From 03c4296c1b2984338e382a0b002657be1bc53773 Mon Sep 17 00:00:00 2001
From: Eaton <eaton@eaton-works.com>
Date: Thu, 23 Aug 2018 16:54:32 -0400
Subject: [PATCH 0001/1703] docs: fix broken links to angular.io (#11811)

docs:  fix broken links to angular.io
---
 packages/schematics/angular/application/files/src/polyfills.ts  | 2 +-
 .../build_angular/hello-world-app/src/polyfills.ts              | 2 +-
 tests/angular_devkit/build_webpack/angular-app/src/polyfills.ts | 2 +-
 tests/legacy-cli/e2e/assets/1.0-project/src/polyfills.ts        | 2 +-
 tests/legacy-cli/e2e/assets/1.7-project/src/polyfills.ts        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/schematics/angular/application/files/src/polyfills.ts b/packages/schematics/angular/application/files/src/polyfills.ts
index d310405a6817..8fceb45d3b0a 100644
--- a/packages/schematics/angular/application/files/src/polyfills.ts
+++ b/packages/schematics/angular/application/files/src/polyfills.ts
@@ -11,7 +11,7 @@
  * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
  * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
  *
- * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
+ * Learn more in https://angular.io/guide/browser-support
  */
 
 /***************************************************************************************************
diff --git a/tests/angular_devkit/build_angular/hello-world-app/src/polyfills.ts b/tests/angular_devkit/build_angular/hello-world-app/src/polyfills.ts
index 1e5ba9f031b6..d7fd9a7ba789 100644
--- a/tests/angular_devkit/build_angular/hello-world-app/src/polyfills.ts
+++ b/tests/angular_devkit/build_angular/hello-world-app/src/polyfills.ts
@@ -18,7 +18,7 @@
  * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
  * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
  *
- * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
+ * Learn more in https://angular.io/guide/browser-support
  */
 
 /***************************************************************************************************
diff --git a/tests/angular_devkit/build_webpack/angular-app/src/polyfills.ts b/tests/angular_devkit/build_webpack/angular-app/src/polyfills.ts
index 1e5ba9f031b6..d7fd9a7ba789 100644
--- a/tests/angular_devkit/build_webpack/angular-app/src/polyfills.ts
+++ b/tests/angular_devkit/build_webpack/angular-app/src/polyfills.ts
@@ -18,7 +18,7 @@
  * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
  * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
  *
- * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
+ * Learn more in https://angular.io/guide/browser-support
  */
 
 /***************************************************************************************************
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/src/polyfills.ts b/tests/legacy-cli/e2e/assets/1.0-project/src/polyfills.ts
index 53bdaf1b8642..a8f13561140d 100644
--- a/tests/legacy-cli/e2e/assets/1.0-project/src/polyfills.ts
+++ b/tests/legacy-cli/e2e/assets/1.0-project/src/polyfills.ts
@@ -11,7 +11,7 @@
  * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
  * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
  *
- * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
+ * Learn more in https://angular.io/guide/browser-support
  */
 
 /***************************************************************************************************
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/src/polyfills.ts b/tests/legacy-cli/e2e/assets/1.7-project/src/polyfills.ts
index af84770782bb..e17a0b1ea437 100644
--- a/tests/legacy-cli/e2e/assets/1.7-project/src/polyfills.ts
+++ b/tests/legacy-cli/e2e/assets/1.7-project/src/polyfills.ts
@@ -11,7 +11,7 @@
  * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
  * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
  *
- * Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
+ * Learn more in https://angular.io/guide/browser-support
  */
 
 /***************************************************************************************************

From 0535e2b7389f594a68905c7acfd23e477207c51e Mon Sep 17 00:00:00 2001
From: Yi Qi <qiyi@google.com>
Date: Thu, 23 Aug 2018 15:02:15 -0700
Subject: [PATCH 0002/1703] feat(@angular/cli): allow schematic command to
 specify the default colletion.

---
 .../angular/cli/commands/generate-impl.ts     |  3 +-
 packages/angular/cli/commands/new-impl.ts     |  4 +--
 .../angular/cli/models/schematic-command.ts   | 35 +++++++++++++++++--
 packages/angular/cli/utilities/config.ts      | 32 +----------------
 4 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/packages/angular/cli/commands/generate-impl.ts b/packages/angular/cli/commands/generate-impl.ts
index 812e5fe2ed24..204bee6d48db 100644
--- a/packages/angular/cli/commands/generate-impl.ts
+++ b/packages/angular/cli/commands/generate-impl.ts
@@ -9,7 +9,6 @@
 // tslint:disable:no-global-tslint-disable no-any
 import { tags, terminal } from '@angular-devkit/core';
 import { SchematicCommand } from '../models/schematic-command';
-import { getDefaultSchematicCollection } from '../utilities/config';
 
 
 export class GenerateCommand extends SchematicCommand {
@@ -61,7 +60,7 @@ export class GenerateCommand extends SchematicCommand {
   }
 
   private parseSchematicInfo(options: any) {
-    let collectionName = getDefaultSchematicCollection();
+    let collectionName = this.getDefaultSchematicCollection();
 
     let schematicName: string = options.schematic;
 
diff --git a/packages/angular/cli/commands/new-impl.ts b/packages/angular/cli/commands/new-impl.ts
index 0057fdcfbef5..b8663199c342 100644
--- a/packages/angular/cli/commands/new-impl.ts
+++ b/packages/angular/cli/commands/new-impl.ts
@@ -8,8 +8,6 @@
 
 // tslint:disable:no-global-tslint-disable no-any
 import { SchematicCommand } from '../models/schematic-command';
-import { getDefaultSchematicCollection } from '../utilities/config';
-
 
 export class NewCommand extends SchematicCommand {
   public readonly allowMissingWorkspace = true;
@@ -65,7 +63,7 @@ export class NewCommand extends SchematicCommand {
   }
 
   private parseCollectionName(options: any): string {
-    const collectionName = options.collection || options.c || getDefaultSchematicCollection();
+    const collectionName = options.collection || options.c || this.getDefaultSchematicCollection();
 
     return collectionName;
   }
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index 81594ac651d2..9f78d5b450ed 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -40,9 +40,10 @@ import {
 import { take } from 'rxjs/operators';
 import { WorkspaceLoader } from '../models/workspace-loader';
 import {
-  getDefaultSchematicCollection,
   getPackageManager,
+  getProjectByCwd,
   getSchematicDefaults,
+  getWorkspace,
 } from '../utilities/config';
 import { ArgumentStrategy, Command, CommandContext, Option } from './command';
 
@@ -188,6 +189,36 @@ export abstract class SchematicCommand extends Command {
     return this._workflow;
   }
 
+  protected getDefaultSchematicCollection(): string {
+    let workspace = getWorkspace('local');
+
+    if (workspace) {
+      const project = getProjectByCwd(workspace);
+      if (project && workspace.getProjectCli(project)) {
+        const value = workspace.getProjectCli(project)['defaultCollection'];
+        if (typeof value == 'string') {
+          return value;
+        }
+      }
+      if (workspace.getCli()) {
+        const value = workspace.getCli()['defaultCollection'];
+        if (typeof value == 'string') {
+          return value;
+        }
+      }
+    }
+
+    workspace = getWorkspace('global');
+    if (workspace && workspace.getCli()) {
+      const value = workspace.getCli()['defaultCollection'];
+      if (typeof value == 'string') {
+        return value;
+      }
+    }
+
+    return '@schematics/angular';
+  }
+
   protected runSchematic(options: RunSchematicOptions) {
     const {collectionName, schematicName, debug, dryRun} = options;
     let schematicOptions = this.removeCoreOptions(options.schematicOptions);
@@ -347,7 +378,7 @@ export abstract class SchematicCommand extends Command {
     // Make a copy.
     this._originalOptions = [...this.options];
 
-    const collectionName = options.collectionName || getDefaultSchematicCollection();
+    const collectionName = options.collectionName || this.getDefaultSchematicCollection();
 
     const collection = this.getCollection(collectionName);
 
diff --git a/packages/angular/cli/utilities/config.ts b/packages/angular/cli/utilities/config.ts
index d9fdb26e9aaf..abad429d7b1f 100644
--- a/packages/angular/cli/utilities/config.ts
+++ b/packages/angular/cli/utilities/config.ts
@@ -140,7 +140,7 @@ export function validateWorkspace(json: JsonObject) {
   return true;
 }
 
-function getProjectByCwd(workspace: experimental.workspace.Workspace): string | null {
+export function getProjectByCwd(workspace: experimental.workspace.Workspace): string | null {
   try {
     return workspace.getProjectByPath(normalize(process.cwd()));
   } catch (e) {
@@ -265,36 +265,6 @@ function getLegacyPackageManager(): string | null {
   return null;
 }
 
-export function getDefaultSchematicCollection(): string {
-  let workspace = getWorkspace('local');
-
-  if (workspace) {
-    const project = getProjectByCwd(workspace);
-    if (project && workspace.getProjectCli(project)) {
-      const value = workspace.getProjectCli(project)['defaultCollection'];
-      if (typeof value == 'string') {
-        return value;
-      }
-    }
-    if (workspace.getCli()) {
-      const value = workspace.getCli()['defaultCollection'];
-      if (typeof value == 'string') {
-        return value;
-      }
-    }
-  }
-
-  workspace = getWorkspace('global');
-  if (workspace && workspace.getCli()) {
-    const value = workspace.getCli()['defaultCollection'];
-    if (typeof value == 'string') {
-      return value;
-    }
-  }
-
-  return '@schematics/angular';
-}
-
 export function getSchematicDefaults(
   collection: string,
   schematic: string,

From c66f831a078736ce01f47d50bb7b2f74dc6ebfed Mon Sep 17 00:00:00 2001
From: ajspera <speradev@gmail.com>
Date: Mon, 27 Aug 2018 11:24:26 -0600
Subject: [PATCH 0003/1703] fix(@angular-devkit/build-angular): load style
 source maps inline so they work (#11729)

without this, the way styles are into the DOM breaks the default sourcemap option
postcss-loader option docs
https://github.com/postcss/postcss-loader#inline
fixes #9099
---
 .../src/angular-cli-files/models/webpack-configs/styles.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
index 09a267b2b173..b8d067df5163 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
@@ -258,7 +258,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
         options: {
           ident: 'embedded',
           plugins: postcssPluginCreator,
-          sourceMap: cssSourceMap
+          sourceMap: cssSourceMap ? 'inline' : false
         }
       },
       ...(use as webpack.Loader[])
@@ -281,7 +281,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
             options: {
               ident: buildOptions.extractCss ? 'extracted' : 'embedded',
               plugins: postcssPluginCreator,
-              sourceMap: cssSourceMap
+              sourceMap: cssSourceMap && !buildOptions.extractCss ? 'inline' : cssSourceMap
             }
           },
           ...(use as webpack.Loader[])

From 907fedc0b8bebc227e7f70b3740babcaa4678d4a Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 27 Aug 2018 18:26:30 +0100
Subject: [PATCH 0004/1703] feat(@angular-devkit/build-angular): use terser
 instead of uglify-es (#11996)

Should help bring down prod build times, @SanderElias reported a ~60% reduction on his project.

Should fix #9340.
---
 .../angular_devkit/build_angular/package.json |   2 +-
 .../models/webpack-configs/common.ts          |   8 +-
 yarn.lock                                     | 107 +++++++++++++++++-
 3 files changed, 110 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 558574ab3afd..35bffdbf66fa 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -46,7 +46,7 @@
     "stylus": "^0.54.5",
     "stylus-loader": "^3.0.2",
     "tree-kill": "^1.2.0",
-    "uglifyjs-webpack-plugin": "^1.2.5",
+    "terser-webpack-plugin": "^1.0.2",
     "url-loader": "^1.0.1",
     "webpack": "^4.15.1",
     "webpack-dev-middleware": "^3.1.3",
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index cab614154b63..c65d78fa07e5 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -24,7 +24,7 @@ import { normalizeExtraEntryPoints } from './utils';
 
 const ProgressPlugin = require('webpack/lib/ProgressPlugin');
 const CircularDependencyPlugin = require('circular-dependency-plugin');
-const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
+const TerserPlugin = require('terser-webpack-plugin');
 const StatsPlugin = require('stats-webpack-plugin');
 
 /**
@@ -208,7 +208,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
   const isIvyEnabled = wco.tsConfig.raw.angularCompilerOptions
                     && wco.tsConfig.raw.angularCompilerOptions.enableIvy;
 
-  const uglifyOptions = {
+  const terserOptions = {
     ecma: wco.supportES2015 ? 6 : 5,
     warnings: !!buildOptions.verbose,
     safari10: true,
@@ -318,11 +318,11 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
           // component styles retain their original file name
           test: (file) => /\.(?:css|scss|sass|less|styl)$/.test(file),
         }),
-        new UglifyJSPlugin({
+        new TerserPlugin({
           sourceMap: buildOptions.sourceMap,
           parallel: true,
           cache: true,
-          uglifyOptions,
+          terserOptions,
         }),
       ],
     },
diff --git a/yarn.lock b/yarn.lock
index cf0ab04b672a..d04f305387cd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -500,6 +500,10 @@ agent-base@^4.1.0:
   dependencies:
     es6-promisify "^5.0.0"
 
+ajv-errors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.0.tgz#ecf021fa108fd17dfb5e6b383f2dd233e31ffc59"
+
 ajv-keywords@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
@@ -1187,6 +1191,25 @@ cacache@^10.0.4:
     unique-filename "^1.1.0"
     y18n "^4.0.0"
 
+cacache@^11.0.2:
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.2.0.tgz#617bdc0b02844af56310e411c0878941d5739965"
+  dependencies:
+    bluebird "^3.5.1"
+    chownr "^1.0.1"
+    figgy-pudding "^3.1.0"
+    glob "^7.1.2"
+    graceful-fs "^4.1.11"
+    lru-cache "^4.1.3"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.2"
+    ssri "^6.0.0"
+    unique-filename "^1.1.0"
+    y18n "^4.0.0"
+
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -2697,6 +2720,10 @@ fecha@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd"
 
+figgy-pudding@^3.1.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.4.1.tgz#af66da1991fa2f94ff7f33b545a38ea4b3869696"
+
 file-loader@^1.1.11:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.11.tgz#6fe886449b0f2a936e43cabaac0cdbfb369506f8"
@@ -2766,6 +2793,14 @@ find-cache-dir@^1.0.0:
     make-dir "^1.0.0"
     pkg-dir "^2.0.0"
 
+find-cache-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d"
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^1.0.0"
+    pkg-dir "^3.0.0"
+
 find-parent-dir@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
@@ -4454,7 +4489,7 @@ lru-cache@2.2.x:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d"
 
-lru-cache@^4.0.1, lru-cache@^4.1.1:
+lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
   dependencies:
@@ -4710,6 +4745,21 @@ mississippi@^2.0.0:
     stream-each "^1.1.0"
     through2 "^2.0.0"
 
+mississippi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+  dependencies:
+    concat-stream "^1.5.0"
+    duplexify "^3.4.2"
+    end-of-stream "^1.1.0"
+    flush-write-stream "^1.0.0"
+    from2 "^2.1.0"
+    parallel-transform "^1.1.0"
+    pump "^3.0.0"
+    pumpify "^1.3.3"
+    stream-each "^1.1.0"
+    through2 "^2.0.0"
+
 mixin-deep@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
@@ -5441,6 +5491,12 @@ pkg-dir@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
+pkg-dir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
+  dependencies:
+    find-up "^3.0.0"
+
 popper.js@^1.14.1:
   version "1.14.4"
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.4.tgz#8eec1d8ff02a5a3a152dd43414a15c7b79fd69b6"
@@ -5635,6 +5691,13 @@ pump@^2.0.0, pump@^2.0.1:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
 pumpify@^1.3.3:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
@@ -6195,6 +6258,14 @@ schema-utils@^0.4.0, schema-utils@^0.4.3, schema-utils@^0.4.4, schema-utils@^0.4
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
 
+schema-utils@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
+  dependencies:
+    ajv "^6.1.0"
+    ajv-errors "^1.0.0"
+    ajv-keywords "^3.1.0"
+
 scss-tokenizer@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
@@ -6503,6 +6574,13 @@ source-map-support@~0.4.0:
   dependencies:
     source-map "^0.5.6"
 
+source-map-support@~0.5.6:
+  version "0.5.9"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
@@ -6660,6 +6738,10 @@ ssri@^5.2.4:
   dependencies:
     safe-buffer "^5.1.1"
 
+ssri@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.0.tgz#fc21bfc90e03275ac3e23d5a42e38b8a1cbc130d"
+
 stack-trace@0.0.x:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
@@ -6884,6 +6966,27 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
+terser-webpack-plugin@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.0.2.tgz#b62dfdc4e59b0b5093665a765b234645b598d1a5"
+  dependencies:
+    cacache "^11.0.2"
+    find-cache-dir "^2.0.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^1.4.0"
+    source-map "^0.6.1"
+    terser "^3.8.1"
+    webpack-sources "^1.1.0"
+    worker-farm "^1.5.2"
+
+terser@^3.8.1:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-3.8.1.tgz#cb70070ac9e0a71add169dfb63c0a64fca2738ac"
+  dependencies:
+    commander "~2.16.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.6"
+
 text-extensions@^1.0.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.7.0.tgz#faaaba2625ed746d568a23e4d0aacd9bf08a8b39"
@@ -7143,7 +7246,7 @@ uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
 
-uglifyjs-webpack-plugin@^1.2.4, uglifyjs-webpack-plugin@^1.2.5:
+uglifyjs-webpack-plugin@^1.2.4:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.7.tgz#57638dd99c853a1ebfe9d97b42160a8a507f9d00"
   dependencies:

From d55deb928218089ea2eb291ae572dd59c63d07ae Mon Sep 17 00:00:00 2001
From: clydin <19598772+clydin@users.noreply.github.com>
Date: Mon, 27 Aug 2018 13:27:44 -0400
Subject: [PATCH 0005/1703] build: add bazel TS library for node tasks (#12008)

---
 packages/angular_devkit/schematics/BUILD | 29 ++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/packages/angular_devkit/schematics/BUILD b/packages/angular_devkit/schematics/BUILD
index db9835277204..613a672ff023 100644
--- a/packages/angular_devkit/schematics/BUILD
+++ b/packages/angular_devkit/schematics/BUILD
@@ -65,6 +65,7 @@ ts_library(
     srcs = glob(
         include = ["tasks/**/*.ts"],
         exclude = [
+            "tasks/node/**/*.ts",
             "tasks/**/*_spec.ts",
             "tasks/**/*_benchmark.ts",
             "tasks/tslint-fix/test/**/*",
@@ -84,6 +85,32 @@ ts_library(
     ],
 )
 
+# @angular-devkit/schematics/tasks/node
+
+ts_library(
+    name = "tasks_node",
+    srcs = glob(
+        include = ["tasks/node/**/*.ts"],
+        exclude = [
+            "tasks/node/**/*_spec.ts",
+            "tasks/node/**/*_benchmark.ts",
+        ],
+    ),
+    module_name = "@angular-devkit/schematics/tasks/node",
+    module_root = "tasks/node/index.d.ts",
+    deps = [
+        ":schematics",
+        ":tasks",
+        "//packages/angular_devkit/core",
+        "//packages/angular_devkit/core:node",
+        "@rxjs",
+        "@rxjs//operators",
+        # @typings: node
+        # @typings: tslint
+        # @typings: typescript
+    ],
+)
+
 ts_library(
     name = "tasks_test_lib",
     srcs = glob(
@@ -135,6 +162,7 @@ ts_library(
     deps = [
         ":schematics",
         ":tasks",
+        ":tasks_node",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
         "@rxjs",
@@ -185,6 +213,7 @@ ts_library(
     deps = [
         ":schematics",
         ":tasks",
+        ":tasks_node",
         ":tools",
         "//packages/angular_devkit/core",
         "@rxjs",

From 02bfde50d65c76900ab6885d5f0dc855b3e299ec Mon Sep 17 00:00:00 2001
From: Alex Eagle <eagle@post.harvard.edu>
Date: Mon, 27 Aug 2018 10:28:21 -0700
Subject: [PATCH 0006/1703] docs: add install instructions to pull a snapshot
 build (#11988)

Would like to point users here when they ask why their bug was closed but the problem is still visible in `@latest`
---
 docs/documentation/home.md | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/docs/documentation/home.md b/docs/documentation/home.md
index 83762c301ab0..c5674d45ce4f 100644
--- a/docs/documentation/home.md
+++ b/docs/documentation/home.md
@@ -2,7 +2,7 @@
 
 # Angular CLI
 
-NOTE: this documentation is for Angular CLI 6. For Angular CLI 1.x go [here](1-x/home) instead.
+NOTE: this documentation is for Angular CLI 6. For Angular CLI 1.x go [here](1-x-home) instead.
 
 ### Overview
 The Angular CLI is a tool to initialize, develop, scaffold  and maintain [Angular](https://angular.io) applications
@@ -13,6 +13,10 @@ To install the Angular CLI:
 npm install -g @angular/cli
 ```
 
+> If you get an error installing the CLI, this is an issue with your local npm setup on your machine, not a problem in Angular CLI.
+> Please have a look at the [fixing npm permissions page](https://docs.npmjs.com/getting-started/fixing-npm-permissions), [common errors page](https://docs.npmjs.com/troubleshooting/common-errors), [npm issue tracker](https://github.com/npm/npm/issues), or open a new issue if the problem you are experiencing isn't known.
+> To install a different version, see below.
+
 Generating and serving an Angular project via a development server
 [Create](new) and [run](serve) a new project:
 ```
@@ -63,3 +67,12 @@ End-to-end tests are run via [Protractor](http://www.protractortest.org/).
 ### Additional Information
 There are several [stories](stories) which will walk you through setting up
 additional aspects of Angular applications.
+
+### Installing a specific version
+The CLI is installed both globally (the command above with the `-g` argument to `npm install`) and also within the project. To install a different version of the CLI, you can just update the version locally within your project. The globally installed package will always delegate to the local one.
+
+There are several different versions available at any time:
+- Install a previous version, maybe because of a bug in the latest version. For example to get 6.0.2: `npm install @angular/cli@6.0.2`
+- Install the pre-release of a newer minor/major version, to try new features. For example to get 7.0.0-beta.3: `npm install @angular/cli@next`. Note that the `@next` version is only useful during beta periods.
+- Install a snapshot build from the latest passing run of our CI (angular-cli/master). This is useful if an issue was just fixed or a new feature just landed on master, but is not yet released: `npm install @angular/cli@github:angular/cli-builds` (or maybe better, find the particular SHA that you want to try: 
+`npm install @angular/cli@github:angular/cli-builds#0123456789abcdef`)

From 62e72fea38108de31e412c6068cf55062298b4d4 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Mon, 27 Aug 2018 18:11:07 -0700
Subject: [PATCH 0007/1703] fix(@angular-devkit/architect): explicitly type
 functions

Closes: #11992
---
 .../angular_devkit/architect/testing/test-project-host.ts   | 3 ++-
 packages/angular_devkit/build_angular/test/utils.ts         | 4 ++--
 packages/angular_devkit/core/src/virtual-fs/host/test.ts    | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/angular_devkit/architect/testing/test-project-host.ts b/packages/angular_devkit/architect/testing/test-project-host.ts
index 4980f0a35bd9..82b75036cf56 100644
--- a/packages/angular_devkit/architect/testing/test-project-host.ts
+++ b/packages/angular_devkit/architect/testing/test-project-host.ts
@@ -8,6 +8,7 @@
 
 import {
   Path,
+  PathFragment,
   basename,
   dirname,
   join,
@@ -128,7 +129,7 @@ export class TestProjectHost extends NodeJsSyncHost {
       virtualFs.stringToFileBuffer(content.concat(str)));
   }
 
-  fileMatchExists(dir: string, regex: RegExp) {
+  fileMatchExists(dir: string, regex: RegExp): PathFragment | undefined {
     const [fileName] = this.scopedSync().list(normalize(dir)).filter(name => name.match(regex));
 
     return fileName || undefined;
diff --git a/packages/angular_devkit/build_angular/test/utils.ts b/packages/angular_devkit/build_angular/test/utils.ts
index 826c48524d3a..72a11bd0a605 100644
--- a/packages/angular_devkit/build_angular/test/utils.ts
+++ b/packages/angular_devkit/build_angular/test/utils.ts
@@ -7,13 +7,13 @@
  */
 
 import { TestProjectHost } from '@angular-devkit/architect/testing';
-import { join, normalize } from '@angular-devkit/core';
+import { Path, join, normalize } from '@angular-devkit/core';
 
 
 const devkitRoot = normalize((global as any)._DevKitRoot); // tslint:disable-line:no-any
 const workspaceRoot = join(devkitRoot, 'tests/angular_devkit/build_angular/hello-world-app/');
 export const host = new TestProjectHost(workspaceRoot);
-export const outputPath = normalize('dist');
+export const outputPath: Path = normalize('dist');
 
 export const browserTargetSpec = { project: 'app', target: 'build' };
 export const devServerTargetSpec = { project: 'app', target: 'serve' };
diff --git a/packages/angular_devkit/core/src/virtual-fs/host/test.ts b/packages/angular_devkit/core/src/virtual-fs/host/test.ts
index eb44fa557133..4efdae796f4b 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/test.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/test.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { Observable } from 'rxjs';
-import { Path, join, normalize } from '../path';
+import { Path, PathFragment, join, normalize } from '../path';
 import { fileBufferToString, stringToFileBuffer } from './buffer';
 import { FileBuffer, HostWatchEvent, HostWatchOptions, Stats } from './interface';
 import { SimpleMemoryHost, SimpleMemoryHostStats } from './memory';
@@ -96,7 +96,7 @@ export class TestHost extends SimpleMemoryHost {
 
     return super._rename(from, to);
   }
-  protected _list(path: Path) {
+  protected _list(path: Path): PathFragment[] {
     this._records.push({ kind: 'list', path });
 
     return super._list(path);
@@ -135,7 +135,7 @@ export class TestHost extends SimpleMemoryHost {
     return fileBufferToString(super._read(normalize(path)));
   }
 
-  $list(path: string) {
+  $list(path: string): PathFragment[] {
     return super._list(normalize(path));
   }
 

From 1730c79b99e1744350f05585f20ab3a4fc220c55 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 28 Aug 2018 03:12:04 +0200
Subject: [PATCH 0008/1703] =?UTF-8?q?fix(@angular-devkit/build-angular):?=
 =?UTF-8?q?=20exclude=20`.map`=20files=20from=20budget=20=E2=80=A6=20(#120?=
 =?UTF-8?q?12)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(@angular-devkit/build-angular): exclude `.map` files from budget calculations

Closes #11999
---
 .../utilities/bundle-calculator.ts            |  7 ++--
 .../test/browser/bundle-budgets_spec_large.ts | 35 +++++++++++++++++++
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator.ts
index 810899e0d868..a396b2f3801d 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator.ts
@@ -64,6 +64,7 @@ class InitialCalculator extends Calculator {
     const initialChunks = this.compilation.chunks.filter(chunk => chunk.isOnlyInitial());
     const size: number = initialChunks
       .reduce((files, chunk) => [...files, ...chunk.files], [])
+      .filter((file: string) => !file.endsWith('.map'))
       .map((file: string) => this.compilation.assets[file].size())
       .reduce((total: number, size: number) => total + size, 0);
     return [{size, label: 'initial'}];
@@ -76,7 +77,7 @@ class InitialCalculator extends Calculator {
 class AllScriptCalculator extends Calculator {
   calculate() {
     const size: number = Object.keys(this.compilation.assets)
-      .filter(key => /\.js$/.test(key))
+      .filter(key => key.endsWith('.js'))
       .map(key => this.compilation.assets[key])
       .map(asset => asset.size())
       .reduce((total: number, size: number) => total + size, 0);
@@ -90,6 +91,7 @@ class AllScriptCalculator extends Calculator {
 class AllCalculator extends Calculator {
   calculate() {
     const size: number = Object.keys(this.compilation.assets)
+      .filter(key => !key.endsWith('.map'))
       .map(key => this.compilation.assets[key].size())
       .reduce((total: number, size: number) => total + size, 0);
     return [{size, label: 'total'}];
@@ -102,7 +104,7 @@ class AllCalculator extends Calculator {
 class AnyScriptCalculator extends Calculator {
   calculate() {
     return Object.keys(this.compilation.assets)
-      .filter(key => /\.js$/.test(key))
+      .filter(key => key.endsWith('.js'))
       .map(key => {
         const asset = this.compilation.assets[key];
         return {
@@ -119,6 +121,7 @@ class AnyScriptCalculator extends Calculator {
 class AnyCalculator extends Calculator {
   calculate() {
     return Object.keys(this.compilation.assets)
+      .filter(key => !key.endsWith('.map'))
       .map(key => {
         const asset = this.compilation.assets[key];
         return {
diff --git a/packages/angular_devkit/build_angular/test/browser/bundle-budgets_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/bundle-budgets_spec_large.ts
index 918e691ba72b..56eb019a5e79 100644
--- a/packages/angular_devkit/build_angular/test/browser/bundle-budgets_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/bundle-budgets_spec_large.ts
@@ -54,4 +54,39 @@ describe('Browser Builder bundle budgets', () => {
       tap(() => expect(logger.includes('WARNING')).toBe(true)),
     ).toPromise().then(done, done.fail);
   });
+
+  describe(`should ignore '.map' files`, () => {
+    it(`when 'intial' budget`, (done) => {
+      const overrides = {
+        optimization: true,
+        budgets: [{ type: 'initial', maximumError: '1mb' }],
+      };
+
+      runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 2).pipe(
+        tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      ).toPromise().then(done, done.fail);
+    });
+
+    it(`when 'all' budget`, (done) => {
+      const overrides = {
+        optimization: true,
+        budgets: [{ type: 'all', maximumError: '1mb' }],
+      };
+
+      runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 2).pipe(
+        tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      ).toPromise().then(done, done.fail);
+    });
+
+    it(`when 'any' budget`, (done) => {
+      const overrides = {
+        optimization: true,
+        budgets: [{ type: 'any', maximumError: '1mb' }],
+      };
+
+      runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 2).pipe(
+        tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      ).toPromise().then(done, done.fail);
+    });
+  });
 });

From 8b7fa047d75c95d760903fa7dab8b7b71d5c90a5 Mon Sep 17 00:00:00 2001
From: Dmitry Teplov <teplov.work@gmail.com>
Date: Tue, 28 Aug 2018 04:12:30 +0300
Subject: [PATCH 0009/1703] docs: fix generate library skip-install desc
 (#11998)

---
 docs/documentation/generate/library.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/documentation/generate/library.md b/docs/documentation/generate/library.md
index 2d62e7985834..2215d2c69db3 100644
--- a/docs/documentation/generate/library.md
+++ b/docs/documentation/generate/library.md
@@ -57,7 +57,7 @@ Generate a library project for Angular.
     <code>--skip-install</code>
   </p>
   <p>
-    Do not add dependencies to package.json.
+    Skip installing dependency packages.
   </p>
 </details>
 <details>

From 3f94b2d8ba5fe58d71a19e8808628302794a6b81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Exbrayat?=
 <cexbrayat@users.noreply.github.com>
Date: Tue, 28 Aug 2018 22:10:18 +0200
Subject: [PATCH 0010/1703] feat(@schematics/angular): remove useless import
 for Ivy (#11874)

Using cli `6.2.0-beta.2` with the new `experimentalIvy` flag leads to:

    ERROR in src/app/app.module.ts(1,1): error TS6133: 'BrowserModule' is declared but its value is never read.
---
 .../schematics/angular/application/other-files/app.module.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/application/other-files/app.module.ts b/packages/schematics/angular/application/other-files/app.module.ts
index 281482250cfa..4ef3c6e953a1 100644
--- a/packages/schematics/angular/application/other-files/app.module.ts
+++ b/packages/schematics/angular/application/other-files/app.module.ts
@@ -1,6 +1,6 @@
-import { BrowserModule } from '@angular/platform-browser';
+<% if (!experimentalIvy) { %>import { BrowserModule } from '@angular/platform-browser';<% } %>
 import { NgModule } from '@angular/core';
-<% if (routing) { %>
+<% if (routing && !experimentalIvy) { %>
 import { AppRoutingModule } from './app-routing.module';<% } %>
 import { AppComponent } from './app.component';
 

From 7f67c64be1b84d4927bce882cb37cf323688dccc Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 28 Aug 2018 22:10:43 +0200
Subject: [PATCH 0011/1703] fix(@angular-devkit/build-angular): fixes cors
 issues with karma (#11970)

Checking the stack trace in the issue one can noticed that the paths for the components are being served via the `webpack://` protocol which is causing a `cors` issue between `http` and `webpack` protocol

This PR removed the `webpack` protocol from the `devtoolModuleFilenameTemplate`

Closes #11966
---
 .../build_angular/src/angular-cli-files/plugins/karma.ts         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
index 71060d02a597..92f4776ae7b6 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
@@ -144,6 +144,7 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
   // Files need to be served from a custom path for Karma.
   webpackConfig.output.path = '/_karma_webpack_/';
   webpackConfig.output.publicPath = '/_karma_webpack_/';
+  webpackConfig.output.devtoolModuleFilenameTemplate = '[namespace]/[resource-path]?[loaders]';
 
   let compiler: any;
   try {

From 7eb080362ffdb137c00cb0572f50a7664db807de Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 28 Aug 2018 22:50:25 +0200
Subject: [PATCH 0012/1703] fix(@angular-devkit/build-angular): only collect
 coverage from files under `sourceRoot` (#11974)

In some cases when having libraries within the workspace this is causing a `Maximum call stack size exceeded`, Also for libraries coverage should be collected with the respective `ng test`

Closes #11934
---
 .../angular-cli-files/models/build-options.ts |  1 +
 .../models/webpack-configs/test.ts            |  6 ++-
 .../build_angular/src/karma/index.ts          |  6 ++-
 .../test/karma/code-coverage_spec_large.ts    | 48 +++++++++++++++++++
 4 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
index a81e728e45de..4dac5449818a 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
@@ -74,6 +74,7 @@ export interface WebpackTestOptions extends BuildOptions {
 export interface WebpackConfigOptions<T = BuildOptions> {
   root: string;
   projectRoot: string;
+  sourceRoot?: string;
   buildOptions: T;
   tsConfig: ts.ParsedCommandLine;
   tsConfigPath: string;
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts
index 9a2c6bf10945..4c8b05aa6008 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts
@@ -23,7 +23,7 @@ import { WebpackConfigOptions, WebpackTestOptions } from '../build-options';
 export function getTestConfig(
   wco: WebpackConfigOptions<WebpackTestOptions>,
 ): webpack.Configuration {
-  const { root, buildOptions } = wco;
+  const { root, buildOptions, sourceRoot: include } = wco;
 
   const extraRules: webpack.Rule[] = [];
   const extraPlugins: webpack.Plugin[] = [];
@@ -46,10 +46,12 @@ export function getTestConfig(
     }
 
     extraRules.push({
-      test: /\.(js|ts)$/, loader: 'istanbul-instrumenter-loader',
+      test: /\.(js|ts)$/,
+      loader: 'istanbul-instrumenter-loader',
       options: { esModules: true },
       enforce: 'post',
       exclude,
+      include,
     });
   }
 
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index f12b29015c5a..df1138edc85a 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -71,11 +71,13 @@ export class KarmaBuilder implements Builder<KarmaBuilderSchema> {
           karmaOptions.browsers = options.browsers.split(',');
         }
 
+        const sourceRoot = builderConfig.sourceRoot && resolve(root, builderConfig.sourceRoot);
+
         karmaOptions.buildWebpack = {
           root: getSystemPath(root),
           projectRoot: getSystemPath(projectRoot),
           options: options as NormalizedKarmaBuilderSchema,
-          webpackConfig: this._buildWebpackConfig(root, projectRoot, host,
+          webpackConfig: this._buildWebpackConfig(root, projectRoot, sourceRoot, host,
             options as NormalizedKarmaBuilderSchema),
           // Pass onto Karma to emit BuildEvents.
           successCb: () => obs.next({ success: true }),
@@ -108,6 +110,7 @@ export class KarmaBuilder implements Builder<KarmaBuilderSchema> {
   private _buildWebpackConfig(
     root: Path,
     projectRoot: Path,
+    sourceRoot: Path | undefined,
     host: virtualFs.Host<fs.Stats>,
     options: NormalizedKarmaBuilderSchema,
   ) {
@@ -130,6 +133,7 @@ export class KarmaBuilder implements Builder<KarmaBuilderSchema> {
     wco = {
       root: getSystemPath(root),
       projectRoot: getSystemPath(projectRoot),
+      sourceRoot: sourceRoot && getSystemPath(sourceRoot),
       // TODO: use only this.options, it contains all flags and configs items already.
       buildOptions: compatOptions,
       tsConfig,
diff --git a/packages/angular_devkit/build_angular/test/karma/code-coverage_spec_large.ts b/packages/angular_devkit/build_angular/test/karma/code-coverage_spec_large.ts
index b67d3d41108e..8440e1143420 100644
--- a/packages/angular_devkit/build_angular/test/karma/code-coverage_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/karma/code-coverage_spec_large.ts
@@ -56,4 +56,52 @@ describe('Karma Builder code coverage', () => {
       }),
     ).toPromise().then(done, done.fail);
   }, 120000);
+
+  it(`should collect coverage from paths in 'sourceRoot'`, (done) => {
+    const overrides: Partial<NormalizedKarmaBuilderSchema> = { codeCoverage: true };
+
+    const files: { [path: string]: string } = {
+      './dist/my-lib/index.d.ts': `
+        export declare const title = 'app';
+      `,
+      './dist/my-lib/index.js': `
+        export const title = 'app';
+      `,
+      './src/app/app.component.ts': `
+        import { Component } from '@angular/core';
+        import { title } from 'my-lib';
+
+        @Component({
+          selector: 'app-root',
+          templateUrl: './app.component.html',
+          styleUrls: ['./app.component.css']
+        })
+        export class AppComponent {
+          title = title;
+        }
+      `,
+    };
+
+    host.writeMultipleFiles(files);
+
+    host.replaceInFile('tsconfig.json', /"baseUrl": ".\/",/, `
+      "baseUrl": "./",
+      "paths": {
+        "my-lib": [
+          "./dist/my-lib"
+        ]
+      },
+    `);
+
+    runTargetSpec(host, karmaTargetSpec, overrides).pipe(
+      // It seems like the coverage files take a while being written to disk, so we wait 500ms here.
+      debounceTime(500),
+      tap(buildEvent => {
+        expect(buildEvent.success).toBe(true);
+        expect(host.scopedSync().exists(coverageFilePath)).toBe(true);
+        const content = virtualFs.fileBufferToString(host.scopedSync().read(coverageFilePath));
+        expect(content).not.toContain('my-lib');
+      }),
+    ).toPromise().then(done, done.fail);
+  }, 120000);
 });

From 2dcf0b9901af011c02a7d425e23e4d4c04ba1100 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 8 Aug 2018 11:39:38 -0400
Subject: [PATCH 0013/1703] refactor(@angular-devkit/core): cleanup ajv
 initialization

---
 .../core/src/json/schema/registry.ts          | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/packages/angular_devkit/core/src/json/schema/registry.ts b/packages/angular_devkit/core/src/json/schema/registry.ts
index 0965910a6273..530ea4d14888 100644
--- a/packages/angular_devkit/core/src/json/schema/registry.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry.ts
@@ -7,7 +7,7 @@
  */
 import * as ajv from 'ajv';
 import * as http from 'http';
-import { Observable, from, of as observableOf } from 'rxjs';
+import { Observable, from, of as observableOf, throwError } from 'rxjs';
 import { concatMap, map, switchMap, tap } from 'rxjs/operators';
 import { BaseException } from '../../exception/exception';
 import { PartiallyOrderedSet, isObservable } from '../../utils';
@@ -176,7 +176,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
       validate = (validate.refVal as any)[(validate.refs as any)['#' + refHash]];
     }
 
-    return { context: validate, schema: validate && validate.schema as JsonObject };
+    return { context: validate, schema: validate.schema as JsonObject };
   }
 
   compile(schema: JsonObject): Observable<SchemaValidator> {
@@ -186,23 +186,18 @@ export class CoreSchemaRegistry implements SchemaRegistry {
     // in synchronous (if available).
     let validator: Observable<ajv.ValidateFunction>;
     try {
-      const maybeFnValidate = this._ajv.compile(schema);
-      validator = observableOf(maybeFnValidate);
+      validator = observableOf(this._ajv.compile(schema));
     } catch (e) {
       // Propagate the error.
       if (!(e instanceof (ajv.MissingRefError as {} as Function))) {
-        throw e;
+        return throwError(e);
       }
 
-      validator = new Observable(obs => {
-        this._ajv.compileAsync(schema)
-          .then(validate => {
-            obs.next(validate);
-            obs.complete();
-          }, err => {
-            obs.error(err);
-          });
-      });
+      try {
+        validator = from(this._ajv.compileAsync(schema));
+      } catch (e) {
+        return throwError(e);
+      }
     }
 
     return validator

From 4207a15c4f68dccc89feba5c93dca948f71f51d9 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 10 Aug 2018 14:37:55 -0400
Subject: [PATCH 0014/1703] fix(@angular-devkit/core): make smart default work
 with default/required

---
 packages/angular_devkit/core/src/json/schema/registry.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/core/src/json/schema/registry.ts b/packages/angular_devkit/core/src/json/schema/registry.ts
index 530ea4d14888..5ad00609e965 100644
--- a/packages/angular_devkit/core/src/json/schema/registry.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry.ts
@@ -208,6 +208,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
               return visitJson(data, visitor, schema, this._resolver, validate);
             })),
           ).pipe(
+            switchMap(updateData => this._applySmartDefaults(updateData)),
             switchMap(updatedData => {
               const result = validate(updatedData);
 
@@ -227,8 +228,8 @@ export class CoreSchemaRegistry implements SchemaRegistry {
             }),
             switchMap(([data, valid]) => {
               if (valid) {
-                return this._applySmartDefaults(data).pipe(
-                  ...[...this._post].map(visitor => concatMap(data => {
+                return observableOf(data).pipe(
+                  ...[...this._post].map(visitor => concatMap((data: JsonValue) => {
                     return visitJson(data as JsonValue, visitor, schema, this._resolver, validate);
                   })),
                 ).pipe(

From 516f52e3ddb5828d9f792fd740164fe894e4fdc1 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 9 Aug 2018 14:18:41 -0400
Subject: [PATCH 0015/1703] feat(@angular-devkit/core): initial prompt provider
 json schema support

---
 packages/angular_devkit/core/package.json     |   1 +
 .../core/src/json/schema/interface.ts         |  25 +-
 .../core/src/json/schema/prompt_spec.ts       | 364 ++++++++++++++++++
 .../core/src/json/schema/registry.ts          | 311 ++++++++++++---
 .../core/src/json/schema/registry_spec.ts     |   1 +
 yarn.lock                                     |   6 +-
 6 files changed, 647 insertions(+), 61 deletions(-)
 create mode 100644 packages/angular_devkit/core/src/json/schema/prompt_spec.ts

diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json
index 1c310e7cb05d..b63e953adeec 100644
--- a/packages/angular_devkit/core/package.json
+++ b/packages/angular_devkit/core/package.json
@@ -10,6 +10,7 @@
   "dependencies": {
     "ajv": "~6.4.0",
     "chokidar": "^2.0.3",
+    "fast-json-stable-stringify": "^2.0.0",
     "source-map": "^0.5.6",
     "rxjs": "^6.0.0"
   }
diff --git a/packages/angular_devkit/core/src/json/schema/interface.ts b/packages/angular_devkit/core/src/json/schema/interface.ts
index 99af07451d46..6f0f092629c3 100644
--- a/packages/angular_devkit/core/src/json/schema/interface.ts
+++ b/packages/angular_devkit/core/src/json/schema/interface.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Observable } from 'rxjs';
+import { Observable, SubscribableOrPromise } from 'rxjs';
 import { JsonArray, JsonObject, JsonValue } from '../interface';
 
 export type JsonPointer = string & {
@@ -57,9 +57,13 @@ export interface SchemaValidatorResult {
   errors?: SchemaValidatorError[];
 }
 
+export interface SchemaValidatorOptions {
+  withPrompts: boolean;
+}
+
 export interface SchemaValidator {
   // tslint:disable-next-line:no-any
-  (data: any): Observable<SchemaValidatorResult>;
+  (data: any, options?: Partial<SchemaValidatorOptions>): Observable<SchemaValidatorResult>;
 }
 
 export interface SchemaFormatter {
@@ -90,8 +94,25 @@ export interface SchemaKeywordValidator {
   ): boolean | Observable<boolean>;
 }
 
+export interface PromptDefinition {
+  id: string;
+  type: string;
+  message: string;
+  default?: string | number | boolean | null;
+  priority: number;
+  validator?: (value: string) => boolean | string | Promise<boolean | string>;
+
+  items?: Array<string | { value: JsonValue, label: string }>;
+
+  raw?: string | JsonObject;
+}
+
+export type PromptProvider = (definitions: Array<PromptDefinition>)
+  => SubscribableOrPromise<{ [id: string]: JsonValue }>;
+
 export interface SchemaRegistry {
   compile(schema: Object): Observable<SchemaValidator>;
   addFormat(format: SchemaFormat): void;
   addSmartDefaultProvider<T>(source: string, provider: SmartDefaultProvider<T>): void;
+  usePromptProvider(provider: PromptProvider): void;
 }
diff --git a/packages/angular_devkit/core/src/json/schema/prompt_spec.ts b/packages/angular_devkit/core/src/json/schema/prompt_spec.ts
new file mode 100644
index 000000000000..40d5f89543c9
--- /dev/null
+++ b/packages/angular_devkit/core/src/json/schema/prompt_spec.ts
@@ -0,0 +1,364 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// tslint:disable:no-any no-big-function
+import { map, mergeMap } from 'rxjs/operators';
+import { CoreSchemaRegistry } from './registry';
+
+
+describe('Prompt Provider', () => {
+  it('sets properties with answer', done => {
+    const registry = new CoreSchemaRegistry();
+    const data: any = {};
+
+    registry.usePromptProvider(async definitions => {
+      return { [definitions[0].id]: true };
+    });
+
+    registry
+      .compile({
+        properties: {
+          test: {
+            type: 'boolean',
+            'x-prompt': 'test-message',
+          },
+        },
+      })
+      .pipe(
+        mergeMap(validator => validator(data)),
+        map(() => {
+          expect(data.test).toBe(true);
+        }),
+      )
+      .toPromise().then(done, done.fail);
+    });
+
+  it('supports mixed schema references', done => {
+    const registry = new CoreSchemaRegistry();
+    const data: any = {};
+
+    registry.usePromptProvider(async definitions => {
+      return {
+        '\'bool\'': true,
+        '\'test\'': 'two',
+        '\'obj\'/\'deep\'/\'three\'': 'test3-answer',
+      };
+    });
+
+    registry
+      .compile({
+        properties: {
+          bool: {
+            $ref: '#/definitions/example',
+          },
+          test: {
+            type: 'string',
+            enum: [
+              'one',
+              'two',
+              'three',
+            ],
+            'x-prompt': {
+              type: 'list',
+              'message': 'other-message',
+            },
+          },
+          obj: {
+            properties: {
+              deep: {
+                properties: {
+                  three: {
+                    $ref: '#/definitions/test3',
+                  },
+                },
+              },
+            },
+          },
+        },
+        definitions: {
+          example: {
+            type: 'boolean',
+            'x-prompt': 'example-message',
+          },
+          test3: {
+            type: 'string',
+            'x-prompt': 'test3-message',
+          },
+        },
+      })
+      .pipe(
+        mergeMap(validator => validator(data)),
+        map(result => {
+          expect(result.success).toBe(true);
+          expect(data.bool).toBe(true);
+          expect(data.test).toBe('two');
+          expect(data.obj.deep.three).toEqual('test3-answer');
+        }),
+      )
+      .toPromise().then(done, done.fail);
+  });
+
+  describe('with shorthand', () => {
+    it('supports message value', done => {
+      const registry = new CoreSchemaRegistry();
+      const data: any = {};
+
+      registry.usePromptProvider(async definitions => {
+        expect(definitions.length).toBe(1);
+        expect(definitions[0].message).toBe('test-message');
+
+        return {};
+      });
+
+      registry
+        .compile({
+          properties: {
+            test: {
+              type: 'string',
+              'x-prompt': 'test-message',
+            },
+          },
+        })
+        .pipe(
+          mergeMap(validator => validator(data)),
+        )
+        .toPromise().then(done, done.fail);
+    });
+
+    it('analyzes enums', done => {
+      const registry = new CoreSchemaRegistry();
+      const data: any = {};
+
+      registry.usePromptProvider(async definitions => {
+        expect(definitions.length).toBe(1);
+        expect(definitions[0].type).toBe('list');
+        expect(definitions[0].items).toEqual([
+          'one',
+          'two',
+          'three',
+        ]);
+
+        return {};
+      });
+
+      registry
+        .compile({
+          properties: {
+            test: {
+              type: 'string',
+              enum: [
+                'one',
+                'two',
+                'three',
+              ],
+              'x-prompt': 'test-message',
+            },
+          },
+        })
+        .pipe(
+          mergeMap(validator => validator(data)),
+        )
+        .toPromise().then(done, done.fail);
+    });
+
+    it('analyzes boolean properties', done => {
+      const registry = new CoreSchemaRegistry();
+      const data: any = {};
+
+      registry.usePromptProvider(async definitions => {
+        expect(definitions.length).toBe(1);
+        expect(definitions[0].type).toBe('confirmation');
+        expect(definitions[0].items).toBeUndefined();
+
+        return {};
+      });
+
+      registry
+        .compile({
+          properties: {
+            test: {
+              type: 'boolean',
+              'x-prompt': 'test-message',
+            },
+          },
+        })
+        .pipe(
+          mergeMap(validator => validator(data)),
+        )
+        .toPromise().then(done, done.fail);
+    });
+
+  });
+
+  describe('with longhand', () => {
+    it('supports message option', done => {
+      const registry = new CoreSchemaRegistry();
+      const data: any = {};
+
+      registry.usePromptProvider(async definitions => {
+        expect(definitions.length).toBe(1);
+        expect(definitions[0].message).toBe('test-message');
+
+        return {};
+      });
+
+      registry
+        .compile({
+          properties: {
+            test: {
+              type: 'string',
+              'x-prompt': {
+                'message': 'test-message',
+              },
+            },
+          },
+        })
+        .pipe(
+          mergeMap(validator => validator(data)),
+        )
+        .toPromise().then(done, done.fail);
+    });
+
+    it('analyzes enums WITH explicit list type', done => {
+      const registry = new CoreSchemaRegistry();
+      const data: any = {};
+
+      registry.usePromptProvider(async definitions => {
+        expect(definitions.length).toBe(1);
+        expect(definitions[0].type).toBe('list');
+        expect(definitions[0].items).toEqual([
+          'one',
+          'two',
+          'three',
+        ]);
+
+        return { [definitions[0].id]: 'one' };
+      });
+
+      registry
+        .compile({
+          properties: {
+            test: {
+              type: 'string',
+              enum: [
+                'one',
+                'two',
+                'three',
+              ],
+              'x-prompt': {
+                'type': 'list',
+                'message': 'test-message',
+              },
+            },
+          },
+        })
+        .pipe(
+          mergeMap(validator => validator(data)),
+        )
+        .toPromise().then(done, done.fail);
+    });
+
+    it('analyzes enums WITHOUT explicit list type', done => {
+      const registry = new CoreSchemaRegistry();
+      const data: any = {};
+
+      registry.usePromptProvider(async definitions => {
+        expect(definitions.length).toBe(1);
+        expect(definitions[0].type).toBe('list');
+        expect(definitions[0].items).toEqual([
+          'one',
+          'two',
+          'three',
+        ]);
+
+        return {};
+      });
+
+      registry
+        .compile({
+          properties: {
+            test: {
+              type: 'string',
+              enum: [
+                'one',
+                'two',
+                'three',
+              ],
+              'x-prompt': {
+                'message': 'test-message',
+              },
+            },
+          },
+        })
+        .pipe(
+          mergeMap(validator => validator(data)),
+        )
+        .toPromise().then(done, done.fail);
+    });
+
+    it('analyzes boolean properties', done => {
+      const registry = new CoreSchemaRegistry();
+      const data: any = {};
+
+      registry.usePromptProvider(async definitions => {
+        expect(definitions.length).toBe(1);
+        expect(definitions[0].type).toBe('confirmation');
+        expect(definitions[0].items).toBeUndefined();
+
+        return {};
+      });
+
+      registry
+        .compile({
+          properties: {
+            test: {
+              type: 'boolean',
+              'x-prompt': {
+                'message': 'test-message',
+              },
+            },
+          },
+        })
+        .pipe(
+          mergeMap(validator => validator(data)),
+        )
+        .toPromise().then(done, done.fail);
+    });
+
+    it('allows prompt type override', done => {
+      const registry = new CoreSchemaRegistry();
+      const data: any = {};
+
+      registry.usePromptProvider(async definitions => {
+        expect(definitions.length).toBe(1);
+        expect(definitions[0].type).toBe('input');
+        expect(definitions[0].items).toBeUndefined();
+
+        return {};
+      });
+
+      registry
+        .compile({
+          properties: {
+            test: {
+              type: 'boolean',
+              'x-prompt': {
+                'type': 'input',
+                'message': 'test-message',
+              },
+            },
+          },
+        })
+        .pipe(
+          mergeMap(validator => validator(data)),
+        )
+        .toPromise().then(done, done.fail);
+    });
+
+  });
+
+});
diff --git a/packages/angular_devkit/core/src/json/schema/registry.ts b/packages/angular_devkit/core/src/json/schema/registry.ts
index 5ad00609e965..27e82270ad69 100644
--- a/packages/angular_devkit/core/src/json/schema/registry.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry.ts
@@ -13,17 +13,21 @@ import { BaseException } from '../../exception/exception';
 import { PartiallyOrderedSet, isObservable } from '../../utils';
 import { JsonObject, JsonValue } from '../interface';
 import {
+  PromptDefinition,
+  PromptProvider,
   SchemaFormat,
   SchemaFormatter,
   SchemaRegistry,
   SchemaValidator,
   SchemaValidatorError,
+  SchemaValidatorOptions,
   SchemaValidatorResult,
   SmartDefaultProvider,
 } from './interface';
 import { addUndefinedDefaults } from './transforms';
 import { JsonVisitor, visitJson } from './visitor';
 
+const serialize = require('fast-json-stable-stringify');
 
 // This interface should be exported from ajv, but they only export the class and not the type.
 interface AjvValidationError {
@@ -69,15 +73,22 @@ export class SchemaValidationException extends BaseException {
   }
 }
 
+interface SchemaInfo {
+  smartDefaultRecord: Map<string, JsonObject>;
+  promptDefinitions: Array<PromptDefinition>;
+}
+
 export class CoreSchemaRegistry implements SchemaRegistry {
   private _ajv: ajv.Ajv;
   private _uriCache = new Map<string, JsonObject>();
   private _pre = new PartiallyOrderedSet<JsonVisitor>();
   private _post = new PartiallyOrderedSet<JsonVisitor>();
+  private _currentCompilationSchemaInfo?: SchemaInfo;
+  private _validatorCache = new Map<string, SchemaValidator>();
 
   private _smartDefaultKeyword = false;
+  private _promptProvider?: PromptProvider;
   private _sourceMap = new Map<string, SmartDefaultProvider<{}>>();
-  private _smartDefaultRecord = new Map<string, JsonObject>();
 
   constructor(formats: SchemaFormat[] = []) {
     /**
@@ -91,10 +102,10 @@ export class CoreSchemaRegistry implements SchemaRegistry {
     }
 
     this._ajv = ajv({
-      useDefaults: true,
       formats: formatsObj,
       loadSchema: (uri: string) => this._fetch(uri),
       schemaId: 'auto',
+      passContext: true,
     });
 
     this._ajv.addMetaSchema(require('ajv/lib/refs/json-schema-draft-04.json'));
@@ -176,16 +187,28 @@ export class CoreSchemaRegistry implements SchemaRegistry {
       validate = (validate.refVal as any)[(validate.refs as any)['#' + refHash]];
     }
 
-    return { context: validate, schema: validate.schema as JsonObject };
+    return { context: validate, schema: validate && validate.schema as JsonObject };
   }
 
   compile(schema: JsonObject): Observable<SchemaValidator> {
+    const schemaKey = serialize(schema);
+    const existingValidator = this._validatorCache.get(schemaKey);
+    if (existingValidator) {
+      return observableOf(existingValidator);
+    }
+
+    const schemaInfo: SchemaInfo = {
+      smartDefaultRecord: new Map<string, JsonObject>(),
+      promptDefinitions: [],
+    };
+
     // Supports both synchronous and asynchronous compilation, by trying the synchronous
     // version first, then if refs are missing this will fails.
     // We also add any refs from external fetched schemas so that those will also be used
     // in synchronous (if available).
     let validator: Observable<ajv.ValidateFunction>;
     try {
+      this._currentCompilationSchemaInfo = schemaInfo;
       validator = observableOf(this._ajv.compile(schema));
     } catch (e) {
       // Propagate the error.
@@ -202,15 +225,26 @@ export class CoreSchemaRegistry implements SchemaRegistry {
 
     return validator
       .pipe(
-        map(validate => (data: JsonValue): Observable<SchemaValidatorResult> => {
+        map<ajv.ValidateFunction, SchemaValidator>(validate => (data, options) => {
+          const validationOptions: SchemaValidatorOptions = {
+            withPrompts: true,
+            ...options,
+          };
+          const validationContext = {
+            promptFieldsWithValue: new Set<string>(),
+          };
+
           return observableOf(data).pipe(
             ...[...this._pre].map(visitor => concatMap((data: JsonValue) => {
               return visitJson(data, visitor, schema, this._resolver, validate);
             })),
           ).pipe(
-            switchMap(updateData => this._applySmartDefaults(updateData)),
-            switchMap(updatedData => {
-              const result = validate(updatedData);
+            switchMap(updateData => this._applySmartDefaults(
+              updateData,
+              schemaInfo.smartDefaultRecord,
+            )),
+            switchMap((updatedData: JsonValue) => {
+              const result = validate.call(validationContext, updatedData);
 
               return typeof result == 'boolean'
                 ? observableOf([updatedData, result])
@@ -226,6 +260,22 @@ export class CoreSchemaRegistry implements SchemaRegistry {
                     return Promise.reject(err);
                   }));
             }),
+            switchMap(([data, valid]) => {
+              if (!validationOptions.withPrompts) {
+                return observableOf([data, valid]);
+              }
+
+              const definitions = schemaInfo.promptDefinitions
+                .filter(def => !validationContext.promptFieldsWithValue.has(def.id));
+
+              if (valid && this._promptProvider && definitions.length > 0) {
+                return from(this._applyPrompts(data, definitions)).pipe(
+                  map(data => [data, valid]),
+                );
+              } else {
+                return observableOf([data, valid]);
+              }
+            }),
             switchMap(([data, valid]) => {
               if (valid) {
                 return observableOf(data).pipe(
@@ -252,6 +302,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
             }),
           );
         }),
+        tap(v => this._validatorCache.set(schemaKey, v)),
       );
   }
 
@@ -289,10 +340,15 @@ export class CoreSchemaRegistry implements SchemaRegistry {
         errors: false,
         valid: true,
         compile: (schema, _parentSchema, it) => {
+          const compilationSchemInfo = this._currentCompilationSchemaInfo;
+          if (!compilationSchemInfo) {
+            throw new Error('Invalid JSON schema compilation state');
+          }
+
           // We cheat, heavily.
-          this._smartDefaultRecord.set(
+          compilationSchemInfo.smartDefaultRecord.set(
             // tslint:disable-next-line:no-any
-            JSON.stringify((it as any).dataPathArr.slice(1, (it as any).dataLevel + 1) as string[]),
+            JSON.stringify((it as any).dataPathArr.slice(1, it.dataLevel + 1) as string[]),
             schema,
           );
 
@@ -310,70 +366,209 @@ export class CoreSchemaRegistry implements SchemaRegistry {
     }
   }
 
-  // tslint:disable-next-line:no-any
-  private _applySmartDefaults(data: any): Observable<any> {
-    function _set(
-      // tslint:disable-next-line:no-any
-      data: any,
-      fragments: string[],
-      value: {},
-      // tslint:disable-next-line:no-any
-      parent: any | null = null,
-      parentProperty?: string,
-    ): void {
-      for (let i = 0; i < fragments.length; i++) {
-        const f = fragments[i];
-
-        if (f[0] == 'i') {
-          if (!Array.isArray(data)) {
-            return;
+  usePromptProvider(provider: PromptProvider) {
+    const isSetup = !!this._promptProvider;
+
+    this._promptProvider = provider;
+
+    if (isSetup) {
+      return;
+    }
+
+    this._ajv.addKeyword('x-prompt', {
+      errors: false,
+      valid: true,
+      compile: (schema, parentSchema: JsonObject, it) => {
+        const compilationSchemInfo = this._currentCompilationSchemaInfo;
+        if (!compilationSchemInfo) {
+          throw new Error('Invalid JSON schema compilation state');
+        }
+
+        // tslint:disable-next-line:no-any
+        const pathArray = ((it as any).dataPathArr as string[]).slice(1, it.dataLevel + 1);
+        const path = pathArray.join('/');
+
+        let type: string | undefined;
+        let items: Array<string | { label: string, value: string | number | boolean }> | undefined;
+        let message: string;
+        if (typeof schema == 'string') {
+          message = schema;
+        } else {
+          message = schema.message;
+          type = schema.type;
+          items = schema.items;
+        }
+
+        if (!type) {
+          if (parentSchema.type === 'boolean') {
+            type = 'confirmation';
+          } else if (Array.isArray(parentSchema.enum)) {
+            type = 'list';
+          } else {
+            type = 'input';
           }
+        }
 
-          for (let j = 0; j < data.length; j++) {
-            _set(data[j], fragments.slice(i + 1), value, data, '' + j);
+        if (type === 'list' && !items) {
+          if (Array.isArray(parentSchema.enum)) {
+            type = 'list';
+            items = [];
+            for (const value of parentSchema.enum) {
+              if (typeof value == 'string') {
+                items.push(value);
+              } else if (typeof value == 'object') {
+                // Invalid
+              } else {
+                items.push({ label: value.toString(), value });
+              }
+            }
           }
+        }
 
-          return;
-        } else if (f.startsWith('key')) {
-          if (typeof data !== 'object') {
-            return;
+        const definition: PromptDefinition = {
+          id: path,
+          type,
+          message,
+          priority: 0,
+          raw: schema,
+          items,
+          default: typeof parentSchema.default == 'object' ? undefined : parentSchema.default,
+          async validator(data: string) {
+            const result = it.self.validate(parentSchema, data);
+            if (typeof result === 'boolean') {
+              return result;
+            } else {
+              try {
+                await result;
+
+                return true;
+              } catch {
+                return false;
+              }
+            }
+          },
+        };
+
+        compilationSchemInfo.promptDefinitions.push(definition);
+
+        return function(this: { promptFieldsWithValue: Set<string> }) {
+          if (this) {
+            this.promptFieldsWithValue.add(path);
           }
 
-          Object.getOwnPropertyNames(data).forEach(property => {
-            _set(data[property], fragments.slice(i + 1), value, data, property);
-          });
+          return true;
+        };
+      },
+      metaSchema: {
+        oneOf: [
+          { type: 'string' },
+          {
+            type: 'object',
+            properties: {
+              'type': { type: 'string' },
+              'message': { type: 'string' },
+            },
+            additionalProperties: true,
+            required: [ 'message' ],
+          },
+        ],
+      },
+    });
+  }
+
+  private _applyPrompts<T>(data: T, prompts: Array<PromptDefinition>): Observable<T> {
+    const provider = this._promptProvider;
+    if (!provider) {
+      return observableOf(data);
+    }
+
+    prompts.sort((a, b) => b.priority - a.priority);
+
+    return from(provider(prompts)).pipe(
+      map(answers => {
+        for (const path in answers) {
+          CoreSchemaRegistry._set(
+            data,
+            path.split('/'),
+            answers[path] as {},
+            null,
+            undefined,
+            true,
+          );
+        }
+
+        return data;
+      }),
+    );
+  }
 
+  private static _set(
+    // tslint:disable-next-line:no-any
+    data: any,
+    fragments: string[],
+    value: {},
+    // tslint:disable-next-line:no-any
+    parent: any | null = null,
+    parentProperty?: string,
+    force?: boolean,
+  ): void {
+    for (let i = 0; i < fragments.length; i++) {
+      const f = fragments[i];
+
+      if (f[0] == 'i') {
+        if (!Array.isArray(data)) {
           return;
-        } else if (f.startsWith('\'') && f[f.length - 1] == '\'') {
-          const property = f
-            .slice(1, -1)
-            .replace(/\\'/g, '\'')
-            .replace(/\\n/g, '\n')
-            .replace(/\\r/g, '\r')
-            .replace(/\\f/g, '\f')
-            .replace(/\\t/g, '\t');
-
-          // We know we need an object because the fragment is a property key.
-          if (!data && parent !== null && parentProperty) {
-            data = parent[parentProperty] = {};
-          }
-          parent = data;
-          parentProperty = property;
+        }
 
-          data = data[property];
-        } else {
+        for (let j = 0; j < data.length; j++) {
+          CoreSchemaRegistry._set(data[j], fragments.slice(i + 1), value, data, '' + j);
+        }
+
+        return;
+      } else if (f.startsWith('key')) {
+        if (typeof data !== 'object') {
           return;
         }
-      }
 
-      if (parent && parentProperty && parent[parentProperty] === undefined) {
-        parent[parentProperty] = value;
+        Object.getOwnPropertyNames(data).forEach(property => {
+          CoreSchemaRegistry._set(data[property], fragments.slice(i + 1), value, data, property);
+        });
+
+        return;
+      } else if (f.startsWith('\'') && f[f.length - 1] == '\'') {
+        const property = f
+          .slice(1, -1)
+          .replace(/\\'/g, '\'')
+          .replace(/\\n/g, '\n')
+          .replace(/\\r/g, '\r')
+          .replace(/\\f/g, '\f')
+          .replace(/\\t/g, '\t');
+
+        // We know we need an object because the fragment is a property key.
+        if (!data && parent !== null && parentProperty) {
+          data = parent[parentProperty] = {};
+        }
+        parent = data;
+        parentProperty = property;
+
+        data = data[property];
+      } else {
+        return;
       }
     }
 
+    if (parent && parentProperty && (force || parent[parentProperty] === undefined)) {
+      parent[parentProperty] = value;
+    }
+  }
+
+  private _applySmartDefaults<T>(
+    data: T,
+    smartDefaults: Map<string, JsonObject>,
+  ): Observable<T> {
     return observableOf(data).pipe(
-      ...[...this._smartDefaultRecord.entries()].map(([pointer, schema]) => {
-        return concatMap(data => {
+      ...[...smartDefaults.entries()].map(([pointer, schema]) => {
+        return concatMap<T, T>(data => {
           const fragments = JSON.parse(pointer);
           const source = this._sourceMap.get((schema as JsonObject).$source as string);
 
@@ -385,7 +580,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
 
           return (value as Observable<{}>).pipe(
             // Synchronously set the new data at the proper JsonSchema path.
-            tap(x => _set(data, fragments, x)),
+            tap(x => CoreSchemaRegistry._set(data, fragments, x)),
             // But return the data object.
             map(() => data),
           );
diff --git a/packages/angular_devkit/core/src/json/schema/registry_spec.ts b/packages/angular_devkit/core/src/json/schema/registry_spec.ts
index 4b47be28b2d8..773a87a479bf 100644
--- a/packages/angular_devkit/core/src/json/schema/registry_spec.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry_spec.ts
@@ -424,4 +424,5 @@ describe('CoreSchemaRegistry', () => {
       )
       .toPromise().then(done, done.fail);
   });
+
 });
diff --git a/yarn.lock b/yarn.lock
index d04f305387cd..d5e23db55b07 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3813,6 +3813,10 @@ is-primitive@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
 
+is-promise@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+
 is-redirect@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
@@ -4408,7 +4412,7 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
-lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.5.0, lodash@~4.17.10:
+lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0, lodash@~4.17.10:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 

From 489f0e905576f3c4ad821d4385d771b0f4bcb31d Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 9 Aug 2018 14:19:25 -0400
Subject: [PATCH 0016/1703] feat(@angular/cli): initialize a console prompt
 provider for schematics

---
 package.json                                  |   1 +
 .../angular/cli/commands/generate-impl.ts     |  10 +-
 packages/angular/cli/commands/generate.json   |   5 +
 packages/angular/cli/commands/new-impl.ts     |   6 +-
 packages/angular/cli/commands/new.json        |   5 +
 .../angular/cli/models/schematic-command.ts   |  45 ++++
 packages/angular/cli/package.json             |   2 +-
 yarn.lock                                     | 192 +++++++++++++++++-
 8 files changed, 255 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 4936df3a1966..8b881cb9159e 100644
--- a/package.json
+++ b/package.json
@@ -69,6 +69,7 @@
     "@types/copy-webpack-plugin": "^4.4.1",
     "@types/express": "^4.16.0",
     "@types/glob": "^5.0.35",
+    "@types/inquirer": "^0.0.42",
     "@types/istanbul": "^0.4.30",
     "@types/jasmine": "^2.8.8",
     "@types/loader-utils": "^1.1.3",
diff --git a/packages/angular/cli/commands/generate-impl.ts b/packages/angular/cli/commands/generate-impl.ts
index 204bee6d48db..7e2580751137 100644
--- a/packages/angular/cli/commands/generate-impl.ts
+++ b/packages/angular/cli/commands/generate-impl.ts
@@ -52,10 +52,11 @@ export class GenerateCommand extends SchematicCommand {
     return this.runSchematic({
       collectionName,
       schematicName,
-      schematicOptions: options,
+      schematicOptions: this.removeLocalOptions(options),
       debug: options.debug,
       dryRun: options.dryRun,
       force: options.force,
+      interactive: options.interactive,
     });
   }
 
@@ -95,4 +96,11 @@ export class GenerateCommand extends SchematicCommand {
       this.logger.info(terminal.cyan(`  ng generate <schematic> --help`));
     }
   }
+
+  private removeLocalOptions(options: any): any {
+    const opts = Object.assign({}, options);
+    delete opts.interactive;
+
+    return opts;
+  }
 }
diff --git a/packages/angular/cli/commands/generate.json b/packages/angular/cli/commands/generate.json
index 95c6c8a46e90..3a784e3d47b9 100644
--- a/packages/angular/cli/commands/generate.json
+++ b/packages/angular/cli/commands/generate.json
@@ -30,6 +30,11 @@
       "default": false,
       "aliases": ["f"],
       "description": "Forces overwriting of files."
+    },
+    "interactive": {
+      "type": "boolean",
+      "default": "true",
+      "description": "Disables interactive inputs (i.e., prompts)."
     }
   },
   "required": [
diff --git a/packages/angular/cli/commands/new-impl.ts b/packages/angular/cli/commands/new-impl.ts
index b8663199c342..c9229a2e1b37 100644
--- a/packages/angular/cli/commands/new-impl.ts
+++ b/packages/angular/cli/commands/new-impl.ts
@@ -50,15 +50,14 @@ export class NewCommand extends SchematicCommand {
     // Ensure skipGit has a boolean value.
     options.skipGit = options.skipGit === undefined ? false : options.skipGit;
 
-    options = this.removeLocalOptions(options);
-
     return this.runSchematic({
       collectionName: collectionName,
       schematicName: this.schematicName,
-      schematicOptions: options,
+      schematicOptions: this.removeLocalOptions(options),
       debug: options.debug,
       dryRun: options.dryRun,
       force: options.force,
+      interactive: options.interactive,
     });
   }
 
@@ -72,6 +71,7 @@ export class NewCommand extends SchematicCommand {
     const opts = Object.assign({}, options);
     delete opts.verbose;
     delete opts.collection;
+    delete opts.interactive;
 
     return opts;
   }
diff --git a/packages/angular/cli/commands/new.json b/packages/angular/cli/commands/new.json
index cf8104029909..b1f8db9f577b 100644
--- a/packages/angular/cli/commands/new.json
+++ b/packages/angular/cli/commands/new.json
@@ -33,6 +33,11 @@
       "default": false,
       "aliases": ["v"],
       "description": "Adds more details to output logging."
+    },
+    "interactive": {
+      "type": "boolean",
+      "default": "true",
+      "description": "Disables interactive inputs (i.e., prompts)."
     }
   },
   "required": []
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index 9f78d5b450ed..75714606c250 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -37,6 +37,7 @@ import {
   NodeWorkflow,
   validateOptionsWithSchema,
 } from '@angular-devkit/schematics/tools';
+import * as inquirer from 'inquirer';
 import { take } from 'rxjs/operators';
 import { WorkspaceLoader } from '../models/workspace-loader';
 import {
@@ -60,6 +61,7 @@ export interface RunSchematicOptions {
   dryRun: boolean;
   force: boolean;
   showNothingDone?: boolean;
+  interactive?: boolean;
 }
 
 export interface GetOptionsOptions {
@@ -279,6 +281,49 @@ export abstract class SchematicCommand extends Command {
       return undefined;
     });
 
+    if (options.interactive !== false && process.stdout.isTTY) {
+      workflow.registry.usePromptProvider((definitions: Array<schema.PromptDefinition>) => {
+        const questions: inquirer.Questions = definitions.map(definition => {
+          const question: inquirer.Question = {
+            name: definition.id,
+            message: definition.message,
+            default: definition.default,
+          };
+
+          const validator = definition.validator;
+          if (validator) {
+            question.validate = input => validator(input);
+          }
+
+          switch (definition.type) {
+            case 'confirmation':
+              question.type = 'confirm';
+              break;
+            case 'list':
+              question.type = 'list';
+              question.choices = definition.items && definition.items.map(item => {
+                if (typeof item == 'string') {
+                  return item;
+                } else {
+                  return {
+                    name: item.label,
+                    value: item.value,
+                  };
+                }
+              });
+              break;
+            default:
+              question.type = definition.type;
+              break;
+          }
+
+          return question;
+        });
+
+        return inquirer.prompt(questions);
+      });
+    }
+
     workflow.reporter.subscribe((event: DryRunEvent) => {
       nothingDone = false;
 
diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 38b778a03d0d..6c658e474a02 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -35,9 +35,9 @@
     "@angular-devkit/schematics": "0.0.0",
     "@schematics/angular": "0.0.0",
     "@schematics/update": "0.0.0",
+    "inquirer": "^6.1.0",
     "json-schema-traverse": "^0.4.1",
     "opn": "^5.3.0",
-    "json-schema-traverse": "^0.4.1",
     "rxjs": "^6.0.0",
     "semver": "^5.1.0",
     "symbol-observable": "^1.2.0",
diff --git a/yarn.lock b/yarn.lock
index d5e23db55b07..88e1463881ab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -181,6 +181,13 @@
     "@types/events" "*"
     "@types/node" "*"
 
+"@types/inquirer@^0.0.42":
+  version "0.0.42"
+  resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-0.0.42.tgz#2310fd8623053bead72247adae416aa32bacdf0c"
+  dependencies:
+    "@types/rx" "*"
+    "@types/through" "*"
+
 "@types/istanbul@^0.4.30":
   version "0.4.30"
   resolved "https://registry.yarnpkg.com/@types/istanbul/-/istanbul-0.4.30.tgz#073159320ab3296b2cfeb481f756a1f8f4c9c8e4"
@@ -237,6 +244,94 @@
     "@types/node" "*"
     "@types/tough-cookie" "*"
 
+"@types/rx-core-binding@*":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@types/rx-core-binding/-/rx-core-binding-4.0.4.tgz#d969d32f15a62b89e2862c17b3ee78fe329818d3"
+  dependencies:
+    "@types/rx-core" "*"
+
+"@types/rx-core@*":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@types/rx-core/-/rx-core-4.0.3.tgz#0b3354b1238cedbe2b74f6326f139dbc7a591d60"
+
+"@types/rx-lite-aggregates@*":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@types/rx-lite-aggregates/-/rx-lite-aggregates-4.0.3.tgz#6efb2b7f3d5f07183a1cb2bd4b1371d7073384c2"
+  dependencies:
+    "@types/rx-lite" "*"
+
+"@types/rx-lite-async@*":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/rx-lite-async/-/rx-lite-async-4.0.2.tgz#27fbf0caeff029f41e2d2aae638b05e91ceb600c"
+  dependencies:
+    "@types/rx-lite" "*"
+
+"@types/rx-lite-backpressure@*":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@types/rx-lite-backpressure/-/rx-lite-backpressure-4.0.3.tgz#05abb19bdf87cc740196c355e5d0b37bb50b5d56"
+  dependencies:
+    "@types/rx-lite" "*"
+
+"@types/rx-lite-coincidence@*":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@types/rx-lite-coincidence/-/rx-lite-coincidence-4.0.3.tgz#80bd69acc4054a15cdc1638e2dc8843498cd85c0"
+  dependencies:
+    "@types/rx-lite" "*"
+
+"@types/rx-lite-experimental@*":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@types/rx-lite-experimental/-/rx-lite-experimental-4.0.1.tgz#c532f5cbdf3f2c15da16ded8930d1b2984023cbd"
+  dependencies:
+    "@types/rx-lite" "*"
+
+"@types/rx-lite-joinpatterns@*":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@types/rx-lite-joinpatterns/-/rx-lite-joinpatterns-4.0.1.tgz#f70fe370518a8432f29158cc92ffb56b4e4afc3e"
+  dependencies:
+    "@types/rx-lite" "*"
+
+"@types/rx-lite-testing@*":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@types/rx-lite-testing/-/rx-lite-testing-4.0.1.tgz#21b19d11f4dfd6ffef5a9d1648e9c8879bfe21e9"
+  dependencies:
+    "@types/rx-lite-virtualtime" "*"
+
+"@types/rx-lite-time@*":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@types/rx-lite-time/-/rx-lite-time-4.0.3.tgz#0eda65474570237598f3448b845d2696f2dbb1c4"
+  dependencies:
+    "@types/rx-lite" "*"
+
+"@types/rx-lite-virtualtime@*":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@types/rx-lite-virtualtime/-/rx-lite-virtualtime-4.0.3.tgz#4b30cacd0fe2e53af29f04f7438584c7d3959537"
+  dependencies:
+    "@types/rx-lite" "*"
+
+"@types/rx-lite@*":
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/@types/rx-lite/-/rx-lite-4.0.5.tgz#b3581525dff69423798daa9a0d33c1e66a5e8c4c"
+  dependencies:
+    "@types/rx-core" "*"
+    "@types/rx-core-binding" "*"
+
+"@types/rx@*":
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@types/rx/-/rx-4.1.1.tgz#598fc94a56baed975f194574e0f572fd8e627a48"
+  dependencies:
+    "@types/rx-core" "*"
+    "@types/rx-core-binding" "*"
+    "@types/rx-lite" "*"
+    "@types/rx-lite-aggregates" "*"
+    "@types/rx-lite-async" "*"
+    "@types/rx-lite-backpressure" "*"
+    "@types/rx-lite-coincidence" "*"
+    "@types/rx-lite-experimental" "*"
+    "@types/rx-lite-joinpatterns" "*"
+    "@types/rx-lite-testing" "*"
+    "@types/rx-lite-time" "*"
+    "@types/rx-lite-virtualtime" "*"
+
 "@types/selenium-webdriver@^3.0.0":
   version "3.0.10"
   resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.10.tgz#e98cc6f05b4b436277671c784ee2f9d05a634f9b"
@@ -270,6 +365,12 @@
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.4.tgz#b4ffc7dc97b498c969b360a41eee247f82616370"
 
+"@types/through@*":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@types/through/-/through-0.0.29.tgz#72943aac922e179339c651fa34a4428a4d722f93"
+  dependencies:
+    "@types/node" "*"
+
 "@types/tough-cookie@*":
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-2.3.3.tgz#7f226d67d654ec9070e755f46daebf014628e9d9"
@@ -553,6 +654,10 @@ ansi-align@^2.0.0:
   dependencies:
     string-width "^2.0.0"
 
+ansi-escapes@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
+
 ansi-html@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
@@ -1307,7 +1412,7 @@ chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.3.2, chalk@^2.4.1:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.3.2, chalk@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
   dependencies:
@@ -1315,6 +1420,10 @@ chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.3.2, chalk@^2.4
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+chardet@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.5.0.tgz#fe3ac73c00c3d865ffcc02a0682e2c20b6a06029"
+
 chokidar@^1.4.2:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
@@ -1403,6 +1512,16 @@ cli-boxes@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
 
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  dependencies:
+    restore-cursor "^2.0.0"
+
+cli-width@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
+
 cliui@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
@@ -2653,6 +2772,14 @@ extend@^3.0.0, extend@~3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
 
+external-editor@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.1.tgz#fc9638c4d7cde4f0bb82b12307a1a23912c492e3"
+  dependencies:
+    chardet "^0.5.0"
+    iconv-lite "^0.4.22"
+    tmp "^0.0.33"
+
 extglob@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
@@ -2724,6 +2851,12 @@ figgy-pudding@^3.1.0:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.4.1.tgz#af66da1991fa2f94ff7f33b545a38ea4b3869696"
 
+figures@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
 file-loader@^1.1.11:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.11.tgz#6fe886449b0f2a936e43cabaac0cdbfb369506f8"
@@ -3463,6 +3596,12 @@ iconv-lite@0.4.23, iconv-lite@^0.4.4:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
+iconv-lite@^0.4.22:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
 ieee754@^1.1.11, ieee754@^1.1.4:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
@@ -3561,6 +3700,24 @@ injection-js@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/injection-js/-/injection-js-2.2.1.tgz#a8d6a085b2f0b8d8650f6f4487f6abb8cc0d67ce"
 
+inquirer@^6.1.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.0"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.0"
+    figures "^2.0.0"
+    lodash "^4.17.10"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rxjs "^6.1.0"
+    string-width "^2.1.0"
+    strip-ansi "^4.0.0"
+    through "^2.3.6"
+
 internal-ip@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-1.2.0.tgz#ae9fbf93b984878785d50a8de1b356956058cf5c"
@@ -4412,7 +4569,7 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
-lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0, lodash@~4.17.10:
+lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.5.0, lodash@~4.17.10:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
@@ -4818,6 +4975,10 @@ multicast-dns@^6.0.1:
     dns-packet "^1.3.1"
     thunky "^1.0.2"
 
+mute-stream@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+
 nan@^2.10.0, nan@^2.9.2:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
@@ -5193,6 +5354,12 @@ one-time@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz#f8cdf77884826fe4dff93e3a9cc37b1e4480742e"
 
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  dependencies:
+    mimic-fn "^1.0.0"
+
 opn@^5.1.0, opn@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
@@ -6116,6 +6283,13 @@ responselike@1.0.2:
   dependencies:
     lowercase-keys "^1.0.0"
 
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  dependencies:
+    onetime "^2.0.0"
+    signal-exit "^3.0.2"
+
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -6185,13 +6359,19 @@ rollup@^0.64.0:
     "@types/estree" "0.0.39"
     "@types/node" "*"
 
+run-async@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+  dependencies:
+    is-promise "^2.1.0"
+
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
   dependencies:
     aproba "^1.1.1"
 
-rxjs@6.0.0, rxjs@^6.0.0:
+rxjs@6.0.0, rxjs@^6.0.0, rxjs@^6.1.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0.tgz#d647e029b5854617f994c82fe57a4c6747b352da"
   dependencies:
@@ -6830,7 +7010,7 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1:
+"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   dependencies:
@@ -7010,7 +7190,7 @@ through2@^2.0.0, through2@^2.0.2, through2@^2.0.3:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
-through@2, "through@>=2.2.7 <3", through@X.X.X:
+through@2, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
@@ -7034,7 +7214,7 @@ tmp@0.0.30:
   dependencies:
     os-tmpdir "~1.0.1"
 
-tmp@0.0.33, tmp@0.0.x:
+tmp@0.0.33, tmp@0.0.x, tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
   dependencies:

From cdbc1988f28ce4f2c2509efb9ebd10e727facbdd Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 17 Aug 2018 11:42:18 -0400
Subject: [PATCH 0017/1703] feat(@angular-devkit/schematics): allow schematic
 rules to control interactivity

---
 .../schematics/src/engine/engine.ts           | 13 +++++++++++-
 .../schematics/src/engine/interface.ts        |  9 ++++++++
 .../schematics/src/engine/schematic.ts        |  6 ++++--
 .../schematics/src/rules/schematic.ts         | 21 ++++++++++++-------
 .../schematics/tools/fallback-engine-host.ts  |  9 ++++----
 .../tools/file-system-engine-host-base.ts     |  9 ++++++--
 .../tools/schema-option-transform.ts          | 12 ++++++++---
 7 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/packages/angular_devkit/schematics/src/engine/engine.ts b/packages/angular_devkit/schematics/src/engine/engine.ts
index 7bcff545af15..4222a904ce11 100644
--- a/packages/angular_devkit/schematics/src/engine/engine.ts
+++ b/packages/angular_devkit/schematics/src/engine/engine.ts
@@ -18,6 +18,7 @@ import {
   CollectionDescription,
   Engine,
   EngineHost,
+  ExecutionOptions,
   Schematic,
   SchematicContext,
   SchematicDescription,
@@ -215,12 +216,20 @@ export class SchematicEngine<CollectionT extends object, SchematicT extends obje
   createContext(
     schematic: Schematic<CollectionT, SchematicT>,
     parent?: Partial<TypedSchematicContext<CollectionT, SchematicT>>,
+    executionOptions?: Partial<ExecutionOptions>,
   ): TypedSchematicContext<CollectionT, SchematicT> {
     // Check for inconsistencies.
     if (parent && parent.engine && parent.engine !== this) {
       throw new SchematicEngineConflictingException();
     }
 
+    let interactive = true;
+    if (executionOptions && executionOptions.interactive != undefined) {
+      interactive = executionOptions.interactive;
+    } else if (parent && parent.interactive != undefined) {
+      interactive = parent.interactive;
+    }
+
     let context: TypedSchematicContext<CollectionT, SchematicT> = {
       debug: parent && parent.debug || false,
       engine: this,
@@ -229,6 +238,7 @@ export class SchematicEngine<CollectionT extends object, SchematicT extends obje
       schematic,
       strategy: (parent && parent.strategy !== undefined)
         ? parent.strategy : this.defaultMergeStrategy,
+      interactive,
       addTask,
     };
 
@@ -325,8 +335,9 @@ export class SchematicEngine<CollectionT extends object, SchematicT extends obje
   transformOptions<OptionT extends object, ResultT extends object>(
     schematic: Schematic<CollectionT, SchematicT>,
     options: OptionT,
+    context?: TypedSchematicContext<CollectionT, SchematicT>,
   ): Observable<ResultT> {
-    return this._host.transformOptions<OptionT, ResultT>(schematic.description, options);
+    return this._host.transformOptions<OptionT, ResultT>(schematic.description, options, context);
   }
 
   createSourceFromUrl(url: Url, context: TypedSchematicContext<CollectionT, SchematicT>): Source {
diff --git a/packages/angular_devkit/schematics/src/engine/interface.ts b/packages/angular_devkit/schematics/src/engine/interface.ts
index 2bcb6b9a6c33..0e43788c2340 100644
--- a/packages/angular_devkit/schematics/src/engine/interface.ts
+++ b/packages/angular_devkit/schematics/src/engine/interface.ts
@@ -41,6 +41,10 @@ export interface TaskInfo {
   readonly context: SchematicContext;
 }
 
+export interface ExecutionOptions {
+  interactive: boolean;
+}
+
 /**
  * The description (metadata) of a collection. This type contains every information the engine
  * needs to run. The CollectionMetadataT type parameter contains additional metadata that you
@@ -92,6 +96,7 @@ export interface EngineHost<CollectionMetadataT extends object, SchematicMetadat
   transformOptions<OptionT extends object, ResultT extends object>(
     schematic: SchematicDescription<CollectionMetadataT, SchematicMetadataT>,
     options: OptionT,
+    context?: TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>,
   ): Observable<ResultT>;
   transformContext(
     context: TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>,
@@ -118,6 +123,7 @@ export interface Engine<CollectionMetadataT extends object, SchematicMetadataT e
   createContext(
     schematic: Schematic<CollectionMetadataT, SchematicMetadataT>,
     parent?: Partial<TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>>,
+    executionOptions?: Partial<ExecutionOptions>,
   ): TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>;
   createSchematic(
       name: string,
@@ -130,6 +136,7 @@ export interface Engine<CollectionMetadataT extends object, SchematicMetadataT e
   transformOptions<OptionT extends object, ResultT extends object>(
       schematic: Schematic<CollectionMetadataT, SchematicMetadataT>,
       options: OptionT,
+      context?: TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>,
   ): Observable<ResultT>;
   executePostTasks(): Observable<void>;
 
@@ -166,6 +173,7 @@ export interface Schematic<CollectionMetadataT extends object, SchematicMetadata
     options: OptionT,
     host: Observable<Tree>,
     parentContext?: Partial<TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>>,
+    executionOptions?: Partial<ExecutionOptions>,
   ): Observable<Tree>;
 }
 
@@ -181,6 +189,7 @@ export interface TypedSchematicContext<CollectionMetadataT extends object,
   readonly logger: logging.LoggerApi;
   readonly schematic: Schematic<CollectionMetadataT, SchematicMetadataT>;
   readonly strategy: MergeStrategy;
+  readonly interactive: boolean;
   addTask<T>(task: TaskConfigurationGenerator<T>, dependencies?: Array<TaskId>): TaskId;
 }
 
diff --git a/packages/angular_devkit/schematics/src/engine/schematic.ts b/packages/angular_devkit/schematics/src/engine/schematic.ts
index 932fdd76285a..fd3acbf774df 100644
--- a/packages/angular_devkit/schematics/src/engine/schematic.ts
+++ b/packages/angular_devkit/schematics/src/engine/schematic.ts
@@ -13,6 +13,7 @@ import { Tree } from '../tree/interface';
 import {
   Collection,
   Engine,
+  ExecutionOptions,
   RuleFactory,
   Schematic,
   SchematicDescription,
@@ -46,13 +47,14 @@ export class SchematicImpl<CollectionT extends object, SchematicT extends object
     options: OptionT,
     host: Observable<Tree>,
     parentContext?: Partial<TypedSchematicContext<CollectionT, SchematicT>>,
+    executionOptions?: Partial<ExecutionOptions>,
   ): Observable<Tree> {
-    const context = this._engine.createContext(this, parentContext);
+    const context = this._engine.createContext(this, parentContext, executionOptions);
 
     return host
       .pipe(
         first(),
-        concatMap(tree => this._engine.transformOptions(this, options).pipe(
+        concatMap(tree => this._engine.transformOptions(this, options, context).pipe(
           map(o => [tree, o]),
         )),
         concatMap(([tree, transformedOptions]: [Tree, OptionT]) => {
diff --git a/packages/angular_devkit/schematics/src/rules/schematic.ts b/packages/angular_devkit/schematics/src/rules/schematic.ts
index 7d7a01cfd258..6885ad9bacb6 100644
--- a/packages/angular_devkit/schematics/src/rules/schematic.ts
+++ b/packages/angular_devkit/schematics/src/rules/schematic.ts
@@ -7,7 +7,7 @@
  */
 import { of as observableOf } from 'rxjs';
 import { last, map } from 'rxjs/operators';
-import { Rule, SchematicContext } from '../engine/interface';
+import { ExecutionOptions, Rule, SchematicContext } from '../engine/interface';
 import { MergeStrategy, Tree } from '../tree/interface';
 import { branch } from '../tree/static';
 
@@ -19,14 +19,17 @@ import { branch } from '../tree/static';
  * @param schematicName The name of the schematic to run.
  * @param options The options to pass as input to the RuleFactory.
  */
-export function externalSchematic<OptionT extends object>(collectionName: string,
-                                                          schematicName: string,
-                                                          options: OptionT): Rule {
+export function externalSchematic<OptionT extends object>(
+  collectionName: string,
+  schematicName: string,
+  options: OptionT,
+  executionOptions?: Partial<ExecutionOptions>,
+): Rule {
   return (input: Tree, context: SchematicContext) => {
     const collection = context.engine.createCollection(collectionName);
     const schematic = collection.createSchematic(schematicName);
 
-    return schematic.call(options, observableOf(branch(input)), context);
+    return schematic.call(options, observableOf(branch(input)), context, executionOptions);
   };
 }
 
@@ -37,12 +40,16 @@ export function externalSchematic<OptionT extends object>(collectionName: string
  * @param schematicName The name of the schematic to run.
  * @param options The options to pass as input to the RuleFactory.
  */
-export function schematic<OptionT extends object>(schematicName: string, options: OptionT): Rule {
+export function schematic<OptionT extends object>(
+  schematicName: string,
+  options: OptionT,
+  executionOptions?: Partial<ExecutionOptions>,
+): Rule {
   return (input: Tree, context: SchematicContext) => {
     const collection = context.schematic.collection;
     const schematic = collection.createSchematic(schematicName, true);
 
-    return schematic.call(options, observableOf(branch(input)), context).pipe(
+    return schematic.call(options, observableOf(branch(input)), context, executionOptions).pipe(
       last(),
       map(x => {
         // We allow overwrite conflict here because they're the only merge conflict we particularly
diff --git a/packages/angular_devkit/schematics/tools/fallback-engine-host.ts b/packages/angular_devkit/schematics/tools/fallback-engine-host.ts
index a9c327cbc7e0..7dd9849bef24 100644
--- a/packages/angular_devkit/schematics/tools/fallback-engine-host.ts
+++ b/packages/angular_devkit/schematics/tools/fallback-engine-host.ts
@@ -31,10 +31,6 @@ export type FallbackSchematicDescription = {
 };
 export type FallbackContext =
   TypedSchematicContext<FallbackCollectionDescription, FallbackSchematicDescription>;
-export declare type OptionTransform<T extends object, R extends object> = (
-  schematic: SchematicDescription<FallbackCollectionDescription, FallbackSchematicDescription>,
-  options: T,
-) => Observable<R>;
 
 
 /**
@@ -93,9 +89,12 @@ export class FallbackEngineHost implements EngineHost<{}, {}> {
   transformOptions<OptionT extends object, ResultT extends object>(
     schematic: SchematicDescription<FallbackCollectionDescription, FallbackSchematicDescription>,
     options: OptionT,
+    context?: FallbackContext,
   ): Observable<ResultT> {
     return (observableOf(options)
-      .pipe(...this._hosts.map(host => mergeMap(opt => host.transformOptions(schematic, opt))))
+      .pipe(...this._hosts
+        .map(host => mergeMap(opt => host.transformOptions(schematic, opt, context))),
+      )
     ) as {} as Observable<ResultT>;
   }
 
diff --git a/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts b/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts
index bc5d19fac843..7c3ed9c808d4 100644
--- a/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts
+++ b/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts
@@ -39,7 +39,11 @@ import { readJsonFile } from './file-system-utility';
 
 
 export declare type OptionTransform<T extends object, R extends object>
-    = (schematic: FileSystemSchematicDescription, options: T) => Observable<R>;
+    = (
+      schematic: FileSystemSchematicDescription,
+      options: T,
+      context?: FileSystemSchematicContext,
+    ) => Observable<R>;
 
 
 export class CollectionCannotBeResolvedException extends BaseException {
@@ -269,11 +273,12 @@ export abstract class FileSystemEngineHostBase implements
   transformOptions<OptionT extends object, ResultT extends object>(
     schematic: FileSystemSchematicDesc,
     options: OptionT,
+    context?: FileSystemSchematicContext,
   ): Observable<ResultT> {
     return (observableOf(options)
       .pipe(
         ...this._transforms.map(tFn => mergeMap(opt => {
-          const newOptions = tFn(schematic, opt);
+          const newOptions = tFn(schematic, opt, context);
           if (isObservable(newOptions)) {
             return newOptions;
           } else {
diff --git a/packages/angular_devkit/schematics/tools/schema-option-transform.ts b/packages/angular_devkit/schematics/tools/schema-option-transform.ts
index 1827b1106f62..1c7491ecb60a 100644
--- a/packages/angular_devkit/schematics/tools/schema-option-transform.ts
+++ b/packages/angular_devkit/schematics/tools/schema-option-transform.ts
@@ -8,7 +8,7 @@
 import { deepCopy, schema } from '@angular-devkit/core';
 import { Observable, of as observableOf } from 'rxjs';
 import { first, map, mergeMap } from 'rxjs/operators';
-import { FileSystemSchematicDescription } from './description';
+import { FileSystemSchematicContext, FileSystemSchematicDescription } from './description';
 
 export class InvalidInputOptions<T = {}> extends schema.SchemaValidationException {
   constructor(options: T, errors: schema.SchemaValidatorError[]) {
@@ -21,16 +21,22 @@ export class InvalidInputOptions<T = {}> extends schema.SchemaValidationExceptio
 
 // This can only be used in NodeJS.
 export function validateOptionsWithSchema(registry: schema.SchemaRegistry) {
-  return <T extends {}>(schematic: FileSystemSchematicDescription, options: T): Observable<T> => {
+  return <T extends {}>(
+    schematic: FileSystemSchematicDescription,
+    options: T,
+    context?: FileSystemSchematicContext,
+  ): Observable<T> => {
     // Prevent a schematic from changing the options object by making a copy of it.
     options = deepCopy(options);
 
+    const withPrompts = context ? context.interactive : true;
+
     if (schematic.schema && schematic.schemaJson) {
       // Make a deep copy of options.
       return registry
         .compile(schematic.schemaJson)
         .pipe(
-          mergeMap(validator => validator(options)),
+          mergeMap(validator => validator(options, { withPrompts })),
           first(),
           map(result => {
             if (!result.success) {

From d299ef7ff710b5408dee0c1d0f80bf5c8660967a Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 21 Aug 2018 13:45:57 -0400
Subject: [PATCH 0018/1703] fix(@angular-devkit/core): correctly resolve schema
 references

---
 .../core/src/json/schema/registry.ts          | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/packages/angular_devkit/core/src/json/schema/registry.ts b/packages/angular_devkit/core/src/json/schema/registry.ts
index 27e82270ad69..b16d79495839 100644
--- a/packages/angular_devkit/core/src/json/schema/registry.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry.ts
@@ -171,23 +171,21 @@ export class CoreSchemaRegistry implements SchemaRegistry {
     ref: string,
     validate: ajv.ValidateFunction,
   ): { context?: ajv.ValidateFunction, schema?: JsonObject } {
-    if (!validate) {
+    if (!validate || !validate.refs || !validate.refVal || !ref) {
       return {};
     }
 
-    const refHash = ref.split('#', 2)[1];
-    const refUrl = ref.startsWith('#') ? ref : ref.split('#', 1);
-
-    if (!ref.startsWith('#')) {
-      // tslint:disable-next-line:no-any
-      validate = (validate.refVal as any)[(validate.refs as any)[refUrl[0]]];
-    }
-    if (validate && refHash) {
-      // tslint:disable-next-line:no-any
-      validate = (validate.refVal as any)[(validate.refs as any)['#' + refHash]];
+    // tslint:disable-next-line:no-any
+    const id = (validate.schema as any).$id || (validate.schema as any).id;
+    let fullReference = (ref[0] === '#' && id) ? id + ref : ref;
+    if (fullReference.endsWith('#')) {
+      fullReference = fullReference.slice(0, -1);
     }
 
-    return { context: validate, schema: validate && validate.schema as JsonObject };
+    // tslint:disable-next-line:no-any
+    const context = validate.refVal[(validate.refs as any)[fullReference]];
+
+    return { context, schema: context && context.schema as JsonObject };
   }
 
   compile(schema: JsonObject): Observable<SchemaValidator> {

From e177849f44621bb2fbbe96a19d32213c4050fedc Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 21 Aug 2018 21:31:06 -0400
Subject: [PATCH 0019/1703] fix(@angular/cli): correct update command packages
 option type

---
 packages/angular/cli/commands/update.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/commands/update.json b/packages/angular/cli/commands/update.json
index dd66520136e0..7a47adf3c7bb 100644
--- a/packages/angular/cli/commands/update.json
+++ b/packages/angular/cli/commands/update.json
@@ -11,7 +11,10 @@
   "type": "object",
   "properties": {
     "packages": {
-      "type": "string",
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
       "description": "The names of package(s) to update",
       "$default": {
         "$source": "argv"

From e0882a754995af7ee1d4c875de4642f43504a79a Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 22 Aug 2018 12:28:24 -0400
Subject: [PATCH 0020/1703] fix(@angular-devkit/core): make workspace projects
 field not required

It has a default which makes the required aspect void.
Global files also do not have projects.
---
 .../angular_devkit/core/src/workspace/workspace-schema.json    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/angular_devkit/core/src/workspace/workspace-schema.json b/packages/angular_devkit/core/src/workspace/workspace-schema.json
index 9fd692661630..a030a6753d55 100644
--- a/packages/angular_devkit/core/src/workspace/workspace-schema.json
+++ b/packages/angular_devkit/core/src/workspace/workspace-schema.json
@@ -48,8 +48,7 @@
   },
   "additionalProperties": false,
   "required": [
-    "version",
-    "projects"
+    "version"
   ],
   "definitions": {
     "project": {

From fd6bba38a008c6ff89584c3edf8ff5ab326f51d1 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 22 Aug 2018 13:03:32 -0400
Subject: [PATCH 0021/1703] fix(@angular/cli): properly type config command
 value option

---
 packages/angular/cli/commands/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular/cli/commands/config.json b/packages/angular/cli/commands/config.json
index 0caaa4f5415a..cdcce065041c 100644
--- a/packages/angular/cli/commands/config.json
+++ b/packages/angular/cli/commands/config.json
@@ -20,7 +20,7 @@
       }
     },
     "value": {
-      "type": "string",
+      "type": ["string", "number", "boolean"],
       "description": "The new value to be set.",
       "$default": {
         "$source": "argv",

From 9af2368481bc3c869f138c942e0177fa9e2c2c5a Mon Sep 17 00:00:00 2001
From: clydin <19598772+clydin@users.noreply.github.com>
Date: Wed, 29 Aug 2018 12:26:30 -0400
Subject: [PATCH 0022/1703] ci: continue even if lint or validate fail (#12011)

---
 .circleci/config.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c02a15a576f5..bab56e835e84 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -140,12 +140,10 @@ workflows:
             - install
       - build:
           requires:
-            - lint
-            - validate
+            - install
       - build-bazel:
           requires:
-            - lint
-            - validate
+            - build
       - test:
           requires:
             - build
@@ -167,6 +165,7 @@ workflows:
           requires:
             - test
             - build
+            - e2e-cli
             - snapshot_publish
           filters:
             tags:

From 67e32a8f2536132e594a00f28ebc7aebb5b8949f Mon Sep 17 00:00:00 2001
From: clydin <19598772+clydin@users.noreply.github.com>
Date: Wed, 29 Aug 2018 12:26:52 -0400
Subject: [PATCH 0023/1703] fix(@angular-devkit/build-angular): improve bundle
 size value parsing (#12026)

Fixes #12013
---
 .../plugins/bundle-budget.ts                  | 36 ++++-----
 .../utilities/bundle-calculator.ts            | 74 +++++++++--------
 .../utilities/bundle-calculator_spec.ts       | 80 +++++++++++++++++++
 3 files changed, 133 insertions(+), 57 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator_spec.ts

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/bundle-budget.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/bundle-budget.ts
index 6400ce9491b9..4ee676886846 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/bundle-budget.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/bundle-budget.ts
@@ -1,6 +1,3 @@
-// tslint:disable
-// TODO: cleanup this file, it's copied as is from Angular CLI.
-
 /**
  * @license
  * Copyright Google Inc. All Rights Reserved.
@@ -8,9 +5,9 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { Size, calculateBytes, calculateSizes } from '../utilities/bundle-calculator';
+import { Compiler, compilation } from 'webpack';
 import { Budget } from '../../browser/schema';
+import { Size, calculateBytes, calculateSizes } from '../utilities/bundle-calculator';
 import { formatSize } from '../utilities/stats';
 
 interface Thresholds {
@@ -31,19 +28,20 @@ export interface BundleBudgetPluginOptions {
 export class BundleBudgetPlugin {
   constructor(private options: BundleBudgetPluginOptions) { }
 
-  apply(compiler: any): void {
+  apply(compiler: Compiler): void {
     const { budgets } = this.options;
-    compiler.hooks.afterEmit.tap('BundleBudgetPlugin', (compilation: any) => {
+    compiler.hooks.afterEmit.tap('BundleBudgetPlugin', (compilation: compilation.Compilation) => {
       if (!budgets || budgets.length === 0) {
         return;
       }
 
       budgets.map(budget => {
         const thresholds = this.calculate(budget);
+
         return {
           budget,
           thresholds,
-          sizes: calculateSizes(budget, compilation)
+          sizes: calculateSizes(budget, compilation),
         };
       })
         .forEach(budgetCheck => {
@@ -62,7 +60,7 @@ export class BundleBudgetPlugin {
     });
   }
 
-  private checkMinimum(threshold: number | undefined, size: Size, messages: any) {
+  private checkMinimum(threshold: number | undefined, size: Size, messages: string[]) {
     if (threshold) {
       if (threshold > size.size) {
         const sizeDifference = formatSize(threshold - size.size);
@@ -72,7 +70,7 @@ export class BundleBudgetPlugin {
     }
   }
 
-  private checkMaximum(threshold: number | undefined, size: Size, messages: any) {
+  private checkMaximum(threshold: number | undefined, size: Size, messages: string[]) {
     if (threshold) {
       if (threshold < size.size) {
         const sizeDifference = formatSize(size.size - threshold);
@@ -83,37 +81,37 @@ export class BundleBudgetPlugin {
   }
 
   private calculate(budget: Budget): Thresholds {
-    let thresholds: Thresholds = {};
+    const thresholds: Thresholds = {};
     if (budget.maximumWarning) {
-      thresholds.maximumWarning = calculateBytes(budget.maximumWarning, budget.baseline, 'pos');
+      thresholds.maximumWarning = calculateBytes(budget.maximumWarning, budget.baseline, 1);
     }
 
     if (budget.maximumError) {
-      thresholds.maximumError = calculateBytes(budget.maximumError, budget.baseline, 'pos');
+      thresholds.maximumError = calculateBytes(budget.maximumError, budget.baseline, 1);
     }
 
     if (budget.minimumWarning) {
-      thresholds.minimumWarning = calculateBytes(budget.minimumWarning, budget.baseline, 'neg');
+      thresholds.minimumWarning = calculateBytes(budget.minimumWarning, budget.baseline, -1);
     }
 
     if (budget.minimumError) {
-      thresholds.minimumError = calculateBytes(budget.minimumError, budget.baseline, 'neg');
+      thresholds.minimumError = calculateBytes(budget.minimumError, budget.baseline, -1);
     }
 
     if (budget.warning) {
-      thresholds.warningLow = calculateBytes(budget.warning, budget.baseline, 'neg');
+      thresholds.warningLow = calculateBytes(budget.warning, budget.baseline, -1);
     }
 
     if (budget.warning) {
-      thresholds.warningHigh = calculateBytes(budget.warning, budget.baseline, 'pos');
+      thresholds.warningHigh = calculateBytes(budget.warning, budget.baseline, 1);
     }
 
     if (budget.error) {
-      thresholds.errorLow = calculateBytes(budget.error, budget.baseline, 'neg');
+      thresholds.errorLow = calculateBytes(budget.error, budget.baseline, -1);
     }
 
     if (budget.error) {
-      thresholds.errorHigh = calculateBytes(budget.error, budget.baseline, 'pos');
+      thresholds.errorHigh = calculateBytes(budget.error, budget.baseline, 1);
     }
 
     return thresholds;
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator.ts
index a396b2f3801d..ca20d6fb386c 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator.ts
@@ -1,6 +1,3 @@
-// tslint:disable
-// TODO: cleanup this file, it's copied as is from Angular CLI.
-
 /**
  * @license
  * Copyright Google Inc. All Rights Reserved.
@@ -11,8 +8,8 @@
 import { Budget } from '../../browser/schema';
 
 export interface Compilation {
-  assets: any;
-  chunks: any[];
+  assets: { [name: string]: { size: () => number } };
+  chunks: { name: string, files: string[], isOnlyInitial: () => boolean }[];
   warnings: string[];
   errors: string[];
 }
@@ -33,6 +30,7 @@ export function calculateSizes(budget: Budget, compilation: Compilation): Size[]
   };
   const ctor = calculatorMap[budget.type];
   const calculator = new ctor(budget, compilation);
+
   return calculator.calculate();
 }
 
@@ -52,6 +50,7 @@ class BundleCalculator extends Calculator {
       .reduce((files, chunk) => [...files, ...chunk.files], [])
       .map((file: string) => this.compilation.assets[file].size())
       .reduce((total: number, size: number) => total + size, 0);
+
     return [{size, label: this.budget.name}];
   }
 }
@@ -67,6 +66,7 @@ class InitialCalculator extends Calculator {
       .filter((file: string) => !file.endsWith('.map'))
       .map((file: string) => this.compilation.assets[file].size())
       .reduce((total: number, size: number) => total + size, 0);
+
     return [{size, label: 'initial'}];
   }
 }
@@ -81,6 +81,7 @@ class AllScriptCalculator extends Calculator {
       .map(key => this.compilation.assets[key])
       .map(asset => asset.size())
       .reduce((total: number, size: number) => total + size, 0);
+
     return [{size, label: 'total scripts'}];
   }
 }
@@ -94,6 +95,7 @@ class AllCalculator extends Calculator {
       .filter(key => !key.endsWith('.map'))
       .map(key => this.compilation.assets[key].size())
       .reduce((total: number, size: number) => total + size, 0);
+
     return [{size, label: 'total'}];
   }
 }
@@ -107,9 +109,10 @@ class AnyScriptCalculator extends Calculator {
       .filter(key => key.endsWith('.js'))
       .map(key => {
         const asset = this.compilation.assets[key];
+
         return {
           size: asset.size(),
-          label: key
+          label: key,
         };
       });
   }
@@ -124,9 +127,10 @@ class AnyCalculator extends Calculator {
       .filter(key => !key.endsWith('.map'))
       .map(key => {
         const asset = this.compilation.assets[key];
+
         return {
           size: asset.size(),
-          label: key
+          label: key,
         };
       });
   }
@@ -135,39 +139,33 @@ class AnyCalculator extends Calculator {
 /**
  * Calculate the bytes given a string value.
  */
-export function calculateBytes(val: string, baseline?: string, factor?: ('pos' | 'neg')): number {
-  if (/^\d+$/.test(val)) {
-    return parseFloat(val);
+export function calculateBytes(
+  input: string,
+  baseline?: string,
+  factor: 1 | -1 = 1,
+): number {
+  const matches = input.match(/^\s*(\d+(?:\.\d+)?)\s*(%|(?:[mM]|[kK]|[gG])?[bB])?\s*$/);
+  if (!matches) {
+    return NaN;
   }
 
-  if (/^(\d+)%$/.test(val)) {
-    return calculatePercentBytes(val, baseline, factor);
+  const baselineBytes = baseline && calculateBytes(baseline) || 0;
+
+  let value = Number(matches[1]);
+  switch (matches[2] && matches[2].toLowerCase()) {
+    case '%':
+      value = baselineBytes * value / 100 * factor;
+      break;
+    case 'kb':
+      value *= 1024;
+      break;
+    case 'mb':
+      value *= 1024 * 1024;
+      break;
+    case 'gb':
+      value *= 1024 * 1024 * 1024;
+      break;
   }
 
-  const multiplier = getMultiplier(val);
-
-  const numberVal = parseFloat(val.replace(/((k|m|M|)b?)$/, ''));
-  const baselineVal = baseline ? parseFloat(baseline.replace(/((k|m|M|)b?)$/, '')) : 0;
-  const baselineMultiplier = baseline ? getMultiplier(baseline) : 1;
-  const factorMultiplier = factor ? (factor === 'pos' ? 1 : -1) : 1;
-
-  return numberVal * multiplier + baselineVal * baselineMultiplier * factorMultiplier;
-}
-
-function getMultiplier(val: string): number {
-  if (/^(\d+)b?$/.test(val)) {
-    return 1;
-  } else if (/^(\d+)kb$/.test(val)) {
-    return 1000;
-  } else if (/^(\d+)(m|M)b$/.test(val)) {
-    return 1000 * 1000;
-  } else {
-    return 1;
-  }
-}
-
-function calculatePercentBytes(val: string, baseline?: string, factor?: ('pos' | 'neg')): number {
-  const baselineBytes = calculateBytes(baseline as string);
-  const percentage = parseFloat(val.replace(/%/g, ''));
-  return baselineBytes + baselineBytes * percentage / 100 * (factor === 'pos' ? 1 : -1);
+  return value + baselineBytes;
 }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator_spec.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator_spec.ts
new file mode 100644
index 000000000000..c610706ebe0c
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator_spec.ts
@@ -0,0 +1,80 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { calculateBytes } from './bundle-calculator';
+
+describe('bundle-calculator', () => {
+  it('converts an integer with no postfix', () => {
+    expect(calculateBytes('0')).toBe(0);
+    expect(calculateBytes('5')).toBe(5);
+    expect(calculateBytes('190')).toBe(190);
+    expect(calculateBytes('92')).toBe(92);
+  });
+
+  it('converts a decimal with no postfix', () => {
+    expect(calculateBytes('3.14')).toBe(3.14);
+    expect(calculateBytes('0.25')).toBe(0.25);
+    expect(calculateBytes('90.5')).toBe(90.5);
+    expect(calculateBytes('25.0')).toBe(25);
+  });
+
+  it('converts an integer with kb postfix', () => {
+    expect(calculateBytes('0kb')).toBe(0);
+    expect(calculateBytes('5kb')).toBe(5 * 1024);
+    expect(calculateBytes('190KB')).toBe(190 * 1024);
+    expect(calculateBytes('92Kb')).toBe(92 * 1024);
+    expect(calculateBytes('25kB')).toBe(25 * 1024);
+  });
+
+  it('converts a decimal with kb postfix', () => {
+    expect(calculateBytes('3.14kb')).toBe(3.14 * 1024);
+    expect(calculateBytes('0.25KB')).toBe(0.25 * 1024);
+    expect(calculateBytes('90.5Kb')).toBe(90.5 * 1024);
+    expect(calculateBytes('25.0kB')).toBe(25 * 1024);
+  });
+
+  it('converts an integer with mb postfix', () => {
+    expect(calculateBytes('0mb')).toBe(0);
+    expect(calculateBytes('5mb')).toBe(5 * 1024 * 1024);
+    expect(calculateBytes('190MB')).toBe(190 * 1024 * 1024);
+    expect(calculateBytes('92Mb')).toBe(92 * 1024 * 1024);
+    expect(calculateBytes('25mB')).toBe(25 * 1024 * 1024);
+  });
+
+  it('converts a decimal with mb postfix', () => {
+    expect(calculateBytes('3.14mb')).toBe(3.14 * 1024 * 1024);
+    expect(calculateBytes('0.25MB')).toBe(0.25 * 1024 * 1024);
+    expect(calculateBytes('90.5Mb')).toBe(90.5 * 1024 * 1024);
+    expect(calculateBytes('25.0mB')).toBe(25 * 1024 * 1024);
+  });
+
+  it('converts an integer with gb postfix', () => {
+    expect(calculateBytes('0gb')).toBe(0);
+    expect(calculateBytes('5gb')).toBe(5 * 1024 * 1024 * 1024);
+    expect(calculateBytes('190GB')).toBe(190 * 1024 * 1024 * 1024);
+    expect(calculateBytes('92Gb')).toBe(92 * 1024 * 1024 * 1024);
+    expect(calculateBytes('25gB')).toBe(25 * 1024 * 1024 * 1024);
+  });
+
+  it('converts a decimal with gb postfix', () => {
+    expect(calculateBytes('3.14gb')).toBe(3.14 * 1024 * 1024 * 1024);
+    expect(calculateBytes('0.25GB')).toBe(0.25 * 1024 * 1024 * 1024);
+    expect(calculateBytes('90.5Gb')).toBe(90.5 * 1024 * 1024 * 1024);
+    expect(calculateBytes('25.0gB')).toBe(25 * 1024 * 1024 * 1024);
+  });
+
+  it ('converts a percentage with baseline', () => {
+    expect(calculateBytes('20%', '1mb')).toBe(1024 * 1024 * 1.2);
+    expect(calculateBytes('20%', '1mb', -1)).toBe(1024 * 1024 * 0.8);
+  });
+
+  it ('supports whitespace', () => {
+    expect(calculateBytes(' 5kb ')).toBe(5 * 1024);
+    expect(calculateBytes('0.25 MB')).toBe(0.25 * 1024 * 1024);
+    expect(calculateBytes(' 20 % ', ' 1 mb ')).toBe(1024 * 1024 * 1.2);
+  });
+});

From a2342b6a75fee3181397f7a6e78642a62812640e Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 29 Aug 2018 18:27:21 +0200
Subject: [PATCH 0024/1703] feat(@angular-devkit/build-angular): remove
 inlining of assets in css (#12027)

BREAKING CHANGE: Assets under 10Kib are not longer inlined in css
---
 .../models/webpack-configs/styles.ts          | 41 +++++-------
 .../test/browser/styles_spec_large.ts         | 66 ++----------------
 .../e2e/tests/build/styles/inline-urls.ts     | 67 -------------------
 3 files changed, 21 insertions(+), 153 deletions(-)
 delete mode 100644 tests/legacy-cli/e2e/tests/build/styles/inline-urls.ts

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
index b8d067df5163..353e2b91ffc2 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
@@ -53,8 +53,6 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
   const extraPlugins: any[] = [];
   const cssSourceMap = buildOptions.sourceMap;
 
-  // Maximum resource size to inline (KiB)
-  const maximumInlineSize = 10;
   // Determine hashing format.
   const hashFormat = getOutputHashFormat(buildOptions.outputHashing as string);
   // Convert absolute resource URLs to account for base-href and deploy-url.
@@ -134,18 +132,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
               return `/${baseHref}/${deployUrl}/${url}`.replace(/\/\/+/g, '/');
             }
           }
-        },
-        {
-          // TODO: inline .cur if not supporting IE (use browserslist to check)
-          filter: (asset: PostcssUrlAsset) => {
-            return maximumInlineSize > 0 && !asset.hash && !asset.absolutePath.endsWith('.cur');
-          },
-          url: 'inline',
-          // NOTE: maxSize is in KB
-          maxSize: maximumInlineSize,
-          fallback: 'rebase',
-        },
-        { url: 'rebase' },
+        }
       ]),
       PostcssCliResources({
         deployUrl: loader.loaders[loader.loaderIndex].options.ident == 'extracted' ? '' : deployUrl,
@@ -196,7 +183,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
 
     if (chunkNames.length > 0) {
       // Add plugin to remove hashes from lazy styles.
-      extraPlugins.push(new RemoveHashPlugin({ chunkNames, hashFormat}));
+      extraPlugins.push(new RemoveHashPlugin({ chunkNames, hashFormat }));
     }
   }
 
@@ -216,7 +203,8 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
   const baseRules: webpack.Rule[] = [
     { test: /\.css$/, use: [] },
     {
-      test: /\.scss$|\.sass$/, use: [{
+      test: /\.scss$|\.sass$/,
+      use: [{
         loader: 'sass-loader',
         options: {
           implementation: dartSass,
@@ -229,7 +217,8 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
       }]
     },
     {
-      test: /\.less$/, use: [{
+      test: /\.less$/,
+      use: [{
         loader: 'less-loader',
         options: {
           sourceMap: cssSourceMap,
@@ -239,7 +228,8 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
       }]
     },
     {
-      test: /\.styl$/, use: [{
+      test: /\.styl$/,
+      use: [{
         loader: 'stylus-loader',
         options: {
           sourceMap: cssSourceMap,
@@ -251,7 +241,9 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
 
   // load component css as raw strings
   const rules: webpack.Rule[] = baseRules.map(({ test, use }) => ({
-    exclude: globalStylePaths, test, use: [
+    exclude: globalStylePaths,
+    test,
+    use: [
       { loader: 'raw-loader' },
       {
         loader: 'postcss-loader',
@@ -306,16 +298,17 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
   }
 
   if (buildOptions.extractCss) {
-    // extract global css from js files into own css file
     extraPlugins.push(
-      new MiniCssExtractPlugin({ filename: `[name]${hashFormat.extract}.css` }));
-    // suppress empty .js files in css only entry points
-    extraPlugins.push(new SuppressExtractedTextChunksWebpackPlugin());
+      // extract global css from js files into own css file
+      new MiniCssExtractPlugin({ filename: `[name]${hashFormat.extract}.css` }),
+      // suppress empty .js files in css only entry points
+      new SuppressExtractedTextChunksWebpackPlugin(),
+    );
   }
 
   return {
     entry: entryPoints,
     module: { rules },
-    plugins: [].concat(extraPlugins as any)
+    plugins: extraPlugins
   };
 }
diff --git a/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
index e6bb8cf866ae..774e1ae96752 100644
--- a/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
@@ -278,62 +278,6 @@ describe('Browser Builder styles', () => {
     });
   });
 
-  it('inlines resources', (done) => {
-    host.copyFile('src/spectrum.png', 'src/large.png');
-    host.writeMultipleFiles({
-      'src/styles.scss': `
-        h1 { background: url('./large.png'),
-                         linear-gradient(to bottom, #0e40fa 25%, #0654f4 75%); }
-        h2 { background: url('./small.svg'); }
-        p  { background: url(./small-id.svg#testID); }
-      `,
-      'src/app/app.component.css': `
-        h3 { background: url('../small.svg'); }
-        h4 { background: url("../large.png"); }
-      `,
-      'src/small.svg': imgSvg,
-      'src/small-id.svg': imgSvg,
-    });
-
-    const overrides = {
-      aot: true,
-      extractCss: true,
-      styles: [`src/styles.scss`],
-    };
-
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = 'dist/styles.css';
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        // Large image should not be inlined, and gradient should be there.
-        expect(content).toMatch(
-          /url\(['"]?large\.png['"]?\),\s+linear-gradient\(to bottom, #0e40fa 25%, #0654f4 75%\);/);
-        // Small image should be inlined.
-        expect(content).toMatch(/url\(\\?['"]data:image\/svg\+xml/);
-        // Small image with param should not be inlined.
-        expect(content).toMatch(/url\(['"]?small-id\.svg#testID['"]?\)/);
-      }),
-      tap(() => {
-        const fileName = 'dist/main.js';
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        // Large image should not be inlined.
-        expect(content).toMatch(/url\((?:['"]|\\')?large\.png(?:['"]|\\')?\)/);
-        // Small image should be inlined.
-        expect(content).toMatch(/url\(\\?['"]data:image\/svg\+xml/);
-      }),
-      tap(() => {
-        expect(host.scopedSync().exists(normalize('dist/small.svg'))).toBe(false);
-        expect(host.scopedSync().exists(normalize('dist/large.png'))).toBe(true);
-        expect(host.scopedSync().exists(normalize('dist/small-id.svg'))).toBe(true);
-      }),
-      // TODO: find a way to check logger/output for warnings.
-      // if (stdout.match(/postcss-url: \.+: Can't read file '\.+', ignoring/)) {
-      //   throw new Error('Expected no postcss-url file read warnings.');
-      // }
-    ).toPromise().then(done, done.fail);
-  });
-
   it(`supports font-awesome imports`, (done) => {
     host.writeMultipleFiles({
       'src/styles.scss': `
@@ -407,8 +351,6 @@ describe('Browser Builder styles', () => {
         h3 { background: url('/assets/component-img-absolute.svg'); }
         h4 { background: url('../assets/component-img-relative.png'); }
       `,
-      // Use a small SVG for the absolute image to help validate that it is being referenced,
-      // because it is so small it would be inlined usually.
       'src/assets/global-img-absolute.svg': imgSvg,
       'src/assets/component-img-absolute.svg': imgSvg,
     });
@@ -427,12 +369,12 @@ describe('Browser Builder styles', () => {
         expect(styles).toContain(`url('global-img-relative.png')`);
         expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
         expect(main).toContain(`url('component-img-relative.png')`);
-        expect(host.scopedSync().exists(normalize('dist/global-img-absolute.svg')))
-          .toBe(false);
+        expect(host.scopedSync().exists(normalize('dist/assets/global-img-absolute.svg')))
+          .toBe(true);
         expect(host.scopedSync().exists(normalize('dist/global-img-relative.png')))
           .toBe(true);
-        expect(host.scopedSync().exists(normalize('dist/component-img-absolute.svg')))
-          .toBe(false);
+        expect(host.scopedSync().exists(normalize('dist/assets/component-img-absolute.svg')))
+          .toBe(true);
         expect(host.scopedSync().exists(normalize('dist/component-img-relative.png')))
           .toBe(true);
       }),
diff --git a/tests/legacy-cli/e2e/tests/build/styles/inline-urls.ts b/tests/legacy-cli/e2e/tests/build/styles/inline-urls.ts
deleted file mode 100644
index a1ff323a1067..000000000000
--- a/tests/legacy-cli/e2e/tests/build/styles/inline-urls.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { ng, silentNpm } from '../../../utils/process';
-import {
-  expectFileToMatch,
-  expectFileToExist,
-  expectFileMatchToExist,
-  writeMultipleFiles
-} from '../../../utils/fs';
-import { copyProjectAsset } from '../../../utils/assets';
-import { expectToFail } from '../../../utils/utils';
-import { updateJsonFile } from '../../../utils/project';
-
-const imgSvg = `
-  <svg width="100" height="100" xmlns="http://www.w3.org/2000/svg">
-    <circle cx="50" cy="50" r="40" stroke="green" stroke-width="4" fill="yellow" />
-  </svg>
-`;
-
-export default function () {
-  // TODO(architect): Delete this test. It is now in devkit/build-angular.
-
-  return Promise.resolve()
-    .then(() => silentNpm('install', 'font-awesome@4.7.0'))
-    .then(() => writeMultipleFiles({
-      'src/styles.scss': `
-        $fa-font-path: "~font-awesome/fonts";
-        @import "~font-awesome/scss/font-awesome";
-        h1 { background: url('./assets/large.png'),
-                         linear-gradient(to bottom, #0e40fa 25%, #0654f4 75%); }
-        h2 { background: url('./assets/small.svg'); }
-        p  { background: url(./assets/small-id.svg#testID); }
-      `,
-      'src/app/app.component.css': `
-        h3 { background: url('../assets/small.svg'); }
-        h4 { background: url("../assets/large.png"); }
-      `,
-      'src/assets/small.svg': imgSvg,
-      'src/assets/small-id.svg': imgSvg
-    }))
-    .then(() => copyProjectAsset('images/spectrum.png', './src/assets/large.png'))
-    .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].targets;
-      appArchitect.build.options.styles = [
-        { input: 'src/styles.scss' }
-      ];
-    }))
-    .then(() => ng('build', '--extract-css', '--aot'))
-    .then(({ stdout }) => {
-      if (stdout.match(/postcss-url: \.+: Can't read file '\.+', ignoring/)) {
-        throw new Error('Expected no postcss-url file read warnings.');
-      }
-    })
-    // Check paths are correctly generated.
-    .then(() => expectFileToMatch('dist/test-project/styles.css',
-      /url\(['"]?large\.png['"]?\),\s+linear-gradient\(to bottom, #0e40fa 25%, #0654f4 75%\);/))
-    .then(() => expectFileToMatch('dist/test-project/styles.css',
-      /url\(\\?['"]data:image\/svg\+xml/))
-    .then(() => expectFileToMatch('dist/test-project/styles.css',
-      /url\(['"]?small-id\.svg#testID['"]?\)/))
-    .then(() => expectFileToMatch('dist/test-project/main.js',
-      /url\(\\?['"]data:image\/svg\+xml/))
-    .then(() => expectFileToMatch('dist/test-project/main.js',
-      /url\((?:['"]|\\')?large\.png(?:['"]|\\')?\)/))
-    // Check files are correctly created.
-    .then(() => expectToFail(() => expectFileToExist('dist/test-project/small.svg')))
-    .then(() => expectFileMatchToExist('./dist/test-project', /large\.png/))
-    .then(() => expectFileMatchToExist('./dist/test-project', /small-id\.svg/));
-}

From 41d20873b16ccb0e2e02db228bb4b3940ce8f3bd Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 29 Aug 2018 17:27:39 +0100
Subject: [PATCH 0025/1703] fix(@angular-devkit/build-angular): remove
 workaround for uglify-es (#12033)

Fix https://github.com/angular/angular-cli/pull/11996#issuecomment-416514015
---
 .../src/angular-cli-files/models/webpack-configs/common.ts    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index c65d78fa07e5..29eea7c418f7 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -229,10 +229,6 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
       // PURE comments work best with 3 passes.
       // See https://github.com/webpack/webpack/issues/2899#issuecomment-317425926.
       passes: buildOptions.buildOptimizer ? 3 : 1,
-      // Workaround known uglify-es issue
-      // See https://github.com/mishoo/UglifyJS2/issues/2949#issuecomment-368070307
-      inline: wco.supportES2015 ? 1 : 3,
-
       global_defs: {
         ngDevMode: false,
       },

From b0897c0306c16f3332666b1e7b00ce784c309934 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 30 Aug 2018 22:46:52 +0200
Subject: [PATCH 0026/1703] fix(@schematics/angular): better error message when
 finding only routing modules (#11994)

Closes #11961
---
 .../schematics/angular/utility/find-module.ts | 23 +++++++++++++------
 .../angular/utility/find-module_spec.ts       | 12 ++++++++++
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/packages/schematics/angular/utility/find-module.ts b/packages/schematics/angular/utility/find-module.ts
index cf55bbd2a88f..6086523b6a12 100644
--- a/packages/schematics/angular/utility/find-module.ts
+++ b/packages/schematics/angular/utility/find-module.ts
@@ -28,7 +28,7 @@ export function findModuleFromOptions(host: Tree, options: ModuleOptions): Path
 
   if (!options.module) {
     const pathToCheck = (options.path || '')
-                      + (options.flat ? '' : '/' + strings.dasherize(options.name));
+      + (options.flat ? '' : '/' + strings.dasherize(options.name));
 
     return normalize(findModule(host, pathToCheck));
   } else {
@@ -59,12 +59,17 @@ export function findModule(host: Tree, generateDir: string): Path {
   const moduleRe = /\.module\.ts$/;
   const routingModuleRe = /-routing\.module\.ts/;
 
+  let foundRoutingModule = false;
+
   while (dir) {
-    const matches = dir.subfiles.filter(p => moduleRe.test(p) && !routingModuleRe.test(p));
+    const allMatches = dir.subfiles.filter(p => moduleRe.test(p));
+    const filteredMatches = allMatches.filter(p => !routingModuleRe.test(p));
+
+    foundRoutingModule = foundRoutingModule || allMatches.length !== filteredMatches.length;
 
-    if (matches.length == 1) {
-      return join(dir.path, matches[0]);
-    } else if (matches.length > 1) {
+    if (filteredMatches.length == 1) {
+      return join(dir.path, filteredMatches[0]);
+    } else if (filteredMatches.length > 1) {
       throw new Error('More than one module matches. Use skip-import option to skip importing '
         + 'the component into the closest module.');
     }
@@ -72,8 +77,12 @@ export function findModule(host: Tree, generateDir: string): Path {
     dir = dir.parent;
   }
 
-  throw new Error('Could not find an NgModule. Use the skip-import '
-    + 'option to skip importing in NgModule.');
+  const errorMsg = foundRoutingModule ? 'Could not find a non Routing NgModule.'
+    + '\nModules with suffix \'-routing.module\' are strictly reserved for routing.'
+    + '\nUse the skip-import option to skip importing in NgModule.'
+    : 'Could not find an NgModule. Use the skip-import option to skip importing in NgModule.';
+
+  throw new Error(errorMsg);
 }
 
 /**
diff --git a/packages/schematics/angular/utility/find-module_spec.ts b/packages/schematics/angular/utility/find-module_spec.ts
index 8b92f4ebc54a..4caa1d1b1618 100644
--- a/packages/schematics/angular/utility/find-module_spec.ts
+++ b/packages/schematics/angular/utility/find-module_spec.ts
@@ -53,6 +53,18 @@ describe('find-module', () => {
       }
     });
 
+    it('should throw if only routing modules were found', () => {
+      host = new EmptyTree();
+      host.create('/foo/src/app/anything-routing.module.ts', 'anything routing module');
+
+      try {
+        findModule(host, 'foo/src/app/anything-routing');
+        throw new Error('Succeeded, should have failed');
+      } catch (err) {
+        expect(err.message).toMatch(/Could not find a non Routing NgModule/);
+      }
+    });
+
     it('should throw if two modules found', () => {
       try {
         host = new EmptyTree();

From 247b20d37a917b0540d16ca3c6ea09e50f75a644 Mon Sep 17 00:00:00 2001
From: Adrian Moos <adrian.moos@bedag.ch>
Date: Thu, 30 Aug 2018 22:47:15 +0200
Subject: [PATCH 0027/1703] style(@schematics/angular): fix typo and English in
 environment.ts (#12023)

---
 .../application/files/src/environments/environment.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/schematics/angular/application/files/src/environments/environment.ts b/packages/schematics/angular/application/files/src/environments/environment.ts
index 600fdaf8a00a..7b4f817adb75 100644
--- a/packages/schematics/angular/application/files/src/environments/environment.ts
+++ b/packages/schematics/angular/application/files/src/environments/environment.ts
@@ -1,5 +1,5 @@
 // This file can be replaced during build by using the `fileReplacements` array.
-// `ng build ---prod` replaces `environment.ts` with `environment.prod.ts`.
+// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
 // The list of file replacements can be found in `angular.json`.
 
 export const environment = {
@@ -7,9 +7,10 @@ export const environment = {
 };
 
 /*
- * In development mode, for easier debugging, you can ignore zone related error
- * stack frames such as `zone.run`/`zoneDelegate.invokeTask` by importing the
- * below file. Don't forget to comment it out in production mode
- * because it will have a performance impact when errors are thrown
+ * For easier debugging in development mode, you can import the following file
+ * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
+ *
+ * This import should be commented out in production mode because it will have a negative impact
+ * on performance if an error is thrown.
  */
 // import 'zone.js/dist/zone-error';  // Included with Angular CLI.

From 7e63dd791b67ad49de4b0b2f55ecc386e4cad20e Mon Sep 17 00:00:00 2001
From: clydin <19598772+clydin@users.noreply.github.com>
Date: Thu, 30 Aug 2018 18:33:31 -0400
Subject: [PATCH 0028/1703] build: limit rxjs to 6.2.x due to a defect in 6.3.0
 (#12048)

---
 package.json                                                | 4 ++--
 packages/angular/cli/package.json                           | 2 +-
 packages/angular_devkit/architect/package.json              | 2 +-
 packages/angular_devkit/architect/test/package.json         | 2 +-
 packages/angular_devkit/architect_cli/package.json          | 2 +-
 packages/angular_devkit/build_angular/package.json          | 2 +-
 packages/angular_devkit/build_ng_packagr/package.json       | 2 +-
 packages/angular_devkit/build_webpack/package.json          | 2 +-
 packages/angular_devkit/core/package.json                   | 2 +-
 packages/angular_devkit/schematics/package.json             | 2 +-
 packages/angular_devkit/schematics_cli/package.json         | 2 +-
 packages/ngtools/webpack/package.json                       | 2 +-
 packages/schematics/angular/utility/latest-versions.ts      | 2 +-
 packages/schematics/update/package.json                     | 2 +-
 .../build_angular/hello-world-app/package.json              | 2 +-
 yarn.lock                                                   | 6 +++---
 16 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index 8b881cb9159e..04bba652e809 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "license-checker": "^20.1.0",
     "minimatch": "^3.0.4",
     "minimist": "^1.2.0",
-    "rxjs": "^6.0.0",
+    "rxjs": "~6.2.0",
     "semver": "^5.3.0",
     "source-map": "^0.5.6",
     "source-map-support": "^0.5.0",
@@ -107,6 +107,6 @@
   "resolutions": {
     "@types/webpack": "4.4.0",
     "@types/webpack-dev-server": "2.9.4",
-    "rxjs": "6.0.0"
+    "rxjs": "~6.2.0"
   }
 }
diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 6c658e474a02..ef122769ae77 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -38,7 +38,7 @@
     "inquirer": "^6.1.0",
     "json-schema-traverse": "^0.4.1",
     "opn": "^5.3.0",
-    "rxjs": "^6.0.0",
+    "rxjs": "~6.2.0",
     "semver": "^5.1.0",
     "symbol-observable": "^1.2.0",
     "yargs-parser": "^10.0.0"
diff --git a/packages/angular_devkit/architect/package.json b/packages/angular_devkit/architect/package.json
index 496454e7d68e..442fdee61353 100644
--- a/packages/angular_devkit/architect/package.json
+++ b/packages/angular_devkit/architect/package.json
@@ -6,6 +6,6 @@
   "typings": "src/index.d.ts",
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "^6.0.0"
+    "rxjs": "~6.2.0"
   }
 }
\ No newline at end of file
diff --git a/packages/angular_devkit/architect/test/package.json b/packages/angular_devkit/architect/test/package.json
index b4617c03ea0d..f433fb9a3eca 100644
--- a/packages/angular_devkit/architect/test/package.json
+++ b/packages/angular_devkit/architect/test/package.json
@@ -1,6 +1,6 @@
 {
   "builders": "builders.json",
   "dependencies": {
-    "rxjs": "^6.0.0"
+    "rxjs": "~6.2.0"
   }
 }
diff --git a/packages/angular_devkit/architect_cli/package.json b/packages/angular_devkit/architect_cli/package.json
index ec7373fd2699..9b54a4cbd89c 100644
--- a/packages/angular_devkit/architect_cli/package.json
+++ b/packages/angular_devkit/architect_cli/package.json
@@ -16,6 +16,6 @@
     "@angular-devkit/architect": "0.0.0",
     "minimist": "^1.2.0",
     "symbol-observable": "^1.2.0",
-    "rxjs": "^6.0.0"
+    "rxjs": "~6.2.0"
   }
 }
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 35bffdbf66fa..68284ad44e6d 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -36,7 +36,7 @@
     "postcss-loader": "^2.1.5",
     "postcss-url": "^7.3.2",
     "raw-loader": "^0.5.1",
-    "rxjs": "^6.0.0",
+    "rxjs": "~6.2.0",
     "sass-loader": "^7.1.0",
     "semver": "^5.5.0",
     "source-map-support": "^0.5.0",
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index ef34febed104..a9eebffa6c25 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@angular-devkit/architect": "0.0.0",
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "^6.0.0",
+    "rxjs": "~6.2.0",
     "semver": "^5.3.0"
   },
   "peerDependencies": {
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index 63c07c6c97a0..4f4b343eae32 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@angular-devkit/architect": "0.0.0",
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "^6.0.0"
+    "rxjs": "~6.2.0"
   },
   "peerDependencies": {
     "webpack": "^4.6.0",
diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json
index b63e953adeec..b48d40207cb5 100644
--- a/packages/angular_devkit/core/package.json
+++ b/packages/angular_devkit/core/package.json
@@ -12,6 +12,6 @@
     "chokidar": "^2.0.3",
     "fast-json-stable-stringify": "^2.0.0",
     "source-map": "^0.5.6",
-    "rxjs": "^6.0.0"
+    "rxjs": "~6.2.0"
   }
 }
diff --git a/packages/angular_devkit/schematics/package.json b/packages/angular_devkit/schematics/package.json
index a964deec6899..44f474c8db8f 100644
--- a/packages/angular_devkit/schematics/package.json
+++ b/packages/angular_devkit/schematics/package.json
@@ -14,6 +14,6 @@
   ],
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "^6.0.0"
+    "rxjs": "~6.2.0"
   }
 }
diff --git a/packages/angular_devkit/schematics_cli/package.json b/packages/angular_devkit/schematics_cli/package.json
index afe13e9cb173..609a07421c9d 100644
--- a/packages/angular_devkit/schematics_cli/package.json
+++ b/packages/angular_devkit/schematics_cli/package.json
@@ -23,6 +23,6 @@
     "@schematics/schematics": "0.0.0",
     "minimist": "^1.2.0",
     "symbol-observable": "^1.2.0",
-    "rxjs": "^6.0.0"
+    "rxjs": "~6.2.0"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index e7505a21e3d9..e49d0c2868f5 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "^6.0.0",
+    "rxjs": "~6.2.0",
     "tree-kill": "^1.0.0",
     "webpack-sources": "^1.1.0"
   },
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 095b7cf1e6a1..ed46b138584e 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -9,7 +9,7 @@
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
   Angular: '^6.1.0',
-  RxJs: '^6.0.0',
+  RxJs: '~6.2.0',
   ZoneJs: '~0.8.26',
   TypeScript: '~2.9.2',
   // The versions below must be manually updated when making a new devkit release.
diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index 7f5346566eea..9d8b40047fc5 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -15,6 +15,6 @@
     "npm-registry-client": "^8.5.1",
     "semver": "^5.3.0",
     "semver-intersect": "^1.1.2",
-    "rxjs": "^6.0.0"
+    "rxjs": "~6.2.0"
   }
 }
\ No newline at end of file
diff --git a/tests/angular_devkit/build_angular/hello-world-app/package.json b/tests/angular_devkit/build_angular/hello-world-app/package.json
index df5e3fd1255f..e45a8c5b0c7c 100644
--- a/tests/angular_devkit/build_angular/hello-world-app/package.json
+++ b/tests/angular_devkit/build_angular/hello-world-app/package.json
@@ -22,7 +22,7 @@
     "@angular/platform-browser-dynamic": "^6.0.0-rc.0",
     "@angular/router": "^6.0.0-rc.0",
     "core-js": "^2.4.1",
-    "rxjs": "^6.0.0",
+    "rxjs": "~6.2.0",
     "zone.js": "^0.8.19"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 88e1463881ab..41f1c83ef417 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6371,9 +6371,9 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs@6.0.0, rxjs@^6.0.0, rxjs@^6.1.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0.tgz#d647e029b5854617f994c82fe57a4c6747b352da"
+rxjs@^6.0.0, rxjs@^6.1.0, rxjs@~6.2.0:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.2.tgz#eb75fa3c186ff5289907d06483a77884586e1cf9"
   dependencies:
     tslib "^1.9.0"
 

From 39b4cc030b0deba88627d659df01aaf3663f0265 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 30 Aug 2018 16:34:02 -0700
Subject: [PATCH 0029/1703] build: fix RxJS invalid typings

---
 packages/angular_devkit/core/src/json/schema/registry.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/core/src/json/schema/registry.ts b/packages/angular_devkit/core/src/json/schema/registry.ts
index b16d79495839..89130f10d563 100644
--- a/packages/angular_devkit/core/src/json/schema/registry.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry.ts
@@ -258,7 +258,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
                     return Promise.reject(err);
                   }));
             }),
-            switchMap(([data, valid]) => {
+            switchMap(([data, valid]: [JsonValue, boolean]) => {
               if (!validationOptions.withPrompts) {
                 return observableOf([data, valid]);
               }
@@ -274,7 +274,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
                 return observableOf([data, valid]);
               }
             }),
-            switchMap(([data, valid]) => {
+            switchMap(([data, valid]: [JsonValue, boolean]) => {
               if (valid) {
                 return observableOf(data).pipe(
                   ...[...this._post].map(visitor => concatMap((data: JsonValue) => {
@@ -287,7 +287,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
                 return observableOf([data, valid]);
               }
             }),
-            map(([data, valid]) => {
+            map(([data, valid]: [JsonValue, boolean]) => {
               if (valid) {
                 return { data, success: true } as SchemaValidatorResult;
               }

From 189563d2778d4691ee2fe247465ec6c16a348c3b Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 4 Sep 2018 14:04:21 -0700
Subject: [PATCH 0030/1703] refactor(@angular/cli): rename getset command to
 deprecated

---
 packages/angular/cli/commands.json            |  4 ++--
 .../angular/cli/commands/deprecated-impl.ts   | 21 +++++++++++++++++++
 .../commands/{getset.json => deprecated.json} |  6 +++---
 packages/angular/cli/commands/getset-impl.ts  | 20 ------------------
 4 files changed, 26 insertions(+), 25 deletions(-)
 create mode 100644 packages/angular/cli/commands/deprecated-impl.ts
 rename packages/angular/cli/commands/{getset.json => deprecated.json} (66%)
 delete mode 100644 packages/angular/cli/commands/getset-impl.ts

diff --git a/packages/angular/cli/commands.json b/packages/angular/cli/commands.json
index a4a0b9360211..be69ff2dbe62 100644
--- a/packages/angular/cli/commands.json
+++ b/packages/angular/cli/commands.json
@@ -7,8 +7,8 @@
   "make-this-awesome": "./commands/easter-egg.json",
   "eject": "./commands/eject.json",
   "generate": "./commands/generate.json",
-  "get": "./commands/getset.json",
-  "set": "./commands/getset.json",
+  "get": "./commands/deprecated.json",
+  "set": "./commands/deprecated.json",
   "help": "./commands/help.json",
   "lint": "./commands/lint.json",
   "new": "./commands/new.json",
diff --git a/packages/angular/cli/commands/deprecated-impl.ts b/packages/angular/cli/commands/deprecated-impl.ts
new file mode 100644
index 000000000000..85c8af440384
--- /dev/null
+++ b/packages/angular/cli/commands/deprecated-impl.ts
@@ -0,0 +1,21 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Command } from '../models/command';
+
+export class DeprecatedCommand extends Command {
+  public async run() {
+    let message = 'The "${this.description.name}" command has been deprecated.';
+    if (this.description.name == 'get' || this.description.name == 'set') {
+      message = 'get/set have been deprecated in favor of the config command.';
+    }
+
+    this.logger.error(message);
+
+    return 0;
+  }
+}
diff --git a/packages/angular/cli/commands/getset.json b/packages/angular/cli/commands/deprecated.json
similarity index 66%
rename from packages/angular/cli/commands/getset.json
rename to packages/angular/cli/commands/deprecated.json
index 5d05f348a0ac..ee77bbd03d20 100644
--- a/packages/angular/cli/commands/getset.json
+++ b/packages/angular/cli/commands/deprecated.json
@@ -1,12 +1,12 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "GetSetCommandOptions",
+  "$id": "ng-cli://commands/deprecated.json",
   "description": "Deprecated in favor of config command.",
   "$longDescription": "",
 
-  "$impl": "./getset-impl#GetSetCommand",
+  "$impl": "./deprecated-impl#DeprecatedCommand",
   "$hidden": true,
   "$type": "deprecated",
 
   "type": "object"
-}
\ No newline at end of file
+}
diff --git a/packages/angular/cli/commands/getset-impl.ts b/packages/angular/cli/commands/getset-impl.ts
deleted file mode 100644
index 0e6c26795820..000000000000
--- a/packages/angular/cli/commands/getset-impl.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { Command } from '../models/command';
-
-export interface Options {
-  keyword: string;
-  search?: boolean;
-}
-
-export class GetSetCommand extends Command {
-  public async run(_options: Options) {
-    this.logger.warn('get/set have been deprecated in favor of the config command.');
-  }
-}

From 4a25d7c9b4ebfabca2a4498c977003edbc792467 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 4 Sep 2018 14:04:43 -0700
Subject: [PATCH 0031/1703] test: get-set deprecation should check stderr now

---
 .../e2e/tests/commands/config/get-set-deprecation.ts      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/commands/config/get-set-deprecation.ts b/tests/legacy-cli/e2e/tests/commands/config/get-set-deprecation.ts
index d5b898b82825..ad9d3f106d17 100644
--- a/tests/legacy-cli/e2e/tests/commands/config/get-set-deprecation.ts
+++ b/tests/legacy-cli/e2e/tests/commands/config/get-set-deprecation.ts
@@ -5,14 +5,14 @@ export default function() {
   const depRegEx = /get\/set have been deprecated in favor of the config command\./;
   return Promise.resolve()
     .then(() => ng('get'))
-    .then(({ stdout }) => {
-      if (!stdout.match(depRegEx)) {
+    .then(({ stderr }) => {
+      if (!stderr.match(depRegEx)) {
         throw new Error(`Expected deprecation warning.`);
       }
     })
     .then(() => ng('set'))
-    .then(({ stdout }) => {
-      if (!stdout.match(depRegEx)) {
+    .then(({ stderr }) => {
+      if (!stderr.match(depRegEx)) {
         throw new Error(`Expected deprecation warning.`);
       }
     });

From 0b84c1d4b06c5ec43f59a10c54996521a149d920 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 4 Sep 2018 14:15:37 -0700
Subject: [PATCH 0032/1703] feat(@angular-devkit/core): move findTypes in
 utility and export

---
 .../core/src/json/schema/transforms.ts        | 54 ++-------------
 .../core/src/json/schema/utility.ts           | 67 +++++++++++++++++++
 2 files changed, 71 insertions(+), 50 deletions(-)
 create mode 100644 packages/angular_devkit/core/src/json/schema/utility.ts

diff --git a/packages/angular_devkit/core/src/json/schema/transforms.ts b/packages/angular_devkit/core/src/json/schema/transforms.ts
index 513d7943b0d5..9c6694e4e32e 100644
--- a/packages/angular_devkit/core/src/json/schema/transforms.ts
+++ b/packages/angular_devkit/core/src/json/schema/transforms.ts
@@ -7,55 +7,7 @@
  */
 import { JsonObject, JsonValue, isJsonObject } from '../interface';
 import { JsonPointer } from './interface';
-
-const allTypes = ['string', 'integer', 'number', 'object', 'array', 'boolean', 'null'];
-
-function findTypes(schema: JsonObject): Set<string> {
-  if (!schema) {
-    return new Set();
-  }
-
-  let potentials: Set<string>;
-  if (typeof schema.type === 'string') {
-    potentials = new Set([schema.type]);
-  } else if (Array.isArray(schema.type)) {
-    potentials = new Set(schema.type as string[]);
-  } else {
-    potentials = new Set(allTypes);
-  }
-
-  if (isJsonObject(schema.not)) {
-    const notTypes = findTypes(schema.not);
-    potentials = new Set([...potentials].filter(p => !notTypes.has(p)));
-  }
-
-  if (Array.isArray(schema.allOf)) {
-    for (const sub of schema.allOf) {
-      const types = findTypes(sub as JsonObject);
-      potentials = new Set([...potentials].filter(p => types.has(p)));
-    }
-  }
-
-  if (Array.isArray(schema.oneOf)) {
-    let options = new Set<string>();
-    for (const sub of schema.oneOf) {
-      const types = findTypes(sub as JsonObject);
-      options = new Set([...options, ...types]);
-    }
-    potentials = new Set([...potentials].filter(p => options.has(p)));
-  }
-
-  if (Array.isArray(schema.anyOf)) {
-    let options = new Set<string>();
-    for (const sub of schema.anyOf) {
-      const types = findTypes(sub as JsonObject);
-      options = new Set([...options, ...types]);
-    }
-    potentials = new Set([...potentials].filter(p => options.has(p)));
-  }
-
-  return potentials;
-}
+import { getTypesOfSchema } from './utility';
 
 export function addUndefinedDefaults(
   value: JsonValue,
@@ -66,7 +18,7 @@ export function addUndefinedDefaults(
     return value;
   }
 
-  const types = findTypes(schema);
+  const types = getTypesOfSchema(schema);
   if (types.size === 0) {
     return value;
   }
@@ -110,6 +62,8 @@ export function addUndefinedDefaults(
     for (const propName of Object.getOwnPropertyNames(schema.properties)) {
       if (propName in newValue) {
         continue;
+      } else if (propName == '$schema') {
+        continue;
       }
 
       // TODO: Does not currently handle more complex schemas (oneOf/anyOf/etc.)
diff --git a/packages/angular_devkit/core/src/json/schema/utility.ts b/packages/angular_devkit/core/src/json/schema/utility.ts
new file mode 100644
index 000000000000..5e1608312ea8
--- /dev/null
+++ b/packages/angular_devkit/core/src/json/schema/utility.ts
@@ -0,0 +1,67 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { JsonObject, isJsonObject } from '../interface';
+
+
+const allTypes = ['string', 'integer', 'number', 'object', 'array', 'boolean', 'null'];
+
+export function getTypesOfSchema(schema: JsonObject | true): Set<string> {
+  if (!schema) {
+    return new Set();
+  }
+  if (schema === true) {
+    return new Set(allTypes);
+  }
+
+  let potentials: Set<string>;
+  if (typeof schema.type === 'string') {
+    potentials = new Set([schema.type]);
+  } else if (Array.isArray(schema.type)) {
+    potentials = new Set(schema.type as string[]);
+  } else {
+    potentials = new Set(allTypes);
+  }
+
+  if (isJsonObject(schema.not)) {
+    const notTypes = getTypesOfSchema(schema.not);
+    potentials = new Set([...potentials].filter(p => !notTypes.has(p)));
+  }
+
+  if (Array.isArray(schema.allOf)) {
+    for (const sub of schema.allOf) {
+      const types = getTypesOfSchema(sub as JsonObject);
+      potentials = new Set([...potentials].filter(p => types.has(p)));
+    }
+  }
+
+  if (Array.isArray(schema.oneOf)) {
+    let options = new Set<string>();
+    for (const sub of schema.oneOf) {
+      const types = getTypesOfSchema(sub as JsonObject);
+      options = new Set([...options, ...types]);
+    }
+    potentials = new Set([...potentials].filter(p => options.has(p)));
+  }
+
+  if (Array.isArray(schema.anyOf)) {
+    let options = new Set<string>();
+    for (const sub of schema.anyOf) {
+      const types = getTypesOfSchema(sub as JsonObject);
+      options = new Set([...options, ...types]);
+    }
+    potentials = new Set([...potentials].filter(p => options.has(p)));
+  }
+
+  if (schema.properties) {
+    potentials.add('object');
+  } else if (schema.items) {
+    potentials.add('array');
+  }
+
+  return potentials;
+}

From 1b5c0082efb2224be80f3b8128a1c17a1f1bac99 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 4 Sep 2018 14:18:14 -0700
Subject: [PATCH 0033/1703] feat(@angular-devkit/core): add levenshtein
 distance utility

---
 .../angular_devkit/core/src/utils/strings.ts  | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/packages/angular_devkit/core/src/utils/strings.ts b/packages/angular_devkit/core/src/utils/strings.ts
index 4743e9cb6555..ff3c0ce7cec3 100644
--- a/packages/angular_devkit/core/src/utils/strings.ts
+++ b/packages/angular_devkit/core/src/utils/strings.ts
@@ -127,3 +127,52 @@ export function underscore(str: string): string {
 export function capitalize(str: string): string {
   return str.charAt(0).toUpperCase() + str.substr(1);
 }
+
+/**
+ * Calculate the levenshtein distance of two strings.
+ * See https://en.wikipedia.org/wiki/Levenshtein_distance.
+ * Based off https://gist.github.com/andrei-m/982927 (for using the faster dynamic programming
+ * version).
+ *
+ * @param a String a.
+ * @param b String b.
+ * @returns A number that represents the distance between the two strings. The greater the number
+ *   the more distant the strings are from each others.
+ */
+export function levenshtein(a: string, b: string): number {
+  if (a.length == 0) {
+    return b.length;
+  }
+  if (b.length == 0) {
+    return a.length;
+  }
+
+  const matrix = [];
+
+  // increment along the first column of each row
+  for (let i = 0; i <= b.length; i++) {
+    matrix[i] = [i];
+  }
+
+  // increment each column in the first row
+  for (let j = 0; j <= a.length; j++) {
+    matrix[0][j] = j;
+  }
+
+  // Fill in the rest of the matrix
+  for (let i = 1; i <= b.length; i++) {
+    for (let j = 1; j <= a.length; j++) {
+      if (b.charAt(i - 1) == a.charAt(j - 1)) {
+        matrix[i][j] = matrix[i - 1][j - 1];
+      } else {
+        matrix[i][j] = Math.min(
+          matrix[i - 1][j - 1] + 1, // substitution
+          matrix[i][j - 1] + 1, // insertion
+          matrix[i - 1][j] + 1, // deletion
+        );
+      }
+    }
+  }
+
+  return matrix[b.length][a.length];
+}

From 75d682b2716a3d1203da1812cf3456bb6e924048 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 4 Sep 2018 14:29:13 -0700
Subject: [PATCH 0034/1703] refactor(@angular/cli): use smart default instead
 of overwriting args

---
 packages/angular/cli/commands/new-impl.ts         | 4 +++-
 packages/schematics/angular/ng-new/schema.json    | 6 ++++--
 packages/schematics/angular/workspace/schema.json | 5 ++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/angular/cli/commands/new-impl.ts b/packages/angular/cli/commands/new-impl.ts
index c9229a2e1b37..338d821d150f 100644
--- a/packages/angular/cli/commands/new-impl.ts
+++ b/packages/angular/cli/commands/new-impl.ts
@@ -44,11 +44,13 @@ export class NewCommand extends SchematicCommand {
       collectionName = this.parseCollectionName(options);
     }
 
+    // Register the version of the CLI in the registry.
     const packageJson = require('../package.json');
-    options.version = packageJson.version;
+    const version = packageJson.version;
 
     // Ensure skipGit has a boolean value.
     options.skipGit = options.skipGit === undefined ? false : options.skipGit;
+    this._workflow.registry.addSmartDefaultProvider('ng-cli-version', () => version);
 
     return this.runSchematic({
       collectionName: collectionName,
diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
index c4846c957fba..2c927a03f9bf 100644
--- a/packages/schematics/angular/ng-new/schema.json
+++ b/packages/schematics/angular/ng-new/schema.json
@@ -90,7 +90,10 @@
     "version": {
       "type": "string",
       "description": "The version of the Angular CLI to use.",
-      "visible": false
+      "visible": false,
+      "$default": {
+        "$source": "ng-cli-version"
+      }
     },
     "routing": {
       "type": "boolean",
@@ -117,6 +120,5 @@
     }
   },
   "required": [
-    "version"
   ]
 }
diff --git a/packages/schematics/angular/workspace/schema.json b/packages/schematics/angular/workspace/schema.json
index 7eac69c5d29a..c5f296fb06c7 100644
--- a/packages/schematics/angular/workspace/schema.json
+++ b/packages/schematics/angular/workspace/schema.json
@@ -69,7 +69,10 @@
     "version": {
       "type": "string",
       "description": "The version of the Angular CLI to use.",
-      "visible": false
+      "visible": false,
+      "$default": {
+        "$source": "ng-cli-version"
+      }
     }
   },
   "required": [

From fb99a490bfe8527edc7b3e0356a61d99c50b3912 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 4 Sep 2018 14:29:54 -0700
Subject: [PATCH 0035/1703] feat(@angular-devkit/core): add a parseJsonFile
 that shows file path on error

---
 .../angular_devkit/core/src/json/parser.ts    | 47 +++++++++++++++++--
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/packages/angular_devkit/core/src/json/parser.ts b/packages/angular_devkit/core/src/json/parser.ts
index 809b96c318c7..90a9e1b12497 100644
--- a/packages/angular_devkit/core/src/json/parser.ts
+++ b/packages/angular_devkit/core/src/json/parser.ts
@@ -25,15 +25,26 @@ import {
   Position,
 } from './interface';
 
+export class JsonException extends BaseException {}
 
 /**
  * A character was invalid in this context.
  */
-export class InvalidJsonCharacterException extends BaseException {
+export class InvalidJsonCharacterException extends JsonException {
+  invalidChar: string;
+  line: number;
+  character: number;
+  offset: number;
+
   constructor(context: JsonParserContext) {
     const pos = context.previous;
-    super(`Invalid JSON character: ${JSON.stringify(_peek(context))} `
-        + `at ${pos.line}:${pos.character}.`);
+    const invalidChar = JSON.stringify(_peek(context));
+    super(`Invalid JSON character: ${invalidChar} at ${pos.line}:${pos.character}.`);
+
+    this.invalidChar = invalidChar;
+    this.line = pos.line;
+    this.offset = pos.offset;
+    this.character = pos.character;
   }
 }
 
@@ -41,12 +52,20 @@ export class InvalidJsonCharacterException extends BaseException {
 /**
  * More input was expected, but we reached the end of the stream.
  */
-export class UnexpectedEndOfInputException extends BaseException {
+export class UnexpectedEndOfInputException extends JsonException {
   constructor(_context: JsonParserContext) {
     super(`Unexpected end of file.`);
   }
 }
 
+/**
+ * An error happened within a file.
+ */
+export class PathSpecificJsonException extends JsonException {
+  constructor(public path: string, public exception: JsonException) {
+    super(`An error happened at file path ${JSON.stringify(path)}: ${exception.message}`);
+  }
+}
 
 /**
  * Context passed around the parser with information about where we currently are in the parse.
@@ -860,3 +879,23 @@ export function parseJson(input: string, mode = JsonParseMode.Default): JsonValu
 
   return parseJsonAst(input, mode).value;
 }
+
+/**
+ * Parse a JSON string into its value.  This discards the AST and only returns the value itself.
+ * It also absorbs JSON parsing errors and return a new error with the path in it. Useful for
+ * showing errors when parsing from a file.
+ * @param input The string to parse.
+ * @param mode The mode to parse the input with. {@see JsonParseMode}.
+ * @returns {JsonValue} The value represented by the JSON string.
+ */
+export function parseJsonFile(input: string, mode = JsonParseMode.Default, path: string) {
+  try {
+    return parseJson(input, mode);
+  } catch (e) {
+    if (e instanceof JsonException) {
+      throw new PathSpecificJsonException(path, e);
+    } else {
+      throw e;
+    }
+  }
+}

From ff1baab7fca4938ba717a87692b6869eb0ba8579 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 4 Sep 2018 14:42:53 -0700
Subject: [PATCH 0036/1703] feat(@angular/cli): remove yargs-parser and
 implement parsing

This is fully backward compatible.
---
 packages/angular/cli/custom-typings.d.ts      |  38 --
 packages/angular/cli/models/command-runner.ts | 500 ++++--------------
 packages/angular/cli/models/command.ts        | 200 ++++---
 packages/angular/cli/models/parser.ts         | 296 +++++++++++
 packages/angular/cli/models/parser_spec.ts    |  73 +++
 packages/angular/cli/package.json             |   4 +-
 yarn.lock                                     |   6 -
 7 files changed, 581 insertions(+), 536 deletions(-)
 delete mode 100644 packages/angular/cli/custom-typings.d.ts
 create mode 100644 packages/angular/cli/models/parser.ts
 create mode 100644 packages/angular/cli/models/parser_spec.ts

diff --git a/packages/angular/cli/custom-typings.d.ts b/packages/angular/cli/custom-typings.d.ts
deleted file mode 100644
index b33ea8011637..000000000000
--- a/packages/angular/cli/custom-typings.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-// tslint:disable:no-global-tslint-disable no-any
-declare module 'yargs-parser' {
-  const parseOptions: any;
-  const yargsParser: <T = any>(args: string | string[], options?: typeof parseOptions) => T;
-  export = yargsParser;
-}
-
-declare module 'json-schema-traverse' {
-  import { JsonObject } from '@angular-devkit/core';
-  interface TraverseOptions {
-    allKeys?: boolean;
-  }
-  type TraverseCallback = (
-    schema: JsonObject,
-    jsonPointer: string,
-    rootSchema: string,
-    parentJsonPointer: string,
-    parentKeyword: string,
-    parentSchema: string,
-    property: string) => void;
-
-  interface TraverseCallbacks {
-    pre?: TraverseCallback;
-    post?: TraverseCallback;
-  }
-
-  const traverse: (schema: object, options: TraverseOptions, cbs: TraverseCallbacks) => void;
-
-  export = traverse;
-}
diff --git a/packages/angular/cli/models/command-runner.ts b/packages/angular/cli/models/command-runner.ts
index 8792328df6f1..b1cef78b87d6 100644
--- a/packages/angular/cli/models/command-runner.ts
+++ b/packages/angular/cli/models/command-runner.ts
@@ -5,454 +5,178 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-// tslint:disable:no-global-tslint-disable no-any
 import {
-  JsonObject,
-  deepCopy,
+  JsonParseMode,
+  isJsonObject,
+  json,
   logging,
-  parseJson,
   schema,
-  strings as coreStrings,
+  strings,
   tags,
 } from '@angular-devkit/core';
-import { ExportStringRef } from '@angular-devkit/schematics/tools';
 import { readFileSync } from 'fs';
-import { dirname, join } from 'path';
-import { of, throwError } from 'rxjs';
-import { concatMap } from 'rxjs/operators';
-import * as yargsParser from 'yargs-parser';
-import {
-  Command,
-  CommandConstructor,
-  CommandContext,
-  CommandScope,
-  Option,
-} from '../models/command';
+import { dirname, join, resolve } from 'path';
+import { of } from 'rxjs';
 import { findUp } from '../utilities/find-up';
-import { insideProject } from '../utilities/project';
-import { convertSchemaToOptions, parseSchema } from './json-schema';
+import { parseJsonSchemaToCommandDescription } from '../utilities/json-schema';
+import { Command } from './command';
+import {
+  CommandDescription,
+  CommandDescriptionMap,
+  CommandProject,
+} from './interface';
+import * as parser from './parser';
 
 
-interface CommandMap {
+export interface CommandMapOptions {
   [key: string]: string;
 }
 
-interface CommandMetadata {
-  description: string;
-  $aliases?: string[];
-  $impl: string;
-  $scope?: 'in' | 'out';
-  $type?: 'architect' | 'schematic';
-  $hidden?: boolean;
-}
-
-interface CommandLocation {
-  path: string;
-  text: string;
-  rawData: CommandMetadata;
-}
-
-// Based off https://en.wikipedia.org/wiki/Levenshtein_distance
-// No optimization, really.
-function levenshtein(a: string, b: string): number {
-  /* base case: empty strings */
-  if (a.length == 0) {
-    return b.length;
-  }
-  if (b.length == 0) {
-    return a.length;
-  }
-
-  // Test if last characters of the strings match.
-  const cost = a[a.length - 1] == b[b.length - 1] ? 0 : 1;
-
-  /* return minimum of delete char from s, delete char from t, and delete char from both */
-  return Math.min(
-    levenshtein(a.slice(0, -1), b) + 1,
-    levenshtein(a, b.slice(0, -1)) + 1,
-    levenshtein(a.slice(0, -1), b.slice(0, -1)) + cost,
-  );
-}
-
 /**
  * Run a command.
  * @param args Raw unparsed arguments.
  * @param logger The logger to use.
- * @param context Execution context.
+ * @param project Project data structure containing project information.
+ * @param commands The map of supported commands.
  */
 export async function runCommand(
   args: string[],
   logger: logging.Logger,
-  context: CommandContext,
-  commandMap?: CommandMap,
+  project: CommandProject,
+  commands?: CommandMapOptions,
 ): Promise<number | void> {
-
-  // if not args supplied, just run the help command.
-  if (!args || args.length === 0) {
-    args = ['help'];
-  }
-  const rawOptions = yargsParser(args, { alias: { help: ['h'] }, boolean: [ 'help' ] });
-  let commandName = rawOptions._[0] || '';
-
-  // remove the command name
-  rawOptions._ = rawOptions._.slice(1);
-  const executionScope = insideProject()
-    ? CommandScope.inProject
-    : CommandScope.outsideProject;
-
-  if (commandMap === undefined) {
+  if (commands === undefined) {
     const commandMapPath = findUp('commands.json', __dirname);
     if (commandMapPath === null) {
-      logger.fatal('Unable to find command map.');
-
-      return 1;
+      throw new Error('Unable to find command map.');
     }
     const cliDir = dirname(commandMapPath);
     const commandsText = readFileSync(commandMapPath).toString('utf-8');
-    const commandJson = JSON.parse(commandsText) as { [name: string]: string };
+    const commandJson = json.parseJsonFile(
+      commandsText,
+      JsonParseMode.Loose,
+      commandMapPath,
+    ) as { [name: string]: string };
 
-    commandMap = {};
+    commands = {};
     for (const commandName of Object.keys(commandJson)) {
-      commandMap[commandName] = join(cliDir, commandJson[commandName]);
+      commands[commandName] = resolve(cliDir, commandJson[commandName]);
     }
   }
 
-  let commandMetadata = commandName ? findCommand(commandMap, commandName) : null;
-
-  if (!commandMetadata && (rawOptions.v || rawOptions.version)) {
-    commandName = 'version';
-    commandMetadata = findCommand(commandMap, commandName);
-  } else if (!commandMetadata && rawOptions.help) {
-    commandName = 'help';
-    commandMetadata = findCommand(commandMap, commandName);
-  }
-
-  if (!commandMetadata) {
-    if (!commandName) {
-      logger.error(tags.stripIndent`
-        We could not find a command from the arguments and the help command seems to be disabled.
-        This is an issue with the CLI itself. If you see this comment, please report it and
-        provide your repository.
-      `);
-
-      return 1;
-    } else {
-      const commandsDistance = {} as { [name: string]: number };
-      const allCommands = Object.keys(commandMap).sort((a, b) => {
-        if (!(a in commandsDistance)) {
-          commandsDistance[a] = levenshtein(a, commandName);
-        }
-        if (!(b in commandsDistance)) {
-          commandsDistance[b] = levenshtein(b, commandName);
-        }
-
-        return commandsDistance[a] - commandsDistance[b];
-      });
-
-      logger.error(tags.stripIndent`
-          The specified command ("${commandName}") is invalid. For a list of available options,
-          run "ng help".
-          Did you mean "${allCommands[0]}"?
-      `);
+  // This registry is exclusively used for flattening schemas, and not for validating.
+  const registry = new schema.CoreSchemaRegistry([]);
+  registry.registerUriHandler((uri: string) => {
+    if (uri.startsWith('ng-cli://')) {
+      const content = readFileSync(join(__dirname, '..', uri.substr('ng-cli://'.length)), 'utf-8');
 
-      return 1;
+      return of(JSON.parse(content));
     }
-  }
+  });
 
-  const command = await createCommand(commandMetadata, context, logger);
-  const metadataOptions = await convertSchemaToOptions(commandMetadata.text);
-  if (command === null) {
-    logger.error(tags.stripIndent`Command (${commandName}) failed to instantiate.`);
+  // Normalize the commandMap
+  const commandMap: CommandDescriptionMap = {};
+  for (const name of Object.keys(commands)) {
+    const schemaPath = commands[name];
+    const schemaContent = readFileSync(schemaPath, 'utf-8');
+    const schema = json.parseJsonFile(schemaContent, JsonParseMode.Loose, schemaPath);
+    if (!isJsonObject(schema)) {
+      throw new Error('Invalid command JSON loaded from ' + JSON.stringify(schemaPath));
+    }
 
-    return 1;
+    commandMap[name] = await parseJsonSchemaToCommandDescription(
+      name,
+      schemaPath,
+      registry,
+      schema,
+    );
   }
-  // Add the options from the metadata to the command object.
-  command.addOptions(metadataOptions);
-  let options = parseOptions(args, metadataOptions);
-  args = await command.initializeRaw(args);
-
-  const optionsCopy = deepCopy(options);
-  await processRegistry(optionsCopy, commandMetadata);
-  await command.initialize(optionsCopy);
 
-  // Reparse options after initializing the command.
-  options = parseOptions(args, command.options);
+  let commandName: string | undefined = undefined;
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
 
-  if (commandName === 'help') {
-    options.commandInfo = getAllCommandInfo(commandMap);
+    if (arg in commandMap) {
+      commandName = arg;
+      args.splice(i, 1);
+      break;
+    } else if (!arg.startsWith('-')) {
+      commandName = arg;
+      args.splice(i, 1);
+      break;
+    }
   }
 
-  if (options.help) {
-    command.printHelp(commandName, commandMetadata.rawData.description, options);
+  // if no commands were found, use `help`.
+  if (commandName === undefined) {
+    commandName = 'help';
+  }
 
-    return;
-  } else {
-    const commandScope = mapCommandScope(commandMetadata.rawData.$scope);
-    if (commandScope !== undefined && commandScope !== CommandScope.everywhere) {
-      if (commandScope !== executionScope) {
-        let errorMessage;
-        if (commandScope === CommandScope.inProject) {
-          errorMessage = `This command can only be run inside of a CLI project.`;
-        } else {
-          errorMessage = `This command can not be run inside of a CLI project.`;
-        }
-        logger.fatal(errorMessage);
+  let description: CommandDescription | null = null;
 
-        return 1;
-      }
-      if (commandScope === CommandScope.inProject) {
-        if (!context.project.configFile) {
-          logger.fatal('Invalid project: missing workspace file.');
-
-          return 1;
+  if (commandName !== undefined) {
+    if (commandMap[commandName]) {
+      description = commandMap[commandName];
+    } else {
+      Object.keys(commandMap).forEach(name => {
+        const commandDescription = commandMap[name];
+        const aliases = commandDescription.aliases;
+
+        let found = false;
+        if (aliases) {
+          if (aliases.some(alias => alias === commandName)) {
+            found = true;
+          }
         }
 
-        if (['.angular-cli.json', 'angular-cli.json'].includes(context.project.configFile)) {
-          // --------------------------------------------------------------------------------
-          // If changing this message, please update the same message in
-          // `packages/@angular/cli/bin/ng-update-message.js`
-          const message = tags.stripIndent`
-            The Angular CLI configuration format has been changed, and your existing configuration
-            can be updated automatically by running the following command:
-
-              ng update @angular/cli
-          `;
-
-          logger.warn(message);
-
-          return 1;
+        if (found) {
+          if (description) {
+            throw new Error('Found multiple commands with the same alias.');
+          }
+          commandName = name;
+          description = commandDescription;
         }
-      }
+      });
     }
   }
-  delete options.h;
-  delete options.help;
-  await processRegistry(options, commandMetadata);
 
-  const isValid = await command.validate(options);
-  if (!isValid) {
-    logger.fatal(`Validation error. Invalid command options.`);
+  if (!commandName) {
+    logger.error(tags.stripIndent`
+        We could not find a command from the arguments and the help command seems to be disabled.
+        This is an issue with the CLI itself. If you see this comment, please report it and
+        provide your repository.
+      `);
 
     return 1;
   }
 
-  return command.run(options);
-}
-
-async function processRegistry(
-  options: {_: (string | boolean | number)[]}, commandMetadata: CommandLocation) {
-  const rawArgs = options._;
-  const registry = new schema.CoreSchemaRegistry([]);
-  registry.addSmartDefaultProvider('argv', (schema: JsonObject) => {
-    if ('index' in schema) {
-      return rawArgs[Number(schema['index'])];
-    } else {
-      return rawArgs;
-    }
-  });
-
-  const jsonSchema = parseSchema(commandMetadata.text);
-  if (jsonSchema === null) {
-    throw new Error('');
-  }
-  await registry.compile(jsonSchema).pipe(
-    concatMap(validator => validator(options)), concatMap(validatorResult => {
-      if (validatorResult.success) {
-        return of(options);
-      } else {
-        return throwError(new schema.SchemaValidationException(validatorResult.errors));
+  if (!description) {
+    const commandsDistance = {} as { [name: string]: number };
+    const name = commandName;
+    const allCommands = Object.keys(commandMap).sort((a, b) => {
+      if (!(a in commandsDistance)) {
+        commandsDistance[a] = strings.levenshtein(a, name);
       }
-    })).toPromise();
-}
-
-export function parseOptions(args: string[], optionsAndArguments: Option[]) {
-  const parser = yargsParser;
-
-  // filter out arguments
-  const options = optionsAndArguments
-    .filter(opt => {
-      let isOption = true;
-      if (opt.$default !== undefined && opt.$default.$source === 'argv') {
-        isOption = false;
-      }
-
-      return isOption;
-    });
-
-  const aliases: { [key: string]: string[]; } = options
-    .reduce((aliases: { [key: string]: string; }, opt) => {
-      if (!opt || !opt.aliases || opt.aliases.length === 0) {
-        return aliases;
-      }
-
-      aliases[opt.name] = (opt.aliases || [])
-        .filter(a => a.length === 1)[0];
-
-      return aliases;
-    }, {});
-
-  const booleans = options
-    .filter(o => o.type && o.type === 'boolean')
-    .map(o => o.name);
-
-  const defaults = options
-    .filter(o => o.default !== undefined || booleans.indexOf(o.name) !== -1)
-    .reduce((defaults: {[key: string]: string | number | boolean | undefined }, opt: Option) => {
-      defaults[opt.name] = opt.default;
-
-      return defaults;
-    }, {});
-
-  const strings = options
-    .filter(o => o.type === 'string')
-    .map(o => o.name);
-
-  const numbers = options
-    .filter(o => o.type === 'number')
-    .map(o => o.name);
-
-
-  aliases.help = ['h'];
-  booleans.push('help');
-
-  const yargsOptions = {
-    alias: aliases,
-    boolean: booleans,
-    default: defaults,
-    string: strings,
-    number: numbers,
-  };
-
-  const parsedOptions = parser(args, yargsOptions);
-
-  // Remove aliases.
-  options
-    .reduce((allAliases, option) => {
-      if (!option || !option.aliases || option.aliases.length === 0) {
-        return allAliases;
+      if (!(b in commandsDistance)) {
+        commandsDistance[b] = strings.levenshtein(b, name);
       }
 
-      return allAliases.concat([...option.aliases]);
-    }, [] as string[])
-    .forEach((alias: string) => {
-      delete parsedOptions[alias];
+      return commandsDistance[a] - commandsDistance[b];
     });
 
-  // Remove undefined booleans
-  booleans
-    .filter(b => parsedOptions[b] === undefined)
-    .map(b => coreStrings.camelize(b))
-    .forEach(b => delete parsedOptions[b]);
+    logger.error(tags.stripIndent`
+        The specified command ("${commandName}") is invalid. For a list of available options,
+        run "ng help".
 
-  // remove options with dashes.
-  Object.keys(parsedOptions)
-    .filter(key => key.indexOf('-') !== -1)
-    .forEach(key => delete parsedOptions[key]);
+        Did you mean "${allCommands[0]}"?
+    `);
 
-  // remove the command name
-  parsedOptions._ = parsedOptions._.slice(1);
-
-  return parsedOptions;
-}
-
-// Find a command.
-function findCommand(map: CommandMap, name: string): CommandLocation | null {
-  // let Cmd: CommandConstructor = map[name];
-  let commandName = name;
-
-  if (!map[commandName]) {
-    // find command via aliases
-    commandName = Object.keys(map)
-      .filter(key => {
-        // get aliases for the key
-        const metadataText = readFileSync(map[key]).toString('utf-8');
-        const metadata = JSON.parse(metadataText);
-        const aliases = metadata['$aliases'];
-        if (!aliases) {
-          return false;
-        }
-        const foundAlias = aliases.filter((alias: string) => alias === name);
-
-        return foundAlias.length > 0;
-      })[0];
-  }
-
-  const metadataPath = map[commandName];
-
-  if (!metadataPath) {
-    return null;
-  }
-  const metadataText = readFileSync(metadataPath).toString('utf-8');
-
-  const metadata = parseJson(metadataText) as any;
-
-  return {
-    path: metadataPath,
-    text: metadataText,
-    rawData: metadata,
-  };
-}
-
-// Create an instance of a command.
-async function createCommand(metadata: CommandLocation,
-                             context: CommandContext,
-                             logger: logging.Logger): Promise<Command | null> {
-  const schema = parseSchema(metadata.text);
-  if (schema === null) {
-    return null;
-  }
-  const implPath = schema.$impl;
-  if (typeof implPath !== 'string') {
-    throw new Error('Implementation path is incorrect');
-  }
-
-  const implRef = new ExportStringRef(implPath, dirname(metadata.path));
-
-  const ctor = implRef.ref as CommandConstructor;
-
-  return new ctor(context, logger);
-}
-
-function mapCommandScope(scope: 'in' | 'out' | undefined): CommandScope {
-  let commandScope = CommandScope.everywhere;
-  switch (scope) {
-    case 'in':
-      commandScope = CommandScope.inProject;
-      break;
-    case 'out':
-      commandScope = CommandScope.outsideProject;
-      break;
+    return 1;
   }
 
-  return commandScope;
-}
-
-interface CommandInfo {
-  name: string;
-  description: string;
-  aliases: string[];
-  hidden: boolean;
-}
-function getAllCommandInfo(map: CommandMap): CommandInfo[] {
-  return Object.keys(map)
-    .map(name => {
-      return {
-        name: name,
-        metadata: findCommand(map, name),
-      };
-    })
-    .map(info => {
-      if (info.metadata === null) {
-        return null;
-      }
+  const parsedOptions = parser.parseArguments(args, description.options);
+  Command.setCommandMap(commandMap);
+  const command = new description.impl({ project }, description, logger);
 
-      return {
-        name: info.name,
-        description: info.metadata.rawData.description,
-        aliases: info.metadata.rawData.$aliases || [],
-        hidden: info.metadata.rawData.$hidden || false,
-      };
-    })
-    .filter(info => info !== null) as CommandInfo[];
+  return await command.validateAndRun(parsedOptions);
 }
diff --git a/packages/angular/cli/models/command.ts b/packages/angular/cli/models/command.ts
index 511abc6a813d..53a1e4307179 100644
--- a/packages/angular/cli/models/command.ts
+++ b/packages/angular/cli/models/command.ts
@@ -7,151 +7,149 @@
  */
 
 // tslint:disable:no-global-tslint-disable no-any
-import { JsonValue, logging, terminal } from '@angular-devkit/core';
-
-export interface CommandConstructor {
-  new(context: CommandContext, logger: logging.Logger): Command;
-  readonly name: string;
-  aliases: string[];
-  scope: CommandScope;
-}
-
-export enum CommandScope {
-  everywhere,
-  inProject,
-  outsideProject,
-}
-
-export enum ArgumentStrategy {
-  MapToOptions,
-  Nothing,
+import { logging, strings, tags, terminal } from '@angular-devkit/core';
+import { getWorkspace } from '../utilities/config';
+import {
+  Arguments,
+  CommandContext,
+  CommandDescription,
+  CommandDescriptionMap,
+  CommandProject,
+  CommandScope,
+  Option,
+} from './interface';
+
+export interface BaseCommandOptions {
+  help?: boolean;
+  help_json?: boolean;
+  '--': string[];
 }
 
-export abstract class Command<T = any> {
-  protected _rawArgs: string[];
+export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions> {
   public allowMissingWorkspace = false;
+  public project: CommandProject;
 
-  constructor(context: CommandContext, logger: logging.Logger) {
-    this.logger = logger;
-    if (context) {
-      this.project = context.project;
-    }
+  protected static commandMap: CommandDescriptionMap;
+  static setCommandMap(map: CommandDescriptionMap) {
+    this.commandMap = map;
   }
 
-  public addOptions(options: Option[]) {
-    this.options = (this.options || []).concat(options);
+  constructor(
+    context: CommandContext,
+    public readonly description: CommandDescription,
+    protected readonly logger: logging.Logger,
+  ) {
+    this.project = context.project;
   }
 
-  async initializeRaw(args: string[]): Promise<any> {
-    this._rawArgs = args;
-
-    return args;
-  }
-  async initialize(_options: any): Promise<void> {
+  async initialize(options: T): Promise<void> {
     return;
   }
 
-  validate(_options: T): boolean | Promise<boolean> {
-    return true;
-  }
+  async printHelp(options: T): Promise<number> {
+    await this.printHelpUsage();
+    await this.printHelpOptions();
 
-  printHelp(commandName: string, description: string, options: any): void {
-    if (description) {
-      this.logger.info(description);
-    }
-    this.printHelpUsage(commandName, this.options);
-    this.printHelpOptions(this.options);
+    return 0;
   }
 
-  private _getArguments(options: Option[]) {
-    function _getArgIndex(def: OptionSmartDefault | undefined): number {
-      if (def === undefined || def.$source !== 'argv' || typeof def.index !== 'number') {
-        // If there's no proper order, this argument is wonky. We will show it at the end only
-        // (after all other arguments).
-        return Infinity;
-      }
-
-      return def.index;
-    }
+  async printJsonHelp(_options: T): Promise<number> {
+    this.logger.info(JSON.stringify(this.description));
 
-    return options
-      .filter(opt => this.isArgument(opt))
-      .sort((a, b) => _getArgIndex(a.$default) - _getArgIndex(b.$default));
+    return 0;
   }
 
-  protected printHelpUsage(name: string, options: Option[]) {
-    const args = this._getArguments(options);
-    const opts = options.filter(opt => !this.isArgument(opt));
+  protected async printHelpUsage() {
+    this.logger.info(this.description.description);
+
+    const name = this.description.name;
+    const args = this.description.options.filter(x => x.positional !== undefined);
+    const opts = this.description.options.filter(x => x.positional === undefined);
+
     const argDisplay = args && args.length > 0
       ? ' ' + args.map(a => `<${a.name}>`).join(' ')
       : '';
     const optionsDisplay = opts && opts.length > 0
       ? ` [options]`
       : ``;
+
     this.logger.info(`usage: ng ${name}${argDisplay}${optionsDisplay}`);
+    this.logger.info('');
   }
 
-  protected isArgument(option: Option) {
-    let isArg = false;
-    if (option.$default !== undefined && option.$default.$source === 'argv') {
-      isArg = true;
-    }
-
-    return isArg;
-  }
+  protected async printHelpOptions(options: Option[] = this.description.options) {
+    const args = options.filter(opt => opt.positional !== undefined);
+    const opts = options.filter(opt => opt.positional === undefined);
 
-  protected printHelpOptions(options: Option[]) {
-    if (!options) {
-      return;
-    }
-    const args = options.filter(opt => this.isArgument(opt));
-    const opts = options.filter(opt => !this.isArgument(opt));
     if (args.length > 0) {
       this.logger.info(`arguments:`);
       args.forEach(o => {
         this.logger.info(`  ${terminal.cyan(o.name)}`);
-        this.logger.info(`    ${o.description}`);
+        if (o.description) {
+          this.logger.info(`    ${o.description}`);
+        }
       });
     }
-    if (this.options.length > 0) {
+    if (options.length > 0) {
+      if (args.length > 0) {
+        this.logger.info('');
+      }
       this.logger.info(`options:`);
       opts
         .filter(o => !o.hidden)
-        .sort((a, b) => a.name >= b.name ? 1 : -1)
+        .sort((a, b) => a.name.localeCompare(b.name))
         .forEach(o => {
           const aliases = o.aliases && o.aliases.length > 0
             ? '(' + o.aliases.map(a => `-${a}`).join(' ') + ')'
             : '';
-          this.logger.info(`  ${terminal.cyan('--' + o.name)} ${aliases}`);
-          this.logger.info(`    ${o.description}`);
+          this.logger.info(`  ${terminal.cyan('--' + strings.dasherize(o.name))} ${aliases}`);
+          if (o.description) {
+            this.logger.info(`    ${o.description}`);
+          }
         });
     }
   }
 
-  abstract run(options: T): number | void | Promise<number | void>;
-  public options: Option[];
-  public additionalSchemas: string[] = [];
-  protected readonly logger: logging.Logger;
-  protected readonly project: any;
-}
-
-export interface CommandContext {
-  project: any;
-}
+  async validateScope(): Promise<void> {
+    switch (this.description.scope) {
+      case CommandScope.OutProject:
+        if (this.project.configFile || getWorkspace('local') !== null) {
+          this.logger.fatal(tags.oneLine`
+            The ${this.description.name} command requires to be run outside of a project, but a
+            project definition was found at "${this.project.root}".
+          `);
+          throw 1;
+        }
+        break;
+      case CommandScope.InProject:
+        if (!this.project.configFile || getWorkspace('local') === null) {
+          this.logger.fatal(tags.oneLine`
+            The ${this.description.name} command requires to be run in an Angular project, but a
+            project definition could not be found.
+          `);
+          throw 1;
+        }
+        break;
+      case CommandScope.Everywhere:
+        // Can't miss this.
+        break;
+    }
+  }
 
-export interface Option {
-  name: string;
-  description: string;
-  type: string;
-  default?: string | number | boolean;
-  required?: boolean;
-  aliases?: string[];
-  format?: string;
-  hidden?: boolean;
-  $default?: OptionSmartDefault;
-}
+  abstract async run(options: T & Arguments): Promise<number | void>;
 
-export interface OptionSmartDefault {
-  $source: string;
-  [key: string]: JsonValue;
+  async validateAndRun(options: T & Arguments): Promise<number | void> {
+    if (!options.help && !options.help_json) {
+      await this.validateScope();
+    }
+    await this.initialize(options);
+
+    if (options.help) {
+      return this.printHelp(options);
+    } else if (options.help_json) {
+      return this.printJsonHelp(options);
+    } else {
+      return await this.run(options);
+    }
+  }
 }
diff --git a/packages/angular/cli/models/parser.ts b/packages/angular/cli/models/parser.ts
new file mode 100644
index 000000000000..1af0c368dd0c
--- /dev/null
+++ b/packages/angular/cli/models/parser.ts
@@ -0,0 +1,296 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ *
+ */
+import { strings } from '@angular-devkit/core';
+import { Arguments, Option, Value } from './interface';
+
+
+function _coerceType(str: string | undefined, type: string, v?: Value): Value | undefined {
+  switch (type) {
+    case 'any':
+      if (Array.isArray(v)) {
+        return v.concat(str || '');
+      }
+
+      return _coerceType(str, 'boolean', v) !== undefined ? _coerceType(str, 'boolean', v)
+           : _coerceType(str, 'number', v) !== undefined ? _coerceType(str, 'number', v)
+           : _coerceType(str, 'string', v);
+
+    case 'string':
+      return str || '';
+
+    case 'boolean':
+      switch (str) {
+        case 'false':
+          return false;
+
+        case undefined:
+        case '':
+        case 'true':
+          return true;
+
+        default:
+          return undefined;
+      }
+
+    case 'number':
+      if (str === undefined) {
+        return 0;
+      } else if (Number.isFinite(+str)) {
+        return +str;
+      } else {
+        return undefined;
+      }
+
+    case 'array':
+      return Array.isArray(v) ? v.concat(str || '') : [str || ''];
+
+    default:
+      return undefined;
+  }
+}
+
+function _coerce(str: string | undefined, o: Option | null, v?: Value): Value | undefined {
+  return _coerceType(str, o ? o.type : 'any', v);
+}
+
+
+function _getOptionFromName(name: string, options: Option[]): Option | undefined {
+  const cName = strings.camelize(name);
+
+  for (const option of options) {
+    if (option.name == name || option.name == cName) {
+      return option;
+    }
+
+    if (option.aliases.some(x => x == name || x == cName)) {
+      return option;
+    }
+  }
+
+  return undefined;
+}
+
+
+function _assignOption(
+  arg: string,
+  args: string[],
+  options: Option[],
+  parsedOptions: Arguments,
+  _positionals: string[],
+  leftovers: string[],
+) {
+  let key = arg.substr(2);
+  let option: Option | null = null;
+  let value = '';
+  const i = arg.indexOf('=');
+
+  // If flag is --no-abc AND there's no equal sign.
+  if (i == -1) {
+    if (key.startsWith('no-')) {
+      // Only use this key if the option matching the rest is a boolean.
+      const maybeOption = _getOptionFromName(key.substr(3), options);
+      if (maybeOption && maybeOption.type == 'boolean') {
+        value = 'false';
+        option = maybeOption;
+      }
+    } else if (key.startsWith('no')) {
+      // Only use this key if the option matching the rest is a boolean.
+      const maybeOption = _getOptionFromName(key.substr(2), options);
+      if (maybeOption && maybeOption.type == 'boolean') {
+        value = 'false';
+        option = maybeOption;
+      }
+    }
+
+    if (option === null) {
+      // Set it to true if it's a boolean and the next argument doesn't match true/false.
+      const maybeOption = _getOptionFromName(key, options);
+      if (maybeOption) {
+        // Not of type boolean, consume the next value.
+        value = args[0];
+        // Only absorb it if it leads to a value.
+        if (_coerce(value, maybeOption) !== undefined) {
+          args.shift();
+        } else {
+          value = '';
+        }
+        option = maybeOption;
+      }
+    }
+  } else {
+    key = arg.substring(0, i);
+    option = _getOptionFromName(key, options) || null;
+    if (option) {
+      value = arg.substring(i + 1);
+      if (option.type === 'boolean' && _coerce(value, option) === undefined) {
+        value = 'true';
+      }
+    }
+  }
+  if (option === null) {
+    if (args[0] && !args[0].startsWith('--')) {
+      leftovers.push(arg, args[0]);
+      args.shift();
+    } else {
+      leftovers.push(arg);
+    }
+  } else {
+    const v = _coerce(value, option, parsedOptions[option.name]);
+    if (v !== undefined) {
+      parsedOptions[option.name] = v;
+    }
+  }
+}
+
+
+/**
+ * Parse the arguments in a consistent way, but without having any option definition. This tries
+ * to assess what the user wants in a free form. For example, using `--name=false` will set the
+ * name properties to a boolean type.
+ * This should only be used when there's no schema available or if a schema is "true" (anything is
+ * valid).
+ *
+ * @param args Argument list to parse.
+ * @returns An object that contains a property per flags from the args.
+ */
+export function parseFreeFormArguments(args: string[]): Arguments {
+  const parsedOptions: Arguments = {};
+  const leftovers = [];
+
+  for (let arg = args.shift(); arg !== undefined; arg = args.shift()) {
+    if (arg == '--') {
+      leftovers.push(...args);
+      break;
+    }
+
+    if (arg.startsWith('--')) {
+      const eqSign = arg.indexOf('=');
+      let name: string;
+      let value: string | undefined;
+      if (eqSign !== -1) {
+        name = arg.substring(2, eqSign);
+        value = arg.substring(eqSign + 1);
+      } else {
+        name = arg.substr(2);
+        value = args.shift();
+      }
+
+      const v = _coerce(value, null, parsedOptions[name]);
+      if (v !== undefined) {
+        parsedOptions[name] = v;
+      }
+    } else if (arg.startsWith('-')) {
+      arg.split('').forEach(x => parsedOptions[x] = true);
+    } else {
+      leftovers.push(arg);
+    }
+  }
+
+  parsedOptions['--'] = leftovers;
+
+  return parsedOptions;
+}
+
+
+/**
+ * Parse the arguments in a consistent way, from a list of standardized options.
+ * The result object will have a key per option name, with the `_` key reserved for positional
+ * arguments, and `--` will contain everything that did not match. Any key that don't have an
+ * option will be pushed back in `--` and removed from the object. If you need to validate that
+ * there's no additionalProperties, you need to check the `--` key.
+ *
+ * @param args The argument array to parse.
+ * @param options List of supported options. {@see Option}.
+ * @returns An object that contains a property per option.
+ */
+export function parseArguments(args: string[], options: Option[] | null): Arguments {
+  if (options === null) {
+    options = [];
+  }
+
+  const leftovers: string[] = [];
+  const positionals: string[] = [];
+  const parsedOptions: Arguments = {};
+
+  for (let arg = args.shift(); arg !== undefined; arg = args.shift()) {
+    if (!arg) {
+      break;
+    }
+
+    if (arg == '--') {
+      // If we find a --, we're done.
+      leftovers.push(...args);
+      break;
+    }
+
+    if (arg.startsWith('--')) {
+      _assignOption(arg, args, options, parsedOptions, positionals, leftovers);
+    } else if (arg.startsWith('-')) {
+      // Argument is of form -abcdef.  Starts at 1 because we skip the `-`.
+      for (let i = 1; i < arg.length; i++) {
+        const flag = arg[i];
+        // Treat the last flag as `--a` (as if full flag but just one letter). We do this in
+        // the loop because it saves us a check to see if the arg is just `-`.
+        if (i == arg.length - 1) {
+          _assignOption('--' + flag, args, options, parsedOptions, positionals, leftovers);
+        } else {
+          const maybeOption = _getOptionFromName(flag, options);
+          if (maybeOption) {
+            const v = _coerce(undefined, maybeOption, parsedOptions[maybeOption.name]);
+            if (v !== undefined) {
+              parsedOptions[maybeOption.name] = v;
+            }
+          }
+        }
+      }
+    } else {
+      positionals.push(arg);
+    }
+  }
+
+  // Deal with positionals.
+  if (positionals.length > 0) {
+    let pos = 0;
+    for (let i = 0; i < positionals.length;) {
+      let found = false;
+      let incrementPos = false;
+      let incrementI = true;
+
+      // We do this with a found flag because more than 1 option could have the same positional.
+      for (const option of options) {
+        // If any option has this positional and no value, we need to remove it.
+        if (option.positional === pos) {
+          if (parsedOptions[option.name] === undefined) {
+            parsedOptions[option.name] = positionals[i];
+            found = true;
+          } else {
+            incrementI = false;
+          }
+          incrementPos = true;
+        }
+      }
+
+      if (found) {
+        positionals.splice(i--, 1);
+      }
+      if (incrementPos) {
+        pos++;
+      }
+      if (incrementI) {
+        i++;
+      }
+    }
+  }
+
+  if (positionals.length > 0 || leftovers.length > 0) {
+    parsedOptions['--'] = [...positionals, ...leftovers];
+  }
+
+  return parsedOptions;
+}
diff --git a/packages/angular/cli/models/parser_spec.ts b/packages/angular/cli/models/parser_spec.ts
new file mode 100644
index 000000000000..961f37952aae
--- /dev/null
+++ b/packages/angular/cli/models/parser_spec.ts
@@ -0,0 +1,73 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ *
+ */
+import { Arguments, Option, OptionType } from './interface';
+import { parseArguments } from './parser';
+
+describe('parseArguments', () => {
+  const options: Option[] = [
+    { name: 'bool', aliases: [ 'b' ], type: OptionType.Boolean, description: '' },
+    { name: 'num', aliases: [ 'n' ], type: OptionType.Number, description: '' },
+    { name: 'str', aliases: [ 's' ], type: OptionType.String, description: '' },
+    { name: 'helloWorld', aliases: [], type: OptionType.String, description: '' },
+    { name: 'helloBool', aliases: [], type: OptionType.Boolean, description: '' },
+    { name: 'arr', aliases: [ 'a' ], type: OptionType.Array, description: '' },
+    { name: 'p1', positional: 0, aliases: [], type: OptionType.String, description: '' },
+    { name: 'p2', positional: 1, aliases: [], type: OptionType.String, description: '' },
+  ];
+
+  const tests: { [test: string]: Partial<Arguments> } = {
+    '--bool': { bool: true },
+    '--bool=1': { bool: true },
+    '--bool=true': { bool: true },
+    '--bool=false': { bool: false },
+    '--no-bool': { bool: false },
+    '--no-bool=true': { '--': ['--no-bool=true'] },
+    '--b=true': { bool: true },
+    '--b=false': { bool: false },
+    '--b true': { bool: true },
+    '--b false': { bool: false },
+    '--bool --num': { bool: true, num: 0 },
+    '--bool --num=true': { bool: true },
+    '--bool=true --num': { bool: true, num: 0 },
+    '--bool true --num': { bool: true, num: 0 },
+    '--bool=false --num': { bool: false, num: 0 },
+    '--bool false --num': { bool: false, num: 0 },
+    '--str false --num': { str: 'false', num: 0 },
+    '--str=false --num': { str: 'false', num: 0 },
+    '--str=false --num1': { str: 'false', '--': ['--num1'] },
+    '--str=false val1 --num1': { str: 'false', p1: 'val1', '--': ['--num1'] },
+    '--str=false val1 val2': { str: 'false', p1: 'val1', p2: 'val2' },
+    '--str=false val1 val2 --num1': { str: 'false', p1: 'val1', p2: 'val2', '--': ['--num1'] },
+    '--str=false val1 --num1 val2': { str: 'false', p1: 'val1', '--': ['--num1', 'val2'] },
+    'val1 --num=1 val2': { num: 1, p1: 'val1', p2: 'val2' },
+    '--p1=val1 --num=1 val2': { num: 1, p1: 'val1', p2: 'val2' },
+    '--p1=val1 --num=1 --p2=val2 val3': { num: 1, p1: 'val1', p2: 'val2', '--': ['val3'] },
+    '--bool val1 --etc --num val2 --v': { bool: true, num: 0, p1: 'val1', p2: 'val2',
+                                          '--': ['--etc', '--v'] },
+    '--arr=a --arr=b --arr c d': { arr: ['a', 'b', 'c'], p1: 'd' },
+    '--arr=1 --arr --arr c d': { arr: ['1', '--arr'], p1: 'c', p2: 'd' },
+    '--str=1': { str: '1' },
+    '--hello-world=1': { helloWorld: '1' },
+    '--hello-bool': { helloBool: true },
+    '--helloBool': { helloBool: true },
+    '--no-helloBool': { helloBool: false },
+    '--noHelloBool': { helloBool: false },
+    '-b': { bool: true },
+    '-sb': { bool: true, str: '' },
+    '-bs': { bool: true, str: '' },
+  };
+
+  Object.entries(tests).forEach(([str, expected]) => {
+    it(`works for ${str}`, () => {
+      const actual = parseArguments(str.split(/\s+/), options);
+
+      expect(actual).toEqual(expected as Arguments);
+    });
+  });
+});
diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index ef122769ae77..0c44982c52a7 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -36,12 +36,10 @@
     "@schematics/angular": "0.0.0",
     "@schematics/update": "0.0.0",
     "inquirer": "^6.1.0",
-    "json-schema-traverse": "^0.4.1",
     "opn": "^5.3.0",
     "rxjs": "~6.2.0",
     "semver": "^5.1.0",
-    "symbol-observable": "^1.2.0",
-    "yargs-parser": "^10.0.0"
+    "symbol-observable": "^1.2.0"
   },
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json"
diff --git a/yarn.lock b/yarn.lock
index 41f1c83ef417..00e64d738515 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7978,12 +7978,6 @@ yallist@^3.0.0, yallist@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
 
-yargs-parser@^10.0.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
-  dependencies:
-    camelcase "^4.1.0"
-
 yargs-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"

From 95176771587e12244e7ad15c2e35a85e38bfd706 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 4 Sep 2018 14:45:15 -0700
Subject: [PATCH 0037/1703] feat(@angular-devkit/core): remove
 addUndefinedDefaults as default post transform

And various bug fixes.
---
 .../core/src/json/schema/index.ts             |   1 +
 .../core/src/json/schema/interface.ts         |  42 +++-
 .../core/src/json/schema/registry.ts          | 218 ++++++++++++++----
 .../core/src/json/schema/registry_spec.ts     |  10 +-
 .../core/src/json/schema/visitor.ts           |  65 +++---
 .../schematics/src/workflow/base.ts           |   9 +-
 .../testing/schematic-test-runner.ts          |   1 +
 .../schematics/tools/description.ts           |   3 +
 .../tools/workflow/node-workflow.ts           |   4 +-
 9 files changed, 265 insertions(+), 88 deletions(-)

diff --git a/packages/angular_devkit/core/src/json/schema/index.ts b/packages/angular_devkit/core/src/json/schema/index.ts
index 862c127a6b06..e5ff6c4a63c5 100644
--- a/packages/angular_devkit/core/src/json/schema/index.ts
+++ b/packages/angular_devkit/core/src/json/schema/index.ts
@@ -9,6 +9,7 @@ export * from './interface';
 export * from './pointer';
 export * from './registry';
 export * from './visitor';
+export * from './utility';
 
 import * as transforms from './transforms';
 
diff --git a/packages/angular_devkit/core/src/json/schema/interface.ts b/packages/angular_devkit/core/src/json/schema/interface.ts
index 6f0f092629c3..9861a30889ac 100644
--- a/packages/angular_devkit/core/src/json/schema/interface.ts
+++ b/packages/angular_devkit/core/src/json/schema/interface.ts
@@ -58,12 +58,13 @@ export interface SchemaValidatorResult {
 }
 
 export interface SchemaValidatorOptions {
-  withPrompts: boolean;
+  applyPreTransforms?: boolean;
+  applyPostTransforms?: boolean;
+  withPrompts?: boolean;
 }
 
 export interface SchemaValidator {
-  // tslint:disable-next-line:no-any
-  (data: any, options?: Partial<SchemaValidatorOptions>): Observable<SchemaValidatorResult>;
+  (data: JsonValue, options?: SchemaValidatorOptions): Observable<SchemaValidatorResult>;
 }
 
 export interface SchemaFormatter {
@@ -112,7 +113,42 @@ export type PromptProvider = (definitions: Array<PromptDefinition>)
 
 export interface SchemaRegistry {
   compile(schema: Object): Observable<SchemaValidator>;
+  flatten(schema: JsonObject | string): Observable<JsonObject>;
   addFormat(format: SchemaFormat): void;
   addSmartDefaultProvider<T>(source: string, provider: SmartDefaultProvider<T>): void;
   usePromptProvider(provider: PromptProvider): void;
+
+  /**
+   * Add a transformation step before the validation of any Json.
+   * @param {JsonVisitor} visitor The visitor to transform every value.
+   * @param {JsonVisitor[]} deps A list of other visitors to run before.
+   */
+  addPreTransform(visitor: JsonVisitor, deps?: JsonVisitor[]): void;
+
+  /**
+   * Add a transformation step after the validation of any Json. The JSON will not be validated
+   * after the POST, so if transformations are not compatible with the Schema it will not result
+   * in an error.
+   * @param {JsonVisitor} visitor The visitor to transform every value.
+   * @param {JsonVisitor[]} deps A list of other visitors to run before.
+   */
+  addPostTransform(visitor: JsonVisitor, deps?: JsonVisitor[]): void;
+}
+
+export interface JsonSchemaVisitor {
+  (
+    current: JsonObject | JsonArray,
+    pointer: JsonPointer,
+    parentSchema?: JsonObject | JsonArray,
+    index?: string,
+  ): void;
+}
+
+export interface JsonVisitor {
+  (
+    value: JsonValue,
+    pointer: JsonPointer,
+    schema?: JsonObject,
+    root?: JsonObject | JsonArray,
+  ): Observable<JsonValue> | JsonValue;
 }
diff --git a/packages/angular_devkit/core/src/json/schema/registry.ts b/packages/angular_devkit/core/src/json/schema/registry.ts
index 89130f10d563..785af9a7a7ac 100644
--- a/packages/angular_devkit/core/src/json/schema/registry.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry.ts
@@ -7,12 +7,15 @@
  */
 import * as ajv from 'ajv';
 import * as http from 'http';
-import { Observable, from, of as observableOf, throwError } from 'rxjs';
+import { Observable, from, of, throwError } from 'rxjs';
 import { concatMap, map, switchMap, tap } from 'rxjs/operators';
+import * as Url from 'url';
 import { BaseException } from '../../exception/exception';
-import { PartiallyOrderedSet, isObservable } from '../../utils';
-import { JsonObject, JsonValue } from '../interface';
+import { PartiallyOrderedSet, deepCopy, isObservable } from '../../utils';
+import { JsonArray, JsonObject, JsonValue, isJsonObject } from '../interface';
 import {
+  JsonPointer,
+  JsonVisitor,
   PromptDefinition,
   PromptProvider,
   SchemaFormat,
@@ -24,10 +27,7 @@ import {
   SchemaValidatorResult,
   SmartDefaultProvider,
 } from './interface';
-import { addUndefinedDefaults } from './transforms';
-import { JsonVisitor, visitJson } from './visitor';
-
-const serialize = require('fast-json-stable-stringify');
+import { visitJson, visitJsonSchema } from './visitor';
 
 // This interface should be exported from ajv, but they only export the class and not the type.
 interface AjvValidationError {
@@ -37,6 +37,14 @@ interface AjvValidationError {
   validation: true;
 }
 
+interface AjvRefMap {
+  refs: string[];
+  refVal: any; // tslint:disable-line:no-any
+  schema: JsonObject;
+}
+
+export type UriHandler = (uri: string) => Observable<JsonObject> | null | undefined;
+
 export class SchemaValidationException extends BaseException {
   public readonly errors: SchemaValidatorError[];
 
@@ -81,10 +89,11 @@ interface SchemaInfo {
 export class CoreSchemaRegistry implements SchemaRegistry {
   private _ajv: ajv.Ajv;
   private _uriCache = new Map<string, JsonObject>();
+  private _uriHandlers = new Set<UriHandler>();
   private _pre = new PartiallyOrderedSet<JsonVisitor>();
   private _post = new PartiallyOrderedSet<JsonVisitor>();
+
   private _currentCompilationSchemaInfo?: SchemaInfo;
-  private _validatorCache = new Map<string, SchemaValidator>();
 
   private _smartDefaultKeyword = false;
   private _promptProvider?: PromptProvider;
@@ -110,8 +119,6 @@ export class CoreSchemaRegistry implements SchemaRegistry {
 
     this._ajv.addMetaSchema(require('ajv/lib/refs/json-schema-draft-04.json'));
     this._ajv.addMetaSchema(require('ajv/lib/refs/json-schema-draft-06.json'));
-
-    this.addPostTransform(addUndefinedDefaults);
   }
 
   private _fetch(uri: string): Promise<JsonObject> {
@@ -121,12 +128,24 @@ export class CoreSchemaRegistry implements SchemaRegistry {
       return Promise.resolve(maybeSchema);
     }
 
+    // Try all handlers, one after the other.
+    for (const maybeHandler of this._uriHandlers) {
+      const handler = maybeHandler(uri);
+      if (handler) {
+        // The AJV API only understands Promises.
+        return handler.pipe(
+          tap(json => this._uriCache.set(uri, json)),
+        ).toPromise();
+      }
+    }
+
+    // If none are found, handle using http client.
     return new Promise<JsonObject>((resolve, reject) => {
       http.get(uri, res => {
         if (!res.statusCode || res.statusCode >= 300) {
           // Consume the rest of the data to free memory.
           res.resume();
-          reject(`Request failed. Status Code: ${res.statusCode}`);
+          reject(new Error(`Request failed. Status Code: ${res.statusCode}`));
         } else {
           res.setEncoding('utf8');
           let data = '';
@@ -175,9 +194,22 @@ export class CoreSchemaRegistry implements SchemaRegistry {
       return {};
     }
 
-    // tslint:disable-next-line:no-any
-    const id = (validate.schema as any).$id || (validate.schema as any).id;
-    let fullReference = (ref[0] === '#' && id) ? id + ref : ref;
+    let refMap = validate as AjvRefMap;
+    const rootRefMap = validate.root as AjvRefMap;
+
+    // Resolve from the root if it's different.
+    if (validate.root && validate.schema !== rootRefMap.schema) {
+      refMap = rootRefMap;
+    }
+
+    const schema = refMap.schema ? typeof refMap.schema == 'object' && refMap.schema : null;
+    const maybeId = schema ? (schema as JsonObject).id || (schema as JsonObject).$id : null;
+
+    if (typeof maybeId == 'string') {
+      ref = Url.resolve(maybeId, ref);
+    }
+
+    let fullReference = (ref[0] === '#' && maybeId) ? maybeId + ref : ref;
     if (fullReference.endsWith('#')) {
       fullReference = fullReference.slice(0, -1);
     }
@@ -185,21 +217,95 @@ export class CoreSchemaRegistry implements SchemaRegistry {
     // tslint:disable-next-line:no-any
     const context = validate.refVal[(validate.refs as any)[fullReference]];
 
-    return { context, schema: context && context.schema as JsonObject };
+    if (typeof context == 'function') {
+      // Context will be a function if the schema isn't loaded yet, and an actual schema if it's
+      // synchronously available.
+      return { context, schema: context && context.schema as JsonObject };
+    } else {
+      return { context: validate, schema: context as JsonObject };
+    }
   }
 
-  compile(schema: JsonObject): Observable<SchemaValidator> {
-    const schemaKey = serialize(schema);
-    const existingValidator = this._validatorCache.get(schemaKey);
-    if (existingValidator) {
-      return observableOf(existingValidator);
+  /**
+   * Flatten the Schema, resolving and replacing all the refs. Makes it into a synchronous schema
+   * that is also easier to traverse. Does not cache the result.
+   *
+   * @param schema The schema or URI to flatten.
+   * @returns An Observable of the flattened schema object.
+   */
+  flatten(schema: JsonObject): Observable<JsonObject> {
+    this._ajv.removeSchema(schema);
+
+    // Supports both synchronous and asynchronous compilation, by trying the synchronous
+    // version first, then if refs are missing this will fails.
+    // We also add any refs from external fetched schemas so that those will also be used
+    // in synchronous (if available).
+    let validator: Observable<ajv.ValidateFunction>;
+    try {
+      this._currentCompilationSchemaInfo = undefined;
+      validator = of(this._ajv.compile(schema)).pipe(
+        tap(() => this._currentCompilationSchemaInfo = undefined),
+      );
+    } catch (e) {
+      // Propagate the error.
+      if (!(e instanceof (ajv.MissingRefError as {} as Function))) {
+        return throwError(e);
+      }
+
+      this._currentCompilationSchemaInfo = undefined;
+      validator = from(this._ajv.compileAsync(schema)).pipe(
+        tap(() => this._currentCompilationSchemaInfo = undefined),
+      );
     }
 
+    return validator.pipe(
+      switchMap(validate => {
+        const self = this;
+
+        function visitor(
+          current: JsonObject | JsonArray,
+          pointer: JsonPointer,
+          parentSchema?: JsonObject | JsonArray,
+          index?: string,
+        ) {
+          if (current
+            && parentSchema
+            && index
+            && isJsonObject(current)
+            && current.hasOwnProperty('$ref')
+            && typeof current['$ref'] == 'string'
+          ) {
+            const resolved = self._resolver(current['$ref'] as string, validate);
+
+            if (resolved.schema) {
+              (parentSchema as JsonObject)[index] = resolved.schema;
+            }
+          }
+        }
+
+        const schema = deepCopy(validate.schema as JsonObject);
+        visitJsonSchema(schema, visitor);
+
+        return of(schema);
+      }),
+    );
+  }
+
+  /**
+   * Compile and return a validation function for the Schema.
+   *
+   * @param schema The schema to validate. If a string, will fetch the schema before compiling it
+   * (using schema as a URI).
+   * @returns An Observable of the Validation function.
+   */
+  compile(schema: JsonObject): Observable<SchemaValidator> {
     const schemaInfo: SchemaInfo = {
       smartDefaultRecord: new Map<string, JsonObject>(),
       promptDefinitions: [],
     };
 
+    this._ajv.removeSchema(schema);
+
     // Supports both synchronous and asynchronous compilation, by trying the synchronous
     // version first, then if refs are missing this will fails.
     // We also add any refs from external fetched schemas so that those will also be used
@@ -207,7 +313,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
     let validator: Observable<ajv.ValidateFunction>;
     try {
       this._currentCompilationSchemaInfo = schemaInfo;
-      validator = observableOf(this._ajv.compile(schema));
+      validator = of(this._ajv.compile(schema));
     } catch (e) {
       // Propagate the error.
       if (!(e instanceof (ajv.MissingRefError as {} as Function))) {
@@ -223,29 +329,36 @@ export class CoreSchemaRegistry implements SchemaRegistry {
 
     return validator
       .pipe(
-        map<ajv.ValidateFunction, SchemaValidator>(validate => (data, options) => {
+        map(validate => (data: JsonValue, options?: SchemaValidatorOptions) => {
           const validationOptions: SchemaValidatorOptions = {
             withPrompts: true,
+            applyPostTransforms: true,
+            applyPreTransforms: true,
             ...options,
           };
           const validationContext = {
             promptFieldsWithValue: new Set<string>(),
           };
 
-          return observableOf(data).pipe(
-            ...[...this._pre].map(visitor => concatMap((data: JsonValue) => {
-              return visitJson(data, visitor, schema, this._resolver, validate);
-            })),
-          ).pipe(
+          let result = of(data);
+          if (validationOptions.applyPreTransforms) {
+            result = result.pipe(
+              ...[...this._pre].map(visitor => concatMap((data: JsonValue) => {
+                return visitJson(data, visitor, schema, this._resolver, validate);
+              })),
+            );
+          }
+
+          return result.pipe(
             switchMap(updateData => this._applySmartDefaults(
               updateData,
               schemaInfo.smartDefaultRecord,
             )),
-            switchMap((updatedData: JsonValue) => {
+            switchMap(updatedData => {
               const result = validate.call(validationContext, updatedData);
 
               return typeof result == 'boolean'
-                ? observableOf([updatedData, result])
+                ? of([updatedData, result])
                 : from((result as Promise<boolean>)
                   .then(r => [updatedData, true])
                   .catch((err: Error | AjvValidationError) => {
@@ -259,8 +372,8 @@ export class CoreSchemaRegistry implements SchemaRegistry {
                   }));
             }),
             switchMap(([data, valid]: [JsonValue, boolean]) => {
-              if (!validationOptions.withPrompts) {
-                return observableOf([data, valid]);
+              if (validationOptions.withPrompts === false) {
+                return of([data, valid]);
               }
 
               const definitions = schemaInfo.promptDefinitions
@@ -271,20 +384,26 @@ export class CoreSchemaRegistry implements SchemaRegistry {
                   map(data => [data, valid]),
                 );
               } else {
-                return observableOf([data, valid]);
+                return of([data, valid]);
               }
             }),
             switchMap(([data, valid]: [JsonValue, boolean]) => {
               if (valid) {
-                return observableOf(data).pipe(
-                  ...[...this._post].map(visitor => concatMap((data: JsonValue) => {
-                    return visitJson(data as JsonValue, visitor, schema, this._resolver, validate);
-                  })),
-                ).pipe(
+                let result = of(data);
+
+                if (validationOptions.applyPostTransforms) {
+                  result = result.pipe(
+                    ...[...this._post].map(visitor => concatMap((data: JsonValue) => {
+                      return visitJson(data, visitor, schema, this._resolver, validate);
+                    })),
+                  );
+                }
+
+                return result.pipe(
                   map(data => [data, valid]),
                 );
               } else {
-                return observableOf([data, valid]);
+                return of([data, valid]);
               }
             }),
             map(([data, valid]: [JsonValue, boolean]) => {
@@ -300,7 +419,6 @@ export class CoreSchemaRegistry implements SchemaRegistry {
             }),
           );
         }),
-        tap(v => this._validatorCache.set(schemaKey, v)),
       );
   }
 
@@ -339,14 +457,14 @@ export class CoreSchemaRegistry implements SchemaRegistry {
         valid: true,
         compile: (schema, _parentSchema, it) => {
           const compilationSchemInfo = this._currentCompilationSchemaInfo;
-          if (!compilationSchemInfo) {
-            throw new Error('Invalid JSON schema compilation state');
+          if (compilationSchemInfo === undefined) {
+            return () => true;
           }
 
           // We cheat, heavily.
           compilationSchemInfo.smartDefaultRecord.set(
             // tslint:disable-next-line:no-any
-            JSON.stringify((it as any).dataPathArr.slice(1, it.dataLevel + 1) as string[]),
+            JSON.stringify((it as any).dataPathArr.slice(1, (it as any).dataLevel + 1) as string[]),
             schema,
           );
 
@@ -364,6 +482,10 @@ export class CoreSchemaRegistry implements SchemaRegistry {
     }
   }
 
+  registerUriHandler(handler: UriHandler) {
+    this._uriHandlers.add(handler);
+  }
+
   usePromptProvider(provider: PromptProvider) {
     const isSetup = !!this._promptProvider;
 
@@ -378,8 +500,10 @@ export class CoreSchemaRegistry implements SchemaRegistry {
       valid: true,
       compile: (schema, parentSchema: JsonObject, it) => {
         const compilationSchemInfo = this._currentCompilationSchemaInfo;
-        if (!compilationSchemInfo) {
+        if (compilationSchemInfo === undefined) {
           throw new Error('Invalid JSON schema compilation state');
+        } else if (compilationSchemInfo === null) {
+          return () => true;
         }
 
         // tslint:disable-next-line:no-any
@@ -477,7 +601,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
   private _applyPrompts<T>(data: T, prompts: Array<PromptDefinition>): Observable<T> {
     const provider = this._promptProvider;
     if (!provider) {
-      return observableOf(data);
+      return of(data);
     }
 
     prompts.sort((a, b) => b.priority - a.priority);
@@ -564,16 +688,16 @@ export class CoreSchemaRegistry implements SchemaRegistry {
     data: T,
     smartDefaults: Map<string, JsonObject>,
   ): Observable<T> {
-    return observableOf(data).pipe(
+    return of(data).pipe(
       ...[...smartDefaults.entries()].map(([pointer, schema]) => {
         return concatMap<T, T>(data => {
           const fragments = JSON.parse(pointer);
           const source = this._sourceMap.get((schema as JsonObject).$source as string);
 
-          let value = source ? source(schema) : observableOf(undefined);
+          let value = source ? source(schema) : of(undefined);
 
           if (!isObservable(value)) {
-            value = observableOf(value);
+            value = of(value);
           }
 
           return (value as Observable<{}>).pipe(
diff --git a/packages/angular_devkit/core/src/json/schema/registry_spec.ts b/packages/angular_devkit/core/src/json/schema/registry_spec.ts
index 773a87a479bf..b221ac9cde91 100644
--- a/packages/angular_devkit/core/src/json/schema/registry_spec.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry_spec.ts
@@ -9,11 +9,13 @@
 import { of as observableOf } from 'rxjs';
 import { map, mergeMap } from 'rxjs/operators';
 import { CoreSchemaRegistry } from './registry';
+import { addUndefinedDefaults } from './transforms';
 
 
 describe('CoreSchemaRegistry', () => {
   it('works asynchronously', done => {
     const registry = new CoreSchemaRegistry();
+    registry.addPostTransform(addUndefinedDefaults);
     const data: any = {};  // tslint:disable-line:no-any
 
     registry
@@ -45,6 +47,7 @@ describe('CoreSchemaRegistry', () => {
 
   it('supports pre transforms', done => {
     const registry = new CoreSchemaRegistry();
+    registry.addPostTransform(addUndefinedDefaults);
     const data: any = {};  // tslint:disable-line:no-any
 
     registry.addPreTransform((data, ptr) => {
@@ -82,6 +85,7 @@ describe('CoreSchemaRegistry', () => {
 
   it('supports local references', done => {
     const registry = new CoreSchemaRegistry();
+    registry.addPostTransform(addUndefinedDefaults);
     const data = { numbers: { one: 1 } };
 
     registry
@@ -108,6 +112,7 @@ describe('CoreSchemaRegistry', () => {
 
   it('fails on invalid additionalProperties', done => {
     const registry = new CoreSchemaRegistry();
+    registry.addPostTransform(addUndefinedDefaults);
     const data = { notNum: 'foo' };
 
     registry
@@ -129,6 +134,7 @@ describe('CoreSchemaRegistry', () => {
 
   it('fails on invalid additionalProperties async', done => {
     const registry = new CoreSchemaRegistry();
+    registry.addPostTransform(addUndefinedDefaults);
     const data = { notNum: 'foo' };
 
     registry
@@ -156,6 +162,7 @@ describe('CoreSchemaRegistry', () => {
   // (i.e. not relyign on the observable).
   it('works synchronously', done => {
     const registry = new CoreSchemaRegistry();
+    registry.addPostTransform(addUndefinedDefaults);
     const data: any = {};  // tslint:disable-line:no-any
     let isDone = false;
 
@@ -298,7 +305,7 @@ describe('CoreSchemaRegistry', () => {
 
       return schema['blue'];
     });
-    registry.addSmartDefaultProvider('test3', (schema) => {
+    registry.addSmartDefaultProvider('test3', () => {
       return [ 1, 2, 3 ];
     });
 
@@ -369,6 +376,7 @@ describe('CoreSchemaRegistry', () => {
 
   it('adds undefined properties', done => {
     const registry = new CoreSchemaRegistry();
+    registry.addPostTransform(addUndefinedDefaults);
     const data: any = {};  // tslint:disable-line:no-any
 
     registry
diff --git a/packages/angular_devkit/core/src/json/schema/visitor.ts b/packages/angular_devkit/core/src/json/schema/visitor.ts
index 8091785cf06d..0708c3564c51 100644
--- a/packages/angular_devkit/core/src/json/schema/visitor.ts
+++ b/packages/angular_devkit/core/src/json/schema/visitor.ts
@@ -9,27 +9,9 @@ import { Observable, concat, from, of as observableOf } from 'rxjs';
 import { concatMap, ignoreElements, mergeMap, tap } from 'rxjs/operators';
 import { isObservable } from '../../utils';
 import { JsonArray, JsonObject, JsonValue } from '../interface';
-import { JsonPointer } from './interface';
+import { JsonPointer, JsonSchemaVisitor, JsonVisitor } from './interface';
 import { buildJsonPointer, joinJsonPointer } from './pointer';
 
-export interface JsonSchemaVisitor {
-  (
-    current: JsonObject | JsonArray,
-    pointer: JsonPointer,
-    parentSchema?: JsonObject | JsonArray,
-    index?: string,
-  ): void;
-}
-
-export interface JsonVisitor {
-  (
-    value: JsonValue,
-    pointer: JsonPointer,
-    schema?: JsonObject,
-    root?: JsonObject | JsonArray,
-  ): Observable<JsonValue> | JsonValue;
-}
-
 
 export interface ReferenceResolver<ContextT> {
   (ref: string, context?: ContextT): { context?: ContextT, schema?: JsonObject };
@@ -167,6 +149,13 @@ export function visitJsonSchema(schema: JsonObject, visitor: JsonSchemaVisitor)
     not: true,
   };
 
+  const arrayKeywords = {
+    items: true,
+    allOf: true,
+    anyOf: true,
+    oneOf: true,
+  };
+
   const propsKeywords = {
     definitions: true,
     properties: true,
@@ -188,23 +177,11 @@ export function visitJsonSchema(schema: JsonObject, visitor: JsonSchemaVisitor)
 
       for (const key of Object.keys(schema)) {
         const sch = schema[key];
-        if (Array.isArray(sch)) {
-          if (key == 'items') {
-            for (let i = 0; i < sch.length; i++) {
-              _traverse(
-                sch[i] as JsonArray,
-                joinJsonPointer(jsonPtr, key, '' + i),
-                rootSchema,
-                schema,
-                '' + i,
-              );
-            }
-          }
-        } else if (key in propsKeywords) {
+        if (key in propsKeywords) {
           if (sch && typeof sch == 'object') {
             for (const prop of Object.keys(sch)) {
               _traverse(
-                sch[prop] as JsonObject,
+                (sch as JsonObject)[prop] as JsonObject,
                 joinJsonPointer(jsonPtr, key, prop),
                 rootSchema,
                 schema,
@@ -214,6 +191,28 @@ export function visitJsonSchema(schema: JsonObject, visitor: JsonSchemaVisitor)
           }
         } else if (key in keywords) {
           _traverse(sch as JsonObject, joinJsonPointer(jsonPtr, key), rootSchema, schema, key);
+        } else if (key in arrayKeywords) {
+          if (Array.isArray(sch)) {
+            for (let i = 0; i < sch.length; i++) {
+              _traverse(
+                sch[i] as JsonArray,
+                joinJsonPointer(jsonPtr, key, '' + i),
+                rootSchema,
+                sch,
+                '' + i,
+              );
+            }
+          }
+        } else if (Array.isArray(sch)) {
+          for (let i = 0; i < sch.length; i++) {
+            _traverse(
+              sch[i] as JsonArray,
+              joinJsonPointer(jsonPtr, key, '' + i),
+              rootSchema,
+              sch,
+              '' + i,
+            );
+          }
         }
       }
     }
diff --git a/packages/angular_devkit/schematics/src/workflow/base.ts b/packages/angular_devkit/schematics/src/workflow/base.ts
index ae5ba62f8bfb..134cde1e61f6 100644
--- a/packages/angular_devkit/schematics/src/workflow/base.ts
+++ b/packages/angular_devkit/schematics/src/workflow/base.ts
@@ -62,7 +62,14 @@ export abstract class BaseWorkflow implements Workflow {
   constructor(options: BaseWorkflowOptions) {
     this._host = options.host;
     this._engineHost = options.engineHost;
-    this._registry = options.registry || new schema.CoreSchemaRegistry(standardFormats);
+
+    if (options.registry) {
+      this._registry = options.registry;
+    } else {
+      this._registry = new schema.CoreSchemaRegistry(standardFormats);
+      this._registry.addPostTransform(schema.transforms.addUndefinedDefaults);
+    }
+
     this._engine = new SchematicEngine(this._engineHost, this);
 
     this._context = [];
diff --git a/packages/angular_devkit/schematics/testing/schematic-test-runner.ts b/packages/angular_devkit/schematics/testing/schematic-test-runner.ts
index a105d260bede..1c0c06ac1ce8 100644
--- a/packages/angular_devkit/schematics/testing/schematic-test-runner.ts
+++ b/packages/angular_devkit/schematics/testing/schematic-test-runner.ts
@@ -57,6 +57,7 @@ export class SchematicTestRunner {
     this._logger = new logging.Logger('test');
 
     const registry = new schema.CoreSchemaRegistry(formats.standardFormats);
+    registry.addPostTransform(schema.transforms.addUndefinedDefaults);
 
     this._engineHost.registerOptionsTransform(validateOptionsWithSchema(registry));
     this._engineHost.registerTaskExecutor(BuiltinTaskExecutor.NodePackage);
diff --git a/packages/angular_devkit/schematics/tools/description.ts b/packages/angular_devkit/schematics/tools/description.ts
index faf18574635c..a6501af85375 100644
--- a/packages/angular_devkit/schematics/tools/description.ts
+++ b/packages/angular_devkit/schematics/tools/description.ts
@@ -10,6 +10,7 @@ import {
   Collection,
   CollectionDescription,
   RuleFactory,
+  Schematic,
   SchematicDescription,
   TypedSchematicContext,
 } from '../src';
@@ -45,6 +46,8 @@ export interface FileSystemSchematicDescription extends FileSystemSchematicJsonD
  */
 export declare type FileSystemCollection
   = Collection<FileSystemCollectionDescription, FileSystemSchematicDescription>;
+export declare type FileSystemSchematic
+  = Schematic<FileSystemCollectionDescription, FileSystemSchematicDescription>;
 export declare type FileSystemCollectionDesc
   = CollectionDescription<FileSystemCollectionDescription>;
 export declare type FileSystemSchematicDesc
diff --git a/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts b/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts
index 740f23e27a97..20ed4d9a9382 100644
--- a/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts
+++ b/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts
@@ -5,9 +5,8 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Path, schema, virtualFs } from '@angular-devkit/core';
+import { Path, virtualFs } from '@angular-devkit/core';
 import {
-  formats,
   workflow,
 } from '@angular-devkit/schematics';  // tslint:disable-line:no-implicit-dependencies
 import { BuiltinTaskExecutor } from '../../tasks/node';
@@ -30,7 +29,6 @@ export class NodeWorkflow extends workflow.BaseWorkflow {
     const engineHost = new NodeModulesEngineHost();
     super({
       host: host,
-      registry: new schema.CoreSchemaRegistry(formats.standardFormats),
       engineHost: engineHost,
 
       force: options.force,

From fd7bcd25fe1af58bf25c22968852aa2cbdb4dde1 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 4 Sep 2018 14:45:59 -0700
Subject: [PATCH 0038/1703] fix(@angular-devkit/core): use architect key only
 if it exists

And if target didnt exist.
---
 .../angular_devkit/core/src/workspace/workspace.ts     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/core/src/workspace/workspace.ts b/packages/angular_devkit/core/src/workspace/workspace.ts
index a4252a9ee5b7..d03bdb42c898 100644
--- a/packages/angular_devkit/core/src/workspace/workspace.ts
+++ b/packages/angular_devkit/core/src/workspace/workspace.ts
@@ -63,6 +63,7 @@ export class Workspace {
 
   constructor(private _root: Path, private _host: virtualFs.Host<{}>) {
     this._registry = new schema.CoreSchemaRegistry();
+    this._registry.addPostTransform(schema.transforms.addUndefinedDefaults);
   }
 
   loadWorkspaceFromJson(json: {}) {
@@ -232,7 +233,9 @@ export class Workspace {
     let workspaceTool = this._workspace[toolName];
 
     // Try falling back to 'architect' if 'targets' is not there or is empty.
-    if ((!workspaceTool || Object.keys(workspaceTool).length === 0) && toolName === 'targets') {
+    if ((!workspaceTool || Object.keys(workspaceTool).length === 0)
+        && toolName === 'targets'
+        && this._workspace['architect']) {
       workspaceTool = this._workspace['architect'];
     }
 
@@ -257,11 +260,12 @@ export class Workspace {
     let projectTool = workspaceProject[toolName];
 
     // Try falling back to 'architect' if 'targets' is not there or is empty.
-    if ((!projectTool || Object.keys(projectTool).length === 0) && toolName === 'targets') {
+    if ((!projectTool || Object.keys(projectTool).length === 0)
+        && workspaceProject['architect']
+        && toolName === 'targets') {
       projectTool = workspaceProject['architect'];
     }
 
-
     if (!projectTool) {
       throw new ProjectToolNotFoundException(toolName);
     }

From de7ec8487299bc2fe4a9820fc52c5b1d9af2a711 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 4 Sep 2018 14:54:37 -0700
Subject: [PATCH 0039/1703] feat(@angular/cli): add --helpJson (or --help-json)
 too all commands

And other refactors.

The interface for the JSON is available in command.ts (the CommandDescription).
---
 packages/angular/cli/commands/add-impl.ts     |  57 +--
 packages/angular/cli/commands/add.json        |  31 +-
 packages/angular/cli/commands/build-impl.ts   |   6 +-
 packages/angular/cli/commands/build.json      |  28 +-
 packages/angular/cli/commands/config-impl.ts  |  10 +-
 packages/angular/cli/commands/config.json     |   4 +-
 .../angular/cli/commands/definitions.json     |  64 +++
 packages/angular/cli/commands/doc-impl.ts     |  22 +-
 packages/angular/cli/commands/doc.json        |   4 +-
 packages/angular/cli/commands/e2e.json        |  21 +-
 .../angular/cli/commands/easter-egg-impl.ts   |   2 +-
 packages/angular/cli/commands/easter-egg.json |   4 +-
 packages/angular/cli/commands/eject-impl.ts   |  15 +-
 packages/angular/cli/commands/eject.json      |   9 +-
 .../angular/cli/commands/generate-impl.ts     | 104 ++--
 packages/angular/cli/commands/generate.json   |  49 +-
 packages/angular/cli/commands/help-impl.ts    |  33 +-
 packages/angular/cli/commands/help.json       |   5 +-
 packages/angular/cli/commands/lint.json       |  41 +-
 packages/angular/cli/commands/new-impl.ts     |  47 +-
 packages/angular/cli/commands/new.json        |  53 +--
 packages/angular/cli/commands/run.json        |  39 +-
 packages/angular/cli/commands/serve.json      |  27 +-
 packages/angular/cli/commands/test.json       |  27 +-
 packages/angular/cli/commands/update-impl.ts  |  86 ++--
 packages/angular/cli/commands/update.json     |  43 +-
 packages/angular/cli/commands/version-impl.ts |   2 +-
 packages/angular/cli/commands/version.json    |   5 +-
 packages/angular/cli/commands/xi18n.json      |  23 +-
 packages/angular/cli/lib/cli/index.ts         |   5 +-
 .../angular/cli/models/architect-command.ts   | 217 +++------
 packages/angular/cli/models/interface.ts      | 110 +++++
 packages/angular/cli/models/json-schema.ts    | 109 -----
 .../angular/cli/models/schematic-command.ts   | 450 ++++++++----------
 packages/angular/cli/utilities/json-schema.ts | 201 ++++++++
 packages/angular/cli/utilities/project.ts     |   8 +-
 .../e2e/tests/basic/in-project-logic.ts       |  15 +-
 .../e2e/tests/generate/help-output.ts         |   6 +-
 tests/legacy-cli/e2e/utils/assets.ts          |   2 +-
 tests/legacy-cli/e2e/utils/process.ts         |  11 +-
 40 files changed, 998 insertions(+), 997 deletions(-)
 create mode 100644 packages/angular/cli/commands/definitions.json
 create mode 100644 packages/angular/cli/models/interface.ts
 delete mode 100644 packages/angular/cli/models/json-schema.ts
 create mode 100644 packages/angular/cli/utilities/json-schema.ts

diff --git a/packages/angular/cli/commands/add-impl.ts b/packages/angular/cli/commands/add-impl.ts
index ba33b8bcc95f..e2492826ea57 100644
--- a/packages/angular/cli/commands/add-impl.ts
+++ b/packages/angular/cli/commands/add-impl.ts
@@ -9,44 +9,24 @@
 // tslint:disable:no-global-tslint-disable no-any
 import { tags, terminal } from '@angular-devkit/core';
 import { NodePackageDoesNotSupportSchematics } from '@angular-devkit/schematics/tools';
-import { parseOptions } from '../models/command-runner';
-import { SchematicCommand } from '../models/schematic-command';
+import { Arguments } from '../models/interface';
+import { BaseSchematicOptions, SchematicCommand } from '../models/schematic-command';
 import { NpmInstall } from '../tasks/npm-install';
 import { getPackageManager } from '../utilities/config';
 
+export interface AddCommandOptions extends BaseSchematicOptions {
+  collection: string;
+  help?: boolean;
+  help_json?: boolean;
+}
 
-export class AddCommand extends SchematicCommand {
+export class AddCommand<
+  T extends AddCommandOptions = AddCommandOptions,
+> extends SchematicCommand<T> {
   readonly allowPrivateSchematics = true;
 
-  private async _parseSchematicOptions(collectionName: string): Promise<any> {
-    const schematicOptions = await this.getOptions({
-      schematicName: 'ng-add',
-      collectionName,
-    });
-    this.addOptions(schematicOptions);
-
-    return parseOptions(this._rawArgs, this.options);
-  }
-
-  validate(options: any) {
-    const collectionName = options._[0];
-
-    if (!collectionName) {
-      this.logger.fatal(
-        `The "ng add" command requires a name argument to be specified eg. `
-        + `${terminal.yellow('ng add [name] ')}. For more details, use "ng help".`,
-      );
-
-      return false;
-    }
-
-    return true;
-  }
-
-  async run(options: any) {
-    const firstArg = options._[0];
-
-    if (!firstArg) {
+  async run(options: AddCommandOptions & Arguments) {
+    if (!options.collection) {
       this.logger.fatal(
         `The "ng add" command requires a name argument to be specified eg. `
         + `${terminal.yellow('ng add [name] ')}. For more details, use "ng help".`,
@@ -59,16 +39,16 @@ export class AddCommand extends SchematicCommand {
 
     const npmInstall: NpmInstall = require('../tasks/npm-install').default;
 
-    const packageName = firstArg.startsWith('@')
-      ? firstArg.split('/', 2).join('/')
-      : firstArg.split('/', 1)[0];
+    const packageName = options.collection.startsWith('@')
+      ? options.collection.split('/', 2).join('/')
+      : options.collection.split('/', 1)[0];
 
     // Remove the tag/version from the package name.
     const collectionName = (
       packageName.startsWith('@')
         ? packageName.split('@', 2).join('@')
         : packageName.split('@', 1).join('@')
-    ) + firstArg.slice(packageName.length);
+    ) + options.collection.slice(packageName.length);
 
     // We don't actually add the package to package.json, that would be the work of the package
     // itself.
@@ -79,11 +59,8 @@ export class AddCommand extends SchematicCommand {
       this.project.root,
     );
 
-    // Reparse the options with the new schematic accessible.
-    options = await this._parseSchematicOptions(collectionName);
-
     const runOptions = {
-      schematicOptions: options,
+      schematicOptions: options['--'] || [],
       workingDir: this.project.root,
       collectionName,
       schematicName: 'ng-add',
diff --git a/packages/angular/cli/commands/add.json b/packages/angular/cli/commands/add.json
index 04a9f3a888ed..f61b1ac2b6e6 100644
--- a/packages/angular/cli/commands/add.json
+++ b/packages/angular/cli/commands/add.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "AddCommandOptions",
+  "$id": "ng-cli://commands/add.json",
   "description": "Add support for a library to your project.",
   "$longDescription": "",
 
@@ -8,16 +8,23 @@
   "$impl": "./add-impl#AddCommand",
 
   "type": "object",
-  "properties": {
-    "collection": {
-      "type": "string",
-      "description": "The package to be added.",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      }
+  "allOf": [
+    {
+      "properties": {
+        "collection": {
+          "type": "string",
+          "description": "The package to be added.",
+          "$default": {
+            "$source": "argv",
+            "index": 0
+          }
+        }
+      },
+      "required": [
+      ]
+    },
+    {
+      "$ref": "./definitions.json#/definitions/base"
     }
-  },
-  "required": [
   ]
-}
\ No newline at end of file
+}
diff --git a/packages/angular/cli/commands/build-impl.ts b/packages/angular/cli/commands/build-impl.ts
index 60b82df73e29..46484827de12 100644
--- a/packages/angular/cli/commands/build-impl.ts
+++ b/packages/angular/cli/commands/build-impl.ts
@@ -12,15 +12,11 @@ import { Version } from '../upgrade/version';
 export class BuildCommand extends ArchitectCommand {
   public readonly target = 'build';
 
-  public validate(options: ArchitectCommandOptions) {
+  public async run(options: ArchitectCommandOptions) {
     // Check Angular and TypeScript versions.
     Version.assertCompatibleAngularVersion(this.project.root);
     Version.assertTypescriptVersion(this.project.root);
 
-    return super.validate(options);
-  }
-
-  public async run(options: ArchitectCommandOptions) {
     return this.runArchitectTarget(options);
   }
 }
diff --git a/packages/angular/cli/commands/build.json b/packages/angular/cli/commands/build.json
index 247914d3ba3f..db73c39b0605 100644
--- a/packages/angular/cli/commands/build.json
+++ b/packages/angular/cli/commands/build.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "BuildCommandOptions",
+  "$id": "ng-cli://commands/build.json",
   "description": "Builds your app and places it into the output path (dist/ by default).",
   "$longDescription": "",
 
@@ -9,26 +9,8 @@
   "$type": "architect",
   "$impl": "./build-impl#BuildCommand",
 
-  "type": "object",
-  "properties": {
-    "project": {
-      "type": "string",
-      "description": "The name of the project to build.",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      }
-    },
-    "configuration": {
-      "description": "Specify the configuration to use.",
-      "type": "string",
-      "aliases": ["c"]
-    },
-    "prod": {
-      "description": "Flag to set configuration to 'production'.",
-      "type": "boolean"
-    }
-  },
-  "required": [
+  "allOf": [
+    { "$ref": "./definitions.json#/definitions/architect" },
+    { "$ref": "./definitions.json#/definitions/base" }
   ]
-}
\ No newline at end of file
+}
diff --git a/packages/angular/cli/commands/config-impl.ts b/packages/angular/cli/commands/config-impl.ts
index b1850b43999b..7499f542cc37 100644
--- a/packages/angular/cli/commands/config-impl.ts
+++ b/packages/angular/cli/commands/config-impl.ts
@@ -17,7 +17,7 @@ import {
   tags,
 } from '@angular-devkit/core';
 import { writeFileSync } from 'fs';
-import { Command } from '../models/command';
+import { BaseCommandOptions, Command } from '../models/command';
 import {
   getWorkspace,
   getWorkspaceRaw,
@@ -26,7 +26,7 @@ import {
 } from '../utilities/config';
 
 
-export interface ConfigOptions {
+export interface ConfigOptions extends BaseCommandOptions {
   jsonPath: string;
   value?: string;
   global?: boolean;
@@ -178,8 +178,8 @@ function normalizeValue(value: string, path: string): JsonValue {
   return value;
 }
 
-export class ConfigCommand extends Command {
-  public run(options: ConfigOptions) {
+export class ConfigCommand<T extends ConfigOptions = ConfigOptions> extends Command<T> {
+  public async run(options: T) {
     const level = options.global ? 'global' : 'local';
 
     let config =
@@ -210,7 +210,7 @@ export class ConfigCommand extends Command {
     }
   }
 
-  private get(config: experimental.workspace.WorkspaceSchema, options: ConfigOptions) {
+  private get(config: experimental.workspace.WorkspaceSchema, options: T) {
     let value;
     if (options.jsonPath) {
       value = getValueFromPath(config as {} as JsonObject, options.jsonPath);
diff --git a/packages/angular/cli/commands/config.json b/packages/angular/cli/commands/config.json
index cdcce065041c..35521ba50406 100644
--- a/packages/angular/cli/commands/config.json
+++ b/packages/angular/cli/commands/config.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "ConfigCommandOptions",
+  "$id": "ng-cli://commands/config.json",
   "description": "Get/set configuration values.",
   "$longDescription": "",
 
@@ -36,4 +36,4 @@
   },
   "required": [
   ]
-}
\ No newline at end of file
+}
diff --git a/packages/angular/cli/commands/definitions.json b/packages/angular/cli/commands/definitions.json
new file mode 100644
index 000000000000..5dd2700d5321
--- /dev/null
+++ b/packages/angular/cli/commands/definitions.json
@@ -0,0 +1,64 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "ng-cli://commands/definitions.json",
+
+  "definitions": {
+    "architect": {
+      "properties": {
+        "project": {
+          "type": "string",
+          "description": "The name of the project to build.",
+          "$default": {
+            "$source": "argv",
+            "index": 0
+          }
+        },
+        "configuration": {
+          "description": "Specify the configuration to use.",
+          "type": "string",
+          "aliases": [
+            "c"
+          ]
+        },
+        "prod": {
+          "description": "Flag to set configuration to 'production'.",
+          "type": "boolean"
+        }
+      }
+    },
+    "base": {
+      "type": "object",
+      "properties": {
+        "help": {
+          "type": "boolean",
+          "description": "Shows a help message."
+        },
+        "helpJson": {
+          "type": "boolean",
+          "description": "Shows the metadata associated with each flags, in JSON format."
+        }
+      }
+    },
+    "schematic": {
+      "properties": {
+        "dryRun": {
+          "type": "boolean",
+          "default": false,
+          "aliases": [ "d" ],
+          "description": "Run through without making any changes."
+        },
+        "force": {
+          "type": "boolean",
+          "default": false,
+          "aliases": [ "f" ],
+          "description": "Forces overwriting of files."
+        },
+        "interactive": {
+          "type": "boolean",
+          "default": "true",
+          "description": "Disables interactive inputs (i.e., prompts)."
+        }
+      }
+    }
+  }
+}
diff --git a/packages/angular/cli/commands/doc-impl.ts b/packages/angular/cli/commands/doc-impl.ts
index b9f6c9451fe4..543c9ecca89a 100644
--- a/packages/angular/cli/commands/doc-impl.ts
+++ b/packages/angular/cli/commands/doc-impl.ts
@@ -6,31 +6,23 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Command } from '../models/command';
+import { BaseCommandOptions, Command } from '../models/command';
 const opn = require('opn');
 
-export interface Options {
+export interface DocCommandOptions extends BaseCommandOptions {
   keyword: string;
   search?: boolean;
 }
 
-export class DocCommand extends Command {
-  public validate(options: Options) {
-    if (!options.keyword) {
-      this.logger.error(`keyword argument is required.`);
-
-      return false;
-    }
-
-    return true;
-  }
-
-  public async run(options: Options) {
+export class DocCommand<T extends DocCommandOptions = DocCommandOptions> extends Command<T> {
+  public async run(options: T) {
     let searchUrl = `https://angular.io/api?query=${options.keyword}`;
     if (options.search) {
       searchUrl = `https://www.google.com/search?q=site%3Aangular.io+${options.keyword}`;
     }
 
-    return opn(searchUrl);
+    return opn(searchUrl, {
+      wait: false,
+    });
   }
 }
diff --git a/packages/angular/cli/commands/doc.json b/packages/angular/cli/commands/doc.json
index d0fd2ce0c4fa..e3649a987960 100644
--- a/packages/angular/cli/commands/doc.json
+++ b/packages/angular/cli/commands/doc.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "DocCommandOptions",
+  "$id": "ng-cli://commands/doc.json",
   "description": "Opens the official Angular API documentation for a given keyword.",
   "$longDescription": "",
 
@@ -27,4 +27,4 @@
   },
   "required": [
   ]
-}
\ No newline at end of file
+}
diff --git a/packages/angular/cli/commands/e2e.json b/packages/angular/cli/commands/e2e.json
index 8f659194cf7d..6e7b1079a46a 100644
--- a/packages/angular/cli/commands/e2e.json
+++ b/packages/angular/cli/commands/e2e.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "E2eCommandOptions",
-  "description": "",
+  "$id": "ng-cli://commands/e2e.json",
+  "description": "Runs the end-to-end tests.",
   "$longDescription": "",
 
   "$aliases": [ "e" ],
@@ -10,17 +10,8 @@
   "$impl": "./e2e-impl#E2eCommand",
 
   "type": "object",
-  "properties": {
-    "configuration": {
-      "description": "Specify the configuration to use.",
-      "type": "string",
-      "aliases": ["c"]
-    },
-    "prod": {
-      "description": "Flag to set configuration to 'production'.",
-      "type": "boolean"
-    }
-  },
-  "required": [
+  "allOf": [
+    { "$ref": "./definitions.json#/definitions/architect" },
+    { "$ref": "./definitions.json#/definitions/base" }
   ]
-}
\ No newline at end of file
+}
diff --git a/packages/angular/cli/commands/easter-egg-impl.ts b/packages/angular/cli/commands/easter-egg-impl.ts
index c91fd44fde6b..197bf9e675f4 100644
--- a/packages/angular/cli/commands/easter-egg-impl.ts
+++ b/packages/angular/cli/commands/easter-egg-impl.ts
@@ -14,7 +14,7 @@ function pickOne(of: string[]): string {
 }
 
 export class AwesomeCommand extends Command {
-  run() {
+  async run() {
     const phrase = pickOne([
       `You're on it, there's nothing for me to do!`,
       `Let's take a look... nope, it's all good!`,
diff --git a/packages/angular/cli/commands/easter-egg.json b/packages/angular/cli/commands/easter-egg.json
index 18833da40982..04e7afa1e45b 100644
--- a/packages/angular/cli/commands/easter-egg.json
+++ b/packages/angular/cli/commands/easter-egg.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "EasterEggCommandOptions",
+  "$id": "ng-cli://commands/easter-egg.json",
   "description": "",
   "$longDescription": "",
   "$hidden": true,
@@ -8,4 +8,4 @@
   "$impl": "./easter-egg-impl#AwesomeCommand",
 
   "type": "object"
-}
\ No newline at end of file
+}
diff --git a/packages/angular/cli/commands/eject-impl.ts b/packages/angular/cli/commands/eject-impl.ts
index cf755606eca2..cdfe324e2231 100644
--- a/packages/angular/cli/commands/eject-impl.ts
+++ b/packages/angular/cli/commands/eject-impl.ts
@@ -7,19 +7,12 @@
  */
 
 import { tags } from '@angular-devkit/core';
-import { Command, Option } from '../models/command';
+import { Command } from '../models/command';
 
 
 export class EjectCommand extends Command {
-  public readonly name = 'eject';
-  public readonly description = 'Temporarily disabled. Ejects your app and output the proper '
-                              + 'webpack configuration and scripts.';
-  public readonly arguments: string[] = [];
-  public readonly options: Option[] = [];
-  public static aliases = [];
-
-  run() {
-    this.logger.info(tags.stripIndents`
+  async run() {
+    this.logger.error(tags.stripIndents`
       The 'eject' command has been temporarily disabled, as it is not yet compatible with the new
       angular.json format. The new configuration format provides further flexibility to modify the
       configuration of your workspace without ejecting. Ejection will be re-enabled in a future
@@ -27,5 +20,7 @@ export class EjectCommand extends Command {
 
       If you need to eject today, use CLI 1.7 to eject your project.
     `);
+
+    return 1;
   }
 }
diff --git a/packages/angular/cli/commands/eject.json b/packages/angular/cli/commands/eject.json
index aa90f156c46b..d5c527d02166 100644
--- a/packages/angular/cli/commands/eject.json
+++ b/packages/angular/cli/commands/eject.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "CommandOptions",
+  "$id": "ng-cli://commands/eject.json",
   "description": "Temporarily disabled. Ejects your app and output the proper webpack configuration and scripts.",
   "$longDescription": "",
 
@@ -8,5 +8,8 @@
   "$scope": "in",
   "$impl": "./eject-impl#EjectCommand",
 
-  "type": "object"
-}
\ No newline at end of file
+  "type": "object",
+  "allOf": [
+    { "$ref": "./definitions.json#/definitions/base" }
+  ]
+}
diff --git a/packages/angular/cli/commands/generate-impl.ts b/packages/angular/cli/commands/generate-impl.ts
index 7e2580751137..7a58da674214 100644
--- a/packages/angular/cli/commands/generate-impl.ts
+++ b/packages/angular/cli/commands/generate-impl.ts
@@ -7,63 +7,64 @@
  */
 
 // tslint:disable:no-global-tslint-disable no-any
-import { tags, terminal } from '@angular-devkit/core';
-import { SchematicCommand } from '../models/schematic-command';
+import { terminal } from '@angular-devkit/core';
+import { Option } from '../models/interface';
+import { BaseSchematicOptions, SchematicCommand } from '../models/schematic-command';
+import { parseJsonSchemaToOptions } from '../utilities/json-schema';
 
+export interface GenerateCommandOptions extends BaseSchematicOptions {
+  schematic?: string;
+}
 
-export class GenerateCommand extends SchematicCommand {
-  private initialized = false;
-  public async initialize(options: any) {
-    if (this.initialized) {
-      return;
-    }
+export class GenerateCommand<
+  T extends GenerateCommandOptions = GenerateCommandOptions,
+> extends SchematicCommand<T> {
+  async initialize(options: T) {
     await super.initialize(options);
-    this.initialized = true;
 
+    // Fill up the schematics property of the command description.
     const [collectionName, schematicName] = this.parseSchematicInfo(options);
-    if (!!schematicName) {
-      const schematicOptions = await this.getOptions({
-        schematicName,
-        collectionName,
-      });
-      this.addOptions(schematicOptions);
-    }
-  }
 
-  validate(options: any): boolean | Promise<boolean> {
-    if (!options.schematic) {
-      this.logger.error(tags.oneLine`
-        The "ng generate" command requires a
-        schematic name to be specified.
-        For more details, use "ng help".`);
+    const collection = this.getCollection(collectionName);
+    this.description.schematics = {};
 
-      return false;
-    }
+    const schematicNames = schematicName ? [schematicName] : collection.listSchematicNames();
+
+    for (const name of schematicNames) {
+      const schematic = this.getSchematic(collection, name, true);
+      let options: Option[] = [];
+      if (schematic.description.schemaJson) {
+        options = await parseJsonSchemaToOptions(
+          this._workflow.registry,
+          schematic.description.schemaJson,
+        );
+      }
 
-    return true;
+      this.description.schematics[`${collectionName}:${name}`] = options;
+    }
   }
 
-  public run(options: any) {
+  public async run(options: T) {
     const [collectionName, schematicName] = this.parseSchematicInfo(options);
 
-    // remove the schematic name from the options
-    delete options.schematic;
+    if (!schematicName || !collectionName) {
+      return this.printHelp(options);
+    }
 
     return this.runSchematic({
       collectionName,
       schematicName,
-      schematicOptions: this.removeLocalOptions(options),
-      debug: options.debug,
-      dryRun: options.dryRun,
-      force: options.force,
-      interactive: options.interactive,
+      schematicOptions: options['--'] || [],
+      debug: !!options.debug || false,
+      dryRun: !!options.dryRun || false,
+      force: !!options.force || false,
     });
   }
 
-  private parseSchematicInfo(options: any) {
+  private parseSchematicInfo(options: { schematic?: string }): [string, string | undefined] {
     let collectionName = this.getDefaultSchematicCollection();
 
-    let schematicName: string = options.schematic;
+    let schematicName = options.schematic;
 
     if (schematicName) {
       if (schematicName.includes(':')) {
@@ -74,33 +75,14 @@ export class GenerateCommand extends SchematicCommand {
     return [collectionName, schematicName];
   }
 
-  public printHelp(_name: string, _description: string, options: any) {
-    const schematicName = options._[0];
-    if (schematicName) {
-      const optsWithoutSchematic = this.options
-        .filter(o => !(o.name === 'schematic' && this.isArgument(o)));
-      this.printHelpUsage(`generate ${schematicName}`, optsWithoutSchematic);
-      this.printHelpOptions(this.options);
-    } else {
-      this.printHelpUsage('generate', this.options);
-      const engineHost = this.getEngineHost();
-      const [collectionName] = this.parseSchematicInfo(options);
-      const collection = this.getCollection(collectionName);
-      const schematicNames: string[] = engineHost.listSchematicNames(collection.description);
-      this.logger.info('Available schematics:');
-      schematicNames.forEach(schematicName => {
-        this.logger.info(`    ${schematicName}`);
-      });
-
-      this.logger.warn(`\nTo see help for a schematic run:`);
+  public async printHelp(options: T) {
+    await super.printHelp(options);
+
+    if (Object.keys(this.description.schematics || {}).length == 1) {
+      this.logger.info(`\nTo see help for a schematic run:`);
       this.logger.info(terminal.cyan(`  ng generate <schematic> --help`));
     }
-  }
-
-  private removeLocalOptions(options: any): any {
-    const opts = Object.assign({}, options);
-    delete opts.interactive;
 
-    return opts;
+    return 0;
   }
 }
diff --git a/packages/angular/cli/commands/generate.json b/packages/angular/cli/commands/generate.json
index 3a784e3d47b9..f8668058cc9f 100644
--- a/packages/angular/cli/commands/generate.json
+++ b/packages/angular/cli/commands/generate.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "GenerateCommandOptions",
+  "$id": "ng-cli://commands/generate.json",
   "description": "Generates and/or modifies files based on a schematic.",
   "$longDescription": "",
 
@@ -9,34 +9,23 @@
   "$type": "schematics",
   "$impl": "./generate-impl#GenerateCommand",
 
-  "type": "object",
-  "properties": {
-    "schematic": {
-      "type": "string",
-      "description": "The schematic or collection:schematic to generate.",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      }
+  "allOf": [
+    {
+      "type": "object",
+      "properties": {
+        "schematic": {
+          "type": "string",
+          "description": "The schematic or collection:schematic to generate.",
+          "$default": {
+            "$source": "argv",
+            "index": 0
+          }
+        }
+      },
+      "required": [
+      ]
     },
-    "dryRun": {
-      "type": "boolean",
-      "default": false,
-      "aliases": ["d"],
-      "description": "Run through without making any changes."
-    },
-    "force": {
-      "type": "boolean",
-      "default": false,
-      "aliases": ["f"],
-      "description": "Forces overwriting of files."
-    },
-    "interactive": {
-      "type": "boolean",
-      "default": "true",
-      "description": "Disables interactive inputs (i.e., prompts)."
-    }
-  },
-  "required": [
+    { "$ref": "./definitions.json#/definitions/base" },
+    { "$ref": "./definitions.json#/definitions/schematic" }
   ]
-}
\ No newline at end of file
+}
diff --git a/packages/angular/cli/commands/help-impl.ts b/packages/angular/cli/commands/help-impl.ts
index ac31379a27b8..a117a19fd209 100644
--- a/packages/angular/cli/commands/help-impl.ts
+++ b/packages/angular/cli/commands/help-impl.ts
@@ -5,36 +5,23 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-// tslint:disable:no-global-tslint-disable no-any
 import { terminal } from '@angular-devkit/core';
 import { Command } from '../models/command';
 
-interface CommandInfo {
-  name: string;
-  description: string;
-  hidden: boolean;
-  aliases: string[];
-}
-
 export class HelpCommand extends Command {
-  run(options: any) {
+  async run() {
     this.logger.info(`Available Commands:`);
-    options.commandInfo
-      .filter((cmd: CommandInfo) => !cmd.hidden)
-      .forEach((cmd: CommandInfo) => {
-        let aliasInfo = '';
-        if (cmd.aliases.length > 0) {
-          aliasInfo = ` (${cmd.aliases.join(', ')})`;
-        }
 
-        this.logger.info(`  ${terminal.cyan(cmd.name)}${aliasInfo} ${cmd.description}`);
-      });
+    for (const name of Object.keys(Command.commandMap)) {
+      const cmd = Command.commandMap[name];
 
-    this.logger.info(`\nFor more detailed help run "ng [command name] --help"`);
-  }
+      if (cmd.hidden) {
+        continue;
+      }
 
-  printHelp(_commandName: string, _description: string, options: any) {
-    return this.run(options);
+      const aliasInfo = cmd.aliases.length > 0 ? ` (${cmd.aliases.join(', ')})` : '';
+      this.logger.info(`  ${terminal.cyan(cmd.name)}${aliasInfo} ${cmd.description}`);
+    }
+    this.logger.info(`\nFor more detailed help run "ng [command name] --help"`);
   }
 }
diff --git a/packages/angular/cli/commands/help.json b/packages/angular/cli/commands/help.json
index 6ce3882e17aa..51c7adc53398 100644
--- a/packages/angular/cli/commands/help.json
+++ b/packages/angular/cli/commands/help.json
@@ -1,11 +1,12 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "HelpCommandOptions",
+  "$id": "ng-cli://commands/help.json",
   "description": "Displays help for the Angular CLI.",
   "$longDescription": "",
 
+  "$scope": "all",
   "$aliases": [],
   "$impl": "./help-impl#HelpCommand",
 
   "type": "object"
-}
\ No newline at end of file
+}
diff --git a/packages/angular/cli/commands/lint.json b/packages/angular/cli/commands/lint.json
index 6340ca1e3d4a..7d007122c28a 100644
--- a/packages/angular/cli/commands/lint.json
+++ b/packages/angular/cli/commands/lint.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "LintCommandOptions",
+  "$id": "ng-cli://commands/lint.json",
   "description": "Lints code in existing project.",
   "$longDescription": "",
 
@@ -10,21 +10,30 @@
   "$impl": "./lint-impl#LintCommand",
 
   "type": "object",
-  "properties": {
-    "project": {
-      "type": "string",
-      "description": "The name of the project to lint.",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      }
+  "allOf": [
+    {
+      "properties": {
+        "project": {
+          "type": "string",
+          "description": "The name of the project to lint.",
+          "$default": {
+            "$source": "argv",
+            "index": 0
+          }
+        },
+        "configuration": {
+          "description": "Specify the configuration to use.",
+          "type": "string",
+          "aliases": [
+            "c"
+          ]
+        }
+      },
+      "required": [
+      ]
     },
-    "configuration": {
-      "description": "Specify the configuration to use.",
-      "type": "string",
-      "aliases": ["c"]
+    {
+      "$ref": "./definitions.json#/definitions/base"
     }
-  },
-  "required": [
   ]
-}
\ No newline at end of file
+}
diff --git a/packages/angular/cli/commands/new-impl.ts b/packages/angular/cli/commands/new-impl.ts
index 338d821d150f..94ae330611eb 100644
--- a/packages/angular/cli/commands/new-impl.ts
+++ b/packages/angular/cli/commands/new-impl.ts
@@ -7,32 +7,19 @@
  */
 
 // tslint:disable:no-global-tslint-disable no-any
-import { SchematicCommand } from '../models/schematic-command';
+import { BaseSchematicOptions, SchematicCommand } from '../models/schematic-command';
+
+export interface NewCommandOptions extends BaseSchematicOptions {
+  skipGit?: boolean;
+  collection?: string;
+}
+
 
 export class NewCommand extends SchematicCommand {
   public readonly allowMissingWorkspace = true;
   private schematicName = 'ng-new';
 
-  private initialized = false;
-  public async initialize(options: any) {
-    if (this.initialized) {
-      return;
-    }
-
-    await super.initialize(options);
-
-    this.initialized = true;
-
-    const collectionName = this.parseCollectionName(options);
-
-    const schematicOptions = await this.getOptions({
-      schematicName: this.schematicName,
-      collectionName,
-    });
-    this.addOptions(this.options.concat(schematicOptions));
-  }
-
-  public async run(options: any) {
+  public async run(options: NewCommandOptions) {
     if (options.dryRun) {
       options.skipGit = true;
     }
@@ -48,33 +35,19 @@ export class NewCommand extends SchematicCommand {
     const packageJson = require('../package.json');
     const version = packageJson.version;
 
-    // Ensure skipGit has a boolean value.
-    options.skipGit = options.skipGit === undefined ? false : options.skipGit;
     this._workflow.registry.addSmartDefaultProvider('ng-cli-version', () => version);
 
     return this.runSchematic({
       collectionName: collectionName,
       schematicName: this.schematicName,
-      schematicOptions: this.removeLocalOptions(options),
+      schematicOptions: options['--'] || [],
       debug: options.debug,
       dryRun: options.dryRun,
       force: options.force,
-      interactive: options.interactive,
     });
   }
 
   private parseCollectionName(options: any): string {
-    const collectionName = options.collection || options.c || this.getDefaultSchematicCollection();
-
-    return collectionName;
-  }
-
-  private removeLocalOptions(options: any): any {
-    const opts = Object.assign({}, options);
-    delete opts.verbose;
-    delete opts.collection;
-    delete opts.interactive;
-
-    return opts;
+    return options.collection || this.getDefaultSchematicCollection();
   }
 }
diff --git a/packages/angular/cli/commands/new.json b/packages/angular/cli/commands/new.json
index b1f8db9f577b..ed301b03a217 100644
--- a/packages/angular/cli/commands/new.json
+++ b/packages/angular/cli/commands/new.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "NewCommandOptions",
+  "$id": "ng-cli://commands/new.json",
   "description": "Creates a new directory and a new Angular app.",
   "$longDescription": "",
 
@@ -10,35 +10,24 @@
   "$impl": "./new-impl#NewCommand",
 
   "type": "object",
-  "properties": {
-    "collection": {
-      "type": "string",
-      "aliases": ["c"],
-      "description": "Schematics collection to use."
+  "allOf": [
+    {
+      "properties": {
+        "collection": {
+          "type": "string",
+          "aliases": [ "c" ],
+          "description": "Schematics collection to use."
+        },
+        "verbose": {
+          "type": "boolean",
+          "default": false,
+          "aliases": [ "v" ],
+          "description": "Adds more details to output logging."
+        }
+      },
+      "required": []
     },
-    "dryRun": {
-      "type": "boolean",
-      "default": false,
-      "aliases": ["d"],
-      "description": "Run through without making any changes."
-    },
-    "force": {
-      "type": "boolean",
-      "default": false,
-      "aliases": ["f"],
-      "description": "Forces overwriting of files."
-    },
-    "verbose": {
-      "type": "boolean",
-      "default": false,
-      "aliases": ["v"],
-      "description": "Adds more details to output logging."
-    },
-    "interactive": {
-      "type": "boolean",
-      "default": "true",
-      "description": "Disables interactive inputs (i.e., prompts)."
-    }
-  },
-  "required": []
-}
\ No newline at end of file
+    { "$ref": "./definitions.json#/definitions/base" },
+    { "$ref": "./definitions.json#/definitions/schematic" }
+  ]
+}
diff --git a/packages/angular/cli/commands/run.json b/packages/angular/cli/commands/run.json
index c46b8b3e72e1..51b74bbacf55 100644
--- a/packages/angular/cli/commands/run.json
+++ b/packages/angular/cli/commands/run.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "RunCommandOptions",
+  "$id": "ng-cli://commands/run.json",
   "description": "Runs Architect targets.",
   "$longDescription": "",
 
@@ -10,21 +10,28 @@
   "$impl": "./run-impl#RunCommand",
 
   "type": "object",
-  "properties": {
-    "target": {
-      "type": "string",
-      "description": "The target to run.",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      }
+  "allOf": [
+    {
+      "properties": {
+        "target": {
+          "type": "string",
+          "description": "The target to run.",
+          "$default": {
+            "$source": "argv",
+            "index": 0
+          }
+        },
+        "configuration": {
+          "description": "Specify the configuration to use.",
+          "type": "string",
+          "aliases": [ "c" ]
+        }
+      },
+      "required": [
+      ]
     },
-    "configuration": {
-      "description": "Specify the configuration to use.",
-      "type": "string",
-      "aliases": ["c"]
+    {
+      "$ref": "./definitions.json#/definitions/base"
     }
-  },
-  "required": [
   ]
-}
\ No newline at end of file
+}
diff --git a/packages/angular/cli/commands/serve.json b/packages/angular/cli/commands/serve.json
index d10ebccee6a9..9b01a5039cb5 100644
--- a/packages/angular/cli/commands/serve.json
+++ b/packages/angular/cli/commands/serve.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "ServeCommandOptions",
+  "$id": "ng-cli://commands/serve.json",
   "description": "Builds and serves your app, rebuilding on file changes.",
   "$longDescription": "",
 
@@ -10,25 +10,8 @@
   "$impl": "./serve-impl#ServeCommand",
 
   "type": "object",
-  "properties": {
-    "project": {
-      "type": "string",
-      "description": "The name of the project to serve.",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      }
-    },
-    "configuration": {
-      "description": "Specify the configuration to use.",
-      "type": "string",
-      "aliases": ["c"]
-    },
-    "prod": {
-      "description": "Flag to set configuration to 'production'.",
-      "type": "boolean"
-    }
-  },
-  "required": [
+  "allOf": [
+    { "$ref": "./definitions.json#/definitions/architect" },
+    { "$ref": "./definitions.json#/definitions/base" }
   ]
-}
\ No newline at end of file
+}
diff --git a/packages/angular/cli/commands/test.json b/packages/angular/cli/commands/test.json
index f987e7fc5cbd..79c5a0ef8c85 100644
--- a/packages/angular/cli/commands/test.json
+++ b/packages/angular/cli/commands/test.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "TestCommandOptions",
+  "$id": "ng-cli://commands/test.json",
   "description": "Run unit tests in existing project.",
   "$longDescription": "",
 
@@ -10,25 +10,8 @@
   "$impl": "./test-impl#TestCommand",
 
   "type": "object",
-  "properties": {
-    "project": {
-      "type": "string",
-      "description": "The name of the project to test.",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      }
-    },
-    "configuration": {
-      "description": "Specify the configuration to use.",
-      "type": "string",
-      "aliases": ["c"]
-    },
-    "prod": {
-      "description": "Flag to set configuration to 'production'.",
-      "type": "boolean"
-    }
-  },
-  "required": [
+  "allOf": [
+    { "$ref": "./definitions.json#/definitions/architect" },
+    { "$ref": "./definitions.json#/definitions/base" }
   ]
-}
\ No newline at end of file
+}
diff --git a/packages/angular/cli/commands/update-impl.ts b/packages/angular/cli/commands/update-impl.ts
index 0594d3c54921..4dbe42cd67f6 100644
--- a/packages/angular/cli/commands/update-impl.ts
+++ b/packages/angular/cli/commands/update-impl.ts
@@ -5,77 +5,83 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-// tslint:disable:no-global-tslint-disable no-any
 import { normalize } from '@angular-devkit/core';
-import { CommandScope, Option } from '../models/command';
-import { CoreSchematicOptions, SchematicCommand } from '../models/schematic-command';
+import { Arguments, Option } from '../models/interface';
+import { BaseSchematicOptions, SchematicCommand } from '../models/schematic-command';
 import { findUp } from '../utilities/find-up';
+import { parseJsonSchemaToOptions } from '../utilities/json-schema';
 
-export interface UpdateOptions extends CoreSchematicOptions {
+export interface UpdateOptions extends BaseSchematicOptions {
   next: boolean;
   schematic?: boolean;
+  dryRun: boolean;
+  force: boolean;
 }
 
+type UpdateSchematicOptions = Arguments & {
+  migrateOnly?: boolean;
+  from?: string;
+  packages?: string | string[];
+};
+
 
-export class UpdateCommand extends SchematicCommand {
-  public readonly name = 'update';
-  public readonly description = 'Updates your application and its dependencies.';
-  public static aliases: string[] = [];
-  public static scope = CommandScope.everywhere;
-  public arguments: string[] = [ 'packages' ];
-  public options: Option[] = [
-    // Remove the --force flag.
-    ...this.coreOptions.filter(option => option.name !== 'force'),
-  ];
+export class UpdateCommand<T extends UpdateOptions = UpdateOptions> extends SchematicCommand<T> {
   public readonly allowMissingWorkspace = true;
 
   private collectionName = '@schematics/update';
   private schematicName = 'update';
 
-  private initialized = false;
-  public async initialize(options: any) {
-    if (this.initialized) {
-      return;
-    }
-    await super.initialize(options);
-    this.initialized = true;
+  async initialize(input: T) {
+    await super.initialize(input);
 
-    const schematicOptions = await this.getOptions({
-      schematicName: this.schematicName,
-      collectionName: this.collectionName,
-    });
-    this.addOptions(schematicOptions);
+    // Set the options.
+    const collection = this.getCollection(this.collectionName);
+    const schematic = this.getSchematic(collection, this.schematicName, true);
+    const options = await parseJsonSchemaToOptions(
+      this._workflow.registry,
+      schematic.description.schemaJson || {},
+    );
+
+    this.description.options.push(...options);
   }
 
-  async validate(options: any) {
-    if (options._[0] == '@angular/cli'
-        && options.migrateOnly === undefined
-        && options.from === undefined) {
+  async parseArguments(schematicOptions: string[], schema: Option[]): Promise<Arguments> {
+    const args = await super.parseArguments(schematicOptions, schema) as UpdateSchematicOptions;
+    const maybeArgsLeftovers = args['--'];
+
+    if (maybeArgsLeftovers
+        && maybeArgsLeftovers.length == 1
+        && maybeArgsLeftovers[0] == '@angular/cli'
+        && args.migrateOnly === undefined
+        && args.from === undefined) {
       // Check for a 1.7 angular-cli.json file.
       const oldConfigFileNames = [
         normalize('.angular-cli.json'),
         normalize('angular-cli.json'),
       ];
-      const oldConfigFilePath =
-        findUp(oldConfigFileNames, process.cwd())
-        || findUp(oldConfigFileNames, __dirname);
+      const oldConfigFilePath = findUp(oldConfigFileNames, process.cwd())
+                             || findUp(oldConfigFileNames, __dirname);
 
       if (oldConfigFilePath) {
-        options.migrateOnly = true;
-        options.from = '1.0.0';
+        args.migrateOnly = true;
+        args.from = '1.0.0';
       }
     }
 
-    return super.validate(options);
-  }
+    // Move `--` to packages.
+    if (args.packages == undefined && args['--']) {
+      args.packages = args['--'];
+      delete args['--'];
+    }
 
+    return args;
+  }
 
-  public async run(options: UpdateOptions) {
+  async run(options: UpdateOptions) {
     return this.runSchematic({
       collectionName: this.collectionName,
       schematicName: this.schematicName,
-      schematicOptions: options,
+      schematicOptions: options['--'],
       dryRun: options.dryRun,
       force: false,
       showNothingDone: false,
diff --git a/packages/angular/cli/commands/update.json b/packages/angular/cli/commands/update.json
index 7a47adf3c7bb..0f179aa44cd8 100644
--- a/packages/angular/cli/commands/update.json
+++ b/packages/angular/cli/commands/update.json
@@ -1,32 +1,39 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "UpdateCommandOptions",
+  "$id": "ng-cli://commands/update.json",
   "description": "Updates your application and its dependencies.",
   "$longDescription": "",
 
+  "$scope": "all",
   "$aliases": [],
   "$type": "schematics",
   "$impl": "./update-impl#UpdateCommand",
 
   "type": "object",
-  "properties": {
-    "packages": {
-      "type": "array",
-      "items": {
-        "type": "string"
+  "allOf": [
+    {
+      "properties": {
+        "packages": {
+          "type": "array",
+          "description": "The names of package(s) to update",
+          "$default": {
+            "$source": "argv"
+          }
+        },
+        "dryRun": {
+          "type": "boolean",
+          "default": false,
+          "aliases": [
+            "d"
+          ],
+          "description": "Run through without making any changes."
+        }
       },
-      "description": "The names of package(s) to update",
-      "$default": {
-        "$source": "argv"
-      }
+      "required": [
+      ]
     },
-    "dryRun": {
-      "type": "boolean",
-      "default": false,
-      "aliases": ["d"],
-      "description": "Run through without making any changes."
+    {
+      "$ref": "./definitions.json#/definitions/base"
     }
-  },
-  "required": [
   ]
-}
\ No newline at end of file
+}
diff --git a/packages/angular/cli/commands/version-impl.ts b/packages/angular/cli/commands/version-impl.ts
index 2b9b740d6d58..64e10026ab35 100644
--- a/packages/angular/cli/commands/version-impl.ts
+++ b/packages/angular/cli/commands/version-impl.ts
@@ -17,7 +17,7 @@ import { findUp } from '../utilities/find-up';
 export class VersionCommand extends Command {
   public static aliases = ['v'];
 
-  public run() {
+  async run() {
     const pkg = require(path.resolve(__dirname, '..', 'package.json'));
     let projPkg;
     try {
diff --git a/packages/angular/cli/commands/version.json b/packages/angular/cli/commands/version.json
index 8d8fda9f1c96..66ff3c3aa364 100644
--- a/packages/angular/cli/commands/version.json
+++ b/packages/angular/cli/commands/version.json
@@ -1,11 +1,12 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "VersionCommandOptions",
+  "$id": "ng-cli://commands/version.json",
   "description": "Outputs Angular CLI version.",
   "$longDescription": "",
 
   "$aliases": [ "v" ],
+  "$scope": "all",
   "$impl": "./version-impl#VersionCommand",
 
   "type": "object"
-}
\ No newline at end of file
+}
diff --git a/packages/angular/cli/commands/xi18n.json b/packages/angular/cli/commands/xi18n.json
index 0c55c95e5a1c..082ae7ca1ba2 100644
--- a/packages/angular/cli/commands/xi18n.json
+++ b/packages/angular/cli/commands/xi18n.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "id": "Xi18nCommandOptions",
+  "$id": "ng-cli://commands/xi18n.json",
   "description": "Extracts i18n messages from source code.",
   "$longDescription": "",
 
@@ -10,21 +10,8 @@
   "$impl": "./xi18n-impl#Xi18nCommand",
 
   "type": "object",
-  "properties": {
-    "project": {
-      "type": "string",
-      "description": "The name of the project to extract.",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      }
-    },
-    "configuration": {
-      "description": "Specify the configuration to use.",
-      "type": "string",
-      "aliases": ["c"]
-    }
-  },
-  "required": [
+  "allOf": [
+    { "$ref": "./definitions.json#/definitions/architect" },
+    { "$ref": "./definitions.json#/definitions/base" }
   ]
-}
\ No newline at end of file
+}
diff --git a/packages/angular/cli/lib/cli/index.ts b/packages/angular/cli/lib/cli/index.ts
index 6be758d2b05e..b6940090de15 100644
--- a/packages/angular/cli/lib/cli/index.ts
+++ b/packages/angular/cli/lib/cli/index.ts
@@ -25,12 +25,9 @@ export default async function(options: { testing?: boolean, cliArgs: string[] })
   if (projectDetails === null) {
     projectDetails = { root: process.cwd() };
   }
-  const context = {
-    project: projectDetails,
-  };
 
   try {
-    const maybeExitCode = await runCommand(options.cliArgs, logger, context);
+    const maybeExitCode = await runCommand(options.cliArgs, logger, projectDetails);
     if (typeof maybeExitCode === 'number') {
       console.assert(Number.isInteger(maybeExitCode));
 
diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index aacacfe9a588..f1f61a90b103 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -5,95 +5,47 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import {
-  Architect,
-  BuildEvent,
-  BuilderDescription,
-  TargetSpecifier,
-} from '@angular-devkit/architect';
-import {
-  JsonObject,
-  UnknownException,
-  experimental,
-  schema,
-  strings,
-  tags,
-} from '@angular-devkit/core';
+import { Architect, BuildEvent, TargetSpecifier } from '@angular-devkit/architect';
+import { experimental, json, schema, tags } from '@angular-devkit/core';
 import { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node';
-import { from, of } from 'rxjs';
+import { from } from 'rxjs';
 import { concatMap, map, tap, toArray } from 'rxjs/operators';
-import { Command, Option } from './command';
+import { parseJsonSchemaToOptions } from '../utilities/json-schema';
+import { BaseCommandOptions, Command } from './command';
+import { parseArguments } from './parser';
 import { WorkspaceLoader } from './workspace-loader';
 
-export interface ProjectAndConfigurationOptions {
+export interface ArchitectCommandOptions extends BaseCommandOptions {
   project?: string;
   configuration?: string;
   prod: boolean;
-}
-
-export interface TargetOptions {
   target?: string;
 }
 
-export type ArchitectCommandOptions = ProjectAndConfigurationOptions & TargetOptions & JsonObject;
-
 export abstract class ArchitectCommand extends Command<ArchitectCommandOptions> {
-
   private _host = new NodeJsSyncHost();
-  private _architect: Architect;
-  private _workspace: experimental.workspace.Workspace;
-  private _logger = createConsoleLogger();
-  // If this command supports running multiple targets.
-  protected multiTarget = false;
+  protected _architect: Architect;
+  protected _workspace: experimental.workspace.Workspace;
+  protected _logger = createConsoleLogger();
 
-  readonly Options: Option[] = [{
-    name: 'configuration',
-    description: 'The configuration',
-    type: 'string',
-    aliases: ['c'],
-  }];
+  protected _registry: json.schema.SchemaRegistry;
 
-  readonly arguments = ['project'];
+  // If this command supports running multiple targets.
+  protected multiTarget = false;
 
   target: string | undefined;
 
   public async initialize(options: ArchitectCommandOptions): Promise<void> {
-    return this._loadWorkspaceAndArchitect().pipe(
-      concatMap(() => {
-        const targetSpec: TargetSpecifier = this._makeTargetSpecifier(options);
-
-        if (this.target && !targetSpec.project) {
-          const projects = this.getProjectNamesByTarget(this.target);
-
-          if (projects.length === 1) {
-            // If there is a single target, use it to parse overrides.
-            targetSpec.project = projects[0];
-          } else {
-            // Multiple targets can have different, incompatible options.
-            // We only lookup options for single targets.
-            return of(null);
-          }
-        }
-
-        if (!targetSpec.project || !targetSpec.target) {
-          throw new Error('Cannot determine project or target for Architect command.');
-        }
+    await super.initialize(options);
 
-        const builderConfig = this._architect.getBuilderConfiguration(targetSpec);
+    this._registry = new json.schema.CoreSchemaRegistry();
+    this._registry.addPostTransform(json.schema.transforms.addUndefinedDefaults);
 
-        return this._architect.getBuilderDescription(builderConfig).pipe(
-          tap<BuilderDescription>(builderDesc => { this.mapArchitectOptions(builderDesc.schema); }),
-        );
-      }),
-    ).toPromise()
-      .then(() => { });
-  }
+    await this._loadWorkspaceAndArchitect().toPromise();
 
-  public validate(options: ArchitectCommandOptions) {
     if (!options.project && this.target) {
       const projectNames = this.getProjectNamesByTarget(this.target);
-      const { overrides } = this._makeTargetSpecifier(options);
-      if (projectNames.length > 1 && Object.keys(overrides || {}).length > 0) {
+      if (projectNames.length > 1 && options['--'] && options['--'].length > 0) {
         // Verify that all builders are the same, otherwise error out (since the meaning of an
         // option could vary from builder to builder).
 
@@ -120,91 +72,63 @@ export abstract class ArchitectCommand extends Command<ArchitectCommandOptions>
       }
     }
 
-    return true;
-  }
+    const targetSpec: TargetSpecifier = this._makeTargetSpecifier(options);
+
+    if (this.target && !targetSpec.project) {
+      const projects = this.getProjectNamesByTarget(this.target);
 
-  protected mapArchitectOptions(schema: JsonObject) {
-    const properties = schema.properties;
-    if (typeof properties != 'object' || properties === null || Array.isArray(properties)) {
-      throw new UnknownException('Invalid schema.');
+      if (projects.length === 1) {
+        // If there is a single target, use it to parse overrides.
+        targetSpec.project = projects[0];
+      }
     }
-    const keys = Object.keys(properties);
-    keys
-      .map(key => {
-        const value = properties[key];
-        if (typeof value != 'object') {
-          throw new UnknownException('Invalid schema.');
-        }
 
-        return {
-          ...value,
-          name: strings.dasherize(key),
-        } as any; // tslint:disable-line:no-any
-      })
-      .map(opt => {
-        const types = ['string', 'boolean', 'integer', 'number'];
-        // Ignore arrays / objects.
-        if (types.indexOf(opt.type) === -1) {
-          return null;
-        }
+    if ((!targetSpec.project || !targetSpec.target) && !this.multiTarget) {
+      throw new Error('Cannot determine project or target for Architect command.');
+    }
+  }
 
-        let aliases: string[] = [];
-        if (opt.alias) {
-          aliases = [...aliases, opt.alias];
-        }
-        if (opt.aliases) {
-          aliases = [...aliases, ...opt.aliases];
-        }
-        const schematicDefault = opt.default;
-
-        return {
-          ...opt,
-          aliases,
-          default: undefined, // do not carry over schematics defaults
-          schematicDefault,
-          hidden: opt.visible === false,
-        };
-      })
-      .filter(x => x)
-      .forEach(option => this.addOptions(option));
+  async run(options: ArchitectCommandOptions) {
+    return await this.runArchitectTarget(options);
   }
 
-  protected prodOption: Option = {
-    name: 'prod',
-    description: 'Flag to set configuration to "prod".',
-    type: 'boolean',
-  };
+  protected async runArchitectTarget(options: ArchitectCommandOptions): Promise<number> {
+    const runSingleTarget = async (targetSpec: TargetSpecifier) => {
+      // We need to build the builderSpec twice because architect does not understand
+      // overrides separately (getting the configuration builds the whole project, including
+      // overrides).
+      const builderConf = this._architect.getBuilderConfiguration(targetSpec);
+      const builderDesc = await this._architect.getBuilderDescription(builderConf).toPromise();
+      const targetOptionArray = await parseJsonSchemaToOptions(this._registry, builderDesc.schema);
+      const overrides = parseArguments(options['--'] || [], targetOptionArray);
+
+      if (overrides['--']) {
+        (overrides['--'] || []).forEach(additional => {
+          this.logger.warn(`Unknown option: '${additional.split(/=/)[0]}'`);
+        });
 
-  protected configurationOption: Option = {
-    name: 'configuration',
-    description: 'Specify the configuration to use.',
-    type: 'string',
-    aliases: ['c'],
-  };
+        return 1;
+      }
+      const realBuilderConf = this._architect.getBuilderConfiguration({ ...targetSpec, overrides });
 
-  protected async runArchitectTarget(options: ArchitectCommandOptions): Promise<number> {
-    delete options._;
-    const targetSpec = this._makeTargetSpecifier(options);
-
-    const runSingleTarget = (targetSpec: TargetSpecifier) => this._architect.run(
-      this._architect.getBuilderConfiguration(targetSpec),
-      { logger: this._logger },
-    ).pipe(
-      map((buildEvent: BuildEvent) => buildEvent.success ? 0 : 1),
-    );
+      return this._architect.run(realBuilderConf, { logger: this._logger }).pipe(
+        map((buildEvent: BuildEvent) => buildEvent.success ? 0 : 1),
+      ).toPromise();
+    };
 
     try {
+      const targetSpec = this._makeTargetSpecifier(options);
       if (!targetSpec.project && this.target) {
         // This runs each target sequentially.
         // Running them in parallel would jumble the log messages.
         return await from(this.getProjectNamesByTarget(this.target)).pipe(
-          concatMap(project => runSingleTarget({ ...targetSpec, project })),
+          concatMap(project => from(runSingleTarget({ ...targetSpec, project }))),
           toArray(),
           map(results => results.every(res => res === 0) ? 0 : 1),
         )
         .toPromise();
       } else {
-        return await runSingleTarget(targetSpec).toPromise();
+        return await runSingleTarget(targetSpec);
       }
     } catch (e) {
       if (e instanceof schema.SchemaValidationException) {
@@ -268,32 +192,22 @@ export abstract class ArchitectCommand extends Command<ArchitectCommandOptions>
     );
   }
 
-  private _makeTargetSpecifier(options: ArchitectCommandOptions): TargetSpecifier {
-    let project, target, configuration, overrides;
-
-    if (options.target) {
-      [project, target, configuration] = options.target.split(':');
+  private _makeTargetSpecifier(commandOptions: ArchitectCommandOptions): TargetSpecifier {
+    let project, target, configuration;
 
-      overrides = { ...options };
-      delete overrides.target;
+    if (commandOptions.target) {
+      [project, target, configuration] = commandOptions.target.split(':');
 
-      if (overrides.configuration) {
-        configuration = overrides.configuration;
-        delete overrides.configuration;
+      if (commandOptions.configuration) {
+        configuration = commandOptions.configuration;
       }
     } else {
-      project = options.project;
+      project = commandOptions.project;
       target = this.target;
-      configuration = options.configuration;
-      if (!configuration && options.prod) {
+      configuration = commandOptions.configuration;
+      if (!configuration && commandOptions.prod) {
         configuration = 'production';
       }
-
-      overrides = { ...options };
-
-      delete overrides.configuration;
-      delete overrides.prod;
-      delete overrides.project;
     }
 
     if (!project) {
@@ -307,7 +221,6 @@ export abstract class ArchitectCommand extends Command<ArchitectCommandOptions>
       project,
       configuration,
       target,
-      overrides,
     };
   }
 }
diff --git a/packages/angular/cli/models/interface.ts b/packages/angular/cli/models/interface.ts
new file mode 100644
index 000000000000..1bfdf7c1269b
--- /dev/null
+++ b/packages/angular/cli/models/interface.ts
@@ -0,0 +1,110 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { json, logging } from '@angular-devkit/core';
+
+export type Value = number | string | boolean | (number | string | boolean)[];
+
+export type Arguments = {
+  [argName: string]: Value;
+} & {
+  '--'?: string[];
+}
+
+export interface CommandInterface<T = {}> {
+  initialize(options: T): Promise<void>;
+  printHelp(options: T): Promise<number>;
+  printJsonHelp(_options: T): Promise<number>;
+  run(options: T & Arguments): Promise<number | void>;
+  validateAndRun(options: T & Arguments): Promise<number | void>;
+}
+
+export interface CommandConstructor {
+  new(
+    context: CommandContext,
+    description: CommandDescription,
+    logger: logging.Logger,
+  ): CommandInterface;
+}
+
+export interface CommandProject {
+  root: string;
+  configFile?: string;
+}
+
+export interface CommandContext {
+  project: CommandProject;
+}
+
+export enum OptionType {
+  String = 'string',
+  Number = 'number',
+  Boolean = 'boolean',
+  Array = 'array',
+  Any = 'any',
+}
+
+export interface Option {
+  name: string;
+  description: string;
+  type: OptionType;
+  types?: OptionType[];
+  aliases: string[];
+  required?: boolean;
+  format?: string;
+  hidden?: boolean;
+  default?: string | number | boolean;
+  positional?: number;
+  $default?: OptionSmartDefault;
+}
+
+export enum CommandScope {
+  InProject = 'in',
+  OutProject = 'out',
+  Everywhere = 'all',
+
+  Default = InProject,
+}
+
+export enum CommandType {
+  Custom = 'custom',
+  Architect = 'architect',
+  Schematic = 'schematics',
+
+  Default = Custom,
+}
+
+export interface CommandDescription {
+  name: string;
+  description: string;
+  options: Option[];
+
+  aliases: string[];
+  scope: CommandScope;
+
+  impl: CommandConstructor;
+
+  hidden: boolean;
+
+  type: CommandType;
+
+  schematics?: {
+    [name: string]: Option[];
+  };
+  architect?: {
+    [name: string]: Option[];
+  };
+}
+
+export interface OptionSmartDefault {
+  $source: string;
+  [key: string]: json.JsonValue;
+}
+
+export interface CommandDescriptionMap {
+  [key: string]: CommandDescription;
+}
diff --git a/packages/angular/cli/models/json-schema.ts b/packages/angular/cli/models/json-schema.ts
deleted file mode 100644
index 1dcb8aee16d3..000000000000
--- a/packages/angular/cli/models/json-schema.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { JsonObject, isJsonObject, parseJson } from '@angular-devkit/core';
-import * as jsonSchemaTraverse from 'json-schema-traverse';
-import { Option, OptionSmartDefault } from './command';
-
-export async function convertSchemaToOptions(schema: string): Promise<Option[]> {
-  const options = await getOptions(schema);
-
-  return options;
-}
-
-function getOptions(schemaText: string, onlyRootProperties = true): Promise<Option[]> {
-  // TODO: Use devkit core's visitJsonSchema
-  return new Promise((resolve) => {
-    const fullSchema = parseJson(schemaText);
-    if (!isJsonObject(fullSchema)) {
-      return Promise.resolve([]);
-    }
-    const traverseOptions = {};
-    const options: Option[] = [];
-    function postCallback(schema: JsonObject,
-                          jsonPointer: string,
-                          _rootSchema: string,
-                          _parentJsonPointer: string,
-                          parentKeyword: string,
-                          _parentSchema: string,
-                          property: string) {
-      if (parentKeyword === 'properties') {
-        let includeOption = true;
-        if (onlyRootProperties && isPropertyNested(jsonPointer)) {
-          includeOption = false;
-        }
-        const description = typeof schema.description == 'string' ? schema.description : '';
-        const type = typeof schema.type == 'string' ? schema.type : '';
-        let defaultValue: string | number | boolean | undefined = undefined;
-        if (schema.default !== null) {
-          if (typeof schema.default !== 'object') {
-            defaultValue = schema.default;
-          }
-        }
-        let $default: OptionSmartDefault | undefined = undefined;
-        if (schema.$default !== null && isJsonObject(schema.$default)) {
-          $default = schema.$default as OptionSmartDefault;
-        }
-        let required = false;
-        if (typeof schema.required === 'boolean') {
-          required = schema.required;
-        }
-        let aliases: string[] | undefined = undefined;
-        if (typeof schema.aliases === 'object' && Array.isArray(schema.aliases)) {
-          aliases = schema.aliases as string[];
-        }
-        let format: string | undefined = undefined;
-        if (typeof schema.format === 'string') {
-          format = schema.format;
-        }
-        let hidden = false;
-        if (typeof schema.hidden === 'boolean') {
-          hidden = schema.hidden;
-        }
-
-        const option: Option = {
-          name: property,
-          // ...schema,
-
-          description,
-          type,
-          default: defaultValue,
-          $default,
-          required,
-          aliases,
-          format,
-          hidden,
-        };
-
-        if (includeOption) {
-          options.push(option);
-        }
-      } else if (schema === fullSchema) {
-        resolve(options);
-      }
-    }
-
-    const callbacks = { post: postCallback };
-
-    jsonSchemaTraverse(fullSchema, traverseOptions, callbacks);
-  });
-}
-
-function isPropertyNested(jsonPath: string): boolean {
-  return jsonPath.split('/')
-    .filter(part => part == 'properties' || part == 'items')
-    .length > 1;
-}
-
-export function parseSchema(schema: string): JsonObject | null {
-  const parsedSchema = parseJson(schema);
-  if (parsedSchema === null || !isJsonObject(parsedSchema)) {
-    return null;
-  }
-
-  return parsedSchema;
-}
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index 75714606c250..f04c262bd1c8 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -5,10 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-// tslint:disable:no-global-tslint-disable no-any
 import {
-  JsonObject,
   experimental,
   logging,
   normalize,
@@ -20,24 +17,24 @@ import {
 } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import {
-  Collection,
   DryRunEvent,
   Engine,
-  Schematic,
   SchematicEngine,
   UnsuccessfulWorkflowExecution,
-  formats,
   workflow,
 } from '@angular-devkit/schematics';
 import {
+  FileSystemCollection,
   FileSystemCollectionDesc,
   FileSystemEngineHostBase,
+  FileSystemSchematic,
   FileSystemSchematicDesc,
   NodeModulesEngineHost,
   NodeWorkflow,
   validateOptionsWithSchema,
 } from '@angular-devkit/schematics/tools';
 import * as inquirer from 'inquirer';
+import * as systemPath from 'path';
 import { take } from 'rxjs/operators';
 import { WorkspaceLoader } from '../models/workspace-loader';
 import {
@@ -46,33 +43,30 @@ import {
   getSchematicDefaults,
   getWorkspace,
 } from '../utilities/config';
-import { ArgumentStrategy, Command, CommandContext, Option } from './command';
+import { parseJsonSchemaToOptions } from '../utilities/json-schema';
+import { BaseCommandOptions, Command } from './command';
+import { Arguments, CommandContext, CommandDescription, Option } from './interface';
+import { parseArguments, parseFreeFormArguments } from './parser';
 
-export interface CoreSchematicOptions {
-  dryRun: boolean;
-  force: boolean;
+export interface BaseSchematicOptions extends BaseCommandOptions {
+  debug?: boolean;
+  dryRun?: boolean;
+  force?: boolean;
+  interactive?: boolean;
 }
 
 export interface RunSchematicOptions {
   collectionName: string;
   schematicName: string;
-  schematicOptions: any;
+
+  schematicOptions?: string[];
+
   debug?: boolean;
-  dryRun: boolean;
-  force: boolean;
+  dryRun?: boolean;
+  force?: boolean;
   showNothingDone?: boolean;
-  interactive?: boolean;
-}
-
-export interface GetOptionsOptions {
-  collectionName: string;
-  schematicName: string;
 }
 
-export interface GetOptionsResult {
-  options: Option[];
-  arguments: Option[];
-}
 
 export class UnknownCollectionError extends Error {
   constructor(collectionName: string) {
@@ -80,47 +74,101 @@ export class UnknownCollectionError extends Error {
   }
 }
 
-export abstract class SchematicCommand extends Command {
-  readonly options: Option[] = [];
+export abstract class SchematicCommand<
+  T extends BaseSchematicOptions = BaseSchematicOptions,
+> extends Command<T> {
   readonly allowPrivateSchematics: boolean = false;
   private _host = new NodeJsSyncHost();
   private _workspace: experimental.workspace.Workspace;
-  private _deAliasedName: string;
-  private _originalOptions: Option[];
-  private _engineHost: FileSystemEngineHostBase;
-  private _engine: Engine<FileSystemCollectionDesc, FileSystemSchematicDesc>;
-  private _workflow: workflow.BaseWorkflow;
-  argStrategy = ArgumentStrategy.Nothing;
+  private readonly _engine: Engine<FileSystemCollectionDesc, FileSystemSchematicDesc>;
+  protected _workflow: workflow.BaseWorkflow;
 
   constructor(
-      context: CommandContext, logger: logging.Logger,
-      engineHost: FileSystemEngineHostBase = new NodeModulesEngineHost()) {
-    super(context, logger);
-    this._engineHost = engineHost;
+    context: CommandContext,
+    description: CommandDescription,
+    logger: logging.Logger,
+    private readonly _engineHost: FileSystemEngineHostBase = new NodeModulesEngineHost(),
+  ) {
+    super(context, description, logger);
     this._engine = new SchematicEngine(this._engineHost);
-    const registry = new schema.CoreSchemaRegistry(formats.standardFormats);
-    this._engineHost.registerOptionsTransform(
-        validateOptionsWithSchema(registry));
   }
 
-  protected readonly coreOptions: Option[] = [
-    {
-      name: 'dryRun',
-      type: 'boolean',
-      default: false,
-      aliases: ['d'],
-      description: 'Run through without making any changes.',
-    },
-    {
-      name: 'force',
-      type: 'boolean',
-      default: false,
-      aliases: ['f'],
-      description: 'Forces overwriting of files.',
-    }];
-
-  public async initialize(_options: any) {
+  public async initialize(options: T) {
     this._loadWorkspace();
+    this.createWorkflow(options);
+  }
+
+  public async printHelp(options: T) {
+    await super.printHelp(options);
+    const schematicNames = Object.keys(this.description.schematics || {});
+
+    await super.printHelpOptions();
+    this.logger.info('');
+
+    if (this.description.schematics) {
+
+      if (schematicNames.length > 1) {
+        this.logger.info('Available Schematics:');
+
+        const namesPerCollection: { [c: string]: string[] } = {};
+        schematicNames.forEach(name => {
+          const [collectionName, schematicName] = name.split(/:/, 2);
+
+          if (!namesPerCollection[collectionName]) {
+            namesPerCollection[collectionName] = [];
+          }
+
+          namesPerCollection[collectionName].push(schematicName);
+        });
+
+        const defaultCollection = this.getDefaultSchematicCollection();
+        Object.keys(namesPerCollection).forEach(collectionName => {
+          const isDefault = defaultCollection == collectionName;
+          this.logger.info(
+            `  Collection "${collectionName}"${isDefault ? ' (default)' : ''}:`,
+          );
+
+          namesPerCollection[collectionName].forEach(schematicName => {
+            this.logger.info(`    ${schematicName}`);
+          });
+        });
+      } else if (schematicNames.length == 1) {
+        this.logger.info('Options for schematic ' + schematicNames[0]);
+        await this.printHelpOptions(this.description.schematics[schematicNames[0]]);
+      }
+    }
+
+    return 0;
+  }
+
+  async printHelpUsage() {
+    const schematicNames = Object.keys(this.description.schematics || {});
+    if (this.description.schematics && schematicNames.length == 1) {
+      this.logger.info(this.description.description);
+
+      const opts = this.description.options.filter(x => x.positional === undefined);
+      const [collectionName, schematicName] = schematicNames[0].split(/:/)[0];
+
+      // Display <collectionName:schematicName> if this is not the default collectionName,
+      // otherwise just show the schematicName.
+      const displayName = collectionName == this.getDefaultSchematicCollection()
+        ? schematicName
+        : schematicNames[0];
+
+      const schematicOptions = this.description.schematics[schematicNames[0]];
+      const schematicArgs = schematicOptions.filter(x => x.positional !== undefined);
+      const argDisplay = schematicArgs.length > 0
+        ? ' ' + schematicArgs.map(a => `<${strings.dasherize(a.name)}>`).join(' ')
+        : '';
+
+      this.logger.info(tags.oneLine`
+        usage: ng ${this.description.name} ${displayName}${argDisplay}
+        ${opts.length > 0 ? `[options]` : ``}
+      `);
+      this.logger.info('');
+    } else {
+      await super.printHelpUsage();
+    }
   }
 
   protected getEngineHost() {
@@ -131,7 +179,7 @@ export abstract class SchematicCommand extends Command {
     return this._engine;
   }
 
-  protected getCollection(collectionName: string): Collection<any, any> {
+  protected getCollection(collectionName: string): FileSystemCollection {
     const engine = this.getEngine();
     const collection = engine.createCollection(collectionName);
 
@@ -143,127 +191,58 @@ export abstract class SchematicCommand extends Command {
   }
 
   protected getSchematic(
-      collection: Collection<any, any>, schematicName: string,
-      allowPrivate?: boolean): Schematic<any, any> {
+    collection: FileSystemCollection,
+    schematicName: string,
+    allowPrivate?: boolean,
+  ): FileSystemSchematic {
     return collection.createSchematic(schematicName, allowPrivate);
   }
 
-  protected setPathOptions(options: any, workingDir: string): any {
+  protected setPathOptions(options: Option[], workingDir: string) {
     if (workingDir === '') {
       return {};
     }
 
-    return this.options
+    return options
       .filter(o => o.format === 'path')
       .map(o => o.name)
-      .filter(name => options[name] === undefined)
-      .reduce((acc: any, curr) => {
+      .reduce((acc, curr) => {
         acc[curr] = workingDir;
 
         return acc;
-      }, {});
+      }, {} as { [name: string]: string });
   }
 
   /*
    * Runtime hook to allow specifying customized workflow
    */
-  protected getWorkflow(options: RunSchematicOptions): workflow.BaseWorkflow {
+  protected createWorkflow(options: BaseSchematicOptions): workflow.BaseWorkflow {
+    if (this._workflow) {
+      return this._workflow;
+    }
+
     const {force, dryRun} = options;
-    const fsHost = new virtualFs.ScopedHost(
-        new NodeJsSyncHost(), normalize(this.project.root));
+    const fsHost = new virtualFs.ScopedHost(new NodeJsSyncHost(), normalize(this.project.root));
 
-    return new NodeWorkflow(
-        fsHost as any,
+    const workflow = new NodeWorkflow(
+        fsHost,
         {
           force,
           dryRun,
           packageManager: getPackageManager(),
-          root: this.project.root,
+          root: normalize(this.project.root),
         },
     );
-  }
-
-  private _getWorkflow(options: RunSchematicOptions): workflow.BaseWorkflow {
-    if (!this._workflow) {
-      this._workflow = this.getWorkflow(options);
-    }
 
-    return this._workflow;
-  }
-
-  protected getDefaultSchematicCollection(): string {
-    let workspace = getWorkspace('local');
+    this._engineHost.registerOptionsTransform(validateOptionsWithSchema(workflow.registry));
 
-    if (workspace) {
-      const project = getProjectByCwd(workspace);
-      if (project && workspace.getProjectCli(project)) {
-        const value = workspace.getProjectCli(project)['defaultCollection'];
-        if (typeof value == 'string') {
-          return value;
-        }
-      }
-      if (workspace.getCli()) {
-        const value = workspace.getCli()['defaultCollection'];
-        if (typeof value == 'string') {
-          return value;
-        }
-      }
-    }
-
-    workspace = getWorkspace('global');
-    if (workspace && workspace.getCli()) {
-      const value = workspace.getCli()['defaultCollection'];
-      if (typeof value == 'string') {
-        return value;
-      }
-    }
-
-    return '@schematics/angular';
-  }
-
-  protected runSchematic(options: RunSchematicOptions) {
-    const {collectionName, schematicName, debug, dryRun} = options;
-    let schematicOptions = this.removeCoreOptions(options.schematicOptions);
-    let nothingDone = true;
-    let loggingQueue: string[] = [];
-    let error = false;
-    const workflow = this._getWorkflow(options);
-
-    const workingDir = process.cwd().replace(this.project.root, '').replace(/\\/g, '/');
-    const pathOptions = this.setPathOptions(schematicOptions, workingDir);
-    schematicOptions = { ...schematicOptions, ...pathOptions };
-    const defaultOptions = this.readDefaults(collectionName, schematicName, schematicOptions);
-    schematicOptions = { ...schematicOptions, ...defaultOptions };
-
-    // Remove all of the original arguments which have already been parsed
-
-    const argumentCount = this._originalOptions
-      .filter(opt => {
-        let isArgument = false;
-        if (opt.$default !== undefined && opt.$default.$source === 'argv') {
-          isArgument = true;
-        }
-
-        return isArgument;
-      })
-      .length;
-
-    // Pass the rest of the arguments as the smart default "argv". Then delete it.
-    const rawArgs = schematicOptions._.slice(argumentCount);
-    workflow.registry.addSmartDefaultProvider('argv', (schema: JsonObject) => {
-      if ('index' in schema) {
-        return rawArgs[Number(schema['index'])];
-      } else {
-        return rawArgs;
-      }
-    });
-    delete schematicOptions._;
+    workflow.registry.addPostTransform(schema.transforms.addUndefinedDefaults);
 
-    workflow.registry.addSmartDefaultProvider('projectName', (_schema: JsonObject) => {
+    workflow.registry.addSmartDefaultProvider('projectName', () => {
       if (this._workspace) {
         try {
-        return this._workspace.getProjectByPath(normalize(process.cwd()))
-               || this._workspace.getDefaultProjectName();
+          return this._workspace.getProjectByPath(normalize(process.cwd()))
+            || this._workspace.getDefaultProjectName();
         } catch (e) {
           if (e instanceof experimental.workspace.AmbiguousProjectPathException) {
             this.logger.warn(tags.oneLine`
@@ -324,6 +303,81 @@ export abstract class SchematicCommand extends Command {
       });
     }
 
+    return this._workflow = workflow;
+  }
+
+  protected getDefaultSchematicCollection(): string {
+    let workspace = getWorkspace('local');
+
+    if (workspace) {
+      const project = getProjectByCwd(workspace);
+      if (project && workspace.getProjectCli(project)) {
+        const value = workspace.getProjectCli(project)['defaultCollection'];
+        if (typeof value == 'string') {
+          return value;
+        }
+      }
+      if (workspace.getCli()) {
+        const value = workspace.getCli()['defaultCollection'];
+        if (typeof value == 'string') {
+          return value;
+        }
+      }
+    }
+
+    workspace = getWorkspace('global');
+    if (workspace && workspace.getCli()) {
+      const value = workspace.getCli()['defaultCollection'];
+      if (typeof value == 'string') {
+        return value;
+      }
+    }
+
+    return '@schematics/angular';
+  }
+
+  protected async runSchematic(options: RunSchematicOptions) {
+    const { schematicOptions, debug, dryRun } = options;
+    let { collectionName, schematicName } = options;
+
+    let nothingDone = true;
+    let loggingQueue: string[] = [];
+    let error = false;
+
+    const workflow = this._workflow;
+
+    const workingDir = normalize(systemPath.relative(this.project.root, process.cwd()));
+
+    // Get the option object from the schematic schema.
+    const schematic = this.getSchematic(
+      this.getCollection(collectionName),
+      schematicName,
+      this.allowPrivateSchematics,
+    );
+    // Update the schematic and collection name in case they're not the same as the ones we
+    // received in our options, e.g. after alias resolution or extension.
+    collectionName = schematic.collection.description.name;
+    schematicName = schematic.description.name;
+
+    // Set the options of format "path".
+    let o: Option[] | null = null;
+    let args: Arguments;
+
+    if (!schematic.description.schemaJson) {
+      args = await this.parseFreeFormArguments(schematicOptions || []);
+    } else {
+      o = await parseJsonSchemaToOptions(workflow.registry, schematic.description.schemaJson);
+      args = await this.parseArguments(schematicOptions || [], o);
+    }
+
+    const pathOptions = o ? this.setPathOptions(o, workingDir) : {};
+    let input = Object.assign(pathOptions, args);
+
+    // Read the default values from the workspace.
+    const projectName = input.project !== undefined ? '' + input.project : null;
+    const defaults = getSchematicDefaults(collectionName, schematicName, projectName);
+    input = Object.assign<{}, {}, typeof input>({}, defaults, input);
+
     workflow.reporter.subscribe((event: DryRunEvent) => {
       nothingDone = false;
 
@@ -371,9 +425,9 @@ export abstract class SchematicCommand extends Command {
       workflow.execute({
         collection: collectionName,
         schematic: schematicName,
-        options: schematicOptions,
+        options: input,
         debug: debug,
-        logger: this.logger as any,
+        logger: this.logger,
         allowPrivate: this.allowPrivateSchematics,
       })
       .subscribe({
@@ -396,7 +450,7 @@ export abstract class SchematicCommand extends Command {
             this.logger.info('Nothing to be done.');
           }
           if (dryRun) {
-            this.logger.warn(`\nNOTE: Run with "dry run" no changes were made.`);
+            this.logger.warn(`\nNOTE: The "dryRun" flag means no changes were made.`);
           }
           resolve();
         },
@@ -404,68 +458,15 @@ export abstract class SchematicCommand extends Command {
     });
   }
 
-  protected removeCoreOptions(options: any): any {
-    const opts = Object.assign({}, options);
-    if (this._originalOptions.find(option => option.name == 'dryRun')) {
-      delete opts.dryRun;
-    }
-    if (this._originalOptions.find(option => option.name == 'force')) {
-      delete opts.force;
-    }
-    if (this._originalOptions.find(option => option.name == 'debug')) {
-      delete opts.debug;
-    }
-
-    return opts;
+  protected async parseFreeFormArguments(schematicOptions: string[]) {
+    return parseFreeFormArguments(schematicOptions);
   }
 
-  protected getOptions(options: GetOptionsOptions): Promise<Option[]> {
-    // Make a copy.
-    this._originalOptions = [...this.options];
-
-    const collectionName = options.collectionName || this.getDefaultSchematicCollection();
-
-    const collection = this.getCollection(collectionName);
-
-    const schematic = this.getSchematic(collection, options.schematicName,
-      this.allowPrivateSchematics);
-    this._deAliasedName = schematic.description.name;
-
-    if (!schematic.description.schemaJson) {
-      return Promise.resolve([]);
-    }
-
-    const properties = schematic.description.schemaJson.properties;
-    const keys = Object.keys(properties);
-    const availableOptions = keys
-      .map(key => ({ ...properties[key], ...{ name: strings.dasherize(key) } }))
-      .map(opt => {
-        const types = ['string', 'boolean', 'integer', 'number'];
-        // Ignore arrays / objects.
-        if (types.indexOf(opt.type) === -1) {
-          return null;
-        }
-
-        let aliases: string[] = [];
-        if (opt.alias) {
-          aliases = [...aliases, opt.alias];
-        }
-        if (opt.aliases) {
-          aliases = [...aliases, ...opt.aliases];
-        }
-        const schematicDefault = opt.default;
-
-        return {
-          ...opt,
-          aliases,
-          default: undefined, // do not carry over schematics defaults
-          schematicDefault,
-          hidden: opt.visible === false,
-        };
-      })
-      .filter(x => x);
-
-    return Promise.resolve(availableOptions);
+  protected async parseArguments(
+    schematicOptions: string[],
+    options: Option[] | null,
+  ): Promise<Arguments> {
+    return parseArguments(schematicOptions, options);
   }
 
   private _loadWorkspace() {
@@ -489,36 +490,7 @@ export abstract class SchematicCommand extends Command {
       if (!this.allowMissingWorkspace) {
         // Ignore missing workspace
         throw err;
-      }
-    }
   }
-
-  private _cleanDefaults<T, K extends keyof T>(defaults: T, undefinedOptions: string[]): T {
-    (Object.keys(defaults) as K[])
-      .filter(key => !undefinedOptions.map(strings.camelize).includes(key as string))
-      .forEach(key => {
-        delete defaults[key];
-      });
-
-    return defaults;
-  }
-
-  private readDefaults(collectionName: string, schematicName: string, options: any): {} {
-    if (this._deAliasedName) {
-      schematicName = this._deAliasedName;
     }
-
-    const projectName = options.project;
-    const defaults = getSchematicDefaults(collectionName, schematicName, projectName);
-
-    // Get list of all undefined options.
-    const undefinedOptions = this.options
-      .filter(o => options[o.name] === undefined)
-      .map(o => o.name);
-
-    // Delete any default that is not undefined.
-    this._cleanDefaults(defaults, undefinedOptions);
-
-    return defaults;
   }
 }
diff --git a/packages/angular/cli/utilities/json-schema.ts b/packages/angular/cli/utilities/json-schema.ts
new file mode 100644
index 000000000000..41cabd96be88
--- /dev/null
+++ b/packages/angular/cli/utilities/json-schema.ts
@@ -0,0 +1,201 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { json } from '@angular-devkit/core';
+import { ExportStringRef } from '@angular-devkit/schematics/tools';
+import { dirname } from 'path';
+import {
+  CommandConstructor,
+  CommandDescription,
+  CommandScope,
+  CommandType,
+  Option,
+  OptionType,
+} from '../models/interface';
+
+function _getEnumFromValue<E, T extends string>(v: json.JsonValue, e: E, d: T): T {
+  if (typeof v !== 'string') {
+    return d;
+  }
+
+  if (Object.values(e).indexOf(v) !== -1) {
+    return v as T;
+  }
+
+  return d;
+}
+
+export async function parseJsonSchemaToCommandDescription(
+  name: string,
+  jsonPath: string,
+  registry: json.schema.SchemaRegistry,
+  schema: json.JsonObject,
+): Promise<CommandDescription> {
+  // Before doing any work, let's validate the implementation.
+  if (typeof schema.$impl != 'string') {
+    throw new Error(`Command ${name} has an invalid implementation.`);
+  }
+  const ref = new ExportStringRef<CommandConstructor>(schema.$impl, dirname(jsonPath));
+  const impl = ref.ref;
+
+  if (impl === undefined || typeof impl !== 'function') {
+    throw new Error(`Command ${name} has an invalid implementation.`);
+  }
+
+  const options = await parseJsonSchemaToOptions(registry, schema);
+
+  const aliases: string[] = [];
+  if (json.isJsonArray(schema.$aliases)) {
+    schema.$aliases.forEach(value => {
+      if (typeof value == 'string') {
+        aliases.push(value);
+      }
+    });
+  }
+
+  const scope = _getEnumFromValue(schema.$scope, CommandScope, CommandScope.Default);
+  const type = _getEnumFromValue(schema.$type, CommandType, CommandType.Default);
+  const description = '' + (schema.description === undefined ? '' : schema.description);
+  const hidden = !!schema.$hidden;
+
+  return { name, description, hidden, type, options, aliases, scope, impl };
+}
+
+export async function parseJsonSchemaToOptions(
+  registry: json.schema.SchemaRegistry,
+  schema: json.JsonObject,
+): Promise<Option[]> {
+  const options: Option[] = [];
+
+  function visitor(
+    current: json.JsonObject | json.JsonArray,
+    pointer: json.schema.JsonPointer,
+    parentSchema?: json.JsonObject | json.JsonArray,
+  ) {
+    if (!parentSchema) {
+      // Ignore root.
+      return;
+    } else if (pointer.split(/properties|items/g).length > 2) {
+      // Ignore subitems (objects or arrays).
+      return;
+    } else if (json.isJsonArray(current)) {
+      return;
+    }
+
+    if (pointer.indexOf('/not/') != -1) {
+      // We don't support anyOf/not.
+      throw new Error('The "not" keyword is not supported in JSON Schema.');
+    }
+
+    const ptr = json.schema.parseJsonPointer(pointer);
+    const name = ptr[ptr.length - 1];
+
+    if (ptr[ptr.length - 2] != 'properties') {
+      // Skip any non-property items.
+      return;
+    }
+
+    const typeSet = json.schema.getTypesOfSchema(current);
+
+    if (typeSet.size == 0) {
+      throw new Error('Cannot find type of schema.');
+    }
+
+    // We only support number, string or boolean (or array of those), so remove everything else.
+    const types = [...typeSet].filter(x => {
+      switch (x) {
+        case 'boolean':
+        case 'number':
+        case 'string':
+          return true;
+
+        case 'array':
+          // Only include arrays if they're boolean, string or number.
+          if (json.isJsonObject(current.items)
+              && typeof current.items.type == 'string'
+              && ['boolean', 'number', 'string'].includes(current.items.type)) {
+            return true;
+          }
+
+          return false;
+
+        default:
+          return false;
+      }
+    }).map(x => _getEnumFromValue(x, OptionType, OptionType.String));
+
+    if (types.length == 0) {
+      // This means it's not usable on the command line. e.g. an Object.
+      return;
+    }
+
+    let defaultValue: string | number | boolean | undefined = undefined;
+    if (schema.default !== undefined) {
+      switch (types[0]) {
+        case 'string':
+          if (typeof schema.default == 'string') {
+            defaultValue = schema.default;
+          }
+          break;
+        case 'number':
+          if (typeof schema.default == 'number') {
+            defaultValue = schema.default;
+          }
+          break;
+        case 'boolean':
+          if (typeof schema.default == 'boolean') {
+            defaultValue = schema.default;
+          }
+          break;
+      }
+    }
+
+    const $default = current.$default;
+    const $defaultIndex = (json.isJsonObject($default) && $default['$source'] == 'argv')
+      ? $default['index'] : undefined;
+    const positional: number | undefined = typeof $defaultIndex == 'number'
+      ? $defaultIndex : undefined;
+
+    const required = json.isJsonArray(current.required)
+        ? current.required.indexOf(name) != -1 : false;
+    const aliases = json.isJsonArray(current.aliases) ? [...current.aliases].map(x => '' + x) : [];
+    const format = typeof current.format == 'string' ? current.format : undefined;
+    const hidden = !!current.hidden;
+
+    const option: Option = {
+      name,
+      description: '' + (current.description === undefined ? '' : current.description),
+      ...types.length == 1 ? { type: types[0] } : { type: types[0], types },
+      ...defaultValue !== undefined ? { default: defaultValue } : {},
+      required,
+      aliases,
+      ...format !== undefined ? { format } : {},
+      hidden,
+      ...positional !== undefined ? { positional } : {},
+    };
+
+    options.push(option);
+  }
+
+  const flattenedSchema = await registry.flatten(schema).toPromise();
+  json.schema.visitJsonSchema(flattenedSchema, visitor);
+
+  // Sort by positional.
+  return options.sort((a, b) => {
+    if (a.positional) {
+      if (b.positional) {
+        return a.positional - b.positional;
+      } else {
+        return 1;
+      }
+    } else if (b.positional) {
+      return -1;
+    } else {
+      return 0;
+    }
+  });
+}
diff --git a/packages/angular/cli/utilities/project.ts b/packages/angular/cli/utilities/project.ts
index d6becfa363f1..e2be4245dda7 100644
--- a/packages/angular/cli/utilities/project.ts
+++ b/packages/angular/cli/utilities/project.ts
@@ -11,18 +11,14 @@ import { normalize } from '@angular-devkit/core';
 import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
+import { CommandProject } from '../models/interface';
 import { findUp } from './find-up';
 
 export function insideProject(): boolean {
   return getProjectDetails() !== null;
 }
 
-export interface ProjectDetails {
-  root: string;
-  configFile?: string;
-}
-
-export function getProjectDetails(): ProjectDetails | null {
+export function getProjectDetails(): CommandProject | null {
   const currentDir = process.cwd();
   const possibleConfigFiles = [
     'angular.json',
diff --git a/tests/legacy-cli/e2e/tests/basic/in-project-logic.ts b/tests/legacy-cli/e2e/tests/basic/in-project-logic.ts
index fea6d3fd7a1c..5bf34c937a61 100644
--- a/tests/legacy-cli/e2e/tests/basic/in-project-logic.ts
+++ b/tests/legacy-cli/e2e/tests/basic/in-project-logic.ts
@@ -1,15 +1,20 @@
-import {writeFile, deleteFile} from '../../utils/fs';
-import {ng} from '../../utils/process';
 import * as os from 'os';
-import {join} from 'path';
+import { join } from 'path';
+import { writeFile, deleteFile } from '../../utils/fs';
+import { ng } from '../../utils/process';
+import { expectToFail } from '../../utils/utils';
 
 
 export default function() {
   const homedir = os.homedir();
-  const globalConfigPath = join(homedir, '.angular.json');
+  const globalConfigPath = join(homedir, '.angular-config.json');
   return Promise.resolve()
     .then(() => writeFile(globalConfigPath, '{"version":1}'))
     .then(() => process.chdir(homedir))
     .then(() => ng('new', 'proj-name', '--dry-run'))
-    .then(() => deleteFile(globalConfigPath));
+    .then(() => deleteFile(globalConfigPath))
+    // Test that we cannot create a project inside another project.
+    .then(() => writeFile(join(homedir, '.angular.json'), '{"version":1}'))
+    .then(() => expectToFail(() => ng('new', 'proj-name', '--dry-run')))
+    .then(() => deleteFile(join(homedir, '.angular.json')));
 }
diff --git a/tests/legacy-cli/e2e/tests/generate/help-output.ts b/tests/legacy-cli/e2e/tests/generate/help-output.ts
index 465448e14ced..c1b9f69c4b2f 100644
--- a/tests/legacy-cli/e2e/tests/generate/help-output.ts
+++ b/tests/legacy-cli/e2e/tests/generate/help-output.ts
@@ -74,7 +74,7 @@ export default function() {
     .then(() => ng('generate', 'fake-schematics:fake', '--help'))
     .then(({stdout}) => {
       if (!/ng generate fake-schematics:fake <a> <b> \[options\]/.test(stdout)) {
-        throw new Error('Help signature is wrong.');
+        throw new Error('Help signature is wrong (1).');
       }
       if (!/opt-a[\s\S]*opt-b[\s\S]*opt-c/.test(stdout)) {
         throw new Error('Help signature options are incorrect.');
@@ -88,8 +88,8 @@ export default function() {
     .then(() => ng('generate', 'fake', '--help'))
     // verify same output
     .then(({stdout}) => {
-      if (!/ng generate fake <a> <b> \[options\]/.test(stdout)) {
-        throw new Error('Help signature is wrong.');
+      if (!/ng generate fake-schematics:fake <a> <b> \[options\]/.test(stdout)) {
+        throw new Error('Help signature is wrong (2).');
       }
       if (!/opt-a[\s\S]*opt-b[\s\S]*opt-c/.test(stdout)) {
         throw new Error('Help signature options are incorrect.');
diff --git a/tests/legacy-cli/e2e/utils/assets.ts b/tests/legacy-cli/e2e/utils/assets.ts
index 581350c6673e..83266c792b29 100644
--- a/tests/legacy-cli/e2e/utils/assets.ts
+++ b/tests/legacy-cli/e2e/utils/assets.ts
@@ -4,7 +4,7 @@ import {getGlobalVariable} from './env';
 import {relative} from 'path';
 import {copyFile} from './fs';
 import {useBuiltPackages} from './project';
-import {silentNpm} from './process';
+import { git, silentNpm } from './process';
 
 
 export function assetDir(assetName: string) {
diff --git a/tests/legacy-cli/e2e/utils/process.ts b/tests/legacy-cli/e2e/utils/process.ts
index 7da400f46797..31bd37a724ff 100644
--- a/tests/legacy-cli/e2e/utils/process.ts
+++ b/tests/legacy-cli/e2e/utils/process.ts
@@ -44,7 +44,11 @@ function  _exec(options: ExecOptions, cmd: string, args: string[]): Promise<Proc
 
   console.log(terminal.blue(`Running \`${cmd} ${args.map(x => `"${x}"`).join(' ')}\`${flags}...`));
   console.log(terminal.blue(`CWD: ${cwd}`));
-  const spawnOptions: SpawnOptions = {cwd, env};
+  console.log(terminal.blue(`ENV: ${JSON.stringify(env)}`));
+  const spawnOptions: SpawnOptions = {
+    cwd,
+    ...env ? { env } : {},
+  };
 
   if (process.platform.startsWith('win')) {
     args.unshift('/c', cmd);
@@ -91,13 +95,14 @@ function  _exec(options: ExecOptions, cmd: string, args: string[]): Promise<Proc
     });
 
     if (options.waitForMatch) {
+      const match = options.waitForMatch;
       childProcess.stdout.on('data', (data: Buffer) => {
-        if (data.toString().match(options.waitForMatch)) {
+        if (data.toString().match(match)) {
           resolve({ stdout, stderr });
         }
       });
       childProcess.stderr.on('data', (data: Buffer) => {
-        if (data.toString().match(options.waitForMatch)) {
+        if (data.toString().match(match)) {
           resolve({ stdout, stderr });
         }
       });

From 7ffd3b303352f4909a850ebc64cd696d1925f588 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 4 Sep 2018 15:26:47 -0700
Subject: [PATCH 0040/1703] refactor(@angular/cli): rename project to workspace
 and clean up

Removed unnecessary fields in interfaces, added some comments. Overall QoL.
---
 packages/angular/cli/commands/add-impl.ts     |  6 +-
 packages/angular/cli/commands/build-impl.ts   |  4 +-
 .../angular/cli/commands/generate-impl.ts     |  6 +-
 packages/angular/cli/commands/serve-impl.ts   |  4 +-
 packages/angular/cli/commands/version-impl.ts |  4 +-
 packages/angular/cli/lib/cli/index.ts         |  6 +-
 .../angular/cli/models/architect-command.ts   |  5 +-
 packages/angular/cli/models/command-runner.ts |  8 +--
 packages/angular/cli/models/command.ts        | 21 ++++---
 packages/angular/cli/models/interface.ts      | 56 +++++++++++++------
 .../angular/cli/models/schematic-command.ts   | 21 ++++---
 packages/angular/cli/utilities/project.ts     |  8 +--
 12 files changed, 83 insertions(+), 66 deletions(-)

diff --git a/packages/angular/cli/commands/add-impl.ts b/packages/angular/cli/commands/add-impl.ts
index e2492826ea57..17e0bb23034a 100644
--- a/packages/angular/cli/commands/add-impl.ts
+++ b/packages/angular/cli/commands/add-impl.ts
@@ -16,8 +16,6 @@ import { getPackageManager } from '../utilities/config';
 
 export interface AddCommandOptions extends BaseSchematicOptions {
   collection: string;
-  help?: boolean;
-  help_json?: boolean;
 }
 
 export class AddCommand<
@@ -56,12 +54,12 @@ export class AddCommand<
       packageName,
       this.logger,
       packageManager,
-      this.project.root,
+      this.workspace.root,
     );
 
     const runOptions = {
       schematicOptions: options['--'] || [],
-      workingDir: this.project.root,
+      workingDir: this.workspace.root,
       collectionName,
       schematicName: 'ng-add',
       allowPrivate: true,
diff --git a/packages/angular/cli/commands/build-impl.ts b/packages/angular/cli/commands/build-impl.ts
index 46484827de12..c6c94dcfbb9d 100644
--- a/packages/angular/cli/commands/build-impl.ts
+++ b/packages/angular/cli/commands/build-impl.ts
@@ -14,8 +14,8 @@ export class BuildCommand extends ArchitectCommand {
 
   public async run(options: ArchitectCommandOptions) {
     // Check Angular and TypeScript versions.
-    Version.assertCompatibleAngularVersion(this.project.root);
-    Version.assertTypescriptVersion(this.project.root);
+    Version.assertCompatibleAngularVersion(this.workspace.root);
+    Version.assertTypescriptVersion(this.workspace.root);
 
     return this.runArchitectTarget(options);
   }
diff --git a/packages/angular/cli/commands/generate-impl.ts b/packages/angular/cli/commands/generate-impl.ts
index 7a58da674214..81189872338e 100644
--- a/packages/angular/cli/commands/generate-impl.ts
+++ b/packages/angular/cli/commands/generate-impl.ts
@@ -26,7 +26,7 @@ export class GenerateCommand<
     const [collectionName, schematicName] = this.parseSchematicInfo(options);
 
     const collection = this.getCollection(collectionName);
-    this.description.schematics = {};
+    this.description.suboptions = {};
 
     const schematicNames = schematicName ? [schematicName] : collection.listSchematicNames();
 
@@ -40,7 +40,7 @@ export class GenerateCommand<
         );
       }
 
-      this.description.schematics[`${collectionName}:${name}`] = options;
+      this.description.suboptions[`${collectionName}:${name}`] = options;
     }
   }
 
@@ -78,7 +78,7 @@ export class GenerateCommand<
   public async printHelp(options: T) {
     await super.printHelp(options);
 
-    if (Object.keys(this.description.schematics || {}).length == 1) {
+    if (Object.keys(this.description.suboptions || {}).length == 1) {
       this.logger.info(`\nTo see help for a schematic run:`);
       this.logger.info(terminal.cyan(`  ng generate <schematic> --help`));
     }
diff --git a/packages/angular/cli/commands/serve-impl.ts b/packages/angular/cli/commands/serve-impl.ts
index 6ff9b11e62c3..1e9175c00497 100644
--- a/packages/angular/cli/commands/serve-impl.ts
+++ b/packages/angular/cli/commands/serve-impl.ts
@@ -15,8 +15,8 @@ export class ServeCommand extends ArchitectCommand {
 
   public validate(_options: ArchitectCommandOptions) {
     // Check Angular and TypeScript versions.
-    Version.assertCompatibleAngularVersion(this.project.root);
-    Version.assertTypescriptVersion(this.project.root);
+    Version.assertCompatibleAngularVersion(this.workspace.root);
+    Version.assertTypescriptVersion(this.workspace.root);
 
     return true;
   }
diff --git a/packages/angular/cli/commands/version-impl.ts b/packages/angular/cli/commands/version-impl.ts
index 64e10026ab35..1b0367d1e18a 100644
--- a/packages/angular/cli/commands/version-impl.ts
+++ b/packages/angular/cli/commands/version-impl.ts
@@ -21,7 +21,7 @@ export class VersionCommand extends Command {
     const pkg = require(path.resolve(__dirname, '..', 'package.json'));
     let projPkg;
     try {
-      projPkg = require(path.resolve(this.project.root, 'package.json'));
+      projPkg = require(path.resolve(this.workspace.root, 'package.json'));
     } catch (exception) {
       projPkg = undefined;
     }
@@ -39,7 +39,7 @@ export class VersionCommand extends Command {
 
     const maybeNodeModules = findUp('node_modules', __dirname);
     const packageRoot = projPkg
-      ? path.resolve(this.project.root, 'node_modules')
+      ? path.resolve(this.workspace.root, 'node_modules')
       : maybeNodeModules;
 
     const packageNames = [
diff --git a/packages/angular/cli/lib/cli/index.ts b/packages/angular/cli/lib/cli/index.ts
index b6940090de15..fd55a21a6731 100644
--- a/packages/angular/cli/lib/cli/index.ts
+++ b/packages/angular/cli/lib/cli/index.ts
@@ -9,19 +9,17 @@
 import { logging, terminal } from '@angular-devkit/core';
 import { filter } from 'rxjs/operators';
 import { runCommand } from '../../models/command-runner';
-import { getProjectDetails } from '../../utilities/project';
+import { getWorkspaceDetails } from '../../utilities/project';
 
 
 export default async function(options: { testing?: boolean, cliArgs: string[] }) {
-  // const commands = await loadCommands();
-
   const logger = new logging.IndentLogger('cling');
   let loggingSubscription;
   if (!options.testing) {
     loggingSubscription = initializeLogging(logger);
   }
 
-  let projectDetails = getProjectDetails();
+  let projectDetails = getWorkspaceDetails();
   if (projectDetails === null) {
     projectDetails = { root: process.cwd() };
   }
diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index f1f61a90b103..ae9979c99255 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -45,7 +45,8 @@ export abstract class ArchitectCommand extends Command<ArchitectCommandOptions>
 
     if (!options.project && this.target) {
       const projectNames = this.getProjectNamesByTarget(this.target);
-      if (projectNames.length > 1 && options['--'] && options['--'].length > 0) {
+      const leftovers = options['--'];
+      if (projectNames.length > 1 && leftovers && leftovers.length > 0) {
         // Verify that all builders are the same, otherwise error out (since the meaning of an
         // option could vary from builder to builder).
 
@@ -183,7 +184,7 @@ export abstract class ArchitectCommand extends Command<ArchitectCommandOptions>
   private _loadWorkspaceAndArchitect() {
     const workspaceLoader = new WorkspaceLoader(this._host);
 
-    return workspaceLoader.loadWorkspace(this.project.root).pipe(
+    return workspaceLoader.loadWorkspace(this.workspace.root).pipe(
       tap((workspace: experimental.workspace.Workspace) => this._workspace = workspace),
       concatMap((workspace: experimental.workspace.Workspace) => {
         return new Architect(workspace).loadArchitect();
diff --git a/packages/angular/cli/models/command-runner.ts b/packages/angular/cli/models/command-runner.ts
index b1cef78b87d6..d673be6cf166 100644
--- a/packages/angular/cli/models/command-runner.ts
+++ b/packages/angular/cli/models/command-runner.ts
@@ -23,7 +23,7 @@ import { Command } from './command';
 import {
   CommandDescription,
   CommandDescriptionMap,
-  CommandProject,
+  CommandWorkspace,
 } from './interface';
 import * as parser from './parser';
 
@@ -36,13 +36,13 @@ export interface CommandMapOptions {
  * Run a command.
  * @param args Raw unparsed arguments.
  * @param logger The logger to use.
- * @param project Project data structure containing project information.
+ * @param workspace Workspace information.
  * @param commands The map of supported commands.
  */
 export async function runCommand(
   args: string[],
   logger: logging.Logger,
-  project: CommandProject,
+  workspace: CommandWorkspace,
   commands?: CommandMapOptions,
 ): Promise<number | void> {
   if (commands === undefined) {
@@ -176,7 +176,7 @@ export async function runCommand(
 
   const parsedOptions = parser.parseArguments(args, description.options);
   Command.setCommandMap(commandMap);
-  const command = new description.impl({ project }, description, logger);
+  const command = new description.impl({ workspace }, description, logger);
 
   return await command.validateAndRun(parsedOptions);
 }
diff --git a/packages/angular/cli/models/command.ts b/packages/angular/cli/models/command.ts
index 53a1e4307179..932cd62ad4d5 100644
--- a/packages/angular/cli/models/command.ts
+++ b/packages/angular/cli/models/command.ts
@@ -14,20 +14,19 @@ import {
   CommandContext,
   CommandDescription,
   CommandDescriptionMap,
-  CommandProject,
   CommandScope,
+  CommandWorkspace,
   Option,
 } from './interface';
 
-export interface BaseCommandOptions {
+export interface BaseCommandOptions extends Arguments {
   help?: boolean;
-  help_json?: boolean;
-  '--': string[];
+  helpJson?: boolean;
 }
 
 export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions> {
   public allowMissingWorkspace = false;
-  public project: CommandProject;
+  public workspace: CommandWorkspace;
 
   protected static commandMap: CommandDescriptionMap;
   static setCommandMap(map: CommandDescriptionMap) {
@@ -39,7 +38,7 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
     public readonly description: CommandDescription,
     protected readonly logger: logging.Logger,
   ) {
-    this.project = context.project;
+    this.workspace = context.workspace;
   }
 
   async initialize(options: T): Promise<void> {
@@ -113,16 +112,16 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
   async validateScope(): Promise<void> {
     switch (this.description.scope) {
       case CommandScope.OutProject:
-        if (this.project.configFile || getWorkspace('local') !== null) {
+        if (this.workspace.configFile || getWorkspace('local') !== null) {
           this.logger.fatal(tags.oneLine`
             The ${this.description.name} command requires to be run outside of a project, but a
-            project definition was found at "${this.project.root}".
+            project definition was found at "${this.workspace.root}".
           `);
           throw 1;
         }
         break;
       case CommandScope.InProject:
-        if (!this.project.configFile || getWorkspace('local') === null) {
+        if (!this.workspace.configFile || getWorkspace('local') === null) {
           this.logger.fatal(tags.oneLine`
             The ${this.description.name} command requires to be run in an Angular project, but a
             project definition could not be found.
@@ -139,14 +138,14 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
   abstract async run(options: T & Arguments): Promise<number | void>;
 
   async validateAndRun(options: T & Arguments): Promise<number | void> {
-    if (!options.help && !options.help_json) {
+    if (!options.help && !options.helpJson) {
       await this.validateScope();
     }
     await this.initialize(options);
 
     if (options.help) {
       return this.printHelp(options);
-    } else if (options.help_json) {
+    } else if (options.helpJson) {
       return this.printJsonHelp(options);
     } else {
       return await this.run(options);
diff --git a/packages/angular/cli/models/interface.ts b/packages/angular/cli/models/interface.ts
index 1bfdf7c1269b..7744e7b9effe 100644
--- a/packages/angular/cli/models/interface.ts
+++ b/packages/angular/cli/models/interface.ts
@@ -7,22 +7,35 @@
  */
 import { json, logging } from '@angular-devkit/core';
 
+/**
+ * Value type of arguments.
+ */
 export type Value = number | string | boolean | (number | string | boolean)[];
 
-export type Arguments = {
-  [argName: string]: Value;
-} & {
+/**
+ * An object representing parsed arguments from the command line.
+ */
+export interface Arguments {
+  [argName: string]: Value | undefined;
+
+  /**
+   * Extra arguments that were not parsed. Will be omitted if all arguments were parsed.
+   */
   '--'?: string[];
 }
 
-export interface CommandInterface<T = {}> {
-  initialize(options: T): Promise<void>;
+/**
+ * The base interface for Command, understood by the command runner.
+ */
+export interface CommandInterface<T extends Arguments = Arguments> {
   printHelp(options: T): Promise<number>;
-  printJsonHelp(_options: T): Promise<number>;
-  run(options: T & Arguments): Promise<number | void>;
-  validateAndRun(options: T & Arguments): Promise<number | void>;
+  printJsonHelp(options: T): Promise<number>;
+  validateAndRun(options: T): Promise<number>;
 }
 
+/**
+ * Command constructor.
+ */
 export interface CommandConstructor {
   new(
     context: CommandContext,
@@ -31,15 +44,24 @@ export interface CommandConstructor {
   ): CommandInterface;
 }
 
-export interface CommandProject {
+/**
+ * A CLI workspace information.
+ */
+export interface CommandWorkspace {
   root: string;
   configFile?: string;
 }
 
+/**
+ * A command runner context.
+ */
 export interface CommandContext {
-  project: CommandProject;
+  workspace: CommandWorkspace;
 }
 
+/**
+ * Value types of an Option.
+ */
 export enum OptionType {
   String = 'string',
   Number = 'number',
@@ -48,11 +70,16 @@ export enum OptionType {
   Any = 'any',
 }
 
+/**
+ * An option description. This is exposed when using `ng --help-json`.
+ */
 export interface Option {
   name: string;
   description: string;
+
   type: OptionType;
   types?: OptionType[];
+
   aliases: string[];
   required?: boolean;
   format?: string;
@@ -85,17 +112,12 @@ export interface CommandDescription {
 
   aliases: string[];
   scope: CommandScope;
+  type: CommandType;
 
   impl: CommandConstructor;
 
   hidden: boolean;
-
-  type: CommandType;
-
-  schematics?: {
-    [name: string]: Option[];
-  };
-  architect?: {
+  suboptions?: {
     [name: string]: Option[];
   };
 }
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index f04c262bd1c8..f3a7fd597adc 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -100,13 +100,12 @@ export abstract class SchematicCommand<
 
   public async printHelp(options: T) {
     await super.printHelp(options);
-    const schematicNames = Object.keys(this.description.schematics || {});
+    const schematicNames = Object.keys(this.description.suboptions || {});
 
     await super.printHelpOptions();
     this.logger.info('');
 
-    if (this.description.schematics) {
-
+    if (this.description.suboptions) {
       if (schematicNames.length > 1) {
         this.logger.info('Available Schematics:');
 
@@ -134,7 +133,7 @@ export abstract class SchematicCommand<
         });
       } else if (schematicNames.length == 1) {
         this.logger.info('Options for schematic ' + schematicNames[0]);
-        await this.printHelpOptions(this.description.schematics[schematicNames[0]]);
+        await this.printHelpOptions(this.description.suboptions[schematicNames[0]]);
       }
     }
 
@@ -142,8 +141,8 @@ export abstract class SchematicCommand<
   }
 
   async printHelpUsage() {
-    const schematicNames = Object.keys(this.description.schematics || {});
-    if (this.description.schematics && schematicNames.length == 1) {
+    const schematicNames = Object.keys(this.description.suboptions || {});
+    if (this.description.suboptions && schematicNames.length == 1) {
       this.logger.info(this.description.description);
 
       const opts = this.description.options.filter(x => x.positional === undefined);
@@ -155,7 +154,7 @@ export abstract class SchematicCommand<
         ? schematicName
         : schematicNames[0];
 
-      const schematicOptions = this.description.schematics[schematicNames[0]];
+      const schematicOptions = this.description.suboptions[schematicNames[0]];
       const schematicArgs = schematicOptions.filter(x => x.positional !== undefined);
       const argDisplay = schematicArgs.length > 0
         ? ' ' + schematicArgs.map(a => `<${strings.dasherize(a.name)}>`).join(' ')
@@ -222,7 +221,7 @@ export abstract class SchematicCommand<
     }
 
     const {force, dryRun} = options;
-    const fsHost = new virtualFs.ScopedHost(new NodeJsSyncHost(), normalize(this.project.root));
+    const fsHost = new virtualFs.ScopedHost(new NodeJsSyncHost(), normalize(this.workspace.root));
 
     const workflow = new NodeWorkflow(
         fsHost,
@@ -230,7 +229,7 @@ export abstract class SchematicCommand<
           force,
           dryRun,
           packageManager: getPackageManager(),
-          root: normalize(this.project.root),
+          root: normalize(this.workspace.root),
         },
     );
 
@@ -346,7 +345,7 @@ export abstract class SchematicCommand<
 
     const workflow = this._workflow;
 
-    const workingDir = normalize(systemPath.relative(this.project.root, process.cwd()));
+    const workingDir = normalize(systemPath.relative(this.workspace.root, process.cwd()));
 
     // Get the option object from the schematic schema.
     const schematic = this.getSchematic(
@@ -476,7 +475,7 @@ export abstract class SchematicCommand<
     const workspaceLoader = new WorkspaceLoader(this._host);
 
     try {
-      workspaceLoader.loadWorkspace(this.project.root).pipe(take(1))
+      workspaceLoader.loadWorkspace(this.workspace.root).pipe(take(1))
         .subscribe(
           (workspace: experimental.workspace.Workspace) => this._workspace = workspace,
           (err: Error) => {
diff --git a/packages/angular/cli/utilities/project.ts b/packages/angular/cli/utilities/project.ts
index e2be4245dda7..0ec8749d9886 100644
--- a/packages/angular/cli/utilities/project.ts
+++ b/packages/angular/cli/utilities/project.ts
@@ -11,14 +11,14 @@ import { normalize } from '@angular-devkit/core';
 import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
-import { CommandProject } from '../models/interface';
+import { CommandWorkspace } from '../models/interface';
 import { findUp } from './find-up';
 
-export function insideProject(): boolean {
-  return getProjectDetails() !== null;
+export function insideWorkspace(): boolean {
+  return getWorkspaceDetails() !== null;
 }
 
-export function getProjectDetails(): CommandProject | null {
+export function getWorkspaceDetails(): CommandWorkspace | null {
   const currentDir = process.cwd();
   const possibleConfigFiles = [
     'angular.json',

From c8ddfbbe620bc43cb6d83114fde65db64d8e6bf2 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 4 Sep 2018 16:30:37 -0700
Subject: [PATCH 0041/1703] fix(@angular/cli): add options in help for
 architect commands

And fix a bug with json schema to Option array.
---
 packages/angular/cli/models/architect-command.ts | 6 ++++++
 packages/angular/cli/utilities/json-schema.ts    | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index ae9979c99255..d5f2184e663a 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -87,6 +87,12 @@ export abstract class ArchitectCommand extends Command<ArchitectCommandOptions>
     if ((!targetSpec.project || !targetSpec.target) && !this.multiTarget) {
       throw new Error('Cannot determine project or target for Architect command.');
     }
+
+    const builderConf = this._architect.getBuilderConfiguration(targetSpec);
+    const builderDesc = await this._architect.getBuilderDescription(builderConf).toPromise();
+    const targetOptionArray = await parseJsonSchemaToOptions(this._registry, builderDesc.schema);
+
+    this.description.options.push(...targetOptionArray);
   }
 
   async run(options: ArchitectCommandOptions) {
diff --git a/packages/angular/cli/utilities/json-schema.ts b/packages/angular/cli/utilities/json-schema.ts
index 41cabd96be88..28de7bb59cec 100644
--- a/packages/angular/cli/utilities/json-schema.ts
+++ b/packages/angular/cli/utilities/json-schema.ts
@@ -79,7 +79,7 @@ export async function parseJsonSchemaToOptions(
     if (!parentSchema) {
       // Ignore root.
       return;
-    } else if (pointer.split(/properties|items/g).length > 2) {
+    } else if (pointer.split(/\/(?:properties|items|definitions)\//g).length > 2) {
       // Ignore subitems (objects or arrays).
       return;
     } else if (json.isJsonArray(current)) {

From 37d1a43d716ab6610ee64b453fc761f7f6a8845c Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 4 Sep 2018 16:32:55 -0700
Subject: [PATCH 0042/1703] fix(@angular/cli): only print options once for
 schematic --help

---
 packages/angular/cli/models/schematic-command.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index f3a7fd597adc..bf87b7559ada 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -100,11 +100,10 @@ export abstract class SchematicCommand<
 
   public async printHelp(options: T) {
     await super.printHelp(options);
-    const schematicNames = Object.keys(this.description.suboptions || {});
-
-    await super.printHelpOptions();
     this.logger.info('');
 
+    const schematicNames = Object.keys(this.description.suboptions || {});
+
     if (this.description.suboptions) {
       if (schematicNames.length > 1) {
         this.logger.info('Available Schematics:');

From 66fbc59767a08a34771da854dc6a665053b2f475 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 4 Sep 2018 16:48:54 -0700
Subject: [PATCH 0043/1703] feat(@angular/cli): add long description and
 suboption option type

---
 packages/angular/cli/commands/add.json        |  2 +-
 packages/angular/cli/commands/add.md          |  2 ++
 .../angular/cli/commands/generate-impl.ts     |  7 +++++++
 packages/angular/cli/models/interface.ts      | 15 +++++++++++++-
 packages/angular/cli/models/parser.ts         | 20 +++++++++++++------
 packages/angular/cli/utilities/json-schema.ts | 11 ++++++++--
 6 files changed, 47 insertions(+), 10 deletions(-)
 create mode 100644 packages/angular/cli/commands/add.md

diff --git a/packages/angular/cli/commands/add.json b/packages/angular/cli/commands/add.json
index f61b1ac2b6e6..4009d228304c 100644
--- a/packages/angular/cli/commands/add.json
+++ b/packages/angular/cli/commands/add.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/add.json",
   "description": "Add support for a library to your project.",
-  "$longDescription": "",
+  "$longDescription": "./add.md",
 
   "$scope": "in",
   "$impl": "./add-impl#AddCommand",
diff --git a/packages/angular/cli/commands/add.md b/packages/angular/cli/commands/add.md
new file mode 100644
index 000000000000..c120a4b9d98d
--- /dev/null
+++ b/packages/angular/cli/commands/add.md
@@ -0,0 +1,2 @@
+Add support for a library in your project, for example adding `@angular/pwa` which would configure
+your project for PWA support.
diff --git a/packages/angular/cli/commands/generate-impl.ts b/packages/angular/cli/commands/generate-impl.ts
index 81189872338e..d4c65730e210 100644
--- a/packages/angular/cli/commands/generate-impl.ts
+++ b/packages/angular/cli/commands/generate-impl.ts
@@ -42,6 +42,12 @@ export class GenerateCommand<
 
       this.description.suboptions[`${collectionName}:${name}`] = options;
     }
+
+    this.description.options.forEach(option => {
+      if (option.name == 'schematic') {
+        option.type = 'suboption';
+      }
+    });
   }
 
   public async run(options: T) {
@@ -78,6 +84,7 @@ export class GenerateCommand<
   public async printHelp(options: T) {
     await super.printHelp(options);
 
+    this.logger.info('');
     if (Object.keys(this.description.suboptions || {}).length == 1) {
       this.logger.info(`\nTo see help for a schematic run:`);
       this.logger.info(terminal.cyan(`  ng generate <schematic> --help`));
diff --git a/packages/angular/cli/models/interface.ts b/packages/angular/cli/models/interface.ts
index 7744e7b9effe..412d6f9c5fe6 100644
--- a/packages/angular/cli/models/interface.ts
+++ b/packages/angular/cli/models/interface.ts
@@ -74,10 +74,17 @@ export enum OptionType {
  * An option description. This is exposed when using `ng --help-json`.
  */
 export interface Option {
+  /**
+   * The name of the option.
+   */
   name: string;
+
+  /**
+   * A short description of the option.
+   */
   description: string;
 
-  type: OptionType;
+  type: OptionType | 'suboption';
   types?: OptionType[];
 
   aliases: string[];
@@ -108,6 +115,12 @@ export enum CommandType {
 export interface CommandDescription {
   name: string;
   description: string;
+
+  /**
+   * A long description of the option, in Markdown format.
+   */
+  longDescription: string;
+
   options: Option[];
 
   aliases: string[];
diff --git a/packages/angular/cli/models/parser.ts b/packages/angular/cli/models/parser.ts
index 1af0c368dd0c..2bf7a89098e0 100644
--- a/packages/angular/cli/models/parser.ts
+++ b/packages/angular/cli/models/parser.ts
@@ -7,19 +7,21 @@
  *
  */
 import { strings } from '@angular-devkit/core';
-import { Arguments, Option, Value } from './interface';
+import { Arguments, Option, OptionType, Value } from './interface';
 
 
-function _coerceType(str: string | undefined, type: string, v?: Value): Value | undefined {
+function _coerceType(str: string | undefined, type: OptionType, v?: Value): Value | undefined {
   switch (type) {
     case 'any':
       if (Array.isArray(v)) {
         return v.concat(str || '');
       }
 
-      return _coerceType(str, 'boolean', v) !== undefined ? _coerceType(str, 'boolean', v)
-           : _coerceType(str, 'number', v) !== undefined ? _coerceType(str, 'number', v)
-           : _coerceType(str, 'string', v);
+      return _coerceType(str, OptionType.Boolean, v) !== undefined
+           ? _coerceType(str, OptionType.Boolean, v)
+           : _coerceType(str, OptionType.Number, v) !== undefined
+           ? _coerceType(str, OptionType.Number, v)
+           : _coerceType(str, OptionType.String, v);
 
     case 'string':
       return str || '';
@@ -56,7 +58,13 @@ function _coerceType(str: string | undefined, type: string, v?: Value): Value |
 }
 
 function _coerce(str: string | undefined, o: Option | null, v?: Value): Value | undefined {
-  return _coerceType(str, o ? o.type : 'any', v);
+  if (!o) {
+    return _coerceType(str, OptionType.Any, v);
+  } else if (o.type == 'suboption') {
+    return _coerceType(str, OptionType.String, v);
+  } else {
+    return _coerceType(str, o.type, v);
+  }
 }
 
 
diff --git a/packages/angular/cli/utilities/json-schema.ts b/packages/angular/cli/utilities/json-schema.ts
index 28de7bb59cec..d852772e71c9 100644
--- a/packages/angular/cli/utilities/json-schema.ts
+++ b/packages/angular/cli/utilities/json-schema.ts
@@ -7,7 +7,8 @@
  */
 import { json } from '@angular-devkit/core';
 import { ExportStringRef } from '@angular-devkit/schematics/tools';
-import { dirname } from 'path';
+import { readFileSync } from 'fs';
+import { dirname, resolve } from 'path';
 import {
   CommandConstructor,
   CommandDescription,
@@ -57,12 +58,18 @@ export async function parseJsonSchemaToCommandDescription(
     });
   }
 
+  let longDescription = '';
+  if (typeof schema.$longDescription == 'string' && schema.$longDescription) {
+    const ldPath = resolve(dirname(jsonPath), schema.$longDescription);
+    longDescription = readFileSync(ldPath, 'utf-8');
+  }
+
   const scope = _getEnumFromValue(schema.$scope, CommandScope, CommandScope.Default);
   const type = _getEnumFromValue(schema.$type, CommandType, CommandType.Default);
   const description = '' + (schema.description === undefined ? '' : schema.description);
   const hidden = !!schema.$hidden;
 
-  return { name, description, hidden, type, options, aliases, scope, impl };
+  return { name, description, longDescription, hidden, type, options, aliases, scope, impl };
 }
 
 export async function parseJsonSchemaToOptions(

From c72c45f9db5c09ed3099e62d7a74c6bc47c70ef6 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 4 Sep 2018 17:22:16 -0700
Subject: [PATCH 0044/1703] fix(@angular/cli): only add options if theres only
 one builder configuration

---
 .../angular/cli/models/architect-command.ts   | 35 ++++++++++++++++---
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index d5f2184e663a..981bb8602e42 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -5,7 +5,12 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect, BuildEvent, TargetSpecifier } from '@angular-devkit/architect';
+import {
+  Architect,
+  BuildEvent,
+  BuilderConfiguration,
+  TargetSpecifier,
+} from '@angular-devkit/architect';
 import { experimental, json, schema, tags } from '@angular-devkit/core';
 import { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node';
 import { from } from 'rxjs';
@@ -88,11 +93,31 @@ export abstract class ArchitectCommand extends Command<ArchitectCommandOptions>
       throw new Error('Cannot determine project or target for Architect command.');
     }
 
-    const builderConf = this._architect.getBuilderConfiguration(targetSpec);
-    const builderDesc = await this._architect.getBuilderDescription(builderConf).toPromise();
-    const targetOptionArray = await parseJsonSchemaToOptions(this._registry, builderDesc.schema);
+    if (this.target) {
+      // Add options IF there's only one builder of this kind.
+      const projectNames = this.getProjectNamesByTarget(this.target);
+      const builderConfigurations: BuilderConfiguration[] = [];
+      for (const projectName of projectNames) {
+        const targetSpec: TargetSpecifier = this._makeTargetSpecifier(options);
+        const targetDesc = this._architect.getBuilderConfiguration({
+          project: projectName,
+          target: targetSpec.target,
+        });
+
+        if (!builderConfigurations.find(b => b.builder === targetDesc.builder)) {
+          builderConfigurations.push(targetDesc);
+        }
+      }
+
+      if (builderConfigurations.length == 1) {
+        const builderConf = builderConfigurations[0];
+        const builderDesc = await this._architect.getBuilderDescription(builderConf).toPromise();
 
-    this.description.options.push(...targetOptionArray);
+        this.description.options.push(...(
+          await parseJsonSchemaToOptions(this._registry, builderDesc.schema)
+        ));
+      }
+    }
   }
 
   async run(options: ArchitectCommandOptions) {

From fefef0271eda1fac5a1866235aa3d87bf5142497 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Wed, 5 Sep 2018 07:46:49 -0700
Subject: [PATCH 0045/1703] refactor(@angular/cli): remove parseJsonFile and
 add options to parseJson instead

---
 packages/angular/cli/models/command-runner.ts | 16 ++++--
 .../angular_devkit/core/src/json/parser.ts    | 54 +++++++++++--------
 2 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/packages/angular/cli/models/command-runner.ts b/packages/angular/cli/models/command-runner.ts
index d673be6cf166..9bd185486ca0 100644
--- a/packages/angular/cli/models/command-runner.ts
+++ b/packages/angular/cli/models/command-runner.ts
@@ -52,15 +52,21 @@ export async function runCommand(
     }
     const cliDir = dirname(commandMapPath);
     const commandsText = readFileSync(commandMapPath).toString('utf-8');
-    const commandJson = json.parseJsonFile(
+    const commandJson = json.parseJson(
       commandsText,
       JsonParseMode.Loose,
-      commandMapPath,
-    ) as { [name: string]: string };
+      { path: commandMapPath },
+    );
+    if (!isJsonObject(commandJson)) {
+      throw Error('Invalid command.json');
+    }
 
     commands = {};
     for (const commandName of Object.keys(commandJson)) {
-      commands[commandName] = resolve(cliDir, commandJson[commandName]);
+      const commandValue = commandJson[commandName];
+      if (typeof commandValue == 'string') {
+        commands[commandName] = resolve(cliDir, commandValue);
+      }
     }
   }
 
@@ -79,7 +85,7 @@ export async function runCommand(
   for (const name of Object.keys(commands)) {
     const schemaPath = commands[name];
     const schemaContent = readFileSync(schemaPath, 'utf-8');
-    const schema = json.parseJsonFile(schemaContent, JsonParseMode.Loose, schemaPath);
+    const schema = json.parseJson(schemaContent, JsonParseMode.Loose, { path: schemaPath });
     if (!isJsonObject(schema)) {
       throw new Error('Invalid command JSON loaded from ' + JSON.stringify(schemaPath));
     }
diff --git a/packages/angular_devkit/core/src/json/parser.ts b/packages/angular_devkit/core/src/json/parser.ts
index 90a9e1b12497..b89b6ccc92dd 100644
--- a/packages/angular_devkit/core/src/json/parser.ts
+++ b/packages/angular_devkit/core/src/json/parser.ts
@@ -862,40 +862,48 @@ export function parseJsonAst(input: string, mode = JsonParseMode.Default): JsonA
 
 
 /**
- * Parse a JSON string into its value.  This discards the AST and only returns the value itself.
- * @param input The string to parse.
- * @param mode The mode to parse the input with. {@see JsonParseMode}.
- * @returns {JsonValue} The value represented by the JSON string.
+ * Options for the parseJson() function.
  */
-export function parseJson(input: string, mode = JsonParseMode.Default): JsonValue {
-  // Try parsing for the fastest path available, if error, uses our own parser for better errors.
-  if (mode == JsonParseMode.Strict) {
-    try {
-      return JSON.parse(input);
-    } catch (err) {
-      return parseJsonAst(input, mode).value;
-    }
-  }
-
-  return parseJsonAst(input, mode).value;
+interface ParseJsonOptions {
+  /**
+   * If omitted, will only emit errors related to the content of the JSON. If specified, any
+   * JSON errors will also include the path of the file that caused the error.
+   */
+  path?: string;
 }
 
+
 /**
  * Parse a JSON string into its value.  This discards the AST and only returns the value itself.
- * It also absorbs JSON parsing errors and return a new error with the path in it. Useful for
- * showing errors when parsing from a file.
+ *
+ * If a path option is pass, it also absorbs JSON parsing errors and return a new error with the
+ * path in it. Useful for showing errors when parsing from a file.
+ *
  * @param input The string to parse.
  * @param mode The mode to parse the input with. {@see JsonParseMode}.
+ * @param options Additional optinos for parsing.
  * @returns {JsonValue} The value represented by the JSON string.
  */
-export function parseJsonFile(input: string, mode = JsonParseMode.Default, path: string) {
+export function parseJson(
+  input: string,
+  mode = JsonParseMode.Default,
+  options?: ParseJsonOptions,
+): JsonValue {
   try {
-    return parseJson(input, mode);
+    // Try parsing for the fastest path available, if error, uses our own parser for better errors.
+    if (mode == JsonParseMode.Strict) {
+      try {
+        return JSON.parse(input);
+      } catch (err) {
+        return parseJsonAst(input, mode).value;
+      }
+    }
+
+    return parseJsonAst(input, mode).value;
   } catch (e) {
-    if (e instanceof JsonException) {
-      throw new PathSpecificJsonException(path, e);
-    } else {
-      throw e;
+    if (options && options.path && e instanceof JsonException) {
+      throw new PathSpecificJsonException(options.path, e);
     }
+    throw e;
   }
 }

From 0070ea46e6eaa25ad49d17c24fe7bed546dc1ec0 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Wed, 5 Sep 2018 16:49:41 -0700
Subject: [PATCH 0046/1703] fix(@angular-devkit/schematics): fix task executor
 on Windows

Before we did not denormalize the paths, but were expecting to get paths as options.
---
 .../schematics/tools/workflow/node-workflow.ts              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts b/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts
index 20ed4d9a9382..e1f507f5b268 100644
--- a/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts
+++ b/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Path, virtualFs } from '@angular-devkit/core';
+import { Path, getSystemPath, virtualFs } from '@angular-devkit/core';
 import {
   workflow,
 } from '@angular-devkit/schematics';  // tslint:disable-line:no-implicit-dependencies
@@ -42,13 +42,13 @@ export class NodeWorkflow extends workflow.BaseWorkflow {
       {
         allowPackageManagerOverride: true,
         packageManager: options.packageManager,
-        rootDirectory: options.root,
+        rootDirectory: options.root && getSystemPath(options.root),
       },
     );
     engineHost.registerTaskExecutor(
       BuiltinTaskExecutor.RepositoryInitializer,
       {
-        rootDirectory: options.root,
+        rootDirectory: options.root && getSystemPath(options.root),
       },
     );
     engineHost.registerTaskExecutor(BuiltinTaskExecutor.RunSchematic);

From 2962ede3e3004bf67e7efa7d179ec7f7c4657d8c Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 5 Sep 2018 11:28:25 +0100
Subject: [PATCH 0047/1703] test(@angular-devkit/build-optimizer): also check
 method metadata

---
 .../src/transforms/scrub-file_spec.ts              | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/angular_devkit/build_optimizer/src/transforms/scrub-file_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/scrub-file_spec.ts
index 20c079ead1ab..5d1140fc8b55 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/scrub-file_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/scrub-file_spec.ts
@@ -341,6 +341,13 @@ describe('scrub-file', () => {
             NotInput(),
             __metadata("design:type", Object)
           ], Clazz.prototype, "other", void 0);
+          Clazz.prototype.myMethod = function () { return 'bar'; };
+          __decorate([
+            myDecorator(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", []),
+            __metadata("design:returntype", void 0)
+          ], MyClass.prototype, "myMethod", null);
           return Clazz;
         }());
       `;
@@ -357,6 +364,13 @@ describe('scrub-file', () => {
             NotInput(),
             __metadata("design:type", Object)
           ], Clazz.prototype, "other", void 0);
+          Clazz.prototype.myMethod = function () { return 'bar'; };
+          __decorate([
+            myDecorator(),
+            __metadata("design:type", Function),
+            __metadata("design:paramtypes", []),
+            __metadata("design:returntype", void 0)
+          ], MyClass.prototype, "myMethod", null);
           return Clazz;
         }());
       `;

From 6076e16ebcba1947cda308b9f3a6e611768ee82e Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 5 Sep 2018 11:30:23 +0100
Subject: [PATCH 0048/1703] feat(@angular-devkit/build-optimizer): remove
 constructor __param

---
 .../src/transforms/scrub-file.ts              | 17 +++++++++-
 .../src/transforms/scrub-file_spec.ts         | 32 +++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_optimizer/src/transforms/scrub-file.ts b/packages/angular_devkit/build_optimizer/src/transforms/scrub-file.ts
index 620b4815ff57..5e7ed7afa48b 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/scrub-file.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/scrub-file.ts
@@ -410,6 +410,7 @@ function pickDecorateNodesToRemove(
 
   // Only remove constructor parameter metadata on non-whitelisted classes.
   if (platformWhitelist.indexOf(classId.text) === -1) {
+    // Remove __metadata calls of type 'design:paramtypes'.
     const metadataCalls = elements.filter((el) => {
       if (!isTslibHelper(el, '__metadata', tslibImports, checker)) {
         return false;
@@ -427,7 +428,21 @@ function pickDecorateNodesToRemove(
 
       return true;
     });
-    ngDecoratorCalls.push(...metadataCalls);
+    // Remove all __param calls.
+    const paramCalls = elements.filter((el) => {
+      if (!isTslibHelper(el, '__param', tslibImports, checker)) {
+        return false;
+      }
+      if (el.arguments.length != 2) {
+        return false;
+      }
+      if (el.arguments[0].kind !== ts.SyntaxKind.NumericLiteral) {
+        return false;
+      }
+
+      return true;
+    });
+    ngDecoratorCalls.push(...metadataCalls, ...paramCalls);
   }
 
   // If all decorators are metadata decorators then return the whole `Class = __decorate([...])'`
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/scrub-file_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/scrub-file_spec.ts
index 5d1140fc8b55..f9bae119b78c 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/scrub-file_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/scrub-file_spec.ts
@@ -422,6 +422,38 @@ describe('scrub-file', () => {
     });
   });
 
+  describe('__param', () => {
+    it('removes all constructor parameters and their type metadata', () => {
+      const output = tags.stripIndent`
+        var MyClass = /** @class */ (function () {
+            function MyClass(myParam) {
+                this.myProp = 'foo';
+            }
+            MyClass = __decorate([
+                myDecorator()
+            ], MyClass);
+            return MyClass;
+        }());
+      `;
+      const input = tags.stripIndent`
+        var MyClass = /** @class */ (function () {
+            function MyClass(myParam) {
+                this.myProp = 'foo';
+            }
+            MyClass = __decorate([
+                myDecorator(),
+                __param(0, myDecorator()),
+                __metadata("design:paramtypes", [Number])
+            ], MyClass);
+            return MyClass;
+        }());
+      `;
+
+      expect(testScrubFile(input)).toBeTruthy();
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+  });
+
   describe('propDecorators', () => {
     it('removes top-level Angular propDecorators', () => {
       const output = tags.stripIndent`

From 7c5178c6983c4b8ecfdbbbbcbadae39f36f0bbc0 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 5 Sep 2018 11:50:42 +0100
Subject: [PATCH 0049/1703] feat(@angular-devkit/build-optimizer): correctly
 identify renamed enums

---
 .../src/transforms/wrap-enums.ts              | 10 +++-
 .../src/transforms/wrap-enums_spec.ts         | 60 ++++++++++++++++++-
 2 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
index 0100b162aab4..ca943192a901 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
@@ -221,10 +221,14 @@ function findTs2_3EnumIife(
   }
 
   const parameter = expression.parameters[0];
-  if (!ts.isIdentifier(parameter.name) || parameter.name.text !== name) {
+  if (!ts.isIdentifier(parameter.name)) {
     return null;
   }
 
+  // The name of the parameter can be different than the name of the enum if it was renamed
+  // due to scope hoisting.
+  const parameterName = parameter.name.text;
+
   // In TS 2.3 enums, the IIFE contains only expressions with a certain format.
   // If we find any that is different, we ignore the whole thing.
   for (let bodyIndex = 0; bodyIndex < expression.body.statements.length; ++bodyIndex) {
@@ -245,7 +249,7 @@ function findTs2_3EnumIife(
       return null;
     }
 
-    if (!ts.isIdentifier(assignment.expression) || assignment.expression.text !== name) {
+    if (!ts.isIdentifier(assignment.expression) || assignment.expression.text !== parameterName) {
       return null;
     }
 
@@ -261,7 +265,7 @@ function findTs2_3EnumIife(
     }
 
     if (!ts.isIdentifier(memberArgument.left.expression)
-        || memberArgument.left.expression.text !== name) {
+      || memberArgument.left.expression.text !== parameterName) {
       return null;
     }
 
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
index 1718dfa7838a..7f1319fde9cb 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
@@ -14,6 +14,7 @@ import { getWrapEnumsTransformer } from './wrap-enums';
 const transform = (content: string) => transformJavascript(
   { content, getTransforms: [getWrapEnumsTransformer] }).content;
 
+// tslint:disable-next-line:no-big-function
 describe('wrap-enums', () => {
   it('wraps ts 2.2 enums in IIFE', () => {
     const input = tags.stripIndent`
@@ -37,7 +38,7 @@ describe('wrap-enums', () => {
     expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
   });
 
-  it('wraps ts 2.3 - 2.6 enums in IIFE', () => {
+  it('wraps ts >2.3 enums in IIFE', () => {
     const input = tags.stripIndent`
       export var ChangeDetectionStrategy;
       (function (ChangeDetectionStrategy) {
@@ -56,7 +57,7 @@ describe('wrap-enums', () => {
     expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
   });
 
-  it('wraps ts 2.3 - 2.6 enums in IIFE, even if they have funny numbers', () => {
+  it('wraps ts >2.3 enums in IIFE, even if they have funny numbers', () => {
     const input = tags.stripIndent`
       export var AnimatorControlState;
       (function (AnimatorControlState) {
@@ -79,6 +80,61 @@ describe('wrap-enums', () => {
     expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
   });
 
+  it('wraps ts >2.3 enums in IIFE, even if they were renamed due to scope hoisting', () => {
+    const input = tags.stripIndent`
+      var TokenType$1;
+      (function (TokenType) {
+        TokenType[TokenType["TAG_OPEN_START"] = 0] = "TAG_OPEN_START";
+        TokenType[TokenType["TAG_OPEN_END"] = 1] = "TAG_OPEN_END";
+        TokenType[TokenType["TAG_OPEN_END_VOID"] = 2] = "TAG_OPEN_END_VOID";
+        TokenType[TokenType["TAG_CLOSE"] = 3] = "TAG_CLOSE";
+        TokenType[TokenType["TEXT"] = 4] = "TEXT";
+        TokenType[TokenType["ESCAPABLE_RAW_TEXT"] = 5] = "ESCAPABLE_RAW_TEXT";
+        TokenType[TokenType["RAW_TEXT"] = 6] = "RAW_TEXT";
+        TokenType[TokenType["COMMENT_START"] = 7] = "COMMENT_START";
+        TokenType[TokenType["COMMENT_END"] = 8] = "COMMENT_END";
+        TokenType[TokenType["CDATA_START"] = 9] = "CDATA_START";
+        TokenType[TokenType["CDATA_END"] = 10] = "CDATA_END";
+        TokenType[TokenType["ATTR_NAME"] = 11] = "ATTR_NAME";
+        TokenType[TokenType["ATTR_VALUE"] = 12] = "ATTR_VALUE";
+        TokenType[TokenType["DOC_TYPE"] = 13] = "DOC_TYPE";
+        TokenType[TokenType["EXPANSION_FORM_START"] = 14] = "EXPANSION_FORM_START";
+        TokenType[TokenType["EXPANSION_CASE_VALUE"] = 15] = "EXPANSION_CASE_VALUE";
+        TokenType[TokenType["EXPANSION_CASE_EXP_START"] = 16] = "EXPANSION_CASE_EXP_START";
+        TokenType[TokenType["EXPANSION_CASE_EXP_END"] = 17] = "EXPANSION_CASE_EXP_END";
+        TokenType[TokenType["EXPANSION_FORM_END"] = 18] = "EXPANSION_FORM_END";
+        TokenType[TokenType["EOF"] = 19] = "EOF";
+      })(TokenType$1 || (TokenType$1 = {}));
+    `;
+    const output = tags.stripIndent`
+      var TokenType$1 = /*@__PURE__*/ (function (TokenType) {
+        TokenType[TokenType["TAG_OPEN_START"] = 0] = "TAG_OPEN_START";
+        TokenType[TokenType["TAG_OPEN_END"] = 1] = "TAG_OPEN_END";
+        TokenType[TokenType["TAG_OPEN_END_VOID"] = 2] = "TAG_OPEN_END_VOID";
+        TokenType[TokenType["TAG_CLOSE"] = 3] = "TAG_CLOSE";
+        TokenType[TokenType["TEXT"] = 4] = "TEXT";
+        TokenType[TokenType["ESCAPABLE_RAW_TEXT"] = 5] = "ESCAPABLE_RAW_TEXT";
+        TokenType[TokenType["RAW_TEXT"] = 6] = "RAW_TEXT";
+        TokenType[TokenType["COMMENT_START"] = 7] = "COMMENT_START";
+        TokenType[TokenType["COMMENT_END"] = 8] = "COMMENT_END";
+        TokenType[TokenType["CDATA_START"] = 9] = "CDATA_START";
+        TokenType[TokenType["CDATA_END"] = 10] = "CDATA_END";
+        TokenType[TokenType["ATTR_NAME"] = 11] = "ATTR_NAME";
+        TokenType[TokenType["ATTR_VALUE"] = 12] = "ATTR_VALUE";
+        TokenType[TokenType["DOC_TYPE"] = 13] = "DOC_TYPE";
+        TokenType[TokenType["EXPANSION_FORM_START"] = 14] = "EXPANSION_FORM_START";
+        TokenType[TokenType["EXPANSION_CASE_VALUE"] = 15] = "EXPANSION_CASE_VALUE";
+        TokenType[TokenType["EXPANSION_CASE_EXP_START"] = 16] = "EXPANSION_CASE_EXP_START";
+        TokenType[TokenType["EXPANSION_CASE_EXP_END"] = 17] = "EXPANSION_CASE_EXP_END";
+        TokenType[TokenType["EXPANSION_FORM_END"] = 18] = "EXPANSION_FORM_END";
+        TokenType[TokenType["EOF"] = 19] = "EOF";
+        return TokenType;
+      })({});
+    `;
+
+    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+  });
+
   it('wraps tsickle enums in IIFE', () => {
     const input = tags.stripIndent`
       /** @enum {number} */

From 53e6d2d3e9fd6a5a1dfa3c9ff55595b13c03a3ca Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 5 Sep 2018 12:58:14 +0100
Subject: [PATCH 0050/1703] test(@angular/cli): add third party decorator prod
 test

---
 .../e2e/tests/misc/third-party-decorators.ts  | 160 ++++++++++++++++++
 1 file changed, 160 insertions(+)
 create mode 100644 tests/legacy-cli/e2e/tests/misc/third-party-decorators.ts

diff --git a/tests/legacy-cli/e2e/tests/misc/third-party-decorators.ts b/tests/legacy-cli/e2e/tests/misc/third-party-decorators.ts
new file mode 100644
index 000000000000..1886318a051c
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/misc/third-party-decorators.ts
@@ -0,0 +1,160 @@
+import { writeMultipleFiles } from '../../utils/fs';
+import { ng, npm } from '../../utils/process';
+import { updateJsonFile } from '../../utils/project';
+
+export default function () {
+  return updateJsonFile('package.json', packageJson => {
+    // Install ngrx
+    packageJson['dependencies']['@ngrx/effects'] = '^6.1.0';
+    packageJson['dependencies']['@ngrx/schematics'] = '^6.1.0';
+    packageJson['dependencies']['@ngrx/store'] = '^6.1.0';
+    packageJson['dependencies']['@ngrx/store-devtools'] = '^6.1.0';
+  })
+    .then(() => npm('install'))
+    // Create an app that uses ngrx decorators and has e2e tests.
+    .then(_ => writeMultipleFiles({
+      './e2e/src/app.po.ts': `
+        import { browser, by, element } from 'protractor';
+        export class AppPage {
+          navigateTo() {    return browser.get('/');  }
+          getIncrementButton() { return element(by.buttonText('Increment')); }
+          getDecrementButton() { return element(by.buttonText('Decrement')); }
+          getResetButton() { return element(by.buttonText('Reset Counter')); }
+          getCounter() { return element(by.xpath('/html/body/app-root/div/span')).getText(); }
+        }
+      `,
+      './e2e/src/app.e2e-spec.ts': `
+        import { AppPage } from './app.po';
+
+        describe('workspace-project App', () => {
+          let page: AppPage;
+
+          beforeEach(() => {
+            page = new AppPage();
+          });
+
+          it('should operate counter', () => {
+            page.navigateTo();
+            page.getIncrementButton().click();
+            page.getIncrementButton().click();
+            expect(page.getCounter()).toEqual('2');
+            page.getDecrementButton().click();
+            expect(page.getCounter()).toEqual('1');
+            page.getResetButton().click();
+            expect(page.getCounter()).toEqual('0');
+          });
+        });
+      `,
+      './src/app/app.component.ts': `
+        import { Component } from '@angular/core';
+        import { Store, select } from '@ngrx/store';
+        import { Observable } from 'rxjs';
+        import { INCREMENT, DECREMENT, RESET } from './counter.reducer';
+
+        interface AppState {
+          count: number;
+        }
+
+        @Component({
+          selector: 'app-root',
+          template: \`
+            <button (click)="increment()">Increment</button>
+            <div>Current Count: <span>{{ count$ | async }}</span></div>
+            <button (click)="decrement()">Decrement</button>
+
+            <button (click)="reset()">Reset Counter</button>
+          \`,
+        })
+        export class AppComponent {
+          count$: Observable<number>;
+
+          constructor(private store: Store<AppState>) {
+            this.count$ = store.pipe(select(state => state.count));
+          }
+
+          increment() {
+            this.store.dispatch({ type: INCREMENT });
+          }
+
+          decrement() {
+            this.store.dispatch({ type: DECREMENT });
+          }
+
+          reset() {
+            this.store.dispatch({ type: RESET });
+          }
+        }
+      `,
+      './src/app/app.effects.ts': `
+        import { Injectable } from '@angular/core';
+        import { Actions, Effect } from '@ngrx/effects';
+        import { filter, map, tap } from 'rxjs/operators';
+
+        @Injectable()
+        export class AppEffects {
+
+          @Effect()
+          mapper$ = this.actions$.pipe(map(() => ({ type: 'ANOTHER'})), filter(() => false));
+
+          @Effect({ dispatch: false })
+          logger$ = this.actions$.pipe(tap(console.log));
+
+          constructor(private actions$: Actions) {}
+        }
+      `,
+      './src/app/app.module.ts': `
+        import { BrowserModule } from '@angular/platform-browser';
+        import { NgModule } from '@angular/core';
+
+        import { AppComponent } from './app.component';
+        import { StoreModule } from '@ngrx/store';
+        import { StoreDevtoolsModule } from '@ngrx/store-devtools';
+        import { environment } from '../environments/environment';
+        import { EffectsModule } from '@ngrx/effects';
+        import { AppEffects } from './app.effects';
+        import { counterReducer } from './counter.reducer';
+
+        @NgModule({
+          declarations: [
+            AppComponent
+          ],
+          imports: [
+            BrowserModule,
+            StoreModule.forRoot({ count: counterReducer }),
+            !environment.production ? StoreDevtoolsModule.instrument() : [],
+            EffectsModule.forRoot([AppEffects])
+          ],
+          providers: [],
+          bootstrap: [AppComponent]
+        })
+        export class AppModule { }
+      `,
+      './src/app/counter.reducer.ts': `
+        import { Action } from '@ngrx/store';
+
+        export const INCREMENT = 'INCREMENT';
+        export const DECREMENT = 'DECREMENT';
+        export const RESET = 'RESET';
+
+        const initialState = 0;
+
+        export function counterReducer(state: number = initialState, action: Action) {
+          switch (action.type) {
+            case INCREMENT:
+              return state + 1;
+
+            case DECREMENT:
+              return state - 1;
+
+            case RESET:
+              return 0;
+
+            default:
+              return state;
+          }
+        }
+      `,
+    }))
+    // Run the e2e tests against a prod build.
+    .then(() => ng('e2e', '--prod'));
+}

From cc6181e3c9e2ae532c178107dac3cd32a9e1f8de Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 4 Sep 2018 19:00:07 -0400
Subject: [PATCH 0051/1703] feat(@schematics/angular): add CLI 7.x migration
 schematic

---
 .../migrations/migration-collection.json      |  5 +++
 .../angular/migrations/update-7/index.ts      | 31 +++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 packages/schematics/angular/migrations/update-7/index.ts

diff --git a/packages/schematics/angular/migrations/migration-collection.json b/packages/schematics/angular/migrations/migration-collection.json
index eaf1c496708d..adee986ffabe 100644
--- a/packages/schematics/angular/migrations/migration-collection.json
+++ b/packages/schematics/angular/migrations/migration-collection.json
@@ -4,6 +4,11 @@
       "version": "6.0.0-beta.8",
       "factory": "./update-6",
       "description": "Update an Angular CLI project to version 6."
+    },
+    "migration-02": {
+      "version": "7.0.0-beta.0",
+      "factory": "./update-7",
+      "description": "Update an Angular CLI project to version 7."
     }
   }
 }
\ No newline at end of file
diff --git a/packages/schematics/angular/migrations/update-7/index.ts b/packages/schematics/angular/migrations/update-7/index.ts
new file mode 100644
index 000000000000..626d4a449ef1
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-7/index.ts
@@ -0,0 +1,31 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Rule } from '@angular-devkit/schematics';
+import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
+import {
+  NodeDependencyType,
+  addPackageJsonDependency,
+} from '../../utility/dependencies';
+import { latestVersions } from '../../utility/latest-versions';
+
+
+export default function(): Rule {
+  return (tree, context) => {
+    addPackageJsonDependency(
+      tree,
+      {
+        type: NodeDependencyType.Dev,
+        name: '@angular-devkit/build-angular',
+        version: latestVersions.DevkitBuildAngular,
+        overwrite: true,
+      },
+    );
+
+    context.addTask(new NodePackageInstallTask());
+  };
+}

From 58977a196985562db1b350af3344ba46c402d2ae Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 30 Aug 2018 09:06:30 +0200
Subject: [PATCH 0052/1703] feat(@ngtools/webpack): add `typescript` version
 `3.0.x` as a peer dependency

---
 packages/ngtools/webpack/package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index e49d0c2868f5..c3e3c72530ae 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -31,11 +31,10 @@
     "webpack-sources": "^1.1.0"
   },
   "peerDependencies": {
-    "typescript": "~2.4.0 || ~2.5.0 || ~2.6.0 || ~2.7.0 || ~2.8.0 || ~2.9.0",
+    "typescript": ">=2.4.0 < 3.1",
     "webpack": "^4.0.0"
   },
   "devDependencies": {
-    "typescript": "~2.9.2",
     "webpack": "^4.0.0"
   }
 }

From 88804b63dc4380be087b2b41c3372f69075640a6 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 30 Aug 2018 15:22:08 +0200
Subject: [PATCH 0053/1703] build: update repo to use `typescript` `3.0.x`

Updated `@angular/<packages>` to `^7.0.0-beta.4` since we need this to be able to run the tests. Due to the `@angular/compiler` in `v6` doesn't support `typescript` `3.0.x`.
---
 package.json                                  |  2 +-
 .../angular_devkit/build_angular/package.json | 22 ++---
 .../build_ng_packagr/package.json             |  4 +-
 packages/schematics/angular/package.json      |  2 +-
 yarn.lock                                     | 94 ++++++++++---------
 5 files changed, 66 insertions(+), 58 deletions(-)

diff --git a/package.json b/package.json
index 04bba652e809..7f1bcd60ea16 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "glob": "^7.0.3",
     "temp": "^0.8.3",
     "tslint": "^5.11.0",
-    "typescript": "~2.9.2"
+    "typescript": "~3.0.1"
   },
   "devDependencies": {
     "@bazel/typescript": "0.16.1",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 68284ad44e6d..d7662c1e1ef5 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -59,19 +59,19 @@
     "node-sass": "^4.9.3"
   },
   "devDependencies": {
-    "@angular/animations": "^6.1.0",
+    "@angular/animations": "^7.0.0-beta.4",
     "@angular/cdk": "^6.1.0",
-    "@angular/common": "^6.1.0",
-    "@angular/compiler": "^6.1.0",
-    "@angular/compiler-cli": "^6.1.0",
-    "@angular/core": "^6.1.0",
-    "@angular/http": "^6.1.0",
+    "@angular/common": "^7.0.0-beta.4",
+    "@angular/compiler": "^7.0.0-beta.4",
+    "@angular/compiler-cli": "^7.0.0-beta.4",
+    "@angular/core": "^7.0.0-beta.4",
+    "@angular/http": "^7.0.0-beta.4",
     "@angular/material": "^6.1.0",
-    "@angular/platform-browser": "^6.1.0",
-    "@angular/platform-browser-dynamic": "^6.1.0",
-    "@angular/platform-server": "^6.1.0",
-    "@angular/router": "^6.1.0",
-    "@angular/service-worker": "^6.1.0",
+    "@angular/platform-browser": "^7.0.0-beta.4",
+    "@angular/platform-browser-dynamic": "^7.0.0-beta.4",
+    "@angular/platform-server": "^7.0.0-beta.4",
+    "@angular/router": "^7.0.0-beta.4",
+    "@angular/service-worker": "^7.0.0-beta.4",
     "codelyzer": "^4.2.1",
     "core-js": "^2.4.1",
     "bootstrap": "^4.0.0",
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index a9eebffa6c25..a14b3af53761 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -15,8 +15,8 @@
     "ng-packagr": "^2.2.0 || ^3.0.0 || ^4.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "^6.1.0",
-    "@angular/compiler-cli": "^6.1.0",
+    "@angular/compiler": "^7.0.0-beta.4",
+    "@angular/compiler-cli": "^7.0.0-beta.4",
     "ng-packagr": "^4.1.0",
     "tsickle": ">=0.27.3",
     "tslib": "^1.9.0"
diff --git a/packages/schematics/angular/package.json b/packages/schematics/angular/package.json
index 98c0fac997eb..49a9160cd022 100644
--- a/packages/schematics/angular/package.json
+++ b/packages/schematics/angular/package.json
@@ -11,6 +11,6 @@
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
-    "typescript": ">=2.6.2 <2.10"
+    "typescript": ">=2.6.2 <3.1"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 00e64d738515..3309a02b20ac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@angular/animations@^6.1.0":
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-6.1.2.tgz#31070ac85bca47e3feab887fed8872c147fcf63e"
+"@angular/animations@^7.0.0-beta.4":
+  version "7.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.0.0-beta.4.tgz#98a8c709604f4023f888a33205e01790015953a0"
   dependencies:
     tslib "^1.9.0"
 
@@ -14,36 +14,38 @@
   dependencies:
     tslib "^1.7.1"
 
-"@angular/common@^6.1.0":
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-6.1.2.tgz#6e3bd4b16975dbb4ba67e2fc7589d0a036e5df12"
+"@angular/common@^7.0.0-beta.4":
+  version "7.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.0.0-beta.4.tgz#e7d6526e1034fb7eb7926dcff0b8205284b40854"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^6.1.0":
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-6.1.2.tgz#00829df848210a8a06c3641428f36525fdf41e53"
+"@angular/compiler-cli@^7.0.0-beta.4":
+  version "7.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.0.0-beta.4.tgz#43ca2c585c903f5c219b7903b2ceabd3d4fb3d48"
   dependencies:
     chokidar "^1.4.2"
+    convert-source-map "^1.5.1"
+    magic-string "^0.25.0"
     minimist "^1.2.0"
     reflect-metadata "^0.1.2"
-    tsickle "^0.32.1"
+    source-map "^0.6.1"
 
-"@angular/compiler@^6.1.0":
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-6.1.2.tgz#56fada04cb7dc77a5d3f0b786be713130293d468"
+"@angular/compiler@^7.0.0-beta.4":
+  version "7.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.0.0-beta.4.tgz#f61a1e15db3e895ea6e8be98a01b261924b87bd7"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^6.1.0":
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-6.1.2.tgz#412dd32a91ec1d5d6db508babbb36e9799235d8d"
+"@angular/core@^7.0.0-beta.4":
+  version "7.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.0.0-beta.4.tgz#797edfc2c59bca443eac0a277cde328f3c704b91"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^6.1.0":
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-6.1.2.tgz#2e0e376686f4bf51ef043856b26679e88d7a92b9"
+"@angular/http@^7.0.0-beta.4":
+  version "7.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.0.0-beta.4.tgz#72230abac0b97c32cb9d3e98a0855d26f332ee79"
   dependencies:
     tslib "^1.9.0"
 
@@ -55,35 +57,35 @@
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/platform-browser-dynamic@^6.1.0":
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.1.2.tgz#76d813e6ab577ce1ffdb31e88d37df9a5177f55c"
+"@angular/platform-browser-dynamic@^7.0.0-beta.4":
+  version "7.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.0.0-beta.4.tgz#2d930f01aca9bd12fccb20754952df1af3acb02f"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^6.1.0":
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-6.1.2.tgz#9a2a498e27e2bcd0fc8d6c696340c258f8b3e322"
+"@angular/platform-browser@^7.0.0-beta.4":
+  version "7.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.0.0-beta.4.tgz#bea6218c7d2b549a2d29bf5ba59df7d398f116bb"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-server@^6.1.0":
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-6.1.2.tgz#f8954c5720169c4a2433cb73678c8a8709b12271"
+"@angular/platform-server@^7.0.0-beta.4":
+  version "7.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.0.0-beta.4.tgz#71702fd37182a5638ea13e9eb2c7312f54762ad1"
   dependencies:
     domino "^2.0.1"
     tslib "^1.9.0"
     xhr2 "^0.1.4"
 
-"@angular/router@^6.1.0":
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-6.1.2.tgz#5e9e12225b41940fe346675caf1ed15033738abc"
+"@angular/router@^7.0.0-beta.4":
+  version "7.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.0.0-beta.4.tgz#becbdf90fae1be20da598cdb2ad69179d9e66901"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@^6.1.0":
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-6.1.2.tgz#11b1b93a040ae20218feb3ea45b2aca792c6e1c1"
+"@angular/service-worker@^7.0.0-beta.4":
+  version "7.0.0-beta.4"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.0.0-beta.4.tgz#c4c37f211a325c32c0d59031b63ca64822a46a9f"
   dependencies:
     tslib "^1.9.0"
 
@@ -1914,7 +1916,7 @@ conventional-commits-parser@^3.0.0:
     through2 "^2.0.0"
     trim-off-newlines "^1.0.0"
 
-convert-source-map@^1.5.0:
+convert-source-map@^1.5.0, convert-source-map@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
 
@@ -4663,6 +4665,12 @@ magic-string@^0.22.4:
   dependencies:
     vlq "^0.2.2"
 
+magic-string@^0.25.0:
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.0.tgz#1f3696f9931ff0a1ed4c132250529e19cad6759b"
+  dependencies:
+    sourcemap-codec "^1.4.1"
+
 make-dir@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -6795,6 +6803,10 @@ source-map@~0.2.0:
   dependencies:
     amdefine ">=0.0.4"
 
+sourcemap-codec@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz#c8fd92d91889e902a07aee392bdd2c5863958ba2"
+
 spdx-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/spdx-compare/-/spdx-compare-1.0.0.tgz#2c55f117362078d7409e6d7b08ce70a857cd3ed7"
@@ -7311,7 +7323,7 @@ ts-node@^5.0.0:
     source-map-support "^0.5.3"
     yn "^2.0.0"
 
-tsickle@0.32.1, tsickle@>=0.27.3, tsickle@^0.32.1:
+tsickle@0.32.1, tsickle@>=0.27.3:
   version "0.32.1"
   resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.32.1.tgz#f16e94ba80b32fc9ebe320dc94fbc2ca7f3521a5"
   dependencies:
@@ -7395,13 +7407,9 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-"typescript@>=2.6.2 <2.10", typescript@~2.9.2:
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"
-
-typescript@~2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
+"typescript@>=2.6.2 <3.1", typescript@~3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.3.tgz#4853b3e275ecdaa27f78fda46dc273a7eb7fc1c8"
 
 uglify-es@^3.3.4:
   version "3.3.9"

From a723310e94cff9eb7758cd6a176503b57133c80a Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 31 Aug 2018 07:41:09 +0200
Subject: [PATCH 0054/1703] feat(@angular-devkit/build-optimizer): update
 `typescript` dependency to `3.0.x`

---
 .../build_angular/test/browser/build-optimizer_spec_large.ts    | 2 +-
 packages/angular_devkit/build_optimizer/package.json            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/build-optimizer_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/build-optimizer_spec_large.ts
index e91af8d67d14..4e1f1a0aca9e 100644
--- a/packages/angular_devkit/build_angular/test/browser/build-optimizer_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/build-optimizer_spec_large.ts
@@ -21,7 +21,7 @@ describe('Browser Builder build optimizer', () => {
 
   it('works', (done) => {
     const overrides = { aot: true, buildOptimizer: true };
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
+    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 3).pipe(
       tap((buildEvent) => expect(buildEvent.success).toBe(true)),
       tap(() => {
         const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
diff --git a/packages/angular_devkit/build_optimizer/package.json b/packages/angular_devkit/build_optimizer/package.json
index 3ffe3d902374..461f626380f7 100644
--- a/packages/angular_devkit/build_optimizer/package.json
+++ b/packages/angular_devkit/build_optimizer/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "loader-utils": "^1.1.0",
     "source-map": "^0.5.6",
-    "typescript": "~2.9.2",
+    "typescript": "~3.0.1",
     "webpack-sources": "^1.1.0"
   }
 }

From 509c0fa8afd3a076f8040609ae9c39fa1f017a0c Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 31 Aug 2018 15:49:39 +0200
Subject: [PATCH 0055/1703] build: add `typescript` as `devDependencies`

---
 packages/ngtools/webpack/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index c3e3c72530ae..965b0ce2ad37 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -35,6 +35,7 @@
     "webpack": "^4.0.0"
   },
   "devDependencies": {
+    "typescript": "~3.0.1",
     "webpack": "^4.0.0"
   }
 }

From bdebc9e0cb488b052cb3587f292420ac9c215417 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sun, 12 Aug 2018 10:39:19 +0200
Subject: [PATCH 0056/1703] feat(@angular-devkit/build-angular): add `ignore`
 option to `assets` object

You can now provide an array of globs to `ignore` from copying

Closes #11850
---
 .../stories/asset-configuration.md            | 16 +++++++---
 packages/angular/cli/lib/config/schema.json   | 21 ++++++++++---
 .../models/webpack-configs/common.ts          |  1 +
 .../build_angular/src/browser/schema.d.ts     |  5 ++++
 .../build_angular/src/browser/schema.json     |  7 +++++
 .../build_angular/src/karma/schema.json       |  7 +++++
 .../test/browser/assets_spec_large.ts         | 30 +++++++++++++++++++
 7 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/docs/documentation/stories/asset-configuration.md b/docs/documentation/stories/asset-configuration.md
index 6d2f50556cd9..07eee9ed23bb 100644
--- a/docs/documentation/stories/asset-configuration.md
+++ b/docs/documentation/stories/asset-configuration.md
@@ -23,9 +23,10 @@ The array below does the same as the default one:
 ]
 ```
 
-`glob` is the a [node-glob](https://github.com/isaacs/node-glob) using `input` as base directory.
-`input` is relative to the workspace root, while `output` is relative to `outDir`
-(`dist/project-name` default).
+- `glob` is the a [node-glob](https://github.com/isaacs/node-glob) using `input` as base directory.
+- `input` is relative to the workspace root.
+- `ignore` is a list of globs to ignore from copying.
+- `output` is relative to `outDir` (`dist/project-name` default).
 
  You can use this extended configuration to copy assets from outside your project.
  For instance, you can copy assets from a node package:
@@ -36,7 +37,14 @@ The array below does the same as the default one:
 ]
 ```
 
-The contents of `node_modules/some-package/images/` will be available in `dist/some-package/`.
+You can ignore certain files from copying by using the `ignore` option:
+ ```json
+"assets": [
+  { "glob": "**/*", "input": "src/assets/", "ignore": ["**/*.svg"], "output": "/assets/" },
+]
+```
+
+The contents of `node_modules/some-package/images/` will be available in `dist/some-package/`. 
 
 ## Writing assets outside of `dist/`
 
diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index 4183c0aee9a8..b87f3b70a110 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -108,7 +108,7 @@
               "default": false,
               "alias": "t"
             },
-            "module":  {
+            "module": {
               "type": "string",
               "description": "Allows specification of the declaring module.",
               "alias": "m"
@@ -160,7 +160,7 @@
               "description": "Flag to indicate if a dir is created.",
               "default": true
             },
-            "module":  {
+            "module": {
               "type": "string",
               "description": "Allows specification of the declaring module.",
               "alias": "m"
@@ -219,7 +219,7 @@
               "default": true,
               "visible": false
             },
-            "module":  {
+            "module": {
               "type": "string",
               "description": "Allows specification of the declaring module.",
               "alias": "m"
@@ -778,6 +778,13 @@
                     "output": {
                       "type": "string",
                       "description": "Absolute path within the output."
+                    },
+                    "ignore": {
+                      "description": "An array of globs to ignore.",
+                      "type": "array",
+                      "items": {
+                        "type": "string"
+                      }
                     }
                   },
                   "additionalProperties": false,
@@ -1241,6 +1248,13 @@
                     "output": {
                       "type": "string",
                       "description": "Absolute path within the output."
+                    },
+                    "ignore": {
+                      "description": "An array of globs to ignore.",
+                      "type": "array",
+                      "items": {
+                        "type": "string"
+                      }
                     }
                   },
                   "additionalProperties": false,
@@ -1541,7 +1555,6 @@
                 }
               ]
             }
-
           }
         },
         "tslint": {
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 29eea7c418f7..fe5ab77d2086 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -125,6 +125,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
         context: asset.input,
         // Now we remove starting slash to make Webpack place it from the output root.
         to: asset.output.replace(/^\//, ''),
+        ignore: asset.ignore,
         from: {
           glob: asset.glob,
           dot: true
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.d.ts b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
index 0cd707918eb2..ca0fc891efe9 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
@@ -237,6 +237,11 @@ export interface AssetPatternObject {
    */
   input: string;
 
+  /**
+   * 	An array of globs to ignore.
+   */
+  ignore?: string[];
+
   /**
    * Absolute path within the output.
    */
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index 61aab484cf21..0539ceb4b628 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -259,6 +259,13 @@
               "type": "string",
               "description": "The input path dir in which to apply 'glob'. Defaults to the project root."
             },
+            "ignore": {
+              "description": "An array of globs to ignore.",
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
             "output": {
               "type": "string",
               "description": "Absolute path within the output."
diff --git a/packages/angular_devkit/build_angular/src/karma/schema.json b/packages/angular_devkit/build_angular/src/karma/schema.json
index ce3414672ef6..4316a48ca246 100644
--- a/packages/angular_devkit/build_angular/src/karma/schema.json
+++ b/packages/angular_devkit/build_angular/src/karma/schema.json
@@ -174,6 +174,13 @@
             "output": {
               "type": "string",
               "description": "Absolute path within the output."
+            },
+            "ignore": {
+              "description": "An array of globs to ignore.",
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
             }
           },
           "additionalProperties": false,
diff --git a/packages/angular_devkit/build_angular/test/browser/assets_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/assets_spec_large.ts
index 703e44a73060..8d7fee3205e7 100644
--- a/packages/angular_devkit/build_angular/test/browser/assets_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/assets_spec_large.ts
@@ -59,6 +59,36 @@ describe('Browser Builder assets', () => {
     ).toPromise().then(done, done.fail);
   });
 
+  it('works with ignored patterns', (done) => {
+    const assets: { [path: string]: string } = {
+      './src/folder/.gitkeep': '',
+      './src/folder/asset-ignored.txt': '',
+      './src/folder/asset.txt': '',
+    };
+
+    host.writeMultipleFiles(assets);
+
+    const overrides = {
+      assets: [
+        {
+          glob: '**/*',
+          ignore: ['asset-ignored.txt'],
+          input: 'src/folder',
+          output: '/folder',
+        },
+      ],
+    };
+
+    runTargetSpec(host, browserTargetSpec, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => {
+        expect(host.scopedSync().exists(normalize('./dist/folder/asset.txt'))).toBe(true);
+        expect(host.scopedSync().exists(normalize('./dist/folder/asset-ignored.txt'))).toBe(false);
+        expect(host.scopedSync().exists(normalize('./dist/folder/.gitkeep'))).toBe(false);
+      }),
+    ).toPromise().then(done, done.fail);
+  });
+
   it('fails with non-absolute output path', (done) => {
     const assets: { [path: string]: string } = {
       './node_modules/some-package/node_modules-asset.txt': 'node_modules-asset.txt',

From 01beb520bcd6ec60182e7c514ba97d5ef3aa29b3 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 31 Aug 2018 15:50:52 +0200
Subject: [PATCH 0057/1703] feat(@angular-devkit/build-angular): add `ignore`
 option to `assets` object

You can now provide an array of globs to `ignore` from copying

Closes #11850
---
 docs/documentation/stories/asset-configuration.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/documentation/stories/asset-configuration.md b/docs/documentation/stories/asset-configuration.md
index 07eee9ed23bb..e8b05b4c9dc1 100644
--- a/docs/documentation/stories/asset-configuration.md
+++ b/docs/documentation/stories/asset-configuration.md
@@ -1,7 +1,8 @@
 # Project assets
 
 You use the `assets` array inside the build target in `angular.json` to list files or folders
-you want to copy as-is when building your project.
+you want to copy as-is when building your project. if you think you need to exclude files, 
+consider not putting that thing in the assets
 
 By default, the `src/assets/` folder and `src/favicon.ico` are copied over.
 
@@ -23,7 +24,7 @@ The array below does the same as the default one:
 ]
 ```
 
-- `glob` is the a [node-glob](https://github.com/isaacs/node-glob) using `input` as base directory.
+- `glob` is a [node-glob](https://github.com/isaacs/node-glob) using `input` as base directory.
 - `input` is relative to the workspace root.
 - `ignore` is a list of globs to ignore from copying.
 - `output` is relative to `outDir` (`dist/project-name` default).

From a94c826661fe122332fcaa17b0457cf48974a86b Mon Sep 17 00:00:00 2001
From: Bram Borggreve <borggreve@gmail.com>
Date: Tue, 21 Aug 2018 22:40:12 +0200
Subject: [PATCH 0058/1703] feat(@schematics/angular): let Universal schematic
 use configurations from build architect

---
 .../schematics/angular/universal/index.ts     | 20 +++++++++++++++++++
 .../angular/universal/index_spec.ts           |  7 +++++++
 2 files changed, 27 insertions(+)

diff --git a/packages/schematics/angular/universal/index.ts b/packages/schematics/angular/universal/index.ts
index 6db955cd11bf..09c8bae3127d 100644
--- a/packages/schematics/angular/universal/index.ts
+++ b/packages/schematics/angular/universal/index.ts
@@ -68,6 +68,16 @@ function getClientTargets(
   return projectTargets;
 }
 
+// TODO: Add types for the Target
+// tslint:disable-next-line:no-any
+function getFileReplacements(target: any ) {
+  const configurations = target.configurations || {};
+  const production = configurations.production || {};
+  const fileReplacements = production.fileReplacements || [];
+
+  return fileReplacements;
+}
+
 function updateConfigFile(options: UniversalOptions, tsConfigDirectory: Path): Rule {
   return (host: Tree) => {
     const workspace = getWorkspace(host);
@@ -83,9 +93,19 @@ function updateConfigFile(options: UniversalOptions, tsConfigDirectory: Path): R
       main: `${clientProject.root}src/main.server.ts`,
       tsConfig: join(tsConfigDirectory, `${options.tsconfigFileName}.json`),
     };
+
+    // TODO: Add types for the TargetConfiguration
+    // tslint:disable-next-line:no-any
+    const builderConfigurations: any = {
+      production: {
+        fileReplacements: getFileReplacements(projectTargets.build),
+      },
+    };
+
     const serverTarget: JsonObject = {
       builder: '@angular-devkit/build-angular:server',
       options: builderOptions,
+      configurations: builderConfigurations,
     };
     projectTargets.server = serverTarget;
 
diff --git a/packages/schematics/angular/universal/index_spec.ts b/packages/schematics/angular/universal/index_spec.ts
index 7a5e3304172c..0ca8c034ac10 100644
--- a/packages/schematics/angular/universal/index_spec.ts
+++ b/packages/schematics/angular/universal/index_spec.ts
@@ -130,6 +130,13 @@ describe('Universal Schematic', () => {
     expect(opts.outputPath).toEqual('dist/bar-server');
     expect(opts.main).toEqual('projects/bar/src/main.server.ts');
     expect(opts.tsConfig).toEqual('projects/bar/tsconfig.server.json');
+    const configurations = targets.server.configurations;
+    expect(configurations.production).toBeDefined();
+    expect(configurations.production.fileReplacements).toBeDefined();
+    const fileReplacements = targets.server.configurations.production.fileReplacements;
+    expect(fileReplacements.length).toEqual(1);
+    expect(fileReplacements[0].replace).toEqual('projects/bar/src/environments/environment.ts');
+    expect(fileReplacements[0].with).toEqual('projects/bar/src/environments/environment.prod.ts');
   });
 
   it('should add a server transition to BrowerModule import', () => {

From ee7603f597dda3e9d856b7eb238731a35bf0fa35 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 9 Aug 2018 14:19:59 -0400
Subject: [PATCH 0059/1703] feat(@schematics/angular): add several prompts to
 ng-new

---
 .../schematics/angular/ng-new/schema.json     | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
index 2c927a03f9bf..61a32c3cf593 100644
--- a/packages/schematics/angular/ng-new/schema.json
+++ b/packages/schematics/angular/ng-new/schema.json
@@ -15,7 +15,8 @@
       "$default": {
         "$source": "argv",
         "index": 0
-      }
+      },
+      "x-prompt": "What name would you like to use for the project?"
     },
     "experimentalIvy": {
       "description": "EXPERIMENTAL: Specifies whether to create a new application which uses the Ivy rendering engine.",
@@ -98,19 +99,32 @@
     "routing": {
       "type": "boolean",
       "description": "Generates a routing module.",
-      "default": false
+      "default": false,
+      "x-prompt": "Would you like to generate a routing module?"
     },
     "prefix": {
       "type": "string",
       "format": "html-selector",
       "description": "The prefix to apply to generated selectors.",
+      "minLength": 1,
       "default": "app",
       "alias": "p"
     },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",
-      "default": "css"
+      "default": "css",
+      "x-prompt": {
+        "message": "Which stylesheet format would you like to use?",
+        "type": "list",
+        "items": [
+          { "value": "css", "label": "CSS" },
+          { "value": "scss", "label": "SCSS   [ http://sass-lang.com   ]" },
+          { "value": "sass", "label": "SASS   [ http://sass-lang.com   ]" },
+          { "value": "less", "label": "LESS   [ http://lesscss.org     ]" },
+          { "value": "styl", "label": "Stylus [ http://stylus-lang.com ]" }
+        ]
+      }
     },
     "skipTests": {
       "description": "Skip creating spec files.",

From 5007a19ad9f3567b8a2193538b6946407cd43694 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 31 Aug 2018 17:11:18 +0200
Subject: [PATCH 0060/1703] refactor(@angular-devkit/build-angular): clean up
 style webpack config

Clean up several parts of the styles config and also removed the dependency on `postcss-url`
---
 .../angular_devkit/build_angular/package.json |   1 -
 .../models/webpack-configs/styles.ts          | 168 +++++-------------
 .../plugins/postcss-cli-resources.ts          |  47 +++--
 .../src/angular-cli-files/plugins/webpack.ts  |   3 +-
 yarn.lock                                     |  10 --
 5 files changed, 81 insertions(+), 148 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index d7662c1e1ef5..16c5bf4e9cb8 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -34,7 +34,6 @@
     "postcss": "^6.0.22",
     "postcss-import": "^11.1.0",
     "postcss-loader": "^2.1.5",
-    "postcss-url": "^7.3.2",
     "raw-loader": "^0.5.1",
     "rxjs": "~6.2.0",
     "sass-loader": "^7.1.0",
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
index 353e2b91ffc2..f9677ac8eae4 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
@@ -5,24 +5,21 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable
-// TODO: cleanup this file, it's copied as is from Angular CLI.
 
-import * as webpack from 'webpack';
 import * as path from 'path';
-import { SuppressExtractedTextChunksWebpackPlugin } from '../../plugins/webpack';
-import { getOutputHashFormat } from './utils';
+import * as webpack from 'webpack';
+import {
+  PostcssCliResources,
+  RawCssLoader,
+  RemoveHashPlugin,
+  SuppressExtractedTextChunksWebpackPlugin,
+} from '../../plugins/webpack';
 import { WebpackConfigOptions } from '../build-options';
-import { findUp } from '../../utilities/find-up';
-import { RawCssLoader } from '../../plugins/webpack';
-import { normalizeExtraEntryPoints } from './utils';
-import { RemoveHashPlugin } from '../../plugins/remove-hash-plugin';
+import { getOutputHashFormat, normalizeExtraEntryPoints } from './utils';
 
-const postcssUrl = require('postcss-url');
 const autoprefixer = require('autoprefixer');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const postcssImports = require('postcss-import');
-const PostcssCliResources = require('../../plugins/webpack').PostcssCliResources;
 
 /**
  * Enumerate loaders and their dependencies from this file to let the dependency validator
@@ -38,19 +35,11 @@ const PostcssCliResources = require('../../plugins/webpack').PostcssCliResources
  * require('sass-loader')
  */
 
-interface PostcssUrlAsset {
-  url: string;
-  hash: string;
-  absolutePath: string;
-}
-
 export function getStylesConfig(wco: WebpackConfigOptions) {
-  const { root, projectRoot, buildOptions } = wco;
-
-  // const appRoot = path.resolve(projectRoot, appConfig.root);
+  const { root, buildOptions } = wco;
   const entryPoints: { [key: string]: string[] } = {};
   const globalStylePaths: string[] = [];
-  const extraPlugins: any[] = [];
+  const extraPlugins = [];
   const cssSourceMap = buildOptions.sourceMap;
 
   // Determine hashing format.
@@ -62,37 +51,13 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
   const postcssPluginCreator = function (loader: webpack.loader.LoaderContext) {
     return [
       postcssImports({
-        resolve: (url: string, context: string) => {
-          return new Promise<string>((resolve, reject) => {
-            let hadTilde = false;
-            if (url && url.startsWith('~')) {
-              url = url.substr(1);
-              hadTilde = true;
-            }
-            loader.resolve(context, (hadTilde ? '' : './') + url, (err: Error, result: string) => {
-              if (err) {
-                if (hadTilde) {
-                  reject(err);
-                  return;
-                }
-                loader.resolve(context, url, (err: Error, result: string) => {
-                  if (err) {
-                    reject(err);
-                  } else {
-                    resolve(result);
-                  }
-                });
-              } else {
-                resolve(result);
-              }
-            });
-          });
-        },
+        resolve: (url: string) => url.startsWith('~') ? url.substr(1) : url,
         load: (filename: string) => {
           return new Promise<string>((resolve, reject) => {
             loader.fs.readFile(filename, (err: Error, data: Buffer) => {
               if (err) {
                 reject(err);
+
                 return;
               }
 
@@ -100,42 +65,11 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
               resolve(content);
             });
           });
-        }
-      }),
-      postcssUrl({
-        filter: ({ url }: PostcssUrlAsset) => url.startsWith('~'),
-        url: ({ url }: PostcssUrlAsset) => {
-          // Note: This will only find the first node_modules folder.
-          const nodeModules = findUp('node_modules', projectRoot);
-          if (!nodeModules) {
-            throw new Error('Cannot locate node_modules directory.')
-          }
-          const fullPath = path.join(nodeModules, url.substr(1));
-          return path.relative(loader.context, fullPath).replace(/\\/g, '/');
-        }
+        },
       }),
-      postcssUrl([
-        {
-          // Only convert root relative URLs, which CSS-Loader won't process into require().
-          filter: ({ url }: PostcssUrlAsset) => url.startsWith('/') && !url.startsWith('//'),
-          url: ({ url }: PostcssUrlAsset) => {
-            if (deployUrl.match(/:\/\//) || deployUrl.startsWith('/')) {
-              // If deployUrl is absolute or root relative, ignore baseHref & use deployUrl as is.
-              return `${deployUrl.replace(/\/$/, '')}${url}`;
-            } else if (baseHref.match(/:\/\//)) {
-              // If baseHref contains a scheme, include it as is.
-              return baseHref.replace(/\/$/, '') +
-                `/${deployUrl}/${url}`.replace(/\/\/+/g, '/');
-            } else {
-              // Join together base-href, deploy-url and the original URL.
-              // Also dedupe multiple slashes into single ones.
-              return `/${baseHref}/${deployUrl}/${url}`.replace(/\/\/+/g, '/');
-            }
-          }
-        }
-      ]),
       PostcssCliResources({
-        deployUrl: loader.loaders[loader.loaderIndex].options.ident == 'extracted' ? '' : deployUrl,
+        baseHref,
+        deployUrl,
         loader,
         filename: `[name]${hashFormat.file}.[ext]`,
       }),
@@ -164,12 +98,11 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
 
     normalizeExtraEntryPoints(buildOptions.styles, 'styles').forEach(style => {
       const resolvedPath = path.resolve(root, style.input);
-
       // Add style entry points.
       if (entryPoints[style.bundleName]) {
-        entryPoints[style.bundleName].push(resolvedPath)
+        entryPoints[style.bundleName].push(resolvedPath);
       } else {
-        entryPoints[style.bundleName] = [resolvedPath]
+        entryPoints[style.bundleName] = [resolvedPath];
       }
 
       // Add lazy styles to the list.
@@ -189,18 +122,20 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
 
   let dartSass: {} | undefined;
   try {
+    // tslint:disable-next-line:no-implicit-dependencies
     dartSass = require('sass');
   } catch { }
 
   let fiber: {} | undefined;
   if (dartSass) {
     try {
+      // tslint:disable-next-line:no-implicit-dependencies
       fiber = require('fibers');
     } catch { }
   }
 
   // set base rules to derive final rules from
-  const baseRules: webpack.Rule[] = [
+  const baseRules: webpack.RuleSetRule[] = [
     { test: /\.css$/, use: [] },
     {
       test: /\.scss$|\.sass$/,
@@ -212,9 +147,9 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
           sourceMap: cssSourceMap,
           // bootstrap-sass requires a minimum precision of 8
           precision: 8,
-          includePaths
-        }
-      }]
+          includePaths,
+        },
+      }],
     },
     {
       test: /\.less$/,
@@ -224,8 +159,8 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
           sourceMap: cssSourceMap,
           javascriptEnabled: true,
           ...lessPathOptions,
-        }
-      }]
+        },
+      }],
     },
     {
       test: /\.styl$/,
@@ -233,14 +168,14 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
         loader: 'stylus-loader',
         options: {
           sourceMap: cssSourceMap,
-          paths: includePaths
-        }
-      }]
-    }
+          paths: includePaths,
+        },
+      }],
+    },
   ];
 
   // load component css as raw strings
-  const rules: webpack.Rule[] = baseRules.map(({ test, use }) => ({
+  const rules: webpack.RuleSetRule[] = baseRules.map(({ test, use }) => ({
     exclude: globalStylePaths,
     test,
     use: [
@@ -250,50 +185,33 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
         options: {
           ident: 'embedded',
           plugins: postcssPluginCreator,
-          sourceMap: cssSourceMap ? 'inline' : false
-        }
+          sourceMap: cssSourceMap ? 'inline' : false,
+        },
       },
-      ...(use as webpack.Loader[])
-    ]
+      ...(use as webpack.Loader[]),
+    ],
   }));
 
   // load global css as css files
   if (globalStylePaths.length > 0) {
     rules.push(...baseRules.map(({ test, use }) => {
-      const extractTextPlugin = {
+      return {
+        include: globalStylePaths,
+        test,
         use: [
-          // style-loader still has issues with relative url()'s with sourcemaps enabled;
-          // even with the convertToAbsoluteUrls options as it uses 'document.location'
-          // which breaks when used with routing.
-          // Once style-loader 1.0 is released the following conditional won't be necessary
-          // due to this 1.0 PR: https://github.com/webpack-contrib/style-loader/pull/219
-          { loader: buildOptions.extractCss ? RawCssLoader : 'raw-loader' },
+          buildOptions.extractCss ? MiniCssExtractPlugin.loader : 'style-loader',
+          RawCssLoader,
           {
             loader: 'postcss-loader',
             options: {
               ident: buildOptions.extractCss ? 'extracted' : 'embedded',
               plugins: postcssPluginCreator,
-              sourceMap: cssSourceMap && !buildOptions.extractCss ? 'inline' : cssSourceMap
-            }
+              sourceMap: cssSourceMap && !buildOptions.extractCss ? 'inline' : cssSourceMap,
+            },
           },
-          ...(use as webpack.Loader[])
+          ...(use as webpack.Loader[]),
         ],
-        // publicPath needed as a workaround https://github.com/angular/angular-cli/issues/4035
-        publicPath: ''
-      };
-      const ret: any = {
-        include: globalStylePaths,
-        test,
-        use: [
-          buildOptions.extractCss ? MiniCssExtractPlugin.loader : 'style-loader',
-          ...extractTextPlugin.use,
-        ]
       };
-      // Save the original options as arguments for eject.
-      // if (buildOptions.extractCss) {
-      //   ret[pluginArgs] = extractTextPlugin;
-      // }
-      return ret;
     }));
   }
 
@@ -309,6 +227,6 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
   return {
     entry: entryPoints,
     module: { rules },
-    plugins: extraPlugins
+    plugins: extraPlugins,
   };
 }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts
index 7bf139cd662f..7192ca92efea 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts
@@ -1,7 +1,3 @@
-// tslint:disable
-// TODO: cleanup this file, it's copied as is from Angular CLI.
-
-
 /**
  * @license
  * Copyright Google Inc. All Rights Reserved.
@@ -28,6 +24,7 @@ function wrapUrl(url: string): string {
 }
 
 export interface PostcssCliResourcesOptions {
+  baseHref?: string;
   deployUrl?: string;
   filename: string;
   loader: webpack.loader.LoaderContext;
@@ -36,21 +33,28 @@ export interface PostcssCliResourcesOptions {
 async function resolve(
   file: string,
   base: string,
-  resolver: (file: string, base: string) => Promise<string>
+  resolver: (file: string, base: string) => Promise<string>,
 ): Promise<string> {
   try {
     return await resolver('./' + file, base);
-  } catch (err) {
+  } catch {
     return resolver(file, base);
   }
 }
 
 export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResourcesOptions) => {
-  const { deployUrl, filename, loader } = options;
+  const {
+    deployUrl = '',
+    baseHref = '',
+    filename,
+    loader,
+  } = options;
+
+  const dedupeSlashes = (url: string) => url.replace(/\/\/+/g, '/');
 
   const process = async (inputUrl: string, resourceCache: Map<string, string>) => {
     // If root-relative or absolute, leave as is
-    if (inputUrl.match(/^(?:\w+:\/\/|data:|chrome:|#|\/)/)) {
+    if (inputUrl.match(/^(?:\w+:\/\/|data:|chrome:|#)/)) {
       return inputUrl;
     }
     // If starts with a caret, remove and return remainder
@@ -64,11 +68,34 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
       return cachedUrl;
     }
 
+    if (inputUrl.startsWith('~')) {
+      inputUrl = inputUrl.substr(1);
+    }
+
+    if (inputUrl.startsWith('/') && !inputUrl.startsWith('//')) {
+      let outputUrl = '';
+      if (deployUrl.match(/:\/\//) || deployUrl.startsWith('/')) {
+        // If deployUrl is absolute or root relative, ignore baseHref & use deployUrl as is.
+        outputUrl = `${deployUrl.replace(/\/$/, '')}${inputUrl}`;
+      } else if (baseHref.match(/:\/\//)) {
+        // If baseHref contains a scheme, include it as is.
+        outputUrl = baseHref.replace(/\/$/, '') + dedupeSlashes(`/${deployUrl}/${inputUrl}`);
+      } else {
+        // Join together base-href, deploy-url and the original URL.
+        outputUrl = dedupeSlashes(`/${baseHref}/${deployUrl}/${inputUrl}`);
+      }
+
+      resourceCache.set(inputUrl, outputUrl);
+
+      return outputUrl;
+    }
+
     const { pathname, hash, search } = url.parse(inputUrl.replace(/\\/g, '/'));
     const resolver = (file: string, base: string) => new Promise<string>((resolve, reject) => {
       loader.resolve(base, file, (err, result) => {
         if (err) {
           reject(err);
+
           return;
         }
         resolve(result);
@@ -81,6 +108,7 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
       loader.fs.readFile(result, (err: Error, content: Buffer) => {
         if (err) {
           reject(err);
+
           return;
         }
 
@@ -98,12 +126,11 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
           outputUrl = url.format({ pathname: outputUrl, hash, search });
         }
 
-        if (deployUrl) {
+        if (deployUrl && loader.loaders[loader.loaderIndex].options.ident !== 'extracted') {
           outputUrl = url.resolve(deployUrl, outputUrl);
         }
 
         resourceCache.set(inputUrl, outputUrl);
-
         resolve(outputUrl);
       });
     });
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/webpack.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/webpack.ts
index 0480230ad484..026e834641fd 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/webpack.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/webpack.ts
@@ -5,8 +5,6 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable
-// TODO: cleanup this file, it's copied as is from Angular CLI.
 
 // Exports the webpack plugins we use internally.
 export { BaseHrefWebpackPlugin } from '../lib/base-href-webpack/base-href-webpack-plugin';
@@ -14,6 +12,7 @@ export { CleanCssWebpackPlugin, CleanCssWebpackPluginOptions } from './cleancss-
 export { BundleBudgetPlugin, BundleBudgetPluginOptions } from './bundle-budget';
 export { ScriptsWebpackPlugin, ScriptsWebpackPluginOptions } from './scripts-webpack-plugin';
 export { SuppressExtractedTextChunksWebpackPlugin } from './suppress-entry-chunks-webpack-plugin';
+export { RemoveHashPlugin, RemoveHashPluginOptions } from './remove-hash-plugin';
 export {
   default as PostcssCliResources,
   PostcssCliResourcesOptions,
diff --git a/yarn.lock b/yarn.lock
index 3309a02b20ac..20e684a651b0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5717,16 +5717,6 @@ postcss-loader@^2.1.5:
     postcss-load-config "^2.0.0"
     schema-utils "^0.4.0"
 
-postcss-url@^7.3.2:
-  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"
-    mkdirp "^0.5.0"
-    postcss "^6.0.1"
-    xxhashjs "^0.2.1"
-
 postcss-url@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-8.0.0.tgz#7b10059bd12929cdbb1971c60f61a0e5af86b4ca"

From 54f7ea2b1dcffa9cbe1e96d0c99acd8704d232ea Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sun, 2 Sep 2018 11:55:58 +0200
Subject: [PATCH 0061/1703] fix(@angular-devkit/schematics): throw
 `InvalidCollectionJsonException` when collection file is invalid

Closes #11818
---
 .../tools/file-system-engine-host-base.ts        | 16 ++++++++++++++--
 .../schematics/tools/node-module-engine-host.ts  | 15 +++++++++++++--
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts b/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts
index 7c3ed9c808d4..0ed3cc7dac98 100644
--- a/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts
+++ b/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts
@@ -7,7 +7,9 @@
  */
 import {
   BaseException,
+  InvalidJsonCharacterException,
   JsonObject,
+  UnexpectedEndOfInputException,
   isObservable,
   normalize,
   virtualFs,
@@ -52,8 +54,18 @@ export class CollectionCannotBeResolvedException extends BaseException {
   }
 }
 export class InvalidCollectionJsonException extends BaseException {
-  constructor(_name: string, path: string) {
-    super(`Collection JSON at path ${JSON.stringify(path)} is invalid.`);
+  constructor(
+    _name: string,
+    path: string,
+    jsonException?: UnexpectedEndOfInputException | InvalidJsonCharacterException,
+  ) {
+    let msg = `Collection JSON at path ${JSON.stringify(path)} is invalid.`;
+
+    if (jsonException) {
+      msg = `${msg} ${jsonException.message}`;
+    }
+
+    super(msg);
   }
 }
 export class SchematicMissingFactoryException extends BaseException {
diff --git a/packages/angular_devkit/schematics/tools/node-module-engine-host.ts b/packages/angular_devkit/schematics/tools/node-module-engine-host.ts
index 93aa34dbafe0..2c0e681626bc 100644
--- a/packages/angular_devkit/schematics/tools/node-module-engine-host.ts
+++ b/packages/angular_devkit/schematics/tools/node-module-engine-host.ts
@@ -5,7 +5,11 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { BaseException } from '@angular-devkit/core';
+import {
+  BaseException,
+  InvalidJsonCharacterException,
+  UnexpectedEndOfInputException,
+} from '@angular-devkit/core';
 import * as core from '@angular-devkit/core/node';
 import { dirname, join, resolve as resolvePath } from 'path';
 import { RuleFactory } from '../src';
@@ -18,6 +22,7 @@ import {
   CollectionCannotBeResolvedException,
   CollectionMissingSchematicsMapException,
   FileSystemEngineHostBase,
+  InvalidCollectionJsonException,
   SchematicMissingFieldsException,
 } from './file-system-engine-host-base';
 import { readJsonFile } from './file-system-utility';
@@ -77,7 +82,7 @@ export class NodeModulesEngineHost extends FileSystemEngineHostBase {
     if (name.replace(/\\/, '/').split('/').length > (name[0] == '@' ? 2 : 1)) {
       try {
         collectionPath = this._resolvePath(name, process.cwd());
-      } catch (_) {
+      } catch {
       }
     }
 
@@ -102,7 +107,13 @@ export class NodeModulesEngineHost extends FileSystemEngineHostBase {
         return collectionPath;
       }
     } catch (e) {
+      if (
+        e instanceof InvalidJsonCharacterException || e instanceof UnexpectedEndOfInputException
+      ) {
+        throw new InvalidCollectionJsonException(name, collectionPath, e);
+      }
     }
+
     throw new CollectionCannotBeResolvedException(name);
   }
 

From 65ede1fd6eb1dbbe0160336828485cc328e1c987 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 31 Aug 2018 09:06:27 +0200
Subject: [PATCH 0062/1703] docs: fix english

---
 packages/angular/cli/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular/cli/README.md b/packages/angular/cli/README.md
index b462efe7e56b..1c076e8a40a2 100644
--- a/packages/angular/cli/README.md
+++ b/packages/angular/cli/README.md
@@ -103,7 +103,7 @@ Scaffold  | Usage
 
 
 
-angular-cli will add reference to `components`, `directives` and `pipes` automatically in the `app.module.ts`. If you need to add this references to another custom module, follow this steps:
+angular-cli will add reference to `components`, `directives` and `pipes` automatically in the `app.module.ts`. If you need to add this references to another custom module, follow these steps:
 
  1. `ng g module new-module` to create a new module
  2.  call `ng g component new-module/new-component`

From e16c8bbe87487b45ab831b348b3137e607233462 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 31 Aug 2018 13:56:11 +0200
Subject: [PATCH 0063/1703] fix(@angular-devkit/build-angular): set the proper
 type to `fileReplacements`

Closes #11294
---
 .../build_angular/src/browser/schema.d.ts             |  2 +-
 .../build_angular/src/extract-i18n/index.ts           |  3 ++-
 .../build_angular/src/server/schema.d.ts              | 11 +++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/browser/schema.d.ts b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
index ca0fc891efe9..11a63aaa698d 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
@@ -49,7 +49,7 @@ export interface BrowserBuilderSchema {
   /**
    * Replace files with other files in the build.
    */
-  fileReplacements: FileReplacements[];
+  fileReplacements: FileReplacement[];
 
   /**
    * Path where output will be placed.
diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
index ead3923d38f8..72752838f18f 100644
--- a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
@@ -85,7 +85,8 @@ export class ExtractI18nBuilder implements Builder<ExtractI18nBuilderOptions> {
 
         // Extracting i18n uses the browser target webpack config with some specific options.
         const webpackConfig = this.buildWebpackConfig(root, projectRoot, {
-          ...browserOptions,
+          // todo: remove this casting when 'CurrentFileReplacement' is changed to 'FileReplacement'
+          ...(browserOptions as NormalizedBrowserBuilderSchema),
           optimization: false,
           i18nLocale: options.i18nLocale,
           i18nFormat: options.i18nFormat,
diff --git a/packages/angular_devkit/build_angular/src/server/schema.d.ts b/packages/angular_devkit/build_angular/src/server/schema.d.ts
index 16beda1fd8fb..24b575422afd 100644
--- a/packages/angular_devkit/build_angular/src/server/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/server/schema.d.ts
@@ -5,6 +5,9 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
+import { FileReplacement } from '../browser/schema';
+
 export interface BuildWebpackServerSchema {
   /**
    * The name of the TypeScript configuration file.
@@ -80,7 +83,7 @@ export interface BuildWebpackServerSchema {
   /**
    * Replace files with other files in the build.
    */
-  fileReplacements: FileReplacements[];
+  fileReplacements: FileReplacement[];
   /**
    * Define the output filename cache-busting hashing mode.
    */
@@ -125,9 +128,9 @@ export interface BuildWebpackServerSchema {
    * Run build when files change.
    */
   watch?: boolean;
-    /**
-   * Enable and define the file watching poll time period in milliseconds.
-   */
+  /**
+ * Enable and define the file watching poll time period in milliseconds.
+ */
   poll?: number;
 }
 

From 8caeb478248ffef219a9ace2386633f2d2e64281 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20H=C3=A4ni?= <haeni.sebastian@gmail.com>
Date: Thu, 23 Aug 2018 01:21:31 +0200
Subject: [PATCH 0064/1703] fix(@angular-devkit/schematics): fix `generate`
 mangling files containing wide characters

Executing a command like `ng generate component my-component` can sometimes lead to
mangled Angular module files when inserting the component into `declaration` and
adding the import. This happens if the file contains characters that are wider than
one byte e.g. a copyright sign or an umlaut. Today it is expected to be able to use
two byte long characters in code.

The `UpdateBuffer` class operates using Buffer objects which use byte arrays internally.
Using text node positions provided by the TypeScript library, these will not match up.
This change looks up the textual position inside the Buffer and uses the correct index.

Closes #7851, #7950
---
 .../schematics/src/tree/recorder.ts           |  6 +++---
 .../schematics/src/utility/update-buffer.ts   | 20 +++++++++++++++----
 .../src/utility/update-buffer_spec.ts         | 10 ++++++++++
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/schematics/src/tree/recorder.ts b/packages/angular_devkit/schematics/src/tree/recorder.ts
index be8e485e6f8b..8b18b8182e55 100644
--- a/packages/angular_devkit/schematics/src/tree/recorder.ts
+++ b/packages/angular_devkit/schematics/src/tree/recorder.ts
@@ -30,9 +30,9 @@ export class UpdateRecorderBase implements UpdateRecorder {
     if (c0 == 0xEF && c1 == 0xBB && c2 == 0xBF) {
       return new UpdateRecorderBom(entry);
     } else if (c0 === 0xFF && c1 == 0xFE) {
-      return new UpdateRecorderBom(entry, 2);
+      return new UpdateRecorderBom(entry);
     } else if (c0 === 0xFE && c1 == 0xFF) {
-      return new UpdateRecorderBom(entry, 2);
+      return new UpdateRecorderBom(entry);
     }
 
     return new UpdateRecorderBase(entry);
@@ -70,7 +70,7 @@ export class UpdateRecorderBase implements UpdateRecorder {
 
 
 export class UpdateRecorderBom extends UpdateRecorderBase {
-  constructor(entry: FileEntry, private _delta = 3) {
+  constructor(entry: FileEntry, private _delta = 1) {
     super(entry);
   }
 
diff --git a/packages/angular_devkit/schematics/src/utility/update-buffer.ts b/packages/angular_devkit/schematics/src/utility/update-buffer.ts
index 44a9f620a914..165305ddabae 100644
--- a/packages/angular_devkit/schematics/src/utility/update-buffer.ts
+++ b/packages/angular_devkit/schematics/src/utility/update-buffer.ts
@@ -201,19 +201,31 @@ export class UpdateBuffer {
   }
 
   protected _slice(start: number): [Chunk, Chunk] {
-    this._assertIndex(start);
+    // If start is longer than the content, use start, otherwise determine exact position in string.
+    const index = start >= this._originalContent.length ? start : this._getTextPosition(start);
+
+    this._assertIndex(index);
 
     // Find the chunk by going through the list.
-    const h = this._linkedList.find(chunk => start <= chunk.end);
+    const h = this._linkedList.find(chunk => index <= chunk.end);
     if (!h) {
       throw Error('Chunk cannot be found.');
     }
 
-    if (start == h.end && h.next !== null) {
+    if (index == h.end && h.next !== null) {
       return [h, h.next];
     }
 
-    return [h, h.slice(start)];
+    return [h, h.slice(index)];
+  }
+
+  /**
+   * Gets the position in the content based on the position in the string.
+   * Some characters might be wider than one byte, thus we have to determine the position using
+   * string functions.
+   */
+  protected _getTextPosition(index: number): number {
+    return Buffer.from(this._originalContent.toString().substring(0, index)).length;
   }
 
   get length(): number {
diff --git a/packages/angular_devkit/schematics/src/utility/update-buffer_spec.ts b/packages/angular_devkit/schematics/src/utility/update-buffer_spec.ts
index f6e7cc2aa271..64e650feeb29 100644
--- a/packages/angular_devkit/schematics/src/utility/update-buffer_spec.ts
+++ b/packages/angular_devkit/schematics/src/utility/update-buffer_spec.ts
@@ -58,6 +58,16 @@ describe('UpdateBuffer', () => {
       mb.insertLeft(6, Buffer.from('Awesome '));
       expect(mb.toString()).toBe('Hello Great Awesome Beautiful World');
     });
+
+    it('works with special characters', () => {
+      const mb = new UpdateBuffer(Buffer.from('Ülaut'));
+
+      mb.insertLeft(1, Buffer.from('m'));
+      expect(mb.toString()).toBe('Ümlaut');
+
+      mb.insertLeft(0, Buffer.from('Hello '));
+      expect(mb.toString()).toBe('Hello Ümlaut');
+    });
   });
 
   describe('delete', () => {

From 6afa6a31bbf1e6516b4ac2120ec431178c5a8e43 Mon Sep 17 00:00:00 2001
From: Jan Kuri <jkuri88@gmail.com>
Date: Mon, 3 Sep 2018 20:30:10 +0200
Subject: [PATCH 0065/1703] docs: update proxy.md with correct path

---
 docs/documentation/stories/proxy.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/documentation/stories/proxy.md b/docs/documentation/stories/proxy.md
index c0cfd0e1cabc..17b301f17c30 100644
--- a/docs/documentation/stories/proxy.md
+++ b/docs/documentation/stories/proxy.md
@@ -26,7 +26,7 @@ We can then add the `proxyConfig` option to the serve target:
     "builder": "@angular-devkit/build-angular:dev-server",
     "options": {
       "browserTarget": "your-application-name:build",
-      "proxyConfig": "src/proxy.conf.json"
+      "proxyConfig": "proxy.conf.json"
     },
 ```
 
@@ -119,7 +119,7 @@ Make sure to point to the right file (`.js` instead of `.json`):
     "builder": "@angular-devkit/build-angular:dev-server",
     "options": {
       "browserTarget": "your-application-name:build",
-      "proxyConfig": "src/proxy.conf.js"
+      "proxyConfig": "proxy.conf.js"
     },
 ```
 
@@ -183,4 +183,4 @@ function setupForCorporateProxy(proxyConfig) {
 module.exports = setupForCorporateProxy(proxyConfig);
 ```
 
-This way if you have a `http_proxy` or `HTTP_PROXY` environment variable defined, an agent will automatically be added to pass calls through your corporate proxy when running `npm start`.
\ No newline at end of file
+This way if you have a `http_proxy` or `HTTP_PROXY` environment variable defined, an agent will automatically be added to pass calls through your corporate proxy when running `npm start`.

From 616ffe70f8f1482b1aadf76810f704383947e1e6 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 4 Sep 2018 12:49:47 +0200
Subject: [PATCH 0066/1703] fix(@schematics/angular): app shell schematic does
 not use production configuration

Closes: #11578
---
 packages/schematics/angular/app-shell/index.ts      | 5 +++++
 packages/schematics/angular/app-shell/index_spec.ts | 1 +
 2 files changed, 6 insertions(+)

diff --git a/packages/schematics/angular/app-shell/index.ts b/packages/schematics/angular/app-shell/index.ts
index 2cdf54a46cd0..a08c7f5c9875 100644
--- a/packages/schematics/angular/app-shell/index.ts
+++ b/packages/schematics/angular/app-shell/index.ts
@@ -196,6 +196,11 @@ function addAppShellConfigToWorkspace(options: AppShellOptions): Rule {
         serverTarget: `${options.clientProject}:server`,
         route: options.route,
       },
+      configurations: {
+        production: {
+          browserTarget: `${options.clientProject}:build:production`,
+        },
+      },
     };
 
     if (!workspace.projects[options.clientProject]) {
diff --git a/packages/schematics/angular/app-shell/index_spec.ts b/packages/schematics/angular/app-shell/index_spec.ts
index d7ceb96785be..e765c25352b4 100644
--- a/packages/schematics/angular/app-shell/index_spec.ts
+++ b/packages/schematics/angular/app-shell/index_spec.ts
@@ -68,6 +68,7 @@ describe('App Shell Schematic', () => {
     expect(target.options.browserTarget).toEqual('bar:build');
     expect(target.options.serverTarget).toEqual('bar:server');
     expect(target.options.route).toEqual('shell');
+    expect(target.configurations.production.browserTarget).toEqual('bar:build:production');
   });
 
   it('should add router module to client app module', () => {

From 36f8cd77baf7baff0df482a6b7bba17cd28e247e Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 6 Sep 2018 12:51:01 +0200
Subject: [PATCH 0067/1703] fix(@schematics/angular): fix path for
 `ngswConfigPath` during migration

`/` will cause an error during lookup `Error: Expected to find an `ngsw-config.json` configuration file
---
 packages/schematics/angular/migrations/update-6/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/migrations/update-6/index.ts b/packages/schematics/angular/migrations/update-6/index.ts
index 3509bb8849f4..be938fc4639b 100644
--- a/packages/schematics/angular/migrations/update-6/index.ts
+++ b/packages/schematics/angular/migrations/update-6/index.ts
@@ -308,7 +308,7 @@ function extractProjectsConfig(
           extractLicenses: true,
           vendorChunk: false,
           buildOptimizer: true,
-          ...(serviceWorker ? {serviceWorker: true, ngswConfigPath: '/src/ngsw-config.json'} : {}),
+          ...(serviceWorker ? {serviceWorker: true, ngswConfigPath: 'src/ngsw-config.json'} : {}),
           ...(app.budgets ? { budgets: app.budgets as JsonArray} : {}),
         };
 

From 0dc36f2848163c570921f84033c6e5450ae1cfb6 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 5 Sep 2018 13:32:07 +0100
Subject: [PATCH 0068/1703] ci: update CI to node 10

---
 .appveyor.yml        |  9 ++++-----
 .circleci/config.yml | 23 ++++++++++++++++++++---
 WORKSPACE            |  8 +++++---
 package.json         |  6 +++---
 4 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 7b237d6d1cf7..edc5ecbae89d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,15 +1,14 @@
 environment:
-  # Note: if updating to Node 10, use at least 10.5.0 to include a fix for
-  # https://github.com/nodejs/node/issues/20297
-  nodejs_version: "8.9.2" # Same version as used in CircleCI.
+  nodejs_version: "10.9.0" # Same version as used in CircleCI.
 
 matrix:
   fast_finish: true
 
 install:
   - ps: Install-Product node $env:nodejs_version
-  - yarn install --frozen-lockfile
-  - npm run webdriver-update-appveyor
+  # --network-timeout is a workaround for https://github.com/yarnpkg/yarn/issues/6221
+  - yarn --frozen-lockfile --network-timeout=500000
+  - yarn webdriver-update-appveyor
 
 test_script:
   - node --version
diff --git a/.circleci/config.yml b/.circleci/config.yml
index bab56e835e84..5ffb9a5590e0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,8 +12,9 @@
 ## IMPORTANT
 # If you change the `docker_image` version, also change the `cache_key` suffix and the version of
 # `com_github_bazelbuild_buildtools` in the `/WORKSPACE` file.
-var_1: &docker_image angular/ngcontainer:0.3.3
-var_2: &cache_key angular_devkit-{{ checksum "yarn.lock" }}-0.3.3-2
+var_1: &docker_image angular/ngcontainer:0.5.0
+var_2: &cache_key angular_devkit-{{ checksum "yarn.lock" }}-0.5.0
+var_3: &node_8_docker_image angular/ngcontainer:0.3.3
 
 # Settings common to each job
 anchor_1: &defaults
@@ -84,8 +85,21 @@ jobs:
     parallelism: 4
     steps:
       - attach_workspace: *attach_options
-      - run: npm install --global npm@6
       - run: xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
+  
+  e2e-node-8:
+    <<: *defaults
+    # Overwrite docker image to node 8.
+    docker:
+      - image: *node_8_docker_image    
+    environment:
+      BASH_ENV: ~/.profile
+    resource_class: xlarge
+    parallelism: 4
+    steps:
+      - attach_workspace: *attach_options
+      - run: npm install --global npm@6
+      - run: xvfb-run -a node ./tests/legacy-cli/run_e2e --glob=tests/basic/*
 
   build:
     <<: *defaults
@@ -153,6 +167,9 @@ workflows:
       - e2e-cli:
           requires:
             - build
+      - e2e-node-8:
+          requires:
+            - build
       - snapshot_publish:
           requires:
             - test
diff --git a/WORKSPACE b/WORKSPACE
index 3647c4e935d3..01a96e2ea061 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -29,9 +29,9 @@ go_register_toolchains()
 # We need a minimum of this version to include https://github.com/bazelbuild/rules_nodejs/pull/281.
 http_archive(
     name = "build_bazel_rules_nodejs",
-    url = "https://github.com/bazelbuild/rules_nodejs/archive/c75e3dd0571b0937e3ce0c4f0e6b6b50d90468f0.zip",
-    strip_prefix = "rules_nodejs-c75e3dd0571b0937e3ce0c4f0e6b6b50d90468f0",
-    sha256 = "b78506ddaed7c682027f873d2bd50086a28570b3187da9fa16fe1672eed3015e",
+    url = "https://github.com/bazelbuild/rules_nodejs/archive/0.12.4.zip",
+    strip_prefix = "rules_nodejs-0.12.4",
+    sha256 = "c482700e032b4df60425cb9a6f8f28152fb1c4c947a9d61e6132fc59ce332b16",
 )
 
 # Load the TypeScript rules, its dependencies, and setup the workspace.
@@ -58,6 +58,8 @@ check_bazel_version("0.15.0")
 node_repositories(
     package_json = ["//:package.json"], 
     preserve_symlinks = True,
+    node_version = "10.3.0",
+    yarn_version = "1.6.0",
 )
 
 local_repository(
diff --git a/package.json b/package.json
index 7f1bcd60ea16..9f6c4df624c2 100644
--- a/package.json
+++ b/package.json
@@ -35,15 +35,15 @@
     "validate-commits": "./bin/devkit-admin validate-commits",
     "prepush": "node ./bin/devkit-admin hooks/pre-push",
     "webdriver-update-appveyor": "webdriver-manager update --standalone false --gecko false --versions.chrome 2.37",
-    "webdriver-update-circleci": "webdriver-manager update --standalone false --gecko false --versions.chrome 2.33"
+    "webdriver-update-circleci": "webdriver-manager update --standalone false --gecko false --versions.chrome $CHROMEDRIVER_VERSION_ARG "
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/angular-cli.git"
   },
   "engines": {
-    "node": ">= 8.9.0",
-    "npm": ">= 5.5.1"
+    "node": ">=10.3.0 <11.0.0",
+    "yarn": ">=1.6.0 <2.0.0"
   },
   "author": "Angular Authors",
   "license": "MIT",

From 6595490b8b32122d39edc3b4a6828f6604c64bfe Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 20 Aug 2018 11:55:19 -0400
Subject: [PATCH 0069/1703] feat(@angular/pwa): support customized workspace
 configurations with add

---
 packages/angular/pwa/BUILD             |   5 +-
 packages/angular/pwa/package.json      |   3 +-
 packages/angular/pwa/pwa/index.ts      | 244 +++++++++++++++----------
 packages/angular/pwa/pwa/index_spec.ts | 117 +++++++-----
 packages/angular/pwa/utility/config.ts |  30 ---
 yarn.lock                              |  17 ++
 6 files changed, 240 insertions(+), 176 deletions(-)
 delete mode 100644 packages/angular/pwa/utility/config.ts

diff --git a/packages/angular/pwa/BUILD b/packages/angular/pwa/BUILD
index 80cc6f59bedf..b72ac6d5d4db 100644
--- a/packages/angular/pwa/BUILD
+++ b/packages/angular/pwa/BUILD
@@ -24,11 +24,10 @@ ts_library(
             "**/*_spec_large.ts",
         ],
     ),
-    # Borrow the compile-time deps of the typescript compiler
-    # Just to avoid an extra npm install action.
-    node_modules = "@build_bazel_rules_typescript_tsc_wrapped_deps//:node_modules",
     deps = [
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/schematics",
+        "@rxjs",
+        # @typings: node
     ],
 )
diff --git a/packages/angular/pwa/package.json b/packages/angular/pwa/package.json
index c419ac9b7b2a..6ac874ec90a8 100644
--- a/packages/angular/pwa/package.json
+++ b/packages/angular/pwa/package.json
@@ -12,6 +12,7 @@
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
     "@schematics/angular": "0.0.0",
-    "typescript": "~2.6.2"
+    "parse5-html-rewriting-stream": "^5.1.0",
+    "rxjs": "^6.0.0"
   }
 }
\ No newline at end of file
diff --git a/packages/angular/pwa/pwa/index.ts b/packages/angular/pwa/pwa/index.ts
index 53e9f87f7e56..9eb869c7c5cf 100644
--- a/packages/angular/pwa/pwa/index.ts
+++ b/packages/angular/pwa/pwa/index.ts
@@ -5,7 +5,14 @@
 * Use of this source code is governed by an MIT-style license that can be
 * found in the LICENSE file at https://angular.io/license
 */
-import { Path, join, normalize } from '@angular-devkit/core';
+import {
+  JsonParseMode,
+  experimental,
+  getSystemPath,
+  join,
+  normalize,
+  parseJson,
+} from '@angular-devkit/core';
 import {
   Rule,
   SchematicContext,
@@ -19,153 +26,190 @@ import {
   template,
   url,
 } from '@angular-devkit/schematics';
-import { getWorkspace, getWorkspacePath } from '../utility/config';
+import { Observable } from 'rxjs';
+import { Readable, Writable } from 'stream';
 import { Schema as PwaOptions } from './schema';
 
+const RewritingStream = require('parse5-html-rewriting-stream');
 
-function addServiceWorker(options: PwaOptions): Rule {
-  return (host: Tree, context: SchematicContext) => {
-    context.logger.debug('Adding service worker...');
-
-    const swOptions = {
-      ...options,
-    };
-    delete swOptions.title;
-
-    return externalSchematic('@schematics/angular', 'service-worker', swOptions);
-  };
-}
 
-function getIndent(text: string): string {
-  let indent = '';
+function getWorkspace(
+  host: Tree,
+): { path: string, workspace: experimental.workspace.WorkspaceSchema } {
+  const possibleFiles = [ '/angular.json', '/.angular.json' ];
+  const path = possibleFiles.filter(path => host.exists(path))[0];
 
-  for (const char of text) {
-    if (char === ' ' || char === '\t') {
-      indent += char;
-    } else {
-      break;
-    }
+  const configBuffer = host.read(path);
+  if (configBuffer === null) {
+    throw new SchematicsException(`Could not find (${path})`);
   }
-
-  return indent;
+  const content = configBuffer.toString();
+
+  return {
+    path,
+    workspace: parseJson(
+      content,
+      JsonParseMode.Loose,
+    ) as {} as experimental.workspace.WorkspaceSchema,
+  };
 }
 
-function updateIndexFile(options: PwaOptions): Rule {
-  return (host: Tree, context: SchematicContext) => {
-    const workspace = getWorkspace(host);
-    const project = workspace.projects[options.project as string];
-    let path: string;
-    const projectTargets = project.targets || project.architect;
-    if (project && projectTargets && projectTargets.build && projectTargets.build.options.index) {
-      path = projectTargets.build.options.index;
-    } else {
-      throw new SchematicsException('Could not find index file for the project');
-    }
+function updateIndexFile(path: string): Rule {
+  return (host: Tree) => {
     const buffer = host.read(path);
     if (buffer === null) {
       throw new SchematicsException(`Could not read index file: ${path}`);
     }
-    const content = buffer.toString();
-    const lines = content.split('\n');
-    let closingHeadTagLineIndex = -1;
-    let closingBodyTagLineIndex = -1;
-    lines.forEach((line, index) => {
-      if (closingHeadTagLineIndex === -1 && /<\/head>/.test(line)) {
-        closingHeadTagLineIndex = index;
-      } else if (closingBodyTagLineIndex === -1 && /<\/body>/.test(line)) {
-        closingBodyTagLineIndex = index;
-      }
-    });
 
-    const headIndent = getIndent(lines[closingHeadTagLineIndex]) + '  ';
-    const itemsToAddToHead = [
-      '<link rel="manifest" href="manifest.json">',
-      '<meta name="theme-color" content="#1976d2">',
-    ];
+    const rewriter = new RewritingStream();
 
-    const bodyIndent = getIndent(lines[closingBodyTagLineIndex]) + '  ';
-    const itemsToAddToBody = [
-      '<noscript>Please enable JavaScript to continue using this application.</noscript>',
-    ];
+    let needsNoScript = true;
+    rewriter.on('startTag', (startTag: { tagName: string }) => {
+      if (startTag.tagName === 'noscript') {
+        needsNoScript = false;
+      }
 
-    const updatedIndex = [
-      ...lines.slice(0, closingHeadTagLineIndex),
-      ...itemsToAddToHead.map(line => headIndent + line),
-      ...lines.slice(closingHeadTagLineIndex, closingBodyTagLineIndex),
-      ...itemsToAddToBody.map(line => bodyIndent + line),
-      ...lines.slice(closingBodyTagLineIndex),
-    ].join('\n');
+      rewriter.emitStartTag(startTag);
+    });
 
-    host.overwrite(path, updatedIndex);
+    rewriter.on('endTag', (endTag: { tagName: string }) => {
+      if (endTag.tagName === 'head') {
+        rewriter.emitRaw('  <link rel="manifest" href="manifest.json">\n');
+        rewriter.emitRaw('  <meta name="theme-color" content="#1976d2">\n');
+      } else if (endTag.tagName === 'body' && needsNoScript) {
+        rewriter.emitRaw(
+          '  <noscript>Please enable JavaScript to continue using this application.</noscript>\n',
+        );
+      }
 
-    return host;
+      rewriter.emitEndTag(endTag);
+    });
+
+    return new Observable<Tree>(obs => {
+      const input = new Readable({
+        encoding: 'utf8',
+        read(): void {
+          this.push(buffer);
+          this.push(null);
+        },
+      });
+
+      const chunks: Array<Buffer> = [];
+      const output = new Writable({
+        write(chunk: string | Buffer, encoding: string, callback: Function): void {
+          chunks.push(typeof chunk === 'string' ? Buffer.from(chunk, encoding) : chunk);
+          callback();
+        },
+        final(callback: (error?: Error) => void): void {
+          const full = Buffer.concat(chunks);
+          host.overwrite(path, full.toString());
+          callback();
+          obs.next(host);
+          obs.complete();
+        },
+      });
+
+      input.pipe(rewriter).pipe(output);
+    });
   };
 }
 
-function addManifestToAssetsConfig(options: PwaOptions) {
+export default function (options: PwaOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
+    if (!options.title) {
+      options.title = options.project;
+    }
+    const {path: workspacePath, workspace } = getWorkspace(host);
 
-    const workspacePath = getWorkspacePath(host);
-    const workspace = getWorkspace(host);
-    const project = workspace.projects[options.project as string];
+    if (!options.project) {
+      throw new SchematicsException('Option "project" is required.');
+    }
 
+    const project = workspace.projects[options.project];
     if (!project) {
-      throw new Error(`Project is not defined in this workspace.`);
+      throw new SchematicsException(`Project is not defined in this workspace.`);
     }
 
-    const assetEntry = join(normalize(project.root), 'src', 'manifest.json');
+    if (project.projectType !== 'application') {
+      throw new SchematicsException(`PWA requires a project type of "application".`);
+    }
 
+    // Find all the relevant targets for the project
     const projectTargets = project.targets || project.architect;
-    if (!projectTargets) {
-      throw new Error(`Targets are not defined for this project.`);
+    if (!projectTargets || Object.keys(projectTargets).length === 0) {
+      throw new SchematicsException(`Targets are not defined for this project.`);
     }
 
-    ['build', 'test'].forEach((target) => {
-
-      const applyTo = projectTargets[target].options;
-      const assets = applyTo.assets || (applyTo.assets = []);
-
-      assets.push(assetEntry);
+    const buildTargets = [];
+    const testTargets = [];
+    for (const targetName in projectTargets) {
+      const target = projectTargets[targetName];
+      if (!target) {
+        continue;
+      }
 
-    });
+      if (target.builder === '@angular-devkit/build-angular:browser') {
+        buildTargets.push(target);
+      } else if (target.builder === '@angular-devkit/build-angular:karma') {
+        testTargets.push(target);
+      }
+    }
 
+    // Add manifest to asset configuration
+    const assetEntry = join(normalize(project.root), 'src', 'manifest.json');
+    for (const target of [...buildTargets, ...testTargets]) {
+      if (target.options) {
+        if (target.options.assets) {
+          target.options.assets.push(assetEntry);
+        } else {
+          target.options.assets = [ assetEntry ];
+        }
+      } else {
+        target.options = { assets: [ assetEntry ] };
+      }
+    }
     host.overwrite(workspacePath, JSON.stringify(workspace, null, 2));
 
-    return host;
-  };
-}
+    // Find all index.html files in build targets
+    const indexFiles = new Set<string>();
+    for (const target of buildTargets) {
+      if (target.options && target.options.index) {
+        indexFiles.add(target.options.index);
+      }
 
-export default function (options: PwaOptions): Rule {
-  return (host: Tree, context: SchematicContext) => {
-    const workspace = getWorkspace(host);
-    if (!options.project) {
-      throw new SchematicsException('Option "project" is required.');
-    }
-    const project = workspace.projects[options.project];
-    if (project.projectType !== 'application') {
-      throw new SchematicsException(`PWA requires a project type of "application".`);
+      if (!target.configurations) {
+        continue;
+      }
+      for (const configName in target.configurations) {
+        const configuration = target.configurations[configName];
+        if (configuration && configuration.index) {
+          indexFiles.add(configuration.index);
+        }
+      }
     }
 
-    const sourcePath = join(project.root as Path, 'src');
+    // Setup sources for the assets files to add to the project
+    const sourcePath = join(normalize(project.root), 'src');
     const assetsPath = join(sourcePath, 'assets');
-
-    options.title = options.title || options.project;
-
     const rootTemplateSource = apply(url('./files/root'), [
       template({ ...options }),
-      move(sourcePath),
+      move(getSystemPath(sourcePath)),
     ]);
     const assetsTemplateSource = apply(url('./files/assets'), [
       template({ ...options }),
-      move(assetsPath),
+      move(getSystemPath(assetsPath)),
     ]);
 
+    // Setup service worker schematic options
+    const swOptions = { ...options };
+    delete swOptions.title;
+
+    // Chain the rules and return
     return chain([
-      addServiceWorker(options),
+      externalSchematic('@schematics/angular', 'service-worker', swOptions),
       mergeWith(rootTemplateSource),
       mergeWith(assetsTemplateSource),
-      updateIndexFile(options),
-      addManifestToAssetsConfig(options),
+      ...[...indexFiles].map(path => updateIndexFile(path)),
     ])(host, context);
   };
 }
diff --git a/packages/angular/pwa/pwa/index_spec.ts b/packages/angular/pwa/pwa/index_spec.ts
index c7a7dda07933..b607a797c8a5 100644
--- a/packages/angular/pwa/pwa/index_spec.ts
+++ b/packages/angular/pwa/pwa/index_spec.ts
@@ -47,63 +47,96 @@ describe('PWA Schematic', () => {
     appTree = schematicRunner.runExternalSchematic('@schematics/angular', 'application', appOptions, appTree);
   });
 
-  it('should run the service worker schematic', () => {
-    const tree = schematicRunner.runSchematic('ng-add', defaultOptions, appTree);
-    const configText = tree.readContent('/angular.json');
-    const config = JSON.parse(configText);
-    const swFlag = config.projects.bar.targets.build.configurations.production.serviceWorker;
-    expect(swFlag).toEqual(true);
+  it('should run the service worker schematic', (done) => {
+    schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise().then(tree => {
+      const configText = tree.readContent('/angular.json');
+      const config = JSON.parse(configText);
+      const swFlag = config.projects.bar.targets.build.configurations.production.serviceWorker;
+      expect(swFlag).toEqual(true);
+      done();
+    }, done.fail);
   });
 
-  it('should create icon files', () => {
+  it('should create icon files', (done) => {
     const dimensions = [72, 96, 128, 144, 152, 192, 384, 512];
     const iconPath = '/projects/bar/src/assets/icons/icon-';
-    const tree = schematicRunner.runSchematic('ng-add', defaultOptions, appTree);
-    dimensions.forEach(d => {
-      const path = `${iconPath}${d}x${d}.png`;
-      expect(tree.exists(path)).toEqual(true);
-    });
+    schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise().then(tree => {
+      dimensions.forEach(d => {
+        const path = `${iconPath}${d}x${d}.png`;
+        expect(tree.exists(path)).toEqual(true);
+      });
+      done();
+    }, done.fail);
   });
 
-  it('should create a manifest file', () => {
-    const tree = schematicRunner.runSchematic('ng-add', defaultOptions, appTree);
-    expect(tree.exists('/projects/bar/src/manifest.json')).toEqual(true);
+  it('should create a manifest file', (done) => {
+    schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise().then(tree => {
+      expect(tree.exists('/projects/bar/src/manifest.json')).toEqual(true);
+      done();
+    }, done.fail);
   });
 
-  it('should set the name & short_name in the manifest file', () => {
-    const tree = schematicRunner.runSchematic('ng-add', defaultOptions, appTree);
-    const manifestText = tree.readContent('/projects/bar/src/manifest.json');
-    const manifest = JSON.parse(manifestText);
-    expect(manifest.name).toEqual(defaultOptions.title);
-    expect(manifest.short_name).toEqual(defaultOptions.title);
+  it('should set the name & short_name in the manifest file', (done) => {
+    schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise().then(tree => {
+      const manifestText = tree.readContent('/projects/bar/src/manifest.json');
+      const manifest = JSON.parse(manifestText);
+
+      expect(manifest.name).toEqual(defaultOptions.title);
+      expect(manifest.short_name).toEqual(defaultOptions.title);
+      done();
+    }, done.fail);
   });
 
-  it('should set the name & short_name in the manifest file when no title provided', () => {
+  it('should set the name & short_name in the manifest file when no title provided', (done) => {
     const options = {...defaultOptions, title: undefined};
-    const tree = schematicRunner.runSchematic('ng-add', options, appTree);
-    const manifestText = tree.readContent('/projects/bar/src/manifest.json');
-    const manifest = JSON.parse(manifestText);
-    expect(manifest.name).toEqual(defaultOptions.project);
-    expect(manifest.short_name).toEqual(defaultOptions.project);
+    schematicRunner.runSchematicAsync('ng-add', options, appTree).toPromise().then(tree => {
+      const manifestText = tree.readContent('/projects/bar/src/manifest.json');
+      const manifest = JSON.parse(manifestText);
+
+      expect(manifest.name).toEqual(defaultOptions.project);
+      expect(manifest.short_name).toEqual(defaultOptions.project);
+      done();
+    }, done.fail);
+  });
+
+  it('should update the index file', (done) => {
+    schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise().then(tree => {
+      const content = tree.readContent('projects/bar/src/index.html');
+
+      expect(content).toMatch(/<link rel="manifest" href="manifest.json">/);
+      expect(content).toMatch(/<meta name="theme-color" content="#1976d2">/);
+      expect(content)
+        .toMatch(/<noscript>Please enable JavaScript to continue using this application.<\/noscript>/);
+      done();
+    }, done.fail);
   });
 
-  it('should update the index file', () => {
-    const tree = schematicRunner.runSchematic('ng-add', defaultOptions, appTree);
-    const content = tree.readContent('projects/bar/src/index.html');
+  it('should not add noscript element to the index file if already present', (done) => {
+    let index = appTree.readContent('projects/bar/src/index.html');
+    index = index.replace('</body>', '<noscript>NO JAVASCRIPT</noscript></body>');
+    appTree.overwrite('projects/bar/src/index.html', index);
+    schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise().then(tree => {
+      const content = tree.readContent('projects/bar/src/index.html');
 
-    expect(content).toMatch(/<link rel="manifest" href="manifest.json">/);
-    expect(content).toMatch(/<meta name="theme-color" content="#1976d2">/);
-    expect(content)
-      .toMatch(/<noscript>Please enable JavaScript to continue using this application.<\/noscript>/);
+      expect(content).toMatch(/<link rel="manifest" href="manifest.json">/);
+      expect(content).toMatch(/<meta name="theme-color" content="#1976d2">/);
+      expect(content).not
+        .toMatch(/<noscript>Please enable JavaScript to continue using this application.<\/noscript>/);
+      expect(content).toMatch(/<noscript>NO JAVASCRIPT<\/noscript>/);
+      done();
+    }, done.fail);
   });
 
-  it('should update the build and test assets configuration', () => {
-    const tree = schematicRunner.runSchematic('ng-add', defaultOptions, appTree);
-    const configText = tree.readContent('/angular.json');
-    const config = JSON.parse(configText);
-    const targets = config.projects.bar.targets;
-    ['build', 'test'].forEach((target) => {
-      expect(targets[target].options.assets).toContain('projects/bar/src/manifest.json');
-    });
+  it('should update the build and test assets configuration', (done) => {
+    schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise().then(tree => {
+      const configText = tree.readContent('/angular.json');
+      const config = JSON.parse(configText);
+      const targets = config.projects.bar.targets;
+
+      ['build', 'test'].forEach((target) => {
+        expect(targets[target].options.assets).toContain('projects/bar/src/manifest.json');
+      });
+      done();
+    }, done.fail);
   });
 });
diff --git a/packages/angular/pwa/utility/config.ts b/packages/angular/pwa/utility/config.ts
deleted file mode 100644
index 0eaf8ab232de..000000000000
--- a/packages/angular/pwa/utility/config.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { JsonParseMode, experimental, parseJson } from '@angular-devkit/core';
-import { SchematicsException, Tree } from '@angular-devkit/schematics';
-
-
-export type WorkspaceSchema = experimental.workspace.WorkspaceSchema;
-
-export function getWorkspacePath(host: Tree): string {
-  const possibleFiles = [ '/angular.json', '/.angular.json' ];
-  const path = possibleFiles.filter(path => host.exists(path))[0];
-
-  return path;
-}
-
-export function getWorkspace(host: Tree): WorkspaceSchema {
-  const path = getWorkspacePath(host);
-  const configBuffer = host.read(path);
-  if (configBuffer === null) {
-    throw new SchematicsException(`Could not find (${path})`);
-  }
-  const content = configBuffer.toString();
-
-  return parseJson(content, JsonParseMode.Loose) as {} as WorkspaceSchema;
-}
diff --git a/yarn.lock b/yarn.lock
index 20e684a651b0..5c7d750d3c20 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5552,6 +5552,19 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
+parse5-html-rewriting-stream@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-5.1.0.tgz#63f92c958764aea8cbe3aa68f2e5895c32068ab8"
+  dependencies:
+    parse5 "^5.1.0"
+    parse5-sax-parser "^5.1.0"
+
+parse5-sax-parser@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/parse5-sax-parser/-/parse5-sax-parser-5.1.0.tgz#ec234d23223a8054a74ff173aa3dc2da74c5bbd9"
+  dependencies:
+    parse5 "^5.1.0"
+
 parse5@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
@@ -5560,6 +5573,10 @@ parse5@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.0.0.tgz#4d02710d44f3c3846197a11e205d4ef17842b81a"
 
+parse5@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2"
+
 parseqs@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"

From 5feb1faa3787a0520da7217977d5b59a14d315aa Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Thu, 6 Sep 2018 14:20:53 -0700
Subject: [PATCH 0070/1703] Update release.md

add note about `latest-versions.ts`
---
 docs/process/release.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/process/release.md b/docs/process/release.md
index 6ae887075057..ae7a3c0ca00e 100644
--- a/docs/process/release.md
+++ b/docs/process/release.md
@@ -41,6 +41,12 @@ Only the first 2 commits should be cherry picked to the patch branch, as the las
 
 # Release
 
+## Before releasing
+
+Make sure the CI is green.
+
+Consider if you need to update `packages/schematics/angular/utility/latest-versions.ts` to reflect changes in dependent versions.
+
 ## Shepparding
 
 As commits are cherry-picked when PRs are merged, creating the release should be a matter of updating the version

From 351359b2ff33385097055507a251635024da1067 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Thu, 6 Sep 2018 14:24:14 -0700
Subject: [PATCH 0071/1703] release: v7.0.0-beta.0

---
 .monorepo.json | 68 +++++++++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index 6a3d96820dff..88c19f99eefa 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,12 +42,12 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.8.0-rc.0",
-      "hash": "a9b1f213a4069f789d20021bda616775"
+      "version": "0.9.0-beta.0",
+      "hash": "2bee2bd5743e4b92e00d80e814e1e198"
     },
     "devkit": {
-      "version": "0.8.0-rc.0",
-      "hash": "5f2b302aa3a1b3f9b6a54a90519f85a0"
+      "version": "0.9.0-beta.0",
+      "hash": "1f7af275fae67185a97f5ca31b1754ae"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -58,15 +58,15 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md"
         }
       ],
-      "version": "6.2.0-rc.0",
+      "version": "7.0.0-beta.0",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "1418f5d7aa4bde2b7c9339f25087de06"
+      "hash": "0284d053cd0ac80fc04216e201e5251b"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.8.0-rc.0",
-      "hash": "b37d506c657d48379099ccbeeba54da9",
+      "version": "0.9.0-beta.0",
+      "hash": "5cff9c1c4a7f82c4bec6d0a2b3db9800",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -77,14 +77,14 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.8.0-rc.0",
-      "hash": "64fb30a21ddc98f26b89ffd1dbf828d7",
+      "version": "0.9.0-beta.0",
+      "hash": "17bb40bcdc83490f43ac835ed3b16fe8",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.8.0-rc.0",
-      "hash": "9d2161b7ca9044c2286c7d66e10ead12",
+      "version": "0.9.0-beta.0",
+      "hash": "7e3b6806dae498141600a835c9e52d91",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/build-optimizer": {
@@ -95,8 +95,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.8.0-rc.0",
-      "hash": "556f1e60c2d5d0ad09ef2e56705e6e4f",
+      "version": "0.9.0-beta.0",
+      "hash": "531cd0937497ad5fcaedf1fd2175465f",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -107,8 +107,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.8.0-rc.0",
-      "hash": "ac2b1791f5e03267681a444d0a919a26",
+      "version": "0.9.0-beta.0",
+      "hash": "0559661e540bbd917720dd581ca19f25",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -119,8 +119,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.8.0-rc.0",
-      "hash": "4bdacedd086a72f496b737623a47f470",
+      "version": "0.9.0-beta.0",
+      "hash": "53ab9746e05ee7ca57db38c7e5571eec",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -131,9 +131,9 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.8.0-rc.0",
+      "version": "0.9.0-beta.0",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "dc4e1b6d135bc9c394169c15cc4902e3"
+      "hash": "576dbb23db07aac3cbf4c2e40da746e9"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -143,8 +143,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "0.8.0-rc.0",
-      "hash": "0d21af770ad0a24cba535cc296995b7d",
+      "version": "0.9.0-beta.0",
+      "hash": "7f090e542ae57d9f7069cd0ccaf1d27d",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -155,43 +155,43 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "0.8.0-rc.0",
-      "hash": "a10bf52f075cc93c8d28d187dcce788d",
+      "version": "0.9.0-beta.0",
+      "hash": "54c94050ef476f686d548f05d25a57f9",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.8.0-rc.0",
-      "hash": "f1ee4ce02cf395e6ef6888fa93ef9d50",
+      "version": "0.9.0-beta.0",
+      "hash": "51ab0c11759306e22e0a43f870067a01",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "6.2.0-rc.0",
+      "version": "7.0.0-beta.0",
       "section": "Misc",
-      "hash": "9ac09fecd47a8602820ae5abb94ddac9",
+      "hash": "a4b8628ddd7938c846c6eb077cbaad60",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "0.8.0-rc.0",
-      "hash": "acf5e21cf8dc3d69ab9333480d2007f3",
+      "version": "0.9.0-beta.0",
+      "hash": "56f9c70451a4bd3b3d573c0857a757ee",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.8.0-rc.0",
+      "version": "0.9.0-beta.0",
       "section": "Schematics",
-      "hash": "45b6ce378bceb13a53b67e2cfbfcb5ab",
+      "hash": "e344bbc6db1dd7845fb4355c82c58774",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.8.0-rc.0",
+      "version": "0.9.0-beta.0",
       "section": "Schematics",
-      "hash": "e29b2069a90870776b29050bedb9475a",
+      "hash": "8329b0344b4dcd2904c7bb70fb7ea385",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }

From 7421d63d4ae51bd3862df55c830d4c00874671ad Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Thu, 6 Sep 2018 14:31:53 -0700
Subject: [PATCH 0072/1703] release: v7.0.0-beta.1

---
 .monorepo.json                                | 42 +++++++++----------
 .../angular/utility/latest-versions.ts        | 10 ++---
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index 88c19f99eefa..6c96ff16842e 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,11 +42,11 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.9.0-beta.0",
+      "version": "0.9.0-beta.1",
       "hash": "2bee2bd5743e4b92e00d80e814e1e198"
     },
     "devkit": {
-      "version": "0.9.0-beta.0",
+      "version": "0.9.0-beta.1",
       "hash": "1f7af275fae67185a97f5ca31b1754ae"
     },
     "@angular/cli": {
@@ -58,15 +58,15 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md"
         }
       ],
-      "version": "7.0.0-beta.0",
+      "version": "7.0.0-beta.1",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "0284d053cd0ac80fc04216e201e5251b"
+      "hash": "2a1b15062a08228084acc1fdca7c7865"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.9.0-beta.0",
-      "hash": "5cff9c1c4a7f82c4bec6d0a2b3db9800",
+      "version": "0.9.0-beta.1",
+      "hash": "d57d1c1effc2e9fbce9cca802809286a",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -77,13 +77,13 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.9.0-beta.0",
+      "version": "0.9.0-beta.1",
       "hash": "17bb40bcdc83490f43ac835ed3b16fe8",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.9.0-beta.0",
+      "version": "0.9.0-beta.1",
       "hash": "7e3b6806dae498141600a835c9e52d91",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
@@ -95,7 +95,7 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.9.0-beta.0",
+      "version": "0.9.0-beta.1",
       "hash": "531cd0937497ad5fcaedf1fd2175465f",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
@@ -107,7 +107,7 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.9.0-beta.0",
+      "version": "0.9.0-beta.1",
       "hash": "0559661e540bbd917720dd581ca19f25",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
@@ -119,8 +119,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.9.0-beta.0",
-      "hash": "53ab9746e05ee7ca57db38c7e5571eec",
+      "version": "0.9.0-beta.1",
+      "hash": "02d81b2a4c59207e6cdadafc8d787226",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -131,7 +131,7 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.9.0-beta.0",
+      "version": "0.9.0-beta.1",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
       "hash": "576dbb23db07aac3cbf4c2e40da746e9"
     },
@@ -143,7 +143,7 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "0.9.0-beta.0",
+      "version": "0.9.0-beta.1",
       "hash": "7f090e542ae57d9f7069cd0ccaf1d27d",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
@@ -155,20 +155,20 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "0.9.0-beta.0",
+      "version": "0.9.0-beta.1",
       "hash": "54c94050ef476f686d548f05d25a57f9",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.9.0-beta.0",
+      "version": "0.9.0-beta.1",
       "hash": "51ab0c11759306e22e0a43f870067a01",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "7.0.0-beta.0",
+      "version": "7.0.0-beta.1",
       "section": "Misc",
       "hash": "a4b8628ddd7938c846c6eb077cbaad60",
       "snapshotRepo": "angular/ngtools-webpack-builds"
@@ -176,20 +176,20 @@
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "0.9.0-beta.0",
-      "hash": "56f9c70451a4bd3b3d573c0857a757ee",
+      "version": "0.9.0-beta.1",
+      "hash": "4ad1f38d64eefcce42f02eb0d581f51e",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.9.0-beta.0",
+      "version": "0.9.0-beta.1",
       "section": "Schematics",
       "hash": "e344bbc6db1dd7845fb4355c82c58774",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.9.0-beta.0",
+      "version": "0.9.0-beta.1",
       "section": "Schematics",
       "hash": "8329b0344b4dcd2904c7bb70fb7ea385",
       "snapshotRepo": "angular/schematics-update-builds"
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index ed46b138584e..9338df413063 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -8,11 +8,11 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '^6.1.0',
-  RxJs: '~6.2.0',
+  Angular: '~7.0.0-beta.0',
+  RxJs: '~6.3.0',
   ZoneJs: '~0.8.26',
-  TypeScript: '~2.9.2',
+  TypeScript: '~3.0.1',
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.8.0-rc.0',
-  DevkitBuildNgPackagr: '~0.8.0-rc.0',
+  DevkitBuildAngular: '~0.9.0-beta.1',
+  DevkitBuildNgPackagr: '~0.9.0-beta.1',
 };

From f7f1d139f4eda6652a44f34cb682af4966159e63 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Thu, 6 Sep 2018 14:47:26 -0700
Subject: [PATCH 0073/1703] release: v7.0.0-beta.2

---
 .monorepo.json                                | 64 +++++++++----------
 .../core/src/json/schema/registry.ts          |  4 +-
 2 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index 6c96ff16842e..d9c426f5a664 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,12 +42,12 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.9.0-beta.1",
+      "version": "0.9.0-beta.2",
       "hash": "2bee2bd5743e4b92e00d80e814e1e198"
     },
     "devkit": {
-      "version": "0.9.0-beta.1",
-      "hash": "1f7af275fae67185a97f5ca31b1754ae"
+      "version": "0.9.0-beta.2",
+      "hash": "5ff7e89a837821d8a27bbbb9589ce99a"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -58,15 +58,15 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md"
         }
       ],
-      "version": "7.0.0-beta.1",
+      "version": "7.0.0-beta.2",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "2a1b15062a08228084acc1fdca7c7865"
+      "hash": "1942efc3e4abd875a42a98e339a71f8e"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.9.0-beta.1",
-      "hash": "d57d1c1effc2e9fbce9cca802809286a",
+      "version": "0.9.0-beta.2",
+      "hash": "ebfe0eb9f64de6febfc057e218a3bcc7",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -77,14 +77,14 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.9.0-beta.1",
-      "hash": "17bb40bcdc83490f43ac835ed3b16fe8",
+      "version": "0.9.0-beta.2",
+      "hash": "1a23735009c97548867a15d5109f848b",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.9.0-beta.1",
-      "hash": "7e3b6806dae498141600a835c9e52d91",
+      "version": "0.9.0-beta.2",
+      "hash": "51b6cc55b25fce87f6a92f0d0942f79c",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/build-optimizer": {
@@ -95,7 +95,7 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.9.0-beta.1",
+      "version": "0.9.0-beta.2",
       "hash": "531cd0937497ad5fcaedf1fd2175465f",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
@@ -107,8 +107,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.9.0-beta.1",
-      "hash": "0559661e540bbd917720dd581ca19f25",
+      "version": "0.9.0-beta.2",
+      "hash": "b5da16fb03baf13afb924f93aed2b049",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -119,8 +119,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.9.0-beta.1",
-      "hash": "02d81b2a4c59207e6cdadafc8d787226",
+      "version": "0.9.0-beta.2",
+      "hash": "8fbc4c9495470a558d04d607e7859e83",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -131,9 +131,9 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.9.0-beta.1",
+      "version": "0.9.0-beta.2",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "576dbb23db07aac3cbf4c2e40da746e9"
+      "hash": "1396832d856d84c4e89f93583765508b"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -143,8 +143,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "0.9.0-beta.1",
-      "hash": "7f090e542ae57d9f7069cd0ccaf1d27d",
+      "version": "0.9.0-beta.2",
+      "hash": "67cdb97ba6bd67291c67c0d6842b493f",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -155,43 +155,43 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "0.9.0-beta.1",
-      "hash": "54c94050ef476f686d548f05d25a57f9",
+      "version": "0.9.0-beta.2",
+      "hash": "bf74e6db102a901cae9d97dfd1d77ac1",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.9.0-beta.1",
-      "hash": "51ab0c11759306e22e0a43f870067a01",
+      "version": "0.9.0-beta.2",
+      "hash": "9d56dfa44e57d77091d27e647fc09811",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "7.0.0-beta.1",
+      "version": "7.0.0-beta.2",
       "section": "Misc",
-      "hash": "a4b8628ddd7938c846c6eb077cbaad60",
+      "hash": "c61a6900616048aad366f3381937bdd5",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "0.9.0-beta.1",
-      "hash": "4ad1f38d64eefcce42f02eb0d581f51e",
+      "version": "0.9.0-beta.2",
+      "hash": "d1cb9eb0d44cd9b52763abebf47c5913",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.9.0-beta.1",
+      "version": "0.9.0-beta.2",
       "section": "Schematics",
-      "hash": "e344bbc6db1dd7845fb4355c82c58774",
+      "hash": "379aecd327b0c60b2751d7da0d0c1804",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.9.0-beta.1",
+      "version": "0.9.0-beta.2",
       "section": "Schematics",
-      "hash": "8329b0344b4dcd2904c7bb70fb7ea385",
+      "hash": "badd6485b01883442e709560f28f7ddf",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }
diff --git a/packages/angular_devkit/core/src/json/schema/registry.ts b/packages/angular_devkit/core/src/json/schema/registry.ts
index 785af9a7a7ac..33510bcdaa61 100644
--- a/packages/angular_devkit/core/src/json/schema/registry.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry.ts
@@ -500,9 +500,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
       valid: true,
       compile: (schema, parentSchema: JsonObject, it) => {
         const compilationSchemInfo = this._currentCompilationSchemaInfo;
-        if (compilationSchemInfo === undefined) {
-          throw new Error('Invalid JSON schema compilation state');
-        } else if (compilationSchemInfo === null) {
+        if (!compilationSchemInfo) {
           return () => true;
         }
 

From a1ea3a05d40a59ca671c6631eae8de157206ef7d Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 4 Sep 2018 22:00:52 -0400
Subject: [PATCH 0074/1703] fix(@angular-devkit/build-optimizer): remove
 deprecated purify plugin

---
 .../angular_devkit/build_optimizer/README.md  | 20 +----
 .../build_optimizer/package.json              |  3 +-
 .../build_optimizer/src/index.ts              |  3 -
 .../build_optimizer/src/purify/cli.ts         | 40 ----------
 .../build_optimizer/src/purify/purify.ts      | 73 -------------------
 .../build_optimizer/src/purify/purify_spec.ts | 65 -----------------
 .../src/purify/webpack-plugin.ts              | 45 ------------
 7 files changed, 3 insertions(+), 246 deletions(-)
 delete mode 100644 packages/angular_devkit/build_optimizer/src/purify/cli.ts
 delete mode 100644 packages/angular_devkit/build_optimizer/src/purify/purify.ts
 delete mode 100644 packages/angular_devkit/build_optimizer/src/purify/purify_spec.ts
 delete mode 100644 packages/angular_devkit/build_optimizer/src/purify/webpack-plugin.ts

diff --git a/packages/angular_devkit/build_optimizer/README.md b/packages/angular_devkit/build_optimizer/README.md
index c1bcaab8d610..ad15925c6a94 100644
--- a/packages/angular_devkit/build_optimizer/README.md
+++ b/packages/angular_devkit/build_optimizer/README.md
@@ -10,8 +10,6 @@ Transformations applied depend on file content:
 - [Class fold](#class-fold), [Scrub file](#scrub-file) and [Prefix functions](#prefix-functions): applied to Angular apps and libraries.
 - [Import tslib](#import-tslib): applied when TypeScript helpers are found.
 
-Non-transform optimizations are applied via the [Purify Plugin](#purify-plugin).
-
 Some of these optimizations add `/*@__PURE__*/` comments.
 These are used by [UglifyJS](https://github.com/mishoo/UglifyJS2) to identify pure functions that can potentially be dropped.
 
@@ -85,7 +83,6 @@ var ComponentClazz = (function () {
 ### Prefix functions
 
 Adds `/*@__PURE__*/` comments to top level downleveled class declarations and instantiation.
-Webpack library imports are also marked as `/*@__PURE__*/` when used with [Purify Plugin](#purify-plugin).
 
 Warning: this transform assumes the file is a pure module. It should not be used with unpure modules.
 
@@ -165,12 +162,6 @@ var ChangeDetectionStrategy = /*@__PURE__*/ (function () {
 ```
 
 
-### Purify Plugin
-
-Performs regex based replacements on all bundles that add `/*@__PURE__*/` comments to
-known pure webpack imports (used with [Prefix functions](#prefix-functions)).
-
-
 ## Library Usage
 
 ```typescript
@@ -192,11 +183,9 @@ export interface BuildOptimizerOptions {
 ```
 
 
-## Webpack loader and plugin usage:
+## Webpack loader usage:
 
 ```typescript
-const PurifyPlugin = require('@angular-devkit/build-optimizer').PurifyPlugin;
-
 module.exports = {
   module: {
     rules: [
@@ -208,10 +197,7 @@ module.exports = {
         }
       }
     ]
-  },
-  plugins: [
-    new PurifyPlugin()
-  ]
+  }
 }
 ```
 
@@ -221,6 +207,4 @@ module.exports = {
 ```bash
 build-optimizer input.js
 build-optimizer input.js output.js
-purify input.js
-purify input.js output.js
 ```
diff --git a/packages/angular_devkit/build_optimizer/package.json b/packages/angular_devkit/build_optimizer/package.json
index 461f626380f7..b0a54ea3a1e9 100644
--- a/packages/angular_devkit/build_optimizer/package.json
+++ b/packages/angular_devkit/build_optimizer/package.json
@@ -5,8 +5,7 @@
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "bin": {
-    "build-optimizer": "./src/build-optimizer/cli.js",
-    "purify": "./src/purify/cli.js"
+    "build-optimizer": "./src/build-optimizer/cli.js"
   },
   "dependencies": {
     "loader-utils": "^1.1.0",
diff --git a/packages/angular_devkit/build_optimizer/src/index.ts b/packages/angular_devkit/build_optimizer/src/index.ts
index 191247f747ef..4b4f9afc0525 100644
--- a/packages/angular_devkit/build_optimizer/src/index.ts
+++ b/packages/angular_devkit/build_optimizer/src/index.ts
@@ -8,9 +8,6 @@
 export { default as buildOptimizerLoader } from './build-optimizer/webpack-loader';
 export { buildOptimizer } from './build-optimizer/build-optimizer';
 
-export { PurifyPlugin } from './purify/webpack-plugin';
-export { purify } from './purify/purify';
-
 export { transformJavascript } from './helpers/transform-javascript';
 
 export { getFoldFileTransformer } from './transforms/class-fold';
diff --git a/packages/angular_devkit/build_optimizer/src/purify/cli.ts b/packages/angular_devkit/build_optimizer/src/purify/cli.ts
deleted file mode 100644
index 5c82c0344ecb..000000000000
--- a/packages/angular_devkit/build_optimizer/src/purify/cli.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env node
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { readFileSync, writeFileSync } from 'fs';
-import { join } from 'path';
-import { purify } from './purify';
-
-console.warn('purify is deprecated and will be removed in 0.7.0.');
-
-if (process.argv.length < 3 || process.argv.length > 4) {
-  throw new Error(`
-    purify should be called with either one or two arguments:
-
-      purify input.js
-      purify input.js output.js
-  `);
-}
-
-const currentDir = process.cwd();
-
-const inputFile = process.argv[2];
-const tsOrJsRegExp = /\.(j|t)s$/;
-
-if (!inputFile.match(tsOrJsRegExp)) {
-  throw new Error(`Input file must be .js or .ts.`);
-}
-
-// Use provided output file, or add the .purify suffix before the extension.
-const outputFile = process.argv[3]
-  || inputFile.replace(tsOrJsRegExp, (subStr) => `.purify${subStr}`);
-
-const purifyOutput = purify(readFileSync(join(currentDir, inputFile), 'UTF-8'));
-
-writeFileSync(join(currentDir, outputFile), purifyOutput);
-console.log(`Emitted: ${outputFile}`);
diff --git a/packages/angular_devkit/build_optimizer/src/purify/purify.ts b/packages/angular_devkit/build_optimizer/src/purify/purify.ts
deleted file mode 100644
index 9f0e251847b0..000000000000
--- a/packages/angular_devkit/build_optimizer/src/purify/purify.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { RawSource, ReplaceSource } from 'webpack-sources';
-
-
-// This matches a comment left by the build-optimizer that contains pure import paths
-const importCommentRegex = /\/\*\* PURE_IMPORTS_START (\S+) PURE_IMPORTS_END \*\//mg;
-
-// Insertion are meant to be used with Webpack's ReplaceSource.
-export interface Insert {
-  pos: number;
-  content: string;
-}
-
-export function purifyReplacements(content: string) {
-
-  const pureImportMatches = getMatches(content, importCommentRegex, 1)
-    // Remove dots at the start of matches.
-    // Older versions of Purify added dots for relative imports.
-    .map(match => match.replace(/^\.+/, ''))
-    .join('|');
-
-  if (!pureImportMatches) {
-    return [];
-  }
-
-  const inserts: Insert[] = [];
-
-  /* Prefix safe imports with pure */
-  const regex = new RegExp(
-    `(_(${pureImportMatches})__(_default)? = )(__webpack_require__(\\.\\w)?\\(\\S+\\);)`,
-    'mg',
-  );
-
-  let match;
-  // tslint:disable-next-line:no-conditional-assignment
-  while (match = regex.exec(content)) {
-    inserts.push({
-      pos: match.index + match[1].length,
-      content: '/*@__PURE__*/',
-    });
-  }
-
-  return inserts;
-}
-
-export function purify(content: string) {
-  const rawSource = new RawSource(content);
-  const replaceSource = new ReplaceSource(rawSource, 'file.js');
-
-  const inserts = purifyReplacements(content);
-  inserts.forEach((insert) => {
-    replaceSource.insert(insert.pos, insert.content);
-  });
-
-  return replaceSource.source();
-}
-
-function getMatches(str: string, regex: RegExp, index: number) {
-  let matches: string[] = [];
-  let match;
-  // tslint:disable-next-line:no-conditional-assignment
-  while (match = regex.exec(str)) {
-    matches = matches.concat(match[index].split(','));
-  }
-
-  return matches;
-}
diff --git a/packages/angular_devkit/build_optimizer/src/purify/purify_spec.ts b/packages/angular_devkit/build_optimizer/src/purify/purify_spec.ts
deleted file mode 100644
index bdc214139f34..000000000000
--- a/packages/angular_devkit/build_optimizer/src/purify/purify_spec.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-// tslint:disable-next-line:no-implicit-dependencies
-import { tags } from '@angular-devkit/core';
-import { purify } from './purify';
-
-// tslint:disable:max-line-length
-describe('purify', () => {
-  it('prefixes safe imports with /*@__PURE__*/', () => {
-    const input = tags.stripIndent`
-      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_rxjs_Subject__ = __webpack_require__("EEr4");
-      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_http__ = __webpack_require__(72);
-      /** PURE_IMPORTS_START rxjs_Subject,_angular_http PURE_IMPORTS_END */
-    `;
-    const output = tags.stripIndent`
-      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_rxjs_Subject__ = /*@__PURE__*/__webpack_require__("EEr4");
-      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__angular_http__ = /*@__PURE__*/__webpack_require__(72);
-      /** PURE_IMPORTS_START rxjs_Subject,_angular_http PURE_IMPORTS_END */
-    `;
-
-    expect(tags.oneLine`${purify(input)}`).toEqual(tags.oneLine`${output}`);
-  });
-
-  it('prefixes safe default imports with /*@__PURE__*/', () => {
-    const input = tags.stripIndent`
-      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_rxjs_Subject__ = __webpack_require__("rlar");
-      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_rxjs_Subject___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4_rxjs_Subject__);
-      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_zone_js___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_zone_js__);
-      /** PURE_IMPORTS_START rxjs_Subject,zone_js PURE_IMPORTS_END */
-      `;
-    const output = tags.stripIndent`
-      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_rxjs_Subject__ = /*@__PURE__*/__webpack_require__("rlar");
-      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_rxjs_Subject___default = /*@__PURE__*/__webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4_rxjs_Subject__);
-      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_zone_js___default = /*@__PURE__*/__webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_zone_js__);
-      /** PURE_IMPORTS_START rxjs_Subject,zone_js PURE_IMPORTS_END */
-      `;
-
-    expect(tags.oneLine`${purify(input)}`).toEqual(tags.oneLine`${output}`);
-  });
-
-  // Older versions of Purify added dots for relative imports. We should be backwards compatible.
-  it('finds old matches that started with dots', () => {
-    const input = tags.stripIndent`
-      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_root__ = __webpack_require__(13);
-      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_toSubscriber__ = __webpack_require__(67);
-      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__symbol_observable__ = __webpack_require__(45);
-      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_pipe__ = __webpack_require__(71);
-      /** PURE_IMPORTS_START ._util_root,._util_toSubscriber,.._symbol_observable,._util_pipe PURE_IMPORTS_END */
-    `;
-    const output = tags.stripIndent`
-      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_root__ = /*@__PURE__*/__webpack_require__(13);
-      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_toSubscriber__ = /*@__PURE__*/__webpack_require__(67);
-      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__symbol_observable__ = /*@__PURE__*/__webpack_require__(45);
-      /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_pipe__ = /*@__PURE__*/__webpack_require__(71);
-      /** PURE_IMPORTS_START ._util_root,._util_toSubscriber,.._symbol_observable,._util_pipe PURE_IMPORTS_END */
-    `;
-
-    expect(tags.oneLine`${purify(input)}`).toEqual(tags.oneLine`${output}`);
-  });
-});
diff --git a/packages/angular_devkit/build_optimizer/src/purify/webpack-plugin.ts b/packages/angular_devkit/build_optimizer/src/purify/webpack-plugin.ts
deleted file mode 100644
index c2d13e607e00..000000000000
--- a/packages/angular_devkit/build_optimizer/src/purify/webpack-plugin.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-// tslint:disable-next-line:no-implicit-dependencies
-import { Compiler, compilation } from 'webpack';
-import { ReplaceSource } from 'webpack-sources';
-import { purifyReplacements } from './purify';
-
-
-interface Chunk {
-  files: string[];
-}
-
-export class PurifyPlugin {
-  constructor() { }
-  public apply(compiler: Compiler): void {
-    compiler.plugin('compilation', (compilation: compilation.Compilation) => {
-      // Webpack 4 provides the same functionality as this plugin and TS transformer
-      compilation.warnings.push('PurifyPlugin is deprecated and will be removed in 0.7.0.');
-
-      compilation.plugin('optimize-chunk-assets', (chunks: Chunk[], callback: () => void) => {
-        chunks.forEach((chunk: Chunk) => {
-          chunk.files
-            .filter((fileName: string) => fileName.endsWith('.js'))
-            .forEach((fileName: string) => {
-              const inserts = purifyReplacements(compilation.assets[fileName].source());
-
-              if (inserts.length > 0) {
-                const replaceSource = new ReplaceSource(compilation.assets[fileName], fileName);
-                inserts.forEach((insert) => {
-                  replaceSource.insert(insert.pos, insert.content);
-                });
-                compilation.assets[fileName] = replaceSource;
-              }
-            });
-        });
-        callback();
-      });
-    });
-  }
-}

From 74bc8e886b6d33c4749057875506fae8cfb6b8fe Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 4 Sep 2018 22:02:00 -0400
Subject: [PATCH 0075/1703] fix(@angular-devkit/build-optimizer): remove
 deprecated wrap enums check

---
 packages/angular_devkit/build_optimizer/src/index.ts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/angular_devkit/build_optimizer/src/index.ts b/packages/angular_devkit/build_optimizer/src/index.ts
index 4b4f9afc0525..1cc3bda13f17 100644
--- a/packages/angular_devkit/build_optimizer/src/index.ts
+++ b/packages/angular_devkit/build_optimizer/src/index.ts
@@ -16,10 +16,3 @@ export { getPrefixClassesTransformer, testPrefixClasses } from './transforms/pre
 export { getPrefixFunctionsTransformer } from './transforms/prefix-functions';
 export { getScrubFileTransformer, testScrubFile } from './transforms/scrub-file';
 export { getWrapEnumsTransformer } from './transforms/wrap-enums';
-
-/**
- * @deprecated since version 6.0
- */
-export function testWrapEnums(_content: string) {
-  return true;
-}

From 87db956cab0b722a7556fe96f50ea777fb9787f7 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 4 Sep 2018 22:04:52 -0400
Subject: [PATCH 0076/1703] refactor(@angular-devkit/build-optimizer): remove
 unused helper function

---
 .../build_optimizer/src/helpers/ast-utils.ts  | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/packages/angular_devkit/build_optimizer/src/helpers/ast-utils.ts b/packages/angular_devkit/build_optimizer/src/helpers/ast-utils.ts
index 071393846d36..131dfbf8d420 100644
--- a/packages/angular_devkit/build_optimizer/src/helpers/ast-utils.ts
+++ b/packages/angular_devkit/build_optimizer/src/helpers/ast-utils.ts
@@ -20,24 +20,3 @@ export function collectDeepNodes<T extends ts.Node>(node: ts.Node, kind: ts.Synt
 
   return nodes;
 }
-
-export function drilldownNodes<T extends ts.Node>(
-  startingNode: T,
-  path: { prop: keyof T, kind: ts.SyntaxKind }[],
-): T | null {
-  let currentNode: T = startingNode;
-  for (const segment of path) {
-    if (segment.prop) {
-      // ts.Node has no index signature, so we need to cast it as any.
-      const tempNode = currentNode[segment.prop];
-      if (!tempNode || typeof tempNode != 'object' || currentNode.kind !== segment.kind) {
-        return null;
-      }
-
-      // tslint:disable-next-line:no-any
-      currentNode = tempNode as any as T;
-    }
-  }
-
-  return currentNode;
-}

From b8b36ba339534732cb951ea08446087b2fae25a3 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 7 Sep 2018 08:35:50 +0200
Subject: [PATCH 0077/1703] refactor: pin down all direct dependencies

This is so that CLI users get the same direct dependency versions that were tested on the CI.
---
 packages/angular/cli/package.json             |   10 +-
 packages/angular/pwa/package.json             |    4 +-
 .../angular_devkit/architect/package.json     |    2 +-
 .../architect/test/package.json               |    2 +-
 .../angular_devkit/architect_cli/package.json |    6 +-
 .../angular_devkit/build_angular/package.json |   86 +-
 .../build_ng_packagr/package.json             |    4 +-
 .../build_optimizer/package.json              |    8 +-
 .../angular_devkit/build_webpack/package.json |    2 +-
 packages/angular_devkit/core/package.json     |   10 +-
 .../angular_devkit/schematics/package.json    |    2 +-
 .../schematics_cli/package.json               |    6 +-
 packages/ngtools/webpack/package.json         |    6 +-
 packages/schematics/angular/package.json      |    2 +-
 .../angular/utility/latest-versions.ts        |    2 +-
 packages/schematics/update/package.json       |    8 +-
 .../e2e/tests/build/rebuild-replacements.ts   |    2 +-
 yarn.lock                                     | 1420 +++++++++--------
 18 files changed, 847 insertions(+), 735 deletions(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 0c44982c52a7..565ef646f384 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -35,11 +35,11 @@
     "@angular-devkit/schematics": "0.0.0",
     "@schematics/angular": "0.0.0",
     "@schematics/update": "0.0.0",
-    "inquirer": "^6.1.0",
-    "opn": "^5.3.0",
-    "rxjs": "~6.2.0",
-    "semver": "^5.1.0",
-    "symbol-observable": "^1.2.0"
+    "inquirer": "6.2.0",
+    "opn": "5.3.0",
+    "rxjs": "6.2.2",
+    "semver": "5.5.1",
+    "symbol-observable": "1.2.0"
   },
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json"
diff --git a/packages/angular/pwa/package.json b/packages/angular/pwa/package.json
index 6ac874ec90a8..0891d2bf3c32 100644
--- a/packages/angular/pwa/package.json
+++ b/packages/angular/pwa/package.json
@@ -12,7 +12,7 @@
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
     "@schematics/angular": "0.0.0",
-    "parse5-html-rewriting-stream": "^5.1.0",
-    "rxjs": "^6.0.0"
+    "parse5-html-rewriting-stream": "5.1.0",
+    "rxjs": "6.2.2"
   }
 }
\ No newline at end of file
diff --git a/packages/angular_devkit/architect/package.json b/packages/angular_devkit/architect/package.json
index 442fdee61353..4ff19b1fdf7d 100644
--- a/packages/angular_devkit/architect/package.json
+++ b/packages/angular_devkit/architect/package.json
@@ -6,6 +6,6 @@
   "typings": "src/index.d.ts",
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "~6.2.0"
+    "rxjs": "6.2.2"
   }
 }
\ No newline at end of file
diff --git a/packages/angular_devkit/architect/test/package.json b/packages/angular_devkit/architect/test/package.json
index f433fb9a3eca..ddd3d69106d0 100644
--- a/packages/angular_devkit/architect/test/package.json
+++ b/packages/angular_devkit/architect/test/package.json
@@ -1,6 +1,6 @@
 {
   "builders": "builders.json",
   "dependencies": {
-    "rxjs": "~6.2.0"
+    "rxjs": "6.2.2"
   }
 }
diff --git a/packages/angular_devkit/architect_cli/package.json b/packages/angular_devkit/architect_cli/package.json
index 9b54a4cbd89c..10a3e56681e2 100644
--- a/packages/angular_devkit/architect_cli/package.json
+++ b/packages/angular_devkit/architect_cli/package.json
@@ -14,8 +14,8 @@
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/architect": "0.0.0",
-    "minimist": "^1.2.0",
-    "symbol-observable": "^1.2.0",
-    "rxjs": "~6.2.0"
+    "minimist": "1.2.0",
+    "symbol-observable": "1.2.0",
+    "rxjs": "6.2.2"
   }
 }
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 16c5bf4e9cb8..391338213c1c 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -11,51 +11,51 @@
     "@angular-devkit/build-webpack": "0.0.0",
     "@angular-devkit/core": "0.0.0",
     "@ngtools/webpack": "0.0.0",
-    "ajv": "~6.4.0",
-    "autoprefixer": "^8.4.1",
-    "circular-dependency-plugin": "^5.0.2",
-    "clean-css": "^4.1.11",
-    "copy-webpack-plugin": "^4.5.2",
-    "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.7.1",
-    "less-loader": "^4.1.0",
-    "license-webpack-plugin": "^1.3.1",
-    "loader-utils": "^1.1.0",
-    "mini-css-extract-plugin": "~0.4.0",
-    "minimatch": "^3.0.4",
-    "parse5": "^4.0.0",
-    "opn": "^5.1.0",
-    "portfinder": "^1.0.13",
-    "postcss": "^6.0.22",
-    "postcss-import": "^11.1.0",
-    "postcss-loader": "^2.1.5",
-    "raw-loader": "^0.5.1",
-    "rxjs": "~6.2.0",
-    "sass-loader": "^7.1.0",
-    "semver": "^5.5.0",
-    "source-map-support": "^0.5.0",
-    "source-map-loader": "^0.2.3",
-    "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",
-    "terser-webpack-plugin": "^1.0.2",
-    "url-loader": "^1.0.1",
-    "webpack": "^4.15.1",
-    "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"
+    "ajv": "6.5.3",
+    "autoprefixer": "8.4.1",
+    "circular-dependency-plugin": "5.0.2",
+    "clean-css": "4.2.1",
+    "copy-webpack-plugin": "4.5.2",
+    "file-loader": "2.0.0",
+    "glob": "7.1.3",
+    "html-webpack-plugin": "3.2.0",
+    "istanbul": "0.4.5",
+    "istanbul-instrumenter-loader": "3.0.1",
+    "karma-source-map-support": "1.3.0",
+    "less": "3.8.1",
+    "less-loader": "4.1.0",
+    "license-webpack-plugin": "1.4.0",
+    "loader-utils": "1.1.0",
+    "mini-css-extract-plugin": "0.4.2",
+    "minimatch": "3.0.4",
+    "parse5": "4.0.0",
+    "opn": "5.3.0",
+    "portfinder": "1.0.17",
+    "postcss": "6.0.23",
+    "postcss-import": "11.1.0",
+    "postcss-loader": "2.1.6",
+    "raw-loader": "0.5.1",
+    "rxjs": "6.2.2",
+    "sass-loader": "7.1.0",
+    "semver": "5.5.1",
+    "source-map-support": "0.5.9",
+    "source-map-loader": "0.2.4",
+    "stats-webpack-plugin": "0.7.0",
+    "style-loader": "0.23.0",
+    "stylus": "0.54.5",
+    "stylus-loader": "3.0.2",
+    "tree-kill": "1.2.0",
+    "terser-webpack-plugin": "1.0.2",
+    "url-loader": "1.1.1",
+    "webpack": "4.17.2",
+    "webpack-dev-middleware": "3.2.0",
+    "webpack-dev-server": "3.1.7",
+    "webpack-merge": "4.1.4",
+    "webpack-sources": "1.2.0",
+    "webpack-subresource-integrity": "1.1.0-rc.4"
   },
   "optionalDependencies": {
-    "node-sass": "^4.9.3"
+    "node-sass": "4.9.3"
   },
   "devDependencies": {
     "@angular/animations": "^7.0.0-beta.4",
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index a14b3af53761..0f46af0ff52c 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -8,8 +8,8 @@
   "dependencies": {
     "@angular-devkit/architect": "0.0.0",
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "~6.2.0",
-    "semver": "^5.3.0"
+    "rxjs": "6.2.2",
+    "semver": "5.5.1"
   },
   "peerDependencies": {
     "ng-packagr": "^2.2.0 || ^3.0.0 || ^4.0.0"
diff --git a/packages/angular_devkit/build_optimizer/package.json b/packages/angular_devkit/build_optimizer/package.json
index b0a54ea3a1e9..5c3487381dba 100644
--- a/packages/angular_devkit/build_optimizer/package.json
+++ b/packages/angular_devkit/build_optimizer/package.json
@@ -8,9 +8,9 @@
     "build-optimizer": "./src/build-optimizer/cli.js"
   },
   "dependencies": {
-    "loader-utils": "^1.1.0",
-    "source-map": "^0.5.6",
-    "typescript": "~3.0.1",
-    "webpack-sources": "^1.1.0"
+    "loader-utils": "1.1.0",
+    "source-map": "0.5.6",
+    "typescript": "3.0.1",
+    "webpack-sources": "1.2.0"
   }
 }
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index 4f4b343eae32..47600f049507 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@angular-devkit/architect": "0.0.0",
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "~6.2.0"
+    "rxjs": "6.2.2"
   },
   "peerDependencies": {
     "webpack": "^4.6.0",
diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json
index b48d40207cb5..d8967cd6022b 100644
--- a/packages/angular_devkit/core/package.json
+++ b/packages/angular_devkit/core/package.json
@@ -8,10 +8,10 @@
     "core"
   ],
   "dependencies": {
-    "ajv": "~6.4.0",
-    "chokidar": "^2.0.3",
-    "fast-json-stable-stringify": "^2.0.0",
-    "source-map": "^0.5.6",
-    "rxjs": "~6.2.0"
+    "ajv": "6.5.3",
+    "chokidar": "2.0.4",
+    "fast-json-stable-stringify": "2.0.0",
+    "source-map": "0.7.3",
+    "rxjs": "6.2.2"
   }
 }
diff --git a/packages/angular_devkit/schematics/package.json b/packages/angular_devkit/schematics/package.json
index 44f474c8db8f..9eff901c231e 100644
--- a/packages/angular_devkit/schematics/package.json
+++ b/packages/angular_devkit/schematics/package.json
@@ -14,6 +14,6 @@
   ],
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "~6.2.0"
+    "rxjs": "6.2.2"
   }
 }
diff --git a/packages/angular_devkit/schematics_cli/package.json b/packages/angular_devkit/schematics_cli/package.json
index 609a07421c9d..b434d52c8adb 100644
--- a/packages/angular_devkit/schematics_cli/package.json
+++ b/packages/angular_devkit/schematics_cli/package.json
@@ -21,8 +21,8 @@
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
     "@schematics/schematics": "0.0.0",
-    "minimist": "^1.2.0",
-    "symbol-observable": "^1.2.0",
-    "rxjs": "~6.2.0"
+    "minimist": "1.2.0",
+    "symbol-observable": "1.2.0",
+    "rxjs": "6.2.2"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 965b0ce2ad37..7f91148f0e29 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -26,9 +26,9 @@
   },
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "~6.2.0",
-    "tree-kill": "^1.0.0",
-    "webpack-sources": "^1.1.0"
+    "rxjs": "6.2.2",
+    "tree-kill": "1.2.0",
+    "webpack-sources": "1.2.0"
   },
   "peerDependencies": {
     "typescript": ">=2.4.0 < 3.1",
diff --git a/packages/schematics/angular/package.json b/packages/schematics/angular/package.json
index 49a9160cd022..2aa67c7156e6 100644
--- a/packages/schematics/angular/package.json
+++ b/packages/schematics/angular/package.json
@@ -11,6 +11,6 @@
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
-    "typescript": ">=2.6.2 <3.1"
+    "typescript": "3.0.1"
   }
 }
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 9338df413063..4aaab771f906 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -9,7 +9,7 @@
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
   Angular: '~7.0.0-beta.0',
-  RxJs: '~6.3.0',
+  RxJs: '~6.3.2',
   ZoneJs: '~0.8.26',
   TypeScript: '~3.0.1',
   // The versions below must be manually updated when making a new devkit release.
diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index 9d8b40047fc5..f761db4c43a4 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -12,9 +12,9 @@
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
-    "npm-registry-client": "^8.5.1",
-    "semver": "^5.3.0",
-    "semver-intersect": "^1.1.2",
-    "rxjs": "~6.2.0"
+    "npm-registry-client": "8.6.0",
+    "semver": "5.5.1",
+    "semver-intersect": "1.4.0",
+    "rxjs": "6.2.2"
   }
 }
\ No newline at end of file
diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts b/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts
index 6d1fd83cf8f4..f9e99cb8d254 100644
--- a/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts
+++ b/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts
@@ -19,7 +19,7 @@ export default async function() {
 
       // Should trigger a rebuild.
     await appendToFile('src/environments/environment.prod.ts', `console.log('PROD');`);
-    await waitForAnyProcessOutputToMatch(webpackGoodRegEx, 30000);
+    await waitForAnyProcessOutputToMatch(webpackGoodRegEx, 40000);
   } catch (e) {
     error = e;
   }
diff --git a/yarn.lock b/yarn.lock
index 5c7d750d3c20..f39320644e77 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3,26 +3,26 @@
 
 
 "@angular/animations@^7.0.0-beta.4":
-  version "7.0.0-beta.4"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.0.0-beta.4.tgz#98a8c709604f4023f888a33205e01790015953a0"
+  version "7.0.0-beta.5"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.0.0-beta.5.tgz#5457ac4c8bb9f20e4d6d1dd8d2a2379b28d83d4a"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/cdk@^6.1.0":
-  version "6.4.5"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-6.4.5.tgz#c0c62d90ca0a8561dee7ee8347d598dd46bfc03f"
+  version "6.4.7"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-6.4.7.tgz#1549b304dd412e82bd854cc55a7d5c6772ee0411"
   dependencies:
     tslib "^1.7.1"
 
 "@angular/common@^7.0.0-beta.4":
-  version "7.0.0-beta.4"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.0.0-beta.4.tgz#e7d6526e1034fb7eb7926dcff0b8205284b40854"
+  version "7.0.0-beta.5"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.0.0-beta.5.tgz#8248838e1e1fd1fa472d521face6e08dc62e1fe4"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/compiler-cli@^7.0.0-beta.4":
-  version "7.0.0-beta.4"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.0.0-beta.4.tgz#43ca2c585c903f5c219b7903b2ceabd3d4fb3d48"
+  version "7.0.0-beta.5"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.0.0-beta.5.tgz#2c12cf4be3de8a5b723bbb0f34852f9e04ad5da2"
   dependencies:
     chokidar "^1.4.2"
     convert-source-map "^1.5.1"
@@ -32,63 +32,141 @@
     source-map "^0.6.1"
 
 "@angular/compiler@^7.0.0-beta.4":
-  version "7.0.0-beta.4"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.0.0-beta.4.tgz#f61a1e15db3e895ea6e8be98a01b261924b87bd7"
+  version "7.0.0-beta.5"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.0.0-beta.5.tgz#33adfdd15f20dfad80a6cb1cdf6a0999e0d46706"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/core@^7.0.0-beta.4":
-  version "7.0.0-beta.4"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.0.0-beta.4.tgz#797edfc2c59bca443eac0a277cde328f3c704b91"
+  version "7.0.0-beta.5"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.0.0-beta.5.tgz#c83c7b8a9d257d7b52695d45ae3ddc4677e929af"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/http@^7.0.0-beta.4":
-  version "7.0.0-beta.4"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.0.0-beta.4.tgz#72230abac0b97c32cb9d3e98a0855d26f332ee79"
+  version "7.0.0-beta.5"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.0.0-beta.5.tgz#d4524f19e347c88620ca32ac0144474c269f1786"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/material@^6.1.0":
-  version "6.4.5"
-  resolved "https://registry.yarnpkg.com/@angular/material/-/material-6.4.5.tgz#284132505841e9ae7895239647ada65ede594350"
+  version "6.4.7"
+  resolved "https://registry.yarnpkg.com/@angular/material/-/material-6.4.7.tgz#3c8f2d6a6a7904d97be29e06a84ffb62a8da6c16"
   dependencies:
     tslib "^1.7.1"
   optionalDependencies:
     parse5 "^5.0.0"
 
 "@angular/platform-browser-dynamic@^7.0.0-beta.4":
-  version "7.0.0-beta.4"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.0.0-beta.4.tgz#2d930f01aca9bd12fccb20754952df1af3acb02f"
+  version "7.0.0-beta.5"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.0.0-beta.5.tgz#e0abaa35b039a76f94cb2c816370a803ecf1239b"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-browser@^7.0.0-beta.4":
-  version "7.0.0-beta.4"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.0.0-beta.4.tgz#bea6218c7d2b549a2d29bf5ba59df7d398f116bb"
+  version "7.0.0-beta.5"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.0.0-beta.5.tgz#f7d5496fa6d04e77d71008016914f0ad088f6bad"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-server@^7.0.0-beta.4":
-  version "7.0.0-beta.4"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.0.0-beta.4.tgz#71702fd37182a5638ea13e9eb2c7312f54762ad1"
+  version "7.0.0-beta.5"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.0.0-beta.5.tgz#691ce9cb98dbd7bee3453f8b4bc998790b85e25d"
   dependencies:
     domino "^2.0.1"
     tslib "^1.9.0"
     xhr2 "^0.1.4"
 
 "@angular/router@^7.0.0-beta.4":
-  version "7.0.0-beta.4"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.0.0-beta.4.tgz#becbdf90fae1be20da598cdb2ad69179d9e66901"
+  version "7.0.0-beta.5"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.0.0-beta.5.tgz#7603f059d1cd3cb2324b72b8f3d62c2df7e98809"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/service-worker@^7.0.0-beta.4":
-  version "7.0.0-beta.4"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.0.0-beta.4.tgz#c4c37f211a325c32c0d59031b63ca64822a46a9f"
+  version "7.0.0-beta.5"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.0.0-beta.5.tgz#9d932d4f6057ca2fb322b218f4b0e5ffd06285a5"
   dependencies:
     tslib "^1.9.0"
 
+"@babel/code-frame@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
+  dependencies:
+    "@babel/highlight" "^7.0.0"
+
+"@babel/generator@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0.tgz#1efd58bffa951dc846449e58ce3a1d7f02d393aa"
+  dependencies:
+    "@babel/types" "^7.0.0"
+    jsesc "^2.5.1"
+    lodash "^4.17.10"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
+"@babel/helper-function-name@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0.tgz#a68cc8d04420ccc663dd258f9cc41b8261efa2d4"
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.0.0"
+    "@babel/template" "^7.0.0"
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-get-function-arity@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-split-export-declaration@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@babel/highlight@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.0.0.tgz#697655183394facffb063437ddf52c0277698775"
+
+"@babel/template@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0.tgz#c2bc9870405959c89a9c814376a2ecb247838c80"
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/parser" "^7.0.0"
+    "@babel/types" "^7.0.0"
+
+"@babel/traverse@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0.tgz#b1fe9b6567fdf3ab542cfad6f3b31f854d799a61"
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/generator" "^7.0.0"
+    "@babel/helper-function-name" "^7.0.0"
+    "@babel/helper-split-export-declaration" "^7.0.0"
+    "@babel/parser" "^7.0.0"
+    "@babel/types" "^7.0.0"
+    debug "^3.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.10"
+
+"@babel/types@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0.tgz#6e191793d3c854d19c6749989e3bc55f0e962118"
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.17.10"
+    to-fast-properties "^2.0.0"
+
 "@bazel/typescript@0.16.1":
   version "0.16.1"
   resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.16.1.tgz#5a5d145a17898bfadae8268cf942815424119412"
@@ -123,8 +201,8 @@
     "@types/node" "*"
 
 "@types/copy-webpack-plugin@^4.4.1":
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/@types/copy-webpack-plugin/-/copy-webpack-plugin-4.4.1.tgz#b1fcc2d4f9e13fac5d430bd2a4a54310e019d384"
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/@types/copy-webpack-plugin/-/copy-webpack-plugin-4.4.2.tgz#6dfac0dc8692378f76a20c6c1bbe01eec438f316"
   dependencies:
     "@types/minimatch" "*"
     "@types/webpack" "*"
@@ -218,16 +296,16 @@
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6"
 
 "@types/node@*":
-  version "10.5.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.5.6.tgz#1640f021dd0eaf12e731e54198c12ad2e020dc8e"
+  version "10.9.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897"
 
 "@types/node@8.10.10":
   version "8.10.10"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.10.tgz#fec07bc2ad549d9e6d2f7aa0fb0be3491b83163a"
 
 "@types/node@^6.0.46":
-  version "6.0.115"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.115.tgz#2ebbd6e57589484c043a25ec3b75799c32f67520"
+  version "6.0.117"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.117.tgz#ccfc2506001404708528d657aad9c1b931111646"
 
 "@types/q@^0.0.32":
   version "0.0.32"
@@ -385,7 +463,7 @@
 
 "@types/webpack-dev-server@2.9.4", "@types/webpack-dev-server@^2.9.4":
   version "2.9.4"
-  resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-2.9.4.tgz#cc3c398330ba87c0f1c7bfd020cfafb7bb895493"
+  resolved "http://registry.npmjs.org/@types/webpack-dev-server/-/webpack-dev-server-2.9.4.tgz#cc3c398330ba87c0f1c7bfd020cfafb7bb895493"
   dependencies:
     "@types/express-serve-static-core" "*"
     "@types/http-proxy-middleware" "*"
@@ -546,20 +624,9 @@
     "@webassemblyjs/wast-parser" "1.5.13"
     long "^3.2.0"
 
-"@webpack-contrib/schema-utils@^1.0.0-beta.0":
-  version "1.0.0-beta.0"
-  resolved "https://registry.yarnpkg.com/@webpack-contrib/schema-utils/-/schema-utils-1.0.0-beta.0.tgz#bf9638c9464d177b48209e84209e23bee2eb4f65"
-  dependencies:
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-    chalk "^2.3.2"
-    strip-ansi "^4.0.0"
-    text-table "^0.2.0"
-    webpack-log "^1.1.2"
-
 JSONStream@^1.0.4:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.3.tgz#27b4b8fbbfeab4e71bcf551e7f27be8d952239bf"
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.4.tgz#615bb2adb0cd34c8f4c447b5f6512fa1d8f16a2e"
   dependencies:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
@@ -586,8 +653,8 @@ acorn-dynamic-import@^3.0.0:
     acorn "^5.0.0"
 
 acorn@^5.0.0, acorn@^5.6.2:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.1.tgz#f095829297706a7c9776958c0afc8930a9b9d9d8"
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.2.tgz#91fa871883485d06708800318404e72bfb26dcc5"
 
 adm-zip@^0.4.9:
   version "0.4.11"
@@ -611,40 +678,23 @@ ajv-keywords@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
 
-ajv@^5.0.0, ajv@^5.1.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
-ajv@^6.1.0:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.2.tgz#678495f9b82f7cca6be248dd92f59bff5e1f4360"
+ajv@6.5.3, ajv@^6.1.0:
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9"
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.4.1"
-    uri-js "^4.2.1"
+    uri-js "^4.2.2"
 
-ajv@~6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.4.0.tgz#d3aff78e9277549771daf0164cff48482b754fc6"
+ajv@^5.0.0, ajv@^5.1.0, ajv@^5.3.0:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
   dependencies:
+    co "^4.6.0"
     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"
-  dependencies:
-    kind-of "^3.0.2"
-    longest "^1.0.1"
-    repeat-string "^1.5.2"
 
 amdefine@>=0.0.4:
   version "1.0.1"
@@ -656,6 +706,10 @@ ansi-align@^2.0.0:
   dependencies:
     string-width "^2.0.0"
 
+ansi-colors@^3.0.0:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.0.5.tgz#cb9dc64993b64fd6945485f797fc3853137d9a7b"
+
 ansi-escapes@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
@@ -696,7 +750,7 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-app-root-path@^2.0.1:
+app-root-path@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.1.0.tgz#98bf6599327ecea199309866e8140368fd2e646a"
 
@@ -757,13 +811,6 @@ array-ify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
 
-array-includes@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
-  dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.7.0"
-
 array-slice@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
@@ -845,11 +892,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.x, async@^1.4.0, async@^1.5.2:
+async@1.x, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
-async@^2.1.4, async@^2.5.0, async@^2.6.0:
+async@^2.5.0, async@^2.6.0, async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
   dependencies:
@@ -860,26 +907,26 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
 atob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a"
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
 
-autoprefixer@^8.4.1:
-  version "8.6.5"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.6.5.tgz#343f3d193ed568b3208e00117a1b96eb691d4ee9"
+autoprefixer@8.4.1:
+  version "8.4.1"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.4.1.tgz#c6b30001ea4b3daa6b611e50071f62dd24beb564"
   dependencies:
-    browserslist "^3.2.8"
-    caniuse-lite "^1.0.30000864"
+    browserslist "^3.2.6"
+    caniuse-lite "^1.0.30000832"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^6.0.23"
+    postcss "^6.0.22"
     postcss-value-parser "^3.2.3"
 
 autoprefixer@^9.0.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.1.0.tgz#566a70d1148046b96b31efa08090f1999ffb6d8c"
+  version "9.1.5"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.1.5.tgz#8675fd8d1c0d43069f3b19a2c316f3524e4f6671"
   dependencies:
-    browserslist "^4.0.1"
-    caniuse-lite "^1.0.30000872"
+    browserslist "^4.1.0"
+    caniuse-lite "^1.0.30000884"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
     postcss "^7.0.2"
@@ -889,9 +936,9 @@ aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
 
-aws4@^1.6.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289"
+aws4@^1.6.0, aws4@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
 
 babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
@@ -1037,8 +1084,8 @@ blocking-proxy@^1.0.0:
     minimist "^1.2.0"
 
 bluebird@^3.3.0, bluebird@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a"
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
@@ -1198,20 +1245,20 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^3.2.8:
+browserslist@^3.2.6:
   version "3.2.8"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6"
   dependencies:
     caniuse-lite "^1.0.30000844"
     electron-to-chromium "^1.3.47"
 
-browserslist@^4.0.0, browserslist@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.0.1.tgz#61c05ce2a5843c7d96166408bc23d58b5416e818"
+browserslist@^4.0.0, browserslist@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.1.1.tgz#328eb4ff1215b12df6589e9ab82f8adaa4fc8cd6"
   dependencies:
-    caniuse-lite "^1.0.30000865"
-    electron-to-chromium "^1.3.52"
-    node-releases "^1.0.0-alpha.10"
+    caniuse-lite "^1.0.30000884"
+    electron-to-chromium "^1.3.62"
+    node-releases "^1.0.0-alpha.11"
 
 browserstack@^1.5.1:
   version "1.5.1"
@@ -1248,7 +1295,7 @@ buffer-xor@^1.0.3:
 
 buffer@^4.3.0:
   version "4.9.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  resolved "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
@@ -1369,10 +1416,6 @@ camelcase-keys@^4.0.0:
     map-obj "^2.0.0"
     quick-lru "^1.0.0"
 
-camelcase@^1.0.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
-
 camelcase@^2.0.0, camelcase@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
@@ -1385,28 +1428,21 @@ camelcase@^4.0.0, camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
 
-caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000864, caniuse-lite@^1.0.30000865, caniuse-lite@^1.0.30000872:
-  version "1.0.30000874"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000874.tgz#a641b1f1c420d58d9b132920ef6ba87bbdcd2223"
+caniuse-lite@^1.0.30000832, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000884:
+  version "1.0.30000885"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000885.tgz#e889e9f8e7e50e769f2a49634c932b8aee622984"
 
 capture-stack-trace@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
 
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
 
-center-align@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
-  dependencies:
-    align-text "^0.1.3"
-    lazy-cache "^1.0.3"
-
 chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
     ansi-styles "^2.2.1"
     escape-string-regexp "^1.0.2"
@@ -1414,7 +1450,7 @@ chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.3.2, chalk@^2.4.1:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
   dependencies:
@@ -1422,26 +1458,11 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.3
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chardet@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.5.0.tgz#fe3ac73c00c3d865ffcc02a0682e2c20b6a06029"
-
-chokidar@^1.4.2:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
-  dependencies:
-    anymatch "^1.3.0"
-    async-each "^1.0.0"
-    glob-parent "^2.0.0"
-    inherits "^2.0.1"
-    is-binary-path "^1.0.0"
-    is-glob "^2.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-  optionalDependencies:
-    fsevents "^1.0.0"
+chardet@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
 
-chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3:
+chokidar@2.0.4, chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
   dependencies:
@@ -1460,6 +1481,21 @@ chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3:
   optionalDependencies:
     fsevents "^1.2.2"
 
+chokidar@^1.4.2:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
+  dependencies:
+    anymatch "^1.3.0"
+    async-each "^1.0.0"
+    glob-parent "^2.0.0"
+    inherits "^2.0.1"
+    is-binary-path "^1.0.0"
+    is-glob "^2.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.0.0"
+  optionalDependencies:
+    fsevents "^1.0.0"
+
 chownr@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
@@ -1470,9 +1506,9 @@ chrome-trace-event@^1.0.0:
   dependencies:
     tslib "^1.9.0"
 
-ci-info@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.3.tgz#710193264bb05c77b8c90d02f5aaf22216a667b2"
+ci-info@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.4.0.tgz#4841d53cad49f11b827b648ebde27a6e189b412f"
 
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
@@ -1481,7 +1517,7 @@ 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@^5.0.2:
+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"
 
@@ -1498,15 +1534,9 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-clean-css@4.1.x:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.11.tgz#2ecdf145aba38f54740f26cefd0ff3e03e125d6a"
-  dependencies:
-    source-map "0.5.x"
-
-clean-css@^4.1.11:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.0.tgz#0a9d62040cddc7904c5edaee9bdeca642d9b9c1c"
+clean-css@4.2.1, clean-css@4.2.x, clean-css@^4.1.11:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
   dependencies:
     source-map "~0.6.0"
 
@@ -1524,14 +1554,6 @@ cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
 
-cliui@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
-  dependencies:
-    center-align "^0.1.1"
-    right-align "^0.1.1"
-    wordwrap "0.0.2"
-
 cliui@^3.0.3, cliui@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
@@ -1576,10 +1598,10 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
 codelyzer@^4.2.1:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-4.4.2.tgz#af11fed6ddf9362ed5b174495467fb7315306fb1"
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-4.4.4.tgz#29b7dbb51ba9ecc45c7300d61280a6564765d402"
   dependencies:
-    app-root-path "^2.0.1"
+    app-root-path "^2.1.0"
     css-selector-tokenizer "^0.7.0"
     cssauron "^1.4.0"
     semver-dsl "^1.0.1"
@@ -1594,16 +1616,12 @@ collection-visit@^1.0.0:
     object-visit "^1.0.0"
 
 color-convert@^1.9.0, color-convert@^1.9.1:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.2.tgz#49881b8fba67df12a96bdf3f56c0aab9e7913147"
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   dependencies:
-    color-name "1.1.1"
+    color-name "1.1.3"
 
-color-name@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.1.tgz#4b1415304cf50028ea81643643bd82ea05803689"
-
-color-name@^1.0.0:
+color-name@1.1.3, color-name@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
 
@@ -1630,8 +1648,8 @@ colors@1.1.2:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
 
 colors@^1.1.0, colors@^1.2.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.1.tgz#4accdb89cf2cabc7f982771925e9468784f32f3d"
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.2.tgz#2df8ff573dfbf255af562f8ce7181d6b971a359b"
 
 colorspace@1.1.x:
   version "1.1.1"
@@ -1650,19 +1668,15 @@ combine-lists@^1.0.0:
   dependencies:
     lodash "^4.5.0"
 
-combined-stream@1.0.6, combined-stream@~1.0.5:
+combined-stream@1.0.6, combined-stream@~1.0.5, combined-stream@~1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.16.x, commander@~2.16.0:
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.16.0.tgz#f16390593996ceb4f3eeb020b31d78528f7f8a50"
-
-commander@^2.12.0, commander@^2.12.1:
-  version "2.17.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.0.tgz#9d07b25e2a6f198b76d8b756a0e8a9604a6a1a60"
+commander@2.17.x, commander@^2.12.0, commander@^2.12.1, commander@~2.17.1:
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
 
 commander@~2.13.0:
   version "2.13.0"
@@ -1683,9 +1697,9 @@ compare-func@^1.3.1:
     array-ify "^1.0.0"
     dot-prop "^3.0.0"
 
-compare-versions@^3.1.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.3.0.tgz#af93ea705a96943f622ab309578b9b90586f39c3"
+compare-versions@^3.2.1:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.4.0.tgz#e0747df5c9cb7f054d6d3dc3e1dbc444f9e92b26"
 
 component-bind@1.0.0:
   version "1.0.0"
@@ -1917,8 +1931,10 @@ conventional-commits-parser@^3.0.0:
     trim-off-newlines "^1.0.0"
 
 convert-source-map@^1.5.0, convert-source-map@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
+  dependencies:
+    safe-buffer "~5.1.1"
 
 cookie-signature@1.0.6:
   version "1.0.6"
@@ -1943,7 +1959,7 @@ copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
 
-copy-webpack-plugin@^4.5.2:
+copy-webpack-plugin@4.5.2:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.2.tgz#d53444a8fea2912d806e78937390ddd7e632ee5c"
   dependencies:
@@ -2026,6 +2042,16 @@ cross-spawn@^5.0.1:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+cross-spawn@^6.0.0:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
 crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -2099,12 +2125,6 @@ cyclist@~0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
 
-d@1:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
-  dependencies:
-    es5-ext "^0.10.9"
-
 dargs@^4.0.1:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
@@ -2152,10 +2172,16 @@ decamelize-keys@^1.0.0:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
 
-decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2:
+decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
+decamelize@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
+  dependencies:
+    xregexp "4.0.0"
+
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -2178,6 +2204,13 @@ deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
 
+default-gateway@^2.6.0:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f"
+  dependencies:
+    execa "^0.10.0"
+    ip-regex "^2.1.0"
+
 default-require-extensions@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
@@ -2185,11 +2218,10 @@ default-require-extensions@^2.0.0:
     strip-bom "^3.0.0"
 
 define-properties@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
   dependencies:
-    foreach "^2.0.5"
-    object-keys "^1.0.8"
+    object-keys "^1.0.12"
 
 define-property@^0.2.5:
   version "0.2.5"
@@ -2271,8 +2303,8 @@ detect-libc@^1.0.2:
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
 
 detect-node@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127"
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
 
 dezalgo@^1.0.0:
   version "1.0.3"
@@ -2285,7 +2317,7 @@ di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
 
-diagnostics@^1.0.1:
+diagnostics@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.1.1.tgz#cab6ac33df70c9d9a727490ae43ac995a769b22a"
   dependencies:
@@ -2370,8 +2402,8 @@ domhandler@2.1:
     domelementtype "1"
 
 domino@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/domino/-/domino-2.0.3.tgz#729fc28e0a54249ba5aaf95d2a35750d12201b01"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.0.tgz#653ba7d331441113b42e40ba05f24253ec86e02e"
 
 domutils@1.1:
   version "1.1.6"
@@ -2426,13 +2458,13 @@ ejs@^2.5.7:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
 
-electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.52:
-  version "1.3.55"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.55.tgz#f150e10b20b77d9d41afcca312efe0c3b1a7fdce"
+electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.62:
+  version "1.3.63"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.63.tgz#6485f5f4f3375358aa8fa23c2029ada208483b8d"
 
 elliptic@^6.0.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"
@@ -2531,7 +2563,7 @@ error-ex@^1.2.0, error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.5.1, es-abstract@^1.7.0:
+es-abstract@^1.5.1:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
   dependencies:
@@ -2549,22 +2581,6 @@ es-to-primitive@^1.1.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.1"
 
-es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.45"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.45.tgz#0bfdf7b473da5919d5adf3bd25ceb754fccc3653"
-  dependencies:
-    es6-iterator "~2.0.3"
-    es6-symbol "~3.1.1"
-    next-tick "1"
-
-es6-iterator@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
-  dependencies:
-    d "1"
-    es5-ext "^0.10.35"
-    es6-symbol "^3.1.1"
-
 es6-promise@^4.0.3:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
@@ -2579,13 +2595,6 @@ es6-promisify@^5.0.0:
   dependencies:
     es6-promise "^4.0.3"
 
-es6-symbol@^3.1.1, es6-symbol@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -2667,6 +2676,18 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
 
+execa@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
@@ -2724,7 +2745,7 @@ expand-range@^1.8.1:
 
 express@^4.16.2:
   version "4.16.3"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
+  resolved "http://registry.npmjs.org/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
   dependencies:
     accepts "~1.3.5"
     array-flatten "1.1.1"
@@ -2770,16 +2791,16 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@^3.0.0, extend@~3.0.1:
+extend@^3.0.0, extend@~3.0.1, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
 
 external-editor@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.1.tgz#fc9638c4d7cde4f0bb82b12307a1a23912c492e3"
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
   dependencies:
-    chardet "^0.5.0"
-    iconv-lite "^0.4.22"
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
 extglob@^0.3.1:
@@ -2817,7 +2838,7 @@ fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
 
-fast-json-stable-stringify@^2.0.0:
+fast-json-stable-stringify@2.0.0, fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
 
@@ -2826,8 +2847,8 @@ fast-levenshtein@~2.0.4:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
 
 fast-safe-stringify@^2.0.4:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.5.tgz#cdb2d02d41329afbe67eff073598811d482609e3"
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.6.tgz#04b26106cc56681f51a044cfc0d76cf0008ac2c2"
 
 fastparse@^1.1.1:
   version "1.1.1"
@@ -2849,9 +2870,9 @@ fecha@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd"
 
-figgy-pudding@^3.1.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.4.1.tgz#af66da1991fa2f94ff7f33b545a38ea4b3869696"
+figgy-pudding@^3.1.0, figgy-pudding@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
 
 figures@^2.0.0:
   version "2.0.0"
@@ -2859,18 +2880,18 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-file-loader@^1.1.11:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.11.tgz#6fe886449b0f2a936e43cabaac0cdbfb369506f8"
+file-loader@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-2.0.0.tgz#39749c82f020b9e85901dcff98e8004e6401cfde"
   dependencies:
     loader-utils "^1.0.2"
-    schema-utils "^0.4.5"
+    schema-utils "^1.0.0"
 
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
 
-fileset@^2.0.2:
+fileset@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
   dependencies:
@@ -2967,8 +2988,8 @@ flush-write-stream@^1.0.0:
     readable-stream "^2.0.4"
 
 follow-redirects@^1.0.0:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.2.tgz#5a9d80e0165957e5ef0c1210678fc5c4acb9fb03"
+  version "1.5.7"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.7.tgz#a39e4804dacb90202bca76a9e2ac10433ca6a69a"
   dependencies:
     debug "^3.1.0"
 
@@ -2996,15 +3017,11 @@ for-own@^1.0.0:
   dependencies:
     for-in "^1.0.1"
 
-foreach@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
-
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
 
-form-data@~2.3.1:
+form-data@~2.3.1, form-data@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
   dependencies:
@@ -3138,8 +3155,8 @@ getpass@^0.1.1:
     assert-plus "^1.0.0"
 
 gh-got@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/gh-got/-/gh-got-7.0.0.tgz#f6cce302e850327ed2d11c00080c56656f1e2432"
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/gh-got/-/gh-got-7.1.0.tgz#f2b14eef375ce49b66d5f034a1c124f56dc5bcf0"
   dependencies:
     got "^8.0.0"
     is-plain-obj "^1.1.0"
@@ -3215,19 +3232,20 @@ glob@7.0.x:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^5.0.10, glob@^5.0.15:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
   dependencies:
+    fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "2 || 3"
+    minimatch "^3.0.4"
     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"
+glob@^5.0.10, 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"
@@ -3235,23 +3253,16 @@ glob@^6.0.4:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 global-dirs@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
   dependencies:
     ini "^1.3.4"
 
+globals@^11.1.0:
+  version "11.7.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673"
+
 globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
@@ -3298,7 +3309,7 @@ globule@^1.0.0:
 
 got@^6.7.1:
   version "6.7.1"
-  resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
+  resolved "http://registry.npmjs.org/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
   dependencies:
     create-error-class "^3.0.0"
     duplexer3 "^0.1.4"
@@ -3342,15 +3353,15 @@ 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.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"
+handlebars@^4.0.1, handlebars@^4.0.11, handlebars@^4.0.2:
+  version "4.0.12"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5"
   dependencies:
-    async "^1.4.0"
+    async "^2.5.0"
     optimist "^0.6.1"
-    source-map "^0.4.4"
+    source-map "^0.6.1"
   optionalDependencies:
-    uglify-js "^2.6"
+    uglify-js "^3.1.4"
 
 har-schema@^2.0.0:
   version "2.0.0"
@@ -3363,6 +3374,13 @@ har-validator@~5.0.3:
     ajv "^5.1.0"
     har-schema "^2.0.0"
 
+har-validator@~5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
+  dependencies:
+    ajv "^5.3.0"
+    har-schema "^2.0.0"
+
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@@ -3391,10 +3409,6 @@ has-symbol-support-x@^1.4.1:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
 
-has-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
-
 has-to-string-tag-x@^1.2.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
@@ -3482,20 +3496,20 @@ html-entities@^1.2.0:
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
 
 html-minifier@^3.2.3:
-  version "3.5.19"
-  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.19.tgz#ed53c4b7326fe507bc3a1adbcc3bbb56660a2ebd"
+  version "3.5.20"
+  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.20.tgz#7b19fd3caa0cb79f7cde5ee5c3abdf8ecaa6bb14"
   dependencies:
     camel-case "3.0.x"
-    clean-css "4.1.x"
-    commander "2.16.x"
+    clean-css "4.2.x"
+    commander "2.17.x"
     he "1.1.x"
     param-case "2.1.x"
     relateurl "0.2.x"
     uglify-js "3.4.x"
 
-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"
+  resolved "http://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
   dependencies:
     html-minifier "^3.2.3"
     loader-utils "^0.2.16"
@@ -3546,7 +3560,7 @@ http-parser-js@>=0.4.0:
 
 http-proxy-middleware@~0.18.0:
   version "0.18.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
+  resolved "http://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
   dependencies:
     http-proxy "^1.16.2"
     is-glob "^4.0.0"
@@ -3592,13 +3606,13 @@ iconv-lite@0.4.19:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
-iconv-lite@0.4.23, iconv-lite@^0.4.4:
+iconv-lite@0.4.23:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.4.22:
+iconv-lite@^0.4.24, iconv-lite@^0.4.4:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   dependencies:
@@ -3657,6 +3671,13 @@ import-local@^1.0.0:
     pkg-dir "^2.0.0"
     resolve-cwd "^2.0.0"
 
+import-local@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
+  dependencies:
+    pkg-dir "^3.0.0"
+    resolve-cwd "^2.0.0"
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -3702,7 +3723,7 @@ injection-js@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/injection-js/-/injection-js-2.2.1.tgz#a8d6a085b2f0b8d8650f6f4487f6abb8cc0d67ce"
 
-inquirer@^6.1.0:
+inquirer@6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"
   dependencies:
@@ -3720,11 +3741,12 @@ inquirer@^6.1.0:
     strip-ansi "^4.0.0"
     through "^2.3.6"
 
-internal-ip@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-1.2.0.tgz#ae9fbf93b984878785d50a8de1b356956058cf5c"
+internal-ip@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-3.0.1.tgz#df5c99876e1d2eb2ea2d74f520e3f669a00ece27"
   dependencies:
-    meow "^3.3.0"
+    default-gateway "^2.6.0"
+    ipaddr.js "^1.5.2"
 
 into-stream@^3.1.0:
   version "3.1.0"
@@ -3743,6 +3765,14 @@ invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
 
+invert-kv@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
+
+ip-regex@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
+
 ip@^1.1.0, ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
@@ -3751,6 +3781,10 @@ ipaddr.js@1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
 
+ipaddr.js@^1.5.2:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.1.tgz#fa4b79fa47fd3def5e3b159825161c0a519c9427"
+
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
@@ -3792,10 +3826,10 @@ is-callable@^1.1.1, is-callable@^1.1.3:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
 
 is-ci@^1.0.10:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.0.tgz#3f4a08d6303a09882cef3f0fb97439c5f5ce2d53"
   dependencies:
-    ci-info "^1.0.0"
+    ci-info "^1.3.0"
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
@@ -4060,24 +4094,24 @@ isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
-istanbul-api@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.1.tgz#4c3b05d18c0016d1022e079b98dc82c40f488954"
-  dependencies:
-    async "^2.1.4"
-    compare-versions "^3.1.0"
-    fileset "^2.0.2"
-    istanbul-lib-coverage "^1.2.0"
-    istanbul-lib-hook "^1.2.0"
-    istanbul-lib-instrument "^1.10.1"
-    istanbul-lib-report "^1.1.4"
-    istanbul-lib-source-maps "^1.2.4"
-    istanbul-reports "^1.3.0"
-    js-yaml "^3.7.0"
-    mkdirp "^0.5.1"
+istanbul-api@^2.0.5:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.0.6.tgz#cd7b33ee678f6c01531d05f5e567ebbcd25f8ecc"
+  dependencies:
+    async "^2.6.1"
+    compare-versions "^3.2.1"
+    fileset "^2.0.3"
+    istanbul-lib-coverage "^2.0.1"
+    istanbul-lib-hook "^2.0.1"
+    istanbul-lib-instrument "^3.0.0"
+    istanbul-lib-report "^2.0.2"
+    istanbul-lib-source-maps "^2.0.1"
+    istanbul-reports "^2.0.1"
+    js-yaml "^3.12.0"
+    make-dir "^1.3.0"
     once "^1.4.0"
 
-istanbul-instrumenter-loader@^3.0.1:
+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:
@@ -4086,54 +4120,69 @@ istanbul-instrumenter-loader@^3.0.1:
     loader-utils "^1.1.0"
     schema-utils "^0.3.0"
 
-istanbul-lib-coverage@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341"
-
-istanbul-lib-hook@^1.2.0:
+istanbul-lib-coverage@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.1.tgz#f614ec45287b2a8fc4f07f5660af787575601805"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0"
+
+istanbul-lib-coverage@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#2aee0e073ad8c5f6a0b00e0dfbf52b4667472eda"
+
+istanbul-lib-hook@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.1.tgz#918a57b75a0f951d552a08487ca1fa5336433d72"
   dependencies:
     append-transform "^1.0.0"
 
-istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.7.3:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz#724b4b6caceba8692d3f1f9d0727e279c401af7b"
+istanbul-lib-instrument@^1.7.3:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz#1f55ed10ac3c47f2bdddd5307935126754d0a9ca"
   dependencies:
     babel-generator "^6.18.0"
     babel-template "^6.16.0"
     babel-traverse "^6.18.0"
     babel-types "^6.18.0"
     babylon "^6.18.0"
-    istanbul-lib-coverage "^1.2.0"
+    istanbul-lib-coverage "^1.2.1"
     semver "^5.3.0"
 
-istanbul-lib-report@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.4.tgz#e886cdf505c4ebbd8e099e4396a90d0a28e2acb5"
+istanbul-lib-instrument@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.0.0.tgz#b5f066b2a161f75788be17a9d556f40a0cf2afc9"
+  dependencies:
+    "@babel/generator" "^7.0.0"
+    "@babel/parser" "^7.0.0"
+    "@babel/template" "^7.0.0"
+    "@babel/traverse" "^7.0.0"
+    "@babel/types" "^7.0.0"
+    istanbul-lib-coverage "^2.0.1"
+    semver "^5.5.0"
+
+istanbul-lib-report@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.2.tgz#430a2598519113e1da7af274ba861bd42dd97535"
   dependencies:
-    istanbul-lib-coverage "^1.2.0"
-    mkdirp "^0.5.1"
-    path-parse "^1.0.5"
-    supports-color "^3.1.2"
+    istanbul-lib-coverage "^2.0.1"
+    make-dir "^1.3.0"
+    supports-color "^5.4.0"
 
-istanbul-lib-source-maps@^1.2.4:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.5.tgz#ffe6be4e7ab86d3603e4290d54990b14506fc9b1"
+istanbul-lib-source-maps@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-2.0.1.tgz#ce8b45131d8293fdeaa732f4faf1852d13d0a97e"
   dependencies:
     debug "^3.1.0"
-    istanbul-lib-coverage "^1.2.0"
-    mkdirp "^0.5.1"
-    rimraf "^2.6.1"
-    source-map "^0.5.3"
+    istanbul-lib-coverage "^2.0.1"
+    make-dir "^1.3.0"
+    rimraf "^2.6.2"
+    source-map "^0.6.1"
 
-istanbul-reports@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.3.0.tgz#2f322e81e1d9520767597dca3c20a0cce89a3554"
+istanbul-reports@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.0.1.tgz#fb8d6ea850701a3984350b977a969e9a556116a7"
   dependencies:
-    handlebars "^4.0.3"
+    handlebars "^4.0.11"
 
-istanbul@^0.4.5:
+istanbul@0.4.5, istanbul@^0.4.5:
   version "0.4.5"
   resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-0.4.5.tgz#65c7d73d4c4da84d4f3ac310b918fb0b8033733b"
   dependencies:
@@ -4210,10 +4259,10 @@ jquery@^3.3.1:
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
 
 js-base64@^2.1.8:
-  version "2.4.8"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.8.tgz#57a9b130888f956834aa40c5b165ba59c758f033"
+  version "2.4.9"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03"
 
-"js-tokens@^3.0.0 || ^4.0.0":
+"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
 
@@ -4221,7 +4270,7 @@ 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, js-yaml@^3.7.0, js-yaml@^3.9.0:
+js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
   dependencies:
@@ -4236,6 +4285,10 @@ jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
 
+jsesc@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
+
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
@@ -4309,10 +4362,10 @@ karma-chrome-launcher@~2.2.0:
     which "^1.2.1"
 
 karma-coverage-istanbul-reporter@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.1.tgz#26b969317d191c6a897c783b4ffe7831cb92e684"
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.3.tgz#ef08d1721ed108407a53f0d298acc6d2dc8a4008"
   dependencies:
-    istanbul-api "^1.3.1"
+    istanbul-api "^2.0.5"
     minimatch "^3.0.4"
 
 karma-jasmine-html-reporter@^0.2.2:
@@ -4325,7 +4378,7 @@ karma-jasmine@^1.0.2, karma-jasmine@~1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.2.tgz#394f2b25ffb4a644b9ada6f22d443e2fd08886c3"
 
-karma-source-map-support@^1.2.0:
+karma-source-map-support@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz#36dd4d8ca154b62ace95696236fae37caf0a7dde"
   dependencies:
@@ -4405,17 +4458,19 @@ latest-version@^3.0.0:
   dependencies:
     package-json "^4.0.0"
 
-lazy-cache@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
-
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
   dependencies:
     invert-kv "^1.0.0"
 
-less-loader@^4.1.0:
+lcid@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
+  dependencies:
+    invert-kv "^2.0.0"
+
+less-loader@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-4.1.0.tgz#2c1352c5b09a4f84101490274fd51674de41363e"
   dependencies:
@@ -4430,7 +4485,7 @@ less-plugin-npm-import@^2.1.0:
     promise "~7.0.1"
     resolve "~1.1.6"
 
-less@^3.7.1, less@^3.8.0:
+less@3.8.1, less@^3.8.0:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/less/-/less-3.8.1.tgz#f31758598ef5a1930dd4caefa9e4340641e71e1d"
   dependencies:
@@ -4468,9 +4523,9 @@ license-checker@^20.1.0:
     strip-ansi "^4.0.0"
     treeify "^1.1.0"
 
-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"
+license-webpack-plugin@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-1.4.0.tgz#be504a849ba7d736f1a6da4b133864f30af885fa"
   dependencies:
     ejs "^2.5.7"
 
@@ -4503,22 +4558,22 @@ loader-runner@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
 
-loader-utils@^0.2.16, loader-utils@~0.2.2:
-  version "0.2.17"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
+loader-utils@1.1.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
   dependencies:
     big.js "^3.1.3"
     emojis-list "^2.0.0"
     json5 "^0.5.0"
-    object-assign "^4.0.1"
 
-loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
+loader-utils@^0.2.16:
+  version "0.2.17"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
   dependencies:
     big.js "^3.1.3"
     emojis-list "^2.0.0"
     json5 "^0.5.0"
+    object-assign "^4.0.1"
 
 locate-path@^2.0.0:
   version "2.0.0"
@@ -4575,22 +4630,17 @@ lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5,
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
-log-symbols@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
-  dependencies:
-    chalk "^2.0.1"
-
 log4js@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.4.tgz#dfb2fc1782766bace1aabd00008460f6d994d159"
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.5.tgz#b80146bfebad68b430d4f3569556d8a6edfef303"
   dependencies:
     circular-json "^0.5.5"
     date-format "^1.2.0"
     debug "^3.1.0"
+    rfdc "^1.1.2"
     streamroller "0.7.0"
 
-logform@^1.9.0:
+logform@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/logform/-/logform-1.9.1.tgz#58b29d7b11c332456d7a217e17b48a13ad69d60a"
   dependencies:
@@ -4604,13 +4654,6 @@ loglevel@^1.4.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
 
-loglevelnext@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/loglevelnext/-/loglevelnext-1.0.5.tgz#36fc4f5996d6640f539ff203ba819641680d75a2"
-  dependencies:
-    es6-symbol "^3.1.1"
-    object.assign "^4.1.0"
-
 long@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
@@ -4619,10 +4662,6 @@ long@^3.2.0, long@~3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
 
-longest@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
-
 loose-envify@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -4671,20 +4710,26 @@ magic-string@^0.25.0:
   dependencies:
     sourcemap-codec "^1.4.1"
 
-make-dir@^1.0.0:
+make-dir@^1.0.0, make-dir@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
   dependencies:
     pify "^3.0.0"
 
 make-error@^1.1.1:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.4.tgz#19978ed575f9e9545d2ff8c13e33b5d18a67d535"
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
 
 mamacro@^0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
 
+map-age-cleaner@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz#098fb15538fd3dbe461f12745b0ca8568d4e3f74"
+  dependencies:
+    p-defer "^1.0.0"
+
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -4728,6 +4773,14 @@ mem@^1.1.0:
   dependencies:
     mimic-fn "^1.0.0"
 
+mem@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf"
+  dependencies:
+    map-age-cleaner "^0.1.1"
+    mimic-fn "^1.0.0"
+    p-is-promise "^1.1.0"
+
 memory-fs@^0.4.0, memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
@@ -4815,15 +4868,15 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-"mime-db@>= 1.34.0 < 2", mime-db@~1.35.0:
-  version "1.35.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.35.0.tgz#0569d657466491283709663ad379a99b90d9ab47"
+"mime-db@>= 1.34.0 < 2", mime-db@~1.36.0:
+  version "1.36.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
 
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18:
-  version "2.1.19"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.19.tgz#71e464537a7ef81c15f2db9d97e913fc0ff606f0"
+mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
+  version "2.1.20"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
   dependencies:
-    mime-db "~1.35.0"
+    mime-db "~1.36.0"
 
 mime@1.4.1:
   version "1.4.1"
@@ -4833,7 +4886,7 @@ mime@^1.4.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
 
-mime@^2.0.3, mime@^2.1.0, mime@^2.3.1:
+mime@^2.0.3, mime@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
 
@@ -4845,12 +4898,12 @@ mimic-response@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
 
-mini-css-extract-plugin@~0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.1.tgz#d2bcf77bb2596b8e4bd9257e43d3f9164c2e86cb"
+mini-css-extract-plugin@0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.2.tgz#b3ecc0d6b1bbe5ff14add42b946a7b200cf78651"
   dependencies:
-    "@webpack-contrib/schema-utils" "^1.0.0-beta.0"
     loader-utils "^1.1.0"
+    schema-utils "^1.0.0"
     webpack-sources "^1.1.0"
 
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
@@ -4861,7 +4914,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-"minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -4876,19 +4929,19 @@ minimist-options@^3.0.1:
 
 minimist@0.0.8:
   version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
-minimist@^1.1.3, minimist@^1.2.0:
+minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
 minimist@~0.0.1:
   version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+  resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
 
 minipass@^2.2.1, minipass@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.3.tgz#a7dcc8b7b833f5d368759cce544dccb55f50f233"
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
   dependencies:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
@@ -4945,7 +4998,7 @@ mixin-object@^2.0.1:
 
 mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
   version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
     minimist "0.0.8"
 
@@ -4988,8 +5041,8 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
 nan@^2.10.0, nan@^2.9.2:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.0.tgz#574e360e4d954ab16966ec102c0c049fd961a099"
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -5008,8 +5061,8 @@ nanomatch@^1.2.9:
     to-regex "^3.0.1"
 
 needle@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d"
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.2.tgz#1120ca4c41f2fcc6976fd28a8968afe239929418"
   dependencies:
     debug "^2.1.2"
     iconv-lite "^0.4.4"
@@ -5020,16 +5073,12 @@ negotiator@0.6.1:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
 
 neo-async@^2.5.0:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.1.tgz#acb909e327b1e87ec9ef15f41b8a269512ad41ee"
-
-next-tick@1:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.2.tgz#489105ce7bc54e709d736b195f82135048c50fcc"
 
 ng-packagr@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-4.1.0.tgz#2996159aa0b68bd7c5c36b0cf8631a350ff8b953"
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-4.1.1.tgz#a2aba1d08e5b2136ad073dfcf7dea90ba10fcc48"
   dependencies:
     "@ngtools/json-schema" "^1.1.0"
     autoprefixer "^9.0.0"
@@ -5058,6 +5107,10 @@ ng-packagr@^4.1.0:
     uglify-js "^3.0.7"
     update-notifier "^2.3.0"
 
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+
 no-case@^2.2.0:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
@@ -5128,9 +5181,9 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.0.0-alpha.10:
-  version "1.0.0-alpha.10"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.0-alpha.10.tgz#61c8d5f9b5b2e05d84eba941d05b6f5202f68a2a"
+node-releases@^1.0.0-alpha.11:
+  version "1.0.0-alpha.11"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.0-alpha.11.tgz#73c810acc2e5b741a17ddfbb39dfca9ab9359d8a"
   dependencies:
     semver "^5.3.0"
 
@@ -5140,7 +5193,7 @@ node-sass-tilde-importer@^1.0.0:
   dependencies:
     find-parent-dir "^0.3.0"
 
-node-sass@^4.9.3:
+node-sass@4.9.3, node-sass@^4.9.3:
   version "4.9.3"
   resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.3.tgz#f407cf3d66f78308bb1e346b24fa428703196224"
   dependencies:
@@ -5209,8 +5262,8 @@ normalize-url@2.0.1:
     sort-keys "^2.0.0"
 
 npm-bundled@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
 
 "npm-package-arg@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0":
   version "6.1.0"
@@ -5228,7 +5281,7 @@ npm-packlist@^1.1.6:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
-npm-registry-client@^8.5.1:
+npm-registry-client@8.6.0:
   version "8.6.0"
   resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-8.6.0.tgz#7f1529f91450732e89f8518e0f21459deea3e4c4"
   dependencies:
@@ -5283,6 +5336,10 @@ oauth-sign@~0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
 
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+
 object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -5299,7 +5356,7 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-keys@^1.0.11, object-keys@^1.0.8:
+object-keys@^1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
 
@@ -5309,15 +5366,6 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
-
 object.getownpropertydescriptors@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
@@ -5368,7 +5416,7 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-opn@^5.1.0, opn@^5.3.0:
+opn@5.3.0, opn@^5.1.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
   dependencies:
@@ -5397,10 +5445,10 @@ optjs@~3.2.2:
   resolved "https://registry.yarnpkg.com/optjs/-/optjs-3.2.2.tgz#69a6ce89c442a44403141ad2f9b370bd5bb6f4ee"
 
 original@>=0.0.5:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/original/-/original-1.0.1.tgz#b0a53ff42ba997a8c9cd1fb5daaeb42b9d693190"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
   dependencies:
-    url-parse "~1.4.0"
+    url-parse "^1.4.3"
 
 os-browserify@^0.3.0:
   version "0.3.0"
@@ -5412,7 +5460,7 @@ os-homedir@^1.0.0:
 
 os-locale@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  resolved "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
   dependencies:
     lcid "^1.0.0"
 
@@ -5424,6 +5472,14 @@ os-locale@^2.0.0:
     lcid "^1.0.0"
     mem "^1.1.0"
 
+os-locale@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.0.1.tgz#3b014fbf01d87f60a1e5348d80fe870dc82c4620"
+  dependencies:
+    execa "^0.10.0"
+    lcid "^2.0.0"
+    mem "^4.0.0"
+
 os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -5439,6 +5495,10 @@ p-cancelable@^0.4.0:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"
 
+p-defer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
@@ -5552,7 +5612,7 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
-parse5-html-rewriting-stream@^5.1.0:
+parse5-html-rewriting-stream@5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-5.1.0.tgz#63f92c958764aea8cbe3aa68f2e5895c32068ab8"
   dependencies:
@@ -5565,15 +5625,11 @@ parse5-sax-parser@^5.1.0:
   dependencies:
     parse5 "^5.1.0"
 
-parse5@^4.0.0:
+parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
 
-parse5@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.0.0.tgz#4d02710d44f3c3846197a11e205d4ef17842b81a"
-
-parse5@^5.1.0:
+parse5@^5.0.0, parse5@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2"
 
@@ -5623,13 +5679,13 @@ path-is-inside@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
 
-path-key@^2.0.0:
+path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
 
 path-parse@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
 
 path-to-regexp@0.1.7:
   version "0.1.7"
@@ -5697,9 +5753,9 @@ popper.js@^1.14.1:
   version "1.14.4"
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.4.tgz#8eec1d8ff02a5a3a152dd43414a15c7b79fd69b6"
 
-portfinder@^1.0.13, portfinder@^1.0.9:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9"
+portfinder@1.0.17, portfinder@^1.0.9:
+  version "1.0.17"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.17.tgz#a8a1691143e46c4735edefcf4fbcccedad26456a"
   dependencies:
     async "^1.5.2"
     debug "^2.2.0"
@@ -5709,7 +5765,7 @@ posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
 
-postcss-import@^11.1.0:
+postcss-import@11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-11.1.0.tgz#55c9362c9192994ec68865d224419df1db2981f0"
   dependencies:
@@ -5725,7 +5781,7 @@ postcss-load-config@^2.0.0:
     cosmiconfig "^4.0.0"
     import-cwd "^2.0.0"
 
-postcss-loader@^2.1.5:
+postcss-loader@2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.1.6.tgz#1d7dd7b17c6ba234b9bed5af13e0bea40a42d740"
   dependencies:
@@ -5748,7 +5804,7 @@ postcss-value-parser@^3.2.3:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
 
-postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.22, postcss@^6.0.23:
+postcss@6.0.23, postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.22:
   version "6.0.23"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
   dependencies:
@@ -5860,6 +5916,10 @@ pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
 
+psl@^1.1.24:
+  version "1.1.29"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
+
 public-encrypt@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994"
@@ -5920,7 +5980,7 @@ qs@6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
 
-qs@6.5.2, qs@~6.5.1:
+qs@6.5.2, qs@~6.5.1, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
 
@@ -5949,8 +6009,8 @@ quick-lru@^1.0.0:
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
 
 randomatic@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.0.0.tgz#d35490030eb4f7578de292ce6dfb04a91a128923"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.0.tgz#36f2ca708e9e567f5ed2ec01949026d50aa10116"
   dependencies:
     is-number "^4.0.0"
     kind-of "^6.0.0"
@@ -5991,7 +6051,7 @@ raw-body@2.3.3:
     iconv-lite "0.4.23"
     unpipe "1.0.0"
 
-raw-loader@^0.5.1:
+raw-loader@0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
 
@@ -6210,8 +6270,8 @@ renderkid@^2.0.1:
     utila "~0.3"
 
 repeat-element@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
 
 repeat-string@^0.2.2:
   version "0.2.2"
@@ -6227,7 +6287,7 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
-request@2.87.0, request@^2.74.0, request@^2.83.0, request@^2.87.0:
+request@2.87.0:
   version "2.87.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
   dependencies:
@@ -6252,6 +6312,31 @@ request@2.87.0, request@^2.74.0, request@^2.83.0, request@^2.87.0:
     tunnel-agent "^0.6.0"
     uuid "^3.1.0"
 
+request@^2.74.0, request@^2.83.0, request@^2.87.0:
+  version "2.88.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.0"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.4.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -6313,11 +6398,9 @@ retry@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
 
-right-align@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
-  dependencies:
-    align-text "^0.1.1"
+rfdc@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.2.tgz#e6e72d74f5dc39de8f538f65e00c36c18018e349"
 
 rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.2"
@@ -6327,7 +6410,7 @@ rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.
 
 rimraf@~2.2.6:
   version "2.2.8"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
+  resolved "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
 
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
@@ -6337,8 +6420,8 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     inherits "^2.0.1"
 
 rollup-plugin-commonjs@^9.1.3:
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.1.4.tgz#525b701adfd40e314b5bb6888d88edc28e10442f"
+  version "9.1.6"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.1.6.tgz#ad553813c922b71467152794b98f2fd0f195b8a5"
   dependencies:
     estree-walker "^0.5.1"
     magic-string "^0.22.4"
@@ -6346,8 +6429,8 @@ rollup-plugin-commonjs@^9.1.3:
     rollup-pluginutils "^2.0.1"
 
 rollup-plugin-node-resolve@^3.0.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.3.0.tgz#c26d110a36812cbefa7ce117cadcd3439aa1c713"
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.4.0.tgz#908585eda12e393caac7498715a01e08606abc89"
   dependencies:
     builtin-modules "^2.0.0"
     is-module "^1.0.0"
@@ -6361,8 +6444,8 @@ rollup-plugin-sourcemaps@^0.4.2:
     source-map-resolve "^0.5.0"
 
 rollup-pluginutils@^2.0.1:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.0.tgz#478ace04bd7f6da2e724356ca798214884738fc4"
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.1.tgz#760d185ccc237dedc12d7ae48c6bcd127b4892d0"
   dependencies:
     estree-walker "^0.5.2"
     micromatch "^2.3.11"
@@ -6386,7 +6469,7 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs@^6.0.0, rxjs@^6.1.0, rxjs@~6.2.0:
+rxjs@6.2.2, rxjs@^6.0.0, rxjs@^6.1.0, rxjs@~6.2.0:
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.2.tgz#eb75fa3c186ff5289907d06483a77884586e1cf9"
   dependencies:
@@ -6419,7 +6502,7 @@ sass-graph@^2.2.4:
     scss-tokenizer "^0.2.3"
     yargs "^7.0.0"
 
-sass-loader@^7.1.0:
+sass-loader@7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.1.0.tgz#16fd5138cb8b424bf8a759528a1972d72aad069d"
   dependencies:
@@ -6438,7 +6521,7 @@ saucelabs@^1.5.0:
 
 sax@0.5.x:
   version "0.5.8"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
+  resolved "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
 
 sax@>=0.6.0, sax@^1.2.4:
   version "1.2.4"
@@ -6450,9 +6533,9 @@ schema-utils@^0.3.0:
   dependencies:
     ajv "^5.0.0"
 
-schema-utils@^0.4.0, schema-utils@^0.4.3, schema-utils@^0.4.4, schema-utils@^0.4.5:
-  version "0.4.5"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e"
+schema-utils@^0.4.0, schema-utils@^0.4.4, schema-utils@^0.4.5:
+  version "0.4.7"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
   dependencies:
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
@@ -6503,15 +6586,15 @@ semver-dsl@^1.0.1:
   dependencies:
     semver "^5.3.0"
 
-semver-intersect@^1.1.2:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/semver-intersect/-/semver-intersect-1.3.1.tgz#8fa84a9e1028bd239e4530d1a3e181e698d884ba"
+semver-intersect@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/semver-intersect/-/semver-intersect-1.4.0.tgz#bdd9c06bedcdd2fedb8cd352c3c43ee8c61321f3"
   dependencies:
     semver "^5.0.0"
 
-"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
+"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", semver@5.5.1, semver@^5.0.0, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.5.0:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
 
 semver@~5.3.0:
   version "5.3.0"
@@ -6742,13 +6825,12 @@ source-list-map@~0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
 
-source-map-loader@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.3.tgz#d4b0c8cd47d54edce3e6bfa0f523f452b5b0e521"
+source-map-loader@0.2.4:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.4.tgz#c18b0dc6e23bf66f6792437557c569a11e072271"
   dependencies:
     async "^2.5.0"
-    loader-utils "~0.2.2"
-    source-map "~0.6.1"
+    loader-utils "^1.1.0"
 
 source-map-resolve@^0.5.0:
   version "0.5.2"
@@ -6760,9 +6842,9 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.5.0, source-map-support@^0.5.3, source-map-support@^0.5.5:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.6.tgz#4435cee46b1aab62b8e8610ce60f788091c51c13"
+source-map-support@0.5.9, source-map-support@^0.5.0, source-map-support@^0.5.3, source-map-support@^0.5.5, source-map-support@~0.5.6:
+  version "0.5.9"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -6773,13 +6855,6 @@ source-map-support@~0.4.0:
   dependencies:
     source-map "^0.5.6"
 
-source-map-support@~0.5.6:
-  version "0.5.9"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
@@ -6790,16 +6865,24 @@ source-map@0.1.x:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+source-map@0.5.6:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+
+source-map@0.7.3:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
 
-source-map@^0.4.2, source-map@^0.4.4, source-map@~0.4.1:
+source-map@^0.4.2, source-map@~0.4.1:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   dependencies:
     amdefine ">=0.0.4"
 
+source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+
 source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
@@ -6865,8 +6948,8 @@ spdx-satisfies@^4.0.0:
     spdx-ranges "^2.0.0"
 
 spdx@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/spdx/-/spdx-0.5.1.tgz#d36c275088b48d75a9046cd44a838ce4b5339998"
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/spdx/-/spdx-0.5.2.tgz#76a428b9b97e7904ef83e62a4af0d06fdb50c265"
   dependencies:
     spdx-exceptions "^1.0.0"
     spdx-license-ids "^1.0.0"
@@ -6942,8 +7025,10 @@ ssri@^5.2.4:
     safe-buffer "^5.1.1"
 
 ssri@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.0.tgz#fc21bfc90e03275ac3e23d5a42e38b8a1cbc130d"
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
+  dependencies:
+    figgy-pudding "^3.5.1"
 
 stack-trace@0.0.x:
   version "0.0.10"
@@ -6956,9 +7041,9 @@ 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"
+stats-webpack-plugin@0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/stats-webpack-plugin/-/stats-webpack-plugin-0.7.0.tgz#ccffe9b745de8bbb155571e063f8263fc0e2bc06"
   dependencies:
     lodash "^4.17.4"
 
@@ -6975,8 +7060,8 @@ statuses@~1.4.0:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
 
 stdout-stream@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b"
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
   dependencies:
     readable-stream "^2.0.1"
 
@@ -7086,14 +7171,14 @@ strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
-style-loader@^0.21.0:
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.21.0.tgz#68c52e5eb2afc9ca92b6274be277ee59aea3a852"
+style-loader@0.23.0:
+  version "0.23.0"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.0.tgz#8377fefab68416a2e05f1cabd8c3a3acfcce74f1"
   dependencies:
     loader-utils "^1.1.0"
     schema-utils "^0.4.5"
 
-stylus-loader@^3.0.2:
+stylus-loader@3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-3.0.2.tgz#27a706420b05a38e038e7cacb153578d450513c6"
   dependencies:
@@ -7101,7 +7186,7 @@ stylus-loader@^3.0.2:
     lodash.clonedeep "^4.5.0"
     when "~3.6.x"
 
-stylus@^0.54.5:
+stylus@0.54.5, stylus@^0.54.5:
   version "0.54.5"
   resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
   dependencies:
@@ -7116,19 +7201,19 @@ 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.0, supports-color@^3.1.2:
+supports-color@^3.1.0:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:
     has-flag "^1.0.0"
 
 supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   dependencies:
     has-flag "^3.0.0"
 
-symbol-observable@^1.2.0:
+symbol-observable@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
 
@@ -7169,7 +7254,7 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
-terser-webpack-plugin@^1.0.2:
+terser-webpack-plugin@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.0.2.tgz#b62dfdc4e59b0b5093665a765b234645b598d1a5"
   dependencies:
@@ -7183,10 +7268,10 @@ terser-webpack-plugin@^1.0.2:
     worker-farm "^1.5.2"
 
 terser@^3.8.1:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-3.8.1.tgz#cb70070ac9e0a71add169dfb63c0a64fca2738ac"
+  version "3.8.2"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-3.8.2.tgz#48b880f949f8d038aca4dfd00a37c53d96ecf9fb"
   dependencies:
-    commander "~2.16.0"
+    commander "~2.17.1"
     source-map "~0.6.1"
     source-map-support "~0.5.6"
 
@@ -7198,10 +7283,6 @@ text-hex@1.0.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5"
 
-text-table@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-
 through2@^2.0.0, through2@^2.0.2, through2@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
@@ -7251,6 +7332,10 @@ to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
 
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
@@ -7283,7 +7368,14 @@ tough-cookie@~2.3.3:
   dependencies:
     punycode "^1.4.1"
 
-tree-kill@^1.0.0, tree-kill@^1.2.0:
+tough-cookie@~2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
+  dependencies:
+    psl "^1.1.24"
+    punycode "^1.4.1"
+
+tree-kill@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36"
 
@@ -7312,10 +7404,10 @@ triple-beam@^1.2.0, triple-beam@^1.3.0:
   resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9"
 
 "true-case-path@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.2.tgz#7ec91130924766c7f573be3020c34f8fdfd00d62"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
   dependencies:
-    glob "^6.0.4"
+    glob "^7.1.2"
 
 ts-node@^5.0.0:
   version "5.0.1"
@@ -7345,8 +7437,8 @@ tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
 
 tslint-no-circular-imports@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/tslint-no-circular-imports/-/tslint-no-circular-imports-0.5.0.tgz#dce659c024165fc1bdd39a6f01479eb4be33cffe"
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/tslint-no-circular-imports/-/tslint-no-circular-imports-0.5.2.tgz#47ac9194ec531101ac19198d5144f7ac9f57d980"
 
 tslint-sonarts@^1.7.0:
   version "1.7.0"
@@ -7414,7 +7506,11 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-"typescript@>=2.6.2 <3.1", typescript@~3.0.1:
+typescript@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.1.tgz#43738f29585d3a87575520a4b93ab6026ef11fdb"
+
+typescript@~3.0.1:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.3.tgz#4853b3e275ecdaa27f78fda46dc273a7eb7fc1c8"
 
@@ -7425,29 +7521,16 @@ uglify-es@^3.3.4:
     commander "~2.13.0"
     source-map "~0.6.1"
 
-uglify-js@3.4.x, uglify-js@^3.0.7:
-  version "3.4.6"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.6.tgz#bc546d53f3e02b05d97d0ca5a7abfe0fb0384ddb"
+uglify-js@3.4.x, uglify-js@^3.0.7, uglify-js@^3.1.4:
+  version "3.4.9"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
   dependencies:
-    commander "~2.16.0"
+    commander "~2.17.1"
     source-map "~0.6.1"
 
-uglify-js@^2.6:
-  version "2.8.29"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
-  dependencies:
-    source-map "~0.5.1"
-    yargs "~3.10.0"
-  optionalDependencies:
-    uglify-to-browserify "~1.0.0"
-
-uglify-to-browserify@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
-
 uglifyjs-webpack-plugin@^1.2.4:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.7.tgz#57638dd99c853a1ebfe9d97b42160a8a507f9d00"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz#75f548160858163a08643e086d5fefe18a5d67de"
   dependencies:
     cacache "^10.0.4"
     find-cache-dir "^1.0.0"
@@ -7531,13 +7614,7 @@ 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"
-
-uri-js@^4.2.1:
+uri-js@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
   dependencies:
@@ -7551,13 +7628,13 @@ 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@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-1.0.1.tgz#61bc53f1f184d7343da2728a1289ef8722ea45ee"
+url-loader@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-1.1.1.tgz#4d1f3b4f90dde89f02c008e662d604d7511167c1"
   dependencies:
     loader-utils "^1.1.0"
     mime "^2.0.3"
-    schema-utils "^0.4.3"
+    schema-utils "^1.0.0"
 
 url-parse-lax@^1.0.0:
   version "1.0.0"
@@ -7571,7 +7648,7 @@ url-parse-lax@^3.0.0:
   dependencies:
     prepend-http "^2.0.0"
 
-url-parse@^1.1.8, url-parse@~1.4.0:
+url-parse@^1.1.8, url-parse@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.3.tgz#bfaee455c889023219d757e045fa6a684ec36c15"
   dependencies:
@@ -7639,13 +7716,13 @@ utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
 
-uuid@^3.0.1, uuid@^3.1.0:
+uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
 
 validate-npm-package-license@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338"
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
   dependencies:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
@@ -7726,24 +7803,23 @@ webpack-core@^0.6.8:
     source-list-map "~0.1.7"
     source-map "~0.4.1"
 
-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"
+webpack-dev-middleware@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.2.0.tgz#a20ceef194873710052da678f3c6ee0aeed92552"
   dependencies:
     loud-rejection "^1.6.0"
     memory-fs "~0.4.1"
-    mime "^2.1.0"
+    mime "^2.3.1"
     path-is-absolute "^1.0.0"
     range-parser "^1.0.3"
     url-join "^4.0.0"
-    webpack-log "^1.0.1"
+    webpack-log "^2.0.0"
 
-webpack-dev-server@^3.1.4:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.5.tgz#87477252e1ac6789303fb8cd3e585fa5d508a401"
+webpack-dev-server@3.1.7:
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.7.tgz#cbf8071cc092d9493732aee4f062f0e065994854"
   dependencies:
     ansi-html "0.0.7"
-    array-includes "^3.0.3"
     bonjour "^3.5.0"
     chokidar "^2.0.0"
     compression "^1.5.2"
@@ -7754,12 +7830,13 @@ webpack-dev-server@^3.1.4:
     html-entities "^1.2.0"
     http-proxy-middleware "~0.18.0"
     import-local "^1.0.0"
-    internal-ip "1.2.0"
+    internal-ip "^3.0.1"
     ip "^1.1.5"
     killable "^1.0.0"
     loglevel "^1.4.1"
     opn "^5.1.0"
     portfinder "^1.0.9"
+    schema-utils "^1.0.0"
     selfsigned "^1.9.1"
     serve-index "^1.7.2"
     sockjs "0.3.19"
@@ -7767,41 +7844,72 @@ webpack-dev-server@^3.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-dev-middleware "3.2.0"
+    webpack-log "^2.0.0"
+    yargs "12.0.1"
 
-webpack-log@^1.0.1, webpack-log@^1.1.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-1.2.0.tgz#a4b34cda6b22b518dbb0ab32e567962d5c72a43d"
+webpack-dev-server@^3.1.4:
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.8.tgz#eb7a95945d1108170f902604fb3b939533d9daeb"
   dependencies:
-    chalk "^2.1.0"
-    log-symbols "^2.1.0"
-    loglevelnext "^1.0.1"
-    uuid "^3.1.0"
+    ansi-html "0.0.7"
+    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 "^2.0.0"
+    internal-ip "^3.0.1"
+    ip "^1.1.5"
+    killable "^1.0.0"
+    loglevel "^1.4.1"
+    opn "^5.1.0"
+    portfinder "^1.0.9"
+    schema-utils "^1.0.0"
+    selfsigned "^1.9.1"
+    serve-index "^1.7.2"
+    sockjs "0.3.19"
+    sockjs-client "1.1.5"
+    spdy "^3.4.1"
+    strip-ansi "^3.0.0"
+    supports-color "^5.1.0"
+    webpack-dev-middleware "3.2.0"
+    webpack-log "^2.0.0"
+    yargs "12.0.2"
+
+webpack-log@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
+  dependencies:
+    ansi-colors "^3.0.0"
+    uuid "^3.3.2"
 
-webpack-merge@^4.1.2:
+webpack-merge@4.1.4:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.4.tgz#0fde38eabf2d5fd85251c24a5a8c48f8a3f4eb7b"
   dependencies:
     lodash "^4.17.5"
 
-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"
+webpack-sources@1.2.0, webpack-sources@^1.1.0, webpack-sources@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.2.0.tgz#18181e0d013fce096faf6f8e6d41eeffffdceac2"
   dependencies:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack-subresource-integrity@^1.1.0-rc.4:
+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"
 
-webpack@^4.0.0, webpack@^4.15.1, webpack@^4.6.0:
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.16.4.tgz#6b020f76483bc66339164c296d89978aa100d37a"
+webpack@4.17.2, webpack@^4.0.0, webpack@^4.6.0:
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.17.2.tgz#49feb20205bd15f0a5f1fe0a12097d5d9931878d"
   dependencies:
     "@webassemblyjs/ast" "1.5.13"
     "@webassemblyjs/helper-module-context" "1.5.13"
@@ -7827,7 +7935,7 @@ webpack@^4.0.0, webpack@^4.15.1, webpack@^4.6.0:
     tapable "^1.0.0"
     uglifyjs-webpack-plugin "^1.2.4"
     watchpack "^1.5.0"
-    webpack-sources "^1.0.1"
+    webpack-sources "^1.2.0"
 
 websocket-driver@>=0.5.1:
   version "0.7.0"
@@ -7870,10 +7978,6 @@ widest-line@^2.0.0:
   dependencies:
     string-width "^2.1.1"
 
-window-size@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
-
 window-size@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
@@ -7886,23 +7990,19 @@ winston-transport@^4.2.0:
     triple-beam "^1.2.0"
 
 winston@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/winston/-/winston-3.0.0.tgz#1f0b24a96586798bcf0cd149fb07ed47cb01a1b2"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/winston/-/winston-3.1.0.tgz#80724376aef164e024f316100d5b178d78ac5331"
   dependencies:
     async "^2.6.0"
-    diagnostics "^1.0.1"
+    diagnostics "^1.1.1"
     is-stream "^1.1.0"
-    logform "^1.9.0"
+    logform "^1.9.1"
     one-time "0.0.4"
     readable-stream "^2.3.6"
     stack-trace "0.0.x"
     triple-beam "^1.3.0"
     winston-transport "^4.2.0"
 
-wordwrap@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
-
 wordwrap@^1.0.0, wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
@@ -7919,7 +8019,7 @@ worker-farm@^1.5.2:
 
 wrap-ansi@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  resolved "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -7967,6 +8067,10 @@ xmlhttprequest-ssl@~1.5.4:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
 
+xregexp@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
+
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
@@ -7981,7 +8085,7 @@ y18n@^3.2.0, y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
 
-y18n@^4.0.0:
+"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
 
@@ -7993,38 +8097,55 @@ yallist@^3.0.0, yallist@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
 
+yargs-parser@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
+  dependencies:
+    camelcase "^4.1.0"
+
 yargs-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
   dependencies:
     camelcase "^3.0.0"
 
-yargs-parser@^9.0.2:
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
+yargs@12.0.1:
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.1.tgz#6432e56123bb4e7c3562115401e98374060261c2"
   dependencies:
-    camelcase "^4.1.0"
+    cliui "^4.0.0"
+    decamelize "^2.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^1.0.1"
+    os-locale "^2.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1 || ^4.0.0"
+    yargs-parser "^10.1.0"
 
-yargs@11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.0.0.tgz#c052931006c5eee74610e5fc0354bedfd08a201b"
+yargs@12.0.2:
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
   dependencies:
     cliui "^4.0.0"
-    decamelize "^1.1.1"
-    find-up "^2.1.0"
+    decamelize "^2.0.0"
+    find-up "^3.0.0"
     get-caller-file "^1.0.1"
-    os-locale "^2.0.0"
+    os-locale "^3.0.0"
     require-directory "^2.1.1"
     require-main-filename "^1.0.1"
     set-blocking "^2.0.0"
     string-width "^2.0.0"
     which-module "^2.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^9.0.2"
+    y18n "^3.2.1 || ^4.0.0"
+    yargs-parser "^10.1.0"
 
 yargs@^3.10.0:
   version "3.32.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995"
+  resolved "http://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995"
   dependencies:
     camelcase "^2.0.1"
     cliui "^3.0.3"
@@ -8052,15 +8173,6 @@ yargs@^7.0.0:
     y18n "^3.2.1"
     yargs-parser "^5.0.0"
 
-yargs@~3.10.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
-  dependencies:
-    camelcase "^1.0.2"
-    cliui "^2.1.0"
-    decamelize "^1.0.0"
-    window-size "0.1.0"
-
 yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"

From d07e68aa95afbbd62a098d2584594541f8a15b57 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Wed, 5 Sep 2018 14:48:24 +0200
Subject: [PATCH 0078/1703] fix(@schematics/angular): `module` imports paths
 are incorrect when `flat` option is used

Closes #12169
---
 packages/schematics/angular/module/index.ts      | 13 ++++++-------
 packages/schematics/angular/module/index_spec.ts |  9 +++++++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/packages/schematics/angular/module/index.ts b/packages/schematics/angular/module/index.ts
index 52f91dd4ad9e..390033a0f433 100644
--- a/packages/schematics/angular/module/index.ts
+++ b/packages/schematics/angular/module/index.ts
@@ -5,7 +5,7 @@
 * Use of this source code is governed by an MIT-style license that can be
 * found in the LICENSE file at https://angular.io/license
 */
-import { basename, dirname, normalize, relative, strings } from '@angular-devkit/core';
+import { normalize, strings } from '@angular-devkit/core';
 import {
   Rule,
   SchematicsException,
@@ -24,7 +24,7 @@ import * as ts from 'typescript';
 import { addImportToModule } from '../utility/ast-utils';
 import { InsertChange } from '../utility/change';
 import { getWorkspace } from '../utility/config';
-import { findModuleFromOptions } from '../utility/find-module';
+import { buildRelativePath, findModuleFromOptions } from '../utility/find-module';
 import { parseName } from '../utility/parse-name';
 import { buildDefaultPath } from '../utility/project';
 import { Schema as ModuleOptions } from './schema';
@@ -36,7 +36,7 @@ function addDeclarationToNgModule(options: ModuleOptions): Rule {
       return host;
     }
 
-    const modulePath = normalize('/' + options.module);
+    const modulePath = options.module;
 
     const text = host.read(modulePath);
     if (text === null) {
@@ -51,10 +51,9 @@ function addDeclarationToNgModule(options: ModuleOptions): Rule {
       + strings.dasherize(options.name)
       + '.module',
     );
-    const relativeDir = relative(dirname(modulePath), dirname(importModulePath));
-    const relativePath = (relativeDir.startsWith('.') ? relativeDir : './' + relativeDir)
-      + '/' + basename(importModulePath);
-    const changes = addImportToModule(source, modulePath,
+    const relativePath = buildRelativePath(modulePath, importModulePath);
+    const changes = addImportToModule(source,
+                                      modulePath,
                                       strings.classify(`${options.name}Module`),
                                       relativePath);
 
diff --git a/packages/schematics/angular/module/index_spec.ts b/packages/schematics/angular/module/index_spec.ts
index 13ff0c8f6a73..a3d988d0c809 100644
--- a/packages/schematics/angular/module/index_spec.ts
+++ b/packages/schematics/angular/module/index_spec.ts
@@ -63,6 +63,15 @@ describe('Module Schematic', () => {
     expect(content).toMatch(/imports: \[[^\]]*FooModule[^\]]*\]/m);
   });
 
+  it('should import into another module when using flat', () => {
+    const options = { ...defaultOptions, flat: true, module: 'app.module.ts' };
+
+    const tree = schematicRunner.runSchematic('module', options, appTree);
+    const content = tree.readContent('/projects/bar/src/app/app.module.ts');
+    expect(content).toMatch(/import { FooModule } from '.\/foo.module'/);
+    expect(content).toMatch(/imports: \[[^\]]*FooModule[^\]]*\]/m);
+  });
+
   it('should import into another module (deep)', () => {
     let tree = appTree;
 

From 432fe97d89adc91c28293b70a3d09003922563c4 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 6 Sep 2018 13:07:53 +0200
Subject: [PATCH 0079/1703] fix(@schematics/angular): use app root to set
 server paths in options

---
 packages/schematics/angular/migrations/update-6/index.ts      | 4 ++--
 packages/schematics/angular/migrations/update-6/index_spec.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-6/index.ts b/packages/schematics/angular/migrations/update-6/index.ts
index be938fc4639b..866e92ae66fa 100644
--- a/packages/schematics/angular/migrations/update-6/index.ts
+++ b/packages/schematics/angular/migrations/update-6/index.ts
@@ -536,8 +536,8 @@ function extractProjectsConfig(
       if (serverApp) {
         const serverOptions: JsonObject = {
           outputPath: serverApp.outDir || defaults.serverOutDir,
-          main: serverApp.main || defaults.serverMain,
-          tsConfig: serverApp.tsconfig || defaults.serverTsConfig,
+          main: `${appRoot}/${serverApp.main || defaults.serverMain}`,
+          tsConfig: `${appRoot}/${serverApp.tsconfig || defaults.serverTsConfig}`,
         };
         const serverTarget: JsonObject = {
           builder: '@angular-devkit/build-angular:server',
diff --git a/packages/schematics/angular/migrations/update-6/index_spec.ts b/packages/schematics/angular/migrations/update-6/index_spec.ts
index 1df2cd48932c..c9298b08f562 100644
--- a/packages/schematics/angular/migrations/update-6/index_spec.ts
+++ b/packages/schematics/angular/migrations/update-6/index_spec.ts
@@ -992,8 +992,8 @@ describe('Migration to v6', () => {
       expect(target).toBeDefined();
       expect(target.builder).toEqual('@angular-devkit/build-angular:server');
       expect(target.options.outputPath).toEqual('dist/server');
-      expect(target.options.main).toEqual('main.server.ts');
-      expect(target.options.tsConfig).toEqual('tsconfig.server.json');
+      expect(target.options.main).toEqual('src/main.server.ts');
+      expect(target.options.tsConfig).toEqual('src/tsconfig.server.json');
     });
   });
 });

From d29701f9781f222a14c5453917567bcb25efe99e Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 29 Aug 2018 13:08:22 -0400
Subject: [PATCH 0080/1703] fix(@angular-devkit/core): allow stat on record
 host

---
 packages/angular_devkit/core/src/virtual-fs/host/record.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/angular_devkit/core/src/virtual-fs/host/record.ts b/packages/angular_devkit/core/src/virtual-fs/host/record.ts
index 9c7d2597061d..74102db7c612 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/record.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/record.ts
@@ -366,11 +366,6 @@ export class CordHost extends SimpleMemoryHost {
       : ((this.willDelete(path) || this.willRename(path)) ? of(false) : this._back.isFile(path));
   }
 
-  stat(path: Path) {
-    // TODO: stat should be possible to implement, at least from memory.
-    return null;
-  }
-
   watch(path: Path, options?: HostWatchOptions) {
     // Watching not supported.
     return null;

From b6ff520b1037f36db6b408441c46b26ba59705bc Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 29 Aug 2018 13:41:10 -0400
Subject: [PATCH 0081/1703] refactor(@ngtools/webpack): avoid double caching of
 files

---
 .../webpack/src/angular_compiler_plugin.ts    |  63 ++-
 packages/ngtools/webpack/src/compiler_host.ts | 389 +++++-------------
 .../webpack/src/transformers/ast_helpers.ts   |   7 +-
 packages/ngtools/webpack/src/type_checker.ts  |   8 +-
 4 files changed, 160 insertions(+), 307 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index e4c9da15354f..ccad0897546b 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -314,6 +314,10 @@ export class AngularCompilerPlugin {
   }
 
   private _getTsProgram() {
+    if (!this._program) {
+      return undefined;
+    }
+
     return this._JitMode ? this._program as ts.Program : (this._program as Program).getTsProgram();
   }
 
@@ -360,6 +364,12 @@ export class AngularCompilerPlugin {
         // Use an identity function as all our paths are absolute already.
         this._moduleResolutionCache = ts.createModuleResolutionCache(this._basePath, x => x);
 
+        const tsProgram = this._getTsProgram();
+        const oldFiles = new Set(tsProgram ?
+          tsProgram.getSourceFiles().map(sf => sf.fileName)
+          : [],
+        );
+
         if (this._JitMode) {
           // Create the TypeScript program.
           time('AngularCompilerPlugin._createOrUpdateProgram.ts.createProgram');
@@ -367,10 +377,15 @@ export class AngularCompilerPlugin {
             this._rootNames,
             this._compilerOptions,
             this._compilerHost,
-            this._program as ts.Program,
+            tsProgram,
           );
           timeEnd('AngularCompilerPlugin._createOrUpdateProgram.ts.createProgram');
 
+          const newFiles = this._program.getSourceFiles().filter(sf => !oldFiles.has(sf.fileName));
+          for (const newFile of newFiles) {
+            this._compilerHost.invalidate(newFile.fileName);
+          }
+
           return Promise.resolve();
         } else {
           time('AngularCompilerPlugin._createOrUpdateProgram.ng.createProgram');
@@ -388,6 +403,12 @@ export class AngularCompilerPlugin {
           return this._program.loadNgStructureAsync()
             .then(() => {
               timeEnd('AngularCompilerPlugin._createOrUpdateProgram.ng.loadNgStructureAsync');
+
+              const newFiles = (this._program as Program).getTsProgram()
+                .getSourceFiles().filter(sf => !oldFiles.has(sf.fileName));
+              for (const newFile of newFiles) {
+                this._compilerHost.invalidate(newFile.fileName);
+              }
             });
         }
       })
@@ -396,7 +417,7 @@ export class AngularCompilerPlugin {
         if (!this._entryModule && this._mainPath) {
           time('AngularCompilerPlugin._make.resolveEntryModuleFromMain');
           this._entryModule = resolveEntryModuleFromMain(
-            this._mainPath, this._compilerHost, this._getTsProgram());
+            this._mainPath, this._compilerHost, this._getTsProgram() as ts.Program);
           timeEnd('AngularCompilerPlugin._make.resolveEntryModuleFromMain');
         }
       });
@@ -621,7 +642,6 @@ export class AngularCompilerPlugin {
         this._basePath,
         host,
       );
-      webpackCompilerHost.enableCaching();
 
       // Create and set a new WebpackResourceLoader.
       this._resourceLoader = new WebpackResourceLoader();
@@ -811,7 +831,7 @@ export class AngularCompilerPlugin {
       ? { path: workaroundResolve(this.entryModule.path), className: this.entryModule.className }
       : this.entryModule;
     const getLazyRoutes = () => this._lazyRoutes;
-    const getTypeChecker = () => this._getTsProgram().getTypeChecker();
+    const getTypeChecker = () => (this._getTsProgram() as ts.Program).getTypeChecker();
 
     if (this._JitMode) {
       // Replace resources in JIT.
@@ -868,13 +888,15 @@ export class AngularCompilerPlugin {
           // We need to run the `listLazyRoutes` the first time because it also navigates libraries
           // and other things that we might miss using the (faster) findLazyRoutesInAst.
           // Lazy routes modules will be read with compilerHost and added to the changed files.
-          const changedTsFiles = this._getChangedTsFiles();
           if (this._ngCompilerSupportsNewApi) {
             this._processLazyRoutes(this._listLazyRoutesFromProgram());
           } else if (this._firstRun) {
             this._processLazyRoutes(this._getLazyRoutesFromNgtools());
-          } else if (changedTsFiles.length > 0) {
-            this._processLazyRoutes(this._findLazyRoutesInAst(changedTsFiles));
+          } else {
+            const changedTsFiles = this._getChangedTsFiles();
+            if (changedTsFiles.length > 0) {
+              this._processLazyRoutes(this._findLazyRoutesInAst(changedTsFiles));
+            }
           }
           if (this._options.additionalLazyModules) {
             this._processLazyRoutes(this._options.additionalLazyModules);
@@ -887,7 +909,7 @@ export class AngularCompilerPlugin {
         // We now have the final list of changed TS files.
         // Go through each changed file and add transforms as needed.
         const sourceFiles = this._getChangedTsFiles()
-          .map((fileName) => this._getTsProgram().getSourceFile(fileName))
+          .map((fileName) => (this._getTsProgram() as ts.Program).getSourceFile(fileName))
           // At this point we shouldn't need to filter out undefined files, because any ts file
           // that changed should be emitted.
           // But due to hostReplacementPaths there can be files (the environment files)
@@ -973,7 +995,7 @@ export class AngularCompilerPlugin {
     } else {
       // Check if the TS input file and the JS output file exist.
       if (((fileName.endsWith('.ts') || fileName.endsWith('.tsx'))
-        && !this._compilerHost.fileExists(fileName, false))
+        && !this._compilerHost.fileExists(fileName))
         || !this._compilerHost.fileExists(outputFile, false)) {
         let msg = `${fileName} is missing from the TypeScript compilation. `
           + `Please make sure it is in your tsconfig via the 'files' or 'include' property.`;
@@ -1066,15 +1088,26 @@ export class AngularCompilerPlugin {
         }
 
         if (!hasErrors(allDiagnostics)) {
-          sourceFiles.forEach((sf) => {
-            const timeLabel = `AngularCompilerPlugin._emit.ts+${sf.fileName}+.emit`;
-            time(timeLabel);
-            emitResult = tsProgram.emit(sf, undefined, undefined, undefined,
+          if (this._firstRun || sourceFiles.length > 20) {
+            emitResult = tsProgram.emit(
+              undefined,
+              undefined,
+              undefined,
+              undefined,
               { before: this._transformers },
             );
             allDiagnostics.push(...emitResult.diagnostics);
-            timeEnd(timeLabel);
-          });
+          } else {
+            sourceFiles.forEach((sf) => {
+              const timeLabel = `AngularCompilerPlugin._emit.ts+${sf.fileName}+.emit`;
+              time(timeLabel);
+              emitResult = tsProgram.emit(sf, undefined, undefined, undefined,
+                { before: this._transformers },
+              );
+              allDiagnostics.push(...emitResult.diagnostics);
+              timeEnd(timeLabel);
+            });
+          }
         }
       } else {
         const angularProgram = program as Program;
diff --git a/packages/ngtools/webpack/src/compiler_host.ts b/packages/ngtools/webpack/src/compiler_host.ts
index 47dd9c648498..a5c2572dfdce 100644
--- a/packages/ngtools/webpack/src/compiler_host.ts
+++ b/packages/ngtools/webpack/src/compiler_host.ts
@@ -5,10 +5,15 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Path, getSystemPath, join as _join, normalize, virtualFs } from '@angular-devkit/core';
-import { NodeJsSyncHost } from '@angular-devkit/core/node';
-import * as fs from 'fs';
-import { basename, dirname, join } from 'path';
+import {
+  Path,
+  getSystemPath,
+  isAbsolute,
+  join,
+  normalize,
+  virtualFs,
+} from '@angular-devkit/core';
+import { Stats } from 'fs';
 import * as ts from 'typescript';
 import { WebpackResourceLoader } from './resource_loader';
 
@@ -21,157 +26,26 @@ export interface OnErrorFn {
 const dev = Math.floor(Math.random() * 10000);
 
 
-export class VirtualStats implements fs.Stats {
-  protected _ctime = new Date();
-  protected _mtime = new Date();
-  protected _atime = new Date();
-  protected _btime = new Date();
-  protected _dev = dev;
-  protected _ino = Math.floor(Math.random() * 100000);
-  protected _mode = parseInt('777', 8);  // RWX for everyone.
-  protected _uid = Number(process.env['UID']) || 0;
-  protected _gid = Number(process.env['GID']) || 0;
-
-  constructor(protected _path: string) {}
-
-  isFile() { return false; }
-  isDirectory() { return false; }
-  isBlockDevice() { return false; }
-  isCharacterDevice() { return false; }
-  isSymbolicLink() { return false; }
-  isFIFO() { return false; }
-  isSocket() { return false; }
-
-  get dev() { return this._dev; }
-  get ino() { return this._ino; }
-  get mode() { return this._mode; }
-  get nlink() { return 1; }  // Default to 1 hard link.
-  get uid() { return this._uid; }
-  get gid() { return this._gid; }
-  get rdev() { return 0; }
-  get size() { return 0; }
-  get blksize() { return 512; }
-  get blocks() { return Math.ceil(this.size / this.blksize); }
-  get atime() { return this._atime; }
-  get atimeMs() { return this._atime.getTime(); }
-  get mtime() { return this._mtime; }
-  get mtimeMs() { return this._mtime.getTime(); }
-  get ctime() { return this._ctime; }
-  get ctimeMs() { return this._ctime.getTime(); }
-  get birthtime() { return this._btime; }
-  get birthtimeMs() { return this._btime.getTime(); }
-}
-
-export class VirtualDirStats extends VirtualStats {
-  constructor(_fileName: string) {
-    super(_fileName);
-  }
-
-  isDirectory() { return true; }
-
-  get size() { return 1024; }
-}
-
-export class VirtualFileStats extends VirtualStats {
-  private _sourceFile: ts.SourceFile | null;
-  private _content: string | null;
-  private _bufferContent: virtualFs.FileBuffer | null;
-
-  constructor(_fileName: string) {
-    super(_fileName);
-  }
-
-  static createFromString(_fileName: string, _content: string) {
-    const stats = new VirtualFileStats(_fileName);
-    stats.content = _content;
-
-    return stats;
-  }
-
-  static createFromBuffer(_fileName: string, _buffer: virtualFs.FileBuffer) {
-    const stats = new VirtualFileStats(_fileName);
-    stats.bufferContent = _buffer;
-
-    return stats;
-  }
-
-  get content() {
-    if (!this._content && this.bufferContent) {
-      this._content = virtualFs.fileBufferToString(this.bufferContent);
-    }
-
-    return this._content || '';
-  }
-  set content(v: string) {
-    this._content = v;
-    this._bufferContent = null;
-    this.resetMetadata();
-  }
-
-  get bufferContent() {
-    if (!this._bufferContent && this._content) {
-      this._bufferContent = virtualFs.stringToFileBuffer(this._content);
-    }
-
-    return this._bufferContent || virtualFs.stringToFileBuffer('');
-  }
-  set bufferContent(buf: virtualFs.FileBuffer) {
-    this._bufferContent = buf;
-    this._content = null;
-    this.resetMetadata();
-  }
-
-  setSourceFile(sourceFile: ts.SourceFile) {
-    this._sourceFile = sourceFile;
-  }
-  getSourceFile(languageVersion: ts.ScriptTarget, setParentNodes: boolean) {
-    if (!this._sourceFile) {
-      this._sourceFile = ts.createSourceFile(
-        workaroundResolve(this._path),
-        this.content,
-        languageVersion,
-        setParentNodes);
-    }
-
-    return this._sourceFile;
-  }
-
-  private resetMetadata(): void {
-    this._mtime = new Date();
-    this._sourceFile = null;
-  }
-
-  isFile() { return true; }
-
-  get size() { return this.content.length; }
-}
-
 export class WebpackCompilerHost implements ts.CompilerHost {
   private _syncHost: virtualFs.SyncDelegateHost;
-  private _files: {[path: string]: VirtualFileStats | null} = Object.create(null);
-  private _directories: {[path: string]: VirtualDirStats | null} = Object.create(null);
-
-  private _changedFiles: {[path: string]: boolean} = Object.create(null);
-  private _changedDirs: {[path: string]: boolean} = Object.create(null);
-
-  private _basePath: string;
-  private _setParentNodes: boolean;
-
-  private _cache = false;
-  private _resourceLoader?: WebpackResourceLoader | undefined;
+  private _changedFiles = new Set<string>();
+  private _basePath: Path;
+  private _resourceLoader?: WebpackResourceLoader;
 
   constructor(
     private _options: ts.CompilerOptions,
     basePath: string,
-    private _host: virtualFs.Host<fs.Stats> = new NodeJsSyncHost(),
+    host: virtualFs.Host,
   ) {
-    this._syncHost = new virtualFs.SyncDelegateHost(_host);
-    this._setParentNodes = true;
-    this._basePath = this._normalizePath(basePath);
+    this._syncHost = new virtualFs.SyncDelegateHost(new virtualFs.CordHost(host));
+    this._basePath = normalize(basePath);
   }
 
-  private _normalizePath(path: string): Path {
-    return normalize(path);
+  private get virtualFiles(): Path[] {
+    return (this._syncHost.delegate as virtualFs.CordHost)
+      .records()
+      .filter(record => record.kind === 'create')
+      .map((record: virtualFs.CordHostCreate) => record.path);
   }
 
   denormalizePath(path: string) {
@@ -179,167 +53,115 @@ export class WebpackCompilerHost implements ts.CompilerHost {
   }
 
   resolve(path: string): Path {
-    const p = this._normalizePath(path);
-    if (p[0] == '.') {
-      return this._normalizePath(join(this.getCurrentDirectory(), p));
-    } else if (p[0] == '/' || p.match(/^\w:\//)) {
+    const p = normalize(path);
+    if (isAbsolute(p)) {
       return p;
     } else {
-      return this._normalizePath(join(this._basePath, p));
+      return join(this._basePath, p);
     }
   }
 
-  private _cacheFile(fileName: string, stats: VirtualFileStats) {
-    this._files[fileName] = stats;
-
-    let p = dirname(fileName);
-    while (p && !this._directories[p]) {
-      this._directories[p] = new VirtualDirStats(p);
-      this._changedDirs[p] = true;
-      p = dirname(p);
-    }
-
-    this._changedFiles[fileName] = true;
-  }
-
-  get dirty() {
-    return Object.keys(this._changedFiles).length > 0;
-  }
-
-  enableCaching() {
-    this._cache = true;
-  }
-
   resetChangedFileTracker() {
-    this._changedFiles = Object.create(null);
-    this._changedDirs = Object.create(null);
+    this._changedFiles.clear();
   }
 
   getChangedFilePaths(): string[] {
-    return Object.keys(this._changedFiles);
+    return [...this._changedFiles];
   }
 
   getNgFactoryPaths(): string[] {
-    return Object.keys(this._files)
+    return this.virtualFiles
       .filter(fileName => fileName.endsWith('.ngfactory.js') || fileName.endsWith('.ngstyle.js'))
       // These paths are used by the virtual file system decorator so we must denormalize them.
-      .map(path => this.denormalizePath(path as Path));
+      .map(path => this.denormalizePath(path));
   }
 
   invalidate(fileName: string): void {
     const fullPath = this.resolve(fileName);
 
-    if (fullPath in this._files) {
-      this._files[fullPath] = null;
-    } else {
-      for (const file in this._files) {
-        if (file.startsWith(fullPath + '/')) {
-          this._files[file] = null;
-        }
-      }
-    }
-    if (this.fileExists(fullPath)) {
-      this._changedFiles[fullPath] = true;
+    if (this.fileExists(fileName)) {
+      this._changedFiles.add(fullPath);
     }
   }
 
   fileExists(fileName: string, delegate = true): boolean {
     const p = this.resolve(fileName);
 
-    return this._files[p] != null
-      || (delegate && this._syncHost.exists(normalize(p)));
-  }
-
-  readFile(fileName: string): string | undefined {
-    const stats = this.findVirtualFile(fileName);
-
-    return stats && stats.content;
-  }
-
-  readFileBuffer(fileName: string): Buffer | undefined {
-    const stats = this.findVirtualFile(fileName);
-    if (stats) {
-      const buffer = Buffer.from(stats.bufferContent);
+    const exists = this._syncHost.exists(p) && this._syncHost.isFile(p);
+    if (delegate) {
+      return exists;
+    } else {
+      const backend = new virtualFs.SyncDelegateHost(
+        (this._syncHost.delegate as virtualFs.CordHost).backend as virtualFs.Host,
+      );
 
-      return buffer;
+      return exists && !(backend.exists(p) && backend.isFile(p));
     }
   }
 
-  private findVirtualFile(fileName: string): VirtualFileStats | undefined {
-    const p = this.resolve(fileName);
-
-    const stats = this._files[p];
-    if (stats) {
-      return stats;
+  readFile(fileName: string): string | undefined {
+    const filePath = this.resolve(fileName);
+    if (!this._syncHost.exists(filePath) || !this._syncHost.isFile(filePath)) {
+      return undefined;
     }
 
-    try {
-      const fileBuffer = this._syncHost.read(p);
-      if (fileBuffer) {
-        const stats = VirtualFileStats.createFromBuffer(p, fileBuffer);
-        if (this._cache) {
-          this._cacheFile(p, stats);
-        }
+    return virtualFs.fileBufferToString(this._syncHost.read(filePath));
+  }
 
-        return stats;
-      }
-    } catch {
+  readFileBuffer(fileName: string): Buffer | undefined {
+    const filePath = this.resolve(fileName);
+    if (!this._syncHost.exists(filePath) || !this._syncHost.isFile(filePath)) {
       return undefined;
     }
+
+    return Buffer.from(this._syncHost.read(filePath));
   }
 
-  stat(path: string): VirtualStats | null {
+  stat(path: string): Stats | null {
     const p = this.resolve(path);
-    const stats = this._files[p] || this._directories[p];
+
+    const stats = this._syncHost.exists(p) && this._syncHost.stat(p);
     if (!stats) {
-      return this._syncHost.stat(p) as VirtualStats | null;
+      return null;
     }
 
-    return stats;
+    return {
+      isBlockDevice: () => false,
+      isCharacterDevice: () => false,
+      isFIFO: () => false,
+      isSymbolicLink: () => false,
+      isSocket: () => false,
+      dev,
+      ino: Math.floor(Math.random() * 100000),
+      mode: parseInt('777', 8),
+      nlink: 1,
+      uid: 0,
+      gid: 0,
+      rdev: 0,
+      blksize: 512,
+      blocks: Math.ceil(stats.size / 512),
+      atimeMs: stats.atime.getTime(),
+      mtimeMs: stats.mtime.getTime(),
+      ctimeMs: stats.ctime.getTime(),
+      birthtimeMs: stats.birthtime.getTime(),
+      ...stats,
+    };
   }
 
-  directoryExists(directoryName: string, delegate = true): boolean {
+  directoryExists(directoryName: string): boolean {
     const p = this.resolve(directoryName);
 
-    return (this._directories[p] != null)
-            || (delegate && this._syncHost.exists(p) && this._syncHost.isDirectory(p));
-  }
-
-  getFiles(path: string): string[] {
-    const p = this.resolve(path);
-
-    const subfiles = Object.keys(this._files)
-      .filter(fileName => dirname(fileName) == p)
-      .map(p => basename(p));
-
-
-    let delegated: string[];
-    try {
-      delegated = this._syncHost.list(p).filter((x: string) => {
-        try {
-          return this._syncHost.isFile(_join(p, x));
-        } catch {
-          return false;
-        }
-      });
-    } catch {
-      delegated = [];
-    }
-
-    return delegated.concat(subfiles);
+    return this._syncHost.exists(p) && this._syncHost.isDirectory(p);
   }
 
   getDirectories(path: string): string[] {
     const p = this.resolve(path);
-    const subdirs = Object.keys(this._directories)
-      .filter(fileName => dirname(fileName) == p)
-      .map(path => basename(path));
 
     let delegated: string[];
     try {
-      delegated = this._syncHost.list(p).filter((x: string) => {
+      delegated = this._syncHost.list(p).filter(x => {
         try {
-          return this._syncHost.isDirectory(_join(p, x));
+          return this._syncHost.isDirectory(join(p, x));
         } catch {
           return false;
         }
@@ -348,45 +170,26 @@ export class WebpackCompilerHost implements ts.CompilerHost {
       delegated = [];
     }
 
-    return delegated.concat(subdirs);
+    return delegated;
   }
 
-  getSourceFile(fileName: string, languageVersion: ts.ScriptTarget, _onError?: OnErrorFn) {
-    fileName = this.resolve(fileName);
-
-    let stats = this._files[fileName];
-    if (!stats) {
+  getSourceFile(fileName: string, languageVersion: ts.ScriptTarget, onError?: OnErrorFn) {
+    try {
       const content = this.readFile(fileName);
-
-      if (!this._cache && content) {
-        return ts.createSourceFile(
-          workaroundResolve(fileName),
-          content,
-          languageVersion,
-          this._setParentNodes,
-        );
-      } else {
-        stats = this._files[fileName];
-        if (!stats) {
-          // If cache is turned on and the file exists, the readFile call will have populated stats.
-          // Empty stats at this point mean the file doesn't exist at and so we should return
-          // undefined.
-          return undefined;
-        }
+      if (content != undefined) {
+        return ts.createSourceFile(workaroundResolve(fileName), content, languageVersion, true);
+      }
+    } catch (e) {
+      if (onError) {
+        onError(e.message);
       }
     }
 
-    return stats && stats.getSourceFile(languageVersion, this._setParentNodes);
-  }
-
-  get getCancellationToken() {
-    // return this._delegate.getCancellationToken;
-    // TODO: consider implementing a cancellation token.
     return undefined;
   }
 
   getDefaultLibFileName(options: ts.CompilerOptions) {
-    return ts.createCompilerHost(options, false).getDefaultLibFileName(options);
+    return ts.createCompilerHost(options).getDefaultLibFileName(options);
   }
 
   // This is due to typescript CompilerHost interface being weird on writeFile. This shuts down
@@ -396,21 +199,29 @@ export class WebpackCompilerHost implements ts.CompilerHost {
       fileName: string,
       data: string,
       _writeByteOrderMark: boolean,
-      _onError?: (message: string) => void,
+      onError?: (message: string) => void,
       _sourceFiles?: ReadonlyArray<ts.SourceFile>,
     ): void => {
       const p = this.resolve(fileName);
-      const stats = VirtualFileStats.createFromString(p, data);
-      this._cacheFile(p, stats);
+
+      try {
+        this._syncHost.write(p, virtualFs.stringToFileBuffer(data));
+      } catch (e) {
+        if (onError) {
+          onError(e.message);
+        }
+      }
     };
   }
 
   getCurrentDirectory(): string {
-    return this._basePath !== null ? this._basePath : '/';
+    return this._basePath;
   }
 
   getCanonicalFileName(fileName: string): string {
-    return this.resolve(fileName);
+    const path = this.resolve(fileName);
+
+    return this.useCaseSensitiveFileNames ? path : path.toLowerCase();
   }
 
   useCaseSensitiveFileNames(): boolean {
diff --git a/packages/ngtools/webpack/src/transformers/ast_helpers.ts b/packages/ngtools/webpack/src/transformers/ast_helpers.ts
index 7315693b0779..481e07960b5d 100644
--- a/packages/ngtools/webpack/src/transformers/ast_helpers.ts
+++ b/packages/ngtools/webpack/src/transformers/ast_helpers.ts
@@ -5,6 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import { virtualFs } from '@angular-devkit/core';
 import * as ts from 'typescript';
 import { WebpackCompilerHost } from '../compiler_host';
 
@@ -57,7 +58,11 @@ export function createTypescriptContext(content: string) {
   };
 
   // Create compiler host.
-  const compilerHost = new WebpackCompilerHost(compilerOptions, basePath);
+  const compilerHost = new WebpackCompilerHost(
+    compilerOptions,
+    basePath,
+    new virtualFs.SimpleMemoryHost(),
+  );
 
   // Add a dummy file to host content.
   compilerHost.writeFile(fileName, content, false);
diff --git a/packages/ngtools/webpack/src/type_checker.ts b/packages/ngtools/webpack/src/type_checker.ts
index 688f6c68b127..d2d4c6a6d0f6 100644
--- a/packages/ngtools/webpack/src/type_checker.ts
+++ b/packages/ngtools/webpack/src/type_checker.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { terminal } from '@angular-devkit/core';
+import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as ts from 'typescript';
 import { time, timeEnd } from './benchmark';
 import { WebpackCompilerHost } from './compiler_host';
@@ -62,8 +63,11 @@ export class TypeChecker {
     private _rootNames: string[],
   ) {
     time('TypeChecker.constructor');
-    const compilerHost = new WebpackCompilerHost(_compilerOptions, _basePath);
-    compilerHost.enableCaching();
+    const compilerHost = new WebpackCompilerHost(
+      _compilerOptions,
+      _basePath,
+      new NodeJsSyncHost(),
+    );
     // We don't set a async resource loader on the compiler host because we only support
     // html templates, which are the only ones that can throw errors, and those can be loaded
     // synchronously.

From 96dc50603802829531930f84efbe725edf08209c Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 6 Sep 2018 19:22:14 -0400
Subject: [PATCH 0082/1703] test(@angular-devkit/build-angular): expand polling
 success threshold

polling is highly dependent on CPU and IO; with shared CI machines this can cause high variability
---
 .../test/browser/poll_spec_large.ts           | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/poll_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/poll_spec_large.ts
index cada0a066363..b6c614503d30 100644
--- a/packages/angular_devkit/build_angular/test/browser/poll_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/poll_spec_large.ts
@@ -16,27 +16,26 @@ describe('Browser Builder poll', () => {
   afterEach(done => host.restore().toPromise().then(done, done.fail));
 
   it('works', (done) => {
-    const overrides = { watch: true, poll: 1000 };
-    let msAvg = 1000;
-    let lastTime: number;
+    const overrides = { watch: true, poll: 2000 };
+    const intervals: number[] = [];
+    let startTime: number | undefined;
     runTargetSpec(host, browserTargetSpec, overrides).pipe(
       // Debounce 1s, otherwise changes are too close together and polling doesn't work.
       debounceTime(1000),
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const currTime = Date.now();
-        if (lastTime) {
-          const ms = Math.floor((currTime - lastTime));
-          msAvg = (msAvg + ms) / 2;
+      tap((buildEvent) => {
+        expect(buildEvent.success).toBe(true);
+        if (startTime != undefined) {
+          intervals.push(Date.now() - startTime - 1000);
         }
-        lastTime = currTime;
+        startTime = Date.now();
         host.appendToFile('src/main.ts', 'console.log(1);');
       }),
-      take(5),
+      take(6),
     ).subscribe(undefined, done.fail, () => {
-      // Check if the average is between 1750 and 2750, allowing for a 1000ms variance.
-      expect(msAvg).toBeGreaterThan(1750);
-      expect(msAvg).toBeLessThan(2750);
+      intervals.sort();
+      const median = intervals[Math.trunc(intervals.length / 2)];
+      expect(median).toBeGreaterThan(1000);
+      expect(median).toBeLessThan(4000);
       done();
     });
   });

From b403aa69c107e2d0a98c775e7b2efd946c30317a Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 7 Sep 2018 14:59:12 -0400
Subject: [PATCH 0083/1703] test(@angular-devkit/build-angular): improve
 resilience of watch rebuilds

---
 .../test/browser/rebuild_spec_large.ts        | 44 +++++++++--------
 .../test/browser/replacements_spec_large.ts   | 49 ++++++++++++-------
 2 files changed, 54 insertions(+), 39 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
index 5d5b869c229d..6ee1df2fdd76 100644
--- a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
@@ -9,7 +9,7 @@
 
 import { DefaultTimeout, TestLogger, runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { debounceTime, take, tap } from 'rxjs/operators';
+import { debounceTime, take, takeWhile, tap } from 'rxjs/operators';
 import { browserTargetSpec, host } from '../utils';
 import { lazyModuleFiles, lazyModuleImport } from './lazy-module_spec_large';
 
@@ -65,29 +65,28 @@ describe('Browser Builder rebuilds', () => {
 
     const overrides = { watch: true };
 
-    let buildNumber = 0;
-
+    let buildCount = 0;
+    let phase = 1;
     runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 3).pipe(
-      // We must debounce on watch mode because file watchers are not very accurate.
-      // Changes from just before a process runs can be picked up and cause rebuilds.
-      // In this case, cleanup from the test right before this one causes a few rebuilds.
-      debounceTime(1000),
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap((buildEvent) => expect(buildEvent.success).toBe(true, 'build should succeed')),
       tap(() => {
-        buildNumber += 1;
-        switch (buildNumber) {
+        buildCount++;
+        const hasLazyChunk = host.scopedSync().exists(join(outputPath, 'lazy-lazy-module.js'));
+        switch (phase) {
           case 1:
             // No lazy chunk should exist.
-            expect(host.scopedSync().exists(join(outputPath, 'lazy-module.js'))).toBe(false);
-            // Write the lazy chunk files. Order matters when writing these, because of imports.
-            host.writeMultipleFiles(lazyModuleFiles);
-            host.writeMultipleFiles(lazyModuleImport);
+            if (!hasLazyChunk) {
+              phase = 2;
+              host.writeMultipleFiles({ ...lazyModuleFiles, ...lazyModuleImport });
+            }
             break;
 
           case 2:
             // A lazy chunk should have been with the filename.
-            expect(host.scopedSync().exists(join(outputPath, 'lazy-lazy-module.js'))).toBe(true);
-            host.writeMultipleFiles(goldenValueFiles);
+            if (hasLazyChunk) {
+              phase = 3;
+              host.writeMultipleFiles(goldenValueFiles);
+            }
             break;
 
           case 3:
@@ -101,15 +100,18 @@ describe('Browser Builder rebuilds', () => {
             const content = virtualFs.fileBufferToString(
               host.scopedSync().read(normalize(fileName)),
             );
-            expect(content).toMatch(re);
-            break;
 
-          default:
+            if (re.test(content)) {
+              phase = 4;
+            }
             break;
         }
       }),
-      take(3),
-    ).toPromise().then(done, done.fail);
+      takeWhile(() => phase < 4),
+      ).toPromise().then(
+        () => done(),
+        () => done.fail(`stuck at phase ${phase} [builds: ${buildCount}]`),
+      );
   });
 
   it('rebuilds on CSS changes', (done) => {
diff --git a/packages/angular_devkit/build_angular/test/browser/replacements_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/replacements_spec_large.ts
index f03555356f3f..e73e56aec1d4 100644
--- a/packages/angular_devkit/build_angular/test/browser/replacements_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/replacements_spec_large.ts
@@ -8,7 +8,7 @@
 
 import { runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { debounceTime, take, tap } from 'rxjs/operators';
+import { takeWhile, tap } from 'rxjs/operators';
 import { browserTargetSpec, host } from '../utils';
 
 
@@ -112,33 +112,46 @@ describe('Browser Builder file replacements', () => {
       watch: true,
     };
 
-    let buildNumber = 0;
-
-    runTargetSpec(host, browserTargetSpec, overrides, 45000).pipe(
-      debounceTime(1000),
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+    let buildCount = 0;
+    let phase = 1;
+    runTargetSpec(host, browserTargetSpec, overrides, 30000).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true, 'build should succeed')),
       tap(() => {
         const fileName = join(outputPath, 'main.js');
         const content = virtualFs.fileBufferToString(host.scopedSync().read(fileName));
-        buildNumber += 1;
-
-        switch (buildNumber) {
+        const has42 = /meaning\s*=\s*42/.test(content);
+        buildCount++;
+        switch (phase) {
           case 1:
-            expect(content).toMatch(/meaning\s*=\s*42/);
-            expect(content).not.toMatch(/meaning\s*=\s*10/);
-            host.writeMultipleFiles({
-              'src/meaning-too.ts': 'export var meaning = 84;',
-            });
+            const has10 = /meaning\s*=\s*10/.test(content);
+
+            if (has42 && !has10) {
+              phase = 2;
+              host.writeMultipleFiles({
+                'src/meaning-too.ts': 'export var meaning = 84;',
+              });
+            }
             break;
 
           case 2:
-            expect(content).toMatch(/meaning\s*=\s*84/);
-            expect(content).not.toMatch(/meaning\s*=\s*42/);
+            const has84 = /meaning\s*=\s*84/.test(content);
+
+            if (has84 && !has42) {
+              phase = 3;
+            } else {
+              // try triggering a rebuild again
+              host.writeMultipleFiles({
+                'src/meaning-too.ts': 'export var meaning = 84;',
+              });
+            }
             break;
         }
       }),
-      take(2),
-    ).toPromise().then(() => done(), done.fail);
+      takeWhile(() => phase < 3),
+    ).toPromise().then(
+      () => done(),
+      () => done.fail(`stuck at phase ${phase} [builds: ${buildCount}]`),
+    );
   });
 
 });

From 9fdcdf49bb9bc3205b2ec7b32df19bcc490a5dcc Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 30 Aug 2018 17:08:47 +0100
Subject: [PATCH 0084/1703] ci: add back angular snapshot e2e on master

---
 .circleci/config.yml                          | 17 +++++++++++
 tests/legacy-cli/e2e/setup/015-build.ts       | 30 +------------------
 .../e2e/setup/500-create-project.ts           |  2 +-
 .../build/build-app-shell-with-schematic.ts   |  2 +-
 .../e2e/tests/build/build-app-shell.ts        |  2 +-
 .../e2e/tests/build/platform-server.ts        |  2 +-
 .../e2e/tests/build/rebuild-replacements.ts   |  2 +-
 .../tests/build/typescript/typescript-2_7.ts  |  2 +-
 tests/legacy-cli/e2e/utils/project.ts         | 15 ++++++----
 tests/legacy-cli/e2e_runner.ts                | 10 +++----
 10 files changed, 39 insertions(+), 45 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5ffb9a5590e0..fd888daecdc5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -101,6 +101,17 @@ jobs:
       - run: npm install --global npm@6
       - run: xvfb-run -a node ./tests/legacy-cli/run_e2e --glob=tests/basic/*
 
+  e2e-cli-ng-snapshots:
+    <<: *defaults
+    environment:
+      BASH_ENV: ~/.profile
+    resource_class: xlarge
+    parallelism: 4
+    steps:
+      - attach_workspace: *attach_options
+      - run: npm install --global npm@6
+      - run: xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} --ng-snapshots
+
   build:
     <<: *defaults
     steps:
@@ -170,6 +181,12 @@ workflows:
       - e2e-node-8:
           requires:
             - build
+      - e2e-cli-ng-snapshots:
+          requires:
+            - build
+          filters:
+            branches:
+              only: master
       - snapshot_publish:
           requires:
             - test
diff --git a/tests/legacy-cli/e2e/setup/015-build.ts b/tests/legacy-cli/e2e/setup/015-build.ts
index 8bf77c0a2e21..faf9b3f5b9c8 100644
--- a/tests/legacy-cli/e2e/setup/015-build.ts
+++ b/tests/legacy-cli/e2e/setup/015-build.ts
@@ -12,33 +12,5 @@ export default function() {
     return;
   }
 
-  return npm('run', 'build', '--', '--local')
-    .then(() => {
-      if (!argv.nightly && !argv['ng-sha']) {
-        return;
-      }
-
-      console.log('Updating package.json from dist for nightly Angular packages...');
-      const label = argv['ng-sha'] ? `#2.0.0-${argv['ng-sha']}` : '';
-
-      return Promise.all(Object.keys(packages).map(pkgName => {
-        return updateJsonFile(join(packages[pkgName].dist, 'package.json'), json => {
-          Object.keys(json['dependencies'] || {})
-            .filter(name => name.match(/^@angular\//))
-            .forEach(name => {
-              const pkgName = name.split(/\//)[1];
-              json['dependencies'][`@angular/${pkgName}`]
-                = `github:angular/${pkgName}-builds${label}`;
-            });
-
-          Object.keys(json['devDependencies'] || {})
-            .filter(name => name.match(/^@angular\//))
-            .forEach(name => {
-              const pkgName = name.split(/\//)[1];
-              json['devDependencies'][`@angular/${pkgName}`]
-                = `github:angular/${pkgName}-builds${label}`;
-            });
-        });
-      }));
-    });
+  return npm('run', 'build', '--', '--local');
 }
diff --git a/tests/legacy-cli/e2e/setup/500-create-project.ts b/tests/legacy-cli/e2e/setup/500-create-project.ts
index ddfadf67f99e..a0a30032dba3 100644
--- a/tests/legacy-cli/e2e/setup/500-create-project.ts
+++ b/tests/legacy-cli/e2e/setup/500-create-project.ts
@@ -37,7 +37,7 @@ export default async function() {
     .then(() => useCIChrome('e2e'))
     .then(() => useCIChrome('src'))
     .then(() => argv['ng-version'] ? useNgVersion(argv['ng-version']) : Promise.resolve())
-    .then(() => argv.nightly || argv['ng-sha'] ? useSha() : Promise.resolve())
+    .then(() => argv['ng-snapshots'] || argv['ng-tag'] ? useSha() : Promise.resolve())
     // npm link on Circle CI is very noisy.
     .then(() => silentNpm('install'))
     .then(() => ng('version'))
diff --git a/tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts b/tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts
index 1b291dbd2783..e9d85afca761 100644
--- a/tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts
+++ b/tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts
@@ -19,7 +19,7 @@ export default function () {
 
   let platformServerVersion = readNgVersion();
 
-  if (getGlobalVariable('argv').nightly) {
+  if (getGlobalVariable('argv')['ng-snapshots']) {
     platformServerVersion = 'github:angular/platform-server-builds';
   }
 
diff --git a/tests/legacy-cli/e2e/tests/build/build-app-shell.ts b/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
index bd5462ed70aa..b836abc35ffa 100644
--- a/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
+++ b/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
@@ -20,7 +20,7 @@ export default function () {
 
   let platformServerVersion = readNgVersion();
 
-  if (getGlobalVariable('argv').nightly) {
+  if (getGlobalVariable('argv')['ng-snapshots']) {
     platformServerVersion = 'github:angular/platform-server-builds';
   }
 
diff --git a/tests/legacy-cli/e2e/tests/build/platform-server.ts b/tests/legacy-cli/e2e/tests/build/platform-server.ts
index 9e5371afd806..ef40c90da6c5 100644
--- a/tests/legacy-cli/e2e/tests/build/platform-server.ts
+++ b/tests/legacy-cli/e2e/tests/build/platform-server.ts
@@ -21,7 +21,7 @@ export default function () {
 
   let platformServerVersion = readNgVersion();
 
-  if (getGlobalVariable('argv').nightly) {
+  if (getGlobalVariable('argv')['ng-snapshots']) {
     platformServerVersion = 'github:angular/platform-server-builds';
   }
 
diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts b/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts
index f9e99cb8d254..7669da896eaf 100644
--- a/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts
+++ b/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts
@@ -19,7 +19,7 @@ export default async function() {
 
       // Should trigger a rebuild.
     await appendToFile('src/environments/environment.prod.ts', `console.log('PROD');`);
-    await waitForAnyProcessOutputToMatch(webpackGoodRegEx, 40000);
+    await waitForAnyProcessOutputToMatch(webpackGoodRegEx, 45000);
   } catch (e) {
     error = e;
   }
diff --git a/tests/legacy-cli/e2e/tests/build/typescript/typescript-2_7.ts b/tests/legacy-cli/e2e/tests/build/typescript/typescript-2_7.ts
index 19b7ffd056a5..0afd67574d41 100644
--- a/tests/legacy-cli/e2e/tests/build/typescript/typescript-2_7.ts
+++ b/tests/legacy-cli/e2e/tests/build/typescript/typescript-2_7.ts
@@ -6,7 +6,7 @@ export default async function () {
   // TypeScript minor versions.
   return;
 
-  // Disable the strict TS version check for nightly
+  // Disable the strict TS version check for snapshots
   await updateJsonFile('src/tsconfig.app.json', configJson => {
     configJson.angularCompilerOptions = {
       ...configJson.angularCompilerOptions,
diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts
index ee6b1bc2d790..ceaa5acc979a 100644
--- a/tests/legacy-cli/e2e/utils/project.ts
+++ b/tests/legacy-cli/e2e/utils/project.ts
@@ -44,7 +44,7 @@ export function createProject(name: string, ...args: string[]) {
     .then(() => useDevKitSnapshots())
     .then(() => argv['ng2'] ? useNg2() : Promise.resolve())
     .then(() => argv['ng4'] ? useNg4() : Promise.resolve())
-    .then(() => argv.nightly || argv['ng-sha'] ? useSha() : Promise.resolve())
+    .then(() => argv['ng-snapshots'] || argv['ng-tag'] ? useSha() : Promise.resolve())
     .then(() => console.log(`Project ${name} created... Installing npm.`))
     .then(() => silentNpm('install'))
     .then(() => useCIDefaults(name));
@@ -110,10 +110,13 @@ export function useBuiltPackages() {
 
 export function useSha() {
   const argv = getGlobalVariable('argv');
-  if (argv.nightly || argv['ng-sha']) {
-    const label = argv['ng-sha'] ? `#2.0.0-${argv['ng-sha']}` : '';
+  if (argv['ng-snapshots'] || argv['ng-tag']) {
+    // We need more than the sha here, version is also needed. Examples of latest tags:
+    // 7.0.0-beta.4+dd2a650
+    // 6.1.6+4a8d56a
+    const label = argv['ng-tag'] ? argv['ng-tag'] : '';
     return updateJsonFile('package.json', json => {
-      // Install over the project with nightly builds.
+      // Install over the project with snapshot builds.
       Object.keys(json['dependencies'] || {})
         .filter(name => name.match(/^@angular\//))
         .forEach(name => {
@@ -135,6 +138,8 @@ export function useSha() {
           json['devDependencies'][`@angular/${pkgName}`]
             = `github:angular/${pkgName}-builds${label}`;
         });
+
+      json['devDependencies']['typescript'] = '~3.0.1';
     });
   } else {
     return Promise.resolve();
@@ -143,7 +148,7 @@ export function useSha() {
 
 export function useNgVersion(version: string) {
   return updateJsonFile('package.json', json => {
-    // Install over the project with nightly builds.
+    // Install over the project with specific versions.
     Object.keys(json['dependencies'] || {})
       .filter(name => name.match(/^@angular\//))
       .forEach(name => {
diff --git a/tests/legacy-cli/e2e_runner.ts b/tests/legacy-cli/e2e_runner.ts
index 4a93a78939d6..7eebdf2acb23 100644
--- a/tests/legacy-cli/e2e_runner.ts
+++ b/tests/legacy-cli/e2e_runner.ts
@@ -26,11 +26,11 @@ Error.stackTraceLimit = Infinity;
  *                    rerun tests.
  *   --noglobal       Skip linking your local @angular/cli directory. Can save a few seconds.
  *   --nosilent       Never silence ng commands.
- *   --ng-sha=SHA     Use a specific ng-sha. Similar to nightly but point to a master SHA instead
- *                    of using the latest.
+ *   --ng-tag=TAG     Use a specific tag for build snapshots. Similar to ng-snapshots but point to a
+ *                    tag of using the latest master.
+ *   --ng-snapshots   Install angular snapshot builds in the test project.
  *   --glob           Run tests matching this glob pattern (relative to tests/e2e/).
  *   --ignore         Ignore tests matching this glob pattern.
- *   --nightly        Install angular nightly builds over the test project.
  *   --reuse=/path    Use a path instead of create a new project. That project should have been
  *                    created, and npm installed. Ideally you want a project created by a previous
  *                    run of e2e.
@@ -46,13 +46,13 @@ const argv = minimist(process.argv.slice(2), {
     'appveyor',
     'debug',
     'eject',
-    'nightly',
+    'ng-snapshots',
     'noglobal',
     'nosilent',
     'noproject',
     'verbose',
   ],
-  'string': ['devkit', 'glob', 'ignore', 'reuse', 'ng-sha', 'tmpdir', 'ng-version'],
+  'string': ['devkit', 'glob', 'ignore', 'reuse', 'ng-tag', 'tmpdir', 'ng-version'],
   'number': ['nb-shards', 'shard'],
 });
 

From c2625271deec1a9c05cdaaa2ccd287cdee429977 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 23 Aug 2018 11:19:29 +0100
Subject: [PATCH 0085/1703] feat(@angular-devkit/benchmark): add package

---
 .monorepo.json                                |   5 +
 bin/benchmark                                 |  19 ++
 package.json                                  |   1 +
 packages/angular_devkit/benchmark/BUILD       |  59 ++++++
 packages/angular_devkit/benchmark/README.md   | 116 +++++++++++
 .../angular_devkit/benchmark/package.json     |  24 +++
 .../angular_devkit/benchmark/src/command.ts   |  23 +++
 .../benchmark/src/default-reporter.ts         |  24 +++
 .../benchmark/src/default-stats-capture.ts    |  60 ++++++
 .../src/default-stats-capture_spec.ts         |  48 +++++
 .../angular_devkit/benchmark/src/index.ts     |  16 ++
 .../benchmark/src/interfaces.d.ts             |  49 +++++
 packages/angular_devkit/benchmark/src/main.ts | 184 ++++++++++++++++++
 .../angular_devkit/benchmark/src/main_spec.ts | 145 ++++++++++++++
 .../benchmark/src/monitored-process.ts        | 106 ++++++++++
 .../benchmark/src/monitored-process_spec.ts   |  50 +++++
 .../benchmark/src/run-benchmark.ts            |  98 ++++++++++
 .../benchmark/src/test/exit-code-one.js       |   1 +
 .../benchmark/src/test/fibonacci.js           |   2 +
 .../benchmark/src/test/test-script.js         |   7 +
 .../angular_devkit/benchmark/src/utils.ts     |  49 +++++
 yarn.lock                                     |  10 +
 22 files changed, 1096 insertions(+)
 create mode 100755 bin/benchmark
 create mode 100644 packages/angular_devkit/benchmark/BUILD
 create mode 100644 packages/angular_devkit/benchmark/README.md
 create mode 100644 packages/angular_devkit/benchmark/package.json
 create mode 100644 packages/angular_devkit/benchmark/src/command.ts
 create mode 100644 packages/angular_devkit/benchmark/src/default-reporter.ts
 create mode 100644 packages/angular_devkit/benchmark/src/default-stats-capture.ts
 create mode 100644 packages/angular_devkit/benchmark/src/default-stats-capture_spec.ts
 create mode 100644 packages/angular_devkit/benchmark/src/index.ts
 create mode 100644 packages/angular_devkit/benchmark/src/interfaces.d.ts
 create mode 100644 packages/angular_devkit/benchmark/src/main.ts
 create mode 100644 packages/angular_devkit/benchmark/src/main_spec.ts
 create mode 100644 packages/angular_devkit/benchmark/src/monitored-process.ts
 create mode 100644 packages/angular_devkit/benchmark/src/monitored-process_spec.ts
 create mode 100644 packages/angular_devkit/benchmark/src/run-benchmark.ts
 create mode 100644 packages/angular_devkit/benchmark/src/test/exit-code-one.js
 create mode 100644 packages/angular_devkit/benchmark/src/test/fibonacci.js
 create mode 100644 packages/angular_devkit/benchmark/src/test/test-script.js
 create mode 100644 packages/angular_devkit/benchmark/src/utils.ts

diff --git a/.monorepo.json b/.monorepo.json
index d9c426f5a664..2f1f149079ca 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -87,6 +87,11 @@
       "hash": "51b6cc55b25fce87f6a92f0d0942f79c",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
+    "@angular-devkit/benchmark": {
+      "name": "Benchmark",
+      "section": "Tooling",
+      "version": "0.0.0"
+    },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
       "links": [
diff --git a/bin/benchmark b/bin/benchmark
new file mode 100755
index 000000000000..4ada663d8bfc
--- /dev/null
+++ b/bin/benchmark
@@ -0,0 +1,19 @@
+#!/usr/bin/env node
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+'use strict';
+
+
+require('../lib/bootstrap-local');
+const packages = require('../lib/packages').packages;
+const main = require(packages['@angular-devkit/benchmark'].bin['benchmark']).main;
+
+const args = process.argv.slice(2);
+main({ args })
+  .then(exitCode => process.exitCode = exitCode)
+  .catch(e => { throw (e); });
diff --git a/package.json b/package.json
index 9f6c4df624c2..8affd2f1af92 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
   "description": "Software Development Kit for Angular",
   "bin": {
     "architect": "./bin/architect",
+    "benchmark": "./bin/benchmark",
     "build-optimizer": "./bin/build-optimizer",
     "devkit-admin": "./bin/devkit-admin",
     "ng": "./bin/ng",
diff --git a/packages/angular_devkit/benchmark/BUILD b/packages/angular_devkit/benchmark/BUILD
new file mode 100644
index 000000000000..3d914cf54edb
--- /dev/null
+++ b/packages/angular_devkit/benchmark/BUILD
@@ -0,0 +1,59 @@
+# Copyright Google Inc. All Rights Reserved.
+#
+# Use of this source code is governed by an MIT-style license that can be
+# found in the LICENSE file at https://angular.io/license
+
+licenses(["notice"])  # MIT
+
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
+
+package(default_visibility = ["//visibility:public"])
+
+ts_library(
+    name = "benchmark",
+    srcs = glob(
+        include = ["src/**/*.ts"],
+        exclude = [
+            "src/**/*_spec.ts",
+            "src/**/*_spec_large.ts",
+            "src/**/*_benchmark.ts",
+        ],
+    ),
+    module_name = "@angular-devkit/benchmark",
+    module_root = "src/index.d.ts",
+    deps = [
+        "//packages/angular_devkit/core",
+        "@rxjs",
+        "@rxjs//operators",
+        # @typings: node
+    ],
+)
+
+ts_library(
+    name = "benchmark_test_lib",
+    srcs = glob(
+        include = [
+            "src/**/*_spec.ts",
+            "src/**/*_spec_large.ts",
+        ],
+    ),
+    data = [
+        "src/test/exit-code-one.js",
+        "src/test/fibonacci.js",
+        "src/test/test-script.js",
+    ],
+    deps = [
+        ":benchmark",
+        "//packages/angular_devkit/core",
+        "@rxjs",
+        "@rxjs//operators",
+        # @typings: jasmine
+        # @typings: node
+    ],
+)
+
+jasmine_node_test(
+    name = "benchmark_test",
+    srcs = [":benchmark_test_lib"],
+)
\ No newline at end of file
diff --git a/packages/angular_devkit/benchmark/README.md b/packages/angular_devkit/benchmark/README.md
new file mode 100644
index 000000000000..caddc4c97942
--- /dev/null
+++ b/packages/angular_devkit/benchmark/README.md
@@ -0,0 +1,116 @@
+# Angular Devkit Benchmark
+
+This tool provides benchmark information for processes.
+The tool will gathering metrics from a given command, then average them out over the total runs.
+
+It currently shows only time, process, cpu, and memory used but might be extended in the future.
+
+This tool was created to provide an objective and reproducible way of benchmarking process
+performance.
+
+Given a process (or its source code), process inputs and environment, keeping two of these elements
+constant while varying the third should allow for meaningful benchmarks over time.
+
+In the context of the DevKit, we publish many CLI tools and have access to their source code.
+By tracking tool resource usage we can catch performance regressions or improvements on our CI.
+
+
+## STABILITY AND SUPPORT DISCLAIMER
+
+This package is not currently stable. Usage, output and API may change at any time.
+Support is not ensured.
+
+## Installation
+
+You can install the benchmark tool via `npm install -g benchmark` for a global install, or without
+`-g` for a local install.
+Installing globally gives you access to the `benchmark` binary in your `PATH`.
+
+
+## CLI Usage
+
+Call the `benchmark` binary, followed by options, then double dash, then the command to benchmark.
+
+For more information on the available options, run `benchmark --help`:
+```
+$ benchmark --help
+[benchmark] benchmark [options] -- [command to benchmark]
+
+Collects process stats from running the command.
+
+Options:
+    --help                    Show this message.
+    (... other available options)
+
+Example:
+    benchmark --iterations=3 -- node my-script.js
+```
+
+
+## Example
+
+Given the naive implementation of a fibonacci number calculator below:
+```
+// fibonacci.js
+const fib = (n) => n > 1 ? fib(n - 1) + fib(n - 2) : n;
+console.log(fib(parseInt(process.argv[2])));
+```
+
+Run `benchmark -- node fibonacci.js 40` to benchmark calculating the 40th fibonacci number:
+
+```
+$ benchmark -- node fibonacci.js 40
+[benchmark] Benchmarking process over 5 iterations, with up to 5 retries.
+[benchmark]   node fibonacci.js 40 (at D:\sandbox\latest-project)
+[benchmark] Process Stats
+[benchmark]   Elapsed Time: 2365.40 ms (2449.00, 2444.00, 2357.00, 2312.00, 2265.00)
+[benchmark]   Average Process usage: 1.00 process(es) (1.00, 1.00, 1.00, 1.00, 1.00)
+[benchmark]   Peak Process usage: 1.00 process(es) (1.00, 1.00, 1.00, 1.00, 1.00)
+[benchmark]   Average CPU usage: 4.72 % (5.03, 4.86, 4.50, 4.50, 4.69)
+[benchmark]   Peak CPU usage: 23.40 % (25.00, 23.40, 21.80, 21.80, 25.00)
+[benchmark]   Average Memory usage: 22.34 MB (22.32, 22.34, 22.34, 22.35, 22.35)
+[benchmark]   Peak Memory usage: 22.34 MB (22.32, 22.34, 22.34, 22.35, 22.35)
+```
+
+
+## API Usage
+
+You can also use the benchmarking API directly:
+
+```
+import { Command, defaultStatsCapture, runBenchmark } from '@angular-devkit/benchmark';
+
+const command = new Command('node', ['fibonacci.js', '40']);
+const captures = [defaultStatsCapture];
+
+runBenchmark({ command, command }).subscribe(results => {
+  // results is:[{
+  //   "name": "Process Stats",
+  //   "metrics": [{
+  //     "name": "Elapsed Time", "unit": "ms", "value": 1883.6,
+  //     "componentValues": [1733, 1957, 1580, 1763, 2385]
+  //   }, {
+  //     "name": "Average Process usage", "unit": "process(es)", "value": 1,
+  //     "componentValues": [1, 1, 1, 1, 1]
+  //   }, {
+  //     "name": "Peak Process usage", "unit": "process(es)", "value": 1,
+  //     "componentValues": [1, 1, 1, 1, 1]
+  //   }, {
+  //     "name": "Average CPU usage", "unit": "%", "value": 3.0855555555555556,
+  //     "componentValues": [1.9625, 1.9500000000000002, 1.9500000000000002, 4.887499999999999, 4.677777777777778]
+  //   }, {
+  //     "name": "Peak CPU usage", "unit": "%", "value": 19.380000000000003,
+  //     "componentValues": [15.7, 15.6, 15.6, 25, 25]
+  //   }, {
+  //     "name": "Average Memory usage", "unit": "MB", "value": 22.364057600000002,
+  //     "componentValues": [22.383104, 22.332416, 22.401024, 22.355968, 22.347776]
+  //   }, {
+  //     "name": "Peak Memory usage", "unit": "MB", "value": 22.3649792,
+  //     "componentValues": [22.384639999999997, 22.335487999999998, 22.401024, 22.355968, 22.347776]
+  //   }]
+  // }]
+});
+```
+
+A good example of API usage is the `main` binary itself, found in `./src/main.ts`.
+We recommend using TypeScript to get full access to the interfaces included.
\ No newline at end of file
diff --git a/packages/angular_devkit/benchmark/package.json b/packages/angular_devkit/benchmark/package.json
new file mode 100644
index 000000000000..a65131ac623b
--- /dev/null
+++ b/packages/angular_devkit/benchmark/package.json
@@ -0,0 +1,24 @@
+{
+  "name": "@angular-devkit/benchmark",
+  "version": "0.0.0",
+  "private": true,
+  "description": "Angular Benchmark",
+  "bin": {
+    "benchmark": "./src/main.js"
+  },
+  "keywords": [
+    "benchmark"
+  ],
+  "engines": {
+    "node": ">= 8.9.0",
+    "npm": ">= 5.5.1"
+  },
+  "dependencies": {
+    "@angular-devkit/core": "0.0.0",
+    "minimist": "^1.2.0",
+    "pidusage": "^2.0.16",
+    "pidtree": "^0.3.0",
+    "rxjs": "~6.2.0",
+    "tree-kill": "^1.2.0"
+  }
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/benchmark/src/command.ts b/packages/angular_devkit/benchmark/src/command.ts
new file mode 100644
index 000000000000..03003a0f11b1
--- /dev/null
+++ b/packages/angular_devkit/benchmark/src/command.ts
@@ -0,0 +1,23 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export class Command {
+  constructor(
+    public cmd: string,
+    public args: string[] = [],
+    public cwd: string = process.cwd(),
+    public expectedExitCode = 0,
+  ) { }
+
+  toString() {
+    const { cmd, args, cwd } = this;
+    const argsStr = args.length > 0 ? ' ' + args.join(' ') : '';
+
+    return `${cmd}${argsStr} (at ${cwd})`;
+  }
+}
diff --git a/packages/angular_devkit/benchmark/src/default-reporter.ts b/packages/angular_devkit/benchmark/src/default-reporter.ts
new file mode 100644
index 000000000000..9224cbe8c057
--- /dev/null
+++ b/packages/angular_devkit/benchmark/src/default-reporter.ts
@@ -0,0 +1,24 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { logging, tags } from '@angular-devkit/core';
+import { AggregatedMetric, BenchmarkReporter, Metric } from './interfaces';
+
+export const defaultReporter = (logger: logging.Logger): BenchmarkReporter => (process, groups) => {
+  const toplevelLogger = logger;
+  const indentLogger = new logging.IndentLogger('benchmark-indent-logger', toplevelLogger);
+
+  const formatMetric = (metric: Metric | AggregatedMetric) => tags.oneLine`
+    ${metric.name}: ${metric.value.toFixed(2)} ${metric.unit}
+    ${metric.componentValues ? `(${metric.componentValues.map(v => v.toFixed(2)).join(', ')})` : ''}
+  `;
+
+  groups.forEach(group => {
+    toplevelLogger.info(`${group.name}`);
+    group.metrics.forEach(metric => indentLogger.info(formatMetric(metric)));
+  });
+};
diff --git a/packages/angular_devkit/benchmark/src/default-stats-capture.ts b/packages/angular_devkit/benchmark/src/default-stats-capture.ts
new file mode 100644
index 000000000000..ad3bed3b9252
--- /dev/null
+++ b/packages/angular_devkit/benchmark/src/default-stats-capture.ts
@@ -0,0 +1,60 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { Observable } from 'rxjs';
+import { map, reduce } from 'rxjs/operators';
+import { AggregatedProcessStats, Capture, MetricGroup, MonitoredProcess } from './interfaces';
+import { cumulativeMovingAverage, max } from './utils';
+
+
+export const defaultStatsCapture: Capture = (
+  process: MonitoredProcess,
+): Observable<MetricGroup> => {
+  type Accumulator = {
+    elapsed: number,
+    avgProcesses: number,
+    peakProcesses: number,
+    avgCpu: number,
+    peakCpu: number,
+    avgMemory: number,
+    peakMemory: number,
+  };
+  const seed: Accumulator = {
+    elapsed: 0,
+    avgProcesses: 0,
+    peakProcesses: 0,
+    avgCpu: 0,
+    peakCpu: 0,
+    avgMemory: 0,
+    peakMemory: 0,
+  };
+
+  return process.stats$.pipe(
+    reduce<AggregatedProcessStats, Accumulator>((acc, val, idx) => ({
+      elapsed: val.elapsed,
+      avgProcesses: cumulativeMovingAverage(acc.avgProcesses, val.processes, idx),
+      peakProcesses: max(acc.peakProcesses, val.processes),
+      avgCpu: cumulativeMovingAverage(acc.avgCpu, val.cpu, idx),
+      peakCpu: max(acc.peakCpu, val.cpu),
+      avgMemory: cumulativeMovingAverage(acc.avgMemory, val.memory, idx),
+      peakMemory: max(acc.peakMemory, val.memory),
+    }), seed),
+    map(metrics => ({
+      name: 'Process Stats',
+      metrics: [
+        { name: 'Elapsed Time', unit: 'ms', value: metrics.elapsed },
+        { name: 'Average Process usage', unit: 'process(es)', value: metrics.avgProcesses },
+        { name: 'Peak Process usage', unit: 'process(es)', value: metrics.peakProcesses },
+        { name: 'Average CPU usage', unit: '%', value: metrics.avgCpu },
+        { name: 'Peak CPU usage', unit: '%', value: metrics.peakCpu },
+        { name: 'Average Memory usage', unit: 'MB', value: metrics.avgMemory * 1e-6 },
+        { name: 'Peak Memory usage', unit: 'MB', value: metrics.peakMemory * 1e-6 },
+      ],
+    })),
+  );
+};
diff --git a/packages/angular_devkit/benchmark/src/default-stats-capture_spec.ts b/packages/angular_devkit/benchmark/src/default-stats-capture_spec.ts
new file mode 100644
index 000000000000..ad367162b3d1
--- /dev/null
+++ b/packages/angular_devkit/benchmark/src/default-stats-capture_spec.ts
@@ -0,0 +1,48 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Observable } from 'rxjs';
+import { toArray } from 'rxjs/operators';
+import { defaultStatsCapture } from './default-stats-capture';
+import { AggregatedProcessStats, MonitoredProcess } from './interfaces';
+
+
+describe('defaultStatsCapture', () => {
+  it('works', async () => {
+    const stats$ = new Observable<AggregatedProcessStats>(obs => {
+      const ignoredStats = { ppid: 1, pid: 1, ctime: 1, timestamp: 1 };
+      obs.next({
+        processes: 1, cpu: 0, memory: 10 * 1e6, elapsed: 1000,
+        ...ignoredStats,
+      });
+      obs.next({
+        processes: 3, cpu: 40, memory: 2 * 1e6, elapsed: 2000,
+        ...ignoredStats,
+      });
+      obs.next({
+        processes: 5, cpu: 20, memory: 3 * 1e6, elapsed: 3000,
+        ...ignoredStats,
+      });
+      obs.complete();
+    });
+    const process = { stats$ } as {} as MonitoredProcess;
+
+    const res = await defaultStatsCapture(process).pipe(toArray()).toPromise();
+    expect(res).toEqual([{
+      name: 'Process Stats',
+      metrics: [
+        { name: 'Elapsed Time', unit: 'ms', value: 3000 },
+        { name: 'Average Process usage', unit: 'process(es)', value: 3 },
+        { name: 'Peak Process usage', unit: 'process(es)', value: 5 },
+        { name: 'Average CPU usage', unit: '%', value: 20 },
+        { name: 'Peak CPU usage', unit: '%', value: 40 },
+        { name: 'Average Memory usage', unit: 'MB', value: 5 },
+        { name: 'Peak Memory usage', unit: 'MB', value: 10 },
+      ],
+    }]);
+  });
+});
diff --git a/packages/angular_devkit/benchmark/src/index.ts b/packages/angular_devkit/benchmark/src/index.ts
new file mode 100644
index 000000000000..65855d04c410
--- /dev/null
+++ b/packages/angular_devkit/benchmark/src/index.ts
@@ -0,0 +1,16 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export * from './interfaces';
+export * from './command';
+export * from './default-reporter';
+export * from './default-stats-capture';
+export * from './monitored-process';
+export * from './run-benchmark';
+export * from './utils';
+export * from './main';
diff --git a/packages/angular_devkit/benchmark/src/interfaces.d.ts b/packages/angular_devkit/benchmark/src/interfaces.d.ts
new file mode 100644
index 000000000000..215164799ac4
--- /dev/null
+++ b/packages/angular_devkit/benchmark/src/interfaces.d.ts
@@ -0,0 +1,49 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Observable } from 'rxjs';
+import { Command } from './command';
+
+export interface AggregatedProcessStats {
+  processes: number;      // number of processes
+  cpu: number;            // percentage (from 0 to 100*vcore)
+  memory: number;         // bytes
+  ppid: number;           // PPID
+  pid: number;            // PID
+  ctime: number;          // ms user + system time
+  elapsed: number;        // ms since the start of the process
+  timestamp: number;      // ms since epoch
+}
+
+export interface MonitoredProcess {
+  stats$: Observable<AggregatedProcessStats>;
+  stdout$: Observable<Buffer>;
+  stderr$: Observable<Buffer>;
+  run(): Observable<number>;
+  toString(): string;
+}
+
+export interface Metric {
+  name: string;
+  unit: string;
+  value: number;
+  componentValues?: number[];
+}
+
+export interface AggregatedMetric extends Metric {
+  componentValues: number[];
+}
+
+export interface MetricGroup {
+  name: string;
+  metrics: (Metric | AggregatedMetric)[];
+}
+
+export type Capture = (process: MonitoredProcess) => Observable<MetricGroup>;
+
+// TODO: might need to allow reporters to say they are finished.
+export type BenchmarkReporter = (command: Command, groups: MetricGroup[]) => void;
diff --git a/packages/angular_devkit/benchmark/src/main.ts b/packages/angular_devkit/benchmark/src/main.ts
new file mode 100644
index 000000000000..edd39881b35e
--- /dev/null
+++ b/packages/angular_devkit/benchmark/src/main.ts
@@ -0,0 +1,184 @@
+#!/usr/bin/env node
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { logging, tags, terminal } from '@angular-devkit/core';
+import { appendFileSync, writeFileSync } from 'fs';
+import * as minimist from 'minimist';
+import { filter, map, toArray } from 'rxjs/operators';
+import { Command } from '../src/command';
+import { defaultReporter } from '../src/default-reporter';
+import { defaultStatsCapture } from '../src/default-stats-capture';
+import { runBenchmark } from '../src/run-benchmark';
+
+
+export interface MainOptions {
+  args: string[];
+  stdout?: { write(buffer: string | Buffer): boolean };
+  stderr?: { write(buffer: string | Buffer): boolean };
+}
+
+export async function main({
+  args,
+  stdout = process.stdout,
+  stderr = process.stderr,
+}: MainOptions): Promise<0 | 1> {
+
+  // Show usage of the CLI tool, and exit the process.
+  function usage(logger: logging.Logger) {
+    logger.info(tags.stripIndent`
+    benchmark [options] -- [command to benchmark]
+
+    Collects process stats from running the command.
+
+    Options:
+        --help                    Show this message.
+        --verbose                 Show more information while running.
+        --exit-code               Expected exit code for the command. Default is 0.
+        --iterations              Number of iterations to run the benchmark over. Default is 5.
+        --retries                 Number of times to retry when process fails. Default is 5.
+        --cwd                     Current working directory to run the process in.
+        --output-file             File to output benchmark log to.
+        --overwrite-output-file   If the output file should be overwritten rather than appended to.
+        --prefix                  Logging prefix.
+
+    Example:
+        benchmark --iterations=3 -- node my-script.js
+  `);
+  }
+
+  interface BenchmarkCliArgv {
+    help: boolean;
+    verbose: boolean;
+    'overwrite-output-file': boolean;
+    'exit-code': number;
+    iterations: number;
+    retries: number;
+    'output-file': string | null;
+    cwd: string;
+    prefix: string;
+    '--': string[] | null;
+  }
+
+  // Parse the command line.
+  const argv = minimist(args, {
+    boolean: ['help', 'verbose', 'overwrite-output-file'],
+    default: {
+      'exit-code': 0,
+      'iterations': 5,
+      'retries': 5,
+      'output-file': null,
+      'cwd': process.cwd(),
+      'prefix': '[benchmark]',
+    },
+    '--': true,
+  }) as {} as BenchmarkCliArgv;
+
+  // Create the DevKit Logger used through the CLI.
+  const logger = new logging.TransformLogger(
+    'benchmark-prefix-logger',
+    stream => stream.pipe(map(entry => {
+      if (argv['prefix']) { entry.message = `${argv['prefix']} ${entry.message}`; }
+
+      return entry;
+    })),
+  );
+
+  // Log to console.
+  logger
+    .pipe(filter(entry => (entry.level != 'debug' || argv['verbose'])))
+    .subscribe(entry => {
+      let color: (s: string) => string = x => terminal.dim(terminal.white(x));
+      let output = stdout;
+      switch (entry.level) {
+        case 'info':
+          color = terminal.white;
+          break;
+        case 'warn':
+          color = terminal.yellow;
+          break;
+        case 'error':
+          color = terminal.red;
+          output = stderr;
+          break;
+        case 'fatal':
+          color = (x: string) => terminal.bold(terminal.red(x));
+          output = stderr;
+          break;
+      }
+
+      output.write(color(entry.message) + '\n');
+    });
+
+
+  // Print help.
+  if (argv['help']) {
+    usage(logger);
+
+    return 0;
+  }
+
+  const commandArgv = argv['--'];
+
+  // Exit early if we can't find the command to benchmark.
+  if (!commandArgv || !Array.isArray(argv['--']) || (argv['--'] as Array<string>).length < 1) {
+    logger.fatal(`Missing command, see benchmark --help for help.`);
+
+    return 1;
+  }
+
+  // Setup file logging.
+  if (argv['output-file'] !== null) {
+    if (argv['overwrite-output-file']) {
+      writeFileSync(argv['output-file'] as string, '');
+    }
+    logger.pipe(filter(entry => (entry.level != 'debug' || argv['verbose'])))
+      .subscribe(entry => appendFileSync(argv['output-file'] as string, `${entry.message}\n`));
+  }
+
+  // Run benchmark on given command, capturing stats and reporting them.
+  const exitCode = argv['exit-code'];
+  const cmd = commandArgv[0];
+  const cmdArgs = commandArgv.slice(1);
+  const command = new Command(cmd, cmdArgs, argv['cwd'], exitCode);
+  const captures = [defaultStatsCapture];
+  const reporters = [defaultReporter(logger)];
+  const iterations = argv['iterations'];
+  const retries = argv['retries'];
+
+  logger.info(`Benchmarking process over ${iterations} iterations, with up to ${retries} retries.`);
+  logger.info(`  ${command.toString()}`);
+
+  let res;
+  try {
+    res = await runBenchmark(
+      { command, captures, reporters, iterations, retries, logger },
+    ).pipe(toArray()).toPromise();
+  } catch (error) {
+    if (error.message) {
+      logger.fatal(error.message);
+    } else {
+      logger.fatal(error);
+    }
+
+    return 1;
+  }
+
+  if (res.length === 0) {
+    return 1;
+  }
+
+  return 0;
+}
+
+if (require.main === module) {
+  const args = process.argv.slice(2);
+  main({ args })
+    .then(exitCode => process.exitCode = exitCode)
+    .catch(e => { throw (e); });
+}
diff --git a/packages/angular_devkit/benchmark/src/main_spec.ts b/packages/angular_devkit/benchmark/src/main_spec.ts
new file mode 100644
index 000000000000..eb26a29f2b32
--- /dev/null
+++ b/packages/angular_devkit/benchmark/src/main_spec.ts
@@ -0,0 +1,145 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { existsSync, readFileSync, unlinkSync, writeFileSync } from 'fs';
+import { basename, dirname, join } from 'path';
+import { main } from './main';
+// tslint:disable-next-line:no-implicit-dependencies
+const temp = require('temp');
+
+
+// We only care about the write method in these mocks of NodeJS.WriteStream.
+class MockWriteStream {
+  lines: string[] = [];
+  write(str: string) {
+    // Strip color control characters.
+    this.lines.push(str.replace(/[^\x20-\x7F]\[\d+m/g, ''));
+
+    return true;
+  }
+}
+
+describe('benchmark binary', () => {
+  const benchmarkScript = require.resolve(join(__dirname, './test/fibonacci.js'));
+  const exitCodeOneScript = require.resolve(join(__dirname, './test/exit-code-one.js'));
+  const outputFileRoot = temp.mkdirSync('benchmark-binary-spec-');
+  const outputFile = join(outputFileRoot, 'output.log');
+  let stdout: MockWriteStream, stderr: MockWriteStream;
+
+  beforeEach(() => {
+    stdout = new MockWriteStream();
+    stderr = new MockWriteStream();
+  });
+
+  afterEach(() => {
+    if (existsSync(outputFile)) { unlinkSync(outputFile); }
+  });
+
+  it('works', async () => {
+    const args = ['--', 'node', benchmarkScript, '30'];
+    const res = await main({ args, stdout, stderr });
+    expect(stdout.lines).toContain('[benchmark] Process Stats\n');
+    expect(res).toEqual(0);
+  });
+
+  it('fails with no command', async () => {
+    const args: string[] = [];
+    const res = await main({ args, stdout, stderr });
+    expect(stderr.lines).toContain(
+      '[benchmark] Missing command, see benchmark --help for help.\n');
+    expect(res).toEqual(1);
+  });
+
+  it('fails with when exit code is not expected', async () => {
+    const args: string[] = ['--', 'node', exitCodeOneScript];
+    const res = await main({ args, stdout, stderr });
+    expect(stderr.lines).toContain(
+      '[benchmark] Maximum number of retries (5) for command was exceeded.\n');
+    expect(res).toEqual(1);
+  });
+
+  it('prints help', async () => {
+    const args = ['--help'];
+    const res = await main({ args, stdout, stderr });
+    // help is a multiline write.
+    expect(stdout.lines[0]).toContain('Options:\n');
+    expect(res).toEqual(0);
+  });
+
+  it('uses verbose', async () => {
+    const args = ['--verbose', '--', 'node', benchmarkScript, '30'];
+    const res = await main({ args, stdout, stderr });
+    expect(stdout.lines).toContain('[benchmark] Run #1: finished successfully\n');
+    expect(res).toEqual(0);
+  });
+
+  it('uses exit code', async () => {
+    const args = ['--exit-code', '1', '--', 'node', exitCodeOneScript];
+    const res = await main({ args, stdout, stderr });
+    expect(stdout.lines).toContain('[benchmark] Process Stats\n');
+    expect(res).toEqual(0);
+  });
+
+  it('uses iterations', async () => {
+    const args = ['--iterations', '3', '--', 'node', benchmarkScript, '30'];
+    const res = await main({ args, stdout, stderr });
+    expect(stdout.lines).toContain(
+      '[benchmark] Benchmarking process over 3 iterations, with up to 5 retries.\n');
+    expect(res).toEqual(0);
+  });
+
+  it('uses retries', async () => {
+    const args = ['--retries', '3', '--', 'node', benchmarkScript, '30'];
+    const res = await main({ args, stdout, stderr });
+    expect(stdout.lines).toContain(
+      '[benchmark] Benchmarking process over 5 iterations, with up to 3 retries.\n');
+    expect(res).toEqual(0);
+  });
+
+  it('uses cwd', async () => {
+    const args = ['--cwd', dirname(benchmarkScript), '--', 'node', basename(benchmarkScript), '30'];
+    const res = await main({ args, stdout, stderr });
+    expect(stdout.lines).toContain('[benchmark] Process Stats\n');
+    expect(res).toEqual(0);
+  });
+
+  it('uses output-file', async () => {
+    const args = ['--output-file', outputFile, '--', 'node', benchmarkScript, '30'];
+    const res = await main({ args, stdout, stderr });
+    expect(res).toEqual(0);
+    expect(existsSync(outputFile)).toBe(true, 'outputFile exists');
+    expect(readFileSync(outputFile, 'utf-8')).toContain('[benchmark] Process Stats');
+  });
+
+  it('appends to output-file', async () => {
+    writeFileSync(outputFile, 'existing line');
+    const args = ['--output-file', outputFile, '--', 'node', benchmarkScript, '30'];
+    const res = await main({ args, stdout, stderr });
+    expect(res).toEqual(0);
+    expect(existsSync(outputFile)).toBe(true, 'outputFile exists');
+    expect(readFileSync(outputFile, 'utf-8')).toContain('existing line');
+  });
+
+  it('overwrites output-file', async () => {
+    writeFileSync(outputFile, 'existing line');
+    const args = [
+      '--output-file', outputFile, '--overwrite-output-file',
+      '--', 'node', benchmarkScript, '30',
+    ];
+    const res = await main({ args, stdout, stderr });
+    expect(res).toEqual(0);
+    expect(existsSync(outputFile)).toBe(true, 'outputFile exists');
+    expect(readFileSync(outputFile, 'utf-8')).not.toContain('existing line');
+  });
+
+  it('uses prefix', async () => {
+    const args = ['--prefix', '[abc]', '--', 'node', benchmarkScript, '30'];
+    const res = await main({ args, stdout, stderr });
+    stdout.lines.forEach(line => expect(line).toMatch(/^\[abc\]/));
+    expect(res).toEqual(0);
+  });
+});
diff --git a/packages/angular_devkit/benchmark/src/monitored-process.ts b/packages/angular_devkit/benchmark/src/monitored-process.ts
new file mode 100644
index 000000000000..885736121e43
--- /dev/null
+++ b/packages/angular_devkit/benchmark/src/monitored-process.ts
@@ -0,0 +1,106 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { SpawnOptions, spawn } from 'child_process';
+import { Observable, Subject, from, timer } from 'rxjs';
+import { concatMap, map, onErrorResumeNext, tap } from 'rxjs/operators';
+import { Command } from './command';
+import { AggregatedProcessStats, MonitoredProcess } from './interfaces';
+const pidusage = require('pidusage');
+const pidtree = require('pidtree');
+const treeKill = require('tree-kill');
+
+
+// Cleanup when the parent process exits.
+const defaultProcessExitCb = () => { };
+let processExitCb = defaultProcessExitCb;
+process.on('exit', () => {
+  processExitCb();
+  processExitCb = defaultProcessExitCb;
+});
+
+export class LocalMonitoredProcess implements MonitoredProcess {
+  private stats = new Subject<AggregatedProcessStats>();
+  private stdout = new Subject<Buffer>();
+  private stderr = new Subject<Buffer>();
+  private pollingRate = 100;
+  stats$: Observable<AggregatedProcessStats> = this.stats.asObservable();
+  stdout$: Observable<Buffer> = this.stdout.asObservable();
+  stderr$: Observable<Buffer> = this.stderr.asObservable();
+
+  constructor(private command: Command) { }
+
+  run(): Observable<number> {
+    return new Observable(obs => {
+      const { cmd, cwd, args } = this.command;
+      const spawnOptions: SpawnOptions = { cwd: cwd, shell: true };
+
+      // Spawn the process.
+      const childProcess = spawn(cmd, args, spawnOptions);
+
+      // Emit output and stats.
+      childProcess.stdout.on('data', (data: Buffer) => this.stdout.next(data));
+      childProcess.stderr.on('data', (data: Buffer) => this.stderr.next(data));
+      const statsSubs = timer(0, this.pollingRate).pipe(
+        concatMap(() => from(pidtree(childProcess.pid, { root: true }))),
+        concatMap((pids: number[]) => from(pidusage(pids, { maxage: 5 * this.pollingRate }))),
+        map((statsByProcess: { [key: string]: AggregatedProcessStats }) => {
+          // Ignore the spawned shell in the total process number.
+          const pids = Object.keys(statsByProcess)
+            .filter(pid => pid != childProcess.pid.toString());
+          const processes = pids.length;
+          // We want most stats from the parent process.
+          const { pid, ppid, ctime, elapsed, timestamp } = statsByProcess[childProcess.pid];
+          // CPU and memory should be agreggated.
+          let cpu = 0, memory = 0;
+          for (const pid of pids) {
+            cpu += statsByProcess[pid].cpu;
+            memory += statsByProcess[pid].memory;
+          }
+
+          return {
+            processes, cpu, memory, pid, ppid, ctime, elapsed, timestamp,
+          } as AggregatedProcessStats;
+        }),
+        tap(stats => this.stats.next(stats)),
+        onErrorResumeNext(),
+      ).subscribe();
+
+      // Process event handling.
+
+      // Killing processes cross platform can be hard, treeKill helps.
+      const killChildProcess = () => {
+        if (childProcess && childProcess.pid) {
+          treeKill(childProcess.pid, 'SIGTERM');
+        }
+      };
+
+      // Convert process exit codes and errors into observable events.
+      const handleChildProcessExit = (code?: number, error?: Error) => {
+        // Stop gathering stats and complete subjects.
+        statsSubs.unsubscribe();
+        this.stats.complete();
+        this.stdout.complete();
+        this.stderr.complete();
+
+        // Kill hanging child processes and emit error/exit code.
+        killChildProcess();
+        if (error) {
+          obs.error(error);
+        }
+        obs.next(code);
+        obs.complete();
+      };
+      childProcess.once('exit', handleChildProcessExit);
+      childProcess.once('error', (err) => handleChildProcessExit(1, err));
+      processExitCb = killChildProcess;
+
+      // Cleanup on unsubscription.
+      return () => childProcess.kill();
+    });
+  }
+}
diff --git a/packages/angular_devkit/benchmark/src/monitored-process_spec.ts b/packages/angular_devkit/benchmark/src/monitored-process_spec.ts
new file mode 100644
index 000000000000..12757d6e8dac
--- /dev/null
+++ b/packages/angular_devkit/benchmark/src/monitored-process_spec.ts
@@ -0,0 +1,50 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { dirname } from 'path';
+import { toArray } from 'rxjs/operators';
+import { Command } from './command';
+import { LocalMonitoredProcess } from './monitored-process';
+
+describe('LocalMonitoredProcess', () => {
+  const cmd = new Command(
+    'node',
+    ['test-script.js'],
+    dirname(require.resolve('./test/test-script.js')),
+  );
+
+  it('works', async () => {
+    const process = new LocalMonitoredProcess(cmd);
+    const res = await process.run().pipe(toArray()).toPromise();
+    expect(res).toEqual([0]);
+  });
+
+  it('captures stdout', async () => {
+    const process = new LocalMonitoredProcess(cmd);
+    const stdoutOutput: string[] = [];
+    process.stdout$.subscribe(data => stdoutOutput.push(data.toString()));
+    await process.run().pipe().toPromise();
+    expect(stdoutOutput).toEqual(['stdout start\n', 'stdout end\n']);
+  });
+
+  it('captures stderr', async () => {
+    const process = new LocalMonitoredProcess(cmd);
+    const stdoutOutput: string[] = [];
+    process.stderr$.subscribe(data => stdoutOutput.push(data.toString()));
+    await process.run().pipe().toPromise();
+    expect(stdoutOutput).toEqual(['stderr start\n', 'stderr end\n']);
+  });
+
+  it('captures stats', async () => {
+    const process = new LocalMonitoredProcess(cmd);
+    const statsOutput: string[] = [];
+    process.stderr$.subscribe(data => statsOutput.push(data.toString()));
+    await process.run().pipe().toPromise();
+    expect(statsOutput.length).toBeGreaterThan(0);
+  });
+});
diff --git a/packages/angular_devkit/benchmark/src/run-benchmark.ts b/packages/angular_devkit/benchmark/src/run-benchmark.ts
new file mode 100644
index 000000000000..2cee80479a7b
--- /dev/null
+++ b/packages/angular_devkit/benchmark/src/run-benchmark.ts
@@ -0,0 +1,98 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { BaseException, logging } from '@angular-devkit/core';
+import { Observable, forkJoin, of, throwError } from 'rxjs';
+import { concatMap, map, retryWhen, take, tap, throwIfEmpty } from 'rxjs/operators';
+import { Command } from './command';
+import { BenchmarkReporter, Capture, MetricGroup } from './interfaces';
+import { LocalMonitoredProcess } from './monitored-process';
+import { aggregateMetricGroups } from './utils';
+
+export interface RunBenchmarkOptions {
+  command: Command;
+  captures: Capture[];
+  reporters: BenchmarkReporter[];
+  iterations?: number;
+  retries?: number;
+  expectedExitCode?: number;
+  logger?: logging.Logger;
+}
+
+export class MaximumRetriesExceeded extends BaseException {
+  constructor(retries: number) {
+    super(`Maximum number of retries (${retries}) for command was exceeded.`);
+  }
+}
+
+export function runBenchmark({
+  command, captures, reporters = [], iterations = 5, retries = 5, logger = new logging.NullLogger(),
+}: RunBenchmarkOptions): Observable<MetricGroup[]> {
+
+  let successfulRuns = 0;
+  let failedRuns = 0;
+  const notDoneYet = new BaseException('Not done yet.');
+  const processFailed = new BaseException('Wrong exit code.');
+  const debugPrefix = () => `Run #${successfulRuns + 1}:`;
+  let aggregatedMetricGroups: MetricGroup[] = [];
+
+  // Run the process and captures, wait for both to finish, and average out the metrics.
+  return new Observable(obs => {
+    const monitoredProcess = new LocalMonitoredProcess(command);
+    const metric$ = captures.map(capture => capture(monitoredProcess));
+    obs.next([monitoredProcess, ...metric$]);
+  }).pipe(
+    tap(() => logger.debug(`${debugPrefix()} starting`)),
+    concatMap(([monitoredProcess, ...metric$]) => forkJoin(monitoredProcess.run(), ...metric$)),
+    throwIfEmpty(() => new Error('Nothing was captured')),
+    concatMap((results) => {
+      const [processExitCode, ...metrics] = results;
+
+      if ((processExitCode as number) != command.expectedExitCode) {
+        logger.debug(`${debugPrefix()} exited with ${processExitCode} but `
+          + `${command.expectedExitCode} was expected`);
+
+        return throwError(processFailed);
+      }
+
+      logger.debug(`${debugPrefix()} finished successfully`);
+
+      return of(metrics as MetricGroup[]);
+    }),
+    map(newMetricGroups => {
+      // Aggregate metric groups into a single one.
+      if (aggregatedMetricGroups.length === 0) {
+        aggregatedMetricGroups = newMetricGroups;
+      } else {
+        aggregatedMetricGroups = aggregatedMetricGroups.map((_, idx) =>
+          aggregateMetricGroups(aggregatedMetricGroups[idx], newMetricGroups[idx]),
+        );
+      }
+
+      successfulRuns += 1;
+
+      return aggregatedMetricGroups;
+    }),
+    concatMap(val => successfulRuns < iterations ? throwError(notDoneYet) : of(val)),
+    // This is where we control when the process should be run again.
+    retryWhen(errors => errors.pipe(concatMap(val => {
+      // Always run again while we are not done yet.
+      if (val === notDoneYet) { return of(val); }
+
+      // Otherwise check if we're still within the retry threshold.
+      failedRuns += 1;
+      if (failedRuns < retries) { return of(val); }
+
+      if (val === processFailed) { return throwError(new MaximumRetriesExceeded(retries)); }
+
+      // Not really sure what happened here, just re-throw it.
+      return throwError(val);
+    }))),
+    tap(groups => reporters.forEach(reporter => reporter(command, groups))),
+    take(1),
+  );
+}
diff --git a/packages/angular_devkit/benchmark/src/test/exit-code-one.js b/packages/angular_devkit/benchmark/src/test/exit-code-one.js
new file mode 100644
index 000000000000..7b777488a01b
--- /dev/null
+++ b/packages/angular_devkit/benchmark/src/test/exit-code-one.js
@@ -0,0 +1 @@
+process.exit(1);
\ No newline at end of file
diff --git a/packages/angular_devkit/benchmark/src/test/fibonacci.js b/packages/angular_devkit/benchmark/src/test/fibonacci.js
new file mode 100644
index 000000000000..58aafbc51023
--- /dev/null
+++ b/packages/angular_devkit/benchmark/src/test/fibonacci.js
@@ -0,0 +1,2 @@
+const fib = (n) => n > 1 ? fib(n - 1) + fib(n - 2) : n;
+console.log(fib(parseInt(process.argv[2])));
\ No newline at end of file
diff --git a/packages/angular_devkit/benchmark/src/test/test-script.js b/packages/angular_devkit/benchmark/src/test/test-script.js
new file mode 100644
index 000000000000..a9ad5213158e
--- /dev/null
+++ b/packages/angular_devkit/benchmark/src/test/test-script.js
@@ -0,0 +1,7 @@
+console.log("stdout start");
+console.error("stderr start");
+
+setTimeout(() => {
+  console.log("stdout end");
+  console.error("stderr end");
+}, 1000);
diff --git a/packages/angular_devkit/benchmark/src/utils.ts b/packages/angular_devkit/benchmark/src/utils.ts
new file mode 100644
index 000000000000..ea8fc36205ee
--- /dev/null
+++ b/packages/angular_devkit/benchmark/src/utils.ts
@@ -0,0 +1,49 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { AggregatedMetric, Metric, MetricGroup } from './interfaces';
+
+// Prefers to keep v1 when both are equal.
+export const max = (v1: number, v2: number) => v2 > v1 ? v2 : v1;
+
+export const cumulativeMovingAverage = (acc: number, val: number, accSize: number) =>
+  (val + accSize * acc) / (accSize + 1);
+
+export const aggregateMetrics = (
+  m1: Metric | AggregatedMetric,
+  m2: Metric | AggregatedMetric,
+): AggregatedMetric => {
+  if ((m1.name != m2.name) || (m1.unit != m2.unit)) {
+    throw new Error('Cannot aggregate metrics with different names or units:');
+  }
+
+  const m1Values = m1.componentValues ? m1.componentValues : [m1.value];
+  const m2Values = m2.componentValues ? m2.componentValues : [m2.value];
+
+  return {
+    name: m1.name,
+    unit: m1.unit,
+    // m1.value already holds an average if it has component values.
+    value: m2Values.reduce(
+      (acc, val, idx) => cumulativeMovingAverage(acc, val, idx + m1Values.length),
+      m1.value,
+    ),
+    componentValues: [...m1Values, ...m2Values],
+  };
+};
+
+export const aggregateMetricGroups = (g1: MetricGroup, g2: MetricGroup): MetricGroup => {
+  if (g1.name != g2.name || g1.metrics.length != g2.metrics.length) {
+    throw new Error('Cannot aggregate metric groups with different names.');
+  }
+
+  return {
+    name: g1.name,
+    metrics: g1.metrics.map((_, idx) => aggregateMetrics(g1.metrics[idx], g2.metrics[idx])),
+  };
+};
diff --git a/yarn.lock b/yarn.lock
index f39320644e77..a90fc11356d2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5719,6 +5719,16 @@ performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
 
+pidtree@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.0.tgz#f6fada10fccc9f99bf50e90d0b23d72c9ebc2e6b"
+
+pidusage@^2.0.16:
+  version "2.0.16"
+  resolved "https://registry.yarnpkg.com/pidusage/-/pidusage-2.0.16.tgz#46e2e3185eaef253ef6303f766f7aae72f74f98c"
+  dependencies:
+    safe-buffer "^5.1.2"
+
 pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"

From 7567a9231e95754003ed5206058b1d57515f5bfb Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 29 Aug 2018 15:22:48 +0100
Subject: [PATCH 0086/1703] test: add AIO benchmark

---
 benchmark/aio/.gitignore   |  1 +
 benchmark/aio/package.json | 17 +++++++++++++++++
 tsconfig.json              |  3 ++-
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 benchmark/aio/.gitignore
 create mode 100644 benchmark/aio/package.json

diff --git a/benchmark/aio/.gitignore b/benchmark/aio/.gitignore
new file mode 100644
index 000000000000..3c85010e11ea
--- /dev/null
+++ b/benchmark/aio/.gitignore
@@ -0,0 +1 @@
+angular/
\ No newline at end of file
diff --git a/benchmark/aio/package.json b/benchmark/aio/package.json
new file mode 100644
index 000000000000..37cdfa474b9a
--- /dev/null
+++ b/benchmark/aio/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "aio-benchmark",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "initialize": "yarn clone && yarn setup && yarn update", 
+    "clone": "(git clone https://github.com/angular/angular --depth 1 || true) && cd angular && git fetch origin dd2a650c3455f3bc0a88f8181758a84aacb25fea && git checkout -f FETCH_HEAD",
+    "setup": "cd angular && yarn && cd aio && yarn && yarn setup",
+    "//": "Shouldn't need to install the package twice, but the first install seems to leave two @ngtools/webpack installs around.",
+    "update": "cd angular/aio && yarn add ../../../../dist/@angular-devkit_build-angular.tgz --dev && yarn add ../../../../dist/_angular-devkit_build-angular.tgz --dev",
+    "benchmark": "cd angular/aio && benchmark --verbose -- yarn ~~build --configuration=stable"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC"
+}
diff --git a/tsconfig.json b/tsconfig.json
index ac88e47f5fad..c4a593422654 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -64,6 +64,7 @@
     "packages/schematics/*/*/*files/**/*",
     "tmp/**/*",
     "scripts/patches/**/*",
-    "tests/**/*"
+    "tests/**/*",
+    "benchmark/**/*",
   ]
 }

From f5fe1b60d42b3aa7359b592b5e917a3b41b11398 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Fri, 31 Aug 2018 14:09:03 +0100
Subject: [PATCH 0087/1703] build: fix tarring packages on windows

---
 scripts/build.ts | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/scripts/build.ts b/scripts/build.ts
index 0d89df98f1f8..9c24b8b0e781 100644
--- a/scripts/build.ts
+++ b/scripts/build.ts
@@ -37,16 +37,48 @@ function _mkdirp(p: string) {
   fs.mkdirSync(p);
 }
 
+function _recursiveFileList(p: string): string[] {
+  if (!fs.statSync(p).isDirectory()) {
+    return [];
+  }
+
+  const list = fs.readdirSync(p);
+
+  return list
+    .map(subpath => {
+      const subpathList = _recursiveFileList(path.join(p, subpath));
+
+      return [ subpath, ...subpathList.map(sp => path.join(subpath, sp))];
+    })
+    // Flatten.
+    .reduce((acc, curr) => [...acc, ...curr], [])
+    // Filter out directories.
+    .filter(sp => !fs.statSync(path.join(p, sp)).isDirectory());
+}
 
+
+// This method mimics how npm pack tars packages.
 function _tar(out: string, dir: string) {
+  // NOTE: node-tar does some Magic Stuff depending on prefixes for files
+  //       specifically with @ signs, so we just neutralize that one
+  //       and any such future "features" by prepending `./`
+
+  // Without this, the .tar file cannot be opened on Windows.
+
+  const files = _recursiveFileList(dir).map((f) => `./${f}`);
+
   return tar.create({
     gzip: true,
     strict: true,
     portable: true,
     cwd: dir,
+    prefix: 'package/',
     file: out,
     sync: true,
-  }, ['.']);
+    // Provide a specific date in the 1980s for the benefit of zip,
+    // which is confounded by files dated at the Unix epoch 0.
+    mtime: new Date('1985-10-26T08:15:00.000Z'),
+  }, files);
 }
 
 

From 4a5973c37a3238af73a6f122e81147852a8389c1 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Fri, 31 Aug 2018 14:11:04 +0100
Subject: [PATCH 0088/1703] build: workaround yarn tgz bug

---
 benchmark/aio/package.json | 3 ++-
 lib/packages.ts            | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/benchmark/aio/package.json b/benchmark/aio/package.json
index 37cdfa474b9a..fce9b14e36f7 100644
--- a/benchmark/aio/package.json
+++ b/benchmark/aio/package.json
@@ -7,8 +7,9 @@
     "initialize": "yarn clone && yarn setup && yarn update", 
     "clone": "(git clone https://github.com/angular/angular --depth 1 || true) && cd angular && git fetch origin dd2a650c3455f3bc0a88f8181758a84aacb25fea && git checkout -f FETCH_HEAD",
     "setup": "cd angular && yarn && cd aio && yarn && yarn setup",
+    "update": "cd angular/aio && yarn add ../../../../dist/_angular-devkit_build-angular.tgz --dev",
     "//": "Shouldn't need to install the package twice, but the first install seems to leave two @ngtools/webpack installs around.",
-    "update": "cd angular/aio && yarn add ../../../../dist/@angular-devkit_build-angular.tgz --dev && yarn add ../../../../dist/_angular-devkit_build-angular.tgz --dev",
+    "postupdate": "cd angular/aio && yarn add ../../../../dist/_angular-devkit_build-angular.tgz --dev",
     "benchmark": "cd angular/aio && benchmark --verbose -- yarn ~~build --configuration=stable"
   },
   "keywords": [],
diff --git a/lib/packages.ts b/lib/packages.ts
index d418943173c4..26eaed8dcf0d 100644
--- a/lib/packages.ts
+++ b/lib/packages.ts
@@ -212,7 +212,9 @@ export const packages: PackageMap =
         relative: path.relative(path.dirname(__dirname), pkgRoot),
         main: path.resolve(pkgRoot, 'src/index.ts'),
         private: packageJson.private,
-        tar: path.join(distRoot, name.replace('/', '_') + '.tgz'),
+        // yarn doesn't take kindly to @ in tgz filenames
+        // https://github.com/yarnpkg/yarn/issues/6339
+        tar: path.join(distRoot, name.replace(/\/|@/g, '_') + '.tgz'),
         bin,
         name,
         packageJson,

From a5bb3ced10bd397156084a15dbf33d7c9e863dbf Mon Sep 17 00:00:00 2001
From: Yaroslav Admin <devoto13@gmail.com>
Date: Thu, 19 Jul 2018 20:23:25 +0200
Subject: [PATCH 0089/1703] fix(@schematics/angular): fix app shell schematic
 failure

Fixes #10093
---
 packages/schematics/angular/app-shell/index.ts      |  8 +++++---
 packages/schematics/angular/app-shell/index_spec.ts | 11 +++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/packages/schematics/angular/app-shell/index.ts b/packages/schematics/angular/app-shell/index.ts
index a08c7f5c9875..d39a71c5c64a 100644
--- a/packages/schematics/angular/app-shell/index.ts
+++ b/packages/schematics/angular/app-shell/index.ts
@@ -25,7 +25,7 @@ import {
   insertImport,
   isImported,
 } from '../utility/ast-utils';
-import { InsertChange } from '../utility/change';
+import { Change, InsertChange } from '../utility/change';
 import { getWorkspace, getWorkspacePath } from '../utility/config';
 import { getAppModulePath } from '../utility/ng-ast-utils';
 import { getProjectTargets } from '../utility/project-targets';
@@ -224,8 +224,10 @@ function addRouterModule(options: AppShellOptions): Rule {
     const moduleSource = getSourceFile(host, modulePath);
     const changes = addImportToModule(moduleSource, modulePath, 'RouterModule', '@angular/router');
     const recorder = host.beginUpdate(modulePath);
-    changes.forEach((change: InsertChange) => {
-      recorder.insertLeft(change.pos, change.toAdd);
+    changes.forEach((change: Change) => {
+      if (change instanceof InsertChange) {
+        recorder.insertLeft(change.pos, change.toAdd);
+      }
     });
     host.commitUpdate(recorder);
 
diff --git a/packages/schematics/angular/app-shell/index_spec.ts b/packages/schematics/angular/app-shell/index_spec.ts
index e765c25352b4..6cc865556f0e 100644
--- a/packages/schematics/angular/app-shell/index_spec.ts
+++ b/packages/schematics/angular/app-shell/index_spec.ts
@@ -78,6 +78,17 @@ describe('App Shell Schematic', () => {
     expect(content).toMatch(/import { RouterModule } from \'@angular\/router\';/);
   });
 
+  it('should not fail when AppModule have imported RouterModule already', () => {
+    const updateRecorder = appTree.beginUpdate('/projects/bar/src/app/app.module.ts');
+    updateRecorder.insertLeft(0, 'import { RouterModule } from \'@angular/router\';');
+    appTree.commitUpdate(updateRecorder);
+
+    const tree = schematicRunner.runSchematic('appShell', defaultOptions, appTree);
+    const filePath = '/projects/bar/src/app/app.module.ts';
+    const content = tree.readContent(filePath);
+    expect(content).toMatch(/import { RouterModule } from \'@angular\/router\';/);
+  });
+
   describe('Add router-outlet', () => {
     function makeInlineTemplate(tree: UnitTestTree, template?: string): void {
       template = template || `

From 82f2bda2f59e4665611d1a75b51a62bae21ac340 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 11 Sep 2018 14:48:24 +0200
Subject: [PATCH 0090/1703] refactor(@schematics/angular): make interaction
 with architect targets type safe

---
 .../schematics/angular/app-shell/index.ts     |  82 +++-------
 .../schematics/angular/application/index.ts   |  20 ++-
 packages/schematics/angular/class/index.ts    |   7 +-
 .../schematics/angular/component/index.ts     |   6 +-
 .../schematics/angular/directive/index.ts     |   6 +-
 packages/schematics/angular/e2e/index.ts      |  76 +++------
 packages/schematics/angular/enum/index.ts     |   6 +-
 packages/schematics/angular/guard/index.ts    |   6 +-
 .../schematics/angular/interface/index.ts     |   6 +-
 packages/schematics/angular/library/index.ts  |  25 +--
 packages/schematics/angular/module/index.ts   |   7 +-
 packages/schematics/angular/pipe/index.ts     |   6 +-
 .../angular/service-worker/index.ts           |  39 ++---
 .../angular/service-worker/schema.d.ts        |   2 +-
 packages/schematics/angular/service/index.ts  |   6 +-
 .../schematics/angular/universal/index.ts     | 115 +++++---------
 packages/schematics/angular/utility/config.ts |  20 +--
 .../angular/utility/project-targets.ts        |  24 ++-
 .../schematics/angular/utility/project.ts     |  25 ++-
 .../angular/utility/project_spec.ts           |   6 +-
 .../angular/utility/workspace-models.ts       | 150 ++++++++++++++++++
 21 files changed, 357 insertions(+), 283 deletions(-)
 create mode 100644 packages/schematics/angular/utility/workspace-models.ts

diff --git a/packages/schematics/angular/app-shell/index.ts b/packages/schematics/angular/app-shell/index.ts
index d39a71c5c64a..0b14d8db9677 100644
--- a/packages/schematics/angular/app-shell/index.ts
+++ b/packages/schematics/angular/app-shell/index.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { JsonObject, dirname, experimental, join, normalize } from '@angular-devkit/core';
+import { dirname, experimental, join, normalize } from '@angular-devkit/core';
 import {
   Rule,
   SchematicContext,
@@ -26,19 +26,13 @@ import {
   isImported,
 } from '../utility/ast-utils';
 import { Change, InsertChange } from '../utility/change';
-import { getWorkspace, getWorkspacePath } from '../utility/config';
+import { getWorkspace, updateWorkspace } from '../utility/config';
 import { getAppModulePath } from '../utility/ng-ast-utils';
-import { getProjectTargets } from '../utility/project-targets';
+import { getProject } from '../utility/project';
+import { getProjectTargets, targetBuildNotFoundError } from '../utility/project-targets';
+import { Builders, WorkspaceProject } from '../utility/workspace-models';
 import { Schema as AppShellOptions } from './schema';
 
-
-// Helper functions. (possible refactors to utils)
-function formatMissingAppMsg(label: string, nameOrIndex: string | undefined): string {
-  const nameOrIndexText = nameOrIndex ? ` (${nameOrIndex})` : '';
-
-  return `${label} app ${nameOrIndexText} not found.`;
-}
-
 function getSourceFile(host: Tree, path: string): ts.SourceFile {
   const buffer = host.read(path);
   if (!buffer) {
@@ -103,9 +97,13 @@ function getComponentTemplate(host: Tree, compPath: string, tmplInfo: TemplateIn
 
 function getBootstrapComponentPath(
   host: Tree,
-  project: experimental.workspace.WorkspaceProject,
+  project: WorkspaceProject,
 ): string {
   const projectTargets = getProjectTargets(project);
+  if (!projectTargets.build) {
+    throw targetBuildNotFoundError();
+  }
+
   const mainPath = projectTargets.build.options.main;
   const modulePath = getAppModulePath(host, mainPath);
   const moduleSource = getSourceFile(host, modulePath);
@@ -137,7 +135,7 @@ function validateProject(options: AppShellOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
     const routerOutletCheckRegex = /<router\-outlet.*?>([\s\S]*?)<\/router\-outlet>/;
 
-    const clientProject = getClientProject(host, options);
+    const clientProject = getProject(host, options.clientProject);
     if (clientProject.projectType !== 'application') {
       throw new SchematicsException(`App shell requires a project type of "application".`);
     }
@@ -155,11 +153,9 @@ function validateProject(options: AppShellOptions): Rule {
 
 function addUniversalTarget(options: AppShellOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
-    const architect = getClientArchitect(host, options);
-    if (architect !== null) {
-      if (architect.server !== undefined) {
-        return host;
-      }
+    const architect = getProjectTargets(host, options.clientProject);
+    if (architect.server) {
+      return host;
     }
 
     // Copy options.
@@ -187,10 +183,9 @@ function addAppShellConfigToWorkspace(options: AppShellOptions): Rule {
     }
 
     const workspace = getWorkspace(host);
-    const workspacePath = getWorkspacePath(host);
-
-    const appShellTarget: JsonObject = {
-      builder: '@angular-devkit/build-angular:app-shell',
+    const projectTargets = getProjectTargets(workspace, options.clientProject);
+    projectTargets['app-shell'] = {
+      builder: Builders.AppShell,
       options: {
         browserTarget: `${options.clientProject}:build`,
         serverTarget: `${options.clientProject}:server`,
@@ -203,23 +198,17 @@ function addAppShellConfigToWorkspace(options: AppShellOptions): Rule {
       },
     };
 
-    if (!workspace.projects[options.clientProject]) {
-      throw new SchematicsException(`Client app ${options.clientProject} not found.`);
-    }
-    const clientProject = workspace.projects[options.clientProject];
-    const projectTargets = getProjectTargets(clientProject);
-    projectTargets['app-shell'] = appShellTarget;
-
-    host.overwrite(workspacePath, JSON.stringify(workspace, null, 2));
-
-    return host;
+    return updateWorkspace(workspace);
   };
 }
 
 function addRouterModule(options: AppShellOptions): Rule {
   return (host: Tree) => {
-    const clientArchitect = getClientArchitect(host, options);
-    const mainPath = clientArchitect.build.options.main;
+    const projectTargets = getProjectTargets(host, options.clientProject);
+    if (!projectTargets.build) {
+      throw targetBuildNotFoundError();
+    }
+    const mainPath = projectTargets.build.options.main;
     const modulePath = getAppModulePath(host, mainPath);
     const moduleSource = getSourceFile(host, modulePath);
     const changes = addImportToModule(moduleSource, modulePath, 'RouterModule', '@angular/router');
@@ -256,8 +245,8 @@ function getMetadataProperty(metadata: ts.Node, propertyName: string): ts.Proper
 
 function addServerRoutes(options: AppShellOptions): Rule {
   return (host: Tree) => {
-    const clientProject = getClientProject(host, options);
-    const architect = getClientArchitect(host, options);
+    const clientProject = getProject(host, options.clientProject);
+    const architect = getProjectTargets(clientProject);
     // const mainPath = universalArchitect.build.options.main;
     const modulePath = getServerModulePath(host, clientProject, architect);
     if (modulePath === null) {
@@ -322,27 +311,6 @@ function addShellComponent(options: AppShellOptions): Rule {
   return schematic('component', componentOptions);
 }
 
-function getClientProject(
-  host: Tree, options: AppShellOptions,
-): experimental.workspace.WorkspaceProject {
-  const workspace = getWorkspace(host);
-  const clientProject = workspace.projects[options.clientProject];
-  if (!clientProject) {
-    throw new SchematicsException(formatMissingAppMsg('Client', options.clientProject));
-  }
-
-  return clientProject;
-}
-
-function getClientArchitect(
-  host: Tree, options: AppShellOptions,
-): experimental.workspace.WorkspaceTool {
-  const clientProject = getClientProject(host, options);
-  const projectTargets = getProjectTargets(clientProject);
-
-  return projectTargets;
-}
-
 export default function (options: AppShellOptions): Rule {
   return chain([
     validateProject(options),
diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 269e30d2f44d..3c54fc6d0d9d 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -24,14 +24,18 @@ import {
 } from '@angular-devkit/schematics';
 import { Schema as E2eOptions } from '../e2e/schema';
 import {
-  WorkspaceProject,
-  WorkspaceSchema,
   addProjectToWorkspace,
   getWorkspace,
 } from '../utility/config';
 import { NodeDependencyType, addPackageJsonDependency } from '../utility/dependencies';
 import { latestVersions } from '../utility/latest-versions';
 import { validateProjectName } from '../utility/validation';
+import {
+  Builders,
+  ProjectType,
+  WorkspaceProject,
+  WorkspaceSchema,
+} from '../utility/workspace-models';
 import { Schema as ApplicationOptions } from './schema';
 
 
@@ -133,12 +137,12 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
   const project: WorkspaceProject = {
     root: projectRoot,
     sourceRoot: join(normalize(projectRoot), 'src'),
-    projectType: 'application',
+    projectType: ProjectType.Application,
     prefix: options.prefix || 'app',
     schematics,
     targets: {
       build: {
-        builder: '@angular-devkit/build-angular:browser',
+        builder: Builders.Browser,
         options: {
           outputPath: `dist/${options.name}`,
           index: `${projectRoot}src/index.html`,
@@ -173,7 +177,7 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
         },
       },
       serve: {
-        builder: '@angular-devkit/build-angular:dev-server',
+        builder: Builders.DevServer,
         options: {
           browserTarget: `${options.name}:build`,
         },
@@ -184,13 +188,13 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
         },
       },
       'extract-i18n': {
-        builder: '@angular-devkit/build-angular:extract-i18n',
+        builder: Builders.ExtractI18n,
         options: {
           browserTarget: `${options.name}:build`,
         },
       },
       test: {
-        builder: '@angular-devkit/build-angular:karma',
+        builder: Builders.Karma,
         options: {
           main: `${projectRoot}src/test.ts`,
           polyfills: `${projectRoot}src/polyfills.ts`,
@@ -207,7 +211,7 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
         },
       },
       lint: {
-        builder: '@angular-devkit/build-angular:tslint',
+        builder: Builders.TsLint,
         options: {
           tsConfig: [
             `${rootFilesRoot}tsconfig.app.json`,
diff --git a/packages/schematics/angular/class/index.ts b/packages/schematics/angular/class/index.ts
index a249a83c95ef..32551fb97ef7 100644
--- a/packages/schematics/angular/class/index.ts
+++ b/packages/schematics/angular/class/index.ts
@@ -20,18 +20,17 @@ import {
   template,
   url,
 } from '@angular-devkit/schematics';
-import { getWorkspace } from '../utility/config';
 import { parseName } from '../utility/parse-name';
-import { buildDefaultPath } from '../utility/project';
+import { buildDefaultPath, getProject } from '../utility/project';
 import { Schema as ClassOptions } from './schema';
 
 export default function (options: ClassOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
-    const workspace = getWorkspace(host);
     if (!options.project) {
       throw new SchematicsException('Option (project) is required.');
     }
-    const project = workspace.projects[options.project];
+
+    const project = getProject(host, options.project);
 
     if (options.path === undefined) {
       options.path = buildDefaultPath(project);
diff --git a/packages/schematics/angular/component/index.ts b/packages/schematics/angular/component/index.ts
index b2d35f50c6c4..a62a471652cb 100644
--- a/packages/schematics/angular/component/index.ts
+++ b/packages/schematics/angular/component/index.ts
@@ -27,11 +27,10 @@ import {
   addExportToModule,
 } from '../utility/ast-utils';
 import { InsertChange } from '../utility/change';
-import { getWorkspace } from '../utility/config';
 import { buildRelativePath, findModuleFromOptions } from '../utility/find-module';
 import { applyLintFix } from '../utility/lint-fix';
 import { parseName } from '../utility/parse-name';
-import { buildDefaultPath } from '../utility/project';
+import { buildDefaultPath, getProject } from '../utility/project';
 import { validateHtmlSelector, validateName } from '../utility/validation';
 import { Schema as ComponentOptions } from './schema';
 
@@ -128,11 +127,10 @@ function buildSelector(options: ComponentOptions, projectPrefix: string) {
 
 export default function(options: ComponentOptions): Rule {
   return (host: Tree) => {
-    const workspace = getWorkspace(host);
     if (!options.project) {
       throw new SchematicsException('Option (project) is required.');
     }
-    const project = workspace.projects[options.project];
+    const project = getProject(host, options.project);
 
     if (options.path === undefined) {
       options.path = buildDefaultPath(project);
diff --git a/packages/schematics/angular/directive/index.ts b/packages/schematics/angular/directive/index.ts
index 0830f260695b..053ba4ffa223 100644
--- a/packages/schematics/angular/directive/index.ts
+++ b/packages/schematics/angular/directive/index.ts
@@ -23,11 +23,10 @@ import {
 import * as ts from 'typescript';
 import { addDeclarationToModule, addExportToModule } from '../utility/ast-utils';
 import { InsertChange } from '../utility/change';
-import { getWorkspace } from '../utility/config';
 import { buildRelativePath, findModuleFromOptions } from '../utility/find-module';
 import { applyLintFix } from '../utility/lint-fix';
 import { parseName } from '../utility/parse-name';
-import { buildDefaultPath } from '../utility/project';
+import { buildDefaultPath, getProject } from '../utility/project';
 import { validateHtmlSelector } from '../utility/validation';
 import { Schema as DirectiveOptions } from './schema';
 
@@ -104,11 +103,10 @@ function buildSelector(options: DirectiveOptions, projectPrefix: string) {
 
 export default function (options: DirectiveOptions): Rule {
   return (host: Tree) => {
-    const workspace = getWorkspace(host);
     if (!options.project) {
       throw new SchematicsException('Option (project) is required.');
     }
-    const project = workspace.projects[options.project];
+    const project = getProject(host, options.project);
 
     if (options.path === undefined) {
       options.path = buildDefaultPath(project);
diff --git a/packages/schematics/angular/e2e/index.ts b/packages/schematics/angular/e2e/index.ts
index 2c2f5472ee1d..36c34ee59ee6 100644
--- a/packages/schematics/angular/e2e/index.ts
+++ b/packages/schematics/angular/e2e/index.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { experimental, strings, tags } from '@angular-devkit/core';
+import { strings, tags } from '@angular-devkit/core';
 import {
   Rule,
   SchematicContext,
@@ -18,60 +18,37 @@ import {
   template,
   url,
 } from '@angular-devkit/schematics';
-import { getWorkspace, getWorkspacePath } from '../utility/config';
+import { getWorkspace, updateWorkspace } from '../utility/config';
+import { getProject } from '../utility/project';
+import {
+  Builders,
+   ProjectType,
+  WorkspaceProject,
+  WorkspaceSchema,
+} from '../utility/workspace-models';
 import { Schema as E2eOptions } from './schema';
 
-type WorkspaceSchema = experimental.workspace.WorkspaceSchema;
-
-// TODO: use JsonAST
-// function appendPropertyInAstObject(
-//   recorder: UpdateRecorder,
-//   node: JsonAstObject,
-//   propertyName: string,
-//   value: JsonValue,
-//   indent = 4,
-// ) {
-//   const indentStr = '\n' + new Array(indent + 1).join(' ');
-
-//   if (node.properties.length > 0) {
-//     // Insert comma.
-//     const last = node.properties[node.properties.length - 1];
-//     recorder.insertRight(last.start.offset + last.text.replace(/\s+$/, '').length, ',');
-//   }
-
-//   recorder.insertLeft(
-//     node.end.offset - 1,
-//     '  '
-//     + `"${propertyName}": ${JSON.stringify(value, null, 2).replace(/\n/g, indentStr)}`
-//     + indentStr.slice(0, -2),
-//   );
-// }
-
 function addAppToWorkspaceFile(options: E2eOptions, workspace: WorkspaceSchema): Rule {
   return (host: Tree, context: SchematicContext) => {
-    // TODO: use JsonAST
-    // const workspacePath = '/angular.json';
-    // const workspaceBuffer = host.read(workspacePath);
-    // if (workspaceBuffer === null) {
-    //   throw new SchematicsException(`Configuration file (${workspacePath}) not found.`);
-    // }
-    // const workspaceJson = parseJson(workspaceBuffer.toString());
-    // if (workspaceJson.value === null) {
-    //   throw new SchematicsException(`Unable to parse configuration file (${workspacePath}).`);
-    // }
     let projectRoot = options.projectRoot !== undefined
       ? options.projectRoot
       : `${workspace.newProjectRoot}/${options.name}`;
+
     if (projectRoot !== '' && !projectRoot.endsWith('/')) {
       projectRoot += '/';
     }
-    // tslint:disable-next-line:no-any
-    const project: any = {
+
+    if (getProject(workspace, options.name)) {
+      throw new SchematicsException(`Project name "${options.name}" already exists.`);
+    }
+
+    const project: WorkspaceProject = {
       root: projectRoot,
-      projectType: 'application',
+      projectType: ProjectType.Application,
+      prefix: '',
       targets: {
         e2e: {
-          builder: '@angular-devkit/build-angular:protractor',
+          builder: Builders.Protractor,
           options: {
             protractorConfig: `${projectRoot}protractor.conf.js`,
             devServerTarget: `${options.relatedAppName}:serve`,
@@ -83,7 +60,7 @@ function addAppToWorkspaceFile(options: E2eOptions, workspace: WorkspaceSchema):
           },
         },
         lint: {
-          builder: '@angular-devkit/build-angular:tslint',
+          builder: Builders.TsLint,
           options: {
             tsConfig: `${projectRoot}tsconfig.e2e.json`,
             exclude: [
@@ -93,17 +70,10 @@ function addAppToWorkspaceFile(options: E2eOptions, workspace: WorkspaceSchema):
         },
       },
     };
-    // tslint:disable-next-line:no-any
-    // const projects: JsonObject = (<any> workspaceAst.value).projects || {};
-    // tslint:disable-next-line:no-any
-    // if (!(<any> workspaceAst.value).projects) {
-    //   // tslint:disable-next-line:no-any
-    //   (<any> workspaceAst.value).projects = projects;
-    // }
-
-    // TODO: throw if the project already exist.
+
     workspace.projects[options.name] = project;
-    host.overwrite(getWorkspacePath(host), JSON.stringify(workspace, null, 2));
+
+    return updateWorkspace(workspace);
   };
 }
 const projectNameRegexp = /^[a-zA-Z][.0-9a-zA-Z]*(-[.0-9a-zA-Z]*)*$/;
diff --git a/packages/schematics/angular/enum/index.ts b/packages/schematics/angular/enum/index.ts
index 2784e9bdfaac..5ad6e48d6a73 100644
--- a/packages/schematics/angular/enum/index.ts
+++ b/packages/schematics/angular/enum/index.ts
@@ -20,20 +20,18 @@ import {
   template,
   url,
 } from '@angular-devkit/schematics';
-import { getWorkspace } from '../utility/config';
 import { applyLintFix } from '../utility/lint-fix';
 import { parseName } from '../utility/parse-name';
-import { buildDefaultPath } from '../utility/project';
+import { buildDefaultPath, getProject } from '../utility/project';
 import { Schema as EnumOptions } from './schema';
 
 
 export default function (options: EnumOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
-    const workspace = getWorkspace(host);
     if (!options.project) {
       throw new SchematicsException('Option (project) is required.');
     }
-    const project = workspace.projects[options.project];
+    const project = getProject(host, options.project);
 
     if (options.path === undefined) {
       options.path = buildDefaultPath(project);
diff --git a/packages/schematics/angular/guard/index.ts b/packages/schematics/angular/guard/index.ts
index 55d715242f20..2c21622d5949 100644
--- a/packages/schematics/angular/guard/index.ts
+++ b/packages/schematics/angular/guard/index.ts
@@ -20,20 +20,18 @@ import {
   template,
   url,
 } from '@angular-devkit/schematics';
-import { getWorkspace } from '../utility/config';
 import { applyLintFix } from '../utility/lint-fix';
 import { parseName } from '../utility/parse-name';
-import { buildDefaultPath } from '../utility/project';
+import { buildDefaultPath, getProject } from '../utility/project';
 import { Schema as GuardOptions } from './schema';
 
 
 export default function (options: GuardOptions): Rule {
   return (host: Tree) => {
-    const workspace = getWorkspace(host);
     if (!options.project) {
       throw new SchematicsException('Option (project) is required.');
     }
-    const project = workspace.projects[options.project];
+    const project = getProject(host, options.project);
 
     if (options.path === undefined) {
       options.path = buildDefaultPath(project);
diff --git a/packages/schematics/angular/interface/index.ts b/packages/schematics/angular/interface/index.ts
index 84ce555d7cc3..84ecfe52530d 100644
--- a/packages/schematics/angular/interface/index.ts
+++ b/packages/schematics/angular/interface/index.ts
@@ -19,20 +19,18 @@ import {
   template,
   url,
 } from '@angular-devkit/schematics';
-import { getWorkspace } from '../utility/config';
 import { applyLintFix } from '../utility/lint-fix';
 import { parseName } from '../utility/parse-name';
-import { buildDefaultPath } from '../utility/project';
+import { buildDefaultPath, getProject } from '../utility/project';
 import { Schema as InterfaceOptions } from './schema';
 
 
 export default function (options: InterfaceOptions): Rule {
   return (host: Tree) => {
-    const workspace = getWorkspace(host);
     if (!options.project) {
       throw new SchematicsException('Option (project) is required.');
     }
-    const project = workspace.projects[options.project];
+    const project = getProject(host, options.project);
 
     if (options.path === undefined) {
       options.path = buildDefaultPath(project);
diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index f3962b00df3b..81914af9dba5 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -22,17 +22,18 @@ import {
 } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import {
-  WorkspaceProject,
-  WorkspaceSchema,
   addProjectToWorkspace,
   getWorkspace,
 } from '../utility/config';
-import {
-  NodeDependencyType,
-  addPackageJsonDependency,
-} from '../utility/dependencies';
+import { NodeDependencyType, addPackageJsonDependency } from '../utility/dependencies';
 import { latestVersions } from '../utility/latest-versions';
 import { validateProjectName } from '../utility/validation';
+import {
+  Builders,
+  ProjectType,
+  WorkspaceProject,
+  WorkspaceSchema,
+} from '../utility/workspace-models';
 import { Schema as LibraryOptions } from './schema';
 
 interface UpdateJsonFn<T> {
@@ -132,21 +133,21 @@ function addDependenciesToPackageJson() {
 function addAppToWorkspaceFile(options: LibraryOptions, workspace: WorkspaceSchema,
                                projectRoot: string, packageName: string): Rule {
 
-  const project: WorkspaceProject = {
-    root: `${projectRoot}`,
+  const project: WorkspaceProject<ProjectType.Library> = {
+    root: projectRoot,
     sourceRoot: `${projectRoot}/src`,
-    projectType: 'library',
+    projectType: ProjectType.Library,
     prefix: options.prefix || 'lib',
     targets: {
       build: {
-        builder: '@angular-devkit/build-ng-packagr:build',
+        builder: Builders.NgPackagr,
         options: {
           tsConfig: `${projectRoot}/tsconfig.lib.json`,
           project: `${projectRoot}/ng-package.json`,
         },
       },
       test: {
-        builder: '@angular-devkit/build-angular:karma',
+        builder: Builders.Karma,
         options: {
           main: `${projectRoot}/src/test.ts`,
           tsConfig: `${projectRoot}/tsconfig.spec.json`,
@@ -154,7 +155,7 @@ function addAppToWorkspaceFile(options: LibraryOptions, workspace: WorkspaceSche
         },
       },
       lint: {
-        builder: '@angular-devkit/build-angular:tslint',
+        builder: Builders.TsLint,
         options: {
           tsConfig: [
             `${projectRoot}/tsconfig.lib.json`,
diff --git a/packages/schematics/angular/module/index.ts b/packages/schematics/angular/module/index.ts
index 390033a0f433..299ec6f8cdfb 100644
--- a/packages/schematics/angular/module/index.ts
+++ b/packages/schematics/angular/module/index.ts
@@ -23,10 +23,9 @@ import {
 import * as ts from 'typescript';
 import { addImportToModule } from '../utility/ast-utils';
 import { InsertChange } from '../utility/change';
-import { getWorkspace } from '../utility/config';
 import { buildRelativePath, findModuleFromOptions } from '../utility/find-module';
 import { parseName } from '../utility/parse-name';
-import { buildDefaultPath } from '../utility/project';
+import { buildDefaultPath, getProject } from '../utility/project';
 import { Schema as ModuleOptions } from './schema';
 
 
@@ -71,15 +70,15 @@ function addDeclarationToNgModule(options: ModuleOptions): Rule {
 
 export default function (options: ModuleOptions): Rule {
   return (host: Tree) => {
-    const workspace = getWorkspace(host);
     if (!options.project) {
       throw new SchematicsException('Option (project) is required.');
     }
-    const project = workspace.projects[options.project];
+    const project = getProject(host, options.project);
 
     if (options.path === undefined) {
       options.path = buildDefaultPath(project);
     }
+
     if (options.module) {
       options.module = findModuleFromOptions(host, options);
     }
diff --git a/packages/schematics/angular/pipe/index.ts b/packages/schematics/angular/pipe/index.ts
index d9bad4ec691d..eaf28616d1b4 100644
--- a/packages/schematics/angular/pipe/index.ts
+++ b/packages/schematics/angular/pipe/index.ts
@@ -23,11 +23,10 @@ import {
 import * as ts from 'typescript';
 import { addDeclarationToModule, addExportToModule } from '../utility/ast-utils';
 import { InsertChange } from '../utility/change';
-import { getWorkspace } from '../utility/config';
 import { buildRelativePath, findModuleFromOptions } from '../utility/find-module';
 import { applyLintFix } from '../utility/lint-fix';
 import { parseName } from '../utility/parse-name';
-import { buildDefaultPath } from '../utility/project';
+import { buildDefaultPath, getProject } from '../utility/project';
 import { Schema as PipeOptions } from './schema';
 
 
@@ -88,11 +87,10 @@ function addDeclarationToNgModule(options: PipeOptions): Rule {
 
 export default function (options: PipeOptions): Rule {
   return (host: Tree) => {
-    const workspace = getWorkspace(host);
     if (!options.project) {
       throw new SchematicsException('Option (project) is required.');
     }
-    const project = workspace.projects[options.project];
+    const project = getProject(host, options.project);
 
     if (options.path === undefined) {
       options.path = buildDefaultPath(project);
diff --git a/packages/schematics/angular/service-worker/index.ts b/packages/schematics/angular/service-worker/index.ts
index 4b571008a4dd..b7c3ccf75a3a 100644
--- a/packages/schematics/angular/service-worker/index.ts
+++ b/packages/schematics/angular/service-worker/index.ts
@@ -22,47 +22,36 @@ import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import * as ts from 'typescript';
 import { addSymbolToNgModuleMetadata, insertImport, isImported } from '../utility/ast-utils';
 import { InsertChange } from '../utility/change';
-import {
-  getWorkspace,
-  getWorkspacePath,
-} from '../utility/config';
+import { getWorkspace, updateWorkspace } from '../utility/config';
 import { addPackageJsonDependency, getPackageJsonDependency } from '../utility/dependencies';
 import { getAppModulePath } from '../utility/ng-ast-utils';
-import { getProjectTargets } from '../utility/project-targets';
+import { getProjectTargets, targetBuildNotFoundError } from '../utility/project-targets';
+import { BrowserBuilderOptions, BrowserBuilderTarget } from '../utility/workspace-models';
 import { Schema as ServiceWorkerOptions } from './schema';
 
 function updateConfigFile(options: ServiceWorkerOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
     context.logger.debug('updating config file.');
-    const workspacePath = getWorkspacePath(host);
-
     const workspace = getWorkspace(host);
 
-    const project = workspace.projects[options.project as string];
-
-    if (!project) {
-      throw new Error(`Project is not defined in this workspace.`);
-    }
-
-    const projectTargets = getProjectTargets(project);
+    const projectTargets = getProjectTargets(workspace, options.project);
 
     if (!projectTargets[options.target]) {
       throw new Error(`Target is not defined for this project.`);
     }
 
-    let applyTo = projectTargets[options.target].options;
+    const target = projectTargets[options.target] as BrowserBuilderTarget;
+    let applyTo = target.options;
 
     if (options.configuration &&
-        projectTargets[options.target].configurations &&
-        projectTargets[options.target].configurations[options.configuration]) {
-      applyTo = projectTargets[options.target].configurations[options.configuration];
+      target.configurations &&
+      target.configurations[options.configuration]) {
+      applyTo = target.configurations[options.configuration] as BrowserBuilderOptions;
     }
 
     applyTo.serviceWorker = true;
 
-    host.overwrite(workspacePath, JSON.stringify(workspace, null, 2));
-
-    return host;
+    return updateWorkspace(workspace);
   };
 }
 
@@ -89,9 +78,11 @@ function updateAppModule(options: ServiceWorkerOptions): Rule {
     context.logger.debug('Updating appmodule');
 
     // find app module
-    const workspace = getWorkspace(host);
-    const project = workspace.projects[options.project as string];
-    const projectTargets = getProjectTargets(project);
+    const projectTargets = getProjectTargets(host, options.project);
+    if (!projectTargets.build) {
+      throw targetBuildNotFoundError();
+    }
+
     const mainPath = projectTargets.build.options.main;
     const modulePath = getAppModulePath(host, mainPath);
     context.logger.debug(`module path: ${modulePath}`);
diff --git a/packages/schematics/angular/service-worker/schema.d.ts b/packages/schematics/angular/service-worker/schema.d.ts
index 7e5b22c33e89..571d59ed771f 100644
--- a/packages/schematics/angular/service-worker/schema.d.ts
+++ b/packages/schematics/angular/service-worker/schema.d.ts
@@ -10,7 +10,7 @@ export interface Schema {
     /**
      * The name of the project.
      */
-    project?: string;
+    project: string;
     /**
      * The target to apply service worker to.
      */
diff --git a/packages/schematics/angular/service/index.ts b/packages/schematics/angular/service/index.ts
index f5b78f19e931..2c9e57b3be58 100644
--- a/packages/schematics/angular/service/index.ts
+++ b/packages/schematics/angular/service/index.ts
@@ -19,19 +19,17 @@ import {
   template,
   url,
 } from '@angular-devkit/schematics';
-import { getWorkspace } from '../utility/config';
 import { applyLintFix } from '../utility/lint-fix';
 import { parseName } from '../utility/parse-name';
-import { buildDefaultPath } from '../utility/project';
+import { buildDefaultPath, getProject } from '../utility/project';
 import { Schema as ServiceOptions } from './schema';
 
 export default function (options: ServiceOptions): Rule {
   return (host: Tree) => {
-    const workspace = getWorkspace(host);
     if (!options.project) {
       throw new SchematicsException('Option (project) is required.');
     }
-    const project = workspace.projects[options.project];
+    const project = getProject(host, options.project);
 
     if (options.path === undefined) {
       options.path = buildDefaultPath(project);
diff --git a/packages/schematics/angular/universal/index.ts b/packages/schematics/angular/universal/index.ts
index 09c8bae3127d..17329143ef8a 100644
--- a/packages/schematics/angular/universal/index.ts
+++ b/packages/schematics/angular/universal/index.ts
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {
-  JsonObject,
   Path,
   basename,
   experimental,
@@ -33,87 +32,46 @@ import {
 import * as ts from 'typescript';
 import { findNode, getDecoratorMetadata } from '../utility/ast-utils';
 import { InsertChange } from '../utility/change';
-import { getWorkspace } from '../utility/config';
+import { getWorkspace, updateWorkspace } from '../utility/config';
 import { addPackageJsonDependency, getPackageJsonDependency } from '../utility/dependencies';
 import { findBootstrapModuleCall, findBootstrapModulePath } from '../utility/ng-ast-utils';
-import { getProjectTargets } from '../utility/project-targets';
+import { getProject } from '../utility/project';
+import { getProjectTargets, targetBuildNotFoundError } from '../utility/project-targets';
+import { Builders, WorkspaceTargets } from '../utility/workspace-models';
 import { Schema as UniversalOptions } from './schema';
 
 
-function getWorkspacePath(host: Tree): string {
-  const possibleFiles = [ '/angular.json', '/.angular.json' ];
+function getFileReplacements(target: WorkspaceTargets) {
+  const fileReplacements =
+    target.build &&
+    target.build.configurations &&
+    target.build.configurations.production &&
+    target.build.configurations.production.fileReplacements;
 
-  return possibleFiles.filter(path => host.exists(path))[0];
-}
-
-function getClientProject(
-  host: Tree, options: UniversalOptions,
-): experimental.workspace.WorkspaceProject {
-  const workspace = getWorkspace(host);
-  const clientProject = workspace.projects[options.clientProject];
-  if (!clientProject) {
-    throw new SchematicsException(`Client app ${options.clientProject} not found.`);
-  }
-
-  return clientProject;
-}
-
-function getClientTargets(
-  host: Tree,
-  options: UniversalOptions,
-): experimental.workspace.WorkspaceTool {
-  const clientProject = getClientProject(host, options);
-  const projectTargets = getProjectTargets(clientProject);
-
-  return projectTargets;
-}
-
-// TODO: Add types for the Target
-// tslint:disable-next-line:no-any
-function getFileReplacements(target: any ) {
-  const configurations = target.configurations || {};
-  const production = configurations.production || {};
-  const fileReplacements = production.fileReplacements || [];
-
-  return fileReplacements;
+  return fileReplacements || [];
 }
 
 function updateConfigFile(options: UniversalOptions, tsConfigDirectory: Path): Rule {
   return (host: Tree) => {
     const workspace = getWorkspace(host);
-    if (!workspace.projects[options.clientProject]) {
-      throw new SchematicsException(`Client app ${options.clientProject} not found.`);
-    }
-
-    const clientProject = workspace.projects[options.clientProject];
+    const clientProject = getProject(workspace, options.clientProject);
     const projectTargets = getProjectTargets(clientProject);
 
-    const builderOptions: JsonObject = {
-      outputPath: `dist/${options.clientProject}-server`,
-      main: `${clientProject.root}src/main.server.ts`,
-      tsConfig: join(tsConfigDirectory, `${options.tsconfigFileName}.json`),
-    };
-
-    // TODO: Add types for the TargetConfiguration
-    // tslint:disable-next-line:no-any
-    const builderConfigurations: any = {
-      production: {
-        fileReplacements: getFileReplacements(projectTargets.build),
+    projectTargets.server = {
+      builder: Builders.Server,
+      options: {
+        outputPath: `dist/${options.clientProject}-server`,
+        main: `${clientProject.root}src/main.server.ts`,
+        tsConfig: join(tsConfigDirectory, `${options.tsconfigFileName}.json`),
+      },
+      configurations: {
+        production: {
+          fileReplacements: getFileReplacements(projectTargets),
+        },
       },
     };
 
-    const serverTarget: JsonObject = {
-      builder: '@angular-devkit/build-angular:server',
-      options: builderOptions,
-      configurations: builderConfigurations,
-    };
-    projectTargets.server = serverTarget;
-
-    const workspacePath = getWorkspacePath(host);
-
-    host.overwrite(workspacePath, JSON.stringify(workspace, null, 2));
-
-    return host;
+    return updateWorkspace(workspace);
   };
 }
 
@@ -138,7 +96,10 @@ function findBrowserModuleImport(host: Tree, modulePath: string): ts.Node {
 
 function wrapBootstrapCall(options: UniversalOptions): Rule {
   return (host: Tree) => {
-    const clientTargets = getClientTargets(host, options);
+    const clientTargets = getProjectTargets(host, options.clientProject);
+    if (!clientTargets.build) {
+      throw targetBuildNotFoundError();
+    }
     const mainPath = normalize('/' + clientTargets.build.options.main);
     let bootstrapCall: ts.Node | null = findBootstrapModuleCall(host, mainPath);
     if (bootstrapCall === null) {
@@ -166,8 +127,11 @@ function wrapBootstrapCall(options: UniversalOptions): Rule {
 
 function addServerTransition(options: UniversalOptions): Rule {
   return (host: Tree) => {
-    const clientProject = getClientProject(host, options);
-    const clientTargets = getClientTargets(host, options);
+    const clientProject = getProject(host, options.clientProject);
+    const clientTargets = getProjectTargets(clientProject);
+    if (!clientTargets.build) {
+      throw targetBuildNotFoundError();
+    }
     const mainPath = normalize('/' + clientTargets.build.options.main);
 
     const bootstrapModuleRelativePath = findBootstrapModulePath(host, mainPath);
@@ -212,8 +176,8 @@ function getTsConfigOutDir(host: Tree, targets: experimental.workspace.Workspace
   const tsConfigContent = tsConfigBuffer.toString();
   const tsConfig = parseJson(tsConfigContent);
   if (tsConfig === null || typeof tsConfig !== 'object' || Array.isArray(tsConfig) ||
-      tsConfig.compilerOptions === null || typeof tsConfig.compilerOptions !== 'object' ||
-      Array.isArray(tsConfig.compilerOptions)) {
+    tsConfig.compilerOptions === null || typeof tsConfig.compilerOptions !== 'object' ||
+    Array.isArray(tsConfig.compilerOptions)) {
     throw new SchematicsException(`Invalid tsconfig - ${tsConfigPath}`);
   }
   const outDir = tsConfig.compilerOptions.outDir;
@@ -223,13 +187,16 @@ function getTsConfigOutDir(host: Tree, targets: experimental.workspace.Workspace
 
 export default function (options: UniversalOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
-    const clientProject = getClientProject(host, options);
+    const clientProject = getProject(host, options.clientProject);
     if (clientProject.projectType !== 'application') {
       throw new SchematicsException(`Universal requires a project type of "application".`);
     }
-    const clientTargets = getClientTargets(host, options);
+    const clientTargets = getProjectTargets(clientProject);
     const outDir = getTsConfigOutDir(host, clientTargets);
-    const tsConfigExtends = basename(clientTargets.build.options.tsConfig);
+    if (!clientTargets.build) {
+      throw targetBuildNotFoundError();
+    }
+    const tsConfigExtends = basename(normalize(clientTargets.build.options.tsConfig));
     const rootInSrc = clientProject.root === '';
     const tsConfigDirectory = join(normalize(clientProject.root), rootInSrc ? 'src' : '');
 
diff --git a/packages/schematics/angular/utility/config.ts b/packages/schematics/angular/utility/config.ts
index 232bbd983b41..b4b2d78d37b4 100644
--- a/packages/schematics/angular/utility/config.ts
+++ b/packages/schematics/angular/utility/config.ts
@@ -5,9 +5,9 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { JsonParseMode, experimental, parseJson } from '@angular-devkit/core';
+import { JsonParseMode, parseJson } from '@angular-devkit/core';
 import { Rule, SchematicContext, SchematicsException, Tree } from '@angular-devkit/schematics';
-
+import { ProjectType, WorkspaceProject, WorkspaceSchema } from './workspace-models';
 
 // The interfaces below are generated from the Angular CLI configuration schema
 // https://github.com/angular/angular-cli/blob/master/packages/@angular/cli/lib/config/schema.json
@@ -478,10 +478,6 @@ export interface CliConfig {
   };
 }
 
-export type WorkspaceSchema = experimental.workspace.WorkspaceSchema;
-export type WorkspaceProject = experimental.workspace.WorkspaceProject;
-
-
 export function getWorkspacePath(host: Tree): string {
   const possibleFiles = [ '/angular.json', '/.angular.json' ];
   const path = possibleFiles.filter(path => host.exists(path))[0];
@@ -500,10 +496,10 @@ export function getWorkspace(host: Tree): WorkspaceSchema {
   return parseJson(content, JsonParseMode.Loose) as {} as WorkspaceSchema;
 }
 
-export function addProjectToWorkspace(
+export function addProjectToWorkspace<TProjectType extends ProjectType = ProjectType.Application>(
   workspace: WorkspaceSchema,
   name: string,
-  project: WorkspaceProject,
+  project: WorkspaceProject<TProjectType>,
 ): Rule {
   return (host: Tree, context: SchematicContext) => {
 
@@ -519,10 +515,16 @@ export function addProjectToWorkspace(
       workspace.defaultProject = name;
     }
 
-    host.overwrite(getWorkspacePath(host), JSON.stringify(workspace, null, 2));
+    return updateWorkspace(workspace);
   };
 }
 
+export function updateWorkspace(workspace: WorkspaceSchema): Rule {
+    return (host: Tree, context: SchematicContext) => {
+        host.overwrite(getWorkspacePath(host), JSON.stringify(workspace, null, 2));
+    };
+}
+
 export const configPath = '/.angular-cli.json';
 
 export function getConfig(host: Tree): CliConfig {
diff --git a/packages/schematics/angular/utility/project-targets.ts b/packages/schematics/angular/utility/project-targets.ts
index 330093d367d6..4559b456bed1 100644
--- a/packages/schematics/angular/utility/project-targets.ts
+++ b/packages/schematics/angular/utility/project-targets.ts
@@ -6,15 +6,31 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { experimental } from '@angular-devkit/core';
+import { SchematicsException, Tree } from '@angular-devkit/schematics';
+import { getProject, isWorkspaceProject } from './project';
+import { WorkspaceProject, WorkspaceSchema, WorkspaceTargets } from './workspace-models';
 
+export function getProjectTargets(project: WorkspaceProject): WorkspaceTargets;
 export function getProjectTargets(
-  project: experimental.workspace.WorkspaceProject,
-): experimental.workspace.WorkspaceTool {
+  workspaceOrHost: WorkspaceSchema | Tree,
+  projectName: string,
+): WorkspaceTargets;
+export function getProjectTargets(
+  projectOrHost: WorkspaceProject | Tree | WorkspaceSchema,
+  projectName = '',
+): WorkspaceTargets {
+  const project = isWorkspaceProject(projectOrHost)
+    ? projectOrHost
+    : getProject(projectOrHost, projectName);
+
   const projectTargets = project.targets || project.architect;
   if (!projectTargets) {
-    throw new Error('Project architect not found.');
+    throw new Error('Project target not found.');
   }
 
   return projectTargets;
 }
+
+export function targetBuildNotFoundError(): SchematicsException {
+  return new SchematicsException(`Project target "build" not found.`);
+}
diff --git a/packages/schematics/angular/utility/project.ts b/packages/schematics/angular/utility/project.ts
index 126273c5351f..13df722f0750 100644
--- a/packages/schematics/angular/utility/project.ts
+++ b/packages/schematics/angular/utility/project.ts
@@ -5,7 +5,9 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { WorkspaceProject } from '../utility/config';
+import { Tree } from '@angular-devkit/schematics';
+import { getWorkspace } from '../utility/config';
+import { ProjectType, WorkspaceProject, WorkspaceSchema } from '../utility/workspace-models';
 
 
 /**
@@ -17,7 +19,26 @@ export function buildDefaultPath(project: WorkspaceProject): string {
     ? `/${project.sourceRoot}/`
     : `/${project.root}/src/`;
 
-  const projectDirName = project.projectType === 'application' ? 'app' : 'lib';
+  const projectDirName = project.projectType === ProjectType.Application ? 'app' : 'lib';
 
   return `${root}${projectDirName}`;
 }
+
+export function getProject<TProjectType extends ProjectType = ProjectType.Application>(
+  workspaceOrHost: WorkspaceSchema | Tree,
+  projectName: string,
+): WorkspaceProject<TProjectType> {
+  const workspace = isWorkspaceSchema(workspaceOrHost)
+    ? workspaceOrHost
+    : getWorkspace(workspaceOrHost);
+
+  return workspace.projects[projectName] as WorkspaceProject<TProjectType>;
+}
+
+export function isWorkspaceSchema(workspace: unknown): workspace is WorkspaceSchema {
+  return !!(workspace && (workspace as WorkspaceSchema).projects);
+}
+
+export function isWorkspaceProject(project: unknown): project is WorkspaceProject {
+  return !!(project && (project as WorkspaceProject).projectType);
+}
diff --git a/packages/schematics/angular/utility/project_spec.ts b/packages/schematics/angular/utility/project_spec.ts
index c7b9a73b02a7..e429c2fbca86 100644
--- a/packages/schematics/angular/utility/project_spec.ts
+++ b/packages/schematics/angular/utility/project_spec.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { WorkspaceProject } from '../utility/config';
+import { ProjectType, WorkspaceProject } from '../utility/workspace-models';
 import { buildDefaultPath } from './project';
 
 
@@ -14,7 +14,7 @@ describe('project', () => {
     let project: WorkspaceProject;
     beforeEach(() => {
       project = {
-        projectType: 'application',
+        projectType: ProjectType.Application,
         root: 'foo',
         prefix: 'app',
       };
@@ -26,7 +26,7 @@ describe('project', () => {
     });
 
     it('should handle projectType of library', () => {
-      project = { ...project, projectType: 'library' };
+      project = { ...project, projectType: ProjectType.Library };
       const result = buildDefaultPath(project);
       expect(result).toEqual('/foo/src/lib');
     });
diff --git a/packages/schematics/angular/utility/workspace-models.ts b/packages/schematics/angular/utility/workspace-models.ts
new file mode 100644
index 000000000000..bb2ddf4f642e
--- /dev/null
+++ b/packages/schematics/angular/utility/workspace-models.ts
@@ -0,0 +1,150 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { experimental } from '@angular-devkit/core';
+
+export enum ProjectType {
+    Application = 'application',
+    Library = 'library',
+}
+
+export enum Builders {
+    AppShell = '@angular-devkit/build-angular:app-shell',
+    Server = '@angular-devkit/build-angular:server',
+    Browser = '@angular-devkit/build-angular:browser',
+    Karma = '@angular-devkit/build-angular:karma',
+    TsLint = '@angular-devkit/build-angular:tslint',
+    NgPackagr = '@angular-devkit/build-ng-packagr:build',
+    DevServer = '@angular-devkit/build-angular:dev-server',
+    ExtractI18n = '@angular-devkit/build-angular:extract-i18n',
+    Protractor = '@angular-devkit/build-angular:protractor',
+}
+
+export interface FileReplacements {
+    replace: string;
+    with: string;
+}
+
+export interface BrowserBuilderBaseOptions {
+    main: string;
+    tsConfig: string;
+    fileReplacements?: FileReplacements[];
+    outputPath?: string;
+    index?: string;
+    polyfills: string;
+    assets?: object[];
+    styles?: string[];
+    scripts?: string[];
+    sourceMap?: boolean;
+}
+
+export interface BrowserBuilderOptions extends BrowserBuilderBaseOptions {
+    serviceWorker?: boolean;
+    optimization?: boolean;
+    outputHashing?: 'all';
+    extractCss?: boolean;
+    namedChunks?: boolean;
+    aot?: boolean;
+    extractLicenses?: boolean;
+    vendorChunk?: boolean;
+    buildOptimizer?: boolean;
+}
+
+export interface ServeBuilderOptions {
+    browserTarget: string;
+}
+export interface LibraryBuilderOptions {
+    tsConfig: string;
+    project: string;
+}
+
+export interface ServerBuilderOptions {
+    outputPath: string;
+    tsConfig: string;
+    main: string;
+    fileReplacements?: FileReplacements[];
+}
+
+export interface AppShellBuilderOptions {
+    browserTarget: string;
+    serverTarget: string;
+    route: string;
+}
+
+export interface TestBuilderOptions extends Partial<BrowserBuilderBaseOptions> {
+    karmaConfig: string;
+}
+
+export interface LintBuilderOptions {
+    tsConfig: string[] | string;
+    exclude?: string[];
+}
+
+export interface ExtractI18nOptions {
+    browserTarget: string;
+}
+
+export interface E2EOptions {
+    protractorConfig: string;
+    devServerTarget: string;
+}
+
+export interface BuilderTarget<TBuilder extends Builders, TOptions> {
+    builder: TBuilder;
+    options: TOptions;
+    configurations?: {
+        production: Partial<TOptions>;
+        [key: string]: Partial<TOptions>;
+    };
+}
+
+export type LibraryBuilderTarget = BuilderTarget<Builders.NgPackagr, LibraryBuilderOptions>;
+export type BrowserBuilderTarget = BuilderTarget<Builders.Browser, BrowserBuilderOptions>;
+export type ServerBuilderTarget = BuilderTarget<Builders.Server, ServerBuilderOptions>;
+export type AppShellBuilderTarget = BuilderTarget<Builders.AppShell, AppShellBuilderOptions>;
+export type LintBuilderTarget = BuilderTarget<Builders.TsLint, LintBuilderOptions>;
+export type TestBuilderTarget = BuilderTarget<Builders.Karma, TestBuilderOptions>;
+export type ServeBuilderTarget = BuilderTarget<Builders.DevServer, ServeBuilderOptions>;
+export type ExtractI18nBuilderTarget = BuilderTarget<Builders.ExtractI18n, ExtractI18nOptions>;
+export type E2EBuilderTarget = BuilderTarget<Builders.Protractor, E2EOptions>;
+
+export interface WorkspaceSchema extends experimental.workspace.WorkspaceSchema {
+    projects: {
+        [key: string]: WorkspaceProject<ProjectType.Application | ProjectType.Library>;
+    };
+}
+
+// tslint:disable-next-line:no-any
+export interface WorkspaceProject<TProjectType extends ProjectType = ProjectType.Application>
+    extends experimental.workspace.WorkspaceProject {
+    /**
+    * Project type.
+    */
+    projectType: ProjectType;
+
+    /**
+     * Tool options.
+     */
+    architect?: WorkspaceTargets<TProjectType>;
+    /**
+     * Tool options.
+     */
+    targets?: WorkspaceTargets<TProjectType>;
+}
+
+export interface WorkspaceTargets<TProjectType extends ProjectType = ProjectType.Application> {
+    build?: TProjectType extends ProjectType.Library ? LibraryBuilderTarget : BrowserBuilderTarget;
+    server?: ServerBuilderTarget;
+    lint?: LintBuilderTarget;
+    test?: TestBuilderTarget;
+    serve?: ServeBuilderTarget;
+    e2e?: E2EBuilderTarget;
+    'app-shell'?: AppShellBuilderTarget;
+    'extract-i18n'?: ExtractI18nBuilderTarget;
+    [key: string]: unknown;
+}

From 467c02b35c4ff43b9f08ed14569fbed34382d6e9 Mon Sep 17 00:00:00 2001
From: Sean Wright <sean@seangwright.me>
Date: Mon, 10 Sep 2018 10:21:16 -0400
Subject: [PATCH 0091/1703] style: match styleguide catch callback

---
 packages/schematics/angular/application/files/src/main.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/application/files/src/main.ts b/packages/schematics/angular/application/files/src/main.ts
index 0c7b5c4872e4..dfbe22af7360 100644
--- a/packages/schematics/angular/application/files/src/main.ts
+++ b/packages/schematics/angular/application/files/src/main.ts
@@ -9,7 +9,7 @@
 <%= experimentalIvy ? '// ' : '' %>}
 <%= experimentalIvy ? '// ' : '' %>
 <%= experimentalIvy ? '// ' : '' %>platformBrowserDynamic().bootstrapModule(AppModule)
-<%= experimentalIvy ? '// ' : '' %>  .catch(err => console.log(err));
+<%= experimentalIvy ? '// ' : '' %>  .catch(err => console.error(err));
 <% if (experimentalIvy) { %>
 import { AppComponent } from './app/app.component';
 import { ɵrenderComponent as renderComponent } from '@angular/core';

From 6133eb23d398b53dc63885c860fb606fb8af165b Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 11 Sep 2018 08:21:11 +0200
Subject: [PATCH 0092/1703] docs: fix asset input path

Closes #12219
---
 docs/documentation/stories/asset-configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/documentation/stories/asset-configuration.md b/docs/documentation/stories/asset-configuration.md
index e8b05b4c9dc1..f448de26ad0d 100644
--- a/docs/documentation/stories/asset-configuration.md
+++ b/docs/documentation/stories/asset-configuration.md
@@ -20,7 +20,7 @@ The array below does the same as the default one:
 ```json
 "assets": [
   { "glob": "**/*", "input": "src/assets/", "output": "/assets/" },
-  { "glob": "favicon.ico", "input": "/src", "output": "/" },
+  { "glob": "favicon.ico", "input": "src/", "output": "/" },
 ]
 ```
 

From 57a32c2ef54e11e4a3f4b76c85643c96d384446a Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 12 Sep 2018 11:55:53 -0400
Subject: [PATCH 0093/1703] fix(@angular/cli): show an error if invalid global
 config file found

Fixes #12198
---
 packages/angular/cli/lib/cli/index.ts  | 9 +++++++++
 packages/angular/cli/models/command.ts | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/angular/cli/lib/cli/index.ts b/packages/angular/cli/lib/cli/index.ts
index fd55a21a6731..c38285ffdecd 100644
--- a/packages/angular/cli/lib/cli/index.ts
+++ b/packages/angular/cli/lib/cli/index.ts
@@ -9,6 +9,7 @@
 import { logging, terminal } from '@angular-devkit/core';
 import { filter } from 'rxjs/operators';
 import { runCommand } from '../../models/command-runner';
+import { getWorkspaceRaw } from '../../utilities/config';
 import { getWorkspaceDetails } from '../../utilities/project';
 
 
@@ -21,6 +22,14 @@ export default async function(options: { testing?: boolean, cliArgs: string[] })
 
   let projectDetails = getWorkspaceDetails();
   if (projectDetails === null) {
+    const [, localPath] = getWorkspaceRaw('local');
+    if (localPath !== null) {
+      logger.fatal(`An invalid configuration file was found ['${localPath}'].`
+                 + ' Please delete the file before running the command.');
+
+      return 1;
+    }
+
     projectDetails = { root: process.cwd() };
   }
 
diff --git a/packages/angular/cli/models/command.ts b/packages/angular/cli/models/command.ts
index 932cd62ad4d5..b7c2cd1d0874 100644
--- a/packages/angular/cli/models/command.ts
+++ b/packages/angular/cli/models/command.ts
@@ -112,10 +112,10 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
   async validateScope(): Promise<void> {
     switch (this.description.scope) {
       case CommandScope.OutProject:
-        if (this.workspace.configFile || getWorkspace('local') !== null) {
+        if (this.workspace.configFile) {
           this.logger.fatal(tags.oneLine`
             The ${this.description.name} command requires to be run outside of a project, but a
-            project definition was found at "${this.workspace.root}".
+            project definition was found at "${this.workspace.configFile}".
           `);
           throw 1;
         }

From 4c5ed59232a8fb16760239013fee1bf51fb81f07 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Fri, 7 Sep 2018 10:29:08 +0100
Subject: [PATCH 0094/1703] build: match engines with bazel and CI

---
 WORKSPACE    | 28 ++++++++++++++++++++++++++--
 package.json |  4 ++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 01a96e2ea061..14eab931653d 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -58,8 +58,32 @@ check_bazel_version("0.15.0")
 node_repositories(
     package_json = ["//:package.json"], 
     preserve_symlinks = True,
-    node_version = "10.3.0",
-    yarn_version = "1.6.0",
+    node_version = "10.9.0",
+    yarn_version = "1.9.2",
+    node_repositories = {
+        "10.9.0-darwin_amd64": (
+            "node-v10.9.0-darwin-x64.tar.gz", 
+            "node-v10.9.0-darwin-x64", 
+            "3c4fe75dacfcc495a432a7ba2dec9045cff359af2a5d7d0429c84a424ef686fc"
+        ),
+        "10.9.0-linux_amd64": (
+            "node-v10.9.0-linux-x64.tar.xz", 
+            "node-v10.9.0-linux-x64", 
+            "c5acb8b7055ee0b6ac653dc4e458c5db45348cecc564b388f4ed1def84a329ff"
+        ),
+        "10.9.0-windows_amd64": (
+            "node-v10.9.0-win-x64.zip", 
+            "node-v10.9.0-win-x64", 
+            "6a75cdbb69d62ed242d6cbf0238a470bcbf628567ee339d4d098a5efcda2401e"
+        ),
+    },
+    yarn_repositories = {
+        "1.9.2": (
+            "yarn-v1.9.2.tar.gz", 
+            "yarn-v1.9.2", 
+            "3ad69cc7f68159a562c676e21998eb21b44138cae7e8fe0749a7d620cf940204"
+        ),
+    },
 )
 
 local_repository(
diff --git a/package.json b/package.json
index 8affd2f1af92..f63af6826edc 100644
--- a/package.json
+++ b/package.json
@@ -43,8 +43,8 @@
     "url": "https://github.com/angular/angular-cli.git"
   },
   "engines": {
-    "node": ">=10.3.0 <11.0.0",
-    "yarn": ">=1.6.0 <2.0.0"
+    "node": ">=10.9.0 <11.0.0",
+    "yarn": ">=1.9.0 <2.0.0"
   },
   "author": "Angular Authors",
   "license": "MIT",

From 2e6eea47d7c065a6d77198293250aa5c9150e5d1 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 10 Sep 2018 16:55:08 -0400
Subject: [PATCH 0095/1703] refactor(@ngtools/webpack): use async/await where
 possible

---
 .../webpack/src/angular_compiler_plugin.ts    | 278 +++++++++---------
 1 file changed, 134 insertions(+), 144 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index ccad0897546b..522647371329 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -346,81 +346,72 @@ export class AngularCompilerPlugin {
       });
   }
 
-  private _createOrUpdateProgram() {
-    return Promise.resolve()
-      .then(() => {
-        // Get the root files from the ts config.
-        // When a new root name (like a lazy route) is added, it won't be available from
-        // following imports on the existing files, so we need to get the new list of root files.
-        const config = readConfiguration(this._tsConfigPath);
-        this._rootNames = config.rootNames.concat(...this._singleFileIncludes);
-
-        // Update the forked type checker with all changed compilation files.
-        // This includes templates, that also need to be reloaded on the type checker.
-        if (this._forkTypeChecker && this._typeCheckerProcess && !this._firstRun) {
-          this._updateForkedTypeChecker(this._rootNames, this._getChangedCompilationFiles());
-        }
+  private async _createOrUpdateProgram() {
+    // Get the root files from the ts config.
+    // When a new root name (like a lazy route) is added, it won't be available from
+    // following imports on the existing files, so we need to get the new list of root files.
+    const config = readConfiguration(this._tsConfigPath);
+    this._rootNames = config.rootNames.concat(...this._singleFileIncludes);
 
-        // Use an identity function as all our paths are absolute already.
-        this._moduleResolutionCache = ts.createModuleResolutionCache(this._basePath, x => x);
+    // Update the forked type checker with all changed compilation files.
+    // This includes templates, that also need to be reloaded on the type checker.
+    if (this._forkTypeChecker && this._typeCheckerProcess && !this._firstRun) {
+      this._updateForkedTypeChecker(this._rootNames, this._getChangedCompilationFiles());
+    }
 
-        const tsProgram = this._getTsProgram();
-        const oldFiles = new Set(tsProgram ?
-          tsProgram.getSourceFiles().map(sf => sf.fileName)
-          : [],
-        );
+    // Use an identity function as all our paths are absolute already.
+    this._moduleResolutionCache = ts.createModuleResolutionCache(this._basePath, x => x);
 
-        if (this._JitMode) {
-          // Create the TypeScript program.
-          time('AngularCompilerPlugin._createOrUpdateProgram.ts.createProgram');
-          this._program = ts.createProgram(
-            this._rootNames,
-            this._compilerOptions,
-            this._compilerHost,
-            tsProgram,
-          );
-          timeEnd('AngularCompilerPlugin._createOrUpdateProgram.ts.createProgram');
+    const tsProgram = this._getTsProgram();
+    const oldFiles = new Set(tsProgram ?
+      tsProgram.getSourceFiles().map(sf => sf.fileName)
+      : [],
+    );
 
-          const newFiles = this._program.getSourceFiles().filter(sf => !oldFiles.has(sf.fileName));
-          for (const newFile of newFiles) {
-            this._compilerHost.invalidate(newFile.fileName);
-          }
+    if (this._JitMode) {
+      // Create the TypeScript program.
+      time('AngularCompilerPlugin._createOrUpdateProgram.ts.createProgram');
+      this._program = ts.createProgram(
+        this._rootNames,
+        this._compilerOptions,
+        this._compilerHost,
+        tsProgram,
+      );
+      timeEnd('AngularCompilerPlugin._createOrUpdateProgram.ts.createProgram');
 
-          return Promise.resolve();
-        } else {
-          time('AngularCompilerPlugin._createOrUpdateProgram.ng.createProgram');
-          // Create the Angular program.
-          this._program = createProgram({
-            rootNames: this._rootNames,
-            options: this._compilerOptions,
-            host: this._compilerHost,
-            oldProgram: this._program as Program,
-          });
-          timeEnd('AngularCompilerPlugin._createOrUpdateProgram.ng.createProgram');
+      const newFiles = this._program.getSourceFiles().filter(sf => !oldFiles.has(sf.fileName));
+      for (const newFile of newFiles) {
+        this._compilerHost.invalidate(newFile.fileName);
+      }
+    } else {
+      time('AngularCompilerPlugin._createOrUpdateProgram.ng.createProgram');
+      // Create the Angular program.
+      this._program = createProgram({
+        rootNames: this._rootNames,
+        options: this._compilerOptions,
+        host: this._compilerHost,
+        oldProgram: this._program as Program,
+      });
+      timeEnd('AngularCompilerPlugin._createOrUpdateProgram.ng.createProgram');
 
-          time('AngularCompilerPlugin._createOrUpdateProgram.ng.loadNgStructureAsync');
+      time('AngularCompilerPlugin._createOrUpdateProgram.ng.loadNgStructureAsync');
+      await this._program.loadNgStructureAsync();
+      timeEnd('AngularCompilerPlugin._createOrUpdateProgram.ng.loadNgStructureAsync');
 
-          return this._program.loadNgStructureAsync()
-            .then(() => {
-              timeEnd('AngularCompilerPlugin._createOrUpdateProgram.ng.loadNgStructureAsync');
+      const newFiles = this._program.getTsProgram()
+        .getSourceFiles().filter(sf => !oldFiles.has(sf.fileName));
+      for (const newFile of newFiles) {
+        this._compilerHost.invalidate(newFile.fileName);
+      }
+    }
 
-              const newFiles = (this._program as Program).getTsProgram()
-                .getSourceFiles().filter(sf => !oldFiles.has(sf.fileName));
-              for (const newFile of newFiles) {
-                this._compilerHost.invalidate(newFile.fileName);
-              }
-            });
-        }
-      })
-      .then(() => {
-        // If there's still no entryModule try to resolve from mainPath.
-        if (!this._entryModule && this._mainPath) {
-          time('AngularCompilerPlugin._make.resolveEntryModuleFromMain');
-          this._entryModule = resolveEntryModuleFromMain(
-            this._mainPath, this._compilerHost, this._getTsProgram() as ts.Program);
-          timeEnd('AngularCompilerPlugin._make.resolveEntryModuleFromMain');
-        }
-      });
+    // If there's still no entryModule try to resolve from mainPath.
+    if (!this._entryModule && this._mainPath) {
+      time('AngularCompilerPlugin._make.resolveEntryModuleFromMain');
+      this._entryModule = resolveEntryModuleFromMain(
+        this._mainPath, this._compilerHost, this._getTsProgram() as ts.Program);
+      timeEnd('AngularCompilerPlugin._make.resolveEntryModuleFromMain');
+    }
   }
 
   private _getLazyRoutesFromNgtools() {
@@ -734,7 +725,10 @@ export class AngularCompilerPlugin {
     compiler.hooks.watchClose.tap('angular-compiler', () => this._killForkedTypeChecker());
 
     // Remake the plugin on each compilation.
-    compiler.hooks.make.tapPromise('angular-compiler', compilation => this._make(compilation));
+    compiler.hooks.make.tapPromise(
+      'angular-compiler',
+      compilation => this._donePromise = this._make(compilation),
+    );
     compiler.hooks.invalid.tap('angular-compiler', () => this._firstRun = false);
     compiler.hooks.afterEmit.tap('angular-compiler', compilation => {
       // tslint:disable-next-line:no-any
@@ -802,16 +796,15 @@ export class AngularCompilerPlugin {
     // Update the resource loader with the new webpack compilation.
     this._resourceLoader.update(compilation);
 
-    return this._donePromise = Promise.resolve()
-      .then(() => this._update())
-      .then(() => {
-        this.pushCompilationErrors(compilation);
-        timeEnd('AngularCompilerPlugin._make');
-      }, err => {
-        compilation.errors.push(err);
-        this.pushCompilationErrors(compilation);
-        timeEnd('AngularCompilerPlugin._make');
-      });
+    try {
+      await this._update();
+      this.pushCompilationErrors(compilation);
+    } catch (err) {
+      compilation.errors.push(err);
+      this.pushCompilationErrors(compilation);
+    }
+
+    timeEnd('AngularCompilerPlugin._make');
   }
 
   private pushCompilationErrors(compilation: compilation.Compilation) {
@@ -868,7 +861,7 @@ export class AngularCompilerPlugin {
     }
   }
 
-  private _update() {
+  private async _update() {
     time('AngularCompilerPlugin._update');
     // We only want to update on TS and template changes, but all kinds of files are on this
     // list, like package.json and .ngsummary.json files.
@@ -879,75 +872,72 @@ export class AngularCompilerPlugin {
       return Promise.resolve();
     }
 
-    return Promise.resolve()
-      // Make a new program and load the Angular structure.
-      .then(() => this._createOrUpdateProgram())
-      .then(() => {
-        if (this.entryModule) {
-          // Try to find lazy routes if we have an entry module.
-          // We need to run the `listLazyRoutes` the first time because it also navigates libraries
-          // and other things that we might miss using the (faster) findLazyRoutesInAst.
-          // Lazy routes modules will be read with compilerHost and added to the changed files.
-          if (this._ngCompilerSupportsNewApi) {
-            this._processLazyRoutes(this._listLazyRoutesFromProgram());
-          } else if (this._firstRun) {
-            this._processLazyRoutes(this._getLazyRoutesFromNgtools());
-          } else {
-            const changedTsFiles = this._getChangedTsFiles();
-            if (changedTsFiles.length > 0) {
-              this._processLazyRoutes(this._findLazyRoutesInAst(changedTsFiles));
-            }
-          }
-          if (this._options.additionalLazyModules) {
-            this._processLazyRoutes(this._options.additionalLazyModules);
-          }
-        }
-      })
-      .then(() => {
-        // Emit and report errors.
-
-        // We now have the final list of changed TS files.
-        // Go through each changed file and add transforms as needed.
-        const sourceFiles = this._getChangedTsFiles()
-          .map((fileName) => (this._getTsProgram() as ts.Program).getSourceFile(fileName))
-          // At this point we shouldn't need to filter out undefined files, because any ts file
-          // that changed should be emitted.
-          // But due to hostReplacementPaths there can be files (the environment files)
-          // that changed but aren't part of the compilation, specially on `ng test`.
-          // So we ignore missing source files files here.
-          // hostReplacementPaths needs to be fixed anyway to take care of the following issue.
-          // https://github.com/angular/angular-cli/issues/7305#issuecomment-332150230
-          .filter((x) => !!x) as ts.SourceFile[];
-
-        // Emit files.
-        time('AngularCompilerPlugin._update._emit');
-        const { emitResult, diagnostics } = this._emit(sourceFiles);
-        timeEnd('AngularCompilerPlugin._update._emit');
-
-        // Report diagnostics.
-        const errors = diagnostics
-          .filter((diag) => diag.category === ts.DiagnosticCategory.Error);
-        const warnings = diagnostics
-          .filter((diag) => diag.category === ts.DiagnosticCategory.Warning);
-
-        if (errors.length > 0) {
-          const message = formatDiagnostics(errors);
-          this._errors.push(new Error(message));
+    // Make a new program and load the Angular structure.
+    await this._createOrUpdateProgram();
+
+    if (this.entryModule) {
+      // Try to find lazy routes if we have an entry module.
+      // We need to run the `listLazyRoutes` the first time because it also navigates libraries
+      // and other things that we might miss using the (faster) findLazyRoutesInAst.
+      // Lazy routes modules will be read with compilerHost and added to the changed files.
+      if (this._ngCompilerSupportsNewApi) {
+        this._processLazyRoutes(this._listLazyRoutesFromProgram());
+      } else if (this._firstRun) {
+        this._processLazyRoutes(this._getLazyRoutesFromNgtools());
+      } else {
+        const changedTsFiles = this._getChangedTsFiles();
+        if (changedTsFiles.length > 0) {
+          this._processLazyRoutes(this._findLazyRoutesInAst(changedTsFiles));
         }
+      }
+      if (this._options.additionalLazyModules) {
+        this._processLazyRoutes(this._options.additionalLazyModules);
+      }
+    }
 
-        if (warnings.length > 0) {
-          const message = formatDiagnostics(warnings);
-          this._warnings.push(message);
-        }
+    // Emit and report errors.
+
+    // We now have the final list of changed TS files.
+    // Go through each changed file and add transforms as needed.
+    const sourceFiles = this._getChangedTsFiles()
+      .map((fileName) => (this._getTsProgram() as ts.Program).getSourceFile(fileName))
+      // At this point we shouldn't need to filter out undefined files, because any ts file
+      // that changed should be emitted.
+      // But due to hostReplacementPaths there can be files (the environment files)
+      // that changed but aren't part of the compilation, specially on `ng test`.
+      // So we ignore missing source files files here.
+      // hostReplacementPaths needs to be fixed anyway to take care of the following issue.
+      // https://github.com/angular/angular-cli/issues/7305#issuecomment-332150230
+      .filter((x) => !!x) as ts.SourceFile[];
+
+    // Emit files.
+    time('AngularCompilerPlugin._update._emit');
+    const { emitResult, diagnostics } = this._emit(sourceFiles);
+    timeEnd('AngularCompilerPlugin._update._emit');
+
+    // Report diagnostics.
+    const errors = diagnostics
+      .filter((diag) => diag.category === ts.DiagnosticCategory.Error);
+    const warnings = diagnostics
+      .filter((diag) => diag.category === ts.DiagnosticCategory.Warning);
+
+    if (errors.length > 0) {
+      const message = formatDiagnostics(errors);
+      this._errors.push(new Error(message));
+    }
 
-        this._emitSkipped = !emitResult || emitResult.emitSkipped;
+    if (warnings.length > 0) {
+      const message = formatDiagnostics(warnings);
+      this._warnings.push(message);
+    }
 
-        // Reset changed files on successful compilation.
-        if (!this._emitSkipped && this._errors.length === 0) {
-          this._compilerHost.resetChangedFileTracker();
-        }
-        timeEnd('AngularCompilerPlugin._update');
-      });
+    this._emitSkipped = !emitResult || emitResult.emitSkipped;
+
+    // Reset changed files on successful compilation.
+    if (!this._emitSkipped && this._errors.length === 0) {
+      this._compilerHost.resetChangedFileTracker();
+    }
+    timeEnd('AngularCompilerPlugin._update');
   }
 
   writeI18nOutFile() {

From a2e44bb8b70e13bf7356530e2d10f08f9817234f Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 10 Sep 2018 20:46:23 -0400
Subject: [PATCH 0096/1703] build: use native async/await support

Node.js 8.9.4 (minimum supported version for the CLI) contains native async support.
---
 tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tsconfig.json b/tsconfig.json
index c4a593422654..5e324d59e6fd 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -22,7 +22,7 @@
     // source in devtools.
     "inlineSources": true,
     "strictNullChecks": true,
-    "target": "es2016",
+    "target": "es2017",
     "lib": [
       "es2017"
     ],

From 1e7feb5270e76603db00c7064b31aad46fd4dcf8 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 10 Sep 2018 20:49:22 -0400
Subject: [PATCH 0097/1703] fix(@ngtools/webpack): remove deprecated
 singleFileIncludes option

---
 .../ngtools/webpack/src/angular_compiler_plugin.ts   | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 522647371329..7685bfdf038a 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -79,9 +79,6 @@ export interface AngularCompilerPluginOptions {
   skipCodeGeneration?: boolean;
   hostReplacementPaths?: { [path: string]: string } | ((path: string) => string);
   forkTypeChecker?: boolean;
-  // TODO: remove singleFileIncludes for 2.0, this is just to support old projects that did not
-  // include 'polyfills.ts' in `tsconfig.spec.json'.
-  singleFileIncludes?: string[];
   i18nInFile?: string;
   i18nInFormat?: string;
   i18nOutFile?: string;
@@ -116,7 +113,6 @@ export class AngularCompilerPlugin {
   // TS compilation.
   private _compilerOptions: CompilerOptions;
   private _rootNames: string[];
-  private _singleFileIncludes: string[] = [];
   private _program: (ts.Program | Program) | null;
   private _compilerHost: WebpackCompilerHost & CompilerHost;
   private _moduleResolutionCache: ts.ModuleResolutionCache;
@@ -203,17 +199,13 @@ export class AngularCompilerPlugin {
       basePath = path.resolve(process.cwd(), options.basePath);
     }
 
-    if (options.singleFileIncludes !== undefined) {
-      this._singleFileIncludes.push(...options.singleFileIncludes);
-    }
-
     // Parse the tsconfig contents.
     const config = readConfiguration(this._tsConfigPath);
     if (config.errors && config.errors.length) {
       throw new Error(formatDiagnostics(config.errors));
     }
 
-    this._rootNames = config.rootNames.concat(...this._singleFileIncludes);
+    this._rootNames = config.rootNames;
     this._compilerOptions = { ...config.options, ...options.compilerOptions };
     this._basePath = config.options.basePath || basePath || '';
 
@@ -351,7 +343,7 @@ export class AngularCompilerPlugin {
     // When a new root name (like a lazy route) is added, it won't be available from
     // following imports on the existing files, so we need to get the new list of root files.
     const config = readConfiguration(this._tsConfigPath);
-    this._rootNames = config.rootNames.concat(...this._singleFileIncludes);
+    this._rootNames = config.rootNames;
 
     // Update the forked type checker with all changed compilation files.
     // This includes templates, that also need to be reloaded on the type checker.

From 67684663b707234ef155993aa0dc66804c6a14cd Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 10 Sep 2018 21:07:07 -0400
Subject: [PATCH 0098/1703] feat(@ngtools/webpack): move @angular/compiler-cli
 to a peer dependency

Now that the package is no longer installed globally, it can now properly use peer dependencies without issue.
---
 packages/ngtools/webpack/package.json         |  3 +
 .../webpack/src/angular_compiler_plugin.ts    | 24 +++--
 .../ngtools/webpack/src/gather_diagnostics.ts |  2 +-
 packages/ngtools/webpack/src/ngtools_api.ts   | 98 -------------------
 packages/ngtools/webpack/src/type_checker.ts  | 10 +-
 5 files changed, 20 insertions(+), 117 deletions(-)
 delete mode 100644 packages/ngtools/webpack/src/ngtools_api.ts

diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 7f91148f0e29..4d33694cf939 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -31,10 +31,13 @@
     "webpack-sources": "1.2.0"
   },
   "peerDependencies": {
+    "@angular/compiler-cli": ">=5.0.0 <8.0.0 || ^7.0.0-beta.0",
     "typescript": ">=2.4.0 < 3.1",
     "webpack": "^4.0.0"
   },
   "devDependencies": {
+    "@angular/compiler": "^7.0.0-beta.4",
+    "@angular/compiler-cli": "^7.0.0-beta.4",
     "typescript": "~3.0.1",
     "webpack": "^4.0.0"
   }
diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 7685bfdf038a..75fb98cbf7fc 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -6,18 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { Path, dirname, getSystemPath, normalize, resolve, virtualFs } from '@angular-devkit/core';
-import { ChildProcess, ForkOptions, fork } from 'child_process';
-import * as fs from 'fs';
-import * as path from 'path';
-import * as ts from 'typescript';
-import { Compiler, compilation } from 'webpack';
-import { time, timeEnd } from './benchmark';
-import { WebpackCompilerHost, workaroundResolve } from './compiler_host';
-import { resolveEntryModuleFromMain } from './entry_resolver';
-import { gatherDiagnostics, hasErrors } from './gather_diagnostics';
-import { LazyRouteMap, findLazyRoutes } from './lazy_routes';
 import {
-  CompilerCliIsSupported,
   CompilerHost,
   CompilerOptions,
   DEFAULT_ERROR_CODE,
@@ -32,7 +21,17 @@ import {
   createProgram,
   formatDiagnostics,
   readConfiguration,
-} from './ngtools_api';
+} from '@angular/compiler-cli';
+import { ChildProcess, ForkOptions, fork } from 'child_process';
+import * as fs from 'fs';
+import * as path from 'path';
+import * as ts from 'typescript';
+import { Compiler, compilation } from 'webpack';
+import { time, timeEnd } from './benchmark';
+import { WebpackCompilerHost, workaroundResolve } from './compiler_host';
+import { resolveEntryModuleFromMain } from './entry_resolver';
+import { gatherDiagnostics, hasErrors } from './gather_diagnostics';
+import { LazyRouteMap, findLazyRoutes } from './lazy_routes';
 import { resolveWithPaths } from './paths-plugin';
 import { WebpackResourceLoader } from './resource_loader';
 import {
@@ -152,7 +151,6 @@ export class AngularCompilerPlugin {
   }
 
   constructor(options: AngularCompilerPluginOptions) {
-    CompilerCliIsSupported();
     this._options = Object.assign({}, options);
     this._setupOptions(this._options);
   }
diff --git a/packages/ngtools/webpack/src/gather_diagnostics.ts b/packages/ngtools/webpack/src/gather_diagnostics.ts
index 6b6be8f74599..ccde7b02774d 100644
--- a/packages/ngtools/webpack/src/gather_diagnostics.ts
+++ b/packages/ngtools/webpack/src/gather_diagnostics.ts
@@ -5,9 +5,9 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import { Diagnostic, Diagnostics, Program } from '@angular/compiler-cli';
 import * as ts from 'typescript';
 import { time, timeEnd } from './benchmark';
-import { Diagnostic, Diagnostics, Program } from './ngtools_api';
 
 
 export class CancellationToken implements ts.CancellationToken {
diff --git a/packages/ngtools/webpack/src/ngtools_api.ts b/packages/ngtools/webpack/src/ngtools_api.ts
deleted file mode 100644
index 23e032a4c361..000000000000
--- a/packages/ngtools/webpack/src/ngtools_api.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-// We disable implicit dependenccies because those are only for typings and don't have a runtime
-// equivalent.
-// tslint:disable-next-line:no-global-tslint-disable
-// tslint:disable:no-implicit-dependencies
-import * as ngc from '@angular/compiler-cli';
-import * as ngtools from '@angular/compiler-cli/ngtools2';
-import * as path from 'path';
-import * as ts from 'typescript';
-
-export const DEFAULT_ERROR_CODE = 100;
-export const UNKNOWN_ERROR_CODE = 500;
-export const SOURCE = 'angular' as 'angular';
-
-export type CompilerOptions = ngc.CompilerOptions;
-export type CompilerHost = ngtools.CompilerHost;
-export type Program = ngtools.Program;
-export type Diagnostic = ngtools.Diagnostic;
-export type Diagnostics = ReadonlyArray<ts.Diagnostic | Diagnostic>;
-
-function _error(api: string, fn: string): never {
-  throw new Error('Could not find API ' + api + ', function ' + fn);
-}
-
-function getApiMember<T, K extends keyof T>(
-  api: T | null,
-  func: K,
-  apiName: string,
-): T[K] {
-  return api && api[func] || _error(apiName, func.toString());
-}
-
-// Manually check for Compiler CLI availability and supported version.
-// This is needed because @ngtools/webpack does not depend directly on @angular/compiler-cli, since
-// it is installed as part of global Angular CLI installs and compiler-cli is not of its
-// dependencies.
-export function CompilerCliIsSupported() {
-  let version;
-
-  // Check that Angular is available.
-  try {
-    version = (require('@angular/compiler-cli') as typeof ngc).VERSION;
-  } catch (e) {
-    throw new Error('The "@angular/compiler-cli" package was not properly installed. Error: ' + e);
-  }
-
-  // Check that Angular is also not part of this module's node_modules (it should be the project's).
-  const compilerCliPath = require.resolve('@angular/compiler-cli');
-  if (compilerCliPath.startsWith(path.dirname(__dirname))) {
-    throw new Error('The @ngtools/webpack plugin now relies on the project @angular/compiler-cli. '
-      + 'Please clean your node_modules and reinstall.');
-  }
-
-  // Throw if we're less than 5.x
-  if (Number(version.major) < 5) {
-    throw new Error('Version of @angular/compiler-cli needs to be 5.0.0 or greater. '
-      + `Current version is "${version.full}".`);
-  }
-}
-
-// These imports do not exist on a global install for Angular CLI, so we cannot use a static ES6
-// import.
-let compilerCli: typeof ngc | null = null;
-try {
-  compilerCli = require('@angular/compiler-cli');
-} catch {
-  // Don't throw an error if the private API does not exist.
-  // Instead, the `CompilerCliIsSupported` method should return throw and indicate the
-  // plugin cannot be used.
-}
-
-export const VERSION: typeof ngc.VERSION = getApiMember(compilerCli, 'VERSION', 'compiler-cli');
-export const __NGTOOLS_PRIVATE_API_2 = getApiMember(
-  compilerCli,
-  '__NGTOOLS_PRIVATE_API_2',
-  'compiler-cli',
-);
-export const readConfiguration = getApiMember(compilerCli, 'readConfiguration', 'compiler-cli');
-
-// These imports do not exist on Angular versions lower than 5, so we cannot use a static ES6
-// import.
-let ngtools2: typeof ngtools | null = null;
-try {
-  ngtools2 = require('@angular/compiler-cli/ngtools2');
-} catch {
-  // Don't throw an error if the private API does not exist.
-}
-
-export const createProgram = getApiMember(ngtools2, 'createProgram', 'ngtools2');
-export const createCompilerHost = getApiMember(ngtools2, 'createCompilerHost', 'ngtools2');
-export const formatDiagnostics = getApiMember(ngtools2, 'formatDiagnostics', 'ngtools2');
-export const EmitFlags = getApiMember(ngtools2, 'EmitFlags', 'ngtools2');
diff --git a/packages/ngtools/webpack/src/type_checker.ts b/packages/ngtools/webpack/src/type_checker.ts
index d2d4c6a6d0f6..7e134c9d3b81 100644
--- a/packages/ngtools/webpack/src/type_checker.ts
+++ b/packages/ngtools/webpack/src/type_checker.ts
@@ -7,10 +7,6 @@
  */
 import { terminal } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
-import * as ts from 'typescript';
-import { time, timeEnd } from './benchmark';
-import { WebpackCompilerHost } from './compiler_host';
-import { CancellationToken, gatherDiagnostics } from './gather_diagnostics';
 import {
   CompilerHost,
   CompilerOptions,
@@ -18,7 +14,11 @@ import {
   createCompilerHost,
   createProgram,
   formatDiagnostics,
-} from './ngtools_api';
+} from '@angular/compiler-cli';
+import * as ts from 'typescript';
+import { time, timeEnd } from './benchmark';
+import { WebpackCompilerHost } from './compiler_host';
+import { CancellationToken, gatherDiagnostics } from './gather_diagnostics';
 
 
 // This file should run in a child process with the AUTO_START_ARG argument

From 437cd6234d8024134603baad9e121da417474598 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 10 Sep 2018 22:31:24 -0400
Subject: [PATCH 0099/1703] ci: remove unused unit test code coverage

This is not saved anywhere and it currently doesn't support native async/await.
---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fd888daecdc5..026eb96fdb7f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -66,7 +66,7 @@ jobs:
     <<: *defaults
     steps:
       - attach_workspace: *attach_options
-      - run: npm run test -- --code-coverage --full
+      - run: npm run test -- --full
 
   test-large:
     <<: *defaults
@@ -75,7 +75,7 @@ jobs:
     steps:
       - attach_workspace: *attach_options
       - run: npm run webdriver-update-circleci
-      - run: npm run test-large -- --code-coverage --full --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
+      - run: npm run test-large -- --full --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
 
   e2e-cli:
     <<: *defaults

From e36a259a45ce3987e9cd4a209ad383bb935006f3 Mon Sep 17 00:00:00 2001
From: Yi Qi <qiyi@google.com>
Date: Mon, 10 Sep 2018 14:00:52 -0700
Subject: [PATCH 0100/1703] fix(@angular/cli): fix issues in google3

---
 packages/angular/cli/BUILD                               | 2 ++
 packages/angular_devkit/core/src/json/schema/registry.ts | 9 ++++++---
 .../schematics/tools/fallback-engine-host.ts             | 3 ++-
 .../schematics/tools/file-system-engine-host-base.ts     | 3 ++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/angular/cli/BUILD b/packages/angular/cli/BUILD
index 471f0d42475a..a4d7f4ba6fdd 100644
--- a/packages/angular/cli/BUILD
+++ b/packages/angular/cli/BUILD
@@ -28,6 +28,8 @@ ts_library(
         "//packages/angular_devkit/schematics:tools",
         "@rxjs",
         "@rxjs//operators",
+        # @typings: es2017.object
+        # @typings: inquirer
         # @typings: node
         # @typings: semver
     ],
diff --git a/packages/angular_devkit/core/src/json/schema/registry.ts b/packages/angular_devkit/core/src/json/schema/registry.ts
index 33510bcdaa61..06321af8aec4 100644
--- a/packages/angular_devkit/core/src/json/schema/registry.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry.ts
@@ -342,7 +342,8 @@ export class CoreSchemaRegistry implements SchemaRegistry {
 
           let result = of(data);
           if (validationOptions.applyPreTransforms) {
-            result = result.pipe(
+            // tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
+            result = (result as any).pipe(
               ...[...this._pre].map(visitor => concatMap((data: JsonValue) => {
                 return visitJson(data, visitor, schema, this._resolver, validate);
               })),
@@ -392,7 +393,8 @@ export class CoreSchemaRegistry implements SchemaRegistry {
                 let result = of(data);
 
                 if (validationOptions.applyPostTransforms) {
-                  result = result.pipe(
+                  // tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
+                  result = (result as any).pipe(
                     ...[...this._post].map(visitor => concatMap((data: JsonValue) => {
                       return visitJson(data, visitor, schema, this._resolver, validate);
                     })),
@@ -686,7 +688,8 @@ export class CoreSchemaRegistry implements SchemaRegistry {
     data: T,
     smartDefaults: Map<string, JsonObject>,
   ): Observable<T> {
-    return of(data).pipe(
+    // tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
+    return (of(data) as any).pipe(
       ...[...smartDefaults.entries()].map(([pointer, schema]) => {
         return concatMap<T, T>(data => {
           const fragments = JSON.parse(pointer);
diff --git a/packages/angular_devkit/schematics/tools/fallback-engine-host.ts b/packages/angular_devkit/schematics/tools/fallback-engine-host.ts
index 7dd9849bef24..3e9f882452b5 100644
--- a/packages/angular_devkit/schematics/tools/fallback-engine-host.ts
+++ b/packages/angular_devkit/schematics/tools/fallback-engine-host.ts
@@ -91,7 +91,8 @@ export class FallbackEngineHost implements EngineHost<{}, {}> {
     options: OptionT,
     context?: FallbackContext,
   ): Observable<ResultT> {
-    return (observableOf(options)
+    // tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
+    return ((observableOf(options) as any)
       .pipe(...this._hosts
         .map(host => mergeMap(opt => host.transformOptions(schematic, opt, context))),
       )
diff --git a/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts b/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts
index 0ed3cc7dac98..aae6da2f8dec 100644
--- a/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts
+++ b/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts
@@ -287,7 +287,8 @@ export abstract class FileSystemEngineHostBase implements
     options: OptionT,
     context?: FileSystemSchematicContext,
   ): Observable<ResultT> {
-    return (observableOf(options)
+    // tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
+    return ((observableOf(options) as any)
       .pipe(
         ...this._transforms.map(tFn => mergeMap(opt => {
           const newOptions = tFn(schematic, opt, context);

From f107d2de11ad19ad7cac8d352f1eb3b7cf86d0b9 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 10 Sep 2018 14:24:53 -0400
Subject: [PATCH 0101/1703] fix(@schematics/angular): use 'architect' instead
 of 'targets' until deprecated

---
 packages/schematics/angular/application/index.ts         | 2 +-
 packages/schematics/angular/e2e/index.ts                 | 2 +-
 packages/schematics/angular/library/index.ts             | 2 +-
 packages/schematics/angular/migrations/update-6/index.ts | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 3c54fc6d0d9d..656c45e76145 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -140,7 +140,7 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
     projectType: ProjectType.Application,
     prefix: options.prefix || 'app',
     schematics,
-    targets: {
+    architect: {
       build: {
         builder: Builders.Browser,
         options: {
diff --git a/packages/schematics/angular/e2e/index.ts b/packages/schematics/angular/e2e/index.ts
index 36c34ee59ee6..ab6cc4516736 100644
--- a/packages/schematics/angular/e2e/index.ts
+++ b/packages/schematics/angular/e2e/index.ts
@@ -46,7 +46,7 @@ function addAppToWorkspaceFile(options: E2eOptions, workspace: WorkspaceSchema):
       root: projectRoot,
       projectType: ProjectType.Application,
       prefix: '',
-      targets: {
+      architect: {
         e2e: {
           builder: Builders.Protractor,
           options: {
diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index 81914af9dba5..aa9b8b7e3ed9 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -138,7 +138,7 @@ function addAppToWorkspaceFile(options: LibraryOptions, workspace: WorkspaceSche
     sourceRoot: `${projectRoot}/src`,
     projectType: ProjectType.Library,
     prefix: options.prefix || 'lib',
-    targets: {
+    architect: {
       build: {
         builder: Builders.NgPackagr,
         options: {
diff --git a/packages/schematics/angular/migrations/update-6/index.ts b/packages/schematics/angular/migrations/update-6/index.ts
index 866e92ae66fa..d8c239b2c215 100644
--- a/packages/schematics/angular/migrations/update-6/index.ts
+++ b/packages/schematics/angular/migrations/update-6/index.ts
@@ -402,7 +402,7 @@ function extractProjectsConfig(
       };
 
       const targets: JsonObject = {};
-      project.targets = targets;
+      project.architect = targets;
 
         // Browser target
       const buildOptions: JsonObject = {

From 57c049e5075bf604dd1796eba9a8a5fc1eb06504 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 10 Sep 2018 15:17:00 -0400
Subject: [PATCH 0102/1703] test: update to support targets & architect fields

---
 packages/angular/pwa/pwa/index_spec.ts        |  4 +-
 .../angular/app-shell/index_spec.ts           |  2 +-
 .../angular/application/index_spec.ts         |  4 +-
 packages/schematics/angular/e2e/index_spec.ts |  6 +--
 .../angular/migrations/update-6/index.ts      |  4 +-
 .../angular/migrations/update-6/index_spec.ts | 51 ++++++++++---------
 .../angular/service-worker/index_spec.ts      |  8 +--
 .../angular/universal/index_spec.ts           | 10 ++--
 tests/legacy-cli/e2e/tests/basic/assets.ts    |  4 +-
 .../e2e/tests/basic/scripts-array.ts          |  4 +-
 .../e2e/tests/basic/styles-array.ts           |  4 +-
 .../e2e/tests/build/build-app-shell.ts        |  2 +-
 .../e2e/tests/build/bundle-budgets.ts         |  8 +--
 .../e2e/tests/build/dynamic-import.ts         |  4 +-
 .../legacy-cli/e2e/tests/build/environment.ts |  4 +-
 .../legacy-cli/e2e/tests/build/output-dir.ts  |  2 +-
 .../e2e/tests/build/platform-server.ts        |  6 +--
 .../e2e/tests/build/service-worker.ts         |  2 +-
 .../e2e/tests/build/styles/dart-sass.ts       |  2 +-
 .../e2e/tests/build/styles/extract-css.ts     |  4 +-
 .../e2e/tests/build/styles/imports.ts         |  8 +--
 .../e2e/tests/build/styles/include-paths.ts   |  2 +-
 .../legacy-cli/e2e/tests/build/styles/less.ts |  4 +-
 .../e2e/tests/build/styles/loaders.ts         |  4 +-
 .../e2e/tests/build/styles/material-import.ts |  4 +-
 .../legacy-cli/e2e/tests/build/styles/scss.ts |  4 +-
 .../e2e/tests/build/styles/stylus.ts          |  4 +-
 .../e2e/tests/commands/build/build-outdir.ts  |  5 +-
 .../commands/config/config-set-serve-port.ts  |  2 +-
 .../e2e/tests/lint/lint-no-project.ts         |  2 +-
 tests/legacy-cli/e2e/tests/misc/coverage.ts   |  4 +-
 tests/legacy-cli/e2e/tests/misc/fallback.ts   |  2 +-
 .../legacy-cli/e2e/tests/test/e2e-baseurl.ts  |  2 +-
 .../legacy-cli/e2e/tests/test/test-assets.ts  |  4 +-
 .../e2e/tests/test/test-environment.ts        |  4 +-
 .../legacy-cli/e2e/tests/test/test-scripts.ts |  4 +-
 .../e2e/tests/third-party/bootstrap.ts        |  6 +--
 .../e2e/tests/third-party/material-icons.ts   |  4 +-
 tests/legacy-cli/e2e/utils/project.ts         |  6 ++-
 39 files changed, 108 insertions(+), 102 deletions(-)

diff --git a/packages/angular/pwa/pwa/index_spec.ts b/packages/angular/pwa/pwa/index_spec.ts
index b607a797c8a5..f716847f47ff 100644
--- a/packages/angular/pwa/pwa/index_spec.ts
+++ b/packages/angular/pwa/pwa/index_spec.ts
@@ -51,7 +51,7 @@ describe('PWA Schematic', () => {
     schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise().then(tree => {
       const configText = tree.readContent('/angular.json');
       const config = JSON.parse(configText);
-      const swFlag = config.projects.bar.targets.build.configurations.production.serviceWorker;
+      const swFlag = config.projects.bar.architect.build.configurations.production.serviceWorker;
       expect(swFlag).toEqual(true);
       done();
     }, done.fail);
@@ -131,7 +131,7 @@ describe('PWA Schematic', () => {
     schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise().then(tree => {
       const configText = tree.readContent('/angular.json');
       const config = JSON.parse(configText);
-      const targets = config.projects.bar.targets;
+      const targets = config.projects.bar.architect;
 
       ['build', 'test'].forEach((target) => {
         expect(targets[target].options.assets).toContain('projects/bar/src/manifest.json');
diff --git a/packages/schematics/angular/app-shell/index_spec.ts b/packages/schematics/angular/app-shell/index_spec.ts
index 6cc865556f0e..deef63477f1a 100644
--- a/packages/schematics/angular/app-shell/index_spec.ts
+++ b/packages/schematics/angular/app-shell/index_spec.ts
@@ -64,7 +64,7 @@ describe('App Shell Schematic', () => {
     const filePath = '/angular.json';
     const content = tree.readContent(filePath);
     const workspace = JSON.parse(content);
-    const target = workspace.projects.bar.targets['app-shell'];
+    const target = workspace.projects.bar.architect['app-shell'];
     expect(target.options.browserTarget).toEqual('bar:build');
     expect(target.options.serverTarget).toEqual('bar:server');
     expect(target.options.route).toEqual('shell');
diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
index aca5907287a2..5fd2be343ee4 100644
--- a/packages/schematics/angular/application/index_spec.ts
+++ b/packages/schematics/angular/application/index_spec.ts
@@ -207,13 +207,13 @@ describe('Application Schematic', () => {
       const config = JSON.parse(tree.readContent('/angular.json'));
       const prj = config.projects.foo;
       expect(prj.root).toEqual('');
-      const buildOpt = prj.targets.build.options;
+      const buildOpt = prj.architect.build.options;
       expect(buildOpt.index).toEqual('src/index.html');
       expect(buildOpt.main).toEqual('src/main.ts');
       expect(buildOpt.polyfills).toEqual('src/polyfills.ts');
       expect(buildOpt.tsConfig).toEqual('src/tsconfig.app.json');
 
-      const testOpt = prj.targets.test.options;
+      const testOpt = prj.architect.test.options;
       expect(testOpt.main).toEqual('src/test.ts');
       expect(testOpt.tsConfig).toEqual('src/tsconfig.spec.json');
       expect(testOpt.karmaConfig).toEqual('src/karma.conf.js');
diff --git a/packages/schematics/angular/e2e/index_spec.ts b/packages/schematics/angular/e2e/index_spec.ts
index 39bed6479f97..204f3f941b89 100644
--- a/packages/schematics/angular/e2e/index_spec.ts
+++ b/packages/schematics/angular/e2e/index_spec.ts
@@ -79,14 +79,14 @@ describe('Application Schematic', () => {
     it('should set 2 targets for the app', () => {
       const tree = schematicRunner.runSchematic('e2e', defaultOptions, workspaceTree);
       const workspace = JSON.parse(tree.readContent('/angular.json'));
-      const targets = workspace.projects.foo.targets;
+      const targets = workspace.projects.foo.architect;
       expect(Object.keys(targets)).toEqual(['e2e', 'lint']);
     });
 
     it('should set the e2e options', () => {
       const tree = schematicRunner.runSchematic('e2e', defaultOptions, workspaceTree);
       const workspace = JSON.parse(tree.readContent('/angular.json'));
-      const e2eOptions = workspace.projects.foo.targets.e2e.options;
+      const e2eOptions = workspace.projects.foo.architect.e2e.options;
       expect(e2eOptions.protractorConfig).toEqual('projects/foo/protractor.conf.js');
       expect(e2eOptions.devServerTarget).toEqual('app:serve');
     });
@@ -94,7 +94,7 @@ describe('Application Schematic', () => {
     it('should set the lint options', () => {
       const tree = schematicRunner.runSchematic('e2e', defaultOptions, workspaceTree);
       const workspace = JSON.parse(tree.readContent('/angular.json'));
-      const lintOptions = workspace.projects.foo.targets.lint.options;
+      const lintOptions = workspace.projects.foo.architect.lint.options;
       expect(lintOptions.tsConfig).toEqual('projects/foo/tsconfig.e2e.json');
     });
   });
diff --git a/packages/schematics/angular/migrations/update-6/index.ts b/packages/schematics/angular/migrations/update-6/index.ts
index d8c239b2c215..e5338f19213d 100644
--- a/packages/schematics/angular/migrations/update-6/index.ts
+++ b/packages/schematics/angular/migrations/update-6/index.ts
@@ -121,7 +121,7 @@ function migrateConfiguration(oldConfig: CliConfig, logger: logging.LoggerApi):
     }
     const targetsConfig = extractTargetsConfig(oldConfig);
     if (targetsConfig !== null) {
-      config.targets = targetsConfig;
+      config.architect = targetsConfig;
     }
 
     context.logger.info(`Removing old config file (${oldConfigPath})`);
@@ -577,7 +577,7 @@ function extractProjectsConfig(
       };
       e2eTargets.lint = e2eLintTarget;
       if (protractorConfig) {
-        e2eProject.targets = e2eTargets;
+        e2eProject.architect = e2eTargets;
       }
 
       return { name, project, e2eProject };
diff --git a/packages/schematics/angular/migrations/update-6/index_spec.ts b/packages/schematics/angular/migrations/update-6/index_spec.ts
index c9298b08f562..d4ff5748eb6e 100644
--- a/packages/schematics/angular/migrations/update-6/index_spec.ts
+++ b/packages/schematics/angular/migrations/update-6/index_spec.ts
@@ -124,6 +124,13 @@ describe('Migration to v6', () => {
     return JSON.parse(tree.readContent(configPath));
   }
 
+  // tslint:disable-next-line:no-any
+  function getTarget(tree: UnitTestTree, targetName: string): any {
+    const project = getConfig(tree).projects.foo;
+
+    return project.architect[targetName];
+  }
+
   describe('file creation/deletion', () => {
     it('should delete the old config file', () => {
       tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
@@ -474,7 +481,7 @@ describe('Migration to v6', () => {
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
         const config = getConfig(tree);
-        expect(config.targets).not.toBeDefined();
+        expect(config.architect).not.toBeDefined();
       });
     });
 
@@ -526,7 +533,7 @@ describe('Migration to v6', () => {
       it('should set build target', () => {
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
-        const build = getConfig(tree).projects.foo.targets.build;
+        const build = getTarget(tree, 'build');
         expect(build.builder).toEqual('@angular-devkit/build-angular:browser');
         expect(build.options.scripts).toEqual([]);
         expect(build.options.styles).toEqual(['src/styles.css']);
@@ -560,7 +567,7 @@ describe('Migration to v6', () => {
       it('should not set baseHref on build & serve targets if not defined', () => {
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
-        const build = getConfig(tree).projects.foo.targets.build;
+        const build = getTarget(tree, 'build');
         expect(build.options.baseHref).toBeUndefined();
       });
 
@@ -569,7 +576,7 @@ describe('Migration to v6', () => {
         config.apps[0].baseHref = '/base/href/';
         tree.create(oldConfigPath, JSON.stringify(config, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
-        const build = getConfig(tree).projects.foo.targets.build;
+        const build = getTarget(tree, 'build');
         expect(build.options.baseHref).toEqual('/base/href/');
       });
 
@@ -577,19 +584,17 @@ describe('Migration to v6', () => {
         baseConfig.apps[0].serviceWorker = true;
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
-        const config = getConfig(tree);
-        expect(config.projects.foo.targets.build.options.serviceWorker).toBeUndefined();
-        expect(
-          config.projects.foo.targets.build.configurations.production.serviceWorker,
-        ).toBe(true);
+        const build = getTarget(tree, 'build');
+        expect(build.options.serviceWorker).toBeUndefined();
+        expect(build.configurations.production.serviceWorker).toBe(true);
       });
 
       it('should add production configuration when no environments', () => {
         delete baseConfig.apps[0].environments;
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
-        const config = getConfig(tree);
-        expect(config.projects.foo.targets.build.configurations).toEqual({
+        const build = getTarget(tree, 'build');
+        expect(build.configurations).toEqual({
           production: {
             optimization: true,
             outputHashing: 'all',
@@ -608,8 +613,8 @@ describe('Migration to v6', () => {
         tree.delete('/src/environments/environment.prod.ts');
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
-        const config = getConfig(tree);
-        expect(config.projects.foo.targets.build.configurations).toEqual({
+        const build = getTarget(tree, 'build');
+        expect(build.configurations).toEqual({
           prod: {
             fileReplacements: [{
               replace: 'src/environments/environment.ts',
@@ -633,7 +638,7 @@ describe('Migration to v6', () => {
       it('should set the serve target', () => {
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
-        const serve = getConfig(tree).projects.foo.targets.serve;
+        const serve = getTarget(tree, 'serve');
         expect(serve.builder).toEqual('@angular-devkit/build-angular:dev-server');
         expect(serve.options).toEqual({
           browserTarget: 'foo:build',
@@ -646,7 +651,7 @@ describe('Migration to v6', () => {
       it('should set the test target', () => {
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
-        const test = getConfig(tree).projects.foo.targets['test'];
+        const test = getTarget(tree, 'test');
         expect(test.builder).toEqual('@angular-devkit/build-angular:karma');
         expect(test.options.main).toEqual('src/test.ts');
         expect(test.options.polyfills).toEqual('src/polyfills.ts');
@@ -665,7 +670,7 @@ describe('Migration to v6', () => {
       it('should set the extract i18n target', () => {
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
-        const extract = getConfig(tree).projects.foo.targets['extract-i18n'];
+        const extract = getTarget(tree, 'extract-i18n');
         expect(extract.builder).toEqual('@angular-devkit/build-angular:extract-i18n');
         expect(extract.options).toBeDefined();
         expect(extract.options.browserTarget).toEqual(`foo:build` );
@@ -674,7 +679,7 @@ describe('Migration to v6', () => {
       it('should set the lint target', () => {
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
-        const tslint = getConfig(tree).projects.foo.targets['lint'];
+        const tslint = getTarget(tree, 'lint');
         expect(tslint.builder).toEqual('@angular-devkit/build-angular:tslint');
         expect(tslint.options).toBeDefined();
         expect(tslint.options.tsConfig)
@@ -691,8 +696,8 @@ describe('Migration to v6', () => {
 
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
-        const config = getConfig(tree);
-        const budgets = config.projects.foo.targets.build.configurations.production.budgets;
+        const build = getTarget(tree, 'build');
+        const budgets = build.configurations.production.budgets;
         expect(budgets.length).toEqual(1);
         expect(budgets[0].type).toEqual('bundle');
         expect(budgets[0].name).toEqual('main');
@@ -707,7 +712,7 @@ describe('Migration to v6', () => {
         const e2eProject = getConfig(tree).projects['foo-e2e'];
         expect(e2eProject.root).toBe('e2e');
         expect(e2eProject.sourceRoot).toBe('e2e');
-        const e2eOptions = e2eProject.targets.e2e;
+        const e2eOptions = e2eProject.architect.e2e;
         expect(e2eOptions.builder).toEqual('@angular-devkit/build-angular:protractor');
         const options = e2eOptions.options;
         expect(options.protractorConfig).toEqual('./protractor.conf.js');
@@ -721,7 +726,7 @@ describe('Migration to v6', () => {
         const e2eProject = getConfig(tree).projects['foo-e2e'];
         expect(e2eProject.root).toBe('apps/app1/e2e');
         expect(e2eProject.sourceRoot).toBe('apps/app1/e2e');
-        const e2eOptions = e2eProject.targets.e2e;
+        const e2eOptions = e2eProject.architect.e2e;
         expect(e2eOptions.builder).toEqual('@angular-devkit/build-angular:protractor');
         const options = e2eOptions.options;
         expect(options.protractorConfig).toEqual('./protractor.conf.js');
@@ -731,7 +736,7 @@ describe('Migration to v6', () => {
       it('should set the lint target', () => {
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
-        const tslint = getConfig(tree).projects['foo-e2e'].targets.lint;
+        const tslint = getConfig(tree).projects['foo-e2e'].architect.lint;
         expect(tslint.builder).toEqual('@angular-devkit/build-angular:tslint');
         expect(tslint.options).toBeDefined();
         expect(tslint.options.tsConfig).toEqual(['e2e/tsconfig.e2e.json']);
@@ -988,7 +993,7 @@ describe('Migration to v6', () => {
       tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
       tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
       const config = getConfig(tree);
-      const target = config.projects.foo.targets.server;
+      const target = config.projects.foo.architect.server;
       expect(target).toBeDefined();
       expect(target.builder).toEqual('@angular-devkit/build-angular:server');
       expect(target.options.outputPath).toEqual('dist/server');
diff --git a/packages/schematics/angular/service-worker/index_spec.ts b/packages/schematics/angular/service-worker/index_spec.ts
index c64888f9248f..47c36824a45d 100644
--- a/packages/schematics/angular/service-worker/index_spec.ts
+++ b/packages/schematics/angular/service-worker/index_spec.ts
@@ -45,11 +45,12 @@ describe('Service Worker Schematic', () => {
     appTree = schematicRunner.runSchematic('application', appOptions, appTree);
   });
 
-  it('should update the proudction configuration', () => {
+  it('should update the production configuration', () => {
     const tree = schematicRunner.runSchematic('service-worker', defaultOptions, appTree);
     const configText = tree.readContent('/angular.json');
     const config = JSON.parse(configText);
-    const swFlag = config.projects.bar.targets.build.configurations.production.serviceWorker;
+    const swFlag = config.projects.bar.architect
+      .build.configurations.production.serviceWorker;
     expect(swFlag).toEqual(true);
   });
 
@@ -58,7 +59,8 @@ describe('Service Worker Schematic', () => {
     const tree = schematicRunner.runSchematic('service-worker', options, appTree);
     const configText = tree.readContent('/angular.json');
     const config = JSON.parse(configText);
-    const swFlag = config.projects.bar.targets.build.options.serviceWorker;
+    const swFlag = config.projects.bar.architect
+      .build.options.serviceWorker;
     expect(swFlag).toEqual(true);
   });
 
diff --git a/packages/schematics/angular/universal/index_spec.ts b/packages/schematics/angular/universal/index_spec.ts
index 0ca8c034ac10..9f228e3529d9 100644
--- a/packages/schematics/angular/universal/index_spec.ts
+++ b/packages/schematics/angular/universal/index_spec.ts
@@ -87,8 +87,8 @@ describe('Universal Schematic', () => {
       },
     });
     const angularConfig = JSON.parse(tree.readContent('angular.json'));
-    expect(angularConfig.projects.workspace.targets.server.options.tsConfig)
-      .toEqual('src/tsconfig.server.json');
+    expect(angularConfig.projects.workspace.architect
+      .server.options.tsConfig).toEqual('src/tsconfig.server.json');
   });
 
   it('should create a tsconfig file for a generated application', () => {
@@ -107,8 +107,8 @@ describe('Universal Schematic', () => {
       },
     });
     const angularConfig = JSON.parse(tree.readContent('angular.json'));
-    expect(angularConfig.projects.bar.targets.server.options.tsConfig)
-      .toEqual('projects/bar/tsconfig.server.json');
+    expect(angularConfig.projects.bar.architect
+      .server.options.tsConfig).toEqual('projects/bar/tsconfig.server.json');
   });
 
   it('should add dependency: @angular/platform-server', () => {
@@ -123,7 +123,7 @@ describe('Universal Schematic', () => {
     const filePath = '/angular.json';
     const contents = tree.readContent(filePath);
     const config = JSON.parse(contents.toString());
-    const targets = config.projects.bar.targets;
+    const targets = config.projects.bar.architect;
     expect(targets.server).toBeDefined();
     expect(targets.server.builder).toBeDefined();
     const opts = targets.server.options;
diff --git a/tests/legacy-cli/e2e/tests/basic/assets.ts b/tests/legacy-cli/e2e/tests/basic/assets.ts
index d8b8dafce381..f35ebc69792a 100644
--- a/tests/legacy-cli/e2e/tests/basic/assets.ts
+++ b/tests/legacy-cli/e2e/tests/basic/assets.ts
@@ -93,9 +93,9 @@ export default function () {
         { 'glob': '**/*', 'input': 'src/folder', 'output': 'folder' },
         { 'glob': 'glob-asset.txt' },
         { 'glob': 'output-asset.txt', 'output': 'output-folder' },
-        { 'glob': '**/*', 'input': 'node_modules/some-package/', 'output': 'package-folder' }
+        { 'glob': '**/*', 'input': 'node_modules/some-package/', 'output': 'package-folder' },
       ];
-      const appArchitect = workspaceJson.projects['test-project'].targets;
+      const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect.build.options.assets = assets;
       appArchitect.test.options.assets = assets;
     }))
diff --git a/tests/legacy-cli/e2e/tests/basic/scripts-array.ts b/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
index 64cd6c24f841..2bea2dabfcd2 100644
--- a/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
+++ b/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
@@ -25,11 +25,11 @@ export default function () {
     'src/input-script.js': 'console.log(\'input-script\');',
     'src/lazy-script.js': 'console.log(\'lazy-script\');',
     'src/pre-rename-script.js': 'console.log(\'pre-rename-script\');',
-    'src/pre-rename-lazy-script.js': 'console.log(\'pre-rename-lazy-script\');'
+    'src/pre-rename-lazy-script.js': 'console.log(\'pre-rename-lazy-script\');',
   })
     .then(() => appendToFile('src/main.ts', 'import \'./string-script.js\';'))
     .then(() => updateJsonFile('angular.json', configJson => {
-      const appArchitect = configJson.projects['test-project'].targets;
+      const appArchitect = configJson.projects['test-project'].architect;
       appArchitect.build.options.scripts = [
         { input: 'src/string-script.js' },
         { input: 'src/zstring-script.js' },
diff --git a/tests/legacy-cli/e2e/tests/basic/styles-array.ts b/tests/legacy-cli/e2e/tests/basic/styles-array.ts
index 380e9d40e187..4815c503d12b 100644
--- a/tests/legacy-cli/e2e/tests/basic/styles-array.ts
+++ b/tests/legacy-cli/e2e/tests/basic/styles-array.ts
@@ -14,10 +14,10 @@ export default function () {
     'src/input-style.css': '.input-style { color: red }',
     'src/lazy-style.css': '.lazy-style { color: red }',
     'src/pre-rename-style.css': '.pre-rename-style { color: red }',
-    'src/pre-rename-lazy-style.css': '.pre-rename-lazy-style { color: red }'
+    'src/pre-rename-lazy-style.css': '.pre-rename-lazy-style { color: red }',
   })
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].targets;
+      const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect.build.options.styles = [
         { input: 'src/string-style.css' },
         { input: 'src/input-style.css' },
diff --git a/tests/legacy-cli/e2e/tests/build/build-app-shell.ts b/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
index b836abc35ffa..fc26d43aabc4 100644
--- a/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
+++ b/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
@@ -26,7 +26,7 @@ export default function () {
 
   return Promise.resolve()
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].targets;
+      const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect['server'] = {
         builder: '@angular-devkit/build-angular:server',
         options: {
diff --git a/tests/legacy-cli/e2e/tests/build/bundle-budgets.ts b/tests/legacy-cli/e2e/tests/build/bundle-budgets.ts
index c5e40be6285c..974a4b189d22 100644
--- a/tests/legacy-cli/e2e/tests/build/bundle-budgets.ts
+++ b/tests/legacy-cli/e2e/tests/build/bundle-budgets.ts
@@ -28,14 +28,14 @@ export default function () {
       expectation: 'warning',
       message: 'Budget warning: all, min warning',
       budget: { type: 'all', minimumWarning: '100mb' },
-    }
+    },
   ];
 
   const promiseFactories = budgetConfigs.map(cfg => {
     if (cfg.expectation === 'error') {
       return () => {
         return updateJsonFile('angular.json', (json) => {
-            json.projects['test-project'].targets.build.options.budgets = [cfg.budget];
+            json.projects['test-project'].architect.build.options.budgets = [cfg.budget];
           })
           .then(() => expectToFail(() => ng('build', '--optimization')))
           .then(errorMessage => {
@@ -47,7 +47,7 @@ export default function () {
     } else if (cfg.expectation === 'warning') {
       return () => {
         return updateJsonFile('angular.json', (json) => {
-            json.projects['test-project'].targets.build.options.budgets = [cfg.budget];
+            json.projects['test-project'].architect.build.options.budgets = [cfg.budget];
           })
           .then(() => ng('build', '--optimization'))
           .then(({ stdout }) => {
@@ -59,7 +59,7 @@ export default function () {
     } else { // pass
       return () => {
         return updateJsonFile('angular.json', (json) => {
-            json.projects['test-project'].targets.build.options.budgets = [cfg.budget];
+            json.projects['test-project'].architect.build.options.budgets = [cfg.budget];
           })
           .then(() => ng('build', '--optimization'))
           .then(({ stdout }) => {
diff --git a/tests/legacy-cli/e2e/tests/build/dynamic-import.ts b/tests/legacy-cli/e2e/tests/build/dynamic-import.ts
index 436a4457b478..296cab2ef2b4 100644
--- a/tests/legacy-cli/e2e/tests/build/dynamic-import.ts
+++ b/tests/legacy-cli/e2e/tests/build/dynamic-import.ts
@@ -8,9 +8,9 @@ export default async function() {
   // Add a lazy module
   await ng('generate', 'module', 'lazy');
   await updateJsonFile('angular.json', workspaceJson => {
-    const appArchitect = workspaceJson.projects['test-project'].targets;
+    const appArchitect = workspaceJson.projects['test-project'].architect;
     appArchitect.build.options.lazyModules = [
-      'src/app/lazy/lazy.module'
+      'src/app/lazy/lazy.module',
     ];
   });
 
diff --git a/tests/legacy-cli/e2e/tests/build/environment.ts b/tests/legacy-cli/e2e/tests/build/environment.ts
index 450d2919af1b..f00b73680b1f 100644
--- a/tests/legacy-cli/e2e/tests/build/environment.ts
+++ b/tests/legacy-cli/e2e/tests/build/environment.ts
@@ -7,12 +7,12 @@ export default function() {
   // Try a prod build.
   return Promise.resolve()
     .then(() => updateJsonFile('angular.json', configJson => {
-      const appArchitect = configJson.projects['test-project'].targets;
+      const appArchitect = configJson.projects['test-project'].architect;
       appArchitect.build.configurations['prod-env'] = {
         fileReplacements: [
           {
             src: 'src/environments/environment.ts',
-            replaceWith: 'src/environments/environment.prod.ts'
+            replaceWith: 'src/environments/environment.prod.ts',
           }
         ],
       };
diff --git a/tests/legacy-cli/e2e/tests/build/output-dir.ts b/tests/legacy-cli/e2e/tests/build/output-dir.ts
index ad502c1be463..5b245bb3d983 100644
--- a/tests/legacy-cli/e2e/tests/build/output-dir.ts
+++ b/tests/legacy-cli/e2e/tests/build/output-dir.ts
@@ -19,7 +19,7 @@ export default function() {
     .then(() => expectFileToExist('./build-output/main.js'))
     .then(() => expectToFail(expectGitToBeClean))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].targets;
+      const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect.build.options.outputPath = 'config-build-output';
     }))
     .then(() => ng('build'))
diff --git a/tests/legacy-cli/e2e/tests/build/platform-server.ts b/tests/legacy-cli/e2e/tests/build/platform-server.ts
index ef40c90da6c5..efca00d14cca 100644
--- a/tests/legacy-cli/e2e/tests/build/platform-server.ts
+++ b/tests/legacy-cli/e2e/tests/build/platform-server.ts
@@ -36,14 +36,14 @@ export default function () {
       dependencies['@angular/platform-server'] = platformServerVersion;
     }))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].targets;
+      const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect['server'] = {
         builder: '@angular-devkit/build-angular:server',
         options: {
           outputPath: 'dist/test-project-server',
           main: 'src/main.server.ts',
-          tsConfig: 'src/tsconfig.server.json'
-        }
+          tsConfig: 'src/tsconfig.server.json',
+        },
       };
     }))
     .then(() => writeFile('./src/tsconfig.server.json', `
diff --git a/tests/legacy-cli/e2e/tests/build/service-worker.ts b/tests/legacy-cli/e2e/tests/build/service-worker.ts
index fe696a94ac67..ff2d165256ba 100644
--- a/tests/legacy-cli/e2e/tests/build/service-worker.ts
+++ b/tests/legacy-cli/e2e/tests/build/service-worker.ts
@@ -32,7 +32,7 @@ export default function() {
   // stuck to the first build done
   return silentNpm('remove', '@angular/service-worker')
     .then(() => silentNpm('install', '@angular/service-worker'))
-    .then(() => ng('config', 'projects.test-project.targets.build.options.serviceWorker', 'true'))
+    .then(() => ng('config', 'projects.test-project.architect.build.options.serviceWorker', 'true'))
     .then(() => writeFile('src/ngsw-config.json', JSON.stringify(MANIFEST, null, 2)))
     .then(() => ng('build', '--optimization'))
     .then(() => expectFileToExist(join(process.cwd(), 'dist')))
diff --git a/tests/legacy-cli/e2e/tests/build/styles/dart-sass.ts b/tests/legacy-cli/e2e/tests/build/styles/dart-sass.ts
index be6811976c5e..9bef49828c79 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/dart-sass.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/dart-sass.ts
@@ -21,7 +21,7 @@ export default async function () {
   });
   await deleteFile('src/app/app.component.css');
   await updateJsonFile('angular.json', workspaceJson => {
-    const appArchitect = workspaceJson.projects['test-project'].targets;
+    const appArchitect = workspaceJson.projects['test-project'].architect;
     appArchitect.build.options.styles = [
       { input: 'src/styles.scss' },
     ];
diff --git a/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts b/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
index db761f5d8a55..35c993cf332c 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
@@ -17,10 +17,10 @@ export default function () {
       'src/input-style.css': '.input-style { color: red }',
       'src/lazy-style.css': '.lazy-style { color: red }',
       'src/pre-rename-style.css': '.pre-rename-style { color: red }',
-      'src/pre-rename-lazy-style.css': '.pre-rename-lazy-style { color: red }'
+      'src/pre-rename-lazy-style.css': '.pre-rename-lazy-style { color: red }',
     }))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].targets;
+      const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect.build.options.styles = [
         { input: 'src/string-style.css' },
         { input: 'src/input-style.css' },
diff --git a/tests/legacy-cli/e2e/tests/build/styles/imports.ts b/tests/legacy-cli/e2e/tests/build/styles/imports.ts
index c9716592f1da..c7a5f7cc1e26 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/imports.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/imports.ts
@@ -41,9 +41,9 @@ export default function () {
         `})
         // change files to use preprocessor
         .then(() => updateJsonFile('angular.json', workspaceJson => {
-          const appArchitect = workspaceJson.projects['test-project'].targets;
+          const appArchitect = workspaceJson.projects['test-project'].architect;
           appArchitect.build.options.styles = [
-            { input: `src/styles.${ext}` }
+            { input: `src/styles.${ext}` },
           ];
         }))
         .then(() => replaceInFile('src/app/app.component.ts',
@@ -66,9 +66,9 @@ export default function () {
         // Also check imports work on ng test
         .then(() => !ejected && ng('test', '--watch=false'))
         .then(() => updateJsonFile('angular.json', workspaceJson => {
-          const appArchitect = workspaceJson.projects['test-project'].targets;
+          const appArchitect = workspaceJson.projects['test-project'].architect;
           appArchitect.build.options.styles = [
-            { input: `src/styles.css` }
+            { input: `src/styles.css` },
           ];
         }))
         .then(() => replaceInFile('src/app/app.component.ts',
diff --git a/tests/legacy-cli/e2e/tests/build/styles/include-paths.ts b/tests/legacy-cli/e2e/tests/build/styles/include-paths.ts
index 5930eac4c774..c685abe6f979 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/include-paths.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/include-paths.ts
@@ -47,7 +47,7 @@ export default function () {
     .then(() => replaceInFile('src/app/app.component.ts', `'./app.component.css\'`,
       `'./app.component.scss', './app.component.styl', './app.component.less'`))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].targets;
+      const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect.build.options.styles = [
         { input: 'src/styles.scss' },
         { input: 'src/styles.styl' },
diff --git a/tests/legacy-cli/e2e/tests/build/styles/less.ts b/tests/legacy-cli/e2e/tests/build/styles/less.ts
index 8963d1f023d3..a8616a78484b 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/less.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/less.ts
@@ -29,9 +29,9 @@ export default function () {
       `})
     .then(() => deleteFile('src/app/app.component.css'))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].targets;
+      const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect.build.options.styles = [
-        { input: 'src/styles.less' }
+        { input: 'src/styles.less' },
       ];
     }))
     .then(() => replaceInFile('src/app/app.component.ts',
diff --git a/tests/legacy-cli/e2e/tests/build/styles/loaders.ts b/tests/legacy-cli/e2e/tests/build/styles/loaders.ts
index 9c9ae0c1eec5..8f52edc87b3b 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/loaders.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/loaders.ts
@@ -27,9 +27,9 @@ export default function () {
       `})
     .then(() => deleteFile('src/app/app.component.css'))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].targets;
+      const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect.build.options.styles = [
-        { input: 'src/styles.scss' }
+        { input: 'src/styles.scss' },
       ];
     }))
     .then(() => replaceInFile('src/app/app.component.ts',
diff --git a/tests/legacy-cli/e2e/tests/build/styles/material-import.ts b/tests/legacy-cli/e2e/tests/build/styles/material-import.ts
index cafd96174eed..03699182c935 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/material-import.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/material-import.ts
@@ -25,9 +25,9 @@ export default function () {
         })
         // change files to use preprocessor
         .then(() => updateJsonFile('angular.json', workspaceJson => {
-          const appArchitect = workspaceJson.projects['test-project'].targets;
+          const appArchitect = workspaceJson.projects['test-project'].architect;
           appArchitect.build.options.styles = [
-            { input: `src/styles.${ext}` }
+            { input: `src/styles.${ext}` },
           ];
         }))
         .then(() => replaceInFile('src/app/app.component.ts',
diff --git a/tests/legacy-cli/e2e/tests/build/styles/scss.ts b/tests/legacy-cli/e2e/tests/build/styles/scss.ts
index 1a0da9839f89..60173381142d 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/scss.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/scss.ts
@@ -29,9 +29,9 @@ export default function () {
       `})
     .then(() => deleteFile('src/app/app.component.css'))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].targets;
+      const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect.build.options.styles = [
-        { input: 'src/styles.scss' }
+        { input: 'src/styles.scss' },
       ];
     }))
     .then(() => replaceInFile('src/app/app.component.ts',
diff --git a/tests/legacy-cli/e2e/tests/build/styles/stylus.ts b/tests/legacy-cli/e2e/tests/build/styles/stylus.ts
index 0f47cf82f0fb..83d33074719a 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/stylus.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/stylus.ts
@@ -29,9 +29,9 @@ export default function () {
       `})
     .then(() => deleteFile('src/app/app.component.css'))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].targets;
+      const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect.build.options.styles = [
-        { input: 'src/styles.styl' }
+        { input: 'src/styles.styl' },
       ];
     }))
     .then(() => replaceInFile('src/app/app.component.ts',
diff --git a/tests/legacy-cli/e2e/tests/commands/build/build-outdir.ts b/tests/legacy-cli/e2e/tests/commands/build/build-outdir.ts
index f62d8aa81fbe..38de272bdeff 100644
--- a/tests/legacy-cli/e2e/tests/commands/build/build-outdir.ts
+++ b/tests/legacy-cli/e2e/tests/commands/build/build-outdir.ts
@@ -8,13 +8,10 @@ export default function() {
 
   return Promise.resolve()
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].targets;
+      const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect.build.options.outputPath = './';
     }))
     .then(() => expectToFail(() => ng('build')))
     .then(() => expectToFail(() => ng('serve')))
     .then(() => expectToFail(() => ng('eject')));
 }
-
-
-
diff --git a/tests/legacy-cli/e2e/tests/commands/config/config-set-serve-port.ts b/tests/legacy-cli/e2e/tests/commands/config/config-set-serve-port.ts
index 451e4ff56189..7557c6f534c9 100644
--- a/tests/legacy-cli/e2e/tests/commands/config/config-set-serve-port.ts
+++ b/tests/legacy-cli/e2e/tests/commands/config/config-set-serve-port.ts
@@ -3,6 +3,6 @@ import { ng } from '../../../utils/process';
 
 export default function() {
   return Promise.resolve()
-    .then(() => ng('config', 'projects.test-project.targets.serve.options.port', '1234'))
+    .then(() => ng('config', 'projects.test-project.architect.serve.options.port', '1234'))
     .then(() => expectFileToMatch('angular.json', /"port": 1234/));
 }
diff --git a/tests/legacy-cli/e2e/tests/lint/lint-no-project.ts b/tests/legacy-cli/e2e/tests/lint/lint-no-project.ts
index 449989811f4e..6253087a997c 100644
--- a/tests/legacy-cli/e2e/tests/lint/lint-no-project.ts
+++ b/tests/legacy-cli/e2e/tests/lint/lint-no-project.ts
@@ -10,7 +10,7 @@ export default function () {
 
   return Promise.resolve()
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].targets;
+      const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect.lint.options.tsConfig = undefined;
     }))
     .then(() => ng('lint', 'app', '--type-check'))
diff --git a/tests/legacy-cli/e2e/tests/misc/coverage.ts b/tests/legacy-cli/e2e/tests/misc/coverage.ts
index 06758945784b..3170532da7d1 100644
--- a/tests/legacy-cli/e2e/tests/misc/coverage.ts
+++ b/tests/legacy-cli/e2e/tests/misc/coverage.ts
@@ -16,10 +16,10 @@ export default function () {
     .then(() => expectFileToMatch('coverage/lcov.info', 'polyfills.ts'))
     .then(() => expectFileToMatch('coverage/lcov.info', 'test.ts'))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].targets;
+      const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect.test.options.codeCoverageExclude = [
         'src/polyfills.ts',
-        '**/test.ts'
+        '**/test.ts',
       ];
     }))
     .then(() => ng('test', '--watch=false', '--code-coverage'))
diff --git a/tests/legacy-cli/e2e/tests/misc/fallback.ts b/tests/legacy-cli/e2e/tests/misc/fallback.ts
index 12b7656cb728..1c8d1ca56ea1 100644
--- a/tests/legacy-cli/e2e/tests/misc/fallback.ts
+++ b/tests/legacy-cli/e2e/tests/misc/fallback.ts
@@ -21,7 +21,7 @@ export default function () {
     // should correctly fallback to a changed index
     .then(() => moveFile('src/index.html', 'src/not-index.html'))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].targets;
+      const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect.build.options.index = 'src/not-index.html';
     }))
     .then(() => ngServe())
diff --git a/tests/legacy-cli/e2e/tests/test/e2e-baseurl.ts b/tests/legacy-cli/e2e/tests/test/e2e-baseurl.ts
index 393f9a3d3906..c7abf7c66d97 100644
--- a/tests/legacy-cli/e2e/tests/test/e2e-baseurl.ts
+++ b/tests/legacy-cli/e2e/tests/test/e2e-baseurl.ts
@@ -11,7 +11,7 @@ export default function () {
   return Promise.resolve()
     .then(() => expectToFail(() => ng('e2e', 'test-project-e2e', '--devServerTarget=')))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].targets;
+      const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect.serve.options.port = 4400;
     }))
     .then(() => ngServe())
diff --git a/tests/legacy-cli/e2e/tests/test/test-assets.ts b/tests/legacy-cli/e2e/tests/test/test-assets.ts
index eba7980a0ff2..d647d07f8d0e 100644
--- a/tests/legacy-cli/e2e/tests/test/test-assets.ts
+++ b/tests/legacy-cli/e2e/tests/test/test-assets.ts
@@ -38,14 +38,14 @@ export default function () {
     }))
     // Test failure condition (no assets in angular.json)
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].targets;
+      const appArchitect = workspaceJson.projects['test-project'];
       appArchitect.build.options.assets = [];
     }))
     .then(() => expectToFail(() => ng('test', '--watch=false'),
       'Should fail because the assets to serve were not in the Angular CLI config'))
     // Test passing condition (assets are included)
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].targets;
+      const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect.build.options.assets = [
         { 'glob': '**/*', 'input': 'src/assets' },
         { 'glob': 'file.txt' },
diff --git a/tests/legacy-cli/e2e/tests/test/test-environment.ts b/tests/legacy-cli/e2e/tests/test/test-environment.ts
index 32e22a0d7300..09152caee409 100644
--- a/tests/legacy-cli/e2e/tests/test/test-environment.ts
+++ b/tests/legacy-cli/e2e/tests/test/test-environment.ts
@@ -15,13 +15,13 @@ export default function () {
     `)
     .then(() => ng('test', '--watch=false'))
     .then(() => updateJsonFile('angular.json', configJson => {
-      const appArchitect = configJson.projects['test-project'].targets;
+      const appArchitect = configJson.projects['test-project'].architect;
       appArchitect.test.configurations = {
         production: {
           fileReplacements: [
             {
               src: 'src/environments/environment.ts',
-              replaceWith: 'src/environments/environment.prod.ts'
+              replaceWith: 'src/environments/environment.prod.ts',
             }
           ],
         }
diff --git a/tests/legacy-cli/e2e/tests/test/test-scripts.ts b/tests/legacy-cli/e2e/tests/test/test-scripts.ts
index 24cbd4908ee7..bf5299647efd 100644
--- a/tests/legacy-cli/e2e/tests/test/test-scripts.ts
+++ b/tests/legacy-cli/e2e/tests/test/test-scripts.ts
@@ -63,10 +63,10 @@ export default function () {
     // should fail because the global scripts were not added to scripts array
     .then(() => expectToFail(() => ng('test', '--watch=false')))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].targets;
+      const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect.test.options.scripts = [
         { input: 'src/string-script.js' },
-        { input: 'src/input-script.js' }
+        { input: 'src/input-script.js' },
       ];
     }))
     // should pass now
diff --git a/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts b/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts
index 80c1f62b9083..847bce3bba42 100644
--- a/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts
+++ b/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts
@@ -10,12 +10,12 @@ export default function() {
   return Promise.resolve()
     .then(() => silentNpm('install', 'bootstrap@4.0.0-beta.3'))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].targets;
+      const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect.build.options.styles = [
-        { input: 'node_modules/bootstrap/dist/css/bootstrap.css' }
+        { input: 'node_modules/bootstrap/dist/css/bootstrap.css' },
       ];
       appArchitect.build.options.scripts = [
-        { input: 'node_modules/bootstrap/dist/js/bootstrap.js' }
+        { input: 'node_modules/bootstrap/dist/js/bootstrap.js' },
       ];
     }))
     .then(() => ng('build', '--extract-css'))
diff --git a/tests/legacy-cli/e2e/tests/third-party/material-icons.ts b/tests/legacy-cli/e2e/tests/third-party/material-icons.ts
index 4747eda50200..07d5ac97b904 100644
--- a/tests/legacy-cli/e2e/tests/third-party/material-icons.ts
+++ b/tests/legacy-cli/e2e/tests/third-party/material-icons.ts
@@ -9,9 +9,9 @@ export default function() {
   return Promise.resolve()
     .then(() => silentNpm('install', 'material-design-icons@3.0.1'))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].targets;
+      const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect.build.options.styles = [
-        { input: 'node_modules/material-design-icons/iconfont/material-icons.css' }
+        { input: 'node_modules/material-design-icons/iconfont/material-icons.css' },
       ];
     }))
     .then(() => ng('build', '--extract-css'))
diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts
index ceaa5acc979a..4eacb97d6077 100644
--- a/tests/legacy-cli/e2e/utils/project.ts
+++ b/tests/legacy-cli/e2e/utils/project.ts
@@ -182,11 +182,13 @@ export function useNgVersion(version: string) {
 export function useCIDefaults(projectName = 'test-project') {
   return updateJsonFile('angular.json', workspaceJson => {
     // Disable progress reporting on CI to reduce spam.
-    const appTargets = workspaceJson.projects[projectName].targets;
+    const project = workspaceJson.projects[projectName];
+    const appTargets = project.targets || project.architect;
     appTargets.build.options.progress = false;
     appTargets.test.options.progress = false;
     // Disable auto-updating webdriver in e2e.
-    const e2eTargets = workspaceJson.projects[projectName + '-e2e'].targets;
+    const e2eProject = workspaceJson.projects[projectName + '-e2e'];
+    const e2eTargets = e2eProject.targets || e2eProject.architect;
     e2eTargets.e2e.options.webdriverUpdate = false;
   })
   .then(() => updateJsonFile('package.json', json => {

From 9e7391c685e7b296e68e21fedb1cc7989a9405c8 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 11 Sep 2018 21:03:37 -0400
Subject: [PATCH 0103/1703] fix(@angular/cli): warn if `targets` is present
 when using a schematic

---
 .../angular/cli/models/schematic-command.ts   | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index bf87b7559ada..60e3b56af9f2 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -7,6 +7,7 @@
  */
 import {
   experimental,
+  json,
   logging,
   normalize,
   schema,
@@ -42,6 +43,7 @@ import {
   getProjectByCwd,
   getSchematicDefaults,
   getWorkspace,
+  getWorkspaceRaw,
 } from '../utilities/config';
 import { parseJsonSchemaToOptions } from '../utilities/json-schema';
 import { BaseCommandOptions, Command } from './command';
@@ -357,6 +359,43 @@ export abstract class SchematicCommand<
     collectionName = schematic.collection.description.name;
     schematicName = schematic.description.name;
 
+    // TODO: Remove warning check when 'targets' is default
+    if (collectionName !== '@schematics/angular') {
+      const [ast, configPath] = getWorkspaceRaw('local');
+      if (ast) {
+        const projectsKeyValue = ast.properties.find(p => p.key.value === 'projects');
+        if (!projectsKeyValue || projectsKeyValue.value.kind !== 'object') {
+          return;
+        }
+
+        const positions: json.Position[] = [];
+        for (const projectKeyValue of projectsKeyValue.value.properties) {
+          const projectNode = projectKeyValue.value;
+          if (projectNode.kind !== 'object') {
+            continue;
+          }
+          const targetsKeyValue = projectNode.properties.find(p => p.key.value === 'targets');
+          if (targetsKeyValue) {
+            positions.push(targetsKeyValue.start);
+          }
+        }
+
+        if (positions.length > 0) {
+          const warning = tags.oneLine`
+            WARNING: This command may not execute successfully.
+            The package/collection may not support the 'targets' field within '${configPath}'.
+            This can be corrected by renaming the following 'targets' fields to 'architect':
+          `;
+
+          const locations = positions
+            .map((p, i) => `${i + 1}) Line: ${p.line + 1}; Column: ${p.character + 1}`)
+            .join('\n');
+
+          this.logger.warn(warning + '\n' + locations + '\n');
+        }
+      }
+    }
+
     // Set the options of format "path".
     let o: Option[] | null = null;
     let args: Arguments;

From f34dfc9643b606d10e2e0f6e2c7d2b36a80f10e3 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Fri, 7 Sep 2018 12:00:18 -0700
Subject: [PATCH 0104/1703] ci: add missing licenses from quicktype-core
 dependencies

And remove fixed TODOs.
---
 scripts/validate-licenses.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/scripts/validate-licenses.ts b/scripts/validate-licenses.ts
index 0f5282ee1d9f..b0afe93580a2 100644
--- a/scripts/validate-licenses.ts
+++ b/scripts/validate-licenses.ts
@@ -73,11 +73,8 @@ const ignoredPackages = [
   'true-case-path@1.0.2', // Apache-2.0 but broken license in package.json
 
   // * Other
-  'jsonify@0.0.0', // TODO(hansl): fix this. this is not an acceptable license, but is 8 deps down
-                   // so hard to manage. In talk with owner and users to switch over.
-  'uws@9.14.0', // Zlib -- TODO(filipesilva): remove this when karma is moved to e2e tests.
-  // TODO(filipesilva): remove this when spec_large is moved to e2e tests.
   'font-awesome@4.7.0', // (OFL-1.1 AND MIT)
+  'stream-json@0.5.2', // 'New BSD'
 ];
 
 // Ignore own packages (all MIT)

From 737ffad272448e08bd240ea0cb4f4d6d6131b362 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Fri, 7 Sep 2018 12:26:03 -0700
Subject: [PATCH 0105/1703] ci: bootstrap-local now prioritizes typescript
 files over JSON

The require() logic by default is not enough; require("file") would pick the json
if there are both a file.ts and file.json. This does not show up in prod because
js files are prioritized over json, but it does show up in bootstrap because we
compile ts in memory and there are no .js file on disk (which require()
could potentially see).

This is necessary for the schema change because schema.json and
schema.ts collides. We should also rename the commands from *-impl.ts to
just *.ts (they were named that way because of this conflict).
---
 lib/bootstrap-local.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/bootstrap-local.js b/lib/bootstrap-local.js
index c64fbe75f723..9a899cb47ee2 100644
--- a/lib/bootstrap-local.js
+++ b/lib/bootstrap-local.js
@@ -126,7 +126,17 @@ if (!__dirname.match(new RegExp(`\\${path.sep}node_modules\\${path.sep}`))) {
         const p = path.join(packages[match].root, request.substr(match.length));
         return oldResolve.call(this, p, parent);
       } else {
-        return oldResolve.apply(this, arguments);
+        // Because loading `.ts` ends up AFTER `.json` in the require() logic, requiring a file that has both `.json`
+        // and `.ts` versions will only get the `.json` content (which wouldn't happen if the .ts was compiled to
+        // JavaScript). We load `.ts` files first here to avoid this conflict. It's hacky, but so is the rest of this
+        // file.
+        const resolvedPath = oldResolve.apply(this, arguments);
+        const maybeTsPath = resolvedPath.endsWith('.json') && resolvedPath.replace(/\.json$/, '.ts');
+        if (maybeTsPath && !request.endsWith('.json') && fs.existsSync(maybeTsPath)) {
+          return maybeTsPath;
+        }
+
+        return resolvedPath;
       }
     }
   };

From aeb7c46332f72e6628fa4a48971cb726424226fb Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Wed, 5 Sep 2018 12:11:11 -0700
Subject: [PATCH 0106/1703] build: add support to build JSON schema through
 bazel

The tests verify that the output of the rule is the same as the input, and will
error if not (with a call to action). The binary produces the golden output.

We have to check the result of the transformation into git because internally
we cannot synchronize quicktype into google3.
---
 BUILD                            |  62 ++++++++--
 package.json                     |   2 +
 packages/schematics/update/BUILD |   5 +
 rules/tsconfig.json              |   2 +-
 tools/BUILD                      |  25 +++-
 tools/bazel.rc                   |   3 +-
 tools/quicktype_runner.js        | 152 ++++++++++++++++++++++++
 tools/ts_json_schema.bzl         |  70 +++++++++++
 tsconfig.json                    |   4 +
 yarn.lock                        | 195 +++++++++++++++++++++++++++++--
 10 files changed, 498 insertions(+), 22 deletions(-)
 create mode 100644 tools/quicktype_runner.js
 create mode 100644 tools/ts_json_schema.bzl

diff --git a/BUILD b/BUILD
index 5b9205d3eef1..10cfed3bc771 100644
--- a/BUILD
+++ b/BUILD
@@ -9,10 +9,22 @@ licenses(["notice"])  # MIT License
 exports_files([
     "LICENSE",
     "tsconfig.json",  # @external
+    "tslint.base.json",  # @external
 ])
 
 # NOTE: this will move to node_modules/BUILD in a later release
 # @external_begin
+NODE_MODULES_EXCLUDE = [
+    # e.g. node_modules/adm-zip/test/assets/attributes_test/New folder/hidden.txt
+    "node_modules/**/test/**",
+    # e.g. node_modules/xpath/docs/function resolvers.md
+    "node_modules/**/docs/**",
+    # e.g. node_modules/puppeteer/.local-chromium/mac-536395/chrome-mac/Chromium.app/Contents/Versions/66.0.3347.0/Chromium Framework.framework/Chromium Framework
+    "node_modules/**/.*/**",
+    # Ignore paths with spaces.
+    "node_modules/**/* *",
+]
+
 filegroup(
     name = "node_modules",
     srcs = glob(
@@ -23,16 +35,46 @@ filegroup(
             "node_modules/**/*.json",
             "node_modules/**/*.d.ts",
         ],
-        exclude = [
-            # e.g. node_modules/adm-zip/test/assets/attributes_test/New folder/hidden.txt
-            "node_modules/**/test/**",
-            # e.g. node_modules/xpath/docs/function resolvers.md
-            "node_modules/**/docs/**",
-            # e.g. node_modules/puppeteer/.local-chromium/mac-536395/chrome-mac/Chromium.app/Contents/Versions/66.0.3347.0/Chromium Framework.framework/Chromium Framework
-            "node_modules/**/.*/**",
-            # Ignore paths with spaces.
-            "node_modules/**/* *",
-        ],
+        exclude = NODE_MODULES_EXCLUDE,
     ) + glob(["node_modules/.bin/*"]),
 )
+
+# node_modules filegroup for tools/quicktype_runner, which contains quicktype-core and tslint.
+QUICKTYPE_TRANSITIVE_DEPENDENCIES = [
+    "collection-utils",
+    "core-util-is",
+    "inherits",
+    "isarray",
+    "js-base64",
+    "pako",
+    "pluralize",
+    "process-nextick-args",
+    "quicktype-core",
+    "readable-stream",
+    "safe-buffer",
+    "stream-json",
+    "string-to-stream",
+    "tiny-inflate",
+    "unicode-properties",
+    "unicode-trie",
+    "urijs",
+    "util-deprecate",
+    "wordwrap",
+]
+
+filegroup(
+    name = "quicktype_node_modules",
+    srcs = glob(
+        [
+            "/".join([
+                "node_modules", "**", pkg, "**/*.js",
+            ]) for pkg in QUICKTYPE_TRANSITIVE_DEPENDENCIES
+        ] + [
+            "/".join([
+                "node_modules", "**", pkg, "**/*.json",
+            ]) for pkg in QUICKTYPE_TRANSITIVE_DEPENDENCIES
+        ],
+        exclude = NODE_MODULES_EXCLUDE,
+    )
+)
 # @external_end
diff --git a/package.json b/package.json
index f63af6826edc..c31ddb9ff2e3 100644
--- a/package.json
+++ b/package.json
@@ -60,6 +60,8 @@
   ],
   "dependencies": {
     "glob": "^7.0.3",
+    "node-fetch": "^2.2.0",
+    "quicktype-core": "^5.0.41",
     "temp": "^0.8.3",
     "tslint": "^5.11.0",
     "typescript": "~3.0.1"
diff --git a/packages/schematics/update/BUILD b/packages/schematics/update/BUILD
index 2d2a7edfb953..edde66c3c117 100644
--- a/packages/schematics/update/BUILD
+++ b/packages/schematics/update/BUILD
@@ -20,6 +20,11 @@ ts_library(
             "**/*_benchmark.ts",
         ],
     ),
+    data = [
+        "collection.json",
+        "migrate/schema.json",
+        "update/schema.json",
+    ],
     deps = [
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/schematics",
diff --git a/rules/tsconfig.json b/rules/tsconfig.json
index deffb2f1791b..5fc61e6f1025 100644
--- a/rules/tsconfig.json
+++ b/rules/tsconfig.json
@@ -3,7 +3,7 @@
   // things faster.
   "extends": "../tsconfig.json",
   "compilerOptions": {
-    "outDir": "../dist",
+    "outDir": "../dist/rules",
     "baseUrl": ""
   },
   "exclude": [
diff --git a/tools/BUILD b/tools/BUILD
index ee6d23bbcd66..b7b9ca2e64b2 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -1 +1,24 @@
-# Marker file indicating this directory is a Bazel package
+# Copyright Google Inc. All Rights Reserved.
+#
+# Use of this source code is governed by an MIT-style license that can be
+# found in the LICENSE file at https://angular.io/license
+
+package(default_visibility = ["//visibility:public"])
+
+load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
+
+nodejs_binary(
+    name = 'quicktype_runner',
+    data = [
+        ":quicktype_runner.js",
+    ],
+    node_modules = "//:quicktype_node_modules",
+    entry_point = "angular_devkit/tools/quicktype_runner.js",
+    templated_args = [
+        # Needed so that node doesn't walk back to the source directory.
+        # From there, the relative imports would point to .ts files.
+        "--node_options=--preserve-symlinks",
+    ],
+    install_source_map_support = False,
+)
+
diff --git a/tools/bazel.rc b/tools/bazel.rc
index 7eb0155fb75f..722747468c4f 100644
--- a/tools/bazel.rc
+++ b/tools/bazel.rc
@@ -5,5 +5,4 @@ build --strategy=TypeScriptCompile=worker
 # Performance: avoid stat'ing input files
 build --watchfs
 
-# Do not generate the symbolic links bazel-*.
-build --symlink_prefix=/
+test --test_output=errors
diff --git a/tools/quicktype_runner.js b/tools/quicktype_runner.js
new file mode 100644
index 000000000000..9d09fe3db2ee
--- /dev/null
+++ b/tools/quicktype_runner.js
@@ -0,0 +1,152 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+ /**
+  * This file is pure JavaScript because we want to avoid any dependency or build step
+  * to it. It's just simple (and zen-ier).
+  *
+  * This file wraps around quicktype and can do one of two things;
+  * 
+  * `node quicktype_runner.js <in_path> <out_path>`
+  *   Reads the in path and outputs the TS file at the out_path.
+  * 
+  * Using `-` as the out_path will output on STDOUT instead of a file.
+  */
+
+// Imports.
+const fs = require('fs');
+const path = require('path');
+const qtCore = require('quicktype-core');
+const tempRoot = process.env['BAZEL_TMPDIR'] || require('os').tmpdir();
+
+// Header to add to all files.
+const header = `
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+ // THIS FILE IS AUTOMATICALLY GENERATED IN BAZEL. TO UPDATE THIS FILE YOU NEED TO CHANGE THE
+ // CORRESPONDING JSON SCHEMA FILE, THEN RUN BAZEL.
+
+`.replace(/^\n/m, '');  // Remove the first \n, it's in the constant because formatting is 👍.
+
+// Footer to add to all files.
+const footer = ``;
+
+/**
+ * The simplest Node JSONSchemaStore implementation we can build which supports our custom protocol.
+ * Supports reading from ng-cli addresses, valid URLs and files (absolute).
+ */
+class FetchingJSONSchemaStore extends qtCore.JSONSchemaStore {
+  constructor(inPath) {
+    super();
+    this._inPath = inPath;
+  }
+
+  async fetch(address) {
+    const URL = require("url");
+    const url = URL.parse(address);
+    let content = null;
+    if (url.protocol === 'ng-cli:') {
+      let filePath = path.join(__dirname, '../packages/angular/cli', url.hostname, url.path);
+      content = fs.readFileSync(filePath, 'utf-8').trim();
+    } else if (url.hostname) {
+      try {
+        const fetch = require("node-fetch");
+        const response = await fetch(address);
+        content = response.text();
+      } catch (e) {
+        content = null;
+      }
+    }
+
+    if (content === null && !path.isAbsolute(address)) {
+      const resolvedPath = path.join(path.dirname(this._inPath), address);
+
+      // Check relative to inPath
+      if (fs.existsSync(resolvedPath)) {
+        content = fs.readFileSync(resolvedPath, 'utf-8');
+      }
+    }
+
+    if (content === null && fs.existsSync(address)) {
+      content = fs.readFileSync(address, 'utf-8').trim();
+    }
+
+    if (content == null) {
+      throw new Error(`Address ${JSON.stringify(address)} cannot be resolved.`);
+    }
+
+    return qtCore.parseJSON(content, "JSON Schema", address);
+  }
+}
+
+
+/**
+ * Create the TS file from the schema, and overwrite the outPath (or log).
+ * @param {string} inPath 
+ * @param {string} outPath 
+ */
+async function main(inPath, outPath) {
+  const content = await generate(inPath);
+
+  if (outPath === '-') {
+    console.log(content);
+    process.exit(0);
+  }
+
+  const buildWorkspaceDirectory = process.env['BUILD_WORKSPACE_DIRECTORY'] || '.';
+  outPath = path.resolve(buildWorkspaceDirectory, outPath);
+  fs.writeFileSync(outPath, content, 'utf-8');
+}
+
+
+async function generate(inPath) {
+  // Best description of how to use the API was found at
+  //   https://blog.quicktype.io/customizing-quicktype/
+  const inputData = new qtCore.InputData();
+  const source = { name: 'Schema', schema: fs.readFileSync(inPath, 'utf-8') };
+
+  await inputData.addSource('schema', source, () => {
+    return new qtCore.JSONSchemaInput(new FetchingJSONSchemaStore(inPath));
+  });
+
+  const lang = new qtCore.TypeScriptTargetLanguage();
+
+  const { lines } = await qtCore.quicktype({
+    lang,
+    inputData,
+    alphabetizeProperties: true,
+    src: [inPath],
+    rendererOptions: {
+      'just-types': true,
+      'explicit-unions': true,
+    }
+  });
+
+  return header + lines.join('\n') + footer;
+}
+
+// Parse arguments and run main().
+const argv = process.argv.slice(2);
+if (argv.length < 2 || argv.length > 3) {
+  console.error('Must include 2 or 3 arguments.');
+  process.exit(1);
+}
+
+main(...argv)
+  .then(() => process.exit(0))
+  .catch(err => {
+    console.error('An error happened:');
+    console.error(err);
+    process.exit(127);
+  });
diff --git a/tools/ts_json_schema.bzl b/tools/ts_json_schema.bzl
new file mode 100644
index 000000000000..b3771472b35b
--- /dev/null
+++ b/tools/ts_json_schema.bzl
@@ -0,0 +1,70 @@
+# Copyright Google Inc. All Rights Reserved.
+#
+# Use of this source code is governed by an MIT-style license that can be
+# found in the LICENSE file at https://angular.io/license
+
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_test", "nodejs_binary")
+
+
+def _ts_json_schema_interface_impl(ctx):
+    args = [
+        ctx.files.src[0].path,
+        ctx.outputs.ts.path,
+    ]
+
+    ctx.actions.run(
+        inputs = ctx.files.src + ctx.files.data,
+        executable = ctx.executable._binary,
+        outputs = [ctx.outputs.ts],
+        arguments = args,
+    )
+
+    return [DefaultInfo()]
+
+
+_ts_json_schema_interface = rule(
+    _ts_json_schema_interface_impl,
+    attrs = {
+        "src": attr.label(
+            allow_files = FileType([
+                ".json",
+            ]),
+            mandatory = True,
+        ),
+        "out": attr.string(
+            mandatory = True,
+        ),
+        "data": attr.label_list(
+            allow_files = FileType([
+                ".json",
+            ]),
+        ),
+        "_binary": attr.label(
+            default = Label("//tools:quicktype_runner"),
+            executable = True,
+            cfg = "host",
+        ),
+    },
+    outputs = {
+        "ts": "%{out}"
+    },
+)
+
+
+def ts_json_schema(name, src, data = [], **kwargs):
+    out = src.replace(".json", ".ts")
+
+    _ts_json_schema_interface(
+        name = name + ".interface",
+        src = src,
+        out = out,
+        data = data,
+    )
+
+    ts_library(
+        name = name,
+        srcs = [
+            out,
+        ]
+    )
diff --git a/tsconfig.json b/tsconfig.json
index 5e324d59e6fd..a2b446565caf 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -27,6 +27,10 @@
       "es2017"
     ],
     "baseUrl": "",
+    "rootDirs": [
+      ".",
+      "./bazel-bin/"
+    ],
     "typeRoots": [
       "./node_modules/@types"
     ],
diff --git a/yarn.lock b/yarn.lock
index a90fc11356d2..99700269a1ea 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -461,6 +461,10 @@
   dependencies:
     source-map "^0.6.1"
 
+"@types/urijs@github:quicktype/types-urijs":
+  version "1.0.1"
+  resolved "https://codeload.github.com/quicktype/types-urijs/tar.gz/a23603a04e31e883a92244bff8515e3d841a8b98"
+
 "@types/webpack-dev-server@2.9.4", "@types/webpack-dev-server@^2.9.4":
   version "2.9.4"
   resolved "http://registry.npmjs.org/@types/webpack-dev-server/-/webpack-dev-server-2.9.4.tgz#cc3c398330ba87c0f1c7bfd020cfafb7bb895493"
@@ -1188,6 +1192,15 @@ braces@^2.3.0, braces@^2.3.1:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
+brfs@^1.4.0:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.6.1.tgz#b78ce2336d818e25eea04a0947cba6d4fb8849c3"
+  dependencies:
+    quote-stream "^1.0.1"
+    resolve "^1.1.5"
+    static-module "^2.2.0"
+    through2 "^2.0.0"
+
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -1277,6 +1290,10 @@ buffer-alloc@^1.2.0:
     buffer-alloc-unsafe "^1.1.0"
     buffer-fill "^1.0.0"
 
+buffer-equal@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"
+
 buffer-fill@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
@@ -1608,6 +1625,10 @@ codelyzer@^4.2.1:
     source-map "^0.5.7"
     sprintf-js "^1.1.1"
 
+collection-utils@0.0.15:
+  version "0.0.15"
+  resolved "https://registry.yarnpkg.com/collection-utils/-/collection-utils-0.0.15.tgz#70f4c54299621699b3f38c66577c9d4284825125"
+
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -1735,7 +1756,7 @@ concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
-concat-stream@^1.5.0, concat-stream@^1.5.2:
+concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@~1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   dependencies:
@@ -2430,6 +2451,12 @@ dot-prop@^4.1.0:
   dependencies:
     is-obj "^1.0.0"
 
+duplexer2@~0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
+  dependencies:
+    readable-stream "^2.0.2"
+
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
@@ -2614,6 +2641,28 @@ escodegen@1.8.x:
   optionalDependencies:
     source-map "~0.2.0"
 
+escodegen@^1.8.1:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589"
+  dependencies:
+    esprima "^3.1.3"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
+escodegen@~1.9.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"
+  dependencies:
+    esprima "^3.1.3"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
 eslint-scope@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
@@ -2625,6 +2674,10 @@ esprima@2.7.x, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
 
+esprima@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
@@ -2639,7 +2692,7 @@ estraverse@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
 
-estraverse@^4.1.0, estraverse@^4.1.1:
+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"
 
@@ -2830,6 +2883,15 @@ extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
 
+falafel@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.1.0.tgz#96bb17761daba94f46d001738b3cedf3a67fe06c"
+  dependencies:
+    acorn "^5.0.0"
+    foreach "^2.0.5"
+    isarray "0.0.1"
+    object-keys "^1.0.6"
+
 fast-deep-equal@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
@@ -3017,6 +3079,10 @@ for-own@^1.0.0:
   dependencies:
     for-in "^1.0.1"
 
+foreach@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -4258,7 +4324,7 @@ jquery@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
 
-js-base64@^2.1.8:
+js-base64@^2.1.8, js-base64@^2.4.3:
   version "2.4.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03"
 
@@ -4821,6 +4887,12 @@ merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
 
+merge-source-map@1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz#a5de46538dae84d4114cc5ea02b4772a6346701f"
+  dependencies:
+    source-map "^0.5.6"
+
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
@@ -5117,6 +5189,10 @@ no-case@^2.2.0:
   dependencies:
     lower-case "^1.1.1"
 
+node-fetch@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.2.0.tgz#4ee79bde909262f9775f731e3656d0db55ced5b5"
+
 node-forge@0.7.5:
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
@@ -5356,7 +5432,11 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-keys@^1.0.12:
+object-inspect@~1.4.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4"
+
+object-keys@^1.0.12, object-keys@^1.0.6:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
 
@@ -5558,7 +5638,11 @@ package-json@^4.0.0:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
-pako@~1.0.2, pako@~1.0.5:
+pako@^0.2.5:
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
+
+pako@^1.0.6, pako@~1.0.2, pako@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
 
@@ -5639,6 +5723,10 @@ parseqs@0.0.5:
   dependencies:
     better-assert "~1.0.0"
 
+parser-toolkit@>=0.0.3:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/parser-toolkit/-/parser-toolkit-0.0.5.tgz#ec4b61729c86318b56ea971bfba6b3c672d62c01"
+
 parseuri@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
@@ -5759,6 +5847,10 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
+pluralize@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
+
 popper.js@^1.14.1:
   version "1.14.4"
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.4.tgz#8eec1d8ff02a5a3a152dd43414a15c7b79fd69b6"
@@ -6018,6 +6110,29 @@ quick-lru@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
 
+quicktype-core@^5.0.41:
+  version "5.0.41"
+  resolved "https://registry.yarnpkg.com/quicktype-core/-/quicktype-core-5.0.41.tgz#83f090b1bddeefcff0581e0d9c754d83410ed453"
+  dependencies:
+    "@types/urijs" "github:quicktype/types-urijs"
+    collection-utils "0.0.15"
+    js-base64 "^2.4.3"
+    pako "^1.0.6"
+    pluralize "^7.0.0"
+    stream-json "0.5.2"
+    string-to-stream "^1.1.0"
+    unicode-properties "github:quicktype/unicode-properties#dist"
+    urijs "^1.19.1"
+    wordwrap "^1.0.0"
+
+quote-stream@^1.0.1, quote-stream@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/quote-stream/-/quote-stream-1.0.2.tgz#84963f8c9c26b942e153feeb53aae74652b7e0b2"
+  dependencies:
+    buffer-equal "0.0.1"
+    minimist "^1.1.3"
+    through2 "^2.0.0"
+
 randomatic@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.0.tgz#36f2ca708e9e567f5ed2ec01949026d50aa10116"
@@ -6141,7 +6256,7 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.0, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   dependencies:
@@ -6381,7 +6496,7 @@ resolve@1.1.x, resolve@~1.1.6:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.5.0:
+resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.5.0:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
   dependencies:
@@ -6706,6 +6821,10 @@ shallow-clone@^1.0.0:
     kind-of "^5.0.0"
     mixin-object "^2.0.1"
 
+shallow-copy@~0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz#415f42702d73d810330292cc5ee86eae1a11a170"
+
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -7044,6 +7163,12 @@ stack-trace@0.0.x:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
 
+static-eval@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.0.tgz#0e821f8926847def7b4b50cda5d55c04a9b13864"
+  dependencies:
+    escodegen "^1.8.1"
+
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -7051,6 +7176,25 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
+static-module@^2.2.0:
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/static-module/-/static-module-2.2.5.tgz#bd40abceae33da6b7afb84a0e4329ff8852bfbbf"
+  dependencies:
+    concat-stream "~1.6.0"
+    convert-source-map "^1.5.1"
+    duplexer2 "~0.1.4"
+    escodegen "~1.9.0"
+    falafel "^2.1.0"
+    has "^1.0.1"
+    magic-string "^0.22.4"
+    merge-source-map "1.0.4"
+    object-inspect "~1.4.0"
+    quote-stream "~1.0.2"
+    readable-stream "~2.3.3"
+    shallow-copy "~0.0.1"
+    static-eval "^2.0.0"
+    through2 "~2.0.3"
+
 stats-webpack-plugin@0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/stats-webpack-plugin/-/stats-webpack-plugin-0.7.0.tgz#ccffe9b745de8bbb155571e063f8263fc0e2bc06"
@@ -7099,6 +7243,12 @@ stream-http@^2.7.2:
     to-arraybuffer "^1.0.0"
     xtend "^4.0.0"
 
+stream-json@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/stream-json/-/stream-json-0.5.2.tgz#f4256c0ef1a905f2ef2d473706b4b3ff827653cf"
+  dependencies:
+    parser-toolkit ">=0.0.3"
+
 stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
@@ -7116,6 +7266,13 @@ strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
 
+string-to-stream@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string-to-stream/-/string-to-stream-1.1.1.tgz#aba78f73e70661b130ee3e1c0192be4fef6cb599"
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.1.0"
+
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -7293,7 +7450,7 @@ text-hex@1.0.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5"
 
-through2@^2.0.0, through2@^2.0.2, through2@^2.0.3:
+through2@^2.0.0, through2@^2.0.2, through2@^2.0.3, through2@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
   dependencies:
@@ -7318,6 +7475,10 @@ timers-browserify@^2.0.4:
   dependencies:
     setimmediate "^1.0.4"
 
+tiny-inflate@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.2.tgz#93d9decffc8805bd57eae4310f0b745e9b6fb3a7"
+
 tmp@0.0.30:
   version "0.0.30"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.30.tgz#72419d4a8be7d6ce75148fd8b324e593a711c2ed"
@@ -7555,6 +7716,20 @@ ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
 
+"unicode-properties@github:quicktype/unicode-properties#dist":
+  version "1.1.0"
+  resolved "https://codeload.github.com/quicktype/unicode-properties/tar.gz/d5fddfea1ef9d05c6479a979e225476063e13f52"
+  dependencies:
+    brfs "^1.4.0"
+    unicode-trie "^0.3.0"
+
+unicode-trie@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/unicode-trie/-/unicode-trie-0.3.1.tgz#d671dddd89101a08bac37b6a5161010602052085"
+  dependencies:
+    pako "^0.2.5"
+    tiny-inflate "^1.0.0"
+
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
@@ -7630,6 +7805,10 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
+urijs@^1.19.1:
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.1.tgz#5b0ff530c0cbde8386f6342235ba5ca6e995d25a"
+
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"

From 9b0d5fa073795dce924d0f4522529273787d595f Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Mon, 10 Sep 2018 10:45:13 -0700
Subject: [PATCH 0107/1703] ci: move bazel-build to xlarge resource class

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 026eb96fdb7f..886c08b5cb23 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -120,7 +120,7 @@ jobs:
 
   build-bazel:
     <<: *defaults
-    resource_class: large
+    resource_class: xlarge
     steps:
       - attach_workspace: *attach_options
       - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc

From e004464a940e78ab568bfa91c6a56962e371d137 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 11 Sep 2018 13:03:58 -0700
Subject: [PATCH 0108/1703] ci: build script uses bazel to generate the schemas

---
 scripts/build.ts | 49 +++++++++++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/scripts/build.ts b/scripts/build.ts
index 9c24b8b0e781..d65a8f7a78d7 100644
--- a/scripts/build.ts
+++ b/scripts/build.ts
@@ -7,10 +7,10 @@
  */
 // tslint:disable:no-implicit-dependencies
 import { JsonObject, logging } from '@angular-devkit/core';
+import * as child_process from 'child_process';
 import * as fs from 'fs';
 import * as glob from 'glob';
 import * as path from 'path';
-import * as ts from 'typescript';
 import { packages } from '../lib/packages';
 
 const minimatch = require('minimatch');
@@ -160,34 +160,30 @@ function _sortPackages() {
   return sortedPackages;
 }
 
+function _exec(command: string, args: string[], opts: { cwd?: string }, logger: logging.Logger) {
+  const { status, error, stderr } = child_process.spawnSync(command, args, { ...opts });
+
+  if (status != 0) {
+    logger.error(`Command failed: ${command} ${args.map(x => JSON.stringify(x)).join(', ')}`);
+    if (error) {
+      logger.error('Error: ' + (error ? error.message : 'undefined'));
+    } else {
+      logger.error(`STDERR:\n${stderr}`);
+    }
+    throw error;
+  }
+}
+
 
 function _build(logger: logging.Logger) {
   logger.info('Building...');
-  const tsConfigPath = path.relative(process.cwd(), path.join(__dirname, '../tsconfig.json'));
-  // Load the Compiler Options.
-  const tsConfig = ts.readConfigFile(tsConfigPath, ts.sys.readFile);
-  const parsedTsConfig = ts.parseJsonConfigFileContent(tsConfig.config, ts.sys, '.');
-
-  // Create the program and emit.
-  const program = ts.createProgram(parsedTsConfig.fileNames, parsedTsConfig.options);
-  const result = program.emit();
-  if (result.emitSkipped) {
-    logger.error(`TypeScript compiler failed:`);
-    const diagLogger = logger.createChild('diagnostics');
-    result.diagnostics.forEach(diagnostic => {
-      const messageText = ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
-
-      if (diagnostic.file) {
-        const position = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start || 0);
-        const fileName = diagnostic.file.fileName;
-        const { line, character } = position;
-        diagLogger.error(`${fileName} (${line + 1},${character + 1}): ${messageText}`);
-      } else {
-        diagLogger.error(messageText);
-      }
-    });
-    process.exit(1);
-  }
+  _exec('node_modules/.bin/tsc', ['-p', 'tsconfig.json'], {}, logger);
+}
+
+
+function _bazel(logger: logging.Logger) {
+  logger.info('Bazel build...');
+  _exec('bazel', ['build', '//packages/...'], {}, logger);
 }
 
 
@@ -195,6 +191,7 @@ export default function(argv: { local?: boolean, snapshot?: boolean }, logger: l
   _clean(logger);
 
   const sortedPackages = _sortPackages();
+  _bazel(logger);
   _build(logger);
 
   logger.info('Moving packages to dist/');

From defe0cca0685c5b0ac0517bb7903835658433f8b Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 11 Sep 2018 15:37:08 -0700
Subject: [PATCH 0109/1703] build: support for JSON Schemas files in
 bootstrap-local

---
 lib/bootstrap-local.js | 38 +++++++++++++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/lib/bootstrap-local.js b/lib/bootstrap-local.js
index 9a899cb47ee2..89b707fc1923 100644
--- a/lib/bootstrap-local.js
+++ b/lib/bootstrap-local.js
@@ -8,10 +8,13 @@
 /* eslint-disable no-console */
 'use strict';
 
+const child_process = require('child_process');
 const fs = require('fs');
 const path = require('path');
+const temp = require('temp');
 const ts = require('typescript');
 
+const tmpRoot = temp.mkdirSync('angular-devkit-');
 
 let _istanbulRequireHook = null;
 if (process.env['CODE_COVERAGE'] || process.argv.indexOf('--code-coverage') !== -1) {
@@ -115,11 +118,18 @@ if (!__dirname.match(new RegExp(`\\${path.sep}node_modules\\${path.sep}`))) {
   const oldResolve = Module._resolveFilename;
 
   Module._resolveFilename = function (request, parent) {
+    let resolved = null;
+    try {
+      resolved = oldResolve.call(this, request, parent);
+    } catch (_) {}
+
     if (request in packages) {
       return packages[request].main;
     } else if (builtinModules.includes(request)) {
       // It's a native Node module.
       return oldResolve.call(this, request, parent);
+    } else if (resolved && resolved.match(/[\\\/]node_modules[\\\/]/)) {
+      return resolved;
     } else {
       const match = Object.keys(packages).find(pkgName => request.startsWith(pkgName + '/'));
       if (match) {
@@ -130,13 +140,31 @@ if (!__dirname.match(new RegExp(`\\${path.sep}node_modules\\${path.sep}`))) {
         // and `.ts` versions will only get the `.json` content (which wouldn't happen if the .ts was compiled to
         // JavaScript). We load `.ts` files first here to avoid this conflict. It's hacky, but so is the rest of this
         // file.
-        const resolvedPath = oldResolve.apply(this, arguments);
-        const maybeTsPath = resolvedPath.endsWith('.json') && resolvedPath.replace(/\.json$/, '.ts');
-        if (maybeTsPath && !request.endsWith('.json') && fs.existsSync(maybeTsPath)) {
-          return maybeTsPath;
+        const maybeTsPath = resolved.endsWith('.json') && resolved.replace(/\.json$/, '.ts');
+        if (maybeTsPath && !request.endsWith('.json')) {
+          // If the file exists, return its path. If it doesn't, run the quicktype runner on it and return the content.
+          if (fs.existsSync(maybeTsPath)) {
+            return maybeTsPath;
+          } else {
+            // This script has the be synchronous, so we spawnSync instead of, say, requiring the runner and calling
+            // the method directly.
+            const tmpJsonSchemaPath = path.join(tmpRoot, maybeTsPath.replace(/[^0-9a-zA-Z.]/g, '_'));
+            try {
+              if (!fs.existsSync(tmpJsonSchemaPath)) {
+                const quicktypeRunnerPath = path.join(__dirname, '../tools/quicktype_runner.js');
+                child_process.spawnSync('node', [quicktypeRunnerPath, resolved, tmpJsonSchemaPath]);
+              }
+
+              return tmpJsonSchemaPath;
+            } catch (_) {
+              // Just return resolvedPath and let Node deals with it.
+              console.log(_);
+              process.exit(99);
+            }
+          }
         }
 
-        return resolvedPath;
+        return resolved;
       }
     }
   };

From a07f83638ef313d856d735d5958648ebc43b9593 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 11 Sep 2018 16:25:24 -0700
Subject: [PATCH 0110/1703] build: add JSON Schema .d.ts and .js files to build
 output

---
 scripts/build.ts | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/scripts/build.ts b/scripts/build.ts
index d65a8f7a78d7..f40f3dbd70ae 100644
--- a/scripts/build.ts
+++ b/scripts/build.ts
@@ -88,6 +88,11 @@ function _copy(from: string, to: string) {
     _mkdirp(path.dirname(to));
   }
 
+  // Error out if destination already exists.
+  if (fs.existsSync(to)) {
+    throw new Error(`Path ${to} already exist...`);
+  }
+
   from = path.relative(process.cwd(), from);
   to = path.relative(process.cwd(), to);
 
@@ -161,13 +166,17 @@ function _sortPackages() {
 }
 
 function _exec(command: string, args: string[], opts: { cwd?: string }, logger: logging.Logger) {
-  const { status, error, stderr } = child_process.spawnSync(command, args, { ...opts });
+  const { status, error, stderr, stdout } = child_process.spawnSync(command, args, {
+    stdio: 'inherit',
+    ...opts,
+  });
 
   if (status != 0) {
     logger.error(`Command failed: ${command} ${args.map(x => JSON.stringify(x)).join(', ')}`);
     if (error) {
       logger.error('Error: ' + (error ? error.message : 'undefined'));
     } else {
+      logger.error(`STDOUT:\n${stdout}`);
       logger.error(`STDERR:\n${stderr}`);
     }
     throw error;
@@ -203,6 +212,19 @@ export default function(argv: { local?: boolean, snapshot?: boolean }, logger: l
     _rimraf(pkg.build);
   }
 
+  logger.info('Merging bazel-bin/ with dist/');
+  for (const packageName of sortedPackages) {
+    const pkg = packages[packageName];
+    const bazelBinPath = pkg.build.replace(/([\\\/]dist[\\\/])(packages)/, (_, dist, packages) => {
+      return path.join(dist, 'bazel-bin', packages);
+    });
+    if (fs.existsSync(bazelBinPath)) {
+      packageLogger.info(packageName);
+      _recursiveCopy(bazelBinPath, pkg.dist, logger);
+      _rimraf(bazelBinPath);
+    }
+  }
+
   logger.info('Copying resources...');
   const resourceLogger = logger.createChild('resources');
   for (const packageName of sortedPackages) {
@@ -274,9 +296,14 @@ export default function(argv: { local?: boolean, snapshot?: boolean }, logger: l
   logger.info('Removing spec files...');
   const specLogger = logger.createChild('specfiles');
   for (const packageName of sortedPackages) {
-    specLogger.info(packageName);
     const pkg = packages[packageName];
     const files = glob.sync(path.join(pkg.dist, '**/*_spec?(_large).@(js|d.ts)'));
+
+    if (files.length == 0) {
+      continue;
+    }
+
+    specLogger.info(packageName);
     specLogger.info(`  ${files.length} spec files found...`);
     files.forEach(fileName => _rm(fileName));
   }
@@ -285,9 +312,14 @@ export default function(argv: { local?: boolean, snapshot?: boolean }, logger: l
   const templateLogger = logger.createChild('templates');
   const templateCompiler = require('@angular-devkit/core').template;
   for (const packageName of sortedPackages) {
-    templateLogger.info(packageName);
     const pkg = packages[packageName];
     const files = glob.sync(path.join(pkg.dist, '**/*.ejs'));
+
+    if (files.length == 0) {
+      continue;
+    }
+
+    templateLogger.info(packageName);
     templateLogger.info(`  ${files.length} ejs files found...`);
     files.forEach(fileName => {
       const p = path.relative(

From 8a4ce4de02a604b110d2f5e2a108e38249870f91 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Thu, 6 Sep 2018 16:15:35 -0700
Subject: [PATCH 0111/1703] refactor(@schematics/update): add automated JSON
 schema generation

---
 packages/schematics/update/BUILD              | 18 +++++++++++++-----
 packages/schematics/update/migrate/index.ts   |  2 +-
 packages/schematics/update/migrate/schema.ts  | 13 -------------
 packages/schematics/update/update/index.ts    | 14 ++++++++------
 packages/schematics/update/update/schema.json |  4 +++-
 packages/schematics/update/update/schema.ts   | 17 -----------------
 6 files changed, 25 insertions(+), 43 deletions(-)
 delete mode 100644 packages/schematics/update/migrate/schema.ts
 delete mode 100644 packages/schematics/update/update/schema.ts

diff --git a/packages/schematics/update/BUILD b/packages/schematics/update/BUILD
index edde66c3c117..fd55ec9502be 100644
--- a/packages/schematics/update/BUILD
+++ b/packages/schematics/update/BUILD
@@ -7,6 +7,7 @@ licenses(["notice"])  # MIT
 
 load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
+load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -20,12 +21,9 @@ ts_library(
             "**/*_benchmark.ts",
         ],
     ),
-    data = [
-        "collection.json",
-        "migrate/schema.json",
-        "update/schema.json",
-    ],
     deps = [
+        ":migrate_schema",
+        ":update_schema",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:tasks",
@@ -35,6 +33,16 @@ ts_library(
     ],
 )
 
+ts_json_schema(
+    name = "update_schema",
+    src = "update/schema.json",
+)
+
+ts_json_schema(
+    name = "migrate_schema",
+    src = "migrate/schema.json",
+)
+
 ts_library(
     name = "update_test_lib",
     srcs = glob(
diff --git a/packages/schematics/update/migrate/index.ts b/packages/schematics/update/migrate/index.ts
index d3db97b2ffc0..501e1b220459 100644
--- a/packages/schematics/update/migrate/index.ts
+++ b/packages/schematics/update/migrate/index.ts
@@ -15,7 +15,7 @@ import {
   externalSchematic,
 } from '@angular-devkit/schematics';
 import * as semver from 'semver';
-import { PostUpdateSchema } from './schema';
+import { Schema as PostUpdateSchema } from './schema';
 
 
 /**
diff --git a/packages/schematics/update/migrate/schema.ts b/packages/schematics/update/migrate/schema.ts
deleted file mode 100644
index 400af572f4d4..000000000000
--- a/packages/schematics/update/migrate/schema.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-export interface PostUpdateSchema {
-  package: string;
-  collection: string;
-  from: string;
-  to: string;
-}
diff --git a/packages/schematics/update/update/index.ts b/packages/schematics/update/update/index.ts
index cee35c63526e..e7a84e483cdb 100644
--- a/packages/schematics/update/update/index.ts
+++ b/packages/schematics/update/update/index.ts
@@ -20,7 +20,7 @@ import * as semver from 'semver';
 import { getNpmPackageJson } from './npm';
 import { NpmRepositoryPackageJson } from './npm-package-json';
 import { Dependency, JsonSchemaForNpmPackageJsonFiles } from './package-json';
-import { UpdateSchema } from './schema';
+import { Schema as UpdateSchema } from './schema';
 
 type VersionRange = string & { __VERSION_RANGE: void; };
 type PeerVersionTransform = string | ((range: string) => string);
@@ -758,9 +758,11 @@ export default function(options: UpdateSchema): Rule {
     // We cannot just return this because we need to fetch the packages from NPM still for the
     // help/guide to show.
     options.packages = [];
-  } else if (typeof options.packages == 'string') {
-    // If a string, then we should split it and make it an array.
-    options.packages = options.packages.split(/,/g);
+  } else {
+    // We split every packages by commas to allow people to pass in multiple and make it an array.
+    options.packages = options.packages.reduce((acc, curr) => {
+      return acc.concat(curr.split(','));
+    }, [] as string[]);
   }
 
   if (options.migrateOnly && options.from) {
@@ -852,9 +854,9 @@ export default function(options: UpdateSchema): Rule {
             logger.createChild(''),
             'warn',
           );
-          _validateUpdatePackages(infoMap, options.force, sublog);
+          _validateUpdatePackages(infoMap, !!options.force, sublog);
 
-          return _performUpdate(tree, context, infoMap, logger, options.migrateOnly);
+          return _performUpdate(tree, context, infoMap, logger, !!options.migrateOnly);
         } else {
           return _usageMessage(options, infoMap, logger);
         }
diff --git a/packages/schematics/update/update/schema.json b/packages/schematics/update/update/schema.json
index a7205a10d0e7..77322ea7d5bf 100644
--- a/packages/schematics/update/update/schema.json
+++ b/packages/schematics/update/update/schema.json
@@ -54,5 +54,7 @@
         }
       ]
     }
-  }
+  },
+  "required": [
+  ]
 }
diff --git a/packages/schematics/update/update/schema.ts b/packages/schematics/update/update/schema.ts
deleted file mode 100644
index 2b45fd81e3c2..000000000000
--- a/packages/schematics/update/update/schema.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-export interface UpdateSchema {
-  packages?: string | string[];
-  force: boolean;
-  all: boolean;
-  next: boolean;
-  migrateOnly: boolean;
-  from?: string;
-  to?: string;
-  registry: string;
-}

From f15d5589c35ccba9c7e83355e796032eca304f34 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Thu, 6 Sep 2018 17:36:59 -0700
Subject: [PATCH 0112/1703] refactor(@schematics/angular): automated JSON
 schema generation

---
 packages/schematics/angular/BUILD             | 23 +++++-
 .../schematics/angular/app-shell/schema.d.ts  | 71 -----------------
 .../angular/application/schema.d.ts           | 55 -------------
 .../angular/application/schema.json           |  4 +-
 packages/schematics/angular/class/schema.d.ts | 30 -------
 packages/schematics/angular/class/schema.json |  5 +-
 .../angular/component/index_spec.ts           |  4 +-
 .../schematics/angular/component/schema.d.ts  | 78 -------------------
 .../schematics/angular/component/schema.json  |  4 +-
 .../schematics/angular/directive/schema.d.ts  | 54 -------------
 .../schematics/angular/directive/schema.json  |  4 +-
 packages/schematics/angular/e2e/schema.d.ts   | 26 -------
 packages/schematics/angular/e2e/schema.json   |  1 +
 packages/schematics/angular/enum/schema.d.ts  | 26 -------
 packages/schematics/angular/enum/schema.json  |  4 +-
 packages/schematics/angular/guard/schema.d.ts | 34 --------
 packages/schematics/angular/guard/schema.json |  5 +-
 .../schematics/angular/interface/schema.d.ts  | 34 --------
 .../schematics/angular/interface/schema.json  |  4 +-
 .../schematics/angular/library/schema.d.ts    | 34 --------
 .../schematics/angular/module/schema.d.ts     | 46 -----------
 .../schematics/angular/module/schema.json     |  4 +-
 .../schematics/angular/ng-new/schema.d.ts     | 75 ------------------
 .../schematics/angular/ng-new/schema.json     |  2 +
 packages/schematics/angular/pipe/schema.d.ts  | 46 -----------
 packages/schematics/angular/pipe/schema.json  |  5 +-
 .../angular/service-worker/schema.json        |  8 +-
 .../schematics/angular/service/schema.d.ts    | 34 --------
 .../schematics/angular/service/schema.json    |  4 +-
 .../schematics/angular/universal/schema.d.ts  | 50 ------------
 .../schematics/angular/workspace/schema.d.ts  | 42 ----------
 31 files changed, 64 insertions(+), 752 deletions(-)
 delete mode 100644 packages/schematics/angular/app-shell/schema.d.ts
 delete mode 100644 packages/schematics/angular/application/schema.d.ts
 delete mode 100644 packages/schematics/angular/class/schema.d.ts
 delete mode 100644 packages/schematics/angular/component/schema.d.ts
 delete mode 100644 packages/schematics/angular/directive/schema.d.ts
 delete mode 100644 packages/schematics/angular/e2e/schema.d.ts
 delete mode 100644 packages/schematics/angular/enum/schema.d.ts
 delete mode 100644 packages/schematics/angular/guard/schema.d.ts
 delete mode 100644 packages/schematics/angular/interface/schema.d.ts
 delete mode 100644 packages/schematics/angular/library/schema.d.ts
 delete mode 100644 packages/schematics/angular/module/schema.d.ts
 delete mode 100644 packages/schematics/angular/ng-new/schema.d.ts
 delete mode 100644 packages/schematics/angular/pipe/schema.d.ts
 delete mode 100644 packages/schematics/angular/service/schema.d.ts
 delete mode 100644 packages/schematics/angular/universal/schema.d.ts
 delete mode 100644 packages/schematics/angular/workspace/schema.d.ts

diff --git a/packages/schematics/angular/BUILD b/packages/schematics/angular/BUILD
index 3613873f8215..d0ffdd22fc2f 100644
--- a/packages/schematics/angular/BUILD
+++ b/packages/schematics/angular/BUILD
@@ -7,9 +7,27 @@ licenses(["notice"])  # MIT
 
 load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
+load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
 package(default_visibility = ["//visibility:public"])
 
+# Create a list of Tuple("path/file.json", "path_file") to be used as rules
+ALL_SCHEMA_TARGETS_PAIR = [
+    (x, x.replace("/", "_").replace("-", "_").replace(".json", ""))
+    for x in glob(["*/schema.json"])
+]
+
+# Create all the targets.
+[
+    ts_json_schema(
+        name = name,
+        src = src,
+    )
+    for (src, name) in ALL_SCHEMA_TARGETS_PAIR
+]
+
+ALL_SCHEMA_DEPS = [":" + name for (_, name) in ALL_SCHEMA_TARGETS_PAIR]
+
 ts_library(
     name = "angular",
     srcs = glob(
@@ -25,7 +43,7 @@ ts_library(
             "utility/test/**/*.ts"
         ],
     ),
-    deps = [
+    deps = ALL_SCHEMA_DEPS + [
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:tasks",
@@ -36,6 +54,7 @@ ts_library(
     ],
 )
 
+
 ts_library(
     name = "angular_test_lib",
     srcs = glob(
@@ -52,7 +71,7 @@ ts_library(
             "*/other-files/**",
         ]
     ),
-    deps = [
+    deps = ALL_SCHEMA_DEPS + [
         ":angular",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/schematics",
diff --git a/packages/schematics/angular/app-shell/schema.d.ts b/packages/schematics/angular/app-shell/schema.d.ts
deleted file mode 100644
index 4946258e9b3c..000000000000
--- a/packages/schematics/angular/app-shell/schema.d.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export interface Schema {
-    /**
-     * Name of related client app.
-     */
-    clientProject: string;
-    /**
-     * Name of related universal app.
-     */
-    universalProject: string;
-    /**
-     * Route path used to produce the app shell.
-     */
-    route?: string;
-    /**
-     * Name of the universal app
-     */
-    name?: string;
-    /**
-     * The appId to use withServerTransition.
-     */
-    appId?: string;
-    /**
-     * The output directory for build results.
-     */
-    outDir?: string;
-    /**
-     * The root directory of the app.
-     */
-    root?: string;
-    /**
-     * Name of the index file
-     */
-    index?: string;
-    /**
-     * The name of the main entry-point file.
-     */
-    main?: string;
-    /**
-     * The name of the test entry-point file.
-     */
-    test?: string;
-    /**
-     * The name of the TypeScript configuration file.
-     */
-    tsconfigFileName?: string;
-    /**
-     * The name of the TypeScript configuration file for tests.
-     */
-    testTsconfigFileName?: string;
-    /**
-     * The name of the application directory.
-     */
-    appDir?: string;
-    /**
-     * The name of the root module file
-     */
-    rootModuleFileName?: string;
-    /**
-     * The name of the root module class.
-     */
-    rootModuleClassName?: string;
-    sourceDir?: string;
-}
diff --git a/packages/schematics/angular/application/schema.d.ts b/packages/schematics/angular/application/schema.d.ts
deleted file mode 100644
index 17c3cb519835..000000000000
--- a/packages/schematics/angular/application/schema.d.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export interface Schema {
-    /**
-     * The root directory of the new application.
-     */
-    projectRoot?: string;
-    /**
-     * The name of the application.
-     */
-    name: string;
-    /**
-     * EXPERIMENTAL: Specifies whether to create a new application which uses the Ivy rendering
-     * engine.
-     */
-    experimentalIvy?: boolean;
-    /**
-     * Specifies if the style will be in the ts file.
-     */
-    inlineStyle?: boolean;
-    /**
-     * Specifies if the template will be in the ts file.
-     */
-    inlineTemplate?: boolean;
-    /**
-     * Specifies the view encapsulation strategy.
-     */
-    viewEncapsulation?: ('Emulated' | 'Native' | 'None');
-    /**
-     * Generates a routing module.
-     */
-    routing?: boolean;
-    /**
-     * The prefix to apply to generated selectors.
-     */
-    prefix?: string;
-    /**
-     * The file extension to be used for style files.
-     */
-    style?: string;
-    /**
-     * Skip creating spec files.
-     */
-    skipTests?: boolean;
-    /**
-    * Do not add dependencies to package.json (e.g., --skipPackageJson)
-    */
-    skipPackageJson?: boolean;
-}
diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json
index 3ea92aeb43fc..0c98245387f2 100644
--- a/packages/schematics/angular/application/schema.json
+++ b/packages/schematics/angular/application/schema.json
@@ -68,5 +68,7 @@
       "description": "Do not add dependencies to package.json."
     }
   },
-  "required": []
+  "required": [
+    "name"
+  ]
 }
diff --git a/packages/schematics/angular/class/schema.d.ts b/packages/schematics/angular/class/schema.d.ts
deleted file mode 100644
index 95c37cc3d858..000000000000
--- a/packages/schematics/angular/class/schema.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export interface Schema {
-    /**
-     * The name of the class.
-     */
-    name: string;
-    /**
-     * The path to create the class.
-     */
-    path?: string;
-    /**
-     * The name of the project.
-     */
-    project?: string;
-    /**
-     * Specifies if a spec file is generated.
-     */
-    spec?: boolean;
-    /**
-     * Specifies the type of class.
-     */
-    type?: string;
-}
diff --git a/packages/schematics/angular/class/schema.json b/packages/schematics/angular/class/schema.json
index 5ec33658e0e0..22323008c5f3 100644
--- a/packages/schematics/angular/class/schema.json
+++ b/packages/schematics/angular/class/schema.json
@@ -36,5 +36,8 @@
       "default": ""
     }
   },
-  "required": []
+  "required": [
+    "name",
+    "project"
+  ]
 }
diff --git a/packages/schematics/angular/component/index_spec.ts b/packages/schematics/angular/component/index_spec.ts
index b73bd8aef7b2..84798ab1a305 100644
--- a/packages/schematics/angular/component/index_spec.ts
+++ b/packages/schematics/angular/component/index_spec.ts
@@ -10,7 +10,7 @@ import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/te
 import { Schema as ApplicationOptions } from '../application/schema';
 import { createAppModule } from '../utility/test';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
-import { Schema as ComponentOptions } from './schema';
+import { ChangeDetection, Schema as ComponentOptions } from './schema';
 
 // tslint:disable:max-line-length
 describe('Component Schematic', () => {
@@ -23,7 +23,7 @@ describe('Component Schematic', () => {
     // path: 'src/app',
     inlineStyle: false,
     inlineTemplate: false,
-    changeDetection: 'Default',
+    changeDetection: ChangeDetection.Default,
     styleext: 'css',
     spec: true,
     module: undefined,
diff --git a/packages/schematics/angular/component/schema.d.ts b/packages/schematics/angular/component/schema.d.ts
deleted file mode 100644
index 58a899b66c87..000000000000
--- a/packages/schematics/angular/component/schema.d.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export interface Schema {
-    /**
-     * The path to create the component.
-     */
-    path?: string;
-    /**
-     * The name of the project.
-     */
-    project?: string;
-    /**
-     * The name of the component.
-     */
-    name: string;
-    /**
-     * Specifies if the style will be in the ts file.
-     */
-    inlineStyle?: boolean;
-    /**
-     * Specifies if the template will be in the ts file.
-     */
-    inlineTemplate?: boolean;
-    /**
-     * Specifies the view encapsulation strategy.
-     */
-    viewEncapsulation?: ('Emulated' | 'Native' | 'None');
-    /**
-     * Specifies the change detection strategy.
-     */
-    changeDetection?: ('Default' | 'OnPush');
-    /**
-     * The prefix to apply to generated selectors.
-     */
-    prefix?: string;
-    /**
-     * The file extension to be used for style files.
-     */
-    styleext?: string;
-    /**
-     * Specifies if a spec file is generated.
-     */
-    spec?: boolean;
-    /**
-     * Flag to indicate if a dir is created.
-     */
-    flat?: boolean;
-    /**
-     * Flag to skip the module import.
-     */
-    skipImport?: boolean;
-    /**
-     * The selector to use for the component.
-     */
-    selector?: string;
-    /**
-     * Allows specification of the declaring module.
-     */
-    module?: string;
-    /**
-     * Specifies if declaring module exports the component.
-     */
-    export?: boolean;
-  /**
-   * Specifies if the component is an entry component of declaring module.
-   */
-    entryComponent?: boolean;
-    /**
-     * Specifies whether to apply lint fixes after generating the component.
-     */
-    lintFix?: boolean;
-}
diff --git a/packages/schematics/angular/component/schema.json b/packages/schematics/angular/component/schema.json
index 01d9f6e36c71..d10af40349d5 100644
--- a/packages/schematics/angular/component/schema.json
+++ b/packages/schematics/angular/component/schema.json
@@ -110,5 +110,7 @@
       "description": "Specifies whether to apply lint fixes after generating the component."
     }
   },
-  "required": []
+  "required": [
+    "name"
+  ]
 }
diff --git a/packages/schematics/angular/directive/schema.d.ts b/packages/schematics/angular/directive/schema.d.ts
deleted file mode 100644
index d7d73803801f..000000000000
--- a/packages/schematics/angular/directive/schema.d.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export interface Schema {
-    /**
-     * The name of the directive.
-     */
-    name: string;
-    /**
-     * The path to create the interface.
-     */
-    path?: string;
-    /**
-     * The name of the project.
-     */
-    project?: string;
-    /**
-     * The prefix to apply to generated selectors.
-     */
-    prefix?: string;
-    /**
-     * Specifies if a spec file is generated.
-     */
-    spec?: boolean;
-    /**
-     * Flag to skip the module import.
-     */
-    skipImport?: boolean;
-    /**
-     * The selector to use for the directive.
-     */
-    selector?: string;
-    /**
-     * Flag to indicate if a dir is created.
-     */
-    flat?: boolean;
-    /**
-     * Allows specification of the declaring module.
-     */
-    module?: string;
-    /**
-     * Specifies if declaring module exports the directive.
-     */
-    export?: boolean;
-    /**
-     * Specifies whether to apply lint fixes after generating the component.
-     */
-    lintFix?: boolean;
-}
diff --git a/packages/schematics/angular/directive/schema.json b/packages/schematics/angular/directive/schema.json
index d7b517f43718..9562c5348c1c 100644
--- a/packages/schematics/angular/directive/schema.json
+++ b/packages/schematics/angular/directive/schema.json
@@ -75,5 +75,7 @@
       "description": "Specifies whether to apply lint fixes after generating the directive."
     }
   },
-  "required": []
+  "required": [
+    "name"
+  ]
 }
diff --git a/packages/schematics/angular/e2e/schema.d.ts b/packages/schematics/angular/e2e/schema.d.ts
deleted file mode 100644
index 2180f6941220..000000000000
--- a/packages/schematics/angular/e2e/schema.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export interface Schema {
-    /**
-     * The root directory of the new application.
-     */
-    projectRoot?: string;
-    /**
-     * The name of the application.
-     */
-    name: string;
-    /**
-     * HTML selector for the root component.
-     */
-    rootSelector?: string;
-    /**
-     * The name of the app being tested.
-     */
-    relatedAppName: string;
-}
diff --git a/packages/schematics/angular/e2e/schema.json b/packages/schematics/angular/e2e/schema.json
index df166cf4a22f..db0988c72bd7 100644
--- a/packages/schematics/angular/e2e/schema.json
+++ b/packages/schematics/angular/e2e/schema.json
@@ -29,6 +29,7 @@
     }
   },
   "required": [
+    "name",
     "relatedAppName"
   ]
 }
diff --git a/packages/schematics/angular/enum/schema.d.ts b/packages/schematics/angular/enum/schema.d.ts
deleted file mode 100644
index 3f5a7b610b79..000000000000
--- a/packages/schematics/angular/enum/schema.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export interface Schema {
-    /**
-     * The name of the enum.
-     */
-    name: string;
-    /**
-     * The path to create the enum.
-     */
-    path?: string;
-    /**
-     * The name of the project.
-     */
-    project?: string;
-    /**
-     * Specifies whether to apply lint fixes after generating the component.
-     */
-    lintFix?: boolean;
-}
diff --git a/packages/schematics/angular/enum/schema.json b/packages/schematics/angular/enum/schema.json
index 9aafb7b7a9af..f9ce0b537289 100644
--- a/packages/schematics/angular/enum/schema.json
+++ b/packages/schematics/angular/enum/schema.json
@@ -31,5 +31,7 @@
       "description": "Specifies whether to apply lint fixes after generating the enum."
     }
   },
-  "required": []
+  "required": [
+    "name"
+  ]
 }
diff --git a/packages/schematics/angular/guard/schema.d.ts b/packages/schematics/angular/guard/schema.d.ts
deleted file mode 100644
index 0ed1b0abbb46..000000000000
--- a/packages/schematics/angular/guard/schema.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export interface Schema {
-    /**
-     * The name of the guard.
-     */
-    name: string;
-    /**
-     * Specifies if a spec file is generated.
-     */
-    spec?: boolean;
-    /**
-     * Flag to indicate if a dir is created.
-     */
-    flat?: boolean;
-    /**
-     * The path to create the interface.
-     */
-    path?: string;
-    /**
-     * The name of the project.
-     */
-    project?: string;
-    /**
-     * Specifies whether to apply lint fixes after generating the component.
-     */
-    lintFix?: boolean;
-}
diff --git a/packages/schematics/angular/guard/schema.json b/packages/schematics/angular/guard/schema.json
index 854254facab4..63cc33b91f78 100644
--- a/packages/schematics/angular/guard/schema.json
+++ b/packages/schematics/angular/guard/schema.json
@@ -41,5 +41,8 @@
       "description": "Specifies whether to apply lint fixes after generating the guard."
     }
   },
-  "required": []
+  "required": [
+    "name",
+    "project"
+  ]
 }
diff --git a/packages/schematics/angular/interface/schema.d.ts b/packages/schematics/angular/interface/schema.d.ts
deleted file mode 100644
index f6ac71bf592b..000000000000
--- a/packages/schematics/angular/interface/schema.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export interface Schema {
-    /**
-     * The name of the interface.
-     */
-    name: string;
-    /**
-     * The path to create the interface.
-     */
-    path?: string;
-    /**
-     * The name of the project.
-     */
-    project?: string;
-    /**
-     * Specifies the prefix to use.
-     */
-    prefix?: string;
-    /**
-     * Specifies the type of interface.
-     */
-    type?: string;
-    /**
-     * Specifies whether to apply lint fixes after generating the component.
-     */
-    lintFix?: boolean;
-}
diff --git a/packages/schematics/angular/interface/schema.json b/packages/schematics/angular/interface/schema.json
index d41e2e327251..9b747b27b2a6 100644
--- a/packages/schematics/angular/interface/schema.json
+++ b/packages/schematics/angular/interface/schema.json
@@ -44,5 +44,7 @@
       "description": "Specifies whether to apply lint fixes after generating the directive."
     }
   },
-  "required": []
+  "required": [
+    "name"
+  ]
 }
diff --git a/packages/schematics/angular/library/schema.d.ts b/packages/schematics/angular/library/schema.d.ts
deleted file mode 100644
index b24d27f9a895..000000000000
--- a/packages/schematics/angular/library/schema.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export interface Schema {
-  /**
-   * The name of the library. Required field.
-   */
-  name: string;
-  /**
-   * The path to create the interface.
-   */
-  entryFile?: string;
-  /**
-   * The prefix to apply to generated selectors.
-   */
-  prefix?: string;
-  /**
-   * Do not add dependencies to package.json (e.g., --skipPackageJson)
-   */
-  skipPackageJson?: boolean;
-  /**
-   * Skip installing dependency packages.
-   */
-  skipInstall?: boolean;
-  /**
-   * Do not update tsconfig.json for development experience (e.g., --skipTsConfig)
-   */
-  skipTsConfig?: boolean;
-}
diff --git a/packages/schematics/angular/module/schema.d.ts b/packages/schematics/angular/module/schema.d.ts
deleted file mode 100644
index 7d9fffae5d6d..000000000000
--- a/packages/schematics/angular/module/schema.d.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export interface Schema {
-    /**
-     * The name of the module.
-     */
-    name: string;
-    /**
-     * The path to create the pipe.
-     */
-    path?: string;
-    /**
-     * The name of the project.
-     */
-    project?: string;
-    /**
-     * Generates a routing module.
-     */
-    routing?: boolean;
-    /**
-     * The scope for the generated routing.
-     */
-    routingScope?: ('Child' | 'Root');
-    /**
-     * Specifies if a spec file is generated.
-     */
-    spec?: boolean;
-    /**
-     * Flag to indicate if a dir is created.
-     */
-    flat?: boolean;
-    /**
-     * Flag to control whether the CommonModule is imported.
-     */
-    commonModule?: boolean;
-    /**
-     * Allows specification of the declaring module.
-     */
-    module?: string;
-}
diff --git a/packages/schematics/angular/module/schema.json b/packages/schematics/angular/module/schema.json
index 8e7bf215bd6d..8dac5b5aa502 100644
--- a/packages/schematics/angular/module/schema.json
+++ b/packages/schematics/angular/module/schema.json
@@ -58,5 +58,7 @@
       "alias": "m"
     }
   },
-  "required": []
+  "required": [
+    "name"
+  ]
 }
diff --git a/packages/schematics/angular/ng-new/schema.d.ts b/packages/schematics/angular/ng-new/schema.d.ts
deleted file mode 100644
index 82190e620110..000000000000
--- a/packages/schematics/angular/ng-new/schema.d.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export interface Schema {
-  /**
-   * The directory name to create the workspace in.
-   */
-  directory?: string;
-  /**
-   * The name of the workspace.
-   */
-  name: string;
-  /**
-   * EXPERIMENTAL: Specifies whether to create a new application which uses the Ivy rendering
-   * engine.
-   */
-  experimentalIvy?: boolean;
-  /**
-   * Skip installing dependency packages.
-   */
-  skipInstall?: boolean;
-  /**
-   * Link CLI to global version (internal development only).
-   */
-  linkCli?: boolean;
-  /**
-   * Skip initializing a git repository.
-   */
-  skipGit?: boolean;
-  /**
-   * Initial repository commit information.
-   */
-  commit?: { name: string, email: string, message?: string } | boolean;
-  /**
-   * The path where new projects will be created.
-   */
-  newProjectRoot?: string;
-  /**
-   * The version of the Angular CLI to use.
-   */
-  version?: string;
-  /**
-   * Specifies if the style will be in the ts file.
-   */
-  inlineStyle?: boolean;
-  /**
-   * Specifies if the template will be in the ts file.
-   */
-  inlineTemplate?: boolean;
-  /**
-   * Specifies the view encapsulation strategy.
-   */
-  viewEncapsulation?: ('Emulated' | 'Native' | 'None');
-  /**
-   * Generates a routing module.
-   */
-  routing?: boolean;
-  /**
-   * The prefix to apply to generated selectors.
-   */
-  prefix?: string;
-  /**
-   * The file extension to be used for style files.
-   */
-  style?: string;
-  /**
-   * Skip creating spec files.
-   */
-  skipTests?: boolean;
-}
diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
index 61a32c3cf593..bb412d0c544b 100644
--- a/packages/schematics/angular/ng-new/schema.json
+++ b/packages/schematics/angular/ng-new/schema.json
@@ -134,5 +134,7 @@
     }
   },
   "required": [
+    "name",
+    "version"
   ]
 }
diff --git a/packages/schematics/angular/pipe/schema.d.ts b/packages/schematics/angular/pipe/schema.d.ts
deleted file mode 100644
index 4a8eba445c2d..000000000000
--- a/packages/schematics/angular/pipe/schema.d.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export interface Schema {
-    /**
-     * The name of the pipe.
-     */
-    name: string;
-    /**
-     * The path to create the pipe.
-     */
-    path?: string;
-    /**
-     * The name of the project.
-     */
-    project?: string;
-    /**
-     * Flag to indicate if a dir is created.
-     */
-    flat?: boolean;
-    /**
-     * Specifies if a spec file is generated.
-     */
-    spec?: boolean;
-    /**
-     * Allows for skipping the module import.
-     */
-    skipImport?: boolean;
-    /**
-     * Allows specification of the declaring module.
-     */
-    module?: string;
-    /**
-     * Specifies if declaring module exports the pipe.
-     */
-    export?: boolean;
-    /**
-     * Specifies whether to apply lint fixes after generating the component.
-     */
-    lintFix?: boolean;
-}
diff --git a/packages/schematics/angular/pipe/schema.json b/packages/schematics/angular/pipe/schema.json
index 76a3a2c666c9..1dd16bec9fe2 100644
--- a/packages/schematics/angular/pipe/schema.json
+++ b/packages/schematics/angular/pipe/schema.json
@@ -42,7 +42,6 @@
     },
     "module": {
       "type": "string",
-      "default": "",
       "description": "Allows specification of the declaring module.",
       "alias": "m"
     },
@@ -57,5 +56,7 @@
       "description": "Specifies whether to apply lint fixes after generating the pipe."
     }
   },
-  "required": []
+  "required": [
+    "name"
+  ]
 }
diff --git a/packages/schematics/angular/service-worker/schema.json b/packages/schematics/angular/service-worker/schema.json
index 4ec3fe49e3c5..938d906ed973 100644
--- a/packages/schematics/angular/service-worker/schema.json
+++ b/packages/schematics/angular/service-worker/schema.json
@@ -22,5 +22,9 @@
       "default": "production"
     }
   },
-  "required": []
-}
\ No newline at end of file
+  "required": [
+    "project",
+    "target",
+    "configuration"
+  ]
+}
diff --git a/packages/schematics/angular/service/schema.d.ts b/packages/schematics/angular/service/schema.d.ts
deleted file mode 100644
index 3196cfe1a5ee..000000000000
--- a/packages/schematics/angular/service/schema.d.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export interface Schema {
-    /**
-     * The name of the service.
-     */
-    name: string;
-    /**
-     * The path to create the service.
-     */
-    path?: string;
-    /**
-     * The name of the project.
-     */
-    project?: string;
-    /**
-     * Flag to indicate if a dir is created.
-     */
-    flat?: boolean;
-    /**
-     * Specifies if a spec file is generated.
-     */
-    spec?: boolean;
-    /**
-     * Specifies whether to apply lint fixes after generating the component.
-     */
-    lintFix?: boolean;
-}
diff --git a/packages/schematics/angular/service/schema.json b/packages/schematics/angular/service/schema.json
index bc1c9ee9c683..ae2b105b92d6 100644
--- a/packages/schematics/angular/service/schema.json
+++ b/packages/schematics/angular/service/schema.json
@@ -41,5 +41,7 @@
       "description": "Specifies whether to apply lint fixes after generating the pipe."
     }
   },
-  "required": []
+  "required": [
+    "name"
+  ]
 }
diff --git a/packages/schematics/angular/universal/schema.d.ts b/packages/schematics/angular/universal/schema.d.ts
deleted file mode 100644
index 7823e3754d76..000000000000
--- a/packages/schematics/angular/universal/schema.d.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export interface Schema {
-    /**
-     * Name or index of related client app.
-     */
-    clientProject: string;
-    /**
-     * The appId to use withServerTransition.
-     */
-    appId?: string;
-    /**
-     * The name of the main entry-point file.
-     */
-    main?: string;
-    /**
-     * The name of the test entry-point file.
-     */
-    test?: string;
-    /**
-     * The name of the TypeScript configuration file.
-     */
-    tsconfigFileName?: string;
-    /**
-     * The name of the TypeScript configuration file for tests.
-     */
-    testTsconfigFileName?: string;
-    /**
-     * The name of the application directory.
-     */
-    appDir?: string;
-    /**
-     * The name of the root module file
-     */
-    rootModuleFileName?: string;
-    /**
-     * The name of the root module class.
-     */
-    rootModuleClassName?: string;
-    /**
-     * Skip installing dependency packages.
-     */
-    skipInstall?: boolean;
-}
diff --git a/packages/schematics/angular/workspace/schema.d.ts b/packages/schematics/angular/workspace/schema.d.ts
deleted file mode 100644
index 405a59b76f39..000000000000
--- a/packages/schematics/angular/workspace/schema.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export interface Schema {
-    /**
-     * The name of the workspace.
-     */
-    name: string;
-    /**
-     * Uses the next version of Angular.
-     */
-    experimentalAngularNext?: boolean;
-    /**
-     * The path where new projects will be created.
-     */
-    newProjectRoot?: string;
-    /**
-     * Skip installing dependency packages.
-     */
-    skipInstall?: boolean;
-    /**
-     * Link CLI to global version (internal development only).
-     */
-    linkCli?: boolean;
-    /**
-     * Skip initializing a git repository.
-     */
-    skipGit?: boolean;
-    /**
-     * Initial repository commit information.
-     */
-    commit?: { name: string, email: string, message?: string };
-    /**
-     * The version of the Angular CLI to use.
-     */
-    version?: string;
-}

From a6d515a0563595ac60ba04b212dc6cef466df08f Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Thu, 6 Sep 2018 17:37:11 -0700
Subject: [PATCH 0113/1703] refactor(@schematics/schematics): automated JSON
 schema interface generation

---
 packages/schematics/schematics/BUILD          | 87 +++++++++++++++++++
 .../schematics/schematics/blank/schema.d.ts   | 18 ----
 .../schematics/schematic/schema.d.ts          | 18 ----
 3 files changed, 87 insertions(+), 36 deletions(-)
 create mode 100644 packages/schematics/schematics/BUILD
 delete mode 100644 packages/schematics/schematics/blank/schema.d.ts
 delete mode 100644 packages/schematics/schematics/schematic/schema.d.ts

diff --git a/packages/schematics/schematics/BUILD b/packages/schematics/schematics/BUILD
new file mode 100644
index 000000000000..dba3e58e6ee2
--- /dev/null
+++ b/packages/schematics/schematics/BUILD
@@ -0,0 +1,87 @@
+# Copyright Google Inc. All Rights Reserved.
+#
+# Use of this source code is governed by an MIT-style license that can be
+# found in the LICENSE file at https://angular.io/license
+
+licenses(["notice"])  # MIT
+
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+# load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
+load("//tools:ts_json_schema.bzl", "ts_json_schema")
+
+package(default_visibility = ["//visibility:public"])
+
+ts_library(
+    name = "schematics",
+    srcs = glob(
+        include = ["**/*.ts"],
+        exclude = [
+            "**/*_spec.ts",
+            "**/*_spec_large.ts",
+            "**/*_benchmark.ts",
+            "schematic/files/**",
+            "blank/project-files/**",
+            "blank/schematic-files/**",
+        ],
+    ),
+    deps = [
+        ":blank_schema",
+        ":schematic_schema",
+        "//packages/angular_devkit/core",
+        "//packages/angular_devkit/schematics",
+        "//packages/angular_devkit/schematics:tasks",
+        "@rxjs",
+        "@rxjs//operators",
+        # @typings: node
+    ],
+)
+
+ts_json_schema(
+    name = "blank_schema",
+    src = "blank/schema.json",
+)
+
+ts_json_schema(
+    name = "schematic_schema",
+    src = "schematic/schema.json",
+)
+
+# For now we don't have specs.
+# ts_library(
+#     name = "schematics_test_lib",
+#     srcs = glob(
+#         include = [
+#             "**/*_spec.ts",
+#             "**/*_spec_large.ts",
+#         ],
+#         exclude = [
+#             "schematic/files/**",
+#             "blank/project-files/**",
+#             "blank/schematic-files/**",
+#         ],
+#     ),
+#     data = glob(
+#         include = [
+#             "**/*.json",
+#             "collection.json",
+#             "schematic/files/**",
+#             "blank/project-files/**",
+#             "blank/schematic-files/**",
+#         ]
+#     ),
+#     deps = [
+#         ":schematics",
+#         "//packages/angular_devkit/core",
+#         "//packages/angular_devkit/schematics",
+#         "//packages/angular_devkit/schematics:testing",
+#         "@rxjs",
+#         "@rxjs//operators",
+#         # @typings: jasmine
+#         # @typings: node
+#     ],
+# )
+
+# jasmine_node_test(
+#     name = "schematics_test",
+#     srcs = [":schematics_test_lib"],
+# )
diff --git a/packages/schematics/schematics/blank/schema.d.ts b/packages/schematics/schematics/blank/schema.d.ts
deleted file mode 100644
index 2413212c1b61..000000000000
--- a/packages/schematics/schematics/blank/schema.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export interface Schema {
-    /**
-     * The package name for the new schematic.
-     */
-    name: string;
-    /**
-     * Author for the new schematic.
-     */
-    author?: string;
-}
diff --git a/packages/schematics/schematics/schematic/schema.d.ts b/packages/schematics/schematics/schematic/schema.d.ts
deleted file mode 100644
index 2413212c1b61..000000000000
--- a/packages/schematics/schematics/schematic/schema.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export interface Schema {
-    /**
-     * The package name for the new schematic.
-     */
-    name: string;
-    /**
-     * Author for the new schematic.
-     */
-    author?: string;
-}

From 0b3d9964a6b6e1feefaec97153420616fb0c686a Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Fri, 7 Sep 2018 15:14:31 -0700
Subject: [PATCH 0114/1703] refactor(@angular/pwa): automated JSON Schema
 generation

---
 packages/angular/pwa/BUILD           |  7 +++++++
 packages/angular/pwa/pwa/schema.d.ts | 26 --------------------------
 2 files changed, 7 insertions(+), 26 deletions(-)
 delete mode 100644 packages/angular/pwa/pwa/schema.d.ts

diff --git a/packages/angular/pwa/BUILD b/packages/angular/pwa/BUILD
index b72ac6d5d4db..84fbbcf1d5cf 100644
--- a/packages/angular/pwa/BUILD
+++ b/packages/angular/pwa/BUILD
@@ -6,6 +6,7 @@
 licenses(["notice"])  # MIT
 
 load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -25,9 +26,15 @@ ts_library(
         ],
     ),
     deps = [
+        ":pwa_schema",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/schematics",
         "@rxjs",
         # @typings: node
     ],
 )
+
+ts_json_schema(
+    name = "pwa_schema",
+    src = "pwa/schema.json",
+)
diff --git a/packages/angular/pwa/pwa/schema.d.ts b/packages/angular/pwa/pwa/schema.d.ts
deleted file mode 100644
index d6d2d83a7a06..000000000000
--- a/packages/angular/pwa/pwa/schema.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export interface Schema {
-  /**
-   * The name of the project.
-   */
-  project?: string;
-  /**
-   * The target to apply service worker to.
-   */
-  target: string;
-  /**
-   * The configuration to apply service worker to.
-   */
-  configuration: string;
-  /**
-   * The title of the application.
-   */
-  title?: string;
-}

From 30b0cbda0db22f94bf6f94fb50912d7a6d53e551 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Fri, 7 Sep 2018 18:22:30 -0700
Subject: [PATCH 0115/1703] refactor(@angular/cli): automated JSON schema
 interface generation

---
 packages/angular/cli/BUILD                    | 171 ++++++++++++++++++
 packages/angular/cli/commands/add-impl.ts     |  13 +-
 packages/angular/cli/commands/add.json        |   3 +
 packages/angular/cli/commands/build-impl.ts   |   6 +-
 packages/angular/cli/commands/config-impl.ts  |  26 ++-
 packages/angular/cli/commands/config.json     |  53 +++---
 .../angular/cli/commands/deprecated-impl.ts   |   3 +-
 packages/angular/cli/commands/deprecated.json |   5 +-
 packages/angular/cli/commands/doc-impl.ts     |  14 +-
 packages/angular/cli/commands/doc.json        |  37 ++--
 packages/angular/cli/commands/e2e-impl.ts     |   8 +-
 .../angular/cli/commands/easter-egg-impl.ts   |   3 +-
 packages/angular/cli/commands/easter-egg.json |   5 +-
 packages/angular/cli/commands/eject-impl.ts   |   4 +-
 .../angular/cli/commands/generate-impl.ts     |  19 +-
 packages/angular/cli/commands/help-impl.ts    |   3 +-
 packages/angular/cli/commands/help.json       |   5 +-
 packages/angular/cli/commands/lint-impl.ts    |   7 +-
 packages/angular/cli/commands/new-impl.ts     |  19 +-
 packages/angular/cli/commands/run-impl.ts     |   7 +-
 packages/angular/cli/commands/serve-impl.ts   |   9 +-
 packages/angular/cli/commands/test-impl.ts    |   6 +-
 packages/angular/cli/commands/update-impl.ts  |  25 +--
 packages/angular/cli/commands/update.json     |   3 +
 packages/angular/cli/commands/version-impl.ts |   4 +-
 packages/angular/cli/commands/version.json    |   5 +-
 packages/angular/cli/commands/xi18n-impl.ts   |   9 +-
 .../angular/cli/models/architect-command.ts   |  15 +-
 packages/angular/cli/models/command.ts        |   8 +-
 .../angular/cli/models/schematic-command.ts   |  19 +-
 30 files changed, 348 insertions(+), 166 deletions(-)

diff --git a/packages/angular/cli/BUILD b/packages/angular/cli/BUILD
index a4d7f4ba6fdd..b98389597251 100644
--- a/packages/angular/cli/BUILD
+++ b/packages/angular/cli/BUILD
@@ -6,6 +6,7 @@
 licenses(["notice"])  # MIT
 
 load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -21,6 +22,7 @@ ts_library(
     data = glob(["**/*.json"]),
     module_name = "@angular/cli",
     deps = [
+        ":command_schemas",
         "//packages/angular_devkit/architect",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
@@ -34,3 +36,172 @@ ts_library(
         # @typings: semver
     ],
 )
+
+ts_library(
+    name = "command_schemas",
+    srcs = [],
+    deps = [
+        ":add_schema",
+        ":build_schema",
+        ":config_schema",
+        ":deprecated_schema",
+        ":doc_schema",
+        ":e2e_schema",
+        ":easter_egg_schema",
+        ":eject_schema",
+        ":generate_schema",
+        ":help_schema",
+        ":lint_schema",
+        ":new_schema",
+        ":run_schema",
+        ":serve_schema",
+        ":test_schema",
+        ":update_schema",
+        ":version_schema",
+        ":xi18n_schema",
+    ],
+)
+
+ts_json_schema(
+    name = "add_schema",
+    src = "commands/add.json",
+    data = [
+        "commands/definitions.json",
+    ],
+)
+
+ts_json_schema(
+    name = "build_schema",
+    src = "commands/build.json",
+    data = [
+        "commands/definitions.json",
+    ],
+)
+
+ts_json_schema(
+    name = "config_schema",
+    src = "commands/config.json",
+    data = [
+        "commands/definitions.json",
+    ],
+)
+
+ts_json_schema(
+    name = "deprecated_schema",
+    src = "commands/deprecated.json",
+    data = [
+        "commands/definitions.json",
+    ],
+)
+
+ts_json_schema(
+    name = "doc_schema",
+    src = "commands/doc.json",
+    data = [
+        "commands/definitions.json",
+    ],
+)
+
+ts_json_schema(
+    name = "e2e_schema",
+    src = "commands/e2e.json",
+    data = [
+        "commands/definitions.json",
+    ],
+)
+
+ts_json_schema(
+    name = "easter_egg_schema",
+    src = "commands/easter-egg.json",
+    data = [
+        "commands/definitions.json",
+    ],
+)
+
+ts_json_schema(
+    name = "eject_schema",
+    src = "commands/eject.json",
+    data = [
+        "commands/definitions.json",
+    ],
+)
+
+ts_json_schema(
+    name = "generate_schema",
+    src = "commands/generate.json",
+    data = [
+        "commands/definitions.json",
+    ],
+)
+
+ts_json_schema(
+    name = "help_schema",
+    src = "commands/help.json",
+    data = [
+        "commands/definitions.json",
+    ],
+)
+
+ts_json_schema(
+    name = "lint_schema",
+    src = "commands/lint.json",
+    data = [
+        "commands/definitions.json",
+    ],
+)
+
+ts_json_schema(
+    name = "new_schema",
+    src = "commands/new.json",
+    data = [
+        "commands/definitions.json",
+    ],
+)
+
+ts_json_schema(
+    name = "run_schema",
+    src = "commands/run.json",
+    data = [
+        "commands/definitions.json",
+    ],
+)
+
+ts_json_schema(
+    name = "serve_schema",
+    src = "commands/serve.json",
+    data = [
+        "commands/definitions.json",
+    ],
+)
+
+ts_json_schema(
+    name = "test_schema",
+    src = "commands/test.json",
+    data = [
+        "commands/definitions.json",
+    ],
+)
+
+ts_json_schema(
+    name = "update_schema",
+    src = "commands/update.json",
+    data = [
+        "commands/definitions.json",
+    ],
+)
+
+ts_json_schema(
+    name = "version_schema",
+    src = "commands/version.json",
+    data = [
+        "commands/definitions.json",
+    ],
+)
+
+ts_json_schema(
+    name = "xi18n_schema",
+    src = "commands/xi18n.json",
+    data = [
+        "commands/definitions.json",
+    ],
+)
diff --git a/packages/angular/cli/commands/add-impl.ts b/packages/angular/cli/commands/add-impl.ts
index 17e0bb23034a..fe0ee5bbd1c6 100644
--- a/packages/angular/cli/commands/add-impl.ts
+++ b/packages/angular/cli/commands/add-impl.ts
@@ -10,20 +10,15 @@
 import { tags, terminal } from '@angular-devkit/core';
 import { NodePackageDoesNotSupportSchematics } from '@angular-devkit/schematics/tools';
 import { Arguments } from '../models/interface';
-import { BaseSchematicOptions, SchematicCommand } from '../models/schematic-command';
+import { SchematicCommand } from '../models/schematic-command';
 import { NpmInstall } from '../tasks/npm-install';
 import { getPackageManager } from '../utilities/config';
+import { Schema as AddCommandSchema } from './add';
 
-export interface AddCommandOptions extends BaseSchematicOptions {
-  collection: string;
-}
-
-export class AddCommand<
-  T extends AddCommandOptions = AddCommandOptions,
-> extends SchematicCommand<T> {
+export class AddCommand extends SchematicCommand<AddCommandSchema> {
   readonly allowPrivateSchematics = true;
 
-  async run(options: AddCommandOptions & Arguments) {
+  async run(options: AddCommandSchema & Arguments) {
     if (!options.collection) {
       this.logger.fatal(
         `The "ng add" command requires a name argument to be specified eg. `
diff --git a/packages/angular/cli/commands/add.json b/packages/angular/cli/commands/add.json
index 4009d228304c..b2cb5b9eb06d 100644
--- a/packages/angular/cli/commands/add.json
+++ b/packages/angular/cli/commands/add.json
@@ -23,6 +23,9 @@
       "required": [
       ]
     },
+    {
+      "$ref": "./definitions.json#/definitions/schematic"
+    },
     {
       "$ref": "./definitions.json#/definitions/base"
     }
diff --git a/packages/angular/cli/commands/build-impl.ts b/packages/angular/cli/commands/build-impl.ts
index c6c94dcfbb9d..39154941098b 100644
--- a/packages/angular/cli/commands/build-impl.ts
+++ b/packages/angular/cli/commands/build-impl.ts
@@ -7,12 +7,14 @@
  */
 
 import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
+import { Arguments } from '../models/interface';
 import { Version } from '../upgrade/version';
+import { Schema as BuildCommandSchema } from './build';
 
-export class BuildCommand extends ArchitectCommand {
+export class BuildCommand extends ArchitectCommand<BuildCommandSchema> {
   public readonly target = 'build';
 
-  public async run(options: ArchitectCommandOptions) {
+  public async run(options: ArchitectCommandOptions & Arguments) {
     // Check Angular and TypeScript versions.
     Version.assertCompatibleAngularVersion(this.workspace.root);
     Version.assertTypescriptVersion(this.workspace.root);
diff --git a/packages/angular/cli/commands/config-impl.ts b/packages/angular/cli/commands/config-impl.ts
index 7499f542cc37..db26faf30f9c 100644
--- a/packages/angular/cli/commands/config-impl.ts
+++ b/packages/angular/cli/commands/config-impl.ts
@@ -17,21 +17,17 @@ import {
   tags,
 } from '@angular-devkit/core';
 import { writeFileSync } from 'fs';
-import { BaseCommandOptions, Command } from '../models/command';
+import { Command } from '../models/command';
+import { Arguments } from '../models/interface';
 import {
   getWorkspace,
   getWorkspaceRaw,
   migrateLegacyGlobalConfig,
   validateWorkspace,
 } from '../utilities/config';
+import { Schema as ConfigCommandSchema, Value as ConfigCommandSchemaValue } from './config';
 
 
-export interface ConfigOptions extends BaseCommandOptions {
-  jsonPath: string;
-  value?: string;
-  global?: boolean;
-}
-
 const validCliPaths = new Map([
   ['cli.warnings.versionMismatch', 'boolean'],
   ['cli.warnings.typescriptMismatch', 'boolean'],
@@ -139,20 +135,20 @@ function setValueFromPath<T extends JsonArray | JsonObject>(
   }
 }
 
-function normalizeValue(value: string, path: string): JsonValue {
+function normalizeValue(value: ConfigCommandSchemaValue, path: string): JsonValue {
   const cliOptionType = validCliPaths.get(path);
   if (cliOptionType) {
     switch (cliOptionType) {
       case 'boolean':
-        if (value.trim() === 'true') {
+        if (('' + value).trim() === 'true') {
           return true;
-        } else if (value.trim() === 'false') {
+        } else if (('' + value).trim() === 'false') {
           return false;
         }
         break;
       case 'number':
         const numberValue = Number(value);
-        if (!Number.isNaN(numberValue)) {
+        if (!Number.isFinite(numberValue)) {
           return numberValue;
         }
         break;
@@ -178,8 +174,8 @@ function normalizeValue(value: string, path: string): JsonValue {
   return value;
 }
 
-export class ConfigCommand<T extends ConfigOptions = ConfigOptions> extends Command<T> {
-  public async run(options: T) {
+export class ConfigCommand extends Command<ConfigCommandSchema> {
+  public async run(options: ConfigCommandSchema & Arguments) {
     const level = options.global ? 'global' : 'local';
 
     let config =
@@ -210,7 +206,7 @@ export class ConfigCommand<T extends ConfigOptions = ConfigOptions> extends Comm
     }
   }
 
-  private get(config: experimental.workspace.WorkspaceSchema, options: T) {
+  private get(config: experimental.workspace.WorkspaceSchema, options: ConfigCommandSchema) {
     let value;
     if (options.jsonPath) {
       value = getValueFromPath(config as {} as JsonObject, options.jsonPath);
@@ -229,7 +225,7 @@ export class ConfigCommand<T extends ConfigOptions = ConfigOptions> extends Comm
     }
   }
 
-  private set(options: ConfigOptions) {
+  private set(options: ConfigCommandSchema) {
     if (!options.jsonPath || !options.jsonPath.trim()) {
       throw new Error('Invalid Path.');
     }
diff --git a/packages/angular/cli/commands/config.json b/packages/angular/cli/commands/config.json
index 35521ba50406..db5a1b665a0e 100644
--- a/packages/angular/cli/commands/config.json
+++ b/packages/angular/cli/commands/config.json
@@ -10,30 +10,35 @@
   "$impl": "./config-impl#ConfigCommand",
 
   "type": "object",
-  "properties": {
-    "jsonPath": {
-      "type": "string",
-      "description": "The path to the value to get/set.",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      }
+  "allOf": [
+    {
+      "properties": {
+        "jsonPath": {
+          "type": "string",
+          "description": "The path to the value to get/set.",
+          "$default": {
+            "$source": "argv",
+            "index": 0
+          }
+        },
+        "value": {
+          "type": ["string", "number", "boolean"],
+          "description": "The new value to be set.",
+          "$default": {
+            "$source": "argv",
+            "index": 1
+          }
+        },
+        "global": {
+          "type": "boolean",
+          "description": "Get/set the value in the global configuration (in your home directory).",
+          "default": false,
+          "aliases": ["g"]
+        }
+      },
+      "required": [
+      ]
     },
-    "value": {
-      "type": ["string", "number", "boolean"],
-      "description": "The new value to be set.",
-      "$default": {
-        "$source": "argv",
-        "index": 1
-      }
-    },
-    "global": {
-      "type": "boolean",
-      "description": "Get/set the value in the global configuration (in your home directory).",
-      "default": false,
-      "aliases": ["g"]
-    }
-  },
-  "required": [
+    { "$ref": "./definitions.json#/definitions/base" }
   ]
 }
diff --git a/packages/angular/cli/commands/deprecated-impl.ts b/packages/angular/cli/commands/deprecated-impl.ts
index 85c8af440384..7887eac8d04d 100644
--- a/packages/angular/cli/commands/deprecated-impl.ts
+++ b/packages/angular/cli/commands/deprecated-impl.ts
@@ -6,8 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { Command } from '../models/command';
+import { Schema as DeprecatedCommandSchema } from './deprecated';
 
-export class DeprecatedCommand extends Command {
+export class DeprecatedCommand extends Command<DeprecatedCommandSchema> {
   public async run() {
     let message = 'The "${this.description.name}" command has been deprecated.';
     if (this.description.name == 'get' || this.description.name == 'set') {
diff --git a/packages/angular/cli/commands/deprecated.json b/packages/angular/cli/commands/deprecated.json
index ee77bbd03d20..05dd86855d95 100644
--- a/packages/angular/cli/commands/deprecated.json
+++ b/packages/angular/cli/commands/deprecated.json
@@ -8,5 +8,8 @@
   "$hidden": true,
   "$type": "deprecated",
 
-  "type": "object"
+  "type": "object",
+  "allOf": [
+    { "$ref": "./definitions.json#/definitions/base" }
+  ]
 }
diff --git a/packages/angular/cli/commands/doc-impl.ts b/packages/angular/cli/commands/doc-impl.ts
index 543c9ecca89a..6a0e7a265ecf 100644
--- a/packages/angular/cli/commands/doc-impl.ts
+++ b/packages/angular/cli/commands/doc-impl.ts
@@ -6,16 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { BaseCommandOptions, Command } from '../models/command';
-const opn = require('opn');
+import { Command } from '../models/command';
+import { Arguments } from '../models/interface';
+import { Schema as DocCommandSchema } from './doc';
 
-export interface DocCommandOptions extends BaseCommandOptions {
-  keyword: string;
-  search?: boolean;
-}
+const opn = require('opn');
 
-export class DocCommand<T extends DocCommandOptions = DocCommandOptions> extends Command<T> {
-  public async run(options: T) {
+export class DocCommand extends Command<DocCommandSchema> {
+  public async run(options: DocCommandSchema & Arguments) {
     let searchUrl = `https://angular.io/api?query=${options.keyword}`;
     if (options.search) {
       searchUrl = `https://www.google.com/search?q=site%3Aangular.io+${options.keyword}`;
diff --git a/packages/angular/cli/commands/doc.json b/packages/angular/cli/commands/doc.json
index e3649a987960..cabe8f10209d 100644
--- a/packages/angular/cli/commands/doc.json
+++ b/packages/angular/cli/commands/doc.json
@@ -9,22 +9,27 @@
   "$impl": "./doc-impl#DocCommand",
 
   "type": "object",
-  "properties": {
-    "keyword": {
-      "type": "string",
-      "description": "The query to search upon.",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      }
+  "allOf": [
+    {
+      "properties": {
+        "keyword": {
+          "type": "string",
+          "description": "The query to search upon.",
+          "$default": {
+            "$source": "argv",
+            "index": 0
+          }
+        },
+        "search": {
+          "aliases": ["s"],
+          "type": "boolean",
+          "default": false,
+          "description": "Search whole angular.io instead of just api."
+        }
+      },
+      "required": [
+      ]
     },
-    "search": {
-      "aliases": ["s"],
-      "type": "boolean",
-      "default": false,
-      "description": "Search whole angular.io instead of just api."
-    }
-  },
-  "required": [
+    { "$ref": "./definitions.json#/definitions/base" }
   ]
 }
diff --git a/packages/angular/cli/commands/e2e-impl.ts b/packages/angular/cli/commands/e2e-impl.ts
index 43d187fe561b..f24a44ca4122 100644
--- a/packages/angular/cli/commands/e2e-impl.ts
+++ b/packages/angular/cli/commands/e2e-impl.ts
@@ -6,14 +6,16 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
+import { ArchitectCommand } from '../models/architect-command';
+import { Arguments } from '../models/interface';
+import { Schema as E2eCommandSchema } from './e2e';
 
 
-export class E2eCommand extends ArchitectCommand {
+export class E2eCommand extends ArchitectCommand<E2eCommandSchema> {
   public readonly target = 'e2e';
   public readonly multiTarget = true;
 
-  public async run(options: ArchitectCommandOptions) {
+  public async run(options: E2eCommandSchema & Arguments) {
     return this.runArchitectTarget(options);
   }
 }
diff --git a/packages/angular/cli/commands/easter-egg-impl.ts b/packages/angular/cli/commands/easter-egg-impl.ts
index 197bf9e675f4..e6cd9ee3eb45 100644
--- a/packages/angular/cli/commands/easter-egg-impl.ts
+++ b/packages/angular/cli/commands/easter-egg-impl.ts
@@ -8,12 +8,13 @@
 
 import { terminal } from '@angular-devkit/core';
 import { Command } from '../models/command';
+import { Schema as AwesomeCommandSchema } from './easter-egg';
 
 function pickOne(of: string[]): string {
   return of[Math.floor(Math.random() * of.length)];
 }
 
-export class AwesomeCommand extends Command {
+export class AwesomeCommand extends Command<AwesomeCommandSchema> {
   async run() {
     const phrase = pickOne([
       `You're on it, there's nothing for me to do!`,
diff --git a/packages/angular/cli/commands/easter-egg.json b/packages/angular/cli/commands/easter-egg.json
index 04e7afa1e45b..d0a7e94189e9 100644
--- a/packages/angular/cli/commands/easter-egg.json
+++ b/packages/angular/cli/commands/easter-egg.json
@@ -7,5 +7,8 @@
 
   "$impl": "./easter-egg-impl#AwesomeCommand",
 
-  "type": "object"
+  "type": "object",
+  "allOf": [
+    { "$ref": "./definitions.json#/definitions/base" }
+  ]
 }
diff --git a/packages/angular/cli/commands/eject-impl.ts b/packages/angular/cli/commands/eject-impl.ts
index cdfe324e2231..47fe394cc0fc 100644
--- a/packages/angular/cli/commands/eject-impl.ts
+++ b/packages/angular/cli/commands/eject-impl.ts
@@ -8,9 +8,9 @@
 
 import { tags } from '@angular-devkit/core';
 import { Command } from '../models/command';
+import { Schema as EjectCommandSchema } from './eject';
 
-
-export class EjectCommand extends Command {
+export class EjectCommand extends Command<EjectCommandSchema> {
   async run() {
     this.logger.error(tags.stripIndents`
       The 'eject' command has been temporarily disabled, as it is not yet compatible with the new
diff --git a/packages/angular/cli/commands/generate-impl.ts b/packages/angular/cli/commands/generate-impl.ts
index d4c65730e210..b7df4f1d81a5 100644
--- a/packages/angular/cli/commands/generate-impl.ts
+++ b/packages/angular/cli/commands/generate-impl.ts
@@ -8,18 +8,13 @@
 
 // tslint:disable:no-global-tslint-disable no-any
 import { terminal } from '@angular-devkit/core';
-import { Option } from '../models/interface';
-import { BaseSchematicOptions, SchematicCommand } from '../models/schematic-command';
+import { Arguments, Option } from '../models/interface';
+import { SchematicCommand } from '../models/schematic-command';
 import { parseJsonSchemaToOptions } from '../utilities/json-schema';
+import { Schema as GenerateCommandSchema } from './generate';
 
-export interface GenerateCommandOptions extends BaseSchematicOptions {
-  schematic?: string;
-}
-
-export class GenerateCommand<
-  T extends GenerateCommandOptions = GenerateCommandOptions,
-> extends SchematicCommand<T> {
-  async initialize(options: T) {
+export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
+  async initialize(options: GenerateCommandSchema & Arguments) {
     await super.initialize(options);
 
     // Fill up the schematics property of the command description.
@@ -50,7 +45,7 @@ export class GenerateCommand<
     });
   }
 
-  public async run(options: T) {
+  public async run(options: GenerateCommandSchema & Arguments) {
     const [collectionName, schematicName] = this.parseSchematicInfo(options);
 
     if (!schematicName || !collectionName) {
@@ -81,7 +76,7 @@ export class GenerateCommand<
     return [collectionName, schematicName];
   }
 
-  public async printHelp(options: T) {
+  public async printHelp(options: GenerateCommandSchema & Arguments) {
     await super.printHelp(options);
 
     this.logger.info('');
diff --git a/packages/angular/cli/commands/help-impl.ts b/packages/angular/cli/commands/help-impl.ts
index a117a19fd209..7bab545922e4 100644
--- a/packages/angular/cli/commands/help-impl.ts
+++ b/packages/angular/cli/commands/help-impl.ts
@@ -7,8 +7,9 @@
  */
 import { terminal } from '@angular-devkit/core';
 import { Command } from '../models/command';
+import { Schema as HelpCommandSchema } from './help';
 
-export class HelpCommand extends Command {
+export class HelpCommand extends Command<HelpCommandSchema> {
   async run() {
     this.logger.info(`Available Commands:`);
 
diff --git a/packages/angular/cli/commands/help.json b/packages/angular/cli/commands/help.json
index 51c7adc53398..e7aeda0ba9e4 100644
--- a/packages/angular/cli/commands/help.json
+++ b/packages/angular/cli/commands/help.json
@@ -8,5 +8,8 @@
   "$aliases": [],
   "$impl": "./help-impl#HelpCommand",
 
-  "type": "object"
+  "type": "object",
+  "allOf": [
+    { "$ref": "./definitions.json#/definitions/base" }
+  ]
 }
diff --git a/packages/angular/cli/commands/lint-impl.ts b/packages/angular/cli/commands/lint-impl.ts
index ad07ddfee80e..bf35c053a966 100644
--- a/packages/angular/cli/commands/lint-impl.ts
+++ b/packages/angular/cli/commands/lint-impl.ts
@@ -7,13 +7,14 @@
  */
 
 import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
+import { Arguments } from '../models/interface';
+import { Schema as LintCommandSchema } from './lint';
 
-
-export class LintCommand extends ArchitectCommand {
+export class LintCommand extends ArchitectCommand<LintCommandSchema> {
   public readonly target = 'lint';
   public readonly multiTarget = true;
 
-  public async run(options: ArchitectCommandOptions) {
+  public async run(options: ArchitectCommandOptions & Arguments) {
     return this.runArchitectTarget(options);
   }
 }
diff --git a/packages/angular/cli/commands/new-impl.ts b/packages/angular/cli/commands/new-impl.ts
index 94ae330611eb..368d0c280584 100644
--- a/packages/angular/cli/commands/new-impl.ts
+++ b/packages/angular/cli/commands/new-impl.ts
@@ -7,19 +7,16 @@
  */
 
 // tslint:disable:no-global-tslint-disable no-any
-import { BaseSchematicOptions, SchematicCommand } from '../models/schematic-command';
-
-export interface NewCommandOptions extends BaseSchematicOptions {
-  skipGit?: boolean;
-  collection?: string;
-}
+import { Arguments } from '../models/interface';
+import { SchematicCommand } from '../models/schematic-command';
+import { Schema as NewCommandSchema } from './new';
 
 
-export class NewCommand extends SchematicCommand {
+export class NewCommand extends SchematicCommand<NewCommandSchema> {
   public readonly allowMissingWorkspace = true;
   private schematicName = 'ng-new';
 
-  public async run(options: NewCommandOptions) {
+  public async run(options: NewCommandSchema & Arguments) {
     if (options.dryRun) {
       options.skipGit = true;
     }
@@ -41,9 +38,9 @@ export class NewCommand extends SchematicCommand {
       collectionName: collectionName,
       schematicName: this.schematicName,
       schematicOptions: options['--'] || [],
-      debug: options.debug,
-      dryRun: options.dryRun,
-      force: options.force,
+      debug: !!options.debug,
+      dryRun: !!options.dryRun,
+      force: !!options.force,
     });
   }
 
diff --git a/packages/angular/cli/commands/run-impl.ts b/packages/angular/cli/commands/run-impl.ts
index ac98d3118486..feefe731fa5b 100644
--- a/packages/angular/cli/commands/run-impl.ts
+++ b/packages/angular/cli/commands/run-impl.ts
@@ -7,10 +7,11 @@
  */
 
 import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
+import { Arguments } from '../models/interface';
+import { Schema as RunCommandSchema } from './run';
 
-
-export class RunCommand extends ArchitectCommand {
-  public async run(options: ArchitectCommandOptions) {
+export class RunCommand extends ArchitectCommand<RunCommandSchema> {
+  public async run(options: ArchitectCommandOptions & Arguments) {
     if (options.target) {
       return this.runArchitectTarget(options);
     } else {
diff --git a/packages/angular/cli/commands/serve-impl.ts b/packages/angular/cli/commands/serve-impl.ts
index 1e9175c00497..ba365974e310 100644
--- a/packages/angular/cli/commands/serve-impl.ts
+++ b/packages/angular/cli/commands/serve-impl.ts
@@ -7,13 +7,14 @@
  */
 
 import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
+import { Arguments } from '../models/interface';
 import { Version } from '../upgrade/version';
+import { Schema as ServeCommandSchema } from './serve';
 
-
-export class ServeCommand extends ArchitectCommand {
+export class ServeCommand extends ArchitectCommand<ServeCommandSchema> {
   public readonly target = 'serve';
 
-  public validate(_options: ArchitectCommandOptions) {
+  public validate(_options: ArchitectCommandOptions & Arguments) {
     // Check Angular and TypeScript versions.
     Version.assertCompatibleAngularVersion(this.workspace.root);
     Version.assertTypescriptVersion(this.workspace.root);
@@ -21,7 +22,7 @@ export class ServeCommand extends ArchitectCommand {
     return true;
   }
 
-  public async run(options: ArchitectCommandOptions) {
+  public async run(options: ArchitectCommandOptions & Arguments) {
     return this.runArchitectTarget(options);
   }
 }
diff --git a/packages/angular/cli/commands/test-impl.ts b/packages/angular/cli/commands/test-impl.ts
index 2692e811d3bb..28f09df4d7b2 100644
--- a/packages/angular/cli/commands/test-impl.ts
+++ b/packages/angular/cli/commands/test-impl.ts
@@ -7,12 +7,14 @@
  */
 
 import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
+import { Arguments } from '../models/interface';
+import { Schema as TestCommandSchema } from './test';
 
-export class TestCommand extends ArchitectCommand {
+export class TestCommand extends ArchitectCommand<TestCommandSchema> {
   public readonly target = 'test';
   public readonly multiTarget = true;
 
-  public async run(options: ArchitectCommandOptions) {
+  public async run(options: ArchitectCommandOptions & Arguments) {
     return this.runArchitectTarget(options);
   }
 }
diff --git a/packages/angular/cli/commands/update-impl.ts b/packages/angular/cli/commands/update-impl.ts
index 4dbe42cd67f6..4708d85cc068 100644
--- a/packages/angular/cli/commands/update-impl.ts
+++ b/packages/angular/cli/commands/update-impl.ts
@@ -7,31 +7,18 @@
  */
 import { normalize } from '@angular-devkit/core';
 import { Arguments, Option } from '../models/interface';
-import { BaseSchematicOptions, SchematicCommand } from '../models/schematic-command';
+import { SchematicCommand } from '../models/schematic-command';
 import { findUp } from '../utilities/find-up';
 import { parseJsonSchemaToOptions } from '../utilities/json-schema';
+import { Schema as UpdateCommandSchema } from './update';
 
-export interface UpdateOptions extends BaseSchematicOptions {
-  next: boolean;
-  schematic?: boolean;
-  dryRun: boolean;
-  force: boolean;
-}
-
-type UpdateSchematicOptions = Arguments & {
-  migrateOnly?: boolean;
-  from?: string;
-  packages?: string | string[];
-};
-
-
-export class UpdateCommand<T extends UpdateOptions = UpdateOptions> extends SchematicCommand<T> {
+export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
   public readonly allowMissingWorkspace = true;
 
   private collectionName = '@schematics/update';
   private schematicName = 'update';
 
-  async initialize(input: T) {
+  async initialize(input: UpdateCommandSchema & Arguments) {
     await super.initialize(input);
 
     // Set the options.
@@ -46,7 +33,7 @@ export class UpdateCommand<T extends UpdateOptions = UpdateOptions> extends Sche
   }
 
   async parseArguments(schematicOptions: string[], schema: Option[]): Promise<Arguments> {
-    const args = await super.parseArguments(schematicOptions, schema) as UpdateSchematicOptions;
+    const args = await super.parseArguments(schematicOptions, schema);
     const maybeArgsLeftovers = args['--'];
 
     if (maybeArgsLeftovers
@@ -77,7 +64,7 @@ export class UpdateCommand<T extends UpdateOptions = UpdateOptions> extends Sche
     return args;
   }
 
-  async run(options: UpdateOptions) {
+  async run(options: UpdateCommandSchema & Arguments) {
     return this.runSchematic({
       collectionName: this.collectionName,
       schematicName: this.schematicName,
diff --git a/packages/angular/cli/commands/update.json b/packages/angular/cli/commands/update.json
index 0f179aa44cd8..9c53d613de6d 100644
--- a/packages/angular/cli/commands/update.json
+++ b/packages/angular/cli/commands/update.json
@@ -15,6 +15,9 @@
       "properties": {
         "packages": {
           "type": "array",
+          "items": {
+            "type": "string"
+          },
           "description": "The names of package(s) to update",
           "$default": {
             "$source": "argv"
diff --git a/packages/angular/cli/commands/version-impl.ts b/packages/angular/cli/commands/version-impl.ts
index 1b0367d1e18a..5f357396e25b 100644
--- a/packages/angular/cli/commands/version-impl.ts
+++ b/packages/angular/cli/commands/version-impl.ts
@@ -12,9 +12,9 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { Command } from '../models/command';
 import { findUp } from '../utilities/find-up';
+import { Schema as VersionCommandSchema } from './version';
 
-
-export class VersionCommand extends Command {
+export class VersionCommand extends Command<VersionCommandSchema> {
   public static aliases = ['v'];
 
   async run() {
diff --git a/packages/angular/cli/commands/version.json b/packages/angular/cli/commands/version.json
index 66ff3c3aa364..795eb654b7a5 100644
--- a/packages/angular/cli/commands/version.json
+++ b/packages/angular/cli/commands/version.json
@@ -8,5 +8,8 @@
   "$scope": "all",
   "$impl": "./version-impl#VersionCommand",
 
-  "type": "object"
+  "type": "object",
+  "allOf": [
+    { "$ref": "./definitions.json#/definitions/base" }
+  ]
 }
diff --git a/packages/angular/cli/commands/xi18n-impl.ts b/packages/angular/cli/commands/xi18n-impl.ts
index 39c5c3368fcd..59e191dd5259 100644
--- a/packages/angular/cli/commands/xi18n-impl.ts
+++ b/packages/angular/cli/commands/xi18n-impl.ts
@@ -6,14 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
+import { ArchitectCommand } from '../models/architect-command';
+import { Arguments } from '../models/interface';
+import { Schema as Xi18nCommandSchema } from './xi18n';
 
-
-export class Xi18nCommand extends ArchitectCommand {
+export class Xi18nCommand extends ArchitectCommand<Xi18nCommandSchema> {
   public readonly target = 'extract-i18n';
   public readonly multiTarget: true;
 
-  public async run(options: ArchitectCommandOptions) {
+  public async run(options: Xi18nCommandSchema & Arguments) {
     return this.runArchitectTarget(options);
   }
 }
diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index 981bb8602e42..dc02c8bb020f 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -17,17 +17,20 @@ import { from } from 'rxjs';
 import { concatMap, map, tap, toArray } from 'rxjs/operators';
 import { parseJsonSchemaToOptions } from '../utilities/json-schema';
 import { BaseCommandOptions, Command } from './command';
+import { Arguments } from './interface';
 import { parseArguments } from './parser';
 import { WorkspaceLoader } from './workspace-loader';
 
 export interface ArchitectCommandOptions extends BaseCommandOptions {
   project?: string;
   configuration?: string;
-  prod: boolean;
+  prod?: boolean;
   target?: string;
 }
 
-export abstract class ArchitectCommand extends Command<ArchitectCommandOptions> {
+export abstract class ArchitectCommand<
+  T extends ArchitectCommandOptions = ArchitectCommandOptions,
+> extends Command<ArchitectCommandOptions> {
   private _host = new NodeJsSyncHost();
   protected _architect: Architect;
   protected _workspace: experimental.workspace.Workspace;
@@ -40,7 +43,7 @@ export abstract class ArchitectCommand extends Command<ArchitectCommandOptions>
 
   target: string | undefined;
 
-  public async initialize(options: ArchitectCommandOptions): Promise<void> {
+  public async initialize(options: ArchitectCommandOptions & Arguments): Promise<void> {
     await super.initialize(options);
 
     this._registry = new json.schema.CoreSchemaRegistry();
@@ -120,11 +123,13 @@ export abstract class ArchitectCommand extends Command<ArchitectCommandOptions>
     }
   }
 
-  async run(options: ArchitectCommandOptions) {
+  async run(options: ArchitectCommandOptions & Arguments) {
     return await this.runArchitectTarget(options);
   }
 
-  protected async runArchitectTarget(options: ArchitectCommandOptions): Promise<number> {
+  protected async runArchitectTarget(
+    options: ArchitectCommandOptions & Arguments,
+  ): Promise<number> {
     const runSingleTarget = async (targetSpec: TargetSpecifier) => {
       // We need to build the builderSpec twice because architect does not understand
       // overrides separately (getting the configuration builds the whole project, including
diff --git a/packages/angular/cli/models/command.ts b/packages/angular/cli/models/command.ts
index b7c2cd1d0874..4202d8bd4c6a 100644
--- a/packages/angular/cli/models/command.ts
+++ b/packages/angular/cli/models/command.ts
@@ -19,7 +19,7 @@ import {
   Option,
 } from './interface';
 
-export interface BaseCommandOptions extends Arguments {
+export interface BaseCommandOptions {
   help?: boolean;
   helpJson?: boolean;
 }
@@ -41,18 +41,18 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
     this.workspace = context.workspace;
   }
 
-  async initialize(options: T): Promise<void> {
+  async initialize(options: T & Arguments): Promise<void> {
     return;
   }
 
-  async printHelp(options: T): Promise<number> {
+  async printHelp(options: T & Arguments): Promise<number> {
     await this.printHelpUsage();
     await this.printHelpOptions();
 
     return 0;
   }
 
-  async printJsonHelp(_options: T): Promise<number> {
+  async printJsonHelp(_options: T & Arguments): Promise<number> {
     this.logger.info(JSON.stringify(this.description));
 
     return 0;
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index 60e3b56af9f2..4484d5797bb0 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -50,22 +50,19 @@ import { BaseCommandOptions, Command } from './command';
 import { Arguments, CommandContext, CommandDescription, Option } from './interface';
 import { parseArguments, parseFreeFormArguments } from './parser';
 
-export interface BaseSchematicOptions extends BaseCommandOptions {
+
+export interface BaseSchematicSchema {
   debug?: boolean;
   dryRun?: boolean;
   force?: boolean;
   interactive?: boolean;
 }
 
-export interface RunSchematicOptions {
+export interface RunSchematicOptions extends BaseSchematicSchema {
   collectionName: string;
   schematicName: string;
 
   schematicOptions?: string[];
-
-  debug?: boolean;
-  dryRun?: boolean;
-  force?: boolean;
   showNothingDone?: boolean;
 }
 
@@ -77,7 +74,7 @@ export class UnknownCollectionError extends Error {
 }
 
 export abstract class SchematicCommand<
-  T extends BaseSchematicOptions = BaseSchematicOptions,
+  T extends (BaseSchematicSchema & BaseCommandOptions),
 > extends Command<T> {
   readonly allowPrivateSchematics: boolean = false;
   private _host = new NodeJsSyncHost();
@@ -95,12 +92,12 @@ export abstract class SchematicCommand<
     this._engine = new SchematicEngine(this._engineHost);
   }
 
-  public async initialize(options: T) {
+  public async initialize(options: T & Arguments) {
     this._loadWorkspace();
     this.createWorkflow(options);
   }
 
-  public async printHelp(options: T) {
+  public async printHelp(options: T & Arguments) {
     await super.printHelp(options);
     this.logger.info('');
 
@@ -216,12 +213,12 @@ export abstract class SchematicCommand<
   /*
    * Runtime hook to allow specifying customized workflow
    */
-  protected createWorkflow(options: BaseSchematicOptions): workflow.BaseWorkflow {
+  protected createWorkflow(options: BaseSchematicSchema): workflow.BaseWorkflow {
     if (this._workflow) {
       return this._workflow;
     }
 
-    const {force, dryRun} = options;
+    const { force, dryRun } = options;
     const fsHost = new virtualFs.ScopedHost(new NodeJsSyncHost(), normalize(this.workspace.root));
 
     const workflow = new NodeWorkflow(

From c63b4d8d2bdc4c8f24bc3aa29ed78bcb29274842 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 11 Sep 2018 19:03:48 -0700
Subject: [PATCH 0116/1703] ci: disable bazel in devkit-admin build

Replace the build step with a custom JSON schema output parallel to
bazel.
---
 .gitignore                |   1 +
 scripts/build.ts          |  58 +++++++++++++++++++---
 scripts/publish.ts        |   4 +-
 scripts/snapshots.ts      |   4 +-
 tools/quicktype_runner.js | 101 ++++++++++++++++++++------------------
 tools/ts_json_schema.bzl  |   7 ++-
 tsconfig.json             |   1 +
 7 files changed, 115 insertions(+), 61 deletions(-)

diff --git a/.gitignore b/.gitignore
index e6c63302db9c..88895c7481f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 bazel-*
 test-project-host-*
 dist/
+dist-schema/
 
 # IDEs
 .idea/
diff --git a/scripts/build.ts b/scripts/build.ts
index f40f3dbd70ae..df1c75b23fdd 100644
--- a/scripts/build.ts
+++ b/scripts/build.ts
@@ -34,7 +34,9 @@ function _mkdirp(p: string) {
   if (!fs.existsSync(path.dirname(p))) {
     _mkdirp(path.dirname(p));
   }
-  fs.mkdirSync(p);
+  if (!fs.existsSync(p)) {
+    fs.mkdirSync(p);
+  }
 }
 
 function _recursiveFileList(p: string): string[] {
@@ -186,21 +188,61 @@ function _exec(command: string, args: string[], opts: { cwd?: string }, logger:
 
 function _build(logger: logging.Logger) {
   logger.info('Building...');
-  _exec('node_modules/.bin/tsc', ['-p', 'tsconfig.json'], {}, logger);
+  _exec('node', [
+    require.resolve('typescript/bin/tsc'),
+    '-p',
+    'tsconfig.json',
+  ], {}, logger);
 }
 
 
-function _bazel(logger: logging.Logger) {
-  logger.info('Bazel build...');
-  _exec('bazel', ['build', '//packages/...'], {}, logger);
+async function _bazel(logger: logging.Logger) {
+  // TODO: undo this when we fully support bazel on windows.
+  // logger.info('Bazel build...');
+  // _exec('bazel', ['build', '//packages/...'], {}, logger);
+
+  const allJsonFiles = glob.sync('packages/**/*.json', {
+    ignore: [
+      '**/node_modules/**',
+      '**/files/**',
+      '**/*-files/**',
+      '**/package.json',
+    ],
+  });
+
+  const quicktypeRunner = require('../tools/quicktype_runner');
+  logger.info('Generating JSON Schema....');
+
+  for (const fileName of allJsonFiles) {
+    if (fs.existsSync(fileName.replace(/\.json$/, '.ts'))
+        || fs.existsSync(fileName.replace(/\.json$/, '.d.ts'))) {
+      // Skip files that already exist.
+      continue;
+    }
+    const content = fs.readFileSync(fileName, 'utf-8');
+
+    const json = JSON.parse(content);
+    if (!json.$schema) {
+      // Skip non-schema files.
+      continue;
+    }
+    const tsContent = await quicktypeRunner.generate(fileName);
+    const tsPath = path.join(__dirname, '../dist-schema', fileName.replace(/\.json$/, '.ts'));
+
+    _mkdirp(path.dirname(tsPath));
+    fs.writeFileSync(tsPath, tsContent, 'utf-8');
+  }
 }
 
 
-export default function(argv: { local?: boolean, snapshot?: boolean }, logger: logging.Logger) {
+export default async function(
+  argv: { local?: boolean, snapshot?: boolean },
+  logger: logging.Logger,
+) {
   _clean(logger);
 
   const sortedPackages = _sortPackages();
-  _bazel(logger);
+  await _bazel(logger);
   _build(logger);
 
   logger.info('Moving packages to dist/');
@@ -216,7 +258,7 @@ export default function(argv: { local?: boolean, snapshot?: boolean }, logger: l
   for (const packageName of sortedPackages) {
     const pkg = packages[packageName];
     const bazelBinPath = pkg.build.replace(/([\\\/]dist[\\\/])(packages)/, (_, dist, packages) => {
-      return path.join(dist, 'bazel-bin', packages);
+      return path.join(dist, 'dist-schema', packages);
     });
     if (fs.existsSync(bazelBinPath)) {
       packageLogger.info(packageName);
diff --git a/scripts/publish.ts b/scripts/publish.ts
index a908b20fee48..f166824b1a4b 100644
--- a/scripts/publish.ts
+++ b/scripts/publish.ts
@@ -29,9 +29,9 @@ function _exec(command: string, args: string[], opts: { cwd?: string }, logger:
 }
 
 
-export default function (args: { tag?: string }, logger: logging.Logger) {
+export default async function (args: { tag?: string }, logger: logging.Logger) {
   logger.info('Building...');
-  build({}, logger.createChild('build'));
+  await build({}, logger.createChild('build'));
 
   return Object.keys(packages).reduce((acc: Promise<void>, name: string) => {
     const pkg = packages[name];
diff --git a/scripts/snapshots.ts b/scripts/snapshots.ts
index 22bd61abe03f..d288fb4bfc39 100644
--- a/scripts/snapshots.ts
+++ b/scripts/snapshots.ts
@@ -53,7 +53,7 @@ export interface SnapshotsOptions {
   githubToken?: string;
 }
 
-export default function(opts: SnapshotsOptions, logger: logging.Logger) {
+export default async function(opts: SnapshotsOptions, logger: logging.Logger) {
   // Get the SHA.
   if (execSync(`git status --porcelain`).toString() && !opts.force) {
     logger.error('You cannot run snapshots with local changes.');
@@ -78,7 +78,7 @@ export default function(opts: SnapshotsOptions, logger: logging.Logger) {
 
   // Run build.
   logger.info('Building...');
-  build({ snapshot: true }, logger.createChild('build'));
+  await build({ snapshot: true }, logger.createChild('build'));
 
   for (const packageName of Object.keys(packages)) {
     const pkg = packages[packageName];
diff --git a/tools/quicktype_runner.js b/tools/quicktype_runner.js
index 9d09fe3db2ee..65c6501536f2 100644
--- a/tools/quicktype_runner.js
+++ b/tools/quicktype_runner.js
@@ -5,39 +5,41 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
- /**
-  * This file is pure JavaScript because we want to avoid any dependency or build step
-  * to it. It's just simple (and zen-ier).
-  *
-  * This file wraps around quicktype and can do one of two things;
-  * 
-  * `node quicktype_runner.js <in_path> <out_path>`
-  *   Reads the in path and outputs the TS file at the out_path.
-  * 
-  * Using `-` as the out_path will output on STDOUT instead of a file.
-  */
-
-// Imports.
 const fs = require('fs');
 const path = require('path');
-const qtCore = require('quicktype-core');
-const tempRoot = process.env['BAZEL_TMPDIR'] || require('os').tmpdir();
+const {
+  InputData,
+  JSONSchema,
+  JSONSchemaInput,
+  JSONSchemaStore,
+  TypeScriptTargetLanguage,
+  parseJSON,
+  quicktype,
+} = require('quicktype-core');
 
-// Header to add to all files.
-const header = `
 /**
- * @license
- * Copyright Google Inc. All Rights Reserved.
+ * This file is pure JavaScript because Bazel only support compiling to ES5, while quicktype is
+ * ES2015. This results in an incompatible call to `super()` in the FetchingJSONSchemaStore
+ * class as it tries to call JSONSchemaStore's constructor in ES5.
+ * TODO: move this file to typescript when Bazel supports ES2015 output.
  *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
+ * This file wraps around quicktype and can do one of two things;
+ *
+ * `node quicktype_runner.js <in_path> <out_path>`
+ *   Reads the in path and outputs the TS file at the out_path.
+ *
+ * Using `-` as the out_path will output on STDOUT instead of a file.
  */
 
- // THIS FILE IS AUTOMATICALLY GENERATED IN BAZEL. TO UPDATE THIS FILE YOU NEED TO CHANGE THE
- // CORRESPONDING JSON SCHEMA FILE, THEN RUN BAZEL.
+// Header to add to all files.
+const header = `
+// THIS FILE IS AUTOMATICALLY GENERATED. TO UPDATE THIS FILE YOU NEED TO CHANGE THE
+// CORRESPONDING JSON SCHEMA FILE, THEN RUN devkit-admin build (or bazel build ...).
+
+// tslint:disable:no-global-tslint-disable
+// tslint:disable
 
-`.replace(/^\n/m, '');  // Remove the first \n, it's in the constant because formatting is 👍.
+`;
 
 // Footer to add to all files.
 const footer = ``;
@@ -46,7 +48,7 @@ const footer = ``;
  * The simplest Node JSONSchemaStore implementation we can build which supports our custom protocol.
  * Supports reading from ng-cli addresses, valid URLs and files (absolute).
  */
-class FetchingJSONSchemaStore extends qtCore.JSONSchemaStore {
+class FetchingJSONSchemaStore extends JSONSchemaStore {
   constructor(inPath) {
     super();
     this._inPath = inPath;
@@ -83,10 +85,10 @@ class FetchingJSONSchemaStore extends qtCore.JSONSchemaStore {
     }
 
     if (content == null) {
-      throw new Error(`Address ${JSON.stringify(address)} cannot be resolved.`);
+      return undefined;
     }
 
-    return qtCore.parseJSON(content, "JSON Schema", address);
+    return parseJSON(content, "JSON Schema", address);
   }
 }
 
@@ -113,40 +115,43 @@ async function main(inPath, outPath) {
 async function generate(inPath) {
   // Best description of how to use the API was found at
   //   https://blog.quicktype.io/customizing-quicktype/
-  const inputData = new qtCore.InputData();
+  const inputData = new InputData();
   const source = { name: 'Schema', schema: fs.readFileSync(inPath, 'utf-8') };
 
   await inputData.addSource('schema', source, () => {
-    return new qtCore.JSONSchemaInput(new FetchingJSONSchemaStore(inPath));
+    return new JSONSchemaInput(new FetchingJSONSchemaStore(inPath));
   });
 
-  const lang = new qtCore.TypeScriptTargetLanguage();
+  const lang = new TypeScriptTargetLanguage();
 
-  const { lines } = await qtCore.quicktype({
+  const { lines } = await quicktype({
     lang,
     inputData,
     alphabetizeProperties: true,
-    src: [inPath],
     rendererOptions: {
-      'just-types': true,
-      'explicit-unions': true,
-    }
+      'just-types': 'true',
+      'explicit-unions': 'true',
+    },
   });
 
   return header + lines.join('\n') + footer;
 }
 
-// Parse arguments and run main().
-const argv = process.argv.slice(2);
-if (argv.length < 2 || argv.length > 3) {
-  console.error('Must include 2 or 3 arguments.');
-  process.exit(1);
+if (require.main === module) {
+  // Parse arguments and run main().
+  const argv = process.argv.slice(2);
+  if (argv.length < 2 || argv.length > 3) {
+    console.error('Must include 2 or 3 arguments.');
+    process.exit(1);
+  }
+
+  main(argv[0], argv[1])
+    .then(() => process.exit(0))
+    .catch(err => {
+      console.error('An error happened:');
+      console.error(err);
+      process.exit(127);
+    });
 }
 
-main(...argv)
-  .then(() => process.exit(0))
-  .catch(err => {
-    console.error('An error happened:');
-    console.error(err);
-    process.exit(127);
-  });
+exports.generate = generate;
diff --git a/tools/ts_json_schema.bzl b/tools/ts_json_schema.bzl
index b3771472b35b..9223d1eef898 100644
--- a/tools/ts_json_schema.bzl
+++ b/tools/ts_json_schema.bzl
@@ -52,7 +52,12 @@ _ts_json_schema_interface = rule(
 )
 
 
-def ts_json_schema(name, src, data = [], **kwargs):
+# Generates a library that contains the interface for a JSON Schema file. Takes a single `src`
+# argument as input, an optional data field for reference files, and produces a ts_library()
+# rule containing the typescript interface.
+# The file produced will have the same name, with the extension replaced from `.json` to `.ts`.
+# Any filename collision will be an error thrown by Bazel.
+def ts_json_schema(name, src, data = []):
     out = src.replace(".json", ".ts")
 
     _ts_json_schema_interface(
diff --git a/tsconfig.json b/tsconfig.json
index a2b446565caf..236b0f857ec2 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -29,6 +29,7 @@
     "baseUrl": "",
     "rootDirs": [
       ".",
+      "./dist-schema/",
       "./bazel-bin/"
     ],
     "typeRoots": [

From c594a6c098c5bf7632d5922d2f549e69c59b7838 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@umich.edu>
Date: Thu, 13 Sep 2018 22:13:34 -0700
Subject: [PATCH 0117/1703] release: v7.0.0-beta.3

---
 .monorepo.json                                | 71 ++++++++++---------
 .../angular/utility/latest-versions.ts        |  2 +-
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index 2f1f149079ca..abe0532d30da 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,12 +42,12 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.9.0-beta.2",
-      "hash": "2bee2bd5743e4b92e00d80e814e1e198"
+      "version": "0.9.0-beta.3",
+      "hash": "89d01d5d739f85f3958ee7ab97a70dfc"
     },
     "devkit": {
-      "version": "0.9.0-beta.2",
-      "hash": "5ff7e89a837821d8a27bbbb9589ce99a"
+      "version": "0.9.0-beta.3",
+      "hash": "17c7ec54e4eacd1529df54229a3a0a63"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -58,15 +58,15 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md"
         }
       ],
-      "version": "7.0.0-beta.2",
+      "version": "7.0.0-beta.3",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "1942efc3e4abd875a42a98e339a71f8e"
+      "hash": "7fbaa8ae4d71df0a3c52180d9731b90c"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.9.0-beta.2",
-      "hash": "ebfe0eb9f64de6febfc057e218a3bcc7",
+      "version": "0.9.0-beta.3",
+      "hash": "dc58ab4cfcae409cdf525add81d5a5ac",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -77,20 +77,21 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.9.0-beta.2",
-      "hash": "1a23735009c97548867a15d5109f848b",
+      "version": "0.9.0-beta.3",
+      "hash": "a728543df72bed527bc935e2146f3272",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.9.0-beta.2",
-      "hash": "51b6cc55b25fce87f6a92f0d0942f79c",
+      "version": "0.9.0-beta.3",
+      "hash": "fd676e5fb4d0360adbc9722d1975f761",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
       "name": "Benchmark",
       "section": "Tooling",
-      "version": "0.0.0"
+      "version": "1.0.0-beta.0",
+      "hash": "97d40f3534277013d29487c508f18920"
     },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
@@ -100,8 +101,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.9.0-beta.2",
-      "hash": "531cd0937497ad5fcaedf1fd2175465f",
+      "version": "0.9.0-beta.3",
+      "hash": "20cfe51cc2405512d307c491119c3b6a",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -112,8 +113,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.9.0-beta.2",
-      "hash": "b5da16fb03baf13afb924f93aed2b049",
+      "version": "0.9.0-beta.3",
+      "hash": "9e0b767db359072b4e133347f26a6453",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -124,8 +125,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.9.0-beta.2",
-      "hash": "8fbc4c9495470a558d04d607e7859e83",
+      "version": "0.9.0-beta.3",
+      "hash": "90aab662520e17a515ff968ef291bdd0",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -136,9 +137,9 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.9.0-beta.2",
+      "version": "0.9.0-beta.3",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "1396832d856d84c4e89f93583765508b"
+      "hash": "52eb219419507760f231d222519fe828"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -148,8 +149,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "0.9.0-beta.2",
-      "hash": "67cdb97ba6bd67291c67c0d6842b493f",
+      "version": "0.9.0-beta.3",
+      "hash": "28145dec22ec7e1aaaa39da617c66ea8",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -160,43 +161,43 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "0.9.0-beta.2",
-      "hash": "bf74e6db102a901cae9d97dfd1d77ac1",
+      "version": "0.9.0-beta.3",
+      "hash": "46b193e3ba7925de3104ec9768de39b9",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.9.0-beta.2",
-      "hash": "9d56dfa44e57d77091d27e647fc09811",
+      "version": "0.9.0-beta.3",
+      "hash": "1e5ac88c25c9b8e31b2e22c73fd4a3ac",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "7.0.0-beta.2",
+      "version": "7.0.0-beta.3",
       "section": "Misc",
-      "hash": "c61a6900616048aad366f3381937bdd5",
+      "hash": "1be2344bf4913ab15dac30725cd58c2d",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "0.9.0-beta.2",
-      "hash": "d1cb9eb0d44cd9b52763abebf47c5913",
+      "version": "0.9.0-beta.3",
+      "hash": "012fa2eb3d2ac1342feeefdd1bae7af5",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.9.0-beta.2",
+      "version": "0.9.0-beta.3",
       "section": "Schematics",
-      "hash": "379aecd327b0c60b2751d7da0d0c1804",
+      "hash": "b29a0e96210093d79a69d64d99fbce78",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.9.0-beta.2",
+      "version": "0.9.0-beta.3",
       "section": "Schematics",
-      "hash": "badd6485b01883442e709560f28f7ddf",
+      "hash": "12fb5f26d29c0cb962a5a60e811d4b90",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 4aaab771f906..17f4736fa1df 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -8,7 +8,7 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~7.0.0-beta.0',
+  Angular: '~7.0.0-beta.5',
   RxJs: '~6.3.2',
   ZoneJs: '~0.8.26',
   TypeScript: '~3.0.1',

From b6793bd521708d2af818d2ad752903f1f0098a64 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Fri, 7 Sep 2018 10:17:55 +0100
Subject: [PATCH 0118/1703] build: use specific engines for built packages

---
 lib/packages.ts                                     | 8 ++++++++
 packages/angular/cli/package.json                   | 4 ----
 packages/angular_devkit/schematics_cli/package.json | 4 ----
 packages/ngtools/webpack/package.json               | 4 ----
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/lib/packages.ts b/lib/packages.ts
index 26eaed8dcf0d..ef9b82589ca7 100644
--- a/lib/packages.ts
+++ b/lib/packages.ts
@@ -114,6 +114,14 @@ function loadPackageJson(p: string) {
         pkg[key] = b;
         break;
 
+      // Overwrite engines to a common default.
+      case 'engines':
+        pkg['engines'] = {
+          'node': '>= 8.9.0',
+          'npm': '>= 5.5.1',
+        };
+        break;
+
       // Overwrite the package's key with to root one.
       default:
         pkg[key] = root[key];
diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 565ef646f384..6b3ed6a16143 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -19,10 +19,6 @@
     "type": "git",
     "url": "https://github.com/angular/angular-cli.git"
   },
-  "engines": {
-    "node": ">= 8.9.0",
-    "npm": ">= 5.5.1"
-  },
   "author": "Angular Authors",
   "license": "MIT",
   "bugs": {
diff --git a/packages/angular_devkit/schematics_cli/package.json b/packages/angular_devkit/schematics_cli/package.json
index b434d52c8adb..8a27cb589f3b 100644
--- a/packages/angular_devkit/schematics_cli/package.json
+++ b/packages/angular_devkit/schematics_cli/package.json
@@ -13,10 +13,6 @@
     "code generation",
     "schematics"
   ],
-  "engines": {
-    "node": ">= 8.9.0",
-    "npm": ">= 5.5.1"
-  },
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 4d33694cf939..2d0ddfed3aec 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -20,10 +20,6 @@
     "url": "https://github.com/angular/angular-cli/issues"
   },
   "homepage": "https://github.com/angular/angular-cli/tree/master/packages/@ngtools/webpack",
-  "engines": {
-    "node": ">= 8.9.0",
-    "npm": ">= 5.5.1"
-  },
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
     "rxjs": "6.2.2",

From 4f9dcd309c2a0d840ee235b1ba765b34df023c90 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Fri, 14 Sep 2018 14:36:54 +0100
Subject: [PATCH 0119/1703] build: update pidusage

Fixes https://github.com/angular/angular-cli/pull/12022#issuecomment-417278408
---
 packages/angular_devkit/benchmark/package.json | 2 +-
 yarn.lock                                      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/benchmark/package.json b/packages/angular_devkit/benchmark/package.json
index a65131ac623b..0763f807fd36 100644
--- a/packages/angular_devkit/benchmark/package.json
+++ b/packages/angular_devkit/benchmark/package.json
@@ -16,7 +16,7 @@
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
     "minimist": "^1.2.0",
-    "pidusage": "^2.0.16",
+    "pidusage": "^2.0.17",
     "pidtree": "^0.3.0",
     "rxjs": "~6.2.0",
     "tree-kill": "^1.2.0"
diff --git a/yarn.lock b/yarn.lock
index 99700269a1ea..7cdc64e6bf72 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5811,9 +5811,9 @@ pidtree@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.0.tgz#f6fada10fccc9f99bf50e90d0b23d72c9ebc2e6b"
 
-pidusage@^2.0.16:
-  version "2.0.16"
-  resolved "https://registry.yarnpkg.com/pidusage/-/pidusage-2.0.16.tgz#46e2e3185eaef253ef6303f766f7aae72f74f98c"
+pidusage@^2.0.17:
+  version "2.0.17"
+  resolved "https://registry.yarnpkg.com/pidusage/-/pidusage-2.0.17.tgz#6b4a2b4a09026f0e9828f7e5627837e4c0672581"
   dependencies:
     safe-buffer "^5.1.2"
 
@@ -7546,7 +7546,7 @@ tough-cookie@~2.4.3:
     psl "^1.1.24"
     punycode "^1.4.1"
 
-tree-kill@1.2.0:
+tree-kill@1.2.0, tree-kill@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36"
 

From d417fa90c8d847a3b7eb8030ababadaf614e38e0 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 11 Sep 2018 16:39:15 -0700
Subject: [PATCH 0120/1703] build: add create script to create a new project
 using local build

---
 bin/devkit-admin  |  4 +-
 scripts/create.ts | 96 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 scripts/create.ts

diff --git a/bin/devkit-admin b/bin/devkit-admin
index be8719fd60ca..45abb60cc659 100755
--- a/bin/devkit-admin
+++ b/bin/devkit-admin
@@ -25,6 +25,7 @@ const args = minimist(process.argv.slice(2), {
 const scriptName = args._.shift();
 const scriptPath = path.join('../scripts', scriptName);
 
+const cwd = process.cwd();
 process.chdir(path.join(__dirname, '..'));
 
 
@@ -64,7 +65,7 @@ try {
 
 try {
   Promise.resolve()
-    .then(() => require(scriptPath).default(args, logger))
+    .then(() => require(scriptPath).default(args, logger, cwd))
     .then(exitCode => process.exit(exitCode || 0))
     .catch(err => {
       logger.fatal(err.stack);
@@ -74,4 +75,3 @@ try {
   logger.fatal(err.stack);
   process.exit(99);
 }
-
diff --git a/scripts/create.ts b/scripts/create.ts
new file mode 100644
index 000000000000..a54a527ddc2b
--- /dev/null
+++ b/scripts/create.ts
@@ -0,0 +1,96 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// tslint:disable:no-implicit-dependencies
+import { logging } from '@angular-devkit/core';
+import cli from '@angular/cli/lib/cli';
+import * as child_process from 'child_process';
+import * as fs from 'fs';
+import * as path from 'path';
+import { packages } from '../lib/packages';
+import build from './build';
+
+export interface CreateOptions {
+  _: string[];
+}
+
+async function _ng(command: string, ...args: string[]) {
+  const exitCode = await cli({
+    cliArgs: [command, ...args],
+  });
+
+  if (exitCode !== 0) {
+    throw new Error('Could not call ng. See above for more details. Error code: ' + exitCode);
+  }
+}
+
+async function _exec(
+  command: string,
+  args: string[],
+  opts: { cwd?: string },
+  logger: logging.Logger,
+) {
+  const { status, error, stderr, stdout } = child_process.spawnSync(command, args, { ...opts });
+
+  if (status != 0) {
+    logger.error(`Command failed: ${command} ${args.map(x => JSON.stringify(x)).join(', ')}`);
+    if (error) {
+      logger.error('Error: ' + (error ? error.message : 'undefined'));
+    } else {
+      logger.error(`STDERR:\n${stderr}`);
+    }
+    throw error;
+  }
+
+  return { stdout };
+}
+
+
+export default async function(
+  args: CreateOptions,
+  logger: logging.Logger,
+  cwd: string,
+): Promise<number> {
+  const projectName = args._[0];
+
+  const oldCwd = process.cwd();
+  logger.info('Building...');
+  await build({ local: true }, logger.createChild('build'));
+
+  process.chdir(cwd);
+  logger.info('Creating project...');
+  await _ng('new', projectName, '--skip-install', '--skip-git', '--no-interactive');
+
+  logger.info('Updating package.json...');
+  const packageJsonPath = path.join(projectName, 'package.json');
+  const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
+
+  if (!packageJson['dependencies']) {
+    packageJson['dependencies'] = {};
+  }
+  if (!packageJson['devDependencies']) {
+    packageJson['devDependencies'] = {};
+  }
+
+  // Set the dependencies to the new build we just used.
+  for (const packageName of Object.keys(packages)) {
+    if (packageJson['dependencies'].hasOwnProperty(packageName)) {
+      packageJson['dependencies'][packageName] = packages[packageName].tar;
+    } else if (packageJson['devDependencies'].hasOwnProperty(packageName)) {
+      packageJson['devDependencies'][packageName] = packages[packageName].tar;
+    }
+  }
+
+  fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), 'utf-8');
+
+  logger.info('Installing npm packages...');
+  await _exec('npm', ['install'], { cwd: path.join(cwd, projectName) }, logger);
+
+  process.chdir(oldCwd);
+
+  return 0;
+}

From c2f9e0b4433f7d7cdc0997c6a1d14695d9616f11 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 11 Sep 2018 17:54:23 -0700
Subject: [PATCH 0121/1703] ci: generate and publish all commands help in JSON
 format

---
 scripts/snapshots.ts | 44 +++++++++++++++++++++++++++++++++++++-------
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/scripts/snapshots.ts b/scripts/snapshots.ts
index d288fb4bfc39..7c3f296ff424 100644
--- a/scripts/snapshots.ts
+++ b/scripts/snapshots.ts
@@ -13,6 +13,7 @@ import * as os from 'os';
 import * as path from 'path';
 import { packages } from '../lib/packages';
 import build from './build';
+import create from './create';
 
 
 function _copy(from: string, to: string) {
@@ -33,17 +34,17 @@ function _copy(from: string, to: string) {
 
 
 function _exec(command: string, args: string[], opts: { cwd?: string }, logger: logging.Logger) {
-  const { status, error, stderr } = spawnSync(command, args, { ...opts });
+  const { status, error, stdout } = spawnSync(command, args, {
+    stdio: ['ignore', 'pipe', 'inherit'],
+    ...opts,
+  });
 
   if (status != 0) {
     logger.error(`Command failed: ${command} ${args.map(x => JSON.stringify(x)).join(', ')}`);
-    if (error) {
-      logger.error('Error: ' + (error ? error.message : 'undefined'));
-    } else {
-      logger.error(`STDERR:\n${stderr}`);
-    }
     throw error;
   }
+
+  return stdout.toString('utf-8');
 }
 
 
@@ -69,17 +70,44 @@ export default async function(opts: SnapshotsOptions, logger: logging.Logger) {
     || ''
   ).trim();
 
-  logger.info('Setting up global git name.');
   if (githubToken) {
+    logger.info('Setting up global git name.');
     _exec('git', ['config', '--global', 'user.email', 'circleci@angular.io'], {}, logger);
     _exec('git', ['config', '--global', 'user.name', 'Angular Builds'], {}, logger);
     _exec('git', ['config', '--global', 'push.default', 'simple'], {}, logger);
   }
 
+  // Creating a new project and reading the help.
+  logger.info('Creating temporary project...');
+  const newProjectTempRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'angular-cli-create-'));
+  const newProjectName = 'help-project';
+  const newProjectRoot = path.join(newProjectTempRoot, newProjectName);
+  await create({ _: [newProjectName] }, logger.createChild('create'), newProjectTempRoot);
+
   // Run build.
   logger.info('Building...');
   await build({ snapshot: true }, logger.createChild('build'));
 
+  logger.info('Gathering JSON Help...');
+  const ngPath = path.join(newProjectRoot, 'node_modules/.bin/ng');
+  const helpOutputRoot = path.join(packages['@angular/cli'].dist, 'help');
+  fs.mkdirSync(helpOutputRoot);
+  const commands = require('../packages/angular/cli/commands.json');
+  for (const commandName of Object.keys(commands)) {
+    const options = { cwd: newProjectRoot };
+    const childLogger = logger.createChild(commandName);
+    const stdout = _exec(ngPath, [commandName, '--help-json'], options, childLogger);
+    if (stdout.trim()) {
+      fs.writeFileSync(path.join(helpOutputRoot, commandName + '.json'), stdout);
+    }
+  }
+
+  if (!githubToken) {
+    logger.info('No token given, skipping actual publishing...');
+
+    return 0;
+  }
+
   for (const packageName of Object.keys(packages)) {
     const pkg = packages[packageName];
 
@@ -119,4 +147,6 @@ export default async function(opts: SnapshotsOptions, logger: logging.Logger) {
     _exec('git', ['push', 'origin'], { cwd: destPath }, publishLogger);
     _exec('git', ['push', '--tags', 'origin'], { cwd: destPath }, publishLogger);
   }
+
+  return 0;
 }

From 84e4e8d7d85ebb6881b17e40c08863fd53e0f2bc Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 11 Sep 2018 17:54:56 -0700
Subject: [PATCH 0122/1703] fix(@angular/cli): run --help-json now returns a
 basic help

It was throwing an exception about some targets not being available.
---
 packages/angular/cli/models/architect-command.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index dc02c8bb020f..184dfc8d450a 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -93,6 +93,11 @@ export abstract class ArchitectCommand<
     }
 
     if ((!targetSpec.project || !targetSpec.target) && !this.multiTarget) {
+      if (options.help || options.helpJson) {
+        // This is a special case where we just return.
+        return;
+      }
+
       throw new Error('Cannot determine project or target for Architect command.');
     }
 

From ec41e6c8288cc582d9c91f2f2fde186226e51533 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Thu, 13 Sep 2018 16:04:28 -0700
Subject: [PATCH 0123/1703] fix(@angular/cli): chunk log so output is piped
 properly

Previously the output of some commands with long one-line log would not be
drained properly when piping it, causing it to be truncated.
---
 packages/angular/cli/lib/cli/index.ts | 28 ++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/lib/cli/index.ts b/packages/angular/cli/lib/cli/index.ts
index c38285ffdecd..7559bab0deb0 100644
--- a/packages/angular/cli/lib/cli/index.ts
+++ b/packages/angular/cli/lib/cli/index.ts
@@ -93,6 +93,32 @@ function initializeLogging(logger: logging.Logger) {
           break;
       }
 
-      output.write(color(entry.message) + '\n');
+      // If we do console.log(message) or process.stdout.write(message + '\n'), the process might
+      // stop before the whole message is written and the stream is flushed. This happens when
+      // streams are asynchronous.
+      //
+      // NodeJS IO streams are different depending on platform and usage. In POSIX environment,
+      // for example, they're asynchronous when writing to a pipe, but synchronous when writing
+      // to a TTY. In windows, it's the other way around. You can verify which is which with
+      // stream.isTTY and platform, but this is not good enough.
+      // In the async case, one should wait for the callback before sending more data or
+      // continuing the process. In our case it would be rather hard to do (but not impossible).
+      //
+      // Instead we take the easy way out and simply chunk the message and call the write
+      // function while the buffer drain itself asynchronously. With a smaller chunk size than
+      // the buffer, we are mostly certain that it works. In this case, the chunk has been picked
+      // as half a page size (4096/2 = 2048), minus some bytes for the color formatting.
+      // On POSIX it seems the buffer is 2 pages (8192), but just to be sure (could be different
+      // by platform).
+      //
+      // For more details, see https://nodejs.org/api/process.html#process_a_note_on_process_i_o
+      const chunkSize = 2000;  // Small chunk.
+      let message = entry.message;
+      while (message) {
+        const chunk = message.slice(0, chunkSize);
+        message = message.slice(chunkSize);
+        output.write(color(chunk));
+      }
+      output.write('\n');
     });
 }

From 3b5dbad5c8089d7e5830c08039bf8a56f7f63678 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Thu, 13 Sep 2018 16:05:09 -0700
Subject: [PATCH 0124/1703] feat(@angular/cli): sort schematics by name in
 --help-json

---
 packages/angular/cli/commands/generate-impl.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/angular/cli/commands/generate-impl.ts b/packages/angular/cli/commands/generate-impl.ts
index b7df4f1d81a5..f07cd398870c 100644
--- a/packages/angular/cli/commands/generate-impl.ts
+++ b/packages/angular/cli/commands/generate-impl.ts
@@ -24,6 +24,8 @@ export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
     this.description.suboptions = {};
 
     const schematicNames = schematicName ? [schematicName] : collection.listSchematicNames();
+    // Sort as a courtesy for the user.
+    schematicNames.sort();
 
     for (const name of schematicNames) {
       const schematic = this.getSchematic(collection, name, true);

From 06d332ba23e39f1800d140ba89283781e1ae87dc Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Thu, 13 Sep 2018 16:06:19 -0700
Subject: [PATCH 0125/1703] feat(@angular/cli): generate --helpJson will remove
 collection name

For the default collection.
---
 packages/angular/cli/commands/generate-impl.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/commands/generate-impl.ts b/packages/angular/cli/commands/generate-impl.ts
index f07cd398870c..a47dc270f83f 100644
--- a/packages/angular/cli/commands/generate-impl.ts
+++ b/packages/angular/cli/commands/generate-impl.ts
@@ -37,7 +37,11 @@ export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
         );
       }
 
-      this.description.suboptions[`${collectionName}:${name}`] = options;
+      if (this.getDefaultSchematicCollection() == collectionName) {
+        this.description.suboptions[name] = options;
+      } else {
+        this.description.suboptions[`${collectionName}:${name}`] = options;
+      }
     }
 
     this.description.options.forEach(option => {

From afa71a147119e758a57866f4892dd3e3c9ec9c95 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Thu, 13 Sep 2018 16:20:48 -0700
Subject: [PATCH 0126/1703] feat(@angular/cli): add help for ng-new schematics

Before it was missing because we need to load the schematics engine for it.
I moved the ng update logic that did this to SchematicCommand.
---
 packages/angular/cli/commands/new-impl.ts     |  6 +-----
 packages/angular/cli/commands/update-impl.ts  | 19 ++-----------------
 .../angular/cli/models/schematic-command.ts   | 19 +++++++++++++++++--
 packages/angular/cli/utilities/json-schema.ts |  3 +++
 4 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/packages/angular/cli/commands/new-impl.ts b/packages/angular/cli/commands/new-impl.ts
index 368d0c280584..10f5d6cee1d6 100644
--- a/packages/angular/cli/commands/new-impl.ts
+++ b/packages/angular/cli/commands/new-impl.ts
@@ -14,13 +14,9 @@ import { Schema as NewCommandSchema } from './new';
 
 export class NewCommand extends SchematicCommand<NewCommandSchema> {
   public readonly allowMissingWorkspace = true;
-  private schematicName = 'ng-new';
+  schematicName = 'ng-new';
 
   public async run(options: NewCommandSchema & Arguments) {
-    if (options.dryRun) {
-      options.skipGit = true;
-    }
-
     let collectionName: string;
     if (options.collection) {
       collectionName = options.collection;
diff --git a/packages/angular/cli/commands/update-impl.ts b/packages/angular/cli/commands/update-impl.ts
index 4708d85cc068..38f1d7fb448a 100644
--- a/packages/angular/cli/commands/update-impl.ts
+++ b/packages/angular/cli/commands/update-impl.ts
@@ -9,28 +9,13 @@ import { normalize } from '@angular-devkit/core';
 import { Arguments, Option } from '../models/interface';
 import { SchematicCommand } from '../models/schematic-command';
 import { findUp } from '../utilities/find-up';
-import { parseJsonSchemaToOptions } from '../utilities/json-schema';
 import { Schema as UpdateCommandSchema } from './update';
 
 export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
   public readonly allowMissingWorkspace = true;
 
-  private collectionName = '@schematics/update';
-  private schematicName = 'update';
-
-  async initialize(input: UpdateCommandSchema & Arguments) {
-    await super.initialize(input);
-
-    // Set the options.
-    const collection = this.getCollection(this.collectionName);
-    const schematic = this.getSchematic(collection, this.schematicName, true);
-    const options = await parseJsonSchemaToOptions(
-      this._workflow.registry,
-      schematic.description.schemaJson || {},
-    );
-
-    this.description.options.push(...options);
-  }
+  collectionName = '@schematics/update';
+  schematicName = 'update';
 
   async parseArguments(schematicOptions: string[], schema: Option[]): Promise<Arguments> {
     const args = await super.parseArguments(schematicOptions, schema);
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index 4484d5797bb0..db2f10d887f4 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -82,6 +82,9 @@ export abstract class SchematicCommand<
   private readonly _engine: Engine<FileSystemCollectionDesc, FileSystemSchematicDesc>;
   protected _workflow: workflow.BaseWorkflow;
 
+  protected collectionName = '@schematics/angular';
+  protected schematicName?: string;
+
   constructor(
     context: CommandContext,
     description: CommandDescription,
@@ -95,6 +98,18 @@ export abstract class SchematicCommand<
   public async initialize(options: T & Arguments) {
     this._loadWorkspace();
     this.createWorkflow(options);
+
+    if (this.schematicName) {
+      // Set the options.
+      const collection = this.getCollection(this.collectionName);
+      const schematic = this.getSchematic(collection, this.schematicName, true);
+      const options = await parseJsonSchemaToOptions(
+        this._workflow.registry,
+        schematic.description.schemaJson || {},
+      );
+
+      this.description.options.push(...options);
+    }
   }
 
   public async printHelp(options: T & Arguments) {
@@ -330,7 +345,7 @@ export abstract class SchematicCommand<
       }
     }
 
-    return '@schematics/angular';
+    return this.collectionName;
   }
 
   protected async runSchematic(options: RunSchematicOptions) {
@@ -357,7 +372,7 @@ export abstract class SchematicCommand<
     schematicName = schematic.description.name;
 
     // TODO: Remove warning check when 'targets' is default
-    if (collectionName !== '@schematics/angular') {
+    if (collectionName !== this.collectionName) {
       const [ast, configPath] = getWorkspaceRaw('local');
       if (ast) {
         const projectsKeyValue = ast.properties.find(p => p.key.value === 'projects');
diff --git a/packages/angular/cli/utilities/json-schema.ts b/packages/angular/cli/utilities/json-schema.ts
index d852772e71c9..978257a95cb7 100644
--- a/packages/angular/cli/utilities/json-schema.ts
+++ b/packages/angular/cli/utilities/json-schema.ts
@@ -158,6 +158,9 @@ export async function parseJsonSchemaToOptions(
             defaultValue = schema.default;
           }
           break;
+
+        default:
+          console.log(types[0], schema);
       }
     }
 

From b5fc50fa1c2bd7305b5b3b76f3a3d7c0c3372d6e Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Fri, 14 Sep 2018 11:14:48 -0700
Subject: [PATCH 0127/1703] fix(@angular/cli): add support for all variant of
 alias field name

---
 packages/angular/cli/utilities/json-schema.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/utilities/json-schema.ts b/packages/angular/cli/utilities/json-schema.ts
index 978257a95cb7..cb6387e818d6 100644
--- a/packages/angular/cli/utilities/json-schema.ts
+++ b/packages/angular/cli/utilities/json-schema.ts
@@ -57,6 +57,16 @@ export async function parseJsonSchemaToCommandDescription(
       }
     });
   }
+  if (json.isJsonArray(schema.aliases)) {
+    schema.aliases.forEach(value => {
+      if (typeof value == 'string') {
+        aliases.push(value);
+      }
+    });
+  }
+  if (typeof schema.alias == 'string') {
+    aliases.push(schema.alias);
+  }
 
   let longDescription = '';
   if (typeof schema.$longDescription == 'string' && schema.$longDescription) {
@@ -172,7 +182,8 @@ export async function parseJsonSchemaToOptions(
 
     const required = json.isJsonArray(current.required)
         ? current.required.indexOf(name) != -1 : false;
-    const aliases = json.isJsonArray(current.aliases) ? [...current.aliases].map(x => '' + x) : [];
+    const aliases = json.isJsonArray(current.aliases) ? [...current.aliases].map(x => '' + x)
+                  : current.alias ? ['' + current.alias] : [];
     const format = typeof current.format == 'string' ? current.format : undefined;
     const hidden = !!current.hidden;
 

From d10c9e31048eca3f798533484e65071460d20b9d Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Fri, 14 Sep 2018 11:24:20 -0700
Subject: [PATCH 0128/1703] fix(@angular/cli): fix support for default values
 in options

---
 packages/angular/cli/utilities/json-schema.ts   | 17 +++++++----------
 .../e2e/tests/generate/help-output.ts           |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/packages/angular/cli/utilities/json-schema.ts b/packages/angular/cli/utilities/json-schema.ts
index cb6387e818d6..ba7dc9fc4c2b 100644
--- a/packages/angular/cli/utilities/json-schema.ts
+++ b/packages/angular/cli/utilities/json-schema.ts
@@ -151,26 +151,23 @@ export async function parseJsonSchemaToOptions(
     }
 
     let defaultValue: string | number | boolean | undefined = undefined;
-    if (schema.default !== undefined) {
+    if (current.default !== undefined) {
       switch (types[0]) {
         case 'string':
-          if (typeof schema.default == 'string') {
-            defaultValue = schema.default;
+          if (typeof current.default == 'string') {
+            defaultValue = current.default;
           }
           break;
         case 'number':
-          if (typeof schema.default == 'number') {
-            defaultValue = schema.default;
+          if (typeof current.default == 'number') {
+            defaultValue = current.default;
           }
           break;
         case 'boolean':
-          if (typeof schema.default == 'boolean') {
-            defaultValue = schema.default;
+          if (typeof current.default == 'boolean') {
+            defaultValue = current.default;
           }
           break;
-
-        default:
-          console.log(types[0], schema);
       }
     }
 
diff --git a/tests/legacy-cli/e2e/tests/generate/help-output.ts b/tests/legacy-cli/e2e/tests/generate/help-output.ts
index c1b9f69c4b2f..0b2f8607ca6c 100644
--- a/tests/legacy-cli/e2e/tests/generate/help-output.ts
+++ b/tests/legacy-cli/e2e/tests/generate/help-output.ts
@@ -88,7 +88,7 @@ export default function() {
     .then(() => ng('generate', 'fake', '--help'))
     // verify same output
     .then(({stdout}) => {
-      if (!/ng generate fake-schematics:fake <a> <b> \[options\]/.test(stdout)) {
+      if (!/ng generate fake <a> <b> \[options\]/.test(stdout)) {
         throw new Error('Help signature is wrong (2).');
       }
       if (!/opt-a[\s\S]*opt-b[\s\S]*opt-c/.test(stdout)) {

From af96ccfb65abc0803719bd526d02ef6799629bf4 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Fri, 14 Sep 2018 12:05:22 -0700
Subject: [PATCH 0129/1703] fix(@angular/cli): fix support for hidden options

They were showing when they should have been hidden.
---
 packages/angular/cli/models/schematic-command.ts | 2 +-
 packages/angular/cli/utilities/json-schema.ts    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index db2f10d887f4..a9081bf4fc51 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -108,7 +108,7 @@ export abstract class SchematicCommand<
         schematic.description.schemaJson || {},
       );
 
-      this.description.options.push(...options);
+      this.description.options.push(...options.filter(x => !x.hidden));
     }
   }
 
diff --git a/packages/angular/cli/utilities/json-schema.ts b/packages/angular/cli/utilities/json-schema.ts
index ba7dc9fc4c2b..ebe66c244a12 100644
--- a/packages/angular/cli/utilities/json-schema.ts
+++ b/packages/angular/cli/utilities/json-schema.ts
@@ -182,7 +182,8 @@ export async function parseJsonSchemaToOptions(
     const aliases = json.isJsonArray(current.aliases) ? [...current.aliases].map(x => '' + x)
                   : current.alias ? ['' + current.alias] : [];
     const format = typeof current.format == 'string' ? current.format : undefined;
-    const hidden = !!current.hidden;
+    const visible = current.visible === undefined || current.visible === true;
+    const hidden = !!current.hidden || !visible;
 
     const option: Option = {
       name,

From 3127fed50a28f8966300ece61dc9da10fc82932e Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Mon, 17 Sep 2018 12:03:39 -0700
Subject: [PATCH 0130/1703] ci: remove external BUILD code that should not be
 internal

---
 tools/BUILD              | 4 ++--
 tools/ts_json_schema.bzl | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/tools/BUILD b/tools/BUILD
index b7b9ca2e64b2..517fbaa9db28 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -2,7 +2,7 @@
 #
 # Use of this source code is governed by an MIT-style license that can be
 # found in the LICENSE file at https://angular.io/license
-
+# @external_begin
 package(default_visibility = ["//visibility:public"])
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
@@ -21,4 +21,4 @@ nodejs_binary(
     ],
     install_source_map_support = False,
 )
-
+# @external_end
diff --git a/tools/ts_json_schema.bzl b/tools/ts_json_schema.bzl
index 9223d1eef898..720117f9e2ec 100644
--- a/tools/ts_json_schema.bzl
+++ b/tools/ts_json_schema.bzl
@@ -4,9 +4,8 @@
 # found in the LICENSE file at https://angular.io/license
 
 load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
-load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_test", "nodejs_binary")
-
 
+# @external_begin
 def _ts_json_schema_interface_impl(ctx):
     args = [
         ctx.files.src[0].path,
@@ -50,6 +49,7 @@ _ts_json_schema_interface = rule(
         "ts": "%{out}"
     },
 )
+# @external_end
 
 
 # Generates a library that contains the interface for a JSON Schema file. Takes a single `src`
@@ -60,16 +60,21 @@ _ts_json_schema_interface = rule(
 def ts_json_schema(name, src, data = []):
     out = src.replace(".json", ".ts")
 
+    # @external_begin
     _ts_json_schema_interface(
         name = name + ".interface",
         src = src,
         out = out,
         data = data,
     )
+    # @external_end
 
     ts_library(
         name = name,
+        # Remove these to empty the rule, since those files are also compiled elsewhere.
+        # @external_begin
         srcs = [
             out,
         ]
+        # @external_end
     )

From 2f7f00f4cd5c7b8c3ab2206f67f701b30209b092 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Mon, 17 Sep 2018 13:41:36 -0700
Subject: [PATCH 0131/1703] refactor(@schematics/angular): replace usage of
 unknown for any

Google3 is still on TypeScript 2.9.
---
 packages/schematics/angular/utility/project.ts          | 8 ++++++--
 packages/schematics/angular/utility/workspace-models.ts | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/schematics/angular/utility/project.ts b/packages/schematics/angular/utility/project.ts
index 13df722f0750..bb25993e077c 100644
--- a/packages/schematics/angular/utility/project.ts
+++ b/packages/schematics/angular/utility/project.ts
@@ -35,10 +35,14 @@ export function getProject<TProjectType extends ProjectType = ProjectType.Applic
   return workspace.projects[projectName] as WorkspaceProject<TProjectType>;
 }
 
-export function isWorkspaceSchema(workspace: unknown): workspace is WorkspaceSchema {
+// TODO(hans): change this any to unknown when google3 supports TypeScript 3.0.
+// tslint:disable-next-line:no-any
+export function isWorkspaceSchema(workspace: any): workspace is WorkspaceSchema {
   return !!(workspace && (workspace as WorkspaceSchema).projects);
 }
 
-export function isWorkspaceProject(project: unknown): project is WorkspaceProject {
+// TODO(hans): change this any to unknown when google3 supports TypeScript 3.0.
+// tslint:disable-next-line:no-any
+export function isWorkspaceProject(project: any): project is WorkspaceProject {
   return !!(project && (project as WorkspaceProject).projectType);
 }
diff --git a/packages/schematics/angular/utility/workspace-models.ts b/packages/schematics/angular/utility/workspace-models.ts
index bb2ddf4f642e..011c2363227d 100644
--- a/packages/schematics/angular/utility/workspace-models.ts
+++ b/packages/schematics/angular/utility/workspace-models.ts
@@ -146,5 +146,7 @@ export interface WorkspaceTargets<TProjectType extends ProjectType = ProjectType
     e2e?: E2EBuilderTarget;
     'app-shell'?: AppShellBuilderTarget;
     'extract-i18n'?: ExtractI18nBuilderTarget;
-    [key: string]: unknown;
+    // TODO(hans): change this any to unknown when google3 supports TypeScript 3.0.
+    // tslint:disable-next-line:no-any
+    [key: string]: any;
 }

From b65860fee2e842c31cf6e52122561a962617eec0 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 17 Sep 2018 14:54:42 +0200
Subject: [PATCH 0132/1703] feat(@ngtools/webpack): add support for
 `traceResolution`

Closes #8676
---
 packages/ngtools/webpack/src/compiler_host.ts |  4 ++++
 .../e2e/tests/misc/trace-resolution.ts        | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 tests/legacy-cli/e2e/tests/misc/trace-resolution.ts

diff --git a/packages/ngtools/webpack/src/compiler_host.ts b/packages/ngtools/webpack/src/compiler_host.ts
index a5c2572dfdce..2c0ea9b65c93 100644
--- a/packages/ngtools/webpack/src/compiler_host.ts
+++ b/packages/ngtools/webpack/src/compiler_host.ts
@@ -246,6 +246,10 @@ export class WebpackCompilerHost implements ts.CompilerHost {
       return this.readFile(fileName);
     }
   }
+
+  trace(message: string) {
+    console.log(message);
+  }
 }
 
 
diff --git a/tests/legacy-cli/e2e/tests/misc/trace-resolution.ts b/tests/legacy-cli/e2e/tests/misc/trace-resolution.ts
new file mode 100644
index 000000000000..30c8113ce9ec
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/misc/trace-resolution.ts
@@ -0,0 +1,22 @@
+import { ng } from '../../utils/process';
+import { updateJsonFile } from '../../utils/project';
+
+export default async function () {
+  await updateJsonFile('tsconfig.json', tsconfig => {
+    tsconfig.compilerOptions.traceResolution = true;
+  });
+
+  const { stdout: stdoutTraced } = await ng('build');
+  if (!/Resolving module/.test(stdoutTraced)) {
+    throw new Error(`Modules resolutions must be printed when 'traceResolution' is enabled.`);
+  }
+
+  await updateJsonFile('tsconfig.json', tsconfig => {
+    tsconfig.compilerOptions.traceResolution = false;
+  });
+
+  const { stdout: stdoutUnTraced } = await ng('build');
+  if (/Resolving module/.test(stdoutUnTraced)) {
+    throw new Error(`Modules resolutions must not be printed when 'traceResolution' is disabled.`);
+  }
+}

From 7fee77006c5053f22a5905ab365d8eef716a6816 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 14 Sep 2018 13:59:48 +0200
Subject: [PATCH 0133/1703] docs: add jsdoc instead of comments

---
 .../src/{interfaces.d.ts => interfaces.ts}    | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)
 rename packages/angular_devkit/benchmark/src/{interfaces.d.ts => interfaces.ts} (73%)

diff --git a/packages/angular_devkit/benchmark/src/interfaces.d.ts b/packages/angular_devkit/benchmark/src/interfaces.ts
similarity index 73%
rename from packages/angular_devkit/benchmark/src/interfaces.d.ts
rename to packages/angular_devkit/benchmark/src/interfaces.ts
index 215164799ac4..c74bd49dfe96 100644
--- a/packages/angular_devkit/benchmark/src/interfaces.d.ts
+++ b/packages/angular_devkit/benchmark/src/interfaces.ts
@@ -9,14 +9,22 @@ import { Observable } from 'rxjs';
 import { Command } from './command';
 
 export interface AggregatedProcessStats {
-  processes: number;      // number of processes
-  cpu: number;            // percentage (from 0 to 100*vcore)
-  memory: number;         // bytes
-  ppid: number;           // PPID
-  pid: number;            // PID
-  ctime: number;          // ms user + system time
-  elapsed: number;        // ms since the start of the process
-  timestamp: number;      // ms since epoch
+  /** Number of processes */
+  processes: number;
+  /** Percentage (from 0 to 100 * vcore) */
+  cpu: number;
+  /** Bytes */
+  memory: number;
+  /** Parent Process ID */
+  ppid: number;
+  /** Process ID */
+  pid: number;
+  /** Ms user + system time */
+  ctime: number;
+  /** Ms since the start of the process */
+  elapsed: number;
+  /** Ms since epoch */
+  timestamp: number;
 }
 
 export interface MonitoredProcess {

From 5308fa07d9e8ff3fd25f28cdf54c17da7b41e1aa Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 18 Sep 2018 11:46:00 +0200
Subject: [PATCH 0134/1703] feat(@schematics/angular): update ng-packagr to
 `4.2.0`

---
 packages/schematics/angular/library/index.ts      | 2 +-
 packages/schematics/angular/library/index_spec.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index aa9b8b7e3ed9..c656b0a100a3 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -107,7 +107,7 @@ function addDependenciesToPackageJson() {
       {
         type: NodeDependencyType.Dev,
         name: 'ng-packagr',
-        version: '^4.1.0',
+        version: '^4.2.0',
       },
       {
         type: NodeDependencyType.Dev,
diff --git a/packages/schematics/angular/library/index_spec.ts b/packages/schematics/angular/library/index_spec.ts
index fe2d737128bf..2628fc41b747 100644
--- a/packages/schematics/angular/library/index_spec.ts
+++ b/packages/schematics/angular/library/index_spec.ts
@@ -138,7 +138,7 @@ describe('Library Schematic', () => {
       const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
 
       const packageJson = getJsonFileContent(tree, 'package.json');
-      expect(packageJson.devDependencies['ng-packagr']).toEqual('^4.1.0');
+      expect(packageJson.devDependencies['ng-packagr']).toEqual('^4.2.0');
       expect(packageJson.devDependencies['@angular-devkit/build-ng-packagr'])
         .toEqual(latestVersions.DevkitBuildNgPackagr);
     });

From 84533e24461f8b11af242770d77889608d733160 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 18 Sep 2018 11:47:36 +0200
Subject: [PATCH 0135/1703] build: update ng-packagr to `4.2.0`

---
 .../angular_devkit/build_ng_packagr/package.json   |  2 +-
 yarn.lock                                          | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index 0f46af0ff52c..22bc16756914 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -17,7 +17,7 @@
   "devDependencies": {
     "@angular/compiler": "^7.0.0-beta.4",
     "@angular/compiler-cli": "^7.0.0-beta.4",
-    "ng-packagr": "^4.1.0",
+    "ng-packagr": "^4.2.0",
     "tsickle": ">=0.27.3",
     "tslib": "^1.9.0"
   }
diff --git a/yarn.lock b/yarn.lock
index 7cdc64e6bf72..0c4c640b6863 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5148,9 +5148,9 @@ neo-async@^2.5.0:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.2.tgz#489105ce7bc54e709d736b195f82135048c50fcc"
 
-ng-packagr@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-4.1.1.tgz#a2aba1d08e5b2136ad073dfcf7dea90ba10fcc48"
+ng-packagr@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-4.2.0.tgz#9e2babac0402f761c64908996dae99e54a07fe3e"
   dependencies:
     "@ngtools/json-schema" "^1.1.0"
     autoprefixer "^9.0.0"
@@ -5170,7 +5170,7 @@ ng-packagr@^4.1.0:
     postcss-url "^8.0.0"
     read-pkg-up "^4.0.0"
     rimraf "^2.6.1"
-    rollup "^0.64.0"
+    rollup "^0.66.0"
     rollup-plugin-commonjs "^9.1.3"
     rollup-plugin-node-resolve "^3.0.0"
     rollup-plugin-sourcemaps "^0.4.2"
@@ -6575,9 +6575,9 @@ rollup-pluginutils@^2.0.1:
     estree-walker "^0.5.2"
     micromatch "^2.3.11"
 
-rollup@^0.64.0:
-  version "0.64.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.64.1.tgz#9188ee368e5fcd43ffbc00ec414e72eeb5de87ba"
+rollup@^0.66.0:
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.66.0.tgz#697acc008f4b613695b17222c7626affddf4a506"
   dependencies:
     "@types/estree" "0.0.39"
     "@types/node" "*"

From 8fac6a7cebf6527fc6b42a099d3146f0311b0322 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 11 Sep 2018 15:38:10 +0200
Subject: [PATCH 0136/1703] fix(@angular-devkit/schematics-cli): fix
 `list-schematics` is not printing anything

Usage:
```
$  schematics @schematics/angular: --list-schematics
$  schematics --list-schematics
```

When no colon is specified, it means that that you are passing a schematic name to be looked up in the default collection.

Closes #12220
---
 .../schematics/src/engine/engine.ts           |  2 +-
 .../schematics_cli/bin/schematics.ts          | 51 ++++++++++++-------
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/packages/angular_devkit/schematics/src/engine/engine.ts b/packages/angular_devkit/schematics/src/engine/engine.ts
index 4222a904ce11..0db56c78c11a 100644
--- a/packages/angular_devkit/schematics/src/engine/engine.ts
+++ b/packages/angular_devkit/schematics/src/engine/engine.ts
@@ -329,7 +329,7 @@ export class SchematicEngine<CollectionT extends object, SchematicT extends obje
     }
 
     // remove duplicates
-    return [...new Set(names)];
+    return [...new Set(names)].sort();
   }
 
   transformOptions<OptionT extends object, ResultT extends object>(
diff --git a/packages/angular_devkit/schematics_cli/bin/schematics.ts b/packages/angular_devkit/schematics_cli/bin/schematics.ts
index d61b2b5b3269..761722628fbb 100644
--- a/packages/angular_devkit/schematics_cli/bin/schematics.ts
+++ b/packages/angular_devkit/schematics_cli/bin/schematics.ts
@@ -18,8 +18,16 @@ import {
   virtualFs,
 } from '@angular-devkit/core';
 import { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node';
-import { DryRunEvent, UnsuccessfulWorkflowExecution } from '@angular-devkit/schematics';
-import { NodeWorkflow } from '@angular-devkit/schematics/tools';
+import {
+  DryRunEvent,
+  SchematicEngine,
+  UnsuccessfulWorkflowExecution,
+} from '@angular-devkit/schematics';
+import {
+  FileSystemEngineHost,
+  NodeModulesEngineHost,
+  NodeWorkflow,
+} from '@angular-devkit/schematics/tools';
 import * as minimist from 'minimist';
 
 
@@ -36,12 +44,18 @@ function usage(exitCode = 0): never {
     Options:
         --debug             Debug mode. This is true by default if the collection is a relative
                             path (in that case, turn off with --debug=false).
+
         --allowPrivate      Allow private schematics to be run from the command line. Default to
                             false.
+
         --dry-run           Do not output anything, but instead just show what actions would be
                             performed. Default to true if debug is also true.
+
         --force             Force overwriting files that would otherwise be an error.
-        --list-schematics   List all schematics from the collection, by name.
+
+        --list-schematics   List all schematics from the collection, by name. A collection name
+                            should be suffixed by a colon. Example: '@schematics/schematics:'.
+
         --verbose           Show more information.
 
         --help              Show this message.
@@ -49,8 +63,7 @@ function usage(exitCode = 0): never {
     Any additional option is passed to the Schematics depending on
   `);
 
-  process.exit(exitCode);
-  throw 0;  // The node typing sometimes don't have a never type for process.exit().
+  return process.exit(exitCode);
 }
 
 
@@ -68,20 +81,12 @@ function usage(exitCode = 0): never {
  * @param str The argument to parse.
  * @return {{collection: string, schematic: (string)}}
  */
-function parseSchematicName(str: string | null): { collection: string, schematic: string } {
+function parseSchematicName(str: string | null): { collection: string, schematic: string | null} {
   let collection = '@schematics/schematics';
 
-  if (!str || str === null) {
-    usage(1);
-  }
-
-  let schematic: string = str as string;
-  if (schematic.indexOf(':') != -1) {
+  let schematic = str;
+  if (schematic && schematic.indexOf(':') != -1) {
     [collection, schematic] = schematic.split(':', 2);
-
-    if (!schematic) {
-      usage(2);
-    }
   }
 
   return { collection, schematic };
@@ -124,11 +129,21 @@ const isLocalCollection = collectionName.startsWith('.') || collectionName.start
 
 /** If the user wants to list schematics, we simply show all the schematic names. */
 if (argv['list-schematics']) {
-  // logger.info(engine.listSchematicNames(collection).join('\n'));
+  const engineHost = isLocalCollection
+    ? new FileSystemEngineHost(normalize(process.cwd()))
+    : new NodeModulesEngineHost();
+
+  const engine = new SchematicEngine(engineHost);
+  const collection = engine.createCollection(collectionName);
+  logger.info(engine.listSchematicNames(collection).join('\n'));
+
   process.exit(0);
-  throw 0;  // TypeScript doesn't know that process.exit() never returns.
 }
 
+if (!schematicName) {
+  usage(1);
+  throw 0; // TypeScript doesn't know that process.exit() never returns.
+}
 
 /** Gather the arguments for later use. */
 const debug: boolean = argv.debug === null ? isLocalCollection : argv.debug;

From 1753b6affbd43d3bd50b38f7af8b634e3f24a128 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 14 Sep 2018 09:33:19 +0200
Subject: [PATCH 0137/1703] test: add tests to schematic-cli

---
 .../schematics_cli/bin/schematics_spec.ts     | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 packages/angular_devkit/schematics_cli/bin/schematics_spec.ts

diff --git a/packages/angular_devkit/schematics_cli/bin/schematics_spec.ts b/packages/angular_devkit/schematics_cli/bin/schematics_spec.ts
new file mode 100644
index 000000000000..905e8831f603
--- /dev/null
+++ b/packages/angular_devkit/schematics_cli/bin/schematics_spec.ts
@@ -0,0 +1,54 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { main } from './schematics';
+
+// We only care about the write method in these mocks of NodeJS.WriteStream.
+class MockWriteStream {
+  lines: string[] = [];
+  write(str: string) {
+    // Strip color control characters.
+    this.lines.push(str.replace(/[^\x20-\x7F]\[\d+m/g, ''));
+
+    return true;
+  }
+}
+
+describe('schematics-cli binary', () => {
+  let stdout: MockWriteStream, stderr: MockWriteStream;
+
+  beforeEach(() => {
+    stdout = new MockWriteStream();
+    stderr = new MockWriteStream();
+  });
+
+  it('list-schematics works', async () => {
+    const args = ['--list-schematics'];
+    const res = await main({ args, stdout, stderr });
+    expect(stdout.lines).toMatch(/blank/);
+    expect(stdout.lines).toMatch(/schematic/);
+    expect(res).toEqual(0);
+  });
+
+  it('dry-run works', async () => {
+    const args = ['blank', 'foo', '--dry-run'];
+    const res = await main({ args, stdout, stderr });
+    expect(stdout.lines).toMatch(/CREATE \/foo\/README.md/);
+    expect(stdout.lines).toMatch(/CREATE \/foo\/.gitignore/);
+    expect(stdout.lines).toMatch(/CREATE \/foo\/src\/foo\/index.ts/);
+    expect(stdout.lines).toMatch(/CREATE \/foo\/src\/foo\/index_spec.ts/);
+    expect(res).toEqual(0);
+  });
+
+  it('error when no name is provided', async () => {
+    const args = ['blank'];
+    const res = await main({ args, stdout, stderr });
+    expect(stderr.lines).toMatch(/Error: name option is required/);
+    expect(res).toEqual(1);
+  });
+});

From 40129ccebd0b870e479fade800f54e1417c44528 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 14 Sep 2018 09:34:53 +0200
Subject: [PATCH 0138/1703] refactor: make the cli testable

---
 .../schematics_cli/bin/schematics.ts          | 417 +++++++++---------
 1 file changed, 219 insertions(+), 198 deletions(-)

diff --git a/packages/angular_devkit/schematics_cli/bin/schematics.ts b/packages/angular_devkit/schematics_cli/bin/schematics.ts
index 761722628fbb..fd68ef8f95ca 100644
--- a/packages/angular_devkit/schematics_cli/bin/schematics.ts
+++ b/packages/angular_devkit/schematics_cli/bin/schematics.ts
@@ -17,7 +17,7 @@ import {
   terminal,
   virtualFs,
 } from '@angular-devkit/core';
-import { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node';
+import { NodeJsSyncHost, ProcessOutput, createConsoleLogger } from '@angular-devkit/core/node';
 import {
   DryRunEvent,
   SchematicEngine,
@@ -31,42 +31,6 @@ import {
 import * as minimist from 'minimist';
 
 
-/**
- * Show usage of the CLI tool, and exit the process.
- */
-function usage(exitCode = 0): never {
-  logger.info(tags.stripIndent`
-    schematics [CollectionName:]SchematicName [options, ...]
-
-    By default, if the collection name is not specified, use the internal collection provided
-    by the Schematics CLI.
-
-    Options:
-        --debug             Debug mode. This is true by default if the collection is a relative
-                            path (in that case, turn off with --debug=false).
-
-        --allowPrivate      Allow private schematics to be run from the command line. Default to
-                            false.
-
-        --dry-run           Do not output anything, but instead just show what actions would be
-                            performed. Default to true if debug is also true.
-
-        --force             Force overwriting files that would otherwise be an error.
-
-        --list-schematics   List all schematics from the collection, by name. A collection name
-                            should be suffixed by a colon. Example: '@schematics/schematics:'.
-
-        --verbose           Show more information.
-
-        --help              Show this message.
-
-    Any additional option is passed to the Schematics depending on
-  `);
-
-  return process.exit(exitCode);
-}
-
-
 /**
  * Parse the name of schematic passed in argument, and return a {collection, schematic} named
  * tuple. The user can pass in `collection-name:schematic-name`, and this function will either
@@ -81,7 +45,7 @@ function usage(exitCode = 0): never {
  * @param str The argument to parse.
  * @return {{collection: string, schematic: (string)}}
  */
-function parseSchematicName(str: string | null): { collection: string, schematic: string | null} {
+function parseSchematicName(str: string | null): { collection: string, schematic: string | null } {
   let collection = '@schematics/schematics';
 
   let schematic = str;
@@ -93,182 +57,204 @@ function parseSchematicName(str: string | null): { collection: string, schematic
 }
 
 
-/** Parse the command line. */
-const booleanArgs = [
-  'allowPrivate',
-  'debug',
-  'dry-run',
-  'force',
-  'help',
-  'list-schematics',
-  'verbose',
-];
-const argv = minimist(process.argv.slice(2), {
-  boolean: booleanArgs,
-  default: {
-    'debug': null,
-    'dry-run': null,
-  },
-  '--': true,
-});
-
-/** Create the DevKit Logger used through the CLI. */
-const logger = createConsoleLogger(argv['verbose']);
-
-if (argv.help) {
-  usage();
+export interface MainOptions {
+  args: string[];
+  stdout?: ProcessOutput;
+  stderr?: ProcessOutput;
 }
 
-/** Get the collection an schematic name from the first argument. */
-const {
-  collection: collectionName,
-  schematic: schematicName,
-} = parseSchematicName(argv._.shift() || null);
-const isLocalCollection = collectionName.startsWith('.') || collectionName.startsWith('/');
-
-
-/** If the user wants to list schematics, we simply show all the schematic names. */
-if (argv['list-schematics']) {
-  const engineHost = isLocalCollection
-    ? new FileSystemEngineHost(normalize(process.cwd()))
-    : new NodeModulesEngineHost();
-
-  const engine = new SchematicEngine(engineHost);
-  const collection = engine.createCollection(collectionName);
-  logger.info(engine.listSchematicNames(collection).join('\n'));
+export async function main({
+  args,
+  stdout = process.stdout,
+  stderr = process.stderr,
+}: MainOptions): Promise<0 | 1> {
+
+  /** Parse the command line. */
+  const booleanArgs = [
+    'allowPrivate',
+    'debug',
+    'dry-run',
+    'force',
+    'help',
+    'list-schematics',
+    'verbose',
+  ];
+  const argv = minimist(args, {
+    boolean: booleanArgs,
+    default: {
+      'debug': null,
+      'dry-run': null,
+    },
+    '--': true,
+  });
+
+  /** Create the DevKit Logger used through the CLI. */
+  const logger = createConsoleLogger(argv['verbose'], stdout, stderr);
+
+  if (argv.help) {
+    logger.info(getUsage());
+
+    return 0;
+  }
 
-  process.exit(0);
-}
+  /** Get the collection an schematic name from the first argument. */
+  const {
+    collection: collectionName,
+    schematic: schematicName,
+  } = parseSchematicName(argv._.shift() || null);
+  const isLocalCollection = collectionName.startsWith('.') || collectionName.startsWith('/');
 
-if (!schematicName) {
-  usage(1);
-  throw 0; // TypeScript doesn't know that process.exit() never returns.
-}
 
-/** Gather the arguments for later use. */
-const debug: boolean = argv.debug === null ? isLocalCollection : argv.debug;
-const dryRun: boolean = argv['dry-run'] === null ? debug : argv['dry-run'];
-const force = argv['force'];
-const allowPrivate = argv['allowPrivate'];
+  /** If the user wants to list schematics, we simply show all the schematic names. */
+  if (argv['list-schematics']) {
+    const engineHost = isLocalCollection
+      ? new FileSystemEngineHost(normalize(process.cwd()))
+      : new NodeModulesEngineHost();
 
-/** Create a Virtual FS Host scoped to where the process is being run. **/
-const fsHost = new virtualFs.ScopedHost(new NodeJsSyncHost(), normalize(process.cwd()));
+    const engine = new SchematicEngine(engineHost);
+    const collection = engine.createCollection(collectionName);
+    logger.info(engine.listSchematicNames(collection).join('\n'));
 
-/** Create the workflow that will be executed with this run. */
-const workflow = new NodeWorkflow(fsHost, { force, dryRun });
+    return 0;
+  }
 
-// Indicate to the user when nothing has been done. This is automatically set to off when there's
-// a new DryRunEvent.
-let nothingDone = true;
+  if (!schematicName) {
+    logger.info(getUsage());
 
-// Logging queue that receives all the messages to show the users. This only get shown when no
-// errors happened.
-let loggingQueue: string[] = [];
-let error = false;
+    return 1;
+  }
 
-/**
- * Logs out dry run events.
- *
- * All events will always be executed here, in order of discovery. That means that an error would
- * be shown along other events when it happens. Since errors in workflows will stop the Observable
- * from completing successfully, we record any events other than errors, then on completion we
- * show them.
- *
- * This is a simple way to only show errors when an error occur.
- */
-workflow.reporter.subscribe((event: DryRunEvent) => {
-  nothingDone = false;
-
-  switch (event.kind) {
-    case 'error':
-      error = true;
-
-      const desc = event.description == 'alreadyExist' ? 'already exists' : 'does not exist';
-      logger.warn(`ERROR! ${event.path} ${desc}.`);
-      break;
-    case 'update':
-      loggingQueue.push(tags.oneLine`
+  /** Gather the arguments for later use. */
+  const debug: boolean = argv.debug === null ? isLocalCollection : argv.debug;
+  const dryRun: boolean = argv['dry-run'] === null ? debug : argv['dry-run'];
+  const force = argv['force'];
+  const allowPrivate = argv['allowPrivate'];
+
+  /** Create a Virtual FS Host scoped to where the process is being run. **/
+  const fsHost = new virtualFs.ScopedHost(new NodeJsSyncHost(), normalize(process.cwd()));
+
+  /** Create the workflow that will be executed with this run. */
+  const workflow = new NodeWorkflow(fsHost, { force, dryRun });
+
+  // Indicate to the user when nothing has been done. This is automatically set to off when there's
+  // a new DryRunEvent.
+  let nothingDone = true;
+
+  // Logging queue that receives all the messages to show the users. This only get shown when no
+  // errors happened.
+  let loggingQueue: string[] = [];
+  let error = false;
+
+  /**
+   * Logs out dry run events.
+   *
+   * All events will always be executed here, in order of discovery. That means that an error would
+   * be shown along other events when it happens. Since errors in workflows will stop the Observable
+   * from completing successfully, we record any events other than errors, then on completion we
+   * show them.
+   *
+   * This is a simple way to only show errors when an error occur.
+   */
+  workflow.reporter.subscribe((event: DryRunEvent) => {
+    nothingDone = false;
+
+    switch (event.kind) {
+      case 'error':
+        error = true;
+
+        const desc = event.description == 'alreadyExist' ? 'already exists' : 'does not exist';
+        logger.warn(`ERROR! ${event.path} ${desc}.`);
+        break;
+      case 'update':
+        loggingQueue.push(tags.oneLine`
         ${terminal.white('UPDATE')} ${event.path} (${event.content.length} bytes)
       `);
-      break;
-    case 'create':
-      loggingQueue.push(tags.oneLine`
+        break;
+      case 'create':
+        loggingQueue.push(tags.oneLine`
         ${terminal.green('CREATE')} ${event.path} (${event.content.length} bytes)
       `);
-      break;
-    case 'delete':
-      loggingQueue.push(`${terminal.yellow('DELETE')} ${event.path}`);
-      break;
-    case 'rename':
-      loggingQueue.push(`${terminal.blue('RENAME')} ${event.path} => ${event.to}`);
-      break;
-  }
-});
+        break;
+      case 'delete':
+        loggingQueue.push(`${terminal.yellow('DELETE')} ${event.path}`);
+        break;
+      case 'rename':
+        loggingQueue.push(`${terminal.blue('RENAME')} ${event.path} => ${event.to}`);
+        break;
+    }
+  });
 
 
-/**
- * Listen to lifecycle events of the workflow to flush the logs between each phases.
- */
-workflow.lifeCycle.subscribe(event => {
-  if (event.kind == 'workflow-end' || event.kind == 'post-tasks-start') {
-    if (!error) {
-      // Flush the log queue and clean the error state.
-      loggingQueue.forEach(log => logger.info(log));
+  /**
+   * Listen to lifecycle events of the workflow to flush the logs between each phases.
+   */
+  workflow.lifeCycle.subscribe(event => {
+    if (event.kind == 'workflow-end' || event.kind == 'post-tasks-start') {
+      if (!error) {
+        // Flush the log queue and clean the error state.
+        loggingQueue.forEach(log => logger.info(log));
+      }
+
+      loggingQueue = [];
+      error = false;
     }
+  });
 
-    loggingQueue = [];
-    error = false;
-  }
-});
 
+  /**
+   * Remove every options from argv that we support in schematics itself.
+   */
+  const parsedArgs = Object.assign({}, argv);
+  delete parsedArgs['--'];
+  for (const key of booleanArgs) {
+    delete parsedArgs[key];
+  }
 
-/**
- * Remove every options from argv that we support in schematics itself.
- */
-const args = Object.assign({}, argv);
-delete args['--'];
-for (const key of booleanArgs) {
-  delete args[key];
-}
+  /**
+   * Add options from `--` to args.
+   */
+  const argv2 = minimist(argv['--']);
+  for (const key of Object.keys(argv2)) {
+    parsedArgs[key] = argv2[key];
+  }
 
-/**
- * Add options from `--` to args.
- */
-const argv2 = minimist(argv['--']);
-for (const key of Object.keys(argv2)) {
-  args[key] = argv2[key];
-}
+  // Pass the rest of the arguments as the smart default "argv". Then delete it.
+  workflow.registry.addSmartDefaultProvider('argv', (schema: JsonObject) => {
+    if ('index' in schema) {
+      return argv._[Number(schema['index'])];
+    } else {
+      return argv._;
+    }
+  });
+  delete parsedArgs._;
+
+
+  /**
+   *  Execute the workflow, which will report the dry run events, run the tasks, and complete
+   *  after all is done.
+   *
+   *  The Observable returned will properly cancel the workflow if unsubscribed, error out if ANY
+   *  step of the workflow failed (sink or task), with details included, and will only complete
+   *  when everything is done.
+   */
+  try {
+    await workflow.execute({
+      collection: collectionName,
+      schematic: schematicName,
+      options: parsedArgs,
+      allowPrivate: allowPrivate,
+      debug: debug,
+      logger: logger,
+    })
+      .toPromise();
 
-// Pass the rest of the arguments as the smart default "argv". Then delete it.
-workflow.registry.addSmartDefaultProvider('argv', (schema: JsonObject) => {
-  if ('index' in schema) {
-    return argv._[Number(schema['index'])];
-  } else {
-    return argv._;
-  }
-});
-delete args._;
+    if (nothingDone) {
+      logger.info('Nothing to be done.');
+    }
 
+    return 0;
 
-/**
- *  Execute the workflow, which will report the dry run events, run the tasks, and complete
- *  after all is done.
- *
- *  The Observable returned will properly cancel the workflow if unsubscribed, error out if ANY
- *  step of the workflow failed (sink or task), with details included, and will only complete
- *  when everything is done.
- */
-workflow.execute({
-  collection: collectionName,
-  schematic: schematicName,
-  options: args,
-  allowPrivate: allowPrivate,
-  debug: debug,
-  logger: logger,
-})
-.subscribe({
-  error(err: Error) {
-    // In case the workflow was not successful, show an appropriate error message.
+  } catch (err) {
     if (err instanceof UnsuccessfulWorkflowExecution) {
       // "See above" because we already printed the error.
       logger.fatal('The Schematic workflow failed. See above.');
@@ -278,11 +264,46 @@ workflow.execute({
       logger.fatal(err.stack || err.message);
     }
 
-    process.exit(1);
-  },
-  complete() {
-    if (nothingDone) {
-      logger.info('Nothing to be done.');
-    }
-  },
-});
+    return 1;
+  }
+}
+
+ /**
+ * Get usage of the CLI tool.
+ */
+function getUsage(): string {
+  return tags.stripIndent`
+  schematics [CollectionName:]SchematicName [options, ...]
+
+  By default, if the collection name is not specified, use the internal collection provided
+  by the Schematics CLI.
+
+  Options:
+      --debug             Debug mode. This is true by default if the collection is a relative
+                          path (in that case, turn off with --debug=false).
+
+      --allowPrivate      Allow private schematics to be run from the command line. Default to
+                          false.
+
+      --dry-run           Do not output anything, but instead just show what actions would be
+                          performed. Default to true if debug is also true.
+
+      --force             Force overwriting files that would otherwise be an error.
+
+      --list-schematics   List all schematics from the collection, by name. A collection name
+                          should be suffixed by a colon. Example: '@schematics/schematics:'.
+
+      --verbose           Show more information.
+
+      --help              Show this message.
+
+  Any additional option is passed to the Schematics depending on
+  `;
+}
+
+if (require.main === module) {
+  const args = process.argv.slice(2);
+  main({ args })
+    .then(exitCode => process.exitCode = exitCode)
+    .catch(e => { throw (e); });
+}

From 04ed3010b24b001c1b49bd966820a71ba1f7fb58 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 14 Sep 2018 09:35:41 +0200
Subject: [PATCH 0139/1703] feat(@angular-devkit/core): `createConsoleLogger`
 now accepts 2 parameters to add custom `stdout` and `stderr`

---
 packages/angular_devkit/core/node/cli-logger.ts | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/angular_devkit/core/node/cli-logger.ts b/packages/angular_devkit/core/node/cli-logger.ts
index 8459fd936fa6..0cbbd4c1059e 100644
--- a/packages/angular_devkit/core/node/cli-logger.ts
+++ b/packages/angular_devkit/core/node/cli-logger.ts
@@ -8,18 +8,25 @@
 import { filter } from 'rxjs/operators';
 import { logging, terminal } from '../src';
 
+export interface ProcessOutput {
+  write(buffer: string | Buffer): boolean;
+}
 
 /**
  * A Logger that sends information to STDOUT and STDERR.
  */
-export function createConsoleLogger(verbose = false): logging.Logger {
+export function createConsoleLogger(
+  verbose = false,
+  stdout: ProcessOutput = process.stdout,
+  stderr: ProcessOutput = process.stderr,
+): logging.Logger {
   const logger = new logging.IndentLogger('cling');
 
   logger
     .pipe(filter(entry => (entry.level != 'debug' || verbose)))
     .subscribe(entry => {
       let color: (s: string) => string = x => terminal.dim(terminal.white(x));
-      let output = process.stdout;
+      let output = stdout;
       switch (entry.level) {
         case 'info':
           color = terminal.white;
@@ -29,11 +36,11 @@ export function createConsoleLogger(verbose = false): logging.Logger {
           break;
         case 'error':
           color = terminal.red;
-          output = process.stderr;
+          output = stderr;
           break;
         case 'fatal':
           color = (x: string) => terminal.bold(terminal.red(x));
-          output = process.stderr;
+          output = stderr;
           break;
       }
 

From f70254d5b84556597f88ebb2a5ae63b72f327be7 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 14 Sep 2018 09:35:57 +0200
Subject: [PATCH 0140/1703] refactor: use common type for stdout and stderr

---
 packages/angular_devkit/benchmark/src/main.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/benchmark/src/main.ts b/packages/angular_devkit/benchmark/src/main.ts
index edd39881b35e..2723728c6bc8 100644
--- a/packages/angular_devkit/benchmark/src/main.ts
+++ b/packages/angular_devkit/benchmark/src/main.ts
@@ -8,6 +8,7 @@
  */
 
 import { logging, tags, terminal } from '@angular-devkit/core';
+import { ProcessOutput } from '@angular-devkit/core/node';
 import { appendFileSync, writeFileSync } from 'fs';
 import * as minimist from 'minimist';
 import { filter, map, toArray } from 'rxjs/operators';
@@ -19,8 +20,8 @@ import { runBenchmark } from '../src/run-benchmark';
 
 export interface MainOptions {
   args: string[];
-  stdout?: { write(buffer: string | Buffer): boolean };
-  stderr?: { write(buffer: string | Buffer): boolean };
+  stdout?: ProcessOutput;
+  stderr?: ProcessOutput;
 }
 
 export async function main({

From 813c5209264a3c998855f7c62c5cf27321cd4ab4 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 14 Sep 2018 09:49:49 +0200
Subject: [PATCH 0141/1703] build: add `angular_devkit/core:node`  to deps

---
 packages/angular_devkit/benchmark/BUILD | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/angular_devkit/benchmark/BUILD b/packages/angular_devkit/benchmark/BUILD
index 3d914cf54edb..6069d782dc0a 100644
--- a/packages/angular_devkit/benchmark/BUILD
+++ b/packages/angular_devkit/benchmark/BUILD
@@ -24,6 +24,7 @@ ts_library(
     module_root = "src/index.d.ts",
     deps = [
         "//packages/angular_devkit/core",
+        "//packages/angular_devkit/core:node",
         "@rxjs",
         "@rxjs//operators",
         # @typings: node
@@ -46,6 +47,7 @@ ts_library(
     deps = [
         ":benchmark",
         "//packages/angular_devkit/core",
+        "//packages/angular_devkit/core:node",
         "@rxjs",
         "@rxjs//operators",
         # @typings: jasmine

From c38e6345e2c7638521c442d25cecd27d25a7bf2d Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Fri, 14 Sep 2018 11:20:23 -0700
Subject: [PATCH 0142/1703] refactor(@schematics/angular): Parameterize
 findModule

This commit modifies `findModule` to accept custom regular expressions
so that a different filename convention for Angular modules is allowed.
---
 .../schematics/angular/utility/find-module.ts | 44 ++++++++-------
 .../angular/utility/find-module_spec.ts       | 54 +++++++++++++++++++
 2 files changed, 79 insertions(+), 19 deletions(-)

diff --git a/packages/schematics/angular/utility/find-module.ts b/packages/schematics/angular/utility/find-module.ts
index 6086523b6a12..de57684421cd 100644
--- a/packages/schematics/angular/utility/find-module.ts
+++ b/packages/schematics/angular/utility/find-module.ts
@@ -15,8 +15,12 @@ export interface ModuleOptions {
   flat?: boolean;
   path?: string;
   skipImport?: boolean;
+  moduleExt?: string;
+  routingModuleExt?: string;
 }
 
+const MODULE_EXT = '.module.ts';
+const ROUTING_MODULE_EXT = '-routing.module.ts';
 
 /**
  * Find the module referred by a set of options passed to the schematics.
@@ -26,44 +30,46 @@ export function findModuleFromOptions(host: Tree, options: ModuleOptions): Path
     return undefined;
   }
 
+  const moduleExt = options.moduleExt || MODULE_EXT;
+  const routingModuleExt = options.routingModuleExt || ROUTING_MODULE_EXT;
+
   if (!options.module) {
     const pathToCheck = (options.path || '')
       + (options.flat ? '' : '/' + strings.dasherize(options.name));
 
-    return normalize(findModule(host, pathToCheck));
+    return normalize(findModule(host, pathToCheck, moduleExt, routingModuleExt));
   } else {
     const modulePath = normalize(
       '/' + (options.path) + '/' + options.module);
     const moduleBaseName = normalize(modulePath).split('/').pop();
 
-    if (host.exists(modulePath)) {
-      return normalize(modulePath);
-    } else if (host.exists(modulePath + '.ts')) {
-      return normalize(modulePath + '.ts');
-    } else if (host.exists(modulePath + '.module.ts')) {
-      return normalize(modulePath + '.module.ts');
-    } else if (host.exists(modulePath + '/' + moduleBaseName + '.module.ts')) {
-      return normalize(modulePath + '/' + moduleBaseName + '.module.ts');
-    } else {
-      throw new Error('Specified module does not exist');
+    const candidates = [
+      modulePath,
+      `${modulePath}.ts`,
+      `${modulePath}${moduleExt}`,
+      `${modulePath}/${moduleBaseName}${moduleExt}`,
+    ];
+    for (const c of candidates) {
+      if (host.exists(c)) {
+        return normalize(c);
+      }
     }
+    throw new Error(`Specified module '${options.module}' does not exist.`);
   }
 }
 
 /**
  * Function to find the "closest" module to a generated file's path.
  */
-export function findModule(host: Tree, generateDir: string): Path {
-  let dir: DirEntry | null = host.getDir('/' + generateDir);
-
-  const moduleRe = /\.module\.ts$/;
-  const routingModuleRe = /-routing\.module\.ts/;
+export function findModule(host: Tree, generateDir: string,
+                           moduleExt = MODULE_EXT, routingModuleExt = ROUTING_MODULE_EXT): Path {
 
+  let dir: DirEntry | null = host.getDir('/' + generateDir);
   let foundRoutingModule = false;
 
   while (dir) {
-    const allMatches = dir.subfiles.filter(p => moduleRe.test(p));
-    const filteredMatches = allMatches.filter(p => !routingModuleRe.test(p));
+    const allMatches = dir.subfiles.filter(p => p.endsWith(moduleExt));
+    const filteredMatches = allMatches.filter(p => !p.endsWith(routingModuleExt));
 
     foundRoutingModule = foundRoutingModule || allMatches.length !== filteredMatches.length;
 
@@ -78,7 +84,7 @@ export function findModule(host: Tree, generateDir: string): Path {
   }
 
   const errorMsg = foundRoutingModule ? 'Could not find a non Routing NgModule.'
-    + '\nModules with suffix \'-routing.module\' are strictly reserved for routing.'
+    + `\nModules with suffix '${routingModuleExt}' are strictly reserved for routing.`
     + '\nUse the skip-import option to skip importing in NgModule.'
     : 'Could not find an NgModule. Use the skip-import option to skip importing in NgModule.';
 
diff --git a/packages/schematics/angular/utility/find-module_spec.ts b/packages/schematics/angular/utility/find-module_spec.ts
index 4caa1d1b1618..0d7ad5f1f424 100644
--- a/packages/schematics/angular/utility/find-module_spec.ts
+++ b/packages/schematics/angular/utility/find-module_spec.ts
@@ -74,6 +74,25 @@ describe('find-module', () => {
         expect(err.message).toMatch(/Could not find an NgModule/);
       }
     });
+
+    it('should accept custom ext for module', () => {
+      const host = new EmptyTree();
+      const modulePath = '/foo/src/app/app_module.ts';
+      host.create(modulePath, 'app module');
+      // Should find module if given a custom ext
+      const foundModule = findModule(host, 'foo/src/app/bar', '_module.ts');
+      expect(foundModule).toBe(modulePath);
+      // Should not find module if using default ext
+      expect(() => findModule(host, 'foo/src/app/bar'))
+        .toThrowError(/Could not find an NgModule/);
+    });
+
+    it('should not find module if ext is invalid', () => {
+      expect(() => findModule(host, 'foo/src/app/bar', '-module.ts'))
+        .toThrowError(/Could not find an NgModule/);
+      expect(() => findModule(host, 'foo/src/app/bar', '_module.ts'))
+        .toThrowError(/Could not find an NgModule/);
+    });
   });
 
   describe('findModuleFromOptions', () => {
@@ -100,5 +119,40 @@ describe('find-module', () => {
       const modPath = findModuleFromOptions(tree, options);
       expect(modPath).toEqual('/projects/my-proj/src/admin/foo.module.ts' as Path);
     });
+
+    it('should find a module using custom ext', () => {
+      tree.create('/projects/my-proj/src/app_module.ts', '');
+      options.module = 'app';
+      options.path = '/projects/my-proj/src';
+      options.moduleExt = '_module.ts';
+      // Should find module using custom moduleExt
+      const modPath = findModuleFromOptions(tree, options);
+      expect(modPath).toBe('/projects/my-proj/src/app_module.ts' as Path);
+      // Should not find module if using invalid ext
+      options.moduleExt = '-module.ts';
+      expect(() => findModuleFromOptions(tree, options)).toThrowError(
+        /Specified module 'app' does not exist/);
+      // Should not find module if using default ext
+      options.moduleExt = undefined;   // use default ext
+      expect(() => findModuleFromOptions(tree, options)).toThrowError(
+        /Specified module 'app' does not exist/);
+    });
+
+    it('should ignore custom ext if module or ${module}.ts exists', () => {
+      tree.create('/projects/my-proj/src/app.module.ts', '');
+      options.path = '/projects/my-proj/src';
+      options.moduleExt = '_module.ts';
+      let modPath;
+
+      // moduleExt ignored because exact path is found
+      options.module = 'app.module.ts';
+      modPath = findModuleFromOptions(tree, options);
+      expect(modPath).toBe('/projects/my-proj/src/app.module.ts' as Path);
+
+      // moduleExt ignored because module + .ts is found
+      options.module = 'app.module';
+      modPath = findModuleFromOptions(tree, options);
+      expect(modPath).toBe('/projects/my-proj/src/app.module.ts' as Path);
+    });
   });
 });

From fce686d965c62d667e92765c3abca001ee6e0716 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 18 Sep 2018 09:01:26 +0200
Subject: [PATCH 0143/1703] feat(@angular-devkit/build-angular): enable
 sourcemaps by default when using karma

Closes #12282
---
 packages/angular_devkit/build_angular/src/karma/schema.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/karma/schema.json b/packages/angular_devkit/build_angular/src/karma/schema.json
index 4316a48ca246..07c55a413404 100644
--- a/packages/angular_devkit/build_angular/src/karma/schema.json
+++ b/packages/angular_devkit/build_angular/src/karma/schema.json
@@ -64,7 +64,8 @@
     },
     "sourceMap": {
       "type": "boolean",
-      "description": "Output sourcemaps."
+      "description": "Output sourcemaps.",
+      "default": true
     },
     "vendorSourceMap": {
       "type": "boolean",

From 0efd002d0d357d4a0ddbf865814c05bf27571c6b Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 18 Sep 2018 09:13:35 +0200
Subject: [PATCH 0144/1703] docs: remove `--prod` as it's no longer needed

Closes #12290
---
 docs/documentation/stories/create-library.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/docs/documentation/stories/create-library.md b/docs/documentation/stories/create-library.md
index 8ccf97421c49..529cfb8becfc 100644
--- a/docs/documentation/stories/create-library.md
+++ b/docs/documentation/stories/create-library.md
@@ -62,7 +62,7 @@ If this happens just rebuild your library.
 To publish your library follow these steps:
 
 ```
-ng build my-lib --prod
+ng build my-lib
 cd dist/my-lib
 npm publish
 ```
@@ -71,9 +71,6 @@ If you've never published a package in npm before, you will need to create a use
 You can read more about publishing on npm here:
 https://docs.npmjs.com/getting-started/publishing-npm-packages
 
-The `--prod` flag should be used when building to publish because it will completely clean the build
-directory for the library beforehand, removing old code leftover code from previous versions.
-
 
 ## Why do I need to build the library everytime I make changes?
 

From 98c2747dd5f0df1006c8f15cc3ec377aeb309f21 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 13 Sep 2018 20:34:29 -0400
Subject: [PATCH 0145/1703] fix(@angular-devkit/build-angular): fully remove
 url inlining

---
 packages/angular_devkit/build_angular/package.json    |  1 -
 .../models/webpack-configs/common.ts                  | 11 +----------
 yarn.lock                                             | 10 +---------
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 391338213c1c..180ad9f2c8be 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -46,7 +46,6 @@
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.0",
     "terser-webpack-plugin": "1.0.2",
-    "url-loader": "1.1.1",
     "webpack": "4.17.2",
     "webpack-dev-middleware": "3.2.0",
     "webpack-dev-server": "3.1.7",
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index fe5ab77d2086..b7901ceab9df 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -271,19 +271,10 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
       rules: [
         { test: /\.html$/, loader: 'raw-loader' },
         {
-          test: /\.(eot|svg|cur)$/,
+          test: /\.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)$/,
           loader: 'file-loader',
           options: {
             name: `[name]${hashFormat.file}.[ext]`,
-            limit: 10000
-          }
-        },
-        {
-          test: /\.(jpg|png|webp|gif|otf|ttf|woff|woff2|ani)$/,
-          loader: 'url-loader',
-          options: {
-            name: `[name]${hashFormat.file}.[ext]`,
-            limit: 10000
           }
         },
         {
diff --git a/yarn.lock b/yarn.lock
index 0c4c640b6863..7e4b6e3f81b3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4958,7 +4958,7 @@ mime@^1.4.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
 
-mime@^2.0.3, mime@^2.3.1:
+mime@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
 
@@ -7817,14 +7817,6 @@ 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@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-1.1.1.tgz#4d1f3b4f90dde89f02c008e662d604d7511167c1"
-  dependencies:
-    loader-utils "^1.1.0"
-    mime "^2.0.3"
-    schema-utils "^1.0.0"
-
 url-parse-lax@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"

From 6cfb72acc2a459c7d8d130499423f6db692e2f5d Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 18 Sep 2018 12:07:25 -0400
Subject: [PATCH 0146/1703] fix(@angular/cli): support `--version` option

---
 packages/angular/cli/models/command-runner.ts |  6 +++-
 tests/legacy-cli/e2e/tests/misc/version.ts    | 33 ++++++++++++-------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/packages/angular/cli/models/command-runner.ts b/packages/angular/cli/models/command-runner.ts
index 9bd185486ca0..f6f2042c4c71 100644
--- a/packages/angular/cli/models/command-runner.ts
+++ b/packages/angular/cli/models/command-runner.ts
@@ -115,7 +115,11 @@ export async function runCommand(
 
   // if no commands were found, use `help`.
   if (commandName === undefined) {
-    commandName = 'help';
+    if (args.length === 1 && args[0] === '--version') {
+      commandName = 'version';
+    } else {
+      commandName = 'help';
+    }
   }
 
   let description: CommandDescription | null = null;
diff --git a/tests/legacy-cli/e2e/tests/misc/version.ts b/tests/legacy-cli/e2e/tests/misc/version.ts
index ce8362799941..121d1aa123e1 100644
--- a/tests/legacy-cli/e2e/tests/misc/version.ts
+++ b/tests/legacy-cli/e2e/tests/misc/version.ts
@@ -1,13 +1,22 @@
-import {deleteFile} from '../../utils/fs';
-import {ng} from '../../utils/process';
-
-
-export default function() {
-  return ng('version')
-    .then(() => deleteFile('angular.json'))
-    // doesn't fail on a project with missing angular.json
-    .then(() => ng('version'))
-    // Doesn't fail outside a project.
-    .then(() => process.chdir('/'))
-    .then(() => ng('version'));
+import { deleteFile } from '../../utils/fs';
+import { ng } from '../../utils/process';
+
+
+export default async function() {
+  const { stdout: commandOutput } = await ng('version');
+  const { stdout: optionOutput } = await ng('--version');
+  if (!optionOutput.includes('Angular CLI:')) {
+    throw new Error('version not displayed');
+  }
+  if (commandOutput !== optionOutput) {
+    throw new Error('version variants have differing output');
+  }
+
+  // doesn't fail on a project with missing angular.json
+  await deleteFile('angular.json');
+  await ng('version');
+
+  // Doesn't fail outside a project.
+  await process.chdir('/');
+  await ng('version');
 }

From c12d3ee329d6ac005415c37a7dc5257bbddc91f7 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 18 Sep 2018 20:39:35 -0400
Subject: [PATCH 0147/1703] refactor(@angular/cli): correct implicit returns

---
 packages/angular/cli/commands/config-impl.ts  | 4 ++++
 packages/angular/cli/models/command-runner.ts | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/packages/angular/cli/commands/config-impl.ts b/packages/angular/cli/commands/config-impl.ts
index db26faf30f9c..37b1156219c2 100644
--- a/packages/angular/cli/commands/config-impl.ts
+++ b/packages/angular/cli/commands/config-impl.ts
@@ -223,6 +223,8 @@ export class ConfigCommand extends Command<ConfigCommandSchema> {
     } else {
       this.logger.info(value.toString());
     }
+
+    return 0;
   }
 
   private set(options: ConfigCommandSchema) {
@@ -264,6 +266,8 @@ export class ConfigCommand extends Command<ConfigCommandSchema> {
 
     const output = JSON.stringify(configValue, null, 2);
     writeFileSync(configPath, output);
+
+    return 0;
   }
 
 }
diff --git a/packages/angular/cli/models/command-runner.ts b/packages/angular/cli/models/command-runner.ts
index f6f2042c4c71..209ed1be62f3 100644
--- a/packages/angular/cli/models/command-runner.ts
+++ b/packages/angular/cli/models/command-runner.ts
@@ -77,6 +77,8 @@ export async function runCommand(
       const content = readFileSync(join(__dirname, '..', uri.substr('ng-cli://'.length)), 'utf-8');
 
       return of(JSON.parse(content));
+    } else {
+      return null;
     }
   });
 

From 80b94ad2f48afea0147f96fa4f5f30b5c7753c3d Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 18 Sep 2018 20:40:04 -0400
Subject: [PATCH 0148/1703] refactor(@angular-devkit/build-angular): correct
 implicit returns

---
 .../build_angular/src/app-shell/index.ts           | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/app-shell/index.ts b/packages/angular_devkit/build_angular/src/app-shell/index.ts
index b51cb6f6ce68..2d1bc1cdef92 100644
--- a/packages/angular_devkit/build_angular/src/app-shell/index.ts
+++ b/packages/angular_devkit/build_angular/src/app-shell/index.ts
@@ -168,14 +168,13 @@ export class AppShellBuilder implements Builder<BuildWebpackAppShellSchema> {
             document: indexHtml,
             url: options.route,
           })
-          .then((html: string) => {
-            return this.context.host
+          .then(async (html: string) => {
+            await this.context.host
               .write(outputIndexPath, virtualFs.stringToFileBuffer(html))
               .toPromise();
-          })
-          .then(() => {
+
             if (browserOptions.serviceWorker) {
-              return augmentAppWithServiceWorker(
+              await augmentAppWithServiceWorker(
                 this.context.host,
                 root,
                 projectRoot,
@@ -184,8 +183,9 @@ export class AppShellBuilder implements Builder<BuildWebpackAppShellSchema> {
                 browserOptions.ngswConfigPath,
               );
             }
-          })
-          .then(() => ({ success: true })),
+
+            return { success: true };
+          }),
         );
       }),
     );

From f5314531f513267f17b67faf5966f45568ff264c Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 18 Sep 2018 20:40:19 -0400
Subject: [PATCH 0149/1703] refactor(@angular-devkit/build-optimizer): correct
 implicit returns

---
 .../src/helpers/transform-javascript.ts       | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/packages/angular_devkit/build_optimizer/src/helpers/transform-javascript.ts b/packages/angular_devkit/build_optimizer/src/helpers/transform-javascript.ts
index 8cb1ac8ae634..efd568e70f21 100644
--- a/packages/angular_devkit/build_optimizer/src/helpers/transform-javascript.ts
+++ b/packages/angular_devkit/build_optimizer/src/helpers/transform-javascript.ts
@@ -31,27 +31,21 @@ interface DiagnosticSourceFile extends ts.SourceFile {
 
 function validateDiagnostics(diagnostics: ReadonlyArray<ts.Diagnostic>, strict?: boolean): boolean {
   // Print error diagnostics.
-  const checkDiagnostics = (diagnostics: ReadonlyArray<ts.Diagnostic>) => {
-    if (diagnostics && diagnostics.length > 0) {
-      let errors = '';
-      errors = errors + '\n' + ts.formatDiagnostics(diagnostics, {
-        getCurrentDirectory: () => ts.sys.getCurrentDirectory(),
-        getNewLine: () => ts.sys.newLine,
-        getCanonicalFileName: (f: string) => f,
-      });
-
-      return errors;
-    }
-  };
 
   const hasError = diagnostics.some(diag => diag.category === ts.DiagnosticCategory.Error);
   if (hasError) {
     // Throw only if we're in strict mode, otherwise return original content.
     if (strict) {
+      const errorMessages = ts.formatDiagnostics(diagnostics, {
+        getCurrentDirectory: () => ts.sys.getCurrentDirectory(),
+        getNewLine: () => ts.sys.newLine,
+        getCanonicalFileName: (f: string) => f,
+      });
+
       throw new Error(`
         TS failed with the following error messages:
 
-        ${checkDiagnostics(diagnostics)}
+        ${errorMessages}
       `);
     } else {
       return false;

From c277b607be7c6f790bb4945d48b9724090b568ee Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 18 Sep 2018 19:13:10 -0400
Subject: [PATCH 0150/1703] build: remove old monorepo version file

---
 versions.json | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 versions.json

diff --git a/versions.json b/versions.json
deleted file mode 100644
index 8c538a76d547..000000000000
--- a/versions.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "versions": {
-    "@_/benchmark": "0.0.10",
-    "@angular-devkit/build-optimizer": "0.0.26",
-    "@angular-devkit/core": "0.0.19",
-    "@angular-devkit/schematics": "0.0.32",
-    "@schematics/angular": "0.0.44",
-    "@schematics/schematics": "0.0.1"
-  },
-  "hashes": {
-    "@_/benchmark": "37ed7e417435c92dbf301e7b26ea37ca",
-    "@angular-devkit/core": "5a4d2636cd6cd66b3733884d4d322076",
-    "@angular-devkit/schematics": "2595b05b283c6c47c24930f0950a6266",
-    "@schematics/angular": "f88f704937ac0dd574166ec27e5c407c",
-    "@angular-devkit/build-optimizer": "e2c0761a3c38064f24e89b1dd6be6dac",
-    "@schematics/schematics": "54fdf2ec654a11af6d6623b08295624f"
-  }
-}

From b502847c7337f544f624ae8a40e2c2e87b16e26b Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 18 Sep 2018 19:14:57 -0400
Subject: [PATCH 0151/1703] build: remove unneeded gitignore file

---
 packages/angular/cli/lib/config/.gitignore | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 packages/angular/cli/lib/config/.gitignore

diff --git a/packages/angular/cli/lib/config/.gitignore b/packages/angular/cli/lib/config/.gitignore
deleted file mode 100644
index 879ebeae0a5f..000000000000
--- a/packages/angular/cli/lib/config/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-schema.d.ts
\ No newline at end of file

From 46da426d0a1191302a2faa324d589ff38c519f90 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 18 Sep 2018 19:10:31 -0400
Subject: [PATCH 0152/1703] build: update nvmrc to use node 10

---
 .nvmrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.nvmrc b/.nvmrc
index 45a4fb75db86..f599e28b8ab0 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-8
+10

From 95f29fbb82baf3c018f71999ecf2cea6ebb0654e Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 18 Sep 2018 13:25:15 -0400
Subject: [PATCH 0153/1703] refactor(@angular-devkit/build-optimizer): remove
 unused import purifier

---
 .../build-optimizer/build-optimizer_spec.ts   |  2 -
 .../src/transforms/prefix-functions.ts        | 34 -----------------
 .../src/transforms/prefix-functions_spec.ts   | 38 -------------------
 3 files changed, 74 deletions(-)

diff --git a/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer_spec.ts b/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer_spec.ts
index 5fccf594001e..af7d436250c1 100644
--- a/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer_spec.ts
@@ -58,7 +58,6 @@ describe('build-optimizer', () => {
       `;
       // tslint:disable:max-line-length
       const output = tags.oneLine`
-        /** PURE_IMPORTS_START _angular_core,tslib PURE_IMPORTS_END */
         ${imports}
         import { __extends } from "tslib";
         var ChangeDetectionStrategy = /*@__PURE__*/ (function (ChangeDetectionStrategy) {
@@ -93,7 +92,6 @@ describe('build-optimizer', () => {
 
     it('supports flagging module as side-effect free', () => {
       const output = tags.oneLine`
-        /** PURE_IMPORTS_START  PURE_IMPORTS_END */
         var RenderType_MdOption = /*@__PURE__*/ ɵcrt({ encapsulation: 2, styles: styles_MdOption });
       `;
       const input = tags.stripIndent`
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions.ts b/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions.ts
index 5a9e2d9ec36e..99d6227b65a5 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions.ts
@@ -15,20 +15,8 @@ export function getPrefixFunctionsTransformer(): ts.TransformerFactory<ts.Source
     const transformer: ts.Transformer<ts.SourceFile> = (sf: ts.SourceFile) => {
 
       const topLevelFunctions = findTopLevelFunctions(sf);
-      const pureImports = findPureImports(sf);
-      const pureImportsComment = `* PURE_IMPORTS_START ${pureImports.join(',')} PURE_IMPORTS_END `;
 
       const visitor: ts.Visitor = (node: ts.Node): ts.Node => {
-
-        // Add the pure imports comment to the first node.
-        if (node.parent && node.parent.parent === undefined && node.pos === 0) {
-          const newNode = ts.addSyntheticLeadingComment(
-            node, ts.SyntaxKind.MultiLineCommentTrivia, pureImportsComment, true);
-
-          // Replace node with modified one.
-          return ts.visitEachChild(newNode, visitor, context);
-        }
-
         // Add pure function comment to top level functions.
         if (topLevelFunctions.has(node)) {
           const newNode = ts.addSyntheticLeadingComment(
@@ -109,28 +97,6 @@ export function findTopLevelFunctions(parentNode: ts.Node): Set<ts.Node> {
   return topLevelFunctions;
 }
 
-export function findPureImports(parentNode: ts.Node): string[] {
-  const pureImports: string[] = [];
-  ts.forEachChild(parentNode, cb);
-
-  function cb(node: ts.Node) {
-    if (node.kind === ts.SyntaxKind.ImportDeclaration
-      && (node as ts.ImportDeclaration).importClause) {
-
-      // Save the path of the import transformed into snake case and remove relative paths.
-      const moduleSpecifier = (node as ts.ImportDeclaration).moduleSpecifier as ts.StringLiteral;
-      const pureImport = moduleSpecifier.text
-        .replace(/[\/@\-]/g, '_')
-        .replace(/^\.+/, '');
-      pureImports.push(pureImport);
-    }
-
-    ts.forEachChild(node, cb);
-  }
-
-  return pureImports;
-}
-
 function hasPureComment(node: ts.Node) {
   if (!node) {
     return false;
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions_spec.ts
index 662f69ce9711..459eb69fda8c 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions_spec.ts
@@ -15,45 +15,14 @@ const transform = (content: string) => transformJavascript(
   { content, getTransforms: [getPrefixFunctionsTransformer] }).content;
 
 describe('prefix-functions', () => {
-  const emptyImportsComment = '/** PURE_IMPORTS_START  PURE_IMPORTS_END */';
   const clazz = 'var Clazz = (function () { function Clazz() { } return Clazz; }());';
 
-  describe('pure imports', () => {
-    it('adds import list', () => {
-      const input = tags.stripIndent`
-        import { Injectable } from '@angular/core';
-        import { Something } from './relative/pure_import';
-        var foo = Injectable;
-        var bar = Something;
-      `;
-      const output = tags.stripIndent`
-        /** PURE_IMPORTS_START _angular_core,_relative_pure_import PURE_IMPORTS_END */
-        ${input}
-      `;
-
-      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
-    });
-
-    it('adds import list even with no imports', () => {
-      const input = tags.stripIndent`
-        var foo = 42;
-      `;
-      const output = tags.stripIndent`
-        ${emptyImportsComment}
-        ${input}
-      `;
-
-      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
-    });
-  });
-
   describe('pure functions', () => {
     it('adds comment to new calls', () => {
       const input = tags.stripIndent`
         var newClazz = new Clazz();
       `;
       const output = tags.stripIndent`
-        ${emptyImportsComment}
         var newClazz = /*@__PURE__*/ new Clazz();
       `;
 
@@ -65,7 +34,6 @@ describe('prefix-functions', () => {
         var newClazz = Clazz();
       `;
       const output = tags.stripIndent`
-        ${emptyImportsComment}
         var newClazz = /*@__PURE__*/ Clazz();
       `;
 
@@ -78,7 +46,6 @@ describe('prefix-functions', () => {
         var ClazzTwo = (function () { function Clazz() { } return Clazz; })();
       `;
       const output = tags.stripIndent`
-        ${emptyImportsComment}
         var Clazz = /*@__PURE__*/ (function () { function Clazz() { } return Clazz; }());
         var ClazzTwo = /*@__PURE__*/ (function () { function Clazz() { } return Clazz; })();
       `;
@@ -99,7 +66,6 @@ describe('prefix-functions', () => {
         };
       `;
       const output = tags.stripIndent`
-        ${emptyImportsComment}
         ${input}
       `;
 
@@ -118,7 +84,6 @@ describe('prefix-functions', () => {
         export { MyFunction };
       `;
       const output = tags.stripIndent`
-        ${emptyImportsComment}
         ${input}
       `;
 
@@ -137,7 +102,6 @@ describe('prefix-functions', () => {
         }
       `;
       const output = tags.stripIndent`
-        ${emptyImportsComment}
         ${input}
       `;
 
@@ -156,7 +120,6 @@ describe('prefix-functions', () => {
         };
       `;
       const output = tags.stripIndent`
-        ${emptyImportsComment}
         ${input}
       `;
 
@@ -172,7 +135,6 @@ describe('prefix-functions', () => {
         };
       `;
       const output = tags.stripIndent`
-        ${emptyImportsComment}
         ${input}
       `;
 

From a8a60a7faf29464f1a38017a864ba1ea0df1abf6 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 18 Sep 2018 14:08:43 -0400
Subject: [PATCH 0154/1703] refactor(@angular-devkit/build-optimizer): minor
 type cleanup

---
 .../build_optimizer/src/transforms/wrap-enums.ts    | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
index ca943192a901..6a31fdcb5172 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
@@ -17,8 +17,7 @@ function isBlockLike(node: ts.Node): node is ts.BlockLike {
 
 export function getWrapEnumsTransformer(): ts.TransformerFactory<ts.SourceFile> {
   return (context: ts.TransformationContext): ts.Transformer<ts.SourceFile> => {
-    const transformer: ts.Transformer<ts.SourceFile> = (sf: ts.SourceFile) => {
-
+    const transformer: ts.Transformer<ts.SourceFile> = sf => {
       const result = visitBlockStatements(sf.statements, context);
 
       return ts.updateSourceFileNode(sf, ts.setTextRange(result, sf.statements));
@@ -45,15 +44,13 @@ function visitBlockStatements(
       result = ts.setTextRange(result, node.statements);
       switch (node.kind) {
         case ts.SyntaxKind.Block:
-          return ts.updateBlock(node as ts.Block, result);
+          return ts.updateBlock(node, result);
         case ts.SyntaxKind.ModuleBlock:
-          return ts.updateModuleBlock(node as ts.ModuleBlock, result);
+          return ts.updateModuleBlock(node, result);
         case ts.SyntaxKind.CaseClause:
-          const clause = node as ts.CaseClause;
-
-          return ts.updateCaseClause(clause, clause.expression, result);
+          return ts.updateCaseClause(node, node.expression, result);
         case ts.SyntaxKind.DefaultClause:
-          return ts.updateDefaultClause(node as ts.DefaultClause, result);
+          return ts.updateDefaultClause(node, result);
         default:
           return node;
       }

From 5890759a9f1501d94aa034d7a67c5715e65d6c83 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 18 Sep 2018 14:13:44 -0400
Subject: [PATCH 0155/1703] fix(@angular-devkit/build-optimizer): deprecate
 transform test functions

These were not intended to be part of the public API and will eventually be removed completely.
---
 .../build_optimizer/src/transforms/import-tslib.ts            | 4 +++-
 .../build_optimizer/src/transforms/prefix-classes.ts          | 4 +++-
 .../build_optimizer/src/transforms/scrub-file.ts              | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/build_optimizer/src/transforms/import-tslib.ts b/packages/angular_devkit/build_optimizer/src/transforms/import-tslib.ts
index 458c4a540f79..61ec752db640 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/import-tslib.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/import-tslib.ts
@@ -7,7 +7,9 @@
  */
 import * as ts from 'typescript';
 
-
+/**
+ * @deprecated From 0.9.0
+ */
 export function testImportTslib(content: string) {
   const regex = /var (__extends|__decorate|__metadata|__param) = \(.*\r?\n(    .*\r?\n)*\};/;
 
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts b/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts
index 678cab7a3205..3535cbf7cfaf 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts
@@ -7,7 +7,9 @@
  */
 import * as ts from 'typescript';
 
-
+/**
+ * @deprecated From 0.9.0
+ */
 export function testPrefixClasses(content: string) {
   const exportVarSetter = /(?:export )?(?:var|const)\s+(\S+)\s*=\s*/;
   const multiLineComment = /\s*(?:\/\*[\s\S]*?\*\/)?\s*/;
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/scrub-file.ts b/packages/angular_devkit/build_optimizer/src/transforms/scrub-file.ts
index 5e7ed7afa48b..2f89eb1336d4 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/scrub-file.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/scrub-file.ts
@@ -8,7 +8,9 @@
 import * as ts from 'typescript';
 import { collectDeepNodes } from '../helpers/ast-utils';
 
-
+/**
+ * @deprecated From 0.9.0
+ */
 export function testScrubFile(content: string) {
   const markers = [
     'decorators',

From 020e696a5570cea59ec14b363c2f6cf94a2d1292 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 18 Sep 2018 19:08:42 -0400
Subject: [PATCH 0156/1703] test: remove development purify bin helper

---
 bin/purify   | 14 --------------
 package.json |  1 -
 2 files changed, 15 deletions(-)
 delete mode 100755 bin/purify

diff --git a/bin/purify b/bin/purify
deleted file mode 100755
index 810b4d6820b9..000000000000
--- a/bin/purify
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env node
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-'use strict';
-
-
-require('../lib/bootstrap-local');
-const packages = require('../lib/packages').packages;
-require(packages['@angular-devkit/build-optimizer'].bin['purify']);
diff --git a/package.json b/package.json
index c31ddb9ff2e3..cb99390c3e09 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,6 @@
     "build-optimizer": "./bin/build-optimizer",
     "devkit-admin": "./bin/devkit-admin",
     "ng": "./bin/ng",
-    "purify": "./bin/purify",
     "schematics": "./bin/schematics"
   },
   "keywords": [

From 72a65ddf5e14080b1a0235d67704a29cb202fae5 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 18 Sep 2018 19:49:38 -0400
Subject: [PATCH 0157/1703] feat(@angular-devkit/build-angular): update webpack
 dependencies

memory leak fix, security vulnerability package updates, hash integrity fix, and other minor defect fixes
---
 .../angular_devkit/build_angular/package.json |  12 +-
 yarn.lock                                     | 374 ++++++++----------
 2 files changed, 165 insertions(+), 221 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 180ad9f2c8be..3f1b61dba346 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -26,7 +26,7 @@
     "less-loader": "4.1.0",
     "license-webpack-plugin": "1.4.0",
     "loader-utils": "1.1.0",
-    "mini-css-extract-plugin": "0.4.2",
+    "mini-css-extract-plugin": "0.4.3",
     "minimatch": "3.0.4",
     "parse5": "4.0.0",
     "opn": "5.3.0",
@@ -45,13 +45,13 @@
     "stylus": "0.54.5",
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.0",
-    "terser-webpack-plugin": "1.0.2",
-    "webpack": "4.17.2",
-    "webpack-dev-middleware": "3.2.0",
-    "webpack-dev-server": "3.1.7",
+    "terser-webpack-plugin": "1.1.0",
+    "webpack": "4.19.1",
+    "webpack-dev-middleware": "3.3.0",
+    "webpack-dev-server": "3.1.8",
     "webpack-merge": "4.1.4",
     "webpack-sources": "1.2.0",
-    "webpack-subresource-integrity": "1.1.0-rc.4"
+    "webpack-subresource-integrity": "1.1.0-rc.6"
   },
   "optionalDependencies": {
     "node-sass": "4.9.3"
diff --git a/yarn.lock b/yarn.lock
index 7e4b6e3f81b3..0fbf50f4cfbc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -492,141 +492,142 @@
     "@types/uglify-js" "*"
     source-map "^0.6.0"
 
-"@webassemblyjs/ast@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.13.tgz#81155a570bd5803a30ec31436bc2c9c0ede38f25"
+"@webassemblyjs/ast@1.7.6":
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.6.tgz#3ef8c45b3e5e943a153a05281317474fef63e21e"
   dependencies:
-    "@webassemblyjs/helper-module-context" "1.5.13"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.13"
-    "@webassemblyjs/wast-parser" "1.5.13"
-    debug "^3.1.0"
+    "@webassemblyjs/helper-module-context" "1.7.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.6"
+    "@webassemblyjs/wast-parser" "1.7.6"
     mamacro "^0.0.3"
 
-"@webassemblyjs/floating-point-hex-parser@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.13.tgz#29ce0baa97411f70e8cce68ce9c0f9d819a4e298"
+"@webassemblyjs/floating-point-hex-parser@1.7.6":
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.6.tgz#7cb37d51a05c3fe09b464ae7e711d1ab3837801f"
 
-"@webassemblyjs/helper-api-error@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.13.tgz#e49b051d67ee19a56e29b9aa8bd949b5b4442a59"
+"@webassemblyjs/helper-api-error@1.7.6":
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.6.tgz#99b7e30e66f550a2638299a109dda84a622070ef"
 
-"@webassemblyjs/helper-buffer@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.13.tgz#873bb0a1b46449231137c1262ddfd05695195a1e"
-  dependencies:
-    debug "^3.1.0"
+"@webassemblyjs/helper-buffer@1.7.6":
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.6.tgz#ba0648be12bbe560c25c997e175c2018df39ca3e"
 
-"@webassemblyjs/helper-code-frame@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.13.tgz#1bd2181b6a0be14e004f0fe9f5a660d265362b58"
+"@webassemblyjs/helper-code-frame@1.7.6":
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.6.tgz#5a94d21b0057b69a7403fca0c253c3aaca95b1a5"
   dependencies:
-    "@webassemblyjs/wast-printer" "1.5.13"
+    "@webassemblyjs/wast-printer" "1.7.6"
 
-"@webassemblyjs/helper-fsm@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.13.tgz#cdf3d9d33005d543a5c5e5adaabf679ffa8db924"
+"@webassemblyjs/helper-fsm@1.7.6":
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.6.tgz#ae1741c6f6121213c7a0b587fb964fac492d3e49"
 
-"@webassemblyjs/helper-module-context@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.13.tgz#dc29ddfb51ed657655286f94a5d72d8a489147c5"
+"@webassemblyjs/helper-module-context@1.7.6":
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.6.tgz#116d19a51a6cebc8900ad53ca34ff8269c668c23"
   dependencies:
-    debug "^3.1.0"
     mamacro "^0.0.3"
 
-"@webassemblyjs/helper-wasm-bytecode@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.13.tgz#03245817f0a762382e61733146f5773def15a747"
-
-"@webassemblyjs/helper-wasm-section@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.13.tgz#efc76f44a10d3073b584b43c38a179df173d5c7d"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.13"
-    "@webassemblyjs/helper-buffer" "1.5.13"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.13"
-    "@webassemblyjs/wasm-gen" "1.5.13"
-    debug "^3.1.0"
-
-"@webassemblyjs/ieee754@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.5.13.tgz#573e97c8c12e4eebb316ca5fde0203ddd90b0364"
-  dependencies:
-    ieee754 "^1.1.11"
-
-"@webassemblyjs/leb128@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.13.tgz#ab52ebab9cec283c1c1897ac1da833a04a3f4cee"
-  dependencies:
-    long "4.0.0"
-
-"@webassemblyjs/utf8@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.5.13.tgz#6b53d2cd861cf94fa99c1f12779dde692fbc2469"
-
-"@webassemblyjs/wasm-edit@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.13.tgz#c9cef5664c245cf11b3b3a73110c9155831724a8"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.13"
-    "@webassemblyjs/helper-buffer" "1.5.13"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.13"
-    "@webassemblyjs/helper-wasm-section" "1.5.13"
-    "@webassemblyjs/wasm-gen" "1.5.13"
-    "@webassemblyjs/wasm-opt" "1.5.13"
-    "@webassemblyjs/wasm-parser" "1.5.13"
-    "@webassemblyjs/wast-printer" "1.5.13"
-    debug "^3.1.0"
+"@webassemblyjs/helper-wasm-bytecode@1.7.6":
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.6.tgz#98e515eaee611aa6834eb5f6a7f8f5b29fefb6f1"
+
+"@webassemblyjs/helper-wasm-section@1.7.6":
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.6.tgz#783835867bdd686df7a95377ab64f51a275e8333"
+  dependencies:
+    "@webassemblyjs/ast" "1.7.6"
+    "@webassemblyjs/helper-buffer" "1.7.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.6"
+    "@webassemblyjs/wasm-gen" "1.7.6"
+
+"@webassemblyjs/ieee754@1.7.6":
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.6.tgz#c34fc058f2f831fae0632a8bb9803cf2d3462eb1"
+  dependencies:
+    "@xtuc/ieee754" "^1.2.0"
+
+"@webassemblyjs/leb128@1.7.6":
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.6.tgz#197f75376a29f6ed6ace15898a310d871d92f03b"
+  dependencies:
+    "@xtuc/long" "4.2.1"
+
+"@webassemblyjs/utf8@1.7.6":
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.6.tgz#eb62c66f906af2be70de0302e29055d25188797d"
+
+"@webassemblyjs/wasm-edit@1.7.6":
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.6.tgz#fa41929160cd7d676d4c28ecef420eed5b3733c5"
+  dependencies:
+    "@webassemblyjs/ast" "1.7.6"
+    "@webassemblyjs/helper-buffer" "1.7.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.6"
+    "@webassemblyjs/helper-wasm-section" "1.7.6"
+    "@webassemblyjs/wasm-gen" "1.7.6"
+    "@webassemblyjs/wasm-opt" "1.7.6"
+    "@webassemblyjs/wasm-parser" "1.7.6"
+    "@webassemblyjs/wast-printer" "1.7.6"
+
+"@webassemblyjs/wasm-gen@1.7.6":
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.6.tgz#695ac38861ab3d72bf763c8c75e5f087ffabc322"
+  dependencies:
+    "@webassemblyjs/ast" "1.7.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.6"
+    "@webassemblyjs/ieee754" "1.7.6"
+    "@webassemblyjs/leb128" "1.7.6"
+    "@webassemblyjs/utf8" "1.7.6"
+
+"@webassemblyjs/wasm-opt@1.7.6":
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.6.tgz#fbafa78e27e1a75ab759a4b658ff3d50b4636c21"
+  dependencies:
+    "@webassemblyjs/ast" "1.7.6"
+    "@webassemblyjs/helper-buffer" "1.7.6"
+    "@webassemblyjs/wasm-gen" "1.7.6"
+    "@webassemblyjs/wasm-parser" "1.7.6"
+
+"@webassemblyjs/wasm-parser@1.7.6":
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.6.tgz#84eafeeff405ad6f4c4b5777d6a28ae54eed51fe"
+  dependencies:
+    "@webassemblyjs/ast" "1.7.6"
+    "@webassemblyjs/helper-api-error" "1.7.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.6"
+    "@webassemblyjs/ieee754" "1.7.6"
+    "@webassemblyjs/leb128" "1.7.6"
+    "@webassemblyjs/utf8" "1.7.6"
+
+"@webassemblyjs/wast-parser@1.7.6":
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.6.tgz#ca4d20b1516e017c91981773bd7e819d6bd9c6a7"
+  dependencies:
+    "@webassemblyjs/ast" "1.7.6"
+    "@webassemblyjs/floating-point-hex-parser" "1.7.6"
+    "@webassemblyjs/helper-api-error" "1.7.6"
+    "@webassemblyjs/helper-code-frame" "1.7.6"
+    "@webassemblyjs/helper-fsm" "1.7.6"
+    "@xtuc/long" "4.2.1"
+    mamacro "^0.0.3"
 
-"@webassemblyjs/wasm-gen@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.13.tgz#8e6ea113c4b432fa66540189e79b16d7a140700e"
+"@webassemblyjs/wast-printer@1.7.6":
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.6.tgz#a6002c526ac5fa230fe2c6d2f1bdbf4aead43a5e"
   dependencies:
-    "@webassemblyjs/ast" "1.5.13"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.13"
-    "@webassemblyjs/ieee754" "1.5.13"
-    "@webassemblyjs/leb128" "1.5.13"
-    "@webassemblyjs/utf8" "1.5.13"
+    "@webassemblyjs/ast" "1.7.6"
+    "@webassemblyjs/wast-parser" "1.7.6"
+    "@xtuc/long" "4.2.1"
 
-"@webassemblyjs/wasm-opt@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.13.tgz#147aad7717a7ee4211c36b21a5f4c30dddf33138"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.13"
-    "@webassemblyjs/helper-buffer" "1.5.13"
-    "@webassemblyjs/wasm-gen" "1.5.13"
-    "@webassemblyjs/wasm-parser" "1.5.13"
-    debug "^3.1.0"
-
-"@webassemblyjs/wasm-parser@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.13.tgz#6f46516c5bb23904fbdf58009233c2dd8a54c72f"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.13"
-    "@webassemblyjs/helper-api-error" "1.5.13"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.13"
-    "@webassemblyjs/ieee754" "1.5.13"
-    "@webassemblyjs/leb128" "1.5.13"
-    "@webassemblyjs/utf8" "1.5.13"
-
-"@webassemblyjs/wast-parser@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.13.tgz#5727a705d397ae6a3ae99d7f5460acf2ec646eea"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.13"
-    "@webassemblyjs/floating-point-hex-parser" "1.5.13"
-    "@webassemblyjs/helper-api-error" "1.5.13"
-    "@webassemblyjs/helper-code-frame" "1.5.13"
-    "@webassemblyjs/helper-fsm" "1.5.13"
-    long "^3.2.0"
-    mamacro "^0.0.3"
+"@xtuc/ieee754@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
 
-"@webassemblyjs/wast-printer@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.13.tgz#bb34d528c14b4f579e7ec11e793ec50ad7cd7c95"
-  dependencies:
-    "@webassemblyjs/ast" "1.5.13"
-    "@webassemblyjs/wast-parser" "1.5.13"
-    long "^3.2.0"
+"@xtuc/long@4.2.1":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
 
 JSONStream@^1.0.4:
   version "1.3.4"
@@ -2384,7 +2385,7 @@ dns-txt@^2.0.2:
 
 dom-converter@~0.1:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b"
+  resolved "http://registry.npmjs.org/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b"
   dependencies:
     utila "~0.3"
 
@@ -3684,7 +3685,7 @@ iconv-lite@^0.4.24, iconv-lite@^0.4.4:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-ieee754@^1.1.11, ieee754@^1.1.4:
+ieee754@^1.1.4:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
 
@@ -3730,13 +3731,6 @@ import-lazy@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
 
-import-local@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
-  dependencies:
-    pkg-dir "^2.0.0"
-    resolve-cwd "^2.0.0"
-
 import-local@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
@@ -4692,10 +4686,14 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
-lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.5.0, lodash@~4.17.10:
+lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.5.0, lodash@~4.17.10:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
 
+lodash@^4.17.3:
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+
 log4js@^3.0.0:
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.5.tgz#b80146bfebad68b430d4f3569556d8a6edfef303"
@@ -4720,11 +4718,7 @@ loglevel@^1.4.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
 
-long@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
-
-long@^3.2.0, long@~3:
+long@~3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
 
@@ -4833,12 +4827,6 @@ media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
 
-mem@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
-  dependencies:
-    mimic-fn "^1.0.0"
-
 mem@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf"
@@ -4970,9 +4958,9 @@ mimic-response@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
 
-mini-css-extract-plugin@0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.2.tgz#b3ecc0d6b1bbe5ff14add42b946a7b200cf78651"
+mini-css-extract-plugin@0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.3.tgz#98d60fcc5d228c3e36a9bd15a1d6816d6580beb8"
   dependencies:
     loader-utils "^1.1.0"
     schema-utils "^1.0.0"
@@ -5544,14 +5532,6 @@ os-locale@^1.4.0:
   dependencies:
     lcid "^1.0.0"
 
-os-locale@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
-  dependencies:
-    execa "^0.7.0"
-    lcid "^1.0.0"
-    mem "^1.1.0"
-
 os-locale@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.0.1.tgz#3b014fbf01d87f60a1e5348d80fe870dc82c4620"
@@ -6270,7 +6250,7 @@ read-pkg@^3.0.0:
 
 readable-stream@1.0:
   version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -7388,6 +7368,10 @@ tapable@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
 
+tapable@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c"
+
 tar@^2.0.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
@@ -7421,9 +7405,9 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
-terser-webpack-plugin@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.0.2.tgz#b62dfdc4e59b0b5093665a765b234645b598d1a5"
+terser-webpack-plugin@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.1.0.tgz#cf7c25a1eee25bf121f4a587bb9e004e3f80e528"
   dependencies:
     cacache "^11.0.2"
     find-cache-dir "^2.0.0"
@@ -7996,40 +7980,18 @@ webpack-dev-middleware@3.2.0:
     url-join "^4.0.0"
     webpack-log "^2.0.0"
 
-webpack-dev-server@3.1.7:
-  version "3.1.7"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.7.tgz#cbf8071cc092d9493732aee4f062f0e065994854"
+webpack-dev-middleware@3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.3.0.tgz#8104daf4d4f65defe06ee2eaaeea612a7c541462"
   dependencies:
-    ansi-html "0.0.7"
-    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 "^3.0.1"
-    ip "^1.1.5"
-    killable "^1.0.0"
-    loglevel "^1.4.1"
-    opn "^5.1.0"
-    portfinder "^1.0.9"
-    schema-utils "^1.0.0"
-    selfsigned "^1.9.1"
-    serve-index "^1.7.2"
-    sockjs "0.3.19"
-    sockjs-client "1.1.5"
-    spdy "^3.4.1"
-    strip-ansi "^3.0.0"
-    supports-color "^5.1.0"
-    webpack-dev-middleware "3.2.0"
+    loud-rejection "^1.6.0"
+    memory-fs "~0.4.1"
+    mime "^2.3.1"
+    range-parser "^1.0.3"
+    url-join "^4.0.0"
     webpack-log "^2.0.0"
-    yargs "12.0.1"
 
-webpack-dev-server@^3.1.4:
+webpack-dev-server@3.1.8, webpack-dev-server@^3.1.4:
   version "3.1.8"
   resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.8.tgz#eb7a95945d1108170f902604fb3b939533d9daeb"
   dependencies:
@@ -8082,21 +8044,20 @@ webpack-sources@1.2.0, webpack-sources@^1.1.0, webpack-sources@^1.2.0:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-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"
+webpack-subresource-integrity@1.1.0-rc.6:
+  version "1.1.0-rc.6"
+  resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz#37f6f1264e1eb378e41465a98da80fad76ab8886"
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.17.2, webpack@^4.0.0, webpack@^4.6.0:
-  version "4.17.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.17.2.tgz#49feb20205bd15f0a5f1fe0a12097d5d9931878d"
+webpack@4.19.1, webpack@^4.0.0, webpack@^4.6.0:
+  version "4.19.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.19.1.tgz#096674bc3b573f8756c762754366e5b333d6576f"
   dependencies:
-    "@webassemblyjs/ast" "1.5.13"
-    "@webassemblyjs/helper-module-context" "1.5.13"
-    "@webassemblyjs/wasm-edit" "1.5.13"
-    "@webassemblyjs/wasm-opt" "1.5.13"
-    "@webassemblyjs/wasm-parser" "1.5.13"
+    "@webassemblyjs/ast" "1.7.6"
+    "@webassemblyjs/helper-module-context" "1.7.6"
+    "@webassemblyjs/wasm-edit" "1.7.6"
+    "@webassemblyjs/wasm-parser" "1.7.6"
     acorn "^5.6.2"
     acorn-dynamic-import "^3.0.0"
     ajv "^6.1.0"
@@ -8113,7 +8074,7 @@ webpack@4.17.2, webpack@^4.0.0, webpack@^4.6.0:
     neo-async "^2.5.0"
     node-libs-browser "^2.0.0"
     schema-utils "^0.4.4"
-    tapable "^1.0.0"
+    tapable "^1.1.0"
     uglifyjs-webpack-plugin "^1.2.4"
     watchpack "^1.5.0"
     webpack-sources "^1.2.0"
@@ -8290,23 +8251,6 @@ yargs-parser@^5.0.0:
   dependencies:
     camelcase "^3.0.0"
 
-yargs@12.0.1:
-  version "12.0.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.1.tgz#6432e56123bb4e7c3562115401e98374060261c2"
-  dependencies:
-    cliui "^4.0.0"
-    decamelize "^2.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^2.0.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^10.1.0"
-
 yargs@12.0.2:
   version "12.0.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"

From e6f9ae98f5c3688b6efb9390956b0b60fbfaf228 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sat, 8 Sep 2018 16:57:09 +0200
Subject: [PATCH 0158/1703] fix(@angular/cli): fix schema error `Property
 targets is not allowed`

Closes #12192
---
 packages/angular/cli/lib/config/schema.json | 28 +++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index b87f3b70a110..5bd45a03dc44 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -327,12 +327,40 @@
           "additionalProperties": {
             "$ref": "#/definitions/project/definitions/target"
           }
+        },
+        "targets": {
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/project/definitions/target"
+          }
         }
       },
       "required": [
         "root",
         "projectType"
       ],
+      "anyOf": [
+        {
+          "required": ["architect"],
+          "not": {
+            "required": ["targets"]
+          }
+        },
+        {
+          "required": ["targets"],
+          "not": {
+            "required": ["architect"]
+          }
+        },
+        {
+          "not": {
+            "required": [
+              "targets",
+              "architect"
+            ]
+          }
+        }
+      ],
       "additionalProperties": false,
       "patternProperties": {
         "^[a-z]{1,3}-.*": {}

From 3bb6548d15d7de83952fcc047ca1ef8593285682 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Mon, 17 Sep 2018 14:40:57 -0700
Subject: [PATCH 0159/1703] feat(@angular/cli): add usage notes to help JSON

---
 packages/angular/cli/models/interface.ts      | 10 +++++++++-
 packages/angular/cli/utilities/json-schema.ts | 18 +++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/packages/angular/cli/models/interface.ts b/packages/angular/cli/models/interface.ts
index 412d6f9c5fe6..60250a2bee3f 100644
--- a/packages/angular/cli/models/interface.ts
+++ b/packages/angular/cli/models/interface.ts
@@ -112,6 +112,9 @@ export enum CommandType {
   Default = Custom,
 }
 
+/**
+ * A description of a command, its metadata.
+ */
 export interface CommandDescription {
   name: string;
   description: string;
@@ -119,7 +122,12 @@ export interface CommandDescription {
   /**
    * A long description of the option, in Markdown format.
    */
-  longDescription: string;
+  longDescription?: string;
+
+  /**
+   * Additional notes about usage of this command.
+   */
+  usageNotes?: string;
 
   options: Option[];
 
diff --git a/packages/angular/cli/utilities/json-schema.ts b/packages/angular/cli/utilities/json-schema.ts
index ebe66c244a12..9bb46edade42 100644
--- a/packages/angular/cli/utilities/json-schema.ts
+++ b/packages/angular/cli/utilities/json-schema.ts
@@ -73,13 +73,29 @@ export async function parseJsonSchemaToCommandDescription(
     const ldPath = resolve(dirname(jsonPath), schema.$longDescription);
     longDescription = readFileSync(ldPath, 'utf-8');
   }
+  let usageNotes = '';
+  if (typeof schema.$usageNotes == 'string' && schema.$usageNotes) {
+    const unPath = resolve(dirname(jsonPath), schema.$usageNotes);
+    usageNotes = readFileSync(unPath, 'utf-8');
+  }
 
   const scope = _getEnumFromValue(schema.$scope, CommandScope, CommandScope.Default);
   const type = _getEnumFromValue(schema.$type, CommandType, CommandType.Default);
   const description = '' + (schema.description === undefined ? '' : schema.description);
   const hidden = !!schema.$hidden;
 
-  return { name, description, longDescription, hidden, type, options, aliases, scope, impl };
+  return {
+    name,
+    description,
+    ...(longDescription ? { longDescription } : {}),
+    ...(usageNotes ? { usageNotes } : {}),
+    hidden,
+    type,
+    options,
+    aliases,
+    scope,
+    impl,
+  };
 }
 
 export async function parseJsonSchemaToOptions(

From 86d803e80a635bc5420272f1c800bfa7dac8cadb Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Mon, 17 Sep 2018 14:49:28 -0700
Subject: [PATCH 0160/1703] docs(@angular/cli): add comments for Command
 interface

---
 packages/angular/cli/models/interface.ts      | 72 ++++++++++++++++++-
 packages/angular/cli/utilities/json-schema.ts |  3 +-
 2 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/packages/angular/cli/models/interface.ts b/packages/angular/cli/models/interface.ts
index 60250a2bee3f..01749de6def3 100644
--- a/packages/angular/cli/models/interface.ts
+++ b/packages/angular/cli/models/interface.ts
@@ -84,18 +84,56 @@ export interface Option {
    */
   description: string;
 
+  /**
+   * The type of option value. If multiple types exist, this type will be the first one, and the
+   * types array will contain all types accepted.
+   */
   type: OptionType | 'suboption';
+
+  /**
+   * {@see type}
+   */
   types?: OptionType[];
 
+  /**
+   * Aliases supported by this option.
+   */
   aliases: string[];
+
+  /**
+   * Whether this option is required or not.
+   */
   required?: boolean;
+
+  /**
+   * Format field of this option.
+   */
   format?: string;
+
+  /**
+   * Whether this option should be hidden from the help output. It will still show up in JSON help.
+   */
   hidden?: boolean;
+
+  /**
+   * Default value of this option.
+   */
   default?: string | number | boolean;
+
+  /**
+   * If this option can be used as an argument, the position of the argument. Otherwise omitted.
+   */
   positional?: number;
+
+  /**
+   * Smart default object.
+   */
   $default?: OptionSmartDefault;
 }
 
+/**
+ * Scope of the command.
+ */
 export enum CommandScope {
   InProject = 'in',
   OutProject = 'out',
@@ -116,7 +154,14 @@ export enum CommandType {
  * A description of a command, its metadata.
  */
 export interface CommandDescription {
+  /**
+   * Name of the command.
+   */
   name: string;
+
+  /**
+   * Short description (1-2 lines) of this command.
+   */
   description: string;
 
   /**
@@ -129,15 +174,40 @@ export interface CommandDescription {
    */
   usageNotes?: string;
 
+  /**
+   * List of all supported options.
+   */
   options: Option[];
 
+  /**
+   * Aliases supported for this command.
+   */
   aliases: string[];
+
+  /**
+   * Scope of the command, whether it can be executed in a project, outside of a project or
+   * anywhere.
+   */
   scope: CommandScope;
+
+  /**
+   * Type of command.
+   */
   type: CommandType;
 
+  /**
+   * Whether this command should be hidden from a list of all commands.
+   */
+  hidden: boolean;
+
+  /**
+   * The constructor of the command, which should be extending the abstract Command<> class.
+   */
   impl: CommandConstructor;
 
-  hidden: boolean;
+  /**
+   * Suboptions.
+   */
   suboptions?: {
     [name: string]: Option[];
   };
diff --git a/packages/angular/cli/utilities/json-schema.ts b/packages/angular/cli/utilities/json-schema.ts
index 9bb46edade42..e9c204fd3f0c 100644
--- a/packages/angular/cli/utilities/json-schema.ts
+++ b/packages/angular/cli/utilities/json-schema.ts
@@ -187,6 +187,7 @@ export async function parseJsonSchemaToOptions(
       }
     }
 
+    const type = types[0];
     const $default = current.$default;
     const $defaultIndex = (json.isJsonObject($default) && $default['$source'] == 'argv')
       ? $default['index'] : undefined;
@@ -204,7 +205,7 @@ export async function parseJsonSchemaToOptions(
     const option: Option = {
       name,
       description: '' + (current.description === undefined ? '' : current.description),
-      ...types.length == 1 ? { type: types[0] } : { type: types[0], types },
+      ...types.length == 1 ? { type } : { type, types },
       ...defaultValue !== undefined ? { default: defaultValue } : {},
       required,
       aliases,

From 6622aa9d1ad58297b047231d7ae7391fb44b9ada Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Mon, 17 Sep 2018 14:50:00 -0700
Subject: [PATCH 0161/1703] refactor(@angular/cli): remove command type

It was really unused.
---
 packages/angular/cli/models/interface.ts      | 13 -------------
 packages/angular/cli/utilities/json-schema.ts |  2 --
 2 files changed, 15 deletions(-)

diff --git a/packages/angular/cli/models/interface.ts b/packages/angular/cli/models/interface.ts
index 01749de6def3..0406d1af86cc 100644
--- a/packages/angular/cli/models/interface.ts
+++ b/packages/angular/cli/models/interface.ts
@@ -142,14 +142,6 @@ export enum CommandScope {
   Default = InProject,
 }
 
-export enum CommandType {
-  Custom = 'custom',
-  Architect = 'architect',
-  Schematic = 'schematics',
-
-  Default = Custom,
-}
-
 /**
  * A description of a command, its metadata.
  */
@@ -190,11 +182,6 @@ export interface CommandDescription {
    */
   scope: CommandScope;
 
-  /**
-   * Type of command.
-   */
-  type: CommandType;
-
   /**
    * Whether this command should be hidden from a list of all commands.
    */
diff --git a/packages/angular/cli/utilities/json-schema.ts b/packages/angular/cli/utilities/json-schema.ts
index e9c204fd3f0c..990488cca359 100644
--- a/packages/angular/cli/utilities/json-schema.ts
+++ b/packages/angular/cli/utilities/json-schema.ts
@@ -13,7 +13,6 @@ import {
   CommandConstructor,
   CommandDescription,
   CommandScope,
-  CommandType,
   Option,
   OptionType,
 } from '../models/interface';
@@ -90,7 +89,6 @@ export async function parseJsonSchemaToCommandDescription(
     ...(longDescription ? { longDescription } : {}),
     ...(usageNotes ? { usageNotes } : {}),
     hidden,
-    type,
     options,
     aliases,
     scope,

From 34818b034677d3e533da9f5edd57457148b0c314 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 18 Sep 2018 12:28:53 -0700
Subject: [PATCH 0162/1703] feat(@angular/cli): add subcommand to options

SubCommands are not tied to the option that triggers them. They
contain a subset of a CommandDescription interface, with at least
a short and long description and usage notes. These are generated
from the subcommand schema (e.g. schematics in case of generate).
---
 .../angular/cli/commands/generate-impl.ts     | 24 ++++---
 packages/angular/cli/models/command.ts        |  8 ++-
 packages/angular/cli/models/interface.ts      | 38 ++++++----
 packages/angular/cli/models/parser.ts         |  2 -
 .../angular/cli/models/schematic-command.ts   | 70 +++++++++++--------
 packages/angular/cli/utilities/json-schema.ts | 49 ++++++++-----
 6 files changed, 118 insertions(+), 73 deletions(-)

diff --git a/packages/angular/cli/commands/generate-impl.ts b/packages/angular/cli/commands/generate-impl.ts
index a47dc270f83f..b47808a7e1f9 100644
--- a/packages/angular/cli/commands/generate-impl.ts
+++ b/packages/angular/cli/commands/generate-impl.ts
@@ -8,9 +8,9 @@
 
 // tslint:disable:no-global-tslint-disable no-any
 import { terminal } from '@angular-devkit/core';
-import { Arguments, Option } from '../models/interface';
+import { Arguments, SubCommandDescription } from '../models/interface';
 import { SchematicCommand } from '../models/schematic-command';
-import { parseJsonSchemaToOptions } from '../utilities/json-schema';
+import { parseJsonSchemaToSubCommandDescription } from '../utilities/json-schema';
 import { Schema as GenerateCommandSchema } from './generate';
 
 export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
@@ -21,7 +21,7 @@ export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
     const [collectionName, schematicName] = this.parseSchematicInfo(options);
 
     const collection = this.getCollection(collectionName);
-    this.description.suboptions = {};
+    const subcommands: { [name: string]: SubCommandDescription } = {};
 
     const schematicNames = schematicName ? [schematicName] : collection.listSchematicNames();
     // Sort as a courtesy for the user.
@@ -29,24 +29,28 @@ export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
 
     for (const name of schematicNames) {
       const schematic = this.getSchematic(collection, name, true);
-      let options: Option[] = [];
+      let subcommand: SubCommandDescription;
       if (schematic.description.schemaJson) {
-        options = await parseJsonSchemaToOptions(
+        subcommand = await parseJsonSchemaToSubCommandDescription(
+          name,
+          schematic.description.path,
           this._workflow.registry,
           schematic.description.schemaJson,
         );
+      } else {
+        continue;
       }
 
       if (this.getDefaultSchematicCollection() == collectionName) {
-        this.description.suboptions[name] = options;
+        subcommands[name] = subcommand;
       } else {
-        this.description.suboptions[`${collectionName}:${name}`] = options;
+        subcommands[`${collectionName}:${name}`] = subcommand;
       }
     }
 
     this.description.options.forEach(option => {
       if (option.name == 'schematic') {
-        option.type = 'suboption';
+        option.subcommands = subcommands;
       }
     });
   }
@@ -86,7 +90,9 @@ export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
     await super.printHelp(options);
 
     this.logger.info('');
-    if (Object.keys(this.description.suboptions || {}).length == 1) {
+    // Find the generate subcommand.
+    const subcommand = this.description.options.filter(x => x.subcommands)[0];
+    if (Object.keys((subcommand && subcommand.subcommands) || {}).length == 1) {
       this.logger.info(`\nTo see help for a schematic run:`);
       this.logger.info(terminal.cyan(`  ng generate <schematic> --help`));
     }
diff --git a/packages/angular/cli/models/command.ts b/packages/angular/cli/models/command.ts
index 4202d8bd4c6a..14442c4922bb 100644
--- a/packages/angular/cli/models/command.ts
+++ b/packages/angular/cli/models/command.ts
@@ -16,7 +16,7 @@ import {
   CommandDescriptionMap,
   CommandScope,
   CommandWorkspace,
-  Option,
+  Option, SubCommandDescription,
 } from './interface';
 
 export interface BaseCommandOptions {
@@ -76,6 +76,12 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
     this.logger.info('');
   }
 
+  protected async printHelpSubcommand(subcommand: SubCommandDescription) {
+    this.logger.info(subcommand.description);
+
+    await this.printHelpOptions(subcommand.options);
+  }
+
   protected async printHelpOptions(options: Option[] = this.description.options) {
     const args = options.filter(opt => opt.positional !== undefined);
     const opts = options.filter(opt => opt.positional === undefined);
diff --git a/packages/angular/cli/models/interface.ts b/packages/angular/cli/models/interface.ts
index 0406d1af86cc..261540412d0c 100644
--- a/packages/angular/cli/models/interface.ts
+++ b/packages/angular/cli/models/interface.ts
@@ -88,13 +88,23 @@ export interface Option {
    * The type of option value. If multiple types exist, this type will be the first one, and the
    * types array will contain all types accepted.
    */
-  type: OptionType | 'suboption';
+  type: OptionType;
 
   /**
    * {@see type}
    */
   types?: OptionType[];
 
+  /**
+   * If this option maps to a subcommand in the parent command, will contain all the subcommands
+   * supported. There is a maximum of 1 subcommand Option per command, and the type of this
+   * option will always be "string" (no other types). The value of this option will map into
+   * this map and return the extra information.
+   */
+  subcommands?: {
+    [name: string]: SubCommandDescription;
+  };
+
   /**
    * Aliases supported by this option.
    */
@@ -143,26 +153,26 @@ export enum CommandScope {
 }
 
 /**
- * A description of a command, its metadata.
+ * A description of a command and its options.
  */
-export interface CommandDescription {
+export interface SubCommandDescription {
   /**
-   * Name of the command.
+   * The name of the subcommand.
    */
   name: string;
 
   /**
-   * Short description (1-2 lines) of this command.
+   * Short description (1-2 lines) of this sub command.
    */
   description: string;
 
   /**
-   * A long description of the option, in Markdown format.
+   * A long description of the sub command, in Markdown format.
    */
   longDescription?: string;
 
   /**
-   * Additional notes about usage of this command.
+   * Additional notes about usage of this sub command, in Markdown format.
    */
   usageNotes?: string;
 
@@ -172,10 +182,15 @@ export interface CommandDescription {
   options: Option[];
 
   /**
-   * Aliases supported for this command.
+   * Aliases supported for this sub command.
    */
   aliases: string[];
+}
 
+/**
+ * A description of a command, its metadata.
+ */
+export interface CommandDescription extends SubCommandDescription {
   /**
    * Scope of the command, whether it can be executed in a project, outside of a project or
    * anywhere.
@@ -191,13 +206,6 @@ export interface CommandDescription {
    * The constructor of the command, which should be extending the abstract Command<> class.
    */
   impl: CommandConstructor;
-
-  /**
-   * Suboptions.
-   */
-  suboptions?: {
-    [name: string]: Option[];
-  };
 }
 
 export interface OptionSmartDefault {
diff --git a/packages/angular/cli/models/parser.ts b/packages/angular/cli/models/parser.ts
index 2bf7a89098e0..94f190e75080 100644
--- a/packages/angular/cli/models/parser.ts
+++ b/packages/angular/cli/models/parser.ts
@@ -60,8 +60,6 @@ function _coerceType(str: string | undefined, type: OptionType, v?: Value): Valu
 function _coerce(str: string | undefined, o: Option | null, v?: Value): Value | undefined {
   if (!o) {
     return _coerceType(str, OptionType.Any, v);
-  } else if (o.type == 'suboption') {
-    return _coerceType(str, OptionType.String, v);
   } else {
     return _coerceType(str, o.type, v);
   }
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index a9081bf4fc51..d6ebcc96452c 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -116,46 +116,60 @@ export abstract class SchematicCommand<
     await super.printHelp(options);
     this.logger.info('');
 
-    const schematicNames = Object.keys(this.description.suboptions || {});
+    const subCommandOption = this.description.options.filter(x => x.subcommands)[0];
 
-    if (this.description.suboptions) {
-      if (schematicNames.length > 1) {
-        this.logger.info('Available Schematics:');
+    if (!subCommandOption || !subCommandOption.subcommands) {
+      return 0;
+    }
 
-        const namesPerCollection: { [c: string]: string[] } = {};
-        schematicNames.forEach(name => {
-          const [collectionName, schematicName] = name.split(/:/, 2);
+    const schematicNames = Object.keys(subCommandOption.subcommands);
 
-          if (!namesPerCollection[collectionName]) {
-            namesPerCollection[collectionName] = [];
-          }
+    if (schematicNames.length > 1) {
+      this.logger.info('Available Schematics:');
 
-          namesPerCollection[collectionName].push(schematicName);
-        });
+      const namesPerCollection: { [c: string]: string[] } = {};
+      schematicNames.forEach(name => {
+        let [collectionName, schematicName] = name.split(/:/, 2);
+        if (!schematicName) {
+          schematicName = collectionName;
+          collectionName = this.collectionName;
+        }
 
-        const defaultCollection = this.getDefaultSchematicCollection();
-        Object.keys(namesPerCollection).forEach(collectionName => {
-          const isDefault = defaultCollection == collectionName;
-          this.logger.info(
-            `  Collection "${collectionName}"${isDefault ? ' (default)' : ''}:`,
-          );
+        if (!namesPerCollection[collectionName]) {
+          namesPerCollection[collectionName] = [];
+        }
+
+        namesPerCollection[collectionName].push(schematicName);
+      });
 
-          namesPerCollection[collectionName].forEach(schematicName => {
-            this.logger.info(`    ${schematicName}`);
-          });
+      const defaultCollection = this.getDefaultSchematicCollection();
+      Object.keys(namesPerCollection).forEach(collectionName => {
+        const isDefault = defaultCollection == collectionName;
+        this.logger.info(
+          `  Collection "${collectionName}"${isDefault ? ' (default)' : ''}:`,
+        );
+
+        namesPerCollection[collectionName].forEach(schematicName => {
+          this.logger.info(`    ${schematicName}`);
         });
-      } else if (schematicNames.length == 1) {
-        this.logger.info('Options for schematic ' + schematicNames[0]);
-        await this.printHelpOptions(this.description.suboptions[schematicNames[0]]);
-      }
+      });
+    } else if (schematicNames.length == 1) {
+      this.logger.info('Help for schematic ' + schematicNames[0]);
+      await this.printHelpSubcommand(subCommandOption.subcommands[schematicNames[0]]);
     }
 
     return 0;
   }
 
   async printHelpUsage() {
-    const schematicNames = Object.keys(this.description.suboptions || {});
-    if (this.description.suboptions && schematicNames.length == 1) {
+    const subCommandOption = this.description.options.filter(x => x.subcommands)[0];
+
+    if (!subCommandOption || !subCommandOption.subcommands) {
+      return;
+    }
+
+    const schematicNames = Object.keys(subCommandOption.subcommands);
+    if (schematicNames.length == 1) {
       this.logger.info(this.description.description);
 
       const opts = this.description.options.filter(x => x.positional === undefined);
@@ -167,7 +181,7 @@ export abstract class SchematicCommand<
         ? schematicName
         : schematicNames[0];
 
-      const schematicOptions = this.description.suboptions[schematicNames[0]];
+      const schematicOptions = subCommandOption.subcommands[schematicNames[0]].options;
       const schematicArgs = schematicOptions.filter(x => x.positional !== undefined);
       const argDisplay = schematicArgs.length > 0
         ? ' ' + schematicArgs.map(a => `<${strings.dasherize(a.name)}>`).join(' ')
diff --git a/packages/angular/cli/utilities/json-schema.ts b/packages/angular/cli/utilities/json-schema.ts
index 990488cca359..8e8ec4cc29b4 100644
--- a/packages/angular/cli/utilities/json-schema.ts
+++ b/packages/angular/cli/utilities/json-schema.ts
@@ -14,7 +14,7 @@ import {
   CommandDescription,
   CommandScope,
   Option,
-  OptionType,
+  OptionType, SubCommandDescription,
 } from '../models/interface';
 
 function _getEnumFromValue<E, T extends string>(v: json.JsonValue, e: E, d: T): T {
@@ -29,23 +29,12 @@ function _getEnumFromValue<E, T extends string>(v: json.JsonValue, e: E, d: T):
   return d;
 }
 
-export async function parseJsonSchemaToCommandDescription(
+export async function parseJsonSchemaToSubCommandDescription(
   name: string,
   jsonPath: string,
   registry: json.schema.SchemaRegistry,
   schema: json.JsonObject,
-): Promise<CommandDescription> {
-  // Before doing any work, let's validate the implementation.
-  if (typeof schema.$impl != 'string') {
-    throw new Error(`Command ${name} has an invalid implementation.`);
-  }
-  const ref = new ExportStringRef<CommandConstructor>(schema.$impl, dirname(jsonPath));
-  const impl = ref.ref;
-
-  if (impl === undefined || typeof impl !== 'function') {
-    throw new Error(`Command ${name} has an invalid implementation.`);
-  }
-
+): Promise<SubCommandDescription> {
   const options = await parseJsonSchemaToOptions(registry, schema);
 
   const aliases: string[] = [];
@@ -78,20 +67,44 @@ export async function parseJsonSchemaToCommandDescription(
     usageNotes = readFileSync(unPath, 'utf-8');
   }
 
-  const scope = _getEnumFromValue(schema.$scope, CommandScope, CommandScope.Default);
-  const type = _getEnumFromValue(schema.$type, CommandType, CommandType.Default);
   const description = '' + (schema.description === undefined ? '' : schema.description);
-  const hidden = !!schema.$hidden;
 
   return {
     name,
     description,
     ...(longDescription ? { longDescription } : {}),
     ...(usageNotes ? { usageNotes } : {}),
-    hidden,
     options,
     aliases,
+  };
+}
+
+export async function parseJsonSchemaToCommandDescription(
+  name: string,
+  jsonPath: string,
+  registry: json.schema.SchemaRegistry,
+  schema: json.JsonObject,
+): Promise<CommandDescription> {
+  const subcommand = await parseJsonSchemaToSubCommandDescription(name, jsonPath, registry, schema);
+
+  // Before doing any work, let's validate the implementation.
+  if (typeof schema.$impl != 'string') {
+    throw new Error(`Command ${name} has an invalid implementation.`);
+  }
+  const ref = new ExportStringRef<CommandConstructor>(schema.$impl, dirname(jsonPath));
+  const impl = ref.ref;
+
+  if (impl === undefined || typeof impl !== 'function') {
+    throw new Error(`Command ${name} has an invalid implementation.`);
+  }
+
+  const scope = _getEnumFromValue(schema.$scope, CommandScope, CommandScope.Default);
+  const hidden = !!schema.$hidden;
+
+  return {
+    ...subcommand,
     scope,
+    hidden,
     impl,
   };
 }

From 7d782a3f5eb2332ba58ad0f1087c576dab451730 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 18 Sep 2018 13:43:00 -0700
Subject: [PATCH 0163/1703] feat(@angular/cli): add support for parsing enums

Options can now contain enumerations of values.
---
 packages/angular/cli/models/interface.ts   | 17 +++++--
 packages/angular/cli/models/parser.ts      | 44 ++++++++++++-----
 packages/angular/cli/models/parser_spec.ts | 57 ++++++++++++++++++++--
 3 files changed, 99 insertions(+), 19 deletions(-)

diff --git a/packages/angular/cli/models/interface.ts b/packages/angular/cli/models/interface.ts
index 261540412d0c..940ae85c1fd1 100644
--- a/packages/angular/cli/models/interface.ts
+++ b/packages/angular/cli/models/interface.ts
@@ -63,11 +63,11 @@ export interface CommandContext {
  * Value types of an Option.
  */
 export enum OptionType {
-  String = 'string',
-  Number = 'number',
-  Boolean = 'boolean',
-  Array = 'array',
   Any = 'any',
+  Array = 'array',
+  Boolean = 'boolean',
+  Number = 'number',
+  String = 'string',
 }
 
 /**
@@ -95,6 +95,15 @@ export interface Option {
    */
   types?: OptionType[];
 
+  /**
+   * If this field is set, only values contained in this field are valid. This array can be mixed
+   * types (strings, numbers, boolean). For example, if this field is "enum: ['hello', true]",
+   * then "type" will be either string or boolean, types will be at least both, and the values
+   * accepted will only be either 'hello' or true (not false or any other string).
+   * This mean that prefixing with `no-` will not work on this field.
+   */
+  enum?: Value[];
+
   /**
    * If this option maps to a subcommand in the parent command, will contain all the subcommands
    * supported. There is a maximum of 1 subcommand Option per command, and the type of this
diff --git a/packages/angular/cli/models/parser.ts b/packages/angular/cli/models/parser.ts
index 94f190e75080..a4a3b6b1abb0 100644
--- a/packages/angular/cli/models/parser.ts
+++ b/packages/angular/cli/models/parser.ts
@@ -12,7 +12,7 @@ import { Arguments, Option, OptionType, Value } from './interface';
 
 function _coerceType(str: string | undefined, type: OptionType, v?: Value): Value | undefined {
   switch (type) {
-    case 'any':
+    case OptionType.Any:
       if (Array.isArray(v)) {
         return v.concat(str || '');
       }
@@ -23,10 +23,10 @@ function _coerceType(str: string | undefined, type: OptionType, v?: Value): Valu
            ? _coerceType(str, OptionType.Number, v)
            : _coerceType(str, OptionType.String, v);
 
-    case 'string':
+    case OptionType.String:
       return str || '';
 
-    case 'boolean':
+    case OptionType.Boolean:
       switch (str) {
         case 'false':
           return false;
@@ -40,7 +40,7 @@ function _coerceType(str: string | undefined, type: OptionType, v?: Value): Valu
           return undefined;
       }
 
-    case 'number':
+    case OptionType.Number:
       if (str === undefined) {
         return 0;
       } else if (Number.isFinite(+str)) {
@@ -49,7 +49,7 @@ function _coerceType(str: string | undefined, type: OptionType, v?: Value): Valu
         return undefined;
       }
 
-    case 'array':
+    case OptionType.Array:
       return Array.isArray(v) ? v.concat(str || '') : [str || ''];
 
     default:
@@ -61,7 +61,20 @@ function _coerce(str: string | undefined, o: Option | null, v?: Value): Value |
   if (!o) {
     return _coerceType(str, OptionType.Any, v);
   } else {
-    return _coerceType(str, o.type, v);
+    const types = o.types || [o.type];
+
+    // Try all the types one by one and pick the first one that returns a value contained in the
+    // enum. If there's no enum, just return the first one that matches.
+    for (const type of types) {
+      const maybeResult = _coerceType(str, type, v);
+      if (maybeResult !== undefined) {
+        if (!o.enum || o.enum.includes(maybeResult)) {
+          return maybeResult;
+        }
+      }
+    }
+
+    return undefined;
   }
 }
 
@@ -118,10 +131,18 @@ function _assignOption(
       // Set it to true if it's a boolean and the next argument doesn't match true/false.
       const maybeOption = _getOptionFromName(key, options);
       if (maybeOption) {
-        // Not of type boolean, consume the next value.
         value = args[0];
-        // Only absorb it if it leads to a value.
-        if (_coerce(value, maybeOption) !== undefined) {
+        let shouldShift = true;
+
+        if (value && value.startsWith('-')) {
+          // Verify if not having a value results in a correct parse, if so don't shift.
+          if (_coerce(undefined, maybeOption) !== undefined) {
+            shouldShift = false;
+          }
+        }
+
+        // Only absorb it if it leads to a better value.
+        if (shouldShift && _coerce(value, maybeOption) !== undefined) {
           args.shift();
         } else {
           value = '';
@@ -134,9 +155,6 @@ function _assignOption(
     option = _getOptionFromName(key, options) || null;
     if (option) {
       value = arg.substring(i + 1);
-      if (option.type === 'boolean' && _coerce(value, option) === undefined) {
-        value = 'true';
-      }
     }
   }
   if (option === null) {
@@ -150,6 +168,8 @@ function _assignOption(
     const v = _coerce(value, option, parsedOptions[option.name]);
     if (v !== undefined) {
       parsedOptions[option.name] = v;
+    } else {
+      leftovers.push(arg);
     }
   }
 }
diff --git a/packages/angular/cli/models/parser_spec.ts b/packages/angular/cli/models/parser_spec.ts
index 961f37952aae..783f1fd797a4 100644
--- a/packages/angular/cli/models/parser_spec.ts
+++ b/packages/angular/cli/models/parser_spec.ts
@@ -19,11 +19,23 @@ describe('parseArguments', () => {
     { name: 'arr', aliases: [ 'a' ], type: OptionType.Array, description: '' },
     { name: 'p1', positional: 0, aliases: [], type: OptionType.String, description: '' },
     { name: 'p2', positional: 1, aliases: [], type: OptionType.String, description: '' },
+    { name: 't1', aliases: [], type: OptionType.Boolean,
+      types: [OptionType.Boolean, OptionType.String], description: '' },
+    { name: 't2', aliases: [], type: OptionType.Boolean,
+      types: [OptionType.Boolean, OptionType.Number], description: '' },
+    { name: 't3', aliases: [], type: OptionType.Number,
+      types: [OptionType.Number, OptionType.Any], description: '' },
+    { name: 'e1', aliases: [], type: OptionType.String, enum: ['hello', 'world'], description: '' },
+    { name: 'e2', aliases: [], type: OptionType.String, enum: ['hello', ''], description: '' },
+    { name: 'e3', aliases: [], type: OptionType.Boolean,
+      types: [OptionType.String, OptionType.Boolean], enum: ['json', true, false],
+      description: '' },
   ];
 
   const tests: { [test: string]: Partial<Arguments> } = {
     '--bool': { bool: true },
-    '--bool=1': { bool: true },
+    '--bool=1': { '--': ['--bool=1'] },
+    '--bool=yellow': { '--': ['--bool=yellow'] },
     '--bool=true': { bool: true },
     '--bool=false': { bool: false },
     '--no-bool': { bool: false },
@@ -33,7 +45,7 @@ describe('parseArguments', () => {
     '--b true': { bool: true },
     '--b false': { bool: false },
     '--bool --num': { bool: true, num: 0 },
-    '--bool --num=true': { bool: true },
+    '--bool --num=true': { bool: true, '--': ['--num=true'] },
     '--bool=true --num': { bool: true, num: 0 },
     '--bool true --num': { bool: true, num: 0 },
     '--bool=false --num': { bool: false, num: 0 },
@@ -51,16 +63,55 @@ describe('parseArguments', () => {
     '--bool val1 --etc --num val2 --v': { bool: true, num: 0, p1: 'val1', p2: 'val2',
                                           '--': ['--etc', '--v'] },
     '--arr=a --arr=b --arr c d': { arr: ['a', 'b', 'c'], p1: 'd' },
-    '--arr=1 --arr --arr c d': { arr: ['1', '--arr'], p1: 'c', p2: 'd' },
+    '--arr=1 --arr --arr c d': { arr: ['1', '', 'c'], p1: 'd' },
+    '--arr=1 --arr --arr c d e': { arr: ['1', '', 'c'], p1: 'd', p2: 'e' },
     '--str=1': { str: '1' },
     '--hello-world=1': { helloWorld: '1' },
     '--hello-bool': { helloBool: true },
     '--helloBool': { helloBool: true },
     '--no-helloBool': { helloBool: false },
     '--noHelloBool': { helloBool: false },
+    '--noBool': { bool: false },
     '-b': { bool: true },
     '-sb': { bool: true, str: '' },
     '-bs': { bool: true, str: '' },
+    '--t1=true': { t1: true },
+    '--t1': { t1: true },
+    '--t1 --num': { t1: true, num: 0 },
+    '--no-t1': { t1: false },
+    '--t1=yellow': { t1: 'yellow' },
+    '--no-t1=true': { '--': ['--no-t1=true'] },
+    '--t1=123': { t1: '123' },
+    '--t2=true': { t2: true },
+    '--t2': { t2: true },
+    '--no-t2': { t2: false },
+    '--t2=yellow': { '--': ['--t2=yellow'] },
+    '--no-t2=true': { '--': ['--no-t2=true'] },
+    '--t2=123': { t2: 123 },
+    '--t3=a': { t3: 'a' },
+    '--t3': { t3: 0 },
+    '--t3 true': { t3: true },
+    '--e1 hello': { e1: 'hello' },
+    '--e1=hello': { e1: 'hello' },
+    '--e1 yellow': { p1: 'yellow', '--': ['--e1'] },
+    '--e1=yellow': { '--': ['--e1=yellow'] },
+    '--e1': { '--': ['--e1'] },
+    '--e1 true': { p1: 'true', '--': ['--e1'] },
+    '--e1=true': { '--': ['--e1=true'] },
+    '--e2 hello': { e2: 'hello' },
+    '--e2=hello': { e2: 'hello' },
+    '--e2 yellow': { p1: 'yellow', e2: '' },
+    '--e2=yellow': { '--': ['--e2=yellow'] },
+    '--e2': { e2: '' },
+    '--e2 true': { p1: 'true', e2: '' },
+    '--e2=true': { '--': ['--e2=true'] },
+    '--e3 json': { e3: 'json' },
+    '--e3=json': { e3: 'json' },
+    '--e3 yellow': { p1: 'yellow', e3: true },
+    '--e3=yellow': { '--': ['--e3=yellow'] },
+    '--e3': { e3: true },
+    '--e3 true': { e3: true },
+    '--e3=true': { e3: true },
   };
 
   Object.entries(tests).forEach(([str, expected]) => {

From 9648aa3ed9ffdb1340c6260b8af1b60fc50664fc Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 18 Sep 2018 14:21:48 -0700
Subject: [PATCH 0164/1703] feat(@angular-devkit/core): add enum support to
 getTypesOfSchema

---
 .../core/src/json/schema/utility.ts           | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/core/src/json/schema/utility.ts b/packages/angular_devkit/core/src/json/schema/utility.ts
index 5e1608312ea8..8c0cf990f1ac 100644
--- a/packages/angular_devkit/core/src/json/schema/utility.ts
+++ b/packages/angular_devkit/core/src/json/schema/utility.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { JsonObject, isJsonObject } from '../interface';
+import { JsonObject, isJsonArray, isJsonObject } from '../interface';
 
 
 const allTypes = ['string', 'integer', 'number', 'object', 'array', 'boolean', 'null'];
@@ -23,6 +23,29 @@ export function getTypesOfSchema(schema: JsonObject | true): Set<string> {
     potentials = new Set([schema.type]);
   } else if (Array.isArray(schema.type)) {
     potentials = new Set(schema.type as string[]);
+  } else if (isJsonArray(schema.enum)) {
+    potentials = new Set();
+
+    // Gather the type of each enum values, and use that as a starter for potential types.
+    for (const v of schema.enum) {
+      switch (typeof v) {
+        case 'string':
+        case 'number':
+        case 'boolean':
+          potentials.add(typeof v);
+          break;
+
+        case 'object':
+          if (Array.isArray(v)) {
+            potentials.add('array');
+          } else if (v === null) {
+            potentials.add('null');
+          } else {
+            potentials.add('object');
+          }
+          break;
+      }
+    }
   } else {
     potentials = new Set(allTypes);
   }

From fcbc7db54f78229f7246d240a78767c5a42445d2 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 18 Sep 2018 14:23:01 -0700
Subject: [PATCH 0165/1703] feat(@angular/cli): remove --help-json and add
 format to help

--help now accepts a value which can be a boolean or a string. If the value
is not understood we simply show a message to the user that it was invalid.
---
 packages/angular/cli/commands/definitions.json |  9 +++------
 packages/angular/cli/models/command.ts         | 15 +++++++++++----
 packages/angular/cli/models/parser_spec.ts     |  2 +-
 packages/angular/cli/utilities/json-schema.ts  | 18 +++++++++++++++++-
 4 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/packages/angular/cli/commands/definitions.json b/packages/angular/cli/commands/definitions.json
index 5dd2700d5321..5314b93ca247 100644
--- a/packages/angular/cli/commands/definitions.json
+++ b/packages/angular/cli/commands/definitions.json
@@ -30,12 +30,9 @@
       "type": "object",
       "properties": {
         "help": {
-          "type": "boolean",
-          "description": "Shows a help message."
-        },
-        "helpJson": {
-          "type": "boolean",
-          "description": "Shows the metadata associated with each flags, in JSON format."
+          "type": ["boolean", "string"],
+          "description": "Shows a help message. Use '--help=json' as a value to output the help in JSON format.",
+          "default": false
         }
       }
     },
diff --git a/packages/angular/cli/models/command.ts b/packages/angular/cli/models/command.ts
index 14442c4922bb..be077849e5ec 100644
--- a/packages/angular/cli/models/command.ts
+++ b/packages/angular/cli/models/command.ts
@@ -20,7 +20,7 @@ import {
 } from './interface';
 
 export interface BaseCommandOptions {
-  help?: boolean;
+  help?: boolean | string;
   helpJson?: boolean;
 }
 
@@ -144,15 +144,22 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
   abstract async run(options: T & Arguments): Promise<number | void>;
 
   async validateAndRun(options: T & Arguments): Promise<number | void> {
-    if (!options.help && !options.helpJson) {
+    if (!(options.help === true || options.help === 'json' || options.help === 'JSON')) {
       await this.validateScope();
     }
     await this.initialize(options);
 
-    if (options.help) {
+    if (options.help === true) {
       return this.printHelp(options);
-    } else if (options.helpJson) {
+    } else if (options.help === 'json' || options.help === 'JSON') {
       return this.printJsonHelp(options);
+    } else if (options.help !== false && options.help !== undefined) {
+      // The user entered an invalid type of help, maybe?
+      this.logger.fatal(
+        `--help was provided, but format ${JSON.stringify(options.help)} was not understood.`,
+      );
+
+      return 1;
     } else {
       return await this.run(options);
     }
diff --git a/packages/angular/cli/models/parser_spec.ts b/packages/angular/cli/models/parser_spec.ts
index 783f1fd797a4..c5664da16599 100644
--- a/packages/angular/cli/models/parser_spec.ts
+++ b/packages/angular/cli/models/parser_spec.ts
@@ -28,7 +28,7 @@ describe('parseArguments', () => {
     { name: 'e1', aliases: [], type: OptionType.String, enum: ['hello', 'world'], description: '' },
     { name: 'e2', aliases: [], type: OptionType.String, enum: ['hello', ''], description: '' },
     { name: 'e3', aliases: [], type: OptionType.Boolean,
-      types: [OptionType.String, OptionType.Boolean], enum: ['json', true, false],
+      types: [OptionType.Boolean, OptionType.String], enum: ['json', true, false],
       description: '' },
   ];
 
diff --git a/packages/angular/cli/utilities/json-schema.ts b/packages/angular/cli/utilities/json-schema.ts
index 8e8ec4cc29b4..fdc58e448a27 100644
--- a/packages/angular/cli/utilities/json-schema.ts
+++ b/packages/angular/cli/utilities/json-schema.ts
@@ -14,7 +14,9 @@ import {
   CommandDescription,
   CommandScope,
   Option,
-  OptionType, SubCommandDescription,
+  OptionType,
+  SubCommandDescription,
+  Value,
 } from '../models/interface';
 
 function _getEnumFromValue<E, T extends string>(v: json.JsonValue, e: E, d: T): T {
@@ -177,6 +179,19 @@ export async function parseJsonSchemaToOptions(
       return;
     }
 
+    // Only keep enum values we support (booleans, numbers and strings).
+    const enumValues = (json.isJsonArray(current.enum) && current.enum || []).filter(x => {
+      switch (typeof x) {
+        case 'boolean':
+        case 'number':
+        case 'string':
+          return true;
+
+        default:
+          return false;
+      }
+    }) as Value[];
+
     let defaultValue: string | number | boolean | undefined = undefined;
     if (current.default !== undefined) {
       switch (types[0]) {
@@ -218,6 +233,7 @@ export async function parseJsonSchemaToOptions(
       description: '' + (current.description === undefined ? '' : current.description),
       ...types.length == 1 ? { type } : { type, types },
       ...defaultValue !== undefined ? { default: defaultValue } : {},
+      ...enumValues && enumValues.length > 0 ? { enum: enumValues } : {},
       required,
       aliases,
       ...format !== undefined ? { format } : {},

From b02a7e5f9be2047cce0e5aa56145323d40ddcdee Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Wed, 19 Sep 2018 09:40:05 -0700
Subject: [PATCH 0166/1703] fix(@angular/cli): on error finding files, show
 warning

This should not prevent execution, but is useful to know.
---
 .../angular/cli/commands/generate-impl.ts     |  1 +
 packages/angular/cli/models/command-runner.ts |  8 ++------
 packages/angular/cli/utilities/json-schema.ts | 19 +++++++++++++++----
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/packages/angular/cli/commands/generate-impl.ts b/packages/angular/cli/commands/generate-impl.ts
index b47808a7e1f9..49d9f60056c4 100644
--- a/packages/angular/cli/commands/generate-impl.ts
+++ b/packages/angular/cli/commands/generate-impl.ts
@@ -36,6 +36,7 @@ export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
           schematic.description.path,
           this._workflow.registry,
           schematic.description.schemaJson,
+          this.logger,
         );
       } else {
         continue;
diff --git a/packages/angular/cli/models/command-runner.ts b/packages/angular/cli/models/command-runner.ts
index 209ed1be62f3..560e34a7b44c 100644
--- a/packages/angular/cli/models/command-runner.ts
+++ b/packages/angular/cli/models/command-runner.ts
@@ -92,12 +92,8 @@ export async function runCommand(
       throw new Error('Invalid command JSON loaded from ' + JSON.stringify(schemaPath));
     }
 
-    commandMap[name] = await parseJsonSchemaToCommandDescription(
-      name,
-      schemaPath,
-      registry,
-      schema,
-    );
+    commandMap[name] =
+      await parseJsonSchemaToCommandDescription(name, schemaPath, registry, schema, logger);
   }
 
   let commandName: string | undefined = undefined;
diff --git a/packages/angular/cli/utilities/json-schema.ts b/packages/angular/cli/utilities/json-schema.ts
index fdc58e448a27..ba4dea2bdbb1 100644
--- a/packages/angular/cli/utilities/json-schema.ts
+++ b/packages/angular/cli/utilities/json-schema.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { json } from '@angular-devkit/core';
+import { json, logging } from '@angular-devkit/core';
 import { ExportStringRef } from '@angular-devkit/schematics/tools';
 import { readFileSync } from 'fs';
 import { dirname, resolve } from 'path';
@@ -36,6 +36,7 @@ export async function parseJsonSchemaToSubCommandDescription(
   jsonPath: string,
   registry: json.schema.SchemaRegistry,
   schema: json.JsonObject,
+  logger: logging.Logger,
 ): Promise<SubCommandDescription> {
   const options = await parseJsonSchemaToOptions(registry, schema);
 
@@ -61,12 +62,20 @@ export async function parseJsonSchemaToSubCommandDescription(
   let longDescription = '';
   if (typeof schema.$longDescription == 'string' && schema.$longDescription) {
     const ldPath = resolve(dirname(jsonPath), schema.$longDescription);
-    longDescription = readFileSync(ldPath, 'utf-8');
+    try {
+      longDescription = readFileSync(ldPath, 'utf-8');
+    } catch (e) {
+      logger.warn(`File ${ldPath} was not found while constructing the subcommand ${name}.`);
+    }
   }
   let usageNotes = '';
   if (typeof schema.$usageNotes == 'string' && schema.$usageNotes) {
     const unPath = resolve(dirname(jsonPath), schema.$usageNotes);
-    usageNotes = readFileSync(unPath, 'utf-8');
+    try {
+      usageNotes = readFileSync(unPath, 'utf-8');
+    } catch (e) {
+      logger.warn(`File ${unPath} was not found while constructing the subcommand ${name}.`);
+    }
   }
 
   const description = '' + (schema.description === undefined ? '' : schema.description);
@@ -86,8 +95,10 @@ export async function parseJsonSchemaToCommandDescription(
   jsonPath: string,
   registry: json.schema.SchemaRegistry,
   schema: json.JsonObject,
+  logger: logging.Logger,
 ): Promise<CommandDescription> {
-  const subcommand = await parseJsonSchemaToSubCommandDescription(name, jsonPath, registry, schema);
+  const subcommand =
+    await parseJsonSchemaToSubCommandDescription(name, jsonPath, registry, schema, logger);
 
   // Before doing any work, let's validate the implementation.
   if (typeof schema.$impl != 'string') {

From d69af5a66318ed8d0ab5701659146e8fa1c83a8c Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Wed, 19 Sep 2018 10:27:58 -0700
Subject: [PATCH 0167/1703] build: ignore dist-schema for linting

---
 scripts/lint.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/scripts/lint.ts b/scripts/lint.ts
index d213461005d8..1b7339385b2b 100644
--- a/scripts/lint.ts
+++ b/scripts/lint.ts
@@ -12,6 +12,12 @@ import * as path from 'path';
 import { Configuration, ILinterOptions, Linter, findFormatter } from 'tslint';
 import * as ts from 'typescript';
 
+// Blacklist (regexes) of the files to not lint. Generated files should not be linted.
+// TODO: when moved to using bazel for the build system, this won't be needed.
+const blacklist = [
+  /^dist-schema[\\\/].*/,
+];
+
 
 function _buildRules(logger: logging.Logger) {
   const tsConfigPath = path.join(__dirname, '../rules/tsconfig.json');
@@ -50,6 +56,10 @@ export default function (options: ParsedArgs, logger: logging.Logger) {
   const tsLintConfig = Configuration.loadConfigurationFromPath(tsLintPath);
 
   program.getRootFileNames().forEach(fileName => {
+    if (blacklist.some(x => x.test(path.relative(process.cwd(), fileName)))) {
+      return;
+    }
+
     linter.lint(fileName, ts.sys.readFile(fileName) || '', tsLintConfig);
   });
 

From f7f5b28daeaff91abfb9e2f20b71e0e8bc38bef5 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Wed, 19 Sep 2018 11:31:33 -0700
Subject: [PATCH 0168/1703] feat(@angular/cli): if parsing comes accross an
 obvious error throw it

We accumulate errors this way, and throw only once at the end, with messages for
all errors.
---
 .../angular/cli/commands/definitions.json     |  4 +-
 packages/angular/cli/models/command.ts        |  7 ---
 packages/angular/cli/models/parser.ts         | 37 +++++++++++++--
 packages/angular/cli/models/parser_spec.ts    | 46 ++++++++++++-------
 4 files changed, 65 insertions(+), 29 deletions(-)

diff --git a/packages/angular/cli/commands/definitions.json b/packages/angular/cli/commands/definitions.json
index 5314b93ca247..e292a75f9f97 100644
--- a/packages/angular/cli/commands/definitions.json
+++ b/packages/angular/cli/commands/definitions.json
@@ -30,8 +30,8 @@
       "type": "object",
       "properties": {
         "help": {
-          "type": ["boolean", "string"],
-          "description": "Shows a help message. Use '--help=json' as a value to output the help in JSON format.",
+          "enum": [true, false, "json", "JSON"],
+          "description": "Shows a help message. You can pass the format as a value.",
           "default": false
         }
       }
diff --git a/packages/angular/cli/models/command.ts b/packages/angular/cli/models/command.ts
index be077849e5ec..6234fb9dc596 100644
--- a/packages/angular/cli/models/command.ts
+++ b/packages/angular/cli/models/command.ts
@@ -153,13 +153,6 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
       return this.printHelp(options);
     } else if (options.help === 'json' || options.help === 'JSON') {
       return this.printJsonHelp(options);
-    } else if (options.help !== false && options.help !== undefined) {
-      // The user entered an invalid type of help, maybe?
-      this.logger.fatal(
-        `--help was provided, but format ${JSON.stringify(options.help)} was not understood.`,
-      );
-
-      return 1;
     } else {
       return await this.run(options);
     }
diff --git a/packages/angular/cli/models/parser.ts b/packages/angular/cli/models/parser.ts
index a4a3b6b1abb0..baa5ec5f0bb4 100644
--- a/packages/angular/cli/models/parser.ts
+++ b/packages/angular/cli/models/parser.ts
@@ -6,10 +6,21 @@
  * found in the LICENSE file at https://angular.io/license
  *
  */
-import { strings } from '@angular-devkit/core';
+import { BaseException, strings } from '@angular-devkit/core';
 import { Arguments, Option, OptionType, Value } from './interface';
 
 
+export class ParseArgumentException extends BaseException {
+  constructor(
+    comments: string[],
+    public readonly parsed: Arguments,
+    public readonly ignored: string[],
+  ) {
+    super(`One or more errors occured while parsing arguments:\n  ${comments.join('\n  ')}`);
+  }
+}
+
+
 function _coerceType(str: string | undefined, type: OptionType, v?: Value): Value | undefined {
   switch (type) {
     case OptionType.Any:
@@ -103,6 +114,8 @@ function _assignOption(
   parsedOptions: Arguments,
   _positionals: string[],
   leftovers: string[],
+  ignored: string[],
+  errors: string[],
 ) {
   let key = arg.substr(2);
   let option: Option | null = null;
@@ -169,7 +182,15 @@ function _assignOption(
     if (v !== undefined) {
       parsedOptions[option.name] = v;
     } else {
-      leftovers.push(arg);
+      let error = `Argument ${key} could not be parsed using value ${JSON.stringify(value)}.`;
+      if (option.enum) {
+        error += ` Valid values are: ${option.enum.map(x => JSON.stringify(x)).join(', ')}.`;
+      } else {
+        error += `Valid type(s) is: ${(option.types || [option.type]).join(', ')}`;
+      }
+
+      errors.push(error);
+      ignored.push(arg);
     }
   }
 }
@@ -244,6 +265,9 @@ export function parseArguments(args: string[], options: Option[] | null): Argume
   const positionals: string[] = [];
   const parsedOptions: Arguments = {};
 
+  const ignored: string[] = [];
+  const errors: string[] = [];
+
   for (let arg = args.shift(); arg !== undefined; arg = args.shift()) {
     if (!arg) {
       break;
@@ -256,7 +280,7 @@ export function parseArguments(args: string[], options: Option[] | null): Argume
     }
 
     if (arg.startsWith('--')) {
-      _assignOption(arg, args, options, parsedOptions, positionals, leftovers);
+      _assignOption(arg, args, options, parsedOptions, positionals, leftovers, ignored, errors);
     } else if (arg.startsWith('-')) {
       // Argument is of form -abcdef.  Starts at 1 because we skip the `-`.
       for (let i = 1; i < arg.length; i++) {
@@ -264,7 +288,8 @@ export function parseArguments(args: string[], options: Option[] | null): Argume
         // Treat the last flag as `--a` (as if full flag but just one letter). We do this in
         // the loop because it saves us a check to see if the arg is just `-`.
         if (i == arg.length - 1) {
-          _assignOption('--' + flag, args, options, parsedOptions, positionals, leftovers);
+          const arg = '--' + flag;
+          _assignOption(arg, args, options, parsedOptions, positionals, leftovers, ignored, errors);
         } else {
           const maybeOption = _getOptionFromName(flag, options);
           if (maybeOption) {
@@ -318,5 +343,9 @@ export function parseArguments(args: string[], options: Option[] | null): Argume
     parsedOptions['--'] = [...positionals, ...leftovers];
   }
 
+  if (errors.length > 0) {
+    throw new ParseArgumentException(errors, parsedOptions, ignored);
+  }
+
   return parsedOptions;
 }
diff --git a/packages/angular/cli/models/parser_spec.ts b/packages/angular/cli/models/parser_spec.ts
index c5664da16599..88de630a2ddd 100644
--- a/packages/angular/cli/models/parser_spec.ts
+++ b/packages/angular/cli/models/parser_spec.ts
@@ -7,7 +7,7 @@
  *
  */
 import { Arguments, Option, OptionType } from './interface';
-import { parseArguments } from './parser';
+import { ParseArgumentException, parseArguments } from './parser';
 
 describe('parseArguments', () => {
   const options: Option[] = [
@@ -32,10 +32,11 @@ describe('parseArguments', () => {
       description: '' },
   ];
 
-  const tests: { [test: string]: Partial<Arguments> } = {
+  const tests: { [test: string]: Partial<Arguments> | ['!!!', Partial<Arguments>, string[]] } = {
     '--bool': { bool: true },
-    '--bool=1': { '--': ['--bool=1'] },
-    '--bool=yellow': { '--': ['--bool=yellow'] },
+    '--bool=1': ['!!!', {}, ['--bool=1']],
+    '-- --bool=1': { '--': ['--bool=1'] },
+    '--bool=yellow': ['!!!', {}, ['--bool=yellow']],
     '--bool=true': { bool: true },
     '--bool=false': { bool: false },
     '--no-bool': { bool: false },
@@ -45,7 +46,8 @@ describe('parseArguments', () => {
     '--b true': { bool: true },
     '--b false': { bool: false },
     '--bool --num': { bool: true, num: 0 },
-    '--bool --num=true': { bool: true, '--': ['--num=true'] },
+    '--bool --num=true': ['!!!', { bool: true }, ['--num=true']],
+    '-- --bool --num=true': { '--': ['--bool', '--num=true'] },
     '--bool=true --num': { bool: true, num: 0 },
     '--bool true --num': { bool: true, num: 0 },
     '--bool=false --num': { bool: false, num: 0 },
@@ -85,7 +87,7 @@ describe('parseArguments', () => {
     '--t2=true': { t2: true },
     '--t2': { t2: true },
     '--no-t2': { t2: false },
-    '--t2=yellow': { '--': ['--t2=yellow'] },
+    '--t2=yellow': ['!!!', {}, ['--t2=yellow']],
     '--no-t2=true': { '--': ['--no-t2=true'] },
     '--t2=123': { t2: 123 },
     '--t3=a': { t3: 'a' },
@@ -93,22 +95,22 @@ describe('parseArguments', () => {
     '--t3 true': { t3: true },
     '--e1 hello': { e1: 'hello' },
     '--e1=hello': { e1: 'hello' },
-    '--e1 yellow': { p1: 'yellow', '--': ['--e1'] },
-    '--e1=yellow': { '--': ['--e1=yellow'] },
-    '--e1': { '--': ['--e1'] },
-    '--e1 true': { p1: 'true', '--': ['--e1'] },
-    '--e1=true': { '--': ['--e1=true'] },
+    '--e1 yellow': ['!!!', { p1: 'yellow' }, ['--e1']],
+    '--e1=yellow': ['!!!', {}, ['--e1=yellow']],
+    '--e1': ['!!!', {}, ['--e1']],
+    '--e1 true': ['!!!', { p1: 'true' }, ['--e1']],
+    '--e1=true': ['!!!', {},  ['--e1=true']],
     '--e2 hello': { e2: 'hello' },
     '--e2=hello': { e2: 'hello' },
     '--e2 yellow': { p1: 'yellow', e2: '' },
-    '--e2=yellow': { '--': ['--e2=yellow'] },
+    '--e2=yellow': ['!!!', {}, ['--e2=yellow']],
     '--e2': { e2: '' },
     '--e2 true': { p1: 'true', e2: '' },
-    '--e2=true': { '--': ['--e2=true'] },
+    '--e2=true': ['!!!', {}, ['--e2=true']],
     '--e3 json': { e3: 'json' },
     '--e3=json': { e3: 'json' },
     '--e3 yellow': { p1: 'yellow', e3: true },
-    '--e3=yellow': { '--': ['--e3=yellow'] },
+    '--e3=yellow': ['!!!', {}, ['--e3=yellow']],
     '--e3': { e3: true },
     '--e3 true': { e3: true },
     '--e3=true': { e3: true },
@@ -116,9 +118,21 @@ describe('parseArguments', () => {
 
   Object.entries(tests).forEach(([str, expected]) => {
     it(`works for ${str}`, () => {
-      const actual = parseArguments(str.split(/\s+/), options);
+      try {
+        const actual = parseArguments(str.split(/\s+/), options);
 
-      expect(actual).toEqual(expected as Arguments);
+        expect(Array.isArray(expected)).toBe(false);
+        expect(actual).toEqual(expected as Arguments);
+      } catch (e) {
+        if (!(e instanceof ParseArgumentException)) {
+          throw e;
+        }
+
+        // The expected values are an array.
+        expect(Array.isArray(expected)).toBe(true);
+        expect(e.parsed).toEqual(expected[1] as Arguments);
+        expect(e.ignored).toEqual(expected[2] as string[]);
+      }
     });
   });
 });

From 97576ecd130e65037b443724a1fa3a8a4331bf81 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Wed, 19 Sep 2018 11:51:02 -0700
Subject: [PATCH 0169/1703] fix(@angular/cli): do not show stack on argument
 parse error

---
 packages/angular/cli/models/command-runner.ts | 21 ++++++++++++++-----
 packages/angular/cli/models/parser.ts         |  2 +-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/packages/angular/cli/models/command-runner.ts b/packages/angular/cli/models/command-runner.ts
index 560e34a7b44c..a44c4f1a0755 100644
--- a/packages/angular/cli/models/command-runner.ts
+++ b/packages/angular/cli/models/command-runner.ts
@@ -182,9 +182,20 @@ export async function runCommand(
     return 1;
   }
 
-  const parsedOptions = parser.parseArguments(args, description.options);
-  Command.setCommandMap(commandMap);
-  const command = new description.impl({ workspace }, description, logger);
-
-  return await command.validateAndRun(parsedOptions);
+  try {
+    const parsedOptions = parser.parseArguments(args, description.options);
+    Command.setCommandMap(commandMap);
+    const command = new description.impl({ workspace }, description, logger);
+
+    return await command.validateAndRun(parsedOptions);
+  } catch (e) {
+    if (e instanceof parser.ParseArgumentException) {
+      logger.fatal('Cannot parse arguments. See below for the reasons.');
+      logger.fatal('    ' + e.comments.join('\n    '));
+
+      return 1;
+    } else {
+      throw e;
+    }
+  }
 }
diff --git a/packages/angular/cli/models/parser.ts b/packages/angular/cli/models/parser.ts
index baa5ec5f0bb4..91082430d3b6 100644
--- a/packages/angular/cli/models/parser.ts
+++ b/packages/angular/cli/models/parser.ts
@@ -12,7 +12,7 @@ import { Arguments, Option, OptionType, Value } from './interface';
 
 export class ParseArgumentException extends BaseException {
   constructor(
-    comments: string[],
+    public readonly comments: string[],
     public readonly parsed: Arguments,
     public readonly ignored: string[],
   ) {

From c3cffc372142cf5d29523928041fdb76295f0f46 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Wed, 19 Sep 2018 13:12:02 -0700
Subject: [PATCH 0170/1703] release: v7.0.0-beta.4

---
 .monorepo.json | 72 +++++++++++++++++++++++++-------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index abe0532d30da..8a268938566b 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,12 +42,12 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.9.0-beta.3",
-      "hash": "89d01d5d739f85f3958ee7ab97a70dfc"
+      "version": "0.9.0-beta.4",
+      "hash": "a9b1f213a4069f789d20021bda616775"
     },
     "devkit": {
-      "version": "0.9.0-beta.3",
-      "hash": "17c7ec54e4eacd1529df54229a3a0a63"
+      "version": "0.9.0-beta.4",
+      "hash": "30ac66398ef7b4f7a5dbd3192d24c665"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -58,15 +58,15 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md"
         }
       ],
-      "version": "7.0.0-beta.3",
+      "version": "7.0.0-beta.4",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "7fbaa8ae4d71df0a3c52180d9731b90c"
+      "hash": "861fb8f47bfe7c42b61ba03c923e4c4f"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.9.0-beta.3",
-      "hash": "dc58ab4cfcae409cdf525add81d5a5ac",
+      "version": "0.9.0-beta.4",
+      "hash": "5ce80a80caee296f31fd7973d1d1af7c",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -77,21 +77,21 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.9.0-beta.3",
-      "hash": "a728543df72bed527bc935e2146f3272",
+      "version": "0.9.0-beta.4",
+      "hash": "6b477a8c670ac1aaf8232517932026e9",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.9.0-beta.3",
-      "hash": "fd676e5fb4d0360adbc9722d1975f761",
+      "version": "0.9.0-beta.4",
+      "hash": "0df3aa7f3bccb0a2390f7691ef610ba4",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
       "name": "Benchmark",
       "section": "Tooling",
-      "version": "1.0.0-beta.0",
-      "hash": "97d40f3534277013d29487c508f18920"
+      "version": "1.0.0-beta.1",
+      "hash": "b413c32410c61f3d7096f40f60e69cc9"
     },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
@@ -101,8 +101,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.9.0-beta.3",
-      "hash": "20cfe51cc2405512d307c491119c3b6a",
+      "version": "0.9.0-beta.4",
+      "hash": "5f028763dff86aaebc80476e1f550d9f",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -113,8 +113,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.9.0-beta.3",
-      "hash": "9e0b767db359072b4e133347f26a6453",
+      "version": "0.9.0-beta.4",
+      "hash": "228c997459d1106b0b9bfcc2636fb838",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -125,8 +125,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.9.0-beta.3",
-      "hash": "90aab662520e17a515ff968ef291bdd0",
+      "version": "0.9.0-beta.4",
+      "hash": "4d12d45c630abe262a3844b0021801cf",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -137,9 +137,9 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.9.0-beta.3",
+      "version": "0.9.0-beta.4",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "52eb219419507760f231d222519fe828"
+      "hash": "5887fbece28cf8e795cadf95b4518de1"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -149,8 +149,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "0.9.0-beta.3",
-      "hash": "28145dec22ec7e1aaaa39da617c66ea8",
+      "version": "7.0.0-beta.4",
+      "hash": "7f4c330644a23e8f1383256c9593842f",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -161,43 +161,43 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "0.9.0-beta.3",
-      "hash": "46b193e3ba7925de3104ec9768de39b9",
+      "version": "7.0.0-beta.4",
+      "hash": "30b6fadcf785da5b8d911ab0dca30397",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.9.0-beta.3",
-      "hash": "1e5ac88c25c9b8e31b2e22c73fd4a3ac",
+      "version": "0.9.0-beta.4",
+      "hash": "e143b8e611f5b5d5b24ee1a62bc638ef",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "7.0.0-beta.3",
+      "version": "7.0.0-beta.4",
       "section": "Misc",
-      "hash": "1be2344bf4913ab15dac30725cd58c2d",
+      "hash": "213663b5fd23e27196cf83bef9f0f41c",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "0.9.0-beta.3",
-      "hash": "012fa2eb3d2ac1342feeefdd1bae7af5",
+      "version": "7.0.0-beta.4",
+      "hash": "963b148fe42112d53ba26cea010089e9",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.9.0-beta.3",
+      "version": "0.9.0-beta.4",
       "section": "Schematics",
-      "hash": "b29a0e96210093d79a69d64d99fbce78",
+      "hash": "a6726ae6664fb43c861e3bb4bb0ccb76",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.9.0-beta.3",
+      "version": "0.9.0-beta.4",
       "section": "Schematics",
-      "hash": "12fb5f26d29c0cb962a5a60e811d4b90",
+      "hash": "5bbb5fd7ebaf18b452dee36521ab5142",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }

From 5757b21f21c22213a5eead965edc6f0a9db6d1aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Exbrayat?=
 <cexbrayat@users.noreply.github.com>
Date: Thu, 20 Sep 2018 23:05:47 +0200
Subject: [PATCH 0171/1703] fix(@schematics/angular): remove module test
 (#11278)

The `module` schematic was generating a useless `module.spec.ts` file.
This commit removes such test.

Fixes #11277
---
 packages/schematics/angular/application/index.ts    |  1 -
 packages/schematics/angular/library/index.ts        |  1 -
 .../__name@dasherize__.module.spec.ts               | 13 -------------
 packages/schematics/angular/module/index.ts         |  1 -
 packages/schematics/angular/module/index_spec.ts    | 13 -------------
 packages/schematics/angular/module/schema.json      |  5 -----
 6 files changed, 34 deletions(-)
 delete mode 100644 packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__.module.spec.ts

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 656c45e76145..d4025145be4d 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -324,7 +324,6 @@ export default function (options: ApplicationOptions): Rule {
         routing: options.routing,
         routingScope: 'Root',
         path: sourceDir,
-        spec: false,
         project: options.name,
       }),
       schematic('component', {
diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index c656b0a100a3..a01a02492273 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -226,7 +226,6 @@ export default function (options: LibraryOptions): Rule {
         commonModule: false,
         flat: true,
         path: sourceDir,
-        spec: false,
         project: options.name,
       }),
       schematic('component', {
diff --git a/packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__.module.spec.ts b/packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__.module.spec.ts
deleted file mode 100644
index f4854eb34e12..000000000000
--- a/packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__.module.spec.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { <%= classify(name) %>Module } from './<%= dasherize(name) %>.module';
-
-describe('<%= classify(name) %>Module', () => {
-  let <%= camelize(name) %>Module: <%= classify(name) %>Module;
-
-  beforeEach(() => {
-    <%= camelize(name) %>Module = new <%= classify(name) %>Module();
-  });
-
-  it('should create an instance', () => {
-    expect(<%= camelize(name) %>Module).toBeTruthy();
-  });
-});
diff --git a/packages/schematics/angular/module/index.ts b/packages/schematics/angular/module/index.ts
index 299ec6f8cdfb..eccb6c415668 100644
--- a/packages/schematics/angular/module/index.ts
+++ b/packages/schematics/angular/module/index.ts
@@ -88,7 +88,6 @@ export default function (options: ModuleOptions): Rule {
     options.path = parsedPath.path;
 
     const templateSource = apply(url('./files'), [
-      options.spec ? noop() : filter(path => !path.endsWith('.spec.ts')),
       options.routing ? noop() : filter(path => !path.endsWith('-routing.module.ts')),
       template({
         ...strings,
diff --git a/packages/schematics/angular/module/index_spec.ts b/packages/schematics/angular/module/index_spec.ts
index a3d988d0c809..c267e591e669 100644
--- a/packages/schematics/angular/module/index_spec.ts
+++ b/packages/schematics/angular/module/index_spec.ts
@@ -18,7 +18,6 @@ describe('Module Schematic', () => {
   );
   const defaultOptions: ModuleOptions = {
     name: 'foo',
-    spec: true,
     module: undefined,
     flat: false,
     project: 'bar',
@@ -50,7 +49,6 @@ describe('Module Schematic', () => {
 
     const tree = schematicRunner.runSchematic('module', options, appTree);
     const files = tree.files;
-    expect(files.indexOf('/projects/bar/src/app/foo/foo.module.spec.ts')).toBeGreaterThanOrEqual(0);
     expect(files.indexOf('/projects/bar/src/app/foo/foo.module.ts')).toBeGreaterThanOrEqual(0);
   });
 
@@ -104,15 +102,6 @@ describe('Module Schematic', () => {
     expect(routingModuleContent).toMatch(/RouterModule.forChild\(routes\)/);
   });
 
-  it('should respect the spec flag', () => {
-    const options = { ...defaultOptions, spec: false };
-
-    const tree = schematicRunner.runSchematic('module', options, appTree);
-    const files = tree.files;
-    expect(files.indexOf('/projects/bar/src/app/foo/foo.module.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/bar/src/app/foo/foo.module.spec.ts')).toEqual(-1);
-  });
-
   it('should dasherize a name', () => {
     const options = { ...defaultOptions, name: 'TwoWord' };
 
@@ -120,8 +109,6 @@ describe('Module Schematic', () => {
     const files = tree.files;
     expect(files.indexOf('/projects/bar/src/app/two-word/two-word.module.ts'))
       .toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/bar/src/app/two-word/two-word.module.spec.ts'))
-      .toBeGreaterThanOrEqual(0);
   });
 
   it('should respect the sourceRoot value', () => {
diff --git a/packages/schematics/angular/module/schema.json b/packages/schematics/angular/module/schema.json
index 8dac5b5aa502..c52ffab315a0 100644
--- a/packages/schematics/angular/module/schema.json
+++ b/packages/schematics/angular/module/schema.json
@@ -36,11 +36,6 @@
       "description": "The scope for the generated routing.",
       "default": "Child"
     },
-    "spec": {
-      "type": "boolean",
-      "description": "Specifies if a spec file is generated.",
-      "default": true
-    },
     "flat": {
       "type": "boolean",
       "description": "Flag to indicate if a dir is created.",

From 72032f8a0ba3da457cf2bc141e739d4f5591a71f Mon Sep 17 00:00:00 2001
From: "Adam J. Penn" <madannep@gmail.com>
Date: Thu, 20 Sep 2018 17:42:48 -0400
Subject: [PATCH 0172/1703] docs(@angular/cli): Added alias section to each doc
 for the generate commands (#12253)

---
 docs/documentation/generate.md             | 5 ++++-
 docs/documentation/generate/app-shell.md   | 5 ++++-
 docs/documentation/generate/application.md | 5 ++++-
 docs/documentation/generate/class.md       | 3 +++
 docs/documentation/generate/component.md   | 3 +++
 docs/documentation/generate/directive.md   | 3 +++
 docs/documentation/generate/enum.md        | 3 +++
 docs/documentation/generate/guard.md       | 3 +++
 docs/documentation/generate/interface.md   | 3 +++
 docs/documentation/generate/library.md     | 3 +++
 docs/documentation/generate/module.md      | 3 +++
 docs/documentation/generate/pipe.md        | 3 +++
 docs/documentation/generate/service.md     | 3 +++
 docs/documentation/generate/universal.md   | 2 +-
 14 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/docs/documentation/generate.md b/docs/documentation/generate.md
index ad35dc73742c..ec448122faee 100644
--- a/docs/documentation/generate.md
+++ b/docs/documentation/generate.md
@@ -5,6 +5,9 @@
 ## Overview
 `ng generate [name]` generates the specified schematic
 
+## Alias
+g - `ng g [name]`
+
 ## Available Schematics:
  - [class](generate/class)
  - [component](generate/component)
@@ -15,7 +18,7 @@
  - [module](generate/module)
  - [pipe](generate/pipe)
  - [service](generate/service)
-
+ - [appShell](generate/app-shell)
  - [application](generate/application)
  - [library](generate/library)
  - [universal](generate/universal)
diff --git a/docs/documentation/generate/app-shell.md b/docs/documentation/generate/app-shell.md
index 42308267e804..b065a442af18 100644
--- a/docs/documentation/generate/app-shell.md
+++ b/docs/documentation/generate/app-shell.md
@@ -3,7 +3,10 @@
 # ng generate app-shell
 
 ## Overview
-Create an app shell.
+`ng generate appShell [name]` creates an app shell
+
+## Alias
+app-shell - `ng generate app-shell [name]`
 
 ## Options
 <details>
diff --git a/docs/documentation/generate/application.md b/docs/documentation/generate/application.md
index 439d24693cf2..ddf2e73d2709 100644
--- a/docs/documentation/generate/application.md
+++ b/docs/documentation/generate/application.md
@@ -3,7 +3,10 @@
 # ng generate application
 
 ## Overview
-Create an Angular application.
+`ng generate application [name]` creates an Angular application.
+
+## Alias
+app - `ng generate app [name]`
 
 ## Options
 <details>
diff --git a/docs/documentation/generate/class.md b/docs/documentation/generate/class.md
index 4804318f7eff..2921320f5d6a 100644
--- a/docs/documentation/generate/class.md
+++ b/docs/documentation/generate/class.md
@@ -5,6 +5,9 @@
 ## Overview
 `ng generate class [name]` generates a class
 
+## Alias
+cl - `ng generate cl [name]`
+
 ## Options
 <details>
   <summary>dry-run</summary>
diff --git a/docs/documentation/generate/component.md b/docs/documentation/generate/component.md
index 95335f9c792e..2a50786f6d89 100644
--- a/docs/documentation/generate/component.md
+++ b/docs/documentation/generate/component.md
@@ -5,6 +5,9 @@
 ## Overview
 `ng generate component [name]` generates a component
 
+## Alias
+c - `ng generate c [name]`
+
 ## Options
 <details>
   <summary>dry-run</summary>
diff --git a/docs/documentation/generate/directive.md b/docs/documentation/generate/directive.md
index aa1653ebf9cc..96c3ce04e94b 100644
--- a/docs/documentation/generate/directive.md
+++ b/docs/documentation/generate/directive.md
@@ -5,6 +5,9 @@
 ## Overview
 `ng generate directive [name]` generates a directive
 
+## Alias
+d - `ng generate d [name]`
+
 ## Options
 <details>
   <summary>dry-run</summary>
diff --git a/docs/documentation/generate/enum.md b/docs/documentation/generate/enum.md
index b5614375d60b..79824e183b91 100644
--- a/docs/documentation/generate/enum.md
+++ b/docs/documentation/generate/enum.md
@@ -5,6 +5,9 @@
 ## Overview
 `ng generate enum [name]` generates an enumeration
 
+## Alias
+e - `ng generate e [name]`
+
 ## Options
 <details>
   <summary>dry-run</summary>
diff --git a/docs/documentation/generate/guard.md b/docs/documentation/generate/guard.md
index ea2e17aec000..06a82df57e9b 100644
--- a/docs/documentation/generate/guard.md
+++ b/docs/documentation/generate/guard.md
@@ -3,6 +3,9 @@
 ## Overview
 `ng generate guard [name]` generates a guard
 
+## Alias
+g - `ng generate g [name]`
+
 ## Options
 <details>
   <summary>dry-run</summary>
diff --git a/docs/documentation/generate/interface.md b/docs/documentation/generate/interface.md
index c769635e12b0..69ac2e27ab8b 100644
--- a/docs/documentation/generate/interface.md
+++ b/docs/documentation/generate/interface.md
@@ -5,6 +5,9 @@
 ## Overview
 `ng generate interface [name] <type>` generates an interface
 
+## Alias
+i - `ng generate i [name]`
+
 ## Options
 <details>
   <summary>dry-run</summary>
diff --git a/docs/documentation/generate/library.md b/docs/documentation/generate/library.md
index 2215d2c69db3..8db2a744522d 100644
--- a/docs/documentation/generate/library.md
+++ b/docs/documentation/generate/library.md
@@ -5,6 +5,9 @@
 ## Overview
 Generate a library project for Angular.
 
+## Alias
+lib - `ng generate lib [name]`
+
 ## Options
 <details>
   <summary>dry-run</summary>
diff --git a/docs/documentation/generate/module.md b/docs/documentation/generate/module.md
index 090a04366098..aadc337a1131 100644
--- a/docs/documentation/generate/module.md
+++ b/docs/documentation/generate/module.md
@@ -5,6 +5,9 @@
 ## Overview
 `ng generate module [name]` generates an NgModule
 
+## Alias
+m - `ng generate m [name]`
+
 ## Options
 <details>
   <summary>dry-run</summary>
diff --git a/docs/documentation/generate/pipe.md b/docs/documentation/generate/pipe.md
index e5384f787a19..beec9abfbd48 100644
--- a/docs/documentation/generate/pipe.md
+++ b/docs/documentation/generate/pipe.md
@@ -5,6 +5,9 @@
 ## Overview
 `ng generate pipe [name]` generates a pipe
 
+## Alias
+p - `ng generate p [name]`
+
 ## Options
 <details>
   <summary>dry-run</summary>
diff --git a/docs/documentation/generate/service.md b/docs/documentation/generate/service.md
index e4008eb0fc20..d52583b12aa3 100644
--- a/docs/documentation/generate/service.md
+++ b/docs/documentation/generate/service.md
@@ -5,6 +5,9 @@
 ## Overview
 `ng generate service [name]` generates a service
 
+## Alias
+s - `ng generate s [name]`
+
 ## Options
 <details>
   <summary>dry-run</summary>
diff --git a/docs/documentation/generate/universal.md b/docs/documentation/generate/universal.md
index 945eaa3c2c0c..8e9bf1e0241f 100644
--- a/docs/documentation/generate/universal.md
+++ b/docs/documentation/generate/universal.md
@@ -3,7 +3,7 @@
 # ng generate universal
 
 ## Overview
-Create an Angular universal app.
+`ng generate universal [name]` creates an Angular universal app.
 
 ## Options
 <details>

From 0b959d123381033a06637707fc908e77336737b0 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Thu, 20 Sep 2018 14:45:09 -0700
Subject: [PATCH 0173/1703] * fix(@angular/cli): remove helpJson and help-json
 mentions (#12331)

* fix(@angular/cli): remove helpJson and help-json mentions

* ci: use proper --help=json for creating snapshot
---
 packages/angular/cli/models/architect-command.ts | 2 +-
 packages/angular/cli/models/command.ts           | 1 -
 packages/angular/cli/models/interface.ts         | 2 +-
 scripts/snapshots.ts                             | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index 184dfc8d450a..505dd5321f0a 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -93,7 +93,7 @@ export abstract class ArchitectCommand<
     }
 
     if ((!targetSpec.project || !targetSpec.target) && !this.multiTarget) {
-      if (options.help || options.helpJson) {
+      if (options.help) {
         // This is a special case where we just return.
         return;
       }
diff --git a/packages/angular/cli/models/command.ts b/packages/angular/cli/models/command.ts
index 6234fb9dc596..793c57ed2528 100644
--- a/packages/angular/cli/models/command.ts
+++ b/packages/angular/cli/models/command.ts
@@ -21,7 +21,6 @@ import {
 
 export interface BaseCommandOptions {
   help?: boolean | string;
-  helpJson?: boolean;
 }
 
 export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions> {
diff --git a/packages/angular/cli/models/interface.ts b/packages/angular/cli/models/interface.ts
index 940ae85c1fd1..26e88f4beb80 100644
--- a/packages/angular/cli/models/interface.ts
+++ b/packages/angular/cli/models/interface.ts
@@ -71,7 +71,7 @@ export enum OptionType {
 }
 
 /**
- * An option description. This is exposed when using `ng --help-json`.
+ * An option description. This is exposed when using `ng --help=json`.
  */
 export interface Option {
   /**
diff --git a/scripts/snapshots.ts b/scripts/snapshots.ts
index 7c3f296ff424..31d02311f402 100644
--- a/scripts/snapshots.ts
+++ b/scripts/snapshots.ts
@@ -96,7 +96,7 @@ export default async function(opts: SnapshotsOptions, logger: logging.Logger) {
   for (const commandName of Object.keys(commands)) {
     const options = { cwd: newProjectRoot };
     const childLogger = logger.createChild(commandName);
-    const stdout = _exec(ngPath, [commandName, '--help-json'], options, childLogger);
+    const stdout = _exec(ngPath, [commandName, '--help=json'], options, childLogger);
     if (stdout.trim()) {
       fs.writeFileSync(path.join(helpOutputRoot, commandName + '.json'), stdout);
     }

From f74c1f479a6d869ba3433b25e449b552dcae2885 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Thu, 20 Sep 2018 15:19:42 -0700
Subject: [PATCH 0174/1703] feat(@angular-devkit/schematics): allow workflow
 impl to define their own sinks (#12330)

Behaviour for NodeWorkflow should be the same.
---
 .../schematics/src/sink/sink.ts               |  4 --
 .../schematics/src/workflow/base.ts           | 67 ++++++++++++-------
 2 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/packages/angular_devkit/schematics/src/sink/sink.ts b/packages/angular_devkit/schematics/src/sink/sink.ts
index 30f0c53175ae..e4ccbe381dbb 100644
--- a/packages/angular_devkit/schematics/src/sink/sink.ts
+++ b/packages/angular_devkit/schematics/src/sink/sink.ts
@@ -32,10 +32,6 @@ import { Tree } from '../tree/interface';
 
 
 export interface Sink {
-  preCommitAction: (action: Action) => void | PromiseLike<Action> | Observable<Action> | Action;
-  preCommit: () => void | Observable<void>;
-  postCommit: () => void | Observable<void>;
-
   commit(tree: Tree): Observable<void>;
 }
 
diff --git a/packages/angular_devkit/schematics/src/workflow/base.ts b/packages/angular_devkit/schematics/src/workflow/base.ts
index 134cde1e61f6..61238b0fe28b 100644
--- a/packages/angular_devkit/schematics/src/workflow/base.ts
+++ b/packages/angular_devkit/schematics/src/workflow/base.ts
@@ -13,6 +13,7 @@ import { UnsuccessfulWorkflowExecution } from '../exception/exception';
 import { standardFormats } from '../formats';
 import { DryRunEvent, DryRunSink } from '../sink/dryrun';
 import { HostSink } from '../sink/host';
+import { Sink } from '../sink/sink';
 import { HostTree } from '../tree/host-tree';
 import { Tree } from '../tree/interface';
 import { optimize } from '../tree/static';
@@ -96,6 +97,35 @@ export abstract class BaseWorkflow implements Workflow {
     return this._lifeCycle.asObservable();
   }
 
+  protected _createSinks(): Sink[] {
+    let error = false;
+
+    const dryRunSink = new DryRunSink(this._host, this._force);
+    const dryRunSubscriber = dryRunSink.reporter.subscribe(event => {
+      this._reporter.next(event);
+      error = error || (event.kind == 'error');
+    });
+
+    // We need two sinks if we want to output what will happen, and actually do the work.
+    return [
+      dryRunSink,
+      // Add a custom sink that clean ourselves and throws an error if an error happened.
+      {
+        commit() {
+          dryRunSubscriber.unsubscribe();
+          if (error) {
+            return throwError(new UnsuccessfulWorkflowExecution());
+          }
+
+          return of();
+        },
+      },
+
+      // Only add a HostSink if this is not a dryRun.
+      ...(!this._dryRun ? [new HostSink(this._host, this._force)] : []),
+    ];
+  }
+
   execute(
     options: Partial<WorkflowExecutionContext> & RequiredWorkflowExecutionContext,
   ): Observable<void> {
@@ -112,17 +142,7 @@ export abstract class BaseWorkflow implements Workflow {
       || (parentContext && parentContext.collection === options.collection);
     const schematic = collection.createSchematic(options.schematic, allowPrivate);
 
-    // We need two sinks if we want to output what will happen, and actually do the work.
-    // Note that fsSink is technically not used if `--dry-run` is passed, but creating the Sink
-    // does not have any side effect.
-    const dryRunSink = new DryRunSink(this._host, this._force);
-    const fsSink = new HostSink(this._host, this._force);
-
-    let error = false;
-    const dryRunSubscriber = dryRunSink.reporter.subscribe(event => {
-      this._reporter.next(event);
-      error = error || (event.kind == 'error');
-    });
+    const sinks = this._createSinks();
 
     this._lifeCycle.next({ kind: 'workflow-start' });
 
@@ -141,23 +161,18 @@ export abstract class BaseWorkflow implements Workflow {
     ).pipe(
       map(tree => optimize(tree)),
       concatMap((tree: Tree) => {
-        return concat(
-          dryRunSink.commit(tree).pipe(ignoreElements()),
-          of(tree),
+        // Process all sinks.
+        return of(tree).pipe(
+          ...sinks.map(sink => {
+            return concatMap((tree: Tree) => {
+              return concat(
+                sink.commit(tree).pipe(ignoreElements()),
+                of(tree),
+              );
+            });
+          }),
         );
       }),
-      concatMap((tree: Tree) => {
-        dryRunSubscriber.unsubscribe();
-        if (error) {
-          return throwError(new UnsuccessfulWorkflowExecution());
-        }
-
-        if (this._dryRun) {
-          return of();
-        }
-
-        return fsSink.commit(tree).pipe(defaultIfEmpty(), last());
-      }),
       concatMap(() => {
         if (this._dryRun) {
           return of();

From 43fff130a59784d945a76a09ce9bc93343deeee5 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 21 Sep 2018 21:27:11 +0200
Subject: [PATCH 0175/1703] fix(@angular/cli): cannot use same target name in
 when having multiple projects (#12327)

Closes #12320
---
 packages/angular/cli/models/architect-command.ts |  9 ++++++---
 .../e2e/tests/misc/multiple-targets.ts           | 16 ++++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 tests/legacy-cli/e2e/tests/misc/multiple-targets.ts

diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index 505dd5321f0a..38b7b59814f4 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -103,10 +103,13 @@ export abstract class ArchitectCommand<
 
     if (this.target) {
       // Add options IF there's only one builder of this kind.
-      const projectNames = this.getProjectNamesByTarget(this.target);
+      const targetSpec: TargetSpecifier = this._makeTargetSpecifier(options);
+      const projectNames = targetSpec.project
+        ? [targetSpec.project]
+        : this.getProjectNamesByTarget(this.target);
+
       const builderConfigurations: BuilderConfiguration[] = [];
       for (const projectName of projectNames) {
-        const targetSpec: TargetSpecifier = this._makeTargetSpecifier(options);
         const targetDesc = this._architect.getBuilderConfiguration({
           project: projectName,
           target: targetSpec.target,
@@ -207,7 +210,7 @@ export abstract class ArchitectCommand<
       // For multi target commands, we always list all projects that have the target.
       return allProjectsForTargetName;
     } else {
-      // For single target commands, we try try the default project project first,
+      // For single target commands, we try the default project first,
       // then the full list if it has a single project, then error out.
       const maybeDefaultProject = this._workspace.getDefaultProjectName();
       if (maybeDefaultProject && allProjectsForTargetName.includes(maybeDefaultProject)) {
diff --git a/tests/legacy-cli/e2e/tests/misc/multiple-targets.ts b/tests/legacy-cli/e2e/tests/misc/multiple-targets.ts
new file mode 100644
index 000000000000..58c92dcfea7d
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/misc/multiple-targets.ts
@@ -0,0 +1,16 @@
+import { expectFileToExist } from '../../utils/fs';
+import { ng } from '../../utils/process';
+import { updateJsonFile } from '../../utils/project';
+
+export default async function () {
+  await ng('generate', 'app', 'secondary-app');
+
+  await updateJsonFile('angular.json', workspaceJson => {
+    workspaceJson.defaultProject = undefined;
+  });
+
+  await ng('build', 'secondary-app');
+
+  expectFileToExist('dist/secondary-app/index.html');
+  expectFileToExist('dist/secondary-app/main.js');
+}

From 38194b6ca4723b46413edccb8d491f5da8d1f6be Mon Sep 17 00:00:00 2001
From: clydin <19598772+clydin@users.noreply.github.com>
Date: Fri, 21 Sep 2018 15:27:41 -0400
Subject: [PATCH 0176/1703] ci: add size check of new project production build
 (#12328)

---
 .circleci/config.yml                      |  3 +++
 .github/angular-robot.yml                 |  5 +++++
 tests/legacy-cli/e2e/tests/basic/build.ts | 27 ++++++++++++++++-------
 tests/legacy-cli/e2e/utils/fs.ts          |  4 ++++
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 886c08b5cb23..f89def943887 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -86,6 +86,9 @@ jobs:
     steps:
       - attach_workspace: *attach_options
       - run: xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
+      - store_artifacts:
+          path: /tmp/dist
+          destination: cli/new-production
   
   e2e-node-8:
     <<: *defaults
diff --git a/.github/angular-robot.yml b/.github/angular-robot.yml
index ca9d26f7dd2d..2ebaf76633ef 100644
--- a/.github/angular-robot.yml
+++ b/.github/angular-robot.yml
@@ -91,3 +91,8 @@ triage:
     -
       - "type: docs"
       - "comp: *"
+
+# Size checking
+size:
+  circleCiStatusName: "ci/circleci: e2e-cli"
+  maxSizeIncrease: 10000
diff --git a/tests/legacy-cli/e2e/tests/basic/build.ts b/tests/legacy-cli/e2e/tests/basic/build.ts
index 36ad2f6b68fc..4473ca62d94f 100644
--- a/tests/legacy-cli/e2e/tests/basic/build.ts
+++ b/tests/legacy-cli/e2e/tests/basic/build.ts
@@ -1,9 +1,20 @@
-import {ng} from '../../utils/process';
-import {expectFileToMatch} from '../../utils/fs';
-
-export default function() {
-  return ng('build')
-    .then(() => expectFileToMatch('dist/test-project/index.html', 'main.js'))
-    .then(() => ng('build', '--prod'))
-    .then(() => expectFileToMatch('dist/test-project/index.html', /main\.[a-zA-Z0-9]{20}\.js/));
+import { expectFileToMatch, moveDirectory } from '../../utils/fs';
+import { ng } from '../../utils/process';
+
+
+export default async function() {
+  // Development build
+  await ng('build');
+  await expectFileToMatch('dist/test-project/index.html', 'main.js');
+
+
+  // Production build
+  await ng('build', '--prod');
+  await expectFileToMatch('dist/test-project/index.html', /main\.[a-zA-Z0-9]{20}\.js/);
+
+  // Store the production build for artifact storage on CircleCI
+  if (process.env['CIRCLECI']) {
+    await ng('build', '--prod', '--output-hashing=none');
+    await moveDirectory('dist', '/tmp/dist');
+  }
 }
diff --git a/tests/legacy-cli/e2e/utils/fs.ts b/tests/legacy-cli/e2e/utils/fs.ts
index 13d424e81f17..2f2a0cdaae77 100644
--- a/tests/legacy-cli/e2e/utils/fs.ts
+++ b/tests/legacy-cli/e2e/utils/fs.ts
@@ -107,6 +107,10 @@ export function copyFile(from: string, to: string) {
     }));
 }
 
+export function moveDirectory(from: string, to: string) {
+  return fs.move(from, to, { overwrite: true });
+}
+
 
 export function writeMultipleFiles(fs: { [path: string]: string }) {
   return Promise.all(Object.keys(fs).map(fileName => writeFile(fileName, fs[fileName])));

From 9af7876d17ed55558186a0ea9e9741e0e6b39293 Mon Sep 17 00:00:00 2001
From: Marcos Junior <coder.marcos@gmail.com>
Date: Fri, 21 Sep 2018 16:27:55 -0300
Subject: [PATCH 0177/1703] docs: example command to generate library (#12334)

---
 docs/documentation/generate/library.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/documentation/generate/library.md b/docs/documentation/generate/library.md
index 8db2a744522d..c891bf6c35bb 100644
--- a/docs/documentation/generate/library.md
+++ b/docs/documentation/generate/library.md
@@ -3,7 +3,7 @@
 # ng generate library
 
 ## Overview
-Generate a library project for Angular.
+`ng generate library [name]` generates a library project for Angular.
 
 ## Alias
 lib - `ng generate lib [name]`

From 1b268b295e09c441d2b1f60e1e4cfb60555a4cdc Mon Sep 17 00:00:00 2001
From: clydin <19598772+clydin@users.noreply.github.com>
Date: Fri, 21 Sep 2018 15:28:10 -0400
Subject: [PATCH 0178/1703] ci: fix parallelism for e2e node 8.x job (#12341)

---
 .circleci/config.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f89def943887..ae48002bb43c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -98,11 +98,11 @@ jobs:
     environment:
       BASH_ENV: ~/.profile
     resource_class: xlarge
-    parallelism: 4
+    parallelism: 2
     steps:
       - attach_workspace: *attach_options
       - run: npm install --global npm@6
-      - run: xvfb-run -a node ./tests/legacy-cli/run_e2e --glob=tests/basic/*
+      - run: xvfb-run -a node ./tests/legacy-cli/run_e2e --glob=tests/basic/* --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
 
   e2e-cli-ng-snapshots:
     <<: *defaults
@@ -112,7 +112,6 @@ jobs:
     parallelism: 4
     steps:
       - attach_workspace: *attach_options
-      - run: npm install --global npm@6
       - run: xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} --ng-snapshots
 
   build:

From 30f8352ca2b3cccd72f5fcff8e09a543f9c70a8d Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 20 Sep 2018 19:54:19 -0400
Subject: [PATCH 0179/1703] feat(@angular-devkit/build-angular): automatically
 include reflect metadata polyfill for JIT

The reflect metadata polyfill is only required by Angular when using JIT.  Since it is unanticipated it would be needed when using AOT, including it when using AOT only serves to unnecessarily increase application file sizes.
JIT is not recommended for production use.  However, if an application uses JIT in production and an alternate reflect metadata polyfill is preferred (core-js/es7/reflect is currently used), then TypeScript path mapping can be used to override the polyfill.  As an example, the following will allow the usage of the `reflect-metadata` package in lieu of the default:
```
    "paths": {
      "core-js/es7/reflect": ["node_modules/reflect-metadata"]
    }
```
---
 .../src/angular-cli-files/models/jit-polyfills.js         | 8 ++++++++
 .../angular-cli-files/models/webpack-configs/common.ts    | 7 +++++++
 2 files changed, 15 insertions(+)
 create mode 100644 packages/angular_devkit/build_angular/src/angular-cli-files/models/jit-polyfills.js

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/jit-polyfills.js b/packages/angular_devkit/build_angular/src/angular-cli-files/models/jit-polyfills.js
new file mode 100644
index 000000000000..624a54706810
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/jit-polyfills.js
@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import 'core-js/es7/reflect';
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index b7901ceab9df..3a59950deb0c 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -62,6 +62,13 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
     entryPoints['polyfills'] = [path.resolve(root, buildOptions.polyfills)];
   }
 
+  if (!buildOptions.aot) {
+    entryPoints['polyfills'] = [
+      ...(entryPoints['polyfills'] || []),
+      path.join(__dirname, '..', 'jit-polyfills.js'),
+    ];
+  }
+
   // determine hashing format
   const hashFormat = getOutputHashFormat(buildOptions.outputHashing as any);
 

From d3fa9a6631f816b4f0c059a1035a8b90ad3581c1 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 20 Sep 2018 19:55:18 -0400
Subject: [PATCH 0180/1703] fix(@schematics/angular): remove redundant reflect
 polyfill

---
 .../schematics/angular/application/files/src/polyfills.ts   | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/schematics/angular/application/files/src/polyfills.ts b/packages/schematics/angular/application/files/src/polyfills.ts
index 8fceb45d3b0a..074b89d38e40 100644
--- a/packages/schematics/angular/application/files/src/polyfills.ts
+++ b/packages/schematics/angular/application/files/src/polyfills.ts
@@ -40,12 +40,6 @@
 /** IE10 and IE11 requires the following for the Reflect API. */
 // import 'core-js/es6/reflect';
 
-
-/** Evergreen browsers require these. **/
-// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
-import 'core-js/es7/reflect';
-
-
 /**
  * Web Animations `@angular/platform-browser/animations`
  * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.

From 17cde22a44e0c2a74aeba29e038378399905d19f Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 21 Sep 2018 17:11:47 -0400
Subject: [PATCH 0181/1703] test: update E2E polyfills test for JIT mode

---
 tests/legacy-cli/e2e/tests/build/polyfills.ts | 36 +++++++++++++------
 tests/legacy-cli/e2e/utils/fs.ts              | 19 ++++++----
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/build/polyfills.ts b/tests/legacy-cli/e2e/tests/build/polyfills.ts
index d480169480e3..cc0e147afd4e 100644
--- a/tests/legacy-cli/e2e/tests/build/polyfills.ts
+++ b/tests/legacy-cli/e2e/tests/build/polyfills.ts
@@ -1,18 +1,32 @@
-import { expectFileToMatch } from '../../utils/fs';
-import { ng } from '../../utils/process';
 import { oneLineTrim } from 'common-tags';
+import {
+  expectFileSizeToBeUnder,
+  expectFileToExist,
+  expectFileToMatch,
+  getFileSize,
+} from '../../utils/fs';
+import { ng } from '../../utils/process';
+import { expectToFail } from '../../utils/utils';
 
-export default function () {
-  // TODO(architect): Delete this test. It is now in devkit/build-angular.
+export default async function () {
+    await ng('build');
+    // files were created successfully
+    await expectFileToMatch('dist/test-project/polyfills.js', 'core-js/es7/reflect');
+    await expectFileToMatch('dist/test-project/polyfills.js', 'zone.js');
+    expectFileToMatch('dist/test-project/index.html', oneLineTrim`
+      <script type="text/javascript" src="runtime.js"></script>
+      <script type="text/javascript" src="polyfills.js"></script>
+    `);
+    const jitPolyfillSize = await getFileSize('dist/test-project/polyfills.js');
 
-  return Promise.resolve()
-    .then(() => ng('build'))
+    await ng('build', '--aot');
     // files were created successfully
-    .then(() => expectFileToMatch('dist/test-project/polyfills.js', 'core-js'))
-    .then(() => expectFileToMatch('dist/test-project/polyfills.js', 'zone.js'))
-    // index.html lists the right bundles
-    .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
+    await expectFileToExist('dist/test-project/polyfills.js');
+    await expectFileSizeToBeUnder('dist/test-project/polyfills.js', jitPolyfillSize);
+    await expectToFail(() => expectFileToMatch('dist/test-project/polyfills.js', 'core-js/es7/reflect'));
+    await expectFileToMatch('dist/test-project/polyfills.js', 'zone.js');
+    expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script type="text/javascript" src="runtime.js"></script>
       <script type="text/javascript" src="polyfills.js"></script>
-    `));
+    `);
 }
diff --git a/tests/legacy-cli/e2e/utils/fs.ts b/tests/legacy-cli/e2e/utils/fs.ts
index 2f2a0cdaae77..4beb03021e1f 100644
--- a/tests/legacy-cli/e2e/utils/fs.ts
+++ b/tests/legacy-cli/e2e/utils/fs.ts
@@ -192,11 +192,16 @@ export function expectFileToMatch(fileName: string, regEx: RegExp | string) {
     });
 }
 
-export function expectFileSizeToBeUnder(fileName: string, sizeInBytes: number) {
-  return readFile(fileName)
-    .then(content => {
-      if (content.length > sizeInBytes) {
-        throw new Error(`File "${fileName}" exceeded file size of "${sizeInBytes}".`);
-      }
-    });
+export async function getFileSize(fileName: string) {
+  const stats = await fs.stat(fileName);
+
+  return stats.size;
+}
+
+export async function expectFileSizeToBeUnder(fileName: string, sizeInBytes: number) {
+  const fileSize = await getFileSize(fileName);
+
+  if (fileSize > sizeInBytes) {
+    throw new Error(`File "${fileName}" exceeded file size of "${sizeInBytes}".`);
+  }
 }

From 4efa26a004449fb79be6f2424454d16f10cf7264 Mon Sep 17 00:00:00 2001
From: S K <xz64@users.noreply.github.com>
Date: Sun, 23 Sep 2018 10:46:35 -0700
Subject: [PATCH 0182/1703] feat(@angular-devkit/build-angular): update
 license-webpack-plugin

Closes #11536
---
 packages/angular_devkit/build_angular/package.json   |  2 +-
 .../models/webpack-configs/browser.ts                |  6 ++++--
 yarn.lock                                            | 12 ++++--------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 3f1b61dba346..ce0dabd9a0e2 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -24,7 +24,7 @@
     "karma-source-map-support": "1.3.0",
     "less": "3.8.1",
     "less-loader": "4.1.0",
-    "license-webpack-plugin": "1.4.0",
+    "license-webpack-plugin": "2.0.1",
     "loader-utils": "1.1.0",
     "mini-css-extract-plugin": "0.4.3",
     "minimatch": "3.0.4",
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
index c4d7460d401b..133485d83523 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
@@ -79,8 +79,10 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
 
   if (buildOptions.extractLicenses) {
     extraPlugins.push(new LicenseWebpackPlugin({
-      pattern: /.*/,
-      suppressErrors: true,
+      stats: {
+        warnings: false,
+        errors: false
+      },
       perChunkOutput: false,
       outputFilename: `3rdpartylicenses.txt`
     }));
diff --git a/yarn.lock b/yarn.lock
index 0fbf50f4cfbc..30fa0b8d6592 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2482,10 +2482,6 @@ ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
-ejs@^2.5.7:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
-
 electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.62:
   version "1.3.63"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.63.tgz#6485f5f4f3375358aa8fa23c2029ada208483b8d"
@@ -4583,11 +4579,11 @@ license-checker@^20.1.0:
     strip-ansi "^4.0.0"
     treeify "^1.1.0"
 
-license-webpack-plugin@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-1.4.0.tgz#be504a849ba7d736f1a6da4b133864f30af885fa"
+license-webpack-plugin@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.0.1.tgz#d8d24d0d0db70d328ec911ae728719b842260078"
   dependencies:
-    ejs "^2.5.7"
+    webpack-sources "^1.2.0"
 
 lie@~3.1.0:
   version "3.1.1"

From efd78be4b0e012a83ad39764d15f8748cadbe49b Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Wed, 19 Sep 2018 19:01:13 -0700
Subject: [PATCH 0183/1703] ci: call main function from schematics bin

---
 bin/schematics | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/schematics b/bin/schematics
index 748599df46c9..ea3f5176befa 100755
--- a/bin/schematics
+++ b/bin/schematics
@@ -11,4 +11,4 @@
 
 require('../lib/bootstrap-local');
 const packages = require('../lib/packages').packages;
-require(packages['@angular-devkit/schematics-cli'].bin['schematics']);
+require(packages['@angular-devkit/schematics-cli'].bin['schematics']).main({ args: process.argv.slice(2) });

From 27715292fd16b11faddddf1456be1eabf9ee4913 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Mon, 24 Sep 2018 15:05:09 -0400
Subject: [PATCH 0184/1703] feat(@schematics/angular): new 7.0.0 migration to
 remove polyfills

See PR https://github.com/angular/angular-cli/pull/12346 for more information. This
PR migrates current CLI projects to the new polyfills introduced in that PR.
---
 .../migrations/migration-collection.json      |   7 +-
 .../angular/migrations/update-7/index.ts      |   1 +
 .../migrations/update-7/polyfill-metadata.ts  | 136 ++++++++++++++++++
 .../update-7/polyfill-metadata_spec.ts        |  89 ++++++++++++
 4 files changed, 232 insertions(+), 1 deletion(-)
 create mode 100644 packages/schematics/angular/migrations/update-7/polyfill-metadata.ts
 create mode 100644 packages/schematics/angular/migrations/update-7/polyfill-metadata_spec.ts

diff --git a/packages/schematics/angular/migrations/migration-collection.json b/packages/schematics/angular/migrations/migration-collection.json
index adee986ffabe..fab2b498dcc3 100644
--- a/packages/schematics/angular/migrations/migration-collection.json
+++ b/packages/schematics/angular/migrations/migration-collection.json
@@ -9,6 +9,11 @@
       "version": "7.0.0-beta.0",
       "factory": "./update-7",
       "description": "Update an Angular CLI project to version 7."
+    },
+    "migration-03": {
+      "version": "7.0.0-rc.0",
+      "factory": "./update-7/index#polyfillMetadataRule",
+      "description": "Update an Angular CLI project to version 7."
     }
   }
-}
\ No newline at end of file
+}
diff --git a/packages/schematics/angular/migrations/update-7/index.ts b/packages/schematics/angular/migrations/update-7/index.ts
index 626d4a449ef1..682463a0041c 100644
--- a/packages/schematics/angular/migrations/update-7/index.ts
+++ b/packages/schematics/angular/migrations/update-7/index.ts
@@ -13,6 +13,7 @@ import {
 } from '../../utility/dependencies';
 import { latestVersions } from '../../utility/latest-versions';
 
+export { polyfillMetadataRule } from './polyfill-metadata';
 
 export default function(): Rule {
   return (tree, context) => {
diff --git a/packages/schematics/angular/migrations/update-7/polyfill-metadata.ts b/packages/schematics/angular/migrations/update-7/polyfill-metadata.ts
new file mode 100644
index 000000000000..328457c8b2ff
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-7/polyfill-metadata.ts
@@ -0,0 +1,136 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { json } from '@angular-devkit/core';
+import { Rule, Tree, chain, noop } from '@angular-devkit/schematics';
+import * as ts from 'typescript';
+
+
+/**
+ * Remove the Reflect import from a polyfill file.
+ * @param tree The tree to use.
+ * @param path Path of the polyfill file found.
+ * @private
+ */
+function _removeReflectFromPolyfills(tree: Tree, path: string) {
+  const source = tree.read(path);
+  if (!source) {
+    return;
+  }
+
+  // Start the update of the file.
+  const recorder = tree.beginUpdate(path);
+
+  const sourceFile = ts.createSourceFile(path, source.toString(), ts.ScriptTarget.Latest);
+  const imports = (
+    sourceFile.statements
+      .filter(s => s.kind === ts.SyntaxKind.ImportDeclaration) as ts.ImportDeclaration[]
+  );
+
+  for (const i of imports) {
+    const module = i.moduleSpecifier.kind == ts.SyntaxKind.StringLiteral
+      && (i.moduleSpecifier as ts.StringLiteral).text;
+
+    switch (module) {
+      case 'core-js/es7/reflect':
+        recorder.remove(i.getStart(sourceFile), i.getWidth(sourceFile));
+        break;
+    }
+  }
+
+  tree.commitUpdate(recorder);
+}
+
+/**
+ * Update a project's target, maybe. Only if it's a builder supported and the options look right.
+ * This is a rule factory so we return the new rule (or noop if we don't support doing the change).
+ * @param root The root of the project source.
+ * @param targetObject The target information.
+ * @private
+ */
+function _updateProjectTarget(root: string, targetObject: json.JsonObject): Rule {
+  // Make sure we're using the correct builder.
+  if (targetObject.builder !== '@angular-devkit/build-angular:browser'
+      || !json.isJsonObject(targetObject.options)) {
+    return noop();
+  }
+  const options = targetObject.options;
+  if (typeof options.polyfills != 'string') {
+    return noop();
+  }
+
+  const polyfillsToUpdate = [`${root}/${options.polyfills}`];
+  const configurations = targetObject.configurations;
+  if (json.isJsonObject(configurations)) {
+    for (const configName of Object.keys(configurations)) {
+      const config = configurations[configName];
+
+      // Just in case, only do non-AOT configurations.
+      if (json.isJsonObject(config)
+          && typeof config.polyfills == 'string'
+          && config.aot !== true) {
+        polyfillsToUpdate.push(`${root}/${config.polyfills}`);
+      }
+    }
+  }
+
+  return chain(
+    polyfillsToUpdate.map(polyfillPath => {
+      return (tree: Tree) => _removeReflectFromPolyfills(tree, polyfillPath);
+    }),
+  );
+}
+
+/**
+ * Move the import reflect metadata polyfill from the polyfill file to the dev environment. This is
+ * not guaranteed to work, but if it doesn't it will result in no changes made.
+ */
+export function polyfillMetadataRule(): Rule {
+  return (tree) => {
+    // Simple. Take the ast of polyfills (if it exists) and find the import metadata. Remove it.
+    const angularConfigContent = tree.read('angular.json') || tree.read('.angular.json');
+    const rules: Rule[] = [];
+
+    if (!angularConfigContent) {
+      // Is this even an angular project?
+      return;
+    }
+
+    const angularJson = json.parseJson(angularConfigContent.toString(), json.JsonParseMode.Loose);
+
+    if (!json.isJsonObject(angularJson) || !json.isJsonObject(angularJson.projects)) {
+      // If that field isn't there, no use...
+      return;
+    }
+
+    // For all projects, for all targets, read the polyfill field, and read the environment.
+    for (const projectName of Object.keys(angularJson.projects)) {
+      const project = angularJson.projects[projectName];
+      if (!json.isJsonObject(project)) {
+        continue;
+      }
+      if (typeof project.root != 'string') {
+        continue;
+      }
+
+      const targets = project.targets || project.architect;
+      if (!json.isJsonObject(targets)) {
+        continue;
+      }
+
+      for (const targetName of Object.keys(targets)) {
+        const target = targets[targetName];
+        if (json.isJsonObject(target)) {
+          rules.push(_updateProjectTarget(project.root, target));
+        }
+      }
+    }
+
+    // Remove null or undefined rules.
+    return chain(rules);
+  };
+}
diff --git a/packages/schematics/angular/migrations/update-7/polyfill-metadata_spec.ts b/packages/schematics/angular/migrations/update-7/polyfill-metadata_spec.ts
new file mode 100644
index 000000000000..beed4a5dbb58
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-7/polyfill-metadata_spec.ts
@@ -0,0 +1,89 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Action, EmptyTree } from '@angular-devkit/schematics';
+import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+
+// Randomly import stuff (including es6 and es7 reflects).
+const oldPolyfills = `
+/** IE9, IE10 and IE11 requires all of the following polyfills. **/
+// import 'core-js/es6/symbol';
+// import 'core-js/es6/object';
+import 'core-js/es6/function';
+import 'core-js/es6/parse-int';
+// import 'core-js/es6/parse-float';
+import 'core-js/es6/number';
+// import 'core-js/es6/math';
+// import 'core-js/es6/string';
+import 'core-js/es6/date';
+// import 'core-js/es6/array';
+// import 'core-js/es6/regexp';
+
+/** IE10 and IE11 requires the following for the Reflect API. */
+import 'core-js/es6/reflect';
+
+
+/** Evergreen browsers require these. **/
+// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
+import 'core-js/es7/reflect';
+
+import 'web-animations-js';  // Run \`npm install --save web-animations-js\`.
+
+ (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
+ (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
+
+/***************************************************************************************************
+ * Zone JS is required by default for Angular itself.
+ */
+import 'zone.js/dist/zone';  // Included with Angular CLI.
+`;
+
+
+describe('polyfillMetadataRule', () => {
+  const schematicRunner = new SchematicTestRunner(
+    'migrations',
+    require.resolve('../migration-collection.json'),
+  );
+
+  let tree: UnitTestTree;
+
+  beforeEach(async () => {
+    tree = new UnitTestTree(new EmptyTree());
+    tree = await schematicRunner.runExternalSchematicAsync(
+      require.resolve('../../collection.json'), 'ng-new',
+      {
+        name: 'migration-test',
+        version: '1.2.3',
+        directory: '.',
+      },
+      tree,
+    ).toPromise();
+  });
+
+  it('is noop for new projects', async () => {
+    const mapToIdem = (x: Action) => {
+      const content = (x.kind == 'o' || x.kind == 'c') ? x.content.toString() : null;
+
+      return { ...x, content, id: -1 };
+    };
+
+    const expected = [...tree.actions.map(mapToIdem)];
+    const tree2 = await schematicRunner.runSchematicAsync('migration-03', {}, tree.branch())
+      .toPromise();
+
+    expect(tree2.actions.map(mapToIdem)).toEqual(expected);
+  });
+
+  it('should work as expected', async () => {
+    const polyfillPath = '/src/polyfills.ts';
+    tree.overwrite(polyfillPath, oldPolyfills);
+    const tree2 = await schematicRunner.runSchematicAsync('migration-03', {}, tree.branch())
+      .toPromise();
+
+    expect(tree2.readContent(polyfillPath)).not.toMatch(/import .*es7.*reflect.*;/);
+  });
+});

From daf0ec8de8841eb51f5c578ec7c6bb74478b0ab4 Mon Sep 17 00:00:00 2001
From: Alireza Mirian <alireza.mirian@gmail.com>
Date: Wed, 25 Jul 2018 09:48:43 +0430
Subject: [PATCH 0185/1703] fix(@angular/cli): suggest windows-compatible
 typescript install command

Specifying version range in single quote doesn't work in windows CMD and it returns:
> The system cannot find the file specified.
---
 packages/angular/cli/upgrade/version.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular/cli/upgrade/version.ts b/packages/angular/cli/upgrade/version.ts
index a24b87231fd1..7cf97e6c8f5c 100644
--- a/packages/angular/cli/upgrade/version.ts
+++ b/packages/angular/cli/upgrade/version.ts
@@ -182,7 +182,7 @@ export class Version {
 
         Please run the following command to install a compatible version of TypeScript.
 
-            npm install typescript@'${currentCombo.typescript}'
+            npm install typescript@"${currentCombo.typescript}"
 
         To disable this warning run "ng config cli.warnings.typescriptMismatch false".
       ` + '\n')));

From 0bd5b1a6573f93077ef2e07fffb018cd3effcd0e Mon Sep 17 00:00:00 2001
From: Christian Liebel <christian.liebel@thinktecture.com>
Date: Mon, 18 Jun 2018 11:01:32 +0200
Subject: [PATCH 0186/1703] feat(@schematics/schematics): update tsconfig.json
 libs to include es2018

Update the lib property in tsconfig.json files to include es2018.
---
 .../schematics/schematics/blank/project-files/tsconfig.json     | 2 +-
 packages/schematics/schematics/schematic/files/tsconfig.json    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/schematics/blank/project-files/tsconfig.json b/packages/schematics/schematics/blank/project-files/tsconfig.json
index 0b296985db87..c294d9b63384 100644
--- a/packages/schematics/schematics/blank/project-files/tsconfig.json
+++ b/packages/schematics/schematics/blank/project-files/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "baseUrl": "tsconfig",
     "lib": [
-      "es2017",
+      "es2018",
       "dom"
     ],
     "declaration": true,
diff --git a/packages/schematics/schematics/schematic/files/tsconfig.json b/packages/schematics/schematics/schematic/files/tsconfig.json
index e93f82906a18..eaf639af3937 100644
--- a/packages/schematics/schematics/schematic/files/tsconfig.json
+++ b/packages/schematics/schematics/schematic/files/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "baseUrl": "tsconfig",
     "lib": [
-      "es2017",
+      "es2018",
       "dom"
     ],
     "module": "commonjs",

From e72d1c3ed7cd28ed44b40859b3e9bc14285bebc5 Mon Sep 17 00:00:00 2001
From: Christian Liebel <christian.liebel@thinktecture.com>
Date: Mon, 18 Jun 2018 11:01:56 +0200
Subject: [PATCH 0187/1703] feat(@schematics/angular): update tsconfig.json
 libs to include es2018

Update the lib property in tsconfig.json files for Angular libraries and workspaces to include es2018.
---
 .../angular/library/files/__projectRoot__/tsconfig.lib.json     | 2 +-
 packages/schematics/angular/workspace/files/tsconfig.json       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/library/files/__projectRoot__/tsconfig.lib.json b/packages/schematics/angular/library/files/__projectRoot__/tsconfig.lib.json
index 019f4c144af7..3d970df9fad9 100644
--- a/packages/schematics/angular/library/files/__projectRoot__/tsconfig.lib.json
+++ b/packages/schematics/angular/library/files/__projectRoot__/tsconfig.lib.json
@@ -14,7 +14,7 @@
     "types": [],
     "lib": [
       "dom",
-      "es2015"
+      "es2018"
     ]
   },
   "angularCompilerOptions": {
diff --git a/packages/schematics/angular/workspace/files/tsconfig.json b/packages/schematics/angular/workspace/files/tsconfig.json
index 916247e4cb29..46aeded1b278 100644
--- a/packages/schematics/angular/workspace/files/tsconfig.json
+++ b/packages/schematics/angular/workspace/files/tsconfig.json
@@ -14,7 +14,7 @@
       "node_modules/@types"
     ],
     "lib": [
-      "es2017",
+      "es2018",
       "dom"
     ]
   }

From 4a2fc6f04a204d0ce18cbfedbeca53c027a109c7 Mon Sep 17 00:00:00 2001
From: Luca Vazzano <luca.vazzano@gmx.net>
Date: Thu, 21 Jun 2018 16:25:14 +0200
Subject: [PATCH 0188/1703] extended Schematics README regarding templating

to include basic info and an example about it
---
 packages/angular_devkit/schematics/README.md | 89 +++++++++++++++++---
 1 file changed, 79 insertions(+), 10 deletions(-)

diff --git a/packages/angular_devkit/schematics/README.md b/packages/angular_devkit/schematics/README.md
index 0912052f826d..1926a885382b 100644
--- a/packages/angular_devkit/schematics/README.md
+++ b/packages/angular_devkit/schematics/README.md
@@ -2,7 +2,7 @@
 > A scaffolding library for the modern web.
 
 ## Description
-Schematics are generators that transform an existing filesystem. It can create files, refactor existing files, or move files around.
+Schematics are generators that transform an existing filesystem. They can create files, refactor existing files, or move files around.
 
 What distinguishes Schematics from other generators, such as Yeoman or Yarn Create, is that schematics are purely descriptive; no changes are applied to the actual filesystem until everything is ready to be committed. There is no side effect, by design, in Schematics.
 
@@ -51,7 +51,7 @@ A Collection is defined by a `collection.json` file (in the reference CLI). This
 ## Schematic
 
 # Operators, Sources and Rules
-A `Source` is a generator of `Tree`; it creates a root tree from nothing. A `Rule` is a transformation from one `Tree` to another. A `Schematic` (at the root) is a `Rule` that is normally applied on the filesystem.
+A `Source` is a generator of a `Tree`; it creates an entirely new root tree from nothing. A `Rule` is a transformation from one `Tree` to another. A `Schematic` (at the root) is a `Rule` that is normally applied on the filesystem.
 
 ## Operators
 `FileOperator`s apply changes to a single `FileEntry` and return a new `FileEntry`. The result follows these rules:
@@ -62,20 +62,23 @@ A `Source` is a generator of `Tree`; it creates a root tree from nothing. A `Rul
 
 It is impossible to create files using a `FileOperator`.
 
+## Provided Operators
+The Schematics library provides multiple `Operator` factories by default that cover basic use cases:
+
 | FileOperator | Description |
 |---|---|
 | `contentTemplate<T>(options: T)` | Apply a content template (see the Template section) |
 | `pathTemplate<T>(options: T)` | Apply a path template (see the Template section) |
 
 ## Provided Sources
-The Schematics library provides multiple `Source` factories by default that cover basic use cases:
+The Schematics library additionally provides multiple `Source` factories by default:
 
 | Source | Description |
 |---|---|
-| `source(tree: Tree)` | Creates a source that returns the tree passed in argument. |
-| `empty()` | Creates a source that returns an empty tree. |
-| `apply(source: Source, rules: Rule[])` | Apply a list of rules to a source, and return the result. |
-| `url(url: string)` | Loads a list of files from a URL and returns a Tree with the files as `CreateAction` applied to an empty `Tree` |
+| `empty()` | Creates a source that returns an empty `Tree`. |
+| `source(tree: Tree)` | Creates a `Source` that returns the `Tree` passed in as argument. |
+| `url(url: string)` | Loads a list of files from the given URL and returns a `Tree` with the files as `CreateAction` applied to an empty `Tree`. |
+| `apply(source: Source, rules: Rule[])` | Apply a list of `Rule`s to a source, and return the resulting `Source`. |
 
 ## Provided Rules
 The schematics library also provides `Rule` factories by default:
@@ -83,16 +86,36 @@ The schematics library also provides `Rule` factories by default:
 | Rule | Description |
 |---|---|
 | `noop()` | Returns the input `Tree` as is. |
-| `chain(rules: Rule[])` | Returns a `Rule` that's the concatenation of other rules. |
+| `chain(rules: Rule[])` | Returns a `Rule` that's the concatenation of other `Rule`s. |
 | `forEach(op: FileOperator)` | Returns a `Rule` that applies an operator to every file of the input `Tree`. |
 | `move(root: string)` | Moves all the files from the input to a subdirectory. |
-| `merge(other: Tree)` | Merge the input `tree` with the other `Tree`. |
+| `merge(other: Tree)` | Merge the input `Tree` with the other `Tree`. |
 | `contentTemplate<T>(options: T)` | Apply a content template (see the Template section) to the entire `Tree`. |
 | `pathTemplate<T>(options: T)` | Apply a path template (see the Template section) to the entire `Tree`. |
 | `template<T>(options: T)` | Apply both path and content templates (see the Template section) to the entire `Tree`. |
 | `filter(predicate: FilePredicate<boolean>)` | Returns the input `Tree` with files that do not pass the `FilePredicate`. |
 
 
+# Templating
+As referenced above, some functions are based upon a file templating system, which consists of path and content templating.
+
+The system operates on placeholders defined inside files or their paths as loaded in the `Tree` and fills these in as defined in the following, using values passed into the `Rule` which applies the templating (i.e. `template<T>(options: T)`).
+
+## Path Templating
+| Placeholder | Description |
+|---|---|
+| __variable__ | Replaced with the value of `variable`. |
+| __varaiable@function__ | Replaced with the result of the call `function(variable)`. Can be chained to the left (`__variable@function1@function2__ ` etc).  |
+
+## Content Templating
+| Placeholder | Description |
+|---|---|
+| <%= expression %> | Replaced with the result of the call of the given expression. This only supports direct expressions, no structural (for/if/...) JavaScript. |
+| <%- expression %> | Same as above, but the value of the result will be escaped for HTML when inserted (i.e. replacing '<' with '&lt;') |
+| <% inline code %> | Inserts the given code into the template structure, allowing to insert structural JavaScript. |
+| <%# text %> | A comment, which gets entirely dropped. |
+
+
 # Examples
 
 ## Simple
@@ -114,8 +137,54 @@ A few things from this example:
 1. The function receives the list of options from the tooling.
 1. It returns a [`Rule`](src/engine/interface.ts#L73), which is a transformation from a `Tree` to another `Tree`.
 
-# Future Work
+## Templating
+A simplified example of a Schematics which creates a file containing a new Class, using an option to determine its name:
+
+```typescript
+// files/__name@dasherize__.ts
 
+export class <%= classify(name) %> {
+}
+```
+
+```typescript
+// index.ts
+
+import { strings } from '@angular-devkit/core';
+import {
+  Rule, SchematicContext, SchematicsException, Tree,
+  apply, branchAndMerge, mergeWith, template, url,
+} from '@angular-devkit/schematics';
+import { Schema as ClassOptions } from './schema';
+
+export default function (options: ClassOptions): Rule {
+  return (tree: Tree, context: SchematicContext) => {
+    if (!options.name) {
+      throw new SchematicsException('Option (name) is required.');
+    }
+
+    const templateSource = apply(
+      url('./files'),
+      [
+        template({
+          ...strings,
+          ...options,
+        }),
+      ]
+    );
+
+    return branchAndMerge(mergeWith(templateSource));
+  };
+}
+```
+
+Additional things from this example:
+1. `strings` provides the used `dasherize` and `classify` functions, among others.
+1. The files are on-disk in the same root directory as the `index.ts` and loaded into a `Tree`.
+1. Then the `template` `Rule` fills in the specified templating placeholders. For this, it only knows about the variables and functions passed to it via the options-object.
+1. Finally, the resulting `Tree`, containing the new file, is merged with the existing files of the project which the Schematic is run on.
+
+# Future Work
 Schematics is not done yet. Here's a list of things we are considering:
 
 * Smart defaults for Options. Having a JavaScript function for default values based on other default values.

From b9d8eed4a740e107237ca075d33636da78c01454 Mon Sep 17 00:00:00 2001
From: Luca Vazzano <luca.vazzano@gmx.net>
Date: Thu, 21 Jun 2018 19:13:57 +0200
Subject: [PATCH 0189/1703] fixed typo in the Schematics README

---
 packages/angular_devkit/schematics/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/schematics/README.md b/packages/angular_devkit/schematics/README.md
index 1926a885382b..9b9cb0ac35f7 100644
--- a/packages/angular_devkit/schematics/README.md
+++ b/packages/angular_devkit/schematics/README.md
@@ -105,7 +105,7 @@ The system operates on placeholders defined inside files or their paths as loade
 | Placeholder | Description |
 |---|---|
 | __variable__ | Replaced with the value of `variable`. |
-| __varaiable@function__ | Replaced with the result of the call `function(variable)`. Can be chained to the left (`__variable@function1@function2__ ` etc).  |
+| __variable@function__ | Replaced with the result of the call `function(variable)`. Can be chained to the left (`__variable@function1@function2__ ` etc).  |
 
 ## Content Templating
 | Placeholder | Description |

From c9dab34fbb48ae8ae7f9a86250e501e1d7f8b9bc Mon Sep 17 00:00:00 2001
From: majo44 <majo44@gmail.com>
Date: Tue, 25 Sep 2018 22:50:02 +0200
Subject: [PATCH 0190/1703] feat(@angular-devkit/core): support of tsx files in
 aot mode (#11407)

---
 .../src/angular-cli-files/models/webpack-configs/typescript.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
index 9583208abab8..82bd2e7ae38f 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
@@ -110,7 +110,7 @@ export function getAotConfig(
     });
   }
 
-  const test = /(?:\.ngfactory\.js|\.ngstyle\.js|\.ts)$/;
+  const test = /(?:\.ngfactory\.js|\.ngstyle\.js|\.tsx?)$/;
 
   return {
     module: { rules: [{ test, use: loaders }] },

From 35dd76013b0577cd6d0db708c4a4c6d8d06916f2 Mon Sep 17 00:00:00 2001
From: psamusev <psamusev@users.noreply.github.com>
Date: Tue, 25 Sep 2018 23:50:36 +0300
Subject: [PATCH 0191/1703] feat(@angular-devkit/build-angular): support of tsx
 absolute path import (#11450)

---
 packages/ngtools/webpack/src/angular_compiler_plugin.ts  | 2 +-
 packages/ngtools/webpack/src/paths-plugin.ts             | 2 +-
 packages/ngtools/webpack/src/transformers/ast_helpers.ts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 75fb98cbf7fc..9523125f88b7 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -127,7 +127,7 @@ export class AngularCompilerPlugin {
   private _platform: PLATFORM;
   private _JitMode = false;
   private _emitSkipped = true;
-  private _changedFileExtensions = new Set(['ts', 'html', 'css']);
+  private _changedFileExtensions = new Set(['ts', 'tsx', 'html', 'css']);
 
   // Webpack plugin.
   private _firstRun = true;
diff --git a/packages/ngtools/webpack/src/paths-plugin.ts b/packages/ngtools/webpack/src/paths-plugin.ts
index 2067c2f9f979..591ed0c9f492 100644
--- a/packages/ngtools/webpack/src/paths-plugin.ts
+++ b/packages/ngtools/webpack/src/paths-plugin.ts
@@ -27,7 +27,7 @@ export function resolveWithPaths(
   }
 
   // Only work on Javascript/TypeScript issuers.
-  if (!request.contextInfo.issuer || !request.contextInfo.issuer.match(/\.[jt]s$/)) {
+  if (!request.contextInfo.issuer || !request.contextInfo.issuer.match(/\.[jt]sx?$/)) {
     callback(null, request);
 
     return;
diff --git a/packages/ngtools/webpack/src/transformers/ast_helpers.ts b/packages/ngtools/webpack/src/transformers/ast_helpers.ts
index 481e07960b5d..c20722da84d5 100644
--- a/packages/ngtools/webpack/src/transformers/ast_helpers.ts
+++ b/packages/ngtools/webpack/src/transformers/ast_helpers.ts
@@ -102,5 +102,5 @@ export function transformTypescript(
   }
 
   // Return the transpiled js.
-  return compilerHost.readFile(fileName.replace(/\.ts$/, '.js'));
+  return compilerHost.readFile(fileName.replace(/\.tsx?$/, '.js'));
 }

From b5616579462ad5648396f06ece2cfca76fc95c5f Mon Sep 17 00:00:00 2001
From: Terry <zhangwenlp@vip.qq.com>
Date: Wed, 26 Sep 2018 04:51:46 +0800
Subject: [PATCH 0192/1703] fix(@angular-devkit/core): fix cannot delete
 directory (#11574)

---
 .../core/src/virtual-fs/host/memory.ts           |  2 +-
 .../core/src/virtual-fs/host/memory_spec.ts      | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/core/src/virtual-fs/host/memory.ts b/packages/angular_devkit/core/src/virtual-fs/host/memory.ts
index 8863a3d41465..02fb40b869d2 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/memory.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/memory.ts
@@ -180,7 +180,7 @@ export class SimpleMemoryHost implements Host<{}> {
     path = this._toAbsolute(path);
     if (this._isDirectory(path)) {
       for (const [cachePath] of this._cache.entries()) {
-        if (path.startsWith(cachePath + NormalizedSep)) {
+        if (cachePath.startsWith(path + NormalizedSep) || cachePath === path) {
           this._cache.delete(cachePath);
         }
       }
diff --git a/packages/angular_devkit/core/src/virtual-fs/host/memory_spec.ts b/packages/angular_devkit/core/src/virtual-fs/host/memory_spec.ts
index bed5437eeb19..bf9df7a106c9 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/memory_spec.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/memory_spec.ts
@@ -65,6 +65,22 @@ describe('SimpleMemoryHost', () => {
     expect(host.exists(normalize('/sub/file1'))).toBe(false);
   });
 
+  it('can delete directory', () => {
+    const host = new SyncDelegateHost(new SimpleMemoryHost());
+
+    const buffer = stringToFileBuffer('hello');
+
+    expect(host.exists(normalize('/sub/file1'))).toBe(false);
+    host.write(normalize('/sub/file1'), buffer);
+    host.write(normalize('/subfile.2'), buffer);
+    expect(host.exists(normalize('/sub/file1'))).toBe(true);
+    expect(host.exists(normalize('/subfile.2'))).toBe(true);
+    host.delete(normalize('/sub'));
+    expect(host.exists(normalize('/sub/file1'))).toBe(false);
+    expect(host.exists(normalize('/sub'))).toBe(false);
+    expect(host.exists(normalize('/subfile.2'))).toBe(true);
+  });
+
   it('can rename', () => {
     const host = new SyncDelegateHost(new SimpleMemoryHost());
 

From 191edda747c40bf3f3effeaa4e8f010aa7adb670 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 25 Sep 2018 13:48:39 +0200
Subject: [PATCH 0193/1703] test: add unit test to cover `subdirs`

Closes #12143
---
 .../schematics/src/tree/host-tree_spec.ts             | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/angular_devkit/schematics/src/tree/host-tree_spec.ts b/packages/angular_devkit/schematics/src/tree/host-tree_spec.ts
index a6010db409e7..6e24d7019a0c 100644
--- a/packages/angular_devkit/schematics/src/tree/host-tree_spec.ts
+++ b/packages/angular_devkit/schematics/src/tree/host-tree_spec.ts
@@ -115,4 +115,15 @@ describe('FilterHostTree', () => {
     expect(filteredFiles).toEqual(['/dir1/file1'].map(normalize));
     expect(filtered2.actions.map(a => a.kind)).toEqual([]);
   });
+
+  it('subdirs only contains directories', () => {
+    const fs = new virtualFs.test.TestHost({
+      '/dir1/file1': '',
+      '/dir1/dir2/file2': '',
+      '/dir1/dir3/file3': '',
+    });
+    const tree = new HostTree(fs);
+    const subDirs = tree.getDir('/dir1').subdirs;
+    expect(subDirs as string[]).toEqual(['dir2', 'dir3']);
+  });
 });

From fb4e8187824fe66e50b42c16f95458e82b4787a8 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Sun, 23 Sep 2018 10:30:39 -0400
Subject: [PATCH 0194/1703] docs: initial schematic prompts documentation

---
 docs/specifications/schematic-prompts.md | 121 +++++++++++++++++++++++
 1 file changed, 121 insertions(+)
 create mode 100644 docs/specifications/schematic-prompts.md

diff --git a/docs/specifications/schematic-prompts.md b/docs/specifications/schematic-prompts.md
new file mode 100644
index 000000000000..08092ef20235
--- /dev/null
+++ b/docs/specifications/schematic-prompts.md
@@ -0,0 +1,121 @@
+# Schematic Prompts
+
+Schematic prompts provide the ability to introduce user interaction into the schematic execution. The schematic runtime supports the ability to allow schematic options to be configured to display a customizable question to the user and then use the response as the value for the option.  These prompts are displayed before the execution of the schematic.  This allows users direct the operation of the schematic without requiring indepth knowledge of the full spectrum of options available to the user.
+
+To enable this capability, the JSON Schema used to define the schematic's options supports extensions to allow the declarative definition of the prompts and their respective behavior.  No additional logic or changes are required to the JavaScript for a schematic to support the prompts.
+
+## Basic Usage
+
+To illustrate the addition of a prompt to an existing schematic the following example JSON schema for a hypothetical _hello world_ schematic will be used.
+
+```json
+{
+    "properties": {
+        "name": {
+            "type": "string",
+            "minLength": 1,
+            "default": "world"
+        },
+        "useColor": {
+            "type": "boolean"
+        }
+    }
+}
+```
+
+Suppose it would be preferred if the user was asked for their name.  This can be accomplished by augmenting the `name` property definition with an `x-prompt` field.
+```json
+"x-prompt": "What is your name?"
+```
+In most cases, only the text of the prompt is required.  To minimize the amount of necessary configuration, the above _shorthand_ form is supported and will typically be all that is required.  Full details regarding the _longhand_ form can be found in the **Configuration Reference** section.
+
+Adding a prompt to allow the user to decided whether the schematic will use color when executing its hello action is also very similar.  The schema with both prompts would be as follows:
+```json
+{
+    "properties": {
+        "name": {
+            "type": "string",
+            "minLength": 1,
+            "default": "world",
+            "x-prompt": "What is your name?"
+        },
+        "useColor": {
+            "type": "boolean",
+            "x-prompt": "Would you like the response in color?"
+        }
+    }
+}
+```
+
+Prompts have several different types which provide the ability to display an input method that best represents the schematic option's potential values.
+
+* `confirmation` - A **yes** or **no** question; ideal for boolean options
+* `input` - textual input; ideal for string or number options
+* `list` - a predefined set of items which may be selected
+
+When using the _shorthand_ form, the most appropriate type will automatically be selected based on the property's schema.  In the example, the `name` prompt will use an `input` type because it it is a `string` property.  The `useColor` prompt will use a `confirmation` type because it is a boolean property with `yes` corresponding to `true` and `no` corresponding to `false`.
+
+It is also important that the response from the user conforms to the contraints of the property.  By specifying constraints using the JSON schema, the prompt runtime will automatically validate the response provided by the user.  If the value is not acceptable, the user will be asked to enter a new value.  This ensures that any values passed to the schematic will meet the expectations of the schematic's implementation  and removes the need to add additional checks within the schematic's code.
+
+##  Configuration Reference
+
+The `x-prompt` field supports two alternatives to enable a prompt for a schematic option.  A shorthand form when additional customization is not required and a longhand form providing the ability for more control over the prompt.  All user responses are validated against the property's schema. For example, string type properties can use a minimum length or regular expression constraint to control the allowed values.  In the event the response fails validation, the user will be asked to enter a new value.
+
+### Longhand Form
+
+In the this form, the `x-prompt` field is an object with subfields that can be used to customize the behavior of the prompt.  Note that some fields only apply to specific prompt types.
+
+| Field | Data Value | Default |
+|-|-|-|
+| `type` | `confirmation`, `input`, `list` | see shorthand section for details
+| `message` | string | N/A (required)
+| `items` | string and/or `label`/`value` object pair | only valid with type `list`
+
+
+### Shorthand Form
+
+`x-prompt` [type: string] --> Question to display to the user.
+
+For this usage, the type of the prompt is determined by the type of the containing property.
+
+| Property Schema  | Prompt Type | Notes |
+|-|:-:|:-:|
+| `"type": "boolean"` | `confirmation`  |   |
+| `"type": "string"`  | `input`  |   |
+| `"type": "number"`  | `input` | only valid numbers accepted  |
+| `"type": "integer"` | `input` | only valid numbers accepted  |
+| `"enum": [...]` | `list` | enum members become list selections
+
+### `x-prompt` Schema
+
+```json
+{
+    "oneOf": [
+        { "type": "string" },
+        {
+            "type": "object",
+            "properties": {
+                "type": { "type": "string" },
+                "message": { "type": "string" },
+                "items": {
+                    "type": "array",
+                    "items": {
+                        "oneOf": [
+                            { "type": "string" },
+                            {
+                                "type": "object",
+                                "properties": {
+                                    "label": { "type": "string" },
+                                    "value": { }
+                                },
+                                "required": [ "value" ]
+                            }
+                        ]
+                    }
+                }
+            },
+            "required": [ "message" ]
+        }
+    ]
+}
+```
\ No newline at end of file

From 91cf2d7b9fac9ae069dd0edcca0206ed7d31ade2 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 24 Sep 2018 12:22:46 -0400
Subject: [PATCH 0195/1703] fix(@angular/cli): allow global config command
 outside project

Fixes #12296
---
 packages/angular/cli/commands/config-impl.ts  |  6 +-
 packages/angular/cli/commands/config.json     |  2 +-
 packages/angular/cli/models/command.ts        |  4 +-
 .../tests/commands/config/config-global.ts    | 65 ++++++++++++-------
 4 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/packages/angular/cli/commands/config-impl.ts b/packages/angular/cli/commands/config-impl.ts
index 37b1156219c2..b6ad2d52e0d5 100644
--- a/packages/angular/cli/commands/config-impl.ts
+++ b/packages/angular/cli/commands/config-impl.ts
@@ -18,7 +18,7 @@ import {
 } from '@angular-devkit/core';
 import { writeFileSync } from 'fs';
 import { Command } from '../models/command';
-import { Arguments } from '../models/interface';
+import { Arguments, CommandScope } from '../models/interface';
 import {
   getWorkspace,
   getWorkspaceRaw,
@@ -178,6 +178,10 @@ export class ConfigCommand extends Command<ConfigCommandSchema> {
   public async run(options: ConfigCommandSchema & Arguments) {
     const level = options.global ? 'global' : 'local';
 
+    if (!options.global) {
+      await this.validateScope(CommandScope.InProject);
+    }
+
     let config =
       (getWorkspace(level) as {} as { _workspace: experimental.workspace.WorkspaceSchema });
 
diff --git a/packages/angular/cli/commands/config.json b/packages/angular/cli/commands/config.json
index db5a1b665a0e..899d563a2be4 100644
--- a/packages/angular/cli/commands/config.json
+++ b/packages/angular/cli/commands/config.json
@@ -5,7 +5,7 @@
   "$longDescription": "",
 
   "$aliases": [],
-  "$scope": "in",
+  "$scope": "all",
   "$type": "native",
   "$impl": "./config-impl#ConfigCommand",
 
diff --git a/packages/angular/cli/models/command.ts b/packages/angular/cli/models/command.ts
index 793c57ed2528..da2079c149ea 100644
--- a/packages/angular/cli/models/command.ts
+++ b/packages/angular/cli/models/command.ts
@@ -114,8 +114,8 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
     }
   }
 
-  async validateScope(): Promise<void> {
-    switch (this.description.scope) {
+  async validateScope(scope?: CommandScope): Promise<void> {
+    switch (scope === undefined ? this.description.scope : scope) {
       case CommandScope.OutProject:
         if (this.workspace.configFile) {
           this.logger.fatal(tags.oneLine`
diff --git a/tests/legacy-cli/e2e/tests/commands/config/config-global.ts b/tests/legacy-cli/e2e/tests/commands/config/config-global.ts
index 0df85d890619..8327836fc500 100644
--- a/tests/legacy-cli/e2e/tests/commands/config/config-global.ts
+++ b/tests/legacy-cli/e2e/tests/commands/config/config-global.ts
@@ -5,29 +5,44 @@ import { ng } from '../../../utils/process';
 import { expectToFail } from '../../../utils/utils';
 
 
-export default function() {
-  return Promise.resolve()
-    .then(() => expectToFail(() => ng('config', '--global', 'schematics.@schematics/angular.component.inlineStyle')))
-    .then(() => ng('config', '--global', 'schematics.@schematics/angular.component.inlineStyle', 'false'))
-    .then(() => ng('config', '--global', 'schematics.@schematics/angular.component.inlineStyle'))
-    .then(({ stdout }) => {
-      if (!stdout.match(/false\n?/)) {
-        throw new Error(`Expected "false", received "${JSON.stringify(stdout)}".`);
-      }
-    })
-    // This test requires schema querying capabilities
-    // .then(() => expectToFail(() => {
-    //   return ng('config', '--global', 'schematics.@schematics/angular.component.inlineStyle', 'INVALID_BOOLEAN');
-    // }))
-    .then(() => ng('config', '--global', 'schematics.@schematics/angular.component.inlineStyle', 'true'))
-    .then(() => ng('config', '--global', 'schematics.@schematics/angular.component.inlineStyle'))
-    .then(({ stdout }) => {
-      if (!stdout.match(/true\n?/)) {
-        throw new Error(`Expected "true", received "${JSON.stringify(stdout)}".`);
-      }
-    })
-    .then(() => expectToFail(() => ng('config', '--global', 'cli.warnings.notreal', 'true')))
-    .then(() => ng('config', '--global', 'cli.warnings.versionMismatch', 'false'))
-    .then(() => expectFileToExist(path.join(homedir(), '.angular-config.json')))
-    .then(() => deleteFile(path.join(homedir(), '.angular-config.json')));
+export default async function() {
+  await expectToFail(() => ng(
+    'config',
+    '--global',
+    'schematics.@schematics/angular.component.inlineStyle',
+  ));
+
+  await ng('config', '--global', 'schematics.@schematics/angular.component.inlineStyle', 'false');
+  let output = await ng(
+    'config',
+    '--global',
+    'schematics.@schematics/angular.component.inlineStyle',
+  );
+  if (!output.stdout.match(/false\n?/)) {
+    throw new Error(`Expected "false", received "${JSON.stringify(output.stdout)}".`);
+  }
+
+  // This test requires schema querying capabilities
+  // .then(() => expectToFail(() => {
+  //   return ng('config', '--global', 'schematics.@schematics/angular.component.inlineStyle', 'INVALID_BOOLEAN');
+  // }))
+
+  const cwd = process.cwd();
+  process.chdir('/');
+  try {
+    await ng('config', '--global', 'schematics.@schematics/angular.component.inlineStyle', 'true');
+  } finally {
+    process.chdir(cwd);
+  }
+
+  output = await ng('config', '--global', 'schematics.@schematics/angular.component.inlineStyle');
+  if (!output.stdout.match(/true\n?/)) {
+    throw new Error(`Expected "true", received "${JSON.stringify(output.stdout)}".`);
+  }
+
+  await expectToFail(() => ng('config', '--global', 'cli.warnings.notreal', 'true'));
+
+  await ng('config', '--global', 'cli.warnings.versionMismatch', 'false');
+  await expectFileToExist(path.join(homedir(), '.angular-config.json'));
+  await deleteFile(path.join(homedir(), '.angular-config.json'));
 }

From 72ded97a8fb19ae2e639d68cab6544025c4f0891 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 19 Jul 2018 16:50:08 +0100
Subject: [PATCH 0196/1703] fix(@schematics/angular): dasherize library package
 name

Fix #11017
---
 packages/schematics/angular/library/index.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index a01a02492273..47a8042ef80d 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -131,7 +131,7 @@ function addDependenciesToPackageJson() {
 }
 
 function addAppToWorkspaceFile(options: LibraryOptions, workspace: WorkspaceSchema,
-                               projectRoot: string, packageName: string): Rule {
+                               projectRoot: string, projectName: string): Rule {
 
   const project: WorkspaceProject<ProjectType.Library> = {
     root: projectRoot,
@@ -169,7 +169,7 @@ function addAppToWorkspaceFile(options: LibraryOptions, workspace: WorkspaceSche
     },
   };
 
-  return addProjectToWorkspace(workspace, packageName, project);
+  return addProjectToWorkspace(workspace, projectName, project);
 }
 
 export default function (options: LibraryOptions): Rule {
@@ -182,7 +182,8 @@ export default function (options: LibraryOptions): Rule {
     validateProjectName(options.name);
 
     // If scoped project (i.e. "@foo/bar"), convert projectDir to "foo/bar".
-    const packageName = options.name;
+    const projectName = options.name;
+    const packageName = strings.dasherize(projectName);
     let scopeName = null;
     if (/^@.*\/.*/.test(options.name)) {
       const [scope, name] = options.name.split('/');
@@ -218,7 +219,7 @@ export default function (options: LibraryOptions): Rule {
 
     return chain([
       branchAndMerge(mergeWith(templateSource)),
-      addAppToWorkspaceFile(options, workspace, projectRoot, packageName),
+      addAppToWorkspaceFile(options, workspace, projectRoot, projectName),
       options.skipPackageJson ? noop() : addDependenciesToPackageJson(),
       options.skipTsConfig ? noop() : updateTsConfig(packageName, distRoot),
       schematic('module', {

From 1bf96348bcb1d62fc148df90786f5b63c2c476e1 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 26 Sep 2018 10:02:01 +0200
Subject: [PATCH 0197/1703] fix(@angular/cli): `--verbose` is an unknown option
 of `serve`

Closes #11086
---
 .../build_angular/src/dev-server/index.ts            |  2 ++
 .../build_angular/src/dev-server/schema.json         |  5 +++++
 .../test/dev-server/works_spec_large.ts              | 12 +++++++++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index fe6fc802d67f..38d430992a30 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -57,6 +57,7 @@ export interface DevServerBuilderOptions {
   baseHref?: string;
   progress?: boolean;
   poll?: number;
+  verbose?: boolean;
 }
 
 
@@ -407,6 +408,7 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
       ...(options.baseHref !== undefined ? { baseHref: options.baseHref } : {}),
       ...(options.progress !== undefined ? { progress: options.progress } : {}),
       ...(options.poll !== undefined ? { poll: options.poll } : {}),
+      ...(options.verbose !== undefined ? { verbose: options.verbose } : {}),
     };
 
     const browserTargetSpec = { project, target, configuration, overrides };
diff --git a/packages/angular_devkit/build_angular/src/dev-server/schema.json b/packages/angular_devkit/build_angular/src/dev-server/schema.json
index aca802e180d0..78a3fa78859b 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/schema.json
+++ b/packages/angular_devkit/build_angular/src/dev-server/schema.json
@@ -40,6 +40,11 @@
       "default": false,
       "alias": "o"
     },
+    "verbose": {
+      "type": "boolean",
+      "description": "Adds more details to output logging.",
+      "default": false
+    },
     "liveReload": {
       "type": "boolean",
       "description": "Whether to reload the page on change, using live-reload.",
diff --git a/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts
index e3148762ba8c..6c62967f007a 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts
@@ -6,9 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { request, runTargetSpec } from '@angular-devkit/architect/testing';
+import { TestLogger, request, runTargetSpec } from '@angular-devkit/architect/testing';
 import { from } from 'rxjs';
 import { concatMap, take, tap } from 'rxjs/operators';
+import { DevServerBuilderOptions } from '../../src';
 import { devServerTargetSpec, host } from '../utils';
 
 
@@ -24,4 +25,13 @@ describe('Dev Server Builder', () => {
       take(1),
     ).toPromise().then(done, done.fail);
   }, 30000);
+
+  it('works with verbose', (done) => {
+    const overrides: Partial<DevServerBuilderOptions> = { verbose: true };
+    const logger = new TestLogger('verbose-serve');
+    runTargetSpec(host, devServerTargetSpec, overrides, undefined, logger).pipe(
+      tap(() => expect(logger.includes('Built at')).toBe(true)),
+      take(1),
+    ).toPromise().then(done, done.fail);
+  }, 30000);
 });

From be6f75705ad9bf275f2be5f409f716e7402de82f Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 17 Jul 2018 20:06:39 -0400
Subject: [PATCH 0198/1703] refactor(@ngtools/webpack): use webpack resolver
 plugin for path mapping

---
 packages/ngtools/webpack/package.json         |   1 +
 .../webpack/src/angular_compiler_plugin.ts    |  25 +--
 packages/ngtools/webpack/src/paths-plugin.ts  | 193 +++++++++---------
 packages/ngtools/webpack/src/webpack.ts       |   2 +
 .../e2e/tests/misc/module-resolution.ts       |   4 +-
 yarn.lock                                     |   2 +-
 6 files changed, 112 insertions(+), 115 deletions(-)

diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 2d0ddfed3aec..0acb8d5cfebf 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -22,6 +22,7 @@
   "homepage": "https://github.com/angular/angular-cli/tree/master/packages/@ngtools/webpack",
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
+    "enhanced-resolve": "4.1.0",    
     "rxjs": "6.2.2",
     "tree-kill": "1.2.0",
     "webpack-sources": "1.2.0"
diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 9523125f88b7..410b9da63130 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -32,7 +32,7 @@ import { WebpackCompilerHost, workaroundResolve } from './compiler_host';
 import { resolveEntryModuleFromMain } from './entry_resolver';
 import { gatherDiagnostics, hasErrors } from './gather_diagnostics';
 import { LazyRouteMap, findLazyRoutes } from './lazy_routes';
-import { resolveWithPaths } from './paths-plugin';
+import { TypeScriptPathsPlugin } from './paths-plugin';
 import { WebpackResourceLoader } from './resource_loader';
 import {
   exportLazyModuleMap,
@@ -729,6 +729,14 @@ export class AngularCompilerPlugin {
     });
 
     compiler.hooks.afterResolvers.tap('angular-compiler', compiler => {
+      // tslint:disable-next-line:no-any
+      (compiler as any).resolverFactory.hooks.resolver
+        .for('normal')
+        // tslint:disable-next-line:no-any
+        .tap('angular-compiler', (resolver: any) => {
+          new TypeScriptPathsPlugin(this._compilerOptions).apply(resolver);
+        });
+
       compiler.hooks.normalModuleFactory.tap('angular-compiler', nmf => {
         // Virtual file system.
         // TODO: consider if it's better to remove this plugin and instead make it wait on the
@@ -754,21 +762,6 @@ export class AngularCompilerPlugin {
         );
       });
     });
-
-    compiler.hooks.normalModuleFactory.tap('angular-compiler', nmf => {
-      nmf.hooks.beforeResolve.tapAsync(
-        'angular-compiler',
-        (request: NormalModuleFactoryRequest, callback: Callback<NormalModuleFactoryRequest>) => {
-          resolveWithPaths(
-            request,
-            callback,
-            this._compilerOptions,
-            this._compilerHost,
-            this._moduleResolutionCache,
-          );
-        },
-      );
-    });
   }
 
   private async _make(compilation: compilation.Compilation) {
diff --git a/packages/ngtools/webpack/src/paths-plugin.ts b/packages/ngtools/webpack/src/paths-plugin.ts
index 591ed0c9f492..cbefe70e39d4 100644
--- a/packages/ngtools/webpack/src/paths-plugin.ts
+++ b/packages/ngtools/webpack/src/paths-plugin.ts
@@ -6,54 +6,97 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import * as path from 'path';
-import * as ts from 'typescript';
-import {
-  Callback,
-  NormalModuleFactoryRequest,
-} from './webpack';
-
-
-export function resolveWithPaths(
-  request: NormalModuleFactoryRequest,
-  callback: Callback<NormalModuleFactoryRequest>,
-  compilerOptions: ts.CompilerOptions,
-  host: ts.CompilerHost,
-  cache?: ts.ModuleResolutionCache,
-) {
-  if (!request || !request.request || !compilerOptions.paths) {
-    callback(null, request);
-
-    return;
-  }
+import { CompilerOptions, MapLike } from 'typescript';
+import { NormalModuleFactoryRequest } from './webpack';
 
-  // Only work on Javascript/TypeScript issuers.
-  if (!request.contextInfo.issuer || !request.contextInfo.issuer.match(/\.[jt]sx?$/)) {
-    callback(null, request);
+const getInnerRequest = require('enhanced-resolve/lib/getInnerRequest');
 
-    return;
-  }
+export interface TypeScriptPathsPluginOptions extends Pick<CompilerOptions, 'paths' | 'baseUrl'> {
 
-  const originalRequest = request.request.trim();
+}
 
-  // Relative requests are not mapped
-  if (originalRequest.startsWith('.') || originalRequest.startsWith('/')) {
-    callback(null, request);
+export class TypeScriptPathsPlugin {
+  constructor(private _options: TypeScriptPathsPluginOptions) { }
 
-    return;
-  }
-
-  // Amd requests are not mapped
-  if (originalRequest.startsWith('!!webpack amd')) {
-    callback(null, request);
+  // tslint:disable-next-line:no-any
+  apply(resolver: any) {
+    if (!this._options.paths || Object.keys(this._options.paths).length === 0) {
+      return;
+    }
 
-    return;
+    const target = resolver.ensureHook('resolve');
+    const resolveAsync = (request: NormalModuleFactoryRequest, requestContext: {}) => {
+      return new Promise<NormalModuleFactoryRequest | undefined>((resolve, reject) => {
+        resolver.doResolve(
+          target,
+          request,
+          '',
+          requestContext,
+          (error: Error | null, result: NormalModuleFactoryRequest | undefined) => {
+            if (error) {
+              reject(error);
+            } else {
+              resolve(result);
+            }
+          },
+        );
+      });
+    };
+
+    resolver.getHook('described-resolve').tapPromise(
+      'TypeScriptPathsPlugin',
+      async (request: NormalModuleFactoryRequest, resolveContext: {}) => {
+        if (!request || request.typescriptPathMapped) {
+          return;
+        }
+
+        const originalRequest = getInnerRequest(resolver, request);
+        if (!originalRequest) {
+          return;
+        }
+
+        // Only work on Javascript/TypeScript issuers.
+        if (!request.context.issuer || !request.context.issuer.match(/\.[jt]sx?$/)) {
+          return;
+        }
+
+        // Relative or absolute requests are not mapped
+        if (originalRequest.startsWith('.') || originalRequest.startsWith('/')) {
+          return;
+        }
+
+        // Amd requests are not mapped
+        if (originalRequest.startsWith('!!webpack amd')) {
+          return;
+        }
+
+        const replacements = findReplacements(originalRequest, this._options.paths || {});
+        for (const potential of replacements) {
+          const potentialRequest = {
+            ...request,
+            request: path.resolve(this._options.baseUrl || '', potential),
+            typescriptPathMapped: true,
+          };
+          const result = await resolveAsync(potentialRequest, resolveContext);
+
+          if (result) {
+            return result;
+          }
+        }
+      },
+    );
   }
+}
 
+function findReplacements(
+  originalRequest: string,
+  paths: MapLike<string[]>,
+): Iterable<string> {
   // check if any path mapping rules are relevant
   const pathMapOptions = [];
-  for (const pattern in compilerOptions.paths) {
+  for (const pattern in paths) {
     // get potentials and remove duplicates; JS Set maintains insertion order
-    const potentials = Array.from(new Set(compilerOptions.paths[pattern]));
+    const potentials = Array.from(new Set(paths[pattern]));
     if (potentials.length === 0) {
       // no potential replacements so skip
       continue;
@@ -96,9 +139,7 @@ export function resolveWithPaths(
   }
 
   if (pathMapOptions.length === 0) {
-    callback(null, request);
-
-    return;
+    return [];
   }
 
   // exact matches take priority then largest prefix match
@@ -112,63 +153,23 @@ export function resolveWithPaths(
     }
   });
 
-  if (pathMapOptions[0].potentials.length === 1) {
-    const onlyPotential = pathMapOptions[0].potentials[0];
-    let replacement;
-    const starIndex = onlyPotential.indexOf('*');
-    if (starIndex === -1) {
-      replacement = onlyPotential;
-    } else if (starIndex === onlyPotential.length - 1) {
-      replacement = onlyPotential.slice(0, -1) + pathMapOptions[0].partial;
-    } else {
-      const [prefix, suffix] = onlyPotential.split('*');
-      replacement = prefix + pathMapOptions[0].partial + suffix;
-    }
-
-    request.request = path.resolve(compilerOptions.baseUrl || '', replacement);
-    callback(null, request);
-
-    return;
-  }
-
-  // TODO: The following is used when there is more than one potential and will not be
-  //       needed once this is turned into a full webpack resolver plugin
-
-  const moduleResolver = ts.resolveModuleName(
-    originalRequest,
-    request.contextInfo.issuer,
-    compilerOptions,
-    host,
-    cache,
-  );
-
-  const moduleFilePath = moduleResolver.resolvedModule
-                         && moduleResolver.resolvedModule.resolvedFileName;
-
-  // If there is no result, let webpack try to resolve
-  if (!moduleFilePath) {
-    callback(null, request);
-
-    return;
-  }
-
-  // If TypeScript gives us a `.d.ts`, it is probably a node module
-  if (moduleFilePath.endsWith('.d.ts')) {
-    // If in a package, let webpack resolve the package
-    const packageRootPath = path.join(path.dirname(moduleFilePath), 'package.json');
-    if (!host.fileExists(packageRootPath)) {
-      // Otherwise, if there is a file with a .js extension use that
-      const jsFilePath = moduleFilePath.slice(0, -5) + '.js';
-      if (host.fileExists(jsFilePath)) {
-        request.request = jsFilePath;
+  const replacements: string[] = [];
+  pathMapOptions.forEach(option => {
+    for (const potential of option.potentials) {
+      let replacement;
+      const starIndex = potential.indexOf('*');
+      if (starIndex === -1) {
+        replacement = potential;
+      } else if (starIndex === potential.length - 1) {
+        replacement = potential.slice(0, -1) + option.partial;
+      } else {
+        const [prefix, suffix] = potential.split('*');
+        replacement = prefix + option.partial + suffix;
       }
-    }
-
-    callback(null, request);
 
-    return;
-  }
+      replacements.push(replacement);
+    }
+  });
 
-  request.request = moduleFilePath;
-  callback(null, request);
+  return replacements;
 }
diff --git a/packages/ngtools/webpack/src/webpack.ts b/packages/ngtools/webpack/src/webpack.ts
index e9035fb7b9e6..83d2a5cddf31 100644
--- a/packages/ngtools/webpack/src/webpack.ts
+++ b/packages/ngtools/webpack/src/webpack.ts
@@ -16,7 +16,9 @@ export interface Callback<T = any> {
 
 export interface NormalModuleFactoryRequest {
   request: string;
+  context: { issuer: string };
   contextInfo: { issuer: string };
+  typescriptPathMapped?: boolean;
 }
 
 export interface InputFileSystem {
diff --git a/tests/legacy-cli/e2e/tests/misc/module-resolution.ts b/tests/legacy-cli/e2e/tests/misc/module-resolution.ts
index f54e64c7b55f..0396650258c7 100644
--- a/tests/legacy-cli/e2e/tests/misc/module-resolution.ts
+++ b/tests/legacy-cli/e2e/tests/misc/module-resolution.ts
@@ -73,14 +73,14 @@ export default async function () {
 
   await updateJsonFile('tsconfig.json', tsconfig => {
     tsconfig.compilerOptions.paths = {
-      '@firebase/polyfill': ['@firebase/polyfill/index.ts'],
+      '@firebase/polyfill': ['./node_modules/@firebase/polyfill/index.ts'],
     };
   });
   await expectToFail(() => ng('build'));
 
   await updateJsonFile('tsconfig.json', tsconfig => {
     tsconfig.compilerOptions.paths = {
-      '@firebase/polyfill*': ['@firebase/polyfill/index.ts'],
+      '@firebase/polyfill*': ['./node_modules/@firebase/polyfill/index.ts'],
     };
   });
   await expectToFail(() => ng('build'));
diff --git a/yarn.lock b/yarn.lock
index 30fa0b8d6592..65935810251f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2555,7 +2555,7 @@ engine.io@~3.2.0:
     engine.io-parser "~2.1.0"
     ws "~3.3.1"
 
-enhanced-resolve@^4.1.0:
+enhanced-resolve@4.1.0, enhanced-resolve@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
   dependencies:

From 048366b3eebf18e3e430588ad34261c11b597964 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Sun, 8 Jul 2018 15:14:50 +0800
Subject: [PATCH 0199/1703] feat(@angular-devkit/build-angular): add profile
 option to browser builder

This should help users send us profile logs for builds that take too long.
---
 .../angular_devkit/build_angular/package.json |  1 +
 .../angular-cli-files/models/build-options.ts |  1 +
 .../models/webpack-configs/common.ts          |  8 ++++-
 .../build_angular/src/browser/index.ts        | 16 ++++++++--
 .../build_angular/src/browser/schema.d.ts     |  5 ++++
 .../build_angular/src/browser/schema.json     |  5 ++++
 .../test/browser/profile_spec_large.ts        | 29 +++++++++++++++++++
 yarn.lock                                     |  6 ++++
 8 files changed, 68 insertions(+), 3 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/test/browser/profile_spec_large.ts

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index ce0dabd9a0e2..654ed49fff1a 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -40,6 +40,7 @@
     "semver": "5.5.1",
     "source-map-support": "0.5.9",
     "source-map-loader": "0.2.4",
+    "speed-measure-webpack-plugin": "^1.2.3",
     "stats-webpack-plugin": "0.7.0",
     "style-loader": "0.23.0",
     "stylus": "0.54.5",
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
index 4dac5449818a..3ee86311eacc 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
@@ -52,6 +52,7 @@ export interface BuildOptions {
   skipAppShell?: boolean;
   statsJson: boolean;
   forkTypeChecker: boolean;
+  profile?: boolean;
 
   main: string;
   index: string;
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 3a59950deb0c..5bf3b61b4849 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -9,7 +9,7 @@
 // TODO: cleanup this file, it's copied as is from Angular CLI.
 
 import * as path from 'path';
-import { HashedModuleIdsPlugin } from 'webpack';
+import { HashedModuleIdsPlugin, debug } from 'webpack';
 import * as CopyWebpackPlugin from 'copy-webpack-plugin';
 import { getOutputHashFormat } from './utils';
 import { isDirectory } from '../../utilities/is-directory';
@@ -69,6 +69,12 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
     ];
   }
 
+  if (buildOptions.profile) {
+    extraPlugins.push(new debug.ProfilingPlugin({
+      outputPath: path.resolve(root, 'chrome-profiler-events.json'),
+    }))
+  }
+
   // determine hashing format
   const hashFormat = getOutputHashFormat(buildOptions.outputHashing as any);
 
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 8b81938e3fbf..39cb7eb43819 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -12,7 +12,7 @@ import {
   BuilderContext,
 } from '@angular-devkit/architect';
 import { LoggingCallback, WebpackBuilder } from '@angular-devkit/build-webpack';
-import { Path, getSystemPath, normalize, resolve, virtualFs } from '@angular-devkit/core';
+import { Path, getSystemPath, join, normalize, resolve, virtualFs } from '@angular-devkit/core';
 import * as fs from 'fs';
 import { Observable, concat, of, throwError } from 'rxjs';
 import { concatMap, last, tap } from 'rxjs/operators';
@@ -36,6 +36,7 @@ import {
 } from '../angular-cli-files/utilities/stats';
 import { defaultProgress, normalizeAssetPatterns, normalizeFileReplacements } from '../utils';
 import { AssetPatternObject, BrowserBuilderSchema, CurrentFileReplacement } from './schema';
+const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');
 const webpackMerge = require('webpack-merge');
 
 
@@ -154,7 +155,18 @@ export class BrowserBuilder implements Builder<BrowserBuilderSchema> {
       webpackConfigs.push(typescriptConfigPartial);
     }
 
-    return webpackMerge(webpackConfigs);
+    const webpackConfig = webpackMerge(webpackConfigs);
+
+    if (options.profile) {
+      const smp = new SpeedMeasurePlugin({
+        outputFormat: 'json',
+        outputTarget: getSystemPath(join(root, 'speed-measure-plugin.json')),
+      });
+
+      return smp.wrap(webpackConfig);
+    }
+
+    return webpackConfig;
   }
 
   private _deleteOutputDir(root: Path, outputPath: Path, host: virtualFs.Host) {
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.d.ts b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
index 11a63aaa698d..5b66793292ad 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
@@ -222,6 +222,11 @@ export interface BrowserBuilderSchema {
    * Budget thresholds to ensure parts of your application stay within boundaries which you set.
    */
   budgets: Budget[];
+
+  /**
+   * Output profile events for Chrome profiler.
+   */
+  profile: boolean;
 }
 
 export type AssetPattern = string | AssetPatternObject;
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index 0539ceb4b628..c29931dee0b8 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -236,6 +236,11 @@
         "$ref": "#/definitions/budget"
       },
       "default": []
+    },
+    "profile": {
+      "type": "boolean",
+      "description": "Output profile events for Chrome profiler.",
+      "default": false
     }
   },
   "additionalProperties": false,
diff --git a/packages/angular_devkit/build_angular/test/browser/profile_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/profile_spec_large.ts
new file mode 100644
index 000000000000..e17349953549
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/profile_spec_large.ts
@@ -0,0 +1,29 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { runTargetSpec } from '@angular-devkit/architect/testing';
+import { normalize } from '@angular-devkit/core';
+import { tap } from 'rxjs/operators';
+import { browserTargetSpec, host } from '../utils';
+
+
+describe('Browser Builder profile', () => {
+  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
+  afterEach(done => host.restore().toPromise().then(done, done.fail));
+
+  it('works', (done) => {
+    const overrides = { profile: true };
+    runTargetSpec(host, browserTargetSpec, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => {
+        expect(host.scopedSync().exists(normalize('chrome-profiler-events.json'))).toBe(true);
+        expect(host.scopedSync().exists(normalize('speed-measure-plugin.json'))).toBe(true);
+      }),
+    ).toPromise().then(done, done.fail);
+  });
+});
diff --git a/yarn.lock b/yarn.lock
index 65935810251f..46a04ea0f288 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7082,6 +7082,12 @@ spdy@^3.4.1:
     select-hose "^2.0.0"
     spdy-transport "^2.0.18"
 
+speed-measure-webpack-plugin@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.2.3.tgz#de170b5cefbfa1c039d95e639edd3ad50cfc7c48"
+  dependencies:
+    chalk "^2.0.1"
+
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"

From 8872205d6535783ce5f26c85f9b74d5b141707e9 Mon Sep 17 00:00:00 2001
From: Volodymyr BIlyachat <vovikdrg@gmail.com>
Date: Fri, 17 Aug 2018 12:42:02 +1000
Subject: [PATCH 0200/1703] fix(@schematics/angular): generate application with
 projectRoot is provided

Closes #11925.
---
 packages/schematics/angular/application/index.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index d4025145be4d..5ed893ac8f34 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -274,10 +274,8 @@ export default function (options: ApplicationOptions): Rule {
       name: `${options.name}-e2e`,
       relatedAppName: options.name,
       rootSelector: appRootSelector,
+      projectRoot: newProjectRoot ? `${newProjectRoot}/e2e` : 'e2e',
     };
-    if (options.projectRoot !== undefined) {
-      e2eOptions.projectRoot = 'e2e';
-    }
 
     return chain([
       addAppToWorkspaceFile(options, workspace),

From 830ba8f5e605eec41fced16209e65f3f9d1de147 Mon Sep 17 00:00:00 2001
From: danielhelfand <dhelfand@mail.depaul.edu>
Date: Sat, 11 Aug 2018 16:24:04 -0400
Subject: [PATCH 0201/1703] docs: add local installation and specific version
 installation instructions

---
 packages/angular/cli/README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/angular/cli/README.md b/packages/angular/cli/README.md
index 1c076e8a40a2..52dbdb4b00d0 100644
--- a/packages/angular/cli/README.md
+++ b/packages/angular/cli/README.md
@@ -42,10 +42,24 @@ with NPM 5.5.1 or higher.
 ## Installation
 
 **BEFORE YOU INSTALL:** please read the [prerequisites](#prerequisites)
+
+### Install Globablly
 ```bash
 npm install -g @angular/cli
 ```
 
+### Install Locally
+```bash
+npm install @angular/cli
+```
+
+To run a locally installed version of the angular-cli, you can call `ng` commands directly using your file path to where the `ng` package is installed locally, or you can use `npm run ng <command>`, which will look for locally installed packages before using a globally installed version.  
+
+### Install Specific Version (Example: 6.1.1)
+```bash
+npm install -g @angular/cli@6.1.1
+```
+
 ## Usage
 
 ```bash

From feb295d9c1db6450a537979dc2cdb6ff64a10e95 Mon Sep 17 00:00:00 2001
From: danielhelfand <dhelfand@mail.depaul.edu>
Date: Sun, 12 Aug 2018 10:02:51 -0400
Subject: [PATCH 0202/1703] docs: touching up local installation instructions

---
 packages/angular/cli/README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/README.md b/packages/angular/cli/README.md
index 52dbdb4b00d0..67a6950f1dbc 100644
--- a/packages/angular/cli/README.md
+++ b/packages/angular/cli/README.md
@@ -53,7 +53,9 @@ npm install -g @angular/cli
 npm install @angular/cli
 ```
 
-To run a locally installed version of the angular-cli, you can call `ng` commands directly using your file path to where the `ng` package is installed locally, or you can use `npm run ng <command>`, which will look for locally installed packages before using a globally installed version.  
+To run a locally installed version of the angular-cli, you can call `ng` commands directly by adding the `.bin` folder within your local `node_modules` folder to your PATH. The `node_modules` and `.bin` folders are created in the directory where `npm install @angular/cli` was run upon completion of the install command.
+
+Alternatively, you can run `npx ng <command>` within the local directory where `npm install @angular/cli` was run, which will use the locally installed angular-cli.
 
 ### Install Specific Version (Example: 6.1.1)
 ```bash

From 2397920ff34cc877e8d613100b7a6adccbacd095 Mon Sep 17 00:00:00 2001
From: danielhelfand <dhelfand@mail.depaul.edu>
Date: Sun, 12 Aug 2018 15:32:17 -0400
Subject: [PATCH 0203/1703] docs: npx install information

---
 packages/angular/cli/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular/cli/README.md b/packages/angular/cli/README.md
index 67a6950f1dbc..a55e25895106 100644
--- a/packages/angular/cli/README.md
+++ b/packages/angular/cli/README.md
@@ -55,7 +55,7 @@ npm install @angular/cli
 
 To run a locally installed version of the angular-cli, you can call `ng` commands directly by adding the `.bin` folder within your local `node_modules` folder to your PATH. The `node_modules` and `.bin` folders are created in the directory where `npm install @angular/cli` was run upon completion of the install command.
 
-Alternatively, you can run `npx ng <command>` within the local directory where `npm install @angular/cli` was run, which will use the locally installed angular-cli.
+Alternatively, you can install [npx](https://www.npmjs.com/package/npx) and run `npx ng <command>` within the local directory where `npm install @angular/cli` was run, which will use the locally installed angular-cli.
 
 ### Install Specific Version (Example: 6.1.1)
 ```bash

From d24db32c4006b8f932040bb9d720994144137013 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 19 Sep 2018 21:23:37 -0400
Subject: [PATCH 0204/1703] fix(@angular/cli): relax compatible angular check
 package location

---
 packages/angular/cli/upgrade/version.ts | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/packages/angular/cli/upgrade/version.ts b/packages/angular/cli/upgrade/version.ts
index 7cf97e6c8f5c..89e013a0f795 100644
--- a/packages/angular/cli/upgrade/version.ts
+++ b/packages/angular/cli/upgrade/version.ts
@@ -41,17 +41,6 @@ export class Version {
     let angularPkgJson;
     let rxjsPkgJson;
 
-    const isInside = (base: string, potential: string): boolean => {
-      const absoluteBase = path.resolve(base);
-      const absolutePotential = path.resolve(potential);
-      const relativePotential = path.relative(absoluteBase, absolutePotential);
-      if (!relativePotential.startsWith('..') && !path.isAbsolute(relativePotential)) {
-        return true;
-      }
-
-      return false;
-    };
-
     try {
       const resolveOptions = {
         basedir: projectRoot,
@@ -61,11 +50,6 @@ export class Version {
       const angularPackagePath = resolve('@angular/core/package.json', resolveOptions);
       const rxjsPackagePath = resolve('rxjs/package.json', resolveOptions);
 
-      if (!isInside(projectRoot, angularPackagePath)
-          || !isInside(projectRoot, rxjsPackagePath)) {
-        throw new Error();
-      }
-
       angularPkgJson = require(angularPackagePath);
       rxjsPkgJson = require(rxjsPackagePath);
     } catch {

From 228a2edd4a6c9bd2e7e70f2e4f8564bda9d8e754 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 20 Sep 2018 11:28:29 -0400
Subject: [PATCH 0205/1703] fix(@angular-devkit/build-angular): fully resolve
 project modules

---
 .../utilities/require-project-module.ts       | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/require-project-module.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/require-project-module.ts
index 18c3cc4cf036..ec1eed116dca 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/require-project-module.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/require-project-module.ts
@@ -5,19 +5,18 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable
-// TODO: cleanup this file, it's copied as is from Angular CLI.
-import * as fs from 'fs';
-import * as path from 'path';
+import { resolve } from '@angular-devkit/core/node';
 
 // Resolve dependencies within the target project.
 export function resolveProjectModule(root: string, moduleName: string) {
-  const rootModules = path.join(root, 'node_modules');
-  if (fs.existsSync(rootModules)) {
-    return require.resolve(moduleName, { paths: [rootModules] });
-  } else {
-    return require.resolve(moduleName, { paths: [root] });
-  }
+  return resolve(
+    moduleName,
+    {
+      basedir: root,
+      checkGlobal: false,
+      checkLocal: true,
+    },
+  );
 }
 
 // Require dependencies within the target project.

From 64927e8e17523992f8e20f000d72336ad8dc0655 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 21 Sep 2018 12:28:30 +0200
Subject: [PATCH 0206/1703] feat(@angular/cli): add support for `ShadowDom` as
 a `viewEncapsulation` value

---
 packages/angular/cli/lib/config/schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index 5bd45a03dc44..c758f76f0a3b 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -141,7 +141,7 @@
             },
             "viewEncapsulation": {
               "description": "Specifies the view encapsulation strategy.",
-              "enum": ["Emulated", "Native", "None"],
+              "enum": ["Emulated", "Native", "None", "ShadowDom"],
               "type": "string",
               "alias": "v"
             }

From 6d6870314c6a2087f59acd79f89153fbcfb53004 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 21 Sep 2018 12:28:45 +0200
Subject: [PATCH 0207/1703] feat(@schematics/angular): add support for
 `ShadowDom` as a `viewEncapsulation` value

---
 packages/schematics/angular/application/schema.json | 2 +-
 packages/schematics/angular/component/schema.json   | 2 +-
 packages/schematics/angular/ng-new/schema.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json
index 0c98245387f2..6c2db3d8f543 100644
--- a/packages/schematics/angular/application/schema.json
+++ b/packages/schematics/angular/application/schema.json
@@ -36,7 +36,7 @@
     },
     "viewEncapsulation": {
       "description": "Specifies the view encapsulation strategy.",
-      "enum": ["Emulated", "Native", "None"],
+      "enum": ["Emulated", "Native", "None", "ShadowDom"],
       "type": "string"
     },
     "routing": {
diff --git a/packages/schematics/angular/component/schema.json b/packages/schematics/angular/component/schema.json
index d10af40349d5..9eb811586b08 100644
--- a/packages/schematics/angular/component/schema.json
+++ b/packages/schematics/angular/component/schema.json
@@ -39,7 +39,7 @@
     },
     "viewEncapsulation": {
       "description": "Specifies the view encapsulation strategy.",
-      "enum": ["Emulated", "Native", "None"],
+      "enum": ["Emulated", "Native", "None", "ShadowDom"],
       "type": "string",
       "alias": "v"
     },
diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
index bb412d0c544b..5f4179e8cc74 100644
--- a/packages/schematics/angular/ng-new/schema.json
+++ b/packages/schematics/angular/ng-new/schema.json
@@ -85,7 +85,7 @@
     },
     "viewEncapsulation": {
       "description": "Specifies the view encapsulation strategy.",
-      "enum": ["Emulated", "Native", "None"],
+      "enum": ["Emulated", "Native", "None", "ShadowDom"],
       "type": "string"
     },
     "version": {

From 3034019ba9c72ff52113b6da9269be3ea921f5e2 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 11 Sep 2018 13:17:28 -0400
Subject: [PATCH 0208/1703] build: update webpack types

---
 package.json                                  |   8 +-
 .../build_angular/src/dev-server/index.ts     |   2 +-
 .../utils/webpack-file-system-host-adapter.ts |   4 +-
 .../src/webpack-dev-server/index.ts           |   2 +-
 .../webpack/src/angular_compiler_plugin.ts    |   2 -
 .../src/virtual_file_system_decorator.ts      |  31 +++--
 .../ngtools/webpack/src/webpack-input-host.ts |   5 +-
 packages/ngtools/webpack/src/webpack.ts       |  17 +--
 yarn.lock                                     | 111 ++++++++++--------
 9 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/package.json b/package.json
index cb99390c3e09..e1504b119083 100644
--- a/package.json
+++ b/package.json
@@ -80,9 +80,9 @@
     "@types/request": "^2.47.1",
     "@types/semver": "^5.5.0",
     "@types/source-map": "0.5.2",
-    "@types/webpack": "^4.4.0",
-    "@types/webpack-dev-server": "^2.9.4",
-    "@types/webpack-sources": "^0.1.4",
+    "@types/webpack": "^4.4.11",
+    "@types/webpack-dev-server": "^3.1.0",
+    "@types/webpack-sources": "^0.1.5",
     "common-tags": "^1.8.0",
     "conventional-changelog": "^1.1.0",
     "conventional-commits-parser": "^3.0.0",
@@ -107,8 +107,6 @@
     "tslint-sonarts": "^1.7.0"
   },
   "resolutions": {
-    "@types/webpack": "4.4.0",
-    "@types/webpack-dev-server": "2.9.4",
     "rxjs": "~6.2.0"
   }
 }
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index 38d430992a30..194323955a70 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -210,7 +210,7 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
         index: `${servePath}/${path.basename(browserOptions.index)}`,
         disableDotRule: true,
         htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
-      },
+      } as WebpackDevServer.HistoryApiFallbackConfig,
       stats: false,
       compress: browserOptions.optimization,
       watchOptions: {
diff --git a/packages/angular_devkit/build_angular/src/utils/webpack-file-system-host-adapter.ts b/packages/angular_devkit/build_angular/src/utils/webpack-file-system-host-adapter.ts
index 0b95101bb98f..3905dfd963a1 100644
--- a/packages/angular_devkit/build_angular/src/utils/webpack-file-system-host-adapter.ts
+++ b/packages/angular_devkit/build_angular/src/utils/webpack-file-system-host-adapter.ts
@@ -6,13 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { FileDoesNotExistException, JsonObject, normalize, virtualFs } from '@angular-devkit/core';
-import { Callback, InputFileSystem } from '@ngtools/webpack/src/webpack';
+import { Callback } from '@ngtools/webpack/src/webpack';
 import { Stats } from 'fs';
 import { Observable, of } from 'rxjs';
 import { map, mergeMap, switchMap } from 'rxjs/operators';
 
 
-export class WebpackFileSystemHostAdapter implements InputFileSystem {
+export class WebpackFileSystemHostAdapter {
   protected _syncHost: virtualFs.SyncDelegateHost<Stats> | null = null;
 
   constructor(protected _host: virtualFs.Host<Stats>) {}
diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts
index 23d6a134e7ec..16a71eb93915 100644
--- a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts
@@ -49,7 +49,7 @@ export class WebpackDevServerBuilder implements Builder<WebpackDevServerBuilderS
       devServerConfig.port = devServerConfig.port || 8080;
 
       if (devServerConfig.stats) {
-        webpackConfig.stats = devServerConfig.stats;
+        webpackConfig.stats = devServerConfig.stats as webpack.Stats.ToStringOptionsObject;
       }
       // Disable stats reporting by the devserver, we have our own logger.
       devServerConfig.stats = false;
diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 410b9da63130..011fad1684f3 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -52,7 +52,6 @@ import {
 } from './virtual_file_system_decorator';
 import {
   Callback,
-  InputFileSystem,
   NodeWatchFileSystemInterface,
   NormalModuleFactoryRequest,
 } from './webpack';
@@ -583,7 +582,6 @@ export class AngularCompilerPlugin {
     compiler.hooks.environment.tap('angular-compiler', () => {
       // The webpack types currently do not include these
       const compilerWithFileSystems = compiler as Compiler & {
-        inputFileSystem: InputFileSystem,
         watchFileSystem: NodeWatchFileSystemInterface,
       };
 
diff --git a/packages/ngtools/webpack/src/virtual_file_system_decorator.ts b/packages/ngtools/webpack/src/virtual_file_system_decorator.ts
index aedf56665b6f..4f897a654a2e 100644
--- a/packages/ngtools/webpack/src/virtual_file_system_decorator.ts
+++ b/packages/ngtools/webpack/src/virtual_file_system_decorator.ts
@@ -7,12 +7,14 @@
  */
 import { Path, getSystemPath, normalize } from '@angular-devkit/core';
 import { Stats } from 'fs';
+import { InputFileSystem } from 'webpack';
 import { WebpackCompilerHost } from './compiler_host';
-import { Callback, InputFileSystem, NodeWatchFileSystemInterface } from './webpack';
+import { Callback, NodeWatchFileSystemInterface } from './webpack';
 
 export const NodeWatchFileSystem: NodeWatchFileSystemInterface = require(
   'webpack/lib/node/NodeWatchFileSystem');
 
+// NOTE: @types/webpack InputFileSystem is missing some methods
 export class VirtualFileSystemDecorator implements InputFileSystem {
   constructor(
     private _inputFileSystem: InputFileSystem,
@@ -39,33 +41,37 @@ export class VirtualFileSystemDecorator implements InputFileSystem {
     return this._webpackCompilerHost.getNgFactoryPaths();
   }
 
-  stat(path: string, callback: Callback<Stats>): void {
+  stat(path: string, callback: (err: Error, stats: Stats) => void): void {
     const result = this._statSync(path);
     if (result) {
-      callback(null, result);
+      // tslint:disable-next-line:no-any
+      callback(null as any, result);
     } else {
       this._inputFileSystem.stat(path, callback);
     }
   }
 
   readdir(path: string, callback: Callback<string[]>): void {
-    this._inputFileSystem.readdir(path, callback);
+    // tslint:disable-next-line:no-any
+    (this._inputFileSystem as any).readdir(path, callback);
   }
 
-  readFile(path: string, callback: Callback<Buffer>): void {
+  readFile(path: string, callback: (err: Error, contents: Buffer) => void): void {
     const result = this._readFileSync(path);
     if (result) {
-      callback(null, result);
+      // tslint:disable-next-line:no-any
+      callback(null as any, result);
     } else {
       this._inputFileSystem.readFile(path, callback);
     }
   }
 
   readJson(path: string, callback: Callback<{}>): void {
-    this._inputFileSystem.readJson(path, callback);
+    // tslint:disable-next-line:no-any
+    (this._inputFileSystem as any).readJson(path, callback);
   }
 
-  readlink(path: string, callback: Callback<string>): void {
+  readlink(path: string, callback: (err: Error, linkString: string) => void): void {
     this._inputFileSystem.readlink(path, callback);
   }
 
@@ -76,7 +82,8 @@ export class VirtualFileSystemDecorator implements InputFileSystem {
   }
 
   readdirSync(path: string): string[] {
-    return this._inputFileSystem.readdirSync(path);
+    // tslint:disable-next-line:no-any
+    return (this._inputFileSystem as any).readdirSync(path);
   }
 
   readFileSync(path: string): Buffer {
@@ -86,7 +93,8 @@ export class VirtualFileSystemDecorator implements InputFileSystem {
   }
 
   readJsonSync(path: string): string {
-    return this._inputFileSystem.readJsonSync(path);
+    // tslint:disable-next-line:no-any
+    return (this._inputFileSystem as any).readJsonSync(path);
   }
 
   readlinkSync(path: string): string {
@@ -100,7 +108,8 @@ export class VirtualFileSystemDecorator implements InputFileSystem {
       changes.forEach((fileName: string) => this._webpackCompilerHost.invalidate(fileName));
     }
     if (this._inputFileSystem.purge) {
-      this._inputFileSystem.purge(changes);
+      // tslint:disable-next-line:no-any
+      (this._inputFileSystem as any).purge(changes);
     }
   }
 }
diff --git a/packages/ngtools/webpack/src/webpack-input-host.ts b/packages/ngtools/webpack/src/webpack-input-host.ts
index 41201d1e88dc..3925ec33ab10 100644
--- a/packages/ngtools/webpack/src/webpack-input-host.ts
+++ b/packages/ngtools/webpack/src/webpack-input-host.ts
@@ -9,7 +9,7 @@ import { Path, PathFragment, fragment, getSystemPath, virtualFs } from '@angular
 import { Stats } from 'fs';
 import { Observable, throwError } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { InputFileSystem } from './webpack';
+import { InputFileSystem } from 'webpack';
 
 // Host is used instead of ReadonlyHost due to most decorators only supporting Hosts
 export class WebpackInputHost implements virtualFs.Host<Stats> {
@@ -51,7 +51,8 @@ export class WebpackInputHost implements virtualFs.Host<Stats> {
       // TODO: remove this try+catch when issue https://github.com/ReactiveX/rxjs/issues/3740 is
       // fixed.
       try {
-        const names = this.inputFileSystem.readdirSync(getSystemPath(path));
+        // tslint:disable-next-line:no-any
+        const names: string[] = (this.inputFileSystem as any).readdirSync(getSystemPath(path));
         obs.next(names.map(name => fragment(name)));
         obs.complete();
       } catch (err) {
diff --git a/packages/ngtools/webpack/src/webpack.ts b/packages/ngtools/webpack/src/webpack.ts
index 83d2a5cddf31..c71afba3c791 100644
--- a/packages/ngtools/webpack/src/webpack.ts
+++ b/packages/ngtools/webpack/src/webpack.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Stats } from 'fs';
+import { InputFileSystem } from 'webpack';
 
 // Declarations for (some) Webpack types. Only what's needed.
 
@@ -21,21 +21,6 @@ export interface NormalModuleFactoryRequest {
   typescriptPathMapped?: boolean;
 }
 
-export interface InputFileSystem {
-  stat(path: string, callback: Callback<Stats>): void;
-  readdir(path: string, callback: Callback<string[]>): void;
-  readFile(path: string, callback: Callback<Buffer>): void;
-  readJson(path: string, callback: Callback): void;
-  readlink(path: string, callback: Callback<string>): void;
-  statSync(path: string): Stats;
-  readdirSync(path: string): string[];
-  readFileSync(path: string): Buffer;
-  // tslint:disable-next-line:no-any
-  readJsonSync(path: string): any;
-  readlinkSync(path: string): string;
-  purge(changes?: string[] | string): void;
-}
-
 export interface NodeWatchFileSystemInterface {
   inputFileSystem: InputFileSystem;
   new(inputFileSystem: InputFileSystem): NodeWatchFileSystemInterface;
diff --git a/yarn.lock b/yarn.lock
index 46a04ea0f288..33e7428e4a8e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -223,7 +223,7 @@
     "@types/node" "*"
     "@types/range-parser" "*"
 
-"@types/express@^4.16.0":
+"@types/express@*", "@types/express@^4.16.0":
   version "4.16.0"
   resolved "https://registry.yarnpkg.com/@types/express/-/express-4.16.0.tgz#6d8bc42ccaa6f35cf29a2b7c3333cb47b5a32a19"
   dependencies:
@@ -435,12 +435,6 @@
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.5.2.tgz#973459e744cc7445c85b97f770275b479b138e08"
 
-"@types/spdy@*":
-  version "3.4.4"
-  resolved "https://registry.yarnpkg.com/@types/spdy/-/spdy-3.4.4.tgz#3282fd4ad8c4603aa49f7017dd520a08a345b2bc"
-  dependencies:
-    "@types/node" "*"
-
 "@types/tapable@*":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.4.tgz#b4ffc7dc97b498c969b360a41eee247f82616370"
@@ -465,17 +459,16 @@
   version "1.0.1"
   resolved "https://codeload.github.com/quicktype/types-urijs/tar.gz/a23603a04e31e883a92244bff8515e3d841a8b98"
 
-"@types/webpack-dev-server@2.9.4", "@types/webpack-dev-server@^2.9.4":
-  version "2.9.4"
-  resolved "http://registry.npmjs.org/@types/webpack-dev-server/-/webpack-dev-server-2.9.4.tgz#cc3c398330ba87c0f1c7bfd020cfafb7bb895493"
+"@types/webpack-dev-server@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-3.1.0.tgz#1fae06ad346d2dd09bc5e34745723946458eed58"
   dependencies:
-    "@types/express-serve-static-core" "*"
+    "@types/express" "*"
     "@types/http-proxy-middleware" "*"
     "@types/serve-static" "*"
-    "@types/spdy" "*"
     "@types/webpack" "*"
 
-"@types/webpack-sources@^0.1.4":
+"@types/webpack-sources@^0.1.5":
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-0.1.5.tgz#be47c10f783d3d6efe1471ff7f042611bd464a92"
   dependencies:
@@ -483,9 +476,9 @@
     "@types/source-list-map" "*"
     source-map "^0.6.1"
 
-"@types/webpack@*", "@types/webpack@4.4.0", "@types/webpack@^4.4.0":
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.4.0.tgz#c0551b772be241d786c0548812dd75a932f8efb4"
+"@types/webpack@*", "@types/webpack@^4.4.11":
+  version "4.4.11"
+  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.4.11.tgz#0ca832870d55c4e92498c01d22d00d02b0f62ae9"
   dependencies:
     "@types/node" "*"
     "@types/tapable" "*"
@@ -658,8 +651,8 @@ acorn-dynamic-import@^3.0.0:
     acorn "^5.0.0"
 
 acorn@^5.0.0, acorn@^5.6.2:
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.2.tgz#91fa871883485d06708800318404e72bfb26dcc5"
+  version "5.7.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
 
 adm-zip@^0.4.9:
   version "0.4.11"
@@ -1524,9 +1517,9 @@ chrome-trace-event@^1.0.0:
   dependencies:
     tslib "^1.9.0"
 
-ci-info@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.4.0.tgz#4841d53cad49f11b827b648ebde27a6e189b412f"
+ci-info@^1.5.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.5.1.tgz#17e8eb5de6f8b2b6038f0cbb714d410bfa9f3030"
 
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
@@ -1696,10 +1689,14 @@ combined-stream@1.0.6, combined-stream@~1.0.5, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.17.x, commander@^2.12.0, commander@^2.12.1, commander@~2.17.1:
+commander@2.17.x, commander@~2.17.1:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
 
+commander@^2.12.0, commander@^2.12.1:
+  version "2.18.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
+
 commander@~2.13.0:
   version "2.13.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
@@ -2171,11 +2168,11 @@ dateformat@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
 
-debug@*, debug@^3.1.0, debug@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+debug@*:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.0.0.tgz#ef7592a30b1c5e05a78e96926df2e6b36b5544e7"
   dependencies:
-    ms "2.0.0"
+    ms "^2.1.1"
 
 debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.8:
   version "2.6.9"
@@ -2183,6 +2180,18 @@ debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.
   dependencies:
     ms "2.0.0"
 
+debug@^3.1.0:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.4.tgz#82123737c51afbe9609a2b5dfe9664e7487171f0"
+  dependencies:
+    ms "^2.1.1"
+
+debug@~3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
@@ -2483,8 +2492,8 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
 electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.62:
-  version "1.3.63"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.63.tgz#6485f5f4f3375358aa8fa23c2029ada208483b8d"
+  version "1.3.65"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.65.tgz#0655c238e45fea7e0e0e81fd0cac62b8186129c2"
 
 elliptic@^6.0.0:
   version "6.4.1"
@@ -2606,8 +2615,8 @@ es-to-primitive@^1.1.1:
     is-symbol "^1.0.1"
 
 es6-promise@^4.0.3:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
+  version "4.2.5"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
 
 es6-promise@~3.0.2:
   version "3.0.2"
@@ -3882,10 +3891,10 @@ is-callable@^1.1.1, is-callable@^1.1.3:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
 
 is-ci@^1.0.10:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.0.tgz#3f4a08d6303a09882cef3f0fb97439c5f5ce2d53"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
   dependencies:
-    ci-info "^1.3.0"
+    ci-info "^1.5.0"
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
@@ -4418,8 +4427,8 @@ karma-chrome-launcher@~2.2.0:
     which "^1.2.1"
 
 karma-coverage-istanbul-reporter@~2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.3.tgz#ef08d1721ed108407a53f0d298acc6d2dc8a4008"
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.4.tgz#402ae4ed6eadb9d9dafbd408ffda17897c0d003a"
   dependencies:
     istanbul-api "^2.0.5"
     minimatch "^3.0.4"
@@ -4479,8 +4488,8 @@ keyv@3.0.0:
     json-buffer "3.0.0"
 
 killable@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.0.tgz#da8b84bd47de5395878f95d64d02f2449fe05e6b"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
 
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
@@ -5117,8 +5126,8 @@ nanomatch@^1.2.9:
     to-regex "^3.0.1"
 
 needle@^2.2.1:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.2.tgz#1120ca4c41f2fcc6976fd28a8968afe239929418"
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.3.tgz#c1b04da378cd634d8befe2de965dc2cfb0fd65ca"
   dependencies:
     debug "^2.1.2"
     iconv-lite "^0.4.4"
@@ -5959,8 +5968,8 @@ protobufjs@5.0.0:
     yargs "^3.10.0"
 
 protractor@~5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.4.0.tgz#e71c9c1f5cf6c5e9bdbcdb71e7f31b17ffd2878f"
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.4.1.tgz#011a99e38df7aa45d22455b889ffbb13a6ce0bd9"
   dependencies:
     "@types/node" "^6.0.46"
     "@types/q" "^0.0.32"
@@ -5976,7 +5985,7 @@ protractor@~5.4.0:
     saucelabs "^1.5.0"
     selenium-webdriver "3.6.0"
     source-map-support "~0.4.0"
-    webdriver-js-extender "2.0.0"
+    webdriver-js-extender "2.1.0"
     webdriver-manager "^12.0.6"
 
 proxy-addr@~2.0.3:
@@ -7037,8 +7046,8 @@ spdx-license-ids@^1.0.0:
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87"
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz#e2a303236cac54b04031fa7a5a79c7e701df852f"
 
 spdx-ranges@^2.0.0:
   version "2.0.0"
@@ -7429,8 +7438,8 @@ terser@^3.8.1:
     source-map-support "~0.5.6"
 
 text-extensions@^1.0.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.7.0.tgz#faaaba2625ed746d568a23e4d0aacd9bf08a8b39"
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.8.0.tgz#6f343c62268843019b21a616a003557bdb952d2b"
 
 text-hex@1.0.x:
   version "1.0.0"
@@ -7598,8 +7607,8 @@ tslint-no-circular-imports@^0.5.0:
   resolved "https://registry.yarnpkg.com/tslint-no-circular-imports/-/tslint-no-circular-imports-0.5.2.tgz#47ac9194ec531101ac19198d5144f7ac9f57d980"
 
 tslint-sonarts@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/tslint-sonarts/-/tslint-sonarts-1.7.0.tgz#1bcaf9f524c86b8d4cf9a2afae736edffd2e0dea"
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/tslint-sonarts/-/tslint-sonarts-1.8.0.tgz#80f2e8addd418c3b8807fc0155dec33b5a81e8d1"
   dependencies:
     immutable "^3.8.2"
 
@@ -7940,9 +7949,9 @@ wbuf@^1.1.0, wbuf@^1.7.2:
   dependencies:
     minimalistic-assert "^1.0.0"
 
-webdriver-js-extender@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-2.0.0.tgz#b27fc1ed1afbf78f0ac57e4c878f31b10e57f146"
+webdriver-js-extender@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz#57d7a93c00db4cc8d556e4d3db4b5db0a80c3bb7"
   dependencies:
     "@types/selenium-webdriver" "^3.0.0"
     selenium-webdriver "^3.0.1"

From a121c4c9dd03f274f78155efd97a9f85f70177c4 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 11 Sep 2018 13:48:16 -0400
Subject: [PATCH 0209/1703] test: update license exceptions

---
 scripts/validate-licenses.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/validate-licenses.ts b/scripts/validate-licenses.ts
index b0afe93580a2..4033770858b0 100644
--- a/scripts/validate-licenses.ts
+++ b/scripts/validate-licenses.ts
@@ -64,8 +64,8 @@ const ignoredPackages = [
   // Us.
   '@angular/devkit-repo@0.0.0',  // Hey, that's us!
   // * Development only
-  'spdx-license-ids@3.0.0',  // CC0 but it's content only (index.json, no code) and not distributed.
-  'tslint-sonarts@1.7.0', // LGPL-3.0 but only used as a tool, not linked in the build.
+  'spdx-license-ids@3.0.1',  // CC0 but it's content only (index.json, no code) and not distributed.
+  'tslint-sonarts@1.8.0', // LGPL-3.0 but only used as a tool, not linked in the build.
 
   // * Broken license fields
   'bitsyntax@0.0.4', // MIT but no license field in package.json

From 1cd4ce8fd5359bdac60c6fef4768594f1f20e8e8 Mon Sep 17 00:00:00 2001
From: Stephen Fluin <stephen.fluin@gmail.com>
Date: Tue, 28 Aug 2018 08:33:49 -0700
Subject: [PATCH 0210/1703] feat(@schematics/angular): add default budget of
 2mb/5mb

---
 packages/schematics/angular/application/index.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 5ed893ac8f34..a5b061c52a69 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -173,6 +173,11 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
             extractLicenses: true,
             vendorChunk: false,
             buildOptimizer: true,
+            budgets: [{
+              type: 'initial',
+              maximumWarning: '2mb',
+              maximumError: '5mb',
+            }],
           },
         },
       },

From d5d9790a4122353ee98e46aa74c454c2fb40f987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Ganslandt?= <b.ganslandt@gmail.com>
Date: Mon, 3 Sep 2018 10:08:31 +0200
Subject: [PATCH 0211/1703] docs: convert console image to css

---
 etc/cli.angular.io/cli-logo.svg | 326 --------------------------------
 etc/cli.angular.io/index.html   |  31 ++-
 etc/cli.angular.io/main.css     |   2 +-
 etc/cli.angular.io/theme.css    |   2 +-
 4 files changed, 24 insertions(+), 337 deletions(-)
 delete mode 100644 etc/cli.angular.io/cli-logo.svg

diff --git a/etc/cli.angular.io/cli-logo.svg b/etc/cli.angular.io/cli-logo.svg
deleted file mode 100644
index fff3d73bfb7c..000000000000
--- a/etc/cli.angular.io/cli-logo.svg
+++ /dev/null
@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="356px"
-   height="227px"
-   viewBox="0 0 356 227"
-   version="1.1"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="cli-logo.svg"
-   inkscape:export-filename="/usr/local/google/home/stephenfluin/cli.png"
-   inkscape:export-xdpi="900.38605"
-   inkscape:export-ydpi="900.38605">
-  <metadata
-     id="metadata71">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1918"
-     inkscape:window-height="960"
-     id="namedview69"
-     showgrid="false"
-     inkscape:zoom="2.3437809"
-     inkscape:cx="346.45503"
-     inkscape:cy="180.4997"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <!-- Generator: Sketch 3.7.2 (28276) - http://www.bohemiancoding.com/sketch -->
-  <title
-     id="title4">CLI Copy 2</title>
-  <desc
-     id="desc6">Created with Sketch.</desc>
-  <defs
-     id="defs8">
-    <rect
-       id="path-1"
-       x="6"
-       y="29"
-       width="344"
-       height="184"
-       rx="4" />
-    <filter
-       x="-50%"
-       y="-50%"
-       width="200%"
-       height="200%"
-       filterUnits="objectBoundingBox"
-       id="filter-2">
-      <feOffset
-         dx="0"
-         dy="5"
-         in="SourceAlpha"
-         result="shadowOffsetOuter1"
-         id="feOffset12" />
-      <feGaussianBlur
-         stdDeviation="2.5"
-         in="shadowOffsetOuter1"
-         result="shadowBlurOuter1"
-         id="feGaussianBlur14" />
-      <feColorMatrix
-         values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.25 0"
-         type="matrix"
-         in="shadowBlurOuter1"
-         id="feColorMatrix16" />
-    </filter>
-    <circle
-       id="path-3"
-       cx="6"
-       cy="6"
-       r="6" />
-    <filter
-       x="-50%"
-       y="-50%"
-       width="200%"
-       height="200%"
-       filterUnits="objectBoundingBox"
-       id="filter-4">
-      <feOffset
-         dx="0"
-         dy="1"
-         in="SourceAlpha"
-         result="shadowOffsetOuter1"
-         id="feOffset20" />
-      <feGaussianBlur
-         stdDeviation="0.5"
-         in="shadowOffsetOuter1"
-         result="shadowBlurOuter1"
-         id="feGaussianBlur22" />
-      <feColorMatrix
-         values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.15 0"
-         type="matrix"
-         in="shadowBlurOuter1"
-         id="feColorMatrix24" />
-    </filter>
-    <circle
-       id="path-5"
-       cx="25"
-       cy="6"
-       r="6" />
-    <filter
-       x="-50%"
-       y="-50%"
-       width="200%"
-       height="200%"
-       filterUnits="objectBoundingBox"
-       id="filter-6">
-      <feOffset
-         dx="0"
-         dy="1"
-         in="SourceAlpha"
-         result="shadowOffsetOuter1"
-         id="feOffset28" />
-      <feGaussianBlur
-         stdDeviation="0.5"
-         in="shadowOffsetOuter1"
-         result="shadowBlurOuter1"
-         id="feGaussianBlur30" />
-      <feColorMatrix
-         values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.15 0"
-         type="matrix"
-         in="shadowBlurOuter1"
-         id="feColorMatrix32" />
-    </filter>
-    <circle
-       id="path-7"
-       cx="45"
-       cy="6"
-       r="6" />
-    <filter
-       x="-50%"
-       y="-50%"
-       width="200%"
-       height="200%"
-       filterUnits="objectBoundingBox"
-       id="filter-8">
-      <feOffset
-         dx="0"
-         dy="1"
-         in="SourceAlpha"
-         result="shadowOffsetOuter1"
-         id="feOffset36" />
-      <feGaussianBlur
-         stdDeviation="0.5"
-         in="shadowOffsetOuter1"
-         result="shadowBlurOuter1"
-         id="feGaussianBlur38" />
-      <feColorMatrix
-         values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.15 0"
-         type="matrix"
-         in="shadowBlurOuter1"
-         id="feColorMatrix40" />
-    </filter>
-  </defs>
-  <g
-     style="fill:none;stroke:none"
-     id="Screem">
-    <use
-       xlink:href="#path-1"
-       id="use45"
-       style="fill:#000000;fill-opacity:1;filter:url(#filter-2)"
-       x="0"
-       y="0"
-       width="356"
-       height="227" />
-    <use
-       xlink:href="#path-1"
-       id="use47"
-       style="fill:#1e1e1e;fill-rule:evenodd"
-       x="0"
-       y="0"
-       width="356"
-       height="227" />
-  </g>
-  <rect
-     id="Header"
-     x="6"
-     y="5"
-     width="344"
-     height="28"
-     style="fill:#d5d5d5;stroke:none" />
-  <g
-     style="fill:none;stroke:none"
-     id="IDE"
-     transform="translate(20,13)">
-    <g
-       id="Oval-1">
-      <use
-         xlink:href="#path-3"
-         id="use52"
-         style="fill:#000000;fill-opacity:1;filter:url(#filter-4)"
-         x="0"
-         y="0"
-         width="356"
-         height="227" />
-      <use
-         xlink:href="#path-3"
-         id="use54"
-         style="fill:#ff6057;fill-rule:evenodd"
-         x="0"
-         y="0"
-         width="356"
-         height="227" />
-    </g>
-    <g
-       id="g56">
-      <use
-         xlink:href="#path-5"
-         id="use58"
-         style="fill:#000000;fill-opacity:1;filter:url(#filter-6)"
-         x="0"
-         y="0"
-         width="356"
-         height="227" />
-      <use
-         xlink:href="#path-5"
-         id="use60"
-         style="fill:#ffc22e;fill-rule:evenodd"
-         x="0"
-         y="0"
-         width="356"
-         height="227" />
-    </g>
-    <g
-       id="g62">
-      <use
-         xlink:href="#path-7"
-         id="use64"
-         style="fill:#000000;fill-opacity:1;filter:url(#filter-8)"
-         x="0"
-         y="0"
-         width="356"
-         height="227" />
-      <use
-         xlink:href="#path-7"
-         id="use66"
-         style="fill:#28ca40;fill-rule:evenodd"
-         x="0"
-         y="0"
-         width="356"
-         height="227" />
-    </g>
-  </g>
-  <path
-     d="m 25.601562,68.430664 0,-1.244141 7.225586,2.857422 0,1.134766 -7.225586,2.857422 0,-1.250977 5.810547,-2.166992 z m 31.869141,1.825195 0,4.744141 -1.264648,0 0,-4.744141 c 0,-0.688154 -0.120767,-1.194008 -0.362305,-1.517578 -0.241538,-0.323569 -0.619789,-0.485351 -1.134766,-0.485351 -0.587893,0 -1.0402,0.208494 -1.356933,0.625488 -0.316734,0.416994 -0.475098,1.015133 -0.475098,1.794434 l 0,4.327148 -1.257812,0 0,-7.65625 1.257812,0 0,1.148437 c 0.223309,-0.437502 0.526365,-0.769041 0.90918,-0.994628 0.382814,-0.225587 0.83626,-0.338379 1.360351,-0.338379 0.779301,0 1.361489,0.256345 1.746582,0.769043 0.385093,0.512698 0.577637,1.288569 0.577637,2.327636 z m 3.807617,3.780274 0,3.875976 -1.264648,0 0,-10.568359 1.264648,0 0,0.977539 c 0.209637,-0.378257 0.488768,-0.666503 0.837403,-0.864746 0.348634,-0.198243 0.750811,-0.297363 1.206543,-0.297363 0.925134,0 1.650876,0.357744 2.177246,1.073242 0.526369,0.715498 0.78955,1.706699 0.78955,2.973633 0,1.244147 -0.26432,2.220536 -0.792968,2.929199 -0.528649,0.708662 -1.253251,1.062988 -2.173828,1.062988 -0.464846,0 -0.871581,-0.09912 -1.220215,-0.297363 -0.348635,-0.198243 -0.623209,-0.486489 -0.823731,-0.864746 z m 3.691407,-2.857422 c 0,-0.975265 -0.153807,-1.711261 -0.461426,-2.208008 -0.307619,-0.496747 -0.764483,-0.745117 -1.370606,-0.745117 -0.61068,0 -1.07324,0.249509 -1.387695,0.748535 -0.314455,0.499026 -0.47168,1.233882 -0.47168,2.20459 0,0.966151 0.157225,1.699867 0.47168,2.201172 0.314455,0.501304 0.777015,0.751953 1.387695,0.751953 0.606123,0 1.062987,-0.24837 1.370606,-0.745117 0.307619,-0.496747 0.461426,-1.232743 0.461426,-2.208008 z m 6.794921,-3.055664 c 0.154949,-0.328127 0.35205,-0.5708 0.591309,-0.728027 0.239259,-0.157228 0.527505,-0.23584 0.864746,-0.23584 0.615238,0 1.049315,0.238116 1.302246,0.714355 0.252931,0.476239 0.379395,1.372878 0.379395,2.689942 l 0,4.436523 -1.148438,0 0,-4.381836 c 0,-1.080083 -0.06038,-1.751138 -0.181152,-2.013184 -0.120769,-0.262045 -0.340656,-0.393066 -0.659668,-0.393066 -0.364585,0 -0.614094,0.140135 -0.748535,0.42041 -0.134441,0.280275 -0.20166,0.942215 -0.20166,1.98584 l 0,4.381836 -1.148438,0 0,-4.381836 c 0,-1.093755 -0.06494,-1.768228 -0.194824,-2.023437 -0.129884,-0.25521 -0.363442,-0.382813 -0.700684,-0.382813 -0.332684,0 -0.563964,0.140135 -0.693847,0.42041 -0.129884,0.280275 -0.194825,0.942215 -0.194825,1.98584 l 0,4.381836 -1.141601,0 0,-7.65625 1.141601,0 0,0.65625 c 0.150392,-0.273439 0.338378,-0.481933 0.563965,-0.625488 0.225587,-0.143556 0.481932,-0.215332 0.769043,-0.215332 0.346356,0 0.634602,0.07975 0.864746,0.239257 0.230145,0.159506 0.409017,0.40104 0.536621,0.72461 z m 14.396485,-0.751953 3.219726,0 0,6.651367 2.495118,0 0,0.977539 -6.248047,0 0,-0.977539 2.495117,0 0,-5.673828 -1.961914,0 z m 1.961914,-2.973633 1.257812,0 0,1.585937 -1.257812,0 z m 11.491211,5.858398 0,4.744141 -1.264649,0 0,-4.744141 c 0,-0.688154 -0.120767,-1.194008 -0.362304,-1.517578 -0.241538,-0.323569 -0.619789,-0.485351 -1.134766,-0.485351 -0.587894,0 -1.0402,0.208494 -1.356934,0.625488 -0.316733,0.416994 -0.475097,1.015133 -0.475097,1.794434 l 0,4.327148 -1.257813,0 0,-7.65625 1.257813,0 0,1.148437 c 0.223308,-0.437502 0.526365,-0.769041 0.909179,-0.994628 0.382815,-0.225587 0.836261,-0.338379 1.360352,-0.338379 0.779301,0 1.361489,0.256345 1.746582,0.769043 0.385093,0.512698 0.577637,1.288569 0.577637,2.327636 z m 7.895512,-2.645507 0,1.230468 c -0.36003,-0.209636 -0.72233,-0.366861 -1.08692,-0.471679 -0.36458,-0.104819 -0.736,-0.157227 -1.11426,-0.157227 -0.56966,0 -0.99462,0.09228 -1.2749,0.276856 -0.28027,0.184571 -0.42041,0.465981 -0.42041,0.844238 0,0.341798 0.10482,0.597004 0.31445,0.765625 0.20964,0.16862 0.73145,0.332681 1.56543,0.492187 l 0.50586,0.0957 c 0.62436,0.118491 1.09717,0.355467 1.41846,0.710938 0.32129,0.355471 0.48193,0.818031 0.48193,1.387695 0,0.756514 -0.26887,1.347817 -0.80664,1.773926 -0.53776,0.426109 -1.28515,0.63916 -2.24218,0.63916 -0.37826,0 -0.77474,-0.03988 -1.18946,-0.119629 -0.41471,-0.07975 -0.8636,-0.19938 -1.34668,-0.358886 l 0,-1.298829 c 0.46941,0.241538 0.91829,0.422689 1.34668,0.543457 0.42839,0.120769 0.83399,0.181153 1.2168,0.181153 0.55599,0 0.98665,-0.112792 1.29199,-0.338379 0.30534,-0.225587 0.45801,-0.541177 0.45801,-0.946777 0,-0.583337 -0.55826,-0.986653 -1.6748,-1.209961 l -0.0547,-0.01367 -0.47168,-0.0957 c -0.72461,-0.141277 -1.25326,-0.379393 -1.58594,-0.714356 -0.33268,-0.334963 -0.49902,-0.791826 -0.49902,-1.370605 0,-0.733728 0.24837,-1.299966 0.74511,-1.698731 0.49675,-0.398765 1.2054,-0.598144 2.12598,-0.598144 0.41016,0 0.80436,0.0376 1.18262,0.112793 0.37825,0.07519 0.74967,0.187987 1.11426,0.338379 l 0,0 z m 5.97461,-2.44043 0,2.173828 2.85742,0 0,0.977539 -2.85742,0 0,4.15625 c 0,0.565107 0.10709,0.959309 0.32128,1.182617 0.2142,0.223309 0.58789,0.334961 1.1211,0.334961 l 1.41504,0 0,1.004883 -1.53809,0 c -0.94336,0 -1.60872,-0.189126 -1.99609,-0.567383 -0.38738,-0.378257 -0.58106,-1.029943 -0.58106,-1.955078 l 0,-4.15625 -2.04394,0 0,-0.977539 2.04394,0 0,-2.173828 z m 9.03027,5.981445 -0.41699,0 c -0.73373,0 -1.2863,0.128742 -1.65772,0.386231 -0.37142,0.257488 -0.55713,0.641436 -0.55713,1.151855 0,0.460289 0.139,0.818033 0.417,1.073242 0.27799,0.25521 0.66308,0.382813 1.15527,0.382813 0.69271,0 1.2373,-0.240395 1.63379,-0.721192 0.39648,-0.480796 0.597,-1.145015 0.60156,-1.992675 l 0,-0.280274 z m 2.44043,-0.519531 0,4.368164 -1.26465,0 0,-1.134766 c -0.26888,0.455732 -0.60726,0.791829 -1.01514,1.008301 -0.40788,0.216473 -0.90348,0.324707 -1.48681,0.324707 -0.7793,0 -1.40137,-0.219887 -1.86621,-0.659668 -0.46485,-0.439781 -0.69727,-1.028805 -0.69727,-1.76709 0,-0.852217 0.28597,-1.499346 0.85791,-1.941406 0.57194,-0.442059 1.41162,-0.663086 2.51904,-0.663086 l 1.68848,0 0,-0.198242 c -0.005,-0.61068 -0.1595,-1.053872 -0.46484,-1.32959 -0.30534,-0.275717 -0.79297,-0.413574 -1.4629,-0.413574 -0.42838,0 -0.86132,0.06152 -1.29882,0.18457 -0.4375,0.123048 -0.86361,0.303059 -1.27832,0.540039 l 0,-1.257812 c 0.46484,-0.177736 0.91031,-0.311035 1.33642,-0.399903 0.42611,-0.08887 0.83968,-0.1333 1.24072,-0.1333 0.63347,0 1.17465,0.09342 1.62354,0.280273 0.4489,0.18685 0.81234,0.467121 1.09033,0.84082 0.17318,0.227866 0.29623,0.509276 0.36914,0.844239 0.0729,0.334962 0.10938,0.837399 0.10938,1.507324 z m 6.10449,1.599609 c 0,0.565107 0.10368,0.99121 0.31103,1.278321 0.20736,0.28711 0.51384,0.430664 0.91944,0.430664 l 1.46973,0 0,1.05957 -1.59278,0 c -0.75196,0 -1.33414,-0.240395 -1.74658,-0.721191 -0.41244,-0.480797 -0.61865,-1.163245 -0.61865,-2.047364 l 0,-6.924804 -2.0166,0 0,-0.984375 3.27441,0 z m 8.42871,0 c 0,0.565107 0.10368,0.99121 0.31104,1.278321 0.20735,0.28711 0.51383,0.430664 0.91943,0.430664 l 1.46973,0 0,1.05957 -1.59278,0 c -0.75195,0 -1.33414,-0.240395 -1.74658,-0.721191 -0.41244,-0.480797 -0.61865,-1.163245 -0.61865,-2.047364 l 0,-6.924804 -2.0166,0 0,-0.984375 3.27441,0 z m 12.63965,-2.180664 7.24609,0 0,1.155274 -7.24609,0 z m 13.59668,1.059571 c 0,-0.943364 -0.15381,-1.659991 -0.46143,-2.149903 -0.30762,-0.489911 -0.75537,-0.734863 -1.34326,-0.734863 -0.61524,0 -1.08463,0.244952 -1.4082,0.734863 -0.32357,0.489912 -0.48535,1.206539 -0.48535,2.149903 0,0.943364 0.16292,1.662269 0.48877,2.156738 0.32584,0.494469 0.79866,0.741699 1.41845,0.741699 0.57878,0 1.02197,-0.24837 1.32959,-0.745117 0.30762,-0.496747 0.46143,-1.214514 0.46143,-2.15332 z m 1.25781,3.39746 c 0,1.148444 -0.27115,2.018878 -0.81348,2.611329 -0.54232,0.59245 -1.33983,0.888671 -2.39257,0.888671 -0.34636,0 -0.70866,-0.0319 -1.08692,-0.0957 -0.37825,-0.0638 -0.75651,-0.157226 -1.13476,-0.280273 l 0,-1.244141 c 0.44661,0.209637 0.85221,0.364583 1.21679,0.464844 0.36459,0.100261 0.69955,0.150391 1.00489,0.150391 0.67904,0 1.1735,-0.184569 1.4834,-0.553711 0.30989,-0.369143 0.46484,-0.954749 0.46484,-1.756836 l 0,-0.05469 0,-0.854492 c -0.20052,0.428388 -0.47396,0.747395 -0.82031,0.957031 -0.34636,0.209637 -0.7679,0.314453 -1.26465,0.314453 -0.89323,0 -1.60644,-0.357743 -2.13965,-1.073242 -0.53321,-0.715498 -0.79981,-1.67252 -0.79981,-2.871093 0,-1.203132 0.2666,-2.162432 0.79981,-2.87793 0.53321,-0.715498 1.24642,-1.073242 2.13965,-1.073242 0.49219,0 0.90918,0.09798 1.25097,0.293945 0.3418,0.195965 0.6198,0.499021 0.83399,0.90918 l 0,-0.991211 1.25781,0 z m -141.380858,25.922848 0,-1.244137 7.225586,2.857417 0,1.13477 -7.225586,2.85742 0,-1.25097 5.810547,-2.167 z m 31.869141,1.8252 0,4.74414 -1.264648,0 0,-4.74414 c 0,-0.68815 -0.120767,-1.19401 -0.362305,-1.51758 -0.241538,-0.32357 -0.619789,-0.48535 -1.134766,-0.48535 -0.587893,0 -1.0402,0.20849 -1.356933,0.62549 -0.316734,0.41699 -0.475098,1.01513 -0.475098,1.79443 l 0,4.32715 -1.257812,0 0,-7.65625 1.257812,0 0,1.14844 c 0.223309,-0.4375 0.526365,-0.769044 0.90918,-0.994631 0.382814,-0.225587 0.83626,-0.338379 1.360351,-0.338379 0.779301,0 1.361489,0.256345 1.746582,0.769043 0.385093,0.512697 0.577637,1.288567 0.577637,2.327637 z m 7.109375,0.85449 c 0,-0.94336 -0.153807,-1.65999 -0.461426,-2.1499 -0.307618,-0.48991 -0.755368,-0.73486 -1.343261,-0.73486 -0.615238,0 -1.084634,0.24495 -1.408204,0.73486 -0.323569,0.48991 -0.485351,1.20654 -0.485351,2.1499 0,0.94337 0.162922,1.66227 0.48877,2.15674 0.325847,0.49447 0.798662,0.7417 1.418456,0.7417 0.578779,0 1.021972,-0.24837 1.32959,-0.74512 0.307619,-0.49674 0.461426,-1.21451 0.461426,-2.15332 z m 1.257813,3.39746 c 0,1.14845 -0.271157,2.01888 -0.813477,2.61133 -0.54232,0.59245 -1.339838,0.88867 -2.392578,0.88867 -0.346356,0 -0.708657,-0.0319 -1.086914,-0.0957 -0.378257,-0.0638 -0.756509,-0.15723 -1.134766,-0.28027 l 0,-1.24415 c 0.446617,0.20964 0.852212,0.36459 1.216797,0.46485 0.364585,0.10026 0.699543,0.15039 1.004883,0.15039 0.67904,0 1.173501,-0.18457 1.483398,-0.55371 0.309898,-0.36914 0.464844,-0.95475 0.464844,-1.75684 l 0,-0.0547 0,-0.85449 c -0.200522,0.42839 -0.473957,0.7474 -0.820312,0.95703 -0.346356,0.20964 -0.767902,0.31446 -1.264649,0.31446 -0.893233,0 -1.606443,-0.35775 -2.139648,-1.07325 -0.533206,-0.71549 -0.799805,-1.67251 -0.799805,-2.87109 0,-1.20313 0.266599,-2.16243 0.799805,-2.87793 0.533205,-0.715496 1.246415,-1.07324 2.139648,-1.07324 0.49219,0 0.909178,0.09798 1.250977,0.293945 0.341798,0.195965 0.61979,0.499021 0.833984,0.909185 l 0,-0.991216 1.257813,0 0,7.136716 z m 16.918945,-4.25195 0,4.74414 -1.264649,0 0,-4.74414 c 0,-0.68815 -0.120767,-1.19401 -0.362304,-1.51758 -0.241538,-0.32357 -0.619789,-0.48535 -1.134766,-0.48535 -0.587893,0 -1.0402,0.20849 -1.356933,0.62549 -0.316734,0.41699 -0.475098,1.01513 -0.475098,1.79443 l 0,4.32715 -1.257813,0 0,-7.65625 1.257813,0 0,1.14844 c 0.223308,-0.4375 0.526365,-0.769044 0.90918,-0.994631 0.382814,-0.225587 0.83626,-0.338379 1.360351,-0.338379 0.779301,0 1.361489,0.256345 1.746582,0.769043 0.385093,0.512697 0.577637,1.288567 0.577637,2.327637 z m 8.900391,0.28711 0,0.61523 -5.448243,0 0,0.041 c -0.03646,1.04362 0.162921,1.79329 0.598145,2.24902 0.435223,0.45573 1.049312,0.6836 1.842285,0.6836 0.401044,0 0.82031,-0.0638 1.257813,-0.19141 0.437502,-0.1276 0.90462,-0.32129 1.401367,-0.58105 l 0,1.25097 c -0.478518,0.19597 -0.939939,0.34294 -1.384278,0.44092 -0.444338,0.098 -0.873858,0.14697 -1.288574,0.14697 -1.189459,0 -2.119137,-0.3566 -2.789062,-1.06982 -0.669926,-0.71322 -1.004883,-1.69645 -1.004883,-2.94971 0,-1.22136 0.328122,-2.19661 0.984375,-2.92578 0.656253,-0.729171 1.531244,-1.09375 2.625,-1.09375 0.975265,0 1.7443,0.3304 2.307129,0.99121 0.562828,0.66081 0.862467,1.45833 0.898926,2.39258 l 0,0 z m -1.257813,-0.36914 c -0.05469,-0.52865 -0.247231,-0.98551 -0.577637,-1.37061 -0.330405,-0.38509 -0.805498,-0.57763 -1.425293,-0.57763 -0.606122,0 -1.105141,0.20052 -1.49707,0.60156 -0.391929,0.40104 -0.606119,0.85221 -0.642578,1.35351 l 4.142578,-0.007 z m 2.030273,-2.83008 1.244141,0 1.333008,6.18652 1.09375,-3.95117 1.073242,0 1.107422,3.95117 1.333008,-6.18652 1.244142,0 L 99.067383,107 97.864258,107 96.640625,102.80273 95.423828,107 l -1.203125,0 z m 21.478513,0.7793 c 0.15495,-0.32813 0.35205,-0.570803 0.59131,-0.72803 0.23926,-0.157228 0.52751,-0.23584 0.86475,-0.23584 0.61524,0 1.04931,0.238116 1.30224,0.714355 0.25293,0.476235 0.3794,1.372875 0.3794,2.689945 l 0,4.43652 -1.14844,0 0,-4.38184 c 0,-1.08008 -0.0604,-1.75113 -0.18115,-2.01318 -0.12077,-0.26205 -0.34066,-0.39307 -0.65967,-0.39307 -0.36459,0 -0.61409,0.14014 -0.74854,0.42041 -0.13443,0.28028 -0.20166,0.94222 -0.20166,1.98584 l 0,4.38184 -1.14843,0 0,-4.38184 c 0,-1.09375 -0.0649,-1.76822 -0.19483,-2.02343 -0.12988,-0.25521 -0.36344,-0.38282 -0.70068,-0.38282 -0.33268,0 -0.56396,0.14014 -0.69385,0.42041 -0.12988,0.28028 -0.19482,0.94222 -0.19482,1.98584 l 0,4.38184 -1.1416,0 0,-7.65625 1.1416,0 0,0.65625 c 0.15039,-0.273439 0.33838,-0.481933 0.56396,-0.625488 0.22559,-0.143556 0.48193,-0.215332 0.76905,-0.215332 0.34635,0 0.6346,0.07975 0.86474,0.239257 0.23015,0.159506 0.40902,0.40104 0.53662,0.724613 z m 9.67286,4.41601 c -0.20964,0.53321 -0.47624,1.23502 -0.79981,2.10547 -0.45117,1.20313 -0.75423,1.93685 -0.90918,2.20117 -0.20964,0.35547 -0.47168,0.62207 -0.78613,0.79981 -0.31446,0.17773 -0.68132,0.2666 -1.10059,0.2666 l -1.01172,0 0,-1.05273 0.74512,0 c 0.36914,0 0.65853,-0.1071 0.86816,-0.32129 0.20964,-0.2142 0.47624,-0.7679 0.79981,-1.66114 l -2.95996,-7.5332 1.33301,0 2.26953,5.98828 2.23535,-5.98828 1.33301,0 z m 3.26074,-2.48828 7.24609,0 0,1.15528 -7.24609,0 z m 13.59668,-1.72949 0,-3.958009 1.25781,0 0,10.636719 -1.25781,0 0,-0.96387 c -0.20964,0.37826 -0.48877,0.66651 -0.83741,0.86475 -0.34863,0.19824 -0.75081,0.29736 -1.20654,0.29736 -0.92513,0 -1.65315,-0.35888 -2.18408,-1.07666 -0.53093,-0.71777 -0.79639,-1.70784 -0.79639,-2.97021 0,-1.24415 0.2666,-2.22054 0.79981,-2.9292 0.5332,-0.708664 1.26008,-1.06299 2.18066,-1.06299 0.46029,0 0.86588,0.09912 1.2168,0.297363 0.35091,0.198243 0.62662,0.486489 0.82715,0.864747 z m -3.69825,2.85742 c 0,0.97527 0.15495,1.71126 0.46485,2.20801 0.3099,0.49675 0.7679,0.74512 1.37402,0.74512 0.60612,0 1.06755,-0.25065 1.38428,-0.75196 0.31673,-0.5013 0.4751,-1.23502 0.4751,-2.20117 0,-0.97071 -0.15837,-1.70556 -0.4751,-2.20459 -0.31673,-0.49903 -0.77816,-0.74853 -1.38428,-0.74853 -0.60612,0 -1.06412,0.24837 -1.37402,0.74511 -0.3099,0.49675 -0.46485,1.23275 -0.46485,2.20801 z m 14.15723,-2.25586 c -0.26888,-0.20963 -0.54232,-0.3623 -0.82031,-0.45801 -0.278,-0.0957 -0.58333,-0.14355 -0.91602,-0.14355 -0.78386,0 -1.38313,0.24609 -1.79785,0.73828 -0.41471,0.49219 -0.62207,1.20312 -0.62207,2.13281 l 0,3.80762 -1.26465,0 0,-7.65625 1.26465,0 0,1.49707 c 0.20964,-0.54232 0.53206,-0.958169 0.96729,-1.247558 0.43522,-0.28939 0.95133,-0.434082 1.54834,-0.434082 0.30989,0 0.59928,0.03874 0.86816,0.116211 0.26888,0.07747 0.52637,0.198241 0.77246,0.362304 z m 8.18945,1.62012 0,0.61523 -5.44824,0 0,0.041 c -0.0365,1.04362 0.16292,1.79329 0.59815,2.24902 0.43522,0.45573 1.04931,0.6836 1.84228,0.6836 0.40104,0 0.82031,-0.0638 1.25781,-0.19141 0.43751,-0.1276 0.90462,-0.32129 1.40137,-0.58105 l 0,1.25097 c -0.47852,0.19597 -0.93994,0.34294 -1.38428,0.44092 -0.44433,0.098 -0.87386,0.14697 -1.28857,0.14697 -1.18946,0 -2.11914,-0.3566 -2.78906,-1.06982 -0.66993,-0.71322 -1.00489,-1.69645 -1.00489,-2.94971 0,-1.22136 0.32813,-2.19661 0.98438,-2.92578 0.65625,-0.729171 1.53124,-1.09375 2.625,-1.09375 0.97526,0 1.7443,0.3304 2.30713,0.99121 0.56283,0.66081 0.86247,1.45833 0.89892,2.39258 l 0,0 z m -1.25781,-0.36914 c -0.0547,-0.52865 -0.24723,-0.98551 -0.57764,-1.37061 -0.3304,-0.38509 -0.80549,-0.57763 -1.42529,-0.57763 -0.60612,0 -1.10514,0.20052 -1.49707,0.60156 -0.39193,0.40104 -0.60612,0.85221 -0.64258,1.35351 l 4.14258,-0.007 z m 6.8291,0.97754 -0.41699,0 c -0.73373,0 -1.28629,0.12874 -1.65771,0.38623 -0.37143,0.25749 -0.55713,0.64143 -0.55713,1.15185 0,0.46029 0.13899,0.81804 0.41699,1.07324 0.278,0.25522 0.66308,0.38282 1.15527,0.38282 0.69271,0 1.23731,-0.2404 1.63379,-0.72119 0.39649,-0.4808 0.59701,-1.14502 0.60156,-1.99268 l 0,-0.28027 z m 2.44043,-0.51953 0,4.36816 -1.26465,0 0,-1.13477 c -0.26888,0.45574 -0.60725,0.79183 -1.01513,1.00831 -0.40788,0.21647 -0.90348,0.3247 -1.48682,0.3247 -0.7793,0 -1.40136,-0.21989 -1.86621,-0.65967 -0.46485,-0.43978 -0.69727,-1.0288 -0.69727,-1.76709 0,-0.85221 0.28597,-1.49934 0.85791,-1.9414 0.57195,-0.44206 1.41162,-0.66309 2.51905,-0.66309 l 1.68847,0 0,-0.19824 c -0.005,-0.61068 -0.1595,-1.05387 -0.46484,-1.32959 -0.30534,-0.27572 -0.79297,-0.41357 -1.46289,-0.41357 -0.42839,0 -0.86133,0.0615 -1.29883,0.18457 -0.4375,0.12304 -0.8636,0.30306 -1.27832,0.54003 l 0,-1.257807 c 0.46485,-0.177736 0.91032,-0.311035 1.33643,-0.399903 0.42611,-0.08887 0.83968,-0.1333 1.24072,-0.1333 0.63347,0 1.17464,0.09342 1.62353,0.280273 0.4489,0.18685 0.81234,0.467121 1.09034,0.840817 0.17317,0.22787 0.29622,0.50928 0.36914,0.84424 0.0729,0.33496 0.10937,0.8374 0.10937,1.50733 z m 5.81055,-2.50879 c 0.15495,-0.32813 0.35205,-0.570803 0.59131,-0.72803 0.23926,-0.157228 0.5275,-0.23584 0.86474,-0.23584 0.61524,0 1.04932,0.238116 1.30225,0.714355 0.25293,0.476235 0.37939,1.372875 0.37939,2.689945 l 0,4.43652 -1.14843,0 0,-4.38184 c 0,-1.08008 -0.0604,-1.75113 -0.18116,-2.01318 -0.12076,-0.26205 -0.34065,-0.39307 -0.65966,-0.39307 -0.36459,0 -0.6141,0.14014 -0.74854,0.42041 -0.13444,0.28028 -0.20166,0.94222 -0.20166,1.98584 l 0,4.38184 -1.14844,0 0,-4.38184 c 0,-1.09375 -0.0649,-1.76822 -0.19482,-2.02343 -0.12988,-0.25521 -0.36344,-0.38282 -0.70068,-0.38282 -0.33269,0 -0.56397,0.14014 -0.69385,0.42041 -0.12989,0.28028 -0.19483,0.94222 -0.19483,1.98584 l 0,4.38184 -1.1416,0 0,-7.65625 1.1416,0 0,0.65625 c 0.1504,-0.273439 0.33838,-0.481933 0.56397,-0.625488 0.22559,-0.143556 0.48193,-0.215332 0.76904,-0.215332 0.34636,0 0.6346,0.07975 0.86475,0.239257 0.23014,0.159506 0.40901,0.40104 0.53662,0.724613 z m 4.50488,1.92773 7.2461,0 0,1.15528 -7.2461,0 z m 12.53028,1.10059 -0.417,0 c -0.73372,0 -1.28629,0.12874 -1.65771,0.38623 -0.37142,0.25749 -0.55713,0.64143 -0.55713,1.15185 0,0.46029 0.139,0.81804 0.41699,1.07324 0.278,0.25522 0.66309,0.38282 1.15528,0.38282 0.69271,0 1.2373,-0.2404 1.63378,-0.72119 0.39649,-0.4808 0.59701,-1.14502 0.60157,-1.99268 l 0,-0.28027 z m 2.44043,-0.51953 0,4.36816 -1.26465,0 0,-1.13477 c -0.26888,0.45574 -0.60726,0.79183 -1.01514,1.00831 -0.40788,0.21647 -0.90348,0.3247 -1.48682,0.3247 -0.7793,0 -1.40136,-0.21989 -1.86621,-0.65967 -0.46484,-0.43978 -0.69726,-1.0288 -0.69726,-1.76709 0,-0.85221 0.28596,-1.49934 0.85791,-1.9414 0.57194,-0.44206 1.41161,-0.66309 2.51904,-0.66309 l 1.68848,0 0,-0.19824 c -0.005,-0.61068 -0.15951,-1.05387 -0.46485,-1.32959 -0.30534,-0.27572 -0.79296,-0.41357 -1.46289,-0.41357 -0.42839,0 -0.86132,0.0615 -1.29883,0.18457 -0.4375,0.12304 -0.8636,0.30306 -1.27832,0.54003 l 0,-1.257807 c 0.46485,-0.177736 0.91032,-0.311035 1.33643,-0.399903 0.42611,-0.08887 0.83968,-0.1333 1.24072,-0.1333 0.63347,0 1.17464,0.09342 1.62354,0.280273 0.44889,0.18685 0.81233,0.467121 1.09033,0.840817 0.17318,0.22787 0.29622,0.50928 0.36914,0.84424 0.0729,0.33496 0.10938,0.8374 0.10938,1.50733 z m 3.75292,3.40429 0,3.87598 -1.26464,0 0,-10.56836 1.26464,0 0,0.97754 c 0.20964,-0.378258 0.48877,-0.666504 0.83741,-0.864747 0.34863,-0.198243 0.75081,-0.297363 1.20654,-0.297363 0.92513,0 1.65088,0.357744 2.17725,1.07324 0.52637,0.7155 0.78955,1.7067 0.78955,2.97364 0,1.24414 -0.26432,2.22053 -0.79297,2.92919 -0.52865,0.70867 -1.25325,1.06299 -2.17383,1.06299 -0.46485,0 -0.87158,-0.0991 -1.22021,-0.29736 -0.34864,-0.19824 -0.62321,-0.48649 -0.82374,-0.86475 z m 3.69141,-2.85742 c 0,-0.97526 -0.15381,-1.71126 -0.46142,-2.20801 -0.30762,-0.49674 -0.76449,-0.74511 -1.37061,-0.74511 -0.61068,0 -1.07324,0.2495 -1.3877,0.74853 -0.31445,0.49903 -0.47168,1.23388 -0.47168,2.20459 0,0.96615 0.15723,1.69987 0.47168,2.20117 0.31446,0.50131 0.77702,0.75196 1.3877,0.75196 0.60612,0 1.06299,-0.24837 1.37061,-0.74512 0.30761,-0.49675 0.46142,-1.23274 0.46142,-2.20801 z m 4.73731,2.85742 0,3.87598 -1.26465,0 0,-10.56836 1.26465,0 0,0.97754 c 0.20963,-0.378258 0.48876,-0.666504 0.8374,-0.864747 0.34863,-0.198243 0.75081,-0.297363 1.20654,-0.297363 0.92514,0 1.65088,0.357744 2.17725,1.07324 0.52637,0.7155 0.78955,1.7067 0.78955,2.97364 0,1.24414 -0.26432,2.22053 -0.79297,2.92919 -0.52865,0.70867 -1.25325,1.06299 -2.17383,1.06299 -0.46484,0 -0.87158,-0.0991 -1.22021,-0.29736 -0.34864,-0.19824 -0.62321,-0.48649 -0.82373,-0.86475 z m 3.6914,-2.85742 c 0,-0.97526 -0.15381,-1.71126 -0.46142,-2.20801 -0.30762,-0.49674 -0.76449,-0.74511 -1.37061,-0.74511 -0.61068,0 -1.07324,0.2495 -1.38769,0.74853 -0.31446,0.49903 -0.47168,1.23388 -0.47168,2.20459 0,0.96615 0.15722,1.69987 0.47168,2.20117 0.31445,0.50131 0.77701,0.75196 1.38769,0.75196 0.60612,0 1.06299,-0.24837 1.37061,-0.74512 0.30761,-0.49675 0.46142,-1.23274 0.46142,-2.20801 z m -182.656248,29.25195 0,-1.24414 7.225586,2.85742 0,1.13477 -7.225586,2.85742 0,-1.25097 5.810547,-2.167 z m 31.9375,6.17969 c -0.337241,0.19597 -0.684731,0.34294 -1.04248,0.44092 -0.357749,0.098 -0.723468,0.14697 -1.097168,0.14697 -1.184902,0 -2.111162,-0.35546 -2.778808,-1.0664 -0.667647,-0.71095 -1.001465,-1.69531 -1.001465,-2.95313 0,-1.25782 0.333818,-2.24218 1.001465,-2.95312 0.667646,-0.71095 1.593906,-1.06641 2.778808,-1.06641 0.369143,0 0.729165,0.0479 1.080078,0.14355 0.350913,0.0957 0.7041,0.24382 1.05957,0.44434 l 0,1.31934 c -0.332684,-0.29623 -0.666502,-0.51042 -1.001464,-0.64258 -0.334963,-0.13216 -0.714354,-0.19824 -1.138184,-0.19824 -0.788415,0 -1.394529,0.2552 -1.818359,0.76562 -0.423831,0.51042 -0.635743,1.23958 -0.635743,2.1875 0,0.94336 0.213052,1.67138 0.639161,2.18408 0.426109,0.5127 1.031083,0.76905 1.814941,0.76905 0.437502,0 0.829425,-0.0672 1.175781,-0.20166 0.346356,-0.13445 0.667642,-0.34294 0.963867,-0.62549 z m 7.041016,-6.28906 0,-3.95801 1.257813,0 0,10.63672 -1.257813,0 0,-0.96387 c -0.209636,0.37826 -0.488768,0.66651 -0.837402,0.86475 -0.348635,0.19824 -0.750812,0.29736 -1.206543,0.29736 -0.925135,0 -1.653155,-0.35888 -2.184082,-1.07666 -0.530927,-0.71778 -0.796387,-1.70784 -0.796387,-2.97021 0,-1.24415 0.266599,-2.22054 0.799805,-2.9292 0.533205,-0.70866 1.260086,-1.06299 2.180664,-1.06299 0.460289,0 0.865884,0.0991 1.216797,0.29736 0.350913,0.19825 0.626626,0.48649 0.827148,0.86475 z m -3.698242,2.85742 c 0,0.97527 0.154946,1.71126 0.464844,2.20801 0.309897,0.49675 0.7679,0.74512 1.374023,0.74512 0.606123,0 1.067544,-0.25065 1.384277,-0.75196 0.316734,-0.5013 0.475098,-1.23502 0.475098,-2.20117 0,-0.97071 -0.158364,-1.70556 -0.475098,-2.20459 -0.316733,-0.49903 -0.778154,-0.74853 -1.384277,-0.74853 -0.606123,0 -1.064126,0.24837 -1.374023,0.74511 -0.309898,0.49675 -0.464844,1.23275 -0.464844,2.20801 z m 19.311523,-3.05566 c 0.154949,-0.32813 0.35205,-0.5708 0.591309,-0.72803 0.239259,-0.15723 0.527505,-0.23584 0.864746,-0.23584 0.615237,0 1.049315,0.23812 1.302246,0.71435 0.252931,0.47624 0.379395,1.37288 0.379395,2.68995 l 0,4.43652 -1.148438,0 0,-4.38184 c 0,-1.08008 -0.06038,-1.75113 -0.181152,-2.01318 -0.120769,-0.26205 -0.340656,-0.39307 -0.659668,-0.39307 -0.364585,0 -0.614094,0.14014 -0.748535,0.42041 -0.134441,0.28028 -0.20166,0.94222 -0.20166,1.98584 l 0,4.38184 -1.148438,0 0,-4.38184 c 0,-1.09375 -0.06494,-1.76822 -0.194824,-2.02343 -0.129884,-0.25521 -0.363442,-0.38282 -0.700684,-0.38282 -0.332684,0 -0.563964,0.14014 -0.693847,0.42041 -0.129884,0.28028 -0.194825,0.94222 -0.194825,1.98584 l 0,4.38184 -1.141601,0 0,-7.65625 1.141601,0 0,0.65625 c 0.150392,-0.27344 0.338378,-0.48193 0.563965,-0.62549 0.225587,-0.14355 0.481932,-0.21533 0.769043,-0.21533 0.346356,0 0.634602,0.0798 0.864746,0.23926 0.230145,0.1595 0.409017,0.40104 0.536621,0.72461 z m 9.672852,4.41601 c -0.209636,0.53321 -0.476235,1.23502 -0.799805,2.10547 -0.451174,1.20313 -0.754231,1.93685 -0.909179,2.20117 -0.209637,0.35547 -0.471679,0.62207 -0.786133,0.79981 -0.314455,0.17773 -0.681313,0.2666 -1.100586,0.2666 l -1.011719,0 0,-1.05274 0.745117,0 c 0.369143,0 0.658528,-0.10709 0.868164,-0.32128 0.209637,-0.2142 0.476236,-0.7679 0.799805,-1.66114 l -2.959961,-7.5332 1.333008,0 2.269531,5.98828 2.235352,-5.98828 1.333007,0 z m 3.260742,-2.48828 7.246097,0 0,1.15527 -7.246097,0 z m 13.596677,-1.72949 0,-3.95801 1.25781,0 0,10.63672 -1.25781,0 0,-0.96387 c -0.20963,0.37826 -0.48876,0.66651 -0.8374,0.86475 -0.34863,0.19824 -0.75081,0.29736 -1.20654,0.29736 -0.92514,0 -1.65316,-0.35888 -2.18409,-1.07666 -0.53092,-0.71778 -0.79638,-1.70784 -0.79638,-2.97021 0,-1.24415 0.2666,-2.22054 0.7998,-2.9292 0.53321,-0.70866 1.26009,-1.06299 2.18067,-1.06299 0.46029,0 0.86588,0.0991 1.21679,0.29736 0.35092,0.19825 0.62663,0.48649 0.82715,0.86475 z m -3.69824,2.85742 c 0,0.97527 0.15495,1.71126 0.46484,2.20801 0.3099,0.49675 0.7679,0.74512 1.37403,0.74512 0.60612,0 1.06754,-0.25065 1.38428,-0.75196 0.31673,-0.5013 0.47509,-1.23502 0.47509,-2.20117 0,-0.97071 -0.15836,-1.70556 -0.47509,-2.20459 -0.31674,-0.49903 -0.77816,-0.74853 -1.38428,-0.74853 -0.60613,0 -1.06413,0.24837 -1.37403,0.74511 -0.30989,0.49675 -0.46484,1.23275 -0.46484,2.20801 z m 14.15723,-2.25586 c -0.26888,-0.20964 -0.54232,-0.3623 -0.82031,-0.45801 -0.278,-0.0957 -0.58334,-0.14355 -0.91602,-0.14355 -0.78386,0 -1.38314,0.24609 -1.79785,0.73828 -0.41472,0.49219 -0.62207,1.20312 -0.62207,2.13281 l 0,3.80762 -1.26465,0 0,-7.65625 1.26465,0 0,1.49707 c 0.20963,-0.54232 0.53206,-0.95817 0.96728,-1.24756 0.43523,-0.28939 0.95133,-0.43408 1.54834,-0.43408 0.3099,0 0.59928,0.0387 0.86817,0.11621 0.26888,0.0775 0.52636,0.19824 0.77246,0.3623 z m 8.18945,1.62012 0,0.61523 -5.44824,0 0,0.041 c -0.0365,1.04362 0.16292,1.79329 0.59814,2.24902 0.43523,0.45573 1.04932,0.6836 1.84229,0.6836 0.40104,0 0.82031,-0.0638 1.25781,-0.19141 0.4375,-0.12761 0.90462,-0.32129 1.40137,-0.58106 l 0,1.25098 c -0.47852,0.19597 -0.93994,0.34294 -1.38428,0.44092 -0.44434,0.098 -0.87386,0.14697 -1.28857,0.14697 -1.18946,0 -2.11914,-0.3566 -2.78907,-1.06982 -0.66992,-0.71322 -1.00488,-1.69645 -1.00488,-2.94971 0,-1.22136 0.32812,-2.19661 0.98438,-2.92578 0.65625,-0.72917 1.53124,-1.09375 2.625,-1.09375 0.97526,0 1.7443,0.3304 2.30713,0.99121 0.56282,0.66081 0.86246,1.45833 0.89892,2.39258 l 0,0 z m -1.25781,-0.36914 c -0.0547,-0.52865 -0.24723,-0.98551 -0.57764,-1.37061 -0.3304,-0.38509 -0.8055,-0.57763 -1.42529,-0.57763 -0.60612,0 -1.10514,0.20051 -1.49707,0.60156 -0.39193,0.40104 -0.60612,0.85221 -0.64258,1.35351 l 4.14258,-0.007 z m 6.8291,0.97754 -0.41699,0 c -0.73373,0 -1.2863,0.12874 -1.65772,0.38623 -0.37142,0.25749 -0.55713,0.64143 -0.55713,1.15185 0,0.46029 0.139,0.81804 0.417,1.07324 0.27799,0.25522 0.66308,0.38282 1.15527,0.38282 0.69271,0 1.2373,-0.2404 1.63379,-0.72119 0.39648,-0.4808 0.597,-1.14502 0.60156,-1.99268 l 0,-0.28027 z m 2.44043,-0.51953 0,4.36816 -1.26465,0 0,-1.13477 c -0.26888,0.45574 -0.60726,0.79183 -1.01514,1.0083 -0.40788,0.21648 -0.90348,0.32471 -1.48681,0.32471 -0.7793,0 -1.40137,-0.21989 -1.86621,-0.65967 -0.46485,-0.43978 -0.69727,-1.0288 -0.69727,-1.76709 0,-0.85221 0.28597,-1.49934 0.85791,-1.9414 0.57194,-0.44206 1.41162,-0.66309 2.51904,-0.66309 l 1.68848,0 0,-0.19824 c -0.005,-0.61068 -0.1595,-1.05387 -0.46484,-1.32959 -0.30534,-0.27572 -0.79297,-0.41357 -1.46289,-0.41357 -0.42839,0 -0.86133,0.0615 -1.29883,0.18457 -0.4375,0.12304 -0.86361,0.30305 -1.27832,0.54003 l 0,-1.25781 c 0.46484,-0.17773 0.91031,-0.31103 1.33642,-0.3999 0.42611,-0.0889 0.83968,-0.1333 1.24073,-0.1333 0.63346,0 1.17464,0.0934 1.62353,0.28027 0.4489,0.18685 0.81234,0.46712 1.09033,0.84082 0.17318,0.22787 0.29623,0.50928 0.36914,0.84424 0.0729,0.33496 0.10938,0.8374 0.10938,1.50733 z m 5.81055,-2.50879 c 0.15494,-0.32813 0.35205,-0.5708 0.5913,-0.72803 0.23926,-0.15723 0.52751,-0.23584 0.86475,-0.23584 0.61524,0 1.04932,0.23812 1.30225,0.71435 0.25293,0.47624 0.37939,1.37288 0.37939,2.68995 l 0,4.43652 -1.14844,0 0,-4.38184 c 0,-1.08008 -0.0604,-1.75113 -0.18115,-2.01318 -0.12077,-0.26205 -0.34066,-0.39307 -0.65967,-0.39307 -0.36458,0 -0.61409,0.14014 -0.74853,0.42041 -0.13444,0.28028 -0.20166,0.94222 -0.20166,1.98584 l 0,4.38184 -1.14844,0 0,-4.38184 c 0,-1.09375 -0.0649,-1.76822 -0.19482,-2.02343 -0.12989,-0.25521 -0.36345,-0.38282 -0.70069,-0.38282 -0.33268,0 -0.56396,0.14014 -0.69385,0.42041 -0.12988,0.28028 -0.19482,0.94222 -0.19482,1.98584 l 0,4.38184 -1.1416,0 0,-7.65625 1.1416,0 0,0.65625 c 0.15039,-0.27344 0.33838,-0.48193 0.56397,-0.62549 0.22558,-0.14355 0.48193,-0.21533 0.76904,-0.21533 0.34636,0 0.6346,0.0798 0.86474,0.23926 0.23015,0.1595 0.40902,0.40104 0.53663,0.72461 z m 4.50488,1.92773 7.24609,0 0,1.15527 -7.24609,0 z m 12.53027,1.10059 -0.41699,0 c -0.73373,0 -1.28629,0.12874 -1.65772,0.38623 -0.37142,0.25749 -0.55712,0.64143 -0.55712,1.15185 0,0.46029 0.13899,0.81804 0.41699,1.07324 0.27799,0.25522 0.66308,0.38282 1.15527,0.38282 0.69271,0 1.2373,-0.2404 1.63379,-0.72119 0.39649,-0.4808 0.59701,-1.14502 0.60156,-1.99268 l 0,-0.28027 z m 2.44043,-0.51953 0,4.36816 -1.26465,0 0,-1.13477 c -0.26888,0.45574 -0.60725,0.79183 -1.01513,1.0083 -0.40788,0.21648 -0.90348,0.32471 -1.48682,0.32471 -0.7793,0 -1.40137,-0.21989 -1.86621,-0.65967 -0.46485,-0.43978 -0.69727,-1.0288 -0.69727,-1.76709 0,-0.85221 0.28597,-1.49934 0.85791,-1.9414 0.57195,-0.44206 1.41162,-0.66309 2.51905,-0.66309 l 1.68847,0 0,-0.19824 c -0.005,-0.61068 -0.1595,-1.05387 -0.46484,-1.32959 -0.30534,-0.27572 -0.79297,-0.41357 -1.46289,-0.41357 -0.42839,0 -0.86133,0.0615 -1.29883,0.18457 -0.4375,0.12304 -0.8636,0.30305 -1.27832,0.54003 l 0,-1.25781 c 0.46485,-0.17773 0.91032,-0.31103 1.33643,-0.3999 0.4261,-0.0889 0.83967,-0.1333 1.24072,-0.1333 0.63347,0 1.17464,0.0934 1.62353,0.28027 0.4489,0.18685 0.81234,0.46712 1.09034,0.84082 0.17317,0.22787 0.29622,0.50928 0.36914,0.84424 0.0729,0.33496 0.10937,0.8374 0.10937,1.50733 z m 3.75293,3.40429 0,3.87598 -1.26465,0 0,-10.56836 1.26465,0 0,0.97754 c 0.20964,-0.37826 0.48877,-0.6665 0.8374,-0.86475 0.34864,-0.19824 0.75081,-0.29736 1.20655,-0.29736 0.92513,0 1.65087,0.35774 2.17724,1.07324 0.52637,0.7155 0.78955,1.7067 0.78955,2.97363 0,1.24415 -0.26432,2.22054 -0.79297,2.9292 -0.52864,0.70867 -1.25325,1.06299 -2.17382,1.06299 -0.46485,0 -0.87158,-0.0991 -1.22022,-0.29736 -0.34863,-0.19824 -0.62321,-0.48649 -0.82373,-0.86475 z m 3.69141,-2.85742 c 0,-0.97526 -0.15381,-1.71126 -0.46143,-2.20801 -0.30762,-0.49674 -0.76448,-0.74511 -1.3706,-0.74511 -0.61068,0 -1.07324,0.2495 -1.3877,0.74853 -0.31445,0.49903 -0.47168,1.23388 -0.47168,2.20459 0,0.96615 0.15723,1.69987 0.47168,2.20117 0.31446,0.50131 0.77702,0.75196 1.3877,0.75196 0.60612,0 1.06298,-0.24837 1.3706,-0.74512 0.30762,-0.49675 0.46143,-1.23274 0.46143,-2.20801 z m 4.7373,2.85742 0,3.87598 -1.26465,0 0,-10.56836 1.26465,0 0,0.97754 c 0.20964,-0.37826 0.48877,-0.6665 0.8374,-0.86475 0.34864,-0.19824 0.75082,-0.29736 1.20655,-0.29736 0.92513,0 1.65087,0.35774 2.17724,1.07324 0.52637,0.7155 0.78955,1.7067 0.78955,2.97363 0,1.24415 -0.26432,2.22054 -0.79296,2.9292 -0.52865,0.70867 -1.25326,1.06299 -2.17383,1.06299 -0.46485,0 -0.87158,-0.0991 -1.22022,-0.29736 -0.34863,-0.19824 -0.62321,-0.48649 -0.82373,-0.86475 z m 3.69141,-2.85742 c 0,-0.97526 -0.15381,-1.71126 -0.46143,-2.20801 -0.30762,-0.49674 -0.76448,-0.74511 -1.3706,-0.74511 -0.61068,0 -1.07324,0.2495 -1.3877,0.74853 -0.31445,0.49903 -0.47168,1.23388 -0.47168,2.20459 0,0.96615 0.15723,1.69987 0.47168,2.20117 0.31446,0.50131 0.77702,0.75196 1.3877,0.75196 0.60612,0 1.06298,-0.24837 1.3706,-0.74512 0.30762,-0.49675 0.46143,-1.23274 0.46143,-2.20801 z m -148.941408,29.25195 0,-1.24414 7.225586,2.85742 0,1.13477 -7.225586,2.85742 0,-1.25097 5.810547,-2.167 z m 31.869141,1.8252 0,4.74414 -1.264648,0 0,-4.74414 c 0,-0.68816 -0.120767,-1.19401 -0.362305,-1.51758 -0.241538,-0.32357 -0.619789,-0.48535 -1.134766,-0.48535 -0.587893,0 -1.0402,0.20849 -1.356933,0.62549 -0.316734,0.41699 -0.475098,1.01513 -0.475098,1.79443 l 0,4.32715 -1.257812,0 0,-7.65625 1.257812,0 0,1.14844 c 0.223309,-0.43751 0.526365,-0.76904 0.90918,-0.99463 0.382814,-0.22559 0.83626,-0.33838 1.360351,-0.33838 0.779301,0 1.361489,0.25634 1.746582,0.76904 0.385093,0.5127 0.577637,1.28857 0.577637,2.32764 z m 7.109375,0.85449 c 0,-0.94336 -0.153807,-1.65999 -0.461426,-2.1499 -0.307618,-0.48991 -0.755368,-0.73486 -1.343261,-0.73486 -0.615238,0 -1.084634,0.24495 -1.408204,0.73486 -0.323569,0.48991 -0.485351,1.20654 -0.485351,2.1499 0,0.94337 0.162922,1.66227 0.48877,2.15674 0.325847,0.49447 0.798662,0.7417 1.418456,0.7417 0.578779,0 1.021972,-0.24837 1.32959,-0.74512 0.307619,-0.49675 0.461426,-1.21451 0.461426,-2.15332 z m 1.257813,3.39746 c 0,1.14845 -0.271157,2.01888 -0.813477,2.61133 -0.54232,0.59245 -1.339838,0.88867 -2.392578,0.88867 -0.346356,0 -0.708657,-0.0319 -1.086914,-0.0957 -0.378257,-0.0638 -0.756509,-0.15723 -1.134766,-0.28027 l 0,-1.24415 c 0.446617,0.20964 0.852212,0.36459 1.216797,0.46485 0.364585,0.10026 0.699543,0.15039 1.004883,0.15039 0.67904,0 1.173501,-0.18457 1.483398,-0.55371 0.309898,-0.36914 0.464844,-0.95475 0.464844,-1.75684 l 0,-0.0547 0,-0.85449 c -0.200522,0.42839 -0.473957,0.7474 -0.820312,0.95703 -0.346356,0.20964 -0.767902,0.31446 -1.264649,0.31446 -0.893233,0 -1.606443,-0.35775 -2.139648,-1.07325 -0.533206,-0.71549 -0.799805,-1.67252 -0.799805,-2.87109 0,-1.20313 0.266599,-2.16243 0.799805,-2.87793 0.533205,-0.7155 1.246415,-1.07324 2.139648,-1.07324 0.49219,0 0.909178,0.098 1.250977,0.29394 0.341798,0.19597 0.61979,0.49903 0.833984,0.90918 l 0,-0.99121 1.257813,0 0,7.13672 z m 16.385742,-6.89746 0,1.23047 c -0.360028,-0.20964 -0.722329,-0.36686 -1.086914,-0.47168 -0.364585,-0.10482 -0.736001,-0.15723 -1.114258,-0.15723 -0.569664,0 -0.994628,0.0923 -1.274902,0.27686 -0.280275,0.18457 -0.420411,0.46598 -0.420411,0.84424 0,0.3418 0.104817,0.597 0.314454,0.76562 0.209636,0.16862 0.731441,0.33268 1.565429,0.49219 l 0.50586,0.0957 c 0.624352,0.11849 1.097166,0.35547 1.418457,0.71094 0.32129,0.35547 0.481933,0.81803 0.481933,1.3877 0,0.75651 -0.268877,1.34781 -0.80664,1.77392 -0.537763,0.42611 -1.285152,0.63916 -2.242188,0.63916 -0.378257,0 -0.774737,-0.0399 -1.189453,-0.11963 -0.414716,-0.0797 -0.863604,-0.19938 -1.34668,-0.35888 l 0,-1.29883 c 0.469404,0.24154 0.918292,0.42269 1.34668,0.54345 0.428388,0.12077 0.833983,0.18116 1.216797,0.18116 0.555992,0 0.986652,-0.11279 1.291992,-0.33838 0.30534,-0.22559 0.458008,-0.54118 0.458008,-0.94678 0,-0.58334 -0.558263,-0.98665 -1.674805,-1.20996 l -0.05469,-0.0137 -0.47168,-0.0957 c -0.724613,-0.14128 -1.253254,-0.3794 -1.585938,-0.71436 -0.332684,-0.33496 -0.499023,-0.79183 -0.499023,-1.37061 0,-0.73372 0.24837,-1.29996 0.745117,-1.69873 0.496747,-0.39876 1.205399,-0.59814 2.125977,-0.59814 0.410158,0 0.80436,0.0376 1.182617,0.11279 0.378257,0.0752 0.749673,0.18799 1.114258,0.33838 l 0,0 z m 9.433594,2.93262 0,0.61523 -5.448243,0 0,0.041 c -0.03646,1.04362 0.162921,1.79329 0.598145,2.24902 0.435223,0.45573 1.049312,0.6836 1.842285,0.6836 0.401044,0 0.82031,-0.0638 1.257813,-0.19141 0.437502,-0.12761 0.90462,-0.32129 1.401367,-0.58106 l 0,1.25098 c -0.478518,0.19597 -0.939939,0.34294 -1.384278,0.44092 -0.444338,0.098 -0.873858,0.14697 -1.288574,0.14697 -1.189459,0 -2.119137,-0.3566 -2.789062,-1.06982 -0.669926,-0.71322 -1.004883,-1.69645 -1.004883,-2.94971 0,-1.22136 0.328122,-2.19661 0.984375,-2.92578 0.656253,-0.72917 1.531244,-1.09375 2.625,-1.09375 0.975265,0 1.7443,0.3304 2.307129,0.99121 0.562828,0.66081 0.862467,1.45833 0.898926,2.39258 l 0,0 z m -1.257813,-0.36914 c -0.05469,-0.52865 -0.247231,-0.98551 -0.577637,-1.37061 -0.330405,-0.38509 -0.805498,-0.57763 -1.425293,-0.57763 -0.606122,0 -1.105141,0.20051 -1.49707,0.60156 -0.391929,0.40104 -0.606119,0.85221 -0.642578,1.35351 l 4.142578,-0.007 z m 9.925776,-1.25098 c -0.26888,-0.20964 -0.542311,-0.3623 -0.820307,-0.45801 -0.277996,-0.0957 -0.583332,-0.14355 -0.916016,-0.14355 -0.783858,0 -1.383136,0.24609 -1.797851,0.73828 -0.414716,0.49219 -0.622071,1.20312 -0.622071,2.13281 l 0,3.80762 -1.264648,0 0,-7.65625 1.264648,0 0,1.49707 c 0.209637,-0.54232 0.532062,-0.95817 0.967285,-1.24756 0.435224,-0.28939 0.951332,-0.43408 1.54834,-0.43408 0.309898,0 0.599283,0.0387 0.868164,0.11621 0.268882,0.0775 0.526366,0.19824 0.772456,0.3623 z m 1.2168,-1.5791 1.30567,0 2.22168,6.42578 2.22851,-6.42578 1.30567,0 -2.72071,7.65625 -1.62012,0 z m 15.40137,3.19922 0,0.61523 -5.44824,0 0,0.041 c -0.0365,1.04362 0.16292,1.79329 0.59814,2.24902 0.43523,0.45573 1.04931,0.6836 1.84229,0.6836 0.40104,0 0.82031,-0.0638 1.25781,-0.19141 0.4375,-0.12761 0.90462,-0.32129 1.40137,-0.58106 l 0,1.25098 c -0.47852,0.19597 -0.93994,0.34294 -1.38428,0.44092 -0.44434,0.098 -0.87386,0.14697 -1.28857,0.14697 -1.18946,0 -2.11914,-0.3566 -2.78907,-1.06982 -0.66992,-0.71322 -1.00488,-1.69645 -1.00488,-2.94971 0,-1.22136 0.32812,-2.19661 0.98438,-2.92578 0.65625,-0.72917 1.53124,-1.09375 2.625,-1.09375 0.97526,0 1.7443,0.3304 2.30712,0.99121 0.56283,0.66081 0.86247,1.45833 0.89893,2.39258 l 0,0 z m -1.25781,-0.36914 c -0.0547,-0.52865 -0.24723,-0.98551 -0.57764,-1.37061 -0.3304,-0.38509 -0.8055,-0.57763 -1.42529,-0.57763 -0.60613,0 -1.10514,0.20051 -1.49707,0.60156 -0.39193,0.40104 -0.60612,0.85221 -0.64258,1.35351 l 4.14258,-0.007 z"
-     id="&gt;--npm-install--g-an"
-     inkscape:connector-curvature="0"
-     style="fill:#ffffff;stroke:none"
-     sodipodi:nodetypes="cccccccccccssssscccccsssccccccccssssssscccssssssscccssssccsssssccssssscccccssscccccccccccccccccccccssssscccccsssscccsssscccsssssccsssscccsssssccccccccscsccssscccccccssscsscccccccssssssccsssccsscccccscsccsssccccsscsccsssccccsccccccsssscssccssssccsscsccssssssccccscccccccccccssscscccccssscccsssssssccssssccsssscccssssssccccscccssscscccccsssccccccssccccssssssccccsssccccccccccccccccccssssccscscsccscscsccccccscccccccsccsscccccccccccccccccccsssssccccsssssssccccsssccccccssccccccssccccssssssccccsssccccscscssccccccccsssssccsscccssccccccssssccssscsccscscscccccsscccccccccssscssccccccccsssssccsscccssscccccccccccssssscccccscsssccccccccccssssscccccscscscccccccccccccssssscccsssssscccccccccssssssccccssssssscccssssccssscsccsssssccccccscccccccsccsccccccccccccccccccccssssscccccssscscccccssscccccsscccccccssscccssssssccccsssccccssscscccccccccsssssccssccccscccccccsssccscscsccscscscccccsscccccccccscscssccccccccsssssccssccccsccccccccccccssscsccccsscsssscccccccccsssssccccsscsssscccccccccccccssscscccccssscccsssssssccssssccsssscccssssscccccsccsscssccssssccccssscccssssccccccccssscccssssssccccssscccccssscccccsscccccccccccccccssscccssssssccccsssccc" />
-  <g
-     transform="translate(13.576271,-0.45254243)"
-     style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
-     id="flowRoot3048">
-    <path
-       d="m 169.75195,71.353902 c 0,-0.587886 -0.14584,-1.057287 -0.4375,-1.408203 -0.29167,-0.355463 -0.68132,-0.533197 -1.16894,-0.533203 -0.48764,6e-6 -0.87956,0.17774 -1.17578,0.533203 -0.29167,0.350916 -0.43751,0.820317 -0.4375,1.408203 -1e-5,0.592451 0.14583,1.066409 0.4375,1.421875 0.29622,0.350914 0.68814,0.526369 1.17578,0.526368 0.48762,10e-7 0.87727,-0.175454 1.16894,-0.526368 0.29166,-0.355466 0.4375,-0.829424 0.4375,-1.421875 m 0.95703,2.802735 -0.98437,0 0,-0.758789 c -0.16863,0.28711 -0.40333,0.508139 -0.7041,0.663086 -0.29623,0.154948 -0.63119,0.232422 -1.00489,0.232421 -0.73372,10e-7 -1.34212,-0.275715 -1.82519,-0.827148 -0.47852,-0.55143 -0.71778,-1.255531 -0.71777,-2.112305 -1e-5,-0.856766 0.23925,-1.560867 0.71777,-2.112304 0.48307,-0.551426 1.09147,-0.827142 1.82519,-0.827149 0.36458,7e-6 0.69954,0.07976 1.00489,0.239258 0.30533,0.159511 0.54003,0.378261 0.7041,0.65625 l 0,-0.430664 c -1e-5,-0.710931 -0.20053,-1.28287 -0.60156,-1.71582 -0.40105,-0.432935 -0.93197,-0.649406 -1.59278,-0.649414 -1.12109,8e-6 -2.01432,0.437508 -2.67968,1.3125 -0.66081,0.870449 -0.99122,2.050786 -0.99122,3.541015 0,1.499351 0.37598,2.693361 1.12793,3.582031 0.75195,0.888672 1.75228,1.333007 3.00098,1.333008 0.24609,-10e-7 0.49218,-0.02279 0.73828,-0.06836 0.24609,-0.04557 0.49902,-0.116212 0.75879,-0.211914 l 0.32813,0.922851 c -0.28712,0.113931 -0.57195,0.198241 -0.8545,0.25293 -0.278,0.05468 -0.54916,0.08203 -0.81347,0.08203 -1.62696,-2e-6 -2.91895,-0.530926 -3.87598,-1.592773 -0.95247,-1.061849 -1.42871,-2.495115 -1.42871,-4.299805 0,-1.777338 0.42839,-3.192376 1.28516,-4.245117 0.85677,-1.052725 2.0052,-1.579092 3.44531,-1.579102 0.95247,10e-6 1.71353,0.30307 2.2832,0.90918 0.56966,0.606128 0.85449,1.419604 0.85449,2.44043 l 0,5.263672"
-       style="font-size:14px;font-variant:normal;font-stretch:normal;letter-spacing:-0.22px;fill:#ffffff;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono"
-       id="path3023" />
-    <path
-       d="m 175.65695,71.230855 -0.41699,0 c -0.73373,4e-6 -1.28744,0.129887 -1.66113,0.389649 -0.36915,0.255211 -0.55372,0.638024 -0.55371,1.148437 -10e-6,0.460289 0.13899,0.818036 0.41699,1.073243 0.27799,0.255209 0.66308,0.382813 1.15527,0.382812 0.69271,10e-7 1.2373,-0.239257 1.63379,-0.717773 0.39648,-0.483071 0.597,-1.148435 0.60156,-1.996094 l 0,-0.280274 -1.17578,0 m 2.44043,-0.519531 0,4.368164 -1.26465,0 0,-1.134765 c -0.26888,0.455729 -0.6084,0.792969 -1.01855,1.011718 -0.4056,0.214193 -0.90007,0.321289 -1.4834,0.321289 -0.7793,0 -1.40137,-0.21875 -1.86621,-0.65625 -0.46484,-0.442056 -0.69727,-1.032225 -0.69727,-1.770507 0,-0.852211 0.28483,-1.499346 0.8545,-1.941407 0.57421,-0.442052 1.41503,-0.663081 2.52246,-0.663086 l 1.68847,0 0,-0.198242 c -0.005,-0.610671 -0.15951,-1.052728 -0.46484,-1.326172 -0.30534,-0.277988 -0.79297,-0.416985 -1.46289,-0.416992 -0.42839,7e-6 -0.86133,0.06153 -1.29883,0.184571 -0.4375,0.123053 -0.86361,0.303066 -1.27832,0.540039 l 0,-1.257813 c 0.46484,-0.177727 0.90918,-0.309888 1.33301,-0.396484 0.42838,-0.09114 0.84309,-0.136711 1.24414,-0.136719 0.63346,8e-6 1.1735,0.09343 1.62012,0.280273 0.45116,0.186857 0.81575,0.46713 1.09375,0.840821 0.17317,0.227871 0.29621,0.510423 0.36914,0.847656 0.0729,0.332688 0.10937,0.833989 0.10937,1.503906"
-       style="font-size:14px;font-variant:normal;font-stretch:normal;letter-spacing:-0.22px;fill:#ffffff;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono"
-       id="path3025" />
-    <path
-       d="m 186.24457,70.335348 0,4.74414 -1.26465,0 0,-4.74414 c 0,-0.688146 -0.12077,-1.194005 -0.3623,-1.517578 -0.24155,-0.323562 -0.6198,-0.485345 -1.13477,-0.485352 -0.58789,7e-6 -1.04134,0.209642 -1.36035,0.628906 -0.31446,0.414719 -0.47168,1.011724 -0.47168,1.791016 l 0,4.327148 -1.25781,0 0,-7.65625 1.25781,0 0,1.148438 c 0.2233,-0.437493 0.52636,-0.767897 0.90918,-0.991211 0.38281,-0.227857 0.83626,-0.341789 1.36035,-0.341797 0.77929,8e-6 1.36035,0.257495 1.74317,0.772461 0.38736,0.510423 0.58104,1.285162 0.58105,2.324219"
-       style="font-size:14px;font-variant:normal;font-stretch:normal;letter-spacing:-0.22px;fill:#ffffff;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono"
-       id="path3027" />
-    <path
-       d="m 193.12711,71.18984 c -10e-6,-0.943355 -0.15495,-1.658849 -0.46484,-2.146485 -0.30535,-0.492181 -0.75196,-0.738274 -1.33985,-0.738281 -0.61524,7e-6 -1.08464,0.2461 -1.4082,0.738281 -0.32357,0.487636 -0.48535,1.20313 -0.48535,2.146485 0,0.943362 0.16178,1.663414 0.48535,2.160156 0.32812,0.492189 0.80208,0.738282 1.42187,0.738281 0.57878,10e-7 1.02083,-0.248371 1.32618,-0.745117 0.30989,-0.496742 0.46483,-1.214515 0.46484,-2.15332 m 1.25781,3.397461 c -1e-5,1.148437 -0.27116,2.018878 -0.81347,2.611328 -0.54233,0.592445 -1.33985,0.888669 -2.39258,0.888672 -0.34636,-3e-6 -0.70866,-0.0319 -1.08692,-0.0957 -0.37825,-0.06381 -0.75651,-0.15723 -1.13476,-0.280274 l 0,-1.24414 c 0.44661,0.209633 0.85221,0.364581 1.21679,0.464843 0.36458,0.100259 0.69955,0.150389 1.00489,0.150391 0.67903,-2e-6 1.17349,-0.184572 1.4834,-0.553711 0.30989,-0.369142 0.46483,-0.954753 0.46484,-1.756836 l 0,-0.05469 0,-0.854493 c -0.20053,0.428387 -0.47396,0.747397 -0.82031,0.957032 -0.34636,0.209635 -0.76791,0.314453 -1.26465,0.314453 -0.89323,0 -1.60645,-0.357747 -2.13965,-1.073242 -0.5332,-0.715493 -0.79981,-1.672524 -0.7998,-2.871094 -1e-5,-1.20312 0.2666,-2.162429 0.7998,-2.87793 0.5332,-0.715487 1.24642,-1.073234 2.13965,-1.073242 0.49218,8e-6 0.90917,0.09799 1.25098,0.293945 0.34179,0.195971 0.61978,0.499031 0.83398,0.90918 l 0,-0.991211 1.25781,0 0,7.136719"
-       style="font-size:14px;font-variant:normal;font-stretch:normal;letter-spacing:-0.22px;fill:#ffffff;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono"
-       id="path3029" />
-    <path
-       d="m 196.79676,72.181051 0,-4.744141 1.25781,0 0,4.744141 c 0,0.688153 0.12076,1.194012 0.3623,1.517578 0.24609,0.323569 0.62435,0.485352 1.13477,0.485351 0.59244,10e-7 1.04589,-0.207355 1.36035,-0.62207 0.31445,-0.419269 0.47167,-1.018552 0.47168,-1.797851 l 0,-4.327149 1.26465,0 0,7.642578 -1.26465,0 0,-1.148437 c -0.22331,0.442058 -0.52865,0.777018 -0.91601,1.004883 -0.38282,0.227864 -0.83171,0.341796 -1.34668,0.341796 -0.78386,0 -1.36719,-0.255208 -1.75,-0.765625 -0.38282,-0.514972 -0.57422,-1.29199 -0.57422,-2.331054"
-       style="font-size:14px;font-variant:normal;font-stretch:normal;letter-spacing:-0.22px;fill:#ffffff;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono"
-       id="path3031" />
-    <path
-       d="m 208.03379,72.304098 c 0,0.565106 0.10254,0.991212 0.30762,1.27832 0.20963,0.287111 0.51725,0.430665 0.92285,0.430664 l 1.46973,0 0,1.066406 -1.59278,0 c -0.75196,0 -1.33529,-0.241536 -1.75,-0.724609 -0.41016,-0.483072 -0.61524,-1.166665 -0.61523,-2.050781 l 0,-6.952149 -2.0166,0 0,-0.984375 3.27441,0 0,7.936524"
-       style="font-size:14px;font-variant:normal;font-stretch:normal;letter-spacing:-0.22px;fill:#ffffff;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono"
-       id="path3033" />
-    <path
-       d="m 216.66633,71.230855 -0.41699,0 c -0.73373,4e-6 -1.28744,0.129887 -1.66114,0.389649 -0.36914,0.255211 -0.55371,0.638024 -0.55371,1.148437 0,0.460289 0.139,0.818036 0.41699,1.073243 0.278,0.255209 0.66309,0.382813 1.15528,0.382812 0.6927,10e-7 1.2373,-0.239257 1.63379,-0.717773 0.39648,-0.483071 0.597,-1.148435 0.60156,-1.996094 l 0,-0.280274 -1.17578,0 m 2.44043,-0.519531 0,4.368164 -1.26465,0 0,-1.134765 c -0.26889,0.455729 -0.6084,0.792969 -1.01856,1.011718 -0.4056,0.214193 -0.90006,0.321289 -1.48339,0.321289 -0.7793,0 -1.40137,-0.21875 -1.86621,-0.65625 -0.46485,-0.442056 -0.69727,-1.032225 -0.69727,-1.770507 0,-0.852211 0.28483,-1.499346 0.85449,-1.941407 0.57422,-0.442052 1.41504,-0.663081 2.52246,-0.663086 l 1.68848,0 0,-0.198242 c -0.005,-0.610671 -0.15951,-1.052728 -0.46484,-1.326172 -0.30535,-0.277988 -0.79298,-0.416985 -1.46289,-0.416992 -0.42839,7e-6 -0.86134,0.06153 -1.29883,0.184571 -0.43751,0.123053 -0.86361,0.303066 -1.27832,0.540039 l 0,-1.257813 c 0.46484,-0.177727 0.90917,-0.309888 1.333,-0.396484 0.42839,-0.09114 0.8431,-0.136711 1.24415,-0.136719 0.63345,8e-6 1.17349,0.09343 1.62011,0.280273 0.45117,0.186857 0.81575,0.46713 1.09375,0.840821 0.17317,0.227871 0.29622,0.510423 0.36914,0.847656 0.0729,0.332688 0.10937,0.833989 0.10938,1.503906"
-       style="font-size:14px;font-variant:normal;font-stretch:normal;letter-spacing:-0.22px;fill:#ffffff;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono"
-       id="path3035" />
-    <path
-       d="m 227.96488,69.00234 c -0.26889,-0.209629 -0.54232,-0.362298 -0.82031,-0.458008 -0.278,-0.0957 -0.58334,-0.143548 -0.91602,-0.143555 -0.78386,7e-6 -1.38314,0.246101 -1.79785,0.738282 -0.41472,0.492193 -0.62207,1.203129 -0.62207,2.132812 l 0,3.807617 -1.26465,0 0,-7.65625 1.26465,0 0,1.497071 c 0.20963,-0.542311 0.53092,-0.957025 0.96387,-1.244141 0.43749,-0.291659 0.95475,-0.437492 1.55176,-0.4375 0.30989,8e-6 0.59927,0.03874 0.86816,0.116211 0.26887,0.07748 0.52636,0.19825 0.77246,0.362305 l 0,1.285156"
-       style="font-size:14px;font-variant:normal;font-stretch:normal;letter-spacing:-0.22px;fill:#ffffff;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono"
-       id="path3037" />
-    <path
-       d="m 234.3484,64.873434 1.29882,0 -5.37304,11.504882 -1.30567,0 5.37989,-11.504882"
-       style="font-size:14px;font-variant:normal;font-stretch:normal;letter-spacing:-0.22px;fill:#ffffff;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono"
-       id="path3039" />
-    <path
-       d="m 243.72605,74.68984 c -0.33725,0.195964 -0.68588,0.341797 -1.0459,0.4375 -0.35547,0.10026 -0.72005,0.15039 -1.09375,0.15039 -1.1849,0 -2.1123,-0.355468 -2.78222,-1.066406 -0.66537,-0.710936 -0.99805,-1.69531 -0.99805,-2.953125 0,-1.257807 0.33268,-2.242181 0.99805,-2.953125 0.66992,-0.71093 1.59732,-1.066398 2.78222,-1.066406 0.36914,8e-6 0.72916,0.04786 1.08008,0.143555 0.35091,0.09571 0.7041,0.243822 1.05957,0.444336 l 0,1.319336 c -0.33269,-0.296218 -0.66765,-0.510411 -1.00488,-0.642579 -0.33269,-0.132154 -0.71094,-0.198235 -1.13477,-0.198242 -0.78841,7e-6 -1.39453,0.255215 -1.81836,0.765625 -0.42383,0.510422 -0.63574,1.239588 -0.63574,2.1875 0,0.943362 0.21191,1.672528 0.63574,2.1875 0.42839,0.510418 1.0345,0.765626 1.81836,0.765625 0.4375,10e-7 0.82942,-0.06608 1.17578,-0.198242 0.34635,-0.136718 0.66764,-0.346353 0.96387,-0.628906 l 0,1.305664"
-       style="font-size:14px;font-variant:normal;font-stretch:normal;letter-spacing:-0.22px;fill:#ffffff;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono"
-       id="path3041" />
-    <path
-       d="m 249.04317,72.304098 c -1e-5,0.565106 0.10253,0.991212 0.30761,1.27832 0.20963,0.287111 0.51725,0.430665 0.92286,0.430664 l 1.46972,0 0,1.066406 -1.59277,0 c -0.75196,0 -1.33529,-0.241536 -1.75,-0.724609 -0.41016,-0.483072 -0.61524,-1.166665 -0.61524,-2.050781 l 0,-6.952149 -2.0166,0 0,-0.984375 3.27442,0 0,7.936524"
-       style="font-size:14px;font-variant:normal;font-stretch:normal;letter-spacing:-0.22px;fill:#ffffff;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono"
-       id="path3043" />
-    <path
-       d="m 254.62688,67.423238 3.21972,0 0,6.678711 2.49512,0 0,0.977539 -6.24805,0 0,-0.977539 2.49512,0 0,-5.701172 -1.96191,0 0,-0.977539 m 1.96191,-2.980468 1.25781,0 0,1.592773 -1.25781,0 0,-1.592773"
-       style="font-size:14px;font-variant:normal;font-stretch:normal;letter-spacing:-0.22px;fill:#ffffff;font-family:Bitstream Vera Sans Mono;-inkscape-font-specification:Bitstream Vera Sans Mono"
-       id="path3045" />
-  </g>
-</svg>
diff --git a/etc/cli.angular.io/index.html b/etc/cli.angular.io/index.html
index c512512f37a4..94cfc1373881 100644
--- a/etc/cli.angular.io/index.html
+++ b/etc/cli.angular.io/index.html
@@ -11,6 +11,7 @@
     <!-- Material Design icons -->
     <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
     <link href='https://fonts.googleapis.com/css?family=Roboto:400,300,500,700' rel='stylesheet' type='text/css'>
+    <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:300" rel="stylesheet">
     <link rel="stylesheet" href="material.min.css">
     <link rel="stylesheet" href="main.css">
     <link rel="stylesheet" href="theme.css">
@@ -31,11 +32,11 @@
     <div class="top-nav-wrapper">
         <label for="site-nav-checkbox">SITE MENU</label>
         <nav class="mdl-navigation">
-            
+
             <a class="mdl-navigation__link" href="https://github.com/angular/angular-cli/wiki">Documentation</a>
-            
+
             <a class="mdl-navigation__link" href="https://github.com/angular/angular-cli">GitHub</a>
-            
+
         </nav>
         <div class="mdl-layout-spacer"></div>
         <nav class="mdl-navigation">
@@ -54,7 +55,19 @@
           <header class="hero-background">
     <section class="hero-container section--center mdl-grid mdl-grid--no-spacing">
         <div class="logo-container mdl-cell mdl-cell--6-col-desktop mdl-cell--12-col-tablet mdl-cell--12-col-phone">
-            <img class="hero-image" src="cli-logo.svg" alt="Mobile Toolkit">
+            <div class="console mdl-shadow--4dp">
+              <div class="console__head">
+                <div class="console__dot console__dot--red"></div>
+                <div class="console__dot console__dot--yellow"></div>
+                <div class="console__dot console__dot--green"></div>
+              </div>
+              <div class="console__body">
+                <kbd class="console__prompt">npm install -g @angular/cli</kbd>
+                <kbd class="console__prompt">ng new my-dream-app</kbd>
+                <kbd class="console__prompt">cd my-dream-app</kbd>
+                <kbd class="console__prompt">ng serve</kbd>
+              </div>
+            </div>
         </div>
         <div class="mdl-cell mdl-cell--6-col-desktop mdl-cell--12-col-tablet mdl-cell--12-col-phone">
             <h4 class="">Angular CLI</h4>
@@ -71,27 +84,27 @@ <h5 class="tagline">A command line interface for Angular</h5>
 
       <!-- Add as many features as needed -->
       <section class="features-container section--center mdl-grid mdl-grid--no-spacing">
-    
+
     <div class="features-list">
         <h4>ng new</h4>
         <p>The Angular CLI makes it easy to create an application that already works, right out of the box. It already follows our best practices!</p>
     </div>
-    
+
     <div class="features-list">
         <h4>ng generate</h4>
         <p>Generate components, routes, services and pipes with a simple command. The CLI will also create simple test shells for all of these.</p>
     </div>
-    
+
     <div class="features-list">
         <h4>ng serve</h4>
         <p>Easily test your app locally while developing.</p>
     </div>
-    
+
     <div class="features-list">
         <h4>Test, Lint, Format</h4>
         <p>Make your code really shine. Run your unittests or your end-to-end tests with the breeze of a command. Execute the official Angular linter and run clang format.</p>
     </div>
-    
+
 
     <div class="button-container mdl-cell mdl-cell--12-col-desktop center">
         <a href="https://github.com/angular/angular-cli/wiki" class="cta-button mdl-typography--font-regular mdl-button mdl-button--raised mdl-button--accent">
diff --git a/etc/cli.angular.io/main.css b/etc/cli.angular.io/main.css
index 06e8032946d9..61b0cb066543 100644
--- a/etc/cli.angular.io/main.css
+++ b/etc/cli.angular.io/main.css
@@ -1 +1 @@
-.hero-image{margin-top:-10px;width:200px}.hero-image{width:360px;padding-right:40px}@media (max-width:830px){.hero-image{padding-right:0}}.mdl-base{height:100vh}body{font-family:'Roboto',Helvetica,sans-serif}h4{font-size:30px;font-weight:400;line-height:40px;margin-bottom:15px;margin-top:15px}h5{font-size:16px;font-weight:300;line-height:28px;margin-bottom:25px;margin-top:15px;max-width:300px}.mdl-demo section.section--center{max-width:920px}.mdl-grid--no-spacing>.mdl-cell{width:100%}.mdl-layout--fixed-drawer>.mdl-layout__content{margin-left:0}.mdl-layout__header{background-color:rgb(244,67,54);box-shadow:0 2px 5px 0 rgba(0,0,0,0.26)}.mdl-layout__header a{color:rgb(255,255,255);text-decoration:none}.mdl-layout--fixed-drawer.is-upgraded:not(.is-small-screen)>.mdl-layout__header{margin-left:0;width:100%}.mdl-layout--fixed-drawer>.mdl-layout__header .mdl-layout__header-row{padding-left:25px;padding-right:0}.mdl-layout__drawer-button{display:none}@media (max-width:1024px){.mdl-layout__drawer-button{display:inline-block}}.mdl-layout__drawer{margin-top:65px;height:calc(100% - 65px)}@media (max-width:1024px){.mdl-layout__drawer{margin-top:0;height:100%}}.mdl-layout__title,.mdl-layout-title{font-size:16px;line-height:28px;letter-spacing:0.02em}.microsite-name{display:inline-block;font-size:20px;margin-left:8px;margin-right:30px;text-transform:uppercase;-webkit-transform:translateY(3px);transform:translateY(3px)}.mdl-navigation__link{font-size:16px;text-transform:uppercase;text-decoration:none}.mdl-navigation__link:hover{background-color:rgb(211,47,47)}.top-nav-wrapper{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1}.top-nav-wrapper label{display:none}.top-nav-wrapper label:hover{background-color:rgb(211,47,47)}@media (max-width:800px){.top-nav-wrapper{display:block;position:absolute;right:0;top:0;width:100%}.top-nav-wrapper label{cursor:pointer;display:block;float:right;line-height:56px;padding:0 16px}.top-nav-wrapper nav{background:rgb(211,47,47);clear:both;display:none;height:auto!important}.top-nav-wrapper nav a{display:block}.top-nav-wrapper .mdl-layout-spacer{display:none}input:checked+.top-nav-wrapper label{background:rgb(211,47,47)}input:checked+.top-nav-wrapper nav{display:block}}.hero-background{background:-webkit-linear-gradient(rgb(211,47,47),rgb(244,67,54));background:linear-gradient(rgb(211,47,47),rgb(244,67,54));color:rgb(255,255,255);margin-bottom:60px}.mdl-grid{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.hero-container{padding:56px 0 56px 0!important}@media (max-width:830px){.hero-container{text-align:center}}.logo-container{overflow:hidden;text-align:center}@media (max-width:840px){.tagline{max-width:100%}}.mdl-button{height:45px;line-height:45px;min-width:140px;padding:0 30px}.mdl-button--primary.mdl-button--primary.mdl-button--raised,.mdl-button--primary.mdl-button--primary.mdl-button--fab{background-color:rgb(255,255,255);color:rgb(183,28,28)}.features-list{width:920px;margin:0 0 23px 0;padding:15px;padding-right:200px}@media (max-width:840px){.features-list{padding-right:15px}}.features-list h4{color:#37474F;font-size:28px;font-weight:500;line-height:32px;margin-top:10px;margin:0 0 16px 0;opacity:.87}.features-list p{font-size:16px;line-height:30px;opacity:.87}.button-container{margin-bottom:24px!important;text-align:center}.mdl-button--accent.mdl-button--accent.mdl-button--raised,.mdl-button--accent.mdl-button--accent.mdl-button--fab{background-color:rgb(244,67,54);color:rgb(255,255,255)}.mdl-mega-footer--bottom-section .mdl-cell--9-col{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;-webkit-box-align:center;-ms-flex-align:center;align-items:center;display:-webkit-box;display:-ms-flexbox;display:flex}.mdl-mega-footer--bottom-section,.mdl-mega-footer__bottom-section{background-color:#263238;bottom:0;color:white;padding-top:0;right:0}footer ul{font-size:14px;font-weight:400;letter-spacing:0;line-height:24px;list-style:none;padding:0}footer ul a{color:white;font-size:16px;line-height:28px;opacity:.87;padding:0;text-decoration:none}footer ul a:hover{text-decoration:underline}@media (max-width:830px){footer ul{background-color:rgba(0,0,0,0.12);padding:8px;text-align:center}}.mdl-mega-footer--bottom-section{margin-bottom:0}.mdl-mega-footer--bottom-section p{font-size:12px;margin:0;opacity:.54}.mdl-mega-footer--bottom-section a{color:white;font-weight:normal;padding:0;text-decoration:none}.power-text{text-align:right}@media (max-width:830px){.power-text{text-align:center;width:calc(100% - 16px)}}.hero-image{margin-top:-10px;width:200px}.hero-image{width:360px;padding-right:40px}@media (max-width:830px){.hero-image{padding-right:0}}.mdl-base{height:100vh}
\ No newline at end of file
+body{font-family:"Roboto",Helvetica,sans-serif}h4,h5{font-size:30px;font-weight:400;line-height:40px;margin-bottom:15px;margin-top:15px}h5{font-size:16px;font-weight:300;line-height:28px;margin-bottom:25px;max-width:300px}.mdl-demo section.section--center{max-width:920px}.mdl-grid--no-spacing>.mdl-cell{width:100%}.mdl-layout--fixed-drawer>.mdl-layout__content{margin-left:0}.mdl-layout__header{background-color:#f44336;box-shadow:0 2px 5px 0 rgba(0,0,0,.26)}.mdl-layout__header a{color:#fff;text-decoration:none}.mdl-layout--fixed-drawer.is-upgraded:not(.is-small-screen)>.mdl-layout__header{margin-left:0;width:100%}.mdl-layout--fixed-drawer>.mdl-layout__header .mdl-layout__header-row{padding-left:25px;padding-right:0}.mdl-layout__drawer-button,.top-nav-wrapper label{display:none}@media (max-width:1024px){.mdl-layout__drawer-button{display:inline-block}}.mdl-layout__drawer{margin-top:65px;height:calc(100% - 65px)}@media (max-width:1024px){.mdl-layout__drawer{margin-top:0;height:100%}}.mdl-layout-title,.mdl-layout__title{font-size:16px;line-height:28px;letter-spacing:.02em}.microsite-name{display:inline-block;font-size:20px;margin-left:8px;margin-right:30px;text-transform:uppercase;-webkit-transform:translateY(3px);transform:translateY(3px)}.mdl-navigation__link{font-size:16px;text-transform:uppercase;text-decoration:none}.mdl-navigation__link:hover,.top-nav-wrapper label:hover{background-color:#d32f2f}.top-nav-wrapper{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1}@media (max-width:800px){.top-nav-wrapper{display:block;position:absolute;right:0;top:0;width:100%}.top-nav-wrapper label{cursor:pointer;display:block;float:right;line-height:56px;padding:0 16px}.top-nav-wrapper nav{background:#d32f2f;clear:both;display:none;height:auto!important}.top-nav-wrapper nav a{display:block}.top-nav-wrapper .mdl-layout-spacer{display:none}input:checked+.top-nav-wrapper label{background:#d32f2f}input:checked+.top-nav-wrapper nav{display:block}}.hero-background{background:-webkit-linear-gradient(#d32f2f ,#f44336);background:linear-gradient(#d32f2f ,#f44336);color:#fff;margin-bottom:60px}.mdl-grid,.mdl-mega-footer--bottom-section .mdl-cell--9-col{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.hero-container{padding:56px 0!important}@media (max-width:830px){.hero-container{text-align:center}}.logo-container{overflow:hidden;text-align:center}@media (max-width:840px){.tagline{max-width:100%}}.mdl-button{height:45px;line-height:45px;min-width:140px;padding:0 30px}.mdl-button--primary.mdl-button--primary.mdl-button--fab,.mdl-button--primary.mdl-button--primary.mdl-button--raised{background-color:#fff;color:#b71c1c}.features-list{width:920px;margin:0 0 23px;padding:15px 200px 15px 15px}@media (max-width:840px){.features-list{padding-right:15px}}.features-list h4{color:#37474f;font-size:28px;font-weight:500;line-height:32px;margin:0 0 16px;opacity:.87}.features-list p,footer ul a{font-size:16px;line-height:30px;opacity:.87}.button-container{margin-bottom:24px!important;text-align:center}.mdl-button--accent.mdl-button--accent.mdl-button--fab,.mdl-button--accent.mdl-button--accent.mdl-button--raised{background-color:#f44336;color:#fff}.mdl-mega-footer--bottom-section .mdl-cell--9-col{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;display:-webkit-box;display:-ms-flexbox;display:flex}.mdl-mega-footer--bottom-section,.mdl-mega-footer__bottom-section{background-color:#263238;bottom:0;color:#fff;padding-top:0;right:0}footer ul{font-size:14px;font-weight:400;letter-spacing:0;line-height:24px;list-style:none;padding:0}footer ul a{color:#fff;line-height:28px;padding:0;text-decoration:none}footer ul a:hover{text-decoration:underline}@media (max-width:830px){footer ul{background-color:rgba(0,0,0,.12);padding:8px;text-align:center}}.mdl-mega-footer--bottom-section{margin-bottom:0}.mdl-mega-footer--bottom-section p{font-size:12px;margin:0;opacity:.54}.mdl-mega-footer--bottom-section a{color:#fff;font-weight:400;padding:0;text-decoration:none}.power-text{text-align:right}@media (max-width:830px){.power-text{text-align:center;width:calc(100% - 16px)}}.mdl-base{height:100vh}
diff --git a/etc/cli.angular.io/theme.css b/etc/cli.angular.io/theme.css
index a90faa788171..b6a336e98b0c 100644
--- a/etc/cli.angular.io/theme.css
+++ b/etc/cli.angular.io/theme.css
@@ -1 +1 @@
-.hero-image{width:360px;padding-right:40px}@media (max-width:830px){.hero-image{padding-right:0}}.mdl-base{height:100vh}
\ No newline at end of file
+.console{width:360px;max-width:92vw;margin-left:15px;margin-right:40px;text-align:left;border-radius:5px;margin-bottom:10px}@media (max-width:830px){.console{margin-right:auto;margin-left:auto}}.console__head{overflow:hidden;background-color:#d5d5d5;padding:8px 15px;border-top-left-radius:5px;border-top-right-radius:5px}.console__dot{float:left;width:12px;height:12px;border-radius:50%;margin-right:7px;box-shadow:0 1px 1px 0 rgba(0,0,0,.2)}.console__dot--red{background-color:#ff6057}.console__dot--yellow{background-color:#ffc22e}.console__dot--green{background-color:#28ca40}.console__body{background-color:#1e1e1e;padding:30px 17px 20px;border-bottom-left-radius:5px;border-bottom-right-radius:5px}.console__prompt{display:block;margin-bottom:15px;font-family:"Source Code Pro",monospace;font-size:15px}.console__prompt::before{content:">";padding-right:15px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mdl-base{height:100vh}

From c6a92a657947aa4483642b89e19b28da5aa4055d Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 26 Sep 2018 17:21:25 +0200
Subject: [PATCH 0212/1703] refactor: change code to work with TypeScript 3 and
 add missing models

---
 packages/schematics/angular/e2e/index.ts              | 11 +++--------
 .../schematics/angular/utility/workspace-models.ts    |  6 +++++-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/packages/schematics/angular/e2e/index.ts b/packages/schematics/angular/e2e/index.ts
index ab6cc4516736..bf96319678c4 100644
--- a/packages/schematics/angular/e2e/index.ts
+++ b/packages/schematics/angular/e2e/index.ts
@@ -119,14 +119,9 @@ export default function (options: E2eOptions): Rule {
     validateProjectName(options.name);
 
     const workspace = getWorkspace(host);
-    let newProjectRoot = workspace.newProjectRoot;
-    let appDir = `${newProjectRoot}/${options.name}`;
-
-
-    if (options.projectRoot !== undefined) {
-      newProjectRoot = options.projectRoot;
-      appDir = newProjectRoot;
-    }
+    const appDir = options.projectRoot !== undefined
+      ? options.projectRoot
+      : `${workspace.newProjectRoot}/${options.name}`;
 
     return chain([
       addAppToWorkspaceFile(options, workspace),
diff --git a/packages/schematics/angular/utility/workspace-models.ts b/packages/schematics/angular/utility/workspace-models.ts
index 011c2363227d..75554c88b162 100644
--- a/packages/schematics/angular/utility/workspace-models.ts
+++ b/packages/schematics/angular/utility/workspace-models.ts
@@ -53,6 +53,11 @@ export interface BrowserBuilderOptions extends BrowserBuilderBaseOptions {
     extractLicenses?: boolean;
     vendorChunk?: boolean;
     buildOptimizer?: boolean;
+    budgets?: {
+        type: string;
+        maximumWarning?: string;
+        maximumError?: string;
+    }[];
 }
 
 export interface ServeBuilderOptions {
@@ -119,7 +124,6 @@ export interface WorkspaceSchema extends experimental.workspace.WorkspaceSchema
     };
 }
 
-// tslint:disable-next-line:no-any
 export interface WorkspaceProject<TProjectType extends ProjectType = ProjectType.Application>
     extends experimental.workspace.WorkspaceProject {
     /**

From 8c4ddff08f73183fdad6f18720234bdba3dc3bfc Mon Sep 17 00:00:00 2001
From: smnbbrv <simonellez@gmail.com>
Date: Sat, 15 Sep 2018 13:52:20 +0200
Subject: [PATCH 0213/1703] feat(@schematics/update): add per-project .npmrc
 file support

---
 packages/schematics/update/update/npm.ts | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/schematics/update/update/npm.ts b/packages/schematics/update/update/npm.ts
index 9bfed9c6be65..1e5ac1d295d9 100644
--- a/packages/schematics/update/update/npm.ts
+++ b/packages/schematics/update/update/npm.ts
@@ -33,15 +33,21 @@ function _readNpmRc(): Observable<{ [key: string]: string }> {
     // TODO: have a way to read options without using fs directly.
     const path = require('path');
     const fs = require('fs');
+    const perProjectNpmrc = path.resolve('.npmrc');
 
     let npmrc = '';
-    if (process.platform === 'win32') {
-      if (process.env.LOCALAPPDATA) {
-        npmrc = fs.readFileSync(path.join(process.env.LOCALAPPDATA, '.npmrc')).toString('utf-8');
-      }
+
+    if (fs.existsSync(perProjectNpmrc)) {
+      npmrc = fs.readFileSync(perProjectNpmrc).toString('utf-8');
     } else {
-      if (process.env.HOME) {
-        npmrc = fs.readFileSync(path.join(process.env.HOME, '.npmrc')).toString('utf-8');
+      if (process.platform === 'win32') {
+        if (process.env.LOCALAPPDATA) {
+          npmrc = fs.readFileSync(path.join(process.env.LOCALAPPDATA, '.npmrc')).toString('utf-8');
+        }
+      } else {
+        if (process.env.HOME) {
+          npmrc = fs.readFileSync(path.join(process.env.HOME, '.npmrc')).toString('utf-8');
+        }
       }
     }
 

From b699ad2684ba89f6909fd05db6dce03628159074 Mon Sep 17 00:00:00 2001
From: smnbbrv <simonellez@gmail.com>
Date: Sat, 15 Sep 2018 21:55:24 +0200
Subject: [PATCH 0214/1703] fix(@schematics/update): process always-auth and
 _auth correctly, better support for private repositories

---
 packages/schematics/update/update/npm.ts | 29 +++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/packages/schematics/update/update/npm.ts b/packages/schematics/update/update/npm.ts
index 1e5ac1d295d9..4a26e0a86a4e 100644
--- a/packages/schematics/update/update/npm.ts
+++ b/packages/schematics/update/update/npm.ts
@@ -198,7 +198,8 @@ export function getNpmPackageJson(
         getNpmConfigOption('_authToken', registryKey),
         getNpmConfigOption('username', registryKey, true),
         getNpmConfigOption('password', registryKey, true),
-        getNpmConfigOption('alwaysAuth', registryKey, true),
+        getNpmConfigOption('email', registryKey, true),
+        getNpmConfigOption('always-auth', registryKey, true),
       ).pipe(
         toArray(),
         concatMap(options => {
@@ -211,6 +212,7 @@ export function getNpmPackageJson(
             authToken,
             username,
             password,
+            email,
             alwaysAuth,
           ] = options;
 
@@ -222,17 +224,38 @@ export function getNpmPackageJson(
             token?: string,
             alwaysAuth?: boolean;
             username?: string;
-            password?: string
+            password?: string;
+            email?: string;
           } = {};
 
           if (alwaysAuth !== undefined) {
             auth.alwaysAuth = alwaysAuth === 'false' ? false : !!alwaysAuth;
           }
 
+          if (email) {
+            auth.email = email;
+          }
+
           if (authToken) {
             auth.token = authToken;
           } else if (token) {
-            auth.token = token;
+            try {
+              // attempt to parse "username:password" from base64 token
+              // to enable Artifactory / Nexus-like repositories support
+              const delimiter = ':';
+              const parsedToken = Buffer.from(token, 'base64').toString('ascii');
+              const [extractedUsername, ...passwordArr] = parsedToken.split(delimiter);
+              const extractedPassword = passwordArr.join(delimiter);
+
+              if (extractedUsername && extractedPassword) {
+                auth.username = extractedUsername;
+                auth.password = extractedPassword;
+              } else {
+                throw new Error('Unable to extract username and password from _auth token');
+              }
+            } catch (ex) {
+              auth.token = token;
+            }
           } else if (username) {
             auth.username = username;
             auth.password = password;

From b19a348c6970f92720e930ce8299779deb32b2ec Mon Sep 17 00:00:00 2001
From: smnbbrv <simonellez@gmail.com>
Date: Wed, 19 Sep 2018 13:13:44 +0200
Subject: [PATCH 0215/1703] fix(@schematics/update): taking whitespaces around
 "=" in .npmrc into account

---
 packages/schematics/update/update/npm.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/update/update/npm.ts b/packages/schematics/update/update/npm.ts
index 4a26e0a86a4e..04fde9d218e4 100644
--- a/packages/schematics/update/update/npm.ts
+++ b/packages/schematics/update/update/npm.ts
@@ -56,7 +56,7 @@ function _readNpmRc(): Observable<{ [key: string]: string }> {
 
     allOptionsArr.forEach(x => {
       const [key, ...value] = x.split('=');
-      allOptions[key] = value.join('=');
+      allOptions[key.trim()] = value.join('=').trim();
     });
 
     subject.next(allOptions);

From 1a3a117b48cbd46f85325bc001486aba38f53eea Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 25 Sep 2018 09:49:58 -0400
Subject: [PATCH 0216/1703] refactor(@angular-devkit/core): adjust rxjs type
 usage

Required for upcoming upgraded to rxjs 6.3
---
 packages/angular_devkit/core/src/json/schema/visitor.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/core/src/json/schema/visitor.ts b/packages/angular_devkit/core/src/json/schema/visitor.ts
index 0708c3564c51..c0d68b2778dc 100644
--- a/packages/angular_devkit/core/src/json/schema/visitor.ts
+++ b/packages/angular_devkit/core/src/json/schema/visitor.ts
@@ -86,7 +86,7 @@ function _visitJsonRecursive<ContextT>(
             }),
             ignoreElements(),
           ),
-          observableOf(value),
+          observableOf<JsonValue>(value),
         );
       } else if (typeof value == 'object' && value !== null) {
         return concat(

From 013c6639863421e1929fe5bda23b0ebcaab2af40 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 25 Sep 2018 09:50:12 -0400
Subject: [PATCH 0217/1703] refactor(@angular-devkit/schematics): adjust rxjs
 type usage

Required for upcoming upgraded to rxjs 6.3
---
 .../schematics/src/workflow/base.ts             | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/packages/angular_devkit/schematics/src/workflow/base.ts b/packages/angular_devkit/schematics/src/workflow/base.ts
index 61238b0fe28b..1101e8b40861 100644
--- a/packages/angular_devkit/schematics/src/workflow/base.ts
+++ b/packages/angular_devkit/schematics/src/workflow/base.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { logging, schema, virtualFs } from '@angular-devkit/core';
-import { Observable, Subject, concat, of, throwError } from 'rxjs';
+import { Observable, Subject, concat, from, of, throwError } from 'rxjs';
 import { concatMap, defaultIfEmpty, ignoreElements, last, map, tap } from 'rxjs/operators';
 import { EngineHost, SchematicEngine } from '../engine';
 import { UnsuccessfulWorkflowExecution } from '../exception/exception';
@@ -162,15 +162,12 @@ export abstract class BaseWorkflow implements Workflow {
       map(tree => optimize(tree)),
       concatMap((tree: Tree) => {
         // Process all sinks.
-        return of(tree).pipe(
-          ...sinks.map(sink => {
-            return concatMap((tree: Tree) => {
-              return concat(
-                sink.commit(tree).pipe(ignoreElements()),
-                of(tree),
-              );
-            });
-          }),
+        return concat(
+          from(sinks).pipe(
+            concatMap(sink => sink.commit(tree)),
+            ignoreElements(),
+          ),
+          of(tree),
         );
       }),
       concatMap(() => {

From 9a793494dce5cc07267d1be3d77f0bcbad522afe Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 25 Sep 2018 09:50:56 -0400
Subject: [PATCH 0218/1703] build: update rxjs to 6.3

---
 package.json                                           | 5 +----
 packages/angular/cli/package.json                      | 2 +-
 packages/angular/pwa/package.json                      | 2 +-
 packages/angular_devkit/architect/package.json         | 2 +-
 packages/angular_devkit/architect/test/package.json    | 2 +-
 packages/angular_devkit/architect_cli/package.json     | 2 +-
 packages/angular_devkit/benchmark/package.json         | 2 +-
 packages/angular_devkit/build_angular/package.json     | 2 +-
 packages/angular_devkit/build_ng_packagr/package.json  | 2 +-
 packages/angular_devkit/build_webpack/package.json     | 2 +-
 packages/angular_devkit/core/package.json              | 2 +-
 packages/angular_devkit/schematics/package.json        | 2 +-
 packages/angular_devkit/schematics_cli/package.json    | 2 +-
 packages/ngtools/webpack/package.json                  | 2 +-
 packages/schematics/angular/utility/latest-versions.ts | 2 +-
 packages/schematics/update/package.json                | 2 +-
 yarn.lock                                              | 6 +++---
 17 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index e1504b119083..9bb3cb3edbd0 100644
--- a/package.json
+++ b/package.json
@@ -95,7 +95,7 @@
     "license-checker": "^20.1.0",
     "minimatch": "^3.0.4",
     "minimist": "^1.2.0",
-    "rxjs": "~6.2.0",
+    "rxjs": "~6.3.0",
     "semver": "^5.3.0",
     "source-map": "^0.5.6",
     "source-map-support": "^0.5.0",
@@ -105,8 +105,5 @@
     "ts-node": "^5.0.0",
     "tslint-no-circular-imports": "^0.5.0",
     "tslint-sonarts": "^1.7.0"
-  },
-  "resolutions": {
-    "rxjs": "~6.2.0"
   }
 }
diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 6b3ed6a16143..30f604f522d9 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -33,7 +33,7 @@
     "@schematics/update": "0.0.0",
     "inquirer": "6.2.0",
     "opn": "5.3.0",
-    "rxjs": "6.2.2",
+    "rxjs": "6.3.3",
     "semver": "5.5.1",
     "symbol-observable": "1.2.0"
   },
diff --git a/packages/angular/pwa/package.json b/packages/angular/pwa/package.json
index 0891d2bf3c32..b195accf5388 100644
--- a/packages/angular/pwa/package.json
+++ b/packages/angular/pwa/package.json
@@ -13,6 +13,6 @@
     "@angular-devkit/schematics": "0.0.0",
     "@schematics/angular": "0.0.0",
     "parse5-html-rewriting-stream": "5.1.0",
-    "rxjs": "6.2.2"
+    "rxjs": "6.3.3"
   }
 }
\ No newline at end of file
diff --git a/packages/angular_devkit/architect/package.json b/packages/angular_devkit/architect/package.json
index 4ff19b1fdf7d..f04b3a985ffa 100644
--- a/packages/angular_devkit/architect/package.json
+++ b/packages/angular_devkit/architect/package.json
@@ -6,6 +6,6 @@
   "typings": "src/index.d.ts",
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "6.2.2"
+    "rxjs": "6.3.3"
   }
 }
\ No newline at end of file
diff --git a/packages/angular_devkit/architect/test/package.json b/packages/angular_devkit/architect/test/package.json
index ddd3d69106d0..7b99dfd2c75c 100644
--- a/packages/angular_devkit/architect/test/package.json
+++ b/packages/angular_devkit/architect/test/package.json
@@ -1,6 +1,6 @@
 {
   "builders": "builders.json",
   "dependencies": {
-    "rxjs": "6.2.2"
+    "rxjs": "6.3.3"
   }
 }
diff --git a/packages/angular_devkit/architect_cli/package.json b/packages/angular_devkit/architect_cli/package.json
index 10a3e56681e2..183dee060281 100644
--- a/packages/angular_devkit/architect_cli/package.json
+++ b/packages/angular_devkit/architect_cli/package.json
@@ -16,6 +16,6 @@
     "@angular-devkit/architect": "0.0.0",
     "minimist": "1.2.0",
     "symbol-observable": "1.2.0",
-    "rxjs": "6.2.2"
+    "rxjs": "6.3.3"
   }
 }
diff --git a/packages/angular_devkit/benchmark/package.json b/packages/angular_devkit/benchmark/package.json
index 0763f807fd36..1be3376670e7 100644
--- a/packages/angular_devkit/benchmark/package.json
+++ b/packages/angular_devkit/benchmark/package.json
@@ -18,7 +18,7 @@
     "minimist": "^1.2.0",
     "pidusage": "^2.0.17",
     "pidtree": "^0.3.0",
-    "rxjs": "~6.2.0",
+    "rxjs": "~6.3.0",
     "tree-kill": "^1.2.0"
   }
 }
\ No newline at end of file
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 654ed49fff1a..402c0e9ac16f 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -35,7 +35,7 @@
     "postcss-import": "11.1.0",
     "postcss-loader": "2.1.6",
     "raw-loader": "0.5.1",
-    "rxjs": "6.2.2",
+    "rxjs": "6.3.3",
     "sass-loader": "7.1.0",
     "semver": "5.5.1",
     "source-map-support": "0.5.9",
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index 22bc16756914..be36b386bc2a 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@angular-devkit/architect": "0.0.0",
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "6.2.2",
+    "rxjs": "6.3.3",
     "semver": "5.5.1"
   },
   "peerDependencies": {
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index 47600f049507..0d2788e7924d 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@angular-devkit/architect": "0.0.0",
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "6.2.2"
+    "rxjs": "6.3.3"
   },
   "peerDependencies": {
     "webpack": "^4.6.0",
diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json
index d8967cd6022b..dd72b800d1db 100644
--- a/packages/angular_devkit/core/package.json
+++ b/packages/angular_devkit/core/package.json
@@ -12,6 +12,6 @@
     "chokidar": "2.0.4",
     "fast-json-stable-stringify": "2.0.0",
     "source-map": "0.7.3",
-    "rxjs": "6.2.2"
+    "rxjs": "6.3.3"
   }
 }
diff --git a/packages/angular_devkit/schematics/package.json b/packages/angular_devkit/schematics/package.json
index 9eff901c231e..be96be5dc296 100644
--- a/packages/angular_devkit/schematics/package.json
+++ b/packages/angular_devkit/schematics/package.json
@@ -14,6 +14,6 @@
   ],
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "6.2.2"
+    "rxjs": "6.3.3"
   }
 }
diff --git a/packages/angular_devkit/schematics_cli/package.json b/packages/angular_devkit/schematics_cli/package.json
index 8a27cb589f3b..5c11beba172d 100644
--- a/packages/angular_devkit/schematics_cli/package.json
+++ b/packages/angular_devkit/schematics_cli/package.json
@@ -19,6 +19,6 @@
     "@schematics/schematics": "0.0.0",
     "minimist": "1.2.0",
     "symbol-observable": "1.2.0",
-    "rxjs": "6.2.2"
+    "rxjs": "6.3.3"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 0acb8d5cfebf..c1bd0c3c32b5 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -23,7 +23,7 @@
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
     "enhanced-resolve": "4.1.0",    
-    "rxjs": "6.2.2",
+    "rxjs": "6.3.3",
     "tree-kill": "1.2.0",
     "webpack-sources": "1.2.0"
   },
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 17f4736fa1df..10accb03e94f 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -9,7 +9,7 @@
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
   Angular: '~7.0.0-beta.5',
-  RxJs: '~6.3.2',
+  RxJs: '~6.3.3',
   ZoneJs: '~0.8.26',
   TypeScript: '~3.0.1',
   // The versions below must be manually updated when making a new devkit release.
diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index f761db4c43a4..39e6958a0785 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -15,6 +15,6 @@
     "npm-registry-client": "8.6.0",
     "semver": "5.5.1",
     "semver-intersect": "1.4.0",
-    "rxjs": "6.2.2"
+    "rxjs": "6.3.3"
   }
 }
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 33e7428e4a8e..2c0c560b0e66 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6579,9 +6579,9 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs@6.2.2, rxjs@^6.0.0, rxjs@^6.1.0, rxjs@~6.2.0:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.2.tgz#eb75fa3c186ff5289907d06483a77884586e1cf9"
+rxjs@6.3.3, rxjs@^6.0.0, rxjs@^6.1.0, rxjs@~6.3.0:
+  version "6.3.3"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
   dependencies:
     tslib "^1.9.0"
 

From 11822d9aea875123291772cc9f755f8cfdb60ccd Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 25 Sep 2018 12:20:37 -0400
Subject: [PATCH 0219/1703] test: update E2E update tests to use built packages

---
 tests/legacy-cli/e2e/tests/basic/update-1.0.ts          | 7 +++++--
 tests/legacy-cli/e2e/tests/basic/update-1.7-longhand.ts | 5 ++++-
 tests/legacy-cli/e2e/tests/basic/update-1.7.ts          | 6 ++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/basic/update-1.0.ts b/tests/legacy-cli/e2e/tests/basic/update-1.0.ts
index ec9967927382..1dcfd03dcaab 100644
--- a/tests/legacy-cli/e2e/tests/basic/update-1.0.ts
+++ b/tests/legacy-cli/e2e/tests/basic/update-1.0.ts
@@ -1,6 +1,6 @@
 import { createProjectFromAsset } from '../../utils/assets';
-import { ng } from '../../utils/process';
-import { useCIChrome, useCIDefaults } from '../../utils/project';
+import { ng, silentNpm } from '../../utils/process';
+import { useBuiltPackages, useCIChrome, useCIDefaults } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
 
 
@@ -10,10 +10,13 @@ export default function () {
     .then(() => useCIChrome('.'))
     .then(() => expectToFail(() => ng('build')))
     .then(() => ng('update', '@angular/cli'))
+    .then(() => useBuiltPackages())
+    .then(() => silentNpm('install'))
     .then(() => useCIDefaults('one-oh-project'))
     .then(() => ng('generate', 'component', 'my-comp'))
     .then(() => ng('test', '--watch=false'))
     .then(() => ng('lint'))
+    .then(() => ng('build'))
     .then(() => ng('build', '--prod'))
     .then(() => ng('e2e'));
 }
diff --git a/tests/legacy-cli/e2e/tests/basic/update-1.7-longhand.ts b/tests/legacy-cli/e2e/tests/basic/update-1.7-longhand.ts
index 900c0d6129e5..50317dcd31ed 100644
--- a/tests/legacy-cli/e2e/tests/basic/update-1.7-longhand.ts
+++ b/tests/legacy-cli/e2e/tests/basic/update-1.7-longhand.ts
@@ -1,6 +1,7 @@
 import { createProjectFromAsset } from '../../utils/assets';
+import { ng, silentNpm } from '../../utils/process';
+import { useBuiltPackages } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
-import { ng } from '../../utils/process';
 
 
 export default function () {
@@ -8,5 +9,7 @@ export default function () {
     .then(() => createProjectFromAsset('1.7-project'))
     .then(() => expectToFail(() => ng('build')))
     .then(() => ng('update', '@angular/cli', '--migrate-only', '--from=1.7.1'))
+    .then(() => useBuiltPackages())
+    .then(() => silentNpm('install'))
     .then(() => ng('build'));
 }
diff --git a/tests/legacy-cli/e2e/tests/basic/update-1.7.ts b/tests/legacy-cli/e2e/tests/basic/update-1.7.ts
index 1bb54d973d0e..016cf4aeba39 100644
--- a/tests/legacy-cli/e2e/tests/basic/update-1.7.ts
+++ b/tests/legacy-cli/e2e/tests/basic/update-1.7.ts
@@ -1,6 +1,6 @@
 import { createProjectFromAsset } from '../../utils/assets';
-import { ng } from '../../utils/process';
-import { useCIChrome, useCIDefaults } from '../../utils/project';
+import { ng, silentNpm } from '../../utils/process';
+import { useBuiltPackages, useCIChrome, useCIDefaults } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
 
 
@@ -10,6 +10,8 @@ export default function () {
     .then(() => useCIChrome('.'))
     .then(() => expectToFail(() => ng('build')))
     .then(() => ng('update', '@angular/cli'))
+    .then(() => useBuiltPackages())
+    .then(() => silentNpm('install'))
     .then(() => useCIDefaults('latest-project'))
     .then(() => ng('generate', 'component', 'my-comp'))
     .then(() => ng('test', '--watch=false'))

From a85af9c33ce65403b31612ed549f00041c187975 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 24 Aug 2018 14:10:55 -0400
Subject: [PATCH 0220/1703] build: ensure @ngtools/webpack uses consistent TS
 version

---
 package.json | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 9bb3cb3edbd0..59b928ced8db 100644
--- a/package.json
+++ b/package.json
@@ -51,12 +51,17 @@
     "url": "https://github.com/angular/angular-cli/issues"
   },
   "homepage": "https://github.com/angular/angular-cli",
-  "workspaces": [
-    "packages/angular/*",
-    "packages/angular_devkit/*",
-    "packages/ngtools/*",
-    "packages/schematics/*"
-  ],
+  "workspaces": {
+    "packages": [
+      "packages/angular/*",
+      "packages/angular_devkit/*",
+      "packages/ngtools/*",
+      "packages/schematics/*"
+    ],
+    "nohoist": [
+      "@angular/compiler-cli"
+    ]
+  },
   "dependencies": {
     "glob": "^7.0.3",
     "node-fetch": "^2.2.0",
@@ -66,6 +71,8 @@
     "typescript": "~3.0.1"
   },
   "devDependencies": {
+    "@angular/compiler": "^7.0.0-beta.4",
+    "@angular/compiler-cli": "^7.0.0-beta.4",
     "@bazel/typescript": "0.16.1",
     "@ngtools/json-schema": "^1.1.0",
     "@types/copy-webpack-plugin": "^4.4.1",

From a161e5f4d0f641aae669fb1e2603fcaa30c6eb6e Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 26 Sep 2018 15:53:27 +0200
Subject: [PATCH 0221/1703] refactor(@angular-devkit/build-angular): clean up
 overriding of options

---
 .../build_angular/src/dev-server/index.ts     | 43 +++++++++++--------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index 194323955a70..03ad4c0a0f6f 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -60,6 +60,7 @@ export interface DevServerBuilderOptions {
   verbose?: boolean;
 }
 
+type DevServerBuilderOptionsKeys = Extract<keyof DevServerBuilderOptions, string>;
 
 export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
 
@@ -392,24 +393,30 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
     const architect = this.context.architect;
     const [project, target, configuration] = options.browserTarget.split(':');
 
-    const overrides = {
-      // Override browser build watch setting.
-      watch: options.watch,
-
-      // Update the browser options with the same options we support in serve, if defined.
-      ...(options.optimization !== undefined ? { optimization: options.optimization } : {}),
-      ...(options.aot !== undefined ? { aot: options.aot } : {}),
-      ...(options.sourceMap !== undefined ? { sourceMap: options.sourceMap } : {}),
-      ...(options.vendorSourceMap !== undefined ?
-         { vendorSourceMap: options.vendorSourceMap } : {}),
-      ...(options.evalSourceMap !== undefined ? { evalSourceMap: options.evalSourceMap } : {}),
-      ...(options.vendorChunk !== undefined ? { vendorChunk: options.vendorChunk } : {}),
-      ...(options.commonChunk !== undefined ? { commonChunk: options.commonChunk } : {}),
-      ...(options.baseHref !== undefined ? { baseHref: options.baseHref } : {}),
-      ...(options.progress !== undefined ? { progress: options.progress } : {}),
-      ...(options.poll !== undefined ? { poll: options.poll } : {}),
-      ...(options.verbose !== undefined ? { verbose: options.verbose } : {}),
-    };
+    const overridesOptions: DevServerBuilderOptionsKeys[] = [
+      'watch',
+      'optimization',
+      'aot',
+      'sourceMap',
+      'vendorSourceMap',
+      'evalSourceMap',
+      'vendorChunk',
+      'commonChunk',
+      'baseHref',
+      'progress',
+      'poll',
+      'verbose',
+    ];
+
+    // remove options that are undefined or not to be overrriden
+    const overrides = (Object.keys(options) as DevServerBuilderOptionsKeys[])
+      .filter(key => options[key] !== undefined && overridesOptions.includes(key))
+      .reduce<Partial<BrowserBuilderSchema>>((previous, key) => (
+        {
+          ...previous,
+          [key]: options[key],
+        }
+      ), {});
 
     const browserTargetSpec = { project, target, configuration, overrides };
     const builderConfig = architect.getBuilderConfiguration<BrowserBuilderSchema>(

From 5c6c704890518920e8245b8ac0ed4eabc634bde9 Mon Sep 17 00:00:00 2001
From: Andrey Sitnik <andrey@sitnik.ru>
Date: Wed, 4 Jul 2018 13:09:05 -0400
Subject: [PATCH 0222/1703] Disable Autoprefixer Grid

---
 .../src/angular-cli-files/models/webpack-configs/styles.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
index f9677ac8eae4..b468dbd8ad7e 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
@@ -73,7 +73,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
         loader,
         filename: `[name]${hashFormat.file}.[ext]`,
       }),
-      autoprefixer({ grid: true }),
+      autoprefixer(),
     ];
   };
 

From b16cb27f5b59607c8e2f913023979c8cc0eb6b34 Mon Sep 17 00:00:00 2001
From: Mike Brocchi <mbrocchi@gmail.com>
Date: Mon, 10 Sep 2018 09:33:21 -0400
Subject: [PATCH 0223/1703] feat(@schematics/angular): Add the option to allow
 preventing the creation of an application

Fixes #12216
---
 packages/schematics/angular/ng-new/index.ts      | 3 ++-
 packages/schematics/angular/ng-new/index_spec.ts | 9 +++++++++
 packages/schematics/angular/ng-new/schema.json   | 5 +++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/angular/ng-new/index.ts b/packages/schematics/angular/ng-new/index.ts
index 4ae4a8454ea1..a5229e6dcf86 100644
--- a/packages/schematics/angular/ng-new/index.ts
+++ b/packages/schematics/angular/ng-new/index.ts
@@ -15,6 +15,7 @@ import {
   empty,
   mergeWith,
   move,
+  noop,
   schematic,
 } from '@angular-devkit/schematics';
 import {
@@ -60,7 +61,7 @@ export default function (options: NgNewOptions): Rule {
     mergeWith(
       apply(empty(), [
         schematic('workspace', workspaceOptions),
-        schematic('application', applicationOptions),
+        options.createApplication ? schematic('application', applicationOptions) : noop,
         move(options.directory || options.name),
       ]),
     ),
diff --git a/packages/schematics/angular/ng-new/index_spec.ts b/packages/schematics/angular/ng-new/index_spec.ts
index 268a3dd87508..8903428d9bab 100644
--- a/packages/schematics/angular/ng-new/index_spec.ts
+++ b/packages/schematics/angular/ng-new/index_spec.ts
@@ -56,4 +56,13 @@ describe('Ng New Schematic', () => {
     const moduleContent = tree.readContent('/foo/src/app/app.module.ts');
     expect(moduleContent).toMatch(/declarations:\s*\[\s*AppComponent\s*\]/m);
   });
+
+  it('createApplication=false should create an empty workspace', () => {
+    const options = { ...defaultOptions, createApplication: false };
+
+    const tree = schematicRunner.runSchematic('ng-new', options);
+    const files = tree.files;
+    expect(files.indexOf('/bar/angular.json')).toBeGreaterThanOrEqual(0);
+    expect(files.indexOf('/bar/src')).toBe(-1);
+  });
 });
diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
index 5f4179e8cc74..cefb1a6a8974 100644
--- a/packages/schematics/angular/ng-new/schema.json
+++ b/packages/schematics/angular/ng-new/schema.json
@@ -131,6 +131,11 @@
       "type": "boolean",
       "default": false,
       "alias": "S"
+    },
+    "createApplication": {
+      "description": "Flag to toggle creation of an application in the new workspace.",
+      "type": "boolean",
+      "default": true
     }
   },
   "required": [

From ae4dc05319c8eaf5a45ef3aa772fdd88c0363f42 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 26 Sep 2018 14:49:36 +0200
Subject: [PATCH 0224/1703] fix(@angular-devkit/build-angular): karma builder
 now serves global styles

Closes: #11072
---
 .../plugins/karma-context.html                |  1 +
 .../plugins/karma-debug.html                  |  1 +
 .../src/angular-cli-files/plugins/karma.ts    |  4 +-
 .../test/karma/styles_spec_large.ts           | 59 +++++++++++++++++++
 4 files changed, 62 insertions(+), 3 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/test/karma/styles_spec_large.ts

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html
index ec185d8d3e60..dd11e3efe33f 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html
@@ -30,6 +30,7 @@
   <script type="text/javascript" src="_karma_webpack_/polyfills.js" crossorigin="anonymous"></script>
   <!-- Dynamically replaced with <script> tags -->
   %SCRIPTS%
+  <script type="text/javascript" src="_karma_webpack_/styles.js" crossorigin="anonymous"></script>
   <script type="text/javascript" src="_karma_webpack_/scripts.js" crossorigin="anonymous"></script>
   <script type="text/javascript" src="_karma_webpack_/vendor.js" crossorigin="anonymous"></script>
   <script type="text/javascript" src="_karma_webpack_/main.js" crossorigin="anonymous"></script>
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-debug.html b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-debug.html
index 4f49e825a3d4..79d8708fdc87 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-debug.html
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-debug.html
@@ -32,6 +32,7 @@
   <script type="text/javascript" src="_karma_webpack_/polyfills.js" crossorigin="anonymous"></script>
   <!-- Dynamically replaced with <script> tags -->
   %SCRIPTS%
+  <script type="text/javascript" src="_karma_webpack_/styles.js" crossorigin="anonymous"></script>
   <script type="text/javascript" src="_karma_webpack_/scripts.js" crossorigin="anonymous"></script>
   <script type="text/javascript" src="_karma_webpack_/vendor.js" crossorigin="anonymous"></script>
   <script type="text/javascript" src="_karma_webpack_/main.js" crossorigin="anonymous"></script>
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
index 92f4776ae7b6..1799ce53075e 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
@@ -125,9 +125,6 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
   config.middleware = config.middleware || [];
   config.middleware.push('@angular-devkit/build-angular--fallback');
 
-  // Delete global styles entry, we don't want to load them.
-  delete webpackConfig.entry.styles;
-
   // The webpack tier owns the watch behavior so we want to force it in the config.
   webpackConfig.watch = !config.singleRun;
   if (config.singleRun) {
@@ -198,6 +195,7 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
           '/_karma_webpack_/runtime.js',
           '/_karma_webpack_/polyfills.js',
           '/_karma_webpack_/scripts.js',
+          '/_karma_webpack_/styles.js',
           '/_karma_webpack_/vendor.js',
         ];
         if (alwaysServe.indexOf(req.url) != -1) {
diff --git a/packages/angular_devkit/build_angular/test/karma/styles_spec_large.ts b/packages/angular_devkit/build_angular/test/karma/styles_spec_large.ts
new file mode 100644
index 000000000000..899fbea31e53
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/karma/styles_spec_large.ts
@@ -0,0 +1,59 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { runTargetSpec } from '@angular-devkit/architect/testing';
+import { tap } from 'rxjs/operators';
+import { host, karmaTargetSpec } from '../utils';
+
+
+describe('Karma Builder global styles', () => {
+  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
+  afterEach(done => host.restore().toPromise().then(done, done.fail));
+
+  it('works', (done) => {
+    host.writeMultipleFiles({
+      'src/styles.css': 'p {display: none}',
+      'src/app/app.component.ts': `
+        import { Component } from '@angular/core';
+
+        @Component({
+          selector: 'app-root',
+          template: '<p>Hello World</p>'
+        })
+        export class AppComponent {
+        }
+       `,
+      'src/app/app.component.spec.ts': `
+        import { TestBed, async } from '@angular/core/testing';
+        import { HttpModule } from '@angular/http';
+        import { AppComponent } from './app.component';
+
+        describe('AppComponent', () => {
+          beforeEach(async(() => {
+            TestBed.configureTestingModule({
+              imports: [
+                HttpModule
+              ],
+              declarations: [
+                AppComponent
+              ]
+            }).compileComponents();
+          }));
+
+          it('should not contain text that is hidden via css', async(() => {
+            const fixture = TestBed.createComponent(AppComponent);
+            expect(fixture.nativeElement.innerText).not.toContain('Hello World');
+          }));
+        });`,
+    });
+
+    runTargetSpec(host, karmaTargetSpec).pipe(
+      tap(buildEvent => expect(buildEvent.success).toBe(true)),
+    ).toPromise().then(done, done.fail);
+  });
+});

From 7ff1e1a33e04d10a29869834d1762cf3f8dc5082 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 27 Sep 2018 11:34:50 -0400
Subject: [PATCH 0225/1703] feat(@angular-devkit/build-angular): add progress
 option to xi18n

Add progress option to xi18n. It is passed to the webpack builder.

Fixes #11667.
---
 .../angular_devkit/build_angular/src/extract-i18n/index.ts   | 2 ++
 .../build_angular/src/extract-i18n/schema.json               | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
index 72752838f18f..34d327fedf7e 100644
--- a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
@@ -38,6 +38,7 @@ export interface ExtractI18nBuilderOptions {
   i18nLocale: string;
   outputPath?: string;
   outFile?: string;
+  progress?: boolean;
 }
 
 export class ExtractI18nBuilder implements Builder<ExtractI18nBuilderOptions> {
@@ -92,6 +93,7 @@ export class ExtractI18nBuilder implements Builder<ExtractI18nBuilderOptions> {
           i18nFormat: options.i18nFormat,
           i18nFile: outFile,
           aot: true,
+          progress: options.progress,
           assets: [],
           scripts: [],
           styles: [],
diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/schema.json b/packages/angular_devkit/build_angular/src/extract-i18n/schema.json
index 00dae2cdcb87..574a453c7883 100644
--- a/packages/angular_devkit/build_angular/src/extract-i18n/schema.json
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/schema.json
@@ -24,6 +24,11 @@
       "type": "string",
       "description": "Specifies the source language of the application."
     },
+    "progress": {
+      "type": "boolean",
+      "description": "Log progress to the console.",
+      "default": true
+    },
     "outputPath": {
       "type": "string",
       "description": "Path where output will be placed."

From a13d74cd985d50ca9bb07214d49e00aeb08794d1 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 27 Sep 2018 12:10:29 -0400
Subject: [PATCH 0226/1703] docs(@angular/cli): add progress to extractI18n
 workspace schema

---
 packages/angular/cli/lib/config/schema.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index c758f76f0a3b..cb898d3c7041 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -1101,6 +1101,11 @@
               "type": "string",
               "description": "Specifies the source language of the application."
             },
+            "progress": {
+              "type": "boolean",
+              "description": "Log progress to the console.",
+              "default": true
+            },
             "outputPath": {
               "type": "string",
               "description": "Path where output will be placed."

From f28cd7c42634b8d274a9958cd5443ded50456632 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 27 Sep 2018 12:37:21 +0200
Subject: [PATCH 0227/1703] style: improve formatting of spec file

---
 .../angular/application/other-files/app.component.spec.ts     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/schematics/angular/application/other-files/app.component.spec.ts b/packages/schematics/angular/application/other-files/app.component.spec.ts
index b6a0247dcd8a..0e7f901ad12d 100644
--- a/packages/schematics/angular/application/other-files/app.component.spec.ts
+++ b/packages/schematics/angular/application/other-files/app.component.spec.ts
@@ -1,6 +1,7 @@
 import { TestBed, async } from '@angular/core/testing';<% if (routing) { %>
 import { RouterTestingModule } from '@angular/router/testing';<% } %>
 import { AppComponent } from './app.component';
+                                                                        
 describe('AppComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({<% if (routing) { %>
@@ -12,16 +13,19 @@ describe('AppComponent', () => {
       ],
     }).compileComponents();
   }));
+
   it('should create the app', async(() => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.debugElement.componentInstance;
     expect(app).toBeTruthy();
   }));
+
   it(`should have as title '<%= name %>'`, async(() => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.debugElement.componentInstance;
     expect(app.title).toEqual('<%= name %>');
   }));
+
   it('should render title in a h1 tag', async(() => {
     const fixture = TestBed.createComponent(AppComponent);
     fixture.detectChanges();

From a97ccbab09498cbe9d55a5d7d68d638134e38c9f Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 27 Sep 2018 13:30:37 +0200
Subject: [PATCH 0228/1703] style: remove redundant `async` in tests

In component specs only the `compileComponents` is async thus the `async` on `it` are redudnant

Closes #12161
---
 .../application/other-files/app.component.spec.ts  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/schematics/angular/application/other-files/app.component.spec.ts b/packages/schematics/angular/application/other-files/app.component.spec.ts
index 0e7f901ad12d..23a395040bf2 100644
--- a/packages/schematics/angular/application/other-files/app.component.spec.ts
+++ b/packages/schematics/angular/application/other-files/app.component.spec.ts
@@ -1,7 +1,7 @@
 import { TestBed, async } from '@angular/core/testing';<% if (routing) { %>
 import { RouterTestingModule } from '@angular/router/testing';<% } %>
 import { AppComponent } from './app.component';
-                                                                        
+
 describe('AppComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({<% if (routing) { %>
@@ -14,22 +14,22 @@ describe('AppComponent', () => {
     }).compileComponents();
   }));
 
-  it('should create the app', async(() => {
+  it('should create the app', () => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.debugElement.componentInstance;
     expect(app).toBeTruthy();
-  }));
+  });
 
-  it(`should have as title '<%= name %>'`, async(() => {
+  it(`should have as title '<%= name %>'`, () => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.debugElement.componentInstance;
     expect(app.title).toEqual('<%= name %>');
-  }));
+  });
 
-  it('should render title in a h1 tag', async(() => {
+  it('should render title in a h1 tag', () => {
     const fixture = TestBed.createComponent(AppComponent);
     fixture.detectChanges();
     const compiled = fixture.debugElement.nativeElement;
     expect(compiled.querySelector('h1').textContent).toContain('Welcome to <%= name %>!');
-  }));
+  });
 });

From 78a6fabb4a882eed31f9c415db003500633b56c1 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Wed, 26 Sep 2018 15:39:44 -0400
Subject: [PATCH 0229/1703] fix(@angular/cli): allow empty string arguments

---
 packages/angular/cli/models/parser.ts      | 4 ----
 packages/angular/cli/models/parser_spec.ts | 7 ++++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/angular/cli/models/parser.ts b/packages/angular/cli/models/parser.ts
index 91082430d3b6..99d31f93c3dd 100644
--- a/packages/angular/cli/models/parser.ts
+++ b/packages/angular/cli/models/parser.ts
@@ -269,10 +269,6 @@ export function parseArguments(args: string[], options: Option[] | null): Argume
   const errors: string[] = [];
 
   for (let arg = args.shift(); arg !== undefined; arg = args.shift()) {
-    if (!arg) {
-      break;
-    }
-
     if (arg == '--') {
       // If we find a --, we're done.
       leftovers.push(...args);
diff --git a/packages/angular/cli/models/parser_spec.ts b/packages/angular/cli/models/parser_spec.ts
index 88de630a2ddd..73513c235c44 100644
--- a/packages/angular/cli/models/parser_spec.ts
+++ b/packages/angular/cli/models/parser_spec.ts
@@ -35,6 +35,7 @@ describe('parseArguments', () => {
   const tests: { [test: string]: Partial<Arguments> | ['!!!', Partial<Arguments>, string[]] } = {
     '--bool': { bool: true },
     '--bool=1': ['!!!', {}, ['--bool=1']],
+    '--bool  ': { bool: true, p1: '' },
     '-- --bool=1': { '--': ['--bool=1'] },
     '--bool=yellow': ['!!!', {}, ['--bool=yellow']],
     '--bool=true': { bool: true },
@@ -68,6 +69,10 @@ describe('parseArguments', () => {
     '--arr=1 --arr --arr c d': { arr: ['1', '', 'c'], p1: 'd' },
     '--arr=1 --arr --arr c d e': { arr: ['1', '', 'c'], p1: 'd', p2: 'e' },
     '--str=1': { str: '1' },
+    '--str=': { str: '' },
+    '--str ': { str: '' },
+    '--str  ': { str: '', p1: '' },
+    '--str    ': { str: '', p1: '', p2: '', '--': [''] },
     '--hello-world=1': { helloWorld: '1' },
     '--hello-bool': { helloBool: true },
     '--helloBool': { helloBool: true },
@@ -119,7 +124,7 @@ describe('parseArguments', () => {
   Object.entries(tests).forEach(([str, expected]) => {
     it(`works for ${str}`, () => {
       try {
-        const actual = parseArguments(str.split(/\s+/), options);
+        const actual = parseArguments(str.split(' '), options);
 
         expect(Array.isArray(expected)).toBe(false);
         expect(actual).toEqual(expected as Arguments);

From 4daa29955847ff284d3ad753515e21a197a63ab2 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Wed, 26 Sep 2018 15:47:33 -0400
Subject: [PATCH 0230/1703] fix(@angular/cli): allow -a=value arguments

If a flag is followed by an equal sign, just treat it as a long name. So
the example above would translate to --a=value, while -abc=123 would be
"-a -b -c=123".

Fixes #12308
---
 packages/angular/cli/models/parser.ts      | 6 ++++++
 packages/angular/cli/models/parser_spec.ts | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/packages/angular/cli/models/parser.ts b/packages/angular/cli/models/parser.ts
index 99d31f93c3dd..60344f416d57 100644
--- a/packages/angular/cli/models/parser.ts
+++ b/packages/angular/cli/models/parser.ts
@@ -281,6 +281,12 @@ export function parseArguments(args: string[], options: Option[] | null): Argume
       // Argument is of form -abcdef.  Starts at 1 because we skip the `-`.
       for (let i = 1; i < arg.length; i++) {
         const flag = arg[i];
+        // If the next character is an '=', treat it as a long flag.
+        if (arg[i + 1] == '=') {
+          const f = '--' + flag + arg.slice(i + 1);
+          _assignOption(f, args, options, parsedOptions, positionals, leftovers, ignored, errors);
+          break;
+        }
         // Treat the last flag as `--a` (as if full flag but just one letter). We do this in
         // the loop because it saves us a check to see if the arg is just `-`.
         if (i == arg.length - 1) {
diff --git a/packages/angular/cli/models/parser_spec.ts b/packages/angular/cli/models/parser_spec.ts
index 73513c235c44..972c5b6b25f4 100644
--- a/packages/angular/cli/models/parser_spec.ts
+++ b/packages/angular/cli/models/parser_spec.ts
@@ -80,7 +80,9 @@ describe('parseArguments', () => {
     '--noHelloBool': { helloBool: false },
     '--noBool': { bool: false },
     '-b': { bool: true },
+    '-b=true': { bool: true },
     '-sb': { bool: true, str: '' },
+    '-s=b': { str: 'b' },
     '-bs': { bool: true, str: '' },
     '--t1=true': { t1: true },
     '--t1': { t1: true },

From 5faf0cb53582b829e2527cbbc2cf53ff4a928098 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Wed, 26 Sep 2018 15:58:47 -0400
Subject: [PATCH 0231/1703] fix(@angular/cli): numerical flags should not give
 0 if empty

And numerical positional flags will be ignored.

If the value is an empty string, a number conversion would give 0. It is unexpected
from the user standpoint ("--num=" has the user expect a string value).
---
 packages/angular/cli/models/parser.ts      | 11 ++++++++---
 packages/angular/cli/models/parser_spec.ts | 11 +++++++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/packages/angular/cli/models/parser.ts b/packages/angular/cli/models/parser.ts
index 60344f416d57..9cba5e6355de 100644
--- a/packages/angular/cli/models/parser.ts
+++ b/packages/angular/cli/models/parser.ts
@@ -54,6 +54,8 @@ function _coerceType(str: string | undefined, type: OptionType, v?: Value): Valu
     case OptionType.Number:
       if (str === undefined) {
         return 0;
+      } else if (str === '') {
+        return undefined;
       } else if (Number.isFinite(+str)) {
         return +str;
       } else {
@@ -308,6 +310,8 @@ export function parseArguments(args: string[], options: Option[] | null): Argume
   }
 
   // Deal with positionals.
+  // TODO(hansl): this is by far the most complex piece of code in this file. Try to refactor it
+  //   simpler.
   if (positionals.length > 0) {
     let pos = 0;
     for (let i = 0; i < positionals.length;) {
@@ -317,10 +321,11 @@ export function parseArguments(args: string[], options: Option[] | null): Argume
 
       // We do this with a found flag because more than 1 option could have the same positional.
       for (const option of options) {
-        // If any option has this positional and no value, we need to remove it.
+        // If any option has this positional and no value, AND fit the type, we need to remove it.
         if (option.positional === pos) {
-          if (parsedOptions[option.name] === undefined) {
-            parsedOptions[option.name] = positionals[i];
+          const coercedValue = _coerce(positionals[i], option, parsedOptions[option.name]);
+          if (parsedOptions[option.name] === undefined && coercedValue !== undefined) {
+            parsedOptions[option.name] = coercedValue;
             found = true;
           } else {
             incrementI = false;
diff --git a/packages/angular/cli/models/parser_spec.ts b/packages/angular/cli/models/parser_spec.ts
index 972c5b6b25f4..dbec3d2712d6 100644
--- a/packages/angular/cli/models/parser_spec.ts
+++ b/packages/angular/cli/models/parser_spec.ts
@@ -19,6 +19,7 @@ describe('parseArguments', () => {
     { name: 'arr', aliases: [ 'a' ], type: OptionType.Array, description: '' },
     { name: 'p1', positional: 0, aliases: [], type: OptionType.String, description: '' },
     { name: 'p2', positional: 1, aliases: [], type: OptionType.String, description: '' },
+    { name: 'p3', positional: 2, aliases: [], type: OptionType.Number, description: '' },
     { name: 't1', aliases: [], type: OptionType.Boolean,
       types: [OptionType.Boolean, OptionType.String], description: '' },
     { name: 't2', aliases: [], type: OptionType.Boolean,
@@ -63,8 +64,13 @@ describe('parseArguments', () => {
     'val1 --num=1 val2': { num: 1, p1: 'val1', p2: 'val2' },
     '--p1=val1 --num=1 val2': { num: 1, p1: 'val1', p2: 'val2' },
     '--p1=val1 --num=1 --p2=val2 val3': { num: 1, p1: 'val1', p2: 'val2', '--': ['val3'] },
-    '--bool val1 --etc --num val2 --v': { bool: true, num: 0, p1: 'val1', p2: 'val2',
-                                          '--': ['--etc', '--v'] },
+    '--bool val1 --etc --num val2 --v': [
+      '!!!',
+      { bool: true, p1: 'val1', p2: 'val2', '--': ['--etc', '--v'] },
+      ['--num' ],
+    ],
+    '--bool val1 --etc --num=1 val2 --v': { bool: true, num: 1, p1: 'val1', p2: 'val2',
+                                            '--': ['--etc', '--v'] },
     '--arr=a --arr=b --arr c d': { arr: ['a', 'b', 'c'], p1: 'd' },
     '--arr=1 --arr --arr c d': { arr: ['1', '', 'c'], p1: 'd' },
     '--arr=1 --arr --arr c d e': { arr: ['1', '', 'c'], p1: 'd', p2: 'e' },
@@ -121,6 +127,7 @@ describe('parseArguments', () => {
     '--e3': { e3: true },
     '--e3 true': { e3: true },
     '--e3=true': { e3: true },
+    'a b c 1': { p1: 'a', p2: 'b', '--': ['c', '1'] },
   };
 
   Object.entries(tests).forEach(([str, expected]) => {

From d8eeced6b40a5f39d8f187c1e808aebe0afae8c8 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 25 Sep 2018 13:47:41 +0200
Subject: [PATCH 0232/1703] test: fix tests so it fails when servePath is not
 working

This is due that when targeting an html file, when it doesn't exists it redirects to the root page. So instead use a `js` files to test
---
 .../build_angular/test/dev-server/serve-path_spec_large.ts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts
index b49bc8c4c5e7..5a09230bb4fe 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts
@@ -17,16 +17,13 @@ describe('Dev Server Builder serve path', () => {
   beforeEach(done => host.initialize().toPromise().then(done, done.fail));
   afterEach(done => host.restore().toPromise().then(done, done.fail));
 
-  // TODO: review this test, it seems to pass with or without the servePath.
   it('works', (done) => {
     const overrides: Partial<DevServerBuilderOptions> = { servePath: 'test/' };
 
     runTargetSpec(host, devServerTargetSpec, overrides).pipe(
       tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      concatMap(() => from(request('http://localhost:4200/test/'))),
-      tap(response => expect(response).toContain('<title>HelloWorldApp</title>')),
-      concatMap(() => from(request('http://localhost:4200/test/abc/'))),
-      tap(response => expect(response).toContain('<title>HelloWorldApp</title>')),
+      concatMap(() => from(request('http://localhost:4200/test/polyfills.js'))),
+      tap(response => expect(response).toContain('window["webpackJsonp"]')),
       take(1),
     ).toPromise().then(done, done.fail);
   }, 30000);

From d582d80972ba60225702b98136ff3499a87c19a2 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 25 Sep 2018 13:41:52 +0200
Subject: [PATCH 0233/1703] fix(@angular-devkit/build-angular): addresses issue
 were `deployUrl` has no effect with serve

Closes #11952
---
 .../build_angular/src/dev-server/index.ts     |  2 ++
 .../test/dev-server/deploy-url_spec_large.ts  | 30 +++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 packages/angular_devkit/build_angular/test/dev-server/deploy-url_spec_large.ts

diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index 03ad4c0a0f6f..b925b71a62ea 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -55,6 +55,7 @@ export interface DevServerBuilderOptions {
   vendorChunk?: boolean;
   commonChunk?: boolean;
   baseHref?: string;
+  deployUrl?: string;
   progress?: boolean;
   poll?: number;
   verbose?: boolean;
@@ -406,6 +407,7 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
       'progress',
       'poll',
       'verbose',
+      'deployUrl',
     ];
 
     // remove options that are undefined or not to be overrriden
diff --git a/packages/angular_devkit/build_angular/test/dev-server/deploy-url_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/deploy-url_spec_large.ts
new file mode 100644
index 000000000000..7079aafdacdf
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/dev-server/deploy-url_spec_large.ts
@@ -0,0 +1,30 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { request, runTargetSpec } from '@angular-devkit/architect/testing';
+import { from } from 'rxjs';
+import { concatMap, take, tap } from 'rxjs/operators';
+import { DevServerBuilderOptions } from '../../src';
+import { devServerTargetSpec, host } from '../utils';
+
+
+describe('Dev Server Deploy Url', () => {
+  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
+  afterEach(done => host.restore().toPromise().then(done, done.fail));
+
+  it('works', (done) => {
+    const overrides: Partial<DevServerBuilderOptions> = { deployUrl: 'test/' };
+
+    runTargetSpec(host, devServerTargetSpec, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      concatMap(() => from(request('http://localhost:4200/test/polyfills.js'))),
+      tap(response => expect(response).toContain('window["webpackJsonp"]')),
+      take(1),
+    ).toPromise().then(done, done.fail);
+  }, 30000);
+});

From 5d8af571128faf551095a52655f68b1c4d77847a Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 4 Sep 2018 14:36:30 -0400
Subject: [PATCH 0234/1703] feat(@angular/cli): add `--defaults` option to `ng
 new`

Any option with a default value will not be prompted (if a prompt is defined) and the default will be used instead.

Closes #12084
---
 packages/angular/cli/commands/definitions.json   | 5 +++++
 packages/angular/cli/models/schematic-command.ts | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/commands/definitions.json b/packages/angular/cli/commands/definitions.json
index e292a75f9f97..201dd59e118c 100644
--- a/packages/angular/cli/commands/definitions.json
+++ b/packages/angular/cli/commands/definitions.json
@@ -54,6 +54,11 @@
           "type": "boolean",
           "default": "true",
           "description": "Disables interactive inputs (i.e., prompts)."
+        },
+        "defaults": {
+          "type": "boolean",
+          "default": "false",
+          "description": "Disables interactive inputs (i.e., prompts) for options with a default."
         }
       }
     }
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index d6ebcc96452c..1b52865ee85c 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -56,6 +56,7 @@ export interface BaseSchematicSchema {
   dryRun?: boolean;
   force?: boolean;
   interactive?: boolean;
+  defaults?: boolean;
 }
 
 export interface RunSchematicOptions extends BaseSchematicSchema {
@@ -262,7 +263,11 @@ export abstract class SchematicCommand<
 
     this._engineHost.registerOptionsTransform(validateOptionsWithSchema(workflow.registry));
 
-    workflow.registry.addPostTransform(schema.transforms.addUndefinedDefaults);
+    if (options.defaults) {
+      workflow.registry.addPreTransform(schema.transforms.addUndefinedDefaults);
+    } else {
+      workflow.registry.addPostTransform(schema.transforms.addUndefinedDefaults);
+    }
 
     workflow.registry.addSmartDefaultProvider('projectName', () => {
       if (this._workspace) {

From aa25a3344815ba609cdc2f3175469b54c3a14e2f Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 27 Sep 2018 12:36:06 -0400
Subject: [PATCH 0235/1703] feat(@angular/cli): show project being linted

Fixes #11231
---
 packages/angular/cli/commands/lint-impl.ts    |  8 ++-
 .../angular/cli/models/architect-command.ts   | 50 ++++++++++---------
 2 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/packages/angular/cli/commands/lint-impl.ts b/packages/angular/cli/commands/lint-impl.ts
index bf35c053a966..a67a8563d951 100644
--- a/packages/angular/cli/commands/lint-impl.ts
+++ b/packages/angular/cli/commands/lint-impl.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
+import { TargetSpecifier } from '@angular-devkit/architect';
 import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
 import { Arguments } from '../models/interface';
 import { Schema as LintCommandSchema } from './lint';
@@ -14,6 +14,12 @@ export class LintCommand extends ArchitectCommand<LintCommandSchema> {
   public readonly target = 'lint';
   public readonly multiTarget = true;
 
+  protected async runSingleTarget(targetSpec: TargetSpecifier, options: string[]) {
+    this.logger.info(`Linting ${JSON.stringify(targetSpec.project)}...`);
+
+    return super.runSingleTarget(targetSpec, options);
+  }
+
   public async run(options: ArchitectCommandOptions & Arguments) {
     return this.runArchitectTarget(options);
   }
diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index 38b7b59814f4..729afd19966f 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -135,31 +135,33 @@ export abstract class ArchitectCommand<
     return await this.runArchitectTarget(options);
   }
 
+  protected async runSingleTarget(targetSpec: TargetSpecifier, options: string[]) {
+    // We need to build the builderSpec twice because architect does not understand
+    // overrides separately (getting the configuration builds the whole project, including
+    // overrides).
+    const builderConf = this._architect.getBuilderConfiguration(targetSpec);
+    const builderDesc = await this._architect.getBuilderDescription(builderConf).toPromise();
+    const targetOptionArray = await parseJsonSchemaToOptions(this._registry, builderDesc.schema);
+    const overrides = parseArguments(options, targetOptionArray);
+
+    if (overrides['--']) {
+      (overrides['--'] || []).forEach(additional => {
+        this.logger.warn(`Unknown option: '${additional.split(/=/)[0]}'`);
+      });
+
+      return 1;
+    }
+    const realBuilderConf = this._architect.getBuilderConfiguration({ ...targetSpec, overrides });
+
+    return this._architect.run(realBuilderConf, { logger: this._logger }).pipe(
+      map((buildEvent: BuildEvent) => buildEvent.success ? 0 : 1),
+    ).toPromise();
+  }
+
   protected async runArchitectTarget(
     options: ArchitectCommandOptions & Arguments,
   ): Promise<number> {
-    const runSingleTarget = async (targetSpec: TargetSpecifier) => {
-      // We need to build the builderSpec twice because architect does not understand
-      // overrides separately (getting the configuration builds the whole project, including
-      // overrides).
-      const builderConf = this._architect.getBuilderConfiguration(targetSpec);
-      const builderDesc = await this._architect.getBuilderDescription(builderConf).toPromise();
-      const targetOptionArray = await parseJsonSchemaToOptions(this._registry, builderDesc.schema);
-      const overrides = parseArguments(options['--'] || [], targetOptionArray);
-
-      if (overrides['--']) {
-        (overrides['--'] || []).forEach(additional => {
-          this.logger.warn(`Unknown option: '${additional.split(/=/)[0]}'`);
-        });
-
-        return 1;
-      }
-      const realBuilderConf = this._architect.getBuilderConfiguration({ ...targetSpec, overrides });
-
-      return this._architect.run(realBuilderConf, { logger: this._logger }).pipe(
-        map((buildEvent: BuildEvent) => buildEvent.success ? 0 : 1),
-      ).toPromise();
-    };
+    const extra = options['--'] || [];
 
     try {
       const targetSpec = this._makeTargetSpecifier(options);
@@ -167,13 +169,13 @@ export abstract class ArchitectCommand<
         // This runs each target sequentially.
         // Running them in parallel would jumble the log messages.
         return await from(this.getProjectNamesByTarget(this.target)).pipe(
-          concatMap(project => from(runSingleTarget({ ...targetSpec, project }))),
+          concatMap(project => from(this.runSingleTarget({ ...targetSpec, project }, extra))),
           toArray(),
           map(results => results.every(res => res === 0) ? 0 : 1),
         )
         .toPromise();
       } else {
-        return await runSingleTarget(targetSpec);
+        return await this.runSingleTarget(targetSpec, extra);
       }
     } catch (e) {
       if (e instanceof schema.SchemaValidationException) {

From 4d46c4ac492e2ff460a52ca2a3f316c554df1521 Mon Sep 17 00:00:00 2001
From: Masahiko Sakakibara <sakakibara@rdlabo.jp>
Date: Fri, 28 Sep 2018 02:39:34 +0900
Subject: [PATCH 0236/1703] =?UTF-8?q?fix(@schematics/angular):=20support?=
 =?UTF-8?q?=20`Fetch=20as=20Google`=EF=BC=88Google=20bot)=20(#11815)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../angular/application/files/src/polyfills.ts           | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/angular/application/files/src/polyfills.ts b/packages/schematics/angular/application/files/src/polyfills.ts
index 074b89d38e40..6bf2547537d3 100644
--- a/packages/schematics/angular/application/files/src/polyfills.ts
+++ b/packages/schematics/angular/application/files/src/polyfills.ts
@@ -28,12 +28,19 @@
 // import 'core-js/es6/math';
 // import 'core-js/es6/string';
 // import 'core-js/es6/date';
-// import 'core-js/es6/array';
 // import 'core-js/es6/regexp';
 // import 'core-js/es6/map';
 // import 'core-js/es6/weak-map';
 // import 'core-js/es6/set';
 
+/**
+ * If your app need to indexed by Google Search, your app require polyfills 'core-js/es6/array'
+ * Google bot use ES5.
+ * FYI: Googlebot uses a renderer following the similar spec to Chrome 41.
+ * https://developers.google.com/search/docs/guides/rendering
+ **/
+// import 'core-js/es6/array';
+
 /** IE10 and IE11 requires the following for NgClass support on SVG elements */
 // import 'classlist.js';  // Run `npm install --save classlist.js`.
 

From fabcac10da7065de0b80aca2bd5654531fc798df Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Thu, 27 Sep 2018 17:21:56 -0400
Subject: [PATCH 0237/1703] feat(@schematics/angular): look for module in more
 places (#12389)

Recursively go through parents of the component and parents of the module name.

Fixes #7662.

Also shows tried directories on failure so the user has more informations.
---
 .../schematics/angular/utility/find-module.ts | 52 ++++++++++++++-----
 .../angular/utility/find-module_spec.ts       |  9 ++++
 2 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/packages/schematics/angular/utility/find-module.ts b/packages/schematics/angular/utility/find-module.ts
index de57684421cd..f1485c2aefb2 100644
--- a/packages/schematics/angular/utility/find-module.ts
+++ b/packages/schematics/angular/utility/find-module.ts
@@ -5,7 +5,15 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Path, join, normalize, relative, strings } from '@angular-devkit/core';
+import {
+  NormalizedRoot,
+  Path,
+  dirname,
+  join,
+  normalize,
+  relative,
+  strings,
+} from '@angular-devkit/core';
 import { DirEntry, Tree } from '@angular-devkit/schematics';
 
 
@@ -39,22 +47,40 @@ export function findModuleFromOptions(host: Tree, options: ModuleOptions): Path
 
     return normalize(findModule(host, pathToCheck, moduleExt, routingModuleExt));
   } else {
-    const modulePath = normalize(
-      '/' + (options.path) + '/' + options.module);
+    const modulePath = normalize(`/${options.path}/${options.module}`);
+    const componentPath = normalize(`/${options.path}/${options.name}`);
     const moduleBaseName = normalize(modulePath).split('/').pop();
 
-    const candidates = [
-      modulePath,
-      `${modulePath}.ts`,
-      `${modulePath}${moduleExt}`,
-      `${modulePath}/${moduleBaseName}${moduleExt}`,
-    ];
-    for (const c of candidates) {
-      if (host.exists(c)) {
-        return normalize(c);
+    const candidateSet = new Set<Path>([
+      normalize(options.path || '/'),
+    ]);
+
+    for (let dir = modulePath; dir != NormalizedRoot; dir = dirname(dir)) {
+      candidateSet.add(dir);
+    }
+    for (let dir = componentPath; dir != NormalizedRoot; dir = dirname(dir)) {
+      candidateSet.add(dir);
+    }
+
+    const candidatesDirs = [...candidateSet].sort((a, b) => b.length - a.length);
+    for (const c of candidatesDirs) {
+      const candidateFiles = [
+        '',
+        `${moduleBaseName}.ts`,
+        `${moduleBaseName}${moduleExt}`,
+      ].map(x => join(c, x));
+
+      for (const sc of candidateFiles) {
+        if (host.exists(sc)) {
+          return normalize(sc);
+        }
       }
     }
-    throw new Error(`Specified module '${options.module}' does not exist.`);
+
+    throw new Error(
+      `Specified module '${options.module}' does not exist.\n`
+        + `Looked in the following directories:\n    ${candidatesDirs.join('\n    ')}`,
+    );
   }
 }
 
diff --git a/packages/schematics/angular/utility/find-module_spec.ts b/packages/schematics/angular/utility/find-module_spec.ts
index 0d7ad5f1f424..babbdcbdb6a3 100644
--- a/packages/schematics/angular/utility/find-module_spec.ts
+++ b/packages/schematics/angular/utility/find-module_spec.ts
@@ -120,6 +120,15 @@ describe('find-module', () => {
       expect(modPath).toEqual('/projects/my-proj/src/admin/foo.module.ts' as Path);
     });
 
+    it('should find a module in a sub dir (2)', () => {
+      tree.create('/projects/my-proj/src/admin/foo.module.ts', '');
+      options.name = 'admin/hello';
+      options.module = 'foo';
+      options.path = '/projects/my-proj/src';
+      const modPath = findModuleFromOptions(tree, options);
+      expect(modPath).toEqual('/projects/my-proj/src/admin/foo.module.ts' as Path);
+    });
+
     it('should find a module using custom ext', () => {
       tree.create('/projects/my-proj/src/app_module.ts', '');
       options.module = 'app';

From 81508387685deac236b9ae4a45ff35a481fa0069 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Thu, 27 Sep 2018 17:23:54 -0400
Subject: [PATCH 0238/1703] ci: new true builder as a private package (#12390)

This is useful for testing things with a builder that always succeeds. In
a project, use "devkit-admin build && npm install $DEVKIT_PATH/dist/___builder.tgz"
and you have a "@_/builders" package that contains a true builder.

This is not published on NPM so I scope this as ci.
---
 .monorepo.json                           |  4 ++++
 packages/_/builders/builders.json        | 10 ++++++++++
 packages/_/builders/package.json         | 12 ++++++++++++
 packages/_/builders/src/noop-schema.json |  4 ++++
 packages/_/builders/src/true.ts          | 20 ++++++++++++++++++++
 5 files changed, 50 insertions(+)
 create mode 100644 packages/_/builders/builders.json
 create mode 100644 packages/_/builders/package.json
 create mode 100644 packages/_/builders/src/noop-schema.json
 create mode 100644 packages/_/builders/src/true.ts

diff --git a/.monorepo.json b/.monorepo.json
index 8a268938566b..a44fa49fc2db 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -45,6 +45,10 @@
       "version": "0.9.0-beta.4",
       "hash": "a9b1f213a4069f789d20021bda616775"
     },
+    "@_/builders": {
+      "version": "0.9.0-beta.4",
+      "hash": ""
+    },
     "devkit": {
       "version": "0.9.0-beta.4",
       "hash": "30ac66398ef7b4f7a5dbd3192d24c665"
diff --git a/packages/_/builders/builders.json b/packages/_/builders/builders.json
new file mode 100644
index 000000000000..87914ed792d2
--- /dev/null
+++ b/packages/_/builders/builders.json
@@ -0,0 +1,10 @@
+{
+  "$schema": "../architect/src/builders-schema.json",
+  "builders": {
+    "true": {
+      "class": "./src/true",
+      "schema": "./src/noop-schema.json",
+      "description": "Always succeed."
+    }
+  }
+}
diff --git a/packages/_/builders/package.json b/packages/_/builders/package.json
new file mode 100644
index 000000000000..0f9d3729d481
--- /dev/null
+++ b/packages/_/builders/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "@_/builders",
+  "version": "0.0.0",
+  "description": "CLI tool for Angular",
+  "main": "src/index.js",
+  "typings": "src/index.d.ts",
+  "builders": "builders.json",
+  "private": true,
+  "dependencies": {
+    "rxjs": "6.3.3"
+  }
+}
diff --git a/packages/_/builders/src/noop-schema.json b/packages/_/builders/src/noop-schema.json
new file mode 100644
index 000000000000..afadf0925f37
--- /dev/null
+++ b/packages/_/builders/src/noop-schema.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "type": "object"
+}
\ No newline at end of file
diff --git a/packages/_/builders/src/true.ts b/packages/_/builders/src/true.ts
new file mode 100644
index 000000000000..efe9b7cb0046
--- /dev/null
+++ b/packages/_/builders/src/true.ts
@@ -0,0 +1,20 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Observable, of } from 'rxjs';
+
+export class TrueBuilder {
+  constructor() {}
+
+  run(): Observable<{ success: boolean }> {
+    return of({
+      success: true,
+    });
+  }
+}
+
+export default TrueBuilder;

From 0aea618cca2f8b7c5bb45aa539e8b34f6a1c8a54 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sun, 30 Sep 2018 10:22:03 +0200
Subject: [PATCH 0239/1703] feat(@ngtools/webpack): add support for
 `TypeScript` 3.1

---
 packages/ngtools/webpack/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index c1bd0c3c32b5..2e2f58374416 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -29,13 +29,13 @@
   },
   "peerDependencies": {
     "@angular/compiler-cli": ">=5.0.0 <8.0.0 || ^7.0.0-beta.0",
-    "typescript": ">=2.4.0 < 3.1",
+    "typescript": ">=2.4.0 < 3.2",
     "webpack": "^4.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "^7.0.0-beta.4",
-    "@angular/compiler-cli": "^7.0.0-beta.4",
-    "typescript": "~3.0.1",
+    "@angular/compiler": "^7.0.0-rc.0",
+    "@angular/compiler-cli": "^7.0.0-rc.0",
+    "typescript": "~3.1.1",
     "webpack": "^4.0.0"
   }
 }

From 91e5fc0bfa0c2a7db8a5869d45e390f03e4e8f12 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sun, 30 Sep 2018 10:22:20 +0200
Subject: [PATCH 0240/1703] build: update to TypeScript 3.1

---
 package.json                                  |   6 +-
 packages/angular/cli/utilities/json-schema.ts |  20 +-
 .../angular_devkit/build_angular/package.json |  22 +--
 .../build_ng_packagr/package.json             |   4 +-
 .../build_optimizer/package.json              |   2 +-
 yarn.lock                                     | 174 ++++++++++++++----
 6 files changed, 165 insertions(+), 63 deletions(-)

diff --git a/package.json b/package.json
index 59b928ced8db..545259eeea87 100644
--- a/package.json
+++ b/package.json
@@ -68,11 +68,11 @@
     "quicktype-core": "^5.0.41",
     "temp": "^0.8.3",
     "tslint": "^5.11.0",
-    "typescript": "~3.0.1"
+    "typescript": "~3.1.1"
   },
   "devDependencies": {
-    "@angular/compiler": "^7.0.0-beta.4",
-    "@angular/compiler-cli": "^7.0.0-beta.4",
+    "@angular/compiler": "^7.0.0-rc.0",
+    "@angular/compiler-cli": "^7.0.0-rc.0",
     "@bazel/typescript": "0.16.1",
     "@ngtools/json-schema": "^1.1.0",
     "@types/copy-webpack-plugin": "^4.4.1",
diff --git a/packages/angular/cli/utilities/json-schema.ts b/packages/angular/cli/utilities/json-schema.ts
index ba4dea2bdbb1..40714c90651e 100644
--- a/packages/angular/cli/utilities/json-schema.ts
+++ b/packages/angular/cli/utilities/json-schema.ts
@@ -19,16 +19,20 @@ import {
   Value,
 } from '../models/interface';
 
-function _getEnumFromValue<E, T extends string>(v: json.JsonValue, e: E, d: T): T {
-  if (typeof v !== 'string') {
-    return d;
+function _getEnumFromValue<E, T extends E[keyof E]>(
+  value: json.JsonValue,
+  enumeration: E,
+  defaultValue: T,
+): T {
+  if (typeof value !== 'string') {
+    return defaultValue;
   }
 
-  if (Object.values(e).indexOf(v) !== -1) {
-    return v as T;
+  if (Object.values(enumeration).indexOf(value) !== -1) {
+    return value as unknown as T;
   }
 
-  return d;
+  return defaultValue;
 }
 
 export async function parseJsonSchemaToSubCommandDescription(
@@ -232,9 +236,9 @@ export async function parseJsonSchemaToOptions(
       ? $defaultIndex : undefined;
 
     const required = json.isJsonArray(current.required)
-        ? current.required.indexOf(name) != -1 : false;
+      ? current.required.indexOf(name) != -1 : false;
     const aliases = json.isJsonArray(current.aliases) ? [...current.aliases].map(x => '' + x)
-                  : current.alias ? ['' + current.alias] : [];
+      : current.alias ? ['' + current.alias] : [];
     const format = typeof current.format == 'string' ? current.format : undefined;
     const visible = current.visible === undefined || current.visible === true;
     const hidden = !!current.hidden || !visible;
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 402c0e9ac16f..c821ac2aeaf4 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -58,19 +58,19 @@
     "node-sass": "4.9.3"
   },
   "devDependencies": {
-    "@angular/animations": "^7.0.0-beta.4",
+    "@angular/animations": "^7.0.0-rc.0",
     "@angular/cdk": "^6.1.0",
-    "@angular/common": "^7.0.0-beta.4",
-    "@angular/compiler": "^7.0.0-beta.4",
-    "@angular/compiler-cli": "^7.0.0-beta.4",
-    "@angular/core": "^7.0.0-beta.4",
-    "@angular/http": "^7.0.0-beta.4",
+    "@angular/common": "^7.0.0-rc.0",
+    "@angular/compiler": "^7.0.0-rc.0",
+    "@angular/compiler-cli": "^7.0.0-rc.0",
+    "@angular/core": "^7.0.0-rc.0",
+    "@angular/http": "^7.0.0-rc.0",
     "@angular/material": "^6.1.0",
-    "@angular/platform-browser": "^7.0.0-beta.4",
-    "@angular/platform-browser-dynamic": "^7.0.0-beta.4",
-    "@angular/platform-server": "^7.0.0-beta.4",
-    "@angular/router": "^7.0.0-beta.4",
-    "@angular/service-worker": "^7.0.0-beta.4",
+    "@angular/platform-browser": "^7.0.0-rc.0",
+    "@angular/platform-browser-dynamic": "^7.0.0-rc.0",
+    "@angular/platform-server": "^7.0.0-rc.0",
+    "@angular/router": "^7.0.0-rc.0",
+    "@angular/service-worker": "^7.0.0-rc.0",
     "codelyzer": "^4.2.1",
     "core-js": "^2.4.1",
     "bootstrap": "^4.0.0",
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index be36b386bc2a..4b9668125eab 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -15,8 +15,8 @@
     "ng-packagr": "^2.2.0 || ^3.0.0 || ^4.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "^7.0.0-beta.4",
-    "@angular/compiler-cli": "^7.0.0-beta.4",
+    "@angular/compiler": "^7.0.0-rc.0",
+    "@angular/compiler-cli": "^7.0.0-rc.0",
     "ng-packagr": "^4.2.0",
     "tsickle": ">=0.27.3",
     "tslib": "^1.9.0"
diff --git a/packages/angular_devkit/build_optimizer/package.json b/packages/angular_devkit/build_optimizer/package.json
index 5c3487381dba..6aba9ecc612e 100644
--- a/packages/angular_devkit/build_optimizer/package.json
+++ b/packages/angular_devkit/build_optimizer/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "loader-utils": "1.1.0",
     "source-map": "0.5.6",
-    "typescript": "3.0.1",
+    "typescript": "3.1.1",
     "webpack-sources": "1.2.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 2c0c560b0e66..cf3b27c5ac46 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@angular/animations@^7.0.0-beta.4":
-  version "7.0.0-beta.5"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.0.0-beta.5.tgz#5457ac4c8bb9f20e4d6d1dd8d2a2379b28d83d4a"
+"@angular/animations@^7.0.0-rc.0":
+  version "7.0.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.0.0-rc.0.tgz#963e64fa7265d948a08cb32508cea1a24107e439"
   dependencies:
     tslib "^1.9.0"
 
@@ -14,38 +14,42 @@
   dependencies:
     tslib "^1.7.1"
 
-"@angular/common@^7.0.0-beta.4":
-  version "7.0.0-beta.5"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.0.0-beta.5.tgz#8248838e1e1fd1fa472d521face6e08dc62e1fe4"
+"@angular/common@^7.0.0-rc.0":
+  version "7.0.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.0.0-rc.0.tgz#4872a430838653cbddfba759ccf1f9332c065171"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^7.0.0-beta.4":
-  version "7.0.0-beta.5"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.0.0-beta.5.tgz#2c12cf4be3de8a5b723bbb0f34852f9e04ad5da2"
+"@angular/compiler-cli@^7.0.0-rc.0":
+  version "7.0.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.0.0-rc.0.tgz#59f37f2409ce896cb73daa221dbd898855d12939"
   dependencies:
+    canonical-path "0.0.2"
     chokidar "^1.4.2"
     convert-source-map "^1.5.1"
+    dependency-graph "^0.7.2"
     magic-string "^0.25.0"
     minimist "^1.2.0"
     reflect-metadata "^0.1.2"
+    shelljs "^0.8.1"
     source-map "^0.6.1"
+    yargs "9.0.1"
 
-"@angular/compiler@^7.0.0-beta.4":
-  version "7.0.0-beta.5"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.0.0-beta.5.tgz#33adfdd15f20dfad80a6cb1cdf6a0999e0d46706"
+"@angular/compiler@^7.0.0-rc.0":
+  version "7.0.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.0.0-rc.0.tgz#2dfd293ad6583f9574c9fe79354256206f594a51"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^7.0.0-beta.4":
-  version "7.0.0-beta.5"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.0.0-beta.5.tgz#c83c7b8a9d257d7b52695d45ae3ddc4677e929af"
+"@angular/core@^7.0.0-rc.0":
+  version "7.0.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.0.0-rc.0.tgz#c1d845d5d1718f96f542abe7ae86b64c280da3bb"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^7.0.0-beta.4":
-  version "7.0.0-beta.5"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.0.0-beta.5.tgz#d4524f19e347c88620ca32ac0144474c269f1786"
+"@angular/http@^7.0.0-rc.0":
+  version "7.0.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.0.0-rc.0.tgz#659c3ac6bd66199a726f1f46cdc800fc25e37922"
   dependencies:
     tslib "^1.9.0"
 
@@ -57,35 +61,35 @@
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/platform-browser-dynamic@^7.0.0-beta.4":
-  version "7.0.0-beta.5"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.0.0-beta.5.tgz#e0abaa35b039a76f94cb2c816370a803ecf1239b"
+"@angular/platform-browser-dynamic@^7.0.0-rc.0":
+  version "7.0.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.0.0-rc.0.tgz#b66d4c30ed25f67dab15e64462b959d039ada705"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^7.0.0-beta.4":
-  version "7.0.0-beta.5"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.0.0-beta.5.tgz#f7d5496fa6d04e77d71008016914f0ad088f6bad"
+"@angular/platform-browser@^7.0.0-rc.0":
+  version "7.0.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.0.0-rc.0.tgz#9e19e83bce242f9dde0457719d15a87a90e314cc"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-server@^7.0.0-beta.4":
-  version "7.0.0-beta.5"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.0.0-beta.5.tgz#691ce9cb98dbd7bee3453f8b4bc998790b85e25d"
+"@angular/platform-server@^7.0.0-rc.0":
+  version "7.0.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.0.0-rc.0.tgz#ae03a549203b91e6335fb3b4401fe9c0c972fc00"
   dependencies:
-    domino "^2.0.1"
+    domino "^2.1.0"
     tslib "^1.9.0"
     xhr2 "^0.1.4"
 
-"@angular/router@^7.0.0-beta.4":
-  version "7.0.0-beta.5"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.0.0-beta.5.tgz#7603f059d1cd3cb2324b72b8f3d62c2df7e98809"
+"@angular/router@^7.0.0-rc.0":
+  version "7.0.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.0.0-rc.0.tgz#6d6ddae8cf8bb15f9c0aaba2bb7487eb42248bd2"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@^7.0.0-beta.4":
-  version "7.0.0-beta.5"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.0.0-beta.5.tgz#9d932d4f6057ca2fb322b218f4b0e5ffd06285a5"
+"@angular/service-worker@^7.0.0-rc.0":
+  version "7.0.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.0.0-rc.0.tgz#52c9bb2c2014f7c2360e1d5a2bd87a18296ba04b"
   dependencies:
     tslib "^1.9.0"
 
@@ -1443,6 +1447,10 @@ caniuse-lite@^1.0.30000832, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.300008
   version "1.0.30000885"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000885.tgz#e889e9f8e7e50e769f2a49634c932b8aee622984"
 
+canonical-path@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-0.0.2.tgz#e31eb937a8c93ee2a01df1839794721902874574"
+
 capture-stack-trace@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
@@ -2312,6 +2320,10 @@ depd@~1.1.1, depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
 
+dependency-graph@^0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.7.2.tgz#91db9de6eb72699209d88aea4c1fd5221cac1c49"
+
 des.js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
@@ -2432,7 +2444,7 @@ domhandler@2.1:
   dependencies:
     domelementtype "1"
 
-domino@^2.0.1:
+domino@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.0.tgz#653ba7d331441113b42e40ba05f24253ec86e02e"
 
@@ -3813,6 +3825,10 @@ internal-ip@^3.0.1:
     default-gateway "^2.6.0"
     ipaddr.js "^1.5.2"
 
+interpret@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
+
 into-stream@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
@@ -4610,6 +4626,15 @@ load-json-file@^1.0.0:
     pinkie-promise "^2.0.0"
     strip-bom "^2.0.0"
 
+load-json-file@^2.0.0:
+  version "2.0.0"
+  resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    strip-bom "^3.0.0"
+
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
@@ -4832,6 +4857,12 @@ media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
 
+mem@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
+  dependencies:
+    mimic-fn "^1.0.0"
+
 mem@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf"
@@ -5537,6 +5568,14 @@ os-locale@^1.4.0:
   dependencies:
     lcid "^1.0.0"
 
+os-locale@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
+  dependencies:
+    execa "^0.7.0"
+    lcid "^1.0.0"
+    mem "^1.1.0"
+
 os-locale@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.0.1.tgz#3b014fbf01d87f60a1e5348d80fe870dc82c4620"
@@ -5772,6 +5811,12 @@ path-type@^1.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+path-type@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
+  dependencies:
+    pify "^2.0.0"
+
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -6211,6 +6256,13 @@ read-pkg-up@^1.0.1:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
 
+read-pkg-up@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
+  dependencies:
+    find-up "^2.0.0"
+    read-pkg "^2.0.0"
+
 read-pkg-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
@@ -6233,6 +6285,14 @@ read-pkg@^1.0.0, read-pkg@^1.1.0:
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
+read-pkg@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
+  dependencies:
+    load-json-file "^2.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^2.0.0"
+
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -6291,6 +6351,12 @@ readdirp@^2.0.0:
     readable-stream "^2.0.2"
     set-immediate-shim "^1.0.1"
 
+rechoir@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  dependencies:
+    resolve "^1.1.6"
+
 redent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
@@ -6820,6 +6886,14 @@ shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
 
+shelljs@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.2.tgz#345b7df7763f4c2340d584abb532c5f752ca9e35"
+  dependencies:
+    glob "^7.0.0"
+    interpret "^1.0.0"
+    rechoir "^0.6.2"
+
 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"
@@ -7676,9 +7750,9 @@ typescript@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.1.tgz#43738f29585d3a87575520a4b93ab6026ef11fdb"
 
-typescript@~3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.3.tgz#4853b3e275ecdaa27f78fda46dc273a7eb7fc1c8"
+typescript@3.1.1, typescript@~3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.1.tgz#3362ba9dd1e482ebb2355b02dfe8bcd19a2c7c96"
 
 uglify-es@^3.3.4:
   version "3.3.9"
@@ -8262,6 +8336,12 @@ yargs-parser@^5.0.0:
   dependencies:
     camelcase "^3.0.0"
 
+yargs-parser@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
+  dependencies:
+    camelcase "^4.1.0"
+
 yargs@12.0.2:
   version "12.0.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
@@ -8279,6 +8359,24 @@ yargs@12.0.2:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^10.1.0"
 
+yargs@9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
+  dependencies:
+    camelcase "^4.1.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^2.0.0"
+    read-pkg-up "^2.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^7.0.0"
+
 yargs@^3.10.0:
   version "3.32.0"
   resolved "http://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995"

From b040a3ccfdc30c06e2f7606da5dae8fd0535cf20 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sun, 30 Sep 2018 10:00:04 +0200
Subject: [PATCH 0241/1703] feat(@schematics/angular): update to latest
 versions of `TypeScript` and `Angular`

---
 packages/schematics/angular/utility/latest-versions.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 10accb03e94f..4e0686d0c40f 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -8,10 +8,10 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~7.0.0-beta.5',
+  Angular: '~7.0.0-rc.0',
   RxJs: '~6.3.3',
   ZoneJs: '~0.8.26',
-  TypeScript: '~3.0.1',
+  TypeScript: '~3.1.1',
   // The versions below must be manually updated when making a new devkit release.
   DevkitBuildAngular: '~0.9.0-beta.1',
   DevkitBuildNgPackagr: '~0.9.0-beta.1',

From 4b7bff05123711c8be209414606ecb177ace0f17 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 1 Oct 2018 10:03:43 +0200
Subject: [PATCH 0242/1703] test: add `skipLibCheck` to `type-warning` test

Declarations in `3.1` are not valid with TypeScript `2.8` which will cause an error and the process will exit with a non zero code.
---
 tests/legacy-cli/e2e/tests/misc/typescript-warning.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/legacy-cli/e2e/tests/misc/typescript-warning.ts b/tests/legacy-cli/e2e/tests/misc/typescript-warning.ts
index 2bbec6ed10dd..f6f10c14a46e 100644
--- a/tests/legacy-cli/e2e/tests/misc/typescript-warning.ts
+++ b/tests/legacy-cli/e2e/tests/misc/typescript-warning.ts
@@ -3,9 +3,16 @@ import { updateJsonFile } from '../../utils/project';
 
 export default async function () {
   // typescript@2.8.0-dev.20180320 is not part of the officially supported range in latest stable.
-  let unsupportedTsVersion = '2.8.0-dev.20180320';
+  const unsupportedTsVersion = '2.8.0-dev.20180320';
 
   await updateJsonFile('src/tsconfig.app.json', configJson => {
+    // skipLibCheck is required because declerations
+    // emitted in TS 3.1 are not compatable with TS 2.8
+    // Thus it will exit with a non zero error code.
+    configJson.compilerOptions = {
+      ...configJson.compilerOptions,
+      skipLibCheck: true,
+    };
     configJson.angularCompilerOptions = {
       ...configJson.angularCompilerOptions,
       disableTypeScriptVersionCheck: true,

From 52b22bf2e46e35af0210b7f2ffe055c503d37cee Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Fri, 28 Sep 2018 17:39:05 -0400
Subject: [PATCH 0243/1703] docs: sort changelog by feature first, then fixes

---
 scripts/templates/changelog.ejs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/scripts/templates/changelog.ejs b/scripts/templates/changelog.ejs
index 6dab1fd6906e..1aaf43467a1d 100644
--- a/scripts/templates/changelog.ejs
+++ b/scripts/templates/changelog.ejs
@@ -56,9 +56,13 @@
     });
 
   for (const scope of scopes) {
-    const scopeCommits = commits
-      .filter(x => x.scope === scope)
-      .filter(x => ['fix', 'feat'].includes(x.type));
+    // Do feature first, then fixes.
+    const allScopeCommits = commits.filter(x => x.scope === scope);
+
+    const scopeCommits = [
+      ...allScopeCommits.filter(x => x.type === 'feat'),
+      ...allScopeCommits.filter(x => x.type === 'fix'),
+    ];
 
     if (scopeCommits.length == 0) {
         continue;

From 3fd6afc7f8de53813e7fd17ba41399e358a68d97 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Fri, 28 Sep 2018 14:36:55 -0400
Subject: [PATCH 0244/1703] feat(@angular-devkit/build-angular): add
 --reporters option to test

It was a regression, and used by enough people on CI. No reason it should be
omitted and karma.conf.js only.

Fixes #11376
---
 packages/angular/cli/lib/config/schema.json                | 7 +++++++
 packages/angular_devkit/build_angular/src/karma/index.ts   | 7 +++++++
 .../angular_devkit/build_angular/src/karma/schema.d.ts     | 5 +++++
 .../angular_devkit/build_angular/src/karma/schema.json     | 7 +++++++
 4 files changed, 26 insertions(+)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index cb898d3c7041..ba1c6a7b66e6 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -1261,6 +1261,13 @@
                 ]
               },
               "default": []
+            },
+            "reporters": {
+              "type": "array",
+              "description": "Karma reporters to use. Directly passed to the karma runner.",
+              "items": {
+                "type": "string"
+              }
             }
           },
           "additionalProperties": false,
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index df1138edc85a..3d1b066d9f1b 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -71,6 +71,13 @@ export class KarmaBuilder implements Builder<KarmaBuilderSchema> {
           karmaOptions.browsers = options.browsers.split(',');
         }
 
+        if (options.reporters) {
+          // Split along commas to make it more natural, and remove empty strings.
+          karmaOptions.reporters = options.reporters
+            .reduce<string[]>((acc, curr) => acc.concat(curr.split(/,/)), [])
+            .filter(x => !!x);
+        }
+
         const sourceRoot = builderConfig.sourceRoot && resolve(root, builderConfig.sourceRoot);
 
         karmaOptions.buildWebpack = {
diff --git a/packages/angular_devkit/build_angular/src/karma/schema.d.ts b/packages/angular_devkit/build_angular/src/karma/schema.d.ts
index 650e05c3d6c7..4ea24b6afe19 100644
--- a/packages/angular_devkit/build_angular/src/karma/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/karma/schema.d.ts
@@ -32,4 +32,9 @@ export interface KarmaBuilderSchema extends Pick<BrowserBuilderSchema,
    * Globs to exclude from code coverage.
    */
   codeCoverageExclude: string[];
+
+  /**
+   * Karma reporters to use. Directly passed to the karma runner.
+   */
+  reporters?: string[];
 }
diff --git a/packages/angular_devkit/build_angular/src/karma/schema.json b/packages/angular_devkit/build_angular/src/karma/schema.json
index 07c55a413404..d883af8cf848 100644
--- a/packages/angular_devkit/build_angular/src/karma/schema.json
+++ b/packages/angular_devkit/build_angular/src/karma/schema.json
@@ -150,6 +150,13 @@
         ]
       },
       "default": []
+    },
+    "reporters": {
+      "type": "array",
+      "description": "Karma reporters to use. Directly passed to the karma runner.",
+      "items": {
+        "type": "string"
+      }
     }
   },
   "additionalProperties": false,

From afb235100cdc2bf53a9e71802a611c9eb97d46ce Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 27 Sep 2018 14:19:23 -0400
Subject: [PATCH 0245/1703] ci: enable size check comments

---
 .github/angular-robot.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/angular-robot.yml b/.github/angular-robot.yml
index 2ebaf76633ef..5e6b231c9d62 100644
--- a/.github/angular-robot.yml
+++ b/.github/angular-robot.yml
@@ -96,3 +96,4 @@ triage:
 size:
   circleCiStatusName: "ci/circleci: e2e-cli"
   maxSizeIncrease: 10000
+  comment: true

From 14f787ad730b103b8052224a0e06aa161a6ca703 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 28 Sep 2018 16:33:03 +0200
Subject: [PATCH 0246/1703] refactor: remove code that was needed for `eject`

---
 .../src/angular-cli-files/models/webpack-configs/common.ts   | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 5bf3b61b4849..9be395734d5e 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -150,11 +150,6 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
 
     const copyWebpackPluginInstance = new CopyWebpackPlugin(copyWebpackPluginPatterns,
       copyWebpackPluginOptions);
-
-    // Save options so we can use them in eject.
-    (copyWebpackPluginInstance as any)['copyWebpackPluginPatterns'] = copyWebpackPluginPatterns;
-    (copyWebpackPluginInstance as any)['copyWebpackPluginOptions'] = copyWebpackPluginOptions;
-
     extraPlugins.push(copyWebpackPluginInstance);
   }
 

From 61ce0ce6d5e0923498edb249073ac183ec0ff48a Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Fri, 28 Sep 2018 16:59:21 +0100
Subject: [PATCH 0247/1703] fix(@angular-devkit/build-angular): don't rerun
 tests on unchanged compilation

Fix #11880
---
 .../build_angular/src/angular-cli-files/plugins/karma.ts  | 6 ++++--
 .../build_angular/test/karma/rebuilds_spec_large.ts       | 8 +++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
index 1799ce53075e..54de40d22155 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
@@ -174,9 +174,11 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
     blocked = [];
   }
 
+  let lastCompilationHash: string | undefined;
   compiler.hooks.done.tap('karma', (stats: any) => {
-    // Don't refresh karma when there are webpack errors.
-    if (stats.compilation.errors.length === 0) {
+    // Refresh karma only when there are no webpack errors, and if the compilation changed.
+    if (stats.compilation.errors.length === 0 && stats.hash != lastCompilationHash) {
+      lastCompilationHash = stats.hash;
       emitter.refreshFiles();
     }
     unblock();
diff --git a/packages/angular_devkit/build_angular/test/karma/rebuilds_spec_large.ts b/packages/angular_devkit/build_angular/test/karma/rebuilds_spec_large.ts
index 5f592eac380e..494823bf121a 100644
--- a/packages/angular_devkit/build_angular/test/karma/rebuilds_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/karma/rebuilds_spec_large.ts
@@ -13,7 +13,8 @@ import { host, karmaTargetSpec } from '../utils';
 
 // Karma watch mode is currently bugged:
 // - errors print a huge stack trace
-// - karma does not have a way to close the server gracefully.
+// - karma does not have a way to close the server
+//   gracefully (https://github.com/karma-runner/karma/issues/3149)
 // TODO: fix these before 6.0 final.
 xdescribe('Karma Builder watch mode', () => {
   beforeEach(done => host.initialize().toPromise().then(done, done.fail));
@@ -64,4 +65,9 @@ xdescribe('Karma Builder watch mode', () => {
       take(3),
     ).toPromise().then(done, done.fail);
   }, 30000);
+
+  it('does not rebuild when nothing changed', (done) => {
+    // Start the server in watch mode, wait for the first build to finish, touch
+    // test.js without changing it, wait 5s then exit unsuscribe, verify only one event was emitted.
+  }, 30000);
 });

From 381eac3e2846060b5be052b46eb0cc533c50faae Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Mon, 1 Oct 2018 09:44:07 -0700
Subject: [PATCH 0248/1703] release: v7.0.0-rc.0

---
 .monorepo.json | 76 +++++++++++++++++++++++++-------------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index a44fa49fc2db..3f59dfff1ef8 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,16 +42,16 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.9.0-beta.4",
-      "hash": "a9b1f213a4069f789d20021bda616775"
+      "version": "0.9.0-rc.0",
+      "hash": "2bee2bd5743e4b92e00d80e814e1e198"
     },
     "@_/builders": {
-      "version": "0.9.0-beta.4",
-      "hash": ""
+      "version": "0.9.0-rc.0",
+      "hash": "569aef8bc23693c344e71b9755e62c50"
     },
     "devkit": {
-      "version": "0.9.0-beta.4",
-      "hash": "30ac66398ef7b4f7a5dbd3192d24c665"
+      "version": "0.9.0-rc.0",
+      "hash": "3c97bd5c2400408973714377228d9b91"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -62,15 +62,15 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md"
         }
       ],
-      "version": "7.0.0-beta.4",
+      "version": "7.0.0-rc.0",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "861fb8f47bfe7c42b61ba03c923e4c4f"
+      "hash": "3d4e669537f043fa072edf7d637e09f1"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.9.0-beta.4",
-      "hash": "5ce80a80caee296f31fd7973d1d1af7c",
+      "version": "0.9.0-rc.0",
+      "hash": "c587f9a0ed386e362e37d27d585b5220",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -81,21 +81,21 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.9.0-beta.4",
-      "hash": "6b477a8c670ac1aaf8232517932026e9",
+      "version": "0.9.0-rc.0",
+      "hash": "c3214f137c5f65626f159d766947c655",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.9.0-beta.4",
-      "hash": "0df3aa7f3bccb0a2390f7691ef610ba4",
+      "version": "0.9.0-rc.0",
+      "hash": "1898d2d1a732273823f67e171ef09cb3",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
       "name": "Benchmark",
       "section": "Tooling",
-      "version": "1.0.0-beta.1",
-      "hash": "b413c32410c61f3d7096f40f60e69cc9"
+      "version": "1.0.0-rc.0",
+      "hash": "8a7ed399be57e27f34fd87bafef305d7"
     },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
@@ -105,8 +105,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.9.0-beta.4",
-      "hash": "5f028763dff86aaebc80476e1f550d9f",
+      "version": "0.9.0-rc.0",
+      "hash": "4421b34d6ab9f98073b6e97f47caffdc",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -117,8 +117,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.9.0-beta.4",
-      "hash": "228c997459d1106b0b9bfcc2636fb838",
+      "version": "0.9.0-rc.0",
+      "hash": "b3fe554470fc4521f3e64a4d57f46a73",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -129,8 +129,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.9.0-beta.4",
-      "hash": "4d12d45c630abe262a3844b0021801cf",
+      "version": "0.9.0-rc.0",
+      "hash": "86c242b9753d5f30500ef94255f0445d",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -141,9 +141,9 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.9.0-beta.4",
+      "version": "0.9.0-rc.0",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "5887fbece28cf8e795cadf95b4518de1"
+      "hash": "4f68658d4c673a456183e17c345598d8"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -153,8 +153,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "7.0.0-beta.4",
-      "hash": "7f4c330644a23e8f1383256c9593842f",
+      "version": "7.0.0-rc.0",
+      "hash": "ae9459adc8ec3c06e6f4eb4b6699c89d",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -165,43 +165,43 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "7.0.0-beta.4",
-      "hash": "30b6fadcf785da5b8d911ab0dca30397",
+      "version": "7.0.0-rc.0",
+      "hash": "1eeedd23a574aa20eb500d885b290623",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.9.0-beta.4",
-      "hash": "e143b8e611f5b5d5b24ee1a62bc638ef",
+      "version": "0.9.0-rc.0",
+      "hash": "fd24f66e92bea5d4d8ec655ff692429d",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "7.0.0-beta.4",
+      "version": "7.0.0-rc.0",
       "section": "Misc",
-      "hash": "213663b5fd23e27196cf83bef9f0f41c",
+      "hash": "caeb4d5ea57ce457f5cbef7719f1ce94",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "7.0.0-beta.4",
-      "hash": "963b148fe42112d53ba26cea010089e9",
+      "version": "7.0.0-rc.0",
+      "hash": "b788004582e68ce8a020cbd4dcb93b9e",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.9.0-beta.4",
+      "version": "0.9.0-rc.0",
       "section": "Schematics",
-      "hash": "a6726ae6664fb43c861e3bb4bb0ccb76",
+      "hash": "7fe124e891c2d6d01bee4aef49372be5",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.9.0-beta.4",
+      "version": "0.9.0-rc.0",
       "section": "Schematics",
-      "hash": "5bbb5fd7ebaf18b452dee36521ab5142",
+      "hash": "7dbd4234020f0903d9138cd20b395d73",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }

From 6038efbd720ec6d50e82b3aa539981b9dc9bc706 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 1 Oct 2018 20:39:28 +0200
Subject: [PATCH 0249/1703] feat(@schematics/angular): update `TypeScript` to
 `3.1`

---
 packages/schematics/angular/package.json | 2 +-
 yarn.lock                                | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/schematics/angular/package.json b/packages/schematics/angular/package.json
index 2aa67c7156e6..e9683c86c404 100644
--- a/packages/schematics/angular/package.json
+++ b/packages/schematics/angular/package.json
@@ -11,6 +11,6 @@
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
-    "typescript": "3.0.1"
+    "typescript": "3.1.1"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index cf3b27c5ac46..a3ac15a74c64 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7746,10 +7746,6 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-typescript@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.1.tgz#43738f29585d3a87575520a4b93ab6026ef11fdb"
-
 typescript@3.1.1, typescript@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.1.tgz#3362ba9dd1e482ebb2355b02dfe8bcd19a2c7c96"

From ab1dfd0927b3cd2f49c9efa724b6327e763661c9 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Mon, 1 Oct 2018 16:13:34 -0700
Subject: [PATCH 0250/1703] release: v7.0.0-rc.1

---
 .monorepo.json                                | 76 +++++++++----------
 .../angular/utility/latest-versions.ts        |  4 +-
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index 3f59dfff1ef8..46e616e86557 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,16 +42,16 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.9.0-rc.0",
-      "hash": "2bee2bd5743e4b92e00d80e814e1e198"
+      "version": "0.9.0-rc.1",
+      "hash": "a9b1f213a4069f789d20021bda616775"
     },
     "@_/builders": {
-      "version": "0.9.0-rc.0",
-      "hash": "569aef8bc23693c344e71b9755e62c50"
+      "version": "0.9.0-rc.1",
+      "hash": "f34470f978203f13c312094472b0a343"
     },
     "devkit": {
-      "version": "0.9.0-rc.0",
-      "hash": "3c97bd5c2400408973714377228d9b91"
+      "version": "0.9.0-rc.1",
+      "hash": "3552542bc61cedbeab0fd5b9dd6ae44c"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -62,15 +62,15 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md"
         }
       ],
-      "version": "7.0.0-rc.0",
+      "version": "7.0.0-rc.1",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "3d4e669537f043fa072edf7d637e09f1"
+      "hash": "71c538637e997e786449b8be2f5549f1"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.9.0-rc.0",
-      "hash": "c587f9a0ed386e362e37d27d585b5220",
+      "version": "0.9.0-rc.1",
+      "hash": "57add138d13c50761208286b625d8111",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -81,21 +81,21 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.9.0-rc.0",
-      "hash": "c3214f137c5f65626f159d766947c655",
+      "version": "0.9.0-rc.1",
+      "hash": "6bdbfa3a9aed04efa9509be2b553124c",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.9.0-rc.0",
-      "hash": "1898d2d1a732273823f67e171ef09cb3",
+      "version": "0.9.0-rc.1",
+      "hash": "c1eb256f9547fb5c836ec70dd2c408f8",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
       "name": "Benchmark",
       "section": "Tooling",
-      "version": "1.0.0-rc.0",
-      "hash": "8a7ed399be57e27f34fd87bafef305d7"
+      "version": "1.0.0-rc.1",
+      "hash": "c11b907aeab37274a842f73524ec5e73"
     },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
@@ -105,8 +105,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.9.0-rc.0",
-      "hash": "4421b34d6ab9f98073b6e97f47caffdc",
+      "version": "0.9.0-rc.1",
+      "hash": "e8feec7840897e25731c34238506deae",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -117,8 +117,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.9.0-rc.0",
-      "hash": "b3fe554470fc4521f3e64a4d57f46a73",
+      "version": "0.9.0-rc.1",
+      "hash": "977f57fe835fac53197d7b288b760268",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -129,8 +129,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.9.0-rc.0",
-      "hash": "86c242b9753d5f30500ef94255f0445d",
+      "version": "0.9.0-rc.1",
+      "hash": "d0909d1a833531ef8b6d986e66a07311",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -141,9 +141,9 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.9.0-rc.0",
+      "version": "0.9.0-rc.1",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "4f68658d4c673a456183e17c345598d8"
+      "hash": "a5f928555a349b1e584964911ef55c9a"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -153,8 +153,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "7.0.0-rc.0",
-      "hash": "ae9459adc8ec3c06e6f4eb4b6699c89d",
+      "version": "7.0.0-rc.1",
+      "hash": "a24d7471f344677ee8ca3c8040dfe525",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -165,43 +165,43 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "7.0.0-rc.0",
-      "hash": "1eeedd23a574aa20eb500d885b290623",
+      "version": "7.0.0-rc.1",
+      "hash": "0aa3a0aade670fd19956e25e2963af54",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.9.0-rc.0",
-      "hash": "fd24f66e92bea5d4d8ec655ff692429d",
+      "version": "0.9.0-rc.1",
+      "hash": "c6b8c15ed7abad30375f61b1e2ef66c0",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "7.0.0-rc.0",
+      "version": "7.0.0-rc.1",
       "section": "Misc",
-      "hash": "caeb4d5ea57ce457f5cbef7719f1ce94",
+      "hash": "86d64917c76fb65c37572e7ec2748ccb",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "7.0.0-rc.0",
-      "hash": "b788004582e68ce8a020cbd4dcb93b9e",
+      "version": "7.0.0-rc.1",
+      "hash": "db9156bfaccc70bac955fb15def05fe3",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.9.0-rc.0",
+      "version": "0.9.0-rc.1",
       "section": "Schematics",
-      "hash": "7fe124e891c2d6d01bee4aef49372be5",
+      "hash": "1ad492543597cb539b795682c5c3e1bf",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.9.0-rc.0",
+      "version": "0.9.0-rc.1",
       "section": "Schematics",
-      "hash": "7dbd4234020f0903d9138cd20b395d73",
+      "hash": "1126ff9f1093897d184a696b6c72764a",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 4e0686d0c40f..a636b852a185 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -13,6 +13,6 @@ export const latestVersions = {
   ZoneJs: '~0.8.26',
   TypeScript: '~3.1.1',
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.9.0-beta.1',
-  DevkitBuildNgPackagr: '~0.9.0-beta.1',
+  DevkitBuildAngular: '~0.9.0-rc.1',
+  DevkitBuildNgPackagr: '~0.9.0-rc.1',
 };

From aec9e3a3f3a6936ddd3085f08d9c3c409ea0a82f Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 3 Oct 2018 08:28:48 +0200
Subject: [PATCH 0251/1703] style: remove trailing whitespace

---
 packages/ngtools/webpack/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 2e2f58374416..7315070a690d 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -22,7 +22,7 @@
   "homepage": "https://github.com/angular/angular-cli/tree/master/packages/@ngtools/webpack",
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
-    "enhanced-resolve": "4.1.0",    
+    "enhanced-resolve": "4.1.0",
     "rxjs": "6.3.3",
     "tree-kill": "1.2.0",
     "webpack-sources": "1.2.0"

From e4e13a2047f9246b501277e6fef14ad2e4dbb107 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 3 Oct 2018 15:21:24 -0400
Subject: [PATCH 0252/1703] refactor(@ngtools/webpack): reduce amount of
 filesystem calls

---
 packages/ngtools/webpack/src/compiler_host.ts | 48 ++++++++++++-------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/packages/ngtools/webpack/src/compiler_host.ts b/packages/ngtools/webpack/src/compiler_host.ts
index 2c0ea9b65c93..19565fa0652d 100644
--- a/packages/ngtools/webpack/src/compiler_host.ts
+++ b/packages/ngtools/webpack/src/compiler_host.ts
@@ -87,40 +87,50 @@ export class WebpackCompilerHost implements ts.CompilerHost {
   fileExists(fileName: string, delegate = true): boolean {
     const p = this.resolve(fileName);
 
-    const exists = this._syncHost.exists(p) && this._syncHost.isFile(p);
-    if (delegate) {
-      return exists;
-    } else {
-      const backend = new virtualFs.SyncDelegateHost(
-        (this._syncHost.delegate as virtualFs.CordHost).backend as virtualFs.Host,
-      );
+    try {
+      const exists = this._syncHost.isFile(p);
+      if (delegate) {
+        return exists;
+      } else if (exists) {
+        const backend = new virtualFs.SyncDelegateHost(
+          (this._syncHost.delegate as virtualFs.CordHost).backend as virtualFs.Host,
+        );
+
+        return !backend.isFile(p);
+      }
+    } catch { }
 
-      return exists && !(backend.exists(p) && backend.isFile(p));
-    }
+    return false;
   }
 
   readFile(fileName: string): string | undefined {
     const filePath = this.resolve(fileName);
-    if (!this._syncHost.exists(filePath) || !this._syncHost.isFile(filePath)) {
+
+    try {
+      return virtualFs.fileBufferToString(this._syncHost.read(filePath));
+    } catch {
       return undefined;
     }
-
-    return virtualFs.fileBufferToString(this._syncHost.read(filePath));
   }
 
   readFileBuffer(fileName: string): Buffer | undefined {
     const filePath = this.resolve(fileName);
-    if (!this._syncHost.exists(filePath) || !this._syncHost.isFile(filePath)) {
+
+    try {
+      return Buffer.from(this._syncHost.read(filePath));
+    } catch {
       return undefined;
     }
-
-    return Buffer.from(this._syncHost.read(filePath));
   }
 
   stat(path: string): Stats | null {
     const p = this.resolve(path);
 
-    const stats = this._syncHost.exists(p) && this._syncHost.stat(p);
+    let stats;
+    try {
+      stats = this._syncHost.stat(p);
+    } catch { }
+
     if (!stats) {
       return null;
     }
@@ -151,7 +161,11 @@ export class WebpackCompilerHost implements ts.CompilerHost {
   directoryExists(directoryName: string): boolean {
     const p = this.resolve(directoryName);
 
-    return this._syncHost.exists(p) && this._syncHost.isDirectory(p);
+    try {
+      return this._syncHost.isDirectory(p);
+    } catch {
+      return false;
+    }
   }
 
   getDirectories(path: string): string[] {

From ae9695a1b7ea6f8f95aff66c5e4876d5e056bc97 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Wed, 3 Oct 2018 11:26:57 -0700
Subject: [PATCH 0253/1703] ci: add count to benchmark and pass index to fn

---
 packages/_/benchmark/src/benchmark.ts | 16 +++++++++-------
 scripts/benchmark.ts                  | 21 +++++++++++++--------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/packages/_/benchmark/src/benchmark.ts b/packages/_/benchmark/src/benchmark.ts
index c02fc605ee25..7c22abe0136f 100644
--- a/packages/_/benchmark/src/benchmark.ts
+++ b/packages/_/benchmark/src/benchmark.ts
@@ -15,11 +15,11 @@ declare const global: {
 const kNanosecondsPerSeconds = 1e9;
 const kBenchmarkIterationMaxCount = 10000;
 const kBenchmarkTimeoutInMsec = 5000;
-const kWarmupIterationCount = 10;
+const kWarmupIterationCount = 100;
 const kTopMetricCount = 5;
 
 
-function _run(fn: () => void, collector: number[]) {
+function _run(fn: (i: number) => void, collector: number[]) {
   const timeout = Date.now();
   // Gather the first 5 seconds runs, or kMaxNumberOfIterations runs whichever comes first
   // (soft timeout).
@@ -28,7 +28,7 @@ function _run(fn: () => void, collector: number[]) {
        i++) {
     // Start time.
     const start = process.hrtime();
-    fn();
+    fn(i);
     // Get the stop difference time.
     const diff = process.hrtime(start);
 
@@ -41,13 +41,15 @@ function _run(fn: () => void, collector: number[]) {
 function _stats(metrics: number[]) {
   metrics.sort((a, b) => a - b);
 
-  const middle = metrics.length / 2;
+  const count = metrics.length;
+  const middle = count / 2;
   const mean = Number.isInteger(middle)
     ? metrics[middle] : ((metrics[middle - 0.5] + metrics[middle + 0.5]) / 2);
   const total = metrics.reduce((acc, curr) => acc + curr, 0);
-  const average = total / metrics.length;
+  const average = total / count;
 
   return {
+    count: count,
     fastest: metrics.slice(0, kTopMetricCount),
     slowest: metrics.reverse().slice(0, kTopMetricCount),
     mean,
@@ -56,12 +58,12 @@ function _stats(metrics: number[]) {
 }
 
 
-export function benchmark(name: string, fn: () => void, base?: () => void) {
+export function benchmark(name: string, fn: (i: number) => void, base?: (i: number) => void) {
   it(name + ' (time in nanoseconds)', (done) => {
     process.nextTick(() => {
       for (let i = 0; i < kWarmupIterationCount; i++) {
         // Warm it up.
-        fn();
+        fn(i);
       }
 
       const reporter = global.benchmarkReporter;
diff --git a/scripts/benchmark.ts b/scripts/benchmark.ts
index 3a19da2d32df..822d798f918d 100644
--- a/scripts/benchmark.ts
+++ b/scripts/benchmark.ts
@@ -27,6 +27,7 @@ declare const global: {
 
 
 interface BenchmarkResult {
+  count: number;
   slowest: number[];
   fastest: number[];
   mean: number;
@@ -71,12 +72,17 @@ class BenchmarkReporter extends JasmineSpecReporter implements jasmine.CustomRep
         return p.substr(0, p.length - ('' + s).length) + s;
       }
 
+      const count = pad(stat.count);
       const fastest = stat.fastest.map(x => pad(x)).join('');
       const slowest = stat.slowest.map(x => pad(x)).join('');
       const mean = pad(Math.floor(stat.mean));
       const average = pad(Math.floor(stat.average));
       if (stat.base) {
-        const precision = (x: number) => ('' + Math.floor(x * 100)).replace(/(\d\d)$/, '.$1');
+        const precision = (x: number) => {
+          x = Math.floor(x * 100);
+
+          return `${Math.floor(x / 100)}.${Math.floor(x / 10) % 10}${x % 10}`;
+        };
         const multPad = '      ';
         const baseFastest = stat.base.fastest.map(x => pad(x)).join('');
         const baseSlowest = stat.base.slowest.map(x => pad(x)).join('');
@@ -86,6 +92,7 @@ class BenchmarkReporter extends JasmineSpecReporter implements jasmine.CustomRep
         const baseAverageMult = pad(precision(stat.average / stat.base.average), multPad);
 
         console.log(terminal.colors.yellow(tags.indentBy(6)`
+          count:   ${count}
           fastest: ${fastest}
             (base) ${baseFastest}
           slowest: ${slowest}
@@ -95,6 +102,7 @@ class BenchmarkReporter extends JasmineSpecReporter implements jasmine.CustomRep
         `));
       } else {
         console.log(terminal.colors.yellow(tags.indentBy(6)`
+          count:   ${count}
           fastest: ${fastest}
           slowest: ${slowest}
           mean:    ${mean}
@@ -120,12 +128,6 @@ global.benchmarkReporter = new BenchmarkReporter();
 runner.env.addReporter(global.benchmarkReporter);
 
 
-// Manually set exit code (needed with custom reporters)
-runner.onComplete((success: boolean) => {
-  process.exitCode = success ? 0 : 1;
-});
-
-
 // Run the tests.
 const allTests =
   glob.sync('packages/**/*_benchmark.ts')
@@ -134,5 +136,8 @@ const allTests =
 
 
 export default function(_args: {}) {
-  runner.execute(allTests);
+  return new Promise(resolve => {
+    runner.onComplete((passed: boolean) => resolve(passed ? 0 : 1));
+    runner.execute(allTests);
+  });
 }

From c13cbd467a3f63689cf521124353993e3468da76 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Wed, 3 Oct 2018 11:27:22 -0700
Subject: [PATCH 0254/1703] refactor(@angular-devkit/core): add cache to
 normalize

And a benchmark to show the curve, more or less.
---
 packages/angular_devkit/core/package.json     |  7 +-
 .../core/src/virtual-fs/path.ts               | 35 ++++++++-
 .../core/src/virtual-fs/path_benchmark.ts     | 74 ++++++++++++++++++-
 yarn.lock                                     |  4 +
 4 files changed, 114 insertions(+), 6 deletions(-)

diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json
index dd72b800d1db..b6ae6091af4f 100644
--- a/packages/angular_devkit/core/package.json
+++ b/packages/angular_devkit/core/package.json
@@ -11,7 +11,10 @@
     "ajv": "6.5.3",
     "chokidar": "2.0.4",
     "fast-json-stable-stringify": "2.0.0",
-    "source-map": "0.7.3",
-    "rxjs": "6.3.3"
+    "rxjs": "6.3.3",
+    "source-map": "0.7.3"
+  },
+  "devDependencies": {
+    "seedrandom": "^2.4.4"
   }
 }
diff --git a/packages/angular_devkit/core/src/virtual-fs/path.ts b/packages/angular_devkit/core/src/virtual-fs/path.ts
index 11ec697b0311..0fd5eb374116 100644
--- a/packages/angular_devkit/core/src/virtual-fs/path.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/path.ts
@@ -185,9 +185,27 @@ export function fragment(path: string): PathFragment {
 }
 
 
+/**
+ * normalize() cache to reduce computation. For now this grows and we never flush it, but in the
+ * future we might want to add a few cache flush to prevent this from growing too large.
+ */
+let normalizedCache = new Map<string, Path>();
+
+
+/**
+ * Reset the cache. This is only useful for testing.
+ * @private
+ */
+export function resetNormalizeCache() {
+  normalizedCache = new Map<string, Path>();
+}
+
+
 /**
  * Normalize a string into a Path. This is the only mean to get a Path type from a string that
- * represents a system path. Normalization includes:
+ * represents a system path. This method cache the results as real world paths tend to be
+ * duplicated often.
+ * Normalization includes:
  *   - Windows backslashes `\\` are replaced with `/`.
  *   - Windows drivers are replaced with `/X/`, where X is the drive letter.
  *   - Absolute paths starts with `/`.
@@ -195,8 +213,23 @@ export function fragment(path: string): PathFragment {
  *   - Path segments `.` are removed.
  *   - Path segments `..` are resolved.
  *   - If a path is absolute, having a `..` at the start is invalid (and will throw).
+ * @param path The path to be normalized.
  */
 export function normalize(path: string): Path {
+  let maybePath = normalizedCache.get(path);
+  if (!maybePath) {
+    maybePath = noCacheNormalize(path);
+    normalizedCache.set(path, maybePath);
+  }
+
+  return maybePath;
+}
+
+
+/**
+ * The no cache version of the normalize() function. Used for benchmarking and testing.
+ */
+export function noCacheNormalize(path: string): Path {
   if (path == '' || path == '.') {
     return '' as Path;
   } else if (path == NormalizedRoot) {
diff --git a/packages/angular_devkit/core/src/virtual-fs/path_benchmark.ts b/packages/angular_devkit/core/src/virtual-fs/path_benchmark.ts
index a2ab0824a1f4..9973c625bae7 100644
--- a/packages/angular_devkit/core/src/virtual-fs/path_benchmark.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/path_benchmark.ts
@@ -7,14 +7,82 @@
  */
 // tslint:disable:no-implicit-dependencies
 import { benchmark } from '@_/benchmark';
-import { join, normalize } from './path';
+import { join, noCacheNormalize, normalize, resetNormalizeCache } from './path';
+
+const seedrandom = require('seedrandom');
 
 
 const p1 = '/b/././a/tt/../../../a/b/./d/../c';
 const p2 = '/a/tt/../../../a/b/./d';
 
 
+const numRandomIter = 10000;
+
+
 describe('Virtual FS Path', () => {
-  benchmark('normalize', () => normalize(p1));
-  benchmark('join', () => join(normalize(p1), normalize(p2)));
+  benchmark('join', () => join(normalize(p1), p2));
+
+  describe('normalize', () => {
+    let rng: () => number;
+    let cases: string[];
+
+    // Math.random() doesn't allow us to set a seed, so we use a library.
+    beforeEach(() => {
+      rng = seedrandom('some fixed value');
+
+      function _str(len: number) {
+        let r = '';
+        const space = 'abcdefghijklmnopqrstuvwxyz0123456789';
+        for (let i = 0; i < len; i++) {
+          r += space[Math.floor(rng() * space.length)];
+        }
+
+        return r;
+      }
+
+      // Build test cases.
+      cases = new Array(numRandomIter)
+        .fill(0)
+        .map(() => {
+          return new Array(Math.floor(rng() * 20 + 5))
+            .fill(0)
+            .map(() => _str(rng() * 20 + 3))
+            .join('/');
+        });
+
+      resetNormalizeCache();
+    });
+
+    describe('random (0 cache hits)', () => {
+      benchmark('', i => normalize(cases[i]), i => noCacheNormalize(cases[i]));
+    });
+
+    describe('random (10% cache hits)', () => {
+      beforeEach(() => {
+        cases = cases.map(x => (rng() < 0.1) ? cases[0] : x);
+      });
+      benchmark('', i => normalize(cases[i]), i => noCacheNormalize(cases[i]));
+    });
+
+    describe('random (30% cache hits)', () => {
+      beforeEach(() => {
+        cases = cases.map(x => (rng() < 0.3) ? cases[0] : x);
+      });
+      benchmark('', i => normalize(cases[i]), i => noCacheNormalize(cases[i]));
+    });
+
+    describe('random (50% cache hits)', () => {
+      beforeEach(() => {
+        cases = cases.map(x => (rng() < 0.5) ? cases[0] : x);
+      });
+      benchmark('', i => normalize(cases[i]), i => noCacheNormalize(cases[i]));
+    });
+
+    describe('random (80% cache hits)', () => {
+      beforeEach(() => {
+        cases = cases.map(x => (rng() < 0.8) ? cases[0] : x);
+      });
+      benchmark('', i => normalize(cases[i]), i => noCacheNormalize(cases[i]));
+    });
+  });
 });
diff --git a/yarn.lock b/yarn.lock
index a3ac15a74c64..35a1e3264287 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6731,6 +6731,10 @@ scss-tokenizer@^0.2.3:
     js-base64 "^2.1.8"
     source-map "^0.4.2"
 
+seedrandom@^2.4.4:
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-2.4.4.tgz#b25ea98632c73e45f58b77cfaa931678df01f9ba"
+
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"

From 5f8230cca110b82d04342bafad0b738f90024504 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 3 Oct 2018 18:59:24 +0200
Subject: [PATCH 0255/1703] fix(@angular-devkit/build-angular): `ng test`
 without `reporters` no longer print error

Closes #12455
---
 packages/angular_devkit/build_angular/src/karma/index.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index 3d1b066d9f1b..8e41e89a7dc5 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -73,9 +73,13 @@ export class KarmaBuilder implements Builder<KarmaBuilderSchema> {
 
         if (options.reporters) {
           // Split along commas to make it more natural, and remove empty strings.
-          karmaOptions.reporters = options.reporters
+          const reporters = options.reporters
             .reduce<string[]>((acc, curr) => acc.concat(curr.split(/,/)), [])
             .filter(x => !!x);
+
+          if (reporters.length > 0) {
+            karmaOptions.reporters = reporters;
+          }
         }
 
         const sourceRoot = builderConfig.sourceRoot && resolve(root, builderConfig.sourceRoot);

From 202117a68e562f5686ebe725d67dbd5f10b54ad1 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 2 Oct 2018 12:11:01 -0700
Subject: [PATCH 0256/1703] ci: add CONTRIBUTING as a template and various
 changes

Added types from the commit validation script to CONTRIBUTING. Added
packages names from the package script to the scope section. Added
examples of good commit messages.

Also corrected some texts.
---
 CONTRIBUTING.md                    |  54 ++++--
 README.md                          |  21 +--
 scripts/templates.ts               |  28 ++-
 scripts/templates/contributing.ejs | 265 +++++++++++++++++++++++++++++
 scripts/templates/readme.ejs       |  21 +--
 scripts/validate-commits.ts        | 108 ++++++++----
 scripts/validate.ts                |   7 +-
 7 files changed, 420 insertions(+), 84 deletions(-)
 create mode 100644 scripts/templates/contributing.ejs

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e93eef54157f..8c56b4741a42 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -180,41 +180,65 @@ If the commit reverts a previous commit, it should begin with `revert: `, follow
 ### Type
 Must be one of the following:
 
-* **build**: Changes that affect the build system or external dependencies
-* **ci**: Changes to our CI configuration files and scripts
-* **docs**: Documentation only changes
-* **feat**: A new feature
-* **fix**: A bug fix
-* **perf**: A code change that improves performance
-* **refactor**: A code change that neither fixes a bug nor adds a feature
-* **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
-* **test**: Adding missing tests or correcting existing tests
+* **build**: Changes that affect the build system or external dependencies. [2]
+* **ci**: Changes to our CI configuration files and scripts. [2]
+* **docs**: Documentation only changes. 
+* **feat**: A new feature. [1]
+* **fix**: A bug fix. [1]
+* **refactor**: A code change that neither fixes a bug nor adds a feature 
+* **release**: A release commit. Must only include version changes. [2]
+* **revert**: A git commit revert. The description must include the original commit message. [2]
+* **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc). 
+* **test**: Adding missing tests or correcting existing tests. 
+
+
+<sup>[1] This type MUST have a scope. See the next section for more information.</sup><br/>
+<sup>[2] This type MUST NOT have a scope. It only applies to general scripts and tooling.</sup>
 
 ### Scope
 The scope should be the name of the npm package affected as perceived by the person reading changelog generated from the commit messages.
 
 The following is the list of supported scopes:
 
-* **@angular-devkit/core**
+* **@angular/cli**
+* **@angular/pwa**
+* **@angular-devkit/architect**
+* **@angular-devkit/architect-cli**
+* **@angular-devkit/build-angular**
+* **@angular-devkit/build-ng-packagr**
 * **@angular-devkit/build-optimizer**
+* **@angular-devkit/build-webpack**
+* **@angular-devkit/core**
 * **@angular-devkit/schematics**
 * **@angular-devkit/schematics-cli**
+* **@ngtools/webpack**
 * **@schematics/angular**
 * **@schematics/schematics**
+* **@schematics/update**
 
-There are currently a few exceptions to the "use package name" rule:
-
-* **packaging**: used for changes that change the npm package layout in all of our packages, e.g. public path changes, package.json changes done to all packages, d.ts file/format changes, changes to bundles, etc.
-* **changelog**: used for updating the release notes in CHANGELOG.md
-* none/empty string: useful for `style`, `test` and `refactor` changes that are done across all packages (e.g. `style: add missing semicolons`)
 
 ### Subject
 The subject contains succinct description of the change:
 
 * use the imperative, present tense: "change" not "changed" nor "changes"
 * don't capitalize first letter
+* be concise and direct
 * no dot (.) at the end
 
+### Examples
+Examples of valid commit messages:
+
+* `fix(@angular/cli): prevent the flubber from grassing`
+* `refactor(@schematics/angular): move all JSON classes together`
+
+Examples of invalid commit messages:
+* `fix(@angular/cli): add a new XYZ command`
+
+  This is a feature, not a fix.
+* `ci(@angular/cli): fix publishing workflow`
+
+  The `ci` type cannot have a scope.
+
 ### Body
 Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes".
 The body should include the motivation for the change and contrast this with previous behavior.
diff --git a/README.md b/README.md
index 762e1ad325e8..5f0e447affb0 100644
--- a/README.md
+++ b/README.md
@@ -25,28 +25,25 @@ This is the home of the DevKit and the Angular CLI code. You can find the Angula
 
 
 
-----
-
-This is the home for all the tools and libraries built to assist developers with their Angular applications.
-
 ### Quick Links
 [Gitter](https://gitter.im/angular/angular-cli) | [Contributing](https://github.com/angular/angular-cli/blob/master/CONTRIBUTING.md) | [Angular CLI](http://github.com/angular/angular-cli) | 
 |---|---|---|
 
+----
+
+## The Goal of Angular CLI
+
+The Angular CLI creates, manages, builds and test your Angular projects. It's built on top of the
+Angular DevKit.
 
 ## The Goal of DevKit
 
-Our goal is to provide a large set of libraries that can be used to manage, develop, deploy and
+DevKit's goal is to provide a large set of libraries that can be used to manage, develop, deploy and
 analyze your code.
 
-This is the extension of the Angular CLI Project. Once this set of tools is done, the Angular CLI
-as it is today will become one of many interfaces available to perform those tasks. Everything
-will also be available to third party tools and IDEs.
-
-
 
 
-## Tools
+# Tools
 
 | Project | Package | Version | Links |
 |---|---|---|---|
@@ -55,7 +52,7 @@ will also be available to third party tools and IDEs.
 
 
 
-## Packages
+# Packages
 This is a monorepo which contains many packages:
 
 
diff --git a/scripts/templates.ts b/scripts/templates.ts
index f403d78ac213..f1921ebaa2f7 100644
--- a/scripts/templates.ts
+++ b/scripts/templates.ts
@@ -9,17 +9,27 @@
 import { logging } from '@angular-devkit/core';
 import * as fs from 'fs';
 import * as path from 'path';
-import { packages } from '../lib/packages';
 
-export default function(_options: {}, logger: logging.Logger) {
-  const monorepo = require('../.monorepo.json');
 
-  logger.info('Building README...');
-  const readme = require('./templates/readme').default;
-  const content = readme({
-    monorepo,
-    packages,
+function _runTemplate(inputPath: string, outputPath: string, logger: logging.Logger) {
+  inputPath = path.resolve(__dirname, inputPath);
+  outputPath = path.resolve(__dirname, outputPath);
+
+  logger.info(`Building ${path.relative(path.dirname(__dirname), outputPath)}...`);
+
+  const template = require(inputPath).default;
+  const content = template({
+    monorepo: require('../.monorepo.json'),
+    packages: require('../lib/packages').packages,
     encode: (x: string) => global.encodeURIComponent(x),
+    require: (x: string) => require(path.resolve(path.dirname(inputPath), x)),
   });
-  fs.writeFileSync(path.join(__dirname, '../README.md'), content, 'utf-8');
+  fs.writeFileSync(outputPath, content, 'utf-8');
+}
+
+export default async function(_options: {}, logger: logging.Logger): Promise<number> {
+  _runTemplate('./templates/readme', '../README.md', logger);
+  _runTemplate('./templates/contributing', '../CONTRIBUTING.md', logger);
+
+  return 1;
 }
diff --git a/scripts/templates/contributing.ejs b/scripts/templates/contributing.ejs
new file mode 100644
index 000000000000..73fd2f5553a9
--- /dev/null
+++ b/scripts/templates/contributing.ejs
@@ -0,0 +1,265 @@
+# Contributing to Angular DevKit
+
+We would love for you to contribute to DevKit and help make it even better
+than it is today! As a contributor, here are the guidelines we would like you
+to follow:
+
+ - [Code of Conduct](#coc)
+ - [Question or Problem?](#question)
+ - [Issues and Bugs](#issue)
+ - [Feature Requests](#feature)
+ - [Submission Guidelines](#submit)
+ - [Coding Rules](#rules)
+ - [Commit Message Guidelines](#commit)
+ - [Signing the CLA](#cla)
+
+## <a name="coc"></a> Code of Conduct
+Help us keep Angular open and inclusive. Please read and follow our [Code of Conduct][coc].
+
+## <a name="question"></a> Got a Question or Problem?
+
+Please, do not open issues for the general support questions as we want to keep GitHub issues for
+bug reports and feature requests. You've got much better chances of getting your question answered
+on [StackOverflow](https://stackoverflow.com/questions/tagged/angular-devkit) where the questions
+should be tagged with tag `angular-cli` or `angular-devkit`.
+
+StackOverflow is a much better place to ask questions since:
+
+- there are thousands of people willing to help on StackOverflow
+- questions and answers stay available for public viewing so your question / answer might help someone else
+- StackOverflow's voting system assures that the best answers are prominently visible.
+
+To save your and our time we will be systematically closing all the issues that are requests for
+general support and redirecting people to StackOverflow.
+
+If you would like to chat about the question in real-time, you can reach out via [our gitter channel][gitter].
+
+## <a name="issue"></a> Found an Issue?
+If you find a bug in the source code or a mistake in the documentation, you can help us by
+[submitting an issue](#submit-issue) to our [GitHub Repository][github]. Even better, you can
+[submit a Pull Request](#submit-pr) with a fix.
+
+## <a name="feature"></a> Want a Feature?
+You can *request* a new feature by [submitting an issue](#submit-issue) to our [GitHub
+Repository][github]. If you would like to *implement* a new feature, please submit an issue with
+a proposal for your work first, to be sure that we can use it.
+Please consider what kind of change it is:
+
+* For a **Major Feature**, first open an issue and outline your proposal so that it can be
+discussed. This will also allow us to better coordinate our efforts, prevent duplication of work,
+and help you to craft the change so that it is successfully accepted into the project.
+* **Small Features** can be crafted and directly [submitted as a Pull Request](#submit-pr).
+
+## <a name="submit"></a> Submission Guidelines
+
+### <a name="submit-issue"></a> Submitting an Issue
+
+Before you submit an issue, please search the issue tracker, maybe an issue for your problem already exists and the discussion might inform you of workarounds readily available.
+
+We want to fix all the issues as soon as possible, but before fixing a bug we need to reproduce and confirm it. Having a reproducible scenario gives us wealth of important information without going back & forth to you with additional questions like:
+
+- version of Angular CLI used
+- `.angular-cli.json` or `angular.json` configuration
+- version of Angular DevKit used
+- 3rd-party libraries and their versions
+- and most importantly - a use-case that fails
+
+A minimal reproduce scenario using allows us to quickly confirm a bug (or point out coding problem) as well as confirm that we are fixing the right problem.
+
+We will be insisting on a minimal reproduce scenario in order to save maintainers time and ultimately be able to fix more bugs. Interestingly, from our experience users often find coding problems themselves while preparing a minimal repository. We understand that sometimes it might be hard to extract essentials bits of code from a larger code-base but we really need to isolate the problem before we can fix it.
+
+Unfortunately we are not able to investigate / fix bugs without a minimal reproduction, so if we don't hear back from you we are going to close an issue that don't have enough info to be reproduced.
+
+You can file new issues by filling out our [new issue form](https://github.com/angular/angular-cli/issues/new).
+
+
+### <a name="submit-pr"></a> Submitting a Pull Request (PR)
+Before you submit your Pull Request (PR) consider the following guidelines:
+
+* Search [GitHub](https://github.com/angular/angular-cli/pulls) for an open or closed PR
+  that relates to your submission. You don't want to duplicate effort.
+* Please sign our [Contributor License Agreement (CLA)](#cla) before sending PRs.
+  We cannot accept code without this.
+* Make your changes in a new git branch:
+
+     ```shell
+     git checkout -b my-fix-branch master
+     ```
+
+* Create your patch, **including appropriate test cases**.
+* Follow our [Coding Rules](#rules).
+* Run the full Angular CLI and DevKit test suite, as described in the [developer documentation][dev-doc],
+  and ensure that all tests pass (coming soon).
+* Commit your changes using a descriptive commit message that follows our
+  [commit message conventions](#commit). Adherence to these conventions
+  is necessary because release notes are automatically generated from these messages.
+
+     ```shell
+     git commit -a
+     ```
+  Note: the optional commit `-a` command line option will automatically "add" and "rm" edited files.
+
+* Push your branch to GitHub:
+
+    ```shell
+    git push origin my-fix-branch
+    ```
+
+* In GitHub, send a pull request to `devkit:master`.
+* If we suggest changes then:
+  * Make the required updates.
+  * Re-run the Angular DevKit test suites to ensure tests are still passing.
+  * Rebase your branch and force push to your GitHub repository (this will update your Pull Request):
+
+    ```shell
+    git rebase master -i
+    git push -f
+    ```
+
+That's it! Thank you for your contribution!
+
+#### After your pull request is merged
+
+After your pull request is merged, you can safely delete your branch and pull the changes
+from the main (upstream) repository:
+
+* Delete the remote branch on GitHub either through the GitHub web UI or your local shell as follows:
+
+    ```shell
+    git push origin --delete my-fix-branch
+    ```
+
+* Check out the master branch:
+
+    ```shell
+    git checkout master -f
+    ```
+
+* Delete the local branch:
+
+    ```shell
+    git branch -D my-fix-branch
+    ```
+
+* Update your master with the latest upstream version:
+
+    ```shell
+    git pull --ff upstream master
+    ```
+
+## <a name="rules"></a> Coding Rules
+To ensure consistency throughout the source code, keep these rules in mind as you are working:
+
+* All features or bug fixes **must be tested** by one or more specs (unit-tests or e2e-tests).
+* All public API methods **must be documented**. (Details TBC).
+* We follow [Google's JavaScript Style Guide][js-style-guide], but wrap all code at
+  **100 characters**.
+
+## <a name="commit"></a> Commit Message Guidelines
+
+We have very precise rules over how our git commit messages can be formatted.  This leads to **more
+readable messages** that are easy to follow when looking through the **project history**.  But also,
+we use the git commit messages to **generate the Angular DevKit change log**.
+
+### Commit Message Format
+Each commit message consists of a **header**, a **body** and a **footer**.  The header has a special
+format that includes a **type**, a **scope** and a **subject**:
+
+```
+<type>(<scope>): <subject>
+<BLANK LINE>
+<body>
+<BLANK LINE>
+<footer>
+```
+
+The **header** is mandatory and the **scope** of the header is optional.
+
+Any line of the commit message cannot be longer 100 characters! This allows the message to be easier
+to read on GitHub as well as in various git tools.
+
+### Revert
+If the commit reverts a previous commit, it should begin with `revert: `, followed by the header of the reverted commit. In the body it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit being reverted.
+
+### Type
+Must be one of the following:
+
+<%
+const { types, Scope } = require('../validate-commits');
+for (const typeName of Object.keys(types).sort()) {
+  const type = types[typeName];
+%>* **<%= typeName %>**: <%= type.description %> <%
+  if (type.scope == Scope.MustHave) {
+    %>[1]<%
+  } else if (type.scope == Scope.MustNotHave) {
+    %>[2]<%
+  }
+%>
+<% } %>
+
+<sup>[1] This type MUST have a scope. See the next section for more information.</sup><br/>
+<sup>[2] This type MUST NOT have a scope. It only applies to general scripts and tooling.</sup>
+
+### Scope
+The scope should be the name of the npm package affected as perceived by the person reading changelog generated from the commit messages.
+
+The following is the list of supported scopes:
+
+<%
+for (const packageName of Object.keys(packages).filter(x => !packages[x].private)) {
+%>* **<%= packageName %>**
+<% } %>
+
+### Subject
+The subject contains succinct description of the change:
+
+* use the imperative, present tense: "change" not "changed" nor "changes"
+* don't capitalize first letter
+* be concise and direct
+* no dot (.) at the end
+
+### Examples
+Examples of valid commit messages:
+
+* `fix(@angular/cli): prevent the flubber from grassing`
+* `refactor(@schematics/angular): move all JSON classes together`
+
+Examples of invalid commit messages:
+* `fix(@angular/cli): add a new XYZ command`
+
+  This is a feature, not a fix.
+* `ci(@angular/cli): fix publishing workflow`
+
+  The `ci` type cannot have a scope.
+
+### Body
+Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes".
+The body should include the motivation for the change and contrast this with previous behavior.
+
+### Footer
+The footer should contain any information about **Breaking Changes** and is also the place to
+reference GitHub issues that this commit **Closes**.
+
+**Breaking Changes** should start with the word `BREAKING CHANGE:` with a space or two newlines. The rest of the commit message is then used for this.
+
+A detailed explanation can be found in this [document][commit-message-format].
+
+## <a name="cla"></a> Signing the CLA
+
+Please sign our Contributor License Agreement (CLA) before sending pull requests. For any code
+changes to be accepted, the CLA must be signed. It's a quick process, we promise!
+
+* For individuals we have a [simple click-through form][individual-cla].
+* For corporations we'll need you to
+  [print, sign and one of scan+email, fax or mail the form][corporate-cla].
+
+
+[coc]: https://github.com/angular/code-of-conduct/blob/master/CODE_OF_CONDUCT.md
+[commit-message-format]: https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit#
+[corporate-cla]: http://code.google.com/legal/corporate-cla-v1.0.html
+[dev-doc]: ttps://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md#development-hints-for-working-on-angular-cli
+[GitHub]: https://github.com/angular/angular-cli
+[gitter]: https://gitter.im/angular/angular-cli
+[individual-cla]: http://code.google.com/legal/individual-cla-v1.0.html
+[js-style-guide]: https://google.github.io/styleguide/jsguide.html
+[stackoverflow]: http://stackoverflow.com/questions/tagged/angular-devkit
diff --git a/scripts/templates/readme.ejs b/scripts/templates/readme.ejs
index 717c4e64b38c..c17b761e241b 100644
--- a/scripts/templates/readme.ejs
+++ b/scripts/templates/readme.ejs
@@ -29,10 +29,6 @@ This is the home of the DevKit and the Angular CLI code. You can find the Angula
 
 <% } %>
 
-----
-
-This is the home for all the tools and libraries built to assist developers with their Angular applications.
-
 ### Quick Links
 <% for (const link of Object.keys(monorepo.links)) {
   %>[<%= link %>](<%= monorepo.links[link] %>) | <%
@@ -41,17 +37,18 @@ This is the home for all the tools and libraries built to assist developers with
 %>|---<%
 } %>|
 
+----
+
+## The Goal of Angular CLI
+
+The Angular CLI creates, manages, builds and test your Angular projects. It's built on top of the
+Angular DevKit.
 
 ## The Goal of DevKit
 
-Our goal is to provide a large set of libraries that can be used to manage, develop, deploy and
+DevKit's goal is to provide a large set of libraries that can be used to manage, develop, deploy and
 analyze your code.
 
-This is the extension of the Angular CLI Project. Once this set of tools is done, the Angular CLI
-as it is today will become one of many interfaces available to perform those tasks. Everything
-will also be available to third party tools and IDEs.
-
-
 <%
   const sections = [
     ...new Set(Object.keys(packages).map(pkgName => monorepo.packages[pkgName].section ))
@@ -59,7 +56,7 @@ will also be available to third party tools and IDEs.
   sections.unshift(undefined);
 %>
 
-## Tools
+# Tools
 
 | Project | Package | Version | Links |
 |---|---|---|---|
@@ -87,7 +84,7 @@ if (mrPkg.snapshotRepo) {
 <% } %>
 
 
-## Packages
+# Packages
 This is a monorepo which contains many packages:
 
 <% for (const section of sections) {
diff --git a/scripts/validate-commits.ts b/scripts/validate-commits.ts
index 04377985d21e..f176ec473c2d 100644
--- a/scripts/validate-commits.ts
+++ b/scripts/validate-commits.ts
@@ -28,6 +28,62 @@ const blacklist = [
 ];
 
 
+export enum Scope {
+  MustHave = 0,
+  MustNotHave = 1,
+  Either = 2,
+}
+
+export const types: { [t: string]: { description: string, scope: Scope } } = {
+  // Types that can contain both a scope or no scope.
+  'docs': {
+    description: 'Documentation only changes.',
+    scope: Scope.Either,
+  },
+  'refactor': {
+    description: 'A code change that neither fixes a bug nor adds a feature',
+    scope: Scope.Either,
+  },
+  'style': {
+    description: 'Changes that do not affect the meaning of the code (white-space, formatting, '
+               + 'missing semi-colons, etc).',
+    scope: Scope.Either,
+  },
+  'test': {
+    description: 'Adding missing tests or correcting existing tests.',
+    scope: Scope.Either,
+  },
+
+  // Types that MUST contain a scope.
+  'feat': {
+    description: 'A new feature.',
+    scope: Scope.MustHave,
+  },
+  'fix': {
+    description: 'A bug fix.',
+    scope: Scope.MustHave,
+  },
+
+  // Types that MUST NOT contain a scope.
+  'build': {
+    description: 'Changes that affect the build system or external dependencies.',
+    scope: Scope.MustNotHave,
+  },
+  'revert': {
+    description: 'A git commit revert. The description must include the original commit message.',
+    scope: Scope.MustNotHave,
+  },
+  'ci': {
+    description: 'Changes to our CI configuration files and scripts.',
+    scope: Scope.MustNotHave,
+  },
+  'release': {
+    description: 'A release commit. Must only include version changes.',
+    scope: Scope.MustNotHave,
+  },
+};
+
+
 export interface ValidateCommitsOptions {
   ci?: boolean;
   base?: string;
@@ -96,21 +152,19 @@ export default function (argv: ValidateCommitsOptions, logger: logging.Logger) {
     }
 
     const [type, scope] = subject.slice(1);
-    switch (type) {
-      // Types that can contain both a scope or no scope.
-      case 'docs':
-      case 'refactor':
-      case 'style':
-      case 'test':
+    if (!(type in types)) {
+      _invalid(sha, message, 'has an unknown type. You can use wip: to avoid this.');
+      continue;
+    }
+    switch (types[type].scope) {
+      case Scope.Either:
         if (scope && !packages[scope]) {
           _invalid(sha, message, 'has a scope that does not exist');
           continue;
         }
         break;
 
-      // Types that MUST contain a scope.
-      case 'feat':
-      case 'fix':
+      case Scope.MustHave:
         if (!scope) {
           _invalid(sha, message, 'should always have a scope');
           continue;
@@ -121,36 +175,24 @@ export default function (argv: ValidateCommitsOptions, logger: logging.Logger) {
         }
         break;
 
-      // Types that MUST NOT contain a scope.
-      case 'build':
-      case 'revert':
-      case 'ci':
-        if (scope) {
-          _invalid(sha, message, 'should not have a scope');
-          continue;
-        }
-        break;
-
-      case 'release':
+      case Scope.MustNotHave:
         if (scope) {
           _invalid(sha, message, 'should not have a scope');
           continue;
         }
-        if (argv.ci && commits.length > 1) {
-          _invalid(sha, message, 'release should always be alone in a PR');
-          continue;
-        }
-        break;
-
-      case 'wip':
-        if (argv.ci) {
-          _invalid(sha, message, 'wip are not allowed in a PR');
-        }
         break;
+    }
 
-      // Unknown types.
-      default:
-        _invalid(sha, message, 'has an unknown type. You can use wip: to avoid this.');
+    // Custom validation.
+    if (type == 'release') {
+      if (argv.ci && commits.length > 1) {
+        _invalid(sha, message, 'release should always be alone in a PR');
+        continue;
+      }
+    } else if (type == 'wip') {
+      if (argv.ci) {
+        _invalid(sha, message, 'wip are not allowed in a PR');
+      }
     }
   }
 
diff --git a/scripts/validate.ts b/scripts/validate.ts
index 8a95adb3be75..d08871c26a95 100644
--- a/scripts/validate.ts
+++ b/scripts/validate.ts
@@ -16,8 +16,6 @@ import validateLicenses from './validate-licenses';
 export default async function (options: { verbose: boolean }, logger: logging.Logger) {
   let error = false;
 
-  logger.info('Running templates validation...');
-  const templateLogger = logger.createChild('templates');
   if (execSync(`git status --porcelain`).toString()) {
     logger.error('There are local changes.');
     if (!options.verbose) {
@@ -25,7 +23,10 @@ export default async function (options: { verbose: boolean }, logger: logging.Lo
     }
     error = true;
   }
-  templates({}, templateLogger);
+
+  logger.info('Running templates validation...');
+  const templateLogger = logger.createChild('templates');
+  await templates({}, templateLogger);
   if (execSync(`git status --porcelain`).toString()) {
     logger.error(tags.oneLine`
       Running templates updated files... Please run "devkit-admin templates" before submitting

From 3d279861d7a71c11f86fb03d9730c09c7a2263b0 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 2 Oct 2018 12:28:20 -0700
Subject: [PATCH 0257/1703] docs: add getting started section to README

---
 CONTRIBUTING.md              |  8 ++++++--
 README.md                    | 36 ++++++++++++++++++++++++++++++------
 scripts/templates/readme.ejs | 36 ++++++++++++++++++++++++++++++------
 3 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8c56b4741a42..44302b71e1a8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,7 +18,10 @@ Help us keep Angular open and inclusive. Please read and follow our [Code of Con
 
 ## <a name="question"></a> Got a Question or Problem?
 
-Please, do not open issues for the general support questions as we want to keep GitHub issues for bug reports and feature requests. You've got much better chances of getting your question answered on [StackOverflow](https://stackoverflow.com/questions/tagged/angular-devkit) where the questions should be tagged with tag `angular-devkit`.
+Please, do not open issues for the general support questions as we want to keep GitHub issues for
+bug reports and feature requests. You've got much better chances of getting your question answered
+on [StackOverflow](https://stackoverflow.com/questions/tagged/angular-devkit) where the questions
+should be tagged with tag `angular-cli` or `angular-devkit`.
 
 StackOverflow is a much better place to ask questions since:
 
@@ -26,7 +29,8 @@ StackOverflow is a much better place to ask questions since:
 - questions and answers stay available for public viewing so your question / answer might help someone else
 - StackOverflow's voting system assures that the best answers are prominently visible.
 
-To save your and our time we will be systematically closing all the issues that are requests for general support and redirecting people to StackOverflow.
+To save your and our time we will be systematically closing all the issues that are requests for
+general support and redirecting people to StackOverflow.
 
 If you would like to chat about the question in real-time, you can reach out via [our gitter channel][gitter].
 
diff --git a/README.md b/README.md
index 5f0e447affb0..f3606ec894ef 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
   Any changes to README.md directly will result in a failure on CI.
 -->
 
-# Angular DevKit
+# Angular CLI
 ### Development tools and libraries specialized for Angular
 
 This is the home of the DevKit and the Angular CLI code. You can find the Angular CLI specific README
@@ -41,9 +41,36 @@ Angular DevKit.
 DevKit's goal is to provide a large set of libraries that can be used to manage, develop, deploy and
 analyze your code.
 
+# Getting Started - Local Development
 
+## Installation
+To get started locally, follow these instructions:
 
-# Tools
+1. If you haven't done it already, [make a fork of this repo](https://github.com/angular/angular-cli/fork).
+1. Clone to your local computer using `git`.
+1. Make sure that you have Node 10.9 or later installed. See instructions [here](https://nodejs.org/en/download/). The Angular CLI requires Node 8, but development requires Node 10.
+1. Make sure that you have `yarn` installed; see instructions [here](https://yarnpkg.com/lang/en/docs/install/).
+1. Run `yarn` (no arguments) from the root of your clone of this project.
+1. Run `yarn link` to add all custom scripts we use to your global install.
+
+## Creating New Packages
+Adding a package to this repository means running two separate commands:
+
+1. `schematics devkit:package PACKAGE_NAME`. This will update the `.monorepo` file, and create the
+  base files for the new package (package.json, src/index, etc).
+1. `devkit-admin templates`. This will update the README and all other template files that might
+  have changed when adding a new package.
+
+For private packages, you will need to add a `"private": true` key to your package.json manually.
+This will require re-running the template admin script.
+
+# Packages
+
+This is a monorepo which contains many tools and packages:
+
+
+
+## Tools
 
 | Project | Package | Version | Links |
 |---|---|---|---|
@@ -51,10 +78,7 @@ analyze your code.
 **Schematics CLI** | [`@angular-devkit/schematics-cli`](https://npmjs.com/package/@angular-devkit/schematics-cli) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fschematics-cli/latest.svg)](https://npmjs.com/package/@angular-devkit/schematics-cli) |  [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-schematics-cli-builds)
 
 
-
-# Packages
-This is a monorepo which contains many packages:
-
+## Packages
 
 
 | Project | Package | Version | Links |
diff --git a/scripts/templates/readme.ejs b/scripts/templates/readme.ejs
index c17b761e241b..5b9da0f58697 100644
--- a/scripts/templates/readme.ejs
+++ b/scripts/templates/readme.ejs
@@ -10,7 +10,7 @@
   Any changes to README.md directly will result in a failure on CI.
 -->
 
-# Angular DevKit
+# Angular CLI
 ### Development tools and libraries specialized for Angular
 
 This is the home of the DevKit and the Angular CLI code. You can find the Angular CLI specific README
@@ -49,6 +49,33 @@ Angular DevKit.
 DevKit's goal is to provide a large set of libraries that can be used to manage, develop, deploy and
 analyze your code.
 
+# Getting Started - Local Development
+
+## Installation
+To get started locally, follow these instructions:
+
+1. If you haven't done it already, [make a fork of this repo](https://github.com/angular/angular-cli/fork).
+1. Clone to your local computer using `git`.
+1. Make sure that you have Node 10.9 or later installed. See instructions [here](https://nodejs.org/en/download/). The Angular CLI requires Node 8, but development requires Node 10.
+1. Make sure that you have `yarn` installed; see instructions [here](https://yarnpkg.com/lang/en/docs/install/).
+1. Run `yarn` (no arguments) from the root of your clone of this project.
+1. Run `yarn link` to add all custom scripts we use to your global install.
+
+## Creating New Packages
+Adding a package to this repository means running two separate commands:
+
+1. `schematics devkit:package PACKAGE_NAME`. This will update the `.monorepo` file, and create the
+  base files for the new package (package.json, src/index, etc).
+1. `devkit-admin templates`. This will update the README and all other template files that might
+  have changed when adding a new package.
+
+For private packages, you will need to add a `"private": true` key to your package.json manually.
+This will require re-running the template admin script.
+
+# Packages
+
+This is a monorepo which contains many tools and packages:
+
 <%
   const sections = [
     ...new Set(Object.keys(packages).map(pkgName => monorepo.packages[pkgName].section ))
@@ -56,7 +83,7 @@ analyze your code.
   sections.unshift(undefined);
 %>
 
-# Tools
+## Tools
 
 | Project | Package | Version | Links |
 |---|---|---|---|
@@ -83,10 +110,7 @@ if (mrPkg.snapshotRepo) {
 } %>
 <% } %>
 
-
-# Packages
-This is a monorepo which contains many packages:
-
+## Packages
 <% for (const section of sections) {
 
 %><%= section ? '#### ' + section : '' %>

From bb56f8067f3377d934346ce4e3480c10818a2a58 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 2 Oct 2018 09:01:10 -0700
Subject: [PATCH 0258/1703] ci: publish script now checks that master has next
 tag

---
 scripts/publish.ts | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/scripts/publish.ts b/scripts/publish.ts
index f166824b1a4b..446701758e39 100644
--- a/scripts/publish.ts
+++ b/scripts/publish.ts
@@ -6,12 +6,18 @@
  * found in the LICENSE file at https://angular.io/license
  */
 // tslint:disable:no-implicit-dependencies
-import { logging } from '@angular-devkit/core';
+import { logging, tags } from '@angular-devkit/core';
 import { spawnSync } from 'child_process';
 import { packages } from '../lib/packages';
 import build from './build';
 
 
+export interface PublishArgs {
+  tag?: string;
+  branchCheck?: boolean;
+}
+
+
 function _exec(command: string, args: string[], opts: { cwd?: string }, logger: logging.Logger) {
   const { status, error, stderr, stdout } = spawnSync(command, args, { ...opts });
 
@@ -29,7 +35,28 @@ function _exec(command: string, args: string[], opts: { cwd?: string }, logger:
 }
 
 
-export default async function (args: { tag?: string }, logger: logging.Logger) {
+function _branchCheck(args: PublishArgs, logger: logging.Logger) {
+  logger.info('Checking branch...');
+  const ref = _exec('git', ['symbolic-ref', 'HEAD'], {}, logger);
+  const branch = ref.trim().replace(/^refs\/heads\//, '');
+
+  switch (branch) {
+    case 'master':
+      if (args.tag !== 'next') {
+        throw new Error(tags.oneLine`
+          Releasing from master requires a next tag. Use --branchCheck=false to skip this check.
+        `);
+      }
+  }
+}
+
+
+export default async function (args: PublishArgs, logger: logging.Logger) {
+  if (args.branchCheck === undefined || args.branchCheck === true) {
+    _branchCheck(args, logger);
+  }
+
+
   logger.info('Building...');
   await build({}, logger.createChild('build'));
 

From c9d10f2b326b17325f7f2fb55e7e2ec07872ec3f Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 2 Oct 2018 09:58:50 -0700
Subject: [PATCH 0259/1703] ci: publish script now checks version and tag
 together

---
 scripts/publish.ts | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/scripts/publish.ts b/scripts/publish.ts
index 446701758e39..cbdad3bf1d42 100644
--- a/scripts/publish.ts
+++ b/scripts/publish.ts
@@ -8,6 +8,7 @@
 // tslint:disable:no-implicit-dependencies
 import { logging, tags } from '@angular-devkit/core';
 import { spawnSync } from 'child_process';
+import * as semver from 'semver';
 import { packages } from '../lib/packages';
 import build from './build';
 
@@ -15,6 +16,7 @@ import build from './build';
 export interface PublishArgs {
   tag?: string;
   branchCheck?: boolean;
+  versionCheck?: boolean;
 }
 
 
@@ -51,11 +53,34 @@ function _branchCheck(args: PublishArgs, logger: logging.Logger) {
 }
 
 
+function _versionCheck(args: PublishArgs, logger: logging.Logger) {
+  logger.info('Checking version...');
+  // Find _any_ version that's beta or RC.
+  let betaOrRc = false;
+  let version = '';
+  Object.keys(packages).forEach((name: string) => {
+    // If there's _ANY_ prerelease information, it's on.
+    if (semver.prerelease(packages[name].version)) {
+      betaOrRc = true;
+      version = packages[name].version;
+    }
+  });
+
+  if (betaOrRc && args.tag !== 'next') {
+    throw new Error(tags.oneLine`
+      Releasing version ${JSON.stringify(version)} requires a next tag.
+      Use --versionCheck=false to skip this check.
+    `);
+  }
+}
+
 export default async function (args: PublishArgs, logger: logging.Logger) {
   if (args.branchCheck === undefined || args.branchCheck === true) {
     _branchCheck(args, logger);
   }
-
+  if (args.versionCheck === undefined || args.versionCheck === true) {
+    _versionCheck(args, logger);
+  }
 
   logger.info('Building...');
   await build({}, logger.createChild('build'));

From 3d9f858c31e820cea74818a3bf8bec250082c2e1 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 2 Oct 2018 10:12:51 +0200
Subject: [PATCH 0260/1703] style: remove unused locals and imports

Closes #12435
---
 .../src/angular-cli-files/models/webpack-configs/browser.ts  | 2 --
 .../src/angular-cli-files/models/webpack-configs/common.ts   | 5 +----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
index 133485d83523..ee19e475baf4 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
@@ -15,8 +15,6 @@ import { LicenseWebpackPlugin } from 'license-webpack-plugin';
 import { generateEntryPoints, packageChunkSort } from '../../utilities/package-chunk-sort';
 import { BaseHrefWebpackPlugin } from '../../lib/base-href-webpack';
 import { IndexHtmlWebpackPlugin } from '../../plugins/index-html-webpack-plugin';
-import { ExtraEntryPoint } from '../../../browser/schema';
-import { BrowserBuilderSchema } from '../../../browser/schema';
 import { WebpackConfigOptions } from '../build-options';
 import { normalizeExtraEntryPoints } from './utils';
 
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 9be395734d5e..803b5f3a78b6 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -19,7 +19,7 @@ import { BundleBudgetPlugin } from '../../plugins/bundle-budget';
 import { CleanCssWebpackPlugin } from '../../plugins/cleancss-webpack-plugin';
 import { ScriptsWebpackPlugin } from '../../plugins/scripts-webpack-plugin';
 import { findUp } from '../../utilities/find-up';
-import { AssetPatternObject, ExtraEntryPoint } from '../../../browser/schema';
+import { AssetPatternObject } from '../../../browser/schema';
 import { normalizeExtraEntryPoints } from './utils';
 
 const ProgressPlugin = require('webpack/lib/ProgressPlugin');
@@ -214,9 +214,6 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
     alias = rxPaths(nodeModules);
   } catch { }
 
-  const isIvyEnabled = wco.tsConfig.raw.angularCompilerOptions
-                    && wco.tsConfig.raw.angularCompilerOptions.enableIvy;
-
   const terserOptions = {
     ecma: wco.supportES2015 ? 6 : 5,
     warnings: !!buildOptions.verbose,

From eab4c2e63070ca90d7367959b1d3df9c8f2d4027 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 1 Oct 2018 20:42:10 +0200
Subject: [PATCH 0261/1703] fix(@angular/cli): `ng update` remove duplicate
 `dryRun` in help

Closes #12423
---
 packages/angular/cli/commands/update-impl.ts | 2 +-
 packages/angular/cli/commands/update.json    | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/packages/angular/cli/commands/update-impl.ts b/packages/angular/cli/commands/update-impl.ts
index 38f1d7fb448a..e5f575db4dfb 100644
--- a/packages/angular/cli/commands/update-impl.ts
+++ b/packages/angular/cli/commands/update-impl.ts
@@ -54,7 +54,7 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
       collectionName: this.collectionName,
       schematicName: this.schematicName,
       schematicOptions: options['--'],
-      dryRun: options.dryRun,
+      dryRun: !!options.dryRun,
       force: false,
       showNothingDone: false,
     });
diff --git a/packages/angular/cli/commands/update.json b/packages/angular/cli/commands/update.json
index 9c53d613de6d..964f1e05d2ef 100644
--- a/packages/angular/cli/commands/update.json
+++ b/packages/angular/cli/commands/update.json
@@ -22,14 +22,6 @@
           "$default": {
             "$source": "argv"
           }
-        },
-        "dryRun": {
-          "type": "boolean",
-          "default": false,
-          "aliases": [
-            "d"
-          ],
-          "description": "Run through without making any changes."
         }
       },
       "required": [

From 3de49db38e76e07f56b1691a2ed01d8c22ac2ab6 Mon Sep 17 00:00:00 2001
From: Noel Mace <contact@noelmace.com>
Date: Sun, 30 Sep 2018 16:12:14 +0200
Subject: [PATCH 0262/1703] fix(@angular/cli): capture CPU profile

Replace the v8-profiler dependency with v8-profiler-node8 as the first one
doesn't support node 8 and 10, and that @angular/cli support only node 8
and 10.
---
 lib/bootstrap-local.js           |  6 +++---
 packages/angular/cli/lib/init.ts | 10 +++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/bootstrap-local.js b/lib/bootstrap-local.js
index 89b707fc1923..064691c7db02 100644
--- a/lib/bootstrap-local.js
+++ b/lib/bootstrap-local.js
@@ -26,10 +26,10 @@ if (process.env['CODE_COVERAGE'] || process.argv.indexOf('--code-coverage') !==
 let profiler = null;
 if (process.env['DEVKIT_PROFILING']) {
   try {
-    profiler = require('v8-profiler');
+    profiler = require('v8-profiler-node8');
   } catch (err) {
-    throw new Error(`Could not require 'v8-profiler'. You must install it separetely with` +
-      `'npm install v8-profiler --no-save.\n\nOriginal error:\n\n${err}`);
+    throw new Error(`Could not require 'v8-profiler-node8'. You must install it separetely with` +
+      `'npm install v8-profiler-node8 --no-save.\n\nOriginal error:\n\n${err}`);
   }
 
   profiler.startProfiling();
diff --git a/packages/angular/cli/lib/init.ts b/packages/angular/cli/lib/init.ts
index 3a269fcee191..8904e618d30a 100644
--- a/packages/angular/cli/lib/init.ts
+++ b/packages/angular/cli/lib/init.ts
@@ -43,8 +43,16 @@ function _fromPackageJson(cwd?: string) {
 
 // Check if we need to profile this CLI run.
 if (process.env['NG_CLI_PROFILING']) {
-  const profiler = require('v8-profiler'); // tslint:disable-line:no-implicit-dependencies
+  let profiler: any = null;
+  try {
+    profiler = require('v8-profiler-node8'); // tslint:disable-line:no-implicit-dependencies
+  } catch (err) {
+    throw new Error(`Could not require 'v8-profiler-node8'. You must install it separetely with` +
+      `'npm install v8-profiler-node8 --no-save.\n\nOriginal error:\n\n${err}`);
+  }
+
   profiler.startProfiling();
+
   const exitHandler = (options: { cleanup?: boolean, exit?: boolean }) => {
     if (options.cleanup) {
       const cpuProfile = profiler.stopProfiling();

From 774f6d61f341bd06ceddc56ff2e3d7301fb5acf6 Mon Sep 17 00:00:00 2001
From: Noel Mace <contact@noelmace.com>
Date: Sun, 30 Sep 2018 16:14:57 +0200
Subject: [PATCH 0263/1703] docs(@angular/cli): how to capture a CPU profile

Add documentation on how to generate a CPU profile capture.
---
 packages/angular/cli/README.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/packages/angular/cli/README.md b/packages/angular/cli/README.md
index a55e25895106..a0e74dfcf7e4 100644
--- a/packages/angular/cli/README.md
+++ b/packages/angular/cli/README.md
@@ -226,6 +226,28 @@ Then you can add breakpoints in `dist/@angular` files.
 
 For more informations about Node.js debugging in VS Code, see the related [VS Code Documentation](https://code.visualstudio.com/docs/nodejs/nodejs-debugging).
 
+### CPU Profiling
+
+In order to investigate performance issues, CPU profiling is often usefull.
+
+To capture a CPU profiling, you can:
+1. install the v8-profiler-node8 dependency: `npm install v8-profiler-node8 --no-save`
+1. set the NG_CLI_PROFILING Environment variable to the file name you want:
+    * on Unix systems (Linux & Mac OS X): ̀`export NG_CLI_PROFILING=my-profile`
+    * on Windows: ̀̀`setx NG_CLI_PROFILING my-profile`
+
+Then, just run the ng command on which you want to capture a CPU profile.
+You will then obtain a `my-profile.cpuprofile` file in the folder from wich you ran the ng command.
+
+You can use the Chrome Devtools to process it. To do so:
+1. open `chrome://inspect/#devices` in Chrome
+1. click on "Open dedicated DevTools for Node"
+1. go to the "profiler" tab
+1. click on the "Load" button and select the generated .cpuprofile file
+1. on the left panel, select the associated file
+
+In addition to this one, another, more elaborated way to capture a CPU profile using the Chrome Devtools is detailed in https://github.com/angular/angular-cli/issues/8259#issue-269908550.
+
 ## Documentation
 
 The documentation for the Angular CLI is located in this repo's [wiki](https://github.com/angular/angular-cli/wiki).

From 42f827ba36177264d0e57df7bf9b8515b2f53cb2 Mon Sep 17 00:00:00 2001
From: Noel Mace <contact@noelmace.com>
Date: Sun, 30 Sep 2018 18:27:25 +0200
Subject: [PATCH 0264/1703] build: add v8-profiler typings

After some refactoring on the angular/cli init, v8-profiler typing is required
in order to fix a no-any lint error.
---
 package.json                     | 1 +
 packages/angular/cli/lib/init.ts | 4 +++-
 yarn.lock                        | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 545259eeea87..4f7b3f203d4d 100644
--- a/package.json
+++ b/package.json
@@ -87,6 +87,7 @@
     "@types/request": "^2.47.1",
     "@types/semver": "^5.5.0",
     "@types/source-map": "0.5.2",
+    "@types/v8-profiler": "^0.0.5",
     "@types/webpack": "^4.4.11",
     "@types/webpack-dev-server": "^3.1.0",
     "@types/webpack-sources": "^0.1.5",
diff --git a/packages/angular/cli/lib/init.ts b/packages/angular/cli/lib/init.ts
index 8904e618d30a..564f0810eb49 100644
--- a/packages/angular/cli/lib/init.ts
+++ b/packages/angular/cli/lib/init.ts
@@ -16,6 +16,8 @@ import { SemVer } from 'semver';
 import { Duplex } from 'stream';
 import { isWarningEnabled } from '../utilities/config';
 
+import { Profiler } from 'v8-profiler';
+
 const packageJson = require('../package.json');
 
 function _fromPackageJson(cwd?: string) {
@@ -43,7 +45,7 @@ function _fromPackageJson(cwd?: string) {
 
 // Check if we need to profile this CLI run.
 if (process.env['NG_CLI_PROFILING']) {
-  let profiler: any = null;
+  let profiler: Profiler;
   try {
     profiler = require('v8-profiler-node8'); // tslint:disable-line:no-implicit-dependencies
   } catch (err) {
diff --git a/yarn.lock b/yarn.lock
index 35a1e3264287..a19ce9aefc31 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -463,6 +463,12 @@
   version "1.0.1"
   resolved "https://codeload.github.com/quicktype/types-urijs/tar.gz/a23603a04e31e883a92244bff8515e3d841a8b98"
 
+"@types/v8-profiler@^0.0.5":
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/@types/v8-profiler/-/v8-profiler-0.0.5.tgz#2b9f0b7ba3294f5b177b66790607772910a195f9"
+  dependencies:
+    "@types/node" "*"
+
 "@types/webpack-dev-server@^3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-3.1.0.tgz#1fae06ad346d2dd09bc5e34745723946458eed58"

From 93ccb823419b12e2ef2ac8dfa7e4519657afee54 Mon Sep 17 00:00:00 2001
From: Noel Mace <contact@noelmace.com>
Date: Sun, 30 Sep 2018 19:46:58 +0200
Subject: [PATCH 0265/1703] style: disable no-implicit-dependency v8-profiler

We only use @types/v8-profiler, which is a repository dev dependency, and v8-profiler-node8
is a "when needed" dependency.
---
 packages/angular/cli/lib/init.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/lib/init.ts b/packages/angular/cli/lib/init.ts
index 564f0810eb49..bce12f2cfe0b 100644
--- a/packages/angular/cli/lib/init.ts
+++ b/packages/angular/cli/lib/init.ts
@@ -16,7 +16,8 @@ import { SemVer } from 'semver';
 import { Duplex } from 'stream';
 import { isWarningEnabled } from '../utilities/config';
 
-import { Profiler } from 'v8-profiler';
+// from @types/v8-profiler (no dependency to v8-profiler as we use v8-profiler-node8)
+import { Profiler } from 'v8-profiler'; // tslint:disable-line:no-implicit-dependencies
 
 const packageJson = require('../package.json');
 

From 317602e40d327d071b2a4f3277582ab7e4a1cc8c Mon Sep 17 00:00:00 2001
From: Noel Mace <contact@noelmace.com>
Date: Tue, 2 Oct 2018 13:58:44 +0200
Subject: [PATCH 0266/1703] refactor(@angular/cli): remove v8-profiler typings

Remove dependency to the @types/v8-profiler Profiler type as we don't want to depend on it.

See https://github.com/angular/angular-cli/pull/12411#discussion_r221688065
---
 package.json                     | 1 -
 packages/angular/cli/lib/init.ts | 8 ++++----
 yarn.lock                        | 6 ------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 4f7b3f203d4d..545259eeea87 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,6 @@
     "@types/request": "^2.47.1",
     "@types/semver": "^5.5.0",
     "@types/source-map": "0.5.2",
-    "@types/v8-profiler": "^0.0.5",
     "@types/webpack": "^4.4.11",
     "@types/webpack-dev-server": "^3.1.0",
     "@types/webpack-sources": "^0.1.5",
diff --git a/packages/angular/cli/lib/init.ts b/packages/angular/cli/lib/init.ts
index bce12f2cfe0b..41fa2f33e81f 100644
--- a/packages/angular/cli/lib/init.ts
+++ b/packages/angular/cli/lib/init.ts
@@ -16,9 +16,6 @@ import { SemVer } from 'semver';
 import { Duplex } from 'stream';
 import { isWarningEnabled } from '../utilities/config';
 
-// from @types/v8-profiler (no dependency to v8-profiler as we use v8-profiler-node8)
-import { Profiler } from 'v8-profiler'; // tslint:disable-line:no-implicit-dependencies
-
 const packageJson = require('../package.json');
 
 function _fromPackageJson(cwd?: string) {
@@ -46,7 +43,10 @@ function _fromPackageJson(cwd?: string) {
 
 // Check if we need to profile this CLI run.
 if (process.env['NG_CLI_PROFILING']) {
-  let profiler: Profiler;
+  let profiler: {
+    startProfiling: (name?: string, recsamples?: boolean) => void;
+    stopProfiling: (name?: string) => any; // tslint:disable-line:no-any
+  };
   try {
     profiler = require('v8-profiler-node8'); // tslint:disable-line:no-implicit-dependencies
   } catch (err) {
diff --git a/yarn.lock b/yarn.lock
index a19ce9aefc31..35a1e3264287 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -463,12 +463,6 @@
   version "1.0.1"
   resolved "https://codeload.github.com/quicktype/types-urijs/tar.gz/a23603a04e31e883a92244bff8515e3d841a8b98"
 
-"@types/v8-profiler@^0.0.5":
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/@types/v8-profiler/-/v8-profiler-0.0.5.tgz#2b9f0b7ba3294f5b177b66790607772910a195f9"
-  dependencies:
-    "@types/node" "*"
-
 "@types/webpack-dev-server@^3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-3.1.0.tgz#1fae06ad346d2dd09bc5e34745723946458eed58"

From b76afb35e002a4c4929607fdadb5876d8031fdc8 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 1 Oct 2018 19:19:32 +0100
Subject: [PATCH 0267/1703] test: update snapshots TS version

---
 tests/legacy-cli/e2e/utils/project.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts
index 4eacb97d6077..ca292e3c682e 100644
--- a/tests/legacy-cli/e2e/utils/project.ts
+++ b/tests/legacy-cli/e2e/utils/project.ts
@@ -139,7 +139,7 @@ export function useSha() {
             = `github:angular/${pkgName}-builds${label}`;
         });
 
-      json['devDependencies']['typescript'] = '~3.0.1';
+      json['devDependencies']['typescript'] = '~3.1.1';
     });
   } else {
     return Promise.resolve();

From b06ee93e0752cec431539f9b743daf411aad5823 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 1 Oct 2018 13:45:20 -0400
Subject: [PATCH 0268/1703] build: add check yarn preinstall script

Direct copy of the script from core.
---
 package.json             |  1 +
 tools/yarn/check-yarn.js | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 tools/yarn/check-yarn.js

diff --git a/package.json b/package.json
index 545259eeea87..06ff5def71b7 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,7 @@
     "validate": "node ./bin/devkit-admin validate",
     "validate-commits": "./bin/devkit-admin validate-commits",
     "prepush": "node ./bin/devkit-admin hooks/pre-push",
+    "preinstall": "node ./tools/yarn/check-yarn.js",
     "webdriver-update-appveyor": "webdriver-manager update --standalone false --gecko false --versions.chrome 2.37",
     "webdriver-update-circleci": "webdriver-manager update --standalone false --gecko false --versions.chrome $CHROMEDRIVER_VERSION_ARG "
   },
diff --git a/tools/yarn/check-yarn.js b/tools/yarn/check-yarn.js
new file mode 100644
index 000000000000..2e7d66ef63c4
--- /dev/null
+++ b/tools/yarn/check-yarn.js
@@ -0,0 +1,14 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+'use strict';
+
+if (process.env.npm_execpath.indexOf('yarn') === -1) {
+  throw new Error(
+      'Please use Yarn instead of NPM to install dependencies. See: https://yarnpkg.com/lang/en/docs/install/');
+}

From 0cfd5737ac8519fbbecc0ebd634ccd1f6abb1f8d Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 2 Oct 2018 18:19:10 +0200
Subject: [PATCH 0269/1703] fix(@angular-devkit/build-angular): resolve assets
 in styles relative to importee

Closes #12430
---
 .../plugins/postcss-cli-resources.ts           | 18 ++++++++++++------
 .../test/browser/styles_spec_large.ts          | 14 ++++++++++++++
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts
index 7192ca92efea..b97e1184f050 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { interpolateName } from 'loader-utils';
+import * as path from 'path';
 import * as postcss from 'postcss';
 import * as url from 'url';
 import * as webpack from 'webpack';
@@ -52,7 +53,7 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
 
   const dedupeSlashes = (url: string) => url.replace(/\/\/+/g, '/');
 
-  const process = async (inputUrl: string, resourceCache: Map<string, string>) => {
+  const process = async (inputUrl: string, context: string, resourceCache: Map<string, string>) => {
     // If root-relative or absolute, leave as is
     if (inputUrl.match(/^(?:\w+:\/\/|data:|chrome:|#)/)) {
       return inputUrl;
@@ -63,7 +64,8 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
       return inputUrl.substr(1);
     }
 
-    const cachedUrl = resourceCache.get(inputUrl);
+    const cacheKey = path.resolve(context, inputUrl);
+    const cachedUrl = resourceCache.get(cacheKey);
     if (cachedUrl) {
       return cachedUrl;
     }
@@ -85,7 +87,7 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
         outputUrl = dedupeSlashes(`/${baseHref}/${deployUrl}/${inputUrl}`);
       }
 
-      resourceCache.set(inputUrl, outputUrl);
+      resourceCache.set(cacheKey, outputUrl);
 
       return outputUrl;
     }
@@ -102,7 +104,7 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
       });
     });
 
-    const result = await resolve(pathname as string, loader.context, resolver);
+    const result = await resolve(pathname as string, context, resolver);
 
     return new Promise<string>((resolve, reject) => {
       loader.fs.readFile(result, (err: Error, content: Buffer) => {
@@ -130,7 +132,7 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
           outputUrl = url.resolve(deployUrl, outputUrl);
         }
 
-        resourceCache.set(inputUrl, outputUrl);
+        resourceCache.set(cacheKey, outputUrl);
         resolve(outputUrl);
       });
     });
@@ -158,12 +160,16 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
       let match;
       let lastIndex = 0;
       let modified = false;
+
+      // We want to load it relative to the file that imports
+      const context = path.dirname(decl.source.input.file);
+
       // tslint:disable-next-line:no-conditional-assignment
       while (match = urlRegex.exec(value)) {
         const originalUrl = match[1] || match[2] || match[3];
         let processedUrl;
         try {
-          processedUrl = await process(originalUrl, resourceCache);
+          processedUrl = await process(originalUrl, context, resourceCache);
         } catch (err) {
           loader.emitError(decl.error(err.message, { word: originalUrl }).toString());
           continue;
diff --git a/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
index 774e1ae96752..4f76dae06977 100644
--- a/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
@@ -293,6 +293,20 @@ describe('Browser Builder styles', () => {
     ).toPromise().then(done, done.fail);
   }, 30000);
 
+  it(`supports font-awesome imports without extractCss`, (done) => {
+    host.writeMultipleFiles({
+      'src/styles.scss': `
+        @import "~font-awesome/css/font-awesome.css";
+      `,
+    });
+
+    const overrides = { extractCss: false, styles: [`src/styles.scss`] };
+
+    runTargetSpec(host, browserTargetSpec, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+    ).toPromise().then(done, done.fail);
+  }, 30000);
+
   it(`uses autoprefixer`, (done) => {
     host.writeMultipleFiles({
       'src/styles.css': tags.stripIndents`

From 8d81c4f5c69c64c52fb2cb0196d9c54c61dbb3c9 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 2 Oct 2018 13:46:51 +0200
Subject: [PATCH 0270/1703] style(@schematics/angular): remove extra whitespace
 in EOF

Closes #12426
---
 packages/schematics/angular/application/files/src/main.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/angular/application/files/src/main.ts b/packages/schematics/angular/application/files/src/main.ts
index dfbe22af7360..ad5a6269c3af 100644
--- a/packages/schematics/angular/application/files/src/main.ts
+++ b/packages/schematics/angular/application/files/src/main.ts
@@ -15,4 +15,5 @@ import { AppComponent } from './app/app.component';
 import { ɵrenderComponent as renderComponent } from '@angular/core';
 
 renderComponent(AppComponent);
-<% } %>
+
+<% } %>
\ No newline at end of file

From 64d15246494e92d0f27a100eac1b3450d1201d6b Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 27 Sep 2018 13:55:15 -0400
Subject: [PATCH 0271/1703] refactor(@schematics/angular): cleanup application
 polyfill comments

---
 .../schematics/angular/application/files/src/polyfills.ts  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/angular/application/files/src/polyfills.ts b/packages/schematics/angular/application/files/src/polyfills.ts
index 6bf2547537d3..ee8b84da807c 100644
--- a/packages/schematics/angular/application/files/src/polyfills.ts
+++ b/packages/schematics/angular/application/files/src/polyfills.ts
@@ -28,15 +28,15 @@
 // import 'core-js/es6/math';
 // import 'core-js/es6/string';
 // import 'core-js/es6/date';
+// import 'core-js/es6/array';
 // import 'core-js/es6/regexp';
 // import 'core-js/es6/map';
 // import 'core-js/es6/weak-map';
 // import 'core-js/es6/set';
 
 /**
- * If your app need to indexed by Google Search, your app require polyfills 'core-js/es6/array'
- * Google bot use ES5.
- * FYI: Googlebot uses a renderer following the similar spec to Chrome 41.
+ * If the application will be indexed by Google Search, the following is required.
+ * Googlebot uses a renderer based on Chrome 41.
  * https://developers.google.com/search/docs/guides/rendering
  **/
 // import 'core-js/es6/array';
@@ -75,7 +75,6 @@
 import 'zone.js/dist/zone';  // Included with Angular CLI.
 
 
-
 /***************************************************************************************************
  * APPLICATION IMPORTS
  */

From 3bf2bb077442e9d884a44fcfc7c15f0ce0f1ef14 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 28 Sep 2018 10:48:41 -0400
Subject: [PATCH 0272/1703] refactor(@angular-devkit/build-angular): remove
 unused html webpack plugins

---
 .../angular_devkit/build_angular/package.json |    1 -
 .../base-href-webpack-plugin.ts               |   49 -
 .../base-href-webpack-plugin_spec.ts          |   91 -
 .../lib/base-href-webpack/index.ts            |   11 -
 .../models/webpack-configs/browser.ts         |   34 +-
 .../src/angular-cli-files/plugins/webpack.ts  |    1 -
 .../utilities/package-chunk-sort.ts           |   37 +-
 yarn.lock                                     | 1535 ++++++++++++++---
 8 files changed, 1294 insertions(+), 465 deletions(-)
 delete mode 100644 packages/angular_devkit/build_angular/src/angular-cli-files/lib/base-href-webpack/base-href-webpack-plugin.ts
 delete mode 100644 packages/angular_devkit/build_angular/src/angular-cli-files/lib/base-href-webpack/base-href-webpack-plugin_spec.ts
 delete mode 100644 packages/angular_devkit/build_angular/src/angular-cli-files/lib/base-href-webpack/index.ts

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index c821ac2aeaf4..5757aeeaf178 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -18,7 +18,6 @@
     "copy-webpack-plugin": "4.5.2",
     "file-loader": "2.0.0",
     "glob": "7.1.3",
-    "html-webpack-plugin": "3.2.0",
     "istanbul": "0.4.5",
     "istanbul-instrumenter-loader": "3.0.1",
     "karma-source-map-support": "1.3.0",
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/lib/base-href-webpack/base-href-webpack-plugin.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/lib/base-href-webpack/base-href-webpack-plugin.ts
deleted file mode 100644
index e91ad5c18aad..000000000000
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/lib/base-href-webpack/base-href-webpack-plugin.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-// tslint:disable
-// TODO: cleanup this file, it's copied as is from Angular CLI.
-
-export interface BaseHrefWebpackPluginOptions {
-  baseHref: string;
-}
-
-export class BaseHrefWebpackPlugin {
-  constructor(public readonly options: BaseHrefWebpackPluginOptions) { }
-
-  apply(compiler: any): void {
-    // Ignore if baseHref is not passed
-    if (!this.options.baseHref && this.options.baseHref !== '') {
-      return;
-    }
-
-    compiler.plugin('compilation', (compilation: any) => {
-      compilation.plugin(
-        'html-webpack-plugin-before-html-processing',
-        (htmlPluginData: any, callback: Function) => {
-          // Check if base tag already exists
-          const baseTagRegex = /<base.*?>/i;
-          const baseTagMatches = htmlPluginData.html.match(baseTagRegex);
-          if (!baseTagMatches) {
-            // Insert it in top of the head if not exist
-            htmlPluginData.html = htmlPluginData.html.replace(
-              /<head>/i, '$&' + `<base href="${this.options.baseHref}">`
-            );
-          } else {
-            // Replace only href attribute if exists
-            const modifiedBaseTag = baseTagMatches[0].replace(
-              /href="\S*?"/i, `href="${this.options.baseHref}"`
-            );
-            htmlPluginData.html = htmlPluginData.html.replace(baseTagRegex, modifiedBaseTag);
-          }
-
-          callback(null, htmlPluginData);
-        }
-      );
-    });
-  }
-}
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/lib/base-href-webpack/base-href-webpack-plugin_spec.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/lib/base-href-webpack/base-href-webpack-plugin_spec.ts
deleted file mode 100644
index a8747096f0b3..000000000000
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/lib/base-href-webpack/base-href-webpack-plugin_spec.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-// tslint:disable
-// TODO: cleanup this file, it's copied as is from Angular CLI.
-
-import { tags } from '@angular-devkit/core';
-import {BaseHrefWebpackPlugin} from './base-href-webpack-plugin';
-
-
-function mockCompiler(indexHtml: string, callback: Function) {
-  return {
-    plugin: function (_event: any, compilerCallback: Function) {
-      const compilation = {
-        plugin: function (_hook: any, compilationCallback: Function) {
-          const htmlPluginData = {
-            html: indexHtml
-          };
-          compilationCallback(htmlPluginData, callback);
-        }
-      };
-      compilerCallback(compilation);
-    }
-  };
-}
-
-describe('base href webpack plugin', () => {
-  const html = tags.oneLine`
-    <html>
-      <head></head>
-      <body></body>
-    </html>
-  `;
-
-  it('should do nothing when baseHref is null', () => {
-    const plugin = new BaseHrefWebpackPlugin({ baseHref: null } as any);
-
-    const compiler = mockCompiler(html, (_x: any, htmlPluginData: any) => {
-      expect(htmlPluginData.html).toEqual('<body><head></head></body>');
-    });
-    plugin.apply(compiler);
-  });
-
-  it('should insert base tag when not exist', function () {
-    const plugin = new BaseHrefWebpackPlugin({ baseHref: '/' });
-    const compiler = mockCompiler(html, (_x: any, htmlPluginData: any) => {
-        expect(htmlPluginData.html).toEqual(tags.oneLine`
-          <html>
-            <head><base href="/"></head>
-            <body></body>
-          </html>
-        `);
-      });
-
-    plugin.apply(compiler);
-  });
-
-  it('should replace href attribute when base tag already exists', function () {
-    const plugin = new BaseHrefWebpackPlugin({ baseHref: '/myUrl/' });
-
-    const compiler = mockCompiler(tags.oneLine`
-          <head><base href="/" target="_blank"></head>
-          <body></body>
-        `, (_x: any, htmlPluginData: any) => {
-      expect(htmlPluginData.html).toEqual(tags.oneLine`
-          <head><base href="/myUrl/" target="_blank"></head>
-          <body></body>
-        `);
-    });
-    plugin.apply(compiler);
-  });
-
-  it('should replace href attribute when baseHref is empty', function () {
-    const plugin = new BaseHrefWebpackPlugin({ baseHref: '' });
-
-    const compiler = mockCompiler(tags.oneLine`
-          <head><base href="/" target="_blank"></head>
-          <body></body>
-        `, (_x: any, htmlPluginData: any) => {
-      expect(htmlPluginData.html).toEqual(tags.oneLine`
-          <head><base href="" target="_blank"></head>
-          <body></body>
-        `);
-    });
-    plugin.apply(compiler);
-  });
-});
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/lib/base-href-webpack/index.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/lib/base-href-webpack/index.ts
deleted file mode 100644
index f38b36f68f81..000000000000
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/lib/base-href-webpack/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-// tslint:disable
-// TODO: cleanup this file, it's copied as is from Angular CLI.
-
-export * from './base-href-webpack-plugin';
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
index ee19e475baf4..eccf8ad71b93 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
@@ -9,11 +9,9 @@
 // TODO: cleanup this file, it's copied as is from Angular CLI.
 
 import * as path from 'path';
-const HtmlWebpackPlugin = require('html-webpack-plugin');
 const SubresourceIntegrityPlugin = require('webpack-subresource-integrity');
 import { LicenseWebpackPlugin } from 'license-webpack-plugin';
-import { generateEntryPoints, packageChunkSort } from '../../utilities/package-chunk-sort';
-import { BaseHrefWebpackPlugin } from '../../lib/base-href-webpack';
+import { generateEntryPoints } from '../../utilities/package-chunk-sort';
 import { IndexHtmlWebpackPlugin } from '../../plugins/index-html-webpack-plugin';
 import { WebpackConfigOptions } from '../build-options';
 import { normalizeExtraEntryPoints } from './utils';
@@ -26,37 +24,9 @@ import { normalizeExtraEntryPoints } from './utils';
 + */
 
 export function getBrowserConfig(wco: WebpackConfigOptions) {
-  const { root, projectRoot, buildOptions } = wco;
-
-
+  const { root, buildOptions } = wco;
   let extraPlugins: any[] = [];
 
-  // Figure out which are the lazy loaded bundle names.
-  const lazyChunkBundleNames = normalizeExtraEntryPoints(
-    // We don't really need a default name because we pre-filtered by lazy only entries.
-    [...buildOptions.styles, ...buildOptions.scripts], 'not-lazy')
-    .filter(entry => entry.lazy)
-    .map(entry => entry.bundleName)
-
-  const generateIndexHtml = false;
-  if (generateIndexHtml) {
-    extraPlugins.push(new HtmlWebpackPlugin({
-      template: path.resolve(root, buildOptions.index),
-      filename: path.resolve(buildOptions.outputPath, buildOptions.index),
-      chunksSortMode: packageChunkSort(buildOptions),
-      excludeChunks: lazyChunkBundleNames,
-      xhtml: true,
-      minify: buildOptions.optimization ? {
-        caseSensitive: true,
-        collapseWhitespace: true,
-        keepClosingSlash: true
-      } : false
-    }));
-    extraPlugins.push(new BaseHrefWebpackPlugin({
-      baseHref: buildOptions.baseHref as string
-    }));
-  }
-
   let sourcemaps: string | false = false;
   if (buildOptions.sourceMap) {
     // See https://webpack.js.org/configuration/devtool/ for sourcemap types.
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/webpack.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/webpack.ts
index 026e834641fd..5679b0be0011 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/webpack.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/webpack.ts
@@ -7,7 +7,6 @@
  */
 
 // Exports the webpack plugins we use internally.
-export { BaseHrefWebpackPlugin } from '../lib/base-href-webpack/base-href-webpack-plugin';
 export { CleanCssWebpackPlugin, CleanCssWebpackPluginOptions } from './cleancss-webpack-plugin';
 export { BundleBudgetPlugin, BundleBudgetPluginOptions } from './bundle-budget';
 export { ScriptsWebpackPlugin, ScriptsWebpackPluginOptions } from './scripts-webpack-plugin';
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts
index ce9f1b3e5dca..2e443db69a22 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts
@@ -5,21 +5,20 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable
-// TODO: cleanup this file, it's copied as is from Angular CLI.
-
 import { ExtraEntryPoint } from '../../browser/schema';
 import { normalizeExtraEntryPoints } from '../models/webpack-configs/utils';
 
-export function generateEntryPoints(appConfig: any) {
-  let entryPoints = ['polyfills', 'sw-register'];
+export function generateEntryPoints(
+  appConfig: { styles: ExtraEntryPoint[], scripts: ExtraEntryPoint[] },
+) {
+  const entryPoints = ['polyfills', 'sw-register'];
 
   // Add all styles/scripts, except lazy-loaded ones.
   [
-    ...normalizeExtraEntryPoints(appConfig.styles as ExtraEntryPoint[], 'styles')
+    ...normalizeExtraEntryPoints(appConfig.styles, 'styles')
       .filter(entry => !entry.lazy)
       .map(entry => entry.bundleName),
-    ...normalizeExtraEntryPoints(appConfig.scripts as ExtraEntryPoint[], 'scripts')
+    ...normalizeExtraEntryPoints(appConfig.scripts, 'scripts')
       .filter(entry => !entry.lazy)
       .map(entry => entry.bundleName),
   ].forEach(bundleName => {
@@ -32,27 +31,3 @@ export function generateEntryPoints(appConfig: any) {
 
   return entryPoints;
 }
-
-// Sort chunks according to a predefined order:
-// inline, polyfills, all styles, vendor, main
-export function packageChunkSort(appConfig: any) {
-  const entryPoints = generateEntryPoints(appConfig);
-
-  function sort(left: any, right: any) {
-    let leftIndex = entryPoints.indexOf(left.names[0]);
-    let rightindex = entryPoints.indexOf(right.names[0]);
-
-    if (leftIndex > rightindex) {
-      return 1;
-    } else if (leftIndex < rightindex) {
-      return -1;
-    } else {
-      return 0;
-    }
-  }
-
-  // We need to list of entry points for the Ejected webpack config to work (we reuse the function
-  // defined above).
-  (sort as any).entryPoints = entryPoints;
-  return sort;
-}
diff --git a/yarn.lock b/yarn.lock
index 35a1e3264287..f477d287ab68 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5,24 +5,28 @@
 "@angular/animations@^7.0.0-rc.0":
   version "7.0.0-rc.0"
   resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.0.0-rc.0.tgz#963e64fa7265d948a08cb32508cea1a24107e439"
+  integrity sha512-NpFcuCfM11O/YIGl1piH3VufOlfnJSK6iyw19ElXjw4mr/jvK4vcg9fEXbqBvmQ6uregoeadRSVCp8tdRJHOyw==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/cdk@^6.1.0":
   version "6.4.7"
   resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-6.4.7.tgz#1549b304dd412e82bd854cc55a7d5c6772ee0411"
+  integrity sha512-18x0U66fLD5kGQWZ9n3nb75xQouXlWs7kUDaTd8HTrHpT1s2QIAqlLd1KxfrYiVhsEC2jPQaoiae7VnBlcvkBg==
   dependencies:
     tslib "^1.7.1"
 
 "@angular/common@^7.0.0-rc.0":
   version "7.0.0-rc.0"
   resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.0.0-rc.0.tgz#4872a430838653cbddfba759ccf1f9332c065171"
+  integrity sha512-YghYg9lFKF0cxaCiWfgByFbQ69dq521QDG93KX1mP+Tvc0jXXlbolDPYHGXx/VMUaoHq18VNzi7ZInpgc/pRBw==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/compiler-cli@^7.0.0-rc.0":
   version "7.0.0-rc.0"
   resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.0.0-rc.0.tgz#59f37f2409ce896cb73daa221dbd898855d12939"
+  integrity sha512-Nkd5UgSt0NHVLE/U3FIUmSJxGW47+9B4hfR5oDhC7gkUNaRQzi+PzzVYj7jOdDJjgHV+Y0KS3msiXWhUSY4gpw==
   dependencies:
     canonical-path "0.0.2"
     chokidar "^1.4.2"
@@ -38,24 +42,28 @@
 "@angular/compiler@^7.0.0-rc.0":
   version "7.0.0-rc.0"
   resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.0.0-rc.0.tgz#2dfd293ad6583f9574c9fe79354256206f594a51"
+  integrity sha512-ifVqB/xJtSzOlk8B39Ld2wMbYni6Ey7s5jc+u/0NMtdut+2Q61Ar+TKjJZ3vmta3df7QqHX5JcP0W6qICRHJ+w==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/core@^7.0.0-rc.0":
   version "7.0.0-rc.0"
   resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.0.0-rc.0.tgz#c1d845d5d1718f96f542abe7ae86b64c280da3bb"
+  integrity sha512-DXTUjk1tUdgxj0AHQR6wAKLF+i/vSsRCBxFEzcBa944UJoYBDd1n2PIREzDMW0tkGMtxfHy3Ti+trSpPBLiDTA==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/http@^7.0.0-rc.0":
   version "7.0.0-rc.0"
   resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.0.0-rc.0.tgz#659c3ac6bd66199a726f1f46cdc800fc25e37922"
+  integrity sha512-f7IaVuen/WuHIKcP9mO3Jz4oy8Qxdwo3PS750Bk5VVVNBF4TILRr+96j37C7965ZBxeJQzfcGfXew7d5nObJ/A==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/material@^6.1.0":
   version "6.4.7"
   resolved "https://registry.yarnpkg.com/@angular/material/-/material-6.4.7.tgz#3c8f2d6a6a7904d97be29e06a84ffb62a8da6c16"
+  integrity sha512-SdNx7Xovi24Kw9eU6lkLhY/7f2M7L9F+/uh6XuPr4jbGgCUVVpeeVI5ztZhsZRbj1sN+/r1p5w8u62apWWl5Ww==
   dependencies:
     tslib "^1.7.1"
   optionalDependencies:
@@ -64,18 +72,21 @@
 "@angular/platform-browser-dynamic@^7.0.0-rc.0":
   version "7.0.0-rc.0"
   resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.0.0-rc.0.tgz#b66d4c30ed25f67dab15e64462b959d039ada705"
+  integrity sha512-+SbuLnedoZNY6kfY5dV5p/+Rm4oj/DVwLhOWVFMtrqiaKRSrrEThH12FPKfQCqak51RjF4wDpJbqyWCGFDIbJA==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-browser@^7.0.0-rc.0":
   version "7.0.0-rc.0"
   resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.0.0-rc.0.tgz#9e19e83bce242f9dde0457719d15a87a90e314cc"
+  integrity sha512-N52E4TjX3AwMT0EMZTikxQz+4rkdx1C9WnBSIuBR5rYwZi391mxexvES8PqE4UqEarm08eHvfxUwtMZU/FwC+w==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-server@^7.0.0-rc.0":
   version "7.0.0-rc.0"
   resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.0.0-rc.0.tgz#ae03a549203b91e6335fb3b4401fe9c0c972fc00"
+  integrity sha512-OxvXlr4DQiT57vJf9wsKxO8fMnC3MBLCPK93HjWTDLgCRzH93FXbbp2+e7knqMAhELUCrC3e1MzNzzEulwkxPg==
   dependencies:
     domino "^2.1.0"
     tslib "^1.9.0"
@@ -84,24 +95,28 @@
 "@angular/router@^7.0.0-rc.0":
   version "7.0.0-rc.0"
   resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.0.0-rc.0.tgz#6d6ddae8cf8bb15f9c0aaba2bb7487eb42248bd2"
+  integrity sha512-rT58TKCelP6BLw8Gzu6ZPeO86xzVFpDxVCLGmwEAmkWw8xG0gACkPYeVny4hsCkfx4nbz2w8upQksOKrudZt4w==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/service-worker@^7.0.0-rc.0":
   version "7.0.0-rc.0"
   resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.0.0-rc.0.tgz#52c9bb2c2014f7c2360e1d5a2bd87a18296ba04b"
+  integrity sha512-nEJhF3etWeS5OLDpCwtzsCb6RXchiQ3WqmykOyzpfzzbYgIIjVN6k/mn858/DvNDw+9LkqNiMB/+U3LRyjFYhw==
   dependencies:
     tslib "^1.9.0"
 
 "@babel/code-frame@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
+  integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
   dependencies:
     "@babel/highlight" "^7.0.0"
 
 "@babel/generator@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0.tgz#1efd58bffa951dc846449e58ce3a1d7f02d393aa"
+  integrity sha512-/BM2vupkpbZXq22l1ALO7MqXJZH2k8bKVv8Y+pABFnzWdztDB/ZLveP5At21vLz5c2YtSE6p7j2FZEsqafMz5Q==
   dependencies:
     "@babel/types" "^7.0.0"
     jsesc "^2.5.1"
@@ -112,6 +127,7 @@
 "@babel/helper-function-name@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0.tgz#a68cc8d04420ccc663dd258f9cc41b8261efa2d4"
+  integrity sha512-Zo+LGvfYp4rMtz84BLF3bavFTdf8y4rJtMPTe2J+rxYmnDOIeH8le++VFI/pRJU+rQhjqiXxE4LMaIau28Tv1Q==
   dependencies:
     "@babel/helper-get-function-arity" "^7.0.0"
     "@babel/template" "^7.0.0"
@@ -120,18 +136,21 @@
 "@babel/helper-get-function-arity@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
+  integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@babel/helper-split-export-declaration@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
+  integrity sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@babel/highlight@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
+  integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
   dependencies:
     chalk "^2.0.0"
     esutils "^2.0.2"
@@ -140,10 +159,12 @@
 "@babel/parser@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.0.0.tgz#697655183394facffb063437ddf52c0277698775"
+  integrity sha512-RgJhNdRinpO8zibnoHbzTTexNs4c8ROkXFBanNDZTLHjwbdLk8J5cJSKulx/bycWTLYmKVNCkxRtVCoJnqPk+g==
 
 "@babel/template@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0.tgz#c2bc9870405959c89a9c814376a2ecb247838c80"
+  integrity sha512-VLQZik/G5mjYJ6u19U3W2u7eM+rA/NGzH+GtHDFFkLTKLW66OasFrxZ/yK7hkyQcswrmvugFyZpDFRW0DjcjCw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/parser" "^7.0.0"
@@ -152,6 +173,7 @@
 "@babel/traverse@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0.tgz#b1fe9b6567fdf3ab542cfad6f3b31f854d799a61"
+  integrity sha512-ka/lwaonJZTlJyn97C4g5FYjPOx+Oxd3ab05hbDr1Mx9aP1FclJ+SUHyLx3Tx40sGmOVJApDxE6puJhd3ld2kw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/generator" "^7.0.0"
@@ -166,6 +188,7 @@
 "@babel/types@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0.tgz#6e191793d3c854d19c6749989e3bc55f0e962118"
+  integrity sha512-5tPDap4bGKTLPtci2SUl/B7Gv8RnuJFuQoWx26RJobS0fFrz4reUA3JnwIM+HVHEmWE0C1mzKhDtTp8NsWY02Q==
   dependencies:
     esutils "^2.0.2"
     lodash "^4.17.10"
@@ -174,6 +197,7 @@
 "@bazel/typescript@0.16.1":
   version "0.16.1"
   resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.16.1.tgz#5a5d145a17898bfadae8268cf942815424119412"
+  integrity sha512-+S1zem6gchQV3jfzta8P5Gex3D4k2VaBKGGbS6gCo0xtLPdlQD/sRRRZSYH82jRUOe5pAKrv6xTu8gUCHu1Y2Q==
   dependencies:
     protobufjs "5.0.0"
     tsickle "0.32.1"
@@ -182,14 +206,17 @@
 "@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"
+  integrity sha1-w6DFRNYjkqzCgTpCyKDcb1j4aSI=
 
 "@sindresorhus/is@^0.7.0":
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
+  integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
 
 "@types/body-parser@*":
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.0.tgz#9f5c9d9bd04bb54be32d5eb9fc0d8c974e6cf58c"
+  integrity sha512-a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w==
   dependencies:
     "@types/connect" "*"
     "@types/node" "*"
@@ -197,16 +224,19 @@
 "@types/caseless@*":
   version "0.12.1"
   resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.1.tgz#9794c69c8385d0192acc471a540d1f8e0d16218a"
+  integrity sha512-FhlMa34NHp9K5MY1Uz8yb+ZvuX0pnvn3jScRSNAb75KHGB8d3rEU6hqMs3Z2vjuytcMfRg6c5CHMc3wtYyD2/A==
 
 "@types/connect@*":
   version "3.4.32"
   resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.32.tgz#aa0e9616b9435ccad02bc52b5b454ffc2c70ba28"
+  integrity sha512-4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==
   dependencies:
     "@types/node" "*"
 
 "@types/copy-webpack-plugin@^4.4.1":
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/@types/copy-webpack-plugin/-/copy-webpack-plugin-4.4.2.tgz#6dfac0dc8692378f76a20c6c1bbe01eec438f316"
+  integrity sha512-/L0m5kc7pKGpsu97TTgAP6YcVRmau2Wj0HpRPQBGEbZXT1DZkdozZPCZHGDWXpxcvWDFTxob2JmYJj3RC7CwFA==
   dependencies:
     "@types/minimatch" "*"
     "@types/webpack" "*"
@@ -214,14 +244,17 @@
 "@types/estree@0.0.39":
   version "0.0.39"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
+  integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
 "@types/events@*":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
+  integrity sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==
 
 "@types/express-serve-static-core@*":
   version "4.16.0"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.16.0.tgz#fdfe777594ddc1fe8eb8eccce52e261b496e43e7"
+  integrity sha512-lTeoCu5NxJU4OD9moCgm0ESZzweAx0YqsAcab6OB0EB3+As1OaHtKnaGJvcngQxYsi9UNv0abn4/DRavrRxt4w==
   dependencies:
     "@types/events" "*"
     "@types/node" "*"
@@ -230,6 +263,7 @@
 "@types/express@*", "@types/express@^4.16.0":
   version "4.16.0"
   resolved "https://registry.yarnpkg.com/@types/express/-/express-4.16.0.tgz#6d8bc42ccaa6f35cf29a2b7c3333cb47b5a32a19"
+  integrity sha512-TtPEYumsmSTtTetAPXlJVf3kEqb6wZK0bZojpJQrnD/djV4q1oB6QQ8aKvKqwNPACoe02GNiy5zDzcYivR5Z2w==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "*"
@@ -238,12 +272,14 @@
 "@types/form-data@*":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@types/form-data/-/form-data-2.2.1.tgz#ee2b3b8eaa11c0938289953606b745b738c54b1e"
+  integrity sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ==
   dependencies:
     "@types/node" "*"
 
 "@types/glob@^5.0.35":
   version "5.0.35"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.35.tgz#1ae151c802cece940443b5ac246925c85189f32a"
+  integrity sha512-wc+VveszMLyMWFvXLkloixT4n0harUIVZjnpzztaZ0nKLuul7Z32iMt2fUFGAaZ4y1XWjFRMtCI5ewvyh4aIeg==
   dependencies:
     "@types/events" "*"
     "@types/minimatch" "*"
@@ -252,6 +288,7 @@
 "@types/http-proxy-middleware@*":
   version "0.17.5"
   resolved "https://registry.yarnpkg.com/@types/http-proxy-middleware/-/http-proxy-middleware-0.17.5.tgz#efdeb4be652744422d57929f3c4ea31a2e627a45"
+  integrity sha512-mUqVzfaiOknDT2QJ7g8f2c37G4ZDqDNt08QdUkFCu19Ey5+2SZ0rWHMG00GRJ7g+SgHvl/9weZYuWLXr7RgiCg==
   dependencies:
     "@types/connect" "*"
     "@types/http-proxy" "*"
@@ -261,6 +298,7 @@
 "@types/http-proxy@*":
   version "1.16.2"
   resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.16.2.tgz#16cb373b52fff2aa2f389d23d940ed4a642349e5"
+  integrity sha512-GgqePmC3rlsn1nv+kx5OviPuUBU2omhnlXOaJSXFgOdsTcScNFap+OaCb2ip9Bm4m5L8EOehgT5d9M4uNB90zg==
   dependencies:
     "@types/events" "*"
     "@types/node" "*"
@@ -268,6 +306,7 @@
 "@types/inquirer@^0.0.42":
   version "0.0.42"
   resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-0.0.42.tgz#2310fd8623053bead72247adae416aa32bacdf0c"
+  integrity sha512-flMaNWU2g9NrtZ4bIV+7SEY2W7OdWNNhmJ0rE1lWVxGrkp3TfFGMcFCxRIBmGWigI8e6n+2HqLjizTTfgcpHLg==
   dependencies:
     "@types/rx" "*"
     "@types/through" "*"
@@ -275,14 +314,17 @@
 "@types/istanbul@^0.4.30":
   version "0.4.30"
   resolved "https://registry.yarnpkg.com/@types/istanbul/-/istanbul-0.4.30.tgz#073159320ab3296b2cfeb481f756a1f8f4c9c8e4"
+  integrity sha512-+hQU4fh2G96ze78uI5/V6+SRDZD1UnVrFn23i2eDetwfbBq3s0/zYP92xj/3qyvVMM3WnvS88N56zjz+HmL04A==
 
 "@types/jasmine@^2.8.8":
   version "2.8.8"
   resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.8.tgz#bf53a7d193ea8b03867a38bfdb4fbb0e0bf066c9"
+  integrity sha512-OJSUxLaxXsjjhob2DBzqzgrkLmukM3+JMpRp0r0E4HTdT1nwDCWhaswjYxazPij6uOdzHCJfNbDjmQ1/rnNbCg==
 
 "@types/loader-utils@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@types/loader-utils/-/loader-utils-1.1.3.tgz#82b9163f2ead596c68a8c03e450fbd6e089df401"
+  integrity sha512-euKGFr2oCB3ASBwG39CYJMR3N9T0nanVqXdiH7Zu/Nqddt6SmFRxytq/i2w9LQYNQekEtGBz+pE3qG6fQTNvRg==
   dependencies:
     "@types/node" "*"
     "@types/webpack" "*"
@@ -290,38 +332,47 @@
 "@types/mime@*":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.0.tgz#5a7306e367c539b9f6543499de8dd519fac37a8b"
+  integrity sha512-A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA==
 
 "@types/minimatch@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
 "@types/minimist@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6"
+  integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
 
 "@types/node@*":
   version "10.9.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897"
+  integrity sha512-fCHV45gS+m3hH17zgkgADUSi2RR1Vht6wOZ0jyHP8rjiQra9f+mIcgwPQHllmDocYOstIEbKlxbFDYlgrTPYqw==
 
 "@types/node@8.10.10":
   version "8.10.10"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.10.tgz#fec07bc2ad549d9e6d2f7aa0fb0be3491b83163a"
+  integrity sha512-p3W/hFzQs76RlYRIZsZc5a9bht6m0TspmWYYbKhRswmLnwj9fsE40EbuGifeu/XWR/c0UJQ1DDbvTxIsm/OOAA==
 
 "@types/node@^6.0.46":
   version "6.0.117"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.117.tgz#ccfc2506001404708528d657aad9c1b931111646"
+  integrity sha512-sihk0SnN8PpiS5ihu5xJQ5ddnURNq4P+XPmW+nORlKkHy21CoZO/IVHK/Wq/l3G8fFW06Fkltgnqx229uPlnRg==
 
 "@types/q@^0.0.32":
   version "0.0.32"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
+  integrity sha1-vShOV8hPEyXacCur/IKlMoGQwMU=
 
 "@types/range-parser@*":
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.2.tgz#fa8e1ad1d474688a757140c91de6dace6f4abc8d"
+  integrity sha512-HtKGu+qG1NPvYe1z7ezLsyIaXYyi8SoAVqWDZgDQ8dLrsZvSzUNCwZyfX33uhWxL/SU0ZDQZ3nwZ0nimt507Kw==
 
 "@types/request@^2.47.1":
   version "2.47.1"
   resolved "https://registry.yarnpkg.com/@types/request/-/request-2.47.1.tgz#25410d3afbdac04c91a94ad9efc9824100735824"
+  integrity sha512-TV3XLvDjQbIeVxJ1Z3oCTDk/KuYwwcNKVwz2YaT0F5u86Prgc4syDAp6P96rkTQQ4bIdh+VswQIC9zS6NjY7/g==
   dependencies:
     "@types/caseless" "*"
     "@types/form-data" "*"
@@ -331,70 +382,82 @@
 "@types/rx-core-binding@*":
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/@types/rx-core-binding/-/rx-core-binding-4.0.4.tgz#d969d32f15a62b89e2862c17b3ee78fe329818d3"
+  integrity sha512-5pkfxnC4w810LqBPUwP5bg7SFR/USwhMSaAeZQQbEHeBp57pjKXRlXmqpMrLJB4y1oglR/c2502853uN0I+DAQ==
   dependencies:
     "@types/rx-core" "*"
 
 "@types/rx-core@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-core/-/rx-core-4.0.3.tgz#0b3354b1238cedbe2b74f6326f139dbc7a591d60"
+  integrity sha1-CzNUsSOM7b4rdPYybxOdvHpZHWA=
 
 "@types/rx-lite-aggregates@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-aggregates/-/rx-lite-aggregates-4.0.3.tgz#6efb2b7f3d5f07183a1cb2bd4b1371d7073384c2"
+  integrity sha512-MAGDAHy8cRatm94FDduhJF+iNS5//jrZ/PIfm+QYw9OCeDgbymFHChM8YVIvN2zArwsRftKgE33QfRWvQk4DPg==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-async@*":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-async/-/rx-lite-async-4.0.2.tgz#27fbf0caeff029f41e2d2aae638b05e91ceb600c"
+  integrity sha512-vTEv5o8l6702ZwfAM5aOeVDfUwBSDOs+ARoGmWAKQ6LOInQ8J4/zjM7ov12fuTpktUKdMQjkeCp07Vd73mPkxw==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-backpressure@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-backpressure/-/rx-lite-backpressure-4.0.3.tgz#05abb19bdf87cc740196c355e5d0b37bb50b5d56"
+  integrity sha512-Y6aIeQCtNban5XSAF4B8dffhIKu6aAy/TXFlScHzSxh6ivfQBQw6UjxyEJxIOt3IT49YkS+siuayM2H/Q0cmgA==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-coincidence@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-coincidence/-/rx-lite-coincidence-4.0.3.tgz#80bd69acc4054a15cdc1638e2dc8843498cd85c0"
+  integrity sha512-1VNJqzE9gALUyMGypDXZZXzR0Tt7LC9DdAZQ3Ou/Q0MubNU35agVUNXKGHKpNTba+fr8GdIdkC26bRDqtCQBeQ==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-experimental@*":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-experimental/-/rx-lite-experimental-4.0.1.tgz#c532f5cbdf3f2c15da16ded8930d1b2984023cbd"
+  integrity sha1-xTL1y98/LBXaFt7Ykw0bKYQCPL0=
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-joinpatterns@*":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-joinpatterns/-/rx-lite-joinpatterns-4.0.1.tgz#f70fe370518a8432f29158cc92ffb56b4e4afc3e"
+  integrity sha1-9w/jcFGKhDLykVjMkv+1a05K/D4=
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-testing@*":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-testing/-/rx-lite-testing-4.0.1.tgz#21b19d11f4dfd6ffef5a9d1648e9c8879bfe21e9"
+  integrity sha1-IbGdEfTf1v/vWp0WSOnIh5v+Iek=
   dependencies:
     "@types/rx-lite-virtualtime" "*"
 
 "@types/rx-lite-time@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-time/-/rx-lite-time-4.0.3.tgz#0eda65474570237598f3448b845d2696f2dbb1c4"
+  integrity sha512-ukO5sPKDRwCGWRZRqPlaAU0SKVxmWwSjiOrLhoQDoWxZWg6vyB9XLEZViKOzIO6LnTIQBlk4UylYV0rnhJLxQw==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-virtualtime@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-virtualtime/-/rx-lite-virtualtime-4.0.3.tgz#4b30cacd0fe2e53af29f04f7438584c7d3959537"
+  integrity sha512-3uC6sGmjpOKatZSVHI2xB1+dedgml669ZRvqxy+WqmGJDVusOdyxcKfyzjW0P3/GrCiN4nmRkLVMhPwHCc5QLg==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite@*":
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/@types/rx-lite/-/rx-lite-4.0.5.tgz#b3581525dff69423798daa9a0d33c1e66a5e8c4c"
+  integrity sha512-KZk5XTR1dm/kNgBx8iVpjno6fRYtAUQWBOmj+O8j724+nk097sz4fOoHJNpCkOJUtHUurZlJC7QvSFCZHbkC+w==
   dependencies:
     "@types/rx-core" "*"
     "@types/rx-core-binding" "*"
@@ -402,6 +465,7 @@
 "@types/rx@*":
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/@types/rx/-/rx-4.1.1.tgz#598fc94a56baed975f194574e0f572fd8e627a48"
+  integrity sha1-WY/JSla67ZdfGUV04PVy/Y5iekg=
   dependencies:
     "@types/rx-core" "*"
     "@types/rx-core-binding" "*"
@@ -419,14 +483,17 @@
 "@types/selenium-webdriver@^3.0.0":
   version "3.0.10"
   resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.10.tgz#e98cc6f05b4b436277671c784ee2f9d05a634f9b"
+  integrity sha512-ikB0JHv6vCR1KYUQAzTO4gi/lXLElT4Tx+6De2pc/OZwizE9LRNiTa+U8TBFKBD/nntPnr/MPSHSnOTybjhqNA==
 
 "@types/semver@^5.5.0":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
+  integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==
 
 "@types/serve-static@*":
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.2.tgz#f5ac4d7a6420a99a6a45af4719f4dcd8cd907a48"
+  integrity sha512-/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q==
   dependencies:
     "@types/express-serve-static-core" "*"
     "@types/mime" "*"
@@ -434,28 +501,34 @@
 "@types/source-list-map@*":
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
+  integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
 "@types/source-map@0.5.2":
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.5.2.tgz#973459e744cc7445c85b97f770275b479b138e08"
+  integrity sha512-++w4WmMbk3dS3UeHGzAG+xJOSz5Xqtjys/TBkqG3qp3SeWE7Wwezqe5eB7B51cxUyh4PW7bwVotpsLdBK0D8cw==
 
 "@types/tapable@*":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.4.tgz#b4ffc7dc97b498c969b360a41eee247f82616370"
+  integrity sha512-78AdXtlhpCHT0K3EytMpn4JNxaf5tbqbLcbIRoQIHzpTIyjpxLQKRoxU55ujBXAtg3Nl2h/XWvfDa9dsMOd0pQ==
 
 "@types/through@*":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/through/-/through-0.0.29.tgz#72943aac922e179339c651fa34a4428a4d722f93"
+  integrity sha512-9a7C5VHh+1BKblaYiq+7Tfc+EOmjMdZaD1MYtkQjSoxgB69tBjW98ry6SKsi4zEIWztLOMRuL87A3bdT/Fc/4w==
   dependencies:
     "@types/node" "*"
 
 "@types/tough-cookie@*":
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-2.3.3.tgz#7f226d67d654ec9070e755f46daebf014628e9d9"
+  integrity sha512-MDQLxNFRLasqS4UlkWMSACMKeSm1x4Q3TxzUC7KQUsh6RK1ZrQ0VEyE3yzXcBu+K8ejVj4wuX32eUG02yNp+YQ==
 
 "@types/uglify-js@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.0.3.tgz#801a5ca1dc642861f47c46d14b700ed2d610840b"
+  integrity sha512-MAT0BW2ruO0LhQKjvlipLGCF/Yx0y/cj+tT67tK3QIQDrM2+9R78HgJ54VlrE8AbfjYJJBCQCEPM5ZblPVTuww==
   dependencies:
     source-map "^0.6.1"
 
@@ -466,6 +539,7 @@
 "@types/webpack-dev-server@^3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-3.1.0.tgz#1fae06ad346d2dd09bc5e34745723946458eed58"
+  integrity sha512-nutifgcFiPP3I/+mPWlZCsQNKpWNUGm6qjAMfleZuPfPfybXWymHvlcYsKvg+NPedSkrNh0vu2xKAlak/l+pOg==
   dependencies:
     "@types/express" "*"
     "@types/http-proxy-middleware" "*"
@@ -475,6 +549,7 @@
 "@types/webpack-sources@^0.1.5":
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-0.1.5.tgz#be47c10f783d3d6efe1471ff7f042611bd464a92"
+  integrity sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==
   dependencies:
     "@types/node" "*"
     "@types/source-list-map" "*"
@@ -483,6 +558,7 @@
 "@types/webpack@*", "@types/webpack@^4.4.11":
   version "4.4.11"
   resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.4.11.tgz#0ca832870d55c4e92498c01d22d00d02b0f62ae9"
+  integrity sha512-NdESmbpvVEtJgs15kyZYKr5ouLYPMYt9DNG5JEgCekbG/ezFLPCzf4XcAv8caOb+b7x6ieAuSt0eoR0UkSI7RA==
   dependencies:
     "@types/node" "*"
     "@types/tapable" "*"
@@ -492,6 +568,7 @@
 "@webassemblyjs/ast@1.7.6":
   version "1.7.6"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.6.tgz#3ef8c45b3e5e943a153a05281317474fef63e21e"
+  integrity sha512-8nkZS48EVsMUU0v6F1LCIOw4RYWLm2plMtbhFTjNgeXmsTNLuU3xTRtnljt9BFQB+iPbLRobkNrCWftWnNC7wQ==
   dependencies:
     "@webassemblyjs/helper-module-context" "1.7.6"
     "@webassemblyjs/helper-wasm-bytecode" "1.7.6"
@@ -501,38 +578,46 @@
 "@webassemblyjs/floating-point-hex-parser@1.7.6":
   version "1.7.6"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.6.tgz#7cb37d51a05c3fe09b464ae7e711d1ab3837801f"
+  integrity sha512-VBOZvaOyBSkPZdIt5VBMg3vPWxouuM13dPXGWI1cBh3oFLNcFJ8s9YA7S9l4mPI7+Q950QqOmqj06oa83hNWBA==
 
 "@webassemblyjs/helper-api-error@1.7.6":
   version "1.7.6"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.6.tgz#99b7e30e66f550a2638299a109dda84a622070ef"
+  integrity sha512-SCzhcQWHXfrfMSKcj8zHg1/kL9kb3aa5TN4plc/EREOs5Xop0ci5bdVBApbk2yfVi8aL+Ly4Qpp3/TRAUInjrg==
 
 "@webassemblyjs/helper-buffer@1.7.6":
   version "1.7.6"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.6.tgz#ba0648be12bbe560c25c997e175c2018df39ca3e"
+  integrity sha512-1/gW5NaGsEOZ02fjnFiU8/OEEXU1uVbv2um0pQ9YVL3IHSkyk6xOwokzyqqO1qDZQUAllb+V8irtClPWntbVqw==
 
 "@webassemblyjs/helper-code-frame@1.7.6":
   version "1.7.6"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.6.tgz#5a94d21b0057b69a7403fca0c253c3aaca95b1a5"
+  integrity sha512-+suMJOkSn9+vEvDvgyWyrJo5vJsWSDXZmJAjtoUq4zS4eqHyXImpktvHOZwXp1XQjO5H+YQwsBgqTQEc0J/5zg==
   dependencies:
     "@webassemblyjs/wast-printer" "1.7.6"
 
 "@webassemblyjs/helper-fsm@1.7.6":
   version "1.7.6"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.6.tgz#ae1741c6f6121213c7a0b587fb964fac492d3e49"
+  integrity sha512-HCS6KN3wgxUihGBW7WFzEC/o8Eyvk0d56uazusnxXthDPnkWiMv+kGi9xXswL2cvfYfeK5yiM17z2K5BVlwypw==
 
 "@webassemblyjs/helper-module-context@1.7.6":
   version "1.7.6"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.6.tgz#116d19a51a6cebc8900ad53ca34ff8269c668c23"
+  integrity sha512-e8/6GbY7OjLM+6OsN7f2krC2qYVNaSr0B0oe4lWdmq5sL++8dYDD1TFbD1TdAdWMRTYNr/Qq7ovXWzia2EbSjw==
   dependencies:
     mamacro "^0.0.3"
 
 "@webassemblyjs/helper-wasm-bytecode@1.7.6":
   version "1.7.6"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.6.tgz#98e515eaee611aa6834eb5f6a7f8f5b29fefb6f1"
+  integrity sha512-PzYFCb7RjjSdAOljyvLWVqd6adAOabJW+8yRT+NWhXuf1nNZWH+igFZCUK9k7Cx7CsBbzIfXjJc7u56zZgFj9Q==
 
 "@webassemblyjs/helper-wasm-section@1.7.6":
   version "1.7.6"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.6.tgz#783835867bdd686df7a95377ab64f51a275e8333"
+  integrity sha512-3GS628ppDPSuwcYlQ7cDCGr4W2n9c4hLzvnRKeuz+lGsJSmc/ADVoYpm1ts2vlB1tGHkjtQMni+yu8mHoMlKlA==
   dependencies:
     "@webassemblyjs/ast" "1.7.6"
     "@webassemblyjs/helper-buffer" "1.7.6"
@@ -542,22 +627,26 @@
 "@webassemblyjs/ieee754@1.7.6":
   version "1.7.6"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.6.tgz#c34fc058f2f831fae0632a8bb9803cf2d3462eb1"
+  integrity sha512-V4cIp0ruyw+hawUHwQLn6o2mFEw4t50tk530oKsYXQhEzKR+xNGDxs/SFFuyTO7X3NzEu4usA3w5jzhl2RYyzQ==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
 "@webassemblyjs/leb128@1.7.6":
   version "1.7.6"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.6.tgz#197f75376a29f6ed6ace15898a310d871d92f03b"
+  integrity sha512-ojdlG8WpM394lBow4ncTGJoIVZ4aAtNOWHhfAM7m7zprmkVcKK+2kK5YJ9Bmj6/ketTtOn7wGSHCtMt+LzqgYQ==
   dependencies:
     "@xtuc/long" "4.2.1"
 
 "@webassemblyjs/utf8@1.7.6":
   version "1.7.6"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.6.tgz#eb62c66f906af2be70de0302e29055d25188797d"
+  integrity sha512-oId+tLxQ+AeDC34ELRYNSqJRaScB0TClUU6KQfpB8rNT6oelYlz8axsPhf6yPTg7PBJ/Z5WcXmUYiHEWgbbHJw==
 
 "@webassemblyjs/wasm-edit@1.7.6":
   version "1.7.6"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.6.tgz#fa41929160cd7d676d4c28ecef420eed5b3733c5"
+  integrity sha512-pTNjLO3o41v/Vz9VFLl+I3YLImpCSpodFW77pNoH4agn5I6GgSxXHXtvWDTvYJFty0jSeXZWLEmbaSIRUDlekg==
   dependencies:
     "@webassemblyjs/ast" "1.7.6"
     "@webassemblyjs/helper-buffer" "1.7.6"
@@ -571,6 +660,7 @@
 "@webassemblyjs/wasm-gen@1.7.6":
   version "1.7.6"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.6.tgz#695ac38861ab3d72bf763c8c75e5f087ffabc322"
+  integrity sha512-mQvFJVumtmRKEUXMohwn8nSrtjJJl6oXwF3FotC5t6e2hlKMh8sIaW03Sck2MDzw9xPogZD7tdP5kjPlbH9EcQ==
   dependencies:
     "@webassemblyjs/ast" "1.7.6"
     "@webassemblyjs/helper-wasm-bytecode" "1.7.6"
@@ -581,6 +671,7 @@
 "@webassemblyjs/wasm-opt@1.7.6":
   version "1.7.6"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.6.tgz#fbafa78e27e1a75ab759a4b658ff3d50b4636c21"
+  integrity sha512-go44K90fSIsDwRgtHhX14VtbdDPdK2sZQtZqUcMRvTojdozj5tLI0VVJAzLCfz51NOkFXezPeVTAYFqrZ6rI8Q==
   dependencies:
     "@webassemblyjs/ast" "1.7.6"
     "@webassemblyjs/helper-buffer" "1.7.6"
@@ -590,6 +681,7 @@
 "@webassemblyjs/wasm-parser@1.7.6":
   version "1.7.6"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.6.tgz#84eafeeff405ad6f4c4b5777d6a28ae54eed51fe"
+  integrity sha512-t1T6TfwNY85pDA/HWPA8kB9xA4sp9ajlRg5W7EKikqrynTyFo+/qDzIpvdkOkOGjlS6d4n4SX59SPuIayR22Yg==
   dependencies:
     "@webassemblyjs/ast" "1.7.6"
     "@webassemblyjs/helper-api-error" "1.7.6"
@@ -601,6 +693,7 @@
 "@webassemblyjs/wast-parser@1.7.6":
   version "1.7.6"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.6.tgz#ca4d20b1516e017c91981773bd7e819d6bd9c6a7"
+  integrity sha512-1MaWTErN0ziOsNUlLdvwS+NS1QWuI/kgJaAGAMHX8+fMJFgOJDmN/xsG4h/A1Gtf/tz5VyXQciaqHZqp2q0vfg==
   dependencies:
     "@webassemblyjs/ast" "1.7.6"
     "@webassemblyjs/floating-point-hex-parser" "1.7.6"
@@ -613,6 +706,7 @@
 "@webassemblyjs/wast-printer@1.7.6":
   version "1.7.6"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.6.tgz#a6002c526ac5fa230fe2c6d2f1bdbf4aead43a5e"
+  integrity sha512-vHdHSK1tOetvDcl1IV1OdDeGNe/NDDQ+KzuZHMtqTVP1xO/tZ/IKNpj5BaGk1OYFdsDWQqb31PIwdEyPntOWRQ==
   dependencies:
     "@webassemblyjs/ast" "1.7.6"
     "@webassemblyjs/wast-parser" "1.7.6"
@@ -621,14 +715,17 @@
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
 
 "@xtuc/long@4.2.1":
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
+  integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
 
 JSONStream@^1.0.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.4.tgz#615bb2adb0cd34c8f4c447b5f6512fa1d8f16a2e"
+  integrity sha512-Y7vfi3I5oMOYIr+WxV8NZxDSwcbNgzdKYsTNInmycOq9bUYwGg9ryu57Wg5NLmCjqdFPNUmpMBo3kSJN9tCbXg==
   dependencies:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
@@ -636,14 +733,17 @@ JSONStream@^1.0.4:
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
 abbrev@1.0.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
+  integrity sha1-kbR5JYinc4wl813W9jdSovh3YTU=
 
 accepts@~1.3.4, accepts@~1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
+  integrity sha1-63d99gEXI6OxTopywIBcjoZ0a9I=
   dependencies:
     mime-types "~2.1.18"
     negotiator "0.6.1"
@@ -651,38 +751,46 @@ accepts@~1.3.4, accepts@~1.3.5:
 acorn-dynamic-import@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
+  integrity sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==
   dependencies:
     acorn "^5.0.0"
 
 acorn@^5.0.0, acorn@^5.6.2:
   version "5.7.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
+  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
 adm-zip@^0.4.9:
   version "0.4.11"
   resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.11.tgz#2aa54c84c4b01a9d0fb89bb11982a51f13e3d62a"
+  integrity sha512-L8vcjDTCOIJk7wFvmlEUN7AsSb8T+2JrdP7KINBjzr24TJ5Mwj590sLu3BC7zNZowvJWa/JtPmD8eJCzdtDWjA==
 
 after@0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
+  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
 
 agent-base@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
+  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
   dependencies:
     es6-promisify "^5.0.0"
 
 ajv-errors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.0.tgz#ecf021fa108fd17dfb5e6b383f2dd233e31ffc59"
+  integrity sha1-7PAh+hCP0X37Xms4Py3SM+Mf/Fk=
 
 ajv-keywords@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
+  integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
 
 ajv@6.5.3, ajv@^6.1.0:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9"
+  integrity sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
@@ -692,6 +800,7 @@ ajv@6.5.3, ajv@^6.1.0:
 ajv@^5.0.0, ajv@^5.1.0, ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
   dependencies:
     co "^4.6.0"
     fast-deep-equal "^1.0.0"
@@ -701,46 +810,56 @@ ajv@^5.0.0, ajv@^5.1.0, ajv@^5.3.0:
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
 ansi-align@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f"
+  integrity sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=
   dependencies:
     string-width "^2.0.0"
 
 ansi-colors@^3.0.0:
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.0.5.tgz#cb9dc64993b64fd6945485f797fc3853137d9a7b"
+  integrity sha512-VVjWpkfaphxUBFarydrQ3n26zX5nIK7hcbT3/ielrvwDDyBBjuh2vuSw1P9zkPq0cfqvdw7lkYHnu+OLSfIBsg==
 
 ansi-escapes@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
+  integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==
 
 ansi-html@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
+  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
 
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
 ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
 
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
 
 anymatch@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
+  integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==
   dependencies:
     micromatch "^2.1.5"
     normalize-path "^2.0.0"
@@ -748,6 +867,7 @@ anymatch@^1.3.0:
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
   dependencies:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
@@ -755,20 +875,24 @@ anymatch@^2.0.0:
 app-root-path@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.1.0.tgz#98bf6599327ecea199309866e8140368fd2e646a"
+  integrity sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo=
 
 append-transform@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab"
+  integrity sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==
   dependencies:
     default-require-extensions "^2.0.0"
 
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
 are-we-there-yet@~1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
@@ -776,80 +900,98 @@ are-we-there-yet@~1.1.2:
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
 arr-diff@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
   dependencies:
     arr-flatten "^1.0.1"
 
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
 arr-flatten@^1.0.1, arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
 arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
 array-find-index@^1.0.1, array-find-index@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
 
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
 
 array-flatten@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296"
+  integrity sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=
 
 array-ify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
+  integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=
 
 array-slice@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
+  integrity sha1-3Tz7gO15c6dRF82sabC5nshhhvU=
 
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
   dependencies:
     array-uniq "^1.0.1"
 
 array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
 array-unique@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
 
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
 arraybuffer.slice@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
+  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
 
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
 asap@^2.0.0, asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
 ascli@~1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ascli/-/ascli-1.0.1.tgz#bcfa5974a62f18e81cabaeb49732ab4a88f906bc"
+  integrity sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=
   dependencies:
     colour "~0.7.1"
     optjs "~3.2.2"
@@ -857,6 +999,7 @@ ascli@~1:
 asn1.js@^4.0.0:
   version "4.10.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
+  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
   dependencies:
     bn.js "^4.0.0"
     inherits "^2.0.1"
@@ -865,56 +1008,68 @@ asn1.js@^4.0.0:
 asn1@~0.2.3:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
   dependencies:
     safer-buffer "~2.1.0"
 
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
 assert@^1.1.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+  integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=
   dependencies:
     util "0.10.3"
 
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
+  integrity sha1-GdOGodntxufByF04iu28xW0zYC0=
 
 async-foreach@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
+  integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
 
 async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
+  integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
 
 async@1.x, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
 async@^2.5.0, async@^2.6.0, async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
+  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
   dependencies:
     lodash "^4.17.10"
 
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
 atob@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 autoprefixer@8.4.1:
   version "8.4.1"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.4.1.tgz#c6b30001ea4b3daa6b611e50071f62dd24beb564"
+  integrity sha512-YqUclCBDXUT9Y7aQ8Xv+ja8yhTZYJoMsOD7WS++gZIJLCpCu+gPcKGDlhk6S3WxhLkTcNVdaMZAWys2nzZCH7g==
   dependencies:
     browserslist "^3.2.6"
     caniuse-lite "^1.0.30000832"
@@ -926,6 +1081,7 @@ autoprefixer@8.4.1:
 autoprefixer@^9.0.0:
   version "9.1.5"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.1.5.tgz#8675fd8d1c0d43069f3b19a2c316f3524e4f6671"
+  integrity sha512-kk4Zb6RUc58ld7gdosERHMF3DzIYJc2fp5sX46qEsGXQQy5bXsu8qyLjoxuY1NuQ/cJuCYnx99BfjwnRggrYIw==
   dependencies:
     browserslist "^4.1.0"
     caniuse-lite "^1.0.30000884"
@@ -937,14 +1093,17 @@ autoprefixer@^9.0.0:
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.6.0, aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
+  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
 babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
   dependencies:
     chalk "^1.1.3"
     esutils "^2.0.2"
@@ -953,6 +1112,7 @@ babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
 babel-generator@^6.18.0:
   version "6.26.1"
   resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
+  integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==
   dependencies:
     babel-messages "^6.23.0"
     babel-runtime "^6.26.0"
@@ -966,12 +1126,14 @@ babel-generator@^6.18.0:
 babel-messages@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=
   dependencies:
     babel-runtime "^6.22.0"
 
 babel-runtime@^6.22.0, babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.11.0"
@@ -979,6 +1141,7 @@ babel-runtime@^6.22.0, babel-runtime@^6.26.0:
 babel-template@^6.16.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+  integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
   dependencies:
     babel-runtime "^6.26.0"
     babel-traverse "^6.26.0"
@@ -989,6 +1152,7 @@ babel-template@^6.16.0:
 babel-traverse@^6.18.0, babel-traverse@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+  integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
   dependencies:
     babel-code-frame "^6.26.0"
     babel-messages "^6.23.0"
@@ -1003,6 +1167,7 @@ babel-traverse@^6.18.0, babel-traverse@^6.26.0:
 babel-types@^6.18.0, babel-types@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
   dependencies:
     babel-runtime "^6.26.0"
     esutils "^2.0.2"
@@ -1012,30 +1177,37 @@ babel-types@^6.18.0, babel-types@^6.26.0:
 babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
 
 backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
+  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
 
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
 base64-arraybuffer@0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
+  integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
 
 base64-js@^1.0.2:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
+  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
 
 base64id@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
+  integrity sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=
 
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
   dependencies:
     cache-base "^1.0.1"
     class-utils "^0.3.5"
@@ -1048,54 +1220,65 @@ base@^0.11.1:
 batch@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
+  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
 
 bcrypt-pbkdf@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
   dependencies:
     tweetnacl "^0.14.3"
 
 better-assert@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
+  integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=
   dependencies:
     callsite "1.0.0"
 
 big.js@^3.1.3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
+  integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
 
 binary-extensions@^1.0.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
+  integrity sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=
 
 blob@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
+  integrity sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=
 
 block-stream@*:
   version "0.0.9"
   resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
   dependencies:
     inherits "~2.0.0"
 
 blocking-proxy@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/blocking-proxy/-/blocking-proxy-1.0.1.tgz#81d6fd1fe13a4c0d6957df7f91b75e98dac40cb2"
+  integrity sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==
   dependencies:
     minimist "^1.2.0"
 
 bluebird@^3.3.0, bluebird@^3.5.1:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a"
+  integrity sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
+  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
 
 body-parser@1.18.2:
   version "1.18.2"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
+  integrity sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=
   dependencies:
     bytes "3.0.0"
     content-type "~1.0.4"
@@ -1111,6 +1294,7 @@ body-parser@1.18.2:
 body-parser@^1.16.1:
   version "1.18.3"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
+  integrity sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=
   dependencies:
     bytes "3.0.0"
     content-type "~1.0.4"
@@ -1126,6 +1310,7 @@ body-parser@^1.16.1:
 bonjour@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
+  integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU=
   dependencies:
     array-flatten "^2.1.0"
     deep-equal "^1.0.1"
@@ -1134,17 +1319,15 @@ bonjour@^3.5.0:
     multicast-dns "^6.0.1"
     multicast-dns-service-types "^1.1.0"
 
-boolbase@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-
 bootstrap@^4.0.0:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.3.tgz#0eb371af2c8448e8c210411d0cb824a6409a12be"
+  integrity sha512-rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w==
 
 boxen@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
+  integrity sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==
   dependencies:
     ansi-align "^2.0.0"
     camelcase "^4.0.0"
@@ -1157,6 +1340,7 @@ boxen@^1.2.1:
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -1164,12 +1348,14 @@ brace-expansion@^1.1.7:
 braces@^0.1.2:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/braces/-/braces-0.1.5.tgz#c085711085291d8b75fdd74eab0f8597280711e6"
+  integrity sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=
   dependencies:
     expand-range "^0.1.0"
 
 braces@^1.8.2:
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
   dependencies:
     expand-range "^1.8.1"
     preserve "^0.2.0"
@@ -1178,6 +1364,7 @@ braces@^1.8.2:
 braces@^2.3.0, braces@^2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
   dependencies:
     arr-flatten "^1.1.0"
     array-unique "^0.3.2"
@@ -1193,6 +1380,7 @@ braces@^2.3.0, braces@^2.3.1:
 brfs@^1.4.0:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.6.1.tgz#b78ce2336d818e25eea04a0947cba6d4fb8849c3"
+  integrity sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==
   dependencies:
     quote-stream "^1.0.1"
     resolve "^1.1.5"
@@ -1202,10 +1390,12 @@ brfs@^1.4.0:
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
   dependencies:
     buffer-xor "^1.0.3"
     cipher-base "^1.0.0"
@@ -1217,6 +1407,7 @@ browserify-aes@^1.0.0, browserify-aes@^1.0.4:
 browserify-cipher@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
   dependencies:
     browserify-aes "^1.0.4"
     browserify-des "^1.0.0"
@@ -1225,6 +1416,7 @@ browserify-cipher@^1.0.0:
 browserify-des@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
+  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
   dependencies:
     cipher-base "^1.0.1"
     des.js "^1.0.0"
@@ -1234,6 +1426,7 @@ browserify-des@^1.0.0:
 browserify-rsa@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
   dependencies:
     bn.js "^4.1.0"
     randombytes "^2.0.1"
@@ -1241,6 +1434,7 @@ browserify-rsa@^4.0.0:
 browserify-sign@^4.0.0:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
+  integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
   dependencies:
     bn.js "^4.1.1"
     browserify-rsa "^4.0.0"
@@ -1253,12 +1447,14 @@ browserify-sign@^4.0.0:
 browserify-zlib@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
   dependencies:
     pako "~1.0.5"
 
 browserslist@^3.2.6:
   version "3.2.8"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6"
+  integrity sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==
   dependencies:
     caniuse-lite "^1.0.30000844"
     electron-to-chromium "^1.3.47"
@@ -1266,6 +1462,7 @@ browserslist@^3.2.6:
 browserslist@^4.0.0, browserslist@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.1.1.tgz#328eb4ff1215b12df6589e9ab82f8adaa4fc8cd6"
+  integrity sha512-VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q==
   dependencies:
     caniuse-lite "^1.0.30000884"
     electron-to-chromium "^1.3.62"
@@ -1274,16 +1471,19 @@ browserslist@^4.0.0, browserslist@^4.1.0:
 browserstack@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.5.1.tgz#e2dfa66ffee940ebad0a07f7e00fd4687c455d66"
+  integrity sha512-O8VMT64P9NOLhuIoD4YngyxBURefaSdR4QdhG8l6HZ9VxtU7jc3m6jLufFwKA5gaf7fetfB2TnRJnMxyob+heg==
   dependencies:
     https-proxy-agent "^2.2.1"
 
 buffer-alloc-unsafe@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
+  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
 
 buffer-alloc@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
+  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
   dependencies:
     buffer-alloc-unsafe "^1.1.0"
     buffer-fill "^1.0.0"
@@ -1291,26 +1491,32 @@ buffer-alloc@^1.2.0:
 buffer-equal@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"
+  integrity sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=
 
 buffer-fill@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
 
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
 buffer-indexof@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
+  integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
 
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
 
 buffer@^4.3.0:
   version "4.9.1"
   resolved "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
@@ -1319,32 +1525,39 @@ buffer@^4.3.0:
 builtin-modules@^1.0.0, builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
 
 builtin-modules@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-2.0.0.tgz#60b7ef5ae6546bd7deefa74b08b62a43a232648e"
+  integrity sha512-3U5kUA5VPsRUA3nofm/BXX7GVHKfxz0hOBAPxXrIvHzlDRkQVqEn6yi8QJegxl4LzOHLdvb7XF5dVawa/VVYBg==
 
 builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
 builtins@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+  integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
 
 bytebuffer@~5:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd"
+  integrity sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=
   dependencies:
     long "~3"
 
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
 cacache@^10.0.4:
   version "10.0.4"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
+  integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==
   dependencies:
     bluebird "^3.5.1"
     chownr "^1.0.1"
@@ -1363,6 +1576,7 @@ cacache@^10.0.4:
 cacache@^11.0.2:
   version "11.2.0"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.2.0.tgz#617bdc0b02844af56310e411c0878941d5739965"
+  integrity sha512-IFWl6lfK6wSeYCHUXh+N1lY72UDrpyrYQJNIVQf48paDuWbv5RbAtJYf/4gUQFObTCHZwdZ5sI8Iw7nqwP6nlQ==
   dependencies:
     bluebird "^3.5.1"
     chownr "^1.0.1"
@@ -1382,6 +1596,7 @@ cacache@^11.0.2:
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
   dependencies:
     collection-visit "^1.0.0"
     component-emitter "^1.2.1"
@@ -1396,6 +1611,7 @@ cache-base@^1.0.1:
 cacheable-request@^2.1.1:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d"
+  integrity sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=
   dependencies:
     clone-response "1.0.2"
     get-stream "3.0.0"
@@ -1408,17 +1624,12 @@ cacheable-request@^2.1.1:
 callsite@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
-
-camel-case@3.0.x:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
-  dependencies:
-    no-case "^2.2.0"
-    upper-case "^1.1.1"
+  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
 
 camelcase-keys@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
   dependencies:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
@@ -1426,6 +1637,7 @@ camelcase-keys@^2.0.0:
 camelcase-keys@^4.0.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
+  integrity sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=
   dependencies:
     camelcase "^4.1.0"
     map-obj "^2.0.0"
@@ -1434,34 +1646,42 @@ camelcase-keys@^4.0.0:
 camelcase@^2.0.0, camelcase@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
 
 camelcase@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
 
 camelcase@^4.0.0, camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
 caniuse-lite@^1.0.30000832, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000884:
   version "1.0.30000885"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000885.tgz#e889e9f8e7e50e769f2a49634c932b8aee622984"
+  integrity sha512-cXKbYwpxBLd7qHyej16JazPoUacqoVuDhvR61U7Fr5vSxMUiodzcYa1rQYRYfZ5GexV03vGZHd722vNPLjPJGQ==
 
 canonical-path@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-0.0.2.tgz#e31eb937a8c93ee2a01df1839794721902874574"
+  integrity sha1-4x65N6jJPuKgHfGDl5RyGQKHRXQ=
 
 capture-stack-trace@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
+  integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==
 
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
 chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
   dependencies:
     ansi-styles "^2.2.1"
     escape-string-regexp "^1.0.2"
@@ -1472,6 +1692,7 @@ chalk@^1.1.1, chalk@^1.1.3:
 chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
+  integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
   dependencies:
     ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
@@ -1480,10 +1701,12 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1:
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
 chokidar@2.0.4, chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
+  integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.0"
@@ -1503,6 +1726,7 @@ chokidar@2.0.4, chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3:
 chokidar@^1.4.2:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
+  integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=
   dependencies:
     anymatch "^1.3.0"
     async-each "^1.0.0"
@@ -1518,20 +1742,24 @@ chokidar@^1.4.2:
 chownr@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
+  integrity sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=
 
 chrome-trace-event@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"
+  integrity sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==
   dependencies:
     tslib "^1.9.0"
 
 ci-info@^1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.5.1.tgz#17e8eb5de6f8b2b6038f0cbb714d410bfa9f3030"
+  integrity sha512-fKFIKXaYiL1exImwJ0AhR/6jxFPSKQBk2ayV5NiNoruUs2+rxC2kNw0EG+1Z9dugZRdCrppskQ8DN2cyaUM1Hw==
 
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -1539,43 +1767,51 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
 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"
+  integrity sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==
 
 circular-json@^0.5.5:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.5.tgz#64182ef359042d37cd8e767fc9de878b1e9447d3"
+  integrity sha512-13YaR6kiz0kBNmIVM87Io8Hp7bWOo4r61vkEANy8iH9R9bc6avud/1FT0SBpqR1RpIQADOh/Q+yHZDA1iL6ysA==
 
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
   dependencies:
     arr-union "^3.1.0"
     define-property "^0.2.5"
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-clean-css@4.2.1, clean-css@4.2.x, clean-css@^4.1.11:
+clean-css@4.2.1, clean-css@^4.1.11:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
+  integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==
   dependencies:
     source-map "~0.6.0"
 
 cli-boxes@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
+  integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM=
 
 cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
   dependencies:
     restore-cursor "^2.0.0"
 
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
+  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
 
 cliui@^3.0.3, cliui@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -1584,6 +1820,7 @@ cliui@^3.0.3, cliui@^3.2.0:
 cliui@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
+  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
   dependencies:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
@@ -1592,6 +1829,7 @@ cliui@^4.0.0:
 clone-deep@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
+  integrity sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==
   dependencies:
     for-own "^1.0.0"
     is-plain-object "^2.0.4"
@@ -1601,24 +1839,29 @@ clone-deep@^2.0.1:
 clone-response@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
+  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
   dependencies:
     mimic-response "^1.0.0"
 
 clone@^2.1.1, clone@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
 
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
 codelyzer@^4.2.1:
   version "4.4.4"
   resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-4.4.4.tgz#29b7dbb51ba9ecc45c7300d61280a6564765d402"
+  integrity sha512-JgFMudx0n50IuE/ydAfnkksCwQkWSVWgYvhDPHZgDUbmsiYC22VuEXKu5l8Hhx9UJsLgjWDLjTAFGj2WaW5DUA==
   dependencies:
     app-root-path "^2.1.0"
     css-selector-tokenizer "^0.7.0"
@@ -1630,10 +1873,12 @@ codelyzer@^4.2.1:
 collection-utils@0.0.15:
   version "0.0.15"
   resolved "https://registry.yarnpkg.com/collection-utils/-/collection-utils-0.0.15.tgz#70f4c54299621699b3f38c66577c9d4284825125"
+  integrity sha512-eLGXa67rSilE5dNCcx2wenWcmmgl4QdlwUj1Z5idKkIBOhZh6PghEZFC3wP3AHH8xnMbIDsky0pR/+1epJBymQ==
 
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
   dependencies:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
@@ -1641,16 +1886,19 @@ collection-visit@^1.0.0:
 color-convert@^1.9.0, color-convert@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
     color-name "1.1.3"
 
 color-name@1.1.3, color-name@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
 color-string@^1.5.2:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc"
+  integrity sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==
   dependencies:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
@@ -1658,6 +1906,7 @@ color-string@^1.5.2:
 color@3.0.x:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/color/-/color-3.0.0.tgz#d920b4328d534a3ac8295d68f7bd4ba6c427be9a"
+  integrity sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==
   dependencies:
     color-convert "^1.9.1"
     color-string "^1.5.2"
@@ -1665,18 +1914,22 @@ color@3.0.x:
 colornames@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz#f8889030685c7c4ff9e2a559f5077eb76a816f96"
+  integrity sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=
 
 colors@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+  integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
 
 colors@^1.1.0, colors@^1.2.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.2.tgz#2df8ff573dfbf255af562f8ce7181d6b971a359b"
+  integrity sha512-rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ==
 
 colorspace@1.1.x:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.1.tgz#9ac2491e1bc6f8fb690e2176814f8d091636d972"
+  integrity sha512-pI3btWyiuz7Ken0BWh9Elzsmv2bM9AhA7psXib4anUXy/orfZ/E0MbQwhSOG/9L8hLlalqrU0UhOuqxW1YjmVw==
   dependencies:
     color "3.0.x"
     text-hex "1.0.x"
@@ -1684,42 +1937,51 @@ colorspace@1.1.x:
 colour@~0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/colour/-/colour-0.7.1.tgz#9cb169917ec5d12c0736d3e8685746df1cadf778"
+  integrity sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=
 
 combine-lists@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/combine-lists/-/combine-lists-1.0.1.tgz#458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"
+  integrity sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=
   dependencies:
     lodash "^4.5.0"
 
 combined-stream@1.0.6, combined-stream@~1.0.5, combined-stream@~1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
+  integrity sha1-cj599ugBrFYTETp+RFqbactjKBg=
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.17.x, commander@~2.17.1:
-  version "2.17.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
-
 commander@^2.12.0, commander@^2.12.1:
   version "2.18.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
+  integrity sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==
 
 commander@~2.13.0:
   version "2.13.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
+  integrity sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==
+
+commander@~2.17.1:
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
+  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
 
 common-tags@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
+  integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==
 
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
 compare-func@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648"
+  integrity sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=
   dependencies:
     array-ify "^1.0.0"
     dot-prop "^3.0.0"
@@ -1727,28 +1989,34 @@ compare-func@^1.3.1:
 compare-versions@^3.2.1:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.4.0.tgz#e0747df5c9cb7f054d6d3dc3e1dbc444f9e92b26"
+  integrity sha512-tK69D7oNXXqUW3ZNo/z7NXTEz22TCF0pTE+YF9cxvaAM9XnkLo1fV621xCLrRR6aevJlKxExkss0vWqUCUpqdg==
 
 component-bind@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
+  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
 
 component-emitter@1.2.1, component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
 
 component-inherit@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
+  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
 
 compressible@~2.0.14:
   version "2.0.14"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.14.tgz#326c5f507fbb055f54116782b969a81b67a29da7"
+  integrity sha1-MmxfUH+7BV9UEWeCuWmoG2einac=
   dependencies:
     mime-db ">= 1.34.0 < 2"
 
 compression@^1.5.2:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db"
+  integrity sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==
   dependencies:
     accepts "~1.3.5"
     bytes "3.0.0"
@@ -1761,10 +2029,12 @@ compression@^1.5.2:
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
 concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@~1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
   dependencies:
     buffer-from "^1.0.0"
     inherits "^2.0.3"
@@ -1774,6 +2044,7 @@ concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@~1.6.0:
 configstore@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f"
+  integrity sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==
   dependencies:
     dot-prop "^4.1.0"
     graceful-fs "^4.1.2"
@@ -1785,10 +2056,12 @@ configstore@^3.0.0:
 connect-history-api-fallback@^1.3.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a"
+  integrity sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=
 
 connect@^3.6.0:
   version "3.6.6"
   resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
+  integrity sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=
   dependencies:
     debug "2.6.9"
     finalhandler "1.1.0"
@@ -1798,28 +2071,34 @@ connect@^3.6.0:
 console-browserify@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
+  integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=
   dependencies:
     date-now "^0.1.4"
 
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
 
 content-disposition@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
+  integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
 
 content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
 conventional-changelog-angular@^1.6.6:
   version "1.6.6"
   resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.6.6.tgz#b27f2b315c16d0a1f23eb181309d0e6a4698ea0f"
+  integrity sha512-suQnFSqCxRwyBxY68pYTsFkG0taIdinHLNEAX5ivtw8bCRnIgnpvcHmlR/yjUyZIrNPYAoXlY1WiEKWgSE4BNg==
   dependencies:
     compare-func "^1.3.1"
     q "^1.5.1"
@@ -1827,18 +2106,21 @@ conventional-changelog-angular@^1.6.6:
 conventional-changelog-atom@^0.2.8:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.2.8.tgz#8037693455990e3256f297320a45fa47ee553a14"
+  integrity sha512-8pPZqhMbrnltNBizjoDCb/Sz85KyUXNDQxuAEYAU5V/eHn0okMBVjqc8aHWYpHrytyZWvMGbayOlDv7i8kEf6g==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-codemirror@^0.3.8:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.8.tgz#a1982c8291f4ee4d6f2f62817c6b2ecd2c4b7b47"
+  integrity sha512-3HFZKtBXTaUCHvz7ai6nk2+psRIkldDoNzCsom0egDtVmPsvvHZkzjynhdQyULfacRSsBTaiQ0ol6nBOL4dDiQ==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-core@^2.0.11:
   version "2.0.11"
   resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-2.0.11.tgz#19b5fbd55a9697773ed6661f4e32030ed7e30287"
+  integrity sha512-HvTE6RlqeEZ/NFPtQeFLsIDOLrGP3bXYr7lFLMhCVsbduF1MXIe8OODkwMFyo1i9ku9NWBwVnVn0jDmIFXjDRg==
   dependencies:
     conventional-changelog-writer "^3.0.9"
     conventional-commits-parser "^2.1.7"
@@ -1857,36 +2139,42 @@ conventional-changelog-core@^2.0.11:
 conventional-changelog-ember@^0.3.12:
   version "0.3.12"
   resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.3.12.tgz#b7d31851756d0fcb49b031dffeb6afa93b202400"
+  integrity sha512-mmJzA7uzbrOqeF89dMMi6z17O07ORTXlTMArnLG9ZTX4oLaKNolUlxFUFlFm9JUoVWajVpaHQWjxH1EOQ+ARoQ==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-eslint@^1.0.9:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.9.tgz#b13cc7e4b472c819450ede031ff1a75c0e3d07d3"
+  integrity sha512-h87nfVh2fdk9fJIvz26wCBsbDC/KxqCc5wSlNMZbXcARtbgNbNDIF7Y7ctokFdnxkzVdaHsbINkh548T9eBA7Q==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-express@^0.3.6:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.3.6.tgz#4a6295cb11785059fb09202180d0e59c358b9c2c"
+  integrity sha512-3iWVtBJZ9RnRnZveNDzOD8QRn6g6vUif0qVTWWyi5nUIAbuN1FfPVyKdAlJJfp5Im+dE8Kiy/d2SpaX/0X678Q==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-jquery@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz#0208397162e3846986e71273b6c79c5b5f80f510"
+  integrity sha1-Agg5cWLjhGmG5xJztsecW1+A9RA=
   dependencies:
     q "^1.4.1"
 
 conventional-changelog-jscs@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz#0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c"
+  integrity sha1-BHnrRDzH1yxYvwvPDvHURKkvDlw=
   dependencies:
     q "^1.4.1"
 
 conventional-changelog-jshint@^0.3.8:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.8.tgz#9051c1ac0767abaf62a31f74d2fe8790e8acc6c8"
+  integrity sha512-hn9QU4ZI/5V50wKPJNPGT4gEWgiBFpV6adieILW4MaUFynuDYOvQ71EMSj3EznJyKi/KzuXpc9dGmX8njZMjig==
   dependencies:
     compare-func "^1.3.1"
     q "^1.5.1"
@@ -1894,10 +2182,12 @@ conventional-changelog-jshint@^0.3.8:
 conventional-changelog-preset-loader@^1.1.8:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.8.tgz#40bb0f142cd27d16839ec6c74ee8db418099b373"
+  integrity sha512-MkksM4G4YdrMlT2MbTsV2F6LXu/hZR0Tc/yenRrDIKRwBl/SP7ER4ZDlglqJsCzLJi4UonBc52Bkm5hzrOVCcw==
 
 conventional-changelog-writer@^3.0.9:
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-3.0.9.tgz#4aecdfef33ff2a53bb0cf3b8071ce21f0e994634"
+  integrity sha512-n9KbsxlJxRQsUnK6wIBRnARacvNnN4C/nxnxCkH+B/R1JS2Fa+DiP1dU4I59mEDEjgnFaN2+9wr1P1s7GYB5/Q==
   dependencies:
     compare-func "^1.3.1"
     conventional-commits-filter "^1.1.6"
@@ -1913,6 +2203,7 @@ conventional-changelog-writer@^3.0.9:
 conventional-changelog@^1.1.0:
   version "1.1.24"
   resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.24.tgz#3d94c29c960f5261c002678315b756cdd3d7d1f0"
+  integrity sha512-2WcSUst4Y3Z4hHvoMTWXMJr/DmgVdLiMOVY1Kak2LfFz+GIz2KDp5naqbFesYbfXPmaZ5p491dO0FWZIJoJw1Q==
   dependencies:
     conventional-changelog-angular "^1.6.6"
     conventional-changelog-atom "^0.2.8"
@@ -1929,6 +2220,7 @@ conventional-changelog@^1.1.0:
 conventional-commits-filter@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.1.6.tgz#4389cd8e58fe89750c0b5fb58f1d7f0cc8ad3831"
+  integrity sha512-KcDgtCRKJCQhyk6VLT7zR+ZOyCnerfemE/CsR3iQpzRRFbLEs0Y6rwk3mpDvtOh04X223z+1xyJ582Stfct/0Q==
   dependencies:
     is-subset "^0.1.1"
     modify-values "^1.0.0"
@@ -1936,6 +2228,7 @@ conventional-commits-filter@^1.1.6:
 conventional-commits-parser@^2.1.7:
   version "2.1.7"
   resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz#eca45ed6140d72ba9722ee4132674d639e644e8e"
+  integrity sha512-BoMaddIEJ6B4QVMSDu9IkVImlGOSGA1I2BQyOZHeLQ6qVOJLcLKn97+fL6dGbzWEiqDzfH4OkcveULmeq2MHFQ==
   dependencies:
     JSONStream "^1.0.4"
     is-text-path "^1.0.0"
@@ -1948,6 +2241,7 @@ conventional-commits-parser@^2.1.7:
 conventional-commits-parser@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.0.tgz#7f604549a50bd8f60443fbe515484b1c2f06a5c4"
+  integrity sha512-GWh71U26BLWgMykCp+VghZ4s64wVbtseECcKQ/PvcPZR2cUnz+FUc2J9KjxNl7/ZbCxST8R03c9fc+Vi0umS9Q==
   dependencies:
     JSONStream "^1.0.4"
     is-text-path "^1.0.0"
@@ -1960,20 +2254,24 @@ conventional-commits-parser@^3.0.0:
 convert-source-map@^1.5.0, convert-source-map@^1.5.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
+  integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
   dependencies:
     safe-buffer "~5.1.1"
 
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
 
 cookie@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
 
 copy-concurrently@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
   dependencies:
     aproba "^1.1.1"
     fs-write-stream-atomic "^1.0.8"
@@ -1985,10 +2283,12 @@ copy-concurrently@^1.0.0:
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 copy-webpack-plugin@4.5.2:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.2.tgz#d53444a8fea2912d806e78937390ddd7e632ee5c"
+  integrity sha512-zmC33E8FFSq3AbflTvqvPvBo621H36Afsxlui91d+QyZxPIuXghfnTsa1CuqiAaCPgJoSUWfTFbKJnadZpKEbQ==
   dependencies:
     cacache "^10.0.4"
     find-cache-dir "^1.0.0"
@@ -2002,18 +2302,22 @@ copy-webpack-plugin@4.5.2:
 core-js@^2.2.0, core-js@^2.4.0, core-js@^2.4.1:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
+  integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==
 
 core-js@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"
+  integrity sha1-+rg/uwstjchfpjbEudNMdUIMbWU=
 
 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"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
 cosmiconfig@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
+  integrity sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==
   dependencies:
     is-directory "^0.3.1"
     js-yaml "^3.9.0"
@@ -2023,6 +2327,7 @@ cosmiconfig@^4.0.0:
 create-ecdh@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
+  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
   dependencies:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
@@ -2030,12 +2335,14 @@ create-ecdh@^4.0.0:
 create-error-class@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
+  integrity sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=
   dependencies:
     capture-stack-trace "^1.0.0"
 
 create-hash@^1.1.0, create-hash@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
   dependencies:
     cipher-base "^1.0.1"
     inherits "^2.0.1"
@@ -2046,6 +2353,7 @@ create-hash@^1.1.0, create-hash@^1.1.2:
 create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
   dependencies:
     cipher-base "^1.0.3"
     create-hash "^1.1.0"
@@ -2057,6 +2365,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
 cross-spawn@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
+  integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI=
   dependencies:
     lru-cache "^4.0.1"
     which "^1.2.9"
@@ -2064,6 +2373,7 @@ cross-spawn@^3.0.0:
 cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
   dependencies:
     lru-cache "^4.0.1"
     shebang-command "^1.2.0"
@@ -2072,6 +2382,7 @@ cross-spawn@^5.0.1:
 cross-spawn@^6.0.0:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
   dependencies:
     nice-try "^1.0.4"
     path-key "^2.0.1"
@@ -2082,6 +2393,7 @@ cross-spawn@^6.0.0:
 crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
   dependencies:
     browserify-cipher "^1.0.0"
     browserify-sign "^4.0.0"
@@ -2098,115 +2410,122 @@ crypto-browserify@^3.11.0:
 crypto-random-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
+  integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=
 
 css-parse@1.7.x:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
-
-css-select@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
-  dependencies:
-    boolbase "~1.0.0"
-    css-what "2.1"
-    domutils "1.5.1"
-    nth-check "~1.0.1"
+  integrity sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=
 
 css-selector-tokenizer@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
+  integrity sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=
   dependencies:
     cssesc "^0.1.0"
     fastparse "^1.1.1"
     regexpu-core "^1.0.0"
 
-css-what@2.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
-
 cssauron@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/cssauron/-/cssauron-1.4.0.tgz#a6602dff7e04a8306dc0db9a551e92e8b5662ad8"
+  integrity sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=
   dependencies:
     through X.X.X
 
 cssesc@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
+  integrity sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=
 
 cuint@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
+  integrity sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=
 
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
   dependencies:
     array-find-index "^1.0.1"
 
 custom-event@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
+  integrity sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=
 
 cyclist@~0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
+  integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
 
 dargs@^4.0.1:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
+  integrity sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=
   dependencies:
     number-is-nan "^1.0.0"
 
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
   dependencies:
     assert-plus "^1.0.0"
 
 date-format@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"
+  integrity sha1-YV6CjiM90aubua4JUODOzPpuytg=
 
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
+  integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
 
 dateformat@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
+  integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
 debug@*:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.0.0.tgz#ef7592a30b1c5e05a78e96926df2e6b36b5544e7"
+  integrity sha512-PlYAp+yaKUjcs6FIDv1G2kU9jh4+OOD7AniwnWEvdoeHSsi5X6vRNuI9MDZCl8YcF/aNsvuF5EDOjY/v90zdrg==
   dependencies:
     ms "^2.1.1"
 
 debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.8:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
 debug@^3.1.0:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.4.tgz#82123737c51afbe9609a2b5dfe9664e7487171f0"
+  integrity sha512-fCEG5fOr7m/fhgOD3KurdAov706JbXZJYXAsAOEJ7GgasGr0GO4N+1NsIcrjlIUcyvJ9oZlnelTzN3Ix8z1ecw==
   dependencies:
     ms "^2.1.1"
 
 debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
   dependencies:
     ms "2.0.0"
 
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
 
 decamelize-keys@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
+  integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
   dependencies:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
@@ -2214,38 +2533,46 @@ decamelize-keys@^1.0.0:
 decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
 decamelize@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
+  integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==
   dependencies:
     xregexp "4.0.0"
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 decompress-response@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
+  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
   dependencies:
     mimic-response "^1.0.0"
 
 deep-equal@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
+  integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
 
 deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
 default-gateway@^2.6.0:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f"
+  integrity sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==
   dependencies:
     execa "^0.10.0"
     ip-regex "^2.1.0"
@@ -2253,30 +2580,28 @@ default-gateway@^2.6.0:
 default-require-extensions@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
+  integrity sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=
   dependencies:
     strip-bom "^3.0.0"
 
-define-properties@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  dependencies:
-    object-keys "^1.0.12"
-
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
   dependencies:
     is-descriptor "^0.1.0"
 
 define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
   dependencies:
     is-descriptor "^1.0.0"
 
 define-property@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
   dependencies:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
@@ -2284,6 +2609,7 @@ define-property@^2.0.2:
 del@^2.2.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
+  integrity sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=
   dependencies:
     globby "^5.0.0"
     is-path-cwd "^1.0.0"
@@ -2296,6 +2622,7 @@ del@^2.2.0:
 del@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
+  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
   dependencies:
     globby "^6.1.0"
     is-path-cwd "^1.0.0"
@@ -2307,26 +2634,32 @@ del@^3.0.0:
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
 depd@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
+  integrity sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=
 
 depd@~1.1.1, depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
 dependency-graph@^0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.7.2.tgz#91db9de6eb72699209d88aea4c1fd5221cac1c49"
+  integrity sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==
 
 des.js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
+  integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=
   dependencies:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
@@ -2334,24 +2667,29 @@ des.js@^1.0.0:
 destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
 detect-indent@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+  integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg=
   dependencies:
     repeating "^2.0.0"
 
 detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
 
 detect-node@^2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
+  integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
 
 dezalgo@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
   dependencies:
     asap "^2.0.0"
     wrappy "1"
@@ -2359,10 +2697,12 @@ dezalgo@^1.0.0:
 di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
+  integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=
 
 diagnostics@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.1.1.tgz#cab6ac33df70c9d9a727490ae43ac995a769b22a"
+  integrity sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==
   dependencies:
     colorspace "1.1.x"
     enabled "1.0.x"
@@ -2371,10 +2711,12 @@ diagnostics@^1.1.1:
 diff@^3.1.0, diff@^3.2.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
 
 diffie-hellman@^5.0.0:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
   dependencies:
     bn.js "^4.1.0"
     miller-rabin "^4.0.0"
@@ -2383,6 +2725,7 @@ diffie-hellman@^5.0.0:
 dir-glob@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
+  integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==
   dependencies:
     arrify "^1.0.1"
     path-type "^3.0.0"
@@ -2390,10 +2733,12 @@ dir-glob@^2.0.0:
 dns-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
+  integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
 
 dns-packet@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
+  integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
   dependencies:
     ip "^1.1.0"
     safe-buffer "^5.0.1"
@@ -2401,91 +2746,60 @@ dns-packet@^1.3.1:
 dns-txt@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
+  integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=
   dependencies:
     buffer-indexof "^1.0.0"
 
-dom-converter@~0.1:
-  version "0.1.4"
-  resolved "http://registry.npmjs.org/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b"
-  dependencies:
-    utila "~0.3"
-
 dom-serialize@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
+  integrity sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=
   dependencies:
     custom-event "~1.0.0"
     ent "~2.2.0"
     extend "^3.0.0"
     void-elements "^2.0.0"
 
-dom-serializer@0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
-  dependencies:
-    domelementtype "~1.1.1"
-    entities "~1.1.1"
-
 domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
-
-domelementtype@1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
-
-domelementtype@~1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
-
-domhandler@2.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"
-  dependencies:
-    domelementtype "1"
+  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
 domino@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.0.tgz#653ba7d331441113b42e40ba05f24253ec86e02e"
-
-domutils@1.1:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.1.6.tgz#bddc3de099b9a2efacc51c623f28f416ecc57485"
-  dependencies:
-    domelementtype "1"
-
-domutils@1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
-  dependencies:
-    dom-serializer "0"
-    domelementtype "1"
+  integrity sha512-xINSODvrnuQcm3eXJN4IkBR+JxqLrJN8Ge4fd00y1b7HsY0A4huKN5BflSS/oo8quBWmocTfWdFvrw2H8TjGqQ==
 
 dot-prop@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
+  integrity sha1-G3CK8JSknJoOfbyteQq6U52sEXc=
   dependencies:
     is-obj "^1.0.0"
 
 dot-prop@^4.1.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
+  integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==
   dependencies:
     is-obj "^1.0.0"
 
 duplexer2@~0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
+  integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=
   dependencies:
     readable-stream "^2.0.2"
 
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
+  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
 
 duplexify@^3.4.2, duplexify@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.0.tgz#592903f5d80b38d037220541264d69a198fb3410"
+  integrity sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==
   dependencies:
     end-of-stream "^1.0.0"
     inherits "^2.0.1"
@@ -2495,6 +2809,7 @@ duplexify@^3.4.2, duplexify@^3.6.0:
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
   dependencies:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
@@ -2502,14 +2817,17 @@ ecc-jsbn@~0.1.1:
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.62:
   version "1.3.65"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.65.tgz#0655c238e45fea7e0e0e81fd0cac62b8186129c2"
+  integrity sha512-tyGr+wh2c/JYBVMeflKpZ3ricwtBPyVBMtRNxYGObl7TP5bAeupgz4VZnBzQSFleZViXYTws1yZtKKFQYZyiYw==
 
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
+  integrity sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"
@@ -2522,26 +2840,31 @@ elliptic@^6.0.0:
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
 
 enabled@1.0.x:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz#965f6513d2c2d1c5f4652b64a2e3396467fc2f93"
+  integrity sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=
   dependencies:
     env-variable "0.0.x"
 
 encodeurl@~1.0.1, encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
+  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
   dependencies:
     once "^1.4.0"
 
 engine.io-client@~3.2.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36"
+  integrity sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==
   dependencies:
     component-emitter "1.2.1"
     component-inherit "0.0.3"
@@ -2558,6 +2881,7 @@ engine.io-client@~3.2.0:
 engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.2.tgz#4c0f4cff79aaeecbbdcfdea66a823c6085409196"
+  integrity sha512-dInLFzr80RijZ1rGpx1+56/uFoH7/7InhH3kZt+Ms6hT8tNx3NGW/WNSA/f8As1WkOfkuyb3tnRyuXGxusclMw==
   dependencies:
     after "0.8.2"
     arraybuffer.slice "~0.0.7"
@@ -2568,6 +2892,7 @@ engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
 engine.io@~3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.0.tgz#54332506f42f2edc71690d2f2a42349359f3bf7d"
+  integrity sha512-mRbgmAtQ4GAlKwuPnnAvXXwdPhEx+jkc0OBCLrXuD/CRvwNK3AxRSnqK4FSqmAMRRHryVJP8TopOvmEaA64fKw==
   dependencies:
     accepts "~1.3.4"
     base64id "1.0.0"
@@ -2579,6 +2904,7 @@ engine.io@~3.2.0:
 enhanced-resolve@4.1.0, enhanced-resolve@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
+  integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.4.0"
@@ -2587,70 +2913,58 @@ enhanced-resolve@4.1.0, enhanced-resolve@^4.1.0:
 ent@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
-
-entities@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
+  integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0=
 
 env-variable@0.0.x:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.4.tgz#0d6280cf507d84242befe35a512b5ae4be77c54e"
+  integrity sha512-+jpGxSWG4vr6gVxUHOc4p+ilPnql7NzZxOZBxNldsKGjCF+97df3CbuX7XMaDa5oAVkKQj4rKp38rYdC4VcpDg==
 
 errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
   dependencies:
     prr "~1.0.1"
 
 error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.5.1:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
-  dependencies:
-    es-to-primitive "^1.1.1"
-    function-bind "^1.1.1"
-    has "^1.0.1"
-    is-callable "^1.1.3"
-    is-regex "^1.0.4"
-
-es-to-primitive@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
-  dependencies:
-    is-callable "^1.1.1"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.1"
-
 es6-promise@^4.0.3:
   version "4.2.5"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
+  integrity sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==
 
 es6-promise@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6"
+  integrity sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=
 
 es6-promisify@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
   dependencies:
     es6-promise "^4.0.3"
 
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
 escodegen@1.8.x:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
+  integrity sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=
   dependencies:
     esprima "^2.7.1"
     estraverse "^1.9.1"
@@ -2662,6 +2976,7 @@ escodegen@1.8.x:
 escodegen@^1.8.1:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589"
+  integrity sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==
   dependencies:
     esprima "^3.1.3"
     estraverse "^4.2.0"
@@ -2673,6 +2988,7 @@ escodegen@^1.8.1:
 escodegen@~1.9.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"
+  integrity sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==
   dependencies:
     esprima "^3.1.3"
     estraverse "^4.2.0"
@@ -2684,6 +3000,7 @@ escodegen@~1.9.0:
 eslint-scope@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
+  integrity sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==
   dependencies:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
@@ -2691,58 +3008,71 @@ eslint-scope@^4.0.0:
 esprima@2.7.x, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+  integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=
 
 esprima@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
 
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esrecurse@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
+  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
   dependencies:
     estraverse "^4.1.0"
 
 estraverse@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
+  integrity sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=
 
 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"
+  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
 
 estree-walker@^0.5.1, estree-walker@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39"
+  integrity sha512-XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig==
 
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
 
 etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
 eventemitter3@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
+  integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
 
 events@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+  integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=
 
 eventsource@0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232"
+  integrity sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=
   dependencies:
     original ">=0.0.5"
 
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
   dependencies:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
@@ -2750,6 +3080,7 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
 execa@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
+  integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==
   dependencies:
     cross-spawn "^6.0.0"
     get-stream "^3.0.0"
@@ -2762,6 +3093,7 @@ execa@^0.10.0:
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
   dependencies:
     cross-spawn "^5.0.1"
     get-stream "^3.0.0"
@@ -2774,10 +3106,12 @@ execa@^0.7.0:
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
 expand-braces@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea"
+  integrity sha1-SIsdHSRRyz06axks/AMPRMWFX+o=
   dependencies:
     array-slice "^0.2.3"
     array-unique "^0.2.1"
@@ -2786,12 +3120,14 @@ expand-braces@^0.1.1:
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
   dependencies:
     is-posix-bracket "^0.1.0"
 
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
   dependencies:
     debug "^2.3.3"
     define-property "^0.2.5"
@@ -2804,6 +3140,7 @@ expand-brackets@^2.1.4:
 expand-range@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-0.1.1.tgz#4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"
+  integrity sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=
   dependencies:
     is-number "^0.1.1"
     repeat-string "^0.2.2"
@@ -2811,12 +3148,14 @@ expand-range@^0.1.0:
 expand-range@^1.8.1:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
   dependencies:
     fill-range "^2.1.0"
 
 express@^4.16.2:
   version "4.16.3"
   resolved "http://registry.npmjs.org/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
+  integrity sha1-avilAjUNsyRuzEvs9rWjTSL37VM=
   dependencies:
     accepts "~1.3.5"
     array-flatten "1.1.1"
@@ -2852,12 +3191,14 @@ express@^4.16.2:
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
   dependencies:
     is-extendable "^0.1.0"
 
 extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
   dependencies:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
@@ -2865,10 +3206,12 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
 extend@^3.0.0, extend@~3.0.1, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
 external-editor@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
+  integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
   dependencies:
     chardet "^0.7.0"
     iconv-lite "^0.4.24"
@@ -2877,12 +3220,14 @@ external-editor@^3.0.0:
 extglob@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
   dependencies:
     is-extglob "^1.0.0"
 
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
   dependencies:
     array-unique "^0.3.2"
     define-property "^1.0.0"
@@ -2896,14 +3241,17 @@ extglob@^2.0.4:
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
 
 extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
 falafel@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.1.0.tgz#96bb17761daba94f46d001738b3cedf3a67fe06c"
+  integrity sha1-lrsXdh2rqU9G0AFzizzt86Z/4Gw=
   dependencies:
     acorn "^5.0.0"
     foreach "^2.0.5"
@@ -2913,56 +3261,68 @@ falafel@^2.1.0:
 fast-deep-equal@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
 
 fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
 
 fast-json-stable-stringify@2.0.0, fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
 fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fast-safe-stringify@^2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.6.tgz#04b26106cc56681f51a044cfc0d76cf0008ac2c2"
+  integrity sha512-q8BZ89jjc+mz08rSxROs8VsrBBcn1SIw1kq9NjolL509tkABRk9io01RAjSaEv1Xb2uFLt8VtRiZbGp5H8iDtg==
 
 fastparse@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
+  integrity sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=
 
 faye-websocket@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
+  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
   dependencies:
     websocket-driver ">=0.5.1"
 
 faye-websocket@~0.11.0:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
+  integrity sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=
   dependencies:
     websocket-driver ">=0.5.1"
 
 fecha@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd"
+  integrity sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==
 
 figgy-pudding@^3.1.0, figgy-pudding@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
+  integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
 
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
   dependencies:
     escape-string-regexp "^1.0.5"
 
 file-loader@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-2.0.0.tgz#39749c82f020b9e85901dcff98e8004e6401cfde"
+  integrity sha512-YCsBfd1ZGCyonOKLxPiKPdu+8ld9HAaMEvJewzz+b2eTF7uL5Zm/HdBF6FjCrpCMRq25Mi0U1gl4pwn2TlH7hQ==
   dependencies:
     loader-utils "^1.0.2"
     schema-utils "^1.0.0"
@@ -2970,10 +3330,12 @@ file-loader@2.0.0:
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
+  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
 
 fileset@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
+  integrity sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=
   dependencies:
     glob "^7.0.3"
     minimatch "^3.0.3"
@@ -2981,6 +3343,7 @@ fileset@^2.0.3:
 fill-range@^2.1.0:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
+  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
   dependencies:
     is-number "^2.1.0"
     isobject "^2.0.0"
@@ -2991,6 +3354,7 @@ fill-range@^2.1.0:
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
   dependencies:
     extend-shallow "^2.0.1"
     is-number "^3.0.0"
@@ -3000,6 +3364,7 @@ fill-range@^4.0.0:
 finalhandler@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
+  integrity sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.1"
@@ -3012,6 +3377,7 @@ finalhandler@1.1.0:
 finalhandler@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
+  integrity sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.2"
@@ -3024,6 +3390,7 @@ finalhandler@1.1.1:
 find-cache-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
+  integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=
   dependencies:
     commondir "^1.0.1"
     make-dir "^1.0.0"
@@ -3032,6 +3399,7 @@ find-cache-dir@^1.0.0:
 find-cache-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d"
+  integrity sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==
   dependencies:
     commondir "^1.0.1"
     make-dir "^1.0.0"
@@ -3040,10 +3408,12 @@ find-cache-dir@^2.0.0:
 find-parent-dir@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
+  integrity sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=
 
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
   dependencies:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
@@ -3051,18 +3421,21 @@ find-up@^1.0.0:
 find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
   dependencies:
     locate-path "^2.0.0"
 
 find-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
   dependencies:
     locate-path "^3.0.0"
 
 flush-write-stream@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
+  integrity sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.4"
@@ -3070,44 +3443,53 @@ flush-write-stream@^1.0.0:
 follow-redirects@^1.0.0:
   version "1.5.7"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.7.tgz#a39e4804dacb90202bca76a9e2ac10433ca6a69a"
+  integrity sha512-NONJVIFiX7Z8k2WxfqBjtwqMifx7X42ORLFrOZ2LTKGj71G3C0kfdyTqGqr8fx5zSX6Foo/D95dgGWbPUiwnew==
   dependencies:
     debug "^3.1.0"
 
 font-awesome@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
+  integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=
 
 for-in@^0.1.3:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
+  integrity sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=
 
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
 for-own@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
   dependencies:
     for-in "^1.0.1"
 
 for-own@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
+  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
   dependencies:
     for-in "^1.0.1"
 
 foreach@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+  integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
 
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
 form-data@~2.3.1, form-data@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
+  integrity sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=
   dependencies:
     asynckit "^0.4.0"
     combined-stream "1.0.6"
@@ -3116,20 +3498,24 @@ form-data@~2.3.1, form-data@~2.3.2:
 forwarded@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
 
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
   dependencies:
     map-cache "^0.2.2"
 
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
 from2@^2.1.0, from2@^2.1.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
@@ -3137,12 +3523,14 @@ from2@^2.1.0, from2@^2.1.1:
 fs-access@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/fs-access/-/fs-access-1.0.1.tgz#d6a87f262271cefebec30c553407fb995da8777a"
+  integrity sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=
   dependencies:
     null-check "^1.0.0"
 
 fs-extra@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.0.tgz#8cc3f47ce07ef7b3593a11b9fb245f7e34c041d6"
+  integrity sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^4.0.0"
@@ -3151,12 +3539,14 @@ fs-extra@^7.0.0:
 fs-minipass@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
   dependencies:
     minipass "^2.2.1"
 
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
   dependencies:
     graceful-fs "^4.1.2"
     iferr "^0.1.5"
@@ -3166,10 +3556,12 @@ fs-write-stream-atomic@^1.0.8:
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.0.0, fsevents@^1.2.2:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
+  integrity sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==
   dependencies:
     nan "^2.9.2"
     node-pre-gyp "^0.10.0"
@@ -3177,6 +3569,7 @@ fsevents@^1.0.0, fsevents@^1.2.2:
 fstream@^1.0.0, fstream@^1.0.2:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+  integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
   dependencies:
     graceful-fs "^4.1.2"
     inherits "~2.0.0"
@@ -3186,10 +3579,12 @@ fstream@^1.0.0, fstream@^1.0.2:
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
   dependencies:
     aproba "^1.0.3"
     console-control-strings "^1.0.0"
@@ -3203,16 +3598,19 @@ gauge@~2.7.3:
 gaze@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
+  integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
   dependencies:
     globule "^1.0.0"
 
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
 get-pkg-repo@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
+  integrity sha1-xztInAbYDMVTbCyFP54FIyBWly0=
   dependencies:
     hosted-git-info "^2.1.4"
     meow "^3.3.0"
@@ -3223,24 +3621,29 @@ get-pkg-repo@^1.0.0:
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
 get-stream@3.0.0, get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
 
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
   dependencies:
     assert-plus "^1.0.0"
 
 gh-got@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/gh-got/-/gh-got-7.1.0.tgz#f2b14eef375ce49b66d5f034a1c124f56dc5bcf0"
+  integrity sha512-KeWkkhresa7sbpzQLYzITMgez5rMigUsijhmSAHcLDORIMUbdlkdoZyaN1wQvIjmUZnyb/wkAPaXb4MQKX0mdQ==
   dependencies:
     got "^8.0.0"
     is-plain-obj "^1.1.0"
@@ -3248,6 +3651,7 @@ gh-got@^7.0.0:
 git-raw-commits@^1.3.6:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.3.6.tgz#27c35a32a67777c1ecd412a239a6c19d71b95aff"
+  integrity sha512-svsK26tQ8vEKnMshTDatSIQSMDdz8CxIIqKsvPqbtV23Etmw6VNaFAitu8zwZ0VrOne7FztwPyRLxK7/DIUTQg==
   dependencies:
     dargs "^4.0.1"
     lodash.template "^4.0.2"
@@ -3258,6 +3662,7 @@ git-raw-commits@^1.3.6:
 git-raw-commits@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.0.tgz#d92addf74440c14bcc5c83ecce3fb7f8a79118b5"
+  integrity sha512-w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg==
   dependencies:
     dargs "^4.0.1"
     lodash.template "^4.0.2"
@@ -3268,6 +3673,7 @@ git-raw-commits@^2.0.0:
 git-remote-origin-url@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f"
+  integrity sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=
   dependencies:
     gitconfiglocal "^1.0.0"
     pify "^2.3.0"
@@ -3275,6 +3681,7 @@ git-remote-origin-url@^2.0.0:
 git-semver-tags@^1.3.6:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.3.6.tgz#357ea01f7280794fe0927f2806bee6414d2caba5"
+  integrity sha512-2jHlJnln4D/ECk9FxGEBh3k44wgYdWjWDtMmJPaecjoRmxKo3Y1Lh8GMYuOPu04CHw86NTAODchYjC5pnpMQig==
   dependencies:
     meow "^4.0.0"
     semver "^5.5.0"
@@ -3282,12 +3689,14 @@ git-semver-tags@^1.3.6:
 gitconfiglocal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"
+  integrity sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=
   dependencies:
     ini "^1.3.2"
 
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
   dependencies:
     glob-parent "^2.0.0"
     is-glob "^2.0.0"
@@ -3295,12 +3704,14 @@ glob-base@^0.3.0:
 glob-parent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
   dependencies:
     is-glob "^2.0.0"
 
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
   dependencies:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
@@ -3308,6 +3719,7 @@ glob-parent@^3.1.0:
 glob@7.0.x:
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
+  integrity sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -3319,6 +3731,7 @@ glob@7.0.x:
 glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -3330,6 +3743,7 @@ glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glo
 glob@^5.0.10, glob@^5.0.15:
   version "5.0.15"
   resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
   dependencies:
     inflight "^1.0.4"
     inherits "2"
@@ -3340,20 +3754,24 @@ glob@^5.0.10, glob@^5.0.15:
 global-dirs@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
+  integrity sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=
   dependencies:
     ini "^1.3.4"
 
 globals@^11.1.0:
   version "11.7.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673"
+  integrity sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==
 
 globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
+  integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
 
 globby@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
+  integrity sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=
   dependencies:
     array-union "^1.0.1"
     arrify "^1.0.0"
@@ -3365,6 +3783,7 @@ globby@^5.0.0:
 globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
   dependencies:
     array-union "^1.0.1"
     glob "^7.0.3"
@@ -3375,6 +3794,7 @@ globby@^6.1.0:
 globby@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
+  integrity sha1-+yzP+UAfhgCUXfral0QMypcrhoA=
   dependencies:
     array-union "^1.0.1"
     dir-glob "^2.0.0"
@@ -3386,6 +3806,7 @@ globby@^7.1.1:
 globule@^1.0.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d"
+  integrity sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==
   dependencies:
     glob "~7.1.1"
     lodash "~4.17.10"
@@ -3394,6 +3815,7 @@ globule@^1.0.0:
 got@^6.7.1:
   version "6.7.1"
   resolved "http://registry.npmjs.org/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
+  integrity sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=
   dependencies:
     create-error-class "^3.0.0"
     duplexer3 "^0.1.4"
@@ -3410,6 +3832,7 @@ got@^6.7.1:
 got@^8.0.0:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937"
+  integrity sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==
   dependencies:
     "@sindresorhus/is" "^0.7.0"
     cacheable-request "^2.1.1"
@@ -3432,14 +3855,17 @@ got@^8.0.0:
 graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
 
 handle-thing@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
+  integrity sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=
 
 handlebars@^4.0.1, handlebars@^4.0.11, handlebars@^4.0.2:
   version "4.0.12"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5"
+  integrity sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==
   dependencies:
     async "^2.5.0"
     optimist "^0.6.1"
@@ -3450,10 +3876,12 @@ handlebars@^4.0.1, handlebars@^4.0.11, handlebars@^4.0.2:
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
 har-validator@~5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
+  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
   dependencies:
     ajv "^5.1.0"
     har-schema "^2.0.0"
@@ -3461,6 +3889,7 @@ har-validator@~5.0.3:
 har-validator@~5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
+  integrity sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==
   dependencies:
     ajv "^5.3.0"
     har-schema "^2.0.0"
@@ -3468,44 +3897,53 @@ har-validator@~5.1.0:
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
   dependencies:
     ansi-regex "^2.0.0"
 
 has-binary2@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
+  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
   dependencies:
     isarray "2.0.1"
 
 has-cors@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
+  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
 
 has-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
 
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
 has-symbol-support-x@^1.4.1:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
+  integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==
 
 has-to-string-tag-x@^1.2.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
+  integrity sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==
   dependencies:
     has-symbol-support-x "^1.4.1"
 
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
 
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
   dependencies:
     get-value "^2.0.3"
     has-values "^0.1.4"
@@ -3514,6 +3952,7 @@ has-value@^0.3.1:
 has-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
   dependencies:
     get-value "^2.0.6"
     has-values "^1.0.0"
@@ -3522,10 +3961,12 @@ has-value@^1.0.0:
 has-values@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
 
 has-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
   dependencies:
     is-number "^3.0.0"
     kind-of "^4.0.0"
@@ -3533,12 +3974,14 @@ has-values@^1.0.0:
 has@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
     function-bind "^1.1.1"
 
 hash-base@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
+  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -3546,17 +3989,15 @@ hash-base@^3.0.0:
 hash.js@^1.0.0, hash.js@^1.0.3:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.5.tgz#e38ab4b85dfb1e0c40fe9265c0e9b54854c23812"
+  integrity sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==
   dependencies:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-he@1.1.x:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
-
 hmac-drbg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
   dependencies:
     hash.js "^1.0.3"
     minimalistic-assert "^1.0.0"
@@ -3565,10 +4006,12 @@ hmac-drbg@^1.0.0:
 hosted-git-info@^2.1.4, hosted-git-info@^2.6.0:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
+  integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
 
 hpack.js@^2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
+  integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=
   dependencies:
     inherits "^2.0.1"
     obuf "^1.0.0"
@@ -3578,51 +4021,22 @@ hpack.js@^2.1.6:
 html-entities@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
-
-html-minifier@^3.2.3:
-  version "3.5.20"
-  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.20.tgz#7b19fd3caa0cb79f7cde5ee5c3abdf8ecaa6bb14"
-  dependencies:
-    camel-case "3.0.x"
-    clean-css "4.2.x"
-    commander "2.17.x"
-    he "1.1.x"
-    param-case "2.1.x"
-    relateurl "0.2.x"
-    uglify-js "3.4.x"
-
-html-webpack-plugin@3.2.0:
-  version "3.2.0"
-  resolved "http://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
-  dependencies:
-    html-minifier "^3.2.3"
-    loader-utils "^0.2.16"
-    lodash "^4.17.3"
-    pretty-error "^2.0.2"
-    tapable "^1.0.0"
-    toposort "^1.0.0"
-    util.promisify "1.0.0"
-
-htmlparser2@~3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe"
-  dependencies:
-    domelementtype "1"
-    domhandler "2.1"
-    domutils "1.1"
-    readable-stream "1.0"
+  integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
 
 http-cache-semantics@3.8.1:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
+  integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
 
 http-deceiver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
+  integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
 
 http-errors@1.6.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
+  integrity sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=
   dependencies:
     depd "1.1.1"
     inherits "2.0.3"
@@ -3632,6 +4046,7 @@ http-errors@1.6.2:
 http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
   dependencies:
     depd "~1.1.2"
     inherits "2.0.3"
@@ -3641,10 +4056,12 @@ http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
 http-parser-js@>=0.4.0:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.13.tgz#3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"
+  integrity sha1-O9bW/ebjFyyTNMOzO2wZPYD+ETc=
 
 http-proxy-middleware@~0.18.0:
   version "0.18.0"
   resolved "http://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
+  integrity sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==
   dependencies:
     http-proxy "^1.16.2"
     is-glob "^4.0.0"
@@ -3654,6 +4071,7 @@ http-proxy-middleware@~0.18.0:
 http-proxy@^1.13.0, http-proxy@^1.16.2:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
+  integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==
   dependencies:
     eventemitter3 "^3.0.0"
     follow-redirects "^1.0.0"
@@ -3662,6 +4080,7 @@ http-proxy@^1.13.0, http-proxy@^1.16.2:
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
   dependencies:
     assert-plus "^1.0.0"
     jsprim "^1.2.2"
@@ -3670,10 +4089,12 @@ http-signature@~1.2.0:
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
 https-proxy-agent@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
+  integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==
   dependencies:
     agent-base "^4.1.0"
     debug "^3.1.0"
@@ -3681,6 +4102,7 @@ https-proxy-agent@^2.2.1:
 husky@^0.14.3:
   version "0.14.3"
   resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3"
+  integrity sha512-e21wivqHpstpoiWA/Yi8eFti8E+sQDSS53cpJsPptPs295QTOQR0ZwnHo2TXy1XOpZFD9rPOd3NpmqTK6uMLJA==
   dependencies:
     is-ci "^1.0.10"
     normalize-path "^1.0.0"
@@ -3689,68 +4111,82 @@ husky@^0.14.3:
 iconv-lite@0.4.19:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
+  integrity sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==
 
 iconv-lite@0.4.23:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
+  integrity sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 iconv-lite@^0.4.24, iconv-lite@^0.4.4:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 ieee754@^1.1.4:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
+  integrity sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==
 
 iferr@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
 ignore-walk@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
   dependencies:
     minimatch "^3.0.4"
 
 ignore@^3.3.5:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
+  integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
 
 image-size@~0.5.0:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
+  integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
 
 immediate@~3.0.5:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
+  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
 
 immutable@^3.8.2:
   version "3.8.2"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
+  integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=
 
 import-cwd@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
+  integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=
   dependencies:
     import-from "^2.1.0"
 
 import-from@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
+  integrity sha1-M1238qev/VOqpHHUuAId7ja387E=
   dependencies:
     resolve-from "^3.0.0"
 
 import-lazy@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
+  integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
 
 import-local@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
+  integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
   dependencies:
     pkg-dir "^3.0.0"
     resolve-cwd "^2.0.0"
@@ -3758,28 +4194,34 @@ import-local@^2.0.0:
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
 in-publish@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
+  integrity sha1-4g/146KvwmkDILbcVSaCqcf631E=
 
 indent-string@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
   dependencies:
     repeating "^2.0.0"
 
 indent-string@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
+  integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=
 
 indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
 
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -3787,22 +4229,27 @@ inflight@^1.0.4:
 inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
 ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
 injection-js@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/injection-js/-/injection-js-2.2.1.tgz#a8d6a085b2f0b8d8650f6f4487f6abb8cc0d67ce"
+  integrity sha512-zHI+E+dM0PXix5FFTO1Y4/UOyAzE7zG1l/QwAn4jchTThOoBq+UYRFK4AVG7lQgFL+go62SbrzSsjXy9DFEZUg==
 
 inquirer@6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"
+  integrity sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.0"
@@ -3821,6 +4268,7 @@ inquirer@6.2.0:
 internal-ip@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-3.0.1.tgz#df5c99876e1d2eb2ea2d74f520e3f669a00ece27"
+  integrity sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==
   dependencies:
     default-gateway "^2.6.0"
     ipaddr.js "^1.5.2"
@@ -3828,10 +4276,12 @@ internal-ip@^3.0.1:
 interpret@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
+  integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
 
 into-stream@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
+  integrity sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=
   dependencies:
     from2 "^2.1.1"
     p-is-promise "^1.1.0"
@@ -3839,98 +4289,108 @@ into-stream@^3.1.0:
 invariant@^2.2.2:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
   dependencies:
     loose-envify "^1.0.0"
 
 invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
 
 invert-kv@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
+  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
 
 ip-regex@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
+  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
 
 ip@^1.1.0, ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
 
 ipaddr.js@1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
+  integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
 
 ipaddr.js@^1.5.2:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.1.tgz#fa4b79fa47fd3def5e3b159825161c0a519c9427"
+  integrity sha1-+kt5+kf9Pe9eOxWYJRYcClGclCc=
 
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
   dependencies:
     kind-of "^3.0.2"
 
 is-accessor-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
 is-arrayish@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
+  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
 
 is-binary-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
   dependencies:
     binary-extensions "^1.0.0"
 
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-builtin-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74=
   dependencies:
     builtin-modules "^1.0.0"
 
-is-callable@^1.1.1, is-callable@^1.1.3:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
-
 is-ci@^1.0.10:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
+  integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==
   dependencies:
     ci-info "^1.5.0"
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
   dependencies:
     kind-of "^3.0.2"
 
 is-data-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
   dependencies:
     kind-of "^6.0.0"
 
-is-date-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
-
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
   dependencies:
     is-accessor-descriptor "^0.1.6"
     is-data-descriptor "^0.1.4"
@@ -3939,6 +4399,7 @@ is-descriptor@^0.1.0:
 is-descriptor@^1.0.0, is-descriptor@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
   dependencies:
     is-accessor-descriptor "^1.0.0"
     is-data-descriptor "^1.0.0"
@@ -3947,72 +4408,86 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
 is-directory@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
 
 is-dotfile@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
+  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
 
 is-equal-shallow@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
   dependencies:
     is-primitive "^2.0.0"
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
 
 is-extendable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
   dependencies:
     is-plain-object "^2.0.4"
 
 is-extglob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
 
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
 is-finite@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
   dependencies:
     is-extglob "^1.0.0"
 
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
   dependencies:
     is-extglob "^2.1.0"
 
 is-glob@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
+  integrity sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=
   dependencies:
     is-extglob "^2.1.1"
 
 is-installed-globally@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80"
+  integrity sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=
   dependencies:
     global-dirs "^0.1.0"
     is-path-inside "^1.0.0"
@@ -4020,164 +4495,188 @@ is-installed-globally@^0.1.0:
 is-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
+  integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
 
 is-npm@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
+  integrity sha1-8vtjpl5JBbQGyGBydloaTceTufQ=
 
 is-number@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806"
+  integrity sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=
 
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
   dependencies:
     kind-of "^3.0.2"
 
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
   dependencies:
     kind-of "^3.0.2"
 
 is-number@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
 is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
 
 is-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
+  integrity sha1-iVJojF7C/9awPsyF52ngKQMINHA=
 
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
 
 is-path-in-cwd@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
+  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
   dependencies:
     is-path-inside "^1.0.0"
 
 is-path-inside@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
   dependencies:
     path-is-inside "^1.0.1"
 
 is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
 is-posix-bracket@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
 
 is-primitive@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
 
 is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+  integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
 
 is-redirect@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
-
-is-regex@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
-  dependencies:
-    has "^1.0.1"
+  integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=
 
 is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
+  integrity sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=
 
 is-stream@^1.0.0, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
 is-subset@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
-
-is-symbol@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
+  integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=
 
 is-text-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
+  integrity sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=
   dependencies:
     text-extensions "^1.0.0"
 
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
 is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
 is-wsl@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
 
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
 isarray@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
+  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
 
 isbinaryfile@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
+  integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
   dependencies:
     buffer-alloc "^1.2.0"
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
 istanbul-api@^2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.0.6.tgz#cd7b33ee678f6c01531d05f5e567ebbcd25f8ecc"
+  integrity sha512-8W5oeAGWXhtTJjAyVfvavOLVyZCTNCKsyF6GON/INKlBdO7uJ/bv3qnPj5M6ERKzmMCJS1kntnjjGuJ86fn3rQ==
   dependencies:
     async "^2.6.1"
     compare-versions "^3.2.1"
@@ -4195,6 +4694,7 @@ istanbul-api@^2.0.5:
 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"
+  integrity sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==
   dependencies:
     convert-source-map "^1.5.0"
     istanbul-lib-instrument "^1.7.3"
@@ -4204,20 +4704,24 @@ istanbul-instrumenter-loader@3.0.1:
 istanbul-lib-coverage@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0"
+  integrity sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==
 
 istanbul-lib-coverage@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#2aee0e073ad8c5f6a0b00e0dfbf52b4667472eda"
+  integrity sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==
 
 istanbul-lib-hook@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.1.tgz#918a57b75a0f951d552a08487ca1fa5336433d72"
+  integrity sha512-ufiZoiJ8CxY577JJWEeFuxXZoMqiKpq/RqZtOAYuQLvlkbJWscq9n3gc4xrCGH9n4pW0qnTxOz1oyMmVtk8E1w==
   dependencies:
     append-transform "^1.0.0"
 
 istanbul-lib-instrument@^1.7.3:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz#1f55ed10ac3c47f2bdddd5307935126754d0a9ca"
+  integrity sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==
   dependencies:
     babel-generator "^6.18.0"
     babel-template "^6.16.0"
@@ -4230,6 +4734,7 @@ istanbul-lib-instrument@^1.7.3:
 istanbul-lib-instrument@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.0.0.tgz#b5f066b2a161f75788be17a9d556f40a0cf2afc9"
+  integrity sha512-eQY9vN9elYjdgN9Iv6NS/00bptm02EBBk70lRMaVjeA6QYocQgenVrSgC28TJurdnZa80AGO3ASdFN+w/njGiQ==
   dependencies:
     "@babel/generator" "^7.0.0"
     "@babel/parser" "^7.0.0"
@@ -4242,6 +4747,7 @@ istanbul-lib-instrument@^3.0.0:
 istanbul-lib-report@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.2.tgz#430a2598519113e1da7af274ba861bd42dd97535"
+  integrity sha512-rJ8uR3peeIrwAxoDEbK4dJ7cqqtxBisZKCuwkMtMv0xYzaAnsAi3AHrHPAAtNXzG/bcCgZZ3OJVqm1DTi9ap2Q==
   dependencies:
     istanbul-lib-coverage "^2.0.1"
     make-dir "^1.3.0"
@@ -4250,6 +4756,7 @@ istanbul-lib-report@^2.0.2:
 istanbul-lib-source-maps@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-2.0.1.tgz#ce8b45131d8293fdeaa732f4faf1852d13d0a97e"
+  integrity sha512-30l40ySg+gvBLcxTrLzR4Z2XTRj3HgRCA/p2rnbs/3OiTaoj054gAbuP5DcLOtwqmy4XW8qXBHzrmP2/bQ9i3A==
   dependencies:
     debug "^3.1.0"
     istanbul-lib-coverage "^2.0.1"
@@ -4260,12 +4767,14 @@ istanbul-lib-source-maps@^2.0.1:
 istanbul-reports@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.0.1.tgz#fb8d6ea850701a3984350b977a969e9a556116a7"
+  integrity sha512-CT0QgMBJqs6NJLF678ZHcquUAZIoBIUNzdJrRJfpkI9OnzG6MkUfHxbJC3ln981dMswC7/B1mfX3LNkhgJxsuw==
   dependencies:
     handlebars "^4.0.11"
 
 istanbul@0.4.5, istanbul@^0.4.5:
   version "0.4.5"
   resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-0.4.5.tgz#65c7d73d4c4da84d4f3ac310b918fb0b8033733b"
+  integrity sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=
   dependencies:
     abbrev "1.0.x"
     async "1.x"
@@ -4285,6 +4794,7 @@ istanbul@0.4.5, istanbul@^0.4.5:
 isurl@^1.0.0-alpha5:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
+  integrity sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==
   dependencies:
     has-to-string-tag-x "^1.2.0"
     is-object "^1.0.1"
@@ -4292,32 +4802,38 @@ isurl@^1.0.0-alpha5:
 jasmine-core@~2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
+  integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
 
 jasmine-core@~2.99.0:
   version "2.99.1"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15"
+  integrity sha1-5kAN8ea1bhMLYcS80JPap/boyhU=
 
 jasmine-diff@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/jasmine-diff/-/jasmine-diff-0.1.3.tgz#93ccc2dcc41028c5ddd4606558074839f2deeaa8"
+  integrity sha1-k8zC3MQQKMXd1GBlWAdIOfLe6qg=
   dependencies:
     diff "^3.2.0"
 
 jasmine-spec-reporter@^3.2.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-3.3.0.tgz#c63c3d43bacfd16e6da86c46d265957e0075f14c"
+  integrity sha1-xjw9Q7rP0W5tqGxG0mWVfgB18Uw=
   dependencies:
     colors "1.1.2"
 
 jasmine-spec-reporter@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz#1d632aec0341670ad324f92ba84b4b32b35e9e22"
+  integrity sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==
   dependencies:
     colors "1.1.2"
 
 jasmine@2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e"
+  integrity sha1-awicChFXax8W3xG4AUbZHU6Lij4=
   dependencies:
     exit "^0.1.2"
     glob "^7.0.6"
@@ -4326,6 +4842,7 @@ jasmine@2.8.0:
 jasmine@^2.6.0:
   version "2.99.0"
   resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.99.0.tgz#8ca72d102e639b867c6489856e0e18a9c7aa42b7"
+  integrity sha1-jKctEC5jm4Z8ZImFbg4YqceqQrc=
   dependencies:
     exit "^0.1.2"
     glob "^7.0.6"
@@ -4334,26 +4851,32 @@ jasmine@^2.6.0:
 jasminewd2@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"
+  integrity sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=
 
 jquery@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
+  integrity sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==
 
 js-base64@^2.1.8, js-base64@^2.4.3:
   version "2.4.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03"
+  integrity sha512-xcinL3AuDJk7VSzsHgb9DvvIXayBbadtMZ4HFPx8rUszbW1MuNMlwYVC4zzCZ6e1sqZpnNS5ZFYOhXqA39T7LQ==
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
 js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
+  integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -4361,64 +4884,79 @@ js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
 jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+  integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
 
 jsesc@^2.5.1:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
+  integrity sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=
 
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
 json-buffer@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
+  integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
 
 json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
 
 json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
 json3@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
+  integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
 
 json5@^0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
 
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
   optionalDependencies:
     graceful-fs "^4.1.6"
 
 jsonparse@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
+  integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
 
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
   dependencies:
     assert-plus "1.0.0"
     extsprintf "1.3.0"
@@ -4428,6 +4966,7 @@ jsprim@^1.2.2:
 jszip@^3.1.3:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.1.5.tgz#e3c2a6c6d706ac6e603314036d43cd40beefdf37"
+  integrity sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==
   dependencies:
     core-js "~2.3.0"
     es6-promise "~3.0.2"
@@ -4438,6 +4977,7 @@ jszip@^3.1.3:
 karma-chrome-launcher@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf"
+  integrity sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==
   dependencies:
     fs-access "^1.0.0"
     which "^1.2.1"
@@ -4445,6 +4985,7 @@ karma-chrome-launcher@~2.2.0:
 karma-coverage-istanbul-reporter@~2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.4.tgz#402ae4ed6eadb9d9dafbd408ffda17897c0d003a"
+  integrity sha512-xJS7QSQIVU6VK9HuJ/ieE5yynxKhjCCkd96NLY/BX/HXsx0CskU9JJiMQbd4cHALiddMwI4OWh1IIzeWrsavJw==
   dependencies:
     istanbul-api "^2.0.5"
     minimatch "^3.0.4"
@@ -4452,22 +4993,26 @@ karma-coverage-istanbul-reporter@~2.0.0:
 karma-jasmine-html-reporter@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-0.2.2.tgz#48a8e5ef18807617ee2b5e33c1194c35b439524c"
+  integrity sha1-SKjl7xiAdhfuK14zwRlMNbQ5Ukw=
   dependencies:
     karma-jasmine "^1.0.2"
 
 karma-jasmine@^1.0.2, karma-jasmine@~1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.2.tgz#394f2b25ffb4a644b9ada6f22d443e2fd08886c3"
+  integrity sha1-OU8rJf+0pkS5rabyLUQ+L9CIhsM=
 
 karma-source-map-support@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz#36dd4d8ca154b62ace95696236fae37caf0a7dde"
+  integrity sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==
   dependencies:
     source-map-support "^0.5.5"
 
 karma@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/karma/-/karma-3.0.0.tgz#6da83461a8a28d8224575c3b5b874e271b4730c3"
+  integrity sha512-ZTjyuDXVXhXsvJ1E4CnZzbCjSxD6sEdzEsFYogLuZM0yqvg/mgz+O+R1jb0J7uAQeuzdY8kJgx6hSNXLwFuHIQ==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
@@ -4500,60 +5045,71 @@ karma@~3.0.0:
 keyv@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
+  integrity sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==
   dependencies:
     json-buffer "3.0.0"
 
 killable@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
+  integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
 
 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"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
 
 kuler@1.0.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/kuler/-/kuler-1.0.0.tgz#904ad31c373b781695854d32be33818bf1d60250"
+  integrity sha512-oyy6pu/yWRjiVfCoJebNUKFL061sNtrs9ejKTbirIwY3oiHmENVCSkHhxDV85Dkm7JYR/czMCBeoM87WilTdSg==
   dependencies:
     colornames "^1.1.1"
 
 latest-version@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15"
+  integrity sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=
   dependencies:
     package-json "^4.0.0"
 
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
   dependencies:
     invert-kv "^1.0.0"
 
 lcid@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
+  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
   dependencies:
     invert-kv "^2.0.0"
 
 less-loader@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-4.1.0.tgz#2c1352c5b09a4f84101490274fd51674de41363e"
+  integrity sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==
   dependencies:
     clone "^2.1.1"
     loader-utils "^1.1.0"
@@ -4562,6 +5118,7 @@ less-loader@4.1.0:
 less-plugin-npm-import@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/less-plugin-npm-import/-/less-plugin-npm-import-2.1.0.tgz#823e6986c93318a98171ca858848b6bead55bf3e"
+  integrity sha1-gj5phskzGKmBccqFiEi2vq1Vvz4=
   dependencies:
     promise "~7.0.1"
     resolve "~1.1.6"
@@ -4569,6 +5126,7 @@ less-plugin-npm-import@^2.1.0:
 less@3.8.1, less@^3.8.0:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/less/-/less-3.8.1.tgz#f31758598ef5a1930dd4caefa9e4340641e71e1d"
+  integrity sha512-8HFGuWmL3FhQR0aH89escFNBQH/nEiYPP2ltDFdQw2chE28Yx2E3lhAIq9Y2saYwLSwa699s4dBVEfCY8Drf7Q==
   dependencies:
     clone "^2.1.2"
   optionalDependencies:
@@ -4584,6 +5142,7 @@ less@3.8.1, less@^3.8.0:
 levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
   dependencies:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
@@ -4591,6 +5150,7 @@ levn@~0.3.0:
 license-checker@^20.1.0:
   version "20.2.0"
   resolved "https://registry.yarnpkg.com/license-checker/-/license-checker-20.2.0.tgz#edb2605fd714514ed16e7eeee5b88a41900241d2"
+  integrity sha512-bseotvz8lfzEY7siilsJhQd2K/z+IF9aeJ+ZscieyZ70S6Ql2iJdVp1IfnL6gkdU4ny5JctT5Y2lFCQerSCfGA==
   dependencies:
     chalk "^2.4.1"
     debug "^3.1.0"
@@ -4607,18 +5167,21 @@ license-checker@^20.1.0:
 license-webpack-plugin@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.0.1.tgz#d8d24d0d0db70d328ec911ae728719b842260078"
+  integrity sha512-XUSJoU+M2w/N5ZdzHm++mFSM2BVKAdnSORXF7nbkpBJVdfi3hiiMpNdiuUR7S4OvsceiXQp1yoBwhiAP+gtC2g==
   dependencies:
     webpack-sources "^1.2.0"
 
 lie@~3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
+  integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=
   dependencies:
     immediate "~3.0.5"
 
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -4629,6 +5192,7 @@ load-json-file@^1.0.0:
 load-json-file@^2.0.0:
   version "2.0.0"
   resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -4638,6 +5202,7 @@ load-json-file@^2.0.0:
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^4.0.0"
@@ -4647,27 +5212,21 @@ load-json-file@^4.0.0:
 loader-runner@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
+  integrity sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=
 
 loader-utils@1.1.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
+  integrity sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=
   dependencies:
     big.js "^3.1.3"
     emojis-list "^2.0.0"
     json5 "^0.5.0"
 
-loader-utils@^0.2.16:
-  version "0.2.17"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-    object-assign "^4.0.1"
-
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
   dependencies:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
@@ -4675,6 +5234,7 @@ locate-path@^2.0.0:
 locate-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
   dependencies:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
@@ -4682,30 +5242,37 @@ locate-path@^3.0.0:
 lodash._reinterpolate@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
 
 lodash.assign@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
+  integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
 
 lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
 lodash.mergewith@^4.6.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
+  integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==
 
 lodash.tail@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
+  integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=
 
 lodash.template@^4.0.2:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
+  integrity sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=
   dependencies:
     lodash._reinterpolate "~3.0.0"
     lodash.templatesettings "^4.0.0"
@@ -4713,20 +5280,19 @@ lodash.template@^4.0.2:
 lodash.templatesettings@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
+  integrity sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
 lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.5.0, lodash@~4.17.10:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-
-lodash@^4.17.3:
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+  integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==
 
 log4js@^3.0.0:
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.5.tgz#b80146bfebad68b430d4f3569556d8a6edfef303"
+  integrity sha512-IX5c3G/7fuTtdr0JjOT2OIR12aTESVhsH6cEsijloYwKgcPRlO6DgOU72v0UFhWcoV1HN6+M3dwT89qVPLXm0w==
   dependencies:
     circular-json "^0.5.5"
     date-format "^1.2.0"
@@ -4737,6 +5303,7 @@ log4js@^3.0.0:
 logform@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/logform/-/logform-1.9.1.tgz#58b29d7b11c332456d7a217e17b48a13ad69d60a"
+  integrity sha512-ZHrZE8VSf7K3xKxJiQ1aoTBp2yK+cEbFcgarsjzI3nt3nE/3O0heNSppoOQMUJVMZo/xiVwCxiXIabaZApsKNQ==
   dependencies:
     colors "^1.2.1"
     fast-safe-stringify "^2.0.4"
@@ -4747,43 +5314,47 @@ logform@^1.9.1:
 loglevel@^1.4.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
+  integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
 
 long@~3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
+  integrity sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=
 
 loose-envify@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
 loud-rejection@^1.0.0, loud-rejection@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
   dependencies:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
 
-lower-case@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
-
 lowercase-keys@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
+  integrity sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=
 
 lowercase-keys@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
+  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
 
 lru-cache@2.2.x:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d"
+  integrity sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=
 
 lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
+  integrity sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==
   dependencies:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
@@ -4791,64 +5362,77 @@ lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.3:
 magic-string@^0.22.4:
   version "0.22.5"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
+  integrity sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==
   dependencies:
     vlq "^0.2.2"
 
 magic-string@^0.25.0:
   version "0.25.0"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.0.tgz#1f3696f9931ff0a1ed4c132250529e19cad6759b"
+  integrity sha512-Msbwa9oNYNPjwVh9ury5X2BHbTFWoirTlzuf4X+pIoSOQVKNRJHXTx1WmKYuXzRM4QZFv8dGXyZvhDMmWhGLPw==
   dependencies:
     sourcemap-codec "^1.4.1"
 
 make-dir@^1.0.0, make-dir@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
+  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
   dependencies:
     pify "^3.0.0"
 
 make-error@^1.1.1:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
+  integrity sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==
 
 mamacro@^0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
+  integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
 
 map-age-cleaner@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz#098fb15538fd3dbe461f12745b0ca8568d4e3f74"
+  integrity sha512-UN1dNocxQq44IhJyMI4TU8phc2m9BddacHRPRjKGLYaF0jqd3xLz0jS0skpAU9WgYyoR4gHtUpzytNBS385FWQ==
   dependencies:
     p-defer "^1.0.0"
 
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
 map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
 
 map-obj@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
+  integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk=
 
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
   dependencies:
     object-visit "^1.0.0"
 
 material-design-icons@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/material-design-icons/-/material-design-icons-3.0.1.tgz#9a71c48747218ebca51e51a66da682038cdcb7bf"
+  integrity sha1-mnHEh0chjrylHlGmbaaCA4zct78=
 
 math-random@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
+  integrity sha1-izqsWIuKZuSXXjzepn97sylgH6w=
 
 md5.js@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
+  integrity sha1-6b296UogpawYsENA/Fdk1bCdkB0=
   dependencies:
     hash-base "^3.0.0"
     inherits "^2.0.1"
@@ -4856,16 +5440,19 @@ md5.js@^1.3.4:
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
 mem@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
+  integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
   dependencies:
     mimic-fn "^1.0.0"
 
 mem@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf"
+  integrity sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==
   dependencies:
     map-age-cleaner "^0.1.1"
     mimic-fn "^1.0.0"
@@ -4874,6 +5461,7 @@ mem@^4.0.0:
 memory-fs@^0.4.0, memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
   dependencies:
     errno "^0.1.3"
     readable-stream "^2.0.1"
@@ -4881,6 +5469,7 @@ memory-fs@^0.4.0, memory-fs@~0.4.1:
 meow@^3.3.0, meow@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
   dependencies:
     camelcase-keys "^2.0.0"
     decamelize "^1.1.2"
@@ -4896,6 +5485,7 @@ meow@^3.3.0, meow@^3.7.0:
 meow@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/meow/-/meow-4.0.1.tgz#d48598f6f4b1472f35bf6317a95945ace347f975"
+  integrity sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==
   dependencies:
     camelcase-keys "^4.0.0"
     decamelize-keys "^1.0.0"
@@ -4910,20 +5500,24 @@ meow@^4.0.0:
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
 
 merge-source-map@1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz#a5de46538dae84d4114cc5ea02b4772a6346701f"
+  integrity sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=
   dependencies:
     source-map "^0.5.6"
 
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
 micromatch@^2.1.5, micromatch@^2.3.11:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
   dependencies:
     arr-diff "^2.0.0"
     array-unique "^0.2.1"
@@ -4942,6 +5536,7 @@ micromatch@^2.1.5, micromatch@^2.3.11:
 micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -4960,6 +5555,7 @@ micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
   dependencies:
     bn.js "^4.0.0"
     brorand "^1.0.1"
@@ -4967,36 +5563,44 @@ miller-rabin@^4.0.0:
 "mime-db@>= 1.34.0 < 2", mime-db@~1.36.0:
   version "1.36.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
+  integrity sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==
 
 mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
   version "2.1.20"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
+  integrity sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==
   dependencies:
     mime-db "~1.36.0"
 
 mime@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
+  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
 mime@^1.4.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mime@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
+  integrity sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==
 
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
 mimic-response@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
+  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
 
 mini-css-extract-plugin@0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.3.tgz#98d60fcc5d228c3e36a9bd15a1d6816d6580beb8"
+  integrity sha512-Mxs0nxzF1kxPv4TRi2NimewgXlJqh0rGE30vviCU2WHrpbta6wklnUV9dr9FUtoAHmB3p3LeXEC+ZjgHvB0Dzg==
   dependencies:
     loader-utils "^1.1.0"
     schema-utils "^1.0.0"
@@ -5005,20 +5609,24 @@ mini-css-extract-plugin@0.4.3:
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
 minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
 "minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
 minimist-options@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
+  integrity sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==
   dependencies:
     arrify "^1.0.1"
     is-plain-obj "^1.1.0"
@@ -5026,18 +5634,22 @@ minimist-options@^3.0.1:
 minimist@0.0.8:
   version "0.0.8"
   resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
 minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
 minimist@~0.0.1:
   version "0.0.10"
   resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
 minipass@^2.2.1, minipass@^2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
+  integrity sha512-mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==
   dependencies:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
@@ -5045,12 +5657,14 @@ minipass@^2.2.1, minipass@^2.3.3:
 minizlib@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
+  integrity sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==
   dependencies:
     minipass "^2.2.1"
 
 mississippi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
+  integrity sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==
   dependencies:
     concat-stream "^1.5.0"
     duplexify "^3.4.2"
@@ -5066,6 +5680,7 @@ mississippi@^2.0.0:
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
   dependencies:
     concat-stream "^1.5.0"
     duplexify "^3.4.2"
@@ -5081,6 +5696,7 @@ mississippi@^3.0.0:
 mixin-deep@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
@@ -5088,6 +5704,7 @@ mixin-deep@^1.2.0:
 mixin-object@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
+  integrity sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=
   dependencies:
     for-in "^0.1.3"
     is-extendable "^0.1.1"
@@ -5095,16 +5712,19 @@ mixin-object@^2.0.1:
 mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
   version "0.5.1"
   resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
 
 modify-values@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
+  integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
   dependencies:
     aproba "^1.1.1"
     copy-concurrently "^1.0.0"
@@ -5116,18 +5736,22 @@ move-concurrently@^1.0.1:
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
 ms@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
 multicast-dns-service-types@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
+  integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=
 
 multicast-dns@^6.0.1:
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
+  integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==
   dependencies:
     dns-packet "^1.3.1"
     thunky "^1.0.2"
@@ -5135,14 +5759,17 @@ multicast-dns@^6.0.1:
 mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
 nan@^2.10.0, nan@^2.9.2:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.0.tgz#574e360e4d954ab16966ec102c0c049fd961a099"
+  integrity sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -5159,6 +5786,7 @@ nanomatch@^1.2.9:
 needle@^2.2.1:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.3.tgz#c1b04da378cd634d8befe2de965dc2cfb0fd65ca"
+  integrity sha512-GPL22d/U9cai87FcCPO6e+MT3vyHS2j+zwotakDc7kE2DtUAqFKMXLJCTtRp+5S75vXIwQPvIxkvlctxf9q4gQ==
   dependencies:
     debug "^2.1.2"
     iconv-lite "^0.4.4"
@@ -5167,14 +5795,17 @@ needle@^2.2.1:
 negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
+  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
 
 neo-async@^2.5.0:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.2.tgz#489105ce7bc54e709d736b195f82135048c50fcc"
+  integrity sha512-vdqTKI9GBIYcAEbFAcpKPErKINfPF5zIuz3/niBfq8WUZjpT2tytLlFVrBgWdOtqI4uaA/Rb6No0hux39XXDuw==
 
 ng-packagr@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-4.2.0.tgz#9e2babac0402f761c64908996dae99e54a07fe3e"
+  integrity sha512-y1a9DgIMho5bG77WWK/3Tz2Sxe3Vm9zt4c3AMTLFA6+GqukgTHJYwdfcvWzNfi3iPotoAeoMBCKwd5KSOoiU8A==
   dependencies:
     "@ngtools/json-schema" "^1.1.0"
     autoprefixer "^9.0.0"
@@ -5206,24 +5837,22 @@ ng-packagr@^4.2.0:
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-
-no-case@^2.2.0:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
-  dependencies:
-    lower-case "^1.1.1"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 node-fetch@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.2.0.tgz#4ee79bde909262f9775f731e3656d0db55ced5b5"
+  integrity sha512-OayFWziIxiHY8bCUyLX6sTpDH8Jsbp4FfYd1j1f7vZyfgkcOnAyM4oQR16f8a0s7Gl/viMGRey8eScYk4V4EZA==
 
 node-forge@0.7.5:
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
+  integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==
 
 node-gyp@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
+  integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
   dependencies:
     fstream "^1.0.0"
     glob "^7.0.3"
@@ -5241,6 +5870,7 @@ node-gyp@^3.8.0:
 node-libs-browser@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
+  integrity sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==
   dependencies:
     assert "^1.1.1"
     browserify-zlib "^0.2.0"
@@ -5269,6 +5899,7 @@ node-libs-browser@^2.0.0:
 node-pre-gyp@^0.10.0:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
+  integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==
   dependencies:
     detect-libc "^1.0.2"
     mkdirp "^0.5.1"
@@ -5284,18 +5915,21 @@ node-pre-gyp@^0.10.0:
 node-releases@^1.0.0-alpha.11:
   version "1.0.0-alpha.11"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.0-alpha.11.tgz#73c810acc2e5b741a17ddfbb39dfca9ab9359d8a"
+  integrity sha512-CaViu+2FqTNYOYNihXa5uPS/zry92I3vPU4nCB6JB3OeZ2UGtOpF5gRwuN4+m3hbEcL47bOXyun1jX2iC+3uEQ==
   dependencies:
     semver "^5.3.0"
 
 node-sass-tilde-importer@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz#1a15105c153f648323b4347693fdb0f331bad1ce"
+  integrity sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==
   dependencies:
     find-parent-dir "^0.3.0"
 
 node-sass@4.9.3, node-sass@^4.9.3:
   version "4.9.3"
   resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.3.tgz#f407cf3d66f78308bb1e346b24fa428703196224"
+  integrity sha512-XzXyGjO+84wxyH7fV6IwBOTrEBe2f0a6SBze9QWWYR/cL74AcQUks2AsqcCZenl/Fp/JVbuEaLpgrLtocwBUww==
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -5320,12 +5954,14 @@ node-sass@4.9.3, node-sass@^4.9.3:
 "nopt@2 || 3", nopt@3.x:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
   dependencies:
     abbrev "1"
 
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
   dependencies:
     abbrev "1"
     osenv "^0.1.4"
@@ -5333,6 +5969,7 @@ nopt@^4.0.1:
 normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, "normalize-package-data@~1.0.1 || ^2.0.0":
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
+  integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==
   dependencies:
     hosted-git-info "^2.1.4"
     is-builtin-module "^1.0.0"
@@ -5342,20 +5979,24 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-
 normalize-path@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
+  integrity sha1-MtDkcvkf80VwHBWoMRAY07CpA3k=
 
 normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
   dependencies:
     remove-trailing-separator "^1.0.1"
 
 normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
 normalize-url@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
+  integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==
   dependencies:
     prepend-http "^2.0.0"
     query-string "^5.0.1"
@@ -5364,10 +6005,12 @@ normalize-url@2.0.1:
 npm-bundled@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
+  integrity sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==
 
 "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"
+  integrity sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==
   dependencies:
     hosted-git-info "^2.6.0"
     osenv "^0.1.5"
@@ -5377,6 +6020,7 @@ npm-bundled@^1.0.1:
 npm-packlist@^1.1.6:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de"
+  integrity sha512-CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
@@ -5384,6 +6028,7 @@ npm-packlist@^1.1.6:
 npm-registry-client@8.6.0:
   version "8.6.0"
   resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-8.6.0.tgz#7f1529f91450732e89f8518e0f21459deea3e4c4"
+  integrity sha512-Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg==
   dependencies:
     concat-stream "^1.5.2"
     graceful-fs "^4.1.6"
@@ -5402,55 +6047,59 @@ npm-registry-client@8.6.0:
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
   dependencies:
     path-key "^2.0.0"
 
 "npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.0, npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
   dependencies:
     are-we-there-yet "~1.1.2"
     console-control-strings "~1.1.0"
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
-nth-check@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
-  dependencies:
-    boolbase "~1.0.0"
-
 null-check@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd"
+  integrity sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=
 
 num2fraction@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
 
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
 oauth-sign@~0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
 
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
 object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
 object-component@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
+  integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=
 
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
   dependencies:
     copy-descriptor "^0.1.0"
     define-property "^0.2.5"
@@ -5459,27 +6108,24 @@ object-copy@^0.1.0:
 object-inspect@~1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4"
+  integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==
 
-object-keys@^1.0.12, object-keys@^1.0.6:
+object-keys@^1.0.6:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
+  integrity sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==
 
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
   dependencies:
     isobject "^3.0.0"
 
-object.getownpropertydescriptors@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
-  dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.5.1"
-
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
   dependencies:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
@@ -5487,48 +6133,57 @@ object.omit@^2.0.0:
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
   dependencies:
     isobject "^3.0.1"
 
 obuf@^1.0.0, obuf@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
+  integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
 
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
   dependencies:
     ee-first "1.1.1"
 
 on-headers@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
+  integrity sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=
 
 once@1.x, once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
 one-time@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz#f8cdf77884826fe4dff93e3a9cc37b1e4480742e"
+  integrity sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=
 
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
   dependencies:
     mimic-fn "^1.0.0"
 
 opn@5.3.0, opn@^5.1.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
+  integrity sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==
   dependencies:
     is-wsl "^1.1.0"
 
 optimist@^0.6.1, optimist@~0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
   dependencies:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
@@ -5536,6 +6191,7 @@ optimist@^0.6.1, optimist@~0.6.0:
 optionator@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
   dependencies:
     deep-is "~0.1.3"
     fast-levenshtein "~2.0.4"
@@ -5547,30 +6203,36 @@ optionator@^0.8.1:
 optjs@~3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/optjs/-/optjs-3.2.2.tgz#69a6ce89c442a44403141ad2f9b370bd5bb6f4ee"
+  integrity sha1-aabOicRCpEQDFBrS+bNwvVu29O4=
 
 original@>=0.0.5:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
+  integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
   dependencies:
     url-parse "^1.4.3"
 
 os-browserify@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
 os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
 os-locale@^1.4.0:
   version "1.4.0"
   resolved "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
   dependencies:
     lcid "^1.0.0"
 
 os-locale@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
+  integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==
   dependencies:
     execa "^0.7.0"
     lcid "^1.0.0"
@@ -5579,6 +6241,7 @@ os-locale@^2.0.0:
 os-locale@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.0.1.tgz#3b014fbf01d87f60a1e5348d80fe870dc82c4620"
+  integrity sha512-7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==
   dependencies:
     execa "^0.10.0"
     lcid "^2.0.0"
@@ -5587,10 +6250,12 @@ os-locale@^3.0.0:
 os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
 osenv@0, osenv@^0.1.4, osenv@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
@@ -5598,64 +6263,77 @@ osenv@0, osenv@^0.1.4, osenv@^0.1.5:
 p-cancelable@^0.4.0:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"
+  integrity sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==
 
 p-defer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
 
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
 p-is-promise@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
+  integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
 
 p-limit@^1.0.0, p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
   dependencies:
     p-try "^1.0.0"
 
 p-limit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
+  integrity sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==
   dependencies:
     p-try "^2.0.0"
 
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
   dependencies:
     p-limit "^1.1.0"
 
 p-locate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
   dependencies:
     p-limit "^2.0.0"
 
 p-map@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
 
 p-timeout@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
+  integrity sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==
   dependencies:
     p-finally "^1.0.0"
 
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
 
 p-try@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
+  integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
 
 package-json@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
+  integrity sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=
   dependencies:
     got "^6.7.1"
     registry-auth-token "^3.0.1"
@@ -5665,28 +6343,26 @@ package-json@^4.0.0:
 pako@^0.2.5:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
+  integrity sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=
 
 pako@^1.0.6, pako@~1.0.2, pako@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
+  integrity sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==
 
 parallel-transform@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
+  integrity sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=
   dependencies:
     cyclist "~0.2.2"
     inherits "^2.0.3"
     readable-stream "^2.1.5"
 
-param-case@2.1.x:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
-  dependencies:
-    no-case "^2.2.0"
-
 parse-asn1@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
+  integrity sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==
   dependencies:
     asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
@@ -5697,10 +6373,12 @@ parse-asn1@^5.0.0:
 parse-github-repo-url@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"
+  integrity sha1-nn2LslKmy2ukJZUGC3v23z28H1A=
 
 parse-glob@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
   dependencies:
     glob-base "^0.3.0"
     is-dotfile "^1.0.0"
@@ -5710,12 +6388,14 @@ parse-glob@^3.0.4:
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
   dependencies:
     error-ex "^1.2.0"
 
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
   dependencies:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
@@ -5723,6 +6403,7 @@ parse-json@^4.0.0:
 parse5-html-rewriting-stream@5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-5.1.0.tgz#63f92c958764aea8cbe3aa68f2e5895c32068ab8"
+  integrity sha512-hZlaOTHJs4dpC5yFHnOSEMh26ErsqTsLzxKqkuRcUqtiu0kMsBQ9pkgANkECDyoBUhJ3+hvb2DPLsyqbtcS61Q==
   dependencies:
     parse5 "^5.1.0"
     parse5-sax-parser "^5.1.0"
@@ -5730,82 +6411,100 @@ parse5-html-rewriting-stream@5.1.0:
 parse5-sax-parser@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/parse5-sax-parser/-/parse5-sax-parser-5.1.0.tgz#ec234d23223a8054a74ff173aa3dc2da74c5bbd9"
+  integrity sha512-VEhdEDhBkoSILPmsZ96SoIIUow3hZbtgQsqXw7r8DxxnqsCIO0fwkT9mWgBcf9SPjVUh92liuEprHrrYzXBPWQ==
   dependencies:
     parse5 "^5.1.0"
 
 parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
+  integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
 
 parse5@^5.0.0, parse5@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2"
+  integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==
 
 parseqs@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
+  integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=
   dependencies:
     better-assert "~1.0.0"
 
 parser-toolkit@>=0.0.3:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parser-toolkit/-/parser-toolkit-0.0.5.tgz#ec4b61729c86318b56ea971bfba6b3c672d62c01"
+  integrity sha1-7EthcpyGMYtW6pcb+6azxnLWLAE=
 
 parseuri@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
+  integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=
   dependencies:
     better-assert "~1.0.0"
 
 parseurl@~1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
+  integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
 
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
 path-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
+  integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=
 
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
 path-exists@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
   dependencies:
     pinkie-promise "^2.0.0"
 
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
 path-is-inside@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
 
 path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
 path-parse@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
 
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
   dependencies:
     graceful-fs "^4.1.2"
     pify "^2.0.0"
@@ -5814,18 +6513,21 @@ path-type@^1.0.0:
 path-type@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
+  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
   dependencies:
     pify "^2.0.0"
 
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
   dependencies:
     pify "^3.0.0"
 
 pbkdf2@^3.0.3:
   version "3.0.16"
   resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.16.tgz#7404208ec6b01b62d85bf83853a8064f8d9c2a5c"
+  integrity sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -5836,58 +6538,70 @@ pbkdf2@^3.0.3:
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
 pidtree@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.0.tgz#f6fada10fccc9f99bf50e90d0b23d72c9ebc2e6b"
+  integrity sha512-9CT4NFlDcosssyg8KVFltgokyKZIFjoBxw8CTGy+5F38Y1eQWrt8tRayiUOXE+zVKQnYu5BR8JjCtvK3BcnBhg==
 
 pidusage@^2.0.17:
   version "2.0.17"
   resolved "https://registry.yarnpkg.com/pidusage/-/pidusage-2.0.17.tgz#6b4a2b4a09026f0e9828f7e5627837e4c0672581"
+  integrity sha512-N8X5v18rBmlBoArfS83vrnD0gIFyZkXEo7a5pAS2aT0i2OLVymFb2AzVg+v8l/QcXnE1JwZcaXR8daJcoJqtjw==
   dependencies:
     safe-buffer "^5.1.2"
 
 pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
 
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
 pkg-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
   dependencies:
     find-up "^2.1.0"
 
 pkg-dir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
+  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
   dependencies:
     find-up "^3.0.0"
 
 pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
+  integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==
 
 popper.js@^1.14.1:
   version "1.14.4"
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.4.tgz#8eec1d8ff02a5a3a152dd43414a15c7b79fd69b6"
+  integrity sha1-juwdj/AqWjoVLdQ0FKFce3n9abY=
 
 portfinder@1.0.17, portfinder@^1.0.9:
   version "1.0.17"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.17.tgz#a8a1691143e46c4735edefcf4fbcccedad26456a"
+  integrity sha512-syFcRIRzVI1BoEFOCaAiizwDolh1S1YXSodsVhncbhjzjZQulhczNRbqnUl9N31Q4dKGOXsNDqxC2BWBgSMqeQ==
   dependencies:
     async "^1.5.2"
     debug "^2.2.0"
@@ -5896,10 +6610,12 @@ portfinder@1.0.17, portfinder@^1.0.9:
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
 postcss-import@11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-11.1.0.tgz#55c9362c9192994ec68865d224419df1db2981f0"
+  integrity sha512-5l327iI75POonjxkXgdRCUS+AlzAdBx4pOvMEhTKTCjb1p8IEeVR9yx3cPbmN7LIWJLbfnIXxAhoB4jpD0c/Cw==
   dependencies:
     postcss "^6.0.1"
     postcss-value-parser "^3.2.3"
@@ -5909,6 +6625,7 @@ postcss-import@11.1.0:
 postcss-load-config@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.0.0.tgz#f1312ddbf5912cd747177083c5ef7a19d62ee484"
+  integrity sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==
   dependencies:
     cosmiconfig "^4.0.0"
     import-cwd "^2.0.0"
@@ -5916,6 +6633,7 @@ postcss-load-config@^2.0.0:
 postcss-loader@2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.1.6.tgz#1d7dd7b17c6ba234b9bed5af13e0bea40a42d740"
+  integrity sha512-hgiWSc13xVQAq25cVw80CH0l49ZKlAnU1hKPOdRrNj89bokRr/bZF2nT+hebPPF9c9xs8c3gw3Fr2nxtmXYnNg==
   dependencies:
     loader-utils "^1.1.0"
     postcss "^6.0.0"
@@ -5925,6 +6643,7 @@ postcss-loader@2.1.6:
 postcss-url@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-8.0.0.tgz#7b10059bd12929cdbb1971c60f61a0e5af86b4ca"
+  integrity sha512-E2cbOQ5aii2zNHh8F6fk1cxls7QVFZjLPSrqvmiza8OuXLzIpErij8BDS5Y3STPfJgpIMNCPEr8JlKQWEoozUw==
   dependencies:
     mime "^2.3.1"
     minimatch "^3.0.4"
@@ -5935,10 +6654,12 @@ postcss-url@^8.0.0:
 postcss-value-parser@^3.2.3:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
+  integrity sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=
 
 postcss@6.0.23, postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.22:
   version "6.0.23"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
+  integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
   dependencies:
     chalk "^2.4.1"
     source-map "^0.6.1"
@@ -5947,6 +6668,7 @@ postcss@6.0.23, postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.22:
 postcss@^7.0.0, postcss@^7.0.2:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.2.tgz#7b5a109de356804e27f95a960bef0e4d5bc9bb18"
+  integrity sha512-fmaUY5370keLUTx+CnwRxtGiuFTcNBLQBqr1oE3WZ/euIYmGAo0OAgOhVJ3ByDnVmOR3PK+0V9VebzfjRIUcqw==
   dependencies:
     chalk "^2.4.1"
     source-map "^0.6.1"
@@ -5955,57 +6677,61 @@ postcss@^7.0.0, postcss@^7.0.2:
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
 prepend-http@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
+  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
 
 prepend-http@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
+  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
 
 preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-
-pretty-error@^2.0.2:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
-  dependencies:
-    renderkid "^2.0.1"
-    utila "~0.4"
+  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
 process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+  integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
 
 process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
 
 process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
 promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
   dependencies:
     asap "~2.0.3"
 
 promise@~7.0.1:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.0.4.tgz#363e84a4c36c8356b890fed62c91ce85d02ed539"
+  integrity sha1-Nj6EpMNsg1a4kP7WLJHOhdAu1Tk=
   dependencies:
     asap "~2.0.3"
 
 protobufjs@5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.0.tgz#4223063233ea96ac063ca2b554035204db524fa1"
+  integrity sha1-QiMGMjPqlqwGPKK1VANSBNtST6E=
   dependencies:
     ascli "~1"
     bytebuffer "~5"
@@ -6015,6 +6741,7 @@ protobufjs@5.0.0:
 protractor@~5.4.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.4.1.tgz#011a99e38df7aa45d22455b889ffbb13a6ce0bd9"
+  integrity sha512-ORey5ewQMYiXQxcQohsqEiKYOg/r5yJoJbt0tuROmmgajdg/CA3gTOZNIFJncUVMAJIk5YFqBBLUjKVmQO6tfA==
   dependencies:
     "@types/node" "^6.0.46"
     "@types/q" "^0.0.32"
@@ -6036,6 +6763,7 @@ protractor@~5.4.0:
 proxy-addr@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
+  integrity sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==
   dependencies:
     forwarded "~0.1.2"
     ipaddr.js "1.8.0"
@@ -6043,18 +6771,22 @@ proxy-addr@~2.0.3:
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
 pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
 psl@^1.1.24:
   version "1.1.29"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
+  integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==
 
 public-encrypt@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994"
+  integrity sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==
   dependencies:
     bn.js "^4.1.0"
     browserify-rsa "^4.0.0"
@@ -6065,6 +6797,7 @@ public-encrypt@^4.0.0:
 pump@^2.0.0, pump@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
@@ -6072,6 +6805,7 @@ pump@^2.0.0, pump@^2.0.1:
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
@@ -6079,6 +6813,7 @@ pump@^3.0.0:
 pumpify@^1.3.3:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
   dependencies:
     duplexify "^3.6.0"
     inherits "^2.0.3"
@@ -6087,38 +6822,47 @@ pumpify@^1.3.3:
 punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
 
 punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
 punycode@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 q@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
+  integrity sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=
 
 q@^1.4.1, q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
 qjobs@^1.1.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
+  integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
 
 qs@6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
+  integrity sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==
 
 qs@6.5.2, qs@~6.5.1, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
 query-string@^5.0.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
+  integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==
   dependencies:
     decode-uri-component "^0.2.0"
     object-assign "^4.1.0"
@@ -6127,22 +6871,27 @@ query-string@^5.0.1:
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
 
 querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
 querystringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.0.0.tgz#fa3ed6e68eb15159457c89b37bc6472833195755"
+  integrity sha512-eTPo5t/4bgaMNZxyjWx6N2a6AuE0mq51KWvpc7nU/MAqixcI6v6KrGUKES0HaomdnolQBBXU/++X6/QQ9KL4tw==
 
 quick-lru@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
+  integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=
 
 quicktype-core@^5.0.41:
   version "5.0.41"
   resolved "https://registry.yarnpkg.com/quicktype-core/-/quicktype-core-5.0.41.tgz#83f090b1bddeefcff0581e0d9c754d83410ed453"
+  integrity sha512-CImdVo4M4TlDs0McPSql9HnaoG5/Z3w1bQIlAhc95qekxBx+jJ2HNIqXzEkIsvx7W7sIPZhOuCug9fvmqNkMKQ==
   dependencies:
     "@types/urijs" "github:quicktype/types-urijs"
     collection-utils "0.0.15"
@@ -6158,6 +6907,7 @@ quicktype-core@^5.0.41:
 quote-stream@^1.0.1, quote-stream@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/quote-stream/-/quote-stream-1.0.2.tgz#84963f8c9c26b942e153feeb53aae74652b7e0b2"
+  integrity sha1-hJY/jJwmuULhU/7rU6rnRlK34LI=
   dependencies:
     buffer-equal "0.0.1"
     minimist "^1.1.3"
@@ -6166,6 +6916,7 @@ quote-stream@^1.0.1, quote-stream@~1.0.2:
 randomatic@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.0.tgz#36f2ca708e9e567f5ed2ec01949026d50aa10116"
+  integrity sha512-KnGPVE0lo2WoXxIZ7cPR8YBpiol4gsSuOwDSg410oHh80ZMp5EiypNqL2K4Z77vJn6lB5rap7IkAmcUlalcnBQ==
   dependencies:
     is-number "^4.0.0"
     kind-of "^6.0.0"
@@ -6174,12 +6925,14 @@ randomatic@^3.0.0:
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
+  integrity sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==
   dependencies:
     safe-buffer "^5.1.0"
 
 randomfill@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
   dependencies:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
@@ -6187,10 +6940,12 @@ randomfill@^1.0.3:
 range-parser@^1.0.3, range-parser@^1.2.0, range-parser@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
+  integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
 raw-body@2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"
+  integrity sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=
   dependencies:
     bytes "3.0.0"
     http-errors "1.6.2"
@@ -6200,6 +6955,7 @@ raw-body@2.3.2:
 raw-body@2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
+  integrity sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==
   dependencies:
     bytes "3.0.0"
     http-errors "1.6.3"
@@ -6209,10 +6965,12 @@ raw-body@2.3.3:
 raw-loader@0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
+  integrity sha1-DD0L6u2KAclm2Xh793goElKpeao=
 
 rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
   dependencies:
     deep-extend "^0.6.0"
     ini "~1.3.0"
@@ -6222,12 +6980,14 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
 read-cache@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
+  integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=
   dependencies:
     pify "^2.3.0"
 
 read-installed@~4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/read-installed/-/read-installed-4.0.3.tgz#ff9b8b67f187d1e4c29b9feb31f6b223acd19067"
+  integrity sha1-/5uLZ/GH0eTCm5/rMfayI6zRkGc=
   dependencies:
     debuglog "^1.0.1"
     read-package-json "^2.0.0"
@@ -6241,6 +7001,7 @@ read-installed@~4.0.3:
 read-package-json@^2.0.0:
   version "2.0.13"
   resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a"
+  integrity sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==
   dependencies:
     glob "^7.1.1"
     json-parse-better-errors "^1.0.1"
@@ -6252,6 +7013,7 @@ read-package-json@^2.0.0:
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
   dependencies:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
@@ -6259,6 +7021,7 @@ read-pkg-up@^1.0.1:
 read-pkg-up@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
+  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
   dependencies:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
@@ -6266,6 +7029,7 @@ read-pkg-up@^2.0.0:
 read-pkg-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
+  integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=
   dependencies:
     find-up "^2.0.0"
     read-pkg "^3.0.0"
@@ -6273,6 +7037,7 @@ read-pkg-up@^3.0.0:
 read-pkg-up@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
+  integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==
   dependencies:
     find-up "^3.0.0"
     read-pkg "^3.0.0"
@@ -6280,6 +7045,7 @@ read-pkg-up@^4.0.0:
 read-pkg@^1.0.0, read-pkg@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
   dependencies:
     load-json-file "^1.0.0"
     normalize-package-data "^2.3.2"
@@ -6288,6 +7054,7 @@ read-pkg@^1.0.0, read-pkg@^1.1.0:
 read-pkg@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
+  integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
   dependencies:
     load-json-file "^2.0.0"
     normalize-package-data "^2.3.2"
@@ -6296,6 +7063,7 @@ read-pkg@^2.0.0:
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
+  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
   dependencies:
     load-json-file "^4.0.0"
     normalize-package-data "^2.3.2"
@@ -6304,6 +7072,7 @@ read-pkg@^3.0.0:
 "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.0, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -6313,18 +7082,10 @@ read-pkg@^3.0.0:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@1.0:
-  version "1.0.34"
-  resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
 readable-stream@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
+  integrity sha1-j5A0HmilPMySh4jaz80Rs265t44=
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -6336,6 +7097,7 @@ readable-stream@~2.0.6:
 readdir-scoped-modules@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
+  integrity sha1-n6+jfShr5dksuuve4DDcm19AZ0c=
   dependencies:
     debuglog "^1.0.1"
     dezalgo "^1.0.0"
@@ -6345,6 +7107,7 @@ readdir-scoped-modules@^1.0.0:
 readdirp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
+  integrity sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=
   dependencies:
     graceful-fs "^4.1.2"
     minimatch "^3.0.2"
@@ -6354,12 +7117,14 @@ readdirp@^2.0.0:
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
   dependencies:
     resolve "^1.1.6"
 
 redent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
   dependencies:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
@@ -6367,6 +7132,7 @@ redent@^1.0.0:
 redent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
+  integrity sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=
   dependencies:
     indent-string "^3.0.0"
     strip-indent "^2.0.0"
@@ -6374,24 +7140,29 @@ redent@^2.0.0:
 reflect-metadata@^0.1.2:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.12.tgz#311bf0c6b63cd782f228a81abe146a2bfa9c56f2"
+  integrity sha512-n+IyV+nGz3+0q3/Yf1ra12KpCyi001bi4XFxSjbiWWjfqb52iTTtpGXmCCAOWWIAn9KEuFZKGqBERHmrtScZ3A==
 
 regenerate@^1.2.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
+  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
 
 regenerator-runtime@^0.11.0:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
 regex-cache@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
+  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
   dependencies:
     is-equal-shallow "^0.1.3"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
   dependencies:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
@@ -6399,6 +7170,7 @@ regex-not@^1.0.0, regex-not@^1.0.2:
 regexpu-core@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
+  integrity sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=
   dependencies:
     regenerate "^1.2.1"
     regjsgen "^0.2.0"
@@ -6407,6 +7179,7 @@ regexpu-core@^1.0.0:
 registry-auth-token@^3.0.1:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
+  integrity sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==
   dependencies:
     rc "^1.1.6"
     safe-buffer "^5.0.1"
@@ -6414,58 +7187,53 @@ registry-auth-token@^3.0.1:
 registry-url@^3.0.3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
+  integrity sha1-PU74cPc93h138M+aOBQyRE4XSUI=
   dependencies:
     rc "^1.0.1"
 
 regjsgen@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+  integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
 
 regjsparser@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+  integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=
   dependencies:
     jsesc "~0.5.0"
 
-relateurl@0.2.x:
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
-
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-
-renderkid@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.1.tgz#898cabfc8bede4b7b91135a3ffd323e58c0db319"
-  dependencies:
-    css-select "^1.1.0"
-    dom-converter "~0.1"
-    htmlparser2 "~3.3.0"
-    strip-ansi "^3.0.0"
-    utila "~0.3"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
 repeat-element@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
 repeat-string@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae"
+  integrity sha1-x6jTI2BoNiBZp+RlH8aITosftK4=
 
 repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
 repeating@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
   dependencies:
     is-finite "^1.0.0"
 
 request@2.87.0:
   version "2.87.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
+  integrity sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.6.0"
@@ -6491,6 +7259,7 @@ request@2.87.0:
 request@^2.74.0, request@^2.83.0, request@^2.87.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -6516,52 +7285,63 @@ request@^2.74.0, request@^2.83.0, request@^2.87.0:
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
 require-from-string@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
 
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
   dependencies:
     resolve-from "^3.0.0"
 
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
 
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
 resolve@1.1.x, resolve@~1.1.6:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
 resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.5.0:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
+  integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==
   dependencies:
     path-parse "^1.0.5"
 
 responselike@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
+  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
   dependencies:
     lowercase-keys "^1.0.0"
 
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
   dependencies:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
@@ -6569,28 +7349,34 @@ restore-cursor@^2.0.0:
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
 retry@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
+  integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
 
 rfdc@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.2.tgz#e6e72d74f5dc39de8f538f65e00c36c18018e349"
+  integrity sha512-92ktAgvZhBzYTIK0Mja9uen5q5J3NRVMoDkJL2VMwq6SXjVCgqvQeVP2XAaUY6HT+XpQYeLSjb3UoitBryKmdA==
 
 rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
   dependencies:
     glob "^7.0.5"
 
 rimraf@~2.2.6:
   version "2.2.8"
   resolved "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
+  integrity sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=
 
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
   dependencies:
     hash-base "^3.0.0"
     inherits "^2.0.1"
@@ -6598,6 +7384,7 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
 rollup-plugin-commonjs@^9.1.3:
   version "9.1.6"
   resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.1.6.tgz#ad553813c922b71467152794b98f2fd0f195b8a5"
+  integrity sha512-J7GOJm9uzEeLqkVxYSgjyoieh34hATWpa9G2M1ilGzWOLYGfQx5IDQ9ewG8QUj/Z2dzgV+d0/AyloAzElkABAA==
   dependencies:
     estree-walker "^0.5.1"
     magic-string "^0.22.4"
@@ -6607,6 +7394,7 @@ rollup-plugin-commonjs@^9.1.3:
 rollup-plugin-node-resolve@^3.0.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.4.0.tgz#908585eda12e393caac7498715a01e08606abc89"
+  integrity sha512-PJcd85dxfSBWih84ozRtBkB731OjXk0KnzN0oGp7WOWcarAFkVa71cV5hTJg2qpVsV2U8EUwrzHP3tvy9vS3qg==
   dependencies:
     builtin-modules "^2.0.0"
     is-module "^1.0.0"
@@ -6615,6 +7403,7 @@ rollup-plugin-node-resolve@^3.0.0:
 rollup-plugin-sourcemaps@^0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.4.2.tgz#62125aa94087aadf7b83ef4dfaf629b473135e87"
+  integrity sha1-YhJaqUCHqt97g+9N+vYptHMTXoc=
   dependencies:
     rollup-pluginutils "^2.0.1"
     source-map-resolve "^0.5.0"
@@ -6622,6 +7411,7 @@ rollup-plugin-sourcemaps@^0.4.2:
 rollup-pluginutils@^2.0.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.1.tgz#760d185ccc237dedc12d7ae48c6bcd127b4892d0"
+  integrity sha512-JZS8aJMHEHhqmY2QVPMXwKP6lsD1ShkrcGYjhAIvqKKdXQyPHw/9NF0tl3On/xOJ4ACkxfeG7AF+chfCN1NpBg==
   dependencies:
     estree-walker "^0.5.2"
     micromatch "^2.3.11"
@@ -6629,6 +7419,7 @@ rollup-pluginutils@^2.0.1:
 rollup@^0.66.0:
   version "0.66.0"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.66.0.tgz#697acc008f4b613695b17222c7626affddf4a506"
+  integrity sha512-WOkVBSdod3phCSAri5Q579JufeAzJTi43L4oAHzFtjRWJTv2LIszYCU3K9TLMEsVksMY93EwgWCb+hpKRhQwGg==
   dependencies:
     "@types/estree" "0.0.39"
     "@types/node" "*"
@@ -6636,42 +7427,50 @@ rollup@^0.66.0:
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+  integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
   dependencies:
     is-promise "^2.1.0"
 
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
   dependencies:
     aproba "^1.1.1"
 
 rxjs@6.3.3, rxjs@^6.0.0, rxjs@^6.1.0, rxjs@~6.3.0:
   version "6.3.3"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
+  integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==
   dependencies:
     tslib "^1.9.0"
 
 safe-buffer@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
+  integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==
 
 safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
   dependencies:
     ret "~0.1.10"
 
 "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 sass-graph@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
+  integrity sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=
   dependencies:
     glob "^7.0.0"
     lodash "^4.0.0"
@@ -6681,6 +7480,7 @@ sass-graph@^2.2.4:
 sass-loader@7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.1.0.tgz#16fd5138cb8b424bf8a759528a1972d72aad069d"
+  integrity sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==
   dependencies:
     clone-deep "^2.0.1"
     loader-utils "^1.0.1"
@@ -6692,26 +7492,31 @@ sass-loader@7.1.0:
 saucelabs@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-1.5.0.tgz#9405a73c360d449b232839919a86c396d379fd9d"
+  integrity sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==
   dependencies:
     https-proxy-agent "^2.2.1"
 
 sax@0.5.x:
   version "0.5.8"
   resolved "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
+  integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=
 
 sax@>=0.6.0, sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
 schema-utils@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
+  integrity sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=
   dependencies:
     ajv "^5.0.0"
 
 schema-utils@^0.4.0, schema-utils@^0.4.4, schema-utils@^0.4.5:
   version "0.4.7"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
+  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
   dependencies:
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
@@ -6719,6 +7524,7 @@ schema-utils@^0.4.0, schema-utils@^0.4.4, schema-utils@^0.4.5:
 schema-utils@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
+  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
   dependencies:
     ajv "^6.1.0"
     ajv-errors "^1.0.0"
@@ -6727,6 +7533,7 @@ schema-utils@^1.0.0:
 scss-tokenizer@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
+  integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE=
   dependencies:
     js-base64 "^2.1.8"
     source-map "^0.4.2"
@@ -6738,10 +7545,12 @@ seedrandom@^2.4.4:
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
+  integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
 selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz#2ba87a1662c020b8988c981ae62cb2a01298eafc"
+  integrity sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==
   dependencies:
     jszip "^3.1.3"
     rimraf "^2.5.4"
@@ -6751,38 +7560,45 @@ selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
 selfsigned@^1.9.1:
   version "1.10.3"
   resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.3.tgz#d628ecf9e3735f84e8bafba936b3cf85bea43823"
+  integrity sha512-vmZenZ+8Al3NLHkWnhBQ0x6BkML1eCP2xEi3JE+f3D9wW9fipD9NNJHYtE9XJM4TsPaHGZJIamrSI6MTg1dU2Q==
   dependencies:
     node-forge "0.7.5"
 
 semver-diff@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
+  integrity sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=
   dependencies:
     semver "^5.0.3"
 
 semver-dsl@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/semver-dsl/-/semver-dsl-1.0.1.tgz#d3678de5555e8a61f629eed025366ae5f27340a0"
+  integrity sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=
   dependencies:
     semver "^5.3.0"
 
 semver-intersect@1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/semver-intersect/-/semver-intersect-1.4.0.tgz#bdd9c06bedcdd2fedb8cd352c3c43ee8c61321f3"
+  integrity sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==
   dependencies:
     semver "^5.0.0"
 
 "semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", semver@5.5.1, semver@^5.0.0, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.5.0:
   version "5.5.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
+  integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
 
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+  integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
 
 send@0.16.2:
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
+  integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
   dependencies:
     debug "2.6.9"
     depd "~1.1.2"
@@ -6801,10 +7617,12 @@ send@0.16.2:
 serialize-javascript@^1.4.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
+  integrity sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==
 
 serve-index@^1.7.2:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
+  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
   dependencies:
     accepts "~1.3.4"
     batch "0.6.1"
@@ -6817,6 +7635,7 @@ serve-index@^1.7.2:
 serve-static@1.13.2:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
+  integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
   dependencies:
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
@@ -6826,14 +7645,17 @@ serve-static@1.13.2:
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
 set-immediate-shim@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
 
 set-value@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -6843,6 +7665,7 @@ set-value@^0.4.3:
 set-value@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -6852,18 +7675,22 @@ set-value@^2.0.0:
 setimmediate@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
 
 setprototypeof@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
+  integrity sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=
 
 setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.11"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -6871,6 +7698,7 @@ sha.js@^2.4.0, sha.js@^2.4.8:
 shallow-clone@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571"
+  integrity sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==
   dependencies:
     is-extendable "^0.1.1"
     kind-of "^5.0.0"
@@ -6879,20 +7707,24 @@ shallow-clone@^1.0.0:
 shallow-copy@~0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz#415f42702d73d810330292cc5ee86eae1a11a170"
+  integrity sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=
 
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
   dependencies:
     shebang-regex "^1.0.0"
 
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
 shelljs@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.2.tgz#345b7df7763f4c2340d584abb532c5f752ca9e35"
+  integrity sha512-pRXeNrCA2Wd9itwhvLp5LZQvPJ0wU6bcjaTMywHHGX5XWhVN2nzSu7WV0q+oUY7mGK3mgSkDDzP3MgjqdyIgbQ==
   dependencies:
     glob "^7.0.0"
     interpret "^1.0.0"
@@ -6901,24 +7733,29 @@ shelljs@^0.8.1:
 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"
+  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
 simple-swizzle@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
+  integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=
   dependencies:
     is-arrayish "^0.3.1"
 
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
 slide@^1.1.3, slide@~1.1.3:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
+  integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
   dependencies:
     define-property "^1.0.0"
     isobject "^3.0.0"
@@ -6927,12 +7764,14 @@ snapdragon-node@^2.0.1:
 snapdragon-util@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
   dependencies:
     kind-of "^3.2.0"
 
 snapdragon@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
   dependencies:
     base "^0.11.1"
     debug "^2.2.0"
@@ -6946,10 +7785,12 @@ snapdragon@^0.8.1:
 socket.io-adapter@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b"
+  integrity sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=
 
 socket.io-client@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.1.tgz#dcb38103436ab4578ddb026638ae2f21b623671f"
+  integrity sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==
   dependencies:
     backo2 "1.0.2"
     base64-arraybuffer "0.1.5"
@@ -6969,6 +7810,7 @@ socket.io-client@2.1.1:
 socket.io-parser@~3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz#e7c6228b6aa1f814e6148aea325b51aa9499e077"
+  integrity sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==
   dependencies:
     component-emitter "1.2.1"
     debug "~3.1.0"
@@ -6977,6 +7819,7 @@ socket.io-parser@~3.2.0:
 socket.io@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz#a069c5feabee3e6b214a75b40ce0652e1cfb9980"
+  integrity sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==
   dependencies:
     debug "~3.1.0"
     engine.io "~3.2.0"
@@ -6988,6 +7831,7 @@ socket.io@2.1.1:
 sockjs-client@1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.5.tgz#1bb7c0f7222c40f42adf14f4442cbd1269771a83"
+  integrity sha1-G7fA9yIsQPQq3xT0RCy9Eml3GoM=
   dependencies:
     debug "^2.6.6"
     eventsource "0.1.6"
@@ -6999,6 +7843,7 @@ sockjs-client@1.1.5:
 sockjs@0.3.19:
   version "0.3.19"
   resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d"
+  integrity sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==
   dependencies:
     faye-websocket "^0.10.0"
     uuid "^3.0.1"
@@ -7006,20 +7851,24 @@ sockjs@0.3.19:
 sort-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
+  integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=
   dependencies:
     is-plain-obj "^1.0.0"
 
 source-list-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
+  integrity sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==
 
 source-list-map@~0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
+  integrity sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=
 
 source-map-loader@0.2.4:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.4.tgz#c18b0dc6e23bf66f6792437557c569a11e072271"
+  integrity sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==
   dependencies:
     async "^2.5.0"
     loader-utils "^1.1.0"
@@ -7027,6 +7876,7 @@ source-map-loader@0.2.4:
 source-map-resolve@^0.5.0:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
   dependencies:
     atob "^2.1.1"
     decode-uri-component "^0.2.0"
@@ -7037,6 +7887,7 @@ source-map-resolve@^0.5.0:
 source-map-support@0.5.9, source-map-support@^0.5.0, source-map-support@^0.5.3, source-map-support@^0.5.5, source-map-support@~0.5.6:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
+  integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -7044,54 +7895,65 @@ source-map-support@0.5.9, source-map-support@^0.5.0, source-map-support@^0.5.3,
 source-map-support@~0.4.0:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
   dependencies:
     source-map "^0.5.6"
 
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
 source-map@0.1.x:
   version "0.1.43"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
   dependencies:
     amdefine ">=0.0.4"
 
 source-map@0.5.6:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+  integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
 
 source-map@0.7.3:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
 
 source-map@^0.4.2, source-map@~0.4.1:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
   dependencies:
     amdefine ">=0.0.4"
 
 source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
 source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 source-map@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
+  integrity sha1-2rc/vPwrqBm03gO9b26qSBZLP50=
   dependencies:
     amdefine ">=0.0.4"
 
 sourcemap-codec@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz#c8fd92d91889e902a07aee392bdd2c5863958ba2"
+  integrity sha512-hX1eNBNuilj8yfFnECh0DzLgwKpBLMIvmhgEhixXNui8lMLBInTI8Kyxt++RwJnMNu7cAUo635L2+N1TxMJCzA==
 
 spdx-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/spdx-compare/-/spdx-compare-1.0.0.tgz#2c55f117362078d7409e6d7b08ce70a857cd3ed7"
+  integrity sha512-C1mDZOX0hnu0ep9dfmuoi03+eOdDoz2yvK79RxbcrVEG1NO1Ph35yW102DHWKN4pk80nwCgeMmSY5L25VE4D9A==
   dependencies:
     array-find-index "^1.0.2"
     spdx-expression-parse "^3.0.0"
@@ -7100,6 +7962,7 @@ spdx-compare@^1.0.0:
 spdx-correct@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
+  integrity sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
@@ -7107,14 +7970,17 @@ spdx-correct@^3.0.0:
 spdx-exceptions@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-1.0.5.tgz#9d21ac4da4bdb71d060fb74e5a67531d032cbba6"
+  integrity sha1-nSGsTaS9tx0GD7dOWmdTHQMsu6Y=
 
 spdx-exceptions@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
+  integrity sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==
 
 spdx-expression-parse@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
+  integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
@@ -7122,18 +7988,22 @@ spdx-expression-parse@^3.0.0:
 spdx-license-ids@^1.0.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+  integrity sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=
 
 spdx-license-ids@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz#e2a303236cac54b04031fa7a5a79c7e701df852f"
+  integrity sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w==
 
 spdx-ranges@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/spdx-ranges/-/spdx-ranges-2.0.0.tgz#257686798e5edb41d45c1aba3d3f1bb47af8d5ec"
+  integrity sha512-AUUXLfqkwD7GlzZkXv8ePPCpPjeVWI9xJCfysL8re/uKb6H10umMnC7bFRsHmLJan4fslUtekAgpHlSgLc/7mA==
 
 spdx-satisfies@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/spdx-satisfies/-/spdx-satisfies-4.0.0.tgz#ebc79eec88b68ac75618e2e5ee94fbc347587552"
+  integrity sha512-OcARj6U1OuVv98SVrRqgrR30sVocONtoPpnX8Xz4vXNrFVedqtbgkA+0KmQoXIQ2xjfltPPRVIMeNzKEFLWWKQ==
   dependencies:
     spdx-compare "^1.0.0"
     spdx-expression-parse "^3.0.0"
@@ -7142,6 +8012,7 @@ spdx-satisfies@^4.0.0:
 spdx@^0.5.1:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/spdx/-/spdx-0.5.2.tgz#76a428b9b97e7904ef83e62a4af0d06fdb50c265"
+  integrity sha512-WQbfCQT2uKLsDllnO9ItpcGUiiF1O/ZvBGCyqFZRg122HgiZubpwpZiM7BkmH19HC3XR3Z+DFMGJNzXSPebG8A==
   dependencies:
     spdx-exceptions "^1.0.0"
     spdx-license-ids "^1.0.0"
@@ -7149,6 +8020,7 @@ spdx@^0.5.1:
 spdy-transport@^2.0.18:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-2.1.0.tgz#4bbb15aaffed0beefdd56ad61dbdc8ba3e2cb7a1"
+  integrity sha512-bpUeGpZcmZ692rrTiqf9/2EUakI6/kXX1Rpe0ib/DyOzbiexVfXkw6GnvI9hVGvIwVaUhkaBojjCZwLNRGQg1g==
   dependencies:
     debug "^2.6.8"
     detect-node "^2.0.3"
@@ -7161,6 +8033,7 @@ spdy-transport@^2.0.18:
 spdy@^3.4.1:
   version "3.4.7"
   resolved "https://registry.yarnpkg.com/spdy/-/spdy-3.4.7.tgz#42ff41ece5cc0f99a3a6c28aabb73f5c3b03acbc"
+  integrity sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=
   dependencies:
     debug "^2.6.8"
     handle-thing "^1.2.5"
@@ -7172,38 +8045,45 @@ spdy@^3.4.1:
 speed-measure-webpack-plugin@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.2.3.tgz#de170b5cefbfa1c039d95e639edd3ad50cfc7c48"
+  integrity sha512-p+taQ69VkRUXYMoZOx2nxV/Tz8tt79ahctoZJyJDHWP7fEYvwFNf5Pd73k5kZ6auu0pTsPNLEUwWpM8mCk85Zw==
   dependencies:
     chalk "^2.0.1"
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
   dependencies:
     extend-shallow "^3.0.0"
 
 split2@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493"
+  integrity sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==
   dependencies:
     through2 "^2.0.2"
 
 split@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
+  integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==
   dependencies:
     through "2"
 
 sprintf-js@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.1.tgz#36be78320afe5801f6cea3ee78b6e5aab940ea0c"
+  integrity sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw=
 
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 sshpk@^1.7.0:
   version "1.14.2"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
+  integrity sha1-xvxhZIo9nE52T9P8306hBeSSupg=
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -7219,28 +8099,33 @@ sshpk@^1.7.0:
 ssri@^5.2.4:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
+  integrity sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==
   dependencies:
     safe-buffer "^5.1.1"
 
 ssri@^6.0.0:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
+  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
   dependencies:
     figgy-pudding "^3.5.1"
 
 stack-trace@0.0.x:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
+  integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
 
 static-eval@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.0.tgz#0e821f8926847def7b4b50cda5d55c04a9b13864"
+  integrity sha512-6flshd3F1Gwm+Ksxq463LtFd1liC77N/PX1FVVc3OzL3hAmo2fwHFbuArkcfi7s9rTNsLEhcRmXGFZhlgy40uw==
   dependencies:
     escodegen "^1.8.1"
 
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
   dependencies:
     define-property "^0.2.5"
     object-copy "^0.1.0"
@@ -7248,6 +8133,7 @@ static-extend@^0.1.1:
 static-module@^2.2.0:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/static-module/-/static-module-2.2.5.tgz#bd40abceae33da6b7afb84a0e4329ff8852bfbbf"
+  integrity sha512-D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ==
   dependencies:
     concat-stream "~1.6.0"
     convert-source-map "^1.5.1"
@@ -7267,30 +8153,36 @@ static-module@^2.2.0:
 stats-webpack-plugin@0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/stats-webpack-plugin/-/stats-webpack-plugin-0.7.0.tgz#ccffe9b745de8bbb155571e063f8263fc0e2bc06"
+  integrity sha512-NT0YGhwuQ0EOX+uPhhUcI6/+1Sq/pMzNuSCBVT4GbFl/ac6I/JZefBcjlECNfAb1t3GOx5dEj1Z7x0cAxeeVLQ==
   dependencies:
     lodash "^4.17.4"
 
 "statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
 statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
+  integrity sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=
 
 statuses@~1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
+  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
 
 stdout-stream@^1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
+  integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==
   dependencies:
     readable-stream "^2.0.1"
 
 stream-browserify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
+  integrity sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=
   dependencies:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
@@ -7298,6 +8190,7 @@ stream-browserify@^2.0.1:
 stream-each@^1.1.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
+  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
   dependencies:
     end-of-stream "^1.1.0"
     stream-shift "^1.0.0"
@@ -7305,6 +8198,7 @@ stream-each@^1.1.0:
 stream-http@^2.7.2:
   version "2.8.3"
   resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
+  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
   dependencies:
     builtin-status-codes "^3.0.0"
     inherits "^2.0.1"
@@ -7315,16 +8209,19 @@ stream-http@^2.7.2:
 stream-json@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/stream-json/-/stream-json-0.5.2.tgz#f4256c0ef1a905f2ef2d473706b4b3ff827653cf"
+  integrity sha512-/QlOLybrc6LkH/oVgXo1lJ8oemRIze/grdpfssLn1Pm8nZVhW4VMOqDDYGaORPodQFxiDEUquQJER5LiBu8Ehg==
   dependencies:
     parser-toolkit ">=0.0.3"
 
 stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
+  integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
 
 streamroller@0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-0.7.0.tgz#a1d1b7cf83d39afb0d63049a5acbf93493bdf64b"
+  integrity sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==
   dependencies:
     date-format "^1.2.0"
     debug "^3.1.0"
@@ -7334,10 +8231,12 @@ streamroller@0.7.0:
 strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
 
 string-to-stream@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string-to-stream/-/string-to-stream-1.1.1.tgz#aba78f73e70661b130ee3e1c0192be4fef6cb599"
+  integrity sha512-QySF2+3Rwq0SdO3s7BAp4x+c3qsClpPQ6abAmb0DGViiSBAkT5kL6JT2iyzEVP+T1SmzHrQD1TwlP9QAHCc+Sw==
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.1.0"
@@ -7345,6 +8244,7 @@ string-to-stream@^1.1.0:
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
   dependencies:
     code-point-at "^1.0.0"
     is-fullwidth-code-point "^1.0.0"
@@ -7353,6 +8253,7 @@ string-width@^1.0.1, string-width@^1.0.2:
 "string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
   dependencies:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
@@ -7360,56 +8261,67 @@ string-width@^1.0.1, string-width@^1.0.2:
 string_decoder@^1.0.0, string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
     safe-buffer "~5.1.0"
 
 string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
   dependencies:
     ansi-regex "^3.0.0"
 
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
   dependencies:
     is-utf8 "^0.2.0"
 
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
 strip-indent@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
   dependencies:
     get-stdin "^4.0.1"
 
 strip-indent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
+  integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=
 
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
 style-loader@0.23.0:
   version "0.23.0"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.0.tgz#8377fefab68416a2e05f1cabd8c3a3acfcce74f1"
+  integrity sha512-uCcN7XWHkqwGVt7skpInW6IGO1tG6ReyFQ1Cseh0VcN6VdcFQi62aG/2F3Y9ueA8x4IVlfaSUxpmQXQD9QrEuQ==
   dependencies:
     loader-utils "^1.1.0"
     schema-utils "^0.4.5"
@@ -7417,6 +8329,7 @@ style-loader@0.23.0:
 stylus-loader@3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-3.0.2.tgz#27a706420b05a38e038e7cacb153578d450513c6"
+  integrity sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==
   dependencies:
     loader-utils "^1.0.2"
     lodash.clonedeep "^4.5.0"
@@ -7425,6 +8338,7 @@ stylus-loader@3.0.2:
 stylus@0.54.5, stylus@^0.54.5:
   version "0.54.5"
   resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
+  integrity sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=
   dependencies:
     css-parse "1.7.x"
     debug "*"
@@ -7436,34 +8350,41 @@ stylus@0.54.5, stylus@^0.54.5:
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
 supports-color@^3.1.0:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
   dependencies:
     has-flag "^1.0.0"
 
 supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
 symbol-observable@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
+  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
 tapable@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
+  integrity sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg==
 
 tapable@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c"
+  integrity sha512-IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA==
 
 tar@^2.0.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+  integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
   dependencies:
     block-stream "*"
     fstream "^1.0.2"
@@ -7472,6 +8393,7 @@ tar@^2.0.0:
 tar@^4, tar@^4.4.4:
   version "4.4.6"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
+  integrity sha512-tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg==
   dependencies:
     chownr "^1.0.1"
     fs-minipass "^1.2.5"
@@ -7484,6 +8406,7 @@ tar@^4, tar@^4.4.4:
 temp@^0.8.3:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59"
+  integrity sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=
   dependencies:
     os-tmpdir "^1.0.0"
     rimraf "~2.2.6"
@@ -7491,12 +8414,14 @@ temp@^0.8.3:
 term-size@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
+  integrity sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=
   dependencies:
     execa "^0.7.0"
 
 terser-webpack-plugin@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.1.0.tgz#cf7c25a1eee25bf121f4a587bb9e004e3f80e528"
+  integrity sha512-61lV0DSxMAZ8AyZG7/A4a3UPlrbOBo8NIQ4tJzLPAdGOQ+yoNC7l5ijEow27lBAL2humer01KLS6bGIMYQxKoA==
   dependencies:
     cacache "^11.0.2"
     find-cache-dir "^2.0.0"
@@ -7510,6 +8435,7 @@ terser-webpack-plugin@1.1.0:
 terser@^3.8.1:
   version "3.8.2"
   resolved "https://registry.yarnpkg.com/terser/-/terser-3.8.2.tgz#48b880f949f8d038aca4dfd00a37c53d96ecf9fb"
+  integrity sha512-FGSBXiBJe2TSXy6pWwXpY0YcEWEK35UKL64BBbxX3aHqM4Nj0RMqXvqBuoSGfyd80t8MKQ5JwYm5jRRGTSEFNg==
   dependencies:
     commander "~2.17.1"
     source-map "~0.6.1"
@@ -7518,14 +8444,17 @@ terser@^3.8.1:
 text-extensions@^1.0.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.8.0.tgz#6f343c62268843019b21a616a003557bdb952d2b"
+  integrity sha512-mVzjRxuWnDKs/qH1rbOJEVHLlSX9kty9lpi7lMvLgU9S74mQ8/Ozg9UPcKxShh0qG2NZ+NyPOPpcZU4C1Eld9A==
 
 text-hex@1.0.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5"
+  integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==
 
 through2@^2.0.0, through2@^2.0.2, through2@^2.0.3, through2@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
+  integrity sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=
   dependencies:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
@@ -7533,62 +8462,75 @@ through2@^2.0.0, through2@^2.0.2, through2@^2.0.3, through2@~2.0.3:
 through@2, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
 thunky@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.2.tgz#a862e018e3fb1ea2ec3fce5d55605cf57f247371"
+  integrity sha1-qGLgGOP7HqLsP85dVWBc9X8kc3E=
 
 timed-out@^4.0.0, timed-out@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
+  integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
 
 timers-browserify@^2.0.4:
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
+  integrity sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==
   dependencies:
     setimmediate "^1.0.4"
 
 tiny-inflate@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.2.tgz#93d9decffc8805bd57eae4310f0b745e9b6fb3a7"
+  integrity sha1-k9nez/yIBb1X6uQxDwt0Xptvs6c=
 
 tmp@0.0.30:
   version "0.0.30"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.30.tgz#72419d4a8be7d6ce75148fd8b324e593a711c2ed"
+  integrity sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=
   dependencies:
     os-tmpdir "~1.0.1"
 
 tmp@0.0.33, tmp@0.0.x, tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
   dependencies:
     os-tmpdir "~1.0.2"
 
 to-array@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
+  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
 
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
 to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
 
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
   dependencies:
     kind-of "^3.0.2"
 
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
   dependencies:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
@@ -7596,25 +8538,24 @@ to-regex-range@^2.1.0:
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
   dependencies:
     define-property "^2.0.2"
     extend-shallow "^3.0.2"
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-toposort@^1.0.0:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
-
 tough-cookie@~2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
+  integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==
   dependencies:
     punycode "^1.4.1"
 
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
+  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
   dependencies:
     psl "^1.1.24"
     punycode "^1.4.1"
@@ -7622,40 +8563,49 @@ tough-cookie@~2.4.3:
 tree-kill@1.2.0, tree-kill@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36"
+  integrity sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==
 
 treeify@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/treeify/-/treeify-1.1.0.tgz#4e31c6a463accd0943879f30667c4fdaff411bb8"
+  integrity sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A==
 
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
 
 trim-newlines@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
+  integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=
 
 trim-off-newlines@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
+  integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM=
 
 trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+  integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
 
 triple-beam@^1.2.0, triple-beam@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9"
+  integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==
 
 "true-case-path@^1.0.2":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
+  integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==
   dependencies:
     glob "^7.1.2"
 
 ts-node@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-5.0.1.tgz#78e5d1cb3f704de1b641e43b76be2d4094f06f81"
+  integrity sha512-XK7QmDcNHVmZkVtkiwNDWiERRHPyU8nBqZB1+iv2UhOG0q3RQ9HsZ2CMqISlFbxjrYFGfG2mX7bW4dAyxBVzUw==
   dependencies:
     arrify "^1.0.0"
     chalk "^2.3.0"
@@ -7669,6 +8619,7 @@ ts-node@^5.0.0:
 tsickle@0.32.1, tsickle@>=0.27.3:
   version "0.32.1"
   resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.32.1.tgz#f16e94ba80b32fc9ebe320dc94fbc2ca7f3521a5"
+  integrity sha512-JW9j+W0SaMSZGejIFZBk0AiPfnhljK3oLx5SaqxrJhjlvzFyPml5zqG1/PuScUj6yTe1muEqwk5CnDK0cOZmKw==
   dependencies:
     jasmine-diff "^0.1.3"
     minimist "^1.2.0"
@@ -7679,20 +8630,24 @@ tsickle@0.32.1, tsickle@>=0.27.3:
 tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
+  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
 tslint-no-circular-imports@^0.5.0:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/tslint-no-circular-imports/-/tslint-no-circular-imports-0.5.2.tgz#47ac9194ec531101ac19198d5144f7ac9f57d980"
+  integrity sha512-Uzu2NiVX7b/kAk9vPrLqUmoCkth0dXUUNOaqwfxpvYgsHfoH67cmj0IHOUMZ1bC0swksJjaTyq7acHe/gU8H4A==
 
 tslint-sonarts@^1.7.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/tslint-sonarts/-/tslint-sonarts-1.8.0.tgz#80f2e8addd418c3b8807fc0155dec33b5a81e8d1"
+  integrity sha512-tpijO5VR18e+Ny99uMNNov3Hw7diiYQ8KoJkezpHGw9hSFFrO5g2PhwdQQo7O9puhJKMIutLl9g+ICMgg+bh0w==
   dependencies:
     immutable "^3.8.2"
 
 tslint@^5.11.0:
   version "5.11.0"
   resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.11.0.tgz#98f30c02eae3cde7006201e4c33cb08b48581eed"
+  integrity sha1-mPMMAurjzecAYgHkwzywi0hYHu0=
   dependencies:
     babel-code-frame "^6.22.0"
     builtin-modules "^1.1.1"
@@ -7710,38 +8665,45 @@ tslint@^5.11.0:
 tsutils@2.20.0:
   version "2.20.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.20.0.tgz#303394064bc80be8ee04e10b8609ae852e9312d3"
+  integrity sha512-qPOBy1/hwLdBxh/TNIpim5qL1WRMR0tgVGBB6shjnpw6/SuS5ZKYyXXxKDYsMsMtVdFOcL+XPGZVEuc+eCOo4A==
   dependencies:
     tslib "^1.8.1"
 
 tsutils@^2.27.2:
   version "2.29.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
+  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
   dependencies:
     tslib "^1.8.1"
 
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
   dependencies:
     safe-buffer "^5.0.1"
 
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
   dependencies:
     prelude-ls "~1.1.2"
 
 type-is@~1.6.15, type-is@~1.6.16:
   version "1.6.16"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
+  integrity sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==
   dependencies:
     media-typer "0.3.0"
     mime-types "~2.1.18"
@@ -7749,21 +8711,25 @@ type-is@~1.6.15, type-is@~1.6.16:
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
 typescript@3.1.1, typescript@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.1.tgz#3362ba9dd1e482ebb2355b02dfe8bcd19a2c7c96"
+  integrity sha512-Veu0w4dTc/9wlWNf2jeRInNodKlcdLgemvPsrNpfu5Pq39sgfFjvIIgTsvUHCoLBnMhPoUA+tFxsXjU6VexVRQ==
 
 uglify-es@^3.3.4:
   version "3.3.9"
   resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
+  integrity sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==
   dependencies:
     commander "~2.13.0"
     source-map "~0.6.1"
 
-uglify-js@3.4.x, uglify-js@^3.0.7, uglify-js@^3.1.4:
+uglify-js@^3.0.7, uglify-js@^3.1.4:
   version "3.4.9"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
+  integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==
   dependencies:
     commander "~2.17.1"
     source-map "~0.6.1"
@@ -7771,6 +8737,7 @@ uglify-js@3.4.x, uglify-js@^3.0.7, uglify-js@^3.1.4:
 uglifyjs-webpack-plugin@^1.2.4:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz#75f548160858163a08643e086d5fefe18a5d67de"
+  integrity sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==
   dependencies:
     cacache "^10.0.4"
     find-cache-dir "^1.0.0"
@@ -7784,6 +8751,7 @@ uglifyjs-webpack-plugin@^1.2.4:
 ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
+  integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
 
 "unicode-properties@github:quicktype/unicode-properties#dist":
   version "1.1.0"
@@ -7795,6 +8763,7 @@ ultron@~1.1.0:
 unicode-trie@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/unicode-trie/-/unicode-trie-0.3.1.tgz#d671dddd89101a08bac37b6a5161010602052085"
+  integrity sha1-1nHd3YkQGgi6w3tqUWEBBgIFIIU=
   dependencies:
     pako "^0.2.5"
     tiny-inflate "^1.0.0"
@@ -7802,6 +8771,7 @@ unicode-trie@^0.3.0:
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
   dependencies:
     arr-union "^3.1.0"
     get-value "^2.0.6"
@@ -7811,32 +8781,38 @@ union-value@^1.0.0:
 unique-filename@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.0.tgz#d05f2fe4032560871f30e93cbe735eea201514f3"
+  integrity sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=
   dependencies:
     unique-slug "^2.0.0"
 
 unique-slug@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.0.tgz#db6676e7c7cc0629878ff196097c78855ae9f4ab"
+  integrity sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=
   dependencies:
     imurmurhash "^0.1.4"
 
 unique-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
+  integrity sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=
   dependencies:
     crypto-random-string "^1.0.0"
 
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
   dependencies:
     has-value "^0.3.1"
     isobject "^3.0.0"
@@ -7844,14 +8820,17 @@ unset-value@^1.0.0:
 unzip-response@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
+  integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
 
 upath@^1.0.5:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
+  integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==
 
 update-notifier@^2.3.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6"
+  integrity sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==
   dependencies:
     boxen "^1.2.1"
     chalk "^2.0.1"
@@ -7864,43 +8843,46 @@ update-notifier@^2.3.0:
     semver-diff "^2.0.0"
     xdg-basedir "^3.0.0"
 
-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@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
   dependencies:
     punycode "^2.1.0"
 
 urijs@^1.19.1:
   version "1.19.1"
   resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.1.tgz#5b0ff530c0cbde8386f6342235ba5ca6e995d25a"
+  integrity sha512-xVrGVi94ueCJNrBSTjWqjvtgvl3cyOTThp2zaMaFNGp3F542TR6sM3f2o8RqZl+AwteClSVmoCyt0ka4RjQOQg==
 
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
 url-join@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.0.tgz#4d3340e807d3773bda9991f8305acdcc2a665d2a"
+  integrity sha1-TTNA6AfTdzvamZH4MFrNzCpmXSo=
 
 url-parse-lax@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
+  integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=
   dependencies:
     prepend-http "^1.0.1"
 
 url-parse-lax@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
+  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
   dependencies:
     prepend-http "^2.0.0"
 
 url-parse@^1.1.8, url-parse@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.3.tgz#bfaee455c889023219d757e045fa6a684ec36c15"
+  integrity sha512-rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==
   dependencies:
     querystringify "^2.0.0"
     requires-port "^1.0.0"
@@ -7908,10 +8890,12 @@ url-parse@^1.1.8, url-parse@^1.4.3:
 url-to-options@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
+  integrity sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=
 
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
   dependencies:
     punycode "1.3.2"
     querystring "0.2.0"
@@ -7919,10 +8903,12 @@ url@^0.11.0:
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
 useragent@2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.2.1.tgz#cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"
+  integrity sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=
   dependencies:
     lru-cache "2.2.x"
     tmp "0.0.x"
@@ -7930,49 +8916,41 @@ useragent@2.2.1:
 util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
 util-extend@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f"
-
-util.promisify@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
-  dependencies:
-    define-properties "^1.1.2"
-    object.getownpropertydescriptors "^2.0.3"
+  integrity sha1-p8IW0mdUUWljeztu3GypEZ4v+T8=
 
 util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
   dependencies:
     inherits "2.0.1"
 
 util@^0.10.3:
   version "0.10.4"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
+  integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
   dependencies:
     inherits "2.0.3"
 
-utila@~0.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/utila/-/utila-0.3.3.tgz#d7e8e7d7e309107092b05f8d9688824d633a4226"
-
-utila@~0.4:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
-
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
 uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
@@ -7980,16 +8958,19 @@ validate-npm-package-license@^3.0.1:
 validate-npm-package-name@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34=
   dependencies:
     builtins "^1.0.3"
 
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
   dependencies:
     assert-plus "^1.0.0"
     core-util-is "1.0.2"
@@ -7998,20 +8979,24 @@ verror@1.10.0:
 vlq@^0.2.2:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
+  integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==
 
 vm-browserify@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
+  integrity sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=
   dependencies:
     indexof "0.0.1"
 
 void-elements@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
+  integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
 
 watchpack@^1.5.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
+  integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==
   dependencies:
     chokidar "^2.0.2"
     graceful-fs "^4.1.2"
@@ -8020,12 +9005,14 @@ watchpack@^1.5.0:
 wbuf@^1.1.0, wbuf@^1.7.2:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
+  integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
   dependencies:
     minimalistic-assert "^1.0.0"
 
 webdriver-js-extender@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz#57d7a93c00db4cc8d556e4d3db4b5db0a80c3bb7"
+  integrity sha512-lcUKrjbBfCK6MNsh7xaY2UAUmZwe+/ib03AjVOpFobX4O7+83BUveSrLfU0Qsyb1DaKJdQRbuU+kM9aZ6QUhiQ==
   dependencies:
     "@types/selenium-webdriver" "^3.0.0"
     selenium-webdriver "^3.0.1"
@@ -8033,6 +9020,7 @@ webdriver-js-extender@2.1.0:
 webdriver-manager@^12.0.6:
   version "12.1.0"
   resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.0.tgz#f6601e52de5f0c97fc7024c889eeb2416f2f1d9d"
+  integrity sha512-oEc5fmkpz6Yh6udhwir5m0eN5mgRPq9P/NU5YWuT3Up5slt6Zz+znhLU7q4+8rwCZz/Qq3Fgpr/4oao7NPCm2A==
   dependencies:
     adm-zip "^0.4.9"
     chalk "^1.1.1"
@@ -8049,6 +9037,7 @@ webdriver-manager@^12.0.6:
 webpack-core@^0.6.8:
   version "0.6.9"
   resolved "https://registry.yarnpkg.com/webpack-core/-/webpack-core-0.6.9.tgz#fc571588c8558da77be9efb6debdc5a3b172bdc2"
+  integrity sha1-/FcViMhVjad76e+23r3Fo7FyvcI=
   dependencies:
     source-list-map "~0.1.7"
     source-map "~0.4.1"
@@ -8056,6 +9045,7 @@ webpack-core@^0.6.8:
 webpack-dev-middleware@3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.2.0.tgz#a20ceef194873710052da678f3c6ee0aeed92552"
+  integrity sha512-YJLMF/96TpKXaEQwaLEo+Z4NDK8aV133ROF6xp9pe3gQoS7sxfpXh4Rv9eC+8vCvWfmDjRQaMSlRPbO+9G6jgA==
   dependencies:
     loud-rejection "^1.6.0"
     memory-fs "~0.4.1"
@@ -8068,6 +9058,7 @@ webpack-dev-middleware@3.2.0:
 webpack-dev-middleware@3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.3.0.tgz#8104daf4d4f65defe06ee2eaaeea612a7c541462"
+  integrity sha512-5C5gXtOo1I6+0AEg4UPglYEtu3Rai6l5IiO6aUu65scHXz29dc3oIWMiRwvcNLXgL0HwRkRxa9N02ZjFt4hY8w==
   dependencies:
     loud-rejection "^1.6.0"
     memory-fs "~0.4.1"
@@ -8079,6 +9070,7 @@ webpack-dev-middleware@3.3.0:
 webpack-dev-server@3.1.8, webpack-dev-server@^3.1.4:
   version "3.1.8"
   resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.8.tgz#eb7a95945d1108170f902604fb3b939533d9daeb"
+  integrity sha512-c+tcJtDqnPdxCAzEEZKdIPmg3i5i7cAHe+B+0xFNK0BlCc2HF/unYccbU7xTgfGc5xxhCztCQzFmsqim+KhI+A==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
@@ -8112,6 +9104,7 @@ webpack-dev-server@3.1.8, webpack-dev-server@^3.1.4:
 webpack-log@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
+  integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
   dependencies:
     ansi-colors "^3.0.0"
     uuid "^3.3.2"
@@ -8119,12 +9112,14 @@ webpack-log@^2.0.0:
 webpack-merge@4.1.4:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.4.tgz#0fde38eabf2d5fd85251c24a5a8c48f8a3f4eb7b"
+  integrity sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==
   dependencies:
     lodash "^4.17.5"
 
 webpack-sources@1.2.0, webpack-sources@^1.1.0, webpack-sources@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.2.0.tgz#18181e0d013fce096faf6f8e6d41eeffffdceac2"
+  integrity sha512-9BZwxR85dNsjWz3blyxdOhTgtnQvv3OEs5xofI0wPYTwu5kaWxS08UuD1oI7WLBLpRO+ylf0ofnXLXWmGb2WMw==
   dependencies:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
@@ -8132,12 +9127,14 @@ webpack-sources@1.2.0, webpack-sources@^1.1.0, webpack-sources@^1.2.0:
 webpack-subresource-integrity@1.1.0-rc.6:
   version "1.1.0-rc.6"
   resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz#37f6f1264e1eb378e41465a98da80fad76ab8886"
+  integrity sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==
   dependencies:
     webpack-core "^0.6.8"
 
 webpack@4.19.1, webpack@^4.0.0, webpack@^4.6.0:
   version "4.19.1"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.19.1.tgz#096674bc3b573f8756c762754366e5b333d6576f"
+  integrity sha512-j7Q/5QqZRqIFXJvC0E59ipLV5Hf6lAnS3ezC3I4HMUybwEDikQBVad5d+IpPtmaQPQArvgUZLXIN6lWijHBn4g==
   dependencies:
     "@webassemblyjs/ast" "1.7.6"
     "@webassemblyjs/helper-module-context" "1.7.6"
@@ -8167,6 +9164,7 @@ webpack@4.19.1, webpack@^4.0.0, webpack@^4.6.0:
 websocket-driver@>=0.5.1:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
+  integrity sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=
   dependencies:
     http-parser-js ">=0.4.0"
     websocket-extensions ">=0.1.1"
@@ -8174,44 +9172,53 @@ websocket-driver@>=0.5.1:
 websocket-extensions@>=0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
+  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
 
 when@~3.6.x:
   version "3.6.4"
   resolved "https://registry.yarnpkg.com/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e"
+  integrity sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=
 
 which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+  integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
 
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
 which@1, which@^1.1.1, which@^1.2.1, which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
 wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
   dependencies:
     string-width "^1.0.2 || 2"
 
 widest-line@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.0.tgz#0142a4e8a243f8882c0233aa0e0281aa76152273"
+  integrity sha1-AUKk6KJD+IgsAjOqDgKBqnYVInM=
   dependencies:
     string-width "^2.1.1"
 
 window-size@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
+  integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=
 
 winston-transport@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.2.0.tgz#a20be89edf2ea2ca39ba25f3e50344d73e6520e5"
+  integrity sha512-0R1bvFqxSlK/ZKTH86nymOuKv/cT1PQBMuDdA7k7f0S9fM44dNH6bXnuxwXPrN8lefJgtZq08BKdyZ0DZIy/rg==
   dependencies:
     readable-stream "^2.3.6"
     triple-beam "^1.2.0"
@@ -8219,6 +9226,7 @@ winston-transport@^4.2.0:
 winston@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/winston/-/winston-3.1.0.tgz#80724376aef164e024f316100d5b178d78ac5331"
+  integrity sha512-FsQfEE+8YIEeuZEYhHDk5cILo1HOcWkGwvoidLrDgPog0r4bser1lEIOco2dN9zpDJ1M88hfDgZvxe5z4xNcwg==
   dependencies:
     async "^2.6.0"
     diagnostics "^1.1.1"
@@ -8233,20 +9241,24 @@ winston@^3.0.0:
 wordwrap@^1.0.0, wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
 worker-farm@^1.5.2:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
+  integrity sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==
   dependencies:
     errno "~0.1.7"
 
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -8254,10 +9266,12 @@ wrap-ansi@^2.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 write-file-atomic@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
+  integrity sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
@@ -8266,6 +9280,7 @@ write-file-atomic@^2.0.0:
 ws@~3.3.1:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
+  integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==
   dependencies:
     async-limiter "~1.0.0"
     safe-buffer "~5.1.0"
@@ -8274,14 +9289,17 @@ ws@~3.3.1:
 xdg-basedir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
+  integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=
 
 xhr2@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.4.tgz#7f87658847716db5026323812f818cadab387a5f"
+  integrity sha1-f4dliEdxbbUCYyOBL4GMras4el8=
 
 xml2js@^0.4.17:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
+  integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==
   dependencies:
     sax ">=0.6.0"
     xmlbuilder "~9.0.1"
@@ -8289,62 +9307,75 @@ xml2js@^0.4.17:
 xmlbuilder@~9.0.1:
   version "9.0.7"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
+  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
 
 xmlhttprequest-ssl@~1.5.4:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
+  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
 
 xregexp@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
+  integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
 
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
 
 xxhashjs@^0.2.1:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/xxhashjs/-/xxhashjs-0.2.2.tgz#8a6251567621a1c46a5ae204da0249c7f8caa9d8"
+  integrity sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==
   dependencies:
     cuint "^0.2.2"
 
 y18n@^3.2.0, y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
 
 "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
 yallist@^3.0.0, yallist@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+  integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=
 
 yargs-parser@^10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
+  integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
   dependencies:
     camelcase "^4.1.0"
 
 yargs-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
+  integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=
   dependencies:
     camelcase "^3.0.0"
 
 yargs-parser@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
+  integrity sha1-jQrELxbqVd69MyyvTEA4s+P139k=
   dependencies:
     camelcase "^4.1.0"
 
 yargs@12.0.2:
   version "12.0.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
+  integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==
   dependencies:
     cliui "^4.0.0"
     decamelize "^2.0.0"
@@ -8362,6 +9393,7 @@ yargs@12.0.2:
 yargs@9.0.1:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
+  integrity sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=
   dependencies:
     camelcase "^4.1.0"
     cliui "^3.2.0"
@@ -8380,6 +9412,7 @@ yargs@9.0.1:
 yargs@^3.10.0:
   version "3.32.0"
   resolved "http://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995"
+  integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=
   dependencies:
     camelcase "^2.0.1"
     cliui "^3.0.3"
@@ -8392,6 +9425,7 @@ yargs@^3.10.0:
 yargs@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
+  integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=
   dependencies:
     camelcase "^3.0.0"
     cliui "^3.2.0"
@@ -8410,11 +9444,14 @@ yargs@^7.0.0:
 yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
+  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
 
 yn@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
+  integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=
 
 zone.js@^0.8.19:
   version "0.8.26"
   resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.26.tgz#7bdd72f7668c5a7ad6b118148b4ea39c59d08d2d"
+  integrity sha512-W9Nj+UmBJG251wkCacIkETgra4QgBo/vgoEkb4a2uoLzpQG7qF9nzwoLXWU5xj3Fg2mxGvEDh47mg24vXccYjA==

From d9f73d76dabc6d8d6baa7e1ef4f401cbcb604017 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 28 Sep 2018 10:58:07 -0400
Subject: [PATCH 0273/1703] fix(@angular-devkit/build-angular): only process
 index HTML if option is used

---
 .../models/webpack-configs/browser.ts         | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
index eccf8ad71b93..aa5483b6bb1a 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
@@ -39,6 +39,17 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
     }
   }
 
+  if (buildOptions.index) {
+    extraPlugins.push(new IndexHtmlWebpackPlugin({
+      input: path.resolve(root, buildOptions.index),
+      output: path.basename(buildOptions.index),
+      baseHref: buildOptions.baseHref,
+      entrypoints: generateEntryPoints(buildOptions),
+      deployUrl: buildOptions.deployUrl,
+      sri: buildOptions.subresourceIntegrity,
+    }));
+  }
+
   if (buildOptions.subresourceIntegrity) {
     extraPlugins.push(new SubresourceIntegrityPlugin({
       hashFuncNames: ['sha384']
@@ -102,16 +113,7 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
         }
       }
     },
-    plugins: extraPlugins.concat([
-      new IndexHtmlWebpackPlugin({
-        input: path.resolve(root, buildOptions.index),
-        output: path.basename(buildOptions.index),
-        baseHref: buildOptions.baseHref,
-        entrypoints: generateEntryPoints(buildOptions),
-        deployUrl: buildOptions.deployUrl,
-        sri: buildOptions.subresourceIntegrity,
-      }),
-    ]),
+    plugins: extraPlugins,
     node: false,
   };
 }

From b89f6b1c62d8e4cbaef7b1d8eb7bc0afe8c9deed Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 28 Sep 2018 11:36:41 -0400
Subject: [PATCH 0274/1703] build: avoid swallowing module not found exception

---
 lib/bootstrap-local.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/bootstrap-local.js b/lib/bootstrap-local.js
index 064691c7db02..e0772ea11740 100644
--- a/lib/bootstrap-local.js
+++ b/lib/bootstrap-local.js
@@ -119,9 +119,12 @@ if (!__dirname.match(new RegExp(`\\${path.sep}node_modules\\${path.sep}`))) {
 
   Module._resolveFilename = function (request, parent) {
     let resolved = null;
+    let exception;
     try {
       resolved = oldResolve.call(this, request, parent);
-    } catch (_) {}
+    } catch (e) {
+      exception = e;
+    }
 
     if (request in packages) {
       return packages[request].main;
@@ -135,6 +138,12 @@ if (!__dirname.match(new RegExp(`\\${path.sep}node_modules\\${path.sep}`))) {
       if (match) {
         const p = path.join(packages[match].root, request.substr(match.length));
         return oldResolve.call(this, p, parent);
+      } else if (!resolved) {
+        if (exception) {
+          throw exception;
+        } else {
+          return resolved;
+        }
       } else {
         // Because loading `.ts` ends up AFTER `.json` in the require() logic, requiring a file that has both `.json`
         // and `.ts` versions will only get the `.json` content (which wouldn't happen if the .ts was compiled to

From 5852f39c02a5b4a17dc8b126caa194e235d6e15b Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 1 Oct 2018 14:53:50 +0100
Subject: [PATCH 0275/1703] feat(@ngtools/webpack): support custom logging

---
 .../webpack/src/angular_compiler_plugin.ts    | 47 ++++++++++++++++---
 packages/ngtools/webpack/src/type_checker.ts  | 40 ++++------------
 .../webpack/src/type_checker_messages.ts      | 45 ++++++++++++++++++
 .../webpack/src/type_checker_worker.ts        |  6 ++-
 4 files changed, 99 insertions(+), 39 deletions(-)
 create mode 100644 packages/ngtools/webpack/src/type_checker_messages.ts

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 011fad1684f3..c25ff7563b28 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -5,7 +5,16 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Path, dirname, getSystemPath, normalize, resolve, virtualFs } from '@angular-devkit/core';
+import {
+  Path,
+  dirname,
+  getSystemPath,
+  logging,
+  normalize,
+  resolve,
+  virtualFs,
+} from '@angular-devkit/core';
+import { createConsoleLogger } from '@angular-devkit/core/node';
 import {
   CompilerHost,
   CompilerOptions,
@@ -45,7 +54,15 @@ import {
   replaceServerBootstrap,
 } from './transformers';
 import { collectDeepNodes } from './transformers/ast_helpers';
-import { AUTO_START_ARG, InitMessage, UpdateMessage } from './type_checker';
+import {
+  AUTO_START_ARG,
+} from './type_checker';
+import {
+  InitMessage,
+  LogMessage,
+  MESSAGE_KIND,
+  UpdateMessage,
+} from './type_checker_messages';
 import {
   VirtualFileSystemDecorator,
   VirtualWatchFileSystemDecorator,
@@ -59,7 +76,7 @@ import { WebpackInputHost } from './webpack-input-host';
 
 const treeKill = require('tree-kill');
 
-export interface ContextElementDependency {}
+export interface ContextElementDependency { }
 
 export interface ContextElementDependencyConstructor {
   new(modulePath: string, name: string): ContextElementDependency;
@@ -85,6 +102,7 @@ export interface AngularCompilerPluginOptions {
   missingTranslation?: string;
   platform?: PLATFORM;
   nameLazyFiles?: boolean;
+  logger?: logging.Logger;
 
   // added to the list of lazy routes
   additionalLazyModules?: { [module: string]: string };
@@ -141,6 +159,9 @@ export class AngularCompilerPlugin {
   private _typeCheckerProcess: ChildProcess | null;
   private _forkedTypeCheckerInitialized = false;
 
+  // Logging.
+  private _logger: logging.Logger;
+
   private get _ngCompilerSupportsNewApi() {
     if (this._JitMode) {
       return false;
@@ -179,6 +200,8 @@ export class AngularCompilerPlugin {
 
   private _setupOptions(options: AngularCompilerPluginOptions) {
     time('AngularCompilerPlugin._setupOptions');
+    this._logger = options.logger || createConsoleLogger();
+
     // Fill in the missing options.
     if (!options.hasOwnProperty('tsConfigPath')) {
       throw new Error('Must specify "tsConfigPath" in the configuration of @ngtools/webpack.');
@@ -415,7 +438,7 @@ export class AngularCompilerPlugin {
         }),
         // TODO: fix compiler-cli typings; entryModule should not be string, but also optional.
         // tslint:disable-next-line:no-non-null-assertion
-        entryModule: this._entryModule !,
+        entryModule: this._entryModule!,
       });
       timeEnd('AngularCompilerPlugin._getLazyRoutesFromNgtools');
 
@@ -542,6 +565,18 @@ export class AngularCompilerPlugin {
       forkArgs,
       forkOptions);
 
+    // Handle child messages.
+    this._typeCheckerProcess.on('message', message => {
+      switch (message.kind) {
+        case MESSAGE_KIND.Log:
+          const logMessage = message as LogMessage;
+          this._logger.log(logMessage.level, logMessage.message);
+          break;
+        default:
+          throw new Error(`TypeChecker: Unexpected message received: ${message}.`);
+      }
+    });
+
     // Handle child process exit.
     this._typeCheckerProcess.once('exit', (_, signal) => {
       this._typeCheckerProcess = null;
@@ -748,10 +783,10 @@ export class AngularCompilerPlugin {
               const name = request.request;
               const issuer = request.contextInfo.issuer;
               if (name.endsWith('.ts') || name.endsWith('.tsx')
-                  || (issuer && /\.ts|ngfactory\.js$/.test(issuer))) {
+                || (issuer && /\.ts|ngfactory\.js$/.test(issuer))) {
                 try {
                   await this.done;
-                } catch {}
+                } catch { }
               }
             }
 
diff --git a/packages/ngtools/webpack/src/type_checker.ts b/packages/ngtools/webpack/src/type_checker.ts
index 7e134c9d3b81..57f18222b84c 100644
--- a/packages/ngtools/webpack/src/type_checker.ts
+++ b/packages/ngtools/webpack/src/type_checker.ts
@@ -5,7 +5,6 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { terminal } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import {
   CompilerHost,
@@ -19,37 +18,10 @@ import * as ts from 'typescript';
 import { time, timeEnd } from './benchmark';
 import { WebpackCompilerHost } from './compiler_host';
 import { CancellationToken, gatherDiagnostics } from './gather_diagnostics';
+import { LogMessage, TypeCheckerMessage } from './type_checker_messages';
 
 
 // This file should run in a child process with the AUTO_START_ARG argument
-
-
-export enum MESSAGE_KIND {
-  Init,
-  Update,
-}
-
-export abstract class TypeCheckerMessage {
-  constructor(public kind: MESSAGE_KIND) { }
-}
-
-export class InitMessage extends TypeCheckerMessage {
-  constructor(
-    public compilerOptions: ts.CompilerOptions,
-    public basePath: string,
-    public jitMode: boolean,
-    public rootNames: string[],
-  ) {
-    super(MESSAGE_KIND.Init);
-  }
-}
-
-export class UpdateMessage extends TypeCheckerMessage {
-  constructor(public rootNames: string[], public changedCompilationFiles: string[]) {
-    super(MESSAGE_KIND.Update);
-  }
-}
-
 export const AUTO_START_ARG = '9d93e901-158a-4cf9-ba1b-2f0582ffcfeb';
 
 export class TypeChecker {
@@ -124,7 +96,7 @@ export class TypeChecker {
 
       if (errors.length > 0) {
         const message = formatDiagnostics(errors);
-        console.error(terminal.bold(terminal.red('ERROR in ' + message)));
+        this.sendMessage(new LogMessage('error', 'ERROR in ' + message));
       } else {
         // Reset the changed file tracker only if there are no errors.
         this._compilerHost.resetChangedFileTracker();
@@ -132,11 +104,17 @@ export class TypeChecker {
 
       if (warnings.length > 0) {
         const message = formatDiagnostics(warnings);
-        console.error(terminal.bold(terminal.yellow('WARNING in ' + message)));
+        this.sendMessage(new LogMessage('warn', 'WARNING in ' + message));
       }
     }
   }
 
+  private sendMessage(msg: TypeCheckerMessage) {
+    if (process.send) {
+      process.send(msg);
+    }
+  }
+
   public update(rootNames: string[], changedCompilationFiles: string[],
                 cancellationToken: CancellationToken) {
     this._update(rootNames, changedCompilationFiles);
diff --git a/packages/ngtools/webpack/src/type_checker_messages.ts b/packages/ngtools/webpack/src/type_checker_messages.ts
new file mode 100644
index 000000000000..4fc0a65c9ba7
--- /dev/null
+++ b/packages/ngtools/webpack/src/type_checker_messages.ts
@@ -0,0 +1,45 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { logging } from '@angular-devkit/core';
+import * as ts from 'typescript';
+
+
+export enum MESSAGE_KIND {
+  Init,
+  Update,
+  Log,
+}
+
+export abstract class TypeCheckerMessage {
+  constructor(public kind: MESSAGE_KIND) { }
+}
+
+export class InitMessage extends TypeCheckerMessage {
+  constructor(
+    public compilerOptions: ts.CompilerOptions,
+    public basePath: string,
+    public jitMode: boolean,
+    public rootNames: string[],
+    public hostReplacementPaths: { [path: string]: string },
+  ) {
+    super(MESSAGE_KIND.Init);
+  }
+}
+
+export class UpdateMessage extends TypeCheckerMessage {
+  constructor(public rootNames: string[], public changedCompilationFiles: string[]) {
+    super(MESSAGE_KIND.Update);
+  }
+}
+
+export class LogMessage extends TypeCheckerMessage {
+  constructor(public level: logging.LogLevel, public message: string) {
+    super(MESSAGE_KIND.Log);
+  }
+}
+
diff --git a/packages/ngtools/webpack/src/type_checker_worker.ts b/packages/ngtools/webpack/src/type_checker_worker.ts
index 777477292357..5cbab0379de6 100644
--- a/packages/ngtools/webpack/src/type_checker_worker.ts
+++ b/packages/ngtools/webpack/src/type_checker_worker.ts
@@ -10,12 +10,14 @@ import { time, timeEnd } from './benchmark';
 import { CancellationToken } from './gather_diagnostics';
 import {
   AUTO_START_ARG,
+  TypeChecker,
+} from './type_checker';
+import {
   InitMessage,
   MESSAGE_KIND,
-  TypeChecker,
   TypeCheckerMessage,
   UpdateMessage,
-} from './type_checker';
+} from './type_checker_messages';
 
 let typeChecker: TypeChecker;
 let lastCancellationToken: CancellationToken;

From 61871d37bb71997f5ff7495d942c7765e9bfe36c Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 1 Oct 2018 14:54:35 +0100
Subject: [PATCH 0276/1703] feat(@angular-devkit/build-angular): pass logger to
 ngtools/webpack

---
 .../src/angular-cli-files/models/build-options.ts            | 5 +++--
 .../angular-cli-files/models/webpack-configs/typescript.ts   | 1 +
 packages/angular_devkit/build_angular/src/browser/index.ts   | 1 +
 .../angular_devkit/build_angular/src/extract-i18n/index.ts   | 1 +
 packages/angular_devkit/build_angular/src/karma/index.ts     | 1 +
 packages/angular_devkit/build_angular/src/server/index.ts    | 1 +
 6 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
index 3ee86311eacc..5a33f1e32913 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
@@ -8,8 +8,8 @@
 
 // TODO: cleanup this file, it's copied as is from Angular CLI.
 
-// tslint:disable-next-line:no-implicit-dependencies
-import * as ts from 'typescript';
+import { logging } from '@angular-devkit/core';
+import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
 import {
   AssetPatternObject,
   Budget,
@@ -74,6 +74,7 @@ export interface WebpackTestOptions extends BuildOptions {
 
 export interface WebpackConfigOptions<T = BuildOptions> {
   root: string;
+  logger: logging.Logger;
   projectRoot: string;
   sourceRoot?: string;
   buildOptions: T;
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
index 82bd2e7ae38f..f939ca054f30 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
@@ -81,6 +81,7 @@ function _createAotPlugin(
     nameLazyFiles: buildOptions.namedChunks,
     forkTypeChecker: buildOptions.forkTypeChecker,
     contextElementDependencyConstructor: require('webpack/lib/dependencies/ContextElementDependency'),
+    logger: wco.logger,
     ...options,
   };
   return new AngularCompilerPlugin(pluginOptions);
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 39cb7eb43819..ab49981a9f0c 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -132,6 +132,7 @@ export class BrowserBuilder implements Builder<BrowserBuilderSchema> {
 
     wco = {
       root: getSystemPath(root),
+      logger: this.context.logger,
       projectRoot: getSystemPath(projectRoot),
       buildOptions: options,
       tsConfig,
diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
index 34d327fedf7e..06fdc798ed4b 100644
--- a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
@@ -118,6 +118,7 @@ export class ExtractI18nBuilder implements Builder<ExtractI18nBuilderOptions> {
 
     wco = {
       root: getSystemPath(root),
+      logger: this.context.logger,
       projectRoot: getSystemPath(projectRoot),
       // TODO: use only this.options, it contains all flags and configs items already.
       buildOptions: options,
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index 8e41e89a7dc5..6a66eaad23ef 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -143,6 +143,7 @@ export class KarmaBuilder implements Builder<KarmaBuilderSchema> {
 
     wco = {
       root: getSystemPath(root),
+      logger: this.context.logger,
       projectRoot: getSystemPath(projectRoot),
       sourceRoot: sourceRoot && getSystemPath(sourceRoot),
       // TODO: use only this.options, it contains all flags and configs items already.
diff --git a/packages/angular_devkit/build_angular/src/server/index.ts b/packages/angular_devkit/build_angular/src/server/index.ts
index 590030022bdb..3874885dc77f 100644
--- a/packages/angular_devkit/build_angular/src/server/index.ts
+++ b/packages/angular_devkit/build_angular/src/server/index.ts
@@ -83,6 +83,7 @@ export class ServerBuilder implements Builder<BuildWebpackServerSchema> {
 
     wco = {
       root: getSystemPath(root),
+      logger: this.context.logger,
       projectRoot: getSystemPath(projectRoot),
       // TODO: use only this.options, it contains all flags and configs items already.
       buildOptions: {

From 3238640e4fda2bbf3503cff3feff32827bb9e2fa Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 1 Oct 2018 15:14:59 +0100
Subject: [PATCH 0277/1703] feat(@ngtools/webpack): support
 hostReplacementPaths

Fix #12197
---
 .../webpack/src/angular_compiler_plugin.ts       |  7 ++++++-
 packages/ngtools/webpack/src/type_checker.ts     | 16 +++++++++++++++-
 .../ngtools/webpack/src/type_checker_worker.ts   |  1 +
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index c25ff7563b28..9a2edcf7e154 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -602,8 +602,13 @@ export class AngularCompilerPlugin {
   private _updateForkedTypeChecker(rootNames: string[], changedCompilationFiles: string[]) {
     if (this._typeCheckerProcess) {
       if (!this._forkedTypeCheckerInitialized) {
+        let hostReplacementPaths = {};
+        if (this._options.hostReplacementPaths
+          && typeof this._options.hostReplacementPaths != 'function') {
+          hostReplacementPaths = this._options.hostReplacementPaths;
+        }
         this._typeCheckerProcess.send(new InitMessage(this._compilerOptions, this._basePath,
-          this._JitMode, this._rootNames));
+          this._JitMode, this._rootNames, hostReplacementPaths));
         this._forkedTypeCheckerInitialized = true;
       }
       this._typeCheckerProcess.send(new UpdateMessage(rootNames, changedCompilationFiles));
diff --git a/packages/ngtools/webpack/src/type_checker.ts b/packages/ngtools/webpack/src/type_checker.ts
index 57f18222b84c..17503fb1b18d 100644
--- a/packages/ngtools/webpack/src/type_checker.ts
+++ b/packages/ngtools/webpack/src/type_checker.ts
@@ -5,6 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import { normalize, resolve, virtualFs } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import {
   CompilerHost,
@@ -33,12 +34,25 @@ export class TypeChecker {
     _basePath: string,
     private _JitMode: boolean,
     private _rootNames: string[],
+    hostReplacementPaths: { [path: string]: string },
   ) {
     time('TypeChecker.constructor');
+    const host = new virtualFs.AliasHost(new NodeJsSyncHost());
+
+    // Add file replacements.
+    for (const from in hostReplacementPaths) {
+      const normalizedFrom = resolve(normalize(_basePath), normalize(from));
+      const normalizedWith = resolve(
+        normalize(_basePath),
+        normalize(hostReplacementPaths[from]),
+      );
+      host.aliases.set(normalizedFrom, normalizedWith);
+    }
+
     const compilerHost = new WebpackCompilerHost(
       _compilerOptions,
       _basePath,
-      new NodeJsSyncHost(),
+      host,
     );
     // We don't set a async resource loader on the compiler host because we only support
     // html templates, which are the only ones that can throw errors, and those can be loaded
diff --git a/packages/ngtools/webpack/src/type_checker_worker.ts b/packages/ngtools/webpack/src/type_checker_worker.ts
index 5cbab0379de6..f04abd01ea1d 100644
--- a/packages/ngtools/webpack/src/type_checker_worker.ts
+++ b/packages/ngtools/webpack/src/type_checker_worker.ts
@@ -34,6 +34,7 @@ if (process.argv.indexOf(AUTO_START_ARG) >= 0) {
           initMessage.basePath,
           initMessage.jitMode,
           initMessage.rootNames,
+          initMessage.hostReplacementPaths,
         );
         break;
       case MESSAGE_KIND.Update:

From ea89f758ce712eaed73b9c81de2ad67754c7f256 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 1 Oct 2018 15:15:47 +0100
Subject: [PATCH 0278/1703] test(@angular-devkit/build-angular): add test for
 type checker replacements

---
 .../test/browser/replacements_spec_large.ts   | 54 ++++++++++++++++++-
 1 file changed, 52 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/replacements_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/replacements_spec_large.ts
index e73e56aec1d4..e1fda961ae9b 100644
--- a/packages/angular_devkit/build_angular/test/browser/replacements_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/replacements_spec_large.ts
@@ -6,9 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { runTargetSpec } from '@angular-devkit/architect/testing';
+import { DefaultTimeout, TestLogger, runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { takeWhile, tap } from 'rxjs/operators';
+import { of, race } from 'rxjs';
+import { delay, filter, map, take, takeUntil, takeWhile, tap } from 'rxjs/operators';
 import { browserTargetSpec, host } from '../utils';
 
 
@@ -154,4 +155,53 @@ describe('Browser Builder file replacements', () => {
     );
   });
 
+  it('file replacements work with forked type checker on watch mode', async () => {
+    host.writeMultipleFiles({
+      'src/file-replaced.ts': 'export var obj = { one: 1, two: 2 };',
+      'src/file.ts': `export var obj = { one: 1 };`,
+      'src/main.ts': `
+        import { obj } from './file';
+        console.log(obj.two);
+      `,
+    });
+
+    const overrides = {
+      fileReplacements: [{
+        replace: normalize('/src/file.ts'),
+        with: normalize('/src/file-replaced.ts'),
+      }],
+      watch: true,
+    };
+
+    const unexpectedError = `Property 'two' does not exist on type '{ one: number; }'`;
+    const expectedError = `Property 'prop' does not exist on type '{}'`;
+    const logger = new TestLogger('rebuild-type-errors');
+
+    // Race between a timeout and the expected log entry.
+    const stop$ = race<null | string>(
+      of(null).pipe(delay(DefaultTimeout * 2 / 3)),
+      logger.pipe(
+        filter(entry => entry.message.includes(expectedError)),
+        map(entry => entry.message),
+        take(1),
+      ),
+    );
+
+    let errorAdded = false;
+    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout, logger).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true, 'build should succeed')),
+      tap(() => {
+        // Introduce a known type error to detect in the logger filter.
+        if (!errorAdded) {
+          host.appendToFile('src/main.ts', 'console.log({}.prop);');
+          errorAdded = true;
+        }
+      }),
+      takeUntil(stop$),
+    ).subscribe();
+
+    const res = await stop$.toPromise();
+    expect(res).not.toBe(null, 'Test timed out.');
+    expect(res).not.toContain(unexpectedError);
+  });
 });

From 5adebf9d06b806ad743a0456acf6dfd4f16a0925 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 2 Oct 2018 18:00:05 +0100
Subject: [PATCH 0279/1703] fix(@angular-devkit/build-angular): workaround
 karma issue

See https://github.com/karma-runner/karma/issues/3154
---
 packages/angular_devkit/build_angular/src/karma/index.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index 6a66eaad23ef..19f63f7d8498 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -93,6 +93,10 @@ export class KarmaBuilder implements Builder<KarmaBuilderSchema> {
           // Pass onto Karma to emit BuildEvents.
           successCb: () => obs.next({ success: true }),
           failureCb: () => obs.next({ success: false }),
+          // Workaround for https://github.com/karma-runner/karma/issues/3154
+          // When this workaround is removed, user projects need to be updated to use a Karma
+          // version that has a fix for this issue.
+          toJSON: () => { },
         };
 
         // TODO: inside the configs, always use the project root and not the workspace root.

From 80163ce0da11d42fbcb8abf41b9ae5100a8d4f1c Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 4 Oct 2018 22:34:17 +0200
Subject: [PATCH 0280/1703]  fix(@angular/cli): `ng update --help` shows
 `--packages` twice (#12470)

* refactor: add a better `description` for `packages`

* fix(@angular/cli): `ng update --help` shows `--packages` twice

Closes #12468
---
 packages/angular/cli/commands/update.json     | 16 ----------------
 packages/schematics/update/update/schema.json |  2 +-
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/packages/angular/cli/commands/update.json b/packages/angular/cli/commands/update.json
index 964f1e05d2ef..3f6bdb900f21 100644
--- a/packages/angular/cli/commands/update.json
+++ b/packages/angular/cli/commands/update.json
@@ -11,22 +11,6 @@
 
   "type": "object",
   "allOf": [
-    {
-      "properties": {
-        "packages": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "The names of package(s) to update",
-          "$default": {
-            "$source": "argv"
-          }
-        }
-      },
-      "required": [
-      ]
-    },
     {
       "$ref": "./definitions.json#/definitions/base"
     }
diff --git a/packages/schematics/update/update/schema.json b/packages/schematics/update/update/schema.json
index 77322ea7d5bf..0c2c57040583 100644
--- a/packages/schematics/update/update/schema.json
+++ b/packages/schematics/update/update/schema.json
@@ -5,7 +5,7 @@
   "type": "object",
   "properties": {
     "packages": {
-      "description": "The packages to get.",
+      "description": "The names of package(s) to update.",
       "type": "array",
       "items": {
         "type": "string"

From 0b884c5d88f8703ca291e871f083d3c1736fdf22 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 4 Oct 2018 22:35:14 +0200
Subject: [PATCH 0281/1703] ci: exit with `0` error code when running templates
 (#12473)

* docs: fix url typo

* ci: exit with `0` error code when running templates
---
 CONTRIBUTING.md                    | 2 +-
 scripts/templates.ts               | 2 +-
 scripts/templates/contributing.ejs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 44302b71e1a8..1018473d1ac6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -268,7 +268,7 @@ changes to be accepted, the CLA must be signed. It's a quick process, we promise
 [coc]: https://github.com/angular/code-of-conduct/blob/master/CODE_OF_CONDUCT.md
 [commit-message-format]: https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit#
 [corporate-cla]: http://code.google.com/legal/corporate-cla-v1.0.html
-[dev-doc]: ttps://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md#development-hints-for-working-on-angular-cli
+[dev-doc]: https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md#development-hints-for-working-on-angular-cli
 [GitHub]: https://github.com/angular/angular-cli
 [gitter]: https://gitter.im/angular/angular-cli
 [individual-cla]: http://code.google.com/legal/individual-cla-v1.0.html
diff --git a/scripts/templates.ts b/scripts/templates.ts
index f1921ebaa2f7..e0d22c303af7 100644
--- a/scripts/templates.ts
+++ b/scripts/templates.ts
@@ -31,5 +31,5 @@ export default async function(_options: {}, logger: logging.Logger): Promise<num
   _runTemplate('./templates/readme', '../README.md', logger);
   _runTemplate('./templates/contributing', '../CONTRIBUTING.md', logger);
 
-  return 1;
+  return 0;
 }
diff --git a/scripts/templates/contributing.ejs b/scripts/templates/contributing.ejs
index 73fd2f5553a9..2032891f1070 100644
--- a/scripts/templates/contributing.ejs
+++ b/scripts/templates/contributing.ejs
@@ -257,7 +257,7 @@ changes to be accepted, the CLA must be signed. It's a quick process, we promise
 [coc]: https://github.com/angular/code-of-conduct/blob/master/CODE_OF_CONDUCT.md
 [commit-message-format]: https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit#
 [corporate-cla]: http://code.google.com/legal/corporate-cla-v1.0.html
-[dev-doc]: ttps://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md#development-hints-for-working-on-angular-cli
+[dev-doc]: https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md#development-hints-for-working-on-angular-cli
 [GitHub]: https://github.com/angular/angular-cli
 [gitter]: https://gitter.im/angular/angular-cli
 [individual-cla]: http://code.google.com/legal/individual-cla-v1.0.html

From 4493d885da3f94223f7afdcf97a86ad2eb8615d7 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Fri, 5 Oct 2018 11:59:47 -0700
Subject: [PATCH 0282/1703] docs: start rewriting docs

---
 packages/angular/cli/commands/build-long.md         |  5 +++++
 packages/angular/cli/commands/build.json            |  4 ++--
 packages/angular/cli/commands/definitions.json      |  6 +++---
 .../build_angular/src/browser/schema.json           | 13 +++++++------
 4 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 packages/angular/cli/commands/build-long.md

diff --git a/packages/angular/cli/commands/build-long.md b/packages/angular/cli/commands/build-long.md
new file mode 100644
index 000000000000..1116fcb1dc4e
--- /dev/null
+++ b/packages/angular/cli/commands/build-long.md
@@ -0,0 +1,5 @@
+Resources in CSS, such as images and fonts, are automatically written and fingerprinted at the root
+of the output folder.  If a resource is less than 10kb, it  is also included inline.
+
+Uses the Webpack build tool, with environment and build options specified in the CLI configuration
+file.
diff --git a/packages/angular/cli/commands/build.json b/packages/angular/cli/commands/build.json
index db73c39b0605..043b370a998c 100644
--- a/packages/angular/cli/commands/build.json
+++ b/packages/angular/cli/commands/build.json
@@ -1,8 +1,8 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/build.json",
-  "description": "Builds your app and places it into the output path (dist/ by default).",
-  "$longDescription": "",
+  "description": "Compiles an Angular app into an output directory named dist/ at the given output path. Must be executed from within a workspace directory.",
+  "$longDescription": "./build-long.md",
 
   "$aliases": [ "b" ],
   "$scope": "in",
diff --git a/packages/angular/cli/commands/definitions.json b/packages/angular/cli/commands/definitions.json
index 201dd59e118c..20099aaa748e 100644
--- a/packages/angular/cli/commands/definitions.json
+++ b/packages/angular/cli/commands/definitions.json
@@ -7,21 +7,21 @@
       "properties": {
         "project": {
           "type": "string",
-          "description": "The name of the project to build.",
+          "description": "The name of the project to build. Can be an app or a library.",
           "$default": {
             "$source": "argv",
             "index": 0
           }
         },
         "configuration": {
-          "description": "Specify the configuration to use.",
+          "description": "A named configuration environment, as specified in the `configurations` section of `angular.json`.",
           "type": "string",
           "aliases": [
             "c"
           ]
         },
         "prod": {
-          "description": "Flag to set configuration to 'production'.",
+          "description": "When true, sets the build configuration to the production environment.\nAll builds make use of bundling and limited tree-shaking, A production build also runs limited dead code elimination using UglifyJS.",
           "type": "boolean"
         }
       }
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index c29931dee0b8..9a8cfd442b53 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -12,15 +12,16 @@
     },
     "main": {
       "type": "string",
-      "description": "The name of the main entry-point file."
+      "description": "The full path for the main entry point to the app, relative to the current workspace.",
+      "$valueDescription": "fileName"
     },
     "polyfills": {
       "type": "string",
-      "description": "The name of the polyfills file."
+      "description": "The full path for the polyfills file, relative to the current workspace."
     },
     "tsConfig": {
       "type": "string",
-      "description": "The name of the TypeScript configuration file."
+      "description": "The full path for the TypeScript configuration file, relative to the current workspace."
     },
     "scripts": {
       "description": "Global scripts to be included in the build.",
@@ -55,7 +56,7 @@
     },
     "optimization": {
       "type": "boolean",
-      "description": "Enables optimization of the build output.",
+      "description": "When true, uses optimization for the app build.",
       "default": false
     },
     "fileReplacements": {
@@ -68,7 +69,7 @@
     },
     "outputPath": {
       "type": "string",
-      "description": "Path where output will be placed."
+      "description": "The full path for the new output directory, relative to the current workspace.\n\nBy default, writes output to a folder named dist/ in the current project."
     },
     "aot": {
       "type": "boolean",
@@ -408,4 +409,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}

From da7daef34bbdd0dbfbe83f21f71d45996eeb8dab Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 4 Oct 2018 11:44:25 -0400
Subject: [PATCH 0283/1703] refactor(@ngtools/webpack): reduce webpack fs
 decorator system  calls

---
 packages/ngtools/webpack/src/compiler_host.ts | 66 +++++++++++--------
 .../src/virtual_file_system_decorator.ts      | 49 +++++---------
 2 files changed, 55 insertions(+), 60 deletions(-)

diff --git a/packages/ngtools/webpack/src/compiler_host.ts b/packages/ngtools/webpack/src/compiler_host.ts
index 19565fa0652d..55b372c0a6fb 100644
--- a/packages/ngtools/webpack/src/compiler_host.ts
+++ b/packages/ngtools/webpack/src/compiler_host.ts
@@ -113,20 +113,46 @@ export class WebpackCompilerHost implements ts.CompilerHost {
     }
   }
 
-  readFileBuffer(fileName: string): Buffer | undefined {
+  readFileBuffer(fileName: string): Buffer {
     const filePath = this.resolve(fileName);
 
-    try {
-      return Buffer.from(this._syncHost.read(filePath));
-    } catch {
-      return undefined;
-    }
+    return Buffer.from(this._syncHost.read(filePath));
+  }
+
+  private _makeStats(stats: virtualFs.Stats<Partial<Stats>>): Stats {
+    return {
+      isFile: () => stats.isFile(),
+      isDirectory: () => stats.isDirectory(),
+      isBlockDevice: () => stats.isBlockDevice && stats.isBlockDevice() || false,
+      isCharacterDevice: () => stats.isCharacterDevice && stats.isCharacterDevice() || false,
+      isFIFO: () => stats.isFIFO && stats.isFIFO() || false,
+      isSymbolicLink: () => stats.isSymbolicLink && stats.isSymbolicLink() || false,
+      isSocket: () => stats.isSocket && stats.isSocket() || false,
+      dev: stats.dev === undefined ? dev : stats.dev,
+      ino: stats.ino === undefined ? Math.floor(Math.random() * 100000) : stats.ino,
+      mode: stats.mode === undefined ? parseInt('777', 8) : stats.mode,
+      nlink: stats.nlink === undefined ? 1 : stats.nlink,
+      uid: stats.uid || 0,
+      gid: stats.gid || 0,
+      rdev: stats.rdev || 0,
+      size: stats.size,
+      blksize: stats.blksize === undefined ? 512 : stats.blksize,
+      blocks: stats.blocks === undefined ? Math.ceil(stats.size / 512) : stats.blocks,
+      atime: stats.atime,
+      atimeMs: stats.atime.getTime(),
+      mtime: stats.mtime,
+      mtimeMs: stats.mtime.getTime(),
+      ctime: stats.ctime,
+      ctimeMs: stats.ctime.getTime(),
+      birthtime: stats.birthtime,
+      birthtimeMs: stats.birthtime.getTime(),
+    };
   }
 
   stat(path: string): Stats | null {
     const p = this.resolve(path);
 
-    let stats;
+    let stats: virtualFs.Stats<Partial<Stats>> | Stats | null = null;
     try {
       stats = this._syncHost.stat(p);
     } catch { }
@@ -135,27 +161,11 @@ export class WebpackCompilerHost implements ts.CompilerHost {
       return null;
     }
 
-    return {
-      isBlockDevice: () => false,
-      isCharacterDevice: () => false,
-      isFIFO: () => false,
-      isSymbolicLink: () => false,
-      isSocket: () => false,
-      dev,
-      ino: Math.floor(Math.random() * 100000),
-      mode: parseInt('777', 8),
-      nlink: 1,
-      uid: 0,
-      gid: 0,
-      rdev: 0,
-      blksize: 512,
-      blocks: Math.ceil(stats.size / 512),
-      atimeMs: stats.atime.getTime(),
-      mtimeMs: stats.mtime.getTime(),
-      ctimeMs: stats.ctime.getTime(),
-      birthtimeMs: stats.birthtime.getTime(),
-      ...stats,
-    };
+    if (stats instanceof Stats) {
+      return stats;
+    }
+
+    return this._makeStats(stats);
   }
 
   directoryExists(directoryName: string): boolean {
diff --git a/packages/ngtools/webpack/src/virtual_file_system_decorator.ts b/packages/ngtools/webpack/src/virtual_file_system_decorator.ts
index 4f897a654a2e..71525db88d57 100644
--- a/packages/ngtools/webpack/src/virtual_file_system_decorator.ts
+++ b/packages/ngtools/webpack/src/virtual_file_system_decorator.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Path, getSystemPath, normalize } from '@angular-devkit/core';
+import { FileDoesNotExistException, Path, getSystemPath, normalize } from '@angular-devkit/core';
 import { Stats } from 'fs';
 import { InputFileSystem } from 'webpack';
 import { WebpackCompilerHost } from './compiler_host';
@@ -21,33 +21,17 @@ export class VirtualFileSystemDecorator implements InputFileSystem {
     private _webpackCompilerHost: WebpackCompilerHost,
   ) { }
 
-  private _readFileSync(path: string): Buffer | null {
-    if (this._webpackCompilerHost.fileExists(path)) {
-      return this._webpackCompilerHost.readFileBuffer(path) || null;
-    }
-
-    return null;
-  }
-
-  private _statSync(path: string): Stats | null {
-    if (this._webpackCompilerHost.fileExists(path)) {
-      return this._webpackCompilerHost.stat(path);
-    }
-
-    return null;
-  }
-
   getVirtualFilesPaths() {
     return this._webpackCompilerHost.getNgFactoryPaths();
   }
 
   stat(path: string, callback: (err: Error, stats: Stats) => void): void {
-    const result = this._statSync(path);
-    if (result) {
+    try {
+      // tslint:disable-next-line:no-any
+      callback(null as any, this._webpackCompilerHost.stat(path) as any);
+    } catch (e) {
       // tslint:disable-next-line:no-any
-      callback(null as any, result);
-    } else {
-      this._inputFileSystem.stat(path, callback);
+      callback(e, undefined as any);
     }
   }
 
@@ -57,12 +41,12 @@ export class VirtualFileSystemDecorator implements InputFileSystem {
   }
 
   readFile(path: string, callback: (err: Error, contents: Buffer) => void): void {
-    const result = this._readFileSync(path);
-    if (result) {
+    try {
       // tslint:disable-next-line:no-any
-      callback(null as any, result);
-    } else {
-      this._inputFileSystem.readFile(path, callback);
+      callback(null as any, this._webpackCompilerHost.readFileBuffer(path));
+    } catch (e) {
+      // tslint:disable-next-line:no-any
+      callback(e, undefined as any);
     }
   }
 
@@ -76,9 +60,12 @@ export class VirtualFileSystemDecorator implements InputFileSystem {
   }
 
   statSync(path: string): Stats {
-    const result = this._statSync(path);
+    const stats = this._webpackCompilerHost.stat(path);
+    if (stats === null) {
+      throw new FileDoesNotExistException(path);
+    }
 
-    return result || this._inputFileSystem.statSync(path);
+    return stats;
   }
 
   readdirSync(path: string): string[] {
@@ -87,9 +74,7 @@ export class VirtualFileSystemDecorator implements InputFileSystem {
   }
 
   readFileSync(path: string): Buffer {
-    const result = this._readFileSync(path);
-
-    return result || this._inputFileSystem.readFileSync(path);
+    return this._webpackCompilerHost.readFileBuffer(path);
   }
 
   readJsonSync(path: string): string {

From 9297eb5bf14596de4389017a1d4f5e45ad0e4408 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 4 Oct 2018 13:03:59 -0400
Subject: [PATCH 0284/1703] fix(@angular-devkit/core): record host should stat
 backing host

---
 packages/angular_devkit/core/src/virtual-fs/host/record.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/angular_devkit/core/src/virtual-fs/host/record.ts b/packages/angular_devkit/core/src/virtual-fs/host/record.ts
index 74102db7c612..9396dbda8a2d 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/record.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/record.ts
@@ -26,6 +26,7 @@ import {
   HostCapabilities,
   HostWatchOptions,
   ReadonlyHost,
+  Stats,
 } from './interface';
 import { SimpleMemoryHost } from './memory';
 
@@ -366,6 +367,12 @@ export class CordHost extends SimpleMemoryHost {
       : ((this.willDelete(path) || this.willRename(path)) ? of(false) : this._back.isFile(path));
   }
 
+  stat(path: Path): Observable<Stats | null> | null {
+    return this._exists(path)
+      ? super.stat(path)
+      : ((this.willDelete(path) || this.willRename(path)) ? of(null) : this._back.stat(path));
+  }
+
   watch(path: Path, options?: HostWatchOptions) {
     // Watching not supported.
     return null;

From a2003fde40fc007af4c8f749e726dfb77e49b8cc Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 4 Oct 2018 22:46:41 -0400
Subject: [PATCH 0285/1703] refactor(@ngtools/webpack): cache parsed source
 files

---
 packages/ngtools/webpack/src/compiler_host.ts | 97 ++++++++++++++-----
 1 file changed, 71 insertions(+), 26 deletions(-)

diff --git a/packages/ngtools/webpack/src/compiler_host.ts b/packages/ngtools/webpack/src/compiler_host.ts
index 55b372c0a6fb..aa2e8e5003f8 100644
--- a/packages/ngtools/webpack/src/compiler_host.ts
+++ b/packages/ngtools/webpack/src/compiler_host.ts
@@ -28,24 +28,25 @@ const dev = Math.floor(Math.random() * 10000);
 
 export class WebpackCompilerHost implements ts.CompilerHost {
   private _syncHost: virtualFs.SyncDelegateHost;
+  private _memoryHost: virtualFs.SyncDelegateHost;
   private _changedFiles = new Set<string>();
   private _basePath: Path;
   private _resourceLoader?: WebpackResourceLoader;
+  private _sourceFileCache = new Map<string, ts.SourceFile>();
 
   constructor(
     private _options: ts.CompilerOptions,
     basePath: string,
     host: virtualFs.Host,
   ) {
-    this._syncHost = new virtualFs.SyncDelegateHost(new virtualFs.CordHost(host));
+    this._syncHost = new virtualFs.SyncDelegateHost(host);
+    this._memoryHost = new virtualFs.SyncDelegateHost(new virtualFs.SimpleMemoryHost());
     this._basePath = normalize(basePath);
   }
 
   private get virtualFiles(): Path[] {
-    return (this._syncHost.delegate as virtualFs.CordHost)
-      .records()
-      .filter(record => record.kind === 'create')
-      .map((record: virtualFs.CordHostCreate) => record.path);
+    return [...(this._memoryHost.delegate as {} as { _cache: Map<Path, {}> })
+      ._cache.keys()];
   }
 
   denormalizePath(path: string) {
@@ -79,35 +80,50 @@ export class WebpackCompilerHost implements ts.CompilerHost {
   invalidate(fileName: string): void {
     const fullPath = this.resolve(fileName);
 
-    if (this.fileExists(fileName)) {
-      this._changedFiles.add(fullPath);
+    if (this._memoryHost.exists(fullPath)) {
+      this._memoryHost.delete(fullPath);
     }
+
+    this._sourceFileCache.delete(fullPath);
+
+    try {
+      const exists = this._syncHost.isFile(fullPath);
+      if (exists) {
+        this._changedFiles.add(fullPath);
+      }
+    } catch { }
   }
 
   fileExists(fileName: string, delegate = true): boolean {
     const p = this.resolve(fileName);
 
+    if (this._memoryHost.isFile(p)) {
+      return true;
+    }
+
+    if (!delegate) {
+      return false;
+    }
+
+    let exists = false;
     try {
-      const exists = this._syncHost.isFile(p);
-      if (delegate) {
-        return exists;
-      } else if (exists) {
-        const backend = new virtualFs.SyncDelegateHost(
-          (this._syncHost.delegate as virtualFs.CordHost).backend as virtualFs.Host,
-        );
-
-        return !backend.isFile(p);
-      }
+      exists = this._syncHost.isFile(p);
     } catch { }
 
-    return false;
+    return exists;
   }
 
   readFile(fileName: string): string | undefined {
     const filePath = this.resolve(fileName);
 
     try {
-      return virtualFs.fileBufferToString(this._syncHost.read(filePath));
+      if (this._memoryHost.isFile(filePath)) {
+        return virtualFs.fileBufferToString(this._memoryHost.read(filePath));
+      } else {
+        const content = this._syncHost.read(filePath);
+
+        return virtualFs.fileBufferToString(content);
+      }
     } catch {
       return undefined;
     }
@@ -116,7 +132,13 @@ export class WebpackCompilerHost implements ts.CompilerHost {
   readFileBuffer(fileName: string): Buffer {
     const filePath = this.resolve(fileName);
 
-    return Buffer.from(this._syncHost.read(filePath));
+    if (this._memoryHost.isFile(filePath)) {
+      return Buffer.from(this._memoryHost.read(filePath));
+    } else {
+      const content = this._syncHost.read(filePath);
+
+      return Buffer.from(content);
+    }
   }
 
   private _makeStats(stats: virtualFs.Stats<Partial<Stats>>): Stats {
@@ -154,7 +176,7 @@ export class WebpackCompilerHost implements ts.CompilerHost {
 
     let stats: virtualFs.Stats<Partial<Stats>> | Stats | null = null;
     try {
-      stats = this._syncHost.stat(p);
+      stats = this._memoryHost.stat(p) || this._syncHost.stat(p);
     } catch { }
 
     if (!stats) {
@@ -172,7 +194,7 @@ export class WebpackCompilerHost implements ts.CompilerHost {
     const p = this.resolve(directoryName);
 
     try {
-      return this._syncHost.isDirectory(p);
+      return this._memoryHost.isDirectory(p) || this._syncHost.isDirectory(p);
     } catch {
       return false;
     }
@@ -194,14 +216,37 @@ export class WebpackCompilerHost implements ts.CompilerHost {
       delegated = [];
     }
 
-    return delegated;
+    let memory: string[];
+    try {
+      memory = this._memoryHost.list(p).filter(x => {
+        try {
+          return this._memoryHost.isDirectory(join(p, x));
+        } catch {
+          return false;
+        }
+      });
+    } catch {
+      memory = [];
+    }
+
+    return [...new Set([...delegated, ...memory])];
   }
 
   getSourceFile(fileName: string, languageVersion: ts.ScriptTarget, onError?: OnErrorFn) {
+    const p = this.resolve(fileName);
+
     try {
+      const cached = this._sourceFileCache.get(p);
+      if (cached) {
+        return cached;
+      }
+
       const content = this.readFile(fileName);
-      if (content != undefined) {
-        return ts.createSourceFile(workaroundResolve(fileName), content, languageVersion, true);
+      if (content !== undefined) {
+        const sf = ts.createSourceFile(workaroundResolve(fileName), content, languageVersion, true);
+        this._sourceFileCache.set(p, sf);
+
+        return sf;
       }
     } catch (e) {
       if (onError) {
@@ -229,7 +274,7 @@ export class WebpackCompilerHost implements ts.CompilerHost {
       const p = this.resolve(fileName);
 
       try {
-        this._syncHost.write(p, virtualFs.stringToFileBuffer(data));
+        this._memoryHost.write(p, virtualFs.stringToFileBuffer(data));
       } catch (e) {
         if (onError) {
           onError(e.message);

From 9ef66e2a3dd3a30e58816a7516895ca22a63c13a Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 5 Oct 2018 13:52:14 -0400
Subject: [PATCH 0286/1703] test(@angular-devkit/build-angular): disable flaky
 poll test

---
 .../build_angular/test/browser/poll_spec_large.ts               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/poll_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/poll_spec_large.ts
index b6c614503d30..d3565810baf3 100644
--- a/packages/angular_devkit/build_angular/test/browser/poll_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/poll_spec_large.ts
@@ -15,7 +15,7 @@ describe('Browser Builder poll', () => {
   beforeEach(done => host.initialize().toPromise().then(done, done.fail));
   afterEach(done => host.restore().toPromise().then(done, done.fail));
 
-  it('works', (done) => {
+  xit('works', (done) => {
     const overrides = { watch: true, poll: 2000 };
     const intervals: number[] = [];
     let startTime: number | undefined;

From 90e69805b2d4a0b545792ef0bd252b5de4d20586 Mon Sep 17 00:00:00 2001
From: Igor Minar <igor@angular.io>
Date: Fri, 5 Oct 2018 10:40:52 -0700
Subject: [PATCH 0287/1703] fix(@schematics/angular): tweak the `ng new`
 routing prompt

---
 packages/schematics/angular/ng-new/schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
index cefb1a6a8974..e79aeffc79b4 100644
--- a/packages/schematics/angular/ng-new/schema.json
+++ b/packages/schematics/angular/ng-new/schema.json
@@ -100,7 +100,7 @@
       "type": "boolean",
       "description": "Generates a routing module.",
       "default": false,
-      "x-prompt": "Would you like to generate a routing module?"
+      "x-prompt": "Would you like to add Angular routing?"
     },
     "prefix": {
       "type": "string",

From d1b6e71b35e0ccd3c784dd71c83bb74d7c63bcb9 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Fri, 5 Oct 2018 10:46:29 -0700
Subject: [PATCH 0288/1703] fix(@schematics/angular): use proper project root
 for e2e

When creating an application, the project root was always "projects/e2e". This
is undesired as it leads to conflicts when creating another app.

Fix #12491.
---
 packages/schematics/angular/application/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index a5b061c52a69..4020f216c676 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -279,7 +279,7 @@ export default function (options: ApplicationOptions): Rule {
       name: `${options.name}-e2e`,
       relatedAppName: options.name,
       rootSelector: appRootSelector,
-      projectRoot: newProjectRoot ? `${newProjectRoot}/e2e` : 'e2e',
+      projectRoot: newProjectRoot ? `${newProjectRoot}/${options.name}-e2e` : 'e2e',
     };
 
     return chain([

From 248d531fe2d823cf10572925f279c7570d56364d Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Fri, 5 Oct 2018 15:07:50 -0700
Subject: [PATCH 0289/1703] release: v7.0.0-rc.2

---
 .monorepo.json | 76 +++++++++++++++++++++++++-------------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index 46e616e86557..aea9500b922e 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,16 +42,16 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.9.0-rc.1",
-      "hash": "a9b1f213a4069f789d20021bda616775"
+      "version": "0.9.0-rc.2",
+      "hash": "ed6f2ae751fd3db351a20ae55349e8ad"
     },
     "@_/builders": {
-      "version": "0.9.0-rc.1",
-      "hash": "f34470f978203f13c312094472b0a343"
+      "version": "0.9.0-rc.2",
+      "hash": "569aef8bc23693c344e71b9755e62c50"
     },
     "devkit": {
-      "version": "0.9.0-rc.1",
-      "hash": "3552542bc61cedbeab0fd5b9dd6ae44c"
+      "version": "0.9.0-rc.2",
+      "hash": "9230702b29c8827fca50617e90f4db62"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -62,15 +62,15 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md"
         }
       ],
-      "version": "7.0.0-rc.1",
+      "version": "7.0.0-rc.2",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "71c538637e997e786449b8be2f5549f1"
+      "hash": "0f0265f67cbd611fe76f9cf2a35eac46"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.9.0-rc.1",
-      "hash": "57add138d13c50761208286b625d8111",
+      "version": "0.9.0-rc.2",
+      "hash": "a575d61acf532ea665ac6705e91a0369",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -81,21 +81,21 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.9.0-rc.1",
-      "hash": "6bdbfa3a9aed04efa9509be2b553124c",
+      "version": "0.9.0-rc.2",
+      "hash": "c644f2be33bdc5068cf74fb4f7c39e29",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.9.0-rc.1",
-      "hash": "c1eb256f9547fb5c836ec70dd2c408f8",
+      "version": "0.9.0-rc.2",
+      "hash": "f0ad25801262bdf4cd4a83f678af7dd6",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
       "name": "Benchmark",
       "section": "Tooling",
-      "version": "1.0.0-rc.1",
-      "hash": "c11b907aeab37274a842f73524ec5e73"
+      "version": "1.0.0-rc.2",
+      "hash": "4809184dd4ad5a0b8e3e28ff460a2837"
     },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
@@ -105,8 +105,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.9.0-rc.1",
-      "hash": "e8feec7840897e25731c34238506deae",
+      "version": "0.9.0-rc.2",
+      "hash": "ab55ec940e1f2e84073b45a16d45e3cd",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -117,8 +117,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.9.0-rc.1",
-      "hash": "977f57fe835fac53197d7b288b760268",
+      "version": "0.9.0-rc.2",
+      "hash": "a7cb02fd554c0947889e974cb9046d96",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -129,8 +129,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.9.0-rc.1",
-      "hash": "d0909d1a833531ef8b6d986e66a07311",
+      "version": "0.9.0-rc.2",
+      "hash": "d7fd8733c5b28f1ef21528b0066f0d1a",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -141,9 +141,9 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.9.0-rc.1",
+      "version": "0.9.0-rc.2",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "a5f928555a349b1e584964911ef55c9a"
+      "hash": "a2574369237d6b3769f7602ff8fa4a31"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -153,8 +153,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "7.0.0-rc.1",
-      "hash": "a24d7471f344677ee8ca3c8040dfe525",
+      "version": "7.0.0-rc.2",
+      "hash": "a5844a4ed97391807c4fd12cb2ef1cf2",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -165,43 +165,43 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "7.0.0-rc.1",
-      "hash": "0aa3a0aade670fd19956e25e2963af54",
+      "version": "7.0.0-rc.2",
+      "hash": "c17d545d96ae49c8a80275cfc986eb4c",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.9.0-rc.1",
-      "hash": "c6b8c15ed7abad30375f61b1e2ef66c0",
+      "version": "0.9.0-rc.2",
+      "hash": "e1fdd7b7f2ea718c3a22d16915a91ff6",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "7.0.0-rc.1",
+      "version": "7.0.0-rc.2",
       "section": "Misc",
-      "hash": "86d64917c76fb65c37572e7ec2748ccb",
+      "hash": "780c036bfa14accd80cd0bd4c2c7704d",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "7.0.0-rc.1",
-      "hash": "db9156bfaccc70bac955fb15def05fe3",
+      "version": "7.0.0-rc.2",
+      "hash": "f204ff9639c871494ac8fe050e327df0",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.9.0-rc.1",
+      "version": "0.9.0-rc.2",
       "section": "Schematics",
-      "hash": "1ad492543597cb539b795682c5c3e1bf",
+      "hash": "4a3e9d9fc64c6efddb0dfba3b745c92a",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.9.0-rc.1",
+      "version": "0.9.0-rc.2",
       "section": "Schematics",
-      "hash": "1126ff9f1093897d184a696b6c72764a",
+      "hash": "6706dfa9fbc9cdbc892fb6e9ed8026f8",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }

From e3f56ebc71d57c79528fb4926a267e5ed4f9c74d Mon Sep 17 00:00:00 2001
From: vikerman <vikerman@users.noreply.github.com>
Date: Tue, 9 Oct 2018 06:37:50 -0700
Subject: [PATCH 0290/1703] fix(@schematics/angular): ast utils - handle
 NgModule with no newlines (#12521)

Exposed in Google where the formatting is different. Check for null before using a regex match result.
---
 packages/schematics/angular/utility/ast-utils.ts  |  2 +-
 .../schematics/angular/utility/ast-utils_spec.ts  | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/angular/utility/ast-utils.ts b/packages/schematics/angular/utility/ast-utils.ts
index 96479d02e964..2442f0661793 100644
--- a/packages/schematics/angular/utility/ast-utils.ts
+++ b/packages/schematics/angular/utility/ast-utils.ts
@@ -395,7 +395,7 @@ export function addSymbolToNgModuleMetadata(
       // Get the indentation of the last element, if any.
       const text = node.getFullText(source);
       const matches = text.match(/^\r?\n\s*/);
-      if (matches.length > 0) {
+      if (matches && matches.length > 0) {
         toInsert = `,${matches[0]}${metadataField}: [${symbolName}]`;
       } else {
         toInsert = `, ${metadataField}: [${symbolName}]`;
diff --git a/packages/schematics/angular/utility/ast-utils_spec.ts b/packages/schematics/angular/utility/ast-utils_spec.ts
index 1ea30a5126a5..bd694b6499a3 100644
--- a/packages/schematics/angular/utility/ast-utils_spec.ts
+++ b/packages/schematics/angular/utility/ast-utils_spec.ts
@@ -151,4 +151,19 @@ describe('ast utils', () => {
     const output = applyChanges(modulePath, moduleContent, changes || []);
     expect(output).toMatch(/imports: \[HelloWorld],\r?\n/m);
   });
+
+  it('should handle NgModule with no newlines', () => {
+    const moduleContent = `
+      import { BrowserModule } from '@angular/platform-browser';
+      import { NgModule } from '@angular/core';
+
+      @NgModule({imports: [BrowserModule], declarations: []})
+      export class AppModule { }
+    `;
+    const source = getTsSource(modulePath, moduleContent);
+    const changes = addExportToModule(source, modulePath, 'FooComponent', './foo.component');
+    const output = applyChanges(modulePath, moduleContent, changes);
+    expect(output).toMatch(/import { FooComponent } from '.\/foo.component';/);
+    expect(output).toMatch(/exports: \[FooComponent\]/);
+  });
 });

From 0cfbdbc045c6e322399a2161d42816d94fbed9fe Mon Sep 17 00:00:00 2001
From: vikerman <vikerman@users.noreply.github.com>
Date: Tue, 9 Oct 2018 07:45:47 -0700
Subject: [PATCH 0291/1703] refactor: Add an extra option to not use dasherize
 in findModuleFromOptions (#12500)

In Google we prefer underscore instead of dashes. So this options is useful there.
---
 packages/schematics/angular/utility/find-module.ts     |  4 +++-
 .../schematics/angular/utility/find-module_spec.ts     | 10 +++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/utility/find-module.ts b/packages/schematics/angular/utility/find-module.ts
index f1485c2aefb2..32eb6645d86a 100644
--- a/packages/schematics/angular/utility/find-module.ts
+++ b/packages/schematics/angular/utility/find-module.ts
@@ -25,6 +25,7 @@ export interface ModuleOptions {
   skipImport?: boolean;
   moduleExt?: string;
   routingModuleExt?: string;
+  nameFormatter?: (str: string) => string;
 }
 
 const MODULE_EXT = '.module.ts';
@@ -42,8 +43,9 @@ export function findModuleFromOptions(host: Tree, options: ModuleOptions): Path
   const routingModuleExt = options.routingModuleExt || ROUTING_MODULE_EXT;
 
   if (!options.module) {
+    options.nameFormatter = options.nameFormatter || strings.dasherize;
     const pathToCheck = (options.path || '')
-      + (options.flat ? '' : '/' + strings.dasherize(options.name));
+      + (options.flat ? '' : '/' + options.nameFormatter(options.name));
 
     return normalize(findModule(host, pathToCheck, moduleExt, routingModuleExt));
   } else {
diff --git a/packages/schematics/angular/utility/find-module_spec.ts b/packages/schematics/angular/utility/find-module_spec.ts
index babbdcbdb6a3..70e1034445d4 100644
--- a/packages/schematics/angular/utility/find-module_spec.ts
+++ b/packages/schematics/angular/utility/find-module_spec.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Path } from '@angular-devkit/core';
+import { Path, strings } from '@angular-devkit/core';
 import { EmptyTree, Tree } from '@angular-devkit/schematics';
 import { ModuleOptions, findModule, findModuleFromOptions } from './find-module';
 
@@ -111,6 +111,14 @@ describe('find-module', () => {
       expect(modPath).toEqual('/projects/my-proj/src/app.module.ts' as Path);
     });
 
+    it('should find a module if nameFormatter is provided', () => {
+      tree.create('/projects/my-proj/src/app_test.module.ts', '');
+      options.path = '/projects/my-proj/src';
+      options.nameFormatter = strings.underscore;
+      const modPath = findModuleFromOptions(tree, options);
+      expect(modPath).toEqual('/projects/my-proj/src/app_test.module.ts' as Path);
+    });
+
     it('should find a module in a sub dir', () => {
       tree.create('/projects/my-proj/src/admin/foo.module.ts', '');
       options.name = 'other/test';

From 7d5caeb8eb7e5734702f811a10d31aca283322a7 Mon Sep 17 00:00:00 2001
From: Rohit Sarkar <rohitsarkar5398@gmail.com>
Date: Thu, 11 Oct 2018 00:36:56 +0530
Subject: [PATCH 0292/1703] docs(@angular/cli): Change `npm install` to `yarn`
 to install (#12495)

dependencies.
---
 packages/angular/cli/README.md | 2 +-
 yarn.lock                      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/README.md b/packages/angular/cli/README.md
index a0e74dfcf7e4..ec1841a7bacc 100644
--- a/packages/angular/cli/README.md
+++ b/packages/angular/cli/README.md
@@ -162,7 +162,7 @@ You can find more details about changes between versions in [the Releases tab on
 
 ```bash
 git clone https://github.com/angular/angular-cli.git
-npm install
+yarn
 npm run build
 cd dist/@angular/cli
 npm link
diff --git a/yarn.lock b/yarn.lock
index f477d287ab68..8120b24f1407 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7541,6 +7541,7 @@ scss-tokenizer@^0.2.3:
 seedrandom@^2.4.4:
   version "2.4.4"
   resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-2.4.4.tgz#b25ea98632c73e45f58b77cfaa931678df01f9ba"
+  integrity sha512-9A+PDmgm+2du77B5i0Ip2cxOqqHjgNxnBgglxLcX78A2D6c2rTo61z4jnVABpF4cKeDMDG+cmXXvdnqse2VqMA==
 
 select-hose@^2.0.0:
   version "2.0.0"

From 2bdf99bad3fdb1cb83c919ef5c1778476405ddb5 Mon Sep 17 00:00:00 2001
From: clydin <19598772+clydin@users.noreply.github.com>
Date: Wed, 10 Oct 2018 15:07:13 -0400
Subject: [PATCH 0293/1703] test: cleanup poll CLI E2E test (#12497)

* test: cleanup poll CLI E2E test

* test(@angular-devkit/build-angular): adjust poll test
---
 .../test/browser/poll_spec_large.ts           | 10 ++--
 tests/legacy-cli/e2e/tests/build/poll.ts      | 46 ++++++++-----------
 2 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/poll_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/poll_spec_large.ts
index d3565810baf3..ea2b42387d58 100644
--- a/packages/angular_devkit/build_angular/test/browser/poll_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/poll_spec_large.ts
@@ -15,8 +15,8 @@ describe('Browser Builder poll', () => {
   beforeEach(done => host.initialize().toPromise().then(done, done.fail));
   afterEach(done => host.restore().toPromise().then(done, done.fail));
 
-  xit('works', (done) => {
-    const overrides = { watch: true, poll: 2000 };
+  it('works', (done) => {
+    const overrides = { watch: true, poll: 10000 };
     const intervals: number[] = [];
     let startTime: number | undefined;
     runTargetSpec(host, browserTargetSpec, overrides).pipe(
@@ -30,12 +30,12 @@ describe('Browser Builder poll', () => {
         startTime = Date.now();
         host.appendToFile('src/main.ts', 'console.log(1);');
       }),
-      take(6),
+      take(4),
     ).subscribe(undefined, done.fail, () => {
       intervals.sort();
       const median = intervals[Math.trunc(intervals.length / 2)];
-      expect(median).toBeGreaterThan(1000);
-      expect(median).toBeLessThan(4000);
+      expect(median).toBeGreaterThan(3000);
+      expect(median).toBeLessThan(12000);
       done();
     });
   });
diff --git a/tests/legacy-cli/e2e/tests/build/poll.ts b/tests/legacy-cli/e2e/tests/build/poll.ts
index a76a8c6f1052..e2aacf46f586 100644
--- a/tests/legacy-cli/e2e/tests/build/poll.ts
+++ b/tests/legacy-cli/e2e/tests/build/poll.ts
@@ -1,42 +1,32 @@
+import { appendToFile } from '../../utils/fs';
 import {
   killAllProcesses,
   waitForAnyProcessOutputToMatch,
-  execAndWaitForOutputToMatch
 } from '../../utils/process';
-import {appendToFile} from '../../utils/fs';
-import {expectToFail, wait} from '../../utils/utils';
+import { ngServe } from '../../utils/project';
+import { expectToFail, wait } from '../../utils/utils';
 
 const webpackGoodRegEx = /: Compiled successfully./;
 
-export default function() {
-  // TODO(architect): This test is behaving oddly both here and in devkit/build-angular.
-  // It seems to be because of file watchers.
-  return;
+export default async function() {
+  try {
+    await ngServe('--poll=10000');
 
-
-  // @filipesilva: This test doesn't work correctly on CircleCI while being ran by the test script.
-  // Polling time seems to be ignored and several builds are fired per second.
-  // Debugging showed that webpack things the `src/` directory changed on each rebuild.
-  // Disabling for now.
-  if (process.env['CIRCLECI']) {
-    return;
-  }
-
-
-  return execAndWaitForOutputToMatch('ng', ['build', '--watch', '--poll=10000'], webpackGoodRegEx)
     // Wait before editing a file.
     // Editing too soon seems to trigger a rebuild and throw polling out of whack.
-    .then(() => wait(3000))
-    .then(() => appendToFile('src/main.ts', 'console.log(1);'))
+    await wait(3000);
+    await appendToFile('src/main.ts', 'console.log(1);');
+
     // We have to wait poll time + rebuild build time for the regex match.
-    .then(() => waitForAnyProcessOutputToMatch(webpackGoodRegEx, 14000))
-    .then(() => appendToFile('src/main.ts', 'console.log(1);'))
+    await waitForAnyProcessOutputToMatch(webpackGoodRegEx, 14000);
+
     // No rebuilds should occur for a while
-    .then(() => expectToFail(() => waitForAnyProcessOutputToMatch(webpackGoodRegEx, 7000)))
+    await appendToFile('src/main.ts', 'console.log(1);');
+    await expectToFail(() => waitForAnyProcessOutputToMatch(webpackGoodRegEx, 7000));
+
     // But a rebuild should happen roughly within the 10 second window.
-    .then(() => waitForAnyProcessOutputToMatch(webpackGoodRegEx, 7000))
-    .then(() => killAllProcesses(), (err: any) => {
-      killAllProcesses();
-      throw err;
-    });
+    await waitForAnyProcessOutputToMatch(webpackGoodRegEx, 7000);
+  } finally {
+    killAllProcesses();
+  }
 }

From 907ce5c94c774147c4b52870b3522aed4e087c76 Mon Sep 17 00:00:00 2001
From: Rohit Sarkar <rohitsarkar5398@gmail.com>
Date: Thu, 11 Oct 2018 00:38:24 +0530
Subject: [PATCH 0294/1703] feat(@schematics/angular): Add --minimal flag to
 generate a barebones (#12498)

project
---
 .../schematics/angular/application/index.ts   | 20 ++++++++++++++++++-
 .../angular/application/schema.json           |  5 +++++
 packages/schematics/angular/ng-new/index.ts   |  1 +
 .../schematics/angular/ng-new/schema.json     |  5 +++++
 .../angular/workspace/files/package.json      |  6 +++---
 .../schematics/angular/workspace/schema.json  |  5 +++++
 tests/legacy-cli/e2e_runner.ts                |  1 -
 7 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 4020f216c676..213c9f20de77 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -240,6 +240,14 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
   return addProjectToWorkspace(workspace, options.name, project);
 }
 
+function minimalPathFilter(path: string): boolean {
+  const toRemoveList: RegExp[] = [/e2e\//, /editorconfig/, /README/, /karma.conf.js/,
+                                  /protractor.conf.js/, /test.ts/, /tsconfig.spec.json/,
+                                  /tslint.json/, /favicon.ico/];
+
+  return !toRemoveList.some(re => re.test(path));
+}
+
 export default function (options: ApplicationOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
     if (!options.name) {
@@ -248,12 +256,19 @@ export default function (options: ApplicationOptions): Rule {
     validateProjectName(options.name);
     const prefix = options.prefix || 'app';
     const appRootSelector = `${prefix}-root`;
-    const componentOptions = {
+    const componentOptions = !options.minimal ?
+    {
       inlineStyle: options.inlineStyle,
       inlineTemplate: options.inlineTemplate,
       spec: !options.skipTests,
       styleext: options.style,
       viewEncapsulation: options.viewEncapsulation,
+    } :
+    {
+      inlineStyle: true,
+      InlineTemplate: true,
+      spec: false,
+      styleext: options.style,
     };
 
     const workspace = getWorkspace(host);
@@ -287,6 +302,7 @@ export default function (options: ApplicationOptions): Rule {
       options.skipPackageJson ? noop() : addDependenciesToPackageJson(),
       mergeWith(
         apply(url('./files/src'), [
+          options.minimal ? filter(minimalPathFilter) : noop(),
           template({
             utils: strings,
             ...options,
@@ -297,6 +313,7 @@ export default function (options: ApplicationOptions): Rule {
         ])),
       mergeWith(
         apply(url('./files/root'), [
+          options.minimal ? filter(minimalPathFilter) : noop(),
           template({
             utils: strings,
             ...options,
@@ -308,6 +325,7 @@ export default function (options: ApplicationOptions): Rule {
         ])),
       mergeWith(
         apply(url('./files/lint'), [
+          options.minimal ? filter(minimalPathFilter) : noop(),
           template({
             utils: strings,
             ...options,
diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json
index 6c2db3d8f543..cb833cd4b059 100644
--- a/packages/schematics/angular/application/schema.json
+++ b/packages/schematics/angular/application/schema.json
@@ -66,6 +66,11 @@
       "type": "boolean",
       "default": false,
       "description": "Do not add dependencies to package.json."
+    },
+    "minimal": {
+      "description": "Create a barebones project without any testing frameworks",
+      "type": "boolean",
+      "default": false
     }
   },
   "required": [
diff --git a/packages/schematics/angular/ng-new/index.ts b/packages/schematics/angular/ng-new/index.ts
index a5229e6dcf86..aab49ab4a894 100644
--- a/packages/schematics/angular/ng-new/index.ts
+++ b/packages/schematics/angular/ng-new/index.ts
@@ -42,6 +42,7 @@ export default function (options: NgNewOptions): Rule {
     version: options.version,
     experimentalAngularNext: options.experimentalIvy,
     newProjectRoot: options.newProjectRoot || 'projects',
+    minimal: options.minimal,
   };
   const applicationOptions: ApplicationOptions = {
     projectRoot: '',
diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
index e79aeffc79b4..e80bc82bc3de 100644
--- a/packages/schematics/angular/ng-new/schema.json
+++ b/packages/schematics/angular/ng-new/schema.json
@@ -136,6 +136,11 @@
       "description": "Flag to toggle creation of an application in the new workspace.",
       "type": "boolean",
       "default": true
+    },
+    "minimal": {
+      "description": "Create a barebones project without any testing frameworks",
+      "type": "boolean",
+      "default": false
     }
   },
   "required": [
diff --git a/packages/schematics/angular/workspace/files/package.json b/packages/schematics/angular/workspace/files/package.json
index ad89cd8a75ae..3810f58197f3 100644
--- a/packages/schematics/angular/workspace/files/package.json
+++ b/packages/schematics/angular/workspace/files/package.json
@@ -28,9 +28,9 @@
     "@angular/cli": "<%= experimentalAngularNext ? 'next' : '~' + version %>",
     "@angular/compiler-cli": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
     "@angular/language-service": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
-    "@types/jasmine": "~2.8.8",
-    "@types/jasminewd2": "~2.0.3",
     "@types/node": "~8.9.4",
+    <% if (!minimal) { %>"@types/jasmine": "~2.8.8",
+    "@types/jasminewd2": "~2.0.3",
     "codelyzer": "~4.3.0",
     "jasmine-core": "~2.99.1",
     "jasmine-spec-reporter": "~4.2.1",
@@ -39,7 +39,7 @@
     "karma-coverage-istanbul-reporter": "~2.0.1",
     "karma-jasmine": "~1.1.2",
     "karma-jasmine-html-reporter": "^0.2.2",
-    "protractor": "~5.4.0",
+    "protractor": "~5.4.0",<% } %>
     "ts-node": "~7.0.0",
     "tslint": "~5.11.0",
     "typescript": "<%= latestVersions.TypeScript %>"
diff --git a/packages/schematics/angular/workspace/schema.json b/packages/schematics/angular/workspace/schema.json
index c5f296fb06c7..9268d1b64006 100644
--- a/packages/schematics/angular/workspace/schema.json
+++ b/packages/schematics/angular/workspace/schema.json
@@ -73,6 +73,11 @@
       "$default": {
         "$source": "ng-cli-version"
       }
+    },
+    "minimal": {
+      "description": "Create a barebones project without any testing frameworks",
+      "type": "boolean",
+      "default": false
     }
   },
   "required": [
diff --git a/tests/legacy-cli/e2e_runner.ts b/tests/legacy-cli/e2e_runner.ts
index 7eebdf2acb23..0f2db025b2bf 100644
--- a/tests/legacy-cli/e2e_runner.ts
+++ b/tests/legacy-cli/e2e_runner.ts
@@ -114,7 +114,6 @@ const allTests = glob.sync(path.join(e2eRoot, testGlob), { nodir: true, ignore:
   // Replace windows slashes.
   .map(name => name.replace(/\\/g, '/'))
   .filter(name => !name.endsWith('/build-app-shell-with-schematic.ts'))
-  .filter(name => !name.endsWith('/new-minimal.ts'))
   // IS this test still valid? \/
   .filter(name => !name.endsWith('/module-id.ts'))
   // Do we want to support this?

From 023a67254e5b90e658edff468df2ee151d322b78 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 10 Oct 2018 20:09:02 +0100
Subject: [PATCH 0295/1703] fix(@angular-devkit/build-angular): don't override
 missing options in protractor (#12507)

Fix #10697
---
 .../angular_devkit/build_angular/src/protractor/index.ts   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/protractor/index.ts b/packages/angular_devkit/build_angular/src/protractor/index.ts
index e4427bd254c3..0c80ad9689e2 100644
--- a/packages/angular_devkit/build_angular/src/protractor/index.ts
+++ b/packages/angular_devkit/build_angular/src/protractor/index.ts
@@ -58,8 +58,11 @@ export class ProtractorBuilder implements Builder<ProtractorBuilderOptions> {
   private _startDevServer(options: ProtractorBuilderOptions) {
     const architect = this.context.architect;
     const [project, targetName, configuration] = (options.devServerTarget as string).split(':');
-    // Override browser build watch setting.
-    const overrides = { watch: false, host: options.host, port: options.port };
+    // Override dev server watch setting.
+    const overrides: Partial<DevServerBuilderOptions> = { watch: false };
+    // Also override the port and host if they are defined in protractor options.
+    if (options.host !== undefined) { overrides.host = options.host; }
+    if (options.port !== undefined) { overrides.port = options.port; }
     const targetSpec = { project, target: targetName, configuration, overrides };
     const builderConfig = architect.getBuilderConfiguration<DevServerBuilderOptions>(targetSpec);
     let devServerDescription: BuilderDescription;

From 150dd4755b16d4e5ccf77a297d2064bf017f34cb Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 10 Oct 2018 21:09:32 +0200
Subject: [PATCH 0296/1703] fix(@schematics/angular): codeCoverage exclude is
 not being migrated (#12511)

Fixes #10936
---
 packages/angular_devkit/build_angular/src/protractor/index.ts | 4 ++--
 .../build_angular/test/protractor/works_spec_large.ts         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/protractor/index.ts b/packages/angular_devkit/build_angular/src/protractor/index.ts
index 0c80ad9689e2..ddbd55e85a77 100644
--- a/packages/angular_devkit/build_angular/src/protractor/index.ts
+++ b/packages/angular_devkit/build_angular/src/protractor/index.ts
@@ -131,10 +131,10 @@ export class ProtractorBuilder implements Builder<ProtractorBuilderOptions> {
   }
 
   private _runProtractor(root: Path, options: ProtractorBuilderOptions): Observable<BuildEvent> {
-    const additionalProtractorConfig = {
+    const additionalProtractorConfig: Partial<ProtractorBuilderOptions> = {
       elementExplorer: options.elementExplorer,
       baseUrl: options.baseUrl,
-      spec: options.specs.length ? options.specs : undefined,
+      specs: options.specs.length ? options.specs : undefined,
       suite: options.suite,
     };
 
diff --git a/packages/angular_devkit/build_angular/test/protractor/works_spec_large.ts b/packages/angular_devkit/build_angular/test/protractor/works_spec_large.ts
index a2fabe5d3b51..0970512d951b 100644
--- a/packages/angular_devkit/build_angular/test/protractor/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/protractor/works_spec_large.ts
@@ -32,9 +32,9 @@ describe('Protractor Builder', () => {
 
   it('overrides protractor specs', (done) => {
     host.scopedSync().rename(normalize('./e2e/app.e2e-spec.ts'),
-      normalize('./e2e/renamed-app.e2e-spec.ts'));
+      normalize('./e2e/renamed-app.e2e.spec.ts'));
 
-    const overrides = { specs: ['./e2e/renamed-app.e2e-spec.ts'] };
+    const overrides = { specs: ['./e2e/renamed-app.e2e.spec.ts'] };
 
     runTargetSpec(host, protractorTargetSpec, overrides).pipe(
       retry(3),

From 2d5c6eba2398856e6ba1eb920f169ad9836d5c34 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 10 Oct 2018 21:09:57 +0200
Subject: [PATCH 0297/1703] fix(@schematics/angular): codeCoverage exclude is
 not being migrated (#12513)

Fixes #10936
---
 .../schematics/angular/migrations/update-6/index.ts   | 11 ++++++++++-
 .../angular/migrations/update-6/index_spec.ts         |  6 ++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/angular/migrations/update-6/index.ts b/packages/schematics/angular/migrations/update-6/index.ts
index e5338f19213d..f64ab8aa1ee7 100644
--- a/packages/schematics/angular/migrations/update-6/index.ts
+++ b/packages/schematics/angular/migrations/update-6/index.ts
@@ -472,7 +472,16 @@ function extractProjectsConfig(
 
       if (app.testTsconfig) {
           testOptions.tsConfig = appRoot + '/' + app.testTsconfig;
-        }
+      }
+
+      const codeCoverageExclude = config.test
+        && config.test.codeCoverage
+        && config.test.codeCoverage.exclude;
+
+      if (codeCoverageExclude) {
+        testOptions.codeCoverageExclude = codeCoverageExclude;
+      }
+
       testOptions.scripts = (app.scripts || []).map(_extraEntryMapper);
       testOptions.styles = (app.styles || []).map(_extraEntryMapper);
       testOptions.assets = (app.assets || []).map(_mapAssets).filter(x => !!x);
diff --git a/packages/schematics/angular/migrations/update-6/index_spec.ts b/packages/schematics/angular/migrations/update-6/index_spec.ts
index d4ff5748eb6e..c614f718f130 100644
--- a/packages/schematics/angular/migrations/update-6/index_spec.ts
+++ b/packages/schematics/angular/migrations/update-6/index_spec.ts
@@ -93,6 +93,11 @@ describe('Migration to v6', () => {
         karma: {
           config: './karma.conf.js',
         },
+        codeCoverage: {
+          exclude: [
+            './excluded.spec.ts',
+          ],
+        },
       },
       defaults: {
         styleExt: 'css',
@@ -657,6 +662,7 @@ describe('Migration to v6', () => {
         expect(test.options.polyfills).toEqual('src/polyfills.ts');
         expect(test.options.tsConfig).toEqual('src/tsconfig.spec.json');
         expect(test.options.karmaConfig).toEqual('./karma.conf.js');
+        expect(test.options.codeCoverageExclude).toEqual(['./excluded.spec.ts']);
         expect(test.options.scripts).toEqual([]);
         expect(test.options.styles).toEqual(['src/styles.css']);
         expect(test.options.assets).toEqual([

From b8eee02205329c8f1f1fdc682b3ef04650a34ec9 Mon Sep 17 00:00:00 2001
From: clydin <19598772+clydin@users.noreply.github.com>
Date: Wed, 10 Oct 2018 15:10:56 -0400
Subject: [PATCH 0298/1703] fix(@schematics/angular): migrate existing packages
 for 7.0 (#12518)

Fixes: #12458
---
 packages/schematics/angular/migrations/update-7/index.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/angular/migrations/update-7/index.ts b/packages/schematics/angular/migrations/update-7/index.ts
index 682463a0041c..75757e75ec59 100644
--- a/packages/schematics/angular/migrations/update-7/index.ts
+++ b/packages/schematics/angular/migrations/update-7/index.ts
@@ -10,6 +10,7 @@ import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import {
   NodeDependencyType,
   addPackageJsonDependency,
+  getPackageJsonDependency,
 } from '../../utility/dependencies';
 import { latestVersions } from '../../utility/latest-versions';
 
@@ -17,10 +18,13 @@ export { polyfillMetadataRule } from './polyfill-metadata';
 
 export default function(): Rule {
   return (tree, context) => {
+    const existing = getPackageJsonDependency(tree, '@angular-devkit/build-angular');
+    const type = existing ? existing.type : NodeDependencyType.Dev;
+
     addPackageJsonDependency(
       tree,
       {
-        type: NodeDependencyType.Dev,
+        type,
         name: '@angular-devkit/build-angular',
         version: latestVersions.DevkitBuildAngular,
         overwrite: true,

From e9a8c3cfa89e42322d53883b276e16babb572032 Mon Sep 17 00:00:00 2001
From: clydin <19598772+clydin@users.noreply.github.com>
Date: Wed, 10 Oct 2018 15:11:12 -0400
Subject: [PATCH 0299/1703] feat(@schematics/angular): add prompts for all name
 options (#12519)

---
 packages/schematics/angular/application/schema.json | 3 ++-
 packages/schematics/angular/class/schema.json       | 3 ++-
 packages/schematics/angular/component/schema.json   | 3 ++-
 packages/schematics/angular/directive/schema.json   | 3 ++-
 packages/schematics/angular/enum/schema.json        | 3 ++-
 packages/schematics/angular/guard/schema.json       | 3 ++-
 packages/schematics/angular/interface/schema.json   | 3 ++-
 packages/schematics/angular/library/schema.json     | 3 ++-
 packages/schematics/angular/module/schema.json      | 3 ++-
 packages/schematics/angular/pipe/schema.json        | 3 ++-
 packages/schematics/angular/service/schema.json     | 3 ++-
 11 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json
index cb833cd4b059..86d71341402c 100644
--- a/packages/schematics/angular/application/schema.json
+++ b/packages/schematics/angular/application/schema.json
@@ -15,7 +15,8 @@
       "$default": {
         "$source": "argv",
         "index": 0
-      }
+      },
+      "x-prompt": "What name would you like to use for the application?"
     },
     "experimentalIvy": {
       "description": "EXPERIMENTAL: Specifies whether to create a new application which uses the Ivy rendering engine.",
diff --git a/packages/schematics/angular/class/schema.json b/packages/schematics/angular/class/schema.json
index 22323008c5f3..9995a0b4c8f9 100644
--- a/packages/schematics/angular/class/schema.json
+++ b/packages/schematics/angular/class/schema.json
@@ -10,7 +10,8 @@
       "$default": {
         "$source": "argv",
         "index": 0
-      }
+      },
+      "x-prompt": "What name would you like to use for the class?"
     },
     "path": {
       "type": "string",
diff --git a/packages/schematics/angular/component/schema.json b/packages/schematics/angular/component/schema.json
index 9eb811586b08..160cce8d80f6 100644
--- a/packages/schematics/angular/component/schema.json
+++ b/packages/schematics/angular/component/schema.json
@@ -23,7 +23,8 @@
       "$default": {
         "$source": "argv",
         "index": 0
-      }
+      },
+      "x-prompt": "What name would you like to use for the component?"
     },
     "inlineStyle": {
       "description": "Specifies if the style will be in the ts file.",
diff --git a/packages/schematics/angular/directive/schema.json b/packages/schematics/angular/directive/schema.json
index 9562c5348c1c..259c1bb392d4 100644
--- a/packages/schematics/angular/directive/schema.json
+++ b/packages/schematics/angular/directive/schema.json
@@ -10,7 +10,8 @@
       "$default": {
         "$source": "argv",
         "index": 0
-      }
+      },
+      "x-prompt": "What name would you like to use for the directive?"
     },
     "path": {
       "type": "string",
diff --git a/packages/schematics/angular/enum/schema.json b/packages/schematics/angular/enum/schema.json
index f9ce0b537289..50f165a4748c 100644
--- a/packages/schematics/angular/enum/schema.json
+++ b/packages/schematics/angular/enum/schema.json
@@ -10,7 +10,8 @@
       "$default": {
         "$source": "argv",
         "index": 0
-      }
+      },
+      "x-prompt": "What name would you like to use for the enum?"
     },
     "path": {
       "type": "string",
diff --git a/packages/schematics/angular/guard/schema.json b/packages/schematics/angular/guard/schema.json
index 63cc33b91f78..ac167fb21c39 100644
--- a/packages/schematics/angular/guard/schema.json
+++ b/packages/schematics/angular/guard/schema.json
@@ -10,7 +10,8 @@
       "$default": {
         "$source": "argv",
         "index": 0
-      }
+      },
+      "x-prompt": "What name would you like to use for the guard?"
     },
     "spec": {
       "type": "boolean",
diff --git a/packages/schematics/angular/interface/schema.json b/packages/schematics/angular/interface/schema.json
index 9b747b27b2a6..63168a32b8c3 100644
--- a/packages/schematics/angular/interface/schema.json
+++ b/packages/schematics/angular/interface/schema.json
@@ -10,7 +10,8 @@
       "$default": {
         "$source": "argv",
         "index": 0
-      }
+      },
+      "x-prompt": "What name would you like to use for the interface?"
     },
     "path": {
       "type": "string",
diff --git a/packages/schematics/angular/library/schema.json b/packages/schematics/angular/library/schema.json
index 52cd9e121161..0ce8e9eac44b 100644
--- a/packages/schematics/angular/library/schema.json
+++ b/packages/schematics/angular/library/schema.json
@@ -10,7 +10,8 @@
       "$default": {
         "$source": "argv",
         "index": 0
-      }
+      },
+      "x-prompt": "What name would you like to use for the library?"
     },
     "entryFile": {
       "type": "string",
diff --git a/packages/schematics/angular/module/schema.json b/packages/schematics/angular/module/schema.json
index c52ffab315a0..20617e405f3b 100644
--- a/packages/schematics/angular/module/schema.json
+++ b/packages/schematics/angular/module/schema.json
@@ -10,7 +10,8 @@
       "$default": {
         "$source": "argv",
         "index": 0
-      }
+      },
+      "x-prompt": "What name would you like to use for the module?"
     },
     "path": {
       "type": "string",
diff --git a/packages/schematics/angular/pipe/schema.json b/packages/schematics/angular/pipe/schema.json
index 1dd16bec9fe2..ff0b21d8eff3 100644
--- a/packages/schematics/angular/pipe/schema.json
+++ b/packages/schematics/angular/pipe/schema.json
@@ -10,7 +10,8 @@
       "$default": {
         "$source": "argv",
         "index": 0
-      }
+      },
+      "x-prompt": "What name would you like to use for the pipe?"
     },
     "path": {
       "type": "string",
diff --git a/packages/schematics/angular/service/schema.json b/packages/schematics/angular/service/schema.json
index ae2b105b92d6..b9cd38ae59df 100644
--- a/packages/schematics/angular/service/schema.json
+++ b/packages/schematics/angular/service/schema.json
@@ -10,7 +10,8 @@
       "$default": {
         "$source": "argv",
         "index": 0
-      }
+      },
+      "x-prompt": "What name would you like to use for the service?"
     },
     "path": {
       "type": "string",

From d45bce2e8b148b5e8155610d4c1e24481a5dc36e Mon Sep 17 00:00:00 2001
From: clydin <19598772+clydin@users.noreply.github.com>
Date: Wed, 10 Oct 2018 15:11:26 -0400
Subject: [PATCH 0300/1703] refactor(@angular/cli): update eject command
 message (#12525)

---
 packages/angular/cli/commands/eject-impl.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/angular/cli/commands/eject-impl.ts b/packages/angular/cli/commands/eject-impl.ts
index 47fe394cc0fc..add0d12850fd 100644
--- a/packages/angular/cli/commands/eject-impl.ts
+++ b/packages/angular/cli/commands/eject-impl.ts
@@ -13,12 +13,14 @@ import { Schema as EjectCommandSchema } from './eject';
 export class EjectCommand extends Command<EjectCommandSchema> {
   async run() {
     this.logger.error(tags.stripIndents`
-      The 'eject' command has been temporarily disabled, as it is not yet compatible with the new
-      angular.json format. The new configuration format provides further flexibility to modify the
-      configuration of your workspace without ejecting. Ejection will be re-enabled in a future
-      release of the CLI.
+      The 'eject' command has been disabled and will be removed completely in 8.0.
+      The new configuration format provides increased flexibility to modify the
+      configuration of your workspace without ejecting.
 
-      If you need to eject today, use CLI 1.7 to eject your project.
+      There are several projects that can be used in conjuction with the new
+      configuration format that provide the benefits of ejecting without the maintenance
+      overhead.  One such project is ngx-build-plus found here:
+      https://github.com/manfredsteyer/ngx-build-plus
     `);
 
     return 1;

From 916a616762b13817033bd00710cff66af05fc9fb Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 10 Oct 2018 20:11:46 +0100
Subject: [PATCH 0301/1703] fix(@angular-devkit/build-angular): fix
 extractLicenses default (#12546)

It should be false so that it doesn't affect dev builds. The default production config has it set to true already.

Partially address #12432.
---
 packages/angular_devkit/build_angular/src/browser/schema.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index 9a8cfd442b53..8e6a4f3e60b4 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -171,8 +171,8 @@
     },
     "extractLicenses": {
       "type": "boolean",
-      "description": "Extract all licenses in a separate file, in the case of production builds only.",
-      "default": true
+      "description": "Extract all licenses in a separate file.",
+      "default": false
     },
     "showCircularDependencies": {
       "type": "boolean",

From 431df79a1bd4f6a81e69fa4adc7d0e9a47ce63bc Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 10 Oct 2018 20:12:08 +0100
Subject: [PATCH 0302/1703] fix(@angular-devkit/build-angular): dont serve
 files on cwd (#12547)

---
 .../build_angular/src/dev-server/index.ts            |  1 +
 .../test/dev-server/works_spec_large.ts              | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index b925b71a62ea..893e04e00626 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -227,6 +227,7 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
       disableHostCheck: options.disableHostCheck,
       publicPath: servePath,
       hot: options.hmr,
+      contentBase: false,
     };
 
     if (options.ssl) {
diff --git a/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts
index 6c62967f007a..f6984ed88b3e 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts
@@ -34,4 +34,16 @@ describe('Dev Server Builder', () => {
       take(1),
     ).toPromise().then(done, done.fail);
   }, 30000);
+
+  it(`doesn't serve files on the cwd directly`, async () => {
+    const res = await runTargetSpec(host, devServerTargetSpec).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      // When webpack-dev-server doesn't have `contentBase: false`, this will serve the repo README.
+      concatMap(() => from(request('http://localhost:4200/README.md'))),
+      take(1),
+    ).toPromise();
+
+    expect(res).not.toContain('This file is automatically generated during release.');
+    expect(res).toContain('<title>HelloWorldApp</title>');
+  });
 });

From 1747845dfaf94ee4760528c33c6da267456ad932 Mon Sep 17 00:00:00 2001
From: clydin <19598772+clydin@users.noreply.github.com>
Date: Wed, 10 Oct 2018 16:50:36 -0400
Subject: [PATCH 0303/1703] fix(@angular-devkit/core): make JSON schema
 required work with prompts (#12548)

---
 .../core/src/json/schema/prompt_spec.ts       |  6 +-
 .../core/src/json/schema/registry.ts          | 57 +++++++++++++------
 2 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/packages/angular_devkit/core/src/json/schema/prompt_spec.ts b/packages/angular_devkit/core/src/json/schema/prompt_spec.ts
index 40d5f89543c9..d1bb23c12fdb 100644
--- a/packages/angular_devkit/core/src/json/schema/prompt_spec.ts
+++ b/packages/angular_devkit/core/src/json/schema/prompt_spec.ts
@@ -43,9 +43,9 @@ describe('Prompt Provider', () => {
 
     registry.usePromptProvider(async definitions => {
       return {
-        '\'bool\'': true,
-        '\'test\'': 'two',
-        '\'obj\'/\'deep\'/\'three\'': 'test3-answer',
+        '/bool': true,
+        '/test': 'two',
+        '/obj/deep/three': 'test3-answer',
       };
     });
 
diff --git a/packages/angular_devkit/core/src/json/schema/registry.ts b/packages/angular_devkit/core/src/json/schema/registry.ts
index 06321af8aec4..e55a111ad966 100644
--- a/packages/angular_devkit/core/src/json/schema/registry.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry.ts
@@ -355,6 +355,35 @@ export class CoreSchemaRegistry implements SchemaRegistry {
               updateData,
               schemaInfo.smartDefaultRecord,
             )),
+            switchMap(updatedData => {
+              if (validationOptions.withPrompts === false) {
+                return of(updatedData);
+              }
+
+              const visitor: JsonVisitor = (value, pointer) => {
+                if (value !== undefined) {
+                  validationContext.promptFieldsWithValue.add(pointer);
+                }
+
+                return value;
+              };
+
+              return visitJson(updatedData, visitor, schema, this._resolver, validate);
+            }),
+            switchMap(updatedData => {
+              if (validationOptions.withPrompts === false) {
+                return of(updatedData);
+              }
+
+              const definitions = schemaInfo.promptDefinitions
+                .filter(def => !validationContext.promptFieldsWithValue.has(def.id));
+
+              if (this._promptProvider && definitions.length > 0) {
+                return from(this._applyPrompts(updatedData, definitions));
+              } else {
+                return of(updatedData);
+              }
+            }),
             switchMap(updatedData => {
               const result = validate.call(validationContext, updatedData);
 
@@ -372,22 +401,6 @@ export class CoreSchemaRegistry implements SchemaRegistry {
                     return Promise.reject(err);
                   }));
             }),
-            switchMap(([data, valid]: [JsonValue, boolean]) => {
-              if (validationOptions.withPrompts === false) {
-                return of([data, valid]);
-              }
-
-              const definitions = schemaInfo.promptDefinitions
-                .filter(def => !validationContext.promptFieldsWithValue.has(def.id));
-
-              if (valid && this._promptProvider && definitions.length > 0) {
-                return from(this._applyPrompts(data, definitions)).pipe(
-                  map(data => [data, valid]),
-                );
-              } else {
-                return of([data, valid]);
-              }
-            }),
             switchMap(([data, valid]: [JsonValue, boolean]) => {
               if (valid) {
                 let result = of(data);
@@ -508,7 +521,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
 
         // tslint:disable-next-line:no-any
         const pathArray = ((it as any).dataPathArr as string[]).slice(1, it.dataLevel + 1);
-        const path = pathArray.join('/');
+        const path = '/' + pathArray.map(p => p.replace(/^\'/, '').replace(/\'$/, '')).join('/');
 
         let type: string | undefined;
         let items: Array<string | { label: string, value: string | number | boolean }> | undefined;
@@ -609,9 +622,17 @@ export class CoreSchemaRegistry implements SchemaRegistry {
     return from(provider(prompts)).pipe(
       map(answers => {
         for (const path in answers) {
+          const pathFragments = path.split('/').map(pf => {
+            if (/^\d+$/.test(pf)) {
+              return pf;
+            } else {
+              return '\'' + pf + '\'';
+            }
+          });
+
           CoreSchemaRegistry._set(
             data,
-            path.split('/'),
+            pathFragments.slice(1),
             answers[path] as {},
             null,
             undefined,

From f48a1630bab95daf6e4e717e4550041354a214de Mon Sep 17 00:00:00 2001
From: Judy Bogart <31899326+jbogarthyde@users.noreply.github.com>
Date: Wed, 10 Oct 2018 14:50:06 -0700
Subject: [PATCH 0304/1703] docs: cli command docs (#12520)

---
 packages/angular/cli/commands/config.json      |  8 ++++----
 packages/angular/cli/commands/definitions.json | 12 ++++++------
 packages/angular/cli/commands/doc.json         |  6 +++---
 packages/angular/cli/commands/e2e.json         |  4 ++--
 packages/angular/cli/commands/help.json        |  2 +-
 packages/angular/cli/commands/lint-long.md     |  2 ++
 packages/angular/cli/commands/lint.json        |  4 ++--
 7 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 packages/angular/cli/commands/lint-long.md

diff --git a/packages/angular/cli/commands/config.json b/packages/angular/cli/commands/config.json
index 899d563a2be4..8d1dabb3f4ed 100644
--- a/packages/angular/cli/commands/config.json
+++ b/packages/angular/cli/commands/config.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/config.json",
-  "description": "Get/set configuration values.",
+  "description": "Retrieves or sets Angular configuration values.",
   "$longDescription": "",
 
   "$aliases": [],
@@ -15,7 +15,7 @@
       "properties": {
         "jsonPath": {
           "type": "string",
-          "description": "The path to the value to get/set.",
+          "description": "The configuration key to set or query, in JSON path format. For example: \"a[3].foo.bar[2]\". If no new value is provided, returns the current value of this key.",
           "$default": {
             "$source": "argv",
             "index": 0
@@ -23,7 +23,7 @@
         },
         "value": {
           "type": ["string", "number", "boolean"],
-          "description": "The new value to be set.",
+          "description": "If provided, a new value for the given configuration key.",
           "$default": {
             "$source": "argv",
             "index": 1
@@ -31,7 +31,7 @@
         },
         "global": {
           "type": "boolean",
-          "description": "Get/set the value in the global configuration (in your home directory).",
+          "description": "When true, accesses the global configuration in the caller's home directory.",
           "default": false,
           "aliases": ["g"]
         }
diff --git a/packages/angular/cli/commands/definitions.json b/packages/angular/cli/commands/definitions.json
index 20099aaa748e..ee2f5b011793 100644
--- a/packages/angular/cli/commands/definitions.json
+++ b/packages/angular/cli/commands/definitions.json
@@ -14,7 +14,7 @@
           }
         },
         "configuration": {
-          "description": "A named configuration environment, as specified in the `configurations` section of `angular.json`.",
+          "description": "A named configuration environment, as specified in the \"configurations\" section of angular.json.",
           "type": "string",
           "aliases": [
             "c"
@@ -31,7 +31,7 @@
       "properties": {
         "help": {
           "enum": [true, false, "json", "JSON"],
-          "description": "Shows a help message. You can pass the format as a value.",
+          "description": "Shows a help message for this command in the console.",
           "default": false
         }
       }
@@ -42,23 +42,23 @@
           "type": "boolean",
           "default": false,
           "aliases": [ "d" ],
-          "description": "Run through without making any changes."
+          "description": "When true, run through and report activity without writing out results."
         },
         "force": {
           "type": "boolean",
           "default": false,
           "aliases": [ "f" ],
-          "description": "Forces overwriting of files."
+          "description": "When true, force overwriting of existing files."
         },
         "interactive": {
           "type": "boolean",
           "default": "true",
-          "description": "Disables interactive inputs (i.e., prompts)."
+          "description": "When false, disables interactive input prompts."
         },
         "defaults": {
           "type": "boolean",
           "default": "false",
-          "description": "Disables interactive inputs (i.e., prompts) for options with a default."
+          "description": "When true, disables interactive input prompts for options with a default."
         }
       }
     }
diff --git a/packages/angular/cli/commands/doc.json b/packages/angular/cli/commands/doc.json
index cabe8f10209d..302c1cac3f4a 100644
--- a/packages/angular/cli/commands/doc.json
+++ b/packages/angular/cli/commands/doc.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/doc.json",
-  "description": "Opens the official Angular API documentation for a given keyword.",
+  "description": "Opens the official Angular documentation (angular.io) in a browser, and searches for a given keyword.",
   "$longDescription": "",
 
   "$aliases": [ "d" ],
@@ -14,7 +14,7 @@
       "properties": {
         "keyword": {
           "type": "string",
-          "description": "The query to search upon.",
+          "description": "The keyword to search for, as provided in the search bar in angular.io.",
           "$default": {
             "$source": "argv",
             "index": 0
@@ -24,7 +24,7 @@
           "aliases": ["s"],
           "type": "boolean",
           "default": false,
-          "description": "Search whole angular.io instead of just api."
+          "description": "When true, searches all of angular.io. Otherwise, searches only API reference documentation."
         }
       },
       "required": [
diff --git a/packages/angular/cli/commands/e2e.json b/packages/angular/cli/commands/e2e.json
index 6e7b1079a46a..5dd23c01dfe7 100644
--- a/packages/angular/cli/commands/e2e.json
+++ b/packages/angular/cli/commands/e2e.json
@@ -1,8 +1,8 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/e2e.json",
-  "description": "Runs the end-to-end tests.",
-  "$longDescription": "",
+  "description": "Builds and serves an Angular app, and runs end-to-end tests using Protractor.",
+  "$longDescription": "Must be executed from within a workspace directory.\n When a project name is not supplied, the configured default e2e project of the workspace is used.",
 
   "$aliases": [ "e" ],
   "$scope": "in",
diff --git a/packages/angular/cli/commands/help.json b/packages/angular/cli/commands/help.json
index e7aeda0ba9e4..ecbe1091d4cb 100644
--- a/packages/angular/cli/commands/help.json
+++ b/packages/angular/cli/commands/help.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/help.json",
-  "description": "Displays help for the Angular CLI.",
+  "description": "Lists available commands and their short descriptions in the console. \n &nbsp &nbsp For help with individual commands, use the \"--help\" or \"-h\" option with the command.",
   "$longDescription": "",
 
   "$scope": "all",
diff --git a/packages/angular/cli/commands/lint-long.md b/packages/angular/cli/commands/lint-long.md
new file mode 100644
index 000000000000..5b6eb99d0d73
--- /dev/null
+++ b/packages/angular/cli/commands/lint-long.md
@@ -0,0 +1,2 @@
+Takes the name of the project, as specified in the  `projects` section of the `angular.json` workspace configuration file.
+When a project name is not supplied, uses the configured `defaultProject` of the workspace.
\ No newline at end of file
diff --git a/packages/angular/cli/commands/lint.json b/packages/angular/cli/commands/lint.json
index 7d007122c28a..7c2851495088 100644
--- a/packages/angular/cli/commands/lint.json
+++ b/packages/angular/cli/commands/lint.json
@@ -1,8 +1,8 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/lint.json",
-  "description": "Lints code in existing project.",
-  "$longDescription": "",
+  "description": "Runs the TSLint tool on Angular app code in the given project folder.",
+  "$longDescription": "./lint-long.md",
 
   "$aliases": [ "l" ],
   "$scope": "in",

From b23ee7a031ae6636eeccdad36f125bb9258ae684 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Wed, 10 Oct 2018 15:08:44 -0700
Subject: [PATCH 0305/1703] ci: add header to snapshot build README (#12482)

Fixes #12481
---
 scripts/snapshots.ts | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/scripts/snapshots.ts b/scripts/snapshots.ts
index 31d02311f402..1b62b00a1632 100644
--- a/scripts/snapshots.ts
+++ b/scripts/snapshots.ts
@@ -11,11 +11,31 @@ import { execSync, spawnSync } from 'child_process';
 import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
-import { packages } from '../lib/packages';
+import { PackageInfo, packages } from '../lib/packages';
 import build from './build';
 import create from './create';
 
 
+// Added to the README.md of the snapshot. This is markdown.
+const readmeHeaderFn = (pkg: PackageInfo) => `
+# Snapshot build of ${pkg.name}
+
+This repository is a snapshot of a commit on the original repository. The original code used to
+generate this is located at http://github.com/angular/angular-cli.
+
+We do not accept PRs or Issues opened on this repository. You should not use this over a tested and
+released version of this package.
+
+To test this snapshot in your own project, use
+
+\`\`\`bash
+npm install github.com/${pkg.snapshotRepo}
+\`\`\`
+
+----
+`;
+
+
 function _copy(from: string, to: string) {
   fs.readdirSync(from)
     .forEach(name => {
@@ -137,7 +157,17 @@ export default async function(opts: SnapshotsOptions, logger: logging.Logger) {
       _exec('git', ['config', 'commit.gpgSign', 'false'], { cwd: destPath }, publishLogger);
     }
 
-    // Make sure that every snapshots is unique.
+    // Add the header to the existing README.md (or create a README if it doesn't exist).
+    const readmePath = path.join(destPath, 'README.md');
+    let readme = readmeHeaderFn(pkg);
+    try {
+      readme += fs.readFileSync(readmePath, 'utf-8');
+    } catch {}
+
+    fs.writeFileSync(readmePath, readme);
+
+    // Make sure that every snapshots is unique (otherwise we would need to make sure git accepts
+    // empty commits).
     fs.writeFileSync(path.join(destPath, 'uniqueId'), '' + new Date());
 
     // Commit and push.

From 0ae84755c711ad3f20515597e190d571610124e5 Mon Sep 17 00:00:00 2001
From: clydin <19598772+clydin@users.noreply.github.com>
Date: Thu, 11 Oct 2018 13:40:41 -0400
Subject: [PATCH 0306/1703] docs(@angular/cli): correct e2e long description
 field (#12561)

---
 packages/angular/cli/commands/e2e-long.md | 2 ++
 packages/angular/cli/commands/e2e.json    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 packages/angular/cli/commands/e2e-long.md

diff --git a/packages/angular/cli/commands/e2e-long.md b/packages/angular/cli/commands/e2e-long.md
new file mode 100644
index 000000000000..028becbcde67
--- /dev/null
+++ b/packages/angular/cli/commands/e2e-long.md
@@ -0,0 +1,2 @@
+Must be executed from within a workspace directory.
+When a project name is not supplied, the configured default e2e project of the workspace is used.
\ No newline at end of file
diff --git a/packages/angular/cli/commands/e2e.json b/packages/angular/cli/commands/e2e.json
index 5dd23c01dfe7..073fdff3a684 100644
--- a/packages/angular/cli/commands/e2e.json
+++ b/packages/angular/cli/commands/e2e.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/e2e.json",
   "description": "Builds and serves an Angular app, and runs end-to-end tests using Protractor.",
-  "$longDescription": "Must be executed from within a workspace directory.\n When a project name is not supplied, the configured default e2e project of the workspace is used.",
+  "$longDescription": "./e2e-long.md",
 
   "$aliases": [ "e" ],
   "$scope": "in",

From 237c89399419fb59e23ec86d570b3dfe25a05563 Mon Sep 17 00:00:00 2001
From: Vikram Subramanian <viks@google.com>
Date: Thu, 11 Oct 2018 13:52:36 -0700
Subject: [PATCH 0307/1703] release: v7.0.0-rc.3

---
 .monorepo.json | 76 +++++++++++++++++++++++++-------------------------
 package.json   |  3 +-
 yarn.lock      |  5 ++++
 3 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index aea9500b922e..d6c4d6f3b765 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,16 +42,16 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.9.0-rc.2",
-      "hash": "ed6f2ae751fd3db351a20ae55349e8ad"
+      "version": "0.9.0-rc.3",
+      "hash": "f828d4a3fa042a7feac4a48c86893375"
     },
     "@_/builders": {
-      "version": "0.9.0-rc.2",
-      "hash": "569aef8bc23693c344e71b9755e62c50"
+      "version": "0.9.0-rc.3",
+      "hash": "6983d21ece5e42aa536b50adfdceb56c"
     },
     "devkit": {
-      "version": "0.9.0-rc.2",
-      "hash": "9230702b29c8827fca50617e90f4db62"
+      "version": "0.9.0-rc.3",
+      "hash": "4f379b7a9eea07dbb4ce5d00943da2a7"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -62,15 +62,15 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md"
         }
       ],
-      "version": "7.0.0-rc.2",
+      "version": "7.0.0-rc.3",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "0f0265f67cbd611fe76f9cf2a35eac46"
+      "hash": "1a81b6f6ae267f7e2ce5e6e541e6c5f1"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.9.0-rc.2",
-      "hash": "a575d61acf532ea665ac6705e91a0369",
+      "version": "0.9.0-rc.3",
+      "hash": "d5a17c053d50acc4371cf8836bd4e305",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -81,21 +81,21 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.9.0-rc.2",
-      "hash": "c644f2be33bdc5068cf74fb4f7c39e29",
+      "version": "0.9.0-rc.3",
+      "hash": "69de58e95e413c7f31288805502ac7cc",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.9.0-rc.2",
-      "hash": "f0ad25801262bdf4cd4a83f678af7dd6",
+      "version": "0.9.0-rc.3",
+      "hash": "56b94bb6df457dfb8247b12ad79c80ff",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
       "name": "Benchmark",
       "section": "Tooling",
-      "version": "1.0.0-rc.2",
-      "hash": "4809184dd4ad5a0b8e3e28ff460a2837"
+      "version": "1.0.0-rc.3",
+      "hash": "b22aede83c4a65b920886c2b7c07e617"
     },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
@@ -105,8 +105,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.9.0-rc.2",
-      "hash": "ab55ec940e1f2e84073b45a16d45e3cd",
+      "version": "0.9.0-rc.3",
+      "hash": "843110dac52428005e98af191cbdee7c",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -117,8 +117,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.9.0-rc.2",
-      "hash": "a7cb02fd554c0947889e974cb9046d96",
+      "version": "0.9.0-rc.3",
+      "hash": "70953928c8b694c84bd17679f32e6370",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -129,8 +129,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.9.0-rc.2",
-      "hash": "d7fd8733c5b28f1ef21528b0066f0d1a",
+      "version": "0.9.0-rc.3",
+      "hash": "977fc0e11ce8e8cba6f1c510b2c9332f",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -141,9 +141,9 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.9.0-rc.2",
+      "version": "0.9.0-rc.3",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "a2574369237d6b3769f7602ff8fa4a31"
+      "hash": "993a11de93afac81b572e4a4cf0da29f"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -153,8 +153,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "7.0.0-rc.2",
-      "hash": "a5844a4ed97391807c4fd12cb2ef1cf2",
+      "version": "7.0.0-rc.3",
+      "hash": "2c72e31bd22c0f247c510f2dde19b2df",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -165,43 +165,43 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "7.0.0-rc.2",
-      "hash": "c17d545d96ae49c8a80275cfc986eb4c",
+      "version": "7.0.0-rc.3",
+      "hash": "ccfc55132a0c921747352f35a8ceed2f",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.9.0-rc.2",
-      "hash": "e1fdd7b7f2ea718c3a22d16915a91ff6",
+      "version": "0.9.0-rc.3",
+      "hash": "5e241ab9106459239f259a83416ef7bf",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "7.0.0-rc.2",
+      "version": "7.0.0-rc.3",
       "section": "Misc",
-      "hash": "780c036bfa14accd80cd0bd4c2c7704d",
+      "hash": "f69c409a11ed2b38ee411bb879646a5a",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "7.0.0-rc.2",
-      "hash": "f204ff9639c871494ac8fe050e327df0",
+      "version": "7.0.0-rc.3",
+      "hash": "a82c0c20dbc83e0a2accfa3512da89c1",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.9.0-rc.2",
+      "version": "0.9.0-rc.3",
       "section": "Schematics",
-      "hash": "4a3e9d9fc64c6efddb0dfba3b745c92a",
+      "hash": "f3be77421fb1e428cf6ed65569260934",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.9.0-rc.2",
+      "version": "0.9.0-rc.3",
       "section": "Schematics",
-      "hash": "6706dfa9fbc9cdbc892fb6e9ed8026f8",
+      "hash": "e8706489d428c28fc2e66fd8fb78d26d",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }
diff --git a/package.json b/package.json
index 06ff5def71b7..5d56f34d2079 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,8 @@
     "quicktype-core": "^5.0.41",
     "temp": "^0.8.3",
     "tslint": "^5.11.0",
-    "typescript": "~3.1.1"
+    "typescript": "~3.1.1",
+    "yarn": "^1.10.1"
   },
   "devDependencies": {
     "@angular/compiler": "^7.0.0-rc.0",
diff --git a/yarn.lock b/yarn.lock
index 8120b24f1407..99ddf4dc38f7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9442,6 +9442,11 @@ yargs@^7.0.0:
     y18n "^3.2.1"
     yargs-parser "^5.0.0"
 
+yarn@^1.10.1:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.10.1.tgz#b792ba28f050ae94cd7e719dbca80639d70da76f"
+  integrity sha512-EH0H1fyfFxkE4UpG4b+VCaVY4I488I2EyQNmGjGGKmvsSIb0G3b+1IcfGYPI2gqa1du43g4ZA3jH8fXlq6oVxg==
+
 yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"

From 583024d758b554cb8e8d3fe9b6f2f86070da1b43 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 12 Oct 2018 12:48:18 -0400
Subject: [PATCH 0308/1703] test: add E2E test for JSON help output for all
 commands

---
 .../e2e/tests/commands/help/help-json.ts          | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 tests/legacy-cli/e2e/tests/commands/help/help-json.ts

diff --git a/tests/legacy-cli/e2e/tests/commands/help/help-json.ts b/tests/legacy-cli/e2e/tests/commands/help/help-json.ts
new file mode 100644
index 000000000000..af4f18872990
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/commands/help/help-json.ts
@@ -0,0 +1,15 @@
+import { silentNg } from '../../../utils/process';
+
+
+export default async function() {
+  const commands = require('@angular/cli/commands.json');
+  for (const commandName of Object.keys(commands)) {
+    const { stdout } = await silentNg(commandName, '--help=json');
+
+    if (stdout.trim()) {
+      JSON.parse(stdout);
+    } else {
+      console.warn(`No JSON output for command [${commandName}].`);
+    }
+  }
+}

From df172bdc8af4caa1a908592a8b9400d31c81eeb0 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 12 Oct 2018 12:04:45 +0200
Subject: [PATCH 0309/1703] fix(@ngtools/webpack): output consistent filename

At the moment when having namedChunks file names are different between JIT and AOT builds .

AOT will will output something like
```
customers-customers-module-ngfactory.9b8b989df2e32e5cadac.js
```
while JIT will output

```
customers-customers-module.js
```

This PR aligns the output file name
---
 .../build_angular/test/browser/lazy-module_spec_large.ts      | 4 ++--
 packages/ngtools/webpack/src/angular_compiler_plugin.ts       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
index 2177de386354..c334fd998178 100644
--- a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
@@ -97,7 +97,7 @@ describe('Browser Builder lazy modules', () => {
       tap((buildEvent) => expect(buildEvent.success).toBe(true)),
       tap(() => {
         expect(host.scopedSync()
-          .exists(join(outputPath, 'lazy-lazy-module-ngfactory.js'))).toBe(true);
+          .exists(join(outputPath, 'lazy-lazy-module.js'))).toBe(true);
       }),
     ).toPromise().then(done, done.fail);
   });
@@ -256,7 +256,7 @@ describe('Browser Builder lazy modules', () => {
     runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 2).pipe(
       tap((buildEvent) => expect(buildEvent.success).toBe(true)),
       tap(() => expect(host.scopedSync()
-        .exists(join(outputPath, 'src-app-lazy-lazy-module-ngfactory.js')))
+        .exists(join(outputPath, 'src-app-lazy-lazy-module.js')))
         .toBe(true)),
     ).toPromise().then(done, done.fail);
   });
diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 9a2edcf7e154..67ecc6df9db3 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -721,7 +721,7 @@ export class AngularCompilerPlugin {
                   const modulePath = this._lazyRoutes[key];
                   const importPath = key.split('#')[0];
                   if (modulePath !== null) {
-                    const name = importPath.replace(/(\.ngfactory)?\.(js|ts)$/, '');
+                    const name = importPath.replace(/(\.ngfactory)?(\.(js|ts))?$/, '');
 
                     return new this._contextElementDependencyConstructor(modulePath, name);
                   } else {

From 3ae3fa3a1deeca98c7a6d463aa003dba569de2c8 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 12 Oct 2018 10:37:02 -0400
Subject: [PATCH 0310/1703] fix(@ngtools/webpack): remove usage of private
 compiler API

---
 .../webpack/src/angular_compiler_plugin.ts    | 92 +++++++------------
 1 file changed, 32 insertions(+), 60 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 67ecc6df9db3..472603db1043 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -21,11 +21,11 @@ import {
   DEFAULT_ERROR_CODE,
   Diagnostic,
   EmitFlags,
+  LazyRoute,
   Program,
   SOURCE,
   UNKNOWN_ERROR_CODE,
   VERSION,
-  __NGTOOLS_PRIVATE_API_2,
   createCompilerHost,
   createProgram,
   formatDiagnostics,
@@ -162,14 +162,6 @@ export class AngularCompilerPlugin {
   // Logging.
   private _logger: logging.Logger;
 
-  private get _ngCompilerSupportsNewApi() {
-    if (this._JitMode) {
-      return false;
-    } else {
-      return !!(this._program as Program).listLazyRoutes;
-    }
-  }
-
   constructor(options: AngularCompilerPluginOptions) {
     this._options = Object.assign({}, options);
     this._setupOptions(this._options);
@@ -426,34 +418,6 @@ export class AngularCompilerPlugin {
     }
   }
 
-  private _getLazyRoutesFromNgtools() {
-    try {
-      time('AngularCompilerPlugin._getLazyRoutesFromNgtools');
-      const result = __NGTOOLS_PRIVATE_API_2.listLazyRoutes({
-        program: this._getTsProgram(),
-        host: this._compilerHost,
-        angularCompilerOptions: Object.assign({}, this._compilerOptions, {
-          // genDir seems to still be needed in @angular\compiler-cli\src\compiler_host.js:226.
-          genDir: '',
-        }),
-        // TODO: fix compiler-cli typings; entryModule should not be string, but also optional.
-        // tslint:disable-next-line:no-non-null-assertion
-        entryModule: this._entryModule!,
-      });
-      timeEnd('AngularCompilerPlugin._getLazyRoutesFromNgtools');
-
-      return result;
-    } catch (err) {
-      // We silence the error that the @angular/router could not be found. In that case, there is
-      // basically no route supported by the app itself.
-      if (err.message.startsWith('Could not resolve module @angular/router')) {
-        return {};
-      } else {
-        throw err;
-      }
-    }
-  }
-
   private _findLazyRoutesInAst(changedFilePaths: string[]): LazyRouteMap {
     time('AngularCompilerPlugin._findLazyRoutesInAst');
     const result: LazyRouteMap = Object.create(null);
@@ -471,12 +435,24 @@ export class AngularCompilerPlugin {
   }
 
   private _listLazyRoutesFromProgram(): LazyRouteMap {
-    const ngProgram = this._program as Program;
-    if (!ngProgram.listLazyRoutes) {
-      throw new Error('_listLazyRoutesFromProgram was called with an old program.');
-    }
+    let lazyRoutes: LazyRoute[];
+    if (this._JitMode) {
+      if (!this.entryModule) {
+        return {};
+      }
+
+      const ngProgram = createProgram({
+        rootNames: this._rootNames,
+        options: { ...this._compilerOptions, genDir: '', collectAllErrors: true },
+        host: this._compilerHost,
+      });
 
-    const lazyRoutes = ngProgram.listLazyRoutes();
+      lazyRoutes = ngProgram.listLazyRoutes(
+        this.entryModule.path + '#' + this.entryModule.className,
+      );
+    } else {
+      lazyRoutes = (this._program as Program).listLazyRoutes();
+    }
 
     return lazyRoutes.reduce(
       (acc, curr) => {
@@ -890,31 +866,27 @@ export class AngularCompilerPlugin {
 
     // If nothing we care about changed and it isn't the first run, don't do anything.
     if (changedFiles.length === 0 && !this._firstRun) {
-      return Promise.resolve();
+      return;
     }
 
     // Make a new program and load the Angular structure.
     await this._createOrUpdateProgram();
 
-    if (this.entryModule) {
-      // Try to find lazy routes if we have an entry module.
-      // We need to run the `listLazyRoutes` the first time because it also navigates libraries
-      // and other things that we might miss using the (faster) findLazyRoutesInAst.
-      // Lazy routes modules will be read with compilerHost and added to the changed files.
-      if (this._ngCompilerSupportsNewApi) {
-        this._processLazyRoutes(this._listLazyRoutesFromProgram());
-      } else if (this._firstRun) {
-        this._processLazyRoutes(this._getLazyRoutesFromNgtools());
-      } else {
-        const changedTsFiles = this._getChangedTsFiles();
-        if (changedTsFiles.length > 0) {
-          this._processLazyRoutes(this._findLazyRoutesInAst(changedTsFiles));
-        }
-      }
-      if (this._options.additionalLazyModules) {
-        this._processLazyRoutes(this._options.additionalLazyModules);
+    // Try to find lazy routes if we have an entry module.
+    // We need to run the `listLazyRoutes` the first time because it also navigates libraries
+    // and other things that we might miss using the (faster) findLazyRoutesInAst.
+    // Lazy routes modules will be read with compilerHost and added to the changed files.
+    if (this._firstRun || !this._JitMode) {
+      this._processLazyRoutes(this._listLazyRoutesFromProgram());
+    } else {
+      const changedTsFiles = this._getChangedTsFiles();
+      if (changedTsFiles.length > 0) {
+        this._processLazyRoutes(this._findLazyRoutesInAst(changedTsFiles));
       }
     }
+    if (this._options.additionalLazyModules) {
+      this._processLazyRoutes(this._options.additionalLazyModules);
+    }
 
     // Emit and report errors.
 

From 1a6b471c8288870e61302f53a3e986c70a0fed27 Mon Sep 17 00:00:00 2001
From: Suguru Inatomi <suguru.inatomi@gmail.com>
Date: Fri, 28 Sep 2018 09:31:56 +0900
Subject: [PATCH 0311/1703] feat(@schematics/angular): remove `@angular/http`
 as it's deprecated

---
 packages/schematics/angular/workspace/files/package.json      | 1 -
 tests/legacy-cli/e2e/tests/basic/rebuild.ts                   | 4 ++--
 .../e2e/tests/build/build-app-shell-with-schematic.ts         | 4 ++++
 tests/legacy-cli/e2e/tests/build/build-app-shell.ts           | 4 ++++
 tests/legacy-cli/e2e/tests/build/platform-server.ts           | 4 ++++
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/schematics/angular/workspace/files/package.json b/packages/schematics/angular/workspace/files/package.json
index 3810f58197f3..583c4ac50ffe 100644
--- a/packages/schematics/angular/workspace/files/package.json
+++ b/packages/schematics/angular/workspace/files/package.json
@@ -16,7 +16,6 @@
     "@angular/compiler": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
     "@angular/core": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
     "@angular/forms": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
-    "@angular/http": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
     "@angular/platform-browser": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
     "@angular/platform-browser-dynamic": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
     "@angular/router": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
diff --git a/tests/legacy-cli/e2e/tests/basic/rebuild.ts b/tests/legacy-cli/e2e/tests/basic/rebuild.ts
index 5021e59694eb..6eda126667ad 100644
--- a/tests/legacy-cli/e2e/tests/basic/rebuild.ts
+++ b/tests/legacy-cli/e2e/tests/basic/rebuild.ts
@@ -34,7 +34,7 @@ export default function() {
         import { BrowserModule } from '@angular/platform-browser';
         import { NgModule } from '@angular/core';
         import { FormsModule } from '@angular/forms';
-        import { HttpModule } from '@angular/http';
+        import { HttpClientModule } from '@angular/common/http';
 
         import { AppComponent } from './app.component';
         import { RouterModule } from '@angular/router';
@@ -46,7 +46,7 @@ export default function() {
           imports: [
             BrowserModule,
             FormsModule,
-            HttpModule,
+            HttpClientModule,
             RouterModule.forRoot([
               { path: 'lazy', loadChildren: './lazy/lazy.module#LazyModule' }
             ])
diff --git a/tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts b/tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts
index e9d85afca761..85bef90848ed 100644
--- a/tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts
+++ b/tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts
@@ -18,9 +18,11 @@ export default function () {
   }
 
   let platformServerVersion = readNgVersion();
+  let httpVersion = readNgVersion();
 
   if (getGlobalVariable('argv')['ng-snapshots']) {
     platformServerVersion = 'github:angular/platform-server-builds';
+    httpVersion = 'github:angular/http-builds';
   }
 
 
@@ -33,6 +35,8 @@ export default function () {
     .then(() => updateJsonFile('package.json', packageJson => {
       const dependencies = packageJson['dependencies'];
       dependencies['@angular/platform-server'] = platformServerVersion;
+      // ServerModule depends on @angular/http regardless the app's dependency.
+      dependencies['@angular/http'] = httpVersion;
     })
     .then(() => npm('install'))
     .then(() => ng('build', '--optimization'))
diff --git a/tests/legacy-cli/e2e/tests/build/build-app-shell.ts b/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
index fc26d43aabc4..a2fac7d400ef 100644
--- a/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
+++ b/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
@@ -19,9 +19,11 @@ export default function () {
   }
 
   let platformServerVersion = readNgVersion();
+  let httpVersion = readNgVersion();
 
   if (getGlobalVariable('argv')['ng-snapshots']) {
     platformServerVersion = 'github:angular/platform-server-builds';
+    httpVersion = 'github:angular/http-builds';
   }
 
   return Promise.resolve()
@@ -134,6 +136,8 @@ export default function () {
     .then(() => updateJsonFile('package.json', packageJson => {
       const dependencies = packageJson['dependencies'];
       dependencies['@angular/platform-server'] = platformServerVersion;
+      // ServerModule depends on @angular/http regardless the app's dependency.
+      dependencies['@angular/http'] = httpVersion;
     })
     .then(() => npm('install')))
     .then(() => ng('run', 'test-project:app-shell'))
diff --git a/tests/legacy-cli/e2e/tests/build/platform-server.ts b/tests/legacy-cli/e2e/tests/build/platform-server.ts
index efca00d14cca..1aeab4b099a6 100644
--- a/tests/legacy-cli/e2e/tests/build/platform-server.ts
+++ b/tests/legacy-cli/e2e/tests/build/platform-server.ts
@@ -20,9 +20,11 @@ export default function () {
   }
 
   let platformServerVersion = readNgVersion();
+  let httpVersion = readNgVersion();
 
   if (getGlobalVariable('argv')['ng-snapshots']) {
     platformServerVersion = 'github:angular/platform-server-builds';
+    httpVersion = 'github:angular/http-builds';
   }
 
   // Skip this test in Angular 2/4.
@@ -34,6 +36,8 @@ export default function () {
     .then(() => updateJsonFile('package.json', packageJson => {
       const dependencies = packageJson['dependencies'];
       dependencies['@angular/platform-server'] = platformServerVersion;
+      // ServerModule depends on @angular/http regardless the app's dependency.
+      dependencies['@angular/http'] = httpVersion;
     }))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
       const appArchitect = workspaceJson.projects['test-project'].architect;

From 3cd6a33bd2123829a8e6f3cf1f1abae5be535d75 Mon Sep 17 00:00:00 2001
From: Suguru Inatomi <suguru.inatomi@gmail.com>
Date: Mon, 1 Oct 2018 16:45:17 +0900
Subject: [PATCH 0312/1703] feat(@schematics/angular): add @angular/http as a
 dependency in universal

---
 packages/schematics/angular/universal/index.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/schematics/angular/universal/index.ts b/packages/schematics/angular/universal/index.ts
index 17329143ef8a..4991ef5ac363 100644
--- a/packages/schematics/angular/universal/index.ts
+++ b/packages/schematics/angular/universal/index.ts
@@ -161,7 +161,12 @@ function addDependencies(): Rule {
       ...coreDep,
       name: '@angular/platform-server',
     };
+    const httpDep = {
+      ...coreDep,
+      name: '@angular/http',
+    };
     addPackageJsonDependency(host, platformServerDep);
+    addPackageJsonDependency(host, httpDep);
 
     return host;
   };

From 9ebf2806972688175f7e6477f6dfabf061e71e43 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 11 Oct 2018 11:51:08 -0400
Subject: [PATCH 0313/1703] fix(@angular/cli): use stderr for all diagnostic
 related log messages

---
 packages/angular/cli/lib/cli/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/angular/cli/lib/cli/index.ts b/packages/angular/cli/lib/cli/index.ts
index 7559bab0deb0..968d184e3c32 100644
--- a/packages/angular/cli/lib/cli/index.ts
+++ b/packages/angular/cli/lib/cli/index.ts
@@ -82,6 +82,7 @@ function initializeLogging(logger: logging.Logger) {
           break;
         case 'warn':
           color = terminal.yellow;
+          output = process.stderr;
           break;
         case 'error':
           color = terminal.red;

From 0ae37346b1e67685e0aa65a24f6ed4f5fe1b3ce9 Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Mon, 15 Oct 2018 10:52:51 -0700
Subject: [PATCH 0314/1703] docs: expand doc for initial cmds

---
 packages/angular/cli/commands/add.json    | 2 +-
 packages/angular/cli/commands/add.md      | 5 +++--
 packages/angular/cli/commands/new.json    | 4 ++--
 packages/angular/cli/commands/new.md      | 5 +++++
 packages/angular/cli/commands/update.json | 4 ++--
 packages/angular/cli/commands/update.md   | 1 +
 6 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 packages/angular/cli/commands/new.md
 create mode 100644 packages/angular/cli/commands/update.md

diff --git a/packages/angular/cli/commands/add.json b/packages/angular/cli/commands/add.json
index b2cb5b9eb06d..68c5e7e61cc8 100644
--- a/packages/angular/cli/commands/add.json
+++ b/packages/angular/cli/commands/add.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/add.json",
-  "description": "Add support for a library to your project.",
+  "description": "Adds support for a published library to your project.",
   "$longDescription": "./add.md",
 
   "$scope": "in",
diff --git a/packages/angular/cli/commands/add.md b/packages/angular/cli/commands/add.md
index c120a4b9d98d..b17bcb7b631a 100644
--- a/packages/angular/cli/commands/add.md
+++ b/packages/angular/cli/commands/add.md
@@ -1,2 +1,3 @@
-Add support for a library in your project, for example adding `@angular/pwa` which would configure
-your project for PWA support.
+Adds the npm package for a published library to your workspace, and configures your default
+app project to use that library, in whatever way is specified by the library's schematic.
+For example, adding `@angular/pwa` configures your project for PWA support.
diff --git a/packages/angular/cli/commands/new.json b/packages/angular/cli/commands/new.json
index ed301b03a217..777014a27220 100644
--- a/packages/angular/cli/commands/new.json
+++ b/packages/angular/cli/commands/new.json
@@ -1,8 +1,8 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/new.json",
-  "description": "Creates a new directory and a new Angular app.",
-  "$longDescription": "",
+  "description": "Creates a new workspace and a new default Angular app.",
+  "$longDescription": "./new.md",
 
   "$aliases": [ "n" ],
   "$scope": "out",
diff --git a/packages/angular/cli/commands/new.md b/packages/angular/cli/commands/new.md
new file mode 100644
index 000000000000..8f0c5ec854d2
--- /dev/null
+++ b/packages/angular/cli/commands/new.md
@@ -0,0 +1,5 @@
+Creates and initializes a new Angular app that is the default project for a new workspace.
+
+* The new workspace folder is given the specified project name. The new app is created at the top level of the workspace folder.
+
+* The new app's configuration appears in the `projects` section of the `angular.json` workspace configuration file, under its project name.
\ No newline at end of file
diff --git a/packages/angular/cli/commands/update.json b/packages/angular/cli/commands/update.json
index 3f6bdb900f21..0e621a19d460 100644
--- a/packages/angular/cli/commands/update.json
+++ b/packages/angular/cli/commands/update.json
@@ -1,8 +1,8 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/update.json",
-  "description": "Updates your application and its dependencies.",
-  "$longDescription": "",
+  "description": "Updates your application and its dependencies. See \"https://update.angular.io/\",
+  "$longDescription": "./update.md",
 
   "$scope": "all",
   "$aliases": [],
diff --git a/packages/angular/cli/commands/update.md b/packages/angular/cli/commands/update.md
new file mode 100644
index 000000000000..9357da20e239
--- /dev/null
+++ b/packages/angular/cli/commands/update.md
@@ -0,0 +1 @@
+Before running this command, see the interactive [Angular Update Guide](https://update.angular.io/).
\ No newline at end of file

From 6ea5c1f566d0888a33e542d35f40dc91ad865663 Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Mon, 15 Oct 2018 14:41:04 -0700
Subject: [PATCH 0315/1703] docs: mention prompts

---
 packages/angular/cli/commands/add.md   | 2 ++
 packages/angular/cli/commands/new.json | 2 +-
 packages/angular/cli/commands/new.md   | 7 ++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/angular/cli/commands/add.md b/packages/angular/cli/commands/add.md
index b17bcb7b631a..b3d8cb6d8ff9 100644
--- a/packages/angular/cli/commands/add.md
+++ b/packages/angular/cli/commands/add.md
@@ -1,3 +1,5 @@
 Adds the npm package for a published library to your workspace, and configures your default
 app project to use that library, in whatever way is specified by the library's schematic.
 For example, adding `@angular/pwa` configures your project for PWA support.
+
+The default app project is the value of `defaultProject` in `angular.json`. 
diff --git a/packages/angular/cli/commands/new.json b/packages/angular/cli/commands/new.json
index 777014a27220..80a8d35623b6 100644
--- a/packages/angular/cli/commands/new.json
+++ b/packages/angular/cli/commands/new.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/new.json",
-  "description": "Creates a new workspace and a new default Angular app.",
+  "description": "Creates a new workspace and an initial Angular app.",
   "$longDescription": "./new.md",
 
   "$aliases": [ "n" ],
diff --git a/packages/angular/cli/commands/new.md b/packages/angular/cli/commands/new.md
index 8f0c5ec854d2..64c30ae9582e 100644
--- a/packages/angular/cli/commands/new.md
+++ b/packages/angular/cli/commands/new.md
@@ -1,5 +1,10 @@
 Creates and initializes a new Angular app that is the default project for a new workspace.
 
-* The new workspace folder is given the specified project name. The new app is created at the top level of the workspace folder.
+Provides interactive prompts for optional configuration, such as adding routing support.
+All prompts can safely be allowed to default.
+
+* The new workspace folder is given the specified project name, and contains configuration files at the top level. 
+
+* The new app files are placed in the `src/` subfolder. A corresponding end-to-end test app is placed in the `e2e/` subfolder.
 
 * The new app's configuration appears in the `projects` section of the `angular.json` workspace configuration file, under its project name.
\ No newline at end of file

From 3ad551c2ff3fd2c58e7109716e33407a8f8f1375 Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Tue, 16 Oct 2018 08:16:27 -0700
Subject: [PATCH 0316/1703] docs: correct json syntax

---
 packages/angular/cli/commands/update.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular/cli/commands/update.json b/packages/angular/cli/commands/update.json
index 0e621a19d460..d80759c754ad 100644
--- a/packages/angular/cli/commands/update.json
+++ b/packages/angular/cli/commands/update.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/update.json",
-  "description": "Updates your application and its dependencies. See \"https://update.angular.io/\",
+  "description": "Updates your application and its dependencies. See \"https://update.angular.io/\"",
   "$longDescription": "./update.md",
 
   "$scope": "all",

From 21956ca25f924ded8af5a07277bc10fd7cd79703 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Tue, 16 Oct 2018 09:04:19 -0700
Subject: [PATCH 0317/1703] docs: minor updates to command reference

Don't mention Architect
We don't inline resources anymore
Minor grammar tweaks
Split out a couple more long descriptions so the short description is plain text
---
 packages/angular/cli/commands/add.json                    | 2 +-
 packages/angular/cli/commands/build-long.md               | 6 ++----
 packages/angular/cli/commands/e2e.json                    | 2 +-
 packages/angular/cli/commands/eject-long.md               | 8 ++++++++
 packages/angular/cli/commands/eject.json                  | 4 ++--
 packages/angular/cli/commands/help-long.md                | 7 +++++++
 packages/angular/cli/commands/help.json                   | 4 ++--
 packages/angular/cli/commands/lint.json                   | 2 +-
 packages/angular/cli/commands/run.json                    | 2 +-
 packages/angular/cli/commands/test.json                   | 2 +-
 .../angular/cli/commands/{update.md => update-long.md}    | 0
 packages/angular/cli/commands/update.json                 | 4 ++--
 12 files changed, 28 insertions(+), 15 deletions(-)
 create mode 100644 packages/angular/cli/commands/eject-long.md
 create mode 100644 packages/angular/cli/commands/help-long.md
 rename packages/angular/cli/commands/{update.md => update-long.md} (100%)

diff --git a/packages/angular/cli/commands/add.json b/packages/angular/cli/commands/add.json
index 68c5e7e61cc8..9dabd06b8ef0 100644
--- a/packages/angular/cli/commands/add.json
+++ b/packages/angular/cli/commands/add.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/add.json",
-  "description": "Adds support for a published library to your project.",
+  "description": "Adds support for an external library to your project.",
   "$longDescription": "./add.md",
 
   "$scope": "in",
diff --git a/packages/angular/cli/commands/build-long.md b/packages/angular/cli/commands/build-long.md
index 1116fcb1dc4e..0d04d981498a 100644
--- a/packages/angular/cli/commands/build-long.md
+++ b/packages/angular/cli/commands/build-long.md
@@ -1,5 +1,3 @@
-Resources in CSS, such as images and fonts, are automatically written and fingerprinted at the root
-of the output folder.  If a resource is less than 10kb, it  is also included inline.
+Resources in CSS, such as images and fonts, are automatically written and fingerprinted at the root of the output folder.
 
-Uses the Webpack build tool, with environment and build options specified in the CLI configuration
-file.
+Uses the Webpack build tool, with environment and build options specified in the CLI configuration file.
diff --git a/packages/angular/cli/commands/e2e.json b/packages/angular/cli/commands/e2e.json
index 073fdff3a684..92c626d4c63e 100644
--- a/packages/angular/cli/commands/e2e.json
+++ b/packages/angular/cli/commands/e2e.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/e2e.json",
-  "description": "Builds and serves an Angular app, and runs end-to-end tests using Protractor.",
+  "description": "Builds and serves an Angular app, then runs end-to-end tests using Protractor.",
   "$longDescription": "./e2e-long.md",
 
   "$aliases": [ "e" ],
diff --git a/packages/angular/cli/commands/eject-long.md b/packages/angular/cli/commands/eject-long.md
new file mode 100644
index 000000000000..4509f1b7bdec
--- /dev/null
+++ b/packages/angular/cli/commands/eject-long.md
@@ -0,0 +1,8 @@
+The 'eject' command has been disabled and will be removed completely in 8.0.
+The new configuration format provides increased flexibility to modify the
+configuration of your workspace without ejecting.
+
+There are several projects that can be used in conjuction with the new
+configuration format that provide the benefits of ejecting without the maintenance
+overhead.  One such project is ngx-build-plus found here:
+https://github.com/manfredsteyer/ngx-build-plus
\ No newline at end of file
diff --git a/packages/angular/cli/commands/eject.json b/packages/angular/cli/commands/eject.json
index d5c527d02166..714e63884399 100644
--- a/packages/angular/cli/commands/eject.json
+++ b/packages/angular/cli/commands/eject.json
@@ -1,8 +1,8 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/eject.json",
-  "description": "Temporarily disabled. Ejects your app and output the proper webpack configuration and scripts.",
-  "$longDescription": "",
+  "description": "Deprecated, will be removed in Angular 8.0.",
+  "$longDescription": "./eject-long.md",
 
   "$hidden": true,
   "$scope": "in",
diff --git a/packages/angular/cli/commands/help-long.md b/packages/angular/cli/commands/help-long.md
new file mode 100644
index 000000000000..b104a1a6c03e
--- /dev/null
+++ b/packages/angular/cli/commands/help-long.md
@@ -0,0 +1,7 @@
+ For help with individual commands, use the `--help` or `-h` option with the command.
+
+ For example,
+
+ ```sh
+ ng help serve
+ ```
diff --git a/packages/angular/cli/commands/help.json b/packages/angular/cli/commands/help.json
index ecbe1091d4cb..b8df614b75b2 100644
--- a/packages/angular/cli/commands/help.json
+++ b/packages/angular/cli/commands/help.json
@@ -1,8 +1,8 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/help.json",
-  "description": "Lists available commands and their short descriptions in the console. \n &nbsp &nbsp For help with individual commands, use the \"--help\" or \"-h\" option with the command.",
-  "$longDescription": "",
+  "description": "Lists available commands and their short descriptions.",
+  "$longDescription": "./help-long.md",
 
   "$scope": "all",
   "$aliases": [],
diff --git a/packages/angular/cli/commands/lint.json b/packages/angular/cli/commands/lint.json
index 7c2851495088..3c409083bc39 100644
--- a/packages/angular/cli/commands/lint.json
+++ b/packages/angular/cli/commands/lint.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/lint.json",
-  "description": "Runs the TSLint tool on Angular app code in the given project folder.",
+  "description": "Runs linting tools on Angular app code in a given project folder.",
   "$longDescription": "./lint-long.md",
 
   "$aliases": [ "l" ],
diff --git a/packages/angular/cli/commands/run.json b/packages/angular/cli/commands/run.json
index 51b74bbacf55..e14547ed1133 100644
--- a/packages/angular/cli/commands/run.json
+++ b/packages/angular/cli/commands/run.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/run.json",
-  "description": "Runs Architect targets.",
+  "description": "Runs a custom target defined in your project.",
   "$longDescription": "",
 
   "$aliases": [],
diff --git a/packages/angular/cli/commands/test.json b/packages/angular/cli/commands/test.json
index 79c5a0ef8c85..8e800f9cad5f 100644
--- a/packages/angular/cli/commands/test.json
+++ b/packages/angular/cli/commands/test.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/test.json",
-  "description": "Run unit tests in existing project.",
+  "description": "Runs unit tests in a project.",
   "$longDescription": "",
 
   "$aliases": [ "t" ],
diff --git a/packages/angular/cli/commands/update.md b/packages/angular/cli/commands/update-long.md
similarity index 100%
rename from packages/angular/cli/commands/update.md
rename to packages/angular/cli/commands/update-long.md
diff --git a/packages/angular/cli/commands/update.json b/packages/angular/cli/commands/update.json
index d80759c754ad..3ccaf012ca77 100644
--- a/packages/angular/cli/commands/update.json
+++ b/packages/angular/cli/commands/update.json
@@ -1,8 +1,8 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/update.json",
-  "description": "Updates your application and its dependencies. See \"https://update.angular.io/\"",
-  "$longDescription": "./update.md",
+  "description": "Updates your application and its dependencies. See https://update.angular.io/",
+  "$longDescription": "./update-long.md",
 
   "$scope": "all",
   "$aliases": [],

From 3d64c344734123b58d933849c307380b3d0351cf Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 16 Oct 2018 17:56:44 +0200
Subject: [PATCH 0318/1703] build: update to typescript 3.1.3

---
 package.json                          | 2 +-
 packages/ngtools/webpack/package.json | 2 +-
 yarn.lock                             | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 5d56f34d2079..e2377af595f4 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "quicktype-core": "^5.0.41",
     "temp": "^0.8.3",
     "tslint": "^5.11.0",
-    "typescript": "~3.1.1",
+    "typescript": "~3.1.3",
     "yarn": "^1.10.1"
   },
   "devDependencies": {
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 7315070a690d..0cd69f1eaa9b 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -35,7 +35,7 @@
   "devDependencies": {
     "@angular/compiler": "^7.0.0-rc.0",
     "@angular/compiler-cli": "^7.0.0-rc.0",
-    "typescript": "~3.1.1",
+    "typescript": "~3.1.3",
     "webpack": "^4.0.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 99ddf4dc38f7..7468d7a0e158 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8714,10 +8714,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@3.1.1, typescript@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.1.tgz#3362ba9dd1e482ebb2355b02dfe8bcd19a2c7c96"
-  integrity sha512-Veu0w4dTc/9wlWNf2jeRInNodKlcdLgemvPsrNpfu5Pq39sgfFjvIIgTsvUHCoLBnMhPoUA+tFxsXjU6VexVRQ==
+typescript@3.1.3, typescript@~3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.3.tgz#01b70247a6d3c2467f70c45795ef5ea18ce191d5"
+  integrity sha512-+81MUSyX+BaSo+u2RbozuQk/UWx6hfG0a5gHu4ANEM4sU96XbuIyAB+rWBW1u70c6a5QuZfuYICn3s2UjuHUpA==
 
 uglify-es@^3.3.4:
   version "3.3.9"

From 748e2e57a18381d1b0ef4c34dcbbb5aabd2bffd6 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 16 Oct 2018 17:57:07 +0200
Subject: [PATCH 0319/1703] fix(@schematics/angular): update typescript
 dependency to 3.1.3

Fixes issues related to Microsoft/TypeScript#27341
---
 packages/schematics/angular/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/package.json b/packages/schematics/angular/package.json
index e9683c86c404..394fe0af24d2 100644
--- a/packages/schematics/angular/package.json
+++ b/packages/schematics/angular/package.json
@@ -11,6 +11,6 @@
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
-    "typescript": "3.1.1"
+    "typescript": "3.1.3"
   }
 }

From 915994da69358253fe0fac763a623e729b9e4ff6 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 16 Oct 2018 19:34:01 +0200
Subject: [PATCH 0320/1703] fix(@angular-devkit/build-optimizer): update to
 typescript 3.1.3

This fixes issues related to Microsoft/TypeScript#27341
---
 packages/angular_devkit/build_optimizer/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_optimizer/package.json b/packages/angular_devkit/build_optimizer/package.json
index 6aba9ecc612e..7dd4920aa4ef 100644
--- a/packages/angular_devkit/build_optimizer/package.json
+++ b/packages/angular_devkit/build_optimizer/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "loader-utils": "1.1.0",
     "source-map": "0.5.6",
-    "typescript": "3.1.1",
+    "typescript": "3.1.3",
     "webpack-sources": "1.2.0"
   }
 }

From d0bea7a1ff726a2f307a0e36e197952852e722cc Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 12 Oct 2018 09:02:31 +0200
Subject: [PATCH 0321/1703] fix(@ngtools/webpack): barrel files fail on windows

Fixes #12035
---
 packages/ngtools/webpack/src/entry_resolver.ts  | 11 ++++++-----
 tests/legacy-cli/e2e/tests/build/barrel-file.ts |  8 ++++++++
 2 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 tests/legacy-cli/e2e/tests/build/barrel-file.ts

diff --git a/packages/ngtools/webpack/src/entry_resolver.ts b/packages/ngtools/webpack/src/entry_resolver.ts
index b844f96c5bfb..1a485d9dc324 100644
--- a/packages/ngtools/webpack/src/entry_resolver.ts
+++ b/packages/ngtools/webpack/src/entry_resolver.ts
@@ -5,8 +5,8 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import * as fs from 'fs';
-import { join } from 'path';
+
+import { Path, join } from '@angular-devkit/core';
 import * as ts from 'typescript';
 import { TypeScriptFileRefactor } from './refactor';
 
@@ -54,9 +54,10 @@ function _recursiveSymbolExportLookup(refactor: TypeScriptFileRefactor,
     for (const specifier of binding.elements) {
       if (specifier.name.text == symbolName) {
         // If it's a directory, load its index and recursively lookup.
-        if (fs.statSync(module).isDirectory()) {
-          const indexModule = join(module, 'index.ts');
-          if (fs.existsSync(indexModule)) {
+        // If it's a file it will return false
+        if (host.directoryExists && host.directoryExists(module)) {
+          const indexModule = join(module as Path, 'index.ts');
+          if (host.fileExists(indexModule)) {
             const indexRefactor = new TypeScriptFileRefactor(indexModule, host, program);
             const maybeModule = _recursiveSymbolExportLookup(
               indexRefactor, symbolName, host, program);
diff --git a/tests/legacy-cli/e2e/tests/build/barrel-file.ts b/tests/legacy-cli/e2e/tests/build/barrel-file.ts
new file mode 100644
index 000000000000..b39480f308ec
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/build/barrel-file.ts
@@ -0,0 +1,8 @@
+import { replaceInFile, writeFile } from '../../utils/fs';
+import { ng } from '../../utils/process';
+
+export default async function() {
+  await writeFile('src/app/index.ts', `export { AppModule } from './app.module';`);
+  await replaceInFile('src/main.ts', './app/app.module', './app');
+  await ng('build');
+}

From 6e7f4d961f09fb13143aa30aba343a660c578124 Mon Sep 17 00:00:00 2001
From: Jason Jean <jasonjean1993@gmail.com>
Date: Tue, 16 Oct 2018 10:55:18 -0400
Subject: [PATCH 0322/1703] fix(@schematics/angular): fix polyfill path
 resolution

---
 .../angular/migrations/update-7/polyfill-metadata.ts |  8 ++++----
 .../migrations/update-7/polyfill-metadata_spec.ts    | 12 ++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-7/polyfill-metadata.ts b/packages/schematics/angular/migrations/update-7/polyfill-metadata.ts
index 328457c8b2ff..895479d461bd 100644
--- a/packages/schematics/angular/migrations/update-7/polyfill-metadata.ts
+++ b/packages/schematics/angular/migrations/update-7/polyfill-metadata.ts
@@ -52,7 +52,7 @@ function _removeReflectFromPolyfills(tree: Tree, path: string) {
  * @param targetObject The target information.
  * @private
  */
-function _updateProjectTarget(root: string, targetObject: json.JsonObject): Rule {
+function _updateProjectTarget(targetObject: json.JsonObject): Rule {
   // Make sure we're using the correct builder.
   if (targetObject.builder !== '@angular-devkit/build-angular:browser'
       || !json.isJsonObject(targetObject.options)) {
@@ -63,7 +63,7 @@ function _updateProjectTarget(root: string, targetObject: json.JsonObject): Rule
     return noop();
   }
 
-  const polyfillsToUpdate = [`${root}/${options.polyfills}`];
+  const polyfillsToUpdate = [options.polyfills];
   const configurations = targetObject.configurations;
   if (json.isJsonObject(configurations)) {
     for (const configName of Object.keys(configurations)) {
@@ -73,7 +73,7 @@ function _updateProjectTarget(root: string, targetObject: json.JsonObject): Rule
       if (json.isJsonObject(config)
           && typeof config.polyfills == 'string'
           && config.aot !== true) {
-        polyfillsToUpdate.push(`${root}/${config.polyfills}`);
+        polyfillsToUpdate.push(config.polyfills);
       }
     }
   }
@@ -125,7 +125,7 @@ export function polyfillMetadataRule(): Rule {
       for (const targetName of Object.keys(targets)) {
         const target = targets[targetName];
         if (json.isJsonObject(target)) {
-          rules.push(_updateProjectTarget(project.root, target));
+          rules.push(_updateProjectTarget(target));
         }
       }
     }
diff --git a/packages/schematics/angular/migrations/update-7/polyfill-metadata_spec.ts b/packages/schematics/angular/migrations/update-7/polyfill-metadata_spec.ts
index beed4a5dbb58..a696e8ac9bc4 100644
--- a/packages/schematics/angular/migrations/update-7/polyfill-metadata_spec.ts
+++ b/packages/schematics/angular/migrations/update-7/polyfill-metadata_spec.ts
@@ -86,4 +86,16 @@ describe('polyfillMetadataRule', () => {
 
     expect(tree2.readContent(polyfillPath)).not.toMatch(/import .*es7.*reflect.*;/);
   });
+
+  it('should work as expected for a project with a root', async () => {
+    const originalContent = JSON.parse(tree.readContent('angular.json'));
+    originalContent.projects['migration-test'].root = 'src';
+    tree.overwrite('angular.json', JSON.stringify(originalContent));
+    const polyfillPath = '/src/polyfills.ts';
+    tree.overwrite(polyfillPath, oldPolyfills);
+    const tree2 = await schematicRunner.runSchematicAsync('migration-03', {}, tree.branch())
+      .toPromise();
+
+    expect(tree2.readContent(polyfillPath)).not.toMatch(/import .*es7.*reflect.*;/);
+  });
 });

From 74c799a82cf756f86074ea3d91ee5b64d7ea43d0 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 17 Oct 2018 14:00:15 -0400
Subject: [PATCH 0323/1703] fix(@schematics/angular): avoid using 6.2+ only
 features in migrations

---
 .../migrations/update-7/polyfill-metadata.ts  | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-7/polyfill-metadata.ts b/packages/schematics/angular/migrations/update-7/polyfill-metadata.ts
index 895479d461bd..cbc2fb4ac8b9 100644
--- a/packages/schematics/angular/migrations/update-7/polyfill-metadata.ts
+++ b/packages/schematics/angular/migrations/update-7/polyfill-metadata.ts
@@ -5,10 +5,13 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { json } from '@angular-devkit/core';
+import { JsonObject, JsonParseMode, JsonValue, parseJson } from '@angular-devkit/core';
 import { Rule, Tree, chain, noop } from '@angular-devkit/schematics';
 import * as ts from 'typescript';
 
+function isJsonObject(value: JsonValue): value is JsonObject {
+  return value != null && typeof value === 'object' && !Array.isArray(value);
+}
 
 /**
  * Remove the Reflect import from a polyfill file.
@@ -52,10 +55,10 @@ function _removeReflectFromPolyfills(tree: Tree, path: string) {
  * @param targetObject The target information.
  * @private
  */
-function _updateProjectTarget(targetObject: json.JsonObject): Rule {
+function _updateProjectTarget(targetObject: JsonObject): Rule {
   // Make sure we're using the correct builder.
   if (targetObject.builder !== '@angular-devkit/build-angular:browser'
-      || !json.isJsonObject(targetObject.options)) {
+      || !isJsonObject(targetObject.options)) {
     return noop();
   }
   const options = targetObject.options;
@@ -65,12 +68,12 @@ function _updateProjectTarget(targetObject: json.JsonObject): Rule {
 
   const polyfillsToUpdate = [options.polyfills];
   const configurations = targetObject.configurations;
-  if (json.isJsonObject(configurations)) {
+  if (isJsonObject(configurations)) {
     for (const configName of Object.keys(configurations)) {
       const config = configurations[configName];
 
       // Just in case, only do non-AOT configurations.
-      if (json.isJsonObject(config)
+      if (isJsonObject(config)
           && typeof config.polyfills == 'string'
           && config.aot !== true) {
         polyfillsToUpdate.push(config.polyfills);
@@ -100,9 +103,9 @@ export function polyfillMetadataRule(): Rule {
       return;
     }
 
-    const angularJson = json.parseJson(angularConfigContent.toString(), json.JsonParseMode.Loose);
+    const angularJson = parseJson(angularConfigContent.toString(), JsonParseMode.Loose);
 
-    if (!json.isJsonObject(angularJson) || !json.isJsonObject(angularJson.projects)) {
+    if (!isJsonObject(angularJson) || !isJsonObject(angularJson.projects)) {
       // If that field isn't there, no use...
       return;
     }
@@ -110,7 +113,7 @@ export function polyfillMetadataRule(): Rule {
     // For all projects, for all targets, read the polyfill field, and read the environment.
     for (const projectName of Object.keys(angularJson.projects)) {
       const project = angularJson.projects[projectName];
-      if (!json.isJsonObject(project)) {
+      if (!isJsonObject(project)) {
         continue;
       }
       if (typeof project.root != 'string') {
@@ -118,13 +121,13 @@ export function polyfillMetadataRule(): Rule {
       }
 
       const targets = project.targets || project.architect;
-      if (!json.isJsonObject(targets)) {
+      if (!isJsonObject(targets)) {
         continue;
       }
 
       for (const targetName of Object.keys(targets)) {
         const target = targets[targetName];
-        if (json.isJsonObject(target)) {
+        if (isJsonObject(target)) {
           rules.push(_updateProjectTarget(target));
         }
       }

From 8b400f2f74335da42f358724c556ae3dcb7a8461 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 18 Oct 2018 12:45:30 +0200
Subject: [PATCH 0324/1703] docs: improve command option descriptions

---
 .../build_angular/src/browser/schema.json              | 10 +++++-----
 .../angular_devkit/build_angular/src/karma/schema.json |  2 +-
 .../build_angular/src/server/schema.json               |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index 8e6a4f3e60b4..ca7c2c0103b9 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -136,7 +136,7 @@
     },
     "extractCss": {
       "type": "boolean",
-      "description": "Extract css from global styles onto css files instead of js ones.",
+      "description": "Extract css from global styles into css files instead of js ones.",
       "default": false
     },
     "watch": {
@@ -181,7 +181,7 @@
     },
     "buildOptimizer": {
       "type": "boolean",
-      "description": "Enables @angular-devkit/build-optimizer optimizations when using the 'aot' option.",
+      "description": "Enables '@angular-devkit/build-optimizer' optimizations when using the 'aot' option.",
       "default": false
     },
     "namedChunks": {
@@ -214,7 +214,7 @@
     },
     "statsJson": {
       "type": "boolean",
-      "description": "Generates a 'stats.json' file which can be analyzed using tools such as: #webpack-bundle-analyzer' or https: //webpack.github.io/analyse.",
+      "description": "Generates a 'stats.json' file which can be analyzed using tools such as: 'webpack-bundle-analyzer' or https: //webpack.github.io/analyse.",
       "default": false
     },
     "forkTypeChecker": {
@@ -223,7 +223,7 @@
       "default": true
     },
     "lazyModules": {
-      "description": "List of additional NgModule files that will be lazy loaded. Lazy router modules with be discovered automatically.",
+      "description": "List of additional NgModule files that will be lazy loaded. Lazy router modules will be discovered automatically.",
       "type": "array",
       "items": {
         "type": "string"
@@ -263,7 +263,7 @@
             },
             "input": {
               "type": "string",
-              "description": "The input path dir in which to apply 'glob'. Defaults to the project root."
+              "description": "The input directory path in which to apply 'glob'. Defaults to the project root."
             },
             "ignore": {
               "description": "An array of globs to ignore.",
diff --git a/packages/angular_devkit/build_angular/src/karma/schema.json b/packages/angular_devkit/build_angular/src/karma/schema.json
index d883af8cf848..e000cb0905ee 100644
--- a/packages/angular_devkit/build_angular/src/karma/schema.json
+++ b/packages/angular_devkit/build_angular/src/karma/schema.json
@@ -177,7 +177,7 @@
             },
             "input": {
               "type": "string",
-              "description": "The input path dir in which to apply 'glob'. Defaults to the project root."
+              "description": "The input directory path in which to apply 'glob'. Defaults to the project root."
             },
             "output": {
               "type": "string",
diff --git a/packages/angular_devkit/build_angular/src/server/schema.json b/packages/angular_devkit/build_angular/src/server/schema.json
index 147d538342a8..c81d4b25d7f4 100644
--- a/packages/angular_devkit/build_angular/src/server/schema.json
+++ b/packages/angular_devkit/build_angular/src/server/schema.json
@@ -145,7 +145,7 @@
     },
     "statsJson": {
       "type": "boolean",
-      "description": "Generates a 'stats.json' file which can be analyzed using tools such as: #webpack-bundle-analyzer' or https: //webpack.github.io/analyse.",
+      "description": "Generates a 'stats.json' file which can be analyzed using tools such as: 'webpack-bundle-analyzer' or https: //webpack.github.io/analyse.",
       "default": false
     },
     "forkTypeChecker": {
@@ -154,7 +154,7 @@
       "default": true
     },
     "lazyModules": {
-      "description": "List of additional NgModule files that will be lazy loaded. Lazy router modules with be discovered automatically.",
+      "description": "List of additional NgModule files that will be lazy loaded. Lazy router modules will be discovered automatically.",
       "type": "array",
       "items": {
         "type": "string"

From 387d64c317d064adc5e4985625131c534efa7eff Mon Sep 17 00:00:00 2001
From: Hsuan Lee <HsuanGM@gmail.com>
Date: Fri, 12 Oct 2018 11:29:05 +0800
Subject: [PATCH 0325/1703] fix(@angular-devkit/build-webpack): skip transition
 property optimization

jakubpawlowicz/clean-css#1050 to be fixed before removing this option.

Fix #12408
---
 .../angular-cli-files/plugins/cleancss-webpack-plugin.ts    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/cleancss-webpack-plugin.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/cleancss-webpack-plugin.ts
index 4555c53d2045..47e48b94a94b 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/cleancss-webpack-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/cleancss-webpack-plugin.ts
@@ -63,7 +63,11 @@ export class CleanCssWebpackPlugin {
     hook(compiler, (compilation: compilation.Compilation, chunks: Array<Chunk>) => {
       const cleancss = new CleanCSS({
         compatibility: 'ie9',
-        level: 2,
+        level: {
+          2: {
+            skipProperties: ['transition'] // Fixes #12408
+          }
+        },
         inline: false,
         returnPromise: true,
         sourceMap: this._options.sourceMap,

From 16f1834736dbed34fc320e8fd895bb624bee848a Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 17 Oct 2018 14:31:25 -0400
Subject: [PATCH 0326/1703] fix(@schematics/angular): update codelyzer for new
 projects

codelyzer@4.5.0 adds support for Angular 7.0 and removes peer dep warnings on new project install.
---
 packages/schematics/angular/workspace/files/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/workspace/files/package.json b/packages/schematics/angular/workspace/files/package.json
index 583c4ac50ffe..edf7f51b4380 100644
--- a/packages/schematics/angular/workspace/files/package.json
+++ b/packages/schematics/angular/workspace/files/package.json
@@ -30,7 +30,7 @@
     "@types/node": "~8.9.4",
     <% if (!minimal) { %>"@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "~2.0.3",
-    "codelyzer": "~4.3.0",
+    "codelyzer": "~4.5.0",
     "jasmine-core": "~2.99.1",
     "jasmine-spec-reporter": "~4.2.1",
     "karma": "~3.0.0",

From 41eee217d50005c3d08ff72c8873c1d83157a6d5 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 18 Oct 2018 09:11:40 +0200
Subject: [PATCH 0327/1703] fix(@schematics/angular): point CLI link to
 `angular.io` instead of wiki

---
 .../angular/application/other-files/app.component.html          | 2 +-
 .../schematics/angular/application/other-files/app.component.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/application/other-files/app.component.html b/packages/schematics/angular/application/other-files/app.component.html
index 45d45d08894b..d64e4d22d343 100644
--- a/packages/schematics/angular/application/other-files/app.component.html
+++ b/packages/schematics/angular/application/other-files/app.component.html
@@ -11,7 +11,7 @@ <h2>Here are some links to help you start: </h2>
     <h2><a target="_blank" rel="noopener" href="https://angular.io/tutorial">Tour of Heroes</a></h2>
   </li>
   <li>
-    <h2><a target="_blank" rel="noopener" href="https://github.com/angular/angular-cli/wiki">CLI Documentation</a></h2>
+    <h2><a target="_blank" rel="noopener" href="https://angular.io/cli">CLI Documentation</a></h2>
   </li>
   <li>
     <h2><a target="_blank" rel="noopener" href="https://blog.angular.io/">Angular blog</a></h2>
diff --git a/packages/schematics/angular/application/other-files/app.component.ts b/packages/schematics/angular/application/other-files/app.component.ts
index c9be35dfcfbb..fb3e8bf8a20e 100644
--- a/packages/schematics/angular/application/other-files/app.component.ts
+++ b/packages/schematics/angular/application/other-files/app.component.ts
@@ -16,7 +16,7 @@ import { Component } from '@angular/core';
         <h2><a target="_blank" rel="noopener" href="https://angular.io/tutorial">Tour of Heroes</a></h2>
       </li>
       <li>
-        <h2><a target="_blank" rel="noopener" href="https://github.com/angular/angular-cli/wiki">CLI Documentation</a></h2>
+        <h2><a target="_blank" rel="noopener" href="https://angular.io/cli">CLI Documentation</a></h2>
       </li>
       <li>
         <h2><a target="_blank" rel="noopener" href="https://blog.angular.io/">Angular blog</a></h2>

From 4a4cfb0fa54f3acd89e78411f21d7888a358ef62 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 18 Oct 2018 16:22:53 +0200
Subject: [PATCH 0328/1703] docs: add links to aio pages

---
 docs/documentation/add.md                     |   2 +
 docs/documentation/build.md                   |   2 +
 docs/documentation/config.md                  |   1 +
 docs/documentation/doc.md                     |   1 +
 docs/documentation/e2e.md                     |   1 +
 docs/documentation/eject.md                   |   1 +
 docs/documentation/generate.md                |   2 +
 docs/documentation/generate/app-shell.md      |   2 +
 docs/documentation/generate/application.md    |   2 +
 docs/documentation/generate/class.md          |   2 +-
 docs/documentation/generate/component.md      |   2 +
 docs/documentation/generate/directive.md      |   1 +
 docs/documentation/generate/enum.md           |   2 +-
 docs/documentation/generate/guard.md          |   2 +
 docs/documentation/generate/interface.md      |   1 +
 docs/documentation/generate/library.md        |   2 +
 docs/documentation/generate/module.md         |   1 +
 docs/documentation/generate/pipe.md           |   1 +
 docs/documentation/generate/service.md        |   1 +
 docs/documentation/generate/universal.md      |   1 +
 docs/documentation/help.md                    |   2 +
 docs/documentation/home.md                    |   2 +-
 docs/documentation/lint.md                    |   1 +
 docs/documentation/new.md                     |   2 +
 docs/documentation/run.md                     |   1 +
 docs/documentation/serve.md                   |   1 +
 docs/documentation/stories/1.0-update.md      | 503 ++++++++++++++++++
 .../stories/application-environments.md       |   2 +
 docs/documentation/stories/budgets.md         |   2 +
 docs/documentation/stories/code-coverage.md   |   2 +
 .../stories/continuous-integration.md         |   2 +
 docs/documentation/stories/github-pages.md    |   2 +
 .../stories/internationalization.md           |   2 +
 docs/documentation/stories/proxy.md           |   2 +
 docs/documentation/stories/routing.md         |   2 +
 .../stories/universal-rendering.md            |   2 +
 docs/documentation/test.md                    |   2 +
 docs/documentation/update.md                  |   1 +
 docs/documentation/version.md                 |   1 +
 docs/documentation/xi18n.md                   |   1 +
 40 files changed, 562 insertions(+), 3 deletions(-)
 create mode 100644 docs/documentation/stories/1.0-update.md

diff --git a/docs/documentation/add.md b/docs/documentation/add.md
index 9406f31a2c2a..8ec0068cb337 100644
--- a/docs/documentation/add.md
+++ b/docs/documentation/add.md
@@ -1,5 +1,7 @@
 <!-- Links in /docs/documentation should NOT have \`.md\` at the end, because they end up in our wiki at release. -->
 
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/add).**
+
 # ng add
 
 ## Overview
diff --git a/docs/documentation/build.md b/docs/documentation/build.md
index ba25703f56b1..816acb63131d 100644
--- a/docs/documentation/build.md
+++ b/docs/documentation/build.md
@@ -1,4 +1,6 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/build)**.
+
 
 # ng build
 
diff --git a/docs/documentation/config.md b/docs/documentation/config.md
index bc4d49f32612..62d554d1e05c 100644
--- a/docs/documentation/config.md
+++ b/docs/documentation/config.md
@@ -1,4 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/config)**.
 
 # ng config
 
diff --git a/docs/documentation/doc.md b/docs/documentation/doc.md
index 33fcd402f69c..098d84f04f5c 100644
--- a/docs/documentation/doc.md
+++ b/docs/documentation/doc.md
@@ -1,4 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/doc)**.
 
 # ng doc
 
diff --git a/docs/documentation/e2e.md b/docs/documentation/e2e.md
index 2f9c0d40a695..120dab85ab94 100644
--- a/docs/documentation/e2e.md
+++ b/docs/documentation/e2e.md
@@ -1,4 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/e2e)**.
 
 # ng e2e
 
diff --git a/docs/documentation/eject.md b/docs/documentation/eject.md
index 3e2ff0055fe4..515283790dcc 100644
--- a/docs/documentation/eject.md
+++ b/docs/documentation/eject.md
@@ -1,4 +1,5 @@
 <!-- Links in /docs/documentation should NOT have \`.md\` at the end, because they end up in our wiki at release. -->
+**Documentation below is for CLI version 6.**.
 
 # ng eject
 
diff --git a/docs/documentation/generate.md b/docs/documentation/generate.md
index ec448122faee..af88444ac51c 100644
--- a/docs/documentation/generate.md
+++ b/docs/documentation/generate.md
@@ -1,5 +1,7 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
 
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+
 # ng generate
 
 ## Overview
diff --git a/docs/documentation/generate/app-shell.md b/docs/documentation/generate/app-shell.md
index b065a442af18..af5ee13d76be 100644
--- a/docs/documentation/generate/app-shell.md
+++ b/docs/documentation/generate/app-shell.md
@@ -1,5 +1,7 @@
 <!-- Links in /docs/documentation should NOT have \`.md\` at the end, because they end up in our wiki at release. -->
 
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+
 # ng generate app-shell
 
 ## Overview
diff --git a/docs/documentation/generate/application.md b/docs/documentation/generate/application.md
index ddf2e73d2709..0f5c21c65862 100644
--- a/docs/documentation/generate/application.md
+++ b/docs/documentation/generate/application.md
@@ -1,5 +1,7 @@
 <!-- Links in /docs/documentation should NOT have \`.md\` at the end, because they end up in our wiki at release. -->
 
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+
 # ng generate application
 
 ## Overview
diff --git a/docs/documentation/generate/class.md b/docs/documentation/generate/class.md
index 2921320f5d6a..d8c562c0abb4 100644
--- a/docs/documentation/generate/class.md
+++ b/docs/documentation/generate/class.md
@@ -1,5 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
-
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
 # ng generate class
 
 ## Overview
diff --git a/docs/documentation/generate/component.md b/docs/documentation/generate/component.md
index 2a50786f6d89..b02e9ca88466 100644
--- a/docs/documentation/generate/component.md
+++ b/docs/documentation/generate/component.md
@@ -1,5 +1,7 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
 
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+
 # ng generate component
 
 ## Overview
diff --git a/docs/documentation/generate/directive.md b/docs/documentation/generate/directive.md
index 96c3ce04e94b..f14d0cdde3ae 100644
--- a/docs/documentation/generate/directive.md
+++ b/docs/documentation/generate/directive.md
@@ -1,4 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
 
 # ng generate directive
 
diff --git a/docs/documentation/generate/enum.md b/docs/documentation/generate/enum.md
index 79824e183b91..7eec3eacb13a 100644
--- a/docs/documentation/generate/enum.md
+++ b/docs/documentation/generate/enum.md
@@ -1,5 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
-
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
 # ng generate enum
 
 ## Overview
diff --git a/docs/documentation/generate/guard.md b/docs/documentation/generate/guard.md
index 06a82df57e9b..5f37f49aae32 100644
--- a/docs/documentation/generate/guard.md
+++ b/docs/documentation/generate/guard.md
@@ -1,3 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+
 # ng generate guard
 
 ## Overview
diff --git a/docs/documentation/generate/interface.md b/docs/documentation/generate/interface.md
index 69ac2e27ab8b..0afd4b9f80bf 100644
--- a/docs/documentation/generate/interface.md
+++ b/docs/documentation/generate/interface.md
@@ -1,4 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
 
 # ng generate interface
 
diff --git a/docs/documentation/generate/library.md b/docs/documentation/generate/library.md
index c891bf6c35bb..c79fdb6f91f1 100644
--- a/docs/documentation/generate/library.md
+++ b/docs/documentation/generate/library.md
@@ -1,4 +1,6 @@
 <!-- Links in /docs/documentation should NOT have \`.md\` at the end, because they end up in our wiki at release. -->
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+
 
 # ng generate library
 
diff --git a/docs/documentation/generate/module.md b/docs/documentation/generate/module.md
index aadc337a1131..c0cae09d6d0a 100644
--- a/docs/documentation/generate/module.md
+++ b/docs/documentation/generate/module.md
@@ -1,4 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
 
 # ng generate module
 
diff --git a/docs/documentation/generate/pipe.md b/docs/documentation/generate/pipe.md
index beec9abfbd48..68bffd3644e1 100644
--- a/docs/documentation/generate/pipe.md
+++ b/docs/documentation/generate/pipe.md
@@ -1,4 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
 
 # ng generate pipe
 
diff --git a/docs/documentation/generate/service.md b/docs/documentation/generate/service.md
index d52583b12aa3..c114bd9826c3 100644
--- a/docs/documentation/generate/service.md
+++ b/docs/documentation/generate/service.md
@@ -1,4 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
 
 # ng generate service
 
diff --git a/docs/documentation/generate/universal.md b/docs/documentation/generate/universal.md
index 8e9bf1e0241f..870c13d7bc4b 100644
--- a/docs/documentation/generate/universal.md
+++ b/docs/documentation/generate/universal.md
@@ -1,4 +1,5 @@
 <!-- Links in /docs/documentation should NOT have \`.md\` at the end, because they end up in our wiki at release. -->
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
 
 # ng generate universal
 
diff --git a/docs/documentation/help.md b/docs/documentation/help.md
index 577f2cab8f9b..45e7bde46c8a 100644
--- a/docs/documentation/help.md
+++ b/docs/documentation/help.md
@@ -1,4 +1,6 @@
 <!-- Links in /docs/documentation should NOT have \`.md\` at the end, because they end up in our wiki at release. -->
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/help)**.
+
 
 # ng help
 
diff --git a/docs/documentation/home.md b/docs/documentation/home.md
index c5674d45ce4f..f8d2bb2a87ac 100644
--- a/docs/documentation/home.md
+++ b/docs/documentation/home.md
@@ -2,7 +2,7 @@
 
 # Angular CLI
 
-NOTE: this documentation is for Angular CLI 6. For Angular CLI 1.x go [here](1-x-home) instead.
+**NOTE: this documentation is for Angular CLI 6. For Angular CLI Version 7 go [here](https://angular.io/cli) and 1.x go [here](1-x-home) instead.**
 
 ### Overview
 The Angular CLI is a tool to initialize, develop, scaffold  and maintain [Angular](https://angular.io) applications
diff --git a/docs/documentation/lint.md b/docs/documentation/lint.md
index 46cf98642821..6c0c48ee3095 100644
--- a/docs/documentation/lint.md
+++ b/docs/documentation/lint.md
@@ -1,4 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/lint)**.
 
 # ng lint
 
diff --git a/docs/documentation/new.md b/docs/documentation/new.md
index 4e7ebd260918..eed0ab4afbcd 100644
--- a/docs/documentation/new.md
+++ b/docs/documentation/new.md
@@ -1,5 +1,7 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
 
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/new)**.
+
 # ng new
 
 ## Overview
diff --git a/docs/documentation/run.md b/docs/documentation/run.md
index c7de54d15085..06caa0658bb4 100644
--- a/docs/documentation/run.md
+++ b/docs/documentation/run.md
@@ -1,4 +1,5 @@
 <!-- Links in /docs/documentation should NOT have \`.md\` at the end, because they end up in our wiki at release. -->
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/run)**.
 
 # ng run
 
diff --git a/docs/documentation/serve.md b/docs/documentation/serve.md
index b064c71ab3f5..f583dd0dba16 100644
--- a/docs/documentation/serve.md
+++ b/docs/documentation/serve.md
@@ -1,4 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/serve)**.
 
 # ng serve
 
diff --git a/docs/documentation/stories/1.0-update.md b/docs/documentation/stories/1.0-update.md
new file mode 100644
index 000000000000..a9fc9d8d3f25
--- /dev/null
+++ b/docs/documentation/stories/1.0-update.md
@@ -0,0 +1,503 @@
+# Angular CLI migration guide
+
+In this migration guide we'll be looking at some of the major changes to CLI projects in the
+last two months.
+
+Most of these changes were not breaking changes and your project should work fine without them.
+
+But if you've been waiting for the perfect time to update, this is it!
+Along with major rebuild speed increases, we've been busy adding a lot of features.
+
+Documentation has also completely moved to [the wiki](https://github.com/angular/angular-cli/wiki).
+The new [Stories](https://github.com/angular/angular-cli/wiki/stories) section covers common usage
+scenarios, so be sure to have a look!
+
+Below are the changes between a project generated two months ago, with `1.0.0-beta.24` and
+a `1.0.0` project.
+If you kept your project up to date you might have a lot of these already.
+
+You can find more details about changes between versions in [the releases tab on GitHub](https://github.com/angular/angular-cli/releases).
+
+If you prefer, you can also generate a new project in a separate folder using
+ `ng new upgrade-project --skip-install` and compare the differences.
+
+## @angular/cli
+
+Angular CLI can now be found on NPM under `@angular/cli` instead of `angular-cli`, and upgrading is a simple 3 step process:
+
+1. Uninstall old version
+2. Update node/npm if necessary
+3. Install new version
+
+### 1. Uninstall old version
+
+If you're using Angular CLI `beta.28` or less, you need to uninstall the `angular-cli` packages:
+```bash
+npm uninstall -g angular-cli          # Remove global package
+npm uninstall --save-dev angular-cli  # Remove from package.json
+```
+
+Otherwise, uninstall the  `@angular/cli` packages:
+```bash
+npm uninstall -g @angular/cli         # Remove global package
+npm uninstall --save-dev @angular/cli # Remove from package.json
+```
+
+Also purge the cache and local packages:
+```
+rm -rf node_modules dist # Use rmdir on Windows
+npm cache clean
+```
+
+At this point, you should not have Angular CLI on your system anymore. If invoking Angular CLI at the commandline reveals that it still exists on your system, you will have to manually remove it. See _Manually removing residual Angular CLI_.
+
+### 2. Update node/npm if necessary
+
+Angular CLI now has a minimum requirement of Node 6.9.0 or higher, together with NPM 3 or higher.
+
+If your Node or NPM versions do not meet these requirements, please refer to [the documentation](https://docs.npmjs.com/getting-started/installing-node) on how to upgrade. 
+
+### 3. Install the new version
+
+To update Angular CLI to a new version, you must update both the global package and your project's local package:
+
+```bash
+npm install -g @angular/cli@latest          # Global package
+npm install --save-dev @angular/cli@latest  # Local package
+npm install                                 # Restore removed dependencies
+```
+
+### Manually removing residual Angular CLI
+
+If you accidentally updated NPM before removing the old Angular CLI, you may find that uninstalling the package using `npm uninstall` is proving fruitless. This _could_ be because the global install (and uninstall) path changed between versions of npm from `/usr/local/lib` to `/usr/lib`, and hence, no longer searches through the old directory. In this case you'll have to remove it manually:
+
+`rm -rf /usr/local/lib/node_modules/@angular/cli`
+
+If the old Angular CLI package _still_ persists, you'll need to research how to remove it before proceeding with the upgrade.
+
+## .angular-cli.json
+
+`angular-cli.json` is now `.angular-cli.json`, but we still accept the old config file name.
+
+A few new properties have changed in it:
+
+### Schema
+
+Add the `$schema` property above project for handy IDE support on your config file:
+
+```
+"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+```
+
+### Polyfills
+
+There is now a dedicated entry for polyfills ([#3812](https://github.com/angular/angular-cli/pull/3812))
+inside `apps[0].polyfills`, between `main` and `test`:
+
+```
+"main": "main.ts",
+"polyfills": "polyfills.ts",
+"test": "test.ts",
+```
+
+Add it and remove `import './polyfills.ts';` from `src/main.ts` and `src/test.ts`.
+
+We also added a lot of descriptive comments to the existing `src/polyfills.ts` file, explaining
+which polyfills are needed for what browsers.
+Be sure to check it out in a new project!
+
+### Environments
+
+A new `environmentSource` entry ([#4705](https://github.com/angular/angular-cli/pull/4705))
+replaces the previous source entry inside environments.
+
+To migrate angular-cli.json follow the example below:
+
+Before:
+```
+"environments": {
+  "source": "environments/environment.ts",
+  "dev": "environments/environment.ts",
+  "prod": "environments/environment.prod.ts"
+}
+```
+
+After:
+
+```
+"environmentSource": "environments/environment.ts",
+"environments": {
+  "dev": "environments/environment.ts",
+  "prod": "environments/environment.prod.ts"
+}
+```
+
+### Linting
+
+The CLI now uses the TSLint API ([#4248](https://github.com/angular/angular-cli/pull/4248))
+to lint several TS projects at once.
+
+There is a new `lint` entry in `.angular-cli.json` between `e2e` and `test` where all linting
+targets are listed:
+
+```
+"e2e": {
+  "protractor": {
+    "config": "./protractor.conf.js"
+  }
+},
+"lint": [
+  {
+    "project": "src/tsconfig.app.json"
+  },
+  {
+    "project": "src/tsconfig.spec.json"
+  },
+  {
+    "project": "e2e/tsconfig.e2e.json"
+  }
+],
+"test": {
+  "karma": {
+    "config": "./karma.conf.js"
+  }
+},
+```
+
+### Generator defaults
+
+Now you can list generator defaults per generator ([#4389](https://github.com/angular/angular-cli/pull/4389))
+in `defaults`.
+
+Instead of:
+```
+"defaults": {
+  "styleExt": "css",
+  "prefixInterfaces": false,
+  "inline": {
+    "style": false,
+    "template": false
+  },
+  "spec": {
+    "class": false,
+    "component": true,
+    "directive": true,
+    "module": false,
+    "pipe": true,
+    "service": true
+  }
+}
+```
+
+You can instead list the flags as they appear on [the generator command](https://github.com/angular/angular-cli/wiki/generate-component):
+```
+"defaults": {
+  "styleExt": "css",
+  "component": {
+    "inlineTemplate": false,
+    "spec": true
+  }
+}
+```
+
+## One tsconfig per app
+
+CLI projects now use one tsconfig per app ([#4924](https://github.com/angular/angular-cli/pull/4924)).
+
+- `src/tsconfig.app.json`: configuration for the Angular app.
+```
+{
+  "compilerOptions": {
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "target": "es5",
+    "lib": [
+      "es2017",
+      "dom"
+    ],
+    "outDir": "../out-tsc/app",
+    "module": "es2015",
+    "baseUrl": "",
+    "types": []
+  },
+  "exclude": [
+    "test.ts",
+    "**/*.spec.ts"
+  ]
+}
+```
+- `src/tsconfig.spec.json`: configuration for the unit tests.
+```
+{
+  "compilerOptions": {
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "lib": [
+      "es2017",
+      "dom"
+    ],
+    "outDir": "../out-tsc/spec",
+    "module": "commonjs",
+    "target": "es5",
+    "baseUrl": "",
+    "types": [
+      "jasmine",
+      "node"
+    ]
+  },
+  "files": [
+    "test.ts"
+  ],
+  "include": [
+    "**/*.spec.ts",
+    "**/*.d.ts"
+  ]
+}
+
+```
+- `e2e/tsconfig.e2e.json`: configuration for the e2e tests.
+```
+{
+  "compilerOptions": {
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "lib": [
+      "es2017"
+    ],
+    "outDir": "../out-tsc/e2e",
+    "module": "commonjs",
+    "target": "es5",
+    "types":[
+      "jasmine",
+      "node"
+    ]
+  }
+}
+
+```
+
+There is an additional root-level `tsconfig.json` that is used for IDE integration.
+```
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "outDir": "./dist/out-tsc",
+    "baseUrl": "src",
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "target": "es5",
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+    "lib": [
+      "es2017",
+      "dom"
+    ]
+  }
+}
+```
+
+You can delete `e2e/tsconfig.json` and `src/tsconfig.json` after adding these.
+
+Also update `.angular-cli.json` to use them inside `apps[0]`:
+
+```
+"tsconfig": "tsconfig.app.json",
+"testTsconfig": "tsconfig.spec.json",
+```
+
+Then update `protractor.conf.js` to use the e2e config as well:
+```
+beforeLaunch: function() {
+  require('ts-node').register({
+    project: 'e2e/tsconfig.e2e.json'
+  });
+},
+```
+
+These configs have an `types` array where you should add any package you install via `@types/*`.
+This array helps keep typings isolated to the apps that really need them and avoid problems with
+duplicate typings.
+
+For instance, the unit test `tsconfig` has `jasmine` and `node`, which correspond to
+`@types/jasmine` and `@types/node`.
+Add any typings you've installed to the appropriate `tsconfig` as well.
+
+## typings.d.ts
+
+There's a new `src/typings.d.ts` file that serves two purposes:
+- provides a centralized place for users to add their own custom typings
+- makes it easy to use components that use `module.id`, present in the documentation and in snippets
+
+```
+/* SystemJS module definition */
+declare var module: NodeModule;
+interface NodeModule {
+  id: string;
+}
+```
+
+## package.json
+
+We've updated a lot of packages over the last months in order to keep projects up to date.
+
+Additions or removals are found in bold below.
+
+Packages in `dependencies`:
+- `@angular/*` packages now have a `^4.0.0` minimum
+- `core-js` remains unchanged at `^2.4.1`
+- `rxjs` was updated to `^5.1.0`
+- `ts-helpers` was **removed**
+- `zone.js` was updated to `^0.8.4`
+
+Packages in `devDependencies`:
+- `@angular/cli` at `1.0.0` replaces `angular-cli`
+- `@angular/compiler-cli` is also at `^4.0.0`
+- `@types/jasmine` remains unchanged and pinned at `2.5.38`
+- `@types/node` was updated to `~6.0.60`
+- `codelyzer` was updated to `~2.0.0`
+- `jasmine-core` was updated to `~2.5.2`
+- `jasmine-spec-reporter` was updated to `~3.2.0`
+- `karma` was updated to `~1.4.1`
+- `karma-chrome-launcher` was updated to `~2.0.0`
+- `karma-cli` was updated to `~1.0.1`
+- `karma-jasmine` was updated to `~1.1.0`
+- `karma-jasmine-html-reporter` was **added** at `^0.2.2`
+- `karma-coverage-istanbul-reporter` was **added** at `^0.2.0`, replacing `karma-remap-istanbul`
+- `karma-remap-istanbul` was **removed**
+- `protractor` was updated to `~5.1.0`
+- `ts-node` was updated to `~2.0.0`
+- `tslint` was updated to `~4.5.0`
+- `typescript` was updated to `~2.1.0`
+
+See the [karma](#karma.conf.js) and [protractor](#protractor.conf.js) sections below for more
+information on changed packages.
+
+The [Linting rules](#Linting rules) section contains a list of rules that changed due to updates.
+
+We also updated the scripts section to make it more simple:
+
+```
+"scripts": {
+  "ng": "ng",
+  "start": "ng serve",
+  "build": "ng build",
+  "test": "ng test",
+  "lint": "ng lint",
+  "e2e": "ng e2e"
+},
+```
+
+## karma.conf.js
+
+Karma configuration suffered some changes to improve the code-coverage functionality,
+use the new `@angular/cli` package, and the new HTML reporter.
+
+In the `frameworks` array update the CLI package to `@angular/cli`.
+
+In the `plugins` array:
+- add `require('karma-jasmine-html-reporter')` and `require('karma-coverage-istanbul-reporter')`
+- remove `require('karma-remap-istanbul')`
+- update the CLI plugin to `require('@angular/cli/plugins/karma')`
+
+Add a new `client` option just above `patterns`:
+```
+client:{
+  clearContext: false // leave Jasmine Spec Runner output visible in browser
+},
+files: [
+```
+
+Change the preprocessor to use the new CLI package:
+```
+preprocessors: {
+  './src/test.ts': ['@angular/cli']
+},
+```
+
+Replace `remapIstanbulReporter` with `coverageIstanbulReporter`:
+```
+coverageIstanbulReporter: {
+  reports: [ 'html', 'lcovonly' ],
+  fixWebpackSourcePaths: true
+},
+```
+
+Remove the config entry from `angularCli`:
+```
+angularCli: {
+  environment: 'dev'
+},
+```
+
+Update the reporters to use `coverage-istanbul` instead of `karma-remap-istanbul`, and
+add `kjhtml` (short for karma-jasmine-html-reporter):
+```
+reporters: config.angularCli && config.angularCli.codeCoverage
+          ? ['progress', 'coverage-istanbul']
+          : ['progress', 'kjhtml'],
+```
+
+## protractor.conf.js
+
+Protractor was updated to the new 5.x major version, but you shouldn't need to change much
+to take advantage of all its new features.
+
+Replace the spec reporter import from:
+```
+var SpecReporter = require('jasmine-spec-reporter');
+```
+to
+```
+const { SpecReporter } = require('jasmine-spec-reporter');
+```
+
+Remove `useAllAngular2AppRoots: true`.
+
+Update `beforeLaunch` as described in [One tsconfig per app](#one-tsconfig-per-app):
+```
+beforeLaunch: function() {
+  require('ts-node').register({
+    project: 'e2e/tsconfig.e2e.json'
+  });
+},
+```
+
+Update `onPrepare`:
+```
+onPrepare: function() {
+  jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
+}
+```
+
+## Linting rules
+
+The updated versions of `tslint` and `codelyzer` contain a few rule changes that you should
+apply to your `tslint.json`:
+
+Add these new rules:
+```
+"callable-types": true,
+"import-blacklist": [true, "rxjs"],
+"import-spacing": true,
+"interface-over-type-literal": true,
+"no-empty-interface": true,
+"no-string-throw": true,
+"prefer-const": true,
+"typeof-compare": true,
+"unified-signatures": true,
+```
+
+Update `no-inferrable-types` to `"no-inferrable-types": [true, "ignore-params"]`.
diff --git a/docs/documentation/stories/application-environments.md b/docs/documentation/stories/application-environments.md
index 635bc2d39fe6..ac65f31c0c46 100644
--- a/docs/documentation/stories/application-environments.md
+++ b/docs/documentation/stories/application-environments.md
@@ -1,3 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/build#configuring-application-environments)**.
+
 # Application Environments
 
 In Angular CLI you can configure the build system to replace existing files for your intended
diff --git a/docs/documentation/stories/budgets.md b/docs/documentation/stories/budgets.md
index f6eea0f0311a..2f7f049e6f25 100644
--- a/docs/documentation/stories/budgets.md
+++ b/docs/documentation/stories/budgets.md
@@ -1,3 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/build#configure-size-budgets)**.
+
 # Budgets
 
 As applications grow in functionality, they also grow in size. Budgets is a feature in the
diff --git a/docs/documentation/stories/code-coverage.md b/docs/documentation/stories/code-coverage.md
index 15f67bb317da..934adc3853d6 100644
--- a/docs/documentation/stories/code-coverage.md
+++ b/docs/documentation/stories/code-coverage.md
@@ -1,3 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/testing#enable-code-coverage-reports)**.
+
 # Code Coverage
 
 With the Angular CLI we can run unit tests as well as create code coverage reports. Code coverage reports allow us to see any parts of our code base that may not be properly tested by our unit tests.
diff --git a/docs/documentation/stories/continuous-integration.md b/docs/documentation/stories/continuous-integration.md
index 269bab08997c..11820cf9b3ca 100644
--- a/docs/documentation/stories/continuous-integration.md
+++ b/docs/documentation/stories/continuous-integration.md
@@ -1,3 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/testing#set-up-continuous-integration)**.
+
 # Continuous Integration
 
 One of the best ways to keep your project bug free is through a test suite, but it's easy to forget
diff --git a/docs/documentation/stories/github-pages.md b/docs/documentation/stories/github-pages.md
index 658c8340a863..89f2795131bc 100644
--- a/docs/documentation/stories/github-pages.md
+++ b/docs/documentation/stories/github-pages.md
@@ -1,3 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/deployment#deploy-to-github-pages)**.
+
 # Deploy to GitHub Pages
 
 A simple way to deploy your Angular app is to use
diff --git a/docs/documentation/stories/internationalization.md b/docs/documentation/stories/internationalization.md
index 2acd551752ba..20210930a696 100644
--- a/docs/documentation/stories/internationalization.md
+++ b/docs/documentation/stories/internationalization.md
@@ -1,3 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/i18n)**.
+
 # Internationalization (i18n)
 
 If you are working on internationalization, the CLI can help you with the following steps:
diff --git a/docs/documentation/stories/proxy.md b/docs/documentation/stories/proxy.md
index 17b301f17c30..ceedd3c0ac69 100644
--- a/docs/documentation/stories/proxy.md
+++ b/docs/documentation/stories/proxy.md
@@ -1,3 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/build#using-corporate-proxy)**.
+
 # Proxy To Backend
 
 Using the [proxying support](https://webpack.js.org/configuration/dev-server/#devserver-proxy) in webpack's dev server we can highjack certain URLs and send them to a backend server.
diff --git a/docs/documentation/stories/routing.md b/docs/documentation/stories/routing.md
index 504a62e6f07e..4e73e7059c83 100644
--- a/docs/documentation/stories/routing.md
+++ b/docs/documentation/stories/routing.md
@@ -1,3 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/router#integrate-routing-with-your-app)**.
+
 # Generating a route
 
 The CLI supports routing in several ways:
diff --git a/docs/documentation/stories/universal-rendering.md b/docs/documentation/stories/universal-rendering.md
index cb007b6eb712..7c56041a547f 100644
--- a/docs/documentation/stories/universal-rendering.md
+++ b/docs/documentation/stories/universal-rendering.md
@@ -1,3 +1,5 @@
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/universal)**.
+
 # Angular Universal Integration
 
 The Angular CLI supports generation of a Universal build for your application. This is a CommonJS-formatted bundle which can be `require()`'d into a Node application (for example, an Express server) and used with `@angular/platform-server`'s APIs to prerender your application.
diff --git a/docs/documentation/test.md b/docs/documentation/test.md
index ea5c128225ea..dacb212dbbdc 100644
--- a/docs/documentation/test.md
+++ b/docs/documentation/test.md
@@ -1,4 +1,6 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/test)**.
+
 
 # ng test
 
diff --git a/docs/documentation/update.md b/docs/documentation/update.md
index 7d2cebe984fb..2d9373dcfca9 100644
--- a/docs/documentation/update.md
+++ b/docs/documentation/update.md
@@ -1,4 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/update)**.
 
 # ng update
 
diff --git a/docs/documentation/version.md b/docs/documentation/version.md
index c6418d66cff5..55240da18e7b 100644
--- a/docs/documentation/version.md
+++ b/docs/documentation/version.md
@@ -1,4 +1,5 @@
 <!-- Links in /docs/documentation should NOT have \`.md\` at the end, because they end up in our wiki at release. -->
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/version)**.
 
 # ng version
 
diff --git a/docs/documentation/xi18n.md b/docs/documentation/xi18n.md
index 835873787bef..8f7716a95a45 100644
--- a/docs/documentation/xi18n.md
+++ b/docs/documentation/xi18n.md
@@ -1,4 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
+**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/xi18n)**.
 
 # ng xi18n
 

From 231b62e42f3083cf9287ce630ae27b36e839da0c Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 15 Oct 2018 12:42:14 +0100
Subject: [PATCH 0329/1703] fix(@ngtools/webpack): only invalidate related
 virtual files

---
 packages/ngtools/webpack/src/compiler_host.ts | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/packages/ngtools/webpack/src/compiler_host.ts b/packages/ngtools/webpack/src/compiler_host.ts
index aa2e8e5003f8..21bd63dcf725 100644
--- a/packages/ngtools/webpack/src/compiler_host.ts
+++ b/packages/ngtools/webpack/src/compiler_host.ts
@@ -33,6 +33,13 @@ export class WebpackCompilerHost implements ts.CompilerHost {
   private _basePath: Path;
   private _resourceLoader?: WebpackResourceLoader;
   private _sourceFileCache = new Map<string, ts.SourceFile>();
+  private _virtualFileExtensions = [
+    '.js', '.js.map',
+    '.ngfactory.js', '.ngfactory.js.map',
+    '.ngstyle.js', '.ngstyle.js.map',
+    '.ngsummary.json',
+  ];
+
 
   constructor(
     private _options: ts.CompilerOptions,
@@ -79,11 +86,6 @@ export class WebpackCompilerHost implements ts.CompilerHost {
 
   invalidate(fileName: string): void {
     const fullPath = this.resolve(fileName);
-
-    if (this._memoryHost.exists(fullPath)) {
-      this._memoryHost.delete(fullPath);
-    }
-
     this._sourceFileCache.delete(fullPath);
 
     try {
@@ -91,7 +93,17 @@ export class WebpackCompilerHost implements ts.CompilerHost {
       if (exists) {
         this._changedFiles.add(fullPath);
       }
-    } catch { }
+    } catch {
+      // File doesn't exist anymore, so we should delete the related virtual files.
+      if (fullPath.endsWith('.ts')) {
+        this._virtualFileExtensions.forEach(ext => {
+          const virtualFile = fullPath.replace(/\.ts$/, ext) as Path;
+          if (this._memoryHost.exists(virtualFile)) {
+            this._memoryHost.delete(virtualFile);
+          }
+        });
+      }
+    }
   }
 
   fileExists(fileName: string, delegate = true): boolean {

From a6ffa2b9ab8ca7361b03e8bae52af798c5cbf839 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 15 Oct 2018 12:42:42 +0100
Subject: [PATCH 0330/1703] fix(@angular-devkit/build-angular): update
 copy-webpack-plugin

---
 .../angular_devkit/build_angular/package.json |  2 +-
 packages/ngtools/webpack/src/compiler_host.ts | 26 +++++++++++--------
 yarn.lock                                     |  8 +++---
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 5757aeeaf178..bc11fc4c95f3 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -15,7 +15,7 @@
     "autoprefixer": "8.4.1",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
-    "copy-webpack-plugin": "4.5.2",
+    "copy-webpack-plugin": "4.5.3",
     "file-loader": "2.0.0",
     "glob": "7.1.3",
     "istanbul": "0.4.5",
diff --git a/packages/ngtools/webpack/src/compiler_host.ts b/packages/ngtools/webpack/src/compiler_host.ts
index 21bd63dcf725..19170f2c414f 100644
--- a/packages/ngtools/webpack/src/compiler_host.ts
+++ b/packages/ngtools/webpack/src/compiler_host.ts
@@ -88,21 +88,25 @@ export class WebpackCompilerHost implements ts.CompilerHost {
     const fullPath = this.resolve(fileName);
     this._sourceFileCache.delete(fullPath);
 
+    let exists = false;
     try {
-      const exists = this._syncHost.isFile(fullPath);
+      exists = this._syncHost.isFile(fullPath);
       if (exists) {
         this._changedFiles.add(fullPath);
       }
-    } catch {
-      // File doesn't exist anymore, so we should delete the related virtual files.
-      if (fullPath.endsWith('.ts')) {
-        this._virtualFileExtensions.forEach(ext => {
-          const virtualFile = fullPath.replace(/\.ts$/, ext) as Path;
-          if (this._memoryHost.exists(virtualFile)) {
-            this._memoryHost.delete(virtualFile);
-          }
-        });
-      }
+    } catch { }
+
+    // File doesn't exist anymore and is not a factory, so we should delete the related
+    // virtual files.
+    if (!exists && fullPath.endsWith('.ts') && !(
+      fullPath.endsWith('.ngfactory.ts') || fullPath.endsWith('.shim.ngstyle.ts')
+    )) {
+      this._virtualFileExtensions.forEach(ext => {
+        const virtualFile = (fullPath.slice(0, -3) + ext) as Path;
+        if (this._memoryHost.exists(virtualFile)) {
+          this._memoryHost.delete(virtualFile);
+        }
+      });
     }
   }
 
diff --git a/yarn.lock b/yarn.lock
index 7468d7a0e158..1a7efd7db68e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2285,10 +2285,10 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-webpack-plugin@4.5.2:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.2.tgz#d53444a8fea2912d806e78937390ddd7e632ee5c"
-  integrity sha512-zmC33E8FFSq3AbflTvqvPvBo621H36Afsxlui91d+QyZxPIuXghfnTsa1CuqiAaCPgJoSUWfTFbKJnadZpKEbQ==
+copy-webpack-plugin@4.5.3:
+  version "4.5.3"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.3.tgz#14a224d205e46f7a79f7956028e1da6df2225ff2"
+  integrity sha512-VKCiNXQcc8zyznaepXfKpCH2cZD+/j3T3B+gsFY97P7qMlEsj34wr/sI9OCG7QPUUh7gAHVx3q8Q1rdQIDM4bA==
   dependencies:
     cacache "^10.0.4"
     find-cache-dir "^1.0.0"

From 8bbba9d0acb825ae59ada5de5116c6c05b34b7a2 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 19 Oct 2018 12:04:48 +0200
Subject: [PATCH 0331/1703] fix(@schematics/angular): update `@angular`
 peerDependencies for new libraries

---
 .../angular/library/files/__projectRoot__/package.json     | 4 ++--
 packages/schematics/angular/library/index.ts               | 1 +
 packages/schematics/angular/library/index_spec.ts          | 7 +++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/library/files/__projectRoot__/package.json b/packages/schematics/angular/library/files/__projectRoot__/package.json
index f72ab5bfbc0d..8d8b5ad6aace 100644
--- a/packages/schematics/angular/library/files/__projectRoot__/package.json
+++ b/packages/schematics/angular/library/files/__projectRoot__/package.json
@@ -2,7 +2,7 @@
   "name": "<%= dasherize(packageName) %>",
   "version": "0.0.1",
   "peerDependencies": {
-    "@angular/common": "^6.0.0-rc.0 || ^6.0.0",
-    "@angular/core": "^6.0.0-rc.0 || ^6.0.0"
+    "@angular/common": "^<%= angularLatestVersion %>",
+    "@angular/core": "^<%= angularLatestVersion %>"
   }
 }
\ No newline at end of file
diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index 47a8042ef80d..039f382ad18f 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -211,6 +211,7 @@ export default function (options: LibraryOptions): Rule {
         distRoot,
         relativePathToWorkspaceRoot,
         prefix,
+        angularLatestVersion: latestVersions.Angular.replace('~', '').replace('^', ''),
       }),
       // TODO: Moving inside `branchAndMerge` should work but is bugged right now.
       // The __projectRoot__ is being used meanwhile.
diff --git a/packages/schematics/angular/library/index_spec.ts b/packages/schematics/angular/library/index_spec.ts
index 2628fc41b747..4ad5c4fe9a95 100644
--- a/packages/schematics/angular/library/index_spec.ts
+++ b/packages/schematics/angular/library/index_spec.ts
@@ -63,6 +63,13 @@ describe('Library Schematic', () => {
     expect(fileContent).toMatch(/"name": "foo"/);
   });
 
+  it('should have the latest Angular major versions in package.json named "foo"', () => {
+    const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
+    const fileContent = getJsonFileContent(tree, '/projects/foo/package.json');
+    const angularVersion = latestVersions.Angular.replace('~', '').replace('^', '');
+    expect(fileContent.peerDependencies['@angular/core']).toBe(`^${angularVersion}`);
+  });
+
   it('should create a tsconfig for library', () => {
     const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
     const fileContent = getJsonFileContent(tree, '/projects/foo/tsconfig.lib.json');

From edb84b340ff996df2ca6a2aaf765304cc64fef3e Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 23 Oct 2018 19:15:35 +0200
Subject: [PATCH 0332/1703] fix(@ngtools/webpack): emit lazy routes errors on
 rebuilds (#12418)

* fix(@ngtools/webpack): emit lazy routes errors on rebuilds

At the moment lazy route errors are only emitted in the initial builds because in following builds we are only processed lazy routes that are declared in the changed files.

At the moment, we cannot cache the previously resolved routes as there is no way to track in which file the lazy route was declared so that we can bust the lazy route if it was removed.

Closes #12236

* test: add test for compilation errors in watch mode

Closes #12311
---
 .../test/browser/lazy-module_spec_large.ts    |  49 ++++++++-
 .../test/browser/rebuild_spec_large.ts        |  27 +++++
 .../webpack/src/angular_compiler_plugin.ts    |  35 ++----
 packages/ngtools/webpack/src/lazy_routes.ts   | 100 ------------------
 .../transformers/export_lazy_module_map.ts    |   5 +-
 5 files changed, 85 insertions(+), 131 deletions(-)
 delete mode 100644 packages/ngtools/webpack/src/lazy_routes.ts

diff --git a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
index c334fd998178..c6dbf303f186 100644
--- a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { DefaultTimeout, runTargetSpec } from '@angular-devkit/architect/testing';
+import { DefaultTimeout, TestLogger, runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, normalize } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
+import { take, tap } from 'rxjs/operators';
 import { BrowserBuilderSchema } from '../../src';
 import { browserTargetSpec, host } from '../utils';
 
@@ -70,6 +70,7 @@ export const lazyModuleImport: { [path: string]: string } = {
   `,
 };
 
+// tslint:disable-next-line:no-big-function
 describe('Browser Builder lazy modules', () => {
 
   const outputPath = normalize('dist');
@@ -89,6 +90,50 @@ describe('Browser Builder lazy modules', () => {
     ).toPromise().then(done, done.fail);
   });
 
+  it('should show error when lazy route is invalid on watch mode AOT', (done) => {
+    host.writeMultipleFiles(lazyModuleFiles);
+    host.writeMultipleFiles(lazyModuleImport);
+    host.replaceInFile(
+      'src/app/app.module.ts',
+      'lazy.module#LazyModule',
+      'invalid.module#LazyModule',
+    );
+
+    const logger = new TestLogger('rebuild-lazy-errors');
+    const overrides = { watch: true, aot: true };
+    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout, logger).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(false)),
+      tap(() => {
+        expect(logger.includes('Could not resolve module')).toBe(true);
+        logger.clear();
+        host.appendToFile('src/main.ts', ' ');
+      }),
+      take(2),
+    ).toPromise().then(done, done.fail);
+  });
+
+  it('should show error when lazy route is invalid on watch mode JIT', (done) => {
+    host.writeMultipleFiles(lazyModuleFiles);
+    host.writeMultipleFiles(lazyModuleImport);
+    host.replaceInFile(
+      'src/app/app.module.ts',
+      'lazy.module#LazyModule',
+      'invalid.module#LazyModule',
+    );
+
+    const logger = new TestLogger('rebuild-lazy-errors');
+    const overrides = { watch: true, aot: false };
+    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout, logger).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(false)),
+      tap(() => {
+        expect(logger.includes('Could not resolve module')).toBe(true);
+        logger.clear();
+        host.appendToFile('src/main.ts', ' ');
+      }),
+      take(2),
+    ).toPromise().then(done, done.fail);
+  });
+
   it('supports lazy bundle for lazy routes with AOT', (done) => {
     host.writeMultipleFiles(lazyModuleFiles);
     host.writeMultipleFiles(lazyModuleImport);
diff --git a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
index 6ee1df2fdd76..9d9523965cda 100644
--- a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
@@ -198,6 +198,33 @@ describe('Browser Builder rebuilds', () => {
     ).toPromise().then(done, done.fail);
   });
 
+  it('rebuilds shows error', (done) => {
+    host.replaceInFile('./src/app/app.component.ts', 'AppComponent', 'AppComponentZ');
+
+    const overrides = { watch: true, aot: false };
+    let buildCount = 1;
+    const logger = new TestLogger('rebuild-errors');
+
+    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 3, logger).pipe(
+      tap((buildEvent) => {
+        switch (buildCount) {
+          case 1:
+            expect(buildEvent.success).toBe(false);
+            expect(logger.includes('AppComponent cannot be used as an entry component')).toBe(true);
+            logger.clear();
+
+            host.replaceInFile('./src/app/app.component.ts', 'AppComponentZ', 'AppComponent');
+            break;
+
+          default:
+            expect(buildEvent.success).toBe(true);
+            break;
+        }
+        buildCount ++;
+      }),
+      take(2),
+    ).toPromise().then(done, done.fail);
+  });
 
   it('rebuilds after errors in AOT', (done) => {
     // Save the original contents of `./src/app/app.component.ts`.
diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 472603db1043..064601a8d85f 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -40,10 +40,10 @@ import { time, timeEnd } from './benchmark';
 import { WebpackCompilerHost, workaroundResolve } from './compiler_host';
 import { resolveEntryModuleFromMain } from './entry_resolver';
 import { gatherDiagnostics, hasErrors } from './gather_diagnostics';
-import { LazyRouteMap, findLazyRoutes } from './lazy_routes';
 import { TypeScriptPathsPlugin } from './paths-plugin';
 import { WebpackResourceLoader } from './resource_loader';
 import {
+  LazyRouteMap,
   exportLazyModuleMap,
   exportNgFactory,
   findResources,
@@ -418,22 +418,6 @@ export class AngularCompilerPlugin {
     }
   }
 
-  private _findLazyRoutesInAst(changedFilePaths: string[]): LazyRouteMap {
-    time('AngularCompilerPlugin._findLazyRoutesInAst');
-    const result: LazyRouteMap = Object.create(null);
-    for (const filePath of changedFilePaths) {
-      const fileLazyRoutes = findLazyRoutes(filePath, this._compilerHost, undefined,
-        this._compilerOptions);
-      for (const routeKey of Object.keys(fileLazyRoutes)) {
-        const route = fileLazyRoutes[routeKey];
-        result[routeKey] = route;
-      }
-    }
-    timeEnd('AngularCompilerPlugin._findLazyRoutesInAst');
-
-    return result;
-  }
-
   private _listLazyRoutesFromProgram(): LazyRouteMap {
     let lazyRoutes: LazyRoute[];
     if (this._JitMode) {
@@ -876,17 +860,12 @@ export class AngularCompilerPlugin {
     // We need to run the `listLazyRoutes` the first time because it also navigates libraries
     // and other things that we might miss using the (faster) findLazyRoutesInAst.
     // Lazy routes modules will be read with compilerHost and added to the changed files.
-    if (this._firstRun || !this._JitMode) {
-      this._processLazyRoutes(this._listLazyRoutesFromProgram());
-    } else {
-      const changedTsFiles = this._getChangedTsFiles();
-      if (changedTsFiles.length > 0) {
-        this._processLazyRoutes(this._findLazyRoutesInAst(changedTsFiles));
-      }
-    }
-    if (this._options.additionalLazyModules) {
-      this._processLazyRoutes(this._options.additionalLazyModules);
-    }
+    const lazyRouteMap: LazyRouteMap = {
+      ... (this._entryModule || !this._JitMode ? this._listLazyRoutesFromProgram() : {}),
+      ...this._options.additionalLazyModules,
+    };
+
+    this._processLazyRoutes(lazyRouteMap);
 
     // Emit and report errors.
 
diff --git a/packages/ngtools/webpack/src/lazy_routes.ts b/packages/ngtools/webpack/src/lazy_routes.ts
deleted file mode 100644
index dc32ebcea8c5..000000000000
--- a/packages/ngtools/webpack/src/lazy_routes.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { dirname, join } from 'path';
-import * as ts from 'typescript';
-import { findAstNodes, resolve } from './refactor';
-
-
-function _getContentOfKeyLiteral(_source: ts.SourceFile, node: ts.Node): string | null {
-  if (node.kind == ts.SyntaxKind.Identifier) {
-    return (node as ts.Identifier).text;
-  } else if (node.kind == ts.SyntaxKind.StringLiteral) {
-    return (node as ts.StringLiteral).text;
-  } else {
-    return null;
-  }
-}
-
-
-export interface LazyRouteMap {
-  [path: string]: string;
-}
-
-
-export function findLazyRoutes(
-  filePath: string,
-  host: ts.CompilerHost,
-  program?: ts.Program,
-  compilerOptions?: ts.CompilerOptions,
-): LazyRouteMap {
-  if (!compilerOptions) {
-    if (!program) {
-      throw new Error('Must pass either program or compilerOptions to findLazyRoutes.');
-    }
-    compilerOptions = program.getCompilerOptions();
-  }
-  const fileName = resolve(filePath, host, compilerOptions).replace(/\\/g, '/');
-  let sourceFile: ts.SourceFile | undefined;
-  if (program) {
-    sourceFile = program.getSourceFile(fileName);
-  }
-
-  if (!sourceFile) {
-    const content = host.readFile(fileName);
-    if (content) {
-      sourceFile = ts.createSourceFile(fileName, content, ts.ScriptTarget.Latest, true);
-    }
-  }
-
-  if (!sourceFile) {
-    throw new Error(`Source file not found: '${fileName}'.`);
-  }
-  const sf: ts.SourceFile = sourceFile;
-
-  return findAstNodes(null, sourceFile, ts.SyntaxKind.ObjectLiteralExpression, true)
-    // Get all their property assignments.
-    .map((node: ts.ObjectLiteralExpression) => {
-      return findAstNodes(node, sf, ts.SyntaxKind.PropertyAssignment, false);
-    })
-    // Take all `loadChildren` elements.
-    .reduce((acc: ts.PropertyAssignment[], props: ts.PropertyAssignment[]) => {
-      return acc.concat(props.filter(literal => {
-        return _getContentOfKeyLiteral(sf, literal.name) == 'loadChildren';
-      }));
-    }, [])
-    // Get only string values.
-    .filter((node: ts.PropertyAssignment) => node.initializer.kind == ts.SyntaxKind.StringLiteral)
-    // Get the string value.
-    .map((node: ts.PropertyAssignment) => (node.initializer as ts.StringLiteral).text)
-    // Map those to either [path, absoluteModulePath], or [path, null] if the module pointing to
-    // does not exist.
-    .map((routePath: string) => {
-      const moduleName = routePath.split('#')[0];
-      const compOptions = (program && program.getCompilerOptions()) || compilerOptions || {};
-      const resolvedModuleName: ts.ResolvedModuleWithFailedLookupLocations = moduleName[0] == '.'
-        ? ({
-            resolvedModule: { resolvedFileName: join(dirname(filePath), moduleName) + '.ts' },
-          } as ts.ResolvedModuleWithFailedLookupLocations)
-        : ts.resolveModuleName(moduleName, filePath, compOptions, host);
-      if (resolvedModuleName.resolvedModule
-          && resolvedModuleName.resolvedModule.resolvedFileName
-          && host.fileExists(resolvedModuleName.resolvedModule.resolvedFileName)) {
-        return [routePath, resolvedModuleName.resolvedModule.resolvedFileName];
-      } else {
-        return [routePath, null];
-      }
-    })
-    // Reduce to the LazyRouteMap map.
-    .reduce((acc: LazyRouteMap, [routePath, resolvedModuleName]: [string, string | null]) => {
-      if (resolvedModuleName) {
-        acc[routePath] = resolvedModuleName;
-      }
-
-      return acc;
-    }, {});
-}
diff --git a/packages/ngtools/webpack/src/transformers/export_lazy_module_map.ts b/packages/ngtools/webpack/src/transformers/export_lazy_module_map.ts
index 9cfc9be42db7..02b02058e66e 100644
--- a/packages/ngtools/webpack/src/transformers/export_lazy_module_map.ts
+++ b/packages/ngtools/webpack/src/transformers/export_lazy_module_map.ts
@@ -7,11 +7,14 @@
  */
 import * as path from 'path';
 import * as ts from 'typescript';
-import { LazyRouteMap } from '../lazy_routes';
 import { getFirstNode, getLastNode } from './ast_helpers';
 import { AddNodeOperation, StandardTransform, TransformOperation } from './interfaces';
 import { makeTransform } from './make_transform';
 
+export interface LazyRouteMap {
+  [path: string]: string;
+}
+
 export function exportLazyModuleMap(
   shouldTransform: (fileName: string) => boolean,
   lazyRoutesCb: () => LazyRouteMap,

From 7f0a7ce5df9780eb658ded0e05d4175740cbe91f Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 3 Oct 2018 07:49:04 +0200
Subject: [PATCH 0333/1703] feat(@angular-devkit/build-angular): expose
 `buildWebpackConfig` method in `KarmaBuilder`

Closes #12447
---
 packages/angular_devkit/build_angular/src/karma/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index 19f63f7d8498..3479edf21f68 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -88,7 +88,7 @@ export class KarmaBuilder implements Builder<KarmaBuilderSchema> {
           root: getSystemPath(root),
           projectRoot: getSystemPath(projectRoot),
           options: options as NormalizedKarmaBuilderSchema,
-          webpackConfig: this._buildWebpackConfig(root, projectRoot, sourceRoot, host,
+          webpackConfig: this.buildWebpackConfig(root, projectRoot, sourceRoot, host,
             options as NormalizedKarmaBuilderSchema),
           // Pass onto Karma to emit BuildEvents.
           successCb: () => obs.next({ success: true }),
@@ -122,7 +122,7 @@ export class KarmaBuilder implements Builder<KarmaBuilderSchema> {
     );
   }
 
-  private _buildWebpackConfig(
+  buildWebpackConfig(
     root: Path,
     projectRoot: Path,
     sourceRoot: Path | undefined,

From 4cca3a10e8e9577294d963ed3b81a552e58b6217 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 10 Oct 2018 10:13:20 +0200
Subject: [PATCH 0334/1703] feat(@schematics/angular): add `text-summary` to
 code coverage reporters

Fixes #3602
---
 .../schematics/angular/application/files/root/karma.conf.js     | 2 +-
 tests/legacy-cli/e2e/tests/misc/coverage.ts                     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/angular/application/files/root/karma.conf.js b/packages/schematics/angular/application/files/root/karma.conf.js
index 8fef64c0f8f2..fe5a99719022 100644
--- a/packages/schematics/angular/application/files/root/karma.conf.js
+++ b/packages/schematics/angular/application/files/root/karma.conf.js
@@ -17,7 +17,7 @@ module.exports = function (config) {
     },
     coverageIstanbulReporter: {
       dir: require('path').join(__dirname, '<%= relativePathToWorkspaceRoot %>/coverage'),
-      reports: ['html', 'lcovonly'],
+      reports: ['html', 'lcovonly', 'text-summary'],
       fixWebpackSourcePaths: true
     },
     reporters: ['progress', 'kjhtml'],
diff --git a/tests/legacy-cli/e2e/tests/misc/coverage.ts b/tests/legacy-cli/e2e/tests/misc/coverage.ts
index 3170532da7d1..af42921fbf76 100644
--- a/tests/legacy-cli/e2e/tests/misc/coverage.ts
+++ b/tests/legacy-cli/e2e/tests/misc/coverage.ts
@@ -10,6 +10,7 @@ export default function () {
   return;
 
   return ng('test', '--watch=false', '--code-coverage')
+    .then(output => expect(output.stdout).toContain('Coverage summary'))
     .then(() => expectFileToExist('coverage/src/app'))
     .then(() => expectFileToExist('coverage/lcov.info'))
     // Verify code coverage exclude work

From 6ca9efffe6e3b47fabe40837e1548873d6abfdd6 Mon Sep 17 00:00:00 2001
From: Caleb Martinez <contact@calebmartinez.com>
Date: Thu, 11 Oct 2018 16:31:15 -0400
Subject: [PATCH 0335/1703] feat(@schematics/update): import user-agent from
 NPM config

Configuration of the user-agent header in requests is a commonly available feature; previous versions of angular-cli do not pull this value from NPM.
---
 packages/schematics/update/update/npm.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/schematics/update/update/npm.ts b/packages/schematics/update/update/npm.ts
index 04fde9d218e4..a6b193f9c08a 100644
--- a/packages/schematics/update/update/npm.ts
+++ b/packages/schematics/update/update/npm.ts
@@ -195,6 +195,7 @@ export function getNpmPackageJson(
         getNpmConfigOption('strict-ssl'),
         getNpmConfigOption('cafile'),
         getNpmConfigOption('_auth'),
+        getNpmConfigOption('user-agent'),
         getNpmConfigOption('_authToken', registryKey),
         getNpmConfigOption('username', registryKey, true),
         getNpmConfigOption('password', registryKey, true),
@@ -209,6 +210,7 @@ export function getNpmPackageJson(
             strictSsl,
             cafile,
             token,
+            userAgent,
             authToken,
             username,
             password,
@@ -264,6 +266,7 @@ export function getNpmPackageJson(
           const client = new RegistryClient({
             proxy: { http, https },
             ssl: sslOptions,
+            ...(userAgent && {userAgent: userAgent}),
           });
           client.log.level = 'silent';
           const params = {

From 0b4e91bb975ab7a0ccdff34a867fdc20f6fc4a01 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 15 Oct 2018 20:10:56 +0200
Subject: [PATCH 0336/1703] feat(@schematics/angular): enable typescript
 helpers in workspace

---
 packages/schematics/angular/library/index.ts  |  2 +-
 .../migrations/migration-collection.json      |  5 ++
 .../angular/migrations/update-7/index.ts      |  1 +
 .../migrations/update-7/typescript-helpers.ts | 79 +++++++++++++++++++
 .../update-7/typescript-helpers_spec.ts       | 70 ++++++++++++++++
 .../angular/utility/latest-versions.ts        |  1 +
 .../angular/workspace/files/package.json      |  1 +
 .../angular/workspace/files/tsconfig.json     |  1 +
 8 files changed, 159 insertions(+), 1 deletion(-)
 create mode 100644 packages/schematics/angular/migrations/update-7/typescript-helpers.ts
 create mode 100644 packages/schematics/angular/migrations/update-7/typescript-helpers_spec.ts

diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index 039f382ad18f..07b296125b84 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -117,7 +117,7 @@ function addDependenciesToPackageJson() {
       {
         type: NodeDependencyType.Dev,
         name: 'tslib',
-        version: '^1.9.0',
+        version: latestVersions.TsLib,
       },
       {
         type: NodeDependencyType.Dev,
diff --git a/packages/schematics/angular/migrations/migration-collection.json b/packages/schematics/angular/migrations/migration-collection.json
index fab2b498dcc3..b6836ed7aacd 100644
--- a/packages/schematics/angular/migrations/migration-collection.json
+++ b/packages/schematics/angular/migrations/migration-collection.json
@@ -14,6 +14,11 @@
       "version": "7.0.0-rc.0",
       "factory": "./update-7/index#polyfillMetadataRule",
       "description": "Update an Angular CLI project to version 7."
+    },
+    "migration-04": {
+      "version": "7.1.0-beta.0",
+      "factory": "./update-7/index#typeScriptHelpersRule",
+      "description": "Update an Angular CLI project to version 7."
     }
   }
 }
diff --git a/packages/schematics/angular/migrations/update-7/index.ts b/packages/schematics/angular/migrations/update-7/index.ts
index 75757e75ec59..283fa59ad7cd 100644
--- a/packages/schematics/angular/migrations/update-7/index.ts
+++ b/packages/schematics/angular/migrations/update-7/index.ts
@@ -15,6 +15,7 @@ import {
 import { latestVersions } from '../../utility/latest-versions';
 
 export { polyfillMetadataRule } from './polyfill-metadata';
+export { typeScriptHelpersRule } from './typescript-helpers';
 
 export default function(): Rule {
   return (tree, context) => {
diff --git a/packages/schematics/angular/migrations/update-7/typescript-helpers.ts b/packages/schematics/angular/migrations/update-7/typescript-helpers.ts
new file mode 100644
index 000000000000..4d6064dcddea
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-7/typescript-helpers.ts
@@ -0,0 +1,79 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { JsonParseMode, parseJsonAst } from '@angular-devkit/core';
+import { Rule, Tree, chain } from '@angular-devkit/schematics';
+import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
+import {
+  NodeDependencyType,
+  addPackageJsonDependency,
+  getPackageJsonDependency,
+} from '../../utility/dependencies';
+import {
+  findPropertyInAstObject,
+  insertPropertyInAstObjectInOrder,
+} from '../../utility/json-utils';
+import { latestVersions } from '../../utility/latest-versions';
+
+export function typeScriptHelpersRule(): Rule {
+  return chain([
+    _updateTsConfig(),
+    (tree, context) => {
+      const existing = getPackageJsonDependency(tree, 'tslib');
+      const type = existing ? existing.type : NodeDependencyType.Default;
+
+      addPackageJsonDependency(
+        tree,
+        {
+          type,
+          name: 'tslib',
+          version: latestVersions.TsLib,
+          overwrite: true,
+        },
+      );
+
+      context.addTask(new NodePackageInstallTask());
+    },
+  ]);
+}
+
+function _updateTsConfig(): Rule {
+  return (host: Tree) => {
+    const tsConfigPath = '/tsconfig.json';
+    const buffer = host.read(tsConfigPath);
+    if (!buffer) {
+      return host;
+    }
+
+    const tsCfgAst = parseJsonAst(buffer.toString(), JsonParseMode.Loose);
+    if (tsCfgAst.kind !== 'object') {
+      return host;
+    }
+
+    const compilerOptions = findPropertyInAstObject(tsCfgAst, 'compilerOptions');
+    if (!compilerOptions || compilerOptions.kind !== 'object') {
+      return host;
+    }
+
+    const importHelpers = findPropertyInAstObject(compilerOptions, 'importHelpers');
+    if (importHelpers && importHelpers.value === true) {
+      return host;
+    }
+
+    const recorder = host.beginUpdate(tsConfigPath);
+    if (importHelpers) {
+      const { start, end } = importHelpers;
+      recorder.remove(start.offset, end.offset - start.offset);
+      recorder.insertLeft(start.offset, 'true');
+    } else {
+      insertPropertyInAstObjectInOrder(recorder, compilerOptions, 'importHelpers', true, 4);
+    }
+    host.commitUpdate(recorder);
+
+    return host;
+  };
+}
diff --git a/packages/schematics/angular/migrations/update-7/typescript-helpers_spec.ts b/packages/schematics/angular/migrations/update-7/typescript-helpers_spec.ts
new file mode 100644
index 000000000000..136fa29c4628
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-7/typescript-helpers_spec.ts
@@ -0,0 +1,70 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { EmptyTree } from '@angular-devkit/schematics';
+import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+
+const oldTsConfig = `
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
+    "declaration": false,
+    "module": "es2015",
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "importHelpers": false,
+    "target": "es5",
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+    "lib": [
+      "es2018",
+      "dom"
+    ]
+  }
+}
+`;
+
+describe('typeScriptHelpersRule', () => {
+  const schematicRunner = new SchematicTestRunner(
+    'migrations',
+    require.resolve('../migration-collection.json'),
+  );
+
+  let tree: UnitTestTree;
+
+  beforeEach(async () => {
+    tree = new UnitTestTree(new EmptyTree());
+    tree = await schematicRunner.runExternalSchematicAsync(
+      require.resolve('../../collection.json'), 'ng-new',
+      {
+        name: 'migration-test',
+        version: '1.2.3',
+        directory: '.',
+      },
+      tree,
+    ).toPromise();
+  });
+
+  it('should work as expected', async () => {
+    const tsConfigPath = '/tsconfig.json';
+    tree.overwrite(tsConfigPath, oldTsConfig);
+    const tree2 = await schematicRunner.runSchematicAsync('migration-04', {}, tree.branch())
+      .toPromise();
+
+    const { importHelpers } = JSON.parse(tree2.readContent(tsConfigPath)).compilerOptions;
+    expect(importHelpers).toBe(true);
+
+    const content = tree2.readContent('/package.json');
+    const pkg = JSON.parse(content);
+    expect(pkg.dependencies.tslib).toBeDefined();
+  });
+});
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index a636b852a185..980ce94ab33f 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -12,6 +12,7 @@ export const latestVersions = {
   RxJs: '~6.3.3',
   ZoneJs: '~0.8.26',
   TypeScript: '~3.1.1',
+  TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
   DevkitBuildAngular: '~0.9.0-rc.1',
   DevkitBuildNgPackagr: '~0.9.0-rc.1',
diff --git a/packages/schematics/angular/workspace/files/package.json b/packages/schematics/angular/workspace/files/package.json
index edf7f51b4380..eace62698914 100644
--- a/packages/schematics/angular/workspace/files/package.json
+++ b/packages/schematics/angular/workspace/files/package.json
@@ -21,6 +21,7 @@
     "@angular/router": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
     "core-js": "^2.5.4",
     "rxjs": "<%= latestVersions.RxJs %>",
+    "tslib": "<%= latestVersions.TsLib %>",
     "zone.js": "<%= latestVersions.ZoneJs %>"
   },
   "devDependencies": {
diff --git a/packages/schematics/angular/workspace/files/tsconfig.json b/packages/schematics/angular/workspace/files/tsconfig.json
index 46aeded1b278..b271fd9f3d55 100644
--- a/packages/schematics/angular/workspace/files/tsconfig.json
+++ b/packages/schematics/angular/workspace/files/tsconfig.json
@@ -9,6 +9,7 @@
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
+    "importHelpers": true,
     "target": "es5",
     "typeRoots": [
       "node_modules/@types"

From bb01cce06a5285b57041b410f66f7a3182ca0059 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 16 Oct 2018 09:40:55 +0200
Subject: [PATCH 0337/1703] feat(@angular-devkit/schematics-cli): add support
 for camelCase arguments

At the moment, only kebab case args works, and this might be misleading if you come from the Angular CLI. As for instance `--dryRun` will have no effect.

Fixes #12599
---
 .../schematics_cli/bin/schematics.ts          | 53 ++++++++++++-------
 .../schematics_cli/bin/schematics_spec.ts     |  8 +++
 2 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/packages/angular_devkit/schematics_cli/bin/schematics.ts b/packages/angular_devkit/schematics_cli/bin/schematics.ts
index fd68ef8f95ca..f0aa2691e2d1 100644
--- a/packages/angular_devkit/schematics_cli/bin/schematics.ts
+++ b/packages/angular_devkit/schematics_cli/bin/schematics.ts
@@ -69,24 +69,7 @@ export async function main({
   stderr = process.stderr,
 }: MainOptions): Promise<0 | 1> {
 
-  /** Parse the command line. */
-  const booleanArgs = [
-    'allowPrivate',
-    'debug',
-    'dry-run',
-    'force',
-    'help',
-    'list-schematics',
-    'verbose',
-  ];
-  const argv = minimist(args, {
-    boolean: booleanArgs,
-    default: {
-      'debug': null,
-      'dry-run': null,
-    },
-    '--': true,
-  });
+  const argv = parseArgs(args);
 
   /** Create the DevKit Logger used through the CLI. */
   const logger = createConsoleLogger(argv['verbose'], stdout, stderr);
@@ -128,7 +111,7 @@ export async function main({
   const debug: boolean = argv.debug === null ? isLocalCollection : argv.debug;
   const dryRun: boolean = argv['dry-run'] === null ? debug : argv['dry-run'];
   const force = argv['force'];
-  const allowPrivate = argv['allowPrivate'];
+  const allowPrivate = argv['allow-private'];
 
   /** Create a Virtual FS Host scoped to where the process is being run. **/
   const fsHost = new virtualFs.ScopedHost(new NodeJsSyncHost(), normalize(process.cwd()));
@@ -282,7 +265,7 @@ function getUsage(): string {
       --debug             Debug mode. This is true by default if the collection is a relative
                           path (in that case, turn off with --debug=false).
 
-      --allowPrivate      Allow private schematics to be run from the command line. Default to
+      --allow-private     Allow private schematics to be run from the command line. Default to
                           false.
 
       --dry-run           Do not output anything, but instead just show what actions would be
@@ -301,6 +284,36 @@ function getUsage(): string {
   `;
 }
 
+/** Parse the command line. */
+const booleanArgs = [
+  'allowPrivate',
+  'allow-private',
+  'debug',
+  'dry-run',
+  'dryRun',
+  'force',
+  'help',
+  'list-schematics',
+  'listSchematics',
+  'verbose',
+];
+
+function parseArgs(args: string[] | undefined): minimist.ParsedArgs {
+    return minimist(args, {
+      boolean: booleanArgs,
+      alias: {
+        'dryRun': 'dry-run',
+        'listSchematics': 'list-schematics',
+        'allowPrivate': 'allow-private',
+      },
+      default: {
+        'debug': null,
+        'dry-run': null,
+      },
+      '--': true,
+    });
+}
+
 if (require.main === module) {
   const args = process.argv.slice(2);
   main({ args })
diff --git a/packages/angular_devkit/schematics_cli/bin/schematics_spec.ts b/packages/angular_devkit/schematics_cli/bin/schematics_spec.ts
index 905e8831f603..15e18be12d07 100644
--- a/packages/angular_devkit/schematics_cli/bin/schematics_spec.ts
+++ b/packages/angular_devkit/schematics_cli/bin/schematics_spec.ts
@@ -35,6 +35,14 @@ describe('schematics-cli binary', () => {
     expect(res).toEqual(0);
   });
 
+  it('listSchematics works', async () => {
+    const args = ['--listSchematics'];
+    const res = await main({ args, stdout, stderr });
+    expect(stdout.lines).toMatch(/blank/);
+    expect(stdout.lines).toMatch(/schematic/);
+    expect(res).toEqual(0);
+  });
+
   it('dry-run works', async () => {
     const args = ['blank', 'foo', '--dry-run'];
     const res = await main({ args, stdout, stderr });

From f98f0d519383b1530da386a8cc0c8adfcd2be67f Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Sun, 21 Oct 2018 20:34:34 -0400
Subject: [PATCH 0338/1703] fix(@ngtools/webpack): ignore webpack special
 requests when pathmapping

---
 packages/ngtools/webpack/src/paths-plugin.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/ngtools/webpack/src/paths-plugin.ts b/packages/ngtools/webpack/src/paths-plugin.ts
index cbefe70e39d4..46bf71ebe1cb 100644
--- a/packages/ngtools/webpack/src/paths-plugin.ts
+++ b/packages/ngtools/webpack/src/paths-plugin.ts
@@ -65,8 +65,8 @@ export class TypeScriptPathsPlugin {
           return;
         }
 
-        // Amd requests are not mapped
-        if (originalRequest.startsWith('!!webpack amd')) {
+        // Ignore all webpack special requests
+        if (originalRequest.startsWith('!!')) {
           return;
         }
 
@@ -113,6 +113,10 @@ function findReplacements(
         });
       }
     } else if (starIndex === 0 && pattern.length === 1) {
+      if (potentials.length === 1 && potentials[0] === '*') {
+        // identity mapping -> noop
+        continue;
+      }
       pathMapOptions.push({
         starIndex,
         partial: originalRequest,

From 3b3e434c4e489cc9b68fd5ef864f76b99b14922a Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Mon, 15 Oct 2018 13:49:56 -0700
Subject: [PATCH 0339/1703] build: add utility for reading build event protocol

---
 .../build/lib/buildeventstream/proto/BUILD    |   9 +
 .../proto/build_event_stream.proto            | 700 ++++++++++++++++++
 .../bazelbuild/bazel/src/main/protobuf/BUILD  |   8 +
 .../src/main/protobuf/command_line.proto      | 103 +++
 .../src/main/protobuf/invocation_policy.proto | 190 +++++
 .../src/main/protobuf/option_filters.proto    |  56 ++
 tools/build_event_protocol/BUILD              |  21 +
 tools/build_event_protocol/README.md          |  26 +
 tools/build_event_protocol/parse_bep.ts       | 117 +++
 tsconfig.json                                 |   1 +
 10 files changed, 1231 insertions(+)
 create mode 100644 third_party/github.com/bazelbuild/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD
 create mode 100644 third_party/github.com/bazelbuild/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto
 create mode 100644 third_party/github.com/bazelbuild/bazel/src/main/protobuf/BUILD
 create mode 100644 third_party/github.com/bazelbuild/bazel/src/main/protobuf/command_line.proto
 create mode 100644 third_party/github.com/bazelbuild/bazel/src/main/protobuf/invocation_policy.proto
 create mode 100644 third_party/github.com/bazelbuild/bazel/src/main/protobuf/option_filters.proto
 create mode 100644 tools/build_event_protocol/BUILD
 create mode 100644 tools/build_event_protocol/README.md
 create mode 100644 tools/build_event_protocol/parse_bep.ts

diff --git a/third_party/github.com/bazelbuild/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD b/third_party/github.com/bazelbuild/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD
new file mode 100644
index 000000000000..531b4325ee17
--- /dev/null
+++ b/third_party/github.com/bazelbuild/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD
@@ -0,0 +1,9 @@
+package(default_visibility = ["//:__subpackages__"])
+
+licenses(["notice"])  # Apache 2.0
+
+proto_library(
+    name = "proto",
+    srcs = glob(["*.proto"]),
+    deps = ["//third_party/github.com/bazelbuild/bazel/src/main/protobuf"],
+)
diff --git a/third_party/github.com/bazelbuild/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto b/third_party/github.com/bazelbuild/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto
new file mode 100644
index 000000000000..b8556bc9b30f
--- /dev/null
+++ b/third_party/github.com/bazelbuild/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto
@@ -0,0 +1,700 @@
+// Copyright 2016 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+
+package build_event_stream;
+
+option java_package = "com.google.devtools.build.lib.buildeventstream";
+option java_outer_classname = "BuildEventStreamProtos";
+
+// LOCAL MOD: change import path
+import "third_party/github.com/bazelbuild/bazel/src/main/protobuf/invocation_policy.proto";
+import "third_party/github.com/bazelbuild/bazel/src/main/protobuf/command_line.proto";
+
+// Identifier for a build event. It is deliberately structured to also provide
+// information about which build target etc the event is related to.
+//
+// Events are chained via the event id as follows: each event has an id and a
+// set of ids of children events such that apart from the initial event each
+// event has an id that is mentioned as child id in an earlier event and a build
+// invocation is complete if and only if all direct and indirect children of the
+// initial event have been posted.
+message BuildEventId {
+  // Generic identifier for a build event. This is the default type of
+  // BuildEventId, but should not be used outside testing; nevertheless,
+  // tools should handle build events with this kind of id gracefully.
+  message UnknownBuildEventId {
+    string details = 1;
+  }
+
+  // Identifier of an event reporting progress. Those events are also used to
+  // chain in events that come early.
+  message ProgressId {
+    // Unique identifier. No assumption should be made about how the ids are
+    // assigned; the only meaningful operation on this field is test for
+    // equality.
+    int32 opaque_count = 1;
+  }
+
+  // Identifier of an event indicating the beginning of a build; this will
+  // normally be the first event.
+  message BuildStartedId {
+  }
+
+  // Identifier on an event indicating the original commandline received by
+  // the bazel server.
+  message UnstructuredCommandLineId {
+  }
+
+  // Identifier on an event describing the commandline received by Bazel.
+  message StructuredCommandLineId {
+    // A title for this command line value, as there may be multiple.
+    // For example, a single invocation may wish to report both the literal and
+    // canonical command lines, and this label would be used to differentiate
+    // between both versions.
+    string command_line_label = 1;
+  }
+
+  // Identifier of an event indicating the workspace status.
+  message WorkspaceStatusId {
+  }
+
+  // Identifier on an event reporting on the options included in the command
+  // line, both explicitly and implicitly.
+  message OptionsParsedId {
+  }
+
+  // Identifier of an event reporting that an external resource was fetched
+  // from.
+  message FetchId {
+    // The external resource that was fetched from.
+    string url = 1;
+  }
+
+  // Identifier of an event indicating that a target pattern has been expanded
+  // further.
+  // Messages of this shape are also used to describe parts of a pattern that
+  // have been skipped for some reason, if the actual expansion was still
+  // carried out (e.g., if keep_going is set). In this case, the
+  // pattern_skipped choice in the id field is to be made.
+  message PatternExpandedId {
+    repeated string pattern = 1;
+  }
+
+  // Identifier of an event indicating that a target has been expanded by
+  // identifying for which configurations it should be build.
+  message TargetConfiguredId {
+    string label = 1;
+
+    // If not empty, the id refers to the expansion of the target for a given
+    // aspect.
+    string aspect = 2;
+  }
+
+  // Identifier of an event introducing a named set of files (usually artifacts)
+  // to be referred to in later messages.
+  message NamedSetOfFilesId {
+    // Identifier of the file set; this is an opaque string valid only for the
+    // particular instance of the event stream.
+    string id = 1;
+  }
+
+  // Identifier of an event introducing a configuration.
+  message ConfigurationId {
+    // Identifier of the configuration; users of the protocol should not make
+    // any assumptions about it having any structure, or equality of the
+    // identifier between different streams.
+    string id = 1;
+  }
+
+  // Identifier of an event indicating that a target was built completely; this
+  // does not include running the test if the target is a test target.
+  message TargetCompletedId {
+    string label = 1;
+
+    // The configuration for which the target was built.
+    ConfigurationId configuration = 3;
+
+    // If not empty, the id refers to the completion of the target for a given
+    // aspect.
+    string aspect = 2;
+  }
+
+  // Identifier of an event reporting that an action was completed (not all
+  // actions are reported, only the ones that can be considered important;
+  // this includes all failed actions).
+  message ActionCompletedId {
+    string primary_output = 1;
+    // Optional, the label of the owner of the action, for reference.
+    string label = 2;
+    // Optional, the id of the configuration of the action owner.
+    ConfigurationId configuration = 3;
+  }
+
+  // Identifier of an event reporting an event associated with an unconfigured
+  // label. Usually, this indicates a failure due to a missing input file. In
+  // any case, it will report some form of error (i.e., the payload will be an
+  // Aborted event); there are no regular events using this identifier. The
+  // purpose of those events is to serve as the root cause of a failed target.
+  message UnconfiguredLabelId {
+    string label = 1;
+  }
+
+  // Identifier of an event reporting an event associated with a configured
+  // label, usually a visibility error. In any case, an event with such an
+  // id will always report some form of error (i.e., the payload will be an
+  // Aborted event); there are no regular events using this identifier.
+  message ConfiguredLabelId {
+    string label = 1;
+    ConfigurationId configuration = 2;
+  }
+
+  // Identifier of an event reporting on an individual test run. The label
+  // identifies the test that is reported about, the remaining fields are
+  // in such a way as to uniquely identify the action within a build. In fact,
+  // attempts for the same test, run, shard triple are counted sequentially,
+  // starting with 1.
+  message TestResultId {
+    string label = 1;
+    ConfigurationId configuration = 5;
+    int32 run = 2;
+    int32 shard = 3;
+    int32 attempt = 4;
+  }
+
+  // Identifier of an event reporting the summary of a test.
+  message TestSummaryId {
+    string label = 1;
+    ConfigurationId configuration = 2;
+  }
+
+  // Identifier of the BuildFinished event, indicating the end of a build.
+  message BuildFinishedId {
+  }
+
+  // Identifier of an event providing additional logs/statistics after
+  // completion of the build.
+  message BuildToolLogsId {
+  }
+
+  // Identifier of an event providing build metrics after completion
+  // of the build.
+  message BuildMetricsId {
+  }
+
+  oneof id {
+    UnknownBuildEventId unknown = 1;
+    ProgressId progress = 2;
+    BuildStartedId started = 3;
+    UnstructuredCommandLineId unstructured_command_line = 11;
+    StructuredCommandLineId structured_command_line = 18;
+    WorkspaceStatusId workspace_status = 14;
+    OptionsParsedId options_parsed = 12;
+    FetchId fetch = 17;
+    ConfigurationId configuration = 15;
+    TargetConfiguredId target_configured = 16;
+    PatternExpandedId pattern = 4;
+    PatternExpandedId pattern_skipped = 10;
+    NamedSetOfFilesId named_set = 13;
+    TargetCompletedId target_completed = 5;
+    ActionCompletedId action_completed = 6;
+    UnconfiguredLabelId unconfigured_label = 19;
+    ConfiguredLabelId configured_label = 21;
+    TestResultId test_result = 8;
+    TestSummaryId test_summary = 7;
+    BuildFinishedId build_finished = 9;
+    BuildToolLogsId build_tool_logs = 20;
+    BuildMetricsId build_metrics = 22;
+  }
+}
+
+// Payload of an event summarizing the progress of the build so far. Those
+// events are also used to be parents of events where the more logical parent
+// event cannot be posted yet as the needed information is not yet complete.
+message Progress {
+  // The next chunk of stdout that bazel produced since the last progress event
+  // or the beginning of the build.
+  string stdout = 1;
+
+  // The next chunk of stderr that bazel produced since the last progress event
+  // or the beginning of the build.
+  string stderr = 2;
+}
+
+// Payload of an event indicating that an expected event will not come, as
+// the build is aborted prematurely for some reason.
+message Aborted {
+  enum AbortReason {
+    UNKNOWN = 0;
+
+    // The user requested the build to be aborted (e.g., by hitting Ctl-C).
+    USER_INTERRUPTED = 1;
+
+    // The user requested that no analysis be performed.
+    NO_ANALYZE = 8;
+
+    // The user requested that no build be carried out.
+    NO_BUILD = 9;
+
+    // The build or target was aborted as a timeout was exceeded.
+    TIME_OUT = 2;
+
+    // The build or target was aborted as some remote environment (e.g., for
+    // remote execution of actions) was not available in the expected way.
+    REMOTE_ENVIRONMENT_FAILURE = 3;
+
+    // Failure due to reasons entirely internal to the build tool, e.g.,
+    // running out of memory.
+    INTERNAL = 4;
+
+    // A Failure occurred in the loading phase of a target.
+    LOADING_FAILURE = 5;
+
+    // A Failure occurred in the analysis phase of a target.
+    ANALYSIS_FAILURE = 6;
+
+    // Target build was skipped (e.g. due to incompatible CPU constraints).
+    SKIPPED = 7;
+  }
+  AbortReason reason = 1;
+
+  // A human readable description with more details about there reason, where
+  // available and useful.
+  string description = 2;
+}
+
+// Payload of an event indicating the beginning of a new build. Usually, events
+// of those type start a new build-event stream. The target pattern requested
+// to be build is contained in one of the announced child events; it is an
+// invariant that precisely one of the announced child events has a non-empty
+// target pattern.
+message BuildStarted {
+  string uuid = 1;
+
+  // Start of the build in ms since the epoch.
+  // TODO(buchgr): Use google.protobuf.TimeStamp once bazel's protoc supports
+  // it.
+  int64 start_time_millis = 2;
+
+  // Version of the build tool that is running.
+  string build_tool_version = 3;
+
+  // A human-readable description of all the non-default option settings
+  string options_description = 4;
+
+  // The name of the command that the user invoked.
+  string command = 5;
+
+  // The working directory from which the build tool was invoked.
+  string working_directory = 6;
+
+  // The directory of the workspace.
+  string workspace_directory = 7;
+
+  // The process ID of the Bazel server.
+  int64 server_pid = 8;
+}
+
+// Payload of an event reporting the command-line of the invocation as
+// originally received by the server. Note that this is not the command-line
+// given by the user, as the client adds information about the invocation,
+// like name and relevant entries of rc-files and client environment variables.
+// However, it does contain enough information to reproduce the build
+// invocation.
+message UnstructuredCommandLine {
+  repeated string args = 1;
+}
+
+// Payload of an event reporting on the parsed options, grouped in various ways.
+message OptionsParsed {
+  repeated string startup_options = 1;
+  repeated string explicit_startup_options = 2;
+  repeated string cmd_line = 3;
+  repeated string explicit_cmd_line = 4;
+  blaze.invocation_policy.InvocationPolicy invocation_policy = 5;
+  string tool_tag = 6;
+}
+
+// Payload of an event indicating that an external resource was fetched. This
+// event will only occur in streams where an actual fetch happened, not in ones
+// where a cached copy of the entity to be fetched was used.
+message Fetch {
+  bool success = 1;
+}
+
+// Payload of an event reporting the workspace status. Key-value pairs can be
+// provided by specifying the workspace_status_command to an executable that
+// returns one key-value pair per line of output (key and value separated by a
+// space).
+message WorkspaceStatus {
+  message Item {
+    string key = 1;
+    string value = 2;
+  }
+  repeated Item item = 1;
+}
+
+// Payload of an event reporting details of a given configuration.
+message Configuration {
+  string mnemonic = 1;
+  string platform_name = 2;
+  string cpu = 3;
+  map<string, string> make_variable = 4;
+}
+
+// Payload of the event indicating the expansion of a target pattern.
+// The main information is in the chaining part: the id will contain the
+// target pattern that was expanded and the children id will contain the
+// target or target pattern it was expanded to.
+message PatternExpanded {
+}
+
+// Enumeration type characterizing the size of a test, as specified by the
+// test rule.
+enum TestSize {
+  UNKNOWN = 0;
+  SMALL = 1;
+  MEDIUM = 2;
+  LARGE = 3;
+  ENORMOUS = 4;
+}
+
+// Payload of the event indicating that the configurations for a target have
+// been identified. As with pattern expansion the main information is in the
+// chaining part: the id will contain the target that was configured and the
+// children id will contain the configured targets it was configured to.
+message TargetConfigured {
+  // The kind of target (e.g.,  e.g. "cc_library rule", "source file",
+  // "generated file") where the completion is reported.
+  string target_kind = 1;
+
+  // The size of the test, if the target is a test target. Unset otherwise.
+  TestSize test_size = 2;
+
+  // List of all tags associated with this target (for all possible
+  // configurations).
+  repeated string tag = 3;
+}
+
+message File {
+  // identifier indicating the nature of the file (e.g., "stdout", "stderr")
+  string name = 1;
+
+  oneof file {
+    // A location where the contents of the file can be found. The string is
+    // encoded according to RFC2396.
+    string uri = 2;
+    // The contents of the file, if they are guaranteed to be short.
+    bytes contents = 3;
+  }
+}
+
+// Payload of a message to describe a set of files, usually build artifacts, to
+// be referred to later by their name. In this way, files that occur identically
+// as outputs of several targets have to be named only once.
+message NamedSetOfFiles {
+  // Files that belong to this named set of files.
+  repeated File files = 1;
+
+  // Other named sets whose members also belong to this set.
+  repeated BuildEventId.NamedSetOfFilesId file_sets = 2;
+}
+
+// Payload of the event indicating the completion of an action. The main purpose
+// of posting those events is to provide details on the root cause for a target
+// failing; however, consumers of the build-event protocol must not assume
+// that only failed actions are posted.
+message ActionExecuted {
+  bool success = 1;
+
+  // The mnemonic of the action that was executed
+  string type = 8;
+
+  // The exit code of the action, if it is available.
+  int32 exit_code = 2;
+
+  // Location where to find the standard output of the action
+  // (e.g., a file path).
+  File stdout = 3;
+
+  // Location where to find the standard error of the action
+  // (e.g., a file path).
+  File stderr = 4;
+
+  // Deprecated. This field is now present on ActionCompletedId.
+  string label = 5 [deprecated = true];
+
+  // Deprecated. This field is now present on ActionCompletedId.
+  BuildEventId.ConfigurationId configuration = 7 [deprecated = true];
+
+  // Primary output; only provided for successful actions.
+  File primary_output = 6;
+
+  // The command-line of the action, if the action is a command.
+  repeated string command_line = 9;
+}
+
+// Collection of all output files belonging to that output group.
+message OutputGroup {
+  // Ids of fields that have been removed.
+  reserved 2;
+
+  // Name of the output group
+  string name = 1;
+
+  // List of file sets that belong to this output group as well.
+  repeated BuildEventId.NamedSetOfFilesId file_sets = 3;
+}
+
+// Payload of the event indicating the completion of a target. The target is
+// specified in the id. If the target failed the root causes are provided as
+// children events.
+message TargetComplete {
+  bool success = 1;
+
+  // The kind of target (e.g.,  e.g. "cc_library rule", "source file",
+  // "generated file") where the completion is reported.
+  // Deprecated: use the target_kind field in TargetConfigured instead.
+  string target_kind = 5 [deprecated = true];
+
+  // The size of the test, if the target is a test target. Unset otherwise.
+  // Deprecated: use the test_size field in TargetConfigured instead.
+  TestSize test_size = 6 [deprecated = true];
+
+  // The output files are arranged by their output group. If an output file
+  // is part of multiple output groups, it appears once in each output
+  // group.
+  repeated OutputGroup output_group = 2;
+
+  // Temporarily, also report the important outputs directly. This is only to
+  // allow existing clients help transition to the deduplicated representation;
+  // new clients should not use it.
+  repeated File important_output = 4 [deprecated = true];
+
+  // List of tags associated with this configured target.
+  repeated string tag = 3;
+
+  // The timeout specified for test actions under this configured target.
+  int64 test_timeout_seconds = 7;
+}
+
+enum TestStatus {
+  NO_STATUS = 0;
+  PASSED = 1;
+  FLAKY = 2;
+  TIMEOUT = 3;
+  FAILED = 4;
+  INCOMPLETE = 5;
+  REMOTE_FAILURE = 6;
+  FAILED_TO_BUILD = 7;
+  TOOL_HALTED_BEFORE_TESTING = 8;
+};
+
+// Payload on events reporting about individual test action.
+message TestResult {
+  reserved 1;
+
+  // The status of this test.
+  TestStatus status = 5;
+
+  // Additional details about the status of the test. This is intended for
+  // user display and must not be parsed.
+  string status_details = 9;
+
+  // True, if the reported attempt is taken from the tool's local cache.
+  bool cached_locally = 4;
+
+  // Time in milliseconds since the epoch at which the test attempt was started.
+  // Note: for cached test results, this is time can be before the start of the
+  // build.
+  int64 test_attempt_start_millis_epoch = 6;
+
+  // Time the test took to run. For locally cached results, this is the time
+  // the cached invocation took when it was invoked.
+  int64 test_attempt_duration_millis = 3;
+
+  // Files (logs, test.xml, undeclared outputs, etc) generated by that test
+  // action.
+  repeated File test_action_output = 2;
+
+  // Warnings generated by that test action.
+  repeated string warning = 7;
+
+  // Message providing optional meta data on the execution of the test action,
+  // if available.
+  message ExecutionInfo {
+    // Deprecated, use TargetComplete.test_timeout_seconds instead.
+    int32 timeout_seconds = 1 [deprecated = true];
+
+    // Name of the strategy to execute this test action (e.g., "local",
+    // "remote")
+    string strategy = 2;
+
+    // True, if the reported attempt was a cache hit in a remote cache.
+    bool cached_remotely = 6;
+
+    // The exit code of the test action.
+    int32 exit_code = 7;
+
+    // The hostname of the machine where the test action was executed (in case
+    // of remote execution), if known.
+    string hostname = 3;
+
+    // Represents a hierarchical timing breakdown of an activity.
+    // The top level time should be the total time of the activity.
+    // Invariant: time_millis >= sum of time_millis of all direct children.
+    message TimingBreakdown {
+      repeated TimingBreakdown child = 1;
+      string name = 2;
+      int64 time_millis = 3;
+    }
+    TimingBreakdown timing_breakdown = 4;
+
+    message ResourceUsage {
+      string name = 1;
+      int64 value = 2;
+    }
+    repeated ResourceUsage resource_usage = 5;
+  }
+  ExecutionInfo execution_info = 8;
+}
+
+// Payload of the event summarizing a test.
+// TODO(aehlig): extend event with additional information as soon as we known
+// which additional information we need for test summaries.
+message TestSummary {
+  // Wrapper around BlazeTestStatus to support importing that enum to proto3.
+  // Overall status of test, accumulated over all runs, shards, and attempts.
+  TestStatus overall_status = 5;
+
+  // Total number of runs
+  int32 total_run_count = 1;
+
+  // Path to logs of passed runs.
+  repeated File passed = 3;
+
+  // Path to logs of failed runs;
+  repeated File failed = 4;
+
+  // Total number of cached test actions
+  int32 total_num_cached = 6;
+}
+
+// Event indicating the end of a build.
+message BuildFinished {
+  // Exit code of a build. The possible values correspond to the predefined
+  // codes in bazel's lib.ExitCode class, as well as any custom exit code a
+  // module might define. The predefined exit codes are subject to change (but
+  // rarely do) and are not part of the public API.
+  //
+  // A build was successful iff ExitCode.code equals 0.
+  message ExitCode {
+    // The name of the exit code.
+    string name = 1;
+
+    // The exit code.
+    int32 code = 2;
+  }
+
+  // If the build succeeded or failed.
+  bool overall_success = 1 [deprecated = true];
+
+  // The overall status of the build. A build was successful iff
+  // ExitCode.code equals 0.
+  ExitCode exit_code = 3;
+
+  // Time in milliseconds since the epoch.
+  // TODO(buchgr): Use google.protobuf.Timestamp once bazel's protoc supports
+  // it.
+  int64 finish_time_millis = 2;
+}
+
+message BuildMetrics {
+  message ActionSummary {
+    // The total number of actions created and registered during the build.
+    // This includes unused actions that were constructed but
+    // not executed during this build.
+    int64 actions_created = 1;
+
+    // The total number of actions executed during the build.
+    // This includes any remote cache hits, but excludes
+    // local action cache hits.
+    int64 actions_executed = 2;
+  }
+  ActionSummary action_summary = 1;
+
+  message MemoryMetrics {
+    // Size of the JVM heap post build in bytes. This is only collected if
+    // --bep_publish_used_heap_size_post_build is set,
+    // since it forces a full GC.
+    int64 used_heap_size_post_build = 1;
+  }
+  MemoryMetrics memory_metrics = 2;
+
+  message TargetMetrics {
+    // Number of targets loaded during this build.
+    int64 targets_loaded = 1;
+
+    // Number of targets configured during this build. This can
+    // be greater than targets_loaded if the same target is configured
+    // multiple times.
+    int64 targets_configured = 2;
+  }
+  TargetMetrics target_metrics = 3;
+
+  message PackageMetrics {
+    // Number of BUILD files (aka packages) loaded during this build.
+    int64 packages_loaded = 1;
+  }
+  PackageMetrics package_metrics = 4;
+}
+
+// Event providing additional statistics/logs after completion of the build.
+message BuildToolLogs {
+  repeated File log = 1;
+}
+
+// Message describing a build event. Events will have an identifier that
+// is unique within a given build invocation; they also announce follow-up
+// events as children. More details, which are specific to the kind of event
+// that is observed, is provided in the payload. More options for the payload
+// might be added in the future.
+message BuildEvent {
+  reserved 11, 19;
+  BuildEventId id = 1;
+  repeated BuildEventId children = 2;
+  bool last_message = 20;
+  oneof payload {
+    Progress progress = 3;
+    Aborted aborted = 4;
+    BuildStarted started = 5;
+    UnstructuredCommandLine unstructured_command_line = 12;
+    command_line.CommandLine structured_command_line = 22;
+    OptionsParsed options_parsed = 13;
+    WorkspaceStatus workspace_status = 16;
+    Fetch fetch = 21;
+    Configuration configuration = 17;
+    PatternExpanded expanded = 6;
+    TargetConfigured configured = 18;
+    ActionExecuted action = 7;
+    NamedSetOfFiles named_set_of_files = 15;
+    TargetComplete completed = 8;
+    TestResult test_result = 10;
+    TestSummary test_summary = 9;
+    BuildFinished finished = 14;
+    BuildToolLogs build_tool_logs = 23;
+    BuildMetrics build_metrics = 24;
+  };
+}
diff --git a/third_party/github.com/bazelbuild/bazel/src/main/protobuf/BUILD b/third_party/github.com/bazelbuild/bazel/src/main/protobuf/BUILD
new file mode 100644
index 000000000000..ea73d6c2a1f4
--- /dev/null
+++ b/third_party/github.com/bazelbuild/bazel/src/main/protobuf/BUILD
@@ -0,0 +1,8 @@
+package(default_visibility = ["//:__subpackages__"])
+
+licenses(["notice"])  # Apache 2.0
+
+proto_library(
+    name = "protobuf",
+    srcs = glob(["*.proto"]),
+)
diff --git a/third_party/github.com/bazelbuild/bazel/src/main/protobuf/command_line.proto b/third_party/github.com/bazelbuild/bazel/src/main/protobuf/command_line.proto
new file mode 100644
index 000000000000..fd09cd7c0aed
--- /dev/null
+++ b/third_party/github.com/bazelbuild/bazel/src/main/protobuf/command_line.proto
@@ -0,0 +1,103 @@
+// Copyright 2017 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+package command_line;
+
+// option java_api_version = 2;
+option java_package = "com.google.devtools.build.lib.runtime.proto";
+
+// LOCAL MOD: change import path
+import "third_party/github.com/bazelbuild/bazel/src/main/protobuf/option_filters.proto";
+
+// Representation of a Bazel command line.
+message CommandLine {
+  // A title for this command line value, to differentiate it from others.
+  // In particular, a single invocation may wish to report both the literal and
+  // canonical command lines, and this label would be used to differentiate
+  // between both versions. This is a string for flexibility.
+  string command_line_label = 1;
+
+  // A Bazel command line is made of distinct parts. For example,
+  //    `bazel --nomaster_bazelrc test --nocache_test_results //foo:aTest`
+  // has the executable "bazel", a startup flag, a command "test", a command
+  // flag, and a test target. There could be many more flags and targets, or
+  // none (`bazel info` for example), but the basic structure is there. The
+  // command line should be broken down into these logical sections here.
+  repeated CommandLineSection sections = 2;
+}
+
+// A section of the Bazel command line.
+message CommandLineSection {
+  // The name of this section, such as "startup_option" or "command".
+  string section_label = 1;
+
+  oneof section_type {
+    // Sections with non-options, such as the list of targets or the command,
+    // should use simple string chunks.
+    ChunkList chunk_list = 2;
+
+    // Startup and command options are lists of options and belong here.
+    OptionList option_list = 3;
+  }
+}
+
+// Wrapper to allow a list of strings in the "oneof" section_type.
+message ChunkList {
+  repeated string chunk = 1;
+}
+
+// Wrapper to allow a list of options in the "oneof" section_type.
+message OptionList {
+  repeated Option option = 1;
+}
+
+// A single command line option.
+//
+// This represents the option itself, but does not take into account the type of
+// option or how the parser interpreted it. If this option is part of a command
+// line that represents the actual input that Bazel received, it would, for
+// example, include expansion flags as they are. However, if this option
+// represents the canonical form of the command line, with the values as Bazel
+// understands them, then the expansion flag, which has no value, would not
+// appear, and the flags it expands to would.
+message Option {
+  // How the option looks with the option and its value combined. Depending on
+  // the purpose of this command line report, this could be the canonical
+  // form, or the way that the flag was set.
+  //
+  // Some examples: this might be `--foo=bar` form, or `--foo bar` with a space;
+  // for boolean flags, `--nobaz` is accepted on top of `--baz=false` and other
+  // negating values, or for a positive value, the unqualified `--baz` form
+  // is also accepted. This could also be a short `-b`, if the flag has an
+  // abbreviated form.
+  string combined_form = 1;
+
+  // The canonical name of the option, without the preceding dashes.
+  string option_name = 2;
+
+  // The value of the flag, or unset for flags that do not take values.
+  // Especially for boolean flags, this should be in canonical form, the
+  // combined_form field above gives room for showing the flag as it was set
+  // if that is preferred.
+  string option_value = 3;
+
+  // This flag's tagged effects. See OptionEffectTag's java documentation for
+  // details.
+  repeated options.OptionEffectTag effect_tags = 4;
+
+  // Metadata about the flag. See OptionMetadataTag's java documentation for
+  // details.
+  repeated options.OptionMetadataTag metadata_tags = 5;
+}
diff --git a/third_party/github.com/bazelbuild/bazel/src/main/protobuf/invocation_policy.proto b/third_party/github.com/bazelbuild/bazel/src/main/protobuf/invocation_policy.proto
new file mode 100644
index 000000000000..53572ac12011
--- /dev/null
+++ b/third_party/github.com/bazelbuild/bazel/src/main/protobuf/invocation_policy.proto
@@ -0,0 +1,190 @@
+// Copyright 2015 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto2";
+package blaze.invocation_policy;
+
+// option java_api_version = 2;
+option java_package = "com.google.devtools.build.lib.runtime.proto";
+
+// The --invocation_policy flag takes a base64-encoded binary-serialized or text
+// formatted InvocationPolicy message.
+message InvocationPolicy {
+  // Order matters.
+  // After expanding policies on expansion flags or flags with implicit
+  // requirements, only the final policy on a specific flag will be enforced
+  // onto the user's command line.
+  repeated FlagPolicy flag_policies = 1;
+}
+
+// A policy for controlling the value of a flag.
+message FlagPolicy {
+  // The name of the flag to enforce this policy on.
+  //
+  // Note that this should be the full name of the flag, not the abbreviated
+  // name of the flag. If the user specifies the abbreviated name of a flag,
+  // that flag will be matched using its full name.
+  //
+  // The "no" prefix will not be parsed, so for boolean flags, use
+  // the flag's full name and explicitly set it to true or false.
+  optional string flag_name = 1;
+
+  // If set, this flag policy is applied only if one of the given commands or a
+  // command that inherits from one of the given commands is being run. For
+  // instance, if "build" is one of the commands here, then this policy will
+  // apply to any command that inherits from build, such as info, coverage, or
+  // test. If empty, this flag policy is applied for all commands. This allows
+  // the policy setter to add all policies to the proto without having to
+  // determine which Bazel command the user is actually running. Additionally,
+  // Bazel allows multiple flags to be defined by the same name, and the
+  // specific flag definition is determined by the command.
+  repeated string commands = 2;
+
+  oneof operation {
+    SetValue set_value = 3;
+    UseDefault use_default = 4;
+    DisallowValues disallow_values = 5;
+    AllowValues allow_values = 6;
+  }
+}
+
+message SetValue {
+  // Use this value for the specified flag, overriding any default or user-set
+  // value (unless append is set to true for repeatable flags).
+  //
+  // This field is repeated for repeatable flags. It is an error to set
+  // multiple values for a flag that is not actually a repeatable flag.
+  // This requires at least 1 value, if even the empty string.
+  //
+  // If the flag allows multiple values, all of its values are replaced with the
+  // value or values from the policy (i.e., no diffing or merging is performed),
+  // unless the append field (see below) is set to true.
+  //
+  // Note that some flags are tricky. For example, some flags look like boolean
+  // flags, but are actually Void expansion flags that expand into other flags.
+  // The Bazel flag parser will accept "--void_flag=false", but because
+  // the flag is Void, the "=false" is ignored. It can get even trickier, like
+  // "--novoid_flag" which is also an expansion flag with the type Void whose
+  // name is explicitly "novoid_flag" and which expands into other flags that
+  // are the opposite of "--void_flag". For expansion flags, it's best to
+  // explicitly override the flags they expand into.
+  //
+  // Other flags may be differently tricky: A flag could have a converter that
+  // converts some string to a list of values, but that flag may not itself have
+  // allowMultiple set to true.
+  //
+  // An example is "--test_tag_filters": this flag sets its converter to
+  // CommaSeparatedOptionListConverter, but does not set allowMultiple to true.
+  // So "--test_tag_filters=foo,bar" results in ["foo", "bar"], however
+  // "--test_tag_filters=foo --test_tag_filters=bar" results in just ["bar"]
+  // since the 2nd value overrides the 1st.
+  //
+  // Similarly, "--test_tag_filters=foo,bar --test_tag_filters=baz,qux" results
+  // in ["baz", "qux"]. For flags like these, the policy should specify
+  // "foo,bar" instead of separately specifying "foo" and "bar" so that the
+  // converter is appropriately invoked.
+  //
+  // Note that the opposite is not necessarily
+  // true: for a flag that specifies allowMultiple=true, "--flag=foo,bar"
+  // may fail to parse or result in an unexpected value.
+  repeated string flag_value = 1;
+
+  // Whether to allow this policy to be overridden by user-specified values.
+  // When set, if the user specified a value for this flag, use the value
+  // from the user, otherwise use the value specified in this policy.
+  optional bool overridable = 2;
+
+  // If true, and if the flag named in the policy is a repeatable flag, then
+  // the values listed in flag_value do not replace all the user-set or default
+  // values of the flag, but instead append to them. If the flag is not
+  // repeatable, then this has no effect.
+  optional bool append = 3;
+}
+
+message UseDefault {
+  // Use the default value of the flag, as defined by Bazel (or equivalently, do
+  // not allow the user to set this flag).
+  //
+  // Note on implementation: UseDefault sets the default by clearing the flag,
+  // so that when the value is requested and no flag is found, the flag parser
+  // returns the default. This is mostly relevant for expansion flags: it will
+  // erase user values in *all* flags that the expansion flag expands to. Only
+  // use this on expansion flags if this is acceptable behavior. Since the last
+  // policy wins, later policies on this same flag will still remove the
+  // expanded UseDefault, so there is a way around, but it's really best not to
+  // use this on expansion flags at all.
+}
+
+message DisallowValues {
+  // Obsolete new_default_value field.
+  reserved 2;
+
+  // It is an error for the user to use any of these values (that is, the Bazel
+  // command will fail), unless new_value or use_default is set.
+  //
+  // For repeatable flags, if any one of the values in the flag matches a value
+  // in the list of disallowed values, an error is thrown.
+  //
+  // Care must be taken for flags with complicated converters. For example,
+  // it's possible for a repeated flag to be of type List<List<T>>, so that
+  // "--foo=a,b --foo=c,d" results in foo=[["a","b"], ["c", "d"]]. In this case,
+  // it is not possible to disallow just "b", nor will ["b", "a"] match, nor
+  // will ["b", "c"] (but ["a", "b"] will still match).
+  repeated string disallowed_values = 1;
+
+  oneof replacement_value {
+    // If set and if the value of the flag is disallowed (including the default
+    // value of the flag if the user doesn't specify a value), use this value as
+    // the value of the flag instead of raising an error. This does not apply to
+    // repeatable flags and is ignored if the flag is a repeatable flag.
+    string new_value = 3;
+
+    // If set and if the value of the flag is disallowed, use the default value
+    // of the flag instead of raising an error. Unlike new_value, this works for
+    // repeatable flags, but note that the default value for repeatable flags is
+    // always empty.
+    //
+    // Note that it is an error to disallow the default value of the flag and
+    // to set use_default, unless the flag is a repeatable flag where the
+    // default value is always the empty list.
+    UseDefault use_default = 4;
+  }
+}
+
+message AllowValues {
+  // Obsolete new_default_value field.
+  reserved 2;
+
+  // It is an error for the user to use any value not in this list, unless
+  // new_value or use_default is set.
+  repeated string allowed_values = 1;
+
+  oneof replacement_value {
+    // If set and if the value of the flag is disallowed (including the default
+    // value of the flag if the user doesn't specify a value), use this value as
+    // the value of the flag instead of raising an error. This does not apply to
+    // repeatable flags and is ignored if the flag is a repeatable flag.
+    string new_value = 3;
+
+    // If set and if the value of the flag is disallowed, use the default value
+    // of the flag instead of raising an error. Unlike new_value, this works for
+    // repeatable flags, but note that the default value for repeatable flags is
+    // always empty.
+    //
+    // Note that it is an error to disallow the default value of the flag and
+    // to set use_default, unless the flag is a repeatable flag where the
+    // default value is always the empty list.
+    UseDefault use_default = 4;
+  }
+}
diff --git a/third_party/github.com/bazelbuild/bazel/src/main/protobuf/option_filters.proto b/third_party/github.com/bazelbuild/bazel/src/main/protobuf/option_filters.proto
new file mode 100644
index 000000000000..782620d05371
--- /dev/null
+++ b/third_party/github.com/bazelbuild/bazel/src/main/protobuf/option_filters.proto
@@ -0,0 +1,56 @@
+// Copyright 2017 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+syntax = "proto3";
+package options;
+
+// option java_api_version = 2;
+option java_package = "com.google.devtools.common.options.proto";
+
+// IMPORTANT NOTE: These two enums must be kept in sync with their Java
+// equivalents in src/main/java/com/google/devtools/common/options.
+// Changing this proto has specific compatibility requirements, please see the
+// Java documentation for details.
+
+// Docs in java enum.
+enum OptionEffectTag {
+  // This option's effect or intent is unknown.
+  UNKNOWN = 0;
+
+  // This flag has literally no effect.
+  NO_OP = 1;
+
+  LOSES_INCREMENTAL_STATE = 2;
+  CHANGES_INPUTS = 3;
+  AFFECTS_OUTPUTS = 4;
+  BUILD_FILE_SEMANTICS = 5;
+  BAZEL_INTERNAL_CONFIGURATION = 6;
+  LOADING_AND_ANALYSIS = 7;
+  EXECUTION = 8;
+  HOST_MACHINE_RESOURCE_OPTIMIZATIONS = 9;
+  EAGERNESS_TO_EXIT = 10;
+  BAZEL_MONITORING = 11;
+  TERMINAL_OUTPUT = 12;
+  ACTION_COMMAND_LINES = 13;
+  TEST_RUNNER = 14;
+}
+
+// Docs in java enum.
+enum OptionMetadataTag {
+  EXPERIMENTAL = 0;
+  INCOMPATIBLE_CHANGE = 1;
+  DEPRECATED = 2;
+  HIDDEN = 3;
+  INTERNAL = 4;
+  TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES = 5;
+}
diff --git a/tools/build_event_protocol/BUILD b/tools/build_event_protocol/BUILD
new file mode 100644
index 000000000000..da9d5b617413
--- /dev/null
+++ b/tools/build_event_protocol/BUILD
@@ -0,0 +1,21 @@
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_library", "ts_proto_library")
+load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
+
+ts_proto_library(
+    name = "build_event_stream",
+    deps = ["//third_party/github.com/bazelbuild/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto"],
+)
+
+ts_library(
+    name = "parse_bep",
+    srcs = ["parse_bep.ts"],
+    deps = [
+      ":build_event_stream",
+    ],
+)
+
+nodejs_binary(
+    name = "parse",
+    entry_point = "angular_devkit/tools/build_event_protocol/parse_bep",
+    data = [":parse_bep"],
+)
diff --git a/tools/build_event_protocol/README.md b/tools/build_event_protocol/README.md
new file mode 100644
index 000000000000..3eaf87961b67
--- /dev/null
+++ b/tools/build_event_protocol/README.md
@@ -0,0 +1,26 @@
+# build_event_protocol
+
+This protocol is used to make streaming build results available for machines to
+read and process.
+
+See https://docs.bazel.build/versions/master/build-event-protocol.html
+
+This directory contains an example program that parses a streaming JSON file
+containing build events. It's useful for manually testing a program that emits
+the build event protocol.
+
+## Try it
+
+First build the tool:
+
+```sh
+$ bazel build //tools/build_event_protocol:parse
+```
+
+Then produce a build event json file:
+
+$ bazel test //... --build_event_json_file=bep.json
+
+as soon as that process has started, you should be able to run in another window
+
+$ bazel-bin/tools/build_event_protocol/parse bep.json
diff --git a/tools/build_event_protocol/parse_bep.ts b/tools/build_event_protocol/parse_bep.ts
new file mode 100644
index 000000000000..4884318406ca
--- /dev/null
+++ b/tools/build_event_protocol/parse_bep.ts
@@ -0,0 +1,117 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+/**
+ * @fileoverview simple program to read the build event protocol and convert to
+ * UI quasi-events.
+ *
+ * See the README.md in this directory for usage
+ */
+
+/// <reference types="node" />
+import * as fs from 'fs';
+import { Observable, Subject } from 'rxjs';
+import { filter } from 'rxjs/operators';
+import { build_event_stream as bes } from './build_event_stream';
+
+function updateUi(s: string, ...more: Array<{}>) {
+  console.error('-->', s, ...more);
+}
+
+// typeof bes.BuildEventId.id
+type payloadType = 'unknown'|'progress'|'started'|'unstructuredCommandLine'|
+    'structuredCommandLine'|'workspaceStatus'|'optionsParsed'|'fetch'|
+    'configuration'|'targetConfigured'|'pattern'|'patternSkipped'|'namedSet'|
+    'targetCompleted'|'actionCompleted'|'unconfiguredLabel'|'configuredLabel'|
+    'testResult'|'testSummary'|'buildFinished'|'buildToolLogs'|'buildMetrics';
+
+function filterType(s: payloadType) {
+  return filter((evt: bes.BuildEvent) => {
+    if (!evt.id) {
+      throw new Error(`expected BuildEvent to contain id
+        ${JSON.stringify(evt)}`);
+    }
+    return Object.keys(evt.id)[0] === s;
+  });
+}
+
+async function main(argv: string[]): Promise<0|1> {
+  const s = new Subject<bes.BuildEvent>();
+  const o: Observable<bes.BuildEvent> = s.asObservable();
+  o.pipe(filterType('testSummary')).subscribe({
+    next: (evt: bes.BuildEvent) => {
+      if (!evt.id || !evt.id.testSummary || !evt.testSummary) {
+        throw new Error(
+            `expected BuildEvent to contain id, testSummary, id.testSummary
+        ${JSON.stringify(evt)}`);
+      }
+      updateUi('Test result', {
+        label: evt.id.testSummary.label,
+        overallStatus: evt.testSummary.overallStatus,
+      });
+    }
+  });
+
+  o.pipe(filterType('buildFinished')).subscribe({
+    next: (evt: bes.BuildEvent) => {
+      if (!evt.finished || !evt.finished.exitCode) {
+        throw new Error(
+            `expected BuildEvent to contain finished, finished.exitCode
+          ${JSON.stringify(evt)}`);
+      }
+      const exitName = evt.finished.exitCode.name;
+      switch (exitName) {
+        case 'SUCCESS':
+          updateUi('Thumbs up');
+          break;
+        case 'TESTS_FAILED':
+          updateUi('Some tests failed');
+          break;
+        case 'INTERRUPTED':
+          updateUi('Cancelled');
+          break;
+        case 'PARSING_FAILURE':
+          updateUi('Error in build configuration file, report to expert', {
+            someDebugThatsUsefulToTheExpert: 'a-file-path',
+          });
+          break;
+        default:
+          throw new Error(`Unhandled exitName ${exitName}`);
+      }
+    },
+    error: (e) => console.error('Unrecoverable error ', e)
+  });
+
+  // Push values into the subject
+  // TODO: should be streaming from file
+  // const stream = fs.createReadStream(argv[0]);
+  // stream.on('data')
+  // stream.on('end)
+  // etc.
+  const content = fs.readFileSync(argv[0], {'encoding': 'utf-8'});
+  content.split(/[\r\n]+/).filter(l => !!l).forEach(
+      evt => s.next(JSON.parse(evt)));
+  s.complete();
+
+  await o.toPromise();
+  return 0;
+}
+
+
+if (require.main === module) {
+  // Allow this program to run under bazel run
+  const wd = process.env['BUILD_WORKING_DIRECTORY'];
+  if (wd) {
+    process.chdir(wd);
+  }
+
+  main(process.argv.slice(2))
+      .then(exitCode => process.exitCode = exitCode, e => {
+        throw new Error(e);
+      });
+}
diff --git a/tsconfig.json b/tsconfig.json
index 236b0f857ec2..07f9204ad3cf 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -70,6 +70,7 @@
     "tmp/**/*",
     "scripts/patches/**/*",
     "tests/**/*",
+    "tools/**/*",
     "benchmark/**/*",
   ]
 }

From 9d69367e97fe6ac6aa5da32ae274e99bc167825c Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 19 Oct 2018 09:10:44 +0200
Subject: [PATCH 0340/1703] fix(@angular-devkit/build-angular): update
 `copy-webpack-plugin` dependency

This fixes the issue that newly added files are not copied on serve

Fixes #9669
---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index bc11fc4c95f3..a7e0c59e84d2 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -15,7 +15,7 @@
     "autoprefixer": "8.4.1",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
-    "copy-webpack-plugin": "4.5.3",
+    "copy-webpack-plugin": "4.5.4",
     "file-loader": "2.0.0",
     "glob": "7.1.3",
     "istanbul": "0.4.5",
diff --git a/yarn.lock b/yarn.lock
index 1a7efd7db68e..1138645a606e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2285,10 +2285,10 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-webpack-plugin@4.5.3:
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.3.tgz#14a224d205e46f7a79f7956028e1da6df2225ff2"
-  integrity sha512-VKCiNXQcc8zyznaepXfKpCH2cZD+/j3T3B+gsFY97P7qMlEsj34wr/sI9OCG7QPUUh7gAHVx3q8Q1rdQIDM4bA==
+copy-webpack-plugin@4.5.4:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.4.tgz#f2b2782b3cd5225535c3dc166a80067e7d940f27"
+  integrity sha512-0lstlEyj74OAtYMrDxlNZsU7cwFijAI3Ofz2fD6Mpo9r4xCv4yegfa3uHIKvZY1NSuOtE9nvG6TAhJ+uz9gDaQ==
   dependencies:
     cacache "^10.0.4"
     find-cache-dir "^1.0.0"

From f61ea6b69f9fff46e27ea56ca8504be8617c0b81 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 12 Oct 2018 13:15:03 +0200
Subject: [PATCH 0341/1703] fix(@ngtools/webpack): report a warning when lazy
 route discovery is disabled

At the moment this will cause a runtime error instead. With this change a warning will be shown during the build.

Closes #12238 and Closes #12025
---
 .../test/browser/no-entry-module_spec_large.ts | 13 ++++++++++++-
 .../webpack/src/angular_compiler_plugin.ts     |  9 ++++++++-
 packages/ngtools/webpack/src/entry_resolver.ts | 18 +++++++-----------
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/no-entry-module_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/no-entry-module_spec_large.ts
index 2046bf6e8efb..ffb086befbd6 100644
--- a/packages/angular_devkit/build_angular/test/browser/no-entry-module_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/no-entry-module_spec_large.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { runTargetSpec } from '@angular-devkit/architect/testing';
+import { TestLogger, runTargetSpec } from '@angular-devkit/architect/testing';
 import { tap } from 'rxjs/operators';
 import { browserTargetSpec, host } from '../utils';
 
@@ -26,4 +26,15 @@ describe('Browser Builder no entry module', () => {
       tap((buildEvent) => expect(buildEvent.success).toBe(true)),
     ).toPromise().then(done, done.fail);
   });
+
+  it('reports warning when no bootstrap code', (done) => {
+    host.replaceInFile('src/main.ts', /./g, '');
+    host.appendToFile('src/main.ts', `import './app/app.module';`);
+
+    const logger = new TestLogger('no-bootstrap');
+    runTargetSpec(host, browserTargetSpec, undefined, undefined, logger).pipe(
+      tap(() => expect(logger.includes('Lazy routes discovery is not enabled')).toBe(true)),
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+    ).toPromise().then(done, done.fail);
+  });
 });
diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 064601a8d85f..581fc5ba6fcd 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -410,10 +410,17 @@ export class AngularCompilerPlugin {
     }
 
     // If there's still no entryModule try to resolve from mainPath.
-    if (!this._entryModule && this._mainPath) {
+    if (!this._entryModule && this._mainPath && !this._compilerOptions.enableIvy) {
       time('AngularCompilerPlugin._make.resolveEntryModuleFromMain');
       this._entryModule = resolveEntryModuleFromMain(
         this._mainPath, this._compilerHost, this._getTsProgram() as ts.Program);
+
+      if (!this.entryModule) {
+        this._warnings.push('Lazy routes discovery is not enabled. '
+          + 'Because there is neither an entryModule nor a '
+          + 'statically analyzable bootstrap code in the main file.',
+        );
+      }
       timeEnd('AngularCompilerPlugin._make.resolveEntryModuleFromMain');
     }
   }
diff --git a/packages/ngtools/webpack/src/entry_resolver.ts b/packages/ngtools/webpack/src/entry_resolver.ts
index 1a485d9dc324..60a96d727f8a 100644
--- a/packages/ngtools/webpack/src/entry_resolver.ts
+++ b/packages/ngtools/webpack/src/entry_resolver.ts
@@ -153,17 +153,13 @@ export function resolveEntryModuleFromMain(mainPath: string,
     .map(node => node.arguments[0] as ts.Identifier)
     .filter(node => node.kind == ts.SyntaxKind.Identifier);
 
-  if (bootstrap.length != 1) {
-    return null;
-  }
-  const bootstrapSymbolName = bootstrap[0].text;
-  const module = _symbolImportLookup(source, bootstrapSymbolName, host, program);
-  if (module) {
-    return `${module.replace(/\.ts$/, '')}#${bootstrapSymbolName}`;
+  if (bootstrap.length === 1) {
+    const bootstrapSymbolName = bootstrap[0].text;
+    const module = _symbolImportLookup(source, bootstrapSymbolName, host, program);
+    if (module) {
+      return `${module.replace(/\.ts$/, '')}#${bootstrapSymbolName}`;
+    }
   }
 
-  // shrug... something bad happened and we couldn't find the import statement.
-  throw new Error('Tried to find bootstrap code, but could not. Specify either '
-    + 'statically analyzable bootstrap code or pass in an entryModule '
-    + 'to the plugins options.');
+  return null;
 }

From e897b39afcb933a3d9eb5006ea984af52a95aa40 Mon Sep 17 00:00:00 2001
From: Andrey Sitnik <andrey@sitnik.ru>
Date: Sun, 14 Oct 2018 11:13:58 -0400
Subject: [PATCH 0342/1703] feat(@angular-devkit/build-angular): update
 Autoprefixer and PostCSS

Closes #9861 and Closes #9829
---
 .../angular_devkit/build_angular/package.json | 10 +--
 yarn.lock                                     | 62 +++++++------------
 2 files changed, 26 insertions(+), 46 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index a7e0c59e84d2..421fdd96a400 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -12,7 +12,7 @@
     "@angular-devkit/core": "0.0.0",
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.5.3",
-    "autoprefixer": "8.4.1",
+    "autoprefixer": "9.1.5",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "4.5.4",
@@ -30,9 +30,9 @@
     "parse5": "4.0.0",
     "opn": "5.3.0",
     "portfinder": "1.0.17",
-    "postcss": "6.0.23",
-    "postcss-import": "11.1.0",
-    "postcss-loader": "2.1.6",
+    "postcss": "7.0.5",
+    "postcss-import": "12.0.0",
+    "postcss-loader": "3.0.0",
     "raw-loader": "0.5.1",
     "rxjs": "6.3.3",
     "sass-loader": "7.1.0",
@@ -87,4 +87,4 @@
     "protractor": "~5.4.0",
     "zone.js": "^0.8.19"
   }
-}
\ No newline at end of file
+}
diff --git a/yarn.lock b/yarn.lock
index 1138645a606e..f06f2662611a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1066,19 +1066,7 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@8.4.1:
-  version "8.4.1"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.4.1.tgz#c6b30001ea4b3daa6b611e50071f62dd24beb564"
-  integrity sha512-YqUclCBDXUT9Y7aQ8Xv+ja8yhTZYJoMsOD7WS++gZIJLCpCu+gPcKGDlhk6S3WxhLkTcNVdaMZAWys2nzZCH7g==
-  dependencies:
-    browserslist "^3.2.6"
-    caniuse-lite "^1.0.30000832"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^6.0.22"
-    postcss-value-parser "^3.2.3"
-
-autoprefixer@^9.0.0:
+autoprefixer@9.1.5, autoprefixer@^9.0.0:
   version "9.1.5"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.1.5.tgz#8675fd8d1c0d43069f3b19a2c316f3524e4f6671"
   integrity sha512-kk4Zb6RUc58ld7gdosERHMF3DzIYJc2fp5sX46qEsGXQQy5bXsu8qyLjoxuY1NuQ/cJuCYnx99BfjwnRggrYIw==
@@ -1451,14 +1439,6 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^3.2.6:
-  version "3.2.8"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6"
-  integrity sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==
-  dependencies:
-    caniuse-lite "^1.0.30000844"
-    electron-to-chromium "^1.3.47"
-
 browserslist@^4.0.0, browserslist@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.1.1.tgz#328eb4ff1215b12df6589e9ab82f8adaa4fc8cd6"
@@ -1658,7 +1638,7 @@ camelcase@^4.0.0, camelcase@^4.1.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
   integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
-caniuse-lite@^1.0.30000832, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000884:
+caniuse-lite@^1.0.30000884:
   version "1.0.30000885"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000885.tgz#e889e9f8e7e50e769f2a49634c932b8aee622984"
   integrity sha512-cXKbYwpxBLd7qHyej16JazPoUacqoVuDhvR61U7Fr5vSxMUiodzcYa1rQYRYfZ5GexV03vGZHd722vNPLjPJGQ==
@@ -2819,7 +2799,7 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.62:
+electron-to-chromium@^1.3.62:
   version "1.3.65"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.65.tgz#0655c238e45fea7e0e0e81fd0cac62b8186129c2"
   integrity sha512-tyGr+wh2c/JYBVMeflKpZ3ricwtBPyVBMtRNxYGObl7TP5bAeupgz4VZnBzQSFleZViXYTws1yZtKKFQYZyiYw==
@@ -6612,12 +6592,12 @@ posix-character-classes@^0.1.0:
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
-postcss-import@11.1.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-11.1.0.tgz#55c9362c9192994ec68865d224419df1db2981f0"
-  integrity sha512-5l327iI75POonjxkXgdRCUS+AlzAdBx4pOvMEhTKTCjb1p8IEeVR9yx3cPbmN7LIWJLbfnIXxAhoB4jpD0c/Cw==
+postcss-import@12.0.0:
+  version "12.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.0.tgz#149f96a4ef0b27525c419784be8517ebd17e92c5"
+  integrity sha512-3KqKRZcaZAvxbY8DVLdd81tG5uKzbUQuiWIvy0o0fzEC42bKacqPYFWbfCQyw6L4LWUaqPz/idvIdbhpgQ32eQ==
   dependencies:
-    postcss "^6.0.1"
+    postcss "^7.0.1"
     postcss-value-parser "^3.2.3"
     read-cache "^1.0.0"
     resolve "^1.1.7"
@@ -6630,15 +6610,15 @@ postcss-load-config@^2.0.0:
     cosmiconfig "^4.0.0"
     import-cwd "^2.0.0"
 
-postcss-loader@2.1.6:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.1.6.tgz#1d7dd7b17c6ba234b9bed5af13e0bea40a42d740"
-  integrity sha512-hgiWSc13xVQAq25cVw80CH0l49ZKlAnU1hKPOdRrNj89bokRr/bZF2nT+hebPPF9c9xs8c3gw3Fr2nxtmXYnNg==
+postcss-loader@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d"
+  integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==
   dependencies:
     loader-utils "^1.1.0"
-    postcss "^6.0.0"
+    postcss "^7.0.0"
     postcss-load-config "^2.0.0"
-    schema-utils "^0.4.0"
+    schema-utils "^1.0.0"
 
 postcss-url@^8.0.0:
   version "8.0.0"
@@ -6656,14 +6636,14 @@ postcss-value-parser@^3.2.3:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
   integrity sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=
 
-postcss@6.0.23, postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.22:
-  version "6.0.23"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
-  integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
+postcss@7.0.5, postcss@^7.0.1:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.5.tgz#70e6443e36a6d520b0fd4e7593fcca3635ee9f55"
+  integrity sha512-HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ==
   dependencies:
     chalk "^2.4.1"
     source-map "^0.6.1"
-    supports-color "^5.4.0"
+    supports-color "^5.5.0"
 
 postcss@^7.0.0, postcss@^7.0.2:
   version "7.0.2"
@@ -7513,7 +7493,7 @@ schema-utils@^0.3.0:
   dependencies:
     ajv "^5.0.0"
 
-schema-utils@^0.4.0, schema-utils@^0.4.4, schema-utils@^0.4.5:
+schema-utils@^0.4.4, schema-utils@^0.4.5:
   version "0.4.7"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
   integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
@@ -8360,7 +8340,7 @@ supports-color@^3.1.0:
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0:
+supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==

From 9c5058e95cda39561944033d309a5d895b7fe580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=ABl=20Mac=C3=A9?= <contact@noelmace.com>
Date: Tue, 23 Oct 2018 20:51:14 +0200
Subject: [PATCH 0343/1703] Docs: fix budgets story (#12585)

* docs: fix typo in budgets story

* docs: add example in budgets story
---
 docs/documentation/stories/budgets.md | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/docs/documentation/stories/budgets.md b/docs/documentation/stories/budgets.md
index 2f7f049e6f25..3c24a22961c5 100644
--- a/docs/documentation/stories/budgets.md
+++ b/docs/documentation/stories/budgets.md
@@ -4,7 +4,7 @@
 
 As applications grow in functionality, they also grow in size. Budgets is a feature in the
 Angular CLI which allows you to set budget thresholds in your configuration to ensure parts
-of your application stay within boundries which you set.
+of your application stay within boundaries which you set.
 
 **angular.json**
 ```
@@ -62,3 +62,24 @@ Available formats:
 
 All sizes are relative to baseline.
 Percentages are not valid for baseline values.
+
+## Example
+
+```
+{
+  ...
+  "configurations": {
+    "production": {
+      ...
+      budgets: [
+        {
+          "type": "bundle",
+          "name": "vendor",
+          "minimumWarning": "300kb",
+          "minimumError": "400kb",
+        }
+      ]
+    }
+  }
+}
+```

From abf99b5b5e27a4a0520526603e1ff48cee160d96 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 15 Oct 2018 08:42:20 +0200
Subject: [PATCH 0344/1703] fix(@angular-devkit/build-optimizer): add tslib
 replacement at top of file

Fixes #12568
---
 .../build-optimizer/build-optimizer_spec.ts   |  2 +-
 .../src/transforms/import-tslib.ts            | 25 +++++++++++---
 .../src/transforms/import-tslib_spec.ts       | 34 +++++++++++--------
 3 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer_spec.ts b/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer_spec.ts
index af7d436250c1..42768c1b15d7 100644
--- a/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer_spec.ts
@@ -58,8 +58,8 @@ describe('build-optimizer', () => {
       `;
       // tslint:disable:max-line-length
       const output = tags.oneLine`
-        ${imports}
         import { __extends } from "tslib";
+        ${imports}
         var ChangeDetectionStrategy = /*@__PURE__*/ (function (ChangeDetectionStrategy) {
           ChangeDetectionStrategy[ChangeDetectionStrategy["OnPush"] = 0] = "OnPush";
           ChangeDetectionStrategy[ChangeDetectionStrategy["Default"] = 1] = "Default";
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/import-tslib.ts b/packages/angular_devkit/build_optimizer/src/transforms/import-tslib.ts
index 61ec752db640..7251aac5e2ad 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/import-tslib.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/import-tslib.ts
@@ -11,7 +11,7 @@ import * as ts from 'typescript';
  * @deprecated From 0.9.0
  */
 export function testImportTslib(content: string) {
-  const regex = /var (__extends|__decorate|__metadata|__param) = \(.*\r?\n(    .*\r?\n)*\};/;
+  const regex = /var (__extends|__decorate|__metadata|__param) = \(.*\r?\n\s+(.*\r?\n)*\s*\};/;
 
   return regex.test(content);
 }
@@ -21,10 +21,12 @@ export function getImportTslibTransformer(): ts.TransformerFactory<ts.SourceFile
 
     const transformer: ts.Transformer<ts.SourceFile> = (sf: ts.SourceFile) => {
 
+      const tslibImports: (ts.VariableStatement | ts.ImportDeclaration)[] = [];
+
       // Check if module has CJS exports. If so, use 'require()' instead of 'import'.
       const useRequire = /exports.\S+\s*=/.test(sf.getText());
 
-      const visitor: ts.Visitor = (node: ts.Node): ts.Node => {
+      const visitor: ts.Visitor = (node: ts.Node): ts.Node | undefined => {
 
         // Check if node is a TS helper declaration and replace with import if yes
         if (ts.isVariableStatement(node)) {
@@ -35,8 +37,10 @@ export function getImportTslibTransformer(): ts.TransformerFactory<ts.SourceFile
 
             if (isHelperName(name)) {
               // TODO: maybe add a few more checks, like checking the first part of the assignment.
+              const tslibImport = createTslibImport(name, useRequire);
+              tslibImports.push(tslibImport);
 
-              return createTslibImport(name, useRequire);
+              return undefined;
             }
           }
         }
@@ -44,14 +48,25 @@ export function getImportTslibTransformer(): ts.TransformerFactory<ts.SourceFile
         return ts.visitEachChild(node, visitor, context);
       };
 
-      return ts.visitEachChild(sf, visitor, context);
+      const sfUpdated = ts.visitEachChild(sf, visitor, context);
+
+      // Add tslib imports before any other statement
+      return tslibImports.length > 0
+        ? ts.updateSourceFileNode(sfUpdated, [
+          ...tslibImports,
+          ...sfUpdated.statements,
+        ])
+        : sfUpdated;
     };
 
     return transformer;
   };
 }
 
-function createTslibImport(name: string, useRequire = false): ts.Node {
+function createTslibImport(
+  name: string,
+  useRequire = false,
+): ts.VariableStatement | ts.ImportDeclaration {
   if (useRequire) {
     // Use `var __helper = /*@__PURE__*/ require("tslib").__helper`.
     const requireCall = ts.createCall(ts.createIdentifier('require'), undefined,
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/import-tslib_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/import-tslib_spec.ts
index ca32b0b7f48f..7f914f582a95 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/import-tslib_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/import-tslib_spec.ts
@@ -31,6 +31,26 @@ describe('import-tslib', () => {
     expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
   });
 
+  it('replaces wrapped __extends', () => {
+    // tslint:disable:max-line-length
+    const input = tags.stripIndent`
+    export default function appGlobal() {
+        var __extends = (this && this.__extends) || function (d, b) {
+          for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+          function __() { this.constructor = d; }
+          d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+        };
+    }
+    `;
+    const output = tags.stripIndent`
+      import { __extends } from "tslib";
+      export default function appGlobal() { }
+    `;
+
+    expect(testImportTslib(input)).toBeTruthy();
+    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+  });
+
   it('replaces __decorate', () => {
     // tslint:disable:max-line-length
     const input = tags.stripIndent`
@@ -98,18 +118,4 @@ describe('import-tslib', () => {
     expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
   });
 
-  it('tests false for files using __webpack_require__', () => {
-    const input = tags.stripIndent`
-      function __webpack_require__(moduleId) {
-          var __extends = (this && this.__extends) || function (d, b) {
-              for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-              function __() { this.constructor = d; }
-              d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-          };
-          exports.meaning = 42;
-      }
-    `;
-
-    expect(testImportTslib(input)).toBeFalsy();
-  });
 });

From 6aff217e88c32e0bca40d432121eeb8715786ba4 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 15 Oct 2018 10:24:58 +0200
Subject: [PATCH 0345/1703] docs: update universal rendering story

Closes: #9202
---
 .../stories/universal-rendering.md            | 95 +++++++++----------
 1 file changed, 47 insertions(+), 48 deletions(-)

diff --git a/docs/documentation/stories/universal-rendering.md b/docs/documentation/stories/universal-rendering.md
index 7c56041a547f..92f45d24324b 100644
--- a/docs/documentation/stories/universal-rendering.md
+++ b/docs/documentation/stories/universal-rendering.md
@@ -22,11 +22,10 @@ This story will show you how to set up Universal bundling for an existing `@angu
 
 Install `@angular/platform-server` into your project. Make sure you use the same version as the other `@angular` packages in your project.
 
-> You'll also need ts-loader (for your webpack build we'll show later) and @nguniversal/module-map-ngfactory-loader, as it's used to handle lazy-loading in the context of a server-render. (by loading the chunks right away)
+> You'll also need @nguniversal/module-map-ngfactory-loader, as it's used to handle lazy-loading in the context of a server-render. (by loading the chunks right away)
 
 ```bash
 $ npm install --save @angular/platform-server @nguniversal/module-map-ngfactory-loader express
-$ npm install --save-dev ts-loader webpack-cli
 ```
 
 ## Step 1: Prepare your App for Universal rendering
@@ -199,6 +198,30 @@ app.engine('html', ngExpressEngine({
 }));
 ```
 
+In case you want to use an AppShell with SSR and Lazy loaded modules you need to configure `NgModuleFactoryLoader` as a provider.
+
+For more context see: https://github.com/angular/angular-cli/issues/9202
+
+```typescript
+import { Compiler, NgModuleFactoryLoader } from '@angular/core';
+import { provideModuleMap, ModuleMapNgFactoryLoader, MODULE_MAP } from '@nguniversal/module-map-ngfactory-loader';
+
+app.engine('html', ngExpressEngine({
+  bootstrap: AppServerModuleNgFactory,
+  providers: [
+    provideModuleMap(LAZY_MODULE_MAP),
+    {
+      provide: NgModuleFactoryLoader,
+      useClass: ModuleMapNgFactoryLoader,
+      deps: [
+        Compiler,
+        MODULE_MAP
+      ],
+    },
+  ]
+}));
+```
+
 Below we can see a TypeScript implementation of a -very- simple Express server to fire everything up.
 
 > Note: This is a very bare bones Express application, and is just for demonstrations sake. In a real production environment, you'd want to make sure you have other authentication and security things setup here as well. This is just meant just to show the specific things needed that are relevant to Universal itself. The rest is up to you!
@@ -265,60 +288,36 @@ app.listen(PORT, () => {
 });
 ```
 
-## Step 5: Setup a webpack config to handle this Node server.ts file and serve your application!
+## Step 5: Setup a TypeScript config to handle this Node server.ts file and serve your application!
 
 Now that we have our Node Express server setup, we need to pack it and serve it!
 
-Create a file named `webpack.server.config.js` at the ROOT of your application.
+Create a file named `server.tsconfig.json` at the ROOT of your application.
 
 > This file basically takes that server.ts file, and takes it and compiles it and every dependency it has into `dist/server.js`.
 
-### ./webpack.server.config.js (root project level)
+### ./server.tsconfig.json (root project level)
 
 ```typescript
-const path = require('path');
-const webpack = require('webpack');
-
-module.exports = {
-  mode: 'none',
-  entry: {
-    server: './server.ts',
-  },
-  target: 'node',
-  resolve: { extensions: ['.ts', '.js'] },
-  optimization: {
-    minimize: false
-  },
-  output: {
-    // Puts the output at the root of the dist folder
-    path: path.join(__dirname, 'dist'),
-    filename: '[name].js'
-  },
-  module: {
-    rules: [
-      { test: /\.ts$/, loader: 'ts-loader' },
-      {
-        // Mark files inside `@angular/core` as using SystemJS style dynamic imports.
-        // Removing this will cause deprecation warnings to appear.
-        test: /(\\|\/)@angular(\\|\/)core(\\|\/).+\.js$/,
-        parser: { system: true },
-      },
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "outDir": "./dist",
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "target": "es5",
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+    "lib": [
+      "es2017",
+      "dom"
     ]
   },
-  plugins: [
-    new webpack.ContextReplacementPlugin(
-      // fixes WARNING Critical dependency: the request of a dependency is an expression
-      /(.+)?angular(\\|\/)core(.+)?/,
-      path.join(__dirname, 'src'), // location of your src
-      {} // a map of your routes
-    ),
-    new webpack.ContextReplacementPlugin(
-      // fixes WARNING Critical dependency: the request of a dependency is an expression
-      /(.+)?express(\\|\/)(.+)?/,
-      path.join(__dirname, 'src'),
-      {}
-    )
-  ]
+  "include": ["server.ts"]
 }
 ```
 
@@ -345,12 +344,12 @@ Now lets create a few handy scripts to help us do all of this in the future.
 ```json
 "scripts": {
   // These will be your common scripts
-  "build:ssr": "npm run build:client-and-server-bundles && npm run webpack:server",
+  "build:ssr": "npm run build:client-and-server-bundles && npm run compile:server",
   "serve:ssr": "node dist/server.js",
 
   // Helpers for the above scripts
   "build:client-and-server-bundles": "ng build --prod && ng run your-project-name:server",
-  "webpack:server": "webpack --config webpack.server.config.js --progress --colors"
+  "compile:server": "tsc -p server.tsconfig.json",
 }
 ```
 

From 39b6300f9bfcd97b99029dfed6ef333ffab9ba2c Mon Sep 17 00:00:00 2001
From: Ahsan Ayaz <ahsan.ubitian@gmail.com>
Date: Tue, 16 Oct 2018 11:15:53 +0500
Subject: [PATCH 0346/1703] fix(@schematics/schematics): should not have test
 node_modules specs

Fixed the  schematics to not consider node_module specs while running unit tests
Fixes #12605
---
 packages/schematics/schematics/schematic/files/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/schematics/schematic/files/package.json b/packages/schematics/schematics/schematic/files/package.json
index c86db01466d8..6ca0bf9d670e 100644
--- a/packages/schematics/schematics/schematic/files/package.json
+++ b/packages/schematics/schematics/schematic/files/package.json
@@ -4,7 +4,7 @@
   "description": "A schematics",
   "scripts": {
     "build": "tsc -p tsconfig.json",
-    "test": "npm run build && jasmine **/*_spec.js"
+    "test": "npm run build && jasmine src/**/*_spec.js"
   },
   "keywords": [
     "schematics"

From 0b4f3c10e8f3f7692ce936da8f1cac19adb1d118 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 16 Oct 2018 11:26:52 +0200
Subject: [PATCH 0347/1703] fix(@angular-devkit/schematics-cli): inconsistency
 in referencing collection

Fixes #12600
---
 .../schematics_cli/bin/schematics.ts          | 25 +++++++--------
 .../e2e/tests/schematics_cli/basic.ts         | 31 +++++++++++++++++++
 2 files changed, 42 insertions(+), 14 deletions(-)
 create mode 100644 tests/legacy-cli/e2e/tests/schematics_cli/basic.ts

diff --git a/packages/angular_devkit/schematics_cli/bin/schematics.ts b/packages/angular_devkit/schematics_cli/bin/schematics.ts
index f0aa2691e2d1..183ec79b3742 100644
--- a/packages/angular_devkit/schematics_cli/bin/schematics.ts
+++ b/packages/angular_devkit/schematics_cli/bin/schematics.ts
@@ -23,11 +23,7 @@ import {
   SchematicEngine,
   UnsuccessfulWorkflowExecution,
 } from '@angular-devkit/schematics';
-import {
-  FileSystemEngineHost,
-  NodeModulesEngineHost,
-  NodeWorkflow,
-} from '@angular-devkit/schematics/tools';
+import { NodeModulesEngineHost, NodeWorkflow } from '@angular-devkit/schematics/tools';
 import * as minimist from 'minimist';
 
 
@@ -73,7 +69,6 @@ export async function main({
 
   /** Create the DevKit Logger used through the CLI. */
   const logger = createConsoleLogger(argv['verbose'], stdout, stderr);
-
   if (argv.help) {
     logger.info(getUsage());
 
@@ -87,16 +82,18 @@ export async function main({
   } = parseSchematicName(argv._.shift() || null);
   const isLocalCollection = collectionName.startsWith('.') || collectionName.startsWith('/');
 
-
   /** If the user wants to list schematics, we simply show all the schematic names. */
   if (argv['list-schematics']) {
-    const engineHost = isLocalCollection
-      ? new FileSystemEngineHost(normalize(process.cwd()))
-      : new NodeModulesEngineHost();
-
-    const engine = new SchematicEngine(engineHost);
-    const collection = engine.createCollection(collectionName);
-    logger.info(engine.listSchematicNames(collection).join('\n'));
+    try {
+      const engineHost = new NodeModulesEngineHost();
+      const engine = new SchematicEngine(engineHost);
+      const collection = engine.createCollection(collectionName);
+      logger.info(engine.listSchematicNames(collection).join('\n'));
+    } catch (error) {
+      logger.fatal(error.message);
+
+      return 1;
+    }
 
     return 0;
   }
diff --git a/tests/legacy-cli/e2e/tests/schematics_cli/basic.ts b/tests/legacy-cli/e2e/tests/schematics_cli/basic.ts
new file mode 100644
index 000000000000..45e2aed81115
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/schematics_cli/basic.ts
@@ -0,0 +1,31 @@
+import * as path from 'path';
+import { getGlobalVariable } from '../../utils/env';
+import { exec, execAndWaitForOutputToMatch, silentNpm } from '../../utils/process';
+
+const packages = require('../../../../../lib/packages').packages;
+
+export default async function () {
+  // setup
+  const argv = getGlobalVariable('argv');
+  if (argv.noglobal) {
+    return;
+  }
+
+  const startCwd = process.cwd();
+  await silentNpm('install', '-g', packages['@angular-devkit/schematics-cli'].tar, '--unsafe-perm');
+  await exec(process.platform.startsWith('win') ? 'where' : 'which', 'schematics');
+
+  // create blank schematic
+  await exec('schematics', 'schematic', '--name', 'test-schematic');
+
+  process.chdir(path.join(startCwd, 'test-schematic'));
+  await execAndWaitForOutputToMatch(
+    'schematics',
+    ['.:', '--list-schematics'],
+    /my-full-schematic/,
+  );
+
+  // restore path
+  process.chdir(startCwd);
+
+}

From 515553f0dcab81f0905f896c8c1b9b6f1d6c8db7 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 17 Oct 2018 09:19:17 +0200
Subject: [PATCH 0348/1703] fix(@schematics/angular): module is not being
 located correctly when using `flat`

Fixes #12614
---
 packages/schematics/angular/utility/find-module.ts      | 3 +--
 packages/schematics/angular/utility/find-module_spec.ts | 9 +++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/utility/find-module.ts b/packages/schematics/angular/utility/find-module.ts
index 32eb6645d86a..4d439a99aebf 100644
--- a/packages/schematics/angular/utility/find-module.ts
+++ b/packages/schematics/angular/utility/find-module.ts
@@ -44,8 +44,7 @@ export function findModuleFromOptions(host: Tree, options: ModuleOptions): Path
 
   if (!options.module) {
     options.nameFormatter = options.nameFormatter || strings.dasherize;
-    const pathToCheck = (options.path || '')
-      + (options.flat ? '' : '/' + options.nameFormatter(options.name));
+    const pathToCheck = (options.path || '') + '/' + options.nameFormatter(options.name);
 
     return normalize(findModule(host, pathToCheck, moduleExt, routingModuleExt));
   } else {
diff --git a/packages/schematics/angular/utility/find-module_spec.ts b/packages/schematics/angular/utility/find-module_spec.ts
index 70e1034445d4..643eda8324de 100644
--- a/packages/schematics/angular/utility/find-module_spec.ts
+++ b/packages/schematics/angular/utility/find-module_spec.ts
@@ -119,6 +119,15 @@ describe('find-module', () => {
       expect(modPath).toEqual('/projects/my-proj/src/app_test.module.ts' as Path);
     });
 
+    it('should find a module if flat is true', () => {
+      tree.create('/projects/my-proj/src/module/app_test.module.ts', '');
+      options.path = '/projects/my-proj/src';
+      options.flat = true;
+      options.name = '/module/directive';
+      const modPath = findModuleFromOptions(tree, options);
+      expect(modPath).toEqual('/projects/my-proj/src/module/app_test.module.ts' as Path);
+    });
+
     it('should find a module in a sub dir', () => {
       tree.create('/projects/my-proj/src/admin/foo.module.ts', '');
       options.name = 'other/test';

From 22dc791d963b4c158be3669e81fd4b19bb926288 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 19 Oct 2018 18:04:17 +0200
Subject: [PATCH 0349/1703] fix(@angular-devkit/build-angular): error when
 using protocol-relative url

Fixes #12648
---
 .../plugins/postcss-cli-resources.ts          |  7 ++++---
 .../test/browser/styles_spec_large.ts         | 21 +++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts
index b97e1184f050..0a5816ad0925 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts
@@ -54,10 +54,11 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
   const dedupeSlashes = (url: string) => url.replace(/\/\/+/g, '/');
 
   const process = async (inputUrl: string, context: string, resourceCache: Map<string, string>) => {
-    // If root-relative or absolute, leave as is
-    if (inputUrl.match(/^(?:\w+:\/\/|data:|chrome:|#)/)) {
+    // If root-relative, absolute or protocol relative url, leave as is
+    if (/^((?:\w+:)?\/\/|data:|chrome:|#)/.test(inputUrl)) {
       return inputUrl;
     }
+
     // If starts with a caret, remove and return remainder
     // this supports bypassing asset processing
     if (inputUrl.startsWith('^')) {
@@ -74,7 +75,7 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
       inputUrl = inputUrl.substr(1);
     }
 
-    if (inputUrl.startsWith('/') && !inputUrl.startsWith('//')) {
+    if (inputUrl.startsWith('/')) {
       let outputUrl = '';
       if (deployUrl.match(/:\/\//) || deployUrl.startsWith('/')) {
         // If deployUrl is absolute or root relative, ignore baseHref & use deployUrl as is.
diff --git a/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
index 4f76dae06977..d22d251e84fa 100644
--- a/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
@@ -503,4 +503,25 @@ describe('Browser Builder styles', () => {
       tap((buildEvent) => expect(buildEvent.success).toBe(true)),
     ).toPromise().then(done, done.fail);
   });
+
+  it('supports Protocol-relative Url', (done) => {
+    host.writeMultipleFiles({
+      'src/styles.css': `
+        body {
+          background-image: url('//cdn.com/classic-bg.jpg');
+        }
+      `,
+    });
+
+    const overrides = { extractCss: true, optimization: true };
+    runTargetSpec(host, browserTargetSpec, overrides).pipe(
+      tap((buildEvent) => {
+        expect(buildEvent.success).toBe(true);
+
+        const filePath = './dist/styles.css';
+        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(filePath)));
+        expect(content).toContain('background-image:url(//cdn.com/classic-bg.jpg)');
+      }),
+    ).toPromise().then(done, done.fail);
+  });
 });

From a6f80e4fe7adb86afd704605133f05eb69bb7198 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 23 Oct 2018 14:59:16 -0400
Subject: [PATCH 0350/1703] Various QoL with TSLint and Docs (#12655)

* docs: add README files to all root folders

Except benchmark and tools.

* refactor: move rules/ directory to etc/

And fix a linting error that was found while updating tslint usage

* ci: lint errors out if TSLint shows a warning

This is not a warning from the code itself, but from TSLint. For example,
if a rule was missing, TSLint will just ignore the rule, show something on
STDOUT and not fail.

This fixes CI where local rules were missing for unknown reasons. It will
now fail CI when that happens, which is the correct behaviour.
---
 bin/README.md                                 | 17 ++++++++++
 docs/README.md                                | 25 ++++++++++++++
 etc/README.md                                 |  3 ++
 etc/rules/README.md                           |  3 ++
 {rules => etc/rules}/Rule.ts                  |  0
 {rules => etc/rules}/defocusRule.ts           |  0
 {rules => etc/rules}/importGroupsRule.ts      |  0
 .../rules}/noGlobalTslintDisableRule.ts       |  0
 {rules => etc/rules}/singleEofLineRule.ts     |  0
 {rules => etc/rules}/tsconfig.json            |  2 +-
 lib/README.md                                 | 16 +++++++++
 packages/README.md                            |  9 +++++
 .../webpack/src/type_checker_messages.ts      |  1 -
 scripts/lint.ts                               | 34 ++++++++++++++++---
 tests/README.md                               | 11 ++++++
 tsconfig.json                                 |  1 +
 tslint.json                                   |  5 ++-
 17 files changed, 118 insertions(+), 9 deletions(-)
 create mode 100644 bin/README.md
 create mode 100644 docs/README.md
 create mode 100644 etc/README.md
 create mode 100644 etc/rules/README.md
 rename {rules => etc/rules}/Rule.ts (100%)
 rename {rules => etc/rules}/defocusRule.ts (100%)
 rename {rules => etc/rules}/importGroupsRule.ts (100%)
 rename {rules => etc/rules}/noGlobalTslintDisableRule.ts (100%)
 rename {rules => etc/rules}/singleEofLineRule.ts (100%)
 rename {rules => etc/rules}/tsconfig.json (85%)
 create mode 100644 lib/README.md
 create mode 100644 packages/README.md
 create mode 100644 tests/README.md

diff --git a/bin/README.md b/bin/README.md
new file mode 100644
index 000000000000..6f3d6c17fbd2
--- /dev/null
+++ b/bin/README.md
@@ -0,0 +1,17 @@
+# `/bin` Folder
+
+This folder includes binaries that are linked when globally linking this repository.
+
+Each file in this directory follows this pattern:
+
+1. JavaScript only.
+1. Requires `../lib/bootstrap-local.js` to bootstrap TypeScript and Node integration.
+1. Requires `../lib/packages` and use the package metadata to find the binary script for the 
+package the script is bootstrapping.
+1. Call out main, or simply require the file if it has no export.
+
+`devkit-admin` does not follow this pattern as it needs to setup logging and run some localized 
+logic.
+
+In order to add a new script, you should make sure it's in the root `package.json`, so people
+linking this repo get a reference to the script.
diff --git a/docs/README.md b/docs/README.md
new file mode 100644
index 000000000000..6fdee803e80c
--- /dev/null
+++ b/docs/README.md
@@ -0,0 +1,25 @@
+# `/docs` Folder
+
+This folder is used for all documentation. It contains a number of subfolders with short 
+descriptions here.
+
+## `/docs/design`
+
+Design documents on GitHub, in Markdown format. The number of design documents available is limited.
+
+## `/docs/documentation`
+
+THIS FOLDER IS DEPRECATED AND SHOULD NOT BE UPDATED ANYMORE. Documentation is now available on
+angular.io and can be updated on the main [angular/angular](https://github.com/angular/angular)
+repo.
+
+Markdown files used to publish to the [GitHub Wiki](https://github.com/angular/angular-cli/wiki).
+
+## `/docs/process`
+
+Description of various caretaker and workflow processes.
+
+## `/docs/specifications`
+
+Specifications for support of Angular CLI features. These are meant to be read directly on GitHub
+by developers of libraries who want to integrate with the Angular CLI.
diff --git a/etc/README.md b/etc/README.md
new file mode 100644
index 000000000000..b0c2447c9b1d
--- /dev/null
+++ b/etc/README.md
@@ -0,0 +1,3 @@
+# `/etc` Folder
+
+This folder is for files that doesn't fit in other directories in the root folder.
diff --git a/etc/rules/README.md b/etc/rules/README.md
new file mode 100644
index 000000000000..616923160a2b
--- /dev/null
+++ b/etc/rules/README.md
@@ -0,0 +1,3 @@
+# TsLint Rules
+
+This folder contains custom TsLint rules specific to this repository.
diff --git a/rules/Rule.ts b/etc/rules/Rule.ts
similarity index 100%
rename from rules/Rule.ts
rename to etc/rules/Rule.ts
diff --git a/rules/defocusRule.ts b/etc/rules/defocusRule.ts
similarity index 100%
rename from rules/defocusRule.ts
rename to etc/rules/defocusRule.ts
diff --git a/rules/importGroupsRule.ts b/etc/rules/importGroupsRule.ts
similarity index 100%
rename from rules/importGroupsRule.ts
rename to etc/rules/importGroupsRule.ts
diff --git a/rules/noGlobalTslintDisableRule.ts b/etc/rules/noGlobalTslintDisableRule.ts
similarity index 100%
rename from rules/noGlobalTslintDisableRule.ts
rename to etc/rules/noGlobalTslintDisableRule.ts
diff --git a/rules/singleEofLineRule.ts b/etc/rules/singleEofLineRule.ts
similarity index 100%
rename from rules/singleEofLineRule.ts
rename to etc/rules/singleEofLineRule.ts
diff --git a/rules/tsconfig.json b/etc/rules/tsconfig.json
similarity index 85%
rename from rules/tsconfig.json
rename to etc/rules/tsconfig.json
index 5fc61e6f1025..dce8cbca6f6f 100644
--- a/rules/tsconfig.json
+++ b/etc/rules/tsconfig.json
@@ -3,7 +3,7 @@
   // things faster.
   "extends": "../tsconfig.json",
   "compilerOptions": {
-    "outDir": "../dist/rules",
+    "outDir": "../../dist/etc/rules",
     "baseUrl": ""
   },
   "exclude": [
diff --git a/lib/README.md b/lib/README.md
new file mode 100644
index 000000000000..bcb80b40bd17
--- /dev/null
+++ b/lib/README.md
@@ -0,0 +1,16 @@
+# `/lib` Folder
+
+This folder includes bootstrap code for the various tools included in this repository. Also 
+included is the packages meta-information package in `packages.ts`. This is used to read and 
+understand all the monorepo information (contained in the `.monorepo.json` file, and `package.json` 
+files across the repo).
+
+`bootstrap-local.js` should be included when running files from this repository without compiling
+first. It allows for compiling and loading packages in memory directly from the repo. Not only 
+does the `devkit-admin` scripts use this to include the library, but also all binaries linked 
+locally (like `schematics` and `ng`), when not using the npm published packages. 
+
+`istanbul-local.js` adds global hooks and information to be able to use code coverage with
+`bootstrap-local.js`. Istanbul does not keep the sourcemaps properly in sync if they're available
+in the code, which happens locally when transpiling TypeScript. It is currently used by the 
+`test` script and is included by `bootstrap-local.js` for integration.
diff --git a/packages/README.md b/packages/README.md
new file mode 100644
index 000000000000..82160f26a4f6
--- /dev/null
+++ b/packages/README.md
@@ -0,0 +1,9 @@
+# `/packages` Folder
+
+This folder is the root of all defined packages in this repository.
+
+Packages that are marked as `private: true` will not be published to NPM. These are limited to the
+`_` subfolder.
+
+This folder includes a directory for every scope in NPM, without the `@` sign. Then one folder 
+per package, which contains the `package.json`.
diff --git a/packages/ngtools/webpack/src/type_checker_messages.ts b/packages/ngtools/webpack/src/type_checker_messages.ts
index 4fc0a65c9ba7..d42c0492d6c0 100644
--- a/packages/ngtools/webpack/src/type_checker_messages.ts
+++ b/packages/ngtools/webpack/src/type_checker_messages.ts
@@ -42,4 +42,3 @@ export class LogMessage extends TypeCheckerMessage {
     super(MESSAGE_KIND.Log);
   }
 }
-
diff --git a/scripts/lint.ts b/scripts/lint.ts
index 1b7339385b2b..448325b7cab0 100644
--- a/scripts/lint.ts
+++ b/scripts/lint.ts
@@ -20,7 +20,7 @@ const blacklist = [
 
 
 function _buildRules(logger: logging.Logger) {
-  const tsConfigPath = path.join(__dirname, '../rules/tsconfig.json');
+  const tsConfigPath = path.join(__dirname, '../etc/rules/tsconfig.json');
   const configFile = ts.readConfigFile(tsConfigPath, ts.sys.readFile);
 
   const parsedTsConfig = ts.parseJsonConfigFileContent(
@@ -43,7 +43,7 @@ function _buildRules(logger: logging.Logger) {
 }
 
 
-export default function (options: ParsedArgs, logger: logging.Logger) {
+export default async function (options: ParsedArgs, logger: logging.Logger) {
   _buildRules(logger);
 
   const lintOptions: ILinterOptions = {
@@ -55,6 +55,22 @@ export default function (options: ParsedArgs, logger: logging.Logger) {
   const tsLintPath = path.join(__dirname, '../tslint.json');
   const tsLintConfig = Configuration.loadConfigurationFromPath(tsLintPath);
 
+  // Remove comments from the configuration, ie. keys that starts with "//".
+  [...tsLintConfig.rules.keys()]
+    .filter(x => x.startsWith('//'))
+    .forEach(key => tsLintConfig.rules.delete(key));
+
+  // Console is used directly by tslint, and when finding a rule that doesn't exist it's considered
+  // a warning by TSLint but _only_ shown on the console and impossible to see through the API.
+  // In order to see any warnings that happen from TSLint itself, we hook into console.warn() and
+  // record any calls.
+  const oldWarn = console.warn;
+  let warnings = false;
+  console.warn = (...args) => {
+    warnings = true;
+    oldWarn(...args);
+  };
+
   program.getRootFileNames().forEach(fileName => {
     if (blacklist.some(x => x.test(path.relative(process.cwd(), fileName)))) {
       return;
@@ -63,6 +79,8 @@ export default function (options: ParsedArgs, logger: logging.Logger) {
     linter.lint(fileName, ts.sys.readFile(fileName) || '', tsLintConfig);
   });
 
+  console.warn = oldWarn;
+
   const result = linter.getResult();
   const Formatter = findFormatter('codeFrame');
   if (!Formatter) {
@@ -76,10 +94,18 @@ export default function (options: ParsedArgs, logger: logging.Logger) {
     if (result.warningCount > 0) {
       logger.info(`Warnings: ${result.warningCount}`);
     }
-    process.exit(2);
+
+    return 2;
   } else if (result.warningCount > 0) {
     logger.warn(formatter.format(result.failures));
     logger.info(`Warnings: ${result.warningCount}`);
-    process.exit(1);
+
+    return 1;
+  } else if (warnings) {
+    logger.warn('TSLint found warnings, but code is okay. See above.');
+
+    return 1;
   }
+
+  return 0;
 }
diff --git a/tests/README.md b/tests/README.md
new file mode 100644
index 000000000000..e507add2cea7
--- /dev/null
+++ b/tests/README.md
@@ -0,0 +1,11 @@
+# `/tests` Folder
+
+Contains all e2e tests and test assets.
+
+## `legacy-cli/`
+
+Contains all assets and all e2e tests from the legacy CLI repo.
+
+## Others
+
+Other folders contain test assets related to the Package namespace folders matching their name.
diff --git a/tsconfig.json b/tsconfig.json
index 07f9204ad3cf..0feb64602a6c 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -64,6 +64,7 @@
   "exclude": [
     "bazel-*/**/*",
     "dist/**/*",
+    "etc/cli.angular.io",
     "node_modules/**/*",
     "packages/_/devkit/**/*files/**/*",
     "packages/schematics/*/*/*files/**/*",
diff --git a/tslint.json b/tslint.json
index 2957023b87ff..8f30ca45f5a1 100644
--- a/tslint.json
+++ b/tslint.json
@@ -6,12 +6,12 @@
     "tslint-no-circular-imports"
   ],
   "rulesDirectory": [
-    "dist/rules",
+    "dist/etc/rules",
     "node_modules/tslint-sonarts/lib/rules"
   ],
   "rules": {
     "//03": "==================================================================================================",
-    "//04": "custom rules defined in dist/rules/**",
+    "//04": "custom rules defined in etc/rules/**",
     "defocus": true,
     "import-groups": true,
     "no-global-tslint-disable": true,
@@ -86,7 +86,6 @@
     "no-internal-module": true,
     "no-trailing-whitespace": true,
     "no-unused-expression": true,
-    "no-unused-variable": [true, {"ignore-pattern": "^_"}],
     "no-var-keyword": true,
     "one-line": [
       true,

From 0dc4c40dd3cdf0a56797ee32fe7be9e2b8b0897b Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 22 Oct 2018 16:07:40 +0200
Subject: [PATCH 0351/1703] fix(@angular/cli): multiline help descriptions are
 not aligned

---
 packages/angular/cli/models/command.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/angular/cli/models/command.ts b/packages/angular/cli/models/command.ts
index da2079c149ea..50cba31e63f3 100644
--- a/packages/angular/cli/models/command.ts
+++ b/packages/angular/cli/models/command.ts
@@ -85,12 +85,15 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
     const args = options.filter(opt => opt.positional !== undefined);
     const opts = options.filter(opt => opt.positional === undefined);
 
+    const formatDescription = (description: string) =>
+      `    ${description.replace(/\n/g, '\n    ')}`;
+
     if (args.length > 0) {
       this.logger.info(`arguments:`);
       args.forEach(o => {
         this.logger.info(`  ${terminal.cyan(o.name)}`);
         if (o.description) {
-          this.logger.info(`    ${o.description}`);
+          this.logger.info(formatDescription(o.description));
         }
       });
     }
@@ -108,7 +111,7 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
             : '';
           this.logger.info(`  ${terminal.cyan('--' + strings.dasherize(o.name))} ${aliases}`);
           if (o.description) {
-            this.logger.info(`    ${o.description}`);
+            this.logger.info(formatDescription(o.description));
           }
         });
     }

From d3395bed76bb042d9884075912ddfd8f533678d1 Mon Sep 17 00:00:00 2001
From: Jeffrey Bosch <jefiozie.bosch@gmail.com>
Date: Mon, 22 Oct 2018 12:44:17 +0200
Subject: [PATCH 0352/1703] fix(@angular-devkit/build-angular): update
 license-webpack-plugin

Closes #12649
---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 421fdd96a400..8ef702747aff 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -23,7 +23,7 @@
     "karma-source-map-support": "1.3.0",
     "less": "3.8.1",
     "less-loader": "4.1.0",
-    "license-webpack-plugin": "2.0.1",
+    "license-webpack-plugin": "2.0.2",
     "loader-utils": "1.1.0",
     "mini-css-extract-plugin": "0.4.3",
     "minimatch": "3.0.4",
diff --git a/yarn.lock b/yarn.lock
index f06f2662611a..1d2765b5e8a0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5144,10 +5144,10 @@ license-checker@^20.1.0:
     strip-ansi "^4.0.0"
     treeify "^1.1.0"
 
-license-webpack-plugin@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.0.1.tgz#d8d24d0d0db70d328ec911ae728719b842260078"
-  integrity sha512-XUSJoU+M2w/N5ZdzHm++mFSM2BVKAdnSORXF7nbkpBJVdfi3hiiMpNdiuUR7S4OvsceiXQp1yoBwhiAP+gtC2g==
+license-webpack-plugin@2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.0.2.tgz#9d34b521cb7fca8527945310b05be6ef0248b687"
+  integrity sha512-GsomZw5VoT20ST8qH2tOjBgbyhn6Pgs9M94g0mbvfBIV1VXufm1iKY+4dbgfTObj1Mp6nSRE3Zf74deOZr0KwA==
   dependencies:
     webpack-sources "^1.2.0"
 

From e08a6f4e98f9f449603b168f01eb968cd1fae438 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 23 Oct 2018 12:16:32 +0200
Subject: [PATCH 0353/1703] docs: update cli readme for version 7

---
 packages/angular/cli/README.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/angular/cli/README.md b/packages/angular/cli/README.md
index ec1841a7bacc..ba394eabc9b0 100644
--- a/packages/angular/cli/README.md
+++ b/packages/angular/cli/README.md
@@ -106,15 +106,15 @@ You can find all possible blueprints in the table below:
 
 Scaffold  | Usage
 ---       | ---
-[Component](https://github.com/angular/angular-cli/wiki/generate-component) | `ng g component my-new-component`
-[Directive](https://github.com/angular/angular-cli/wiki/generate-directive) | `ng g directive my-new-directive`
-[Pipe](https://github.com/angular/angular-cli/wiki/generate-pipe)           | `ng g pipe my-new-pipe`
-[Service](https://github.com/angular/angular-cli/wiki/generate-service)     | `ng g service my-new-service`
-[Class](https://github.com/angular/angular-cli/wiki/generate-class)         | `ng g class my-new-class`
-[Guard](https://github.com/angular/angular-cli/wiki/generate-guard)         | `ng g guard my-new-guard`
-[Interface](https://github.com/angular/angular-cli/wiki/generate-interface) | `ng g interface my-new-interface`
-[Enum](https://github.com/angular/angular-cli/wiki/generate-enum)           | `ng g enum my-new-enum`
-[Module](https://github.com/angular/angular-cli/wiki/generate-module)       | `ng g module my-module`
+[Component](https://angular.io/cli/generate#component)      | `ng g component my-new-component`
+[Directive](https://angular.io/cli/generate#directive)      | `ng g directive my-new-directive`
+[Pipe](https://angular.io/cli/generate#pipe)                | `ng g pipe my-new-pipe`
+[Service](https://angular.io/cli/generate#service)          | `ng g service my-new-service`
+[Class](https://angular.io/cli/generate#class)              | `ng g class my-new-class`
+[Guard](https://angular.io/cli/generate#guard)              | `ng g guard my-new-guard`
+[Interface](https://angular.io/cli/generate#interface)      | `ng g interface my-new-interface`
+[Enum](https://angular.io/cli/generate#enum)                | `ng g enum my-new-enum`
+[Module](https://angular.io/cli/generate#module)            | `ng g module my-module`
 
 
 
@@ -228,7 +228,7 @@ For more informations about Node.js debugging in VS Code, see the related [VS Co
 
 ### CPU Profiling
 
-In order to investigate performance issues, CPU profiling is often usefull.
+In order to investigate performance issues, CPU profiling is often useful.
 
 To capture a CPU profiling, you can:
 1. install the v8-profiler-node8 dependency: `npm install v8-profiler-node8 --no-save`
@@ -250,7 +250,7 @@ In addition to this one, another, more elaborated way to capture a CPU profile u
 
 ## Documentation
 
-The documentation for the Angular CLI is located in this repo's [wiki](https://github.com/angular/angular-cli/wiki).
+The documentation for the Angular CLI is located in this repo's [wiki](https://angular.io/cli).
 
 ## License
 

From 9f114aee1e009c3580784dd3bb7299bdf4a5918c Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 22 Oct 2018 16:17:50 -0400
Subject: [PATCH 0354/1703] refactor(@angular-devkit/build-angular):
 cleanup/fix linting of webpack configs

---
 .../models/webpack-configs/browser.ts         | 37 ++++------
 .../models/webpack-configs/common.ts          | 70 ++++++++-----------
 .../models/webpack-configs/index.ts           |  3 -
 .../models/webpack-configs/server.ts          | 12 ++--
 4 files changed, 51 insertions(+), 71 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
index aa5483b6bb1a..27c22ce0309b 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
@@ -5,27 +5,19 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable
-// TODO: cleanup this file, it's copied as is from Angular CLI.
-
-import * as path from 'path';
-const SubresourceIntegrityPlugin = require('webpack-subresource-integrity');
 import { LicenseWebpackPlugin } from 'license-webpack-plugin';
-import { generateEntryPoints } from '../../utilities/package-chunk-sort';
+import * as path from 'path';
 import { IndexHtmlWebpackPlugin } from '../../plugins/index-html-webpack-plugin';
+import { generateEntryPoints } from '../../utilities/package-chunk-sort';
 import { WebpackConfigOptions } from '../build-options';
 import { normalizeExtraEntryPoints } from './utils';
 
-/**
-+ * license-webpack-plugin has a peer dependency on webpack-sources, list it in a comment to
-+ * let the dependency validator know it is used.
-+ *
-+ * require('webpack-sources')
-+ */
+const SubresourceIntegrityPlugin = require('webpack-subresource-integrity');
+
 
 export function getBrowserConfig(wco: WebpackConfigOptions) {
   const { root, buildOptions } = wco;
-  let extraPlugins: any[] = [];
+  const extraPlugins = [];
 
   let sourcemaps: string | false = false;
   if (buildOptions.sourceMap) {
@@ -52,7 +44,7 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
 
   if (buildOptions.subresourceIntegrity) {
     extraPlugins.push(new SubresourceIntegrityPlugin({
-      hashFuncNames: ['sha384']
+      hashFuncNames: ['sha384'],
     }));
   }
 
@@ -60,10 +52,10 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
     extraPlugins.push(new LicenseWebpackPlugin({
       stats: {
         warnings: false,
-        errors: false
+        errors: false,
       },
       perChunkOutput: false,
-      outputFilename: `3rdpartylicenses.txt`
+      outputFilename: `3rdpartylicenses.txt`,
     }));
   }
 
@@ -75,11 +67,11 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
     resolve: {
       mainFields: [
         ...(wco.supportES2015 ? ['es2015'] : []),
-        'browser', 'module', 'main'
-      ]
+        'browser', 'module', 'main',
+      ],
     },
     output: {
-      crossOriginLoading: buildOptions.subresourceIntegrity ? 'anonymous' : false
+      crossOriginLoading: buildOptions.subresourceIntegrity ? 'anonymous' : false,
     },
     optimization: {
       runtimeChunk: 'single',
@@ -103,15 +95,16 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
             name: 'vendor',
             chunks: 'initial',
             enforce: true,
-            test: (module: any, chunks: Array<{ name: string }>) => {
+            test: (module: { nameForCondition?: Function }, chunks: Array<{ name: string }>) => {
               const moduleName = module.nameForCondition ? module.nameForCondition() : '';
+
               return /[\\/]node_modules[\\/]/.test(moduleName)
                 && !chunks.some(({ name }) => name === 'polyfills'
                   || globalStylesBundleNames.includes(name));
             },
           },
-        }
-      }
+        },
+      },
     },
     plugins: extraPlugins,
     node: false,
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 803b5f3a78b6..699dafdbf688 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -5,54 +5,43 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable
-// TODO: cleanup this file, it's copied as is from Angular CLI.
-
+import * as CopyWebpackPlugin from 'copy-webpack-plugin';
 import * as path from 'path';
 import { HashedModuleIdsPlugin, debug } from 'webpack';
-import * as CopyWebpackPlugin from 'copy-webpack-plugin';
-import { getOutputHashFormat } from './utils';
-import { isDirectory } from '../../utilities/is-directory';
-import { requireProjectModule } from '../../utilities/require-project-module';
-import { WebpackConfigOptions } from '../build-options';
+import { AssetPatternObject } from '../../../browser/schema';
 import { BundleBudgetPlugin } from '../../plugins/bundle-budget';
 import { CleanCssWebpackPlugin } from '../../plugins/cleancss-webpack-plugin';
 import { ScriptsWebpackPlugin } from '../../plugins/scripts-webpack-plugin';
 import { findUp } from '../../utilities/find-up';
-import { AssetPatternObject } from '../../../browser/schema';
-import { normalizeExtraEntryPoints } from './utils';
+import { isDirectory } from '../../utilities/is-directory';
+import { requireProjectModule } from '../../utilities/require-project-module';
+import { WebpackConfigOptions } from '../build-options';
+import { getOutputHashFormat, normalizeExtraEntryPoints } from './utils';
 
 const ProgressPlugin = require('webpack/lib/ProgressPlugin');
 const CircularDependencyPlugin = require('circular-dependency-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
 const StatsPlugin = require('stats-webpack-plugin');
 
-/**
- * Enumerate loaders and their dependencies from this file to let the dependency validator
- * know they are used.
- *
- * require('source-map-loader')
- * require('raw-loader')
- * require('url-loader')
- * require('file-loader')
- * require('@angular-devkit/build-optimizer')
- */
 
+// tslint:disable-next-line:no-any
 const g: any = typeof global !== 'undefined' ? global : {};
 export const buildOptimizerLoader: string = g['_DevKitIsLocal']
   ? require.resolve('@angular-devkit/build-optimizer/src/build-optimizer/webpack-loader')
   : '@angular-devkit/build-optimizer/webpack-loader';
 
+// tslint:disable-next-line:no-big-function
 export function getCommonConfig(wco: WebpackConfigOptions) {
   const { root, projectRoot, buildOptions } = wco;
 
   const nodeModules = findUp('node_modules', projectRoot);
   if (!nodeModules) {
-    throw new Error('Cannot locate node_modules directory.')
+    throw new Error('Cannot locate node_modules directory.');
   }
 
-  let extraPlugins: any[] = [];
-  let entryPoints: { [key: string]: string[] } = {};
+  // tslint:disable-next-line:no-any
+  const extraPlugins: any[] = [];
+  const entryPoints: { [key: string]: string[] } = {};
 
   if (buildOptions.main) {
     entryPoints['main'] = [path.resolve(root, buildOptions.main)];
@@ -72,11 +61,11 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
   if (buildOptions.profile) {
     extraPlugins.push(new debug.ProfilingPlugin({
       outputPath: path.resolve(root, 'chrome-profiler-events.json'),
-    }))
+    }));
   }
 
   // determine hashing format
-  const hashFormat = getOutputHashFormat(buildOptions.outputHashing as any);
+  const hashFormat = getOutputHashFormat(buildOptions.outputHashing || 'none');
 
   // process global scripts
   if (buildOptions.scripts.length > 0) {
@@ -84,7 +73,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
       .reduce((prev: { bundleName: string, paths: string[], lazy: boolean }[], curr) => {
         const bundleName = curr.bundleName;
         const resolvedPath = path.resolve(root, curr.input);
-        let existingEntry = prev.find((el) => el.bundleName === bundleName);
+        const existingEntry = prev.find((el) => el.bundleName === bundleName);
         if (existingEntry) {
           if (existingEntry.lazy && !curr.lazy) {
             // All entries have to be lazy for the bundle to be lazy.
@@ -97,9 +86,10 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
           prev.push({
             bundleName,
             paths: [resolvedPath],
-            lazy: curr.lazy
+            lazy: curr.lazy,
           });
         }
+
         return prev;
       }, []);
 
@@ -141,8 +131,8 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
         ignore: asset.ignore,
         from: {
           glob: asset.glob,
-          dot: true
-        }
+          dot: true,
+        },
       };
     });
 
@@ -159,7 +149,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
 
   if (buildOptions.showCircularDependencies) {
     extraPlugins.push(new CircularDependencyPlugin({
-      exclude: /[\\\/]node_modules[\\\/]/
+      exclude: /[\\\/]node_modules[\\\/]/,
     }));
   }
 
@@ -172,10 +162,10 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
     sourceMapUseRule = {
       use: [
         {
-          loader: 'source-map-loader'
-        }
-      ]
-    }
+          loader: 'source-map-loader',
+        },
+      ],
+    };
   }
 
   let buildOptimizerUseRule;
@@ -184,7 +174,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
       use: [
         {
           loader: buildOptimizerLoader,
-          options: { sourceMap: buildOptions.sourceMap }
+          options: { sourceMap: buildOptions.sourceMap },
         },
       ],
     };
@@ -253,10 +243,10 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
         wco.tsConfig.options.baseUrl || projectRoot,
         'node_modules',
       ],
-      alias
+      alias,
     },
     resolveLoader: {
-      modules: loaderNodeModules
+      modules: loaderNodeModules,
     },
     context: projectRoot,
     entry: entryPoints,
@@ -267,7 +257,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
     },
     watch: buildOptions.watch,
     watchOptions: {
-      poll: buildOptions.poll
+      poll: buildOptions.poll,
     },
     performance: {
       hints: false,
@@ -280,7 +270,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
           loader: 'file-loader',
           options: {
             name: `[name]${hashFormat.file}.[ext]`,
-          }
+          },
         },
         {
           // Mark files inside `@angular/core` as using SystemJS style dynamic imports.
@@ -298,7 +288,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
           enforce: 'pre',
           ...sourceMapUseRule,
         },
-      ]
+      ],
     },
     optimization: {
       noEmitOnErrors: true,
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/index.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/index.ts
index bbcc83372f2e..1ec5c1a271bf 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/index.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/index.ts
@@ -5,9 +5,6 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable
-// TODO: cleanup this file, it's copied as is from Angular CLI.
-
 export * from './browser';
 export * from './common';
 export * from './server';
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts
index 418f400749fa..ee12c70ed2b4 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts
@@ -5,18 +5,17 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable
-// TODO: cleanup this file, it's copied as is from Angular CLI.
-
+import { Configuration } from 'webpack';
 import { WebpackConfigOptions } from '../build-options';
 
+
 /**
  * Returns a partial specific to creating a bundle for node
  * @param wco Options which are include the build options and app config
  */
 export function getServerConfig(wco: WebpackConfigOptions) {
 
-  const config: any = {
+  const config: Configuration = {
     devtool: wco.buildOptions.sourceMap ? 'source-map' : false,
     resolve: {
       mainFields: [
@@ -26,7 +25,7 @@ export function getServerConfig(wco: WebpackConfigOptions) {
     },
     target: 'node',
     output: {
-      libraryTarget: 'commonjs'
+      libraryTarget: 'commonjs',
     },
     node: false,
   };
@@ -34,6 +33,7 @@ export function getServerConfig(wco: WebpackConfigOptions) {
   if (wco.buildOptions.bundleDependencies == 'none') {
     config.externals = [
       /^@angular/,
+      // tslint:disable-next-line:no-any
       (_: any, request: any, callback: (error?: any, result?: any) => void) => {
         // Absolute & Relative paths are not externals
         if (request.match(/^\.{0,2}\//)) {
@@ -54,7 +54,7 @@ export function getServerConfig(wco: WebpackConfigOptions) {
           // Node couldn't find it, so it must be user-aliased
           callback();
         }
-      }
+      },
     ];
   }
 

From 9ae9757048c51f715e5049dc03b9ee0395b445c1 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 23 Oct 2018 10:29:43 -0400
Subject: [PATCH 0355/1703] feat(@angular-devkit/build-angular): update webpack
 dependencies

Webpack@4.22.0
---
 .../angular_devkit/build_angular/package.json |  14 +-
 yarn.lock                                     | 395 ++++++++++--------
 2 files changed, 233 insertions(+), 176 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 8ef702747aff..498ac49eedce 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -25,7 +25,7 @@
     "less-loader": "4.1.0",
     "license-webpack-plugin": "2.0.2",
     "loader-utils": "1.1.0",
-    "mini-css-extract-plugin": "0.4.3",
+    "mini-css-extract-plugin": "0.4.4",
     "minimatch": "3.0.4",
     "parse5": "4.0.0",
     "opn": "5.3.0",
@@ -39,18 +39,18 @@
     "semver": "5.5.1",
     "source-map-support": "0.5.9",
     "source-map-loader": "0.2.4",
-    "speed-measure-webpack-plugin": "^1.2.3",
+    "speed-measure-webpack-plugin": "1.2.3",
     "stats-webpack-plugin": "0.7.0",
-    "style-loader": "0.23.0",
+    "style-loader": "0.23.1",
     "stylus": "0.54.5",
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.0",
     "terser-webpack-plugin": "1.1.0",
-    "webpack": "4.19.1",
-    "webpack-dev-middleware": "3.3.0",
-    "webpack-dev-server": "3.1.8",
+    "webpack": "4.22.0",
+    "webpack-dev-middleware": "3.4.0",
+    "webpack-dev-server": "3.1.10",
     "webpack-merge": "4.1.4",
-    "webpack-sources": "1.2.0",
+    "webpack-sources": "1.3.0",
     "webpack-subresource-integrity": "1.1.0-rc.6"
   },
   "optionalDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 1d2765b5e8a0..dce6f3949ebd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -565,151 +565,147 @@
     "@types/uglify-js" "*"
     source-map "^0.6.0"
 
-"@webassemblyjs/ast@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.6.tgz#3ef8c45b3e5e943a153a05281317474fef63e21e"
-  integrity sha512-8nkZS48EVsMUU0v6F1LCIOw4RYWLm2plMtbhFTjNgeXmsTNLuU3xTRtnljt9BFQB+iPbLRobkNrCWftWnNC7wQ==
-  dependencies:
-    "@webassemblyjs/helper-module-context" "1.7.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.6"
-    "@webassemblyjs/wast-parser" "1.7.6"
-    mamacro "^0.0.3"
-
-"@webassemblyjs/floating-point-hex-parser@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.6.tgz#7cb37d51a05c3fe09b464ae7e711d1ab3837801f"
-  integrity sha512-VBOZvaOyBSkPZdIt5VBMg3vPWxouuM13dPXGWI1cBh3oFLNcFJ8s9YA7S9l4mPI7+Q950QqOmqj06oa83hNWBA==
-
-"@webassemblyjs/helper-api-error@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.6.tgz#99b7e30e66f550a2638299a109dda84a622070ef"
-  integrity sha512-SCzhcQWHXfrfMSKcj8zHg1/kL9kb3aa5TN4plc/EREOs5Xop0ci5bdVBApbk2yfVi8aL+Ly4Qpp3/TRAUInjrg==
-
-"@webassemblyjs/helper-buffer@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.6.tgz#ba0648be12bbe560c25c997e175c2018df39ca3e"
-  integrity sha512-1/gW5NaGsEOZ02fjnFiU8/OEEXU1uVbv2um0pQ9YVL3IHSkyk6xOwokzyqqO1qDZQUAllb+V8irtClPWntbVqw==
-
-"@webassemblyjs/helper-code-frame@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.6.tgz#5a94d21b0057b69a7403fca0c253c3aaca95b1a5"
-  integrity sha512-+suMJOkSn9+vEvDvgyWyrJo5vJsWSDXZmJAjtoUq4zS4eqHyXImpktvHOZwXp1XQjO5H+YQwsBgqTQEc0J/5zg==
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.7.6"
-
-"@webassemblyjs/helper-fsm@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.6.tgz#ae1741c6f6121213c7a0b587fb964fac492d3e49"
-  integrity sha512-HCS6KN3wgxUihGBW7WFzEC/o8Eyvk0d56uazusnxXthDPnkWiMv+kGi9xXswL2cvfYfeK5yiM17z2K5BVlwypw==
-
-"@webassemblyjs/helper-module-context@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.6.tgz#116d19a51a6cebc8900ad53ca34ff8269c668c23"
-  integrity sha512-e8/6GbY7OjLM+6OsN7f2krC2qYVNaSr0B0oe4lWdmq5sL++8dYDD1TFbD1TdAdWMRTYNr/Qq7ovXWzia2EbSjw==
-  dependencies:
-    mamacro "^0.0.3"
-
-"@webassemblyjs/helper-wasm-bytecode@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.6.tgz#98e515eaee611aa6834eb5f6a7f8f5b29fefb6f1"
-  integrity sha512-PzYFCb7RjjSdAOljyvLWVqd6adAOabJW+8yRT+NWhXuf1nNZWH+igFZCUK9k7Cx7CsBbzIfXjJc7u56zZgFj9Q==
-
-"@webassemblyjs/helper-wasm-section@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.6.tgz#783835867bdd686df7a95377ab64f51a275e8333"
-  integrity sha512-3GS628ppDPSuwcYlQ7cDCGr4W2n9c4hLzvnRKeuz+lGsJSmc/ADVoYpm1ts2vlB1tGHkjtQMni+yu8mHoMlKlA==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.6"
-    "@webassemblyjs/helper-buffer" "1.7.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.6"
-    "@webassemblyjs/wasm-gen" "1.7.6"
-
-"@webassemblyjs/ieee754@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.6.tgz#c34fc058f2f831fae0632a8bb9803cf2d3462eb1"
-  integrity sha512-V4cIp0ruyw+hawUHwQLn6o2mFEw4t50tk530oKsYXQhEzKR+xNGDxs/SFFuyTO7X3NzEu4usA3w5jzhl2RYyzQ==
+"@webassemblyjs/ast@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.8.tgz#f31f480debeef957f01b623f27eabc695fa4fe8f"
+  integrity sha512-dOrtdtEyB8sInpl75yLPNksY4sRl0j/+t6aHyB/YA+ab9hV3Fo7FmG12FHzP+2MvWVAJtDb+6eXR5EZbZJ+uVg==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.7.8"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
+    "@webassemblyjs/wast-parser" "1.7.8"
+
+"@webassemblyjs/floating-point-hex-parser@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.8.tgz#1b3ed0e27e384032254e9322fc646dd3e70ef1b9"
+  integrity sha512-kn2zNKGsbql5i56VAgRYkpG+VazqHhQQZQycT2uXAazrAEDs23gy+Odkh5VblybjnwX2/BITkDtNmSO76hdIvQ==
+
+"@webassemblyjs/helper-api-error@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.8.tgz#a2b49c11f615e736f815ec927f035dcfa690d572"
+  integrity sha512-xUwxDXsd1dUKArJEP5wWM5zxgCSwZApSOJyP1XO7M8rNUChUDblcLQ4FpzTpWG2YeylMwMl1MlP5Ztryiz1x4g==
+
+"@webassemblyjs/helper-buffer@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.8.tgz#3fc66bfa09c1c60e824cf3d5887826fac062877d"
+  integrity sha512-WXiIMnuvuwlhWvVOm8xEXU9DnHaa3AgAU0ZPfvY8vO1cSsmYb2WbGbHnMLgs43vXnA7XAob9b56zuZaMkxpCBg==
+
+"@webassemblyjs/helper-code-frame@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.8.tgz#cc5a7e9522b70e7580df056dfd34020cf29645b0"
+  integrity sha512-TLQxyD9qGOIdX5LPQOPo0Ernd88U5rHkFb8WAjeMIeA0sPjCHeVPaGqUGGIXjUcblUkjuDAc07bruCcNHUrHDA==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.7.8"
+
+"@webassemblyjs/helper-fsm@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.8.tgz#fe4607430af466912797c21acafd3046080182ea"
+  integrity sha512-TjK0CnD8hAPkV5mbSp5aWl6SO1+H3WFcjWtixWoy8EMA99YnNzYhpc/WSYWhf7yrhpzkq5tZB0tvLK3Svr3IXA==
+
+"@webassemblyjs/helper-module-context@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.8.tgz#3c2e7ee93d14ff4768ba66fb1be42fdc9dc7160a"
+  integrity sha512-uCutAKR7Nm0VsFixcvnB4HhAyHouNbj0Dx1p7eRjFjXGGZ+N7ftTaG1ZbWCasAEbtwGj54LP8+lkBZdTCPmLGg==
+
+"@webassemblyjs/helper-wasm-bytecode@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.8.tgz#89bdb78cd6dd5209ae2ed2925de78d0f0e00b6f0"
+  integrity sha512-AdCCE3BMW6V34WYaKUmPgVHa88t2Z14P4/0LjLwuGkI0X6pf7nzp0CehzVVk51cKm2ymVXjl9dCG+gR1yhITIQ==
+
+"@webassemblyjs/helper-wasm-section@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.8.tgz#c68ef7d26a6fc12421b2e6e56f9bc810dfb33e87"
+  integrity sha512-BkBhYQuzyl4hgTGOKo87Vdw6f9nj8HhI7WYpI0MCC5qFa5ahrAPOGgyETVdnRbv+Rjukl9MxxfDmVcVC435lDg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.8"
+    "@webassemblyjs/helper-buffer" "1.7.8"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
+    "@webassemblyjs/wasm-gen" "1.7.8"
+
+"@webassemblyjs/ieee754@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.8.tgz#1f37974b13cb486a9237e73ce04cac7a2f1265ed"
+  integrity sha512-tOarWChdG1a3y1yqCX0JMDKzrat5tQe4pV6K/TX19BcXsBLYxFQOL1DEDa5KG9syeyvCrvZ+i1+Mv1ExngvktQ==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.6.tgz#197f75376a29f6ed6ace15898a310d871d92f03b"
-  integrity sha512-ojdlG8WpM394lBow4ncTGJoIVZ4aAtNOWHhfAM7m7zprmkVcKK+2kK5YJ9Bmj6/ketTtOn7wGSHCtMt+LzqgYQ==
+"@webassemblyjs/leb128@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.8.tgz#1bee83426819192db2ea1a234b84c7ebc6d34c1f"
+  integrity sha512-GCYeGPgUFWJiZuP4NICbcyUQNxNLJIf476Ei+K+jVuuebtLpfvwkvYT6iTUE7oZYehhkor4Zz2g7SJ/iZaPudQ==
   dependencies:
     "@xtuc/long" "4.2.1"
 
-"@webassemblyjs/utf8@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.6.tgz#eb62c66f906af2be70de0302e29055d25188797d"
-  integrity sha512-oId+tLxQ+AeDC34ELRYNSqJRaScB0TClUU6KQfpB8rNT6oelYlz8axsPhf6yPTg7PBJ/Z5WcXmUYiHEWgbbHJw==
-
-"@webassemblyjs/wasm-edit@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.6.tgz#fa41929160cd7d676d4c28ecef420eed5b3733c5"
-  integrity sha512-pTNjLO3o41v/Vz9VFLl+I3YLImpCSpodFW77pNoH4agn5I6GgSxXHXtvWDTvYJFty0jSeXZWLEmbaSIRUDlekg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.6"
-    "@webassemblyjs/helper-buffer" "1.7.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.6"
-    "@webassemblyjs/helper-wasm-section" "1.7.6"
-    "@webassemblyjs/wasm-gen" "1.7.6"
-    "@webassemblyjs/wasm-opt" "1.7.6"
-    "@webassemblyjs/wasm-parser" "1.7.6"
-    "@webassemblyjs/wast-printer" "1.7.6"
-
-"@webassemblyjs/wasm-gen@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.6.tgz#695ac38861ab3d72bf763c8c75e5f087ffabc322"
-  integrity sha512-mQvFJVumtmRKEUXMohwn8nSrtjJJl6oXwF3FotC5t6e2hlKMh8sIaW03Sck2MDzw9xPogZD7tdP5kjPlbH9EcQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.6"
-    "@webassemblyjs/ieee754" "1.7.6"
-    "@webassemblyjs/leb128" "1.7.6"
-    "@webassemblyjs/utf8" "1.7.6"
-
-"@webassemblyjs/wasm-opt@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.6.tgz#fbafa78e27e1a75ab759a4b658ff3d50b4636c21"
-  integrity sha512-go44K90fSIsDwRgtHhX14VtbdDPdK2sZQtZqUcMRvTojdozj5tLI0VVJAzLCfz51NOkFXezPeVTAYFqrZ6rI8Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.6"
-    "@webassemblyjs/helper-buffer" "1.7.6"
-    "@webassemblyjs/wasm-gen" "1.7.6"
-    "@webassemblyjs/wasm-parser" "1.7.6"
-
-"@webassemblyjs/wasm-parser@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.6.tgz#84eafeeff405ad6f4c4b5777d6a28ae54eed51fe"
-  integrity sha512-t1T6TfwNY85pDA/HWPA8kB9xA4sp9ajlRg5W7EKikqrynTyFo+/qDzIpvdkOkOGjlS6d4n4SX59SPuIayR22Yg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.6"
-    "@webassemblyjs/helper-api-error" "1.7.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.6"
-    "@webassemblyjs/ieee754" "1.7.6"
-    "@webassemblyjs/leb128" "1.7.6"
-    "@webassemblyjs/utf8" "1.7.6"
-
-"@webassemblyjs/wast-parser@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.6.tgz#ca4d20b1516e017c91981773bd7e819d6bd9c6a7"
-  integrity sha512-1MaWTErN0ziOsNUlLdvwS+NS1QWuI/kgJaAGAMHX8+fMJFgOJDmN/xsG4h/A1Gtf/tz5VyXQciaqHZqp2q0vfg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.6"
-    "@webassemblyjs/floating-point-hex-parser" "1.7.6"
-    "@webassemblyjs/helper-api-error" "1.7.6"
-    "@webassemblyjs/helper-code-frame" "1.7.6"
-    "@webassemblyjs/helper-fsm" "1.7.6"
+"@webassemblyjs/utf8@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.8.tgz#2b489d5cf43e0aebb93d8e2d792aff9879c61f05"
+  integrity sha512-9X+f0VV+xNXW2ujfIRSXBJENGE6Qh7bNVKqu3yDjTFB3ar3nsThsGBBKdTG58aXOm2iUH6v28VIf88ymPXODHA==
+
+"@webassemblyjs/wasm-edit@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.8.tgz#f8bdbe7088718eca27b1c349bb7c06b8a457950c"
+  integrity sha512-6D3Hm2gFixrfyx9XjSON4ml1FZTugqpkIz5Awvrou8fnpyprVzcm4X8pyGRtA2Piixjl3DqmX/HB1xdWyE097A==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.8"
+    "@webassemblyjs/helper-buffer" "1.7.8"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
+    "@webassemblyjs/helper-wasm-section" "1.7.8"
+    "@webassemblyjs/wasm-gen" "1.7.8"
+    "@webassemblyjs/wasm-opt" "1.7.8"
+    "@webassemblyjs/wasm-parser" "1.7.8"
+    "@webassemblyjs/wast-printer" "1.7.8"
+
+"@webassemblyjs/wasm-gen@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.8.tgz#7e8abf1545eae74ac6781d545c034af3cfd0c7d5"
+  integrity sha512-a7O/wE6eBeVKKUYgpMK7NOHmMADD85rSXLe3CqrWRDwWff5y3cSVbzpN6Qv3z6C4hdkpq9qyij1Ga1kemOZGvQ==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.8"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
+    "@webassemblyjs/ieee754" "1.7.8"
+    "@webassemblyjs/leb128" "1.7.8"
+    "@webassemblyjs/utf8" "1.7.8"
+
+"@webassemblyjs/wasm-opt@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.8.tgz#7ada6e211914728fce02ff0ff9c344edc6d41f26"
+  integrity sha512-3lbQ0PT81NHCdi1sR/7+SNpZadM4qYcTSr62nFFAA7e5lFwJr14M1Gi+A/Y3PgcDWOHYjsaNGPpPU0H03N6Blg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.8"
+    "@webassemblyjs/helper-buffer" "1.7.8"
+    "@webassemblyjs/wasm-gen" "1.7.8"
+    "@webassemblyjs/wasm-parser" "1.7.8"
+
+"@webassemblyjs/wasm-parser@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.8.tgz#dac47c291fb6a3e63529aecd647592cd34afbf94"
+  integrity sha512-rZ/zlhp9DHR/05zh1MbAjT2t624sjrPP/OkJCjXqzm7ynH+nIdNcn9Ixc+qzPMFXhIrk0rBoQ3to6sEIvHh9jQ==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.8"
+    "@webassemblyjs/helper-api-error" "1.7.8"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
+    "@webassemblyjs/ieee754" "1.7.8"
+    "@webassemblyjs/leb128" "1.7.8"
+    "@webassemblyjs/utf8" "1.7.8"
+
+"@webassemblyjs/wast-parser@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.8.tgz#f8aab9a450c048c1f9537695c89faeb92fabfba5"
+  integrity sha512-Q/zrvtUvzWuSiJMcSp90fi6gp2nraiHXjTV2VgAluVdVapM4gy1MQn7akja2p6eSBDQpKJPJ6P4TxRkghRS5dg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.8"
+    "@webassemblyjs/floating-point-hex-parser" "1.7.8"
+    "@webassemblyjs/helper-api-error" "1.7.8"
+    "@webassemblyjs/helper-code-frame" "1.7.8"
+    "@webassemblyjs/helper-fsm" "1.7.8"
     "@xtuc/long" "4.2.1"
-    mamacro "^0.0.3"
 
-"@webassemblyjs/wast-printer@1.7.6":
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.6.tgz#a6002c526ac5fa230fe2c6d2f1bdbf4aead43a5e"
-  integrity sha512-vHdHSK1tOetvDcl1IV1OdDeGNe/NDDQ+KzuZHMtqTVP1xO/tZ/IKNpj5BaGk1OYFdsDWQqb31PIwdEyPntOWRQ==
+"@webassemblyjs/wast-printer@1.7.8":
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.8.tgz#e7e965782c1912f6a965f14a53ff43d8ad0403a5"
+  integrity sha512-GllIthRtwTxRDAURRNXscu7Napzmdf1jt1gpiZiK/QN4fH0lSGs3OTmvdfsMNP7tqI4B3ZtfaaWRlNIQug6Xyg==
   dependencies:
-    "@webassemblyjs/ast" "1.7.6"
-    "@webassemblyjs/wast-parser" "1.7.6"
+    "@webassemblyjs/ast" "1.7.8"
+    "@webassemblyjs/wast-parser" "1.7.8"
     "@xtuc/long" "4.2.1"
 
 "@xtuc/ieee754@^1.2.0":
@@ -2490,6 +2486,13 @@ debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
+debug@^3.2.5:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+  dependencies:
+    ms "^2.1.1"
+
 debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
@@ -3049,6 +3052,13 @@ eventsource@0.1.6:
   dependencies:
     original ">=0.0.5"
 
+eventsource@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"
+  integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==
+  dependencies:
+    original "^1.0.0"
+
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
@@ -3275,7 +3285,7 @@ faye-websocket@^0.10.0:
   dependencies:
     websocket-driver ">=0.5.1"
 
-faye-websocket@~0.11.0:
+faye-websocket@~0.11.0, faye-websocket@~0.11.1:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
   integrity sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=
@@ -5365,11 +5375,6 @@ make-error@^1.1.1:
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
   integrity sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==
 
-mamacro@^0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
-  integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
-
 map-age-cleaner@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz#098fb15538fd3dbe461f12745b0ca8568d4e3f74"
@@ -5577,10 +5582,10 @@ mimic-response@^1.0.0:
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
   integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
 
-mini-css-extract-plugin@0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.3.tgz#98d60fcc5d228c3e36a9bd15a1d6816d6580beb8"
-  integrity sha512-Mxs0nxzF1kxPv4TRi2NimewgXlJqh0rGE30vviCU2WHrpbta6wklnUV9dr9FUtoAHmB3p3LeXEC+ZjgHvB0Dzg==
+mini-css-extract-plugin@0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.4.tgz#c10410a004951bd3cedac1da69053940fccb625d"
+  integrity sha512-o+Jm+ocb0asEngdM6FsZWtZsRzA8koFUudIDwYUfl94M3PejPHG7Vopw5hN9V8WsMkSFpm3tZP3Fesz89EyrfQ==
   dependencies:
     loader-utils "^1.1.0"
     schema-utils "^1.0.0"
@@ -6185,7 +6190,7 @@ optjs@~3.2.2:
   resolved "https://registry.yarnpkg.com/optjs/-/optjs-3.2.2.tgz#69a6ce89c442a44403141ad2f9b370bd5bb6f4ee"
   integrity sha1-aabOicRCpEQDFBrS+bNwvVu29O4=
 
-original@>=0.0.5:
+original@>=0.0.5, original@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
   integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
@@ -7821,6 +7826,18 @@ sockjs-client@1.1.5:
     json3 "^3.3.2"
     url-parse "^1.1.8"
 
+sockjs-client@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz#12fc9d6cb663da5739d3dc5fb6e8687da95cb177"
+  integrity sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==
+  dependencies:
+    debug "^3.2.5"
+    eventsource "^1.0.7"
+    faye-websocket "~0.11.1"
+    inherits "^2.0.3"
+    json3 "^3.3.2"
+    url-parse "^1.4.3"
+
 sockjs@0.3.19:
   version "0.3.19"
   resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d"
@@ -8023,7 +8040,7 @@ spdy@^3.4.1:
     select-hose "^2.0.0"
     spdy-transport "^2.0.18"
 
-speed-measure-webpack-plugin@^1.2.3:
+speed-measure-webpack-plugin@1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.2.3.tgz#de170b5cefbfa1c039d95e639edd3ad50cfc7c48"
   integrity sha512-p+taQ69VkRUXYMoZOx2nxV/Tz8tt79ahctoZJyJDHWP7fEYvwFNf5Pd73k5kZ6auu0pTsPNLEUwWpM8mCk85Zw==
@@ -8299,13 +8316,13 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
-style-loader@0.23.0:
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.0.tgz#8377fefab68416a2e05f1cabd8c3a3acfcce74f1"
-  integrity sha512-uCcN7XWHkqwGVt7skpInW6IGO1tG6ReyFQ1Cseh0VcN6VdcFQi62aG/2F3Y9ueA8x4IVlfaSUxpmQXQD9QrEuQ==
+style-loader@0.23.1:
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz#cb9154606f3e771ab6c4ab637026a1049174d925"
+  integrity sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==
   dependencies:
     loader-utils "^1.1.0"
-    schema-utils "^0.4.5"
+    schema-utils "^1.0.0"
 
 stylus-loader@3.0.2:
   version "3.0.2"
@@ -9036,19 +9053,51 @@ webpack-dev-middleware@3.2.0:
     url-join "^4.0.0"
     webpack-log "^2.0.0"
 
-webpack-dev-middleware@3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.3.0.tgz#8104daf4d4f65defe06ee2eaaeea612a7c541462"
-  integrity sha512-5C5gXtOo1I6+0AEg4UPglYEtu3Rai6l5IiO6aUu65scHXz29dc3oIWMiRwvcNLXgL0HwRkRxa9N02ZjFt4hY8w==
+webpack-dev-middleware@3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz#1132fecc9026fd90f0ecedac5cbff75d1fb45890"
+  integrity sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==
   dependencies:
-    loud-rejection "^1.6.0"
     memory-fs "~0.4.1"
     mime "^2.3.1"
     range-parser "^1.0.3"
-    url-join "^4.0.0"
     webpack-log "^2.0.0"
 
-webpack-dev-server@3.1.8, webpack-dev-server@^3.1.4:
+webpack-dev-server@3.1.10:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.10.tgz#507411bee727ee8d2fdffdc621b66a64ab3dea2b"
+  integrity sha512-RqOAVjfqZJtQcB0LmrzJ5y4Jp78lv9CK0MZ1YJDTaTmedMZ9PU9FLMQNrMCfVu8hHzaVLVOJKBlGEHMN10z+ww==
+  dependencies:
+    ansi-html "0.0.7"
+    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 "^2.0.0"
+    internal-ip "^3.0.1"
+    ip "^1.1.5"
+    killable "^1.0.0"
+    loglevel "^1.4.1"
+    opn "^5.1.0"
+    portfinder "^1.0.9"
+    schema-utils "^1.0.0"
+    selfsigned "^1.9.1"
+    serve-index "^1.7.2"
+    sockjs "0.3.19"
+    sockjs-client "1.3.0"
+    spdy "^3.4.1"
+    strip-ansi "^3.0.0"
+    supports-color "^5.1.0"
+    webpack-dev-middleware "3.4.0"
+    webpack-log "^2.0.0"
+    yargs "12.0.2"
+
+webpack-dev-server@^3.1.4:
   version "3.1.8"
   resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.8.tgz#eb7a95945d1108170f902604fb3b939533d9daeb"
   integrity sha512-c+tcJtDqnPdxCAzEEZKdIPmg3i5i7cAHe+B+0xFNK0BlCc2HF/unYccbU7xTgfGc5xxhCztCQzFmsqim+KhI+A==
@@ -9105,6 +9154,14 @@ webpack-sources@1.2.0, webpack-sources@^1.1.0, webpack-sources@^1.2.0:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
+webpack-sources@1.3.0, webpack-sources@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
+  integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"
+
 webpack-subresource-integrity@1.1.0-rc.6:
   version "1.1.0-rc.6"
   resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz#37f6f1264e1eb378e41465a98da80fad76ab8886"
@@ -9112,15 +9169,15 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.19.1, webpack@^4.0.0, webpack@^4.6.0:
-  version "4.19.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.19.1.tgz#096674bc3b573f8756c762754366e5b333d6576f"
-  integrity sha512-j7Q/5QqZRqIFXJvC0E59ipLV5Hf6lAnS3ezC3I4HMUybwEDikQBVad5d+IpPtmaQPQArvgUZLXIN6lWijHBn4g==
+webpack@4.22.0, webpack@^4.0.0, webpack@^4.6.0:
+  version "4.22.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.22.0.tgz#b168111e2e7b05f5169ac484e79e62093ec39e0d"
+  integrity sha512-2+3EYFqyhPl12buLQ42QPHEEh8BHn3P9ipRvGRHhdfKJ1u9svhZ3QjhIoEdL5SeIhL5gfOZVbBnartYEabkEsg==
   dependencies:
-    "@webassemblyjs/ast" "1.7.6"
-    "@webassemblyjs/helper-module-context" "1.7.6"
-    "@webassemblyjs/wasm-edit" "1.7.6"
-    "@webassemblyjs/wasm-parser" "1.7.6"
+    "@webassemblyjs/ast" "1.7.8"
+    "@webassemblyjs/helper-module-context" "1.7.8"
+    "@webassemblyjs/wasm-edit" "1.7.8"
+    "@webassemblyjs/wasm-parser" "1.7.8"
     acorn "^5.6.2"
     acorn-dynamic-import "^3.0.0"
     ajv "^6.1.0"
@@ -9140,7 +9197,7 @@ webpack@4.19.1, webpack@^4.0.0, webpack@^4.6.0:
     tapable "^1.1.0"
     uglifyjs-webpack-plugin "^1.2.4"
     watchpack "^1.5.0"
-    webpack-sources "^1.2.0"
+    webpack-sources "^1.3.0"
 
 websocket-driver@>=0.5.1:
   version "0.7.0"

From a53cf44e1db15f7e0680539fa9857506072e5104 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 23 Oct 2018 16:22:11 -0400
Subject: [PATCH 0356/1703] Branch support in snapshots (#12692)

* ci: snapshots can push to specific branches

Can take either a branch argument, or use CIRCLE_BRANCH if available.

* ci: run snapshots on all branches
---
 .circleci/config.yml |   3 +-
 scripts/snapshots.ts | 116 +++++++++++++++++++++++++------------------
 2 files changed, 71 insertions(+), 48 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ae48002bb43c..1f24b8304721 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -196,7 +196,8 @@ workflows:
             - e2e-cli
           filters:
             branches:
-              only: master
+              ignore:
+                - /pull\/.*/
       - publish:
           requires:
             - test
diff --git a/scripts/snapshots.ts b/scripts/snapshots.ts
index 1b62b00a1632..318af975a878 100644
--- a/scripts/snapshots.ts
+++ b/scripts/snapshots.ts
@@ -67,11 +67,72 @@ function _exec(command: string, args: string[], opts: { cwd?: string }, logger:
   return stdout.toString('utf-8');
 }
 
+async function _publishSnapshot(
+  pkg: PackageInfo,
+  branch: string,
+  message: string,
+  logger: logging.Logger,
+  githubToken: string,
+) {
+  if (!pkg.snapshot) {
+    logger.warn(`Skipping ${pkg.name}.`);
+
+    return;
+  }
+
+  logger.info(`Publishing ${pkg.name} to repo ${JSON.stringify(pkg.snapshotRepo)}.`);
+
+  const root = process.cwd();
+  const publishLogger = logger.createChild('publish');
+  publishLogger.debug('Temporary directory: ' + root);
+
+  const url = `https://${githubToken ? githubToken + '@' : ''}github.com/${pkg.snapshotRepo}.git`;
+  const destPath = path.join(root, path.basename(pkg.snapshotRepo));
+
+  _exec('git', ['clone', url], { cwd: root }, publishLogger);
+  if (branch) {
+    _exec('git', ['checkout', '-B', branch], { cwd: destPath }, publishLogger);
+  }
+
+  // Clear snapshot directory before publishing to remove deleted build files.
+  try {
+    _exec('git', ['rm', '-rf', './'], {cwd: destPath}, publishLogger);
+  } catch {
+    // Ignore errors on delete. :shrug:
+  }
+  _copy(pkg.dist, destPath);
+
+  if (githubToken) {
+    _exec('git', ['config', 'commit.gpgSign', 'false'], { cwd: destPath }, publishLogger);
+  }
+
+  // Add the header to the existing README.md (or create a README if it doesn't exist).
+  const readmePath = path.join(destPath, 'README.md');
+  let readme = readmeHeaderFn(pkg);
+  try {
+    readme += fs.readFileSync(readmePath, 'utf-8');
+  } catch {}
+
+  fs.writeFileSync(readmePath, readme);
+
+  // Make sure that every snapshots is unique (otherwise we would need to make sure git accepts
+  // empty commits).
+  fs.writeFileSync(path.join(destPath, 'uniqueId'), '' + new Date());
+
+  // Commit and push.
+  _exec('git', ['add', '.'], { cwd: destPath }, publishLogger);
+  _exec('git', ['commit', '-a', '-m', message], { cwd: destPath }, publishLogger);
+  _exec('git', ['tag', pkg.snapshotHash], { cwd: destPath }, publishLogger);
+  _exec('git', ['push', 'origin', branch], { cwd: destPath }, publishLogger);
+  _exec('git', ['push', '--tags', 'origin', branch], { cwd: destPath }, publishLogger);
+}
+
 
 export interface SnapshotsOptions {
   force?: boolean;
   githubTokenFile?: string;
   githubToken?: string;
+  branch?: string;
 }
 
 export default async function(opts: SnapshotsOptions, logger: logging.Logger) {
@@ -83,6 +144,12 @@ export default async function(opts: SnapshotsOptions, logger: logging.Logger) {
 
   const root = fs.mkdtempSync(path.join(os.tmpdir(), 'angular-cli-publish-'));
   const message = execSync(`git log --format="%h %s" -n1`).toString().trim();
+  let branch = opts.branch || 'master';
+
+  // CIRCLE_BRANCH
+  if (typeof process.env['CIRCLE_BRANCH'] == 'string') {
+    branch = '' + process.env['CIRCLE_BRANCH'];
+  }
 
   const githubToken = (
     opts.githubToken
@@ -129,53 +196,8 @@ export default async function(opts: SnapshotsOptions, logger: logging.Logger) {
   }
 
   for (const packageName of Object.keys(packages)) {
-    const pkg = packages[packageName];
-
-    if (!pkg.snapshot) {
-      logger.warn(`Skipping ${pkg.name}.`);
-      continue;
-    }
-
-    logger.info(`Publishing ${pkg.name} to repo ${JSON.stringify(pkg.snapshotRepo)}.`);
-
-    const publishLogger = logger.createChild('publish');
-    publishLogger.debug('Temporary directory: ' + root);
-
-    const url = `https://${githubToken ? githubToken + '@' : ''}github.com/${pkg.snapshotRepo}.git`;
-    _exec('git', ['clone', url], { cwd: root }, publishLogger);
-
-    const destPath = path.join(root, path.basename(pkg.snapshotRepo));
-    // Clear snapshot directory before publishing to remove deleted build files.
-    try {
-      _exec('git', ['rm', '-rf', './'], {cwd: destPath}, publishLogger);
-    } catch {
-      // Ignore errors on delete. :shrug:
-    }
-    _copy(pkg.dist, destPath);
-
-    if (githubToken) {
-      _exec('git', ['config', 'commit.gpgSign', 'false'], { cwd: destPath }, publishLogger);
-    }
-
-    // Add the header to the existing README.md (or create a README if it doesn't exist).
-    const readmePath = path.join(destPath, 'README.md');
-    let readme = readmeHeaderFn(pkg);
-    try {
-      readme += fs.readFileSync(readmePath, 'utf-8');
-    } catch {}
-
-    fs.writeFileSync(readmePath, readme);
-
-    // Make sure that every snapshots is unique (otherwise we would need to make sure git accepts
-    // empty commits).
-    fs.writeFileSync(path.join(destPath, 'uniqueId'), '' + new Date());
-
-    // Commit and push.
-    _exec('git', ['add', '.'], { cwd: destPath }, publishLogger);
-    _exec('git', ['commit', '-a', '-m', message], { cwd: destPath }, publishLogger);
-    _exec('git', ['tag', pkg.snapshotHash], { cwd: destPath }, publishLogger);
-    _exec('git', ['push', 'origin'], { cwd: destPath }, publishLogger);
-    _exec('git', ['push', '--tags', 'origin'], { cwd: destPath }, publishLogger);
+    process.chdir(root);
+    await _publishSnapshot(packages[packageName], branch, message, logger, githubToken);
   }
 
   return 0;

From f52f043e4f423554d2f5b26e75c5a77e973ce8b2 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 23 Oct 2018 12:18:57 +0200
Subject: [PATCH 0357/1703] docs: update descriptions

---
 packages/angular/cli/lib/config/schema.json          | 10 +++++-----
 packages/schematics/angular/component/schema.json    |  2 +-
 packages/schematics/angular/directive/schema.json    |  2 +-
 packages/schematics/angular/guard/schema.json        |  2 +-
 packages/schematics/angular/module/schema.json       |  2 +-
 packages/schematics/angular/pipe/schema.json         |  2 +-
 packages/schematics/angular/service/schema.json      |  2 +-
 packages/schematics/angular/utility/config.ts        | 12 ++++++------
 .../json/schema/serializers/schema_benchmark.json    | 12 ++++++------
 9 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index ba1c6a7b66e6..bc544328d1d3 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -93,7 +93,7 @@
             },
             "flat": {
               "type": "boolean",
-              "description": "Flag to indicate if a dir is created.",
+              "description": "Flag to indicate if a directory is created.",
               "default": false
             },
             "inlineStyle": {
@@ -157,7 +157,7 @@
             },
             "flat": {
               "type": "boolean",
-              "description": "Flag to indicate if a dir is created.",
+              "description": "Flag to indicate if a directory is created.",
               "default": true
             },
             "module": {
@@ -210,7 +210,7 @@
             },
             "flat": {
               "type": "boolean",
-              "description": "Flag to indicate if a dir is created.",
+              "description": "Flag to indicate if a directory is created.",
               "default": false
             },
             "commonModule": {
@@ -232,7 +232,7 @@
             "flat": {
               "type": "boolean",
               "default": true,
-              "description": "Flag to indicate if a dir is created."
+              "description": "Flag to indicate if a directory is created."
             },
             "spec": {
               "type": "boolean",
@@ -247,7 +247,7 @@
             "flat": {
               "type": "boolean",
               "default": true,
-              "description": "Flag to indicate if a dir is created."
+              "description": "Flag to indicate if a directory is created."
             },
             "spec": {
               "type": "boolean",
diff --git a/packages/schematics/angular/component/schema.json b/packages/schematics/angular/component/schema.json
index 160cce8d80f6..a3401bbbd320 100644
--- a/packages/schematics/angular/component/schema.json
+++ b/packages/schematics/angular/component/schema.json
@@ -77,7 +77,7 @@
     },
     "flat": {
       "type": "boolean",
-      "description": "Flag to indicate if a dir is created.",
+      "description": "Flag to indicate if a directory is created.",
       "default": false
     },
     "skipImport": {
diff --git a/packages/schematics/angular/directive/schema.json b/packages/schematics/angular/directive/schema.json
index 259c1bb392d4..69aab44e5214 100644
--- a/packages/schematics/angular/directive/schema.json
+++ b/packages/schematics/angular/directive/schema.json
@@ -57,7 +57,7 @@
     },
     "flat": {
       "type": "boolean",
-      "description": "Flag to indicate if a dir is created.",
+      "description": "Flag to indicate if a directory is created.",
       "default": true
     },
     "module":  {
diff --git a/packages/schematics/angular/guard/schema.json b/packages/schematics/angular/guard/schema.json
index ac167fb21c39..0b08eaba2b99 100644
--- a/packages/schematics/angular/guard/schema.json
+++ b/packages/schematics/angular/guard/schema.json
@@ -20,7 +20,7 @@
     },
     "flat": {
       "type": "boolean",
-      "description": "Flag to indicate if a dir is created.",
+      "description": "Flag to indicate if a directory is created.",
       "default": true
     },
     "path": {
diff --git a/packages/schematics/angular/module/schema.json b/packages/schematics/angular/module/schema.json
index 20617e405f3b..a8ba886285fe 100644
--- a/packages/schematics/angular/module/schema.json
+++ b/packages/schematics/angular/module/schema.json
@@ -39,7 +39,7 @@
     },
     "flat": {
       "type": "boolean",
-      "description": "Flag to indicate if a dir is created.",
+      "description": "Flag to indicate if a directory is created.",
       "default": false
     },
     "commonModule": {
diff --git a/packages/schematics/angular/pipe/schema.json b/packages/schematics/angular/pipe/schema.json
index ff0b21d8eff3..f9ed5ffbb9cf 100644
--- a/packages/schematics/angular/pipe/schema.json
+++ b/packages/schematics/angular/pipe/schema.json
@@ -29,7 +29,7 @@
     "flat": {
       "type": "boolean",
       "default": true,
-      "description": "Flag to indicate if a dir is created."
+      "description": "Flag to indicate if a directory is created."
     },
     "spec": {
       "type": "boolean",
diff --git a/packages/schematics/angular/service/schema.json b/packages/schematics/angular/service/schema.json
index b9cd38ae59df..eeffbfe6e578 100644
--- a/packages/schematics/angular/service/schema.json
+++ b/packages/schematics/angular/service/schema.json
@@ -29,7 +29,7 @@
     "flat": {
       "type": "boolean",
       "default": true,
-      "description": "Flag to indicate if a dir is created."
+      "description": "Flag to indicate if a directory is created."
     },
     "spec": {
       "type": "boolean",
diff --git a/packages/schematics/angular/utility/config.ts b/packages/schematics/angular/utility/config.ts
index b4b2d78d37b4..2d3b0c8c6cd0 100644
--- a/packages/schematics/angular/utility/config.ts
+++ b/packages/schematics/angular/utility/config.ts
@@ -265,7 +265,7 @@ export interface CliConfig {
        */
       component?: {
           /**
-           * Flag to indicate if a dir is created.
+           * Flag to indicate if a directory is created.
            */
           flat?: boolean;
           /**
@@ -294,7 +294,7 @@ export interface CliConfig {
        */
       directive?: {
           /**
-           * Flag to indicate if a dir is created.
+           * Flag to indicate if a directory is created.
            */
           flat?: boolean;
           /**
@@ -307,7 +307,7 @@ export interface CliConfig {
        */
       guard?: {
           /**
-           * Flag to indicate if a dir is created.
+           * Flag to indicate if a directory is created.
            */
           flat?: boolean;
           /**
@@ -329,7 +329,7 @@ export interface CliConfig {
        */
       module?: {
           /**
-           * Flag to indicate if a dir is created.
+           * Flag to indicate if a directory is created.
            */
           flat?: boolean;
           /**
@@ -342,7 +342,7 @@ export interface CliConfig {
        */
       pipe?: {
           /**
-           * Flag to indicate if a dir is created.
+           * Flag to indicate if a directory is created.
            */
           flat?: boolean;
           /**
@@ -355,7 +355,7 @@ export interface CliConfig {
        */
       service?: {
           /**
-           * Flag to indicate if a dir is created.
+           * Flag to indicate if a directory is created.
            */
           flat?: boolean;
           /**
diff --git a/tests/angular_devkit/core/json/schema/serializers/schema_benchmark.json b/tests/angular_devkit/core/json/schema/serializers/schema_benchmark.json
index af5c8d521ef0..7418a03fd48b 100644
--- a/tests/angular_devkit/core/json/schema/serializers/schema_benchmark.json
+++ b/tests/angular_devkit/core/json/schema/serializers/schema_benchmark.json
@@ -330,7 +330,7 @@
           "type": "object",
           "properties": {
             "flat": {
-              "description": "Flag to indicate if a dir is created.",
+              "description": "Flag to indicate if a directory is created.",
               "type": "boolean",
               "default": false
             },
@@ -366,7 +366,7 @@
           "type": "object",
           "properties": {
             "flat": {
-              "description": "Flag to indicate if a dir is created.",
+              "description": "Flag to indicate if a directory is created.",
               "type": "boolean",
               "default": true
             },
@@ -382,7 +382,7 @@
           "type": "object",
           "properties": {
             "flat": {
-              "description": "Flag to indicate if a dir is created.",
+              "description": "Flag to indicate if a directory is created.",
               "type": "boolean",
               "default": true
             },
@@ -409,7 +409,7 @@
           "type": "object",
           "properties": {
             "flat": {
-              "description": "Flag to indicate if a dir is created.",
+              "description": "Flag to indicate if a directory is created.",
               "type": "boolean",
               "default": false
             },
@@ -425,7 +425,7 @@
           "type": "object",
           "properties": {
             "flat": {
-              "description": "Flag to indicate if a dir is created.",
+              "description": "Flag to indicate if a directory is created.",
               "type": "boolean",
               "default": true
             },
@@ -441,7 +441,7 @@
           "type": "object",
           "properties": {
             "flat": {
-              "description": "Flag to indicate if a dir is created.",
+              "description": "Flag to indicate if a directory is created.",
               "type": "boolean",
               "default": true
             },

From 2c6c398e6cbb9dc9a83a4f3a8d512469d1dcbc91 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 8 Oct 2018 10:26:17 -0400
Subject: [PATCH 0358/1703] refactor(@angular-devkit/core): allow promises for
 registry URI handlers

---
 packages/angular_devkit/core/src/json/schema/registry.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/core/src/json/schema/registry.ts b/packages/angular_devkit/core/src/json/schema/registry.ts
index e55a111ad966..dca9789aa9cc 100644
--- a/packages/angular_devkit/core/src/json/schema/registry.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry.ts
@@ -43,7 +43,8 @@ interface AjvRefMap {
   schema: JsonObject;
 }
 
-export type UriHandler = (uri: string) => Observable<JsonObject> | null | undefined;
+export type UriHandler = (uri: string) =>
+  Observable<JsonObject> | Promise<JsonObject> | null | undefined;
 
 export class SchemaValidationException extends BaseException {
   public readonly errors: SchemaValidatorError[];
@@ -133,7 +134,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
       const handler = maybeHandler(uri);
       if (handler) {
         // The AJV API only understands Promises.
-        return handler.pipe(
+        return from(handler).pipe(
           tap(json => this._uriCache.set(uri, json)),
         ).toPromise();
       }

From 5af69ba43b16f3d67a3da6022ca402211695e75e Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 8 Oct 2018 10:27:37 -0400
Subject: [PATCH 0359/1703] refactor(@angular/cli): remove rxjs direct
 dependency

---
 packages/angular/cli/BUILD                    |  2 -
 packages/angular/cli/lib/cli/index.ts         |  4 +-
 .../angular/cli/models/architect-command.ts   | 36 ++++++-------
 packages/angular/cli/models/command-runner.ts |  3 +-
 .../angular/cli/models/schematic-command.ts   | 18 ++-----
 .../angular/cli/models/workspace-loader.ts    | 50 +++----------------
 packages/angular/cli/package.json             |  1 -
 7 files changed, 28 insertions(+), 86 deletions(-)

diff --git a/packages/angular/cli/BUILD b/packages/angular/cli/BUILD
index b98389597251..859e31338d4c 100644
--- a/packages/angular/cli/BUILD
+++ b/packages/angular/cli/BUILD
@@ -28,8 +28,6 @@ ts_library(
         "//packages/angular_devkit/core:node",
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:tools",
-        "@rxjs",
-        "@rxjs//operators",
         # @typings: es2017.object
         # @typings: inquirer
         # @typings: node
diff --git a/packages/angular/cli/lib/cli/index.ts b/packages/angular/cli/lib/cli/index.ts
index 968d184e3c32..02ddd62bc21e 100644
--- a/packages/angular/cli/lib/cli/index.ts
+++ b/packages/angular/cli/lib/cli/index.ts
@@ -7,7 +7,6 @@
  */
 
 import { logging, terminal } from '@angular-devkit/core';
-import { filter } from 'rxjs/operators';
 import { runCommand } from '../../models/command-runner';
 import { getWorkspaceRaw } from '../../utilities/config';
 import { getWorkspaceDetails } from '../../utilities/project';
@@ -72,11 +71,12 @@ export default async function(options: { testing?: boolean, cliArgs: string[] })
 // Initialize logging.
 function initializeLogging(logger: logging.Logger) {
   return logger
-    .pipe(filter(entry => (entry.level != 'debug')))
     .subscribe(entry => {
       let color = (x: string) => terminal.dim(terminal.white(x));
       let output = process.stdout;
       switch (entry.level) {
+        case 'debug':
+          return;
         case 'info':
           color = terminal.white;
           break;
diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index 729afd19966f..5744061beaaa 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -7,14 +7,11 @@
  */
 import {
   Architect,
-  BuildEvent,
   BuilderConfiguration,
   TargetSpecifier,
 } from '@angular-devkit/architect';
 import { experimental, json, schema, tags } from '@angular-devkit/core';
 import { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node';
-import { from } from 'rxjs';
-import { concatMap, map, tap, toArray } from 'rxjs/operators';
 import { parseJsonSchemaToOptions } from '../utilities/json-schema';
 import { BaseCommandOptions, Command } from './command';
 import { Arguments } from './interface';
@@ -49,7 +46,7 @@ export abstract class ArchitectCommand<
     this._registry = new json.schema.CoreSchemaRegistry();
     this._registry.addPostTransform(json.schema.transforms.addUndefinedDefaults);
 
-    await this._loadWorkspaceAndArchitect().toPromise();
+    await this._loadWorkspaceAndArchitect();
 
     if (!options.project && this.target) {
       const projectNames = this.getProjectNamesByTarget(this.target);
@@ -153,9 +150,9 @@ export abstract class ArchitectCommand<
     }
     const realBuilderConf = this._architect.getBuilderConfiguration({ ...targetSpec, overrides });
 
-    return this._architect.run(realBuilderConf, { logger: this._logger }).pipe(
-      map((buildEvent: BuildEvent) => buildEvent.success ? 0 : 1),
-    ).toPromise();
+    const result = await this._architect.run(realBuilderConf, { logger: this._logger }).toPromise();
+
+    return result.success ? 0 : 1;
   }
 
   protected async runArchitectTarget(
@@ -168,12 +165,12 @@ export abstract class ArchitectCommand<
       if (!targetSpec.project && this.target) {
         // This runs each target sequentially.
         // Running them in parallel would jumble the log messages.
-        return await from(this.getProjectNamesByTarget(this.target)).pipe(
-          concatMap(project => from(this.runSingleTarget({ ...targetSpec, project }, extra))),
-          toArray(),
-          map(results => results.every(res => res === 0) ? 0 : 1),
-        )
-        .toPromise();
+        let result = 0;
+        for (const project of this.getProjectNamesByTarget(this.target)) {
+          result |= await this.runSingleTarget({ ...targetSpec, project }, extra);
+        }
+
+        return result;
       } else {
         return await this.runSingleTarget(targetSpec, extra);
       }
@@ -227,16 +224,13 @@ export abstract class ArchitectCommand<
     }
   }
 
-  private _loadWorkspaceAndArchitect() {
+  private async _loadWorkspaceAndArchitect() {
     const workspaceLoader = new WorkspaceLoader(this._host);
 
-    return workspaceLoader.loadWorkspace(this.workspace.root).pipe(
-      tap((workspace: experimental.workspace.Workspace) => this._workspace = workspace),
-      concatMap((workspace: experimental.workspace.Workspace) => {
-        return new Architect(workspace).loadArchitect();
-      }),
-      tap((architect: Architect) => this._architect = architect),
-    );
+    const workspace = await workspaceLoader.loadWorkspace(this.workspace.root);
+
+    this._workspace = workspace;
+    this._architect = await new Architect(workspace).loadArchitect().toPromise();
   }
 
   private _makeTargetSpecifier(commandOptions: ArchitectCommandOptions): TargetSpecifier {
diff --git a/packages/angular/cli/models/command-runner.ts b/packages/angular/cli/models/command-runner.ts
index a44c4f1a0755..4828b4239edc 100644
--- a/packages/angular/cli/models/command-runner.ts
+++ b/packages/angular/cli/models/command-runner.ts
@@ -16,7 +16,6 @@ import {
 } from '@angular-devkit/core';
 import { readFileSync } from 'fs';
 import { dirname, join, resolve } from 'path';
-import { of } from 'rxjs';
 import { findUp } from '../utilities/find-up';
 import { parseJsonSchemaToCommandDescription } from '../utilities/json-schema';
 import { Command } from './command';
@@ -76,7 +75,7 @@ export async function runCommand(
     if (uri.startsWith('ng-cli://')) {
       const content = readFileSync(join(__dirname, '..', uri.substr('ng-cli://'.length)), 'utf-8');
 
-      return of(JSON.parse(content));
+      return Promise.resolve(JSON.parse(content));
     } else {
       return null;
     }
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index 1b52865ee85c..b58a5edfc4ee 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -36,7 +36,6 @@ import {
 } from '@angular-devkit/schematics/tools';
 import * as inquirer from 'inquirer';
 import * as systemPath from 'path';
-import { take } from 'rxjs/operators';
 import { WorkspaceLoader } from '../models/workspace-loader';
 import {
   getPackageManager,
@@ -97,7 +96,7 @@ export abstract class SchematicCommand<
   }
 
   public async initialize(options: T & Arguments) {
-    this._loadWorkspace();
+    await this._loadWorkspace();
     this.createWorkflow(options);
 
     if (this.schematicName) {
@@ -537,28 +536,19 @@ export abstract class SchematicCommand<
     return parseArguments(schematicOptions, options);
   }
 
-  private _loadWorkspace() {
+  private async _loadWorkspace() {
     if (this._workspace) {
       return;
     }
     const workspaceLoader = new WorkspaceLoader(this._host);
 
     try {
-      workspaceLoader.loadWorkspace(this.workspace.root).pipe(take(1))
-        .subscribe(
-          (workspace: experimental.workspace.Workspace) => this._workspace = workspace,
-          (err: Error) => {
-            if (!this.allowMissingWorkspace) {
-              // Ignore missing workspace
-              throw err;
-            }
-          },
-        );
+      this._workspace = await workspaceLoader.loadWorkspace(this.workspace.root);
     } catch (err) {
       if (!this.allowMissingWorkspace) {
         // Ignore missing workspace
         throw err;
-  }
+      }
     }
   }
 }
diff --git a/packages/angular/cli/models/workspace-loader.ts b/packages/angular/cli/models/workspace-loader.ts
index e8785f7dc209..854492a2e03b 100644
--- a/packages/angular/cli/models/workspace-loader.ts
+++ b/packages/angular/cli/models/workspace-loader.ts
@@ -11,20 +11,13 @@ import {
   basename,
   dirname,
   experimental,
-  join,
   normalize,
   virtualFs,
 } from '@angular-devkit/core';
-import * as fs from 'fs';
-import { homedir } from 'os';
-import { Observable, of } from 'rxjs';
-import { concatMap, tap } from 'rxjs/operators';
 import { findUp } from '../utilities/find-up';
 
 
-// TODO: error out instead of returning null when workspace cannot be found.
 export class WorkspaceLoader {
-  private _workspaceCacheMap = new Map<string, experimental.workspace.Workspace>();
   // TODO: add remaining fallbacks.
   private _configFileNames = [
     normalize('.angular.json'),
@@ -32,20 +25,12 @@ export class WorkspaceLoader {
   ];
   constructor(private _host: virtualFs.Host) { }
 
-  loadGlobalWorkspace(): Observable<experimental.workspace.Workspace | null> {
-    return this._getGlobalWorkspaceFilePath().pipe(
-      concatMap(globalWorkspacePath => this._loadWorkspaceFromPath(globalWorkspacePath)),
-    );
-  }
-
-  loadWorkspace(projectPath?: string): Observable<experimental.workspace.Workspace | null> {
-    return this._getProjectWorkspaceFilePath(projectPath).pipe(
-      concatMap(globalWorkspacePath => this._loadWorkspaceFromPath(globalWorkspacePath)),
-    );
+  loadWorkspace(projectPath?: string): Promise<experimental.workspace.Workspace> {
+    return this._loadWorkspaceFromPath(this._getProjectWorkspaceFilePath(projectPath));
   }
 
   // TODO: do this with the host instead of fs.
-  private _getProjectWorkspaceFilePath(projectPath?: string): Observable<Path | null> {
+  private _getProjectWorkspaceFilePath(projectPath?: string): Path {
     // Find the workspace file, either where specified, in the Angular CLI project
     // (if it's in node_modules) or from the current process.
     const workspaceFilePath = (projectPath && findUp(this._configFileNames, projectPath))
@@ -53,40 +38,17 @@ export class WorkspaceLoader {
       || findUp(this._configFileNames, __dirname);
 
     if (workspaceFilePath) {
-      return of(normalize(workspaceFilePath));
+      return normalize(workspaceFilePath);
     } else {
       throw new Error(`Local workspace file ('angular.json') could not be found.`);
     }
   }
 
-  // TODO: do this with the host instead of fs.
-  private _getGlobalWorkspaceFilePath(): Observable<Path | null> {
-    for (const fileName of this._configFileNames) {
-      const workspaceFilePath = join(normalize(homedir()), fileName);
-
-      if (fs.existsSync(workspaceFilePath)) {
-        return of(normalize(workspaceFilePath));
-      }
-    }
-
-    return of(null);
-  }
-
-  private _loadWorkspaceFromPath(workspacePath: Path | null) {
-    if (!workspacePath) {
-      return of(null);
-    }
-
-    if (this._workspaceCacheMap.has(workspacePath)) {
-      return of(this._workspaceCacheMap.get(workspacePath) || null);
-    }
-
+  private _loadWorkspaceFromPath(workspacePath: Path) {
     const workspaceRoot = dirname(workspacePath);
     const workspaceFileName = basename(workspacePath);
     const workspace = new experimental.workspace.Workspace(workspaceRoot, this._host);
 
-    return workspace.loadWorkspaceFromHost(workspaceFileName).pipe(
-      tap(workspace => this._workspaceCacheMap.set(workspacePath, workspace)),
-    );
+    return workspace.loadWorkspaceFromHost(workspaceFileName).toPromise();
   }
 }
diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 30f604f522d9..77603e72b77d 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -33,7 +33,6 @@
     "@schematics/update": "0.0.0",
     "inquirer": "6.2.0",
     "opn": "5.3.0",
-    "rxjs": "6.3.3",
     "semver": "5.5.1",
     "symbol-observable": "1.2.0"
   },

From 55f015f40da6b3177e3c0d45a9f2a1070f0e837e Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 9 Oct 2018 14:19:07 -0400
Subject: [PATCH 0360/1703] refactor(@schematics/update): cleanup/optimize npm
 fetch

---
 packages/schematics/update/package.json  |   2 +-
 packages/schematics/update/update/npm.ts | 312 +++++------------------
 yarn.lock                                | 268 +++++++++++++++----
 3 files changed, 283 insertions(+), 299 deletions(-)

diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index 39e6958a0785..eeccda4a9338 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
-    "npm-registry-client": "8.6.0",
+    "pacote": "9.1.1",
     "semver": "5.5.1",
     "semver-intersect": "1.4.0",
     "rxjs": "6.3.3"
diff --git a/packages/schematics/update/update/npm.ts b/packages/schematics/update/update/npm.ts
index a6b193f9c08a..4e26ddc5e8e4 100644
--- a/packages/schematics/update/update/npm.ts
+++ b/packages/schematics/update/update/npm.ts
@@ -6,142 +6,68 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { logging } from '@angular-devkit/core';
-import { exec } from 'child_process';
 import { readFileSync } from 'fs';
-import { Observable, ReplaySubject, concat, of } from 'rxjs';
-import {
-  catchError,
-  concatMap,
-  defaultIfEmpty,
-  filter,
-  first,
-  map,
-  shareReplay,
-  toArray,
-} from 'rxjs/operators';
-import * as url from 'url';
+import { Observable, from } from 'rxjs';
+import { shareReplay } from 'rxjs/operators';
 import { NpmRepositoryPackageJson } from './npm-package-json';
 
-const RegistryClient = require('npm-registry-client');
+const pacote = require('pacote');
 
 const npmPackageJsonCache = new Map<string, Observable<NpmRepositoryPackageJson>>();
-const npmConfigOptionCache = new Map<string, Observable<string | undefined>>();
 
-
-function _readNpmRc(): Observable<{ [key: string]: string }> {
-  return new Observable<{ [key: string]: string }>(subject => {
-    // TODO: have a way to read options without using fs directly.
-    const path = require('path');
-    const fs = require('fs');
-    const perProjectNpmrc = path.resolve('.npmrc');
-
-    let npmrc = '';
-
-    if (fs.existsSync(perProjectNpmrc)) {
-      npmrc = fs.readFileSync(perProjectNpmrc).toString('utf-8');
-    } else {
-      if (process.platform === 'win32') {
-        if (process.env.LOCALAPPDATA) {
-          npmrc = fs.readFileSync(path.join(process.env.LOCALAPPDATA, '.npmrc')).toString('utf-8');
-        }
-      } else {
-        if (process.env.HOME) {
-          npmrc = fs.readFileSync(path.join(process.env.HOME, '.npmrc')).toString('utf-8');
-        }
-      }
-    }
-
-    const allOptionsArr = npmrc.split(/\r?\n/).map(x => x.trim());
-    const allOptions: { [key: string]: string } = {};
-
-    allOptionsArr.forEach(x => {
-      const [key, ...value] = x.split('=');
-      allOptions[key.trim()] = value.join('=').trim();
-    });
-
-    subject.next(allOptions);
-    subject.complete();
-  }).pipe(
-    catchError(() => of({})),
-    shareReplay(),
-  );
+let npmrc: { [key: string]: string };
+try {
+  npmrc = _readNpmRc();
+} catch {
+  npmrc = {};
 }
 
 
-function getOptionFromNpmRc(option: string): Observable<string | undefined> {
-  return _readNpmRc().pipe(
-    map(options => options[option]),
-  );
-}
+function _readNpmRc(): { [key: string]: string } {
+  // TODO: have a way to read options without using fs directly.
+  const path = require('path');
+  const fs = require('fs');
+  const perProjectNpmrc = path.resolve('.npmrc');
 
-function getOptionFromNpmCli(option: string): Observable<string | undefined> {
-  return new Observable<string | undefined>(subject => {
-    exec(`npm get ${option}`, (error, data) => {
-      if (error) {
-        throw error;
-      } else {
-        data = data.trim();
-        if (!data || data === 'undefined' || data === 'null') {
-          subject.next();
-        } else {
-          subject.next(data);
-        }
-      }
+  const configs: string[] = [];
 
-      subject.complete();
-    });
-  }).pipe(
-    catchError(() => of(undefined)),
-    shareReplay(),
-  );
-}
-
-function getNpmConfigOption(
-  option: string,
-  scope?: string,
-  tryWithoutScope?: boolean,
-): Observable<string | undefined> {
-  if (scope && tryWithoutScope) {
-    return concat(
-      getNpmConfigOption(option, scope),
-      getNpmConfigOption(option),
-    ).pipe(
-      filter(result => !!result),
-      defaultIfEmpty(),
-      first(),
-    );
+  if (process.platform === 'win32') {
+    if (process.env.LOCALAPPDATA) {
+      configs.push(fs.readFileSync(path.join(process.env.LOCALAPPDATA, '.npmrc'), 'utf8'));
+    }
+  } else {
+    if (process.env.HOME) {
+      configs.push(fs.readFileSync(path.join(process.env.HOME, '.npmrc'), 'utf8'));
+    }
   }
 
-  const fullOption = `${scope ? scope + ':' : ''}${option}`;
-
-  let value = npmConfigOptionCache.get(fullOption);
-  if (value) {
-    return value;
+  if (fs.existsSync(perProjectNpmrc)) {
+    configs.push(fs.readFileSync(perProjectNpmrc, 'utf8'));
   }
 
-  value = option.startsWith('_')
-      ? getOptionFromNpmRc(fullOption)
-      : getOptionFromNpmCli(fullOption);
-
-  npmConfigOptionCache.set(fullOption, value);
-
-  return value;
-}
-
-function getNpmClientSslOptions(strictSsl?: string, cafile?: string) {
-  const sslOptions: { strict?: boolean, ca?: Buffer } = {};
+  const allOptions: { [key: string]: string } = {};
+  for (const config of configs) {
+    const allOptionsArr = config.split(/\r?\n/).map(x => x.trim());
 
-  if (strictSsl === 'false') {
-    sslOptions.strict = false;
-  } else if (strictSsl === 'true') {
-    sslOptions.strict = true;
-  }
+    allOptionsArr.forEach(x => {
+      const [key, ...value] = x.split('=');
+      const fullValue = value.join('=').trim();
+      if (key && fullValue && fullValue !== 'null') {
+        allOptions[key.trim()] = fullValue;
+      }
+    });
 
-  if (cafile) {
-    sslOptions.ca = readFileSync(cafile);
+    if (allOptions.cafile) {
+      const cafile = allOptions.cafile;
+      delete allOptions.cafile;
+      try {
+        allOptions.ca = readFileSync(cafile, 'utf8');
+        allOptions.ca = allOptions.ca.replace(/\r?\n/, '\\n');
+      } catch { }
+    }
   }
 
-  return sslOptions;
+  return allOptions;
 }
 
 /**
@@ -155,144 +81,24 @@ function getNpmClientSslOptions(strictSsl?: string, cafile?: string) {
 export function getNpmPackageJson(
   packageName: string,
   registryUrl: string | undefined,
-  logger: logging.LoggerApi,
+  _logger: logging.LoggerApi,
 ): Observable<Partial<NpmRepositoryPackageJson>> {
-  const scope = packageName.startsWith('@') ? packageName.split('/')[0] : undefined;
-
-  return (
-    registryUrl ? of(registryUrl) : getNpmConfigOption('registry', scope, true)
-  ).pipe(
-    map(partialUrl => {
-      if (!partialUrl) {
-        partialUrl = 'https://registry.npmjs.org/';
-      }
-      const partial = url.parse(partialUrl);
-      let fullUrl = new url.URL(`http://${partial.host}/${packageName.replace(/\//g, '%2F')}`);
-      try {
-        const registry = new url.URL(partialUrl);
-        registry.pathname = (registry.pathname || '')
-            .replace(/\/?$/, '/' + packageName.replace(/\//g, '%2F'));
-        fullUrl = new url.URL(url.format(registry));
-      } catch {}
-
-      logger.debug(
-        `Getting package.json from '${packageName}' (url: ${JSON.stringify(fullUrl)})...`,
-      );
-
-      return fullUrl;
-    }),
-    concatMap(fullUrl => {
-      let maybeRequest = npmPackageJsonCache.get(fullUrl.toString());
-      if (maybeRequest) {
-        return maybeRequest;
-      }
-
-      const registryKey = `//${fullUrl.host}/`;
-
-      return concat(
-        getNpmConfigOption('proxy'),
-        getNpmConfigOption('https-proxy'),
-        getNpmConfigOption('strict-ssl'),
-        getNpmConfigOption('cafile'),
-        getNpmConfigOption('_auth'),
-        getNpmConfigOption('user-agent'),
-        getNpmConfigOption('_authToken', registryKey),
-        getNpmConfigOption('username', registryKey, true),
-        getNpmConfigOption('password', registryKey, true),
-        getNpmConfigOption('email', registryKey, true),
-        getNpmConfigOption('always-auth', registryKey, true),
-      ).pipe(
-        toArray(),
-        concatMap(options => {
-          const [
-            http,
-            https,
-            strictSsl,
-            cafile,
-            token,
-            userAgent,
-            authToken,
-            username,
-            password,
-            email,
-            alwaysAuth,
-          ] = options;
-
-          const subject = new ReplaySubject<NpmRepositoryPackageJson>(1);
-
-          const sslOptions = getNpmClientSslOptions(strictSsl, cafile);
-
-          const auth: {
-            token?: string,
-            alwaysAuth?: boolean;
-            username?: string;
-            password?: string;
-            email?: string;
-          } = {};
-
-          if (alwaysAuth !== undefined) {
-            auth.alwaysAuth = alwaysAuth === 'false' ? false : !!alwaysAuth;
-          }
-
-          if (email) {
-            auth.email = email;
-          }
-
-          if (authToken) {
-            auth.token = authToken;
-          } else if (token) {
-            try {
-              // attempt to parse "username:password" from base64 token
-              // to enable Artifactory / Nexus-like repositories support
-              const delimiter = ':';
-              const parsedToken = Buffer.from(token, 'base64').toString('ascii');
-              const [extractedUsername, ...passwordArr] = parsedToken.split(delimiter);
-              const extractedPassword = passwordArr.join(delimiter);
-
-              if (extractedUsername && extractedPassword) {
-                auth.username = extractedUsername;
-                auth.password = extractedPassword;
-              } else {
-                throw new Error('Unable to extract username and password from _auth token');
-              }
-            } catch (ex) {
-              auth.token = token;
-            }
-          } else if (username) {
-            auth.username = username;
-            auth.password = password;
-          }
-
-          const client = new RegistryClient({
-            proxy: { http, https },
-            ssl: sslOptions,
-            ...(userAgent && {userAgent: userAgent}),
-          });
-          client.log.level = 'silent';
-          const params = {
-            timeout: 30000,
-            auth,
-          };
-
-          client.get(
-            fullUrl.toString(),
-            params,
-            (error: object, data: NpmRepositoryPackageJson) => {
-            if (error) {
-              subject.error(error);
-            }
-
-            subject.next(data);
-            subject.complete();
-          });
-
-          maybeRequest = subject.asObservable();
-          npmPackageJsonCache.set(fullUrl.toString(), maybeRequest);
+  const cachedResponse = npmPackageJsonCache.get(packageName);
+  if (cachedResponse) {
+    return cachedResponse;
+  }
 
-          return maybeRequest;
-        }),
-      );
-    }),
+  const resultPromise = pacote.packument(
+    packageName,
+    {
+      'full-metadata': true,
+      ...npmrc,
+      registry: registryUrl,
+    },
   );
 
+  const response = from<NpmRepositoryPackageJson>(resultPromise).pipe(shareReplay());
+  npmPackageJsonCache.set(packageName, response);
+
+  return response;
 }
diff --git a/yarn.lock b/yarn.lock
index dce6f3949ebd..c5a5f9f5b4d8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -726,6 +726,14 @@ JSONStream@^1.0.4:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
+JSONStream@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
+  integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
+  dependencies:
+    jsonparse "^1.2.0"
+    through ">=2.2.7 <3"
+
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -766,13 +774,20 @@ after@0.8.2:
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
   integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
 
-agent-base@^4.1.0:
+agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
   integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
   dependencies:
     es6-promisify "^5.0.0"
 
+agentkeepalive@^3.4.1:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67"
+  integrity sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==
+  dependencies:
+    humanize-ms "^1.2.1"
+
 ajv-errors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.0.tgz#ecf021fa108fd17dfb5e6b383f2dd233e31ffc59"
@@ -1249,7 +1264,7 @@ blocking-proxy@^1.0.0:
   dependencies:
     minimist "^1.2.0"
 
-bluebird@^3.3.0, bluebird@^3.5.1:
+bluebird@^3.3.0, bluebird@^3.5.1, bluebird@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a"
   integrity sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==
@@ -1549,7 +1564,7 @@ cacache@^10.0.4:
     unique-filename "^1.1.0"
     y18n "^4.0.0"
 
-cacache@^11.0.2:
+cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0:
   version "11.2.0"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.2.0.tgz#617bdc0b02844af56310e411c0878941d5739965"
   integrity sha512-IFWl6lfK6wSeYCHUXh+N1lY72UDrpyrYQJNIVQf48paDuWbv5RbAtJYf/4gUQFObTCHZwdZ5sI8Iw7nqwP6nlQ==
@@ -2007,7 +2022,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@~1.6.0:
+concat-stream@^1.5.0, concat-stream@~1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -2479,6 +2494,13 @@ debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.
   dependencies:
     ms "2.0.0"
 
+debug@3.1.0, debug@~3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
+  dependencies:
+    ms "2.0.0"
+
 debug@^3.1.0:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.4.tgz#82123737c51afbe9609a2b5dfe9664e7487171f0"
@@ -2493,13 +2515,6 @@ debug@^3.2.5:
   dependencies:
     ms "^2.1.1"
 
-debug@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
@@ -2837,6 +2852,13 @@ encodeurl@~1.0.1, encodeurl@~1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
+encoding@^0.1.11:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
+  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
+  dependencies:
+    iconv-lite "~0.4.13"
+
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
@@ -2903,6 +2925,11 @@ env-variable@0.0.x:
   resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.4.tgz#0d6280cf507d84242befe35a512b5ae4be77c54e"
   integrity sha512-+jpGxSWG4vr6gVxUHOc4p+ilPnql7NzZxOZBxNldsKGjCF+97df3CbuX7XMaDa5oAVkKQj4rKp38rYdC4VcpDg==
 
+err-code@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
+  integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=
+
 errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
@@ -3297,7 +3324,7 @@ fecha@^2.3.3:
   resolved "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd"
   integrity sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==
 
-figgy-pudding@^3.1.0, figgy-pudding@^3.5.1:
+figgy-pudding@^3.1.0, figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
   integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
@@ -3592,6 +3619,11 @@ gaze@^1.0.0:
   dependencies:
     globule "^1.0.0"
 
+genfun@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
+  integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==
+
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
@@ -3618,6 +3650,13 @@ get-stream@3.0.0, get-stream@^3.0.0:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
   integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
 
+get-stream@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+  dependencies:
+    pump "^3.0.0"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -3718,7 +3757,7 @@ glob@7.0.x:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
+glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
   integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
@@ -4013,7 +4052,7 @@ html-entities@^1.2.0:
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
   integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
 
-http-cache-semantics@3.8.1:
+http-cache-semantics@3.8.1, http-cache-semantics@^3.8.1:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
   integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
@@ -4048,6 +4087,14 @@ http-parser-js@>=0.4.0:
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.13.tgz#3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"
   integrity sha1-O9bW/ebjFyyTNMOzO2wZPYD+ETc=
 
+http-proxy-agent@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
+  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
+  dependencies:
+    agent-base "4"
+    debug "3.1.0"
+
 http-proxy-middleware@~0.18.0:
   version "0.18.0"
   resolved "http://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
@@ -4089,6 +4136,13 @@ https-proxy-agent@^2.2.1:
     agent-base "^4.1.0"
     debug "^3.1.0"
 
+humanize-ms@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+  integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=
+  dependencies:
+    ms "^2.0.0"
+
 husky@^0.14.3:
   version "0.14.3"
   resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3"
@@ -4110,7 +4164,7 @@ iconv-lite@0.4.23:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.4.24, iconv-lite@^0.4.4:
+iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -4896,7 +4950,7 @@ json-buffer@3.0.0:
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
   integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
 
-json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
+json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
@@ -5341,7 +5395,7 @@ lru-cache@2.2.x:
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d"
   integrity sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=
 
-lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.3:
+lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
   integrity sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==
@@ -5375,6 +5429,23 @@ make-error@^1.1.1:
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
   integrity sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==
 
+make-fetch-happen@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz#141497cb878f243ba93136c83d8aba12c216c083"
+  integrity sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==
+  dependencies:
+    agentkeepalive "^3.4.1"
+    cacache "^11.0.1"
+    http-cache-semantics "^3.8.1"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.1"
+    lru-cache "^4.1.2"
+    mississippi "^3.0.0"
+    node-fetch-npm "^2.0.2"
+    promise-retry "^1.1.1"
+    socks-proxy-agent "^4.0.0"
+    ssri "^6.0.0"
+
 map-age-cleaner@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz#098fb15538fd3dbe461f12745b0ca8568d4e3f74"
@@ -5639,6 +5710,14 @@ minipass@^2.2.1, minipass@^2.3.3:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
+minipass@^2.3.5:
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
+  integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
 minizlib@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
@@ -5723,7 +5802,7 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@^2.1.1:
+ms@^2.0.0, ms@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
@@ -5824,6 +5903,15 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
+node-fetch-npm@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7"
+  integrity sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==
+  dependencies:
+    encoding "^0.1.11"
+    json-parse-better-errors "^1.0.0"
+    safe-buffer "^5.1.1"
+
 node-fetch@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.2.0.tgz#4ee79bde909262f9775f731e3656d0db55ced5b5"
@@ -5951,7 +6039,7 @@ nopt@^4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, "normalize-package-data@~1.0.1 || ^2.0.0":
+normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
   integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==
@@ -5992,7 +6080,7 @@ npm-bundled@^1.0.1:
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
   integrity sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==
 
-"npm-package-arg@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0":
+npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
   integrity sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==
@@ -6002,6 +6090,14 @@ npm-bundled@^1.0.1:
     semver "^5.5.0"
     validate-npm-package-name "^3.0.0"
 
+npm-packlist@^1.1.12:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a"
+  integrity sha512-WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g==
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+
 npm-packlist@^1.1.6:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de"
@@ -6010,24 +6106,25 @@ npm-packlist@^1.1.6:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
-npm-registry-client@8.6.0:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-8.6.0.tgz#7f1529f91450732e89f8518e0f21459deea3e4c4"
-  integrity sha512-Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg==
+npm-pick-manifest@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.1.0.tgz#dc381bdd670c35d81655e1d5a94aa3dd4d87fce5"
+  integrity sha512-q9zLP8cTr8xKPmMZN3naxp1k/NxVFsjxN6uWuO1tiw9gxg7wZWQ/b5UTfzD0ANw2q1lQxdLKTeCCksq+bPSgbQ==
   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-package-arg "^6.0.0"
+    semver "^5.4.1"
+
+npm-registry-fetch@^3.8.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-3.8.0.tgz#aa7d9a7c92aff94f48dba0984bdef4bd131c88cc"
+  integrity sha512-hrw8UMD+Nob3Kl3h8Z/YjmKamb1gf7D1ZZch2otrIXM3uFLB5vjEY6DhMlq80z/zZet6eETLbOXcuQudCB3Zpw==
+  dependencies:
+    JSONStream "^1.3.4"
+    bluebird "^3.5.1"
+    figgy-pudding "^3.4.1"
+    lru-cache "^4.1.3"
+    make-fetch-happen "^4.0.1"
+    npm-package-arg "^6.1.0"
 
 npm-run-path@^2.0.0:
   version "2.0.2"
@@ -6036,7 +6133,7 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-"npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.0, npmlog@^4.0.2:
+"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@@ -6139,7 +6236,7 @@ on-headers@~1.0.1:
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
   integrity sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=
 
-once@1.x, once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
+once@1.x, once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
@@ -6325,6 +6422,39 @@ package-json@^4.0.0:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
+pacote@9.1.1:
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.1.1.tgz#25091f75a25021de8be8d34cc6408728fca3579b"
+  integrity sha512-f28Rq5ozzKAA9YwIKw61/ipwAatUZseYmVssDbHHaexF0wRIVotapVEZPAjOT7Eu3LYVqEp0NVpNizoAnYBUaA==
+  dependencies:
+    bluebird "^3.5.2"
+    cacache "^11.2.0"
+    figgy-pudding "^3.5.1"
+    get-stream "^4.1.0"
+    glob "^7.1.3"
+    lru-cache "^4.1.3"
+    make-fetch-happen "^4.0.1"
+    minimatch "^3.0.4"
+    minipass "^2.3.5"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    normalize-package-data "^2.4.0"
+    npm-package-arg "^6.1.0"
+    npm-packlist "^1.1.12"
+    npm-pick-manifest "^2.1.0"
+    npm-registry-fetch "^3.8.0"
+    osenv "^0.1.5"
+    promise-inflight "^1.0.1"
+    promise-retry "^1.1.1"
+    protoduck "^5.0.1"
+    rimraf "^2.6.2"
+    safe-buffer "^5.1.2"
+    semver "^5.6.0"
+    ssri "^6.0.1"
+    tar "^4.4.6"
+    unique-filename "^1.1.1"
+    which "^1.3.1"
+
 pako@^0.2.5:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
@@ -6699,6 +6829,14 @@ promise-inflight@^1.0.1:
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
   integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
+promise-retry@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
+  integrity sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=
+  dependencies:
+    err-code "^1.0.0"
+    retry "^0.10.0"
+
 promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
@@ -6723,6 +6861,13 @@ protobufjs@5.0.0:
     glob "^5.0.10"
     yargs "^3.10.0"
 
+protoduck@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f"
+  integrity sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==
+  dependencies:
+    genfun "^5.0.0"
+
 protractor@~5.4.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.4.1.tgz#011a99e38df7aa45d22455b889ffbb13a6ce0bd9"
@@ -7241,7 +7386,7 @@ request@2.87.0:
     tunnel-agent "^0.6.0"
     uuid "^3.1.0"
 
-request@^2.74.0, request@^2.83.0, request@^2.87.0:
+request@^2.83.0, request@^2.87.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
   integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
@@ -7571,11 +7716,16 @@ semver-intersect@1.4.0:
   dependencies:
     semver "^5.0.0"
 
-"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", semver@5.5.1, semver@^5.0.0, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.5.0:
+"semver@2 || 3 || 4 || 5", semver@5.5.1, semver@^5.0.0, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.5.0:
   version "5.5.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
   integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
 
+semver@^5.4.1, semver@^5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
+
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -7733,11 +7883,16 @@ slash@^1.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
   integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
-slide@^1.1.3, slide@~1.1.3:
+slide@~1.1.3:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
   integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=
 
+smart-buffer@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.1.tgz#07ea1ca8d4db24eb4cac86537d7d18995221ace3"
+  integrity sha512-RFqinRVJVcCAL9Uh1oVqE6FZkqsyLiVOYEZ20TqIOjuX7iFVJ+zsbs4RIghnw/pTs7mZvt8ZHhvm1ZUrR4fykg==
+
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -7846,6 +8001,22 @@ sockjs@0.3.19:
     faye-websocket "^0.10.0"
     uuid "^3.0.1"
 
+socks-proxy-agent@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz#5936bf8b707a993079c6f37db2091821bffa6473"
+  integrity sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==
+  dependencies:
+    agent-base "~4.2.0"
+    socks "~2.2.0"
+
+socks@~2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.2.1.tgz#68ad678b3642fbc5d99c64c165bc561eab0215f9"
+  integrity sha512-0GabKw7n9mI46vcNrVfs0o6XzWzjVa3h6GaSo2UPxtWAROXUWavfJWh1M4PR5tnE0dcnQXZIDFP4yrAysLze/w==
+  dependencies:
+    ip "^1.1.5"
+    smart-buffer "^4.0.1"
+
 sort-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
@@ -8101,7 +8272,7 @@ ssri@^5.2.4:
   dependencies:
     safe-buffer "^5.1.1"
 
-ssri@^6.0.0:
+ssri@^6.0.0, ssri@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
   integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
@@ -8388,7 +8559,7 @@ tar@^2.0.0:
     fstream "^1.0.2"
     inherits "2"
 
-tar@^4, tar@^4.4.4:
+tar@^4, tar@^4.4.4, tar@^4.4.6:
   version "4.4.6"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
   integrity sha512-tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg==
@@ -8783,6 +8954,13 @@ unique-filename@^1.1.0:
   dependencies:
     unique-slug "^2.0.0"
 
+unique-filename@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
+  dependencies:
+    unique-slug "^2.0.0"
+
 unique-slug@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.0.tgz#db6676e7c7cc0629878ff196097c78855ae9f4ab"
@@ -9227,7 +9405,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@1, which@^1.1.1, which@^1.2.1, which@^1.2.9:
+which@1, which@^1.1.1, which@^1.2.1, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==

From 2d4332f0caf61607cc44f697dbf17c96bc5a67c2 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Sun, 21 Oct 2018 20:31:08 -0400
Subject: [PATCH 0361/1703] fix(@schematics/angular): migrate build-angular for
 7.0 RC users

Fixes #12647
---
 .../schematics/angular/migrations/migration-collection.json  | 5 +++++
 packages/schematics/angular/migrations/update-7/index.ts     | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/angular/migrations/migration-collection.json b/packages/schematics/angular/migrations/migration-collection.json
index b6836ed7aacd..5d789a24cb50 100644
--- a/packages/schematics/angular/migrations/migration-collection.json
+++ b/packages/schematics/angular/migrations/migration-collection.json
@@ -19,6 +19,11 @@
       "version": "7.1.0-beta.0",
       "factory": "./update-7/index#typeScriptHelpersRule",
       "description": "Update an Angular CLI project to version 7."
+    },
+    "migration-05": {
+      "version": "7.0.4",
+      "factory": "./update-7",
+      "description": "Update an Angular CLI project to version 7."
     }
   }
 }
diff --git a/packages/schematics/angular/migrations/update-7/index.ts b/packages/schematics/angular/migrations/update-7/index.ts
index 283fa59ad7cd..b54923bd3341 100644
--- a/packages/schematics/angular/migrations/update-7/index.ts
+++ b/packages/schematics/angular/migrations/update-7/index.ts
@@ -20,8 +20,11 @@ export { typeScriptHelpersRule } from './typescript-helpers';
 export default function(): Rule {
   return (tree, context) => {
     const existing = getPackageJsonDependency(tree, '@angular-devkit/build-angular');
-    const type = existing ? existing.type : NodeDependencyType.Dev;
+    if (existing && latestVersions.DevkitBuildAngular === existing.version) {
+      return;
+    }
 
+    const type = existing ? existing.type : NodeDependencyType.Dev;
     addPackageJsonDependency(
       tree,
       {

From c24afaf31cf1c39f8652dad9ab151b377b04d5a6 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 23 Oct 2018 18:13:42 +0200
Subject: [PATCH 0362/1703] fix(@schematics/angular): experimentalIvy creates
 project using `next` packages

Close: #12667
---
 packages/schematics/angular/ng-new/index.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/schematics/angular/ng-new/index.ts b/packages/schematics/angular/ng-new/index.ts
index aab49ab4a894..7ce9e5e8f2a7 100644
--- a/packages/schematics/angular/ng-new/index.ts
+++ b/packages/schematics/angular/ng-new/index.ts
@@ -40,7 +40,6 @@ export default function (options: NgNewOptions): Rule {
   const workspaceOptions: WorkspaceOptions = {
     name: options.name,
     version: options.version,
-    experimentalAngularNext: options.experimentalIvy,
     newProjectRoot: options.newProjectRoot || 'projects',
     minimal: options.minimal,
   };

From b38a13dc02cf894679dc4bf40e010e66e741e7a5 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 24 Oct 2018 20:57:31 +0200
Subject: [PATCH 0363/1703] fix(@angular-devkit/schematics): upgrade
 refactoring with tslint emits too much whitespace

Fixes #12653
---
 .../angular_devkit/schematics/tasks/tslint-fix/executor.ts   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/schematics/tasks/tslint-fix/executor.ts b/packages/angular_devkit/schematics/tasks/tslint-fix/executor.ts
index dc8f19b83cc6..d933945d5f53 100644
--- a/packages/angular_devkit/schematics/tasks/tslint-fix/executor.ts
+++ b/packages/angular_devkit/schematics/tasks/tslint-fix/executor.ts
@@ -182,7 +182,10 @@ export default function(): TaskExecutor<TslintFixTaskOptions> {
         }
         const formatter = new Formatter();
 
-        const output = formatter.format(result.failures, result.fixes);
+        // Certain tslint formatters outputs '\n' when there are no failures.
+        // This will bloat the console when having schematics running refactor tasks.
+        // see https://github.com/palantir/tslint/issues/4244
+        const output = (formatter.format(result.failures, result.fixes) || '').trim();
         if (output) {
           context.logger.info(output);
         }

From a3b05a0283f3497c6915091d4549daae76e9406c Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@umich.edu>
Date: Fri, 19 Oct 2018 17:42:04 -0700
Subject: [PATCH 0364/1703] build: Use fine-grained node_module deps

This commit updates the BUILD files to specify fine-grained node_module deps
by replacing "@typings" comments with actual @npm node module.

Moved tools/bazel.rc -> .bazelrc

Removed "jasmine" typings from base tsconfig.json

Added @bazel/karma to devDependencies, needed for `ts_web_test`
---
 .bazelignore                                  |    2 +
 tools/bazel.rc => .bazelrc                    |    0
 .circleci/config.yml                          |   10 +-
 BUILD                                         |   68 +-
 WORKSPACE                                     |   82 +-
 package.json                                  |   10 +-
 packages/angular/cli/BUILD                    |    6 +-
 packages/angular/pwa/BUILD                    |    2 +-
 packages/angular_devkit/architect/BUILD       |    1 +
 packages/angular_devkit/architect_cli/BUILD   |    2 +
 packages/angular_devkit/benchmark/BUILD       |   20 +-
 packages/angular_devkit/build_optimizer/BUILD |   20 +-
 packages/angular_devkit/core/BUILD            |   39 +-
 packages/angular_devkit/core/node/resolve.ts  |    6 +
 packages/angular_devkit/schematics/BUILD      |   49 +-
 packages/angular_devkit/schematics_cli/BUILD  |    5 +-
 packages/schematics/angular/BUILD             |   16 +-
 packages/schematics/schematics/BUILD          |    8 +-
 packages/schematics/update/BUILD              |   19 +-
 scripts/validate-licenses.ts                  |    1 +
 .../tools/file-system-engine-host/BUILD       |   10 +-
 tools/BUILD                                   |    6 +-
 tools/build_event_protocol/BUILD              |    3 +
 tools/ts_json_schema.bzl                      |    3 +
 tsconfig-test.json                            |    9 +
 tsconfig.json                                 |    1 -
 yarn.lock                                     | 2970 +++++++----------
 27 files changed, 1502 insertions(+), 1866 deletions(-)
 create mode 100644 .bazelignore
 rename tools/bazel.rc => .bazelrc (100%)
 create mode 100644 tsconfig-test.json

diff --git a/.bazelignore b/.bazelignore
new file mode 100644
index 000000000000..de4d1f007dd1
--- /dev/null
+++ b/.bazelignore
@@ -0,0 +1,2 @@
+dist
+node_modules
diff --git a/tools/bazel.rc b/.bazelrc
similarity index 100%
rename from tools/bazel.rc
rename to .bazelrc
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1f24b8304721..46c3418b9b57 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,8 +12,8 @@
 ## IMPORTANT
 # If you change the `docker_image` version, also change the `cache_key` suffix and the version of
 # `com_github_bazelbuild_buildtools` in the `/WORKSPACE` file.
-var_1: &docker_image angular/ngcontainer:0.5.0
-var_2: &cache_key angular_devkit-{{ checksum "yarn.lock" }}-0.5.0
+var_1: &docker_image angular/ngcontainer:0.7.0
+var_2: &cache_key angular_devkit-{{ checksum "yarn.lock" }}-0.7.0
 var_3: &node_8_docker_image angular/ngcontainer:0.3.3
 
 # Settings common to each job
@@ -49,7 +49,7 @@ jobs:
           <<: *root_package_lock_key
           paths:
             - ~/.cache/yarn
-  
+
   lint:
     <<: *defaults
     steps:
@@ -89,12 +89,12 @@ jobs:
       - store_artifacts:
           path: /tmp/dist
           destination: cli/new-production
-  
+
   e2e-node-8:
     <<: *defaults
     # Overwrite docker image to node 8.
     docker:
-      - image: *node_8_docker_image    
+      - image: *node_8_docker_image
     environment:
       BASH_ENV: ~/.profile
     resource_class: xlarge
diff --git a/BUILD b/BUILD
index 10cfed3bc771..a1c5b6b5ac0e 100644
--- a/BUILD
+++ b/BUILD
@@ -9,72 +9,6 @@ licenses(["notice"])  # MIT License
 exports_files([
     "LICENSE",
     "tsconfig.json",  # @external
+    "tsconfig-test.json",  # @external
     "tslint.base.json",  # @external
 ])
-
-# NOTE: this will move to node_modules/BUILD in a later release
-# @external_begin
-NODE_MODULES_EXCLUDE = [
-    # e.g. node_modules/adm-zip/test/assets/attributes_test/New folder/hidden.txt
-    "node_modules/**/test/**",
-    # e.g. node_modules/xpath/docs/function resolvers.md
-    "node_modules/**/docs/**",
-    # e.g. node_modules/puppeteer/.local-chromium/mac-536395/chrome-mac/Chromium.app/Contents/Versions/66.0.3347.0/Chromium Framework.framework/Chromium Framework
-    "node_modules/**/.*/**",
-    # Ignore paths with spaces.
-    "node_modules/**/* *",
-]
-
-filegroup(
-    name = "node_modules",
-    srcs = glob(
-        # Only include files we might use, to reduce the file count and surface size of 
-        # filename problems.
-        [
-            "node_modules/**/*.js",
-            "node_modules/**/*.json",
-            "node_modules/**/*.d.ts",
-        ],
-        exclude = NODE_MODULES_EXCLUDE,
-    ) + glob(["node_modules/.bin/*"]),
-)
-
-# node_modules filegroup for tools/quicktype_runner, which contains quicktype-core and tslint.
-QUICKTYPE_TRANSITIVE_DEPENDENCIES = [
-    "collection-utils",
-    "core-util-is",
-    "inherits",
-    "isarray",
-    "js-base64",
-    "pako",
-    "pluralize",
-    "process-nextick-args",
-    "quicktype-core",
-    "readable-stream",
-    "safe-buffer",
-    "stream-json",
-    "string-to-stream",
-    "tiny-inflate",
-    "unicode-properties",
-    "unicode-trie",
-    "urijs",
-    "util-deprecate",
-    "wordwrap",
-]
-
-filegroup(
-    name = "quicktype_node_modules",
-    srcs = glob(
-        [
-            "/".join([
-                "node_modules", "**", pkg, "**/*.js",
-            ]) for pkg in QUICKTYPE_TRANSITIVE_DEPENDENCIES
-        ] + [
-            "/".join([
-                "node_modules", "**", pkg, "**/*.json",
-            ]) for pkg in QUICKTYPE_TRANSITIVE_DEPENDENCIES
-        ],
-        exclude = NODE_MODULES_EXCLUDE,
-    )
-)
-# @external_end
diff --git a/WORKSPACE b/WORKSPACE
index 14eab931653d..275af432ac1d 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,4 +1,4 @@
-workspace(name = "angular_devkit")
+workspace(name = "angular_cli")
 
 # We get Buildifier from here.
 http_archive(
@@ -8,85 +8,71 @@ http_archive(
     sha256 = "76d1837a86fa6ef5b4a07438f8489f00bfa1b841e5643b618e01232ba884b1fe",
 )
 
-load("@com_github_bazelbuild_buildtools//buildifier:deps.bzl", "buildifier_dependencies")
-buildifier_dependencies()
-
-# The Go toolchain is used for Buildifier.
-# rules_typescript_dependencies() also tries to load it but we add it explicitely so we
-# don't have hidden dependencies. 
-# This also means we need to load it before rules_typescript_dependencies().
-http_archive(
-    name = "io_bazel_rules_go",
-    url = "https://github.com/bazelbuild/rules_go/archive/0.14.0.zip",
-    strip_prefix = "rules_go-0.14.0",
-    sha256 = "9bd7c2743f014e4e112b671098ba1da6aec036fe07093b10ca39a9f81ec5cc33",
-)
-
-load("@io_bazel_rules_go//go:def.bzl", "go_register_toolchains", "go_rules_dependencies")
-go_rules_dependencies()
-go_register_toolchains()
-
-# We need a minimum of this version to include https://github.com/bazelbuild/rules_nodejs/pull/281.
-http_archive(
-    name = "build_bazel_rules_nodejs",
-    url = "https://github.com/bazelbuild/rules_nodejs/archive/0.12.4.zip",
-    strip_prefix = "rules_nodejs-0.12.4",
-    sha256 = "c482700e032b4df60425cb9a6f8f28152fb1c4c947a9d61e6132fc59ce332b16",
-)
-
 # Load the TypeScript rules, its dependencies, and setup the workspace.
 http_archive(
     name = "build_bazel_rules_typescript",
-    url = "https://github.com/bazelbuild/rules_typescript/archive/0.16.1.zip",
-    strip_prefix = "rules_typescript-0.16.1",
-    sha256 = "5b2b0bc63cfcffe7bf97cad2dad3b26a73362f806de66207051f66c87956a995",
+    url = "https://github.com/bazelbuild/rules_typescript/archive/0.20.3.zip",
+    strip_prefix = "rules_typescript-0.20.3",
 )
 
 load("@build_bazel_rules_typescript//:package.bzl", "rules_typescript_dependencies")
 # build_bazel_rules_nodejs is loaded transitively through rules_typescript_dependencies.
 rules_typescript_dependencies()
 
+load("@com_github_bazelbuild_buildtools//buildifier:deps.bzl", "buildifier_dependencies")
+buildifier_dependencies()
+
+load("@io_bazel_rules_go//go:def.bzl", "go_register_toolchains", "go_rules_dependencies")
+go_rules_dependencies()
+go_register_toolchains()
+
 load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
 ts_setup_workspace()
 
-# Load the nodejs dependencies, check minimum Bazel version, and define the local node_modules.
-load("@build_bazel_rules_nodejs//:package.bzl", "rules_nodejs_dependencies")
-rules_nodejs_dependencies()
-
-load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories")
-check_bazel_version("0.15.0")
+load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
+# 0.18.0 is needed for .bazelignore
+check_bazel_version("0.18.0")
 node_repositories(
-    package_json = ["//:package.json"], 
-    preserve_symlinks = True,
     node_version = "10.9.0",
     yarn_version = "1.9.2",
     node_repositories = {
         "10.9.0-darwin_amd64": (
-            "node-v10.9.0-darwin-x64.tar.gz", 
-            "node-v10.9.0-darwin-x64", 
+            "node-v10.9.0-darwin-x64.tar.gz",
+            "node-v10.9.0-darwin-x64",
             "3c4fe75dacfcc495a432a7ba2dec9045cff359af2a5d7d0429c84a424ef686fc"
         ),
         "10.9.0-linux_amd64": (
-            "node-v10.9.0-linux-x64.tar.xz", 
-            "node-v10.9.0-linux-x64", 
+            "node-v10.9.0-linux-x64.tar.xz",
+            "node-v10.9.0-linux-x64",
             "c5acb8b7055ee0b6ac653dc4e458c5db45348cecc564b388f4ed1def84a329ff"
         ),
         "10.9.0-windows_amd64": (
-            "node-v10.9.0-win-x64.zip", 
-            "node-v10.9.0-win-x64", 
+            "node-v10.9.0-win-x64.zip",
+            "node-v10.9.0-win-x64",
             "6a75cdbb69d62ed242d6cbf0238a470bcbf628567ee339d4d098a5efcda2401e"
         ),
     },
     yarn_repositories = {
         "1.9.2": (
-            "yarn-v1.9.2.tar.gz", 
-            "yarn-v1.9.2", 
+            "yarn-v1.9.2.tar.gz",
+            "yarn-v1.9.2",
             "3ad69cc7f68159a562c676e21998eb21b44138cae7e8fe0749a7d620cf940204"
         ),
     },
 )
 
-local_repository(
+yarn_install(
+    name = "npm",
+    package_json = "//:package.json",
+    yarn_lock = "//:yarn.lock",
+    data = [
+        "//:tools/yarn/check-yarn.js",
+    ],
+)
+
+http_archive(
     name = "rxjs",
-    path = "node_modules/rxjs/src",
+    url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz",
+    strip_prefix = "package/src",
+    sha256 = "72b0b4e517f43358f554c125e40e39f67688cd2738a8998b4a266981ed32f403",
 )
diff --git a/package.json b/package.json
index e2377af595f4..6291c323842d 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,8 @@
   "devDependencies": {
     "@angular/compiler": "^7.0.0-rc.0",
     "@angular/compiler-cli": "^7.0.0-rc.0",
-    "@bazel/typescript": "0.16.1",
+    "@bazel/karma": "^0.20.3",
+    "@bazel/typescript": "0.20.3",
     "@ngtools/json-schema": "^1.1.0",
     "@types/copy-webpack-plugin": "^4.4.1",
     "@types/express": "^4.16.0",
@@ -92,6 +93,7 @@
     "@types/webpack": "^4.4.11",
     "@types/webpack-dev-server": "^3.1.0",
     "@types/webpack-sources": "^0.1.5",
+    "ajv": "6.5.3",
     "common-tags": "^1.8.0",
     "conventional-changelog": "^1.1.0",
     "conventional-commits-parser": "^3.0.0",
@@ -101,9 +103,14 @@
     "istanbul": "^0.4.5",
     "jasmine": "^2.6.0",
     "jasmine-spec-reporter": "^3.2.0",
+    "karma-jasmine-html-reporter": "^0.2.2",
     "license-checker": "^20.1.0",
     "minimatch": "^3.0.4",
     "minimist": "^1.2.0",
+    "npm-registry-client": "^8.6.0",
+    "pacote": "^9.2.3",
+    "pidtree": "^0.3.0",
+    "pidusage": "^2.0.17",
     "rxjs": "~6.3.0",
     "semver": "^5.3.0",
     "source-map": "^0.5.6",
@@ -111,6 +118,7 @@
     "spdx-satisfies": "^4.0.0",
     "tar": "^4.4.4",
     "through2": "^2.0.3",
+    "tree-kill": "^1.2.0",
     "ts-node": "^5.0.0",
     "tslint-no-circular-imports": "^0.5.0",
     "tslint-sonarts": "^1.7.0"
diff --git a/packages/angular/cli/BUILD b/packages/angular/cli/BUILD
index 859e31338d4c..13373957a7ac 100644
--- a/packages/angular/cli/BUILD
+++ b/packages/angular/cli/BUILD
@@ -29,9 +29,9 @@ ts_library(
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:tools",
         # @typings: es2017.object
-        # @typings: inquirer
-        # @typings: node
-        # @typings: semver
+        "@npm//@types/node",
+        "@npm//@types/inquirer",
+        "@npm//@types/semver",
     ],
 )
 
diff --git a/packages/angular/pwa/BUILD b/packages/angular/pwa/BUILD
index 84fbbcf1d5cf..1ff99f111fb9 100644
--- a/packages/angular/pwa/BUILD
+++ b/packages/angular/pwa/BUILD
@@ -30,7 +30,7 @@ ts_library(
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/schematics",
         "@rxjs",
-        # @typings: node
+        "@npm//@types/node",
     ],
 )
 
diff --git a/packages/angular_devkit/architect/BUILD b/packages/angular_devkit/architect/BUILD
index c7d7d97b98b1..976b9caaaa53 100644
--- a/packages/angular_devkit/architect/BUILD
+++ b/packages/angular_devkit/architect/BUILD
@@ -26,5 +26,6 @@ ts_library(
         "//packages/angular_devkit/core:node",
         "@rxjs",
         "@rxjs//operators",
+        "@npm//@types/node",
     ],
 )
diff --git a/packages/angular_devkit/architect_cli/BUILD b/packages/angular_devkit/architect_cli/BUILD
index 8beaa43550fe..225116f0cf1d 100644
--- a/packages/angular_devkit/architect_cli/BUILD
+++ b/packages/angular_devkit/architect_cli/BUILD
@@ -20,5 +20,7 @@ ts_library(
         "//packages/angular_devkit/core:node",
         "@rxjs",
         "@rxjs//operators",
+        "@npm//@types/node",
+        "@npm//@types/minimist",
     ],
 )
diff --git a/packages/angular_devkit/benchmark/BUILD b/packages/angular_devkit/benchmark/BUILD
index 6069d782dc0a..faf0b59b8de9 100644
--- a/packages/angular_devkit/benchmark/BUILD
+++ b/packages/angular_devkit/benchmark/BUILD
@@ -27,7 +27,8 @@ ts_library(
         "//packages/angular_devkit/core:node",
         "@rxjs",
         "@rxjs//operators",
-        # @typings: node
+        "@npm//@types/node",
+        "@npm//@types/minimist",
     ],
 )
 
@@ -50,12 +51,23 @@ ts_library(
         "//packages/angular_devkit/core:node",
         "@rxjs",
         "@rxjs//operators",
-        # @typings: jasmine
-        # @typings: node
+        "@npm//@types/node",
+        "@npm//@types/jasmine",
     ],
+    testonly = True,
+    tsconfig = "//:tsconfig-test.json",
 )
 
 jasmine_node_test(
     name = "benchmark_test",
     srcs = [":benchmark_test_lib"],
-)
\ No newline at end of file
+    deps = [
+        "@npm//jasmine",
+        "@npm//source-map",
+        "@npm//minimist",
+        "@npm//pidusage",
+        "@npm//pidtree",
+        "@npm//tree-kill",
+        "@npm//temp",
+    ],
+)
diff --git a/packages/angular_devkit/build_optimizer/BUILD b/packages/angular_devkit/build_optimizer/BUILD
index a733b2a06d36..23c483e63979 100644
--- a/packages/angular_devkit/build_optimizer/BUILD
+++ b/packages/angular_devkit/build_optimizer/BUILD
@@ -23,7 +23,12 @@ ts_library(
             "src/**/*_benchmark.ts",
         ],
     ),
-    deps = [],
+    deps = [
+        "@npm//@types/node",
+        "@npm//@types/source-map",
+        "@npm//typescript",
+        "@npm//@types/webpack",
+    ],
 )
 
 ts_library(
@@ -37,12 +42,19 @@ ts_library(
     deps = [
         ":build_optimizer",
         "//packages/angular_devkit/core",
-        # @typings: jasmine
-        # @typings: node
+        "@npm//@types/node",
+        "@npm//@types/jasmine",
+        "@npm//@types/source-map",
     ],
+    testonly = True,
+    tsconfig = "//:tsconfig-test.json",
 )
 
 jasmine_node_test(
     name = "build_optimizer_test",
     srcs = [":build_optimizer_test_lib"],
-)
\ No newline at end of file
+    deps = [
+        "@npm//jasmine",
+        "@npm//source-map",
+    ],
+)
diff --git a/packages/angular_devkit/core/BUILD b/packages/angular_devkit/core/BUILD
index 770dcf3adc77..1086e5546dbd 100644
--- a/packages/angular_devkit/core/BUILD
+++ b/packages/angular_devkit/core/BUILD
@@ -27,12 +27,12 @@ ts_library(
     deps = [
         "@rxjs",
         "@rxjs//operators",
+        "@npm//@types/node",
+        "@npm//@types/source-map",
+        "@npm//ajv",
         # @typings: es2015.core
         # @typings: es2015.symbol.wellknown
         # @typings: es2016.array.include
-        # @typings: ajv
-        # @typings: node
-        # @typings: source-map
     ],
 )
 
@@ -49,18 +49,25 @@ ts_library(
         ":node",
         "@rxjs",
         "@rxjs//operators",
-        # @typings: jasmine
-        # @typings: node
+        "@npm//@types/node",
+        "@npm//@types/jasmine",
     ],
     data = [
         "src/workspace/workspace-schema.json",
-        "src/workspace/test/test-workspace.json"    
+        "src/workspace/test/test-workspace.json"
     ],
+    testonly = True,
+    tsconfig = "//:tsconfig-test.json",
 )
 
 jasmine_node_test(
     name = "core_test",
     srcs = [":core_test_lib"],
+    deps = [
+        "@npm//jasmine",
+        "@npm//source-map",
+        "@npm//chokidar",
+    ],
 )
 
 
@@ -83,7 +90,7 @@ ts_library(
         ":core",
         "@rxjs",
         "@rxjs//operators",
-        # @typings: node
+        "@npm//@types/node",
     ],
 )
 
@@ -100,14 +107,23 @@ ts_library(
         ":node",
         "@rxjs",
         "@rxjs//operators",
-        # @typings: jasmine
-        # @typings: node
+        "@npm//@types/node",
+        "@npm//@types/jasmine",
     ],
+    testonly = True,
+    tsconfig = "//:tsconfig-test.json",
 )
 
 jasmine_node_test(
     name = "node_test",
     srcs = [":node_test_lib"],
+    deps = [
+        "@npm//jasmine",
+        "@npm//chokidar",
+        "@npm//source-map",
+        "@npm//temp",
+        "@npm//tslint",
+    ],
 )
 
 
@@ -130,6 +146,7 @@ ts_library(
         ":node",
         "@rxjs",
         "@rxjs//operators",
-        # @typings: node
+        "@npm//@types/node",
+        "@npm//@types/jasmine",
     ],
-)
\ No newline at end of file
+)
diff --git a/packages/angular_devkit/core/node/resolve.ts b/packages/angular_devkit/core/node/resolve.ts
index 3f07f1170016..5a3e0712e6f6 100644
--- a/packages/angular_devkit/core/node/resolve.ts
+++ b/packages/angular_devkit/core/node/resolve.ts
@@ -260,6 +260,12 @@ export function resolve(x: string, options: ResolveOptions): string {
 
   function nodeModulesPaths(start: string, opts: ResolveOptions) {
     const modules = ['node_modules'];
+    if (process.env.BAZEL_TARGET) {
+      // When running test under Bazel, node_modules have to be resolved
+      // differently. node_modules are installed in the `npm` workspace.
+      // For more info, see `yarn_install` rule in WORKSPACE file.
+      modules.push(path.join('npm', 'node_modules'));
+    }
 
     // ensure that `start` is an absolute path at this point,
     // resolving against the process' current working directory
diff --git a/packages/angular_devkit/schematics/BUILD b/packages/angular_devkit/schematics/BUILD
index 613a672ff023..72f80df46937 100644
--- a/packages/angular_devkit/schematics/BUILD
+++ b/packages/angular_devkit/schematics/BUILD
@@ -28,7 +28,7 @@ ts_library(
         "//packages/angular_devkit/core:node",  # TODO: get rid of this for 6.0
         "@rxjs",
         "@rxjs//operators",
-        # @typings: node
+        "@npm//@types/node",
     ],
 )
 
@@ -47,14 +47,21 @@ ts_library(
         "//packages/angular_devkit/core:node",
         "@rxjs",
         "@rxjs//operators",
-        # @typings: jasmine
-        # @typings: node
+        "@npm//@types/node",
+        "@npm//@types/jasmine",
     ],
+    testonly = True,
+    tsconfig = "//:tsconfig-test.json",
 )
 
 jasmine_node_test(
     name = "schematics_test",
     srcs = [":schematics_test_lib"],
+    deps = [
+        "@npm//jasmine",
+        "@npm//source-map",
+        "@npm//chokidar",
+    ],
 )
 
 
@@ -79,9 +86,8 @@ ts_library(
         "//packages/angular_devkit/core:node",
         "@rxjs",
         "@rxjs//operators",
-        # @typings: node
-        # @typings: tslint
-        # @typings: typescript
+        "@npm//@types/node",
+        "@npm//tslint",
     ],
 )
 
@@ -105,9 +111,7 @@ ts_library(
         "//packages/angular_devkit/core:node",
         "@rxjs",
         "@rxjs//operators",
-        # @typings: node
-        # @typings: tslint
-        # @typings: typescript
+        "@npm//@types/node",
     ],
 )
 
@@ -133,15 +137,22 @@ ts_library(
         "//packages/angular_devkit/core:node_testing",
         "@rxjs",
         "@rxjs//operators",
-        # @typings: jasmine
-        # @typings: node
+        "@npm//@types/node",
+        "@npm//@types/jasmine",
     ],
+    testonly = True,
+    tsconfig = "//:tsconfig-test.json",
 )
 
 
 jasmine_node_test(
     name = "tasks_test",
     srcs = [":tasks_test_lib"],
+    deps = [
+        "@npm//jasmine",
+        "@npm//source-map",
+        "@npm//chokidar",
+    ],
 )
 
 
@@ -167,7 +178,7 @@ ts_library(
         "//packages/angular_devkit/core:node",
         "@rxjs",
         "@rxjs//operators",
-        # @typings: node
+        "@npm//@types/node",
     ],
 )
 
@@ -190,14 +201,21 @@ ts_library(
         "//tests/angular_devkit/schematics/tools/file-system-engine-host:file_system_engine_host_test_lib",
         "@rxjs",
         "@rxjs//operators",
-        # @typings: jasmine
-        # @typings: node
+        "@npm//@types/node",
+        "@npm//@types/jasmine",
     ],
+    testonly = True,
+    tsconfig = "//:tsconfig-test.json",
 )
 
 jasmine_node_test(
     name = "tools_test",
     srcs = [":tools_test_lib"],
+    deps = [
+        "@npm//jasmine",
+        "@npm//source-map",
+        "@npm//chokidar",
+    ],
 )
 
 
@@ -218,5 +236,6 @@ ts_library(
         "//packages/angular_devkit/core",
         "@rxjs",
         "@rxjs//operators",
+        "@npm//@types/node",
     ],
-)
\ No newline at end of file
+)
diff --git a/packages/angular_devkit/schematics_cli/BUILD b/packages/angular_devkit/schematics_cli/BUILD
index d073108dddb4..0b5266220542 100644
--- a/packages/angular_devkit/schematics_cli/BUILD
+++ b/packages/angular_devkit/schematics_cli/BUILD
@@ -31,6 +31,7 @@ ts_library(
         "//packages/angular_devkit/schematics:tools",
         "@rxjs",
         "@rxjs//operators",
-        # @typings: minimist
+        "@npm//@types/minimist",
+        "@npm//@types/node",
     ],
-)
\ No newline at end of file
+)
diff --git a/packages/schematics/angular/BUILD b/packages/schematics/angular/BUILD
index d0ffdd22fc2f..fc97c49508d9 100644
--- a/packages/schematics/angular/BUILD
+++ b/packages/schematics/angular/BUILD
@@ -49,8 +49,8 @@ ts_library(
         "//packages/angular_devkit/schematics:tasks",
         "@rxjs",
         "@rxjs//operators",
-        # @typings: typescript
-        # @typings: node
+        "@npm//@types/node",
+        "@npm//typescript",
     ],
 )
 
@@ -78,12 +78,20 @@ ts_library(
         "//packages/angular_devkit/schematics:testing",
         "@rxjs",
         "@rxjs//operators",
-        # @typings: jasmine
-        # @typings: node
+        "@npm//@types/node",
+        "@npm//@types/jasmine",
+        "@npm//typescript",
     ],
+    testonly = True,
+    tsconfig = "//:tsconfig-test.json",
 )
 
 jasmine_node_test(
     name = "angular_test",
     srcs = [":angular_test_lib"],
+    deps = [
+        "@npm//jasmine",
+        "@npm//source-map",
+        "@npm//chokidar",
+    ],
 )
diff --git a/packages/schematics/schematics/BUILD b/packages/schematics/schematics/BUILD
index dba3e58e6ee2..1222314155a1 100644
--- a/packages/schematics/schematics/BUILD
+++ b/packages/schematics/schematics/BUILD
@@ -32,7 +32,7 @@ ts_library(
         "//packages/angular_devkit/schematics:tasks",
         "@rxjs",
         "@rxjs//operators",
-        # @typings: node
+        "@npm//@types/node",
     ],
 )
 
@@ -76,9 +76,11 @@ ts_json_schema(
 #         "//packages/angular_devkit/schematics:testing",
 #         "@rxjs",
 #         "@rxjs//operators",
-#         # @typings: jasmine
-#         # @typings: node
+#         "@npm//@types/node",
+#         "@npm//@types/jasmine",
 #     ],
+#     testonly = True,
+#     tsconfig = "//:tsconfig-test.json",
 # )
 
 # jasmine_node_test(
diff --git a/packages/schematics/update/BUILD b/packages/schematics/update/BUILD
index fd55ec9502be..7a994d5db65c 100644
--- a/packages/schematics/update/BUILD
+++ b/packages/schematics/update/BUILD
@@ -29,7 +29,8 @@ ts_library(
         "//packages/angular_devkit/schematics:tasks",
         "@rxjs",
         "@rxjs//operators",
-        # @typings: node
+        "@npm//@types/node",
+        "@npm//@types/semver",
     ],
 )
 
@@ -63,12 +64,22 @@ ts_library(
         "//packages/angular_devkit/schematics:testing",
         "@rxjs",
         "@rxjs//operators",
-        # @typings: jasmine
-        # @typings: node
+        "@npm//@types/jasmine",
+        "@npm//@types/node",
+        "@npm//@types/semver",
+        "@npm//pacote",
     ],
+    testonly = True,
+    tsconfig = "//:tsconfig-test.json",
 )
 
 jasmine_node_test(
     name = "update_test",
     srcs = [":update_test_lib"],
-)
\ No newline at end of file
+    deps = [
+        "@npm//jasmine",
+        "@npm//source-map",
+        "@npm//chokidar",
+        "@npm//npm-registry-client",
+    ],
+)
diff --git a/scripts/validate-licenses.ts b/scripts/validate-licenses.ts
index 4033770858b0..42f9233980f2 100644
--- a/scripts/validate-licenses.ts
+++ b/scripts/validate-licenses.ts
@@ -71,6 +71,7 @@ const ignoredPackages = [
   'bitsyntax@0.0.4', // MIT but no license field in package.json
   'pako@1.0.6', // MIT but broken license in package.json
   'true-case-path@1.0.2', // Apache-2.0 but broken license in package.json
+  'uws@9.14.0', // zlib license
 
   // * Other
   'font-awesome@4.7.0', // (OFL-1.1 AND MIT)
diff --git a/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD b/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD
index dd3441d61396..0ed6399fcbd3 100644
--- a/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD
+++ b/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD
@@ -17,15 +17,15 @@ ts_library(
     ),
     data = glob(
         include = ["**/collection.json"],
-    ),    
+    ),
     deps = [
-        "//packages/angular_devkit/schematics:schematics",
+        "//packages/angular_devkit/schematics",
         # ":testing",
         # "//packages/angular_devkit/core",
         # "//packages/angular_devkit/core:node",
         # "@rxjs",
         # "@rxjs//operators",
-        # @typings: jasmine
-        # @typings: node
+        "@npm//@types/jasmine",
+        "@npm//@types/node",
     ],
-)
\ No newline at end of file
+)
diff --git a/tools/BUILD b/tools/BUILD
index 517fbaa9db28..4c09dc0603cf 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -10,10 +10,10 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
 nodejs_binary(
     name = 'quicktype_runner',
     data = [
-        ":quicktype_runner.js",
+        "quicktype_runner.js",
     ],
-    node_modules = "//:quicktype_node_modules",
-    entry_point = "angular_devkit/tools/quicktype_runner.js",
+    node_modules = "@npm//quicktype-core",
+    entry_point = "angular_cli/tools/quicktype_runner.js",
     templated_args = [
         # Needed so that node doesn't walk back to the source directory.
         # From there, the relative imports would point to .ts files.
diff --git a/tools/build_event_protocol/BUILD b/tools/build_event_protocol/BUILD
index da9d5b617413..7b47346ad739 100644
--- a/tools/build_event_protocol/BUILD
+++ b/tools/build_event_protocol/BUILD
@@ -11,6 +11,9 @@ ts_library(
     srcs = ["parse_bep.ts"],
     deps = [
       ":build_event_stream",
+      "@npm//@types/node",
+      "@rxjs",
+      "@rxjs//operators",
     ],
 )
 
diff --git a/tools/ts_json_schema.bzl b/tools/ts_json_schema.bzl
index 720117f9e2ec..5c60bab7b113 100644
--- a/tools/ts_json_schema.bzl
+++ b/tools/ts_json_schema.bzl
@@ -71,6 +71,9 @@ def ts_json_schema(name, src, data = []):
 
     ts_library(
         name = name,
+        deps = [
+            "@npm//@types/node",
+        ],
         # Remove these to empty the rule, since those files are also compiled elsewhere.
         # @external_begin
         srcs = [
diff --git a/tsconfig-test.json b/tsconfig-test.json
new file mode 100644
index 000000000000..a9676fb36c2d
--- /dev/null
+++ b/tsconfig-test.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "types": [
+      "node",
+      "jasmine"
+    ]
+  },
+}
diff --git a/tsconfig.json b/tsconfig.json
index 0feb64602a6c..33867eb4ba63 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -36,7 +36,6 @@
       "./node_modules/@types"
     ],
     "types": [
-      "jasmine",
       "node"
     ],
     "paths": {
diff --git a/yarn.lock b/yarn.lock
index c5a5f9f5b4d8..b99e5365e8f2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3,30 +3,26 @@
 
 
 "@angular/animations@^7.0.0-rc.0":
-  version "7.0.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.0.0-rc.0.tgz#963e64fa7265d948a08cb32508cea1a24107e439"
-  integrity sha512-NpFcuCfM11O/YIGl1piH3VufOlfnJSK6iyw19ElXjw4mr/jvK4vcg9fEXbqBvmQ6uregoeadRSVCp8tdRJHOyw==
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.0.1.tgz#2df561c0959e156985297e69b7c30614537b4ffe"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/cdk@^6.1.0":
   version "6.4.7"
   resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-6.4.7.tgz#1549b304dd412e82bd854cc55a7d5c6772ee0411"
-  integrity sha512-18x0U66fLD5kGQWZ9n3nb75xQouXlWs7kUDaTd8HTrHpT1s2QIAqlLd1KxfrYiVhsEC2jPQaoiae7VnBlcvkBg==
   dependencies:
     tslib "^1.7.1"
 
 "@angular/common@^7.0.0-rc.0":
-  version "7.0.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.0.0-rc.0.tgz#4872a430838653cbddfba759ccf1f9332c065171"
-  integrity sha512-YghYg9lFKF0cxaCiWfgByFbQ69dq521QDG93KX1mP+Tvc0jXXlbolDPYHGXx/VMUaoHq18VNzi7ZInpgc/pRBw==
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.0.1.tgz#55750879f08d5f4b6f247f7dce0b5ea2b3ec2059"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/compiler-cli@^7.0.0-rc.0":
   version "7.0.0-rc.0"
   resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.0.0-rc.0.tgz#59f37f2409ce896cb73daa221dbd898855d12939"
-  integrity sha512-Nkd5UgSt0NHVLE/U3FIUmSJxGW47+9B4hfR5oDhC7gkUNaRQzi+PzzVYj7jOdDJjgHV+Y0KS3msiXWhUSY4gpw==
   dependencies:
     canonical-path "0.0.2"
     chokidar "^1.4.2"
@@ -42,181 +38,174 @@
 "@angular/compiler@^7.0.0-rc.0":
   version "7.0.0-rc.0"
   resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.0.0-rc.0.tgz#2dfd293ad6583f9574c9fe79354256206f594a51"
-  integrity sha512-ifVqB/xJtSzOlk8B39Ld2wMbYni6Ey7s5jc+u/0NMtdut+2Q61Ar+TKjJZ3vmta3df7QqHX5JcP0W6qICRHJ+w==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/core@^7.0.0-rc.0":
-  version "7.0.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.0.0-rc.0.tgz#c1d845d5d1718f96f542abe7ae86b64c280da3bb"
-  integrity sha512-DXTUjk1tUdgxj0AHQR6wAKLF+i/vSsRCBxFEzcBa944UJoYBDd1n2PIREzDMW0tkGMtxfHy3Ti+trSpPBLiDTA==
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.0.1.tgz#42f52bf04bf88759d4f4b9e03cb9b312508233a0"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/http@^7.0.0-rc.0":
-  version "7.0.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.0.0-rc.0.tgz#659c3ac6bd66199a726f1f46cdc800fc25e37922"
-  integrity sha512-f7IaVuen/WuHIKcP9mO3Jz4oy8Qxdwo3PS750Bk5VVVNBF4TILRr+96j37C7965ZBxeJQzfcGfXew7d5nObJ/A==
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.0.1.tgz#54df0b7c6a5234d45a386bad81a64e0f1e85d666"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/material@^6.1.0":
   version "6.4.7"
   resolved "https://registry.yarnpkg.com/@angular/material/-/material-6.4.7.tgz#3c8f2d6a6a7904d97be29e06a84ffb62a8da6c16"
-  integrity sha512-SdNx7Xovi24Kw9eU6lkLhY/7f2M7L9F+/uh6XuPr4jbGgCUVVpeeVI5ztZhsZRbj1sN+/r1p5w8u62apWWl5Ww==
   dependencies:
     tslib "^1.7.1"
   optionalDependencies:
     parse5 "^5.0.0"
 
 "@angular/platform-browser-dynamic@^7.0.0-rc.0":
-  version "7.0.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.0.0-rc.0.tgz#b66d4c30ed25f67dab15e64462b959d039ada705"
-  integrity sha512-+SbuLnedoZNY6kfY5dV5p/+Rm4oj/DVwLhOWVFMtrqiaKRSrrEThH12FPKfQCqak51RjF4wDpJbqyWCGFDIbJA==
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.0.1.tgz#bf50a90573bc49e00e4bb8c08f6dee888f553e04"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-browser@^7.0.0-rc.0":
-  version "7.0.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.0.0-rc.0.tgz#9e19e83bce242f9dde0457719d15a87a90e314cc"
-  integrity sha512-N52E4TjX3AwMT0EMZTikxQz+4rkdx1C9WnBSIuBR5rYwZi391mxexvES8PqE4UqEarm08eHvfxUwtMZU/FwC+w==
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.0.1.tgz#d9638cb6592543018b96355a0119fc826ab5e27e"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-server@^7.0.0-rc.0":
-  version "7.0.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.0.0-rc.0.tgz#ae03a549203b91e6335fb3b4401fe9c0c972fc00"
-  integrity sha512-OxvXlr4DQiT57vJf9wsKxO8fMnC3MBLCPK93HjWTDLgCRzH93FXbbp2+e7knqMAhELUCrC3e1MzNzzEulwkxPg==
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.0.1.tgz#f284fbf90832a9fdefbba871faa50cec337822e2"
   dependencies:
     domino "^2.1.0"
     tslib "^1.9.0"
     xhr2 "^0.1.4"
 
 "@angular/router@^7.0.0-rc.0":
-  version "7.0.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.0.0-rc.0.tgz#6d6ddae8cf8bb15f9c0aaba2bb7487eb42248bd2"
-  integrity sha512-rT58TKCelP6BLw8Gzu6ZPeO86xzVFpDxVCLGmwEAmkWw8xG0gACkPYeVny4hsCkfx4nbz2w8upQksOKrudZt4w==
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.0.1.tgz#2085466c47a8efad576b4310db191c3e338cacef"
   dependencies:
     tslib "^1.9.0"
 
 "@angular/service-worker@^7.0.0-rc.0":
-  version "7.0.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.0.0-rc.0.tgz#52c9bb2c2014f7c2360e1d5a2bd87a18296ba04b"
-  integrity sha512-nEJhF3etWeS5OLDpCwtzsCb6RXchiQ3WqmykOyzpfzzbYgIIjVN6k/mn858/DvNDw+9LkqNiMB/+U3LRyjFYhw==
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.0.1.tgz#773ad7e758e29a5ad8b5627636480a4c2d74568f"
   dependencies:
     tslib "^1.9.0"
 
 "@babel/code-frame@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
-  integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/generator@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0.tgz#1efd58bffa951dc846449e58ce3a1d7f02d393aa"
-  integrity sha512-/BM2vupkpbZXq22l1ALO7MqXJZH2k8bKVv8Y+pABFnzWdztDB/ZLveP5At21vLz5c2YtSE6p7j2FZEsqafMz5Q==
+"@babel/generator@^7.0.0", "@babel/generator@^7.1.3":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.1.3.tgz#2103ec9c42d9bdad9190a6ad5ff2d456fd7b8673"
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.1.3"
     jsesc "^2.5.1"
     lodash "^4.17.10"
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
-"@babel/helper-function-name@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0.tgz#a68cc8d04420ccc663dd258f9cc41b8261efa2d4"
-  integrity sha512-Zo+LGvfYp4rMtz84BLF3bavFTdf8y4rJtMPTe2J+rxYmnDOIeH8le++VFI/pRJU+rQhjqiXxE4LMaIau28Tv1Q==
+"@babel/helper-function-name@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
   dependencies:
     "@babel/helper-get-function-arity" "^7.0.0"
-    "@babel/template" "^7.0.0"
+    "@babel/template" "^7.1.0"
     "@babel/types" "^7.0.0"
 
 "@babel/helper-get-function-arity@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
-  integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@babel/helper-split-export-declaration@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
-  integrity sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@babel/highlight@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
-  integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
   dependencies:
     chalk "^2.0.0"
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.0.0.tgz#697655183394facffb063437ddf52c0277698775"
-  integrity sha512-RgJhNdRinpO8zibnoHbzTTexNs4c8ROkXFBanNDZTLHjwbdLk8J5cJSKulx/bycWTLYmKVNCkxRtVCoJnqPk+g==
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.2", "@babel/parser@^7.1.3":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.3.tgz#2c92469bac2b7fbff810b67fca07bd138b48af77"
 
-"@babel/template@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0.tgz#c2bc9870405959c89a9c814376a2ecb247838c80"
-  integrity sha512-VLQZik/G5mjYJ6u19U3W2u7eM+rA/NGzH+GtHDFFkLTKLW66OasFrxZ/yK7hkyQcswrmvugFyZpDFRW0DjcjCw==
+"@babel/template@^7.0.0", "@babel/template@^7.1.0":
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.1.2.tgz#090484a574fef5a2d2d7726a674eceda5c5b5644"
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.0.0"
-    "@babel/types" "^7.0.0"
+    "@babel/parser" "^7.1.2"
+    "@babel/types" "^7.1.2"
 
 "@babel/traverse@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0.tgz#b1fe9b6567fdf3ab542cfad6f3b31f854d799a61"
-  integrity sha512-ka/lwaonJZTlJyn97C4g5FYjPOx+Oxd3ab05hbDr1Mx9aP1FclJ+SUHyLx3Tx40sGmOVJApDxE6puJhd3ld2kw==
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.1.4.tgz#f4f83b93d649b4b2c91121a9087fa2fa949ec2b4"
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.0.0"
-    "@babel/helper-function-name" "^7.0.0"
+    "@babel/generator" "^7.1.3"
+    "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/parser" "^7.0.0"
-    "@babel/types" "^7.0.0"
+    "@babel/parser" "^7.1.3"
+    "@babel/types" "^7.1.3"
     debug "^3.1.0"
     globals "^11.1.0"
     lodash "^4.17.10"
 
-"@babel/types@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0.tgz#6e191793d3c854d19c6749989e3bc55f0e962118"
-  integrity sha512-5tPDap4bGKTLPtci2SUl/B7Gv8RnuJFuQoWx26RJobS0fFrz4reUA3JnwIM+HVHEmWE0C1mzKhDtTp8NsWY02Q==
+"@babel/types@^7.0.0", "@babel/types@^7.1.2", "@babel/types@^7.1.3":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.1.3.tgz#3a767004567060c2f40fca49a304712c525ee37d"
   dependencies:
     esutils "^2.0.2"
     lodash "^4.17.10"
     to-fast-properties "^2.0.0"
 
-"@bazel/typescript@0.16.1":
-  version "0.16.1"
-  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.16.1.tgz#5a5d145a17898bfadae8268cf942815424119412"
-  integrity sha512-+S1zem6gchQV3jfzta8P5Gex3D4k2VaBKGGbS6gCo0xtLPdlQD/sRRRZSYH82jRUOe5pAKrv6xTu8gUCHu1Y2Q==
+"@bazel/karma@^0.20.3":
+  version "0.20.3"
+  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.20.3.tgz#a63bb82b4887ae8c0d01f3028c6fa4764470851d"
+  dependencies:
+    jasmine-core "2.8.0"
+    karma alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a
+    karma-chrome-launcher "2.2.0"
+    karma-firefox-launcher "1.1.0"
+    karma-jasmine "1.1.1"
+    karma-requirejs "1.1.0"
+    karma-sauce-launcher "1.2.0"
+    karma-sourcemap-loader "0.3.7"
+    requirejs "2.3.5"
+    tmp "0.0.33"
+
+"@bazel/typescript@0.20.3":
+  version "0.20.3"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.20.3.tgz#51dcc369c2af0d7f2311d6e692d07776492060f4"
   dependencies:
-    protobufjs "5.0.0"
-    tsickle "0.32.1"
-    tsutils "2.20.0"
+    protobufjs "5.0.3"
+    source-map-support "0.5.9"
+    tsickle "0.28.0"
+    tsutils "2.27.2"
 
 "@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"
-  integrity sha1-w6DFRNYjkqzCgTpCyKDcb1j4aSI=
 
 "@sindresorhus/is@^0.7.0":
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
-  integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
 
 "@types/body-parser@*":
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.0.tgz#9f5c9d9bd04bb54be32d5eb9fc0d8c974e6cf58c"
-  integrity sha512-a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w==
   dependencies:
     "@types/connect" "*"
     "@types/node" "*"
@@ -224,19 +213,16 @@
 "@types/caseless@*":
   version "0.12.1"
   resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.1.tgz#9794c69c8385d0192acc471a540d1f8e0d16218a"
-  integrity sha512-FhlMa34NHp9K5MY1Uz8yb+ZvuX0pnvn3jScRSNAb75KHGB8d3rEU6hqMs3Z2vjuytcMfRg6c5CHMc3wtYyD2/A==
 
 "@types/connect@*":
   version "3.4.32"
   resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.32.tgz#aa0e9616b9435ccad02bc52b5b454ffc2c70ba28"
-  integrity sha512-4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==
   dependencies:
     "@types/node" "*"
 
 "@types/copy-webpack-plugin@^4.4.1":
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/@types/copy-webpack-plugin/-/copy-webpack-plugin-4.4.2.tgz#6dfac0dc8692378f76a20c6c1bbe01eec438f316"
-  integrity sha512-/L0m5kc7pKGpsu97TTgAP6YcVRmau2Wj0HpRPQBGEbZXT1DZkdozZPCZHGDWXpxcvWDFTxob2JmYJj3RC7CwFA==
   dependencies:
     "@types/minimatch" "*"
     "@types/webpack" "*"
@@ -244,17 +230,14 @@
 "@types/estree@0.0.39":
   version "0.0.39"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
-  integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
 "@types/events@*":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
-  integrity sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==
 
 "@types/express-serve-static-core@*":
   version "4.16.0"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.16.0.tgz#fdfe777594ddc1fe8eb8eccce52e261b496e43e7"
-  integrity sha512-lTeoCu5NxJU4OD9moCgm0ESZzweAx0YqsAcab6OB0EB3+As1OaHtKnaGJvcngQxYsi9UNv0abn4/DRavrRxt4w==
   dependencies:
     "@types/events" "*"
     "@types/node" "*"
@@ -263,7 +246,6 @@
 "@types/express@*", "@types/express@^4.16.0":
   version "4.16.0"
   resolved "https://registry.yarnpkg.com/@types/express/-/express-4.16.0.tgz#6d8bc42ccaa6f35cf29a2b7c3333cb47b5a32a19"
-  integrity sha512-TtPEYumsmSTtTetAPXlJVf3kEqb6wZK0bZojpJQrnD/djV4q1oB6QQ8aKvKqwNPACoe02GNiy5zDzcYivR5Z2w==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "*"
@@ -272,14 +254,12 @@
 "@types/form-data@*":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@types/form-data/-/form-data-2.2.1.tgz#ee2b3b8eaa11c0938289953606b745b738c54b1e"
-  integrity sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ==
   dependencies:
     "@types/node" "*"
 
 "@types/glob@^5.0.35":
   version "5.0.35"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.35.tgz#1ae151c802cece940443b5ac246925c85189f32a"
-  integrity sha512-wc+VveszMLyMWFvXLkloixT4n0harUIVZjnpzztaZ0nKLuul7Z32iMt2fUFGAaZ4y1XWjFRMtCI5ewvyh4aIeg==
   dependencies:
     "@types/events" "*"
     "@types/minimatch" "*"
@@ -288,7 +268,6 @@
 "@types/http-proxy-middleware@*":
   version "0.17.5"
   resolved "https://registry.yarnpkg.com/@types/http-proxy-middleware/-/http-proxy-middleware-0.17.5.tgz#efdeb4be652744422d57929f3c4ea31a2e627a45"
-  integrity sha512-mUqVzfaiOknDT2QJ7g8f2c37G4ZDqDNt08QdUkFCu19Ey5+2SZ0rWHMG00GRJ7g+SgHvl/9weZYuWLXr7RgiCg==
   dependencies:
     "@types/connect" "*"
     "@types/http-proxy" "*"
@@ -298,7 +277,6 @@
 "@types/http-proxy@*":
   version "1.16.2"
   resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.16.2.tgz#16cb373b52fff2aa2f389d23d940ed4a642349e5"
-  integrity sha512-GgqePmC3rlsn1nv+kx5OviPuUBU2omhnlXOaJSXFgOdsTcScNFap+OaCb2ip9Bm4m5L8EOehgT5d9M4uNB90zg==
   dependencies:
     "@types/events" "*"
     "@types/node" "*"
@@ -306,7 +284,6 @@
 "@types/inquirer@^0.0.42":
   version "0.0.42"
   resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-0.0.42.tgz#2310fd8623053bead72247adae416aa32bacdf0c"
-  integrity sha512-flMaNWU2g9NrtZ4bIV+7SEY2W7OdWNNhmJ0rE1lWVxGrkp3TfFGMcFCxRIBmGWigI8e6n+2HqLjizTTfgcpHLg==
   dependencies:
     "@types/rx" "*"
     "@types/through" "*"
@@ -314,17 +291,14 @@
 "@types/istanbul@^0.4.30":
   version "0.4.30"
   resolved "https://registry.yarnpkg.com/@types/istanbul/-/istanbul-0.4.30.tgz#073159320ab3296b2cfeb481f756a1f8f4c9c8e4"
-  integrity sha512-+hQU4fh2G96ze78uI5/V6+SRDZD1UnVrFn23i2eDetwfbBq3s0/zYP92xj/3qyvVMM3WnvS88N56zjz+HmL04A==
 
 "@types/jasmine@^2.8.8":
   version "2.8.8"
   resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.8.tgz#bf53a7d193ea8b03867a38bfdb4fbb0e0bf066c9"
-  integrity sha512-OJSUxLaxXsjjhob2DBzqzgrkLmukM3+JMpRp0r0E4HTdT1nwDCWhaswjYxazPij6uOdzHCJfNbDjmQ1/rnNbCg==
 
 "@types/loader-utils@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@types/loader-utils/-/loader-utils-1.1.3.tgz#82b9163f2ead596c68a8c03e450fbd6e089df401"
-  integrity sha512-euKGFr2oCB3ASBwG39CYJMR3N9T0nanVqXdiH7Zu/Nqddt6SmFRxytq/i2w9LQYNQekEtGBz+pE3qG6fQTNvRg==
   dependencies:
     "@types/node" "*"
     "@types/webpack" "*"
@@ -332,47 +306,38 @@
 "@types/mime@*":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.0.tgz#5a7306e367c539b9f6543499de8dd519fac37a8b"
-  integrity sha512-A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA==
 
 "@types/minimatch@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
-  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
 "@types/minimist@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6"
-  integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
 
 "@types/node@*":
   version "10.9.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897"
-  integrity sha512-fCHV45gS+m3hH17zgkgADUSi2RR1Vht6wOZ0jyHP8rjiQra9f+mIcgwPQHllmDocYOstIEbKlxbFDYlgrTPYqw==
 
 "@types/node@8.10.10":
   version "8.10.10"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.10.tgz#fec07bc2ad549d9e6d2f7aa0fb0be3491b83163a"
-  integrity sha512-p3W/hFzQs76RlYRIZsZc5a9bht6m0TspmWYYbKhRswmLnwj9fsE40EbuGifeu/XWR/c0UJQ1DDbvTxIsm/OOAA==
 
 "@types/node@^6.0.46":
-  version "6.0.117"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.117.tgz#ccfc2506001404708528d657aad9c1b931111646"
-  integrity sha512-sihk0SnN8PpiS5ihu5xJQ5ddnURNq4P+XPmW+nORlKkHy21CoZO/IVHK/Wq/l3G8fFW06Fkltgnqx229uPlnRg==
+  version "6.14.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.0.tgz#85c6998293fc6f2945915419296c7fbb63384f66"
 
 "@types/q@^0.0.32":
   version "0.0.32"
-  resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
-  integrity sha1-vShOV8hPEyXacCur/IKlMoGQwMU=
+  resolved "http://registry.npmjs.org/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
 
 "@types/range-parser@*":
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.2.tgz#fa8e1ad1d474688a757140c91de6dace6f4abc8d"
-  integrity sha512-HtKGu+qG1NPvYe1z7ezLsyIaXYyi8SoAVqWDZgDQ8dLrsZvSzUNCwZyfX33uhWxL/SU0ZDQZ3nwZ0nimt507Kw==
 
 "@types/request@^2.47.1":
   version "2.47.1"
   resolved "https://registry.yarnpkg.com/@types/request/-/request-2.47.1.tgz#25410d3afbdac04c91a94ad9efc9824100735824"
-  integrity sha512-TV3XLvDjQbIeVxJ1Z3oCTDk/KuYwwcNKVwz2YaT0F5u86Prgc4syDAp6P96rkTQQ4bIdh+VswQIC9zS6NjY7/g==
   dependencies:
     "@types/caseless" "*"
     "@types/form-data" "*"
@@ -382,82 +347,70 @@
 "@types/rx-core-binding@*":
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/@types/rx-core-binding/-/rx-core-binding-4.0.4.tgz#d969d32f15a62b89e2862c17b3ee78fe329818d3"
-  integrity sha512-5pkfxnC4w810LqBPUwP5bg7SFR/USwhMSaAeZQQbEHeBp57pjKXRlXmqpMrLJB4y1oglR/c2502853uN0I+DAQ==
   dependencies:
     "@types/rx-core" "*"
 
 "@types/rx-core@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-core/-/rx-core-4.0.3.tgz#0b3354b1238cedbe2b74f6326f139dbc7a591d60"
-  integrity sha1-CzNUsSOM7b4rdPYybxOdvHpZHWA=
 
 "@types/rx-lite-aggregates@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-aggregates/-/rx-lite-aggregates-4.0.3.tgz#6efb2b7f3d5f07183a1cb2bd4b1371d7073384c2"
-  integrity sha512-MAGDAHy8cRatm94FDduhJF+iNS5//jrZ/PIfm+QYw9OCeDgbymFHChM8YVIvN2zArwsRftKgE33QfRWvQk4DPg==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-async@*":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-async/-/rx-lite-async-4.0.2.tgz#27fbf0caeff029f41e2d2aae638b05e91ceb600c"
-  integrity sha512-vTEv5o8l6702ZwfAM5aOeVDfUwBSDOs+ARoGmWAKQ6LOInQ8J4/zjM7ov12fuTpktUKdMQjkeCp07Vd73mPkxw==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-backpressure@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-backpressure/-/rx-lite-backpressure-4.0.3.tgz#05abb19bdf87cc740196c355e5d0b37bb50b5d56"
-  integrity sha512-Y6aIeQCtNban5XSAF4B8dffhIKu6aAy/TXFlScHzSxh6ivfQBQw6UjxyEJxIOt3IT49YkS+siuayM2H/Q0cmgA==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-coincidence@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-coincidence/-/rx-lite-coincidence-4.0.3.tgz#80bd69acc4054a15cdc1638e2dc8843498cd85c0"
-  integrity sha512-1VNJqzE9gALUyMGypDXZZXzR0Tt7LC9DdAZQ3Ou/Q0MubNU35agVUNXKGHKpNTba+fr8GdIdkC26bRDqtCQBeQ==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-experimental@*":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-experimental/-/rx-lite-experimental-4.0.1.tgz#c532f5cbdf3f2c15da16ded8930d1b2984023cbd"
-  integrity sha1-xTL1y98/LBXaFt7Ykw0bKYQCPL0=
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-joinpatterns@*":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-joinpatterns/-/rx-lite-joinpatterns-4.0.1.tgz#f70fe370518a8432f29158cc92ffb56b4e4afc3e"
-  integrity sha1-9w/jcFGKhDLykVjMkv+1a05K/D4=
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-testing@*":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-testing/-/rx-lite-testing-4.0.1.tgz#21b19d11f4dfd6ffef5a9d1648e9c8879bfe21e9"
-  integrity sha1-IbGdEfTf1v/vWp0WSOnIh5v+Iek=
   dependencies:
     "@types/rx-lite-virtualtime" "*"
 
 "@types/rx-lite-time@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-time/-/rx-lite-time-4.0.3.tgz#0eda65474570237598f3448b845d2696f2dbb1c4"
-  integrity sha512-ukO5sPKDRwCGWRZRqPlaAU0SKVxmWwSjiOrLhoQDoWxZWg6vyB9XLEZViKOzIO6LnTIQBlk4UylYV0rnhJLxQw==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-virtualtime@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-virtualtime/-/rx-lite-virtualtime-4.0.3.tgz#4b30cacd0fe2e53af29f04f7438584c7d3959537"
-  integrity sha512-3uC6sGmjpOKatZSVHI2xB1+dedgml669ZRvqxy+WqmGJDVusOdyxcKfyzjW0P3/GrCiN4nmRkLVMhPwHCc5QLg==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite@*":
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/@types/rx-lite/-/rx-lite-4.0.5.tgz#b3581525dff69423798daa9a0d33c1e66a5e8c4c"
-  integrity sha512-KZk5XTR1dm/kNgBx8iVpjno6fRYtAUQWBOmj+O8j724+nk097sz4fOoHJNpCkOJUtHUurZlJC7QvSFCZHbkC+w==
   dependencies:
     "@types/rx-core" "*"
     "@types/rx-core-binding" "*"
@@ -465,7 +418,6 @@
 "@types/rx@*":
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/@types/rx/-/rx-4.1.1.tgz#598fc94a56baed975f194574e0f572fd8e627a48"
-  integrity sha1-WY/JSla67ZdfGUV04PVy/Y5iekg=
   dependencies:
     "@types/rx-core" "*"
     "@types/rx-core-binding" "*"
@@ -481,19 +433,16 @@
     "@types/rx-lite-virtualtime" "*"
 
 "@types/selenium-webdriver@^3.0.0":
-  version "3.0.10"
-  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.10.tgz#e98cc6f05b4b436277671c784ee2f9d05a634f9b"
-  integrity sha512-ikB0JHv6vCR1KYUQAzTO4gi/lXLElT4Tx+6De2pc/OZwizE9LRNiTa+U8TBFKBD/nntPnr/MPSHSnOTybjhqNA==
+  version "3.0.12"
+  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.12.tgz#6affe5aed1ba379175075a889adbe2bc3aa62159"
 
 "@types/semver@^5.5.0":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
-  integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==
 
 "@types/serve-static@*":
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.2.tgz#f5ac4d7a6420a99a6a45af4719f4dcd8cd907a48"
-  integrity sha512-/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q==
   dependencies:
     "@types/express-serve-static-core" "*"
     "@types/mime" "*"
@@ -501,34 +450,28 @@
 "@types/source-list-map@*":
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
-  integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
 "@types/source-map@0.5.2":
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.5.2.tgz#973459e744cc7445c85b97f770275b479b138e08"
-  integrity sha512-++w4WmMbk3dS3UeHGzAG+xJOSz5Xqtjys/TBkqG3qp3SeWE7Wwezqe5eB7B51cxUyh4PW7bwVotpsLdBK0D8cw==
 
 "@types/tapable@*":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.4.tgz#b4ffc7dc97b498c969b360a41eee247f82616370"
-  integrity sha512-78AdXtlhpCHT0K3EytMpn4JNxaf5tbqbLcbIRoQIHzpTIyjpxLQKRoxU55ujBXAtg3Nl2h/XWvfDa9dsMOd0pQ==
 
 "@types/through@*":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/through/-/through-0.0.29.tgz#72943aac922e179339c651fa34a4428a4d722f93"
-  integrity sha512-9a7C5VHh+1BKblaYiq+7Tfc+EOmjMdZaD1MYtkQjSoxgB69tBjW98ry6SKsi4zEIWztLOMRuL87A3bdT/Fc/4w==
   dependencies:
     "@types/node" "*"
 
 "@types/tough-cookie@*":
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-2.3.3.tgz#7f226d67d654ec9070e755f46daebf014628e9d9"
-  integrity sha512-MDQLxNFRLasqS4UlkWMSACMKeSm1x4Q3TxzUC7KQUsh6RK1ZrQ0VEyE3yzXcBu+K8ejVj4wuX32eUG02yNp+YQ==
 
 "@types/uglify-js@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.0.3.tgz#801a5ca1dc642861f47c46d14b700ed2d610840b"
-  integrity sha512-MAT0BW2ruO0LhQKjvlipLGCF/Yx0y/cj+tT67tK3QIQDrM2+9R78HgJ54VlrE8AbfjYJJBCQCEPM5ZblPVTuww==
   dependencies:
     source-map "^0.6.1"
 
@@ -539,7 +482,6 @@
 "@types/webpack-dev-server@^3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-3.1.0.tgz#1fae06ad346d2dd09bc5e34745723946458eed58"
-  integrity sha512-nutifgcFiPP3I/+mPWlZCsQNKpWNUGm6qjAMfleZuPfPfybXWymHvlcYsKvg+NPedSkrNh0vu2xKAlak/l+pOg==
   dependencies:
     "@types/express" "*"
     "@types/http-proxy-middleware" "*"
@@ -549,7 +491,6 @@
 "@types/webpack-sources@^0.1.5":
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-0.1.5.tgz#be47c10f783d3d6efe1471ff7f042611bd464a92"
-  integrity sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==
   dependencies:
     "@types/node" "*"
     "@types/source-list-map" "*"
@@ -558,7 +499,6 @@
 "@types/webpack@*", "@types/webpack@^4.4.11":
   version "4.4.11"
   resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.4.11.tgz#0ca832870d55c4e92498c01d22d00d02b0f62ae9"
-  integrity sha512-NdESmbpvVEtJgs15kyZYKr5ouLYPMYt9DNG5JEgCekbG/ezFLPCzf4XcAv8caOb+b7x6ieAuSt0eoR0UkSI7RA==
   dependencies:
     "@types/node" "*"
     "@types/tapable" "*"
@@ -568,7 +508,6 @@
 "@webassemblyjs/ast@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.8.tgz#f31f480debeef957f01b623f27eabc695fa4fe8f"
-  integrity sha512-dOrtdtEyB8sInpl75yLPNksY4sRl0j/+t6aHyB/YA+ab9hV3Fo7FmG12FHzP+2MvWVAJtDb+6eXR5EZbZJ+uVg==
   dependencies:
     "@webassemblyjs/helper-module-context" "1.7.8"
     "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
@@ -577,44 +516,36 @@
 "@webassemblyjs/floating-point-hex-parser@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.8.tgz#1b3ed0e27e384032254e9322fc646dd3e70ef1b9"
-  integrity sha512-kn2zNKGsbql5i56VAgRYkpG+VazqHhQQZQycT2uXAazrAEDs23gy+Odkh5VblybjnwX2/BITkDtNmSO76hdIvQ==
 
 "@webassemblyjs/helper-api-error@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.8.tgz#a2b49c11f615e736f815ec927f035dcfa690d572"
-  integrity sha512-xUwxDXsd1dUKArJEP5wWM5zxgCSwZApSOJyP1XO7M8rNUChUDblcLQ4FpzTpWG2YeylMwMl1MlP5Ztryiz1x4g==
 
 "@webassemblyjs/helper-buffer@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.8.tgz#3fc66bfa09c1c60e824cf3d5887826fac062877d"
-  integrity sha512-WXiIMnuvuwlhWvVOm8xEXU9DnHaa3AgAU0ZPfvY8vO1cSsmYb2WbGbHnMLgs43vXnA7XAob9b56zuZaMkxpCBg==
 
 "@webassemblyjs/helper-code-frame@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.8.tgz#cc5a7e9522b70e7580df056dfd34020cf29645b0"
-  integrity sha512-TLQxyD9qGOIdX5LPQOPo0Ernd88U5rHkFb8WAjeMIeA0sPjCHeVPaGqUGGIXjUcblUkjuDAc07bruCcNHUrHDA==
   dependencies:
     "@webassemblyjs/wast-printer" "1.7.8"
 
 "@webassemblyjs/helper-fsm@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.8.tgz#fe4607430af466912797c21acafd3046080182ea"
-  integrity sha512-TjK0CnD8hAPkV5mbSp5aWl6SO1+H3WFcjWtixWoy8EMA99YnNzYhpc/WSYWhf7yrhpzkq5tZB0tvLK3Svr3IXA==
 
 "@webassemblyjs/helper-module-context@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.8.tgz#3c2e7ee93d14ff4768ba66fb1be42fdc9dc7160a"
-  integrity sha512-uCutAKR7Nm0VsFixcvnB4HhAyHouNbj0Dx1p7eRjFjXGGZ+N7ftTaG1ZbWCasAEbtwGj54LP8+lkBZdTCPmLGg==
 
 "@webassemblyjs/helper-wasm-bytecode@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.8.tgz#89bdb78cd6dd5209ae2ed2925de78d0f0e00b6f0"
-  integrity sha512-AdCCE3BMW6V34WYaKUmPgVHa88t2Z14P4/0LjLwuGkI0X6pf7nzp0CehzVVk51cKm2ymVXjl9dCG+gR1yhITIQ==
 
 "@webassemblyjs/helper-wasm-section@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.8.tgz#c68ef7d26a6fc12421b2e6e56f9bc810dfb33e87"
-  integrity sha512-BkBhYQuzyl4hgTGOKo87Vdw6f9nj8HhI7WYpI0MCC5qFa5ahrAPOGgyETVdnRbv+Rjukl9MxxfDmVcVC435lDg==
   dependencies:
     "@webassemblyjs/ast" "1.7.8"
     "@webassemblyjs/helper-buffer" "1.7.8"
@@ -624,26 +555,22 @@
 "@webassemblyjs/ieee754@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.8.tgz#1f37974b13cb486a9237e73ce04cac7a2f1265ed"
-  integrity sha512-tOarWChdG1a3y1yqCX0JMDKzrat5tQe4pV6K/TX19BcXsBLYxFQOL1DEDa5KG9syeyvCrvZ+i1+Mv1ExngvktQ==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
 "@webassemblyjs/leb128@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.8.tgz#1bee83426819192db2ea1a234b84c7ebc6d34c1f"
-  integrity sha512-GCYeGPgUFWJiZuP4NICbcyUQNxNLJIf476Ei+K+jVuuebtLpfvwkvYT6iTUE7oZYehhkor4Zz2g7SJ/iZaPudQ==
   dependencies:
     "@xtuc/long" "4.2.1"
 
 "@webassemblyjs/utf8@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.8.tgz#2b489d5cf43e0aebb93d8e2d792aff9879c61f05"
-  integrity sha512-9X+f0VV+xNXW2ujfIRSXBJENGE6Qh7bNVKqu3yDjTFB3ar3nsThsGBBKdTG58aXOm2iUH6v28VIf88ymPXODHA==
 
 "@webassemblyjs/wasm-edit@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.8.tgz#f8bdbe7088718eca27b1c349bb7c06b8a457950c"
-  integrity sha512-6D3Hm2gFixrfyx9XjSON4ml1FZTugqpkIz5Awvrou8fnpyprVzcm4X8pyGRtA2Piixjl3DqmX/HB1xdWyE097A==
   dependencies:
     "@webassemblyjs/ast" "1.7.8"
     "@webassemblyjs/helper-buffer" "1.7.8"
@@ -657,7 +584,6 @@
 "@webassemblyjs/wasm-gen@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.8.tgz#7e8abf1545eae74ac6781d545c034af3cfd0c7d5"
-  integrity sha512-a7O/wE6eBeVKKUYgpMK7NOHmMADD85rSXLe3CqrWRDwWff5y3cSVbzpN6Qv3z6C4hdkpq9qyij1Ga1kemOZGvQ==
   dependencies:
     "@webassemblyjs/ast" "1.7.8"
     "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
@@ -668,7 +594,6 @@
 "@webassemblyjs/wasm-opt@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.8.tgz#7ada6e211914728fce02ff0ff9c344edc6d41f26"
-  integrity sha512-3lbQ0PT81NHCdi1sR/7+SNpZadM4qYcTSr62nFFAA7e5lFwJr14M1Gi+A/Y3PgcDWOHYjsaNGPpPU0H03N6Blg==
   dependencies:
     "@webassemblyjs/ast" "1.7.8"
     "@webassemblyjs/helper-buffer" "1.7.8"
@@ -678,7 +603,6 @@
 "@webassemblyjs/wasm-parser@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.8.tgz#dac47c291fb6a3e63529aecd647592cd34afbf94"
-  integrity sha512-rZ/zlhp9DHR/05zh1MbAjT2t624sjrPP/OkJCjXqzm7ynH+nIdNcn9Ixc+qzPMFXhIrk0rBoQ3to6sEIvHh9jQ==
   dependencies:
     "@webassemblyjs/ast" "1.7.8"
     "@webassemblyjs/helper-api-error" "1.7.8"
@@ -690,7 +614,6 @@
 "@webassemblyjs/wast-parser@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.8.tgz#f8aab9a450c048c1f9537695c89faeb92fabfba5"
-  integrity sha512-Q/zrvtUvzWuSiJMcSp90fi6gp2nraiHXjTV2VgAluVdVapM4gy1MQn7akja2p6eSBDQpKJPJ6P4TxRkghRS5dg==
   dependencies:
     "@webassemblyjs/ast" "1.7.8"
     "@webassemblyjs/floating-point-hex-parser" "1.7.8"
@@ -702,7 +625,6 @@
 "@webassemblyjs/wast-printer@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.8.tgz#e7e965782c1912f6a965f14a53ff43d8ad0403a5"
-  integrity sha512-GllIthRtwTxRDAURRNXscu7Napzmdf1jt1gpiZiK/QN4fH0lSGs3OTmvdfsMNP7tqI4B3ZtfaaWRlNIQug6Xyg==
   dependencies:
     "@webassemblyjs/ast" "1.7.8"
     "@webassemblyjs/wast-parser" "1.7.8"
@@ -711,17 +633,14 @@
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
-  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
 
 "@xtuc/long@4.2.1":
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
-  integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
 
 JSONStream@^1.0.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.4.tgz#615bb2adb0cd34c8f4c447b5f6512fa1d8f16a2e"
-  integrity sha512-Y7vfi3I5oMOYIr+WxV8NZxDSwcbNgzdKYsTNInmycOq9bUYwGg9ryu57Wg5NLmCjqdFPNUmpMBo3kSJN9tCbXg==
   dependencies:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
@@ -729,7 +648,6 @@ JSONStream@^1.0.4:
 JSONStream@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
-  integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
   dependencies:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
@@ -737,17 +655,14 @@ JSONStream@^1.3.4:
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
 abbrev@1.0.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
-  integrity sha1-kbR5JYinc4wl813W9jdSovh3YTU=
 
 accepts@~1.3.4, accepts@~1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
-  integrity sha1-63d99gEXI6OxTopywIBcjoZ0a9I=
   dependencies:
     mime-types "~2.1.18"
     negotiator "0.6.1"
@@ -755,53 +670,48 @@ accepts@~1.3.4, accepts@~1.3.5:
 acorn-dynamic-import@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
-  integrity sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==
   dependencies:
     acorn "^5.0.0"
 
 acorn@^5.0.0, acorn@^5.6.2:
   version "5.7.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
-  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
-adm-zip@^0.4.9:
+addressparser@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/addressparser/-/addressparser-1.0.1.tgz#47afbe1a2a9262191db6838e4fd1d39b40821746"
+
+adm-zip@^0.4.9, adm-zip@~0.4.3:
   version "0.4.11"
   resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.11.tgz#2aa54c84c4b01a9d0fb89bb11982a51f13e3d62a"
-  integrity sha512-L8vcjDTCOIJk7wFvmlEUN7AsSb8T+2JrdP7KINBjzr24TJ5Mwj590sLu3BC7zNZowvJWa/JtPmD8eJCzdtDWjA==
 
 after@0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
-  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
 
-agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0:
+agent-base@4, agent-base@^4.1.0, agent-base@^4.2.0, agent-base@~4.2.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
-  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
   dependencies:
     es6-promisify "^5.0.0"
 
 agentkeepalive@^3.4.1:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67"
-  integrity sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==
   dependencies:
     humanize-ms "^1.2.1"
 
 ajv-errors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.0.tgz#ecf021fa108fd17dfb5e6b383f2dd233e31ffc59"
-  integrity sha1-7PAh+hCP0X37Xms4Py3SM+Mf/Fk=
 
 ajv-keywords@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
-  integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
 
-ajv@6.5.3, ajv@^6.1.0:
+ajv@6.5.3:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9"
-  integrity sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
@@ -811,66 +721,74 @@ ajv@6.5.3, ajv@^6.1.0:
 ajv@^5.0.0, ajv@^5.1.0, ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
   dependencies:
     co "^4.6.0"
     fast-deep-equal "^1.0.0"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
+ajv@^6.1.0:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.4.tgz#247d5274110db653706b550fcc2b797ca28cfc59"
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
+
+amqplib@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/amqplib/-/amqplib-0.5.2.tgz#d2d7313c7ffaa4d10bcf1e6252de4591b6cc7b63"
+  dependencies:
+    bitsyntax "~0.0.4"
+    bluebird "^3.4.6"
+    buffer-more-ints "0.0.2"
+    readable-stream "1.x >=1.1.9"
+    safe-buffer "^5.0.1"
 
 ansi-align@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f"
-  integrity sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=
   dependencies:
     string-width "^2.0.0"
 
 ansi-colors@^3.0.0:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.0.5.tgz#cb9dc64993b64fd6945485f797fc3853137d9a7b"
-  integrity sha512-VVjWpkfaphxUBFarydrQ3n26zX5nIK7hcbT3/ielrvwDDyBBjuh2vuSw1P9zkPq0cfqvdw7lkYHnu+OLSfIBsg==
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.1.tgz#9638047e4213f3428a11944a7d4b31cba0a3ff95"
 
 ansi-escapes@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
-  integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==
 
 ansi-html@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
-  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
 
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
 ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
 
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
 
 anymatch@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
-  integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==
   dependencies:
     micromatch "^2.1.5"
     normalize-path "^2.0.0"
@@ -878,7 +796,6 @@ anymatch@^1.3.0:
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
-  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
   dependencies:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
@@ -886,24 +803,44 @@ anymatch@^2.0.0:
 app-root-path@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.1.0.tgz#98bf6599327ecea199309866e8140368fd2e646a"
-  integrity sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo=
 
 append-transform@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab"
-  integrity sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==
   dependencies:
     default-require-extensions "^2.0.0"
 
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+
+archiver-utils@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-1.3.0.tgz#e50b4c09c70bf3d680e32ff1b7994e9f9d895174"
+  dependencies:
+    glob "^7.0.0"
+    graceful-fs "^4.1.0"
+    lazystream "^1.0.0"
+    lodash "^4.8.0"
+    normalize-path "^2.0.0"
+    readable-stream "^2.0.0"
+
+archiver@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/archiver/-/archiver-2.1.1.tgz#ff662b4a78201494a3ee544d3a33fe7496509ebc"
+  dependencies:
+    archiver-utils "^1.3.0"
+    async "^2.0.0"
+    buffer-crc32 "^0.2.1"
+    glob "^7.0.0"
+    lodash "^4.8.0"
+    readable-stream "^2.0.0"
+    tar-stream "^1.5.0"
+    zip-stream "^1.2.0"
 
 are-we-there-yet@~1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
@@ -911,98 +848,80 @@ are-we-there-yet@~1.1.2:
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
 arr-diff@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
   dependencies:
     arr-flatten "^1.0.1"
 
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
 arr-flatten@^1.0.1, arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
 arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
 array-find-index@^1.0.1, array-find-index@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
-  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
 
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
-  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
 
 array-flatten@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296"
-  integrity sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=
 
 array-ify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
-  integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=
 
 array-slice@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
-  integrity sha1-3Tz7gO15c6dRF82sabC5nshhhvU=
 
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
   dependencies:
     array-uniq "^1.0.1"
 
 array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
 array-unique@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
 
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
 arraybuffer.slice@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
-  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
 
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
 asap@^2.0.0, asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
-  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
 ascli@~1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ascli/-/ascli-1.0.1.tgz#bcfa5974a62f18e81cabaeb49732ab4a88f906bc"
-  integrity sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=
   dependencies:
     colour "~0.7.1"
     optjs "~3.2.2"
@@ -1010,7 +929,6 @@ ascli@~1:
 asn1.js@^4.0.0:
   version "4.10.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
-  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
   dependencies:
     bn.js "^4.0.0"
     inherits "^2.0.1"
@@ -1019,68 +937,70 @@ asn1.js@^4.0.0:
 asn1@~0.2.3:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
-  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
   dependencies:
     safer-buffer "~2.1.0"
 
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
+
+assert-plus@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
 
 assert@^1.1.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
-  integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=
   dependencies:
     util "0.10.3"
 
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
+
+ast-types@0.x.x:
+  version "0.11.6"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.6.tgz#4e2266c2658829aef3b40cc33ad599c4e9eb89ef"
 
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
-  integrity sha1-GdOGodntxufByF04iu28xW0zYC0=
 
 async-foreach@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
-  integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
 
 async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
-  integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
 
 async@1.x, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
-async@^2.5.0, async@^2.6.0, async@^2.6.1:
+async@2.0.1:
+  version "2.0.1"
+  resolved "http://registry.npmjs.org/async/-/async-2.0.1.tgz#b709cc0280a9c36f09f4536be823c838a9049e25"
+  dependencies:
+    lodash "^4.8.0"
+
+async@^2.0.0, async@^2.1.2, async@^2.5.0, async@^2.6.0, async@^2.6.1, async@~2.6.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
-  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
   dependencies:
     lodash "^4.17.10"
 
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
 atob@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
-  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@9.1.5, autoprefixer@^9.0.0:
+autoprefixer@9.1.5:
   version "9.1.5"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.1.5.tgz#8675fd8d1c0d43069f3b19a2c316f3524e4f6671"
-  integrity sha512-kk4Zb6RUc58ld7gdosERHMF3DzIYJc2fp5sX46qEsGXQQy5bXsu8qyLjoxuY1NuQ/cJuCYnx99BfjwnRggrYIw==
   dependencies:
     browserslist "^4.1.0"
     caniuse-lite "^1.0.30000884"
@@ -1089,20 +1009,38 @@ autoprefixer@9.1.5, autoprefixer@^9.0.0:
     postcss "^7.0.2"
     postcss-value-parser "^3.2.3"
 
+autoprefixer@^9.0.0:
+  version "9.3.1"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.3.1.tgz#71b622174de2b783d5fd99f9ad617b7a3c78443e"
+  dependencies:
+    browserslist "^4.3.3"
+    caniuse-lite "^1.0.30000898"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^7.0.5"
+    postcss-value-parser "^3.3.1"
+
+aws-sign2@~0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
-aws4@^1.6.0, aws4@^1.8.0:
+aws4@^1.2.1, aws4@^1.6.0, aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
-  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
+
+axios@^0.15.3:
+  version "0.15.3"
+  resolved "http://registry.npmjs.org/axios/-/axios-0.15.3.tgz#2c9d638b2e191a08ea1d6cc988eadd6ba5bdc053"
+  dependencies:
+    follow-redirects "1.0.0"
 
 babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
   dependencies:
     chalk "^1.1.3"
     esutils "^2.0.2"
@@ -1111,7 +1049,6 @@ babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
 babel-generator@^6.18.0:
   version "6.26.1"
   resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
-  integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==
   dependencies:
     babel-messages "^6.23.0"
     babel-runtime "^6.26.0"
@@ -1125,14 +1062,12 @@ babel-generator@^6.18.0:
 babel-messages@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
-  integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=
   dependencies:
     babel-runtime "^6.22.0"
 
 babel-runtime@^6.22.0, babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.11.0"
@@ -1140,7 +1075,6 @@ babel-runtime@^6.22.0, babel-runtime@^6.26.0:
 babel-template@^6.16.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
-  integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
   dependencies:
     babel-runtime "^6.26.0"
     babel-traverse "^6.26.0"
@@ -1151,7 +1085,6 @@ babel-template@^6.16.0:
 babel-traverse@^6.18.0, babel-traverse@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
-  integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
   dependencies:
     babel-code-frame "^6.26.0"
     babel-messages "^6.23.0"
@@ -1166,7 +1099,6 @@ babel-traverse@^6.18.0, babel-traverse@^6.26.0:
 babel-types@^6.18.0, babel-types@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
-  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
   dependencies:
     babel-runtime "^6.26.0"
     esutils "^2.0.2"
@@ -1176,37 +1108,30 @@ babel-types@^6.18.0, babel-types@^6.26.0:
 babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
-  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
 
 backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
-  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
 
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
 base64-arraybuffer@0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
-  integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
 
 base64-js@^1.0.2:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
-  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
 
 base64id@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
-  integrity sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=
 
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
-  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
   dependencies:
     cache-base "^1.0.1"
     class-utils "^0.3.5"
@@ -1219,81 +1144,73 @@ base@^0.11.1:
 batch@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
-  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
 
 bcrypt-pbkdf@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
   dependencies:
     tweetnacl "^0.14.3"
 
 better-assert@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
-  integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=
   dependencies:
     callsite "1.0.0"
 
 big.js@^3.1.3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
-  integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
 
 binary-extensions@^1.0.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
-  integrity sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=
+
+bitsyntax@~0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/bitsyntax/-/bitsyntax-0.0.4.tgz#eb10cc6f82b8c490e3e85698f07e83d46e0cba82"
+  dependencies:
+    buffer-more-ints "0.0.2"
+
+bl@^1.0.0:
+  version "1.2.2"
+  resolved "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
+  dependencies:
+    readable-stream "^2.3.5"
+    safe-buffer "^5.1.1"
+
+bl@~1.1.2:
+  version "1.1.2"
+  resolved "http://registry.npmjs.org/bl/-/bl-1.1.2.tgz#fdca871a99713aa00d19e3bbba41c44787a65398"
+  dependencies:
+    readable-stream "~2.0.5"
 
 blob@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
-  integrity sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=
 
 block-stream@*:
   version "0.0.9"
   resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
   dependencies:
     inherits "~2.0.0"
 
 blocking-proxy@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/blocking-proxy/-/blocking-proxy-1.0.1.tgz#81d6fd1fe13a4c0d6957df7f91b75e98dac40cb2"
-  integrity sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==
   dependencies:
     minimist "^1.2.0"
 
-bluebird@^3.3.0, bluebird@^3.5.1, bluebird@^3.5.2:
+bluebird@^3.3.0, bluebird@^3.4.6, bluebird@^3.5.1, bluebird@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a"
-  integrity sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
-  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
-
-body-parser@1.18.2:
-  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
-  integrity sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=
-  dependencies:
-    bytes "3.0.0"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "~1.1.1"
-    http-errors "~1.6.2"
-    iconv-lite "0.4.19"
-    on-finished "~2.3.0"
-    qs "6.5.1"
-    raw-body "2.3.2"
-    type-is "~1.6.15"
 
-body-parser@^1.16.1:
+body-parser@1.18.3, body-parser@^1.16.1:
   version "1.18.3"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
-  integrity sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=
   dependencies:
     bytes "3.0.0"
     content-type "~1.0.4"
@@ -1309,7 +1226,6 @@ body-parser@^1.16.1:
 bonjour@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
-  integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU=
   dependencies:
     array-flatten "^2.1.0"
     deep-equal "^1.0.1"
@@ -1318,15 +1234,31 @@ bonjour@^3.5.0:
     multicast-dns "^6.0.1"
     multicast-dns-service-types "^1.1.0"
 
+boom@2.x.x:
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
+  dependencies:
+    hoek "2.x.x"
+
+boom@4.x.x:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
+  dependencies:
+    hoek "4.x.x"
+
+boom@5.x.x:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
+  dependencies:
+    hoek "4.x.x"
+
 bootstrap@^4.0.0:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.3.tgz#0eb371af2c8448e8c210411d0cb824a6409a12be"
-  integrity sha512-rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w==
 
 boxen@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
-  integrity sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==
   dependencies:
     ansi-align "^2.0.0"
     camelcase "^4.0.0"
@@ -1339,7 +1271,6 @@ boxen@^1.2.1:
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -1347,14 +1278,12 @@ brace-expansion@^1.1.7:
 braces@^0.1.2:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/braces/-/braces-0.1.5.tgz#c085711085291d8b75fdd74eab0f8597280711e6"
-  integrity sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=
   dependencies:
     expand-range "^0.1.0"
 
 braces@^1.8.2:
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
   dependencies:
     expand-range "^1.8.1"
     preserve "^0.2.0"
@@ -1363,7 +1292,6 @@ braces@^1.8.2:
 braces@^2.3.0, braces@^2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
-  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
   dependencies:
     arr-flatten "^1.1.0"
     array-unique "^0.3.2"
@@ -1379,7 +1307,6 @@ braces@^2.3.0, braces@^2.3.1:
 brfs@^1.4.0:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.6.1.tgz#b78ce2336d818e25eea04a0947cba6d4fb8849c3"
-  integrity sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==
   dependencies:
     quote-stream "^1.0.1"
     resolve "^1.1.5"
@@ -1389,12 +1316,10 @@ brfs@^1.4.0:
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
-  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
-  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
+  resolved "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
   dependencies:
     buffer-xor "^1.0.3"
     cipher-base "^1.0.0"
@@ -1406,7 +1331,6 @@ browserify-aes@^1.0.0, browserify-aes@^1.0.4:
 browserify-cipher@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
-  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
   dependencies:
     browserify-aes "^1.0.4"
     browserify-des "^1.0.0"
@@ -1415,7 +1339,6 @@ browserify-cipher@^1.0.0:
 browserify-des@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
-  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
   dependencies:
     cipher-base "^1.0.1"
     des.js "^1.0.0"
@@ -1424,8 +1347,7 @@ browserify-des@^1.0.0:
 
 browserify-rsa@^4.0.0:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
-  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
+  resolved "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
   dependencies:
     bn.js "^4.1.0"
     randombytes "^2.0.1"
@@ -1433,7 +1355,6 @@ browserify-rsa@^4.0.0:
 browserify-sign@^4.0.0:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
-  integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
   dependencies:
     bn.js "^4.1.1"
     browserify-rsa "^4.0.0"
@@ -1446,109 +1367,118 @@ browserify-sign@^4.0.0:
 browserify-zlib@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
-  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.1.1.tgz#328eb4ff1215b12df6589e9ab82f8adaa4fc8cd6"
-  integrity sha512-VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q==
+browserslist@^4.0.0, browserslist@^4.1.0, browserslist@^4.3.3:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.4.tgz#4477b737db6a1b07077275b24791e680d4300425"
   dependencies:
-    caniuse-lite "^1.0.30000884"
-    electron-to-chromium "^1.3.62"
-    node-releases "^1.0.0-alpha.11"
+    caniuse-lite "^1.0.30000899"
+    electron-to-chromium "^1.3.82"
+    node-releases "^1.0.1"
 
 browserstack@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.5.1.tgz#e2dfa66ffee940ebad0a07f7e00fd4687c455d66"
-  integrity sha512-O8VMT64P9NOLhuIoD4YngyxBURefaSdR4QdhG8l6HZ9VxtU7jc3m6jLufFwKA5gaf7fetfB2TnRJnMxyob+heg==
   dependencies:
     https-proxy-agent "^2.2.1"
 
 buffer-alloc-unsafe@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
-  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
 
 buffer-alloc@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
-  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
   dependencies:
     buffer-alloc-unsafe "^1.1.0"
     buffer-fill "^1.0.0"
 
+buffer-crc32@^0.2.1:
+  version "0.2.13"
+  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
+
 buffer-equal@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"
-  integrity sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=
 
 buffer-fill@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
-  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
 
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
 buffer-indexof@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
-  integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
+
+buffer-more-ints@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/buffer-more-ints/-/buffer-more-ints-0.0.2.tgz#26b3885d10fa13db7fc01aae3aab870199e0124c"
 
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
-  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
 
 buffer@^4.3.0:
   version "4.9.1"
   resolved "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
-  integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
+buffer@^5.1.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.2.1.tgz#dd57fa0f109ac59c602479044dca7b8b3d0b71d6"
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+
+buildmail@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/buildmail/-/buildmail-4.0.1.tgz#877f7738b78729871c9a105e3b837d2be11a7a72"
+  dependencies:
+    addressparser "1.0.1"
+    libbase64 "0.1.0"
+    libmime "3.0.0"
+    libqp "1.1.0"
+    nodemailer-fetch "1.6.0"
+    nodemailer-shared "1.1.0"
+    punycode "1.4.1"
+
 builtin-modules@^1.0.0, builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
 
 builtin-modules@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-2.0.0.tgz#60b7ef5ae6546bd7deefa74b08b62a43a232648e"
-  integrity sha512-3U5kUA5VPsRUA3nofm/BXX7GVHKfxz0hOBAPxXrIvHzlDRkQVqEn6yi8QJegxl4LzOHLdvb7XF5dVawa/VVYBg==
 
 builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
-  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
 builtins@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
-  integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
 
 bytebuffer@~5:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd"
-  integrity sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=
   dependencies:
     long "~3"
 
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
 cacache@^10.0.4:
   version "10.0.4"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
-  integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==
   dependencies:
     bluebird "^3.5.1"
     chownr "^1.0.1"
@@ -1567,7 +1497,6 @@ cacache@^10.0.4:
 cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0:
   version "11.2.0"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.2.0.tgz#617bdc0b02844af56310e411c0878941d5739965"
-  integrity sha512-IFWl6lfK6wSeYCHUXh+N1lY72UDrpyrYQJNIVQf48paDuWbv5RbAtJYf/4gUQFObTCHZwdZ5sI8Iw7nqwP6nlQ==
   dependencies:
     bluebird "^3.5.1"
     chownr "^1.0.1"
@@ -1587,7 +1516,6 @@ cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0:
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
-  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
   dependencies:
     collection-visit "^1.0.0"
     component-emitter "^1.2.1"
@@ -1602,7 +1530,6 @@ cache-base@^1.0.1:
 cacheable-request@^2.1.1:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d"
-  integrity sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=
   dependencies:
     clone-response "1.0.2"
     get-stream "3.0.0"
@@ -1615,12 +1542,10 @@ cacheable-request@^2.1.1:
 callsite@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
-  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
 
 camelcase-keys@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
-  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
   dependencies:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
@@ -1628,7 +1553,6 @@ camelcase-keys@^2.0.0:
 camelcase-keys@^4.0.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
-  integrity sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=
   dependencies:
     camelcase "^4.1.0"
     map-obj "^2.0.0"
@@ -1637,42 +1561,38 @@ camelcase-keys@^4.0.0:
 camelcase@^2.0.0, camelcase@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
-  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
 
 camelcase@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
-  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
 
 camelcase@^4.0.0, camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
-  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
-caniuse-lite@^1.0.30000884:
-  version "1.0.30000885"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000885.tgz#e889e9f8e7e50e769f2a49634c932b8aee622984"
-  integrity sha512-cXKbYwpxBLd7qHyej16JazPoUacqoVuDhvR61U7Fr5vSxMUiodzcYa1rQYRYfZ5GexV03vGZHd722vNPLjPJGQ==
+caniuse-lite@^1.0.30000884, caniuse-lite@^1.0.30000898, caniuse-lite@^1.0.30000899:
+  version "1.0.30000903"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000903.tgz#86d46227759279b3db345ddbe778335dbba9e858"
 
 canonical-path@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-0.0.2.tgz#e31eb937a8c93ee2a01df1839794721902874574"
-  integrity sha1-4x65N6jJPuKgHfGDl5RyGQKHRXQ=
 
 capture-stack-trace@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
-  integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==
+
+caseless@~0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
 
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
 chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
   dependencies:
     ansi-styles "^2.2.1"
     escape-string-regexp "^1.0.2"
@@ -1683,7 +1603,6 @@ chalk@^1.1.1, chalk@^1.1.3:
 chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
-  integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
   dependencies:
     ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
@@ -1692,12 +1611,10 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1:
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
-  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
 chokidar@2.0.4, chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
-  integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.0"
@@ -1714,10 +1631,9 @@ chokidar@2.0.4, chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3:
   optionalDependencies:
     fsevents "^1.2.2"
 
-chokidar@^1.4.2:
+chokidar@^1.4.1, chokidar@^1.4.2:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
-  integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=
   dependencies:
     anymatch "^1.3.0"
     async-each "^1.0.0"
@@ -1733,24 +1649,20 @@ chokidar@^1.4.2:
 chownr@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
-  integrity sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=
 
 chrome-trace-event@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"
-  integrity sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==
   dependencies:
     tslib "^1.9.0"
 
 ci-info@^1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.5.1.tgz#17e8eb5de6f8b2b6038f0cbb714d410bfa9f3030"
-  integrity sha512-fKFIKXaYiL1exImwJ0AhR/6jxFPSKQBk2ayV5NiNoruUs2+rxC2kNw0EG+1Z9dugZRdCrppskQ8DN2cyaUM1Hw==
 
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
-  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -1758,17 +1670,18 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
 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"
-  integrity sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==
+
+circular-json@^0.5.4:
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.8.tgz#40d2ff3aadee99871ebd19b41af3c9f113490003"
 
 circular-json@^0.5.5:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.5.tgz#64182ef359042d37cd8e767fc9de878b1e9447d3"
-  integrity sha512-13YaR6kiz0kBNmIVM87Io8Hp7bWOo4r61vkEANy8iH9R9bc6avud/1FT0SBpqR1RpIQADOh/Q+yHZDA1iL6ysA==
+  version "0.5.9"
+  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.9.tgz#932763ae88f4f7dead7a0d09c8a51a4743a53b1d"
 
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
-  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
   dependencies:
     arr-union "^3.1.0"
     define-property "^0.2.5"
@@ -1778,31 +1691,26 @@ class-utils@^0.3.5:
 clean-css@4.2.1, clean-css@^4.1.11:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
-  integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==
   dependencies:
     source-map "~0.6.0"
 
 cli-boxes@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
-  integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM=
 
 cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
-  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
   dependencies:
     restore-cursor "^2.0.0"
 
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
-  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
 
 cliui@^3.0.3, cliui@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
-  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -1811,7 +1719,6 @@ cliui@^3.0.3, cliui@^3.2.0:
 cliui@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
-  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
   dependencies:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
@@ -1820,7 +1727,6 @@ cliui@^4.0.0:
 clone-deep@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
-  integrity sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==
   dependencies:
     for-own "^1.0.0"
     is-plain-object "^2.0.4"
@@ -1830,29 +1736,24 @@ clone-deep@^2.0.1:
 clone-response@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
-  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
   dependencies:
     mimic-response "^1.0.0"
 
 clone@^2.1.1, clone@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
-  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
 
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
 codelyzer@^4.2.1:
-  version "4.4.4"
-  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-4.4.4.tgz#29b7dbb51ba9ecc45c7300d61280a6564765d402"
-  integrity sha512-JgFMudx0n50IuE/ydAfnkksCwQkWSVWgYvhDPHZgDUbmsiYC22VuEXKu5l8Hhx9UJsLgjWDLjTAFGj2WaW5DUA==
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-4.5.0.tgz#a65ddeeeca2894653253a89bfa229118ff9f59b1"
   dependencies:
     app-root-path "^2.1.0"
     css-selector-tokenizer "^0.7.0"
@@ -1864,12 +1765,10 @@ codelyzer@^4.2.1:
 collection-utils@0.0.15:
   version "0.0.15"
   resolved "https://registry.yarnpkg.com/collection-utils/-/collection-utils-0.0.15.tgz#70f4c54299621699b3f38c66577c9d4284825125"
-  integrity sha512-eLGXa67rSilE5dNCcx2wenWcmmgl4QdlwUj1Z5idKkIBOhZh6PghEZFC3wP3AHH8xnMbIDsky0pR/+1epJBymQ==
 
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
-  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
   dependencies:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
@@ -1877,19 +1776,16 @@ collection-visit@^1.0.0:
 color-convert@^1.9.0, color-convert@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
     color-name "1.1.3"
 
 color-name@1.1.3, color-name@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
 color-string@^1.5.2:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc"
-  integrity sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==
   dependencies:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
@@ -1897,7 +1793,6 @@ color-string@^1.5.2:
 color@3.0.x:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/color/-/color-3.0.0.tgz#d920b4328d534a3ac8295d68f7bd4ba6c427be9a"
-  integrity sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==
   dependencies:
     color-convert "^1.9.1"
     color-string "^1.5.2"
@@ -1905,22 +1800,18 @@ color@3.0.x:
 colornames@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz#f8889030685c7c4ff9e2a559f5077eb76a816f96"
-  integrity sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=
 
 colors@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
-  integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
 
 colors@^1.1.0, colors@^1.2.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.2.tgz#2df8ff573dfbf255af562f8ce7181d6b971a359b"
-  integrity sha512-rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ==
 
 colorspace@1.1.x:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.1.tgz#9ac2491e1bc6f8fb690e2176814f8d091636d972"
-  integrity sha512-pI3btWyiuz7Ken0BWh9Elzsmv2bM9AhA7psXib4anUXy/orfZ/E0MbQwhSOG/9L8hLlalqrU0UhOuqxW1YjmVw==
   dependencies:
     color "3.0.x"
     text-hex "1.0.x"
@@ -1928,51 +1819,52 @@ colorspace@1.1.x:
 colour@~0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/colour/-/colour-0.7.1.tgz#9cb169917ec5d12c0736d3e8685746df1cadf778"
-  integrity sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=
 
 combine-lists@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/combine-lists/-/combine-lists-1.0.1.tgz#458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"
-  integrity sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=
   dependencies:
     lodash "^4.5.0"
 
 combined-stream@1.0.6, combined-stream@~1.0.5, combined-stream@~1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-  integrity sha1-cj599ugBrFYTETp+RFqbactjKBg=
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.12.0, commander@^2.12.1:
+combined-stream@^1.0.5, combined-stream@^1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
+  dependencies:
+    delayed-stream "~1.0.0"
+
+commander@^2.12.0, commander@^2.9.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
+
+commander@^2.12.1:
   version "2.18.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
-  integrity sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==
 
 commander@~2.13.0:
   version "2.13.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
-  integrity sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==
 
 commander@~2.17.1:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
-  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
 
 common-tags@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
-  integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==
 
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
 compare-func@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648"
-  integrity sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=
   dependencies:
     array-ify "^1.0.0"
     dot-prop "^3.0.0"
@@ -1980,34 +1872,37 @@ compare-func@^1.3.1:
 compare-versions@^3.2.1:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.4.0.tgz#e0747df5c9cb7f054d6d3dc3e1dbc444f9e92b26"
-  integrity sha512-tK69D7oNXXqUW3ZNo/z7NXTEz22TCF0pTE+YF9cxvaAM9XnkLo1fV621xCLrRR6aevJlKxExkss0vWqUCUpqdg==
 
 component-bind@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
-  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
 
 component-emitter@1.2.1, component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
 
 component-inherit@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
-  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
+
+compress-commons@^1.2.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-1.2.2.tgz#524a9f10903f3a813389b0225d27c48bb751890f"
+  dependencies:
+    buffer-crc32 "^0.2.1"
+    crc32-stream "^2.0.0"
+    normalize-path "^2.0.0"
+    readable-stream "^2.0.0"
 
 compressible@~2.0.14:
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.14.tgz#326c5f507fbb055f54116782b969a81b67a29da7"
-  integrity sha1-MmxfUH+7BV9UEWeCuWmoG2einac=
+  version "2.0.15"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.15.tgz#857a9ab0a7e5a07d8d837ed43fe2defff64fe212"
   dependencies:
-    mime-db ">= 1.34.0 < 2"
+    mime-db ">= 1.36.0 < 2"
 
 compression@^1.5.2:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db"
-  integrity sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==
   dependencies:
     accepts "~1.3.5"
     bytes "3.0.0"
@@ -2020,12 +1915,10 @@ compression@^1.5.2:
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.5.0, concat-stream@~1.6.0:
+concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@~1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
   dependencies:
     buffer-from "^1.0.0"
     inherits "^2.0.3"
@@ -2035,7 +1928,6 @@ concat-stream@^1.5.0, concat-stream@~1.6.0:
 configstore@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f"
-  integrity sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==
   dependencies:
     dot-prop "^4.1.0"
     graceful-fs "^4.1.2"
@@ -2047,12 +1939,10 @@ configstore@^3.0.0:
 connect-history-api-fallback@^1.3.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a"
-  integrity sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=
 
 connect@^3.6.0:
   version "3.6.6"
   resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
-  integrity sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=
   dependencies:
     debug "2.6.9"
     finalhandler "1.1.0"
@@ -2062,34 +1952,28 @@ connect@^3.6.0:
 console-browserify@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
-  integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=
   dependencies:
     date-now "^0.1.4"
 
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
-  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
 
 content-disposition@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
-  integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
 
 content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
-  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
 conventional-changelog-angular@^1.6.6:
   version "1.6.6"
   resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.6.6.tgz#b27f2b315c16d0a1f23eb181309d0e6a4698ea0f"
-  integrity sha512-suQnFSqCxRwyBxY68pYTsFkG0taIdinHLNEAX5ivtw8bCRnIgnpvcHmlR/yjUyZIrNPYAoXlY1WiEKWgSE4BNg==
   dependencies:
     compare-func "^1.3.1"
     q "^1.5.1"
@@ -2097,21 +1981,18 @@ conventional-changelog-angular@^1.6.6:
 conventional-changelog-atom@^0.2.8:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.2.8.tgz#8037693455990e3256f297320a45fa47ee553a14"
-  integrity sha512-8pPZqhMbrnltNBizjoDCb/Sz85KyUXNDQxuAEYAU5V/eHn0okMBVjqc8aHWYpHrytyZWvMGbayOlDv7i8kEf6g==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-codemirror@^0.3.8:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.8.tgz#a1982c8291f4ee4d6f2f62817c6b2ecd2c4b7b47"
-  integrity sha512-3HFZKtBXTaUCHvz7ai6nk2+psRIkldDoNzCsom0egDtVmPsvvHZkzjynhdQyULfacRSsBTaiQ0ol6nBOL4dDiQ==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-core@^2.0.11:
   version "2.0.11"
   resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-2.0.11.tgz#19b5fbd55a9697773ed6661f4e32030ed7e30287"
-  integrity sha512-HvTE6RlqeEZ/NFPtQeFLsIDOLrGP3bXYr7lFLMhCVsbduF1MXIe8OODkwMFyo1i9ku9NWBwVnVn0jDmIFXjDRg==
   dependencies:
     conventional-changelog-writer "^3.0.9"
     conventional-commits-parser "^2.1.7"
@@ -2130,42 +2011,36 @@ conventional-changelog-core@^2.0.11:
 conventional-changelog-ember@^0.3.12:
   version "0.3.12"
   resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.3.12.tgz#b7d31851756d0fcb49b031dffeb6afa93b202400"
-  integrity sha512-mmJzA7uzbrOqeF89dMMi6z17O07ORTXlTMArnLG9ZTX4oLaKNolUlxFUFlFm9JUoVWajVpaHQWjxH1EOQ+ARoQ==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-eslint@^1.0.9:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.9.tgz#b13cc7e4b472c819450ede031ff1a75c0e3d07d3"
-  integrity sha512-h87nfVh2fdk9fJIvz26wCBsbDC/KxqCc5wSlNMZbXcARtbgNbNDIF7Y7ctokFdnxkzVdaHsbINkh548T9eBA7Q==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-express@^0.3.6:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.3.6.tgz#4a6295cb11785059fb09202180d0e59c358b9c2c"
-  integrity sha512-3iWVtBJZ9RnRnZveNDzOD8QRn6g6vUif0qVTWWyi5nUIAbuN1FfPVyKdAlJJfp5Im+dE8Kiy/d2SpaX/0X678Q==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-jquery@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz#0208397162e3846986e71273b6c79c5b5f80f510"
-  integrity sha1-Agg5cWLjhGmG5xJztsecW1+A9RA=
   dependencies:
     q "^1.4.1"
 
 conventional-changelog-jscs@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz#0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c"
-  integrity sha1-BHnrRDzH1yxYvwvPDvHURKkvDlw=
   dependencies:
     q "^1.4.1"
 
 conventional-changelog-jshint@^0.3.8:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.8.tgz#9051c1ac0767abaf62a31f74d2fe8790e8acc6c8"
-  integrity sha512-hn9QU4ZI/5V50wKPJNPGT4gEWgiBFpV6adieILW4MaUFynuDYOvQ71EMSj3EznJyKi/KzuXpc9dGmX8njZMjig==
   dependencies:
     compare-func "^1.3.1"
     q "^1.5.1"
@@ -2173,12 +2048,10 @@ conventional-changelog-jshint@^0.3.8:
 conventional-changelog-preset-loader@^1.1.8:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.8.tgz#40bb0f142cd27d16839ec6c74ee8db418099b373"
-  integrity sha512-MkksM4G4YdrMlT2MbTsV2F6LXu/hZR0Tc/yenRrDIKRwBl/SP7ER4ZDlglqJsCzLJi4UonBc52Bkm5hzrOVCcw==
 
 conventional-changelog-writer@^3.0.9:
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-3.0.9.tgz#4aecdfef33ff2a53bb0cf3b8071ce21f0e994634"
-  integrity sha512-n9KbsxlJxRQsUnK6wIBRnARacvNnN4C/nxnxCkH+B/R1JS2Fa+DiP1dU4I59mEDEjgnFaN2+9wr1P1s7GYB5/Q==
   dependencies:
     compare-func "^1.3.1"
     conventional-commits-filter "^1.1.6"
@@ -2194,7 +2067,6 @@ conventional-changelog-writer@^3.0.9:
 conventional-changelog@^1.1.0:
   version "1.1.24"
   resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.24.tgz#3d94c29c960f5261c002678315b756cdd3d7d1f0"
-  integrity sha512-2WcSUst4Y3Z4hHvoMTWXMJr/DmgVdLiMOVY1Kak2LfFz+GIz2KDp5naqbFesYbfXPmaZ5p491dO0FWZIJoJw1Q==
   dependencies:
     conventional-changelog-angular "^1.6.6"
     conventional-changelog-atom "^0.2.8"
@@ -2211,7 +2083,6 @@ conventional-changelog@^1.1.0:
 conventional-commits-filter@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.1.6.tgz#4389cd8e58fe89750c0b5fb58f1d7f0cc8ad3831"
-  integrity sha512-KcDgtCRKJCQhyk6VLT7zR+ZOyCnerfemE/CsR3iQpzRRFbLEs0Y6rwk3mpDvtOh04X223z+1xyJ582Stfct/0Q==
   dependencies:
     is-subset "^0.1.1"
     modify-values "^1.0.0"
@@ -2219,7 +2090,6 @@ conventional-commits-filter@^1.1.6:
 conventional-commits-parser@^2.1.7:
   version "2.1.7"
   resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz#eca45ed6140d72ba9722ee4132674d639e644e8e"
-  integrity sha512-BoMaddIEJ6B4QVMSDu9IkVImlGOSGA1I2BQyOZHeLQ6qVOJLcLKn97+fL6dGbzWEiqDzfH4OkcveULmeq2MHFQ==
   dependencies:
     JSONStream "^1.0.4"
     is-text-path "^1.0.0"
@@ -2232,7 +2102,6 @@ conventional-commits-parser@^2.1.7:
 conventional-commits-parser@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.0.tgz#7f604549a50bd8f60443fbe515484b1c2f06a5c4"
-  integrity sha512-GWh71U26BLWgMykCp+VghZ4s64wVbtseECcKQ/PvcPZR2cUnz+FUc2J9KjxNl7/ZbCxST8R03c9fc+Vi0umS9Q==
   dependencies:
     JSONStream "^1.0.4"
     is-text-path "^1.0.0"
@@ -2245,24 +2114,20 @@ conventional-commits-parser@^3.0.0:
 convert-source-map@^1.5.0, convert-source-map@^1.5.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
-  integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
   dependencies:
     safe-buffer "~5.1.1"
 
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
 
 cookie@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
-  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
 
 copy-concurrently@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
-  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
   dependencies:
     aproba "^1.1.1"
     fs-write-stream-atomic "^1.0.8"
@@ -2274,12 +2139,10 @@ copy-concurrently@^1.0.0:
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 copy-webpack-plugin@4.5.4:
   version "4.5.4"
   resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.4.tgz#f2b2782b3cd5225535c3dc166a80067e7d940f27"
-  integrity sha512-0lstlEyj74OAtYMrDxlNZsU7cwFijAI3Ofz2fD6Mpo9r4xCv4yegfa3uHIKvZY1NSuOtE9nvG6TAhJ+uz9gDaQ==
   dependencies:
     cacache "^10.0.4"
     find-cache-dir "^1.0.0"
@@ -2293,32 +2156,40 @@ copy-webpack-plugin@4.5.4:
 core-js@^2.2.0, core-js@^2.4.0, core-js@^2.4.1:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
-  integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==
 
 core-js@~2.3.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"
-  integrity sha1-+rg/uwstjchfpjbEudNMdUIMbWU=
+  resolved "http://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"
 
 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"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
 cosmiconfig@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
-  integrity sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==
   dependencies:
     is-directory "^0.3.1"
     js-yaml "^3.9.0"
     parse-json "^4.0.0"
     require-from-string "^2.0.1"
 
+crc32-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-2.0.0.tgz#e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"
+  dependencies:
+    crc "^3.4.4"
+    readable-stream "^2.0.0"
+
+crc@^3.4.4:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6"
+  dependencies:
+    buffer "^5.1.0"
+
 create-ecdh@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
-  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
   dependencies:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
@@ -2326,14 +2197,12 @@ create-ecdh@^4.0.0:
 create-error-class@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
-  integrity sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=
   dependencies:
     capture-stack-trace "^1.0.0"
 
 create-hash@^1.1.0, create-hash@^1.1.2:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
-  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
+  resolved "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
   dependencies:
     cipher-base "^1.0.1"
     inherits "^2.0.1"
@@ -2343,8 +2212,7 @@ create-hash@^1.1.0, create-hash@^1.1.2:
 
 create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
   version "1.1.7"
-  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
-  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
+  resolved "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
   dependencies:
     cipher-base "^1.0.3"
     create-hash "^1.1.0"
@@ -2356,7 +2224,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
 cross-spawn@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
-  integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI=
   dependencies:
     lru-cache "^4.0.1"
     which "^1.2.9"
@@ -2364,7 +2231,6 @@ cross-spawn@^3.0.0:
 cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
-  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
   dependencies:
     lru-cache "^4.0.1"
     shebang-command "^1.2.0"
@@ -2373,7 +2239,6 @@ cross-spawn@^5.0.1:
 cross-spawn@^6.0.0:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
   dependencies:
     nice-try "^1.0.4"
     path-key "^2.0.1"
@@ -2381,10 +2246,21 @@ cross-spawn@^6.0.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+cryptiles@2.x.x:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
+  dependencies:
+    boom "2.x.x"
+
+cryptiles@3.x.x:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
+  dependencies:
+    boom "5.x.x"
+
 crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
-  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
   dependencies:
     browserify-cipher "^1.0.0"
     browserify-sign "^4.0.0"
@@ -2401,17 +2277,14 @@ crypto-browserify@^3.11.0:
 crypto-random-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
-  integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=
 
 css-parse@1.7.x:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
-  integrity sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=
 
 css-selector-tokenizer@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
-  integrity sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz#a177271a8bca5019172f4f891fc6eed9cbf68d5d"
   dependencies:
     cssesc "^0.1.0"
     fastparse "^1.1.1"
@@ -2420,110 +2293,96 @@ css-selector-tokenizer@^0.7.0:
 cssauron@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/cssauron/-/cssauron-1.4.0.tgz#a6602dff7e04a8306dc0db9a551e92e8b5662ad8"
-  integrity sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=
   dependencies:
     through X.X.X
 
 cssesc@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
-  integrity sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=
 
 cuint@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
-  integrity sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=
 
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
-  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
   dependencies:
     array-find-index "^1.0.1"
 
 custom-event@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
-  integrity sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=
 
 cyclist@~0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
-  integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
 
 dargs@^4.0.1:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
-  integrity sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=
   dependencies:
     number-is-nan "^1.0.0"
 
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
   dependencies:
     assert-plus "^1.0.0"
 
+data-uri-to-buffer@1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz#77163ea9c20d8641b4707e8f18abdf9a78f34835"
+
 date-format@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"
-  integrity sha1-YV6CjiM90aubua4JUODOzPpuytg=
 
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
-  integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
 
 dateformat@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
-  integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
 debug@*:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.0.0.tgz#ef7592a30b1c5e05a78e96926df2e6b36b5544e7"
-  integrity sha512-PlYAp+yaKUjcs6FIDv1G2kU9jh4+OOD7AniwnWEvdoeHSsi5X6vRNuI9MDZCl8YcF/aNsvuF5EDOjY/v90zdrg==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
   dependencies:
     ms "^2.1.1"
 
-debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.8:
+debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@~2.6.4, debug@~2.6.6:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
 debug@3.1.0, debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
   dependencies:
     ms "2.0.0"
 
 debug@^3.1.0:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.4.tgz#82123737c51afbe9609a2b5dfe9664e7487171f0"
-  integrity sha512-fCEG5fOr7m/fhgOD3KurdAov706JbXZJYXAsAOEJ7GgasGr0GO4N+1NsIcrjlIUcyvJ9oZlnelTzN3Ix8z1ecw==
   dependencies:
     ms "^2.1.1"
 
 debug@^3.2.5:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
   dependencies:
     ms "^2.1.1"
 
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
-  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
 
 decamelize-keys@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
-  integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
   dependencies:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
@@ -2531,46 +2390,38 @@ decamelize-keys@^1.0.0:
 decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
 decamelize@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
-  integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==
   dependencies:
     xregexp "4.0.0"
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 decompress-response@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
-  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
   dependencies:
     mimic-response "^1.0.0"
 
 deep-equal@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
-  integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
 
 deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
 default-gateway@^2.6.0:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f"
-  integrity sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==
   dependencies:
     execa "^0.10.0"
     ip-regex "^2.1.0"
@@ -2578,36 +2429,39 @@ default-gateway@^2.6.0:
 default-require-extensions@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
-  integrity sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=
   dependencies:
     strip-bom "^3.0.0"
 
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
   dependencies:
     is-descriptor "^0.1.0"
 
 define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
   dependencies:
     is-descriptor "^1.0.0"
 
 define-property@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
-  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
   dependencies:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
+degenerator@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-1.0.4.tgz#fcf490a37ece266464d9cc431ab98c5819ced095"
+  dependencies:
+    ast-types "0.x.x"
+    escodegen "1.x.x"
+    esprima "3.x.x"
+
 del@^2.2.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
-  integrity sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=
   dependencies:
     globby "^5.0.0"
     is-path-cwd "^1.0.0"
@@ -2620,7 +2474,6 @@ del@^2.2.0:
 del@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
-  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
   dependencies:
     globby "^6.1.0"
     is-path-cwd "^1.0.0"
@@ -2632,32 +2485,22 @@ del@^3.0.0:
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
-depd@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
-  integrity sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=
-
-depd@~1.1.1, depd@~1.1.2:
+depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
 dependency-graph@^0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.7.2.tgz#91db9de6eb72699209d88aea4c1fd5221cac1c49"
-  integrity sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==
 
 des.js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
-  integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=
   dependencies:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
@@ -2665,29 +2508,24 @@ des.js@^1.0.0:
 destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
 detect-indent@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
-  integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg=
   dependencies:
     repeating "^2.0.0"
 
 detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
 
 detect-node@^2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
-  integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
 
 dezalgo@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
-  integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
   dependencies:
     asap "^2.0.0"
     wrappy "1"
@@ -2695,12 +2533,10 @@ dezalgo@^1.0.0:
 di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
-  integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=
 
 diagnostics@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.1.1.tgz#cab6ac33df70c9d9a727490ae43ac995a769b22a"
-  integrity sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==
   dependencies:
     colorspace "1.1.x"
     enabled "1.0.x"
@@ -2709,12 +2545,10 @@ diagnostics@^1.1.1:
 diff@^3.1.0, diff@^3.2.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
 
 diffie-hellman@^5.0.0:
   version "5.0.3"
-  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
-  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
+  resolved "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
   dependencies:
     bn.js "^4.1.0"
     miller-rabin "^4.0.0"
@@ -2723,7 +2557,6 @@ diffie-hellman@^5.0.0:
 dir-glob@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
-  integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==
   dependencies:
     arrify "^1.0.1"
     path-type "^3.0.0"
@@ -2731,12 +2564,10 @@ dir-glob@^2.0.0:
 dns-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
-  integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
 
 dns-packet@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
-  integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
   dependencies:
     ip "^1.1.0"
     safe-buffer "^5.0.1"
@@ -2744,14 +2575,12 @@ dns-packet@^1.3.1:
 dns-txt@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
-  integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=
   dependencies:
     buffer-indexof "^1.0.0"
 
 dom-serialize@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
-  integrity sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=
   dependencies:
     custom-event "~1.0.0"
     ent "~2.2.0"
@@ -2761,43 +2590,40 @@ dom-serialize@^2.2.0:
 domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
-  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
 domino@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.0.tgz#653ba7d331441113b42e40ba05f24253ec86e02e"
-  integrity sha512-xINSODvrnuQcm3eXJN4IkBR+JxqLrJN8Ge4fd00y1b7HsY0A4huKN5BflSS/oo8quBWmocTfWdFvrw2H8TjGqQ==
 
 dot-prop@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
-  integrity sha1-G3CK8JSknJoOfbyteQq6U52sEXc=
   dependencies:
     is-obj "^1.0.0"
 
 dot-prop@^4.1.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
-  integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==
   dependencies:
     is-obj "^1.0.0"
 
+double-ended-queue@^2.1.0-0:
+  version "2.1.0-0"
+  resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
+
 duplexer2@~0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
-  integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=
   dependencies:
     readable-stream "^2.0.2"
 
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
-  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
 
 duplexify@^3.4.2, duplexify@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.0.tgz#592903f5d80b38d037220541264d69a198fb3410"
-  integrity sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.1.tgz#b1a7a29c4abfd639585efaecce80d666b1e34125"
   dependencies:
     end-of-stream "^1.0.0"
     inherits "^2.0.1"
@@ -2807,7 +2633,6 @@ duplexify@^3.4.2, duplexify@^3.6.0:
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
   dependencies:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
@@ -2815,17 +2640,14 @@ ecc-jsbn@~0.1.1:
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.62:
-  version "1.3.65"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.65.tgz#0655c238e45fea7e0e0e81fd0cac62b8186129c2"
-  integrity sha512-tyGr+wh2c/JYBVMeflKpZ3ricwtBPyVBMtRNxYGObl7TP5bAeupgz4VZnBzQSFleZViXYTws1yZtKKFQYZyiYw==
+electron-to-chromium@^1.3.82:
+  version "1.3.82"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.82.tgz#7d13ae4437d2a783de3f4efba96b186c540b67b1"
 
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
-  integrity sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"
@@ -2838,38 +2660,48 @@ elliptic@^6.0.0:
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
 
 enabled@1.0.x:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz#965f6513d2c2d1c5f4652b64a2e3396467fc2f93"
-  integrity sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=
   dependencies:
     env-variable "0.0.x"
 
 encodeurl@~1.0.1, encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
 encoding@^0.1.11:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
-  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
   dependencies:
     iconv-lite "~0.4.13"
 
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
-  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
   dependencies:
     once "^1.4.0"
 
+engine.io-client@~3.1.0:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.1.6.tgz#5bdeb130f8b94a50ac5cbeb72583e7a4a063ddfd"
+  dependencies:
+    component-emitter "1.2.1"
+    component-inherit "0.0.3"
+    debug "~3.1.0"
+    engine.io-parser "~2.1.1"
+    has-cors "1.1.0"
+    indexof "0.0.1"
+    parseqs "0.0.5"
+    parseuri "0.0.5"
+    ws "~3.3.1"
+    xmlhttprequest-ssl "~1.5.4"
+    yeast "0.1.2"
+
 engine.io-client@~3.2.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36"
-  integrity sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==
   dependencies:
     component-emitter "1.2.1"
     component-inherit "0.0.3"
@@ -2886,7 +2718,6 @@ engine.io-client@~3.2.0:
 engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.2.tgz#4c0f4cff79aaeecbbdcfdea66a823c6085409196"
-  integrity sha512-dInLFzr80RijZ1rGpx1+56/uFoH7/7InhH3kZt+Ms6hT8tNx3NGW/WNSA/f8As1WkOfkuyb3tnRyuXGxusclMw==
   dependencies:
     after "0.8.2"
     arraybuffer.slice "~0.0.7"
@@ -2894,10 +2725,22 @@ engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
     blob "0.0.4"
     has-binary2 "~1.0.2"
 
+engine.io@~3.1.0:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.1.5.tgz#0e7ef9d690eb0b35597f1d4ad02a26ca2dba3845"
+  dependencies:
+    accepts "~1.3.4"
+    base64id "1.0.0"
+    cookie "0.3.1"
+    debug "~3.1.0"
+    engine.io-parser "~2.1.0"
+    ws "~3.3.1"
+  optionalDependencies:
+    uws "~9.14.0"
+
 engine.io@~3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.0.tgz#54332506f42f2edc71690d2f2a42349359f3bf7d"
-  integrity sha512-mRbgmAtQ4GAlKwuPnnAvXXwdPhEx+jkc0OBCLrXuD/CRvwNK3AxRSnqK4FSqmAMRRHryVJP8TopOvmEaA64fKw==
   dependencies:
     accepts "~1.3.4"
     base64id "1.0.0"
@@ -2909,7 +2752,6 @@ engine.io@~3.2.0:
 enhanced-resolve@4.1.0, enhanced-resolve@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
-  integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.4.0"
@@ -2918,63 +2760,52 @@ enhanced-resolve@4.1.0, enhanced-resolve@^4.1.0:
 ent@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
-  integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0=
 
 env-variable@0.0.x:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.4.tgz#0d6280cf507d84242befe35a512b5ae4be77c54e"
-  integrity sha512-+jpGxSWG4vr6gVxUHOc4p+ilPnql7NzZxOZBxNldsKGjCF+97df3CbuX7XMaDa5oAVkKQj4rKp38rYdC4VcpDg==
 
 err-code@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
-  integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=
 
 errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
-  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
   dependencies:
     prr "~1.0.1"
 
 error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
 es6-promise@^4.0.3:
   version "4.2.5"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
-  integrity sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==
 
 es6-promise@~3.0.2:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6"
-  integrity sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=
+  resolved "http://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6"
 
 es6-promisify@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
-  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
   dependencies:
     es6-promise "^4.0.3"
 
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
 escodegen@1.8.x:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
-  integrity sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=
   dependencies:
     esprima "^2.7.1"
     estraverse "^1.9.1"
@@ -2983,10 +2814,9 @@ escodegen@1.8.x:
   optionalDependencies:
     source-map "~0.2.0"
 
-escodegen@^1.8.1:
+escodegen@1.x.x, escodegen@^1.8.1:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589"
-  integrity sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==
   dependencies:
     esprima "^3.1.3"
     estraverse "^4.2.0"
@@ -2998,7 +2828,6 @@ escodegen@^1.8.1:
 escodegen@~1.9.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"
-  integrity sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==
   dependencies:
     esprima "^3.1.3"
     estraverse "^4.2.0"
@@ -3010,7 +2839,6 @@ escodegen@~1.9.0:
 eslint-scope@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
-  integrity sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==
   dependencies:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
@@ -3018,78 +2846,58 @@ eslint-scope@^4.0.0:
 esprima@2.7.x, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
-  integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=
 
-esprima@^3.1.3:
+esprima@3.x.x, esprima@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
 
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esrecurse@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
-  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
   dependencies:
     estraverse "^4.1.0"
 
 estraverse@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
-  integrity sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=
 
 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"
-  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
 
-estree-walker@^0.5.1, estree-walker@^0.5.2:
+estree-walker@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39"
-  integrity sha512-XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig==
 
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
 
 etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
 eventemitter3@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
-  integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
 
 events@^1.0.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
-  integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=
-
-eventsource@0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232"
-  integrity sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=
-  dependencies:
-    original ">=0.0.5"
+  resolved "http://registry.npmjs.org/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
 
 eventsource@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"
-  integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==
   dependencies:
     original "^1.0.0"
 
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
-  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
   dependencies:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
@@ -3097,7 +2905,6 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
 execa@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
-  integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==
   dependencies:
     cross-spawn "^6.0.0"
     get-stream "^3.0.0"
@@ -3110,7 +2917,6 @@ execa@^0.10.0:
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
-  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
   dependencies:
     cross-spawn "^5.0.1"
     get-stream "^3.0.0"
@@ -3123,12 +2929,10 @@ execa@^0.7.0:
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
 expand-braces@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea"
-  integrity sha1-SIsdHSRRyz06axks/AMPRMWFX+o=
   dependencies:
     array-slice "^0.2.3"
     array-unique "^0.2.1"
@@ -3137,14 +2941,12 @@ expand-braces@^0.1.1:
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
   dependencies:
     is-posix-bracket "^0.1.0"
 
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
   dependencies:
     debug "^2.3.3"
     define-property "^0.2.5"
@@ -3157,7 +2959,6 @@ expand-brackets@^2.1.4:
 expand-range@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-0.1.1.tgz#4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"
-  integrity sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=
   dependencies:
     is-number "^0.1.1"
     repeat-string "^0.2.2"
@@ -3165,18 +2966,16 @@ expand-range@^0.1.0:
 expand-range@^1.8.1:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
   dependencies:
     fill-range "^2.1.0"
 
 express@^4.16.2:
-  version "4.16.3"
-  resolved "http://registry.npmjs.org/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
-  integrity sha1-avilAjUNsyRuzEvs9rWjTSL37VM=
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
   dependencies:
     accepts "~1.3.5"
     array-flatten "1.1.1"
-    body-parser "1.18.2"
+    body-parser "1.18.3"
     content-disposition "0.5.2"
     content-type "~1.0.4"
     cookie "0.3.1"
@@ -3193,10 +2992,10 @@ express@^4.16.2:
     on-finished "~2.3.0"
     parseurl "~1.3.2"
     path-to-regexp "0.1.7"
-    proxy-addr "~2.0.3"
-    qs "6.5.1"
+    proxy-addr "~2.0.4"
+    qs "6.5.2"
     range-parser "~1.2.0"
-    safe-buffer "5.1.1"
+    safe-buffer "5.1.2"
     send "0.16.2"
     serve-static "1.13.2"
     setprototypeof "1.1.0"
@@ -3208,27 +3007,23 @@ express@^4.16.2:
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
   dependencies:
     is-extendable "^0.1.0"
 
 extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
   dependencies:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@^3.0.0, extend@~3.0.1, extend@~3.0.2:
+extend@3, extend@^3.0.0, extend@~3.0.0, extend@~3.0.1, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
 external-editor@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
-  integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
   dependencies:
     chardet "^0.7.0"
     iconv-lite "^0.4.24"
@@ -3237,14 +3032,12 @@ external-editor@^3.0.0:
 extglob@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
   dependencies:
     is-extglob "^1.0.0"
 
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
-  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
   dependencies:
     array-unique "^0.3.2"
     define-property "^1.0.0"
@@ -3258,17 +3051,14 @@ extglob@^2.0.4:
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
 
 extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
 falafel@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.1.0.tgz#96bb17761daba94f46d001738b3cedf3a67fe06c"
-  integrity sha1-lrsXdh2rqU9G0AFzizzt86Z/4Gw=
   dependencies:
     acorn "^5.0.0"
     foreach "^2.0.5"
@@ -3278,81 +3068,71 @@ falafel@^2.1.0:
 fast-deep-equal@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
-  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
 
 fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
 
 fast-json-stable-stringify@2.0.0, fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
 fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fast-safe-stringify@^2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.6.tgz#04b26106cc56681f51a044cfc0d76cf0008ac2c2"
-  integrity sha512-q8BZ89jjc+mz08rSxROs8VsrBBcn1SIw1kq9NjolL509tkABRk9io01RAjSaEv1Xb2uFLt8VtRiZbGp5H8iDtg==
 
 fastparse@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
-  integrity sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
 
 faye-websocket@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
-  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
   dependencies:
     websocket-driver ">=0.5.1"
 
-faye-websocket@~0.11.0, faye-websocket@~0.11.1:
+faye-websocket@~0.11.1:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
-  integrity sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=
   dependencies:
     websocket-driver ">=0.5.1"
 
 fecha@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd"
-  integrity sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==
 
 figgy-pudding@^3.1.0, figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
-  integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
 
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
   dependencies:
     escape-string-regexp "^1.0.5"
 
 file-loader@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-2.0.0.tgz#39749c82f020b9e85901dcff98e8004e6401cfde"
-  integrity sha512-YCsBfd1ZGCyonOKLxPiKPdu+8ld9HAaMEvJewzz+b2eTF7uL5Zm/HdBF6FjCrpCMRq25Mi0U1gl4pwn2TlH7hQ==
   dependencies:
     loader-utils "^1.0.2"
     schema-utils "^1.0.0"
 
+file-uri-to-path@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
 
 fileset@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
-  integrity sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=
   dependencies:
     glob "^7.0.3"
     minimatch "^3.0.3"
@@ -3360,7 +3140,6 @@ fileset@^2.0.3:
 fill-range@^2.1.0:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
-  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
   dependencies:
     is-number "^2.1.0"
     isobject "^2.0.0"
@@ -3371,7 +3150,6 @@ fill-range@^2.1.0:
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
   dependencies:
     extend-shallow "^2.0.1"
     is-number "^3.0.0"
@@ -3381,7 +3159,6 @@ fill-range@^4.0.0:
 finalhandler@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
-  integrity sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.1"
@@ -3393,8 +3170,7 @@ finalhandler@1.1.0:
 
 finalhandler@1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
-  integrity sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==
+  resolved "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.2"
@@ -3407,7 +3183,6 @@ finalhandler@1.1.1:
 find-cache-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
-  integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=
   dependencies:
     commondir "^1.0.1"
     make-dir "^1.0.0"
@@ -3416,7 +3191,6 @@ find-cache-dir@^1.0.0:
 find-cache-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d"
-  integrity sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==
   dependencies:
     commondir "^1.0.1"
     make-dir "^1.0.0"
@@ -3425,12 +3199,10 @@ find-cache-dir@^2.0.0:
 find-parent-dir@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
-  integrity sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=
 
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
-  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
   dependencies:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
@@ -3438,75 +3210,85 @@ find-up@^1.0.0:
 find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
   dependencies:
     locate-path "^2.0.0"
 
 find-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
   dependencies:
     locate-path "^3.0.0"
 
 flush-write-stream@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
-  integrity sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.4"
 
+follow-redirects@1.0.0:
+  version "1.0.0"
+  resolved "http://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz#8e34298cbd2e176f254effec75a1c78cc849fd37"
+  dependencies:
+    debug "^2.2.0"
+
 follow-redirects@^1.0.0:
   version "1.5.7"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.7.tgz#a39e4804dacb90202bca76a9e2ac10433ca6a69a"
-  integrity sha512-NONJVIFiX7Z8k2WxfqBjtwqMifx7X42ORLFrOZ2LTKGj71G3C0kfdyTqGqr8fx5zSX6Foo/D95dgGWbPUiwnew==
   dependencies:
     debug "^3.1.0"
 
 font-awesome@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
-  integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=
 
 for-in@^0.1.3:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
-  integrity sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=
 
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
 for-own@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
   dependencies:
     for-in "^1.0.1"
 
 for-own@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
-  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
   dependencies:
     for-in "^1.0.1"
 
 foreach@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
-  integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
 
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
+
+form-data@~2.0.0:
+  version "2.0.0"
+  resolved "http://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz#6f0aebadcc5da16c13e1ecc11137d85f9b883b25"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.11"
+
+form-data@~2.3.0:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
 
 form-data@~2.3.1, form-data@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
-  integrity sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=
   dependencies:
     asynckit "^0.4.0"
     combined-stream "1.0.6"
@@ -3515,24 +3297,20 @@ form-data@~2.3.1, form-data@~2.3.2:
 forwarded@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
-  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
 
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
   dependencies:
     map-cache "^0.2.2"
 
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
 from2@^2.1.0, from2@^2.1.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
@@ -3540,14 +3318,16 @@ from2@^2.1.0, from2@^2.1.1:
 fs-access@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/fs-access/-/fs-access-1.0.1.tgz#d6a87f262271cefebec30c553407fb995da8777a"
-  integrity sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=
   dependencies:
     null-check "^1.0.0"
 
+fs-constants@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+
 fs-extra@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.0.tgz#8cc3f47ce07ef7b3593a11b9fb245f7e34c041d6"
-  integrity sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^4.0.0"
@@ -3556,14 +3336,12 @@ fs-extra@^7.0.0:
 fs-minipass@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
-  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
   dependencies:
     minipass "^2.2.1"
 
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
-  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
   dependencies:
     graceful-fs "^4.1.2"
     iferr "^0.1.5"
@@ -3573,12 +3351,10 @@ fs-write-stream-atomic@^1.0.8:
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.0.0, fsevents@^1.2.2:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
-  integrity sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==
   dependencies:
     nan "^2.9.2"
     node-pre-gyp "^0.10.0"
@@ -3586,22 +3362,26 @@ fsevents@^1.0.0, fsevents@^1.2.2:
 fstream@^1.0.0, fstream@^1.0.2:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
-  integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
   dependencies:
     graceful-fs "^4.1.2"
     inherits "~2.0.0"
     mkdirp ">=0.5 0"
     rimraf "2"
 
+ftp@~0.3.10:
+  version "0.3.10"
+  resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
+  dependencies:
+    readable-stream "1.1.x"
+    xregexp "2.0.0"
+
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
   dependencies:
     aproba "^1.0.3"
     console-control-strings "^1.0.0"
@@ -3615,24 +3395,32 @@ gauge@~2.7.3:
 gaze@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
-  integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
   dependencies:
     globule "^1.0.0"
 
+generate-function@^2.0.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f"
+  dependencies:
+    is-property "^1.0.2"
+
+generate-object-property@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
+  dependencies:
+    is-property "^1.0.0"
+
 genfun@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
-  integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==
 
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
-  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
 get-pkg-repo@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
-  integrity sha1-xztInAbYDMVTbCyFP54FIyBWly0=
   dependencies:
     hosted-git-info "^2.1.4"
     meow "^3.3.0"
@@ -3643,36 +3431,41 @@ get-pkg-repo@^1.0.0:
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
-  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
 get-stream@3.0.0, get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
 
 get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
-  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
   dependencies:
     pump "^3.0.0"
 
+get-uri@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.2.tgz#5c795e71326f6ca1286f2fc82575cd2bab2af578"
+  dependencies:
+    data-uri-to-buffer "1"
+    debug "2"
+    extend "3"
+    file-uri-to-path "1"
+    ftp "~0.3.10"
+    readable-stream "2"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
   dependencies:
     assert-plus "^1.0.0"
 
 gh-got@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/gh-got/-/gh-got-7.1.0.tgz#f2b14eef375ce49b66d5f034a1c124f56dc5bcf0"
-  integrity sha512-KeWkkhresa7sbpzQLYzITMgez5rMigUsijhmSAHcLDORIMUbdlkdoZyaN1wQvIjmUZnyb/wkAPaXb4MQKX0mdQ==
   dependencies:
     got "^8.0.0"
     is-plain-obj "^1.1.0"
@@ -3680,7 +3473,6 @@ gh-got@^7.0.0:
 git-raw-commits@^1.3.6:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.3.6.tgz#27c35a32a67777c1ecd412a239a6c19d71b95aff"
-  integrity sha512-svsK26tQ8vEKnMshTDatSIQSMDdz8CxIIqKsvPqbtV23Etmw6VNaFAitu8zwZ0VrOne7FztwPyRLxK7/DIUTQg==
   dependencies:
     dargs "^4.0.1"
     lodash.template "^4.0.2"
@@ -3691,7 +3483,6 @@ git-raw-commits@^1.3.6:
 git-raw-commits@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.0.tgz#d92addf74440c14bcc5c83ecce3fb7f8a79118b5"
-  integrity sha512-w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg==
   dependencies:
     dargs "^4.0.1"
     lodash.template "^4.0.2"
@@ -3702,7 +3493,6 @@ git-raw-commits@^2.0.0:
 git-remote-origin-url@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f"
-  integrity sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=
   dependencies:
     gitconfiglocal "^1.0.0"
     pify "^2.3.0"
@@ -3710,7 +3500,6 @@ git-remote-origin-url@^2.0.0:
 git-semver-tags@^1.3.6:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.3.6.tgz#357ea01f7280794fe0927f2806bee6414d2caba5"
-  integrity sha512-2jHlJnln4D/ECk9FxGEBh3k44wgYdWjWDtMmJPaecjoRmxKo3Y1Lh8GMYuOPu04CHw86NTAODchYjC5pnpMQig==
   dependencies:
     meow "^4.0.0"
     semver "^5.5.0"
@@ -3718,14 +3507,12 @@ git-semver-tags@^1.3.6:
 gitconfiglocal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"
-  integrity sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=
   dependencies:
     ini "^1.3.2"
 
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
   dependencies:
     glob-parent "^2.0.0"
     is-glob "^2.0.0"
@@ -3733,14 +3520,12 @@ glob-base@^0.3.0:
 glob-parent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
   dependencies:
     is-glob "^2.0.0"
 
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
   dependencies:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
@@ -3748,7 +3533,6 @@ glob-parent@^3.1.0:
 glob@7.0.x:
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
-  integrity sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -3760,7 +3544,6 @@ glob@7.0.x:
 glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -3769,10 +3552,9 @@ glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glo
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^5.0.10, glob@^5.0.15:
+glob@^5.0.15:
   version "5.0.15"
   resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
   dependencies:
     inflight "^1.0.4"
     inherits "2"
@@ -3783,24 +3565,20 @@ glob@^5.0.10, glob@^5.0.15:
 global-dirs@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
-  integrity sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=
   dependencies:
     ini "^1.3.4"
 
 globals@^11.1.0:
-  version "11.7.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673"
-  integrity sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==
+  version "11.8.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.8.0.tgz#c1ef45ee9bed6badf0663c5cb90e8d1adec1321d"
 
 globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
-  integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
 
 globby@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
-  integrity sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=
   dependencies:
     array-union "^1.0.1"
     arrify "^1.0.0"
@@ -3812,7 +3590,6 @@ globby@^5.0.0:
 globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
-  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
   dependencies:
     array-union "^1.0.1"
     glob "^7.0.3"
@@ -3823,7 +3600,6 @@ globby@^6.1.0:
 globby@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
-  integrity sha1-+yzP+UAfhgCUXfral0QMypcrhoA=
   dependencies:
     array-union "^1.0.1"
     dir-glob "^2.0.0"
@@ -3835,7 +3611,6 @@ globby@^7.1.1:
 globule@^1.0.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d"
-  integrity sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==
   dependencies:
     glob "~7.1.1"
     lodash "~4.17.10"
@@ -3844,7 +3619,6 @@ globule@^1.0.0:
 got@^6.7.1:
   version "6.7.1"
   resolved "http://registry.npmjs.org/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
-  integrity sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=
   dependencies:
     create-error-class "^3.0.0"
     duplexer3 "^0.1.4"
@@ -3861,7 +3635,6 @@ got@^6.7.1:
 got@^8.0.0:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937"
-  integrity sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==
   dependencies:
     "@sindresorhus/is" "^0.7.0"
     cacheable-request "^2.1.1"
@@ -3881,20 +3654,17 @@ got@^8.0.0:
     url-parse-lax "^3.0.0"
     url-to-options "^1.0.1"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
 
 handle-thing@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
-  integrity sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=
 
 handlebars@^4.0.1, handlebars@^4.0.11, handlebars@^4.0.2:
   version "4.0.12"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5"
-  integrity sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==
   dependencies:
     async "^2.5.0"
     optimist "^0.6.1"
@@ -3905,12 +3675,19 @@ handlebars@^4.0.1, handlebars@^4.0.11, handlebars@^4.0.2:
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
+
+har-validator@~2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
+  dependencies:
+    chalk "^1.1.1"
+    commander "^2.9.0"
+    is-my-json-valid "^2.12.4"
+    pinkie-promise "^2.0.0"
 
 har-validator@~5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
-  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
   dependencies:
     ajv "^5.1.0"
     har-schema "^2.0.0"
@@ -3918,7 +3695,6 @@ har-validator@~5.0.3:
 har-validator@~5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
-  integrity sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==
   dependencies:
     ajv "^5.3.0"
     har-schema "^2.0.0"
@@ -3926,53 +3702,44 @@ har-validator@~5.1.0:
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
   dependencies:
     ansi-regex "^2.0.0"
 
 has-binary2@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
-  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
   dependencies:
     isarray "2.0.1"
 
 has-cors@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
-  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
 
 has-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
 
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
 has-symbol-support-x@^1.4.1:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
-  integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==
 
 has-to-string-tag-x@^1.2.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
-  integrity sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==
   dependencies:
     has-symbol-support-x "^1.4.1"
 
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
 
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
   dependencies:
     get-value "^2.0.3"
     has-values "^0.1.4"
@@ -3981,7 +3748,6 @@ has-value@^0.3.1:
 has-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
   dependencies:
     get-value "^2.0.6"
     has-values "^1.0.0"
@@ -3990,12 +3756,10 @@ has-value@^1.0.0:
 has-values@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
 
 has-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
   dependencies:
     is-number "^3.0.0"
     kind-of "^4.0.0"
@@ -4003,14 +3767,12 @@ has-values@^1.0.0:
 has@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
     function-bind "^1.1.1"
 
 hash-base@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
-  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -4018,29 +3780,58 @@ hash-base@^3.0.0:
 hash.js@^1.0.0, hash.js@^1.0.3:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.5.tgz#e38ab4b85dfb1e0c40fe9265c0e9b54854c23812"
-  integrity sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==
   dependencies:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
+hawk@~3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
+  dependencies:
+    boom "2.x.x"
+    cryptiles "2.x.x"
+    hoek "2.x.x"
+    sntp "1.x.x"
+
+hawk@~6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
+  dependencies:
+    boom "4.x.x"
+    cryptiles "3.x.x"
+    hoek "4.x.x"
+    sntp "2.x.x"
+
+hipchat-notifier@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/hipchat-notifier/-/hipchat-notifier-1.1.0.tgz#b6d249755437c191082367799d3ba9a0f23b231e"
+  dependencies:
+    lodash "^4.0.0"
+    request "^2.0.0"
+
 hmac-drbg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
-  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
   dependencies:
     hash.js "^1.0.3"
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
+hoek@2.x.x:
+  version "2.16.3"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
+
+hoek@4.x.x:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
+
 hosted-git-info@^2.1.4, hosted-git-info@^2.6.0:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
-  integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
 
 hpack.js@^2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
-  integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=
   dependencies:
     inherits "^2.0.1"
     obuf "^1.0.0"
@@ -4050,32 +3841,18 @@ hpack.js@^2.1.6:
 html-entities@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
-  integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
 
 http-cache-semantics@3.8.1, http-cache-semantics@^3.8.1:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
-  integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
 
 http-deceiver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
-  integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
-
-http-errors@1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
-  integrity sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=
-  dependencies:
-    depd "1.1.1"
-    inherits "2.0.3"
-    setprototypeof "1.0.3"
-    statuses ">= 1.3.1 < 2"
 
 http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
   dependencies:
     depd "~1.1.2"
     inherits "2.0.3"
@@ -4083,14 +3860,12 @@ http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
     statuses ">= 1.4.0 < 2"
 
 http-parser-js@>=0.4.0:
-  version "0.4.13"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.13.tgz#3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"
-  integrity sha1-O9bW/ebjFyyTNMOzO2wZPYD+ETc=
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8"
 
 http-proxy-agent@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
-  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
   dependencies:
     agent-base "4"
     debug "3.1.0"
@@ -4098,7 +3873,6 @@ http-proxy-agent@^2.1.0:
 http-proxy-middleware@~0.18.0:
   version "0.18.0"
   resolved "http://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
-  integrity sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==
   dependencies:
     http-proxy "^1.16.2"
     is-glob "^4.0.0"
@@ -4108,30 +3882,45 @@ http-proxy-middleware@~0.18.0:
 http-proxy@^1.13.0, http-proxy@^1.16.2:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
-  integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==
   dependencies:
     eventemitter3 "^3.0.0"
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
+http-signature@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
+  dependencies:
+    assert-plus "^0.2.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
   dependencies:
     assert-plus "^1.0.0"
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
+httpntlm@1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/httpntlm/-/httpntlm-1.6.1.tgz#ad01527143a2e8773cfae6a96f58656bb52a34b2"
+  dependencies:
+    httpreq ">=0.4.22"
+    underscore "~1.7.0"
+
+httpreq@>=0.4.22:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/httpreq/-/httpreq-0.4.24.tgz#4335ffd82cd969668a39465c929ac61d6393627f"
+
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
-  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
 https-proxy-agent@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
-  integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==
   dependencies:
     agent-base "^4.1.0"
     debug "^3.1.0"
@@ -4139,98 +3928,82 @@ https-proxy-agent@^2.2.1:
 humanize-ms@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
-  integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=
   dependencies:
     ms "^2.0.0"
 
 husky@^0.14.3:
   version "0.14.3"
   resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3"
-  integrity sha512-e21wivqHpstpoiWA/Yi8eFti8E+sQDSS53cpJsPptPs295QTOQR0ZwnHo2TXy1XOpZFD9rPOd3NpmqTK6uMLJA==
   dependencies:
     is-ci "^1.0.10"
     normalize-path "^1.0.0"
     strip-indent "^2.0.0"
 
-iconv-lite@0.4.19:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
-  integrity sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==
+iconv-lite@0.4.15:
+  version "0.4.15"
+  resolved "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
 
 iconv-lite@0.4.23:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
-  integrity sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 ieee754@^1.1.4:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
-  integrity sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==
 
 iferr@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
-  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
 ignore-walk@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
-  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
   dependencies:
     minimatch "^3.0.4"
 
 ignore@^3.3.5:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
-  integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
 
 image-size@~0.5.0:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
-  integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
 
 immediate@~3.0.5:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
-  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
 
 immutable@^3.8.2:
   version "3.8.2"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
-  integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=
 
 import-cwd@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
-  integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=
   dependencies:
     import-from "^2.1.0"
 
 import-from@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
-  integrity sha1-M1238qev/VOqpHHUuAId7ja387E=
   dependencies:
     resolve-from "^3.0.0"
 
 import-lazy@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
-  integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
 
 import-local@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
-  integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
   dependencies:
     pkg-dir "^3.0.0"
     resolve-cwd "^2.0.0"
@@ -4238,34 +4011,36 @@ import-local@^2.0.0:
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
 in-publish@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
-  integrity sha1-4g/146KvwmkDILbcVSaCqcf631E=
 
 indent-string@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
-  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
   dependencies:
     repeating "^2.0.0"
 
 indent-string@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
-  integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=
 
 indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
-  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
+
+inflection@~1.12.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416"
+
+inflection@~1.3.0:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.3.8.tgz#cbd160da9f75b14c3cc63578d4f396784bf3014e"
 
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -4273,27 +4048,22 @@ inflight@^1.0.4:
 inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
-  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
 ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
 injection-js@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/injection-js/-/injection-js-2.2.1.tgz#a8d6a085b2f0b8d8650f6f4487f6abb8cc0d67ce"
-  integrity sha512-zHI+E+dM0PXix5FFTO1Y4/UOyAzE7zG1l/QwAn4jchTThOoBq+UYRFK4AVG7lQgFL+go62SbrzSsjXy9DFEZUg==
 
 inquirer@6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"
-  integrity sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.0"
@@ -4312,7 +4082,6 @@ inquirer@6.2.0:
 internal-ip@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-3.0.1.tgz#df5c99876e1d2eb2ea2d74f520e3f669a00ece27"
-  integrity sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==
   dependencies:
     default-gateway "^2.6.0"
     ipaddr.js "^1.5.2"
@@ -4320,12 +4089,10 @@ internal-ip@^3.0.1:
 interpret@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
-  integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
 
 into-stream@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
-  integrity sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=
   dependencies:
     from2 "^2.1.1"
     p-is-promise "^1.1.0"
@@ -4333,108 +4100,90 @@ into-stream@^3.1.0:
 invariant@^2.2.2:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
-  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
   dependencies:
     loose-envify "^1.0.0"
 
 invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
-  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
 
 invert-kv@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
-  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
 
 ip-regex@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
-  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
 
-ip@^1.1.0, ip@^1.1.5:
+ip@^1.1.0, ip@^1.1.2, ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
-  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
 
 ipaddr.js@1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
-  integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
 
 ipaddr.js@^1.5.2:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.1.tgz#fa4b79fa47fd3def5e3b159825161c0a519c9427"
-  integrity sha1-+kt5+kf9Pe9eOxWYJRYcClGclCc=
 
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
-  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
   dependencies:
     kind-of "^3.0.2"
 
 is-accessor-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
-  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
 is-arrayish@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
-  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
 
 is-binary-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
-  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
   dependencies:
     binary-extensions "^1.0.0"
 
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-builtin-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
-  integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74=
   dependencies:
     builtin-modules "^1.0.0"
 
 is-ci@^1.0.10:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
-  integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==
   dependencies:
     ci-info "^1.5.0"
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
   dependencies:
     kind-of "^3.0.2"
 
 is-data-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
-  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
   dependencies:
     is-accessor-descriptor "^0.1.6"
     is-data-descriptor "^0.1.4"
@@ -4443,7 +4192,6 @@ is-descriptor@^0.1.0:
 is-descriptor@^1.0.0, is-descriptor@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
-  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
   dependencies:
     is-accessor-descriptor "^1.0.0"
     is-data-descriptor "^1.0.0"
@@ -4452,86 +4200,72 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
 is-directory@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
-  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
 
 is-dotfile@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
 
 is-equal-shallow@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
   dependencies:
     is-primitive "^2.0.0"
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
 
 is-extendable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
   dependencies:
     is-plain-object "^2.0.4"
 
 is-extglob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
 
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
 is-finite@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
-  integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
   dependencies:
     is-extglob "^1.0.0"
 
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
   dependencies:
     is-extglob "^2.1.0"
 
 is-glob@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
-  integrity sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=
   dependencies:
     is-extglob "^2.1.1"
 
 is-installed-globally@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80"
-  integrity sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=
   dependencies:
     global-dirs "^0.1.0"
     is-path-inside "^1.0.0"
@@ -4539,188 +4273,172 @@ is-installed-globally@^0.1.0:
 is-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
-  integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
+
+is-my-ip-valid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
+
+is-my-json-valid@^2.12.4:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.19.0.tgz#8fd6e40363cd06b963fa877d444bfb5eddc62175"
+  dependencies:
+    generate-function "^2.0.0"
+    generate-object-property "^1.1.0"
+    is-my-ip-valid "^1.0.0"
+    jsonpointer "^4.0.0"
+    xtend "^4.0.0"
 
 is-npm@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
-  integrity sha1-8vtjpl5JBbQGyGBydloaTceTufQ=
 
 is-number@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806"
-  integrity sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=
 
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
   dependencies:
     kind-of "^3.0.2"
 
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
   dependencies:
     kind-of "^3.0.2"
 
 is-number@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
 is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
 
 is-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
-  integrity sha1-iVJojF7C/9awPsyF52ngKQMINHA=
 
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
-  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
 
 is-path-in-cwd@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
-  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
   dependencies:
     is-path-inside "^1.0.0"
 
 is-path-inside@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
-  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
   dependencies:
     path-is-inside "^1.0.1"
 
 is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
 is-posix-bracket@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
 
 is-primitive@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
 
 is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
-  integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
+
+is-property@^1.0.0, is-property@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
 
 is-redirect@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
-  integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=
 
 is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
-  integrity sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=
 
 is-stream@^1.0.0, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
 is-subset@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
-  integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=
 
 is-text-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
-  integrity sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=
   dependencies:
     text-extensions "^1.0.0"
 
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
 is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
 is-wsl@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
-  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
 
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
 isarray@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
-  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
 
 isbinaryfile@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
-  integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
   dependencies:
     buffer-alloc "^1.2.0"
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
 istanbul-api@^2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.0.6.tgz#cd7b33ee678f6c01531d05f5e567ebbcd25f8ecc"
-  integrity sha512-8W5oeAGWXhtTJjAyVfvavOLVyZCTNCKsyF6GON/INKlBdO7uJ/bv3qnPj5M6ERKzmMCJS1kntnjjGuJ86fn3rQ==
   dependencies:
     async "^2.6.1"
     compare-versions "^3.2.1"
@@ -4738,7 +4456,6 @@ istanbul-api@^2.0.5:
 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"
-  integrity sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==
   dependencies:
     convert-source-map "^1.5.0"
     istanbul-lib-instrument "^1.7.3"
@@ -4748,24 +4465,20 @@ istanbul-instrumenter-loader@3.0.1:
 istanbul-lib-coverage@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0"
-  integrity sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==
 
 istanbul-lib-coverage@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#2aee0e073ad8c5f6a0b00e0dfbf52b4667472eda"
-  integrity sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==
 
 istanbul-lib-hook@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.1.tgz#918a57b75a0f951d552a08487ca1fa5336433d72"
-  integrity sha512-ufiZoiJ8CxY577JJWEeFuxXZoMqiKpq/RqZtOAYuQLvlkbJWscq9n3gc4xrCGH9n4pW0qnTxOz1oyMmVtk8E1w==
   dependencies:
     append-transform "^1.0.0"
 
 istanbul-lib-instrument@^1.7.3:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz#1f55ed10ac3c47f2bdddd5307935126754d0a9ca"
-  integrity sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==
   dependencies:
     babel-generator "^6.18.0"
     babel-template "^6.16.0"
@@ -4778,7 +4491,6 @@ istanbul-lib-instrument@^1.7.3:
 istanbul-lib-instrument@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.0.0.tgz#b5f066b2a161f75788be17a9d556f40a0cf2afc9"
-  integrity sha512-eQY9vN9elYjdgN9Iv6NS/00bptm02EBBk70lRMaVjeA6QYocQgenVrSgC28TJurdnZa80AGO3ASdFN+w/njGiQ==
   dependencies:
     "@babel/generator" "^7.0.0"
     "@babel/parser" "^7.0.0"
@@ -4791,7 +4503,6 @@ istanbul-lib-instrument@^3.0.0:
 istanbul-lib-report@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.2.tgz#430a2598519113e1da7af274ba861bd42dd97535"
-  integrity sha512-rJ8uR3peeIrwAxoDEbK4dJ7cqqtxBisZKCuwkMtMv0xYzaAnsAi3AHrHPAAtNXzG/bcCgZZ3OJVqm1DTi9ap2Q==
   dependencies:
     istanbul-lib-coverage "^2.0.1"
     make-dir "^1.3.0"
@@ -4800,7 +4511,6 @@ istanbul-lib-report@^2.0.2:
 istanbul-lib-source-maps@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-2.0.1.tgz#ce8b45131d8293fdeaa732f4faf1852d13d0a97e"
-  integrity sha512-30l40ySg+gvBLcxTrLzR4Z2XTRj3HgRCA/p2rnbs/3OiTaoj054gAbuP5DcLOtwqmy4XW8qXBHzrmP2/bQ9i3A==
   dependencies:
     debug "^3.1.0"
     istanbul-lib-coverage "^2.0.1"
@@ -4811,14 +4521,12 @@ istanbul-lib-source-maps@^2.0.1:
 istanbul-reports@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.0.1.tgz#fb8d6ea850701a3984350b977a969e9a556116a7"
-  integrity sha512-CT0QgMBJqs6NJLF678ZHcquUAZIoBIUNzdJrRJfpkI9OnzG6MkUfHxbJC3ln981dMswC7/B1mfX3LNkhgJxsuw==
   dependencies:
     handlebars "^4.0.11"
 
 istanbul@0.4.5, istanbul@^0.4.5:
   version "0.4.5"
   resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-0.4.5.tgz#65c7d73d4c4da84d4f3ac310b918fb0b8033733b"
-  integrity sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=
   dependencies:
     abbrev "1.0.x"
     async "1.x"
@@ -4838,46 +4546,33 @@ istanbul@0.4.5, istanbul@^0.4.5:
 isurl@^1.0.0-alpha5:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
-  integrity sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==
   dependencies:
     has-to-string-tag-x "^1.2.0"
     is-object "^1.0.1"
 
-jasmine-core@~2.8.0:
+jasmine-core@2.8.0, jasmine-core@~2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
-  integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
 
 jasmine-core@~2.99.0:
   version "2.99.1"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15"
-  integrity sha1-5kAN8ea1bhMLYcS80JPap/boyhU=
-
-jasmine-diff@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/jasmine-diff/-/jasmine-diff-0.1.3.tgz#93ccc2dcc41028c5ddd4606558074839f2deeaa8"
-  integrity sha1-k8zC3MQQKMXd1GBlWAdIOfLe6qg=
-  dependencies:
-    diff "^3.2.0"
 
 jasmine-spec-reporter@^3.2.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-3.3.0.tgz#c63c3d43bacfd16e6da86c46d265957e0075f14c"
-  integrity sha1-xjw9Q7rP0W5tqGxG0mWVfgB18Uw=
   dependencies:
     colors "1.1.2"
 
 jasmine-spec-reporter@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz#1d632aec0341670ad324f92ba84b4b32b35e9e22"
-  integrity sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==
   dependencies:
     colors "1.1.2"
 
 jasmine@2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e"
-  integrity sha1-awicChFXax8W3xG4AUbZHU6Lij4=
   dependencies:
     exit "^0.1.2"
     glob "^7.0.6"
@@ -4886,7 +4581,6 @@ jasmine@2.8.0:
 jasmine@^2.6.0:
   version "2.99.0"
   resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.99.0.tgz#8ca72d102e639b867c6489856e0e18a9c7aa42b7"
-  integrity sha1-jKctEC5jm4Z8ZImFbg4YqceqQrc=
   dependencies:
     exit "^0.1.2"
     glob "^7.0.6"
@@ -4895,32 +4589,26 @@ jasmine@^2.6.0:
 jasminewd2@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"
-  integrity sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=
 
 jquery@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
-  integrity sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==
 
 js-base64@^2.1.8, js-base64@^2.4.3:
   version "2.4.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03"
-  integrity sha512-xcinL3AuDJk7VSzsHgb9DvvIXayBbadtMZ4HFPx8rUszbW1MuNMlwYVC4zzCZ6e1sqZpnNS5ZFYOhXqA39T7LQ==
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
 js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
-  integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -4928,79 +4616,68 @@ js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
 jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
-  integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
 
 jsesc@^2.5.1:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
-  integrity sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=
 
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
 json-buffer@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
-  integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
 
 json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
 
-json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
+json-stringify-safe@5.0.x, json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
 json3@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
-  integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
 
 json5@^0.5.0:
   version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
+  resolved "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
 
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
   optionalDependencies:
     graceful-fs "^4.1.6"
 
 jsonparse@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
-  integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
+
+jsonpointer@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
 
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
   dependencies:
     assert-plus "1.0.0"
     extsprintf "1.3.0"
@@ -5010,7 +4687,6 @@ jsprim@^1.2.2:
 jszip@^3.1.3:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.1.5.tgz#e3c2a6c6d706ac6e603314036d43cd40beefdf37"
-  integrity sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==
   dependencies:
     core-js "~2.3.0"
     es6-promise "~3.0.2"
@@ -5018,10 +4694,9 @@ jszip@^3.1.3:
     pako "~1.0.2"
     readable-stream "~2.0.6"
 
-karma-chrome-launcher@~2.2.0:
+karma-chrome-launcher@2.2.0, karma-chrome-launcher@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf"
-  integrity sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==
   dependencies:
     fs-access "^1.0.0"
     which "^1.2.1"
@@ -5029,34 +4704,88 @@ karma-chrome-launcher@~2.2.0:
 karma-coverage-istanbul-reporter@~2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.4.tgz#402ae4ed6eadb9d9dafbd408ffda17897c0d003a"
-  integrity sha512-xJS7QSQIVU6VK9HuJ/ieE5yynxKhjCCkd96NLY/BX/HXsx0CskU9JJiMQbd4cHALiddMwI4OWh1IIzeWrsavJw==
   dependencies:
     istanbul-api "^2.0.5"
     minimatch "^3.0.4"
 
+karma-firefox-launcher@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/karma-firefox-launcher/-/karma-firefox-launcher-1.1.0.tgz#2c47030452f04531eb7d13d4fc7669630bb93339"
+
 karma-jasmine-html-reporter@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-0.2.2.tgz#48a8e5ef18807617ee2b5e33c1194c35b439524c"
-  integrity sha1-SKjl7xiAdhfuK14zwRlMNbQ5Ukw=
   dependencies:
     karma-jasmine "^1.0.2"
 
+karma-jasmine@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.1.tgz#6fe840e75a11600c9d91e84b33c458e1c46a3529"
+
 karma-jasmine@^1.0.2, karma-jasmine@~1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.2.tgz#394f2b25ffb4a644b9ada6f22d443e2fd08886c3"
-  integrity sha1-OU8rJf+0pkS5rabyLUQ+L9CIhsM=
 
-karma-source-map-support@1.3.0:
+karma-requirejs@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/karma-requirejs/-/karma-requirejs-1.1.0.tgz#fddae2cb87d7ebc16fb0222893564d7fee578798"
+
+karma-sauce-launcher@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/karma-sauce-launcher/-/karma-sauce-launcher-1.2.0.tgz#6f2558ddef3cf56879fa27540c8ae9f8bfd16bca"
+  dependencies:
+    q "^1.5.0"
+    sauce-connect-launcher "^1.2.2"
+    saucelabs "^1.4.0"
+    wd "^1.4.0"
+
+karma-source-map-support@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz#36dd4d8ca154b62ace95696236fae37caf0a7dde"
-  integrity sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==
   dependencies:
     source-map-support "^0.5.5"
 
+karma-sourcemap-loader@0.3.7:
+  version "0.3.7"
+  resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz#91322c77f8f13d46fed062b042e1009d4c4505d8"
+  dependencies:
+    graceful-fs "^4.1.2"
+
+karma@alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a:
+  version "1.7.1"
+  resolved "https://codeload.github.com/alexeagle/karma/tar.gz/fa1a84ac881485b5657cb669e9b4e5da77b79f0a"
+  dependencies:
+    bluebird "^3.3.0"
+    body-parser "^1.16.1"
+    chokidar "^1.4.1"
+    colors "^1.1.0"
+    combine-lists "^1.0.0"
+    connect "^3.6.0"
+    core-js "^2.2.0"
+    di "^0.0.1"
+    dom-serialize "^2.2.0"
+    expand-braces "^0.1.1"
+    glob "^7.1.1"
+    graceful-fs "^4.1.2"
+    http-proxy "^1.13.0"
+    isbinaryfile "^3.0.0"
+    lodash "^4.17.4"
+    log4js "^2.3.9"
+    mime "^1.3.4"
+    minimatch "^3.0.2"
+    optimist "^0.6.1"
+    qjobs "^1.1.4"
+    range-parser "^1.2.0"
+    rimraf "^2.6.0"
+    safe-buffer "^5.0.1"
+    socket.io "2.0.4"
+    source-map "^0.6.1"
+    tmp "0.0.33"
+    useragent "^2.1.12"
+
 karma@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/karma/-/karma-3.0.0.tgz#6da83461a8a28d8224575c3b5b874e271b4730c3"
-  integrity sha512-ZTjyuDXVXhXsvJ1E4CnZzbCjSxD6sEdzEsFYogLuZM0yqvg/mgz+O+R1jb0J7uAQeuzdY8kJgx6hSNXLwFuHIQ==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
@@ -5089,71 +4818,66 @@ karma@~3.0.0:
 keyv@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
-  integrity sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==
   dependencies:
     json-buffer "3.0.0"
 
 killable@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
-  integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
 
 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"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
 
 kuler@1.0.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/kuler/-/kuler-1.0.0.tgz#904ad31c373b781695854d32be33818bf1d60250"
-  integrity sha512-oyy6pu/yWRjiVfCoJebNUKFL061sNtrs9ejKTbirIwY3oiHmENVCSkHhxDV85Dkm7JYR/czMCBeoM87WilTdSg==
   dependencies:
     colornames "^1.1.1"
 
 latest-version@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15"
-  integrity sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=
   dependencies:
     package-json "^4.0.0"
 
+lazystream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
+  dependencies:
+    readable-stream "^2.0.5"
+
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
-  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
   dependencies:
     invert-kv "^1.0.0"
 
 lcid@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
-  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
   dependencies:
     invert-kv "^2.0.0"
 
 less-loader@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-4.1.0.tgz#2c1352c5b09a4f84101490274fd51674de41363e"
-  integrity sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==
   dependencies:
     clone "^2.1.1"
     loader-utils "^1.1.0"
@@ -5162,7 +4886,6 @@ less-loader@4.1.0:
 less-plugin-npm-import@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/less-plugin-npm-import/-/less-plugin-npm-import-2.1.0.tgz#823e6986c93318a98171ca858848b6bead55bf3e"
-  integrity sha1-gj5phskzGKmBccqFiEi2vq1Vvz4=
   dependencies:
     promise "~7.0.1"
     resolve "~1.1.6"
@@ -5170,7 +4893,6 @@ less-plugin-npm-import@^2.1.0:
 less@3.8.1, less@^3.8.0:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/less/-/less-3.8.1.tgz#f31758598ef5a1930dd4caefa9e4340641e71e1d"
-  integrity sha512-8HFGuWmL3FhQR0aH89escFNBQH/nEiYPP2ltDFdQw2chE28Yx2E3lhAIq9Y2saYwLSwa699s4dBVEfCY8Drf7Q==
   dependencies:
     clone "^2.1.2"
   optionalDependencies:
@@ -5186,15 +4908,29 @@ less@3.8.1, less@^3.8.0:
 levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
   dependencies:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
+libbase64@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/libbase64/-/libbase64-0.1.0.tgz#62351a839563ac5ff5bd26f12f60e9830bb751e6"
+
+libmime@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/libmime/-/libmime-3.0.0.tgz#51a1a9e7448ecbd32cda54421675bb21bc093da6"
+  dependencies:
+    iconv-lite "0.4.15"
+    libbase64 "0.1.0"
+    libqp "1.1.0"
+
+libqp@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/libqp/-/libqp-1.1.0.tgz#f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"
+
 license-checker@^20.1.0:
   version "20.2.0"
   resolved "https://registry.yarnpkg.com/license-checker/-/license-checker-20.2.0.tgz#edb2605fd714514ed16e7eeee5b88a41900241d2"
-  integrity sha512-bseotvz8lfzEY7siilsJhQd2K/z+IF9aeJ+ZscieyZ70S6Ql2iJdVp1IfnL6gkdU4ny5JctT5Y2lFCQerSCfGA==
   dependencies:
     chalk "^2.4.1"
     debug "^3.1.0"
@@ -5211,21 +4947,18 @@ license-checker@^20.1.0:
 license-webpack-plugin@2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.0.2.tgz#9d34b521cb7fca8527945310b05be6ef0248b687"
-  integrity sha512-GsomZw5VoT20ST8qH2tOjBgbyhn6Pgs9M94g0mbvfBIV1VXufm1iKY+4dbgfTObj1Mp6nSRE3Zf74deOZr0KwA==
   dependencies:
     webpack-sources "^1.2.0"
 
 lie@~3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
-  integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=
   dependencies:
     immediate "~3.0.5"
 
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -5236,7 +4969,6 @@ load-json-file@^1.0.0:
 load-json-file@^2.0.0:
   version "2.0.0"
   resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
-  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -5246,7 +4978,6 @@ load-json-file@^2.0.0:
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^4.0.0"
@@ -5254,14 +4985,12 @@ load-json-file@^4.0.0:
     strip-bom "^3.0.0"
 
 loader-runner@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
-  integrity sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.1.tgz#026f12fe7c3115992896ac02ba022ba92971b979"
 
 loader-utils@1.1.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
-  integrity sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=
   dependencies:
     big.js "^3.1.3"
     emojis-list "^2.0.0"
@@ -5270,7 +4999,6 @@ loader-utils@1.1.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
   dependencies:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
@@ -5278,7 +5006,6 @@ locate-path@^2.0.0:
 locate-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
   dependencies:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
@@ -5286,37 +5013,30 @@ locate-path@^3.0.0:
 lodash._reinterpolate@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
 
 lodash.assign@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
-  integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
 
 lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
 lodash.mergewith@^4.6.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
-  integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==
 
 lodash.tail@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
-  integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=
 
 lodash.template@^4.0.2:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
-  integrity sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=
   dependencies:
     lodash._reinterpolate "~3.0.0"
     lodash.templatesettings "^4.0.0"
@@ -5324,19 +5044,39 @@ lodash.template@^4.0.2:
 lodash.templatesettings@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
-  integrity sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
-lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.5.0, lodash@~4.17.10:
+lodash@4.17.10, lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.5.0:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-  integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==
+
+lodash@^4.15.0, lodash@^4.16.6, lodash@^4.17.5, lodash@^4.8.0, lodash@~4.17.10:
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+
+log4js@^2.3.9:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-2.11.0.tgz#bf3902eff65c6923d9ce9cfbd2db54160e34005a"
+  dependencies:
+    circular-json "^0.5.4"
+    date-format "^1.2.0"
+    debug "^3.1.0"
+    semver "^5.5.0"
+    streamroller "0.7.0"
+  optionalDependencies:
+    amqplib "^0.5.2"
+    axios "^0.15.3"
+    hipchat-notifier "^1.1.0"
+    loggly "^1.1.0"
+    mailgun-js "^0.18.0"
+    nodemailer "^2.5.0"
+    redis "^2.7.1"
+    slack-node "~0.2.0"
 
 log4js@^3.0.0:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.5.tgz#b80146bfebad68b430d4f3569556d8a6edfef303"
-  integrity sha512-IX5c3G/7fuTtdr0JjOT2OIR12aTESVhsH6cEsijloYwKgcPRlO6DgOU72v0UFhWcoV1HN6+M3dwT89qVPLXm0w==
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.6.tgz#e6caced94967eeeb9ce399f9f8682a4b2b28c8ff"
   dependencies:
     circular-json "^0.5.5"
     date-format "^1.2.0"
@@ -5347,7 +5087,6 @@ log4js@^3.0.0:
 logform@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/logform/-/logform-1.9.1.tgz#58b29d7b11c332456d7a217e17b48a13ad69d60a"
-  integrity sha512-ZHrZE8VSf7K3xKxJiQ1aoTBp2yK+cEbFcgarsjzI3nt3nE/3O0heNSppoOQMUJVMZo/xiVwCxiXIabaZApsKNQ==
   dependencies:
     colors "^1.2.1"
     fast-safe-stringify "^2.0.4"
@@ -5355,27 +5094,31 @@ logform@^1.9.1:
     ms "^2.1.1"
     triple-beam "^1.2.0"
 
+loggly@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/loggly/-/loggly-1.1.1.tgz#0a0fc1d3fa3a5ec44fdc7b897beba2a4695cebee"
+  dependencies:
+    json-stringify-safe "5.0.x"
+    request "2.75.x"
+    timespan "2.3.x"
+
 loglevel@^1.4.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
-  integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
 
 long@~3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
-  integrity sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=
 
 loose-envify@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
-  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
-loud-rejection@^1.0.0, loud-rejection@^1.6.0:
+loud-rejection@^1.0.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
-  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
   dependencies:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
@@ -5383,22 +5126,18 @@ loud-rejection@^1.0.0, loud-rejection@^1.6.0:
 lowercase-keys@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
-  integrity sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=
 
 lowercase-keys@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
-  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
 
 lru-cache@2.2.x:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d"
-  integrity sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=
 
-lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
+lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
-  integrity sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==
   dependencies:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
@@ -5406,33 +5145,55 @@ lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
 magic-string@^0.22.4:
   version "0.22.5"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
-  integrity sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==
   dependencies:
     vlq "^0.2.2"
 
 magic-string@^0.25.0:
   version "0.25.0"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.0.tgz#1f3696f9931ff0a1ed4c132250529e19cad6759b"
-  integrity sha512-Msbwa9oNYNPjwVh9ury5X2BHbTFWoirTlzuf4X+pIoSOQVKNRJHXTx1WmKYuXzRM4QZFv8dGXyZvhDMmWhGLPw==
   dependencies:
     sourcemap-codec "^1.4.1"
 
+magic-string@^0.25.1:
+  version "0.25.1"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.1.tgz#b1c248b399cd7485da0fe7385c2fc7011843266e"
+  dependencies:
+    sourcemap-codec "^1.4.1"
+
+mailcomposer@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/mailcomposer/-/mailcomposer-4.0.1.tgz#0e1c44b2a07cf740ee17dc149ba009f19cadfeb4"
+  dependencies:
+    buildmail "4.0.1"
+    libmime "3.0.0"
+
+mailgun-js@^0.18.0:
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/mailgun-js/-/mailgun-js-0.18.1.tgz#ee39aa18d7bb598a5ce9ede84afb681defc8a6b0"
+  dependencies:
+    async "~2.6.0"
+    debug "~3.1.0"
+    form-data "~2.3.0"
+    inflection "~1.12.0"
+    is-stream "^1.1.0"
+    path-proxy "~1.0.0"
+    promisify-call "^2.0.2"
+    proxy-agent "~3.0.0"
+    tsscmp "~1.0.0"
+
 make-dir@^1.0.0, make-dir@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
-  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
   dependencies:
     pify "^3.0.0"
 
 make-error@^1.1.1:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
-  integrity sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==
 
 make-fetch-happen@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz#141497cb878f243ba93136c83d8aba12c216c083"
-  integrity sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==
   dependencies:
     agentkeepalive "^3.4.1"
     cacache "^11.0.1"
@@ -5449,66 +5210,56 @@ make-fetch-happen@^4.0.1:
 map-age-cleaner@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz#098fb15538fd3dbe461f12745b0ca8568d4e3f74"
-  integrity sha512-UN1dNocxQq44IhJyMI4TU8phc2m9BddacHRPRjKGLYaF0jqd3xLz0jS0skpAU9WgYyoR4gHtUpzytNBS385FWQ==
   dependencies:
     p-defer "^1.0.0"
 
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
 map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
-  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
 
 map-obj@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
-  integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk=
 
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
   dependencies:
     object-visit "^1.0.0"
 
 material-design-icons@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/material-design-icons/-/material-design-icons-3.0.1.tgz#9a71c48747218ebca51e51a66da682038cdcb7bf"
-  integrity sha1-mnHEh0chjrylHlGmbaaCA4zct78=
 
 math-random@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
-  integrity sha1-izqsWIuKZuSXXjzepn97sylgH6w=
 
 md5.js@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
-  integrity sha1-6b296UogpawYsENA/Fdk1bCdkB0=
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
   dependencies:
     hash-base "^3.0.0"
     inherits "^2.0.1"
+    safe-buffer "^5.1.2"
 
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
 mem@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
-  integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
   dependencies:
     mimic-fn "^1.0.0"
 
 mem@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf"
-  integrity sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==
   dependencies:
     map-age-cleaner "^0.1.1"
     mimic-fn "^1.0.0"
@@ -5517,7 +5268,6 @@ mem@^4.0.0:
 memory-fs@^0.4.0, memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
-  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
   dependencies:
     errno "^0.1.3"
     readable-stream "^2.0.1"
@@ -5525,7 +5275,6 @@ memory-fs@^0.4.0, memory-fs@~0.4.1:
 meow@^3.3.0, meow@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
-  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
   dependencies:
     camelcase-keys "^2.0.0"
     decamelize "^1.1.2"
@@ -5541,7 +5290,6 @@ meow@^3.3.0, meow@^3.7.0:
 meow@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/meow/-/meow-4.0.1.tgz#d48598f6f4b1472f35bf6317a95945ace347f975"
-  integrity sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==
   dependencies:
     camelcase-keys "^4.0.0"
     decamelize-keys "^1.0.0"
@@ -5556,24 +5304,20 @@ meow@^4.0.0:
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
 
 merge-source-map@1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz#a5de46538dae84d4114cc5ea02b4772a6346701f"
-  integrity sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=
   dependencies:
     source-map "^0.5.6"
 
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
 micromatch@^2.1.5, micromatch@^2.3.11:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
   dependencies:
     arr-diff "^2.0.0"
     array-unique "^0.2.1"
@@ -5592,7 +5336,6 @@ micromatch@^2.1.5, micromatch@^2.3.11:
 micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
-  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -5611,52 +5354,53 @@ micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
-  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
   dependencies:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-"mime-db@>= 1.34.0 < 2", mime-db@~1.36.0:
+"mime-db@>= 1.36.0 < 2", mime-db@~1.37.0:
+  version "1.37.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
+
+mime-db@~1.36.0:
   version "1.36.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
-  integrity sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==
+
+mime-types@^2.1.11, mime-types@~2.1.7:
+  version "2.1.21"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
+  dependencies:
+    mime-db "~1.37.0"
 
 mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
   version "2.1.20"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
-  integrity sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==
   dependencies:
     mime-db "~1.36.0"
 
 mime@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
-  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
-mime@^1.4.1:
+mime@^1.3.4, mime@^1.4.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mime@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
-  integrity sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==
 
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
-  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
 mimic-response@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
-  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
 
 mini-css-extract-plugin@0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.4.tgz#c10410a004951bd3cedac1da69053940fccb625d"
-  integrity sha512-o+Jm+ocb0asEngdM6FsZWtZsRzA8koFUudIDwYUfl94M3PejPHG7Vopw5hN9V8WsMkSFpm3tZP3Fesz89EyrfQ==
   dependencies:
     loader-utils "^1.1.0"
     schema-utils "^1.0.0"
@@ -5665,24 +5409,20 @@ mini-css-extract-plugin@0.4.4:
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
-  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
 minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
-  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
 "minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
 minimist-options@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
-  integrity sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==
   dependencies:
     arrify "^1.0.1"
     is-plain-obj "^1.1.0"
@@ -5690,22 +5430,18 @@ minimist-options@^3.0.1:
 minimist@0.0.8:
   version "0.0.8"
   resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
 minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
 minimist@~0.0.1:
   version "0.0.10"
   resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
 minipass@^2.2.1, minipass@^2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
-  integrity sha512-mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==
   dependencies:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
@@ -5713,7 +5449,6 @@ minipass@^2.2.1, minipass@^2.3.3:
 minipass@^2.3.5:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
-  integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
   dependencies:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
@@ -5721,14 +5456,12 @@ minipass@^2.3.5:
 minizlib@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
-  integrity sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==
   dependencies:
     minipass "^2.2.1"
 
 mississippi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
-  integrity sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==
   dependencies:
     concat-stream "^1.5.0"
     duplexify "^3.4.2"
@@ -5744,7 +5477,6 @@ mississippi@^2.0.0:
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
-  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
   dependencies:
     concat-stream "^1.5.0"
     duplexify "^3.4.2"
@@ -5760,7 +5492,6 @@ mississippi@^3.0.0:
 mixin-deep@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
-  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
@@ -5768,7 +5499,6 @@ mixin-deep@^1.2.0:
 mixin-object@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
-  integrity sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=
   dependencies:
     for-in "^0.1.3"
     is-extendable "^0.1.1"
@@ -5776,19 +5506,16 @@ mixin-object@^2.0.1:
 mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
   version "0.5.1"
   resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
 
 modify-values@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
-  integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
-  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
   dependencies:
     aproba "^1.1.1"
     copy-concurrently "^1.0.0"
@@ -5800,22 +5527,18 @@ move-concurrently@^1.0.1:
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
 ms@^2.0.0, ms@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
 multicast-dns-service-types@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
-  integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=
 
 multicast-dns@^6.0.1:
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
-  integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==
   dependencies:
     dns-packet "^1.3.1"
     thunky "^1.0.2"
@@ -5823,17 +5546,18 @@ multicast-dns@^6.0.1:
 mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
-nan@^2.10.0, nan@^2.9.2:
+nan@^2.10.0:
+  version "2.11.1"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766"
+
+nan@^2.9.2:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.0.tgz#574e360e4d954ab16966ec102c0c049fd961a099"
-  integrity sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
-  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -5850,7 +5574,6 @@ nanomatch@^1.2.9:
 needle@^2.2.1:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.3.tgz#c1b04da378cd634d8befe2de965dc2cfb0fd65ca"
-  integrity sha512-GPL22d/U9cai87FcCPO6e+MT3vyHS2j+zwotakDc7kE2DtUAqFKMXLJCTtRp+5S75vXIwQPvIxkvlctxf9q4gQ==
   dependencies:
     debug "^2.1.2"
     iconv-lite "^0.4.4"
@@ -5859,17 +5582,18 @@ needle@^2.2.1:
 negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
-  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
 
 neo-async@^2.5.0:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.2.tgz#489105ce7bc54e709d736b195f82135048c50fcc"
-  integrity sha512-vdqTKI9GBIYcAEbFAcpKPErKINfPF5zIuz3/niBfq8WUZjpT2tytLlFVrBgWdOtqI4uaA/Rb6No0hux39XXDuw==
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
+
+netmask@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35"
 
 ng-packagr@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-4.2.0.tgz#9e2babac0402f761c64908996dae99e54a07fe3e"
-  integrity sha512-y1a9DgIMho5bG77WWK/3Tz2Sxe3Vm9zt4c3AMTLFA6+GqukgTHJYwdfcvWzNfi3iPotoAeoMBCKwd5KSOoiU8A==
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-4.4.0.tgz#b868a829b5743870c6392491de3faf4e4cec6f4d"
   dependencies:
     "@ngtools/json-schema" "^1.1.0"
     autoprefixer "^9.0.0"
@@ -5891,6 +5615,7 @@ ng-packagr@^4.2.0:
     rimraf "^2.6.1"
     rollup "^0.66.0"
     rollup-plugin-commonjs "^9.1.3"
+    rollup-plugin-json "^3.1.0"
     rollup-plugin-node-resolve "^3.0.0"
     rollup-plugin-sourcemaps "^0.4.2"
     rxjs "^6.0.0"
@@ -5901,12 +5626,10 @@ ng-packagr@^4.2.0:
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 node-fetch-npm@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7"
-  integrity sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==
   dependencies:
     encoding "^0.1.11"
     json-parse-better-errors "^1.0.0"
@@ -5915,17 +5638,14 @@ node-fetch-npm@^2.0.2:
 node-fetch@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.2.0.tgz#4ee79bde909262f9775f731e3656d0db55ced5b5"
-  integrity sha512-OayFWziIxiHY8bCUyLX6sTpDH8Jsbp4FfYd1j1f7vZyfgkcOnAyM4oQR16f8a0s7Gl/viMGRey8eScYk4V4EZA==
 
 node-forge@0.7.5:
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
-  integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==
 
 node-gyp@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
-  integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
   dependencies:
     fstream "^1.0.0"
     glob "^7.0.3"
@@ -5943,7 +5663,6 @@ node-gyp@^3.8.0:
 node-libs-browser@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
-  integrity sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==
   dependencies:
     assert "^1.1.1"
     browserify-zlib "^0.2.0"
@@ -5972,7 +5691,6 @@ node-libs-browser@^2.0.0:
 node-pre-gyp@^0.10.0:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
-  integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==
   dependencies:
     detect-libc "^1.0.2"
     mkdirp "^0.5.1"
@@ -5985,24 +5703,21 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.0.0-alpha.11:
-  version "1.0.0-alpha.11"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.0-alpha.11.tgz#73c810acc2e5b741a17ddfbb39dfca9ab9359d8a"
-  integrity sha512-CaViu+2FqTNYOYNihXa5uPS/zry92I3vPU4nCB6JB3OeZ2UGtOpF5gRwuN4+m3hbEcL47bOXyun1jX2iC+3uEQ==
+node-releases@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.2.tgz#27c296d9fca3b659c64f7d43ea47a31ad2a90e4b"
   dependencies:
     semver "^5.3.0"
 
 node-sass-tilde-importer@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz#1a15105c153f648323b4347693fdb0f331bad1ce"
-  integrity sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==
   dependencies:
     find-parent-dir "^0.3.0"
 
-node-sass@4.9.3, node-sass@^4.9.3:
+node-sass@4.9.3:
   version "4.9.3"
   resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.3.tgz#f407cf3d66f78308bb1e346b24fa428703196224"
-  integrity sha512-XzXyGjO+84wxyH7fV6IwBOTrEBe2f0a6SBze9QWWYR/cL74AcQUks2AsqcCZenl/Fp/JVbuEaLpgrLtocwBUww==
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -6024,25 +5739,99 @@ node-sass@4.9.3, node-sass@^4.9.3:
     stdout-stream "^1.4.0"
     "true-case-path" "^1.0.2"
 
+node-sass@^4.9.3:
+  version "4.9.4"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.4.tgz#349bd7f1c89422ffe7e1e4b60f2055a69fbc5512"
+  dependencies:
+    async-foreach "^0.1.3"
+    chalk "^1.1.1"
+    cross-spawn "^3.0.0"
+    gaze "^1.0.0"
+    get-stdin "^4.0.1"
+    glob "^7.0.3"
+    in-publish "^2.0.0"
+    lodash.assign "^4.2.0"
+    lodash.clonedeep "^4.3.2"
+    lodash.mergewith "^4.6.0"
+    meow "^3.7.0"
+    mkdirp "^0.5.1"
+    nan "^2.10.0"
+    node-gyp "^3.8.0"
+    npmlog "^4.0.0"
+    request "^2.88.0"
+    sass-graph "^2.2.4"
+    stdout-stream "^1.4.0"
+    "true-case-path" "^1.0.2"
+
+node-uuid@~1.4.7:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
+
+nodemailer-direct-transport@3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/nodemailer-direct-transport/-/nodemailer-direct-transport-3.3.2.tgz#e96fafb90358560947e569017d97e60738a50a86"
+  dependencies:
+    nodemailer-shared "1.1.0"
+    smtp-connection "2.12.0"
+
+nodemailer-fetch@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz#79c4908a1c0f5f375b73fe888da9828f6dc963a4"
+
+nodemailer-shared@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz#cf5994e2fd268d00f5cf0fa767a08169edb07ec0"
+  dependencies:
+    nodemailer-fetch "1.6.0"
+
+nodemailer-smtp-pool@2.8.2:
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/nodemailer-smtp-pool/-/nodemailer-smtp-pool-2.8.2.tgz#2eb94d6cf85780b1b4725ce853b9cbd5e8da8c72"
+  dependencies:
+    nodemailer-shared "1.1.0"
+    nodemailer-wellknown "0.1.10"
+    smtp-connection "2.12.0"
+
+nodemailer-smtp-transport@2.7.2:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/nodemailer-smtp-transport/-/nodemailer-smtp-transport-2.7.2.tgz#03d71c76314f14ac7dbc7bf033a6a6d16d67fb77"
+  dependencies:
+    nodemailer-shared "1.1.0"
+    nodemailer-wellknown "0.1.10"
+    smtp-connection "2.12.0"
+
+nodemailer-wellknown@0.1.10:
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz#586db8101db30cb4438eb546737a41aad0cf13d5"
+
+nodemailer@^2.5.0:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-2.7.2.tgz#f242e649aeeae39b6c7ed740ef7b061c404d30f9"
+  dependencies:
+    libmime "3.0.0"
+    mailcomposer "4.0.1"
+    nodemailer-direct-transport "3.3.2"
+    nodemailer-shared "1.1.0"
+    nodemailer-smtp-pool "2.8.2"
+    nodemailer-smtp-transport "2.7.2"
+    socks "1.1.9"
+
 "nopt@2 || 3", nopt@3.x:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
   dependencies:
     abbrev "1"
 
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
   dependencies:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0:
+normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, "normalize-package-data@~1.0.1 || ^2.0.0":
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
-  integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==
   dependencies:
     hosted-git-info "^2.1.4"
     is-builtin-module "^1.0.0"
@@ -6052,24 +5841,20 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-
 normalize-path@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
-  integrity sha1-MtDkcvkf80VwHBWoMRAY07CpA3k=
 
 normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
   dependencies:
     remove-trailing-separator "^1.0.1"
 
 normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
-  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
 normalize-url@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
-  integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==
   dependencies:
     prepend-http "^2.0.0"
     query-string "^5.0.1"
@@ -6078,12 +5863,10 @@ normalize-url@2.0.1:
 npm-bundled@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
-  integrity sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==
 
-npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
+"npm-package-arg@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
-  integrity sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==
   dependencies:
     hosted-git-info "^2.6.0"
     osenv "^0.1.5"
@@ -6093,7 +5876,6 @@ npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
 npm-packlist@^1.1.12:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a"
-  integrity sha512-WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
@@ -6101,23 +5883,39 @@ npm-packlist@^1.1.12:
 npm-packlist@^1.1.6:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de"
-  integrity sha512-CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
-npm-pick-manifest@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.1.0.tgz#dc381bdd670c35d81655e1d5a94aa3dd4d87fce5"
-  integrity sha512-q9zLP8cTr8xKPmMZN3naxp1k/NxVFsjxN6uWuO1tiw9gxg7wZWQ/b5UTfzD0ANw2q1lQxdLKTeCCksq+bPSgbQ==
+npm-pick-manifest@^2.1.0, npm-pick-manifest@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40"
   dependencies:
+    figgy-pudding "^3.5.1"
     npm-package-arg "^6.0.0"
     semver "^5.4.1"
 
+npm-registry-client@^8.6.0:
+  version "8.6.0"
+  resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-8.6.0.tgz#7f1529f91450732e89f8518e0f21459deea3e4c4"
+  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-fetch@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-3.8.0.tgz#aa7d9a7c92aff94f48dba0984bdef4bd131c88cc"
-  integrity sha512-hrw8UMD+Nob3Kl3h8Z/YjmKamb1gf7D1ZZch2otrIXM3uFLB5vjEY6DhMlq80z/zZet6eETLbOXcuQudCB3Zpw==
   dependencies:
     JSONStream "^1.3.4"
     bluebird "^3.5.1"
@@ -6129,14 +5927,12 @@ npm-registry-fetch@^3.8.0:
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
   dependencies:
     path-key "^2.0.0"
 
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
+"npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.0, npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
   dependencies:
     are-we-there-yet "~1.1.2"
     console-control-strings "~1.1.0"
@@ -6146,42 +5942,34 @@ npm-run-path@^2.0.0:
 null-check@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd"
-  integrity sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=
 
 num2fraction@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
-  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
 
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-oauth-sign@~0.8.2:
+oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
 
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
 object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
 object-component@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
-  integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=
 
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
-  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
   dependencies:
     copy-descriptor "^0.1.0"
     define-property "^0.2.5"
@@ -6190,24 +5978,20 @@ object-copy@^0.1.0:
 object-inspect@~1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4"
-  integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==
 
 object-keys@^1.0.6:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
-  integrity sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==
 
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
-  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
   dependencies:
     isobject "^3.0.0"
 
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
   dependencies:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
@@ -6215,57 +5999,54 @@ object.omit@^2.0.0:
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
   dependencies:
     isobject "^3.0.1"
 
 obuf@^1.0.0, obuf@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
-  integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
 
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
   dependencies:
     ee-first "1.1.1"
 
 on-headers@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
-  integrity sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=
 
-once@1.x, once@^1.3.0, once@^1.3.1, once@^1.4.0:
+once@1.x, once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
 one-time@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz#f8cdf77884826fe4dff93e3a9cc37b1e4480742e"
-  integrity sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=
 
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
-  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
   dependencies:
     mimic-fn "^1.0.0"
 
-opn@5.3.0, opn@^5.1.0:
+opn@5.3.0:
   version "5.3.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
-  integrity sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==
+  resolved "http://registry.npmjs.org/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
+  dependencies:
+    is-wsl "^1.1.0"
+
+opn@^5.1.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
   dependencies:
     is-wsl "^1.1.0"
 
 optimist@^0.6.1, optimist@~0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
   dependencies:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
@@ -6273,7 +6054,6 @@ optimist@^0.6.1, optimist@~0.6.0:
 optionator@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
-  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
   dependencies:
     deep-is "~0.1.3"
     fast-levenshtein "~2.0.4"
@@ -6285,36 +6065,30 @@ optionator@^0.8.1:
 optjs@~3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/optjs/-/optjs-3.2.2.tgz#69a6ce89c442a44403141ad2f9b370bd5bb6f4ee"
-  integrity sha1-aabOicRCpEQDFBrS+bNwvVu29O4=
 
-original@>=0.0.5, original@^1.0.0:
+original@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
-  integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
   dependencies:
     url-parse "^1.4.3"
 
 os-browserify@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
-  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
 os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
 os-locale@^1.4.0:
   version "1.4.0"
   resolved "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
-  integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
   dependencies:
     lcid "^1.0.0"
 
 os-locale@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
-  integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==
   dependencies:
     execa "^0.7.0"
     lcid "^1.0.0"
@@ -6323,7 +6097,6 @@ os-locale@^2.0.0:
 os-locale@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.0.1.tgz#3b014fbf01d87f60a1e5348d80fe870dc82c4620"
-  integrity sha512-7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==
   dependencies:
     execa "^0.10.0"
     lcid "^2.0.0"
@@ -6332,12 +6105,10 @@ os-locale@^3.0.0:
 os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
 osenv@0, osenv@^0.1.4, osenv@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
@@ -6345,77 +6116,87 @@ osenv@0, osenv@^0.1.4, osenv@^0.1.5:
 p-cancelable@^0.4.0:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"
-  integrity sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==
 
 p-defer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
-  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
 
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
 p-is-promise@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
-  integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
 
 p-limit@^1.0.0, p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
-  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
   dependencies:
     p-try "^1.0.0"
 
 p-limit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
-  integrity sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==
   dependencies:
     p-try "^2.0.0"
 
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
-  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
   dependencies:
     p-limit "^1.1.0"
 
 p-locate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
   dependencies:
     p-limit "^2.0.0"
 
 p-map@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
-  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
 
 p-timeout@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
-  integrity sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==
   dependencies:
     p-finally "^1.0.0"
 
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
 
 p-try@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
-  integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
+
+pac-proxy-agent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz#11d578b72a164ad74bf9d5bac9ff462a38282432"
+  dependencies:
+    agent-base "^4.2.0"
+    debug "^3.1.0"
+    get-uri "^2.0.0"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.1"
+    pac-resolver "^3.0.0"
+    raw-body "^2.2.0"
+    socks-proxy-agent "^4.0.1"
+
+pac-resolver@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-3.0.0.tgz#6aea30787db0a891704deb7800a722a7615a6f26"
+  dependencies:
+    co "^4.6.0"
+    degenerator "^1.0.4"
+    ip "^1.1.5"
+    netmask "^1.0.6"
+    thunkify "^2.1.2"
 
 package-json@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
-  integrity sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=
   dependencies:
     got "^6.7.1"
     registry-auth-token "^3.0.1"
@@ -6425,7 +6206,6 @@ package-json@^4.0.0:
 pacote@9.1.1:
   version "9.1.1"
   resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.1.1.tgz#25091f75a25021de8be8d34cc6408728fca3579b"
-  integrity sha512-f28Rq5ozzKAA9YwIKw61/ipwAatUZseYmVssDbHHaexF0wRIVotapVEZPAjOT7Eu3LYVqEp0NVpNizoAnYBUaA==
   dependencies:
     bluebird "^3.5.2"
     cacache "^11.2.0"
@@ -6455,20 +6235,49 @@ pacote@9.1.1:
     unique-filename "^1.1.1"
     which "^1.3.1"
 
+pacote@^9.2.3:
+  version "9.2.3"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.2.3.tgz#48cfe87beb9177acd6594355a584a538835424b3"
+  dependencies:
+    bluebird "^3.5.2"
+    cacache "^11.2.0"
+    figgy-pudding "^3.5.1"
+    get-stream "^4.1.0"
+    glob "^7.1.3"
+    lru-cache "^4.1.3"
+    make-fetch-happen "^4.0.1"
+    minimatch "^3.0.4"
+    minipass "^2.3.5"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    normalize-package-data "^2.4.0"
+    npm-package-arg "^6.1.0"
+    npm-packlist "^1.1.12"
+    npm-pick-manifest "^2.2.3"
+    npm-registry-fetch "^3.8.0"
+    osenv "^0.1.5"
+    promise-inflight "^1.0.1"
+    promise-retry "^1.1.1"
+    protoduck "^5.0.1"
+    rimraf "^2.6.2"
+    safe-buffer "^5.1.2"
+    semver "^5.6.0"
+    ssri "^6.0.1"
+    tar "^4.4.6"
+    unique-filename "^1.1.1"
+    which "^1.3.1"
+
 pako@^0.2.5:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
-  integrity sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=
 
 pako@^1.0.6, pako@~1.0.2, pako@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
-  integrity sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==
 
 parallel-transform@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
-  integrity sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=
   dependencies:
     cyclist "~0.2.2"
     inherits "^2.0.3"
@@ -6476,8 +6285,7 @@ parallel-transform@^1.1.0:
 
 parse-asn1@^5.0.0:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
-  integrity sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==
+  resolved "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
   dependencies:
     asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
@@ -6488,12 +6296,10 @@ parse-asn1@^5.0.0:
 parse-github-repo-url@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"
-  integrity sha1-nn2LslKmy2ukJZUGC3v23z28H1A=
 
 parse-glob@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
   dependencies:
     glob-base "^0.3.0"
     is-dotfile "^1.0.0"
@@ -6503,14 +6309,12 @@ parse-glob@^3.0.4:
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
   dependencies:
     error-ex "^1.2.0"
 
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
   dependencies:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
@@ -6518,7 +6322,6 @@ parse-json@^4.0.0:
 parse5-html-rewriting-stream@5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-5.1.0.tgz#63f92c958764aea8cbe3aa68f2e5895c32068ab8"
-  integrity sha512-hZlaOTHJs4dpC5yFHnOSEMh26ErsqTsLzxKqkuRcUqtiu0kMsBQ9pkgANkECDyoBUhJ3+hvb2DPLsyqbtcS61Q==
   dependencies:
     parse5 "^5.1.0"
     parse5-sax-parser "^5.1.0"
@@ -6526,100 +6329,88 @@ parse5-html-rewriting-stream@5.1.0:
 parse5-sax-parser@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/parse5-sax-parser/-/parse5-sax-parser-5.1.0.tgz#ec234d23223a8054a74ff173aa3dc2da74c5bbd9"
-  integrity sha512-VEhdEDhBkoSILPmsZ96SoIIUow3hZbtgQsqXw7r8DxxnqsCIO0fwkT9mWgBcf9SPjVUh92liuEprHrrYzXBPWQ==
   dependencies:
     parse5 "^5.1.0"
 
 parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
-  integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
 
 parse5@^5.0.0, parse5@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2"
-  integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==
 
 parseqs@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
-  integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=
   dependencies:
     better-assert "~1.0.0"
 
 parser-toolkit@>=0.0.3:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parser-toolkit/-/parser-toolkit-0.0.5.tgz#ec4b61729c86318b56ea971bfba6b3c672d62c01"
-  integrity sha1-7EthcpyGMYtW6pcb+6azxnLWLAE=
 
 parseuri@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
-  integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=
   dependencies:
     better-assert "~1.0.0"
 
 parseurl@~1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
-  integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
 
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
 path-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
-  integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=
 
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
 path-exists@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
-  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
   dependencies:
     pinkie-promise "^2.0.0"
 
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
 path-is-inside@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
 
 path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
 path-parse@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+
+path-proxy@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/path-proxy/-/path-proxy-1.0.0.tgz#18e8a36859fc9d2f1a53b48dee138543c020de5e"
+  dependencies:
+    inflection "~1.3.0"
 
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
 
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
-  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
   dependencies:
     graceful-fs "^4.1.2"
     pify "^2.0.0"
@@ -6628,21 +6419,18 @@ path-type@^1.0.0:
 path-type@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
-  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
   dependencies:
     pify "^2.0.0"
 
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
   dependencies:
     pify "^3.0.0"
 
 pbkdf2@^3.0.3:
-  version "3.0.16"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.16.tgz#7404208ec6b01b62d85bf83853a8064f8d9c2a5c"
-  integrity sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==
+  version "3.0.17"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -6653,70 +6441,66 @@ pbkdf2@^3.0.3:
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
 pidtree@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.0.tgz#f6fada10fccc9f99bf50e90d0b23d72c9ebc2e6b"
-  integrity sha512-9CT4NFlDcosssyg8KVFltgokyKZIFjoBxw8CTGy+5F38Y1eQWrt8tRayiUOXE+zVKQnYu5BR8JjCtvK3BcnBhg==
 
 pidusage@^2.0.17:
   version "2.0.17"
   resolved "https://registry.yarnpkg.com/pidusage/-/pidusage-2.0.17.tgz#6b4a2b4a09026f0e9828f7e5627837e4c0672581"
-  integrity sha512-N8X5v18rBmlBoArfS83vrnD0gIFyZkXEo7a5pAS2aT0i2OLVymFb2AzVg+v8l/QcXnE1JwZcaXR8daJcoJqtjw==
   dependencies:
     safe-buffer "^5.1.2"
 
 pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
 
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
 pkg-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
   dependencies:
     find-up "^2.1.0"
 
 pkg-dir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
-  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
   dependencies:
     find-up "^3.0.0"
 
 pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
-  integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==
 
 popper.js@^1.14.1:
   version "1.14.4"
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.4.tgz#8eec1d8ff02a5a3a152dd43414a15c7b79fd69b6"
-  integrity sha1-juwdj/AqWjoVLdQ0FKFce3n9abY=
 
-portfinder@1.0.17, portfinder@^1.0.9:
+portfinder@1.0.17:
   version "1.0.17"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.17.tgz#a8a1691143e46c4735edefcf4fbcccedad26456a"
-  integrity sha512-syFcRIRzVI1BoEFOCaAiizwDolh1S1YXSodsVhncbhjzjZQulhczNRbqnUl9N31Q4dKGOXsNDqxC2BWBgSMqeQ==
+  dependencies:
+    async "^1.5.2"
+    debug "^2.2.0"
+    mkdirp "0.5.x"
+
+portfinder@^1.0.9:
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.19.tgz#07e87914a55242dcda5b833d42f018d6875b595f"
   dependencies:
     async "^1.5.2"
     debug "^2.2.0"
@@ -6725,12 +6509,10 @@ portfinder@1.0.17, portfinder@^1.0.9:
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
 postcss-import@12.0.0:
   version "12.0.0"
   resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.0.tgz#149f96a4ef0b27525c419784be8517ebd17e92c5"
-  integrity sha512-3KqKRZcaZAvxbY8DVLdd81tG5uKzbUQuiWIvy0o0fzEC42bKacqPYFWbfCQyw6L4LWUaqPz/idvIdbhpgQ32eQ==
   dependencies:
     postcss "^7.0.1"
     postcss-value-parser "^3.2.3"
@@ -6740,7 +6522,6 @@ postcss-import@12.0.0:
 postcss-load-config@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.0.0.tgz#f1312ddbf5912cd747177083c5ef7a19d62ee484"
-  integrity sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==
   dependencies:
     cosmiconfig "^4.0.0"
     import-cwd "^2.0.0"
@@ -6748,7 +6529,6 @@ postcss-load-config@^2.0.0:
 postcss-loader@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d"
-  integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==
   dependencies:
     loader-utils "^1.1.0"
     postcss "^7.0.0"
@@ -6758,7 +6538,6 @@ postcss-loader@3.0.0:
 postcss-url@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-8.0.0.tgz#7b10059bd12929cdbb1971c60f61a0e5af86b4ca"
-  integrity sha512-E2cbOQ5aii2zNHh8F6fk1cxls7QVFZjLPSrqvmiza8OuXLzIpErij8BDS5Y3STPfJgpIMNCPEr8JlKQWEoozUw==
   dependencies:
     mime "^2.3.1"
     minimatch "^3.0.4"
@@ -6766,73 +6545,53 @@ postcss-url@^8.0.0:
     postcss "^7.0.2"
     xxhashjs "^0.2.1"
 
-postcss-value-parser@^3.2.3:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
-  integrity sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=
+postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
 
-postcss@7.0.5, postcss@^7.0.1:
+postcss@7.0.5, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
   version "7.0.5"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.5.tgz#70e6443e36a6d520b0fd4e7593fcca3635ee9f55"
-  integrity sha512-HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ==
   dependencies:
     chalk "^2.4.1"
     source-map "^0.6.1"
     supports-color "^5.5.0"
 
-postcss@^7.0.0, postcss@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.2.tgz#7b5a109de356804e27f95a960bef0e4d5bc9bb18"
-  integrity sha512-fmaUY5370keLUTx+CnwRxtGiuFTcNBLQBqr1oE3WZ/euIYmGAo0OAgOhVJ3ByDnVmOR3PK+0V9VebzfjRIUcqw==
-  dependencies:
-    chalk "^2.4.1"
-    source-map "^0.6.1"
-    supports-color "^5.4.0"
-
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
 prepend-http@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
 
 prepend-http@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
-  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
 
 preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
 process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-  integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
 
 process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
 
 process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
 promise-retry@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
-  integrity sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=
   dependencies:
     err-code "^1.0.0"
     retry "^0.10.0"
@@ -6840,38 +6599,39 @@ promise-retry@^1.1.1:
 promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
-  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
   dependencies:
     asap "~2.0.3"
 
 promise@~7.0.1:
   version "7.0.4"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.0.4.tgz#363e84a4c36c8356b890fed62c91ce85d02ed539"
-  integrity sha1-Nj6EpMNsg1a4kP7WLJHOhdAu1Tk=
+  resolved "http://registry.npmjs.org/promise/-/promise-7.0.4.tgz#363e84a4c36c8356b890fed62c91ce85d02ed539"
   dependencies:
     asap "~2.0.3"
 
-protobufjs@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.0.tgz#4223063233ea96ac063ca2b554035204db524fa1"
-  integrity sha1-QiMGMjPqlqwGPKK1VANSBNtST6E=
+promisify-call@^2.0.2:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/promisify-call/-/promisify-call-2.0.4.tgz#d48c2d45652ccccd52801ddecbd533a6d4bd5fba"
+  dependencies:
+    with-callback "^1.0.2"
+
+protobufjs@5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.3.tgz#e4dfe9fb67c90b2630d15868249bcc4961467a17"
   dependencies:
     ascli "~1"
     bytebuffer "~5"
-    glob "^5.0.10"
+    glob "^7.0.5"
     yargs "^3.10.0"
 
 protoduck@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f"
-  integrity sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==
   dependencies:
     genfun "^5.0.0"
 
 protractor@~5.4.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.4.1.tgz#011a99e38df7aa45d22455b889ffbb13a6ce0bd9"
-  integrity sha512-ORey5ewQMYiXQxcQohsqEiKYOg/r5yJoJbt0tuROmmgajdg/CA3gTOZNIFJncUVMAJIk5YFqBBLUjKVmQO6tfA==
   dependencies:
     "@types/node" "^6.0.46"
     "@types/q" "^0.0.32"
@@ -6890,44 +6650,56 @@ protractor@~5.4.0:
     webdriver-js-extender "2.1.0"
     webdriver-manager "^12.0.6"
 
-proxy-addr@~2.0.3:
+proxy-addr@~2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
-  integrity sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==
   dependencies:
     forwarded "~0.1.2"
     ipaddr.js "1.8.0"
 
+proxy-agent@~3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-3.0.3.tgz#1c1a33db60ef5f2e9e35b876fd63c2bc681c611d"
+  dependencies:
+    agent-base "^4.2.0"
+    debug "^3.1.0"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.1"
+    lru-cache "^4.1.2"
+    pac-proxy-agent "^3.0.0"
+    proxy-from-env "^1.0.0"
+    socks-proxy-agent "^4.0.1"
+
+proxy-from-env@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
+
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
 pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
 psl@^1.1.24:
   version "1.1.29"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
-  integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==
 
 public-encrypt@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994"
-  integrity sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
   dependencies:
     bn.js "^4.1.0"
     browserify-rsa "^4.0.0"
     create-hash "^1.1.0"
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
+    safe-buffer "^5.1.2"
 
 pump@^2.0.0, pump@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
-  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
@@ -6935,7 +6707,6 @@ pump@^2.0.0, pump@^2.0.1:
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
@@ -6943,7 +6714,6 @@ pump@^3.0.0:
 pumpify@^1.3.3:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
-  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
   dependencies:
     duplexify "^3.6.0"
     inherits "^2.0.3"
@@ -6952,47 +6722,38 @@ pumpify@^1.3.3:
 punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
 
-punycode@^1.2.4, punycode@^1.4.1:
+punycode@1.4.1, punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
 punycode@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 q@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
-  integrity sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=
 
-q@^1.4.1, q@^1.5.1:
+q@^1.4.1, q@^1.5.0, q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
-  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
 qjobs@^1.1.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
-  integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
-
-qs@6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
-  integrity sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==
 
 qs@6.5.2, qs@~6.5.1, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+
+qs@~6.2.0:
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"
 
 query-string@^5.0.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
-  integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==
   dependencies:
     decode-uri-component "^0.2.0"
     object-assign "^4.1.0"
@@ -7001,27 +6762,22 @@ query-string@^5.0.1:
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
-  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
 
 querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
 querystringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.0.0.tgz#fa3ed6e68eb15159457c89b37bc6472833195755"
-  integrity sha512-eTPo5t/4bgaMNZxyjWx6N2a6AuE0mq51KWvpc7nU/MAqixcI6v6KrGUKES0HaomdnolQBBXU/++X6/QQ9KL4tw==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.0.tgz#7ded8dfbf7879dcc60d0a644ac6754b283ad17ef"
 
 quick-lru@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
-  integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=
 
 quicktype-core@^5.0.41:
   version "5.0.41"
   resolved "https://registry.yarnpkg.com/quicktype-core/-/quicktype-core-5.0.41.tgz#83f090b1bddeefcff0581e0d9c754d83410ed453"
-  integrity sha512-CImdVo4M4TlDs0McPSql9HnaoG5/Z3w1bQIlAhc95qekxBx+jJ2HNIqXzEkIsvx7W7sIPZhOuCug9fvmqNkMKQ==
   dependencies:
     "@types/urijs" "github:quicktype/types-urijs"
     collection-utils "0.0.15"
@@ -7037,7 +6793,6 @@ quicktype-core@^5.0.41:
 quote-stream@^1.0.1, quote-stream@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/quote-stream/-/quote-stream-1.0.2.tgz#84963f8c9c26b942e153feeb53aae74652b7e0b2"
-  integrity sha1-hJY/jJwmuULhU/7rU6rnRlK34LI=
   dependencies:
     buffer-equal "0.0.1"
     minimist "^1.1.3"
@@ -7046,7 +6801,6 @@ quote-stream@^1.0.1, quote-stream@~1.0.2:
 randomatic@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.0.tgz#36f2ca708e9e567f5ed2ec01949026d50aa10116"
-  integrity sha512-KnGPVE0lo2WoXxIZ7cPR8YBpiol4gsSuOwDSg410oHh80ZMp5EiypNqL2K4Z77vJn6lB5rap7IkAmcUlalcnBQ==
   dependencies:
     is-number "^4.0.0"
     kind-of "^6.0.0"
@@ -7055,14 +6809,12 @@ randomatic@^3.0.0:
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
-  integrity sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==
   dependencies:
     safe-buffer "^5.1.0"
 
 randomfill@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
-  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
   dependencies:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
@@ -7070,22 +6822,10 @@ randomfill@^1.0.3:
 range-parser@^1.0.3, range-parser@^1.2.0, range-parser@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
-  integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
-raw-body@2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"
-  integrity sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=
-  dependencies:
-    bytes "3.0.0"
-    http-errors "1.6.2"
-    iconv-lite "0.4.19"
-    unpipe "1.0.0"
-
-raw-body@2.3.3:
+raw-body@2.3.3, raw-body@^2.2.0:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
-  integrity sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==
   dependencies:
     bytes "3.0.0"
     http-errors "1.6.3"
@@ -7095,12 +6835,10 @@ raw-body@2.3.3:
 raw-loader@0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
-  integrity sha1-DD0L6u2KAclm2Xh793goElKpeao=
 
 rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
   dependencies:
     deep-extend "^0.6.0"
     ini "~1.3.0"
@@ -7110,14 +6848,12 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
 read-cache@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
-  integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=
   dependencies:
     pify "^2.3.0"
 
 read-installed@~4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/read-installed/-/read-installed-4.0.3.tgz#ff9b8b67f187d1e4c29b9feb31f6b223acd19067"
-  integrity sha1-/5uLZ/GH0eTCm5/rMfayI6zRkGc=
   dependencies:
     debuglog "^1.0.1"
     read-package-json "^2.0.0"
@@ -7131,7 +6867,6 @@ read-installed@~4.0.3:
 read-package-json@^2.0.0:
   version "2.0.13"
   resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a"
-  integrity sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==
   dependencies:
     glob "^7.1.1"
     json-parse-better-errors "^1.0.1"
@@ -7143,7 +6878,6 @@ read-package-json@^2.0.0:
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
-  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
   dependencies:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
@@ -7151,7 +6885,6 @@ read-pkg-up@^1.0.1:
 read-pkg-up@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
-  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
   dependencies:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
@@ -7159,7 +6892,6 @@ read-pkg-up@^2.0.0:
 read-pkg-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
-  integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=
   dependencies:
     find-up "^2.0.0"
     read-pkg "^3.0.0"
@@ -7167,7 +6899,6 @@ read-pkg-up@^3.0.0:
 read-pkg-up@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
-  integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==
   dependencies:
     find-up "^3.0.0"
     read-pkg "^3.0.0"
@@ -7175,7 +6906,6 @@ read-pkg-up@^4.0.0:
 read-pkg@^1.0.0, read-pkg@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
-  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
   dependencies:
     load-json-file "^1.0.0"
     normalize-package-data "^2.3.2"
@@ -7184,7 +6914,6 @@ read-pkg@^1.0.0, read-pkg@^1.1.0:
 read-pkg@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
-  integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
   dependencies:
     load-json-file "^2.0.0"
     normalize-package-data "^2.3.2"
@@ -7193,16 +6922,14 @@ read-pkg@^2.0.0:
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
-  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
   dependencies:
     load-json-file "^4.0.0"
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.0, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3:
+"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.0, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.3:
   version "2.3.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
+  resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -7212,10 +6939,18 @@ read-pkg@^3.0.0:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@~2.0.6:
+readable-stream@1.1.x, "readable-stream@1.x >=1.1.9":
+  version "1.1.14"
+  resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
+readable-stream@~2.0.5, readable-stream@~2.0.6:
   version "2.0.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
-  integrity sha1-j5A0HmilPMySh4jaz80Rs265t44=
+  resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -7227,7 +6962,6 @@ readable-stream@~2.0.6:
 readdir-scoped-modules@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
-  integrity sha1-n6+jfShr5dksuuve4DDcm19AZ0c=
   dependencies:
     debuglog "^1.0.1"
     dezalgo "^1.0.0"
@@ -7237,7 +6971,6 @@ readdir-scoped-modules@^1.0.0:
 readdirp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
-  integrity sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=
   dependencies:
     graceful-fs "^4.1.2"
     minimatch "^3.0.2"
@@ -7247,14 +6980,12 @@ readdirp@^2.0.0:
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-  integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
   dependencies:
     resolve "^1.1.6"
 
 redent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
-  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
   dependencies:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
@@ -7262,37 +6993,47 @@ redent@^1.0.0:
 redent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
-  integrity sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=
   dependencies:
     indent-string "^3.0.0"
     strip-indent "^2.0.0"
 
+redis-commands@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.4.0.tgz#52f9cf99153efcce56a8f86af986bd04e988602f"
+
+redis-parser@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-2.6.0.tgz#52ed09dacac108f1a631c07e9b69941e7a19504b"
+
+redis@^2.7.1:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/redis/-/redis-2.8.0.tgz#202288e3f58c49f6079d97af7a10e1303ae14b02"
+  dependencies:
+    double-ended-queue "^2.1.0-0"
+    redis-commands "^1.2.0"
+    redis-parser "^2.6.0"
+
 reflect-metadata@^0.1.2:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.12.tgz#311bf0c6b63cd782f228a81abe146a2bfa9c56f2"
-  integrity sha512-n+IyV+nGz3+0q3/Yf1ra12KpCyi001bi4XFxSjbiWWjfqb52iTTtpGXmCCAOWWIAn9KEuFZKGqBERHmrtScZ3A==
 
 regenerate@^1.2.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
-  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
 
 regenerator-runtime@^0.11.0:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
-  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
 regex-cache@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
   dependencies:
     is-equal-shallow "^0.1.3"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
-  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
   dependencies:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
@@ -7300,7 +7041,6 @@ regex-not@^1.0.0, regex-not@^1.0.2:
 regexpu-core@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
-  integrity sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=
   dependencies:
     regenerate "^1.2.1"
     regjsgen "^0.2.0"
@@ -7309,7 +7049,6 @@ regexpu-core@^1.0.0:
 registry-auth-token@^3.0.1:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
-  integrity sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==
   dependencies:
     rc "^1.1.6"
     safe-buffer "^5.0.1"
@@ -7317,53 +7056,97 @@ registry-auth-token@^3.0.1:
 registry-url@^3.0.3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
-  integrity sha1-PU74cPc93h138M+aOBQyRE4XSUI=
   dependencies:
     rc "^1.0.1"
 
 regjsgen@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
-  integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
+  resolved "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
 
 regjsparser@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
-  integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=
   dependencies:
     jsesc "~0.5.0"
 
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
 repeat-element@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
-  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
 repeat-string@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae"
-  integrity sha1-x6jTI2BoNiBZp+RlH8aITosftK4=
 
 repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
 repeating@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
-  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
   dependencies:
     is-finite "^1.0.0"
 
+request@2.75.x:
+  version "2.75.0"
+  resolved "http://registry.npmjs.org/request/-/request-2.75.0.tgz#d2b8268a286da13eaa5d01adf5d18cc90f657d93"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    bl "~1.1.2"
+    caseless "~0.11.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.0.0"
+    har-validator "~2.0.6"
+    hawk "~3.1.3"
+    http-signature "~1.1.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.7"
+    node-uuid "~1.4.7"
+    oauth-sign "~0.8.1"
+    qs "~6.2.0"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "~0.4.1"
+
+request@2.85.0:
+  version "2.85.0"
+  resolved "http://registry.npmjs.org/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.6.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.1"
+    forever-agent "~0.6.1"
+    form-data "~2.3.1"
+    har-validator "~5.0.3"
+    hawk "~6.0.2"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.17"
+    oauth-sign "~0.8.2"
+    performance-now "^2.1.0"
+    qs "~6.5.1"
+    safe-buffer "^5.1.1"
+    stringstream "~0.0.5"
+    tough-cookie "~2.3.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.1.0"
+
 request@2.87.0:
   version "2.87.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
-  integrity sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.6.0"
@@ -7386,10 +7169,9 @@ request@2.87.0:
     tunnel-agent "^0.6.0"
     uuid "^3.1.0"
 
-request@^2.83.0, request@^2.87.0:
+request@^2.0.0, request@^2.74.0, request@^2.83.0, request@^2.87.0, request@^2.88.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
-  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -7412,66 +7194,68 @@ request@^2.83.0, request@^2.87.0:
     tunnel-agent "^0.6.0"
     uuid "^3.3.2"
 
+requestretry@^1.2.2:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/requestretry/-/requestretry-1.13.0.tgz#213ec1006eeb750e8b8ce54176283d15a8d55d94"
+  dependencies:
+    extend "^3.0.0"
+    lodash "^4.15.0"
+    request "^2.74.0"
+    when "^3.7.7"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
 require-from-string@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
-  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
-  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
+
+requirejs@2.3.5:
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.5.tgz#617b9acbbcb336540ef4914d790323a8d4b861b0"
 
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
-  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
   dependencies:
     resolve-from "^3.0.0"
 
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
-  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
 
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
 resolve@1.1.x, resolve@~1.1.6:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
-  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.5.0:
+resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
-  integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==
   dependencies:
     path-parse "^1.0.5"
 
 responselike@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
-  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
   dependencies:
     lowercase-keys "^1.0.0"
 
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
-  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
   dependencies:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
@@ -7479,52 +7263,50 @@ restore-cursor@^2.0.0:
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
 retry@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
-  integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
 
 rfdc@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.2.tgz#e6e72d74f5dc39de8f538f65e00c36c18018e349"
-  integrity sha512-92ktAgvZhBzYTIK0Mja9uen5q5J3NRVMoDkJL2VMwq6SXjVCgqvQeVP2XAaUY6HT+XpQYeLSjb3UoitBryKmdA==
 
 rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
   dependencies:
     glob "^7.0.5"
 
 rimraf@~2.2.6:
   version "2.2.8"
   resolved "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
-  integrity sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=
 
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
-  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
   dependencies:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
 rollup-plugin-commonjs@^9.1.3:
-  version "9.1.6"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.1.6.tgz#ad553813c922b71467152794b98f2fd0f195b8a5"
-  integrity sha512-J7GOJm9uzEeLqkVxYSgjyoieh34hATWpa9G2M1ilGzWOLYGfQx5IDQ9ewG8QUj/Z2dzgV+d0/AyloAzElkABAA==
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.2.0.tgz#4604e25069e0c78a09e08faa95dc32dec27f7c89"
   dependencies:
-    estree-walker "^0.5.1"
-    magic-string "^0.22.4"
-    resolve "^1.5.0"
-    rollup-pluginutils "^2.0.1"
+    estree-walker "^0.5.2"
+    magic-string "^0.25.1"
+    resolve "^1.8.1"
+    rollup-pluginutils "^2.3.3"
+
+rollup-plugin-json@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-json/-/rollup-plugin-json-3.1.0.tgz#7c1daf60c46bc21021ea016bd00863561a03321b"
+  dependencies:
+    rollup-pluginutils "^2.3.1"
 
 rollup-plugin-node-resolve@^3.0.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.4.0.tgz#908585eda12e393caac7498715a01e08606abc89"
-  integrity sha512-PJcd85dxfSBWih84ozRtBkB731OjXk0KnzN0oGp7WOWcarAFkVa71cV5hTJg2qpVsV2U8EUwrzHP3tvy9vS3qg==
   dependencies:
     builtin-modules "^2.0.0"
     is-module "^1.0.0"
@@ -7533,23 +7315,20 @@ rollup-plugin-node-resolve@^3.0.0:
 rollup-plugin-sourcemaps@^0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.4.2.tgz#62125aa94087aadf7b83ef4dfaf629b473135e87"
-  integrity sha1-YhJaqUCHqt97g+9N+vYptHMTXoc=
   dependencies:
     rollup-pluginutils "^2.0.1"
     source-map-resolve "^0.5.0"
 
-rollup-pluginutils@^2.0.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.1.tgz#760d185ccc237dedc12d7ae48c6bcd127b4892d0"
-  integrity sha512-JZS8aJMHEHhqmY2QVPMXwKP6lsD1ShkrcGYjhAIvqKKdXQyPHw/9NF0tl3On/xOJ4ACkxfeG7AF+chfCN1NpBg==
+rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.3.tgz#3aad9b1eb3e7fe8262820818840bf091e5ae6794"
   dependencies:
     estree-walker "^0.5.2"
     micromatch "^2.3.11"
 
 rollup@^0.66.0:
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.66.0.tgz#697acc008f4b613695b17222c7626affddf4a506"
-  integrity sha512-WOkVBSdod3phCSAri5Q579JufeAzJTi43L4oAHzFtjRWJTv2LIszYCU3K9TLMEsVksMY93EwgWCb+hpKRhQwGg==
+  version "0.66.6"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.66.6.tgz#ce7d6185beb7acea644ce220c25e71ae03275482"
   dependencies:
     "@types/estree" "0.0.39"
     "@types/node" "*"
@@ -7557,50 +7336,38 @@ rollup@^0.66.0:
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
-  integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
   dependencies:
     is-promise "^2.1.0"
 
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
-  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
   dependencies:
     aproba "^1.1.1"
 
 rxjs@6.3.3, rxjs@^6.0.0, rxjs@^6.1.0, rxjs@~6.3.0:
   version "6.3.3"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
-  integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-  integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==
-
 safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
 safe-regex@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
+  resolved "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
   dependencies:
     ret "~0.1.10"
 
 "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 sass-graph@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
-  integrity sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=
   dependencies:
     glob "^7.0.0"
     lodash "^4.0.0"
@@ -7610,7 +7377,6 @@ sass-graph@^2.2.4:
 sass-loader@7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.1.0.tgz#16fd5138cb8b424bf8a759528a1972d72aad069d"
-  integrity sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==
   dependencies:
     clone-deep "^2.0.1"
     loader-utils "^1.0.1"
@@ -7619,34 +7385,39 @@ sass-loader@7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
-saucelabs@^1.5.0:
+sauce-connect-launcher@^1.2.2:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sauce-connect-launcher/-/sauce-connect-launcher-1.2.4.tgz#8d38f85242a9fbede1b2303b559f7e20c5609a1c"
+  dependencies:
+    adm-zip "~0.4.3"
+    async "^2.1.2"
+    https-proxy-agent "^2.2.1"
+    lodash "^4.16.6"
+    rimraf "^2.5.4"
+
+saucelabs@^1.4.0, saucelabs@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-1.5.0.tgz#9405a73c360d449b232839919a86c396d379fd9d"
-  integrity sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==
   dependencies:
     https-proxy-agent "^2.2.1"
 
 sax@0.5.x:
   version "0.5.8"
   resolved "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
-  integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=
 
 sax@>=0.6.0, sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
 schema-utils@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
-  integrity sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=
   dependencies:
     ajv "^5.0.0"
 
 schema-utils@^0.4.4, schema-utils@^0.4.5:
   version "0.4.7"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
-  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
   dependencies:
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
@@ -7654,7 +7425,6 @@ schema-utils@^0.4.4, schema-utils@^0.4.5:
 schema-utils@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
-  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
   dependencies:
     ajv "^6.1.0"
     ajv-errors "^1.0.0"
@@ -7663,7 +7433,6 @@ schema-utils@^1.0.0:
 scss-tokenizer@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
-  integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE=
   dependencies:
     js-base64 "^2.1.8"
     source-map "^0.4.2"
@@ -7671,17 +7440,14 @@ scss-tokenizer@^0.2.3:
 seedrandom@^2.4.4:
   version "2.4.4"
   resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-2.4.4.tgz#b25ea98632c73e45f58b77cfaa931678df01f9ba"
-  integrity sha512-9A+PDmgm+2du77B5i0Ip2cxOqqHjgNxnBgglxLcX78A2D6c2rTo61z4jnVABpF4cKeDMDG+cmXXvdnqse2VqMA==
 
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
-  integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
 selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz#2ba87a1662c020b8988c981ae62cb2a01298eafc"
-  integrity sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==
   dependencies:
     jszip "^3.1.3"
     rimraf "^2.5.4"
@@ -7689,52 +7455,44 @@ selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
     xml2js "^0.4.17"
 
 selfsigned@^1.9.1:
-  version "1.10.3"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.3.tgz#d628ecf9e3735f84e8bafba936b3cf85bea43823"
-  integrity sha512-vmZenZ+8Al3NLHkWnhBQ0x6BkML1eCP2xEi3JE+f3D9wW9fipD9NNJHYtE9XJM4TsPaHGZJIamrSI6MTg1dU2Q==
+  version "1.10.4"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
   dependencies:
     node-forge "0.7.5"
 
 semver-diff@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
-  integrity sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=
   dependencies:
     semver "^5.0.3"
 
 semver-dsl@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/semver-dsl/-/semver-dsl-1.0.1.tgz#d3678de5555e8a61f629eed025366ae5f27340a0"
-  integrity sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=
   dependencies:
     semver "^5.3.0"
 
 semver-intersect@1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/semver-intersect/-/semver-intersect-1.4.0.tgz#bdd9c06bedcdd2fedb8cd352c3c43ee8c61321f3"
-  integrity sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==
   dependencies:
     semver "^5.0.0"
 
-"semver@2 || 3 || 4 || 5", semver@5.5.1, semver@^5.0.0, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.5.0:
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
-  integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
-
-semver@^5.4.1, semver@^5.6.0:
+"semver@2 >=2.2.1 || 3.x || 4 || 5", semver@^5.0.0, semver@^5.0.3, semver@^5.1.0, semver@^5.4.1, semver@^5.6.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
-  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
+
+"semver@2 || 3 || 4 || 5", semver@5.5.1, semver@^5.3.0, semver@^5.5.0:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
 
 semver@~5.3.0:
   version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-  integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
+  resolved "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
 send@0.16.2:
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
-  integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
   dependencies:
     debug "2.6.9"
     depd "~1.1.2"
@@ -7753,12 +7511,10 @@ send@0.16.2:
 serialize-javascript@^1.4.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
-  integrity sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==
 
 serve-index@^1.7.2:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
-  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
   dependencies:
     accepts "~1.3.4"
     batch "0.6.1"
@@ -7771,7 +7527,6 @@ serve-index@^1.7.2:
 serve-static@1.13.2:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
-  integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
   dependencies:
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
@@ -7781,17 +7536,14 @@ serve-static@1.13.2:
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
 set-immediate-shim@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
 
 set-value@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
-  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -7801,7 +7553,6 @@ set-value@^0.4.3:
 set-value@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
-  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -7811,22 +7562,14 @@ set-value@^2.0.0:
 setimmediate@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
-
-setprototypeof@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
-  integrity sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=
 
 setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
-  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.11"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
-  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
+  resolved "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -7834,7 +7577,6 @@ sha.js@^2.4.0, sha.js@^2.4.8:
 shallow-clone@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571"
-  integrity sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==
   dependencies:
     is-extendable "^0.1.1"
     kind-of "^5.0.0"
@@ -7843,24 +7585,20 @@ shallow-clone@^1.0.0:
 shallow-copy@~0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz#415f42702d73d810330292cc5ee86eae1a11a170"
-  integrity sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=
 
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
   dependencies:
     shebang-regex "^1.0.0"
 
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
 shelljs@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.2.tgz#345b7df7763f4c2340d584abb532c5f752ca9e35"
-  integrity sha512-pRXeNrCA2Wd9itwhvLp5LZQvPJ0wU6bcjaTMywHHGX5XWhVN2nzSu7WV0q+oUY7mGK3mgSkDDzP3MgjqdyIgbQ==
   dependencies:
     glob "^7.0.0"
     interpret "^1.0.0"
@@ -7869,34 +7607,45 @@ shelljs@^0.8.1:
 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"
-  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
 simple-swizzle@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
-  integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=
   dependencies:
     is-arrayish "^0.3.1"
 
+slack-node@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/slack-node/-/slack-node-0.2.0.tgz#de4b8dddaa8b793f61dbd2938104fdabf37dfa30"
+  dependencies:
+    requestretry "^1.2.2"
+
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
-  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
-slide@~1.1.3:
+slide@^1.1.3, slide@~1.1.3:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
-  integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=
+
+smart-buffer@^1.0.4:
+  version "1.1.15"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-1.1.15.tgz#7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"
 
 smart-buffer@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.1.tgz#07ea1ca8d4db24eb4cac86537d7d18995221ace3"
-  integrity sha512-RFqinRVJVcCAL9Uh1oVqE6FZkqsyLiVOYEZ20TqIOjuX7iFVJ+zsbs4RIghnw/pTs7mZvt8ZHhvm1ZUrR4fykg==
+
+smtp-connection@2.12.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/smtp-connection/-/smtp-connection-2.12.0.tgz#d76ef9127cb23c2259edb1e8349c2e8d5e2d74c1"
+  dependencies:
+    httpntlm "1.6.1"
+    nodemailer-shared "1.1.0"
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
-  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
   dependencies:
     define-property "^1.0.0"
     isobject "^3.0.0"
@@ -7905,14 +7654,12 @@ snapdragon-node@^2.0.1:
 snapdragon-util@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
-  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
   dependencies:
     kind-of "^3.2.0"
 
 snapdragon@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
-  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
   dependencies:
     base "^0.11.1"
     debug "^2.2.0"
@@ -7923,15 +7670,43 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
+sntp@1.x.x:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
+  dependencies:
+    hoek "2.x.x"
+
+sntp@2.x.x:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
+  dependencies:
+    hoek "4.x.x"
+
 socket.io-adapter@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b"
-  integrity sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=
+
+socket.io-client@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.0.4.tgz#0918a552406dc5e540b380dcd97afc4a64332f8e"
+  dependencies:
+    backo2 "1.0.2"
+    base64-arraybuffer "0.1.5"
+    component-bind "1.0.0"
+    component-emitter "1.2.1"
+    debug "~2.6.4"
+    engine.io-client "~3.1.0"
+    has-cors "1.1.0"
+    indexof "0.0.1"
+    object-component "0.0.3"
+    parseqs "0.0.5"
+    parseuri "0.0.5"
+    socket.io-parser "~3.1.1"
+    to-array "0.1.4"
 
 socket.io-client@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.1.tgz#dcb38103436ab4578ddb026638ae2f21b623671f"
-  integrity sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==
   dependencies:
     backo2 "1.0.2"
     base64-arraybuffer "0.1.5"
@@ -7948,19 +7723,36 @@ socket.io-client@2.1.1:
     socket.io-parser "~3.2.0"
     to-array "0.1.4"
 
+socket.io-parser@~3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.1.3.tgz#ed2da5ee79f10955036e3da413bfd7f1e4d86c8e"
+  dependencies:
+    component-emitter "1.2.1"
+    debug "~3.1.0"
+    has-binary2 "~1.0.2"
+    isarray "2.0.1"
+
 socket.io-parser@~3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz#e7c6228b6aa1f814e6148aea325b51aa9499e077"
-  integrity sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==
   dependencies:
     component-emitter "1.2.1"
     debug "~3.1.0"
     isarray "2.0.1"
 
+socket.io@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.0.4.tgz#c1a4590ceff87ecf13c72652f046f716b29e6014"
+  dependencies:
+    debug "~2.6.6"
+    engine.io "~3.1.0"
+    socket.io-adapter "~1.1.0"
+    socket.io-client "2.0.4"
+    socket.io-parser "~3.1.1"
+
 socket.io@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz#a069c5feabee3e6b214a75b40ce0652e1cfb9980"
-  integrity sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==
   dependencies:
     debug "~3.1.0"
     engine.io "~3.2.0"
@@ -7969,22 +7761,9 @@ socket.io@2.1.1:
     socket.io-client "2.1.1"
     socket.io-parser "~3.2.0"
 
-sockjs-client@1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.5.tgz#1bb7c0f7222c40f42adf14f4442cbd1269771a83"
-  integrity sha1-G7fA9yIsQPQq3xT0RCy9Eml3GoM=
-  dependencies:
-    debug "^2.6.6"
-    eventsource "0.1.6"
-    faye-websocket "~0.11.0"
-    inherits "^2.0.1"
-    json3 "^3.3.2"
-    url-parse "^1.1.8"
-
 sockjs-client@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz#12fc9d6cb663da5739d3dc5fb6e8687da95cb177"
-  integrity sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==
   dependencies:
     debug "^3.2.5"
     eventsource "^1.0.7"
@@ -7996,23 +7775,27 @@ sockjs-client@1.3.0:
 sockjs@0.3.19:
   version "0.3.19"
   resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d"
-  integrity sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==
   dependencies:
     faye-websocket "^0.10.0"
     uuid "^3.0.1"
 
-socks-proxy-agent@^4.0.0:
+socks-proxy-agent@^4.0.0, socks-proxy-agent@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz#5936bf8b707a993079c6f37db2091821bffa6473"
-  integrity sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==
   dependencies:
     agent-base "~4.2.0"
     socks "~2.2.0"
 
+socks@1.1.9:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-1.1.9.tgz#628d7e4d04912435445ac0b6e459376cb3e6d691"
+  dependencies:
+    ip "^1.1.2"
+    smart-buffer "^1.0.4"
+
 socks@~2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/socks/-/socks-2.2.1.tgz#68ad678b3642fbc5d99c64c165bc561eab0215f9"
-  integrity sha512-0GabKw7n9mI46vcNrVfs0o6XzWzjVa3h6GaSo2UPxtWAROXUWavfJWh1M4PR5tnE0dcnQXZIDFP4yrAysLze/w==
   dependencies:
     ip "^1.1.5"
     smart-buffer "^4.0.1"
@@ -8020,24 +7803,20 @@ socks@~2.2.0:
 sort-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
-  integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=
   dependencies:
     is-plain-obj "^1.0.0"
 
 source-list-map@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
-  integrity sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
 
 source-list-map@~0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
-  integrity sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=
 
 source-map-loader@0.2.4:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.4.tgz#c18b0dc6e23bf66f6792437557c569a11e072271"
-  integrity sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==
   dependencies:
     async "^2.5.0"
     loader-utils "^1.1.0"
@@ -8045,7 +7824,6 @@ source-map-loader@0.2.4:
 source-map-resolve@^0.5.0:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
-  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
   dependencies:
     atob "^2.1.1"
     decode-uri-component "^0.2.0"
@@ -8056,7 +7834,6 @@ source-map-resolve@^0.5.0:
 source-map-support@0.5.9, source-map-support@^0.5.0, source-map-support@^0.5.3, source-map-support@^0.5.5, source-map-support@~0.5.6:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
-  integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -8064,65 +7841,54 @@ source-map-support@0.5.9, source-map-support@^0.5.0, source-map-support@^0.5.3,
 source-map-support@~0.4.0:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
-  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
   dependencies:
     source-map "^0.5.6"
 
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
-  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
 source-map@0.1.x:
   version "0.1.43"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
-  integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
   dependencies:
     amdefine ">=0.0.4"
 
 source-map@0.5.6:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
-  integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
 
-source-map@0.7.3:
+source-map@0.7.3, source-map@^0.7.3:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
 
 source-map@^0.4.2, source-map@~0.4.1:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
   dependencies:
     amdefine ">=0.0.4"
 
 source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
 source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 source-map@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
-  integrity sha1-2rc/vPwrqBm03gO9b26qSBZLP50=
   dependencies:
     amdefine ">=0.0.4"
 
 sourcemap-codec@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz#c8fd92d91889e902a07aee392bdd2c5863958ba2"
-  integrity sha512-hX1eNBNuilj8yfFnECh0DzLgwKpBLMIvmhgEhixXNui8lMLBInTI8Kyxt++RwJnMNu7cAUo635L2+N1TxMJCzA==
 
 spdx-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/spdx-compare/-/spdx-compare-1.0.0.tgz#2c55f117362078d7409e6d7b08ce70a857cd3ed7"
-  integrity sha512-C1mDZOX0hnu0ep9dfmuoi03+eOdDoz2yvK79RxbcrVEG1NO1Ph35yW102DHWKN4pk80nwCgeMmSY5L25VE4D9A==
   dependencies:
     array-find-index "^1.0.2"
     spdx-expression-parse "^3.0.0"
@@ -8131,7 +7897,6 @@ spdx-compare@^1.0.0:
 spdx-correct@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
-  integrity sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
@@ -8139,17 +7904,14 @@ spdx-correct@^3.0.0:
 spdx-exceptions@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-1.0.5.tgz#9d21ac4da4bdb71d060fb74e5a67531d032cbba6"
-  integrity sha1-nSGsTaS9tx0GD7dOWmdTHQMsu6Y=
 
 spdx-exceptions@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
-  integrity sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==
 
 spdx-expression-parse@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
-  integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
@@ -8157,22 +7919,18 @@ spdx-expression-parse@^3.0.0:
 spdx-license-ids@^1.0.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
-  integrity sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=
 
 spdx-license-ids@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz#e2a303236cac54b04031fa7a5a79c7e701df852f"
-  integrity sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w==
 
 spdx-ranges@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/spdx-ranges/-/spdx-ranges-2.0.0.tgz#257686798e5edb41d45c1aba3d3f1bb47af8d5ec"
-  integrity sha512-AUUXLfqkwD7GlzZkXv8ePPCpPjeVWI9xJCfysL8re/uKb6H10umMnC7bFRsHmLJan4fslUtekAgpHlSgLc/7mA==
 
 spdx-satisfies@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/spdx-satisfies/-/spdx-satisfies-4.0.0.tgz#ebc79eec88b68ac75618e2e5ee94fbc347587552"
-  integrity sha512-OcARj6U1OuVv98SVrRqgrR30sVocONtoPpnX8Xz4vXNrFVedqtbgkA+0KmQoXIQ2xjfltPPRVIMeNzKEFLWWKQ==
   dependencies:
     spdx-compare "^1.0.0"
     spdx-expression-parse "^3.0.0"
@@ -8181,7 +7939,6 @@ spdx-satisfies@^4.0.0:
 spdx@^0.5.1:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/spdx/-/spdx-0.5.2.tgz#76a428b9b97e7904ef83e62a4af0d06fdb50c265"
-  integrity sha512-WQbfCQT2uKLsDllnO9ItpcGUiiF1O/ZvBGCyqFZRg122HgiZubpwpZiM7BkmH19HC3XR3Z+DFMGJNzXSPebG8A==
   dependencies:
     spdx-exceptions "^1.0.0"
     spdx-license-ids "^1.0.0"
@@ -8189,7 +7946,6 @@ spdx@^0.5.1:
 spdy-transport@^2.0.18:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-2.1.0.tgz#4bbb15aaffed0beefdd56ad61dbdc8ba3e2cb7a1"
-  integrity sha512-bpUeGpZcmZ692rrTiqf9/2EUakI6/kXX1Rpe0ib/DyOzbiexVfXkw6GnvI9hVGvIwVaUhkaBojjCZwLNRGQg1g==
   dependencies:
     debug "^2.6.8"
     detect-node "^2.0.3"
@@ -8202,7 +7958,6 @@ spdy-transport@^2.0.18:
 spdy@^3.4.1:
   version "3.4.7"
   resolved "https://registry.yarnpkg.com/spdy/-/spdy-3.4.7.tgz#42ff41ece5cc0f99a3a6c28aabb73f5c3b03acbc"
-  integrity sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=
   dependencies:
     debug "^2.6.8"
     handle-thing "^1.2.5"
@@ -8214,45 +7969,38 @@ spdy@^3.4.1:
 speed-measure-webpack-plugin@1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.2.3.tgz#de170b5cefbfa1c039d95e639edd3ad50cfc7c48"
-  integrity sha512-p+taQ69VkRUXYMoZOx2nxV/Tz8tt79ahctoZJyJDHWP7fEYvwFNf5Pd73k5kZ6auu0pTsPNLEUwWpM8mCk85Zw==
   dependencies:
     chalk "^2.0.1"
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
-  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
   dependencies:
     extend-shallow "^3.0.0"
 
 split2@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493"
-  integrity sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==
   dependencies:
     through2 "^2.0.2"
 
 split@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
-  integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==
   dependencies:
     through "2"
 
 sprintf-js@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.1.tgz#36be78320afe5801f6cea3ee78b6e5aab940ea0c"
-  integrity sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw=
 
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 sshpk@^1.7.0:
   version "1.14.2"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
-  integrity sha1-xvxhZIo9nE52T9P8306hBeSSupg=
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -8268,33 +8016,28 @@ sshpk@^1.7.0:
 ssri@^5.2.4:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
-  integrity sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==
   dependencies:
     safe-buffer "^5.1.1"
 
 ssri@^6.0.0, ssri@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
-  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
   dependencies:
     figgy-pudding "^3.5.1"
 
 stack-trace@0.0.x:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
-  integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
 
 static-eval@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.0.tgz#0e821f8926847def7b4b50cda5d55c04a9b13864"
-  integrity sha512-6flshd3F1Gwm+Ksxq463LtFd1liC77N/PX1FVVc3OzL3hAmo2fwHFbuArkcfi7s9rTNsLEhcRmXGFZhlgy40uw==
   dependencies:
     escodegen "^1.8.1"
 
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
-  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
   dependencies:
     define-property "^0.2.5"
     object-copy "^0.1.0"
@@ -8302,7 +8045,6 @@ static-extend@^0.1.1:
 static-module@^2.2.0:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/static-module/-/static-module-2.2.5.tgz#bd40abceae33da6b7afb84a0e4329ff8852bfbbf"
-  integrity sha512-D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ==
   dependencies:
     concat-stream "~1.6.0"
     convert-source-map "^1.5.1"
@@ -8322,36 +8064,30 @@ static-module@^2.2.0:
 stats-webpack-plugin@0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/stats-webpack-plugin/-/stats-webpack-plugin-0.7.0.tgz#ccffe9b745de8bbb155571e063f8263fc0e2bc06"
-  integrity sha512-NT0YGhwuQ0EOX+uPhhUcI6/+1Sq/pMzNuSCBVT4GbFl/ac6I/JZefBcjlECNfAb1t3GOx5dEj1Z7x0cAxeeVLQ==
   dependencies:
     lodash "^4.17.4"
 
-"statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2":
+"statuses@>= 1.4.0 < 2":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
 statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
-  integrity sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=
 
 statuses@~1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
-  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
 
 stdout-stream@^1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
-  integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==
   dependencies:
     readable-stream "^2.0.1"
 
 stream-browserify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
-  integrity sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=
   dependencies:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
@@ -8359,7 +8095,6 @@ stream-browserify@^2.0.1:
 stream-each@^1.1.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
-  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
   dependencies:
     end-of-stream "^1.1.0"
     stream-shift "^1.0.0"
@@ -8367,7 +8102,6 @@ stream-each@^1.1.0:
 stream-http@^2.7.2:
   version "2.8.3"
   resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
-  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
   dependencies:
     builtin-status-codes "^3.0.0"
     inherits "^2.0.1"
@@ -8378,19 +8112,16 @@ stream-http@^2.7.2:
 stream-json@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/stream-json/-/stream-json-0.5.2.tgz#f4256c0ef1a905f2ef2d473706b4b3ff827653cf"
-  integrity sha512-/QlOLybrc6LkH/oVgXo1lJ8oemRIze/grdpfssLn1Pm8nZVhW4VMOqDDYGaORPodQFxiDEUquQJER5LiBu8Ehg==
   dependencies:
     parser-toolkit ">=0.0.3"
 
 stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
-  integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
 
 streamroller@0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-0.7.0.tgz#a1d1b7cf83d39afb0d63049a5acbf93493bdf64b"
-  integrity sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==
   dependencies:
     date-format "^1.2.0"
     debug "^3.1.0"
@@ -8400,12 +8131,10 @@ streamroller@0.7.0:
 strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
 
 string-to-stream@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string-to-stream/-/string-to-stream-1.1.1.tgz#aba78f73e70661b130ee3e1c0192be4fef6cb599"
-  integrity sha512-QySF2+3Rwq0SdO3s7BAp4x+c3qsClpPQ6abAmb0DGViiSBAkT5kL6JT2iyzEVP+T1SmzHrQD1TwlP9QAHCc+Sw==
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.1.0"
@@ -8413,7 +8142,6 @@ string-to-stream@^1.1.0:
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
   dependencies:
     code-point-at "^1.0.0"
     is-fullwidth-code-point "^1.0.0"
@@ -8422,7 +8150,6 @@ string-width@^1.0.1, string-width@^1.0.2:
 "string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
   dependencies:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
@@ -8430,67 +8157,60 @@ string-width@^1.0.1, string-width@^1.0.2:
 string_decoder@^1.0.0, string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
     safe-buffer "~5.1.0"
 
 string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
+
+stringstream@~0.0.4, stringstream@~0.0.5:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
   dependencies:
     ansi-regex "^3.0.0"
 
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
   dependencies:
     is-utf8 "^0.2.0"
 
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
 strip-indent@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
-  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
   dependencies:
     get-stdin "^4.0.1"
 
 strip-indent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
-  integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=
 
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
 style-loader@0.23.1:
   version "0.23.1"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz#cb9154606f3e771ab6c4ab637026a1049174d925"
-  integrity sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==
   dependencies:
     loader-utils "^1.1.0"
     schema-utils "^1.0.0"
@@ -8498,7 +8218,6 @@ style-loader@0.23.1:
 stylus-loader@3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-3.0.2.tgz#27a706420b05a38e038e7cacb153578d450513c6"
-  integrity sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==
   dependencies:
     loader-utils "^1.0.2"
     lodash.clonedeep "^4.5.0"
@@ -8507,7 +8226,6 @@ stylus-loader@3.0.2:
 stylus@0.54.5, stylus@^0.54.5:
   version "0.54.5"
   resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
-  integrity sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=
   dependencies:
     css-parse "1.7.x"
     debug "*"
@@ -8519,41 +8237,42 @@ stylus@0.54.5, stylus@^0.54.5:
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
 supports-color@^3.1.0:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
-  integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
   dependencies:
     has-flag "^1.0.0"
 
 supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
 symbol-observable@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
-  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
-tapable@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
-  integrity sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg==
-
-tapable@^1.1.0:
+tapable@^1.0.0, tapable@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c"
-  integrity sha512-IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA==
+
+tar-stream@^1.5.0:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
+  dependencies:
+    bl "^1.0.0"
+    buffer-alloc "^1.2.0"
+    end-of-stream "^1.0.0"
+    fs-constants "^1.0.0"
+    readable-stream "^2.3.0"
+    to-buffer "^1.1.1"
+    xtend "^4.0.0"
 
 tar@^2.0.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-  integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
   dependencies:
     block-stream "*"
     fstream "^1.0.2"
@@ -8562,7 +8281,6 @@ tar@^2.0.0:
 tar@^4, tar@^4.4.4, tar@^4.4.6:
   version "4.4.6"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
-  integrity sha512-tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg==
   dependencies:
     chownr "^1.0.1"
     fs-minipass "^1.2.5"
@@ -8575,7 +8293,6 @@ tar@^4, tar@^4.4.4, tar@^4.4.6:
 temp@^0.8.3:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59"
-  integrity sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=
   dependencies:
     os-tmpdir "^1.0.0"
     rimraf "~2.2.6"
@@ -8583,14 +8300,12 @@ temp@^0.8.3:
 term-size@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
-  integrity sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=
   dependencies:
     execa "^0.7.0"
 
 terser-webpack-plugin@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.1.0.tgz#cf7c25a1eee25bf121f4a587bb9e004e3f80e528"
-  integrity sha512-61lV0DSxMAZ8AyZG7/A4a3UPlrbOBo8NIQ4tJzLPAdGOQ+yoNC7l5ijEow27lBAL2humer01KLS6bGIMYQxKoA==
   dependencies:
     cacache "^11.0.2"
     find-cache-dir "^2.0.0"
@@ -8602,9 +8317,8 @@ terser-webpack-plugin@1.1.0:
     worker-farm "^1.5.2"
 
 terser@^3.8.1:
-  version "3.8.2"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-3.8.2.tgz#48b880f949f8d038aca4dfd00a37c53d96ecf9fb"
-  integrity sha512-FGSBXiBJe2TSXy6pWwXpY0YcEWEK35UKL64BBbxX3aHqM4Nj0RMqXvqBuoSGfyd80t8MKQ5JwYm5jRRGTSEFNg==
+  version "3.10.8"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-3.10.8.tgz#2fe3967396a10cdc3d575074fe857efd30a2895a"
   dependencies:
     commander "~2.17.1"
     source-map "~0.6.1"
@@ -8613,17 +8327,14 @@ terser@^3.8.1:
 text-extensions@^1.0.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.8.0.tgz#6f343c62268843019b21a616a003557bdb952d2b"
-  integrity sha512-mVzjRxuWnDKs/qH1rbOJEVHLlSX9kty9lpi7lMvLgU9S74mQ8/Ozg9UPcKxShh0qG2NZ+NyPOPpcZU4C1Eld9A==
 
 text-hex@1.0.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5"
-  integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==
 
 through2@^2.0.0, through2@^2.0.2, through2@^2.0.3, through2@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-  integrity sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=
   dependencies:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
@@ -8631,75 +8342,74 @@ through2@^2.0.0, through2@^2.0.2, through2@^2.0.3, through2@~2.0.3:
 through@2, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+
+thunkify@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/thunkify/-/thunkify-2.1.2.tgz#faa0e9d230c51acc95ca13a361ac05ca7e04553d"
 
 thunky@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.2.tgz#a862e018e3fb1ea2ec3fce5d55605cf57f247371"
-  integrity sha1-qGLgGOP7HqLsP85dVWBc9X8kc3E=
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.3.tgz#f5df732453407b09191dae73e2a8cc73f381a826"
 
 timed-out@^4.0.0, timed-out@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
-  integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
 
 timers-browserify@^2.0.4:
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
-  integrity sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==
   dependencies:
     setimmediate "^1.0.4"
 
+timespan@2.3.x:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/timespan/-/timespan-2.3.0.tgz#4902ce040bd13d845c8f59b27e9d59bad6f39929"
+
 tiny-inflate@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.2.tgz#93d9decffc8805bd57eae4310f0b745e9b6fb3a7"
-  integrity sha1-k9nez/yIBb1X6uQxDwt0Xptvs6c=
 
 tmp@0.0.30:
   version "0.0.30"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.30.tgz#72419d4a8be7d6ce75148fd8b324e593a711c2ed"
-  integrity sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=
   dependencies:
     os-tmpdir "~1.0.1"
 
 tmp@0.0.33, tmp@0.0.x, tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
   dependencies:
     os-tmpdir "~1.0.2"
 
 to-array@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
-  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
 
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
-  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
+
+to-buffer@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
 
 to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
-  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
 
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
   dependencies:
     kind-of "^3.0.2"
 
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
   dependencies:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
@@ -8707,24 +8417,21 @@ to-regex-range@^2.1.0:
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
-  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
   dependencies:
     define-property "^2.0.2"
     extend-shallow "^3.0.2"
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-tough-cookie@~2.3.3:
+tough-cookie@~2.3.0, tough-cookie@~2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
-  integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==
   dependencies:
     punycode "^1.4.1"
 
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
-  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
   dependencies:
     psl "^1.1.24"
     punycode "^1.4.1"
@@ -8732,49 +8439,40 @@ tough-cookie@~2.4.3:
 tree-kill@1.2.0, tree-kill@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36"
-  integrity sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==
 
 treeify@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/treeify/-/treeify-1.1.0.tgz#4e31c6a463accd0943879f30667c4fdaff411bb8"
-  integrity sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A==
 
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
-  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
 
 trim-newlines@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
-  integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=
 
 trim-off-newlines@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
-  integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM=
 
 trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
-  integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
 
 triple-beam@^1.2.0, triple-beam@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9"
-  integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==
 
 "true-case-path@^1.0.2":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
-  integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==
   dependencies:
     glob "^7.1.2"
 
 ts-node@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-5.0.1.tgz#78e5d1cb3f704de1b641e43b76be2d4094f06f81"
-  integrity sha512-XK7QmDcNHVmZkVtkiwNDWiERRHPyU8nBqZB1+iv2UhOG0q3RQ9HsZ2CMqISlFbxjrYFGfG2mX7bW4dAyxBVzUw==
   dependencies:
     arrify "^1.0.0"
     chalk "^2.3.0"
@@ -8785,38 +8483,40 @@ ts-node@^5.0.0:
     source-map-support "^0.5.3"
     yn "^2.0.0"
 
-tsickle@0.32.1, tsickle@>=0.27.3:
-  version "0.32.1"
-  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.32.1.tgz#f16e94ba80b32fc9ebe320dc94fbc2ca7f3521a5"
-  integrity sha512-JW9j+W0SaMSZGejIFZBk0AiPfnhljK3oLx5SaqxrJhjlvzFyPml5zqG1/PuScUj6yTe1muEqwk5CnDK0cOZmKw==
+tsickle@0.28.0:
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.28.0.tgz#6cd6fa004766c6ad9261b599c83866ee97cc7875"
   dependencies:
-    jasmine-diff "^0.1.3"
     minimist "^1.2.0"
     mkdirp "^0.5.1"
     source-map "^0.6.0"
     source-map-support "^0.5.0"
 
+tsickle@>=0.27.3:
+  version "0.33.1"
+  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.33.1.tgz#eee4ebabeda3bcd8afc32cee34c822cbe3e839ec"
+  dependencies:
+    minimist "^1.2.0"
+    mkdirp "^0.5.1"
+    source-map "^0.7.3"
+
 tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
-  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
 tslint-no-circular-imports@^0.5.0:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/tslint-no-circular-imports/-/tslint-no-circular-imports-0.5.2.tgz#47ac9194ec531101ac19198d5144f7ac9f57d980"
-  integrity sha512-Uzu2NiVX7b/kAk9vPrLqUmoCkth0dXUUNOaqwfxpvYgsHfoH67cmj0IHOUMZ1bC0swksJjaTyq7acHe/gU8H4A==
 
 tslint-sonarts@^1.7.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/tslint-sonarts/-/tslint-sonarts-1.8.0.tgz#80f2e8addd418c3b8807fc0155dec33b5a81e8d1"
-  integrity sha512-tpijO5VR18e+Ny99uMNNov3Hw7diiYQ8KoJkezpHGw9hSFFrO5g2PhwdQQo7O9puhJKMIutLl9g+ICMgg+bh0w==
   dependencies:
     immutable "^3.8.2"
 
 tslint@^5.11.0:
   version "5.11.0"
   resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.11.0.tgz#98f30c02eae3cde7006201e4c33cb08b48581eed"
-  integrity sha1-mPMMAurjzecAYgHkwzywi0hYHu0=
   dependencies:
     babel-code-frame "^6.22.0"
     builtin-modules "^1.1.1"
@@ -8831,48 +8531,49 @@ tslint@^5.11.0:
     tslib "^1.8.0"
     tsutils "^2.27.2"
 
-tsutils@2.20.0:
-  version "2.20.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.20.0.tgz#303394064bc80be8ee04e10b8609ae852e9312d3"
-  integrity sha512-qPOBy1/hwLdBxh/TNIpim5qL1WRMR0tgVGBB6shjnpw6/SuS5ZKYyXXxKDYsMsMtVdFOcL+XPGZVEuc+eCOo4A==
+tsscmp@~1.0.0:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"
+
+tsutils@2.27.2:
+  version "2.27.2"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.27.2.tgz#60ba88a23d6f785ec4b89c6e8179cac9b431f1c7"
   dependencies:
     tslib "^1.8.1"
 
 tsutils@^2.27.2:
   version "2.29.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
-  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
   dependencies:
     tslib "^1.8.1"
 
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
-  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
   dependencies:
     safe-buffer "^5.0.1"
 
+tunnel-agent@~0.4.1:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
+
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
   dependencies:
     prelude-ls "~1.1.2"
 
-type-is@~1.6.15, type-is@~1.6.16:
+type-is@~1.6.16:
   version "1.6.16"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
-  integrity sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==
   dependencies:
     media-typer "0.3.0"
     mime-types "~2.1.18"
@@ -8880,17 +8581,14 @@ type-is@~1.6.15, type-is@~1.6.16:
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
 typescript@3.1.3, typescript@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.3.tgz#01b70247a6d3c2467f70c45795ef5ea18ce191d5"
-  integrity sha512-+81MUSyX+BaSo+u2RbozuQk/UWx6hfG0a5gHu4ANEM4sU96XbuIyAB+rWBW1u70c6a5QuZfuYICn3s2UjuHUpA==
 
 uglify-es@^3.3.4:
   version "3.3.9"
   resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
-  integrity sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==
   dependencies:
     commander "~2.13.0"
     source-map "~0.6.1"
@@ -8898,7 +8596,6 @@ uglify-es@^3.3.4:
 uglify-js@^3.0.7, uglify-js@^3.1.4:
   version "3.4.9"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
-  integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==
   dependencies:
     commander "~2.17.1"
     source-map "~0.6.1"
@@ -8906,7 +8603,6 @@ uglify-js@^3.0.7, uglify-js@^3.1.4:
 uglifyjs-webpack-plugin@^1.2.4:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz#75f548160858163a08643e086d5fefe18a5d67de"
-  integrity sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==
   dependencies:
     cacache "^10.0.4"
     find-cache-dir "^1.0.0"
@@ -8920,7 +8616,10 @@ uglifyjs-webpack-plugin@^1.2.4:
 ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
-  integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
+
+underscore@~1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz#6bbaf0877500d36be34ecaa584e0db9fef035209"
 
 "unicode-properties@github:quicktype/unicode-properties#dist":
   version "1.1.0"
@@ -8932,7 +8631,6 @@ ultron@~1.1.0:
 unicode-trie@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/unicode-trie/-/unicode-trie-0.3.1.tgz#d671dddd89101a08bac37b6a5161010602052085"
-  integrity sha1-1nHd3YkQGgi6w3tqUWEBBgIFIIU=
   dependencies:
     pako "^0.2.5"
     tiny-inflate "^1.0.0"
@@ -8940,55 +8638,41 @@ unicode-trie@^0.3.0:
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
-  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
   dependencies:
     arr-union "^3.1.0"
     get-value "^2.0.6"
     is-extendable "^0.1.1"
     set-value "^0.4.3"
 
-unique-filename@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.0.tgz#d05f2fe4032560871f30e93cbe735eea201514f3"
-  integrity sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=
-  dependencies:
-    unique-slug "^2.0.0"
-
-unique-filename@^1.1.1:
+unique-filename@^1.1.0, unique-filename@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
-  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
   dependencies:
     unique-slug "^2.0.0"
 
 unique-slug@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.0.tgz#db6676e7c7cc0629878ff196097c78855ae9f4ab"
-  integrity sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.1.tgz#5e9edc6d1ce8fb264db18a507ef9bd8544451ca6"
   dependencies:
     imurmurhash "^0.1.4"
 
 unique-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
-  integrity sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=
   dependencies:
     crypto-random-string "^1.0.0"
 
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
-  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
   dependencies:
     has-value "^0.3.1"
     isobject "^3.0.0"
@@ -8996,17 +8680,14 @@ unset-value@^1.0.0:
 unzip-response@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
-  integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
 
 upath@^1.0.5:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
-  integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==
 
 update-notifier@^2.3.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6"
-  integrity sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==
   dependencies:
     boxen "^1.2.1"
     chalk "^2.0.1"
@@ -9022,43 +8703,32 @@ update-notifier@^2.3.0:
 uri-js@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
   dependencies:
     punycode "^2.1.0"
 
 urijs@^1.19.1:
   version "1.19.1"
   resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.1.tgz#5b0ff530c0cbde8386f6342235ba5ca6e995d25a"
-  integrity sha512-xVrGVi94ueCJNrBSTjWqjvtgvl3cyOTThp2zaMaFNGp3F542TR6sM3f2o8RqZl+AwteClSVmoCyt0ka4RjQOQg==
 
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
-
-url-join@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.0.tgz#4d3340e807d3773bda9991f8305acdcc2a665d2a"
-  integrity sha1-TTNA6AfTdzvamZH4MFrNzCpmXSo=
 
 url-parse-lax@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
-  integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=
   dependencies:
     prepend-http "^1.0.1"
 
 url-parse-lax@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
-  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
   dependencies:
     prepend-http "^2.0.0"
 
-url-parse@^1.1.8, url-parse@^1.4.3:
+url-parse@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.3.tgz#bfaee455c889023219d757e045fa6a684ec36c15"
-  integrity sha512-rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==
   dependencies:
     querystringify "^2.0.0"
     requires-port "^1.0.0"
@@ -9066,12 +8736,10 @@ url-parse@^1.1.8, url-parse@^1.4.3:
 url-to-options@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
-  integrity sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=
 
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
   dependencies:
     punycode "1.3.2"
     querystring "0.2.0"
@@ -9079,54 +8747,56 @@ url@^0.11.0:
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
-  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
 useragent@2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.2.1.tgz#cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"
-  integrity sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=
   dependencies:
     lru-cache "2.2.x"
     tmp "0.0.x"
 
+useragent@^2.1.12:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz#217f943ad540cb2128658ab23fc960f6a88c9972"
+  dependencies:
+    lru-cache "4.1.x"
+    tmp "0.0.x"
+
 util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
 util-extend@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f"
-  integrity sha1-p8IW0mdUUWljeztu3GypEZ4v+T8=
 
 util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
-  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
   dependencies:
     inherits "2.0.1"
 
 util@^0.10.3:
   version "0.10.4"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
-  integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
   dependencies:
     inherits "2.0.3"
 
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
 uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
+
+uws@~9.14.0:
+  version "9.14.0"
+  resolved "https://registry.yarnpkg.com/uws/-/uws-9.14.0.tgz#fac8386befc33a7a3705cbd58dc47b430ca4dd95"
 
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
-  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
@@ -9134,19 +8804,20 @@ validate-npm-package-license@^3.0.1:
 validate-npm-package-name@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
-  integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34=
   dependencies:
     builtins "^1.0.3"
 
+vargs@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/vargs/-/vargs-0.1.0.tgz#6b6184da6520cc3204ce1b407cac26d92609ebff"
+
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
   dependencies:
     assert-plus "^1.0.0"
     core-util-is "1.0.2"
@@ -9155,24 +8826,20 @@ verror@1.10.0:
 vlq@^0.2.2:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
-  integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==
 
 vm-browserify@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
-  integrity sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=
   dependencies:
     indexof "0.0.1"
 
 void-elements@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
-  integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
 
 watchpack@^1.5.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
-  integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==
   dependencies:
     chokidar "^2.0.2"
     graceful-fs "^4.1.2"
@@ -9181,14 +8848,24 @@ watchpack@^1.5.0:
 wbuf@^1.1.0, wbuf@^1.7.2:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
-  integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
   dependencies:
     minimalistic-assert "^1.0.0"
 
+wd@^1.4.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/wd/-/wd-1.11.0.tgz#b610deea7f79f5a520a573c09e047e42d31433f9"
+  dependencies:
+    archiver "2.1.1"
+    async "2.0.1"
+    lodash "4.17.10"
+    mkdirp "^0.5.1"
+    q "1.4.1"
+    request "2.85.0"
+    vargs "0.1.0"
+
 webdriver-js-extender@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz#57d7a93c00db4cc8d556e4d3db4b5db0a80c3bb7"
-  integrity sha512-lcUKrjbBfCK6MNsh7xaY2UAUmZwe+/ib03AjVOpFobX4O7+83BUveSrLfU0Qsyb1DaKJdQRbuU+kM9aZ6QUhiQ==
   dependencies:
     "@types/selenium-webdriver" "^3.0.0"
     selenium-webdriver "^3.0.1"
@@ -9196,7 +8873,6 @@ webdriver-js-extender@2.1.0:
 webdriver-manager@^12.0.6:
   version "12.1.0"
   resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.0.tgz#f6601e52de5f0c97fc7024c889eeb2416f2f1d9d"
-  integrity sha512-oEc5fmkpz6Yh6udhwir5m0eN5mgRPq9P/NU5YWuT3Up5slt6Zz+znhLU7q4+8rwCZz/Qq3Fgpr/4oao7NPCm2A==
   dependencies:
     adm-zip "^0.4.9"
     chalk "^1.1.1"
@@ -9213,38 +8889,22 @@ webdriver-manager@^12.0.6:
 webpack-core@^0.6.8:
   version "0.6.9"
   resolved "https://registry.yarnpkg.com/webpack-core/-/webpack-core-0.6.9.tgz#fc571588c8558da77be9efb6debdc5a3b172bdc2"
-  integrity sha1-/FcViMhVjad76e+23r3Fo7FyvcI=
   dependencies:
     source-list-map "~0.1.7"
     source-map "~0.4.1"
 
-webpack-dev-middleware@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.2.0.tgz#a20ceef194873710052da678f3c6ee0aeed92552"
-  integrity sha512-YJLMF/96TpKXaEQwaLEo+Z4NDK8aV133ROF6xp9pe3gQoS7sxfpXh4Rv9eC+8vCvWfmDjRQaMSlRPbO+9G6jgA==
-  dependencies:
-    loud-rejection "^1.6.0"
-    memory-fs "~0.4.1"
-    mime "^2.3.1"
-    path-is-absolute "^1.0.0"
-    range-parser "^1.0.3"
-    url-join "^4.0.0"
-    webpack-log "^2.0.0"
-
 webpack-dev-middleware@3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz#1132fecc9026fd90f0ecedac5cbff75d1fb45890"
-  integrity sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==
   dependencies:
     memory-fs "~0.4.1"
     mime "^2.3.1"
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
-webpack-dev-server@3.1.10:
+webpack-dev-server@3.1.10, webpack-dev-server@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.10.tgz#507411bee727ee8d2fdffdc621b66a64ab3dea2b"
-  integrity sha512-RqOAVjfqZJtQcB0LmrzJ5y4Jp78lv9CK0MZ1YJDTaTmedMZ9PU9FLMQNrMCfVu8hHzaVLVOJKBlGEHMN10z+ww==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
@@ -9275,44 +8935,9 @@ webpack-dev-server@3.1.10:
     webpack-log "^2.0.0"
     yargs "12.0.2"
 
-webpack-dev-server@^3.1.4:
-  version "3.1.8"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.8.tgz#eb7a95945d1108170f902604fb3b939533d9daeb"
-  integrity sha512-c+tcJtDqnPdxCAzEEZKdIPmg3i5i7cAHe+B+0xFNK0BlCc2HF/unYccbU7xTgfGc5xxhCztCQzFmsqim+KhI+A==
-  dependencies:
-    ansi-html "0.0.7"
-    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 "^2.0.0"
-    internal-ip "^3.0.1"
-    ip "^1.1.5"
-    killable "^1.0.0"
-    loglevel "^1.4.1"
-    opn "^5.1.0"
-    portfinder "^1.0.9"
-    schema-utils "^1.0.0"
-    selfsigned "^1.9.1"
-    serve-index "^1.7.2"
-    sockjs "0.3.19"
-    sockjs-client "1.1.5"
-    spdy "^3.4.1"
-    strip-ansi "^3.0.0"
-    supports-color "^5.1.0"
-    webpack-dev-middleware "3.2.0"
-    webpack-log "^2.0.0"
-    yargs "12.0.2"
-
 webpack-log@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
-  integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
   dependencies:
     ansi-colors "^3.0.0"
     uuid "^3.3.2"
@@ -9320,22 +8945,19 @@ webpack-log@^2.0.0:
 webpack-merge@4.1.4:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.4.tgz#0fde38eabf2d5fd85251c24a5a8c48f8a3f4eb7b"
-  integrity sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==
   dependencies:
     lodash "^4.17.5"
 
-webpack-sources@1.2.0, webpack-sources@^1.1.0, webpack-sources@^1.2.0:
+webpack-sources@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.2.0.tgz#18181e0d013fce096faf6f8e6d41eeffffdceac2"
-  integrity sha512-9BZwxR85dNsjWz3blyxdOhTgtnQvv3OEs5xofI0wPYTwu5kaWxS08UuD1oI7WLBLpRO+ylf0ofnXLXWmGb2WMw==
   dependencies:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack-sources@1.3.0, webpack-sources@^1.3.0:
+webpack-sources@1.3.0, webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
-  integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==
   dependencies:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
@@ -9343,14 +8965,12 @@ webpack-sources@1.3.0, webpack-sources@^1.3.0:
 webpack-subresource-integrity@1.1.0-rc.6:
   version "1.1.0-rc.6"
   resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz#37f6f1264e1eb378e41465a98da80fad76ab8886"
-  integrity sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==
   dependencies:
     webpack-core "^0.6.8"
 
 webpack@4.22.0, webpack@^4.0.0, webpack@^4.6.0:
   version "4.22.0"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.22.0.tgz#b168111e2e7b05f5169ac484e79e62093ec39e0d"
-  integrity sha512-2+3EYFqyhPl12buLQ42QPHEEh8BHn3P9ipRvGRHhdfKJ1u9svhZ3QjhIoEdL5SeIhL5gfOZVbBnartYEabkEsg==
   dependencies:
     "@webassemblyjs/ast" "1.7.8"
     "@webassemblyjs/helper-module-context" "1.7.8"
@@ -9380,7 +9000,6 @@ webpack@4.22.0, webpack@^4.0.0, webpack@^4.6.0:
 websocket-driver@>=0.5.1:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
-  integrity sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=
   dependencies:
     http-parser-js ">=0.4.0"
     websocket-extensions ">=0.1.1"
@@ -9388,53 +9007,48 @@ websocket-driver@>=0.5.1:
 websocket-extensions@>=0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
-  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
+
+when@^3.7.7:
+  version "3.7.8"
+  resolved "https://registry.yarnpkg.com/when/-/when-3.7.8.tgz#c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"
 
 when@~3.6.x:
   version "3.6.4"
   resolved "https://registry.yarnpkg.com/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e"
-  integrity sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=
 
 which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
-  integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
 
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
 which@1, which@^1.1.1, which@^1.2.1, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
 wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
   dependencies:
     string-width "^1.0.2 || 2"
 
 widest-line@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.0.tgz#0142a4e8a243f8882c0233aa0e0281aa76152273"
-  integrity sha1-AUKk6KJD+IgsAjOqDgKBqnYVInM=
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc"
   dependencies:
     string-width "^2.1.1"
 
 window-size@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
-  integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=
 
 winston-transport@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.2.0.tgz#a20be89edf2ea2ca39ba25f3e50344d73e6520e5"
-  integrity sha512-0R1bvFqxSlK/ZKTH86nymOuKv/cT1PQBMuDdA7k7f0S9fM44dNH6bXnuxwXPrN8lefJgtZq08BKdyZ0DZIy/rg==
   dependencies:
     readable-stream "^2.3.6"
     triple-beam "^1.2.0"
@@ -9442,7 +9056,6 @@ winston-transport@^4.2.0:
 winston@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/winston/-/winston-3.1.0.tgz#80724376aef164e024f316100d5b178d78ac5331"
-  integrity sha512-FsQfEE+8YIEeuZEYhHDk5cILo1HOcWkGwvoidLrDgPog0r4bser1lEIOco2dN9zpDJ1M88hfDgZvxe5z4xNcwg==
   dependencies:
     async "^2.6.0"
     diagnostics "^1.1.1"
@@ -9454,27 +9067,27 @@ winston@^3.0.0:
     triple-beam "^1.3.0"
     winston-transport "^4.2.0"
 
+with-callback@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/with-callback/-/with-callback-1.0.2.tgz#a09629b9a920028d721404fb435bdcff5c91bc21"
+
 wordwrap@^1.0.0, wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
 worker-farm@^1.5.2:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
-  integrity sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==
   dependencies:
     errno "~0.1.7"
 
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
-  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -9482,12 +9095,10 @@ wrap-ansi@^2.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 write-file-atomic@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
-  integrity sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
@@ -9496,7 +9107,6 @@ write-file-atomic@^2.0.0:
 ws@~3.3.1:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
-  integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==
   dependencies:
     async-limiter "~1.0.0"
     safe-buffer "~5.1.0"
@@ -9505,93 +9115,81 @@ ws@~3.3.1:
 xdg-basedir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
-  integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=
 
 xhr2@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.4.tgz#7f87658847716db5026323812f818cadab387a5f"
-  integrity sha1-f4dliEdxbbUCYyOBL4GMras4el8=
 
 xml2js@^0.4.17:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
-  integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==
   dependencies:
     sax ">=0.6.0"
     xmlbuilder "~9.0.1"
 
 xmlbuilder@~9.0.1:
   version "9.0.7"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
-  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
+  resolved "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
 
 xmlhttprequest-ssl@~1.5.4:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
-  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
+
+xregexp@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
 
 xregexp@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
-  integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
 
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
 
 xxhashjs@^0.2.1:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/xxhashjs/-/xxhashjs-0.2.2.tgz#8a6251567621a1c46a5ae204da0249c7f8caa9d8"
-  integrity sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==
   dependencies:
     cuint "^0.2.2"
 
 y18n@^3.2.0, y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
 
 "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
 yallist@^3.0.0, yallist@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
-  integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=
 
 yargs-parser@^10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
-  integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
   dependencies:
     camelcase "^4.1.0"
 
 yargs-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
-  integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=
   dependencies:
     camelcase "^3.0.0"
 
 yargs-parser@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
-  integrity sha1-jQrELxbqVd69MyyvTEA4s+P139k=
   dependencies:
     camelcase "^4.1.0"
 
 yargs@12.0.2:
   version "12.0.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
-  integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==
   dependencies:
     cliui "^4.0.0"
     decamelize "^2.0.0"
@@ -9609,7 +9207,6 @@ yargs@12.0.2:
 yargs@9.0.1:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
-  integrity sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=
   dependencies:
     camelcase "^4.1.0"
     cliui "^3.2.0"
@@ -9628,7 +9225,6 @@ yargs@9.0.1:
 yargs@^3.10.0:
   version "3.32.0"
   resolved "http://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995"
-  integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=
   dependencies:
     camelcase "^2.0.1"
     cliui "^3.0.3"
@@ -9641,7 +9237,6 @@ yargs@^3.10.0:
 yargs@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
-  integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=
   dependencies:
     camelcase "^3.0.0"
     cliui "^3.2.0"
@@ -9660,19 +9255,24 @@ yargs@^7.0.0:
 yarn@^1.10.1:
   version "1.10.1"
   resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.10.1.tgz#b792ba28f050ae94cd7e719dbca80639d70da76f"
-  integrity sha512-EH0H1fyfFxkE4UpG4b+VCaVY4I488I2EyQNmGjGGKmvsSIb0G3b+1IcfGYPI2gqa1du43g4ZA3jH8fXlq6oVxg==
 
 yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
-  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
 
 yn@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
-  integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=
+
+zip-stream@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-1.2.0.tgz#a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"
+  dependencies:
+    archiver-utils "^1.3.0"
+    compress-commons "^1.2.0"
+    lodash "^4.8.0"
+    readable-stream "^2.0.0"
 
 zone.js@^0.8.19:
   version "0.8.26"
   resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.26.tgz#7bdd72f7668c5a7ad6b118148b4ea39c59d08d2d"
-  integrity sha512-W9Nj+UmBJG251wkCacIkETgra4QgBo/vgoEkb4a2uoLzpQG7qF9nzwoLXWU5xj3Fg2mxGvEDh47mg24vXccYjA==

From 90a5a7db9634c3613d8b52453d5be0a670be2c4a Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 24 Oct 2018 11:52:27 +0200
Subject: [PATCH 0365/1703] feat(@schematics/angular): install packages when
 creating a new application

Fixes #12719
---
 packages/schematics/angular/application/index.ts    | 11 ++++++++---
 packages/schematics/angular/application/schema.json |  5 +++++
 packages/schematics/angular/ng-new/index.ts         |  2 ++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 213c9f20de77..3de361632581 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -22,6 +22,7 @@ import {
   template,
   url,
 } from '@angular-devkit/schematics';
+import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import { Schema as E2eOptions } from '../e2e/schema';
 import {
   addProjectToWorkspace,
@@ -63,8 +64,8 @@ import { Schema as ApplicationOptions } from './schema';
 //   );
 // }
 
-function addDependenciesToPackageJson() {
-  return (host: Tree) => {
+function addDependenciesToPackageJson(options: ApplicationOptions) {
+  return (host: Tree, context: SchematicContext) => {
     [
       {
         type: NodeDependencyType.Dev,
@@ -83,6 +84,10 @@ function addDependenciesToPackageJson() {
       },
     ].forEach(dependency => addPackageJsonDependency(host, dependency));
 
+    if (!options.skipInstall) {
+      context.addTask(new NodePackageInstallTask());
+    }
+
     return host;
   };
 }
@@ -299,7 +304,6 @@ export default function (options: ApplicationOptions): Rule {
 
     return chain([
       addAppToWorkspaceFile(options, workspace),
-      options.skipPackageJson ? noop() : addDependenciesToPackageJson(),
       mergeWith(
         apply(url('./files/src'), [
           options.minimal ? filter(minimalPathFilter) : noop(),
@@ -369,6 +373,7 @@ export default function (options: ApplicationOptions): Rule {
           move(sourceDir),
         ]), MergeStrategy.Overwrite),
       schematic('e2e', e2eOptions),
+      options.skipPackageJson ? noop() : addDependenciesToPackageJson(options),
     ]);
   };
 }
diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json
index 86d71341402c..0a6ab8ce7742 100644
--- a/packages/schematics/angular/application/schema.json
+++ b/packages/schematics/angular/application/schema.json
@@ -72,6 +72,11 @@
       "description": "Create a barebones project without any testing frameworks",
       "type": "boolean",
       "default": false
+    },
+    "skipInstall": {
+      "description": "Skip installing dependency packages.",
+      "type": "boolean",
+      "default": false
     }
   },
   "required": [
diff --git a/packages/schematics/angular/ng-new/index.ts b/packages/schematics/angular/ng-new/index.ts
index 7ce9e5e8f2a7..e71a83e5a917 100644
--- a/packages/schematics/angular/ng-new/index.ts
+++ b/packages/schematics/angular/ng-new/index.ts
@@ -55,6 +55,8 @@ export default function (options: NgNewOptions): Rule {
     style: options.style,
     skipTests: options.skipTests,
     skipPackageJson: false,
+    // always 'skipInstall' here, so that we do it after the move
+    skipInstall: true,
   };
 
   return chain([

From bd33f64f1bc17dce646e0f4cc9565d09a9ebeb4d Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 1 Nov 2018 04:57:44 +0100
Subject: [PATCH 0366/1703] Enable Webpack E2Es (#12735)

* test: enable webpack e2e tests

* refactor: remove redundant catch block

* fix(@ngtools/webpack): when stats is not available call callback with an error

Fixes #12686
---
 .../ngtools/webpack/src/virtual_file_system_decorator.ts | 9 +++++----
 tests/legacy-cli/e2e_runner.ts                           | 4 ----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/ngtools/webpack/src/virtual_file_system_decorator.ts b/packages/ngtools/webpack/src/virtual_file_system_decorator.ts
index 71525db88d57..853d13378072 100644
--- a/packages/ngtools/webpack/src/virtual_file_system_decorator.ts
+++ b/packages/ngtools/webpack/src/virtual_file_system_decorator.ts
@@ -26,12 +26,13 @@ export class VirtualFileSystemDecorator implements InputFileSystem {
   }
 
   stat(path: string, callback: (err: Error, stats: Stats) => void): void {
-    try {
+    const result = this._webpackCompilerHost.stat(path);
+    if (result) {
       // tslint:disable-next-line:no-any
-      callback(null as any, this._webpackCompilerHost.stat(path) as any);
-    } catch (e) {
+      callback(null as any, result);
+    } else {
       // tslint:disable-next-line:no-any
-      callback(e, undefined as any);
+      callback(new FileDoesNotExistException(path), undefined as any);
     }
   }
 
diff --git a/tests/legacy-cli/e2e_runner.ts b/tests/legacy-cli/e2e_runner.ts
index 0f2db025b2bf..da4c125f0ffe 100644
--- a/tests/legacy-cli/e2e_runner.ts
+++ b/tests/legacy-cli/e2e_runner.ts
@@ -124,10 +124,6 @@ const allTests = glob.sync(path.join(e2eRoot, testGlob), { nodir: true, ignore:
   .filter(name => !name.includes('tests/commands/new/'))
   // NEEDS devkit change
   .filter(name => !name.endsWith('/existing-directory.ts'))
-  // ngtools/webpack is now in devkit and needs to be tested there
-  .filter(name => !name.endsWith('/packages/webpack/server-ng5.ts'))
-  .filter(name => !name.endsWith('/packages/webpack/test-ng5.ts'))
-  .filter(name => !name.endsWith('/packages/webpack/weird-ng5.ts'))
   // Disabled on rc.0 due to needed sync with devkit for changes.
   .filter(name => !name.endsWith('/service-worker.ts'))
   .sort();

From ef6d76e4a9f0594141764eb4f7c562c10b7c916e Mon Sep 17 00:00:00 2001
From: Teamop <zhangwenlp@vip.qq.com>
Date: Thu, 25 Oct 2018 17:11:33 +0800
Subject: [PATCH 0367/1703] fix(@angular-devkit/build-angular): improve bundle
 size value displaying

---
 .../build_angular/src/angular-cli-files/utilities/stats.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/stats.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/stats.ts
index ebe40dd73a99..3a355b132444 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/stats.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/stats.ts
@@ -18,9 +18,9 @@ export function formatSize(size: number): string {
   }
 
   const abbreviations = ['bytes', 'kB', 'MB', 'GB'];
-  const index = Math.floor(Math.log(size) / Math.log(1000));
+  const index = Math.floor(Math.log(size) / Math.log(1024));
 
-  return `${+(size / Math.pow(1000, index)).toPrecision(3)} ${abbreviations[index]}`;
+  return `${+(size / Math.pow(1024, index)).toPrecision(3)} ${abbreviations[index]}`;
 }
 
 

From a1176986e4d94669bb43b916fe79816099d13719 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 25 Oct 2018 14:49:31 +0200
Subject: [PATCH 0368/1703] fix(@schematics/angular): order of `module`
 properties is inconsistent

Closes #12509
---
 .../__name@dasherize@if-flat__/__name@dasherize__.module.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__.module.ts b/packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__.module.ts
index 4a7237d766ec..3ba2010a36e9 100644
--- a/packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__.module.ts
+++ b/packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__.module.ts
@@ -4,10 +4,10 @@ import { CommonModule } from '@angular/common';<% } %><% if (routing) { %>
 import { <%= classify(name) %>RoutingModule } from './<%= dasherize(name) %>-routing.module';<% } %>
 
 @NgModule({
+  declarations: [],
   imports: [<% if (commonModule) { %>
     CommonModule<%= routing ? ',' : '' %><% } %><% if (routing) { %>
     <%= classify(name) %>RoutingModule<% } %>
-  ],
-  declarations: []
+  ]
 })
 export class <%= classify(name) %>Module { }

From 4b3d283bfa56cc1750aac5361aad0df1ced33e82 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@umich.edu>
Date: Thu, 25 Oct 2018 15:21:57 -0700
Subject: [PATCH 0369/1703] build: Add module_name for @schematics/angular

---
 packages/schematics/angular/BUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/schematics/angular/BUILD b/packages/schematics/angular/BUILD
index fc97c49508d9..e59f66353731 100644
--- a/packages/schematics/angular/BUILD
+++ b/packages/schematics/angular/BUILD
@@ -43,6 +43,7 @@ ts_library(
             "utility/test/**/*.ts"
         ],
     ),
+    module_name = "@schematics/angular",
     deps = ALL_SCHEMA_DEPS + [
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/schematics",

From 96be267815511a2a4aa63f04202618e596105cb9 Mon Sep 17 00:00:00 2001
From: Sibiraj <20282546+sibiraj-s@users.noreply.github.com>
Date: Fri, 26 Oct 2018 10:44:37 +0530
Subject: [PATCH 0370/1703] style: fix indentation in tslint.json

---
 .../library/files/__projectRoot__/tslint.json | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/schematics/angular/library/files/__projectRoot__/tslint.json b/packages/schematics/angular/library/files/__projectRoot__/tslint.json
index 20341240eecf..ad2f4a64bf8b 100644
--- a/packages/schematics/angular/library/files/__projectRoot__/tslint.json
+++ b/packages/schematics/angular/library/files/__projectRoot__/tslint.json
@@ -1,17 +1,17 @@
 {
-    "extends": "<%= relativePathToWorkspaceRoot %>/tslint.json",
-    "rules": {
-        "directive-selector": [
-            true,
-            "attribute",
-            "<%= prefix %>",
-            "camelCase"
-        ],
-        "component-selector": [
-            true,
-            "element",
-            "<%= prefix %>",
-            "kebab-case"
-        ]
-    }
+  "extends": "<%= relativePathToWorkspaceRoot %>/tslint.json",
+  "rules": {
+    "directive-selector": [
+      true,
+      "attribute",
+      "<%= prefix %>",
+      "camelCase"
+    ],
+    "component-selector": [
+      true,
+      "element",
+      "<%= prefix %>",
+      "kebab-case"
+    ]
+  }
 }

From 2bb26f197b9709f9608be7f6f3ba64a43efab9ce Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 1 Nov 2018 05:02:25 +0100
Subject: [PATCH 0371/1703] fix(@ngtools/webpack): print error message on new
 line (#12764)

* fix(@ngtools/webpack): print error message on new line

* fix(@angular/cli): change logger from `warning` to `fatal` for unkown options
---
 packages/angular/cli/models/architect-command.ts        | 2 +-
 packages/ngtools/webpack/src/angular_compiler_plugin.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index 5744061beaaa..bacff6da519b 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -143,7 +143,7 @@ export abstract class ArchitectCommand<
 
     if (overrides['--']) {
       (overrides['--'] || []).forEach(additional => {
-        this.logger.warn(`Unknown option: '${additional.split(/=/)[0]}'`);
+        this.logger.fatal(`Unknown option: '${additional.split(/=/)[0]}'`);
       });
 
       return 1;
diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 581fc5ba6fcd..ba47634abbc5 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -537,7 +537,7 @@ export class AngularCompilerPlugin {
       switch (message.kind) {
         case MESSAGE_KIND.Log:
           const logMessage = message as LogMessage;
-          this._logger.log(logMessage.level, logMessage.message);
+          this._logger.log(logMessage.level, `\n${logMessage.message}`);
           break;
         default:
           throw new Error(`TypeChecker: Unexpected message received: ${message}.`);

From 6e0b60df32369b8f6b84dd9735e6e73f6c3b28dc Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 1 Nov 2018 05:03:03 +0100
Subject: [PATCH 0372/1703]  fix(@angular/cli): errors and warnings are hard to
 read in windows cmd (#12767)

* fix(@angular-devkit/core): errors and warnings are hard to read in windows cmd

Closes #12755

* fix(@angular/cli): errors and warnings are hard to read in windows cmd

Closes #12755
---
 packages/angular/cli/lib/cli/index.ts           | 10 ++++------
 packages/angular_devkit/core/node/cli-logger.ts |  7 ++-----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/packages/angular/cli/lib/cli/index.ts b/packages/angular/cli/lib/cli/index.ts
index 02ddd62bc21e..b9d8fe00e171 100644
--- a/packages/angular/cli/lib/cli/index.ts
+++ b/packages/angular/cli/lib/cli/index.ts
@@ -81,19 +81,17 @@ function initializeLogging(logger: logging.Logger) {
           color = terminal.white;
           break;
         case 'warn':
-          color = terminal.yellow;
-          output = process.stderr;
-          break;
-        case 'error':
-          color = terminal.red;
+          color = (x: string) => terminal.bold(terminal.yellow(x));
           output = process.stderr;
           break;
         case 'fatal':
-          color = (x) => terminal.bold(terminal.red(x));
+        case 'error':
+          color = (x: string) => terminal.bold(terminal.red(x));
           output = process.stderr;
           break;
       }
 
+
       // If we do console.log(message) or process.stdout.write(message + '\n'), the process might
       // stop before the whole message is written and the stream is flushed. This happens when
       // streams are asynchronous.
diff --git a/packages/angular_devkit/core/node/cli-logger.ts b/packages/angular_devkit/core/node/cli-logger.ts
index 0cbbd4c1059e..6acadceb6ae4 100644
--- a/packages/angular_devkit/core/node/cli-logger.ts
+++ b/packages/angular_devkit/core/node/cli-logger.ts
@@ -32,13 +32,10 @@ export function createConsoleLogger(
           color = terminal.white;
           break;
         case 'warn':
-          color = terminal.yellow;
-          break;
-        case 'error':
-          color = terminal.red;
-          output = stderr;
+          color = (x: string) => terminal.bold(terminal.yellow(x));
           break;
         case 'fatal':
+        case 'error':
           color = (x: string) => terminal.bold(terminal.red(x));
           output = stderr;
           break;

From c891ab0723ca6b0ef72235f56cb29ffca8b1b931 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 29 Oct 2018 08:32:47 +0100
Subject: [PATCH 0373/1703] fix(@schematics/angular): minimal workspace leaves
 blank line in `package.json`

Fix #12778
---
 packages/schematics/angular/workspace/files/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/workspace/files/package.json b/packages/schematics/angular/workspace/files/package.json
index eace62698914..b1440a336451 100644
--- a/packages/schematics/angular/workspace/files/package.json
+++ b/packages/schematics/angular/workspace/files/package.json
@@ -28,8 +28,8 @@
     "@angular/cli": "<%= experimentalAngularNext ? 'next' : '~' + version %>",
     "@angular/compiler-cli": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
     "@angular/language-service": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
-    "@types/node": "~8.9.4",
-    <% if (!minimal) { %>"@types/jasmine": "~2.8.8",
+    "@types/node": "~8.9.4",<% if (!minimal) { %>
+    "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "~2.0.3",
     "codelyzer": "~4.5.0",
     "jasmine-core": "~2.99.1",

From 33781e1c19a0ee42ea3e38e8d889191df645849a Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 29 Oct 2018 09:06:55 +0100
Subject: [PATCH 0374/1703] docs: update descriptions for builders

---
 .../angular_devkit/build_angular/src/dev-server/schema.json   | 4 ++--
 packages/angular_devkit/build_angular/src/server/schema.json  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/dev-server/schema.json b/packages/angular_devkit/build_angular/src/dev-server/schema.json
index 78a3fa78859b..d7416676358e 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/schema.json
+++ b/packages/angular_devkit/build_angular/src/dev-server/schema.json
@@ -1,6 +1,6 @@
 {
-  "title": "Karma Target",
-  "description": "Karma target options for Build Facade.",
+  "title": "Dev Server Target",
+  "description": "Dev Server target options for Build Facade.",
   "type": "object",
   "properties": {
     "browserTarget": {
diff --git a/packages/angular_devkit/build_angular/src/server/schema.json b/packages/angular_devkit/build_angular/src/server/schema.json
index c81d4b25d7f4..119d4909b36c 100644
--- a/packages/angular_devkit/build_angular/src/server/schema.json
+++ b/packages/angular_devkit/build_angular/src/server/schema.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/schema",
   "id": "BuildAngularWebpackServerSchema",
-  "title": "Angular Webpack Architect Builder Schema",
+  "title": "Universal Target",
   "properties": {
     "main": {
       "type": "string",

From ba4265984818dd2b88a4291c273535b6f535d8dc Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 30 Oct 2018 10:04:22 +0100
Subject: [PATCH 0375/1703] refactor: fix english in update message

---
 packages/schematics/update/update/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/update/update/index.ts b/packages/schematics/update/update/index.ts
index e7a84e483cdb..4baf04372aa5 100644
--- a/packages/schematics/update/update/index.ts
+++ b/packages/schematics/update/update/index.ts
@@ -488,7 +488,7 @@ function _usageMessage(
 
   logger.info('\n');
   logger.info('There might be additional packages that are outdated.');
-  logger.info('Or run ng update --all to try to update all at the same time.\n');
+  logger.info('Run "ng update --all" to try to update all at the same time.\n');
 
   return of<void>(undefined);
 }

From 8bc8eca027bde278bc97f7e58b961a75328bbfec Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Tue, 30 Oct 2018 21:09:32 +0100
Subject: [PATCH 0376/1703] docs: remove UglifyJS mention

Now that https://github.com/angular/angular-cli/pull/11996 landed, the CLI uses Terser instead of UglifyJS.
---
 packages/angular_devkit/build_optimizer/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_optimizer/README.md b/packages/angular_devkit/build_optimizer/README.md
index ad15925c6a94..0a7b3236badb 100644
--- a/packages/angular_devkit/build_optimizer/README.md
+++ b/packages/angular_devkit/build_optimizer/README.md
@@ -11,7 +11,7 @@ Transformations applied depend on file content:
 - [Import tslib](#import-tslib): applied when TypeScript helpers are found.
 
 Some of these optimizations add `/*@__PURE__*/` comments.
-These are used by [UglifyJS](https://github.com/mishoo/UglifyJS2) to identify pure functions that can potentially be dropped.
+These are used by JS optimization tools to identify pure functions that can potentially be dropped.
 
 
 ### Class fold

From 99c01786580dd42603f34c7d546c0c8bf4fd03c2 Mon Sep 17 00:00:00 2001
From: Majid Hajian <mhadaily@gmail.com>
Date: Tue, 30 Oct 2018 22:30:01 +0100
Subject: [PATCH 0377/1703] docs: production build configuration for app-shell

ng run <Project>:app-shell will not trigger production build, to trigger production build, we should explicitly pass it as an argument.
---
 docs/documentation/stories/app-shell.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/documentation/stories/app-shell.md b/docs/documentation/stories/app-shell.md
index 2428f65b2f65..2709de187f36 100644
--- a/docs/documentation/stories/app-shell.md
+++ b/docs/documentation/stories/app-shell.md
@@ -48,7 +48,12 @@ build with the app shell target
 ```
 ng run my-app:app-shell
 ```
+If you would like to build for production you should run the following command
+```
+ng run my-app:app-shell:production
+ng run my-app:app-shell --configuration production
+```
 
 Verify the build output
-Open dist/app-shell/index.html
+Open dist/index.html
 look for text "app-shell works!" which verifies that the app shell route was rendered as part of the output

From db784ec1f4721eafc309cd8e238260fc0fdb0649 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 31 Oct 2018 09:42:30 +0000
Subject: [PATCH 0378/1703] fix(@angular-devkit/build-optimizer): update
 typescript to 3.1.5

Fix #12773
---
 .../build_optimizer/package.json              |    2 +-
 yarn.lock                                     | 1428 +++++++++++++++++
 2 files changed, 1429 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_optimizer/package.json b/packages/angular_devkit/build_optimizer/package.json
index 7dd4920aa4ef..1c74bfd53abf 100644
--- a/packages/angular_devkit/build_optimizer/package.json
+++ b/packages/angular_devkit/build_optimizer/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "loader-utils": "1.1.0",
     "source-map": "0.5.6",
-    "typescript": "3.1.3",
+    "typescript": "3.1.5",
     "webpack-sources": "1.2.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index b99e5365e8f2..6a8231f76d65 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5,24 +5,28 @@
 "@angular/animations@^7.0.0-rc.0":
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.0.1.tgz#2df561c0959e156985297e69b7c30614537b4ffe"
+  integrity sha512-gRirN4Maduh198VhpI1cLoWCtD/BTQT4lPuwiVkHYaradiwEqPlyE+EP/4QZRmFZH+BqwvjS+FYtICznE668Cg==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/cdk@^6.1.0":
   version "6.4.7"
   resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-6.4.7.tgz#1549b304dd412e82bd854cc55a7d5c6772ee0411"
+  integrity sha512-18x0U66fLD5kGQWZ9n3nb75xQouXlWs7kUDaTd8HTrHpT1s2QIAqlLd1KxfrYiVhsEC2jPQaoiae7VnBlcvkBg==
   dependencies:
     tslib "^1.7.1"
 
 "@angular/common@^7.0.0-rc.0":
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.0.1.tgz#55750879f08d5f4b6f247f7dce0b5ea2b3ec2059"
+  integrity sha512-QnGwwM6+OLuzu0VZvzQMPENJQgOMmcjZC1vxWu5y62fPI3BsTDYaePOAEN6mfY8R09J90FmF2IXXC5DN/el0Ug==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/compiler-cli@^7.0.0-rc.0":
   version "7.0.0-rc.0"
   resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.0.0-rc.0.tgz#59f37f2409ce896cb73daa221dbd898855d12939"
+  integrity sha512-Nkd5UgSt0NHVLE/U3FIUmSJxGW47+9B4hfR5oDhC7gkUNaRQzi+PzzVYj7jOdDJjgHV+Y0KS3msiXWhUSY4gpw==
   dependencies:
     canonical-path "0.0.2"
     chokidar "^1.4.2"
@@ -38,24 +42,28 @@
 "@angular/compiler@^7.0.0-rc.0":
   version "7.0.0-rc.0"
   resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.0.0-rc.0.tgz#2dfd293ad6583f9574c9fe79354256206f594a51"
+  integrity sha512-ifVqB/xJtSzOlk8B39Ld2wMbYni6Ey7s5jc+u/0NMtdut+2Q61Ar+TKjJZ3vmta3df7QqHX5JcP0W6qICRHJ+w==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/core@^7.0.0-rc.0":
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.0.1.tgz#42f52bf04bf88759d4f4b9e03cb9b312508233a0"
+  integrity sha512-u/3Xx+tIddVC1wANjK1F102uG8fQrNd4Y9nlz3vtKcnFX66b2SQlnjWd18L8FmzYtzaI44RxSWWTPQB0eTx1xw==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/http@^7.0.0-rc.0":
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.0.1.tgz#54df0b7c6a5234d45a386bad81a64e0f1e85d666"
+  integrity sha512-3W5k5cSj9qj8jVU1EgtGKCxVcP1SH/LB5X34oVjtIEZBAESC8ZT1sYr+AvZLFs8Bw0EmqzQJ/hA2PziUZ2jsUw==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/material@^6.1.0":
   version "6.4.7"
   resolved "https://registry.yarnpkg.com/@angular/material/-/material-6.4.7.tgz#3c8f2d6a6a7904d97be29e06a84ffb62a8da6c16"
+  integrity sha512-SdNx7Xovi24Kw9eU6lkLhY/7f2M7L9F+/uh6XuPr4jbGgCUVVpeeVI5ztZhsZRbj1sN+/r1p5w8u62apWWl5Ww==
   dependencies:
     tslib "^1.7.1"
   optionalDependencies:
@@ -64,18 +72,21 @@
 "@angular/platform-browser-dynamic@^7.0.0-rc.0":
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.0.1.tgz#bf50a90573bc49e00e4bb8c08f6dee888f553e04"
+  integrity sha512-9pn+1lSxXXq6swrlAHlyufcy7sGolQklyrHm79kr6RXnl/hwEvxuFZQ+ki3bihdcUt9sgu3uPrw4I0a5TtzGhQ==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-browser@^7.0.0-rc.0":
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.0.1.tgz#d9638cb6592543018b96355a0119fc826ab5e27e"
+  integrity sha512-rGD9c6GN1oDdwy2FkcGKV11Pj3BFKGvnKByawv3S7DutrSgSF4LO529CFiGD0eMTCh2C/yzufC8pXngPj/XHUA==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/platform-server@^7.0.0-rc.0":
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.0.1.tgz#f284fbf90832a9fdefbba871faa50cec337822e2"
+  integrity sha512-XErcbHe/JMNIjJfhgfjLuWB0VkU262SLyziLNXn2VNnlQNxX4Km22c6CJgp190R1TvJqOYNW4G+qC+FFKtTmhA==
   dependencies:
     domino "^2.1.0"
     tslib "^1.9.0"
@@ -84,24 +95,28 @@
 "@angular/router@^7.0.0-rc.0":
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.0.1.tgz#2085466c47a8efad576b4310db191c3e338cacef"
+  integrity sha512-1HhTsbwZYxXLgfd6g9Ok2UQjtRBttSaBkWdRM5hbisl3nMnnNOGEMF/B4/UrRQ7phqbUw4eKniUcZm/7UbK7EA==
   dependencies:
     tslib "^1.9.0"
 
 "@angular/service-worker@^7.0.0-rc.0":
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.0.1.tgz#773ad7e758e29a5ad8b5627636480a4c2d74568f"
+  integrity sha512-0gVCEEbV0GAZKFkLc/9oSNSzTeaB3oXUM3iskDdIM0542lRWMeOZXKV+UJHhVrJ2rJ4nB+cdN/Te7Yd0zPOZ8g==
   dependencies:
     tslib "^1.9.0"
 
 "@babel/code-frame@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
+  integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
   dependencies:
     "@babel/highlight" "^7.0.0"
 
 "@babel/generator@^7.0.0", "@babel/generator@^7.1.3":
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.1.3.tgz#2103ec9c42d9bdad9190a6ad5ff2d456fd7b8673"
+  integrity sha512-ZoCZGcfIJFJuZBqxcY9OjC1KW2lWK64qrX1o4UYL3yshVhwKFYgzpWZ0vvtGMNJdTlvkw0W+HR1VnYN8q3QPFQ==
   dependencies:
     "@babel/types" "^7.1.3"
     jsesc "^2.5.1"
@@ -112,6 +127,7 @@
 "@babel/helper-function-name@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
+  integrity sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==
   dependencies:
     "@babel/helper-get-function-arity" "^7.0.0"
     "@babel/template" "^7.1.0"
@@ -120,18 +136,21 @@
 "@babel/helper-get-function-arity@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
+  integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@babel/helper-split-export-declaration@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
+  integrity sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@babel/highlight@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
+  integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
   dependencies:
     chalk "^2.0.0"
     esutils "^2.0.2"
@@ -140,10 +159,12 @@
 "@babel/parser@^7.0.0", "@babel/parser@^7.1.2", "@babel/parser@^7.1.3":
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.3.tgz#2c92469bac2b7fbff810b67fca07bd138b48af77"
+  integrity sha512-gqmspPZOMW3MIRb9HlrnbZHXI1/KHTOroBwN1NcLL6pWxzqzEKGvRTq0W/PxS45OtQGbaFikSQpkS5zbnsQm2w==
 
 "@babel/template@^7.0.0", "@babel/template@^7.1.0":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.1.2.tgz#090484a574fef5a2d2d7726a674eceda5c5b5644"
+  integrity sha512-SY1MmplssORfFiLDcOETrW7fCLl+PavlwMh92rrGcikQaRq4iWPVH0MpwPpY3etVMx6RnDjXtr6VZYr/IbP/Ag==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/parser" "^7.1.2"
@@ -152,6 +173,7 @@
 "@babel/traverse@^7.0.0":
   version "7.1.4"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.1.4.tgz#f4f83b93d649b4b2c91121a9087fa2fa949ec2b4"
+  integrity sha512-my9mdrAIGdDiSVBuMjpn/oXYpva0/EZwWL3sm3Wcy/AVWO2eXnsoZruOT9jOGNRXU8KbCIu5zsKnXcAJ6PcV6Q==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@babel/generator" "^7.1.3"
@@ -166,6 +188,7 @@
 "@babel/types@^7.0.0", "@babel/types@^7.1.2", "@babel/types@^7.1.3":
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.1.3.tgz#3a767004567060c2f40fca49a304712c525ee37d"
+  integrity sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==
   dependencies:
     esutils "^2.0.2"
     lodash "^4.17.10"
@@ -174,6 +197,7 @@
 "@bazel/karma@^0.20.3":
   version "0.20.3"
   resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.20.3.tgz#a63bb82b4887ae8c0d01f3028c6fa4764470851d"
+  integrity sha512-IgWfTpK9XLEI977DS2kHIEO1QfFTEOBxeNDDjHtd1onmzyMCLROphTOBZ/g42ybUIWyJhS9DK4U3bLSMQE0Bng==
   dependencies:
     jasmine-core "2.8.0"
     karma alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a
@@ -189,6 +213,7 @@
 "@bazel/typescript@0.20.3":
   version "0.20.3"
   resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.20.3.tgz#51dcc369c2af0d7f2311d6e692d07776492060f4"
+  integrity sha512-BZmfzaNkgS++53CGEUk5p9FXOG+k8FNWCDbxzYljoIGP60aIkw4UgRQ24ReBwhCMg6M6KW609yje7AvDZkA6bg==
   dependencies:
     protobufjs "5.0.3"
     source-map-support "0.5.9"
@@ -198,14 +223,17 @@
 "@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"
+  integrity sha1-w6DFRNYjkqzCgTpCyKDcb1j4aSI=
 
 "@sindresorhus/is@^0.7.0":
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
+  integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
 
 "@types/body-parser@*":
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.0.tgz#9f5c9d9bd04bb54be32d5eb9fc0d8c974e6cf58c"
+  integrity sha512-a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w==
   dependencies:
     "@types/connect" "*"
     "@types/node" "*"
@@ -213,16 +241,19 @@
 "@types/caseless@*":
   version "0.12.1"
   resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.1.tgz#9794c69c8385d0192acc471a540d1f8e0d16218a"
+  integrity sha512-FhlMa34NHp9K5MY1Uz8yb+ZvuX0pnvn3jScRSNAb75KHGB8d3rEU6hqMs3Z2vjuytcMfRg6c5CHMc3wtYyD2/A==
 
 "@types/connect@*":
   version "3.4.32"
   resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.32.tgz#aa0e9616b9435ccad02bc52b5b454ffc2c70ba28"
+  integrity sha512-4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==
   dependencies:
     "@types/node" "*"
 
 "@types/copy-webpack-plugin@^4.4.1":
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/@types/copy-webpack-plugin/-/copy-webpack-plugin-4.4.2.tgz#6dfac0dc8692378f76a20c6c1bbe01eec438f316"
+  integrity sha512-/L0m5kc7pKGpsu97TTgAP6YcVRmau2Wj0HpRPQBGEbZXT1DZkdozZPCZHGDWXpxcvWDFTxob2JmYJj3RC7CwFA==
   dependencies:
     "@types/minimatch" "*"
     "@types/webpack" "*"
@@ -230,14 +261,17 @@
 "@types/estree@0.0.39":
   version "0.0.39"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
+  integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
 "@types/events@*":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
+  integrity sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==
 
 "@types/express-serve-static-core@*":
   version "4.16.0"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.16.0.tgz#fdfe777594ddc1fe8eb8eccce52e261b496e43e7"
+  integrity sha512-lTeoCu5NxJU4OD9moCgm0ESZzweAx0YqsAcab6OB0EB3+As1OaHtKnaGJvcngQxYsi9UNv0abn4/DRavrRxt4w==
   dependencies:
     "@types/events" "*"
     "@types/node" "*"
@@ -246,6 +280,7 @@
 "@types/express@*", "@types/express@^4.16.0":
   version "4.16.0"
   resolved "https://registry.yarnpkg.com/@types/express/-/express-4.16.0.tgz#6d8bc42ccaa6f35cf29a2b7c3333cb47b5a32a19"
+  integrity sha512-TtPEYumsmSTtTetAPXlJVf3kEqb6wZK0bZojpJQrnD/djV4q1oB6QQ8aKvKqwNPACoe02GNiy5zDzcYivR5Z2w==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "*"
@@ -254,12 +289,14 @@
 "@types/form-data@*":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@types/form-data/-/form-data-2.2.1.tgz#ee2b3b8eaa11c0938289953606b745b738c54b1e"
+  integrity sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ==
   dependencies:
     "@types/node" "*"
 
 "@types/glob@^5.0.35":
   version "5.0.35"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.35.tgz#1ae151c802cece940443b5ac246925c85189f32a"
+  integrity sha512-wc+VveszMLyMWFvXLkloixT4n0harUIVZjnpzztaZ0nKLuul7Z32iMt2fUFGAaZ4y1XWjFRMtCI5ewvyh4aIeg==
   dependencies:
     "@types/events" "*"
     "@types/minimatch" "*"
@@ -268,6 +305,7 @@
 "@types/http-proxy-middleware@*":
   version "0.17.5"
   resolved "https://registry.yarnpkg.com/@types/http-proxy-middleware/-/http-proxy-middleware-0.17.5.tgz#efdeb4be652744422d57929f3c4ea31a2e627a45"
+  integrity sha512-mUqVzfaiOknDT2QJ7g8f2c37G4ZDqDNt08QdUkFCu19Ey5+2SZ0rWHMG00GRJ7g+SgHvl/9weZYuWLXr7RgiCg==
   dependencies:
     "@types/connect" "*"
     "@types/http-proxy" "*"
@@ -277,6 +315,7 @@
 "@types/http-proxy@*":
   version "1.16.2"
   resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.16.2.tgz#16cb373b52fff2aa2f389d23d940ed4a642349e5"
+  integrity sha512-GgqePmC3rlsn1nv+kx5OviPuUBU2omhnlXOaJSXFgOdsTcScNFap+OaCb2ip9Bm4m5L8EOehgT5d9M4uNB90zg==
   dependencies:
     "@types/events" "*"
     "@types/node" "*"
@@ -284,6 +323,7 @@
 "@types/inquirer@^0.0.42":
   version "0.0.42"
   resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-0.0.42.tgz#2310fd8623053bead72247adae416aa32bacdf0c"
+  integrity sha512-flMaNWU2g9NrtZ4bIV+7SEY2W7OdWNNhmJ0rE1lWVxGrkp3TfFGMcFCxRIBmGWigI8e6n+2HqLjizTTfgcpHLg==
   dependencies:
     "@types/rx" "*"
     "@types/through" "*"
@@ -291,14 +331,17 @@
 "@types/istanbul@^0.4.30":
   version "0.4.30"
   resolved "https://registry.yarnpkg.com/@types/istanbul/-/istanbul-0.4.30.tgz#073159320ab3296b2cfeb481f756a1f8f4c9c8e4"
+  integrity sha512-+hQU4fh2G96ze78uI5/V6+SRDZD1UnVrFn23i2eDetwfbBq3s0/zYP92xj/3qyvVMM3WnvS88N56zjz+HmL04A==
 
 "@types/jasmine@^2.8.8":
   version "2.8.8"
   resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.8.tgz#bf53a7d193ea8b03867a38bfdb4fbb0e0bf066c9"
+  integrity sha512-OJSUxLaxXsjjhob2DBzqzgrkLmukM3+JMpRp0r0E4HTdT1nwDCWhaswjYxazPij6uOdzHCJfNbDjmQ1/rnNbCg==
 
 "@types/loader-utils@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@types/loader-utils/-/loader-utils-1.1.3.tgz#82b9163f2ead596c68a8c03e450fbd6e089df401"
+  integrity sha512-euKGFr2oCB3ASBwG39CYJMR3N9T0nanVqXdiH7Zu/Nqddt6SmFRxytq/i2w9LQYNQekEtGBz+pE3qG6fQTNvRg==
   dependencies:
     "@types/node" "*"
     "@types/webpack" "*"
@@ -306,38 +349,47 @@
 "@types/mime@*":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.0.tgz#5a7306e367c539b9f6543499de8dd519fac37a8b"
+  integrity sha512-A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA==
 
 "@types/minimatch@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
 "@types/minimist@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6"
+  integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
 
 "@types/node@*":
   version "10.9.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897"
+  integrity sha512-fCHV45gS+m3hH17zgkgADUSi2RR1Vht6wOZ0jyHP8rjiQra9f+mIcgwPQHllmDocYOstIEbKlxbFDYlgrTPYqw==
 
 "@types/node@8.10.10":
   version "8.10.10"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.10.tgz#fec07bc2ad549d9e6d2f7aa0fb0be3491b83163a"
+  integrity sha512-p3W/hFzQs76RlYRIZsZc5a9bht6m0TspmWYYbKhRswmLnwj9fsE40EbuGifeu/XWR/c0UJQ1DDbvTxIsm/OOAA==
 
 "@types/node@^6.0.46":
   version "6.14.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.0.tgz#85c6998293fc6f2945915419296c7fbb63384f66"
+  integrity sha512-6tQyh4Q4B5pECcXBOQDZ5KjyBIxRZGzrweGPM47sAYTdVG4+7R+2EGMTmp0h6ZwgqHrFRCeg2gdhsG9xXEl2Sg==
 
 "@types/q@^0.0.32":
   version "0.0.32"
   resolved "http://registry.npmjs.org/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
+  integrity sha1-vShOV8hPEyXacCur/IKlMoGQwMU=
 
 "@types/range-parser@*":
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.2.tgz#fa8e1ad1d474688a757140c91de6dace6f4abc8d"
+  integrity sha512-HtKGu+qG1NPvYe1z7ezLsyIaXYyi8SoAVqWDZgDQ8dLrsZvSzUNCwZyfX33uhWxL/SU0ZDQZ3nwZ0nimt507Kw==
 
 "@types/request@^2.47.1":
   version "2.47.1"
   resolved "https://registry.yarnpkg.com/@types/request/-/request-2.47.1.tgz#25410d3afbdac04c91a94ad9efc9824100735824"
+  integrity sha512-TV3XLvDjQbIeVxJ1Z3oCTDk/KuYwwcNKVwz2YaT0F5u86Prgc4syDAp6P96rkTQQ4bIdh+VswQIC9zS6NjY7/g==
   dependencies:
     "@types/caseless" "*"
     "@types/form-data" "*"
@@ -347,70 +399,82 @@
 "@types/rx-core-binding@*":
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/@types/rx-core-binding/-/rx-core-binding-4.0.4.tgz#d969d32f15a62b89e2862c17b3ee78fe329818d3"
+  integrity sha512-5pkfxnC4w810LqBPUwP5bg7SFR/USwhMSaAeZQQbEHeBp57pjKXRlXmqpMrLJB4y1oglR/c2502853uN0I+DAQ==
   dependencies:
     "@types/rx-core" "*"
 
 "@types/rx-core@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-core/-/rx-core-4.0.3.tgz#0b3354b1238cedbe2b74f6326f139dbc7a591d60"
+  integrity sha1-CzNUsSOM7b4rdPYybxOdvHpZHWA=
 
 "@types/rx-lite-aggregates@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-aggregates/-/rx-lite-aggregates-4.0.3.tgz#6efb2b7f3d5f07183a1cb2bd4b1371d7073384c2"
+  integrity sha512-MAGDAHy8cRatm94FDduhJF+iNS5//jrZ/PIfm+QYw9OCeDgbymFHChM8YVIvN2zArwsRftKgE33QfRWvQk4DPg==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-async@*":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-async/-/rx-lite-async-4.0.2.tgz#27fbf0caeff029f41e2d2aae638b05e91ceb600c"
+  integrity sha512-vTEv5o8l6702ZwfAM5aOeVDfUwBSDOs+ARoGmWAKQ6LOInQ8J4/zjM7ov12fuTpktUKdMQjkeCp07Vd73mPkxw==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-backpressure@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-backpressure/-/rx-lite-backpressure-4.0.3.tgz#05abb19bdf87cc740196c355e5d0b37bb50b5d56"
+  integrity sha512-Y6aIeQCtNban5XSAF4B8dffhIKu6aAy/TXFlScHzSxh6ivfQBQw6UjxyEJxIOt3IT49YkS+siuayM2H/Q0cmgA==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-coincidence@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-coincidence/-/rx-lite-coincidence-4.0.3.tgz#80bd69acc4054a15cdc1638e2dc8843498cd85c0"
+  integrity sha512-1VNJqzE9gALUyMGypDXZZXzR0Tt7LC9DdAZQ3Ou/Q0MubNU35agVUNXKGHKpNTba+fr8GdIdkC26bRDqtCQBeQ==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-experimental@*":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-experimental/-/rx-lite-experimental-4.0.1.tgz#c532f5cbdf3f2c15da16ded8930d1b2984023cbd"
+  integrity sha1-xTL1y98/LBXaFt7Ykw0bKYQCPL0=
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-joinpatterns@*":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-joinpatterns/-/rx-lite-joinpatterns-4.0.1.tgz#f70fe370518a8432f29158cc92ffb56b4e4afc3e"
+  integrity sha1-9w/jcFGKhDLykVjMkv+1a05K/D4=
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-testing@*":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-testing/-/rx-lite-testing-4.0.1.tgz#21b19d11f4dfd6ffef5a9d1648e9c8879bfe21e9"
+  integrity sha1-IbGdEfTf1v/vWp0WSOnIh5v+Iek=
   dependencies:
     "@types/rx-lite-virtualtime" "*"
 
 "@types/rx-lite-time@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-time/-/rx-lite-time-4.0.3.tgz#0eda65474570237598f3448b845d2696f2dbb1c4"
+  integrity sha512-ukO5sPKDRwCGWRZRqPlaAU0SKVxmWwSjiOrLhoQDoWxZWg6vyB9XLEZViKOzIO6LnTIQBlk4UylYV0rnhJLxQw==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-virtualtime@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-virtualtime/-/rx-lite-virtualtime-4.0.3.tgz#4b30cacd0fe2e53af29f04f7438584c7d3959537"
+  integrity sha512-3uC6sGmjpOKatZSVHI2xB1+dedgml669ZRvqxy+WqmGJDVusOdyxcKfyzjW0P3/GrCiN4nmRkLVMhPwHCc5QLg==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite@*":
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/@types/rx-lite/-/rx-lite-4.0.5.tgz#b3581525dff69423798daa9a0d33c1e66a5e8c4c"
+  integrity sha512-KZk5XTR1dm/kNgBx8iVpjno6fRYtAUQWBOmj+O8j724+nk097sz4fOoHJNpCkOJUtHUurZlJC7QvSFCZHbkC+w==
   dependencies:
     "@types/rx-core" "*"
     "@types/rx-core-binding" "*"
@@ -418,6 +482,7 @@
 "@types/rx@*":
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/@types/rx/-/rx-4.1.1.tgz#598fc94a56baed975f194574e0f572fd8e627a48"
+  integrity sha1-WY/JSla67ZdfGUV04PVy/Y5iekg=
   dependencies:
     "@types/rx-core" "*"
     "@types/rx-core-binding" "*"
@@ -435,14 +500,17 @@
 "@types/selenium-webdriver@^3.0.0":
   version "3.0.12"
   resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.12.tgz#6affe5aed1ba379175075a889adbe2bc3aa62159"
+  integrity sha512-hYn+eoOehVUIdMwp5h34ZsGAO1ydja10GDup4BwyoFCdcH5MQ35nQq+AInSaBMEMopD5hEooFCyKo2Pajbe1ag==
 
 "@types/semver@^5.5.0":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
+  integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==
 
 "@types/serve-static@*":
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.2.tgz#f5ac4d7a6420a99a6a45af4719f4dcd8cd907a48"
+  integrity sha512-/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q==
   dependencies:
     "@types/express-serve-static-core" "*"
     "@types/mime" "*"
@@ -450,28 +518,34 @@
 "@types/source-list-map@*":
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
+  integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
 "@types/source-map@0.5.2":
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.5.2.tgz#973459e744cc7445c85b97f770275b479b138e08"
+  integrity sha512-++w4WmMbk3dS3UeHGzAG+xJOSz5Xqtjys/TBkqG3qp3SeWE7Wwezqe5eB7B51cxUyh4PW7bwVotpsLdBK0D8cw==
 
 "@types/tapable@*":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.4.tgz#b4ffc7dc97b498c969b360a41eee247f82616370"
+  integrity sha512-78AdXtlhpCHT0K3EytMpn4JNxaf5tbqbLcbIRoQIHzpTIyjpxLQKRoxU55ujBXAtg3Nl2h/XWvfDa9dsMOd0pQ==
 
 "@types/through@*":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/through/-/through-0.0.29.tgz#72943aac922e179339c651fa34a4428a4d722f93"
+  integrity sha512-9a7C5VHh+1BKblaYiq+7Tfc+EOmjMdZaD1MYtkQjSoxgB69tBjW98ry6SKsi4zEIWztLOMRuL87A3bdT/Fc/4w==
   dependencies:
     "@types/node" "*"
 
 "@types/tough-cookie@*":
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-2.3.3.tgz#7f226d67d654ec9070e755f46daebf014628e9d9"
+  integrity sha512-MDQLxNFRLasqS4UlkWMSACMKeSm1x4Q3TxzUC7KQUsh6RK1ZrQ0VEyE3yzXcBu+K8ejVj4wuX32eUG02yNp+YQ==
 
 "@types/uglify-js@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.0.3.tgz#801a5ca1dc642861f47c46d14b700ed2d610840b"
+  integrity sha512-MAT0BW2ruO0LhQKjvlipLGCF/Yx0y/cj+tT67tK3QIQDrM2+9R78HgJ54VlrE8AbfjYJJBCQCEPM5ZblPVTuww==
   dependencies:
     source-map "^0.6.1"
 
@@ -482,6 +556,7 @@
 "@types/webpack-dev-server@^3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-3.1.0.tgz#1fae06ad346d2dd09bc5e34745723946458eed58"
+  integrity sha512-nutifgcFiPP3I/+mPWlZCsQNKpWNUGm6qjAMfleZuPfPfybXWymHvlcYsKvg+NPedSkrNh0vu2xKAlak/l+pOg==
   dependencies:
     "@types/express" "*"
     "@types/http-proxy-middleware" "*"
@@ -491,6 +566,7 @@
 "@types/webpack-sources@^0.1.5":
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-0.1.5.tgz#be47c10f783d3d6efe1471ff7f042611bd464a92"
+  integrity sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==
   dependencies:
     "@types/node" "*"
     "@types/source-list-map" "*"
@@ -499,6 +575,7 @@
 "@types/webpack@*", "@types/webpack@^4.4.11":
   version "4.4.11"
   resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.4.11.tgz#0ca832870d55c4e92498c01d22d00d02b0f62ae9"
+  integrity sha512-NdESmbpvVEtJgs15kyZYKr5ouLYPMYt9DNG5JEgCekbG/ezFLPCzf4XcAv8caOb+b7x6ieAuSt0eoR0UkSI7RA==
   dependencies:
     "@types/node" "*"
     "@types/tapable" "*"
@@ -508,6 +585,7 @@
 "@webassemblyjs/ast@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.8.tgz#f31f480debeef957f01b623f27eabc695fa4fe8f"
+  integrity sha512-dOrtdtEyB8sInpl75yLPNksY4sRl0j/+t6aHyB/YA+ab9hV3Fo7FmG12FHzP+2MvWVAJtDb+6eXR5EZbZJ+uVg==
   dependencies:
     "@webassemblyjs/helper-module-context" "1.7.8"
     "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
@@ -516,36 +594,44 @@
 "@webassemblyjs/floating-point-hex-parser@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.8.tgz#1b3ed0e27e384032254e9322fc646dd3e70ef1b9"
+  integrity sha512-kn2zNKGsbql5i56VAgRYkpG+VazqHhQQZQycT2uXAazrAEDs23gy+Odkh5VblybjnwX2/BITkDtNmSO76hdIvQ==
 
 "@webassemblyjs/helper-api-error@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.8.tgz#a2b49c11f615e736f815ec927f035dcfa690d572"
+  integrity sha512-xUwxDXsd1dUKArJEP5wWM5zxgCSwZApSOJyP1XO7M8rNUChUDblcLQ4FpzTpWG2YeylMwMl1MlP5Ztryiz1x4g==
 
 "@webassemblyjs/helper-buffer@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.8.tgz#3fc66bfa09c1c60e824cf3d5887826fac062877d"
+  integrity sha512-WXiIMnuvuwlhWvVOm8xEXU9DnHaa3AgAU0ZPfvY8vO1cSsmYb2WbGbHnMLgs43vXnA7XAob9b56zuZaMkxpCBg==
 
 "@webassemblyjs/helper-code-frame@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.8.tgz#cc5a7e9522b70e7580df056dfd34020cf29645b0"
+  integrity sha512-TLQxyD9qGOIdX5LPQOPo0Ernd88U5rHkFb8WAjeMIeA0sPjCHeVPaGqUGGIXjUcblUkjuDAc07bruCcNHUrHDA==
   dependencies:
     "@webassemblyjs/wast-printer" "1.7.8"
 
 "@webassemblyjs/helper-fsm@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.8.tgz#fe4607430af466912797c21acafd3046080182ea"
+  integrity sha512-TjK0CnD8hAPkV5mbSp5aWl6SO1+H3WFcjWtixWoy8EMA99YnNzYhpc/WSYWhf7yrhpzkq5tZB0tvLK3Svr3IXA==
 
 "@webassemblyjs/helper-module-context@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.8.tgz#3c2e7ee93d14ff4768ba66fb1be42fdc9dc7160a"
+  integrity sha512-uCutAKR7Nm0VsFixcvnB4HhAyHouNbj0Dx1p7eRjFjXGGZ+N7ftTaG1ZbWCasAEbtwGj54LP8+lkBZdTCPmLGg==
 
 "@webassemblyjs/helper-wasm-bytecode@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.8.tgz#89bdb78cd6dd5209ae2ed2925de78d0f0e00b6f0"
+  integrity sha512-AdCCE3BMW6V34WYaKUmPgVHa88t2Z14P4/0LjLwuGkI0X6pf7nzp0CehzVVk51cKm2ymVXjl9dCG+gR1yhITIQ==
 
 "@webassemblyjs/helper-wasm-section@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.8.tgz#c68ef7d26a6fc12421b2e6e56f9bc810dfb33e87"
+  integrity sha512-BkBhYQuzyl4hgTGOKo87Vdw6f9nj8HhI7WYpI0MCC5qFa5ahrAPOGgyETVdnRbv+Rjukl9MxxfDmVcVC435lDg==
   dependencies:
     "@webassemblyjs/ast" "1.7.8"
     "@webassemblyjs/helper-buffer" "1.7.8"
@@ -555,22 +641,26 @@
 "@webassemblyjs/ieee754@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.8.tgz#1f37974b13cb486a9237e73ce04cac7a2f1265ed"
+  integrity sha512-tOarWChdG1a3y1yqCX0JMDKzrat5tQe4pV6K/TX19BcXsBLYxFQOL1DEDa5KG9syeyvCrvZ+i1+Mv1ExngvktQ==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
 "@webassemblyjs/leb128@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.8.tgz#1bee83426819192db2ea1a234b84c7ebc6d34c1f"
+  integrity sha512-GCYeGPgUFWJiZuP4NICbcyUQNxNLJIf476Ei+K+jVuuebtLpfvwkvYT6iTUE7oZYehhkor4Zz2g7SJ/iZaPudQ==
   dependencies:
     "@xtuc/long" "4.2.1"
 
 "@webassemblyjs/utf8@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.8.tgz#2b489d5cf43e0aebb93d8e2d792aff9879c61f05"
+  integrity sha512-9X+f0VV+xNXW2ujfIRSXBJENGE6Qh7bNVKqu3yDjTFB3ar3nsThsGBBKdTG58aXOm2iUH6v28VIf88ymPXODHA==
 
 "@webassemblyjs/wasm-edit@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.8.tgz#f8bdbe7088718eca27b1c349bb7c06b8a457950c"
+  integrity sha512-6D3Hm2gFixrfyx9XjSON4ml1FZTugqpkIz5Awvrou8fnpyprVzcm4X8pyGRtA2Piixjl3DqmX/HB1xdWyE097A==
   dependencies:
     "@webassemblyjs/ast" "1.7.8"
     "@webassemblyjs/helper-buffer" "1.7.8"
@@ -584,6 +674,7 @@
 "@webassemblyjs/wasm-gen@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.8.tgz#7e8abf1545eae74ac6781d545c034af3cfd0c7d5"
+  integrity sha512-a7O/wE6eBeVKKUYgpMK7NOHmMADD85rSXLe3CqrWRDwWff5y3cSVbzpN6Qv3z6C4hdkpq9qyij1Ga1kemOZGvQ==
   dependencies:
     "@webassemblyjs/ast" "1.7.8"
     "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
@@ -594,6 +685,7 @@
 "@webassemblyjs/wasm-opt@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.8.tgz#7ada6e211914728fce02ff0ff9c344edc6d41f26"
+  integrity sha512-3lbQ0PT81NHCdi1sR/7+SNpZadM4qYcTSr62nFFAA7e5lFwJr14M1Gi+A/Y3PgcDWOHYjsaNGPpPU0H03N6Blg==
   dependencies:
     "@webassemblyjs/ast" "1.7.8"
     "@webassemblyjs/helper-buffer" "1.7.8"
@@ -603,6 +695,7 @@
 "@webassemblyjs/wasm-parser@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.8.tgz#dac47c291fb6a3e63529aecd647592cd34afbf94"
+  integrity sha512-rZ/zlhp9DHR/05zh1MbAjT2t624sjrPP/OkJCjXqzm7ynH+nIdNcn9Ixc+qzPMFXhIrk0rBoQ3to6sEIvHh9jQ==
   dependencies:
     "@webassemblyjs/ast" "1.7.8"
     "@webassemblyjs/helper-api-error" "1.7.8"
@@ -614,6 +707,7 @@
 "@webassemblyjs/wast-parser@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.8.tgz#f8aab9a450c048c1f9537695c89faeb92fabfba5"
+  integrity sha512-Q/zrvtUvzWuSiJMcSp90fi6gp2nraiHXjTV2VgAluVdVapM4gy1MQn7akja2p6eSBDQpKJPJ6P4TxRkghRS5dg==
   dependencies:
     "@webassemblyjs/ast" "1.7.8"
     "@webassemblyjs/floating-point-hex-parser" "1.7.8"
@@ -625,6 +719,7 @@
 "@webassemblyjs/wast-printer@1.7.8":
   version "1.7.8"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.8.tgz#e7e965782c1912f6a965f14a53ff43d8ad0403a5"
+  integrity sha512-GllIthRtwTxRDAURRNXscu7Napzmdf1jt1gpiZiK/QN4fH0lSGs3OTmvdfsMNP7tqI4B3ZtfaaWRlNIQug6Xyg==
   dependencies:
     "@webassemblyjs/ast" "1.7.8"
     "@webassemblyjs/wast-parser" "1.7.8"
@@ -633,14 +728,17 @@
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
 
 "@xtuc/long@4.2.1":
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
+  integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
 
 JSONStream@^1.0.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.4.tgz#615bb2adb0cd34c8f4c447b5f6512fa1d8f16a2e"
+  integrity sha512-Y7vfi3I5oMOYIr+WxV8NZxDSwcbNgzdKYsTNInmycOq9bUYwGg9ryu57Wg5NLmCjqdFPNUmpMBo3kSJN9tCbXg==
   dependencies:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
@@ -648,6 +746,7 @@ JSONStream@^1.0.4:
 JSONStream@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
+  integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
   dependencies:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
@@ -655,14 +754,17 @@ JSONStream@^1.3.4:
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
 abbrev@1.0.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
+  integrity sha1-kbR5JYinc4wl813W9jdSovh3YTU=
 
 accepts@~1.3.4, accepts@~1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
+  integrity sha1-63d99gEXI6OxTopywIBcjoZ0a9I=
   dependencies:
     mime-types "~2.1.18"
     negotiator "0.6.1"
@@ -670,48 +772,58 @@ accepts@~1.3.4, accepts@~1.3.5:
 acorn-dynamic-import@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
+  integrity sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==
   dependencies:
     acorn "^5.0.0"
 
 acorn@^5.0.0, acorn@^5.6.2:
   version "5.7.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
+  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
 addressparser@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/addressparser/-/addressparser-1.0.1.tgz#47afbe1a2a9262191db6838e4fd1d39b40821746"
+  integrity sha1-R6++GiqSYhkdtoOOT9HTm0CCF0Y=
 
 adm-zip@^0.4.9, adm-zip@~0.4.3:
   version "0.4.11"
   resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.11.tgz#2aa54c84c4b01a9d0fb89bb11982a51f13e3d62a"
+  integrity sha512-L8vcjDTCOIJk7wFvmlEUN7AsSb8T+2JrdP7KINBjzr24TJ5Mwj590sLu3BC7zNZowvJWa/JtPmD8eJCzdtDWjA==
 
 after@0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
+  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
 
 agent-base@4, agent-base@^4.1.0, agent-base@^4.2.0, agent-base@~4.2.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
+  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
   dependencies:
     es6-promisify "^5.0.0"
 
 agentkeepalive@^3.4.1:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67"
+  integrity sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==
   dependencies:
     humanize-ms "^1.2.1"
 
 ajv-errors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.0.tgz#ecf021fa108fd17dfb5e6b383f2dd233e31ffc59"
+  integrity sha1-7PAh+hCP0X37Xms4Py3SM+Mf/Fk=
 
 ajv-keywords@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
+  integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
 
 ajv@6.5.3:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9"
+  integrity sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
@@ -721,6 +833,7 @@ ajv@6.5.3:
 ajv@^5.0.0, ajv@^5.1.0, ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
   dependencies:
     co "^4.6.0"
     fast-deep-equal "^1.0.0"
@@ -730,6 +843,7 @@ ajv@^5.0.0, ajv@^5.1.0, ajv@^5.3.0:
 ajv@^6.1.0:
   version "6.5.4"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.4.tgz#247d5274110db653706b550fcc2b797ca28cfc59"
+  integrity sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
@@ -739,10 +853,12 @@ ajv@^6.1.0:
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
 amqplib@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/amqplib/-/amqplib-0.5.2.tgz#d2d7313c7ffaa4d10bcf1e6252de4591b6cc7b63"
+  integrity sha512-l9mCs6LbydtHqRniRwYkKdqxVa6XMz3Vw1fh+2gJaaVgTM6Jk3o8RccAKWKtlhT1US5sWrFh+KKxsVUALURSIA==
   dependencies:
     bitsyntax "~0.0.4"
     bluebird "^3.4.6"
@@ -753,42 +869,51 @@ amqplib@^0.5.2:
 ansi-align@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f"
+  integrity sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=
   dependencies:
     string-width "^2.0.0"
 
 ansi-colors@^3.0.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.1.tgz#9638047e4213f3428a11944a7d4b31cba0a3ff95"
+  integrity sha512-Xt+zb6nqgvV9SWAVp0EG3lRsHcbq5DDgqjPPz6pwgtj6RKz65zGXMNa82oJfOSBA/to6GmRP7Dr+6o+kbApTzQ==
 
 ansi-escapes@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
+  integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==
 
 ansi-html@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
+  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
 
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
 ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
 
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
 
 anymatch@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
+  integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==
   dependencies:
     micromatch "^2.1.5"
     normalize-path "^2.0.0"
@@ -796,6 +921,7 @@ anymatch@^1.3.0:
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
   dependencies:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
@@ -803,20 +929,24 @@ anymatch@^2.0.0:
 app-root-path@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.1.0.tgz#98bf6599327ecea199309866e8140368fd2e646a"
+  integrity sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo=
 
 append-transform@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab"
+  integrity sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==
   dependencies:
     default-require-extensions "^2.0.0"
 
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
 archiver-utils@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-1.3.0.tgz#e50b4c09c70bf3d680e32ff1b7994e9f9d895174"
+  integrity sha1-5QtMCccL89aA4y/xt5lOn52JUXQ=
   dependencies:
     glob "^7.0.0"
     graceful-fs "^4.1.0"
@@ -828,6 +958,7 @@ archiver-utils@^1.3.0:
 archiver@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/archiver/-/archiver-2.1.1.tgz#ff662b4a78201494a3ee544d3a33fe7496509ebc"
+  integrity sha1-/2YrSnggFJSj7lRNOjP+dJZQnrw=
   dependencies:
     archiver-utils "^1.3.0"
     async "^2.0.0"
@@ -841,6 +972,7 @@ archiver@2.1.1:
 are-we-there-yet@~1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
@@ -848,80 +980,98 @@ are-we-there-yet@~1.1.2:
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
 arr-diff@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
   dependencies:
     arr-flatten "^1.0.1"
 
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
 arr-flatten@^1.0.1, arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
 arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
 array-find-index@^1.0.1, array-find-index@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
 
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
 
 array-flatten@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296"
+  integrity sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=
 
 array-ify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
+  integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=
 
 array-slice@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
+  integrity sha1-3Tz7gO15c6dRF82sabC5nshhhvU=
 
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
   dependencies:
     array-uniq "^1.0.1"
 
 array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
 array-unique@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
 
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
 arraybuffer.slice@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
+  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
 
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
 asap@^2.0.0, asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
 ascli@~1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ascli/-/ascli-1.0.1.tgz#bcfa5974a62f18e81cabaeb49732ab4a88f906bc"
+  integrity sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=
   dependencies:
     colour "~0.7.1"
     optjs "~3.2.2"
@@ -929,6 +1079,7 @@ ascli@~1:
 asn1.js@^4.0.0:
   version "4.10.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
+  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
   dependencies:
     bn.js "^4.0.0"
     inherits "^2.0.1"
@@ -937,70 +1088,85 @@ asn1.js@^4.0.0:
 asn1@~0.2.3:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
   dependencies:
     safer-buffer "~2.1.0"
 
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
 assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
+  integrity sha1-104bh+ev/A24qttwIfP+SBAasjQ=
 
 assert@^1.1.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+  integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=
   dependencies:
     util "0.10.3"
 
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
 ast-types@0.x.x:
   version "0.11.6"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.6.tgz#4e2266c2658829aef3b40cc33ad599c4e9eb89ef"
+  integrity sha512-nHiuV14upVGl7MWwFUYbzJ6YlfwWS084CU9EA8HajfYQjMSli5TQi3UTRygGF58LFWVkXxS1rbgRhROEqlQkXg==
 
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
+  integrity sha1-GdOGodntxufByF04iu28xW0zYC0=
 
 async-foreach@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
+  integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
 
 async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
+  integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
 
 async@1.x, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
 async@2.0.1:
   version "2.0.1"
   resolved "http://registry.npmjs.org/async/-/async-2.0.1.tgz#b709cc0280a9c36f09f4536be823c838a9049e25"
+  integrity sha1-twnMAoCpw28J9FNr6CPIOKkEniU=
   dependencies:
     lodash "^4.8.0"
 
 async@^2.0.0, async@^2.1.2, async@^2.5.0, async@^2.6.0, async@^2.6.1, async@~2.6.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
+  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
   dependencies:
     lodash "^4.17.10"
 
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
 atob@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 autoprefixer@9.1.5:
   version "9.1.5"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.1.5.tgz#8675fd8d1c0d43069f3b19a2c316f3524e4f6671"
+  integrity sha512-kk4Zb6RUc58ld7gdosERHMF3DzIYJc2fp5sX46qEsGXQQy5bXsu8qyLjoxuY1NuQ/cJuCYnx99BfjwnRggrYIw==
   dependencies:
     browserslist "^4.1.0"
     caniuse-lite "^1.0.30000884"
@@ -1012,6 +1178,7 @@ autoprefixer@9.1.5:
 autoprefixer@^9.0.0:
   version "9.3.1"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.3.1.tgz#71b622174de2b783d5fd99f9ad617b7a3c78443e"
+  integrity sha512-DY9gOh8z3tnCbJ13JIWaeQsoYncTGdsrgCceBaQSIL4nvdrLxgbRSBPevg2XbX7u4QCSfLheSJEEIUUSlkbx6Q==
   dependencies:
     browserslist "^4.3.3"
     caniuse-lite "^1.0.30000898"
@@ -1023,24 +1190,29 @@ autoprefixer@^9.0.0:
 aws-sign2@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+  integrity sha1-FDQt0428yU0OW4fXY81jYSwOeU8=
 
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.2.1, aws4@^1.6.0, aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
+  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
 axios@^0.15.3:
   version "0.15.3"
   resolved "http://registry.npmjs.org/axios/-/axios-0.15.3.tgz#2c9d638b2e191a08ea1d6cc988eadd6ba5bdc053"
+  integrity sha1-LJ1jiy4ZGgjqHWzJiOrda6W9wFM=
   dependencies:
     follow-redirects "1.0.0"
 
 babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
   dependencies:
     chalk "^1.1.3"
     esutils "^2.0.2"
@@ -1049,6 +1221,7 @@ babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
 babel-generator@^6.18.0:
   version "6.26.1"
   resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
+  integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==
   dependencies:
     babel-messages "^6.23.0"
     babel-runtime "^6.26.0"
@@ -1062,12 +1235,14 @@ babel-generator@^6.18.0:
 babel-messages@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=
   dependencies:
     babel-runtime "^6.22.0"
 
 babel-runtime@^6.22.0, babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.11.0"
@@ -1075,6 +1250,7 @@ babel-runtime@^6.22.0, babel-runtime@^6.26.0:
 babel-template@^6.16.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+  integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
   dependencies:
     babel-runtime "^6.26.0"
     babel-traverse "^6.26.0"
@@ -1085,6 +1261,7 @@ babel-template@^6.16.0:
 babel-traverse@^6.18.0, babel-traverse@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+  integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
   dependencies:
     babel-code-frame "^6.26.0"
     babel-messages "^6.23.0"
@@ -1099,6 +1276,7 @@ babel-traverse@^6.18.0, babel-traverse@^6.26.0:
 babel-types@^6.18.0, babel-types@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
   dependencies:
     babel-runtime "^6.26.0"
     esutils "^2.0.2"
@@ -1108,30 +1286,37 @@ babel-types@^6.18.0, babel-types@^6.26.0:
 babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
 
 backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
+  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
 
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
 base64-arraybuffer@0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
+  integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
 
 base64-js@^1.0.2:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
+  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
 
 base64id@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
+  integrity sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=
 
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
   dependencies:
     cache-base "^1.0.1"
     class-utils "^0.3.5"
@@ -1144,36 +1329,43 @@ base@^0.11.1:
 batch@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
+  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
 
 bcrypt-pbkdf@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
   dependencies:
     tweetnacl "^0.14.3"
 
 better-assert@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
+  integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=
   dependencies:
     callsite "1.0.0"
 
 big.js@^3.1.3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
+  integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
 
 binary-extensions@^1.0.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
+  integrity sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=
 
 bitsyntax@~0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/bitsyntax/-/bitsyntax-0.0.4.tgz#eb10cc6f82b8c490e3e85698f07e83d46e0cba82"
+  integrity sha1-6xDMb4K4xJDj6FaY8H6D1G4MuoI=
   dependencies:
     buffer-more-ints "0.0.2"
 
 bl@^1.0.0:
   version "1.2.2"
   resolved "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
+  integrity sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==
   dependencies:
     readable-stream "^2.3.5"
     safe-buffer "^5.1.1"
@@ -1181,36 +1373,43 @@ bl@^1.0.0:
 bl@~1.1.2:
   version "1.1.2"
   resolved "http://registry.npmjs.org/bl/-/bl-1.1.2.tgz#fdca871a99713aa00d19e3bbba41c44787a65398"
+  integrity sha1-/cqHGplxOqANGeO7ukHER4emU5g=
   dependencies:
     readable-stream "~2.0.5"
 
 blob@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
+  integrity sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=
 
 block-stream@*:
   version "0.0.9"
   resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
   dependencies:
     inherits "~2.0.0"
 
 blocking-proxy@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/blocking-proxy/-/blocking-proxy-1.0.1.tgz#81d6fd1fe13a4c0d6957df7f91b75e98dac40cb2"
+  integrity sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==
   dependencies:
     minimist "^1.2.0"
 
 bluebird@^3.3.0, bluebird@^3.4.6, bluebird@^3.5.1, bluebird@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a"
+  integrity sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
+  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
 
 body-parser@1.18.3, body-parser@^1.16.1:
   version "1.18.3"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
+  integrity sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=
   dependencies:
     bytes "3.0.0"
     content-type "~1.0.4"
@@ -1226,6 +1425,7 @@ body-parser@1.18.3, body-parser@^1.16.1:
 bonjour@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
+  integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU=
   dependencies:
     array-flatten "^2.1.0"
     deep-equal "^1.0.1"
@@ -1237,28 +1437,33 @@ bonjour@^3.5.0:
 boom@2.x.x:
   version "2.10.1"
   resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
+  integrity sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=
   dependencies:
     hoek "2.x.x"
 
 boom@4.x.x:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
+  integrity sha1-T4owBctKfjiJ90kDD9JbluAdLjE=
   dependencies:
     hoek "4.x.x"
 
 boom@5.x.x:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
+  integrity sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==
   dependencies:
     hoek "4.x.x"
 
 bootstrap@^4.0.0:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.3.tgz#0eb371af2c8448e8c210411d0cb824a6409a12be"
+  integrity sha512-rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w==
 
 boxen@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
+  integrity sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==
   dependencies:
     ansi-align "^2.0.0"
     camelcase "^4.0.0"
@@ -1271,6 +1476,7 @@ boxen@^1.2.1:
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -1278,12 +1484,14 @@ brace-expansion@^1.1.7:
 braces@^0.1.2:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/braces/-/braces-0.1.5.tgz#c085711085291d8b75fdd74eab0f8597280711e6"
+  integrity sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=
   dependencies:
     expand-range "^0.1.0"
 
 braces@^1.8.2:
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
   dependencies:
     expand-range "^1.8.1"
     preserve "^0.2.0"
@@ -1292,6 +1500,7 @@ braces@^1.8.2:
 braces@^2.3.0, braces@^2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
   dependencies:
     arr-flatten "^1.1.0"
     array-unique "^0.3.2"
@@ -1307,6 +1516,7 @@ braces@^2.3.0, braces@^2.3.1:
 brfs@^1.4.0:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.6.1.tgz#b78ce2336d818e25eea04a0947cba6d4fb8849c3"
+  integrity sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==
   dependencies:
     quote-stream "^1.0.1"
     resolve "^1.1.5"
@@ -1316,10 +1526,12 @@ brfs@^1.4.0:
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
   resolved "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
   dependencies:
     buffer-xor "^1.0.3"
     cipher-base "^1.0.0"
@@ -1331,6 +1543,7 @@ browserify-aes@^1.0.0, browserify-aes@^1.0.4:
 browserify-cipher@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
   dependencies:
     browserify-aes "^1.0.4"
     browserify-des "^1.0.0"
@@ -1339,6 +1552,7 @@ browserify-cipher@^1.0.0:
 browserify-des@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
+  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
   dependencies:
     cipher-base "^1.0.1"
     des.js "^1.0.0"
@@ -1348,6 +1562,7 @@ browserify-des@^1.0.0:
 browserify-rsa@^4.0.0:
   version "4.0.1"
   resolved "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
   dependencies:
     bn.js "^4.1.0"
     randombytes "^2.0.1"
@@ -1355,6 +1570,7 @@ browserify-rsa@^4.0.0:
 browserify-sign@^4.0.0:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
+  integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
   dependencies:
     bn.js "^4.1.1"
     browserify-rsa "^4.0.0"
@@ -1367,12 +1583,14 @@ browserify-sign@^4.0.0:
 browserify-zlib@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
   dependencies:
     pako "~1.0.5"
 
 browserslist@^4.0.0, browserslist@^4.1.0, browserslist@^4.3.3:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.4.tgz#4477b737db6a1b07077275b24791e680d4300425"
+  integrity sha512-u5iz+ijIMUlmV8blX82VGFrB9ecnUg5qEt55CMZ/YJEhha+d8qpBfOFuutJ6F/VKRXjZoD33b6uvarpPxcl3RA==
   dependencies:
     caniuse-lite "^1.0.30000899"
     electron-to-chromium "^1.3.82"
@@ -1381,16 +1599,19 @@ browserslist@^4.0.0, browserslist@^4.1.0, browserslist@^4.3.3:
 browserstack@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.5.1.tgz#e2dfa66ffee940ebad0a07f7e00fd4687c455d66"
+  integrity sha512-O8VMT64P9NOLhuIoD4YngyxBURefaSdR4QdhG8l6HZ9VxtU7jc3m6jLufFwKA5gaf7fetfB2TnRJnMxyob+heg==
   dependencies:
     https-proxy-agent "^2.2.1"
 
 buffer-alloc-unsafe@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
+  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
 
 buffer-alloc@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
+  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
   dependencies:
     buffer-alloc-unsafe "^1.1.0"
     buffer-fill "^1.0.0"
@@ -1398,34 +1619,42 @@ buffer-alloc@^1.2.0:
 buffer-crc32@^0.2.1:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
+  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
 
 buffer-equal@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"
+  integrity sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=
 
 buffer-fill@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
 
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
 buffer-indexof@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
+  integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
 
 buffer-more-ints@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/buffer-more-ints/-/buffer-more-ints-0.0.2.tgz#26b3885d10fa13db7fc01aae3aab870199e0124c"
+  integrity sha1-JrOIXRD6E9t/wBquOquHAZngEkw=
 
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
 
 buffer@^4.3.0:
   version "4.9.1"
   resolved "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
@@ -1434,6 +1663,7 @@ buffer@^4.3.0:
 buffer@^5.1.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.2.1.tgz#dd57fa0f109ac59c602479044dca7b8b3d0b71d6"
+  integrity sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
@@ -1441,6 +1671,7 @@ buffer@^5.1.0:
 buildmail@4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/buildmail/-/buildmail-4.0.1.tgz#877f7738b78729871c9a105e3b837d2be11a7a72"
+  integrity sha1-h393OLeHKYccmhBeO4N9K+EaenI=
   dependencies:
     addressparser "1.0.1"
     libbase64 "0.1.0"
@@ -1453,32 +1684,39 @@ buildmail@4.0.1:
 builtin-modules@^1.0.0, builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
 
 builtin-modules@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-2.0.0.tgz#60b7ef5ae6546bd7deefa74b08b62a43a232648e"
+  integrity sha512-3U5kUA5VPsRUA3nofm/BXX7GVHKfxz0hOBAPxXrIvHzlDRkQVqEn6yi8QJegxl4LzOHLdvb7XF5dVawa/VVYBg==
 
 builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
 builtins@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+  integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
 
 bytebuffer@~5:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd"
+  integrity sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=
   dependencies:
     long "~3"
 
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
 cacache@^10.0.4:
   version "10.0.4"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
+  integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==
   dependencies:
     bluebird "^3.5.1"
     chownr "^1.0.1"
@@ -1497,6 +1735,7 @@ cacache@^10.0.4:
 cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0:
   version "11.2.0"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.2.0.tgz#617bdc0b02844af56310e411c0878941d5739965"
+  integrity sha512-IFWl6lfK6wSeYCHUXh+N1lY72UDrpyrYQJNIVQf48paDuWbv5RbAtJYf/4gUQFObTCHZwdZ5sI8Iw7nqwP6nlQ==
   dependencies:
     bluebird "^3.5.1"
     chownr "^1.0.1"
@@ -1516,6 +1755,7 @@ cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0:
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
   dependencies:
     collection-visit "^1.0.0"
     component-emitter "^1.2.1"
@@ -1530,6 +1770,7 @@ cache-base@^1.0.1:
 cacheable-request@^2.1.1:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d"
+  integrity sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=
   dependencies:
     clone-response "1.0.2"
     get-stream "3.0.0"
@@ -1542,10 +1783,12 @@ cacheable-request@^2.1.1:
 callsite@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
+  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
 
 camelcase-keys@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
   dependencies:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
@@ -1553,6 +1796,7 @@ camelcase-keys@^2.0.0:
 camelcase-keys@^4.0.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
+  integrity sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=
   dependencies:
     camelcase "^4.1.0"
     map-obj "^2.0.0"
@@ -1561,38 +1805,47 @@ camelcase-keys@^4.0.0:
 camelcase@^2.0.0, camelcase@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
 
 camelcase@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
 
 camelcase@^4.0.0, camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
 caniuse-lite@^1.0.30000884, caniuse-lite@^1.0.30000898, caniuse-lite@^1.0.30000899:
   version "1.0.30000903"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000903.tgz#86d46227759279b3db345ddbe778335dbba9e858"
+  integrity sha512-T1XVJEpGCoaq7MDw7/6hCdYUukmSaS+1l/OQJkLtw7Cr2+/+d67tNGKEbyiqf7Ck8x6EhNFUxjYFXXka0N/w5g==
 
 canonical-path@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-0.0.2.tgz#e31eb937a8c93ee2a01df1839794721902874574"
+  integrity sha1-4x65N6jJPuKgHfGDl5RyGQKHRXQ=
 
 capture-stack-trace@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
+  integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==
 
 caseless@~0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
+  integrity sha1-cVuW6phBWTzDMGeSP17GDr2k99c=
 
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
 chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
   dependencies:
     ansi-styles "^2.2.1"
     escape-string-regexp "^1.0.2"
@@ -1603,6 +1856,7 @@ chalk@^1.1.1, chalk@^1.1.3:
 chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
+  integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
   dependencies:
     ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
@@ -1611,10 +1865,12 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1:
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
 chokidar@2.0.4, chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
+  integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.0"
@@ -1634,6 +1890,7 @@ chokidar@2.0.4, chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3:
 chokidar@^1.4.1, chokidar@^1.4.2:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
+  integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=
   dependencies:
     anymatch "^1.3.0"
     async-each "^1.0.0"
@@ -1649,20 +1906,24 @@ chokidar@^1.4.1, chokidar@^1.4.2:
 chownr@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
+  integrity sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=
 
 chrome-trace-event@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"
+  integrity sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==
   dependencies:
     tslib "^1.9.0"
 
 ci-info@^1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.5.1.tgz#17e8eb5de6f8b2b6038f0cbb714d410bfa9f3030"
+  integrity sha512-fKFIKXaYiL1exImwJ0AhR/6jxFPSKQBk2ayV5NiNoruUs2+rxC2kNw0EG+1Z9dugZRdCrppskQ8DN2cyaUM1Hw==
 
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -1670,18 +1931,22 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
 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"
+  integrity sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==
 
 circular-json@^0.5.4:
   version "0.5.8"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.8.tgz#40d2ff3aadee99871ebd19b41af3c9f113490003"
+  integrity sha512-VjaKMyZuVkL40usJkknJnmqQKpn2PkKS4M3/xdTRtZ0VsWl2Wbc2xdvXFXmEdmN6CKGqkm8XGyLHuFECZYEugw==
 
 circular-json@^0.5.5:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.9.tgz#932763ae88f4f7dead7a0d09c8a51a4743a53b1d"
+  integrity sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==
 
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
   dependencies:
     arr-union "^3.1.0"
     define-property "^0.2.5"
@@ -1691,26 +1956,31 @@ class-utils@^0.3.5:
 clean-css@4.2.1, clean-css@^4.1.11:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
+  integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==
   dependencies:
     source-map "~0.6.0"
 
 cli-boxes@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
+  integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM=
 
 cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
   dependencies:
     restore-cursor "^2.0.0"
 
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
+  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
 
 cliui@^3.0.3, cliui@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -1719,6 +1989,7 @@ cliui@^3.0.3, cliui@^3.2.0:
 cliui@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
+  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
   dependencies:
     string-width "^2.1.1"
     strip-ansi "^4.0.0"
@@ -1727,6 +1998,7 @@ cliui@^4.0.0:
 clone-deep@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
+  integrity sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==
   dependencies:
     for-own "^1.0.0"
     is-plain-object "^2.0.4"
@@ -1736,24 +2008,29 @@ clone-deep@^2.0.1:
 clone-response@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
+  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
   dependencies:
     mimic-response "^1.0.0"
 
 clone@^2.1.1, clone@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
 
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
 codelyzer@^4.2.1:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-4.5.0.tgz#a65ddeeeca2894653253a89bfa229118ff9f59b1"
+  integrity sha512-oO6vCkjqsVrEsmh58oNlnJkRXuA30hF8cdNAQV9DytEalDwyOFRvHMnlKFzmOStNerOmPGZU9GAHnBo4tGvtiQ==
   dependencies:
     app-root-path "^2.1.0"
     css-selector-tokenizer "^0.7.0"
@@ -1765,10 +2042,12 @@ codelyzer@^4.2.1:
 collection-utils@0.0.15:
   version "0.0.15"
   resolved "https://registry.yarnpkg.com/collection-utils/-/collection-utils-0.0.15.tgz#70f4c54299621699b3f38c66577c9d4284825125"
+  integrity sha512-eLGXa67rSilE5dNCcx2wenWcmmgl4QdlwUj1Z5idKkIBOhZh6PghEZFC3wP3AHH8xnMbIDsky0pR/+1epJBymQ==
 
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
   dependencies:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
@@ -1776,16 +2055,19 @@ collection-visit@^1.0.0:
 color-convert@^1.9.0, color-convert@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
     color-name "1.1.3"
 
 color-name@1.1.3, color-name@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
 color-string@^1.5.2:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc"
+  integrity sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==
   dependencies:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
@@ -1793,6 +2075,7 @@ color-string@^1.5.2:
 color@3.0.x:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/color/-/color-3.0.0.tgz#d920b4328d534a3ac8295d68f7bd4ba6c427be9a"
+  integrity sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==
   dependencies:
     color-convert "^1.9.1"
     color-string "^1.5.2"
@@ -1800,18 +2083,22 @@ color@3.0.x:
 colornames@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz#f8889030685c7c4ff9e2a559f5077eb76a816f96"
+  integrity sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=
 
 colors@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+  integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
 
 colors@^1.1.0, colors@^1.2.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.2.tgz#2df8ff573dfbf255af562f8ce7181d6b971a359b"
+  integrity sha512-rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ==
 
 colorspace@1.1.x:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.1.tgz#9ac2491e1bc6f8fb690e2176814f8d091636d972"
+  integrity sha512-pI3btWyiuz7Ken0BWh9Elzsmv2bM9AhA7psXib4anUXy/orfZ/E0MbQwhSOG/9L8hLlalqrU0UhOuqxW1YjmVw==
   dependencies:
     color "3.0.x"
     text-hex "1.0.x"
@@ -1819,52 +2106,63 @@ colorspace@1.1.x:
 colour@~0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/colour/-/colour-0.7.1.tgz#9cb169917ec5d12c0736d3e8685746df1cadf778"
+  integrity sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=
 
 combine-lists@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/combine-lists/-/combine-lists-1.0.1.tgz#458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"
+  integrity sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=
   dependencies:
     lodash "^4.5.0"
 
 combined-stream@1.0.6, combined-stream@~1.0.5, combined-stream@~1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
+  integrity sha1-cj599ugBrFYTETp+RFqbactjKBg=
   dependencies:
     delayed-stream "~1.0.0"
 
 combined-stream@^1.0.5, combined-stream@^1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
+  integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
   dependencies:
     delayed-stream "~1.0.0"
 
 commander@^2.12.0, commander@^2.9.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
+  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
 
 commander@^2.12.1:
   version "2.18.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
+  integrity sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==
 
 commander@~2.13.0:
   version "2.13.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
+  integrity sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==
 
 commander@~2.17.1:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
+  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
 
 common-tags@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
+  integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==
 
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
 compare-func@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648"
+  integrity sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=
   dependencies:
     array-ify "^1.0.0"
     dot-prop "^3.0.0"
@@ -1872,22 +2170,27 @@ compare-func@^1.3.1:
 compare-versions@^3.2.1:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.4.0.tgz#e0747df5c9cb7f054d6d3dc3e1dbc444f9e92b26"
+  integrity sha512-tK69D7oNXXqUW3ZNo/z7NXTEz22TCF0pTE+YF9cxvaAM9XnkLo1fV621xCLrRR6aevJlKxExkss0vWqUCUpqdg==
 
 component-bind@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
+  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
 
 component-emitter@1.2.1, component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
 
 component-inherit@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
+  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
 
 compress-commons@^1.2.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-1.2.2.tgz#524a9f10903f3a813389b0225d27c48bb751890f"
+  integrity sha1-UkqfEJA/OoEzibAiXSfEi7dRiQ8=
   dependencies:
     buffer-crc32 "^0.2.1"
     crc32-stream "^2.0.0"
@@ -1897,12 +2200,14 @@ compress-commons@^1.2.0:
 compressible@~2.0.14:
   version "2.0.15"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.15.tgz#857a9ab0a7e5a07d8d837ed43fe2defff64fe212"
+  integrity sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==
   dependencies:
     mime-db ">= 1.36.0 < 2"
 
 compression@^1.5.2:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db"
+  integrity sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==
   dependencies:
     accepts "~1.3.5"
     bytes "3.0.0"
@@ -1915,10 +2220,12 @@ compression@^1.5.2:
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
 concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@~1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
   dependencies:
     buffer-from "^1.0.0"
     inherits "^2.0.3"
@@ -1928,6 +2235,7 @@ concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@~1.6.0:
 configstore@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f"
+  integrity sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==
   dependencies:
     dot-prop "^4.1.0"
     graceful-fs "^4.1.2"
@@ -1939,10 +2247,12 @@ configstore@^3.0.0:
 connect-history-api-fallback@^1.3.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a"
+  integrity sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=
 
 connect@^3.6.0:
   version "3.6.6"
   resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
+  integrity sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=
   dependencies:
     debug "2.6.9"
     finalhandler "1.1.0"
@@ -1952,28 +2262,34 @@ connect@^3.6.0:
 console-browserify@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
+  integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=
   dependencies:
     date-now "^0.1.4"
 
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
 
 content-disposition@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
+  integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
 
 content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
 conventional-changelog-angular@^1.6.6:
   version "1.6.6"
   resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.6.6.tgz#b27f2b315c16d0a1f23eb181309d0e6a4698ea0f"
+  integrity sha512-suQnFSqCxRwyBxY68pYTsFkG0taIdinHLNEAX5ivtw8bCRnIgnpvcHmlR/yjUyZIrNPYAoXlY1WiEKWgSE4BNg==
   dependencies:
     compare-func "^1.3.1"
     q "^1.5.1"
@@ -1981,18 +2297,21 @@ conventional-changelog-angular@^1.6.6:
 conventional-changelog-atom@^0.2.8:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.2.8.tgz#8037693455990e3256f297320a45fa47ee553a14"
+  integrity sha512-8pPZqhMbrnltNBizjoDCb/Sz85KyUXNDQxuAEYAU5V/eHn0okMBVjqc8aHWYpHrytyZWvMGbayOlDv7i8kEf6g==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-codemirror@^0.3.8:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.8.tgz#a1982c8291f4ee4d6f2f62817c6b2ecd2c4b7b47"
+  integrity sha512-3HFZKtBXTaUCHvz7ai6nk2+psRIkldDoNzCsom0egDtVmPsvvHZkzjynhdQyULfacRSsBTaiQ0ol6nBOL4dDiQ==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-core@^2.0.11:
   version "2.0.11"
   resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-2.0.11.tgz#19b5fbd55a9697773ed6661f4e32030ed7e30287"
+  integrity sha512-HvTE6RlqeEZ/NFPtQeFLsIDOLrGP3bXYr7lFLMhCVsbduF1MXIe8OODkwMFyo1i9ku9NWBwVnVn0jDmIFXjDRg==
   dependencies:
     conventional-changelog-writer "^3.0.9"
     conventional-commits-parser "^2.1.7"
@@ -2011,36 +2330,42 @@ conventional-changelog-core@^2.0.11:
 conventional-changelog-ember@^0.3.12:
   version "0.3.12"
   resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.3.12.tgz#b7d31851756d0fcb49b031dffeb6afa93b202400"
+  integrity sha512-mmJzA7uzbrOqeF89dMMi6z17O07ORTXlTMArnLG9ZTX4oLaKNolUlxFUFlFm9JUoVWajVpaHQWjxH1EOQ+ARoQ==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-eslint@^1.0.9:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.9.tgz#b13cc7e4b472c819450ede031ff1a75c0e3d07d3"
+  integrity sha512-h87nfVh2fdk9fJIvz26wCBsbDC/KxqCc5wSlNMZbXcARtbgNbNDIF7Y7ctokFdnxkzVdaHsbINkh548T9eBA7Q==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-express@^0.3.6:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.3.6.tgz#4a6295cb11785059fb09202180d0e59c358b9c2c"
+  integrity sha512-3iWVtBJZ9RnRnZveNDzOD8QRn6g6vUif0qVTWWyi5nUIAbuN1FfPVyKdAlJJfp5Im+dE8Kiy/d2SpaX/0X678Q==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-jquery@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz#0208397162e3846986e71273b6c79c5b5f80f510"
+  integrity sha1-Agg5cWLjhGmG5xJztsecW1+A9RA=
   dependencies:
     q "^1.4.1"
 
 conventional-changelog-jscs@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz#0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c"
+  integrity sha1-BHnrRDzH1yxYvwvPDvHURKkvDlw=
   dependencies:
     q "^1.4.1"
 
 conventional-changelog-jshint@^0.3.8:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.8.tgz#9051c1ac0767abaf62a31f74d2fe8790e8acc6c8"
+  integrity sha512-hn9QU4ZI/5V50wKPJNPGT4gEWgiBFpV6adieILW4MaUFynuDYOvQ71EMSj3EznJyKi/KzuXpc9dGmX8njZMjig==
   dependencies:
     compare-func "^1.3.1"
     q "^1.5.1"
@@ -2048,10 +2373,12 @@ conventional-changelog-jshint@^0.3.8:
 conventional-changelog-preset-loader@^1.1.8:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.8.tgz#40bb0f142cd27d16839ec6c74ee8db418099b373"
+  integrity sha512-MkksM4G4YdrMlT2MbTsV2F6LXu/hZR0Tc/yenRrDIKRwBl/SP7ER4ZDlglqJsCzLJi4UonBc52Bkm5hzrOVCcw==
 
 conventional-changelog-writer@^3.0.9:
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-3.0.9.tgz#4aecdfef33ff2a53bb0cf3b8071ce21f0e994634"
+  integrity sha512-n9KbsxlJxRQsUnK6wIBRnARacvNnN4C/nxnxCkH+B/R1JS2Fa+DiP1dU4I59mEDEjgnFaN2+9wr1P1s7GYB5/Q==
   dependencies:
     compare-func "^1.3.1"
     conventional-commits-filter "^1.1.6"
@@ -2067,6 +2394,7 @@ conventional-changelog-writer@^3.0.9:
 conventional-changelog@^1.1.0:
   version "1.1.24"
   resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.24.tgz#3d94c29c960f5261c002678315b756cdd3d7d1f0"
+  integrity sha512-2WcSUst4Y3Z4hHvoMTWXMJr/DmgVdLiMOVY1Kak2LfFz+GIz2KDp5naqbFesYbfXPmaZ5p491dO0FWZIJoJw1Q==
   dependencies:
     conventional-changelog-angular "^1.6.6"
     conventional-changelog-atom "^0.2.8"
@@ -2083,6 +2411,7 @@ conventional-changelog@^1.1.0:
 conventional-commits-filter@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.1.6.tgz#4389cd8e58fe89750c0b5fb58f1d7f0cc8ad3831"
+  integrity sha512-KcDgtCRKJCQhyk6VLT7zR+ZOyCnerfemE/CsR3iQpzRRFbLEs0Y6rwk3mpDvtOh04X223z+1xyJ582Stfct/0Q==
   dependencies:
     is-subset "^0.1.1"
     modify-values "^1.0.0"
@@ -2090,6 +2419,7 @@ conventional-commits-filter@^1.1.6:
 conventional-commits-parser@^2.1.7:
   version "2.1.7"
   resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz#eca45ed6140d72ba9722ee4132674d639e644e8e"
+  integrity sha512-BoMaddIEJ6B4QVMSDu9IkVImlGOSGA1I2BQyOZHeLQ6qVOJLcLKn97+fL6dGbzWEiqDzfH4OkcveULmeq2MHFQ==
   dependencies:
     JSONStream "^1.0.4"
     is-text-path "^1.0.0"
@@ -2102,6 +2432,7 @@ conventional-commits-parser@^2.1.7:
 conventional-commits-parser@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.0.tgz#7f604549a50bd8f60443fbe515484b1c2f06a5c4"
+  integrity sha512-GWh71U26BLWgMykCp+VghZ4s64wVbtseECcKQ/PvcPZR2cUnz+FUc2J9KjxNl7/ZbCxST8R03c9fc+Vi0umS9Q==
   dependencies:
     JSONStream "^1.0.4"
     is-text-path "^1.0.0"
@@ -2114,20 +2445,24 @@ conventional-commits-parser@^3.0.0:
 convert-source-map@^1.5.0, convert-source-map@^1.5.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
+  integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
   dependencies:
     safe-buffer "~5.1.1"
 
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
 
 cookie@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
 
 copy-concurrently@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
   dependencies:
     aproba "^1.1.1"
     fs-write-stream-atomic "^1.0.8"
@@ -2139,10 +2474,12 @@ copy-concurrently@^1.0.0:
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 copy-webpack-plugin@4.5.4:
   version "4.5.4"
   resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.4.tgz#f2b2782b3cd5225535c3dc166a80067e7d940f27"
+  integrity sha512-0lstlEyj74OAtYMrDxlNZsU7cwFijAI3Ofz2fD6Mpo9r4xCv4yegfa3uHIKvZY1NSuOtE9nvG6TAhJ+uz9gDaQ==
   dependencies:
     cacache "^10.0.4"
     find-cache-dir "^1.0.0"
@@ -2156,18 +2493,22 @@ copy-webpack-plugin@4.5.4:
 core-js@^2.2.0, core-js@^2.4.0, core-js@^2.4.1:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
+  integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==
 
 core-js@~2.3.0:
   version "2.3.0"
   resolved "http://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"
+  integrity sha1-+rg/uwstjchfpjbEudNMdUIMbWU=
 
 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"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
 cosmiconfig@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
+  integrity sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==
   dependencies:
     is-directory "^0.3.1"
     js-yaml "^3.9.0"
@@ -2177,6 +2518,7 @@ cosmiconfig@^4.0.0:
 crc32-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-2.0.0.tgz#e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"
+  integrity sha1-483TtN8xaN10494/u8t7KX/pCPQ=
   dependencies:
     crc "^3.4.4"
     readable-stream "^2.0.0"
@@ -2184,12 +2526,14 @@ crc32-stream@^2.0.0:
 crc@^3.4.4:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6"
+  integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==
   dependencies:
     buffer "^5.1.0"
 
 create-ecdh@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
+  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
   dependencies:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
@@ -2197,12 +2541,14 @@ create-ecdh@^4.0.0:
 create-error-class@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
+  integrity sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=
   dependencies:
     capture-stack-trace "^1.0.0"
 
 create-hash@^1.1.0, create-hash@^1.1.2:
   version "1.2.0"
   resolved "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
   dependencies:
     cipher-base "^1.0.1"
     inherits "^2.0.1"
@@ -2213,6 +2559,7 @@ create-hash@^1.1.0, create-hash@^1.1.2:
 create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
   version "1.1.7"
   resolved "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
   dependencies:
     cipher-base "^1.0.3"
     create-hash "^1.1.0"
@@ -2224,6 +2571,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
 cross-spawn@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
+  integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI=
   dependencies:
     lru-cache "^4.0.1"
     which "^1.2.9"
@@ -2231,6 +2579,7 @@ cross-spawn@^3.0.0:
 cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
   dependencies:
     lru-cache "^4.0.1"
     shebang-command "^1.2.0"
@@ -2239,6 +2588,7 @@ cross-spawn@^5.0.1:
 cross-spawn@^6.0.0:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
   dependencies:
     nice-try "^1.0.4"
     path-key "^2.0.1"
@@ -2249,18 +2599,21 @@ cross-spawn@^6.0.0:
 cryptiles@2.x.x:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
+  integrity sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=
   dependencies:
     boom "2.x.x"
 
 cryptiles@3.x.x:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
+  integrity sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=
   dependencies:
     boom "5.x.x"
 
 crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
   dependencies:
     browserify-cipher "^1.0.0"
     browserify-sign "^4.0.0"
@@ -2277,14 +2630,17 @@ crypto-browserify@^3.11.0:
 crypto-random-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
+  integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=
 
 css-parse@1.7.x:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
+  integrity sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=
 
 css-selector-tokenizer@^0.7.0:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz#a177271a8bca5019172f4f891fc6eed9cbf68d5d"
+  integrity sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==
   dependencies:
     cssesc "^0.1.0"
     fastparse "^1.1.1"
@@ -2293,96 +2649,115 @@ css-selector-tokenizer@^0.7.0:
 cssauron@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/cssauron/-/cssauron-1.4.0.tgz#a6602dff7e04a8306dc0db9a551e92e8b5662ad8"
+  integrity sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=
   dependencies:
     through X.X.X
 
 cssesc@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
+  integrity sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=
 
 cuint@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
+  integrity sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=
 
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
   dependencies:
     array-find-index "^1.0.1"
 
 custom-event@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
+  integrity sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=
 
 cyclist@~0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
+  integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
 
 dargs@^4.0.1:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
+  integrity sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=
   dependencies:
     number-is-nan "^1.0.0"
 
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
   dependencies:
     assert-plus "^1.0.0"
 
 data-uri-to-buffer@1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz#77163ea9c20d8641b4707e8f18abdf9a78f34835"
+  integrity sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ==
 
 date-format@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"
+  integrity sha1-YV6CjiM90aubua4JUODOzPpuytg=
 
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
+  integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
 
 dateformat@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
+  integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
 debug@*:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
+  integrity sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==
   dependencies:
     ms "^2.1.1"
 
 debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@~2.6.4, debug@~2.6.6:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
 debug@3.1.0, debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
   dependencies:
     ms "2.0.0"
 
 debug@^3.1.0:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.4.tgz#82123737c51afbe9609a2b5dfe9664e7487171f0"
+  integrity sha512-fCEG5fOr7m/fhgOD3KurdAov706JbXZJYXAsAOEJ7GgasGr0GO4N+1NsIcrjlIUcyvJ9oZlnelTzN3Ix8z1ecw==
   dependencies:
     ms "^2.1.1"
 
 debug@^3.2.5:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
   dependencies:
     ms "^2.1.1"
 
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
 
 decamelize-keys@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
+  integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
   dependencies:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
@@ -2390,38 +2765,46 @@ decamelize-keys@^1.0.0:
 decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
 decamelize@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
+  integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==
   dependencies:
     xregexp "4.0.0"
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 decompress-response@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
+  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
   dependencies:
     mimic-response "^1.0.0"
 
 deep-equal@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
+  integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
 
 deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
 default-gateway@^2.6.0:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f"
+  integrity sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==
   dependencies:
     execa "^0.10.0"
     ip-regex "^2.1.0"
@@ -2429,24 +2812,28 @@ default-gateway@^2.6.0:
 default-require-extensions@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
+  integrity sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=
   dependencies:
     strip-bom "^3.0.0"
 
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
   dependencies:
     is-descriptor "^0.1.0"
 
 define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
   dependencies:
     is-descriptor "^1.0.0"
 
 define-property@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
   dependencies:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
@@ -2454,6 +2841,7 @@ define-property@^2.0.2:
 degenerator@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-1.0.4.tgz#fcf490a37ece266464d9cc431ab98c5819ced095"
+  integrity sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=
   dependencies:
     ast-types "0.x.x"
     escodegen "1.x.x"
@@ -2462,6 +2850,7 @@ degenerator@^1.0.4:
 del@^2.2.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
+  integrity sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=
   dependencies:
     globby "^5.0.0"
     is-path-cwd "^1.0.0"
@@ -2474,6 +2863,7 @@ del@^2.2.0:
 del@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
+  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
   dependencies:
     globby "^6.1.0"
     is-path-cwd "^1.0.0"
@@ -2485,22 +2875,27 @@ del@^3.0.0:
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
 depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
 dependency-graph@^0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.7.2.tgz#91db9de6eb72699209d88aea4c1fd5221cac1c49"
+  integrity sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==
 
 des.js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
+  integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=
   dependencies:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
@@ -2508,24 +2903,29 @@ des.js@^1.0.0:
 destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
 detect-indent@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+  integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg=
   dependencies:
     repeating "^2.0.0"
 
 detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
 
 detect-node@^2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
+  integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
 
 dezalgo@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
   dependencies:
     asap "^2.0.0"
     wrappy "1"
@@ -2533,10 +2933,12 @@ dezalgo@^1.0.0:
 di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
+  integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=
 
 diagnostics@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.1.1.tgz#cab6ac33df70c9d9a727490ae43ac995a769b22a"
+  integrity sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==
   dependencies:
     colorspace "1.1.x"
     enabled "1.0.x"
@@ -2545,10 +2947,12 @@ diagnostics@^1.1.1:
 diff@^3.1.0, diff@^3.2.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
 
 diffie-hellman@^5.0.0:
   version "5.0.3"
   resolved "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
   dependencies:
     bn.js "^4.1.0"
     miller-rabin "^4.0.0"
@@ -2557,6 +2961,7 @@ diffie-hellman@^5.0.0:
 dir-glob@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
+  integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==
   dependencies:
     arrify "^1.0.1"
     path-type "^3.0.0"
@@ -2564,10 +2969,12 @@ dir-glob@^2.0.0:
 dns-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
+  integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
 
 dns-packet@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
+  integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
   dependencies:
     ip "^1.1.0"
     safe-buffer "^5.0.1"
@@ -2575,12 +2982,14 @@ dns-packet@^1.3.1:
 dns-txt@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
+  integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=
   dependencies:
     buffer-indexof "^1.0.0"
 
 dom-serialize@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
+  integrity sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=
   dependencies:
     custom-event "~1.0.0"
     ent "~2.2.0"
@@ -2590,40 +2999,48 @@ dom-serialize@^2.2.0:
 domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
 domino@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.0.tgz#653ba7d331441113b42e40ba05f24253ec86e02e"
+  integrity sha512-xINSODvrnuQcm3eXJN4IkBR+JxqLrJN8Ge4fd00y1b7HsY0A4huKN5BflSS/oo8quBWmocTfWdFvrw2H8TjGqQ==
 
 dot-prop@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
+  integrity sha1-G3CK8JSknJoOfbyteQq6U52sEXc=
   dependencies:
     is-obj "^1.0.0"
 
 dot-prop@^4.1.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
+  integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==
   dependencies:
     is-obj "^1.0.0"
 
 double-ended-queue@^2.1.0-0:
   version "2.1.0-0"
   resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
+  integrity sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw=
 
 duplexer2@~0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
+  integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=
   dependencies:
     readable-stream "^2.0.2"
 
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
+  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
 
 duplexify@^3.4.2, duplexify@^3.6.0:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.1.tgz#b1a7a29c4abfd639585efaecce80d666b1e34125"
+  integrity sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==
   dependencies:
     end-of-stream "^1.0.0"
     inherits "^2.0.1"
@@ -2633,6 +3050,7 @@ duplexify@^3.4.2, duplexify@^3.6.0:
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
   dependencies:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
@@ -2640,14 +3058,17 @@ ecc-jsbn@~0.1.1:
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 electron-to-chromium@^1.3.82:
   version "1.3.82"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.82.tgz#7d13ae4437d2a783de3f4efba96b186c540b67b1"
+  integrity sha512-NI4nB2IWGcU4JVT1AE8kBb/dFor4zjLHMLsOROPahppeHrR0FG5uslxMmkp/thO1MvPjM2xhlKoY29/I60s0ew==
 
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
+  integrity sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"
@@ -2660,32 +3081,38 @@ elliptic@^6.0.0:
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
 
 enabled@1.0.x:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz#965f6513d2c2d1c5f4652b64a2e3396467fc2f93"
+  integrity sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=
   dependencies:
     env-variable "0.0.x"
 
 encodeurl@~1.0.1, encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
 encoding@^0.1.11:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
+  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
   dependencies:
     iconv-lite "~0.4.13"
 
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
+  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
   dependencies:
     once "^1.4.0"
 
 engine.io-client@~3.1.0:
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.1.6.tgz#5bdeb130f8b94a50ac5cbeb72583e7a4a063ddfd"
+  integrity sha512-hnuHsFluXnsKOndS4Hv6SvUrgdYx1pk2NqfaDMW+GWdgfU3+/V25Cj7I8a0x92idSpa5PIhJRKxPvp9mnoLsfg==
   dependencies:
     component-emitter "1.2.1"
     component-inherit "0.0.3"
@@ -2702,6 +3129,7 @@ engine.io-client@~3.1.0:
 engine.io-client@~3.2.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36"
+  integrity sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==
   dependencies:
     component-emitter "1.2.1"
     component-inherit "0.0.3"
@@ -2718,6 +3146,7 @@ engine.io-client@~3.2.0:
 engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.2.tgz#4c0f4cff79aaeecbbdcfdea66a823c6085409196"
+  integrity sha512-dInLFzr80RijZ1rGpx1+56/uFoH7/7InhH3kZt+Ms6hT8tNx3NGW/WNSA/f8As1WkOfkuyb3tnRyuXGxusclMw==
   dependencies:
     after "0.8.2"
     arraybuffer.slice "~0.0.7"
@@ -2728,6 +3157,7 @@ engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
 engine.io@~3.1.0:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.1.5.tgz#0e7ef9d690eb0b35597f1d4ad02a26ca2dba3845"
+  integrity sha512-D06ivJkYxyRrcEe0bTpNnBQNgP9d3xog+qZlLbui8EsMr/DouQpf5o9FzJnWYHEYE0YsFHllUv2R1dkgYZXHcA==
   dependencies:
     accepts "~1.3.4"
     base64id "1.0.0"
@@ -2741,6 +3171,7 @@ engine.io@~3.1.0:
 engine.io@~3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.0.tgz#54332506f42f2edc71690d2f2a42349359f3bf7d"
+  integrity sha512-mRbgmAtQ4GAlKwuPnnAvXXwdPhEx+jkc0OBCLrXuD/CRvwNK3AxRSnqK4FSqmAMRRHryVJP8TopOvmEaA64fKw==
   dependencies:
     accepts "~1.3.4"
     base64id "1.0.0"
@@ -2752,6 +3183,7 @@ engine.io@~3.2.0:
 enhanced-resolve@4.1.0, enhanced-resolve@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
+  integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.4.0"
@@ -2760,52 +3192,63 @@ enhanced-resolve@4.1.0, enhanced-resolve@^4.1.0:
 ent@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
+  integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0=
 
 env-variable@0.0.x:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.4.tgz#0d6280cf507d84242befe35a512b5ae4be77c54e"
+  integrity sha512-+jpGxSWG4vr6gVxUHOc4p+ilPnql7NzZxOZBxNldsKGjCF+97df3CbuX7XMaDa5oAVkKQj4rKp38rYdC4VcpDg==
 
 err-code@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
+  integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=
 
 errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
   dependencies:
     prr "~1.0.1"
 
 error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
 es6-promise@^4.0.3:
   version "4.2.5"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
+  integrity sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==
 
 es6-promise@~3.0.2:
   version "3.0.2"
   resolved "http://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6"
+  integrity sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=
 
 es6-promisify@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
   dependencies:
     es6-promise "^4.0.3"
 
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
 escodegen@1.8.x:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
+  integrity sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=
   dependencies:
     esprima "^2.7.1"
     estraverse "^1.9.1"
@@ -2817,6 +3260,7 @@ escodegen@1.8.x:
 escodegen@1.x.x, escodegen@^1.8.1:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589"
+  integrity sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==
   dependencies:
     esprima "^3.1.3"
     estraverse "^4.2.0"
@@ -2828,6 +3272,7 @@ escodegen@1.x.x, escodegen@^1.8.1:
 escodegen@~1.9.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"
+  integrity sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==
   dependencies:
     esprima "^3.1.3"
     estraverse "^4.2.0"
@@ -2839,6 +3284,7 @@ escodegen@~1.9.0:
 eslint-scope@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
+  integrity sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==
   dependencies:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
@@ -2846,58 +3292,71 @@ eslint-scope@^4.0.0:
 esprima@2.7.x, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+  integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=
 
 esprima@3.x.x, esprima@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
 
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esrecurse@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
+  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
   dependencies:
     estraverse "^4.1.0"
 
 estraverse@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
+  integrity sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=
 
 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"
+  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
 
 estree-walker@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39"
+  integrity sha512-XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig==
 
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
 
 etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
 eventemitter3@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
+  integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
 
 events@^1.0.0:
   version "1.1.1"
   resolved "http://registry.npmjs.org/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+  integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=
 
 eventsource@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"
+  integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==
   dependencies:
     original "^1.0.0"
 
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
   dependencies:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
@@ -2905,6 +3364,7 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
 execa@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
+  integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==
   dependencies:
     cross-spawn "^6.0.0"
     get-stream "^3.0.0"
@@ -2917,6 +3377,7 @@ execa@^0.10.0:
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
   dependencies:
     cross-spawn "^5.0.1"
     get-stream "^3.0.0"
@@ -2929,10 +3390,12 @@ execa@^0.7.0:
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
 expand-braces@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea"
+  integrity sha1-SIsdHSRRyz06axks/AMPRMWFX+o=
   dependencies:
     array-slice "^0.2.3"
     array-unique "^0.2.1"
@@ -2941,12 +3404,14 @@ expand-braces@^0.1.1:
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
   dependencies:
     is-posix-bracket "^0.1.0"
 
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
   dependencies:
     debug "^2.3.3"
     define-property "^0.2.5"
@@ -2959,6 +3424,7 @@ expand-brackets@^2.1.4:
 expand-range@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-0.1.1.tgz#4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"
+  integrity sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=
   dependencies:
     is-number "^0.1.1"
     repeat-string "^0.2.2"
@@ -2966,12 +3432,14 @@ expand-range@^0.1.0:
 expand-range@^1.8.1:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
   dependencies:
     fill-range "^2.1.0"
 
 express@^4.16.2:
   version "4.16.4"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
+  integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
   dependencies:
     accepts "~1.3.5"
     array-flatten "1.1.1"
@@ -3007,12 +3475,14 @@ express@^4.16.2:
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
   dependencies:
     is-extendable "^0.1.0"
 
 extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
   dependencies:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
@@ -3020,10 +3490,12 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
 extend@3, extend@^3.0.0, extend@~3.0.0, extend@~3.0.1, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
 external-editor@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
+  integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
   dependencies:
     chardet "^0.7.0"
     iconv-lite "^0.4.24"
@@ -3032,12 +3504,14 @@ external-editor@^3.0.0:
 extglob@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
   dependencies:
     is-extglob "^1.0.0"
 
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
   dependencies:
     array-unique "^0.3.2"
     define-property "^1.0.0"
@@ -3051,14 +3525,17 @@ extglob@^2.0.4:
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
 
 extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
 falafel@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.1.0.tgz#96bb17761daba94f46d001738b3cedf3a67fe06c"
+  integrity sha1-lrsXdh2rqU9G0AFzizzt86Z/4Gw=
   dependencies:
     acorn "^5.0.0"
     foreach "^2.0.5"
@@ -3068,56 +3545,68 @@ falafel@^2.1.0:
 fast-deep-equal@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
 
 fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
 
 fast-json-stable-stringify@2.0.0, fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
 fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fast-safe-stringify@^2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.6.tgz#04b26106cc56681f51a044cfc0d76cf0008ac2c2"
+  integrity sha512-q8BZ89jjc+mz08rSxROs8VsrBBcn1SIw1kq9NjolL509tkABRk9io01RAjSaEv1Xb2uFLt8VtRiZbGp5H8iDtg==
 
 fastparse@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
+  integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
 
 faye-websocket@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
+  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
   dependencies:
     websocket-driver ">=0.5.1"
 
 faye-websocket@~0.11.1:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
+  integrity sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=
   dependencies:
     websocket-driver ">=0.5.1"
 
 fecha@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd"
+  integrity sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==
 
 figgy-pudding@^3.1.0, figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
+  integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
 
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
   dependencies:
     escape-string-regexp "^1.0.5"
 
 file-loader@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-2.0.0.tgz#39749c82f020b9e85901dcff98e8004e6401cfde"
+  integrity sha512-YCsBfd1ZGCyonOKLxPiKPdu+8ld9HAaMEvJewzz+b2eTF7uL5Zm/HdBF6FjCrpCMRq25Mi0U1gl4pwn2TlH7hQ==
   dependencies:
     loader-utils "^1.0.2"
     schema-utils "^1.0.0"
@@ -3125,14 +3614,17 @@ file-loader@2.0.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"
+  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
+  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
 
 fileset@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
+  integrity sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=
   dependencies:
     glob "^7.0.3"
     minimatch "^3.0.3"
@@ -3140,6 +3632,7 @@ fileset@^2.0.3:
 fill-range@^2.1.0:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
+  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
   dependencies:
     is-number "^2.1.0"
     isobject "^2.0.0"
@@ -3150,6 +3643,7 @@ fill-range@^2.1.0:
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
   dependencies:
     extend-shallow "^2.0.1"
     is-number "^3.0.0"
@@ -3159,6 +3653,7 @@ fill-range@^4.0.0:
 finalhandler@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
+  integrity sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.1"
@@ -3171,6 +3666,7 @@ finalhandler@1.1.0:
 finalhandler@1.1.1:
   version "1.1.1"
   resolved "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
+  integrity sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.2"
@@ -3183,6 +3679,7 @@ finalhandler@1.1.1:
 find-cache-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
+  integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=
   dependencies:
     commondir "^1.0.1"
     make-dir "^1.0.0"
@@ -3191,6 +3688,7 @@ find-cache-dir@^1.0.0:
 find-cache-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d"
+  integrity sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==
   dependencies:
     commondir "^1.0.1"
     make-dir "^1.0.0"
@@ -3199,10 +3697,12 @@ find-cache-dir@^2.0.0:
 find-parent-dir@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
+  integrity sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=
 
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
   dependencies:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
@@ -3210,18 +3710,21 @@ find-up@^1.0.0:
 find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
   dependencies:
     locate-path "^2.0.0"
 
 find-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
   dependencies:
     locate-path "^3.0.0"
 
 flush-write-stream@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
+  integrity sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.4"
@@ -3229,50 +3732,60 @@ flush-write-stream@^1.0.0:
 follow-redirects@1.0.0:
   version "1.0.0"
   resolved "http://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz#8e34298cbd2e176f254effec75a1c78cc849fd37"
+  integrity sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=
   dependencies:
     debug "^2.2.0"
 
 follow-redirects@^1.0.0:
   version "1.5.7"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.7.tgz#a39e4804dacb90202bca76a9e2ac10433ca6a69a"
+  integrity sha512-NONJVIFiX7Z8k2WxfqBjtwqMifx7X42ORLFrOZ2LTKGj71G3C0kfdyTqGqr8fx5zSX6Foo/D95dgGWbPUiwnew==
   dependencies:
     debug "^3.1.0"
 
 font-awesome@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
+  integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=
 
 for-in@^0.1.3:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
+  integrity sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=
 
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
 for-own@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
   dependencies:
     for-in "^1.0.1"
 
 for-own@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
+  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
   dependencies:
     for-in "^1.0.1"
 
 foreach@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+  integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
 
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
 form-data@~2.0.0:
   version "2.0.0"
   resolved "http://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz#6f0aebadcc5da16c13e1ecc11137d85f9b883b25"
+  integrity sha1-bwrrrcxdoWwT4ezBETfYX5uIOyU=
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.5"
@@ -3281,6 +3794,7 @@ form-data@~2.0.0:
 form-data@~2.3.0:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.6"
@@ -3289,6 +3803,7 @@ form-data@~2.3.0:
 form-data@~2.3.1, form-data@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
+  integrity sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=
   dependencies:
     asynckit "^0.4.0"
     combined-stream "1.0.6"
@@ -3297,20 +3812,24 @@ form-data@~2.3.1, form-data@~2.3.2:
 forwarded@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
 
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
   dependencies:
     map-cache "^0.2.2"
 
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
 from2@^2.1.0, from2@^2.1.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
@@ -3318,16 +3837,19 @@ from2@^2.1.0, from2@^2.1.1:
 fs-access@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/fs-access/-/fs-access-1.0.1.tgz#d6a87f262271cefebec30c553407fb995da8777a"
+  integrity sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=
   dependencies:
     null-check "^1.0.0"
 
 fs-constants@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
 
 fs-extra@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.0.tgz#8cc3f47ce07ef7b3593a11b9fb245f7e34c041d6"
+  integrity sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^4.0.0"
@@ -3336,12 +3858,14 @@ fs-extra@^7.0.0:
 fs-minipass@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
   dependencies:
     minipass "^2.2.1"
 
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
   dependencies:
     graceful-fs "^4.1.2"
     iferr "^0.1.5"
@@ -3351,10 +3875,12 @@ fs-write-stream-atomic@^1.0.8:
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.0.0, fsevents@^1.2.2:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
+  integrity sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==
   dependencies:
     nan "^2.9.2"
     node-pre-gyp "^0.10.0"
@@ -3362,6 +3888,7 @@ fsevents@^1.0.0, fsevents@^1.2.2:
 fstream@^1.0.0, fstream@^1.0.2:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+  integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
   dependencies:
     graceful-fs "^4.1.2"
     inherits "~2.0.0"
@@ -3371,6 +3898,7 @@ fstream@^1.0.0, fstream@^1.0.2:
 ftp@~0.3.10:
   version "0.3.10"
   resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
+  integrity sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=
   dependencies:
     readable-stream "1.1.x"
     xregexp "2.0.0"
@@ -3378,10 +3906,12 @@ ftp@~0.3.10:
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
   dependencies:
     aproba "^1.0.3"
     console-control-strings "^1.0.0"
@@ -3395,32 +3925,38 @@ gauge@~2.7.3:
 gaze@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
+  integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
   dependencies:
     globule "^1.0.0"
 
 generate-function@^2.0.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f"
+  integrity sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==
   dependencies:
     is-property "^1.0.2"
 
 generate-object-property@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
+  integrity sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=
   dependencies:
     is-property "^1.0.0"
 
 genfun@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
+  integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==
 
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
 get-pkg-repo@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
+  integrity sha1-xztInAbYDMVTbCyFP54FIyBWly0=
   dependencies:
     hosted-git-info "^2.1.4"
     meow "^3.3.0"
@@ -3431,20 +3967,24 @@ get-pkg-repo@^1.0.0:
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
 get-stream@3.0.0, get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
 
 get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
   dependencies:
     pump "^3.0.0"
 
 get-uri@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.2.tgz#5c795e71326f6ca1286f2fc82575cd2bab2af578"
+  integrity sha512-ZD325dMZOgerGqF/rF6vZXyFGTAay62svjQIT+X/oU2PtxYpFxvSkbsdi+oxIrsNxlZVd4y8wUDqkaExWTI/Cw==
   dependencies:
     data-uri-to-buffer "1"
     debug "2"
@@ -3456,16 +3996,19 @@ get-uri@^2.0.0:
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
   dependencies:
     assert-plus "^1.0.0"
 
 gh-got@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/gh-got/-/gh-got-7.1.0.tgz#f2b14eef375ce49b66d5f034a1c124f56dc5bcf0"
+  integrity sha512-KeWkkhresa7sbpzQLYzITMgez5rMigUsijhmSAHcLDORIMUbdlkdoZyaN1wQvIjmUZnyb/wkAPaXb4MQKX0mdQ==
   dependencies:
     got "^8.0.0"
     is-plain-obj "^1.1.0"
@@ -3473,6 +4016,7 @@ gh-got@^7.0.0:
 git-raw-commits@^1.3.6:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.3.6.tgz#27c35a32a67777c1ecd412a239a6c19d71b95aff"
+  integrity sha512-svsK26tQ8vEKnMshTDatSIQSMDdz8CxIIqKsvPqbtV23Etmw6VNaFAitu8zwZ0VrOne7FztwPyRLxK7/DIUTQg==
   dependencies:
     dargs "^4.0.1"
     lodash.template "^4.0.2"
@@ -3483,6 +4027,7 @@ git-raw-commits@^1.3.6:
 git-raw-commits@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.0.tgz#d92addf74440c14bcc5c83ecce3fb7f8a79118b5"
+  integrity sha512-w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg==
   dependencies:
     dargs "^4.0.1"
     lodash.template "^4.0.2"
@@ -3493,6 +4038,7 @@ git-raw-commits@^2.0.0:
 git-remote-origin-url@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f"
+  integrity sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=
   dependencies:
     gitconfiglocal "^1.0.0"
     pify "^2.3.0"
@@ -3500,6 +4046,7 @@ git-remote-origin-url@^2.0.0:
 git-semver-tags@^1.3.6:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.3.6.tgz#357ea01f7280794fe0927f2806bee6414d2caba5"
+  integrity sha512-2jHlJnln4D/ECk9FxGEBh3k44wgYdWjWDtMmJPaecjoRmxKo3Y1Lh8GMYuOPu04CHw86NTAODchYjC5pnpMQig==
   dependencies:
     meow "^4.0.0"
     semver "^5.5.0"
@@ -3507,12 +4054,14 @@ git-semver-tags@^1.3.6:
 gitconfiglocal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"
+  integrity sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=
   dependencies:
     ini "^1.3.2"
 
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
   dependencies:
     glob-parent "^2.0.0"
     is-glob "^2.0.0"
@@ -3520,12 +4069,14 @@ glob-base@^0.3.0:
 glob-parent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
   dependencies:
     is-glob "^2.0.0"
 
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
   dependencies:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
@@ -3533,6 +4084,7 @@ glob-parent@^3.1.0:
 glob@7.0.x:
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
+  integrity sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -3544,6 +4096,7 @@ glob@7.0.x:
 glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -3555,6 +4108,7 @@ glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glo
 glob@^5.0.15:
   version "5.0.15"
   resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
   dependencies:
     inflight "^1.0.4"
     inherits "2"
@@ -3565,20 +4119,24 @@ glob@^5.0.15:
 global-dirs@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
+  integrity sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=
   dependencies:
     ini "^1.3.4"
 
 globals@^11.1.0:
   version "11.8.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.8.0.tgz#c1ef45ee9bed6badf0663c5cb90e8d1adec1321d"
+  integrity sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==
 
 globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
+  integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
 
 globby@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
+  integrity sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=
   dependencies:
     array-union "^1.0.1"
     arrify "^1.0.0"
@@ -3590,6 +4148,7 @@ globby@^5.0.0:
 globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
   dependencies:
     array-union "^1.0.1"
     glob "^7.0.3"
@@ -3600,6 +4159,7 @@ globby@^6.1.0:
 globby@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
+  integrity sha1-+yzP+UAfhgCUXfral0QMypcrhoA=
   dependencies:
     array-union "^1.0.1"
     dir-glob "^2.0.0"
@@ -3611,6 +4171,7 @@ globby@^7.1.1:
 globule@^1.0.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d"
+  integrity sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==
   dependencies:
     glob "~7.1.1"
     lodash "~4.17.10"
@@ -3619,6 +4180,7 @@ globule@^1.0.0:
 got@^6.7.1:
   version "6.7.1"
   resolved "http://registry.npmjs.org/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
+  integrity sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=
   dependencies:
     create-error-class "^3.0.0"
     duplexer3 "^0.1.4"
@@ -3635,6 +4197,7 @@ got@^6.7.1:
 got@^8.0.0:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937"
+  integrity sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==
   dependencies:
     "@sindresorhus/is" "^0.7.0"
     cacheable-request "^2.1.1"
@@ -3657,14 +4220,17 @@ got@^8.0.0:
 graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
 
 handle-thing@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
+  integrity sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=
 
 handlebars@^4.0.1, handlebars@^4.0.11, handlebars@^4.0.2:
   version "4.0.12"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5"
+  integrity sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==
   dependencies:
     async "^2.5.0"
     optimist "^0.6.1"
@@ -3675,10 +4241,12 @@ handlebars@^4.0.1, handlebars@^4.0.11, handlebars@^4.0.2:
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
 har-validator@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
+  integrity sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=
   dependencies:
     chalk "^1.1.1"
     commander "^2.9.0"
@@ -3688,6 +4256,7 @@ har-validator@~2.0.6:
 har-validator@~5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
+  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
   dependencies:
     ajv "^5.1.0"
     har-schema "^2.0.0"
@@ -3695,6 +4264,7 @@ har-validator@~5.0.3:
 har-validator@~5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
+  integrity sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==
   dependencies:
     ajv "^5.3.0"
     har-schema "^2.0.0"
@@ -3702,44 +4272,53 @@ har-validator@~5.1.0:
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
   dependencies:
     ansi-regex "^2.0.0"
 
 has-binary2@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
+  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
   dependencies:
     isarray "2.0.1"
 
 has-cors@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
+  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
 
 has-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
 
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
 has-symbol-support-x@^1.4.1:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
+  integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==
 
 has-to-string-tag-x@^1.2.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
+  integrity sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==
   dependencies:
     has-symbol-support-x "^1.4.1"
 
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
 
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
   dependencies:
     get-value "^2.0.3"
     has-values "^0.1.4"
@@ -3748,6 +4327,7 @@ has-value@^0.3.1:
 has-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
   dependencies:
     get-value "^2.0.6"
     has-values "^1.0.0"
@@ -3756,10 +4336,12 @@ has-value@^1.0.0:
 has-values@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
 
 has-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
   dependencies:
     is-number "^3.0.0"
     kind-of "^4.0.0"
@@ -3767,12 +4349,14 @@ has-values@^1.0.0:
 has@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
     function-bind "^1.1.1"
 
 hash-base@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
+  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -3780,6 +4364,7 @@ hash-base@^3.0.0:
 hash.js@^1.0.0, hash.js@^1.0.3:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.5.tgz#e38ab4b85dfb1e0c40fe9265c0e9b54854c23812"
+  integrity sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==
   dependencies:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
@@ -3787,6 +4372,7 @@ hash.js@^1.0.0, hash.js@^1.0.3:
 hawk@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
+  integrity sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=
   dependencies:
     boom "2.x.x"
     cryptiles "2.x.x"
@@ -3796,6 +4382,7 @@ hawk@~3.1.3:
 hawk@~6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
+  integrity sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==
   dependencies:
     boom "4.x.x"
     cryptiles "3.x.x"
@@ -3805,6 +4392,7 @@ hawk@~6.0.2:
 hipchat-notifier@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/hipchat-notifier/-/hipchat-notifier-1.1.0.tgz#b6d249755437c191082367799d3ba9a0f23b231e"
+  integrity sha1-ttJJdVQ3wZEII2d5nTupoPI7Ix4=
   dependencies:
     lodash "^4.0.0"
     request "^2.0.0"
@@ -3812,6 +4400,7 @@ hipchat-notifier@^1.1.0:
 hmac-drbg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
   dependencies:
     hash.js "^1.0.3"
     minimalistic-assert "^1.0.0"
@@ -3820,18 +4409,22 @@ hmac-drbg@^1.0.0:
 hoek@2.x.x:
   version "2.16.3"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
+  integrity sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=
 
 hoek@4.x.x:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
+  integrity sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==
 
 hosted-git-info@^2.1.4, hosted-git-info@^2.6.0:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
+  integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
 
 hpack.js@^2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
+  integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=
   dependencies:
     inherits "^2.0.1"
     obuf "^1.0.0"
@@ -3841,18 +4434,22 @@ hpack.js@^2.1.6:
 html-entities@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
+  integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
 
 http-cache-semantics@3.8.1, http-cache-semantics@^3.8.1:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
+  integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
 
 http-deceiver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
+  integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
 
 http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
   dependencies:
     depd "~1.1.2"
     inherits "2.0.3"
@@ -3862,10 +4459,12 @@ http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
 http-parser-js@>=0.4.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8"
+  integrity sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==
 
 http-proxy-agent@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
+  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
   dependencies:
     agent-base "4"
     debug "3.1.0"
@@ -3873,6 +4472,7 @@ http-proxy-agent@^2.1.0:
 http-proxy-middleware@~0.18.0:
   version "0.18.0"
   resolved "http://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
+  integrity sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==
   dependencies:
     http-proxy "^1.16.2"
     is-glob "^4.0.0"
@@ -3882,6 +4482,7 @@ http-proxy-middleware@~0.18.0:
 http-proxy@^1.13.0, http-proxy@^1.16.2:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
+  integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==
   dependencies:
     eventemitter3 "^3.0.0"
     follow-redirects "^1.0.0"
@@ -3890,6 +4491,7 @@ http-proxy@^1.13.0, http-proxy@^1.16.2:
 http-signature@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
+  integrity sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=
   dependencies:
     assert-plus "^0.2.0"
     jsprim "^1.2.2"
@@ -3898,6 +4500,7 @@ http-signature@~1.1.0:
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
   dependencies:
     assert-plus "^1.0.0"
     jsprim "^1.2.2"
@@ -3906,6 +4509,7 @@ http-signature@~1.2.0:
 httpntlm@1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/httpntlm/-/httpntlm-1.6.1.tgz#ad01527143a2e8773cfae6a96f58656bb52a34b2"
+  integrity sha1-rQFScUOi6Hc8+uapb1hla7UqNLI=
   dependencies:
     httpreq ">=0.4.22"
     underscore "~1.7.0"
@@ -3913,14 +4517,17 @@ httpntlm@1.6.1:
 httpreq@>=0.4.22:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/httpreq/-/httpreq-0.4.24.tgz#4335ffd82cd969668a39465c929ac61d6393627f"
+  integrity sha1-QzX/2CzZaWaKOUZckprGHWOTYn8=
 
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
 https-proxy-agent@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
+  integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==
   dependencies:
     agent-base "^4.1.0"
     debug "^3.1.0"
@@ -3928,12 +4535,14 @@ https-proxy-agent@^2.2.1:
 humanize-ms@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+  integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=
   dependencies:
     ms "^2.0.0"
 
 husky@^0.14.3:
   version "0.14.3"
   resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3"
+  integrity sha512-e21wivqHpstpoiWA/Yi8eFti8E+sQDSS53cpJsPptPs295QTOQR0ZwnHo2TXy1XOpZFD9rPOd3NpmqTK6uMLJA==
   dependencies:
     is-ci "^1.0.10"
     normalize-path "^1.0.0"
@@ -3942,68 +4551,82 @@ husky@^0.14.3:
 iconv-lite@0.4.15:
   version "0.4.15"
   resolved "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
+  integrity sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es=
 
 iconv-lite@0.4.23:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
+  integrity sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 ieee754@^1.1.4:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
+  integrity sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==
 
 iferr@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
 ignore-walk@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
   dependencies:
     minimatch "^3.0.4"
 
 ignore@^3.3.5:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
+  integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
 
 image-size@~0.5.0:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
+  integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
 
 immediate@~3.0.5:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
+  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
 
 immutable@^3.8.2:
   version "3.8.2"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
+  integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=
 
 import-cwd@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
+  integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=
   dependencies:
     import-from "^2.1.0"
 
 import-from@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
+  integrity sha1-M1238qev/VOqpHHUuAId7ja387E=
   dependencies:
     resolve-from "^3.0.0"
 
 import-lazy@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
+  integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
 
 import-local@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
+  integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
   dependencies:
     pkg-dir "^3.0.0"
     resolve-cwd "^2.0.0"
@@ -4011,36 +4634,44 @@ import-local@^2.0.0:
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
 in-publish@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
+  integrity sha1-4g/146KvwmkDILbcVSaCqcf631E=
 
 indent-string@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
   dependencies:
     repeating "^2.0.0"
 
 indent-string@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
+  integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=
 
 indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
 
 inflection@~1.12.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416"
+  integrity sha1-ogCTVlbW9fa8TcdQLhrstwMihBY=
 
 inflection@~1.3.0:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.3.8.tgz#cbd160da9f75b14c3cc63578d4f396784bf3014e"
+  integrity sha1-y9Fg2p91sUw8xjV41POWeEvzAU4=
 
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
@@ -4048,22 +4679,27 @@ inflight@^1.0.4:
 inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
 ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
 injection-js@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/injection-js/-/injection-js-2.2.1.tgz#a8d6a085b2f0b8d8650f6f4487f6abb8cc0d67ce"
+  integrity sha512-zHI+E+dM0PXix5FFTO1Y4/UOyAzE7zG1l/QwAn4jchTThOoBq+UYRFK4AVG7lQgFL+go62SbrzSsjXy9DFEZUg==
 
 inquirer@6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"
+  integrity sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.0"
@@ -4082,6 +4718,7 @@ inquirer@6.2.0:
 internal-ip@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-3.0.1.tgz#df5c99876e1d2eb2ea2d74f520e3f669a00ece27"
+  integrity sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==
   dependencies:
     default-gateway "^2.6.0"
     ipaddr.js "^1.5.2"
@@ -4089,10 +4726,12 @@ internal-ip@^3.0.1:
 interpret@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
+  integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
 
 into-stream@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
+  integrity sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=
   dependencies:
     from2 "^2.1.1"
     p-is-promise "^1.1.0"
@@ -4100,90 +4739,108 @@ into-stream@^3.1.0:
 invariant@^2.2.2:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
   dependencies:
     loose-envify "^1.0.0"
 
 invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
 
 invert-kv@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
+  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
 
 ip-regex@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
+  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
 
 ip@^1.1.0, ip@^1.1.2, ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
 
 ipaddr.js@1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
+  integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
 
 ipaddr.js@^1.5.2:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.1.tgz#fa4b79fa47fd3def5e3b159825161c0a519c9427"
+  integrity sha1-+kt5+kf9Pe9eOxWYJRYcClGclCc=
 
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
   dependencies:
     kind-of "^3.0.2"
 
 is-accessor-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
 is-arrayish@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
+  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
 
 is-binary-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
   dependencies:
     binary-extensions "^1.0.0"
 
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-builtin-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74=
   dependencies:
     builtin-modules "^1.0.0"
 
 is-ci@^1.0.10:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
+  integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==
   dependencies:
     ci-info "^1.5.0"
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
   dependencies:
     kind-of "^3.0.2"
 
 is-data-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
   dependencies:
     is-accessor-descriptor "^0.1.6"
     is-data-descriptor "^0.1.4"
@@ -4192,6 +4849,7 @@ is-descriptor@^0.1.0:
 is-descriptor@^1.0.0, is-descriptor@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
   dependencies:
     is-accessor-descriptor "^1.0.0"
     is-data-descriptor "^1.0.0"
@@ -4200,72 +4858,86 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
 is-directory@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
 
 is-dotfile@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
+  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
 
 is-equal-shallow@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
   dependencies:
     is-primitive "^2.0.0"
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
 
 is-extendable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
   dependencies:
     is-plain-object "^2.0.4"
 
 is-extglob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
 
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
 is-finite@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
   dependencies:
     is-extglob "^1.0.0"
 
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
   dependencies:
     is-extglob "^2.1.0"
 
 is-glob@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
+  integrity sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=
   dependencies:
     is-extglob "^2.1.1"
 
 is-installed-globally@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80"
+  integrity sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=
   dependencies:
     global-dirs "^0.1.0"
     is-path-inside "^1.0.0"
@@ -4273,14 +4945,17 @@ is-installed-globally@^0.1.0:
 is-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
+  integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
 
 is-my-ip-valid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
+  integrity sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==
 
 is-my-json-valid@^2.12.4:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.19.0.tgz#8fd6e40363cd06b963fa877d444bfb5eddc62175"
+  integrity sha512-mG0f/unGX1HZ5ep4uhRaPOS8EkAY8/j6mDRMJrutq4CqhoJWYp7qAlonIPy3TV7p3ju4TK9fo/PbnoksWmsp5Q==
   dependencies:
     generate-function "^2.0.0"
     generate-object-property "^1.1.0"
@@ -4291,154 +4966,188 @@ is-my-json-valid@^2.12.4:
 is-npm@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
+  integrity sha1-8vtjpl5JBbQGyGBydloaTceTufQ=
 
 is-number@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806"
+  integrity sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=
 
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
   dependencies:
     kind-of "^3.0.2"
 
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
   dependencies:
     kind-of "^3.0.2"
 
 is-number@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
 is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
 
 is-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
+  integrity sha1-iVJojF7C/9awPsyF52ngKQMINHA=
 
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
 
 is-path-in-cwd@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
+  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
   dependencies:
     is-path-inside "^1.0.0"
 
 is-path-inside@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
   dependencies:
     path-is-inside "^1.0.1"
 
 is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
 is-posix-bracket@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
 
 is-primitive@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
 
 is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+  integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
 
 is-property@^1.0.0, is-property@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
+  integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=
 
 is-redirect@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
+  integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=
 
 is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
+  integrity sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=
 
 is-stream@^1.0.0, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
 is-subset@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
+  integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=
 
 is-text-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
+  integrity sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=
   dependencies:
     text-extensions "^1.0.0"
 
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
 is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
 is-wsl@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
 
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
 isarray@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
+  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
 
 isbinaryfile@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
+  integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
   dependencies:
     buffer-alloc "^1.2.0"
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
 istanbul-api@^2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.0.6.tgz#cd7b33ee678f6c01531d05f5e567ebbcd25f8ecc"
+  integrity sha512-8W5oeAGWXhtTJjAyVfvavOLVyZCTNCKsyF6GON/INKlBdO7uJ/bv3qnPj5M6ERKzmMCJS1kntnjjGuJ86fn3rQ==
   dependencies:
     async "^2.6.1"
     compare-versions "^3.2.1"
@@ -4456,6 +5165,7 @@ istanbul-api@^2.0.5:
 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"
+  integrity sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==
   dependencies:
     convert-source-map "^1.5.0"
     istanbul-lib-instrument "^1.7.3"
@@ -4465,20 +5175,24 @@ istanbul-instrumenter-loader@3.0.1:
 istanbul-lib-coverage@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0"
+  integrity sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==
 
 istanbul-lib-coverage@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#2aee0e073ad8c5f6a0b00e0dfbf52b4667472eda"
+  integrity sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==
 
 istanbul-lib-hook@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.1.tgz#918a57b75a0f951d552a08487ca1fa5336433d72"
+  integrity sha512-ufiZoiJ8CxY577JJWEeFuxXZoMqiKpq/RqZtOAYuQLvlkbJWscq9n3gc4xrCGH9n4pW0qnTxOz1oyMmVtk8E1w==
   dependencies:
     append-transform "^1.0.0"
 
 istanbul-lib-instrument@^1.7.3:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz#1f55ed10ac3c47f2bdddd5307935126754d0a9ca"
+  integrity sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==
   dependencies:
     babel-generator "^6.18.0"
     babel-template "^6.16.0"
@@ -4491,6 +5205,7 @@ istanbul-lib-instrument@^1.7.3:
 istanbul-lib-instrument@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.0.0.tgz#b5f066b2a161f75788be17a9d556f40a0cf2afc9"
+  integrity sha512-eQY9vN9elYjdgN9Iv6NS/00bptm02EBBk70lRMaVjeA6QYocQgenVrSgC28TJurdnZa80AGO3ASdFN+w/njGiQ==
   dependencies:
     "@babel/generator" "^7.0.0"
     "@babel/parser" "^7.0.0"
@@ -4503,6 +5218,7 @@ istanbul-lib-instrument@^3.0.0:
 istanbul-lib-report@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.2.tgz#430a2598519113e1da7af274ba861bd42dd97535"
+  integrity sha512-rJ8uR3peeIrwAxoDEbK4dJ7cqqtxBisZKCuwkMtMv0xYzaAnsAi3AHrHPAAtNXzG/bcCgZZ3OJVqm1DTi9ap2Q==
   dependencies:
     istanbul-lib-coverage "^2.0.1"
     make-dir "^1.3.0"
@@ -4511,6 +5227,7 @@ istanbul-lib-report@^2.0.2:
 istanbul-lib-source-maps@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-2.0.1.tgz#ce8b45131d8293fdeaa732f4faf1852d13d0a97e"
+  integrity sha512-30l40ySg+gvBLcxTrLzR4Z2XTRj3HgRCA/p2rnbs/3OiTaoj054gAbuP5DcLOtwqmy4XW8qXBHzrmP2/bQ9i3A==
   dependencies:
     debug "^3.1.0"
     istanbul-lib-coverage "^2.0.1"
@@ -4521,12 +5238,14 @@ istanbul-lib-source-maps@^2.0.1:
 istanbul-reports@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.0.1.tgz#fb8d6ea850701a3984350b977a969e9a556116a7"
+  integrity sha512-CT0QgMBJqs6NJLF678ZHcquUAZIoBIUNzdJrRJfpkI9OnzG6MkUfHxbJC3ln981dMswC7/B1mfX3LNkhgJxsuw==
   dependencies:
     handlebars "^4.0.11"
 
 istanbul@0.4.5, istanbul@^0.4.5:
   version "0.4.5"
   resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-0.4.5.tgz#65c7d73d4c4da84d4f3ac310b918fb0b8033733b"
+  integrity sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=
   dependencies:
     abbrev "1.0.x"
     async "1.x"
@@ -4546,6 +5265,7 @@ istanbul@0.4.5, istanbul@^0.4.5:
 isurl@^1.0.0-alpha5:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
+  integrity sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==
   dependencies:
     has-to-string-tag-x "^1.2.0"
     is-object "^1.0.1"
@@ -4553,26 +5273,31 @@ isurl@^1.0.0-alpha5:
 jasmine-core@2.8.0, jasmine-core@~2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
+  integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
 
 jasmine-core@~2.99.0:
   version "2.99.1"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15"
+  integrity sha1-5kAN8ea1bhMLYcS80JPap/boyhU=
 
 jasmine-spec-reporter@^3.2.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-3.3.0.tgz#c63c3d43bacfd16e6da86c46d265957e0075f14c"
+  integrity sha1-xjw9Q7rP0W5tqGxG0mWVfgB18Uw=
   dependencies:
     colors "1.1.2"
 
 jasmine-spec-reporter@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz#1d632aec0341670ad324f92ba84b4b32b35e9e22"
+  integrity sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==
   dependencies:
     colors "1.1.2"
 
 jasmine@2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e"
+  integrity sha1-awicChFXax8W3xG4AUbZHU6Lij4=
   dependencies:
     exit "^0.1.2"
     glob "^7.0.6"
@@ -4581,6 +5306,7 @@ jasmine@2.8.0:
 jasmine@^2.6.0:
   version "2.99.0"
   resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.99.0.tgz#8ca72d102e639b867c6489856e0e18a9c7aa42b7"
+  integrity sha1-jKctEC5jm4Z8ZImFbg4YqceqQrc=
   dependencies:
     exit "^0.1.2"
     glob "^7.0.6"
@@ -4589,26 +5315,32 @@ jasmine@^2.6.0:
 jasminewd2@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"
+  integrity sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=
 
 jquery@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
+  integrity sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==
 
 js-base64@^2.1.8, js-base64@^2.4.3:
   version "2.4.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03"
+  integrity sha512-xcinL3AuDJk7VSzsHgb9DvvIXayBbadtMZ4HFPx8rUszbW1MuNMlwYVC4zzCZ6e1sqZpnNS5ZFYOhXqA39T7LQ==
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
 js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
+  integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -4616,68 +5348,84 @@ js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
 jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+  integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
 
 jsesc@^2.5.1:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
+  integrity sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=
 
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
 json-buffer@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
+  integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
 
 json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
 
 json-stringify-safe@5.0.x, json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
 json3@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
+  integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
 
 json5@^0.5.0:
   version "0.5.1"
   resolved "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
 
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
   optionalDependencies:
     graceful-fs "^4.1.6"
 
 jsonparse@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
+  integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
 
 jsonpointer@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
+  integrity sha1-T9kss04OnbPInIYi7PUfm5eMbLk=
 
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
   dependencies:
     assert-plus "1.0.0"
     extsprintf "1.3.0"
@@ -4687,6 +5435,7 @@ jsprim@^1.2.2:
 jszip@^3.1.3:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.1.5.tgz#e3c2a6c6d706ac6e603314036d43cd40beefdf37"
+  integrity sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==
   dependencies:
     core-js "~2.3.0"
     es6-promise "~3.0.2"
@@ -4697,6 +5446,7 @@ jszip@^3.1.3:
 karma-chrome-launcher@2.2.0, karma-chrome-launcher@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf"
+  integrity sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==
   dependencies:
     fs-access "^1.0.0"
     which "^1.2.1"
@@ -4704,6 +5454,7 @@ karma-chrome-launcher@2.2.0, karma-chrome-launcher@~2.2.0:
 karma-coverage-istanbul-reporter@~2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.4.tgz#402ae4ed6eadb9d9dafbd408ffda17897c0d003a"
+  integrity sha512-xJS7QSQIVU6VK9HuJ/ieE5yynxKhjCCkd96NLY/BX/HXsx0CskU9JJiMQbd4cHALiddMwI4OWh1IIzeWrsavJw==
   dependencies:
     istanbul-api "^2.0.5"
     minimatch "^3.0.4"
@@ -4711,28 +5462,34 @@ karma-coverage-istanbul-reporter@~2.0.0:
 karma-firefox-launcher@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/karma-firefox-launcher/-/karma-firefox-launcher-1.1.0.tgz#2c47030452f04531eb7d13d4fc7669630bb93339"
+  integrity sha512-LbZ5/XlIXLeQ3cqnCbYLn+rOVhuMIK9aZwlP6eOLGzWdo1UVp7t6CN3DP4SafiRLjexKwHeKHDm0c38Mtd3VxA==
 
 karma-jasmine-html-reporter@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-0.2.2.tgz#48a8e5ef18807617ee2b5e33c1194c35b439524c"
+  integrity sha1-SKjl7xiAdhfuK14zwRlMNbQ5Ukw=
   dependencies:
     karma-jasmine "^1.0.2"
 
 karma-jasmine@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.1.tgz#6fe840e75a11600c9d91e84b33c458e1c46a3529"
+  integrity sha1-b+hA51oRYAydkehLM8RY4cRqNSk=
 
 karma-jasmine@^1.0.2, karma-jasmine@~1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.2.tgz#394f2b25ffb4a644b9ada6f22d443e2fd08886c3"
+  integrity sha1-OU8rJf+0pkS5rabyLUQ+L9CIhsM=
 
 karma-requirejs@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/karma-requirejs/-/karma-requirejs-1.1.0.tgz#fddae2cb87d7ebc16fb0222893564d7fee578798"
+  integrity sha1-/driy4fX68FvsCIok1ZNf+5Xh5g=
 
 karma-sauce-launcher@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/karma-sauce-launcher/-/karma-sauce-launcher-1.2.0.tgz#6f2558ddef3cf56879fa27540c8ae9f8bfd16bca"
+  integrity sha512-lEhtGRGS+3Yw6JSx/vJY9iQyHNtTjcojrSwNzqNUOaDceKDu9dPZqA/kr69bUO9G2T6GKbu8AZgXqy94qo31Jg==
   dependencies:
     q "^1.5.0"
     sauce-connect-launcher "^1.2.2"
@@ -4742,12 +5499,14 @@ karma-sauce-launcher@1.2.0:
 karma-source-map-support@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz#36dd4d8ca154b62ace95696236fae37caf0a7dde"
+  integrity sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==
   dependencies:
     source-map-support "^0.5.5"
 
 karma-sourcemap-loader@0.3.7:
   version "0.3.7"
   resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz#91322c77f8f13d46fed062b042e1009d4c4505d8"
+  integrity sha1-kTIsd/jxPUb+0GKwQuEAnUxFBdg=
   dependencies:
     graceful-fs "^4.1.2"
 
@@ -4786,6 +5545,7 @@ karma@alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a:
 karma@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/karma/-/karma-3.0.0.tgz#6da83461a8a28d8224575c3b5b874e271b4730c3"
+  integrity sha512-ZTjyuDXVXhXsvJ1E4CnZzbCjSxD6sEdzEsFYogLuZM0yqvg/mgz+O+R1jb0J7uAQeuzdY8kJgx6hSNXLwFuHIQ==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
@@ -4818,66 +5578,78 @@ karma@~3.0.0:
 keyv@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
+  integrity sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==
   dependencies:
     json-buffer "3.0.0"
 
 killable@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
+  integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
 
 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"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
 
 kuler@1.0.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/kuler/-/kuler-1.0.0.tgz#904ad31c373b781695854d32be33818bf1d60250"
+  integrity sha512-oyy6pu/yWRjiVfCoJebNUKFL061sNtrs9ejKTbirIwY3oiHmENVCSkHhxDV85Dkm7JYR/czMCBeoM87WilTdSg==
   dependencies:
     colornames "^1.1.1"
 
 latest-version@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15"
+  integrity sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=
   dependencies:
     package-json "^4.0.0"
 
 lazystream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
+  integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=
   dependencies:
     readable-stream "^2.0.5"
 
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
   dependencies:
     invert-kv "^1.0.0"
 
 lcid@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
+  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
   dependencies:
     invert-kv "^2.0.0"
 
 less-loader@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-4.1.0.tgz#2c1352c5b09a4f84101490274fd51674de41363e"
+  integrity sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==
   dependencies:
     clone "^2.1.1"
     loader-utils "^1.1.0"
@@ -4886,6 +5658,7 @@ less-loader@4.1.0:
 less-plugin-npm-import@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/less-plugin-npm-import/-/less-plugin-npm-import-2.1.0.tgz#823e6986c93318a98171ca858848b6bead55bf3e"
+  integrity sha1-gj5phskzGKmBccqFiEi2vq1Vvz4=
   dependencies:
     promise "~7.0.1"
     resolve "~1.1.6"
@@ -4893,6 +5666,7 @@ less-plugin-npm-import@^2.1.0:
 less@3.8.1, less@^3.8.0:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/less/-/less-3.8.1.tgz#f31758598ef5a1930dd4caefa9e4340641e71e1d"
+  integrity sha512-8HFGuWmL3FhQR0aH89escFNBQH/nEiYPP2ltDFdQw2chE28Yx2E3lhAIq9Y2saYwLSwa699s4dBVEfCY8Drf7Q==
   dependencies:
     clone "^2.1.2"
   optionalDependencies:
@@ -4908,6 +5682,7 @@ less@3.8.1, less@^3.8.0:
 levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
   dependencies:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
@@ -4915,10 +5690,12 @@ levn@~0.3.0:
 libbase64@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/libbase64/-/libbase64-0.1.0.tgz#62351a839563ac5ff5bd26f12f60e9830bb751e6"
+  integrity sha1-YjUag5VjrF/1vSbxL2Dpgwu3UeY=
 
 libmime@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/libmime/-/libmime-3.0.0.tgz#51a1a9e7448ecbd32cda54421675bb21bc093da6"
+  integrity sha1-UaGp50SOy9Ms2lRCFnW7IbwJPaY=
   dependencies:
     iconv-lite "0.4.15"
     libbase64 "0.1.0"
@@ -4927,10 +5704,12 @@ libmime@3.0.0:
 libqp@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/libqp/-/libqp-1.1.0.tgz#f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"
+  integrity sha1-9ebgatdLeU+1tbZpiL9yjvHe2+g=
 
 license-checker@^20.1.0:
   version "20.2.0"
   resolved "https://registry.yarnpkg.com/license-checker/-/license-checker-20.2.0.tgz#edb2605fd714514ed16e7eeee5b88a41900241d2"
+  integrity sha512-bseotvz8lfzEY7siilsJhQd2K/z+IF9aeJ+ZscieyZ70S6Ql2iJdVp1IfnL6gkdU4ny5JctT5Y2lFCQerSCfGA==
   dependencies:
     chalk "^2.4.1"
     debug "^3.1.0"
@@ -4947,18 +5726,21 @@ license-checker@^20.1.0:
 license-webpack-plugin@2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.0.2.tgz#9d34b521cb7fca8527945310b05be6ef0248b687"
+  integrity sha512-GsomZw5VoT20ST8qH2tOjBgbyhn6Pgs9M94g0mbvfBIV1VXufm1iKY+4dbgfTObj1Mp6nSRE3Zf74deOZr0KwA==
   dependencies:
     webpack-sources "^1.2.0"
 
 lie@~3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
+  integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=
   dependencies:
     immediate "~3.0.5"
 
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -4969,6 +5751,7 @@ load-json-file@^1.0.0:
 load-json-file@^2.0.0:
   version "2.0.0"
   resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -4978,6 +5761,7 @@ load-json-file@^2.0.0:
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^4.0.0"
@@ -4987,10 +5771,12 @@ load-json-file@^4.0.0:
 loader-runner@^2.3.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.1.tgz#026f12fe7c3115992896ac02ba022ba92971b979"
+  integrity sha512-By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw==
 
 loader-utils@1.1.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
+  integrity sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=
   dependencies:
     big.js "^3.1.3"
     emojis-list "^2.0.0"
@@ -4999,6 +5785,7 @@ loader-utils@1.1.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
   dependencies:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
@@ -5006,6 +5793,7 @@ locate-path@^2.0.0:
 locate-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
   dependencies:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
@@ -5013,30 +5801,37 @@ locate-path@^3.0.0:
 lodash._reinterpolate@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
 
 lodash.assign@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
+  integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
 
 lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
 lodash.mergewith@^4.6.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
+  integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==
 
 lodash.tail@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
+  integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=
 
 lodash.template@^4.0.2:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
+  integrity sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=
   dependencies:
     lodash._reinterpolate "~3.0.0"
     lodash.templatesettings "^4.0.0"
@@ -5044,20 +5839,24 @@ lodash.template@^4.0.2:
 lodash.templatesettings@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
+  integrity sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
 lodash@4.17.10, lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.5.0:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+  integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==
 
 lodash@^4.15.0, lodash@^4.16.6, lodash@^4.17.5, lodash@^4.8.0, lodash@~4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
 log4js@^2.3.9:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-2.11.0.tgz#bf3902eff65c6923d9ce9cfbd2db54160e34005a"
+  integrity sha512-z1XdwyGFg8/WGkOyF6DPJjivCWNLKrklGdViywdYnSKOvgtEBo2UyEMZS5sD2mZrQlU3TvO8wDWLc8mzE1ncBQ==
   dependencies:
     circular-json "^0.5.4"
     date-format "^1.2.0"
@@ -5077,6 +5876,7 @@ log4js@^2.3.9:
 log4js@^3.0.0:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.6.tgz#e6caced94967eeeb9ce399f9f8682a4b2b28c8ff"
+  integrity sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==
   dependencies:
     circular-json "^0.5.5"
     date-format "^1.2.0"
@@ -5087,6 +5887,7 @@ log4js@^3.0.0:
 logform@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/logform/-/logform-1.9.1.tgz#58b29d7b11c332456d7a217e17b48a13ad69d60a"
+  integrity sha512-ZHrZE8VSf7K3xKxJiQ1aoTBp2yK+cEbFcgarsjzI3nt3nE/3O0heNSppoOQMUJVMZo/xiVwCxiXIabaZApsKNQ==
   dependencies:
     colors "^1.2.1"
     fast-safe-stringify "^2.0.4"
@@ -5097,6 +5898,7 @@ logform@^1.9.1:
 loggly@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/loggly/-/loggly-1.1.1.tgz#0a0fc1d3fa3a5ec44fdc7b897beba2a4695cebee"
+  integrity sha1-Cg/B0/o6XsRP3HuJe+uipGlc6+4=
   dependencies:
     json-stringify-safe "5.0.x"
     request "2.75.x"
@@ -5105,20 +5907,24 @@ loggly@^1.1.0:
 loglevel@^1.4.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
+  integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
 
 long@~3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
+  integrity sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=
 
 loose-envify@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
 loud-rejection@^1.0.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
   dependencies:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
@@ -5126,18 +5932,22 @@ loud-rejection@^1.0.0:
 lowercase-keys@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
+  integrity sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=
 
 lowercase-keys@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
+  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
 
 lru-cache@2.2.x:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d"
+  integrity sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=
 
 lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
+  integrity sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==
   dependencies:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
@@ -5145,24 +5955,28 @@ lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache
 magic-string@^0.22.4:
   version "0.22.5"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
+  integrity sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==
   dependencies:
     vlq "^0.2.2"
 
 magic-string@^0.25.0:
   version "0.25.0"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.0.tgz#1f3696f9931ff0a1ed4c132250529e19cad6759b"
+  integrity sha512-Msbwa9oNYNPjwVh9ury5X2BHbTFWoirTlzuf4X+pIoSOQVKNRJHXTx1WmKYuXzRM4QZFv8dGXyZvhDMmWhGLPw==
   dependencies:
     sourcemap-codec "^1.4.1"
 
 magic-string@^0.25.1:
   version "0.25.1"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.1.tgz#b1c248b399cd7485da0fe7385c2fc7011843266e"
+  integrity sha512-sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg==
   dependencies:
     sourcemap-codec "^1.4.1"
 
 mailcomposer@4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/mailcomposer/-/mailcomposer-4.0.1.tgz#0e1c44b2a07cf740ee17dc149ba009f19cadfeb4"
+  integrity sha1-DhxEsqB890DuF9wUm6AJ8Zyt/rQ=
   dependencies:
     buildmail "4.0.1"
     libmime "3.0.0"
@@ -5170,6 +5984,7 @@ mailcomposer@4.0.1:
 mailgun-js@^0.18.0:
   version "0.18.1"
   resolved "https://registry.yarnpkg.com/mailgun-js/-/mailgun-js-0.18.1.tgz#ee39aa18d7bb598a5ce9ede84afb681defc8a6b0"
+  integrity sha512-lvuMP14u24HS2uBsJEnzSyPMxzU2b99tQsIx1o6QNjqxjk8b3WvR+vq5oG1mjqz/IBYo+5gF+uSoDS0RkMVHmg==
   dependencies:
     async "~2.6.0"
     debug "~3.1.0"
@@ -5184,16 +5999,19 @@ mailgun-js@^0.18.0:
 make-dir@^1.0.0, make-dir@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
+  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
   dependencies:
     pify "^3.0.0"
 
 make-error@^1.1.1:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
+  integrity sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==
 
 make-fetch-happen@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz#141497cb878f243ba93136c83d8aba12c216c083"
+  integrity sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==
   dependencies:
     agentkeepalive "^3.4.1"
     cacache "^11.0.1"
@@ -5210,38 +6028,46 @@ make-fetch-happen@^4.0.1:
 map-age-cleaner@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz#098fb15538fd3dbe461f12745b0ca8568d4e3f74"
+  integrity sha512-UN1dNocxQq44IhJyMI4TU8phc2m9BddacHRPRjKGLYaF0jqd3xLz0jS0skpAU9WgYyoR4gHtUpzytNBS385FWQ==
   dependencies:
     p-defer "^1.0.0"
 
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
 map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
 
 map-obj@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
+  integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk=
 
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
   dependencies:
     object-visit "^1.0.0"
 
 material-design-icons@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/material-design-icons/-/material-design-icons-3.0.1.tgz#9a71c48747218ebca51e51a66da682038cdcb7bf"
+  integrity sha1-mnHEh0chjrylHlGmbaaCA4zct78=
 
 math-random@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
+  integrity sha1-izqsWIuKZuSXXjzepn97sylgH6w=
 
 md5.js@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
+  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
   dependencies:
     hash-base "^3.0.0"
     inherits "^2.0.1"
@@ -5250,16 +6076,19 @@ md5.js@^1.3.4:
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
 mem@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
+  integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
   dependencies:
     mimic-fn "^1.0.0"
 
 mem@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf"
+  integrity sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==
   dependencies:
     map-age-cleaner "^0.1.1"
     mimic-fn "^1.0.0"
@@ -5268,6 +6097,7 @@ mem@^4.0.0:
 memory-fs@^0.4.0, memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
   dependencies:
     errno "^0.1.3"
     readable-stream "^2.0.1"
@@ -5275,6 +6105,7 @@ memory-fs@^0.4.0, memory-fs@~0.4.1:
 meow@^3.3.0, meow@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
   dependencies:
     camelcase-keys "^2.0.0"
     decamelize "^1.1.2"
@@ -5290,6 +6121,7 @@ meow@^3.3.0, meow@^3.7.0:
 meow@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/meow/-/meow-4.0.1.tgz#d48598f6f4b1472f35bf6317a95945ace347f975"
+  integrity sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==
   dependencies:
     camelcase-keys "^4.0.0"
     decamelize-keys "^1.0.0"
@@ -5304,20 +6136,24 @@ meow@^4.0.0:
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
 
 merge-source-map@1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz#a5de46538dae84d4114cc5ea02b4772a6346701f"
+  integrity sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=
   dependencies:
     source-map "^0.5.6"
 
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
 micromatch@^2.1.5, micromatch@^2.3.11:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
   dependencies:
     arr-diff "^2.0.0"
     array-unique "^0.2.1"
@@ -5336,6 +6172,7 @@ micromatch@^2.1.5, micromatch@^2.3.11:
 micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -5354,6 +6191,7 @@ micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
   dependencies:
     bn.js "^4.0.0"
     brorand "^1.0.1"
@@ -5361,46 +6199,56 @@ miller-rabin@^4.0.0:
 "mime-db@>= 1.36.0 < 2", mime-db@~1.37.0:
   version "1.37.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
+  integrity sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==
 
 mime-db@~1.36.0:
   version "1.36.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
+  integrity sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==
 
 mime-types@^2.1.11, mime-types@~2.1.7:
   version "2.1.21"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
+  integrity sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==
   dependencies:
     mime-db "~1.37.0"
 
 mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
   version "2.1.20"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
+  integrity sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==
   dependencies:
     mime-db "~1.36.0"
 
 mime@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
+  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
 mime@^1.3.4, mime@^1.4.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mime@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
+  integrity sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==
 
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
 mimic-response@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
+  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
 
 mini-css-extract-plugin@0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.4.tgz#c10410a004951bd3cedac1da69053940fccb625d"
+  integrity sha512-o+Jm+ocb0asEngdM6FsZWtZsRzA8koFUudIDwYUfl94M3PejPHG7Vopw5hN9V8WsMkSFpm3tZP3Fesz89EyrfQ==
   dependencies:
     loader-utils "^1.1.0"
     schema-utils "^1.0.0"
@@ -5409,20 +6257,24 @@ mini-css-extract-plugin@0.4.4:
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
 minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
 "minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
 minimist-options@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
+  integrity sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==
   dependencies:
     arrify "^1.0.1"
     is-plain-obj "^1.1.0"
@@ -5430,18 +6282,22 @@ minimist-options@^3.0.1:
 minimist@0.0.8:
   version "0.0.8"
   resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
 minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
 minimist@~0.0.1:
   version "0.0.10"
   resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
 minipass@^2.2.1, minipass@^2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
+  integrity sha512-mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==
   dependencies:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
@@ -5449,6 +6305,7 @@ minipass@^2.2.1, minipass@^2.3.3:
 minipass@^2.3.5:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
+  integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
   dependencies:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
@@ -5456,12 +6313,14 @@ minipass@^2.3.5:
 minizlib@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
+  integrity sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==
   dependencies:
     minipass "^2.2.1"
 
 mississippi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
+  integrity sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==
   dependencies:
     concat-stream "^1.5.0"
     duplexify "^3.4.2"
@@ -5477,6 +6336,7 @@ mississippi@^2.0.0:
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
   dependencies:
     concat-stream "^1.5.0"
     duplexify "^3.4.2"
@@ -5492,6 +6352,7 @@ mississippi@^3.0.0:
 mixin-deep@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
@@ -5499,6 +6360,7 @@ mixin-deep@^1.2.0:
 mixin-object@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
+  integrity sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=
   dependencies:
     for-in "^0.1.3"
     is-extendable "^0.1.1"
@@ -5506,16 +6368,19 @@ mixin-object@^2.0.1:
 mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
   version "0.5.1"
   resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
 
 modify-values@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
+  integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
   dependencies:
     aproba "^1.1.1"
     copy-concurrently "^1.0.0"
@@ -5527,18 +6392,22 @@ move-concurrently@^1.0.1:
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
 ms@^2.0.0, ms@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
 multicast-dns-service-types@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
+  integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=
 
 multicast-dns@^6.0.1:
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
+  integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==
   dependencies:
     dns-packet "^1.3.1"
     thunky "^1.0.2"
@@ -5546,18 +6415,22 @@ multicast-dns@^6.0.1:
 mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
 nan@^2.10.0:
   version "2.11.1"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766"
+  integrity sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==
 
 nan@^2.9.2:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.0.tgz#574e360e4d954ab16966ec102c0c049fd961a099"
+  integrity sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -5574,6 +6447,7 @@ nanomatch@^1.2.9:
 needle@^2.2.1:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.3.tgz#c1b04da378cd634d8befe2de965dc2cfb0fd65ca"
+  integrity sha512-GPL22d/U9cai87FcCPO6e+MT3vyHS2j+zwotakDc7kE2DtUAqFKMXLJCTtRp+5S75vXIwQPvIxkvlctxf9q4gQ==
   dependencies:
     debug "^2.1.2"
     iconv-lite "^0.4.4"
@@ -5582,18 +6456,22 @@ needle@^2.2.1:
 negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
+  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
 
 neo-async@^2.5.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
+  integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
 
 netmask@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35"
+  integrity sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU=
 
 ng-packagr@^4.2.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-4.4.0.tgz#b868a829b5743870c6392491de3faf4e4cec6f4d"
+  integrity sha512-dLpC/kmQsdbkL96ZclGjNRhq/J4MwpPKwPYNom74lvXqFC2jbbT/fnwmxX9WKXjvE8MEGsg2D2x8MsRURiNscg==
   dependencies:
     "@ngtools/json-schema" "^1.1.0"
     autoprefixer "^9.0.0"
@@ -5626,10 +6504,12 @@ ng-packagr@^4.2.0:
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 node-fetch-npm@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7"
+  integrity sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==
   dependencies:
     encoding "^0.1.11"
     json-parse-better-errors "^1.0.0"
@@ -5638,14 +6518,17 @@ node-fetch-npm@^2.0.2:
 node-fetch@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.2.0.tgz#4ee79bde909262f9775f731e3656d0db55ced5b5"
+  integrity sha512-OayFWziIxiHY8bCUyLX6sTpDH8Jsbp4FfYd1j1f7vZyfgkcOnAyM4oQR16f8a0s7Gl/viMGRey8eScYk4V4EZA==
 
 node-forge@0.7.5:
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
+  integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==
 
 node-gyp@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
+  integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
   dependencies:
     fstream "^1.0.0"
     glob "^7.0.3"
@@ -5663,6 +6546,7 @@ node-gyp@^3.8.0:
 node-libs-browser@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
+  integrity sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==
   dependencies:
     assert "^1.1.1"
     browserify-zlib "^0.2.0"
@@ -5691,6 +6575,7 @@ node-libs-browser@^2.0.0:
 node-pre-gyp@^0.10.0:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
+  integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==
   dependencies:
     detect-libc "^1.0.2"
     mkdirp "^0.5.1"
@@ -5706,18 +6591,21 @@ node-pre-gyp@^0.10.0:
 node-releases@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.2.tgz#27c296d9fca3b659c64f7d43ea47a31ad2a90e4b"
+  integrity sha512-zP8Asfg13lG9KDAW85rylSxXBYvaSdtjMIYKHUk8c1fM8drmFwRqbSYKYD+UlNVPUvrceSvgLUKHMOWR5jPWQg==
   dependencies:
     semver "^5.3.0"
 
 node-sass-tilde-importer@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz#1a15105c153f648323b4347693fdb0f331bad1ce"
+  integrity sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==
   dependencies:
     find-parent-dir "^0.3.0"
 
 node-sass@4.9.3:
   version "4.9.3"
   resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.3.tgz#f407cf3d66f78308bb1e346b24fa428703196224"
+  integrity sha512-XzXyGjO+84wxyH7fV6IwBOTrEBe2f0a6SBze9QWWYR/cL74AcQUks2AsqcCZenl/Fp/JVbuEaLpgrLtocwBUww==
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -5742,6 +6630,7 @@ node-sass@4.9.3:
 node-sass@^4.9.3:
   version "4.9.4"
   resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.4.tgz#349bd7f1c89422ffe7e1e4b60f2055a69fbc5512"
+  integrity sha512-MXyurANsUoE4/6KmfMkwGcBzAnJQ5xJBGW7Ei6ea8KnUKuzHr/SguVBIi3uaUAHtZCPUYkvlJ3Ef5T5VAwVpaA==
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -5766,10 +6655,12 @@ node-sass@^4.9.3:
 node-uuid@~1.4.7:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
+  integrity sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=
 
 nodemailer-direct-transport@3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/nodemailer-direct-transport/-/nodemailer-direct-transport-3.3.2.tgz#e96fafb90358560947e569017d97e60738a50a86"
+  integrity sha1-6W+vuQNYVglH5WkBfZfmBzilCoY=
   dependencies:
     nodemailer-shared "1.1.0"
     smtp-connection "2.12.0"
@@ -5777,16 +6668,19 @@ nodemailer-direct-transport@3.3.2:
 nodemailer-fetch@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz#79c4908a1c0f5f375b73fe888da9828f6dc963a4"
+  integrity sha1-ecSQihwPXzdbc/6IjamCj23JY6Q=
 
 nodemailer-shared@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz#cf5994e2fd268d00f5cf0fa767a08169edb07ec0"
+  integrity sha1-z1mU4v0mjQD1zw+nZ6CBae2wfsA=
   dependencies:
     nodemailer-fetch "1.6.0"
 
 nodemailer-smtp-pool@2.8.2:
   version "2.8.2"
   resolved "https://registry.yarnpkg.com/nodemailer-smtp-pool/-/nodemailer-smtp-pool-2.8.2.tgz#2eb94d6cf85780b1b4725ce853b9cbd5e8da8c72"
+  integrity sha1-LrlNbPhXgLG0clzoU7nL1ejajHI=
   dependencies:
     nodemailer-shared "1.1.0"
     nodemailer-wellknown "0.1.10"
@@ -5795,6 +6689,7 @@ nodemailer-smtp-pool@2.8.2:
 nodemailer-smtp-transport@2.7.2:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/nodemailer-smtp-transport/-/nodemailer-smtp-transport-2.7.2.tgz#03d71c76314f14ac7dbc7bf033a6a6d16d67fb77"
+  integrity sha1-A9ccdjFPFKx9vHvwM6am0W1n+3c=
   dependencies:
     nodemailer-shared "1.1.0"
     nodemailer-wellknown "0.1.10"
@@ -5803,10 +6698,12 @@ nodemailer-smtp-transport@2.7.2:
 nodemailer-wellknown@0.1.10:
   version "0.1.10"
   resolved "https://registry.yarnpkg.com/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz#586db8101db30cb4438eb546737a41aad0cf13d5"
+  integrity sha1-WG24EB2zDLRDjrVGc3pBqtDPE9U=
 
 nodemailer@^2.5.0:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-2.7.2.tgz#f242e649aeeae39b6c7ed740ef7b061c404d30f9"
+  integrity sha1-8kLmSa7q45tsftdA73sGHEBNMPk=
   dependencies:
     libmime "3.0.0"
     mailcomposer "4.0.1"
@@ -5819,12 +6716,14 @@ nodemailer@^2.5.0:
 "nopt@2 || 3", nopt@3.x:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
   dependencies:
     abbrev "1"
 
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
   dependencies:
     abbrev "1"
     osenv "^0.1.4"
@@ -5832,6 +6731,7 @@ nopt@^4.0.1:
 normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, "normalize-package-data@~1.0.1 || ^2.0.0":
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
+  integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==
   dependencies:
     hosted-git-info "^2.1.4"
     is-builtin-module "^1.0.0"
@@ -5841,20 +6741,24 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-
 normalize-path@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
+  integrity sha1-MtDkcvkf80VwHBWoMRAY07CpA3k=
 
 normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
   dependencies:
     remove-trailing-separator "^1.0.1"
 
 normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
 normalize-url@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
+  integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==
   dependencies:
     prepend-http "^2.0.0"
     query-string "^5.0.1"
@@ -5863,10 +6767,12 @@ normalize-url@2.0.1:
 npm-bundled@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
+  integrity sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==
 
 "npm-package-arg@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
+  integrity sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==
   dependencies:
     hosted-git-info "^2.6.0"
     osenv "^0.1.5"
@@ -5876,6 +6782,7 @@ npm-bundled@^1.0.1:
 npm-packlist@^1.1.12:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a"
+  integrity sha512-WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
@@ -5883,6 +6790,7 @@ npm-packlist@^1.1.12:
 npm-packlist@^1.1.6:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de"
+  integrity sha512-CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
@@ -5890,6 +6798,7 @@ npm-packlist@^1.1.6:
 npm-pick-manifest@^2.1.0, npm-pick-manifest@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40"
+  integrity sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==
   dependencies:
     figgy-pudding "^3.5.1"
     npm-package-arg "^6.0.0"
@@ -5898,6 +6807,7 @@ npm-pick-manifest@^2.1.0, npm-pick-manifest@^2.2.3:
 npm-registry-client@^8.6.0:
   version "8.6.0"
   resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-8.6.0.tgz#7f1529f91450732e89f8518e0f21459deea3e4c4"
+  integrity sha512-Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg==
   dependencies:
     concat-stream "^1.5.2"
     graceful-fs "^4.1.6"
@@ -5916,6 +6826,7 @@ npm-registry-client@^8.6.0:
 npm-registry-fetch@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-3.8.0.tgz#aa7d9a7c92aff94f48dba0984bdef4bd131c88cc"
+  integrity sha512-hrw8UMD+Nob3Kl3h8Z/YjmKamb1gf7D1ZZch2otrIXM3uFLB5vjEY6DhMlq80z/zZet6eETLbOXcuQudCB3Zpw==
   dependencies:
     JSONStream "^1.3.4"
     bluebird "^3.5.1"
@@ -5927,12 +6838,14 @@ npm-registry-fetch@^3.8.0:
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
   dependencies:
     path-key "^2.0.0"
 
 "npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.0, npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
   dependencies:
     are-we-there-yet "~1.1.2"
     console-control-strings "~1.1.0"
@@ -5942,34 +6855,42 @@ npm-run-path@^2.0.0:
 null-check@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd"
+  integrity sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=
 
 num2fraction@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
 
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
 oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
 
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
 object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
 object-component@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
+  integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=
 
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
   dependencies:
     copy-descriptor "^0.1.0"
     define-property "^0.2.5"
@@ -5978,20 +6899,24 @@ object-copy@^0.1.0:
 object-inspect@~1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4"
+  integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==
 
 object-keys@^1.0.6:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
+  integrity sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==
 
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
   dependencies:
     isobject "^3.0.0"
 
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
   dependencies:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
@@ -5999,54 +6924,64 @@ object.omit@^2.0.0:
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
   dependencies:
     isobject "^3.0.1"
 
 obuf@^1.0.0, obuf@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
+  integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
 
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
   dependencies:
     ee-first "1.1.1"
 
 on-headers@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
+  integrity sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=
 
 once@1.x, once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
 one-time@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz#f8cdf77884826fe4dff93e3a9cc37b1e4480742e"
+  integrity sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=
 
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
   dependencies:
     mimic-fn "^1.0.0"
 
 opn@5.3.0:
   version "5.3.0"
   resolved "http://registry.npmjs.org/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
+  integrity sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==
   dependencies:
     is-wsl "^1.1.0"
 
 opn@^5.1.0:
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
+  integrity sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==
   dependencies:
     is-wsl "^1.1.0"
 
 optimist@^0.6.1, optimist@~0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
   dependencies:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
@@ -6054,6 +6989,7 @@ optimist@^0.6.1, optimist@~0.6.0:
 optionator@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
   dependencies:
     deep-is "~0.1.3"
     fast-levenshtein "~2.0.4"
@@ -6065,30 +7001,36 @@ optionator@^0.8.1:
 optjs@~3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/optjs/-/optjs-3.2.2.tgz#69a6ce89c442a44403141ad2f9b370bd5bb6f4ee"
+  integrity sha1-aabOicRCpEQDFBrS+bNwvVu29O4=
 
 original@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
+  integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
   dependencies:
     url-parse "^1.4.3"
 
 os-browserify@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
 os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
 os-locale@^1.4.0:
   version "1.4.0"
   resolved "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
   dependencies:
     lcid "^1.0.0"
 
 os-locale@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
+  integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==
   dependencies:
     execa "^0.7.0"
     lcid "^1.0.0"
@@ -6097,6 +7039,7 @@ os-locale@^2.0.0:
 os-locale@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.0.1.tgz#3b014fbf01d87f60a1e5348d80fe870dc82c4620"
+  integrity sha512-7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==
   dependencies:
     execa "^0.10.0"
     lcid "^2.0.0"
@@ -6105,10 +7048,12 @@ os-locale@^3.0.0:
 os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
 osenv@0, osenv@^0.1.4, osenv@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
@@ -6116,64 +7061,77 @@ osenv@0, osenv@^0.1.4, osenv@^0.1.5:
 p-cancelable@^0.4.0:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"
+  integrity sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==
 
 p-defer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
 
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
 p-is-promise@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
+  integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
 
 p-limit@^1.0.0, p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
   dependencies:
     p-try "^1.0.0"
 
 p-limit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
+  integrity sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==
   dependencies:
     p-try "^2.0.0"
 
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
   dependencies:
     p-limit "^1.1.0"
 
 p-locate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
   dependencies:
     p-limit "^2.0.0"
 
 p-map@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
 
 p-timeout@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
+  integrity sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==
   dependencies:
     p-finally "^1.0.0"
 
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
 
 p-try@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
+  integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
 
 pac-proxy-agent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz#11d578b72a164ad74bf9d5bac9ff462a38282432"
+  integrity sha512-AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q==
   dependencies:
     agent-base "^4.2.0"
     debug "^3.1.0"
@@ -6187,6 +7145,7 @@ pac-proxy-agent@^3.0.0:
 pac-resolver@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-3.0.0.tgz#6aea30787db0a891704deb7800a722a7615a6f26"
+  integrity sha512-tcc38bsjuE3XZ5+4vP96OfhOugrX+JcnpUbhfuc4LuXBLQhoTthOstZeoQJBDnQUDYzYmdImKsbz0xSl1/9qeA==
   dependencies:
     co "^4.6.0"
     degenerator "^1.0.4"
@@ -6197,6 +7156,7 @@ pac-resolver@^3.0.0:
 package-json@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
+  integrity sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=
   dependencies:
     got "^6.7.1"
     registry-auth-token "^3.0.1"
@@ -6206,6 +7166,7 @@ package-json@^4.0.0:
 pacote@9.1.1:
   version "9.1.1"
   resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.1.1.tgz#25091f75a25021de8be8d34cc6408728fca3579b"
+  integrity sha512-f28Rq5ozzKAA9YwIKw61/ipwAatUZseYmVssDbHHaexF0wRIVotapVEZPAjOT7Eu3LYVqEp0NVpNizoAnYBUaA==
   dependencies:
     bluebird "^3.5.2"
     cacache "^11.2.0"
@@ -6238,6 +7199,7 @@ pacote@9.1.1:
 pacote@^9.2.3:
   version "9.2.3"
   resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.2.3.tgz#48cfe87beb9177acd6594355a584a538835424b3"
+  integrity sha512-Y3+yY3nBRAxMlZWvr62XLJxOwCmG9UmkGZkFurWHoCjqF0cZL72cTOCRJTvWw8T4OhJS2RTg13x4oYYriauvEw==
   dependencies:
     bluebird "^3.5.2"
     cacache "^11.2.0"
@@ -6270,14 +7232,17 @@ pacote@^9.2.3:
 pako@^0.2.5:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
+  integrity sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=
 
 pako@^1.0.6, pako@~1.0.2, pako@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
+  integrity sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==
 
 parallel-transform@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
+  integrity sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=
   dependencies:
     cyclist "~0.2.2"
     inherits "^2.0.3"
@@ -6286,6 +7251,7 @@ parallel-transform@^1.1.0:
 parse-asn1@^5.0.0:
   version "5.1.1"
   resolved "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
+  integrity sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==
   dependencies:
     asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
@@ -6296,10 +7262,12 @@ parse-asn1@^5.0.0:
 parse-github-repo-url@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"
+  integrity sha1-nn2LslKmy2ukJZUGC3v23z28H1A=
 
 parse-glob@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
   dependencies:
     glob-base "^0.3.0"
     is-dotfile "^1.0.0"
@@ -6309,12 +7277,14 @@ parse-glob@^3.0.4:
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
   dependencies:
     error-ex "^1.2.0"
 
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
   dependencies:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
@@ -6322,6 +7292,7 @@ parse-json@^4.0.0:
 parse5-html-rewriting-stream@5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-5.1.0.tgz#63f92c958764aea8cbe3aa68f2e5895c32068ab8"
+  integrity sha512-hZlaOTHJs4dpC5yFHnOSEMh26ErsqTsLzxKqkuRcUqtiu0kMsBQ9pkgANkECDyoBUhJ3+hvb2DPLsyqbtcS61Q==
   dependencies:
     parse5 "^5.1.0"
     parse5-sax-parser "^5.1.0"
@@ -6329,88 +7300,107 @@ parse5-html-rewriting-stream@5.1.0:
 parse5-sax-parser@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/parse5-sax-parser/-/parse5-sax-parser-5.1.0.tgz#ec234d23223a8054a74ff173aa3dc2da74c5bbd9"
+  integrity sha512-VEhdEDhBkoSILPmsZ96SoIIUow3hZbtgQsqXw7r8DxxnqsCIO0fwkT9mWgBcf9SPjVUh92liuEprHrrYzXBPWQ==
   dependencies:
     parse5 "^5.1.0"
 
 parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
+  integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
 
 parse5@^5.0.0, parse5@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2"
+  integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==
 
 parseqs@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
+  integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=
   dependencies:
     better-assert "~1.0.0"
 
 parser-toolkit@>=0.0.3:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parser-toolkit/-/parser-toolkit-0.0.5.tgz#ec4b61729c86318b56ea971bfba6b3c672d62c01"
+  integrity sha1-7EthcpyGMYtW6pcb+6azxnLWLAE=
 
 parseuri@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
+  integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=
   dependencies:
     better-assert "~1.0.0"
 
 parseurl@~1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
+  integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
 
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
 path-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
+  integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=
 
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
 path-exists@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
   dependencies:
     pinkie-promise "^2.0.0"
 
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
 path-is-inside@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
 
 path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
 path-parse@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
 path-proxy@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/path-proxy/-/path-proxy-1.0.0.tgz#18e8a36859fc9d2f1a53b48dee138543c020de5e"
+  integrity sha1-GOijaFn8nS8aU7SN7hOFQ8Ag3l4=
   dependencies:
     inflection "~1.3.0"
 
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
 
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
   dependencies:
     graceful-fs "^4.1.2"
     pify "^2.0.0"
@@ -6419,18 +7409,21 @@ path-type@^1.0.0:
 path-type@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
+  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
   dependencies:
     pify "^2.0.0"
 
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
   dependencies:
     pify "^3.0.0"
 
 pbkdf2@^3.0.3:
   version "3.0.17"
   resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
+  integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -6441,58 +7434,70 @@ pbkdf2@^3.0.3:
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
 pidtree@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.0.tgz#f6fada10fccc9f99bf50e90d0b23d72c9ebc2e6b"
+  integrity sha512-9CT4NFlDcosssyg8KVFltgokyKZIFjoBxw8CTGy+5F38Y1eQWrt8tRayiUOXE+zVKQnYu5BR8JjCtvK3BcnBhg==
 
 pidusage@^2.0.17:
   version "2.0.17"
   resolved "https://registry.yarnpkg.com/pidusage/-/pidusage-2.0.17.tgz#6b4a2b4a09026f0e9828f7e5627837e4c0672581"
+  integrity sha512-N8X5v18rBmlBoArfS83vrnD0gIFyZkXEo7a5pAS2aT0i2OLVymFb2AzVg+v8l/QcXnE1JwZcaXR8daJcoJqtjw==
   dependencies:
     safe-buffer "^5.1.2"
 
 pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
 
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
 pkg-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
   dependencies:
     find-up "^2.1.0"
 
 pkg-dir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
+  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
   dependencies:
     find-up "^3.0.0"
 
 pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
+  integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==
 
 popper.js@^1.14.1:
   version "1.14.4"
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.4.tgz#8eec1d8ff02a5a3a152dd43414a15c7b79fd69b6"
+  integrity sha1-juwdj/AqWjoVLdQ0FKFce3n9abY=
 
 portfinder@1.0.17:
   version "1.0.17"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.17.tgz#a8a1691143e46c4735edefcf4fbcccedad26456a"
+  integrity sha512-syFcRIRzVI1BoEFOCaAiizwDolh1S1YXSodsVhncbhjzjZQulhczNRbqnUl9N31Q4dKGOXsNDqxC2BWBgSMqeQ==
   dependencies:
     async "^1.5.2"
     debug "^2.2.0"
@@ -6501,6 +7506,7 @@ portfinder@1.0.17:
 portfinder@^1.0.9:
   version "1.0.19"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.19.tgz#07e87914a55242dcda5b833d42f018d6875b595f"
+  integrity sha512-23aeQKW9KgHe6citUrG3r9HjeX6vls0h713TAa+CwTKZwNIr/pD2ApaxYF4Um3ZZyq4ar+Siv3+fhoHaIwSOSw==
   dependencies:
     async "^1.5.2"
     debug "^2.2.0"
@@ -6509,10 +7515,12 @@ portfinder@^1.0.9:
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
 postcss-import@12.0.0:
   version "12.0.0"
   resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.0.tgz#149f96a4ef0b27525c419784be8517ebd17e92c5"
+  integrity sha512-3KqKRZcaZAvxbY8DVLdd81tG5uKzbUQuiWIvy0o0fzEC42bKacqPYFWbfCQyw6L4LWUaqPz/idvIdbhpgQ32eQ==
   dependencies:
     postcss "^7.0.1"
     postcss-value-parser "^3.2.3"
@@ -6522,6 +7530,7 @@ postcss-import@12.0.0:
 postcss-load-config@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.0.0.tgz#f1312ddbf5912cd747177083c5ef7a19d62ee484"
+  integrity sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==
   dependencies:
     cosmiconfig "^4.0.0"
     import-cwd "^2.0.0"
@@ -6529,6 +7538,7 @@ postcss-load-config@^2.0.0:
 postcss-loader@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d"
+  integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==
   dependencies:
     loader-utils "^1.1.0"
     postcss "^7.0.0"
@@ -6538,6 +7548,7 @@ postcss-loader@3.0.0:
 postcss-url@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-8.0.0.tgz#7b10059bd12929cdbb1971c60f61a0e5af86b4ca"
+  integrity sha512-E2cbOQ5aii2zNHh8F6fk1cxls7QVFZjLPSrqvmiza8OuXLzIpErij8BDS5Y3STPfJgpIMNCPEr8JlKQWEoozUw==
   dependencies:
     mime "^2.3.1"
     minimatch "^3.0.4"
@@ -6548,10 +7559,12 @@ postcss-url@^8.0.0:
 postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
+  integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
 postcss@7.0.5, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
   version "7.0.5"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.5.tgz#70e6443e36a6d520b0fd4e7593fcca3635ee9f55"
+  integrity sha512-HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ==
   dependencies:
     chalk "^2.4.1"
     source-map "^0.6.1"
@@ -6560,38 +7573,47 @@ postcss@7.0.5, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
 prepend-http@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
+  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
 
 prepend-http@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
+  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
 
 preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
 process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+  integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
 
 process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
 
 process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
 promise-retry@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
+  integrity sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=
   dependencies:
     err-code "^1.0.0"
     retry "^0.10.0"
@@ -6599,24 +7621,28 @@ promise-retry@^1.1.1:
 promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
   dependencies:
     asap "~2.0.3"
 
 promise@~7.0.1:
   version "7.0.4"
   resolved "http://registry.npmjs.org/promise/-/promise-7.0.4.tgz#363e84a4c36c8356b890fed62c91ce85d02ed539"
+  integrity sha1-Nj6EpMNsg1a4kP7WLJHOhdAu1Tk=
   dependencies:
     asap "~2.0.3"
 
 promisify-call@^2.0.2:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/promisify-call/-/promisify-call-2.0.4.tgz#d48c2d45652ccccd52801ddecbd533a6d4bd5fba"
+  integrity sha1-1IwtRWUszM1SgB3ey9UzptS9X7o=
   dependencies:
     with-callback "^1.0.2"
 
 protobufjs@5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.3.tgz#e4dfe9fb67c90b2630d15868249bcc4961467a17"
+  integrity sha512-55Kcx1MhPZX0zTbVosMQEO5R6/rikNXd9b6RQK4KSPcrSIIwoXTtebIczUrXlwaSrbz4x8XUVThGPob1n8I4QA==
   dependencies:
     ascli "~1"
     bytebuffer "~5"
@@ -6626,12 +7652,14 @@ protobufjs@5.0.3:
 protoduck@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f"
+  integrity sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==
   dependencies:
     genfun "^5.0.0"
 
 protractor@~5.4.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.4.1.tgz#011a99e38df7aa45d22455b889ffbb13a6ce0bd9"
+  integrity sha512-ORey5ewQMYiXQxcQohsqEiKYOg/r5yJoJbt0tuROmmgajdg/CA3gTOZNIFJncUVMAJIk5YFqBBLUjKVmQO6tfA==
   dependencies:
     "@types/node" "^6.0.46"
     "@types/q" "^0.0.32"
@@ -6653,6 +7681,7 @@ protractor@~5.4.0:
 proxy-addr@~2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
+  integrity sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==
   dependencies:
     forwarded "~0.1.2"
     ipaddr.js "1.8.0"
@@ -6660,6 +7689,7 @@ proxy-addr@~2.0.4:
 proxy-agent@~3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-3.0.3.tgz#1c1a33db60ef5f2e9e35b876fd63c2bc681c611d"
+  integrity sha512-PXVVVuH9tiQuxQltFJVSnXWuDtNr+8aNBP6XVDDCDiUuDN8eRCm+ii4/mFWmXWEA0w8jjJSlePa4LXlM4jIzNA==
   dependencies:
     agent-base "^4.2.0"
     debug "^3.1.0"
@@ -6673,22 +7703,27 @@ proxy-agent@~3.0.0:
 proxy-from-env@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
+  integrity sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=
 
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
 pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
 psl@^1.1.24:
   version "1.1.29"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
+  integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==
 
 public-encrypt@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
+  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
   dependencies:
     bn.js "^4.1.0"
     browserify-rsa "^4.0.0"
@@ -6700,6 +7735,7 @@ public-encrypt@^4.0.0:
 pump@^2.0.0, pump@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
@@ -6707,6 +7743,7 @@ pump@^2.0.0, pump@^2.0.1:
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
@@ -6714,6 +7751,7 @@ pump@^3.0.0:
 pumpify@^1.3.3:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
   dependencies:
     duplexify "^3.6.0"
     inherits "^2.0.3"
@@ -6722,38 +7760,47 @@ pumpify@^1.3.3:
 punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
 
 punycode@1.4.1, punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
 punycode@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 q@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
+  integrity sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=
 
 q@^1.4.1, q@^1.5.0, q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
 qjobs@^1.1.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
+  integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
 
 qs@6.5.2, qs@~6.5.1, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
 qs@~6.2.0:
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"
+  integrity sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=
 
 query-string@^5.0.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
+  integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==
   dependencies:
     decode-uri-component "^0.2.0"
     object-assign "^4.1.0"
@@ -6762,22 +7809,27 @@ query-string@^5.0.1:
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
 
 querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
 querystringify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.0.tgz#7ded8dfbf7879dcc60d0a644ac6754b283ad17ef"
+  integrity sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==
 
 quick-lru@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
+  integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=
 
 quicktype-core@^5.0.41:
   version "5.0.41"
   resolved "https://registry.yarnpkg.com/quicktype-core/-/quicktype-core-5.0.41.tgz#83f090b1bddeefcff0581e0d9c754d83410ed453"
+  integrity sha512-CImdVo4M4TlDs0McPSql9HnaoG5/Z3w1bQIlAhc95qekxBx+jJ2HNIqXzEkIsvx7W7sIPZhOuCug9fvmqNkMKQ==
   dependencies:
     "@types/urijs" "github:quicktype/types-urijs"
     collection-utils "0.0.15"
@@ -6793,6 +7845,7 @@ quicktype-core@^5.0.41:
 quote-stream@^1.0.1, quote-stream@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/quote-stream/-/quote-stream-1.0.2.tgz#84963f8c9c26b942e153feeb53aae74652b7e0b2"
+  integrity sha1-hJY/jJwmuULhU/7rU6rnRlK34LI=
   dependencies:
     buffer-equal "0.0.1"
     minimist "^1.1.3"
@@ -6801,6 +7854,7 @@ quote-stream@^1.0.1, quote-stream@~1.0.2:
 randomatic@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.0.tgz#36f2ca708e9e567f5ed2ec01949026d50aa10116"
+  integrity sha512-KnGPVE0lo2WoXxIZ7cPR8YBpiol4gsSuOwDSg410oHh80ZMp5EiypNqL2K4Z77vJn6lB5rap7IkAmcUlalcnBQ==
   dependencies:
     is-number "^4.0.0"
     kind-of "^6.0.0"
@@ -6809,12 +7863,14 @@ randomatic@^3.0.0:
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
+  integrity sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==
   dependencies:
     safe-buffer "^5.1.0"
 
 randomfill@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
   dependencies:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
@@ -6822,10 +7878,12 @@ randomfill@^1.0.3:
 range-parser@^1.0.3, range-parser@^1.2.0, range-parser@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
+  integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
 raw-body@2.3.3, raw-body@^2.2.0:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
+  integrity sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==
   dependencies:
     bytes "3.0.0"
     http-errors "1.6.3"
@@ -6835,10 +7893,12 @@ raw-body@2.3.3, raw-body@^2.2.0:
 raw-loader@0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
+  integrity sha1-DD0L6u2KAclm2Xh793goElKpeao=
 
 rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
   dependencies:
     deep-extend "^0.6.0"
     ini "~1.3.0"
@@ -6848,12 +7908,14 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
 read-cache@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
+  integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=
   dependencies:
     pify "^2.3.0"
 
 read-installed@~4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/read-installed/-/read-installed-4.0.3.tgz#ff9b8b67f187d1e4c29b9feb31f6b223acd19067"
+  integrity sha1-/5uLZ/GH0eTCm5/rMfayI6zRkGc=
   dependencies:
     debuglog "^1.0.1"
     read-package-json "^2.0.0"
@@ -6867,6 +7929,7 @@ read-installed@~4.0.3:
 read-package-json@^2.0.0:
   version "2.0.13"
   resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a"
+  integrity sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==
   dependencies:
     glob "^7.1.1"
     json-parse-better-errors "^1.0.1"
@@ -6878,6 +7941,7 @@ read-package-json@^2.0.0:
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
   dependencies:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
@@ -6885,6 +7949,7 @@ read-pkg-up@^1.0.1:
 read-pkg-up@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
+  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
   dependencies:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
@@ -6892,6 +7957,7 @@ read-pkg-up@^2.0.0:
 read-pkg-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
+  integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=
   dependencies:
     find-up "^2.0.0"
     read-pkg "^3.0.0"
@@ -6899,6 +7965,7 @@ read-pkg-up@^3.0.0:
 read-pkg-up@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
+  integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==
   dependencies:
     find-up "^3.0.0"
     read-pkg "^3.0.0"
@@ -6906,6 +7973,7 @@ read-pkg-up@^4.0.0:
 read-pkg@^1.0.0, read-pkg@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
   dependencies:
     load-json-file "^1.0.0"
     normalize-package-data "^2.3.2"
@@ -6914,6 +7982,7 @@ read-pkg@^1.0.0, read-pkg@^1.1.0:
 read-pkg@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
+  integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
   dependencies:
     load-json-file "^2.0.0"
     normalize-package-data "^2.3.2"
@@ -6922,6 +7991,7 @@ read-pkg@^2.0.0:
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
+  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
   dependencies:
     load-json-file "^4.0.0"
     normalize-package-data "^2.3.2"
@@ -6930,6 +8000,7 @@ read-pkg@^3.0.0:
 "readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.0, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.3:
   version "2.3.6"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -6942,6 +8013,7 @@ read-pkg@^3.0.0:
 readable-stream@1.1.x, "readable-stream@1.x >=1.1.9":
   version "1.1.14"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -6951,6 +8023,7 @@ readable-stream@1.1.x, "readable-stream@1.x >=1.1.9":
 readable-stream@~2.0.5, readable-stream@~2.0.6:
   version "2.0.6"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
+  integrity sha1-j5A0HmilPMySh4jaz80Rs265t44=
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -6962,6 +8035,7 @@ readable-stream@~2.0.5, readable-stream@~2.0.6:
 readdir-scoped-modules@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
+  integrity sha1-n6+jfShr5dksuuve4DDcm19AZ0c=
   dependencies:
     debuglog "^1.0.1"
     dezalgo "^1.0.0"
@@ -6971,6 +8045,7 @@ readdir-scoped-modules@^1.0.0:
 readdirp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
+  integrity sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=
   dependencies:
     graceful-fs "^4.1.2"
     minimatch "^3.0.2"
@@ -6980,12 +8055,14 @@ readdirp@^2.0.0:
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
   dependencies:
     resolve "^1.1.6"
 
 redent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
   dependencies:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
@@ -6993,6 +8070,7 @@ redent@^1.0.0:
 redent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
+  integrity sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=
   dependencies:
     indent-string "^3.0.0"
     strip-indent "^2.0.0"
@@ -7000,14 +8078,17 @@ redent@^2.0.0:
 redis-commands@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.4.0.tgz#52f9cf99153efcce56a8f86af986bd04e988602f"
+  integrity sha512-cu8EF+MtkwI4DLIT0x9P8qNTLFhQD4jLfxLR0cCNkeGzs87FN6879JOJwNQR/1zD7aSYNbU0hgsV9zGY71Itvw==
 
 redis-parser@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-2.6.0.tgz#52ed09dacac108f1a631c07e9b69941e7a19504b"
+  integrity sha1-Uu0J2srBCPGmMcB+m2mUHnoZUEs=
 
 redis@^2.7.1:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/redis/-/redis-2.8.0.tgz#202288e3f58c49f6079d97af7a10e1303ae14b02"
+  integrity sha512-M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A==
   dependencies:
     double-ended-queue "^2.1.0-0"
     redis-commands "^1.2.0"
@@ -7016,24 +8097,29 @@ redis@^2.7.1:
 reflect-metadata@^0.1.2:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.12.tgz#311bf0c6b63cd782f228a81abe146a2bfa9c56f2"
+  integrity sha512-n+IyV+nGz3+0q3/Yf1ra12KpCyi001bi4XFxSjbiWWjfqb52iTTtpGXmCCAOWWIAn9KEuFZKGqBERHmrtScZ3A==
 
 regenerate@^1.2.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
+  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
 
 regenerator-runtime@^0.11.0:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
 regex-cache@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
+  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
   dependencies:
     is-equal-shallow "^0.1.3"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
   dependencies:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
@@ -7041,6 +8127,7 @@ regex-not@^1.0.0, regex-not@^1.0.2:
 regexpu-core@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
+  integrity sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=
   dependencies:
     regenerate "^1.2.1"
     regjsgen "^0.2.0"
@@ -7049,6 +8136,7 @@ regexpu-core@^1.0.0:
 registry-auth-token@^3.0.1:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
+  integrity sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==
   dependencies:
     rc "^1.1.6"
     safe-buffer "^5.0.1"
@@ -7056,44 +8144,53 @@ registry-auth-token@^3.0.1:
 registry-url@^3.0.3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
+  integrity sha1-PU74cPc93h138M+aOBQyRE4XSUI=
   dependencies:
     rc "^1.0.1"
 
 regjsgen@^0.2.0:
   version "0.2.0"
   resolved "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+  integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
 
 regjsparser@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+  integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=
   dependencies:
     jsesc "~0.5.0"
 
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
 repeat-element@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
 repeat-string@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae"
+  integrity sha1-x6jTI2BoNiBZp+RlH8aITosftK4=
 
 repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
 repeating@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
   dependencies:
     is-finite "^1.0.0"
 
 request@2.75.x:
   version "2.75.0"
   resolved "http://registry.npmjs.org/request/-/request-2.75.0.tgz#d2b8268a286da13eaa5d01adf5d18cc90f657d93"
+  integrity sha1-0rgmiihtoT6qXQGt9dGMyQ9lfZM=
   dependencies:
     aws-sign2 "~0.6.0"
     aws4 "^1.2.1"
@@ -7120,6 +8217,7 @@ request@2.75.x:
 request@2.85.0:
   version "2.85.0"
   resolved "http://registry.npmjs.org/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
+  integrity sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.6.0"
@@ -7147,6 +8245,7 @@ request@2.85.0:
 request@2.87.0:
   version "2.87.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
+  integrity sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.6.0"
@@ -7172,6 +8271,7 @@ request@2.87.0:
 request@^2.0.0, request@^2.74.0, request@^2.83.0, request@^2.87.0, request@^2.88.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -7197,6 +8297,7 @@ request@^2.0.0, request@^2.74.0, request@^2.83.0, request@^2.87.0, request@^2.88
 requestretry@^1.2.2:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/requestretry/-/requestretry-1.13.0.tgz#213ec1006eeb750e8b8ce54176283d15a8d55d94"
+  integrity sha512-Lmh9qMvnQXADGAQxsXHP4rbgO6pffCfuR8XUBdP9aitJcLQJxhp7YZK4xAVYXnPJ5E52mwrfiKQtKonPL8xsmg==
   dependencies:
     extend "^3.0.0"
     lodash "^4.15.0"
@@ -7206,56 +8307,68 @@ requestretry@^1.2.2:
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
 require-from-string@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
 
 requirejs@2.3.5:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.5.tgz#617b9acbbcb336540ef4914d790323a8d4b861b0"
+  integrity sha512-svnO+aNcR/an9Dpi44C7KSAy5fFGLtmPbaaCeQaklUz8BQhS64tWWIIlvEA5jrWICzlO/X9KSzSeXFnZdBu8nw==
 
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
   dependencies:
     resolve-from "^3.0.0"
 
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
 
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
 resolve@1.1.x, resolve@~1.1.6:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
 resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
+  integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==
   dependencies:
     path-parse "^1.0.5"
 
 responselike@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
+  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
   dependencies:
     lowercase-keys "^1.0.0"
 
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
   dependencies:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
@@ -7263,28 +8376,34 @@ restore-cursor@^2.0.0:
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
 retry@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
+  integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
 
 rfdc@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.2.tgz#e6e72d74f5dc39de8f538f65e00c36c18018e349"
+  integrity sha512-92ktAgvZhBzYTIK0Mja9uen5q5J3NRVMoDkJL2VMwq6SXjVCgqvQeVP2XAaUY6HT+XpQYeLSjb3UoitBryKmdA==
 
 rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
   dependencies:
     glob "^7.0.5"
 
 rimraf@~2.2.6:
   version "2.2.8"
   resolved "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
+  integrity sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=
 
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
   dependencies:
     hash-base "^3.0.0"
     inherits "^2.0.1"
@@ -7292,6 +8411,7 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
 rollup-plugin-commonjs@^9.1.3:
   version "9.2.0"
   resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.2.0.tgz#4604e25069e0c78a09e08faa95dc32dec27f7c89"
+  integrity sha512-0RM5U4Vd6iHjL6rLvr3lKBwnPsaVml+qxOGaaNUWN1lSq6S33KhITOfHmvxV3z2vy9Mk4t0g4rNlVaJJsNQPWA==
   dependencies:
     estree-walker "^0.5.2"
     magic-string "^0.25.1"
@@ -7301,12 +8421,14 @@ rollup-plugin-commonjs@^9.1.3:
 rollup-plugin-json@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/rollup-plugin-json/-/rollup-plugin-json-3.1.0.tgz#7c1daf60c46bc21021ea016bd00863561a03321b"
+  integrity sha512-BlYk5VspvGpjz7lAwArVzBXR60JK+4EKtPkCHouAWg39obk9S61hZYJDBfMK+oitPdoe11i69TlxKlMQNFC/Uw==
   dependencies:
     rollup-pluginutils "^2.3.1"
 
 rollup-plugin-node-resolve@^3.0.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.4.0.tgz#908585eda12e393caac7498715a01e08606abc89"
+  integrity sha512-PJcd85dxfSBWih84ozRtBkB731OjXk0KnzN0oGp7WOWcarAFkVa71cV5hTJg2qpVsV2U8EUwrzHP3tvy9vS3qg==
   dependencies:
     builtin-modules "^2.0.0"
     is-module "^1.0.0"
@@ -7315,6 +8437,7 @@ rollup-plugin-node-resolve@^3.0.0:
 rollup-plugin-sourcemaps@^0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.4.2.tgz#62125aa94087aadf7b83ef4dfaf629b473135e87"
+  integrity sha1-YhJaqUCHqt97g+9N+vYptHMTXoc=
   dependencies:
     rollup-pluginutils "^2.0.1"
     source-map-resolve "^0.5.0"
@@ -7322,6 +8445,7 @@ rollup-plugin-sourcemaps@^0.4.2:
 rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.3.tgz#3aad9b1eb3e7fe8262820818840bf091e5ae6794"
+  integrity sha512-2XZwja7b6P5q4RZ5FhyX1+f46xi1Z3qBKigLRZ6VTZjwbN0K1IFGMlwm06Uu0Emcre2Z63l77nq/pzn+KxIEoA==
   dependencies:
     estree-walker "^0.5.2"
     micromatch "^2.3.11"
@@ -7329,6 +8453,7 @@ rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.3.3:
 rollup@^0.66.0:
   version "0.66.6"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.66.6.tgz#ce7d6185beb7acea644ce220c25e71ae03275482"
+  integrity sha512-J7/SWanrcb83vfIHqa8+aVVGzy457GcjA6GVZEnD0x2u4OnOd0Q1pCrEoNe8yLwM6z6LZP02zBT2uW0yh5TqOw==
   dependencies:
     "@types/estree" "0.0.39"
     "@types/node" "*"
@@ -7336,38 +8461,45 @@ rollup@^0.66.0:
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+  integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
   dependencies:
     is-promise "^2.1.0"
 
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
   dependencies:
     aproba "^1.1.1"
 
 rxjs@6.3.3, rxjs@^6.0.0, rxjs@^6.1.0, rxjs@~6.3.0:
   version "6.3.3"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
+  integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==
   dependencies:
     tslib "^1.9.0"
 
 safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
   dependencies:
     ret "~0.1.10"
 
 "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 sass-graph@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
+  integrity sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=
   dependencies:
     glob "^7.0.0"
     lodash "^4.0.0"
@@ -7377,6 +8509,7 @@ sass-graph@^2.2.4:
 sass-loader@7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.1.0.tgz#16fd5138cb8b424bf8a759528a1972d72aad069d"
+  integrity sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==
   dependencies:
     clone-deep "^2.0.1"
     loader-utils "^1.0.1"
@@ -7388,6 +8521,7 @@ sass-loader@7.1.0:
 sauce-connect-launcher@^1.2.2:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sauce-connect-launcher/-/sauce-connect-launcher-1.2.4.tgz#8d38f85242a9fbede1b2303b559f7e20c5609a1c"
+  integrity sha512-X2vfwulR6brUGiicXKxPm1GJ7dBEeP1II450Uv4bHGrcGOapZNgzJvn9aioea5IC5BPp/7qjKdE3xbbTBIVXMA==
   dependencies:
     adm-zip "~0.4.3"
     async "^2.1.2"
@@ -7398,26 +8532,31 @@ sauce-connect-launcher@^1.2.2:
 saucelabs@^1.4.0, saucelabs@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-1.5.0.tgz#9405a73c360d449b232839919a86c396d379fd9d"
+  integrity sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==
   dependencies:
     https-proxy-agent "^2.2.1"
 
 sax@0.5.x:
   version "0.5.8"
   resolved "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
+  integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=
 
 sax@>=0.6.0, sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
 schema-utils@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
+  integrity sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=
   dependencies:
     ajv "^5.0.0"
 
 schema-utils@^0.4.4, schema-utils@^0.4.5:
   version "0.4.7"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
+  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
   dependencies:
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
@@ -7425,6 +8564,7 @@ schema-utils@^0.4.4, schema-utils@^0.4.5:
 schema-utils@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
+  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
   dependencies:
     ajv "^6.1.0"
     ajv-errors "^1.0.0"
@@ -7433,6 +8573,7 @@ schema-utils@^1.0.0:
 scss-tokenizer@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
+  integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE=
   dependencies:
     js-base64 "^2.1.8"
     source-map "^0.4.2"
@@ -7440,14 +8581,17 @@ scss-tokenizer@^0.2.3:
 seedrandom@^2.4.4:
   version "2.4.4"
   resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-2.4.4.tgz#b25ea98632c73e45f58b77cfaa931678df01f9ba"
+  integrity sha512-9A+PDmgm+2du77B5i0Ip2cxOqqHjgNxnBgglxLcX78A2D6c2rTo61z4jnVABpF4cKeDMDG+cmXXvdnqse2VqMA==
 
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
+  integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
 selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz#2ba87a1662c020b8988c981ae62cb2a01298eafc"
+  integrity sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==
   dependencies:
     jszip "^3.1.3"
     rimraf "^2.5.4"
@@ -7457,42 +8601,50 @@ selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
 selfsigned@^1.9.1:
   version "1.10.4"
   resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
+  integrity sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==
   dependencies:
     node-forge "0.7.5"
 
 semver-diff@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
+  integrity sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=
   dependencies:
     semver "^5.0.3"
 
 semver-dsl@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/semver-dsl/-/semver-dsl-1.0.1.tgz#d3678de5555e8a61f629eed025366ae5f27340a0"
+  integrity sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=
   dependencies:
     semver "^5.3.0"
 
 semver-intersect@1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/semver-intersect/-/semver-intersect-1.4.0.tgz#bdd9c06bedcdd2fedb8cd352c3c43ee8c61321f3"
+  integrity sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==
   dependencies:
     semver "^5.0.0"
 
 "semver@2 >=2.2.1 || 3.x || 4 || 5", semver@^5.0.0, semver@^5.0.3, semver@^5.1.0, semver@^5.4.1, semver@^5.6.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
 "semver@2 || 3 || 4 || 5", semver@5.5.1, semver@^5.3.0, semver@^5.5.0:
   version "5.5.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
+  integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
 
 semver@~5.3.0:
   version "5.3.0"
   resolved "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+  integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
 
 send@0.16.2:
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
+  integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
   dependencies:
     debug "2.6.9"
     depd "~1.1.2"
@@ -7511,10 +8663,12 @@ send@0.16.2:
 serialize-javascript@^1.4.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
+  integrity sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==
 
 serve-index@^1.7.2:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
+  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
   dependencies:
     accepts "~1.3.4"
     batch "0.6.1"
@@ -7527,6 +8681,7 @@ serve-index@^1.7.2:
 serve-static@1.13.2:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
+  integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
   dependencies:
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
@@ -7536,14 +8691,17 @@ serve-static@1.13.2:
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
 set-immediate-shim@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
 
 set-value@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -7553,6 +8711,7 @@ set-value@^0.4.3:
 set-value@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -7562,14 +8721,17 @@ set-value@^2.0.0:
 setimmediate@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
 
 setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.11"
   resolved "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -7577,6 +8739,7 @@ sha.js@^2.4.0, sha.js@^2.4.8:
 shallow-clone@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571"
+  integrity sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==
   dependencies:
     is-extendable "^0.1.1"
     kind-of "^5.0.0"
@@ -7585,20 +8748,24 @@ shallow-clone@^1.0.0:
 shallow-copy@~0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz#415f42702d73d810330292cc5ee86eae1a11a170"
+  integrity sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=
 
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
   dependencies:
     shebang-regex "^1.0.0"
 
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
 shelljs@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.2.tgz#345b7df7763f4c2340d584abb532c5f752ca9e35"
+  integrity sha512-pRXeNrCA2Wd9itwhvLp5LZQvPJ0wU6bcjaTMywHHGX5XWhVN2nzSu7WV0q+oUY7mGK3mgSkDDzP3MgjqdyIgbQ==
   dependencies:
     glob "^7.0.0"
     interpret "^1.0.0"
@@ -7607,38 +8774,46 @@ shelljs@^0.8.1:
 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"
+  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
 simple-swizzle@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
+  integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=
   dependencies:
     is-arrayish "^0.3.1"
 
 slack-node@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/slack-node/-/slack-node-0.2.0.tgz#de4b8dddaa8b793f61dbd2938104fdabf37dfa30"
+  integrity sha1-3kuN3aqLeT9h29KTgQT9q/N9+jA=
   dependencies:
     requestretry "^1.2.2"
 
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
 slide@^1.1.3, slide@~1.1.3:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
+  integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=
 
 smart-buffer@^1.0.4:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-1.1.15.tgz#7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"
+  integrity sha1-fxFLW2X6s+KjWqd1uxLw0cZJvxY=
 
 smart-buffer@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.1.tgz#07ea1ca8d4db24eb4cac86537d7d18995221ace3"
+  integrity sha512-RFqinRVJVcCAL9Uh1oVqE6FZkqsyLiVOYEZ20TqIOjuX7iFVJ+zsbs4RIghnw/pTs7mZvt8ZHhvm1ZUrR4fykg==
 
 smtp-connection@2.12.0:
   version "2.12.0"
   resolved "https://registry.yarnpkg.com/smtp-connection/-/smtp-connection-2.12.0.tgz#d76ef9127cb23c2259edb1e8349c2e8d5e2d74c1"
+  integrity sha1-1275EnyyPCJZ7bHoNJwujV4tdME=
   dependencies:
     httpntlm "1.6.1"
     nodemailer-shared "1.1.0"
@@ -7646,6 +8821,7 @@ smtp-connection@2.12.0:
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
   dependencies:
     define-property "^1.0.0"
     isobject "^3.0.0"
@@ -7654,12 +8830,14 @@ snapdragon-node@^2.0.1:
 snapdragon-util@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
   dependencies:
     kind-of "^3.2.0"
 
 snapdragon@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
   dependencies:
     base "^0.11.1"
     debug "^2.2.0"
@@ -7673,22 +8851,26 @@ snapdragon@^0.8.1:
 sntp@1.x.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
+  integrity sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=
   dependencies:
     hoek "2.x.x"
 
 sntp@2.x.x:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
+  integrity sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==
   dependencies:
     hoek "4.x.x"
 
 socket.io-adapter@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b"
+  integrity sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=
 
 socket.io-client@2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.0.4.tgz#0918a552406dc5e540b380dcd97afc4a64332f8e"
+  integrity sha1-CRilUkBtxeVAs4Dc2Xr8SmQzL44=
   dependencies:
     backo2 "1.0.2"
     base64-arraybuffer "0.1.5"
@@ -7707,6 +8889,7 @@ socket.io-client@2.0.4:
 socket.io-client@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.1.tgz#dcb38103436ab4578ddb026638ae2f21b623671f"
+  integrity sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==
   dependencies:
     backo2 "1.0.2"
     base64-arraybuffer "0.1.5"
@@ -7726,6 +8909,7 @@ socket.io-client@2.1.1:
 socket.io-parser@~3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.1.3.tgz#ed2da5ee79f10955036e3da413bfd7f1e4d86c8e"
+  integrity sha512-g0a2HPqLguqAczs3dMECuA1RgoGFPyvDqcbaDEdCWY9g59kdUAz3YRmaJBNKXflrHNwB7Q12Gkf/0CZXfdHR7g==
   dependencies:
     component-emitter "1.2.1"
     debug "~3.1.0"
@@ -7735,6 +8919,7 @@ socket.io-parser@~3.1.1:
 socket.io-parser@~3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz#e7c6228b6aa1f814e6148aea325b51aa9499e077"
+  integrity sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==
   dependencies:
     component-emitter "1.2.1"
     debug "~3.1.0"
@@ -7743,6 +8928,7 @@ socket.io-parser@~3.2.0:
 socket.io@2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.0.4.tgz#c1a4590ceff87ecf13c72652f046f716b29e6014"
+  integrity sha1-waRZDO/4fs8TxyZS8Eb3FrKeYBQ=
   dependencies:
     debug "~2.6.6"
     engine.io "~3.1.0"
@@ -7753,6 +8939,7 @@ socket.io@2.0.4:
 socket.io@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz#a069c5feabee3e6b214a75b40ce0652e1cfb9980"
+  integrity sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==
   dependencies:
     debug "~3.1.0"
     engine.io "~3.2.0"
@@ -7764,6 +8951,7 @@ socket.io@2.1.1:
 sockjs-client@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz#12fc9d6cb663da5739d3dc5fb6e8687da95cb177"
+  integrity sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==
   dependencies:
     debug "^3.2.5"
     eventsource "^1.0.7"
@@ -7775,6 +8963,7 @@ sockjs-client@1.3.0:
 sockjs@0.3.19:
   version "0.3.19"
   resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d"
+  integrity sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==
   dependencies:
     faye-websocket "^0.10.0"
     uuid "^3.0.1"
@@ -7782,6 +8971,7 @@ sockjs@0.3.19:
 socks-proxy-agent@^4.0.0, socks-proxy-agent@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz#5936bf8b707a993079c6f37db2091821bffa6473"
+  integrity sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==
   dependencies:
     agent-base "~4.2.0"
     socks "~2.2.0"
@@ -7789,6 +8979,7 @@ socks-proxy-agent@^4.0.0, socks-proxy-agent@^4.0.1:
 socks@1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/socks/-/socks-1.1.9.tgz#628d7e4d04912435445ac0b6e459376cb3e6d691"
+  integrity sha1-Yo1+TQSRJDVEWsC25Fk3bLPm1pE=
   dependencies:
     ip "^1.1.2"
     smart-buffer "^1.0.4"
@@ -7796,6 +8987,7 @@ socks@1.1.9:
 socks@~2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/socks/-/socks-2.2.1.tgz#68ad678b3642fbc5d99c64c165bc561eab0215f9"
+  integrity sha512-0GabKw7n9mI46vcNrVfs0o6XzWzjVa3h6GaSo2UPxtWAROXUWavfJWh1M4PR5tnE0dcnQXZIDFP4yrAysLze/w==
   dependencies:
     ip "^1.1.5"
     smart-buffer "^4.0.1"
@@ -7803,20 +8995,24 @@ socks@~2.2.0:
 sort-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
+  integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=
   dependencies:
     is-plain-obj "^1.0.0"
 
 source-list-map@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
+  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
 source-list-map@~0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
+  integrity sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=
 
 source-map-loader@0.2.4:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.4.tgz#c18b0dc6e23bf66f6792437557c569a11e072271"
+  integrity sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==
   dependencies:
     async "^2.5.0"
     loader-utils "^1.1.0"
@@ -7824,6 +9020,7 @@ source-map-loader@0.2.4:
 source-map-resolve@^0.5.0:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
   dependencies:
     atob "^2.1.1"
     decode-uri-component "^0.2.0"
@@ -7834,6 +9031,7 @@ source-map-resolve@^0.5.0:
 source-map-support@0.5.9, source-map-support@^0.5.0, source-map-support@^0.5.3, source-map-support@^0.5.5, source-map-support@~0.5.6:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
+  integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -7841,54 +9039,65 @@ source-map-support@0.5.9, source-map-support@^0.5.0, source-map-support@^0.5.3,
 source-map-support@~0.4.0:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
   dependencies:
     source-map "^0.5.6"
 
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
 source-map@0.1.x:
   version "0.1.43"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
   dependencies:
     amdefine ">=0.0.4"
 
 source-map@0.5.6:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+  integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
 
 source-map@0.7.3, source-map@^0.7.3:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
 
 source-map@^0.4.2, source-map@~0.4.1:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
   dependencies:
     amdefine ">=0.0.4"
 
 source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
 source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 source-map@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
+  integrity sha1-2rc/vPwrqBm03gO9b26qSBZLP50=
   dependencies:
     amdefine ">=0.0.4"
 
 sourcemap-codec@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz#c8fd92d91889e902a07aee392bdd2c5863958ba2"
+  integrity sha512-hX1eNBNuilj8yfFnECh0DzLgwKpBLMIvmhgEhixXNui8lMLBInTI8Kyxt++RwJnMNu7cAUo635L2+N1TxMJCzA==
 
 spdx-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/spdx-compare/-/spdx-compare-1.0.0.tgz#2c55f117362078d7409e6d7b08ce70a857cd3ed7"
+  integrity sha512-C1mDZOX0hnu0ep9dfmuoi03+eOdDoz2yvK79RxbcrVEG1NO1Ph35yW102DHWKN4pk80nwCgeMmSY5L25VE4D9A==
   dependencies:
     array-find-index "^1.0.2"
     spdx-expression-parse "^3.0.0"
@@ -7897,6 +9106,7 @@ spdx-compare@^1.0.0:
 spdx-correct@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
+  integrity sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
@@ -7904,14 +9114,17 @@ spdx-correct@^3.0.0:
 spdx-exceptions@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-1.0.5.tgz#9d21ac4da4bdb71d060fb74e5a67531d032cbba6"
+  integrity sha1-nSGsTaS9tx0GD7dOWmdTHQMsu6Y=
 
 spdx-exceptions@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
+  integrity sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==
 
 spdx-expression-parse@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
+  integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
@@ -7919,18 +9132,22 @@ spdx-expression-parse@^3.0.0:
 spdx-license-ids@^1.0.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+  integrity sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=
 
 spdx-license-ids@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz#e2a303236cac54b04031fa7a5a79c7e701df852f"
+  integrity sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w==
 
 spdx-ranges@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/spdx-ranges/-/spdx-ranges-2.0.0.tgz#257686798e5edb41d45c1aba3d3f1bb47af8d5ec"
+  integrity sha512-AUUXLfqkwD7GlzZkXv8ePPCpPjeVWI9xJCfysL8re/uKb6H10umMnC7bFRsHmLJan4fslUtekAgpHlSgLc/7mA==
 
 spdx-satisfies@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/spdx-satisfies/-/spdx-satisfies-4.0.0.tgz#ebc79eec88b68ac75618e2e5ee94fbc347587552"
+  integrity sha512-OcARj6U1OuVv98SVrRqgrR30sVocONtoPpnX8Xz4vXNrFVedqtbgkA+0KmQoXIQ2xjfltPPRVIMeNzKEFLWWKQ==
   dependencies:
     spdx-compare "^1.0.0"
     spdx-expression-parse "^3.0.0"
@@ -7939,6 +9156,7 @@ spdx-satisfies@^4.0.0:
 spdx@^0.5.1:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/spdx/-/spdx-0.5.2.tgz#76a428b9b97e7904ef83e62a4af0d06fdb50c265"
+  integrity sha512-WQbfCQT2uKLsDllnO9ItpcGUiiF1O/ZvBGCyqFZRg122HgiZubpwpZiM7BkmH19HC3XR3Z+DFMGJNzXSPebG8A==
   dependencies:
     spdx-exceptions "^1.0.0"
     spdx-license-ids "^1.0.0"
@@ -7946,6 +9164,7 @@ spdx@^0.5.1:
 spdy-transport@^2.0.18:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-2.1.0.tgz#4bbb15aaffed0beefdd56ad61dbdc8ba3e2cb7a1"
+  integrity sha512-bpUeGpZcmZ692rrTiqf9/2EUakI6/kXX1Rpe0ib/DyOzbiexVfXkw6GnvI9hVGvIwVaUhkaBojjCZwLNRGQg1g==
   dependencies:
     debug "^2.6.8"
     detect-node "^2.0.3"
@@ -7958,6 +9177,7 @@ spdy-transport@^2.0.18:
 spdy@^3.4.1:
   version "3.4.7"
   resolved "https://registry.yarnpkg.com/spdy/-/spdy-3.4.7.tgz#42ff41ece5cc0f99a3a6c28aabb73f5c3b03acbc"
+  integrity sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=
   dependencies:
     debug "^2.6.8"
     handle-thing "^1.2.5"
@@ -7969,38 +9189,45 @@ spdy@^3.4.1:
 speed-measure-webpack-plugin@1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.2.3.tgz#de170b5cefbfa1c039d95e639edd3ad50cfc7c48"
+  integrity sha512-p+taQ69VkRUXYMoZOx2nxV/Tz8tt79ahctoZJyJDHWP7fEYvwFNf5Pd73k5kZ6auu0pTsPNLEUwWpM8mCk85Zw==
   dependencies:
     chalk "^2.0.1"
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
   dependencies:
     extend-shallow "^3.0.0"
 
 split2@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493"
+  integrity sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==
   dependencies:
     through2 "^2.0.2"
 
 split@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
+  integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==
   dependencies:
     through "2"
 
 sprintf-js@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.1.tgz#36be78320afe5801f6cea3ee78b6e5aab940ea0c"
+  integrity sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw=
 
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 sshpk@^1.7.0:
   version "1.14.2"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
+  integrity sha1-xvxhZIo9nE52T9P8306hBeSSupg=
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -8016,28 +9243,33 @@ sshpk@^1.7.0:
 ssri@^5.2.4:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
+  integrity sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==
   dependencies:
     safe-buffer "^5.1.1"
 
 ssri@^6.0.0, ssri@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
+  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
   dependencies:
     figgy-pudding "^3.5.1"
 
 stack-trace@0.0.x:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
+  integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
 
 static-eval@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.0.tgz#0e821f8926847def7b4b50cda5d55c04a9b13864"
+  integrity sha512-6flshd3F1Gwm+Ksxq463LtFd1liC77N/PX1FVVc3OzL3hAmo2fwHFbuArkcfi7s9rTNsLEhcRmXGFZhlgy40uw==
   dependencies:
     escodegen "^1.8.1"
 
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
   dependencies:
     define-property "^0.2.5"
     object-copy "^0.1.0"
@@ -8045,6 +9277,7 @@ static-extend@^0.1.1:
 static-module@^2.2.0:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/static-module/-/static-module-2.2.5.tgz#bd40abceae33da6b7afb84a0e4329ff8852bfbbf"
+  integrity sha512-D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ==
   dependencies:
     concat-stream "~1.6.0"
     convert-source-map "^1.5.1"
@@ -8064,30 +9297,36 @@ static-module@^2.2.0:
 stats-webpack-plugin@0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/stats-webpack-plugin/-/stats-webpack-plugin-0.7.0.tgz#ccffe9b745de8bbb155571e063f8263fc0e2bc06"
+  integrity sha512-NT0YGhwuQ0EOX+uPhhUcI6/+1Sq/pMzNuSCBVT4GbFl/ac6I/JZefBcjlECNfAb1t3GOx5dEj1Z7x0cAxeeVLQ==
   dependencies:
     lodash "^4.17.4"
 
 "statuses@>= 1.4.0 < 2":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
 statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
+  integrity sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=
 
 statuses@~1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
+  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
 
 stdout-stream@^1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
+  integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==
   dependencies:
     readable-stream "^2.0.1"
 
 stream-browserify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
+  integrity sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=
   dependencies:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
@@ -8095,6 +9334,7 @@ stream-browserify@^2.0.1:
 stream-each@^1.1.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
+  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
   dependencies:
     end-of-stream "^1.1.0"
     stream-shift "^1.0.0"
@@ -8102,6 +9342,7 @@ stream-each@^1.1.0:
 stream-http@^2.7.2:
   version "2.8.3"
   resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
+  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
   dependencies:
     builtin-status-codes "^3.0.0"
     inherits "^2.0.1"
@@ -8112,16 +9353,19 @@ stream-http@^2.7.2:
 stream-json@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/stream-json/-/stream-json-0.5.2.tgz#f4256c0ef1a905f2ef2d473706b4b3ff827653cf"
+  integrity sha512-/QlOLybrc6LkH/oVgXo1lJ8oemRIze/grdpfssLn1Pm8nZVhW4VMOqDDYGaORPodQFxiDEUquQJER5LiBu8Ehg==
   dependencies:
     parser-toolkit ">=0.0.3"
 
 stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
+  integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
 
 streamroller@0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-0.7.0.tgz#a1d1b7cf83d39afb0d63049a5acbf93493bdf64b"
+  integrity sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==
   dependencies:
     date-format "^1.2.0"
     debug "^3.1.0"
@@ -8131,10 +9375,12 @@ streamroller@0.7.0:
 strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
 
 string-to-stream@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string-to-stream/-/string-to-stream-1.1.1.tgz#aba78f73e70661b130ee3e1c0192be4fef6cb599"
+  integrity sha512-QySF2+3Rwq0SdO3s7BAp4x+c3qsClpPQ6abAmb0DGViiSBAkT5kL6JT2iyzEVP+T1SmzHrQD1TwlP9QAHCc+Sw==
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.1.0"
@@ -8142,6 +9388,7 @@ string-to-stream@^1.1.0:
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
   dependencies:
     code-point-at "^1.0.0"
     is-fullwidth-code-point "^1.0.0"
@@ -8150,6 +9397,7 @@ string-width@^1.0.1, string-width@^1.0.2:
 "string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
   dependencies:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
@@ -8157,60 +9405,72 @@ string-width@^1.0.1, string-width@^1.0.2:
 string_decoder@^1.0.0, string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
     safe-buffer "~5.1.0"
 
 string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
 
 stringstream@~0.0.4, stringstream@~0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
+  integrity sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
   dependencies:
     ansi-regex "^3.0.0"
 
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
   dependencies:
     is-utf8 "^0.2.0"
 
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
 strip-indent@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
   dependencies:
     get-stdin "^4.0.1"
 
 strip-indent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
+  integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=
 
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
 style-loader@0.23.1:
   version "0.23.1"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz#cb9154606f3e771ab6c4ab637026a1049174d925"
+  integrity sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==
   dependencies:
     loader-utils "^1.1.0"
     schema-utils "^1.0.0"
@@ -8218,6 +9478,7 @@ style-loader@0.23.1:
 stylus-loader@3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-3.0.2.tgz#27a706420b05a38e038e7cacb153578d450513c6"
+  integrity sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==
   dependencies:
     loader-utils "^1.0.2"
     lodash.clonedeep "^4.5.0"
@@ -8226,6 +9487,7 @@ stylus-loader@3.0.2:
 stylus@0.54.5, stylus@^0.54.5:
   version "0.54.5"
   resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
+  integrity sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=
   dependencies:
     css-parse "1.7.x"
     debug "*"
@@ -8237,30 +9499,36 @@ stylus@0.54.5, stylus@^0.54.5:
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
 supports-color@^3.1.0:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
   dependencies:
     has-flag "^1.0.0"
 
 supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
 symbol-observable@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
+  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
 tapable@^1.0.0, tapable@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c"
+  integrity sha512-IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA==
 
 tar-stream@^1.5.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
+  integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
   dependencies:
     bl "^1.0.0"
     buffer-alloc "^1.2.0"
@@ -8273,6 +9541,7 @@ tar-stream@^1.5.0:
 tar@^2.0.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+  integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
   dependencies:
     block-stream "*"
     fstream "^1.0.2"
@@ -8281,6 +9550,7 @@ tar@^2.0.0:
 tar@^4, tar@^4.4.4, tar@^4.4.6:
   version "4.4.6"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
+  integrity sha512-tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg==
   dependencies:
     chownr "^1.0.1"
     fs-minipass "^1.2.5"
@@ -8293,6 +9563,7 @@ tar@^4, tar@^4.4.4, tar@^4.4.6:
 temp@^0.8.3:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59"
+  integrity sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=
   dependencies:
     os-tmpdir "^1.0.0"
     rimraf "~2.2.6"
@@ -8300,12 +9571,14 @@ temp@^0.8.3:
 term-size@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
+  integrity sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=
   dependencies:
     execa "^0.7.0"
 
 terser-webpack-plugin@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.1.0.tgz#cf7c25a1eee25bf121f4a587bb9e004e3f80e528"
+  integrity sha512-61lV0DSxMAZ8AyZG7/A4a3UPlrbOBo8NIQ4tJzLPAdGOQ+yoNC7l5ijEow27lBAL2humer01KLS6bGIMYQxKoA==
   dependencies:
     cacache "^11.0.2"
     find-cache-dir "^2.0.0"
@@ -8319,6 +9592,7 @@ terser-webpack-plugin@1.1.0:
 terser@^3.8.1:
   version "3.10.8"
   resolved "https://registry.yarnpkg.com/terser/-/terser-3.10.8.tgz#2fe3967396a10cdc3d575074fe857efd30a2895a"
+  integrity sha512-GQJHWJ/vbx0EgRk+lBMONMmKaT+ifeo/XgT/hi3KpzEEFOERVyFuJSVXH8grcmJjiqKY35ds8rBCxvABUeyyuQ==
   dependencies:
     commander "~2.17.1"
     source-map "~0.6.1"
@@ -8327,14 +9601,17 @@ terser@^3.8.1:
 text-extensions@^1.0.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.8.0.tgz#6f343c62268843019b21a616a003557bdb952d2b"
+  integrity sha512-mVzjRxuWnDKs/qH1rbOJEVHLlSX9kty9lpi7lMvLgU9S74mQ8/Ozg9UPcKxShh0qG2NZ+NyPOPpcZU4C1Eld9A==
 
 text-hex@1.0.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5"
+  integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==
 
 through2@^2.0.0, through2@^2.0.2, through2@^2.0.3, through2@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
+  integrity sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=
   dependencies:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
@@ -8342,74 +9619,90 @@ through2@^2.0.0, through2@^2.0.2, through2@^2.0.3, through2@~2.0.3:
 through@2, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
 thunkify@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/thunkify/-/thunkify-2.1.2.tgz#faa0e9d230c51acc95ca13a361ac05ca7e04553d"
+  integrity sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=
 
 thunky@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.3.tgz#f5df732453407b09191dae73e2a8cc73f381a826"
+  integrity sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==
 
 timed-out@^4.0.0, timed-out@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
+  integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
 
 timers-browserify@^2.0.4:
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
+  integrity sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==
   dependencies:
     setimmediate "^1.0.4"
 
 timespan@2.3.x:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/timespan/-/timespan-2.3.0.tgz#4902ce040bd13d845c8f59b27e9d59bad6f39929"
+  integrity sha1-SQLOBAvRPYRcj1myfp1ZutbzmSk=
 
 tiny-inflate@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.2.tgz#93d9decffc8805bd57eae4310f0b745e9b6fb3a7"
+  integrity sha1-k9nez/yIBb1X6uQxDwt0Xptvs6c=
 
 tmp@0.0.30:
   version "0.0.30"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.30.tgz#72419d4a8be7d6ce75148fd8b324e593a711c2ed"
+  integrity sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=
   dependencies:
     os-tmpdir "~1.0.1"
 
 tmp@0.0.33, tmp@0.0.x, tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
   dependencies:
     os-tmpdir "~1.0.2"
 
 to-array@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
+  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
 
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
 to-buffer@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
+  integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==
 
 to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
 
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
   dependencies:
     kind-of "^3.0.2"
 
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
   dependencies:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
@@ -8417,6 +9710,7 @@ to-regex-range@^2.1.0:
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
   dependencies:
     define-property "^2.0.2"
     extend-shallow "^3.0.2"
@@ -8426,12 +9720,14 @@ to-regex@^3.0.1, to-regex@^3.0.2:
 tough-cookie@~2.3.0, tough-cookie@~2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
+  integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==
   dependencies:
     punycode "^1.4.1"
 
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
+  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
   dependencies:
     psl "^1.1.24"
     punycode "^1.4.1"
@@ -8439,40 +9735,49 @@ tough-cookie@~2.4.3:
 tree-kill@1.2.0, tree-kill@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36"
+  integrity sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==
 
 treeify@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/treeify/-/treeify-1.1.0.tgz#4e31c6a463accd0943879f30667c4fdaff411bb8"
+  integrity sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A==
 
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
 
 trim-newlines@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
+  integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=
 
 trim-off-newlines@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
+  integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM=
 
 trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+  integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
 
 triple-beam@^1.2.0, triple-beam@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9"
+  integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==
 
 "true-case-path@^1.0.2":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
+  integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==
   dependencies:
     glob "^7.1.2"
 
 ts-node@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-5.0.1.tgz#78e5d1cb3f704de1b641e43b76be2d4094f06f81"
+  integrity sha512-XK7QmDcNHVmZkVtkiwNDWiERRHPyU8nBqZB1+iv2UhOG0q3RQ9HsZ2CMqISlFbxjrYFGfG2mX7bW4dAyxBVzUw==
   dependencies:
     arrify "^1.0.0"
     chalk "^2.3.0"
@@ -8486,6 +9791,7 @@ ts-node@^5.0.0:
 tsickle@0.28.0:
   version "0.28.0"
   resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.28.0.tgz#6cd6fa004766c6ad9261b599c83866ee97cc7875"
+  integrity sha512-cb/Z4NlKMPGiIIbgmklfBJIxDl4EQoYqC+0/BnPxZWzWcUvikeOHFkkkEmabJVqKh47jUqOwU/uMAu6UvhicZg==
   dependencies:
     minimist "^1.2.0"
     mkdirp "^0.5.1"
@@ -8495,6 +9801,7 @@ tsickle@0.28.0:
 tsickle@>=0.27.3:
   version "0.33.1"
   resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.33.1.tgz#eee4ebabeda3bcd8afc32cee34c822cbe3e839ec"
+  integrity sha512-SpW2G3PvDGs4a5sMXPlWnCWHWRviWjSlI3U0734e3fU3U39VAE0NPr8M3W1cuL/OU/YXheYipGeEwtIJ5k0NHQ==
   dependencies:
     minimist "^1.2.0"
     mkdirp "^0.5.1"
@@ -8503,20 +9810,24 @@ tsickle@>=0.27.3:
 tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
+  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
 tslint-no-circular-imports@^0.5.0:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/tslint-no-circular-imports/-/tslint-no-circular-imports-0.5.2.tgz#47ac9194ec531101ac19198d5144f7ac9f57d980"
+  integrity sha512-Uzu2NiVX7b/kAk9vPrLqUmoCkth0dXUUNOaqwfxpvYgsHfoH67cmj0IHOUMZ1bC0swksJjaTyq7acHe/gU8H4A==
 
 tslint-sonarts@^1.7.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/tslint-sonarts/-/tslint-sonarts-1.8.0.tgz#80f2e8addd418c3b8807fc0155dec33b5a81e8d1"
+  integrity sha512-tpijO5VR18e+Ny99uMNNov3Hw7diiYQ8KoJkezpHGw9hSFFrO5g2PhwdQQo7O9puhJKMIutLl9g+ICMgg+bh0w==
   dependencies:
     immutable "^3.8.2"
 
 tslint@^5.11.0:
   version "5.11.0"
   resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.11.0.tgz#98f30c02eae3cde7006201e4c33cb08b48581eed"
+  integrity sha1-mPMMAurjzecAYgHkwzywi0hYHu0=
   dependencies:
     babel-code-frame "^6.22.0"
     builtin-modules "^1.1.1"
@@ -8534,46 +9845,55 @@ tslint@^5.11.0:
 tsscmp@~1.0.0:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"
+  integrity sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==
 
 tsutils@2.27.2:
   version "2.27.2"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.27.2.tgz#60ba88a23d6f785ec4b89c6e8179cac9b431f1c7"
+  integrity sha512-qf6rmT84TFMuxAKez2pIfR8UCai49iQsfB7YWVjV1bKpy/d0PWT5rEOSM6La9PiHZ0k1RRZQiwVdVJfQ3BPHgg==
   dependencies:
     tslib "^1.8.1"
 
 tsutils@^2.27.2:
   version "2.29.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
+  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
   dependencies:
     tslib "^1.8.1"
 
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
   dependencies:
     safe-buffer "^5.0.1"
 
 tunnel-agent@~0.4.1:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
+  integrity sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=
 
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
   dependencies:
     prelude-ls "~1.1.2"
 
 type-is@~1.6.16:
   version "1.6.16"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
+  integrity sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==
   dependencies:
     media-typer "0.3.0"
     mime-types "~2.1.18"
@@ -8581,14 +9901,22 @@ type-is@~1.6.16:
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
 typescript@3.1.3, typescript@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.3.tgz#01b70247a6d3c2467f70c45795ef5ea18ce191d5"
+  integrity sha512-+81MUSyX+BaSo+u2RbozuQk/UWx6hfG0a5gHu4ANEM4sU96XbuIyAB+rWBW1u70c6a5QuZfuYICn3s2UjuHUpA==
+
+typescript@3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.4.tgz#c74ef7b3c2da65beff548b903022cb8c3cd997ed"
+  integrity sha512-JZHJtA6ZL15+Q3Dqkbh8iCUmvxD3iJ7ujXS+fVkKnwIVAdHc5BJTDNM0aTrnr2luKulFjU7W+SRhDZvi66Ru7Q==
 
 uglify-es@^3.3.4:
   version "3.3.9"
   resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
+  integrity sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==
   dependencies:
     commander "~2.13.0"
     source-map "~0.6.1"
@@ -8596,6 +9924,7 @@ uglify-es@^3.3.4:
 uglify-js@^3.0.7, uglify-js@^3.1.4:
   version "3.4.9"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
+  integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==
   dependencies:
     commander "~2.17.1"
     source-map "~0.6.1"
@@ -8603,6 +9932,7 @@ uglify-js@^3.0.7, uglify-js@^3.1.4:
 uglifyjs-webpack-plugin@^1.2.4:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz#75f548160858163a08643e086d5fefe18a5d67de"
+  integrity sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==
   dependencies:
     cacache "^10.0.4"
     find-cache-dir "^1.0.0"
@@ -8616,10 +9946,12 @@ uglifyjs-webpack-plugin@^1.2.4:
 ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
+  integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
 
 underscore@~1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz#6bbaf0877500d36be34ecaa584e0db9fef035209"
+  integrity sha1-a7rwh3UA02vjTsqlhODbn+8DUgk=
 
 "unicode-properties@github:quicktype/unicode-properties#dist":
   version "1.1.0"
@@ -8631,6 +9963,7 @@ underscore@~1.7.0:
 unicode-trie@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/unicode-trie/-/unicode-trie-0.3.1.tgz#d671dddd89101a08bac37b6a5161010602052085"
+  integrity sha1-1nHd3YkQGgi6w3tqUWEBBgIFIIU=
   dependencies:
     pako "^0.2.5"
     tiny-inflate "^1.0.0"
@@ -8638,6 +9971,7 @@ unicode-trie@^0.3.0:
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
   dependencies:
     arr-union "^3.1.0"
     get-value "^2.0.6"
@@ -8647,32 +9981,38 @@ union-value@^1.0.0:
 unique-filename@^1.1.0, unique-filename@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
   dependencies:
     unique-slug "^2.0.0"
 
 unique-slug@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.1.tgz#5e9edc6d1ce8fb264db18a507ef9bd8544451ca6"
+  integrity sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==
   dependencies:
     imurmurhash "^0.1.4"
 
 unique-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
+  integrity sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=
   dependencies:
     crypto-random-string "^1.0.0"
 
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
   dependencies:
     has-value "^0.3.1"
     isobject "^3.0.0"
@@ -8680,14 +10020,17 @@ unset-value@^1.0.0:
 unzip-response@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
+  integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
 
 upath@^1.0.5:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
+  integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==
 
 update-notifier@^2.3.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6"
+  integrity sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==
   dependencies:
     boxen "^1.2.1"
     chalk "^2.0.1"
@@ -8703,32 +10046,38 @@ update-notifier@^2.3.0:
 uri-js@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
   dependencies:
     punycode "^2.1.0"
 
 urijs@^1.19.1:
   version "1.19.1"
   resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.1.tgz#5b0ff530c0cbde8386f6342235ba5ca6e995d25a"
+  integrity sha512-xVrGVi94ueCJNrBSTjWqjvtgvl3cyOTThp2zaMaFNGp3F542TR6sM3f2o8RqZl+AwteClSVmoCyt0ka4RjQOQg==
 
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
 url-parse-lax@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
+  integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=
   dependencies:
     prepend-http "^1.0.1"
 
 url-parse-lax@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
+  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
   dependencies:
     prepend-http "^2.0.0"
 
 url-parse@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.3.tgz#bfaee455c889023219d757e045fa6a684ec36c15"
+  integrity sha512-rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==
   dependencies:
     querystringify "^2.0.0"
     requires-port "^1.0.0"
@@ -8736,10 +10085,12 @@ url-parse@^1.4.3:
 url-to-options@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
+  integrity sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=
 
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
   dependencies:
     punycode "1.3.2"
     querystring "0.2.0"
@@ -8747,10 +10098,12 @@ url@^0.11.0:
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
 useragent@2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.2.1.tgz#cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"
+  integrity sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=
   dependencies:
     lru-cache "2.2.x"
     tmp "0.0.x"
@@ -8758,6 +10111,7 @@ useragent@2.2.1:
 useragent@^2.1.12:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz#217f943ad540cb2128658ab23fc960f6a88c9972"
+  integrity sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==
   dependencies:
     lru-cache "4.1.x"
     tmp "0.0.x"
@@ -8765,38 +10119,46 @@ useragent@^2.1.12:
 util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
 util-extend@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f"
+  integrity sha1-p8IW0mdUUWljeztu3GypEZ4v+T8=
 
 util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
   dependencies:
     inherits "2.0.1"
 
 util@^0.10.3:
   version "0.10.4"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
+  integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
   dependencies:
     inherits "2.0.3"
 
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
 uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
 uws@~9.14.0:
   version "9.14.0"
   resolved "https://registry.yarnpkg.com/uws/-/uws-9.14.0.tgz#fac8386befc33a7a3705cbd58dc47b430ca4dd95"
+  integrity sha512-HNMztPP5A1sKuVFmdZ6BPVpBQd5bUjNC8EFMFiICK+oho/OQsAJy5hnIx4btMHiOk8j04f/DbIlqnEZ9d72dqg==
 
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
@@ -8804,20 +10166,24 @@ validate-npm-package-license@^3.0.1:
 validate-npm-package-name@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34=
   dependencies:
     builtins "^1.0.3"
 
 vargs@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/vargs/-/vargs-0.1.0.tgz#6b6184da6520cc3204ce1b407cac26d92609ebff"
+  integrity sha1-a2GE2mUgzDIEzhtAfKwm2SYJ6/8=
 
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
   dependencies:
     assert-plus "^1.0.0"
     core-util-is "1.0.2"
@@ -8826,20 +10192,24 @@ verror@1.10.0:
 vlq@^0.2.2:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
+  integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==
 
 vm-browserify@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
+  integrity sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=
   dependencies:
     indexof "0.0.1"
 
 void-elements@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
+  integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
 
 watchpack@^1.5.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
+  integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==
   dependencies:
     chokidar "^2.0.2"
     graceful-fs "^4.1.2"
@@ -8848,12 +10218,14 @@ watchpack@^1.5.0:
 wbuf@^1.1.0, wbuf@^1.7.2:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
+  integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
   dependencies:
     minimalistic-assert "^1.0.0"
 
 wd@^1.4.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/wd/-/wd-1.11.0.tgz#b610deea7f79f5a520a573c09e047e42d31433f9"
+  integrity sha512-h2EBfJvmsWocIjOOg5BsHh9IJKrqZDG4Az4jEZhFugEH7sOPcX6feZQ30aFuktqDI0jquarZJmNpA6V0A0Q7Mg==
   dependencies:
     archiver "2.1.1"
     async "2.0.1"
@@ -8866,6 +10238,7 @@ wd@^1.4.0:
 webdriver-js-extender@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz#57d7a93c00db4cc8d556e4d3db4b5db0a80c3bb7"
+  integrity sha512-lcUKrjbBfCK6MNsh7xaY2UAUmZwe+/ib03AjVOpFobX4O7+83BUveSrLfU0Qsyb1DaKJdQRbuU+kM9aZ6QUhiQ==
   dependencies:
     "@types/selenium-webdriver" "^3.0.0"
     selenium-webdriver "^3.0.1"
@@ -8873,6 +10246,7 @@ webdriver-js-extender@2.1.0:
 webdriver-manager@^12.0.6:
   version "12.1.0"
   resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.0.tgz#f6601e52de5f0c97fc7024c889eeb2416f2f1d9d"
+  integrity sha512-oEc5fmkpz6Yh6udhwir5m0eN5mgRPq9P/NU5YWuT3Up5slt6Zz+znhLU7q4+8rwCZz/Qq3Fgpr/4oao7NPCm2A==
   dependencies:
     adm-zip "^0.4.9"
     chalk "^1.1.1"
@@ -8889,6 +10263,7 @@ webdriver-manager@^12.0.6:
 webpack-core@^0.6.8:
   version "0.6.9"
   resolved "https://registry.yarnpkg.com/webpack-core/-/webpack-core-0.6.9.tgz#fc571588c8558da77be9efb6debdc5a3b172bdc2"
+  integrity sha1-/FcViMhVjad76e+23r3Fo7FyvcI=
   dependencies:
     source-list-map "~0.1.7"
     source-map "~0.4.1"
@@ -8896,6 +10271,7 @@ webpack-core@^0.6.8:
 webpack-dev-middleware@3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz#1132fecc9026fd90f0ecedac5cbff75d1fb45890"
+  integrity sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==
   dependencies:
     memory-fs "~0.4.1"
     mime "^2.3.1"
@@ -8905,6 +10281,7 @@ webpack-dev-middleware@3.4.0:
 webpack-dev-server@3.1.10, webpack-dev-server@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.10.tgz#507411bee727ee8d2fdffdc621b66a64ab3dea2b"
+  integrity sha512-RqOAVjfqZJtQcB0LmrzJ5y4Jp78lv9CK0MZ1YJDTaTmedMZ9PU9FLMQNrMCfVu8hHzaVLVOJKBlGEHMN10z+ww==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
@@ -8938,6 +10315,7 @@ webpack-dev-server@3.1.10, webpack-dev-server@^3.1.4:
 webpack-log@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
+  integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
   dependencies:
     ansi-colors "^3.0.0"
     uuid "^3.3.2"
@@ -8945,12 +10323,14 @@ webpack-log@^2.0.0:
 webpack-merge@4.1.4:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.4.tgz#0fde38eabf2d5fd85251c24a5a8c48f8a3f4eb7b"
+  integrity sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==
   dependencies:
     lodash "^4.17.5"
 
 webpack-sources@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.2.0.tgz#18181e0d013fce096faf6f8e6d41eeffffdceac2"
+  integrity sha512-9BZwxR85dNsjWz3blyxdOhTgtnQvv3OEs5xofI0wPYTwu5kaWxS08UuD1oI7WLBLpRO+ylf0ofnXLXWmGb2WMw==
   dependencies:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
@@ -8958,6 +10338,7 @@ webpack-sources@1.2.0:
 webpack-sources@1.3.0, webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
+  integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==
   dependencies:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
@@ -8965,12 +10346,14 @@ webpack-sources@1.3.0, webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-s
 webpack-subresource-integrity@1.1.0-rc.6:
   version "1.1.0-rc.6"
   resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz#37f6f1264e1eb378e41465a98da80fad76ab8886"
+  integrity sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==
   dependencies:
     webpack-core "^0.6.8"
 
 webpack@4.22.0, webpack@^4.0.0, webpack@^4.6.0:
   version "4.22.0"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.22.0.tgz#b168111e2e7b05f5169ac484e79e62093ec39e0d"
+  integrity sha512-2+3EYFqyhPl12buLQ42QPHEEh8BHn3P9ipRvGRHhdfKJ1u9svhZ3QjhIoEdL5SeIhL5gfOZVbBnartYEabkEsg==
   dependencies:
     "@webassemblyjs/ast" "1.7.8"
     "@webassemblyjs/helper-module-context" "1.7.8"
@@ -9000,6 +10383,7 @@ webpack@4.22.0, webpack@^4.0.0, webpack@^4.6.0:
 websocket-driver@>=0.5.1:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
+  integrity sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=
   dependencies:
     http-parser-js ">=0.4.0"
     websocket-extensions ">=0.1.1"
@@ -9007,48 +10391,58 @@ websocket-driver@>=0.5.1:
 websocket-extensions@>=0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
+  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
 
 when@^3.7.7:
   version "3.7.8"
   resolved "https://registry.yarnpkg.com/when/-/when-3.7.8.tgz#c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"
+  integrity sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I=
 
 when@~3.6.x:
   version "3.6.4"
   resolved "https://registry.yarnpkg.com/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e"
+  integrity sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=
 
 which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+  integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
 
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
 which@1, which@^1.1.1, which@^1.2.1, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
 wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
   dependencies:
     string-width "^1.0.2 || 2"
 
 widest-line@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc"
+  integrity sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==
   dependencies:
     string-width "^2.1.1"
 
 window-size@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
+  integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=
 
 winston-transport@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.2.0.tgz#a20be89edf2ea2ca39ba25f3e50344d73e6520e5"
+  integrity sha512-0R1bvFqxSlK/ZKTH86nymOuKv/cT1PQBMuDdA7k7f0S9fM44dNH6bXnuxwXPrN8lefJgtZq08BKdyZ0DZIy/rg==
   dependencies:
     readable-stream "^2.3.6"
     triple-beam "^1.2.0"
@@ -9056,6 +10450,7 @@ winston-transport@^4.2.0:
 winston@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/winston/-/winston-3.1.0.tgz#80724376aef164e024f316100d5b178d78ac5331"
+  integrity sha512-FsQfEE+8YIEeuZEYhHDk5cILo1HOcWkGwvoidLrDgPog0r4bser1lEIOco2dN9zpDJ1M88hfDgZvxe5z4xNcwg==
   dependencies:
     async "^2.6.0"
     diagnostics "^1.1.1"
@@ -9070,24 +10465,29 @@ winston@^3.0.0:
 with-callback@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/with-callback/-/with-callback-1.0.2.tgz#a09629b9a920028d721404fb435bdcff5c91bc21"
+  integrity sha1-oJYpuakgAo1yFAT7Q1vc/1yRvCE=
 
 wordwrap@^1.0.0, wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
 worker-farm@^1.5.2:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
+  integrity sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==
   dependencies:
     errno "~0.1.7"
 
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -9095,10 +10495,12 @@ wrap-ansi@^2.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 write-file-atomic@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
+  integrity sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
@@ -9107,6 +10509,7 @@ write-file-atomic@^2.0.0:
 ws@~3.3.1:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
+  integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==
   dependencies:
     async-limiter "~1.0.0"
     safe-buffer "~5.1.0"
@@ -9115,14 +10518,17 @@ ws@~3.3.1:
 xdg-basedir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
+  integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=
 
 xhr2@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.4.tgz#7f87658847716db5026323812f818cadab387a5f"
+  integrity sha1-f4dliEdxbbUCYyOBL4GMras4el8=
 
 xml2js@^0.4.17:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
+  integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==
   dependencies:
     sax ">=0.6.0"
     xmlbuilder "~9.0.1"
@@ -9130,66 +10536,80 @@ xml2js@^0.4.17:
 xmlbuilder@~9.0.1:
   version "9.0.7"
   resolved "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
+  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
 
 xmlhttprequest-ssl@~1.5.4:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
+  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
 
 xregexp@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
+  integrity sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=
 
 xregexp@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
+  integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
 
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
 
 xxhashjs@^0.2.1:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/xxhashjs/-/xxhashjs-0.2.2.tgz#8a6251567621a1c46a5ae204da0249c7f8caa9d8"
+  integrity sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==
   dependencies:
     cuint "^0.2.2"
 
 y18n@^3.2.0, y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
 
 "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
 yallist@^3.0.0, yallist@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+  integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=
 
 yargs-parser@^10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
+  integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
   dependencies:
     camelcase "^4.1.0"
 
 yargs-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
+  integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=
   dependencies:
     camelcase "^3.0.0"
 
 yargs-parser@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
+  integrity sha1-jQrELxbqVd69MyyvTEA4s+P139k=
   dependencies:
     camelcase "^4.1.0"
 
 yargs@12.0.2:
   version "12.0.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
+  integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==
   dependencies:
     cliui "^4.0.0"
     decamelize "^2.0.0"
@@ -9207,6 +10627,7 @@ yargs@12.0.2:
 yargs@9.0.1:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
+  integrity sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=
   dependencies:
     camelcase "^4.1.0"
     cliui "^3.2.0"
@@ -9225,6 +10646,7 @@ yargs@9.0.1:
 yargs@^3.10.0:
   version "3.32.0"
   resolved "http://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995"
+  integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=
   dependencies:
     camelcase "^2.0.1"
     cliui "^3.0.3"
@@ -9237,6 +10659,7 @@ yargs@^3.10.0:
 yargs@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
+  integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=
   dependencies:
     camelcase "^3.0.0"
     cliui "^3.2.0"
@@ -9255,18 +10678,22 @@ yargs@^7.0.0:
 yarn@^1.10.1:
   version "1.10.1"
   resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.10.1.tgz#b792ba28f050ae94cd7e719dbca80639d70da76f"
+  integrity sha512-EH0H1fyfFxkE4UpG4b+VCaVY4I488I2EyQNmGjGGKmvsSIb0G3b+1IcfGYPI2gqa1du43g4ZA3jH8fXlq6oVxg==
 
 yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
+  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
 
 yn@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
+  integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=
 
 zip-stream@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-1.2.0.tgz#a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"
+  integrity sha1-qLxF9MG0lpnGuQGYuqyqzbzUugQ=
   dependencies:
     archiver-utils "^1.3.0"
     compress-commons "^1.2.0"
@@ -9276,3 +10703,4 @@ zip-stream@^1.2.0:
 zone.js@^0.8.19:
   version "0.8.26"
   resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.26.tgz#7bdd72f7668c5a7ad6b118148b4ea39c59d08d2d"
+  integrity sha512-W9Nj+UmBJG251wkCacIkETgra4QgBo/vgoEkb4a2uoLzpQG7qF9nzwoLXWU5xj3Fg2mxGvEDh47mg24vXccYjA==

From 208912fffeed9b2353736adffbb04d7a50aa66e4 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 31 Oct 2018 09:43:24 +0000
Subject: [PATCH 0379/1703] build: update typescript to 3.1.5

---
 package.json                                        |  2 +-
 packages/ngtools/webpack/package.json               |  2 +-
 packages/schematics/angular/package.json            |  2 +-
 .../schematics/angular/utility/latest-versions.ts   |  2 +-
 .../schematics/blank/project-files/package.json     |  2 +-
 .../schematics/schematic/files/package.json         |  2 +-
 yarn.lock                                           | 13 ++++---------
 7 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 6291c323842d..7493cad88c29 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "quicktype-core": "^5.0.41",
     "temp": "^0.8.3",
     "tslint": "^5.11.0",
-    "typescript": "~3.1.3",
+    "typescript": "~3.1.5",
     "yarn": "^1.10.1"
   },
   "devDependencies": {
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 0cd69f1eaa9b..9ab78de9ac19 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -35,7 +35,7 @@
   "devDependencies": {
     "@angular/compiler": "^7.0.0-rc.0",
     "@angular/compiler-cli": "^7.0.0-rc.0",
-    "typescript": "~3.1.3",
+    "typescript": "~3.1.5",
     "webpack": "^4.0.0"
   }
 }
diff --git a/packages/schematics/angular/package.json b/packages/schematics/angular/package.json
index 394fe0af24d2..1b8cd6a80201 100644
--- a/packages/schematics/angular/package.json
+++ b/packages/schematics/angular/package.json
@@ -11,6 +11,6 @@
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
-    "typescript": "3.1.3"
+    "typescript": "3.1.5"
   }
 }
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 980ce94ab33f..22844f7b6d41 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -11,7 +11,7 @@ export const latestVersions = {
   Angular: '~7.0.0-rc.0',
   RxJs: '~6.3.3',
   ZoneJs: '~0.8.26',
-  TypeScript: '~3.1.1',
+  TypeScript: '~3.1.4',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
   DevkitBuildAngular: '~0.9.0-rc.1',
diff --git a/packages/schematics/schematics/blank/project-files/package.json b/packages/schematics/schematics/blank/project-files/package.json
index abd157f9264a..78f1d478d8ac 100644
--- a/packages/schematics/schematics/blank/project-files/package.json
+++ b/packages/schematics/schematics/blank/project-files/package.json
@@ -18,6 +18,6 @@
     "@types/jasmine": "^2.6.0",
     "@types/node": "^8.0.31",
     "jasmine": "^2.8.0",
-    "typescript": "^2.5.2"
+    "typescript": "~3.1.5"
   }
 }
diff --git a/packages/schematics/schematics/schematic/files/package.json b/packages/schematics/schematics/schematic/files/package.json
index 6ca0bf9d670e..d708b981ee58 100644
--- a/packages/schematics/schematics/schematic/files/package.json
+++ b/packages/schematics/schematics/schematic/files/package.json
@@ -18,6 +18,6 @@
     "@types/jasmine": "^2.6.0",
     "@types/node": "^8.0.31",
     "jasmine": "^2.8.0",
-    "typescript": "^2.5.2"
+    "typescript": "~3.1.5"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 6a8231f76d65..061c3fb7b8f0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9903,15 +9903,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@3.1.3, typescript@~3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.3.tgz#01b70247a6d3c2467f70c45795ef5ea18ce191d5"
-  integrity sha512-+81MUSyX+BaSo+u2RbozuQk/UWx6hfG0a5gHu4ANEM4sU96XbuIyAB+rWBW1u70c6a5QuZfuYICn3s2UjuHUpA==
-
-typescript@3.1.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.4.tgz#c74ef7b3c2da65beff548b903022cb8c3cd997ed"
-  integrity sha512-JZHJtA6ZL15+Q3Dqkbh8iCUmvxD3iJ7ujXS+fVkKnwIVAdHc5BJTDNM0aTrnr2luKulFjU7W+SRhDZvi66Ru7Q==
+typescript@3.1.5, typescript@~3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.5.tgz#93d8b6864375325a91177372cb370ae0ae3a0703"
+  integrity sha512-muYNWV9j5+3mXoKD6oPONKuGUmYiFX14gfo9lWm9ZXRHOqVDQiB4q1CzFPbF4QLV2E9TZXH6oK55oQ94rn3PpA==
 
 uglify-es@^3.3.4:
   version "3.3.9"

From 7ca3bb5263c10e3d30d053c038b40f05db967833 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 1 Nov 2018 09:16:10 +0000
Subject: [PATCH 0380/1703] test: update typescript warning test unsupported
 version

The old version was failing to build against @angular/core@7.1.0-beta.1 with the error below:
```
ERROR in node_modules/@angular/core/src/di/injector.d.ts(67,70): error TS1005: ',' expected.
```
---
 tests/legacy-cli/e2e/tests/misc/typescript-warning.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/misc/typescript-warning.ts b/tests/legacy-cli/e2e/tests/misc/typescript-warning.ts
index f6f10c14a46e..267b9715cfbb 100644
--- a/tests/legacy-cli/e2e/tests/misc/typescript-warning.ts
+++ b/tests/legacy-cli/e2e/tests/misc/typescript-warning.ts
@@ -2,8 +2,8 @@ import { ng, silentNpm } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 
 export default async function () {
-  // typescript@2.8.0-dev.20180320 is not part of the officially supported range in latest stable.
-  const unsupportedTsVersion = '2.8.0-dev.20180320';
+  // typescript@3.0.1 is not part of the officially supported range in latest stable.
+  const unsupportedTsVersion = '3.0.1';
 
   await updateJsonFile('src/tsconfig.app.json', configJson => {
     // skipLibCheck is required because declerations

From eef66f0f6548d4ddd215e857c2278522ebd220e1 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 11 Oct 2018 12:28:58 +0100
Subject: [PATCH 0381/1703] fix(@angular/cli): error out when command json is
 invalid

---
 .../angular/cli/commands/generate-impl.ts     |  1 -
 packages/angular/cli/models/command-runner.ts |  2 +-
 packages/angular/cli/utilities/json-schema.ts | 17 +++--
 .../angular/cli/utilities/json-schema_spec.ts | 76 +++++++++++++++++++
 scripts/snapshots.ts                          |  6 +-
 5 files changed, 91 insertions(+), 11 deletions(-)
 create mode 100644 packages/angular/cli/utilities/json-schema_spec.ts

diff --git a/packages/angular/cli/commands/generate-impl.ts b/packages/angular/cli/commands/generate-impl.ts
index 49d9f60056c4..b47808a7e1f9 100644
--- a/packages/angular/cli/commands/generate-impl.ts
+++ b/packages/angular/cli/commands/generate-impl.ts
@@ -36,7 +36,6 @@ export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
           schematic.description.path,
           this._workflow.registry,
           schematic.description.schemaJson,
-          this.logger,
         );
       } else {
         continue;
diff --git a/packages/angular/cli/models/command-runner.ts b/packages/angular/cli/models/command-runner.ts
index 4828b4239edc..28a3c371f3be 100644
--- a/packages/angular/cli/models/command-runner.ts
+++ b/packages/angular/cli/models/command-runner.ts
@@ -92,7 +92,7 @@ export async function runCommand(
     }
 
     commandMap[name] =
-      await parseJsonSchemaToCommandDescription(name, schemaPath, registry, schema, logger);
+      await parseJsonSchemaToCommandDescription(name, schemaPath, registry, schema);
   }
 
   let commandName: string | undefined = undefined;
diff --git a/packages/angular/cli/utilities/json-schema.ts b/packages/angular/cli/utilities/json-schema.ts
index 40714c90651e..a857867490c6 100644
--- a/packages/angular/cli/utilities/json-schema.ts
+++ b/packages/angular/cli/utilities/json-schema.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { json, logging } from '@angular-devkit/core';
+import { BaseException, json } from '@angular-devkit/core';
 import { ExportStringRef } from '@angular-devkit/schematics/tools';
 import { readFileSync } from 'fs';
 import { dirname, resolve } from 'path';
@@ -19,6 +19,13 @@ import {
   Value,
 } from '../models/interface';
 
+
+export class CommandJsonPathException extends BaseException {
+  constructor(public readonly path: string, public readonly name: string) {
+    super(`File ${path} was not found while constructing the subcommand ${name}.`);
+  }
+}
+
 function _getEnumFromValue<E, T extends E[keyof E]>(
   value: json.JsonValue,
   enumeration: E,
@@ -40,7 +47,6 @@ export async function parseJsonSchemaToSubCommandDescription(
   jsonPath: string,
   registry: json.schema.SchemaRegistry,
   schema: json.JsonObject,
-  logger: logging.Logger,
 ): Promise<SubCommandDescription> {
   const options = await parseJsonSchemaToOptions(registry, schema);
 
@@ -69,7 +75,7 @@ export async function parseJsonSchemaToSubCommandDescription(
     try {
       longDescription = readFileSync(ldPath, 'utf-8');
     } catch (e) {
-      logger.warn(`File ${ldPath} was not found while constructing the subcommand ${name}.`);
+      throw new CommandJsonPathException(ldPath, name);
     }
   }
   let usageNotes = '';
@@ -78,7 +84,7 @@ export async function parseJsonSchemaToSubCommandDescription(
     try {
       usageNotes = readFileSync(unPath, 'utf-8');
     } catch (e) {
-      logger.warn(`File ${unPath} was not found while constructing the subcommand ${name}.`);
+      throw new CommandJsonPathException(unPath, name);
     }
   }
 
@@ -99,10 +105,9 @@ export async function parseJsonSchemaToCommandDescription(
   jsonPath: string,
   registry: json.schema.SchemaRegistry,
   schema: json.JsonObject,
-  logger: logging.Logger,
 ): Promise<CommandDescription> {
   const subcommand =
-    await parseJsonSchemaToSubCommandDescription(name, jsonPath, registry, schema, logger);
+    await parseJsonSchemaToSubCommandDescription(name, jsonPath, registry, schema);
 
   // Before doing any work, let's validate the implementation.
   if (typeof schema.$impl != 'string') {
diff --git a/packages/angular/cli/utilities/json-schema_spec.ts b/packages/angular/cli/utilities/json-schema_spec.ts
new file mode 100644
index 000000000000..c26601227c3b
--- /dev/null
+++ b/packages/angular/cli/utilities/json-schema_spec.ts
@@ -0,0 +1,76 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ *
+ */
+import { schema } from '@angular-devkit/core';
+import { readFileSync } from 'fs';
+import { join } from 'path';
+import { of } from 'rxjs';
+import { CommandJsonPathException, parseJsonSchemaToCommandDescription } from './json-schema';
+
+describe('parseJsonSchemaToCommandDescription', () => {
+  let registry: schema.CoreSchemaRegistry;
+  const baseSchemaJson = {
+    '$schema': 'http://json-schema.org/schema',
+    '$id': 'ng-cli://commands/version.json',
+    'description': 'Outputs Angular CLI version.',
+    '$longDescription': 'not a file ref',
+
+    '$aliases': ['v'],
+    '$scope': 'all',
+    '$impl': './version-impl#VersionCommand',
+
+    'type': 'object',
+    'allOf': [
+      { '$ref': './definitions.json#/definitions/base' },
+    ],
+  };
+
+  beforeEach(() => {
+    registry = new schema.CoreSchemaRegistry([]);
+    registry.registerUriHandler((uri: string) => {
+      if (uri.startsWith('ng-cli://')) {
+        const content = readFileSync(
+          join(__dirname, '..', uri.substr('ng-cli://'.length)), 'utf-8');
+
+        return of(JSON.parse(content));
+      } else {
+        return null;
+      }
+    });
+  });
+
+  it(`should throw on invalid $longDescription path`, async () => {
+    const name = 'version';
+    const schemaPath = join(__dirname, './bad-sample.json');
+    const schemaJson = { ...baseSchemaJson, $longDescription: 'not a file ref' };
+    try {
+      await parseJsonSchemaToCommandDescription(name, schemaPath, registry, schemaJson);
+    } catch (error) {
+      const refPath = join(__dirname, schemaJson.$longDescription);
+      expect(error).toEqual(new CommandJsonPathException(refPath, name));
+
+      return;
+    }
+    expect(true).toBe(false, 'function should have thrown');
+  });
+
+  it(`should throw on invalid $usageNotes path`, async () => {
+    const name = 'version';
+    const schemaPath = join(__dirname, './bad-sample.json');
+    const schemaJson = { ...baseSchemaJson, $usageNotes: 'not a file ref' };
+    try {
+      await parseJsonSchemaToCommandDescription(name, schemaPath, registry, schemaJson);
+    } catch (error) {
+      const refPath = join(__dirname, schemaJson.$usageNotes);
+      expect(error).toEqual(new CommandJsonPathException(refPath, name));
+
+      return;
+    }
+    expect(true).toBe(false, 'function should have thrown');
+  });
+});
diff --git a/scripts/snapshots.ts b/scripts/snapshots.ts
index 318af975a878..83fb0c7bc217 100644
--- a/scripts/snapshots.ts
+++ b/scripts/snapshots.ts
@@ -184,9 +184,9 @@ export default async function(opts: SnapshotsOptions, logger: logging.Logger) {
     const options = { cwd: newProjectRoot };
     const childLogger = logger.createChild(commandName);
     const stdout = _exec(ngPath, [commandName, '--help=json'], options, childLogger);
-    if (stdout.trim()) {
-      fs.writeFileSync(path.join(helpOutputRoot, commandName + '.json'), stdout);
-    }
+    // Make sure the output is JSON before printing it, and format it as well.
+    const jsonOutput = JSON.stringify(JSON.parse(stdout.trim()), undefined, 2);
+    fs.writeFileSync(path.join(helpOutputRoot, commandName + '.json'), jsonOutput);
   }
 
   if (!githubToken) {

From 58ca30b1e7ace139285c0a350da80e6451432bc4 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 1 Nov 2018 08:04:23 +0100
Subject: [PATCH 0382/1703] fix(@schematics/angular): update
 `@angular-devkit/build-ng-packagr` when migrating

Closes #12642
---
 .../migrations/migration-collection.json      |  5 ++
 .../migrations/update-7/devkit-ng-packagr.ts  | 33 ++++++++++++
 .../update-7/devkit-ng-packagr_spec.ts        | 52 +++++++++++++++++++
 .../angular/migrations/update-7/index.ts      |  1 +
 4 files changed, 91 insertions(+)
 create mode 100644 packages/schematics/angular/migrations/update-7/devkit-ng-packagr.ts
 create mode 100644 packages/schematics/angular/migrations/update-7/devkit-ng-packagr_spec.ts

diff --git a/packages/schematics/angular/migrations/migration-collection.json b/packages/schematics/angular/migrations/migration-collection.json
index 5d789a24cb50..0e03d24ae78f 100644
--- a/packages/schematics/angular/migrations/migration-collection.json
+++ b/packages/schematics/angular/migrations/migration-collection.json
@@ -24,6 +24,11 @@
       "version": "7.0.4",
       "factory": "./update-7",
       "description": "Update an Angular CLI project to version 7."
+    },
+    "migration-06": {
+      "version": "7.0.3",
+      "factory": "./update-7/index#updateDevkitBuildNgPackagr",
+      "description": "Update an Angular CLI project to version 7."
     }
   }
 }
diff --git a/packages/schematics/angular/migrations/update-7/devkit-ng-packagr.ts b/packages/schematics/angular/migrations/update-7/devkit-ng-packagr.ts
new file mode 100644
index 000000000000..d52aefce47d3
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-7/devkit-ng-packagr.ts
@@ -0,0 +1,33 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Rule } from '@angular-devkit/schematics';
+import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
+import { addPackageJsonDependency, getPackageJsonDependency } from '../../utility/dependencies';
+import { latestVersions } from '../../utility/latest-versions';
+
+export function updateDevkitBuildNgPackagr(): Rule {
+  return (tree, context) => {
+    const existing = getPackageJsonDependency(tree, '@angular-devkit/build-ng-packagr');
+
+    if (!existing) {
+      return;
+    }
+
+    addPackageJsonDependency(
+      tree,
+      {
+        type: existing.type,
+        name: '@angular-devkit/build-ng-packagr',
+        version: latestVersions.DevkitBuildNgPackagr,
+        overwrite: true,
+      },
+    );
+
+    context.addTask(new NodePackageInstallTask());
+  };
+}
diff --git a/packages/schematics/angular/migrations/update-7/devkit-ng-packagr_spec.ts b/packages/schematics/angular/migrations/update-7/devkit-ng-packagr_spec.ts
new file mode 100644
index 000000000000..a606dfdc3725
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-7/devkit-ng-packagr_spec.ts
@@ -0,0 +1,52 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { EmptyTree } from '@angular-devkit/schematics';
+import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+import { latestVersions } from '../../utility/latest-versions';
+
+const oldPkg = `
+{
+  "devDependencies": {
+    "@angular-devkit/build-angular": "0.0.0",
+    "@angular-devkit/build-ng-packagr": "0.0.0"
+  }
+}
+`;
+
+describe('updateDevkitBuildNgPackagr', () => {
+  const schematicRunner = new SchematicTestRunner(
+    'migrations',
+    require.resolve('../migration-collection.json'),
+  );
+
+  let tree: UnitTestTree;
+
+  beforeEach(async () => {
+    tree = new UnitTestTree(new EmptyTree());
+    tree = await schematicRunner.runExternalSchematicAsync(
+      require.resolve('../../collection.json'), 'ng-new',
+      {
+        name: 'migration-test',
+        version: '1.2.3',
+        directory: '.',
+      },
+      tree,
+    ).toPromise();
+  });
+
+  it('should work as expected', async () => {
+    tree.overwrite('/package.json', oldPkg);
+    const tree2 = await schematicRunner.runSchematicAsync('migration-06', {}, tree.branch())
+      .toPromise();
+
+    const content = tree2.readContent('/package.json');
+    const pkg = JSON.parse(content);
+    expect(pkg.devDependencies['@angular-devkit/build-ng-packagr'])
+      .toBe(latestVersions.DevkitBuildNgPackagr);
+  });
+});
diff --git a/packages/schematics/angular/migrations/update-7/index.ts b/packages/schematics/angular/migrations/update-7/index.ts
index b54923bd3341..5359f37ef4ef 100644
--- a/packages/schematics/angular/migrations/update-7/index.ts
+++ b/packages/schematics/angular/migrations/update-7/index.ts
@@ -16,6 +16,7 @@ import { latestVersions } from '../../utility/latest-versions';
 
 export { polyfillMetadataRule } from './polyfill-metadata';
 export { typeScriptHelpersRule } from './typescript-helpers';
+export { updateDevkitBuildNgPackagr } from './devkit-ng-packagr';
 
 export default function(): Rule {
   return (tree, context) => {

From 524769bf99c34eaf88e9f2d1a24b257a142f9dab Mon Sep 17 00:00:00 2001
From: Fabrice_Pomata <fab.pomata@gmail.com>
Date: Tue, 30 Oct 2018 20:30:08 +0100
Subject: [PATCH 0383/1703] feat(@schematics/angular): add profiling files to
 gitignore closes #12811

---
 packages/schematics/angular/workspace/files/__dot__gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/schematics/angular/workspace/files/__dot__gitignore b/packages/schematics/angular/workspace/files/__dot__gitignore
index ee5c9d8336b7..85158b7a442a 100755
--- a/packages/schematics/angular/workspace/files/__dot__gitignore
+++ b/packages/schematics/angular/workspace/files/__dot__gitignore
@@ -8,6 +8,10 @@
 # dependencies
 /node_modules
 
+# profiling files
+chrome-profiler-events.json
+speed-measure-plugin.json
+
 # IDEs and editors
 /.idea
 .project

From eddad5698a8b8a9a3b1be47772c176318bb13883 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 31 Oct 2018 07:22:05 +0100
Subject: [PATCH 0384/1703] fix(@angular-devkit/schematics-cli): dryRun is not
 set by default when using a local collection

Fixes #12815
---
 .../angular_devkit/schematics_cli/bin/schematics.ts    |  2 +-
 .../schematics_cli/bin/schematics_spec.ts              | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/schematics_cli/bin/schematics.ts b/packages/angular_devkit/schematics_cli/bin/schematics.ts
index 183ec79b3742..9fc6a39abd6f 100644
--- a/packages/angular_devkit/schematics_cli/bin/schematics.ts
+++ b/packages/angular_devkit/schematics_cli/bin/schematics.ts
@@ -305,7 +305,7 @@ function parseArgs(args: string[] | undefined): minimist.ParsedArgs {
       },
       default: {
         'debug': null,
-        'dry-run': null,
+        'dryRun': null,
       },
       '--': true,
     });
diff --git a/packages/angular_devkit/schematics_cli/bin/schematics_spec.ts b/packages/angular_devkit/schematics_cli/bin/schematics_spec.ts
index 15e18be12d07..0bfee880cebb 100644
--- a/packages/angular_devkit/schematics_cli/bin/schematics_spec.ts
+++ b/packages/angular_devkit/schematics_cli/bin/schematics_spec.ts
@@ -53,6 +53,16 @@ describe('schematics-cli binary', () => {
     expect(res).toEqual(0);
   });
 
+  it('dry-run is default when debug mode', async () => {
+    const args = ['blank', 'foo', '--debug'];
+    const res = await main({ args, stdout, stderr });
+    expect(stdout.lines).toMatch(/CREATE \/foo\/README.md/);
+    expect(stdout.lines).toMatch(/CREATE \/foo\/.gitignore/);
+    expect(stdout.lines).toMatch(/CREATE \/foo\/src\/foo\/index.ts/);
+    expect(stdout.lines).toMatch(/CREATE \/foo\/src\/foo\/index_spec.ts/);
+    expect(res).toEqual(0);
+  });
+
   it('error when no name is provided', async () => {
     const args = ['blank'];
     const res = await main({ args, stdout, stderr });

From 298faa129af4c0d4a90ae0408f4a5b19d4d0794b Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 1 Nov 2018 16:01:02 +0000
Subject: [PATCH 0385/1703] test(@angular/cli): fix implicit import

This lint error resulted from the interaction between https://github.com/angular/angular-cli/pull/12554 and https://github.com/angular/angular-cli/pull/12515.
---
 packages/angular/cli/utilities/json-schema_spec.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/angular/cli/utilities/json-schema_spec.ts b/packages/angular/cli/utilities/json-schema_spec.ts
index c26601227c3b..09822cef7730 100644
--- a/packages/angular/cli/utilities/json-schema_spec.ts
+++ b/packages/angular/cli/utilities/json-schema_spec.ts
@@ -9,7 +9,6 @@
 import { schema } from '@angular-devkit/core';
 import { readFileSync } from 'fs';
 import { join } from 'path';
-import { of } from 'rxjs';
 import { CommandJsonPathException, parseJsonSchemaToCommandDescription } from './json-schema';
 
 describe('parseJsonSchemaToCommandDescription', () => {
@@ -37,7 +36,7 @@ describe('parseJsonSchemaToCommandDescription', () => {
         const content = readFileSync(
           join(__dirname, '..', uri.substr('ng-cli://'.length)), 'utf-8');
 
-        return of(JSON.parse(content));
+        return Promise.resolve(JSON.parse(content));
       } else {
         return null;
       }

From 8064ff6bddfe8eb772322af4380fee452a91a0f2 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 31 Oct 2018 10:22:52 +0000
Subject: [PATCH 0386/1703] fix(@schematics/angular): update karma version

---
 packages/schematics/angular/workspace/files/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/workspace/files/package.json b/packages/schematics/angular/workspace/files/package.json
index b1440a336451..a3ea4c379f53 100644
--- a/packages/schematics/angular/workspace/files/package.json
+++ b/packages/schematics/angular/workspace/files/package.json
@@ -34,7 +34,7 @@
     "codelyzer": "~4.5.0",
     "jasmine-core": "~2.99.1",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~3.0.0",
+    "karma": "~3.1.1",
     "karma-chrome-launcher": "~2.2.0",
     "karma-coverage-istanbul-reporter": "~2.0.1",
     "karma-jasmine": "~1.1.2",

From cd0b01a2f94874fe1c2ff66e8efb5c055c8b0467 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 31 Oct 2018 10:55:04 +0000
Subject: [PATCH 0387/1703] feat(@angular-devkit/build-angular): stop karma
 gracefully

Followup to https://github.com/karma-runner/karma/pull/3153
---
 package.json                                  |  1 +
 .../angular_devkit/build_angular/package.json |  2 +-
 .../build_angular/src/karma/index.ts          | 11 ++--
 .../test/karma/rebuilds_spec_large.ts         | 56 ++-----------------
 yarn.lock                                     |  8 +--
 5 files changed, 16 insertions(+), 62 deletions(-)

diff --git a/package.json b/package.json
index 7493cad88c29..fc88b041b1df 100644
--- a/package.json
+++ b/package.json
@@ -103,6 +103,7 @@
     "istanbul": "^0.4.5",
     "jasmine": "^2.6.0",
     "jasmine-spec-reporter": "^3.2.0",
+    "karma": "~3.1.1",
     "karma-jasmine-html-reporter": "^0.2.2",
     "license-checker": "^20.1.0",
     "minimatch": "^3.0.4",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 498ac49eedce..e699262781d7 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -77,7 +77,7 @@
     "jquery": "^3.3.1",
     "jasmine-core": "~2.8.0",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~3.0.0",
+    "karma": "~3.1.1",
     "karma-chrome-launcher": "~2.2.0",
     "karma-coverage-istanbul-reporter": "~2.0.0",
     "karma-jasmine": "~1.1.0",
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index 3479edf21f68..ef3f17acd508 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -108,15 +108,14 @@ export class KarmaBuilder implements Builder<KarmaBuilderSchema> {
 
         // Complete the observable once the Karma server returns.
         const karmaServer = new karma.Server(karmaOptions, () => obs.complete());
-        karmaServer.start();
+        const karmaStartPromise = karmaServer.start();
 
         // Cleanup, signal Karma to exit.
         return () => {
-          // Karma does not seem to have a way to exit the server gracefully.
-          // See https://github.com/karma-runner/karma/issues/2867#issuecomment-369912167
-          // TODO: make a PR for karma to add `karmaServer.close(code)`, that
-          // calls `disconnectBrowsers(code);`
-          // karmaServer.close();
+          // Karma only has the `stop` method start with 3.1.1, so we must defensively check.
+          if (karmaServer.stop && typeof karmaServer.stop === 'function') {
+            return karmaStartPromise.then(() => karmaServer.stop());
+          }
         };
       })),
     );
diff --git a/packages/angular_devkit/build_angular/test/karma/rebuilds_spec_large.ts b/packages/angular_devkit/build_angular/test/karma/rebuilds_spec_large.ts
index 494823bf121a..6d08de627625 100644
--- a/packages/angular_devkit/build_angular/test/karma/rebuilds_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/karma/rebuilds_spec_large.ts
@@ -10,64 +10,18 @@ import { runTargetSpec } from '@angular-devkit/architect/testing';
 import { debounceTime, take, tap } from 'rxjs/operators';
 import { host, karmaTargetSpec } from '../utils';
 
-
-// Karma watch mode is currently bugged:
-// - errors print a huge stack trace
-// - karma does not have a way to close the server
-//   gracefully (https://github.com/karma-runner/karma/issues/3149)
-// TODO: fix these before 6.0 final.
-xdescribe('Karma Builder watch mode', () => {
+describe('Karma Builder watch mode', () => {
   beforeEach(done => host.initialize().toPromise().then(done, done.fail));
   afterEach(done => host.restore().toPromise().then(done, done.fail));
 
-  it('works', (done) => {
+  it('works', async () => {
     const overrides = { watch: true };
-    runTargetSpec(host, karmaTargetSpec, overrides).pipe(
+    const res = await runTargetSpec(host, karmaTargetSpec, overrides).pipe(
       debounceTime(500),
       tap((buildEvent) => expect(buildEvent.success).toBe(true)),
       take(1),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
-
-  it('recovers from compilation failures in watch mode', (done) => {
-    const overrides = { watch: true };
-    let buildNumber = 0;
-
-    runTargetSpec(host, karmaTargetSpec, overrides).pipe(
-      debounceTime(500),
-      tap((buildEvent) => {
-        buildNumber += 1;
-        switch (buildNumber) {
-          case 1:
-            // Karma run should succeed.
-            // Add a compilation error.
-            expect(buildEvent.success).toBe(true);
-            host.writeMultipleFiles({
-              'src/app/app.component.spec.ts': '<p> definitely not typescript </p>',
-            });
-            break;
-
-          case 2:
-            // Karma run should fail due to compilation error. Fix it.
-            expect(buildEvent.success).toBe(false);
-            host.writeMultipleFiles({ 'src/foo.spec.ts': '' });
-            break;
-
-          case 3:
-            // Karma run should succeed again.
-            expect(buildEvent.success).toBe(true);
-            break;
-
-          default:
-            break;
-        }
-      }),
-      take(3),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
+    ).toPromise();
 
-  it('does not rebuild when nothing changed', (done) => {
-    // Start the server in watch mode, wait for the first build to finish, touch
-    // test.js without changing it, wait 5s then exit unsuscribe, verify only one event was emitted.
+    expect(res).toEqual({ success: true });
   }, 30000);
 });
diff --git a/yarn.lock b/yarn.lock
index 061c3fb7b8f0..11f88d92b126 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5542,10 +5542,10 @@ karma@alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a:
     tmp "0.0.33"
     useragent "^2.1.12"
 
-karma@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-3.0.0.tgz#6da83461a8a28d8224575c3b5b874e271b4730c3"
-  integrity sha512-ZTjyuDXVXhXsvJ1E4CnZzbCjSxD6sEdzEsFYogLuZM0yqvg/mgz+O+R1jb0J7uAQeuzdY8kJgx6hSNXLwFuHIQ==
+karma@~3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-3.1.1.tgz#94c8edd20fb9597ccde343326da009737fb0423a"
+  integrity sha512-NetT3wPCQMNB36uiL9LLyhrOt8SQwrEKt0xD3+KpTCfm0VxVyUJdPL5oTq2Ic5ouemgL/Iz4wqXEbF3zea9kQQ==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"

From 9b26f9ba49c76186dd9618f3f06658f73016eba7 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 31 Oct 2018 15:43:48 +0000
Subject: [PATCH 0388/1703] feat(@ngtools/webpack): only do type checking on
 forked type checker

Syntactic errors were only being reported in the type checker when it was running. This caused rebuilds to finish successfully if they had syntactic errors, which could lead to very weird behaviour on rebuilds.
---
 .../webpack/src/angular_compiler_plugin.ts    | 17 +++--
 .../ngtools/webpack/src/gather_diagnostics.ts | 62 ++++++++++++-------
 packages/ngtools/webpack/src/type_checker.ts  |  4 +-
 3 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index ba47634abbc5..7689c4cf4a09 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -39,7 +39,7 @@ import { Compiler, compilation } from 'webpack';
 import { time, timeEnd } from './benchmark';
 import { WebpackCompilerHost, workaroundResolve } from './compiler_host';
 import { resolveEntryModuleFromMain } from './entry_resolver';
-import { gatherDiagnostics, hasErrors } from './gather_diagnostics';
+import { DiagnosticMode, gatherDiagnostics, hasErrors } from './gather_diagnostics';
 import { TypeScriptPathsPlugin } from './paths-plugin';
 import { WebpackResourceLoader } from './resource_loader';
 import {
@@ -284,6 +284,7 @@ export class AngularCompilerPlugin {
     if (options.forkTypeChecker !== undefined) {
       this._forkTypeChecker = options.forkTypeChecker;
     }
+    // this._forkTypeChecker = false;
 
     // Add custom platform transformers.
     if (options.platformTransformers !== undefined) {
@@ -1038,6 +1039,8 @@ export class AngularCompilerPlugin {
     time('AngularCompilerPlugin._emit');
     const program = this._program;
     const allDiagnostics: Array<ts.Diagnostic | Diagnostic> = [];
+    const diagMode = (this._firstRun || !this._forkTypeChecker) ?
+      DiagnosticMode.All : DiagnosticMode.Syntactic;
 
     let emitResult: ts.EmitResult | undefined;
     try {
@@ -1051,10 +1054,8 @@ export class AngularCompilerPlugin {
           timeEnd('AngularCompilerPlugin._emit.ts.getOptionsDiagnostics');
         }
 
-        if ((this._firstRun || !this._forkTypeChecker) && this._program) {
-          allDiagnostics.push(...gatherDiagnostics(this._program, this._JitMode,
-            'AngularCompilerPlugin._emit.ts'));
-        }
+        allDiagnostics.push(...gatherDiagnostics(tsProgram, this._JitMode,
+          'AngularCompilerPlugin._emit.ts', diagMode));
 
         if (!hasErrors(allDiagnostics)) {
           if (this._firstRun || sourceFiles.length > 20) {
@@ -1098,10 +1099,8 @@ export class AngularCompilerPlugin {
           timeEnd('AngularCompilerPlugin._emit.ng.getNgOptionDiagnostics');
         }
 
-        if ((this._firstRun || !this._forkTypeChecker) && this._program) {
-          allDiagnostics.push(...gatherDiagnostics(this._program, this._JitMode,
-            'AngularCompilerPlugin._emit.ng'));
-        }
+        allDiagnostics.push(...gatherDiagnostics(angularProgram, this._JitMode,
+          'AngularCompilerPlugin._emit.ng', diagMode));
 
         if (!hasErrors(allDiagnostics)) {
           time('AngularCompilerPlugin._emit.ng.emit');
diff --git a/packages/ngtools/webpack/src/gather_diagnostics.ts b/packages/ngtools/webpack/src/gather_diagnostics.ts
index ccde7b02774d..3a8b40cae6a7 100644
--- a/packages/ngtools/webpack/src/gather_diagnostics.ts
+++ b/packages/ngtools/webpack/src/gather_diagnostics.ts
@@ -9,6 +9,13 @@ import { Diagnostic, Diagnostics, Program } from '@angular/compiler-cli';
 import * as ts from 'typescript';
 import { time, timeEnd } from './benchmark';
 
+export enum DiagnosticMode {
+  Syntactic = 1 << 0,
+  Semantic = 1 << 1,
+
+  All = Syntactic | Semantic,
+  Default = All,
+}
 
 export class CancellationToken implements ts.CancellationToken {
   private _isCancelled = false;
@@ -36,6 +43,7 @@ export function gatherDiagnostics(
   program: ts.Program | Program,
   jitMode: boolean,
   benchmarkLabel: string,
+  mode = DiagnosticMode.All,
   cancellationToken?: CancellationToken,
 ): Diagnostics {
   const allDiagnostics: Array<ts.Diagnostic | Diagnostic> = [];
@@ -52,34 +60,44 @@ export function gatherDiagnostics(
     }
   }
 
+  const gatherSyntacticDiagnostics = (mode & DiagnosticMode.Syntactic) != 0;
+  const gatherSemanticDiagnostics = (mode & DiagnosticMode.Semantic) != 0;
+
   if (jitMode) {
     const tsProgram = program as ts.Program;
-    // Check syntactic diagnostics.
-    time(`${benchmarkLabel}.gatherDiagnostics.ts.getSyntacticDiagnostics`);
-    checkDiagnostics(tsProgram.getSyntacticDiagnostics.bind(tsProgram));
-    timeEnd(`${benchmarkLabel}.gatherDiagnostics.ts.getSyntacticDiagnostics`);
-
-    // Check semantic diagnostics.
-    time(`${benchmarkLabel}.gatherDiagnostics.ts.getSemanticDiagnostics`);
-    checkDiagnostics(tsProgram.getSemanticDiagnostics.bind(tsProgram));
-    timeEnd(`${benchmarkLabel}.gatherDiagnostics.ts.getSemanticDiagnostics`);
+    if (gatherSyntacticDiagnostics) {
+      // Check syntactic diagnostics.
+      time(`${benchmarkLabel}.gatherDiagnostics.ts.getSyntacticDiagnostics`);
+      checkDiagnostics(tsProgram.getSyntacticDiagnostics.bind(tsProgram));
+      timeEnd(`${benchmarkLabel}.gatherDiagnostics.ts.getSyntacticDiagnostics`);
+    }
+
+    if (gatherSemanticDiagnostics) {
+      // Check semantic diagnostics.
+      time(`${benchmarkLabel}.gatherDiagnostics.ts.getSemanticDiagnostics`);
+      checkDiagnostics(tsProgram.getSemanticDiagnostics.bind(tsProgram));
+      timeEnd(`${benchmarkLabel}.gatherDiagnostics.ts.getSemanticDiagnostics`);
+    }
   } else {
     const angularProgram = program as Program;
+    if (gatherSyntacticDiagnostics) {
+      // Check TypeScript syntactic diagnostics.
+      time(`${benchmarkLabel}.gatherDiagnostics.ng.getTsSyntacticDiagnostics`);
+      checkDiagnostics(angularProgram.getTsSyntacticDiagnostics.bind(angularProgram));
+      timeEnd(`${benchmarkLabel}.gatherDiagnostics.ng.getTsSyntacticDiagnostics`);
+    }
 
-    // Check TypeScript syntactic diagnostics.
-    time(`${benchmarkLabel}.gatherDiagnostics.ng.getTsSyntacticDiagnostics`);
-    checkDiagnostics(angularProgram.getTsSyntacticDiagnostics.bind(angularProgram));
-    timeEnd(`${benchmarkLabel}.gatherDiagnostics.ng.getTsSyntacticDiagnostics`);
-
-    // Check TypeScript semantic and Angular structure diagnostics.
-    time(`${benchmarkLabel}.gatherDiagnostics.ng.getTsSemanticDiagnostics`);
-    checkDiagnostics(angularProgram.getTsSemanticDiagnostics.bind(angularProgram));
-    timeEnd(`${benchmarkLabel}.gatherDiagnostics.ng.getTsSemanticDiagnostics`);
+    if (gatherSemanticDiagnostics) {
+      // Check TypeScript semantic and Angular structure diagnostics.
+      time(`${benchmarkLabel}.gatherDiagnostics.ng.getTsSemanticDiagnostics`);
+      checkDiagnostics(angularProgram.getTsSemanticDiagnostics.bind(angularProgram));
+      timeEnd(`${benchmarkLabel}.gatherDiagnostics.ng.getTsSemanticDiagnostics`);
 
-    // Check Angular semantic diagnostics
-    time(`${benchmarkLabel}.gatherDiagnostics.ng.getNgSemanticDiagnostics`);
-    checkDiagnostics(angularProgram.getNgSemanticDiagnostics.bind(angularProgram));
-    timeEnd(`${benchmarkLabel}.gatherDiagnostics.ng.getNgSemanticDiagnostics`);
+      // Check Angular semantic diagnostics
+      time(`${benchmarkLabel}.gatherDiagnostics.ng.getNgSemanticDiagnostics`);
+      checkDiagnostics(angularProgram.getNgSemanticDiagnostics.bind(angularProgram));
+      timeEnd(`${benchmarkLabel}.gatherDiagnostics.ng.getNgSemanticDiagnostics`);
+    }
   }
 
   return allDiagnostics;
diff --git a/packages/ngtools/webpack/src/type_checker.ts b/packages/ngtools/webpack/src/type_checker.ts
index 17503fb1b18d..97263292ac7f 100644
--- a/packages/ngtools/webpack/src/type_checker.ts
+++ b/packages/ngtools/webpack/src/type_checker.ts
@@ -18,7 +18,7 @@ import {
 import * as ts from 'typescript';
 import { time, timeEnd } from './benchmark';
 import { WebpackCompilerHost } from './compiler_host';
-import { CancellationToken, gatherDiagnostics } from './gather_diagnostics';
+import { CancellationToken, DiagnosticMode, gatherDiagnostics } from './gather_diagnostics';
 import { LogMessage, TypeCheckerMessage } from './type_checker_messages';
 
 
@@ -101,7 +101,7 @@ export class TypeChecker {
 
   private _diagnose(cancellationToken: CancellationToken) {
     const allDiagnostics = gatherDiagnostics(
-      this._program, this._JitMode, 'TypeChecker', cancellationToken);
+      this._program, this._JitMode, 'TypeChecker', DiagnosticMode.Semantic, cancellationToken);
 
     // Report diagnostics.
     if (!cancellationToken.isCancellationRequested()) {

From e4c01512419ff8924e61ba0db69536db7b4062e6 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 31 Oct 2018 15:44:26 +0000
Subject: [PATCH 0389/1703] test(@angular-devkit/build-angular): remove
 unneeded flag from test

---
 .../build_angular/test/browser/rebuild_spec_large.ts          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
index 9d9523965cda..778b3b687376 100644
--- a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
@@ -233,7 +233,7 @@ describe('Browser Builder rebuilds', () => {
     // Add a major static analysis error on a non-main file to the initial build.
     host.replaceInFile('./src/app/app.component.ts', `'app-root'`, `(() => 'app-root')()`);
 
-    const overrides = { watch: true, aot: true, forkTypeChecker: false };
+    const overrides = { watch: true, aot: true };
     const logger = new TestLogger('rebuild-aot-errors');
     const staticAnalysisError = 'Function expressions are not supported in decorators';
     const syntaxError = 'Declaration or statement expected.';
@@ -298,7 +298,7 @@ describe('Browser Builder rebuilds', () => {
       'src/app/imported-styles.css': 'p {color: #f00;}',
     });
 
-    const overrides = { watch: true, aot: true, forkTypeChecker: false };
+    const overrides = { watch: true, aot: true };
     let buildNumber = 0;
 
     runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 3).pipe(

From 09099432595ff18a11122c0ea03ea18dd5de845d Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 31 Oct 2018 16:09:20 +0000
Subject: [PATCH 0390/1703] test(@angular-devkit/build-angular): test karma on
 watch mode

---
 .../src/angular-cli-files/plugins/karma.ts    | 28 ++++--
 .../build_angular/src/karma/index.ts          |  1 +
 .../test/karma/rebuilds_spec_large.ts         | 86 ++++++++++++++++++-
 3 files changed, 104 insertions(+), 11 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
index 54de40d22155..bdc4e2a04744 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
@@ -9,13 +9,15 @@
 // TODO: cleanup this file, it's copied as is from Angular CLI.
 
 import * as path from 'path';
-import * as fs from 'fs';
 import * as glob from 'glob';
 import * as webpack from 'webpack';
 const webpackDevMiddleware = require('webpack-dev-middleware');
 
-import { AssetPattern } from '../../browser/schema';
 import { KarmaWebpackFailureCb } from './karma-webpack-failure-cb';
+import { statsErrorsToString } from '../utilities/stats';
+import { getWebpackStatsConfig } from '../models/webpack-configs/stats';
+import { createConsoleLogger } from '@angular-devkit/core/node';
+import { logging } from '@angular-devkit/core';
 
 /**
  * Enumerate needed (but not require/imported) dependencies from this file
@@ -62,7 +64,7 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
     )
   }
   const options = config.buildWebpack.options;
-  const projectRoot = config.buildWebpack.projectRoot as string;
+  const logger: logging.Logger = config.buildWebpack.logger || createConsoleLogger();
   successCb = config.buildWebpack.successCb;
   failureCb = config.buildWebpack.failureCb;
 
@@ -93,7 +95,9 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
   // Add webpack config.
   const webpackConfig = config.buildWebpack.webpackConfig;
   const webpackMiddlewareConfig = {
-    logLevel: 'error', // Hide webpack output because its noisy.
+    // Hide webpack output because its noisy.
+    logLevel: 'error',
+    stats: false,
     watchOptions: { poll: options.poll },
     publicPath: '/_karma_webpack_/',
   };
@@ -147,9 +151,9 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
   try {
     compiler = webpack(webpackConfig);
   } catch (e) {
-    console.error(e.stack || e);
+    logger.error(e.stack || e)
     if (e.details) {
-      console.error(e.details);
+      logger.error(e.details)
     }
     throw e;
   }
@@ -175,9 +179,17 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
   }
 
   let lastCompilationHash: string | undefined;
+  const statsConfig = getWebpackStatsConfig();
   compiler.hooks.done.tap('karma', (stats: any) => {
-    // Refresh karma only when there are no webpack errors, and if the compilation changed.
-    if (stats.compilation.errors.length === 0 && stats.hash != lastCompilationHash) {
+    if (stats.compilation.errors.length > 0) {
+      const json = stats.toJson(config.stats);
+      // Print compilation errors.
+      logger.error(statsErrorsToString(json, statsConfig));
+      lastCompilationHash = undefined;
+      // Emit a failure build event if there are compilation errors.
+      failureCb && failureCb();
+    } else if (stats.hash != lastCompilationHash) {
+      // Refresh karma only when there are no webpack errors, and if the compilation changed.
       lastCompilationHash = stats.hash;
       emitter.refreshFiles();
     }
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index ef3f17acd508..1bd80e91196e 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -97,6 +97,7 @@ export class KarmaBuilder implements Builder<KarmaBuilderSchema> {
           // When this workaround is removed, user projects need to be updated to use a Karma
           // version that has a fix for this issue.
           toJSON: () => { },
+          logger: this.context.logger,
         };
 
         // TODO: inside the configs, always use the project root and not the workspace root.
diff --git a/packages/angular_devkit/build_angular/test/karma/rebuilds_spec_large.ts b/packages/angular_devkit/build_angular/test/karma/rebuilds_spec_large.ts
index 6d08de627625..a9613859373e 100644
--- a/packages/angular_devkit/build_angular/test/karma/rebuilds_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/karma/rebuilds_spec_large.ts
@@ -6,10 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { debounceTime, take, tap } from 'rxjs/operators';
+import { DefaultTimeout, runTargetSpec } from '@angular-devkit/architect/testing';
+import { Subject } from 'rxjs';
+import { debounceTime, delay, take, takeUntil, takeWhile, tap } from 'rxjs/operators';
 import { host, karmaTargetSpec } from '../utils';
 
+
 describe('Karma Builder watch mode', () => {
   beforeEach(done => host.initialize().toPromise().then(done, done.fail));
   afterEach(done => host.restore().toPromise().then(done, done.fail));
@@ -23,5 +25,83 @@ describe('Karma Builder watch mode', () => {
     ).toPromise();
 
     expect(res).toEqual({ success: true });
-  }, 30000);
+  });
+
+  it('recovers from compilation failures in watch mode', (done) => {
+    const overrides = { watch: true };
+    let buildCount = 0;
+    let phase = 1;
+
+    runTargetSpec(host, karmaTargetSpec, overrides, DefaultTimeout * 3).pipe(
+      debounceTime(500),
+      tap((buildEvent) => {
+        buildCount += 1;
+        switch (phase) {
+          case 1:
+            // Karma run should succeed.
+            // Add a compilation error.
+            expect(buildEvent.success).toBe(true);
+            // Add an syntax error to a non-main file.
+            host.appendToFile('src/app/app.component.spec.ts', `]]]`);
+            phase = 2;
+            break;
+
+          case 2:
+            // Karma run should fail due to compilation error. Fix it.
+            expect(buildEvent.success).toBe(false);
+            host.replaceInFile('src/app/app.component.spec.ts', `]]]`, '');
+            phase = 3;
+            break;
+
+          case 3:
+            // Karma run should succeed again.
+            expect(buildEvent.success).toBe(true);
+            phase = 4;
+            break;
+        }
+      }),
+      takeWhile(() => phase < 4),
+    ).toPromise().then(
+      () => done(),
+      () => done.fail(`stuck at phase ${phase} [builds: ${buildCount}]`),
+    );
+  });
+
+  it('does not rebuild when nothing changed', (done) => {
+    const overrides = { watch: true };
+    let buildCount = 0;
+    let phase = 1;
+
+    const stopSubject = new Subject();
+    const stop$ = stopSubject.asObservable().pipe(delay(5000));
+
+    runTargetSpec(host, karmaTargetSpec, overrides, DefaultTimeout * 3).pipe(
+      debounceTime(500),
+      tap((buildEvent) => {
+        buildCount += 1;
+        switch (phase) {
+          case 1:
+            // Karma run should succeed.
+            // Add a compilation error.
+            expect(buildEvent.success).toBe(true);
+            // Touch the file.
+            host.appendToFile('src/app/app.component.spec.ts', ``);
+            // Signal the stopper, which delays emission by 5s.
+            // If there's no rebuild within that time then the test is successful.
+            stopSubject.next();
+            phase = 2;
+            break;
+
+          case 2:
+            // Should never trigger this second build.
+            expect(true).toBeFalsy('Should not trigger second build.');
+            break;
+        }
+      }),
+      takeUntil(stop$),
+    ).toPromise().then(
+      () => done(),
+      () => done.fail(`stuck at phase ${phase} [builds: ${buildCount}]`),
+    );
+  });
 });

From 258df041c365299b7a495b0cddb349185eb86f85 Mon Sep 17 00:00:00 2001
From: puku0x <puku0x@gmail.com>
Date: Wed, 31 Oct 2018 12:04:07 +0900
Subject: [PATCH 0391/1703] fix(@schematics/angular): add serverTarget to app
 shell production configuration

---
 packages/schematics/angular/app-shell/index.ts      | 1 +
 packages/schematics/angular/app-shell/index_spec.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/schematics/angular/app-shell/index.ts b/packages/schematics/angular/app-shell/index.ts
index 0b14d8db9677..ec8b73feaa74 100644
--- a/packages/schematics/angular/app-shell/index.ts
+++ b/packages/schematics/angular/app-shell/index.ts
@@ -194,6 +194,7 @@ function addAppShellConfigToWorkspace(options: AppShellOptions): Rule {
       configurations: {
         production: {
           browserTarget: `${options.clientProject}:build:production`,
+          serverTarget: `${options.clientProject}:server:production`,
         },
       },
     };
diff --git a/packages/schematics/angular/app-shell/index_spec.ts b/packages/schematics/angular/app-shell/index_spec.ts
index deef63477f1a..ca7bf55929f9 100644
--- a/packages/schematics/angular/app-shell/index_spec.ts
+++ b/packages/schematics/angular/app-shell/index_spec.ts
@@ -69,6 +69,7 @@ describe('App Shell Schematic', () => {
     expect(target.options.serverTarget).toEqual('bar:server');
     expect(target.options.route).toEqual('shell');
     expect(target.configurations.production.browserTarget).toEqual('bar:build:production');
+    expect(target.configurations.production.serverTarget).toEqual('bar:server:production');
   });
 
   it('should add router module to client app module', () => {

From 1f3e2768c276544017cf7ee6798b27c870e72bb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=ABl=20Mac=C3=A9?= <contact@noelmace.com>
Date: Thu, 1 Nov 2018 18:59:13 +0100
Subject: [PATCH 0392/1703] fix(@schematics/angular): --minimal should prevent
 generating e2e (#12742)

* fix(@schematics/angular): --minimal should prevent generating e2e

Don't run the e2e schematic when using application or ng-new schematics
with option.minimal set to true.

fix #12739

* style: inverse logic according to feedback

* test(@schematics/angular): app and ng-new --minimal shouldn't generate e2e
---
 packages/schematics/angular/application/index.ts      |  2 +-
 packages/schematics/angular/application/index_spec.ts | 10 ++++++++++
 packages/schematics/angular/ng-new/index.ts           |  1 +
 packages/schematics/angular/ng-new/index_spec.ts      | 10 ++++++++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 3de361632581..24fd2dab1bf4 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -372,7 +372,7 @@ export default function (options: ApplicationOptions): Rule {
           }),
           move(sourceDir),
         ]), MergeStrategy.Overwrite),
-      schematic('e2e', e2eOptions),
+      options.minimal ? noop() : schematic('e2e', e2eOptions),
       options.skipPackageJson ? noop() : addDependenciesToPackageJson(options),
     ]);
   };
diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
index 5fd2be343ee4..931d9049ab43 100644
--- a/packages/schematics/angular/application/index_spec.ts
+++ b/packages/schematics/angular/application/index_spec.ts
@@ -136,6 +136,16 @@ describe('Application Schematic', () => {
     expect(content.rules['component-selector'][2]).toMatch('app');
   });
 
+  it('minimal=true should not create e2e project', () => {
+    const options = { ...defaultOptions, minimal: true };
+
+    const tree = schematicRunner.runSchematic('application', options, workspaceTree);
+    const files = tree.files;
+    expect(files.indexOf('/projects/foo-e2e')).toEqual(-1);
+    const confContent = JSON.parse(tree.readContent('/angular.json'));
+    expect(confContent.projects['foo-e2e']).toBeUndefined();
+  });
+
   describe(`update package.json`, () => {
     it(`should add build-angular to devDependencies`, () => {
       const tree = schematicRunner.runSchematic('application', defaultOptions, workspaceTree);
diff --git a/packages/schematics/angular/ng-new/index.ts b/packages/schematics/angular/ng-new/index.ts
index e71a83e5a917..9e7d926ee47e 100644
--- a/packages/schematics/angular/ng-new/index.ts
+++ b/packages/schematics/angular/ng-new/index.ts
@@ -57,6 +57,7 @@ export default function (options: NgNewOptions): Rule {
     skipPackageJson: false,
     // always 'skipInstall' here, so that we do it after the move
     skipInstall: true,
+    minimal: options.minimal,
   };
 
   return chain([
diff --git a/packages/schematics/angular/ng-new/index_spec.ts b/packages/schematics/angular/ng-new/index_spec.ts
index 8903428d9bab..efbf6daf6931 100644
--- a/packages/schematics/angular/ng-new/index_spec.ts
+++ b/packages/schematics/angular/ng-new/index_spec.ts
@@ -65,4 +65,14 @@ describe('Ng New Schematic', () => {
     expect(files.indexOf('/bar/angular.json')).toBeGreaterThanOrEqual(0);
     expect(files.indexOf('/bar/src')).toBe(-1);
   });
+
+  it('minimal=true should not create e2e project', () => {
+    const options = { ...defaultOptions, minimal: true };
+
+    const tree = schematicRunner.runSchematic('ng-new', options);
+    const files = tree.files;
+    expect(files.indexOf('/bar/e2e')).toEqual(-1);
+    const confContent = JSON.parse(tree.readContent('/bar/angular.json'));
+    expect(confContent.projects['foo-e2e']).toBeUndefined();
+  });
 });

From 0c4b4a6f8bbb0b91dac3ccf482443684222638af Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Thu, 1 Nov 2018 13:29:57 -0700
Subject: [PATCH 0393/1703] release: v7.1.0-beta.0

---
 .monorepo.json                                | 76 +++++++++----------
 .../angular/utility/latest-versions.ts        |  6 +-
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index d6c4d6f3b765..ae7c334be7ac 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,16 +42,16 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.9.0-rc.3",
-      "hash": "f828d4a3fa042a7feac4a48c86893375"
+      "version": "0.11.0-beta.0",
+      "hash": "ed6f2ae751fd3db351a20ae55349e8ad"
     },
     "@_/builders": {
-      "version": "0.9.0-rc.3",
-      "hash": "6983d21ece5e42aa536b50adfdceb56c"
+      "version": "0.11.0-beta.0",
+      "hash": "569aef8bc23693c344e71b9755e62c50"
     },
     "devkit": {
-      "version": "0.9.0-rc.3",
-      "hash": "4f379b7a9eea07dbb4ce5d00943da2a7"
+      "version": "0.11.0-beta.0",
+      "hash": "ffdd40ab3d05801f7bf32efa324d92d1"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -62,15 +62,15 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md"
         }
       ],
-      "version": "7.0.0-rc.3",
+      "version": "7.1.0-beta.0",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "1a81b6f6ae267f7e2ce5e6e541e6c5f1"
+      "hash": "f9e82d23eaf73855f73a6bf12faa41d7"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.9.0-rc.3",
-      "hash": "d5a17c053d50acc4371cf8836bd4e305",
+      "version": "0.11.0-beta.0",
+      "hash": "0261713533db3e3c3345732f7198cf2b",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -81,21 +81,21 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.9.0-rc.3",
-      "hash": "69de58e95e413c7f31288805502ac7cc",
+      "version": "0.11.0-beta.0",
+      "hash": "bf4589ed3a4b3f68014837616d1ed4e2",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.9.0-rc.3",
-      "hash": "56b94bb6df457dfb8247b12ad79c80ff",
+      "version": "0.11.0-beta.0",
+      "hash": "0c35ddea54a5b2483af2670b24635648",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
       "name": "Benchmark",
       "section": "Tooling",
-      "version": "1.0.0-rc.3",
-      "hash": "b22aede83c4a65b920886c2b7c07e617"
+      "version": "1.0.0-beta.0",
+      "hash": "9a28b5865e951779fedbeeaf8b445e74"
     },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
@@ -105,8 +105,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.9.0-rc.3",
-      "hash": "843110dac52428005e98af191cbdee7c",
+      "version": "0.11.0-beta.0",
+      "hash": "86c03973829cf0493ba1a27e95e184a1",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -117,8 +117,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.9.0-rc.3",
-      "hash": "70953928c8b694c84bd17679f32e6370",
+      "version": "0.11.0-beta.0",
+      "hash": "dbfed6c02deba394e8417160ac91f602",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -129,8 +129,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.9.0-rc.3",
-      "hash": "977fc0e11ce8e8cba6f1c510b2c9332f",
+      "version": "0.11.0-beta.0",
+      "hash": "71ba7e591bb8eb7f2e14ce16a3701329",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -141,9 +141,9 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.9.0-rc.3",
+      "version": "0.11.0-beta.0",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "993a11de93afac81b572e4a4cf0da29f"
+      "hash": "7c61bdbd01a925182ab03022e8498d3d"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -153,8 +153,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "7.0.0-rc.3",
-      "hash": "2c72e31bd22c0f247c510f2dde19b2df",
+      "version": "7.1.0-beta.0",
+      "hash": "e9ff1713f5a700c2605233be608de818",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -165,43 +165,43 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "7.0.0-rc.3",
-      "hash": "ccfc55132a0c921747352f35a8ceed2f",
+      "version": "7.1.0-beta.0",
+      "hash": "9bb483845f2984aaf14526d630de1571",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.9.0-rc.3",
-      "hash": "5e241ab9106459239f259a83416ef7bf",
+      "version": "0.11.0-beta.0",
+      "hash": "132d74c7cbbeb902aa5c9816a55e4c32",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "7.0.0-rc.3",
+      "version": "7.1.0-beta.0",
       "section": "Misc",
-      "hash": "f69c409a11ed2b38ee411bb879646a5a",
+      "hash": "bbe0f0908ad927f96ef6db1da4cc90e6",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "7.0.0-rc.3",
-      "hash": "a82c0c20dbc83e0a2accfa3512da89c1",
+      "version": "7.1.0-beta.0",
+      "hash": "db7d1da88bab17944ec7ff502a80b8d3",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.9.0-rc.3",
+      "version": "0.11.0-beta.0",
       "section": "Schematics",
-      "hash": "f3be77421fb1e428cf6ed65569260934",
+      "hash": "ab43ec0cdcb51f26e34ddbac933d76b9",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.9.0-rc.3",
+      "version": "0.11.0-beta.0",
       "section": "Schematics",
-      "hash": "e8706489d428c28fc2e66fd8fb78d26d",
+      "hash": "18bd3ac68c6d2808579a35cbf5c6fd32",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 22844f7b6d41..1232c81cea8d 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -8,12 +8,12 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~7.0.0-rc.0',
+  Angular: '~7.1.0-beta.0',
   RxJs: '~6.3.3',
   ZoneJs: '~0.8.26',
   TypeScript: '~3.1.4',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.9.0-rc.1',
-  DevkitBuildNgPackagr: '~0.9.0-rc.1',
+  DevkitBuildAngular: '~0.11.0-beta.0',
+  DevkitBuildNgPackagr: '~0.11.0-beta.0',
 };

From d63dbf143319ade4021f25ee1683c00ec9052cb0 Mon Sep 17 00:00:00 2001
From: vikerman <vikerman@users.noreply.github.com>
Date: Mon, 5 Nov 2018 13:46:00 -0800
Subject: [PATCH 0394/1703] chore: add license to BUILD file

---
 tools/build_event_protocol/BUILD | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/build_event_protocol/BUILD b/tools/build_event_protocol/BUILD
index 7b47346ad739..76be45f40bf6 100644
--- a/tools/build_event_protocol/BUILD
+++ b/tools/build_event_protocol/BUILD
@@ -1,3 +1,7 @@
+# Copyright Google Inc. All Rights Reserved.
+#
+# Use of this source code is governed by an MIT-style license that can be
+# found in the LICENSE file at https://angular.io/license
 load("@build_bazel_rules_typescript//:defs.bzl", "ts_library", "ts_proto_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
 

From 80dfe9cc15b100f563446761db2c4503fd4db88e Mon Sep 17 00:00:00 2001
From: vikerman <vikerman@users.noreply.github.com>
Date: Mon, 5 Nov 2018 13:50:38 -0800
Subject: [PATCH 0395/1703] chore: add license to BUILD file

---
 .../github.com/bazelbuild/bazel/src/main/protobuf/BUILD       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/third_party/github.com/bazelbuild/bazel/src/main/protobuf/BUILD b/third_party/github.com/bazelbuild/bazel/src/main/protobuf/BUILD
index ea73d6c2a1f4..55e90267ea77 100644
--- a/third_party/github.com/bazelbuild/bazel/src/main/protobuf/BUILD
+++ b/third_party/github.com/bazelbuild/bazel/src/main/protobuf/BUILD
@@ -1,3 +1,7 @@
+# Copyright Google Inc. All Rights Reserved.
+#
+# Use of this source code is governed by an MIT-style license that can be
+# found in the LICENSE file at https://angular.io/license
 package(default_visibility = ["//:__subpackages__"])
 
 licenses(["notice"])  # Apache 2.0

From 3139cba991e66989d362af5b5f4a670ae6c99e2b Mon Sep 17 00:00:00 2001
From: vikerman <vikerman@users.noreply.github.com>
Date: Mon, 5 Nov 2018 13:52:43 -0800
Subject: [PATCH 0396/1703] chore: add license to BUILD file

---
 .../google/devtools/build/lib/buildeventstream/proto/BUILD    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/third_party/github.com/bazelbuild/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD b/third_party/github.com/bazelbuild/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD
index 531b4325ee17..bac38c77f52e 100644
--- a/third_party/github.com/bazelbuild/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD
+++ b/third_party/github.com/bazelbuild/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/BUILD
@@ -1,3 +1,7 @@
+# Copyright Google Inc. All Rights Reserved.
+#
+# Use of this source code is governed by an MIT-style license that can be
+# found in the LICENSE file at https://angular.io/license
 package(default_visibility = ["//:__subpackages__"])
 
 licenses(["notice"])  # Apache 2.0

From db78228fc4880374076129d21d84248937cd9269 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Tue, 6 Nov 2018 11:12:21 -0800
Subject: [PATCH 0397/1703] build: add external block for tsconfig in test
 targets (#12879)

---
 packages/angular_devkit/benchmark/BUILD       | 2 ++
 packages/angular_devkit/build_optimizer/BUILD | 2 ++
 packages/angular_devkit/core/BUILD            | 4 ++++
 packages/angular_devkit/schematics/BUILD      | 6 ++++++
 packages/schematics/angular/BUILD             | 2 ++
 packages/schematics/schematics/BUILD          | 2 ++
 packages/schematics/update/BUILD              | 2 ++
 7 files changed, 20 insertions(+)

diff --git a/packages/angular_devkit/benchmark/BUILD b/packages/angular_devkit/benchmark/BUILD
index faf0b59b8de9..cf7fb65dd27b 100644
--- a/packages/angular_devkit/benchmark/BUILD
+++ b/packages/angular_devkit/benchmark/BUILD
@@ -55,7 +55,9 @@ ts_library(
         "@npm//@types/jasmine",
     ],
     testonly = True,
+    # @external_begin
     tsconfig = "//:tsconfig-test.json",
+    # @external_end
 )
 
 jasmine_node_test(
diff --git a/packages/angular_devkit/build_optimizer/BUILD b/packages/angular_devkit/build_optimizer/BUILD
index 23c483e63979..84c0a9383635 100644
--- a/packages/angular_devkit/build_optimizer/BUILD
+++ b/packages/angular_devkit/build_optimizer/BUILD
@@ -47,7 +47,9 @@ ts_library(
         "@npm//@types/source-map",
     ],
     testonly = True,
+    # @external_begin
     tsconfig = "//:tsconfig-test.json",
+    # @external_end
 )
 
 jasmine_node_test(
diff --git a/packages/angular_devkit/core/BUILD b/packages/angular_devkit/core/BUILD
index 1086e5546dbd..0d813f40b18d 100644
--- a/packages/angular_devkit/core/BUILD
+++ b/packages/angular_devkit/core/BUILD
@@ -57,7 +57,9 @@ ts_library(
         "src/workspace/test/test-workspace.json"
     ],
     testonly = True,
+    # @external_begin
     tsconfig = "//:tsconfig-test.json",
+    # @external_end
 )
 
 jasmine_node_test(
@@ -111,7 +113,9 @@ ts_library(
         "@npm//@types/jasmine",
     ],
     testonly = True,
+    # @external_begin
     tsconfig = "//:tsconfig-test.json",
+    # @external_end
 )
 
 jasmine_node_test(
diff --git a/packages/angular_devkit/schematics/BUILD b/packages/angular_devkit/schematics/BUILD
index 72f80df46937..bc932d1250e1 100644
--- a/packages/angular_devkit/schematics/BUILD
+++ b/packages/angular_devkit/schematics/BUILD
@@ -51,7 +51,9 @@ ts_library(
         "@npm//@types/jasmine",
     ],
     testonly = True,
+    # @external_begin
     tsconfig = "//:tsconfig-test.json",
+    # @external_end
 )
 
 jasmine_node_test(
@@ -141,7 +143,9 @@ ts_library(
         "@npm//@types/jasmine",
     ],
     testonly = True,
+    # @external_begin
     tsconfig = "//:tsconfig-test.json",
+    # @external_end
 )
 
 
@@ -205,7 +209,9 @@ ts_library(
         "@npm//@types/jasmine",
     ],
     testonly = True,
+    # @external_begin
     tsconfig = "//:tsconfig-test.json",
+    # @external_end
 )
 
 jasmine_node_test(
diff --git a/packages/schematics/angular/BUILD b/packages/schematics/angular/BUILD
index e59f66353731..42dc8a8b0ae1 100644
--- a/packages/schematics/angular/BUILD
+++ b/packages/schematics/angular/BUILD
@@ -84,7 +84,9 @@ ts_library(
         "@npm//typescript",
     ],
     testonly = True,
+    # @external_begin
     tsconfig = "//:tsconfig-test.json",
+    # @external_end
 )
 
 jasmine_node_test(
diff --git a/packages/schematics/schematics/BUILD b/packages/schematics/schematics/BUILD
index 1222314155a1..4119cef43f68 100644
--- a/packages/schematics/schematics/BUILD
+++ b/packages/schematics/schematics/BUILD
@@ -80,7 +80,9 @@ ts_json_schema(
 #         "@npm//@types/jasmine",
 #     ],
 #     testonly = True,
+#     # @external_begin
 #     tsconfig = "//:tsconfig-test.json",
+#     # @external_end
 # )
 
 # jasmine_node_test(
diff --git a/packages/schematics/update/BUILD b/packages/schematics/update/BUILD
index 7a994d5db65c..57a171f12d9b 100644
--- a/packages/schematics/update/BUILD
+++ b/packages/schematics/update/BUILD
@@ -70,7 +70,9 @@ ts_library(
         "@npm//pacote",
     ],
     testonly = True,
+    # @external_begin
     tsconfig = "//:tsconfig-test.json",
+    # @external_end
 )
 
 jasmine_node_test(

From 160ba3ff3823483cc31aa970be9f7871070d52af Mon Sep 17 00:00:00 2001
From: vikerman <vikerman@users.noreply.github.com>
Date: Tue, 6 Nov 2018 16:47:00 -0800
Subject: [PATCH 0398/1703] ci: fix 1.7 e2e test project by pinning jasmine
 typings version (#12884)

---
 tests/legacy-cli/e2e/assets/1.7-project/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/legacy-cli/e2e/assets/1.7-project/package.json b/tests/legacy-cli/e2e/assets/1.7-project/package.json
index a47925f53ada..17dfbf92a873 100644
--- a/tests/legacy-cli/e2e/assets/1.7-project/package.json
+++ b/tests/legacy-cli/e2e/assets/1.7-project/package.json
@@ -29,7 +29,7 @@
     "@angular/cli": "0.0.0",
     "@angular/compiler-cli": "^5.2.0",
     "@angular/language-service": "^5.2.0",
-    "@types/jasmine": "~2.8.3",
+    "@types/jasmine": "2.8.3",
     "@types/jasminewd2": "~2.0.2",
     "@types/node": "~6.0.60",
     "codelyzer": "^4.0.1",

From 42f85bede8cb6c7a693ec15ec448d9cfa1cc487c Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 7 Nov 2018 01:35:04 +0000
Subject: [PATCH 0399/1703] ci: add skip to appveyor (#12851)

---
 .appveyor.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.appveyor.yml b/.appveyor.yml
index edc5ecbae89d..e06ec0027ca0 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -4,6 +4,9 @@ environment:
 matrix:
   fast_finish: true
 
+skip_tags: true
+skip_branch_with_pr: true
+
 install:
   - ps: Install-Product node $env:nodejs_version
   # --network-timeout is a workaround for https://github.com/yarnpkg/yarn/issues/6221

From d3e1149bdfdb576e24ecff1f06d1be4829c67e67 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Tue, 6 Nov 2018 20:40:03 -0800
Subject: [PATCH 0400/1703] build: add missing transitive deps for typescript
 (#12881)

add `strict_checks = False` for building inside Google.
---
 packages/angular/cli/BUILD               |  3 ++-
 packages/angular_devkit/architect/BUILD  |  1 +
 packages/angular_devkit/core/BUILD       |  3 +++
 packages/angular_devkit/schematics/BUILD | 15 ++++++++++-----
 packages/schematics/angular/BUILD        |  1 +
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/packages/angular/cli/BUILD b/packages/angular/cli/BUILD
index 13373957a7ac..716ec2cd69c1 100644
--- a/packages/angular/cli/BUILD
+++ b/packages/angular/cli/BUILD
@@ -19,8 +19,9 @@ ts_library(
             "**/*_spec_large.ts",
         ],
     ),
-    data = glob(["**/*.json"]),
+    data = glob(["**/*.json", "**/*.md"]),
     module_name = "@angular/cli",
+    # strict_checks = False,
     deps = [
         ":command_schemas",
         "//packages/angular_devkit/architect",
diff --git a/packages/angular_devkit/architect/BUILD b/packages/angular_devkit/architect/BUILD
index 976b9caaaa53..64928bd9c268 100644
--- a/packages/angular_devkit/architect/BUILD
+++ b/packages/angular_devkit/architect/BUILD
@@ -20,6 +20,7 @@ ts_library(
     ),
     module_name = "@angular-devkit/architect",
     module_root = "src/index.d.ts",
+    # strict_checks = False,
     data = glob(["**/*.json"]),
     deps = [
         "//packages/angular_devkit/core",
diff --git a/packages/angular_devkit/core/BUILD b/packages/angular_devkit/core/BUILD
index 0d813f40b18d..0ef5a3aea99d 100644
--- a/packages/angular_devkit/core/BUILD
+++ b/packages/angular_devkit/core/BUILD
@@ -24,6 +24,7 @@ ts_library(
     data = glob(["**/*.json"]),
     module_name = "@angular-devkit/core",
     module_root = "src/index.d.ts",
+    # strict_checks = False,
     deps = [
         "@rxjs",
         "@rxjs//operators",
@@ -44,6 +45,7 @@ ts_library(
             "src/**/*_spec_large.ts",
         ],
     ),
+    # strict_checks = False,
     deps = [
         ":core",
         ":node",
@@ -145,6 +147,7 @@ ts_library(
     ),
     module_name = "@angular-devkit/core/node/testing",
     module_root = "node/testing/index.d.ts",
+    # strict_checks = False,
     deps = [
         ":core",
         ":node",
diff --git a/packages/angular_devkit/schematics/BUILD b/packages/angular_devkit/schematics/BUILD
index bc932d1250e1..f69847984252 100644
--- a/packages/angular_devkit/schematics/BUILD
+++ b/packages/angular_devkit/schematics/BUILD
@@ -23,6 +23,7 @@ ts_library(
     ),
     module_name = "@angular-devkit/schematics",
     module_root = "src/index.d.ts",
+    # strict_checks = False,
     deps = [
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",  # TODO: get rid of this for 6.0
@@ -60,9 +61,9 @@ jasmine_node_test(
     name = "schematics_test",
     srcs = [":schematics_test_lib"],
     deps = [
+        "@npm//chokidar",
         "@npm//jasmine",
         "@npm//source-map",
-        "@npm//chokidar",
     ],
 )
 
@@ -82,14 +83,16 @@ ts_library(
     ),
     module_name = "@angular-devkit/schematics/tasks",
     module_root = "tasks/index.d.ts",
+    # strict_checks = False,
     deps = [
         ":schematics",
-        "//packages/angular_devkit/core",
-        "//packages/angular_devkit/core:node",
-        "@rxjs",
-        "@rxjs//operators",
         "@npm//@types/node",
         "@npm//tslint",
+        "@npm//typescript",
+        "@rxjs",
+        "@rxjs//operators",
+        "//packages/angular_devkit/core:node",
+        "//packages/angular_devkit/core",
     ],
 )
 
@@ -106,6 +109,7 @@ ts_library(
     ),
     module_name = "@angular-devkit/schematics/tasks/node",
     module_root = "tasks/node/index.d.ts",
+    # strict_checks = False,
     deps = [
         ":schematics",
         ":tasks",
@@ -174,6 +178,7 @@ ts_library(
     ),
     module_name = "@angular-devkit/schematics/tools",
     module_root = "tools/index.d.ts",
+    # strict_checks = False,
     deps = [
         ":schematics",
         ":tasks",
diff --git a/packages/schematics/angular/BUILD b/packages/schematics/angular/BUILD
index 42dc8a8b0ae1..fe4755caec48 100644
--- a/packages/schematics/angular/BUILD
+++ b/packages/schematics/angular/BUILD
@@ -44,6 +44,7 @@ ts_library(
         ],
     ),
     module_name = "@schematics/angular",
+    # strict_checks = False,
     deps = ALL_SCHEMA_DEPS + [
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/schematics",

From df4ee8c491593f4a6a7a51adbe1a0c3dd9e0cb69 Mon Sep 17 00:00:00 2001
From: vikerman <vikerman@users.noreply.github.com>
Date: Tue, 6 Nov 2018 20:44:06 -0800
Subject: [PATCH 0401/1703] fix(@angular-devkit/core): fix 'this' check
 (#12873)

---
 packages/angular_devkit/core/src/json/schema/registry.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/core/src/json/schema/registry.ts b/packages/angular_devkit/core/src/json/schema/registry.ts
index dca9789aa9cc..71a4b7a6ce5d 100644
--- a/packages/angular_devkit/core/src/json/schema/registry.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry.ts
@@ -588,7 +588,9 @@ export class CoreSchemaRegistry implements SchemaRegistry {
         compilationSchemInfo.promptDefinitions.push(definition);
 
         return function(this: { promptFieldsWithValue: Set<string> }) {
-          if (this) {
+          // If 'this' is undefined in the call, then it defaults to the global
+          // 'this'.
+          if (this && this.promptFieldsWithValue) {
             this.promptFieldsWithValue.add(path);
           }
 

From 5e354d17f1c0ac39a9e4b6ae17a0bcdc64b47f31 Mon Sep 17 00:00:00 2001
From: clydin <19598772+clydin@users.noreply.github.com>
Date: Wed, 7 Nov 2018 01:00:40 -0500
Subject: [PATCH 0402/1703] feat(@angular/cli): autodetect default package
 manager (#12753)

---
 packages/angular/cli/commands/add-impl.ts     |  4 +-
 .../angular/cli/models/schematic-command.ts   |  4 +-
 .../cli/utilities/check-package-manager.ts    | 53 -----------------
 packages/angular/cli/utilities/config.ts      |  4 +-
 .../angular/cli/utilities/package-manager.ts  | 58 +++++++++++++++++++
 5 files changed, 64 insertions(+), 59 deletions(-)
 delete mode 100644 packages/angular/cli/utilities/check-package-manager.ts
 create mode 100644 packages/angular/cli/utilities/package-manager.ts

diff --git a/packages/angular/cli/commands/add-impl.ts b/packages/angular/cli/commands/add-impl.ts
index fe0ee5bbd1c6..400b7c05aef7 100644
--- a/packages/angular/cli/commands/add-impl.ts
+++ b/packages/angular/cli/commands/add-impl.ts
@@ -12,7 +12,7 @@ import { NodePackageDoesNotSupportSchematics } from '@angular-devkit/schematics/
 import { Arguments } from '../models/interface';
 import { SchematicCommand } from '../models/schematic-command';
 import { NpmInstall } from '../tasks/npm-install';
-import { getPackageManager } from '../utilities/config';
+import { getPackageManager } from '../utilities/package-manager';
 import { Schema as AddCommandSchema } from './add';
 
 export class AddCommand extends SchematicCommand<AddCommandSchema> {
@@ -28,7 +28,7 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
       return 1;
     }
 
-    const packageManager = getPackageManager();
+    const packageManager = getPackageManager(this.workspace.root);
 
     const npmInstall: NpmInstall = require('../tasks/npm-install').default;
 
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index b58a5edfc4ee..e25378040fb0 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -38,13 +38,13 @@ import * as inquirer from 'inquirer';
 import * as systemPath from 'path';
 import { WorkspaceLoader } from '../models/workspace-loader';
 import {
-  getPackageManager,
   getProjectByCwd,
   getSchematicDefaults,
   getWorkspace,
   getWorkspaceRaw,
 } from '../utilities/config';
 import { parseJsonSchemaToOptions } from '../utilities/json-schema';
+import { getPackageManager } from '../utilities/package-manager';
 import { BaseCommandOptions, Command } from './command';
 import { Arguments, CommandContext, CommandDescription, Option } from './interface';
 import { parseArguments, parseFreeFormArguments } from './parser';
@@ -255,7 +255,7 @@ export abstract class SchematicCommand<
         {
           force,
           dryRun,
-          packageManager: getPackageManager(),
+          packageManager: getPackageManager(this.workspace.root),
           root: normalize(this.workspace.root),
         },
     );
diff --git a/packages/angular/cli/utilities/check-package-manager.ts b/packages/angular/cli/utilities/check-package-manager.ts
deleted file mode 100644
index b62c89a1fbe2..000000000000
--- a/packages/angular/cli/utilities/check-package-manager.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { terminal } from '@angular-devkit/core';
-import { exec } from 'child_process';
-import { promisify } from 'util';
-import { getPackageManager } from './config';
-
-const execPromise = promisify(exec);
-const packageManager = getPackageManager();
-
-
-export function checkYarnOrCNPM() {
-
-  // Don't show messages if user has already changed the default.
-  if (packageManager !== 'default') {
-    return Promise.resolve();
-  }
-
-  return Promise
-      .all([checkYarn(), checkCNPM()])
-      .then((data: Array<boolean>) => {
-        const [isYarnInstalled, isCNPMInstalled] = data;
-        if (isYarnInstalled && isCNPMInstalled) {
-          console.error(terminal.yellow('You can `ng config -g cli.packageManager yarn` '
-            + 'or `ng config -g cli.packageManager cnpm`.'));
-        } else if (isYarnInstalled) {
-          console.error(terminal.yellow('You can `ng config -g cli.packageManager yarn`.'));
-        } else if (isCNPMInstalled) {
-          console.error(terminal.yellow('You can `ng config -g cli.packageManager cnpm`.'));
-        } else  {
-          if (packageManager !== 'default' && packageManager !== 'npm') {
-            console.error(terminal.yellow(`Seems that ${packageManager} is not installed.`));
-            console.error(terminal.yellow('You can `ng config -g cli.packageManager npm`.'));
-          }
-        }
-      });
-}
-
-function checkYarn() {
-  return execPromise('yarn --version')
-    .then(() => true, () => false);
-}
-
-function checkCNPM() {
-  return execPromise('cnpm --version')
-    .then(() => true, () => false);
-}
diff --git a/packages/angular/cli/utilities/config.ts b/packages/angular/cli/utilities/config.ts
index abad429d7b1f..336813c19d15 100644
--- a/packages/angular/cli/utilities/config.ts
+++ b/packages/angular/cli/utilities/config.ts
@@ -151,7 +151,7 @@ export function getProjectByCwd(workspace: experimental.workspace.Workspace): st
   }
 }
 
-export function getPackageManager(): string {
+export function getConfiguredPackageManager(): string | null {
   let workspace = getWorkspace('local');
 
   if (workspace) {
@@ -186,7 +186,7 @@ export function getPackageManager(): string {
     }
   }
 
-  return 'npm';
+  return null;
 }
 
 export function migrateLegacyGlobalConfig(): boolean {
diff --git a/packages/angular/cli/utilities/package-manager.ts b/packages/angular/cli/utilities/package-manager.ts
new file mode 100644
index 000000000000..31c7d4b54c35
--- /dev/null
+++ b/packages/angular/cli/utilities/package-manager.ts
@@ -0,0 +1,58 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { execSync } from 'child_process';
+import { existsSync } from 'fs';
+import { join } from 'path';
+import { getConfiguredPackageManager } from './config';
+
+
+export function supportsYarn(): boolean {
+  try {
+    execSync('yarn --version');
+
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+export function supportsNpm(): boolean {
+  try {
+    execSync('npm --version');
+
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+export function getPackageManager(root: string): string {
+  let packageManager = getConfiguredPackageManager();
+  if (packageManager) {
+    return packageManager;
+  }
+
+  const hasYarn = supportsYarn();
+  const hasYarnLock = existsSync(join(root, 'yarn.lock'));
+  const hasNpm = supportsNpm();
+  const hasNpmLock = existsSync(join(root, 'package-lock.json'));
+
+  if (hasYarn && hasYarnLock && !hasNpmLock) {
+    packageManager = 'yarn';
+  } else if (hasNpm && hasNpmLock && !hasYarnLock) {
+    packageManager = 'npm';
+  } else if (hasYarn && !hasNpm) {
+    packageManager = 'yarn';
+  } else if (hasNpm && !hasYarn) {
+    packageManager = 'npm';
+  }
+
+  // TODO: This should eventually inform the user of ambiguous package manager usage.
+  //       Potentially with a prompt to choose and optionally set as the default.
+  return packageManager || 'npm';
+}

From 131f55518cfa380c5fe1f74d5d568d3b5b5b2bca Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 7 Nov 2018 06:43:14 +0000
Subject: [PATCH 0403/1703] fix(@angular/cli): support all single dashes
 prefixed arguments (#12783)

Fixes #12771
---
 packages/angular/cli/models/parser.ts      | 10 ++++++----
 packages/angular/cli/models/parser_spec.ts |  8 ++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/packages/angular/cli/models/parser.ts b/packages/angular/cli/models/parser.ts
index 9cba5e6355de..a06148581f51 100644
--- a/packages/angular/cli/models/parser.ts
+++ b/packages/angular/cli/models/parser.ts
@@ -119,7 +119,8 @@ function _assignOption(
   ignored: string[],
   errors: string[],
 ) {
-  let key = arg.substr(2);
+  const from = arg.startsWith('--') ? 2 : 1;
+  let key = arg.substr(from);
   let option: Option | null = null;
   let value = '';
   const i = arg.indexOf('=');
@@ -172,8 +173,9 @@ function _assignOption(
       value = arg.substring(i + 1);
     }
   }
+
   if (option === null) {
-    if (args[0] && !args[0].startsWith('--')) {
+    if (args[0] && !args[0].startsWith('-')) {
       leftovers.push(arg, args[0]);
       args.shift();
     } else {
@@ -285,14 +287,14 @@ export function parseArguments(args: string[], options: Option[] | null): Argume
         const flag = arg[i];
         // If the next character is an '=', treat it as a long flag.
         if (arg[i + 1] == '=') {
-          const f = '--' + flag + arg.slice(i + 1);
+          const f = '-' + flag + arg.slice(i + 1);
           _assignOption(f, args, options, parsedOptions, positionals, leftovers, ignored, errors);
           break;
         }
         // Treat the last flag as `--a` (as if full flag but just one letter). We do this in
         // the loop because it saves us a check to see if the arg is just `-`.
         if (i == arg.length - 1) {
-          const arg = '--' + flag;
+          const arg = '-' + flag;
           _assignOption(arg, args, options, parsedOptions, positionals, leftovers, ignored, errors);
         } else {
           const maybeOption = _getOptionFromName(flag, options);
diff --git a/packages/angular/cli/models/parser_spec.ts b/packages/angular/cli/models/parser_spec.ts
index dbec3d2712d6..35440dcb34a5 100644
--- a/packages/angular/cli/models/parser_spec.ts
+++ b/packages/angular/cli/models/parser_spec.ts
@@ -128,6 +128,14 @@ describe('parseArguments', () => {
     '--e3 true': { e3: true },
     '--e3=true': { e3: true },
     'a b c 1': { p1: 'a', p2: 'b', '--': ['c', '1'] },
+
+    '-p=1 -c=prod': {'--': ['-p=1', '-c=prod'] },
+    '--p --c': {'--': ['--p', '--c'] },
+    '--p=123': {'--': ['--p=123'] },
+    '--p -c': {'--': ['--p', '-c'] },
+    '-p --c': {'--': ['-p', '--c'] },
+    '-p --c 123': {'--': ['-p', '--c', '123'] },
+    '--c 123 -p': {'--': ['--c', '123', '-p'] },
   };
 
   Object.entries(tests).forEach(([str, expected]) => {

From aaa453e3f518398f903dd22a07b71db6fbf38723 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 7 Nov 2018 06:44:25 +0000
Subject: [PATCH 0404/1703] feat(@angular-devkit/build-angular): update webpack
 (#12801)

---
 .../angular_devkit/build_angular/package.json |   2 +-
 yarn.lock                                     | 280 +++++++++---------
 2 files changed, 141 insertions(+), 141 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index e699262781d7..cb2927cf5d7f 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -46,7 +46,7 @@
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.0",
     "terser-webpack-plugin": "1.1.0",
-    "webpack": "4.22.0",
+    "webpack": "4.23.1",
     "webpack-dev-middleware": "3.4.0",
     "webpack-dev-server": "3.1.10",
     "webpack-merge": "4.1.4",
diff --git a/yarn.lock b/yarn.lock
index 11f88d92b126..49c4abe9ba00 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -582,147 +582,147 @@
     "@types/uglify-js" "*"
     source-map "^0.6.0"
 
-"@webassemblyjs/ast@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.8.tgz#f31f480debeef957f01b623f27eabc695fa4fe8f"
-  integrity sha512-dOrtdtEyB8sInpl75yLPNksY4sRl0j/+t6aHyB/YA+ab9hV3Fo7FmG12FHzP+2MvWVAJtDb+6eXR5EZbZJ+uVg==
-  dependencies:
-    "@webassemblyjs/helper-module-context" "1.7.8"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
-    "@webassemblyjs/wast-parser" "1.7.8"
-
-"@webassemblyjs/floating-point-hex-parser@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.8.tgz#1b3ed0e27e384032254e9322fc646dd3e70ef1b9"
-  integrity sha512-kn2zNKGsbql5i56VAgRYkpG+VazqHhQQZQycT2uXAazrAEDs23gy+Odkh5VblybjnwX2/BITkDtNmSO76hdIvQ==
-
-"@webassemblyjs/helper-api-error@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.8.tgz#a2b49c11f615e736f815ec927f035dcfa690d572"
-  integrity sha512-xUwxDXsd1dUKArJEP5wWM5zxgCSwZApSOJyP1XO7M8rNUChUDblcLQ4FpzTpWG2YeylMwMl1MlP5Ztryiz1x4g==
-
-"@webassemblyjs/helper-buffer@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.8.tgz#3fc66bfa09c1c60e824cf3d5887826fac062877d"
-  integrity sha512-WXiIMnuvuwlhWvVOm8xEXU9DnHaa3AgAU0ZPfvY8vO1cSsmYb2WbGbHnMLgs43vXnA7XAob9b56zuZaMkxpCBg==
-
-"@webassemblyjs/helper-code-frame@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.8.tgz#cc5a7e9522b70e7580df056dfd34020cf29645b0"
-  integrity sha512-TLQxyD9qGOIdX5LPQOPo0Ernd88U5rHkFb8WAjeMIeA0sPjCHeVPaGqUGGIXjUcblUkjuDAc07bruCcNHUrHDA==
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.7.8"
-
-"@webassemblyjs/helper-fsm@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.8.tgz#fe4607430af466912797c21acafd3046080182ea"
-  integrity sha512-TjK0CnD8hAPkV5mbSp5aWl6SO1+H3WFcjWtixWoy8EMA99YnNzYhpc/WSYWhf7yrhpzkq5tZB0tvLK3Svr3IXA==
-
-"@webassemblyjs/helper-module-context@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.8.tgz#3c2e7ee93d14ff4768ba66fb1be42fdc9dc7160a"
-  integrity sha512-uCutAKR7Nm0VsFixcvnB4HhAyHouNbj0Dx1p7eRjFjXGGZ+N7ftTaG1ZbWCasAEbtwGj54LP8+lkBZdTCPmLGg==
-
-"@webassemblyjs/helper-wasm-bytecode@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.8.tgz#89bdb78cd6dd5209ae2ed2925de78d0f0e00b6f0"
-  integrity sha512-AdCCE3BMW6V34WYaKUmPgVHa88t2Z14P4/0LjLwuGkI0X6pf7nzp0CehzVVk51cKm2ymVXjl9dCG+gR1yhITIQ==
-
-"@webassemblyjs/helper-wasm-section@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.8.tgz#c68ef7d26a6fc12421b2e6e56f9bc810dfb33e87"
-  integrity sha512-BkBhYQuzyl4hgTGOKo87Vdw6f9nj8HhI7WYpI0MCC5qFa5ahrAPOGgyETVdnRbv+Rjukl9MxxfDmVcVC435lDg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.8"
-    "@webassemblyjs/helper-buffer" "1.7.8"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
-    "@webassemblyjs/wasm-gen" "1.7.8"
-
-"@webassemblyjs/ieee754@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.8.tgz#1f37974b13cb486a9237e73ce04cac7a2f1265ed"
-  integrity sha512-tOarWChdG1a3y1yqCX0JMDKzrat5tQe4pV6K/TX19BcXsBLYxFQOL1DEDa5KG9syeyvCrvZ+i1+Mv1ExngvktQ==
+"@webassemblyjs/ast@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.10.tgz#0cfc61d61286240b72fc522cb755613699eea40a"
+  integrity sha512-wTUeaByYN2EA6qVqhbgavtGc7fLTOx0glG2IBsFlrFG51uXIGlYBTyIZMf4SPLo3v1bgV/7lBN3l7Z0R6Hswew==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.7.10"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
+    "@webassemblyjs/wast-parser" "1.7.10"
+
+"@webassemblyjs/floating-point-hex-parser@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.10.tgz#ee63d729c6311a85863e369a473f9983f984e4d9"
+  integrity sha512-gMsGbI6I3p/P1xL2UxqhNh1ga2HCsx5VBB2i5VvJFAaqAjd2PBTRULc3BpTydabUQEGlaZCzEUQhLoLG7TvEYQ==
+
+"@webassemblyjs/helper-api-error@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.10.tgz#bfcb3bbe59775357475790a2ad7b289f09b2f198"
+  integrity sha512-DoYRlPWtuw3yd5BOr9XhtrmB6X1enYF0/54yNvQWGXZEPDF5PJVNI7zQ7gkcKfTESzp8bIBWailaFXEK/jjCsw==
+
+"@webassemblyjs/helper-buffer@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.10.tgz#0a8c624c67ad0b214d2e003859921a1988cb151b"
+  integrity sha512-+RMU3dt/dPh4EpVX4u5jxsOlw22tp3zjqE0m3ftU2tsYxnPULb4cyHlgaNd2KoWuwasCQqn8Mhr+TTdbtj3LlA==
+
+"@webassemblyjs/helper-code-frame@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.10.tgz#0ab7e22fad0241a173178c73976fc0edf50832ce"
+  integrity sha512-UiytbpKAULOEab2hUZK2ywXen4gWJVrgxtwY3Kn+eZaaSWaRM8z/7dAXRSoamhKFiBh1uaqxzE/XD9BLlug3gw==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.7.10"
+
+"@webassemblyjs/helper-fsm@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.10.tgz#0915e7713fbbb735620a9d3e4fa3d7951f97ac64"
+  integrity sha512-w2vDtUK9xeSRtt5+RnnlRCI7wHEvLjF0XdnxJpgx+LJOvklTZPqWkuy/NhwHSLP19sm9H8dWxKeReMR7sCkGZA==
+
+"@webassemblyjs/helper-module-context@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.10.tgz#9beb83f72740f5ac8075313b5cac5e796510f755"
+  integrity sha512-yE5x/LzZ3XdPdREmJijxzfrf+BDRewvO0zl8kvORgSWmxpRrkqY39KZSq6TSgIWBxkK4SrzlS3BsMCv2s1FpsQ==
+
+"@webassemblyjs/helper-wasm-bytecode@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.10.tgz#797b1e734bbcfdea8399669cdc58308ef1c7ffc0"
+  integrity sha512-u5qy4SJ/OrxKxZqJ9N3qH4ZQgHaAzsopsYwLvoWJY6Q33r8PhT3VPyNMaJ7ZFoqzBnZlCcS/0f4Sp8WBxylXfg==
+
+"@webassemblyjs/helper-wasm-section@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.10.tgz#c0ea3703c615d7bc3e3507c3b7991c8767b2f20e"
+  integrity sha512-Ecvww6sCkcjatcyctUrn22neSJHLN/TTzolMGG/N7S9rpbsTZ8c6Bl98GpSpV77EvzNijiNRHBG0+JO99qKz6g==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.10"
+    "@webassemblyjs/helper-buffer" "1.7.10"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
+    "@webassemblyjs/wasm-gen" "1.7.10"
+
+"@webassemblyjs/ieee754@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.10.tgz#62c1728b7ef0f66ef8221e2966a0afd75db430df"
+  integrity sha512-HRcWcY+YWt4+s/CvQn+vnSPfRaD4KkuzQFt5MNaELXXHSjelHlSEA8ZcqT69q0GTIuLWZ6JaoKar4yWHVpZHsQ==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.8.tgz#1bee83426819192db2ea1a234b84c7ebc6d34c1f"
-  integrity sha512-GCYeGPgUFWJiZuP4NICbcyUQNxNLJIf476Ei+K+jVuuebtLpfvwkvYT6iTUE7oZYehhkor4Zz2g7SJ/iZaPudQ==
+"@webassemblyjs/leb128@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.10.tgz#167e0bb4b06d7701585772a73fba9f4df85439f6"
+  integrity sha512-og8MciYlA8hvzCLR71hCuZKPbVBfLQeHv7ImKZ4nlyxrYbG7uJHYtHiHu6OV9SqrGuD03H/HtXC4Bgdjfm9FHw==
   dependencies:
     "@xtuc/long" "4.2.1"
 
-"@webassemblyjs/utf8@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.8.tgz#2b489d5cf43e0aebb93d8e2d792aff9879c61f05"
-  integrity sha512-9X+f0VV+xNXW2ujfIRSXBJENGE6Qh7bNVKqu3yDjTFB3ar3nsThsGBBKdTG58aXOm2iUH6v28VIf88ymPXODHA==
-
-"@webassemblyjs/wasm-edit@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.8.tgz#f8bdbe7088718eca27b1c349bb7c06b8a457950c"
-  integrity sha512-6D3Hm2gFixrfyx9XjSON4ml1FZTugqpkIz5Awvrou8fnpyprVzcm4X8pyGRtA2Piixjl3DqmX/HB1xdWyE097A==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.8"
-    "@webassemblyjs/helper-buffer" "1.7.8"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
-    "@webassemblyjs/helper-wasm-section" "1.7.8"
-    "@webassemblyjs/wasm-gen" "1.7.8"
-    "@webassemblyjs/wasm-opt" "1.7.8"
-    "@webassemblyjs/wasm-parser" "1.7.8"
-    "@webassemblyjs/wast-printer" "1.7.8"
-
-"@webassemblyjs/wasm-gen@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.8.tgz#7e8abf1545eae74ac6781d545c034af3cfd0c7d5"
-  integrity sha512-a7O/wE6eBeVKKUYgpMK7NOHmMADD85rSXLe3CqrWRDwWff5y3cSVbzpN6Qv3z6C4hdkpq9qyij1Ga1kemOZGvQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.8"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
-    "@webassemblyjs/ieee754" "1.7.8"
-    "@webassemblyjs/leb128" "1.7.8"
-    "@webassemblyjs/utf8" "1.7.8"
-
-"@webassemblyjs/wasm-opt@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.8.tgz#7ada6e211914728fce02ff0ff9c344edc6d41f26"
-  integrity sha512-3lbQ0PT81NHCdi1sR/7+SNpZadM4qYcTSr62nFFAA7e5lFwJr14M1Gi+A/Y3PgcDWOHYjsaNGPpPU0H03N6Blg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.8"
-    "@webassemblyjs/helper-buffer" "1.7.8"
-    "@webassemblyjs/wasm-gen" "1.7.8"
-    "@webassemblyjs/wasm-parser" "1.7.8"
-
-"@webassemblyjs/wasm-parser@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.8.tgz#dac47c291fb6a3e63529aecd647592cd34afbf94"
-  integrity sha512-rZ/zlhp9DHR/05zh1MbAjT2t624sjrPP/OkJCjXqzm7ynH+nIdNcn9Ixc+qzPMFXhIrk0rBoQ3to6sEIvHh9jQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.8"
-    "@webassemblyjs/helper-api-error" "1.7.8"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
-    "@webassemblyjs/ieee754" "1.7.8"
-    "@webassemblyjs/leb128" "1.7.8"
-    "@webassemblyjs/utf8" "1.7.8"
-
-"@webassemblyjs/wast-parser@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.8.tgz#f8aab9a450c048c1f9537695c89faeb92fabfba5"
-  integrity sha512-Q/zrvtUvzWuSiJMcSp90fi6gp2nraiHXjTV2VgAluVdVapM4gy1MQn7akja2p6eSBDQpKJPJ6P4TxRkghRS5dg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.8"
-    "@webassemblyjs/floating-point-hex-parser" "1.7.8"
-    "@webassemblyjs/helper-api-error" "1.7.8"
-    "@webassemblyjs/helper-code-frame" "1.7.8"
-    "@webassemblyjs/helper-fsm" "1.7.8"
+"@webassemblyjs/utf8@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.10.tgz#b6728f5b6f50364abc155be029f9670e6685605a"
+  integrity sha512-Ng6Pxv6siyZp635xCSnH3mKmIFgqWPCcGdoo0GBYgyGdxu7cUj4agV7Uu1a8REP66UYUFXJLudeGgd4RvuJAnQ==
+
+"@webassemblyjs/wasm-edit@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.10.tgz#83fe3140f5a58f5a30b914702be9f0e59a399092"
+  integrity sha512-e9RZFQlb+ZuYcKRcW9yl+mqX/Ycj9+3/+ppDI8nEE/NCY6FoK8f3dKBcfubYV/HZn44b+ND4hjh+4BYBt+sDnA==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.10"
+    "@webassemblyjs/helper-buffer" "1.7.10"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
+    "@webassemblyjs/helper-wasm-section" "1.7.10"
+    "@webassemblyjs/wasm-gen" "1.7.10"
+    "@webassemblyjs/wasm-opt" "1.7.10"
+    "@webassemblyjs/wasm-parser" "1.7.10"
+    "@webassemblyjs/wast-printer" "1.7.10"
+
+"@webassemblyjs/wasm-gen@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.10.tgz#4de003806ae29c97ab3707782469b53299570174"
+  integrity sha512-M0lb6cO2Y0PzDye/L39PqwV+jvO+2YxEG5ax+7dgq7EwXdAlpOMx1jxyXJTScQoeTpzOPIb+fLgX/IkLF8h2yw==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.10"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
+    "@webassemblyjs/ieee754" "1.7.10"
+    "@webassemblyjs/leb128" "1.7.10"
+    "@webassemblyjs/utf8" "1.7.10"
+
+"@webassemblyjs/wasm-opt@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.10.tgz#d151e31611934a556c82789fdeec41a814993c2a"
+  integrity sha512-R66IHGCdicgF5ZliN10yn5HaC7vwYAqrSVJGjtJJQp5+QNPBye6heWdVH/at40uh0uoaDN/UVUfXK0gvuUqtVg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.10"
+    "@webassemblyjs/helper-buffer" "1.7.10"
+    "@webassemblyjs/wasm-gen" "1.7.10"
+    "@webassemblyjs/wasm-parser" "1.7.10"
+
+"@webassemblyjs/wasm-parser@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.10.tgz#0367be7bf8f09e3e6abc95f8e483b9206487ec65"
+  integrity sha512-AEv8mkXVK63n/iDR3T693EzoGPnNAwKwT3iHmKJNBrrALAhhEjuPzo/lTE4U7LquEwyvg5nneSNdTdgrBaGJcA==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.10"
+    "@webassemblyjs/helper-api-error" "1.7.10"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
+    "@webassemblyjs/ieee754" "1.7.10"
+    "@webassemblyjs/leb128" "1.7.10"
+    "@webassemblyjs/utf8" "1.7.10"
+
+"@webassemblyjs/wast-parser@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.10.tgz#058f598b52f730b23fc874d4775b6286b6247264"
+  integrity sha512-YTPEtOBljkCL0VjDp4sHe22dAYSm3ZwdJ9+2NTGdtC7ayNvuip1wAhaAS8Zt9Q6SW9E5Jf5PX7YE3XWlrzR9cw==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.10"
+    "@webassemblyjs/floating-point-hex-parser" "1.7.10"
+    "@webassemblyjs/helper-api-error" "1.7.10"
+    "@webassemblyjs/helper-code-frame" "1.7.10"
+    "@webassemblyjs/helper-fsm" "1.7.10"
     "@xtuc/long" "4.2.1"
 
-"@webassemblyjs/wast-printer@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.8.tgz#e7e965782c1912f6a965f14a53ff43d8ad0403a5"
-  integrity sha512-GllIthRtwTxRDAURRNXscu7Napzmdf1jt1gpiZiK/QN4fH0lSGs3OTmvdfsMNP7tqI4B3ZtfaaWRlNIQug6Xyg==
+"@webassemblyjs/wast-printer@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.10.tgz#d817909d2450ae96c66b7607624d98a33b84223b"
+  integrity sha512-mJ3QKWtCchL1vhU/kZlJnLPuQZnlDOdZsyP0bbLWPGdYsQDnSBvyTLhzwBA3QAMlzEL9V4JHygEmK6/OTEyytA==
   dependencies:
-    "@webassemblyjs/ast" "1.7.8"
-    "@webassemblyjs/wast-parser" "1.7.8"
+    "@webassemblyjs/ast" "1.7.10"
+    "@webassemblyjs/wast-parser" "1.7.10"
     "@xtuc/long" "4.2.1"
 
 "@xtuc/ieee754@^1.2.0":
@@ -10345,15 +10345,15 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.22.0, webpack@^4.0.0, webpack@^4.6.0:
-  version "4.22.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.22.0.tgz#b168111e2e7b05f5169ac484e79e62093ec39e0d"
-  integrity sha512-2+3EYFqyhPl12buLQ42QPHEEh8BHn3P9ipRvGRHhdfKJ1u9svhZ3QjhIoEdL5SeIhL5gfOZVbBnartYEabkEsg==
+webpack@4.23.1, webpack@^4.0.0, webpack@^4.6.0:
+  version "4.23.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.23.1.tgz#db7467b116771ae020c58bdfe2a0822785bb8239"
+  integrity sha512-iE5Cu4rGEDk7ONRjisTOjVHv3dDtcFfwitSxT7evtYj/rANJpt1OuC/Kozh1pBa99AUBr1L/LsaNB+D9Xz3CEg==
   dependencies:
-    "@webassemblyjs/ast" "1.7.8"
-    "@webassemblyjs/helper-module-context" "1.7.8"
-    "@webassemblyjs/wasm-edit" "1.7.8"
-    "@webassemblyjs/wasm-parser" "1.7.8"
+    "@webassemblyjs/ast" "1.7.10"
+    "@webassemblyjs/helper-module-context" "1.7.10"
+    "@webassemblyjs/wasm-edit" "1.7.10"
+    "@webassemblyjs/wasm-parser" "1.7.10"
     acorn "^5.6.2"
     acorn-dynamic-import "^3.0.0"
     ajv "^6.1.0"

From 4fd73103324761351c2b961f948adf7173f5b4b8 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 7 Nov 2018 06:44:39 +0000
Subject: [PATCH 0405/1703] feat(@angular-devkit/build-angular): improve
 verbose output (#12833)

---
 .../angular-cli-files/models/webpack-configs/stats.ts    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/stats.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/stats.ts
index 5e3d46953d3e..6c7ffc76a44d 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/stats.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/stats.ts
@@ -26,11 +26,16 @@ const webpackOutputOptions = {
 };
 
 const verboseWebpackOutputOptions = {
+  // The verbose output will most likely be piped to a file, so colors just mess it up.
+  colors: false,
+  usedExports: true,
+  maxModules: Infinity,
+  optimizationBailout: true,
+  reasons: true,
   children: true,
   assets: true,
   version: true,
-  reasons: true,
-  chunkModules: false, // TODO: set to true when console to file output is fixed
+  chunkModules: true,
   errorDetails: true,
   moduleTrace: true,
 };

From 0995886004a0dbc18f7c499129b3682926856529 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 7 Nov 2018 06:46:10 +0000
Subject: [PATCH 0406/1703] refactor: remove `experimentalAngularNext` (#12848)

Closes #12769
---
 .../angular/workspace/files/package.json      | 22 +++++++++----------
 .../schematics/angular/workspace/schema.json  |  5 -----
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/packages/schematics/angular/workspace/files/package.json b/packages/schematics/angular/workspace/files/package.json
index a3ea4c379f53..4c6f3a0b0a71 100644
--- a/packages/schematics/angular/workspace/files/package.json
+++ b/packages/schematics/angular/workspace/files/package.json
@@ -11,23 +11,23 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
-    "@angular/common": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
-    "@angular/compiler": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
-    "@angular/core": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
-    "@angular/forms": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
-    "@angular/platform-browser": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
-    "@angular/platform-browser-dynamic": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
-    "@angular/router": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
+    "@angular/animations": "<%= latestVersions.Angular %>",
+    "@angular/common": "<%= latestVersions.Angular %>",
+    "@angular/compiler": "<%= latestVersions.Angular %>",
+    "@angular/core": "<%= latestVersions.Angular %>",
+    "@angular/forms": "<%= latestVersions.Angular %>",
+    "@angular/platform-browser": "<%= latestVersions.Angular %>",
+    "@angular/platform-browser-dynamic": "<%= latestVersions.Angular %>",
+    "@angular/router": "<%= latestVersions.Angular %>",
     "core-js": "^2.5.4",
     "rxjs": "<%= latestVersions.RxJs %>",
     "tslib": "<%= latestVersions.TsLib %>",
     "zone.js": "<%= latestVersions.ZoneJs %>"
   },
   "devDependencies": {
-    "@angular/cli": "<%= experimentalAngularNext ? 'next' : '~' + version %>",
-    "@angular/compiler-cli": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
-    "@angular/language-service": "<%= experimentalAngularNext ? 'next' : latestVersions.Angular %>",
+    "@angular/cli": "<%= '~' + version %>",
+    "@angular/compiler-cli": "<%= latestVersions.Angular %>",
+    "@angular/language-service": "<%= latestVersions.Angular %>",
     "@types/node": "~8.9.4",<% if (!minimal) { %>
     "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "~2.0.3",
diff --git a/packages/schematics/angular/workspace/schema.json b/packages/schematics/angular/workspace/schema.json
index 9268d1b64006..7d3defa307de 100644
--- a/packages/schematics/angular/workspace/schema.json
+++ b/packages/schematics/angular/workspace/schema.json
@@ -13,11 +13,6 @@
         "index": 0
       }
     },
-    "experimentalAngularNext": {
-      "description": "Use the next version of Angular (@next dist-tag).",
-      "type": "boolean",
-      "visible": "false"
-    },
     "newProjectRoot": {
       "description": "The path where new projects will be created.",
       "type": "string",

From 53118c62241e5b07325dc1142648ee5b5d6a1ed7 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 7 Nov 2018 06:46:37 +0000
Subject: [PATCH 0407/1703]  build: update typescript to 3.1.6 (#12849)

* fix(@angular-devkit/build-optimizer): update typescript to 3.1.6

* build: update typescript to 3.1.6
---
 package.json                                              | 2 +-
 packages/angular_devkit/build_optimizer/package.json      | 2 +-
 packages/ngtools/webpack/package.json                     | 2 +-
 packages/schematics/angular/package.json                  | 2 +-
 packages/schematics/angular/utility/latest-versions.ts    | 2 +-
 .../schematics/blank/project-files/package.json           | 2 +-
 .../schematics/schematics/schematic/files/package.json    | 2 +-
 yarn.lock                                                 | 8 ++++----
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index fc88b041b1df..81d0f892c300 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "quicktype-core": "^5.0.41",
     "temp": "^0.8.3",
     "tslint": "^5.11.0",
-    "typescript": "~3.1.5",
+    "typescript": "~3.1.6",
     "yarn": "^1.10.1"
   },
   "devDependencies": {
diff --git a/packages/angular_devkit/build_optimizer/package.json b/packages/angular_devkit/build_optimizer/package.json
index 1c74bfd53abf..0e37192541c3 100644
--- a/packages/angular_devkit/build_optimizer/package.json
+++ b/packages/angular_devkit/build_optimizer/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "loader-utils": "1.1.0",
     "source-map": "0.5.6",
-    "typescript": "3.1.5",
+    "typescript": "3.1.6",
     "webpack-sources": "1.2.0"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 9ab78de9ac19..e3bc82d49ddd 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -35,7 +35,7 @@
   "devDependencies": {
     "@angular/compiler": "^7.0.0-rc.0",
     "@angular/compiler-cli": "^7.0.0-rc.0",
-    "typescript": "~3.1.5",
+    "typescript": "~3.1.6",
     "webpack": "^4.0.0"
   }
 }
diff --git a/packages/schematics/angular/package.json b/packages/schematics/angular/package.json
index 1b8cd6a80201..17fa20594002 100644
--- a/packages/schematics/angular/package.json
+++ b/packages/schematics/angular/package.json
@@ -11,6 +11,6 @@
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
-    "typescript": "3.1.5"
+    "typescript": "3.1.6"
   }
 }
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 1232c81cea8d..ca34a923985b 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -11,7 +11,7 @@ export const latestVersions = {
   Angular: '~7.1.0-beta.0',
   RxJs: '~6.3.3',
   ZoneJs: '~0.8.26',
-  TypeScript: '~3.1.4',
+  TypeScript: '~3.1.6',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
   DevkitBuildAngular: '~0.11.0-beta.0',
diff --git a/packages/schematics/schematics/blank/project-files/package.json b/packages/schematics/schematics/blank/project-files/package.json
index 78f1d478d8ac..2479ef312f33 100644
--- a/packages/schematics/schematics/blank/project-files/package.json
+++ b/packages/schematics/schematics/blank/project-files/package.json
@@ -18,6 +18,6 @@
     "@types/jasmine": "^2.6.0",
     "@types/node": "^8.0.31",
     "jasmine": "^2.8.0",
-    "typescript": "~3.1.5"
+    "typescript": "~3.1.6"
   }
 }
diff --git a/packages/schematics/schematics/schematic/files/package.json b/packages/schematics/schematics/schematic/files/package.json
index d708b981ee58..0c82a10e4339 100644
--- a/packages/schematics/schematics/schematic/files/package.json
+++ b/packages/schematics/schematics/schematic/files/package.json
@@ -18,6 +18,6 @@
     "@types/jasmine": "^2.6.0",
     "@types/node": "^8.0.31",
     "jasmine": "^2.8.0",
-    "typescript": "~3.1.5"
+    "typescript": "~3.1.6"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 49c4abe9ba00..45d9e876297c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9903,10 +9903,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@3.1.5, typescript@~3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.5.tgz#93d8b6864375325a91177372cb370ae0ae3a0703"
-  integrity sha512-muYNWV9j5+3mXoKD6oPONKuGUmYiFX14gfo9lWm9ZXRHOqVDQiB4q1CzFPbF4QLV2E9TZXH6oK55oQ94rn3PpA==
+typescript@3.1.6, typescript@~3.1.6:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68"
+  integrity sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==
 
 uglify-es@^3.3.4:
   version "3.3.9"

From d3d433624b60fbac7b4acf3039e6956cff834a17 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 7 Nov 2018 06:47:39 +0000
Subject: [PATCH 0408/1703] fix(@schematics/angular): minimal should be honored
 in workspace creation

---
 .../schematics/angular/application/index.ts   | 38 +++++++++----------
 .../angular/application/index_spec.ts         | 24 ++++++++++++
 .../schematics/angular/workspace/index.ts     |  6 +++
 .../angular/workspace/index_spec.ts           | 12 ++++++
 4 files changed, 60 insertions(+), 20 deletions(-)

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 24fd2dab1bf4..1739407d83b0 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -23,6 +23,7 @@ import {
   url,
 } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
+import { Schema as ComponentOptions } from '../component/schema';
 import { Schema as E2eOptions } from '../e2e/schema';
 import {
   addProjectToWorkspace,
@@ -246,11 +247,9 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
 }
 
 function minimalPathFilter(path: string): boolean {
-  const toRemoveList: RegExp[] = [/e2e\//, /editorconfig/, /README/, /karma.conf.js/,
-                                  /protractor.conf.js/, /test.ts/, /tsconfig.spec.json/,
-                                  /tslint.json/, /favicon.ico/];
+  const toRemoveList = /(test.ts|tsconfig.spec.json|karma.conf.js)$/;
 
-  return !toRemoveList.some(re => re.test(path));
+  return !toRemoveList.test(path);
 }
 
 export default function (options: ApplicationOptions): Rule {
@@ -261,20 +260,20 @@ export default function (options: ApplicationOptions): Rule {
     validateProjectName(options.name);
     const prefix = options.prefix || 'app';
     const appRootSelector = `${prefix}-root`;
-    const componentOptions = !options.minimal ?
-    {
-      inlineStyle: options.inlineStyle,
-      inlineTemplate: options.inlineTemplate,
-      spec: !options.skipTests,
-      styleext: options.style,
-      viewEncapsulation: options.viewEncapsulation,
-    } :
-    {
-      inlineStyle: true,
-      InlineTemplate: true,
-      spec: false,
-      styleext: options.style,
-    };
+    const componentOptions: Partial<ComponentOptions> = !options.minimal ?
+      {
+        inlineStyle: options.inlineStyle,
+        inlineTemplate: options.inlineTemplate,
+        spec: !options.skipTests,
+        styleext: options.style,
+        viewEncapsulation: options.viewEncapsulation,
+      } :
+      {
+        inlineStyle: true,
+        inlineTemplate: true,
+        spec: false,
+        styleext: options.style,
+      };
 
     const workspace = getWorkspace(host);
     let newProjectRoot = workspace.newProjectRoot;
@@ -327,9 +326,8 @@ export default function (options: ApplicationOptions): Rule {
           }),
           move(appDir),
         ])),
-      mergeWith(
+      options.minimal ? noop() : mergeWith(
         apply(url('./files/lint'), [
-          options.minimal ? filter(minimalPathFilter) : noop(),
           template({
             utils: strings,
             ...options,
diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
index 931d9049ab43..9ddb893418c6 100644
--- a/packages/schematics/angular/application/index_spec.ts
+++ b/packages/schematics/angular/application/index_spec.ts
@@ -146,6 +146,30 @@ describe('Application Schematic', () => {
     expect(confContent.projects['foo-e2e']).toBeUndefined();
   });
 
+  it('should create correct files when using minimal', () => {
+    const options = { ...defaultOptions, minimal: true };
+    const tree = schematicRunner.runSchematic('application', options, workspaceTree);
+    const files = tree.files;
+
+    expect(files.indexOf('/projects/foo/karma.conf.js')).toBe(-1);
+    expect(files.indexOf('/projects/foo/tsconfig.app.json')).toBeGreaterThanOrEqual(0);
+    expect(files.indexOf('/projects/foo/tsconfig.spec.json')).toBe(-1);
+    expect(files.indexOf('/projects/foo/tslint.json')).toBe(-1);
+    expect(files.indexOf('/projects/foo/src/environments/environment.ts')).toBeGreaterThanOrEqual(0);
+    expect(files.indexOf('/projects/foo/src/environments/environment.prod.ts')).toBeGreaterThanOrEqual(0);
+    expect(files.indexOf('/projects/foo/src/favicon.ico')).toBeGreaterThanOrEqual(0);
+    expect(files.indexOf('/projects/foo/src/index.html')).toBeGreaterThanOrEqual(0);
+    expect(files.indexOf('/projects/foo/src/main.ts')).toBeGreaterThanOrEqual(0);
+    expect(files.indexOf('/projects/foo/src/polyfills.ts')).toBeGreaterThanOrEqual(0);
+    expect(files.indexOf('/projects/foo/src/styles.css')).toBeGreaterThanOrEqual(0);
+    expect(files.indexOf('/projects/foo/src/test.ts')).toBe(-1);
+    expect(files.indexOf('/projects/foo/src/app/app.module.ts')).toBeGreaterThanOrEqual(0);
+    expect(files.indexOf('/projects/foo/src/app/app.component.css')).toBe(-1);
+    expect(files.indexOf('/projects/foo/src/app/app.component.html')).toBe(-1);
+    expect(files.indexOf('/projects/foo/src/app/app.component.spec.ts')).toBe(-1);
+    expect(files.indexOf('/projects/foo/src/app/app.component.ts')).toBeGreaterThanOrEqual(0);
+  });
+
   describe(`update package.json`, () => {
     it(`should add build-angular to devDependencies`, () => {
       const tree = schematicRunner.runSchematic('application', defaultOptions, workspaceTree);
diff --git a/packages/schematics/angular/workspace/index.ts b/packages/schematics/angular/workspace/index.ts
index 11f4d81f72fc..6f2dd14589af 100644
--- a/packages/schematics/angular/workspace/index.ts
+++ b/packages/schematics/angular/workspace/index.ts
@@ -9,15 +9,21 @@ import { strings } from '@angular-devkit/core';
 import {
   Rule,
   apply,
+  filter,
   mergeWith,
+  noop,
   template,
   url,
 } from '@angular-devkit/schematics';
 import { latestVersions } from '../utility/latest-versions';
 import { Schema as WorkspaceOptions } from './schema';
 
+
 export default function (options: WorkspaceOptions): Rule {
+  const minimalFilesRegExp = /(.editorconfig|tslint.json)$/;
+
   return mergeWith(apply(url('./files'), [
+    options.minimal ? filter(path => !minimalFilesRegExp.test(path)) : noop(),
     template({
       utils: strings,
       ...options,
diff --git a/packages/schematics/angular/workspace/index_spec.ts b/packages/schematics/angular/workspace/index_spec.ts
index 6ddba08d3bea..3b80d61d15ab 100644
--- a/packages/schematics/angular/workspace/index_spec.ts
+++ b/packages/schematics/angular/workspace/index_spec.ts
@@ -54,4 +54,16 @@ describe('Workspace Schematic', () => {
     expect(pkg.dependencies['zone.js']).toEqual(latestVersions.ZoneJs);
     expect(pkg.devDependencies['typescript']).toEqual(latestVersions.TypeScript);
   });
+
+  it('should create correct files when using minimal', () => {
+    const tree = schematicRunner.runSchematic('workspace', { ...defaultOptions, minimal: true });
+    const files = tree.files;
+    expect(files.indexOf('/angular.json')).toBeGreaterThanOrEqual(0);
+    expect(files.indexOf('/.gitignore')).toBeGreaterThanOrEqual(0);
+    expect(files.indexOf('/package.json')).toBeGreaterThanOrEqual(0);
+    expect(files.indexOf('/README.md')).toBeGreaterThanOrEqual(0);
+    expect(files.indexOf('/tsconfig.json')).toBeGreaterThanOrEqual(0);
+    expect(files.indexOf('/tslint.json')).toBe(-1);
+    expect(files.indexOf('/.editorconfig')).toBe(-1);
+  });
 });

From 13c057a8541ac120adbf8ebb663025768618ca23 Mon Sep 17 00:00:00 2001
From: Jason Jean <jasonjean1993@gmail.com>
Date: Wed, 7 Nov 2018 17:25:27 -0500
Subject: [PATCH 0409/1703] refactor(@angular-devkit/schematics): improve
 performance of move() (#12857)

---
 .../schematics/src/rules/move.ts              | 16 ++++++---
 .../schematics/src/rules/move_spec.ts         | 34 +++++++++++++++++++
 .../schematics/src/tree/host-tree.ts          | 27 +++++++--------
 .../schematics/src/tree/virtual.ts            | 24 +++++++------
 4 files changed, 72 insertions(+), 29 deletions(-)

diff --git a/packages/angular_devkit/schematics/src/rules/move.ts b/packages/angular_devkit/schematics/src/rules/move.ts
index 96cfe15737fc..b11e9de5f0d8 100644
--- a/packages/angular_devkit/schematics/src/rules/move.ts
+++ b/packages/angular_devkit/schematics/src/rules/move.ts
@@ -23,9 +23,17 @@ export function move(from: string, to?: string): Rule {
     return noop;
   }
 
-  return tree => tree.visit(path => {
-    if (path.startsWith(fromPath)) {
-      tree.rename(path, toPath + '/' + path.substr(fromPath.length));
+  return tree => {
+    if (tree.exists(fromPath)) {
+      // fromPath is a file
+      tree.rename(fromPath, toPath);
+    } else {
+      // fromPath is a directory
+      tree.getDir(fromPath).visit(path => {
+        tree.rename(path, toPath + '/' + path.substr(fromPath.length));
+      });
     }
-  });
+
+    return tree;
+  };
 }
diff --git a/packages/angular_devkit/schematics/src/rules/move_spec.ts b/packages/angular_devkit/schematics/src/rules/move_spec.ts
index 7737f861db1d..96bfcc896331 100644
--- a/packages/angular_devkit/schematics/src/rules/move_spec.ts
+++ b/packages/angular_devkit/schematics/src/rules/move_spec.ts
@@ -49,6 +49,40 @@ describe('move', () => {
       .then(done, done.fail);
   });
 
+  it('works on moving a directory into a subdirectory of itself', done => {
+    const tree = new HostTree();
+    tree.create('a/b/file1', 'hello world');
+    tree.create('a/b/file2', 'hello world');
+    tree.create('a/c/file3', 'hello world');
+
+    callRule(move('a/b', 'a/b/c'), observableOf(tree), context)
+      .toPromise()
+      .then(result => {
+        expect(result.exists('a/b/c/file1')).toBe(true);
+        expect(result.exists('a/b/c/file2')).toBe(true);
+        expect(result.exists('a/c/file3')).toBe(true);
+      })
+      .then(done, done.fail);
+  });
+
+  it('works on moving a directory into a parent of itself', done => {
+    const tree = new HostTree();
+    tree.create('a/b/file1', 'hello world');
+    tree.create('a/b/file2', 'hello world');
+    tree.create('a/c/file3', 'hello world');
+
+    callRule(move('a/b', 'a'), observableOf(tree), context)
+      .toPromise()
+      .then(result => {
+        expect(result.exists('file1')).toBe(false);
+        expect(result.exists('file2')).toBe(false);
+        expect(result.exists('a/file1')).toBe(true);
+        expect(result.exists('a/file2')).toBe(true);
+        expect(result.exists('a/c/file3')).toBe(true);
+      })
+      .then(done, done.fail);
+  });
+
   it('becomes a noop with identical from and to', done => {
     const tree = new HostTree();
     tree.create('a/b/file1', 'hello world');
diff --git a/packages/angular_devkit/schematics/src/tree/host-tree.ts b/packages/angular_devkit/schematics/src/tree/host-tree.ts
index 6eb8488e439a..ce5a910fca9e 100644
--- a/packages/angular_devkit/schematics/src/tree/host-tree.ts
+++ b/packages/angular_devkit/schematics/src/tree/host-tree.ts
@@ -76,23 +76,25 @@ export class HostDirEntry implements DirEntry {
   }
 
   visit(visitor: FileVisitor): void {
-    function _recurse(entry: DirEntry) {
-      entry.subfiles.forEach(path => {
-        visitor(join(entry.path, path), entry.file(path));
-      });
-      entry.subdirs.forEach(path => {
-        _recurse(entry.dir(path));
-      });
-    }
-
     try {
-      _recurse(this);
+      this.getSubfilesRecursively().forEach(file => visitor(file.path, file));
     } catch (e) {
       if (e !== FileVisitorCancelToken) {
         throw e;
       }
     }
   }
+
+  private getSubfilesRecursively() {
+    function _recurse(entry: DirEntry): FileEntry[] {
+      return entry.subdirs.reduce((files, subdir) => [
+        ...files,
+        ..._recurse(entry.dir(subdir)),
+      ], entry.subfiles.map(subfile => entry.file(subfile) as FileEntry));
+    }
+
+    return _recurse(this);
+  }
 }
 
 
@@ -315,12 +317,9 @@ export class HostTree implements Tree {
     return maybeCache;
   }
   visit(visitor: FileVisitor): void {
-    const allFiles: [Path, FileEntry | null | undefined][] = [];
     this.root.visit((path, entry) => {
-      allFiles.push([path, entry]);
+      visitor(path, entry);
     });
-
-    allFiles.forEach(([path, entry]) => visitor(path, entry));
   }
 
   // Change content of host files.
diff --git a/packages/angular_devkit/schematics/src/tree/virtual.ts b/packages/angular_devkit/schematics/src/tree/virtual.ts
index d0aa418d6f71..d34c5c070be4 100644
--- a/packages/angular_devkit/schematics/src/tree/virtual.ts
+++ b/packages/angular_devkit/schematics/src/tree/virtual.ts
@@ -84,24 +84,26 @@ export class VirtualDirEntry implements DirEntry {
     return this._tree.get(join(this._path, name));
   }
 
-  visit(visitor: FileVisitor) {
-    function _recurse(entry: VirtualDirEntry) {
-      entry.subfiles.forEach(path => {
-        visitor(join(entry._path, path), entry.file(path));
-      });
-      entry.subdirs.forEach(path => {
-        _recurse(entry.dir(path) as VirtualDirEntry);
-      });
-    }
-
+  visit(visitor: FileVisitor): void {
     try {
-      _recurse(this);
+      this.getSubfilesRecursively().forEach(file => visitor(file.path, file));
     } catch (e) {
       if (e !== FileVisitorCancelToken) {
         throw e;
       }
     }
   }
+
+  private getSubfilesRecursively() {
+    function _recurse(entry: DirEntry): FileEntry[] {
+      return entry.subdirs.reduce((files, subdir) => [
+        ...files,
+        ..._recurse(entry.dir(subdir)),
+      ], entry.subfiles.map(subfile => entry.file(subfile) as FileEntry));
+    }
+
+    return _recurse(this);
+  }
 }
 
 /**

From 8d69589733eca077af5a1dacb7273aa686705ec6 Mon Sep 17 00:00:00 2001
From: fscherwi <fscherwi@users.noreply.github.com>
Date: Thu, 8 Nov 2018 19:29:28 +0100
Subject: [PATCH 0410/1703] feat(@angular-devkit/build-angular): update
 node-sass (#12890)

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index cb2927cf5d7f..5a8be46e4db4 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -54,7 +54,7 @@
     "webpack-subresource-integrity": "1.1.0-rc.6"
   },
   "optionalDependencies": {
-    "node-sass": "4.9.3"
+    "node-sass": "4.10.0"
   },
   "devDependencies": {
     "@angular/animations": "^7.0.0-rc.0",

From bd4dc38359f358f814ed29b023e845e8dba0cfdf Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 8 Nov 2018 18:30:41 +0000
Subject: [PATCH 0411/1703] refactor: use `createConsoleLogger` and remove
 duplicate code (#12787)

---
 packages/angular/cli/lib/cli/index.ts         | 66 +------------------
 .../angular/cli/models/architect-command.ts   |  4 +-
 .../angular_devkit/core/node/cli-logger.ts    | 29 +++++++-
 .../e2e/tests/build/bundle-budgets.ts         |  8 +--
 .../e2e/tests/misc/circular-dependency.ts     |  4 +-
 5 files changed, 37 insertions(+), 74 deletions(-)

diff --git a/packages/angular/cli/lib/cli/index.ts b/packages/angular/cli/lib/cli/index.ts
index b9d8fe00e171..b18556c0d86f 100644
--- a/packages/angular/cli/lib/cli/index.ts
+++ b/packages/angular/cli/lib/cli/index.ts
@@ -6,18 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { logging, terminal } from '@angular-devkit/core';
+import { createConsoleLogger } from '@angular-devkit/core/node';
 import { runCommand } from '../../models/command-runner';
 import { getWorkspaceRaw } from '../../utilities/config';
 import { getWorkspaceDetails } from '../../utilities/project';
 
 
 export default async function(options: { testing?: boolean, cliArgs: string[] }) {
-  const logger = new logging.IndentLogger('cling');
-  let loggingSubscription;
-  if (!options.testing) {
-    loggingSubscription = initializeLogging(logger);
-  }
+  const logger = createConsoleLogger();
 
   let projectDetails = getWorkspaceDetails();
   if (projectDetails === null) {
@@ -60,64 +56,6 @@ export default async function(options: { testing?: boolean, cliArgs: string[] })
       throw err;
     }
 
-    if (loggingSubscription) {
-      loggingSubscription.unsubscribe();
-    }
-
     return 1;
   }
 }
-
-// Initialize logging.
-function initializeLogging(logger: logging.Logger) {
-  return logger
-    .subscribe(entry => {
-      let color = (x: string) => terminal.dim(terminal.white(x));
-      let output = process.stdout;
-      switch (entry.level) {
-        case 'debug':
-          return;
-        case 'info':
-          color = terminal.white;
-          break;
-        case 'warn':
-          color = (x: string) => terminal.bold(terminal.yellow(x));
-          output = process.stderr;
-          break;
-        case 'fatal':
-        case 'error':
-          color = (x: string) => terminal.bold(terminal.red(x));
-          output = process.stderr;
-          break;
-      }
-
-
-      // If we do console.log(message) or process.stdout.write(message + '\n'), the process might
-      // stop before the whole message is written and the stream is flushed. This happens when
-      // streams are asynchronous.
-      //
-      // NodeJS IO streams are different depending on platform and usage. In POSIX environment,
-      // for example, they're asynchronous when writing to a pipe, but synchronous when writing
-      // to a TTY. In windows, it's the other way around. You can verify which is which with
-      // stream.isTTY and platform, but this is not good enough.
-      // In the async case, one should wait for the callback before sending more data or
-      // continuing the process. In our case it would be rather hard to do (but not impossible).
-      //
-      // Instead we take the easy way out and simply chunk the message and call the write
-      // function while the buffer drain itself asynchronously. With a smaller chunk size than
-      // the buffer, we are mostly certain that it works. In this case, the chunk has been picked
-      // as half a page size (4096/2 = 2048), minus some bytes for the color formatting.
-      // On POSIX it seems the buffer is 2 pages (8192), but just to be sure (could be different
-      // by platform).
-      //
-      // For more details, see https://nodejs.org/api/process.html#process_a_note_on_process_i_o
-      const chunkSize = 2000;  // Small chunk.
-      let message = entry.message;
-      while (message) {
-        const chunk = message.slice(0, chunkSize);
-        message = message.slice(chunkSize);
-        output.write(color(chunk));
-      }
-      output.write('\n');
-    });
-}
diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index bacff6da519b..2069e104ba6f 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -31,8 +31,6 @@ export abstract class ArchitectCommand<
   private _host = new NodeJsSyncHost();
   protected _architect: Architect;
   protected _workspace: experimental.workspace.Workspace;
-  protected _logger = createConsoleLogger();
-
   protected _registry: json.schema.SchemaRegistry;
 
   // If this command supports running multiple targets.
@@ -150,7 +148,7 @@ export abstract class ArchitectCommand<
     }
     const realBuilderConf = this._architect.getBuilderConfiguration({ ...targetSpec, overrides });
 
-    const result = await this._architect.run(realBuilderConf, { logger: this._logger }).toPromise();
+    const result = await this._architect.run(realBuilderConf, { logger: this.logger }).toPromise();
 
     return result.success ? 0 : 1;
   }
diff --git a/packages/angular_devkit/core/node/cli-logger.ts b/packages/angular_devkit/core/node/cli-logger.ts
index 6acadceb6ae4..cfb4232556ab 100644
--- a/packages/angular_devkit/core/node/cli-logger.ts
+++ b/packages/angular_devkit/core/node/cli-logger.ts
@@ -33,6 +33,7 @@ export function createConsoleLogger(
           break;
         case 'warn':
           color = (x: string) => terminal.bold(terminal.yellow(x));
+          output = stderr;
           break;
         case 'fatal':
         case 'error':
@@ -41,7 +42,33 @@ export function createConsoleLogger(
           break;
       }
 
-      output.write(color(entry.message) + '\n');
+      // If we do console.log(message) or process.stdout.write(message + '\n'), the process might
+      // stop before the whole message is written and the stream is flushed. This happens when
+      // streams are asynchronous.
+      //
+      // NodeJS IO streams are different depending on platform and usage. In POSIX environment,
+      // for example, they're asynchronous when writing to a pipe, but synchronous when writing
+      // to a TTY. In windows, it's the other way around. You can verify which is which with
+      // stream.isTTY and platform, but this is not good enough.
+      // In the async case, one should wait for the callback before sending more data or
+      // continuing the process. In our case it would be rather hard to do (but not impossible).
+      //
+      // Instead we take the easy way out and simply chunk the message and call the write
+      // function while the buffer drain itself asynchronously. With a smaller chunk size than
+      // the buffer, we are mostly certain that it works. In this case, the chunk has been picked
+      // as half a page size (4096/2 = 2048), minus some bytes for the color formatting.
+      // On POSIX it seems the buffer is 2 pages (8192), but just to be sure (could be different
+      // by platform).
+      //
+      // For more details, see https://nodejs.org/api/process.html#process_a_note_on_process_i_o
+      const chunkSize = 2000;  // Small chunk.
+      let message = entry.message;
+      while (message) {
+        const chunk = message.slice(0, chunkSize);
+        message = message.slice(chunkSize);
+        output.write(color(chunk));
+      }
+      output.write('\n');
     });
 
   return logger;
diff --git a/tests/legacy-cli/e2e/tests/build/bundle-budgets.ts b/tests/legacy-cli/e2e/tests/build/bundle-budgets.ts
index 974a4b189d22..63b0de08444e 100644
--- a/tests/legacy-cli/e2e/tests/build/bundle-budgets.ts
+++ b/tests/legacy-cli/e2e/tests/build/bundle-budgets.ts
@@ -50,8 +50,8 @@ export default function () {
             json.projects['test-project'].architect.build.options.budgets = [cfg.budget];
           })
           .then(() => ng('build', '--optimization'))
-          .then(({ stdout }) => {
-            if (!/WARNING in budgets/.test(stdout)) {
+          .then(({ stderr }) => {
+            if (!/WARNING in budgets/.test(stderr)) {
               throw new Error(cfg.message);
             }
           });
@@ -62,8 +62,8 @@ export default function () {
             json.projects['test-project'].architect.build.options.budgets = [cfg.budget];
           })
           .then(() => ng('build', '--optimization'))
-          .then(({ stdout }) => {
-            if (/(WARNING|ERROR)/.test(stdout)) {
+          .then(({ stderr }) => {
+            if (/(WARNING|ERROR)/.test(stderr)) {
               throw new Error(cfg.message);
             }
           });
diff --git a/tests/legacy-cli/e2e/tests/misc/circular-dependency.ts b/tests/legacy-cli/e2e/tests/misc/circular-dependency.ts
index 0d18cf3e6dad..4ff2e94759f6 100644
--- a/tests/legacy-cli/e2e/tests/misc/circular-dependency.ts
+++ b/tests/legacy-cli/e2e/tests/misc/circular-dependency.ts
@@ -7,8 +7,8 @@ export default async function () {
 
   await prependToFile('src/app/app.component.ts',
     `import { AppModule } from './app.module'; console.log(AppModule);`);
-  let output = await ng('build', '--show-circular-dependencies');
-  if (!output.stdout.match(/WARNING in Circular dependency detected/)) {
+  const { stderr } = await ng('build', '--show-circular-dependencies');
+  if (!stderr.match(/WARNING in Circular dependency detected/)) {
     throw new Error('Expected to have circular dependency warning in output.');
   }
 }

From 96606b3d1e842a379d4c3758f1651fe4789de345 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 8 Nov 2018 18:31:14 +0000
Subject: [PATCH 0412/1703] fix(@ngtools/webpack): replace resources should
 effect only class decorators (#12503)

At the moment we are processing all property assignments in object literals irrespective if they are in a decorator or not. With this change we will process only property assignments found under in a component decorator.

Fixes #12488, Fixes #6007, Fixes: #6498 and Fixes: #8295
---
 .../webpack/src/angular_compiler_plugin.ts    |   6 +-
 .../src/transformers/find_resources.ts        |  68 +++++
 .../src/transformers/find_resources_spec.ts   |  49 +++
 .../ngtools/webpack/src/transformers/index.ts |   1 +
 .../src/transformers/replace_resources.ts     | 289 +++++++++++-------
 .../transformers/replace_resources_spec.ts    | 226 +++++++++++++-
 6 files changed, 512 insertions(+), 127 deletions(-)
 create mode 100644 packages/ngtools/webpack/src/transformers/find_resources.ts
 create mode 100644 packages/ngtools/webpack/src/transformers/find_resources_spec.ts

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 7689c4cf4a09..752a530e42d1 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -817,7 +817,7 @@ export class AngularCompilerPlugin {
 
     if (this._JitMode) {
       // Replace resources in JIT.
-      this._transformers.push(replaceResources(isAppPath));
+      this._transformers.push(replaceResources(isAppPath, getTypeChecker));
     } else {
       // Remove unneeded angular decorators.
       this._transformers.push(removeDecorators(isAppPath, getTypeChecker));
@@ -1013,9 +1013,7 @@ export class AngularCompilerPlugin {
       .filter(x => x);
 
     const resourceImports = findResources(sourceFile)
-      .map((resourceReplacement) => resourceReplacement.resourcePaths)
-      .reduce((prev, curr) => prev.concat(curr), [])
-      .map((resourcePath) => resolve(dirname(resolvedFileName), normalize(resourcePath)));
+      .map(resourcePath => resolve(dirname(resolvedFileName), normalize(resourcePath)));
 
     // These paths are meant to be used by the loader so we must denormalize them.
     const uniqueDependencies = new Set([
diff --git a/packages/ngtools/webpack/src/transformers/find_resources.ts b/packages/ngtools/webpack/src/transformers/find_resources.ts
new file mode 100644
index 000000000000..1158e4465fde
--- /dev/null
+++ b/packages/ngtools/webpack/src/transformers/find_resources.ts
@@ -0,0 +1,68 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import * as ts from 'typescript';
+import { collectDeepNodes } from './ast_helpers';
+import { getResourceUrl } from './replace_resources';
+
+export function findResources(sourceFile: ts.SourceFile): string[] {
+  const resources: string[] = [];
+  const decorators = collectDeepNodes<ts.Decorator>(sourceFile, ts.SyntaxKind.Decorator);
+
+  for (const node of decorators) {
+    if (!ts.isCallExpression(node.expression)) {
+      continue;
+    }
+
+    const decoratorFactory = node.expression;
+    const args = decoratorFactory.arguments;
+    if (args.length !== 1 || !ts.isObjectLiteralExpression(args[0])) {
+      // Unsupported component metadata
+      continue;
+    }
+
+    ts.visitNodes(
+      (args[0] as ts.ObjectLiteralExpression).properties,
+      (node: ts.ObjectLiteralElementLike) => {
+        if (!ts.isPropertyAssignment(node) || ts.isComputedPropertyName(node.name)) {
+          return node;
+        }
+
+        const name = node.name.text;
+        switch (name) {
+          case 'templateUrl':
+            const url = getResourceUrl(node.initializer);
+
+            if (url) {
+              resources.push(url);
+            }
+            break;
+
+          case 'styleUrls':
+            if (!ts.isArrayLiteralExpression(node.initializer)) {
+              return node;
+            }
+
+            ts.visitNodes(node.initializer.elements, (node: ts.Expression) => {
+              const url = getResourceUrl(node);
+
+              if (url) {
+                resources.push(url);
+              }
+
+              return node;
+            });
+            break;
+        }
+
+        return node;
+      },
+    );
+  }
+
+  return resources;
+}
diff --git a/packages/ngtools/webpack/src/transformers/find_resources_spec.ts b/packages/ngtools/webpack/src/transformers/find_resources_spec.ts
new file mode 100644
index 000000000000..0e0cf9cbaaa8
--- /dev/null
+++ b/packages/ngtools/webpack/src/transformers/find_resources_spec.ts
@@ -0,0 +1,49 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { tags } from '@angular-devkit/core';  // tslint:disable-line:no-implicit-dependencies
+import * as ts from 'typescript';
+import { findResources } from './find_resources';
+
+
+describe('@ngtools/webpack transformers', () => {
+  describe('find_resources', () => {
+    it('should return resources', () => {
+      const input = tags.stripIndent`
+        import { Component } from '@angular/core';
+
+        @Component({
+          selector: 'app-root',
+          templateUrl: './app.component.html',
+          styleUrls: ['./app.component.css', './app.component.2.css']
+        })
+        export class AppComponent {
+          title = 'app';
+        }
+      `;
+
+      const result = findResources(ts.createSourceFile('temp.ts', input, ts.ScriptTarget.ES2015));
+      expect(result).toEqual([
+        './app.component.html',
+        './app.component.css',
+        './app.component.2.css',
+      ]);
+    });
+
+    it('should not return resources if they are not in decorator', () => {
+      const input = tags.stripIndent`
+        const foo = {
+          templateUrl: './app.component.html',
+          styleUrls: ['./app.component.css', './app.component.2.css']
+        }
+      `;
+
+      const result = findResources(ts.createSourceFile('temp.ts', input, ts.ScriptTarget.ES2015));
+      expect(result).toEqual([]);
+    });
+  });
+});
diff --git a/packages/ngtools/webpack/src/transformers/index.ts b/packages/ngtools/webpack/src/transformers/index.ts
index bb3d03dc92af..de51a382ba1d 100644
--- a/packages/ngtools/webpack/src/transformers/index.ts
+++ b/packages/ngtools/webpack/src/transformers/index.ts
@@ -17,3 +17,4 @@ export * from './export_lazy_module_map';
 export * from './register_locale_data';
 export * from './replace_resources';
 export * from './remove_decorators';
+export * from './find_resources';
diff --git a/packages/ngtools/webpack/src/transformers/replace_resources.ts b/packages/ngtools/webpack/src/transformers/replace_resources.ts
index 28ade37e6f71..22428e15e262 100644
--- a/packages/ngtools/webpack/src/transformers/replace_resources.ts
+++ b/packages/ngtools/webpack/src/transformers/replace_resources.ts
@@ -6,155 +6,214 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import * as ts from 'typescript';
-import { collectDeepNodes, getFirstNode } from './ast_helpers';
-import {
-  AddNodeOperation,
-  ReplaceNodeOperation,
-  StandardTransform,
-  TransformOperation,
-} from './interfaces';
-import { makeTransform } from './make_transform';
-
 
 export function replaceResources(
   shouldTransform: (fileName: string) => boolean,
+  getTypeChecker: () => ts.TypeChecker,
 ): ts.TransformerFactory<ts.SourceFile> {
-  const standardTransform: StandardTransform = function (sourceFile: ts.SourceFile) {
-    const ops: TransformOperation[] = [];
 
-    if (!shouldTransform(sourceFile.fileName)) {
-      return ops;
-    }
+  return (context: ts.TransformationContext) => {
+    const typeChecker = getTypeChecker();
 
-    const replacements = findResources(sourceFile);
+    const visitNode: ts.Visitor = (node: ts.Decorator) => {
+      if (ts.isClassDeclaration(node)) {
+        node.decorators = ts.visitNodes(
+          node.decorators,
+          (node: ts.Decorator) => visitDecorator(node, typeChecker),
+        );
+      }
 
-    if (replacements.length > 0) {
+      return ts.visitEachChild(node, visitNode, context);
+    };
 
-      // Add the replacement operations.
-      ops.push(...(replacements.map((rep) => rep.replaceNodeOperation)));
+    return (sourceFile: ts.SourceFile) => (
+      shouldTransform(sourceFile.fileName)
+        ? ts.visitNode(sourceFile, visitNode)
+        : sourceFile
+    );
+  };
+}
 
-      // If we added a require call, we need to also add typings for it.
-      // The typings need to be compatible with node typings, but also work by themselves.
+function visitDecorator(node: ts.Decorator, typeChecker: ts.TypeChecker): ts.Decorator {
+  if (!isComponentDecorator(node, typeChecker)) {
+    return node;
+  }
 
-      // interface NodeRequire {(id: string): any;}
-      const nodeRequireInterface = ts.createInterfaceDeclaration([], [], 'NodeRequire', [], [], [
-        ts.createCallSignature([], [
-          ts.createParameter([], [], undefined, 'id', undefined,
-            ts.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
-          ),
-        ], ts.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)),
-      ]);
+  if (!ts.isCallExpression(node.expression)) {
+    return node;
+  }
 
-      // declare var require: NodeRequire;
-      const varRequire = ts.createVariableStatement(
-        [ts.createToken(ts.SyntaxKind.DeclareKeyword)],
-        [ts.createVariableDeclaration('require', ts.createTypeReferenceNode('NodeRequire', []))],
-      );
+  const decoratorFactory = node.expression;
+  const args = decoratorFactory.arguments;
+  if (args.length !== 1 || !ts.isObjectLiteralExpression(args[0])) {
+    // Unsupported component metadata
+    return node;
+  }
 
-      ops.push(new AddNodeOperation(sourceFile, getFirstNode(sourceFile), nodeRequireInterface));
-      ops.push(new AddNodeOperation(sourceFile, getFirstNode(sourceFile), varRequire));
-    }
+  const objectExpression = args[0] as ts.ObjectLiteralExpression;
+  const styleReplacements: ts.Expression[] = [];
 
-    return ops;
-  };
+  // visit all properties
+  let properties = ts.visitNodes(
+    objectExpression.properties,
+    (node: ts.ObjectLiteralElementLike) => visitComponentMetadata(node, styleReplacements),
+  );
 
-  return makeTransform(standardTransform);
-}
+  // replace properties with updated properties
+  if (styleReplacements.length > 0) {
+    const styleProperty = ts.createPropertyAssignment(
+      ts.createIdentifier('styles'),
+      ts.createArrayLiteral(styleReplacements),
+    );
+
+    properties = ts.createNodeArray([...properties, styleProperty]);
+  }
 
-export interface ResourceReplacement {
-  resourcePaths: string[];
-  replaceNodeOperation: ReplaceNodeOperation;
+  return ts.updateDecorator(
+    node,
+    ts.updateCall(
+      decoratorFactory,
+      decoratorFactory.expression,
+      decoratorFactory.typeArguments,
+      [ts.updateObjectLiteral(objectExpression, properties)],
+    ),
+  );
 }
 
-export function findResources(sourceFile: ts.SourceFile): ResourceReplacement[] {
-  const replacements: ResourceReplacement[] = [];
-
-  // Find all object literals.
-  collectDeepNodes<ts.ObjectLiteralExpression>(sourceFile, ts.SyntaxKind.ObjectLiteralExpression)
-    // Get all their property assignments.
-    .map(node => collectDeepNodes<ts.PropertyAssignment>(node, ts.SyntaxKind.PropertyAssignment))
-    // Flatten into a single array (from an array of array<property assignments>).
-    .reduce((prev, curr) => curr ? prev.concat(curr) : prev, [])
-    // We only want property assignments for the templateUrl/styleUrls keys.
-    .filter((node: ts.PropertyAssignment) => {
-      const key = _getContentOfKeyLiteral(node.name);
-      if (!key) {
-        // key is an expression, can't do anything.
-        return false;
+function visitComponentMetadata(
+  node: ts.ObjectLiteralElementLike,
+  styleReplacements: ts.Expression[],
+): ts.ObjectLiteralElementLike | undefined {
+  if (!ts.isPropertyAssignment(node) || ts.isComputedPropertyName(node.name)) {
+    return node;
+  }
+
+  const name = node.name.text;
+  switch (name) {
+    case 'moduleId':
+
+      return undefined;
+
+    case 'templateUrl':
+      return ts.updatePropertyAssignment(
+        node,
+        ts.createIdentifier('template'),
+        createRequireExpression(node.initializer),
+      );
+
+    case 'styles':
+    case 'styleUrls':
+      if (!ts.isArrayLiteralExpression(node.initializer)) {
+        return node;
       }
 
-      return key == 'templateUrl' || key == 'styleUrls';
-    })
-    // Replace templateUrl/styleUrls key with template/styles, and and paths with require('path').
-    .forEach((node: ts.PropertyAssignment) => {
-      const key = _getContentOfKeyLiteral(node.name);
-
-      if (key == 'templateUrl') {
-        const resourcePath = _getResourceRequest(node.initializer, sourceFile);
-        const requireCall = _createRequireCall(resourcePath);
-        const propAssign = ts.createPropertyAssignment('template', requireCall);
-        replacements.push({
-          resourcePaths: [resourcePath],
-          replaceNodeOperation: new ReplaceNodeOperation(sourceFile, node, propAssign),
-        });
-      } else if (key == 'styleUrls') {
-        const arr = collectDeepNodes<ts.ArrayLiteralExpression>(node,
-          ts.SyntaxKind.ArrayLiteralExpression);
-        if (!arr || arr.length == 0 || arr[0].elements.length == 0) {
-          return;
-        }
-
-        const stylePaths = arr[0].elements.map((element: ts.Expression) => {
-          return _getResourceRequest(element, sourceFile);
-        });
-
-        const requireArray = ts.createArrayLiteral(
-          stylePaths.map((path) => _createRequireCall(path)),
-        );
+      const isInlineStyles = name === 'styles';
+      const styles = ts.visitNodes(
+        node.initializer.elements,
+        (node: ts.Expression) => {
+          if (!ts.isStringLiteral(node) && !ts.isNoSubstitutionTemplateLiteral(node)) {
+            return node;
+          }
+
+          return isInlineStyles ? ts.createLiteral(node.text) : createRequireExpression(node);
+        },
+      );
 
-        const propAssign = ts.createPropertyAssignment('styles', requireArray);
-        replacements.push({
-          resourcePaths: stylePaths,
-          replaceNodeOperation: new ReplaceNodeOperation(sourceFile, node, propAssign),
-        });
+      // Styles should be placed first
+      if (isInlineStyles) {
+        styleReplacements.unshift(...styles);
+      } else {
+        styleReplacements.push(...styles);
       }
-    });
 
-  return replacements;
+      return undefined;
 
+    default:
+      return node;
+  }
 }
 
-function _getContentOfKeyLiteral(node?: ts.Node): string | null {
-  if (!node) {
-    return null;
-  } else if (node.kind == ts.SyntaxKind.Identifier) {
-    return (node as ts.Identifier).text;
-  } else if (node.kind == ts.SyntaxKind.StringLiteral) {
-    return (node as ts.StringLiteral).text;
-  } else {
+export function getResourceUrl(node: ts.Expression): string | null {
+  // only analyze strings
+  if (!ts.isStringLiteral(node) && !ts.isNoSubstitutionTemplateLiteral(node)) {
     return null;
   }
+
+  return `${/^\.?\.\//.test(node.text) ? '' : './'}${node.text}`;
 }
 
-function _getResourceRequest(element: ts.Expression, sourceFile: ts.SourceFile) {
-  if (
-    element.kind === ts.SyntaxKind.StringLiteral ||
-    element.kind === ts.SyntaxKind.NoSubstitutionTemplateLiteral
-  ) {
-    const url = (element as ts.StringLiteral).text;
+function isComponentDecorator(node: ts.Node, typeChecker: ts.TypeChecker): node is ts.Decorator {
+  if (!ts.isDecorator(node)) {
+    return false;
+  }
 
-    // If the URL does not start with ./ or ../, prepends ./ to it.
-    return `${/^\.?\.\//.test(url) ? '' : './'}${url}`;
-  } else {
-    // if not string, just use expression directly
-    return element.getFullText(sourceFile);
+  const origin = getDecoratorOrigin(node, typeChecker);
+  if (origin && origin.module === '@angular/core' && origin.name === 'Component') {
+    return true;
   }
+
+  return false;
 }
 
-function _createRequireCall(path: string) {
+function createRequireExpression(node: ts.Expression): ts.Expression {
+  const url = getResourceUrl(node);
+  if (!url) {
+    return node;
+  }
+
   return ts.createCall(
     ts.createIdentifier('require'),
-    [],
-    [ts.createLiteral(path)],
+    undefined,
+    [ts.createLiteral(url)],
   );
 }
+
+interface DecoratorOrigin {
+  name: string;
+  module: string;
+}
+
+function getDecoratorOrigin(
+  decorator: ts.Decorator,
+  typeChecker: ts.TypeChecker,
+): DecoratorOrigin | null {
+  if (!ts.isCallExpression(decorator.expression)) {
+    return null;
+  }
+
+  let identifier: ts.Node;
+  let name = '';
+
+  if (ts.isPropertyAccessExpression(decorator.expression.expression)) {
+    identifier = decorator.expression.expression.expression;
+    name = decorator.expression.expression.name.text;
+  } else if (ts.isIdentifier(decorator.expression.expression)) {
+    identifier = decorator.expression.expression;
+  } else {
+    return null;
+  }
+
+  // NOTE: resolver.getReferencedImportDeclaration would work as well but is internal
+  const symbol = typeChecker.getSymbolAtLocation(identifier);
+  if (symbol && symbol.declarations && symbol.declarations.length > 0) {
+    const declaration = symbol.declarations[0];
+    let module: string;
+
+    if (ts.isImportSpecifier(declaration)) {
+      name = (declaration.propertyName || declaration.name).text;
+      module = (declaration.parent.parent.parent.moduleSpecifier as ts.Identifier).text;
+    } else if (ts.isNamespaceImport(declaration)) {
+      // Use the name from the decorator namespace property access
+      module = (declaration.parent.parent.moduleSpecifier as ts.Identifier).text;
+    } else if (ts.isImportClause(declaration)) {
+      name = (declaration.name as ts.Identifier).text;
+      module = (declaration.parent.moduleSpecifier as ts.Identifier).text;
+    } else {
+      return null;
+    }
+
+    return { name, module };
+  }
+
+  return null;
+}
diff --git a/packages/ngtools/webpack/src/transformers/replace_resources_spec.ts b/packages/ngtools/webpack/src/transformers/replace_resources_spec.ts
index 23e3a65acf42..0ba09eecb385 100644
--- a/packages/ngtools/webpack/src/transformers/replace_resources_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/replace_resources_spec.ts
@@ -6,11 +6,21 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { tags } from '@angular-devkit/core';  // tslint:disable-line:no-implicit-dependencies
-import { transformTypescript } from './ast_helpers';
+import { createTypescriptContext, transformTypescript } from './ast_helpers';
 import { replaceResources } from './replace_resources';
 
+function transform(input: string, shouldTransform = true) {
+  const { program } = createTypescriptContext(input);
+  const getTypeChecker = () => program.getTypeChecker();
+  const transformer = replaceResources(() => shouldTransform, getTypeChecker);
+
+  return transformTypescript(input, [transformer]);
+}
+
+// tslint:disable-next-line:no-big-function
 describe('@ngtools/webpack transformers', () => {
-  describe('replace_resources', () => {
+  // tslint:disable-next-line:no-big-function
+  describe('find_resources', () => {
     it('should replace resources', () => {
       const input = tags.stripIndent`
         import { Component } from '@angular/core';
@@ -42,9 +52,43 @@ describe('@ngtools/webpack transformers', () => {
         export { AppComponent };
       `;
 
-      const transformer = replaceResources(() => true);
-      const result = transformTypescript(input, [transformer]);
+      const result = transform(input);
+      expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+    });
 
+    it('should merge styleUrls with styles', () => {
+      const input = tags.stripIndent`
+        import { Component } from '@angular/core';
+
+        @Component({
+          selector: 'app-root',
+          templateUrl: './app.component.html',
+          styles: ['a { color: red }'],
+          styleUrls: ['./app.component.css'],
+        })
+        export class AppComponent {
+          title = 'app';
+        }
+      `;
+      const output = tags.stripIndent`
+        import * as tslib_1 from "tslib";
+        import { Component } from '@angular/core';
+        let AppComponent = class AppComponent {
+            constructor() {
+                this.title = 'app';
+            }
+        };
+        AppComponent = tslib_1.__decorate([
+            Component({
+                selector: 'app-root',
+                template: require("./app.component.html"),
+                styles: ["a { color: red }", require("./app.component.css")]
+            })
+        ], AppComponent);
+        export { AppComponent };
+      `;
+
+      const result = transform(input);
       expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
     });
 
@@ -79,12 +123,180 @@ describe('@ngtools/webpack transformers', () => {
         export { AppComponent };
       `;
 
-      const transformer = replaceResources(() => true);
+      const result = transform(input);
+      expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it('should replace resources if Component decorator is aliased', () => {
+      const input = tags.stripIndent`
+        import { Component as NgComponent } from '@angular/core';
+
+        @NgComponent({
+          selector: 'app-root',
+          templateUrl: './app.component.html',
+          styleUrls: ['./app.component.css', './app.component.2.css']
+        })
+        export class AppComponent {
+          title = 'app';
+        }
+      `;
+      const output = tags.stripIndent`
+        import * as tslib_1 from "tslib";
+        import { Component as NgComponent } from '@angular/core';
+        let AppComponent = class AppComponent {
+            constructor() {
+                this.title = 'app';
+            }
+        };
+        AppComponent = tslib_1.__decorate([
+          NgComponent({
+                selector: 'app-root',
+                template: require("./app.component.html"),
+                styles: [require("./app.component.css"), require("./app.component.2.css")]
+            })
+        ], AppComponent);
+        export { AppComponent };
+      `;
+
+      const { program } = createTypescriptContext(input);
+      const getTypeChecker = () => program.getTypeChecker();
+      const transformer = replaceResources(() => true, getTypeChecker);
       const result = transformTypescript(input, [transformer]);
 
       expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
     });
 
+    it('should replace resources if Angular Core import is namespaced', () => {
+      const input = tags.stripIndent`
+        import * as ng from '@angular/core';
+
+        @ng.Component({
+          selector: 'app-root',
+          templateUrl: './app.component.html',
+          styleUrls: ['./app.component.css', './app.component.2.css']
+        })
+        export class AppComponent {
+          title = 'app';
+        }
+      `;
+      const output = tags.stripIndent`
+        import * as tslib_1 from "tslib";
+        import * as ng from '@angular/core';
+        let AppComponent = class AppComponent {
+            constructor() {
+                this.title = 'app';
+            }
+        };
+        AppComponent = tslib_1.__decorate([
+          ng.Component({
+                selector: 'app-root',
+                template: require("./app.component.html"),
+                styles: [require("./app.component.css"), require("./app.component.2.css")]
+            })
+        ], AppComponent);
+        export { AppComponent };
+      `;
+
+      const result = transform(input);
+      expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it('should not replace resources if not in Component decorator', () => {
+      const input = tags.stripIndent`
+        import { Component } from '@angular/core';
+
+        @Component({
+          selector: 'app-root',
+          templateUrl: './app.component.html',
+          styleUrls: ['./app.component.css']
+        })
+        export class AppComponent {
+          obj = [
+            {
+              'labels': 'Content',
+              'templateUrl': 'content.html'
+            }
+          ];
+        }
+      `;
+
+      const output = tags.stripIndent`
+        import * as tslib_1 from "tslib";
+        import { Component } from '@angular/core';
+
+        let AppComponent = class AppComponent {
+          constructor() {
+            this.obj = [
+              {
+                'labels': 'Content',
+                'templateUrl': 'content.html'
+              }
+            ];
+          }
+        };
+
+        AppComponent = tslib_1.__decorate([
+            Component({
+                selector: 'app-root',
+                template: require("./app.component.html"),
+                styles: [require("./app.component.css")]
+            })
+        ], AppComponent);
+        export { AppComponent };
+      `;
+
+      const result = transform(input);
+      expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it('should not replace resources if not in an NG Component decorator', () => {
+      const input = tags.stripIndent`
+        import { Component } from 'foo';
+
+        @Component({
+          selector: 'app-root',
+          templateUrl: './app.component.html',
+          styleUrls: ['./app.component.css']
+        })
+        export class AppComponent {
+          obj = [
+            {
+              'labels': 'Content',
+              'templateUrl': 'content.html'
+            }
+          ];
+        }
+      `;
+
+      const output = tags.stripIndent`
+        import * as tslib_1 from "tslib";
+        import { Component } from 'foo';
+
+        let AppComponent = class AppComponent {
+          constructor() {
+            this.obj = [
+              {
+                'labels': 'Content',
+                'templateUrl': 'content.html'
+              }
+            ];
+          }
+        };
+
+        AppComponent = tslib_1.__decorate([
+            Component({
+                selector: 'app-root',
+                templateUrl: './app.component.html',
+                styleUrls: ['./app.component.css']
+            })
+        ], AppComponent);
+        export { AppComponent };
+      `;
+
+      const result = transform(input);
+      expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+    });
+
     it('should not replace resources if shouldTransform returns false', () => {
       const input = tags.stripIndent`
         import { Component } from '@angular/core';
@@ -116,9 +328,7 @@ describe('@ngtools/webpack transformers', () => {
         export { AppComponent };
       `;
 
-      const transformer = replaceResources(() => false);
-      const result = transformTypescript(input, [transformer]);
-
+      const result = transform(input, false);
       expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
     });
   });

From 5150f82762fe377bac4ea1571cd7f21b8a087dfc Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 8 Nov 2018 18:32:28 +0000
Subject: [PATCH 0413/1703] feat(@ngtools/webpack): allow custom lazy module
 resource (#12593)

---
 .../ngtools/webpack/src/angular_compiler_plugin.ts  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 752a530e42d1..e446782ffe59 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -106,6 +106,7 @@ export interface AngularCompilerPluginOptions {
 
   // added to the list of lazy routes
   additionalLazyModules?: { [module: string]: string };
+  additionalLazyModuleResources?: string[];
 
   // The ContextElementDependency of correct Webpack compilation.
   // This is needed when there are multiple Webpack installs.
@@ -663,15 +664,19 @@ export class AngularCompilerPlugin {
       // APFv6 does not have single FESM anymore. Instead of verifying if we're pointing to
       // FESMs, we resolve the `@angular/core` path and verify that the path for the
       // module starts with it.
-
       // This may be slower but it will be compatible with both APF5, 6 and potential future
       // versions (until the dynamic import appears outside of core I suppose).
       // We resolve any symbolic links in order to get the real path that would be used in webpack.
-      const angularCoreDirname = fs.realpathSync(path.dirname(angularCorePackagePath));
+      const angularCoreResourceRoot = fs.realpathSync(path.dirname(angularCorePackagePath));
 
       cmf.hooks.afterResolve.tapPromise('angular-compiler', async result => {
-        // Alter only request from Angular.
-        if (!result || !this.done || !result.resource.startsWith(angularCoreDirname)) {
+        // Alter only existing request from Angular or one of the additional lazy module resources.
+        const isLazyModuleResource = (resource: string) =>
+          resource.startsWith(angularCoreResourceRoot) ||
+          ( this.options.additionalLazyModuleResources &&
+            this.options.additionalLazyModuleResources.includes(resource));
+
+        if (!result || !this.done || !isLazyModuleResource(result.resource)) {
           return result;
         }
 

From 3f85824ecf2649ba4c3b6c3d215e7948e93d8928 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 8 Nov 2018 18:32:48 +0000
Subject: [PATCH 0414/1703] feat(@angular-devkit/build-angular): update
 autoprefixer (#12785)

---
 .../angular_devkit/build_angular/package.json  |  2 +-
 yarn.lock                                      | 18 +++---------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 5a8be46e4db4..0011db8e7f9d 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -12,7 +12,7 @@
     "@angular-devkit/core": "0.0.0",
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.5.3",
-    "autoprefixer": "9.1.5",
+    "autoprefixer": "9.3.1",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "4.5.4",
diff --git a/yarn.lock b/yarn.lock
index 45d9e876297c..05dee9c1b995 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1163,19 +1163,7 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@9.1.5:
-  version "9.1.5"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.1.5.tgz#8675fd8d1c0d43069f3b19a2c316f3524e4f6671"
-  integrity sha512-kk4Zb6RUc58ld7gdosERHMF3DzIYJc2fp5sX46qEsGXQQy5bXsu8qyLjoxuY1NuQ/cJuCYnx99BfjwnRggrYIw==
-  dependencies:
-    browserslist "^4.1.0"
-    caniuse-lite "^1.0.30000884"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^7.0.2"
-    postcss-value-parser "^3.2.3"
-
-autoprefixer@^9.0.0:
+autoprefixer@9.3.1, autoprefixer@^9.0.0:
   version "9.3.1"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.3.1.tgz#71b622174de2b783d5fd99f9ad617b7a3c78443e"
   integrity sha512-DY9gOh8z3tnCbJ13JIWaeQsoYncTGdsrgCceBaQSIL4nvdrLxgbRSBPevg2XbX7u4QCSfLheSJEEIUUSlkbx6Q==
@@ -1587,7 +1575,7 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.1.0, browserslist@^4.3.3:
+browserslist@^4.0.0, browserslist@^4.3.3:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.4.tgz#4477b737db6a1b07077275b24791e680d4300425"
   integrity sha512-u5iz+ijIMUlmV8blX82VGFrB9ecnUg5qEt55CMZ/YJEhha+d8qpBfOFuutJ6F/VKRXjZoD33b6uvarpPxcl3RA==
@@ -1817,7 +1805,7 @@ camelcase@^4.0.0, camelcase@^4.1.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
   integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
-caniuse-lite@^1.0.30000884, caniuse-lite@^1.0.30000898, caniuse-lite@^1.0.30000899:
+caniuse-lite@^1.0.30000898, caniuse-lite@^1.0.30000899:
   version "1.0.30000903"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000903.tgz#86d46227759279b3db345ddbe778335dbba9e858"
   integrity sha512-T1XVJEpGCoaq7MDw7/6hCdYUukmSaS+1l/OQJkLtw7Cr2+/+d67tNGKEbyiqf7Ck8x6EhNFUxjYFXXka0N/w5g==

From 6d2e333d9eb68feec657a10523ad8d163cf9d21b Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Thu, 8 Nov 2018 13:34:12 -0500
Subject: [PATCH 0415/1703] ci: fast track docs-preview snapshot (#12854)

---
 .circleci/config.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 46c3418b9b57..ad4b1b8f30bd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -168,6 +168,10 @@ workflows:
       - build:
           requires:
             - install
+          filters:
+            branches:
+              ignore:
+              - /docs-preview/
       - build-bazel:
           requires:
             - build
@@ -183,6 +187,13 @@ workflows:
       - e2e-node-8:
           requires:
             - build
+      - snapshot_publish_docs:
+          requires:
+          - install
+          filters:
+            branches:
+              only:
+              - /docs-preview/
       - e2e-cli-ng-snapshots:
           requires:
             - build

From 3c8b33ab3a6b53c03c166a4468117b7fa2fa2c92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Exbrayat?=
 <cexbrayat@users.noreply.github.com>
Date: Thu, 8 Nov 2018 19:34:35 +0100
Subject: [PATCH 0416/1703] fix(@angular-devkit/build-angular): add a base href
 to karma context (#12889)

This commits adds a base href value in the karma context iframe used to run unit tests.

It solves a very old issue in Angular https://github.com/angular/angular/issues/12295 where a unit test throws:

    No base href set. Please provide a value for the APP_BASE_HREF token or add a base element to the document.

even if the application is fine. This is because the `index.html` from Angular CLI contains a base href value, but not the Karma context iframe. So when adding a unit test with a testing module that imports a NgModule, for example `AppModule`, which itself imports `RouterModule`, the unit test used to throw an error (regression appeared in router 3.1).

That could be solved by either adding `RouterTestingModule` to the testing module, or by adding a provider `{ provide: APP_BASE_HREF, useValue: '/' }`, but required to understand the issue (see how many thumbs up there are on the original issue).

This solves the issue in a transparent way: developers won't even encounter the problem anymore.
---
 .../src/angular-cli-files/plugins/karma-context.html             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html
index dd11e3efe33f..17937eee4920 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html
@@ -8,6 +8,7 @@
 
 <head>
   <title></title>
+  <base href="/">
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
 </head>

From 4059fe83b485edcf42b8a795ea74289f1531688e Mon Sep 17 00:00:00 2001
From: Vikram Subramanian <viks@google.com>
Date: Thu, 8 Nov 2018 14:15:20 -0800
Subject: [PATCH 0417/1703] release: v7.1.0-beta.1

---
 .monorepo.json | 76 +++++++++++++++++++++++++-------------------------
 yarn.lock      | 36 ++++--------------------
 2 files changed, 43 insertions(+), 69 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index ae7c334be7ac..22a3ae846a35 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,16 +42,16 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.11.0-beta.0",
-      "hash": "ed6f2ae751fd3db351a20ae55349e8ad"
+      "version": "0.11.0-beta.1",
+      "hash": "f828d4a3fa042a7feac4a48c86893375"
     },
     "@_/builders": {
-      "version": "0.11.0-beta.0",
-      "hash": "569aef8bc23693c344e71b9755e62c50"
+      "version": "0.11.0-beta.1",
+      "hash": "6983d21ece5e42aa536b50adfdceb56c"
     },
     "devkit": {
-      "version": "0.11.0-beta.0",
-      "hash": "ffdd40ab3d05801f7bf32efa324d92d1"
+      "version": "0.11.0-beta.1",
+      "hash": "4415622db3803c68e2f496cb9614c3bb"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -62,15 +62,15 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md"
         }
       ],
-      "version": "7.1.0-beta.0",
+      "version": "7.1.0-beta.1",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "f9e82d23eaf73855f73a6bf12faa41d7"
+      "hash": "028d5d132ab5ddc2c2b184620c363dfd"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.11.0-beta.0",
-      "hash": "0261713533db3e3c3345732f7198cf2b",
+      "version": "0.11.0-beta.1",
+      "hash": "5e02cbbfff8aa9430d295d3a9b6e3393",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -81,21 +81,21 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.11.0-beta.0",
-      "hash": "bf4589ed3a4b3f68014837616d1ed4e2",
+      "version": "0.11.0-beta.1",
+      "hash": "d5593511032523b78fec1286fb2a1280",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.11.0-beta.0",
-      "hash": "0c35ddea54a5b2483af2670b24635648",
+      "version": "0.11.0-beta.1",
+      "hash": "b84b66a87d913cc8a016f06cf3068d9b",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
       "name": "Benchmark",
       "section": "Tooling",
-      "version": "1.0.0-beta.0",
-      "hash": "9a28b5865e951779fedbeeaf8b445e74"
+      "version": "1.0.0-beta.1",
+      "hash": "8570143472857348b74f4a4e83f76577"
     },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
@@ -105,8 +105,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.11.0-beta.0",
-      "hash": "86c03973829cf0493ba1a27e95e184a1",
+      "version": "0.11.0-beta.1",
+      "hash": "db4b249af3423efe9d96e725de519a0b",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -117,8 +117,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.11.0-beta.0",
-      "hash": "dbfed6c02deba394e8417160ac91f602",
+      "version": "0.11.0-beta.1",
+      "hash": "31c87a6c2130b704c316ddf43a4ee9b2",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -129,8 +129,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.11.0-beta.0",
-      "hash": "71ba7e591bb8eb7f2e14ce16a3701329",
+      "version": "0.11.0-beta.1",
+      "hash": "34246eafb7b434b37490645f511a0e18",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -141,9 +141,9 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.11.0-beta.0",
+      "version": "0.11.0-beta.1",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "7c61bdbd01a925182ab03022e8498d3d"
+      "hash": "fc3b66fcdbf673a7f9b1cedf2f665c70"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -153,8 +153,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "7.1.0-beta.0",
-      "hash": "e9ff1713f5a700c2605233be608de818",
+      "version": "7.1.0-beta.1",
+      "hash": "41d8cb7821c8bfdfeab7dc142ac1cd2f",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -165,43 +165,43 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "7.1.0-beta.0",
-      "hash": "9bb483845f2984aaf14526d630de1571",
+      "version": "7.1.0-beta.1",
+      "hash": "6fc8334aed0a6f26e30f5ff98c123499",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.11.0-beta.0",
-      "hash": "132d74c7cbbeb902aa5c9816a55e4c32",
+      "version": "0.11.0-beta.1",
+      "hash": "7212d320a60807d41f76cc3bde42378c",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "7.1.0-beta.0",
+      "version": "7.1.0-beta.1",
       "section": "Misc",
-      "hash": "bbe0f0908ad927f96ef6db1da4cc90e6",
+      "hash": "727cb9120ae625b3934ff155526c9618",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "7.1.0-beta.0",
-      "hash": "db7d1da88bab17944ec7ff502a80b8d3",
+      "version": "7.1.0-beta.1",
+      "hash": "ba246ac11ca98b48e8f738d3fcec5f6c",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.11.0-beta.0",
+      "version": "0.11.0-beta.1",
       "section": "Schematics",
-      "hash": "ab43ec0cdcb51f26e34ddbac933d76b9",
+      "hash": "3fc55264935b9c01c160ea121a9ca534",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.11.0-beta.0",
+      "version": "0.11.0-beta.1",
       "section": "Schematics",
-      "hash": "18bd3ac68c6d2808579a35cbf5c6fd32",
+      "hash": "1c6859b3d33ed3fb59c6572170d548c0",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }
diff --git a/yarn.lock b/yarn.lock
index 05dee9c1b995..a9a2bf43324b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6590,10 +6590,10 @@ node-sass-tilde-importer@^1.0.0:
   dependencies:
     find-parent-dir "^0.3.0"
 
-node-sass@4.9.3:
-  version "4.9.3"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.3.tgz#f407cf3d66f78308bb1e346b24fa428703196224"
-  integrity sha512-XzXyGjO+84wxyH7fV6IwBOTrEBe2f0a6SBze9QWWYR/cL74AcQUks2AsqcCZenl/Fp/JVbuEaLpgrLtocwBUww==
+node-sass@4.10.0:
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.10.0.tgz#dcc2b364c0913630945ccbf7a2bbf1f926effca4"
+  integrity sha512-fDQJfXszw6vek63Fe/ldkYXmRYK/QS6NbvM3i5oEo9ntPDy4XX7BcKZyTKv+/kSSxRtXXc7l+MSwEmYc0CSy6Q==
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -6610,7 +6610,7 @@ node-sass@4.9.3:
     nan "^2.10.0"
     node-gyp "^3.8.0"
     npmlog "^4.0.0"
-    request "2.87.0"
+    request "^2.88.0"
     sass-graph "^2.2.4"
     stdout-stream "^1.4.0"
     "true-case-path" "^1.0.2"
@@ -8230,32 +8230,6 @@ request@2.85.0:
     tunnel-agent "^0.6.0"
     uuid "^3.1.0"
 
-request@2.87.0:
-  version "2.87.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
-  integrity sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
-    forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
-
 request@^2.0.0, request@^2.74.0, request@^2.83.0, request@^2.87.0, request@^2.88.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"

From f848d08a1a3659fb5bf21ca3dbf97d1831897575 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 8 Nov 2018 11:32:39 -0500
Subject: [PATCH 0418/1703] feat(@ngtools/webpack): disable sourcefile cache
 when not in watch mode

Requires Webpack 4.23.0+
---
 packages/ngtools/webpack/src/angular_compiler_plugin.ts  | 6 +++++-
 packages/ngtools/webpack/src/compiler_host.ts            | 6 +++++-
 packages/ngtools/webpack/src/transformers/ast_helpers.ts | 1 +
 packages/ngtools/webpack/src/type_checker.ts             | 1 +
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index e446782ffe59..af5a4c78ea69 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -585,7 +585,10 @@ export class AngularCompilerPlugin {
   }
 
   // Registration hook for webpack plugin.
-  apply(compiler: Compiler) {
+  apply(compiler: Compiler & { watchMode?: boolean }) {
+    // only present for webpack 4.23.0+, assume true otherwise
+    const watchMode = compiler.watchMode === undefined ? true : compiler.watchMode;
+
     // Decorate inputFileSystem to serve contents of CompilerHost.
     // Use decorated inputFileSystem in watchFileSystem.
     compiler.hooks.environment.tap('angular-compiler', () => {
@@ -629,6 +632,7 @@ export class AngularCompilerPlugin {
         this._compilerOptions,
         this._basePath,
         host,
+        watchMode,
       );
 
       // Create and set a new WebpackResourceLoader.
diff --git a/packages/ngtools/webpack/src/compiler_host.ts b/packages/ngtools/webpack/src/compiler_host.ts
index 19170f2c414f..e87aff1f44ad 100644
--- a/packages/ngtools/webpack/src/compiler_host.ts
+++ b/packages/ngtools/webpack/src/compiler_host.ts
@@ -45,6 +45,7 @@ export class WebpackCompilerHost implements ts.CompilerHost {
     private _options: ts.CompilerOptions,
     basePath: string,
     host: virtualFs.Host,
+    private readonly cacheSourceFiles: boolean,
   ) {
     this._syncHost = new virtualFs.SyncDelegateHost(host);
     this._memoryHost = new virtualFs.SyncDelegateHost(new virtualFs.SimpleMemoryHost());
@@ -260,7 +261,10 @@ export class WebpackCompilerHost implements ts.CompilerHost {
       const content = this.readFile(fileName);
       if (content !== undefined) {
         const sf = ts.createSourceFile(workaroundResolve(fileName), content, languageVersion, true);
-        this._sourceFileCache.set(p, sf);
+
+        if (this.cacheSourceFiles) {
+          this._sourceFileCache.set(p, sf);
+        }
 
         return sf;
       }
diff --git a/packages/ngtools/webpack/src/transformers/ast_helpers.ts b/packages/ngtools/webpack/src/transformers/ast_helpers.ts
index c20722da84d5..1c894b5bbafa 100644
--- a/packages/ngtools/webpack/src/transformers/ast_helpers.ts
+++ b/packages/ngtools/webpack/src/transformers/ast_helpers.ts
@@ -62,6 +62,7 @@ export function createTypescriptContext(content: string) {
     compilerOptions,
     basePath,
     new virtualFs.SimpleMemoryHost(),
+    false,
   );
 
   // Add a dummy file to host content.
diff --git a/packages/ngtools/webpack/src/type_checker.ts b/packages/ngtools/webpack/src/type_checker.ts
index 97263292ac7f..4aedf0d790ce 100644
--- a/packages/ngtools/webpack/src/type_checker.ts
+++ b/packages/ngtools/webpack/src/type_checker.ts
@@ -53,6 +53,7 @@ export class TypeChecker {
       _compilerOptions,
       _basePath,
       host,
+      true,
     );
     // We don't set a async resource loader on the compiler host because we only support
     // html templates, which are the only ones that can throw errors, and those can be loaded

From 8f7fe87fd22c300f72dd6a7d1b6908e25541a0c2 Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Wed, 24 Oct 2018 13:37:54 -0700
Subject: [PATCH 0419/1703] docs: edit and expand command docs

---
 packages/angular/cli/commands/build-long.md    | 12 +++++++++++-
 packages/angular/cli/commands/config.json      |  2 +-
 packages/angular/cli/commands/definitions.json |  8 ++++----
 packages/angular/cli/commands/lint-long.md     |  4 +++-
 packages/angular/cli/commands/lint.json        |  2 +-
 packages/angular/cli/commands/new.json         |  4 ++--
 packages/angular/cli/commands/run-long.md      |  8 ++++++++
 packages/angular/cli/commands/run.json         |  6 +++---
 8 files changed, 33 insertions(+), 13 deletions(-)
 create mode 100644 packages/angular/cli/commands/run-long.md

diff --git a/packages/angular/cli/commands/build-long.md b/packages/angular/cli/commands/build-long.md
index 0d04d981498a..70d51e2e0852 100644
--- a/packages/angular/cli/commands/build-long.md
+++ b/packages/angular/cli/commands/build-long.md
@@ -1,3 +1,13 @@
+Uses the Webpack build tool, with default target environment and build options specified in the workspace configuration file, `angular.json`.
+
+You can override the configuration defaults by specifying an option on the command line. 
+The command can accept option names given in either dash-case or camelCase.
+Note that in the configuration file, you must specify names in camelCase.
+
+The configuration options generally correspond to the command options.
+Some additional options can only be set through the configuration file,
+either by direct editing or with the `ng config` command.
+These include `assets`, `styles`, and `scripts` objects that provide runtime-global resources to include in the project. 
 Resources in CSS, such as images and fonts, are automatically written and fingerprinted at the root of the output folder.
 
-Uses the Webpack build tool, with environment and build options specified in the CLI configuration file.
+For further details, see Workspace Configuration.
diff --git a/packages/angular/cli/commands/config.json b/packages/angular/cli/commands/config.json
index 8d1dabb3f4ed..d0c3d59520b3 100644
--- a/packages/angular/cli/commands/config.json
+++ b/packages/angular/cli/commands/config.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/config.json",
-  "description": "Retrieves or sets Angular configuration values.",
+  "description": "Retrieves or sets Angular configuration values in the angular.json file for the workspace.",
   "$longDescription": "",
 
   "$aliases": [],
diff --git a/packages/angular/cli/commands/definitions.json b/packages/angular/cli/commands/definitions.json
index ee2f5b011793..094a7d7a7b71 100644
--- a/packages/angular/cli/commands/definitions.json
+++ b/packages/angular/cli/commands/definitions.json
@@ -14,14 +14,14 @@
           }
         },
         "configuration": {
-          "description": "A named configuration environment, as specified in the \"configurations\" section of angular.json.",
+          "description": "A named build target, as specified in the \"configurations\" section of angular.json.\nEach named target is accompanied by a configuration of option defaults for that target.",
           "type": "string",
           "aliases": [
             "c"
           ]
         },
         "prod": {
-          "description": "When true, sets the build configuration to the production environment.\nAll builds make use of bundling and limited tree-shaking, A production build also runs limited dead code elimination using UglifyJS.",
+          "description": "When true, sets the build configuration to the production target.\nAll builds make use of bundling and limited tree-shaking, A production build also runs limited dead code elimination using UglifyJS.",
           "type": "boolean"
         }
       }
@@ -42,13 +42,13 @@
           "type": "boolean",
           "default": false,
           "aliases": [ "d" ],
-          "description": "When true, run through and report activity without writing out results."
+          "description": "When true, runs through and reports activity without writing out results."
         },
         "force": {
           "type": "boolean",
           "default": false,
           "aliases": [ "f" ],
-          "description": "When true, force overwriting of existing files."
+          "description": "When true, forces overwriting of existing files."
         },
         "interactive": {
           "type": "boolean",
diff --git a/packages/angular/cli/commands/lint-long.md b/packages/angular/cli/commands/lint-long.md
index 5b6eb99d0d73..42bbc32f0051 100644
--- a/packages/angular/cli/commands/lint-long.md
+++ b/packages/angular/cli/commands/lint-long.md
@@ -1,2 +1,4 @@
 Takes the name of the project, as specified in the  `projects` section of the `angular.json` workspace configuration file.
-When a project name is not supplied, uses the configured `defaultProject` of the workspace.
\ No newline at end of file
+When a project name is not supplied, uses the configured `defaultProject` of the workspace.
+
+The default linting tool is [TSLint](https://palantir.github.io/tslint/), and the default configuration is specified in the project's `tslint.json` file.
\ No newline at end of file
diff --git a/packages/angular/cli/commands/lint.json b/packages/angular/cli/commands/lint.json
index 3c409083bc39..eed1cda035c6 100644
--- a/packages/angular/cli/commands/lint.json
+++ b/packages/angular/cli/commands/lint.json
@@ -22,7 +22,7 @@
           }
         },
         "configuration": {
-          "description": "Specify the configuration to use.",
+          "description": "The linting configuration to use.",
           "type": "string",
           "aliases": [
             "c"
diff --git a/packages/angular/cli/commands/new.json b/packages/angular/cli/commands/new.json
index 80a8d35623b6..aeffbfe5255f 100644
--- a/packages/angular/cli/commands/new.json
+++ b/packages/angular/cli/commands/new.json
@@ -16,13 +16,13 @@
         "collection": {
           "type": "string",
           "aliases": [ "c" ],
-          "description": "Schematics collection to use."
+          "description": "A collection of schematics to use in generating the initial app."
         },
         "verbose": {
           "type": "boolean",
           "default": false,
           "aliases": [ "v" ],
-          "description": "Adds more details to output logging."
+          "description": "When true, adds more details to output logging."
         }
       },
       "required": []
diff --git a/packages/angular/cli/commands/run-long.md b/packages/angular/cli/commands/run-long.md
new file mode 100644
index 000000000000..7db565352207
--- /dev/null
+++ b/packages/angular/cli/commands/run-long.md
@@ -0,0 +1,8 @@
+Architect is the tool that the CLI uses to perform complex tasks such as compilation, according to provided configurations.
+The CLI commands run Architect targets such as `build`, `serve`, `test` and `lint`. 
+Each named target has a default configuration, specified by an "options" object, and an optional set of named alternate configurations in the "configurations" object. 
+For example, the "build" target for a newly generated app has a predefined alternate configuration named "production". 
+
+You can define new targets and their configuration options in the "architect" section of the `angular.json` file.
+If you do so, you can run them from the command line using the `ng run` command.
+
diff --git a/packages/angular/cli/commands/run.json b/packages/angular/cli/commands/run.json
index e14547ed1133..1f7397496c46 100644
--- a/packages/angular/cli/commands/run.json
+++ b/packages/angular/cli/commands/run.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/run.json",
-  "description": "Runs a custom target defined in your project.",
+  "description": "Runs an architect target with a custom build configuration defined in your project.",
   "$longDescription": "",
 
   "$aliases": [],
@@ -15,14 +15,14 @@
       "properties": {
         "target": {
           "type": "string",
-          "description": "The target to run.",
+          "description": "The command to run.",
           "$default": {
             "$source": "argv",
             "index": 0
           }
         },
         "configuration": {
-          "description": "Specify the configuration to use.",
+          "description": "A named build configuration, defined in the \"configurations\" section of angular.json.\nThe build uses the configuration associated with the given target.",
           "type": "string",
           "aliases": [ "c" ]
         }

From b07fbee0b18e6e0999e11b940a85eaba36806bf4 Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Thu, 25 Oct 2018 08:34:33 -0700
Subject: [PATCH 0420/1703] docs: edit run terminology

---
 packages/angular/cli/commands/run-long.md | 3 +--
 packages/angular/cli/commands/run.json    | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/angular/cli/commands/run-long.md b/packages/angular/cli/commands/run-long.md
index 7db565352207..22404bf5a291 100644
--- a/packages/angular/cli/commands/run-long.md
+++ b/packages/angular/cli/commands/run-long.md
@@ -4,5 +4,4 @@ Each named target has a default configuration, specified by an "options" object,
 For example, the "build" target for a newly generated app has a predefined alternate configuration named "production". 
 
 You can define new targets and their configuration options in the "architect" section of the `angular.json` file.
-If you do so, you can run them from the command line using the `ng run` command.
-
+If you do so, you can run them from the command line using the `ng run` command.
\ No newline at end of file
diff --git a/packages/angular/cli/commands/run.json b/packages/angular/cli/commands/run.json
index 1f7397496c46..673cca89f74c 100644
--- a/packages/angular/cli/commands/run.json
+++ b/packages/angular/cli/commands/run.json
@@ -1,8 +1,8 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/run.json",
-  "description": "Runs an architect target with a custom build configuration defined in your project.",
-  "$longDescription": "",
+  "description": "Runs an architect target with a custom builder configuration defined in your project.",
+  "$longDescription": "./run-long.md",
 
   "$aliases": [],
   "$scope": "in",
@@ -15,14 +15,14 @@
       "properties": {
         "target": {
           "type": "string",
-          "description": "The command to run.",
+          "description": "The target to run.",
           "$default": {
             "$source": "argv",
             "index": 0
           }
         },
         "configuration": {
-          "description": "A named build configuration, defined in the \"configurations\" section of angular.json.\nThe build uses the configuration associated with the given target.",
+          "description": "A named builder configuration, defined in the \"configurations\" section of angular.json.\nThe builder uses the named configuration to run the given target.",
           "type": "string",
           "aliases": [ "c" ]
         }

From 1c39f54a24eb0893735d3cf87e8f3d6403bf8ae2 Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Mon, 29 Oct 2018 12:51:46 -0700
Subject: [PATCH 0421/1703] docs: edit run description

---
 packages/angular/cli/commands/run-long.md | 19 ++++++++++++++-----
 packages/angular/cli/commands/run.json    |  4 ++--
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/packages/angular/cli/commands/run-long.md b/packages/angular/cli/commands/run-long.md
index 22404bf5a291..b68fa94fa547 100644
--- a/packages/angular/cli/commands/run-long.md
+++ b/packages/angular/cli/commands/run-long.md
@@ -1,7 +1,16 @@
 Architect is the tool that the CLI uses to perform complex tasks such as compilation, according to provided configurations.
-The CLI commands run Architect targets such as `build`, `serve`, `test` and `lint`. 
-Each named target has a default configuration, specified by an "options" object, and an optional set of named alternate configurations in the "configurations" object. 
-For example, the "build" target for a newly generated app has a predefined alternate configuration named "production". 
+The CLI commands run Architect targets such as `build`, `serve`, `test` and `lint`.
+Each named target has a default configuration, specified by an "options" object,
+and an optional set of named alternate configurations in the "configurations" object.
 
-You can define new targets and their configuration options in the "architect" section of the `angular.json` file.
-If you do so, you can run them from the command line using the `ng run` command.
\ No newline at end of file
+For example, the "server" target for a newly generated app has a predefined
+alternate configuration named "production".
+
+You can define new targets and their configuration options in the "architect" section
+of the `angular.json` file.
+If you do so, you can run them from the command line using the `ng run` command.
+Execute the command using the following format.
+
+```
+ng run project:target[.configuration]
+```
\ No newline at end of file
diff --git a/packages/angular/cli/commands/run.json b/packages/angular/cli/commands/run.json
index 673cca89f74c..86f132f8f1b1 100644
--- a/packages/angular/cli/commands/run.json
+++ b/packages/angular/cli/commands/run.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/run.json",
-  "description": "Runs an architect target with a custom builder configuration defined in your project.",
+  "description": "Runs an architect target with an optional custom builder configuration defined in your project.",
   "$longDescription": "./run-long.md",
 
   "$aliases": [],
@@ -15,7 +15,7 @@
       "properties": {
         "target": {
           "type": "string",
-          "description": "The target to run.",
+          "description": "The Architect target to run.",
           "$default": {
             "$source": "argv",
             "index": 0

From c695c3ab279a07199368b037fd572c68a89ffe58 Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Mon, 29 Oct 2018 13:00:20 -0700
Subject: [PATCH 0422/1703] docs: edit build description

---
 packages/angular/cli/commands/build-long.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/angular/cli/commands/build-long.md b/packages/angular/cli/commands/build-long.md
index 70d51e2e0852..c2fa222a7f8a 100644
--- a/packages/angular/cli/commands/build-long.md
+++ b/packages/angular/cli/commands/build-long.md
@@ -1,10 +1,11 @@
-Uses the Webpack build tool, with default target environment and build options specified in the workspace configuration file, `angular.json`.
+Uses the Webpack build tool, with default configuration options specified in the workspace configuration file, `angular.json`, or with a named alternative configuration. 
+A "production" configuration is created by default when you use the CLI to create the project, and you can use that configuration by specifying the `--prod` option.
 
-You can override the configuration defaults by specifying an option on the command line. 
+The configuration options generally correspond to the command options.
+You can override individual configuration defaults by specifying the corresponding options on the command line. 
 The command can accept option names given in either dash-case or camelCase.
 Note that in the configuration file, you must specify names in camelCase.
 
-The configuration options generally correspond to the command options.
 Some additional options can only be set through the configuration file,
 either by direct editing or with the `ng config` command.
 These include `assets`, `styles`, and `scripts` objects that provide runtime-global resources to include in the project. 

From ed6e765471a35e634fecff5f09e7249423dae17b Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Wed, 24 Oct 2018 14:41:06 -0700
Subject: [PATCH 0423/1703] docs: add generation schematics option docs

---
 .../angular/app-shell/app-shell-long.md       |  0
 .../schematics/angular/app-shell/schema.json  | 12 ++++---
 .../angular/application/schema.json           | 25 +++++++-------
 packages/schematics/angular/class/schema.json |  9 ++---
 .../schematics/angular/component/schema.json  | 31 +++++++++--------
 .../schematics/angular/directive/schema.json  | 21 ++++++------
 packages/schematics/angular/e2e/e2e-long.md   |  1 +
 packages/schematics/angular/e2e/schema.json   |  8 +++--
 packages/schematics/angular/enum/schema.json  |  7 ++--
 packages/schematics/angular/guard/schema.json | 11 +++---
 .../schematics/angular/interface/schema.json  |  9 ++---
 .../angular/library/library-long.md           |  4 +++
 .../schematics/angular/library/schema.json    | 12 ++++---
 .../schematics/angular/module/schema.json     | 17 +++++-----
 .../schematics/angular/ng-new/schema.json     | 34 +++++++++----------
 packages/schematics/angular/pipe/schema.json  | 15 ++++----
 .../angular/service-worker/schema.json        |  1 +
 .../schematics/angular/service/schema.json    |  9 ++---
 .../schematics/angular/universal/schema.json  | 13 +++----
 .../schematics/angular/workspace/schema.json  |  8 ++---
 20 files changed, 135 insertions(+), 112 deletions(-)
 create mode 100644 packages/schematics/angular/app-shell/app-shell-long.md
 create mode 100644 packages/schematics/angular/e2e/e2e-long.md
 create mode 100644 packages/schematics/angular/library/library-long.md

diff --git a/packages/schematics/angular/app-shell/app-shell-long.md b/packages/schematics/angular/app-shell/app-shell-long.md
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/packages/schematics/angular/app-shell/schema.json b/packages/schematics/angular/app-shell/schema.json
index bccd2e25ebee..975921de5784 100644
--- a/packages/schematics/angular/app-shell/schema.json
+++ b/packages/schematics/angular/app-shell/schema.json
@@ -3,14 +3,16 @@
   "id": "SchematicsAngularAppShell",
   "title": "Angular AppShell Options Schema",
   "type": "object",
+  "description": "Generates an app shell for running a server-side version of an app.",
+  "long-description": "",
   "properties": {
     "clientProject": {
       "type": "string",
-      "description": "Name of related client app."
+      "description": "The name of the related client app."
     },
     "universalProject": {
       "type": "string",
-      "description": "Name of related universal app."
+      "description": "The name of related Universal app."
     },
     "route": {
       "type": "string",
@@ -20,12 +22,12 @@
     "name": {
       "type": "string",
       "format": "html-selector",
-      "description": "Name of the universal app"
+      "description": "The HTML selector of the Universal app"
     },
     "appId": {
       "type": "string",
       "format": "html-selector",
-      "description": "The appId to use withServerTransition.",
+      "description": "The app ID to use in withServerTransition().",
       "default": "serverApp"
     },
     "outDir": {
@@ -43,7 +45,7 @@
     "index": {
       "type": "string",
       "format": "path",
-      "description": "Name of the index file",
+      "description": "The name of the index file",
       "default": "index.html"
     },
     "main": {
diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json
index 0a6ab8ce7742..34ec6a09888e 100644
--- a/packages/schematics/angular/application/schema.json
+++ b/packages/schematics/angular/application/schema.json
@@ -3,14 +3,15 @@
   "id": "SchematicsAngularApp",
   "title": "Angular Application Options Schema",
   "type": "object",
+  "description": "Generates a new basic app definition in the \"projects\" subfolder of the workspace.",
   "properties": {
     "projectRoot": {
-      "description": "The root directory of the new application.",
+      "description": "The root folder of the new app.",
       "type": "string",
       "visible": false
     },
     "name": {
-      "description": "The name of the application.",
+      "description": "The name of the new app.",
       "type": "string",
       "$default": {
         "$source": "argv",
@@ -19,46 +20,46 @@
       "x-prompt": "What name would you like to use for the application?"
     },
     "experimentalIvy": {
-      "description": "EXPERIMENTAL: Specifies whether to create a new application which uses the Ivy rendering engine.",
+      "description": "EXPERIMENTAL: True to create a new app that uses the Ivy rendering engine.",
       "type": "boolean",
       "default": false
     },
     "inlineStyle": {
-      "description": "Specifies if the style will be in the ts file.",
+      "description": "When true, includes styles inline in the root component TS file. Only CSS styles can be included inline. Default is false, meaning that an external styles file is created and referenced in the root component TS file.",
       "type": "boolean",
       "default": false,
       "alias": "s"
     },
     "inlineTemplate": {
-      "description": "Specifies if the template will be in the ts file.",
+      "description": "When true, includes template inline in the root component TS file. Default is false, meaning that an external template file is created and referenced in the root component TS file. ",
       "type": "boolean",
       "default": false,
       "alias": "t"
     },
     "viewEncapsulation": {
-      "description": "Specifies the view encapsulation strategy.",
+      "description": "The view encapsulation strategy to use in the new app.",
       "enum": ["Emulated", "Native", "None", "ShadowDom"],
       "type": "string"
     },
     "routing": {
       "type": "boolean",
-      "description": "Generates a routing module.",
+      "description": "When true, creates a routing NgModule.",
       "default": false
     },
     "prefix": {
       "type": "string",
       "format": "html-selector",
-      "description": "The prefix to apply to generated selectors.",
+      "description": "A prefix to apply to generated selectors.",
       "default": "app",
       "alias": "p"
     },
     "style": {
-      "description": "The file extension to be used for style files.",
+      "description": "The file extension to use for style files.",
       "type": "string",
       "default": "css"
     },
     "skipTests": {
-      "description": "Skip creating spec files.",
+      "description": "When true, does not create \"spec.ts\" test files for the app.",
       "type": "boolean",
       "default": false,
       "alias": "S"
@@ -66,10 +67,10 @@
     "skipPackageJson": {
       "type": "boolean",
       "default": false,
-      "description": "Do not add dependencies to package.json."
+      "description": "When true, does not add dependencies to the \"package.json\" file."
     },
     "minimal": {
-      "description": "Create a barebones project without any testing frameworks",
+      "description": "When true, creates a bare-bones project without any testing frameworks.",
       "type": "boolean",
       "default": false
     },
diff --git a/packages/schematics/angular/class/schema.json b/packages/schematics/angular/class/schema.json
index 9995a0b4c8f9..7d1d12877afb 100644
--- a/packages/schematics/angular/class/schema.json
+++ b/packages/schematics/angular/class/schema.json
@@ -3,10 +3,11 @@
   "id": "SchematicsAngularClass",
   "title": "Angular Class Options Schema",
   "type": "object",
+  "description": "Creates a new generic class definition in the given or default project.",
   "properties": {
     "name": {
       "type": "string",
-      "description": "The name of the class.",
+      "description": "The name of the new class.",
       "$default": {
         "$source": "argv",
         "index": 0
@@ -16,7 +17,7 @@
     "path": {
       "type": "string",
       "format": "path",
-      "description": "The path to create the class.",
+      "description": "The path at which to create the class, relative to the workspace root.",
       "visible": false
     },
     "project": {
@@ -28,12 +29,12 @@
     },
     "spec": {
       "type": "boolean",
-      "description": "Specifies if a spec file is generated.",
+      "description": "When true, generates a \"spec.ts\" test file for the new class.",
       "default": false
     },
     "type": {
       "type": "string",
-      "description": "Specifies the type of class.",
+      "description": "Adds a developer-defined type to the filename, in the format \"name.type.ts\".",
       "default": ""
     }
   },
diff --git a/packages/schematics/angular/component/schema.json b/packages/schematics/angular/component/schema.json
index a3401bbbd320..140b4313fe14 100644
--- a/packages/schematics/angular/component/schema.json
+++ b/packages/schematics/angular/component/schema.json
@@ -3,11 +3,12 @@
   "id": "SchematicsAngularComponent",
   "title": "Angular Component Options Schema",
   "type": "object",
+  "description": "Creates a new generic component definition in the given or default project.",
   "properties": {
     "path": {
       "type": "string",
       "format": "path",
-      "description": "The path to create the component.",
+      "description": "The path at which to create the component file, relative to the current workspace. Default is a folder with the same name as the component in the project root.",
       "visible": false
     },
     "project": {
@@ -27,25 +28,25 @@
       "x-prompt": "What name would you like to use for the component?"
     },
     "inlineStyle": {
-      "description": "Specifies if the style will be in the ts file.",
+      "description": "When true, includes styles inline in the component TS file.  Only CSS styles can be included inline. By default, an external styles file is created and referenced in the component TS file.",
       "type": "boolean",
       "default": false,
       "alias": "s"
     },
     "inlineTemplate": {
-      "description": "Specifies if the template will be in the ts file.",
+      "description": "When true, includes template inline in the component TS file. By default, an external template file is created and referenced in the component TS file.",
       "type": "boolean",
       "default": false,
       "alias": "t"
     },
     "viewEncapsulation": {
-      "description": "Specifies the view encapsulation strategy.",
+      "description": "The view encapsulation strategy to use in the new component.",
       "enum": ["Emulated", "Native", "None", "ShadowDom"],
       "type": "string",
       "alias": "v"
     },
     "changeDetection": {
-      "description": "Specifies the change detection strategy.",
+      "description": "The change detection strategy to use in the new component.",
       "enum": ["Default", "OnPush"],
       "type": "string",
       "default": "Default",
@@ -53,7 +54,7 @@
     },
     "prefix": {
       "type": "string",
-      "description": "The prefix to apply to generated selectors.",
+      "description": "The prefix to apply to the generated component selector.",
       "alias": "p",
       "oneOf": [
         {
@@ -66,49 +67,49 @@
       ]
     },
     "styleext": {
-      "description": "The file extension to be used for style files.",
+      "description": "The file extension to use for style files.",
       "type": "string",
       "default": "css"
     },
     "spec": {
       "type": "boolean",
-      "description": "Specifies if a spec file is generated.",
+      "description": "When true (the default), generates a  \"spec.ts\" test file for the new component.",
       "default": true
     },
     "flat": {
       "type": "boolean",
-      "description": "Flag to indicate if a directory is created.",
+      "description": "When true, creates the new files at the top level of the current project.",
       "default": false
     },
     "skipImport": {
       "type": "boolean",
-      "description": "Flag to skip the module import.",
+      "description": "When true, does not import this component into the owning NgModule.",
       "default": false
     },
     "selector": {
       "type": "string",
       "format": "html-selector",
-      "description": "The selector to use for the component."
+      "description": "The HTML selector to use for this component."
     },
     "module":  {
       "type": "string",
-      "description": "Allows specification of the declaring module.",
+      "description": "The declaring NgModule.",
       "alias": "m"
     },
     "export": {
       "type": "boolean",
       "default": false,
-      "description": "Specifies if declaring module exports the component."
+      "description": "When true, the declaring NgModule exports this component."
     },
     "entryComponent": {
       "type": "boolean",
       "default": false,
-      "description": "Specifies if the component is an entry component of declaring module."
+      "description": "When true, the new component is the entry component of the declaring NgModule."
     },
     "lintFix": {
       "type": "boolean",
       "default": false,
-      "description": "Specifies whether to apply lint fixes after generating the component."
+      "description": "When true, applies lint fixes after generating the component."
     }
   },
   "required": [
diff --git a/packages/schematics/angular/directive/schema.json b/packages/schematics/angular/directive/schema.json
index 69aab44e5214..e6ace492e30b 100644
--- a/packages/schematics/angular/directive/schema.json
+++ b/packages/schematics/angular/directive/schema.json
@@ -3,10 +3,11 @@
   "id": "SchematicsAngularDirective",
   "title": "Angular Directive Options Schema",
   "type": "object",
+  "description": "Creates a new generic directive definition in the given or default project.",
   "properties": {
     "name": {
       "type": "string",
-      "description": "The name of the directive.",
+      "description": "The name of the new directive.",
       "$default": {
         "$source": "argv",
         "index": 0
@@ -16,7 +17,7 @@
     "path": {
       "type": "string",
       "format": "path",
-      "description": "The path to create the interface.",
+      "description": "The path at which to create the interface that defines the directive, relative to the workspace root.",
       "visible": false
     },
     "project": {
@@ -28,7 +29,7 @@
     },
     "prefix": {
       "type": "string",
-      "description": "The prefix to apply to generated selectors.",
+      "description": "A prefix to apply to generated selectors.",
       "alias": "p",
       "oneOf": [
         {
@@ -42,38 +43,38 @@
     },
     "spec": {
       "type": "boolean",
-      "description": "Specifies if a spec file is generated.",
+      "description": "When true (the default), generates a  \"spec.ts\" test file for the new directive.",
       "default": true
     },
     "skipImport": {
       "type": "boolean",
-      "description": "Flag to skip the module import.",
+      "description": "When true, does not import this directive into the owning NgModule.",
       "default": false
     },
     "selector": {
       "type": "string",
       "format": "html-selector",
-      "description": "The selector to use for the directive."
+      "description": "The HTML selector to use for this directive."
     },
     "flat": {
       "type": "boolean",
-      "description": "Flag to indicate if a directory is created.",
+      "description": "When true (the default), creates the new files at the top level of the current project.",
       "default": true
     },
     "module":  {
       "type": "string",
-      "description": "Allows specification of the declaring module.",
+      "description": "The declaring NgModule.",
       "alias": "m"
     },
     "export": {
       "type": "boolean",
       "default": false,
-      "description": "Specifies if declaring module exports the directive."
+      "description": "When true, the declaring NgModule exports this directive."
     },
     "lintFix": {
       "type": "boolean",
       "default": false,
-      "description": "Specifies whether to apply lint fixes after generating the directive."
+      "description": "When true, applies lint fixes after generating the directive."
     }
   },
   "required": [
diff --git a/packages/schematics/angular/e2e/e2e-long.md b/packages/schematics/angular/e2e/e2e-long.md
new file mode 100644
index 000000000000..ef1ba2e0b6c2
--- /dev/null
+++ b/packages/schematics/angular/e2e/e2e-long.md
@@ -0,0 +1 @@
+The e2e tests are created in a separate app, next to the project being tested in the `projects` folder of the workspace.
\ No newline at end of file
diff --git a/packages/schematics/angular/e2e/schema.json b/packages/schematics/angular/e2e/schema.json
index db0988c72bd7..89201ad387e9 100644
--- a/packages/schematics/angular/e2e/schema.json
+++ b/packages/schematics/angular/e2e/schema.json
@@ -3,14 +3,16 @@
   "id": "SchematicsAngularE2eApp",
   "title": "Angular e2e Application Options Schema",
   "type": "object",
+  "description": "Generates a new, generic end-to-end test definition for the given or default project.",
+  "long-description": "e2e-long.md",
   "properties": {
     "projectRoot": {
-      "description": "The root directory of the new application.",
+      "description": "The root folder for the new test app.",
       "type": "string",
       "visible": false
     },
     "name": {
-      "description": "The name of the e2e application.",
+      "description": "The name of the new e2e app.",
       "type": "string",
       "format": "html-selector",
       "$default": {
@@ -19,7 +21,7 @@
       }
     },
     "rootSelector": {
-      "description": "HTML selector for the root component.",
+      "description": "The HTML selector for the root component of the test app.",
       "type": "string",
       "default": "app-root"
     },
diff --git a/packages/schematics/angular/enum/schema.json b/packages/schematics/angular/enum/schema.json
index 50f165a4748c..1399eacb6a04 100644
--- a/packages/schematics/angular/enum/schema.json
+++ b/packages/schematics/angular/enum/schema.json
@@ -3,6 +3,7 @@
   "id": "SchematicsAngularEnum",
   "title": "Angular Enum Options Schema",
   "type": "object",
+  "description": "Generates a new, generic enum definition for the given or default project.",
   "properties": {
     "name": {
       "type": "string",
@@ -16,12 +17,12 @@
     "path": {
       "type": "string",
       "format": "path",
-      "description": "The path to create the enum.",
+      "description": "The path at which to create the enum definition, relative to the current workspace.",
       "visible": false
     },
     "project": {
       "type": "string",
-      "description": "The name of the project.",
+      "description": "The name of the project in which to create the enum. Default is the configured default project for the workspace.",
       "$default": {
         "$source": "projectName"
       }
@@ -29,7 +30,7 @@
     "lintFix": {
       "type": "boolean",
       "default": false,
-      "description": "Specifies whether to apply lint fixes after generating the enum."
+      "description": "When true, applies lint fixes after generating the enum."
     }
   },
   "required": [
diff --git a/packages/schematics/angular/guard/schema.json b/packages/schematics/angular/guard/schema.json
index 0b08eaba2b99..c2a528deaa85 100644
--- a/packages/schematics/angular/guard/schema.json
+++ b/packages/schematics/angular/guard/schema.json
@@ -3,10 +3,11 @@
   "id": "SchematicsAngularGuard",
   "title": "Angular Guard Options Schema",
   "type": "object",
+  "description": "Generates a new, generic route guard definition in the given or default project.",
   "properties": {
     "name": {
       "type": "string",
-      "description": "The name of the guard.",
+      "description": "The name of the new route guard.",
       "$default": {
         "$source": "argv",
         "index": 0
@@ -15,18 +16,18 @@
     },
     "spec": {
       "type": "boolean",
-      "description": "Specifies if a spec file is generated.",
+      "description": "When true (the default), generates a  \"spec.ts\" test file for the new guard.",
       "default": true
     },
     "flat": {
       "type": "boolean",
-      "description": "Flag to indicate if a directory is created.",
+      "description": "When true (the default), creates the new files at the top level of the current project.",
       "default": true
     },
     "path": {
       "type": "string",
       "format": "path",
-      "description": "The path to create the interface.",
+      "description": "The path at which to create the interface that defines the guard, relative to the current workspace.",
       "visible": false
     },
     "project": {
@@ -39,7 +40,7 @@
     "lintFix": {
       "type": "boolean",
       "default": false,
-      "description": "Specifies whether to apply lint fixes after generating the guard."
+      "description": "When true, applies lint fixes after generating the guard."
     }
   },
   "required": [
diff --git a/packages/schematics/angular/interface/schema.json b/packages/schematics/angular/interface/schema.json
index 63168a32b8c3..32bd0daaa21a 100644
--- a/packages/schematics/angular/interface/schema.json
+++ b/packages/schematics/angular/interface/schema.json
@@ -3,6 +3,7 @@
   "id": "SchematicsAngularInterface",
   "title": "Angular Interface Options Schema",
   "type": "object",
+  "description": "Creates a new generic interface definition in the given or default project.",
   "properties": {
     "name": {
       "type": "string",
@@ -16,7 +17,7 @@
     "path": {
       "type": "string",
       "format": "path",
-      "description": "The path to create the interface.",
+      "description": "The path at which to create the interface, relative to the workspace root.",
       "visible": false
     },
     "project": {
@@ -29,11 +30,11 @@
     "prefix": {
       "type": "string",
       "default": "",
-      "description": "Specifies the prefix to use."
+      "description": "A prefix to apply to generated selectors."
     },
     "type": {
       "type": "string",
-      "description": "Specifies the type of interface.",
+      "description": "Adds a developer-defined type to the filename, in the format \"name.type.ts\".",
       "$default": {
         "$source": "argv",
         "index": 1
@@ -42,7 +43,7 @@
     "lintFix": {
       "type": "boolean",
       "default": false,
-      "description": "Specifies whether to apply lint fixes after generating the directive."
+      "description": "When true, applies lint fixes after generating the interface."
     }
   },
   "required": [
diff --git a/packages/schematics/angular/library/library-long.md b/packages/schematics/angular/library/library-long.md
new file mode 100644
index 000000000000..bac674dca23e
--- /dev/null
+++ b/packages/schematics/angular/library/library-long.md
@@ -0,0 +1,4 @@
+A library is a type of project that does not run independently.
+The library skeleton created by this command is placed by default in the `/projects` folder, and has `type` of "library".
+
+You can build a new library using the `ng build` command, and unit-test it and lint it using the `ng test` and `ng lint` commands.
\ No newline at end of file
diff --git a/packages/schematics/angular/library/schema.json b/packages/schematics/angular/library/schema.json
index 0ce8e9eac44b..3db99c2d029d 100644
--- a/packages/schematics/angular/library/schema.json
+++ b/packages/schematics/angular/library/schema.json
@@ -3,6 +3,8 @@
   "id": "SchematicsLibrary",
   "title": "Library Options Schema",
   "type": "object",
+  "description": "Creates a new generic library project in the current workspace.",
+  "long-description": "./library-long.md",
   "properties": {
     "name": {
       "type": "string",
@@ -16,30 +18,30 @@
     "entryFile": {
       "type": "string",
       "format": "path",
-      "description": "The path to create the library's public API file.",
+      "description": "The path at which to create the library's public API file, relative to the workspace root.",
       "default": "public_api"
     },
     "prefix": {
       "type": "string",
       "format": "html-selector",
-      "description": "The prefix to apply to generated selectors.",
+      "description": "A prefix to apply to generated selectors.",
       "default": "lib",
       "alias": "p"
     },
     "skipPackageJson": {
       "type": "boolean",
       "default": false,
-      "description": "Do not add dependencies to package.json."
+      "description": "When true, does not add dependencies to the \"package.json\" file. "
     },
     "skipInstall": {
-      "description": "Skip installing dependency packages.",
+      "description": "When true, does not install dependency packages.",
       "type": "boolean",
       "default": false
     },
     "skipTsConfig": {
       "type": "boolean",
       "default": false,
-      "description": "Do not update tsconfig.json for development experience."
+      "description": "When true, does not update \"tsconfig.json\" to add a path mapping for the new library. The path mapping is needed to use the library in an app, but can be disabled here to simplify development."
     }
   },
   "required": []
diff --git a/packages/schematics/angular/module/schema.json b/packages/schematics/angular/module/schema.json
index a8ba886285fe..f58e8299786d 100644
--- a/packages/schematics/angular/module/schema.json
+++ b/packages/schematics/angular/module/schema.json
@@ -3,20 +3,21 @@
   "id": "SchematicsAngularModule",
   "title": "Angular Module Options Schema",
   "type": "object",
+  "description": "Creates a new generic NgModule definition in the given or default project.",
   "properties": {
     "name": {
       "type": "string",
-      "description": "The name of the module.",
+      "description": "The name of the NgModule.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the module?"
+      "x-prompt": "What name would you like to use for the NgModule?"
     },
     "path": {
       "type": "string",
       "format": "path",
-      "description": "The path to create the module.",
+      "description": "The path at which to create the NgModule, relative to the workspace root.",
       "visible": false
     },
     "project": {
@@ -28,29 +29,29 @@
     },
     "routing": {
       "type": "boolean",
-      "description": "Generates a routing module.",
+      "description": "When true, creates a routing module.",
       "default": false
     },
     "routingScope": {
       "enum": ["Child", "Root"],
       "type": "string",
-      "description": "The scope for the generated routing.",
+      "description": "The scope for the new routing module.",
       "default": "Child"
     },
     "flat": {
       "type": "boolean",
-      "description": "Flag to indicate if a directory is created.",
+      "description": "When true, creates the new files at the top level of the current project root. ",
       "default": false
     },
     "commonModule": {
       "type": "boolean",
-      "description": "Flag to control whether the CommonModule is imported.",
+      "description": "When true, the new NgModule imports \"CommonModule\". ",
       "default": true,
       "visible": false
     },
     "module":  {
       "type": "string",
-      "description": "Allows specification of the declaring module.",
+      "description": "The declaring NgModule.",
       "alias": "m"
     }
   },
diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
index e80bc82bc3de..45bd6da58565 100644
--- a/packages/schematics/angular/ng-new/schema.json
+++ b/packages/schematics/angular/ng-new/schema.json
@@ -9,39 +9,39 @@
       "description": "The directory name to create the workspace in."
     },
     "name": {
-      "description": "The name of the workspace.",
+      "description": "The name of the new workspace and initial project.",
       "type": "string",
       "format": "html-selector",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the project?"
+      "x-prompt": "What name would you like to use for the new workspace and initial project?"
     },
     "experimentalIvy": {
-      "description": "EXPERIMENTAL: Specifies whether to create a new application which uses the Ivy rendering engine.",
+      "description": "EXPERIMENTAL: When true, creates a new app that uses the Ivy rendering engine.",
       "type": "boolean",
       "default": false
     },
     "skipInstall": {
-      "description": "Skip installing dependency packages.",
+      "description": "When true, does not install dependency packages.",
       "type": "boolean",
       "default": false
     },
     "linkCli": {
-      "description": "Link CLI to global version (internal development only).",
+      "description": "When true, links CLI to global version (internal development only).",
       "type": "boolean",
       "default": false,
       "visible": false
     },
     "skipGit": {
-      "description": "Skip initializing a git repository.",
+      "description": "When true, does not initialize a git repository.",
       "type": "boolean",
       "default": false,
       "alias": "g"
     },
     "commit": {
-      "description": "Initial repository commit information.",
+      "description": "Initial git repository commit information.",
       "oneOf": [
         { "type": "boolean" },
         {
@@ -67,24 +67,24 @@
       "default": true
     },
     "newProjectRoot": {
-      "description": "The path where new projects will be created.",
+      "description": "The path where new projects will be created, relative to the new workspace root.",
       "type": "string",
       "default": "projects"
     },
     "inlineStyle": {
-      "description": "Specifies if the style will be in the ts file.",
+      "description": "When true, includes styles inline in the component TS file. By default, an external styles file is created and referenced in the component TS file.",
       "type": "boolean",
       "default": false,
       "alias": "s"
     },
     "inlineTemplate": {
-      "description": "Specifies if the template will be in the ts file.",
+      "description": "When true, includes template inline in the component TS file. By default, an external template file is created and referenced in the component TS file.",
       "type": "boolean",
       "default": false,
       "alias": "t"
     },
     "viewEncapsulation": {
-      "description": "Specifies the view encapsulation strategy.",
+      "description": "The view encapsulation strategy to use in the initial project.",
       "enum": ["Emulated", "Native", "None", "ShadowDom"],
       "type": "string"
     },
@@ -98,20 +98,20 @@
     },
     "routing": {
       "type": "boolean",
-      "description": "Generates a routing module.",
+      "description": "When true, generates a routing module for the initial project.",
       "default": false,
       "x-prompt": "Would you like to add Angular routing?"
     },
     "prefix": {
       "type": "string",
       "format": "html-selector",
-      "description": "The prefix to apply to generated selectors.",
+      "description": "The prefix to apply to generated selectors for the initial project.",
       "minLength": 1,
       "default": "app",
       "alias": "p"
     },
     "style": {
-      "description": "The file extension to be used for style files.",
+      "description": "The file extension to use for style files.",
       "type": "string",
       "default": "css",
       "x-prompt": {
@@ -127,18 +127,18 @@
       }
     },
     "skipTests": {
-      "description": "Skip creating spec files.",
+      "description": "When true, does not generate \"spec.ts\" test files for the new project. ",
       "type": "boolean",
       "default": false,
       "alias": "S"
     },
     "createApplication": {
-      "description": "Flag to toggle creation of an application in the new workspace.",
+      "description": "When true (the default), creates a new initial app project in the new workspace.",
       "type": "boolean",
       "default": true
     },
     "minimal": {
-      "description": "Create a barebones project without any testing frameworks",
+      "description": "When true, creates a barebones project without any testing frameworks.",
       "type": "boolean",
       "default": false
     }
diff --git a/packages/schematics/angular/pipe/schema.json b/packages/schematics/angular/pipe/schema.json
index f9ed5ffbb9cf..eb77636b1f10 100644
--- a/packages/schematics/angular/pipe/schema.json
+++ b/packages/schematics/angular/pipe/schema.json
@@ -3,6 +3,7 @@
   "id": "SchematicsAngularPipe",
   "title": "Angular Pipe Options Schema",
   "type": "object",
+  "description": "Creates a new generic pipe definition in the given or default project.",
   "properties": {
     "name": {
       "type": "string",
@@ -16,7 +17,7 @@
     "path": {
       "type": "string",
       "format": "path",
-      "description": "The path to create the pipe.",
+      "description": "The path at which to create the pipe, relative to the workspace root.",
       "visible": false
     },
     "project": {
@@ -29,32 +30,32 @@
     "flat": {
       "type": "boolean",
       "default": true,
-      "description": "Flag to indicate if a directory is created."
+      "description": "When true (the default) creates files at the top level of the project."
     },
     "spec": {
       "type": "boolean",
       "default": true,
-      "description": "Specifies if a spec file is generated."
+      "description": "When true (the default), generates a  \"spec.ts\" test file for the new pipe."
     },
     "skipImport": {
       "type": "boolean",
       "default": false,
-      "description": "Allows for skipping the module import."
+      "description": "When true, does not import this pipe into the owning NgModule."
     },
     "module": {
       "type": "string",
-      "description": "Allows specification of the declaring module.",
+      "description": "The declaring NgModule.",
       "alias": "m"
     },
     "export": {
       "type": "boolean",
       "default": false,
-      "description": "Specifies if declaring module exports the pipe."
+      "description": "When true, the declaring NgModule exports this pipe."
     },
     "lintFix": {
       "type": "boolean",
       "default": false,
-      "description": "Specifies whether to apply lint fixes after generating the pipe."
+      "description": "When true, applies lint fixes after generating the pipe."
     }
   },
   "required": [
diff --git a/packages/schematics/angular/service-worker/schema.json b/packages/schematics/angular/service-worker/schema.json
index 938d906ed973..56312e7e4c4e 100644
--- a/packages/schematics/angular/service-worker/schema.json
+++ b/packages/schematics/angular/service-worker/schema.json
@@ -3,6 +3,7 @@
   "id": "SchematicsAngularServiceWorker",
   "title": "Angular Service Worker Options Schema",
   "type": "object",
+  "description": "Pass this schematic to the \"run\" command to create a service worker",
   "properties": {
     "project": {
       "type": "string",
diff --git a/packages/schematics/angular/service/schema.json b/packages/schematics/angular/service/schema.json
index eeffbfe6e578..67f6b89610fa 100644
--- a/packages/schematics/angular/service/schema.json
+++ b/packages/schematics/angular/service/schema.json
@@ -3,6 +3,7 @@
   "id": "SchematicsAngularService",
   "title": "Angular Service Options Schema",
   "type": "object",
+  "description": "Creates a new, generic service definition in the given or default project.",
   "properties": {
     "name": {
       "type": "string",
@@ -16,7 +17,7 @@
     "path": {
       "type": "string",
       "format": "path",
-      "description": "The path to create the service.",
+      "description": "The path at which to create the service, relative to the workspace root.",
       "visible": false
     },
     "project": {
@@ -29,17 +30,17 @@
     "flat": {
       "type": "boolean",
       "default": true,
-      "description": "Flag to indicate if a directory is created."
+      "description": "When true (the default) creates files at the top level of the project."
     },
     "spec": {
       "type": "boolean",
       "default": true,
-      "description": "Specifies if a spec file is generated."
+      "description": "When true (the default), generates a  \"spec.ts\" test file for the new service."
     },
     "lintFix": {
       "type": "boolean",
       "default": false,
-      "description": "Specifies whether to apply lint fixes after generating the pipe."
+      "description": "When true, applies lint fixes after generating the pipe."
     }
   },
   "required": [
diff --git a/packages/schematics/angular/universal/schema.json b/packages/schematics/angular/universal/schema.json
index ee2bda67bef3..da5b760b9896 100644
--- a/packages/schematics/angular/universal/schema.json
+++ b/packages/schematics/angular/universal/schema.json
@@ -3,15 +3,16 @@
   "id": "SchematicsAngularUniversalApp",
   "title": "Angular Universal App Options Schema",
   "type": "object",
+  "description": "Pass this schematic to the \"run\" command to set up server-side rendering for an app.",
   "properties": {
     "clientProject": {
       "type": "string",
-      "description": "Name of related client app."
+      "description": "The name of the related client app. Required in place of \"project\"."
     },
     "appId": {
       "type": "string",
       "format": "html-selector",
-      "description": "The appId to use withServerTransition.",
+      "description": "The app identifier to use for transition.",
       "default": "serverApp"
     },
     "main": {
@@ -39,22 +40,22 @@
     "appDir": {
       "type": "string",
       "format": "path",
-      "description": "The name of the application directory.",
+      "description": "The name of the application folder.",
       "default": "app"
     },
     "rootModuleFileName": {
       "type": "string",
       "format": "path",
-      "description": "The name of the root module file",
+      "description": "The name of the root NgModule file.",
       "default": "app.server.module.ts"
     },
     "rootModuleClassName": {
       "type": "string",
-      "description": "The name of the root module class.",
+      "description": "The name of the root NgModule class.",
       "default": "AppServerModule"
     },
     "skipInstall": {
-      "description": "Skip installing dependency packages.",
+      "description": "When true, does not install packages for dependencies.",
       "type": "boolean",
       "default": false
     }
diff --git a/packages/schematics/angular/workspace/schema.json b/packages/schematics/angular/workspace/schema.json
index 7d3defa307de..4ec31e77693b 100644
--- a/packages/schematics/angular/workspace/schema.json
+++ b/packages/schematics/angular/workspace/schema.json
@@ -19,18 +19,18 @@
       "visible": "false"
     },
     "skipInstall": {
-      "description": "Skip installing dependency packages.",
+      "description": "When true, does not install packages for dependencies.",
       "type": "boolean",
       "default": false
     },
     "linkCli": {
-      "description": "Link CLI to global version (internal development only).",
+      "description": "When true, link CLI to global version (internal development only).",
       "type": "boolean",
       "default": false,
       "visible": false
     },
     "skipGit": {
-      "description": "Skip initializing a git repository.",
+      "description": "When true, do not initialize a git repository.",
       "type": "boolean",
       "default": false,
       "alias": "g"
@@ -70,7 +70,7 @@
       }
     },
     "minimal": {
-      "description": "Create a barebones project without any testing frameworks",
+      "description": "When true, creates a bare-bones project without any testing frameworks",
       "type": "boolean",
       "default": false
     }

From f454b7cd170036980c3028770a144ae87152931f Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Tue, 30 Oct 2018 09:45:24 -0700
Subject: [PATCH 0424/1703] docs: remove uglify reference

---
 packages/angular/cli/commands/definitions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular/cli/commands/definitions.json b/packages/angular/cli/commands/definitions.json
index 094a7d7a7b71..504f23b9ea23 100644
--- a/packages/angular/cli/commands/definitions.json
+++ b/packages/angular/cli/commands/definitions.json
@@ -21,7 +21,7 @@
           ]
         },
         "prod": {
-          "description": "When true, sets the build configuration to the production target.\nAll builds make use of bundling and limited tree-shaking, A production build also runs limited dead code elimination using UglifyJS.",
+          "description": "When true, sets the build configuration to the production target.\nAll builds make use of bundling and limited tree-shaking, A production build also runs limited dead code elimination.",
           "type": "boolean"
         }
       }

From deadbaf392eda6bb70c940a919cccc3b9acc7beb Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Tue, 30 Oct 2018 09:49:35 -0700
Subject: [PATCH 0425/1703] docs: fix run syntax

---
 packages/angular/cli/commands/run-long.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular/cli/commands/run-long.md b/packages/angular/cli/commands/run-long.md
index b68fa94fa547..8f84cf47994a 100644
--- a/packages/angular/cli/commands/run-long.md
+++ b/packages/angular/cli/commands/run-long.md
@@ -12,5 +12,5 @@ If you do so, you can run them from the command line using the `ng run` command.
 Execute the command using the following format.
 
 ```
-ng run project:target[.configuration]
+ng run project:target[:configuration]
 ```
\ No newline at end of file

From e2707a4c50b09c392102497b8f50f294d4faa2cc Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Tue, 30 Oct 2018 10:18:22 -0700
Subject: [PATCH 0426/1703] docs: change folder to dir

---
 packages/schematics/angular/application/schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json
index 34ec6a09888e..ffe24eb1a38b 100644
--- a/packages/schematics/angular/application/schema.json
+++ b/packages/schematics/angular/application/schema.json
@@ -6,7 +6,7 @@
   "description": "Generates a new basic app definition in the \"projects\" subfolder of the workspace.",
   "properties": {
     "projectRoot": {
-      "description": "The root folder of the new app.",
+      "description": "The root directory of the new app.",
       "type": "string",
       "visible": false
     },

From 7029eee980a7f94fbd1e11f17bd80287d86d718a Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Fri, 2 Nov 2018 08:22:11 -0700
Subject: [PATCH 0427/1703] docs: add links to workspace-config page

---
 packages/angular/cli/commands/build-long.md  |  2 +-
 packages/angular/cli/commands/config-long.md | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 packages/angular/cli/commands/config-long.md

diff --git a/packages/angular/cli/commands/build-long.md b/packages/angular/cli/commands/build-long.md
index c2fa222a7f8a..c3ac89bd3c4e 100644
--- a/packages/angular/cli/commands/build-long.md
+++ b/packages/angular/cli/commands/build-long.md
@@ -11,4 +11,4 @@ either by direct editing or with the `ng config` command.
 These include `assets`, `styles`, and `scripts` objects that provide runtime-global resources to include in the project. 
 Resources in CSS, such as images and fonts, are automatically written and fingerprinted at the root of the output folder.
 
-For further details, see Workspace Configuration.
+For further details, see [Workspace Configuration](guide/workspace-config).
diff --git a/packages/angular/cli/commands/config-long.md b/packages/angular/cli/commands/config-long.md
new file mode 100644
index 000000000000..cd812c58a201
--- /dev/null
+++ b/packages/angular/cli/commands/config-long.md
@@ -0,0 +1,11 @@
+A workspace has a single CLI configuration file, `angular.json`, at the top level. 
+The `projects` object contains a configuration object for each project in the workspace.
+
+You can edit the configuration directly in a code editor, 
+or indirectly on the command line using this command. 
+
+The configurable property names match command option names, 
+except that in the configuration file, all names must use camelCase, 
+while on the command line options can be given in either camelCase or dash-case.
+
+For further details, see [Workspace Configuration](guide/workspace-config).
\ No newline at end of file

From cf75a6401a8c4ffbb9e6e0ae93edb1b1c3ec97f3 Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Fri, 2 Nov 2018 08:24:51 -0700
Subject: [PATCH 0428/1703] docs: clarify library description

---
 packages/schematics/angular/library/library-long.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/angular/library/library-long.md b/packages/schematics/angular/library/library-long.md
index bac674dca23e..1fc87d47ede2 100644
--- a/packages/schematics/angular/library/library-long.md
+++ b/packages/schematics/angular/library/library-long.md
@@ -1,4 +1,5 @@
 A library is a type of project that does not run independently.
 The library skeleton created by this command is placed by default in the `/projects` folder, and has `type` of "library".
 
-You can build a new library using the `ng build` command, and unit-test it and lint it using the `ng test` and `ng lint` commands.
\ No newline at end of file
+You can build a new library using the `ng build` command, run unit test for it using the `ng test` command,
+and lint it using  and the `ng lint` command.
\ No newline at end of file

From 9da4bdca8109a8062f2fdecf68bf4ffc77d4dcbb Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Fri, 2 Nov 2018 12:35:54 -0700
Subject: [PATCH 0429/1703] docs: copy edit

Closes #12837.
Closes #12898.
---
 packages/angular/cli/commands/build-long.md         | 2 +-
 packages/angular/cli/commands/definitions.json      | 2 +-
 packages/angular/cli/commands/run-long.md           | 2 +-
 packages/angular/cli/commands/run.json              | 2 +-
 packages/schematics/angular/application/schema.json | 4 ++--
 packages/schematics/angular/component/schema.json   | 4 ++--
 packages/schematics/angular/e2e/e2e-long.md         | 3 ++-
 packages/schematics/angular/ng-new/schema.json      | 4 ++--
 packages/schematics/angular/service/schema.json     | 2 +-
 packages/schematics/angular/workspace/schema.json   | 6 +++---
 10 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/packages/angular/cli/commands/build-long.md b/packages/angular/cli/commands/build-long.md
index c3ac89bd3c4e..7913795c54b7 100644
--- a/packages/angular/cli/commands/build-long.md
+++ b/packages/angular/cli/commands/build-long.md
@@ -1,4 +1,4 @@
-Uses the Webpack build tool, with default configuration options specified in the workspace configuration file, `angular.json`, or with a named alternative configuration. 
+Uses the [webpack](https://webpack.js.org/) build tool, with default configuration options specified in the workspace configuration file (`angular.json`) or with a named alternative configuration. 
 A "production" configuration is created by default when you use the CLI to create the project, and you can use that configuration by specifying the `--prod` option.
 
 The configuration options generally correspond to the command options.
diff --git a/packages/angular/cli/commands/definitions.json b/packages/angular/cli/commands/definitions.json
index 504f23b9ea23..2adccc4a0693 100644
--- a/packages/angular/cli/commands/definitions.json
+++ b/packages/angular/cli/commands/definitions.json
@@ -21,7 +21,7 @@
           ]
         },
         "prod": {
-          "description": "When true, sets the build configuration to the production target.\nAll builds make use of bundling and limited tree-shaking, A production build also runs limited dead code elimination.",
+          "description": "When true, sets the build configuration to the production target.\nAll builds make use of bundling and limited tree-shaking. A production build also runs limited dead code elimination.",
           "type": "boolean"
         }
       }
diff --git a/packages/angular/cli/commands/run-long.md b/packages/angular/cli/commands/run-long.md
index 8f84cf47994a..5a02cf98cfae 100644
--- a/packages/angular/cli/commands/run-long.md
+++ b/packages/angular/cli/commands/run-long.md
@@ -1,5 +1,5 @@
 Architect is the tool that the CLI uses to perform complex tasks such as compilation, according to provided configurations.
-The CLI commands run Architect targets such as `build`, `serve`, `test` and `lint`.
+The CLI commands run Architect targets such as `build`, `serve`, `test`, and `lint`.
 Each named target has a default configuration, specified by an "options" object,
 and an optional set of named alternate configurations in the "configurations" object.
 
diff --git a/packages/angular/cli/commands/run.json b/packages/angular/cli/commands/run.json
index 86f132f8f1b1..4111cc014a67 100644
--- a/packages/angular/cli/commands/run.json
+++ b/packages/angular/cli/commands/run.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/run.json",
-  "description": "Runs an architect target with an optional custom builder configuration defined in your project.",
+  "description": "Runs an Architect target with an optional custom builder configuration defined in your project.",
   "$longDescription": "./run-long.md",
 
   "$aliases": [],
diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json
index ffe24eb1a38b..9dde81b57487 100644
--- a/packages/schematics/angular/application/schema.json
+++ b/packages/schematics/angular/application/schema.json
@@ -25,13 +25,13 @@
       "default": false
     },
     "inlineStyle": {
-      "description": "When true, includes styles inline in the root component TS file. Only CSS styles can be included inline. Default is false, meaning that an external styles file is created and referenced in the root component TS file.",
+      "description": "When true, includes styles inline in the root component.ts file. Only CSS styles can be included inline. Default is false, meaning that an external styles file is created and referenced in the root component.ts file.",
       "type": "boolean",
       "default": false,
       "alias": "s"
     },
     "inlineTemplate": {
-      "description": "When true, includes template inline in the root component TS file. Default is false, meaning that an external template file is created and referenced in the root component TS file. ",
+      "description": "When true, includes template inline in the root component.ts file. Default is false, meaning that an external template file is created and referenced in the root component.ts file. ",
       "type": "boolean",
       "default": false,
       "alias": "t"
diff --git a/packages/schematics/angular/component/schema.json b/packages/schematics/angular/component/schema.json
index 140b4313fe14..8df70ceb9135 100644
--- a/packages/schematics/angular/component/schema.json
+++ b/packages/schematics/angular/component/schema.json
@@ -28,13 +28,13 @@
       "x-prompt": "What name would you like to use for the component?"
     },
     "inlineStyle": {
-      "description": "When true, includes styles inline in the component TS file.  Only CSS styles can be included inline. By default, an external styles file is created and referenced in the component TS file.",
+      "description": "When true, includes styles inline in the component.ts file. Only CSS styles can be included inline. By default, an external styles file is created and referenced in the component.ts file.",
       "type": "boolean",
       "default": false,
       "alias": "s"
     },
     "inlineTemplate": {
-      "description": "When true, includes template inline in the component TS file. By default, an external template file is created and referenced in the component TS file.",
+      "description": "When true, includes template inline in the component.ts file. By default, an external template file is created and referenced in the component.ts file.",
       "type": "boolean",
       "default": false,
       "alias": "t"
diff --git a/packages/schematics/angular/e2e/e2e-long.md b/packages/schematics/angular/e2e/e2e-long.md
index ef1ba2e0b6c2..1831992c5512 100644
--- a/packages/schematics/angular/e2e/e2e-long.md
+++ b/packages/schematics/angular/e2e/e2e-long.md
@@ -1 +1,2 @@
-The e2e tests are created in a separate app, next to the project being tested in the `projects` folder of the workspace.
\ No newline at end of file
+The e2e tests are created in a separate app in the `projects` folder of the workspace,
+next to the project being tested.
\ No newline at end of file
diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
index 45bd6da58565..f577547de0c6 100644
--- a/packages/schematics/angular/ng-new/schema.json
+++ b/packages/schematics/angular/ng-new/schema.json
@@ -29,7 +29,7 @@
       "default": false
     },
     "linkCli": {
-      "description": "When true, links CLI to global version (internal development only).",
+      "description": "When true, links the CLI to the global version (internal development only).",
       "type": "boolean",
       "default": false,
       "visible": false
@@ -138,7 +138,7 @@
       "default": true
     },
     "minimal": {
-      "description": "When true, creates a barebones project without any testing frameworks.",
+      "description": "When true, creates a project without any testing frameworks.",
       "type": "boolean",
       "default": false
     }
diff --git a/packages/schematics/angular/service/schema.json b/packages/schematics/angular/service/schema.json
index 67f6b89610fa..c56b0fff0ade 100644
--- a/packages/schematics/angular/service/schema.json
+++ b/packages/schematics/angular/service/schema.json
@@ -30,7 +30,7 @@
     "flat": {
       "type": "boolean",
       "default": true,
-      "description": "When true (the default) creates files at the top level of the project."
+      "description": "When true (the default), creates files at the top level of the project."
     },
     "spec": {
       "type": "boolean",
diff --git a/packages/schematics/angular/workspace/schema.json b/packages/schematics/angular/workspace/schema.json
index 4ec31e77693b..b8d377dd76a6 100644
--- a/packages/schematics/angular/workspace/schema.json
+++ b/packages/schematics/angular/workspace/schema.json
@@ -24,13 +24,13 @@
       "default": false
     },
     "linkCli": {
-      "description": "When true, link CLI to global version (internal development only).",
+      "description": "When true, links the CLI to the global version (internal development only).",
       "type": "boolean",
       "default": false,
       "visible": false
     },
     "skipGit": {
-      "description": "When true, do not initialize a git repository.",
+      "description": "When true, does not initialize a git repository.",
       "type": "boolean",
       "default": false,
       "alias": "g"
@@ -70,7 +70,7 @@
       }
     },
     "minimal": {
-      "description": "When true, creates a bare-bones project without any testing frameworks",
+      "description": "When true, creates a project without any testing frameworks",
       "type": "boolean",
       "default": false
     }

From 456614828fbd1d7721e7a8964cd540e061bf82d1 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 1 Nov 2018 15:24:33 -0400
Subject: [PATCH 0430/1703] feat(@angular/cli): allow flags to have deprecation

The feature comes from the "x-deprecated" field in schemas (any schema that is used
to parse arguments), and can be a boolean or a string.

The parser now takes a logger and will warn users when encountering a deprecated
option. These options will also appear in JSON help.
---
 .../angular/cli/models/architect-command.ts   |  2 +-
 packages/angular/cli/models/command-runner.ts |  2 +-
 packages/angular/cli/models/interface.ts      |  6 +++
 packages/angular/cli/models/parser.ts         | 42 ++++++++++++++-----
 packages/angular/cli/models/parser_spec.ts    | 38 +++++++++++++++++
 .../angular/cli/models/schematic-command.ts   |  2 +-
 packages/angular/cli/utilities/json-schema.ts |  6 +++
 7 files changed, 84 insertions(+), 14 deletions(-)

diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index 2069e104ba6f..600e926d2e22 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -137,7 +137,7 @@ export abstract class ArchitectCommand<
     const builderConf = this._architect.getBuilderConfiguration(targetSpec);
     const builderDesc = await this._architect.getBuilderDescription(builderConf).toPromise();
     const targetOptionArray = await parseJsonSchemaToOptions(this._registry, builderDesc.schema);
-    const overrides = parseArguments(options, targetOptionArray);
+    const overrides = parseArguments(options, targetOptionArray, this.logger);
 
     if (overrides['--']) {
       (overrides['--'] || []).forEach(additional => {
diff --git a/packages/angular/cli/models/command-runner.ts b/packages/angular/cli/models/command-runner.ts
index 28a3c371f3be..a092540fbebb 100644
--- a/packages/angular/cli/models/command-runner.ts
+++ b/packages/angular/cli/models/command-runner.ts
@@ -182,7 +182,7 @@ export async function runCommand(
   }
 
   try {
-    const parsedOptions = parser.parseArguments(args, description.options);
+    const parsedOptions = parser.parseArguments(args, description.options, logger);
     Command.setCommandMap(commandMap);
     const command = new description.impl({ workspace }, description, logger);
 
diff --git a/packages/angular/cli/models/interface.ts b/packages/angular/cli/models/interface.ts
index 26e88f4beb80..48ae7ff7b0d3 100644
--- a/packages/angular/cli/models/interface.ts
+++ b/packages/angular/cli/models/interface.ts
@@ -144,6 +144,12 @@ export interface Option {
    */
   positional?: number;
 
+  /**
+   * Deprecation. If this flag is not false a warning will be shown on the console. Either `true`
+   * or a string to show the user as a notice.
+   */
+  deprecated?: boolean | string;
+
   /**
    * Smart default object.
    */
diff --git a/packages/angular/cli/models/parser.ts b/packages/angular/cli/models/parser.ts
index a06148581f51..27d07c263c75 100644
--- a/packages/angular/cli/models/parser.ts
+++ b/packages/angular/cli/models/parser.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  *
  */
-import { BaseException, strings } from '@angular-devkit/core';
+import { BaseException, logging, strings } from '@angular-devkit/core';
 import { Arguments, Option, OptionType, Value } from './interface';
 
 
@@ -112,12 +112,15 @@ function _getOptionFromName(name: string, options: Option[]): Option | undefined
 function _assignOption(
   arg: string,
   args: string[],
-  options: Option[],
-  parsedOptions: Arguments,
-  _positionals: string[],
-  leftovers: string[],
-  ignored: string[],
-  errors: string[],
+  { options, parsedOptions, leftovers, ignored, errors, deprecations }: {
+    options: Option[],
+    parsedOptions: Arguments,
+    positionals: string[],
+    leftovers: string[],
+    ignored: string[],
+    errors: string[],
+    deprecations: string[],
+  },
 ) {
   const from = arg.startsWith('--') ? 2 : 1;
   let key = arg.substr(from);
@@ -185,6 +188,11 @@ function _assignOption(
     const v = _coerce(value, option, parsedOptions[option.name]);
     if (v !== undefined) {
       parsedOptions[option.name] = v;
+
+      if (option.deprecated !== undefined && option.deprecated !== false) {
+        deprecations.push(`Option ${JSON.stringify(option.name)} is deprecated${
+            typeof option.deprecated == 'string' ? ': ' + option.deprecated : ''}.`);
+      }
     } else {
       let error = `Argument ${key} could not be parsed using value ${JSON.stringify(value)}.`;
       if (option.enum) {
@@ -258,9 +266,14 @@ export function parseFreeFormArguments(args: string[]): Arguments {
  *
  * @param args The argument array to parse.
  * @param options List of supported options. {@see Option}.
+ * @param logger Logger to use to warn users.
  * @returns An object that contains a property per option.
  */
-export function parseArguments(args: string[], options: Option[] | null): Arguments {
+export function parseArguments(
+  args: string[],
+  options: Option[] | null,
+  logger?: logging.Logger,
+): Arguments {
   if (options === null) {
     options = [];
   }
@@ -271,6 +284,9 @@ export function parseArguments(args: string[], options: Option[] | null): Argume
 
   const ignored: string[] = [];
   const errors: string[] = [];
+  const deprecations: string[] = [];
+
+  const state = { options, parsedOptions, positionals, leftovers, ignored, errors, deprecations };
 
   for (let arg = args.shift(); arg !== undefined; arg = args.shift()) {
     if (arg == '--') {
@@ -280,7 +296,7 @@ export function parseArguments(args: string[], options: Option[] | null): Argume
     }
 
     if (arg.startsWith('--')) {
-      _assignOption(arg, args, options, parsedOptions, positionals, leftovers, ignored, errors);
+      _assignOption(arg, args, state);
     } else if (arg.startsWith('-')) {
       // Argument is of form -abcdef.  Starts at 1 because we skip the `-`.
       for (let i = 1; i < arg.length; i++) {
@@ -288,14 +304,14 @@ export function parseArguments(args: string[], options: Option[] | null): Argume
         // If the next character is an '=', treat it as a long flag.
         if (arg[i + 1] == '=') {
           const f = '-' + flag + arg.slice(i + 1);
-          _assignOption(f, args, options, parsedOptions, positionals, leftovers, ignored, errors);
+          _assignOption(f, args, state);
           break;
         }
         // Treat the last flag as `--a` (as if full flag but just one letter). We do this in
         // the loop because it saves us a check to see if the arg is just `-`.
         if (i == arg.length - 1) {
           const arg = '-' + flag;
-          _assignOption(arg, args, options, parsedOptions, positionals, leftovers, ignored, errors);
+          _assignOption(arg, args, state);
         } else {
           const maybeOption = _getOptionFromName(flag, options);
           if (maybeOption) {
@@ -352,6 +368,10 @@ export function parseArguments(args: string[], options: Option[] | null): Argume
     parsedOptions['--'] = [...positionals, ...leftovers];
   }
 
+  if (deprecations.length > 0 && logger) {
+    deprecations.forEach(message => logger.warn(message));
+  }
+
   if (errors.length > 0) {
     throw new ParseArgumentException(errors, parsedOptions, ignored);
   }
diff --git a/packages/angular/cli/models/parser_spec.ts b/packages/angular/cli/models/parser_spec.ts
index 35440dcb34a5..24aa8fbaa248 100644
--- a/packages/angular/cli/models/parser_spec.ts
+++ b/packages/angular/cli/models/parser_spec.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  *
  */
+import { logging } from '@angular-devkit/core';
 import { Arguments, Option, OptionType } from './interface';
 import { ParseArgumentException, parseArguments } from './parser';
 
@@ -157,4 +158,41 @@ describe('parseArguments', () => {
       }
     });
   });
+
+  it('handles deprecation', () => {
+    const options = [
+      { name: 'bool', aliases: [], type: OptionType.Boolean, description: '' },
+      { name: 'depr', aliases: [], type: OptionType.Boolean, description: '', deprecated: true },
+      { name: 'deprM', aliases: [], type: OptionType.Boolean, description: '', deprecated: 'ABCD' },
+    ];
+
+    const logger = new logging.Logger('');
+    const messages: string[] = [];
+
+    logger.subscribe(entry => messages.push(entry.message));
+
+    let result = parseArguments(['--bool'], options, logger);
+    expect(result).toEqual({ bool: true });
+    expect(messages).toEqual([]);
+
+    result = parseArguments(['--depr'], options, logger);
+    expect(result).toEqual({ depr: true });
+    expect(messages.length).toEqual(1);
+    expect(messages[0]).toMatch(/\bdepr\b/);
+    messages.shift();
+
+    result = parseArguments(['--depr', '--bool'], options, logger);
+    expect(result).toEqual({ depr: true, bool: true });
+    expect(messages.length).toEqual(1);
+    expect(messages[0]).toMatch(/\bdepr\b/);
+    messages.shift();
+
+    result = parseArguments(['--depr', '--bool', '--deprM'], options, logger);
+    expect(result).toEqual({ depr: true, deprM: true, bool: true });
+    expect(messages.length).toEqual(2);
+    expect(messages[0]).toMatch(/\bdepr\b/);
+    expect(messages[1]).toMatch(/\bdeprM\b/);
+    expect(messages[1]).toMatch(/\bABCD\b/);
+    messages.shift();
+  });
 });
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index e25378040fb0..d22c7c3e3f85 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -533,7 +533,7 @@ export abstract class SchematicCommand<
     schematicOptions: string[],
     options: Option[] | null,
   ): Promise<Arguments> {
-    return parseArguments(schematicOptions, options);
+    return parseArguments(schematicOptions, options, this.logger);
   }
 
   private async _loadWorkspace() {
diff --git a/packages/angular/cli/utilities/json-schema.ts b/packages/angular/cli/utilities/json-schema.ts
index a857867490c6..434d24804d46 100644
--- a/packages/angular/cli/utilities/json-schema.ts
+++ b/packages/angular/cli/utilities/json-schema.ts
@@ -248,6 +248,11 @@ export async function parseJsonSchemaToOptions(
     const visible = current.visible === undefined || current.visible === true;
     const hidden = !!current.hidden || !visible;
 
+    // Deprecated is set only if it's true or a string.
+    const xDeprecated = current['x-deprecated'];
+    const deprecated = (xDeprecated === true || typeof xDeprecated == 'string')
+      ? xDeprecated : undefined;
+
     const option: Option = {
       name,
       description: '' + (current.description === undefined ? '' : current.description),
@@ -258,6 +263,7 @@ export async function parseJsonSchemaToOptions(
       aliases,
       ...format !== undefined ? { format } : {},
       hidden,
+      ...deprecated !== undefined ? { deprecated } : {},
       ...positional !== undefined ? { positional } : {},
     };
 

From 43aabb4be6847238472fbd002fc7aa0b17762ebd Mon Sep 17 00:00:00 2001
From: clydin <19598772+clydin@users.noreply.github.com>
Date: Wed, 14 Nov 2018 13:30:00 -0500
Subject: [PATCH 0431/1703] fix(@schematics/update): improve npmrc discovery
 (#12871)

* fix(@schematics/update): improve npmrc discovery

* feat(@angular/cli): support yarnrc options during update when using yarn
---
 package.json                                  |  3 +-
 packages/angular/cli/commands/update-impl.ts  |  4 +
 .../angular/cli/models/schematic-command.ts   |  8 +-
 packages/schematics/update/BUILD              |  2 +
 packages/schematics/update/package.json       |  2 +
 packages/schematics/update/update/index.ts    |  3 +-
 packages/schematics/update/update/npm.ts      | 96 +++++++++++--------
 packages/schematics/update/update/schema.json |  9 ++
 yarn.lock                                     |  9 +-
 9 files changed, 89 insertions(+), 47 deletions(-)

diff --git a/package.json b/package.json
index 81d0f892c300..e2313bd72561 100644
--- a/package.json
+++ b/package.json
@@ -93,6 +93,7 @@
     "@types/webpack": "^4.4.11",
     "@types/webpack-dev-server": "^3.1.0",
     "@types/webpack-sources": "^0.1.5",
+    "@yarnpkg/lockfile": "1.1.0",
     "ajv": "6.5.3",
     "common-tags": "^1.8.0",
     "conventional-changelog": "^1.1.0",
@@ -108,7 +109,7 @@
     "license-checker": "^20.1.0",
     "minimatch": "^3.0.4",
     "minimist": "^1.2.0",
-    "npm-registry-client": "^8.6.0",
+    "npm-registry-client": "8.6.0",
     "pacote": "^9.2.3",
     "pidtree": "^0.3.0",
     "pidusage": "^2.0.17",
diff --git a/packages/angular/cli/commands/update-impl.ts b/packages/angular/cli/commands/update-impl.ts
index e5f575db4dfb..389ee9728c0f 100644
--- a/packages/angular/cli/commands/update-impl.ts
+++ b/packages/angular/cli/commands/update-impl.ts
@@ -9,6 +9,7 @@ import { normalize } from '@angular-devkit/core';
 import { Arguments, Option } from '../models/interface';
 import { SchematicCommand } from '../models/schematic-command';
 import { findUp } from '../utilities/find-up';
+import { getPackageManager } from '../utilities/package-manager';
 import { Schema as UpdateCommandSchema } from './update';
 
 export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
@@ -50,6 +51,8 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
   }
 
   async run(options: UpdateCommandSchema & Arguments) {
+    const packageManager = getPackageManager(this.workspace.root);
+
     return this.runSchematic({
       collectionName: this.collectionName,
       schematicName: this.schematicName,
@@ -57,6 +60,7 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
       dryRun: !!options.dryRun,
       force: false,
       showNothingDone: false,
+      additionalOptions: { packageManager },
     });
   }
 }
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index d22c7c3e3f85..5b7c03259ba9 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -61,7 +61,7 @@ export interface BaseSchematicSchema {
 export interface RunSchematicOptions extends BaseSchematicSchema {
   collectionName: string;
   schematicName: string;
-
+  additionalOptions?: { [key: string]: {} };
   schematicOptions?: string[];
   showNothingDone?: boolean;
 }
@@ -443,7 +443,11 @@ export abstract class SchematicCommand<
     // Read the default values from the workspace.
     const projectName = input.project !== undefined ? '' + input.project : null;
     const defaults = getSchematicDefaults(collectionName, schematicName, projectName);
-    input = Object.assign<{}, {}, typeof input>({}, defaults, input);
+    input = {
+      ...defaults,
+      ...input,
+      ...options.additionalOptions,
+    };
 
     workflow.reporter.subscribe((event: DryRunEvent) => {
       nothingDone = false;
diff --git a/packages/schematics/update/BUILD b/packages/schematics/update/BUILD
index 57a171f12d9b..b429933d9a6a 100644
--- a/packages/schematics/update/BUILD
+++ b/packages/schematics/update/BUILD
@@ -67,6 +67,8 @@ ts_library(
         "@npm//@types/jasmine",
         "@npm//@types/node",
         "@npm//@types/semver",
+        "@npm//@yarnpkg/lockfile",
+        "@npm//ini",
         "@npm//pacote",
     ],
     testonly = True,
diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index eeccda4a9338..5d88f9179dd9 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -12,6 +12,8 @@
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
+    "@yarnpkg/lockfile": "1.1.0",
+    "ini": "1.3.5",
     "pacote": "9.1.1",
     "semver": "5.5.1",
     "semver-intersect": "1.4.0",
diff --git a/packages/schematics/update/update/index.ts b/packages/schematics/update/update/index.ts
index 4baf04372aa5..9a2ab9a55361 100644
--- a/packages/schematics/update/update/index.ts
+++ b/packages/schematics/update/update/index.ts
@@ -778,11 +778,12 @@ export default function(options: UpdateSchema): Rule {
     const logger = context.logger;
     const allDependencies = _getAllDependencies(tree);
     const packages = _buildPackageList(options, allDependencies, logger);
+    const usingYarn = options.packageManager === 'yarn';
 
     return observableFrom([...allDependencies.keys()]).pipe(
       // Grab all package.json from the npm repository. This requires a lot of HTTP calls so we
       // try to parallelize as many as possible.
-      mergeMap(depName => getNpmPackageJson(depName, options.registry, logger)),
+      mergeMap(depName => getNpmPackageJson(depName, options.registry, logger, usingYarn)),
 
       // Build a map of all dependencies and their packageJson.
       reduce<NpmRepositoryPackageJson, Map<string, NpmRepositoryPackageJson>>(
diff --git a/packages/schematics/update/update/npm.ts b/packages/schematics/update/update/npm.ts
index 4e26ddc5e8e4..a73cbfc4205e 100644
--- a/packages/schematics/update/update/npm.ts
+++ b/packages/schematics/update/update/npm.ts
@@ -6,68 +6,69 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { logging } from '@angular-devkit/core';
-import { readFileSync } from 'fs';
+import { existsSync, readFileSync } from 'fs';
+import { homedir } from 'os';
+import * as path from 'path';
 import { Observable, from } from 'rxjs';
 import { shareReplay } from 'rxjs/operators';
 import { NpmRepositoryPackageJson } from './npm-package-json';
 
+const ini = require('ini');
+const lockfile = require('@yarnpkg/lockfile');
 const pacote = require('pacote');
 
 const npmPackageJsonCache = new Map<string, Observable<NpmRepositoryPackageJson>>();
-
 let npmrc: { [key: string]: string };
-try {
-  npmrc = _readNpmRc();
-} catch {
-  npmrc = {};
-}
 
 
-function _readNpmRc(): { [key: string]: string } {
+function readOptions(yarn = false): { [key: string]: string } {
   // TODO: have a way to read options without using fs directly.
-  const path = require('path');
-  const fs = require('fs');
-  const perProjectNpmrc = path.resolve('.npmrc');
+  const cwd = process.cwd();
+  const baseFilename = yarn ? 'yarnrc' : 'npmrc';
+  const dotFilename = '.' + baseFilename;
 
-  const configs: string[] = [];
-
-  if (process.platform === 'win32') {
-    if (process.env.LOCALAPPDATA) {
-      configs.push(fs.readFileSync(path.join(process.env.LOCALAPPDATA, '.npmrc'), 'utf8'));
-    }
+  let globalPrefix: string;
+  if (process.env.PREFIX) {
+    globalPrefix = process.env.PREFIX;
   } else {
-    if (process.env.HOME) {
-      configs.push(fs.readFileSync(path.join(process.env.HOME, '.npmrc'), 'utf8'));
+    globalPrefix = path.dirname(process.execPath);
+    if (process.platform !== 'win32') {
+      globalPrefix = path.dirname(globalPrefix);
     }
   }
 
-  if (fs.existsSync(perProjectNpmrc)) {
-    configs.push(fs.readFileSync(perProjectNpmrc, 'utf8'));
-  }
-
-  const allOptions: { [key: string]: string } = {};
-  for (const config of configs) {
-    const allOptionsArr = config.split(/\r?\n/).map(x => x.trim());
+  const defaultConfigLocations = [
+    path.join(globalPrefix, 'etc', baseFilename),
+    path.join(homedir(), dotFilename),
+  ];
 
-    allOptionsArr.forEach(x => {
-      const [key, ...value] = x.split('=');
-      const fullValue = value.join('=').trim();
-      if (key && fullValue && fullValue !== 'null') {
-        allOptions[key.trim()] = fullValue;
+  const projectConfigLocations: string[] = [];
+  const root = path.parse(cwd).root;
+  for (let curDir = path.dirname(cwd); curDir && curDir !== root; curDir = path.dirname(curDir)) {
+    projectConfigLocations.unshift(path.join(curDir, dotFilename));
+  }
+  projectConfigLocations.push(path.join(cwd, dotFilename));
+
+  let options: { [key: string]: string } = {};
+  for (const location of [...defaultConfigLocations, ...projectConfigLocations]) {
+    if (existsSync(location)) {
+      const data = readFileSync(location, 'utf8');
+      options = {
+        ...options,
+        ...(yarn ? lockfile.parse(data) : ini.parse(data)),
+      };
+
+      if (options.cafile) {
+        const cafile = path.resolve(path.dirname(location), options.cafile);
+        delete options.cafile;
+        try {
+          options.ca = readFileSync(cafile, 'utf8').replace(/\r?\n/, '\\n');
+        } catch { }
       }
-    });
-
-    if (allOptions.cafile) {
-      const cafile = allOptions.cafile;
-      delete allOptions.cafile;
-      try {
-        allOptions.ca = readFileSync(cafile, 'utf8');
-        allOptions.ca = allOptions.ca.replace(/\r?\n/, '\\n');
-      } catch { }
     }
   }
 
-  return allOptions;
+  return options;
 }
 
 /**
@@ -82,12 +83,25 @@ export function getNpmPackageJson(
   packageName: string,
   registryUrl: string | undefined,
   _logger: logging.LoggerApi,
+  usingYarn = false,
 ): Observable<Partial<NpmRepositoryPackageJson>> {
   const cachedResponse = npmPackageJsonCache.get(packageName);
   if (cachedResponse) {
     return cachedResponse;
   }
 
+  if (!npmrc) {
+    try {
+      npmrc = readOptions();
+    } catch { }
+
+    if (usingYarn) {
+      try {
+        npmrc = { ...npmrc, ...readOptions(true) };
+      } catch { }
+    }
+  }
+
   const resultPromise = pacote.packument(
     packageName,
     {
diff --git a/packages/schematics/update/update/schema.json b/packages/schematics/update/update/schema.json
index 0c2c57040583..d5b020bf0fa3 100644
--- a/packages/schematics/update/update/schema.json
+++ b/packages/schematics/update/update/schema.json
@@ -53,6 +53,15 @@
           "format": "hostname"
         }
       ]
+    },
+    "packageManager": {
+      "description": "The preferred package manager configuration files to use for registry settings.",
+      "type": "string",
+      "default": "npm",
+      "enum": [
+        "npm",
+        "yarn"
+      ]
     }
   },
   "required": [
diff --git a/yarn.lock b/yarn.lock
index a9a2bf43324b..00c5d763dc13 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -735,6 +735,11 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
   integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
 
+"@yarnpkg/lockfile@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
+  integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
+
 JSONStream@^1.0.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.4.tgz#615bb2adb0cd34c8f4c447b5f6512fa1d8f16a2e"
@@ -4674,7 +4679,7 @@ inherits@2.0.1:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
   integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
-ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
+ini@1.3.5, ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
@@ -6792,7 +6797,7 @@ npm-pick-manifest@^2.1.0, npm-pick-manifest@^2.2.3:
     npm-package-arg "^6.0.0"
     semver "^5.4.1"
 
-npm-registry-client@^8.6.0:
+npm-registry-client@8.6.0:
   version "8.6.0"
   resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-8.6.0.tgz#7f1529f91450732e89f8518e0f21459deea3e4c4"
   integrity sha512-Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg==

From 62511a5209ff45ec55dcc395f8a327b963c690dc Mon Sep 17 00:00:00 2001
From: Emmanuel Demey <demey.emmanuel@gmail.com>
Date: Mon, 8 Oct 2018 13:19:37 +0200
Subject: [PATCH 0432/1703] fix(@schematics/angular): rename e2e PO utility
 function

---
 packages/schematics/angular/e2e/files/src/app.e2e-spec.ts       | 2 +-
 packages/schematics/angular/e2e/files/src/app.po.ts             | 2 +-
 .../build_angular/hello-world-app/e2e/app.e2e-spec.ts           | 2 +-
 .../angular_devkit/build_angular/hello-world-app/e2e/app.po.ts  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/angular/e2e/files/src/app.e2e-spec.ts b/packages/schematics/angular/e2e/files/src/app.e2e-spec.ts
index d097198b3f96..7f2323bf37cf 100644
--- a/packages/schematics/angular/e2e/files/src/app.e2e-spec.ts
+++ b/packages/schematics/angular/e2e/files/src/app.e2e-spec.ts
@@ -9,6 +9,6 @@ describe('workspace-project App', () => {
 
   it('should display welcome message', () => {
     page.navigateTo();
-    expect(page.getParagraphText()).toEqual('Welcome to <%= relatedAppName %>!');
+    expect(page.getTitleText()).toEqual('Welcome to <%= relatedAppName %>!');
   });
 });
diff --git a/packages/schematics/angular/e2e/files/src/app.po.ts b/packages/schematics/angular/e2e/files/src/app.po.ts
index a3db76a53158..e071a4c8b39e 100644
--- a/packages/schematics/angular/e2e/files/src/app.po.ts
+++ b/packages/schematics/angular/e2e/files/src/app.po.ts
@@ -5,7 +5,7 @@ export class AppPage {
     return browser.get('/');
   }
 
-  getParagraphText() {
+  getTitleText() {
     return element(by.css('<%= rootSelector %> h1')).getText();
   }
 }
diff --git a/tests/angular_devkit/build_angular/hello-world-app/e2e/app.e2e-spec.ts b/tests/angular_devkit/build_angular/hello-world-app/e2e/app.e2e-spec.ts
index 69dd6a1b7f89..05f1adf816da 100644
--- a/tests/angular_devkit/build_angular/hello-world-app/e2e/app.e2e-spec.ts
+++ b/tests/angular_devkit/build_angular/hello-world-app/e2e/app.e2e-spec.ts
@@ -16,6 +16,6 @@ describe('hello-world-app App', () => {
 
   it('should display welcome message', () => {
     page.navigateTo();
-    expect(page.getParagraphText()).toEqual('Welcome to app!');
+    expect(page.getTitleText()).toEqual('Welcome to app!');
   });
 });
diff --git a/tests/angular_devkit/build_angular/hello-world-app/e2e/app.po.ts b/tests/angular_devkit/build_angular/hello-world-app/e2e/app.po.ts
index 1b38c7c7fa33..04d4aa2b9143 100644
--- a/tests/angular_devkit/build_angular/hello-world-app/e2e/app.po.ts
+++ b/tests/angular_devkit/build_angular/hello-world-app/e2e/app.po.ts
@@ -12,7 +12,7 @@ export class AppPage {
     return browser.get('/');
   }
 
-  getParagraphText() {
+  getTitleText() {
     return element(by.css('app-root h1')).getText();
   }
 }

From 03829ac9fb459fd32154b7df7caf46a94ab36d41 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 29 Oct 2018 09:21:40 +0100
Subject: [PATCH 0433/1703] style: add comments in tslint.json

---
 tslint.json | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/tslint.json b/tslint.json
index 8f30ca45f5a1..e617a4d2236f 100644
--- a/tslint.json
+++ b/tslint.json
@@ -1,7 +1,7 @@
 {
-  "//00": "Consider using no-identical-functions and disabling in faulty tests",
-  "//01": "Consider using cognitive-complexity and refactor",
-  "//02": "Consider using no-useless-cast but it's annoying",
+  // Consider using no-identical-functions and disabling in faulty tests
+  // Consider using cognitive-complexity and refactor
+  // Consider using no-useless-cast but it's annoying
   "extends": [
     "tslint-no-circular-imports"
   ],
@@ -10,17 +10,15 @@
     "node_modules/tslint-sonarts/lib/rules"
   ],
   "rules": {
-    "//03": "==================================================================================================",
-    "//04": "custom rules defined in etc/rules/**",
+    // ==================================================================================================
+    // custom rules defined in etc/rules/**
     "defocus": true,
     "import-groups": true,
     "no-global-tslint-disable": true,
     "single-eof-line": true,
-    "//05": "==================================================================================================",
-
-    "//06": "==================================================================================================",
-    "//07": "tslint-sonarts rules. See https://github.com/SonarSource/SonarTS",
-    "//08": "These rules are part of the bug detection section of tslint-sonarts",
+    // ==================================================================================================
+    // tslint-sonarts rules. See https://github.com/SonarSource/SonarTS
+    // These rules are part of the bug detection section of tslint-sonarts
     "no-big-function": true,
     "no-all-duplicated-branches": true,
     "no-case-with-or": true,
@@ -38,13 +36,11 @@
     "no-use-of-empty-return-value": true,
     "no-useless-increment": true,
 
-    "//09": "These rules are part of the code smell detection section of tslint-sonarts",
+    //These rules are part of the code smell detection section of tslint-sonarts
     "no-dead-store": true,
     "no-useless-intersection": true,
-    "//10": "==================================================================================================",
-
-    "//11": "==================================================================================================",
-    "//12": "base tslint rules",
+    // ==================================================================================================
+    // base tslint rules
     "arrow-return-shorthand": true,
     "no-duplicate-imports": true,
     "no-angle-bracket-type-assertion": true,

From e18b912aa73f0e176c2373c12aa05bcc2650ba0c Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 14 Nov 2018 07:24:38 +0100
Subject: [PATCH 0434/1703] test: use `toContain` instead of `indexOf`

---
 .../angular/application/index_spec.ts         | 118 ++++++++++--------
 .../schematics/angular/class/index_spec.ts    |  14 +--
 .../angular/component/index_spec.ts           |  62 +++++----
 .../angular/directive/index_spec.ts           |  11 +-
 packages/schematics/angular/e2e/index_spec.ts |  14 ++-
 .../schematics/angular/enum/index_spec.ts     |   4 +-
 .../schematics/angular/guard/index_spec.ts    |  11 +-
 .../angular/interface/index_spec.ts           |   7 +-
 .../schematics/angular/library/index_spec.ts  |  26 ++--
 .../schematics/angular/module/index_spec.ts   |  12 +-
 .../schematics/angular/ng-new/index_spec.ts   |  16 +--
 .../schematics/angular/pipe/index_spec.ts     |  11 +-
 .../schematics/angular/service/index_spec.ts  |  11 +-
 .../angular/workspace/index_spec.ts           |  33 ++---
 14 files changed, 185 insertions(+), 165 deletions(-)

diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
index 9ddb893418c6..88b4c23ae487 100644
--- a/packages/schematics/angular/application/index_spec.ts
+++ b/packages/schematics/angular/application/index_spec.ts
@@ -44,23 +44,25 @@ describe('Application Schematic', () => {
 
     const tree = schematicRunner.runSchematic('application', options, workspaceTree);
     const files = tree.files;
-    expect(files.indexOf('/projects/foo/karma.conf.js')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/tsconfig.app.json')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/tsconfig.spec.json')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/tslint.json')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/environments/environment.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/environments/environment.prod.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/favicon.ico')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/index.html')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/main.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/polyfills.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/styles.css')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/test.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/app/app.module.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/app/app.component.css')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/app/app.component.html')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/app/app.component.spec.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/app/app.component.ts')).toBeGreaterThanOrEqual(0);
+    expect(files).toEqual(jasmine.arrayContaining([
+      '/projects/foo/karma.conf.js',
+      '/projects/foo/tsconfig.app.json',
+      '/projects/foo/tsconfig.spec.json',
+      '/projects/foo/tslint.json',
+      '/projects/foo/src/environments/environment.ts',
+      '/projects/foo/src/environments/environment.prod.ts',
+      '/projects/foo/src/favicon.ico',
+      '/projects/foo/src/index.html',
+      '/projects/foo/src/main.ts',
+      '/projects/foo/src/polyfills.ts',
+      '/projects/foo/src/styles.css',
+      '/projects/foo/src/test.ts',
+      '/projects/foo/src/app/app.module.ts',
+      '/projects/foo/src/app/app.component.css',
+      '/projects/foo/src/app/app.component.html',
+      '/projects/foo/src/app/app.component.spec.ts',
+      '/projects/foo/src/app/app.component.ts',
+    ]));
   });
 
   it('should add the application to the workspace', () => {
@@ -93,8 +95,8 @@ describe('Application Schematic', () => {
 
     const tree = schematicRunner.runSchematic('application', options, workspaceTree);
     const files = tree.files;
-    expect(files.indexOf('/projects/foo/src/app/app.module.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/app/app-routing.module.ts')).toBeGreaterThanOrEqual(0);
+    expect(files).toContain('/projects/foo/src/app/app.module.ts');
+    expect(files).toContain('/projects/foo/src/app/app-routing.module.ts');
     const moduleContent = tree.readContent('/projects/foo/src/app/app.module.ts');
     expect(moduleContent).toMatch(/import { AppRoutingModule } from '.\/app-routing.module'/);
     const routingModuleContent = tree.readContent('/projects/foo/src/app/app-routing.module.ts');
@@ -141,7 +143,7 @@ describe('Application Schematic', () => {
 
     const tree = schematicRunner.runSchematic('application', options, workspaceTree);
     const files = tree.files;
-    expect(files.indexOf('/projects/foo-e2e')).toEqual(-1);
+    expect(files).not.toContain('/projects/foo-e2e');
     const confContent = JSON.parse(tree.readContent('/angular.json'));
     expect(confContent.projects['foo-e2e']).toBeUndefined();
   });
@@ -150,24 +152,28 @@ describe('Application Schematic', () => {
     const options = { ...defaultOptions, minimal: true };
     const tree = schematicRunner.runSchematic('application', options, workspaceTree);
     const files = tree.files;
-
-    expect(files.indexOf('/projects/foo/karma.conf.js')).toBe(-1);
-    expect(files.indexOf('/projects/foo/tsconfig.app.json')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/tsconfig.spec.json')).toBe(-1);
-    expect(files.indexOf('/projects/foo/tslint.json')).toBe(-1);
-    expect(files.indexOf('/projects/foo/src/environments/environment.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/environments/environment.prod.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/favicon.ico')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/index.html')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/main.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/polyfills.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/styles.css')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/test.ts')).toBe(-1);
-    expect(files.indexOf('/projects/foo/src/app/app.module.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/app/app.component.css')).toBe(-1);
-    expect(files.indexOf('/projects/foo/src/app/app.component.html')).toBe(-1);
-    expect(files.indexOf('/projects/foo/src/app/app.component.spec.ts')).toBe(-1);
-    expect(files.indexOf('/projects/foo/src/app/app.component.ts')).toBeGreaterThanOrEqual(0);
+    [
+      '/projects/foo/tsconfig.spec.json',
+      '/projects/foo/tslint.json',
+      '/projects/foo/karma.conf.js',
+      '/projects/foo/src/test.ts',
+      '/projects/foo/src/app/app.component.css',
+      '/projects/foo/src/app/app.component.html',
+      '/projects/foo/src/app/app.component.spec.ts',
+    ].forEach(x => expect(files).not.toContain(x));
+
+    expect(files).toEqual(jasmine.arrayContaining([
+      '/projects/foo/tsconfig.app.json',
+      '/projects/foo/src/environments/environment.ts',
+      '/projects/foo/src/environments/environment.prod.ts',
+      '/projects/foo/src/favicon.ico',
+      '/projects/foo/src/index.html',
+      '/projects/foo/src/main.ts',
+      '/projects/foo/src/polyfills.ts',
+      '/projects/foo/src/styles.css',
+      '/projects/foo/src/app/app.module.ts',
+      '/projects/foo/src/app/app.component.ts',
+    ]));
   });
 
   describe(`update package.json`, () => {
@@ -215,23 +221,25 @@ describe('Application Schematic', () => {
 
       const tree = schematicRunner.runSchematic('application', options, workspaceTree);
       const files = tree.files;
-      expect(files.indexOf('/src/karma.conf.js')).toBeGreaterThanOrEqual(0);
-      expect(files.indexOf('/src/tsconfig.app.json')).toBeGreaterThanOrEqual(0);
-      expect(files.indexOf('/src/tsconfig.spec.json')).toBeGreaterThanOrEqual(0);
-      expect(files.indexOf('/src/tslint.json')).toBeGreaterThanOrEqual(0);
-      expect(files.indexOf('/src/environments/environment.ts')).toBeGreaterThanOrEqual(0);
-      expect(files.indexOf('/src/environments/environment.prod.ts')).toBeGreaterThanOrEqual(0);
-      expect(files.indexOf('/src/favicon.ico')).toBeGreaterThanOrEqual(0);
-      expect(files.indexOf('/src/index.html')).toBeGreaterThanOrEqual(0);
-      expect(files.indexOf('/src/main.ts')).toBeGreaterThanOrEqual(0);
-      expect(files.indexOf('/src/polyfills.ts')).toBeGreaterThanOrEqual(0);
-      expect(files.indexOf('/src/styles.css')).toBeGreaterThanOrEqual(0);
-      expect(files.indexOf('/src/test.ts')).toBeGreaterThanOrEqual(0);
-      expect(files.indexOf('/src/app/app.module.ts')).toBeGreaterThanOrEqual(0);
-      expect(files.indexOf('/src/app/app.component.css')).toBeGreaterThanOrEqual(0);
-      expect(files.indexOf('/src/app/app.component.html')).toBeGreaterThanOrEqual(0);
-      expect(files.indexOf('/src/app/app.component.spec.ts')).toBeGreaterThanOrEqual(0);
-      expect(files.indexOf('/src/app/app.component.ts')).toBeGreaterThanOrEqual(0);
+      expect(files).toEqual(jasmine.arrayContaining([
+        '/src/karma.conf.js',
+        '/src/tsconfig.app.json',
+        '/src/tsconfig.spec.json',
+        '/src/tslint.json',
+        '/src/environments/environment.ts',
+        '/src/environments/environment.prod.ts',
+        '/src/favicon.ico',
+        '/src/index.html',
+        '/src/main.ts',
+        '/src/polyfills.ts',
+        '/src/styles.css',
+        '/src/test.ts',
+        '/src/app/app.module.ts',
+        '/src/app/app.component.css',
+        '/src/app/app.component.html',
+        '/src/app/app.component.spec.ts',
+        '/src/app/app.component.ts',
+      ]));
     });
 
     it('should set values in angular.json correctly', () => {
diff --git a/packages/schematics/angular/class/index_spec.ts b/packages/schematics/angular/class/index_spec.ts
index 2c2ec6faf9b0..7408e6701551 100644
--- a/packages/schematics/angular/class/index_spec.ts
+++ b/packages/schematics/angular/class/index_spec.ts
@@ -47,8 +47,8 @@ describe('Class Schematic', () => {
 
   it('should create just the class file', () => {
     const tree = schematicRunner.runSchematic('class', defaultOptions, appTree);
-    expect(tree.files.indexOf('/projects/bar/src/app/foo.ts')).toBeGreaterThanOrEqual(0);
-    expect(tree.files.indexOf('/projects/bar/src/app/foo.spec.ts')).toBeLessThan(0);
+    expect(tree.files).toContain('/projects/bar/src/app/foo.ts');
+    expect(tree.files).not.toContain('/projects/bar/src/app/foo.spec.ts');
   });
 
   it('should create the class and spec file', () => {
@@ -57,8 +57,8 @@ describe('Class Schematic', () => {
       spec: true,
     };
     const tree = schematicRunner.runSchematic('class', options, appTree);
-    expect(tree.files.indexOf('/projects/bar/src/app/foo.ts')).toBeGreaterThanOrEqual(0);
-    expect(tree.files.indexOf('/projects/bar/src/app/foo.spec.ts')).toBeGreaterThanOrEqual(0);
+    expect(tree.files).toContain('/projects/bar/src/app/foo.ts');
+    expect(tree.files).toContain('/projects/bar/src/app/foo.spec.ts');
   });
 
   it('should create an class named "Foo"', () => {
@@ -71,7 +71,7 @@ describe('Class Schematic', () => {
     const options = { ...defaultOptions, type: 'model' };
 
     const tree = schematicRunner.runSchematic('class', options, appTree);
-    expect(tree.files.indexOf('/projects/bar/src/app/foo.model.ts')).toBeGreaterThanOrEqual(0);
+    expect(tree.files).toContain('/projects/bar/src/app/foo.model.ts');
   });
 
   it('should split the name to name & type with split on "."', () => {
@@ -85,7 +85,7 @@ describe('Class Schematic', () => {
   it('should respect the path option', () => {
     const options = { ...defaultOptions, path: 'zzz' };
     const tree = schematicRunner.runSchematic('class', options, appTree);
-    expect(tree.files.indexOf('/zzz/foo.ts')).toBeGreaterThanOrEqual(0);
+    expect(tree.files).toContain('/zzz/foo.ts');
   });
 
   it('should respect the sourceRoot value', () => {
@@ -93,6 +93,6 @@ describe('Class Schematic', () => {
     config.projects.bar.sourceRoot = 'projects/bar/custom';
     appTree.overwrite('/angular.json', JSON.stringify(config, null, 2));
     appTree = schematicRunner.runSchematic('class', defaultOptions, appTree);
-    expect(appTree.files.indexOf('/projects/bar/custom/app/foo.ts')).toBeGreaterThanOrEqual(0);
+    expect(appTree.files).toContain('/projects/bar/custom/app/foo.ts');
   });
 });
diff --git a/packages/schematics/angular/component/index_spec.ts b/packages/schematics/angular/component/index_spec.ts
index 84798ab1a305..e1e035a21206 100644
--- a/packages/schematics/angular/component/index_spec.ts
+++ b/packages/schematics/angular/component/index_spec.ts
@@ -57,10 +57,12 @@ describe('Component Schematic', () => {
     const options = { ...defaultOptions };
     const tree = schematicRunner.runSchematic('component', options, appTree);
     const files = tree.files;
-    expect(files.indexOf('/projects/bar/src/app/foo/foo.component.css')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/bar/src/app/foo/foo.component.html')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/bar/src/app/foo/foo.component.spec.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/bar/src/app/foo/foo.component.ts')).toBeGreaterThanOrEqual(0);
+    expect(files).toEqual(jasmine.arrayContaining([
+      '/projects/bar/src/app/foo/foo.component.css',
+      '/projects/bar/src/app/foo/foo.component.html',
+      '/projects/bar/src/app/foo/foo.component.spec.ts',
+      '/projects/bar/src/app/foo/foo.component.ts',
+    ]));
     const moduleContent = tree.readContent('/projects/bar/src/app/app.module.ts');
     expect(moduleContent).toMatch(/import.*Foo.*from '.\/foo\/foo.component'/);
     expect(moduleContent).toMatch(/declarations:\s*\[[^\]]+?,\r?\n\s+FooComponent\r?\n/m);
@@ -103,10 +105,12 @@ describe('Component Schematic', () => {
 
     const tree = schematicRunner.runSchematic('component', options, appTree);
     const files = tree.files;
-    expect(files.indexOf('/projects/bar/src/app/foo.component.css')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/bar/src/app/foo.component.html')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/bar/src/app/foo.component.spec.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/bar/src/app/foo.component.ts')).toBeGreaterThanOrEqual(0);
+    expect(files).toEqual(jasmine.arrayContaining([
+      '/projects/bar/src/app/foo.component.css',
+      '/projects/bar/src/app/foo.component.html',
+      '/projects/bar/src/app/foo.component.spec.ts',
+      '/projects/bar/src/app/foo.component.ts',
+    ]));
   });
 
   it('should find the closest module', () => {
@@ -170,19 +174,23 @@ describe('Component Schematic', () => {
     const tree = schematicRunner.runSchematic('component', options, appTree);
     let files = tree.files;
     let root = `/${pathOption}/foo/foo.component`;
-    expect(files.indexOf(`${root}.css`)).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf(`${root}.html`)).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf(`${root}.spec.ts`)).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf(`${root}.ts`)).toBeGreaterThanOrEqual(0);
+    expect(files).toEqual(jasmine.arrayContaining([
+      `${root}.css`,
+      `${root}.html`,
+      `${root}.spec.ts`,
+      `${root}.ts`,
+    ]));
 
     const options2 = { ...options, name: 'BAR' };
     const tree2 = schematicRunner.runSchematic('component', options2, tree);
     files = tree2.files;
     root = `/${pathOption}/bar/bar.component`;
-    expect(files.indexOf(`${root}.css`)).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf(`${root}.html`)).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf(`${root}.spec.ts`)).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf(`${root}.ts`)).toBeGreaterThanOrEqual(0);
+    expect(files).toEqual(jasmine.arrayContaining([
+      `${root}.css`,
+      `${root}.html`,
+      `${root}.spec.ts`,
+      `${root}.ts`,
+    ]));
   });
 
   it('should create a component in a sub-directory', () => {
@@ -191,10 +199,12 @@ describe('Component Schematic', () => {
     const tree = schematicRunner.runSchematic('component', options, appTree);
     const files = tree.files;
     const root = `/${options.path}/foo/foo.component`;
-    expect(files.indexOf(`${root}.css`)).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf(`${root}.html`)).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf(`${root}.spec.ts`)).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf(`${root}.ts`)).toBeGreaterThanOrEqual(0);
+    expect(files).toEqual(jasmine.arrayContaining([
+      `${root}.css`,
+      `${root}.html`,
+      `${root}.spec.ts`,
+      `${root}.ts`,
+    ]));
   });
 
   it('should use the prefix', () => {
@@ -227,7 +237,7 @@ describe('Component Schematic', () => {
     const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(content).toMatch(/template: /);
     expect(content).not.toMatch(/templateUrl: /);
-    expect(tree.files.indexOf('/projects/bar/src/app/foo/foo.component.html')).toEqual(-1);
+    expect(tree.files).not.toContain('/projects/bar/src/app/foo/foo.component.html');
   });
 
   it('should respect the inlineStyle option', () => {
@@ -236,7 +246,7 @@ describe('Component Schematic', () => {
     const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(content).toMatch(/styles: \[/);
     expect(content).not.toMatch(/styleUrls: /);
-    expect(tree.files.indexOf('/projects/bar/src/app/foo/foo.component.css')).toEqual(-1);
+    expect(tree.files).not.toContain('/projects/bar/src/app/foo/foo.component.css');
   });
 
   it('should respect the styleext option', () => {
@@ -244,9 +254,8 @@ describe('Component Schematic', () => {
     const tree = schematicRunner.runSchematic('component', options, appTree);
     const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(content).toMatch(/styleUrls: \['.\/foo.component.scss/);
-    expect(tree.files.indexOf('/projects/bar/src/app/foo/foo.component.scss'))
-      .toBeGreaterThanOrEqual(0);
-    expect(tree.files.indexOf('/projects/bar/src/app/foo/foo.component.css')).toEqual(-1);
+    expect(tree.files).toContain('/projects/bar/src/app/foo/foo.component.scss');
+    expect(tree.files).not.toContain('/projects/bar/src/app/foo/foo.component.css');
   });
 
   it('should use the module flag even if the module is a routing module', () => {
@@ -299,7 +308,6 @@ describe('Component Schematic', () => {
     // move the module
     appTree.rename('/projects/bar/src/app/app.module.ts', '/projects/bar/custom/app/app.module.ts');
     appTree = schematicRunner.runSchematic('component', defaultOptions, appTree);
-    expect(appTree.files.indexOf('/projects/bar/custom/app/foo/foo.component.ts'))
-      .toBeGreaterThanOrEqual(0);
+    expect(appTree.files).toContain('/projects/bar/custom/app/foo/foo.component.ts');
   });
 });
diff --git a/packages/schematics/angular/directive/index_spec.ts b/packages/schematics/angular/directive/index_spec.ts
index dbd0dbc680e7..750115183479 100644
--- a/packages/schematics/angular/directive/index_spec.ts
+++ b/packages/schematics/angular/directive/index_spec.ts
@@ -52,8 +52,8 @@ describe('Directive Schematic', () => {
 
     const tree = schematicRunner.runSchematic('directive', options, appTree);
     const files = tree.files;
-    expect(files.indexOf('/projects/bar/src/app/foo.directive.spec.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/bar/src/app/foo.directive.ts')).toBeGreaterThanOrEqual(0);
+    expect(files).toContain('/projects/bar/src/app/foo.directive.spec.ts');
+    expect(files).toContain('/projects/bar/src/app/foo.directive.ts');
     const moduleContent = tree.readContent('/projects/bar/src/app/app.module.ts');
     expect(moduleContent).toMatch(/import.*Foo.*from '.\/foo.directive'/);
     expect(moduleContent).toMatch(/declarations:\s*\[[^\]]+?,\r?\n\s+FooDirective\r?\n/m);
@@ -64,8 +64,8 @@ describe('Directive Schematic', () => {
 
     const tree = schematicRunner.runSchematic('directive', options, appTree);
     const files = tree.files;
-    expect(files.indexOf('/projects/bar/src/app/foo/foo.directive.spec.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/bar/src/app/foo/foo.directive.ts')).toBeGreaterThanOrEqual(0);
+    expect(files).toContain('/projects/bar/src/app/foo/foo.directive.spec.ts');
+    expect(files).toContain('/projects/bar/src/app/foo/foo.directive.ts');
   });
 
   it('should find the closest module', () => {
@@ -165,7 +165,6 @@ describe('Directive Schematic', () => {
     // move the module
     appTree.rename('/projects/bar/src/app/app.module.ts', '/projects/bar/custom/app/app.module.ts');
     appTree = schematicRunner.runSchematic('directive', defaultOptions, appTree);
-    expect(appTree.files.indexOf('/projects/bar/custom/app/foo.directive.ts'))
-      .toBeGreaterThanOrEqual(0);
+    expect(appTree.files).toContain('/projects/bar/custom/app/foo.directive.ts');
   });
 });
diff --git a/packages/schematics/angular/e2e/index_spec.ts b/packages/schematics/angular/e2e/index_spec.ts
index 204f3f941b89..6ac8e78036aa 100644
--- a/packages/schematics/angular/e2e/index_spec.ts
+++ b/packages/schematics/angular/e2e/index_spec.ts
@@ -35,18 +35,20 @@ describe('Application Schematic', () => {
   it('should create all files of an e2e application', () => {
     const tree = schematicRunner.runSchematic('e2e', defaultOptions, workspaceTree);
     const files = tree.files;
-    expect(files.indexOf('/projects/foo/protractor.conf.js')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/tsconfig.e2e.json')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/app.e2e-spec.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/app.po.ts')).toBeGreaterThanOrEqual(0);
+    expect(files).toEqual(jasmine.arrayContaining([
+      '/projects/foo/protractor.conf.js',
+      '/projects/foo/tsconfig.e2e.json',
+      '/projects/foo/src/app.e2e-spec.ts',
+      '/projects/foo/src/app.po.ts',
+    ]));
   });
 
   it('should create all files of an e2e application', () => {
     const options = {...defaultOptions, projectRoot: 'e2e'};
     const tree = schematicRunner.runSchematic('e2e', options, workspaceTree);
     const files = tree.files;
-    expect(files.indexOf('/projects/foo/protractor.conf.js')).toEqual(-1);
-    expect(files.indexOf('/e2e/protractor.conf.js')).toBeGreaterThanOrEqual(0);
+    expect(files).not.toContain('/projects/foo/protractor.conf.js');
+    expect(files).toContain('/e2e/protractor.conf.js');
   });
 
   it('should set the rootSelector in the app.po.ts', () => {
diff --git a/packages/schematics/angular/enum/index_spec.ts b/packages/schematics/angular/enum/index_spec.ts
index ec9bdd4c898c..ef1b03cf9478 100644
--- a/packages/schematics/angular/enum/index_spec.ts
+++ b/packages/schematics/angular/enum/index_spec.ts
@@ -45,7 +45,7 @@ describe('Enum Schematic', () => {
   it('should create an enumeration', () => {
     const tree = schematicRunner.runSchematic('enum', defaultOptions, appTree);
     const files = tree.files;
-    expect(files.indexOf('/projects/bar/src/app/foo.enum.ts')).toBeGreaterThanOrEqual(0);
+    expect(files).toContain('/projects/bar/src/app/foo.enum.ts');
   });
   it('should create an enumeration', () => {
     const tree = schematicRunner.runSchematic('enum', defaultOptions, appTree);
@@ -58,6 +58,6 @@ describe('Enum Schematic', () => {
     config.projects.bar.sourceRoot = 'projects/bar/custom';
     appTree.overwrite('/angular.json', JSON.stringify(config, null, 2));
     appTree = schematicRunner.runSchematic('enum', defaultOptions, appTree);
-    expect(appTree.files.indexOf('/projects/bar/custom/app/foo.enum.ts')).toBeGreaterThanOrEqual(0);
+    expect(appTree.files).toContain('/projects/bar/custom/app/foo.enum.ts');
   });
 });
diff --git a/packages/schematics/angular/guard/index_spec.ts b/packages/schematics/angular/guard/index_spec.ts
index 59527dd5014f..919b47b470b4 100644
--- a/packages/schematics/angular/guard/index_spec.ts
+++ b/packages/schematics/angular/guard/index_spec.ts
@@ -46,8 +46,8 @@ describe('Guard Schematic', () => {
   it('should create a guard', () => {
     const tree = schematicRunner.runSchematic('guard', defaultOptions, appTree);
     const files = tree.files;
-    expect(files.indexOf('/projects/bar/src/app/foo.guard.spec.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/bar/src/app/foo.guard.ts')).toBeGreaterThanOrEqual(0);
+    expect(files).toContain('/projects/bar/src/app/foo.guard.spec.ts');
+    expect(files).toContain('/projects/bar/src/app/foo.guard.ts');
   });
 
   it('should respect the spec flag', () => {
@@ -55,8 +55,8 @@ describe('Guard Schematic', () => {
 
     const tree = schematicRunner.runSchematic('guard', options, appTree);
     const files = tree.files;
-    expect(files.indexOf('/projects/bar/src/app/foo.guard.spec.ts')).toEqual(-1);
-    expect(files.indexOf('/projects/bar/src/app/foo.guard.ts')).toBeGreaterThanOrEqual(0);
+    expect(files).not.toContain('/projects/bar/src/app/foo.guard.spec.ts');
+    expect(files).toContain('/projects/bar/src/app/foo.guard.ts');
   });
 
   it('should respect the sourceRoot value', () => {
@@ -64,7 +64,6 @@ describe('Guard Schematic', () => {
     config.projects.bar.sourceRoot = 'projects/bar/custom';
     appTree.overwrite('/angular.json', JSON.stringify(config, null, 2));
     appTree = schematicRunner.runSchematic('guard', defaultOptions, appTree);
-    expect(appTree.files.indexOf('/projects/bar/custom/app/foo.guard.ts'))
-      .toBeGreaterThanOrEqual(0);
+    expect(appTree.files).toContain('/projects/bar/custom/app/foo.guard.ts');
   });
 });
diff --git a/packages/schematics/angular/interface/index_spec.ts b/packages/schematics/angular/interface/index_spec.ts
index 9ce9e8b41cb0..d64a823c18cb 100644
--- a/packages/schematics/angular/interface/index_spec.ts
+++ b/packages/schematics/angular/interface/index_spec.ts
@@ -46,7 +46,7 @@ describe('Interface Schematic', () => {
 
   it('should create one file', () => {
     const tree = schematicRunner.runSchematic('interface', defaultOptions, appTree);
-    expect(tree.files.indexOf('/projects/bar/src/app/foo.ts')).toBeGreaterThanOrEqual(0);
+    expect(tree.files).toContain('/projects/bar/src/app/foo.ts');
   });
 
   it('should create an interface named "Foo"', () => {
@@ -59,7 +59,7 @@ describe('Interface Schematic', () => {
     const options = { ...defaultOptions, type: 'model' };
 
     const tree = schematicRunner.runSchematic('interface', options, appTree);
-    expect(tree.files.indexOf('/projects/bar/src/app/foo.model.ts')).toBeGreaterThanOrEqual(0);
+    expect(tree.files).toContain('/projects/bar/src/app/foo.model.ts');
   });
 
   it('should respect the sourceRoot value', () => {
@@ -67,7 +67,6 @@ describe('Interface Schematic', () => {
     config.projects.bar.sourceRoot = 'projects/bar/custom';
     appTree.overwrite('/angular.json', JSON.stringify(config, null, 2));
     appTree = schematicRunner.runSchematic('interface', defaultOptions, appTree);
-    expect(appTree.files.indexOf('/projects/bar/custom/app/foo.ts'))
-      .toBeGreaterThanOrEqual(0);
+    expect(appTree.files).toContain('/projects/bar/custom/app/foo.ts');
   });
 });
diff --git a/packages/schematics/angular/library/index_spec.ts b/packages/schematics/angular/library/index_spec.ts
index 4ad5c4fe9a95..277d5eaec9f0 100644
--- a/packages/schematics/angular/library/index_spec.ts
+++ b/packages/schematics/angular/library/index_spec.ts
@@ -44,17 +44,19 @@ describe('Library Schematic', () => {
   it('should create files', () => {
     const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
     const files = tree.files;
-    expect(files.indexOf('/projects/foo/karma.conf.js')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/ng-package.json')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/package.json')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/tslint.json')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/test.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/my_index.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/lib/foo.module.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/lib/foo.component.spec.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/lib/foo.component.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/lib/foo.service.spec.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/foo/src/lib/foo.service.ts')).toBeGreaterThanOrEqual(0);
+    expect(files).toEqual(jasmine.arrayContaining([
+      '/projects/foo/karma.conf.js',
+      '/projects/foo/ng-package.json',
+      '/projects/foo/package.json',
+      '/projects/foo/tslint.json',
+      '/projects/foo/src/test.ts',
+      '/projects/foo/src/my_index.ts',
+      '/projects/foo/src/lib/foo.module.ts',
+      '/projects/foo/src/lib/foo.component.spec.ts',
+      '/projects/foo/src/lib/foo.component.ts',
+      '/projects/foo/src/lib/foo.service.spec.ts',
+      '/projects/foo/src/lib/foo.service.ts',
+    ]));
   });
 
   it('should create a package.json named "foo"', () => {
@@ -88,7 +90,7 @@ describe('Library Schematic', () => {
     const tree = schematicRunner.runSchematic('library', {
       name: 'foobar',
     }, workspaceTree);
-    expect(tree.files.indexOf('/projects/foobar/src/public_api.ts')).toBeGreaterThanOrEqual(0);
+    expect(tree.files).toContain('/projects/foobar/src/public_api.ts');
   });
 
   it(`should add library to workspace`, () => {
diff --git a/packages/schematics/angular/module/index_spec.ts b/packages/schematics/angular/module/index_spec.ts
index c267e591e669..f934f2dba520 100644
--- a/packages/schematics/angular/module/index_spec.ts
+++ b/packages/schematics/angular/module/index_spec.ts
@@ -49,7 +49,7 @@ describe('Module Schematic', () => {
 
     const tree = schematicRunner.runSchematic('module', options, appTree);
     const files = tree.files;
-    expect(files.indexOf('/projects/bar/src/app/foo/foo.module.ts')).toBeGreaterThanOrEqual(0);
+    expect(files).toContain('/projects/bar/src/app/foo/foo.module.ts');
   });
 
   it('should import into another module', () => {
@@ -94,8 +94,8 @@ describe('Module Schematic', () => {
 
     const tree = schematicRunner.runSchematic('module', options, appTree);
     const files = tree.files;
-    expect(files.indexOf('/projects/bar/src/app/foo/foo.module.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/bar/src/app/foo/foo-routing.module.ts')).toBeGreaterThanOrEqual(0);
+    expect(files).toContain('/projects/bar/src/app/foo/foo.module.ts');
+    expect(files).toContain('/projects/bar/src/app/foo/foo-routing.module.ts');
     const moduleContent = tree.readContent('/projects/bar/src/app/foo/foo.module.ts');
     expect(moduleContent).toMatch(/import { FooRoutingModule } from '.\/foo-routing.module'/);
     const routingModuleContent = tree.readContent('/projects/bar/src/app/foo/foo-routing.module.ts');
@@ -107,8 +107,7 @@ describe('Module Schematic', () => {
 
     const tree = schematicRunner.runSchematic('module', options, appTree);
     const files = tree.files;
-    expect(files.indexOf('/projects/bar/src/app/two-word/two-word.module.ts'))
-      .toBeGreaterThanOrEqual(0);
+    expect(files).toContain('/projects/bar/src/app/two-word/two-word.module.ts');
   });
 
   it('should respect the sourceRoot value', () => {
@@ -116,7 +115,6 @@ describe('Module Schematic', () => {
     config.projects.bar.sourceRoot = 'projects/bar/custom';
     appTree.overwrite('/angular.json', JSON.stringify(config, null, 2));
     appTree = schematicRunner.runSchematic('module', defaultOptions, appTree);
-    expect(appTree.files.indexOf('/projects/bar/custom/app/foo/foo.module.ts'))
-      .toBeGreaterThanOrEqual(0);
+    expect(appTree.files).toContain('/projects/bar/custom/app/foo/foo.module.ts');
   });
 });
diff --git a/packages/schematics/angular/ng-new/index_spec.ts b/packages/schematics/angular/ng-new/index_spec.ts
index efbf6daf6931..dfd5a3824066 100644
--- a/packages/schematics/angular/ng-new/index_spec.ts
+++ b/packages/schematics/angular/ng-new/index_spec.ts
@@ -25,7 +25,7 @@ describe('Ng New Schematic', () => {
 
     const tree = schematicRunner.runSchematic('ng-new', options);
     const files = tree.files;
-    expect(files.indexOf('/bar/angular.json')).toBeGreaterThanOrEqual(0);
+    expect(files).toContain('/bar/angular.json');
   });
 
   it('should create files of an application', () => {
@@ -33,9 +33,11 @@ describe('Ng New Schematic', () => {
 
     const tree = schematicRunner.runSchematic('ng-new', options);
     const files = tree.files;
-    expect(files.indexOf('/bar/src/tsconfig.app.json')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/bar/src/main.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/bar/src/app/app.module.ts')).toBeGreaterThanOrEqual(0);
+    expect(files).toEqual(jasmine.arrayContaining([
+      '/bar/src/tsconfig.app.json',
+      '/bar/src/main.ts',
+      '/bar/src/app/app.module.ts',
+    ]));
   });
 
   it('should should set the prefix in angular.json and in app.component.ts', () => {
@@ -62,8 +64,8 @@ describe('Ng New Schematic', () => {
 
     const tree = schematicRunner.runSchematic('ng-new', options);
     const files = tree.files;
-    expect(files.indexOf('/bar/angular.json')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/bar/src')).toBe(-1);
+    expect(files).toContain('/bar/angular.json');
+    expect(files).not.toContain('/bar/src');
   });
 
   it('minimal=true should not create e2e project', () => {
@@ -71,7 +73,7 @@ describe('Ng New Schematic', () => {
 
     const tree = schematicRunner.runSchematic('ng-new', options);
     const files = tree.files;
-    expect(files.indexOf('/bar/e2e')).toEqual(-1);
+    expect(files).not.toContain('/bar/e2e');
     const confContent = JSON.parse(tree.readContent('/bar/angular.json'));
     expect(confContent.projects['foo-e2e']).toBeUndefined();
   });
diff --git a/packages/schematics/angular/pipe/index_spec.ts b/packages/schematics/angular/pipe/index_spec.ts
index 4dee3b85f400..50263fd34c0c 100644
--- a/packages/schematics/angular/pipe/index_spec.ts
+++ b/packages/schematics/angular/pipe/index_spec.ts
@@ -52,8 +52,8 @@ describe('Pipe Schematic', () => {
 
     const tree = schematicRunner.runSchematic('pipe', options, appTree);
     const files = tree.files;
-    expect(files.indexOf('/projects/bar/src/app/foo.pipe.spec.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/bar/src/app/foo.pipe.ts')).toBeGreaterThanOrEqual(0);
+    expect(files).toContain('/projects/bar/src/app/foo.pipe.spec.ts');
+    expect(files).toContain('/projects/bar/src/app/foo.pipe.ts');
     const moduleContent = getFileContent(tree, '/projects/bar/src/app/app.module.ts');
     expect(moduleContent).toMatch(/import.*Foo.*from '.\/foo.pipe'/);
     expect(moduleContent).toMatch(/declarations:\s*\[[^\]]+?,\r?\n\s+FooPipe\r?\n/m);
@@ -92,8 +92,8 @@ describe('Pipe Schematic', () => {
 
     const tree = schematicRunner.runSchematic('pipe', options, appTree);
     const files = tree.files;
-    expect(files.indexOf('/projects/bar/src/app/foo/foo.pipe.spec.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/bar/src/app/foo/foo.pipe.ts')).toBeGreaterThanOrEqual(0);
+    expect(files).toContain('/projects/bar/src/app/foo/foo.pipe.spec.ts');
+    expect(files).toContain('/projects/bar/src/app/foo/foo.pipe.ts');
     const moduleContent = getFileContent(tree, '/projects/bar/src/app/app.module.ts');
     expect(moduleContent).toMatch(/import.*Foo.*from '.\/foo\/foo.pipe'/);
     expect(moduleContent).toMatch(/declarations:\s*\[[^\]]+?,\r?\n\s+FooPipe\r?\n/m);
@@ -120,7 +120,6 @@ describe('Pipe Schematic', () => {
     // move the module
     appTree.rename('/projects/bar/src/app/app.module.ts', '/projects/bar/custom/app/app.module.ts');
     appTree = schematicRunner.runSchematic('pipe', defaultOptions, appTree);
-    expect(appTree.files.indexOf('/projects/bar/custom/app/foo.pipe.ts'))
-      .toBeGreaterThanOrEqual(0);
+    expect(appTree.files).toContain('/projects/bar/custom/app/foo.pipe.ts');
   });
 });
diff --git a/packages/schematics/angular/service/index_spec.ts b/packages/schematics/angular/service/index_spec.ts
index 3b00027eaeff..57367a7b7dc4 100644
--- a/packages/schematics/angular/service/index_spec.ts
+++ b/packages/schematics/angular/service/index_spec.ts
@@ -49,8 +49,8 @@ describe('Service Schematic', () => {
 
     const tree = schematicRunner.runSchematic('service', options, appTree);
     const files = tree.files;
-    expect(files.indexOf('/projects/bar/src/app/foo/foo.service.spec.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/bar/src/app/foo/foo.service.ts')).toBeGreaterThanOrEqual(0);
+    expect(files).toContain('/projects/bar/src/app/foo/foo.service.spec.ts');
+    expect(files).toContain('/projects/bar/src/app/foo/foo.service.ts');
   });
 
   it('service should be tree-shakeable', () => {
@@ -66,8 +66,8 @@ describe('Service Schematic', () => {
 
     const tree = schematicRunner.runSchematic('service', options, appTree);
     const files = tree.files;
-    expect(files.indexOf('/projects/bar/src/app/foo/foo.service.ts')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/projects/bar/src/app/foo/foo.service.spec.ts')).toEqual(-1);
+    expect(files).toContain('/projects/bar/src/app/foo/foo.service.ts');
+    expect(files).not.toContain('/projects/bar/src/app/foo/foo.service.spec.ts');
   });
 
   it('should respect the sourceRoot value', () => {
@@ -75,7 +75,6 @@ describe('Service Schematic', () => {
     config.projects.bar.sourceRoot = 'projects/bar/custom';
     appTree.overwrite('/angular.json', JSON.stringify(config, null, 2));
     appTree = schematicRunner.runSchematic('service', defaultOptions, appTree);
-    expect(appTree.files.indexOf('/projects/bar/custom/app/foo/foo.service.ts'))
-      .toBeGreaterThanOrEqual(0);
+    expect(appTree.files).toContain('/projects/bar/custom/app/foo/foo.service.ts');
   });
 });
diff --git a/packages/schematics/angular/workspace/index_spec.ts b/packages/schematics/angular/workspace/index_spec.ts
index 3b80d61d15ab..488ff7b4faa5 100644
--- a/packages/schematics/angular/workspace/index_spec.ts
+++ b/packages/schematics/angular/workspace/index_spec.ts
@@ -25,13 +25,15 @@ describe('Workspace Schematic', () => {
 
     const tree = schematicRunner.runSchematic('workspace', options);
     const files = tree.files;
-    expect(files.indexOf('/.editorconfig')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/angular.json')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/.gitignore')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/package.json')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/README.md')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/tsconfig.json')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/tslint.json')).toBeGreaterThanOrEqual(0);
+    expect(files).toEqual(jasmine.arrayContaining([
+      '/.editorconfig',
+      '/angular.json',
+      '/.gitignore',
+      '/package.json',
+      '/README.md',
+      '/tsconfig.json',
+      '/tslint.json',
+    ]));
   });
 
   it('should set the name in package.json', () => {
@@ -58,12 +60,15 @@ describe('Workspace Schematic', () => {
   it('should create correct files when using minimal', () => {
     const tree = schematicRunner.runSchematic('workspace', { ...defaultOptions, minimal: true });
     const files = tree.files;
-    expect(files.indexOf('/angular.json')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/.gitignore')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/package.json')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/README.md')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/tsconfig.json')).toBeGreaterThanOrEqual(0);
-    expect(files.indexOf('/tslint.json')).toBe(-1);
-    expect(files.indexOf('/.editorconfig')).toBe(-1);
+    expect(files).toEqual(jasmine.arrayContaining([
+      '/angular.json',
+      '/.gitignore',
+      '/package.json',
+      '/README.md',
+      '/tsconfig.json',
+    ]));
+
+    expect(files).not.toContain('/tslint.json');
+    expect(files).not.toContain('/.editorconfig');
   });
 });

From 747b7519871dc574dbd3a2f76cbfdc97100b5070 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 9 Nov 2018 18:20:41 +0100
Subject: [PATCH 0435/1703] fix(@ngtools/webpack): update error message to
 reference templateUrl

Fixes #12693
---
 packages/ngtools/webpack/src/resource_loader.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/ngtools/webpack/src/resource_loader.ts b/packages/ngtools/webpack/src/resource_loader.ts
index f30994e21338..0497102da31c 100644
--- a/packages/ngtools/webpack/src/resource_loader.ts
+++ b/packages/ngtools/webpack/src/resource_loader.ts
@@ -49,7 +49,9 @@ export class WebpackResourceLoader {
 
     // Simple sanity check.
     if (filePath.match(/\.[jt]s$/)) {
-      return Promise.reject('Cannot use a JavaScript or TypeScript file for styleUrl.');
+      return Promise.reject(
+        'Cannot use a JavaScript or TypeScript file for styleUrl or templateUrl.',
+      );
     }
 
     const outputOptions = { filename: filePath };

From 1bd1889baca4bd1daf077291502443ac0011be59 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 9 Nov 2018 13:43:44 -0500
Subject: [PATCH 0436/1703] refactor(@ngtools/webpack): cleanup/optimize emit
 logic

---
 .../webpack/src/angular_compiler_plugin.ts    | 62 +++++++++----------
 1 file changed, 28 insertions(+), 34 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index af5a4c78ea69..dc1c7c9d75a4 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -327,12 +327,6 @@ export class AngularCompilerPlugin {
     return this._JitMode ? this._program as ts.Program : (this._program as Program).getTsProgram();
   }
 
-  private _getChangedTsFiles() {
-    return this._compilerHost.getChangedFilePaths()
-      .filter(k => (k.endsWith('.ts') || k.endsWith('.tsx')) && !k.endsWith('.d.ts'))
-      .filter(k => this._compilerHost.fileExists(k));
-  }
-
   updateChangedFileExtensions(extension: string) {
     if (extension) {
       this._changedFileExtensions.add(extension);
@@ -873,35 +867,16 @@ export class AngularCompilerPlugin {
     // Make a new program and load the Angular structure.
     await this._createOrUpdateProgram();
 
-    // Try to find lazy routes if we have an entry module.
-    // We need to run the `listLazyRoutes` the first time because it also navigates libraries
-    // and other things that we might miss using the (faster) findLazyRoutesInAst.
-    // Lazy routes modules will be read with compilerHost and added to the changed files.
+    // Find lazy routes
     const lazyRouteMap: LazyRouteMap = {
-      ... (this._entryModule || !this._JitMode ? this._listLazyRoutesFromProgram() : {}),
+      ...this._listLazyRoutesFromProgram(),
       ...this._options.additionalLazyModules,
     };
-
     this._processLazyRoutes(lazyRouteMap);
 
-    // Emit and report errors.
-
-    // We now have the final list of changed TS files.
-    // Go through each changed file and add transforms as needed.
-    const sourceFiles = this._getChangedTsFiles()
-      .map((fileName) => (this._getTsProgram() as ts.Program).getSourceFile(fileName))
-      // At this point we shouldn't need to filter out undefined files, because any ts file
-      // that changed should be emitted.
-      // But due to hostReplacementPaths there can be files (the environment files)
-      // that changed but aren't part of the compilation, specially on `ng test`.
-      // So we ignore missing source files files here.
-      // hostReplacementPaths needs to be fixed anyway to take care of the following issue.
-      // https://github.com/angular/angular-cli/issues/7305#issuecomment-332150230
-      .filter((x) => !!x) as ts.SourceFile[];
-
     // Emit files.
     time('AngularCompilerPlugin._update._emit');
-    const { emitResult, diagnostics } = this._emit(sourceFiles);
+    const { emitResult, diagnostics } = this._emit();
     timeEnd('AngularCompilerPlugin._update._emit');
 
     // Report diagnostics.
@@ -1042,7 +1017,7 @@ export class AngularCompilerPlugin {
   // This code mostly comes from `performCompilation` in `@angular/compiler-cli`.
   // It skips the program creation because we need to use `loadNgStructureAsync()`,
   // and uses CustomTransformers.
-  private _emit(sourceFiles: ts.SourceFile[]) {
+  private _emit() {
     time('AngularCompilerPlugin._emit');
     const program = this._program;
     const allDiagnostics: Array<ts.Diagnostic | Diagnostic> = [];
@@ -1053,19 +1028,33 @@ export class AngularCompilerPlugin {
     try {
       if (this._JitMode) {
         const tsProgram = program as ts.Program;
+        const changedTsFiles = new Set<string>();
 
         if (this._firstRun) {
           // Check parameter diagnostics.
           time('AngularCompilerPlugin._emit.ts.getOptionsDiagnostics');
           allDiagnostics.push(...tsProgram.getOptionsDiagnostics());
           timeEnd('AngularCompilerPlugin._emit.ts.getOptionsDiagnostics');
+        } else {
+          // generate a list of changed files for emit
+          // not needed on first run since a full program emit is required
+          for (const changedFile of this._compilerHost.getChangedFilePaths()) {
+            if (!changedFile.endsWith('.ts') && !changedFile.endsWith('.tsx')) {
+              continue;
+            }
+            // existing type definitions are not emitted
+            if (changedFile.endsWith('.d.ts')) {
+              continue;
+            }
+            changedTsFiles.add(changedFile);
+          }
         }
 
         allDiagnostics.push(...gatherDiagnostics(tsProgram, this._JitMode,
           'AngularCompilerPlugin._emit.ts', diagMode));
 
         if (!hasErrors(allDiagnostics)) {
-          if (this._firstRun || sourceFiles.length > 20) {
+          if (this._firstRun || changedTsFiles.size > 20) {
             emitResult = tsProgram.emit(
               undefined,
               undefined,
@@ -1075,15 +1064,20 @@ export class AngularCompilerPlugin {
             );
             allDiagnostics.push(...emitResult.diagnostics);
           } else {
-            sourceFiles.forEach((sf) => {
-              const timeLabel = `AngularCompilerPlugin._emit.ts+${sf.fileName}+.emit`;
+            for (const changedFile of changedTsFiles) {
+              const sourceFile = tsProgram.getSourceFile(changedFile);
+              if (!sourceFile) {
+                continue;
+              }
+
+              const timeLabel = `AngularCompilerPlugin._emit.ts+${sourceFile.fileName}+.emit`;
               time(timeLabel);
-              emitResult = tsProgram.emit(sf, undefined, undefined, undefined,
+              emitResult = tsProgram.emit(sourceFile, undefined, undefined, undefined,
                 { before: this._transformers },
               );
               allDiagnostics.push(...emitResult.diagnostics);
               timeEnd(timeLabel);
-            });
+            }
           }
         }
       } else {

From 83469c5387fd46eb5b2f368dc1ab522726def5aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs?= <vixximpred@gmail.com>
Date: Mon, 12 Nov 2018 09:54:23 +0100
Subject: [PATCH 0437/1703] style: update editorconfig website url (#12923)

---
 .editorconfig                                                   | 2 +-
 packages/schematics/angular/workspace/files/__dot__editorconfig | 2 +-
 .../angular_devkit/build_angular/hello-world-app/.editorconfig  | 2 +-
 tests/legacy-cli/e2e/assets/1.0-project/.editorconfig           | 2 +-
 tests/legacy-cli/e2e/assets/1.7-project/.editorconfig           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 36e19acf952e..1c658dfbc777 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,4 +1,4 @@
-# http://editorconfig.org
+# https://editorconfig.org
 
 root = true
 
diff --git a/packages/schematics/angular/workspace/files/__dot__editorconfig b/packages/schematics/angular/workspace/files/__dot__editorconfig
index 6e87a003da89..e89330a618c1 100644
--- a/packages/schematics/angular/workspace/files/__dot__editorconfig
+++ b/packages/schematics/angular/workspace/files/__dot__editorconfig
@@ -1,4 +1,4 @@
-# Editor configuration, see http://editorconfig.org
+# Editor configuration, see https://editorconfig.org
 root = true
 
 [*]
diff --git a/tests/angular_devkit/build_angular/hello-world-app/.editorconfig b/tests/angular_devkit/build_angular/hello-world-app/.editorconfig
index 6e87a003da89..e89330a618c1 100644
--- a/tests/angular_devkit/build_angular/hello-world-app/.editorconfig
+++ b/tests/angular_devkit/build_angular/hello-world-app/.editorconfig
@@ -1,4 +1,4 @@
-# Editor configuration, see http://editorconfig.org
+# Editor configuration, see https://editorconfig.org
 root = true
 
 [*]
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/.editorconfig b/tests/legacy-cli/e2e/assets/1.0-project/.editorconfig
index 6e87a003da89..e89330a618c1 100644
--- a/tests/legacy-cli/e2e/assets/1.0-project/.editorconfig
+++ b/tests/legacy-cli/e2e/assets/1.0-project/.editorconfig
@@ -1,4 +1,4 @@
-# Editor configuration, see http://editorconfig.org
+# Editor configuration, see https://editorconfig.org
 root = true
 
 [*]
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/.editorconfig b/tests/legacy-cli/e2e/assets/1.7-project/.editorconfig
index 6e87a003da89..e89330a618c1 100644
--- a/tests/legacy-cli/e2e/assets/1.7-project/.editorconfig
+++ b/tests/legacy-cli/e2e/assets/1.7-project/.editorconfig
@@ -1,4 +1,4 @@
-# Editor configuration, see http://editorconfig.org
+# Editor configuration, see https://editorconfig.org
 root = true
 
 [*]

From 26245c0c536394fc911d873000ef4bfa2d2ebce2 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 14 Nov 2018 06:26:57 +0100
Subject: [PATCH 0438/1703] docs: update long descriptions for test, e2e and
 lint

Closes #12930
---
 packages/angular/cli/commands/e2e-long.md  | 2 +-
 packages/angular/cli/commands/lint-long.md | 2 +-
 packages/angular/cli/commands/test-long.md | 2 ++
 packages/angular/cli/commands/test.json    | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 packages/angular/cli/commands/test-long.md

diff --git a/packages/angular/cli/commands/e2e-long.md b/packages/angular/cli/commands/e2e-long.md
index 028becbcde67..6b651df713d9 100644
--- a/packages/angular/cli/commands/e2e-long.md
+++ b/packages/angular/cli/commands/e2e-long.md
@@ -1,2 +1,2 @@
 Must be executed from within a workspace directory.
-When a project name is not supplied, the configured default e2e project of the workspace is used.
\ No newline at end of file
+When a project name is not supplied, it will execute for all projects.
\ No newline at end of file
diff --git a/packages/angular/cli/commands/lint-long.md b/packages/angular/cli/commands/lint-long.md
index 42bbc32f0051..03917ffb252e 100644
--- a/packages/angular/cli/commands/lint-long.md
+++ b/packages/angular/cli/commands/lint-long.md
@@ -1,4 +1,4 @@
 Takes the name of the project, as specified in the  `projects` section of the `angular.json` workspace configuration file.
-When a project name is not supplied, uses the configured `defaultProject` of the workspace.
+When a project name is not supplied, it will execute for all projects.
 
 The default linting tool is [TSLint](https://palantir.github.io/tslint/), and the default configuration is specified in the project's `tslint.json` file.
\ No newline at end of file
diff --git a/packages/angular/cli/commands/test-long.md b/packages/angular/cli/commands/test-long.md
new file mode 100644
index 000000000000..64dae312ab47
--- /dev/null
+++ b/packages/angular/cli/commands/test-long.md
@@ -0,0 +1,2 @@
+Takes the name of the project, as specified in the `projects` section of the `angular.json` workspace configuration file.
+When a project name is not supplied, it will execute for all projects.
\ No newline at end of file
diff --git a/packages/angular/cli/commands/test.json b/packages/angular/cli/commands/test.json
index 8e800f9cad5f..3b330a9cb71e 100644
--- a/packages/angular/cli/commands/test.json
+++ b/packages/angular/cli/commands/test.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/test.json",
   "description": "Runs unit tests in a project.",
-  "$longDescription": "",
+  "$longDescription": "./test-long.md",
 
   "$aliases": [ "t" ],
   "$scope": "in",

From 00141868ce4d3d1b788767ab62850cf6ed54cc18 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 12 Nov 2018 11:50:52 -0500
Subject: [PATCH 0439/1703] fix(@angular/cli): silence package manager not
 found messages

Fixes #12939
---
 .../angular/cli/utilities/package-manager.ts    | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/packages/angular/cli/utilities/package-manager.ts b/packages/angular/cli/utilities/package-manager.ts
index 31c7d4b54c35..bf948b1dda5f 100644
--- a/packages/angular/cli/utilities/package-manager.ts
+++ b/packages/angular/cli/utilities/package-manager.ts
@@ -10,10 +10,9 @@ import { existsSync } from 'fs';
 import { join } from 'path';
 import { getConfiguredPackageManager } from './config';
 
-
-export function supportsYarn(): boolean {
+function supports(name: string): boolean {
   try {
-    execSync('yarn --version');
+    execSync(`${name} --version`, { stdio: 'ignore' });
 
     return true;
   } catch {
@@ -21,14 +20,12 @@ export function supportsYarn(): boolean {
   }
 }
 
-export function supportsNpm(): boolean {
-  try {
-    execSync('npm --version');
+export function supportsYarn(): boolean {
+  return supports('yarn');
+}
 
-    return true;
-  } catch {
-    return false;
-  }
+export function supportsNpm(): boolean {
+  return supports('npm');
 }
 
 export function getPackageManager(root: string): string {

From 1dbd574714ea3348e4a66ca5f956bb771ce0aed5 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 14 Nov 2018 21:41:27 +0100
Subject: [PATCH 0440/1703] fix(@ngtools/webpack): Fix lazy loading (#12945)

* revert: fix(@ngtools/webpack): output consistent filename

This reverts commit df172bdc8af4caa1a908592a8b9400d31c81eeb0.

* refactor(@ngtools/webpack): remove RegExp for ngfactory

This RegExp is not needed as if it actually works it will break lazy loading as in case of AOT, the name should always be suffixed with ngfactory

https://github.com/angular/angular/blob/4c2ce4e8ba4c5ac5ce8754d67bc6603eaad4564a/packages/core/src/linker/system_js_ng_module_factory_loader.ts#L83
---
 .../build_angular/test/browser/lazy-module_spec_large.ts      | 4 ++--
 packages/ngtools/webpack/src/angular_compiler_plugin.ts       | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
index c6dbf303f186..001751bb86d2 100644
--- a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
@@ -142,7 +142,7 @@ describe('Browser Builder lazy modules', () => {
       tap((buildEvent) => expect(buildEvent.success).toBe(true)),
       tap(() => {
         expect(host.scopedSync()
-          .exists(join(outputPath, 'lazy-lazy-module.js'))).toBe(true);
+          .exists(join(outputPath, 'lazy-lazy-module-ngfactory.js'))).toBe(true);
       }),
     ).toPromise().then(done, done.fail);
   });
@@ -301,7 +301,7 @@ describe('Browser Builder lazy modules', () => {
     runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 2).pipe(
       tap((buildEvent) => expect(buildEvent.success).toBe(true)),
       tap(() => expect(host.scopedSync()
-        .exists(join(outputPath, 'src-app-lazy-lazy-module.js')))
+        .exists(join(outputPath, 'src-app-lazy-lazy-module-ngfactory.js')))
         .toBe(true)),
     ).toPromise().then(done, done.fail);
   });
diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index dc1c7c9d75a4..2174824cbe81 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -690,9 +690,8 @@ export class AngularCompilerPlugin {
               const dependencies = Object.keys(this._lazyRoutes)
                 .map((key) => {
                   const modulePath = this._lazyRoutes[key];
-                  const importPath = key.split('#')[0];
                   if (modulePath !== null) {
-                    const name = importPath.replace(/(\.ngfactory)?(\.(js|ts))?$/, '');
+                    const name = key.split('#')[0];
 
                     return new this._contextElementDependencyConstructor(modulePath, name);
                   } else {

From a2aba2866c0b594b6580f6709f919d283a9e21f9 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 13 Nov 2018 11:33:48 +0100
Subject: [PATCH 0441/1703] fix(@angular-devkit/core): handle drive only paths
 in windows

When normalized path will not have a trailing slash, and at the moment the RegExp for drive needs to match `\c\`

Fixes #12670
---
 packages/angular_devkit/core/src/virtual-fs/path.ts      | 6 ++++--
 packages/angular_devkit/core/src/virtual-fs/path_spec.ts | 8 ++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/core/src/virtual-fs/path.ts b/packages/angular_devkit/core/src/virtual-fs/path.ts
index 0fd5eb374116..a17ddb41e578 100644
--- a/packages/angular_devkit/core/src/virtual-fs/path.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/path.ts
@@ -298,9 +298,11 @@ export type PosixPath = string & {
 };
 
 export function asWindowsPath(path: Path): WindowsPath {
-  const drive = path.match(/^\/(\w)\/(.*)$/);
+  const drive = path.match(/^\/(\w)(?:\/(.*))?$/);
   if (drive) {
-    return `${drive[1]}:\\${drive[2].replace(/\//g, '\\')}` as WindowsPath;
+    const subPath = drive[2] ? drive[2].replace(/\//g, '\\') : '';
+
+    return `${drive[1]}:\\${subPath}` as WindowsPath;
   }
 
   return path.replace(/\//g, '\\') as WindowsPath;
diff --git a/packages/angular_devkit/core/src/virtual-fs/path_spec.ts b/packages/angular_devkit/core/src/virtual-fs/path_spec.ts
index fa63df2e7412..305b1ebbe63b 100644
--- a/packages/angular_devkit/core/src/virtual-fs/path_spec.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/path_spec.ts
@@ -8,6 +8,7 @@
 import {
   InvalidPathException,
   Path,
+  asWindowsPath,
   basename,
   dirname,
   join,
@@ -159,4 +160,11 @@ describe('path', () => {
     expect(basename(normalize('.'))).toBe('');
     expect(basename(normalize('./a/b/c'))).toBe('c');
   });
+
+  it('asWindowsPath', () => {
+    expect(asWindowsPath(normalize('c:/'))).toBe('c:\\');
+    expect(asWindowsPath(normalize('c:/b/'))).toBe('c:\\b');
+    expect(asWindowsPath(normalize('c:/b/c'))).toBe('c:\\b\\c');
+  });
+
 });

From 8f0d03b6c2e0991a778ac4416423fe91094467a4 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 14 Nov 2018 06:25:40 +0100
Subject: [PATCH 0442/1703] fix(@schematics/angular):
 `addSymbolToNgModuleMetadata` metadata without indent

At the moment, at least a single whitespace is required as otherwise the following error `Cannot read property '0' of null ` will be thrown

Fixes #12950
---
 packages/schematics/angular/utility/ast-utils.ts  |  6 +++---
 .../schematics/angular/utility/ast-utils_spec.ts  | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/angular/utility/ast-utils.ts b/packages/schematics/angular/utility/ast-utils.ts
index 2442f0661793..e81f85919149 100644
--- a/packages/schematics/angular/utility/ast-utils.ts
+++ b/packages/schematics/angular/utility/ast-utils.ts
@@ -455,8 +455,8 @@ export function addSymbolToNgModuleMetadata(
       position = node.getEnd();
       // Get the indentation of the last element, if any.
       const text = node.getFullText(source);
-      if (text.match('^\r?\r?\n')) {
-        toInsert = `,${text.match(/^\r?\n\s+/)[0]}${metadataField}: [${symbolName}]`;
+      if (text.match(/^\r?\r?\n/)) {
+        toInsert = `,${text.match(/^\r?\n\s*/)[0]}${metadataField}: [${symbolName}]`;
       } else {
         toInsert = `, ${metadataField}: [${symbolName}]`;
       }
@@ -469,7 +469,7 @@ export function addSymbolToNgModuleMetadata(
     // Get the indentation of the last element, if any.
     const text = node.getFullText(source);
     if (text.match(/^\r?\n/)) {
-      toInsert = `,${text.match(/^\r?\n(\r?)\s+/)[0]}${symbolName}`;
+      toInsert = `,${text.match(/^\r?\n(\r?)\s*/)[0]}${symbolName}`;
     } else {
       toInsert = `, ${symbolName}`;
     }
diff --git a/packages/schematics/angular/utility/ast-utils_spec.ts b/packages/schematics/angular/utility/ast-utils_spec.ts
index bd694b6499a3..21bd96d6e764 100644
--- a/packages/schematics/angular/utility/ast-utils_spec.ts
+++ b/packages/schematics/angular/utility/ast-utils_spec.ts
@@ -11,7 +11,11 @@ import { HostTree } from '@angular-devkit/schematics';
 import * as ts from 'typescript';
 import { Change, InsertChange } from '../utility/change';
 import { getFileContent } from '../utility/test';
-import { addExportToModule, addSymbolToNgModuleMetadata } from './ast-utils';
+import {
+  addDeclarationToModule,
+  addExportToModule,
+  addSymbolToNgModuleMetadata,
+} from './ast-utils';
 
 
 function getTsSource(path: string, content: string): ts.SourceFile {
@@ -73,6 +77,15 @@ describe('ast utils', () => {
     expect(output).toMatch(/exports: \[FooComponent\]/);
   });
 
+  it('should add declarations to module if not indented', () => {
+    moduleContent = tags.stripIndents`${moduleContent}`;
+    const source = getTsSource(modulePath, moduleContent);
+    const changes = addDeclarationToModule(source, modulePath, 'FooComponent', './foo.component');
+    const output = applyChanges(modulePath, moduleContent, changes);
+    expect(output).toMatch(/import { FooComponent } from '.\/foo.component';/);
+    expect(output).toMatch(/declarations: \[\nAppComponent,\nFooComponent\n\]/);
+  });
+
   it('should add metadata', () => {
     const source = getTsSource(modulePath, moduleContent);
     const changes = addSymbolToNgModuleMetadata(source, modulePath, 'imports', 'HelloWorld');

From aeb96a09135677fcdc9b8a618f42afac592087cb Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Tue, 13 Nov 2018 23:16:14 +0100
Subject: [PATCH 0443/1703] docs: typo in library command docs

---
 packages/schematics/angular/library/library-long.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/library/library-long.md b/packages/schematics/angular/library/library-long.md
index 1fc87d47ede2..61ebc6069133 100644
--- a/packages/schematics/angular/library/library-long.md
+++ b/packages/schematics/angular/library/library-long.md
@@ -2,4 +2,4 @@ A library is a type of project that does not run independently.
 The library skeleton created by this command is placed by default in the `/projects` folder, and has `type` of "library".
 
 You can build a new library using the `ng build` command, run unit test for it using the `ng test` command,
-and lint it using  and the `ng lint` command.
\ No newline at end of file
+and lint it using the `ng lint` command.
\ No newline at end of file

From b659f1eef612595f9179250b1eba57bf495bb732 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 14 Nov 2018 11:33:26 +0100
Subject: [PATCH 0444/1703] fix(@angular/cli): add missing `ngswConfigPath` to
 schema

---
 packages/angular/cli/lib/config/schema.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index bc544328d1d3..d4a139d7f7f5 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -752,6 +752,10 @@
               "description": "Generates a service worker config for production builds.",
               "default": false
             },
+            "ngswConfigPath": {
+              "type": "string",
+              "description": "Path to ngsw-config.json."
+            },
             "skipAppShell": {
               "type": "boolean",
               "description": "Flag to prevent building an app shell.",

From e5aea19a6a32a5c2b60b5f4a53efe164e34df6a3 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@umich.edu>
Date: Wed, 14 Nov 2018 13:16:56 -0800
Subject: [PATCH 0445/1703] release: v7.1.0-rc.0

---
 .monorepo.json | 76 +++++++++++++++++++++++++-------------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index 22a3ae846a35..9058b2a7f426 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,16 +42,16 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.11.0-beta.1",
-      "hash": "f828d4a3fa042a7feac4a48c86893375"
+      "version": "0.11.0-rc.0",
+      "hash": "5bfa9de2083bea5cbbea49d48a87e49a"
     },
     "@_/builders": {
-      "version": "0.11.0-beta.1",
-      "hash": "6983d21ece5e42aa536b50adfdceb56c"
+      "version": "0.11.0-rc.0",
+      "hash": "575504a90d567ed077e933519642be6f"
     },
     "devkit": {
-      "version": "0.11.0-beta.1",
-      "hash": "4415622db3803c68e2f496cb9614c3bb"
+      "version": "0.11.0-rc.0",
+      "hash": "24385ec699deb72d602dcab7234a850c"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -62,15 +62,15 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md"
         }
       ],
-      "version": "7.1.0-beta.1",
+      "version": "7.1.0-rc.0",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "028d5d132ab5ddc2c2b184620c363dfd"
+      "hash": "95f75fed987e54edd7128d0a0f9619a4"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.11.0-beta.1",
-      "hash": "5e02cbbfff8aa9430d295d3a9b6e3393",
+      "version": "0.11.0-rc.0",
+      "hash": "1c100bee84f5bca5f4bd08b715519425",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -81,21 +81,21 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.11.0-beta.1",
-      "hash": "d5593511032523b78fec1286fb2a1280",
+      "version": "0.11.0-rc.0",
+      "hash": "3e5084d27124e4d31eb7ea2c8b8bc182",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.11.0-beta.1",
-      "hash": "b84b66a87d913cc8a016f06cf3068d9b",
+      "version": "0.11.0-rc.0",
+      "hash": "445c678fb5882243b789f6d0e2463269",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
       "name": "Benchmark",
       "section": "Tooling",
-      "version": "1.0.0-beta.1",
-      "hash": "8570143472857348b74f4a4e83f76577"
+      "version": "1.0.0-rc.0",
+      "hash": "f1b5d598a9748e2b9ddeb06956d192d6"
     },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
@@ -105,8 +105,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.11.0-beta.1",
-      "hash": "db4b249af3423efe9d96e725de519a0b",
+      "version": "0.11.0-rc.0",
+      "hash": "f7a208e234574769498fc97802e33178",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -117,8 +117,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.11.0-beta.1",
-      "hash": "31c87a6c2130b704c316ddf43a4ee9b2",
+      "version": "0.11.0-rc.0",
+      "hash": "d742d683614e05e097558a3dcf6b7d85",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -129,8 +129,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.11.0-beta.1",
-      "hash": "34246eafb7b434b37490645f511a0e18",
+      "version": "0.11.0-rc.0",
+      "hash": "37947c7342c85b6c76bcb2c30dff0e32",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -141,9 +141,9 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.11.0-beta.1",
+      "version": "0.11.0-rc.0",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "fc3b66fcdbf673a7f9b1cedf2f665c70"
+      "hash": "7082fc772c44e13aeb5e6af55f81bb7a"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -153,8 +153,8 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "7.1.0-beta.1",
-      "hash": "41d8cb7821c8bfdfeab7dc142ac1cd2f",
+      "version": "7.1.0-rc.0",
+      "hash": "61c8d98cb6faa0ed05d6a2f54f8b8446",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -165,43 +165,43 @@
           "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "7.1.0-beta.1",
-      "hash": "6fc8334aed0a6f26e30f5ff98c123499",
+      "version": "7.1.0-rc.0",
+      "hash": "241304d0a05ce95082c22c894317be9f",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.11.0-beta.1",
-      "hash": "7212d320a60807d41f76cc3bde42378c",
+      "version": "0.11.0-rc.0",
+      "hash": "6a410ab5ada8a71f7429b5e6d0305d2d",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "7.1.0-beta.1",
+      "version": "7.1.0-rc.0",
       "section": "Misc",
-      "hash": "727cb9120ae625b3934ff155526c9618",
+      "hash": "9add1a8b73ad9a38947cb00a42a475f9",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "7.1.0-beta.1",
-      "hash": "ba246ac11ca98b48e8f738d3fcec5f6c",
+      "version": "7.1.0-rc.0",
+      "hash": "b8ffff36a742299d0a0e218b11ac3eb7",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.11.0-beta.1",
+      "version": "0.11.0-rc.0",
       "section": "Schematics",
-      "hash": "3fc55264935b9c01c160ea121a9ca534",
+      "hash": "e912ea1bae8ae64487e2d11f393bc4a1",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.11.0-beta.1",
+      "version": "0.11.0-rc.0",
       "section": "Schematics",
-      "hash": "1c6859b3d33ed3fb59c6572170d548c0",
+      "hash": "dbbc989101ade8492b8594dbc22267fc",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }

From 3c875a1148f68bbd510e49451edc36061cd2baa9 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 15 Nov 2018 11:52:58 +0100
Subject: [PATCH 0446/1703] refactor: deprecate `evalSourceMap`

This was previously done for build performance, however this is no needed anymore
---
 packages/angular_devkit/build_angular/src/browser/schema.d.ts  | 1 +
 packages/angular_devkit/build_angular/src/dev-server/index.ts  | 1 +
 .../angular_devkit/build_angular/src/dev-server/schema.json    | 3 ++-
 packages/angular_devkit/build_angular/src/karma/schema.json    | 3 ++-
 packages/angular_devkit/build_angular/src/server/schema.json   | 3 ++-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/browser/schema.d.ts b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
index 5b66793292ad..624ad7a52789 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
@@ -72,6 +72,7 @@ export interface BrowserBuilderSchema {
   vendorSourceMap?: boolean;
 
   /**
+    @deprecated
    * Output in-file eval sourcemaps.
    */
   evalSourceMap: boolean;
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index 893e04e00626..409115dacb54 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -51,6 +51,7 @@ export interface DevServerBuilderOptions {
   aot?: boolean;
   sourceMap?: boolean;
   vendorSourceMap?: boolean;
+  /**@deprecated */
   evalSourceMap?: boolean;
   vendorChunk?: boolean;
   commonChunk?: boolean;
diff --git a/packages/angular_devkit/build_angular/src/dev-server/schema.json b/packages/angular_devkit/build_angular/src/dev-server/schema.json
index d7416676358e..e2f5099fe589 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/schema.json
+++ b/packages/angular_devkit/build_angular/src/dev-server/schema.json
@@ -102,7 +102,8 @@
     },
     "evalSourceMap": {
       "type": "boolean",
-      "description": "Output in-file eval sourcemaps."
+      "description": "Output in-file eval sourcemaps.",
+      "x-deprecated": true
     },
     "vendorChunk": {
       "type": "boolean",
diff --git a/packages/angular_devkit/build_angular/src/karma/schema.json b/packages/angular_devkit/build_angular/src/karma/schema.json
index e000cb0905ee..3eabc45fab53 100644
--- a/packages/angular_devkit/build_angular/src/karma/schema.json
+++ b/packages/angular_devkit/build_angular/src/karma/schema.json
@@ -74,7 +74,8 @@
     },
     "evalSourceMap": {
       "type": "boolean",
-      "description": "Output in-file eval sourcemaps."
+      "description": "Output in-file eval sourcemaps.",
+      "x-deprecated": true
     },
     "progress": {
       "type": "boolean",
diff --git a/packages/angular_devkit/build_angular/src/server/schema.json b/packages/angular_devkit/build_angular/src/server/schema.json
index 119d4909b36c..5b6f1b6da789 100644
--- a/packages/angular_devkit/build_angular/src/server/schema.json
+++ b/packages/angular_devkit/build_angular/src/server/schema.json
@@ -57,7 +57,8 @@
     "evalSourceMap": {
       "type": "boolean",
       "description": "Output in-file eval sourcemaps.",
-      "default": false
+      "default": false,
+      "x-deprecated": true
     },
     "vendorChunk": {
       "type": "boolean",

From 67630f5270778fbc408f8449e0c286862fc5a942 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 15 Nov 2018 11:53:43 +0100
Subject: [PATCH 0447/1703] fix(@angular-devkit/build-angular): remove
 `skipAppShell` as it has no effect in browser builder

Closes #11478
---
 packages/angular_devkit/build_angular/src/browser/schema.d.ts | 1 +
 packages/angular_devkit/build_angular/src/browser/schema.json | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/browser/schema.d.ts b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
index 624ad7a52789..e6c30d7b0718 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
@@ -193,6 +193,7 @@ export interface BrowserBuilderSchema {
   ngswConfigPath?: string;
 
   /**
+   * @deprecated
    * Flag to prevent building an app shell.
    */
   skipAppShell: boolean;
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index ca7c2c0103b9..201844584f01 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -206,7 +206,8 @@
     "skipAppShell": {
       "type": "boolean",
       "description": "Flag to prevent building an app shell.",
-      "default": false
+      "default": false,
+      "x-deprecated": true
     },
     "index": {
       "type": "string",

From c631c1852f06d61e8293c1bd3533df199a612e36 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 12 Nov 2018 14:50:22 -0500
Subject: [PATCH 0448/1703] test: update angular test dependencies

---
 package.json                                  |   4 +-
 .../angular_devkit/build_angular/package.json |  26 ++--
 .../build_ng_packagr/package.json             |   4 +-
 packages/ngtools/webpack/package.json         |   4 +-
 yarn.lock                                     | 118 +++++++++---------
 5 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/package.json b/package.json
index e2313bd72561..dfafcefd6e02 100644
--- a/package.json
+++ b/package.json
@@ -73,8 +73,8 @@
     "yarn": "^1.10.1"
   },
   "devDependencies": {
-    "@angular/compiler": "^7.0.0-rc.0",
-    "@angular/compiler-cli": "^7.0.0-rc.0",
+    "@angular/compiler": "^7.0.3",
+    "@angular/compiler-cli": "^7.0.3",
     "@bazel/karma": "^0.20.3",
     "@bazel/typescript": "0.20.3",
     "@ngtools/json-schema": "^1.1.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 0011db8e7f9d..8edd6a986c37 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -57,19 +57,19 @@
     "node-sass": "4.10.0"
   },
   "devDependencies": {
-    "@angular/animations": "^7.0.0-rc.0",
-    "@angular/cdk": "^6.1.0",
-    "@angular/common": "^7.0.0-rc.0",
-    "@angular/compiler": "^7.0.0-rc.0",
-    "@angular/compiler-cli": "^7.0.0-rc.0",
-    "@angular/core": "^7.0.0-rc.0",
-    "@angular/http": "^7.0.0-rc.0",
-    "@angular/material": "^6.1.0",
-    "@angular/platform-browser": "^7.0.0-rc.0",
-    "@angular/platform-browser-dynamic": "^7.0.0-rc.0",
-    "@angular/platform-server": "^7.0.0-rc.0",
-    "@angular/router": "^7.0.0-rc.0",
-    "@angular/service-worker": "^7.0.0-rc.0",
+    "@angular/animations": "^7.0.3",
+    "@angular/cdk": "^7.0.3",
+    "@angular/common": "^7.0.3",
+    "@angular/compiler": "^7.0.3",
+    "@angular/compiler-cli": "^7.0.3",
+    "@angular/core": "^7.0.3",
+    "@angular/http": "^7.0.3",
+    "@angular/material": "^7.0.3",
+    "@angular/platform-browser": "^7.0.3",
+    "@angular/platform-browser-dynamic": "^7.0.3",
+    "@angular/platform-server": "^7.0.3",
+    "@angular/router": "^7.0.3",
+    "@angular/service-worker": "^7.0.3",
     "codelyzer": "^4.2.1",
     "core-js": "^2.4.1",
     "bootstrap": "^4.0.0",
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index 4b9668125eab..0d3d3007202c 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -15,8 +15,8 @@
     "ng-packagr": "^2.2.0 || ^3.0.0 || ^4.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "^7.0.0-rc.0",
-    "@angular/compiler-cli": "^7.0.0-rc.0",
+    "@angular/compiler": "^7.0.3",
+    "@angular/compiler-cli": "^7.0.3",
     "ng-packagr": "^4.2.0",
     "tsickle": ">=0.27.3",
     "tslib": "^1.9.0"
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index e3bc82d49ddd..0d4d45727ff6 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -33,8 +33,8 @@
     "webpack": "^4.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "^7.0.0-rc.0",
-    "@angular/compiler-cli": "^7.0.0-rc.0",
+    "@angular/compiler": "^7.0.3",
+    "@angular/compiler-cli": "^7.0.3",
     "typescript": "~3.1.6",
     "webpack": "^4.0.0"
   }
diff --git a/yarn.lock b/yarn.lock
index 00c5d763dc13..5fdfd88562cb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,33 +2,35 @@
 # yarn lockfile v1
 
 
-"@angular/animations@^7.0.0-rc.0":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.0.1.tgz#2df561c0959e156985297e69b7c30614537b4ffe"
-  integrity sha512-gRirN4Maduh198VhpI1cLoWCtD/BTQT4lPuwiVkHYaradiwEqPlyE+EP/4QZRmFZH+BqwvjS+FYtICznE668Cg==
+"@angular/animations@^7.0.3":
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.0.3.tgz#04bf1881e82b5b2eaf378728085ec12e83d67c72"
+  integrity sha512-jCRHlt+ghfSnP5a8HKr6R/Adc5Cq7i/mcYsn3V6M2QBpGFCVmy0ZWZa66QOhRaqler8u8EGi1PdoCCoGAZc4OA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cdk@^6.1.0":
-  version "6.4.7"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-6.4.7.tgz#1549b304dd412e82bd854cc55a7d5c6772ee0411"
-  integrity sha512-18x0U66fLD5kGQWZ9n3nb75xQouXlWs7kUDaTd8HTrHpT1s2QIAqlLd1KxfrYiVhsEC2jPQaoiae7VnBlcvkBg==
+"@angular/cdk@^7.0.3":
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.0.3.tgz#6f6ca3203470dfa91858a421d72c8e41765644e5"
+  integrity sha512-QT7U2tOBVfwn8Q71Nyh0UjlyXfZNKdanq3+b8GJ/+IB/d8mVdMRTXBGQ4PqY7CP+wpkgm+wbbUt3urZF1AqdmQ==
   dependencies:
     tslib "^1.7.1"
+  optionalDependencies:
+    parse5 "^5.0.0"
 
-"@angular/common@^7.0.0-rc.0":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.0.1.tgz#55750879f08d5f4b6f247f7dce0b5ea2b3ec2059"
-  integrity sha512-QnGwwM6+OLuzu0VZvzQMPENJQgOMmcjZC1vxWu5y62fPI3BsTDYaePOAEN6mfY8R09J90FmF2IXXC5DN/el0Ug==
+"@angular/common@^7.0.3":
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.0.3.tgz#c0056185251649264f0d3ee5a5a446549a8a1d78"
+  integrity sha512-aiuQh6+5kWFp34SYEtpnkAJWU3Qn17S/9LjWSZbgfiaYG6MyszepxqLZPBSBPTElxx2u5VoCPh97+TpKoDqx+g==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^7.0.0-rc.0":
-  version "7.0.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.0.0-rc.0.tgz#59f37f2409ce896cb73daa221dbd898855d12939"
-  integrity sha512-Nkd5UgSt0NHVLE/U3FIUmSJxGW47+9B4hfR5oDhC7gkUNaRQzi+PzzVYj7jOdDJjgHV+Y0KS3msiXWhUSY4gpw==
+"@angular/compiler-cli@^7.0.3":
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.0.3.tgz#5d2567056251a8417ad0154de5d6757fa502f837"
+  integrity sha512-8/SNgyce0Eqhfn8N/XkwSDSxTJryA+/EVLA68D2IopOSg/95u6GgYv3mVNNQnclSzC4g1FuK0zt4z0zRIWZ6JA==
   dependencies:
-    canonical-path "0.0.2"
+    canonical-path "1.0.0"
     chokidar "^1.4.2"
     convert-source-map "^1.5.1"
     dependency-graph "^0.7.2"
@@ -39,70 +41,68 @@
     source-map "^0.6.1"
     yargs "9.0.1"
 
-"@angular/compiler@^7.0.0-rc.0":
-  version "7.0.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.0.0-rc.0.tgz#2dfd293ad6583f9574c9fe79354256206f594a51"
-  integrity sha512-ifVqB/xJtSzOlk8B39Ld2wMbYni6Ey7s5jc+u/0NMtdut+2Q61Ar+TKjJZ3vmta3df7QqHX5JcP0W6qICRHJ+w==
+"@angular/compiler@^7.0.3":
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.0.3.tgz#c9bf049b92d37f9fec932698f52743c3be8ad6e7"
+  integrity sha512-1eF4PzWej9eoEQhHwuMxujx9B4oSjP70vORIs9pgXF8O4nWDWTKtfPQyNCPxc8mY+Fwb0+nSOEvvA+Ou8Hnreg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^7.0.0-rc.0":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.0.1.tgz#42f52bf04bf88759d4f4b9e03cb9b312508233a0"
-  integrity sha512-u/3Xx+tIddVC1wANjK1F102uG8fQrNd4Y9nlz3vtKcnFX66b2SQlnjWd18L8FmzYtzaI44RxSWWTPQB0eTx1xw==
+"@angular/core@^7.0.3":
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.0.3.tgz#e78e10c932fd6243b99723b76e23135b88e4f861"
+  integrity sha512-x/OYYykVsi2vrKlYQJ37I8HYAI/s/CtL3Sd9bl87F6AnqLWnnKIxQaofT/ShfAfdP44LQoN5BNp5j+sjs8K4Kg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^7.0.0-rc.0":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.0.1.tgz#54df0b7c6a5234d45a386bad81a64e0f1e85d666"
-  integrity sha512-3W5k5cSj9qj8jVU1EgtGKCxVcP1SH/LB5X34oVjtIEZBAESC8ZT1sYr+AvZLFs8Bw0EmqzQJ/hA2PziUZ2jsUw==
+"@angular/http@^7.0.3":
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.0.3.tgz#5447595d289ce5a9607c7bbecaddd954d9f0b068"
+  integrity sha512-aL+z1/tbVY8oJw5v46rbMli5vBGDVyJvs95d1l2n3hWnwMTzS9AVetjcL3B3uruAYuXoh4QlSJ+ysBgdmV1+IA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/material@^6.1.0":
-  version "6.4.7"
-  resolved "https://registry.yarnpkg.com/@angular/material/-/material-6.4.7.tgz#3c8f2d6a6a7904d97be29e06a84ffb62a8da6c16"
-  integrity sha512-SdNx7Xovi24Kw9eU6lkLhY/7f2M7L9F+/uh6XuPr4jbGgCUVVpeeVI5ztZhsZRbj1sN+/r1p5w8u62apWWl5Ww==
+"@angular/material@^7.0.3":
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/material/-/material-7.0.3.tgz#81df814ab4da7df4f0f7241852950795936d3cd5"
+  integrity sha512-acJ2zU44k/rsd4OeTdAMVP0R3te8aXwfubDQGc8YI1CdRVW1XqMSvAWkToYDVaGvnZV53zQt/iSi1XWaSXYf1Q==
   dependencies:
     tslib "^1.7.1"
-  optionalDependencies:
-    parse5 "^5.0.0"
 
-"@angular/platform-browser-dynamic@^7.0.0-rc.0":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.0.1.tgz#bf50a90573bc49e00e4bb8c08f6dee888f553e04"
-  integrity sha512-9pn+1lSxXXq6swrlAHlyufcy7sGolQklyrHm79kr6RXnl/hwEvxuFZQ+ki3bihdcUt9sgu3uPrw4I0a5TtzGhQ==
+"@angular/platform-browser-dynamic@^7.0.3":
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.0.3.tgz#cea2f3d2eb5b98305182a18aa700b4f3fa4b4c17"
+  integrity sha512-hrdBtlkKyq2CZRY6z2RWFTcGF4n4MirM7EEzByEjlgiXSU+c4qHYb0a8z30qdCF1D/DZ6Md7cRRH+1uR/rCqxQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^7.0.0-rc.0":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.0.1.tgz#d9638cb6592543018b96355a0119fc826ab5e27e"
-  integrity sha512-rGD9c6GN1oDdwy2FkcGKV11Pj3BFKGvnKByawv3S7DutrSgSF4LO529CFiGD0eMTCh2C/yzufC8pXngPj/XHUA==
+"@angular/platform-browser@^7.0.3":
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.0.3.tgz#9b02347a76db5a9ad42c2b9beaff078060168e39"
+  integrity sha512-OKDGce2dYw9Fw8agpcSNJA+ecMMnMQCi9xoPHNIp1pYdvte7mUXKUvUzR7chqQ7b83d7SzVeEhqAZYa4BUwFRA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-server@^7.0.0-rc.0":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.0.1.tgz#f284fbf90832a9fdefbba871faa50cec337822e2"
-  integrity sha512-XErcbHe/JMNIjJfhgfjLuWB0VkU262SLyziLNXn2VNnlQNxX4Km22c6CJgp190R1TvJqOYNW4G+qC+FFKtTmhA==
+"@angular/platform-server@^7.0.3":
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.0.3.tgz#53991ea16b4a88c5452a7e9ad7b45a274dce4d5d"
+  integrity sha512-yXcFwsym0zMjjIJmrD/w1vLr+Lk0MrqdBtl2MG289K65n3DLMP5YQL3vWB78x8G5MvGK+wxwEdTHNewSLELjEA==
   dependencies:
     domino "^2.1.0"
     tslib "^1.9.0"
     xhr2 "^0.1.4"
 
-"@angular/router@^7.0.0-rc.0":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.0.1.tgz#2085466c47a8efad576b4310db191c3e338cacef"
-  integrity sha512-1HhTsbwZYxXLgfd6g9Ok2UQjtRBttSaBkWdRM5hbisl3nMnnNOGEMF/B4/UrRQ7phqbUw4eKniUcZm/7UbK7EA==
+"@angular/router@^7.0.3":
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.0.3.tgz#7cf86ad1667a892998ec3670ab7ba0b2b373c24a"
+  integrity sha512-885svORDpD9DkaMKjvGwn4g5bf0n3JR8os+gCNhzk0p4TPfpc+vmNo8SyY2jwdLMh2rQzrUQTDkn9SzzgiOfDQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@^7.0.0-rc.0":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.0.1.tgz#773ad7e758e29a5ad8b5627636480a4c2d74568f"
-  integrity sha512-0gVCEEbV0GAZKFkLc/9oSNSzTeaB3oXUM3iskDdIM0542lRWMeOZXKV+UJHhVrJ2rJ4nB+cdN/Te7Yd0zPOZ8g==
+"@angular/service-worker@^7.0.3":
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.0.3.tgz#a3989fb3ed578aab10ca3eee31a6ae95cf6908db"
+  integrity sha512-LBiXMl/nBlCv2slPWzsPC0eNyDDOUHjEJsb+z3EbbeGO+IvhpOJcLiHaJhUV7piduJoX2WpssszOMOaJUUqbfA==
   dependencies:
     tslib "^1.9.0"
 
@@ -1815,10 +1815,10 @@ caniuse-lite@^1.0.30000898, caniuse-lite@^1.0.30000899:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000903.tgz#86d46227759279b3db345ddbe778335dbba9e858"
   integrity sha512-T1XVJEpGCoaq7MDw7/6hCdYUukmSaS+1l/OQJkLtw7Cr2+/+d67tNGKEbyiqf7Ck8x6EhNFUxjYFXXka0N/w5g==
 
-canonical-path@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-0.0.2.tgz#e31eb937a8c93ee2a01df1839794721902874574"
-  integrity sha1-4x65N6jJPuKgHfGDl5RyGQKHRXQ=
+canonical-path@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
+  integrity sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==
 
 capture-stack-trace@^1.0.0:
   version "1.0.1"

From 5e7f9950014c091e3ccfe469e55bbfc067281895 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 17 Oct 2018 13:51:48 -0400
Subject: [PATCH 0449/1703] fix(@angular/cli): improve architect command
 project parsing

---
 .../angular/cli/models/architect-command.ts   | 162 +++++++++++-------
 tests/legacy-cli/e2e/tests/basic/build.ts     |   5 +
 2 files changed, 105 insertions(+), 62 deletions(-)

diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index 600e926d2e22..61973decec6b 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -7,14 +7,13 @@
  */
 import {
   Architect,
-  BuilderConfiguration,
   TargetSpecifier,
 } from '@angular-devkit/architect';
 import { experimental, json, schema, tags } from '@angular-devkit/core';
 import { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node';
 import { parseJsonSchemaToOptions } from '../utilities/json-schema';
 import { BaseCommandOptions, Command } from './command';
-import { Arguments } from './interface';
+import { Arguments, Option } from './interface';
 import { parseArguments } from './parser';
 import { WorkspaceLoader } from './workspace-loader';
 
@@ -46,84 +45,123 @@ export abstract class ArchitectCommand<
 
     await this._loadWorkspaceAndArchitect();
 
-    if (!options.project && this.target) {
-      const projectNames = this.getProjectNamesByTarget(this.target);
-      const leftovers = options['--'];
-      if (projectNames.length > 1 && leftovers && leftovers.length > 0) {
-        // Verify that all builders are the same, otherwise error out (since the meaning of an
-        // option could vary from builder to builder).
-
-        const builders: string[] = [];
-        for (const projectName of projectNames) {
-          const targetSpec: TargetSpecifier = this._makeTargetSpecifier(options);
-          const targetDesc = this._architect.getBuilderConfiguration({
-            project: projectName,
-            target: targetSpec.target,
-          });
-
-          if (builders.indexOf(targetDesc.builder) == -1) {
-            builders.push(targetDesc.builder);
-          }
-        }
-
-        if (builders.length > 1) {
-          throw new Error(tags.oneLine`
-            Architect commands with command line overrides cannot target different builders. The
-            '${this.target}' target would run on projects ${projectNames.join()} which have the
-            following builders: ${'\n  ' + builders.join('\n  ')}
-          `);
-        }
+    if (!this.target) {
+      if (options.help) {
+        // This is a special case where we just return.
+        return;
       }
-    }
 
-    const targetSpec: TargetSpecifier = this._makeTargetSpecifier(options);
+      const specifier = this._makeTargetSpecifier(options);
+      if (!specifier.project || !specifier.target) {
+        throw new Error('Cannot determine project or target for command.');
+      }
 
-    if (this.target && !targetSpec.project) {
-      const projects = this.getProjectNamesByTarget(this.target);
+      return;
+    }
 
-      if (projects.length === 1) {
-        // If there is a single target, use it to parse overrides.
-        targetSpec.project = projects[0];
+    const commandLeftovers = options['--'];
+    let projectName = options.project;
+    const targetProjectNames: string[] = [];
+    for (const name of this._workspace.listProjectNames()) {
+      if (this._architect.listProjectTargets(name).includes(this.target)) {
+        targetProjectNames.push(name);
       }
     }
 
-    if ((!targetSpec.project || !targetSpec.target) && !this.multiTarget) {
-      if (options.help) {
-        // This is a special case where we just return.
-        return;
-      }
+    if (targetProjectNames.length === 0) {
+      throw new Error(`No projects support the '${this.target}' target.`);
+    }
 
-      throw new Error('Cannot determine project or target for Architect command.');
+    if (projectName && !targetProjectNames.includes(projectName)) {
+      throw new Error(`Project '${projectName}' does not support the '${this.target}' target.`);
     }
 
-    if (this.target) {
-      // Add options IF there's only one builder of this kind.
-      const targetSpec: TargetSpecifier = this._makeTargetSpecifier(options);
-      const projectNames = targetSpec.project
-        ? [targetSpec.project]
-        : this.getProjectNamesByTarget(this.target);
-
-      const builderConfigurations: BuilderConfiguration[] = [];
-      for (const projectName of projectNames) {
-        const targetDesc = this._architect.getBuilderConfiguration({
-          project: projectName,
-          target: targetSpec.target,
+    if (!projectName && commandLeftovers && commandLeftovers.length > 0) {
+      const builderNames = new Set<string>();
+      const leftoverMap = new Map<string, { optionDefs: Option[], parsedOptions: Arguments }>();
+      let potentialProjectNames = new Set<string>(targetProjectNames);
+      for (const name of targetProjectNames) {
+        const builderConfig = this._architect.getBuilderConfiguration({
+          project: name,
+          target: this.target,
         });
 
-        if (!builderConfigurations.find(b => b.builder === targetDesc.builder)) {
-          builderConfigurations.push(targetDesc);
+        if (this.multiTarget) {
+          builderNames.add(builderConfig.builder);
         }
+
+        const builderDesc = await this._architect.getBuilderDescription(builderConfig).toPromise();
+        const optionDefs = await parseJsonSchemaToOptions(this._registry, builderDesc.schema);
+        const parsedOptions = parseArguments([...commandLeftovers], optionDefs);
+        const builderLeftovers = parsedOptions['--'] || [];
+        leftoverMap.set(name, { optionDefs, parsedOptions });
+
+        potentialProjectNames = new Set(builderLeftovers.filter(x => potentialProjectNames.has(x)));
       }
 
-      if (builderConfigurations.length == 1) {
-        const builderConf = builderConfigurations[0];
-        const builderDesc = await this._architect.getBuilderDescription(builderConf).toPromise();
+      if (potentialProjectNames.size === 1) {
+        projectName = [...potentialProjectNames][0];
+
+        // remove the project name from the leftovers
+        const optionInfo = leftoverMap.get(projectName);
+        if (optionInfo) {
+          const locations = [];
+          let i = 0;
+          while (i < commandLeftovers.length) {
+            i = commandLeftovers.indexOf(projectName, i + 1);
+            if (i === -1) {
+              break;
+            }
+            locations.push(i);
+          }
+          delete optionInfo.parsedOptions['--'];
+          for (const location of locations) {
+            const tempLeftovers = [...commandLeftovers];
+            tempLeftovers.splice(location, 1);
+            const tempArgs = parseArguments([...tempLeftovers], optionInfo.optionDefs);
+            delete tempArgs['--'];
+            if (JSON.stringify(optionInfo.parsedOptions) === JSON.stringify(tempArgs)) {
+              options['--'] = tempLeftovers;
+              break;
+            }
+          }
+        }
+      }
+
+      if (!projectName && this.multiTarget && builderNames.size > 1) {
+        throw new Error(tags.oneLine`
+          Architect commands with command line overrides cannot target different builders. The
+          '${this.target}' target would run on projects ${targetProjectNames.join()} which have the
+          following builders: ${'\n  ' + [...builderNames].join('\n  ')}
+        `);
+      }
+    }
 
-        this.description.options.push(...(
-          await parseJsonSchemaToOptions(this._registry, builderDesc.schema)
-        ));
+    if (!projectName && !this.multiTarget) {
+      const defaultProjectName = this._workspace.getDefaultProjectName();
+      if (targetProjectNames.length === 1) {
+        projectName = targetProjectNames[0];
+      } else if (defaultProjectName && targetProjectNames.includes(defaultProjectName)) {
+        projectName = defaultProjectName;
+      } else if (options.help) {
+        // This is a special case where we just return.
+        return;
+      } else {
+        throw new Error('Cannot determine project or target for command.');
       }
     }
+
+    options.project = projectName;
+
+    const builderConf = this._architect.getBuilderConfiguration({
+      project: projectName || (targetProjectNames.length > 0 ? targetProjectNames[0] : ''),
+      target: this.target,
+    });
+    const builderDesc = await this._architect.getBuilderDescription(builderConf).toPromise();
+
+    this.description.options.push(...(
+      await parseJsonSchemaToOptions(this._registry, builderDesc.schema)
+    ));
   }
 
   async run(options: ArchitectCommandOptions & Arguments) {
diff --git a/tests/legacy-cli/e2e/tests/basic/build.ts b/tests/legacy-cli/e2e/tests/basic/build.ts
index 4473ca62d94f..94825cf0dc92 100644
--- a/tests/legacy-cli/e2e/tests/basic/build.ts
+++ b/tests/legacy-cli/e2e/tests/basic/build.ts
@@ -7,10 +7,15 @@ export default async function() {
   await ng('build');
   await expectFileToMatch('dist/test-project/index.html', 'main.js');
 
+  // Named Development build
+  await ng('build', 'test-project');
+  await ng('build', 'test-project', '--no-progress');
+  await ng('build', '--no-progress', 'test-project');
 
   // Production build
   await ng('build', '--prod');
   await expectFileToMatch('dist/test-project/index.html', /main\.[a-zA-Z0-9]{20}\.js/);
+  await ng('build', '--prod', '--no-progress', 'test-project');
 
   // Store the production build for artifact storage on CircleCI
   if (process.env['CIRCLECI']) {

From a38566f18e4e9749d51a536f8818c99f3287f48c Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 15 Nov 2018 16:30:37 +0100
Subject: [PATCH 0450/1703] feat(@angular-devkit/build-angular): add option to
 allow outputting css resources to a different folder

Added `resourcesOutputPath` option so that CSS assets such as images and fonts are outputted to a subfolder in `dist`
---
 .../angular-cli-files/models/build-options.ts |   1 +
 .../models/webpack-configs/styles.ts          |   2 +
 .../plugins/postcss-cli-resources.ts          |   8 +-
 .../build_angular/src/browser/schema.d.ts     |   5 +
 .../build_angular/src/browser/schema.json     |   5 +
 .../build_angular/src/server/schema.d.ts      |   4 +
 .../build_angular/src/server/schema.json      |   5 +
 .../resources-output-path_spec_large.ts       | 108 ++++++++++++++++++
 8 files changed, 137 insertions(+), 1 deletion(-)
 create mode 100644 packages/angular_devkit/build_angular/test/browser/resources-output-path_spec_large.ts

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
index 5a33f1e32913..8e8e6df74dde 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
@@ -21,6 +21,7 @@ export interface BuildOptions {
   optimization: boolean;
   environment?: string;
   outputPath: string;
+  resourcesOutputPath?: string;
   aot?: boolean;
   sourceMap?: boolean;
   vendorSourceMap?: boolean;
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
index b468dbd8ad7e..436fb0ba9159 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
@@ -47,6 +47,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
   // Convert absolute resource URLs to account for base-href and deploy-url.
   const baseHref = wco.buildOptions.baseHref || '';
   const deployUrl = wco.buildOptions.deployUrl || '';
+  const resourcesOutputPath = buildOptions.resourcesOutputPath || '';
 
   const postcssPluginCreator = function (loader: webpack.loader.LoaderContext) {
     return [
@@ -70,6 +71,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
       PostcssCliResources({
         baseHref,
         deployUrl,
+        resourcesOutputPath,
         loader,
         filename: `[name]${hashFormat.file}.[ext]`,
       }),
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts
index 0a5816ad0925..e885293ede46 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts
@@ -27,6 +27,7 @@ function wrapUrl(url: string): string {
 export interface PostcssCliResourcesOptions {
   baseHref?: string;
   deployUrl?: string;
+  resourcesOutputPath?: string;
   filename: string;
   loader: webpack.loader.LoaderContext;
 }
@@ -47,6 +48,7 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
   const {
     deployUrl = '',
     baseHref = '',
+    resourcesOutputPath = '',
     filename,
     loader,
   } = options;
@@ -115,12 +117,16 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
           return;
         }
 
-        const outputPath = interpolateName(
+        let outputPath = interpolateName(
           { resourcePath: result } as webpack.loader.LoaderContext,
           filename,
           { content },
         );
 
+        if (resourcesOutputPath) {
+          outputPath = path.posix.join(resourcesOutputPath, outputPath);
+        }
+
         loader.addDependency(result);
         loader.emitFile(outputPath, content, undefined);
 
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.d.ts b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
index e6c30d7b0718..33ed974acadd 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
@@ -56,6 +56,11 @@ export interface BrowserBuilderSchema {
    */
   outputPath: string;
 
+  /**
+   * Path where style resources will be placed (Relative to outputPath).
+   */
+  resourcesOutputPath: string;
+
   /**
    * Build using Ahead of Time compilation.
    */
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index 201844584f01..2f0259214116 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -71,6 +71,11 @@
       "type": "string",
       "description": "The full path for the new output directory, relative to the current workspace.\n\nBy default, writes output to a folder named dist/ in the current project."
     },
+    "resourcesOutputPath": {
+      "type": "string",
+      "description": "The path where style resources will be placed, relative to outputPath.",
+      "default": ""
+    },
     "aot": {
       "type": "boolean",
       "description": "Build using Ahead of Time compilation.",
diff --git a/packages/angular_devkit/build_angular/src/server/schema.d.ts b/packages/angular_devkit/build_angular/src/server/schema.d.ts
index 24b575422afd..0addbe5222e0 100644
--- a/packages/angular_devkit/build_angular/src/server/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/server/schema.d.ts
@@ -49,6 +49,10 @@ export interface BuildWebpackServerSchema {
    * Path where output will be placed.
    */
   outputPath: string;
+  /**
+ * Path where style resources will be placed (Relative to outputPath).
+ */
+  resourcesOutputPath: string;
   /**
    * Generates a 'stats.json' file which can be analyzed using tools such as:
    * #webpack-bundle-analyzer' or https: //webpack.github.io/analyse.
diff --git a/packages/angular_devkit/build_angular/src/server/schema.json b/packages/angular_devkit/build_angular/src/server/schema.json
index 5b6f1b6da789..de93450c3297 100644
--- a/packages/angular_devkit/build_angular/src/server/schema.json
+++ b/packages/angular_devkit/build_angular/src/server/schema.json
@@ -44,6 +44,11 @@
       "type": "string",
       "description": "Path where output will be placed."
     },
+    "resourcesOutputPath": {
+      "type": "string",
+      "description": "The path where style resources will be placed, relative to outputPath.",
+      "default": ""
+    },
     "sourceMap": {
       "type": "boolean",
       "description": "Output sourcemaps.",
diff --git a/packages/angular_devkit/build_angular/test/browser/resources-output-path_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/resources-output-path_spec_large.ts
new file mode 100644
index 000000000000..cc97c3d69b8f
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/resources-output-path_spec_large.ts
@@ -0,0 +1,108 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// tslint:disable:no-big-function
+
+import { runTargetSpec } from '@angular-devkit/architect/testing';
+import { normalize, virtualFs } from '@angular-devkit/core';
+import { tap } from 'rxjs/operators';
+import { browserTargetSpec, host } from '../utils';
+
+
+describe('Browser Builder styles resources output path', () => {
+  const stylesBundle = 'dist/styles.css';
+  const mainBundle = 'dist/main.js';
+
+  const imgSvg = `
+    <svg width="100" height="100" xmlns="http://www.w3.org/2000/svg">
+      <circle cx="50" cy="50" r="40" stroke="green" stroke-width="4" fill="yellow" />
+    </svg>
+  `;
+
+  function writeFiles() {
+    // Use a large image for the relative ref so it cannot be inlined.
+    host.copyFile('src/spectrum.png', './src/assets/global-img-relative.png');
+    host.copyFile('src/spectrum.png', './src/assets/component-img-relative.png');
+    host.writeMultipleFiles({
+      'src/styles.css': `
+          h1 { background: url('/assets/global-img-absolute.svg'); }
+          h2 { background: url('./assets/global-img-relative.png'); }
+        `,
+      'src/app/app.component.css': `
+          h3 { background: url('/assets/component-img-absolute.svg'); }
+          h4 { background: url('../assets/component-img-relative.png'); }
+        `,
+      'src/assets/global-img-absolute.svg': imgSvg,
+      'src/assets/component-img-absolute.svg': imgSvg,
+    });
+  }
+
+  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
+  afterEach(done => host.restore().toPromise().then(done, done.fail));
+
+  it(`supports resourcesOutputPath in resource urls`, (done) => {
+    writeFiles();
+    // Check base paths are correctly generated.
+    const overrides = {
+      aot: true,
+      extractCss: true,
+      resourcesOutputPath: 'out-assets',
+    };
+
+    runTargetSpec(host, browserTargetSpec, overrides, undefined, undefined).pipe(
+      tap(() => {
+        const styles = virtualFs.fileBufferToString(
+          host.scopedSync().read(normalize(stylesBundle)),
+        );
+
+        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
+        expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+        expect(styles).toContain(`url('out-assets/global-img-relative.png')`);
+        expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+        expect(main).toContain(`url('out-assets/component-img-relative.png')`);
+
+        expect(host.scopedSync()
+          .exists(normalize('dist/assets/global-img-absolute.svg'))).toBe(true);
+        expect(host.scopedSync()
+          .exists(normalize('dist/out-assets/global-img-relative.png'))).toBe(true);
+        expect(host.scopedSync()
+          .exists(normalize('dist/assets/component-img-absolute.svg'))).toBe(true);
+        expect(host.scopedSync()
+          .exists(normalize('dist/out-assets/component-img-relative.png'))).toBe(true);
+      }),
+    ).toPromise().then(done, done.fail);
+  });
+
+  it(`supports blank resourcesOutputPath`, (done) => {
+    writeFiles();
+
+    // Check base paths are correctly generated.
+    const overrides = { aot: true, extractCss: true };
+    runTargetSpec(host, browserTargetSpec, overrides, undefined, undefined).pipe(
+      tap(() => {
+        const styles = virtualFs.fileBufferToString(
+          host.scopedSync().read(normalize(stylesBundle)),
+        );
+
+        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
+        expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+        expect(styles).toContain(`url('global-img-relative.png')`);
+        expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+        expect(main).toContain(`url('component-img-relative.png')`);
+        expect(host.scopedSync().exists(normalize('dist/assets/global-img-absolute.svg')))
+          .toBe(true);
+        expect(host.scopedSync().exists(normalize('dist/global-img-relative.png')))
+          .toBe(true);
+        expect(host.scopedSync().exists(normalize('dist/assets/component-img-absolute.svg')))
+          .toBe(true);
+        expect(host.scopedSync().exists(normalize('dist/component-img-relative.png')))
+          .toBe(true);
+      }),
+    ).toPromise().then(done, done.fail);
+  });
+
+});

From 1d5d5153f3982ebfc2bcf2ef4a285242326358b4 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 15 Nov 2018 16:30:47 +0100
Subject: [PATCH 0451/1703] feat(@angular/cli): add `resourcesOutputPath` to
 schema

---
 packages/angular/cli/lib/config/schema.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index d4a139d7f7f5..99bc50ac4895 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -623,6 +623,10 @@
               "type": "string",
               "description": "Path where output will be placed."
             },
+            "resourcesOutputPath": {
+              "type": "string",
+              "description": "The path where style resources will be placed, relative to outputPath."
+            },
             "aot": {
               "type": "boolean",
               "description": "Build using Ahead of Time compilation.",
@@ -1446,6 +1450,10 @@
               "type": "string",
               "description": "Path where output will be placed."
             },
+            "resourcesOutputPath": {
+              "type": "string",
+              "description": "The path where style resources will be placed, relative to outputPath."
+            },
             "sourceMap": {
               "type": "boolean",
               "description": "Output sourcemaps.",

From 282eb52e0837226b75f7410baf8b002d989cb58e Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 15 Nov 2018 16:33:17 +0100
Subject: [PATCH 0452/1703] refactor: use `buildOptions` directly

---
 .../src/angular-cli-files/models/webpack-configs/styles.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
index 436fb0ba9159..451febeaca3b 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
@@ -45,8 +45,8 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
   // Determine hashing format.
   const hashFormat = getOutputHashFormat(buildOptions.outputHashing as string);
   // Convert absolute resource URLs to account for base-href and deploy-url.
-  const baseHref = wco.buildOptions.baseHref || '';
-  const deployUrl = wco.buildOptions.deployUrl || '';
+  const baseHref = buildOptions.baseHref || '';
+  const deployUrl = buildOptions.deployUrl || '';
   const resourcesOutputPath = buildOptions.resourcesOutputPath || '';
 
   const postcssPluginCreator = function (loader: webpack.loader.LoaderContext) {

From d2a29afd4807e37af24736277f7097ddde20cc07 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 29 Oct 2018 18:00:39 +0100
Subject: [PATCH 0453/1703] fix(@angular/cli): handle case senstive aliases

Closes #12780
---
 packages/angular/cli/models/parser.ts      | 35 +++++++++++-----------
 packages/angular/cli/models/parser_spec.ts |  2 ++
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/packages/angular/cli/models/parser.ts b/packages/angular/cli/models/parser.ts
index 27d07c263c75..1c9e9830524d 100644
--- a/packages/angular/cli/models/parser.ts
+++ b/packages/angular/cli/models/parser.ts
@@ -29,10 +29,10 @@ function _coerceType(str: string | undefined, type: OptionType, v?: Value): Valu
       }
 
       return _coerceType(str, OptionType.Boolean, v) !== undefined
-           ? _coerceType(str, OptionType.Boolean, v)
-           : _coerceType(str, OptionType.Number, v) !== undefined
-           ? _coerceType(str, OptionType.Number, v)
-           : _coerceType(str, OptionType.String, v);
+        ? _coerceType(str, OptionType.Boolean, v)
+        : _coerceType(str, OptionType.Number, v) !== undefined
+          ? _coerceType(str, OptionType.Number, v)
+          : _coerceType(str, OptionType.String, v);
 
     case OptionType.String:
       return str || '';
@@ -93,14 +93,16 @@ function _coerce(str: string | undefined, o: Option | null, v?: Value): Value |
 
 
 function _getOptionFromName(name: string, options: Option[]): Option | undefined {
-  const cName = strings.camelize(name);
+  const camelName = /(-|_)/.test(name)
+    ? strings.camelize(name)
+    : name;
 
   for (const option of options) {
-    if (option.name == name || option.name == cName) {
+    if (option.name === name || option.name === camelName) {
       return option;
     }
 
-    if (option.aliases.some(x => x == name || x == cName)) {
+    if (option.aliases.some(x => x === name || x === camelName)) {
       return option;
     }
   }
@@ -108,6 +110,11 @@ function _getOptionFromName(name: string, options: Option[]): Option | undefined
   return undefined;
 }
 
+function _removeLeadingDashes(key: string): string {
+  const from = key.startsWith('--') ? 2 : key.startsWith('-') ? 1 : 0;
+
+  return key.substr(from);
+}
 
 function _assignOption(
   arg: string,
@@ -130,16 +137,10 @@ function _assignOption(
 
   // If flag is --no-abc AND there's no equal sign.
   if (i == -1) {
-    if (key.startsWith('no-')) {
-      // Only use this key if the option matching the rest is a boolean.
-      const maybeOption = _getOptionFromName(key.substr(3), options);
-      if (maybeOption && maybeOption.type == 'boolean') {
-        value = 'false';
-        option = maybeOption;
-      }
-    } else if (key.startsWith('no')) {
+    if (key.startsWith('no')) {
       // Only use this key if the option matching the rest is a boolean.
-      const maybeOption = _getOptionFromName(key.substr(2), options);
+      const from = key.startsWith('no-') ? 3 : 2;
+      const maybeOption = _getOptionFromName(strings.camelize(key.substr(from)), options);
       if (maybeOption && maybeOption.type == 'boolean') {
         value = 'false';
         option = maybeOption;
@@ -171,7 +172,7 @@ function _assignOption(
     }
   } else {
     key = arg.substring(0, i);
-    option = _getOptionFromName(key, options) || null;
+    option = _getOptionFromName(_removeLeadingDashes(key), options) || null;
     if (option) {
       value = arg.substring(i + 1);
     }
diff --git a/packages/angular/cli/models/parser_spec.ts b/packages/angular/cli/models/parser_spec.ts
index 24aa8fbaa248..531fbaa09a7d 100644
--- a/packages/angular/cli/models/parser_spec.ts
+++ b/packages/angular/cli/models/parser_spec.ts
@@ -15,6 +15,7 @@ describe('parseArguments', () => {
     { name: 'bool', aliases: [ 'b' ], type: OptionType.Boolean, description: '' },
     { name: 'num', aliases: [ 'n' ], type: OptionType.Number, description: '' },
     { name: 'str', aliases: [ 's' ], type: OptionType.String, description: '' },
+    { name: 'strUpper', aliases: [ 'S' ], type: OptionType.String, description: '' },
     { name: 'helloWorld', aliases: [], type: OptionType.String, description: '' },
     { name: 'helloBool', aliases: [], type: OptionType.Boolean, description: '' },
     { name: 'arr', aliases: [ 'a' ], type: OptionType.Array, description: '' },
@@ -35,6 +36,7 @@ describe('parseArguments', () => {
   ];
 
   const tests: { [test: string]: Partial<Arguments> | ['!!!', Partial<Arguments>, string[]] } = {
+    '-S=b': { strUpper: 'b' },
     '--bool': { bool: true },
     '--bool=1': ['!!!', {}, ['--bool=1']],
     '--bool  ': { bool: true, p1: '' },

From 39dac643860ed568b6d1d014a1d13f4198743d26 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Thu, 15 Nov 2018 17:03:43 -0800
Subject: [PATCH 0454/1703] ci: packages script should list public packages

Added a --json arg for old output.
---
 scripts/packages.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/packages.ts b/scripts/packages.ts
index 7706d013941f..e4227afd9aef 100644
--- a/scripts/packages.ts
+++ b/scripts/packages.ts
@@ -12,6 +12,10 @@ import { logging } from '@angular-devkit/core';
 const { packages } = require('../lib/packages');
 
 
-export default function(_: {}, logger: logging.Logger) {
-  logger.info(JSON.stringify(packages, null, 2));
+export default function(args: { json: boolean }, logger: logging.Logger) {
+  if (args.json) {
+    logger.info(JSON.stringify(packages, null, 2));
+  } else {
+    logger.info(Object.keys(packages).filter(name => !packages[name].private).join('\n'));
+  }
 }

From 34d7e9d2405627171268fe45f457a2fe9ec630bd Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Thu, 15 Nov 2018 15:23:33 -0800
Subject: [PATCH 0455/1703] feat(@angular-devkit/schematics-cli): add prompt
 support using Inquirer

---
 packages/angular_devkit/schematics_cli/BUILD  |  1 +
 .../schematics_cli/bin/schematics.ts          | 77 +++++++++++++++----
 .../schematics_cli/package.json               |  5 +-
 3 files changed, 68 insertions(+), 15 deletions(-)

diff --git a/packages/angular_devkit/schematics_cli/BUILD b/packages/angular_devkit/schematics_cli/BUILD
index 0b5266220542..f71a477c60e3 100644
--- a/packages/angular_devkit/schematics_cli/BUILD
+++ b/packages/angular_devkit/schematics_cli/BUILD
@@ -31,6 +31,7 @@ ts_library(
         "//packages/angular_devkit/schematics:tools",
         "@rxjs",
         "@rxjs//operators",
+        "@npm//@types/inquirer",
         "@npm//@types/minimist",
         "@npm//@types/node",
     ],
diff --git a/packages/angular_devkit/schematics_cli/bin/schematics.ts b/packages/angular_devkit/schematics_cli/bin/schematics.ts
index 9fc6a39abd6f..b5e97bb3c0e7 100644
--- a/packages/angular_devkit/schematics_cli/bin/schematics.ts
+++ b/packages/angular_devkit/schematics_cli/bin/schematics.ts
@@ -12,7 +12,9 @@ import 'symbol-observable';
 // tslint:disable-next-line:ordered-imports import-groups
 import {
   JsonObject,
+  logging,
   normalize,
+  schema,
   tags,
   terminal,
   virtualFs,
@@ -24,6 +26,7 @@ import {
   UnsuccessfulWorkflowExecution,
 } from '@angular-devkit/schematics';
 import { NodeModulesEngineHost, NodeWorkflow } from '@angular-devkit/schematics/tools';
+import * as inquirer from 'inquirer';
 import * as minimist from 'minimist';
 
 
@@ -59,12 +62,68 @@ export interface MainOptions {
   stderr?: ProcessOutput;
 }
 
+
+function _listSchematics(collectionName: string, logger: logging.Logger) {
+  try {
+    const engineHost = new NodeModulesEngineHost();
+    const engine = new SchematicEngine(engineHost);
+    const collection = engine.createCollection(collectionName);
+    logger.info(engine.listSchematicNames(collection).join('\n'));
+  } catch (error) {
+    logger.fatal(error.message);
+
+    return 1;
+  }
+
+  return 0;
+}
+
+function _createPromptProvider(): schema.PromptProvider {
+  return (definitions: Array<schema.PromptDefinition>) => {
+    const questions: inquirer.Questions = definitions.map(definition => {
+      const question: inquirer.Question = {
+        name: definition.id,
+        message: definition.message,
+        default: definition.default,
+      };
+
+      const validator = definition.validator;
+      if (validator) {
+        question.validate = input => validator(input);
+      }
+
+      switch (definition.type) {
+        case 'confirmation':
+          return { ...question, type: 'confirm' };
+        case 'list':
+          return {
+            ...question,
+            type: 'list',
+            choices: definition.items && definition.items.map(item => {
+              if (typeof item == 'string') {
+                return item;
+              } else {
+                return {
+                  name: item.label,
+                  value: item.value,
+                };
+              }
+            }),
+          };
+        default:
+          return { ...question, type: definition.type };
+      }
+    });
+
+    return inquirer.prompt(questions);
+  };
+}
+
 export async function main({
   args,
   stdout = process.stdout,
   stderr = process.stderr,
 }: MainOptions): Promise<0 | 1> {
-
   const argv = parseArgs(args);
 
   /** Create the DevKit Logger used through the CLI. */
@@ -84,18 +143,7 @@ export async function main({
 
   /** If the user wants to list schematics, we simply show all the schematic names. */
   if (argv['list-schematics']) {
-    try {
-      const engineHost = new NodeModulesEngineHost();
-      const engine = new SchematicEngine(engineHost);
-      const collection = engine.createCollection(collectionName);
-      logger.info(engine.listSchematicNames(collection).join('\n'));
-    } catch (error) {
-      logger.fatal(error.message);
-
-      return 1;
-    }
-
-    return 0;
+    return _listSchematics(collectionName, logger);
   }
 
   if (!schematicName) {
@@ -208,6 +256,9 @@ export async function main({
   });
   delete parsedArgs._;
 
+  // Add prompts.
+  workflow.registry.usePromptProvider(_createPromptProvider());
+
 
   /**
    *  Execute the workflow, which will report the dry run events, run the tasks, and complete
diff --git a/packages/angular_devkit/schematics_cli/package.json b/packages/angular_devkit/schematics_cli/package.json
index 5c11beba172d..6558e9d16a58 100644
--- a/packages/angular_devkit/schematics_cli/package.json
+++ b/packages/angular_devkit/schematics_cli/package.json
@@ -17,8 +17,9 @@
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
     "@schematics/schematics": "0.0.0",
+    "inquirer": "6.2.0",
     "minimist": "1.2.0",
-    "symbol-observable": "1.2.0",
-    "rxjs": "6.3.3"
+    "rxjs": "6.3.3",
+    "symbol-observable": "1.2.0"
   }
 }

From 268ce429335b28e84089e341a0171ced6458e13a Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Tue, 13 Nov 2018 15:52:13 -0800
Subject: [PATCH 0456/1703] docs: fix typos

---
 packages/angular/cli/commands/run-long.md           | 2 +-
 packages/schematics/angular/library/library-long.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/angular/cli/commands/run-long.md b/packages/angular/cli/commands/run-long.md
index 5a02cf98cfae..a95bbd78a27a 100644
--- a/packages/angular/cli/commands/run-long.md
+++ b/packages/angular/cli/commands/run-long.md
@@ -3,7 +3,7 @@ The CLI commands run Architect targets such as `build`, `serve`, `test`, and `li
 Each named target has a default configuration, specified by an "options" object,
 and an optional set of named alternate configurations in the "configurations" object.
 
-For example, the "server" target for a newly generated app has a predefined
+For example, the "serve" target for a newly generated app has a predefined
 alternate configuration named "production".
 
 You can define new targets and their configuration options in the "architect" section
diff --git a/packages/schematics/angular/library/library-long.md b/packages/schematics/angular/library/library-long.md
index 61ebc6069133..00b4f2592cd0 100644
--- a/packages/schematics/angular/library/library-long.md
+++ b/packages/schematics/angular/library/library-long.md
@@ -1,5 +1,5 @@
 A library is a type of project that does not run independently.
 The library skeleton created by this command is placed by default in the `/projects` folder, and has `type` of "library".
 
-You can build a new library using the `ng build` command, run unit test for it using the `ng test` command,
-and lint it using the `ng lint` command.
\ No newline at end of file
+You can build a new library using the `ng build` command, run unit tests for it using the `ng test` command,
+and lint it using  and the `ng lint` command.
\ No newline at end of file

From b626ca7c5ea95606fa5f8cf101063291fe80593e Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Fri, 16 Nov 2018 11:10:59 -0800
Subject: [PATCH 0457/1703] docs: add v7 instructions to ng update cmd

---
 packages/angular/cli/commands/update-long.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/commands/update-long.md b/packages/angular/cli/commands/update-long.md
index 9357da20e239..4610f43364ef 100644
--- a/packages/angular/cli/commands/update-long.md
+++ b/packages/angular/cli/commands/update-long.md
@@ -1 +1,7 @@
-Before running this command, see the interactive [Angular Update Guide](https://update.angular.io/).
\ No newline at end of file
+Perform a basic update to v7 of the core framework and CLI by running the following command.
+
+```
+ng update @angular/cli @angular/core‌
+```
+
+For detailed information and guidance on updating your application, see the interactive [Angular Update Guide](https://update.angular.io/).

From 1e7cf9bcf8efbc8a81c2656ff619ee8f9058a262 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 15 Nov 2018 10:32:39 -0500
Subject: [PATCH 0458/1703] feat(@ngtools/webpack): support directly loading
 component templates

---
 packages/ngtools/webpack/README.md                      | 1 +
 packages/ngtools/webpack/src/angular_compiler_plugin.ts | 2 ++
 packages/ngtools/webpack/src/compiler_host.ts           | 5 +++++
 3 files changed, 8 insertions(+)

diff --git a/packages/ngtools/webpack/README.md b/packages/ngtools/webpack/README.md
index 9e6f6bb3f3f5..9163c1e3b007 100644
--- a/packages/ngtools/webpack/README.md
+++ b/packages/ngtools/webpack/README.md
@@ -43,6 +43,7 @@ The loader works with webpack plugin to compile your TypeScript. It's important
 * `sourceMap`. Optional. Include sourcemaps.
 * `compilerOptions`. Optional. Override options in `tsconfig.json`.
 * `contextElementDependencyConstructor`. Optional. Set to `require('webpack/lib/dependencies/ContextElementDependency')` if you are having `No module factory available for dependency type: ContextElementDependency` errors.
+* `directTemplateLoading`. Optional. Causes the plugin to load component templates (HTML) directly from the filesystem.  This is more efficient if only using the `raw-loader` to load component templates.  Do not enable this option if additional loaders are configured for component templates.
 
 ## Features
 The benefits and ability of using [`@ngtools/webpack`](https://www.npmjs.com/~ngtools) standalone from the Angular CLI as presented in [Stephen Fluin's Angular CLI talk](https://youtu.be/uBRK6cTr4Vk?t=6m45s) at Angular Connect 2016:
diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 2174824cbe81..3aa428ac97c9 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -103,6 +103,7 @@ export interface AngularCompilerPluginOptions {
   platform?: PLATFORM;
   nameLazyFiles?: boolean;
   logger?: logging.Logger;
+  directTemplateLoading?: boolean;
 
   // added to the list of lazy routes
   additionalLazyModules?: { [module: string]: string };
@@ -627,6 +628,7 @@ export class AngularCompilerPlugin {
         this._basePath,
         host,
         watchMode,
+        this._options.directTemplateLoading,
       );
 
       // Create and set a new WebpackResourceLoader.
diff --git a/packages/ngtools/webpack/src/compiler_host.ts b/packages/ngtools/webpack/src/compiler_host.ts
index e87aff1f44ad..34da158b56d6 100644
--- a/packages/ngtools/webpack/src/compiler_host.ts
+++ b/packages/ngtools/webpack/src/compiler_host.ts
@@ -46,6 +46,7 @@ export class WebpackCompilerHost implements ts.CompilerHost {
     basePath: string,
     host: virtualFs.Host,
     private readonly cacheSourceFiles: boolean,
+    private readonly directTemplateLoading = false,
   ) {
     this._syncHost = new virtualFs.SyncDelegateHost(host);
     this._memoryHost = new virtualFs.SyncDelegateHost(new virtualFs.SimpleMemoryHost());
@@ -326,6 +327,10 @@ export class WebpackCompilerHost implements ts.CompilerHost {
   }
 
   readResource(fileName: string) {
+    if (this.directTemplateLoading && fileName.endsWith('.html')) {
+      return this.readFile(fileName);
+    }
+
     if (this._resourceLoader) {
       // These paths are meant to be used by the loader so we must denormalize them.
       const denormalizedFileName = this.denormalizePath(normalize(fileName));

From bd55bf01d5b7d95227b36c1fe11d9e6f2df19de8 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 15 Nov 2018 10:36:57 -0500
Subject: [PATCH 0459/1703] refactor(@angular-devkit/build-angular): enable
 direct template loading

---
 .../src/angular-cli-files/models/webpack-configs/typescript.ts   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
index f939ca054f30..f03f522f8417 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
@@ -82,6 +82,7 @@ function _createAotPlugin(
     forkTypeChecker: buildOptions.forkTypeChecker,
     contextElementDependencyConstructor: require('webpack/lib/dependencies/ContextElementDependency'),
     logger: wco.logger,
+    directTemplateLoading: true,
     ...options,
   };
   return new AngularCompilerPlugin(pluginOptions);

From 480952df56a1d1ea507f70ce8446f0035d74b5a5 Mon Sep 17 00:00:00 2001
From: Hayden Berge <35084775+hb-coding@users.noreply.github.com>
Date: Mon, 19 Nov 2018 13:04:37 -0700
Subject: [PATCH 0460/1703] feat(@schematics/angular): add .history directory
 to gitignore

---
 packages/schematics/angular/workspace/files/__dot__gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/schematics/angular/workspace/files/__dot__gitignore b/packages/schematics/angular/workspace/files/__dot__gitignore
index 85158b7a442a..47765ada9d86 100755
--- a/packages/schematics/angular/workspace/files/__dot__gitignore
+++ b/packages/schematics/angular/workspace/files/__dot__gitignore
@@ -27,6 +27,7 @@ speed-measure-plugin.json
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+.history/*
 
 # misc
 /.sass-cache

From f7ac352d0abeae55d0e99c65d473805985e5dd6b Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Mon, 19 Nov 2018 16:25:21 +0100
Subject: [PATCH 0461/1703] docs: typo in library command docs

---
 packages/schematics/angular/library/library-long.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/library/library-long.md b/packages/schematics/angular/library/library-long.md
index 00b4f2592cd0..7907be6b8269 100644
--- a/packages/schematics/angular/library/library-long.md
+++ b/packages/schematics/angular/library/library-long.md
@@ -2,4 +2,4 @@ A library is a type of project that does not run independently.
 The library skeleton created by this command is placed by default in the `/projects` folder, and has `type` of "library".
 
 You can build a new library using the `ng build` command, run unit tests for it using the `ng test` command,
-and lint it using  and the `ng lint` command.
\ No newline at end of file
+and lint it using the `ng lint` command.
\ No newline at end of file

From 3e9705f31bcdf0893c57746f7fccc15a1f63864c Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 15 Nov 2018 22:32:39 -0800
Subject: [PATCH 0462/1703] feat(@angular/cli): add warning for overriding
 flags in arguments

Fixes #12948
---
 packages/angular/cli/models/parser.ts      | 34 ++++++++++++++------
 packages/angular/cli/models/parser_spec.ts | 37 ++++++++++++++++++++++
 2 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/packages/angular/cli/models/parser.ts b/packages/angular/cli/models/parser.ts
index 1c9e9830524d..757f0f8c9863 100644
--- a/packages/angular/cli/models/parser.ts
+++ b/packages/angular/cli/models/parser.ts
@@ -63,7 +63,11 @@ function _coerceType(str: string | undefined, type: OptionType, v?: Value): Valu
       }
 
     case OptionType.Array:
-      return Array.isArray(v) ? v.concat(str || '') : [str || ''];
+      return Array.isArray(v)
+        ? v.concat(str || '')
+        : v === undefined
+          ? [str || '']
+          : [v + '', str || ''];
 
     default:
       return undefined;
@@ -119,14 +123,14 @@ function _removeLeadingDashes(key: string): string {
 function _assignOption(
   arg: string,
   args: string[],
-  { options, parsedOptions, leftovers, ignored, errors, deprecations }: {
+  { options, parsedOptions, leftovers, ignored, errors, warnings }: {
     options: Option[],
     parsedOptions: Arguments,
     positionals: string[],
     leftovers: string[],
     ignored: string[],
     errors: string[],
-    deprecations: string[],
+    warnings: string[],
   },
 ) {
   const from = arg.startsWith('--') ? 2 : 1;
@@ -188,11 +192,21 @@ function _assignOption(
   } else {
     const v = _coerce(value, option, parsedOptions[option.name]);
     if (v !== undefined) {
-      parsedOptions[option.name] = v;
+      if (parsedOptions[option.name] !== v) {
+        if (parsedOptions[option.name] !== undefined) {
+          warnings.push(
+            `Option ${JSON.stringify(option.name)} was already specified with value `
+            + `${JSON.stringify(parsedOptions[option.name])}. The new value ${JSON.stringify(v)} `
+            + `will override it.`,
+          );
+        }
+
+        parsedOptions[option.name] = v;
 
-      if (option.deprecated !== undefined && option.deprecated !== false) {
-        deprecations.push(`Option ${JSON.stringify(option.name)} is deprecated${
+        if (option.deprecated !== undefined && option.deprecated !== false) {
+          warnings.push(`Option ${JSON.stringify(option.name)} is deprecated${
             typeof option.deprecated == 'string' ? ': ' + option.deprecated : ''}.`);
+        }
       }
     } else {
       let error = `Argument ${key} could not be parsed using value ${JSON.stringify(value)}.`;
@@ -285,9 +299,9 @@ export function parseArguments(
 
   const ignored: string[] = [];
   const errors: string[] = [];
-  const deprecations: string[] = [];
+  const warnings: string[] = [];
 
-  const state = { options, parsedOptions, positionals, leftovers, ignored, errors, deprecations };
+  const state = { options, parsedOptions, positionals, leftovers, ignored, errors, warnings };
 
   for (let arg = args.shift(); arg !== undefined; arg = args.shift()) {
     if (arg == '--') {
@@ -369,8 +383,8 @@ export function parseArguments(
     parsedOptions['--'] = [...positionals, ...leftovers];
   }
 
-  if (deprecations.length > 0 && logger) {
-    deprecations.forEach(message => logger.warn(message));
+  if (warnings.length > 0 && logger) {
+    warnings.forEach(message => logger.warn(message));
   }
 
   if (errors.length > 0) {
diff --git a/packages/angular/cli/models/parser_spec.ts b/packages/angular/cli/models/parser_spec.ts
index 531fbaa09a7d..70387e6f88c5 100644
--- a/packages/angular/cli/models/parser_spec.ts
+++ b/packages/angular/cli/models/parser_spec.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  *
  */
+// tslint:disable:no-global-tslint-disable no-big-function
 import { logging } from '@angular-devkit/core';
 import { Arguments, Option, OptionType } from './interface';
 import { ParseArgumentException, parseArguments } from './parser';
@@ -64,6 +65,10 @@ describe('parseArguments', () => {
     '--str=false val1 val2': { str: 'false', p1: 'val1', p2: 'val2' },
     '--str=false val1 val2 --num1': { str: 'false', p1: 'val1', p2: 'val2', '--': ['--num1'] },
     '--str=false val1 --num1 val2': { str: 'false', p1: 'val1', '--': ['--num1', 'val2'] },
+    '--bool --bool=false': { bool: false },
+    '--bool --bool=false --bool': { bool: true },
+    '--num=1 --num=2 --num=3': { num: 3 },
+    '--str=1 --str=2 --str=3': { str: '3' },
     'val1 --num=1 val2': { num: 1, p1: 'val1', p2: 'val2' },
     '--p1=val1 --num=1 val2': { num: 1, p1: 'val1', p2: 'val2' },
     '--p1=val1 --num=1 --p2=val2 val3': { num: 1, p1: 'val1', p2: 'val2', '--': ['val3'] },
@@ -74,6 +79,7 @@ describe('parseArguments', () => {
     ],
     '--bool val1 --etc --num=1 val2 --v': { bool: true, num: 1, p1: 'val1', p2: 'val2',
                                             '--': ['--etc', '--v'] },
+    '--arr=a d': { arr: ['a'], p1: 'd' },
     '--arr=a --arr=b --arr c d': { arr: ['a', 'b', 'c'], p1: 'd' },
     '--arr=1 --arr --arr c d': { arr: ['1', '', 'c'], p1: 'd' },
     '--arr=1 --arr --arr c d e': { arr: ['1', '', 'c'], p1: 'd', p2: 'e' },
@@ -197,4 +203,35 @@ describe('parseArguments', () => {
     expect(messages[1]).toMatch(/\bABCD\b/);
     messages.shift();
   });
+
+  it('handles a flag being added multiple times', () => {
+    const options = [
+      { name: 'bool', aliases: [], type: OptionType.Boolean, description: '' },
+    ];
+
+    const logger = new logging.Logger('');
+    const messages: string[] = [];
+
+    logger.subscribe(entry => messages.push(entry.message));
+
+    let result = parseArguments(['--bool'], options, logger);
+    expect(result).toEqual({ bool: true });
+    expect(messages).toEqual([]);
+
+    result = parseArguments(['--bool', '--bool'], options, logger);
+    expect(result).toEqual({ bool: true });
+    expect(messages).toEqual([]);
+
+    result = parseArguments(['--bool', '--bool=false'], options, logger);
+    expect(result).toEqual({ bool: false });
+    expect(messages.length).toEqual(1);
+    expect(messages[0]).toMatch(/\bbool\b.*\btrue\b.*\bfalse\b/);
+    messages.shift();
+
+    result = parseArguments(['--bool', '--bool=false', '--bool=false'], options, logger);
+    expect(result).toEqual({ bool: false });
+    expect(messages.length).toEqual(1);
+    expect(messages[0]).toMatch(/\bbool\b.*\btrue\b.*\bfalse\b/);
+    messages.shift();
+  });
 });

From a3e3bb2524d51ca77c1f937ed6b1abca2ae6a4d7 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 14 Nov 2018 12:17:39 +0100
Subject: [PATCH 0463/1703] docs: point root README to branch-relative links

Fixes #12700
---
 .monorepo.json | 20 ++++++++++----------
 README.md      | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index 9058b2a7f426..54a1f68eca58 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -19,7 +19,7 @@
       {
         "label": "License",
         "image": "https://img.shields.io/npm/l/@angular/cli.svg",
-        "url": "https://github.com/angular/angular-cli/blob/master/LICENSE"
+        "url": "/LICENSE"
       }
     ],
     [
@@ -37,7 +37,7 @@
   ],
   "links": {
     "Gitter": "https://gitter.im/angular/angular-cli",
-    "Contributing": "https://github.com/angular/angular-cli/blob/master/CONTRIBUTING.md",
+    "Contributing": "/CONTRIBUTING.md",
     "Angular CLI": "http://github.com/angular/angular-cli"
   },
   "packages": {
@@ -59,7 +59,7 @@
       "links": [
         {
           "label": "README",
-          "url": "https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md"
+          "url": "/packages/angular/cli/README.md"
         }
       ],
       "version": "7.1.0-rc.0",
@@ -78,7 +78,7 @@
       "links": [
         {
           "label": "README",
-          "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/architect/README.md"
+          "url": "/packages/angular_devkit/architect/README.md"
         }
       ],
       "version": "0.11.0-rc.0",
@@ -102,7 +102,7 @@
       "links": [
         {
           "label": "README",
-          "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_optimizer/README.md"
+          "url": "/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
       "version": "0.11.0-rc.0",
@@ -114,7 +114,7 @@
       "links": [
         {
           "label": "README",
-          "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_ng_packagr/README.md"
+          "url": "/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
       "version": "0.11.0-rc.0",
@@ -126,7 +126,7 @@
       "links": [
         {
           "label": "README",
-          "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_angular/README.md"
+          "url": "/packages/angular_devkit/build_angular/README.md"
         }
       ],
       "version": "0.11.0-rc.0",
@@ -138,7 +138,7 @@
       "links": [
         {
           "label": "README",
-          "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_webpack/README.md"
+          "url": "/packages/angular_devkit/build_webpack/README.md"
         }
       ],
       "version": "0.11.0-rc.0",
@@ -150,7 +150,7 @@
       "links": [
         {
           "label": "README",
-          "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/core/README.md"
+          "url": "/packages/angular_devkit/core/README.md"
         }
       ],
       "version": "7.1.0-rc.0",
@@ -162,7 +162,7 @@
       "links": [
         {
           "label": "README",
-          "url": "https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/README.md"
+          "url": "/packages/angular_devkit/schematics/README.md"
         }
       ],
       "version": "7.1.0-rc.0",
diff --git a/README.md b/README.md
index f3606ec894ef..4e3a100311d1 100644
--- a/README.md
+++ b/README.md
@@ -19,14 +19,14 @@ This is the home of the DevKit and the Angular CLI code. You can find the Angula
 
 [![CircleCI branch](https://img.shields.io/circleci/project/github/angular/angular-cli/master.svg?label=circleci)](https://circleci.com/gh/angular/angular-cli) [![Dependency Status](https://david-dm.org/angular/angular-cli.svg)](https://david-dm.org/angular/angular-cli) [![devDependency Status](https://david-dm.org/angular/angular-cli/dev-status.svg)](https://david-dm.org/angular/angular-cli?type=dev) 
 
-[![License](https://img.shields.io/npm/l/@angular/cli.svg)](https://github.com/angular/angular-cli/blob/master/LICENSE) 
+[![License](https://img.shields.io/npm/l/@angular/cli.svg)](/LICENSE) 
 
 [![GitHub forks](https://img.shields.io/github/forks/angular/angular-cli.svg?style=social&label=Fork)](https://github.com/angular/angular-cli/fork) [![GitHub stars](https://img.shields.io/github/stars/angular/angular-cli.svg?style=social&label=Star)](https://github.com/angular/angular-cli) 
 
 
 
 ### Quick Links
-[Gitter](https://gitter.im/angular/angular-cli) | [Contributing](https://github.com/angular/angular-cli/blob/master/CONTRIBUTING.md) | [Angular CLI](http://github.com/angular/angular-cli) | 
+[Gitter](https://gitter.im/angular/angular-cli) | [Contributing](/CONTRIBUTING.md) | [Angular CLI](http://github.com/angular/angular-cli) | 
 |---|---|---|
 
 ----
@@ -74,7 +74,7 @@ This is a monorepo which contains many tools and packages:
 
 | Project | Package | Version | Links |
 |---|---|---|---|
-**Angular CLI** | [`@angular/cli`](https://npmjs.com/package/@angular/cli) | [![latest](https://img.shields.io/npm/v/%40angular%2Fcli/latest.svg)](https://npmjs.com/package/@angular/cli) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/cli-builds)
+**Angular CLI** | [`@angular/cli`](https://npmjs.com/package/@angular/cli) | [![latest](https://img.shields.io/npm/v/%40angular%2Fcli/latest.svg)](https://npmjs.com/package/@angular/cli) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular/cli/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/cli-builds)
 **Schematics CLI** | [`@angular-devkit/schematics-cli`](https://npmjs.com/package/@angular-devkit/schematics-cli) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fschematics-cli/latest.svg)](https://npmjs.com/package/@angular-devkit/schematics-cli) |  [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-schematics-cli-builds)
 
 
@@ -83,14 +83,14 @@ This is a monorepo which contains many tools and packages:
 
 | Project | Package | Version | Links |
 |---|---|---|---|
-**Architect** | [`@angular-devkit/architect`](https://npmjs.com/package/@angular-devkit/architect) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Farchitect/latest.svg)](https://npmjs.com/package/@angular-devkit/architect) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/architect/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-architect-builds)
+**Architect** | [`@angular-devkit/architect`](https://npmjs.com/package/@angular-devkit/architect) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Farchitect/latest.svg)](https://npmjs.com/package/@angular-devkit/architect) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular_devkit/architect/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-architect-builds)
 **Architect CLI** | [`@angular-devkit/architect-cli`](https://npmjs.com/package/@angular-devkit/architect-cli) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Farchitect-cli/latest.svg)](https://npmjs.com/package/@angular-devkit/architect-cli) |  [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-architect-cli-builds)
-**Build Angular** | [`@angular-devkit/build-angular`](https://npmjs.com/package/@angular-devkit/build-angular) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-angular/latest.svg)](https://npmjs.com/package/@angular-devkit/build-angular) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_angular/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-build-angular-builds)
-**Build NgPackagr** | [`@angular-devkit/build-ng-packagr`](https://npmjs.com/package/@angular-devkit/build-ng-packagr) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-ng-packagr/latest.svg)](https://npmjs.com/package/@angular-devkit/build-ng-packagr) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_ng_packagr/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-build-ng-packagr-builds)
-**Build Optimizer** | [`@angular-devkit/build-optimizer`](https://npmjs.com/package/@angular-devkit/build-optimizer) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-optimizer/latest.svg)](https://npmjs.com/package/@angular-devkit/build-optimizer) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_optimizer/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-build-optimizer-builds)
-**Build Webpack** | [`@angular-devkit/build-webpack`](https://npmjs.com/package/@angular-devkit/build-webpack) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-webpack/latest.svg)](https://npmjs.com/package/@angular-devkit/build-webpack) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_webpack/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-build-webpack-builds)
-**Core** | [`@angular-devkit/core`](https://npmjs.com/package/@angular-devkit/core) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fcore/latest.svg)](https://npmjs.com/package/@angular-devkit/core) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/core/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-core-builds)
-**Schematics** | [`@angular-devkit/schematics`](https://npmjs.com/package/@angular-devkit/schematics) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fschematics/latest.svg)](https://npmjs.com/package/@angular-devkit/schematics) | [![README](https://img.shields.io/badge/README--green.svg)](https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-schematics-builds)
+**Build Angular** | [`@angular-devkit/build-angular`](https://npmjs.com/package/@angular-devkit/build-angular) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-angular/latest.svg)](https://npmjs.com/package/@angular-devkit/build-angular) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular_devkit/build_angular/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-build-angular-builds)
+**Build NgPackagr** | [`@angular-devkit/build-ng-packagr`](https://npmjs.com/package/@angular-devkit/build-ng-packagr) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-ng-packagr/latest.svg)](https://npmjs.com/package/@angular-devkit/build-ng-packagr) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular_devkit/build_ng_packagr/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-build-ng-packagr-builds)
+**Build Optimizer** | [`@angular-devkit/build-optimizer`](https://npmjs.com/package/@angular-devkit/build-optimizer) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-optimizer/latest.svg)](https://npmjs.com/package/@angular-devkit/build-optimizer) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular_devkit/build_optimizer/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-build-optimizer-builds)
+**Build Webpack** | [`@angular-devkit/build-webpack`](https://npmjs.com/package/@angular-devkit/build-webpack) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-webpack/latest.svg)](https://npmjs.com/package/@angular-devkit/build-webpack) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular_devkit/build_webpack/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-build-webpack-builds)
+**Core** | [`@angular-devkit/core`](https://npmjs.com/package/@angular-devkit/core) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fcore/latest.svg)](https://npmjs.com/package/@angular-devkit/core) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular_devkit/core/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-core-builds)
+**Schematics** | [`@angular-devkit/schematics`](https://npmjs.com/package/@angular-devkit/schematics) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fschematics/latest.svg)](https://npmjs.com/package/@angular-devkit/schematics) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular_devkit/schematics/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-schematics-builds)
 
 #### Schematics
 

From 6fce79355fb6305f3db2e627fdf345b9ac1f173b Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 21 Nov 2018 12:08:13 -0500
Subject: [PATCH 0464/1703] fix(@schematics/update): replace environment
 variables in npm/yarn rc

---
 packages/schematics/update/update/npm.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/schematics/update/update/npm.ts b/packages/schematics/update/update/npm.ts
index a73cbfc4205e..1f98ce493c67 100644
--- a/packages/schematics/update/update/npm.ts
+++ b/packages/schematics/update/update/npm.ts
@@ -68,6 +68,11 @@ function readOptions(yarn = false): { [key: string]: string } {
     }
   }
 
+  // Substitute any environment variable references
+  for (const key in options) {
+    options[key] = options[key].replace(/\$\{([^\}]+)\}/, (_, name) => process.env[name] || '');
+  }
+
   return options;
 }
 

From fddd71009b2fde440a7a32745ec427911cb83bc5 Mon Sep 17 00:00:00 2001
From: Carlo Dapor <catull@gmail.com>
Date: Sat, 24 Nov 2018 07:57:10 +0100
Subject: [PATCH 0465/1703] docs: remove spurious Unicode character at the end
 of update-long.md

There is an extra character (\u200c) at the end of the line starting with "ng add".
---
 packages/angular/cli/commands/update-long.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular/cli/commands/update-long.md b/packages/angular/cli/commands/update-long.md
index 4610f43364ef..00fb979d4ca5 100644
--- a/packages/angular/cli/commands/update-long.md
+++ b/packages/angular/cli/commands/update-long.md
@@ -1,7 +1,7 @@
 Perform a basic update to v7 of the core framework and CLI by running the following command.
 
 ```
-ng update @angular/cli @angular/core‌
+ng update @angular/cli @angular/core
 ```
 
 For detailed information and guidance on updating your application, see the interactive [Angular Update Guide](https://update.angular.io/).

From 1e5cbd1cc950be898f3e8a55376f4f747c42bf29 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Mon, 26 Nov 2018 11:04:23 -0800
Subject: [PATCH 0466/1703] release: v7.1.0

---
 .monorepo.json                                | 76 +++++++++----------
 .../angular/utility/latest-versions.ts        |  6 +-
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index 54a1f68eca58..0fb1c2a091b2 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,16 +42,16 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.11.0-rc.0",
-      "hash": "5bfa9de2083bea5cbbea49d48a87e49a"
+      "version": "0.11.0",
+      "hash": "5225044ecf49d630564a68b710f6b82f"
     },
     "@_/builders": {
-      "version": "0.11.0-rc.0",
-      "hash": "575504a90d567ed077e933519642be6f"
+      "version": "0.11.0",
+      "hash": "f34470f978203f13c312094472b0a343"
     },
     "devkit": {
-      "version": "0.11.0-rc.0",
-      "hash": "24385ec699deb72d602dcab7234a850c"
+      "version": "0.11.0",
+      "hash": "3d8279285237adcda7885a24f0242ff1"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -62,15 +62,15 @@
           "url": "/packages/angular/cli/README.md"
         }
       ],
-      "version": "7.1.0-rc.0",
+      "version": "7.1.0",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "95f75fed987e54edd7128d0a0f9619a4"
+      "hash": "e12ea0ff25b467c59f41bb7f09978b77"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.11.0-rc.0",
-      "hash": "1c100bee84f5bca5f4bd08b715519425",
+      "version": "0.11.0",
+      "hash": "c116af8724067c8d65d6b9e5cff0db6e",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -81,21 +81,21 @@
           "url": "/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.11.0-rc.0",
-      "hash": "3e5084d27124e4d31eb7ea2c8b8bc182",
+      "version": "0.11.0",
+      "hash": "a35fc327f511397304b54abce6e51f13",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.11.0-rc.0",
-      "hash": "445c678fb5882243b789f6d0e2463269",
+      "version": "0.11.0",
+      "hash": "f8b9ed887e104ea4a8d23732ebacb4d0",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
       "name": "Benchmark",
       "section": "Tooling",
-      "version": "1.0.0-rc.0",
-      "hash": "f1b5d598a9748e2b9ddeb06956d192d6"
+      "version": "1.0.0",
+      "hash": "2a821f7757c6722e57873437e91712cf"
     },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
@@ -105,8 +105,8 @@
           "url": "/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.11.0-rc.0",
-      "hash": "f7a208e234574769498fc97802e33178",
+      "version": "0.11.0",
+      "hash": "15bcfd189158d6f2540a6d318753a847",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -117,8 +117,8 @@
           "url": "/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.11.0-rc.0",
-      "hash": "d742d683614e05e097558a3dcf6b7d85",
+      "version": "0.11.0",
+      "hash": "5567a181dea53e9b59965c701591c791",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -129,8 +129,8 @@
           "url": "/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.11.0-rc.0",
-      "hash": "37947c7342c85b6c76bcb2c30dff0e32",
+      "version": "0.11.0",
+      "hash": "97495f7e53ae9d8d3e6e84737734289f",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -141,9 +141,9 @@
           "url": "/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.11.0-rc.0",
+      "version": "0.11.0",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "7082fc772c44e13aeb5e6af55f81bb7a"
+      "hash": "c82f5f66b7cba16409fb450423ef584b"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -153,8 +153,8 @@
           "url": "/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "7.1.0-rc.0",
-      "hash": "61c8d98cb6faa0ed05d6a2f54f8b8446",
+      "version": "7.1.0",
+      "hash": "edb4cd588e93738ddc701eba0a18838d",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -165,43 +165,43 @@
           "url": "/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "7.1.0-rc.0",
-      "hash": "241304d0a05ce95082c22c894317be9f",
+      "version": "7.1.0",
+      "hash": "14adbc24f34c6bf530c595c8f81a1dac",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.11.0-rc.0",
-      "hash": "6a410ab5ada8a71f7429b5e6d0305d2d",
+      "version": "0.11.0",
+      "hash": "a3932c5c4bee509cf99f968764a33bc6",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "7.1.0-rc.0",
+      "version": "7.1.0",
       "section": "Misc",
-      "hash": "9add1a8b73ad9a38947cb00a42a475f9",
+      "hash": "688d8625df02a29bb4b35c7ace1c6306",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "7.1.0-rc.0",
-      "hash": "b8ffff36a742299d0a0e218b11ac3eb7",
+      "version": "7.1.0",
+      "hash": "415e700a4b37e4c7bbc39215ccada542",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.11.0-rc.0",
+      "version": "0.11.0",
       "section": "Schematics",
-      "hash": "e912ea1bae8ae64487e2d11f393bc4a1",
+      "hash": "5ac1b2d99b258044b32d1a2428f5423a",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.11.0-rc.0",
+      "version": "0.11.0",
       "section": "Schematics",
-      "hash": "dbbc989101ade8492b8594dbc22267fc",
+      "hash": "f19a525d59e859922020dc75ec22ec0f",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index ca34a923985b..3bc2df3fe9b9 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -8,12 +8,12 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~7.1.0-beta.0',
+  Angular: '~7.1.0',
   RxJs: '~6.3.3',
   ZoneJs: '~0.8.26',
   TypeScript: '~3.1.6',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.11.0-beta.0',
-  DevkitBuildNgPackagr: '~0.11.0-beta.0',
+  DevkitBuildAngular: '~0.11.0',
+  DevkitBuildNgPackagr: '~0.11.0',
 };

From 69078b54ad0287f7b04926f522f40c2d9345c0fb Mon Sep 17 00:00:00 2001
From: clydin <19598772+clydin@users.noreply.github.com>
Date: Tue, 27 Nov 2018 17:00:47 -0500
Subject: [PATCH 0467/1703] ci: run minimal tests on PRs and original set on
 release branches (#12920)

---
 .appveyor.yml    | 3 ++-
 appveyor-e2e.bat | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 appveyor-e2e.bat

diff --git a/.appveyor.yml b/.appveyor.yml
index e06ec0027ca0..c7d7537d1596 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -17,7 +17,7 @@ test_script:
   - node --version
   - yarn --version
   - yarn test
-  - node tests\legacy-cli\run_e2e.js --appveyor "--glob=tests/{basic,commands,generate,build/styles}/**"
+  - appveyor-e2e.bat
 
 build: off
 deploy: off
@@ -25,3 +25,4 @@ deploy: off
 cache:
   - node_modules -> yarn.lock
   - "%LOCALAPPDATA%\\Yarn"
+  
\ No newline at end of file
diff --git a/appveyor-e2e.bat b/appveyor-e2e.bat
new file mode 100644
index 000000000000..9d8e8b2d5888
--- /dev/null
+++ b/appveyor-e2e.bat
@@ -0,0 +1,6 @@
+@ECHO OFF
+IF defined APPVEYOR_PULL_REQUEST_NUMBER (
+    node tests\legacy-cli\run_e2e.js --appveyor "--glob=tests/basic/**"
+) ELSE (
+    node tests\legacy-cli\run_e2e.js --appveyor "--glob=tests/{basic,commands,generate,build/styles}/**"
+)
\ No newline at end of file

From 6b4179343d2377c992749cda2fb40f1139b4d427 Mon Sep 17 00:00:00 2001
From: clydin <19598772+clydin@users.noreply.github.com>
Date: Tue, 27 Nov 2018 17:01:24 -0500
Subject: [PATCH 0468/1703] feat(@schematics/update): add initial verbose
 option (#12995)

Currently displays the list of potential npm/yarn rc files and which of these were found.
---
 packages/schematics/update/update/index.ts    |  6 ++-
 packages/schematics/update/update/npm.ts      | 39 +++++++++++++------
 packages/schematics/update/update/schema.json |  4 ++
 3 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/packages/schematics/update/update/index.ts b/packages/schematics/update/update/index.ts
index 9a2ab9a55361..e56e18cc6fa8 100644
--- a/packages/schematics/update/update/index.ts
+++ b/packages/schematics/update/update/index.ts
@@ -783,7 +783,11 @@ export default function(options: UpdateSchema): Rule {
     return observableFrom([...allDependencies.keys()]).pipe(
       // Grab all package.json from the npm repository. This requires a lot of HTTP calls so we
       // try to parallelize as many as possible.
-      mergeMap(depName => getNpmPackageJson(depName, options.registry, logger, usingYarn)),
+      mergeMap(depName => getNpmPackageJson(
+        depName,
+        logger,
+        { registryUrl: options.registry, usingYarn, verbose: options.verbose },
+      )),
 
       // Build a map of all dependencies and their packageJson.
       reduce<NpmRepositoryPackageJson, Map<string, NpmRepositoryPackageJson>>(
diff --git a/packages/schematics/update/update/npm.ts b/packages/schematics/update/update/npm.ts
index 1f98ce493c67..1858b84259a2 100644
--- a/packages/schematics/update/update/npm.ts
+++ b/packages/schematics/update/update/npm.ts
@@ -21,8 +21,11 @@ const npmPackageJsonCache = new Map<string, Observable<NpmRepositoryPackageJson>
 let npmrc: { [key: string]: string };
 
 
-function readOptions(yarn = false): { [key: string]: string } {
-  // TODO: have a way to read options without using fs directly.
+function readOptions(
+  logger: logging.LoggerApi,
+  yarn = false,
+  showPotentials = false,
+): Record<string, string> {
   const cwd = process.cwd();
   const baseFilename = yarn ? 'yarnrc' : 'npmrc';
   const dotFilename = '.' + baseFilename;
@@ -42,16 +45,25 @@ function readOptions(yarn = false): { [key: string]: string } {
     path.join(homedir(), dotFilename),
   ];
 
-  const projectConfigLocations: string[] = [];
+  const projectConfigLocations: string[] = [
+    path.join(cwd, dotFilename),
+  ];
   const root = path.parse(cwd).root;
   for (let curDir = path.dirname(cwd); curDir && curDir !== root; curDir = path.dirname(curDir)) {
     projectConfigLocations.unshift(path.join(curDir, dotFilename));
   }
-  projectConfigLocations.push(path.join(cwd, dotFilename));
+
+  if (showPotentials) {
+    logger.info(`Locating potential ${baseFilename} files:`);
+  }
 
   let options: { [key: string]: string } = {};
   for (const location of [...defaultConfigLocations, ...projectConfigLocations]) {
     if (existsSync(location)) {
+      if (showPotentials) {
+        logger.info(`Trying '${location}'...found.`);
+      }
+
       const data = readFileSync(location, 'utf8');
       options = {
         ...options,
@@ -65,6 +77,8 @@ function readOptions(yarn = false): { [key: string]: string } {
           options.ca = readFileSync(cafile, 'utf8').replace(/\r?\n/, '\\n');
         } catch { }
       }
+    } else if (showPotentials) {
+      logger.info(`Trying '${location}'...not found.`);
     }
   }
 
@@ -86,9 +100,12 @@ function readOptions(yarn = false): { [key: string]: string } {
  */
 export function getNpmPackageJson(
   packageName: string,
-  registryUrl: string | undefined,
-  _logger: logging.LoggerApi,
-  usingYarn = false,
+  logger: logging.LoggerApi,
+  options?: {
+    registryUrl?: string;
+    usingYarn?: boolean;
+    verbose?: boolean;
+  },
 ): Observable<Partial<NpmRepositoryPackageJson>> {
   const cachedResponse = npmPackageJsonCache.get(packageName);
   if (cachedResponse) {
@@ -97,12 +114,12 @@ export function getNpmPackageJson(
 
   if (!npmrc) {
     try {
-      npmrc = readOptions();
+      npmrc = readOptions(logger, false, options && options.verbose);
     } catch { }
 
-    if (usingYarn) {
+    if (options && options.usingYarn) {
       try {
-        npmrc = { ...npmrc, ...readOptions(true) };
+        npmrc = { ...npmrc, ...readOptions(logger, true, options && options.verbose) };
       } catch { }
     }
   }
@@ -112,7 +129,7 @@ export function getNpmPackageJson(
     {
       'full-metadata': true,
       ...npmrc,
-      registry: registryUrl,
+      registry: options && options.registryUrl,
     },
   );
 
diff --git a/packages/schematics/update/update/schema.json b/packages/schematics/update/update/schema.json
index d5b020bf0fa3..8e0009bd1ec6 100644
--- a/packages/schematics/update/update/schema.json
+++ b/packages/schematics/update/update/schema.json
@@ -54,6 +54,10 @@
         }
       ]
     },
+    "verbose": {
+      "description": "Display additional details during the update process.",
+      "type": "boolean"
+    },
     "packageManager": {
       "description": "The preferred package manager configuration files to use for registry settings.",
       "type": "string",

From 508d4df48231d4db11b690c55d51a57094a9e3ff Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 27 Nov 2018 23:02:23 +0100
Subject: [PATCH 0469/1703] choreUpdate angular and tsickle dependencies
 (#13034)

* build: update `@angular/packages` to `7.1.0`

* feat(@schematics/angular): use tsickle `>=0.34.0` when creating a library

This is the official version that supports 3.1+

* feat(@schematics/angular): use angular version `7.1.0`
---
 package.json                                  |   4 +-
 .../angular_devkit/build_angular/package.json |  26 ++--
 .../build_ng_packagr/package.json             |   6 +-
 packages/ngtools/webpack/package.json         |   4 +-
 packages/schematics/angular/library/index.ts  |   2 +-
 yarn.lock                                     | 113 +++++++++---------
 6 files changed, 78 insertions(+), 77 deletions(-)

diff --git a/package.json b/package.json
index dfafcefd6e02..27fa9ebcd2a7 100644
--- a/package.json
+++ b/package.json
@@ -73,8 +73,8 @@
     "yarn": "^1.10.1"
   },
   "devDependencies": {
-    "@angular/compiler": "^7.0.3",
-    "@angular/compiler-cli": "^7.0.3",
+    "@angular/compiler": "^7.1.0",
+    "@angular/compiler-cli": "^7.1.0",
     "@bazel/karma": "^0.20.3",
     "@bazel/typescript": "0.20.3",
     "@ngtools/json-schema": "^1.1.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 8edd6a986c37..61b3093532d4 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -57,19 +57,19 @@
     "node-sass": "4.10.0"
   },
   "devDependencies": {
-    "@angular/animations": "^7.0.3",
-    "@angular/cdk": "^7.0.3",
-    "@angular/common": "^7.0.3",
-    "@angular/compiler": "^7.0.3",
-    "@angular/compiler-cli": "^7.0.3",
-    "@angular/core": "^7.0.3",
-    "@angular/http": "^7.0.3",
-    "@angular/material": "^7.0.3",
-    "@angular/platform-browser": "^7.0.3",
-    "@angular/platform-browser-dynamic": "^7.0.3",
-    "@angular/platform-server": "^7.0.3",
-    "@angular/router": "^7.0.3",
-    "@angular/service-worker": "^7.0.3",
+    "@angular/animations": "^7.1.0",
+    "@angular/cdk": "^7.1.0",
+    "@angular/common": "^7.1.0",
+    "@angular/compiler": "^7.1.0",
+    "@angular/compiler-cli": "^7.1.0",
+    "@angular/core": "^7.1.0",
+    "@angular/http": "^7.1.0",
+    "@angular/material": "^7.1.0",
+    "@angular/platform-browser": "^7.1.0",
+    "@angular/platform-browser-dynamic": "^7.1.0",
+    "@angular/platform-server": "^7.1.0",
+    "@angular/router": "^7.1.0",
+    "@angular/service-worker": "^7.1.0",
     "codelyzer": "^4.2.1",
     "core-js": "^2.4.1",
     "bootstrap": "^4.0.0",
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index 0d3d3007202c..9a4692a8b905 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -15,10 +15,10 @@
     "ng-packagr": "^2.2.0 || ^3.0.0 || ^4.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "^7.0.3",
-    "@angular/compiler-cli": "^7.0.3",
+    "@angular/compiler": "^7.1.0",
+    "@angular/compiler-cli": "^7.1.0",
     "ng-packagr": "^4.2.0",
-    "tsickle": ">=0.27.3",
+    "tsickle": ">=0.34.0",
     "tslib": "^1.9.0"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 0d4d45727ff6..3e7c5552a25d 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -33,8 +33,8 @@
     "webpack": "^4.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "^7.0.3",
-    "@angular/compiler-cli": "^7.0.3",
+    "@angular/compiler": "^7.1.0",
+    "@angular/compiler-cli": "^7.1.0",
     "typescript": "~3.1.6",
     "webpack": "^4.0.0"
   }
diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index 07b296125b84..48af3d281104 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -112,7 +112,7 @@ function addDependenciesToPackageJson() {
       {
         type: NodeDependencyType.Dev,
         name: 'tsickle',
-        version: '>=0.29.0',
+        version: '>=0.34.0',
       },
       {
         type: NodeDependencyType.Dev,
diff --git a/yarn.lock b/yarn.lock
index 5fdfd88562cb..4b82b5ec463f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,33 +2,33 @@
 # yarn lockfile v1
 
 
-"@angular/animations@^7.0.3":
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.0.3.tgz#04bf1881e82b5b2eaf378728085ec12e83d67c72"
-  integrity sha512-jCRHlt+ghfSnP5a8HKr6R/Adc5Cq7i/mcYsn3V6M2QBpGFCVmy0ZWZa66QOhRaqler8u8EGi1PdoCCoGAZc4OA==
+"@angular/animations@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.1.0.tgz#3f03175217a45b72e53310d9ab35e69802ad9555"
+  integrity sha512-1Sje3qptVsTxPP4LwcvVPQun4P156wsEEwwCXoCO3NuP+tS67syU8M69uIpyDbpnx2ZeuWpJ9HfvKe1ljeqcuw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cdk@^7.0.3":
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.0.3.tgz#6f6ca3203470dfa91858a421d72c8e41765644e5"
-  integrity sha512-QT7U2tOBVfwn8Q71Nyh0UjlyXfZNKdanq3+b8GJ/+IB/d8mVdMRTXBGQ4PqY7CP+wpkgm+wbbUt3urZF1AqdmQ==
+"@angular/cdk@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.1.0.tgz#7e5c3e3631947ef91413a83997ec4edec92cdd1c"
+  integrity sha512-dY740pKcIRtKr6n6NomrgqfdEj988urTZ9I/bfJjxF5fdhnSjyhEvDlB55EHsrF+bTTZbZXRmv7AwOQ9GJnD9w==
   dependencies:
     tslib "^1.7.1"
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/common@^7.0.3":
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.0.3.tgz#c0056185251649264f0d3ee5a5a446549a8a1d78"
-  integrity sha512-aiuQh6+5kWFp34SYEtpnkAJWU3Qn17S/9LjWSZbgfiaYG6MyszepxqLZPBSBPTElxx2u5VoCPh97+TpKoDqx+g==
+"@angular/common@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.1.0.tgz#89b0a34fd8f2a323704369551be4ac7491dda0b7"
+  integrity sha512-tu6Hv3/z3K2NLD4ndBioGtcykhbwhMJYUWb0NvaOLhaVYColWKPFpkflEorDWB+3/IWkpELGhA/HQ2zQh7EVyg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^7.0.3":
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.0.3.tgz#5d2567056251a8417ad0154de5d6757fa502f837"
-  integrity sha512-8/SNgyce0Eqhfn8N/XkwSDSxTJryA+/EVLA68D2IopOSg/95u6GgYv3mVNNQnclSzC4g1FuK0zt4z0zRIWZ6JA==
+"@angular/compiler-cli@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.1.0.tgz#b02b2f94b9510caadc2b16bf1f97aa41d21a3ce2"
+  integrity sha512-Q42B3YmjMNYWTxTWfyDDFa6HSVqwY3rZO5Kp3Q/NKhQ6w/WddduxjARf/OCbtp0bVX3wZNObS6nO4H65rNCtsw==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^1.4.2"
@@ -39,70 +39,71 @@
     reflect-metadata "^0.1.2"
     shelljs "^0.8.1"
     source-map "^0.6.1"
+    tslib "^1.9.0"
     yargs "9.0.1"
 
-"@angular/compiler@^7.0.3":
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.0.3.tgz#c9bf049b92d37f9fec932698f52743c3be8ad6e7"
-  integrity sha512-1eF4PzWej9eoEQhHwuMxujx9B4oSjP70vORIs9pgXF8O4nWDWTKtfPQyNCPxc8mY+Fwb0+nSOEvvA+Ou8Hnreg==
+"@angular/compiler@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.1.0.tgz#3455eeb575d0b9b68a099b5781d3cce78468146a"
+  integrity sha512-1Hjx6e+lVXZyXFFe4OW34ZpiaGEYyB1MQ7k2C+cMm0ABMQS3LsWT4DYhY7bk0mmMuuXQj66C62MX76ladDtdIg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^7.0.3":
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.0.3.tgz#e78e10c932fd6243b99723b76e23135b88e4f861"
-  integrity sha512-x/OYYykVsi2vrKlYQJ37I8HYAI/s/CtL3Sd9bl87F6AnqLWnnKIxQaofT/ShfAfdP44LQoN5BNp5j+sjs8K4Kg==
+"@angular/core@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.1.0.tgz#a55fbbc28b2c9da767121f433733683780266eb3"
+  integrity sha512-7mMoWuf8jAf4hcjQ0Exz2w9Qx9SRwNuDdtEZFGWH9dZWz5uPCewrN+Kt9MigMfSYGEdLAPcRMIuvFHDCS8B3Hg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^7.0.3":
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.0.3.tgz#5447595d289ce5a9607c7bbecaddd954d9f0b068"
-  integrity sha512-aL+z1/tbVY8oJw5v46rbMli5vBGDVyJvs95d1l2n3hWnwMTzS9AVetjcL3B3uruAYuXoh4QlSJ+ysBgdmV1+IA==
+"@angular/http@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.1.0.tgz#9243d6a0fae5b5fd12aa9408e3dbaffad54deb9b"
+  integrity sha512-Je3D374ccxTFGpFu9tXi6k95vTaG+3jYYtEQ7i43CHbaGyHR/KwMEr8DEzrABd1zCSxBX71WwHuReG2wBANfcA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/material@^7.0.3":
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/@angular/material/-/material-7.0.3.tgz#81df814ab4da7df4f0f7241852950795936d3cd5"
-  integrity sha512-acJ2zU44k/rsd4OeTdAMVP0R3te8aXwfubDQGc8YI1CdRVW1XqMSvAWkToYDVaGvnZV53zQt/iSi1XWaSXYf1Q==
+"@angular/material@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/material/-/material-7.1.0.tgz#441f2d03a97a1fa35546b61dcde86db34f0f5efc"
+  integrity sha512-bgotNpSfGLjNZ1AcTyhs6XS7trF4I7UHwQmfa0l8y3Gf9plwErPDfQe2XqnayRyG9nTwHj9f1lQ45X5mr3/0/A==
   dependencies:
     tslib "^1.7.1"
 
-"@angular/platform-browser-dynamic@^7.0.3":
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.0.3.tgz#cea2f3d2eb5b98305182a18aa700b4f3fa4b4c17"
-  integrity sha512-hrdBtlkKyq2CZRY6z2RWFTcGF4n4MirM7EEzByEjlgiXSU+c4qHYb0a8z30qdCF1D/DZ6Md7cRRH+1uR/rCqxQ==
+"@angular/platform-browser-dynamic@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.1.0.tgz#c7d07f6b1c08fa12c54b4e310da930da613c7e6e"
+  integrity sha512-0yG6e/ZOI9LNUGgSjJ7xUWZhC41z87klO0oEHhEzQeaDxO/SOBasbMiws4ETuhulMgOR81UCAVobXMoOQJbfWg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^7.0.3":
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.0.3.tgz#9b02347a76db5a9ad42c2b9beaff078060168e39"
-  integrity sha512-OKDGce2dYw9Fw8agpcSNJA+ecMMnMQCi9xoPHNIp1pYdvte7mUXKUvUzR7chqQ7b83d7SzVeEhqAZYa4BUwFRA==
+"@angular/platform-browser@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.1.0.tgz#0d40fed536a08d66ea580f6c4d2976310d559111"
+  integrity sha512-kCrmaNZukWaXk6qlvzyE1Dln/YB2XOGbhb9e+y3NE94beCgDTWseKViMevIoGm/H+Lzf0I2RPg8GMKkQ7pQwNQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-server@^7.0.3":
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.0.3.tgz#53991ea16b4a88c5452a7e9ad7b45a274dce4d5d"
-  integrity sha512-yXcFwsym0zMjjIJmrD/w1vLr+Lk0MrqdBtl2MG289K65n3DLMP5YQL3vWB78x8G5MvGK+wxwEdTHNewSLELjEA==
+"@angular/platform-server@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.1.0.tgz#d5bfd11981abe7a6cae8788d9c102806a2ae7a2c"
+  integrity sha512-aQk62TT40dS1DtOvmbgVzz2bxB9iDn231AzIfJnsWJCwFqYF6sqwJQTIrdEyHYdSQDl7V+i40nJH6lSYjd3tBA==
   dependencies:
     domino "^2.1.0"
     tslib "^1.9.0"
     xhr2 "^0.1.4"
 
-"@angular/router@^7.0.3":
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.0.3.tgz#7cf86ad1667a892998ec3670ab7ba0b2b373c24a"
-  integrity sha512-885svORDpD9DkaMKjvGwn4g5bf0n3JR8os+gCNhzk0p4TPfpc+vmNo8SyY2jwdLMh2rQzrUQTDkn9SzzgiOfDQ==
+"@angular/router@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.1.0.tgz#19b66e127065dfc2106793e81d660790422e73b0"
+  integrity sha512-yrjNvCj7XbXmZSmQfXGEkWJ9ogRZmIk5GHyOfGKNNRXhQK2OBznY0Avyer2r3mcgV/RLrI1FYQyKN9mdLftf6g==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@^7.0.3":
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.0.3.tgz#a3989fb3ed578aab10ca3eee31a6ae95cf6908db"
-  integrity sha512-LBiXMl/nBlCv2slPWzsPC0eNyDDOUHjEJsb+z3EbbeGO+IvhpOJcLiHaJhUV7piduJoX2WpssszOMOaJUUqbfA==
+"@angular/service-worker@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.1.0.tgz#35f287534febe40e71fc371d1893a5dffe8f5466"
+  integrity sha512-lmeJl8JDvmtDFM7h1gUs8vVsJhMuRKakBIwtQTWEX8TYRh/6fZCObHNjoGGps3BAPrgAbCyxJE2g3rhb/Y4YqA==
   dependencies:
     tslib "^1.9.0"
 
@@ -9765,10 +9766,10 @@ tsickle@0.28.0:
     source-map "^0.6.0"
     source-map-support "^0.5.0"
 
-tsickle@>=0.27.3:
-  version "0.33.1"
-  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.33.1.tgz#eee4ebabeda3bcd8afc32cee34c822cbe3e839ec"
-  integrity sha512-SpW2G3PvDGs4a5sMXPlWnCWHWRviWjSlI3U0734e3fU3U39VAE0NPr8M3W1cuL/OU/YXheYipGeEwtIJ5k0NHQ==
+tsickle@>=0.34.0:
+  version "0.34.0"
+  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.34.0.tgz#10187fa6401a288a65efb93a60bf28b2ff95f90b"
+  integrity sha512-O3wCPRtL18Hc/ZBnaiKwmmjVzeCWTOTpsi0btfC7FWL3RnXpxLPxD6hoJ0QEXuSfG/0QJk+MWNjqT9N6fOyyIg==
   dependencies:
     minimist "^1.2.0"
     mkdirp "^0.5.1"

From 717b02f533f4c131096fdada0235141addfcb372 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 30 Nov 2018 20:53:54 +0100
Subject: [PATCH 0470/1703] ci: add ts api guardian (#12010)

* refactor: fix `import` and `export` paths to work with classic resolution

`ts-api-guardian` only support classic module resolution which means that we need to specify `index` so that the resolution works.

* build: add `npm_package` to packages

* build: add ts-api-guardian to repo

* test: add api golden files

* refactor: use proper namespace instead of alias export

* refactor: use proper namspace einstead of alias export

* build: add `_golden_api` files

At the moment ts api guardian doesn't support aliased symbols as namespaces, this is a workaround to still have namespaced symbols in the final golden file.

* build: update angular archive for workspace

* test: fix reference to `TestHost` to use namespace

* refactor: create `fs` namespace instead of aliased export

* test: update api golden file for `@angular-devkit/core/node`
---
 .circleci/config.yml                          |    2 +-
 WORKSPACE                                     |   23 +-
 etc/api/BUILD                                 |   50 +
 .../angular_devkit/architect/src/index.d.ts   |  102 ++
 .../architect/testing/index.d.ts              |   28 +
 .../angular_devkit/benchmark/src/index.d.ts   |   91 ++
 .../build_optimizer/src/_golden-api.d.ts      |   23 +
 etc/api/angular_devkit/core/node/index.d.ts   |   57 +
 .../core/node/testing/index.d.ts              |    8 +
 .../angular_devkit/core/src/_golden-api.d.ts  | 1059 +++++++++++++++++
 .../schematics/src/_golden-api.d.ts           |  700 +++++++++++
 .../schematics/tasks/index.d.ts               |   42 +
 .../schematics/testing/index.d.ts             |   16 +
 .../schematics/tools/index.d.ts               |  150 +++
 packages/angular_devkit/architect/BUILD       |   31 +
 packages/angular_devkit/benchmark/BUILD       |    9 +-
 packages/angular_devkit/build_optimizer/BUILD |    9 +-
 .../build_optimizer/src/_golden-api.ts        |    9 +
 packages/angular_devkit/core/BUILD            |   11 +-
 packages/angular_devkit/core/node/fs.ts       |   46 +-
 packages/angular_devkit/core/node/index.ts    |    5 +-
 packages/angular_devkit/core/node/resolve.ts  |    8 +-
 .../angular_devkit/core/src/_golden-api.ts    |   53 +
 .../angular_devkit/core/src/experimental.ts   |    2 +-
 packages/angular_devkit/core/src/index.ts     |   12 +-
 .../angular_devkit/core/src/json/index.ts     |    2 +-
 .../angular_devkit/core/src/json/parser.ts    |    2 +-
 .../core/src/terminal/colors.ts               |   55 +-
 .../angular_devkit/core/src/terminal/index.ts |    4 +-
 .../angular_devkit/core/src/terminal/text.ts  |   55 +-
 .../core/src/virtual-fs/host/index.ts         |    5 +-
 .../core/src/virtual-fs/host/record_spec.ts   |    3 +-
 .../core/src/virtual-fs/host/test.ts          |  203 ++--
 .../core/src/virtual-fs/host/test_spec.ts     |    4 +-
 .../core/src/virtual-fs/index.ts              |    2 +-
 packages/angular_devkit/schematics/BUILD      |   12 +-
 .../schematics/src/_golden-api.ts             |   13 +
 .../angular_devkit/schematics/src/index.ts    |    6 +-
 tsconfig.json                                 |    1 +
 39 files changed, 2698 insertions(+), 215 deletions(-)
 create mode 100644 etc/api/BUILD
 create mode 100644 etc/api/angular_devkit/architect/src/index.d.ts
 create mode 100644 etc/api/angular_devkit/architect/testing/index.d.ts
 create mode 100644 etc/api/angular_devkit/benchmark/src/index.d.ts
 create mode 100644 etc/api/angular_devkit/build_optimizer/src/_golden-api.d.ts
 create mode 100644 etc/api/angular_devkit/core/node/index.d.ts
 create mode 100644 etc/api/angular_devkit/core/node/testing/index.d.ts
 create mode 100644 etc/api/angular_devkit/core/src/_golden-api.d.ts
 create mode 100644 etc/api/angular_devkit/schematics/src/_golden-api.d.ts
 create mode 100644 etc/api/angular_devkit/schematics/tasks/index.d.ts
 create mode 100644 etc/api/angular_devkit/schematics/testing/index.d.ts
 create mode 100644 etc/api/angular_devkit/schematics/tools/index.d.ts
 create mode 100644 packages/angular_devkit/build_optimizer/src/_golden-api.ts
 create mode 100644 packages/angular_devkit/core/src/_golden-api.ts
 create mode 100644 packages/angular_devkit/schematics/src/_golden-api.ts

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ad4b1b8f30bd..98faf1532252 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -126,7 +126,7 @@ jobs:
     steps:
       - attach_workspace: *attach_options
       - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
-      - run: bazel test //packages/...
+      - run: bazel test ...
 
   snapshot_publish:
     <<: *defaults
diff --git a/WORKSPACE b/WORKSPACE
index 275af432ac1d..406f14f95d7e 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,5 +1,13 @@
 workspace(name = "angular_cli")
 
+# This is required by Angular Workspace
+http_archive(
+    name = "bazel_skylib",
+    url = "https://github.com/bazelbuild/bazel-skylib/archive/0.5.0.zip",
+    strip_prefix = "bazel-skylib-0.5.0",
+    sha256 = "ca4e3b8e4da9266c3a9101c8f4704fe2e20eb5625b2a6a7d2d7d45e3dd4efffd",
+)
+
 # We get Buildifier from here.
 http_archive(
     name = "com_github_bazelbuild_buildtools",
@@ -11,8 +19,8 @@ http_archive(
 # Load the TypeScript rules, its dependencies, and setup the workspace.
 http_archive(
     name = "build_bazel_rules_typescript",
-    url = "https://github.com/bazelbuild/rules_typescript/archive/0.20.3.zip",
-    strip_prefix = "rules_typescript-0.20.3",
+    url = "https://github.com/bazelbuild/rules_typescript/archive/8ea1a55cf5cf8be84ddfeefc0940769b80da792f.zip",
+    strip_prefix = "rules_typescript-8ea1a55cf5cf8be84ddfeefc0940769b80da792f",
 )
 
 load("@build_bazel_rules_typescript//:package.bzl", "rules_typescript_dependencies")
@@ -26,6 +34,17 @@ load("@io_bazel_rules_go//go:def.bzl", "go_register_toolchains", "go_rules_depen
 go_rules_dependencies()
 go_register_toolchains()
 
+# TS API Guardian resides in Angular
+http_archive(
+    name = "angular",
+    url = "https://github.com/angular/angular/archive/7.1.0-rc.0.zip",
+    strip_prefix = "angular-7.1.0-rc.0",
+    sha256 = "dbf3ae2d60b5384715bc002c695be0141f8c9219396ac1edbdc7023bd400c8a1",
+)
+
+load("@angular//:index.bzl", "ng_setup_workspace")
+ng_setup_workspace()
+
 load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
 ts_setup_workspace()
 
diff --git a/etc/api/BUILD b/etc/api/BUILD
new file mode 100644
index 000000000000..fb66f90a6ad0
--- /dev/null
+++ b/etc/api/BUILD
@@ -0,0 +1,50 @@
+load("@angular//tools/ts-api-guardian:index.bzl", "ts_api_guardian_test")
+
+[ts_api_guardian_test(
+    name = "%s_%s_%sapi" % (
+        bundle[0],
+        bundle[1],
+        bundle[2].replace("src/", "").replace("index", "").replace("_golden-api", "").replace("/", "_"),
+    ),
+    actual = "angular_cli/packages/%s/%s/npm_package/%s.d.ts" % (
+        bundle[0],
+        bundle[1],
+        bundle[2],
+    ),
+    data = glob([
+        "%s/%s/**/*.d.ts" % (
+            bundle[0],
+            bundle[1],
+        ),
+    ]) + [
+        "//packages/%s/%s:npm_package" % (
+            bundle[0],
+            bundle[1],
+        ),
+    ],
+    golden = "angular_cli/etc/api/%s/%s/%s.d.ts" % (
+        bundle[0],
+        bundle[1],
+        bundle[2],
+    ),
+    # We don't want to analyse these exports nor add them to the golden files
+    # in most cases it's because Ts API Guardian doesn't support Symbol Aliases.
+    strip_export_pattern = [
+        # @angular-devkit/schematics
+        "^workflow$",
+        "^formats$",
+        # @angular-devkit/build-optimizer
+        "^buildOptimizerLoader$",
+    ],
+    allow_module_identifiers = [
+        "fs",
+        "ts",
+        "ajv",
+        "Symbol",
+        "webpack",
+    ],
+    # At the moment using this will ignore a big change
+    use_angular_tag_rules = False,
+) for bundle in [b[:-len(".d.ts")].split("/", 2) for b in glob(
+    ["**/*.d.ts"],
+)]]
diff --git a/etc/api/angular_devkit/architect/src/index.d.ts b/etc/api/angular_devkit/architect/src/index.d.ts
new file mode 100644
index 000000000000..d20842d03b88
--- /dev/null
+++ b/etc/api/angular_devkit/architect/src/index.d.ts
@@ -0,0 +1,102 @@
+export declare class Architect {
+    constructor(_workspace: experimental.workspace.Workspace);
+    getBuilder<OptionsT>(builderDescription: BuilderDescription, context: BuilderContext): Builder<OptionsT>;
+    getBuilderConfiguration<OptionsT>(targetSpec: TargetSpecifier): BuilderConfiguration<OptionsT>;
+    getBuilderDescription<OptionsT>(builderConfig: BuilderConfiguration<OptionsT>): Observable<BuilderDescription>;
+    listProjectTargets(projectName: string): string[];
+    loadArchitect(): Observable<this>;
+    run<OptionsT>(builderConfig: BuilderConfiguration<OptionsT>, partialContext?: Partial<BuilderContext>): Observable<BuildEvent>;
+    validateBuilderOptions<OptionsT>(builderConfig: BuilderConfiguration<OptionsT>, builderDescription: BuilderDescription): Observable<BuilderConfiguration<OptionsT>>;
+}
+
+export declare class ArchitectNotYetLoadedException extends BaseException {
+    constructor();
+}
+
+export interface Builder<OptionsT> {
+    run(builderConfig: BuilderConfiguration<Partial<OptionsT>>): Observable<BuildEvent>;
+}
+
+export declare class BuilderCannotBeResolvedException extends BaseException {
+    constructor(builder: string);
+}
+
+export interface BuilderConfiguration<OptionsT = {}> {
+    builder: string;
+    options: OptionsT;
+    projectType: string;
+    root: Path;
+    sourceRoot?: Path;
+}
+
+export interface BuilderConstructor<OptionsT> {
+    new (context: BuilderContext): Builder<OptionsT>;
+}
+
+export interface BuilderContext {
+    architect: Architect;
+    host: virtualFs.Host<{}>;
+    logger: logging.Logger;
+    workspace: experimental.workspace.Workspace;
+}
+
+export interface BuilderDescription {
+    description: string;
+    name: string;
+    schema: JsonObject;
+}
+
+export declare class BuilderNotFoundException extends BaseException {
+    constructor(builder: string);
+}
+
+export interface BuilderPaths {
+    class: Path;
+    description: string;
+    schema: Path;
+}
+
+export interface BuilderPathsMap {
+    builders: {
+        [k: string]: BuilderPaths;
+    };
+}
+
+export interface BuildEvent {
+    success: boolean;
+}
+
+export declare class ConfigurationNotFoundException extends BaseException {
+    constructor(projectName: string, configurationName: string);
+}
+
+export declare class ProjectNotFoundException extends BaseException {
+    constructor(projectName: string);
+}
+
+export interface Target<T = JsonObject> {
+    builder: string;
+    configurations?: {
+        [k: string]: TargetConfiguration<T>;
+    };
+    options: TargetOptions<T>;
+}
+
+export declare type TargetConfiguration<T = JsonObject> = Partial<T>;
+
+export interface TargetMap {
+    [k: string]: Target;
+}
+
+export declare class TargetNotFoundException extends BaseException {
+    constructor(projectName: string, targetName: string);
+}
+
+export declare type TargetOptions<T = JsonObject> = T;
+
+export interface TargetSpecifier<OptionsT = {}> {
+    configuration?: string;
+    overrides?: Partial<OptionsT>;
+    project: string;
+    target: string;
+}
diff --git a/etc/api/angular_devkit/architect/testing/index.d.ts b/etc/api/angular_devkit/architect/testing/index.d.ts
new file mode 100644
index 000000000000..df6a94e5de15
--- /dev/null
+++ b/etc/api/angular_devkit/architect/testing/index.d.ts
@@ -0,0 +1,28 @@
+export declare const DefaultTimeout = 45000;
+
+export declare function request(url: string, headers?: {}): Promise<string>;
+
+export declare function runTargetSpec(host: TestProjectHost, targetSpec: TargetSpecifier, overrides?: {}, timeout?: number, logger?: logging.Logger): Observable<BuildEvent>;
+
+export declare class TestLogger extends logging.Logger {
+    constructor(name: string, parent?: logging.Logger | null);
+    clear(): void;
+    includes(message: string): boolean;
+    test(re: RegExp): boolean;
+}
+
+export declare class TestProjectHost extends NodeJsSyncHost {
+    protected _templateRoot: Path;
+    constructor(_templateRoot: Path);
+    appendToFile(path: string, str: string): void;
+    copyFile(from: string, to: string): void;
+    fileMatchExists(dir: string, regex: RegExp): PathFragment | undefined;
+    initialize(): Observable<void>;
+    replaceInFile(path: string, match: RegExp | string, replacement: string): void;
+    restore(): Observable<void>;
+    root(): Path;
+    scopedSync(): virtualFs.SyncDelegateHost<Stats>;
+    writeMultipleFiles(files: {
+        [path: string]: string | ArrayBufferLike | Buffer;
+    }): void;
+}
diff --git a/etc/api/angular_devkit/benchmark/src/index.d.ts b/etc/api/angular_devkit/benchmark/src/index.d.ts
new file mode 100644
index 000000000000..9c3713d1a78b
--- /dev/null
+++ b/etc/api/angular_devkit/benchmark/src/index.d.ts
@@ -0,0 +1,91 @@
+export interface AggregatedMetric extends Metric {
+    componentValues: number[];
+}
+
+export interface AggregatedProcessStats {
+    cpu: number;
+    ctime: number;
+    elapsed: number;
+    memory: number;
+    pid: number;
+    ppid: number;
+    processes: number;
+    timestamp: number;
+}
+
+export declare const aggregateMetricGroups: (g1: MetricGroup, g2: MetricGroup) => MetricGroup;
+
+export declare const aggregateMetrics: (m1: Metric | AggregatedMetric, m2: Metric | AggregatedMetric) => AggregatedMetric;
+
+export declare type BenchmarkReporter = (command: Command, groups: MetricGroup[]) => void;
+
+export declare type Capture = (process: MonitoredProcess) => Observable<MetricGroup>;
+
+export declare class Command {
+    args: string[];
+    cmd: string;
+    cwd: string;
+    expectedExitCode: number;
+    constructor(cmd: string, args?: string[], cwd?: string, expectedExitCode?: number);
+    toString(): string;
+}
+
+export declare const cumulativeMovingAverage: (acc: number, val: number, accSize: number) => number;
+
+export declare const defaultReporter: (logger: logging.Logger) => BenchmarkReporter;
+
+export declare const defaultStatsCapture: Capture;
+
+export declare class LocalMonitoredProcess implements MonitoredProcess {
+    stats$: Observable<AggregatedProcessStats>;
+    stderr$: Observable<Buffer>;
+    stdout$: Observable<Buffer>;
+    constructor(command: Command);
+    run(): Observable<number>;
+}
+
+export declare function main({ args, stdout, stderr, }: MainOptions): Promise<0 | 1>;
+
+export interface MainOptions {
+    args: string[];
+    stderr?: ProcessOutput;
+    stdout?: ProcessOutput;
+}
+
+export declare const max: (v1: number, v2: number) => number;
+
+export declare class MaximumRetriesExceeded extends BaseException {
+    constructor(retries: number);
+}
+
+export interface Metric {
+    componentValues?: number[];
+    name: string;
+    unit: string;
+    value: number;
+}
+
+export interface MetricGroup {
+    metrics: (Metric | AggregatedMetric)[];
+    name: string;
+}
+
+export interface MonitoredProcess {
+    stats$: Observable<AggregatedProcessStats>;
+    stderr$: Observable<Buffer>;
+    stdout$: Observable<Buffer>;
+    run(): Observable<number>;
+    toString(): string;
+}
+
+export declare function runBenchmark({ command, captures, reporters, iterations, retries, logger, }: RunBenchmarkOptions): Observable<MetricGroup[]>;
+
+export interface RunBenchmarkOptions {
+    captures: Capture[];
+    command: Command;
+    expectedExitCode?: number;
+    iterations?: number;
+    logger?: logging.Logger;
+    reporters: BenchmarkReporter[];
+    retries?: number;
+}
diff --git a/etc/api/angular_devkit/build_optimizer/src/_golden-api.d.ts b/etc/api/angular_devkit/build_optimizer/src/_golden-api.d.ts
new file mode 100644
index 000000000000..e3e9a7ef1a8d
--- /dev/null
+++ b/etc/api/angular_devkit/build_optimizer/src/_golden-api.d.ts
@@ -0,0 +1,23 @@
+export declare function buildOptimizer(options: BuildOptimizerOptions): TransformJavascriptOutput;
+
+export default function buildOptimizerLoader(this: webpack.loader.LoaderContext, content: string, previousSourceMap: RawSourceMap): void;
+
+export declare function getFoldFileTransformer(program: ts.Program): ts.TransformerFactory<ts.SourceFile>;
+
+export declare function getImportTslibTransformer(): ts.TransformerFactory<ts.SourceFile>;
+
+export declare function getPrefixClassesTransformer(): ts.TransformerFactory<ts.SourceFile>;
+
+export declare function getPrefixFunctionsTransformer(): ts.TransformerFactory<ts.SourceFile>;
+
+export declare function getScrubFileTransformer(program: ts.Program): ts.TransformerFactory<ts.SourceFile>;
+
+export declare function getWrapEnumsTransformer(): ts.TransformerFactory<ts.SourceFile>;
+
+export declare function testImportTslib(content: string): boolean;
+
+export declare function testPrefixClasses(content: string): boolean;
+
+export declare function testScrubFile(content: string): boolean;
+
+export declare function transformJavascript(options: TransformJavascriptOptions): TransformJavascriptOutput;
diff --git a/etc/api/angular_devkit/core/node/index.d.ts b/etc/api/angular_devkit/core/node/index.d.ts
new file mode 100644
index 000000000000..6c2e882fc1cc
--- /dev/null
+++ b/etc/api/angular_devkit/core/node/index.d.ts
@@ -0,0 +1,57 @@
+export declare function createConsoleLogger(verbose?: boolean, stdout?: ProcessOutput, stderr?: ProcessOutput): logging.Logger;
+
+export declare namespace fs {
+    function isFile(filePath: string): boolean;
+    function isDirectory(filePath: string): boolean;
+}
+
+export declare class ModuleNotFoundException extends BaseException {
+    readonly basePath: string;
+    readonly code: string;
+    readonly moduleName: string;
+    constructor(moduleName: string, basePath: string);
+}
+
+export declare class NodeJsAsyncHost implements virtualFs.Host<fs.Stats> {
+    readonly capabilities: virtualFs.HostCapabilities;
+    delete(path: Path): Observable<void>;
+    exists(path: Path): Observable<boolean>;
+    isDirectory(path: Path): Observable<boolean>;
+    isFile(path: Path): Observable<boolean>;
+    list(path: Path): Observable<PathFragment[]>;
+    read(path: Path): Observable<virtualFs.FileBuffer>;
+    rename(from: Path, to: Path): Observable<void>;
+    stat(path: Path): Observable<virtualFs.Stats<fs.Stats>> | null;
+    watch(path: Path, _options?: virtualFs.HostWatchOptions): Observable<virtualFs.HostWatchEvent> | null;
+    write(path: Path, content: virtualFs.FileBuffer): Observable<void>;
+}
+
+export declare class NodeJsSyncHost implements virtualFs.Host<fs.Stats> {
+    readonly capabilities: virtualFs.HostCapabilities;
+    delete(path: Path): Observable<void>;
+    exists(path: Path): Observable<boolean>;
+    isDirectory(path: Path): Observable<boolean>;
+    isFile(path: Path): Observable<boolean>;
+    list(path: Path): Observable<PathFragment[]>;
+    read(path: Path): Observable<virtualFs.FileBuffer>;
+    rename(from: Path, to: Path): Observable<void>;
+    stat(path: Path): Observable<virtualFs.Stats<fs.Stats>>;
+    watch(path: Path, _options?: virtualFs.HostWatchOptions): Observable<virtualFs.HostWatchEvent> | null;
+    write(path: Path, content: virtualFs.FileBuffer): Observable<void>;
+}
+
+export interface ProcessOutput {
+    write(buffer: string | Buffer): boolean;
+}
+
+export declare function resolve(x: string, options: ResolveOptions): string;
+
+export interface ResolveOptions {
+    basedir: string;
+    checkGlobal?: boolean;
+    checkLocal?: boolean;
+    extensions?: string[];
+    paths?: string[];
+    preserveSymlinks?: boolean;
+    resolvePackageJson?: boolean;
+}
diff --git a/etc/api/angular_devkit/core/node/testing/index.d.ts b/etc/api/angular_devkit/core/node/testing/index.d.ts
new file mode 100644
index 000000000000..0c9c161d0878
--- /dev/null
+++ b/etc/api/angular_devkit/core/node/testing/index.d.ts
@@ -0,0 +1,8 @@
+export declare class TempScopedNodeJsSyncHost extends virtualFs.ScopedHost<fs.Stats> {
+    protected _root: Path;
+    protected _sync: virtualFs.SyncDelegateHost<fs.Stats>;
+    readonly files: Path[];
+    readonly root: Path;
+    readonly sync: virtualFs.SyncDelegateHost<fs.Stats>;
+    constructor();
+}
diff --git a/etc/api/angular_devkit/core/src/_golden-api.d.ts b/etc/api/angular_devkit/core/src/_golden-api.d.ts
new file mode 100644
index 000000000000..aa1dfa19aabe
--- /dev/null
+++ b/etc/api/angular_devkit/core/src/_golden-api.d.ts
@@ -0,0 +1,1059 @@
+export interface AdditionalPropertiesValidatorError extends SchemaValidatorErrorBase {
+    keyword: 'additionalProperties';
+    params: {
+        additionalProperty: string;
+    };
+}
+
+export declare function addUndefinedDefaults(value: JsonValue, _pointer: JsonPointer, schema?: JsonObject): JsonValue;
+
+export declare class AliasHost<StatsT extends object = {}> extends ResolverHost<StatsT> {
+    protected _aliases: Map<Path, Path>;
+    readonly aliases: Map<Path, Path>;
+    protected _resolve(path: Path): Path;
+}
+
+export declare class AmbiguousProjectPathException extends BaseException {
+    readonly path: Path;
+    readonly projects: ReadonlyArray<string>;
+    constructor(path: Path, projects: ReadonlyArray<string>);
+}
+
+export declare function asPosixPath(path: Path): PosixPath;
+
+export declare function asWindowsPath(path: Path): WindowsPath;
+
+export declare class BaseException extends Error {
+    constructor(message?: string);
+}
+
+export declare function basename(path: Path): PathFragment;
+
+export declare const bgBlack: (x: string) => string;
+
+export declare const bgBlue: (x: string) => string;
+
+export declare const bgCyan: (x: string) => string;
+
+export declare const bgGreen: (x: string) => string;
+
+export declare const bgMagenta: (x: string) => string;
+
+export declare const bgRed: (x: string) => string;
+
+export declare const bgWhite: (x: string) => string;
+
+export declare const bgYellow: (x: string) => string;
+
+export declare const black: (x: string) => string;
+
+export declare const blue: (x: string) => string;
+
+export declare const bold: (x: string) => string;
+
+export declare function buildJsonPointer(fragments: string[]): JsonPointer;
+
+export declare function camelize(str: string): string;
+
+export declare function capitalize(str: string): string;
+
+export declare class CircularDependencyFoundException extends BaseException {
+    constructor();
+}
+
+export declare function classify(str: string): string;
+
+export declare function clean<T>(array: Array<T | undefined>): Array<T>;
+
+export declare namespace colors {
+    const reset: (x: string) => string;
+    const bold: (x: string) => string;
+    const dim: (x: string) => string;
+    const italic: (x: string) => string;
+    const underline: (x: string) => string;
+    const inverse: (x: string) => string;
+    const hidden: (x: string) => string;
+    const strikethrough: (x: string) => string;
+    const black: (x: string) => string;
+    const red: (x: string) => string;
+    const green: (x: string) => string;
+    const yellow: (x: string) => string;
+    const blue: (x: string) => string;
+    const magenta: (x: string) => string;
+    const cyan: (x: string) => string;
+    const white: (x: string) => string;
+    const grey: (x: string) => string;
+    const gray: (x: string) => string;
+    const bgBlack: (x: string) => string;
+    const bgRed: (x: string) => string;
+    const bgGreen: (x: string) => string;
+    const bgYellow: (x: string) => string;
+    const bgBlue: (x: string) => string;
+    const bgMagenta: (x: string) => string;
+    const bgCyan: (x: string) => string;
+    const bgWhite: (x: string) => string;
+}
+
+export declare class ContentHasMutatedException extends BaseException {
+    constructor(path: string);
+}
+
+export declare class CordHost extends SimpleMemoryHost {
+    protected _back: ReadonlyHost;
+    protected _filesToCreate: Set<Path>;
+    protected _filesToDelete: Set<Path>;
+    protected _filesToOverwrite: Set<Path>;
+    protected _filesToRename: Map<Path, Path>;
+    protected _filesToRenameRevert: Map<Path, Path>;
+    readonly backend: ReadonlyHost;
+    readonly capabilities: HostCapabilities;
+    constructor(_back: ReadonlyHost);
+    clone(): CordHost;
+    commit(host: Host, force?: boolean): Observable<void>;
+    create(path: Path, content: FileBuffer): Observable<void>;
+    delete(path: Path): Observable<void>;
+    exists(path: Path): Observable<boolean>;
+    isDirectory(path: Path): Observable<boolean>;
+    isFile(path: Path): Observable<boolean>;
+    list(path: Path): Observable<PathFragment[]>;
+    overwrite(path: Path, content: FileBuffer): Observable<void>;
+    read(path: Path): Observable<FileBuffer>;
+    records(): CordHostRecord[];
+    rename(from: Path, to: Path): Observable<void>;
+    stat(path: Path): Observable<Stats | null> | null;
+    watch(path: Path, options?: HostWatchOptions): null;
+    willCreate(path: Path): boolean;
+    willDelete(path: Path): boolean;
+    willOverwrite(path: Path): boolean;
+    willRename(path: Path): boolean;
+    willRenameTo(path: Path, to: Path): boolean;
+    write(path: Path, content: FileBuffer): Observable<void>;
+}
+
+export interface CordHostCreate {
+    content: FileBuffer;
+    kind: 'create';
+    path: Path;
+}
+
+export interface CordHostDelete {
+    kind: 'delete';
+    path: Path;
+}
+
+export interface CordHostOverwrite {
+    content: FileBuffer;
+    kind: 'overwrite';
+    path: Path;
+}
+
+export declare type CordHostRecord = CordHostCreate | CordHostOverwrite | CordHostRename | CordHostDelete;
+
+export interface CordHostRename {
+    from: Path;
+    kind: 'rename';
+    to: Path;
+}
+
+export declare class CoreSchemaRegistry implements SchemaRegistry {
+    constructor(formats?: SchemaFormat[]);
+    protected _resolver(ref: string, validate: ajv.ValidateFunction): {
+        context?: ajv.ValidateFunction;
+        schema?: JsonObject;
+    };
+    addFormat(format: SchemaFormat): void;
+    addPostTransform(visitor: JsonVisitor, deps?: JsonVisitor[]): void;
+    addPreTransform(visitor: JsonVisitor, deps?: JsonVisitor[]): void;
+    addSmartDefaultProvider<T>(source: string, provider: SmartDefaultProvider<T>): void;
+    compile(schema: JsonObject): Observable<SchemaValidator>;
+    flatten(schema: JsonObject): Observable<JsonObject>;
+    registerUriHandler(handler: UriHandler): void;
+    usePromptProvider(provider: PromptProvider): void;
+}
+
+export declare const cyan: (x: string) => string;
+
+export declare function dasherize(str: string): string;
+
+export declare function decamelize(str: string): string;
+
+export declare function deepCopy<T extends any>(value: T): T;
+
+export declare class DependencyNotFoundException extends BaseException {
+    constructor();
+}
+
+export declare const dim: (x: string) => string;
+
+export declare function dirname(path: Path): Path;
+
+export declare class Empty implements ReadonlyHost {
+    readonly capabilities: HostCapabilities;
+    exists(path: Path): Observable<boolean>;
+    isDirectory(path: Path): Observable<boolean>;
+    isFile(path: Path): Observable<boolean>;
+    list(path: Path): Observable<PathFragment[]>;
+    read(path: Path): Observable<FileBuffer>;
+    stat(path: Path): Observable<Stats<{}> | null>;
+}
+
+export declare function extname(path: Path): string;
+
+export declare class FileAlreadyExistException extends BaseException {
+    constructor(path: string);
+}
+
+export declare const fileBuffer: TemplateTag<FileBuffer>;
+
+export declare type FileBuffer = ArrayBuffer;
+
+export declare type FileBufferLike = ArrayBufferLike;
+
+export declare function fileBufferToString(fileBuffer: FileBuffer): string;
+
+export declare class FileDoesNotExistException extends BaseException {
+    constructor(path: string);
+}
+
+export interface FormatValidatorError extends SchemaValidatorErrorBase {
+    keyword: 'format';
+    params: {
+        format: string;
+    };
+}
+
+export declare function fragment(path: string): PathFragment;
+
+export declare function getSystemPath(path: Path): string;
+
+export declare function getTypesOfSchema(schema: JsonObject | true): Set<string>;
+
+export declare const gray: (x: string) => string;
+
+export declare const green: (x: string) => string;
+
+export declare const grey: (x: string) => string;
+
+export declare const hidden: (x: string) => string;
+
+export interface Host<StatsT extends object = {}> extends ReadonlyHost<StatsT> {
+    delete(path: Path): Observable<void>;
+    rename(from: Path, to: Path): Observable<void>;
+    watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent> | null;
+    write(path: Path, content: FileBufferLike): Observable<void>;
+}
+
+export interface HostCapabilities {
+    synchronous: boolean;
+}
+
+export interface HostWatchEvent {
+    readonly path: Path;
+    readonly time: Date;
+    readonly type: HostWatchEventType;
+}
+
+export declare const enum HostWatchEventType {
+    Changed = 0,
+    Created = 1,
+    Deleted = 2,
+    Renamed = 3
+}
+
+export interface HostWatchOptions {
+    readonly persistent?: boolean;
+    readonly recursive?: boolean;
+}
+
+export declare function indentBy(indentations: number): TemplateTag;
+
+export declare class IndentLogger extends Logger {
+    constructor(name: string, parent?: Logger | null, indentation?: string);
+}
+
+export declare class InvalidJsonCharacterException extends JsonException {
+    character: number;
+    invalidChar: string;
+    line: number;
+    offset: number;
+    constructor(context: JsonParserContext);
+}
+
+export declare class InvalidPathException extends BaseException {
+    constructor(path: string);
+}
+
+export declare class InvalidUpdateRecordException extends BaseException {
+    constructor();
+}
+
+export declare const inverse: (x: string) => string;
+
+export declare function isAbsolute(p: Path): boolean;
+
+export declare function isJsonArray(value: JsonValue): value is JsonArray;
+
+export declare function isJsonObject(value: JsonValue): value is JsonObject;
+
+export declare function isObservable(obj: any | Observable<any>): obj is Observable<any>;
+
+export declare function isPromise(obj: any): obj is Promise<any>;
+
+export declare const italic: (x: string) => string;
+
+export declare function join(p1: Path, ...others: string[]): Path;
+
+export declare function joinJsonPointer(root: JsonPointer, ...others: string[]): JsonPointer;
+
+export interface JsonArray extends Array<JsonValue> {
+}
+
+export interface JsonAstArray extends JsonAstNodeBase {
+    readonly elements: JsonAstNode[];
+    readonly kind: 'array';
+    readonly value: JsonArray;
+}
+
+export interface JsonAstComment extends JsonAstNodeBase {
+    readonly content: string;
+    readonly kind: 'comment';
+}
+
+export interface JsonAstConstantFalse extends JsonAstNodeBase {
+    readonly kind: 'false';
+    readonly value: false;
+}
+
+export interface JsonAstConstantNull extends JsonAstNodeBase {
+    readonly kind: 'null';
+    readonly value: null;
+}
+
+export interface JsonAstConstantTrue extends JsonAstNodeBase {
+    readonly kind: 'true';
+    readonly value: true;
+}
+
+export interface JsonAstIdentifier extends JsonAstNodeBase {
+    readonly kind: 'identifier';
+    readonly value: string;
+}
+
+export interface JsonAstKeyValue extends JsonAstNodeBase {
+    readonly key: JsonAstString | JsonAstIdentifier;
+    readonly kind: 'keyvalue';
+    readonly value: JsonAstNode;
+}
+
+export interface JsonAstMultilineComment extends JsonAstNodeBase {
+    readonly content: string;
+    readonly kind: 'multicomment';
+}
+
+export declare type JsonAstNode = JsonAstNumber | JsonAstString | JsonAstIdentifier | JsonAstArray | JsonAstObject | JsonAstConstantFalse | JsonAstConstantNull | JsonAstConstantTrue;
+
+export interface JsonAstNodeBase {
+    readonly comments?: (JsonAstComment | JsonAstMultilineComment)[];
+    readonly end: Position;
+    readonly start: Position;
+    readonly text: string;
+}
+
+export interface JsonAstNumber extends JsonAstNodeBase {
+    readonly kind: 'number';
+    readonly value: number;
+}
+
+export interface JsonAstObject extends JsonAstNodeBase {
+    readonly kind: 'object';
+    readonly properties: JsonAstKeyValue[];
+    readonly value: JsonObject;
+}
+
+export interface JsonAstString extends JsonAstNodeBase {
+    readonly kind: 'string';
+    readonly value: string;
+}
+
+export declare class JsonException extends BaseException {
+}
+
+export interface JsonObject {
+    [prop: string]: JsonValue;
+}
+
+export declare enum JsonParseMode {
+    Strict = 0,
+    CommentsAllowed = 1,
+    SingleQuotesAllowed = 2,
+    IdentifierKeyNamesAllowed = 4,
+    TrailingCommasAllowed = 8,
+    HexadecimalNumberAllowed = 16,
+    MultiLineStringAllowed = 32,
+    LaxNumberParsingAllowed = 64,
+    NumberConstantsAllowed = 128,
+    Default = 0,
+    Loose = 255,
+    Json = 0,
+    Json5 = 255
+}
+
+export interface JsonParserContext {
+    readonly mode: JsonParseMode;
+    readonly original: string;
+    position: Position;
+    previous: Position;
+}
+
+export declare type JsonPointer = string & {
+    __PRIVATE_DEVKIT_JSON_POINTER: void;
+};
+
+export interface JsonSchemaVisitor {
+    (current: JsonObject | JsonArray, pointer: JsonPointer, parentSchema?: JsonObject | JsonArray, index?: string): void;
+}
+
+export declare type JsonValue = JsonAstNode['value'];
+
+export interface JsonVisitor {
+    (value: JsonValue, pointer: JsonPointer, schema?: JsonObject, root?: JsonObject | JsonArray): Observable<JsonValue> | JsonValue;
+}
+
+export declare class LevelCapLogger extends LevelTransformLogger {
+    readonly levelCap: LogLevel;
+    readonly name: string;
+    readonly parent: Logger | null;
+    constructor(name: string, parent: Logger | null, levelCap: LogLevel);
+    static levelMap: {
+        [cap: string]: {
+            [level: string]: string;
+        };
+    };
+}
+
+export declare class LevelTransformLogger extends Logger {
+    readonly levelTransform: (level: LogLevel) => LogLevel;
+    readonly name: string;
+    readonly parent: Logger | null;
+    constructor(name: string, parent: Logger | null, levelTransform: (level: LogLevel) => LogLevel);
+    createChild(name: string): Logger;
+    log(level: LogLevel, message: string, metadata?: JsonObject): void;
+}
+
+export declare function levenshtein(a: string, b: string): number;
+
+export interface LimitValidatorError extends SchemaValidatorErrorBase {
+    keyword: 'maxItems' | 'minItems' | 'maxLength' | 'minLength' | 'maxProperties' | 'minProperties';
+    params: {
+        limit: number;
+    };
+}
+
+export interface LogEntry extends LoggerMetadata {
+    level: LogLevel;
+    message: string;
+    timestamp: number;
+}
+
+export declare class Logger extends Observable<LogEntry> implements LoggerApi {
+    protected _metadata: LoggerMetadata;
+    protected _observable: Observable<LogEntry>;
+    protected readonly _subject: Subject<LogEntry>;
+    readonly name: string;
+    readonly parent: Logger | null;
+    constructor(name: string, parent?: Logger | null);
+    asApi(): LoggerApi;
+    complete(): void;
+    createChild(name: string): Logger;
+    debug(message: string, metadata?: JsonObject): void;
+    error(message: string, metadata?: JsonObject): void;
+    fatal(message: string, metadata?: JsonObject): void;
+    forEach(next: (value: LogEntry) => void, PromiseCtor?: typeof Promise): Promise<void>;
+    info(message: string, metadata?: JsonObject): void;
+    lift<R>(operator: Operator<LogEntry, R>): Observable<R>;
+    log(level: LogLevel, message: string, metadata?: JsonObject): void;
+    subscribe(): Subscription;
+    subscribe(observer: PartialObserver<LogEntry>): Subscription;
+    subscribe(next?: (value: LogEntry) => void, error?: (error: Error) => void, complete?: () => void): Subscription;
+    toString(): string;
+    warn(message: string, metadata?: JsonObject): void;
+}
+
+export interface LoggerApi {
+    createChild(name: string): Logger;
+    debug(message: string, metadata?: JsonObject): void;
+    error(message: string, metadata?: JsonObject): void;
+    fatal(message: string, metadata?: JsonObject): void;
+    info(message: string, metadata?: JsonObject): void;
+    log(level: LogLevel, message: string, metadata?: JsonObject): void;
+    warn(message: string, metadata?: JsonObject): void;
+}
+
+export interface LoggerMetadata extends JsonObject {
+    name: string;
+    path: string[];
+}
+
+export declare type LogLevel = 'debug' | 'info' | 'warn' | 'error' | 'fatal';
+
+export declare const magenta: (x: string) => string;
+
+export declare function mapObject<T, V>(obj: {
+    [k: string]: T;
+}, mapper: (k: string, v: T) => V): {
+    [k: string]: V;
+};
+
+export declare class MergeConflictException extends BaseException {
+    constructor(path: string);
+}
+
+export declare function noCacheNormalize(path: string): Path;
+
+export declare function normalize(path: string): Path;
+
+export declare const NormalizedRoot: Path;
+
+export declare const NormalizedSep: Path;
+
+export declare class NullLogger extends Logger {
+    constructor(parent?: Logger | null);
+    asApi(): LoggerApi;
+}
+
+export declare function oneLine(strings: TemplateStringsArray, ...values: any[]): string;
+
+export declare function parseJson(input: string, mode?: JsonParseMode, options?: ParseJsonOptions): JsonValue;
+
+export declare function parseJsonAst(input: string, mode?: JsonParseMode): JsonAstNode;
+
+export interface ParseJsonOptions {
+    path?: string;
+}
+
+export declare function parseJsonPointer(pointer: JsonPointer): string[];
+
+export declare class PartiallyOrderedSet<T> implements Set<T> {
+    readonly [Symbol.toStringTag]: 'Set';
+    readonly size: number;
+    [Symbol.iterator](): IterableIterator<T>;
+    protected _checkCircularDependencies(item: T, deps: Set<T>): void;
+    add(item: T, deps?: (Set<T> | T[])): this;
+    clear(): void;
+    delete(item: T): boolean;
+    entries(): IterableIterator<[T, T]>;
+    forEach(callbackfn: (value: T, value2: T, set: PartiallyOrderedSet<T>) => void, thisArg?: any): void;
+    has(item: T): boolean;
+    keys(): IterableIterator<T>;
+    values(): IterableIterator<T>;
+}
+
+export declare const path: TemplateTag<Path>;
+
+export declare type Path = string & {
+    __PRIVATE_DEVKIT_PATH: void;
+};
+
+export declare class PathCannotBeFragmentException extends BaseException {
+    constructor(path: string);
+}
+
+export declare type PathFragment = Path & {
+    __PRIVATE_DEVKIT_PATH_FRAGMENT: void;
+};
+
+export declare class PathIsDirectoryException extends BaseException {
+    constructor(path: string);
+}
+
+export declare class PathIsFileException extends BaseException {
+    constructor(path: string);
+}
+
+export declare class PathMustBeAbsoluteException extends BaseException {
+    constructor(path: string);
+}
+
+export declare class PathSpecificJsonException extends JsonException {
+    exception: JsonException;
+    path: string;
+    constructor(path: string, exception: JsonException);
+}
+
+export declare class PatternMatchingHost<StatsT extends object = {}> extends ResolverHost<StatsT> {
+    protected _patterns: Map<RegExp, ReplacementFunction>;
+    protected _resolve(path: Path): Path;
+    addPattern(pattern: string | string[], replacementFn: ReplacementFunction): void;
+}
+
+export interface Position {
+    readonly character: number;
+    readonly line: number;
+    readonly offset: number;
+}
+
+export declare type PosixPath = string & {
+    __PRIVATE_DEVKIT_POSIX_PATH: void;
+};
+
+export declare class PriorityQueue<T> {
+    readonly size: number;
+    constructor(_comparator: (x: T, y: T) => number);
+    clear(): void;
+    peek(): T | undefined;
+    pop(): T | undefined;
+    push(item: T): void;
+    toArray(): Array<T>;
+}
+
+export declare class ProjectNotFoundException extends BaseException {
+    constructor(name: string);
+}
+
+export declare class ProjectToolNotFoundException extends BaseException {
+    constructor(name: string);
+}
+
+export interface PromptDefinition {
+    default?: string | number | boolean | null;
+    id: string;
+    items?: Array<string | {
+        value: JsonValue;
+        label: string;
+    }>;
+    message: string;
+    priority: number;
+    raw?: string | JsonObject;
+    type: string;
+    validator?: (value: string) => boolean | string | Promise<boolean | string>;
+}
+
+export declare type PromptProvider = (definitions: Array<PromptDefinition>) => SubscribableOrPromise<{
+    [id: string]: JsonValue;
+}>;
+
+export interface ReadonlyHost<StatsT extends object = {}> {
+    readonly capabilities: HostCapabilities;
+    exists(path: Path): Observable<boolean>;
+    isDirectory(path: Path): Observable<boolean>;
+    isFile(path: Path): Observable<boolean>;
+    list(path: Path): Observable<PathFragment[]>;
+    read(path: Path): Observable<FileBuffer>;
+    stat(path: Path): Observable<Stats<StatsT> | null> | null;
+}
+
+export declare const red: (x: string) => string;
+
+export interface ReferenceResolver<ContextT> {
+    (ref: string, context?: ContextT): {
+        context?: ContextT;
+        schema?: JsonObject;
+    };
+}
+
+export interface RefValidatorError extends SchemaValidatorErrorBase {
+    keyword: '$ref';
+    params: {
+        ref: string;
+    };
+}
+
+export declare function relative(from: Path, to: Path): Path;
+
+export declare type ReplacementFunction = (path: Path) => Path;
+
+export interface RequiredValidatorError extends SchemaValidatorErrorBase {
+    keyword: 'required';
+    params: {
+        missingProperty: string;
+    };
+}
+
+export declare const reset: (x: string) => string;
+
+export declare function resetNormalizeCache(): void;
+
+export declare function resolve(p1: Path, p2: Path): Path;
+
+export declare abstract class ResolverHost<T extends object> implements Host<T> {
+    protected _delegate: Host<T>;
+    readonly capabilities: HostCapabilities;
+    constructor(_delegate: Host<T>);
+    protected abstract _resolve(path: Path): Path;
+    delete(path: Path): Observable<void>;
+    exists(path: Path): Observable<boolean>;
+    isDirectory(path: Path): Observable<boolean>;
+    isFile(path: Path): Observable<boolean>;
+    list(path: Path): Observable<PathFragment[]>;
+    read(path: Path): Observable<FileBuffer>;
+    rename(from: Path, to: Path): Observable<void>;
+    stat(path: Path): Observable<Stats<T> | null> | null;
+    watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent> | null;
+    write(path: Path, content: FileBuffer): Observable<void>;
+}
+
+export declare class SafeReadonlyHost<StatsT extends object = {}> implements ReadonlyHost<StatsT> {
+    readonly capabilities: HostCapabilities;
+    constructor(_delegate: ReadonlyHost<StatsT>);
+    exists(path: Path): Observable<boolean>;
+    isDirectory(path: Path): Observable<boolean>;
+    isFile(path: Path): Observable<boolean>;
+    list(path: Path): Observable<PathFragment[]>;
+    read(path: Path): Observable<FileBuffer>;
+    stat(path: Path): Observable<Stats<StatsT> | null> | null;
+}
+
+export interface SchemaFormat {
+    formatter: SchemaFormatter;
+    name: string;
+}
+
+export interface SchemaFormatter {
+    readonly async: boolean;
+    validate(data: any): boolean | Observable<boolean>;
+}
+
+export interface SchemaKeywordValidator {
+    (data: JsonValue, schema: JsonValue, parent: JsonObject | JsonArray | undefined, parentProperty: string | number | undefined, pointer: JsonPointer, rootData: JsonValue): boolean | Observable<boolean>;
+}
+
+export interface SchemaRegistry {
+    addFormat(format: SchemaFormat): void;
+    addPostTransform(visitor: JsonVisitor, deps?: JsonVisitor[]): void;
+    addPreTransform(visitor: JsonVisitor, deps?: JsonVisitor[]): void;
+    addSmartDefaultProvider<T>(source: string, provider: SmartDefaultProvider<T>): void;
+    compile(schema: Object): Observable<SchemaValidator>;
+    flatten(schema: JsonObject | string): Observable<JsonObject>;
+    usePromptProvider(provider: PromptProvider): void;
+}
+
+export declare class SchemaValidationException extends BaseException {
+    readonly errors: SchemaValidatorError[];
+    constructor(errors?: SchemaValidatorError[], baseMessage?: string);
+    static createMessages(errors?: SchemaValidatorError[]): string[];
+}
+
+export interface SchemaValidator {
+    (data: JsonValue, options?: SchemaValidatorOptions): Observable<SchemaValidatorResult>;
+}
+
+export declare type SchemaValidatorError = RefValidatorError | LimitValidatorError | AdditionalPropertiesValidatorError | FormatValidatorError | RequiredValidatorError;
+
+export interface SchemaValidatorErrorBase {
+    data?: JsonValue;
+    dataPath: string;
+    keyword: string;
+    message?: string;
+}
+
+export interface SchemaValidatorOptions {
+    applyPostTransforms?: boolean;
+    applyPreTransforms?: boolean;
+    withPrompts?: boolean;
+}
+
+export interface SchemaValidatorResult {
+    data: JsonValue;
+    errors?: SchemaValidatorError[];
+    success: boolean;
+}
+
+export declare class ScopedHost<T extends object> extends ResolverHost<T> {
+    protected _root: Path;
+    constructor(delegate: Host<T>, _root?: Path);
+    protected _resolve(path: Path): Path;
+}
+
+export declare class SimpleMemoryHost implements Host<{}> {
+    protected _cache: Map<Path, Stats<SimpleMemoryHostStats>>;
+    readonly capabilities: HostCapabilities;
+    constructor();
+    protected _delete(path: Path): void;
+    protected _exists(path: Path): boolean;
+    protected _isDirectory(path: Path): boolean;
+    protected _isFile(path: Path): boolean;
+    protected _list(path: Path): PathFragment[];
+    protected _newDirStats(): {
+        inspect(): string;
+        isFile(): boolean;
+        isDirectory(): boolean;
+        size: number;
+        atime: Date;
+        ctime: Date;
+        mtime: Date;
+        birthtime: Date;
+        content: null;
+    };
+    protected _newFileStats(content: FileBuffer, oldStats?: Stats<SimpleMemoryHostStats>): {
+        inspect(): string;
+        isFile(): boolean;
+        isDirectory(): boolean;
+        size: number;
+        atime: Date;
+        ctime: Date;
+        mtime: Date;
+        birthtime: Date;
+        content: ArrayBuffer;
+    };
+    protected _read(path: Path): FileBuffer;
+    protected _rename(from: Path, to: Path): void;
+    protected _stat(path: Path): Stats<SimpleMemoryHostStats> | null;
+    protected _toAbsolute(path: Path): Path;
+    protected _updateWatchers(path: Path, type: HostWatchEventType): void;
+    protected _watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent>;
+    protected _write(path: Path, content: FileBuffer): void;
+    delete(path: Path): Observable<void>;
+    exists(path: Path): Observable<boolean>;
+    isDirectory(path: Path): Observable<boolean>;
+    isFile(path: Path): Observable<boolean>;
+    list(path: Path): Observable<PathFragment[]>;
+    read(path: Path): Observable<FileBuffer>;
+    rename(from: Path, to: Path): Observable<void>;
+    stat(path: Path): Observable<Stats<{}> | null> | null;
+    watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent> | null;
+    write(path: Path, content: FileBuffer): Observable<void>;
+}
+
+export interface SimpleMemoryHostStats {
+    readonly content: FileBuffer | null;
+}
+
+export interface SmartDefaultProvider<T> {
+    (schema: JsonObject): T | Observable<T>;
+}
+
+export declare function split(path: Path): PathFragment[];
+
+export declare type Stats<T extends object = {}> = T & {
+    isFile(): boolean;
+    isDirectory(): boolean;
+    readonly size: number;
+    readonly atime: Date;
+    readonly mtime: Date;
+    readonly ctime: Date;
+    readonly birthtime: Date;
+};
+
+export declare const strikethrough: (x: string) => string;
+
+export declare function stringToFileBuffer(str: string): FileBuffer;
+
+export declare function stripIndent(strings: TemplateStringsArray, ...values: any[]): string;
+
+export declare function stripIndents(strings: TemplateStringsArray, ...values: any[]): string;
+
+export declare class SyncDelegateHost<T extends object = {}> {
+    protected _delegate: Host<T>;
+    readonly capabilities: HostCapabilities;
+    readonly delegate: Host<T>;
+    constructor(_delegate: Host<T>);
+    protected _doSyncCall<ResultT>(observable: Observable<ResultT>): ResultT;
+    delete(path: Path): void;
+    exists(path: Path): boolean;
+    isDirectory(path: Path): boolean;
+    isFile(path: Path): boolean;
+    list(path: Path): PathFragment[];
+    read(path: Path): FileBuffer;
+    rename(from: Path, to: Path): void;
+    stat(path: Path): Stats<T> | null;
+    watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent> | null;
+    write(path: Path, content: FileBufferLike): void;
+}
+
+export declare class SynchronousDelegateExpectedException extends BaseException {
+    constructor();
+}
+
+export declare function template<T>(content: string, options?: TemplateOptions): (input: T) => string;
+
+export interface TemplateAst {
+    children: TemplateAstNode[];
+    content: string;
+    fileName: string;
+}
+
+export interface TemplateAstBase {
+    end: Position;
+    start: Position;
+}
+
+export interface TemplateAstComment extends TemplateAstBase {
+    kind: 'comment';
+    text: string;
+}
+
+export interface TemplateAstContent extends TemplateAstBase {
+    content: string;
+    kind: 'content';
+}
+
+export interface TemplateAstEscape extends TemplateAstBase {
+    expression: string;
+    kind: 'escape';
+}
+
+export interface TemplateAstEvaluate extends TemplateAstBase {
+    expression: string;
+    kind: 'evaluate';
+}
+
+export interface TemplateAstInterpolate extends TemplateAstBase {
+    expression: string;
+    kind: 'interpolate';
+}
+
+export declare type TemplateAstNode = TemplateAstContent | TemplateAstEvaluate | TemplateAstComment | TemplateAstEscape | TemplateAstInterpolate;
+
+export interface TemplateOptions {
+    fileName?: string;
+    module?: boolean | {
+        exports: {};
+    };
+    sourceMap?: boolean;
+    sourceRoot?: string;
+    sourceURL?: string;
+}
+
+export declare function templateParser(sourceText: string, fileName: string): TemplateAst;
+
+export interface TemplateTag<R = string> {
+    (template: TemplateStringsArray, ...substitutions: any[]): R;
+}
+
+export declare namespace test {
+    type TestLogRecord = {
+        kind: 'write' | 'read' | 'delete' | 'list' | 'exists' | 'isDirectory' | 'isFile' | 'stat' | 'watch';
+        path: Path;
+    } | {
+        kind: 'rename';
+        from: Path;
+        to: Path;
+    };
+    class TestHost extends SimpleMemoryHost {
+        protected _records: TestLogRecord[];
+        protected _sync: SyncDelegateHost<{}>;
+        readonly files: Path[];
+        readonly records: TestLogRecord[];
+        readonly sync: SyncDelegateHost<{}>;
+        constructor(map?: {
+            [path: string]: string;
+        });
+        $exists(path: string): boolean;
+        $isDirectory(path: string): boolean;
+        $isFile(path: string): boolean;
+        $list(path: string): PathFragment[];
+        $read(path: string): string;
+        $write(path: string, content: string): void;
+        protected _delete(path: Path): void;
+        protected _exists(path: Path): boolean;
+        protected _isDirectory(path: Path): boolean;
+        protected _isFile(path: Path): boolean;
+        protected _list(path: Path): PathFragment[];
+        protected _read(path: Path): ArrayBuffer;
+        protected _rename(from: Path, to: Path): void;
+        protected _stat(path: Path): Stats<SimpleMemoryHostStats> | null;
+        protected _watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent>;
+        protected _write(path: Path, content: FileBuffer): void;
+        clearRecords(): void;
+        clone(): TestHost;
+    }
+}
+
+export declare class TransformLogger extends Logger {
+    constructor(name: string, transform: (stream: Observable<LogEntry>) => Observable<LogEntry>, parent?: Logger | null);
+}
+
+export declare function trimNewlines(strings: TemplateStringsArray, ...values: any[]): string;
+
+export declare const underline: (x: string) => string;
+
+export declare function underscore(str: string): string;
+
+export declare class UnexpectedEndOfInputException extends JsonException {
+    constructor(_context: JsonParserContext);
+}
+
+export declare class UnimplementedException extends BaseException {
+    constructor();
+}
+
+export declare class UnknownException extends Error {
+    constructor(message: string);
+}
+
+export declare class UnsupportedPlatformException extends BaseException {
+    constructor();
+}
+
+export declare type UriHandler = (uri: string) => Observable<JsonObject> | Promise<JsonObject> | null | undefined;
+
+export declare function visitJson<ContextT>(json: JsonValue, visitor: JsonVisitor, schema?: JsonObject, refResolver?: ReferenceResolver<ContextT>, context?: ContextT): Observable<JsonValue>;
+
+export declare function visitJsonSchema(schema: JsonObject, visitor: JsonSchemaVisitor): void;
+
+export declare const white: (x: string) => string;
+
+export declare type WindowsPath = string & {
+    __PRIVATE_DEVKIT_WINDOWS_PATH: void;
+};
+
+export declare class Workspace {
+    readonly host: virtualFs.Host<{}>;
+    readonly newProjectRoot: string | undefined;
+    readonly root: Path;
+    readonly version: number;
+    constructor(_root: Path, _host: virtualFs.Host<{}>);
+    getCli(): WorkspaceTool;
+    getDefaultProjectName(): string | null;
+    getProject(projectName: string): WorkspaceProject;
+    getProjectByPath(path: Path): string | null;
+    getProjectCli(projectName: string): WorkspaceTool;
+    getProjectSchematics(projectName: string): WorkspaceTool;
+    getProjectTargets(projectName: string): WorkspaceTool;
+    getSchematics(): WorkspaceTool;
+    getTargets(): WorkspaceTool;
+    listProjectNames(): string[];
+    loadWorkspaceFromHost(workspacePath: Path): Observable<this>;
+    loadWorkspaceFromJson(json: {}): Observable<this>;
+    validateAgainstSchema<T = {}>(contentJson: {}, schemaJson: JsonObject): Observable<T>;
+}
+
+export declare class WorkspaceNotYetLoadedException extends BaseException {
+    constructor();
+}
+
+export interface WorkspaceProject {
+    architect?: WorkspaceTool;
+    cli?: WorkspaceTool;
+    prefix: string;
+    projectType: "application" | "library";
+    root: string;
+    schematics?: WorkspaceTool;
+    sourceRoot?: string;
+    targets?: WorkspaceTool;
+}
+
+export interface WorkspaceSchema {
+    $schema?: string;
+    architect?: WorkspaceTool;
+    cli?: WorkspaceTool;
+    defaultProject?: string;
+    newProjectRoot?: string;
+    projects: {
+        [k: string]: WorkspaceProject;
+    };
+    schematics?: WorkspaceTool;
+    targets?: WorkspaceTool;
+    version: number;
+}
+
+export interface WorkspaceTool {
+    $schema?: string;
+    [k: string]: any;
+}
+
+export declare class WorkspaceToolNotFoundException extends BaseException {
+    constructor(name: string);
+}
+
+export declare const yellow: (x: string) => string;
diff --git a/etc/api/angular_devkit/schematics/src/_golden-api.d.ts b/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
new file mode 100644
index 000000000000..026a5893cfcf
--- /dev/null
+++ b/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
@@ -0,0 +1,700 @@
+export declare type Action = CreateFileAction | OverwriteFileAction | RenameFileAction | DeleteFileAction;
+
+export interface ActionBase {
+    readonly id: number;
+    readonly parent: number;
+    readonly path: Path;
+}
+
+export declare class ActionList implements Iterable<Action> {
+    readonly length: number;
+    [Symbol.iterator](): IterableIterator<Action>;
+    protected _action(action: Partial<Action>): void;
+    create(path: Path, content: Buffer): void;
+    delete(path: Path): void;
+    find(predicate: (value: Action) => boolean): Action | null;
+    forEach(fn: (value: Action, index: number, array: Action[]) => void, thisArg?: {}): void;
+    get(i: number): Action;
+    has(action: Action): boolean;
+    optimize(): void;
+    overwrite(path: Path, content: Buffer): void;
+    push(action: Action): void;
+    rename(path: Path, to: Path): void;
+}
+
+export declare function apply(source: Source, rules: Rule[]): Source;
+
+export declare function applyContentTemplate<T>(options: T): FileOperator;
+
+export declare function applyPathTemplate<T extends PathTemplateData>(data: T, options?: PathTemplateOptions): FileOperator;
+
+export declare function applyTemplates<T>(options: T): Rule;
+
+export declare function asSource(rule: Rule): Source;
+
+export declare type AsyncFileOperator = (tree: FileEntry) => Observable<FileEntry | null>;
+
+export declare abstract class BaseWorkflow implements Workflow {
+    protected _context: WorkflowExecutionContext[];
+    protected _dryRun: boolean;
+    protected _engine: SchematicEngine<{}, {}>;
+    protected _engineHost: EngineHost<{}, {}>;
+    protected _force: boolean;
+    protected _host: virtualFs.Host;
+    protected _lifeCycle: Subject<LifeCycleEvent>;
+    protected _registry: schema.CoreSchemaRegistry;
+    protected _reporter: Subject<DryRunEvent>;
+    readonly context: Readonly<WorkflowExecutionContext>;
+    readonly lifeCycle: Observable<LifeCycleEvent>;
+    readonly registry: schema.SchemaRegistry;
+    readonly reporter: Observable<DryRunEvent>;
+    constructor(options: BaseWorkflowOptions);
+    protected _createSinks(): Sink[];
+    execute(options: Partial<WorkflowExecutionContext> & RequiredWorkflowExecutionContext): Observable<void>;
+}
+
+export interface BaseWorkflowOptions {
+    dryRun?: boolean;
+    engineHost: EngineHost<{}, {}>;
+    force?: boolean;
+    host: virtualFs.Host;
+    registry?: schema.CoreSchemaRegistry;
+}
+
+export declare function branchAndMerge(rule: Rule, strategy?: MergeStrategy): Rule;
+
+export declare function callRule(rule: Rule, input: Observable<Tree>, context: SchematicContext): Observable<Tree>;
+
+export declare function callSource(source: Source, context: SchematicContext): Observable<Tree>;
+
+export declare function chain(rules: Rule[]): Rule;
+
+export declare class CircularCollectionException extends BaseException {
+    constructor(name: string);
+}
+
+export interface Collection<CollectionMetadataT extends object, SchematicMetadataT extends object> {
+    readonly baseDescriptions?: Array<CollectionDescription<CollectionMetadataT>>;
+    readonly description: CollectionDescription<CollectionMetadataT>;
+    createSchematic(name: string, allowPrivate?: boolean): Schematic<CollectionMetadataT, SchematicMetadataT>;
+    listSchematicNames(): string[];
+}
+
+export declare type CollectionDescription<CollectionMetadataT extends object> = CollectionMetadataT & {
+    readonly name: string;
+    readonly extends?: string[];
+};
+
+export declare class CollectionImpl<CollectionT extends object, SchematicT extends object> implements Collection<CollectionT, SchematicT> {
+    readonly baseDescriptions?: CollectionDescription<CollectionT>[] | undefined;
+    readonly description: CollectionDescription<CollectionT>;
+    readonly name: string;
+    constructor(_description: CollectionDescription<CollectionT>, _engine: SchematicEngine<CollectionT, SchematicT>, baseDescriptions?: CollectionDescription<CollectionT>[] | undefined);
+    createSchematic(name: string, allowPrivate?: boolean): Schematic<CollectionT, SchematicT>;
+    listSchematicNames(): string[];
+}
+
+export declare function composeFileOperators(operators: FileOperator[]): FileOperator;
+
+export declare class ContentHasMutatedException extends BaseException {
+    constructor(path: string);
+}
+
+export declare function contentTemplate<T>(options: T): Rule;
+
+export interface CreateFileAction extends ActionBase {
+    readonly content: Buffer;
+    readonly kind: 'c';
+}
+
+export declare class DelegateTree implements Tree {
+    protected _other: Tree;
+    readonly actions: Action[];
+    readonly root: DirEntry;
+    constructor(_other: Tree);
+    apply(action: Action, strategy?: MergeStrategy): void;
+    beginUpdate(path: string): UpdateRecorder;
+    branch(): Tree;
+    commitUpdate(record: UpdateRecorder): void;
+    create(path: string, content: Buffer | string): void;
+    delete(path: string): void;
+    exists(path: string): boolean;
+    get(path: string): FileEntry | null;
+    getDir(path: string): DirEntry;
+    merge(other: Tree, strategy?: MergeStrategy): void;
+    overwrite(path: string, content: Buffer | string): void;
+    read(path: string): Buffer | null;
+    rename(from: string, to: string): void;
+    visit(visitor: FileVisitor): void;
+}
+
+export interface DeleteFileAction extends ActionBase {
+    readonly kind: 'd';
+}
+
+export interface DirEntry {
+    readonly parent: DirEntry | null;
+    readonly path: Path;
+    readonly subdirs: PathFragment[];
+    readonly subfiles: PathFragment[];
+    dir(name: PathFragment): DirEntry;
+    file(name: PathFragment): FileEntry | null;
+    visit(visitor: FileVisitor): void;
+}
+
+export interface DryRunCreateEvent {
+    content: Buffer;
+    kind: 'create';
+    path: string;
+}
+
+export interface DryRunDeleteEvent {
+    kind: 'delete';
+    path: string;
+}
+
+export interface DryRunErrorEvent {
+    description: 'alreadyExist' | 'doesNotExist';
+    kind: 'error';
+    path: string;
+}
+
+export declare type DryRunEvent = DryRunErrorEvent | DryRunDeleteEvent | DryRunCreateEvent | DryRunUpdateEvent | DryRunRenameEvent;
+
+export interface DryRunRenameEvent {
+    kind: 'rename';
+    path: string;
+    to: string;
+}
+
+export declare class DryRunSink extends HostSink {
+    protected _fileAlreadyExistExceptionSet: Set<string>;
+    protected _fileDoesNotExistExceptionSet: Set<string>;
+    protected _subject: Subject<DryRunEvent>;
+    readonly reporter: Observable<DryRunEvent>;
+    constructor(dir: string, force?: boolean);
+    constructor(host: virtualFs.Host, force?: boolean);
+    _done(): Observable<void>;
+    protected _fileAlreadyExistException(path: string): void;
+    protected _fileDoesNotExistException(path: string): void;
+}
+
+export interface DryRunUpdateEvent {
+    content: Buffer;
+    kind: 'update';
+    path: string;
+}
+
+export declare function empty(): Source;
+
+export declare class EmptyTree extends HostTree {
+    constructor();
+}
+
+export interface Engine<CollectionMetadataT extends object, SchematicMetadataT extends object> {
+    readonly defaultMergeStrategy: MergeStrategy;
+    readonly workflow: Workflow | null;
+    createCollection(name: string): Collection<CollectionMetadataT, SchematicMetadataT>;
+    createContext(schematic: Schematic<CollectionMetadataT, SchematicMetadataT>, parent?: Partial<TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>>, executionOptions?: Partial<ExecutionOptions>): TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>;
+    createSchematic(name: string, collection: Collection<CollectionMetadataT, SchematicMetadataT>): Schematic<CollectionMetadataT, SchematicMetadataT>;
+    createSourceFromUrl(url: Url, context: TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>): Source;
+    executePostTasks(): Observable<void>;
+    transformOptions<OptionT extends object, ResultT extends object>(schematic: Schematic<CollectionMetadataT, SchematicMetadataT>, options: OptionT, context?: TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>): Observable<ResultT>;
+}
+
+export interface EngineHost<CollectionMetadataT extends object, SchematicMetadataT extends object> {
+    readonly defaultMergeStrategy?: MergeStrategy;
+    createCollectionDescription(name: string): CollectionDescription<CollectionMetadataT>;
+    createSchematicDescription(name: string, collection: CollectionDescription<CollectionMetadataT>): SchematicDescription<CollectionMetadataT, SchematicMetadataT> | null;
+    createSourceFromUrl(url: Url, context: TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>): Source | null;
+    createTaskExecutor(name: string): Observable<TaskExecutor>;
+    getSchematicRuleFactory<OptionT extends object>(schematic: SchematicDescription<CollectionMetadataT, SchematicMetadataT>, collection: CollectionDescription<CollectionMetadataT>): RuleFactory<OptionT>;
+    hasTaskExecutor(name: string): boolean;
+    listSchematicNames(collection: CollectionDescription<CollectionMetadataT>): string[];
+    listSchematics(collection: Collection<CollectionMetadataT, SchematicMetadataT>): string[];
+    transformContext(context: TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>): TypedSchematicContext<CollectionMetadataT, SchematicMetadataT> | void;
+    transformOptions<OptionT extends object, ResultT extends object>(schematic: SchematicDescription<CollectionMetadataT, SchematicMetadataT>, options: OptionT, context?: TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>): Observable<ResultT>;
+}
+
+export interface ExecutionOptions {
+    interactive: boolean;
+}
+
+export declare function externalSchematic<OptionT extends object>(collectionName: string, schematicName: string, options: OptionT, executionOptions?: Partial<ExecutionOptions>): Rule;
+
+export declare class FileAlreadyExistException extends BaseException {
+    constructor(path: string);
+}
+
+export declare class FileDoesNotExistException extends BaseException {
+    constructor(path: string);
+}
+
+export interface FileEntry {
+    readonly content: Buffer;
+    readonly path: Path;
+}
+
+export declare type FileOperator = (entry: FileEntry) => FileEntry | null;
+
+export interface FilePredicate<T> {
+    (path: Path, entry?: Readonly<FileEntry> | null): T;
+}
+
+export declare class FileSystemCreateTree extends FileSystemTree {
+    constructor(host: virtualFs.Host);
+}
+
+export declare class FileSystemDirEntry extends VirtualDirEntry {
+    protected _host: virtualFs.SyncDelegateHost<{}>;
+    readonly parent: DirEntry | null;
+    readonly subdirs: PathFragment[];
+    readonly subfiles: PathFragment[];
+    constructor(_host: virtualFs.SyncDelegateHost<{}>, tree: FileSystemTree, path?: Path);
+    protected _createDir(name: PathFragment): DirEntry;
+    file(name: PathFragment): FileEntry | null;
+}
+
+export declare class FileSystemSink extends HostSink {
+    constructor(dir: string, force?: boolean);
+}
+
+export declare class FileSystemTree extends VirtualTree {
+    protected _host: virtualFs.SyncDelegateHost<{}>;
+    protected _initialized: boolean;
+    readonly tree: Map<Path, FileEntry>;
+    constructor(host: virtualFs.Host);
+    protected _copyTo<T extends VirtualTree>(tree: T): void;
+    protected _recursiveFileList(): Path[];
+    branch(): Tree;
+    get(path: string): FileEntry | null;
+}
+
+export declare type FileVisitor = FilePredicate<void>;
+
+export declare const FileVisitorCancelToken: symbol;
+
+export declare function filter(predicate: FilePredicate<boolean>): Rule;
+
+export declare class FilterHostTree extends HostTree {
+    constructor(tree: HostTree, filter?: FilePredicate<boolean>);
+}
+
+export declare function forEach(operator: FileOperator): Rule;
+
+export declare class HostCreateTree extends HostTree {
+    constructor(host: virtualFs.ReadonlyHost);
+}
+
+export declare class HostDirEntry implements DirEntry {
+    protected _host: virtualFs.SyncDelegateHost;
+    protected _tree: Tree;
+    readonly parent: DirEntry | null;
+    readonly path: Path;
+    readonly subdirs: PathFragment[];
+    readonly subfiles: PathFragment[];
+    constructor(parent: DirEntry | null, path: Path, _host: virtualFs.SyncDelegateHost, _tree: Tree);
+    dir(name: PathFragment): DirEntry;
+    file(name: PathFragment): FileEntry | null;
+    visit(visitor: FileVisitor): void;
+}
+
+export declare class HostSink extends SimpleSinkBase {
+    protected _filesToCreate: Map<Path, UpdateBuffer>;
+    protected _filesToDelete: Set<Path>;
+    protected _filesToRename: Set<[Path, Path]>;
+    protected _filesToUpdate: Map<Path, UpdateBuffer>;
+    protected _force: boolean;
+    protected _host: virtualFs.Host;
+    constructor(_host: virtualFs.Host, _force?: boolean);
+    protected _createFile(path: Path, content: Buffer): Observable<void>;
+    protected _deleteFile(path: Path): Observable<void>;
+    _done(): Observable<void>;
+    protected _overwriteFile(path: Path, content: Buffer): Observable<void>;
+    protected _renameFile(from: Path, to: Path): Observable<void>;
+    protected _validateCreateAction(action: CreateFileAction): Observable<void>;
+    protected _validateFileExists(p: Path): Observable<boolean>;
+}
+
+export declare class HostTree implements Tree {
+    protected _backend: virtualFs.ReadonlyHost<{}>;
+    readonly actions: Action[];
+    readonly root: DirEntry;
+    constructor(_backend?: virtualFs.ReadonlyHost<{}>);
+    protected _normalizePath(path: string): Path;
+    protected _willCreate(path: Path): boolean;
+    protected _willDelete(path: Path): boolean;
+    protected _willOverwrite(path: Path): boolean;
+    protected _willRename(path: Path): boolean;
+    apply(action: Action, strategy?: MergeStrategy): void;
+    beginUpdate(path: string): UpdateRecorder;
+    branch(): Tree;
+    commitUpdate(record: UpdateRecorder): void;
+    create(path: string, content: Buffer | string): void;
+    delete(path: string): void;
+    exists(path: string): boolean;
+    get(path: string): FileEntry | null;
+    getDir(path: string): DirEntry;
+    merge(other: Tree, strategy?: MergeStrategy): void;
+    optimize(): this;
+    overwrite(path: string, content: Buffer | string): void;
+    read(path: string): Buffer | null;
+    rename(from: string, to: string): void;
+    visit(visitor: FileVisitor): void;
+    static isHostTree(tree: Tree): tree is HostTree;
+}
+
+export declare const htmlSelectorFormat: schema.SchemaFormat;
+
+export declare class InvalidPipeException extends BaseException {
+    constructor(name: string);
+}
+
+export declare class InvalidRuleResultException extends BaseException {
+    constructor(value?: {});
+}
+
+export declare class InvalidSchematicsNameException extends BaseException {
+    constructor(name: string);
+}
+
+export declare class InvalidSourceResultException extends BaseException {
+    constructor(value?: {});
+}
+
+export declare class InvalidUpdateRecordException extends BaseException {
+    constructor();
+}
+
+export declare function isAction(action: any): action is Action;
+
+export declare function isContentAction(action: Action): action is CreateFileAction | OverwriteFileAction;
+
+export interface LifeCycleEvent {
+    kind: 'start' | 'end' | 'workflow-start' | 'workflow-end' | 'post-tasks-start' | 'post-tasks-end';
+}
+
+export declare class MergeConflictException extends BaseException {
+    constructor(path: string);
+}
+
+export declare enum MergeStrategy {
+    AllowOverwriteConflict = 2,
+    AllowCreationConflict = 4,
+    AllowDeleteConflict = 8,
+    Default = 0,
+    Error = 1,
+    ContentOnly = 2,
+    Overwrite = 14
+}
+
+export declare function mergeWith(source: Source, strategy?: MergeStrategy): Rule;
+
+export declare function move(from: string, to?: string): Rule;
+
+export declare function noop(): Rule;
+
+export declare class OptionIsNotDefinedException extends BaseException {
+    constructor(name: string);
+}
+
+export interface OverwriteFileAction extends ActionBase {
+    readonly content: Buffer;
+    readonly kind: 'o';
+}
+
+export declare function partitionApplyMerge(predicate: FilePredicate<boolean>, ruleYes: Rule, ruleNo?: Rule): Rule;
+
+export declare const pathFormat: schema.SchemaFormat;
+
+export declare function pathTemplate<T extends PathTemplateData>(options: T): Rule;
+
+export declare type PathTemplateData = {
+    [key: string]: PathTemplateValue | PathTemplateData | PathTemplatePipeFunction;
+};
+
+export interface PathTemplateOptions {
+    interpolationEnd: string;
+    interpolationStart: string;
+    pipeSeparator?: string;
+}
+
+export declare type PathTemplatePipeFunction = (x: string) => PathTemplateValue;
+
+export declare type PathTemplateValue = boolean | string | number | undefined;
+
+export declare class PrivateSchematicException extends BaseException {
+    constructor(name: string, collection: CollectionDescription<{}>);
+}
+
+export interface RandomOptions {
+    multi?: boolean | number;
+    multiFiles?: boolean | number;
+    root?: string;
+}
+
+export interface RenameFileAction extends ActionBase {
+    readonly kind: 'r';
+    readonly to: Path;
+}
+
+export declare function renameTemplateFiles(): Rule;
+
+export interface RequiredWorkflowExecutionContext {
+    collection: string;
+    options: object;
+    schematic: string;
+}
+
+export declare type Rule = (tree: Tree, context: SchematicContext) => Tree | Observable<Tree> | Rule | void;
+
+export declare type RuleFactory<T extends object> = (options: T) => Rule;
+
+export declare function schematic<OptionT extends object>(schematicName: string, options: OptionT, executionOptions?: Partial<ExecutionOptions>): Rule;
+
+export interface Schematic<CollectionMetadataT extends object, SchematicMetadataT extends object> {
+    readonly collection: Collection<CollectionMetadataT, SchematicMetadataT>;
+    readonly description: SchematicDescription<CollectionMetadataT, SchematicMetadataT>;
+    call<OptionT extends object>(options: OptionT, host: Observable<Tree>, parentContext?: Partial<TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>>, executionOptions?: Partial<ExecutionOptions>): Observable<Tree>;
+}
+
+export declare type SchematicContext = TypedSchematicContext<{}, {}>;
+
+export declare type SchematicDescription<CollectionMetadataT extends object, SchematicMetadataT extends object> = SchematicMetadataT & {
+    readonly collection: CollectionDescription<CollectionMetadataT>;
+    readonly name: string;
+    readonly private?: boolean;
+    readonly hidden?: boolean;
+};
+
+export declare class SchematicEngine<CollectionT extends object, SchematicT extends object> implements Engine<CollectionT, SchematicT> {
+    protected _workflow?: Workflow | undefined;
+    readonly defaultMergeStrategy: MergeStrategy;
+    readonly workflow: Workflow | null;
+    constructor(_host: EngineHost<CollectionT, SchematicT>, _workflow?: Workflow | undefined);
+    createCollection(name: string): Collection<CollectionT, SchematicT>;
+    createContext(schematic: Schematic<CollectionT, SchematicT>, parent?: Partial<TypedSchematicContext<CollectionT, SchematicT>>, executionOptions?: Partial<ExecutionOptions>): TypedSchematicContext<CollectionT, SchematicT>;
+    createSchematic(name: string, collection: Collection<CollectionT, SchematicT>, allowPrivate?: boolean): Schematic<CollectionT, SchematicT>;
+    createSourceFromUrl(url: Url, context: TypedSchematicContext<CollectionT, SchematicT>): Source;
+    executePostTasks(): Observable<void>;
+    listSchematicNames(collection: Collection<CollectionT, SchematicT>): string[];
+    transformOptions<OptionT extends object, ResultT extends object>(schematic: Schematic<CollectionT, SchematicT>, options: OptionT, context?: TypedSchematicContext<CollectionT, SchematicT>): Observable<ResultT>;
+}
+
+export declare class SchematicEngineConflictingException extends BaseException {
+    constructor();
+}
+
+export declare class SchematicImpl<CollectionT extends object, SchematicT extends object> implements Schematic<CollectionT, SchematicT> {
+    readonly collection: Collection<CollectionT, SchematicT>;
+    readonly description: SchematicDescription<CollectionT, SchematicT>;
+    constructor(_description: SchematicDescription<CollectionT, SchematicT>, _factory: RuleFactory<{}>, _collection: Collection<CollectionT, SchematicT>, _engine: Engine<CollectionT, SchematicT>);
+    call<OptionT extends object>(options: OptionT, host: Observable<Tree>, parentContext?: Partial<TypedSchematicContext<CollectionT, SchematicT>>, executionOptions?: Partial<ExecutionOptions>): Observable<Tree>;
+}
+
+export declare class SchematicsException extends BaseException {
+}
+
+export declare abstract class SimpleSinkBase implements Sink {
+    postCommit: () => void | Observable<void>;
+    postCommitAction: (action: Action) => void | Observable<void>;
+    preCommit: () => void | Observable<void>;
+    preCommitAction: (action: Action) => void | Action | PromiseLike<Action> | Observable<Action>;
+    protected abstract _createFile(path: string, content: Buffer): Observable<void>;
+    protected abstract _deleteFile(path: string): Observable<void>;
+    protected abstract _done(): Observable<void>;
+    protected _fileAlreadyExistException(path: string): void;
+    protected _fileDoesNotExistException(path: string): void;
+    protected abstract _overwriteFile(path: string, content: Buffer): Observable<void>;
+    protected abstract _renameFile(path: string, to: string): Observable<void>;
+    protected _validateCreateAction(action: CreateFileAction): Observable<void>;
+    protected _validateDeleteAction(action: DeleteFileAction): Observable<void>;
+    protected abstract _validateFileExists(p: string): Observable<boolean>;
+    protected _validateOverwriteAction(action: OverwriteFileAction): Observable<void>;
+    protected _validateRenameAction(action: RenameFileAction): Observable<void>;
+    commit(tree: Tree): Observable<void>;
+    commitSingleAction(action: Action): Observable<void>;
+    validateSingleAction(action: Action): Observable<void>;
+}
+
+export interface Sink {
+    commit(tree: Tree): Observable<void>;
+}
+
+export declare function source(tree: Tree): Source;
+
+export declare type Source = (context: SchematicContext) => Tree | Observable<Tree>;
+
+export declare const standardFormats: schema.SchemaFormat[];
+
+export interface TaskConfiguration<T = {}> {
+    dependencies?: Array<TaskId>;
+    name: string;
+    options?: T;
+}
+
+export interface TaskConfigurationGenerator<T = {}> {
+    toConfiguration(): TaskConfiguration<T>;
+}
+
+export declare type TaskExecutor<T = {}> = (options: T | undefined, context: SchematicContext) => Promise<void> | Observable<void>;
+
+export interface TaskExecutorFactory<T> {
+    readonly name: string;
+    create(options?: T): Promise<TaskExecutor> | Observable<TaskExecutor>;
+}
+
+export interface TaskId {
+    readonly id: number;
+}
+
+export interface TaskInfo {
+    readonly configuration: TaskConfiguration;
+    readonly context: SchematicContext;
+    readonly id: number;
+    readonly priority: number;
+}
+
+export declare class TaskScheduler {
+    constructor(_context: SchematicContext);
+    finalize(): ReadonlyArray<TaskInfo>;
+    schedule<T>(taskConfiguration: TaskConfiguration<T>): TaskId;
+}
+
+export declare function template<T>(options: T): Rule;
+
+export declare const TEMPLATE_FILENAME_RE: RegExp;
+
+export declare const Tree: TreeConstructor;
+
+export interface TreeConstructor {
+    branch(tree: TreeInterface): TreeInterface;
+    empty(): TreeInterface;
+    merge(tree: TreeInterface, other: TreeInterface, strategy?: MergeStrategy): TreeInterface;
+    optimize(tree: TreeInterface): TreeInterface;
+    partition(tree: TreeInterface, predicate: FilePredicate<boolean>): [TreeInterface, TreeInterface];
+}
+
+export declare const TreeSymbol: symbol;
+
+export interface TypedSchematicContext<CollectionMetadataT extends object, SchematicMetadataT extends object> {
+    readonly debug: boolean;
+    readonly engine: Engine<CollectionMetadataT, SchematicMetadataT>;
+    readonly interactive: boolean;
+    readonly logger: logging.LoggerApi;
+    readonly schematic: Schematic<CollectionMetadataT, SchematicMetadataT>;
+    readonly strategy: MergeStrategy;
+    addTask<T>(task: TaskConfigurationGenerator<T>, dependencies?: Array<TaskId>): TaskId;
+}
+
+export declare class UnimplementedException extends BaseException {
+    constructor();
+}
+
+export declare class UnknownActionException extends BaseException {
+    constructor(action: Action);
+}
+
+export declare class UnknownCollectionException extends BaseException {
+    constructor(name: string);
+}
+
+export declare class UnknownPipeException extends BaseException {
+    constructor(name: string);
+}
+
+export declare class UnknownSchematicException extends BaseException {
+    constructor(name: string, collection: CollectionDescription<{}>);
+}
+
+export declare class UnknownTaskDependencyException extends BaseException {
+    constructor(id: TaskId);
+}
+
+export declare class UnknownUrlSourceProtocol extends BaseException {
+    constructor(url: string);
+}
+
+export declare class UnregisteredTaskException extends BaseException {
+    constructor(name: string, schematic?: SchematicDescription<{}, {}>);
+}
+
+export declare class UnsuccessfulWorkflowExecution extends BaseException {
+    constructor();
+}
+
+export interface UpdateRecorder {
+    insertLeft(index: number, content: Buffer | string): UpdateRecorder;
+    insertRight(index: number, content: Buffer | string): UpdateRecorder;
+    remove(index: number, length: number): UpdateRecorder;
+}
+
+export declare function url(urlString: string): Source;
+
+export declare class VirtualDirEntry implements DirEntry {
+    protected _path: Path;
+    protected _subdirs: Map<PathFragment, DirEntry>;
+    protected _tree: VirtualTree;
+    readonly parent: DirEntry | null;
+    readonly path: Path;
+    readonly subdirs: PathFragment[];
+    readonly subfiles: PathFragment[];
+    constructor(_tree: VirtualTree, _path?: Path);
+    protected _createDir(name: PathFragment): DirEntry;
+    dir(name: PathFragment): DirEntry;
+    file(name: PathFragment): FileEntry | null;
+    visit(visitor: FileVisitor): void;
+}
+
+export declare class VirtualTree implements Tree {
+    protected _actions: ActionList;
+    protected _cacheMap: Map<Path, FileEntry>;
+    protected _root: VirtualDirEntry;
+    protected _tree: Map<Path, FileEntry>;
+    readonly actions: Action[];
+    readonly files: Path[];
+    readonly root: DirEntry;
+    readonly staging: ReadonlyMap<Path, FileEntry>;
+    protected readonly tree: ReadonlyMap<Path, FileEntry>;
+    protected _copyTo<T extends VirtualTree>(tree: T): void;
+    protected _create(path: Path, content: Buffer, action?: Action): void;
+    protected _delete(path: Path, action?: Action): void;
+    protected _normalizePath(path: string): Path;
+    protected _overwrite(path: Path, content: Buffer, action?: Action): void;
+    protected _rename(path: Path, to: Path, action?: Action, force?: boolean): void;
+    apply(action: Action, strategy: MergeStrategy): void;
+    beginUpdate(path: string): UpdateRecorder;
+    branch(): Tree;
+    commitUpdate(record: UpdateRecorder): void;
+    create(path: string, content: Buffer | string): void;
+    delete(path: string): void;
+    exists(path: string): boolean;
+    get(path: string): FileEntry | null;
+    getDir(path: string): DirEntry;
+    has(path: string): boolean;
+    merge(other: Tree, strategy?: MergeStrategy): void;
+    optimize(): void;
+    overwrite(path: string, content: Buffer | string): void;
+    read(path: string): Buffer | null;
+    rename(path: string, to: string): void;
+    set(entry: FileEntry): Map<Path, FileEntry>;
+    visit(visitor: FileVisitor): void;
+    static branch(tree: Tree): Tree;
+    static isVirtualTree(tree: Tree): tree is VirtualTree;
+    static merge(tree: Tree, other: Tree, strategy?: MergeStrategy): Tree;
+    static optimize(tree: Tree): VirtualTree;
+}
+
+export declare function when(predicate: FilePredicate<boolean>, operator: FileOperator): FileOperator;
+
+export interface Workflow {
+    readonly context: Readonly<WorkflowExecutionContext>;
+    execute(options: Partial<WorkflowExecutionContext> & RequiredWorkflowExecutionContext): Observable<void>;
+}
+
+export interface WorkflowExecutionContext extends RequiredWorkflowExecutionContext {
+    allowPrivate?: boolean;
+    debug: boolean;
+    logger: logging.Logger;
+    parentContext?: Readonly<WorkflowExecutionContext>;
+}
diff --git a/etc/api/angular_devkit/schematics/tasks/index.d.ts b/etc/api/angular_devkit/schematics/tasks/index.d.ts
new file mode 100644
index 000000000000..f802db93d246
--- /dev/null
+++ b/etc/api/angular_devkit/schematics/tasks/index.d.ts
@@ -0,0 +1,42 @@
+export declare class NodePackageInstallTask implements TaskConfigurationGenerator<NodePackageTaskOptions> {
+    packageManager?: string;
+    packageName?: string;
+    quiet: boolean;
+    workingDirectory?: string;
+    constructor(options: Partial<NodePackageInstallTaskOptions>);
+    constructor(workingDirectory?: string);
+    toConfiguration(): TaskConfiguration<NodePackageTaskOptions>;
+}
+
+export declare class NodePackageLinkTask implements TaskConfigurationGenerator<NodePackageTaskOptions> {
+    packageName?: string | undefined;
+    quiet: boolean;
+    workingDirectory?: string | undefined;
+    constructor(packageName?: string | undefined, workingDirectory?: string | undefined);
+    toConfiguration(): TaskConfiguration<NodePackageTaskOptions>;
+}
+
+export declare class RepositoryInitializerTask implements TaskConfigurationGenerator<RepositoryInitializerTaskOptions> {
+    commitOptions?: CommitOptions | undefined;
+    workingDirectory?: string | undefined;
+    constructor(workingDirectory?: string | undefined, commitOptions?: CommitOptions | undefined);
+    toConfiguration(): TaskConfiguration<RepositoryInitializerTaskOptions>;
+}
+
+export declare class RunSchematicTask<T> implements TaskConfigurationGenerator<RunSchematicTaskOptions<T>> {
+    protected _collection: string | null;
+    protected _options: T;
+    protected _schematic: string;
+    constructor(c: string, s: string, o: T);
+    constructor(s: string, o: T);
+    toConfiguration(): TaskConfiguration<RunSchematicTaskOptions<T>>;
+}
+
+export declare class TslintFixTask implements TaskConfigurationGenerator<TslintFixTaskOptions> {
+    protected _configOrPath: null | string | JsonObject;
+    protected _options: TslintFixTaskOptionsBase;
+    constructor(config: JsonObject, options: TslintFixTaskOptionsBase);
+    constructor(options: TslintFixTaskOptionsBase);
+    constructor(path: string, options: TslintFixTaskOptionsBase);
+    toConfiguration(): TaskConfiguration<TslintFixTaskOptions>;
+}
diff --git a/etc/api/angular_devkit/schematics/testing/index.d.ts b/etc/api/angular_devkit/schematics/testing/index.d.ts
new file mode 100644
index 000000000000..b2fd06c700a4
--- /dev/null
+++ b/etc/api/angular_devkit/schematics/testing/index.d.ts
@@ -0,0 +1,16 @@
+export declare class SchematicTestRunner {
+    readonly engine: SchematicEngine<{}, {}>;
+    readonly logger: logging.Logger;
+    readonly tasks: TaskConfiguration[];
+    constructor(_collectionName: string, collectionPath: string);
+    callRule(rule: Rule, tree: Tree, parentContext?: Partial<SchematicContext>): Observable<Tree>;
+    runExternalSchematic<SchematicSchemaT>(collectionName: string, schematicName: string, opts?: SchematicSchemaT, tree?: Tree): UnitTestTree;
+    runExternalSchematicAsync<SchematicSchemaT>(collectionName: string, schematicName: string, opts?: SchematicSchemaT, tree?: Tree): Observable<UnitTestTree>;
+    runSchematic<SchematicSchemaT>(schematicName: string, opts?: SchematicSchemaT, tree?: Tree): UnitTestTree;
+    runSchematicAsync<SchematicSchemaT>(schematicName: string, opts?: SchematicSchemaT, tree?: Tree): Observable<UnitTestTree>;
+}
+
+export declare class UnitTestTree extends DelegateTree {
+    readonly files: string[];
+    readContent(path: string): string;
+}
diff --git a/etc/api/angular_devkit/schematics/tools/index.d.ts b/etc/api/angular_devkit/schematics/tools/index.d.ts
new file mode 100644
index 000000000000..785039f4c799
--- /dev/null
+++ b/etc/api/angular_devkit/schematics/tools/index.d.ts
@@ -0,0 +1,150 @@
+export declare class CollectionCannotBeResolvedException extends BaseException {
+    constructor(name: string);
+}
+
+export declare class CollectionMissingFieldsException extends BaseException {
+    constructor(name: string);
+}
+
+export declare class CollectionMissingSchematicsMapException extends BaseException {
+    constructor(name: string);
+}
+
+export declare class ExportStringRef<T> {
+    readonly module: string;
+    readonly path: string;
+    readonly ref: T | undefined;
+    constructor(ref: string, parentPath?: string, inner?: boolean);
+}
+
+export declare class FactoryCannotBeResolvedException extends BaseException {
+    constructor(name: string);
+}
+
+export declare type FileSystemCollection = Collection<FileSystemCollectionDescription, FileSystemSchematicDescription>;
+
+export declare type FileSystemCollectionDesc = CollectionDescription<FileSystemCollectionDescription>;
+
+export interface FileSystemCollectionDescription {
+    readonly path: string;
+    readonly schematics: {
+        [name: string]: FileSystemSchematicDesc;
+    };
+    readonly version?: string;
+}
+
+export declare class FileSystemEngineHost extends FileSystemEngineHostBase {
+    protected _root: string;
+    constructor(_root: string);
+    protected _resolveCollectionPath(name: string): string;
+    protected _resolveReferenceString(refString: string, parentPath: string): {
+        ref: RuleFactory<{}>;
+        path: string;
+    } | null;
+    protected _transformCollectionDescription(name: string, desc: Partial<FileSystemCollectionDesc>): FileSystemCollectionDesc;
+    protected _transformSchematicDescription(name: string, _collection: FileSystemCollectionDesc, desc: Partial<FileSystemSchematicDesc>): FileSystemSchematicDesc;
+}
+
+export declare abstract class FileSystemEngineHostBase implements EngineHost<FileSystemCollectionDescription, FileSystemSchematicDescription> {
+    protected abstract _resolveCollectionPath(name: string): string;
+    protected abstract _resolveReferenceString(name: string, parentPath: string): {
+        ref: RuleFactory<{}>;
+        path: string;
+    } | null;
+    protected abstract _transformCollectionDescription(name: string, desc: Partial<FileSystemCollectionDesc>): FileSystemCollectionDesc;
+    protected abstract _transformSchematicDescription(name: string, collection: FileSystemCollectionDesc, desc: Partial<FileSystemSchematicDesc>): FileSystemSchematicDesc;
+    createCollectionDescription(name: string): FileSystemCollectionDesc;
+    createSchematicDescription(name: string, collection: FileSystemCollectionDesc): FileSystemSchematicDesc | null;
+    createSourceFromUrl(url: Url): Source | null;
+    createTaskExecutor(name: string): Observable<TaskExecutor>;
+    getSchematicRuleFactory<OptionT extends object>(schematic: FileSystemSchematicDesc, _collection: FileSystemCollectionDesc): RuleFactory<OptionT>;
+    hasTaskExecutor(name: string): boolean;
+    listSchematicNames(collection: FileSystemCollectionDesc): string[];
+    listSchematics(collection: FileSystemCollection): string[];
+    registerOptionsTransform<T extends object, R extends object>(t: OptionTransform<T, R>): void;
+    registerTaskExecutor<T>(factory: TaskExecutorFactory<T>, options?: T): void;
+    transformContext(context: FileSystemSchematicContext): FileSystemSchematicContext;
+    transformOptions<OptionT extends object, ResultT extends object>(schematic: FileSystemSchematicDesc, options: OptionT, context?: FileSystemSchematicContext): Observable<ResultT>;
+}
+
+export declare class FileSystemHost extends virtualFs.ScopedHost<{}> {
+    constructor(dir: string);
+}
+
+export declare type FileSystemSchematic = Schematic<FileSystemCollectionDescription, FileSystemSchematicDescription>;
+
+export declare type FileSystemSchematicContext = TypedSchematicContext<FileSystemCollectionDescription, FileSystemSchematicDescription>;
+
+export declare type FileSystemSchematicDesc = SchematicDescription<FileSystemCollectionDescription, FileSystemSchematicDescription>;
+
+export interface FileSystemSchematicDescription extends FileSystemSchematicJsonDescription {
+    readonly factoryFn: RuleFactory<{}>;
+    readonly path: string;
+    readonly schemaJson?: JsonObject;
+}
+
+export interface FileSystemSchematicJsonDescription {
+    readonly aliases?: string[];
+    readonly description: string;
+    readonly extends?: string;
+    readonly factory: string;
+    readonly schema?: string;
+}
+
+export declare class InvalidCollectionJsonException extends BaseException {
+    constructor(_name: string, path: string, jsonException?: UnexpectedEndOfInputException | InvalidJsonCharacterException);
+}
+
+export declare class NodeModulesEngineHost extends FileSystemEngineHostBase {
+    constructor();
+    protected _resolveCollectionPath(name: string): string;
+    protected _resolvePackageJson(name: string, basedir?: string): string;
+    protected _resolvePath(name: string, basedir?: string): string;
+    protected _resolveReferenceString(refString: string, parentPath: string): {
+        ref: RuleFactory<{}>;
+        path: string;
+    } | null;
+    protected _transformCollectionDescription(name: string, desc: Partial<FileSystemCollectionDesc>): FileSystemCollectionDesc;
+    protected _transformSchematicDescription(name: string, _collection: FileSystemCollectionDesc, desc: Partial<FileSystemSchematicDesc>): FileSystemSchematicDesc;
+}
+
+export declare class NodeModulesTestEngineHost extends NodeModulesEngineHost {
+    readonly tasks: TaskConfiguration<{}>[];
+    protected _resolveCollectionPath(name: string): string;
+    clearTasks(): void;
+    registerCollection(name: string, path: string): void;
+    transformContext(context: FileSystemSchematicContext): FileSystemSchematicContext;
+}
+
+export declare class NodePackageDoesNotSupportSchematics extends BaseException {
+    constructor(name: string);
+}
+
+export declare class NodeWorkflow extends workflow.BaseWorkflow {
+    constructor(host: virtualFs.Host, options: {
+        force?: boolean;
+        dryRun?: boolean;
+        root?: Path;
+        packageManager?: string;
+    });
+}
+
+export declare type OptionTransform<T extends object, R extends object> = (schematic: FileSystemSchematicDescription, options: T, context?: FileSystemSchematicContext) => Observable<R>;
+
+export declare class SchematicMissingDescriptionException extends BaseException {
+    constructor(name: string);
+}
+
+export declare class SchematicMissingFactoryException extends BaseException {
+    constructor(name: string);
+}
+
+export declare class SchematicMissingFieldsException extends BaseException {
+    constructor(name: string);
+}
+
+export declare class SchematicNameCollisionException extends BaseException {
+    constructor(name: string);
+}
+
+export declare function validateOptionsWithSchema(registry: schema.SchemaRegistry): <T extends {}>(schematic: FileSystemSchematicDescription, options: T, context?: import("@angular-devkit/schematics/src/engine/interface").TypedSchematicContext<import("@angular-devkit/schematics/tools/tools/description").FileSystemCollectionDescription, FileSystemSchematicDescription> | undefined) => Observable<T>;
diff --git a/packages/angular_devkit/architect/BUILD b/packages/angular_devkit/architect/BUILD
index 64928bd9c268..49dc46ed8807 100644
--- a/packages/angular_devkit/architect/BUILD
+++ b/packages/angular_devkit/architect/BUILD
@@ -6,6 +6,7 @@
 licenses(["notice"])  # MIT
 
 load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -30,3 +31,33 @@ ts_library(
         "@npm//@types/node",
     ],
 )
+
+ts_library(
+    name = "testing",
+    srcs = glob(
+        include = ["testing/**/*.ts"],
+        exclude = [
+            "**/*_spec.ts",
+            "**/*_spec_large.ts",
+        ],
+    ),
+    module_name = "@angular-devkit/architect/testing",
+    module_root = "testing/index.d.ts",
+    deps = [
+        ":architect",
+        "//packages/angular_devkit/core",
+        "//packages/angular_devkit/core:node",
+        "@rxjs",
+        "@rxjs//operators",
+        "@npm//@types/node",
+    ],
+)
+
+
+npm_package(
+    name = "npm_package",
+    deps = [
+        ":architect",
+        ":testing"
+    ],
+)
diff --git a/packages/angular_devkit/benchmark/BUILD b/packages/angular_devkit/benchmark/BUILD
index cf7fb65dd27b..06b7c3028362 100644
--- a/packages/angular_devkit/benchmark/BUILD
+++ b/packages/angular_devkit/benchmark/BUILD
@@ -6,7 +6,7 @@
 licenses(["notice"])  # MIT
 
 load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
-load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
+load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test", "npm_package")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -73,3 +73,10 @@ jasmine_node_test(
         "@npm//temp",
     ],
 )
+
+npm_package(
+    name = "npm_package",
+    deps = [
+        ":benchmark",
+    ],
+)
diff --git a/packages/angular_devkit/build_optimizer/BUILD b/packages/angular_devkit/build_optimizer/BUILD
index 84c0a9383635..9a38a79b4376 100644
--- a/packages/angular_devkit/build_optimizer/BUILD
+++ b/packages/angular_devkit/build_optimizer/BUILD
@@ -6,7 +6,7 @@
 licenses(["notice"])  # MIT
 
 load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
-load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
+load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test", "npm_package")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -58,5 +58,12 @@ jasmine_node_test(
     deps = [
         "@npm//jasmine",
         "@npm//source-map",
+    ]
+)
+
+npm_package(
+    name = "npm_package",
+    deps = [
+        ":build_optimizer",
     ],
 )
diff --git a/packages/angular_devkit/build_optimizer/src/_golden-api.ts b/packages/angular_devkit/build_optimizer/src/_golden-api.ts
new file mode 100644
index 000000000000..06e63e7a2c84
--- /dev/null
+++ b/packages/angular_devkit/build_optimizer/src/_golden-api.ts
@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+export * from './index';
+export { default } from './build-optimizer/webpack-loader';
diff --git a/packages/angular_devkit/core/BUILD b/packages/angular_devkit/core/BUILD
index 0ef5a3aea99d..39faa08980ec 100644
--- a/packages/angular_devkit/core/BUILD
+++ b/packages/angular_devkit/core/BUILD
@@ -5,7 +5,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
-load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
+load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test", "npm_package")
 
 licenses(["notice"])  # MIT License
 
@@ -157,3 +157,12 @@ ts_library(
         "@npm//@types/jasmine",
     ],
 )
+
+npm_package(
+    name = "npm_package",
+    deps = [
+        ":core",
+        ":node",
+        ":node_testing",
+    ],
+)
diff --git a/packages/angular_devkit/core/node/fs.ts b/packages/angular_devkit/core/node/fs.ts
index f5ca187a415a..7f37baef6a8d 100644
--- a/packages/angular_devkit/core/node/fs.ts
+++ b/packages/angular_devkit/core/node/fs.ts
@@ -5,34 +5,36 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import * as fs from 'fs';
+import { statSync } from 'fs';
 
-
-export function isFile(filePath: string): boolean {
-  let stat;
-  try {
-    stat = fs.statSync(filePath);
-  } catch (e) {
-    if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR')) {
-      return false;
+export namespace fs {
+  export function isFile(filePath: string): boolean {
+    let stat;
+    try {
+      stat = statSync(filePath);
+    } catch (e) {
+      if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR')) {
+        return false;
+      }
+      throw e;
     }
-    throw e;
-  }
 
-  return stat.isFile() || stat.isFIFO();
-}
+    return stat.isFile() || stat.isFIFO();
+  }
 
 
-export function isDirectory(filePath: string): boolean {
-  let stat;
-  try {
-    stat = fs.statSync(filePath);
-  } catch (e) {
-    if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR')) {
-      return false;
+  export function isDirectory(filePath: string): boolean {
+    let stat;
+    try {
+      stat = statSync(filePath);
+    } catch (e) {
+      if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR')) {
+        return false;
+      }
+      throw e;
     }
-    throw e;
+
+    return stat.isDirectory();
   }
 
-  return stat.isDirectory();
 }
diff --git a/packages/angular_devkit/core/node/index.ts b/packages/angular_devkit/core/node/index.ts
index 51a3944ba3b5..1008bfa1c3c9 100644
--- a/packages/angular_devkit/core/node/index.ts
+++ b/packages/angular_devkit/core/node/index.ts
@@ -5,10 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import * as fs from './fs';
-
+export * from './fs';
 export * from './cli-logger';
 export * from './host';
 export { ModuleNotFoundException, ResolveOptions, resolve } from './resolve';
-
-export { fs };
diff --git a/packages/angular_devkit/core/node/resolve.ts b/packages/angular_devkit/core/node/resolve.ts
index 5a3e0712e6f6..1faaf247e052 100644
--- a/packages/angular_devkit/core/node/resolve.ts
+++ b/packages/angular_devkit/core/node/resolve.ts
@@ -8,7 +8,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { BaseException } from '../src';
-import { isFile } from './fs';
+import { fs as devkitFs } from './fs';
 
 /**
  * Exception thrown when a module could not be resolved.
@@ -204,16 +204,16 @@ export function resolve(x: string, options: ResolveOptions): string {
   throw new ModuleNotFoundException(x, basePath);
 
   function loadAsFileSync(x: string): string | null {
-    if (isFile(x)) {
+    if (devkitFs.isFile(x)) {
       return x;
     }
 
-    return extensions.map(ex => x + ex).find(f => isFile(f)) || null;
+    return extensions.map(ex => x + ex).find(f => devkitFs.isFile(f)) || null;
   }
 
   function loadAsDirectorySync(x: string): string | null {
     const pkgfile = path.join(x, 'package.json');
-    if (isFile(pkgfile)) {
+    if (devkitFs.isFile(pkgfile)) {
       if (options.resolvePackageJson) {
         return pkgfile;
       }
diff --git a/packages/angular_devkit/core/src/_golden-api.ts b/packages/angular_devkit/core/src/_golden-api.ts
new file mode 100644
index 000000000000..d6916e0f9b62
--- /dev/null
+++ b/packages/angular_devkit/core/src/_golden-api.ts
@@ -0,0 +1,53 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export * from './exception/exception';
+
+ // Start experimental namespace
+export * from './workspace/index';
+// End experimental namespace
+
+// Start json namespace
+export * from './json/interface';
+export * from './json/parser';
+export * from './json/schema/interface';
+export * from './json/schema/pointer';
+export * from './json/schema/registry';
+export * from './json/schema/visitor';
+export * from './json/schema/utility';
+export * from './json/schema/transforms';
+// End json namespace
+
+// Start logging namespace
+export * from './logger/indent';
+export * from './logger/level';
+export * from './logger/logger';
+export * from './logger/null-logger';
+export * from './logger/transform-logger';
+// End logging namespace
+
+// Start terminal namespace
+export * from './terminal/text';
+export * from './terminal/colors';
+// End terminal namespace
+
+// Start utils namespace
+export * from './utils/literals';
+export * from './utils/strings';
+export * from './utils/array';
+export * from './utils/object';
+export * from './utils/template';
+export * from './utils/partially-ordered-set';
+export * from './utils/priority-queue';
+export * from './utils/lang';
+// End utils namespace
+
+// Start virtualFs namespace
+export * from './virtual-fs/path';
+export * from './virtual-fs/host/index';
+// End virtualFs namespace
diff --git a/packages/angular_devkit/core/src/experimental.ts b/packages/angular_devkit/core/src/experimental.ts
index 9e2f0199cf67..5e3dcf689ed7 100644
--- a/packages/angular_devkit/core/src/experimental.ts
+++ b/packages/angular_devkit/core/src/experimental.ts
@@ -5,6 +5,6 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import * as workspace from './workspace';
+import * as workspace from './workspace/index';
 
 export { workspace };
diff --git a/packages/angular_devkit/core/src/index.ts b/packages/angular_devkit/core/src/index.ts
index 874421822d83..e292e8e9ff42 100644
--- a/packages/angular_devkit/core/src/index.ts
+++ b/packages/angular_devkit/core/src/index.ts
@@ -6,14 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import * as experimental from './experimental';
-import * as json from './json';
-import * as logging from './logger';
-import * as terminal from './terminal';
+import * as json from './json/index';
+import * as logging from './logger/index';
+import * as terminal from './terminal/index';
 
 export * from './exception/exception';
-export * from './json';
-export * from './utils';
-export * from './virtual-fs';
+export * from './json/index';
+export * from './utils/index';
+export * from './virtual-fs/index';
 
 export {
   experimental,
diff --git a/packages/angular_devkit/core/src/json/index.ts b/packages/angular_devkit/core/src/json/index.ts
index 4109871211e3..16bc0d1ff55c 100644
--- a/packages/angular_devkit/core/src/json/index.ts
+++ b/packages/angular_devkit/core/src/json/index.ts
@@ -8,5 +8,5 @@
 export * from './interface';
 export * from './parser';
 
-import * as schema from './schema';
+import * as schema from './schema/index';
 export { schema };
diff --git a/packages/angular_devkit/core/src/json/parser.ts b/packages/angular_devkit/core/src/json/parser.ts
index b89b6ccc92dd..cdf83e20771d 100644
--- a/packages/angular_devkit/core/src/json/parser.ts
+++ b/packages/angular_devkit/core/src/json/parser.ts
@@ -864,7 +864,7 @@ export function parseJsonAst(input: string, mode = JsonParseMode.Default): JsonA
 /**
  * Options for the parseJson() function.
  */
-interface ParseJsonOptions {
+export interface ParseJsonOptions {
   /**
    * If omitted, will only emit errors related to the content of the JSON. If specified, any
    * JSON errors will also include the path of the file that caused the error.
diff --git a/packages/angular_devkit/core/src/terminal/colors.ts b/packages/angular_devkit/core/src/terminal/colors.ts
index 6f509446efd3..1494ec04bcb6 100644
--- a/packages/angular_devkit/core/src/terminal/colors.ts
+++ b/packages/angular_devkit/core/src/terminal/colors.ts
@@ -44,32 +44,33 @@ const kColorFunctions = mapObject(kColors, (_, v) => {
   return mapObject(v, (_, vv) => (x: string) => `\u001b[${vv[0]}m${x}\u001b[${vv[1]}m`);
 });
 
+export namespace colors {
+  export const reset = kColorFunctions.modifiers.reset;
+  export const bold = kColorFunctions.modifiers.bold;
+  export const dim = kColorFunctions.modifiers.dim;
+  export const italic = kColorFunctions.modifiers.italic;
+  export const underline = kColorFunctions.modifiers.underline;
+  export const inverse = kColorFunctions.modifiers.inverse;
+  export const hidden = kColorFunctions.modifiers.hidden;
+  export const strikethrough = kColorFunctions.modifiers.strikethrough;
 
-export const reset = kColorFunctions.modifiers.reset;
-export const bold = kColorFunctions.modifiers.bold;
-export const dim = kColorFunctions.modifiers.dim;
-export const italic = kColorFunctions.modifiers.italic;
-export const underline = kColorFunctions.modifiers.underline;
-export const inverse = kColorFunctions.modifiers.inverse;
-export const hidden = kColorFunctions.modifiers.hidden;
-export const strikethrough = kColorFunctions.modifiers.strikethrough;
+  export const black = kColorFunctions.colors.black;
+  export const red = kColorFunctions.colors.red;
+  export const green = kColorFunctions.colors.green;
+  export const yellow = kColorFunctions.colors.yellow;
+  export const blue = kColorFunctions.colors.blue;
+  export const magenta = kColorFunctions.colors.magenta;
+  export const cyan = kColorFunctions.colors.cyan;
+  export const white = kColorFunctions.colors.white;
+  export const grey = kColorFunctions.colors.gray;
+  export const gray = kColorFunctions.colors.gray;
 
-export const black = kColorFunctions.colors.black;
-export const red = kColorFunctions.colors.red;
-export const green = kColorFunctions.colors.green;
-export const yellow = kColorFunctions.colors.yellow;
-export const blue = kColorFunctions.colors.blue;
-export const magenta = kColorFunctions.colors.magenta;
-export const cyan = kColorFunctions.colors.cyan;
-export const white = kColorFunctions.colors.white;
-export const grey = kColorFunctions.colors.gray;
-export const gray = kColorFunctions.colors.gray;
-
-export const bgBlack = kColorFunctions.bgColors.bgBlack;
-export const bgRed = kColorFunctions.bgColors.bgRed;
-export const bgGreen = kColorFunctions.bgColors.bgGreen;
-export const bgYellow = kColorFunctions.bgColors.bgYellow;
-export const bgBlue = kColorFunctions.bgColors.bgBlue;
-export const bgMagenta = kColorFunctions.bgColors.bgMagenta;
-export const bgCyan = kColorFunctions.bgColors.bgCyan;
-export const bgWhite = kColorFunctions.bgColors.bgWhite;
+  export const bgBlack = kColorFunctions.bgColors.bgBlack;
+  export const bgRed = kColorFunctions.bgColors.bgRed;
+  export const bgGreen = kColorFunctions.bgColors.bgGreen;
+  export const bgYellow = kColorFunctions.bgColors.bgYellow;
+  export const bgBlue = kColorFunctions.bgColors.bgBlue;
+  export const bgMagenta = kColorFunctions.bgColors.bgMagenta;
+  export const bgCyan = kColorFunctions.bgColors.bgCyan;
+  export const bgWhite = kColorFunctions.bgColors.bgWhite;
+}
diff --git a/packages/angular_devkit/core/src/terminal/index.ts b/packages/angular_devkit/core/src/terminal/index.ts
index e4bcae665520..a33a3ba65ac9 100644
--- a/packages/angular_devkit/core/src/terminal/index.ts
+++ b/packages/angular_devkit/core/src/terminal/index.ts
@@ -6,6 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 export * from './text';
-
-import * as colors from './colors';
-export { colors };
+export * from './colors';
diff --git a/packages/angular_devkit/core/src/terminal/text.ts b/packages/angular_devkit/core/src/terminal/text.ts
index bf4f9e7ebae2..3636270a62a1 100644
--- a/packages/angular_devkit/core/src/terminal/text.ts
+++ b/packages/angular_devkit/core/src/terminal/text.ts
@@ -6,34 +6,33 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import * as caps from './caps';
-import * as ansi from './colors';
+import { colors } from './colors';
 
+export const reset = caps.stdout.colors ? colors.reset : (x: string) => x;
+export const bold = caps.stdout.colors ? colors.bold : (x: string) => x;
+export const dim = caps.stdout.colors ? colors.dim : (x: string) => x;
+export const italic = caps.stdout.colors ? colors.italic : (x: string) => x;
+export const underline = caps.stdout.colors ? colors.underline : (x: string) => x;
+export const inverse = caps.stdout.colors ? colors.inverse : (x: string) => x;
+export const hidden = caps.stdout.colors ? colors.hidden : (x: string) => x;
+export const strikethrough = caps.stdout.colors ? colors.strikethrough : (x: string) => x;
 
-export const reset = caps.stdout.colors ? ansi.reset : (x: string) => x;
-export const bold = caps.stdout.colors ? ansi.bold : (x: string) => x;
-export const dim = caps.stdout.colors ? ansi.dim : (x: string) => x;
-export const italic = caps.stdout.colors ? ansi.italic : (x: string) => x;
-export const underline = caps.stdout.colors ? ansi.underline : (x: string) => x;
-export const inverse = caps.stdout.colors ? ansi.inverse : (x: string) => x;
-export const hidden = caps.stdout.colors ? ansi.hidden : (x: string) => x;
-export const strikethrough = caps.stdout.colors ? ansi.strikethrough : (x: string) => x;
+export const black = caps.stdout.colors ? colors.black : (x: string) => x;
+export const red = caps.stdout.colors ? colors.red : (x: string) => x;
+export const green = caps.stdout.colors ? colors.green : (x: string) => x;
+export const yellow = caps.stdout.colors ? colors.yellow : (x: string) => x;
+export const blue = caps.stdout.colors ? colors.blue : (x: string) => x;
+export const magenta = caps.stdout.colors ? colors.magenta : (x: string) => x;
+export const cyan = caps.stdout.colors ? colors.cyan : (x: string) => x;
+export const white = caps.stdout.colors ? colors.white : (x: string) => x;
+export const grey = caps.stdout.colors ? colors.gray : (x: string) => x;
+export const gray = caps.stdout.colors ? colors.gray : (x: string) => x;
 
-export const black = caps.stdout.colors ? ansi.black : (x: string) => x;
-export const red = caps.stdout.colors ? ansi.red : (x: string) => x;
-export const green = caps.stdout.colors ? ansi.green : (x: string) => x;
-export const yellow = caps.stdout.colors ? ansi.yellow : (x: string) => x;
-export const blue = caps.stdout.colors ? ansi.blue : (x: string) => x;
-export const magenta = caps.stdout.colors ? ansi.magenta : (x: string) => x;
-export const cyan = caps.stdout.colors ? ansi.cyan : (x: string) => x;
-export const white = caps.stdout.colors ? ansi.white : (x: string) => x;
-export const grey = caps.stdout.colors ? ansi.gray : (x: string) => x;
-export const gray = caps.stdout.colors ? ansi.gray : (x: string) => x;
-
-export const bgBlack = caps.stdout.colors ? ansi.bgBlack : (x: string) => x;
-export const bgRed = caps.stdout.colors ? ansi.bgRed : (x: string) => x;
-export const bgGreen = caps.stdout.colors ? ansi.bgGreen : (x: string) => x;
-export const bgYellow = caps.stdout.colors ? ansi.bgYellow : (x: string) => x;
-export const bgBlue = caps.stdout.colors ? ansi.bgBlue : (x: string) => x;
-export const bgMagenta = caps.stdout.colors ? ansi.bgMagenta : (x: string) => x;
-export const bgCyan = caps.stdout.colors ? ansi.bgCyan : (x: string) => x;
-export const bgWhite = caps.stdout.colors ? ansi.bgWhite : (x: string) => x;
+export const bgBlack = caps.stdout.colors ? colors.bgBlack : (x: string) => x;
+export const bgRed = caps.stdout.colors ? colors.bgRed : (x: string) => x;
+export const bgGreen = caps.stdout.colors ? colors.bgGreen : (x: string) => x;
+export const bgYellow = caps.stdout.colors ? colors.bgYellow : (x: string) => x;
+export const bgBlue = caps.stdout.colors ? colors.bgBlue : (x: string) => x;
+export const bgMagenta = caps.stdout.colors ? colors.bgMagenta : (x: string) => x;
+export const bgCyan = caps.stdout.colors ? colors.bgCyan : (x: string) => x;
+export const bgWhite = caps.stdout.colors ? colors.bgWhite : (x: string) => x;
diff --git a/packages/angular_devkit/core/src/virtual-fs/host/index.ts b/packages/angular_devkit/core/src/virtual-fs/host/index.ts
index f7c963dcfc86..c17b0c50f952 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/index.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/index.ts
@@ -17,7 +17,4 @@ export * from './safe';
 export * from './scoped';
 export * from './sync';
 export * from './resolver';
-
-import * as test from './test';
-
-export { test };
+export * from './test';
diff --git a/packages/angular_devkit/core/src/virtual-fs/host/record_spec.ts b/packages/angular_devkit/core/src/virtual-fs/host/record_spec.ts
index 96b6b0e43eaa..2500cc66bb5d 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/record_spec.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/record_spec.ts
@@ -9,10 +9,11 @@
 import { path } from '../path';
 import { fileBuffer } from './buffer';
 import { CordHost } from './record';
-import { TestHost } from './test';
+import { test } from './test';
 
 
 describe('CordHost', () => {
+  const TestHost = test.TestHost;
   const mutatingTestRecord = ['write', 'delete', 'rename'];
 
   it('works (create)', done => {
diff --git a/packages/angular_devkit/core/src/virtual-fs/host/test.ts b/packages/angular_devkit/core/src/virtual-fs/host/test.ts
index 4efdae796f4b..55179384b5f6 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/test.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/test.ts
@@ -12,10 +12,11 @@ import { FileBuffer, HostWatchEvent, HostWatchOptions, Stats } from './interface
 import { SimpleMemoryHost, SimpleMemoryHostStats } from './memory';
 import { SyncDelegateHost } from './sync';
 
+export namespace test {
 
-export type TestLogRecord = {
+  export type TestLogRecord = {
     kind: 'write' | 'read' | 'delete' | 'list' | 'exists' | 'isDirectory' | 'isFile' | 'stat'
-        | 'watch';
+    | 'watch';
     path: Path;
   } | {
     kind: 'rename';
@@ -24,130 +25,132 @@ export type TestLogRecord = {
   };
 
 
-export class TestHost extends SimpleMemoryHost {
-  protected _records: TestLogRecord[] = [];
-  protected _sync: SyncDelegateHost<{}>;
+  export class TestHost extends SimpleMemoryHost {
+    protected _records: TestLogRecord[] = [];
+    protected _sync: SyncDelegateHost<{}>;
 
-  constructor(map: { [path: string]: string } = {}) {
-    super();
+    constructor(map: { [path: string]: string } = {}) {
+      super();
 
-    for (const filePath of Object.getOwnPropertyNames(map)) {
-      this._write(normalize(filePath), stringToFileBuffer(map[filePath]));
+      for (const filePath of Object.getOwnPropertyNames(map)) {
+        this._write(normalize(filePath), stringToFileBuffer(map[filePath]));
+      }
     }
-  }
 
-  get records(): TestLogRecord[] {
-    return [...this._records];
-  }
-  clearRecords() {
-    this._records = [];
-  }
+    get records(): TestLogRecord[] {
+      return [...this._records];
+    }
+    clearRecords() {
+      this._records = [];
+    }
 
-  get files(): Path[] {
-    const sync = this.sync;
-    function _visit(p: Path): Path[] {
-      return sync.list(p)
-        .map(fragment => join(p, fragment))
-        .reduce((files, path) => {
-          if (sync.isDirectory(path)) {
-            return files.concat(_visit(path));
-          } else {
-            return files.concat(path);
-          }
-        }, [] as Path[]);
-    }
-
-    return _visit(normalize('/'));
-  }
+    get files(): Path[] {
+      const sync = this.sync;
+      function _visit(p: Path): Path[] {
+        return sync.list(p)
+          .map(fragment => join(p, fragment))
+          .reduce((files, path) => {
+            if (sync.isDirectory(path)) {
+              return files.concat(_visit(path));
+            } else {
+              return files.concat(path);
+            }
+          }, [] as Path[]);
+      }
+
+      return _visit(normalize('/'));
+    }
+
+    get sync() {
+      if (!this._sync) {
+        this._sync = new SyncDelegateHost<{}>(this);
+      }
 
-  get sync() {
-    if (!this._sync) {
-      this._sync = new SyncDelegateHost<{}>(this);
+      return this._sync;
     }
 
-    return this._sync;
-  }
+    clone() {
+      const newHost = new TestHost();
+      newHost._cache = new Map(this._cache);
 
-  clone() {
-    const newHost = new TestHost();
-    newHost._cache = new Map(this._cache);
+      return newHost;
+    }
 
-    return newHost;
-  }
+    // Override parents functions to keep a record of all operators that were done.
+    protected _write(path: Path, content: FileBuffer) {
+      this._records.push({ kind: 'write', path });
 
-  // Override parents functions to keep a record of all operators that were done.
-  protected _write(path: Path, content: FileBuffer) {
-    this._records.push({ kind: 'write', path });
+      return super._write(path, content);
+    }
+    protected _read(path: Path) {
+      this._records.push({ kind: 'read', path });
 
-    return super._write(path, content);
-  }
-  protected _read(path: Path) {
-    this._records.push({ kind: 'read', path });
+      return super._read(path);
+    }
+    protected _delete(path: Path) {
+      this._records.push({ kind: 'delete', path });
 
-    return super._read(path);
-  }
-  protected _delete(path: Path) {
-    this._records.push({ kind: 'delete', path });
+      return super._delete(path);
+    }
+    protected _rename(from: Path, to: Path) {
+      this._records.push({ kind: 'rename', from, to });
 
-    return super._delete(path);
-  }
-  protected _rename(from: Path, to: Path) {
-    this._records.push({ kind: 'rename', from, to });
+      return super._rename(from, to);
+    }
+    protected _list(path: Path): PathFragment[] {
+      this._records.push({ kind: 'list', path });
 
-    return super._rename(from, to);
-  }
-  protected _list(path: Path): PathFragment[] {
-    this._records.push({ kind: 'list', path });
+      return super._list(path);
+    }
+    protected _exists(path: Path) {
+      this._records.push({ kind: 'exists', path });
 
-    return super._list(path);
-  }
-  protected _exists(path: Path) {
-    this._records.push({ kind: 'exists', path });
+      return super._exists(path);
+    }
+    protected _isDirectory(path: Path) {
+      this._records.push({ kind: 'isDirectory', path });
 
-    return super._exists(path);
-  }
-  protected _isDirectory(path: Path) {
-    this._records.push({ kind: 'isDirectory', path });
+      return super._isDirectory(path);
+    }
+    protected _isFile(path: Path) {
+      this._records.push({ kind: 'isFile', path });
 
-    return super._isDirectory(path);
-  }
-  protected _isFile(path: Path) {
-    this._records.push({ kind: 'isFile', path });
+      return super._isFile(path);
+    }
+    protected _stat(path: Path): Stats<SimpleMemoryHostStats> | null {
+      this._records.push({ kind: 'stat', path });
 
-    return super._isFile(path);
-  }
-  protected _stat(path: Path): Stats<SimpleMemoryHostStats> | null {
-    this._records.push({ kind: 'stat', path });
+      return super._stat(path);
+    }
+    protected _watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent> {
+      this._records.push({ kind: 'watch', path });
 
-    return super._stat(path);
-  }
-  protected _watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent> {
-    this._records.push({ kind: 'watch', path });
+      return super._watch(path, options);
+    }
 
-    return super._watch(path, options);
-  }
+    $write(path: string, content: string) {
+      return super._write(normalize(path), stringToFileBuffer(content));
+    }
 
-  $write(path: string, content: string) {
-    return super._write(normalize(path), stringToFileBuffer(content));
-  }
+    $read(path: string): string {
+      return fileBufferToString(super._read(normalize(path)));
+    }
 
-  $read(path: string): string {
-    return fileBufferToString(super._read(normalize(path)));
-  }
+    $list(path: string): PathFragment[] {
+      return super._list(normalize(path));
+    }
 
-  $list(path: string): PathFragment[] {
-    return super._list(normalize(path));
-  }
+    $exists(path: string) {
+      return super._exists(normalize(path));
+    }
 
-  $exists(path: string) {
-    return super._exists(normalize(path));
-  }
+    $isDirectory(path: string) {
+      return super._isDirectory(normalize(path));
+    }
 
-  $isDirectory(path: string) {
-    return super._isDirectory(normalize(path));
+    $isFile(path: string) {
+      return super._isFile(normalize(path));
+    }
   }
 
-  $isFile(path: string) {
-    return super._isFile(normalize(path));
-  }
 }
diff --git a/packages/angular_devkit/core/src/virtual-fs/host/test_spec.ts b/packages/angular_devkit/core/src/virtual-fs/host/test_spec.ts
index dc8556054ab6..4e0cb296a155 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/test_spec.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/test_spec.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { TestHost } from './test';
+import { test } from './test';
 
 
 // Yes, we realize the irony of testing a test host.
@@ -19,7 +19,7 @@ describe('TestHost', () => {
       '/x/y/b': '',
     };
 
-    const host = new TestHost(files);
+    const host = new test.TestHost(files);
     expect(host.files.sort() as string[]).toEqual(Object.keys(files).sort());
   });
 
diff --git a/packages/angular_devkit/core/src/virtual-fs/index.ts b/packages/angular_devkit/core/src/virtual-fs/index.ts
index ab9ccf25fcd1..988c3b40d449 100644
--- a/packages/angular_devkit/core/src/virtual-fs/index.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/index.ts
@@ -7,5 +7,5 @@
  */
 export * from './path';
 
-import * as virtualFs from './host';
+import * as virtualFs from './host/index';
 export { virtualFs };
diff --git a/packages/angular_devkit/schematics/BUILD b/packages/angular_devkit/schematics/BUILD
index f69847984252..46fd94b6ae28 100644
--- a/packages/angular_devkit/schematics/BUILD
+++ b/packages/angular_devkit/schematics/BUILD
@@ -5,7 +5,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
-load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
+load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test", "npm_package")
 
 licenses(["notice"])  # MIT License
 
@@ -250,3 +250,13 @@ ts_library(
         "@npm//@types/node",
     ],
 )
+
+npm_package(
+    name = "npm_package",
+    deps = [
+        ":schematics",
+        ":tasks",
+        ":tools",
+        ":testing"
+    ],
+)
diff --git a/packages/angular_devkit/schematics/src/_golden-api.ts b/packages/angular_devkit/schematics/src/_golden-api.ts
new file mode 100644
index 000000000000..9d9ea4ddacbe
--- /dev/null
+++ b/packages/angular_devkit/schematics/src/_golden-api.ts
@@ -0,0 +1,13 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export * from './index';
+
+export * from './formats/index';
+
+export * from './workflow/index';
diff --git a/packages/angular_devkit/schematics/src/index.ts b/packages/angular_devkit/schematics/src/index.ts
index 31333a014f09..52c8b314e8eb 100644
--- a/packages/angular_devkit/schematics/src/index.ts
+++ b/packages/angular_devkit/schematics/src/index.ts
@@ -12,7 +12,7 @@ import { branch, empty, merge, optimize, partition } from './tree/static';
 export { SchematicsException } from './exception/exception';
 
 export * from './tree/action';
-export * from './engine';
+export * from './engine/index';
 export * from './exception/exception';
 export * from './tree/interface';
 export * from './rules/base';
@@ -34,10 +34,10 @@ export * from './sink/filesystem';
 export * from './sink/host';
 export * from './sink/sink';
 
-import * as formats from './formats';
+import * as formats from './formats/index';
 export { formats };
 
-import * as workflow from './workflow';
+import * as workflow from './workflow/index';
 export { workflow };
 
 export interface TreeConstructor {
diff --git a/tsconfig.json b/tsconfig.json
index 33867eb4ba63..1b04987d77f1 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -72,5 +72,6 @@
     "tests/**/*",
     "tools/**/*",
     "benchmark/**/*",
+    "etc/api/**/*"
   ]
 }

From 1ad42db2857d3e2652e7375cdd44667ba35e4fc1 Mon Sep 17 00:00:00 2001
From: clydin <19598772+clydin@users.noreply.github.com>
Date: Fri, 30 Nov 2018 14:55:29 -0500
Subject: [PATCH 0471/1703] fix(@ngtools/webpack): cleanup resources after
 modules are loaded (#12994)

---
 .../webpack/src/angular_compiler_plugin.ts    | 36 +++++++++++++++----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 3aa428ac97c9..ef9ad5c1ed0f 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -134,7 +134,7 @@ export class AngularCompilerPlugin {
   private _program: (ts.Program | Program) | null;
   private _compilerHost: WebpackCompilerHost & CompilerHost;
   private _moduleResolutionCache: ts.ModuleResolutionCache;
-  private _resourceLoader: WebpackResourceLoader;
+  private _resourceLoader?: WebpackResourceLoader;
   // Contains `moduleImportPath#exportName` => `fullModulePath`.
   private _lazyRoutes: LazyRouteMap = Object.create(null);
   private _tsConfigPath: string;
@@ -580,9 +580,20 @@ export class AngularCompilerPlugin {
   }
 
   // Registration hook for webpack plugin.
+  // tslint:disable-next-line:no-big-function
   apply(compiler: Compiler & { watchMode?: boolean }) {
-    // only present for webpack 4.23.0+, assume true otherwise
-    const watchMode = compiler.watchMode === undefined ? true : compiler.watchMode;
+    // cleanup if not watching
+    compiler.hooks.thisCompilation.tap('angular-compiler', compilation => {
+      compilation.hooks.finishModules.tap('angular-compiler', () => {
+        // only present for webpack 4.23.0+, assume true otherwise
+        const watchMode = compiler.watchMode === undefined ? true : compiler.watchMode;
+        if (!watchMode) {
+          this._program = null;
+          this._transformers = [];
+          this._resourceLoader = undefined;
+        }
+      });
+    });
 
     // Decorate inputFileSystem to serve contents of CompilerHost.
     // Use decorated inputFileSystem in watchFileSystem.
@@ -622,6 +633,9 @@ export class AngularCompilerPlugin {
         }
       }
 
+      // only present for webpack 4.23.0+, assume true otherwise
+      const watchMode = compiler.watchMode === undefined ? true : compiler.watchMode;
+
       // Create the webpack compiler host.
       const webpackCompilerHost = new WebpackCompilerHost(
         this._compilerOptions,
@@ -631,9 +645,11 @@ export class AngularCompilerPlugin {
         this._options.directTemplateLoading,
       );
 
-      // Create and set a new WebpackResourceLoader.
-      this._resourceLoader = new WebpackResourceLoader();
-      webpackCompilerHost.setResourceLoader(this._resourceLoader);
+      // Create and set a new WebpackResourceLoader in AOT
+      if (!this._JitMode) {
+        this._resourceLoader = new WebpackResourceLoader();
+        webpackCompilerHost.setResourceLoader(this._resourceLoader);
+      }
 
       // Use the WebpackCompilerHost with a resource loader to create an AngularCompilerHost.
       this._compilerHost = createCompilerHost({
@@ -787,7 +803,9 @@ export class AngularCompilerPlugin {
     (compilation as any)._ngToolsWebpackPluginInstance = this;
 
     // Update the resource loader with the new webpack compilation.
-    this._resourceLoader.update(compilation);
+    if (this._resourceLoader) {
+      this._resourceLoader.update(compilation);
+    }
 
     try {
       await this._update();
@@ -1012,6 +1030,10 @@ export class AngularCompilerPlugin {
   }
 
   getResourceDependencies(fileName: string): string[] {
+    if (!this._resourceLoader) {
+      return [];
+    }
+
     return this._resourceLoader.getResourceDependencies(fileName);
   }
 

From db0fc7759b16ab1c1f74e07cf44b4cebf284e6f4 Mon Sep 17 00:00:00 2001
From: Michael O'Keefe <okeefem355@gmail.com>
Date: Fri, 30 Nov 2018 15:01:57 -0500
Subject: [PATCH 0472/1703] feat(@angular/cli): Added support for multiselect
 list prompt (#13031)

* feat(@angular/cli): Added support for multiselect list prompt

* If multiselect option is true use the checkbox
   inquirer prompt type, otherwise use list.

* feat(@angular-devkit/core): Added support for multiselect list prompt

* Added multiselect to PromptDefinition interface and usages
---
 .../angular/cli/models/schematic-command.ts   |  2 +-
 .../core/src/json/schema/interface.ts         |  3 +-
 .../core/src/json/schema/prompt_spec.ts       | 77 +++++++++++++++++++
 .../core/src/json/schema/registry.ts          |  1 +
 .../schematics_cli/bin/schematics.ts          |  2 +-
 5 files changed, 82 insertions(+), 3 deletions(-)

diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index 5b7c03259ba9..ded5925dfab8 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -309,7 +309,7 @@ export abstract class SchematicCommand<
               question.type = 'confirm';
               break;
             case 'list':
-              question.type = 'list';
+              question.type = !!definition.multiselect ? 'checkbox' : 'list';
               question.choices = definition.items && definition.items.map(item => {
                 if (typeof item == 'string') {
                   return item;
diff --git a/packages/angular_devkit/core/src/json/schema/interface.ts b/packages/angular_devkit/core/src/json/schema/interface.ts
index 9861a30889ac..4269b191a197 100644
--- a/packages/angular_devkit/core/src/json/schema/interface.ts
+++ b/packages/angular_devkit/core/src/json/schema/interface.ts
@@ -99,13 +99,14 @@ export interface PromptDefinition {
   id: string;
   type: string;
   message: string;
-  default?: string | number | boolean | null;
+  default?: string | string[] | number | boolean | null;
   priority: number;
   validator?: (value: string) => boolean | string | Promise<boolean | string>;
 
   items?: Array<string | { value: JsonValue, label: string }>;
 
   raw?: string | JsonObject;
+  multiselect?: boolean;
 }
 
 export type PromptProvider = (definitions: Array<PromptDefinition>)
diff --git a/packages/angular_devkit/core/src/json/schema/prompt_spec.ts b/packages/angular_devkit/core/src/json/schema/prompt_spec.ts
index d1bb23c12fdb..6e74e7fb6559 100644
--- a/packages/angular_devkit/core/src/json/schema/prompt_spec.ts
+++ b/packages/angular_devkit/core/src/json/schema/prompt_spec.ts
@@ -262,6 +262,83 @@ describe('Prompt Provider', () => {
         .toPromise().then(done, done.fail);
     });
 
+    it('analyzes list with multiselect option and object items', done => {
+      const registry = new CoreSchemaRegistry();
+      const data: any = {};
+
+      registry.usePromptProvider(async definitions => {
+        expect(definitions.length).toBe(1);
+        expect(definitions[0].type).toBe('list');
+        expect(definitions[0].multiselect).toBe(true);
+        expect(definitions[0].items).toEqual([
+          { 'value': 'one', 'label': 'one' },
+          { 'value': 'two', 'label': 'two' },
+        ]);
+
+        return { [definitions[0].id]: { 'value': 'one', 'label': 'one' } };
+      });
+
+      registry
+        .compile({
+          properties: {
+            test: {
+              type: 'array',
+              'x-prompt': {
+                'type': 'list',
+                'multiselect': true,
+                'items': [
+                  { 'value': 'one', 'label': 'one' },
+                  { 'value': 'two', 'label': 'two' },
+                ],
+                'message': 'test-message',
+              },
+            },
+          },
+        })
+        .pipe(
+          mergeMap(validator => validator(data)),
+        )
+        .toPromise().then(done, done.fail);
+    });
+
+    it('analyzes list without multiselect option and object items', done => {
+      const registry = new CoreSchemaRegistry();
+      const data: any = {};
+
+      registry.usePromptProvider(async definitions => {
+        expect(definitions.length).toBe(1);
+        expect(definitions[0].type).toBe('list');
+        expect(definitions[0].multiselect).toBeUndefined();
+        expect(definitions[0].items).toEqual([
+          { 'value': 'one', 'label': 'one' },
+          { 'value': 'two', 'label': 'two' },
+        ]);
+
+        return { [definitions[0].id]: { 'value': 'two', 'label': 'two' } };
+      });
+
+      registry
+        .compile({
+          properties: {
+            test: {
+              type: 'array',
+              'x-prompt': {
+                'type': 'list',
+                'items': [
+                  { 'value': 'one', 'label': 'one' },
+                  { 'value': 'two', 'label': 'two' },
+                ],
+                'message': 'test-message',
+              },
+            },
+          },
+        })
+        .pipe(
+          mergeMap(validator => validator(data)),
+        )
+        .toPromise().then(done, done.fail);
+    });
+
     it('analyzes enums WITHOUT explicit list type', done => {
       const registry = new CoreSchemaRegistry();
       const data: any = {};
diff --git a/packages/angular_devkit/core/src/json/schema/registry.ts b/packages/angular_devkit/core/src/json/schema/registry.ts
index 71a4b7a6ce5d..b228a0896faa 100644
--- a/packages/angular_devkit/core/src/json/schema/registry.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry.ts
@@ -568,6 +568,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
           priority: 0,
           raw: schema,
           items,
+          multiselect: type === 'list' ? schema.multiselect : false,
           default: typeof parentSchema.default == 'object' ? undefined : parentSchema.default,
           async validator(data: string) {
             const result = it.self.validate(parentSchema, data);
diff --git a/packages/angular_devkit/schematics_cli/bin/schematics.ts b/packages/angular_devkit/schematics_cli/bin/schematics.ts
index b5e97bb3c0e7..3ce98f7fa17f 100644
--- a/packages/angular_devkit/schematics_cli/bin/schematics.ts
+++ b/packages/angular_devkit/schematics_cli/bin/schematics.ts
@@ -98,7 +98,7 @@ function _createPromptProvider(): schema.PromptProvider {
         case 'list':
           return {
             ...question,
-            type: 'list',
+            type: !!definition.multiselect ? 'checkbox' : 'list',
             choices: definition.items && definition.items.map(item => {
               if (typeof item == 'string') {
                 return item;

From 5979f6eaf15e30efde186632a660e77df5bcf6e0 Mon Sep 17 00:00:00 2001
From: Krishna Mohan <krishnamohan.a.m@gmail.com>
Date: Sat, 1 Dec 2018 01:32:38 +0530
Subject: [PATCH 0473/1703] docs: fix config name in update (#13039)

Fixes #13028
---
 docs/documentation/stories/1.0-update.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/documentation/stories/1.0-update.md b/docs/documentation/stories/1.0-update.md
index a9fc9d8d3f25..d5c065c1a07b 100644
--- a/docs/documentation/stories/1.0-update.md
+++ b/docs/documentation/stories/1.0-update.md
@@ -77,7 +77,7 @@ If the old Angular CLI package _still_ persists, you'll need to research how to
 
 ## .angular-cli.json
 
-`angular-cli.json` is now `.angular-cli.json`, but we still accept the old config file name.
+`angular-cli.json` is now `angular.json`, but we still accept the old config file name.
 
 A few new properties have changed in it:
 

From 81670ae13bb3de030e14e4e67739cc04e463cd85 Mon Sep 17 00:00:00 2001
From: Mathou54 <Mathou54@users.noreply.github.com>
Date: Fri, 30 Nov 2018 21:02:58 +0100
Subject: [PATCH 0474/1703] docs(@angular/cli): change default test watch flag
 (#13051)

---
 packages/angular/cli/lib/config/schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index 99bc50ac4895..4b3fc35c06d2 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -1201,7 +1201,7 @@
             "watch": {
               "type": "boolean",
               "description": "Run build when files change.",
-              "default": false
+              "default": true
             },
             "poll": {
               "type": "number",

From ddbc7f201aa3788210f6779ae53ff75d95041d99 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Fri, 30 Nov 2018 13:05:54 -0800
Subject: [PATCH 0475/1703] ci: packages now can list version numbers too
 (#13057)

Useful for mapping to npm commands like dist-tag.
---
 scripts/packages.ts | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/scripts/packages.ts b/scripts/packages.ts
index e4227afd9aef..bf8044bee9a4 100644
--- a/scripts/packages.ts
+++ b/scripts/packages.ts
@@ -12,10 +12,20 @@ import { logging } from '@angular-devkit/core';
 const { packages } = require('../lib/packages');
 
 
-export default function(args: { json: boolean }, logger: logging.Logger) {
+export default function(args: { json: boolean, version: boolean }, logger: logging.Logger) {
   if (args.json) {
     logger.info(JSON.stringify(packages, null, 2));
   } else {
-    logger.info(Object.keys(packages).filter(name => !packages[name].private).join('\n'));
+    logger.info(
+      Object.keys(packages)
+        .filter(name => !packages[name].private)
+        .map(name => {
+          if (args.version) {
+            return `${name}@${packages[name].version}`;
+          } else {
+            return name;
+          }
+        })
+        .join('\n'));
   }
 }

From 8516d68213f4bafd34b5c68dfde43462173f5603 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 30 Nov 2018 22:11:52 +0100
Subject: [PATCH 0476/1703] feat(@angular-devkit/build-angular): fine grain
 settings for sourceMaps (#13062)

* feat(@angular/cli): update schema to match new `sourceMap`

* feat(@angular-devkit/build-angular): fine grain settings for sourceMaps

This PR add more control over which sourceMaps you want, Now you can enable sourceMaps for scripts only, styles only or both. Also we added another functionality which are hidden sourcemaps. These are normaly used for error reporting tools.

Fixes #7527
---
 packages/angular/cli/lib/config/schema.json   | 127 ++++++++++++-
 .../angular-cli-files/models/build-options.ts |   3 +
 .../models/webpack-configs/browser.ts         |  33 ++--
 .../models/webpack-configs/common.ts          |  10 +-
 .../models/webpack-configs/server.ts          |  18 +-
 .../models/webpack-configs/styles.ts          |  10 +-
 .../models/webpack-configs/test.ts            |  17 +-
 .../models/webpack-configs/typescript.ts      |   4 +-
 .../models/webpack-configs/utils.ts           |  23 +++
 .../build_angular/src/browser/index.ts        |  31 +++-
 .../build_angular/src/browser/schema.d.ts     |  16 +-
 .../build_angular/src/browser/schema.json     |  37 +++-
 .../build_angular/src/dev-server/index.ts     |  41 ++---
 .../build_angular/src/dev-server/schema.json  |  38 +++-
 .../build_angular/src/karma/index.ts          |  20 +-
 .../build_angular/src/karma/schema.d.ts       |  20 +-
 .../build_angular/src/karma/schema.json       |  30 ++-
 .../build_angular/src/server/index.ts         |  19 +-
 .../build_angular/src/server/schema.d.ts      |  11 +-
 .../build_angular/src/server/schema.json      |  36 +++-
 .../build_angular/src/utils/index.ts          |   1 +
 .../src/utils/normalize-source-maps.ts        |  32 ++++
 .../test/browser/source-map_spec_large.ts     | 173 +++++++++++++++++-
 .../browser/vendor-source-map_spec_large.ts   |  17 +-
 .../test/server/base_spec_large.ts            |  53 ++++++
 25 files changed, 731 insertions(+), 89 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/src/utils/normalize-source-maps.ts

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index 4b3fc35c06d2..3fc2e39275bd 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -633,9 +633,39 @@
               "default": false
             },
             "sourceMap": {
-              "type": "boolean",
               "description": "Output sourcemaps.",
-              "default": true
+              "default": true,
+              "oneOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "scripts": {
+                      "type": "boolean",
+                      "description": "Output sourcemaps for all scripts.",
+                      "default": true
+                    },
+                    "styles": {
+                      "type": "boolean",
+                      "description": "Output sourcemaps for all styles.",
+                      "default": true
+                    },
+                    "hidden": {
+                      "type": "boolean",
+                      "description": "Output sourcemaps used for error reporting tools.",
+                      "default": false
+                    },
+                    "vendor": {
+                      "type": "boolean",
+                      "description": "Resolve vendor packages sourcemaps.",
+                      "default": false
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "boolean"
+                }
+              ]
             },
             "vendorSourceMap": {
               "type": "boolean",
@@ -1045,8 +1075,34 @@
               "description": "Build using Ahead of Time compilation."
             },
             "sourceMap": {
-              "type": "boolean",
-              "description": "Output sourcemaps."
+              "description": "Output sourcemaps.",
+              "default": true,
+              "oneOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "scripts": {
+                      "type": "boolean",
+                      "description": "Output sourcemaps for all scripts.",
+                      "default": true
+                    },
+                    "styles": {
+                      "type": "boolean",
+                      "description": "Output sourcemaps for all styles.",
+                      "default": true
+                    },
+                    "vendor": {
+                      "type": "boolean",
+                      "description": "Resolve vendor packages sourcemaps.",
+                      "default": false
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "boolean"
+                }
+              ]
             },
             "vendorSourceMap": {
               "type": "boolean",
@@ -1189,9 +1245,34 @@
               "description": "Defines the build environment."
             },
             "sourceMap": {
-              "type": "boolean",
               "description": "Output sourcemaps.",
-              "default": true
+              "default": true,
+              "oneOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "scripts": {
+                      "type": "boolean",
+                      "description": "Output sourcemaps for all scripts.",
+                      "default": true
+                    },
+                    "styles": {
+                      "type": "boolean",
+                      "description": "Output sourcemaps for all styles.",
+                      "default": true
+                    },
+                    "vendor": {
+                      "type": "boolean",
+                      "description": "Resolve vendor packages sourcemaps.",
+                      "default": false
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "boolean"
+                }
+              ]
             },
             "progress": {
               "type": "boolean",
@@ -1455,9 +1536,39 @@
               "description": "The path where style resources will be placed, relative to outputPath."
             },
             "sourceMap": {
-              "type": "boolean",
               "description": "Output sourcemaps.",
-              "default": true
+              "default": true,
+              "oneOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "scripts": {
+                      "type": "boolean",
+                      "description": "Output sourcemaps for all scripts.",
+                      "default": true
+                    },
+                    "styles": {
+                      "type": "boolean",
+                      "description": "Output sourcemaps for all styles.",
+                      "default": true
+                    },
+                    "hidden": {
+                      "type": "boolean",
+                      "description": "Output sourcemaps used for error reporting tools.",
+                      "default": false
+                    },
+                    "vendor": {
+                      "type": "boolean",
+                      "description": "Resolve vendor packages sourcemaps.",
+                      "default": false
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "boolean"
+                }
+              ]
             },
             "vendorSourceMap": {
               "type": "boolean",
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
index 8e8e6df74dde..649d287ad144 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
@@ -24,6 +24,9 @@ export interface BuildOptions {
   resourcesOutputPath?: string;
   aot?: boolean;
   sourceMap?: boolean;
+  scriptsSourceMap?: boolean;
+  stylesSourceMap?: boolean;
+  hiddenSourceMap?: boolean;
   vendorSourceMap?: boolean;
   evalSourceMap?: boolean;
   vendorChunk?: boolean;
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
index 27c22ce0309b..0fc80f090891 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
@@ -10,7 +10,7 @@ import * as path from 'path';
 import { IndexHtmlWebpackPlugin } from '../../plugins/index-html-webpack-plugin';
 import { generateEntryPoints } from '../../utilities/package-chunk-sort';
 import { WebpackConfigOptions } from '../build-options';
-import { normalizeExtraEntryPoints } from './utils';
+import { getSourceMapDevTool, normalizeExtraEntryPoints } from './utils';
 
 const SubresourceIntegrityPlugin = require('webpack-subresource-integrity');
 
@@ -19,16 +19,11 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
   const { root, buildOptions } = wco;
   const extraPlugins = [];
 
-  let sourcemaps: string | false = false;
-  if (buildOptions.sourceMap) {
-    // See https://webpack.js.org/configuration/devtool/ for sourcemap types.
-    if (buildOptions.evalSourceMap && !buildOptions.optimization) {
-      // Produce eval sourcemaps for development with serve, which are faster.
-      sourcemaps = 'eval';
-    } else {
-      // Produce full separate sourcemaps for production.
-      sourcemaps = 'source-map';
-    }
+  let isEval = false;
+  // See https://webpack.js.org/configuration/devtool/ for sourcemap types.
+  if (buildOptions.sourceMap && buildOptions.evalSourceMap && !buildOptions.optimization) {
+    // Produce eval sourcemaps for development with serve, which are faster.
+    isEval = true;
   }
 
   if (buildOptions.index) {
@@ -59,11 +54,25 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
     }));
   }
 
+  if (!isEval && buildOptions.sourceMap) {
+    const {
+      scriptsSourceMap = false,
+      stylesSourceMap = false,
+      hiddenSourceMap = false,
+    } = buildOptions;
+
+    extraPlugins.push(getSourceMapDevTool(
+      scriptsSourceMap,
+      stylesSourceMap,
+      hiddenSourceMap,
+    ));
+  }
+
   const globalStylesBundleNames = normalizeExtraEntryPoints(buildOptions.styles, 'styles')
     .map(style => style.bundleName);
 
   return {
-    devtool: sourcemaps,
+    devtool: isEval ? 'eval' : false,
     resolve: {
       mainFields: [
         ...(wco.supportES2015 ? ['es2015'] : []),
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 699dafdbf688..147f770912ea 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -15,7 +15,7 @@ import { ScriptsWebpackPlugin } from '../../plugins/scripts-webpack-plugin';
 import { findUp } from '../../utilities/find-up';
 import { isDirectory } from '../../utilities/is-directory';
 import { requireProjectModule } from '../../utilities/require-project-module';
-import { WebpackConfigOptions } from '../build-options';
+import { BuildOptions, WebpackConfigOptions } from '../build-options';
 import { getOutputHashFormat, normalizeExtraEntryPoints } from './utils';
 
 const ProgressPlugin = require('webpack/lib/ProgressPlugin');
@@ -102,7 +102,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
 
       extraPlugins.push(new ScriptsWebpackPlugin({
         name: bundleName,
-        sourceMap: buildOptions.sourceMap,
+        sourceMap: buildOptions.scriptsSourceMap,
         filename: `${path.basename(bundleName)}${hash}.js`,
         scripts: script.paths,
         basePath: projectRoot,
@@ -174,7 +174,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
       use: [
         {
           loader: buildOptimizerLoader,
-          options: { sourceMap: buildOptions.sourceMap },
+          options: { sourceMap: buildOptions.scriptsSourceMap },
         },
       ],
     };
@@ -297,12 +297,12 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
         // TODO: check with Mike what this feature needs.
         new BundleBudgetPlugin({ budgets: buildOptions.budgets }),
         new CleanCssWebpackPlugin({
-          sourceMap: buildOptions.sourceMap,
+          sourceMap: buildOptions.stylesSourceMap,
           // component styles retain their original file name
           test: (file) => /\.(?:css|scss|sass|less|styl)$/.test(file),
         }),
         new TerserPlugin({
-          sourceMap: buildOptions.sourceMap,
+          sourceMap: buildOptions.scriptsSourceMap,
           parallel: true,
           cache: true,
           terserOptions,
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts
index ee12c70ed2b4..df1027e33354 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts
@@ -7,6 +7,7 @@
  */
 import { Configuration } from 'webpack';
 import { WebpackConfigOptions } from '../build-options';
+import { getSourceMapDevTool } from './utils';
 
 
 /**
@@ -15,8 +16,22 @@ import { WebpackConfigOptions } from '../build-options';
  */
 export function getServerConfig(wco: WebpackConfigOptions) {
 
+  const extraPlugins = [];
+  if (wco.buildOptions.sourceMap) {
+    const {
+      scriptsSourceMap = false,
+      stylesSourceMap = false,
+      hiddenSourceMap = false,
+    } = wco.buildOptions;
+
+    extraPlugins.push(getSourceMapDevTool(
+      scriptsSourceMap,
+      stylesSourceMap,
+      hiddenSourceMap,
+    ));
+  }
+
   const config: Configuration = {
-    devtool: wco.buildOptions.sourceMap ? 'source-map' : false,
     resolve: {
       mainFields: [
         ...(wco.supportES2015 ? ['es2015'] : []),
@@ -27,6 +42,7 @@ export function getServerConfig(wco: WebpackConfigOptions) {
     output: {
       libraryTarget: 'commonjs',
     },
+    plugins: extraPlugins,
     node: false,
   };
 
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
index 451febeaca3b..972bda036dc7 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
@@ -40,7 +40,8 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
   const entryPoints: { [key: string]: string[] } = {};
   const globalStylePaths: string[] = [];
   const extraPlugins = [];
-  const cssSourceMap = buildOptions.sourceMap;
+
+  const cssSourceMap = buildOptions.stylesSourceMap;
 
   // Determine hashing format.
   const hashFormat = getOutputHashFormat(buildOptions.outputHashing as string);
@@ -187,7 +188,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
         options: {
           ident: 'embedded',
           plugins: postcssPluginCreator,
-          sourceMap: cssSourceMap ? 'inline' : false,
+          sourceMap: cssSourceMap && !buildOptions.hiddenSourceMap ? 'inline' : false,
         },
       },
       ...(use as webpack.Loader[]),
@@ -208,7 +209,10 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
             options: {
               ident: buildOptions.extractCss ? 'extracted' : 'embedded',
               plugins: postcssPluginCreator,
-              sourceMap: cssSourceMap && !buildOptions.extractCss ? 'inline' : cssSourceMap,
+              sourceMap: cssSourceMap
+                && !buildOptions.extractCss
+                && !buildOptions.hiddenSourceMap
+                ? 'inline' : cssSourceMap,
             },
           },
           ...(use as webpack.Loader[]),
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts
index 4c8b05aa6008..f54aca248c54 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts
@@ -10,6 +10,7 @@ import * as glob from 'glob';
 import * as path from 'path';
 import * as webpack from 'webpack';
 import { WebpackConfigOptions, WebpackTestOptions } from '../build-options';
+import { getSourceMapDevTool } from './utils';
 
 
 /**
@@ -55,6 +56,20 @@ export function getTestConfig(
     });
   }
 
+  if (wco.buildOptions.sourceMap) {
+    const {
+      scriptsSourceMap = false,
+      stylesSourceMap = false,
+    } = wco.buildOptions;
+
+    extraPlugins.push(getSourceMapDevTool(
+      scriptsSourceMap,
+      stylesSourceMap,
+      false,
+      true,
+    ));
+  }
+
   return {
     mode: 'development',
     resolve: {
@@ -63,7 +78,7 @@ export function getTestConfig(
         'browser', 'module', 'main',
       ],
     },
-    devtool: buildOptions.sourceMap ? 'inline-source-map' : 'eval',
+    devtool: buildOptions.sourceMap ? false : 'eval',
     entry: {
       main: path.resolve(root, buildOptions.main),
     },
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
index f03f522f8417..b6303a853e13 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
@@ -75,7 +75,7 @@ function _createAotPlugin(
     locale: buildOptions.i18nLocale,
     platform: buildOptions.platform === 'server' ? PLATFORM.Server : PLATFORM.Browser,
     missingTranslation: buildOptions.i18nMissingTranslation,
-    sourceMap: buildOptions.sourceMap,
+    sourceMap: buildOptions.scriptsSourceMap,
     additionalLazyModules,
     hostReplacementPaths,
     nameLazyFiles: buildOptions.namedChunks,
@@ -108,7 +108,7 @@ export function getAotConfig(
   if (buildOptions.buildOptimizer) {
     loaders.unshift({
       loader: buildOptimizerLoader,
-      options: { sourceMap: buildOptions.sourceMap }
+      options: { sourceMap: buildOptions.scriptsSourceMap }
     });
   }
 
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
index f32f3f8afabb..2fe43e7ea98a 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
@@ -11,6 +11,7 @@
 import * as path from 'path';
 import { basename, normalize } from '@angular-devkit/core';
 import { ExtraEntryPoint, ExtraEntryPointObject } from '../../../browser/schema';
+import { SourceMapDevToolPlugin } from 'webpack';
 
 export const ngAppResolve = (resolvePath: string): string => {
   return path.resolve(process.cwd(), resolvePath);
@@ -66,3 +67,25 @@ export function normalizeExtraEntryPoints(
     return normalizedEntry;
   })
 }
+
+export function getSourceMapDevTool(
+  scriptsSourceMap: boolean,
+  stylesSourceMap: boolean,
+  hiddenSourceMap = false,
+  inlineSourceMap = false,
+): SourceMapDevToolPlugin {
+  const include = [];
+  if (scriptsSourceMap) {
+    include.push(/js$/);
+  }
+
+  if (stylesSourceMap) {
+    include.push(/css$/);
+  }
+
+  return new SourceMapDevToolPlugin({
+    filename: inlineSourceMap ? undefined : '[file].map',
+    include,
+    append: hiddenSourceMap ? false : undefined,
+  });
+}
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index ab49981a9f0c..1f3b3fa468f9 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -34,8 +34,18 @@ import {
   statsToString,
   statsWarningsToString,
 } from '../angular-cli-files/utilities/stats';
-import { defaultProgress, normalizeAssetPatterns, normalizeFileReplacements } from '../utils';
-import { AssetPatternObject, BrowserBuilderSchema, CurrentFileReplacement } from './schema';
+import {
+  NormalizedSourceMaps,
+  defaultProgress,
+  normalizeAssetPatterns,
+  normalizeFileReplacements,
+  normalizeSourceMaps,
+} from '../utils';
+import {
+  AssetPatternObject,
+  BrowserBuilderSchema,
+  CurrentFileReplacement,
+} from './schema';
 const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');
 const webpackMerge = require('webpack-merge');
 
@@ -45,7 +55,9 @@ const webpackMerge = require('webpack-merge');
 // Right now this normalization has to be done in all other builders that make use of the
 // BrowserBuildSchema and BrowserBuilder.buildWebpackConfig.
 // It would really help if it happens during architect.validateBuilderOptions, or similar.
-export interface NormalizedBrowserBuilderSchema extends BrowserBuilderSchema {
+export interface NormalizedBrowserBuilderSchema extends
+  Pick<BrowserBuilderSchema, Exclude<keyof BrowserBuilderSchema, 'sourceMap' | 'vendorSourceMap'>>,
+  NormalizedSourceMaps {
   assets: AssetPatternObject[];
   fileReplacements: CurrentFileReplacement[];
 }
@@ -55,7 +67,7 @@ export class BrowserBuilder implements Builder<BrowserBuilderSchema> {
   constructor(public context: BuilderContext) { }
 
   run(builderConfig: BuilderConfiguration<BrowserBuilderSchema>): Observable<BuildEvent> {
-    const options = builderConfig.options;
+    let options = builderConfig.options;
     const root = this.context.workspace.root;
     const projectRoot = resolve(root, builderConfig.root);
     const host = new virtualFs.AliasHost(this.context.host as virtualFs.Host<fs.Stats>);
@@ -71,6 +83,17 @@ export class BrowserBuilder implements Builder<BrowserBuilderSchema> {
         options.assets, host, root, projectRoot, builderConfig.sourceRoot)),
       // Replace the assets in options with the normalized version.
       tap((assetPatternObjects => options.assets = assetPatternObjects)),
+      tap(() => {
+        const normalizedOptions = normalizeSourceMaps(options.sourceMap);
+        // todo: remove when removing the deprecations
+        normalizedOptions.vendorSourceMap
+          = normalizedOptions.vendorSourceMap || !!options.vendorSourceMap;
+
+        options = {
+          ...options,
+          ...normalizedOptions,
+        };
+      }),
       concatMap(() => {
         let webpackConfig;
         try {
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.d.ts b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
index 33ed974acadd..ba27d8ab0418 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
@@ -69,10 +69,11 @@ export interface BrowserBuilderSchema {
   /**
    * Output sourcemaps.
    */
-  sourceMap: boolean;
+  sourceMap: SourceMapOptions;
 
   /**
    * Resolve vendor packages sourcemaps.
+   * @deprecated - use `sourceMap.vendor` instead
    */
   vendorSourceMap?: boolean;
 
@@ -236,6 +237,19 @@ export interface BrowserBuilderSchema {
   profile: boolean;
 }
 
+export type SourceMapOptions = boolean | SourceMapObject;
+
+export interface SourceMapObject {
+  /** Output sourcemaps used for error reports. */
+  hidden?: boolean;
+  /** Resolve vendor packages sourcemaps */
+  vendor?: boolean;
+  /** Output sourcemaps for all scripts */
+  scripts?: boolean;
+  /** Output sourcemaps for all styles. */
+  styles?: boolean;
+}
+
 export type AssetPattern = string | AssetPatternObject;
 
 export interface AssetPatternObject {
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index 2f0259214116..38c7e541dc43 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -82,13 +82,44 @@
       "default": false
     },
     "sourceMap": {
-      "type": "boolean",
       "description": "Output sourcemaps.",
-      "default": true
+      "default": true,
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
+            "scripts": {
+              "type": "boolean",
+              "description": "Output sourcemaps for all scripts.",
+              "default": true
+            },
+            "styles": {
+              "type": "boolean",
+              "description": "Output sourcemaps for all styles.",
+              "default": true
+            },
+            "hidden": {
+              "type": "boolean",
+              "description": "Output sourcemaps used for error reporting tools.",
+              "default": false
+            },
+            "vendor": {
+              "type": "boolean",
+              "description": "Resolve vendor packages sourcemaps.",
+              "default": false
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "type": "boolean"
+        }
+      ]
     },
     "vendorSourceMap": {
       "type": "boolean",
       "description": "Resolve vendor packages sourcemaps.",
+      "x-deprecated": true,
       "default": false
     },
     "evalSourceMap": {
@@ -415,4 +446,4 @@
       ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index 409115dacb54..f72fe3caa3be 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -24,11 +24,15 @@ import * as WebpackDevServer from 'webpack-dev-server';
 import { checkPort } from '../angular-cli-files/utilities/check-port';
 import { BrowserBuilder, NormalizedBrowserBuilderSchema, getBrowserLoggingCb } from '../browser/';
 import { BrowserBuilderSchema } from '../browser/schema';
-import { normalizeAssetPatterns, normalizeFileReplacements } from '../utils';
+import { normalizeAssetPatterns, normalizeFileReplacements, normalizeSourceMaps } from '../utils';
 const opn = require('opn');
 
 
-export interface DevServerBuilderOptions {
+export interface DevServerBuilderOptions extends Pick<BrowserBuilderSchema,
+  'optimization' | 'aot' | 'sourceMap' | 'vendorSourceMap'
+  | 'evalSourceMap' | 'vendorChunk' | 'commonChunk' | 'poll'
+  | 'baseHref' | 'deployUrl' | 'progress' | 'verbose'
+  > {
   browserTarget: string;
   port: number;
   host: string;
@@ -45,21 +49,6 @@ export interface DevServerBuilderOptions {
   watch: boolean;
   hmrWarning: boolean;
   servePathDefaultWarning: boolean;
-
-  // These options come from the browser builder and are provided here for convenience.
-  optimization?: boolean;
-  aot?: boolean;
-  sourceMap?: boolean;
-  vendorSourceMap?: boolean;
-  /**@deprecated */
-  evalSourceMap?: boolean;
-  vendorChunk?: boolean;
-  commonChunk?: boolean;
-  baseHref?: string;
-  deployUrl?: string;
-  progress?: boolean;
-  poll?: number;
-  verbose?: boolean;
 }
 
 type DevServerBuilderOptionsKeys = Extract<keyof DevServerBuilderOptions, string>;
@@ -88,14 +77,24 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
         browserOptions.assets, host, root, projectRoot, builderConfig.sourceRoot)),
       // Replace the assets in options with the normalized version.
       tap((assetPatternObjects => browserOptions.assets = assetPatternObjects)),
+      tap(() => {
+        const normalizedOptions = normalizeSourceMaps(browserOptions.sourceMap);
+        // todo: remove when removing the deprecations
+        normalizedOptions.vendorSourceMap
+          = normalizedOptions.vendorSourceMap || !!browserOptions.vendorSourceMap;
+
+        browserOptions = {
+          ...browserOptions,
+          ...normalizedOptions,
+        };
+      }),
       concatMap(() => {
         const webpackConfig = this.buildWebpackConfig(
           root, projectRoot, host, browserOptions as NormalizedBrowserBuilderSchema);
 
         let webpackDevServerConfig: WebpackDevServer.Configuration;
         try {
-          webpackDevServerConfig = this._buildServerConfig(
-            root, projectRoot, options, browserOptions);
+          webpackDevServerConfig = this._buildServerConfig(root, options, browserOptions);
         } catch (err) {
           return throwError(err);
         }
@@ -172,7 +171,8 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
 
         return buildEvent;
       }),
-    );
+     // using more than 10 operators will cause rxjs to loose the types
+    ) as Observable<BuildEvent>;
   }
 
   buildWebpackConfig(
@@ -190,7 +190,6 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
 
   private _buildServerConfig(
     root: Path,
-    projectRoot: Path,
     options: DevServerBuilderOptions,
     browserOptions: BrowserBuilderSchema,
   ) {
diff --git a/packages/angular_devkit/build_angular/src/dev-server/schema.json b/packages/angular_devkit/build_angular/src/dev-server/schema.json
index e2f5099fe589..c69da96418a2 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/schema.json
+++ b/packages/angular_devkit/build_angular/src/dev-server/schema.json
@@ -92,12 +92,44 @@
       "description": "Build using Ahead of Time compilation."
     },
     "sourceMap": {
-      "type": "boolean",
-      "description": "Output sourcemaps."
+      "description": "Output sourcemaps.",
+      "default": true,
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
+            "scripts": {
+              "type": "boolean",
+              "description": "Output sourcemaps for all scripts.",
+              "default": true
+            },
+            "styles": {
+              "type": "boolean",
+              "description": "Output sourcemaps for all styles.",
+              "default": true
+            },
+            "hidden": {
+              "type": "boolean",
+              "description": "Output sourcemaps used for error reporting tools.",
+              "default": false
+            },
+            "vendor": {
+              "type": "boolean",
+              "description": "Resolve vendor packages sourcemaps.",
+              "default": false
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "type": "boolean"
+        }
+      ]
     },
     "vendorSourceMap": {
       "type": "boolean",
       "description": "Resolve vendor packages sourcemaps.",
+      "x-deprecated": true,
       "default": false
     },
     "evalSourceMap": {
@@ -134,4 +166,4 @@
   "required": [
     "browserTarget"
   ]
-}
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index 1bd80e91196e..431506ed59ec 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -27,7 +27,12 @@ import {
 import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
 import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
 import { AssetPatternObject, CurrentFileReplacement } from '../browser/schema';
-import { defaultProgress, normalizeAssetPatterns, normalizeFileReplacements } from '../utils';
+import {
+  defaultProgress,
+  normalizeAssetPatterns,
+  normalizeFileReplacements,
+  normalizeSourceMaps,
+} from '../utils';
 import { KarmaBuilderSchema } from './schema';
 const webpackMerge = require('webpack-merge');
 
@@ -41,7 +46,7 @@ export class KarmaBuilder implements Builder<KarmaBuilderSchema> {
   constructor(public context: BuilderContext) { }
 
   run(builderConfig: BuilderConfiguration<KarmaBuilderSchema>): Observable<BuildEvent> {
-    const options = builderConfig.options;
+    let options = builderConfig.options;
     const root = this.context.workspace.root;
     const projectRoot = resolve(root, builderConfig.root);
     const host = new virtualFs.AliasHost(this.context.host as virtualFs.Host<fs.Stats>);
@@ -53,6 +58,17 @@ export class KarmaBuilder implements Builder<KarmaBuilderSchema> {
         options.assets, host, root, projectRoot, builderConfig.sourceRoot)),
       // Replace the assets in options with the normalized version.
       tap((assetPatternObjects => options.assets = assetPatternObjects)),
+      tap(() => {
+        const normalizedOptions = normalizeSourceMaps(options.sourceMap);
+        // todo: remove when removing the deprecations
+        normalizedOptions.vendorSourceMap
+          = normalizedOptions.vendorSourceMap || !!options.vendorSourceMap;
+
+        options = {
+          ...options,
+          ...normalizedOptions,
+        };
+      }),
       concatMap(() => new Observable(obs => {
         const karma = requireProjectModule(getSystemPath(projectRoot), 'karma');
         const karmaConfig = getSystemPath(resolve(root, normalize(options.karmaConfig)));
diff --git a/packages/angular_devkit/build_angular/src/karma/schema.d.ts b/packages/angular_devkit/build_angular/src/karma/schema.d.ts
index 4ea24b6afe19..632e6a55a5c4 100644
--- a/packages/angular_devkit/build_angular/src/karma/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/karma/schema.d.ts
@@ -7,17 +7,20 @@
  */
 import { BrowserBuilderSchema } from '../browser/schema';
 
-
-// TODO: in TS 2.8 use Extract instead of Pick to make a subset of another type.
 export interface KarmaBuilderSchema extends Pick<BrowserBuilderSchema,
   'assets' | 'main' | 'polyfills' | 'tsConfig' | 'scripts' | 'styles' | 'stylePreprocessorOptions'
-  | 'fileReplacements' | 'sourceMap' | 'poll' | 'preserveSymlinks' | 'watch'
+  | 'fileReplacements' | 'poll' | 'preserveSymlinks' | 'watch' | 'vendorSourceMap'
   > {
   /**
    * The name of the Karma configuration file..
    */
   karmaConfig: string;
 
+  /**
+   * Output sourcemaps.
+   */
+  sourceMap: KarmaSourceMapOptions;
+
   /**
    * Override which browsers tests are run against.
    */
@@ -38,3 +41,14 @@ export interface KarmaBuilderSchema extends Pick<BrowserBuilderSchema,
    */
   reporters?: string[];
 }
+
+export type KarmaSourceMapOptions = boolean | KarmaSourceMapObject;
+
+export interface KarmaSourceMapObject {
+  /** Resolve vendor packages sourcemaps */
+  vendor?: boolean;
+  /** Output sourcemaps for all scripts */
+  scripts?: boolean;
+  /** Output sourcemaps for all styles. */
+  styles?: boolean;
+}
diff --git a/packages/angular_devkit/build_angular/src/karma/schema.json b/packages/angular_devkit/build_angular/src/karma/schema.json
index 3eabc45fab53..0da0e45b0ffa 100644
--- a/packages/angular_devkit/build_angular/src/karma/schema.json
+++ b/packages/angular_devkit/build_angular/src/karma/schema.json
@@ -63,13 +63,39 @@
       "description": "Defines the build environment."
     },
     "sourceMap": {
-      "type": "boolean",
       "description": "Output sourcemaps.",
-      "default": true
+      "default": true,
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
+            "scripts": {
+              "type": "boolean",
+              "description": "Output sourcemaps for all scripts.",
+              "default": true
+            },
+            "styles": {
+              "type": "boolean",
+              "description": "Output sourcemaps for all styles.",
+              "default": true
+            },
+            "vendor": {
+              "type": "boolean",
+              "description": "Resolve vendor packages sourcemaps.",
+              "default": false
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "type": "boolean"
+        }
+      ]
     },
     "vendorSourceMap": {
       "type": "boolean",
       "description": "Resolve vendor packages sourcemaps.",
+      "x-deprecated": true,
       "default": false
     },
     "evalSourceMap": {
diff --git a/packages/angular_devkit/build_angular/src/server/index.ts b/packages/angular_devkit/build_angular/src/server/index.ts
index 3874885dc77f..fdd2f7094dd4 100644
--- a/packages/angular_devkit/build_angular/src/server/index.ts
+++ b/packages/angular_devkit/build_angular/src/server/index.ts
@@ -30,7 +30,7 @@ import {
 import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
 import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
 import { getBrowserLoggingCb } from '../browser';
-import { defaultProgress, normalizeFileReplacements } from '../utils';
+import { defaultProgress, normalizeFileReplacements, normalizeSourceMaps } from '../utils';
 import { BuildWebpackServerSchema } from './schema';
 const webpackMerge = require('webpack-merge');
 
@@ -40,7 +40,7 @@ export class ServerBuilder implements Builder<BuildWebpackServerSchema> {
   constructor(public context: BuilderContext) { }
 
   run(builderConfig: BuilderConfiguration<BuildWebpackServerSchema>): Observable<BuildEvent> {
-    const options = builderConfig.options;
+    let options = builderConfig.options;
     const root = this.context.workspace.root;
     const projectRoot = resolve(root, builderConfig.root);
     const host = new virtualFs.AliasHost(this.context.host as virtualFs.Host<Stats>);
@@ -51,8 +51,19 @@ export class ServerBuilder implements Builder<BuildWebpackServerSchema> {
       concatMap(() => options.deleteOutputPath
         ? this._deleteOutputDir(root, normalize(options.outputPath), this.context.host)
         : of(null)),
-        concatMap(() => normalizeFileReplacements(options.fileReplacements, host, root)),
-        tap(fileReplacements => options.fileReplacements = fileReplacements),
+      concatMap(() => normalizeFileReplacements(options.fileReplacements, host, root)),
+      tap(fileReplacements => options.fileReplacements = fileReplacements),
+      tap(() => {
+        const normalizedOptions = normalizeSourceMaps(options.sourceMap);
+        // todo: remove when removing the deprecations
+        normalizedOptions.vendorSourceMap
+          = normalizedOptions.vendorSourceMap || !!options.vendorSourceMap;
+
+        options = {
+          ...options,
+          ...normalizedOptions,
+        };
+      }),
       concatMap(() => {
         const webpackConfig = this.buildWebpackConfig(root, projectRoot, host, options);
 
diff --git a/packages/angular_devkit/build_angular/src/server/schema.d.ts b/packages/angular_devkit/build_angular/src/server/schema.d.ts
index 0addbe5222e0..35acca4b0ae7 100644
--- a/packages/angular_devkit/build_angular/src/server/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/server/schema.d.ts
@@ -6,17 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { FileReplacement } from '../browser/schema';
+import { BrowserBuilderSchema, FileReplacement, SourceMapOptions } from '../browser/schema';
 
 export interface BuildWebpackServerSchema {
   /**
    * The name of the TypeScript configuration file.
    */
   tsConfig: string;
-  /**
-   * Output sourcemaps.
-   */
-  sourceMap?: boolean;
   /**
    * Adds more details to output logging.
    */
@@ -37,8 +33,13 @@ export interface BuildWebpackServerSchema {
    * Use a separate bundle containing only vendor libraries.
    */
   vendorChunk?: boolean;
+  /**
+   * Output sourcemaps.
+   */
+  sourceMap: SourceMapOptions;
   /**
    * Resolve vendor packages sourcemaps.
+   * @deprecated use sourceMap.vendor
    */
   vendorSourceMap?: boolean;
   /**
diff --git a/packages/angular_devkit/build_angular/src/server/schema.json b/packages/angular_devkit/build_angular/src/server/schema.json
index de93450c3297..3cd83727fd61 100644
--- a/packages/angular_devkit/build_angular/src/server/schema.json
+++ b/packages/angular_devkit/build_angular/src/server/schema.json
@@ -50,13 +50,44 @@
       "default": ""
     },
     "sourceMap": {
-      "type": "boolean",
       "description": "Output sourcemaps.",
-      "default": true
+      "default": true,
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
+            "scripts": {
+              "type": "boolean",
+              "description": "Output sourcemaps for all scripts.",
+              "default": true
+            },
+            "styles": {
+              "type": "boolean",
+              "description": "Output sourcemaps for all styles.",
+              "default": true
+            },
+            "hidden": {
+              "type": "boolean",
+              "description": "Output sourcemaps used for error reporting tools.",
+              "default": false
+            },
+            "vendor": {
+              "type": "boolean",
+              "description": "Resolve vendor packages sourcemaps.",
+              "default": false
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "type": "boolean"
+        }
+      ]
     },
     "vendorSourceMap": {
       "type": "boolean",
       "description": "Resolve vendor packages sourcemaps.",
+      "x-deprecated": true,
       "default": false
     },
     "evalSourceMap": {
@@ -220,6 +251,5 @@
         }
       ]
     }
-
   }
 }
\ No newline at end of file
diff --git a/packages/angular_devkit/build_angular/src/utils/index.ts b/packages/angular_devkit/build_angular/src/utils/index.ts
index be8b36d7091a..e4b77f57dcbe 100644
--- a/packages/angular_devkit/build_angular/src/utils/index.ts
+++ b/packages/angular_devkit/build_angular/src/utils/index.ts
@@ -10,3 +10,4 @@ export * from './default-progress';
 export * from './run-module-as-observable-fork';
 export * from './normalize-file-replacements';
 export * from './normalize-asset-patterns';
+export * from './normalize-source-maps';
diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-source-maps.ts b/packages/angular_devkit/build_angular/src/utils/normalize-source-maps.ts
new file mode 100644
index 000000000000..41392886b8b8
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/utils/normalize-source-maps.ts
@@ -0,0 +1,32 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { SourceMapOptions } from '../browser/schema';
+
+export interface NormalizedSourceMaps {
+  sourceMap: boolean;
+  scriptsSourceMap: boolean;
+  stylesSourceMap: boolean;
+  hiddenSourceMap: boolean;
+  vendorSourceMap: boolean;
+}
+
+export function normalizeSourceMaps(sourceMap: SourceMapOptions): NormalizedSourceMaps {
+  const scriptsSourceMap = !!(typeof sourceMap === 'object' ? sourceMap.scripts : sourceMap);
+  const stylesSourceMap = !!(typeof sourceMap === 'object' ? sourceMap.styles : sourceMap);
+  const hiddenSourceMap = typeof sourceMap === 'object' && !!sourceMap.hidden;
+  const vendorSourceMap = typeof sourceMap === 'object' && !!sourceMap.vendor;
+
+  return {
+    sourceMap: stylesSourceMap || scriptsSourceMap,
+    vendorSourceMap,
+    hiddenSourceMap,
+    scriptsSourceMap,
+    stylesSourceMap,
+  };
+}
diff --git a/packages/angular_devkit/build_angular/test/browser/source-map_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/source-map_spec_large.ts
index 4708376f1f7f..64d172c6c921 100644
--- a/packages/angular_devkit/build_angular/test/browser/source-map_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/source-map_spec_large.ts
@@ -9,9 +9,10 @@
 import { runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { tap } from 'rxjs/operators';
+import { BrowserBuilderSchema, OutputHashing } from '../../src';
 import { browserTargetSpec, host } from '../utils';
 
-
+// tslint:disable-next-line:no-big-function
 describe('Browser Builder source map', () => {
   const outputPath = normalize('dist');
 
@@ -19,13 +20,38 @@ describe('Browser Builder source map', () => {
   afterEach(done => host.restore().toPromise().then(done, done.fail));
 
   it('works', (done) => {
-    const overrides = { sourceMap: true };
+    const overrides: Partial<BrowserBuilderSchema> = {
+      sourceMap: true,
+      extractCss: true,
+      styles: ['src/styles.css'],
+    };
+
+    host.writeMultipleFiles({
+      'src/styles.css': `div { flex: 1 }`,
+    });
 
     runTargetSpec(host, browserTargetSpec, overrides).pipe(
       tap((buildEvent) => expect(buildEvent.success).toBe(true)),
       tap(() => {
-        const fileName = join(outputPath, 'main.js.map');
-        expect(host.scopedSync().exists(fileName)).toBe(true);
+        const scriptsFileName = join(outputPath, 'main.js.map');
+        expect(host.scopedSync().exists(scriptsFileName)).toBe(true);
+
+        const stylesFileName = join(outputPath, 'styles.css.map');
+        expect(host.scopedSync().exists(stylesFileName)).toBe(true);
+      }),
+    ).toPromise().then(done, done.fail);
+  });
+
+  it('works with outputHashing', (done) => {
+    const overrides: Partial<BrowserBuilderSchema> = {
+      sourceMap: true,
+      outputHashing: OutputHashing.All,
+    };
+
+    runTargetSpec(host, browserTargetSpec, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => {
+        expect(host.fileMatchExists(outputPath, /main\.[0-9a-f]{20}\.js.map/)).toBeTruthy();
       }),
     ).toPromise().then(done, done.fail);
   });
@@ -55,4 +81,143 @@ describe('Browser Builder source map', () => {
       }),
     ).toPromise().then(done, done.fail);
   });
+
+  it('supports hidden sourcemaps', (done) => {
+    const overrides: Partial<BrowserBuilderSchema> = {
+      sourceMap: {
+        hidden: true,
+        styles: true,
+        scripts: true,
+      },
+      extractCss: true,
+      styles: ['src/styles.scss'],
+    };
+
+    host.writeMultipleFiles({
+      'src/styles.scss': `div { flex: 1 }`,
+    });
+
+
+    runTargetSpec(host, browserTargetSpec, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => {
+        expect(host.scopedSync().exists(join(outputPath, 'main.js.map'))).toBe(true);
+        expect(host.scopedSync().exists(join(outputPath, 'styles.css.map'))).toBe(true);
+
+        const scriptContent = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, 'main.js')),
+        );
+        expect(scriptContent).not.toContain('sourceMappingURL=main.js.map');
+
+        const styleContent = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, 'styles.css')),
+        );
+        expect(styleContent).not.toContain('sourceMappingURL=styles.css.map');
+      }),
+    ).toPromise().then(done, done.fail);
+  });
+
+  it('supports styles only sourcemaps', (done) => {
+    const overrides: Partial<BrowserBuilderSchema> = {
+      sourceMap: {
+        styles: true,
+        scripts: false,
+      },
+      extractCss: true,
+      styles: ['src/styles.scss'],
+    };
+
+    host.writeMultipleFiles({
+      'src/styles.scss': `div { flex: 1 }`,
+    });
+
+    runTargetSpec(host, browserTargetSpec, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => {
+        expect(host.scopedSync().exists(join(outputPath, 'main.js.map'))).toBe(false);
+        expect(host.scopedSync().exists(join(outputPath, 'styles.css.map'))).toBe(true);
+
+        const scriptContent = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, 'main.js')),
+        );
+        expect(scriptContent).not.toContain('sourceMappingURL=main.js.map');
+
+        const styleContent = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, 'styles.css')),
+        );
+
+        expect(styleContent).toContain('sourceMappingURL=styles.css.map');
+      }),
+    ).toPromise().then(done, done.fail);
+  });
+
+  it('supports scripts only sourcemaps', (done) => {
+    const overrides: Partial<BrowserBuilderSchema> = {
+      sourceMap: {
+        styles: false,
+        scripts: true,
+      },
+      extractCss: true,
+      styles: ['src/styles.scss'],
+    };
+
+    host.writeMultipleFiles({
+      'src/styles.scss': `div { flex: 1 }`,
+    });
+
+    runTargetSpec(host, browserTargetSpec, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => {
+        expect(host.scopedSync().exists(join(outputPath, 'main.js.map'))).toBe(true);
+        expect(host.scopedSync().exists(join(outputPath, 'styles.css.map'))).toBe(false);
+
+        const scriptContent = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, 'main.js')),
+        );
+        expect(scriptContent).toContain('sourceMappingURL=main.js.map');
+
+        const styleContent = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, 'styles.css')),
+        );
+        expect(styleContent).not.toContain('sourceMappingURL=styles.css.map');
+      }),
+    ).toPromise().then(done, done.fail);
+  });
+
+  it('should not inline component styles sourcemaps when hidden', (done) => {
+    const overrides: Partial<BrowserBuilderSchema> = {
+      sourceMap: {
+        hidden: true,
+        styles: true,
+        scripts: true,
+      },
+      extractCss: true,
+      styles: ['src/styles.scss'],
+    };
+
+    host.writeMultipleFiles({
+      'src/styles.scss': `div { flex: 1 }`,
+      'src/app/app.component.css': `p { color: red; }`,
+    });
+
+    runTargetSpec(host, browserTargetSpec, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => {
+        expect(host.scopedSync().exists(join(outputPath, 'main.js.map'))).toBe(true);
+        expect(host.scopedSync().exists(join(outputPath, 'styles.css.map'))).toBe(true);
+
+        const scriptContent = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, 'main.js')),
+        );
+
+        expect(scriptContent).not.toContain('sourceMappingURL=main.js.map');
+        expect(scriptContent).not.toContain('sourceMappingURL=data:application/json');
+
+        const styleContent = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, 'styles.css')),
+        );
+        expect(styleContent).not.toContain('sourceMappingURL=styles.css.map');
+      }),
+    ).toPromise().then(done, done.fail);
+  });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts
index 45bc61914039..00f7f52002df 100644
--- a/packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts
@@ -10,6 +10,7 @@ import { runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import * as path from 'path';
 import { tap } from 'rxjs/operators';
+import { BrowserBuilderSchema } from '../../src/browser/schema';
 import { browserTargetSpec, host } from '../utils';
 
 describe('Browser Builder external source map', () => {
@@ -19,7 +20,13 @@ describe('Browser Builder external source map', () => {
   afterEach(done => host.restore().toPromise().then(done, done.fail));
 
   it('works', (done) => {
-    const overrides = { sourceMap: true, vendorSourceMap: true };
+    const overrides: Partial<BrowserBuilderSchema> = {
+      sourceMap: {
+        scripts: true,
+        styles: true,
+        vendor: true,
+      },
+    };
 
     runTargetSpec(host, browserTargetSpec, overrides).pipe(
       tap((buildEvent) => expect(buildEvent.success).toBe(true)),
@@ -35,7 +42,13 @@ describe('Browser Builder external source map', () => {
   });
 
   it('does not map sourcemaps from external library when disabled', (done) => {
-    const overrides = { sourceMap: true, vendorSourceMap: false };
+    const overrides: Partial<BrowserBuilderSchema> = {
+      sourceMap: {
+        scripts: true,
+        styles: true,
+        vendor: false,
+      },
+    };
 
     runTargetSpec(host, browserTargetSpec, overrides).pipe(
       tap((buildEvent) => expect(buildEvent.success).toBe(true)),
diff --git a/packages/angular_devkit/build_angular/test/server/base_spec_large.ts b/packages/angular_devkit/build_angular/test/server/base_spec_large.ts
index 845666bf5e05..67c941150413 100644
--- a/packages/angular_devkit/build_angular/test/server/base_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/server/base_spec_large.ts
@@ -9,6 +9,7 @@
 import { runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { take, tap } from 'rxjs/operators';
+import { BuildWebpackServerSchema } from '../../src/server/schema';
 import { host } from '../utils';
 
 
@@ -47,6 +48,58 @@ describe('Server Builder', () => {
     ).toPromise().then(done, done.fail);
   });
 
+  it('supports scripts only sourcemaps', (done) => {
+    const overrides: Partial<BuildWebpackServerSchema> = {
+      sourceMap: {
+        styles: false,
+        scripts: true,
+      },
+    };
+
+    host.writeMultipleFiles({
+      'src/app/app.component.css': `p { color: red; }`,
+    });
+
+    runTargetSpec(host, { project: 'app', target: 'server' }, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => {
+        expect(host.scopedSync().exists(join(outputPath, 'main.js.map'))).toBe(true);
+
+        const scriptContent = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, 'main.js')),
+        );
+        expect(scriptContent).toContain('sourceMappingURL=main.js.map');
+        expect(scriptContent).not.toContain('sourceMappingURL=data:application/json');
+      }),
+    ).toPromise().then(done, done.fail);
+  });
+
+  it('supports component styles sourcemaps', (done) => {
+    const overrides: Partial<BuildWebpackServerSchema> = {
+      sourceMap: {
+        styles: true,
+        scripts: true,
+      },
+    };
+
+    host.writeMultipleFiles({
+      'src/app/app.component.css': `p { color: red; }`,
+    });
+
+    runTargetSpec(host, { project: 'app', target: 'server' }, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => {
+        expect(host.scopedSync().exists(join(outputPath, 'main.js.map'))).toBe(true);
+
+        const scriptContent = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, 'main.js')),
+        );
+        expect(scriptContent).toContain('sourceMappingURL=main.js.map');
+        expect(scriptContent).toContain('sourceMappingURL=data:application/json');
+      }),
+    ).toPromise().then(done, done.fail);
+  });
+
   it('runs watch mode', (done) => {
     const overrides = { watch: true };
 

From cd66d2717080b1909a5cf954649618efd77162c0 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 30 Nov 2018 23:06:55 +0100
Subject: [PATCH 0477/1703] refactor: deprecate `evalSourceMap` (#13063)

Missed a couple in https://github.com/angular/angular-cli/pull/12966
---
 packages/angular_devkit/build_angular/src/browser/schema.json | 3 ++-
 packages/angular_devkit/build_angular/src/server/schema.d.ts  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index 38c7e541dc43..13c58553d0a4 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -125,7 +125,8 @@
     "evalSourceMap": {
       "type": "boolean",
       "description": "Output in-file eval sourcemaps.",
-      "default": false
+      "default": false,
+      "x-deprecated": true
     },
     "vendorChunk": {
       "type": "boolean",
diff --git a/packages/angular_devkit/build_angular/src/server/schema.d.ts b/packages/angular_devkit/build_angular/src/server/schema.d.ts
index 35acca4b0ae7..bb00e4fd2fea 100644
--- a/packages/angular_devkit/build_angular/src/server/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/server/schema.d.ts
@@ -44,6 +44,7 @@ export interface BuildWebpackServerSchema {
   vendorSourceMap?: boolean;
   /**
    * Output in-file eval sourcemaps.
+   * @deprecated
    */
   evalSourceMap?: boolean;
   /**

From f392f18e428f4fa98af3021eab7864c8a8004552 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 30 Nov 2018 23:07:36 +0100
Subject: [PATCH 0478/1703] docs: add documentation for API guardian (#13065)

---
 CONTRIBUTING.md                    | 36 ++++++++++++++++++++++++++++++
 scripts/templates/contributing.ejs | 36 ++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1018473d1ac6..fb1f9f06606b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,6 +12,7 @@ to follow:
  - [Coding Rules](#rules)
  - [Commit Message Guidelines](#commit)
  - [Signing the CLA](#cla)
+ - [Updating the Public API](#public-api)
 
 ## <a name="coc"></a> Code of Conduct
 Help us keep Angular open and inclusive. Please read and follow our [Code of Conduct][coc].
@@ -274,3 +275,38 @@ changes to be accepted, the CLA must be signed. It's a quick process, we promise
 [individual-cla]: http://code.google.com/legal/individual-cla-v1.0.html
 [js-style-guide]: https://google.github.io/styleguide/jsguide.html
 [stackoverflow]: http://stackoverflow.com/questions/tagged/angular-devkit
+
+## <a name="public-api"></a> Updating the Public API
+Our Public API is protected with TS API Guardian. This is a tool that keeps track of public API surface of our packages.
+
+To test if your change effect the public API you need to run the API guardian on that particular package.
+
+For example in case `@angular-devkit/core` package was modified you need to run:
+
+```bash
+bazel test //etc/api:angular_devkit_core_api
+```
+
+You can also test all packages by running:
+```bash
+bazel test //etc/api ...
+```
+
+If you modified the public API, the test will fail. To update the golden files you need to run:
+
+```bash
+bazel run //etc/api:angular_devkit_core_api.accept
+```
+
+**Note**: In some cases we use aliased symbols to create namespaces.
+
+Example:
+```javascript 
+import * as foo from './foo';
+
+export { foo };
+```
+There are currently not supported by the API guardian. 
+To overcome this limitiation we created `_golden-api.ts` in certain packages.
+
+When adding a new API, it might be the case that you need to add it to `_golden-api.ts`.
diff --git a/scripts/templates/contributing.ejs b/scripts/templates/contributing.ejs
index 2032891f1070..d9c497a0d3b5 100644
--- a/scripts/templates/contributing.ejs
+++ b/scripts/templates/contributing.ejs
@@ -12,6 +12,7 @@ to follow:
  - [Coding Rules](#rules)
  - [Commit Message Guidelines](#commit)
  - [Signing the CLA](#cla)
+ - [Updating the Public API](#public-api)
 
 ## <a name="coc"></a> Code of Conduct
 Help us keep Angular open and inclusive. Please read and follow our [Code of Conduct][coc].
@@ -263,3 +264,38 @@ changes to be accepted, the CLA must be signed. It's a quick process, we promise
 [individual-cla]: http://code.google.com/legal/individual-cla-v1.0.html
 [js-style-guide]: https://google.github.io/styleguide/jsguide.html
 [stackoverflow]: http://stackoverflow.com/questions/tagged/angular-devkit
+
+## <a name="public-api"></a> Updating the Public API
+Our Public API is protected with TS API Guardian. This is a tool that keeps track of public API surface of our packages.
+
+To test if your change effect the public API you need to run the API guardian on that particular package.
+
+For example in case `@angular-devkit/core` package was modified you need to run:
+
+```bash
+bazel test //etc/api:angular_devkit_core_api
+```
+
+You can also test all packages by running:
+```bash
+bazel test //etc/api ...
+```
+
+If you modified the public API, the test will fail. To update the golden files you need to run:
+
+```bash
+bazel run //etc/api:angular_devkit_core_api.accept
+```
+
+**Note**: In some cases we use aliased symbols to create namespaces.
+
+Example:
+```javascript 
+import * as foo from './foo';
+
+export { foo };
+```
+There are currently not supported by the API guardian. 
+To overcome this limitiation we created `_golden-api.ts` in certain packages.
+
+When adding a new API, it might be the case that you need to add it to `_golden-api.ts`.

From 0692cacd063949df299336db576e5f07d5b3e4de Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 30 Nov 2018 23:08:03 +0100
Subject: [PATCH 0479/1703]  feat(@schematics/angular): account for root level
 assets and `resourcesOutputPath` (#13074)

* feat(@schematics/angular): account for root level assets and `resourcesOutputPath`

By default we are only account for assets inside the assets folder. Which breaks the offline experience.

Fixes #13067

* test: add test to verify root level assets in service workers
---
 .../test/browser/service-worker_spec_large.ts | 13 +++--
 .../service-worker/files/ngsw-config.json     |  3 +-
 .../angular/service-worker/index.ts           | 52 ++++++++++++-------
 .../angular/service-worker/index_spec.ts      | 22 +++++++-
 .../angular/utility/workspace-models.ts       |  1 +
 5 files changed, 68 insertions(+), 23 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts
index c84150f23cfb..a9d4a4e808fb 100644
--- a/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts
@@ -20,8 +20,9 @@ describe('Browser Builder service worker', () => {
         name: 'app',
         installMode: 'prefetch',
         resources: {
-          files: ['/favicon.ico', '/index.html'],
-          versionedFiles: [
+          files: [
+            '/favicon.ico',
+            '/index.html',
             '/*.bundle.css',
             '/*.bundle.js',
             '/*.chunk.js',
@@ -33,7 +34,10 @@ describe('Browser Builder service worker', () => {
         installMode: 'lazy',
         updateMode: 'prefetch',
         resources: {
-          files: ['/assets/**'],
+          files: [
+            '/assets/**',
+            '/*.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)',
+          ],
         },
       },
     ],
@@ -55,6 +59,7 @@ describe('Browser Builder service worker', () => {
     host.writeMultipleFiles({
       'src/ngsw-config.json': JSON.stringify(manifest),
       'src/assets/folder-asset.txt': 'folder-asset.txt',
+      'src/styles.css': `body { background: url(./spectrum.png); }`,
     });
 
     const overrides = { serviceWorker: true };
@@ -91,6 +96,7 @@ describe('Browser Builder service worker', () => {
               updateMode: 'prefetch',
               urls: [
                 '/assets/folder-asset.txt',
+                '/spectrum.png',
               ],
               patterns: [],
             },
@@ -100,6 +106,7 @@ describe('Browser Builder service worker', () => {
             '/favicon.ico': '84161b857f5c547e3699ddfbffc6d8d737542e01',
             '/assets/folder-asset.txt': '617f202968a6a81050aa617c2e28e1dca11ce8d4',
             '/index.html': '843c96f0aeadc8f093b1b2203c08891ecd8f7425',
+            '/spectrum.png': '8d048ece46c0f3af4b598a95fd8e4709b631c3c0',
           },
         });
       }),
diff --git a/packages/schematics/angular/service-worker/files/ngsw-config.json b/packages/schematics/angular/service-worker/files/ngsw-config.json
index fa9410f347f6..ca5274b03cae 100644
--- a/packages/schematics/angular/service-worker/files/ngsw-config.json
+++ b/packages/schematics/angular/service-worker/files/ngsw-config.json
@@ -18,7 +18,8 @@
       "updateMode": "prefetch",
       "resources": {
         "files": [
-          "/assets/**"
+          "/assets/**",
+          "<%= resourcesOutputPath %>/*.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)"
         ]
       }
     }
diff --git a/packages/schematics/angular/service-worker/index.ts b/packages/schematics/angular/service-worker/index.ts
index b7c3ccf75a3a..c0437bad5774 100644
--- a/packages/schematics/angular/service-worker/index.ts
+++ b/packages/schematics/angular/service-worker/index.ts
@@ -26,30 +26,41 @@ import { getWorkspace, updateWorkspace } from '../utility/config';
 import { addPackageJsonDependency, getPackageJsonDependency } from '../utility/dependencies';
 import { getAppModulePath } from '../utility/ng-ast-utils';
 import { getProjectTargets, targetBuildNotFoundError } from '../utility/project-targets';
-import { BrowserBuilderOptions, BrowserBuilderTarget } from '../utility/workspace-models';
+import {
+  BrowserBuilderOptions,
+  BrowserBuilderTarget,
+  WorkspaceSchema,
+} from '../utility/workspace-models';
 import { Schema as ServiceWorkerOptions } from './schema';
 
-function updateConfigFile(options: ServiceWorkerOptions): Rule {
-  return (host: Tree, context: SchematicContext) => {
-    context.logger.debug('updating config file.');
-    const workspace = getWorkspace(host);
+function getProjectConfiguration(
+  workspace: WorkspaceSchema,
+  options: ServiceWorkerOptions,
+): BrowserBuilderOptions {
+  const projectTargets = getProjectTargets(workspace, options.project);
+  if (!projectTargets[options.target]) {
+    throw new Error(`Target is not defined for this project.`);
+  }
 
-    const projectTargets = getProjectTargets(workspace, options.project);
+  const target = projectTargets[options.target] as BrowserBuilderTarget;
+  let applyTo = target.options;
 
-    if (!projectTargets[options.target]) {
-      throw new Error(`Target is not defined for this project.`);
-    }
+  if (options.configuration &&
+    target.configurations &&
+    target.configurations[options.configuration]) {
+    applyTo = target.configurations[options.configuration] as BrowserBuilderOptions;
+  }
 
-    const target = projectTargets[options.target] as BrowserBuilderTarget;
-    let applyTo = target.options;
+  return applyTo;
+}
 
-    if (options.configuration &&
-      target.configurations &&
-      target.configurations[options.configuration]) {
-      applyTo = target.configurations[options.configuration] as BrowserBuilderOptions;
-    }
+function updateConfigFile(options: ServiceWorkerOptions): Rule {
+  return (host: Tree, context: SchematicContext) => {
+    context.logger.debug('updating config file.');
+    const workspace = getWorkspace(host);
 
-    applyTo.serviceWorker = true;
+    const config = getProjectConfiguration(workspace, options);
+    config.serviceWorker = true;
 
     return updateWorkspace(workspace);
   };
@@ -160,8 +171,13 @@ export default function (options: ServiceWorkerOptions): Rule {
       throw new SchematicsException(`Service worker requires a project type of "application".`);
     }
 
+    let { resourcesOutputPath = '' } = getProjectConfiguration(workspace, options);
+    if (resourcesOutputPath) {
+      resourcesOutputPath = '/' + resourcesOutputPath.split('/').filter(x => !!x).join('/');
+    }
+
     const templateSource = apply(url('./files'), [
-      template({...options}),
+      template({ ...options, resourcesOutputPath }),
       move(project.root),
     ]);
 
diff --git a/packages/schematics/angular/service-worker/index_spec.ts b/packages/schematics/angular/service-worker/index_spec.ts
index 47c36824a45d..24718e9fe576 100644
--- a/packages/schematics/angular/service-worker/index_spec.ts
+++ b/packages/schematics/angular/service-worker/index_spec.ts
@@ -55,7 +55,7 @@ describe('Service Worker Schematic', () => {
   });
 
   it('should update the target options if no configuration is set', () => {
-    const options = {...defaultOptions, configuration: ''};
+    const options = { ...defaultOptions, configuration: '' };
     const tree = schematicRunner.runSchematic('service-worker', options, appTree);
     const configText = tree.readContent('/angular.json');
     const config = JSON.parse(configText);
@@ -97,4 +97,24 @@ describe('Service Worker Schematic', () => {
     const path = '/projects/bar/ngsw-config.json';
     expect(tree.exists(path)).toEqual(true);
   });
+
+  it('should add root assets RegExp', () => {
+    const tree = schematicRunner.runSchematic('service-worker', defaultOptions, appTree);
+    const pkgText = tree.readContent('/projects/bar/ngsw-config.json');
+    const config = JSON.parse(pkgText);
+    expect(config.assetGroups[1].resources.files)
+      .toContain('/*.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)');
+  });
+
+  it('should add resourcesOutputPath to root assets when specified', () => {
+    const config = JSON.parse(appTree.readContent('/angular.json'));
+    config.projects.bar.architect.build.configurations.production.resourcesOutputPath = 'outDir';
+    appTree.overwrite('/angular.json', JSON.stringify(config));
+    const tree = schematicRunner.runSchematic('service-worker', defaultOptions, appTree);
+    const pkgText = tree.readContent('/projects/bar/ngsw-config.json');
+    const ngswConfig = JSON.parse(pkgText);
+    expect(ngswConfig.assetGroups[1].resources.files)
+      .toContain('/outDir/*.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)');
+  });
+
 });
diff --git a/packages/schematics/angular/utility/workspace-models.ts b/packages/schematics/angular/utility/workspace-models.ts
index 75554c88b162..4cb08b3b5d7d 100644
--- a/packages/schematics/angular/utility/workspace-models.ts
+++ b/packages/schematics/angular/utility/workspace-models.ts
@@ -47,6 +47,7 @@ export interface BrowserBuilderOptions extends BrowserBuilderBaseOptions {
     serviceWorker?: boolean;
     optimization?: boolean;
     outputHashing?: 'all';
+    resourcesOutputPath?: string;
     extractCss?: boolean;
     namedChunks?: boolean;
     aot?: boolean;

From 822d6a0b9b8f0b6b6def8a34f0aba3ff841171bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E9=98=B3?= <bsdfzzzy@gmail.com>
Date: Sat, 1 Dec 2018 06:08:49 +0800
Subject: [PATCH 0480/1703] fix(@schematics/angular): add providers into
 providers metadata but not inner Object with ut. (#13081)

---
 .../schematics/angular/utility/ast-utils.ts   |  8 +++---
 .../angular/utility/ast-utils_spec.ts         | 26 +++++++++++++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/packages/schematics/angular/utility/ast-utils.ts b/packages/schematics/angular/utility/ast-utils.ts
index e81f85919149..46ea7c441110 100644
--- a/packages/schematics/angular/utility/ast-utils.ts
+++ b/packages/schematics/angular/utility/ast-utils.ts
@@ -449,16 +449,14 @@ export function addSymbolToNgModuleMetadata(
     const expr = node as ts.ObjectLiteralExpression;
     if (expr.properties.length == 0) {
       position = expr.getEnd() - 1;
-      toInsert = `  ${metadataField}: [${symbolName}]\n`;
+      toInsert = `  ${symbolName}\n`;
     } else {
-      node = expr.properties[expr.properties.length - 1];
-      position = node.getEnd();
       // Get the indentation of the last element, if any.
       const text = node.getFullText(source);
       if (text.match(/^\r?\r?\n/)) {
-        toInsert = `,${text.match(/^\r?\n\s*/)[0]}${metadataField}: [${symbolName}]`;
+        toInsert = `,${text.match(/^\r?\n\s*/)[0]}${symbolName}`;
       } else {
-        toInsert = `, ${metadataField}: [${symbolName}]`;
+        toInsert = `, ${symbolName}`;
       }
     }
   } else if (node.kind == ts.SyntaxKind.ArrayLiteralExpression) {
diff --git a/packages/schematics/angular/utility/ast-utils_spec.ts b/packages/schematics/angular/utility/ast-utils_spec.ts
index 21bd96d6e764..2aee6a258d7e 100644
--- a/packages/schematics/angular/utility/ast-utils_spec.ts
+++ b/packages/schematics/angular/utility/ast-utils_spec.ts
@@ -14,6 +14,7 @@ import { getFileContent } from '../utility/test';
 import {
   addDeclarationToModule,
   addExportToModule,
+  addProviderToModule,
   addSymbolToNgModuleMetadata,
 } from './ast-utils';
 
@@ -179,4 +180,29 @@ describe('ast utils', () => {
     expect(output).toMatch(/import { FooComponent } from '.\/foo.component';/);
     expect(output).toMatch(/exports: \[FooComponent\]/);
   });
+
+  it('should add into providers metadata in new line ', () => {
+    const moduleContent = `
+      import { BrowserModule } from '@angular/platform-browser';
+      import { NgModule } from '@angular/core';
+
+      @NgModule({
+        imports: [BrowserModule],
+        declarations: [],
+        providers: [
+          {
+            provide: HTTP_INTERCEPTORS,
+            useClass: AuthInterceptor,
+            multi: true
+          }
+        ]
+      })
+      export class AppModule { }
+    `;
+    const source = getTsSource(modulePath, moduleContent);
+    const changes = addProviderToModule(source, modulePath, 'LogService', './log.service');
+    const output = applyChanges(modulePath, moduleContent, changes);
+    expect(output).toMatch(/import { LogService } from '.\/log.service';/);
+    expect(output).toMatch(/\},\r?\n\s*LogService\r?\n\s*\]/);
+  });
 });

From f8bafc22d0b5b04bbdce7fd33474168092fde8d9 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 30 Nov 2018 23:09:35 +0100
Subject: [PATCH 0481/1703] style: add .gitattributes file (#13086)

On windows unless otherwise specified when cloning the repo the line ending will be CRLF which will cause some tests large specs to fail
---
 .gitattributes | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000000..de32b85d6693
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,12 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# JS and TS files must always use LF for tools to work
+*.js eol=lf
+*.ts eol=lf
+*.json eol=lf
+*.css eol=lf
+*.scss eol=lf
+*.less eol=lf
+*.html eol=lf
+*.svg eol=lf

From 8bc6e79d896661a52ce3c77dce3d562b0ff2719d Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 30 Nov 2018 23:10:18 +0100
Subject: [PATCH 0482/1703] fix(@ngtools/webpack): files are not being updated
 when using `allowJs` or `resolveJsonModule` (#13089)

* fix(@ngtools/webpack): files are not being updated when using `allowJs` or `resolveJsonModule`

Fixes #13076 and Fixes #12964

* test: add tests for allowJs and resolveJsonModule in watch mode

* test: improve tests for `allowJs`

When not using `allowJs` js files are not processed by the tsc compiler, but still processed by webpack.

So a correct test should be to check that the JS is transpiled down to ES5 syntax.
---
 .../test/browser/allow-js_spec_large.ts       | 74 ++++++++++++++++++-
 .../browser/resolve-json-module_spec_large.ts | 60 +++++++++++++++
 .../webpack/src/angular_compiler_plugin.ts    |  4 +-
 packages/ngtools/webpack/src/compiler_host.ts |  9 +++
 4 files changed, 141 insertions(+), 6 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts

diff --git a/packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts
index 6f2abef28616..3e05a104e115 100644
--- a/packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts
@@ -7,8 +7,9 @@
  */
 
 import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { join, virtualFs } from '@angular-devkit/core';
+import { debounceTime, take, tap } from 'rxjs/operators';
+import { browserTargetSpec, host, outputPath } from '../utils';
 
 
 describe('Browser Builder allow js', () => {
@@ -21,11 +22,21 @@ describe('Browser Builder allow js', () => {
       'src/main.ts': `import { a } from './my-js-file'; console.log(a);`,
     });
 
-    // TODO: this test originally edited tsconfig to have `"allowJs": true` but works without it.
-    // Investigate.
+    host.replaceInFile(
+      'tsconfig.json',
+      '"target": "es5"',
+      '"target": "es5", "allowJs": true',
+    );
 
     runTargetSpec(host, browserTargetSpec).pipe(
       tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => {
+        const content = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, 'main.js')),
+        );
+
+        expect(content).toContain('var a = 2');
+      }),
     ).toPromise().then(done, done.fail);
   });
 
@@ -35,10 +46,65 @@ describe('Browser Builder allow js', () => {
       'src/main.ts': `import { a } from './my-js-file'; console.log(a);`,
     });
 
+    host.replaceInFile(
+      'tsconfig.json',
+      '"target": "es5"',
+      '"target": "es5", "allowJs": true',
+    );
+
     const overrides = { aot: true };
 
     runTargetSpec(host, browserTargetSpec, overrides).pipe(
       tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => {
+        const content = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, 'main.js')),
+        );
+
+        expect(content).toContain('var a = 2');
+      }),
+    ).toPromise().then(done, done.fail);
+  });
+
+  it('works with watch', (done) => {
+    host.writeMultipleFiles({
+      'src/my-js-file.js': `console.log(1); export const a = 2;`,
+      'src/main.ts': `import { a } from './my-js-file'; console.log(a);`,
+    });
+
+    host.replaceInFile(
+      'tsconfig.json',
+      '"target": "es5"',
+      '"target": "es5", "allowJs": true',
+    );
+
+    const overrides = { watch: true };
+
+    let buildCount = 1;
+    runTargetSpec(host, browserTargetSpec, overrides).pipe(
+      debounceTime(1000),
+      tap(() => {
+        const content = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, 'main.js')),
+        );
+
+        switch (buildCount) {
+          case 1:
+            expect(content).toContain('var a = 2');
+            host.writeMultipleFiles({
+              'src/my-js-file.js': `console.log(1); export const a = 1;`,
+            });
+            break;
+          case 2:
+            expect(content).toContain('var a = 1');
+            break;
+        }
+
+        buildCount++;
+      }),
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      take(2),
     ).toPromise().then(done, done.fail);
   });
+
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts
new file mode 100644
index 000000000000..7e81cfed7116
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts
@@ -0,0 +1,60 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { runTargetSpec } from '@angular-devkit/architect/testing';
+import { join, virtualFs } from '@angular-devkit/core';
+import { debounceTime, take, tap } from 'rxjs/operators';
+import { browserTargetSpec, host, outputPath } from '../utils';
+
+
+describe('Browser Builder resolve json module', () => {
+  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
+  afterEach(done => host.restore().toPromise().then(done, done.fail));
+
+  it('works with watch', (done) => {
+    host.writeMultipleFiles({
+      'src/my-json-file.json': `{"foo": "1"}`,
+      'src/main.ts': `import * as a from './my-json-file.json'; console.log(a);`,
+    });
+
+    host.replaceInFile(
+      'tsconfig.json',
+      '"target": "es5"',
+      '"target": "es5", "resolveJsonModule": true',
+    );
+
+    const overrides = { watch: true };
+
+    let buildCount = 1;
+    runTargetSpec(host, browserTargetSpec, overrides).pipe(
+      debounceTime(1000),
+      tap(() => {
+        const content = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, 'main.js')),
+        );
+
+        switch (buildCount) {
+          case 1:
+            expect(content).toContain('foo":"1"');
+            host.writeMultipleFiles({
+              'src/my-json-file.json': `{"foo": "2"}`,
+            });
+            break;
+          case 2:
+            expect(content).toContain('foo":"2"');
+            break;
+        }
+
+        buildCount++;
+      }),
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      take(2),
+    ).toPromise().then(done, done.fail);
+  });
+
+});
diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index ef9ad5c1ed0f..08a4a046e17f 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -146,7 +146,7 @@ export class AngularCompilerPlugin {
   private _platform: PLATFORM;
   private _JitMode = false;
   private _emitSkipped = true;
-  private _changedFileExtensions = new Set(['ts', 'tsx', 'html', 'css']);
+  private _changedFileExtensions = new Set(['ts', 'tsx', 'html', 'css', 'js', 'json']);
 
   // Webpack plugin.
   private _firstRun = true;
@@ -1062,7 +1062,7 @@ export class AngularCompilerPlugin {
           // generate a list of changed files for emit
           // not needed on first run since a full program emit is required
           for (const changedFile of this._compilerHost.getChangedFilePaths()) {
-            if (!changedFile.endsWith('.ts') && !changedFile.endsWith('.tsx')) {
+            if (!/.(tsx|ts|json|js)$/.test(changedFile)) {
               continue;
             }
             // existing type definitions are not emitted
diff --git a/packages/ngtools/webpack/src/compiler_host.ts b/packages/ngtools/webpack/src/compiler_host.ts
index 34da158b56d6..873d2fb93e4a 100644
--- a/packages/ngtools/webpack/src/compiler_host.ts
+++ b/packages/ngtools/webpack/src/compiler_host.ts
@@ -110,6 +110,15 @@ export class WebpackCompilerHost implements ts.CompilerHost {
         }
       });
     }
+
+    // In case resolveJsonModule and allowJs we also need to remove virtual emitted files
+    // both if they exists or not.
+    if ((fullPath.endsWith('.js') || fullPath.endsWith('.json'))
+      && !/(\.(ngfactory|ngstyle)\.js|ngsummary\.json)$/.test(fullPath)) {
+      if (this._memoryHost.exists(fullPath)) {
+        this._memoryHost.delete(fullPath);
+      }
+    }
   }
 
   fileExists(fileName: string, delegate = true): boolean {

From 7b3dd8f5102078aee5018cd12624683d9baa4d0f Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 30 Nov 2018 23:10:53 +0100
Subject: [PATCH 0483/1703] fix(@schematics/angular): let tslint resolve
 codelyzer (#13101)

Tslint will try to resolve modules using node module resolution.
https://palantir.github.io//tslint/usage/configuration/

Fixes #13100
---
 packages/schematics/angular/workspace/files/tslint.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/workspace/files/tslint.json b/packages/schematics/angular/workspace/files/tslint.json
index 6ddb6b293151..c740a7b2a595 100644
--- a/packages/schematics/angular/workspace/files/tslint.json
+++ b/packages/schematics/angular/workspace/files/tslint.json
@@ -1,6 +1,6 @@
 {
   "rulesDirectory": [
-    "node_modules/codelyzer"
+    "codelyzer"
   ],
   "rules": {
     "arrow-return-shorthand": true,

From 53f15715bb70707d086f588d79718523f4dbfefe Mon Sep 17 00:00:00 2001
From: clydin <19598772+clydin@users.noreply.github.com>
Date: Fri, 30 Nov 2018 19:07:27 -0500
Subject: [PATCH 0484/1703] test: update golden api for devkit core (#13105)

---
 etc/api/angular_devkit/core/src/_golden-api.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etc/api/angular_devkit/core/src/_golden-api.d.ts b/etc/api/angular_devkit/core/src/_golden-api.d.ts
index aa1dfa19aabe..5075c710d4df 100644
--- a/etc/api/angular_devkit/core/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/core/src/_golden-api.d.ts
@@ -615,13 +615,14 @@ export declare class ProjectToolNotFoundException extends BaseException {
 }
 
 export interface PromptDefinition {
-    default?: string | number | boolean | null;
+    default?: string | string[] | number | boolean | null;
     id: string;
     items?: Array<string | {
         value: JsonValue;
         label: string;
     }>;
     message: string;
+    multiselect?: boolean;
     priority: number;
     raw?: string | JsonObject;
     type: string;

From f7f693cc6faa80cddf27f3de11f6cf52ac269c36 Mon Sep 17 00:00:00 2001
From: Vikram Subramanian <viks@google.com>
Date: Mon, 3 Dec 2018 10:17:23 -0800
Subject: [PATCH 0485/1703] release: v7.2.0-beta.0

---
 .monorepo.json | 76 +++++++++++++++++++++++++-------------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index 0fb1c2a091b2..4120c48a3a8f 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,16 +42,16 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.11.0",
-      "hash": "5225044ecf49d630564a68b710f6b82f"
+      "version": "0.12.0-beta.0",
+      "hash": "f828d4a3fa042a7feac4a48c86893375"
     },
     "@_/builders": {
-      "version": "0.11.0",
-      "hash": "f34470f978203f13c312094472b0a343"
+      "version": "0.12.0-beta.0",
+      "hash": "6983d21ece5e42aa536b50adfdceb56c"
     },
     "devkit": {
-      "version": "0.11.0",
-      "hash": "3d8279285237adcda7885a24f0242ff1"
+      "version": "0.12.0-beta.0",
+      "hash": "63b06136e183b221639ecd3c4bb81180"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -62,15 +62,15 @@
           "url": "/packages/angular/cli/README.md"
         }
       ],
-      "version": "7.1.0",
+      "version": "7.2.0-beta.0",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "e12ea0ff25b467c59f41bb7f09978b77"
+      "hash": "20db216251930978e3c08e7eafa9251d"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.11.0",
-      "hash": "c116af8724067c8d65d6b9e5cff0db6e",
+      "version": "0.12.0-beta.0",
+      "hash": "a4b90e0a270fa3e483eecd08375836e2",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -81,21 +81,21 @@
           "url": "/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.11.0",
-      "hash": "a35fc327f511397304b54abce6e51f13",
+      "version": "0.12.0-beta.0",
+      "hash": "2c79c75124816a59009232a8da5ea8ae",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.11.0",
-      "hash": "f8b9ed887e104ea4a8d23732ebacb4d0",
+      "version": "0.12.0-beta.0",
+      "hash": "e00c8c0c49f69e70e7ae1e60f2ca3241",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
       "name": "Benchmark",
       "section": "Tooling",
-      "version": "1.0.0",
-      "hash": "2a821f7757c6722e57873437e91712cf"
+      "version": "1.1.0-beta.0",
+      "hash": "0b7f44ee7d7f759f6e52224594f38bcd"
     },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
@@ -105,8 +105,8 @@
           "url": "/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.11.0",
-      "hash": "15bcfd189158d6f2540a6d318753a847",
+      "version": "0.12.0-beta.0",
+      "hash": "b8747c7c031783bbf838b0c5a2d0f1dd",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -117,8 +117,8 @@
           "url": "/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.11.0",
-      "hash": "5567a181dea53e9b59965c701591c791",
+      "version": "0.12.0-beta.0",
+      "hash": "02be0dc89a257002de22e35b6f3b118d",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -129,8 +129,8 @@
           "url": "/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.11.0",
-      "hash": "97495f7e53ae9d8d3e6e84737734289f",
+      "version": "0.12.0-beta.0",
+      "hash": "bd9b03939d8d1e60783654d552154969",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -141,9 +141,9 @@
           "url": "/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.11.0",
+      "version": "0.12.0-beta.0",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "c82f5f66b7cba16409fb450423ef584b"
+      "hash": "c5eba8f9dedcc77e10a79fd3121081ae"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -153,8 +153,8 @@
           "url": "/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "7.1.0",
-      "hash": "edb4cd588e93738ddc701eba0a18838d",
+      "version": "7.2.0-beta.0",
+      "hash": "b4a5f918eec70cc3b64869906d9a7ebb",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -165,43 +165,43 @@
           "url": "/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "7.1.0",
-      "hash": "14adbc24f34c6bf530c595c8f81a1dac",
+      "version": "7.2.0-beta.0",
+      "hash": "92c6d749dbd2675232b3719e8b0b1827",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.11.0",
-      "hash": "a3932c5c4bee509cf99f968764a33bc6",
+      "version": "0.12.0-beta.0",
+      "hash": "d1fc4faf9dd840276b46c65b220018ab",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "7.1.0",
+      "version": "7.2.0-beta.0",
       "section": "Misc",
-      "hash": "688d8625df02a29bb4b35c7ace1c6306",
+      "hash": "acff86ebc3745cfc19daea5447e7a762",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "7.1.0",
-      "hash": "415e700a4b37e4c7bbc39215ccada542",
+      "version": "7.2.0-beta.0",
+      "hash": "adc8e6c45dd508c87b8d73742fb09413",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.11.0",
+      "version": "0.12.0-beta.0",
       "section": "Schematics",
-      "hash": "5ac1b2d99b258044b32d1a2428f5423a",
+      "hash": "8dcdeb231b23be595038d48c0c6bb00c",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.11.0",
+      "version": "0.12.0-beta.0",
       "section": "Schematics",
-      "hash": "f19a525d59e859922020dc75ec22ec0f",
+      "hash": "2952b55cd99f9e7362f928d1314f8b57",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }

From 7d88182935fc7baa2fc483324ba5fd139010692f Mon Sep 17 00:00:00 2001
From: Michael Nahkies <michael@nahkies.co.nz>
Date: Sun, 21 Oct 2018 10:49:19 +0100
Subject: [PATCH 0486/1703] fix(@angular/cli): pass arguments to all targets

When running a command with args against multiple targets, all targets
should be given the args. As parseArguments was mutating the passed args
array this wasn't the case. Fix by not mutating the array.

This was especially noticeable when using the `ng lint --fix` command
on a newly generated project, as files in the app target would be fixed,
but e2e target would be only be linted (with no fix)

Possibly closes #10657, #10656, #11005
---
 packages/angular/cli/models/parser.ts      | 34 ++++++++++++++--------
 packages/angular/cli/models/parser_spec.ts |  6 +++-
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/packages/angular/cli/models/parser.ts b/packages/angular/cli/models/parser.ts
index 757f0f8c9863..8a9a3c3b8bea 100644
--- a/packages/angular/cli/models/parser.ts
+++ b/packages/angular/cli/models/parser.ts
@@ -122,7 +122,7 @@ function _removeLeadingDashes(key: string): string {
 
 function _assignOption(
   arg: string,
-  args: string[],
+  nextArg: string | undefined,
   { options, parsedOptions, leftovers, ignored, errors, warnings }: {
     options: Option[],
     parsedOptions: Arguments,
@@ -134,9 +134,10 @@ function _assignOption(
   },
 ) {
   const from = arg.startsWith('--') ? 2 : 1;
+  let consumedNextArg = false;
   let key = arg.substr(from);
   let option: Option | null = null;
-  let value = '';
+  let value: string | undefined = '';
   const i = arg.indexOf('=');
 
   // If flag is --no-abc AND there's no equal sign.
@@ -155,7 +156,7 @@ function _assignOption(
       // Set it to true if it's a boolean and the next argument doesn't match true/false.
       const maybeOption = _getOptionFromName(key, options);
       if (maybeOption) {
-        value = args[0];
+        value = nextArg;
         let shouldShift = true;
 
         if (value && value.startsWith('-')) {
@@ -167,7 +168,7 @@ function _assignOption(
 
         // Only absorb it if it leads to a better value.
         if (shouldShift && _coerce(value, maybeOption) !== undefined) {
-          args.shift();
+          consumedNextArg = true;
         } else {
           value = '';
         }
@@ -183,9 +184,9 @@ function _assignOption(
   }
 
   if (option === null) {
-    if (args[0] && !args[0].startsWith('-')) {
-      leftovers.push(arg, args[0]);
-      args.shift();
+    if (nextArg && !nextArg.startsWith('-')) {
+      leftovers.push(arg, nextArg);
+      consumedNextArg = true;
     } else {
       leftovers.push(arg);
     }
@@ -220,6 +221,8 @@ function _assignOption(
       ignored.push(arg);
     }
   }
+
+  return consumedNextArg;
 }
 
 
@@ -303,15 +306,18 @@ export function parseArguments(
 
   const state = { options, parsedOptions, positionals, leftovers, ignored, errors, warnings };
 
-  for (let arg = args.shift(); arg !== undefined; arg = args.shift()) {
+  for (let argIndex = 0; argIndex < args.length; argIndex++) {
+    const arg = args[argIndex];
+    let consumedNextArg = false;
+
     if (arg == '--') {
       // If we find a --, we're done.
-      leftovers.push(...args);
+      leftovers.push(...args.slice(argIndex + 1));
       break;
     }
 
     if (arg.startsWith('--')) {
-      _assignOption(arg, args, state);
+      consumedNextArg = _assignOption(arg, args[argIndex + 1], state);
     } else if (arg.startsWith('-')) {
       // Argument is of form -abcdef.  Starts at 1 because we skip the `-`.
       for (let i = 1; i < arg.length; i++) {
@@ -319,14 +325,14 @@ export function parseArguments(
         // If the next character is an '=', treat it as a long flag.
         if (arg[i + 1] == '=') {
           const f = '-' + flag + arg.slice(i + 1);
-          _assignOption(f, args, state);
+          consumedNextArg = _assignOption(f, args[argIndex + 1], state);
           break;
         }
         // Treat the last flag as `--a` (as if full flag but just one letter). We do this in
         // the loop because it saves us a check to see if the arg is just `-`.
         if (i == arg.length - 1) {
           const arg = '-' + flag;
-          _assignOption(arg, args, state);
+          consumedNextArg = _assignOption(arg, args[argIndex + 1], state);
         } else {
           const maybeOption = _getOptionFromName(flag, options);
           if (maybeOption) {
@@ -340,6 +346,10 @@ export function parseArguments(
     } else {
       positionals.push(arg);
     }
+
+    if (consumedNextArg) {
+      argIndex++;
+    }
   }
 
   // Deal with positionals.
diff --git a/packages/angular/cli/models/parser_spec.ts b/packages/angular/cli/models/parser_spec.ts
index 70387e6f88c5..86b9cba71211 100644
--- a/packages/angular/cli/models/parser_spec.ts
+++ b/packages/angular/cli/models/parser_spec.ts
@@ -150,10 +150,14 @@ describe('parseArguments', () => {
   Object.entries(tests).forEach(([str, expected]) => {
     it(`works for ${str}`, () => {
       try {
-        const actual = parseArguments(str.split(' '), options);
+        const originalArgs = str.split(' ');
+        const args = originalArgs.slice();
+
+        const actual = parseArguments(args, options);
 
         expect(Array.isArray(expected)).toBe(false);
         expect(actual).toEqual(expected as Arguments);
+        expect(args).toEqual(originalArgs);
       } catch (e) {
         if (!(e instanceof ParseArgumentException)) {
           throw e;

From bc76d0c2736a93e9137c0b2cf376bdc6869bbe45 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 12 Nov 2018 10:29:42 +0100
Subject: [PATCH 0487/1703] refactor(@angular/cli): move project name being
 linted logic to builder

---
 packages/angular/cli/commands/lint-impl.ts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/angular/cli/commands/lint-impl.ts b/packages/angular/cli/commands/lint-impl.ts
index a67a8563d951..6edd8556f994 100644
--- a/packages/angular/cli/commands/lint-impl.ts
+++ b/packages/angular/cli/commands/lint-impl.ts
@@ -5,7 +5,6 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { TargetSpecifier } from '@angular-devkit/architect';
 import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
 import { Arguments } from '../models/interface';
 import { Schema as LintCommandSchema } from './lint';
@@ -14,12 +13,6 @@ export class LintCommand extends ArchitectCommand<LintCommandSchema> {
   public readonly target = 'lint';
   public readonly multiTarget = true;
 
-  protected async runSingleTarget(targetSpec: TargetSpecifier, options: string[]) {
-    this.logger.info(`Linting ${JSON.stringify(targetSpec.project)}...`);
-
-    return super.runSingleTarget(targetSpec, options);
-  }
-
   public async run(options: ArchitectCommandOptions & Arguments) {
     return this.runArchitectTarget(options);
   }

From 45b6df511ff31e7a111d223a6239a3215e87fe53 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 30 Nov 2018 11:50:01 +0100
Subject: [PATCH 0488/1703] fix(@angular-devkit/build-angular): lint non human
 readable formatters produces invalid output

fixes #12674
---
 .../angular/cli/models/architect-command.ts   |  8 +++++--
 .../angular_devkit/architect/src/architect.ts |  1 +
 .../architect/testing/run-target-spec.ts      |  8 +++++--
 .../build_angular/src/tslint/index.ts         | 16 +++++++++----
 .../test/tslint/works_spec_large.ts           | 24 ++++++++++++++++++-
 5 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index 61973decec6b..d847788f31a3 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -7,6 +7,7 @@
  */
 import {
   Architect,
+  BuilderContext,
   TargetSpecifier,
 } from '@angular-devkit/architect';
 import { experimental, json, schema, tags } from '@angular-devkit/core';
@@ -185,8 +186,11 @@ export abstract class ArchitectCommand<
       return 1;
     }
     const realBuilderConf = this._architect.getBuilderConfiguration({ ...targetSpec, overrides });
-
-    const result = await this._architect.run(realBuilderConf, { logger: this.logger }).toPromise();
+    const builderContext: Partial<BuilderContext> = {
+      logger: this.logger,
+      targetSpecifier: targetSpec,
+    };
+    const result = await this._architect.run(realBuilderConf, builderContext).toPromise();
 
     return result.success ? 0 : 1;
   }
diff --git a/packages/angular_devkit/architect/src/architect.ts b/packages/angular_devkit/architect/src/architect.ts
index fa81d51424d2..c83994aa33c6 100644
--- a/packages/angular_devkit/architect/src/architect.ts
+++ b/packages/angular_devkit/architect/src/architect.ts
@@ -64,6 +64,7 @@ export interface BuilderContext {
   host: virtualFs.Host<{}>;
   workspace: experimental.workspace.Workspace;
   architect: Architect;
+  targetSpecifier?: TargetSpecifier;
 }
 
 // TODO: use Build Event Protocol
diff --git a/packages/angular_devkit/architect/testing/run-target-spec.ts b/packages/angular_devkit/architect/testing/run-target-spec.ts
index 1224589e4edf..20688782b5c6 100644
--- a/packages/angular_devkit/architect/testing/run-target-spec.ts
+++ b/packages/angular_devkit/architect/testing/run-target-spec.ts
@@ -9,7 +9,7 @@
 import { experimental, logging, normalize } from '@angular-devkit/core';
 import { Observable, merge, throwError, timer } from 'rxjs';
 import { concatMap, concatMapTo, finalize, takeUntil } from 'rxjs/operators';
-import { Architect, BuildEvent, TargetSpecifier } from '../src';
+import { Architect, BuildEvent, BuilderContext, TargetSpecifier } from '../src';
 import { TestProjectHost } from './test-project-host';
 
 export const DefaultTimeout = 45000;
@@ -33,9 +33,13 @@ export function runTargetSpec(
   });
 
   // Load the workspace from the root of the host, then run a target.
+  const builderContext: Partial<BuilderContext> = {
+    logger,
+    targetSpecifier: targetSpec,
+  };
   const runArchitect$ = workspace.loadWorkspaceFromHost(workspaceFile).pipe(
     concatMap(ws => new Architect(ws).loadArchitect()),
-    concatMap(arch => arch.run(arch.getBuilderConfiguration(targetSpec), { logger })),
+    concatMap(arch => arch.run(arch.getBuilderConfiguration(targetSpec), builderContext)),
     finalize(() => finalizeCB()),
   );
 
diff --git a/packages/angular_devkit/build_angular/src/tslint/index.ts b/packages/angular_devkit/build_angular/src/tslint/index.ts
index 9fe76ac1fd88..6fcf8b11854e 100644
--- a/packages/angular_devkit/build_angular/src/tslint/index.ts
+++ b/packages/angular_devkit/build_angular/src/tslint/index.ts
@@ -60,6 +60,17 @@ export default class TslintBuilder implements Builder<TslintBuilderOptions> {
     const root = this.context.workspace.root;
     const systemRoot = getSystemPath(root);
     const options = builderConfig.options;
+    const targetSpecifier = this.context.targetSpecifier;
+    const projectName = targetSpecifier && targetSpecifier.project || '';
+
+    // Print formatter output directly for non human-readable formats.
+    if (!['prose', 'verbose', 'stylish'].includes(options.format)) {
+      options.silent = true;
+    }
+
+    if (!options.silent) {
+      this.context.logger.info(`Linting ${JSON.stringify(projectName)}...`);
+    }
 
     if (!options.tsConfig && options.typeCheck) {
       throw new Error('A "project" must be specified to enable type checking.');
@@ -116,11 +127,6 @@ export default class TslintBuilder implements Builder<TslintBuilderOptions> {
         }
       }
 
-      // Print formatter output directly for non human-readable formats.
-      if (['prose', 'verbose', 'stylish'].indexOf(options.format) == -1) {
-        options.silent = true;
-      }
-
       if (result.warningCount > 0 && !options.silent) {
         this.context.logger.warn('Lint warnings found in the listed files.');
       }
diff --git a/packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts b/packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts
index 69192e545754..583557cdf3b9 100644
--- a/packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts
@@ -12,7 +12,7 @@ import { tap } from 'rxjs/operators';
 import { TslintBuilderOptions } from '../../src';
 import { host, tslintTargetSpec } from '../utils';
 
-
+// tslint:disable-next-line:no-big-function
 describe('Tslint Target', () => {
   const filesWithErrors = { 'src/foo.ts': 'const foo = "";\n' };
 
@@ -25,6 +25,28 @@ describe('Tslint Target', () => {
     ).toPromise().then(done, done.fail);
   }, 30000);
 
+  it(`should show project name when formatter is human readable`, (done) => {
+    const logger = new TestLogger('lint-info');
+
+    runTargetSpec(host, tslintTargetSpec, undefined, undefined, logger).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => {
+        expect(logger.includes('Linting "app"...')).toBe(true);
+      }),
+    ).toPromise().then(done, done.fail);
+  }, 30000);
+
+  it(`should not show project name when formatter is non human readable`, (done) => {
+    const logger = new TestLogger('lint-info');
+
+    runTargetSpec(host, tslintTargetSpec, { format: 'checkstyle' }, undefined, logger).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => {
+        expect(logger.includes('Linting "app"...')).toBe(false);
+      }),
+    ).toPromise().then(done, done.fail);
+  }, 30000);
+
   it('should report lint error once', (done) => {
     host.writeMultipleFiles({'src/app/app.component.ts': 'const foo = "";\n' });
     const logger = new TestLogger('lint-error');

From aae1afd1149c51c9c97f1a0746cdc4707f2344af Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 26 Nov 2018 09:20:34 +0100
Subject: [PATCH 0489/1703] build: add support for `x-deprecated` when
 generating schema

When using the CLI and a property is deprecated we emit a warning by using the `x-deprecated` field. However API consumers have no way to know that a property is deprecated at the moment.

This converts `x-deprecated` to  `@deprecated` comments
---
 tools/quicktype_runner.js | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/tools/quicktype_runner.js b/tools/quicktype_runner.js
index 65c6501536f2..021e809b5862 100644
--- a/tools/quicktype_runner.js
+++ b/tools/quicktype_runner.js
@@ -9,7 +9,6 @@ const fs = require('fs');
 const path = require('path');
 const {
   InputData,
-  JSONSchema,
   JSONSchemaInput,
   JSONSchemaStore,
   TypeScriptTargetLanguage,
@@ -88,6 +87,8 @@ class FetchingJSONSchemaStore extends JSONSchemaStore {
       return undefined;
     }
 
+    content = appendDeprecatedDescription(content);
+
     return parseJSON(content, "JSON Schema", address);
   }
 }
@@ -116,7 +117,8 @@ async function generate(inPath) {
   // Best description of how to use the API was found at
   //   https://blog.quicktype.io/customizing-quicktype/
   const inputData = new InputData();
-  const source = { name: 'Schema', schema: fs.readFileSync(inPath, 'utf-8') };
+  const content = fs.readFileSync(inPath, 'utf-8');
+  const source = { name: 'Schema', schema: appendDeprecatedDescription(content) };
 
   await inputData.addSource('schema', source, () => {
     return new JSONSchemaInput(new FetchingJSONSchemaStore(inPath));
@@ -137,6 +139,27 @@ async function generate(inPath) {
   return header + lines.join('\n') + footer;
 }
 
+/**
+ * Converts `x-deprecated` to `@deprecated` comments.
+ * @param {string} schema
+ */
+function appendDeprecatedDescription(schema) {
+  const content = JSON.parse(schema);
+  const props = content.properties;
+
+  for (const key in props) {
+    let { description = '', 'x-deprecated': deprecated } = props[key];
+    if (!deprecated) {
+      continue;
+    }
+
+    description += '\n@deprecated' + (typeof deprecated === 'string' ? ` ${deprecated}` : '');
+    props[key].description = description;
+  }
+
+  return JSON.stringify(content);
+}
+
 if (require.main === module) {
   // Parse arguments and run main().
   const argv = process.argv.slice(2);

From 17d4dcc93635da4f0d4851cc7f29342da671ac2d Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 30 Nov 2018 19:07:12 -0500
Subject: [PATCH 0490/1703] fix(@schematics/update): only set registry option
 when used

---
 packages/schematics/update/update/npm.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/update/update/npm.ts b/packages/schematics/update/update/npm.ts
index 1858b84259a2..9e3e9e3a4811 100644
--- a/packages/schematics/update/update/npm.ts
+++ b/packages/schematics/update/update/npm.ts
@@ -129,7 +129,7 @@ export function getNpmPackageJson(
     {
       'full-metadata': true,
       ...npmrc,
-      registry: options && options.registryUrl,
+      ...(options && options.registryUrl ? { registry: options.registryUrl } : {}),
     },
   );
 

From 4f8a5b7a55316f773c1ae80505864212dc278b6a Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 3 Dec 2018 09:08:04 +0100
Subject: [PATCH 0491/1703] feat(@angular-devkit/build-angular): fine grain
 settings for optimization

---
 .../angular-cli-files/models/build-options.ts |  3 +-
 .../models/webpack-configs/browser.ts         |  6 +-
 .../models/webpack-configs/common.ts          | 91 +++++++++++--------
 .../build_angular/src/browser/index.ts        | 15 ++-
 .../build_angular/src/browser/schema.d.ts     | 11 ++-
 .../build_angular/src/browser/schema.json     | 26 +++++-
 .../build_angular/src/dev-server/index.ts     | 38 ++++++--
 .../build_angular/src/dev-server/schema.json  | 25 ++++-
 .../build_angular/src/server/index.ts         |  9 +-
 .../build_angular/src/server/schema.d.ts      |  9 +-
 .../build_angular/src/server/schema.json      | 24 ++++-
 .../build_angular/src/utils/index.ts          |  1 +
 .../src/utils/normalize-optimization.ts       | 24 +++++
 .../browser/optimization-level_spec_large.ts  | 69 ++++++++++++++
 14 files changed, 289 insertions(+), 62 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/src/utils/normalize-optimization.ts

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
index 649d287ad144..422e37cfb291 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
@@ -16,9 +16,10 @@ import {
   CurrentFileReplacement,
   ExtraEntryPoint,
 } from '../../browser/schema';
+import { NormalizedOptimization } from '../../utils/index';
 
 export interface BuildOptions {
-  optimization: boolean;
+  optimization: NormalizedOptimization;
   environment?: string;
   outputPath: string;
   resourcesOutputPath?: string;
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
index 0fc80f090891..3eae2eaf5d63 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
@@ -20,8 +20,12 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
   const extraPlugins = [];
 
   let isEval = false;
+  const { styles: stylesOptimization, scripts: scriptsOptimization } = buildOptions.optimization;
   // See https://webpack.js.org/configuration/devtool/ for sourcemap types.
-  if (buildOptions.sourceMap && buildOptions.evalSourceMap && !buildOptions.optimization) {
+  if (buildOptions.sourceMap &&
+    buildOptions.evalSourceMap &&
+    !stylesOptimization &&
+    !scriptsOptimization) {
     // Produce eval sourcemaps for development with serve, which are faster.
     isEval = true;
   }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 147f770912ea..d12f7208dff4 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -33,6 +33,7 @@ export const buildOptimizerLoader: string = g['_DevKitIsLocal']
 // tslint:disable-next-line:no-big-function
 export function getCommonConfig(wco: WebpackConfigOptions) {
   const { root, projectRoot, buildOptions } = wco;
+  const { styles: stylesOptimization, scripts: scriptsOptimization } = buildOptions.optimization;
 
   const nodeModules = findUp('node_modules', projectRoot);
   if (!nodeModules) {
@@ -204,37 +205,61 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
     alias = rxPaths(nodeModules);
   } catch { }
 
-  const terserOptions = {
-    ecma: wco.supportES2015 ? 6 : 5,
-    warnings: !!buildOptions.verbose,
-    safari10: true,
-    output: {
-      ascii_only: true,
-      comments: false,
-      webkit: true,
-    },
+  const extraMinimizers = [];
+  if (stylesOptimization) {
+    extraMinimizers.push(
+      new CleanCssWebpackPlugin({
+        sourceMap: buildOptions.stylesSourceMap,
+        // component styles retain their original file name
+        test: (file) => /\.(?:css|scss|sass|less|styl)$/.test(file),
+      }),
+    );
+  }
 
-    // On server, we don't want to compress anything. We still set the ngDevMode = false for it
-    // to remove dev code.
-    compress: (buildOptions.platform == 'server' ? {
-      global_defs: {
-        ngDevMode: false,
-      },
-    } : {
-      pure_getters: buildOptions.buildOptimizer,
-      // PURE comments work best with 3 passes.
-      // See https://github.com/webpack/webpack/issues/2899#issuecomment-317425926.
-      passes: buildOptions.buildOptimizer ? 3 : 1,
-      global_defs: {
-        ngDevMode: false,
+  if (scriptsOptimization) {
+    const terserOptions = {
+      ecma: wco.supportES2015 ? 6 : 5,
+      warnings: !!buildOptions.verbose,
+      safari10: true,
+      output: {
+        ascii_only: true,
+        comments: false,
+        webkit: true,
       },
-    }),
-    // We also want to avoid mangling on server.
-    ...(buildOptions.platform == 'server' ? { mangle: false } : {}),
-  };
+
+      // On server, we don't want to compress anything. We still set the ngDevMode = false for it
+      // to remove dev code.
+      compress: (buildOptions.platform == 'server' ? {
+        global_defs: {
+          ngDevMode: false,
+        },
+      } : {
+          pure_getters: buildOptions.buildOptimizer,
+          // PURE comments work best with 3 passes.
+          // See https://github.com/webpack/webpack/issues/2899#issuecomment-317425926.
+          passes: buildOptions.buildOptimizer ? 3 : 1,
+          global_defs: {
+            ngDevMode: false,
+          },
+        }),
+      // We also want to avoid mangling on server.
+      ...(buildOptions.platform == 'server' ? { mangle: false } : {}),
+    };
+
+    extraMinimizers.push(
+      new TerserPlugin({
+        sourceMap: buildOptions.scriptsSourceMap,
+        parallel: true,
+        cache: true,
+        terserOptions,
+      }),
+    );
+  }
 
   return {
-    mode: buildOptions.optimization ? 'production' : 'development',
+    mode: scriptsOptimization || stylesOptimization
+      ? 'production'
+      : 'development',
     devtool: false,
     resolve: {
       extensions: ['.ts', '.tsx', '.mjs', '.js'],
@@ -296,17 +321,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
         new HashedModuleIdsPlugin(),
         // TODO: check with Mike what this feature needs.
         new BundleBudgetPlugin({ budgets: buildOptions.budgets }),
-        new CleanCssWebpackPlugin({
-          sourceMap: buildOptions.stylesSourceMap,
-          // component styles retain their original file name
-          test: (file) => /\.(?:css|scss|sass|less|styl)$/.test(file),
-        }),
-        new TerserPlugin({
-          sourceMap: buildOptions.scriptsSourceMap,
-          parallel: true,
-          cache: true,
-          terserOptions,
-        }),
+        ...extraMinimizers,
       ],
     },
     plugins: extraPlugins,
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 1f3b3fa468f9..f2b9b09c7af1 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -35,10 +35,12 @@ import {
   statsWarningsToString,
 } from '../angular-cli-files/utilities/stats';
 import {
+  NormalizedOptimization,
   NormalizedSourceMaps,
   defaultProgress,
   normalizeAssetPatterns,
   normalizeFileReplacements,
+  normalizeOptimization,
   normalizeSourceMaps,
 } from '../utils';
 import {
@@ -56,10 +58,14 @@ const webpackMerge = require('webpack-merge');
 // BrowserBuildSchema and BrowserBuilder.buildWebpackConfig.
 // It would really help if it happens during architect.validateBuilderOptions, or similar.
 export interface NormalizedBrowserBuilderSchema extends
-  Pick<BrowserBuilderSchema, Exclude<keyof BrowserBuilderSchema, 'sourceMap' | 'vendorSourceMap'>>,
+  Pick<
+  BrowserBuilderSchema,
+  Exclude<keyof BrowserBuilderSchema, 'sourceMap' | 'vendorSourceMap' | 'optimization'>
+  >,
   NormalizedSourceMaps {
   assets: AssetPatternObject[];
   fileReplacements: CurrentFileReplacement[];
+  optimization: NormalizedOptimization;
 }
 
 export class BrowserBuilder implements Builder<BrowserBuilderSchema> {
@@ -92,13 +98,18 @@ export class BrowserBuilder implements Builder<BrowserBuilderSchema> {
         options = {
           ...options,
           ...normalizedOptions,
+          // tslint:disable-next-line:no-any
+          optimization: normalizeOptimization(options.optimization) as any,
         };
       }),
       concatMap(() => {
         let webpackConfig;
         try {
           webpackConfig = this.buildWebpackConfig(root, projectRoot, host,
-            options as NormalizedBrowserBuilderSchema);
+            // todo replace with unknown
+            // we need to find a clear way to create this options
+            // tslint:disable-next-line:no-any
+            options as any as NormalizedBrowserBuilderSchema);
         } catch (e) {
           return throwError(e);
         }
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.d.ts b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
index ba27d8ab0418..c9c9d02158b8 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
@@ -44,7 +44,7 @@ export interface BrowserBuilderSchema {
   /**
    * Enables optimization of the build output.
    */
-  optimization: boolean;
+  optimization: OptimizationOptions;
 
   /**
    * Replace files with other files in the build.
@@ -237,6 +237,15 @@ export interface BrowserBuilderSchema {
   profile: boolean;
 }
 
+export type OptimizationOptions = boolean | OptimizationObject;
+
+export interface OptimizationObject {
+  /** Enables optimization of the scripts output. */
+  scripts?: boolean;
+  /** Enables optimization of the styles output. */
+  styles?: boolean;
+}
+
 export type SourceMapOptions = boolean | SourceMapObject;
 
 export interface SourceMapObject {
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index 13c58553d0a4..913c0660c81b 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -55,9 +55,29 @@
       "additionalProperties": false
     },
     "optimization": {
-      "type": "boolean",
-      "description": "When true, uses optimization for the app build.",
-      "default": false
+      "description": "Enables optimization of the build output.",
+      "default": false,
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
+            "scripts": {
+              "type": "boolean",
+              "description": "Enables optimization of the scripts output.",
+              "default": true
+            },
+            "styles": {
+              "type": "boolean",
+              "description": "Enables optimization of the styles output.",
+              "default": true
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "type": "boolean"
+        }
+      ]
     },
     "fileReplacements": {
       "description": "Replace files with other files in the build.",
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index f72fe3caa3be..394b2ed1babb 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -24,7 +24,12 @@ import * as WebpackDevServer from 'webpack-dev-server';
 import { checkPort } from '../angular-cli-files/utilities/check-port';
 import { BrowserBuilder, NormalizedBrowserBuilderSchema, getBrowserLoggingCb } from '../browser/';
 import { BrowserBuilderSchema } from '../browser/schema';
-import { normalizeAssetPatterns, normalizeFileReplacements, normalizeSourceMaps } from '../utils';
+import {
+  normalizeAssetPatterns,
+  normalizeFileReplacements,
+  normalizeOptimization,
+  normalizeSourceMaps,
+} from '../utils';
 const opn = require('opn');
 
 
@@ -86,15 +91,26 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
         browserOptions = {
           ...browserOptions,
           ...normalizedOptions,
+          // tslint:disable-next-line:no-any
+          optimization: normalizeOptimization(options.optimization) as any,
         };
       }),
       concatMap(() => {
         const webpackConfig = this.buildWebpackConfig(
-          root, projectRoot, host, browserOptions as NormalizedBrowserBuilderSchema);
+          // todo should be unknown
+          // tslint:disable-next-line:no-any
+          root, projectRoot, host, browserOptions as any as NormalizedBrowserBuilderSchema,
+        );
 
         let webpackDevServerConfig: WebpackDevServer.Configuration;
         try {
-          webpackDevServerConfig = this._buildServerConfig(root, options, browserOptions);
+          webpackDevServerConfig = this._buildServerConfig(
+            root,
+            options,
+            // todo should be unknown
+            // tslint:disable-next-line:no-any
+            browserOptions as any as NormalizedBrowserBuilderSchema,
+          );
         } catch (err) {
           return throwError(err);
         }
@@ -179,11 +195,11 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
     root: Path,
     projectRoot: Path,
     host: virtualFs.Host<Stats>,
-    browserOptions: BrowserBuilderSchema,
+    browserOptions: NormalizedBrowserBuilderSchema,
   ) {
     const browserBuilder = new BrowserBuilder(this.context);
     const webpackConfig = browserBuilder.buildWebpackConfig(
-      root, projectRoot, host, browserOptions as NormalizedBrowserBuilderSchema);
+      root, projectRoot, host, browserOptions);
 
     return webpackConfig;
   }
@@ -191,7 +207,7 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
   private _buildServerConfig(
     root: Path,
     options: DevServerBuilderOptions,
-    browserOptions: BrowserBuilderSchema,
+    browserOptions: NormalizedBrowserBuilderSchema,
   ) {
     const systemRoot = getSystemPath(root);
     if (options.disableHostCheck) {
@@ -203,6 +219,7 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
     }
 
     const servePath = this._buildServePath(options, browserOptions);
+    const { styles, scripts } = browserOptions.optimization;
 
     const config: WebpackDevServer.Configuration = {
       host: options.host,
@@ -214,13 +231,13 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
         htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
       } as WebpackDevServer.HistoryApiFallbackConfig,
       stats: false,
-      compress: browserOptions.optimization,
+      compress: styles || scripts,
       watchOptions: {
         poll: browserOptions.poll,
       },
       https: options.ssl,
       overlay: {
-        errors: !browserOptions.optimization,
+        errors: !(styles || scripts),
         warnings: false,
       },
       public: options.publicHost,
@@ -332,7 +349,10 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
     config.proxy = proxyConfig;
   }
 
-  private _buildServePath(options: DevServerBuilderOptions, browserOptions: BrowserBuilderSchema) {
+  private _buildServePath(
+    options: DevServerBuilderOptions,
+    browserOptions: NormalizedBrowserBuilderSchema,
+  ) {
     let servePath = options.servePath;
     if (!servePath && servePath !== '') {
       const defaultServePath =
diff --git a/packages/angular_devkit/build_angular/src/dev-server/schema.json b/packages/angular_devkit/build_angular/src/dev-server/schema.json
index c69da96418a2..d4e59a1ea066 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/schema.json
+++ b/packages/angular_devkit/build_angular/src/dev-server/schema.json
@@ -84,8 +84,29 @@
       "default": true
     },
     "optimization": {
-      "type": "boolean",
-      "description": "Enables optimization of the build output."
+      "description": "Enables optimization of the build output.",
+      "default": false,
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
+            "scripts": {
+              "type": "boolean",
+              "description": "Enables optimization of the scripts output.",
+              "default": true
+            },
+            "styles": {
+              "type": "boolean",
+              "description": "Enables optimization of the styles output.",
+              "default": true
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "type": "boolean"
+        }
+      ]
     },
     "aot": {
       "type": "boolean",
diff --git a/packages/angular_devkit/build_angular/src/server/index.ts b/packages/angular_devkit/build_angular/src/server/index.ts
index fdd2f7094dd4..8bcbfa7c1e1f 100644
--- a/packages/angular_devkit/build_angular/src/server/index.ts
+++ b/packages/angular_devkit/build_angular/src/server/index.ts
@@ -30,7 +30,12 @@ import {
 import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
 import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
 import { getBrowserLoggingCb } from '../browser';
-import { defaultProgress, normalizeFileReplacements, normalizeSourceMaps } from '../utils';
+import {
+  defaultProgress,
+  normalizeFileReplacements,
+  normalizeOptimization,
+  normalizeSourceMaps,
+} from '../utils';
 import { BuildWebpackServerSchema } from './schema';
 const webpackMerge = require('webpack-merge');
 
@@ -62,6 +67,8 @@ export class ServerBuilder implements Builder<BuildWebpackServerSchema> {
         options = {
           ...options,
           ...normalizedOptions,
+          // tslint:disable-next-line:no-any
+          optimization: normalizeOptimization(options.optimization || {}) as any,
         };
       }),
       concatMap(() => {
diff --git a/packages/angular_devkit/build_angular/src/server/schema.d.ts b/packages/angular_devkit/build_angular/src/server/schema.d.ts
index bb00e4fd2fea..383c7c8f36b2 100644
--- a/packages/angular_devkit/build_angular/src/server/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/server/schema.d.ts
@@ -6,7 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { BrowserBuilderSchema, FileReplacement, SourceMapOptions } from '../browser/schema';
+import {
+  BrowserBuilderSchema,
+  FileReplacement,
+  OptimizationObject,
+  SourceMapOptions,
+} from '../browser/schema';
 
 export interface BuildWebpackServerSchema {
   /**
@@ -72,7 +77,7 @@ export interface BuildWebpackServerSchema {
   /**
    * Enables optimization of the build output.
    */
-  optimization?: boolean;
+  optimization?: OptimizationObject;
   /**
    * Log progress to the console while building.
    */
diff --git a/packages/angular_devkit/build_angular/src/server/schema.json b/packages/angular_devkit/build_angular/src/server/schema.json
index 3cd83727fd61..8a502c583754 100644
--- a/packages/angular_devkit/build_angular/src/server/schema.json
+++ b/packages/angular_devkit/build_angular/src/server/schema.json
@@ -28,9 +28,29 @@
       "additionalProperties": false
     },
     "optimization": {
-      "type": "boolean",
       "description": "Enables optimization of the build output.",
-      "default": false
+      "default": false,
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
+            "scripts": {
+              "type": "boolean",
+              "description": "Enables optimization of the scripts output.",
+              "default": true
+            },
+            "styles": {
+              "type": "boolean",
+              "description": "Enables optimization of the styles output.",
+              "default": true
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "type": "boolean"
+        }
+      ]
     },
     "fileReplacements": {
       "description": "Replace files with other files in the build.",
diff --git a/packages/angular_devkit/build_angular/src/utils/index.ts b/packages/angular_devkit/build_angular/src/utils/index.ts
index e4b77f57dcbe..190ca556a3ae 100644
--- a/packages/angular_devkit/build_angular/src/utils/index.ts
+++ b/packages/angular_devkit/build_angular/src/utils/index.ts
@@ -11,3 +11,4 @@ export * from './run-module-as-observable-fork';
 export * from './normalize-file-replacements';
 export * from './normalize-asset-patterns';
 export * from './normalize-source-maps';
+export * from './normalize-optimization';
diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-optimization.ts b/packages/angular_devkit/build_angular/src/utils/normalize-optimization.ts
new file mode 100644
index 000000000000..36aa1e00420a
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/utils/normalize-optimization.ts
@@ -0,0 +1,24 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { OptimizationOptions, SourceMapOptions } from '../browser/schema';
+
+export interface NormalizedOptimization {
+  scripts: boolean;
+  styles: boolean;
+}
+
+export function normalizeOptimization(optimization: OptimizationOptions): NormalizedOptimization {
+  const scripts = !!(typeof optimization === 'object' ? optimization.scripts : optimization);
+  const styles = !!(typeof optimization === 'object' ? optimization.styles : optimization);
+
+  return {
+    scripts,
+    styles,
+  };
+}
diff --git a/packages/angular_devkit/build_angular/test/browser/optimization-level_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/optimization-level_spec_large.ts
index 932ae0928baa..61d0cfff1ecc 100644
--- a/packages/angular_devkit/build_angular/test/browser/optimization-level_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/optimization-level_spec_large.ts
@@ -9,6 +9,7 @@
 import { DefaultTimeout, runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { tap } from 'rxjs/operators';
+import { BrowserBuilderSchema } from '../../src/browser/schema';
 import { browserTargetSpec, host } from '../utils';
 
 
@@ -46,4 +47,72 @@ describe('Browser Builder optimization level', () => {
       }),
     ).toPromise().then(done, done.fail);
   });
+
+  it('supports styles only optimizations', (done) => {
+    const overrides: Partial<BrowserBuilderSchema> = {
+      optimization: {
+        styles: true,
+        scripts: false,
+      },
+      aot: true,
+      extractCss: true,
+      styles: ['src/styles.css'],
+    };
+
+    host.appendToFile('src/main.ts', '/** js comment should not be dropped */');
+    host.appendToFile('src/app/app.component.css', 'div { color: white }');
+    host.writeMultipleFiles({
+      'src/styles.css': `div { color: white }`,
+    });
+
+    runTargetSpec(host, browserTargetSpec, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => {
+        const scriptContent = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, 'main.js')),
+        );
+        expect(scriptContent).toContain('js comment should not be dropped');
+        expect(scriptContent).toContain('color:#fff');
+
+        const styleContent = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, 'styles.css')),
+        );
+        expect(styleContent).toContain('color:#fff');
+      }),
+    ).toPromise().then(done, done.fail);
+  });
+
+  it('supports scripts only optimizations', (done) => {
+    const overrides: Partial<BrowserBuilderSchema> = {
+      optimization: {
+        styles: false,
+        scripts: true,
+      },
+      aot: true,
+      extractCss: true,
+      styles: ['src/styles.css'],
+    };
+
+    host.appendToFile('src/main.ts', '/** js comment should be dropped */');
+    host.appendToFile('src/app/app.component.css', 'div { color: white }');
+    host.writeMultipleFiles({
+      'src/styles.css': `div { color: white }`,
+    });
+
+    runTargetSpec(host, browserTargetSpec, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => {
+        const scriptContent = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, 'main.js')),
+        );
+        expect(scriptContent).not.toContain('js comment should be dropped');
+        expect(scriptContent).toContain('color: white');
+
+        const styleContent = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, 'styles.css')),
+        );
+        expect(styleContent).toContain('color: white');
+      }),
+    ).toPromise().then(done, done.fail);
+  });
 });

From af67b49342dec3159fd38cb01ac1f47b1f188775 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 3 Dec 2018 17:55:24 +0100
Subject: [PATCH 0492/1703] refactor: clean up how to generate normalized build
 options and improve type safety

---
 .../angular-cli-files/models/build-options.ts |  9 +-
 .../models/webpack-configs/browser.ts         | 18 ++--
 .../models/webpack-configs/common.ts          | 15 ++--
 .../models/webpack-configs/server.ts          | 12 +--
 .../models/webpack-configs/styles.ts          |  6 +-
 .../models/webpack-configs/test.ts            |  9 +-
 .../models/webpack-configs/typescript.ts      |  4 +-
 .../build_angular/src/browser/index.ts        | 56 +++---------
 .../build_angular/src/browser/schema.d.ts     | 16 ++++
 .../build_angular/src/browser/schema.json     |  1 -
 .../build_angular/src/dev-server/index.ts     | 52 +++---------
 .../build_angular/src/dev-server/schema.json  |  1 -
 .../build_angular/src/extract-i18n/index.ts   |  8 +-
 .../build_angular/src/karma/index.ts          | 44 +++-------
 .../build_angular/src/karma/schema.d.ts       | 10 +++
 .../build_angular/src/server/index.ts         | 34 +++-----
 .../build_angular/src/server/schema.d.ts      |  9 ++
 .../build_angular/src/server/schema.json      |  1 -
 .../build_angular/src/utils/index.ts          |  1 +
 .../src/utils/normalize-builder-schema.ts     | 85 +++++++++++++++++++
 .../src/utils/normalize-source-maps.ts        | 26 +++---
 21 files changed, 220 insertions(+), 197 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/src/utils/normalize-builder-schema.ts

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
index 422e37cfb291..552b515b53cd 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
@@ -16,7 +16,7 @@ import {
   CurrentFileReplacement,
   ExtraEntryPoint,
 } from '../../browser/schema';
-import { NormalizedOptimization } from '../../utils/index';
+import { NormalizedOptimization, NormalizedSourceMaps } from '../../utils/index';
 
 export interface BuildOptions {
   optimization: NormalizedOptimization;
@@ -24,11 +24,10 @@ export interface BuildOptions {
   outputPath: string;
   resourcesOutputPath?: string;
   aot?: boolean;
-  sourceMap?: boolean;
-  scriptsSourceMap?: boolean;
-  stylesSourceMap?: boolean;
-  hiddenSourceMap?: boolean;
+  sourceMap: NormalizedSourceMaps;
+  /** @deprecated use sourceMap instead */
   vendorSourceMap?: boolean;
+  /** @deprecated  */
   evalSourceMap?: boolean;
   vendorChunk?: boolean;
   commonChunk?: boolean;
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
index 3eae2eaf5d63..e9b23b927d3f 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
@@ -21,8 +21,14 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
 
   let isEval = false;
   const { styles: stylesOptimization, scripts: scriptsOptimization } = buildOptions.optimization;
+  const {
+    styles: stylesSouceMap,
+    scripts: scriptsSourceMap,
+    hidden: hiddenSourceMap,
+  } = buildOptions.sourceMap;
+
   // See https://webpack.js.org/configuration/devtool/ for sourcemap types.
-  if (buildOptions.sourceMap &&
+  if ((stylesSouceMap || scriptsSourceMap) &&
     buildOptions.evalSourceMap &&
     !stylesOptimization &&
     !scriptsOptimization) {
@@ -58,16 +64,10 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
     }));
   }
 
-  if (!isEval && buildOptions.sourceMap) {
-    const {
-      scriptsSourceMap = false,
-      stylesSourceMap = false,
-      hiddenSourceMap = false,
-    } = buildOptions;
-
+  if (!isEval && (scriptsSourceMap || stylesSouceMap)) {
     extraPlugins.push(getSourceMapDevTool(
       scriptsSourceMap,
-      stylesSourceMap,
+      stylesSouceMap,
       hiddenSourceMap,
     ));
   }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index d12f7208dff4..1734dab3a0e9 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -34,6 +34,11 @@ export const buildOptimizerLoader: string = g['_DevKitIsLocal']
 export function getCommonConfig(wco: WebpackConfigOptions) {
   const { root, projectRoot, buildOptions } = wco;
   const { styles: stylesOptimization, scripts: scriptsOptimization } = buildOptions.optimization;
+  const {
+    styles: stylesSouceMap,
+    scripts: scriptsSourceMap,
+    vendor: vendorSourceMap,
+  } = buildOptions.sourceMap;
 
   const nodeModules = findUp('node_modules', projectRoot);
   if (!nodeModules) {
@@ -103,7 +108,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
 
       extraPlugins.push(new ScriptsWebpackPlugin({
         name: bundleName,
-        sourceMap: buildOptions.scriptsSourceMap,
+        sourceMap: scriptsSourceMap,
         filename: `${path.basename(bundleName)}${hash}.js`,
         scripts: script.paths,
         basePath: projectRoot,
@@ -159,7 +164,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
   }
 
   let sourceMapUseRule;
-  if (buildOptions.sourceMap && buildOptions.vendorSourceMap) {
+  if ((scriptsSourceMap || stylesSouceMap) && vendorSourceMap) {
     sourceMapUseRule = {
       use: [
         {
@@ -175,7 +180,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
       use: [
         {
           loader: buildOptimizerLoader,
-          options: { sourceMap: buildOptions.scriptsSourceMap },
+          options: { sourceMap: scriptsSourceMap },
         },
       ],
     };
@@ -209,7 +214,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
   if (stylesOptimization) {
     extraMinimizers.push(
       new CleanCssWebpackPlugin({
-        sourceMap: buildOptions.stylesSourceMap,
+        sourceMap: stylesSouceMap,
         // component styles retain their original file name
         test: (file) => /\.(?:css|scss|sass|less|styl)$/.test(file),
       }),
@@ -248,7 +253,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
 
     extraMinimizers.push(
       new TerserPlugin({
-        sourceMap: buildOptions.scriptsSourceMap,
+        sourceMap: scriptsSourceMap,
         parallel: true,
         cache: true,
         terserOptions,
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts
index df1027e33354..12bf23f720df 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts
@@ -18,16 +18,12 @@ export function getServerConfig(wco: WebpackConfigOptions) {
 
   const extraPlugins = [];
   if (wco.buildOptions.sourceMap) {
-    const {
-      scriptsSourceMap = false,
-      stylesSourceMap = false,
-      hiddenSourceMap = false,
-    } = wco.buildOptions;
+    const { scripts, styles, hidden } = wco.buildOptions.sourceMap;
 
     extraPlugins.push(getSourceMapDevTool(
-      scriptsSourceMap,
-      stylesSourceMap,
-      hiddenSourceMap,
+      scripts,
+      styles,
+      hidden,
     ));
   }
 
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
index 972bda036dc7..ead6d9791bbe 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
@@ -41,7 +41,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
   const globalStylePaths: string[] = [];
   const extraPlugins = [];
 
-  const cssSourceMap = buildOptions.stylesSourceMap;
+  const cssSourceMap = buildOptions.sourceMap.styles;
 
   // Determine hashing format.
   const hashFormat = getOutputHashFormat(buildOptions.outputHashing as string);
@@ -188,7 +188,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
         options: {
           ident: 'embedded',
           plugins: postcssPluginCreator,
-          sourceMap: cssSourceMap && !buildOptions.hiddenSourceMap ? 'inline' : false,
+          sourceMap: cssSourceMap && !buildOptions.sourceMap.hidden ? 'inline' : false,
         },
       },
       ...(use as webpack.Loader[]),
@@ -211,7 +211,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
               plugins: postcssPluginCreator,
               sourceMap: cssSourceMap
                 && !buildOptions.extractCss
-                && !buildOptions.hiddenSourceMap
+                && !buildOptions.sourceMap.hidden
                 ? 'inline' : cssSourceMap,
             },
           },
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts
index f54aca248c54..a61ada1d7a5e 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts
@@ -57,14 +57,11 @@ export function getTestConfig(
   }
 
   if (wco.buildOptions.sourceMap) {
-    const {
-      scriptsSourceMap = false,
-      stylesSourceMap = false,
-    } = wco.buildOptions;
+    const { styles, scripts } = wco.buildOptions.sourceMap;
 
     extraPlugins.push(getSourceMapDevTool(
-      scriptsSourceMap,
-      stylesSourceMap,
+      styles,
+      scripts,
       false,
       true,
     ));
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
index b6303a853e13..1c5539c6ee77 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
@@ -75,7 +75,7 @@ function _createAotPlugin(
     locale: buildOptions.i18nLocale,
     platform: buildOptions.platform === 'server' ? PLATFORM.Server : PLATFORM.Browser,
     missingTranslation: buildOptions.i18nMissingTranslation,
-    sourceMap: buildOptions.scriptsSourceMap,
+    sourceMap: buildOptions.sourceMap.scripts,
     additionalLazyModules,
     hostReplacementPaths,
     nameLazyFiles: buildOptions.namedChunks,
@@ -108,7 +108,7 @@ export function getAotConfig(
   if (buildOptions.buildOptimizer) {
     loaders.unshift({
       loader: buildOptimizerLoader,
-      options: { sourceMap: buildOptions.scriptsSourceMap }
+      options: { sourceMap: buildOptions.sourceMap.scripts }
     });
   }
 
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index f2b9b09c7af1..4de602cd1f75 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -38,78 +38,42 @@ import {
   NormalizedOptimization,
   NormalizedSourceMaps,
   defaultProgress,
-  normalizeAssetPatterns,
-  normalizeFileReplacements,
-  normalizeOptimization,
-  normalizeSourceMaps,
+  normalizeBuilderSchema,
 } from '../utils';
 import {
   AssetPatternObject,
   BrowserBuilderSchema,
   CurrentFileReplacement,
+  NormalizedBrowserBuilderSchema,
 } from './schema';
 const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');
 const webpackMerge = require('webpack-merge');
 
-
-// TODO: figure out a better way to normalize assets, extra entry points, file replacements,
-// and whatever else needs to be normalized, while keeping type safety.
-// Right now this normalization has to be done in all other builders that make use of the
-// BrowserBuildSchema and BrowserBuilder.buildWebpackConfig.
-// It would really help if it happens during architect.validateBuilderOptions, or similar.
-export interface NormalizedBrowserBuilderSchema extends
-  Pick<
-  BrowserBuilderSchema,
-  Exclude<keyof BrowserBuilderSchema, 'sourceMap' | 'vendorSourceMap' | 'optimization'>
-  >,
-  NormalizedSourceMaps {
-  assets: AssetPatternObject[];
-  fileReplacements: CurrentFileReplacement[];
-  optimization: NormalizedOptimization;
-}
-
 export class BrowserBuilder implements Builder<BrowserBuilderSchema> {
 
   constructor(public context: BuilderContext) { }
 
   run(builderConfig: BuilderConfiguration<BrowserBuilderSchema>): Observable<BuildEvent> {
-    let options = builderConfig.options;
+    let options: NormalizedBrowserBuilderSchema;
     const root = this.context.workspace.root;
     const projectRoot = resolve(root, builderConfig.root);
     const host = new virtualFs.AliasHost(this.context.host as virtualFs.Host<fs.Stats>);
     const webpackBuilder = new WebpackBuilder({ ...this.context, host });
 
     return of(null).pipe(
+      concatMap(() => normalizeBuilderSchema(
+        host,
+        root,
+        builderConfig,
+      )),
+      tap(normalizedOptions => options = normalizedOptions),
       concatMap(() => options.deleteOutputPath
         ? this._deleteOutputDir(root, normalize(options.outputPath), this.context.host)
         : of(null)),
-      concatMap(() => normalizeFileReplacements(options.fileReplacements, host, root)),
-      tap(fileReplacements => options.fileReplacements = fileReplacements),
-      concatMap(() => normalizeAssetPatterns(
-        options.assets, host, root, projectRoot, builderConfig.sourceRoot)),
-      // Replace the assets in options with the normalized version.
-      tap((assetPatternObjects => options.assets = assetPatternObjects)),
-      tap(() => {
-        const normalizedOptions = normalizeSourceMaps(options.sourceMap);
-        // todo: remove when removing the deprecations
-        normalizedOptions.vendorSourceMap
-          = normalizedOptions.vendorSourceMap || !!options.vendorSourceMap;
-
-        options = {
-          ...options,
-          ...normalizedOptions,
-          // tslint:disable-next-line:no-any
-          optimization: normalizeOptimization(options.optimization) as any,
-        };
-      }),
       concatMap(() => {
         let webpackConfig;
         try {
-          webpackConfig = this.buildWebpackConfig(root, projectRoot, host,
-            // todo replace with unknown
-            // we need to find a clear way to create this options
-            // tslint:disable-next-line:no-any
-            options as any as NormalizedBrowserBuilderSchema);
+          webpackConfig = this.buildWebpackConfig(root, projectRoot, host, options);
         } catch (e) {
           return throwError(e);
         }
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.d.ts b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
index c9c9d02158b8..79f306045e52 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
@@ -403,3 +403,19 @@ export enum BudgetType {
   AnyScript = 'anyScript',
   Bundle = 'bundle',
 }
+
+// TODO: figure out a better way to normalize assets, extra entry points, file replacements,
+// and whatever else needs to be normalized, while keeping type safety.
+// Right now this normalization has to be done in all other builders that make use of the
+// BrowserBuildSchema and BrowserBuilder.buildWebpackConfig.
+// It would really help if it happens during architect.validateBuilderOptions, or similar.
+export interface NormalizedBrowserBuilderSchema extends
+  Pick<
+  BrowserBuilderSchema,
+  Exclude<keyof BrowserBuilderSchema, 'sourceMap' | 'vendorSourceMap' | 'optimization'>
+  > {
+  sourceMap: NormalizedSourceMaps;
+  assets: AssetPatternObject[];
+  fileReplacements: CurrentFileReplacement[];
+  optimization: NormalizedOptimization;
+}
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index 913c0660c81b..c959f449e059 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -56,7 +56,6 @@
     },
     "optimization": {
       "description": "Enables optimization of the build output.",
-      "default": false,
       "oneOf": [
         {
           "type": "object",
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index 394b2ed1babb..afc4fadc64d5 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -22,14 +22,9 @@ import * as url from 'url';
 import * as webpack from 'webpack';
 import * as WebpackDevServer from 'webpack-dev-server';
 import { checkPort } from '../angular-cli-files/utilities/check-port';
-import { BrowserBuilder, NormalizedBrowserBuilderSchema, getBrowserLoggingCb } from '../browser/';
-import { BrowserBuilderSchema } from '../browser/schema';
-import {
-  normalizeAssetPatterns,
-  normalizeFileReplacements,
-  normalizeOptimization,
-  normalizeSourceMaps,
-} from '../utils';
+import { BrowserBuilder, getBrowserLoggingCb } from '../browser';
+import { BrowserBuilderSchema, NormalizedBrowserBuilderSchema } from '../browser/schema';
+import { normalizeBuilderSchema } from '../utils';
 const opn = require('opn');
 
 
@@ -68,48 +63,28 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
     const projectRoot = resolve(root, builderConfig.root);
     const host = new virtualFs.AliasHost(this.context.host as virtualFs.Host<Stats>);
     const webpackDevServerBuilder = new WebpackDevServerBuilder({ ...this.context, host });
-    let browserOptions: BrowserBuilderSchema;
+    let browserOptions: NormalizedBrowserBuilderSchema;
     let first = true;
     let opnAddress: string;
 
     return checkPort(options.port, options.host).pipe(
       tap((port) => options.port = port),
       concatMap(() => this._getBrowserOptions(options)),
-      tap((opts) => browserOptions = opts),
-      concatMap(() => normalizeFileReplacements(browserOptions.fileReplacements, host, root)),
-      tap(fileReplacements => browserOptions.fileReplacements = fileReplacements),
-      concatMap(() => normalizeAssetPatterns(
-        browserOptions.assets, host, root, projectRoot, builderConfig.sourceRoot)),
-      // Replace the assets in options with the normalized version.
-      tap((assetPatternObjects => browserOptions.assets = assetPatternObjects)),
-      tap(() => {
-        const normalizedOptions = normalizeSourceMaps(browserOptions.sourceMap);
-        // todo: remove when removing the deprecations
-        normalizedOptions.vendorSourceMap
-          = normalizedOptions.vendorSourceMap || !!browserOptions.vendorSourceMap;
-
-        browserOptions = {
-          ...browserOptions,
-          ...normalizedOptions,
-          // tslint:disable-next-line:no-any
-          optimization: normalizeOptimization(options.optimization) as any,
-        };
-      }),
+      concatMap((opts) => normalizeBuilderSchema(
+        host,
+        root,
+        opts,
+      )),
+      tap(normalizedOptions => browserOptions = normalizedOptions),
       concatMap(() => {
-        const webpackConfig = this.buildWebpackConfig(
-          // todo should be unknown
-          // tslint:disable-next-line:no-any
-          root, projectRoot, host, browserOptions as any as NormalizedBrowserBuilderSchema,
-        );
+        const webpackConfig = this.buildWebpackConfig(root, projectRoot, host, browserOptions);
 
         let webpackDevServerConfig: WebpackDevServer.Configuration;
         try {
           webpackDevServerConfig = this._buildServerConfig(
             root,
             options,
-            // todo should be unknown
-            // tslint:disable-next-line:no-any
-            browserOptions as any as NormalizedBrowserBuilderSchema,
+            browserOptions,
           );
         } catch (err) {
           return throwError(err);
@@ -260,7 +235,7 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
 
   private _addLiveReload(
     options: DevServerBuilderOptions,
-    browserOptions: BrowserBuilderSchema,
+    browserOptions: NormalizedBrowserBuilderSchema,
     webpackConfig: any, // tslint:disable-line:no-any
     clientAddress: string,
   ) {
@@ -448,7 +423,6 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
     return architect.getBuilderDescription(builderConfig).pipe(
       concatMap(browserDescription =>
         architect.validateBuilderOptions(builderConfig, browserDescription)),
-      map(browserConfig => browserConfig.options),
     );
   }
 }
diff --git a/packages/angular_devkit/build_angular/src/dev-server/schema.json b/packages/angular_devkit/build_angular/src/dev-server/schema.json
index d4e59a1ea066..7e61aa80a083 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/schema.json
+++ b/packages/angular_devkit/build_angular/src/dev-server/schema.json
@@ -85,7 +85,6 @@
     },
     "optimization": {
       "description": "Enables optimization of the build output.",
-      "default": false,
       "oneOf": [
         {
           "type": "object",
diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
index 06fdc798ed4b..29ed65b8590f 100644
--- a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
@@ -27,8 +27,7 @@ import {
 } from '../angular-cli-files/models/webpack-configs';
 import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
 import { statsErrorsToString, statsWarningsToString } from '../angular-cli-files/utilities/stats';
-import { NormalizedBrowserBuilderSchema } from '../browser';
-import { BrowserBuilderSchema } from '../browser/schema';
+import { BrowserBuilderSchema, NormalizedBrowserBuilderSchema } from '../browser/schema';
 const webpackMerge = require('webpack-merge');
 
 
@@ -88,7 +87,10 @@ export class ExtractI18nBuilder implements Builder<ExtractI18nBuilderOptions> {
         const webpackConfig = this.buildWebpackConfig(root, projectRoot, {
           // todo: remove this casting when 'CurrentFileReplacement' is changed to 'FileReplacement'
           ...(browserOptions as NormalizedBrowserBuilderSchema),
-          optimization: false,
+          optimization: {
+            scripts: false,
+            styles: false,
+          },
           i18nLocale: options.i18nLocale,
           i18nFormat: options.i18nFormat,
           i18nFile: outFile,
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index 431506ed59ec..d144d4d1e9f1 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -27,48 +27,27 @@ import {
 import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
 import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
 import { AssetPatternObject, CurrentFileReplacement } from '../browser/schema';
-import {
-  defaultProgress,
-  normalizeAssetPatterns,
-  normalizeFileReplacements,
-  normalizeSourceMaps,
-} from '../utils';
-import { KarmaBuilderSchema } from './schema';
+import { NormalizedSourceMaps, defaultProgress, normalizeBuilderSchema } from '../utils';
+import { KarmaBuilderSchema, NormalizedKarmaBuilderSchema } from './schema';
 const webpackMerge = require('webpack-merge');
 
 
-export interface NormalizedKarmaBuilderSchema extends KarmaBuilderSchema {
-  assets: AssetPatternObject[];
-  fileReplacements: CurrentFileReplacement[];
-}
-
 export class KarmaBuilder implements Builder<KarmaBuilderSchema> {
   constructor(public context: BuilderContext) { }
 
   run(builderConfig: BuilderConfiguration<KarmaBuilderSchema>): Observable<BuildEvent> {
-    let options = builderConfig.options;
+    let options: NormalizedKarmaBuilderSchema;
     const root = this.context.workspace.root;
     const projectRoot = resolve(root, builderConfig.root);
     const host = new virtualFs.AliasHost(this.context.host as virtualFs.Host<fs.Stats>);
 
     return of(null).pipe(
-      concatMap(() => normalizeFileReplacements(options.fileReplacements, host, root)),
-      tap(fileReplacements => options.fileReplacements = fileReplacements),
-      concatMap(() => normalizeAssetPatterns(
-        options.assets, host, root, projectRoot, builderConfig.sourceRoot)),
-      // Replace the assets in options with the normalized version.
-      tap((assetPatternObjects => options.assets = assetPatternObjects)),
-      tap(() => {
-        const normalizedOptions = normalizeSourceMaps(options.sourceMap);
-        // todo: remove when removing the deprecations
-        normalizedOptions.vendorSourceMap
-          = normalizedOptions.vendorSourceMap || !!options.vendorSourceMap;
-
-        options = {
-          ...options,
-          ...normalizedOptions,
-        };
-      }),
+      concatMap((opts) => normalizeBuilderSchema(
+        host,
+        root,
+        builderConfig,
+      )),
+      tap(normalizedOptions => options = normalizedOptions),
       concatMap(() => new Observable(obs => {
         const karma = requireProjectModule(getSystemPath(projectRoot), 'karma');
         const karmaConfig = getSystemPath(resolve(root, normalize(options.karmaConfig)));
@@ -103,9 +82,8 @@ export class KarmaBuilder implements Builder<KarmaBuilderSchema> {
         karmaOptions.buildWebpack = {
           root: getSystemPath(root),
           projectRoot: getSystemPath(projectRoot),
-          options: options as NormalizedKarmaBuilderSchema,
-          webpackConfig: this.buildWebpackConfig(root, projectRoot, sourceRoot, host,
-            options as NormalizedKarmaBuilderSchema),
+          options,
+          webpackConfig: this.buildWebpackConfig(root, projectRoot, sourceRoot, host, options),
           // Pass onto Karma to emit BuildEvents.
           successCb: () => obs.next({ success: true }),
           failureCb: () => obs.next({ success: false }),
diff --git a/packages/angular_devkit/build_angular/src/karma/schema.d.ts b/packages/angular_devkit/build_angular/src/karma/schema.d.ts
index 632e6a55a5c4..f2fbc1ca9342 100644
--- a/packages/angular_devkit/build_angular/src/karma/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/karma/schema.d.ts
@@ -52,3 +52,13 @@ export interface KarmaSourceMapObject {
   /** Output sourcemaps for all styles. */
   styles?: boolean;
 }
+
+
+export interface NormalizedKarmaBuilderSchema extends Pick<
+  KarmaBuilderSchema,
+  Exclude<keyof KarmaBuilderSchema, 'sourceMap' | 'vendorSourceMap'>
+  > {
+  assets: AssetPatternObject[];
+  fileReplacements: CurrentFileReplacement[];
+  sourceMap: NormalizedSourceMaps;
+}
diff --git a/packages/angular_devkit/build_angular/src/server/index.ts b/packages/angular_devkit/build_angular/src/server/index.ts
index 8bcbfa7c1e1f..4f3a221545f4 100644
--- a/packages/angular_devkit/build_angular/src/server/index.ts
+++ b/packages/angular_devkit/build_angular/src/server/index.ts
@@ -30,13 +30,14 @@ import {
 import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
 import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
 import { getBrowserLoggingCb } from '../browser';
+import { CurrentFileReplacement } from '../browser/schema';
 import {
+  NormalizedOptimization,
+  NormalizedSourceMaps,
   defaultProgress,
-  normalizeFileReplacements,
-  normalizeOptimization,
-  normalizeSourceMaps,
+  normalizeBuilderSchema,
 } from '../utils';
-import { BuildWebpackServerSchema } from './schema';
+import { BuildWebpackServerSchema, NormalizedServerBuilderServerSchema } from './schema';
 const webpackMerge = require('webpack-merge');
 
 
@@ -45,7 +46,7 @@ export class ServerBuilder implements Builder<BuildWebpackServerSchema> {
   constructor(public context: BuilderContext) { }
 
   run(builderConfig: BuilderConfiguration<BuildWebpackServerSchema>): Observable<BuildEvent> {
-    let options = builderConfig.options;
+    let options: NormalizedServerBuilderServerSchema;
     const root = this.context.workspace.root;
     const projectRoot = resolve(root, builderConfig.root);
     const host = new virtualFs.AliasHost(this.context.host as virtualFs.Host<Stats>);
@@ -53,24 +54,15 @@ export class ServerBuilder implements Builder<BuildWebpackServerSchema> {
 
     // TODO: verify using of(null) to kickstart things is a pattern.
     return of(null).pipe(
+      concatMap(() => normalizeBuilderSchema(
+        host,
+        root,
+        builderConfig,
+      )),
+      tap(normalizedOptions => options = normalizedOptions),
       concatMap(() => options.deleteOutputPath
         ? this._deleteOutputDir(root, normalize(options.outputPath), this.context.host)
         : of(null)),
-      concatMap(() => normalizeFileReplacements(options.fileReplacements, host, root)),
-      tap(fileReplacements => options.fileReplacements = fileReplacements),
-      tap(() => {
-        const normalizedOptions = normalizeSourceMaps(options.sourceMap);
-        // todo: remove when removing the deprecations
-        normalizedOptions.vendorSourceMap
-          = normalizedOptions.vendorSourceMap || !!options.vendorSourceMap;
-
-        options = {
-          ...options,
-          ...normalizedOptions,
-          // tslint:disable-next-line:no-any
-          optimization: normalizeOptimization(options.optimization || {}) as any,
-        };
-      }),
       concatMap(() => {
         const webpackConfig = this.buildWebpackConfig(root, projectRoot, host, options);
 
@@ -81,7 +73,7 @@ export class ServerBuilder implements Builder<BuildWebpackServerSchema> {
 
   buildWebpackConfig(root: Path, projectRoot: Path,
                      host: virtualFs.Host<Stats>,
-                     options: BuildWebpackServerSchema) {
+                     options: NormalizedServerBuilderServerSchema) {
     let wco: WebpackConfigOptions;
 
     // TODO: make target defaults into configurations instead
diff --git a/packages/angular_devkit/build_angular/src/server/schema.d.ts b/packages/angular_devkit/build_angular/src/server/schema.d.ts
index 383c7c8f36b2..faadc64667df 100644
--- a/packages/angular_devkit/build_angular/src/server/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/server/schema.d.ts
@@ -173,3 +173,12 @@ export interface StylePreprocessorOptions {
    */
   includePaths?: string[];
 }
+
+export interface NormalizedServerBuilderServerSchema extends Pick<
+  BuildWebpackServerSchema,
+  Exclude<keyof BuildWebpackServerSchema, 'sourceMap' | 'optimization'>
+  > {
+  fileReplacements: CurrentFileReplacement[];
+  sourceMap: NormalizedSourceMaps;
+  optimization: NormalizedOptimization;
+}
diff --git a/packages/angular_devkit/build_angular/src/server/schema.json b/packages/angular_devkit/build_angular/src/server/schema.json
index 8a502c583754..705c8f0c8948 100644
--- a/packages/angular_devkit/build_angular/src/server/schema.json
+++ b/packages/angular_devkit/build_angular/src/server/schema.json
@@ -29,7 +29,6 @@
     },
     "optimization": {
       "description": "Enables optimization of the build output.",
-      "default": false,
       "oneOf": [
         {
           "type": "object",
diff --git a/packages/angular_devkit/build_angular/src/utils/index.ts b/packages/angular_devkit/build_angular/src/utils/index.ts
index 190ca556a3ae..6271764c6862 100644
--- a/packages/angular_devkit/build_angular/src/utils/index.ts
+++ b/packages/angular_devkit/build_angular/src/utils/index.ts
@@ -12,3 +12,4 @@ export * from './normalize-file-replacements';
 export * from './normalize-asset-patterns';
 export * from './normalize-source-maps';
 export * from './normalize-optimization';
+export * from './normalize-builder-schema';
diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-builder-schema.ts b/packages/angular_devkit/build_angular/src/utils/normalize-builder-schema.ts
new file mode 100644
index 000000000000..5080cb5c400b
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/utils/normalize-builder-schema.ts
@@ -0,0 +1,85 @@
+
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+
+import { BuilderConfiguration } from '@angular-devkit/architect';
+import { Path, resolve, virtualFs } from '@angular-devkit/core';
+import { Observable, combineLatest, of } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { BrowserBuilderSchema, NormalizedBrowserBuilderSchema } from '../browser/schema';
+import { KarmaBuilderSchema, NormalizedKarmaBuilderSchema } from '../karma/schema';
+import { BuildWebpackServerSchema, NormalizedServerBuilderServerSchema } from '../server/schema';
+import { normalizeAssetPatterns } from './normalize-asset-patterns';
+import { normalizeFileReplacements } from './normalize-file-replacements';
+import { normalizeOptimization } from './normalize-optimization';
+import { normalizeSourceMaps } from './normalize-source-maps';
+
+export function normalizeBuilderSchema<BuilderConfigurationT extends
+    BuilderConfiguration<BrowserBuilderSchema | BuildWebpackServerSchema | KarmaBuilderSchema>,
+    OptionsT = BuilderConfigurationT['options']>(
+        host: virtualFs.Host<{}>,
+        root: Path,
+        builderConfig: BuilderConfigurationT,
+): Observable<
+OptionsT extends BrowserBuilderSchema ? NormalizedBrowserBuilderSchema :
+OptionsT extends BuildWebpackServerSchema ? NormalizedServerBuilderServerSchema :
+// todo should be unknown
+// tslint:disable-next-line:no-any
+OptionsT extends KarmaBuilderSchema ? NormalizedKarmaBuilderSchema : any> {
+    const { options } = builderConfig;
+    const projectRoot = resolve(root, builderConfig.root);
+
+    // todo: this should be unknown
+    // tslint:disable-next-line:no-any
+    const isKarmaBuilderSchema = (options: any): options is KarmaBuilderSchema =>
+        !options.hasOwnProperty('optimization');
+
+    // todo: this should be unknown
+    // tslint:disable-next-line:no-any
+    const isBuildWebpackServerSchema = (options: any): options is BuildWebpackServerSchema =>
+        !options.hasOwnProperty('assets');
+
+    return combineLatest(
+        isBuildWebpackServerSchema(options)
+            ? of(null)
+            : normalizeAssetPatterns(
+                options.assets,
+                host,
+                root,
+                projectRoot,
+                builderConfig.sourceRoot,
+            ),
+        normalizeFileReplacements(options.fileReplacements, host, root),
+    ).pipe(
+        map(([assetPatternObjects, fileReplacements]) => {
+            const normalizedSourceMapOptions = normalizeSourceMaps(options.sourceMap);
+            // todo: remove when removing the deprecations
+            normalizedSourceMapOptions.vendor
+                = normalizedSourceMapOptions.vendor || !!options.vendorSourceMap;
+
+            const optimization = isKarmaBuilderSchema(options)
+                ? {}
+                : options.optimization || {};
+
+            const assets = isBuildWebpackServerSchema(options)
+                ? {}
+                : { assets: assetPatternObjects };
+
+            return {
+                // todo remove any casing when using typescript 3.2
+                // tslint:disable-next-line:no-any
+                ...options as any,
+                ...assets,
+                fileReplacements,
+                optimization: normalizeOptimization(optimization),
+                sourceMap: normalizeSourceMaps(options.sourceMap),
+            };
+        }),
+    );
+}
diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-source-maps.ts b/packages/angular_devkit/build_angular/src/utils/normalize-source-maps.ts
index 41392886b8b8..69d403219792 100644
--- a/packages/angular_devkit/build_angular/src/utils/normalize-source-maps.ts
+++ b/packages/angular_devkit/build_angular/src/utils/normalize-source-maps.ts
@@ -9,24 +9,22 @@
 import { SourceMapOptions } from '../browser/schema';
 
 export interface NormalizedSourceMaps {
-  sourceMap: boolean;
-  scriptsSourceMap: boolean;
-  stylesSourceMap: boolean;
-  hiddenSourceMap: boolean;
-  vendorSourceMap: boolean;
+  scripts: boolean;
+  styles: boolean;
+  hidden: boolean;
+  vendor: boolean;
 }
 
 export function normalizeSourceMaps(sourceMap: SourceMapOptions): NormalizedSourceMaps {
-  const scriptsSourceMap = !!(typeof sourceMap === 'object' ? sourceMap.scripts : sourceMap);
-  const stylesSourceMap = !!(typeof sourceMap === 'object' ? sourceMap.styles : sourceMap);
-  const hiddenSourceMap = typeof sourceMap === 'object' && !!sourceMap.hidden;
-  const vendorSourceMap = typeof sourceMap === 'object' && !!sourceMap.vendor;
+  const scripts = !!(typeof sourceMap === 'object' ? sourceMap.scripts : sourceMap);
+  const styles = !!(typeof sourceMap === 'object' ? sourceMap.styles : sourceMap);
+  const hidden = typeof sourceMap === 'object' && !!sourceMap.hidden;
+  const vendor = typeof sourceMap === 'object' && !!sourceMap.vendor;
 
   return {
-    sourceMap: stylesSourceMap || scriptsSourceMap,
-    vendorSourceMap,
-    hiddenSourceMap,
-    scriptsSourceMap,
-    stylesSourceMap,
+    vendor,
+    hidden,
+    scripts,
+    styles,
   };
 }

From 6b65e4cbc32520a22b5b575ff48eedbedd4a12a7 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 6 Dec 2018 09:03:53 +0100
Subject: [PATCH 0493/1703] feat(@angular/cli): update optimization options

---
 packages/angular/cli/lib/config/schema.json | 70 +++++++++++++++++++--
 1 file changed, 64 insertions(+), 6 deletions(-)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index 3fc2e39275bd..8a313ea14553 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -607,9 +607,28 @@
               "additionalProperties": false
             },
             "optimization": {
-              "type": "boolean",
               "description": "Enables optimization of the build output.",
-              "default": false
+              "oneOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "scripts": {
+                      "type": "boolean",
+                      "description": "Enables optimization of the scripts output.",
+                      "default": true
+                    },
+                    "styles": {
+                      "type": "boolean",
+                      "description": "Enables optimization of the styles output.",
+                      "default": true
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "boolean"
+                }
+              ]
             },
             "fileReplacements": {
               "description": "Replace files with other files in the build.",
@@ -1067,8 +1086,28 @@
               "default": true
             },
             "optimization": {
-              "type": "boolean",
-              "description": "Enables optimization of the build output."
+              "description": "Enables optimization of the build output.",
+              "oneOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "scripts": {
+                      "type": "boolean",
+                      "description": "Enables optimization of the scripts output.",
+                      "default": true
+                    },
+                    "styles": {
+                      "type": "boolean",
+                      "description": "Enables optimization of the styles output.",
+                      "default": true
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "boolean"
+                }
+              ]
             },
             "aot": {
               "type": "boolean",
@@ -1515,9 +1554,28 @@
               "additionalProperties": false
             },
             "optimization": {
-              "type": "boolean",
               "description": "Enables optimization of the build output.",
-              "default": false
+              "oneOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "scripts": {
+                      "type": "boolean",
+                      "description": "Enables optimization of the scripts output.",
+                      "default": true
+                    },
+                    "styles": {
+                      "type": "boolean",
+                      "description": "Enables optimization of the styles output.",
+                      "default": true
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "type": "boolean"
+                }
+              ]
             },
             "fileReplacements": {
               "description": "Replace files with other files in the build.",

From eaad125da9e50e0cacdeb42f2daa5c643fcc7629 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 6 Dec 2018 09:26:09 +0100
Subject: [PATCH 0494/1703] refactor: normalizeFileReplacements and
 normalizeAssetPatterns no longer use rxjs

---
 .../build_angular/src/browser/index.ts        | 27 +++-----
 .../build_angular/src/dev-server/index.ts     |  5 +-
 .../build_angular/src/karma/index.ts          | 18 +++--
 .../build_angular/src/server/index.ts         | 23 +++----
 .../src/utils/normalize-asset-patterns.ts     | 64 ++++++++----------
 .../src/utils/normalize-builder-schema.ts     | 66 ++++++++-----------
 .../src/utils/normalize-file-replacements.ts  | 36 +++++-----
 7 files changed, 99 insertions(+), 140 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 4de602cd1f75..f22674d5ebbe 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -34,18 +34,8 @@ import {
   statsToString,
   statsWarningsToString,
 } from '../angular-cli-files/utilities/stats';
-import {
-  NormalizedOptimization,
-  NormalizedSourceMaps,
-  defaultProgress,
-  normalizeBuilderSchema,
-} from '../utils';
-import {
-  AssetPatternObject,
-  BrowserBuilderSchema,
-  CurrentFileReplacement,
-  NormalizedBrowserBuilderSchema,
-} from './schema';
+import { defaultProgress, normalizeBuilderSchema } from '../utils';
+import { BrowserBuilderSchema, NormalizedBrowserBuilderSchema } from './schema';
 const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');
 const webpackMerge = require('webpack-merge');
 
@@ -54,19 +44,18 @@ export class BrowserBuilder implements Builder<BrowserBuilderSchema> {
   constructor(public context: BuilderContext) { }
 
   run(builderConfig: BuilderConfiguration<BrowserBuilderSchema>): Observable<BuildEvent> {
-    let options: NormalizedBrowserBuilderSchema;
     const root = this.context.workspace.root;
     const projectRoot = resolve(root, builderConfig.root);
     const host = new virtualFs.AliasHost(this.context.host as virtualFs.Host<fs.Stats>);
     const webpackBuilder = new WebpackBuilder({ ...this.context, host });
 
+    const options = normalizeBuilderSchema(
+      host,
+      root,
+      builderConfig,
+    );
+
     return of(null).pipe(
-      concatMap(() => normalizeBuilderSchema(
-        host,
-        root,
-        builderConfig,
-      )),
-      tap(normalizedOptions => options = normalizedOptions),
       concatMap(() => options.deleteOutputPath
         ? this._deleteOutputDir(root, normalize(options.outputPath), this.context.host)
         : of(null)),
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index afc4fadc64d5..62485375f8ab 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -70,12 +70,11 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
     return checkPort(options.port, options.host).pipe(
       tap((port) => options.port = port),
       concatMap(() => this._getBrowserOptions(options)),
-      concatMap((opts) => normalizeBuilderSchema(
+      tap(opts => browserOptions = normalizeBuilderSchema(
         host,
         root,
         opts,
       )),
-      tap(normalizedOptions => browserOptions = normalizedOptions),
       concatMap(() => {
         const webpackConfig = this.buildWebpackConfig(root, projectRoot, host, browserOptions);
 
@@ -162,7 +161,7 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
 
         return buildEvent;
       }),
-     // using more than 10 operators will cause rxjs to loose the types
+      // using more than 10 operators will cause rxjs to loose the types
     ) as Observable<BuildEvent>;
   }
 
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index d144d4d1e9f1..fcb2a5881101 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -15,7 +15,7 @@ import {
 import { Path, getSystemPath, normalize, resolve, virtualFs } from '@angular-devkit/core';
 import * as fs from 'fs';
 import { Observable, of } from 'rxjs';
-import { concatMap, tap } from 'rxjs/operators';
+import { concatMap } from 'rxjs/operators';
 import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
 import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
 import {
@@ -26,8 +26,7 @@ import {
 } from '../angular-cli-files/models/webpack-configs';
 import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
 import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
-import { AssetPatternObject, CurrentFileReplacement } from '../browser/schema';
-import { NormalizedSourceMaps, defaultProgress, normalizeBuilderSchema } from '../utils';
+import { defaultProgress, normalizeBuilderSchema } from '../utils';
 import { KarmaBuilderSchema, NormalizedKarmaBuilderSchema } from './schema';
 const webpackMerge = require('webpack-merge');
 
@@ -36,18 +35,17 @@ export class KarmaBuilder implements Builder<KarmaBuilderSchema> {
   constructor(public context: BuilderContext) { }
 
   run(builderConfig: BuilderConfiguration<KarmaBuilderSchema>): Observable<BuildEvent> {
-    let options: NormalizedKarmaBuilderSchema;
     const root = this.context.workspace.root;
     const projectRoot = resolve(root, builderConfig.root);
     const host = new virtualFs.AliasHost(this.context.host as virtualFs.Host<fs.Stats>);
 
+    const options = normalizeBuilderSchema(
+      host,
+      root,
+      builderConfig,
+    );
+
     return of(null).pipe(
-      concatMap((opts) => normalizeBuilderSchema(
-        host,
-        root,
-        builderConfig,
-      )),
-      tap(normalizedOptions => options = normalizedOptions),
       concatMap(() => new Observable(obs => {
         const karma = requireProjectModule(getSystemPath(projectRoot), 'karma');
         const karmaConfig = getSystemPath(resolve(root, normalize(options.karmaConfig)));
diff --git a/packages/angular_devkit/build_angular/src/server/index.ts b/packages/angular_devkit/build_angular/src/server/index.ts
index 4f3a221545f4..0443c7020c51 100644
--- a/packages/angular_devkit/build_angular/src/server/index.ts
+++ b/packages/angular_devkit/build_angular/src/server/index.ts
@@ -16,7 +16,7 @@ import { WebpackBuilder } from '@angular-devkit/build-webpack';
 import { Path, getSystemPath, normalize, resolve, virtualFs } from '@angular-devkit/core';
 import { Stats } from 'fs';
 import { Observable, concat, of } from 'rxjs';
-import { concatMap, last, tap } from 'rxjs/operators';
+import { concatMap, last } from 'rxjs/operators';
 import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
 import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
 import {
@@ -30,13 +30,7 @@ import {
 import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
 import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
 import { getBrowserLoggingCb } from '../browser';
-import { CurrentFileReplacement } from '../browser/schema';
-import {
-  NormalizedOptimization,
-  NormalizedSourceMaps,
-  defaultProgress,
-  normalizeBuilderSchema,
-} from '../utils';
+import { defaultProgress, normalizeBuilderSchema } from '../utils';
 import { BuildWebpackServerSchema, NormalizedServerBuilderServerSchema } from './schema';
 const webpackMerge = require('webpack-merge');
 
@@ -46,20 +40,19 @@ export class ServerBuilder implements Builder<BuildWebpackServerSchema> {
   constructor(public context: BuilderContext) { }
 
   run(builderConfig: BuilderConfiguration<BuildWebpackServerSchema>): Observable<BuildEvent> {
-    let options: NormalizedServerBuilderServerSchema;
     const root = this.context.workspace.root;
     const projectRoot = resolve(root, builderConfig.root);
     const host = new virtualFs.AliasHost(this.context.host as virtualFs.Host<Stats>);
     const webpackBuilder = new WebpackBuilder({ ...this.context, host });
 
+    const options = normalizeBuilderSchema(
+      host,
+      root,
+      builderConfig,
+    );
+
     // TODO: verify using of(null) to kickstart things is a pattern.
     return of(null).pipe(
-      concatMap(() => normalizeBuilderSchema(
-        host,
-        root,
-        builderConfig,
-      )),
-      tap(normalizedOptions => options = normalizedOptions),
       concatMap(() => options.deleteOutputPath
         ? this._deleteOutputDir(root, normalize(options.outputPath), this.context.host)
         : of(null)),
diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-asset-patterns.ts b/packages/angular_devkit/build_angular/src/utils/normalize-asset-patterns.ts
index faf66dac430f..0945b99b8758 100644
--- a/packages/angular_devkit/build_angular/src/utils/normalize-asset-patterns.ts
+++ b/packages/angular_devkit/build_angular/src/utils/normalize-asset-patterns.ts
@@ -16,8 +16,6 @@ import {
   resolve,
   virtualFs,
 } from '@angular-devkit/core';
-import { Observable, forkJoin, of } from 'rxjs';
-import { catchError, map } from 'rxjs/operators';
 import { AssetPattern, AssetPatternObject } from '../browser/schema';
 
 
@@ -29,23 +27,20 @@ export class MissingAssetSourceRootException extends BaseException {
 
 export function normalizeAssetPatterns(
   assetPatterns: AssetPattern[],
-  host: virtualFs.Host,
+  host: virtualFs.SyncDelegateHost,
   root: Path,
   projectRoot: Path,
   maybeSourceRoot: Path | undefined,
-): Observable<AssetPatternObject[]> {
+): AssetPatternObject[] {
   // When sourceRoot is not available, we default to ${projectRoot}/src.
   const sourceRoot = maybeSourceRoot || join(projectRoot, 'src');
   const resolvedSourceRoot = resolve(root, sourceRoot);
 
   if (assetPatterns.length === 0) {
-    // If there are no asset patterns, return an empty array.
-    // It's important to do this because forkJoin with an empty array will immediately complete
-    // the observable.
-    return of([]);
+    return [];
   }
 
-  const assetPatternObjectObservables: Observable<AssetPatternObject>[] = assetPatterns
+  return assetPatterns
     .map(assetPattern => {
       // Normalize string asset patterns to objects.
       if (typeof assetPattern === 'string') {
@@ -57,36 +52,35 @@ export function normalizeAssetPatterns(
           throw new MissingAssetSourceRootException(assetPattern);
         }
 
-        return host.isDirectory(resolvedAssetPath).pipe(
-          // If the path doesn't exist at all, pretend it is a directory.
-          catchError(() => of(true)),
-          map(isDirectory => {
-            let glob: string, input: Path, output: Path;
-            if (isDirectory) {
-              // Folders get a recursive star glob.
-              glob = '**/*';
-              // Input directory is their original path.
-              input = assetPath;
-            } else {
-              // Files are their own glob.
-              glob = basename(assetPath);
-              // Input directory is their original dirname.
-              input = dirname(assetPath);
-            }
+        let glob: string, input: Path, output: Path;
+        let isDirectory = false;
 
-            // Output directory for both is the relative path from source root to input.
-            output = relative(resolvedSourceRoot, resolve(root, input));
+        try {
+          isDirectory = host.isDirectory(resolvedAssetPath);
+        } catch {
+          isDirectory = true;
+        }
+
+        if (isDirectory) {
+          // Folders get a recursive star glob.
+          glob = '**/*';
+          // Input directory is their original path.
+          input = assetPath;
+        } else {
+          // Files are their own glob.
+          glob = basename(assetPath);
+          // Input directory is their original dirname.
+          input = dirname(assetPath);
+        }
 
-            // Return the asset pattern in object format.
-            return { glob, input, output };
-          }),
-        );
+        // Output directory for both is the relative path from source root to input.
+        output = relative(resolvedSourceRoot, resolve(root, input));
+
+        // Return the asset pattern in object format.
+        return { glob, input, output };
       } else {
         // It's already an AssetPatternObject, no need to convert.
-        return of(assetPattern);
+        return assetPattern;
       }
     });
-
-  // Wait for all the asset patterns and return them as an array.
-  return forkJoin(assetPatternObjectObservables);
 }
diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-builder-schema.ts b/packages/angular_devkit/build_angular/src/utils/normalize-builder-schema.ts
index 5080cb5c400b..2a7617d489f0 100644
--- a/packages/angular_devkit/build_angular/src/utils/normalize-builder-schema.ts
+++ b/packages/angular_devkit/build_angular/src/utils/normalize-builder-schema.ts
@@ -10,8 +10,6 @@
 
 import { BuilderConfiguration } from '@angular-devkit/architect';
 import { Path, resolve, virtualFs } from '@angular-devkit/core';
-import { Observable, combineLatest, of } from 'rxjs';
-import { map } from 'rxjs/operators';
 import { BrowserBuilderSchema, NormalizedBrowserBuilderSchema } from '../browser/schema';
 import { KarmaBuilderSchema, NormalizedKarmaBuilderSchema } from '../karma/schema';
 import { BuildWebpackServerSchema, NormalizedServerBuilderServerSchema } from '../server/schema';
@@ -26,14 +24,15 @@ export function normalizeBuilderSchema<BuilderConfigurationT extends
         host: virtualFs.Host<{}>,
         root: Path,
         builderConfig: BuilderConfigurationT,
-): Observable<
-OptionsT extends BrowserBuilderSchema ? NormalizedBrowserBuilderSchema :
-OptionsT extends BuildWebpackServerSchema ? NormalizedServerBuilderServerSchema :
-// todo should be unknown
-// tslint:disable-next-line:no-any
-OptionsT extends KarmaBuilderSchema ? NormalizedKarmaBuilderSchema : any> {
+):
+    OptionsT extends BrowserBuilderSchema ? NormalizedBrowserBuilderSchema :
+    OptionsT extends BuildWebpackServerSchema ? NormalizedServerBuilderServerSchema :
+    // todo should be unknown
+    // tslint:disable-next-line:no-any
+    OptionsT extends KarmaBuilderSchema ? NormalizedKarmaBuilderSchema : any {
     const { options } = builderConfig;
     const projectRoot = resolve(root, builderConfig.root);
+    const syncHost = new virtualFs.SyncDelegateHost(host);
 
     // todo: this should be unknown
     // tslint:disable-next-line:no-any
@@ -45,41 +44,34 @@ OptionsT extends KarmaBuilderSchema ? NormalizedKarmaBuilderSchema : any> {
     const isBuildWebpackServerSchema = (options: any): options is BuildWebpackServerSchema =>
         !options.hasOwnProperty('assets');
 
-    return combineLatest(
-        isBuildWebpackServerSchema(options)
-            ? of(null)
-            : normalizeAssetPatterns(
+    const assets = isBuildWebpackServerSchema(options)
+        ? {}
+        : {
+            assets: normalizeAssetPatterns(
                 options.assets,
-                host,
+                syncHost,
                 root,
                 projectRoot,
                 builderConfig.sourceRoot,
             ),
-        normalizeFileReplacements(options.fileReplacements, host, root),
-    ).pipe(
-        map(([assetPatternObjects, fileReplacements]) => {
-            const normalizedSourceMapOptions = normalizeSourceMaps(options.sourceMap);
-            // todo: remove when removing the deprecations
-            normalizedSourceMapOptions.vendor
-                = normalizedSourceMapOptions.vendor || !!options.vendorSourceMap;
+        };
 
-            const optimization = isKarmaBuilderSchema(options)
-                ? {}
-                : options.optimization || {};
+    const normalizedSourceMapOptions = normalizeSourceMaps(options.sourceMap);
+    // todo: remove when removing the deprecations
+    normalizedSourceMapOptions.vendor
+        = normalizedSourceMapOptions.vendor || !!options.vendorSourceMap;
 
-            const assets = isBuildWebpackServerSchema(options)
-                ? {}
-                : { assets: assetPatternObjects };
+    const optimization = isKarmaBuilderSchema(options)
+        ? {}
+        : options.optimization || {};
 
-            return {
-                // todo remove any casing when using typescript 3.2
-                // tslint:disable-next-line:no-any
-                ...options as any,
-                ...assets,
-                fileReplacements,
-                optimization: normalizeOptimization(optimization),
-                sourceMap: normalizeSourceMaps(options.sourceMap),
-            };
-        }),
-    );
+    return {
+        // todo remove any casing when using typescript 3.2
+        // tslint:disable-next-line:no-any
+        ...options as any,
+        ...assets,
+        fileReplacements: normalizeFileReplacements(options.fileReplacements, syncHost, root),
+        optimization: normalizeOptimization(optimization),
+        sourceMap: normalizeSourceMaps(options.sourceMap),
+    };
 }
diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-file-replacements.ts b/packages/angular_devkit/build_angular/src/utils/normalize-file-replacements.ts
index 9345e2aa85d9..0ac5c0d7828a 100644
--- a/packages/angular_devkit/build_angular/src/utils/normalize-file-replacements.ts
+++ b/packages/angular_devkit/build_angular/src/utils/normalize-file-replacements.ts
@@ -14,8 +14,6 @@ import {
   normalize,
   virtualFs,
 } from '@angular-devkit/core';
-import { Observable, from, of } from 'rxjs';
-import { concat, concatMap, ignoreElements, map, mergeMap, tap, toArray } from 'rxjs/operators';
 import {
   CurrentFileReplacement,
   DeprecatedFileReplacment,
@@ -36,31 +34,27 @@ export interface NormalizedFileReplacement {
 
 export function normalizeFileReplacements(
   fileReplacements: FileReplacement[],
-  host: virtualFs.Host,
+  host: virtualFs.SyncDelegateHost,
   root: Path,
-): Observable<NormalizedFileReplacement[]> {
+): NormalizedFileReplacement[] {
   if (fileReplacements.length === 0) {
-    return of([]);
+    return [];
   }
 
-  // Ensure all the replacements exist.
-  const errorOnFalse = (path: Path) => tap((exists: boolean) => {
-    if (!exists) {
-      throw new MissingFileReplacementException(getSystemPath(path));
+  const normalizedReplacement = fileReplacements
+    .map(replacement => normalizeFileReplacement(replacement, root));
+
+  for (const { replace, with: replacementWith } of normalizedReplacement) {
+    if (!host.exists(replacementWith)) {
+      throw new MissingFileReplacementException(getSystemPath(replacementWith));
+    }
+
+    if (!host.exists(replace)) {
+      throw new MissingFileReplacementException(getSystemPath(replace));
     }
-  });
+  }
 
-  return from(fileReplacements).pipe(
-    map(replacement => normalizeFileReplacement(replacement, root)),
-    concatMap(normalized => {
-      return from([normalized.replace, normalized.with]).pipe(
-        mergeMap(path => host.exists(path).pipe(errorOnFalse(path))),
-        ignoreElements(),
-        concat(of(normalized)),
-      );
-    }),
-    toArray(),
-  );
+  return normalizedReplacement;
 }
 
 function normalizeFileReplacement(

From 18ff08dfb38fd926971fe68ab4c85b161ee992b0 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 4 Dec 2018 08:07:44 +0100
Subject: [PATCH 0495/1703] refactor: remove webpack 3 code from cleancss
 plugin

---
 .../plugins/cleancss-webpack-plugin.ts        | 25 +++++--------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/cleancss-webpack-plugin.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/cleancss-webpack-plugin.ts
index 47e48b94a94b..2391ac453aa2 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/cleancss-webpack-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/cleancss-webpack-plugin.ts
@@ -27,25 +27,12 @@ function hook(
   compiler: any,
   action: (compilation: any, chunks: Array<Chunk>) => Promise<void | void[]>,
 ) {
-  if (compiler.hooks) {
-    // Webpack 4
-    compiler.hooks.compilation.tap('cleancss-webpack-plugin', (compilation: any) => {
-      compilation.hooks.optimizeChunkAssets.tapPromise(
-        'cleancss-webpack-plugin',
-        (chunks: Array<Chunk>) => action(compilation, chunks),
-      );
-    });
-  } else {
-    // Webpack 3
-    compiler.plugin('compilation', (compilation: any) => {
-      compilation.plugin(
-        'optimize-chunk-assets',
-        (chunks: Array<Chunk>, callback: (err?: Error) => void) => action(compilation, chunks)
-          .then(() => callback())
-          .catch((err) => callback(err)),
-      );
-    });
-  }
+  compiler.hooks.compilation.tap('cleancss-webpack-plugin', (compilation: any) => {
+    compilation.hooks.optimizeChunkAssets.tapPromise(
+      'cleancss-webpack-plugin',
+      (chunks: Array<Chunk>) => action(compilation, chunks),
+    );
+  });
 }
 
 export class CleanCssWebpackPlugin {

From 43231d950786c91c77b53869542dfc862a8dc18d Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 5 Dec 2018 09:53:52 +0100
Subject: [PATCH 0496/1703] refactor: script webpack plugin remove webpack 3
 code

---
 .../plugins/scripts-webpack-plugin.ts         | 42 ++++---------------
 1 file changed, 9 insertions(+), 33 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/scripts-webpack-plugin.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/scripts-webpack-plugin.ts
index d832a124adf6..51d0c8ed8b2b 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/scripts-webpack-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/scripts-webpack-plugin.ts
@@ -37,35 +37,18 @@ interface ScriptOutput {
 }
 
 function addDependencies(compilation: any, scripts: string[]): void {
-  if (compilation.fileDependencies.add) {
-    // Webpack 4+ uses a Set
-    for (const script of scripts) {
-      compilation.fileDependencies.add(script);
-    }
-  } else {
-    // Webpack 3
-    compilation.fileDependencies.push(...scripts);
+  for (const script of scripts) {
+    compilation.fileDependencies.add(script);
   }
 }
 
 function hook(compiler: any, action: (compilation: any, callback: (err?: Error) => void) => void) {
-  if (compiler.hooks) {
-    // Webpack 4
-    compiler.hooks.thisCompilation.tap('scripts-webpack-plugin', (compilation: any) => {
-      compilation.hooks.additionalAssets.tapAsync(
-        'scripts-webpack-plugin',
-        (callback: (err?: Error) => void) => action(compilation, callback),
-      );
-    });
-  } else {
-    // Webpack 3
-    compiler.plugin('this-compilation', (compilation: any) => {
-      compilation.plugin(
-        'additional-assets',
-        (callback: (err?: Error) => void) => action(compilation, callback),
-      );
-    });
-  }
+  compiler.hooks.thisCompilation.tap('scripts-webpack-plugin', (compilation: any) => {
+    compilation.hooks.additionalAssets.tapAsync(
+      'scripts-webpack-plugin',
+      (callback: (err?: Error) => void) => action(compilation, callback),
+    );
+  });
 }
 
 export class ScriptsWebpackPlugin {
@@ -81,14 +64,7 @@ export class ScriptsWebpackPlugin {
     }
 
     for (let i = 0; i < scripts.length; i++) {
-      let scriptTime;
-      if (compilation.fileTimestamps.get) {
-        // Webpack 4+ uses a Map
-        scriptTime = compilation.fileTimestamps.get(scripts[i]);
-      } else {
-        // Webpack 3
-        scriptTime = compilation.fileTimestamps[scripts[i]];
-      }
+      const scriptTime = compilation.fileTimestamps.get(scripts[i]);
       if (!scriptTime || scriptTime > this._lastBuildTime) {
         this._lastBuildTime = Date.now();
         return false;

From 914f99d75e6c44bd611fac817418132104b8e846 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sat, 1 Dec 2018 08:29:57 +0100
Subject: [PATCH 0497/1703] docs: change link for CLI readme to be relative

---
 README.md                    | 2 +-
 scripts/templates/readme.ejs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4e3a100311d1..865ad2636f26 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@
 ### Development tools and libraries specialized for Angular
 
 This is the home of the DevKit and the Angular CLI code. You can find the Angular CLI specific README
-[here](https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md).
+[here](/packages/angular/cli/README.md).
 
 
 [![CircleCI branch](https://img.shields.io/circleci/project/github/angular/angular-cli/master.svg?label=circleci)](https://circleci.com/gh/angular/angular-cli) [![Dependency Status](https://david-dm.org/angular/angular-cli.svg)](https://david-dm.org/angular/angular-cli) [![devDependency Status](https://david-dm.org/angular/angular-cli/dev-status.svg)](https://david-dm.org/angular/angular-cli?type=dev) 
diff --git a/scripts/templates/readme.ejs b/scripts/templates/readme.ejs
index 5b9da0f58697..a4f1857f6998 100644
--- a/scripts/templates/readme.ejs
+++ b/scripts/templates/readme.ejs
@@ -14,7 +14,7 @@
 ### Development tools and libraries specialized for Angular
 
 This is the home of the DevKit and the Angular CLI code. You can find the Angular CLI specific README
-[here](https://github.com/angular/angular-cli/blob/master/packages/angular/cli/README.md).
+[here](/packages/angular/cli/README.md).
 
 <%# Badges are created here. %>
 <% for (const section of monorepo.badges) {

From 51f4e075db0065fd49a6f30ef6680d7105fd2250 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 3 Dec 2018 14:57:30 +0100
Subject: [PATCH 0498/1703] test: remove debounce as it's causing flakes

---
 .../build_angular/test/browser/allow-js_spec_large.ts          | 3 +--
 .../test/browser/resolve-json-module_spec_large.ts             | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts
index 3e05a104e115..efff75627a83 100644
--- a/packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts
@@ -8,7 +8,7 @@
 
 import { runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, virtualFs } from '@angular-devkit/core';
-import { debounceTime, take, tap } from 'rxjs/operators';
+import { take, tap } from 'rxjs/operators';
 import { browserTargetSpec, host, outputPath } from '../utils';
 
 
@@ -82,7 +82,6 @@ describe('Browser Builder allow js', () => {
 
     let buildCount = 1;
     runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      debounceTime(1000),
       tap(() => {
         const content = virtualFs.fileBufferToString(
           host.scopedSync().read(join(outputPath, 'main.js')),
diff --git a/packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts
index 7e81cfed7116..3c7e8e9a47aa 100644
--- a/packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts
@@ -8,7 +8,7 @@
 
 import { runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, virtualFs } from '@angular-devkit/core';
-import { debounceTime, take, tap } from 'rxjs/operators';
+import { take, tap } from 'rxjs/operators';
 import { browserTargetSpec, host, outputPath } from '../utils';
 
 
@@ -32,7 +32,6 @@ describe('Browser Builder resolve json module', () => {
 
     let buildCount = 1;
     runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      debounceTime(1000),
       tap(() => {
         const content = virtualFs.fileBufferToString(
           host.scopedSync().read(join(outputPath, 'main.js')),

From ea65cc220bedbb40f7d08a6d9c2a73f5c5a0293d Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 4 Dec 2018 21:00:38 -0500
Subject: [PATCH 0499/1703] fix(@ngtools/webpack): avoid checking watchMode in
 environment hook

---
 packages/ngtools/webpack/src/angular_compiler_plugin.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 08a4a046e17f..8d1286937801 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -633,15 +633,12 @@ export class AngularCompilerPlugin {
         }
       }
 
-      // only present for webpack 4.23.0+, assume true otherwise
-      const watchMode = compiler.watchMode === undefined ? true : compiler.watchMode;
-
       // Create the webpack compiler host.
       const webpackCompilerHost = new WebpackCompilerHost(
         this._compilerOptions,
         this._basePath,
         host,
-        watchMode,
+        true,
         this._options.directTemplateLoading,
       );
 

From a613a9759e55e45b3c670ae26a507833ca98ebba Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 5 Dec 2018 07:48:26 +0100
Subject: [PATCH 0500/1703] style: add spacing to error message

---
 packages/angular/cli/lib/init.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/angular/cli/lib/init.ts b/packages/angular/cli/lib/init.ts
index 41fa2f33e81f..be3884b154db 100644
--- a/packages/angular/cli/lib/init.ts
+++ b/packages/angular/cli/lib/init.ts
@@ -50,8 +50,8 @@ if (process.env['NG_CLI_PROFILING']) {
   try {
     profiler = require('v8-profiler-node8'); // tslint:disable-line:no-implicit-dependencies
   } catch (err) {
-    throw new Error(`Could not require 'v8-profiler-node8'. You must install it separetely with` +
-      `'npm install v8-profiler-node8 --no-save.\n\nOriginal error:\n\n${err}`);
+    throw new Error(`Could not require 'v8-profiler-node8'. You must install it separetely with ` +
+      `'npm install v8-profiler-node8 --no-save'.\n\nOriginal error:\n\n${err}`);
   }
 
   profiler.startProfiling();

From 31783140b82a111fcca0cff1af10d3ea6286b4a6 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 6 Dec 2018 09:58:40 +0100
Subject: [PATCH 0501/1703] fix(@angular/cli): show full path to project
 definition when already exists

Fixes #13138
---
 packages/angular/cli/models/command.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/models/command.ts b/packages/angular/cli/models/command.ts
index 50cba31e63f3..8accd58f1f77 100644
--- a/packages/angular/cli/models/command.ts
+++ b/packages/angular/cli/models/command.ts
@@ -8,6 +8,7 @@
 
 // tslint:disable:no-global-tslint-disable no-any
 import { logging, strings, tags, terminal } from '@angular-devkit/core';
+import * as path from 'path';
 import { getWorkspace } from '../utilities/config';
 import {
   Arguments,
@@ -123,7 +124,10 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
         if (this.workspace.configFile) {
           this.logger.fatal(tags.oneLine`
             The ${this.description.name} command requires to be run outside of a project, but a
-            project definition was found at "${this.workspace.configFile}".
+            project definition was found at "${path.join(
+              this.workspace.root,
+              this.workspace.configFile,
+            )}".
           `);
           throw 1;
         }

From 4d02cbc9a3daf286a982f0cb1fe559b338a96d19 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Thu, 6 Dec 2018 13:45:44 -0800
Subject: [PATCH 0502/1703] build: update architect golden API

---
 etc/api/angular_devkit/architect/src/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/etc/api/angular_devkit/architect/src/index.d.ts b/etc/api/angular_devkit/architect/src/index.d.ts
index d20842d03b88..6abeeeb4c133 100644
--- a/etc/api/angular_devkit/architect/src/index.d.ts
+++ b/etc/api/angular_devkit/architect/src/index.d.ts
@@ -37,6 +37,7 @@ export interface BuilderContext {
     architect: Architect;
     host: virtualFs.Host<{}>;
     logger: logging.Logger;
+    targetSpecifier?: TargetSpecifier;
     workspace: experimental.workspace.Workspace;
 }
 

From 15813410111062af0a27b704ea0c41f911b83134 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Thu, 6 Dec 2018 13:48:52 -0800
Subject: [PATCH 0503/1703] release: v7.2.0-beta.1

---
 .monorepo.json |   76 +-
 package.json   |    1 +
 yarn.lock      | 5010 ++----------------------------------------------
 3 files changed, 180 insertions(+), 4907 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index 4120c48a3a8f..ac43db373416 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,16 +42,16 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.12.0-beta.0",
-      "hash": "f828d4a3fa042a7feac4a48c86893375"
+      "version": "0.12.0-beta.1",
+      "hash": "ed6f2ae751fd3db351a20ae55349e8ad"
     },
     "@_/builders": {
-      "version": "0.12.0-beta.0",
-      "hash": "6983d21ece5e42aa536b50adfdceb56c"
+      "version": "0.12.0-beta.1",
+      "hash": "569aef8bc23693c344e71b9755e62c50"
     },
     "devkit": {
-      "version": "0.12.0-beta.0",
-      "hash": "63b06136e183b221639ecd3c4bb81180"
+      "version": "0.12.0-beta.1",
+      "hash": "b8f475958757c03aca252fd75dbaec76"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -62,15 +62,15 @@
           "url": "/packages/angular/cli/README.md"
         }
       ],
-      "version": "7.2.0-beta.0",
+      "version": "7.2.0-beta.1",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "20db216251930978e3c08e7eafa9251d"
+      "hash": "c39ce3c768bdb81c5a6ae0adb3d011e7"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.12.0-beta.0",
-      "hash": "a4b90e0a270fa3e483eecd08375836e2",
+      "version": "0.12.0-beta.1",
+      "hash": "1ed5eefdcc4ff58d2f4c85a4119bf507",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -81,21 +81,21 @@
           "url": "/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.12.0-beta.0",
-      "hash": "2c79c75124816a59009232a8da5ea8ae",
+      "version": "0.12.0-beta.1",
+      "hash": "5b02798914abe02edbbb9635adaee498",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.12.0-beta.0",
-      "hash": "e00c8c0c49f69e70e7ae1e60f2ca3241",
+      "version": "0.12.0-beta.1",
+      "hash": "d2f9b2a0098b3f5f7acb3e2f697d18c9",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
       "name": "Benchmark",
       "section": "Tooling",
-      "version": "1.1.0-beta.0",
-      "hash": "0b7f44ee7d7f759f6e52224594f38bcd"
+      "version": "1.1.0-beta.1",
+      "hash": "c83dcb430abfa6f8da3fe1d2c547266a"
     },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
@@ -105,8 +105,8 @@
           "url": "/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.12.0-beta.0",
-      "hash": "b8747c7c031783bbf838b0c5a2d0f1dd",
+      "version": "0.12.0-beta.1",
+      "hash": "6b14427c17a68496050cac8223d36ef1",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -117,8 +117,8 @@
           "url": "/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.12.0-beta.0",
-      "hash": "02be0dc89a257002de22e35b6f3b118d",
+      "version": "0.12.0-beta.1",
+      "hash": "aae59da1e9bd86d5829ebd102b94f6a8",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -129,8 +129,8 @@
           "url": "/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.12.0-beta.0",
-      "hash": "bd9b03939d8d1e60783654d552154969",
+      "version": "0.12.0-beta.1",
+      "hash": "71cc6d780859973414b1140e734ddc58",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -141,9 +141,9 @@
           "url": "/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.12.0-beta.0",
+      "version": "0.12.0-beta.1",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "c5eba8f9dedcc77e10a79fd3121081ae"
+      "hash": "51e18a98d5903a7d6e128ed980c88563"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -153,8 +153,8 @@
           "url": "/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "7.2.0-beta.0",
-      "hash": "b4a5f918eec70cc3b64869906d9a7ebb",
+      "version": "7.2.0-beta.1",
+      "hash": "6bd16480043b9ee2a0931eb9ce1c694a",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -165,43 +165,43 @@
           "url": "/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "7.2.0-beta.0",
-      "hash": "92c6d749dbd2675232b3719e8b0b1827",
+      "version": "7.2.0-beta.1",
+      "hash": "5ddc5a92a2162e27812f4827b08ddc25",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.12.0-beta.0",
-      "hash": "d1fc4faf9dd840276b46c65b220018ab",
+      "version": "0.12.0-beta.1",
+      "hash": "431bcef3f3d7a8ac8b5658ab4710c962",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "7.2.0-beta.0",
+      "version": "7.2.0-beta.1",
       "section": "Misc",
-      "hash": "acff86ebc3745cfc19daea5447e7a762",
+      "hash": "c5b78bc13f0d27721541cadaf5a41ba3",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "7.2.0-beta.0",
-      "hash": "adc8e6c45dd508c87b8d73742fb09413",
+      "version": "7.2.0-beta.1",
+      "hash": "970471e2e3491aad1792c96bfd19b472",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.12.0-beta.0",
+      "version": "0.12.0-beta.1",
       "section": "Schematics",
-      "hash": "8dcdeb231b23be595038d48c0c6bb00c",
+      "hash": "16627c5f7f50286ae19527683b0b9455",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.12.0-beta.0",
+      "version": "0.12.0-beta.1",
       "section": "Schematics",
-      "hash": "2952b55cd99f9e7362f928d1314f8b57",
+      "hash": "bb2d3299fd9cc43823751b6d12a7df5c",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }
diff --git a/package.json b/package.json
index 27fa9ebcd2a7..0e939f194c2c 100644
--- a/package.json
+++ b/package.json
@@ -75,6 +75,7 @@
   "devDependencies": {
     "@angular/compiler": "^7.1.0",
     "@angular/compiler-cli": "^7.1.0",
+    "@bazel/bazel": "~0.19",
     "@bazel/karma": "^0.20.3",
     "@bazel/typescript": "0.20.3",
     "@ngtools/json-schema": "^1.1.0",
diff --git a/yarn.lock b/yarn.lock
index 4b82b5ec463f..1179326ea537 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,33 +2,9 @@
 # yarn lockfile v1
 
 
-"@angular/animations@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.1.0.tgz#3f03175217a45b72e53310d9ab35e69802ad9555"
-  integrity sha512-1Sje3qptVsTxPP4LwcvVPQun4P156wsEEwwCXoCO3NuP+tS67syU8M69uIpyDbpnx2ZeuWpJ9HfvKe1ljeqcuw==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/cdk@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.1.0.tgz#7e5c3e3631947ef91413a83997ec4edec92cdd1c"
-  integrity sha512-dY740pKcIRtKr6n6NomrgqfdEj988urTZ9I/bfJjxF5fdhnSjyhEvDlB55EHsrF+bTTZbZXRmv7AwOQ9GJnD9w==
-  dependencies:
-    tslib "^1.7.1"
-  optionalDependencies:
-    parse5 "^5.0.0"
-
-"@angular/common@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.1.0.tgz#89b0a34fd8f2a323704369551be4ac7491dda0b7"
-  integrity sha512-tu6Hv3/z3K2NLD4ndBioGtcykhbwhMJYUWb0NvaOLhaVYColWKPFpkflEorDWB+3/IWkpELGhA/HQ2zQh7EVyg==
-  dependencies:
-    tslib "^1.9.0"
-
 "@angular/compiler-cli@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.1.0.tgz#b02b2f94b9510caadc2b16bf1f97aa41d21a3ce2"
-  integrity sha512-Q42B3YmjMNYWTxTWfyDDFa6HSVqwY3rZO5Kp3Q/NKhQ6w/WddduxjARf/OCbtp0bVX3wZNObS6nO4H65rNCtsw==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^1.4.2"
@@ -45,160 +21,32 @@
 "@angular/compiler@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.1.0.tgz#3455eeb575d0b9b68a099b5781d3cce78468146a"
-  integrity sha512-1Hjx6e+lVXZyXFFe4OW34ZpiaGEYyB1MQ7k2C+cMm0ABMQS3LsWT4DYhY7bk0mmMuuXQj66C62MX76ladDtdIg==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/core@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.1.0.tgz#a55fbbc28b2c9da767121f433733683780266eb3"
-  integrity sha512-7mMoWuf8jAf4hcjQ0Exz2w9Qx9SRwNuDdtEZFGWH9dZWz5uPCewrN+Kt9MigMfSYGEdLAPcRMIuvFHDCS8B3Hg==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/http@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.1.0.tgz#9243d6a0fae5b5fd12aa9408e3dbaffad54deb9b"
-  integrity sha512-Je3D374ccxTFGpFu9tXi6k95vTaG+3jYYtEQ7i43CHbaGyHR/KwMEr8DEzrABd1zCSxBX71WwHuReG2wBANfcA==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/material@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/material/-/material-7.1.0.tgz#441f2d03a97a1fa35546b61dcde86db34f0f5efc"
-  integrity sha512-bgotNpSfGLjNZ1AcTyhs6XS7trF4I7UHwQmfa0l8y3Gf9plwErPDfQe2XqnayRyG9nTwHj9f1lQ45X5mr3/0/A==
-  dependencies:
-    tslib "^1.7.1"
-
-"@angular/platform-browser-dynamic@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.1.0.tgz#c7d07f6b1c08fa12c54b4e310da930da613c7e6e"
-  integrity sha512-0yG6e/ZOI9LNUGgSjJ7xUWZhC41z87klO0oEHhEzQeaDxO/SOBasbMiws4ETuhulMgOR81UCAVobXMoOQJbfWg==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/platform-browser@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.1.0.tgz#0d40fed536a08d66ea580f6c4d2976310d559111"
-  integrity sha512-kCrmaNZukWaXk6qlvzyE1Dln/YB2XOGbhb9e+y3NE94beCgDTWseKViMevIoGm/H+Lzf0I2RPg8GMKkQ7pQwNQ==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/platform-server@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.1.0.tgz#d5bfd11981abe7a6cae8788d9c102806a2ae7a2c"
-  integrity sha512-aQk62TT40dS1DtOvmbgVzz2bxB9iDn231AzIfJnsWJCwFqYF6sqwJQTIrdEyHYdSQDl7V+i40nJH6lSYjd3tBA==
-  dependencies:
-    domino "^2.1.0"
-    tslib "^1.9.0"
-    xhr2 "^0.1.4"
-
-"@angular/router@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.1.0.tgz#19b66e127065dfc2106793e81d660790422e73b0"
-  integrity sha512-yrjNvCj7XbXmZSmQfXGEkWJ9ogRZmIk5GHyOfGKNNRXhQK2OBznY0Avyer2r3mcgV/RLrI1FYQyKN9mdLftf6g==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/service-worker@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.1.0.tgz#35f287534febe40e71fc371d1893a5dffe8f5466"
-  integrity sha512-lmeJl8JDvmtDFM7h1gUs8vVsJhMuRKakBIwtQTWEX8TYRh/6fZCObHNjoGGps3BAPrgAbCyxJE2g3rhb/Y4YqA==
   dependencies:
     tslib "^1.9.0"
 
-"@babel/code-frame@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
-  integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
-  dependencies:
-    "@babel/highlight" "^7.0.0"
-
-"@babel/generator@^7.0.0", "@babel/generator@^7.1.3":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.1.3.tgz#2103ec9c42d9bdad9190a6ad5ff2d456fd7b8673"
-  integrity sha512-ZoCZGcfIJFJuZBqxcY9OjC1KW2lWK64qrX1o4UYL3yshVhwKFYgzpWZ0vvtGMNJdTlvkw0W+HR1VnYN8q3QPFQ==
-  dependencies:
-    "@babel/types" "^7.1.3"
-    jsesc "^2.5.1"
-    lodash "^4.17.10"
-    source-map "^0.5.0"
-    trim-right "^1.0.1"
-
-"@babel/helper-function-name@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
-  integrity sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.0.0"
-    "@babel/template" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-get-function-arity@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
-  integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-split-export-declaration@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
-  integrity sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==
-  dependencies:
-    "@babel/types" "^7.0.0"
+"@bazel/bazel-darwin_x64@0.19.1":
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.19.1.tgz#58d779c8938bd1c136cab55e2f6473121f83741b"
 
-"@babel/highlight@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
-  integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
-  dependencies:
-    chalk "^2.0.0"
-    esutils "^2.0.2"
-    js-tokens "^4.0.0"
+"@bazel/bazel-linux_x64@0.19.1":
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.19.1.tgz#aef363e0932d29d1bb48980da139d74bfb4b1ffb"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.2", "@babel/parser@^7.1.3":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.3.tgz#2c92469bac2b7fbff810b67fca07bd138b48af77"
-  integrity sha512-gqmspPZOMW3MIRb9HlrnbZHXI1/KHTOroBwN1NcLL6pWxzqzEKGvRTq0W/PxS45OtQGbaFikSQpkS5zbnsQm2w==
-
-"@babel/template@^7.0.0", "@babel/template@^7.1.0":
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.1.2.tgz#090484a574fef5a2d2d7726a674eceda5c5b5644"
-  integrity sha512-SY1MmplssORfFiLDcOETrW7fCLl+PavlwMh92rrGcikQaRq4iWPVH0MpwPpY3etVMx6RnDjXtr6VZYr/IbP/Ag==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.1.2"
-    "@babel/types" "^7.1.2"
-
-"@babel/traverse@^7.0.0":
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.1.4.tgz#f4f83b93d649b4b2c91121a9087fa2fa949ec2b4"
-  integrity sha512-my9mdrAIGdDiSVBuMjpn/oXYpva0/EZwWL3sm3Wcy/AVWO2eXnsoZruOT9jOGNRXU8KbCIu5zsKnXcAJ6PcV6Q==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.1.3"
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.0.0"
-    "@babel/parser" "^7.1.3"
-    "@babel/types" "^7.1.3"
-    debug "^3.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.10"
+"@bazel/bazel-win32_x64@0.19.1":
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.19.1.tgz#273c43b0febc11675614c402ec82ae44b519f9ee"
 
-"@babel/types@^7.0.0", "@babel/types@^7.1.2", "@babel/types@^7.1.3":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.1.3.tgz#3a767004567060c2f40fca49a304712c525ee37d"
-  integrity sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==
-  dependencies:
-    esutils "^2.0.2"
-    lodash "^4.17.10"
-    to-fast-properties "^2.0.0"
+"@bazel/bazel@~0.19":
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel/-/bazel-0.19.1.tgz#22ce225b5172a4ad2a94496be66b14b7c7facca2"
+  optionalDependencies:
+    "@bazel/bazel-darwin_x64" "0.19.1"
+    "@bazel/bazel-linux_x64" "0.19.1"
+    "@bazel/bazel-win32_x64" "0.19.1"
 
 "@bazel/karma@^0.20.3":
   version "0.20.3"
   resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.20.3.tgz#a63bb82b4887ae8c0d01f3028c6fa4764470851d"
-  integrity sha512-IgWfTpK9XLEI977DS2kHIEO1QfFTEOBxeNDDjHtd1onmzyMCLROphTOBZ/g42ybUIWyJhS9DK4U3bLSMQE0Bng==
   dependencies:
     jasmine-core "2.8.0"
     karma alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a
@@ -214,7 +62,6 @@
 "@bazel/typescript@0.20.3":
   version "0.20.3"
   resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.20.3.tgz#51dcc369c2af0d7f2311d6e692d07776492060f4"
-  integrity sha512-BZmfzaNkgS++53CGEUk5p9FXOG+k8FNWCDbxzYljoIGP60aIkw4UgRQ24ReBwhCMg6M6KW609yje7AvDZkA6bg==
   dependencies:
     protobufjs "5.0.3"
     source-map-support "0.5.9"
@@ -224,17 +71,14 @@
 "@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"
-  integrity sha1-w6DFRNYjkqzCgTpCyKDcb1j4aSI=
 
 "@sindresorhus/is@^0.7.0":
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
-  integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
 
 "@types/body-parser@*":
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.0.tgz#9f5c9d9bd04bb54be32d5eb9fc0d8c974e6cf58c"
-  integrity sha512-a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w==
   dependencies:
     "@types/connect" "*"
     "@types/node" "*"
@@ -242,37 +86,27 @@
 "@types/caseless@*":
   version "0.12.1"
   resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.1.tgz#9794c69c8385d0192acc471a540d1f8e0d16218a"
-  integrity sha512-FhlMa34NHp9K5MY1Uz8yb+ZvuX0pnvn3jScRSNAb75KHGB8d3rEU6hqMs3Z2vjuytcMfRg6c5CHMc3wtYyD2/A==
 
 "@types/connect@*":
   version "3.4.32"
   resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.32.tgz#aa0e9616b9435ccad02bc52b5b454ffc2c70ba28"
-  integrity sha512-4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==
   dependencies:
     "@types/node" "*"
 
 "@types/copy-webpack-plugin@^4.4.1":
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/@types/copy-webpack-plugin/-/copy-webpack-plugin-4.4.2.tgz#6dfac0dc8692378f76a20c6c1bbe01eec438f316"
-  integrity sha512-/L0m5kc7pKGpsu97TTgAP6YcVRmau2Wj0HpRPQBGEbZXT1DZkdozZPCZHGDWXpxcvWDFTxob2JmYJj3RC7CwFA==
   dependencies:
     "@types/minimatch" "*"
     "@types/webpack" "*"
 
-"@types/estree@0.0.39":
-  version "0.0.39"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
-  integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
-
 "@types/events@*":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
-  integrity sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==
 
 "@types/express-serve-static-core@*":
   version "4.16.0"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.16.0.tgz#fdfe777594ddc1fe8eb8eccce52e261b496e43e7"
-  integrity sha512-lTeoCu5NxJU4OD9moCgm0ESZzweAx0YqsAcab6OB0EB3+As1OaHtKnaGJvcngQxYsi9UNv0abn4/DRavrRxt4w==
   dependencies:
     "@types/events" "*"
     "@types/node" "*"
@@ -281,7 +115,6 @@
 "@types/express@*", "@types/express@^4.16.0":
   version "4.16.0"
   resolved "https://registry.yarnpkg.com/@types/express/-/express-4.16.0.tgz#6d8bc42ccaa6f35cf29a2b7c3333cb47b5a32a19"
-  integrity sha512-TtPEYumsmSTtTetAPXlJVf3kEqb6wZK0bZojpJQrnD/djV4q1oB6QQ8aKvKqwNPACoe02GNiy5zDzcYivR5Z2w==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "*"
@@ -290,14 +123,12 @@
 "@types/form-data@*":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@types/form-data/-/form-data-2.2.1.tgz#ee2b3b8eaa11c0938289953606b745b738c54b1e"
-  integrity sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ==
   dependencies:
     "@types/node" "*"
 
 "@types/glob@^5.0.35":
   version "5.0.35"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.35.tgz#1ae151c802cece940443b5ac246925c85189f32a"
-  integrity sha512-wc+VveszMLyMWFvXLkloixT4n0harUIVZjnpzztaZ0nKLuul7Z32iMt2fUFGAaZ4y1XWjFRMtCI5ewvyh4aIeg==
   dependencies:
     "@types/events" "*"
     "@types/minimatch" "*"
@@ -306,7 +137,6 @@
 "@types/http-proxy-middleware@*":
   version "0.17.5"
   resolved "https://registry.yarnpkg.com/@types/http-proxy-middleware/-/http-proxy-middleware-0.17.5.tgz#efdeb4be652744422d57929f3c4ea31a2e627a45"
-  integrity sha512-mUqVzfaiOknDT2QJ7g8f2c37G4ZDqDNt08QdUkFCu19Ey5+2SZ0rWHMG00GRJ7g+SgHvl/9weZYuWLXr7RgiCg==
   dependencies:
     "@types/connect" "*"
     "@types/http-proxy" "*"
@@ -316,7 +146,6 @@
 "@types/http-proxy@*":
   version "1.16.2"
   resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.16.2.tgz#16cb373b52fff2aa2f389d23d940ed4a642349e5"
-  integrity sha512-GgqePmC3rlsn1nv+kx5OviPuUBU2omhnlXOaJSXFgOdsTcScNFap+OaCb2ip9Bm4m5L8EOehgT5d9M4uNB90zg==
   dependencies:
     "@types/events" "*"
     "@types/node" "*"
@@ -324,7 +153,6 @@
 "@types/inquirer@^0.0.42":
   version "0.0.42"
   resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-0.0.42.tgz#2310fd8623053bead72247adae416aa32bacdf0c"
-  integrity sha512-flMaNWU2g9NrtZ4bIV+7SEY2W7OdWNNhmJ0rE1lWVxGrkp3TfFGMcFCxRIBmGWigI8e6n+2HqLjizTTfgcpHLg==
   dependencies:
     "@types/rx" "*"
     "@types/through" "*"
@@ -332,17 +160,14 @@
 "@types/istanbul@^0.4.30":
   version "0.4.30"
   resolved "https://registry.yarnpkg.com/@types/istanbul/-/istanbul-0.4.30.tgz#073159320ab3296b2cfeb481f756a1f8f4c9c8e4"
-  integrity sha512-+hQU4fh2G96ze78uI5/V6+SRDZD1UnVrFn23i2eDetwfbBq3s0/zYP92xj/3qyvVMM3WnvS88N56zjz+HmL04A==
 
 "@types/jasmine@^2.8.8":
   version "2.8.8"
   resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.8.tgz#bf53a7d193ea8b03867a38bfdb4fbb0e0bf066c9"
-  integrity sha512-OJSUxLaxXsjjhob2DBzqzgrkLmukM3+JMpRp0r0E4HTdT1nwDCWhaswjYxazPij6uOdzHCJfNbDjmQ1/rnNbCg==
 
 "@types/loader-utils@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@types/loader-utils/-/loader-utils-1.1.3.tgz#82b9163f2ead596c68a8c03e450fbd6e089df401"
-  integrity sha512-euKGFr2oCB3ASBwG39CYJMR3N9T0nanVqXdiH7Zu/Nqddt6SmFRxytq/i2w9LQYNQekEtGBz+pE3qG6fQTNvRg==
   dependencies:
     "@types/node" "*"
     "@types/webpack" "*"
@@ -350,47 +175,30 @@
 "@types/mime@*":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.0.tgz#5a7306e367c539b9f6543499de8dd519fac37a8b"
-  integrity sha512-A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA==
 
 "@types/minimatch@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
-  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
 "@types/minimist@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6"
-  integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
 
 "@types/node@*":
   version "10.9.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897"
-  integrity sha512-fCHV45gS+m3hH17zgkgADUSi2RR1Vht6wOZ0jyHP8rjiQra9f+mIcgwPQHllmDocYOstIEbKlxbFDYlgrTPYqw==
 
 "@types/node@8.10.10":
   version "8.10.10"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.10.tgz#fec07bc2ad549d9e6d2f7aa0fb0be3491b83163a"
-  integrity sha512-p3W/hFzQs76RlYRIZsZc5a9bht6m0TspmWYYbKhRswmLnwj9fsE40EbuGifeu/XWR/c0UJQ1DDbvTxIsm/OOAA==
-
-"@types/node@^6.0.46":
-  version "6.14.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.0.tgz#85c6998293fc6f2945915419296c7fbb63384f66"
-  integrity sha512-6tQyh4Q4B5pECcXBOQDZ5KjyBIxRZGzrweGPM47sAYTdVG4+7R+2EGMTmp0h6ZwgqHrFRCeg2gdhsG9xXEl2Sg==
-
-"@types/q@^0.0.32":
-  version "0.0.32"
-  resolved "http://registry.npmjs.org/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
-  integrity sha1-vShOV8hPEyXacCur/IKlMoGQwMU=
 
 "@types/range-parser@*":
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.2.tgz#fa8e1ad1d474688a757140c91de6dace6f4abc8d"
-  integrity sha512-HtKGu+qG1NPvYe1z7ezLsyIaXYyi8SoAVqWDZgDQ8dLrsZvSzUNCwZyfX33uhWxL/SU0ZDQZ3nwZ0nimt507Kw==
 
 "@types/request@^2.47.1":
   version "2.47.1"
   resolved "https://registry.yarnpkg.com/@types/request/-/request-2.47.1.tgz#25410d3afbdac04c91a94ad9efc9824100735824"
-  integrity sha512-TV3XLvDjQbIeVxJ1Z3oCTDk/KuYwwcNKVwz2YaT0F5u86Prgc4syDAp6P96rkTQQ4bIdh+VswQIC9zS6NjY7/g==
   dependencies:
     "@types/caseless" "*"
     "@types/form-data" "*"
@@ -400,82 +208,70 @@
 "@types/rx-core-binding@*":
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/@types/rx-core-binding/-/rx-core-binding-4.0.4.tgz#d969d32f15a62b89e2862c17b3ee78fe329818d3"
-  integrity sha512-5pkfxnC4w810LqBPUwP5bg7SFR/USwhMSaAeZQQbEHeBp57pjKXRlXmqpMrLJB4y1oglR/c2502853uN0I+DAQ==
   dependencies:
     "@types/rx-core" "*"
 
 "@types/rx-core@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-core/-/rx-core-4.0.3.tgz#0b3354b1238cedbe2b74f6326f139dbc7a591d60"
-  integrity sha1-CzNUsSOM7b4rdPYybxOdvHpZHWA=
 
 "@types/rx-lite-aggregates@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-aggregates/-/rx-lite-aggregates-4.0.3.tgz#6efb2b7f3d5f07183a1cb2bd4b1371d7073384c2"
-  integrity sha512-MAGDAHy8cRatm94FDduhJF+iNS5//jrZ/PIfm+QYw9OCeDgbymFHChM8YVIvN2zArwsRftKgE33QfRWvQk4DPg==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-async@*":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-async/-/rx-lite-async-4.0.2.tgz#27fbf0caeff029f41e2d2aae638b05e91ceb600c"
-  integrity sha512-vTEv5o8l6702ZwfAM5aOeVDfUwBSDOs+ARoGmWAKQ6LOInQ8J4/zjM7ov12fuTpktUKdMQjkeCp07Vd73mPkxw==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-backpressure@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-backpressure/-/rx-lite-backpressure-4.0.3.tgz#05abb19bdf87cc740196c355e5d0b37bb50b5d56"
-  integrity sha512-Y6aIeQCtNban5XSAF4B8dffhIKu6aAy/TXFlScHzSxh6ivfQBQw6UjxyEJxIOt3IT49YkS+siuayM2H/Q0cmgA==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-coincidence@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-coincidence/-/rx-lite-coincidence-4.0.3.tgz#80bd69acc4054a15cdc1638e2dc8843498cd85c0"
-  integrity sha512-1VNJqzE9gALUyMGypDXZZXzR0Tt7LC9DdAZQ3Ou/Q0MubNU35agVUNXKGHKpNTba+fr8GdIdkC26bRDqtCQBeQ==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-experimental@*":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-experimental/-/rx-lite-experimental-4.0.1.tgz#c532f5cbdf3f2c15da16ded8930d1b2984023cbd"
-  integrity sha1-xTL1y98/LBXaFt7Ykw0bKYQCPL0=
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-joinpatterns@*":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-joinpatterns/-/rx-lite-joinpatterns-4.0.1.tgz#f70fe370518a8432f29158cc92ffb56b4e4afc3e"
-  integrity sha1-9w/jcFGKhDLykVjMkv+1a05K/D4=
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-testing@*":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-testing/-/rx-lite-testing-4.0.1.tgz#21b19d11f4dfd6ffef5a9d1648e9c8879bfe21e9"
-  integrity sha1-IbGdEfTf1v/vWp0WSOnIh5v+Iek=
   dependencies:
     "@types/rx-lite-virtualtime" "*"
 
 "@types/rx-lite-time@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-time/-/rx-lite-time-4.0.3.tgz#0eda65474570237598f3448b845d2696f2dbb1c4"
-  integrity sha512-ukO5sPKDRwCGWRZRqPlaAU0SKVxmWwSjiOrLhoQDoWxZWg6vyB9XLEZViKOzIO6LnTIQBlk4UylYV0rnhJLxQw==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-virtualtime@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-virtualtime/-/rx-lite-virtualtime-4.0.3.tgz#4b30cacd0fe2e53af29f04f7438584c7d3959537"
-  integrity sha512-3uC6sGmjpOKatZSVHI2xB1+dedgml669ZRvqxy+WqmGJDVusOdyxcKfyzjW0P3/GrCiN4nmRkLVMhPwHCc5QLg==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite@*":
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/@types/rx-lite/-/rx-lite-4.0.5.tgz#b3581525dff69423798daa9a0d33c1e66a5e8c4c"
-  integrity sha512-KZk5XTR1dm/kNgBx8iVpjno6fRYtAUQWBOmj+O8j724+nk097sz4fOoHJNpCkOJUtHUurZlJC7QvSFCZHbkC+w==
   dependencies:
     "@types/rx-core" "*"
     "@types/rx-core-binding" "*"
@@ -483,7 +279,6 @@
 "@types/rx@*":
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/@types/rx/-/rx-4.1.1.tgz#598fc94a56baed975f194574e0f572fd8e627a48"
-  integrity sha1-WY/JSla67ZdfGUV04PVy/Y5iekg=
   dependencies:
     "@types/rx-core" "*"
     "@types/rx-core-binding" "*"
@@ -498,20 +293,13 @@
     "@types/rx-lite-time" "*"
     "@types/rx-lite-virtualtime" "*"
 
-"@types/selenium-webdriver@^3.0.0":
-  version "3.0.12"
-  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.12.tgz#6affe5aed1ba379175075a889adbe2bc3aa62159"
-  integrity sha512-hYn+eoOehVUIdMwp5h34ZsGAO1ydja10GDup4BwyoFCdcH5MQ35nQq+AInSaBMEMopD5hEooFCyKo2Pajbe1ag==
-
 "@types/semver@^5.5.0":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
-  integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==
 
 "@types/serve-static@*":
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.2.tgz#f5ac4d7a6420a99a6a45af4719f4dcd8cd907a48"
-  integrity sha512-/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q==
   dependencies:
     "@types/express-serve-static-core" "*"
     "@types/mime" "*"
@@ -519,34 +307,28 @@
 "@types/source-list-map@*":
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
-  integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
 "@types/source-map@0.5.2":
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.5.2.tgz#973459e744cc7445c85b97f770275b479b138e08"
-  integrity sha512-++w4WmMbk3dS3UeHGzAG+xJOSz5Xqtjys/TBkqG3qp3SeWE7Wwezqe5eB7B51cxUyh4PW7bwVotpsLdBK0D8cw==
 
 "@types/tapable@*":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.4.tgz#b4ffc7dc97b498c969b360a41eee247f82616370"
-  integrity sha512-78AdXtlhpCHT0K3EytMpn4JNxaf5tbqbLcbIRoQIHzpTIyjpxLQKRoxU55ujBXAtg3Nl2h/XWvfDa9dsMOd0pQ==
 
 "@types/through@*":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/through/-/through-0.0.29.tgz#72943aac922e179339c651fa34a4428a4d722f93"
-  integrity sha512-9a7C5VHh+1BKblaYiq+7Tfc+EOmjMdZaD1MYtkQjSoxgB69tBjW98ry6SKsi4zEIWztLOMRuL87A3bdT/Fc/4w==
   dependencies:
     "@types/node" "*"
 
 "@types/tough-cookie@*":
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-2.3.3.tgz#7f226d67d654ec9070e755f46daebf014628e9d9"
-  integrity sha512-MDQLxNFRLasqS4UlkWMSACMKeSm1x4Q3TxzUC7KQUsh6RK1ZrQ0VEyE3yzXcBu+K8ejVj4wuX32eUG02yNp+YQ==
 
 "@types/uglify-js@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.0.3.tgz#801a5ca1dc642861f47c46d14b700ed2d610840b"
-  integrity sha512-MAT0BW2ruO0LhQKjvlipLGCF/Yx0y/cj+tT67tK3QIQDrM2+9R78HgJ54VlrE8AbfjYJJBCQCEPM5ZblPVTuww==
   dependencies:
     source-map "^0.6.1"
 
@@ -557,7 +339,6 @@
 "@types/webpack-dev-server@^3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-3.1.0.tgz#1fae06ad346d2dd09bc5e34745723946458eed58"
-  integrity sha512-nutifgcFiPP3I/+mPWlZCsQNKpWNUGm6qjAMfleZuPfPfybXWymHvlcYsKvg+NPedSkrNh0vu2xKAlak/l+pOg==
   dependencies:
     "@types/express" "*"
     "@types/http-proxy-middleware" "*"
@@ -567,7 +348,6 @@
 "@types/webpack-sources@^0.1.5":
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-0.1.5.tgz#be47c10f783d3d6efe1471ff7f042611bd464a92"
-  integrity sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==
   dependencies:
     "@types/node" "*"
     "@types/source-list-map" "*"
@@ -576,175 +356,19 @@
 "@types/webpack@*", "@types/webpack@^4.4.11":
   version "4.4.11"
   resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.4.11.tgz#0ca832870d55c4e92498c01d22d00d02b0f62ae9"
-  integrity sha512-NdESmbpvVEtJgs15kyZYKr5ouLYPMYt9DNG5JEgCekbG/ezFLPCzf4XcAv8caOb+b7x6ieAuSt0eoR0UkSI7RA==
   dependencies:
     "@types/node" "*"
     "@types/tapable" "*"
     "@types/uglify-js" "*"
     source-map "^0.6.0"
 
-"@webassemblyjs/ast@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.10.tgz#0cfc61d61286240b72fc522cb755613699eea40a"
-  integrity sha512-wTUeaByYN2EA6qVqhbgavtGc7fLTOx0glG2IBsFlrFG51uXIGlYBTyIZMf4SPLo3v1bgV/7lBN3l7Z0R6Hswew==
-  dependencies:
-    "@webassemblyjs/helper-module-context" "1.7.10"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
-    "@webassemblyjs/wast-parser" "1.7.10"
-
-"@webassemblyjs/floating-point-hex-parser@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.10.tgz#ee63d729c6311a85863e369a473f9983f984e4d9"
-  integrity sha512-gMsGbI6I3p/P1xL2UxqhNh1ga2HCsx5VBB2i5VvJFAaqAjd2PBTRULc3BpTydabUQEGlaZCzEUQhLoLG7TvEYQ==
-
-"@webassemblyjs/helper-api-error@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.10.tgz#bfcb3bbe59775357475790a2ad7b289f09b2f198"
-  integrity sha512-DoYRlPWtuw3yd5BOr9XhtrmB6X1enYF0/54yNvQWGXZEPDF5PJVNI7zQ7gkcKfTESzp8bIBWailaFXEK/jjCsw==
-
-"@webassemblyjs/helper-buffer@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.10.tgz#0a8c624c67ad0b214d2e003859921a1988cb151b"
-  integrity sha512-+RMU3dt/dPh4EpVX4u5jxsOlw22tp3zjqE0m3ftU2tsYxnPULb4cyHlgaNd2KoWuwasCQqn8Mhr+TTdbtj3LlA==
-
-"@webassemblyjs/helper-code-frame@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.10.tgz#0ab7e22fad0241a173178c73976fc0edf50832ce"
-  integrity sha512-UiytbpKAULOEab2hUZK2ywXen4gWJVrgxtwY3Kn+eZaaSWaRM8z/7dAXRSoamhKFiBh1uaqxzE/XD9BLlug3gw==
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.7.10"
-
-"@webassemblyjs/helper-fsm@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.10.tgz#0915e7713fbbb735620a9d3e4fa3d7951f97ac64"
-  integrity sha512-w2vDtUK9xeSRtt5+RnnlRCI7wHEvLjF0XdnxJpgx+LJOvklTZPqWkuy/NhwHSLP19sm9H8dWxKeReMR7sCkGZA==
-
-"@webassemblyjs/helper-module-context@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.10.tgz#9beb83f72740f5ac8075313b5cac5e796510f755"
-  integrity sha512-yE5x/LzZ3XdPdREmJijxzfrf+BDRewvO0zl8kvORgSWmxpRrkqY39KZSq6TSgIWBxkK4SrzlS3BsMCv2s1FpsQ==
-
-"@webassemblyjs/helper-wasm-bytecode@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.10.tgz#797b1e734bbcfdea8399669cdc58308ef1c7ffc0"
-  integrity sha512-u5qy4SJ/OrxKxZqJ9N3qH4ZQgHaAzsopsYwLvoWJY6Q33r8PhT3VPyNMaJ7ZFoqzBnZlCcS/0f4Sp8WBxylXfg==
-
-"@webassemblyjs/helper-wasm-section@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.10.tgz#c0ea3703c615d7bc3e3507c3b7991c8767b2f20e"
-  integrity sha512-Ecvww6sCkcjatcyctUrn22neSJHLN/TTzolMGG/N7S9rpbsTZ8c6Bl98GpSpV77EvzNijiNRHBG0+JO99qKz6g==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.10"
-    "@webassemblyjs/helper-buffer" "1.7.10"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
-    "@webassemblyjs/wasm-gen" "1.7.10"
-
-"@webassemblyjs/ieee754@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.10.tgz#62c1728b7ef0f66ef8221e2966a0afd75db430df"
-  integrity sha512-HRcWcY+YWt4+s/CvQn+vnSPfRaD4KkuzQFt5MNaELXXHSjelHlSEA8ZcqT69q0GTIuLWZ6JaoKar4yWHVpZHsQ==
-  dependencies:
-    "@xtuc/ieee754" "^1.2.0"
-
-"@webassemblyjs/leb128@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.10.tgz#167e0bb4b06d7701585772a73fba9f4df85439f6"
-  integrity sha512-og8MciYlA8hvzCLR71hCuZKPbVBfLQeHv7ImKZ4nlyxrYbG7uJHYtHiHu6OV9SqrGuD03H/HtXC4Bgdjfm9FHw==
-  dependencies:
-    "@xtuc/long" "4.2.1"
-
-"@webassemblyjs/utf8@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.10.tgz#b6728f5b6f50364abc155be029f9670e6685605a"
-  integrity sha512-Ng6Pxv6siyZp635xCSnH3mKmIFgqWPCcGdoo0GBYgyGdxu7cUj4agV7Uu1a8REP66UYUFXJLudeGgd4RvuJAnQ==
-
-"@webassemblyjs/wasm-edit@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.10.tgz#83fe3140f5a58f5a30b914702be9f0e59a399092"
-  integrity sha512-e9RZFQlb+ZuYcKRcW9yl+mqX/Ycj9+3/+ppDI8nEE/NCY6FoK8f3dKBcfubYV/HZn44b+ND4hjh+4BYBt+sDnA==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.10"
-    "@webassemblyjs/helper-buffer" "1.7.10"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
-    "@webassemblyjs/helper-wasm-section" "1.7.10"
-    "@webassemblyjs/wasm-gen" "1.7.10"
-    "@webassemblyjs/wasm-opt" "1.7.10"
-    "@webassemblyjs/wasm-parser" "1.7.10"
-    "@webassemblyjs/wast-printer" "1.7.10"
-
-"@webassemblyjs/wasm-gen@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.10.tgz#4de003806ae29c97ab3707782469b53299570174"
-  integrity sha512-M0lb6cO2Y0PzDye/L39PqwV+jvO+2YxEG5ax+7dgq7EwXdAlpOMx1jxyXJTScQoeTpzOPIb+fLgX/IkLF8h2yw==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.10"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
-    "@webassemblyjs/ieee754" "1.7.10"
-    "@webassemblyjs/leb128" "1.7.10"
-    "@webassemblyjs/utf8" "1.7.10"
-
-"@webassemblyjs/wasm-opt@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.10.tgz#d151e31611934a556c82789fdeec41a814993c2a"
-  integrity sha512-R66IHGCdicgF5ZliN10yn5HaC7vwYAqrSVJGjtJJQp5+QNPBye6heWdVH/at40uh0uoaDN/UVUfXK0gvuUqtVg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.10"
-    "@webassemblyjs/helper-buffer" "1.7.10"
-    "@webassemblyjs/wasm-gen" "1.7.10"
-    "@webassemblyjs/wasm-parser" "1.7.10"
-
-"@webassemblyjs/wasm-parser@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.10.tgz#0367be7bf8f09e3e6abc95f8e483b9206487ec65"
-  integrity sha512-AEv8mkXVK63n/iDR3T693EzoGPnNAwKwT3iHmKJNBrrALAhhEjuPzo/lTE4U7LquEwyvg5nneSNdTdgrBaGJcA==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.10"
-    "@webassemblyjs/helper-api-error" "1.7.10"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
-    "@webassemblyjs/ieee754" "1.7.10"
-    "@webassemblyjs/leb128" "1.7.10"
-    "@webassemblyjs/utf8" "1.7.10"
-
-"@webassemblyjs/wast-parser@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.10.tgz#058f598b52f730b23fc874d4775b6286b6247264"
-  integrity sha512-YTPEtOBljkCL0VjDp4sHe22dAYSm3ZwdJ9+2NTGdtC7ayNvuip1wAhaAS8Zt9Q6SW9E5Jf5PX7YE3XWlrzR9cw==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.10"
-    "@webassemblyjs/floating-point-hex-parser" "1.7.10"
-    "@webassemblyjs/helper-api-error" "1.7.10"
-    "@webassemblyjs/helper-code-frame" "1.7.10"
-    "@webassemblyjs/helper-fsm" "1.7.10"
-    "@xtuc/long" "4.2.1"
-
-"@webassemblyjs/wast-printer@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.10.tgz#d817909d2450ae96c66b7607624d98a33b84223b"
-  integrity sha512-mJ3QKWtCchL1vhU/kZlJnLPuQZnlDOdZsyP0bbLWPGdYsQDnSBvyTLhzwBA3QAMlzEL9V4JHygEmK6/OTEyytA==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.10"
-    "@webassemblyjs/wast-parser" "1.7.10"
-    "@xtuc/long" "4.2.1"
-
-"@xtuc/ieee754@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
-  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
-
-"@xtuc/long@4.2.1":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
-  integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
-
 "@yarnpkg/lockfile@1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
-  integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
 
 JSONStream@^1.0.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.4.tgz#615bb2adb0cd34c8f4c447b5f6512fa1d8f16a2e"
-  integrity sha512-Y7vfi3I5oMOYIr+WxV8NZxDSwcbNgzdKYsTNInmycOq9bUYwGg9ryu57Wg5NLmCjqdFPNUmpMBo3kSJN9tCbXg==
   dependencies:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
@@ -752,7 +376,6 @@ JSONStream@^1.0.4:
 JSONStream@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
-  integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
   dependencies:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
@@ -760,111 +383,71 @@ JSONStream@^1.3.4:
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
 abbrev@1.0.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
-  integrity sha1-kbR5JYinc4wl813W9jdSovh3YTU=
 
-accepts@~1.3.4, accepts@~1.3.5:
+accepts@~1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
-  integrity sha1-63d99gEXI6OxTopywIBcjoZ0a9I=
   dependencies:
     mime-types "~2.1.18"
     negotiator "0.6.1"
 
-acorn-dynamic-import@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
-  integrity sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==
-  dependencies:
-    acorn "^5.0.0"
-
-acorn@^5.0.0, acorn@^5.6.2:
+acorn@^5.0.0:
   version "5.7.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
-  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
 addressparser@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/addressparser/-/addressparser-1.0.1.tgz#47afbe1a2a9262191db6838e4fd1d39b40821746"
-  integrity sha1-R6++GiqSYhkdtoOOT9HTm0CCF0Y=
 
-adm-zip@^0.4.9, adm-zip@~0.4.3:
+adm-zip@~0.4.3:
   version "0.4.11"
   resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.11.tgz#2aa54c84c4b01a9d0fb89bb11982a51f13e3d62a"
-  integrity sha512-L8vcjDTCOIJk7wFvmlEUN7AsSb8T+2JrdP7KINBjzr24TJ5Mwj590sLu3BC7zNZowvJWa/JtPmD8eJCzdtDWjA==
 
 after@0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
-  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
 
 agent-base@4, agent-base@^4.1.0, agent-base@^4.2.0, agent-base@~4.2.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
-  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
   dependencies:
     es6-promisify "^5.0.0"
 
 agentkeepalive@^3.4.1:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67"
-  integrity sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==
   dependencies:
     humanize-ms "^1.2.1"
 
-ajv-errors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.0.tgz#ecf021fa108fd17dfb5e6b383f2dd233e31ffc59"
-  integrity sha1-7PAh+hCP0X37Xms4Py3SM+Mf/Fk=
-
-ajv-keywords@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
-  integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
-
 ajv@6.5.3:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9"
-  integrity sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^5.0.0, ajv@^5.1.0, ajv@^5.3.0:
+ajv@^5.1.0, ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
   dependencies:
     co "^4.6.0"
     fast-deep-equal "^1.0.0"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ajv@^6.1.0:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.4.tgz#247d5274110db653706b550fcc2b797ca28cfc59"
-  integrity sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
 amqplib@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/amqplib/-/amqplib-0.5.2.tgz#d2d7313c7ffaa4d10bcf1e6252de4591b6cc7b63"
-  integrity sha512-l9mCs6LbydtHqRniRwYkKdqxVa6XMz3Vw1fh+2gJaaVgTM6Jk3o8RccAKWKtlhT1US5sWrFh+KKxsVUALURSIA==
   dependencies:
     bitsyntax "~0.0.4"
     bluebird "^3.4.6"
@@ -872,54 +455,27 @@ amqplib@^0.5.2:
     readable-stream "1.x >=1.1.9"
     safe-buffer "^5.0.1"
 
-ansi-align@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f"
-  integrity sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=
-  dependencies:
-    string-width "^2.0.0"
-
-ansi-colors@^3.0.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.1.tgz#9638047e4213f3428a11944a7d4b31cba0a3ff95"
-  integrity sha512-Xt+zb6nqgvV9SWAVp0EG3lRsHcbq5DDgqjPPz6pwgtj6RKz65zGXMNa82oJfOSBA/to6GmRP7Dr+6o+kbApTzQ==
-
-ansi-escapes@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
-  integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==
-
-ansi-html@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
-  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
-
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
 ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
 
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
 
 anymatch@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
-  integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==
   dependencies:
     micromatch "^2.1.5"
     normalize-path "^2.0.0"
@@ -927,32 +483,17 @@ anymatch@^1.3.0:
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
-  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
   dependencies:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-app-root-path@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.1.0.tgz#98bf6599327ecea199309866e8140368fd2e646a"
-  integrity sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo=
-
-append-transform@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab"
-  integrity sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==
-  dependencies:
-    default-require-extensions "^2.0.0"
-
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
 archiver-utils@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-1.3.0.tgz#e50b4c09c70bf3d680e32ff1b7994e9f9d895174"
-  integrity sha1-5QtMCccL89aA4y/xt5lOn52JUXQ=
   dependencies:
     glob "^7.0.0"
     graceful-fs "^4.1.0"
@@ -964,7 +505,6 @@ archiver-utils@^1.3.0:
 archiver@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/archiver/-/archiver-2.1.1.tgz#ff662b4a78201494a3ee544d3a33fe7496509ebc"
-  integrity sha1-/2YrSnggFJSj7lRNOjP+dJZQnrw=
   dependencies:
     archiver-utils "^1.3.0"
     async "^2.0.0"
@@ -978,7 +518,6 @@ archiver@2.1.1:
 are-we-there-yet@~1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
@@ -986,331 +525,169 @@ are-we-there-yet@~1.1.2:
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
 arr-diff@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
   dependencies:
     arr-flatten "^1.0.1"
 
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
 arr-flatten@^1.0.1, arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
 arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
 array-find-index@^1.0.1, array-find-index@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
-  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
-
-array-flatten@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
-  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
-
-array-flatten@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296"
-  integrity sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=
 
 array-ify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
-  integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=
 
 array-slice@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
-  integrity sha1-3Tz7gO15c6dRF82sabC5nshhhvU=
-
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
-  dependencies:
-    array-uniq "^1.0.1"
-
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
 array-unique@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
 
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
 arraybuffer.slice@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
-  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
 
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
-asap@^2.0.0, asap@~2.0.3:
+asap@^2.0.0:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
-  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
 ascli@~1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ascli/-/ascli-1.0.1.tgz#bcfa5974a62f18e81cabaeb49732ab4a88f906bc"
-  integrity sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=
   dependencies:
     colour "~0.7.1"
     optjs "~3.2.2"
 
-asn1.js@^4.0.0:
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
-  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
-  dependencies:
-    bn.js "^4.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-
 asn1@~0.2.3:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
-  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
   dependencies:
     safer-buffer "~2.1.0"
 
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
 assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
-  integrity sha1-104bh+ev/A24qttwIfP+SBAasjQ=
-
-assert@^1.1.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
-  integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=
-  dependencies:
-    util "0.10.3"
 
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
 ast-types@0.x.x:
   version "0.11.6"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.6.tgz#4e2266c2658829aef3b40cc33ad599c4e9eb89ef"
-  integrity sha512-nHiuV14upVGl7MWwFUYbzJ6YlfwWS084CU9EA8HajfYQjMSli5TQi3UTRygGF58LFWVkXxS1rbgRhROEqlQkXg==
 
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
-  integrity sha1-GdOGodntxufByF04iu28xW0zYC0=
-
-async-foreach@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
-  integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
 
 async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
-  integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
 
-async@1.x, async@^1.5.2:
+async@1.x:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
 async@2.0.1:
   version "2.0.1"
   resolved "http://registry.npmjs.org/async/-/async-2.0.1.tgz#b709cc0280a9c36f09f4536be823c838a9049e25"
-  integrity sha1-twnMAoCpw28J9FNr6CPIOKkEniU=
   dependencies:
     lodash "^4.8.0"
 
-async@^2.0.0, async@^2.1.2, async@^2.5.0, async@^2.6.0, async@^2.6.1, async@~2.6.0:
+async@^2.0.0, async@^2.1.2, async@^2.5.0, async@^2.6.0, async@~2.6.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
-  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
   dependencies:
     lodash "^4.17.10"
 
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
 atob@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
-  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
-
-autoprefixer@9.3.1, autoprefixer@^9.0.0:
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.3.1.tgz#71b622174de2b783d5fd99f9ad617b7a3c78443e"
-  integrity sha512-DY9gOh8z3tnCbJ13JIWaeQsoYncTGdsrgCceBaQSIL4nvdrLxgbRSBPevg2XbX7u4QCSfLheSJEEIUUSlkbx6Q==
-  dependencies:
-    browserslist "^4.3.3"
-    caniuse-lite "^1.0.30000898"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^7.0.5"
-    postcss-value-parser "^3.3.1"
 
 aws-sign2@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
-  integrity sha1-FDQt0428yU0OW4fXY81jYSwOeU8=
 
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.2.1, aws4@^1.6.0, aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
-  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
 axios@^0.15.3:
   version "0.15.3"
   resolved "http://registry.npmjs.org/axios/-/axios-0.15.3.tgz#2c9d638b2e191a08ea1d6cc988eadd6ba5bdc053"
-  integrity sha1-LJ1jiy4ZGgjqHWzJiOrda6W9wFM=
   dependencies:
     follow-redirects "1.0.0"
 
-babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
+babel-code-frame@^6.22.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
   dependencies:
     chalk "^1.1.3"
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
-babel-generator@^6.18.0:
-  version "6.26.1"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
-  integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==
-  dependencies:
-    babel-messages "^6.23.0"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    detect-indent "^4.0.0"
-    jsesc "^1.3.0"
-    lodash "^4.17.4"
-    source-map "^0.5.7"
-    trim-right "^1.0.1"
-
-babel-messages@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
-  integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-runtime@^6.22.0, babel-runtime@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.11.0"
-
-babel-template@^6.16.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
-  integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
-  dependencies:
-    babel-runtime "^6.26.0"
-    babel-traverse "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    lodash "^4.17.4"
-
-babel-traverse@^6.18.0, babel-traverse@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
-  integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
-  dependencies:
-    babel-code-frame "^6.26.0"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    debug "^2.6.8"
-    globals "^9.18.0"
-    invariant "^2.2.2"
-    lodash "^4.17.4"
-
-babel-types@^6.18.0, babel-types@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
-  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
-  dependencies:
-    babel-runtime "^6.26.0"
-    esutils "^2.0.2"
-    lodash "^4.17.4"
-    to-fast-properties "^1.0.3"
-
-babylon@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
-  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
-
 backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
-  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
 
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
 base64-arraybuffer@0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
-  integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
 
 base64-js@^1.0.2:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
-  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
 
 base64id@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
-  integrity sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=
 
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
-  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
   dependencies:
     cache-base "^1.0.1"
     class-utils "^0.3.5"
@@ -1320,46 +697,31 @@ base@^0.11.1:
     mixin-deep "^1.2.0"
     pascalcase "^0.1.1"
 
-batch@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
-  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
-
 bcrypt-pbkdf@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
   dependencies:
     tweetnacl "^0.14.3"
 
 better-assert@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
-  integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=
   dependencies:
     callsite "1.0.0"
 
-big.js@^3.1.3:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
-  integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
-
 binary-extensions@^1.0.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
-  integrity sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=
 
 bitsyntax@~0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/bitsyntax/-/bitsyntax-0.0.4.tgz#eb10cc6f82b8c490e3e85698f07e83d46e0cba82"
-  integrity sha1-6xDMb4K4xJDj6FaY8H6D1G4MuoI=
   dependencies:
     buffer-more-ints "0.0.2"
 
 bl@^1.0.0:
   version "1.2.2"
   resolved "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
-  integrity sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==
   dependencies:
     readable-stream "^2.3.5"
     safe-buffer "^5.1.1"
@@ -1367,43 +729,20 @@ bl@^1.0.0:
 bl@~1.1.2:
   version "1.1.2"
   resolved "http://registry.npmjs.org/bl/-/bl-1.1.2.tgz#fdca871a99713aa00d19e3bbba41c44787a65398"
-  integrity sha1-/cqHGplxOqANGeO7ukHER4emU5g=
   dependencies:
     readable-stream "~2.0.5"
 
 blob@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
-  integrity sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=
-
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
-  dependencies:
-    inherits "~2.0.0"
-
-blocking-proxy@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/blocking-proxy/-/blocking-proxy-1.0.1.tgz#81d6fd1fe13a4c0d6957df7f91b75e98dac40cb2"
-  integrity sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==
-  dependencies:
-    minimist "^1.2.0"
 
 bluebird@^3.3.0, bluebird@^3.4.6, bluebird@^3.5.1, bluebird@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a"
-  integrity sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==
 
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
-  version "4.11.8"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
-  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
-
-body-parser@1.18.3, body-parser@^1.16.1:
+body-parser@^1.16.1:
   version "1.18.3"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
-  integrity sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=
   dependencies:
     bytes "3.0.0"
     content-type "~1.0.4"
@@ -1416,61 +755,27 @@ body-parser@1.18.3, body-parser@^1.16.1:
     raw-body "2.3.3"
     type-is "~1.6.16"
 
-bonjour@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
-  integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU=
-  dependencies:
-    array-flatten "^2.1.0"
-    deep-equal "^1.0.1"
-    dns-equal "^1.0.0"
-    dns-txt "^2.0.2"
-    multicast-dns "^6.0.1"
-    multicast-dns-service-types "^1.1.0"
-
 boom@2.x.x:
   version "2.10.1"
   resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
-  integrity sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=
   dependencies:
     hoek "2.x.x"
 
 boom@4.x.x:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
-  integrity sha1-T4owBctKfjiJ90kDD9JbluAdLjE=
   dependencies:
     hoek "4.x.x"
 
 boom@5.x.x:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
-  integrity sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==
   dependencies:
     hoek "4.x.x"
 
-bootstrap@^4.0.0:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.3.tgz#0eb371af2c8448e8c210411d0cb824a6409a12be"
-  integrity sha512-rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w==
-
-boxen@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
-  integrity sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==
-  dependencies:
-    ansi-align "^2.0.0"
-    camelcase "^4.0.0"
-    chalk "^2.0.1"
-    cli-boxes "^1.0.0"
-    string-width "^2.0.0"
-    term-size "^1.2.0"
-    widest-line "^2.0.0"
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -1478,14 +783,12 @@ brace-expansion@^1.1.7:
 braces@^0.1.2:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/braces/-/braces-0.1.5.tgz#c085711085291d8b75fdd74eab0f8597280711e6"
-  integrity sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=
   dependencies:
     expand-range "^0.1.0"
 
 braces@^1.8.2:
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
   dependencies:
     expand-range "^1.8.1"
     preserve "^0.2.0"
@@ -1494,7 +797,6 @@ braces@^1.8.2:
 braces@^2.3.0, braces@^2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
-  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
   dependencies:
     arr-flatten "^1.1.0"
     array-unique "^0.3.2"
@@ -1510,102 +812,19 @@ braces@^2.3.0, braces@^2.3.1:
 brfs@^1.4.0:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.6.1.tgz#b78ce2336d818e25eea04a0947cba6d4fb8849c3"
-  integrity sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==
   dependencies:
     quote-stream "^1.0.1"
     resolve "^1.1.5"
     static-module "^2.2.0"
     through2 "^2.0.0"
 
-brorand@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
-  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
-
-browserify-aes@^1.0.0, browserify-aes@^1.0.4:
-  version "1.2.0"
-  resolved "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
-  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
-  dependencies:
-    buffer-xor "^1.0.3"
-    cipher-base "^1.0.0"
-    create-hash "^1.1.0"
-    evp_bytestokey "^1.0.3"
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-browserify-cipher@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
-  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
-  dependencies:
-    browserify-aes "^1.0.4"
-    browserify-des "^1.0.0"
-    evp_bytestokey "^1.0.0"
-
-browserify-des@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
-  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
-  dependencies:
-    cipher-base "^1.0.1"
-    des.js "^1.0.0"
-    inherits "^2.0.1"
-    safe-buffer "^5.1.2"
-
-browserify-rsa@^4.0.0:
-  version "4.0.1"
-  resolved "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
-  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
-  dependencies:
-    bn.js "^4.1.0"
-    randombytes "^2.0.1"
-
-browserify-sign@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
-  integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
-  dependencies:
-    bn.js "^4.1.1"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.2"
-    elliptic "^6.0.0"
-    inherits "^2.0.1"
-    parse-asn1 "^5.0.0"
-
-browserify-zlib@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
-  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
-  dependencies:
-    pako "~1.0.5"
-
-browserslist@^4.0.0, browserslist@^4.3.3:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.4.tgz#4477b737db6a1b07077275b24791e680d4300425"
-  integrity sha512-u5iz+ijIMUlmV8blX82VGFrB9ecnUg5qEt55CMZ/YJEhha+d8qpBfOFuutJ6F/VKRXjZoD33b6uvarpPxcl3RA==
-  dependencies:
-    caniuse-lite "^1.0.30000899"
-    electron-to-chromium "^1.3.82"
-    node-releases "^1.0.1"
-
-browserstack@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.5.1.tgz#e2dfa66ffee940ebad0a07f7e00fd4687c455d66"
-  integrity sha512-O8VMT64P9NOLhuIoD4YngyxBURefaSdR4QdhG8l6HZ9VxtU7jc3m6jLufFwKA5gaf7fetfB2TnRJnMxyob+heg==
-  dependencies:
-    https-proxy-agent "^2.2.1"
-
 buffer-alloc-unsafe@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
-  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
 
 buffer-alloc@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
-  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
   dependencies:
     buffer-alloc-unsafe "^1.1.0"
     buffer-fill "^1.0.0"
@@ -1613,51 +832,26 @@ buffer-alloc@^1.2.0:
 buffer-crc32@^0.2.1:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
 
 buffer-equal@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"
-  integrity sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=
 
 buffer-fill@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
-  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
 
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
-
-buffer-indexof@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
-  integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
 
 buffer-more-ints@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/buffer-more-ints/-/buffer-more-ints-0.0.2.tgz#26b3885d10fa13db7fc01aae3aab870199e0124c"
-  integrity sha1-JrOIXRD6E9t/wBquOquHAZngEkw=
-
-buffer-xor@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
-  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
-
-buffer@^4.3.0:
-  version "4.9.1"
-  resolved "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
-  integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
-  dependencies:
-    base64-js "^1.0.2"
-    ieee754 "^1.1.4"
-    isarray "^1.0.0"
 
 buffer@^5.1.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.2.1.tgz#dd57fa0f109ac59c602479044dca7b8b3d0b71d6"
-  integrity sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
@@ -1665,7 +859,6 @@ buffer@^5.1.0:
 buildmail@4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/buildmail/-/buildmail-4.0.1.tgz#877f7738b78729871c9a105e3b837d2be11a7a72"
-  integrity sha1-h393OLeHKYccmhBeO4N9K+EaenI=
   dependencies:
     addressparser "1.0.1"
     libbase64 "0.1.0"
@@ -1678,58 +871,24 @@ buildmail@4.0.1:
 builtin-modules@^1.0.0, builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
-
-builtin-modules@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-2.0.0.tgz#60b7ef5ae6546bd7deefa74b08b62a43a232648e"
-  integrity sha512-3U5kUA5VPsRUA3nofm/BXX7GVHKfxz0hOBAPxXrIvHzlDRkQVqEn6yi8QJegxl4LzOHLdvb7XF5dVawa/VVYBg==
-
-builtin-status-codes@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
-  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
 builtins@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
-  integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
 
 bytebuffer@~5:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd"
-  integrity sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=
   dependencies:
     long "~3"
 
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
-cacache@^10.0.4:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
-  integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==
-  dependencies:
-    bluebird "^3.5.1"
-    chownr "^1.0.1"
-    glob "^7.1.2"
-    graceful-fs "^4.1.11"
-    lru-cache "^4.1.1"
-    mississippi "^2.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.2"
-    ssri "^5.2.4"
-    unique-filename "^1.1.0"
-    y18n "^4.0.0"
-
-cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0:
+cacache@^11.0.1, cacache@^11.2.0:
   version "11.2.0"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.2.0.tgz#617bdc0b02844af56310e411c0878941d5739965"
-  integrity sha512-IFWl6lfK6wSeYCHUXh+N1lY72UDrpyrYQJNIVQf48paDuWbv5RbAtJYf/4gUQFObTCHZwdZ5sI8Iw7nqwP6nlQ==
   dependencies:
     bluebird "^3.5.1"
     chownr "^1.0.1"
@@ -1749,7 +908,6 @@ cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0:
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
-  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
   dependencies:
     collection-visit "^1.0.0"
     component-emitter "^1.2.1"
@@ -1764,7 +922,6 @@ cache-base@^1.0.1:
 cacheable-request@^2.1.1:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d"
-  integrity sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=
   dependencies:
     clone-response "1.0.2"
     get-stream "3.0.0"
@@ -1777,12 +934,10 @@ cacheable-request@^2.1.1:
 callsite@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
-  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
 
 camelcase-keys@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
-  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
   dependencies:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
@@ -1790,7 +945,6 @@ camelcase-keys@^2.0.0:
 camelcase-keys@^4.0.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
-  integrity sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=
   dependencies:
     camelcase "^4.1.0"
     map-obj "^2.0.0"
@@ -1799,47 +953,26 @@ camelcase-keys@^4.0.0:
 camelcase@^2.0.0, camelcase@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
-  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
-
-camelcase@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
-  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
 
-camelcase@^4.0.0, camelcase@^4.1.0:
+camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
-  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
-
-caniuse-lite@^1.0.30000898, caniuse-lite@^1.0.30000899:
-  version "1.0.30000903"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000903.tgz#86d46227759279b3db345ddbe778335dbba9e858"
-  integrity sha512-T1XVJEpGCoaq7MDw7/6hCdYUukmSaS+1l/OQJkLtw7Cr2+/+d67tNGKEbyiqf7Ck8x6EhNFUxjYFXXka0N/w5g==
 
 canonical-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
-  integrity sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==
-
-capture-stack-trace@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
-  integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==
 
 caseless@~0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
-  integrity sha1-cVuW6phBWTzDMGeSP17GDr2k99c=
 
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
 chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
   dependencies:
     ansi-styles "^2.2.1"
     escape-string-regexp "^1.0.2"
@@ -1847,24 +980,32 @@ chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1:
+chalk@^2.3.0, chalk@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
-  integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
   dependencies:
     ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chardet@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
-  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
+chokidar@^1.4.1, chokidar@^1.4.2:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
+  dependencies:
+    anymatch "^1.3.0"
+    async-each "^1.0.0"
+    glob-parent "^2.0.0"
+    inherits "^2.0.1"
+    is-binary-path "^1.0.0"
+    is-glob "^2.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.0.0"
+  optionalDependencies:
+    fsevents "^1.0.0"
 
-chokidar@2.0.4, chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3:
+chokidar@^2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
-  integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.0"
@@ -1881,167 +1022,60 @@ chokidar@2.0.4, chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3:
   optionalDependencies:
     fsevents "^1.2.2"
 
-chokidar@^1.4.1, chokidar@^1.4.2:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
-  integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=
-  dependencies:
-    anymatch "^1.3.0"
-    async-each "^1.0.0"
-    glob-parent "^2.0.0"
-    inherits "^2.0.1"
-    is-binary-path "^1.0.0"
-    is-glob "^2.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-  optionalDependencies:
-    fsevents "^1.0.0"
-
 chownr@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
-  integrity sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=
-
-chrome-trace-event@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"
-  integrity sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==
-  dependencies:
-    tslib "^1.9.0"
 
 ci-info@^1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.5.1.tgz#17e8eb5de6f8b2b6038f0cbb714d410bfa9f3030"
-  integrity sha512-fKFIKXaYiL1exImwJ0AhR/6jxFPSKQBk2ayV5NiNoruUs2+rxC2kNw0EG+1Z9dugZRdCrppskQ8DN2cyaUM1Hw==
-
-cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
-  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-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"
-  integrity sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==
 
 circular-json@^0.5.4:
   version "0.5.8"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.8.tgz#40d2ff3aadee99871ebd19b41af3c9f113490003"
-  integrity sha512-VjaKMyZuVkL40usJkknJnmqQKpn2PkKS4M3/xdTRtZ0VsWl2Wbc2xdvXFXmEdmN6CKGqkm8XGyLHuFECZYEugw==
 
 circular-json@^0.5.5:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.9.tgz#932763ae88f4f7dead7a0d09c8a51a4743a53b1d"
-  integrity sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==
 
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
-  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
   dependencies:
     arr-union "^3.1.0"
     define-property "^0.2.5"
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-clean-css@4.2.1, clean-css@^4.1.11:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
-  integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==
-  dependencies:
-    source-map "~0.6.0"
-
-cli-boxes@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
-  integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM=
-
-cli-cursor@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
-  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
-  dependencies:
-    restore-cursor "^2.0.0"
-
-cli-width@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
-  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
-
 cliui@^3.0.3, cliui@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
-  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
     wrap-ansi "^2.0.0"
 
-cliui@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
-  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
-  dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-    wrap-ansi "^2.0.0"
-
-clone-deep@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
-  integrity sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==
-  dependencies:
-    for-own "^1.0.0"
-    is-plain-object "^2.0.4"
-    kind-of "^6.0.0"
-    shallow-clone "^1.0.0"
-
 clone-response@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
-  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
   dependencies:
     mimic-response "^1.0.0"
 
-clone@^2.1.1, clone@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
-  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
-
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
-codelyzer@^4.2.1:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-4.5.0.tgz#a65ddeeeca2894653253a89bfa229118ff9f59b1"
-  integrity sha512-oO6vCkjqsVrEsmh58oNlnJkRXuA30hF8cdNAQV9DytEalDwyOFRvHMnlKFzmOStNerOmPGZU9GAHnBo4tGvtiQ==
-  dependencies:
-    app-root-path "^2.1.0"
-    css-selector-tokenizer "^0.7.0"
-    cssauron "^1.4.0"
-    semver-dsl "^1.0.1"
-    source-map "^0.5.7"
-    sprintf-js "^1.1.1"
 
 collection-utils@0.0.15:
   version "0.0.15"
   resolved "https://registry.yarnpkg.com/collection-utils/-/collection-utils-0.0.15.tgz#70f4c54299621699b3f38c66577c9d4284825125"
-  integrity sha512-eLGXa67rSilE5dNCcx2wenWcmmgl4QdlwUj1Z5idKkIBOhZh6PghEZFC3wP3AHH8xnMbIDsky0pR/+1epJBymQ==
 
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
-  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
   dependencies:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
@@ -2049,19 +1083,16 @@ collection-visit@^1.0.0:
 color-convert@^1.9.0, color-convert@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
     color-name "1.1.3"
 
 color-name@1.1.3, color-name@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
 color-string@^1.5.2:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc"
-  integrity sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==
   dependencies:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
@@ -2069,7 +1100,6 @@ color-string@^1.5.2:
 color@3.0.x:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/color/-/color-3.0.0.tgz#d920b4328d534a3ac8295d68f7bd4ba6c427be9a"
-  integrity sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==
   dependencies:
     color-convert "^1.9.1"
     color-string "^1.5.2"
@@ -2077,22 +1107,18 @@ color@3.0.x:
 colornames@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz#f8889030685c7c4ff9e2a559f5077eb76a816f96"
-  integrity sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=
 
 colors@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
-  integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
 
 colors@^1.1.0, colors@^1.2.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.2.tgz#2df8ff573dfbf255af562f8ce7181d6b971a359b"
-  integrity sha512-rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ==
 
 colorspace@1.1.x:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.1.tgz#9ac2491e1bc6f8fb690e2176814f8d091636d972"
-  integrity sha512-pI3btWyiuz7Ken0BWh9Elzsmv2bM9AhA7psXib4anUXy/orfZ/E0MbQwhSOG/9L8hLlalqrU0UhOuqxW1YjmVw==
   dependencies:
     color "3.0.x"
     text-hex "1.0.x"
@@ -2100,190 +1126,102 @@ colorspace@1.1.x:
 colour@~0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/colour/-/colour-0.7.1.tgz#9cb169917ec5d12c0736d3e8685746df1cadf778"
-  integrity sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=
 
 combine-lists@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/combine-lists/-/combine-lists-1.0.1.tgz#458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"
-  integrity sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=
   dependencies:
     lodash "^4.5.0"
 
 combined-stream@1.0.6, combined-stream@~1.0.5, combined-stream@~1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-  integrity sha1-cj599ugBrFYTETp+RFqbactjKBg=
   dependencies:
     delayed-stream "~1.0.0"
 
 combined-stream@^1.0.5, combined-stream@^1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
-  integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.12.0, commander@^2.9.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
-  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
-
 commander@^2.12.1:
   version "2.18.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
-  integrity sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==
 
-commander@~2.13.0:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
-  integrity sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==
+commander@^2.9.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
 
 commander@~2.17.1:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
-  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
 
 common-tags@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
-  integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==
-
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
 compare-func@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648"
-  integrity sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=
   dependencies:
     array-ify "^1.0.0"
     dot-prop "^3.0.0"
 
-compare-versions@^3.2.1:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.4.0.tgz#e0747df5c9cb7f054d6d3dc3e1dbc444f9e92b26"
-  integrity sha512-tK69D7oNXXqUW3ZNo/z7NXTEz22TCF0pTE+YF9cxvaAM9XnkLo1fV621xCLrRR6aevJlKxExkss0vWqUCUpqdg==
-
 component-bind@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
-  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
 
 component-emitter@1.2.1, component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
 
 component-inherit@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
-  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
 
 compress-commons@^1.2.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-1.2.2.tgz#524a9f10903f3a813389b0225d27c48bb751890f"
-  integrity sha1-UkqfEJA/OoEzibAiXSfEi7dRiQ8=
   dependencies:
     buffer-crc32 "^0.2.1"
     crc32-stream "^2.0.0"
     normalize-path "^2.0.0"
     readable-stream "^2.0.0"
 
-compressible@~2.0.14:
-  version "2.0.15"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.15.tgz#857a9ab0a7e5a07d8d837ed43fe2defff64fe212"
-  integrity sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==
-  dependencies:
-    mime-db ">= 1.36.0 < 2"
-
-compression@^1.5.2:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db"
-  integrity sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==
-  dependencies:
-    accepts "~1.3.5"
-    bytes "3.0.0"
-    compressible "~2.0.14"
-    debug "2.6.9"
-    on-headers "~1.0.1"
-    safe-buffer "5.1.2"
-    vary "~1.1.2"
-
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
 concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@~1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
   dependencies:
     buffer-from "^1.0.0"
     inherits "^2.0.3"
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-configstore@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f"
-  integrity sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==
-  dependencies:
-    dot-prop "^4.1.0"
-    graceful-fs "^4.1.2"
-    make-dir "^1.0.0"
-    unique-string "^1.0.0"
-    write-file-atomic "^2.0.0"
-    xdg-basedir "^3.0.0"
-
-connect-history-api-fallback@^1.3.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a"
-  integrity sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=
-
 connect@^3.6.0:
   version "3.6.6"
   resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
-  integrity sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=
   dependencies:
     debug "2.6.9"
     finalhandler "1.1.0"
     parseurl "~1.3.2"
     utils-merge "1.0.1"
 
-console-browserify@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
-  integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=
-  dependencies:
-    date-now "^0.1.4"
-
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
-constants-browserify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
-  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
-
-content-disposition@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
-  integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
 
 content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
-  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
 conventional-changelog-angular@^1.6.6:
   version "1.6.6"
   resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.6.6.tgz#b27f2b315c16d0a1f23eb181309d0e6a4698ea0f"
-  integrity sha512-suQnFSqCxRwyBxY68pYTsFkG0taIdinHLNEAX5ivtw8bCRnIgnpvcHmlR/yjUyZIrNPYAoXlY1WiEKWgSE4BNg==
   dependencies:
     compare-func "^1.3.1"
     q "^1.5.1"
@@ -2291,21 +1229,18 @@ conventional-changelog-angular@^1.6.6:
 conventional-changelog-atom@^0.2.8:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.2.8.tgz#8037693455990e3256f297320a45fa47ee553a14"
-  integrity sha512-8pPZqhMbrnltNBizjoDCb/Sz85KyUXNDQxuAEYAU5V/eHn0okMBVjqc8aHWYpHrytyZWvMGbayOlDv7i8kEf6g==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-codemirror@^0.3.8:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.8.tgz#a1982c8291f4ee4d6f2f62817c6b2ecd2c4b7b47"
-  integrity sha512-3HFZKtBXTaUCHvz7ai6nk2+psRIkldDoNzCsom0egDtVmPsvvHZkzjynhdQyULfacRSsBTaiQ0ol6nBOL4dDiQ==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-core@^2.0.11:
   version "2.0.11"
   resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-2.0.11.tgz#19b5fbd55a9697773ed6661f4e32030ed7e30287"
-  integrity sha512-HvTE6RlqeEZ/NFPtQeFLsIDOLrGP3bXYr7lFLMhCVsbduF1MXIe8OODkwMFyo1i9ku9NWBwVnVn0jDmIFXjDRg==
   dependencies:
     conventional-changelog-writer "^3.0.9"
     conventional-commits-parser "^2.1.7"
@@ -2324,42 +1259,36 @@ conventional-changelog-core@^2.0.11:
 conventional-changelog-ember@^0.3.12:
   version "0.3.12"
   resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.3.12.tgz#b7d31851756d0fcb49b031dffeb6afa93b202400"
-  integrity sha512-mmJzA7uzbrOqeF89dMMi6z17O07ORTXlTMArnLG9ZTX4oLaKNolUlxFUFlFm9JUoVWajVpaHQWjxH1EOQ+ARoQ==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-eslint@^1.0.9:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.9.tgz#b13cc7e4b472c819450ede031ff1a75c0e3d07d3"
-  integrity sha512-h87nfVh2fdk9fJIvz26wCBsbDC/KxqCc5wSlNMZbXcARtbgNbNDIF7Y7ctokFdnxkzVdaHsbINkh548T9eBA7Q==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-express@^0.3.6:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.3.6.tgz#4a6295cb11785059fb09202180d0e59c358b9c2c"
-  integrity sha512-3iWVtBJZ9RnRnZveNDzOD8QRn6g6vUif0qVTWWyi5nUIAbuN1FfPVyKdAlJJfp5Im+dE8Kiy/d2SpaX/0X678Q==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-jquery@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz#0208397162e3846986e71273b6c79c5b5f80f510"
-  integrity sha1-Agg5cWLjhGmG5xJztsecW1+A9RA=
   dependencies:
     q "^1.4.1"
 
 conventional-changelog-jscs@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz#0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c"
-  integrity sha1-BHnrRDzH1yxYvwvPDvHURKkvDlw=
   dependencies:
     q "^1.4.1"
 
 conventional-changelog-jshint@^0.3.8:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.8.tgz#9051c1ac0767abaf62a31f74d2fe8790e8acc6c8"
-  integrity sha512-hn9QU4ZI/5V50wKPJNPGT4gEWgiBFpV6adieILW4MaUFynuDYOvQ71EMSj3EznJyKi/KzuXpc9dGmX8njZMjig==
   dependencies:
     compare-func "^1.3.1"
     q "^1.5.1"
@@ -2367,12 +1296,10 @@ conventional-changelog-jshint@^0.3.8:
 conventional-changelog-preset-loader@^1.1.8:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.8.tgz#40bb0f142cd27d16839ec6c74ee8db418099b373"
-  integrity sha512-MkksM4G4YdrMlT2MbTsV2F6LXu/hZR0Tc/yenRrDIKRwBl/SP7ER4ZDlglqJsCzLJi4UonBc52Bkm5hzrOVCcw==
 
 conventional-changelog-writer@^3.0.9:
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-3.0.9.tgz#4aecdfef33ff2a53bb0cf3b8071ce21f0e994634"
-  integrity sha512-n9KbsxlJxRQsUnK6wIBRnARacvNnN4C/nxnxCkH+B/R1JS2Fa+DiP1dU4I59mEDEjgnFaN2+9wr1P1s7GYB5/Q==
   dependencies:
     compare-func "^1.3.1"
     conventional-commits-filter "^1.1.6"
@@ -2388,7 +1315,6 @@ conventional-changelog-writer@^3.0.9:
 conventional-changelog@^1.1.0:
   version "1.1.24"
   resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.24.tgz#3d94c29c960f5261c002678315b756cdd3d7d1f0"
-  integrity sha512-2WcSUst4Y3Z4hHvoMTWXMJr/DmgVdLiMOVY1Kak2LfFz+GIz2KDp5naqbFesYbfXPmaZ5p491dO0FWZIJoJw1Q==
   dependencies:
     conventional-changelog-angular "^1.6.6"
     conventional-changelog-atom "^0.2.8"
@@ -2405,7 +1331,6 @@ conventional-changelog@^1.1.0:
 conventional-commits-filter@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.1.6.tgz#4389cd8e58fe89750c0b5fb58f1d7f0cc8ad3831"
-  integrity sha512-KcDgtCRKJCQhyk6VLT7zR+ZOyCnerfemE/CsR3iQpzRRFbLEs0Y6rwk3mpDvtOh04X223z+1xyJ582Stfct/0Q==
   dependencies:
     is-subset "^0.1.1"
     modify-values "^1.0.0"
@@ -2413,7 +1338,6 @@ conventional-commits-filter@^1.1.6:
 conventional-commits-parser@^2.1.7:
   version "2.1.7"
   resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz#eca45ed6140d72ba9722ee4132674d639e644e8e"
-  integrity sha512-BoMaddIEJ6B4QVMSDu9IkVImlGOSGA1I2BQyOZHeLQ6qVOJLcLKn97+fL6dGbzWEiqDzfH4OkcveULmeq2MHFQ==
   dependencies:
     JSONStream "^1.0.4"
     is-text-path "^1.0.0"
@@ -2426,7 +1350,6 @@ conventional-commits-parser@^2.1.7:
 conventional-commits-parser@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.0.tgz#7f604549a50bd8f60443fbe515484b1c2f06a5c4"
-  integrity sha512-GWh71U26BLWgMykCp+VghZ4s64wVbtseECcKQ/PvcPZR2cUnz+FUc2J9KjxNl7/ZbCxST8R03c9fc+Vi0umS9Q==
   dependencies:
     JSONStream "^1.0.4"
     is-text-path "^1.0.0"
@@ -2436,27 +1359,19 @@ conventional-commits-parser@^3.0.0:
     through2 "^2.0.0"
     trim-off-newlines "^1.0.0"
 
-convert-source-map@^1.5.0, convert-source-map@^1.5.1:
+convert-source-map@^1.5.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
-  integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
   dependencies:
     safe-buffer "~5.1.1"
 
-cookie-signature@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
-
 cookie@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
-  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
 
 copy-concurrently@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
-  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
   dependencies:
     aproba "^1.1.1"
     fs-write-stream-atomic "^1.0.8"
@@ -2468,51 +1383,18 @@ copy-concurrently@^1.0.0:
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
-
-copy-webpack-plugin@4.5.4:
-  version "4.5.4"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.4.tgz#f2b2782b3cd5225535c3dc166a80067e7d940f27"
-  integrity sha512-0lstlEyj74OAtYMrDxlNZsU7cwFijAI3Ofz2fD6Mpo9r4xCv4yegfa3uHIKvZY1NSuOtE9nvG6TAhJ+uz9gDaQ==
-  dependencies:
-    cacache "^10.0.4"
-    find-cache-dir "^1.0.0"
-    globby "^7.1.1"
-    is-glob "^4.0.0"
-    loader-utils "^1.1.0"
-    minimatch "^3.0.4"
-    p-limit "^1.0.0"
-    serialize-javascript "^1.4.0"
 
-core-js@^2.2.0, core-js@^2.4.0, core-js@^2.4.1:
+core-js@^2.2.0:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
-  integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==
-
-core-js@~2.3.0:
-  version "2.3.0"
-  resolved "http://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"
-  integrity sha1-+rg/uwstjchfpjbEudNMdUIMbWU=
 
 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"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
-cosmiconfig@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
-  integrity sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==
-  dependencies:
-    is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    parse-json "^4.0.0"
-    require-from-string "^2.0.1"
 
 crc32-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-2.0.0.tgz#e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"
-  integrity sha1-483TtN8xaN10494/u8t7KX/pCPQ=
   dependencies:
     crc "^3.4.4"
     readable-stream "^2.0.0"
@@ -2520,238 +1402,92 @@ crc32-stream@^2.0.0:
 crc@^3.4.4:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6"
-  integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==
   dependencies:
     buffer "^5.1.0"
 
-create-ecdh@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
-  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
-  dependencies:
-    bn.js "^4.1.0"
-    elliptic "^6.0.0"
-
-create-error-class@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
-  integrity sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=
-  dependencies:
-    capture-stack-trace "^1.0.0"
-
-create-hash@^1.1.0, create-hash@^1.1.2:
-  version "1.2.0"
-  resolved "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
-  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
-  dependencies:
-    cipher-base "^1.0.1"
-    inherits "^2.0.1"
-    md5.js "^1.3.4"
-    ripemd160 "^2.0.1"
-    sha.js "^2.4.0"
-
-create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
-  version "1.1.7"
-  resolved "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
-  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
-  dependencies:
-    cipher-base "^1.0.3"
-    create-hash "^1.1.0"
-    inherits "^2.0.1"
-    ripemd160 "^2.0.0"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
-cross-spawn@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
-  integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI=
-  dependencies:
-    lru-cache "^4.0.1"
-    which "^1.2.9"
-
 cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
-  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
   dependencies:
     lru-cache "^4.0.1"
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^6.0.0:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
 cryptiles@2.x.x:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
-  integrity sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=
   dependencies:
     boom "2.x.x"
 
 cryptiles@3.x.x:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
-  integrity sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=
   dependencies:
     boom "5.x.x"
 
-crypto-browserify@^3.11.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
-  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
-  dependencies:
-    browserify-cipher "^1.0.0"
-    browserify-sign "^4.0.0"
-    create-ecdh "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.0"
-    diffie-hellman "^5.0.0"
-    inherits "^2.0.1"
-    pbkdf2 "^3.0.3"
-    public-encrypt "^4.0.0"
-    randombytes "^2.0.0"
-    randomfill "^1.0.3"
-
-crypto-random-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
-  integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=
-
-css-parse@1.7.x:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
-  integrity sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=
-
-css-selector-tokenizer@^0.7.0:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz#a177271a8bca5019172f4f891fc6eed9cbf68d5d"
-  integrity sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==
-  dependencies:
-    cssesc "^0.1.0"
-    fastparse "^1.1.1"
-    regexpu-core "^1.0.0"
-
-cssauron@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/cssauron/-/cssauron-1.4.0.tgz#a6602dff7e04a8306dc0db9a551e92e8b5662ad8"
-  integrity sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=
-  dependencies:
-    through X.X.X
-
-cssesc@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
-  integrity sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=
-
-cuint@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
-  integrity sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=
-
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
-  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
   dependencies:
     array-find-index "^1.0.1"
 
 custom-event@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
-  integrity sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=
 
 cyclist@~0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
-  integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
 
 dargs@^4.0.1:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
-  integrity sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=
   dependencies:
     number-is-nan "^1.0.0"
 
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
   dependencies:
     assert-plus "^1.0.0"
 
 data-uri-to-buffer@1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz#77163ea9c20d8641b4707e8f18abdf9a78f34835"
-  integrity sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ==
 
 date-format@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"
-  integrity sha1-YV6CjiM90aubua4JUODOzPpuytg=
-
-date-now@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
-  integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
 
 dateformat@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
-  integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
-
-debug@*:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
-  integrity sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==
-  dependencies:
-    ms "^2.1.1"
 
-debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@~2.6.4, debug@~2.6.6:
+debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@~2.6.4, debug@~2.6.6:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
 debug@3.1.0, debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
   dependencies:
     ms "2.0.0"
 
 debug@^3.1.0:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.4.tgz#82123737c51afbe9609a2b5dfe9664e7487171f0"
-  integrity sha512-fCEG5fOr7m/fhgOD3KurdAov706JbXZJYXAsAOEJ7GgasGr0GO4N+1NsIcrjlIUcyvJ9oZlnelTzN3Ix8z1ecw==
-  dependencies:
-    ms "^2.1.1"
-
-debug@^3.2.5:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
   dependencies:
     ms "^2.1.1"
 
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
-  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
 
 decamelize-keys@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
-  integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
   dependencies:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
@@ -2759,75 +1495,40 @@ decamelize-keys@^1.0.0:
 decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
-decamelize@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
-  integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==
-  dependencies:
-    xregexp "4.0.0"
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 decompress-response@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
-  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
   dependencies:
     mimic-response "^1.0.0"
 
-deep-equal@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
-  integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
-
 deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
-
-default-gateway@^2.6.0:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f"
-  integrity sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==
-  dependencies:
-    execa "^0.10.0"
-    ip-regex "^2.1.0"
-
-default-require-extensions@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
-  integrity sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=
-  dependencies:
-    strip-bom "^3.0.0"
 
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
   dependencies:
     is-descriptor "^0.1.0"
 
 define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
   dependencies:
     is-descriptor "^1.0.0"
 
 define-property@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
-  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
   dependencies:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
@@ -2835,91 +1536,34 @@ define-property@^2.0.2:
 degenerator@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-1.0.4.tgz#fcf490a37ece266464d9cc431ab98c5819ced095"
-  integrity sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=
   dependencies:
     ast-types "0.x.x"
     escodegen "1.x.x"
     esprima "3.x.x"
 
-del@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
-  integrity sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=
-  dependencies:
-    globby "^5.0.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    rimraf "^2.2.8"
-
-del@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
-  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
-  dependencies:
-    globby "^6.1.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    p-map "^1.1.1"
-    pify "^3.0.0"
-    rimraf "^2.2.8"
-
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
 depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
 dependency-graph@^0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.7.2.tgz#91db9de6eb72699209d88aea4c1fd5221cac1c49"
-  integrity sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==
-
-des.js@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
-  integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=
-  dependencies:
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-
-destroy@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
-
-detect-indent@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
-  integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg=
-  dependencies:
-    repeating "^2.0.0"
 
 detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
-detect-node@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
-  integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
 
 dezalgo@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
-  integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
   dependencies:
     asap "^2.0.0"
     wrappy "1"
@@ -2927,12 +1571,10 @@ dezalgo@^1.0.0:
 di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
-  integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=
 
 diagnostics@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.1.1.tgz#cab6ac33df70c9d9a727490ae43ac995a769b22a"
-  integrity sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==
   dependencies:
     colorspace "1.1.x"
     enabled "1.0.x"
@@ -2941,100 +1583,39 @@ diagnostics@^1.1.1:
 diff@^3.1.0, diff@^3.2.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
-
-diffie-hellman@^5.0.0:
-  version "5.0.3"
-  resolved "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
-  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
-  dependencies:
-    bn.js "^4.1.0"
-    miller-rabin "^4.0.0"
-    randombytes "^2.0.0"
-
-dir-glob@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
-  integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==
-  dependencies:
-    arrify "^1.0.1"
-    path-type "^3.0.0"
-
-dns-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
-  integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
-
-dns-packet@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
-  integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
-  dependencies:
-    ip "^1.1.0"
-    safe-buffer "^5.0.1"
-
-dns-txt@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
-  integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=
-  dependencies:
-    buffer-indexof "^1.0.0"
 
 dom-serialize@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
-  integrity sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=
   dependencies:
     custom-event "~1.0.0"
     ent "~2.2.0"
     extend "^3.0.0"
     void-elements "^2.0.0"
 
-domain-browser@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
-  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
-
-domino@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.0.tgz#653ba7d331441113b42e40ba05f24253ec86e02e"
-  integrity sha512-xINSODvrnuQcm3eXJN4IkBR+JxqLrJN8Ge4fd00y1b7HsY0A4huKN5BflSS/oo8quBWmocTfWdFvrw2H8TjGqQ==
-
 dot-prop@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
-  integrity sha1-G3CK8JSknJoOfbyteQq6U52sEXc=
-  dependencies:
-    is-obj "^1.0.0"
-
-dot-prop@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
-  integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==
   dependencies:
     is-obj "^1.0.0"
 
 double-ended-queue@^2.1.0-0:
   version "2.1.0-0"
   resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
-  integrity sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw=
 
 duplexer2@~0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
-  integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=
   dependencies:
     readable-stream "^2.0.2"
 
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
-  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
 
 duplexify@^3.4.2, duplexify@^3.6.0:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.1.tgz#b1a7a29c4abfd639585efaecce80d666b1e34125"
-  integrity sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==
   dependencies:
     end-of-stream "^1.0.0"
     inherits "^2.0.1"
@@ -3044,7 +1625,6 @@ duplexify@^3.4.2, duplexify@^3.6.0:
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
   dependencies:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
@@ -3052,61 +1632,32 @@ ecc-jsbn@~0.1.1:
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-
-electron-to-chromium@^1.3.82:
-  version "1.3.82"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.82.tgz#7d13ae4437d2a783de3f4efba96b186c540b67b1"
-  integrity sha512-NI4nB2IWGcU4JVT1AE8kBb/dFor4zjLHMLsOROPahppeHrR0FG5uslxMmkp/thO1MvPjM2xhlKoY29/I60s0ew==
-
-elliptic@^6.0.0:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
-  integrity sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==
-  dependencies:
-    bn.js "^4.4.0"
-    brorand "^1.0.1"
-    hash.js "^1.0.0"
-    hmac-drbg "^1.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.0"
-
-emojis-list@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
 
 enabled@1.0.x:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz#965f6513d2c2d1c5f4652b64a2e3396467fc2f93"
-  integrity sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=
   dependencies:
     env-variable "0.0.x"
 
-encodeurl@~1.0.1, encodeurl@~1.0.2:
+encodeurl@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
 encoding@^0.1.11:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
-  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
   dependencies:
     iconv-lite "~0.4.13"
 
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
-  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
   dependencies:
     once "^1.4.0"
 
 engine.io-client@~3.1.0:
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.1.6.tgz#5bdeb130f8b94a50ac5cbeb72583e7a4a063ddfd"
-  integrity sha512-hnuHsFluXnsKOndS4Hv6SvUrgdYx1pk2NqfaDMW+GWdgfU3+/V25Cj7I8a0x92idSpa5PIhJRKxPvp9mnoLsfg==
   dependencies:
     component-emitter "1.2.1"
     component-inherit "0.0.3"
@@ -3123,7 +1674,6 @@ engine.io-client@~3.1.0:
 engine.io-client@~3.2.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36"
-  integrity sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==
   dependencies:
     component-emitter "1.2.1"
     component-inherit "0.0.3"
@@ -3140,7 +1690,6 @@ engine.io-client@~3.2.0:
 engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.2.tgz#4c0f4cff79aaeecbbdcfdea66a823c6085409196"
-  integrity sha512-dInLFzr80RijZ1rGpx1+56/uFoH7/7InhH3kZt+Ms6hT8tNx3NGW/WNSA/f8As1WkOfkuyb3tnRyuXGxusclMw==
   dependencies:
     after "0.8.2"
     arraybuffer.slice "~0.0.7"
@@ -3151,7 +1700,6 @@ engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
 engine.io@~3.1.0:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.1.5.tgz#0e7ef9d690eb0b35597f1d4ad02a26ca2dba3845"
-  integrity sha512-D06ivJkYxyRrcEe0bTpNnBQNgP9d3xog+qZlLbui8EsMr/DouQpf5o9FzJnWYHEYE0YsFHllUv2R1dkgYZXHcA==
   dependencies:
     accepts "~1.3.4"
     base64id "1.0.0"
@@ -3165,7 +1713,6 @@ engine.io@~3.1.0:
 engine.io@~3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.0.tgz#54332506f42f2edc71690d2f2a42349359f3bf7d"
-  integrity sha512-mRbgmAtQ4GAlKwuPnnAvXXwdPhEx+jkc0OBCLrXuD/CRvwNK3AxRSnqK4FSqmAMRRHryVJP8TopOvmEaA64fKw==
   dependencies:
     accepts "~1.3.4"
     base64id "1.0.0"
@@ -3174,75 +1721,45 @@ engine.io@~3.2.0:
     engine.io-parser "~2.1.0"
     ws "~3.3.1"
 
-enhanced-resolve@4.1.0, enhanced-resolve@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
-  integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
-  dependencies:
-    graceful-fs "^4.1.2"
-    memory-fs "^0.4.0"
-    tapable "^1.0.0"
-
 ent@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
-  integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0=
 
 env-variable@0.0.x:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.4.tgz#0d6280cf507d84242befe35a512b5ae4be77c54e"
-  integrity sha512-+jpGxSWG4vr6gVxUHOc4p+ilPnql7NzZxOZBxNldsKGjCF+97df3CbuX7XMaDa5oAVkKQj4rKp38rYdC4VcpDg==
 
 err-code@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
-  integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=
-
-errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
-  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
-  dependencies:
-    prr "~1.0.1"
 
 error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
 es6-promise@^4.0.3:
   version "4.2.5"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
-  integrity sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==
-
-es6-promise@~3.0.2:
-  version "3.0.2"
-  resolved "http://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6"
-  integrity sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=
 
 es6-promisify@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
-  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
   dependencies:
     es6-promise "^4.0.3"
 
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
 escodegen@1.8.x:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
-  integrity sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=
   dependencies:
     esprima "^2.7.1"
     estraverse "^1.9.1"
@@ -3254,7 +1771,6 @@ escodegen@1.8.x:
 escodegen@1.x.x, escodegen@^1.8.1:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589"
-  integrity sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==
   dependencies:
     esprima "^3.1.3"
     estraverse "^4.2.0"
@@ -3266,7 +1782,6 @@ escodegen@1.x.x, escodegen@^1.8.1:
 escodegen@~1.9.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"
-  integrity sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==
   dependencies:
     esprima "^3.1.3"
     estraverse "^4.2.0"
@@ -3275,103 +1790,37 @@ escodegen@~1.9.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-scope@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
-  integrity sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==
-  dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
 esprima@2.7.x, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
-  integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=
 
 esprima@3.x.x, esprima@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
 
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
-esrecurse@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
-  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
-  dependencies:
-    estraverse "^4.1.0"
 
 estraverse@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
-  integrity sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=
 
-estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
-  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
-
-estree-walker@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39"
-  integrity sha512-XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig==
 
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
-
-etag@~1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
 eventemitter3@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
-  integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
-
-events@^1.0.0:
-  version "1.1.1"
-  resolved "http://registry.npmjs.org/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
-  integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=
-
-eventsource@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"
-  integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==
-  dependencies:
-    original "^1.0.0"
-
-evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
-  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
-  dependencies:
-    md5.js "^1.3.4"
-    safe-buffer "^5.1.1"
-
-execa@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
-  integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
 
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
-  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
   dependencies:
     cross-spawn "^5.0.1"
     get-stream "^3.0.0"
@@ -3384,12 +1833,10 @@ execa@^0.7.0:
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
 expand-braces@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea"
-  integrity sha1-SIsdHSRRyz06axks/AMPRMWFX+o=
   dependencies:
     array-slice "^0.2.3"
     array-unique "^0.2.1"
@@ -3398,14 +1845,12 @@ expand-braces@^0.1.1:
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
   dependencies:
     is-posix-bracket "^0.1.0"
 
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
   dependencies:
     debug "^2.3.3"
     define-property "^0.2.5"
@@ -3418,7 +1863,6 @@ expand-brackets@^2.1.4:
 expand-range@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-0.1.1.tgz#4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"
-  integrity sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=
   dependencies:
     is-number "^0.1.1"
     repeat-string "^0.2.2"
@@ -3426,57 +1870,18 @@ expand-range@^0.1.0:
 expand-range@^1.8.1:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
   dependencies:
     fill-range "^2.1.0"
 
-express@^4.16.2:
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
-  integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
-  dependencies:
-    accepts "~1.3.5"
-    array-flatten "1.1.1"
-    body-parser "1.18.3"
-    content-disposition "0.5.2"
-    content-type "~1.0.4"
-    cookie "0.3.1"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "~1.1.2"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "1.1.1"
-    fresh "0.5.2"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.4"
-    qs "6.5.2"
-    range-parser "~1.2.0"
-    safe-buffer "5.1.2"
-    send "0.16.2"
-    serve-static "1.13.2"
-    setprototypeof "1.1.0"
-    statuses "~1.4.0"
-    type-is "~1.6.16"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
-
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
   dependencies:
     is-extendable "^0.1.0"
 
 extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
   dependencies:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
@@ -3484,28 +1889,16 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
 extend@3, extend@^3.0.0, extend@~3.0.0, extend@~3.0.1, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-
-external-editor@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
-  integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
-  dependencies:
-    chardet "^0.7.0"
-    iconv-lite "^0.4.24"
-    tmp "^0.0.33"
 
 extglob@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
   dependencies:
     is-extglob "^1.0.0"
 
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
-  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
   dependencies:
     array-unique "^0.3.2"
     define-property "^1.0.0"
@@ -3519,17 +1912,14 @@ extglob@^2.0.4:
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
 
 extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
 falafel@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.1.0.tgz#96bb17761daba94f46d001738b3cedf3a67fe06c"
-  integrity sha1-lrsXdh2rqU9G0AFzizzt86Z/4Gw=
   dependencies:
     acorn "^5.0.0"
     foreach "^2.0.5"
@@ -3539,94 +1929,42 @@ falafel@^2.1.0:
 fast-deep-equal@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
-  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
 
 fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
 
-fast-json-stable-stringify@2.0.0, fast-json-stable-stringify@^2.0.0:
+fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
 fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fast-safe-stringify@^2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.6.tgz#04b26106cc56681f51a044cfc0d76cf0008ac2c2"
-  integrity sha512-q8BZ89jjc+mz08rSxROs8VsrBBcn1SIw1kq9NjolL509tkABRk9io01RAjSaEv1Xb2uFLt8VtRiZbGp5H8iDtg==
-
-fastparse@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
-  integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
-
-faye-websocket@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
-  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
-  dependencies:
-    websocket-driver ">=0.5.1"
-
-faye-websocket@~0.11.1:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
-  integrity sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=
-  dependencies:
-    websocket-driver ">=0.5.1"
 
 fecha@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd"
-  integrity sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==
 
 figgy-pudding@^3.1.0, figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
-  integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
-
-figures@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
-file-loader@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-2.0.0.tgz#39749c82f020b9e85901dcff98e8004e6401cfde"
-  integrity sha512-YCsBfd1ZGCyonOKLxPiKPdu+8ld9HAaMEvJewzz+b2eTF7uL5Zm/HdBF6FjCrpCMRq25Mi0U1gl4pwn2TlH7hQ==
-  dependencies:
-    loader-utils "^1.0.2"
-    schema-utils "^1.0.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"
-  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
-
-fileset@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
-  integrity sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=
-  dependencies:
-    glob "^7.0.3"
-    minimatch "^3.0.3"
 
 fill-range@^2.1.0:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
-  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
   dependencies:
     is-number "^2.1.0"
     isobject "^2.0.0"
@@ -3637,7 +1975,6 @@ fill-range@^2.1.0:
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
   dependencies:
     extend-shallow "^2.0.1"
     is-number "^3.0.0"
@@ -3647,7 +1984,6 @@ fill-range@^4.0.0:
 finalhandler@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
-  integrity sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.1"
@@ -3657,68 +1993,22 @@ finalhandler@1.1.0:
     statuses "~1.3.1"
     unpipe "~1.0.0"
 
-finalhandler@1.1.1:
-  version "1.1.1"
-  resolved "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
-  integrity sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    statuses "~1.4.0"
-    unpipe "~1.0.0"
-
-find-cache-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
-  integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^1.0.0"
-    pkg-dir "^2.0.0"
-
-find-cache-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d"
-  integrity sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^1.0.0"
-    pkg-dir "^3.0.0"
-
-find-parent-dir@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
-  integrity sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=
-
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
-  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
   dependencies:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
-find-up@^2.0.0, find-up@^2.1.0:
+find-up@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
   dependencies:
     locate-path "^2.0.0"
 
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
-
 flush-write-stream@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
-  integrity sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.4"
@@ -3726,60 +2016,36 @@ flush-write-stream@^1.0.0:
 follow-redirects@1.0.0:
   version "1.0.0"
   resolved "http://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz#8e34298cbd2e176f254effec75a1c78cc849fd37"
-  integrity sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=
   dependencies:
     debug "^2.2.0"
 
 follow-redirects@^1.0.0:
   version "1.5.7"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.7.tgz#a39e4804dacb90202bca76a9e2ac10433ca6a69a"
-  integrity sha512-NONJVIFiX7Z8k2WxfqBjtwqMifx7X42ORLFrOZ2LTKGj71G3C0kfdyTqGqr8fx5zSX6Foo/D95dgGWbPUiwnew==
   dependencies:
     debug "^3.1.0"
 
-font-awesome@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
-  integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=
-
-for-in@^0.1.3:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
-  integrity sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=
-
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
 for-own@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
-  dependencies:
-    for-in "^1.0.1"
-
-for-own@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
-  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
   dependencies:
     for-in "^1.0.1"
 
 foreach@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
-  integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
 
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
 form-data@~2.0.0:
   version "2.0.0"
   resolved "http://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz#6f0aebadcc5da16c13e1ecc11137d85f9b883b25"
-  integrity sha1-bwrrrcxdoWwT4ezBETfYX5uIOyU=
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.5"
@@ -3788,7 +2054,6 @@ form-data@~2.0.0:
 form-data@~2.3.0:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.6"
@@ -3797,33 +2062,20 @@ form-data@~2.3.0:
 form-data@~2.3.1, form-data@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
-  integrity sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=
   dependencies:
     asynckit "^0.4.0"
     combined-stream "1.0.6"
     mime-types "^2.1.12"
 
-forwarded@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
-  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
-
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
   dependencies:
     map-cache "^0.2.2"
 
-fresh@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
-
 from2@^2.1.0, from2@^2.1.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
@@ -3831,35 +2083,22 @@ from2@^2.1.0, from2@^2.1.1:
 fs-access@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/fs-access/-/fs-access-1.0.1.tgz#d6a87f262271cefebec30c553407fb995da8777a"
-  integrity sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=
   dependencies:
     null-check "^1.0.0"
 
 fs-constants@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
-  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
-
-fs-extra@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.0.tgz#8cc3f47ce07ef7b3593a11b9fb245f7e34c041d6"
-  integrity sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
 
 fs-minipass@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
-  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
   dependencies:
     minipass "^2.2.1"
 
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
-  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
   dependencies:
     graceful-fs "^4.1.2"
     iferr "^0.1.5"
@@ -3869,30 +2108,17 @@ fs-write-stream-atomic@^1.0.8:
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.0.0, fsevents@^1.2.2:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
-  integrity sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==
   dependencies:
     nan "^2.9.2"
     node-pre-gyp "^0.10.0"
 
-fstream@^1.0.0, fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
-  integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
-  dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
-
 ftp@~0.3.10:
   version "0.3.10"
   resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
-  integrity sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=
   dependencies:
     readable-stream "1.1.x"
     xregexp "2.0.0"
@@ -3900,12 +2126,10 @@ ftp@~0.3.10:
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
   dependencies:
     aproba "^1.0.3"
     console-control-strings "^1.0.0"
@@ -3916,41 +2140,29 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-gaze@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
-  integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
-  dependencies:
-    globule "^1.0.0"
-
 generate-function@^2.0.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f"
-  integrity sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==
   dependencies:
     is-property "^1.0.2"
 
 generate-object-property@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
-  integrity sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=
   dependencies:
     is-property "^1.0.0"
 
 genfun@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
-  integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==
 
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
-  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
 get-pkg-repo@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
-  integrity sha1-xztInAbYDMVTbCyFP54FIyBWly0=
   dependencies:
     hosted-git-info "^2.1.4"
     meow "^3.3.0"
@@ -3961,24 +2173,20 @@ get-pkg-repo@^1.0.0:
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
-  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
 get-stream@3.0.0, get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
 
 get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
-  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
   dependencies:
     pump "^3.0.0"
 
 get-uri@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.2.tgz#5c795e71326f6ca1286f2fc82575cd2bab2af578"
-  integrity sha512-ZD325dMZOgerGqF/rF6vZXyFGTAay62svjQIT+X/oU2PtxYpFxvSkbsdi+oxIrsNxlZVd4y8wUDqkaExWTI/Cw==
   dependencies:
     data-uri-to-buffer "1"
     debug "2"
@@ -3990,19 +2198,16 @@ get-uri@^2.0.0:
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
   dependencies:
     assert-plus "^1.0.0"
 
 gh-got@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/gh-got/-/gh-got-7.1.0.tgz#f2b14eef375ce49b66d5f034a1c124f56dc5bcf0"
-  integrity sha512-KeWkkhresa7sbpzQLYzITMgez5rMigUsijhmSAHcLDORIMUbdlkdoZyaN1wQvIjmUZnyb/wkAPaXb4MQKX0mdQ==
   dependencies:
     got "^8.0.0"
     is-plain-obj "^1.1.0"
@@ -4010,7 +2215,6 @@ gh-got@^7.0.0:
 git-raw-commits@^1.3.6:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.3.6.tgz#27c35a32a67777c1ecd412a239a6c19d71b95aff"
-  integrity sha512-svsK26tQ8vEKnMshTDatSIQSMDdz8CxIIqKsvPqbtV23Etmw6VNaFAitu8zwZ0VrOne7FztwPyRLxK7/DIUTQg==
   dependencies:
     dargs "^4.0.1"
     lodash.template "^4.0.2"
@@ -4021,7 +2225,6 @@ git-raw-commits@^1.3.6:
 git-raw-commits@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.0.tgz#d92addf74440c14bcc5c83ecce3fb7f8a79118b5"
-  integrity sha512-w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg==
   dependencies:
     dargs "^4.0.1"
     lodash.template "^4.0.2"
@@ -4032,7 +2235,6 @@ git-raw-commits@^2.0.0:
 git-remote-origin-url@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f"
-  integrity sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=
   dependencies:
     gitconfiglocal "^1.0.0"
     pify "^2.3.0"
@@ -4040,7 +2242,6 @@ git-remote-origin-url@^2.0.0:
 git-semver-tags@^1.3.6:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.3.6.tgz#357ea01f7280794fe0927f2806bee6414d2caba5"
-  integrity sha512-2jHlJnln4D/ECk9FxGEBh3k44wgYdWjWDtMmJPaecjoRmxKo3Y1Lh8GMYuOPu04CHw86NTAODchYjC5pnpMQig==
   dependencies:
     meow "^4.0.0"
     semver "^5.5.0"
@@ -4048,14 +2249,12 @@ git-semver-tags@^1.3.6:
 gitconfiglocal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"
-  integrity sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=
   dependencies:
     ini "^1.3.2"
 
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
   dependencies:
     glob-parent "^2.0.0"
     is-glob "^2.0.0"
@@ -4063,34 +2262,29 @@ glob-base@^0.3.0:
 glob-parent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
   dependencies:
     is-glob "^2.0.0"
 
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
   dependencies:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob@7.0.x:
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
-  integrity sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=
+glob@^5.0.15:
+  version "5.0.15"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
   dependencies:
-    fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.0.2"
+    minimatch "2 || 3"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1:
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -4099,99 +2293,9 @@ glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glo
     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"
-  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-global-dirs@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
-  integrity sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=
-  dependencies:
-    ini "^1.3.4"
-
-globals@^11.1.0:
-  version "11.8.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.8.0.tgz#c1ef45ee9bed6badf0663c5cb90e8d1adec1321d"
-  integrity sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==
-
-globals@^9.18.0:
-  version "9.18.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
-  integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
-
-globby@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
-  integrity sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=
-  dependencies:
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-globby@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
-  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
-  dependencies:
-    array-union "^1.0.1"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-globby@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
-  integrity sha1-+yzP+UAfhgCUXfral0QMypcrhoA=
-  dependencies:
-    array-union "^1.0.1"
-    dir-glob "^2.0.0"
-    glob "^7.1.2"
-    ignore "^3.3.5"
-    pify "^3.0.0"
-    slash "^1.0.0"
-
-globule@^1.0.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d"
-  integrity sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==
-  dependencies:
-    glob "~7.1.1"
-    lodash "~4.17.10"
-    minimatch "~3.0.2"
-
-got@^6.7.1:
-  version "6.7.1"
-  resolved "http://registry.npmjs.org/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
-  integrity sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=
-  dependencies:
-    create-error-class "^3.0.0"
-    duplexer3 "^0.1.4"
-    get-stream "^3.0.0"
-    is-redirect "^1.0.0"
-    is-retry-allowed "^1.0.0"
-    is-stream "^1.0.0"
-    lowercase-keys "^1.0.0"
-    safe-buffer "^5.0.1"
-    timed-out "^4.0.0"
-    unzip-response "^2.0.1"
-    url-parse-lax "^1.0.0"
-
 got@^8.0.0:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937"
-  integrity sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==
   dependencies:
     "@sindresorhus/is" "^0.7.0"
     cacheable-request "^2.1.1"
@@ -4214,17 +2318,10 @@ got@^8.0.0:
 graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
 
-handle-thing@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
-  integrity sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=
-
-handlebars@^4.0.1, handlebars@^4.0.11, handlebars@^4.0.2:
+handlebars@^4.0.1, handlebars@^4.0.2:
   version "4.0.12"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5"
-  integrity sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==
   dependencies:
     async "^2.5.0"
     optimist "^0.6.1"
@@ -4235,12 +2332,10 @@ handlebars@^4.0.1, handlebars@^4.0.11, handlebars@^4.0.2:
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
 har-validator@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
-  integrity sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=
   dependencies:
     chalk "^1.1.1"
     commander "^2.9.0"
@@ -4250,7 +2345,6 @@ har-validator@~2.0.6:
 har-validator@~5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
-  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
   dependencies:
     ajv "^5.1.0"
     har-schema "^2.0.0"
@@ -4258,7 +2352,6 @@ har-validator@~5.0.3:
 har-validator@~5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
-  integrity sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==
   dependencies:
     ajv "^5.3.0"
     har-schema "^2.0.0"
@@ -4266,53 +2359,44 @@ har-validator@~5.1.0:
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
   dependencies:
     ansi-regex "^2.0.0"
 
 has-binary2@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
-  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
   dependencies:
     isarray "2.0.1"
 
 has-cors@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
-  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
 
 has-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
 
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
 has-symbol-support-x@^1.4.1:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
-  integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==
 
 has-to-string-tag-x@^1.2.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
-  integrity sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==
   dependencies:
     has-symbol-support-x "^1.4.1"
 
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
 
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
   dependencies:
     get-value "^2.0.3"
     has-values "^0.1.4"
@@ -4321,7 +2405,6 @@ has-value@^0.3.1:
 has-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
   dependencies:
     get-value "^2.0.6"
     has-values "^1.0.0"
@@ -4330,12 +2413,10 @@ has-value@^1.0.0:
 has-values@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
 
 has-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
   dependencies:
     is-number "^3.0.0"
     kind-of "^4.0.0"
@@ -4343,30 +2424,12 @@ has-values@^1.0.0:
 has@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
     function-bind "^1.1.1"
 
-hash-base@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
-  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.5.tgz#e38ab4b85dfb1e0c40fe9265c0e9b54854c23812"
-  integrity sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==
-  dependencies:
-    inherits "^2.0.3"
-    minimalistic-assert "^1.0.1"
-
 hawk@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
-  integrity sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=
   dependencies:
     boom "2.x.x"
     cryptiles "2.x.x"
@@ -4376,7 +2439,6 @@ hawk@~3.1.3:
 hawk@~6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
-  integrity sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==
   dependencies:
     boom "4.x.x"
     cryptiles "3.x.x"
@@ -4386,97 +2448,45 @@ hawk@~6.0.2:
 hipchat-notifier@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/hipchat-notifier/-/hipchat-notifier-1.1.0.tgz#b6d249755437c191082367799d3ba9a0f23b231e"
-  integrity sha1-ttJJdVQ3wZEII2d5nTupoPI7Ix4=
   dependencies:
     lodash "^4.0.0"
     request "^2.0.0"
 
-hmac-drbg@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
-  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
-  dependencies:
-    hash.js "^1.0.3"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.1"
-
 hoek@2.x.x:
   version "2.16.3"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
-  integrity sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=
 
 hoek@4.x.x:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
-  integrity sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==
 
 hosted-git-info@^2.1.4, hosted-git-info@^2.6.0:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
-  integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
-
-hpack.js@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
-  integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=
-  dependencies:
-    inherits "^2.0.1"
-    obuf "^1.0.0"
-    readable-stream "^2.0.1"
-    wbuf "^1.1.0"
-
-html-entities@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
-  integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
 
 http-cache-semantics@3.8.1, http-cache-semantics@^3.8.1:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
-  integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
-
-http-deceiver@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
-  integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
 
-http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
+http-errors@1.6.3, http-errors@~1.6.3:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
   dependencies:
     depd "~1.1.2"
     inherits "2.0.3"
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
-http-parser-js@>=0.4.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8"
-  integrity sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==
-
 http-proxy-agent@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
-  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
   dependencies:
     agent-base "4"
     debug "3.1.0"
 
-http-proxy-middleware@~0.18.0:
-  version "0.18.0"
-  resolved "http://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
-  integrity sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==
-  dependencies:
-    http-proxy "^1.16.2"
-    is-glob "^4.0.0"
-    lodash "^4.17.5"
-    micromatch "^3.1.9"
-
-http-proxy@^1.13.0, http-proxy@^1.16.2:
+http-proxy@^1.13.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
-  integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==
   dependencies:
     eventemitter3 "^3.0.0"
     follow-redirects "^1.0.0"
@@ -4485,7 +2495,6 @@ http-proxy@^1.13.0, http-proxy@^1.16.2:
 http-signature@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
-  integrity sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=
   dependencies:
     assert-plus "^0.2.0"
     jsprim "^1.2.2"
@@ -4494,7 +2503,6 @@ http-signature@~1.1.0:
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
   dependencies:
     assert-plus "^1.0.0"
     jsprim "^1.2.2"
@@ -4503,7 +2511,6 @@ http-signature@~1.2.0:
 httpntlm@1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/httpntlm/-/httpntlm-1.6.1.tgz#ad01527143a2e8773cfae6a96f58656bb52a34b2"
-  integrity sha1-rQFScUOi6Hc8+uapb1hla7UqNLI=
   dependencies:
     httpreq ">=0.4.22"
     underscore "~1.7.0"
@@ -4511,17 +2518,10 @@ httpntlm@1.6.1:
 httpreq@>=0.4.22:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/httpreq/-/httpreq-0.4.24.tgz#4335ffd82cd969668a39465c929ac61d6393627f"
-  integrity sha1-QzX/2CzZaWaKOUZckprGHWOTYn8=
-
-https-browserify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
-  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
 https-proxy-agent@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
-  integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==
   dependencies:
     agent-base "^4.1.0"
     debug "^3.1.0"
@@ -4529,14 +2529,12 @@ https-proxy-agent@^2.2.1:
 humanize-ms@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
-  integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=
   dependencies:
     ms "^2.0.0"
 
 husky@^0.14.3:
   version "0.14.3"
   resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3"
-  integrity sha512-e21wivqHpstpoiWA/Yi8eFti8E+sQDSS53cpJsPptPs295QTOQR0ZwnHo2TXy1XOpZFD9rPOd3NpmqTK6uMLJA==
   dependencies:
     is-ci "^1.0.10"
     normalize-path "^1.0.0"
@@ -4545,296 +2543,154 @@ husky@^0.14.3:
 iconv-lite@0.4.15:
   version "0.4.15"
   resolved "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
-  integrity sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es=
 
 iconv-lite@0.4.23:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
-  integrity sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 ieee754@^1.1.4:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
-  integrity sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==
 
 iferr@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
-  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
 ignore-walk@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
-  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
   dependencies:
     minimatch "^3.0.4"
 
-ignore@^3.3.5:
-  version "3.3.10"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
-  integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
-
-image-size@~0.5.0:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
-  integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
-
-immediate@~3.0.5:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
-  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
-
 immutable@^3.8.2:
   version "3.8.2"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
-  integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=
-
-import-cwd@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
-  integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=
-  dependencies:
-    import-from "^2.1.0"
-
-import-from@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
-  integrity sha1-M1238qev/VOqpHHUuAId7ja387E=
-  dependencies:
-    resolve-from "^3.0.0"
-
-import-lazy@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
-  integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
-
-import-local@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
-  integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
-  dependencies:
-    pkg-dir "^3.0.0"
-    resolve-cwd "^2.0.0"
 
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
-
-in-publish@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
-  integrity sha1-4g/146KvwmkDILbcVSaCqcf631E=
 
 indent-string@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
-  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
   dependencies:
     repeating "^2.0.0"
 
 indent-string@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
-  integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=
 
 indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
-  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
 
 inflection@~1.12.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416"
-  integrity sha1-ogCTVlbW9fa8TcdQLhrstwMihBY=
 
 inflection@~1.3.0:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.3.8.tgz#cbd160da9f75b14c3cc63578d4f396784bf3014e"
-  integrity sha1-y9Fg2p91sUw8xjV41POWeEvzAU4=
 
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
-inherits@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
-  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
-ini@1.3.5, ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
+ini@^1.3.2, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
-
-injection-js@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/injection-js/-/injection-js-2.2.1.tgz#a8d6a085b2f0b8d8650f6f4487f6abb8cc0d67ce"
-  integrity sha512-zHI+E+dM0PXix5FFTO1Y4/UOyAzE7zG1l/QwAn4jchTThOoBq+UYRFK4AVG7lQgFL+go62SbrzSsjXy9DFEZUg==
-
-inquirer@6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"
-  integrity sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==
-  dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^3.0.0"
-    figures "^2.0.0"
-    lodash "^4.17.10"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rxjs "^6.1.0"
-    string-width "^2.1.0"
-    strip-ansi "^4.0.0"
-    through "^2.3.6"
-
-internal-ip@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-3.0.1.tgz#df5c99876e1d2eb2ea2d74f520e3f669a00ece27"
-  integrity sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==
-  dependencies:
-    default-gateway "^2.6.0"
-    ipaddr.js "^1.5.2"
 
 interpret@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
-  integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
 
 into-stream@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
-  integrity sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=
   dependencies:
     from2 "^2.1.1"
     p-is-promise "^1.1.0"
 
-invariant@^2.2.2:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
-  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
-  dependencies:
-    loose-envify "^1.0.0"
-
 invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
-  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
-
-invert-kv@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
-  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
-
-ip-regex@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
-  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
 
-ip@^1.1.0, ip@^1.1.2, ip@^1.1.5:
+ip@^1.1.2, ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
-  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
-
-ipaddr.js@1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
-  integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
-
-ipaddr.js@^1.5.2:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.1.tgz#fa4b79fa47fd3def5e3b159825161c0a519c9427"
-  integrity sha1-+kt5+kf9Pe9eOxWYJRYcClGclCc=
 
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
-  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
   dependencies:
     kind-of "^3.0.2"
 
 is-accessor-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
-  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
 is-arrayish@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
-  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
 
 is-binary-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
-  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
   dependencies:
     binary-extensions "^1.0.0"
 
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-builtin-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
-  integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74=
   dependencies:
     builtin-modules "^1.0.0"
 
 is-ci@^1.0.10:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
-  integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==
   dependencies:
     ci-info "^1.5.0"
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
   dependencies:
     kind-of "^3.0.2"
 
 is-data-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
-  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
   dependencies:
     is-accessor-descriptor "^0.1.6"
     is-data-descriptor "^0.1.4"
@@ -4843,113 +2699,80 @@ is-descriptor@^0.1.0:
 is-descriptor@^1.0.0, is-descriptor@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
-  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
   dependencies:
     is-accessor-descriptor "^1.0.0"
     is-data-descriptor "^1.0.0"
     kind-of "^6.0.2"
 
-is-directory@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
-  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
-
 is-dotfile@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
 
 is-equal-shallow@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
   dependencies:
     is-primitive "^2.0.0"
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
 
 is-extendable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
   dependencies:
     is-plain-object "^2.0.4"
 
 is-extglob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
 
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
 is-finite@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
-  integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
   dependencies:
     is-extglob "^1.0.0"
 
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
   dependencies:
     is-extglob "^2.1.0"
 
 is-glob@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
-  integrity sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=
   dependencies:
     is-extglob "^2.1.1"
 
-is-installed-globally@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80"
-  integrity sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=
-  dependencies:
-    global-dirs "^0.1.0"
-    is-path-inside "^1.0.0"
-
-is-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
-  integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
-
 is-my-ip-valid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
-  integrity sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==
 
 is-my-json-valid@^2.12.4:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.19.0.tgz#8fd6e40363cd06b963fa877d444bfb5eddc62175"
-  integrity sha512-mG0f/unGX1HZ5ep4uhRaPOS8EkAY8/j6mDRMJrutq4CqhoJWYp7qAlonIPy3TV7p3ju4TK9fo/PbnoksWmsp5Q==
   dependencies:
     generate-function "^2.0.0"
     generate-object-property "^1.1.0"
@@ -4957,289 +2780,125 @@ is-my-json-valid@^2.12.4:
     jsonpointer "^4.0.0"
     xtend "^4.0.0"
 
-is-npm@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
-  integrity sha1-8vtjpl5JBbQGyGBydloaTceTufQ=
-
 is-number@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806"
-  integrity sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=
 
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
   dependencies:
     kind-of "^3.0.2"
 
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
   dependencies:
     kind-of "^3.0.2"
 
 is-number@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
 is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
 
 is-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
-  integrity sha1-iVJojF7C/9awPsyF52ngKQMINHA=
-
-is-path-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
-  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
-
-is-path-in-cwd@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
-  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
-  dependencies:
-    is-path-inside "^1.0.0"
-
-is-path-inside@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
-  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
-  dependencies:
-    path-is-inside "^1.0.1"
 
 is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
 is-posix-bracket@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
 
 is-primitive@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
-
-is-promise@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
-  integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
 
 is-property@^1.0.0, is-property@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-  integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=
-
-is-redirect@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
-  integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=
 
-is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0:
+is-retry-allowed@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
-  integrity sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=
 
-is-stream@^1.0.0, is-stream@^1.1.0:
+is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
 is-subset@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
-  integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=
 
 is-text-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
-  integrity sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=
   dependencies:
     text-extensions "^1.0.0"
 
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
 is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
-
-is-wsl@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
-  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
 
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+isarray@1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
 isarray@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
-  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
 
 isbinaryfile@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
-  integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
   dependencies:
     buffer-alloc "^1.2.0"
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-
-istanbul-api@^2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.0.6.tgz#cd7b33ee678f6c01531d05f5e567ebbcd25f8ecc"
-  integrity sha512-8W5oeAGWXhtTJjAyVfvavOLVyZCTNCKsyF6GON/INKlBdO7uJ/bv3qnPj5M6ERKzmMCJS1kntnjjGuJ86fn3rQ==
-  dependencies:
-    async "^2.6.1"
-    compare-versions "^3.2.1"
-    fileset "^2.0.3"
-    istanbul-lib-coverage "^2.0.1"
-    istanbul-lib-hook "^2.0.1"
-    istanbul-lib-instrument "^3.0.0"
-    istanbul-lib-report "^2.0.2"
-    istanbul-lib-source-maps "^2.0.1"
-    istanbul-reports "^2.0.1"
-    js-yaml "^3.12.0"
-    make-dir "^1.3.0"
-    once "^1.4.0"
-
-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"
-  integrity sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==
-  dependencies:
-    convert-source-map "^1.5.0"
-    istanbul-lib-instrument "^1.7.3"
-    loader-utils "^1.1.0"
-    schema-utils "^0.3.0"
-
-istanbul-lib-coverage@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0"
-  integrity sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==
-
-istanbul-lib-coverage@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#2aee0e073ad8c5f6a0b00e0dfbf52b4667472eda"
-  integrity sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==
-
-istanbul-lib-hook@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.1.tgz#918a57b75a0f951d552a08487ca1fa5336433d72"
-  integrity sha512-ufiZoiJ8CxY577JJWEeFuxXZoMqiKpq/RqZtOAYuQLvlkbJWscq9n3gc4xrCGH9n4pW0qnTxOz1oyMmVtk8E1w==
-  dependencies:
-    append-transform "^1.0.0"
-
-istanbul-lib-instrument@^1.7.3:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz#1f55ed10ac3c47f2bdddd5307935126754d0a9ca"
-  integrity sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==
-  dependencies:
-    babel-generator "^6.18.0"
-    babel-template "^6.16.0"
-    babel-traverse "^6.18.0"
-    babel-types "^6.18.0"
-    babylon "^6.18.0"
-    istanbul-lib-coverage "^1.2.1"
-    semver "^5.3.0"
-
-istanbul-lib-instrument@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.0.0.tgz#b5f066b2a161f75788be17a9d556f40a0cf2afc9"
-  integrity sha512-eQY9vN9elYjdgN9Iv6NS/00bptm02EBBk70lRMaVjeA6QYocQgenVrSgC28TJurdnZa80AGO3ASdFN+w/njGiQ==
-  dependencies:
-    "@babel/generator" "^7.0.0"
-    "@babel/parser" "^7.0.0"
-    "@babel/template" "^7.0.0"
-    "@babel/traverse" "^7.0.0"
-    "@babel/types" "^7.0.0"
-    istanbul-lib-coverage "^2.0.1"
-    semver "^5.5.0"
-
-istanbul-lib-report@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.2.tgz#430a2598519113e1da7af274ba861bd42dd97535"
-  integrity sha512-rJ8uR3peeIrwAxoDEbK4dJ7cqqtxBisZKCuwkMtMv0xYzaAnsAi3AHrHPAAtNXzG/bcCgZZ3OJVqm1DTi9ap2Q==
-  dependencies:
-    istanbul-lib-coverage "^2.0.1"
-    make-dir "^1.3.0"
-    supports-color "^5.4.0"
-
-istanbul-lib-source-maps@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-2.0.1.tgz#ce8b45131d8293fdeaa732f4faf1852d13d0a97e"
-  integrity sha512-30l40ySg+gvBLcxTrLzR4Z2XTRj3HgRCA/p2rnbs/3OiTaoj054gAbuP5DcLOtwqmy4XW8qXBHzrmP2/bQ9i3A==
-  dependencies:
-    debug "^3.1.0"
-    istanbul-lib-coverage "^2.0.1"
-    make-dir "^1.3.0"
-    rimraf "^2.6.2"
-    source-map "^0.6.1"
-
-istanbul-reports@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.0.1.tgz#fb8d6ea850701a3984350b977a969e9a556116a7"
-  integrity sha512-CT0QgMBJqs6NJLF678ZHcquUAZIoBIUNzdJrRJfpkI9OnzG6MkUfHxbJC3ln981dMswC7/B1mfX3LNkhgJxsuw==
-  dependencies:
-    handlebars "^4.0.11"
 
-istanbul@0.4.5, istanbul@^0.4.5:
+istanbul@^0.4.5:
   version "0.4.5"
   resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-0.4.5.tgz#65c7d73d4c4da84d4f3ac310b918fb0b8033733b"
-  integrity sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=
   dependencies:
     abbrev "1.0.x"
     async "1.x"
@@ -5259,82 +2918,43 @@ istanbul@0.4.5, istanbul@^0.4.5:
 isurl@^1.0.0-alpha5:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
-  integrity sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==
   dependencies:
     has-to-string-tag-x "^1.2.0"
     is-object "^1.0.1"
 
-jasmine-core@2.8.0, jasmine-core@~2.8.0:
+jasmine-core@2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
-  integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
 
 jasmine-core@~2.99.0:
   version "2.99.1"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15"
-  integrity sha1-5kAN8ea1bhMLYcS80JPap/boyhU=
 
 jasmine-spec-reporter@^3.2.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-3.3.0.tgz#c63c3d43bacfd16e6da86c46d265957e0075f14c"
-  integrity sha1-xjw9Q7rP0W5tqGxG0mWVfgB18Uw=
-  dependencies:
-    colors "1.1.2"
-
-jasmine-spec-reporter@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz#1d632aec0341670ad324f92ba84b4b32b35e9e22"
-  integrity sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==
   dependencies:
     colors "1.1.2"
 
-jasmine@2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e"
-  integrity sha1-awicChFXax8W3xG4AUbZHU6Lij4=
-  dependencies:
-    exit "^0.1.2"
-    glob "^7.0.6"
-    jasmine-core "~2.8.0"
-
 jasmine@^2.6.0:
   version "2.99.0"
   resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.99.0.tgz#8ca72d102e639b867c6489856e0e18a9c7aa42b7"
-  integrity sha1-jKctEC5jm4Z8ZImFbg4YqceqQrc=
   dependencies:
     exit "^0.1.2"
     glob "^7.0.6"
     jasmine-core "~2.99.0"
 
-jasminewd2@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"
-  integrity sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=
-
-jquery@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
-  integrity sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==
-
-js-base64@^2.1.8, js-base64@^2.4.3:
+js-base64@^2.4.3:
   version "2.4.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03"
-  integrity sha512-xcinL3AuDJk7VSzsHgb9DvvIXayBbadtMZ4HFPx8rUszbW1MuNMlwYVC4zzCZ6e1sqZpnNS5ZFYOhXqA39T7LQ==
-
-"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
-js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
+js-yaml@3.x, js-yaml@^3.7.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
-  integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -5342,165 +2962,89 @@ js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
-
-jsesc@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
-  integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
-
-jsesc@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
-  integrity sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=
-
-jsesc@~0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
 json-buffer@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
-  integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
 
-json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
+json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
 
 json-stringify-safe@5.0.x, json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
-
-json3@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
-  integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
-
-json5@^0.5.0:
-  version "0.5.1"
-  resolved "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
-
-jsonfile@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
-  optionalDependencies:
-    graceful-fs "^4.1.6"
 
 jsonparse@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
-  integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
 
 jsonpointer@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
-  integrity sha1-T9kss04OnbPInIYi7PUfm5eMbLk=
 
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
   dependencies:
     assert-plus "1.0.0"
     extsprintf "1.3.0"
     json-schema "0.2.3"
     verror "1.10.0"
 
-jszip@^3.1.3:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.1.5.tgz#e3c2a6c6d706ac6e603314036d43cd40beefdf37"
-  integrity sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==
-  dependencies:
-    core-js "~2.3.0"
-    es6-promise "~3.0.2"
-    lie "~3.1.0"
-    pako "~1.0.2"
-    readable-stream "~2.0.6"
-
-karma-chrome-launcher@2.2.0, karma-chrome-launcher@~2.2.0:
+karma-chrome-launcher@2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf"
-  integrity sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==
   dependencies:
     fs-access "^1.0.0"
     which "^1.2.1"
 
-karma-coverage-istanbul-reporter@~2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.4.tgz#402ae4ed6eadb9d9dafbd408ffda17897c0d003a"
-  integrity sha512-xJS7QSQIVU6VK9HuJ/ieE5yynxKhjCCkd96NLY/BX/HXsx0CskU9JJiMQbd4cHALiddMwI4OWh1IIzeWrsavJw==
-  dependencies:
-    istanbul-api "^2.0.5"
-    minimatch "^3.0.4"
-
 karma-firefox-launcher@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/karma-firefox-launcher/-/karma-firefox-launcher-1.1.0.tgz#2c47030452f04531eb7d13d4fc7669630bb93339"
-  integrity sha512-LbZ5/XlIXLeQ3cqnCbYLn+rOVhuMIK9aZwlP6eOLGzWdo1UVp7t6CN3DP4SafiRLjexKwHeKHDm0c38Mtd3VxA==
 
 karma-jasmine-html-reporter@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-0.2.2.tgz#48a8e5ef18807617ee2b5e33c1194c35b439524c"
-  integrity sha1-SKjl7xiAdhfuK14zwRlMNbQ5Ukw=
   dependencies:
     karma-jasmine "^1.0.2"
 
 karma-jasmine@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.1.tgz#6fe840e75a11600c9d91e84b33c458e1c46a3529"
-  integrity sha1-b+hA51oRYAydkehLM8RY4cRqNSk=
 
-karma-jasmine@^1.0.2, karma-jasmine@~1.1.0:
+karma-jasmine@^1.0.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.2.tgz#394f2b25ffb4a644b9ada6f22d443e2fd08886c3"
-  integrity sha1-OU8rJf+0pkS5rabyLUQ+L9CIhsM=
 
 karma-requirejs@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/karma-requirejs/-/karma-requirejs-1.1.0.tgz#fddae2cb87d7ebc16fb0222893564d7fee578798"
-  integrity sha1-/driy4fX68FvsCIok1ZNf+5Xh5g=
 
 karma-sauce-launcher@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/karma-sauce-launcher/-/karma-sauce-launcher-1.2.0.tgz#6f2558ddef3cf56879fa27540c8ae9f8bfd16bca"
-  integrity sha512-lEhtGRGS+3Yw6JSx/vJY9iQyHNtTjcojrSwNzqNUOaDceKDu9dPZqA/kr69bUO9G2T6GKbu8AZgXqy94qo31Jg==
   dependencies:
     q "^1.5.0"
     sauce-connect-launcher "^1.2.2"
     saucelabs "^1.4.0"
     wd "^1.4.0"
 
-karma-source-map-support@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz#36dd4d8ca154b62ace95696236fae37caf0a7dde"
-  integrity sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==
-  dependencies:
-    source-map-support "^0.5.5"
-
 karma-sourcemap-loader@0.3.7:
   version "0.3.7"
   resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz#91322c77f8f13d46fed062b042e1009d4c4505d8"
-  integrity sha1-kTIsd/jxPUb+0GKwQuEAnUxFBdg=
   dependencies:
     graceful-fs "^4.1.2"
 
@@ -5539,7 +3083,6 @@ karma@alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a:
 karma@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/karma/-/karma-3.1.1.tgz#94c8edd20fb9597ccde343326da009737fb0423a"
-  integrity sha512-NetT3wPCQMNB36uiL9LLyhrOt8SQwrEKt0xD3+KpTCfm0VxVyUJdPL5oTq2Ic5ouemgL/Iz4wqXEbF3zea9kQQ==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
@@ -5572,111 +3115,50 @@ karma@~3.1.1:
 keyv@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
-  integrity sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==
   dependencies:
     json-buffer "3.0.0"
 
-killable@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
-  integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
-
 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"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
 
 kuler@1.0.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/kuler/-/kuler-1.0.0.tgz#904ad31c373b781695854d32be33818bf1d60250"
-  integrity sha512-oyy6pu/yWRjiVfCoJebNUKFL061sNtrs9ejKTbirIwY3oiHmENVCSkHhxDV85Dkm7JYR/czMCBeoM87WilTdSg==
   dependencies:
     colornames "^1.1.1"
 
-latest-version@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15"
-  integrity sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=
-  dependencies:
-    package-json "^4.0.0"
-
 lazystream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
-  integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=
   dependencies:
     readable-stream "^2.0.5"
 
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
-  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
   dependencies:
     invert-kv "^1.0.0"
 
-lcid@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
-  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
-  dependencies:
-    invert-kv "^2.0.0"
-
-less-loader@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-4.1.0.tgz#2c1352c5b09a4f84101490274fd51674de41363e"
-  integrity sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==
-  dependencies:
-    clone "^2.1.1"
-    loader-utils "^1.1.0"
-    pify "^3.0.0"
-
-less-plugin-npm-import@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/less-plugin-npm-import/-/less-plugin-npm-import-2.1.0.tgz#823e6986c93318a98171ca858848b6bead55bf3e"
-  integrity sha1-gj5phskzGKmBccqFiEi2vq1Vvz4=
-  dependencies:
-    promise "~7.0.1"
-    resolve "~1.1.6"
-
-less@3.8.1, less@^3.8.0:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/less/-/less-3.8.1.tgz#f31758598ef5a1930dd4caefa9e4340641e71e1d"
-  integrity sha512-8HFGuWmL3FhQR0aH89escFNBQH/nEiYPP2ltDFdQw2chE28Yx2E3lhAIq9Y2saYwLSwa699s4dBVEfCY8Drf7Q==
-  dependencies:
-    clone "^2.1.2"
-  optionalDependencies:
-    errno "^0.1.1"
-    graceful-fs "^4.1.2"
-    image-size "~0.5.0"
-    mime "^1.4.1"
-    mkdirp "^0.5.0"
-    promise "^7.1.1"
-    request "^2.83.0"
-    source-map "~0.6.0"
-
 levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
   dependencies:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
@@ -5684,12 +3166,10 @@ levn@~0.3.0:
 libbase64@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/libbase64/-/libbase64-0.1.0.tgz#62351a839563ac5ff5bd26f12f60e9830bb751e6"
-  integrity sha1-YjUag5VjrF/1vSbxL2Dpgwu3UeY=
 
 libmime@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/libmime/-/libmime-3.0.0.tgz#51a1a9e7448ecbd32cda54421675bb21bc093da6"
-  integrity sha1-UaGp50SOy9Ms2lRCFnW7IbwJPaY=
   dependencies:
     iconv-lite "0.4.15"
     libbase64 "0.1.0"
@@ -5698,12 +3178,10 @@ libmime@3.0.0:
 libqp@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/libqp/-/libqp-1.1.0.tgz#f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"
-  integrity sha1-9ebgatdLeU+1tbZpiL9yjvHe2+g=
 
 license-checker@^20.1.0:
   version "20.2.0"
   resolved "https://registry.yarnpkg.com/license-checker/-/license-checker-20.2.0.tgz#edb2605fd714514ed16e7eeee5b88a41900241d2"
-  integrity sha512-bseotvz8lfzEY7siilsJhQd2K/z+IF9aeJ+ZscieyZ70S6Ql2iJdVp1IfnL6gkdU4ny5JctT5Y2lFCQerSCfGA==
   dependencies:
     chalk "^2.4.1"
     debug "^3.1.0"
@@ -5717,24 +3195,9 @@ license-checker@^20.1.0:
     strip-ansi "^4.0.0"
     treeify "^1.1.0"
 
-license-webpack-plugin@2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.0.2.tgz#9d34b521cb7fca8527945310b05be6ef0248b687"
-  integrity sha512-GsomZw5VoT20ST8qH2tOjBgbyhn6Pgs9M94g0mbvfBIV1VXufm1iKY+4dbgfTObj1Mp6nSRE3Zf74deOZr0KwA==
-  dependencies:
-    webpack-sources "^1.2.0"
-
-lie@~3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
-  integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=
-  dependencies:
-    immediate "~3.0.5"
-
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -5745,7 +3208,6 @@ load-json-file@^1.0.0:
 load-json-file@^2.0.0:
   version "2.0.0"
   resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
-  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -5755,77 +3217,30 @@ load-json-file@^2.0.0:
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^4.0.0"
     pify "^3.0.0"
     strip-bom "^3.0.0"
 
-loader-runner@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.1.tgz#026f12fe7c3115992896ac02ba022ba92971b979"
-  integrity sha512-By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw==
-
-loader-utils@1.1.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
-  integrity sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
   dependencies:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
-
 lodash._reinterpolate@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
-
-lodash.assign@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
-  integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
-
-lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
-
-lodash.mergewith@^4.6.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
-  integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==
-
-lodash.tail@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
-  integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=
 
 lodash.template@^4.0.2:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
-  integrity sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=
   dependencies:
     lodash._reinterpolate "~3.0.0"
     lodash.templatesettings "^4.0.0"
@@ -5833,24 +3248,20 @@ lodash.template@^4.0.2:
 lodash.templatesettings@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
-  integrity sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
 lodash@4.17.10, lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.5.0:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-  integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==
 
-lodash@^4.15.0, lodash@^4.16.6, lodash@^4.17.5, lodash@^4.8.0, lodash@~4.17.10:
+lodash@^4.15.0, lodash@^4.16.6, lodash@^4.8.0:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
-  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
 log4js@^2.3.9:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-2.11.0.tgz#bf3902eff65c6923d9ce9cfbd2db54160e34005a"
-  integrity sha512-z1XdwyGFg8/WGkOyF6DPJjivCWNLKrklGdViywdYnSKOvgtEBo2UyEMZS5sD2mZrQlU3TvO8wDWLc8mzE1ncBQ==
   dependencies:
     circular-json "^0.5.4"
     date-format "^1.2.0"
@@ -5870,7 +3281,6 @@ log4js@^2.3.9:
 log4js@^3.0.0:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.6.tgz#e6caced94967eeeb9ce399f9f8682a4b2b28c8ff"
-  integrity sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==
   dependencies:
     circular-json "^0.5.5"
     date-format "^1.2.0"
@@ -5881,7 +3291,6 @@ log4js@^3.0.0:
 logform@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/logform/-/logform-1.9.1.tgz#58b29d7b11c332456d7a217e17b48a13ad69d60a"
-  integrity sha512-ZHrZE8VSf7K3xKxJiQ1aoTBp2yK+cEbFcgarsjzI3nt3nE/3O0heNSppoOQMUJVMZo/xiVwCxiXIabaZApsKNQ==
   dependencies:
     colors "^1.2.1"
     fast-safe-stringify "^2.0.4"
@@ -5892,33 +3301,18 @@ logform@^1.9.1:
 loggly@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/loggly/-/loggly-1.1.1.tgz#0a0fc1d3fa3a5ec44fdc7b897beba2a4695cebee"
-  integrity sha1-Cg/B0/o6XsRP3HuJe+uipGlc6+4=
   dependencies:
     json-stringify-safe "5.0.x"
     request "2.75.x"
     timespan "2.3.x"
 
-loglevel@^1.4.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
-  integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
-
 long@~3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
-  integrity sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=
-
-loose-envify@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
-  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
-  dependencies:
-    js-tokens "^3.0.0 || ^4.0.0"
 
 loud-rejection@^1.0.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
-  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
   dependencies:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
@@ -5926,22 +3320,18 @@ loud-rejection@^1.0.0:
 lowercase-keys@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
-  integrity sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=
 
 lowercase-keys@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
-  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
 
 lru-cache@2.2.x:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d"
-  integrity sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=
 
-lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
+lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
-  integrity sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==
   dependencies:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
@@ -5949,28 +3339,18 @@ lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache
 magic-string@^0.22.4:
   version "0.22.5"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
-  integrity sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==
   dependencies:
     vlq "^0.2.2"
 
 magic-string@^0.25.0:
   version "0.25.0"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.0.tgz#1f3696f9931ff0a1ed4c132250529e19cad6759b"
-  integrity sha512-Msbwa9oNYNPjwVh9ury5X2BHbTFWoirTlzuf4X+pIoSOQVKNRJHXTx1WmKYuXzRM4QZFv8dGXyZvhDMmWhGLPw==
-  dependencies:
-    sourcemap-codec "^1.4.1"
-
-magic-string@^0.25.1:
-  version "0.25.1"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.1.tgz#b1c248b399cd7485da0fe7385c2fc7011843266e"
-  integrity sha512-sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg==
   dependencies:
     sourcemap-codec "^1.4.1"
 
 mailcomposer@4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/mailcomposer/-/mailcomposer-4.0.1.tgz#0e1c44b2a07cf740ee17dc149ba009f19cadfeb4"
-  integrity sha1-DhxEsqB890DuF9wUm6AJ8Zyt/rQ=
   dependencies:
     buildmail "4.0.1"
     libmime "3.0.0"
@@ -5978,7 +3358,6 @@ mailcomposer@4.0.1:
 mailgun-js@^0.18.0:
   version "0.18.1"
   resolved "https://registry.yarnpkg.com/mailgun-js/-/mailgun-js-0.18.1.tgz#ee39aa18d7bb598a5ce9ede84afb681defc8a6b0"
-  integrity sha512-lvuMP14u24HS2uBsJEnzSyPMxzU2b99tQsIx1o6QNjqxjk8b3WvR+vq5oG1mjqz/IBYo+5gF+uSoDS0RkMVHmg==
   dependencies:
     async "~2.6.0"
     debug "~3.1.0"
@@ -5990,22 +3369,13 @@ mailgun-js@^0.18.0:
     proxy-agent "~3.0.0"
     tsscmp "~1.0.0"
 
-make-dir@^1.0.0, make-dir@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
-  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
-  dependencies:
-    pify "^3.0.0"
-
 make-error@^1.1.1:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
-  integrity sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==
 
 make-fetch-happen@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz#141497cb878f243ba93136c83d8aba12c216c083"
-  integrity sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==
   dependencies:
     agentkeepalive "^3.4.1"
     cacache "^11.0.1"
@@ -6019,87 +3389,41 @@ make-fetch-happen@^4.0.1:
     socks-proxy-agent "^4.0.0"
     ssri "^6.0.0"
 
-map-age-cleaner@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz#098fb15538fd3dbe461f12745b0ca8568d4e3f74"
-  integrity sha512-UN1dNocxQq44IhJyMI4TU8phc2m9BddacHRPRjKGLYaF0jqd3xLz0jS0skpAU9WgYyoR4gHtUpzytNBS385FWQ==
-  dependencies:
-    p-defer "^1.0.0"
-
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
 map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
-  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
 
 map-obj@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
-  integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk=
 
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
   dependencies:
     object-visit "^1.0.0"
 
-material-design-icons@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/material-design-icons/-/material-design-icons-3.0.1.tgz#9a71c48747218ebca51e51a66da682038cdcb7bf"
-  integrity sha1-mnHEh0chjrylHlGmbaaCA4zct78=
-
 math-random@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
-  integrity sha1-izqsWIuKZuSXXjzepn97sylgH6w=
-
-md5.js@^1.3.4:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
-  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-    safe-buffer "^5.1.2"
 
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
 mem@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
-  integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
   dependencies:
     mimic-fn "^1.0.0"
 
-mem@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf"
-  integrity sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==
-  dependencies:
-    map-age-cleaner "^0.1.1"
-    mimic-fn "^1.0.0"
-    p-is-promise "^1.1.0"
-
-memory-fs@^0.4.0, memory-fs@~0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
-  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
-  dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
-
-meow@^3.3.0, meow@^3.7.0:
+meow@^3.3.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
-  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
   dependencies:
     camelcase-keys "^2.0.0"
     decamelize "^1.1.2"
@@ -6115,7 +3439,6 @@ meow@^3.3.0, meow@^3.7.0:
 meow@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/meow/-/meow-4.0.1.tgz#d48598f6f4b1472f35bf6317a95945ace347f975"
-  integrity sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==
   dependencies:
     camelcase-keys "^4.0.0"
     decamelize-keys "^1.0.0"
@@ -6127,27 +3450,15 @@ meow@^4.0.0:
     redent "^2.0.0"
     trim-newlines "^2.0.0"
 
-merge-descriptors@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
-
 merge-source-map@1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz#a5de46538dae84d4114cc5ea02b4772a6346701f"
-  integrity sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=
   dependencies:
     source-map "^0.5.6"
 
-methods@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
-
-micromatch@^2.1.5, micromatch@^2.3.11:
+micromatch@^2.1.5:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
   dependencies:
     arr-diff "^2.0.0"
     array-unique "^0.2.1"
@@ -6163,10 +3474,9 @@ micromatch@^2.1.5, micromatch@^2.3.11:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
-micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
+micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
-  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -6182,93 +3492,51 @@ micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-miller-rabin@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
-  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
-  dependencies:
-    bn.js "^4.0.0"
-    brorand "^1.0.1"
-
-"mime-db@>= 1.36.0 < 2", mime-db@~1.37.0:
-  version "1.37.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
-  integrity sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==
-
 mime-db@~1.36.0:
   version "1.36.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
-  integrity sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==
+
+mime-db@~1.37.0:
+  version "1.37.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
 
 mime-types@^2.1.11, mime-types@~2.1.7:
   version "2.1.21"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
-  integrity sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==
   dependencies:
     mime-db "~1.37.0"
 
 mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
   version "2.1.20"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
-  integrity sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==
   dependencies:
     mime-db "~1.36.0"
 
-mime@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
-  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
-
-mime@^1.3.4, mime@^1.4.1:
+mime@^1.3.4:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mime@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
-  integrity sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==
 
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
-  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
 mimic-response@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
-  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
-
-mini-css-extract-plugin@0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.4.tgz#c10410a004951bd3cedac1da69053940fccb625d"
-  integrity sha512-o+Jm+ocb0asEngdM6FsZWtZsRzA8koFUudIDwYUfl94M3PejPHG7Vopw5hN9V8WsMkSFpm3tZP3Fesz89EyrfQ==
-  dependencies:
-    loader-utils "^1.1.0"
-    schema-utils "^1.0.0"
-    webpack-sources "^1.1.0"
 
-minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
-  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
-
-minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
-  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
-
-"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+"minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
 minimist-options@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
-  integrity sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==
   dependencies:
     arrify "^1.0.1"
     is-plain-obj "^1.1.0"
@@ -6276,22 +3544,18 @@ minimist-options@^3.0.1:
 minimist@0.0.8:
   version "0.0.8"
   resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0:
+minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
 minimist@~0.0.1:
   version "0.0.10"
   resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
 minipass@^2.2.1, minipass@^2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
-  integrity sha512-mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==
   dependencies:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
@@ -6299,7 +3563,6 @@ minipass@^2.2.1, minipass@^2.3.3:
 minipass@^2.3.5:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
-  integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
   dependencies:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
@@ -6307,30 +3570,12 @@ minipass@^2.3.5:
 minizlib@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
-  integrity sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==
   dependencies:
     minipass "^2.2.1"
 
-mississippi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
-  integrity sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==
-  dependencies:
-    concat-stream "^1.5.0"
-    duplexify "^3.4.2"
-    end-of-stream "^1.1.0"
-    flush-write-stream "^1.0.0"
-    from2 "^2.1.0"
-    parallel-transform "^1.1.0"
-    pump "^2.0.1"
-    pumpify "^1.3.3"
-    stream-each "^1.1.0"
-    through2 "^2.0.0"
-
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
-  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
   dependencies:
     concat-stream "^1.5.0"
     duplexify "^3.4.2"
@@ -6346,35 +3591,23 @@ mississippi@^3.0.0:
 mixin-deep@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
-  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mixin-object@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
-  integrity sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=
-  dependencies:
-    for-in "^0.1.3"
-    is-extendable "^0.1.1"
-
-mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
+mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1:
   version "0.5.1"
   resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
 
 modify-values@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
-  integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
-  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
   dependencies:
     aproba "^1.1.1"
     copy-concurrently "^1.0.0"
@@ -6386,45 +3619,18 @@ move-concurrently@^1.0.1:
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
 ms@^2.0.0, ms@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
-
-multicast-dns-service-types@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
-  integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=
-
-multicast-dns@^6.0.1:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
-  integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==
-  dependencies:
-    dns-packet "^1.3.1"
-    thunky "^1.0.2"
-
-mute-stream@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
-
-nan@^2.10.0:
-  version "2.11.1"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766"
-  integrity sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==
 
 nan@^2.9.2:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.0.tgz#574e360e4d954ab16966ec102c0c049fd961a099"
-  integrity sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
-  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -6441,7 +3647,6 @@ nanomatch@^1.2.9:
 needle@^2.2.1:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.3.tgz#c1b04da378cd634d8befe2de965dc2cfb0fd65ca"
-  integrity sha512-GPL22d/U9cai87FcCPO6e+MT3vyHS2j+zwotakDc7kE2DtUAqFKMXLJCTtRp+5S75vXIwQPvIxkvlctxf9q4gQ==
   dependencies:
     debug "^2.1.2"
     iconv-lite "^0.4.4"
@@ -6450,60 +3655,14 @@ needle@^2.2.1:
 negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
-  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
-
-neo-async@^2.5.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
-  integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
 
 netmask@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35"
-  integrity sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU=
-
-ng-packagr@^4.2.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-4.4.0.tgz#b868a829b5743870c6392491de3faf4e4cec6f4d"
-  integrity sha512-dLpC/kmQsdbkL96ZclGjNRhq/J4MwpPKwPYNom74lvXqFC2jbbT/fnwmxX9WKXjvE8MEGsg2D2x8MsRURiNscg==
-  dependencies:
-    "@ngtools/json-schema" "^1.1.0"
-    autoprefixer "^9.0.0"
-    browserslist "^4.0.0"
-    chalk "^2.3.1"
-    chokidar "^2.0.3"
-    clean-css "^4.1.11"
-    commander "^2.12.0"
-    fs-extra "^7.0.0"
-    glob "^7.1.2"
-    injection-js "^2.2.1"
-    less "^3.8.0"
-    less-plugin-npm-import "^2.1.0"
-    node-sass "^4.9.3"
-    node-sass-tilde-importer "^1.0.0"
-    postcss "^7.0.0"
-    postcss-url "^8.0.0"
-    read-pkg-up "^4.0.0"
-    rimraf "^2.6.1"
-    rollup "^0.66.0"
-    rollup-plugin-commonjs "^9.1.3"
-    rollup-plugin-json "^3.1.0"
-    rollup-plugin-node-resolve "^3.0.0"
-    rollup-plugin-sourcemaps "^0.4.2"
-    rxjs "^6.0.0"
-    stylus "^0.54.5"
-    uglify-js "^3.0.7"
-    update-notifier "^2.3.0"
-
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 node-fetch-npm@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7"
-  integrity sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==
   dependencies:
     encoding "^0.1.11"
     json-parse-better-errors "^1.0.0"
@@ -6512,64 +3671,10 @@ node-fetch-npm@^2.0.2:
 node-fetch@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.2.0.tgz#4ee79bde909262f9775f731e3656d0db55ced5b5"
-  integrity sha512-OayFWziIxiHY8bCUyLX6sTpDH8Jsbp4FfYd1j1f7vZyfgkcOnAyM4oQR16f8a0s7Gl/viMGRey8eScYk4V4EZA==
-
-node-forge@0.7.5:
-  version "0.7.5"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
-  integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==
-
-node-gyp@^3.8.0:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
-  integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
-  dependencies:
-    fstream "^1.0.0"
-    glob "^7.0.3"
-    graceful-fs "^4.1.2"
-    mkdirp "^0.5.0"
-    nopt "2 || 3"
-    npmlog "0 || 1 || 2 || 3 || 4"
-    osenv "0"
-    request "^2.87.0"
-    rimraf "2"
-    semver "~5.3.0"
-    tar "^2.0.0"
-    which "1"
-
-node-libs-browser@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
-  integrity sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==
-  dependencies:
-    assert "^1.1.1"
-    browserify-zlib "^0.2.0"
-    buffer "^4.3.0"
-    console-browserify "^1.1.0"
-    constants-browserify "^1.0.0"
-    crypto-browserify "^3.11.0"
-    domain-browser "^1.1.1"
-    events "^1.0.0"
-    https-browserify "^1.0.0"
-    os-browserify "^0.3.0"
-    path-browserify "0.0.0"
-    process "^0.11.10"
-    punycode "^1.2.4"
-    querystring-es3 "^0.2.0"
-    readable-stream "^2.3.3"
-    stream-browserify "^2.0.1"
-    stream-http "^2.7.2"
-    string_decoder "^1.0.0"
-    timers-browserify "^2.0.4"
-    tty-browserify "0.0.0"
-    url "^0.11.0"
-    util "^0.10.3"
-    vm-browserify "0.0.4"
 
 node-pre-gyp@^0.10.0:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
-  integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==
   dependencies:
     detect-libc "^1.0.2"
     mkdirp "^0.5.1"
@@ -6582,79 +3687,13 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.2.tgz#27c296d9fca3b659c64f7d43ea47a31ad2a90e4b"
-  integrity sha512-zP8Asfg13lG9KDAW85rylSxXBYvaSdtjMIYKHUk8c1fM8drmFwRqbSYKYD+UlNVPUvrceSvgLUKHMOWR5jPWQg==
-  dependencies:
-    semver "^5.3.0"
-
-node-sass-tilde-importer@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz#1a15105c153f648323b4347693fdb0f331bad1ce"
-  integrity sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==
-  dependencies:
-    find-parent-dir "^0.3.0"
-
-node-sass@4.10.0:
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.10.0.tgz#dcc2b364c0913630945ccbf7a2bbf1f926effca4"
-  integrity sha512-fDQJfXszw6vek63Fe/ldkYXmRYK/QS6NbvM3i5oEo9ntPDy4XX7BcKZyTKv+/kSSxRtXXc7l+MSwEmYc0CSy6Q==
-  dependencies:
-    async-foreach "^0.1.3"
-    chalk "^1.1.1"
-    cross-spawn "^3.0.0"
-    gaze "^1.0.0"
-    get-stdin "^4.0.1"
-    glob "^7.0.3"
-    in-publish "^2.0.0"
-    lodash.assign "^4.2.0"
-    lodash.clonedeep "^4.3.2"
-    lodash.mergewith "^4.6.0"
-    meow "^3.7.0"
-    mkdirp "^0.5.1"
-    nan "^2.10.0"
-    node-gyp "^3.8.0"
-    npmlog "^4.0.0"
-    request "^2.88.0"
-    sass-graph "^2.2.4"
-    stdout-stream "^1.4.0"
-    "true-case-path" "^1.0.2"
-
-node-sass@^4.9.3:
-  version "4.9.4"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.4.tgz#349bd7f1c89422ffe7e1e4b60f2055a69fbc5512"
-  integrity sha512-MXyurANsUoE4/6KmfMkwGcBzAnJQ5xJBGW7Ei6ea8KnUKuzHr/SguVBIi3uaUAHtZCPUYkvlJ3Ef5T5VAwVpaA==
-  dependencies:
-    async-foreach "^0.1.3"
-    chalk "^1.1.1"
-    cross-spawn "^3.0.0"
-    gaze "^1.0.0"
-    get-stdin "^4.0.1"
-    glob "^7.0.3"
-    in-publish "^2.0.0"
-    lodash.assign "^4.2.0"
-    lodash.clonedeep "^4.3.2"
-    lodash.mergewith "^4.6.0"
-    meow "^3.7.0"
-    mkdirp "^0.5.1"
-    nan "^2.10.0"
-    node-gyp "^3.8.0"
-    npmlog "^4.0.0"
-    request "^2.88.0"
-    sass-graph "^2.2.4"
-    stdout-stream "^1.4.0"
-    "true-case-path" "^1.0.2"
-
 node-uuid@~1.4.7:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
-  integrity sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=
 
 nodemailer-direct-transport@3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/nodemailer-direct-transport/-/nodemailer-direct-transport-3.3.2.tgz#e96fafb90358560947e569017d97e60738a50a86"
-  integrity sha1-6W+vuQNYVglH5WkBfZfmBzilCoY=
   dependencies:
     nodemailer-shared "1.1.0"
     smtp-connection "2.12.0"
@@ -6662,19 +3701,16 @@ nodemailer-direct-transport@3.3.2:
 nodemailer-fetch@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz#79c4908a1c0f5f375b73fe888da9828f6dc963a4"
-  integrity sha1-ecSQihwPXzdbc/6IjamCj23JY6Q=
 
 nodemailer-shared@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz#cf5994e2fd268d00f5cf0fa767a08169edb07ec0"
-  integrity sha1-z1mU4v0mjQD1zw+nZ6CBae2wfsA=
   dependencies:
     nodemailer-fetch "1.6.0"
 
 nodemailer-smtp-pool@2.8.2:
   version "2.8.2"
   resolved "https://registry.yarnpkg.com/nodemailer-smtp-pool/-/nodemailer-smtp-pool-2.8.2.tgz#2eb94d6cf85780b1b4725ce853b9cbd5e8da8c72"
-  integrity sha1-LrlNbPhXgLG0clzoU7nL1ejajHI=
   dependencies:
     nodemailer-shared "1.1.0"
     nodemailer-wellknown "0.1.10"
@@ -6683,7 +3719,6 @@ nodemailer-smtp-pool@2.8.2:
 nodemailer-smtp-transport@2.7.2:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/nodemailer-smtp-transport/-/nodemailer-smtp-transport-2.7.2.tgz#03d71c76314f14ac7dbc7bf033a6a6d16d67fb77"
-  integrity sha1-A9ccdjFPFKx9vHvwM6am0W1n+3c=
   dependencies:
     nodemailer-shared "1.1.0"
     nodemailer-wellknown "0.1.10"
@@ -6692,12 +3727,10 @@ nodemailer-smtp-transport@2.7.2:
 nodemailer-wellknown@0.1.10:
   version "0.1.10"
   resolved "https://registry.yarnpkg.com/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz#586db8101db30cb4438eb546737a41aad0cf13d5"
-  integrity sha1-WG24EB2zDLRDjrVGc3pBqtDPE9U=
 
 nodemailer@^2.5.0:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-2.7.2.tgz#f242e649aeeae39b6c7ed740ef7b061c404d30f9"
-  integrity sha1-8kLmSa7q45tsftdA73sGHEBNMPk=
   dependencies:
     libmime "3.0.0"
     mailcomposer "4.0.1"
@@ -6707,17 +3740,15 @@ nodemailer@^2.5.0:
     nodemailer-smtp-transport "2.7.2"
     socks "1.1.9"
 
-"nopt@2 || 3", nopt@3.x:
+nopt@3.x:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
   dependencies:
     abbrev "1"
 
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
   dependencies:
     abbrev "1"
     osenv "^0.1.4"
@@ -6725,7 +3756,6 @@ nopt@^4.0.1:
 normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, "normalize-package-data@~1.0.1 || ^2.0.0":
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
-  integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==
   dependencies:
     hosted-git-info "^2.1.4"
     is-builtin-module "^1.0.0"
@@ -6735,24 +3765,16 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-
 normalize-path@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
-  integrity sha1-MtDkcvkf80VwHBWoMRAY07CpA3k=
 
 normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
   dependencies:
     remove-trailing-separator "^1.0.1"
 
-normalize-range@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
-  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
-
 normalize-url@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
-  integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==
   dependencies:
     prepend-http "^2.0.0"
     query-string "^5.0.1"
@@ -6761,12 +3783,10 @@ normalize-url@2.0.1:
 npm-bundled@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
-  integrity sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==
 
 "npm-package-arg@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
-  integrity sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==
   dependencies:
     hosted-git-info "^2.6.0"
     osenv "^0.1.5"
@@ -6776,7 +3796,6 @@ npm-bundled@^1.0.1:
 npm-packlist@^1.1.12:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a"
-  integrity sha512-WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
@@ -6784,15 +3803,13 @@ npm-packlist@^1.1.12:
 npm-packlist@^1.1.6:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de"
-  integrity sha512-CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
-npm-pick-manifest@^2.1.0, npm-pick-manifest@^2.2.3:
+npm-pick-manifest@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40"
-  integrity sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==
   dependencies:
     figgy-pudding "^3.5.1"
     npm-package-arg "^6.0.0"
@@ -6801,7 +3818,6 @@ npm-pick-manifest@^2.1.0, npm-pick-manifest@^2.2.3:
 npm-registry-client@8.6.0:
   version "8.6.0"
   resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-8.6.0.tgz#7f1529f91450732e89f8518e0f21459deea3e4c4"
-  integrity sha512-Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg==
   dependencies:
     concat-stream "^1.5.2"
     graceful-fs "^4.1.6"
@@ -6820,7 +3836,6 @@ npm-registry-client@8.6.0:
 npm-registry-fetch@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-3.8.0.tgz#aa7d9a7c92aff94f48dba0984bdef4bd131c88cc"
-  integrity sha512-hrw8UMD+Nob3Kl3h8Z/YjmKamb1gf7D1ZZch2otrIXM3uFLB5vjEY6DhMlq80z/zZet6eETLbOXcuQudCB3Zpw==
   dependencies:
     JSONStream "^1.3.4"
     bluebird "^3.5.1"
@@ -6832,14 +3847,12 @@ npm-registry-fetch@^3.8.0:
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
   dependencies:
     path-key "^2.0.0"
 
-"npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.0, npmlog@^4.0.2:
+"npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
   dependencies:
     are-we-there-yet "~1.1.2"
     console-control-strings "~1.1.0"
@@ -6849,42 +3862,30 @@ npm-run-path@^2.0.0:
 null-check@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd"
-  integrity sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=
-
-num2fraction@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
-  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
 
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
 oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
 
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
 object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
 object-component@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
-  integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=
 
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
-  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
   dependencies:
     copy-descriptor "^0.1.0"
     define-property "^0.2.5"
@@ -6893,24 +3894,20 @@ object-copy@^0.1.0:
 object-inspect@~1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4"
-  integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==
 
 object-keys@^1.0.6:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
-  integrity sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==
 
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
-  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
   dependencies:
     isobject "^3.0.0"
 
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
   dependencies:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
@@ -6918,64 +3915,28 @@ object.omit@^2.0.0:
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
   dependencies:
     isobject "^3.0.1"
 
-obuf@^1.0.0, obuf@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
-  integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
-
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
   dependencies:
     ee-first "1.1.1"
 
-on-headers@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
-  integrity sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=
-
 once@1.x, once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
 one-time@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz#f8cdf77884826fe4dff93e3a9cc37b1e4480742e"
-  integrity sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=
 
-onetime@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
-  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
-  dependencies:
-    mimic-fn "^1.0.0"
-
-opn@5.3.0:
-  version "5.3.0"
-  resolved "http://registry.npmjs.org/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
-  integrity sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==
-  dependencies:
-    is-wsl "^1.1.0"
-
-opn@^5.1.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
-  integrity sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==
-  dependencies:
-    is-wsl "^1.1.0"
-
-optimist@^0.6.1, optimist@~0.6.0:
+optimist@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
   dependencies:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
@@ -6983,7 +3944,6 @@ optimist@^0.6.1, optimist@~0.6.0:
 optionator@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
-  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
   dependencies:
     deep-is "~0.1.3"
     fast-levenshtein "~2.0.4"
@@ -6995,59 +3955,32 @@ optionator@^0.8.1:
 optjs@~3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/optjs/-/optjs-3.2.2.tgz#69a6ce89c442a44403141ad2f9b370bd5bb6f4ee"
-  integrity sha1-aabOicRCpEQDFBrS+bNwvVu29O4=
-
-original@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
-  integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
-  dependencies:
-    url-parse "^1.4.3"
-
-os-browserify@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
-  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
 os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
 os-locale@^1.4.0:
   version "1.4.0"
   resolved "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
-  integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
   dependencies:
     lcid "^1.0.0"
 
 os-locale@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
-  integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==
   dependencies:
     execa "^0.7.0"
     lcid "^1.0.0"
     mem "^1.1.0"
 
-os-locale@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.0.1.tgz#3b014fbf01d87f60a1e5348d80fe870dc82c4620"
-  integrity sha512-7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==
-  dependencies:
-    execa "^0.10.0"
-    lcid "^2.0.0"
-    mem "^4.0.0"
-
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@0, osenv@^0.1.4, osenv@^0.1.5:
+osenv@^0.1.4, osenv@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
@@ -7055,77 +3988,40 @@ osenv@0, osenv@^0.1.4, osenv@^0.1.5:
 p-cancelable@^0.4.0:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"
-  integrity sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==
-
-p-defer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
-  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
 
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
 p-is-promise@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
-  integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
 
-p-limit@^1.0.0, p-limit@^1.1.0:
+p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
-  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
-  integrity sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==
-  dependencies:
-    p-try "^2.0.0"
-
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
-  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
   dependencies:
     p-limit "^1.1.0"
 
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
-  dependencies:
-    p-limit "^2.0.0"
-
-p-map@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
-  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
-
 p-timeout@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
-  integrity sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==
   dependencies:
     p-finally "^1.0.0"
 
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
-
-p-try@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
-  integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
 
 pac-proxy-agent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz#11d578b72a164ad74bf9d5bac9ff462a38282432"
-  integrity sha512-AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q==
   dependencies:
     agent-base "^4.2.0"
     debug "^3.1.0"
@@ -7139,7 +4035,6 @@ pac-proxy-agent@^3.0.0:
 pac-resolver@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-3.0.0.tgz#6aea30787db0a891704deb7800a722a7615a6f26"
-  integrity sha512-tcc38bsjuE3XZ5+4vP96OfhOugrX+JcnpUbhfuc4LuXBLQhoTthOstZeoQJBDnQUDYzYmdImKsbz0xSl1/9qeA==
   dependencies:
     co "^4.6.0"
     degenerator "^1.0.4"
@@ -7147,53 +4042,9 @@ pac-resolver@^3.0.0:
     netmask "^1.0.6"
     thunkify "^2.1.2"
 
-package-json@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
-  integrity sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=
-  dependencies:
-    got "^6.7.1"
-    registry-auth-token "^3.0.1"
-    registry-url "^3.0.3"
-    semver "^5.1.0"
-
-pacote@9.1.1:
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.1.1.tgz#25091f75a25021de8be8d34cc6408728fca3579b"
-  integrity sha512-f28Rq5ozzKAA9YwIKw61/ipwAatUZseYmVssDbHHaexF0wRIVotapVEZPAjOT7Eu3LYVqEp0NVpNizoAnYBUaA==
-  dependencies:
-    bluebird "^3.5.2"
-    cacache "^11.2.0"
-    figgy-pudding "^3.5.1"
-    get-stream "^4.1.0"
-    glob "^7.1.3"
-    lru-cache "^4.1.3"
-    make-fetch-happen "^4.0.1"
-    minimatch "^3.0.4"
-    minipass "^2.3.5"
-    mississippi "^3.0.0"
-    mkdirp "^0.5.1"
-    normalize-package-data "^2.4.0"
-    npm-package-arg "^6.1.0"
-    npm-packlist "^1.1.12"
-    npm-pick-manifest "^2.1.0"
-    npm-registry-fetch "^3.8.0"
-    osenv "^0.1.5"
-    promise-inflight "^1.0.1"
-    promise-retry "^1.1.1"
-    protoduck "^5.0.1"
-    rimraf "^2.6.2"
-    safe-buffer "^5.1.2"
-    semver "^5.6.0"
-    ssri "^6.0.1"
-    tar "^4.4.6"
-    unique-filename "^1.1.1"
-    which "^1.3.1"
-
 pacote@^9.2.3:
   version "9.2.3"
   resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.2.3.tgz#48cfe87beb9177acd6594355a584a538835424b3"
-  integrity sha512-Y3+yY3nBRAxMlZWvr62XLJxOwCmG9UmkGZkFurWHoCjqF0cZL72cTOCRJTvWw8T4OhJS2RTg13x4oYYriauvEw==
   dependencies:
     bluebird "^3.5.2"
     cacache "^11.2.0"
@@ -7226,42 +4077,26 @@ pacote@^9.2.3:
 pako@^0.2.5:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
-  integrity sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=
 
-pako@^1.0.6, pako@~1.0.2, pako@~1.0.5:
+pako@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
-  integrity sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==
 
 parallel-transform@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
-  integrity sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=
   dependencies:
     cyclist "~0.2.2"
     inherits "^2.0.3"
     readable-stream "^2.1.5"
 
-parse-asn1@^5.0.0:
-  version "5.1.1"
-  resolved "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
-  integrity sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==
-  dependencies:
-    asn1.js "^4.0.0"
-    browserify-aes "^1.0.0"
-    create-hash "^1.1.0"
-    evp_bytestokey "^1.0.0"
-    pbkdf2 "^3.0.3"
-
 parse-github-repo-url@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"
-  integrity sha1-nn2LslKmy2ukJZUGC3v23z28H1A=
 
 parse-glob@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
   dependencies:
     glob-base "^0.3.0"
     is-dotfile "^1.0.0"
@@ -7271,130 +4106,75 @@ parse-glob@^3.0.4:
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
   dependencies:
     error-ex "^1.2.0"
 
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
   dependencies:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
-parse5-html-rewriting-stream@5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-5.1.0.tgz#63f92c958764aea8cbe3aa68f2e5895c32068ab8"
-  integrity sha512-hZlaOTHJs4dpC5yFHnOSEMh26ErsqTsLzxKqkuRcUqtiu0kMsBQ9pkgANkECDyoBUhJ3+hvb2DPLsyqbtcS61Q==
-  dependencies:
-    parse5 "^5.1.0"
-    parse5-sax-parser "^5.1.0"
-
-parse5-sax-parser@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/parse5-sax-parser/-/parse5-sax-parser-5.1.0.tgz#ec234d23223a8054a74ff173aa3dc2da74c5bbd9"
-  integrity sha512-VEhdEDhBkoSILPmsZ96SoIIUow3hZbtgQsqXw7r8DxxnqsCIO0fwkT9mWgBcf9SPjVUh92liuEprHrrYzXBPWQ==
-  dependencies:
-    parse5 "^5.1.0"
-
-parse5@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
-  integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
-
-parse5@^5.0.0, parse5@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2"
-  integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==
-
 parseqs@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
-  integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=
   dependencies:
     better-assert "~1.0.0"
 
 parser-toolkit@>=0.0.3:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parser-toolkit/-/parser-toolkit-0.0.5.tgz#ec4b61729c86318b56ea971bfba6b3c672d62c01"
-  integrity sha1-7EthcpyGMYtW6pcb+6azxnLWLAE=
 
 parseuri@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
-  integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=
   dependencies:
     better-assert "~1.0.0"
 
 parseurl@~1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
-  integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
 
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
-
-path-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
-  integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=
 
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
 path-exists@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
-  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
   dependencies:
     pinkie-promise "^2.0.0"
 
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-path-is-inside@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
 
-path-key@^2.0.0, path-key@^2.0.1:
+path-key@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
 path-parse@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
 path-proxy@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/path-proxy/-/path-proxy-1.0.0.tgz#18e8a36859fc9d2f1a53b48dee138543c020de5e"
-  integrity sha1-GOijaFn8nS8aU7SN7hOFQ8Ag3l4=
   dependencies:
     inflection "~1.3.0"
 
-path-to-regexp@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
-
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
-  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
   dependencies:
     graceful-fs "^4.1.2"
     pify "^2.0.0"
@@ -7403,240 +4183,95 @@ path-type@^1.0.0:
 path-type@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
-  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
   dependencies:
     pify "^2.0.0"
 
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
   dependencies:
     pify "^3.0.0"
 
-pbkdf2@^3.0.3:
-  version "3.0.17"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
-  integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==
-  dependencies:
-    create-hash "^1.1.2"
-    create-hmac "^1.1.4"
-    ripemd160 "^2.0.1"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
 pidtree@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.0.tgz#f6fada10fccc9f99bf50e90d0b23d72c9ebc2e6b"
-  integrity sha512-9CT4NFlDcosssyg8KVFltgokyKZIFjoBxw8CTGy+5F38Y1eQWrt8tRayiUOXE+zVKQnYu5BR8JjCtvK3BcnBhg==
 
 pidusage@^2.0.17:
   version "2.0.17"
   resolved "https://registry.yarnpkg.com/pidusage/-/pidusage-2.0.17.tgz#6b4a2b4a09026f0e9828f7e5627837e4c0672581"
-  integrity sha512-N8X5v18rBmlBoArfS83vrnD0gIFyZkXEo7a5pAS2aT0i2OLVymFb2AzVg+v8l/QcXnE1JwZcaXR8daJcoJqtjw==
   dependencies:
     safe-buffer "^5.1.2"
 
 pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
 
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-
-pkg-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
-  dependencies:
-    find-up "^2.1.0"
-
-pkg-dir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
-  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
-  dependencies:
-    find-up "^3.0.0"
 
 pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
-  integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==
-
-popper.js@^1.14.1:
-  version "1.14.4"
-  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.4.tgz#8eec1d8ff02a5a3a152dd43414a15c7b79fd69b6"
-  integrity sha1-juwdj/AqWjoVLdQ0FKFce3n9abY=
-
-portfinder@1.0.17:
-  version "1.0.17"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.17.tgz#a8a1691143e46c4735edefcf4fbcccedad26456a"
-  integrity sha512-syFcRIRzVI1BoEFOCaAiizwDolh1S1YXSodsVhncbhjzjZQulhczNRbqnUl9N31Q4dKGOXsNDqxC2BWBgSMqeQ==
-  dependencies:
-    async "^1.5.2"
-    debug "^2.2.0"
-    mkdirp "0.5.x"
-
-portfinder@^1.0.9:
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.19.tgz#07e87914a55242dcda5b833d42f018d6875b595f"
-  integrity sha512-23aeQKW9KgHe6citUrG3r9HjeX6vls0h713TAa+CwTKZwNIr/pD2ApaxYF4Um3ZZyq4ar+Siv3+fhoHaIwSOSw==
-  dependencies:
-    async "^1.5.2"
-    debug "^2.2.0"
-    mkdirp "0.5.x"
 
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
-
-postcss-import@12.0.0:
-  version "12.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.0.tgz#149f96a4ef0b27525c419784be8517ebd17e92c5"
-  integrity sha512-3KqKRZcaZAvxbY8DVLdd81tG5uKzbUQuiWIvy0o0fzEC42bKacqPYFWbfCQyw6L4LWUaqPz/idvIdbhpgQ32eQ==
-  dependencies:
-    postcss "^7.0.1"
-    postcss-value-parser "^3.2.3"
-    read-cache "^1.0.0"
-    resolve "^1.1.7"
-
-postcss-load-config@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.0.0.tgz#f1312ddbf5912cd747177083c5ef7a19d62ee484"
-  integrity sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==
-  dependencies:
-    cosmiconfig "^4.0.0"
-    import-cwd "^2.0.0"
-
-postcss-loader@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d"
-  integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==
-  dependencies:
-    loader-utils "^1.1.0"
-    postcss "^7.0.0"
-    postcss-load-config "^2.0.0"
-    schema-utils "^1.0.0"
-
-postcss-url@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-8.0.0.tgz#7b10059bd12929cdbb1971c60f61a0e5af86b4ca"
-  integrity sha512-E2cbOQ5aii2zNHh8F6fk1cxls7QVFZjLPSrqvmiza8OuXLzIpErij8BDS5Y3STPfJgpIMNCPEr8JlKQWEoozUw==
-  dependencies:
-    mime "^2.3.1"
-    minimatch "^3.0.4"
-    mkdirp "^0.5.0"
-    postcss "^7.0.2"
-    xxhashjs "^0.2.1"
-
-postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
-  integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
-
-postcss@7.0.5, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.5.tgz#70e6443e36a6d520b0fd4e7593fcca3635ee9f55"
-  integrity sha512-HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ==
-  dependencies:
-    chalk "^2.4.1"
-    source-map "^0.6.1"
-    supports-color "^5.5.0"
 
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
-
-prepend-http@^1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
 
 prepend-http@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
-  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
 
 preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
 process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-  integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
 
 process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
-
-process@^0.11.10:
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
 promise-retry@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
-  integrity sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=
   dependencies:
     err-code "^1.0.0"
     retry "^0.10.0"
 
-promise@^7.1.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
-  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
-  dependencies:
-    asap "~2.0.3"
-
-promise@~7.0.1:
-  version "7.0.4"
-  resolved "http://registry.npmjs.org/promise/-/promise-7.0.4.tgz#363e84a4c36c8356b890fed62c91ce85d02ed539"
-  integrity sha1-Nj6EpMNsg1a4kP7WLJHOhdAu1Tk=
-  dependencies:
-    asap "~2.0.3"
-
 promisify-call@^2.0.2:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/promisify-call/-/promisify-call-2.0.4.tgz#d48c2d45652ccccd52801ddecbd533a6d4bd5fba"
-  integrity sha1-1IwtRWUszM1SgB3ey9UzptS9X7o=
   dependencies:
     with-callback "^1.0.2"
 
 protobufjs@5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.3.tgz#e4dfe9fb67c90b2630d15868249bcc4961467a17"
-  integrity sha512-55Kcx1MhPZX0zTbVosMQEO5R6/rikNXd9b6RQK4KSPcrSIIwoXTtebIczUrXlwaSrbz4x8XUVThGPob1n8I4QA==
   dependencies:
     ascli "~1"
     bytebuffer "~5"
@@ -7646,44 +4281,12 @@ protobufjs@5.0.3:
 protoduck@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f"
-  integrity sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==
   dependencies:
     genfun "^5.0.0"
 
-protractor@~5.4.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.4.1.tgz#011a99e38df7aa45d22455b889ffbb13a6ce0bd9"
-  integrity sha512-ORey5ewQMYiXQxcQohsqEiKYOg/r5yJoJbt0tuROmmgajdg/CA3gTOZNIFJncUVMAJIk5YFqBBLUjKVmQO6tfA==
-  dependencies:
-    "@types/node" "^6.0.46"
-    "@types/q" "^0.0.32"
-    "@types/selenium-webdriver" "^3.0.0"
-    blocking-proxy "^1.0.0"
-    browserstack "^1.5.1"
-    chalk "^1.1.3"
-    glob "^7.0.3"
-    jasmine "2.8.0"
-    jasminewd2 "^2.1.0"
-    optimist "~0.6.0"
-    q "1.4.1"
-    saucelabs "^1.5.0"
-    selenium-webdriver "3.6.0"
-    source-map-support "~0.4.0"
-    webdriver-js-extender "2.1.0"
-    webdriver-manager "^12.0.6"
-
-proxy-addr@~2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
-  integrity sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==
-  dependencies:
-    forwarded "~0.1.2"
-    ipaddr.js "1.8.0"
-
 proxy-agent@~3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-3.0.3.tgz#1c1a33db60ef5f2e9e35b876fd63c2bc681c611d"
-  integrity sha512-PXVVVuH9tiQuxQltFJVSnXWuDtNr+8aNBP6XVDDCDiUuDN8eRCm+ii4/mFWmXWEA0w8jjJSlePa4LXlM4jIzNA==
   dependencies:
     agent-base "^4.2.0"
     debug "^3.1.0"
@@ -7697,39 +4300,18 @@ proxy-agent@~3.0.0:
 proxy-from-env@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
-  integrity sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=
-
-prr@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
 pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
 psl@^1.1.24:
   version "1.1.29"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
-  integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==
-
-public-encrypt@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
-  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
-  dependencies:
-    bn.js "^4.1.0"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    parse-asn1 "^5.0.0"
-    randombytes "^2.0.1"
-    safe-buffer "^5.1.2"
 
-pump@^2.0.0, pump@^2.0.1:
+pump@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
-  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
@@ -7737,7 +4319,6 @@ pump@^2.0.0, pump@^2.0.1:
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
@@ -7745,85 +4326,54 @@ pump@^3.0.0:
 pumpify@^1.3.3:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
-  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
   dependencies:
     duplexify "^3.6.0"
     inherits "^2.0.3"
     pump "^2.0.0"
 
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
-
-punycode@1.4.1, punycode@^1.2.4, punycode@^1.4.1:
+punycode@1.4.1, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
 punycode@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 q@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
-  integrity sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=
 
 q@^1.4.1, q@^1.5.0, q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
-  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
 qjobs@^1.1.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
-  integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
 
 qs@6.5.2, qs@~6.5.1, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
 qs@~6.2.0:
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"
-  integrity sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=
 
 query-string@^5.0.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
-  integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==
   dependencies:
     decode-uri-component "^0.2.0"
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
-querystring-es3@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
-  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
-
-querystring@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
-
-querystringify@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.0.tgz#7ded8dfbf7879dcc60d0a644ac6754b283ad17ef"
-  integrity sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==
-
 quick-lru@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
-  integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=
 
 quicktype-core@^5.0.41:
   version "5.0.41"
   resolved "https://registry.yarnpkg.com/quicktype-core/-/quicktype-core-5.0.41.tgz#83f090b1bddeefcff0581e0d9c754d83410ed453"
-  integrity sha512-CImdVo4M4TlDs0McPSql9HnaoG5/Z3w1bQIlAhc95qekxBx+jJ2HNIqXzEkIsvx7W7sIPZhOuCug9fvmqNkMKQ==
   dependencies:
     "@types/urijs" "github:quicktype/types-urijs"
     collection-utils "0.0.15"
@@ -7839,7 +4389,6 @@ quicktype-core@^5.0.41:
 quote-stream@^1.0.1, quote-stream@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/quote-stream/-/quote-stream-1.0.2.tgz#84963f8c9c26b942e153feeb53aae74652b7e0b2"
-  integrity sha1-hJY/jJwmuULhU/7rU6rnRlK34LI=
   dependencies:
     buffer-equal "0.0.1"
     minimist "^1.1.3"
@@ -7848,68 +4397,36 @@ quote-stream@^1.0.1, quote-stream@~1.0.2:
 randomatic@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.0.tgz#36f2ca708e9e567f5ed2ec01949026d50aa10116"
-  integrity sha512-KnGPVE0lo2WoXxIZ7cPR8YBpiol4gsSuOwDSg410oHh80ZMp5EiypNqL2K4Z77vJn6lB5rap7IkAmcUlalcnBQ==
   dependencies:
     is-number "^4.0.0"
     kind-of "^6.0.0"
     math-random "^1.0.1"
 
-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
-  integrity sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==
-  dependencies:
-    safe-buffer "^5.1.0"
-
-randomfill@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
-  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
-  dependencies:
-    randombytes "^2.0.5"
-    safe-buffer "^5.1.0"
-
-range-parser@^1.0.3, range-parser@^1.2.0, range-parser@~1.2.0:
+range-parser@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
-  integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
 raw-body@2.3.3, raw-body@^2.2.0:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
-  integrity sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==
   dependencies:
     bytes "3.0.0"
     http-errors "1.6.3"
     iconv-lite "0.4.23"
     unpipe "1.0.0"
 
-raw-loader@0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
-  integrity sha1-DD0L6u2KAclm2Xh793goElKpeao=
-
-rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
+rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
   dependencies:
     deep-extend "^0.6.0"
     ini "~1.3.0"
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-read-cache@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
-  integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=
-  dependencies:
-    pify "^2.3.0"
-
 read-installed@~4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/read-installed/-/read-installed-4.0.3.tgz#ff9b8b67f187d1e4c29b9feb31f6b223acd19067"
-  integrity sha1-/5uLZ/GH0eTCm5/rMfayI6zRkGc=
   dependencies:
     debuglog "^1.0.1"
     read-package-json "^2.0.0"
@@ -7923,7 +4440,6 @@ read-installed@~4.0.3:
 read-package-json@^2.0.0:
   version "2.0.13"
   resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a"
-  integrity sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==
   dependencies:
     glob "^7.1.1"
     json-parse-better-errors "^1.0.1"
@@ -7935,7 +4451,6 @@ read-package-json@^2.0.0:
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
-  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
   dependencies:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
@@ -7943,7 +4458,6 @@ read-pkg-up@^1.0.1:
 read-pkg-up@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
-  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
   dependencies:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
@@ -7951,23 +4465,13 @@ read-pkg-up@^2.0.0:
 read-pkg-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
-  integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=
   dependencies:
     find-up "^2.0.0"
     read-pkg "^3.0.0"
 
-read-pkg-up@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
-  integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==
-  dependencies:
-    find-up "^3.0.0"
-    read-pkg "^3.0.0"
-
 read-pkg@^1.0.0, read-pkg@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
-  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
   dependencies:
     load-json-file "^1.0.0"
     normalize-package-data "^2.3.2"
@@ -7976,7 +4480,6 @@ read-pkg@^1.0.0, read-pkg@^1.1.0:
 read-pkg@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
-  integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
   dependencies:
     load-json-file "^2.0.0"
     normalize-package-data "^2.3.2"
@@ -7985,16 +4488,14 @@ read-pkg@^2.0.0:
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
-  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
   dependencies:
     load-json-file "^4.0.0"
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.0, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.3:
+"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.0, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.3:
   version "2.3.6"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -8007,17 +4508,15 @@ read-pkg@^3.0.0:
 readable-stream@1.1.x, "readable-stream@1.x >=1.1.9":
   version "1.1.14"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@~2.0.5, readable-stream@~2.0.6:
+readable-stream@~2.0.5:
   version "2.0.6"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
-  integrity sha1-j5A0HmilPMySh4jaz80Rs265t44=
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -8029,7 +4528,6 @@ readable-stream@~2.0.5, readable-stream@~2.0.6:
 readdir-scoped-modules@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
-  integrity sha1-n6+jfShr5dksuuve4DDcm19AZ0c=
   dependencies:
     debuglog "^1.0.1"
     dezalgo "^1.0.0"
@@ -8039,7 +4537,6 @@ readdir-scoped-modules@^1.0.0:
 readdirp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
-  integrity sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=
   dependencies:
     graceful-fs "^4.1.2"
     minimatch "^3.0.2"
@@ -8049,14 +4546,12 @@ readdirp@^2.0.0:
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-  integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
   dependencies:
     resolve "^1.1.6"
 
 redent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
-  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
   dependencies:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
@@ -8064,7 +4559,6 @@ redent@^1.0.0:
 redent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
-  integrity sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=
   dependencies:
     indent-string "^3.0.0"
     strip-indent "^2.0.0"
@@ -8072,17 +4566,14 @@ redent@^2.0.0:
 redis-commands@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.4.0.tgz#52f9cf99153efcce56a8f86af986bd04e988602f"
-  integrity sha512-cu8EF+MtkwI4DLIT0x9P8qNTLFhQD4jLfxLR0cCNkeGzs87FN6879JOJwNQR/1zD7aSYNbU0hgsV9zGY71Itvw==
 
 redis-parser@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-2.6.0.tgz#52ed09dacac108f1a631c07e9b69941e7a19504b"
-  integrity sha1-Uu0J2srBCPGmMcB+m2mUHnoZUEs=
 
 redis@^2.7.1:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/redis/-/redis-2.8.0.tgz#202288e3f58c49f6079d97af7a10e1303ae14b02"
-  integrity sha512-M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A==
   dependencies:
     double-ended-queue "^2.1.0-0"
     redis-commands "^1.2.0"
@@ -8091,100 +4582,45 @@ redis@^2.7.1:
 reflect-metadata@^0.1.2:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.12.tgz#311bf0c6b63cd782f228a81abe146a2bfa9c56f2"
-  integrity sha512-n+IyV+nGz3+0q3/Yf1ra12KpCyi001bi4XFxSjbiWWjfqb52iTTtpGXmCCAOWWIAn9KEuFZKGqBERHmrtScZ3A==
-
-regenerate@^1.2.1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
-  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
-
-regenerator-runtime@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
-  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
 regex-cache@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
   dependencies:
     is-equal-shallow "^0.1.3"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
-  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
   dependencies:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexpu-core@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
-  integrity sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=
-  dependencies:
-    regenerate "^1.2.1"
-    regjsgen "^0.2.0"
-    regjsparser "^0.1.4"
-
-registry-auth-token@^3.0.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
-  integrity sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==
-  dependencies:
-    rc "^1.1.6"
-    safe-buffer "^5.0.1"
-
-registry-url@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
-  integrity sha1-PU74cPc93h138M+aOBQyRE4XSUI=
-  dependencies:
-    rc "^1.0.1"
-
-regjsgen@^0.2.0:
-  version "0.2.0"
-  resolved "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
-  integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
-
-regjsparser@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
-  integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=
-  dependencies:
-    jsesc "~0.5.0"
-
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
 repeat-element@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
-  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
 repeat-string@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae"
-  integrity sha1-x6jTI2BoNiBZp+RlH8aITosftK4=
 
 repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
 repeating@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
-  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
   dependencies:
     is-finite "^1.0.0"
 
 request@2.75.x:
   version "2.75.0"
   resolved "http://registry.npmjs.org/request/-/request-2.75.0.tgz#d2b8268a286da13eaa5d01adf5d18cc90f657d93"
-  integrity sha1-0rgmiihtoT6qXQGt9dGMyQ9lfZM=
   dependencies:
     aws-sign2 "~0.6.0"
     aws4 "^1.2.1"
@@ -8211,7 +4647,6 @@ request@2.75.x:
 request@2.85.0:
   version "2.85.0"
   resolved "http://registry.npmjs.org/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
-  integrity sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.6.0"
@@ -8236,10 +4671,9 @@ request@2.85.0:
     tunnel-agent "^0.6.0"
     uuid "^3.1.0"
 
-request@^2.0.0, request@^2.74.0, request@^2.83.0, request@^2.87.0, request@^2.88.0:
+request@^2.0.0, request@^2.74.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
-  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -8265,7 +4699,6 @@ request@^2.0.0, request@^2.74.0, request@^2.83.0, request@^2.87.0, request@^2.88
 requestretry@^1.2.2:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/requestretry/-/requestretry-1.13.0.tgz#213ec1006eeb750e8b8ce54176283d15a8d55d94"
-  integrity sha512-Lmh9qMvnQXADGAQxsXHP4rbgO6pffCfuR8XUBdP9aitJcLQJxhp7YZK4xAVYXnPJ5E52mwrfiKQtKonPL8xsmg==
   dependencies:
     extend "^3.0.0"
     lodash "^4.15.0"
@@ -8275,221 +4708,90 @@ requestretry@^1.2.2:
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
-
-require-from-string@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
-  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
-  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
 
 requirejs@2.3.5:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.5.tgz#617b9acbbcb336540ef4914d790323a8d4b861b0"
-  integrity sha512-svnO+aNcR/an9Dpi44C7KSAy5fFGLtmPbaaCeQaklUz8BQhS64tWWIIlvEA5jrWICzlO/X9KSzSeXFnZdBu8nw==
 
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
-
-resolve-cwd@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
-  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
-  dependencies:
-    resolve-from "^3.0.0"
-
-resolve-from@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
-  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
 
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@1.1.x, resolve@~1.1.6:
+resolve@1.1.x:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
-  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.8.1:
+resolve@^1.1.5, resolve@^1.1.6, resolve@^1.3.2:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
-  integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==
   dependencies:
     path-parse "^1.0.5"
 
 responselike@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
-  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
   dependencies:
     lowercase-keys "^1.0.0"
 
-restore-cursor@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
-  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
-  dependencies:
-    onetime "^2.0.0"
-    signal-exit "^3.0.2"
-
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
 retry@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
-  integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
 
 rfdc@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.2.tgz#e6e72d74f5dc39de8f538f65e00c36c18018e349"
-  integrity sha512-92ktAgvZhBzYTIK0Mja9uen5q5J3NRVMoDkJL2VMwq6SXjVCgqvQeVP2XAaUY6HT+XpQYeLSjb3UoitBryKmdA==
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2:
+rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
   dependencies:
     glob "^7.0.5"
 
 rimraf@~2.2.6:
   version "2.2.8"
   resolved "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
-  integrity sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=
-
-ripemd160@^2.0.0, ripemd160@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
-  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-
-rollup-plugin-commonjs@^9.1.3:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.2.0.tgz#4604e25069e0c78a09e08faa95dc32dec27f7c89"
-  integrity sha512-0RM5U4Vd6iHjL6rLvr3lKBwnPsaVml+qxOGaaNUWN1lSq6S33KhITOfHmvxV3z2vy9Mk4t0g4rNlVaJJsNQPWA==
-  dependencies:
-    estree-walker "^0.5.2"
-    magic-string "^0.25.1"
-    resolve "^1.8.1"
-    rollup-pluginutils "^2.3.3"
-
-rollup-plugin-json@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-json/-/rollup-plugin-json-3.1.0.tgz#7c1daf60c46bc21021ea016bd00863561a03321b"
-  integrity sha512-BlYk5VspvGpjz7lAwArVzBXR60JK+4EKtPkCHouAWg39obk9S61hZYJDBfMK+oitPdoe11i69TlxKlMQNFC/Uw==
-  dependencies:
-    rollup-pluginutils "^2.3.1"
-
-rollup-plugin-node-resolve@^3.0.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.4.0.tgz#908585eda12e393caac7498715a01e08606abc89"
-  integrity sha512-PJcd85dxfSBWih84ozRtBkB731OjXk0KnzN0oGp7WOWcarAFkVa71cV5hTJg2qpVsV2U8EUwrzHP3tvy9vS3qg==
-  dependencies:
-    builtin-modules "^2.0.0"
-    is-module "^1.0.0"
-    resolve "^1.1.6"
-
-rollup-plugin-sourcemaps@^0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.4.2.tgz#62125aa94087aadf7b83ef4dfaf629b473135e87"
-  integrity sha1-YhJaqUCHqt97g+9N+vYptHMTXoc=
-  dependencies:
-    rollup-pluginutils "^2.0.1"
-    source-map-resolve "^0.5.0"
-
-rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.3.tgz#3aad9b1eb3e7fe8262820818840bf091e5ae6794"
-  integrity sha512-2XZwja7b6P5q4RZ5FhyX1+f46xi1Z3qBKigLRZ6VTZjwbN0K1IFGMlwm06Uu0Emcre2Z63l77nq/pzn+KxIEoA==
-  dependencies:
-    estree-walker "^0.5.2"
-    micromatch "^2.3.11"
-
-rollup@^0.66.0:
-  version "0.66.6"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.66.6.tgz#ce7d6185beb7acea644ce220c25e71ae03275482"
-  integrity sha512-J7/SWanrcb83vfIHqa8+aVVGzy457GcjA6GVZEnD0x2u4OnOd0Q1pCrEoNe8yLwM6z6LZP02zBT2uW0yh5TqOw==
-  dependencies:
-    "@types/estree" "0.0.39"
-    "@types/node" "*"
-
-run-async@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
-  integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
-  dependencies:
-    is-promise "^2.1.0"
 
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
-  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
   dependencies:
     aproba "^1.1.1"
 
-rxjs@6.3.3, rxjs@^6.0.0, rxjs@^6.1.0, rxjs@~6.3.0:
+rxjs@~6.3.0:
   version "6.3.3"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
-  integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
   dependencies:
     ret "~0.1.10"
 
 "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-sass-graph@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
-  integrity sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=
-  dependencies:
-    glob "^7.0.0"
-    lodash "^4.0.0"
-    scss-tokenizer "^0.2.3"
-    yargs "^7.0.0"
-
-sass-loader@7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.1.0.tgz#16fd5138cb8b424bf8a759528a1972d72aad069d"
-  integrity sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==
-  dependencies:
-    clone-deep "^2.0.1"
-    loader-utils "^1.0.1"
-    lodash.tail "^4.1.1"
-    neo-async "^2.5.0"
-    pify "^3.0.0"
-    semver "^5.5.0"
 
 sauce-connect-launcher@^1.2.2:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sauce-connect-launcher/-/sauce-connect-launcher-1.2.4.tgz#8d38f85242a9fbede1b2303b559f7e20c5609a1c"
-  integrity sha512-X2vfwulR6brUGiicXKxPm1GJ7dBEeP1II450Uv4bHGrcGOapZNgzJvn9aioea5IC5BPp/7qjKdE3xbbTBIVXMA==
   dependencies:
     adm-zip "~0.4.3"
     async "^2.1.2"
@@ -8497,179 +4799,35 @@ sauce-connect-launcher@^1.2.2:
     lodash "^4.16.6"
     rimraf "^2.5.4"
 
-saucelabs@^1.4.0, saucelabs@^1.5.0:
+saucelabs@^1.4.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-1.5.0.tgz#9405a73c360d449b232839919a86c396d379fd9d"
-  integrity sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==
   dependencies:
     https-proxy-agent "^2.2.1"
 
-sax@0.5.x:
-  version "0.5.8"
-  resolved "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
-  integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=
-
-sax@>=0.6.0, sax@^1.2.4:
+sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-
-schema-utils@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
-  integrity sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=
-  dependencies:
-    ajv "^5.0.0"
-
-schema-utils@^0.4.4, schema-utils@^0.4.5:
-  version "0.4.7"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
-  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
-  dependencies:
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-
-schema-utils@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
-  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
-  dependencies:
-    ajv "^6.1.0"
-    ajv-errors "^1.0.0"
-    ajv-keywords "^3.1.0"
-
-scss-tokenizer@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
-  integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE=
-  dependencies:
-    js-base64 "^2.1.8"
-    source-map "^0.4.2"
-
-seedrandom@^2.4.4:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-2.4.4.tgz#b25ea98632c73e45f58b77cfaa931678df01f9ba"
-  integrity sha512-9A+PDmgm+2du77B5i0Ip2cxOqqHjgNxnBgglxLcX78A2D6c2rTo61z4jnVABpF4cKeDMDG+cmXXvdnqse2VqMA==
-
-select-hose@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
-  integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
-
-selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz#2ba87a1662c020b8988c981ae62cb2a01298eafc"
-  integrity sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==
-  dependencies:
-    jszip "^3.1.3"
-    rimraf "^2.5.4"
-    tmp "0.0.30"
-    xml2js "^0.4.17"
-
-selfsigned@^1.9.1:
-  version "1.10.4"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
-  integrity sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==
-  dependencies:
-    node-forge "0.7.5"
-
-semver-diff@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
-  integrity sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=
-  dependencies:
-    semver "^5.0.3"
-
-semver-dsl@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/semver-dsl/-/semver-dsl-1.0.1.tgz#d3678de5555e8a61f629eed025366ae5f27340a0"
-  integrity sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=
-  dependencies:
-    semver "^5.3.0"
 
-semver-intersect@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/semver-intersect/-/semver-intersect-1.4.0.tgz#bdd9c06bedcdd2fedb8cd352c3c43ee8c61321f3"
-  integrity sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==
-  dependencies:
-    semver "^5.0.0"
-
-"semver@2 >=2.2.1 || 3.x || 4 || 5", semver@^5.0.0, semver@^5.0.3, semver@^5.1.0, semver@^5.4.1, semver@^5.6.0:
+"semver@2 >=2.2.1 || 3.x || 4 || 5", semver@^5.4.1, semver@^5.6.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
-  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
-"semver@2 || 3 || 4 || 5", semver@5.5.1, semver@^5.3.0, semver@^5.5.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0:
   version "5.5.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
-  integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
-
-semver@~5.3.0:
-  version "5.3.0"
-  resolved "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-  integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
-
-send@0.16.2:
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
-  integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
-  dependencies:
-    debug "2.6.9"
-    depd "~1.1.2"
-    destroy "~1.0.4"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "~1.6.2"
-    mime "1.4.1"
-    ms "2.0.0"
-    on-finished "~2.3.0"
-    range-parser "~1.2.0"
-    statuses "~1.4.0"
-
-serialize-javascript@^1.4.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
-  integrity sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==
-
-serve-index@^1.7.2:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
-  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
-  dependencies:
-    accepts "~1.3.4"
-    batch "0.6.1"
-    debug "2.6.9"
-    escape-html "~1.0.3"
-    http-errors "~1.6.2"
-    mime-types "~2.1.17"
-    parseurl "~1.3.2"
-
-serve-static@1.13.2:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
-  integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
-  dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.2"
-    send "0.16.2"
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
 set-immediate-shim@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
 
 set-value@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
-  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -8679,109 +4837,73 @@ set-value@^0.4.3:
 set-value@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
-  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
-    is-plain-object "^2.0.3"
-    split-string "^3.0.1"
-
-setimmediate@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
-
-setprototypeof@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
-  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
-
-sha.js@^2.4.0, sha.js@^2.4.8:
-  version "2.4.11"
-  resolved "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
-  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.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"
-  integrity sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==
-  dependencies:
-    is-extendable "^0.1.1"
-    kind-of "^5.0.0"
-    mixin-object "^2.0.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
+setprototypeof@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
 
 shallow-copy@~0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz#415f42702d73d810330292cc5ee86eae1a11a170"
-  integrity sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=
 
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
   dependencies:
     shebang-regex "^1.0.0"
 
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
 shelljs@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.2.tgz#345b7df7763f4c2340d584abb532c5f752ca9e35"
-  integrity sha512-pRXeNrCA2Wd9itwhvLp5LZQvPJ0wU6bcjaTMywHHGX5XWhVN2nzSu7WV0q+oUY7mGK3mgSkDDzP3MgjqdyIgbQ==
   dependencies:
     glob "^7.0.0"
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
-signal-exit@^3.0.0, signal-exit@^3.0.2:
+signal-exit@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
 simple-swizzle@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
-  integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=
   dependencies:
     is-arrayish "^0.3.1"
 
 slack-node@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/slack-node/-/slack-node-0.2.0.tgz#de4b8dddaa8b793f61dbd2938104fdabf37dfa30"
-  integrity sha1-3kuN3aqLeT9h29KTgQT9q/N9+jA=
   dependencies:
     requestretry "^1.2.2"
 
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
-  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
 slide@^1.1.3, slide@~1.1.3:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
-  integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=
 
 smart-buffer@^1.0.4:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-1.1.15.tgz#7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"
-  integrity sha1-fxFLW2X6s+KjWqd1uxLw0cZJvxY=
 
 smart-buffer@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.1.tgz#07ea1ca8d4db24eb4cac86537d7d18995221ace3"
-  integrity sha512-RFqinRVJVcCAL9Uh1oVqE6FZkqsyLiVOYEZ20TqIOjuX7iFVJ+zsbs4RIghnw/pTs7mZvt8ZHhvm1ZUrR4fykg==
 
 smtp-connection@2.12.0:
   version "2.12.0"
   resolved "https://registry.yarnpkg.com/smtp-connection/-/smtp-connection-2.12.0.tgz#d76ef9127cb23c2259edb1e8349c2e8d5e2d74c1"
-  integrity sha1-1275EnyyPCJZ7bHoNJwujV4tdME=
   dependencies:
     httpntlm "1.6.1"
     nodemailer-shared "1.1.0"
@@ -8789,7 +4911,6 @@ smtp-connection@2.12.0:
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
-  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
   dependencies:
     define-property "^1.0.0"
     isobject "^3.0.0"
@@ -8798,14 +4919,12 @@ snapdragon-node@^2.0.1:
 snapdragon-util@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
-  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
   dependencies:
     kind-of "^3.2.0"
 
 snapdragon@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
-  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
   dependencies:
     base "^0.11.1"
     debug "^2.2.0"
@@ -8819,26 +4938,22 @@ snapdragon@^0.8.1:
 sntp@1.x.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
-  integrity sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=
   dependencies:
     hoek "2.x.x"
 
 sntp@2.x.x:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
-  integrity sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==
   dependencies:
     hoek "4.x.x"
 
 socket.io-adapter@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b"
-  integrity sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=
 
 socket.io-client@2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.0.4.tgz#0918a552406dc5e540b380dcd97afc4a64332f8e"
-  integrity sha1-CRilUkBtxeVAs4Dc2Xr8SmQzL44=
   dependencies:
     backo2 "1.0.2"
     base64-arraybuffer "0.1.5"
@@ -8857,7 +4972,6 @@ socket.io-client@2.0.4:
 socket.io-client@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.1.tgz#dcb38103436ab4578ddb026638ae2f21b623671f"
-  integrity sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==
   dependencies:
     backo2 "1.0.2"
     base64-arraybuffer "0.1.5"
@@ -8877,7 +4991,6 @@ socket.io-client@2.1.1:
 socket.io-parser@~3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.1.3.tgz#ed2da5ee79f10955036e3da413bfd7f1e4d86c8e"
-  integrity sha512-g0a2HPqLguqAczs3dMECuA1RgoGFPyvDqcbaDEdCWY9g59kdUAz3YRmaJBNKXflrHNwB7Q12Gkf/0CZXfdHR7g==
   dependencies:
     component-emitter "1.2.1"
     debug "~3.1.0"
@@ -8887,7 +5000,6 @@ socket.io-parser@~3.1.1:
 socket.io-parser@~3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz#e7c6228b6aa1f814e6148aea325b51aa9499e077"
-  integrity sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==
   dependencies:
     component-emitter "1.2.1"
     debug "~3.1.0"
@@ -8896,7 +5008,6 @@ socket.io-parser@~3.2.0:
 socket.io@2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.0.4.tgz#c1a4590ceff87ecf13c72652f046f716b29e6014"
-  integrity sha1-waRZDO/4fs8TxyZS8Eb3FrKeYBQ=
   dependencies:
     debug "~2.6.6"
     engine.io "~3.1.0"
@@ -8907,7 +5018,6 @@ socket.io@2.0.4:
 socket.io@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz#a069c5feabee3e6b214a75b40ce0652e1cfb9980"
-  integrity sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==
   dependencies:
     debug "~3.1.0"
     engine.io "~3.2.0"
@@ -8916,30 +5026,9 @@ socket.io@2.1.1:
     socket.io-client "2.1.1"
     socket.io-parser "~3.2.0"
 
-sockjs-client@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz#12fc9d6cb663da5739d3dc5fb6e8687da95cb177"
-  integrity sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==
-  dependencies:
-    debug "^3.2.5"
-    eventsource "^1.0.7"
-    faye-websocket "~0.11.1"
-    inherits "^2.0.3"
-    json3 "^3.3.2"
-    url-parse "^1.4.3"
-
-sockjs@0.3.19:
-  version "0.3.19"
-  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d"
-  integrity sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==
-  dependencies:
-    faye-websocket "^0.10.0"
-    uuid "^3.0.1"
-
 socks-proxy-agent@^4.0.0, socks-proxy-agent@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz#5936bf8b707a993079c6f37db2091821bffa6473"
-  integrity sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==
   dependencies:
     agent-base "~4.2.0"
     socks "~2.2.0"
@@ -8947,7 +5036,6 @@ socks-proxy-agent@^4.0.0, socks-proxy-agent@^4.0.1:
 socks@1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/socks/-/socks-1.1.9.tgz#628d7e4d04912435445ac0b6e459376cb3e6d691"
-  integrity sha1-Yo1+TQSRJDVEWsC25Fk3bLPm1pE=
   dependencies:
     ip "^1.1.2"
     smart-buffer "^1.0.4"
@@ -8955,7 +5043,6 @@ socks@1.1.9:
 socks@~2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/socks/-/socks-2.2.1.tgz#68ad678b3642fbc5d99c64c165bc561eab0215f9"
-  integrity sha512-0GabKw7n9mI46vcNrVfs0o6XzWzjVa3h6GaSo2UPxtWAROXUWavfJWh1M4PR5tnE0dcnQXZIDFP4yrAysLze/w==
   dependencies:
     ip "^1.1.5"
     smart-buffer "^4.0.1"
@@ -8963,32 +5050,12 @@ socks@~2.2.0:
 sort-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
-  integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=
   dependencies:
     is-plain-obj "^1.0.0"
 
-source-list-map@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
-  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
-
-source-list-map@~0.1.7:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
-  integrity sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=
-
-source-map-loader@0.2.4:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.4.tgz#c18b0dc6e23bf66f6792437557c569a11e072271"
-  integrity sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==
-  dependencies:
-    async "^2.5.0"
-    loader-utils "^1.1.0"
-
 source-map-resolve@^0.5.0:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
-  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
   dependencies:
     atob "^2.1.1"
     decode-uri-component "^0.2.0"
@@ -8996,76 +5063,38 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@0.5.9, source-map-support@^0.5.0, source-map-support@^0.5.3, source-map-support@^0.5.5, source-map-support@~0.5.6:
+source-map-support@0.5.9, source-map-support@^0.5.0, source-map-support@^0.5.3:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
-  integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map-support@~0.4.0:
-  version "0.4.18"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
-  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
-  dependencies:
-    source-map "^0.5.6"
-
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
-  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
-
-source-map@0.1.x:
-  version "0.1.43"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
-  integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
-  dependencies:
-    amdefine ">=0.0.4"
-
-source-map@0.5.6:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
-  integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
-
-source-map@0.7.3, source-map@^0.7.3:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
-
-source-map@^0.4.2, source-map@~0.4.1:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
-  dependencies:
-    amdefine ">=0.0.4"
 
-source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
+source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
+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"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 source-map@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
-  integrity sha1-2rc/vPwrqBm03gO9b26qSBZLP50=
   dependencies:
     amdefine ">=0.0.4"
 
 sourcemap-codec@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz#c8fd92d91889e902a07aee392bdd2c5863958ba2"
-  integrity sha512-hX1eNBNuilj8yfFnECh0DzLgwKpBLMIvmhgEhixXNui8lMLBInTI8Kyxt++RwJnMNu7cAUo635L2+N1TxMJCzA==
 
 spdx-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/spdx-compare/-/spdx-compare-1.0.0.tgz#2c55f117362078d7409e6d7b08ce70a857cd3ed7"
-  integrity sha512-C1mDZOX0hnu0ep9dfmuoi03+eOdDoz2yvK79RxbcrVEG1NO1Ph35yW102DHWKN4pk80nwCgeMmSY5L25VE4D9A==
   dependencies:
     array-find-index "^1.0.2"
     spdx-expression-parse "^3.0.0"
@@ -9074,7 +5103,6 @@ spdx-compare@^1.0.0:
 spdx-correct@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
-  integrity sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
@@ -9082,17 +5110,14 @@ spdx-correct@^3.0.0:
 spdx-exceptions@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-1.0.5.tgz#9d21ac4da4bdb71d060fb74e5a67531d032cbba6"
-  integrity sha1-nSGsTaS9tx0GD7dOWmdTHQMsu6Y=
 
 spdx-exceptions@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
-  integrity sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==
 
 spdx-expression-parse@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
-  integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
@@ -9100,22 +5125,18 @@ spdx-expression-parse@^3.0.0:
 spdx-license-ids@^1.0.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
-  integrity sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=
 
 spdx-license-ids@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz#e2a303236cac54b04031fa7a5a79c7e701df852f"
-  integrity sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w==
 
 spdx-ranges@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/spdx-ranges/-/spdx-ranges-2.0.0.tgz#257686798e5edb41d45c1aba3d3f1bb47af8d5ec"
-  integrity sha512-AUUXLfqkwD7GlzZkXv8ePPCpPjeVWI9xJCfysL8re/uKb6H10umMnC7bFRsHmLJan4fslUtekAgpHlSgLc/7mA==
 
 spdx-satisfies@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/spdx-satisfies/-/spdx-satisfies-4.0.0.tgz#ebc79eec88b68ac75618e2e5ee94fbc347587552"
-  integrity sha512-OcARj6U1OuVv98SVrRqgrR30sVocONtoPpnX8Xz4vXNrFVedqtbgkA+0KmQoXIQ2xjfltPPRVIMeNzKEFLWWKQ==
   dependencies:
     spdx-compare "^1.0.0"
     spdx-expression-parse "^3.0.0"
@@ -9124,78 +5145,35 @@ spdx-satisfies@^4.0.0:
 spdx@^0.5.1:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/spdx/-/spdx-0.5.2.tgz#76a428b9b97e7904ef83e62a4af0d06fdb50c265"
-  integrity sha512-WQbfCQT2uKLsDllnO9ItpcGUiiF1O/ZvBGCyqFZRg122HgiZubpwpZiM7BkmH19HC3XR3Z+DFMGJNzXSPebG8A==
   dependencies:
     spdx-exceptions "^1.0.0"
     spdx-license-ids "^1.0.0"
 
-spdy-transport@^2.0.18:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-2.1.0.tgz#4bbb15aaffed0beefdd56ad61dbdc8ba3e2cb7a1"
-  integrity sha512-bpUeGpZcmZ692rrTiqf9/2EUakI6/kXX1Rpe0ib/DyOzbiexVfXkw6GnvI9hVGvIwVaUhkaBojjCZwLNRGQg1g==
-  dependencies:
-    debug "^2.6.8"
-    detect-node "^2.0.3"
-    hpack.js "^2.1.6"
-    obuf "^1.1.1"
-    readable-stream "^2.2.9"
-    safe-buffer "^5.0.1"
-    wbuf "^1.7.2"
-
-spdy@^3.4.1:
-  version "3.4.7"
-  resolved "https://registry.yarnpkg.com/spdy/-/spdy-3.4.7.tgz#42ff41ece5cc0f99a3a6c28aabb73f5c3b03acbc"
-  integrity sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=
-  dependencies:
-    debug "^2.6.8"
-    handle-thing "^1.2.5"
-    http-deceiver "^1.2.7"
-    safe-buffer "^5.0.1"
-    select-hose "^2.0.0"
-    spdy-transport "^2.0.18"
-
-speed-measure-webpack-plugin@1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.2.3.tgz#de170b5cefbfa1c039d95e639edd3ad50cfc7c48"
-  integrity sha512-p+taQ69VkRUXYMoZOx2nxV/Tz8tt79ahctoZJyJDHWP7fEYvwFNf5Pd73k5kZ6auu0pTsPNLEUwWpM8mCk85Zw==
-  dependencies:
-    chalk "^2.0.1"
-
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
-  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
   dependencies:
     extend-shallow "^3.0.0"
 
 split2@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493"
-  integrity sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==
   dependencies:
     through2 "^2.0.2"
 
 split@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
-  integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==
   dependencies:
     through "2"
 
-sprintf-js@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.1.tgz#36be78320afe5801f6cea3ee78b6e5aab940ea0c"
-  integrity sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw=
-
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 sshpk@^1.7.0:
   version "1.14.2"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
-  integrity sha1-xvxhZIo9nE52T9P8306hBeSSupg=
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -9211,33 +5189,28 @@ sshpk@^1.7.0:
 ssri@^5.2.4:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
-  integrity sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==
   dependencies:
     safe-buffer "^5.1.1"
 
 ssri@^6.0.0, ssri@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
-  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
   dependencies:
     figgy-pudding "^3.5.1"
 
 stack-trace@0.0.x:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
-  integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
 
 static-eval@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.0.tgz#0e821f8926847def7b4b50cda5d55c04a9b13864"
-  integrity sha512-6flshd3F1Gwm+Ksxq463LtFd1liC77N/PX1FVVc3OzL3hAmo2fwHFbuArkcfi7s9rTNsLEhcRmXGFZhlgy40uw==
   dependencies:
     escodegen "^1.8.1"
 
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
-  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
   dependencies:
     define-property "^0.2.5"
     object-copy "^0.1.0"
@@ -9245,7 +5218,6 @@ static-extend@^0.1.1:
 static-module@^2.2.0:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/static-module/-/static-module-2.2.5.tgz#bd40abceae33da6b7afb84a0e4329ff8852bfbbf"
-  integrity sha512-D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ==
   dependencies:
     concat-stream "~1.6.0"
     convert-source-map "^1.5.1"
@@ -9262,78 +5234,34 @@ static-module@^2.2.0:
     static-eval "^2.0.0"
     through2 "~2.0.3"
 
-stats-webpack-plugin@0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/stats-webpack-plugin/-/stats-webpack-plugin-0.7.0.tgz#ccffe9b745de8bbb155571e063f8263fc0e2bc06"
-  integrity sha512-NT0YGhwuQ0EOX+uPhhUcI6/+1Sq/pMzNuSCBVT4GbFl/ac6I/JZefBcjlECNfAb1t3GOx5dEj1Z7x0cAxeeVLQ==
-  dependencies:
-    lodash "^4.17.4"
-
 "statuses@>= 1.4.0 < 2":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
 statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
-  integrity sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=
-
-statuses@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
-  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
-
-stdout-stream@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
-  integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==
-  dependencies:
-    readable-stream "^2.0.1"
-
-stream-browserify@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
-  integrity sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=
-  dependencies:
-    inherits "~2.0.1"
-    readable-stream "^2.0.2"
 
 stream-each@^1.1.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
-  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
   dependencies:
     end-of-stream "^1.1.0"
     stream-shift "^1.0.0"
 
-stream-http@^2.7.2:
-  version "2.8.3"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
-  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
-  dependencies:
-    builtin-status-codes "^3.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.3.6"
-    to-arraybuffer "^1.0.0"
-    xtend "^4.0.0"
-
 stream-json@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/stream-json/-/stream-json-0.5.2.tgz#f4256c0ef1a905f2ef2d473706b4b3ff827653cf"
-  integrity sha512-/QlOLybrc6LkH/oVgXo1lJ8oemRIze/grdpfssLn1Pm8nZVhW4VMOqDDYGaORPodQFxiDEUquQJER5LiBu8Ehg==
   dependencies:
     parser-toolkit ">=0.0.3"
 
 stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
-  integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
 
 streamroller@0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-0.7.0.tgz#a1d1b7cf83d39afb0d63049a5acbf93493bdf64b"
-  integrity sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==
   dependencies:
     date-format "^1.2.0"
     debug "^3.1.0"
@@ -9343,160 +5271,102 @@ streamroller@0.7.0:
 strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
 
 string-to-stream@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string-to-stream/-/string-to-stream-1.1.1.tgz#aba78f73e70661b130ee3e1c0192be4fef6cb599"
-  integrity sha512-QySF2+3Rwq0SdO3s7BAp4x+c3qsClpPQ6abAmb0DGViiSBAkT5kL6JT2iyzEVP+T1SmzHrQD1TwlP9QAHCc+Sw==
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.1.0"
 
-string-width@^1.0.1, string-width@^1.0.2:
+string-width@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
   dependencies:
     code-point-at "^1.0.0"
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
+"string-width@^1.0.2 || 2", string-width@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
   dependencies:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string_decoder@^1.0.0, string_decoder@~1.1.1:
+string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+
+string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
     safe-buffer "~5.1.0"
 
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
-
 stringstream@~0.0.4, stringstream@~0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
-  integrity sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
   dependencies:
     ansi-regex "^3.0.0"
 
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
   dependencies:
     is-utf8 "^0.2.0"
 
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
 strip-indent@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
-  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
   dependencies:
     get-stdin "^4.0.1"
 
 strip-indent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
-  integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=
 
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
-style-loader@0.23.1:
-  version "0.23.1"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz#cb9154606f3e771ab6c4ab637026a1049174d925"
-  integrity sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==
-  dependencies:
-    loader-utils "^1.1.0"
-    schema-utils "^1.0.0"
-
-stylus-loader@3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-3.0.2.tgz#27a706420b05a38e038e7cacb153578d450513c6"
-  integrity sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==
-  dependencies:
-    loader-utils "^1.0.2"
-    lodash.clonedeep "^4.5.0"
-    when "~3.6.x"
-
-stylus@0.54.5, stylus@^0.54.5:
-  version "0.54.5"
-  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
-  integrity sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=
-  dependencies:
-    css-parse "1.7.x"
-    debug "*"
-    glob "7.0.x"
-    mkdirp "0.5.x"
-    sax "0.5.x"
-    source-map "0.1.x"
 
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
 supports-color@^3.1.0:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
-  integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0:
+supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
-symbol-observable@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
-  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
-
-tapable@^1.0.0, tapable@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c"
-  integrity sha512-IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA==
-
 tar-stream@^1.5.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
-  integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
   dependencies:
     bl "^1.0.0"
     buffer-alloc "^1.2.0"
@@ -9506,19 +5376,9 @@ tar-stream@^1.5.0:
     to-buffer "^1.1.1"
     xtend "^4.0.0"
 
-tar@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-  integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
-  dependencies:
-    block-stream "*"
-    fstream "^1.0.2"
-    inherits "2"
-
 tar@^4, tar@^4.4.4, tar@^4.4.6:
   version "4.4.6"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
-  integrity sha512-tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg==
   dependencies:
     chownr "^1.0.1"
     fs-minipass "^1.2.5"
@@ -9531,146 +5391,68 @@ tar@^4, tar@^4.4.4, tar@^4.4.6:
 temp@^0.8.3:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59"
-  integrity sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=
   dependencies:
     os-tmpdir "^1.0.0"
     rimraf "~2.2.6"
 
-term-size@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
-  integrity sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=
-  dependencies:
-    execa "^0.7.0"
-
-terser-webpack-plugin@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.1.0.tgz#cf7c25a1eee25bf121f4a587bb9e004e3f80e528"
-  integrity sha512-61lV0DSxMAZ8AyZG7/A4a3UPlrbOBo8NIQ4tJzLPAdGOQ+yoNC7l5ijEow27lBAL2humer01KLS6bGIMYQxKoA==
-  dependencies:
-    cacache "^11.0.2"
-    find-cache-dir "^2.0.0"
-    schema-utils "^1.0.0"
-    serialize-javascript "^1.4.0"
-    source-map "^0.6.1"
-    terser "^3.8.1"
-    webpack-sources "^1.1.0"
-    worker-farm "^1.5.2"
-
-terser@^3.8.1:
-  version "3.10.8"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-3.10.8.tgz#2fe3967396a10cdc3d575074fe857efd30a2895a"
-  integrity sha512-GQJHWJ/vbx0EgRk+lBMONMmKaT+ifeo/XgT/hi3KpzEEFOERVyFuJSVXH8grcmJjiqKY35ds8rBCxvABUeyyuQ==
-  dependencies:
-    commander "~2.17.1"
-    source-map "~0.6.1"
-    source-map-support "~0.5.6"
-
 text-extensions@^1.0.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.8.0.tgz#6f343c62268843019b21a616a003557bdb952d2b"
-  integrity sha512-mVzjRxuWnDKs/qH1rbOJEVHLlSX9kty9lpi7lMvLgU9S74mQ8/Ozg9UPcKxShh0qG2NZ+NyPOPpcZU4C1Eld9A==
 
 text-hex@1.0.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5"
-  integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==
 
 through2@^2.0.0, through2@^2.0.2, through2@^2.0.3, through2@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-  integrity sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=
   dependencies:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
-through@2, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.6:
+through@2, "through@>=2.2.7 <3":
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
 thunkify@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/thunkify/-/thunkify-2.1.2.tgz#faa0e9d230c51acc95ca13a361ac05ca7e04553d"
-  integrity sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=
-
-thunky@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.3.tgz#f5df732453407b09191dae73e2a8cc73f381a826"
-  integrity sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==
 
-timed-out@^4.0.0, timed-out@^4.0.1:
+timed-out@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
-  integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
-
-timers-browserify@^2.0.4:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
-  integrity sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==
-  dependencies:
-    setimmediate "^1.0.4"
 
 timespan@2.3.x:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/timespan/-/timespan-2.3.0.tgz#4902ce040bd13d845c8f59b27e9d59bad6f39929"
-  integrity sha1-SQLOBAvRPYRcj1myfp1ZutbzmSk=
 
 tiny-inflate@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.2.tgz#93d9decffc8805bd57eae4310f0b745e9b6fb3a7"
-  integrity sha1-k9nez/yIBb1X6uQxDwt0Xptvs6c=
-
-tmp@0.0.30:
-  version "0.0.30"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.30.tgz#72419d4a8be7d6ce75148fd8b324e593a711c2ed"
-  integrity sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=
-  dependencies:
-    os-tmpdir "~1.0.1"
 
-tmp@0.0.33, tmp@0.0.x, tmp@^0.0.33:
+tmp@0.0.33, tmp@0.0.x:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
   dependencies:
     os-tmpdir "~1.0.2"
 
 to-array@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
-  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
-
-to-arraybuffer@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
-  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
 to-buffer@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
-  integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==
-
-to-fast-properties@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
-  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
-
-to-fast-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
   dependencies:
     kind-of "^3.0.2"
 
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
   dependencies:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
@@ -9678,7 +5460,6 @@ to-regex-range@^2.1.0:
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
-  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
   dependencies:
     define-property "^2.0.2"
     extend-shallow "^3.0.2"
@@ -9688,64 +5469,43 @@ to-regex@^3.0.1, to-regex@^3.0.2:
 tough-cookie@~2.3.0, tough-cookie@~2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
-  integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==
   dependencies:
     punycode "^1.4.1"
 
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
-  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
   dependencies:
     psl "^1.1.24"
     punycode "^1.4.1"
 
-tree-kill@1.2.0, tree-kill@^1.2.0:
+tree-kill@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36"
-  integrity sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==
 
 treeify@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/treeify/-/treeify-1.1.0.tgz#4e31c6a463accd0943879f30667c4fdaff411bb8"
-  integrity sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A==
 
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
-  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
 
 trim-newlines@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
-  integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=
 
 trim-off-newlines@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
-  integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM=
-
-trim-right@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
-  integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
 
 triple-beam@^1.2.0, triple-beam@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9"
-  integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==
-
-"true-case-path@^1.0.2":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
-  integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==
-  dependencies:
-    glob "^7.1.2"
 
 ts-node@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-5.0.1.tgz#78e5d1cb3f704de1b641e43b76be2d4094f06f81"
-  integrity sha512-XK7QmDcNHVmZkVtkiwNDWiERRHPyU8nBqZB1+iv2UhOG0q3RQ9HsZ2CMqISlFbxjrYFGfG2mX7bW4dAyxBVzUw==
   dependencies:
     arrify "^1.0.0"
     chalk "^2.3.0"
@@ -9759,43 +5519,29 @@ ts-node@^5.0.0:
 tsickle@0.28.0:
   version "0.28.0"
   resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.28.0.tgz#6cd6fa004766c6ad9261b599c83866ee97cc7875"
-  integrity sha512-cb/Z4NlKMPGiIIbgmklfBJIxDl4EQoYqC+0/BnPxZWzWcUvikeOHFkkkEmabJVqKh47jUqOwU/uMAu6UvhicZg==
   dependencies:
     minimist "^1.2.0"
     mkdirp "^0.5.1"
     source-map "^0.6.0"
     source-map-support "^0.5.0"
 
-tsickle@>=0.34.0:
-  version "0.34.0"
-  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.34.0.tgz#10187fa6401a288a65efb93a60bf28b2ff95f90b"
-  integrity sha512-O3wCPRtL18Hc/ZBnaiKwmmjVzeCWTOTpsi0btfC7FWL3RnXpxLPxD6hoJ0QEXuSfG/0QJk+MWNjqT9N6fOyyIg==
-  dependencies:
-    minimist "^1.2.0"
-    mkdirp "^0.5.1"
-    source-map "^0.7.3"
-
-tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
+tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
-  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
 tslint-no-circular-imports@^0.5.0:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/tslint-no-circular-imports/-/tslint-no-circular-imports-0.5.2.tgz#47ac9194ec531101ac19198d5144f7ac9f57d980"
-  integrity sha512-Uzu2NiVX7b/kAk9vPrLqUmoCkth0dXUUNOaqwfxpvYgsHfoH67cmj0IHOUMZ1bC0swksJjaTyq7acHe/gU8H4A==
 
 tslint-sonarts@^1.7.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/tslint-sonarts/-/tslint-sonarts-1.8.0.tgz#80f2e8addd418c3b8807fc0155dec33b5a81e8d1"
-  integrity sha512-tpijO5VR18e+Ny99uMNNov3Hw7diiYQ8KoJkezpHGw9hSFFrO5g2PhwdQQo7O9puhJKMIutLl9g+ICMgg+bh0w==
   dependencies:
     immutable "^3.8.2"
 
 tslint@^5.11.0:
   version "5.11.0"
   resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.11.0.tgz#98f30c02eae3cde7006201e4c33cb08b48581eed"
-  integrity sha1-mPMMAurjzecAYgHkwzywi0hYHu0=
   dependencies:
     babel-code-frame "^6.22.0"
     builtin-modules "^1.1.1"
@@ -9813,55 +5559,42 @@ tslint@^5.11.0:
 tsscmp@~1.0.0:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"
-  integrity sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==
 
 tsutils@2.27.2:
   version "2.27.2"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.27.2.tgz#60ba88a23d6f785ec4b89c6e8179cac9b431f1c7"
-  integrity sha512-qf6rmT84TFMuxAKez2pIfR8UCai49iQsfB7YWVjV1bKpy/d0PWT5rEOSM6La9PiHZ0k1RRZQiwVdVJfQ3BPHgg==
   dependencies:
     tslib "^1.8.1"
 
 tsutils@^2.27.2:
   version "2.29.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
-  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
   dependencies:
     tslib "^1.8.1"
 
-tty-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
-  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
-
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
   dependencies:
     safe-buffer "^5.0.1"
 
 tunnel-agent@~0.4.1:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
-  integrity sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=
 
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
   dependencies:
     prelude-ls "~1.1.2"
 
 type-is@~1.6.16:
   version "1.6.16"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
-  integrity sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==
   dependencies:
     media-typer "0.3.0"
     mime-types "~2.1.18"
@@ -9869,52 +5602,25 @@ type-is@~1.6.16:
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@3.1.6, typescript@~3.1.6:
+typescript@~3.1.6:
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68"
-  integrity sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==
-
-uglify-es@^3.3.4:
-  version "3.3.9"
-  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
-  integrity sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==
-  dependencies:
-    commander "~2.13.0"
-    source-map "~0.6.1"
 
-uglify-js@^3.0.7, uglify-js@^3.1.4:
+uglify-js@^3.1.4:
   version "3.4.9"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
-  integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==
   dependencies:
     commander "~2.17.1"
     source-map "~0.6.1"
 
-uglifyjs-webpack-plugin@^1.2.4:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz#75f548160858163a08643e086d5fefe18a5d67de"
-  integrity sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==
-  dependencies:
-    cacache "^10.0.4"
-    find-cache-dir "^1.0.0"
-    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"
-
 ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
-  integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
 
 underscore@~1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz#6bbaf0877500d36be34ecaa584e0db9fef035209"
-  integrity sha1-a7rwh3UA02vjTsqlhODbn+8DUgk=
 
 "unicode-properties@github:quicktype/unicode-properties#dist":
   version "1.1.0"
@@ -9926,7 +5632,6 @@ underscore@~1.7.0:
 unicode-trie@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/unicode-trie/-/unicode-trie-0.3.1.tgz#d671dddd89101a08bac37b6a5161010602052085"
-  integrity sha1-1nHd3YkQGgi6w3tqUWEBBgIFIIU=
   dependencies:
     pako "^0.2.5"
     tiny-inflate "^1.0.0"
@@ -9934,7 +5639,6 @@ unicode-trie@^0.3.0:
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
-  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
   dependencies:
     arr-union "^3.1.0"
     get-value "^2.0.6"
@@ -9944,129 +5648,61 @@ union-value@^1.0.0:
 unique-filename@^1.1.0, unique-filename@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
-  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
   dependencies:
     unique-slug "^2.0.0"
 
 unique-slug@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.1.tgz#5e9edc6d1ce8fb264db18a507ef9bd8544451ca6"
-  integrity sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==
   dependencies:
     imurmurhash "^0.1.4"
 
-unique-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
-  integrity sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=
-  dependencies:
-    crypto-random-string "^1.0.0"
-
-universalify@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
-  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
   dependencies:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-unzip-response@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
-  integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
-
 upath@^1.0.5:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
-  integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==
-
-update-notifier@^2.3.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6"
-  integrity sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==
-  dependencies:
-    boxen "^1.2.1"
-    chalk "^2.0.1"
-    configstore "^3.0.0"
-    import-lazy "^2.1.0"
-    is-ci "^1.0.10"
-    is-installed-globally "^0.1.0"
-    is-npm "^1.0.0"
-    latest-version "^3.0.0"
-    semver-diff "^2.0.0"
-    xdg-basedir "^3.0.0"
 
 uri-js@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
   dependencies:
     punycode "^2.1.0"
 
 urijs@^1.19.1:
   version "1.19.1"
   resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.1.tgz#5b0ff530c0cbde8386f6342235ba5ca6e995d25a"
-  integrity sha512-xVrGVi94ueCJNrBSTjWqjvtgvl3cyOTThp2zaMaFNGp3F542TR6sM3f2o8RqZl+AwteClSVmoCyt0ka4RjQOQg==
 
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
-
-url-parse-lax@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
-  integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=
-  dependencies:
-    prepend-http "^1.0.1"
 
 url-parse-lax@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
-  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
   dependencies:
     prepend-http "^2.0.0"
 
-url-parse@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.3.tgz#bfaee455c889023219d757e045fa6a684ec36c15"
-  integrity sha512-rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==
-  dependencies:
-    querystringify "^2.0.0"
-    requires-port "^1.0.0"
-
 url-to-options@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
-  integrity sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=
-
-url@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
-  dependencies:
-    punycode "1.3.2"
-    querystring "0.2.0"
 
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
-  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
 useragent@2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.2.1.tgz#cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"
-  integrity sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=
   dependencies:
     lru-cache "2.2.x"
     tmp "0.0.x"
@@ -10074,7 +5710,6 @@ useragent@2.2.1:
 useragent@^2.1.12:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz#217f943ad540cb2128658ab23fc960f6a88c9972"
-  integrity sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==
   dependencies:
     lru-cache "4.1.x"
     tmp "0.0.x"
@@ -10082,46 +5717,26 @@ useragent@^2.1.12:
 util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
 util-extend@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f"
-  integrity sha1-p8IW0mdUUWljeztu3GypEZ4v+T8=
-
-util@0.10.3:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
-  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
-  dependencies:
-    inherits "2.0.1"
-
-util@^0.10.3:
-  version "0.10.4"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
-  integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
-  dependencies:
-    inherits "2.0.3"
 
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2:
+uuid@^3.1.0, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
 uws@~9.14.0:
   version "9.14.0"
   resolved "https://registry.yarnpkg.com/uws/-/uws-9.14.0.tgz#fac8386befc33a7a3705cbd58dc47b430ca4dd95"
-  integrity sha512-HNMztPP5A1sKuVFmdZ6BPVpBQd5bUjNC8EFMFiICK+oho/OQsAJy5hnIx4btMHiOk8j04f/DbIlqnEZ9d72dqg==
 
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
-  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
@@ -10129,24 +5744,16 @@ validate-npm-package-license@^3.0.1:
 validate-npm-package-name@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
-  integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34=
   dependencies:
     builtins "^1.0.3"
 
 vargs@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/vargs/-/vargs-0.1.0.tgz#6b6184da6520cc3204ce1b407cac26d92609ebff"
-  integrity sha1-a2GE2mUgzDIEzhtAfKwm2SYJ6/8=
-
-vary@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
   dependencies:
     assert-plus "^1.0.0"
     core-util-is "1.0.2"
@@ -10155,40 +5762,14 @@ verror@1.10.0:
 vlq@^0.2.2:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
-  integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==
-
-vm-browserify@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
-  integrity sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=
-  dependencies:
-    indexof "0.0.1"
 
 void-elements@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
-  integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
-
-watchpack@^1.5.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
-  integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==
-  dependencies:
-    chokidar "^2.0.2"
-    graceful-fs "^4.1.2"
-    neo-async "^2.5.0"
-
-wbuf@^1.1.0, wbuf@^1.7.2:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
-  integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
-  dependencies:
-    minimalistic-assert "^1.0.0"
 
 wd@^1.4.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/wd/-/wd-1.11.0.tgz#b610deea7f79f5a520a573c09e047e42d31433f9"
-  integrity sha512-h2EBfJvmsWocIjOOg5BsHh9IJKrqZDG4Az4jEZhFugEH7sOPcX6feZQ30aFuktqDI0jquarZJmNpA6V0A0Q7Mg==
   dependencies:
     archiver "2.1.1"
     async "2.0.1"
@@ -10198,214 +5779,33 @@ wd@^1.4.0:
     request "2.85.0"
     vargs "0.1.0"
 
-webdriver-js-extender@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz#57d7a93c00db4cc8d556e4d3db4b5db0a80c3bb7"
-  integrity sha512-lcUKrjbBfCK6MNsh7xaY2UAUmZwe+/ib03AjVOpFobX4O7+83BUveSrLfU0Qsyb1DaKJdQRbuU+kM9aZ6QUhiQ==
-  dependencies:
-    "@types/selenium-webdriver" "^3.0.0"
-    selenium-webdriver "^3.0.1"
-
-webdriver-manager@^12.0.6:
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.0.tgz#f6601e52de5f0c97fc7024c889eeb2416f2f1d9d"
-  integrity sha512-oEc5fmkpz6Yh6udhwir5m0eN5mgRPq9P/NU5YWuT3Up5slt6Zz+znhLU7q4+8rwCZz/Qq3Fgpr/4oao7NPCm2A==
-  dependencies:
-    adm-zip "^0.4.9"
-    chalk "^1.1.1"
-    del "^2.2.0"
-    glob "^7.0.3"
-    ini "^1.3.4"
-    minimist "^1.2.0"
-    q "^1.4.1"
-    request "^2.87.0"
-    rimraf "^2.5.2"
-    semver "^5.3.0"
-    xml2js "^0.4.17"
-
-webpack-core@^0.6.8:
-  version "0.6.9"
-  resolved "https://registry.yarnpkg.com/webpack-core/-/webpack-core-0.6.9.tgz#fc571588c8558da77be9efb6debdc5a3b172bdc2"
-  integrity sha1-/FcViMhVjad76e+23r3Fo7FyvcI=
-  dependencies:
-    source-list-map "~0.1.7"
-    source-map "~0.4.1"
-
-webpack-dev-middleware@3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz#1132fecc9026fd90f0ecedac5cbff75d1fb45890"
-  integrity sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==
-  dependencies:
-    memory-fs "~0.4.1"
-    mime "^2.3.1"
-    range-parser "^1.0.3"
-    webpack-log "^2.0.0"
-
-webpack-dev-server@3.1.10, webpack-dev-server@^3.1.4:
-  version "3.1.10"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.10.tgz#507411bee727ee8d2fdffdc621b66a64ab3dea2b"
-  integrity sha512-RqOAVjfqZJtQcB0LmrzJ5y4Jp78lv9CK0MZ1YJDTaTmedMZ9PU9FLMQNrMCfVu8hHzaVLVOJKBlGEHMN10z+ww==
-  dependencies:
-    ansi-html "0.0.7"
-    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 "^2.0.0"
-    internal-ip "^3.0.1"
-    ip "^1.1.5"
-    killable "^1.0.0"
-    loglevel "^1.4.1"
-    opn "^5.1.0"
-    portfinder "^1.0.9"
-    schema-utils "^1.0.0"
-    selfsigned "^1.9.1"
-    serve-index "^1.7.2"
-    sockjs "0.3.19"
-    sockjs-client "1.3.0"
-    spdy "^3.4.1"
-    strip-ansi "^3.0.0"
-    supports-color "^5.1.0"
-    webpack-dev-middleware "3.4.0"
-    webpack-log "^2.0.0"
-    yargs "12.0.2"
-
-webpack-log@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
-  integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
-  dependencies:
-    ansi-colors "^3.0.0"
-    uuid "^3.3.2"
-
-webpack-merge@4.1.4:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.4.tgz#0fde38eabf2d5fd85251c24a5a8c48f8a3f4eb7b"
-  integrity sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==
-  dependencies:
-    lodash "^4.17.5"
-
-webpack-sources@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.2.0.tgz#18181e0d013fce096faf6f8e6d41eeffffdceac2"
-  integrity sha512-9BZwxR85dNsjWz3blyxdOhTgtnQvv3OEs5xofI0wPYTwu5kaWxS08UuD1oI7WLBLpRO+ylf0ofnXLXWmGb2WMw==
-  dependencies:
-    source-list-map "^2.0.0"
-    source-map "~0.6.1"
-
-webpack-sources@1.3.0, webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
-  integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==
-  dependencies:
-    source-list-map "^2.0.0"
-    source-map "~0.6.1"
-
-webpack-subresource-integrity@1.1.0-rc.6:
-  version "1.1.0-rc.6"
-  resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz#37f6f1264e1eb378e41465a98da80fad76ab8886"
-  integrity sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==
-  dependencies:
-    webpack-core "^0.6.8"
-
-webpack@4.23.1, webpack@^4.0.0, webpack@^4.6.0:
-  version "4.23.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.23.1.tgz#db7467b116771ae020c58bdfe2a0822785bb8239"
-  integrity sha512-iE5Cu4rGEDk7ONRjisTOjVHv3dDtcFfwitSxT7evtYj/rANJpt1OuC/Kozh1pBa99AUBr1L/LsaNB+D9Xz3CEg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.10"
-    "@webassemblyjs/helper-module-context" "1.7.10"
-    "@webassemblyjs/wasm-edit" "1.7.10"
-    "@webassemblyjs/wasm-parser" "1.7.10"
-    acorn "^5.6.2"
-    acorn-dynamic-import "^3.0.0"
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-    chrome-trace-event "^1.0.0"
-    enhanced-resolve "^4.1.0"
-    eslint-scope "^4.0.0"
-    json-parse-better-errors "^1.0.2"
-    loader-runner "^2.3.0"
-    loader-utils "^1.1.0"
-    memory-fs "~0.4.1"
-    micromatch "^3.1.8"
-    mkdirp "~0.5.0"
-    neo-async "^2.5.0"
-    node-libs-browser "^2.0.0"
-    schema-utils "^0.4.4"
-    tapable "^1.1.0"
-    uglifyjs-webpack-plugin "^1.2.4"
-    watchpack "^1.5.0"
-    webpack-sources "^1.3.0"
-
-websocket-driver@>=0.5.1:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
-  integrity sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=
-  dependencies:
-    http-parser-js ">=0.4.0"
-    websocket-extensions ">=0.1.1"
-
-websocket-extensions@>=0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
-  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
-
 when@^3.7.7:
   version "3.7.8"
   resolved "https://registry.yarnpkg.com/when/-/when-3.7.8.tgz#c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"
-  integrity sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I=
-
-when@~3.6.x:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e"
-  integrity sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=
-
-which-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
-  integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
 
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@1, which@^1.1.1, which@^1.2.1, which@^1.2.9, which@^1.3.1:
+which@^1.1.1, which@^1.2.1, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
 wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
   dependencies:
     string-width "^1.0.2 || 2"
 
-widest-line@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc"
-  integrity sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==
-  dependencies:
-    string-width "^2.1.1"
-
 window-size@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
-  integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=
 
 winston-transport@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.2.0.tgz#a20be89edf2ea2ca39ba25f3e50344d73e6520e5"
-  integrity sha512-0R1bvFqxSlK/ZKTH86nymOuKv/cT1PQBMuDdA7k7f0S9fM44dNH6bXnuxwXPrN8lefJgtZq08BKdyZ0DZIy/rg==
   dependencies:
     readable-stream "^2.3.6"
     triple-beam "^1.2.0"
@@ -10413,7 +5813,6 @@ winston-transport@^4.2.0:
 winston@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/winston/-/winston-3.1.0.tgz#80724376aef164e024f316100d5b178d78ac5331"
-  integrity sha512-FsQfEE+8YIEeuZEYhHDk5cILo1HOcWkGwvoidLrDgPog0r4bser1lEIOco2dN9zpDJ1M88hfDgZvxe5z4xNcwg==
   dependencies:
     async "^2.6.0"
     diagnostics "^1.1.1"
@@ -10428,29 +5827,18 @@ winston@^3.0.0:
 with-callback@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/with-callback/-/with-callback-1.0.2.tgz#a09629b9a920028d721404fb435bdcff5c91bc21"
-  integrity sha1-oJYpuakgAo1yFAT7Q1vc/1yRvCE=
 
 wordwrap@^1.0.0, wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
-
-worker-farm@^1.5.2:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
-  integrity sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==
-  dependencies:
-    errno "~0.1.7"
 
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
-  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -10458,139 +5846,52 @@ wrap-ansi@^2.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-write-file-atomic@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
-  integrity sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==
-  dependencies:
-    graceful-fs "^4.1.11"
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.2"
 
 ws@~3.3.1:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
-  integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==
   dependencies:
     async-limiter "~1.0.0"
     safe-buffer "~5.1.0"
     ultron "~1.1.0"
 
-xdg-basedir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
-  integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=
-
-xhr2@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.4.tgz#7f87658847716db5026323812f818cadab387a5f"
-  integrity sha1-f4dliEdxbbUCYyOBL4GMras4el8=
-
-xml2js@^0.4.17:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
-  integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==
-  dependencies:
-    sax ">=0.6.0"
-    xmlbuilder "~9.0.1"
-
-xmlbuilder@~9.0.1:
-  version "9.0.7"
-  resolved "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
-  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
-
 xmlhttprequest-ssl@~1.5.4:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
-  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
 
 xregexp@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
-  integrity sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=
-
-xregexp@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
-  integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
 
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
-
-xxhashjs@^0.2.1:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/xxhashjs/-/xxhashjs-0.2.2.tgz#8a6251567621a1c46a5ae204da0249c7f8caa9d8"
-  integrity sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==
-  dependencies:
-    cuint "^0.2.2"
 
 y18n@^3.2.0, y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
 
-"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
+y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
 yallist@^3.0.0, yallist@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
-  integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=
-
-yargs-parser@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
-  integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
-  dependencies:
-    camelcase "^4.1.0"
-
-yargs-parser@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
-  integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=
-  dependencies:
-    camelcase "^3.0.0"
 
 yargs-parser@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
-  integrity sha1-jQrELxbqVd69MyyvTEA4s+P139k=
   dependencies:
     camelcase "^4.1.0"
 
-yargs@12.0.2:
-  version "12.0.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
-  integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==
-  dependencies:
-    cliui "^4.0.0"
-    decamelize "^2.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.0.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^10.1.0"
-
 yargs@9.0.1:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
-  integrity sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=
   dependencies:
     camelcase "^4.1.0"
     cliui "^3.2.0"
@@ -10609,7 +5910,6 @@ yargs@9.0.1:
 yargs@^3.10.0:
   version "3.32.0"
   resolved "http://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995"
-  integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=
   dependencies:
     camelcase "^2.0.1"
     cliui "^3.0.3"
@@ -10619,51 +5919,23 @@ yargs@^3.10.0:
     window-size "^0.1.4"
     y18n "^3.2.0"
 
-yargs@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
-  integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=
-  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 "^5.0.0"
-
 yarn@^1.10.1:
   version "1.10.1"
   resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.10.1.tgz#b792ba28f050ae94cd7e719dbca80639d70da76f"
-  integrity sha512-EH0H1fyfFxkE4UpG4b+VCaVY4I488I2EyQNmGjGGKmvsSIb0G3b+1IcfGYPI2gqa1du43g4ZA3jH8fXlq6oVxg==
 
 yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
-  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
 
 yn@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
-  integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=
 
 zip-stream@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-1.2.0.tgz#a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"
-  integrity sha1-qLxF9MG0lpnGuQGYuqyqzbzUugQ=
   dependencies:
     archiver-utils "^1.3.0"
     compress-commons "^1.2.0"
     lodash "^4.8.0"
     readable-stream "^2.0.0"
-
-zone.js@^0.8.19:
-  version "0.8.26"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.26.tgz#7bdd72f7668c5a7ad6b118148b4ea39c59d08d2d"
-  integrity sha512-W9Nj+UmBJG251wkCacIkETgra4QgBo/vgoEkb4a2uoLzpQG7qF9nzwoLXWU5xj3Fg2mxGvEDh47mg24vXccYjA==

From d63ce36d7893c9b50c827b559e1807455b45a964 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Thu, 6 Dec 2018 14:04:30 -0800
Subject: [PATCH 0504/1703] build: Restore package.json prior to v7.2.0-beta.1
 release

I accidentally picked up local changes when pushing the release
---
 package.json |    1 -
 yarn.lock    | 5030 ++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 4879 insertions(+), 152 deletions(-)

diff --git a/package.json b/package.json
index 0e939f194c2c..27fa9ebcd2a7 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,6 @@
   "devDependencies": {
     "@angular/compiler": "^7.1.0",
     "@angular/compiler-cli": "^7.1.0",
-    "@bazel/bazel": "~0.19",
     "@bazel/karma": "^0.20.3",
     "@bazel/typescript": "0.20.3",
     "@ngtools/json-schema": "^1.1.0",
diff --git a/yarn.lock b/yarn.lock
index 1179326ea537..4b82b5ec463f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,9 +2,33 @@
 # yarn lockfile v1
 
 
+"@angular/animations@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.1.0.tgz#3f03175217a45b72e53310d9ab35e69802ad9555"
+  integrity sha512-1Sje3qptVsTxPP4LwcvVPQun4P156wsEEwwCXoCO3NuP+tS67syU8M69uIpyDbpnx2ZeuWpJ9HfvKe1ljeqcuw==
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/cdk@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.1.0.tgz#7e5c3e3631947ef91413a83997ec4edec92cdd1c"
+  integrity sha512-dY740pKcIRtKr6n6NomrgqfdEj988urTZ9I/bfJjxF5fdhnSjyhEvDlB55EHsrF+bTTZbZXRmv7AwOQ9GJnD9w==
+  dependencies:
+    tslib "^1.7.1"
+  optionalDependencies:
+    parse5 "^5.0.0"
+
+"@angular/common@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.1.0.tgz#89b0a34fd8f2a323704369551be4ac7491dda0b7"
+  integrity sha512-tu6Hv3/z3K2NLD4ndBioGtcykhbwhMJYUWb0NvaOLhaVYColWKPFpkflEorDWB+3/IWkpELGhA/HQ2zQh7EVyg==
+  dependencies:
+    tslib "^1.9.0"
+
 "@angular/compiler-cli@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.1.0.tgz#b02b2f94b9510caadc2b16bf1f97aa41d21a3ce2"
+  integrity sha512-Q42B3YmjMNYWTxTWfyDDFa6HSVqwY3rZO5Kp3Q/NKhQ6w/WddduxjARf/OCbtp0bVX3wZNObS6nO4H65rNCtsw==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^1.4.2"
@@ -21,32 +45,160 @@
 "@angular/compiler@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.1.0.tgz#3455eeb575d0b9b68a099b5781d3cce78468146a"
+  integrity sha512-1Hjx6e+lVXZyXFFe4OW34ZpiaGEYyB1MQ7k2C+cMm0ABMQS3LsWT4DYhY7bk0mmMuuXQj66C62MX76ladDtdIg==
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/core@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.1.0.tgz#a55fbbc28b2c9da767121f433733683780266eb3"
+  integrity sha512-7mMoWuf8jAf4hcjQ0Exz2w9Qx9SRwNuDdtEZFGWH9dZWz5uPCewrN+Kt9MigMfSYGEdLAPcRMIuvFHDCS8B3Hg==
   dependencies:
     tslib "^1.9.0"
 
-"@bazel/bazel-darwin_x64@0.19.1":
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.19.1.tgz#58d779c8938bd1c136cab55e2f6473121f83741b"
+"@angular/http@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.1.0.tgz#9243d6a0fae5b5fd12aa9408e3dbaffad54deb9b"
+  integrity sha512-Je3D374ccxTFGpFu9tXi6k95vTaG+3jYYtEQ7i43CHbaGyHR/KwMEr8DEzrABd1zCSxBX71WwHuReG2wBANfcA==
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/material@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/material/-/material-7.1.0.tgz#441f2d03a97a1fa35546b61dcde86db34f0f5efc"
+  integrity sha512-bgotNpSfGLjNZ1AcTyhs6XS7trF4I7UHwQmfa0l8y3Gf9plwErPDfQe2XqnayRyG9nTwHj9f1lQ45X5mr3/0/A==
+  dependencies:
+    tslib "^1.7.1"
 
-"@bazel/bazel-linux_x64@0.19.1":
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.19.1.tgz#aef363e0932d29d1bb48980da139d74bfb4b1ffb"
+"@angular/platform-browser-dynamic@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.1.0.tgz#c7d07f6b1c08fa12c54b4e310da930da613c7e6e"
+  integrity sha512-0yG6e/ZOI9LNUGgSjJ7xUWZhC41z87klO0oEHhEzQeaDxO/SOBasbMiws4ETuhulMgOR81UCAVobXMoOQJbfWg==
+  dependencies:
+    tslib "^1.9.0"
 
-"@bazel/bazel-win32_x64@0.19.1":
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.19.1.tgz#273c43b0febc11675614c402ec82ae44b519f9ee"
+"@angular/platform-browser@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.1.0.tgz#0d40fed536a08d66ea580f6c4d2976310d559111"
+  integrity sha512-kCrmaNZukWaXk6qlvzyE1Dln/YB2XOGbhb9e+y3NE94beCgDTWseKViMevIoGm/H+Lzf0I2RPg8GMKkQ7pQwNQ==
+  dependencies:
+    tslib "^1.9.0"
 
-"@bazel/bazel@~0.19":
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel/-/bazel-0.19.1.tgz#22ce225b5172a4ad2a94496be66b14b7c7facca2"
-  optionalDependencies:
-    "@bazel/bazel-darwin_x64" "0.19.1"
-    "@bazel/bazel-linux_x64" "0.19.1"
-    "@bazel/bazel-win32_x64" "0.19.1"
+"@angular/platform-server@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.1.0.tgz#d5bfd11981abe7a6cae8788d9c102806a2ae7a2c"
+  integrity sha512-aQk62TT40dS1DtOvmbgVzz2bxB9iDn231AzIfJnsWJCwFqYF6sqwJQTIrdEyHYdSQDl7V+i40nJH6lSYjd3tBA==
+  dependencies:
+    domino "^2.1.0"
+    tslib "^1.9.0"
+    xhr2 "^0.1.4"
+
+"@angular/router@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.1.0.tgz#19b66e127065dfc2106793e81d660790422e73b0"
+  integrity sha512-yrjNvCj7XbXmZSmQfXGEkWJ9ogRZmIk5GHyOfGKNNRXhQK2OBznY0Avyer2r3mcgV/RLrI1FYQyKN9mdLftf6g==
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/service-worker@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.1.0.tgz#35f287534febe40e71fc371d1893a5dffe8f5466"
+  integrity sha512-lmeJl8JDvmtDFM7h1gUs8vVsJhMuRKakBIwtQTWEX8TYRh/6fZCObHNjoGGps3BAPrgAbCyxJE2g3rhb/Y4YqA==
+  dependencies:
+    tslib "^1.9.0"
+
+"@babel/code-frame@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
+  integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
+  dependencies:
+    "@babel/highlight" "^7.0.0"
+
+"@babel/generator@^7.0.0", "@babel/generator@^7.1.3":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.1.3.tgz#2103ec9c42d9bdad9190a6ad5ff2d456fd7b8673"
+  integrity sha512-ZoCZGcfIJFJuZBqxcY9OjC1KW2lWK64qrX1o4UYL3yshVhwKFYgzpWZ0vvtGMNJdTlvkw0W+HR1VnYN8q3QPFQ==
+  dependencies:
+    "@babel/types" "^7.1.3"
+    jsesc "^2.5.1"
+    lodash "^4.17.10"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
+"@babel/helper-function-name@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
+  integrity sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.0.0"
+    "@babel/template" "^7.1.0"
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-get-function-arity@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
+  integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@babel/helper-split-export-declaration@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
+  integrity sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==
+  dependencies:
+    "@babel/types" "^7.0.0"
+
+"@babel/highlight@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
+  integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.2", "@babel/parser@^7.1.3":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.3.tgz#2c92469bac2b7fbff810b67fca07bd138b48af77"
+  integrity sha512-gqmspPZOMW3MIRb9HlrnbZHXI1/KHTOroBwN1NcLL6pWxzqzEKGvRTq0W/PxS45OtQGbaFikSQpkS5zbnsQm2w==
+
+"@babel/template@^7.0.0", "@babel/template@^7.1.0":
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.1.2.tgz#090484a574fef5a2d2d7726a674eceda5c5b5644"
+  integrity sha512-SY1MmplssORfFiLDcOETrW7fCLl+PavlwMh92rrGcikQaRq4iWPVH0MpwPpY3etVMx6RnDjXtr6VZYr/IbP/Ag==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/parser" "^7.1.2"
+    "@babel/types" "^7.1.2"
+
+"@babel/traverse@^7.0.0":
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.1.4.tgz#f4f83b93d649b4b2c91121a9087fa2fa949ec2b4"
+  integrity sha512-my9mdrAIGdDiSVBuMjpn/oXYpva0/EZwWL3sm3Wcy/AVWO2eXnsoZruOT9jOGNRXU8KbCIu5zsKnXcAJ6PcV6Q==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/generator" "^7.1.3"
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/helper-split-export-declaration" "^7.0.0"
+    "@babel/parser" "^7.1.3"
+    "@babel/types" "^7.1.3"
+    debug "^3.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.10"
+
+"@babel/types@^7.0.0", "@babel/types@^7.1.2", "@babel/types@^7.1.3":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.1.3.tgz#3a767004567060c2f40fca49a304712c525ee37d"
+  integrity sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.17.10"
+    to-fast-properties "^2.0.0"
 
 "@bazel/karma@^0.20.3":
   version "0.20.3"
   resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.20.3.tgz#a63bb82b4887ae8c0d01f3028c6fa4764470851d"
+  integrity sha512-IgWfTpK9XLEI977DS2kHIEO1QfFTEOBxeNDDjHtd1onmzyMCLROphTOBZ/g42ybUIWyJhS9DK4U3bLSMQE0Bng==
   dependencies:
     jasmine-core "2.8.0"
     karma alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a
@@ -62,6 +214,7 @@
 "@bazel/typescript@0.20.3":
   version "0.20.3"
   resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.20.3.tgz#51dcc369c2af0d7f2311d6e692d07776492060f4"
+  integrity sha512-BZmfzaNkgS++53CGEUk5p9FXOG+k8FNWCDbxzYljoIGP60aIkw4UgRQ24ReBwhCMg6M6KW609yje7AvDZkA6bg==
   dependencies:
     protobufjs "5.0.3"
     source-map-support "0.5.9"
@@ -71,14 +224,17 @@
 "@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"
+  integrity sha1-w6DFRNYjkqzCgTpCyKDcb1j4aSI=
 
 "@sindresorhus/is@^0.7.0":
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
+  integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
 
 "@types/body-parser@*":
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.0.tgz#9f5c9d9bd04bb54be32d5eb9fc0d8c974e6cf58c"
+  integrity sha512-a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w==
   dependencies:
     "@types/connect" "*"
     "@types/node" "*"
@@ -86,27 +242,37 @@
 "@types/caseless@*":
   version "0.12.1"
   resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.1.tgz#9794c69c8385d0192acc471a540d1f8e0d16218a"
+  integrity sha512-FhlMa34NHp9K5MY1Uz8yb+ZvuX0pnvn3jScRSNAb75KHGB8d3rEU6hqMs3Z2vjuytcMfRg6c5CHMc3wtYyD2/A==
 
 "@types/connect@*":
   version "3.4.32"
   resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.32.tgz#aa0e9616b9435ccad02bc52b5b454ffc2c70ba28"
+  integrity sha512-4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==
   dependencies:
     "@types/node" "*"
 
 "@types/copy-webpack-plugin@^4.4.1":
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/@types/copy-webpack-plugin/-/copy-webpack-plugin-4.4.2.tgz#6dfac0dc8692378f76a20c6c1bbe01eec438f316"
+  integrity sha512-/L0m5kc7pKGpsu97TTgAP6YcVRmau2Wj0HpRPQBGEbZXT1DZkdozZPCZHGDWXpxcvWDFTxob2JmYJj3RC7CwFA==
   dependencies:
     "@types/minimatch" "*"
     "@types/webpack" "*"
 
+"@types/estree@0.0.39":
+  version "0.0.39"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
+  integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
+
 "@types/events@*":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
+  integrity sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==
 
 "@types/express-serve-static-core@*":
   version "4.16.0"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.16.0.tgz#fdfe777594ddc1fe8eb8eccce52e261b496e43e7"
+  integrity sha512-lTeoCu5NxJU4OD9moCgm0ESZzweAx0YqsAcab6OB0EB3+As1OaHtKnaGJvcngQxYsi9UNv0abn4/DRavrRxt4w==
   dependencies:
     "@types/events" "*"
     "@types/node" "*"
@@ -115,6 +281,7 @@
 "@types/express@*", "@types/express@^4.16.0":
   version "4.16.0"
   resolved "https://registry.yarnpkg.com/@types/express/-/express-4.16.0.tgz#6d8bc42ccaa6f35cf29a2b7c3333cb47b5a32a19"
+  integrity sha512-TtPEYumsmSTtTetAPXlJVf3kEqb6wZK0bZojpJQrnD/djV4q1oB6QQ8aKvKqwNPACoe02GNiy5zDzcYivR5Z2w==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "*"
@@ -123,12 +290,14 @@
 "@types/form-data@*":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@types/form-data/-/form-data-2.2.1.tgz#ee2b3b8eaa11c0938289953606b745b738c54b1e"
+  integrity sha512-JAMFhOaHIciYVh8fb5/83nmuO/AHwmto+Hq7a9y8FzLDcC1KCU344XDOMEmahnrTFlHjgh4L0WJFczNIX2GxnQ==
   dependencies:
     "@types/node" "*"
 
 "@types/glob@^5.0.35":
   version "5.0.35"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.35.tgz#1ae151c802cece940443b5ac246925c85189f32a"
+  integrity sha512-wc+VveszMLyMWFvXLkloixT4n0harUIVZjnpzztaZ0nKLuul7Z32iMt2fUFGAaZ4y1XWjFRMtCI5ewvyh4aIeg==
   dependencies:
     "@types/events" "*"
     "@types/minimatch" "*"
@@ -137,6 +306,7 @@
 "@types/http-proxy-middleware@*":
   version "0.17.5"
   resolved "https://registry.yarnpkg.com/@types/http-proxy-middleware/-/http-proxy-middleware-0.17.5.tgz#efdeb4be652744422d57929f3c4ea31a2e627a45"
+  integrity sha512-mUqVzfaiOknDT2QJ7g8f2c37G4ZDqDNt08QdUkFCu19Ey5+2SZ0rWHMG00GRJ7g+SgHvl/9weZYuWLXr7RgiCg==
   dependencies:
     "@types/connect" "*"
     "@types/http-proxy" "*"
@@ -146,6 +316,7 @@
 "@types/http-proxy@*":
   version "1.16.2"
   resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.16.2.tgz#16cb373b52fff2aa2f389d23d940ed4a642349e5"
+  integrity sha512-GgqePmC3rlsn1nv+kx5OviPuUBU2omhnlXOaJSXFgOdsTcScNFap+OaCb2ip9Bm4m5L8EOehgT5d9M4uNB90zg==
   dependencies:
     "@types/events" "*"
     "@types/node" "*"
@@ -153,6 +324,7 @@
 "@types/inquirer@^0.0.42":
   version "0.0.42"
   resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-0.0.42.tgz#2310fd8623053bead72247adae416aa32bacdf0c"
+  integrity sha512-flMaNWU2g9NrtZ4bIV+7SEY2W7OdWNNhmJ0rE1lWVxGrkp3TfFGMcFCxRIBmGWigI8e6n+2HqLjizTTfgcpHLg==
   dependencies:
     "@types/rx" "*"
     "@types/through" "*"
@@ -160,14 +332,17 @@
 "@types/istanbul@^0.4.30":
   version "0.4.30"
   resolved "https://registry.yarnpkg.com/@types/istanbul/-/istanbul-0.4.30.tgz#073159320ab3296b2cfeb481f756a1f8f4c9c8e4"
+  integrity sha512-+hQU4fh2G96ze78uI5/V6+SRDZD1UnVrFn23i2eDetwfbBq3s0/zYP92xj/3qyvVMM3WnvS88N56zjz+HmL04A==
 
 "@types/jasmine@^2.8.8":
   version "2.8.8"
   resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.8.tgz#bf53a7d193ea8b03867a38bfdb4fbb0e0bf066c9"
+  integrity sha512-OJSUxLaxXsjjhob2DBzqzgrkLmukM3+JMpRp0r0E4HTdT1nwDCWhaswjYxazPij6uOdzHCJfNbDjmQ1/rnNbCg==
 
 "@types/loader-utils@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@types/loader-utils/-/loader-utils-1.1.3.tgz#82b9163f2ead596c68a8c03e450fbd6e089df401"
+  integrity sha512-euKGFr2oCB3ASBwG39CYJMR3N9T0nanVqXdiH7Zu/Nqddt6SmFRxytq/i2w9LQYNQekEtGBz+pE3qG6fQTNvRg==
   dependencies:
     "@types/node" "*"
     "@types/webpack" "*"
@@ -175,30 +350,47 @@
 "@types/mime@*":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.0.tgz#5a7306e367c539b9f6543499de8dd519fac37a8b"
+  integrity sha512-A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA==
 
 "@types/minimatch@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
 "@types/minimist@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6"
+  integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
 
 "@types/node@*":
   version "10.9.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897"
+  integrity sha512-fCHV45gS+m3hH17zgkgADUSi2RR1Vht6wOZ0jyHP8rjiQra9f+mIcgwPQHllmDocYOstIEbKlxbFDYlgrTPYqw==
 
 "@types/node@8.10.10":
   version "8.10.10"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.10.tgz#fec07bc2ad549d9e6d2f7aa0fb0be3491b83163a"
+  integrity sha512-p3W/hFzQs76RlYRIZsZc5a9bht6m0TspmWYYbKhRswmLnwj9fsE40EbuGifeu/XWR/c0UJQ1DDbvTxIsm/OOAA==
+
+"@types/node@^6.0.46":
+  version "6.14.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.0.tgz#85c6998293fc6f2945915419296c7fbb63384f66"
+  integrity sha512-6tQyh4Q4B5pECcXBOQDZ5KjyBIxRZGzrweGPM47sAYTdVG4+7R+2EGMTmp0h6ZwgqHrFRCeg2gdhsG9xXEl2Sg==
+
+"@types/q@^0.0.32":
+  version "0.0.32"
+  resolved "http://registry.npmjs.org/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
+  integrity sha1-vShOV8hPEyXacCur/IKlMoGQwMU=
 
 "@types/range-parser@*":
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.2.tgz#fa8e1ad1d474688a757140c91de6dace6f4abc8d"
+  integrity sha512-HtKGu+qG1NPvYe1z7ezLsyIaXYyi8SoAVqWDZgDQ8dLrsZvSzUNCwZyfX33uhWxL/SU0ZDQZ3nwZ0nimt507Kw==
 
 "@types/request@^2.47.1":
   version "2.47.1"
   resolved "https://registry.yarnpkg.com/@types/request/-/request-2.47.1.tgz#25410d3afbdac04c91a94ad9efc9824100735824"
+  integrity sha512-TV3XLvDjQbIeVxJ1Z3oCTDk/KuYwwcNKVwz2YaT0F5u86Prgc4syDAp6P96rkTQQ4bIdh+VswQIC9zS6NjY7/g==
   dependencies:
     "@types/caseless" "*"
     "@types/form-data" "*"
@@ -208,70 +400,82 @@
 "@types/rx-core-binding@*":
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/@types/rx-core-binding/-/rx-core-binding-4.0.4.tgz#d969d32f15a62b89e2862c17b3ee78fe329818d3"
+  integrity sha512-5pkfxnC4w810LqBPUwP5bg7SFR/USwhMSaAeZQQbEHeBp57pjKXRlXmqpMrLJB4y1oglR/c2502853uN0I+DAQ==
   dependencies:
     "@types/rx-core" "*"
 
 "@types/rx-core@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-core/-/rx-core-4.0.3.tgz#0b3354b1238cedbe2b74f6326f139dbc7a591d60"
+  integrity sha1-CzNUsSOM7b4rdPYybxOdvHpZHWA=
 
 "@types/rx-lite-aggregates@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-aggregates/-/rx-lite-aggregates-4.0.3.tgz#6efb2b7f3d5f07183a1cb2bd4b1371d7073384c2"
+  integrity sha512-MAGDAHy8cRatm94FDduhJF+iNS5//jrZ/PIfm+QYw9OCeDgbymFHChM8YVIvN2zArwsRftKgE33QfRWvQk4DPg==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-async@*":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-async/-/rx-lite-async-4.0.2.tgz#27fbf0caeff029f41e2d2aae638b05e91ceb600c"
+  integrity sha512-vTEv5o8l6702ZwfAM5aOeVDfUwBSDOs+ARoGmWAKQ6LOInQ8J4/zjM7ov12fuTpktUKdMQjkeCp07Vd73mPkxw==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-backpressure@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-backpressure/-/rx-lite-backpressure-4.0.3.tgz#05abb19bdf87cc740196c355e5d0b37bb50b5d56"
+  integrity sha512-Y6aIeQCtNban5XSAF4B8dffhIKu6aAy/TXFlScHzSxh6ivfQBQw6UjxyEJxIOt3IT49YkS+siuayM2H/Q0cmgA==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-coincidence@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-coincidence/-/rx-lite-coincidence-4.0.3.tgz#80bd69acc4054a15cdc1638e2dc8843498cd85c0"
+  integrity sha512-1VNJqzE9gALUyMGypDXZZXzR0Tt7LC9DdAZQ3Ou/Q0MubNU35agVUNXKGHKpNTba+fr8GdIdkC26bRDqtCQBeQ==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-experimental@*":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-experimental/-/rx-lite-experimental-4.0.1.tgz#c532f5cbdf3f2c15da16ded8930d1b2984023cbd"
+  integrity sha1-xTL1y98/LBXaFt7Ykw0bKYQCPL0=
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-joinpatterns@*":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-joinpatterns/-/rx-lite-joinpatterns-4.0.1.tgz#f70fe370518a8432f29158cc92ffb56b4e4afc3e"
+  integrity sha1-9w/jcFGKhDLykVjMkv+1a05K/D4=
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-testing@*":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-testing/-/rx-lite-testing-4.0.1.tgz#21b19d11f4dfd6ffef5a9d1648e9c8879bfe21e9"
+  integrity sha1-IbGdEfTf1v/vWp0WSOnIh5v+Iek=
   dependencies:
     "@types/rx-lite-virtualtime" "*"
 
 "@types/rx-lite-time@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-time/-/rx-lite-time-4.0.3.tgz#0eda65474570237598f3448b845d2696f2dbb1c4"
+  integrity sha512-ukO5sPKDRwCGWRZRqPlaAU0SKVxmWwSjiOrLhoQDoWxZWg6vyB9XLEZViKOzIO6LnTIQBlk4UylYV0rnhJLxQw==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite-virtualtime@*":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rx-lite-virtualtime/-/rx-lite-virtualtime-4.0.3.tgz#4b30cacd0fe2e53af29f04f7438584c7d3959537"
+  integrity sha512-3uC6sGmjpOKatZSVHI2xB1+dedgml669ZRvqxy+WqmGJDVusOdyxcKfyzjW0P3/GrCiN4nmRkLVMhPwHCc5QLg==
   dependencies:
     "@types/rx-lite" "*"
 
 "@types/rx-lite@*":
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/@types/rx-lite/-/rx-lite-4.0.5.tgz#b3581525dff69423798daa9a0d33c1e66a5e8c4c"
+  integrity sha512-KZk5XTR1dm/kNgBx8iVpjno6fRYtAUQWBOmj+O8j724+nk097sz4fOoHJNpCkOJUtHUurZlJC7QvSFCZHbkC+w==
   dependencies:
     "@types/rx-core" "*"
     "@types/rx-core-binding" "*"
@@ -279,6 +483,7 @@
 "@types/rx@*":
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/@types/rx/-/rx-4.1.1.tgz#598fc94a56baed975f194574e0f572fd8e627a48"
+  integrity sha1-WY/JSla67ZdfGUV04PVy/Y5iekg=
   dependencies:
     "@types/rx-core" "*"
     "@types/rx-core-binding" "*"
@@ -293,13 +498,20 @@
     "@types/rx-lite-time" "*"
     "@types/rx-lite-virtualtime" "*"
 
+"@types/selenium-webdriver@^3.0.0":
+  version "3.0.12"
+  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.12.tgz#6affe5aed1ba379175075a889adbe2bc3aa62159"
+  integrity sha512-hYn+eoOehVUIdMwp5h34ZsGAO1ydja10GDup4BwyoFCdcH5MQ35nQq+AInSaBMEMopD5hEooFCyKo2Pajbe1ag==
+
 "@types/semver@^5.5.0":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
+  integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==
 
 "@types/serve-static@*":
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.2.tgz#f5ac4d7a6420a99a6a45af4719f4dcd8cd907a48"
+  integrity sha512-/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q==
   dependencies:
     "@types/express-serve-static-core" "*"
     "@types/mime" "*"
@@ -307,28 +519,34 @@
 "@types/source-list-map@*":
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
+  integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
 "@types/source-map@0.5.2":
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/@types/source-map/-/source-map-0.5.2.tgz#973459e744cc7445c85b97f770275b479b138e08"
+  integrity sha512-++w4WmMbk3dS3UeHGzAG+xJOSz5Xqtjys/TBkqG3qp3SeWE7Wwezqe5eB7B51cxUyh4PW7bwVotpsLdBK0D8cw==
 
 "@types/tapable@*":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.4.tgz#b4ffc7dc97b498c969b360a41eee247f82616370"
+  integrity sha512-78AdXtlhpCHT0K3EytMpn4JNxaf5tbqbLcbIRoQIHzpTIyjpxLQKRoxU55ujBXAtg3Nl2h/XWvfDa9dsMOd0pQ==
 
 "@types/through@*":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/through/-/through-0.0.29.tgz#72943aac922e179339c651fa34a4428a4d722f93"
+  integrity sha512-9a7C5VHh+1BKblaYiq+7Tfc+EOmjMdZaD1MYtkQjSoxgB69tBjW98ry6SKsi4zEIWztLOMRuL87A3bdT/Fc/4w==
   dependencies:
     "@types/node" "*"
 
 "@types/tough-cookie@*":
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-2.3.3.tgz#7f226d67d654ec9070e755f46daebf014628e9d9"
+  integrity sha512-MDQLxNFRLasqS4UlkWMSACMKeSm1x4Q3TxzUC7KQUsh6RK1ZrQ0VEyE3yzXcBu+K8ejVj4wuX32eUG02yNp+YQ==
 
 "@types/uglify-js@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.0.3.tgz#801a5ca1dc642861f47c46d14b700ed2d610840b"
+  integrity sha512-MAT0BW2ruO0LhQKjvlipLGCF/Yx0y/cj+tT67tK3QIQDrM2+9R78HgJ54VlrE8AbfjYJJBCQCEPM5ZblPVTuww==
   dependencies:
     source-map "^0.6.1"
 
@@ -339,6 +557,7 @@
 "@types/webpack-dev-server@^3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-3.1.0.tgz#1fae06ad346d2dd09bc5e34745723946458eed58"
+  integrity sha512-nutifgcFiPP3I/+mPWlZCsQNKpWNUGm6qjAMfleZuPfPfybXWymHvlcYsKvg+NPedSkrNh0vu2xKAlak/l+pOg==
   dependencies:
     "@types/express" "*"
     "@types/http-proxy-middleware" "*"
@@ -348,6 +567,7 @@
 "@types/webpack-sources@^0.1.5":
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-0.1.5.tgz#be47c10f783d3d6efe1471ff7f042611bd464a92"
+  integrity sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==
   dependencies:
     "@types/node" "*"
     "@types/source-list-map" "*"
@@ -356,19 +576,175 @@
 "@types/webpack@*", "@types/webpack@^4.4.11":
   version "4.4.11"
   resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.4.11.tgz#0ca832870d55c4e92498c01d22d00d02b0f62ae9"
+  integrity sha512-NdESmbpvVEtJgs15kyZYKr5ouLYPMYt9DNG5JEgCekbG/ezFLPCzf4XcAv8caOb+b7x6ieAuSt0eoR0UkSI7RA==
   dependencies:
     "@types/node" "*"
     "@types/tapable" "*"
     "@types/uglify-js" "*"
     source-map "^0.6.0"
 
+"@webassemblyjs/ast@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.10.tgz#0cfc61d61286240b72fc522cb755613699eea40a"
+  integrity sha512-wTUeaByYN2EA6qVqhbgavtGc7fLTOx0glG2IBsFlrFG51uXIGlYBTyIZMf4SPLo3v1bgV/7lBN3l7Z0R6Hswew==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.7.10"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
+    "@webassemblyjs/wast-parser" "1.7.10"
+
+"@webassemblyjs/floating-point-hex-parser@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.10.tgz#ee63d729c6311a85863e369a473f9983f984e4d9"
+  integrity sha512-gMsGbI6I3p/P1xL2UxqhNh1ga2HCsx5VBB2i5VvJFAaqAjd2PBTRULc3BpTydabUQEGlaZCzEUQhLoLG7TvEYQ==
+
+"@webassemblyjs/helper-api-error@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.10.tgz#bfcb3bbe59775357475790a2ad7b289f09b2f198"
+  integrity sha512-DoYRlPWtuw3yd5BOr9XhtrmB6X1enYF0/54yNvQWGXZEPDF5PJVNI7zQ7gkcKfTESzp8bIBWailaFXEK/jjCsw==
+
+"@webassemblyjs/helper-buffer@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.10.tgz#0a8c624c67ad0b214d2e003859921a1988cb151b"
+  integrity sha512-+RMU3dt/dPh4EpVX4u5jxsOlw22tp3zjqE0m3ftU2tsYxnPULb4cyHlgaNd2KoWuwasCQqn8Mhr+TTdbtj3LlA==
+
+"@webassemblyjs/helper-code-frame@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.10.tgz#0ab7e22fad0241a173178c73976fc0edf50832ce"
+  integrity sha512-UiytbpKAULOEab2hUZK2ywXen4gWJVrgxtwY3Kn+eZaaSWaRM8z/7dAXRSoamhKFiBh1uaqxzE/XD9BLlug3gw==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.7.10"
+
+"@webassemblyjs/helper-fsm@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.10.tgz#0915e7713fbbb735620a9d3e4fa3d7951f97ac64"
+  integrity sha512-w2vDtUK9xeSRtt5+RnnlRCI7wHEvLjF0XdnxJpgx+LJOvklTZPqWkuy/NhwHSLP19sm9H8dWxKeReMR7sCkGZA==
+
+"@webassemblyjs/helper-module-context@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.10.tgz#9beb83f72740f5ac8075313b5cac5e796510f755"
+  integrity sha512-yE5x/LzZ3XdPdREmJijxzfrf+BDRewvO0zl8kvORgSWmxpRrkqY39KZSq6TSgIWBxkK4SrzlS3BsMCv2s1FpsQ==
+
+"@webassemblyjs/helper-wasm-bytecode@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.10.tgz#797b1e734bbcfdea8399669cdc58308ef1c7ffc0"
+  integrity sha512-u5qy4SJ/OrxKxZqJ9N3qH4ZQgHaAzsopsYwLvoWJY6Q33r8PhT3VPyNMaJ7ZFoqzBnZlCcS/0f4Sp8WBxylXfg==
+
+"@webassemblyjs/helper-wasm-section@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.10.tgz#c0ea3703c615d7bc3e3507c3b7991c8767b2f20e"
+  integrity sha512-Ecvww6sCkcjatcyctUrn22neSJHLN/TTzolMGG/N7S9rpbsTZ8c6Bl98GpSpV77EvzNijiNRHBG0+JO99qKz6g==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.10"
+    "@webassemblyjs/helper-buffer" "1.7.10"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
+    "@webassemblyjs/wasm-gen" "1.7.10"
+
+"@webassemblyjs/ieee754@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.10.tgz#62c1728b7ef0f66ef8221e2966a0afd75db430df"
+  integrity sha512-HRcWcY+YWt4+s/CvQn+vnSPfRaD4KkuzQFt5MNaELXXHSjelHlSEA8ZcqT69q0GTIuLWZ6JaoKar4yWHVpZHsQ==
+  dependencies:
+    "@xtuc/ieee754" "^1.2.0"
+
+"@webassemblyjs/leb128@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.10.tgz#167e0bb4b06d7701585772a73fba9f4df85439f6"
+  integrity sha512-og8MciYlA8hvzCLR71hCuZKPbVBfLQeHv7ImKZ4nlyxrYbG7uJHYtHiHu6OV9SqrGuD03H/HtXC4Bgdjfm9FHw==
+  dependencies:
+    "@xtuc/long" "4.2.1"
+
+"@webassemblyjs/utf8@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.10.tgz#b6728f5b6f50364abc155be029f9670e6685605a"
+  integrity sha512-Ng6Pxv6siyZp635xCSnH3mKmIFgqWPCcGdoo0GBYgyGdxu7cUj4agV7Uu1a8REP66UYUFXJLudeGgd4RvuJAnQ==
+
+"@webassemblyjs/wasm-edit@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.10.tgz#83fe3140f5a58f5a30b914702be9f0e59a399092"
+  integrity sha512-e9RZFQlb+ZuYcKRcW9yl+mqX/Ycj9+3/+ppDI8nEE/NCY6FoK8f3dKBcfubYV/HZn44b+ND4hjh+4BYBt+sDnA==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.10"
+    "@webassemblyjs/helper-buffer" "1.7.10"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
+    "@webassemblyjs/helper-wasm-section" "1.7.10"
+    "@webassemblyjs/wasm-gen" "1.7.10"
+    "@webassemblyjs/wasm-opt" "1.7.10"
+    "@webassemblyjs/wasm-parser" "1.7.10"
+    "@webassemblyjs/wast-printer" "1.7.10"
+
+"@webassemblyjs/wasm-gen@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.10.tgz#4de003806ae29c97ab3707782469b53299570174"
+  integrity sha512-M0lb6cO2Y0PzDye/L39PqwV+jvO+2YxEG5ax+7dgq7EwXdAlpOMx1jxyXJTScQoeTpzOPIb+fLgX/IkLF8h2yw==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.10"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
+    "@webassemblyjs/ieee754" "1.7.10"
+    "@webassemblyjs/leb128" "1.7.10"
+    "@webassemblyjs/utf8" "1.7.10"
+
+"@webassemblyjs/wasm-opt@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.10.tgz#d151e31611934a556c82789fdeec41a814993c2a"
+  integrity sha512-R66IHGCdicgF5ZliN10yn5HaC7vwYAqrSVJGjtJJQp5+QNPBye6heWdVH/at40uh0uoaDN/UVUfXK0gvuUqtVg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.10"
+    "@webassemblyjs/helper-buffer" "1.7.10"
+    "@webassemblyjs/wasm-gen" "1.7.10"
+    "@webassemblyjs/wasm-parser" "1.7.10"
+
+"@webassemblyjs/wasm-parser@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.10.tgz#0367be7bf8f09e3e6abc95f8e483b9206487ec65"
+  integrity sha512-AEv8mkXVK63n/iDR3T693EzoGPnNAwKwT3iHmKJNBrrALAhhEjuPzo/lTE4U7LquEwyvg5nneSNdTdgrBaGJcA==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.10"
+    "@webassemblyjs/helper-api-error" "1.7.10"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
+    "@webassemblyjs/ieee754" "1.7.10"
+    "@webassemblyjs/leb128" "1.7.10"
+    "@webassemblyjs/utf8" "1.7.10"
+
+"@webassemblyjs/wast-parser@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.10.tgz#058f598b52f730b23fc874d4775b6286b6247264"
+  integrity sha512-YTPEtOBljkCL0VjDp4sHe22dAYSm3ZwdJ9+2NTGdtC7ayNvuip1wAhaAS8Zt9Q6SW9E5Jf5PX7YE3XWlrzR9cw==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.10"
+    "@webassemblyjs/floating-point-hex-parser" "1.7.10"
+    "@webassemblyjs/helper-api-error" "1.7.10"
+    "@webassemblyjs/helper-code-frame" "1.7.10"
+    "@webassemblyjs/helper-fsm" "1.7.10"
+    "@xtuc/long" "4.2.1"
+
+"@webassemblyjs/wast-printer@1.7.10":
+  version "1.7.10"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.10.tgz#d817909d2450ae96c66b7607624d98a33b84223b"
+  integrity sha512-mJ3QKWtCchL1vhU/kZlJnLPuQZnlDOdZsyP0bbLWPGdYsQDnSBvyTLhzwBA3QAMlzEL9V4JHygEmK6/OTEyytA==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.10"
+    "@webassemblyjs/wast-parser" "1.7.10"
+    "@xtuc/long" "4.2.1"
+
+"@xtuc/ieee754@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
+
+"@xtuc/long@4.2.1":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
+  integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
+
 "@yarnpkg/lockfile@1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
+  integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
 
 JSONStream@^1.0.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.4.tgz#615bb2adb0cd34c8f4c447b5f6512fa1d8f16a2e"
+  integrity sha512-Y7vfi3I5oMOYIr+WxV8NZxDSwcbNgzdKYsTNInmycOq9bUYwGg9ryu57Wg5NLmCjqdFPNUmpMBo3kSJN9tCbXg==
   dependencies:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
@@ -376,6 +752,7 @@ JSONStream@^1.0.4:
 JSONStream@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
+  integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
   dependencies:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
@@ -383,71 +760,111 @@ JSONStream@^1.3.4:
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
 abbrev@1.0.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
+  integrity sha1-kbR5JYinc4wl813W9jdSovh3YTU=
 
-accepts@~1.3.4:
+accepts@~1.3.4, accepts@~1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
+  integrity sha1-63d99gEXI6OxTopywIBcjoZ0a9I=
   dependencies:
     mime-types "~2.1.18"
     negotiator "0.6.1"
 
-acorn@^5.0.0:
+acorn-dynamic-import@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
+  integrity sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==
+  dependencies:
+    acorn "^5.0.0"
+
+acorn@^5.0.0, acorn@^5.6.2:
   version "5.7.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
+  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
 addressparser@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/addressparser/-/addressparser-1.0.1.tgz#47afbe1a2a9262191db6838e4fd1d39b40821746"
+  integrity sha1-R6++GiqSYhkdtoOOT9HTm0CCF0Y=
 
-adm-zip@~0.4.3:
+adm-zip@^0.4.9, adm-zip@~0.4.3:
   version "0.4.11"
   resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.11.tgz#2aa54c84c4b01a9d0fb89bb11982a51f13e3d62a"
+  integrity sha512-L8vcjDTCOIJk7wFvmlEUN7AsSb8T+2JrdP7KINBjzr24TJ5Mwj590sLu3BC7zNZowvJWa/JtPmD8eJCzdtDWjA==
 
 after@0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
+  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
 
 agent-base@4, agent-base@^4.1.0, agent-base@^4.2.0, agent-base@~4.2.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
+  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
   dependencies:
     es6-promisify "^5.0.0"
 
 agentkeepalive@^3.4.1:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67"
+  integrity sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==
   dependencies:
     humanize-ms "^1.2.1"
 
+ajv-errors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.0.tgz#ecf021fa108fd17dfb5e6b383f2dd233e31ffc59"
+  integrity sha1-7PAh+hCP0X37Xms4Py3SM+Mf/Fk=
+
+ajv-keywords@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
+  integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
+
 ajv@6.5.3:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9"
+  integrity sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^5.1.0, ajv@^5.3.0:
+ajv@^5.0.0, ajv@^5.1.0, ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
   dependencies:
     co "^4.6.0"
     fast-deep-equal "^1.0.0"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
+ajv@^6.1.0:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.4.tgz#247d5274110db653706b550fcc2b797ca28cfc59"
+  integrity sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
 amqplib@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/amqplib/-/amqplib-0.5.2.tgz#d2d7313c7ffaa4d10bcf1e6252de4591b6cc7b63"
+  integrity sha512-l9mCs6LbydtHqRniRwYkKdqxVa6XMz3Vw1fh+2gJaaVgTM6Jk3o8RccAKWKtlhT1US5sWrFh+KKxsVUALURSIA==
   dependencies:
     bitsyntax "~0.0.4"
     bluebird "^3.4.6"
@@ -455,27 +872,54 @@ amqplib@^0.5.2:
     readable-stream "1.x >=1.1.9"
     safe-buffer "^5.0.1"
 
+ansi-align@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f"
+  integrity sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=
+  dependencies:
+    string-width "^2.0.0"
+
+ansi-colors@^3.0.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.1.tgz#9638047e4213f3428a11944a7d4b31cba0a3ff95"
+  integrity sha512-Xt+zb6nqgvV9SWAVp0EG3lRsHcbq5DDgqjPPz6pwgtj6RKz65zGXMNa82oJfOSBA/to6GmRP7Dr+6o+kbApTzQ==
+
+ansi-escapes@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
+  integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==
+
+ansi-html@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
+  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
+
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
 ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
 
 ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
 
 anymatch@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
+  integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==
   dependencies:
     micromatch "^2.1.5"
     normalize-path "^2.0.0"
@@ -483,17 +927,32 @@ anymatch@^1.3.0:
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
   dependencies:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
+app-root-path@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.1.0.tgz#98bf6599327ecea199309866e8140368fd2e646a"
+  integrity sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo=
+
+append-transform@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz#046a52ae582a228bd72f58acfbe2967c678759ab"
+  integrity sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==
+  dependencies:
+    default-require-extensions "^2.0.0"
+
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
 archiver-utils@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-1.3.0.tgz#e50b4c09c70bf3d680e32ff1b7994e9f9d895174"
+  integrity sha1-5QtMCccL89aA4y/xt5lOn52JUXQ=
   dependencies:
     glob "^7.0.0"
     graceful-fs "^4.1.0"
@@ -505,6 +964,7 @@ archiver-utils@^1.3.0:
 archiver@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/archiver/-/archiver-2.1.1.tgz#ff662b4a78201494a3ee544d3a33fe7496509ebc"
+  integrity sha1-/2YrSnggFJSj7lRNOjP+dJZQnrw=
   dependencies:
     archiver-utils "^1.3.0"
     async "^2.0.0"
@@ -518,6 +978,7 @@ archiver@2.1.1:
 are-we-there-yet@~1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
@@ -525,169 +986,331 @@ are-we-there-yet@~1.1.2:
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
 arr-diff@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
   dependencies:
     arr-flatten "^1.0.1"
 
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
 arr-flatten@^1.0.1, arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
 arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
 array-find-index@^1.0.1, array-find-index@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
+
+array-flatten@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
+
+array-flatten@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296"
+  integrity sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=
 
 array-ify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
+  integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=
 
 array-slice@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
+  integrity sha1-3Tz7gO15c6dRF82sabC5nshhhvU=
+
+array-union@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
+  dependencies:
+    array-uniq "^1.0.1"
+
+array-uniq@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
 array-unique@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
 
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
 arraybuffer.slice@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
+  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
 
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
-asap@^2.0.0:
+asap@^2.0.0, asap@~2.0.3:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
 ascli@~1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ascli/-/ascli-1.0.1.tgz#bcfa5974a62f18e81cabaeb49732ab4a88f906bc"
+  integrity sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=
   dependencies:
     colour "~0.7.1"
     optjs "~3.2.2"
 
+asn1.js@^4.0.0:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
+  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
+  dependencies:
+    bn.js "^4.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
 asn1@~0.2.3:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
   dependencies:
     safer-buffer "~2.1.0"
 
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
 assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
+  integrity sha1-104bh+ev/A24qttwIfP+SBAasjQ=
+
+assert@^1.1.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+  integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=
+  dependencies:
+    util "0.10.3"
 
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
 ast-types@0.x.x:
   version "0.11.6"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.6.tgz#4e2266c2658829aef3b40cc33ad599c4e9eb89ef"
+  integrity sha512-nHiuV14upVGl7MWwFUYbzJ6YlfwWS084CU9EA8HajfYQjMSli5TQi3UTRygGF58LFWVkXxS1rbgRhROEqlQkXg==
 
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
+  integrity sha1-GdOGodntxufByF04iu28xW0zYC0=
+
+async-foreach@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
+  integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
 
 async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
+  integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
 
-async@1.x:
+async@1.x, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
 async@2.0.1:
   version "2.0.1"
   resolved "http://registry.npmjs.org/async/-/async-2.0.1.tgz#b709cc0280a9c36f09f4536be823c838a9049e25"
+  integrity sha1-twnMAoCpw28J9FNr6CPIOKkEniU=
   dependencies:
     lodash "^4.8.0"
 
-async@^2.0.0, async@^2.1.2, async@^2.5.0, async@^2.6.0, async@~2.6.0:
+async@^2.0.0, async@^2.1.2, async@^2.5.0, async@^2.6.0, async@^2.6.1, async@~2.6.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
+  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
   dependencies:
     lodash "^4.17.10"
 
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
 atob@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+
+autoprefixer@9.3.1, autoprefixer@^9.0.0:
+  version "9.3.1"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.3.1.tgz#71b622174de2b783d5fd99f9ad617b7a3c78443e"
+  integrity sha512-DY9gOh8z3tnCbJ13JIWaeQsoYncTGdsrgCceBaQSIL4nvdrLxgbRSBPevg2XbX7u4QCSfLheSJEEIUUSlkbx6Q==
+  dependencies:
+    browserslist "^4.3.3"
+    caniuse-lite "^1.0.30000898"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^7.0.5"
+    postcss-value-parser "^3.3.1"
 
 aws-sign2@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+  integrity sha1-FDQt0428yU0OW4fXY81jYSwOeU8=
 
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.2.1, aws4@^1.6.0, aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
+  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
 axios@^0.15.3:
   version "0.15.3"
   resolved "http://registry.npmjs.org/axios/-/axios-0.15.3.tgz#2c9d638b2e191a08ea1d6cc988eadd6ba5bdc053"
+  integrity sha1-LJ1jiy4ZGgjqHWzJiOrda6W9wFM=
   dependencies:
     follow-redirects "1.0.0"
 
-babel-code-frame@^6.22.0:
+babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
   dependencies:
     chalk "^1.1.3"
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
+babel-generator@^6.18.0:
+  version "6.26.1"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
+  integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==
+  dependencies:
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    detect-indent "^4.0.0"
+    jsesc "^1.3.0"
+    lodash "^4.17.4"
+    source-map "^0.5.7"
+    trim-right "^1.0.1"
+
+babel-messages@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-runtime@^6.22.0, babel-runtime@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
+
+babel-template@^6.16.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+  integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    lodash "^4.17.4"
+
+babel-traverse@^6.18.0, babel-traverse@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+  integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    debug "^2.6.8"
+    globals "^9.18.0"
+    invariant "^2.2.2"
+    lodash "^4.17.4"
+
+babel-types@^6.18.0, babel-types@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
+  dependencies:
+    babel-runtime "^6.26.0"
+    esutils "^2.0.2"
+    lodash "^4.17.4"
+    to-fast-properties "^1.0.3"
+
+babylon@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
+
 backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
+  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
 
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
 base64-arraybuffer@0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
+  integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
 
 base64-js@^1.0.2:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
+  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
 
 base64id@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
+  integrity sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=
 
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
   dependencies:
     cache-base "^1.0.1"
     class-utils "^0.3.5"
@@ -697,31 +1320,46 @@ base@^0.11.1:
     mixin-deep "^1.2.0"
     pascalcase "^0.1.1"
 
+batch@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
+  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
+
 bcrypt-pbkdf@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
   dependencies:
     tweetnacl "^0.14.3"
 
 better-assert@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
+  integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=
   dependencies:
     callsite "1.0.0"
 
+big.js@^3.1.3:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
+  integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
+
 binary-extensions@^1.0.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
+  integrity sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=
 
 bitsyntax@~0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/bitsyntax/-/bitsyntax-0.0.4.tgz#eb10cc6f82b8c490e3e85698f07e83d46e0cba82"
+  integrity sha1-6xDMb4K4xJDj6FaY8H6D1G4MuoI=
   dependencies:
     buffer-more-ints "0.0.2"
 
 bl@^1.0.0:
   version "1.2.2"
   resolved "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
+  integrity sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==
   dependencies:
     readable-stream "^2.3.5"
     safe-buffer "^5.1.1"
@@ -729,20 +1367,43 @@ bl@^1.0.0:
 bl@~1.1.2:
   version "1.1.2"
   resolved "http://registry.npmjs.org/bl/-/bl-1.1.2.tgz#fdca871a99713aa00d19e3bbba41c44787a65398"
+  integrity sha1-/cqHGplxOqANGeO7ukHER4emU5g=
   dependencies:
     readable-stream "~2.0.5"
 
 blob@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
+  integrity sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=
+
+block-stream@*:
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
+  dependencies:
+    inherits "~2.0.0"
+
+blocking-proxy@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/blocking-proxy/-/blocking-proxy-1.0.1.tgz#81d6fd1fe13a4c0d6957df7f91b75e98dac40cb2"
+  integrity sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==
+  dependencies:
+    minimist "^1.2.0"
 
 bluebird@^3.3.0, bluebird@^3.4.6, bluebird@^3.5.1, bluebird@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a"
+  integrity sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==
 
-body-parser@^1.16.1:
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
+  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
+
+body-parser@1.18.3, body-parser@^1.16.1:
   version "1.18.3"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
+  integrity sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=
   dependencies:
     bytes "3.0.0"
     content-type "~1.0.4"
@@ -755,27 +1416,61 @@ body-parser@^1.16.1:
     raw-body "2.3.3"
     type-is "~1.6.16"
 
+bonjour@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
+  integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU=
+  dependencies:
+    array-flatten "^2.1.0"
+    deep-equal "^1.0.1"
+    dns-equal "^1.0.0"
+    dns-txt "^2.0.2"
+    multicast-dns "^6.0.1"
+    multicast-dns-service-types "^1.1.0"
+
 boom@2.x.x:
   version "2.10.1"
   resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
+  integrity sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=
   dependencies:
     hoek "2.x.x"
 
 boom@4.x.x:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
+  integrity sha1-T4owBctKfjiJ90kDD9JbluAdLjE=
   dependencies:
     hoek "4.x.x"
 
 boom@5.x.x:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
+  integrity sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==
   dependencies:
     hoek "4.x.x"
 
+bootstrap@^4.0.0:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.3.tgz#0eb371af2c8448e8c210411d0cb824a6409a12be"
+  integrity sha512-rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w==
+
+boxen@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
+  integrity sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==
+  dependencies:
+    ansi-align "^2.0.0"
+    camelcase "^4.0.0"
+    chalk "^2.0.1"
+    cli-boxes "^1.0.0"
+    string-width "^2.0.0"
+    term-size "^1.2.0"
+    widest-line "^2.0.0"
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -783,12 +1478,14 @@ brace-expansion@^1.1.7:
 braces@^0.1.2:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/braces/-/braces-0.1.5.tgz#c085711085291d8b75fdd74eab0f8597280711e6"
+  integrity sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=
   dependencies:
     expand-range "^0.1.0"
 
 braces@^1.8.2:
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
   dependencies:
     expand-range "^1.8.1"
     preserve "^0.2.0"
@@ -797,6 +1494,7 @@ braces@^1.8.2:
 braces@^2.3.0, braces@^2.3.1:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
   dependencies:
     arr-flatten "^1.1.0"
     array-unique "^0.3.2"
@@ -812,19 +1510,102 @@ braces@^2.3.0, braces@^2.3.1:
 brfs@^1.4.0:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.6.1.tgz#b78ce2336d818e25eea04a0947cba6d4fb8849c3"
+  integrity sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==
   dependencies:
     quote-stream "^1.0.1"
     resolve "^1.1.5"
     static-module "^2.2.0"
     through2 "^2.0.0"
 
+brorand@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
+
+browserify-aes@^1.0.0, browserify-aes@^1.0.4:
+  version "1.2.0"
+  resolved "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
+  dependencies:
+    buffer-xor "^1.0.3"
+    cipher-base "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.3"
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+browserify-cipher@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
+  dependencies:
+    browserify-aes "^1.0.4"
+    browserify-des "^1.0.0"
+    evp_bytestokey "^1.0.0"
+
+browserify-des@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
+  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
+  dependencies:
+    cipher-base "^1.0.1"
+    des.js "^1.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+browserify-rsa@^4.0.0:
+  version "4.0.1"
+  resolved "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
+  dependencies:
+    bn.js "^4.1.0"
+    randombytes "^2.0.1"
+
+browserify-sign@^4.0.0:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
+  integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
+  dependencies:
+    bn.js "^4.1.1"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.2"
+    elliptic "^6.0.0"
+    inherits "^2.0.1"
+    parse-asn1 "^5.0.0"
+
+browserify-zlib@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
+  dependencies:
+    pako "~1.0.5"
+
+browserslist@^4.0.0, browserslist@^4.3.3:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.4.tgz#4477b737db6a1b07077275b24791e680d4300425"
+  integrity sha512-u5iz+ijIMUlmV8blX82VGFrB9ecnUg5qEt55CMZ/YJEhha+d8qpBfOFuutJ6F/VKRXjZoD33b6uvarpPxcl3RA==
+  dependencies:
+    caniuse-lite "^1.0.30000899"
+    electron-to-chromium "^1.3.82"
+    node-releases "^1.0.1"
+
+browserstack@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.5.1.tgz#e2dfa66ffee940ebad0a07f7e00fd4687c455d66"
+  integrity sha512-O8VMT64P9NOLhuIoD4YngyxBURefaSdR4QdhG8l6HZ9VxtU7jc3m6jLufFwKA5gaf7fetfB2TnRJnMxyob+heg==
+  dependencies:
+    https-proxy-agent "^2.2.1"
+
 buffer-alloc-unsafe@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
+  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
 
 buffer-alloc@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
+  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
   dependencies:
     buffer-alloc-unsafe "^1.1.0"
     buffer-fill "^1.0.0"
@@ -832,26 +1613,51 @@ buffer-alloc@^1.2.0:
 buffer-crc32@^0.2.1:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
+  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
 
 buffer-equal@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"
+  integrity sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=
 
 buffer-fill@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
 
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+
+buffer-indexof@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
+  integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
 
 buffer-more-ints@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/buffer-more-ints/-/buffer-more-ints-0.0.2.tgz#26b3885d10fa13db7fc01aae3aab870199e0124c"
+  integrity sha1-JrOIXRD6E9t/wBquOquHAZngEkw=
+
+buffer-xor@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
+
+buffer@^4.3.0:
+  version "4.9.1"
+  resolved "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+    isarray "^1.0.0"
 
 buffer@^5.1.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.2.1.tgz#dd57fa0f109ac59c602479044dca7b8b3d0b71d6"
+  integrity sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
@@ -859,6 +1665,7 @@ buffer@^5.1.0:
 buildmail@4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/buildmail/-/buildmail-4.0.1.tgz#877f7738b78729871c9a105e3b837d2be11a7a72"
+  integrity sha1-h393OLeHKYccmhBeO4N9K+EaenI=
   dependencies:
     addressparser "1.0.1"
     libbase64 "0.1.0"
@@ -871,24 +1678,58 @@ buildmail@4.0.1:
 builtin-modules@^1.0.0, builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
+
+builtin-modules@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-2.0.0.tgz#60b7ef5ae6546bd7deefa74b08b62a43a232648e"
+  integrity sha512-3U5kUA5VPsRUA3nofm/BXX7GVHKfxz0hOBAPxXrIvHzlDRkQVqEn6yi8QJegxl4LzOHLdvb7XF5dVawa/VVYBg==
+
+builtin-status-codes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
 builtins@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
+  integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
 
 bytebuffer@~5:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd"
+  integrity sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=
   dependencies:
     long "~3"
 
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
-cacache@^11.0.1, cacache@^11.2.0:
+cacache@^10.0.4:
+  version "10.0.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
+  integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==
+  dependencies:
+    bluebird "^3.5.1"
+    chownr "^1.0.1"
+    glob "^7.1.2"
+    graceful-fs "^4.1.11"
+    lru-cache "^4.1.1"
+    mississippi "^2.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.2"
+    ssri "^5.2.4"
+    unique-filename "^1.1.0"
+    y18n "^4.0.0"
+
+cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0:
   version "11.2.0"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.2.0.tgz#617bdc0b02844af56310e411c0878941d5739965"
+  integrity sha512-IFWl6lfK6wSeYCHUXh+N1lY72UDrpyrYQJNIVQf48paDuWbv5RbAtJYf/4gUQFObTCHZwdZ5sI8Iw7nqwP6nlQ==
   dependencies:
     bluebird "^3.5.1"
     chownr "^1.0.1"
@@ -908,6 +1749,7 @@ cacache@^11.0.1, cacache@^11.2.0:
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
   dependencies:
     collection-visit "^1.0.0"
     component-emitter "^1.2.1"
@@ -922,6 +1764,7 @@ cache-base@^1.0.1:
 cacheable-request@^2.1.1:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d"
+  integrity sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=
   dependencies:
     clone-response "1.0.2"
     get-stream "3.0.0"
@@ -934,10 +1777,12 @@ cacheable-request@^2.1.1:
 callsite@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
+  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
 
 camelcase-keys@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
   dependencies:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
@@ -945,6 +1790,7 @@ camelcase-keys@^2.0.0:
 camelcase-keys@^4.0.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
+  integrity sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=
   dependencies:
     camelcase "^4.1.0"
     map-obj "^2.0.0"
@@ -953,26 +1799,47 @@ camelcase-keys@^4.0.0:
 camelcase@^2.0.0, camelcase@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
+
+camelcase@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
 
-camelcase@^4.1.0:
+camelcase@^4.0.0, camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
+
+caniuse-lite@^1.0.30000898, caniuse-lite@^1.0.30000899:
+  version "1.0.30000903"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000903.tgz#86d46227759279b3db345ddbe778335dbba9e858"
+  integrity sha512-T1XVJEpGCoaq7MDw7/6hCdYUukmSaS+1l/OQJkLtw7Cr2+/+d67tNGKEbyiqf7Ck8x6EhNFUxjYFXXka0N/w5g==
 
 canonical-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
+  integrity sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==
+
+capture-stack-trace@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
+  integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==
 
 caseless@~0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
+  integrity sha1-cVuW6phBWTzDMGeSP17GDr2k99c=
 
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
 chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
   dependencies:
     ansi-styles "^2.2.1"
     escape-string-regexp "^1.0.2"
@@ -980,32 +1847,24 @@ chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.3.0, chalk@^2.4.1:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
+  integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
   dependencies:
     ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chokidar@^1.4.1, chokidar@^1.4.2:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
-  dependencies:
-    anymatch "^1.3.0"
-    async-each "^1.0.0"
-    glob-parent "^2.0.0"
-    inherits "^2.0.1"
-    is-binary-path "^1.0.0"
-    is-glob "^2.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-  optionalDependencies:
-    fsevents "^1.0.0"
+chardet@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-chokidar@^2.0.3:
+chokidar@2.0.4, chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
+  integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.0"
@@ -1022,60 +1881,167 @@ chokidar@^2.0.3:
   optionalDependencies:
     fsevents "^1.2.2"
 
+chokidar@^1.4.1, chokidar@^1.4.2:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
+  integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=
+  dependencies:
+    anymatch "^1.3.0"
+    async-each "^1.0.0"
+    glob-parent "^2.0.0"
+    inherits "^2.0.1"
+    is-binary-path "^1.0.0"
+    is-glob "^2.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.0.0"
+  optionalDependencies:
+    fsevents "^1.0.0"
+
 chownr@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
+  integrity sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=
+
+chrome-trace-event@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"
+  integrity sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==
+  dependencies:
+    tslib "^1.9.0"
 
 ci-info@^1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.5.1.tgz#17e8eb5de6f8b2b6038f0cbb714d410bfa9f3030"
+  integrity sha512-fKFIKXaYiL1exImwJ0AhR/6jxFPSKQBk2ayV5NiNoruUs2+rxC2kNw0EG+1Z9dugZRdCrppskQ8DN2cyaUM1Hw==
+
+cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+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"
+  integrity sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==
 
 circular-json@^0.5.4:
   version "0.5.8"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.8.tgz#40d2ff3aadee99871ebd19b41af3c9f113490003"
+  integrity sha512-VjaKMyZuVkL40usJkknJnmqQKpn2PkKS4M3/xdTRtZ0VsWl2Wbc2xdvXFXmEdmN6CKGqkm8XGyLHuFECZYEugw==
 
 circular-json@^0.5.5:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.9.tgz#932763ae88f4f7dead7a0d09c8a51a4743a53b1d"
+  integrity sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==
 
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
   dependencies:
     arr-union "^3.1.0"
     define-property "^0.2.5"
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
+clean-css@4.2.1, clean-css@^4.1.11:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
+  integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==
+  dependencies:
+    source-map "~0.6.0"
+
+cli-boxes@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
+  integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM=
+
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
+  dependencies:
+    restore-cursor "^2.0.0"
+
+cli-width@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
+  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
+
 cliui@^3.0.3, cliui@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
     wrap-ansi "^2.0.0"
 
+cliui@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
+  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
+  dependencies:
+    string-width "^2.1.1"
+    strip-ansi "^4.0.0"
+    wrap-ansi "^2.0.0"
+
+clone-deep@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
+  integrity sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==
+  dependencies:
+    for-own "^1.0.0"
+    is-plain-object "^2.0.4"
+    kind-of "^6.0.0"
+    shallow-clone "^1.0.0"
+
 clone-response@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
+  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
   dependencies:
     mimic-response "^1.0.0"
 
+clone@^2.1.1, clone@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
+
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
+
+codelyzer@^4.2.1:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-4.5.0.tgz#a65ddeeeca2894653253a89bfa229118ff9f59b1"
+  integrity sha512-oO6vCkjqsVrEsmh58oNlnJkRXuA30hF8cdNAQV9DytEalDwyOFRvHMnlKFzmOStNerOmPGZU9GAHnBo4tGvtiQ==
+  dependencies:
+    app-root-path "^2.1.0"
+    css-selector-tokenizer "^0.7.0"
+    cssauron "^1.4.0"
+    semver-dsl "^1.0.1"
+    source-map "^0.5.7"
+    sprintf-js "^1.1.1"
 
 collection-utils@0.0.15:
   version "0.0.15"
   resolved "https://registry.yarnpkg.com/collection-utils/-/collection-utils-0.0.15.tgz#70f4c54299621699b3f38c66577c9d4284825125"
+  integrity sha512-eLGXa67rSilE5dNCcx2wenWcmmgl4QdlwUj1Z5idKkIBOhZh6PghEZFC3wP3AHH8xnMbIDsky0pR/+1epJBymQ==
 
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
   dependencies:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
@@ -1083,16 +2049,19 @@ collection-visit@^1.0.0:
 color-convert@^1.9.0, color-convert@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
     color-name "1.1.3"
 
 color-name@1.1.3, color-name@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
 color-string@^1.5.2:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc"
+  integrity sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==
   dependencies:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
@@ -1100,6 +2069,7 @@ color-string@^1.5.2:
 color@3.0.x:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/color/-/color-3.0.0.tgz#d920b4328d534a3ac8295d68f7bd4ba6c427be9a"
+  integrity sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==
   dependencies:
     color-convert "^1.9.1"
     color-string "^1.5.2"
@@ -1107,18 +2077,22 @@ color@3.0.x:
 colornames@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz#f8889030685c7c4ff9e2a559f5077eb76a816f96"
+  integrity sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=
 
 colors@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+  integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
 
 colors@^1.1.0, colors@^1.2.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.2.tgz#2df8ff573dfbf255af562f8ce7181d6b971a359b"
+  integrity sha512-rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ==
 
 colorspace@1.1.x:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.1.tgz#9ac2491e1bc6f8fb690e2176814f8d091636d972"
+  integrity sha512-pI3btWyiuz7Ken0BWh9Elzsmv2bM9AhA7psXib4anUXy/orfZ/E0MbQwhSOG/9L8hLlalqrU0UhOuqxW1YjmVw==
   dependencies:
     color "3.0.x"
     text-hex "1.0.x"
@@ -1126,102 +2100,190 @@ colorspace@1.1.x:
 colour@~0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/colour/-/colour-0.7.1.tgz#9cb169917ec5d12c0736d3e8685746df1cadf778"
+  integrity sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=
 
 combine-lists@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/combine-lists/-/combine-lists-1.0.1.tgz#458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"
+  integrity sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=
   dependencies:
     lodash "^4.5.0"
 
 combined-stream@1.0.6, combined-stream@~1.0.5, combined-stream@~1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
+  integrity sha1-cj599ugBrFYTETp+RFqbactjKBg=
   dependencies:
     delayed-stream "~1.0.0"
 
 combined-stream@^1.0.5, combined-stream@^1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
+  integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
   dependencies:
     delayed-stream "~1.0.0"
 
+commander@^2.12.0, commander@^2.9.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
+  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
+
 commander@^2.12.1:
   version "2.18.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
+  integrity sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==
 
-commander@^2.9.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
+commander@~2.13.0:
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
+  integrity sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==
 
 commander@~2.17.1:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
+  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
 
 common-tags@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
+  integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==
+
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
 compare-func@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648"
+  integrity sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=
   dependencies:
     array-ify "^1.0.0"
     dot-prop "^3.0.0"
 
+compare-versions@^3.2.1:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.4.0.tgz#e0747df5c9cb7f054d6d3dc3e1dbc444f9e92b26"
+  integrity sha512-tK69D7oNXXqUW3ZNo/z7NXTEz22TCF0pTE+YF9cxvaAM9XnkLo1fV621xCLrRR6aevJlKxExkss0vWqUCUpqdg==
+
 component-bind@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
+  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
 
 component-emitter@1.2.1, component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
 
 component-inherit@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
+  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
 
 compress-commons@^1.2.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-1.2.2.tgz#524a9f10903f3a813389b0225d27c48bb751890f"
+  integrity sha1-UkqfEJA/OoEzibAiXSfEi7dRiQ8=
   dependencies:
     buffer-crc32 "^0.2.1"
     crc32-stream "^2.0.0"
     normalize-path "^2.0.0"
     readable-stream "^2.0.0"
 
+compressible@~2.0.14:
+  version "2.0.15"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.15.tgz#857a9ab0a7e5a07d8d837ed43fe2defff64fe212"
+  integrity sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==
+  dependencies:
+    mime-db ">= 1.36.0 < 2"
+
+compression@^1.5.2:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db"
+  integrity sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==
+  dependencies:
+    accepts "~1.3.5"
+    bytes "3.0.0"
+    compressible "~2.0.14"
+    debug "2.6.9"
+    on-headers "~1.0.1"
+    safe-buffer "5.1.2"
+    vary "~1.1.2"
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
 concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@~1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
   dependencies:
     buffer-from "^1.0.0"
     inherits "^2.0.3"
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
+configstore@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f"
+  integrity sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==
+  dependencies:
+    dot-prop "^4.1.0"
+    graceful-fs "^4.1.2"
+    make-dir "^1.0.0"
+    unique-string "^1.0.0"
+    write-file-atomic "^2.0.0"
+    xdg-basedir "^3.0.0"
+
+connect-history-api-fallback@^1.3.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a"
+  integrity sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=
+
 connect@^3.6.0:
   version "3.6.6"
   resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
+  integrity sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=
   dependencies:
     debug "2.6.9"
     finalhandler "1.1.0"
     parseurl "~1.3.2"
     utils-merge "1.0.1"
 
+console-browserify@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
+  integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=
+  dependencies:
+    date-now "^0.1.4"
+
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
+
+constants-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
+
+content-disposition@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
+  integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
 
 content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
 conventional-changelog-angular@^1.6.6:
   version "1.6.6"
   resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.6.6.tgz#b27f2b315c16d0a1f23eb181309d0e6a4698ea0f"
+  integrity sha512-suQnFSqCxRwyBxY68pYTsFkG0taIdinHLNEAX5ivtw8bCRnIgnpvcHmlR/yjUyZIrNPYAoXlY1WiEKWgSE4BNg==
   dependencies:
     compare-func "^1.3.1"
     q "^1.5.1"
@@ -1229,18 +2291,21 @@ conventional-changelog-angular@^1.6.6:
 conventional-changelog-atom@^0.2.8:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.2.8.tgz#8037693455990e3256f297320a45fa47ee553a14"
+  integrity sha512-8pPZqhMbrnltNBizjoDCb/Sz85KyUXNDQxuAEYAU5V/eHn0okMBVjqc8aHWYpHrytyZWvMGbayOlDv7i8kEf6g==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-codemirror@^0.3.8:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.8.tgz#a1982c8291f4ee4d6f2f62817c6b2ecd2c4b7b47"
+  integrity sha512-3HFZKtBXTaUCHvz7ai6nk2+psRIkldDoNzCsom0egDtVmPsvvHZkzjynhdQyULfacRSsBTaiQ0ol6nBOL4dDiQ==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-core@^2.0.11:
   version "2.0.11"
   resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-2.0.11.tgz#19b5fbd55a9697773ed6661f4e32030ed7e30287"
+  integrity sha512-HvTE6RlqeEZ/NFPtQeFLsIDOLrGP3bXYr7lFLMhCVsbduF1MXIe8OODkwMFyo1i9ku9NWBwVnVn0jDmIFXjDRg==
   dependencies:
     conventional-changelog-writer "^3.0.9"
     conventional-commits-parser "^2.1.7"
@@ -1259,36 +2324,42 @@ conventional-changelog-core@^2.0.11:
 conventional-changelog-ember@^0.3.12:
   version "0.3.12"
   resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.3.12.tgz#b7d31851756d0fcb49b031dffeb6afa93b202400"
+  integrity sha512-mmJzA7uzbrOqeF89dMMi6z17O07ORTXlTMArnLG9ZTX4oLaKNolUlxFUFlFm9JUoVWajVpaHQWjxH1EOQ+ARoQ==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-eslint@^1.0.9:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.9.tgz#b13cc7e4b472c819450ede031ff1a75c0e3d07d3"
+  integrity sha512-h87nfVh2fdk9fJIvz26wCBsbDC/KxqCc5wSlNMZbXcARtbgNbNDIF7Y7ctokFdnxkzVdaHsbINkh548T9eBA7Q==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-express@^0.3.6:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.3.6.tgz#4a6295cb11785059fb09202180d0e59c358b9c2c"
+  integrity sha512-3iWVtBJZ9RnRnZveNDzOD8QRn6g6vUif0qVTWWyi5nUIAbuN1FfPVyKdAlJJfp5Im+dE8Kiy/d2SpaX/0X678Q==
   dependencies:
     q "^1.5.1"
 
 conventional-changelog-jquery@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/conventional-changelog-jquery/-/conventional-changelog-jquery-0.1.0.tgz#0208397162e3846986e71273b6c79c5b5f80f510"
+  integrity sha1-Agg5cWLjhGmG5xJztsecW1+A9RA=
   dependencies:
     q "^1.4.1"
 
 conventional-changelog-jscs@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/conventional-changelog-jscs/-/conventional-changelog-jscs-0.1.0.tgz#0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c"
+  integrity sha1-BHnrRDzH1yxYvwvPDvHURKkvDlw=
   dependencies:
     q "^1.4.1"
 
 conventional-changelog-jshint@^0.3.8:
   version "0.3.8"
   resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.8.tgz#9051c1ac0767abaf62a31f74d2fe8790e8acc6c8"
+  integrity sha512-hn9QU4ZI/5V50wKPJNPGT4gEWgiBFpV6adieILW4MaUFynuDYOvQ71EMSj3EznJyKi/KzuXpc9dGmX8njZMjig==
   dependencies:
     compare-func "^1.3.1"
     q "^1.5.1"
@@ -1296,10 +2367,12 @@ conventional-changelog-jshint@^0.3.8:
 conventional-changelog-preset-loader@^1.1.8:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.8.tgz#40bb0f142cd27d16839ec6c74ee8db418099b373"
+  integrity sha512-MkksM4G4YdrMlT2MbTsV2F6LXu/hZR0Tc/yenRrDIKRwBl/SP7ER4ZDlglqJsCzLJi4UonBc52Bkm5hzrOVCcw==
 
 conventional-changelog-writer@^3.0.9:
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-3.0.9.tgz#4aecdfef33ff2a53bb0cf3b8071ce21f0e994634"
+  integrity sha512-n9KbsxlJxRQsUnK6wIBRnARacvNnN4C/nxnxCkH+B/R1JS2Fa+DiP1dU4I59mEDEjgnFaN2+9wr1P1s7GYB5/Q==
   dependencies:
     compare-func "^1.3.1"
     conventional-commits-filter "^1.1.6"
@@ -1315,6 +2388,7 @@ conventional-changelog-writer@^3.0.9:
 conventional-changelog@^1.1.0:
   version "1.1.24"
   resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.24.tgz#3d94c29c960f5261c002678315b756cdd3d7d1f0"
+  integrity sha512-2WcSUst4Y3Z4hHvoMTWXMJr/DmgVdLiMOVY1Kak2LfFz+GIz2KDp5naqbFesYbfXPmaZ5p491dO0FWZIJoJw1Q==
   dependencies:
     conventional-changelog-angular "^1.6.6"
     conventional-changelog-atom "^0.2.8"
@@ -1331,6 +2405,7 @@ conventional-changelog@^1.1.0:
 conventional-commits-filter@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.1.6.tgz#4389cd8e58fe89750c0b5fb58f1d7f0cc8ad3831"
+  integrity sha512-KcDgtCRKJCQhyk6VLT7zR+ZOyCnerfemE/CsR3iQpzRRFbLEs0Y6rwk3mpDvtOh04X223z+1xyJ582Stfct/0Q==
   dependencies:
     is-subset "^0.1.1"
     modify-values "^1.0.0"
@@ -1338,6 +2413,7 @@ conventional-commits-filter@^1.1.6:
 conventional-commits-parser@^2.1.7:
   version "2.1.7"
   resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz#eca45ed6140d72ba9722ee4132674d639e644e8e"
+  integrity sha512-BoMaddIEJ6B4QVMSDu9IkVImlGOSGA1I2BQyOZHeLQ6qVOJLcLKn97+fL6dGbzWEiqDzfH4OkcveULmeq2MHFQ==
   dependencies:
     JSONStream "^1.0.4"
     is-text-path "^1.0.0"
@@ -1350,6 +2426,7 @@ conventional-commits-parser@^2.1.7:
 conventional-commits-parser@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.0.tgz#7f604549a50bd8f60443fbe515484b1c2f06a5c4"
+  integrity sha512-GWh71U26BLWgMykCp+VghZ4s64wVbtseECcKQ/PvcPZR2cUnz+FUc2J9KjxNl7/ZbCxST8R03c9fc+Vi0umS9Q==
   dependencies:
     JSONStream "^1.0.4"
     is-text-path "^1.0.0"
@@ -1359,19 +2436,27 @@ conventional-commits-parser@^3.0.0:
     through2 "^2.0.0"
     trim-off-newlines "^1.0.0"
 
-convert-source-map@^1.5.1:
+convert-source-map@^1.5.0, convert-source-map@^1.5.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
+  integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
   dependencies:
     safe-buffer "~5.1.1"
 
+cookie-signature@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
+
 cookie@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
 
 copy-concurrently@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
   dependencies:
     aproba "^1.1.1"
     fs-write-stream-atomic "^1.0.8"
@@ -1383,18 +2468,51 @@ copy-concurrently@^1.0.0:
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
+
+copy-webpack-plugin@4.5.4:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.4.tgz#f2b2782b3cd5225535c3dc166a80067e7d940f27"
+  integrity sha512-0lstlEyj74OAtYMrDxlNZsU7cwFijAI3Ofz2fD6Mpo9r4xCv4yegfa3uHIKvZY1NSuOtE9nvG6TAhJ+uz9gDaQ==
+  dependencies:
+    cacache "^10.0.4"
+    find-cache-dir "^1.0.0"
+    globby "^7.1.1"
+    is-glob "^4.0.0"
+    loader-utils "^1.1.0"
+    minimatch "^3.0.4"
+    p-limit "^1.0.0"
+    serialize-javascript "^1.4.0"
 
-core-js@^2.2.0:
+core-js@^2.2.0, core-js@^2.4.0, core-js@^2.4.1:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
+  integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==
+
+core-js@~2.3.0:
+  version "2.3.0"
+  resolved "http://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"
+  integrity sha1-+rg/uwstjchfpjbEudNMdUIMbWU=
 
 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"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+cosmiconfig@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
+  integrity sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==
+  dependencies:
+    is-directory "^0.3.1"
+    js-yaml "^3.9.0"
+    parse-json "^4.0.0"
+    require-from-string "^2.0.1"
 
 crc32-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-2.0.0.tgz#e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"
+  integrity sha1-483TtN8xaN10494/u8t7KX/pCPQ=
   dependencies:
     crc "^3.4.4"
     readable-stream "^2.0.0"
@@ -1402,92 +2520,238 @@ crc32-stream@^2.0.0:
 crc@^3.4.4:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6"
+  integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==
   dependencies:
     buffer "^5.1.0"
 
+create-ecdh@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
+  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
+  dependencies:
+    bn.js "^4.1.0"
+    elliptic "^6.0.0"
+
+create-error-class@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
+  integrity sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=
+  dependencies:
+    capture-stack-trace "^1.0.0"
+
+create-hash@^1.1.0, create-hash@^1.1.2:
+  version "1.2.0"
+  resolved "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
+  dependencies:
+    cipher-base "^1.0.1"
+    inherits "^2.0.1"
+    md5.js "^1.3.4"
+    ripemd160 "^2.0.1"
+    sha.js "^2.4.0"
+
+create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
+  version "1.1.7"
+  resolved "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
+  dependencies:
+    cipher-base "^1.0.3"
+    create-hash "^1.1.0"
+    inherits "^2.0.1"
+    ripemd160 "^2.0.0"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+cross-spawn@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
+  integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI=
+  dependencies:
+    lru-cache "^4.0.1"
+    which "^1.2.9"
+
 cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
   dependencies:
     lru-cache "^4.0.1"
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+cross-spawn@^6.0.0:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
 cryptiles@2.x.x:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
+  integrity sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=
   dependencies:
     boom "2.x.x"
 
 cryptiles@3.x.x:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
+  integrity sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=
   dependencies:
     boom "5.x.x"
 
+crypto-browserify@^3.11.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
+  dependencies:
+    browserify-cipher "^1.0.0"
+    browserify-sign "^4.0.0"
+    create-ecdh "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.0"
+    diffie-hellman "^5.0.0"
+    inherits "^2.0.1"
+    pbkdf2 "^3.0.3"
+    public-encrypt "^4.0.0"
+    randombytes "^2.0.0"
+    randomfill "^1.0.3"
+
+crypto-random-string@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
+  integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=
+
+css-parse@1.7.x:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
+  integrity sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=
+
+css-selector-tokenizer@^0.7.0:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz#a177271a8bca5019172f4f891fc6eed9cbf68d5d"
+  integrity sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==
+  dependencies:
+    cssesc "^0.1.0"
+    fastparse "^1.1.1"
+    regexpu-core "^1.0.0"
+
+cssauron@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/cssauron/-/cssauron-1.4.0.tgz#a6602dff7e04a8306dc0db9a551e92e8b5662ad8"
+  integrity sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=
+  dependencies:
+    through X.X.X
+
+cssesc@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
+  integrity sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=
+
+cuint@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
+  integrity sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=
+
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
   dependencies:
     array-find-index "^1.0.1"
 
 custom-event@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
+  integrity sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=
 
 cyclist@~0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
+  integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
 
 dargs@^4.0.1:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
+  integrity sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=
   dependencies:
     number-is-nan "^1.0.0"
 
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
   dependencies:
     assert-plus "^1.0.0"
 
 data-uri-to-buffer@1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz#77163ea9c20d8641b4707e8f18abdf9a78f34835"
+  integrity sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ==
 
 date-format@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"
+  integrity sha1-YV6CjiM90aubua4JUODOzPpuytg=
+
+date-now@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
+  integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
 
 dateformat@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
+  integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
+
+debug@*:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
+  integrity sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==
+  dependencies:
+    ms "^2.1.1"
 
-debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@~2.6.4, debug@~2.6.6:
+debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@~2.6.4, debug@~2.6.6:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
 debug@3.1.0, debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
   dependencies:
     ms "2.0.0"
 
 debug@^3.1.0:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.4.tgz#82123737c51afbe9609a2b5dfe9664e7487171f0"
+  integrity sha512-fCEG5fOr7m/fhgOD3KurdAov706JbXZJYXAsAOEJ7GgasGr0GO4N+1NsIcrjlIUcyvJ9oZlnelTzN3Ix8z1ecw==
+  dependencies:
+    ms "^2.1.1"
+
+debug@^3.2.5:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
   dependencies:
     ms "^2.1.1"
 
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+  integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
 
 decamelize-keys@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
+  integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
   dependencies:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
@@ -1495,40 +2759,75 @@ decamelize-keys@^1.0.0:
 decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+
+decamelize@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
+  integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==
+  dependencies:
+    xregexp "4.0.0"
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 decompress-response@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
+  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
   dependencies:
     mimic-response "^1.0.0"
 
+deep-equal@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
+  integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
+
 deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+
+default-gateway@^2.6.0:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f"
+  integrity sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==
+  dependencies:
+    execa "^0.10.0"
+    ip-regex "^2.1.0"
+
+default-require-extensions@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
+  integrity sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=
+  dependencies:
+    strip-bom "^3.0.0"
 
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
   dependencies:
     is-descriptor "^0.1.0"
 
 define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
   dependencies:
     is-descriptor "^1.0.0"
 
 define-property@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
   dependencies:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
@@ -1536,34 +2835,91 @@ define-property@^2.0.2:
 degenerator@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-1.0.4.tgz#fcf490a37ece266464d9cc431ab98c5819ced095"
+  integrity sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=
   dependencies:
     ast-types "0.x.x"
     escodegen "1.x.x"
     esprima "3.x.x"
 
+del@^2.2.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
+  integrity sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=
+  dependencies:
+    globby "^5.0.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    rimraf "^2.2.8"
+
+del@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
+  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
+  dependencies:
+    globby "^6.1.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    p-map "^1.1.1"
+    pify "^3.0.0"
+    rimraf "^2.2.8"
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
 depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
 dependency-graph@^0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.7.2.tgz#91db9de6eb72699209d88aea4c1fd5221cac1c49"
+  integrity sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==
+
+des.js@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
+  integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=
+  dependencies:
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+destroy@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+
+detect-indent@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+  integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg=
+  dependencies:
+    repeating "^2.0.0"
 
 detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
+
+detect-node@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
+  integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
 
 dezalgo@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=
   dependencies:
     asap "^2.0.0"
     wrappy "1"
@@ -1571,10 +2927,12 @@ dezalgo@^1.0.0:
 di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
+  integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=
 
 diagnostics@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.1.1.tgz#cab6ac33df70c9d9a727490ae43ac995a769b22a"
+  integrity sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==
   dependencies:
     colorspace "1.1.x"
     enabled "1.0.x"
@@ -1583,39 +2941,100 @@ diagnostics@^1.1.1:
 diff@^3.1.0, diff@^3.2.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
+
+diffie-hellman@^5.0.0:
+  version "5.0.3"
+  resolved "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
+  dependencies:
+    bn.js "^4.1.0"
+    miller-rabin "^4.0.0"
+    randombytes "^2.0.0"
+
+dir-glob@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
+  integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==
+  dependencies:
+    arrify "^1.0.1"
+    path-type "^3.0.0"
+
+dns-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
+  integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
+
+dns-packet@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
+  integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
+  dependencies:
+    ip "^1.1.0"
+    safe-buffer "^5.0.1"
+
+dns-txt@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
+  integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=
+  dependencies:
+    buffer-indexof "^1.0.0"
 
 dom-serialize@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
+  integrity sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=
   dependencies:
     custom-event "~1.0.0"
     ent "~2.2.0"
     extend "^3.0.0"
     void-elements "^2.0.0"
 
+domain-browser@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
+
+domino@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.0.tgz#653ba7d331441113b42e40ba05f24253ec86e02e"
+  integrity sha512-xINSODvrnuQcm3eXJN4IkBR+JxqLrJN8Ge4fd00y1b7HsY0A4huKN5BflSS/oo8quBWmocTfWdFvrw2H8TjGqQ==
+
 dot-prop@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
+  integrity sha1-G3CK8JSknJoOfbyteQq6U52sEXc=
+  dependencies:
+    is-obj "^1.0.0"
+
+dot-prop@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
+  integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==
   dependencies:
     is-obj "^1.0.0"
 
 double-ended-queue@^2.1.0-0:
   version "2.1.0-0"
   resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
+  integrity sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw=
 
 duplexer2@~0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
+  integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=
   dependencies:
     readable-stream "^2.0.2"
 
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
+  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
 
 duplexify@^3.4.2, duplexify@^3.6.0:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.1.tgz#b1a7a29c4abfd639585efaecce80d666b1e34125"
+  integrity sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==
   dependencies:
     end-of-stream "^1.0.0"
     inherits "^2.0.1"
@@ -1625,6 +3044,7 @@ duplexify@^3.4.2, duplexify@^3.6.0:
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
   dependencies:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
@@ -1632,32 +3052,61 @@ ecc-jsbn@~0.1.1:
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+
+electron-to-chromium@^1.3.82:
+  version "1.3.82"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.82.tgz#7d13ae4437d2a783de3f4efba96b186c540b67b1"
+  integrity sha512-NI4nB2IWGcU4JVT1AE8kBb/dFor4zjLHMLsOROPahppeHrR0FG5uslxMmkp/thO1MvPjM2xhlKoY29/I60s0ew==
+
+elliptic@^6.0.0:
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
+  integrity sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==
+  dependencies:
+    bn.js "^4.4.0"
+    brorand "^1.0.1"
+    hash.js "^1.0.0"
+    hmac-drbg "^1.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.0"
+
+emojis-list@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
 
 enabled@1.0.x:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz#965f6513d2c2d1c5f4652b64a2e3396467fc2f93"
+  integrity sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=
   dependencies:
     env-variable "0.0.x"
 
-encodeurl@~1.0.1:
+encodeurl@~1.0.1, encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
 encoding@^0.1.11:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
+  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
   dependencies:
     iconv-lite "~0.4.13"
 
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
+  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
   dependencies:
     once "^1.4.0"
 
 engine.io-client@~3.1.0:
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.1.6.tgz#5bdeb130f8b94a50ac5cbeb72583e7a4a063ddfd"
+  integrity sha512-hnuHsFluXnsKOndS4Hv6SvUrgdYx1pk2NqfaDMW+GWdgfU3+/V25Cj7I8a0x92idSpa5PIhJRKxPvp9mnoLsfg==
   dependencies:
     component-emitter "1.2.1"
     component-inherit "0.0.3"
@@ -1674,6 +3123,7 @@ engine.io-client@~3.1.0:
 engine.io-client@~3.2.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36"
+  integrity sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==
   dependencies:
     component-emitter "1.2.1"
     component-inherit "0.0.3"
@@ -1690,6 +3140,7 @@ engine.io-client@~3.2.0:
 engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.2.tgz#4c0f4cff79aaeecbbdcfdea66a823c6085409196"
+  integrity sha512-dInLFzr80RijZ1rGpx1+56/uFoH7/7InhH3kZt+Ms6hT8tNx3NGW/WNSA/f8As1WkOfkuyb3tnRyuXGxusclMw==
   dependencies:
     after "0.8.2"
     arraybuffer.slice "~0.0.7"
@@ -1700,6 +3151,7 @@ engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
 engine.io@~3.1.0:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.1.5.tgz#0e7ef9d690eb0b35597f1d4ad02a26ca2dba3845"
+  integrity sha512-D06ivJkYxyRrcEe0bTpNnBQNgP9d3xog+qZlLbui8EsMr/DouQpf5o9FzJnWYHEYE0YsFHllUv2R1dkgYZXHcA==
   dependencies:
     accepts "~1.3.4"
     base64id "1.0.0"
@@ -1713,6 +3165,7 @@ engine.io@~3.1.0:
 engine.io@~3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.0.tgz#54332506f42f2edc71690d2f2a42349359f3bf7d"
+  integrity sha512-mRbgmAtQ4GAlKwuPnnAvXXwdPhEx+jkc0OBCLrXuD/CRvwNK3AxRSnqK4FSqmAMRRHryVJP8TopOvmEaA64fKw==
   dependencies:
     accepts "~1.3.4"
     base64id "1.0.0"
@@ -1721,45 +3174,75 @@ engine.io@~3.2.0:
     engine.io-parser "~2.1.0"
     ws "~3.3.1"
 
+enhanced-resolve@4.1.0, enhanced-resolve@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
+  integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.4.0"
+    tapable "^1.0.0"
+
 ent@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
+  integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0=
 
 env-variable@0.0.x:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.4.tgz#0d6280cf507d84242befe35a512b5ae4be77c54e"
+  integrity sha512-+jpGxSWG4vr6gVxUHOc4p+ilPnql7NzZxOZBxNldsKGjCF+97df3CbuX7XMaDa5oAVkKQj4rKp38rYdC4VcpDg==
 
 err-code@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
+  integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=
+
+errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
+  dependencies:
+    prr "~1.0.1"
 
 error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
 es6-promise@^4.0.3:
   version "4.2.5"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
+  integrity sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==
+
+es6-promise@~3.0.2:
+  version "3.0.2"
+  resolved "http://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6"
+  integrity sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=
 
 es6-promisify@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
   dependencies:
     es6-promise "^4.0.3"
 
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
 escodegen@1.8.x:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
+  integrity sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=
   dependencies:
     esprima "^2.7.1"
     estraverse "^1.9.1"
@@ -1771,6 +3254,7 @@ escodegen@1.8.x:
 escodegen@1.x.x, escodegen@^1.8.1:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589"
+  integrity sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==
   dependencies:
     esprima "^3.1.3"
     estraverse "^4.2.0"
@@ -1782,6 +3266,7 @@ escodegen@1.x.x, escodegen@^1.8.1:
 escodegen@~1.9.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"
+  integrity sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==
   dependencies:
     esprima "^3.1.3"
     estraverse "^4.2.0"
@@ -1790,37 +3275,103 @@ escodegen@~1.9.0:
   optionalDependencies:
     source-map "~0.6.1"
 
+eslint-scope@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
+  integrity sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
 esprima@2.7.x, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+  integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=
 
 esprima@3.x.x, esprima@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
 
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
+esrecurse@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
+  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
+  dependencies:
+    estraverse "^4.1.0"
 
 estraverse@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
+  integrity sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=
 
-estraverse@^4.2.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"
+  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
+
+estree-walker@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39"
+  integrity sha512-XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig==
 
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
+
+etag@~1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
 
 eventemitter3@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
+  integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
+
+events@^1.0.0:
+  version "1.1.1"
+  resolved "http://registry.npmjs.org/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+  integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=
+
+eventsource@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"
+  integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==
+  dependencies:
+    original "^1.0.0"
+
+evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
+  dependencies:
+    md5.js "^1.3.4"
+    safe-buffer "^5.1.1"
+
+execa@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
+  integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
 
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
   dependencies:
     cross-spawn "^5.0.1"
     get-stream "^3.0.0"
@@ -1833,10 +3384,12 @@ execa@^0.7.0:
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
 expand-braces@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea"
+  integrity sha1-SIsdHSRRyz06axks/AMPRMWFX+o=
   dependencies:
     array-slice "^0.2.3"
     array-unique "^0.2.1"
@@ -1845,12 +3398,14 @@ expand-braces@^0.1.1:
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
   dependencies:
     is-posix-bracket "^0.1.0"
 
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
   dependencies:
     debug "^2.3.3"
     define-property "^0.2.5"
@@ -1863,6 +3418,7 @@ expand-brackets@^2.1.4:
 expand-range@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-0.1.1.tgz#4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"
+  integrity sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=
   dependencies:
     is-number "^0.1.1"
     repeat-string "^0.2.2"
@@ -1870,18 +3426,57 @@ expand-range@^0.1.0:
 expand-range@^1.8.1:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
   dependencies:
     fill-range "^2.1.0"
 
+express@^4.16.2:
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
+  integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
+  dependencies:
+    accepts "~1.3.5"
+    array-flatten "1.1.1"
+    body-parser "1.18.3"
+    content-disposition "0.5.2"
+    content-type "~1.0.4"
+    cookie "0.3.1"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "1.1.1"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.2"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.4"
+    qs "6.5.2"
+    range-parser "~1.2.0"
+    safe-buffer "5.1.2"
+    send "0.16.2"
+    serve-static "1.13.2"
+    setprototypeof "1.1.0"
+    statuses "~1.4.0"
+    type-is "~1.6.16"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
   dependencies:
     is-extendable "^0.1.0"
 
 extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
   dependencies:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
@@ -1889,16 +3484,28 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
 extend@3, extend@^3.0.0, extend@~3.0.0, extend@~3.0.1, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+external-editor@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
+  integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
+  dependencies:
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
+    tmp "^0.0.33"
 
 extglob@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
   dependencies:
     is-extglob "^1.0.0"
 
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
   dependencies:
     array-unique "^0.3.2"
     define-property "^1.0.0"
@@ -1912,14 +3519,17 @@ extglob@^2.0.4:
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
 
 extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
 falafel@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.1.0.tgz#96bb17761daba94f46d001738b3cedf3a67fe06c"
+  integrity sha1-lrsXdh2rqU9G0AFzizzt86Z/4Gw=
   dependencies:
     acorn "^5.0.0"
     foreach "^2.0.5"
@@ -1929,42 +3539,94 @@ falafel@^2.1.0:
 fast-deep-equal@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
 
 fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
 
-fast-json-stable-stringify@^2.0.0:
+fast-json-stable-stringify@2.0.0, fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
 fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fast-safe-stringify@^2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.6.tgz#04b26106cc56681f51a044cfc0d76cf0008ac2c2"
+  integrity sha512-q8BZ89jjc+mz08rSxROs8VsrBBcn1SIw1kq9NjolL509tkABRk9io01RAjSaEv1Xb2uFLt8VtRiZbGp5H8iDtg==
+
+fastparse@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
+  integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
+
+faye-websocket@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
+  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
+  dependencies:
+    websocket-driver ">=0.5.1"
+
+faye-websocket@~0.11.1:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
+  integrity sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=
+  dependencies:
+    websocket-driver ">=0.5.1"
 
 fecha@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd"
+  integrity sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==
 
 figgy-pudding@^3.1.0, figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
+  integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
+
+figures@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+file-loader@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-2.0.0.tgz#39749c82f020b9e85901dcff98e8004e6401cfde"
+  integrity sha512-YCsBfd1ZGCyonOKLxPiKPdu+8ld9HAaMEvJewzz+b2eTF7uL5Zm/HdBF6FjCrpCMRq25Mi0U1gl4pwn2TlH7hQ==
+  dependencies:
+    loader-utils "^1.0.2"
+    schema-utils "^1.0.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"
+  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
+  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
+
+fileset@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
+  integrity sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=
+  dependencies:
+    glob "^7.0.3"
+    minimatch "^3.0.3"
 
 fill-range@^2.1.0:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
+  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
   dependencies:
     is-number "^2.1.0"
     isobject "^2.0.0"
@@ -1975,6 +3637,7 @@ fill-range@^2.1.0:
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
   dependencies:
     extend-shallow "^2.0.1"
     is-number "^3.0.0"
@@ -1984,6 +3647,7 @@ fill-range@^4.0.0:
 finalhandler@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
+  integrity sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.1"
@@ -1993,22 +3657,68 @@ finalhandler@1.1.0:
     statuses "~1.3.1"
     unpipe "~1.0.0"
 
-find-up@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+finalhandler@1.1.1:
+  version "1.1.1"
+  resolved "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
+  integrity sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.2"
+    statuses "~1.4.0"
+    unpipe "~1.0.0"
+
+find-cache-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
+  integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^1.0.0"
+    pkg-dir "^2.0.0"
+
+find-cache-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d"
+  integrity sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^1.0.0"
+    pkg-dir "^3.0.0"
+
+find-parent-dir@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
+  integrity sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=
+
+find-up@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
   dependencies:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
-find-up@^2.0.0:
+find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
   dependencies:
     locate-path "^2.0.0"
 
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+  dependencies:
+    locate-path "^3.0.0"
+
 flush-write-stream@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
+  integrity sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.4"
@@ -2016,36 +3726,60 @@ flush-write-stream@^1.0.0:
 follow-redirects@1.0.0:
   version "1.0.0"
   resolved "http://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz#8e34298cbd2e176f254effec75a1c78cc849fd37"
+  integrity sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=
   dependencies:
     debug "^2.2.0"
 
 follow-redirects@^1.0.0:
   version "1.5.7"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.7.tgz#a39e4804dacb90202bca76a9e2ac10433ca6a69a"
+  integrity sha512-NONJVIFiX7Z8k2WxfqBjtwqMifx7X42ORLFrOZ2LTKGj71G3C0kfdyTqGqr8fx5zSX6Foo/D95dgGWbPUiwnew==
   dependencies:
     debug "^3.1.0"
 
+font-awesome@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
+  integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=
+
+for-in@^0.1.3:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
+  integrity sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=
+
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
 for-own@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
+  dependencies:
+    for-in "^1.0.1"
+
+for-own@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
+  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
   dependencies:
     for-in "^1.0.1"
 
 foreach@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+  integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
 
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
 form-data@~2.0.0:
   version "2.0.0"
   resolved "http://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz#6f0aebadcc5da16c13e1ecc11137d85f9b883b25"
+  integrity sha1-bwrrrcxdoWwT4ezBETfYX5uIOyU=
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.5"
@@ -2054,6 +3788,7 @@ form-data@~2.0.0:
 form-data@~2.3.0:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.6"
@@ -2062,20 +3797,33 @@ form-data@~2.3.0:
 form-data@~2.3.1, form-data@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
+  integrity sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=
   dependencies:
     asynckit "^0.4.0"
     combined-stream "1.0.6"
     mime-types "^2.1.12"
 
+forwarded@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
+
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
   dependencies:
     map-cache "^0.2.2"
 
+fresh@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+
 from2@^2.1.0, from2@^2.1.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
@@ -2083,22 +3831,35 @@ from2@^2.1.0, from2@^2.1.1:
 fs-access@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/fs-access/-/fs-access-1.0.1.tgz#d6a87f262271cefebec30c553407fb995da8777a"
+  integrity sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=
   dependencies:
     null-check "^1.0.0"
 
 fs-constants@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
+
+fs-extra@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.0.tgz#8cc3f47ce07ef7b3593a11b9fb245f7e34c041d6"
+  integrity sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
 
 fs-minipass@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
   dependencies:
     minipass "^2.2.1"
 
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
   dependencies:
     graceful-fs "^4.1.2"
     iferr "^0.1.5"
@@ -2108,17 +3869,30 @@ fs-write-stream-atomic@^1.0.8:
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.0.0, fsevents@^1.2.2:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
+  integrity sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==
   dependencies:
     nan "^2.9.2"
     node-pre-gyp "^0.10.0"
 
+fstream@^1.0.0, fstream@^1.0.2:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+  integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
+  dependencies:
+    graceful-fs "^4.1.2"
+    inherits "~2.0.0"
+    mkdirp ">=0.5 0"
+    rimraf "2"
+
 ftp@~0.3.10:
   version "0.3.10"
   resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
+  integrity sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=
   dependencies:
     readable-stream "1.1.x"
     xregexp "2.0.0"
@@ -2126,10 +3900,12 @@ ftp@~0.3.10:
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
   dependencies:
     aproba "^1.0.3"
     console-control-strings "^1.0.0"
@@ -2140,29 +3916,41 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
+gaze@^1.0.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
+  integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
+  dependencies:
+    globule "^1.0.0"
+
 generate-function@^2.0.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f"
+  integrity sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==
   dependencies:
     is-property "^1.0.2"
 
 generate-object-property@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
+  integrity sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=
   dependencies:
     is-property "^1.0.0"
 
 genfun@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
+  integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==
 
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
 get-pkg-repo@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
+  integrity sha1-xztInAbYDMVTbCyFP54FIyBWly0=
   dependencies:
     hosted-git-info "^2.1.4"
     meow "^3.3.0"
@@ -2173,20 +3961,24 @@ get-pkg-repo@^1.0.0:
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
 get-stream@3.0.0, get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
 
 get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
   dependencies:
     pump "^3.0.0"
 
 get-uri@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.2.tgz#5c795e71326f6ca1286f2fc82575cd2bab2af578"
+  integrity sha512-ZD325dMZOgerGqF/rF6vZXyFGTAay62svjQIT+X/oU2PtxYpFxvSkbsdi+oxIrsNxlZVd4y8wUDqkaExWTI/Cw==
   dependencies:
     data-uri-to-buffer "1"
     debug "2"
@@ -2198,16 +3990,19 @@ get-uri@^2.0.0:
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
   dependencies:
     assert-plus "^1.0.0"
 
 gh-got@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/gh-got/-/gh-got-7.1.0.tgz#f2b14eef375ce49b66d5f034a1c124f56dc5bcf0"
+  integrity sha512-KeWkkhresa7sbpzQLYzITMgez5rMigUsijhmSAHcLDORIMUbdlkdoZyaN1wQvIjmUZnyb/wkAPaXb4MQKX0mdQ==
   dependencies:
     got "^8.0.0"
     is-plain-obj "^1.1.0"
@@ -2215,6 +4010,7 @@ gh-got@^7.0.0:
 git-raw-commits@^1.3.6:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.3.6.tgz#27c35a32a67777c1ecd412a239a6c19d71b95aff"
+  integrity sha512-svsK26tQ8vEKnMshTDatSIQSMDdz8CxIIqKsvPqbtV23Etmw6VNaFAitu8zwZ0VrOne7FztwPyRLxK7/DIUTQg==
   dependencies:
     dargs "^4.0.1"
     lodash.template "^4.0.2"
@@ -2225,6 +4021,7 @@ git-raw-commits@^1.3.6:
 git-raw-commits@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.0.tgz#d92addf74440c14bcc5c83ecce3fb7f8a79118b5"
+  integrity sha512-w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg==
   dependencies:
     dargs "^4.0.1"
     lodash.template "^4.0.2"
@@ -2235,6 +4032,7 @@ git-raw-commits@^2.0.0:
 git-remote-origin-url@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f"
+  integrity sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=
   dependencies:
     gitconfiglocal "^1.0.0"
     pify "^2.3.0"
@@ -2242,6 +4040,7 @@ git-remote-origin-url@^2.0.0:
 git-semver-tags@^1.3.6:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.3.6.tgz#357ea01f7280794fe0927f2806bee6414d2caba5"
+  integrity sha512-2jHlJnln4D/ECk9FxGEBh3k44wgYdWjWDtMmJPaecjoRmxKo3Y1Lh8GMYuOPu04CHw86NTAODchYjC5pnpMQig==
   dependencies:
     meow "^4.0.0"
     semver "^5.5.0"
@@ -2249,12 +4048,14 @@ git-semver-tags@^1.3.6:
 gitconfiglocal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"
+  integrity sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=
   dependencies:
     ini "^1.3.2"
 
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
   dependencies:
     glob-parent "^2.0.0"
     is-glob "^2.0.0"
@@ -2262,29 +4063,34 @@ glob-base@^0.3.0:
 glob-parent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
   dependencies:
     is-glob "^2.0.0"
 
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
   dependencies:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob@^5.0.15:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+glob@7.0.x:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
+  integrity sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=
   dependencies:
+    fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "2 || 3"
+    minimatch "^3.0.2"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
+glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -2293,9 +4099,99 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, gl
     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"
+  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+global-dirs@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
+  integrity sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=
+  dependencies:
+    ini "^1.3.4"
+
+globals@^11.1.0:
+  version "11.8.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.8.0.tgz#c1ef45ee9bed6badf0663c5cb90e8d1adec1321d"
+  integrity sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==
+
+globals@^9.18.0:
+  version "9.18.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
+  integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
+
+globby@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
+  integrity sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=
+  dependencies:
+    array-union "^1.0.1"
+    arrify "^1.0.0"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+globby@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
+  dependencies:
+    array-union "^1.0.1"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+globby@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
+  integrity sha1-+yzP+UAfhgCUXfral0QMypcrhoA=
+  dependencies:
+    array-union "^1.0.1"
+    dir-glob "^2.0.0"
+    glob "^7.1.2"
+    ignore "^3.3.5"
+    pify "^3.0.0"
+    slash "^1.0.0"
+
+globule@^1.0.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d"
+  integrity sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==
+  dependencies:
+    glob "~7.1.1"
+    lodash "~4.17.10"
+    minimatch "~3.0.2"
+
+got@^6.7.1:
+  version "6.7.1"
+  resolved "http://registry.npmjs.org/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
+  integrity sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=
+  dependencies:
+    create-error-class "^3.0.0"
+    duplexer3 "^0.1.4"
+    get-stream "^3.0.0"
+    is-redirect "^1.0.0"
+    is-retry-allowed "^1.0.0"
+    is-stream "^1.0.0"
+    lowercase-keys "^1.0.0"
+    safe-buffer "^5.0.1"
+    timed-out "^4.0.0"
+    unzip-response "^2.0.1"
+    url-parse-lax "^1.0.0"
+
 got@^8.0.0:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937"
+  integrity sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==
   dependencies:
     "@sindresorhus/is" "^0.7.0"
     cacheable-request "^2.1.1"
@@ -2318,10 +4214,17 @@ got@^8.0.0:
 graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
+
+handle-thing@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
+  integrity sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=
 
-handlebars@^4.0.1, handlebars@^4.0.2:
+handlebars@^4.0.1, handlebars@^4.0.11, handlebars@^4.0.2:
   version "4.0.12"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5"
+  integrity sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==
   dependencies:
     async "^2.5.0"
     optimist "^0.6.1"
@@ -2332,10 +4235,12 @@ handlebars@^4.0.1, handlebars@^4.0.2:
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
 har-validator@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
+  integrity sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=
   dependencies:
     chalk "^1.1.1"
     commander "^2.9.0"
@@ -2345,6 +4250,7 @@ har-validator@~2.0.6:
 har-validator@~5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
+  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
   dependencies:
     ajv "^5.1.0"
     har-schema "^2.0.0"
@@ -2352,6 +4258,7 @@ har-validator@~5.0.3:
 har-validator@~5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
+  integrity sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==
   dependencies:
     ajv "^5.3.0"
     har-schema "^2.0.0"
@@ -2359,44 +4266,53 @@ har-validator@~5.1.0:
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
   dependencies:
     ansi-regex "^2.0.0"
 
 has-binary2@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
+  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
   dependencies:
     isarray "2.0.1"
 
 has-cors@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
+  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
 
 has-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
 
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
 has-symbol-support-x@^1.4.1:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
+  integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==
 
 has-to-string-tag-x@^1.2.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
+  integrity sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==
   dependencies:
     has-symbol-support-x "^1.4.1"
 
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
 
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
   dependencies:
     get-value "^2.0.3"
     has-values "^0.1.4"
@@ -2405,6 +4321,7 @@ has-value@^0.3.1:
 has-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
   dependencies:
     get-value "^2.0.6"
     has-values "^1.0.0"
@@ -2413,10 +4330,12 @@ has-value@^1.0.0:
 has-values@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
 
 has-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
   dependencies:
     is-number "^3.0.0"
     kind-of "^4.0.0"
@@ -2424,12 +4343,30 @@ has-values@^1.0.0:
 has@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
     function-bind "^1.1.1"
 
+hash-base@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
+  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+hash.js@^1.0.0, hash.js@^1.0.3:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.5.tgz#e38ab4b85dfb1e0c40fe9265c0e9b54854c23812"
+  integrity sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==
+  dependencies:
+    inherits "^2.0.3"
+    minimalistic-assert "^1.0.1"
+
 hawk@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
+  integrity sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=
   dependencies:
     boom "2.x.x"
     cryptiles "2.x.x"
@@ -2439,6 +4376,7 @@ hawk@~3.1.3:
 hawk@~6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
+  integrity sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==
   dependencies:
     boom "4.x.x"
     cryptiles "3.x.x"
@@ -2448,45 +4386,97 @@ hawk@~6.0.2:
 hipchat-notifier@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/hipchat-notifier/-/hipchat-notifier-1.1.0.tgz#b6d249755437c191082367799d3ba9a0f23b231e"
+  integrity sha1-ttJJdVQ3wZEII2d5nTupoPI7Ix4=
   dependencies:
     lodash "^4.0.0"
     request "^2.0.0"
 
+hmac-drbg@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
+  dependencies:
+    hash.js "^1.0.3"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.1"
+
 hoek@2.x.x:
   version "2.16.3"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
+  integrity sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=
 
 hoek@4.x.x:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
+  integrity sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==
 
 hosted-git-info@^2.1.4, hosted-git-info@^2.6.0:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
+  integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
+
+hpack.js@^2.1.6:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
+  integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=
+  dependencies:
+    inherits "^2.0.1"
+    obuf "^1.0.0"
+    readable-stream "^2.0.1"
+    wbuf "^1.1.0"
+
+html-entities@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
+  integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
 
 http-cache-semantics@3.8.1, http-cache-semantics@^3.8.1:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
+  integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
+
+http-deceiver@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
+  integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
 
-http-errors@1.6.3, http-errors@~1.6.3:
+http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
   dependencies:
     depd "~1.1.2"
     inherits "2.0.3"
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
+http-parser-js@>=0.4.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8"
+  integrity sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==
+
 http-proxy-agent@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
+  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
   dependencies:
     agent-base "4"
     debug "3.1.0"
 
-http-proxy@^1.13.0:
+http-proxy-middleware@~0.18.0:
+  version "0.18.0"
+  resolved "http://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
+  integrity sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==
+  dependencies:
+    http-proxy "^1.16.2"
+    is-glob "^4.0.0"
+    lodash "^4.17.5"
+    micromatch "^3.1.9"
+
+http-proxy@^1.13.0, http-proxy@^1.16.2:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
+  integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==
   dependencies:
     eventemitter3 "^3.0.0"
     follow-redirects "^1.0.0"
@@ -2495,6 +4485,7 @@ http-proxy@^1.13.0:
 http-signature@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
+  integrity sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=
   dependencies:
     assert-plus "^0.2.0"
     jsprim "^1.2.2"
@@ -2503,6 +4494,7 @@ http-signature@~1.1.0:
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
   dependencies:
     assert-plus "^1.0.0"
     jsprim "^1.2.2"
@@ -2511,6 +4503,7 @@ http-signature@~1.2.0:
 httpntlm@1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/httpntlm/-/httpntlm-1.6.1.tgz#ad01527143a2e8773cfae6a96f58656bb52a34b2"
+  integrity sha1-rQFScUOi6Hc8+uapb1hla7UqNLI=
   dependencies:
     httpreq ">=0.4.22"
     underscore "~1.7.0"
@@ -2518,10 +4511,17 @@ httpntlm@1.6.1:
 httpreq@>=0.4.22:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/httpreq/-/httpreq-0.4.24.tgz#4335ffd82cd969668a39465c929ac61d6393627f"
+  integrity sha1-QzX/2CzZaWaKOUZckprGHWOTYn8=
+
+https-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
 https-proxy-agent@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
+  integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==
   dependencies:
     agent-base "^4.1.0"
     debug "^3.1.0"
@@ -2529,12 +4529,14 @@ https-proxy-agent@^2.2.1:
 humanize-ms@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+  integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=
   dependencies:
     ms "^2.0.0"
 
 husky@^0.14.3:
   version "0.14.3"
   resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3"
+  integrity sha512-e21wivqHpstpoiWA/Yi8eFti8E+sQDSS53cpJsPptPs295QTOQR0ZwnHo2TXy1XOpZFD9rPOd3NpmqTK6uMLJA==
   dependencies:
     is-ci "^1.0.10"
     normalize-path "^1.0.0"
@@ -2543,154 +4545,296 @@ husky@^0.14.3:
 iconv-lite@0.4.15:
   version "0.4.15"
   resolved "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
+  integrity sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es=
 
 iconv-lite@0.4.23:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
+  integrity sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 ieee754@^1.1.4:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
+  integrity sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==
 
 iferr@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
 ignore-walk@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
   dependencies:
     minimatch "^3.0.4"
 
+ignore@^3.3.5:
+  version "3.3.10"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
+  integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
+
+image-size@~0.5.0:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
+  integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
+
+immediate@~3.0.5:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
+  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
+
 immutable@^3.8.2:
   version "3.8.2"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
+  integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=
+
+import-cwd@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
+  integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=
+  dependencies:
+    import-from "^2.1.0"
+
+import-from@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
+  integrity sha1-M1238qev/VOqpHHUuAId7ja387E=
+  dependencies:
+    resolve-from "^3.0.0"
+
+import-lazy@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
+  integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
+
+import-local@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
+  integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
+  dependencies:
+    pkg-dir "^3.0.0"
+    resolve-cwd "^2.0.0"
 
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+
+in-publish@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
+  integrity sha1-4g/146KvwmkDILbcVSaCqcf631E=
 
 indent-string@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
   dependencies:
     repeating "^2.0.0"
 
 indent-string@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
+  integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=
 
 indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
 
 inflection@~1.12.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416"
+  integrity sha1-ogCTVlbW9fa8TcdQLhrstwMihBY=
 
 inflection@~1.3.0:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.3.8.tgz#cbd160da9f75b14c3cc63578d4f396784bf3014e"
+  integrity sha1-y9Fg2p91sUw8xjV41POWeEvzAU4=
 
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+
+inherits@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
-ini@^1.3.2, ini@~1.3.0:
+ini@1.3.5, ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+
+injection-js@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/injection-js/-/injection-js-2.2.1.tgz#a8d6a085b2f0b8d8650f6f4487f6abb8cc0d67ce"
+  integrity sha512-zHI+E+dM0PXix5FFTO1Y4/UOyAzE7zG1l/QwAn4jchTThOoBq+UYRFK4AVG7lQgFL+go62SbrzSsjXy9DFEZUg==
+
+inquirer@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"
+  integrity sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.0"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.0"
+    figures "^2.0.0"
+    lodash "^4.17.10"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rxjs "^6.1.0"
+    string-width "^2.1.0"
+    strip-ansi "^4.0.0"
+    through "^2.3.6"
+
+internal-ip@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-3.0.1.tgz#df5c99876e1d2eb2ea2d74f520e3f669a00ece27"
+  integrity sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==
+  dependencies:
+    default-gateway "^2.6.0"
+    ipaddr.js "^1.5.2"
 
 interpret@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
+  integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
 
 into-stream@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
+  integrity sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=
   dependencies:
     from2 "^2.1.1"
     p-is-promise "^1.1.0"
 
+invariant@^2.2.2:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
+  dependencies:
+    loose-envify "^1.0.0"
+
 invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
+
+invert-kv@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
+  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
+
+ip-regex@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
+  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
 
-ip@^1.1.2, ip@^1.1.5:
+ip@^1.1.0, ip@^1.1.2, ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
+
+ipaddr.js@1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
+  integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
+
+ipaddr.js@^1.5.2:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.1.tgz#fa4b79fa47fd3def5e3b159825161c0a519c9427"
+  integrity sha1-+kt5+kf9Pe9eOxWYJRYcClGclCc=
 
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
   dependencies:
     kind-of "^3.0.2"
 
 is-accessor-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
 is-arrayish@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
+  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
 
 is-binary-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
   dependencies:
     binary-extensions "^1.0.0"
 
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-builtin-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74=
   dependencies:
     builtin-modules "^1.0.0"
 
 is-ci@^1.0.10:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
+  integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==
   dependencies:
     ci-info "^1.5.0"
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
   dependencies:
     kind-of "^3.0.2"
 
 is-data-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
   dependencies:
     is-accessor-descriptor "^0.1.6"
     is-data-descriptor "^0.1.4"
@@ -2699,80 +4843,113 @@ is-descriptor@^0.1.0:
 is-descriptor@^1.0.0, is-descriptor@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
   dependencies:
     is-accessor-descriptor "^1.0.0"
     is-data-descriptor "^1.0.0"
     kind-of "^6.0.2"
 
+is-directory@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
+
 is-dotfile@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
+  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
 
 is-equal-shallow@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
   dependencies:
     is-primitive "^2.0.0"
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
 
 is-extendable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
   dependencies:
     is-plain-object "^2.0.4"
 
 is-extglob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
 
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
 is-finite@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
   dependencies:
     is-extglob "^1.0.0"
 
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
   dependencies:
     is-extglob "^2.1.0"
 
 is-glob@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
+  integrity sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=
   dependencies:
     is-extglob "^2.1.1"
 
+is-installed-globally@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80"
+  integrity sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=
+  dependencies:
+    global-dirs "^0.1.0"
+    is-path-inside "^1.0.0"
+
+is-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
+  integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
+
 is-my-ip-valid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
+  integrity sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==
 
 is-my-json-valid@^2.12.4:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.19.0.tgz#8fd6e40363cd06b963fa877d444bfb5eddc62175"
+  integrity sha512-mG0f/unGX1HZ5ep4uhRaPOS8EkAY8/j6mDRMJrutq4CqhoJWYp7qAlonIPy3TV7p3ju4TK9fo/PbnoksWmsp5Q==
   dependencies:
     generate-function "^2.0.0"
     generate-object-property "^1.1.0"
@@ -2780,125 +4957,289 @@ is-my-json-valid@^2.12.4:
     jsonpointer "^4.0.0"
     xtend "^4.0.0"
 
+is-npm@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
+  integrity sha1-8vtjpl5JBbQGyGBydloaTceTufQ=
+
 is-number@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806"
+  integrity sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=
 
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
   dependencies:
     kind-of "^3.0.2"
 
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
   dependencies:
     kind-of "^3.0.2"
 
 is-number@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
 is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
 
 is-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
+  integrity sha1-iVJojF7C/9awPsyF52ngKQMINHA=
+
+is-path-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
+
+is-path-in-cwd@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
+  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
+  dependencies:
+    is-path-inside "^1.0.0"
+
+is-path-inside@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
+  dependencies:
+    path-is-inside "^1.0.1"
 
 is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
 is-posix-bracket@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
 
 is-primitive@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
+
+is-promise@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+  integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
 
 is-property@^1.0.0, is-property@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
+  integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=
 
-is-retry-allowed@^1.1.0:
+is-redirect@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
+  integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=
+
+is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
+  integrity sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=
 
-is-stream@^1.1.0:
+is-stream@^1.0.0, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
 is-subset@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
+  integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=
 
 is-text-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
+  integrity sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=
   dependencies:
     text-extensions "^1.0.0"
 
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
 is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+
+is-wsl@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
 
-isarray@1.0.0, isarray@~1.0.0:
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
 isarray@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
+  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
 
 isbinaryfile@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
+  integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
   dependencies:
     buffer-alloc "^1.2.0"
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
+
+istanbul-api@^2.0.5:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.0.6.tgz#cd7b33ee678f6c01531d05f5e567ebbcd25f8ecc"
+  integrity sha512-8W5oeAGWXhtTJjAyVfvavOLVyZCTNCKsyF6GON/INKlBdO7uJ/bv3qnPj5M6ERKzmMCJS1kntnjjGuJ86fn3rQ==
+  dependencies:
+    async "^2.6.1"
+    compare-versions "^3.2.1"
+    fileset "^2.0.3"
+    istanbul-lib-coverage "^2.0.1"
+    istanbul-lib-hook "^2.0.1"
+    istanbul-lib-instrument "^3.0.0"
+    istanbul-lib-report "^2.0.2"
+    istanbul-lib-source-maps "^2.0.1"
+    istanbul-reports "^2.0.1"
+    js-yaml "^3.12.0"
+    make-dir "^1.3.0"
+    once "^1.4.0"
+
+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"
+  integrity sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==
+  dependencies:
+    convert-source-map "^1.5.0"
+    istanbul-lib-instrument "^1.7.3"
+    loader-utils "^1.1.0"
+    schema-utils "^0.3.0"
+
+istanbul-lib-coverage@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0"
+  integrity sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==
+
+istanbul-lib-coverage@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#2aee0e073ad8c5f6a0b00e0dfbf52b4667472eda"
+  integrity sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==
+
+istanbul-lib-hook@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.1.tgz#918a57b75a0f951d552a08487ca1fa5336433d72"
+  integrity sha512-ufiZoiJ8CxY577JJWEeFuxXZoMqiKpq/RqZtOAYuQLvlkbJWscq9n3gc4xrCGH9n4pW0qnTxOz1oyMmVtk8E1w==
+  dependencies:
+    append-transform "^1.0.0"
+
+istanbul-lib-instrument@^1.7.3:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz#1f55ed10ac3c47f2bdddd5307935126754d0a9ca"
+  integrity sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==
+  dependencies:
+    babel-generator "^6.18.0"
+    babel-template "^6.16.0"
+    babel-traverse "^6.18.0"
+    babel-types "^6.18.0"
+    babylon "^6.18.0"
+    istanbul-lib-coverage "^1.2.1"
+    semver "^5.3.0"
+
+istanbul-lib-instrument@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.0.0.tgz#b5f066b2a161f75788be17a9d556f40a0cf2afc9"
+  integrity sha512-eQY9vN9elYjdgN9Iv6NS/00bptm02EBBk70lRMaVjeA6QYocQgenVrSgC28TJurdnZa80AGO3ASdFN+w/njGiQ==
+  dependencies:
+    "@babel/generator" "^7.0.0"
+    "@babel/parser" "^7.0.0"
+    "@babel/template" "^7.0.0"
+    "@babel/traverse" "^7.0.0"
+    "@babel/types" "^7.0.0"
+    istanbul-lib-coverage "^2.0.1"
+    semver "^5.5.0"
 
-istanbul@^0.4.5:
+istanbul-lib-report@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.2.tgz#430a2598519113e1da7af274ba861bd42dd97535"
+  integrity sha512-rJ8uR3peeIrwAxoDEbK4dJ7cqqtxBisZKCuwkMtMv0xYzaAnsAi3AHrHPAAtNXzG/bcCgZZ3OJVqm1DTi9ap2Q==
+  dependencies:
+    istanbul-lib-coverage "^2.0.1"
+    make-dir "^1.3.0"
+    supports-color "^5.4.0"
+
+istanbul-lib-source-maps@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-2.0.1.tgz#ce8b45131d8293fdeaa732f4faf1852d13d0a97e"
+  integrity sha512-30l40ySg+gvBLcxTrLzR4Z2XTRj3HgRCA/p2rnbs/3OiTaoj054gAbuP5DcLOtwqmy4XW8qXBHzrmP2/bQ9i3A==
+  dependencies:
+    debug "^3.1.0"
+    istanbul-lib-coverage "^2.0.1"
+    make-dir "^1.3.0"
+    rimraf "^2.6.2"
+    source-map "^0.6.1"
+
+istanbul-reports@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.0.1.tgz#fb8d6ea850701a3984350b977a969e9a556116a7"
+  integrity sha512-CT0QgMBJqs6NJLF678ZHcquUAZIoBIUNzdJrRJfpkI9OnzG6MkUfHxbJC3ln981dMswC7/B1mfX3LNkhgJxsuw==
+  dependencies:
+    handlebars "^4.0.11"
+
+istanbul@0.4.5, istanbul@^0.4.5:
   version "0.4.5"
   resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-0.4.5.tgz#65c7d73d4c4da84d4f3ac310b918fb0b8033733b"
+  integrity sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=
   dependencies:
     abbrev "1.0.x"
     async "1.x"
@@ -2918,43 +5259,82 @@ istanbul@^0.4.5:
 isurl@^1.0.0-alpha5:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
+  integrity sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==
   dependencies:
     has-to-string-tag-x "^1.2.0"
     is-object "^1.0.1"
 
-jasmine-core@2.8.0:
+jasmine-core@2.8.0, jasmine-core@~2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
+  integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
 
 jasmine-core@~2.99.0:
   version "2.99.1"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15"
+  integrity sha1-5kAN8ea1bhMLYcS80JPap/boyhU=
 
 jasmine-spec-reporter@^3.2.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-3.3.0.tgz#c63c3d43bacfd16e6da86c46d265957e0075f14c"
+  integrity sha1-xjw9Q7rP0W5tqGxG0mWVfgB18Uw=
+  dependencies:
+    colors "1.1.2"
+
+jasmine-spec-reporter@~4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz#1d632aec0341670ad324f92ba84b4b32b35e9e22"
+  integrity sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==
   dependencies:
     colors "1.1.2"
 
+jasmine@2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e"
+  integrity sha1-awicChFXax8W3xG4AUbZHU6Lij4=
+  dependencies:
+    exit "^0.1.2"
+    glob "^7.0.6"
+    jasmine-core "~2.8.0"
+
 jasmine@^2.6.0:
   version "2.99.0"
   resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.99.0.tgz#8ca72d102e639b867c6489856e0e18a9c7aa42b7"
+  integrity sha1-jKctEC5jm4Z8ZImFbg4YqceqQrc=
   dependencies:
     exit "^0.1.2"
     glob "^7.0.6"
     jasmine-core "~2.99.0"
 
-js-base64@^2.4.3:
+jasminewd2@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"
+  integrity sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=
+
+jquery@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
+  integrity sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==
+
+js-base64@^2.1.8, js-base64@^2.4.3:
   version "2.4.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03"
+  integrity sha512-xcinL3AuDJk7VSzsHgb9DvvIXayBbadtMZ4HFPx8rUszbW1MuNMlwYVC4zzCZ6e1sqZpnNS5ZFYOhXqA39T7LQ==
+
+"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
-js-yaml@3.x, js-yaml@^3.7.0:
+js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
+  integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -2962,89 +5342,165 @@ js-yaml@3.x, js-yaml@^3.7.0:
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+
+jsesc@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+  integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
+
+jsesc@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
+  integrity sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=
+
+jsesc@~0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
 json-buffer@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
+  integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
 
-json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1:
+json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
 
 json-stringify-safe@5.0.x, json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+
+json3@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
+  integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
+
+json5@^0.5.0:
+  version "0.5.1"
+  resolved "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
+
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
 
 jsonparse@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
+  integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
 
 jsonpointer@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
+  integrity sha1-T9kss04OnbPInIYi7PUfm5eMbLk=
 
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
   dependencies:
     assert-plus "1.0.0"
     extsprintf "1.3.0"
     json-schema "0.2.3"
     verror "1.10.0"
 
-karma-chrome-launcher@2.2.0:
+jszip@^3.1.3:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.1.5.tgz#e3c2a6c6d706ac6e603314036d43cd40beefdf37"
+  integrity sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==
+  dependencies:
+    core-js "~2.3.0"
+    es6-promise "~3.0.2"
+    lie "~3.1.0"
+    pako "~1.0.2"
+    readable-stream "~2.0.6"
+
+karma-chrome-launcher@2.2.0, karma-chrome-launcher@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf"
+  integrity sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==
   dependencies:
     fs-access "^1.0.0"
     which "^1.2.1"
 
+karma-coverage-istanbul-reporter@~2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.4.tgz#402ae4ed6eadb9d9dafbd408ffda17897c0d003a"
+  integrity sha512-xJS7QSQIVU6VK9HuJ/ieE5yynxKhjCCkd96NLY/BX/HXsx0CskU9JJiMQbd4cHALiddMwI4OWh1IIzeWrsavJw==
+  dependencies:
+    istanbul-api "^2.0.5"
+    minimatch "^3.0.4"
+
 karma-firefox-launcher@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/karma-firefox-launcher/-/karma-firefox-launcher-1.1.0.tgz#2c47030452f04531eb7d13d4fc7669630bb93339"
+  integrity sha512-LbZ5/XlIXLeQ3cqnCbYLn+rOVhuMIK9aZwlP6eOLGzWdo1UVp7t6CN3DP4SafiRLjexKwHeKHDm0c38Mtd3VxA==
 
 karma-jasmine-html-reporter@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-0.2.2.tgz#48a8e5ef18807617ee2b5e33c1194c35b439524c"
+  integrity sha1-SKjl7xiAdhfuK14zwRlMNbQ5Ukw=
   dependencies:
     karma-jasmine "^1.0.2"
 
 karma-jasmine@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.1.tgz#6fe840e75a11600c9d91e84b33c458e1c46a3529"
+  integrity sha1-b+hA51oRYAydkehLM8RY4cRqNSk=
 
-karma-jasmine@^1.0.2:
+karma-jasmine@^1.0.2, karma-jasmine@~1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.2.tgz#394f2b25ffb4a644b9ada6f22d443e2fd08886c3"
+  integrity sha1-OU8rJf+0pkS5rabyLUQ+L9CIhsM=
 
 karma-requirejs@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/karma-requirejs/-/karma-requirejs-1.1.0.tgz#fddae2cb87d7ebc16fb0222893564d7fee578798"
+  integrity sha1-/driy4fX68FvsCIok1ZNf+5Xh5g=
 
 karma-sauce-launcher@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/karma-sauce-launcher/-/karma-sauce-launcher-1.2.0.tgz#6f2558ddef3cf56879fa27540c8ae9f8bfd16bca"
+  integrity sha512-lEhtGRGS+3Yw6JSx/vJY9iQyHNtTjcojrSwNzqNUOaDceKDu9dPZqA/kr69bUO9G2T6GKbu8AZgXqy94qo31Jg==
   dependencies:
     q "^1.5.0"
     sauce-connect-launcher "^1.2.2"
     saucelabs "^1.4.0"
     wd "^1.4.0"
 
+karma-source-map-support@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz#36dd4d8ca154b62ace95696236fae37caf0a7dde"
+  integrity sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==
+  dependencies:
+    source-map-support "^0.5.5"
+
 karma-sourcemap-loader@0.3.7:
   version "0.3.7"
   resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz#91322c77f8f13d46fed062b042e1009d4c4505d8"
+  integrity sha1-kTIsd/jxPUb+0GKwQuEAnUxFBdg=
   dependencies:
     graceful-fs "^4.1.2"
 
@@ -3083,6 +5539,7 @@ karma@alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a:
 karma@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/karma/-/karma-3.1.1.tgz#94c8edd20fb9597ccde343326da009737fb0423a"
+  integrity sha512-NetT3wPCQMNB36uiL9LLyhrOt8SQwrEKt0xD3+KpTCfm0VxVyUJdPL5oTq2Ic5ouemgL/Iz4wqXEbF3zea9kQQ==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
@@ -3115,61 +5572,124 @@ karma@~3.1.1:
 keyv@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
+  integrity sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==
   dependencies:
     json-buffer "3.0.0"
 
+killable@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
+  integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
+
 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"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
 
 kuler@1.0.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/kuler/-/kuler-1.0.0.tgz#904ad31c373b781695854d32be33818bf1d60250"
+  integrity sha512-oyy6pu/yWRjiVfCoJebNUKFL061sNtrs9ejKTbirIwY3oiHmENVCSkHhxDV85Dkm7JYR/czMCBeoM87WilTdSg==
   dependencies:
     colornames "^1.1.1"
 
+latest-version@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15"
+  integrity sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=
+  dependencies:
+    package-json "^4.0.0"
+
 lazystream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
+  integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=
   dependencies:
     readable-stream "^2.0.5"
 
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
   dependencies:
     invert-kv "^1.0.0"
 
-levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+lcid@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
+  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
   dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
-libbase64@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/libbase64/-/libbase64-0.1.0.tgz#62351a839563ac5ff5bd26f12f60e9830bb751e6"
+    invert-kv "^2.0.0"
 
-libmime@3.0.0:
+less-loader@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-4.1.0.tgz#2c1352c5b09a4f84101490274fd51674de41363e"
+  integrity sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==
+  dependencies:
+    clone "^2.1.1"
+    loader-utils "^1.1.0"
+    pify "^3.0.0"
+
+less-plugin-npm-import@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/less-plugin-npm-import/-/less-plugin-npm-import-2.1.0.tgz#823e6986c93318a98171ca858848b6bead55bf3e"
+  integrity sha1-gj5phskzGKmBccqFiEi2vq1Vvz4=
+  dependencies:
+    promise "~7.0.1"
+    resolve "~1.1.6"
+
+less@3.8.1, less@^3.8.0:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/less/-/less-3.8.1.tgz#f31758598ef5a1930dd4caefa9e4340641e71e1d"
+  integrity sha512-8HFGuWmL3FhQR0aH89escFNBQH/nEiYPP2ltDFdQw2chE28Yx2E3lhAIq9Y2saYwLSwa699s4dBVEfCY8Drf7Q==
+  dependencies:
+    clone "^2.1.2"
+  optionalDependencies:
+    errno "^0.1.1"
+    graceful-fs "^4.1.2"
+    image-size "~0.5.0"
+    mime "^1.4.1"
+    mkdirp "^0.5.0"
+    promise "^7.1.1"
+    request "^2.83.0"
+    source-map "~0.6.0"
+
+levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
+libbase64@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/libbase64/-/libbase64-0.1.0.tgz#62351a839563ac5ff5bd26f12f60e9830bb751e6"
+  integrity sha1-YjUag5VjrF/1vSbxL2Dpgwu3UeY=
+
+libmime@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/libmime/-/libmime-3.0.0.tgz#51a1a9e7448ecbd32cda54421675bb21bc093da6"
+  integrity sha1-UaGp50SOy9Ms2lRCFnW7IbwJPaY=
   dependencies:
     iconv-lite "0.4.15"
     libbase64 "0.1.0"
@@ -3178,10 +5698,12 @@ libmime@3.0.0:
 libqp@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/libqp/-/libqp-1.1.0.tgz#f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"
+  integrity sha1-9ebgatdLeU+1tbZpiL9yjvHe2+g=
 
 license-checker@^20.1.0:
   version "20.2.0"
   resolved "https://registry.yarnpkg.com/license-checker/-/license-checker-20.2.0.tgz#edb2605fd714514ed16e7eeee5b88a41900241d2"
+  integrity sha512-bseotvz8lfzEY7siilsJhQd2K/z+IF9aeJ+ZscieyZ70S6Ql2iJdVp1IfnL6gkdU4ny5JctT5Y2lFCQerSCfGA==
   dependencies:
     chalk "^2.4.1"
     debug "^3.1.0"
@@ -3195,9 +5717,24 @@ license-checker@^20.1.0:
     strip-ansi "^4.0.0"
     treeify "^1.1.0"
 
+license-webpack-plugin@2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.0.2.tgz#9d34b521cb7fca8527945310b05be6ef0248b687"
+  integrity sha512-GsomZw5VoT20ST8qH2tOjBgbyhn6Pgs9M94g0mbvfBIV1VXufm1iKY+4dbgfTObj1Mp6nSRE3Zf74deOZr0KwA==
+  dependencies:
+    webpack-sources "^1.2.0"
+
+lie@~3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
+  integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=
+  dependencies:
+    immediate "~3.0.5"
+
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -3208,6 +5745,7 @@ load-json-file@^1.0.0:
 load-json-file@^2.0.0:
   version "2.0.0"
   resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -3217,30 +5755,77 @@ load-json-file@^2.0.0:
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^4.0.0"
     pify "^3.0.0"
     strip-bom "^3.0.0"
 
+loader-runner@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.1.tgz#026f12fe7c3115992896ac02ba022ba92971b979"
+  integrity sha512-By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw==
+
+loader-utils@1.1.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
+  integrity sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=
+  dependencies:
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
   dependencies:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
+locate-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
+  dependencies:
+    p-locate "^3.0.0"
+    path-exists "^3.0.0"
+
 lodash._reinterpolate@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
+
+lodash.assign@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
+  integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
+
+lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
+
+lodash.mergewith@^4.6.0:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
+  integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==
+
+lodash.tail@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
+  integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=
 
 lodash.template@^4.0.2:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
+  integrity sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=
   dependencies:
     lodash._reinterpolate "~3.0.0"
     lodash.templatesettings "^4.0.0"
@@ -3248,20 +5833,24 @@ lodash.template@^4.0.2:
 lodash.templatesettings@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
+  integrity sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
 lodash@4.17.10, lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.5.0:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+  integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==
 
-lodash@^4.15.0, lodash@^4.16.6, lodash@^4.8.0:
+lodash@^4.15.0, lodash@^4.16.6, lodash@^4.17.5, lodash@^4.8.0, lodash@~4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
 log4js@^2.3.9:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-2.11.0.tgz#bf3902eff65c6923d9ce9cfbd2db54160e34005a"
+  integrity sha512-z1XdwyGFg8/WGkOyF6DPJjivCWNLKrklGdViywdYnSKOvgtEBo2UyEMZS5sD2mZrQlU3TvO8wDWLc8mzE1ncBQ==
   dependencies:
     circular-json "^0.5.4"
     date-format "^1.2.0"
@@ -3281,6 +5870,7 @@ log4js@^2.3.9:
 log4js@^3.0.0:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.6.tgz#e6caced94967eeeb9ce399f9f8682a4b2b28c8ff"
+  integrity sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==
   dependencies:
     circular-json "^0.5.5"
     date-format "^1.2.0"
@@ -3291,6 +5881,7 @@ log4js@^3.0.0:
 logform@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/logform/-/logform-1.9.1.tgz#58b29d7b11c332456d7a217e17b48a13ad69d60a"
+  integrity sha512-ZHrZE8VSf7K3xKxJiQ1aoTBp2yK+cEbFcgarsjzI3nt3nE/3O0heNSppoOQMUJVMZo/xiVwCxiXIabaZApsKNQ==
   dependencies:
     colors "^1.2.1"
     fast-safe-stringify "^2.0.4"
@@ -3301,18 +5892,33 @@ logform@^1.9.1:
 loggly@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/loggly/-/loggly-1.1.1.tgz#0a0fc1d3fa3a5ec44fdc7b897beba2a4695cebee"
+  integrity sha1-Cg/B0/o6XsRP3HuJe+uipGlc6+4=
   dependencies:
     json-stringify-safe "5.0.x"
     request "2.75.x"
     timespan "2.3.x"
 
+loglevel@^1.4.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
+  integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
+
 long@~3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
+  integrity sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=
+
+loose-envify@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
+  dependencies:
+    js-tokens "^3.0.0 || ^4.0.0"
 
 loud-rejection@^1.0.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
   dependencies:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
@@ -3320,18 +5926,22 @@ loud-rejection@^1.0.0:
 lowercase-keys@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
+  integrity sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=
 
 lowercase-keys@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
+  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
 
 lru-cache@2.2.x:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d"
+  integrity sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=
 
-lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
+lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
+  integrity sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==
   dependencies:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
@@ -3339,18 +5949,28 @@ lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
 magic-string@^0.22.4:
   version "0.22.5"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
+  integrity sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==
   dependencies:
     vlq "^0.2.2"
 
 magic-string@^0.25.0:
   version "0.25.0"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.0.tgz#1f3696f9931ff0a1ed4c132250529e19cad6759b"
+  integrity sha512-Msbwa9oNYNPjwVh9ury5X2BHbTFWoirTlzuf4X+pIoSOQVKNRJHXTx1WmKYuXzRM4QZFv8dGXyZvhDMmWhGLPw==
+  dependencies:
+    sourcemap-codec "^1.4.1"
+
+magic-string@^0.25.1:
+  version "0.25.1"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.1.tgz#b1c248b399cd7485da0fe7385c2fc7011843266e"
+  integrity sha512-sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg==
   dependencies:
     sourcemap-codec "^1.4.1"
 
 mailcomposer@4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/mailcomposer/-/mailcomposer-4.0.1.tgz#0e1c44b2a07cf740ee17dc149ba009f19cadfeb4"
+  integrity sha1-DhxEsqB890DuF9wUm6AJ8Zyt/rQ=
   dependencies:
     buildmail "4.0.1"
     libmime "3.0.0"
@@ -3358,6 +5978,7 @@ mailcomposer@4.0.1:
 mailgun-js@^0.18.0:
   version "0.18.1"
   resolved "https://registry.yarnpkg.com/mailgun-js/-/mailgun-js-0.18.1.tgz#ee39aa18d7bb598a5ce9ede84afb681defc8a6b0"
+  integrity sha512-lvuMP14u24HS2uBsJEnzSyPMxzU2b99tQsIx1o6QNjqxjk8b3WvR+vq5oG1mjqz/IBYo+5gF+uSoDS0RkMVHmg==
   dependencies:
     async "~2.6.0"
     debug "~3.1.0"
@@ -3369,13 +5990,22 @@ mailgun-js@^0.18.0:
     proxy-agent "~3.0.0"
     tsscmp "~1.0.0"
 
+make-dir@^1.0.0, make-dir@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
+  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
+  dependencies:
+    pify "^3.0.0"
+
 make-error@^1.1.1:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
+  integrity sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==
 
 make-fetch-happen@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz#141497cb878f243ba93136c83d8aba12c216c083"
+  integrity sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==
   dependencies:
     agentkeepalive "^3.4.1"
     cacache "^11.0.1"
@@ -3389,41 +6019,87 @@ make-fetch-happen@^4.0.1:
     socks-proxy-agent "^4.0.0"
     ssri "^6.0.0"
 
+map-age-cleaner@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz#098fb15538fd3dbe461f12745b0ca8568d4e3f74"
+  integrity sha512-UN1dNocxQq44IhJyMI4TU8phc2m9BddacHRPRjKGLYaF0jqd3xLz0jS0skpAU9WgYyoR4gHtUpzytNBS385FWQ==
+  dependencies:
+    p-defer "^1.0.0"
+
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
 map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
 
 map-obj@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
+  integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk=
 
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
   dependencies:
     object-visit "^1.0.0"
 
+material-design-icons@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/material-design-icons/-/material-design-icons-3.0.1.tgz#9a71c48747218ebca51e51a66da682038cdcb7bf"
+  integrity sha1-mnHEh0chjrylHlGmbaaCA4zct78=
+
 math-random@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
+  integrity sha1-izqsWIuKZuSXXjzepn97sylgH6w=
+
+md5.js@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
+  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
 
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
 mem@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
+  integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
+  dependencies:
+    mimic-fn "^1.0.0"
+
+mem@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf"
+  integrity sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==
   dependencies:
+    map-age-cleaner "^0.1.1"
     mimic-fn "^1.0.0"
+    p-is-promise "^1.1.0"
 
-meow@^3.3.0:
+memory-fs@^0.4.0, memory-fs@~0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+meow@^3.3.0, meow@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
   dependencies:
     camelcase-keys "^2.0.0"
     decamelize "^1.1.2"
@@ -3439,6 +6115,7 @@ meow@^3.3.0:
 meow@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/meow/-/meow-4.0.1.tgz#d48598f6f4b1472f35bf6317a95945ace347f975"
+  integrity sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==
   dependencies:
     camelcase-keys "^4.0.0"
     decamelize-keys "^1.0.0"
@@ -3450,15 +6127,27 @@ meow@^4.0.0:
     redent "^2.0.0"
     trim-newlines "^2.0.0"
 
+merge-descriptors@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
+
 merge-source-map@1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz#a5de46538dae84d4114cc5ea02b4772a6346701f"
+  integrity sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=
   dependencies:
     source-map "^0.5.6"
 
-micromatch@^2.1.5:
+methods@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
+
+micromatch@^2.1.5, micromatch@^2.3.11:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
   dependencies:
     arr-diff "^2.0.0"
     array-unique "^0.2.1"
@@ -3474,9 +6163,10 @@ micromatch@^2.1.5:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
-micromatch@^3.1.4:
+micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -3492,51 +6182,93 @@ micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-mime-db@~1.36.0:
-  version "1.36.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
+miller-rabin@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
+  dependencies:
+    bn.js "^4.0.0"
+    brorand "^1.0.1"
 
-mime-db@~1.37.0:
+"mime-db@>= 1.36.0 < 2", mime-db@~1.37.0:
   version "1.37.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
+  integrity sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==
+
+mime-db@~1.36.0:
+  version "1.36.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
+  integrity sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==
 
 mime-types@^2.1.11, mime-types@~2.1.7:
   version "2.1.21"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
+  integrity sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==
   dependencies:
     mime-db "~1.37.0"
 
 mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
   version "2.1.20"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
+  integrity sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==
   dependencies:
     mime-db "~1.36.0"
 
-mime@^1.3.4:
+mime@1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
+  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
+
+mime@^1.3.4, mime@^1.4.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mime@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
+  integrity sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==
 
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
 mimic-response@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
+  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
+
+mini-css-extract-plugin@0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.4.tgz#c10410a004951bd3cedac1da69053940fccb625d"
+  integrity sha512-o+Jm+ocb0asEngdM6FsZWtZsRzA8koFUudIDwYUfl94M3PejPHG7Vopw5hN9V8WsMkSFpm3tZP3Fesz89EyrfQ==
+  dependencies:
+    loader-utils "^1.1.0"
+    schema-utils "^1.0.0"
+    webpack-sources "^1.1.0"
+
+minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
+
+minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-"minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.4:
+"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
 minimist-options@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
+  integrity sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==
   dependencies:
     arrify "^1.0.1"
     is-plain-obj "^1.1.0"
@@ -3544,18 +6276,22 @@ minimist-options@^3.0.1:
 minimist@0.0.8:
   version "0.0.8"
   resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@^1.1.3, minimist@^1.2.0:
+minimist@1.2.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
 minimist@~0.0.1:
   version "0.0.10"
   resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
 minipass@^2.2.1, minipass@^2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
+  integrity sha512-mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==
   dependencies:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
@@ -3563,6 +6299,7 @@ minipass@^2.2.1, minipass@^2.3.3:
 minipass@^2.3.5:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
+  integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
   dependencies:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
@@ -3570,12 +6307,30 @@ minipass@^2.3.5:
 minizlib@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
+  integrity sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==
   dependencies:
     minipass "^2.2.1"
 
+mississippi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
+  integrity sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==
+  dependencies:
+    concat-stream "^1.5.0"
+    duplexify "^3.4.2"
+    end-of-stream "^1.1.0"
+    flush-write-stream "^1.0.0"
+    from2 "^2.1.0"
+    parallel-transform "^1.1.0"
+    pump "^2.0.1"
+    pumpify "^1.3.3"
+    stream-each "^1.1.0"
+    through2 "^2.0.0"
+
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
   dependencies:
     concat-stream "^1.5.0"
     duplexify "^3.4.2"
@@ -3591,23 +6346,35 @@ mississippi@^3.0.0:
 mixin-deep@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1:
+mixin-object@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
+  integrity sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=
+  dependencies:
+    for-in "^0.1.3"
+    is-extendable "^0.1.1"
+
+mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
   version "0.5.1"
   resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
 
 modify-values@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
+  integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
   dependencies:
     aproba "^1.1.1"
     copy-concurrently "^1.0.0"
@@ -3619,18 +6386,45 @@ move-concurrently@^1.0.1:
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
 ms@^2.0.0, ms@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+
+multicast-dns-service-types@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
+  integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=
+
+multicast-dns@^6.0.1:
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
+  integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==
+  dependencies:
+    dns-packet "^1.3.1"
+    thunky "^1.0.2"
+
+mute-stream@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
+
+nan@^2.10.0:
+  version "2.11.1"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766"
+  integrity sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==
 
 nan@^2.9.2:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.0.tgz#574e360e4d954ab16966ec102c0c049fd961a099"
+  integrity sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -3647,6 +6441,7 @@ nanomatch@^1.2.9:
 needle@^2.2.1:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.3.tgz#c1b04da378cd634d8befe2de965dc2cfb0fd65ca"
+  integrity sha512-GPL22d/U9cai87FcCPO6e+MT3vyHS2j+zwotakDc7kE2DtUAqFKMXLJCTtRp+5S75vXIwQPvIxkvlctxf9q4gQ==
   dependencies:
     debug "^2.1.2"
     iconv-lite "^0.4.4"
@@ -3655,14 +6450,60 @@ needle@^2.2.1:
 negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
+  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
+
+neo-async@^2.5.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
+  integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
 
 netmask@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35"
+  integrity sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU=
+
+ng-packagr@^4.2.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-4.4.0.tgz#b868a829b5743870c6392491de3faf4e4cec6f4d"
+  integrity sha512-dLpC/kmQsdbkL96ZclGjNRhq/J4MwpPKwPYNom74lvXqFC2jbbT/fnwmxX9WKXjvE8MEGsg2D2x8MsRURiNscg==
+  dependencies:
+    "@ngtools/json-schema" "^1.1.0"
+    autoprefixer "^9.0.0"
+    browserslist "^4.0.0"
+    chalk "^2.3.1"
+    chokidar "^2.0.3"
+    clean-css "^4.1.11"
+    commander "^2.12.0"
+    fs-extra "^7.0.0"
+    glob "^7.1.2"
+    injection-js "^2.2.1"
+    less "^3.8.0"
+    less-plugin-npm-import "^2.1.0"
+    node-sass "^4.9.3"
+    node-sass-tilde-importer "^1.0.0"
+    postcss "^7.0.0"
+    postcss-url "^8.0.0"
+    read-pkg-up "^4.0.0"
+    rimraf "^2.6.1"
+    rollup "^0.66.0"
+    rollup-plugin-commonjs "^9.1.3"
+    rollup-plugin-json "^3.1.0"
+    rollup-plugin-node-resolve "^3.0.0"
+    rollup-plugin-sourcemaps "^0.4.2"
+    rxjs "^6.0.0"
+    stylus "^0.54.5"
+    uglify-js "^3.0.7"
+    update-notifier "^2.3.0"
+
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 node-fetch-npm@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7"
+  integrity sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==
   dependencies:
     encoding "^0.1.11"
     json-parse-better-errors "^1.0.0"
@@ -3671,10 +6512,64 @@ node-fetch-npm@^2.0.2:
 node-fetch@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.2.0.tgz#4ee79bde909262f9775f731e3656d0db55ced5b5"
+  integrity sha512-OayFWziIxiHY8bCUyLX6sTpDH8Jsbp4FfYd1j1f7vZyfgkcOnAyM4oQR16f8a0s7Gl/viMGRey8eScYk4V4EZA==
+
+node-forge@0.7.5:
+  version "0.7.5"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
+  integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==
+
+node-gyp@^3.8.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
+  integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
+  dependencies:
+    fstream "^1.0.0"
+    glob "^7.0.3"
+    graceful-fs "^4.1.2"
+    mkdirp "^0.5.0"
+    nopt "2 || 3"
+    npmlog "0 || 1 || 2 || 3 || 4"
+    osenv "0"
+    request "^2.87.0"
+    rimraf "2"
+    semver "~5.3.0"
+    tar "^2.0.0"
+    which "1"
+
+node-libs-browser@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
+  integrity sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==
+  dependencies:
+    assert "^1.1.1"
+    browserify-zlib "^0.2.0"
+    buffer "^4.3.0"
+    console-browserify "^1.1.0"
+    constants-browserify "^1.0.0"
+    crypto-browserify "^3.11.0"
+    domain-browser "^1.1.1"
+    events "^1.0.0"
+    https-browserify "^1.0.0"
+    os-browserify "^0.3.0"
+    path-browserify "0.0.0"
+    process "^0.11.10"
+    punycode "^1.2.4"
+    querystring-es3 "^0.2.0"
+    readable-stream "^2.3.3"
+    stream-browserify "^2.0.1"
+    stream-http "^2.7.2"
+    string_decoder "^1.0.0"
+    timers-browserify "^2.0.4"
+    tty-browserify "0.0.0"
+    url "^0.11.0"
+    util "^0.10.3"
+    vm-browserify "0.0.4"
 
 node-pre-gyp@^0.10.0:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
+  integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==
   dependencies:
     detect-libc "^1.0.2"
     mkdirp "^0.5.1"
@@ -3687,13 +6582,79 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
+node-releases@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.2.tgz#27c296d9fca3b659c64f7d43ea47a31ad2a90e4b"
+  integrity sha512-zP8Asfg13lG9KDAW85rylSxXBYvaSdtjMIYKHUk8c1fM8drmFwRqbSYKYD+UlNVPUvrceSvgLUKHMOWR5jPWQg==
+  dependencies:
+    semver "^5.3.0"
+
+node-sass-tilde-importer@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz#1a15105c153f648323b4347693fdb0f331bad1ce"
+  integrity sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==
+  dependencies:
+    find-parent-dir "^0.3.0"
+
+node-sass@4.10.0:
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.10.0.tgz#dcc2b364c0913630945ccbf7a2bbf1f926effca4"
+  integrity sha512-fDQJfXszw6vek63Fe/ldkYXmRYK/QS6NbvM3i5oEo9ntPDy4XX7BcKZyTKv+/kSSxRtXXc7l+MSwEmYc0CSy6Q==
+  dependencies:
+    async-foreach "^0.1.3"
+    chalk "^1.1.1"
+    cross-spawn "^3.0.0"
+    gaze "^1.0.0"
+    get-stdin "^4.0.1"
+    glob "^7.0.3"
+    in-publish "^2.0.0"
+    lodash.assign "^4.2.0"
+    lodash.clonedeep "^4.3.2"
+    lodash.mergewith "^4.6.0"
+    meow "^3.7.0"
+    mkdirp "^0.5.1"
+    nan "^2.10.0"
+    node-gyp "^3.8.0"
+    npmlog "^4.0.0"
+    request "^2.88.0"
+    sass-graph "^2.2.4"
+    stdout-stream "^1.4.0"
+    "true-case-path" "^1.0.2"
+
+node-sass@^4.9.3:
+  version "4.9.4"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.4.tgz#349bd7f1c89422ffe7e1e4b60f2055a69fbc5512"
+  integrity sha512-MXyurANsUoE4/6KmfMkwGcBzAnJQ5xJBGW7Ei6ea8KnUKuzHr/SguVBIi3uaUAHtZCPUYkvlJ3Ef5T5VAwVpaA==
+  dependencies:
+    async-foreach "^0.1.3"
+    chalk "^1.1.1"
+    cross-spawn "^3.0.0"
+    gaze "^1.0.0"
+    get-stdin "^4.0.1"
+    glob "^7.0.3"
+    in-publish "^2.0.0"
+    lodash.assign "^4.2.0"
+    lodash.clonedeep "^4.3.2"
+    lodash.mergewith "^4.6.0"
+    meow "^3.7.0"
+    mkdirp "^0.5.1"
+    nan "^2.10.0"
+    node-gyp "^3.8.0"
+    npmlog "^4.0.0"
+    request "^2.88.0"
+    sass-graph "^2.2.4"
+    stdout-stream "^1.4.0"
+    "true-case-path" "^1.0.2"
+
 node-uuid@~1.4.7:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
+  integrity sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=
 
 nodemailer-direct-transport@3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/nodemailer-direct-transport/-/nodemailer-direct-transport-3.3.2.tgz#e96fafb90358560947e569017d97e60738a50a86"
+  integrity sha1-6W+vuQNYVglH5WkBfZfmBzilCoY=
   dependencies:
     nodemailer-shared "1.1.0"
     smtp-connection "2.12.0"
@@ -3701,16 +6662,19 @@ nodemailer-direct-transport@3.3.2:
 nodemailer-fetch@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz#79c4908a1c0f5f375b73fe888da9828f6dc963a4"
+  integrity sha1-ecSQihwPXzdbc/6IjamCj23JY6Q=
 
 nodemailer-shared@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz#cf5994e2fd268d00f5cf0fa767a08169edb07ec0"
+  integrity sha1-z1mU4v0mjQD1zw+nZ6CBae2wfsA=
   dependencies:
     nodemailer-fetch "1.6.0"
 
 nodemailer-smtp-pool@2.8.2:
   version "2.8.2"
   resolved "https://registry.yarnpkg.com/nodemailer-smtp-pool/-/nodemailer-smtp-pool-2.8.2.tgz#2eb94d6cf85780b1b4725ce853b9cbd5e8da8c72"
+  integrity sha1-LrlNbPhXgLG0clzoU7nL1ejajHI=
   dependencies:
     nodemailer-shared "1.1.0"
     nodemailer-wellknown "0.1.10"
@@ -3719,6 +6683,7 @@ nodemailer-smtp-pool@2.8.2:
 nodemailer-smtp-transport@2.7.2:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/nodemailer-smtp-transport/-/nodemailer-smtp-transport-2.7.2.tgz#03d71c76314f14ac7dbc7bf033a6a6d16d67fb77"
+  integrity sha1-A9ccdjFPFKx9vHvwM6am0W1n+3c=
   dependencies:
     nodemailer-shared "1.1.0"
     nodemailer-wellknown "0.1.10"
@@ -3727,10 +6692,12 @@ nodemailer-smtp-transport@2.7.2:
 nodemailer-wellknown@0.1.10:
   version "0.1.10"
   resolved "https://registry.yarnpkg.com/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz#586db8101db30cb4438eb546737a41aad0cf13d5"
+  integrity sha1-WG24EB2zDLRDjrVGc3pBqtDPE9U=
 
 nodemailer@^2.5.0:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-2.7.2.tgz#f242e649aeeae39b6c7ed740ef7b061c404d30f9"
+  integrity sha1-8kLmSa7q45tsftdA73sGHEBNMPk=
   dependencies:
     libmime "3.0.0"
     mailcomposer "4.0.1"
@@ -3740,15 +6707,17 @@ nodemailer@^2.5.0:
     nodemailer-smtp-transport "2.7.2"
     socks "1.1.9"
 
-nopt@3.x:
+"nopt@2 || 3", nopt@3.x:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
   dependencies:
     abbrev "1"
 
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
   dependencies:
     abbrev "1"
     osenv "^0.1.4"
@@ -3756,6 +6725,7 @@ nopt@^4.0.1:
 normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, "normalize-package-data@~1.0.1 || ^2.0.0":
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
+  integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==
   dependencies:
     hosted-git-info "^2.1.4"
     is-builtin-module "^1.0.0"
@@ -3765,16 +6735,24 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-
 normalize-path@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
+  integrity sha1-MtDkcvkf80VwHBWoMRAY07CpA3k=
 
 normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
   dependencies:
     remove-trailing-separator "^1.0.1"
 
+normalize-range@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
+
 normalize-url@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
+  integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==
   dependencies:
     prepend-http "^2.0.0"
     query-string "^5.0.1"
@@ -3783,10 +6761,12 @@ normalize-url@2.0.1:
 npm-bundled@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
+  integrity sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==
 
 "npm-package-arg@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
+  integrity sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==
   dependencies:
     hosted-git-info "^2.6.0"
     osenv "^0.1.5"
@@ -3796,6 +6776,7 @@ npm-bundled@^1.0.1:
 npm-packlist@^1.1.12:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a"
+  integrity sha512-WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
@@ -3803,13 +6784,15 @@ npm-packlist@^1.1.12:
 npm-packlist@^1.1.6:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de"
+  integrity sha512-CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
-npm-pick-manifest@^2.2.3:
+npm-pick-manifest@^2.1.0, npm-pick-manifest@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40"
+  integrity sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==
   dependencies:
     figgy-pudding "^3.5.1"
     npm-package-arg "^6.0.0"
@@ -3818,6 +6801,7 @@ npm-pick-manifest@^2.2.3:
 npm-registry-client@8.6.0:
   version "8.6.0"
   resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-8.6.0.tgz#7f1529f91450732e89f8518e0f21459deea3e4c4"
+  integrity sha512-Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg==
   dependencies:
     concat-stream "^1.5.2"
     graceful-fs "^4.1.6"
@@ -3836,6 +6820,7 @@ npm-registry-client@8.6.0:
 npm-registry-fetch@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-3.8.0.tgz#aa7d9a7c92aff94f48dba0984bdef4bd131c88cc"
+  integrity sha512-hrw8UMD+Nob3Kl3h8Z/YjmKamb1gf7D1ZZch2otrIXM3uFLB5vjEY6DhMlq80z/zZet6eETLbOXcuQudCB3Zpw==
   dependencies:
     JSONStream "^1.3.4"
     bluebird "^3.5.1"
@@ -3847,12 +6832,14 @@ npm-registry-fetch@^3.8.0:
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
   dependencies:
     path-key "^2.0.0"
 
-"npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.2:
+"npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.0, npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
   dependencies:
     are-we-there-yet "~1.1.2"
     console-control-strings "~1.1.0"
@@ -3862,30 +6849,42 @@ npm-run-path@^2.0.0:
 null-check@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd"
+  integrity sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=
+
+num2fraction@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
 
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
 oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
 
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
 object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
 object-component@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
+  integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=
 
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
   dependencies:
     copy-descriptor "^0.1.0"
     define-property "^0.2.5"
@@ -3894,20 +6893,24 @@ object-copy@^0.1.0:
 object-inspect@~1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4"
+  integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==
 
 object-keys@^1.0.6:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
+  integrity sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==
 
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
   dependencies:
     isobject "^3.0.0"
 
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
   dependencies:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
@@ -3915,28 +6918,64 @@ object.omit@^2.0.0:
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
   dependencies:
     isobject "^3.0.1"
 
+obuf@^1.0.0, obuf@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
+  integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
+
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
   dependencies:
     ee-first "1.1.1"
 
+on-headers@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
+  integrity sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=
+
 once@1.x, once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
 one-time@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz#f8cdf77884826fe4dff93e3a9cc37b1e4480742e"
+  integrity sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=
+
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
+  dependencies:
+    mimic-fn "^1.0.0"
+
+opn@5.3.0:
+  version "5.3.0"
+  resolved "http://registry.npmjs.org/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
+  integrity sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==
+  dependencies:
+    is-wsl "^1.1.0"
 
-optimist@^0.6.1:
+opn@^5.1.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
+  integrity sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==
+  dependencies:
+    is-wsl "^1.1.0"
+
+optimist@^0.6.1, optimist@~0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
   dependencies:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
@@ -3944,6 +6983,7 @@ optimist@^0.6.1:
 optionator@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
   dependencies:
     deep-is "~0.1.3"
     fast-levenshtein "~2.0.4"
@@ -3955,32 +6995,59 @@ optionator@^0.8.1:
 optjs@~3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/optjs/-/optjs-3.2.2.tgz#69a6ce89c442a44403141ad2f9b370bd5bb6f4ee"
+  integrity sha1-aabOicRCpEQDFBrS+bNwvVu29O4=
+
+original@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
+  integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
+  dependencies:
+    url-parse "^1.4.3"
+
+os-browserify@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
 os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
 os-locale@^1.4.0:
   version "1.4.0"
   resolved "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
   dependencies:
     lcid "^1.0.0"
 
 os-locale@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
+  integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==
   dependencies:
     execa "^0.7.0"
     lcid "^1.0.0"
     mem "^1.1.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
+os-locale@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.0.1.tgz#3b014fbf01d87f60a1e5348d80fe870dc82c4620"
+  integrity sha512-7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==
+  dependencies:
+    execa "^0.10.0"
+    lcid "^2.0.0"
+    mem "^4.0.0"
+
+os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@^0.1.4, osenv@^0.1.5:
+osenv@0, osenv@^0.1.4, osenv@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
@@ -3988,40 +7055,77 @@ osenv@^0.1.4, osenv@^0.1.5:
 p-cancelable@^0.4.0:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"
+  integrity sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==
+
+p-defer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
 
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
 p-is-promise@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
+  integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
 
-p-limit@^1.1.0:
+p-limit@^1.0.0, p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
   dependencies:
     p-try "^1.0.0"
 
+p-limit@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
+  integrity sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==
+  dependencies:
+    p-try "^2.0.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
   dependencies:
     p-limit "^1.1.0"
 
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
+  dependencies:
+    p-limit "^2.0.0"
+
+p-map@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
+
 p-timeout@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
+  integrity sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==
   dependencies:
     p-finally "^1.0.0"
 
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
+
+p-try@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
+  integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
 
 pac-proxy-agent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz#11d578b72a164ad74bf9d5bac9ff462a38282432"
+  integrity sha512-AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q==
   dependencies:
     agent-base "^4.2.0"
     debug "^3.1.0"
@@ -4035,6 +7139,7 @@ pac-proxy-agent@^3.0.0:
 pac-resolver@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-3.0.0.tgz#6aea30787db0a891704deb7800a722a7615a6f26"
+  integrity sha512-tcc38bsjuE3XZ5+4vP96OfhOugrX+JcnpUbhfuc4LuXBLQhoTthOstZeoQJBDnQUDYzYmdImKsbz0xSl1/9qeA==
   dependencies:
     co "^4.6.0"
     degenerator "^1.0.4"
@@ -4042,9 +7147,53 @@ pac-resolver@^3.0.0:
     netmask "^1.0.6"
     thunkify "^2.1.2"
 
+package-json@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
+  integrity sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=
+  dependencies:
+    got "^6.7.1"
+    registry-auth-token "^3.0.1"
+    registry-url "^3.0.3"
+    semver "^5.1.0"
+
+pacote@9.1.1:
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.1.1.tgz#25091f75a25021de8be8d34cc6408728fca3579b"
+  integrity sha512-f28Rq5ozzKAA9YwIKw61/ipwAatUZseYmVssDbHHaexF0wRIVotapVEZPAjOT7Eu3LYVqEp0NVpNizoAnYBUaA==
+  dependencies:
+    bluebird "^3.5.2"
+    cacache "^11.2.0"
+    figgy-pudding "^3.5.1"
+    get-stream "^4.1.0"
+    glob "^7.1.3"
+    lru-cache "^4.1.3"
+    make-fetch-happen "^4.0.1"
+    minimatch "^3.0.4"
+    minipass "^2.3.5"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    normalize-package-data "^2.4.0"
+    npm-package-arg "^6.1.0"
+    npm-packlist "^1.1.12"
+    npm-pick-manifest "^2.1.0"
+    npm-registry-fetch "^3.8.0"
+    osenv "^0.1.5"
+    promise-inflight "^1.0.1"
+    promise-retry "^1.1.1"
+    protoduck "^5.0.1"
+    rimraf "^2.6.2"
+    safe-buffer "^5.1.2"
+    semver "^5.6.0"
+    ssri "^6.0.1"
+    tar "^4.4.6"
+    unique-filename "^1.1.1"
+    which "^1.3.1"
+
 pacote@^9.2.3:
   version "9.2.3"
   resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.2.3.tgz#48cfe87beb9177acd6594355a584a538835424b3"
+  integrity sha512-Y3+yY3nBRAxMlZWvr62XLJxOwCmG9UmkGZkFurWHoCjqF0cZL72cTOCRJTvWw8T4OhJS2RTg13x4oYYriauvEw==
   dependencies:
     bluebird "^3.5.2"
     cacache "^11.2.0"
@@ -4077,26 +7226,42 @@ pacote@^9.2.3:
 pako@^0.2.5:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
+  integrity sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=
 
-pako@^1.0.6:
+pako@^1.0.6, pako@~1.0.2, pako@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
+  integrity sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==
 
 parallel-transform@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
+  integrity sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=
   dependencies:
     cyclist "~0.2.2"
     inherits "^2.0.3"
     readable-stream "^2.1.5"
 
+parse-asn1@^5.0.0:
+  version "5.1.1"
+  resolved "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
+  integrity sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==
+  dependencies:
+    asn1.js "^4.0.0"
+    browserify-aes "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.0"
+    pbkdf2 "^3.0.3"
+
 parse-github-repo-url@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"
+  integrity sha1-nn2LslKmy2ukJZUGC3v23z28H1A=
 
 parse-glob@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
   dependencies:
     glob-base "^0.3.0"
     is-dotfile "^1.0.0"
@@ -4106,75 +7271,130 @@ parse-glob@^3.0.4:
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
   dependencies:
     error-ex "^1.2.0"
 
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
   dependencies:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
+parse5-html-rewriting-stream@5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-5.1.0.tgz#63f92c958764aea8cbe3aa68f2e5895c32068ab8"
+  integrity sha512-hZlaOTHJs4dpC5yFHnOSEMh26ErsqTsLzxKqkuRcUqtiu0kMsBQ9pkgANkECDyoBUhJ3+hvb2DPLsyqbtcS61Q==
+  dependencies:
+    parse5 "^5.1.0"
+    parse5-sax-parser "^5.1.0"
+
+parse5-sax-parser@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/parse5-sax-parser/-/parse5-sax-parser-5.1.0.tgz#ec234d23223a8054a74ff173aa3dc2da74c5bbd9"
+  integrity sha512-VEhdEDhBkoSILPmsZ96SoIIUow3hZbtgQsqXw7r8DxxnqsCIO0fwkT9mWgBcf9SPjVUh92liuEprHrrYzXBPWQ==
+  dependencies:
+    parse5 "^5.1.0"
+
+parse5@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
+  integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
+
+parse5@^5.0.0, parse5@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2"
+  integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==
+
 parseqs@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
+  integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=
   dependencies:
     better-assert "~1.0.0"
 
 parser-toolkit@>=0.0.3:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parser-toolkit/-/parser-toolkit-0.0.5.tgz#ec4b61729c86318b56ea971bfba6b3c672d62c01"
+  integrity sha1-7EthcpyGMYtW6pcb+6azxnLWLAE=
 
 parseuri@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
+  integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=
   dependencies:
     better-assert "~1.0.0"
 
 parseurl@~1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
+  integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
 
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
+
+path-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
+  integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=
 
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
 path-exists@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
   dependencies:
     pinkie-promise "^2.0.0"
 
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+path-is-inside@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
 
-path-key@^2.0.0:
+path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
 path-parse@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
 path-proxy@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/path-proxy/-/path-proxy-1.0.0.tgz#18e8a36859fc9d2f1a53b48dee138543c020de5e"
+  integrity sha1-GOijaFn8nS8aU7SN7hOFQ8Ag3l4=
   dependencies:
     inflection "~1.3.0"
 
+path-to-regexp@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
+
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
   dependencies:
     graceful-fs "^4.1.2"
     pify "^2.0.0"
@@ -4183,95 +7403,240 @@ path-type@^1.0.0:
 path-type@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
+  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
   dependencies:
     pify "^2.0.0"
 
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
   dependencies:
     pify "^3.0.0"
 
+pbkdf2@^3.0.3:
+  version "3.0.17"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
+  integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==
+  dependencies:
+    create-hash "^1.1.2"
+    create-hmac "^1.1.4"
+    ripemd160 "^2.0.1"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
 pidtree@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.0.tgz#f6fada10fccc9f99bf50e90d0b23d72c9ebc2e6b"
+  integrity sha512-9CT4NFlDcosssyg8KVFltgokyKZIFjoBxw8CTGy+5F38Y1eQWrt8tRayiUOXE+zVKQnYu5BR8JjCtvK3BcnBhg==
 
 pidusage@^2.0.17:
   version "2.0.17"
   resolved "https://registry.yarnpkg.com/pidusage/-/pidusage-2.0.17.tgz#6b4a2b4a09026f0e9828f7e5627837e4c0672581"
+  integrity sha512-N8X5v18rBmlBoArfS83vrnD0gIFyZkXEo7a5pAS2aT0i2OLVymFb2AzVg+v8l/QcXnE1JwZcaXR8daJcoJqtjw==
   dependencies:
     safe-buffer "^5.1.2"
 
 pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
 
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+
+pkg-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
+  dependencies:
+    find-up "^2.1.0"
+
+pkg-dir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
+  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
+  dependencies:
+    find-up "^3.0.0"
 
 pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
+  integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==
+
+popper.js@^1.14.1:
+  version "1.14.4"
+  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.4.tgz#8eec1d8ff02a5a3a152dd43414a15c7b79fd69b6"
+  integrity sha1-juwdj/AqWjoVLdQ0FKFce3n9abY=
+
+portfinder@1.0.17:
+  version "1.0.17"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.17.tgz#a8a1691143e46c4735edefcf4fbcccedad26456a"
+  integrity sha512-syFcRIRzVI1BoEFOCaAiizwDolh1S1YXSodsVhncbhjzjZQulhczNRbqnUl9N31Q4dKGOXsNDqxC2BWBgSMqeQ==
+  dependencies:
+    async "^1.5.2"
+    debug "^2.2.0"
+    mkdirp "0.5.x"
+
+portfinder@^1.0.9:
+  version "1.0.19"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.19.tgz#07e87914a55242dcda5b833d42f018d6875b595f"
+  integrity sha512-23aeQKW9KgHe6citUrG3r9HjeX6vls0h713TAa+CwTKZwNIr/pD2ApaxYF4Um3ZZyq4ar+Siv3+fhoHaIwSOSw==
+  dependencies:
+    async "^1.5.2"
+    debug "^2.2.0"
+    mkdirp "0.5.x"
 
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
+
+postcss-import@12.0.0:
+  version "12.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.0.tgz#149f96a4ef0b27525c419784be8517ebd17e92c5"
+  integrity sha512-3KqKRZcaZAvxbY8DVLdd81tG5uKzbUQuiWIvy0o0fzEC42bKacqPYFWbfCQyw6L4LWUaqPz/idvIdbhpgQ32eQ==
+  dependencies:
+    postcss "^7.0.1"
+    postcss-value-parser "^3.2.3"
+    read-cache "^1.0.0"
+    resolve "^1.1.7"
+
+postcss-load-config@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.0.0.tgz#f1312ddbf5912cd747177083c5ef7a19d62ee484"
+  integrity sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==
+  dependencies:
+    cosmiconfig "^4.0.0"
+    import-cwd "^2.0.0"
+
+postcss-loader@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d"
+  integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==
+  dependencies:
+    loader-utils "^1.1.0"
+    postcss "^7.0.0"
+    postcss-load-config "^2.0.0"
+    schema-utils "^1.0.0"
+
+postcss-url@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-8.0.0.tgz#7b10059bd12929cdbb1971c60f61a0e5af86b4ca"
+  integrity sha512-E2cbOQ5aii2zNHh8F6fk1cxls7QVFZjLPSrqvmiza8OuXLzIpErij8BDS5Y3STPfJgpIMNCPEr8JlKQWEoozUw==
+  dependencies:
+    mime "^2.3.1"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.0"
+    postcss "^7.0.2"
+    xxhashjs "^0.2.1"
+
+postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
+  integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
+
+postcss@7.0.5, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.5.tgz#70e6443e36a6d520b0fd4e7593fcca3635ee9f55"
+  integrity sha512-HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ==
+  dependencies:
+    chalk "^2.4.1"
+    source-map "^0.6.1"
+    supports-color "^5.5.0"
 
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+
+prepend-http@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
+  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
 
 prepend-http@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
+  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
 
 preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
 process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+  integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
 
 process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
+
+process@^0.11.10:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
 promise-retry@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
+  integrity sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=
   dependencies:
     err-code "^1.0.0"
     retry "^0.10.0"
 
+promise@^7.1.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
+  dependencies:
+    asap "~2.0.3"
+
+promise@~7.0.1:
+  version "7.0.4"
+  resolved "http://registry.npmjs.org/promise/-/promise-7.0.4.tgz#363e84a4c36c8356b890fed62c91ce85d02ed539"
+  integrity sha1-Nj6EpMNsg1a4kP7WLJHOhdAu1Tk=
+  dependencies:
+    asap "~2.0.3"
+
 promisify-call@^2.0.2:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/promisify-call/-/promisify-call-2.0.4.tgz#d48c2d45652ccccd52801ddecbd533a6d4bd5fba"
+  integrity sha1-1IwtRWUszM1SgB3ey9UzptS9X7o=
   dependencies:
     with-callback "^1.0.2"
 
 protobufjs@5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.3.tgz#e4dfe9fb67c90b2630d15868249bcc4961467a17"
+  integrity sha512-55Kcx1MhPZX0zTbVosMQEO5R6/rikNXd9b6RQK4KSPcrSIIwoXTtebIczUrXlwaSrbz4x8XUVThGPob1n8I4QA==
   dependencies:
     ascli "~1"
     bytebuffer "~5"
@@ -4281,12 +7646,44 @@ protobufjs@5.0.3:
 protoduck@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f"
+  integrity sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==
   dependencies:
     genfun "^5.0.0"
 
+protractor@~5.4.0:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/protractor/-/protractor-5.4.1.tgz#011a99e38df7aa45d22455b889ffbb13a6ce0bd9"
+  integrity sha512-ORey5ewQMYiXQxcQohsqEiKYOg/r5yJoJbt0tuROmmgajdg/CA3gTOZNIFJncUVMAJIk5YFqBBLUjKVmQO6tfA==
+  dependencies:
+    "@types/node" "^6.0.46"
+    "@types/q" "^0.0.32"
+    "@types/selenium-webdriver" "^3.0.0"
+    blocking-proxy "^1.0.0"
+    browserstack "^1.5.1"
+    chalk "^1.1.3"
+    glob "^7.0.3"
+    jasmine "2.8.0"
+    jasminewd2 "^2.1.0"
+    optimist "~0.6.0"
+    q "1.4.1"
+    saucelabs "^1.5.0"
+    selenium-webdriver "3.6.0"
+    source-map-support "~0.4.0"
+    webdriver-js-extender "2.1.0"
+    webdriver-manager "^12.0.6"
+
+proxy-addr@~2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
+  integrity sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==
+  dependencies:
+    forwarded "~0.1.2"
+    ipaddr.js "1.8.0"
+
 proxy-agent@~3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-3.0.3.tgz#1c1a33db60ef5f2e9e35b876fd63c2bc681c611d"
+  integrity sha512-PXVVVuH9tiQuxQltFJVSnXWuDtNr+8aNBP6XVDDCDiUuDN8eRCm+ii4/mFWmXWEA0w8jjJSlePa4LXlM4jIzNA==
   dependencies:
     agent-base "^4.2.0"
     debug "^3.1.0"
@@ -4300,18 +7697,39 @@ proxy-agent@~3.0.0:
 proxy-from-env@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
+  integrity sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=
+
+prr@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
 pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
 psl@^1.1.24:
   version "1.1.29"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
+  integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==
+
+public-encrypt@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
+  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
+  dependencies:
+    bn.js "^4.1.0"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    parse-asn1 "^5.0.0"
+    randombytes "^2.0.1"
+    safe-buffer "^5.1.2"
 
-pump@^2.0.0:
+pump@^2.0.0, pump@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
@@ -4319,6 +7737,7 @@ pump@^2.0.0:
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
@@ -4326,54 +7745,85 @@ pump@^3.0.0:
 pumpify@^1.3.3:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
   dependencies:
     duplexify "^3.6.0"
     inherits "^2.0.3"
     pump "^2.0.0"
 
-punycode@1.4.1, punycode@^1.4.1:
+punycode@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
+
+punycode@1.4.1, punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
 punycode@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 q@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
+  integrity sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=
 
 q@^1.4.1, q@^1.5.0, q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
 qjobs@^1.1.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
+  integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
 
 qs@6.5.2, qs@~6.5.1, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
 qs@~6.2.0:
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"
+  integrity sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=
 
 query-string@^5.0.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
+  integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==
   dependencies:
     decode-uri-component "^0.2.0"
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
+querystring-es3@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
+
+querystring@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
+
+querystringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.0.tgz#7ded8dfbf7879dcc60d0a644ac6754b283ad17ef"
+  integrity sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==
+
 quick-lru@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
+  integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=
 
 quicktype-core@^5.0.41:
   version "5.0.41"
   resolved "https://registry.yarnpkg.com/quicktype-core/-/quicktype-core-5.0.41.tgz#83f090b1bddeefcff0581e0d9c754d83410ed453"
+  integrity sha512-CImdVo4M4TlDs0McPSql9HnaoG5/Z3w1bQIlAhc95qekxBx+jJ2HNIqXzEkIsvx7W7sIPZhOuCug9fvmqNkMKQ==
   dependencies:
     "@types/urijs" "github:quicktype/types-urijs"
     collection-utils "0.0.15"
@@ -4389,6 +7839,7 @@ quicktype-core@^5.0.41:
 quote-stream@^1.0.1, quote-stream@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/quote-stream/-/quote-stream-1.0.2.tgz#84963f8c9c26b942e153feeb53aae74652b7e0b2"
+  integrity sha1-hJY/jJwmuULhU/7rU6rnRlK34LI=
   dependencies:
     buffer-equal "0.0.1"
     minimist "^1.1.3"
@@ -4397,36 +7848,68 @@ quote-stream@^1.0.1, quote-stream@~1.0.2:
 randomatic@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.0.tgz#36f2ca708e9e567f5ed2ec01949026d50aa10116"
+  integrity sha512-KnGPVE0lo2WoXxIZ7cPR8YBpiol4gsSuOwDSg410oHh80ZMp5EiypNqL2K4Z77vJn6lB5rap7IkAmcUlalcnBQ==
   dependencies:
     is-number "^4.0.0"
     kind-of "^6.0.0"
     math-random "^1.0.1"
 
-range-parser@^1.2.0:
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
+  integrity sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==
+  dependencies:
+    safe-buffer "^5.1.0"
+
+randomfill@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
+  dependencies:
+    randombytes "^2.0.5"
+    safe-buffer "^5.1.0"
+
+range-parser@^1.0.3, range-parser@^1.2.0, range-parser@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
+  integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
 raw-body@2.3.3, raw-body@^2.2.0:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
+  integrity sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==
   dependencies:
     bytes "3.0.0"
     http-errors "1.6.3"
     iconv-lite "0.4.23"
     unpipe "1.0.0"
 
-rc@^1.2.7:
+raw-loader@0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
+  integrity sha1-DD0L6u2KAclm2Xh793goElKpeao=
+
+rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
   dependencies:
     deep-extend "^0.6.0"
     ini "~1.3.0"
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
+read-cache@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
+  integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=
+  dependencies:
+    pify "^2.3.0"
+
 read-installed@~4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/read-installed/-/read-installed-4.0.3.tgz#ff9b8b67f187d1e4c29b9feb31f6b223acd19067"
+  integrity sha1-/5uLZ/GH0eTCm5/rMfayI6zRkGc=
   dependencies:
     debuglog "^1.0.1"
     read-package-json "^2.0.0"
@@ -4440,6 +7923,7 @@ read-installed@~4.0.3:
 read-package-json@^2.0.0:
   version "2.0.13"
   resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a"
+  integrity sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==
   dependencies:
     glob "^7.1.1"
     json-parse-better-errors "^1.0.1"
@@ -4451,6 +7935,7 @@ read-package-json@^2.0.0:
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
   dependencies:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
@@ -4458,6 +7943,7 @@ read-pkg-up@^1.0.1:
 read-pkg-up@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
+  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
   dependencies:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
@@ -4465,13 +7951,23 @@ read-pkg-up@^2.0.0:
 read-pkg-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
+  integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=
   dependencies:
     find-up "^2.0.0"
     read-pkg "^3.0.0"
 
+read-pkg-up@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
+  integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==
+  dependencies:
+    find-up "^3.0.0"
+    read-pkg "^3.0.0"
+
 read-pkg@^1.0.0, read-pkg@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
   dependencies:
     load-json-file "^1.0.0"
     normalize-package-data "^2.3.2"
@@ -4480,6 +7976,7 @@ read-pkg@^1.0.0, read-pkg@^1.1.0:
 read-pkg@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
+  integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
   dependencies:
     load-json-file "^2.0.0"
     normalize-package-data "^2.3.2"
@@ -4488,14 +7985,16 @@ read-pkg@^2.0.0:
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
+  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
   dependencies:
     load-json-file "^4.0.0"
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.0, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.3:
+"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.0, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.3:
   version "2.3.6"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -4508,15 +8007,17 @@ read-pkg@^3.0.0:
 readable-stream@1.1.x, "readable-stream@1.x >=1.1.9":
   version "1.1.14"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@~2.0.5:
+readable-stream@~2.0.5, readable-stream@~2.0.6:
   version "2.0.6"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
+  integrity sha1-j5A0HmilPMySh4jaz80Rs265t44=
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -4528,6 +8029,7 @@ readable-stream@~2.0.5:
 readdir-scoped-modules@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
+  integrity sha1-n6+jfShr5dksuuve4DDcm19AZ0c=
   dependencies:
     debuglog "^1.0.1"
     dezalgo "^1.0.0"
@@ -4537,6 +8039,7 @@ readdir-scoped-modules@^1.0.0:
 readdirp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
+  integrity sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=
   dependencies:
     graceful-fs "^4.1.2"
     minimatch "^3.0.2"
@@ -4546,12 +8049,14 @@ readdirp@^2.0.0:
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
   dependencies:
     resolve "^1.1.6"
 
 redent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
   dependencies:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
@@ -4559,6 +8064,7 @@ redent@^1.0.0:
 redent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
+  integrity sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=
   dependencies:
     indent-string "^3.0.0"
     strip-indent "^2.0.0"
@@ -4566,14 +8072,17 @@ redent@^2.0.0:
 redis-commands@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.4.0.tgz#52f9cf99153efcce56a8f86af986bd04e988602f"
+  integrity sha512-cu8EF+MtkwI4DLIT0x9P8qNTLFhQD4jLfxLR0cCNkeGzs87FN6879JOJwNQR/1zD7aSYNbU0hgsV9zGY71Itvw==
 
 redis-parser@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-2.6.0.tgz#52ed09dacac108f1a631c07e9b69941e7a19504b"
+  integrity sha1-Uu0J2srBCPGmMcB+m2mUHnoZUEs=
 
 redis@^2.7.1:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/redis/-/redis-2.8.0.tgz#202288e3f58c49f6079d97af7a10e1303ae14b02"
+  integrity sha512-M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A==
   dependencies:
     double-ended-queue "^2.1.0-0"
     redis-commands "^1.2.0"
@@ -4582,45 +8091,100 @@ redis@^2.7.1:
 reflect-metadata@^0.1.2:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.12.tgz#311bf0c6b63cd782f228a81abe146a2bfa9c56f2"
+  integrity sha512-n+IyV+nGz3+0q3/Yf1ra12KpCyi001bi4XFxSjbiWWjfqb52iTTtpGXmCCAOWWIAn9KEuFZKGqBERHmrtScZ3A==
+
+regenerate@^1.2.1:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
+  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
+
+regenerator-runtime@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
 regex-cache@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
+  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
   dependencies:
     is-equal-shallow "^0.1.3"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
   dependencies:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
+regexpu-core@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
+  integrity sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=
+  dependencies:
+    regenerate "^1.2.1"
+    regjsgen "^0.2.0"
+    regjsparser "^0.1.4"
+
+registry-auth-token@^3.0.1:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
+  integrity sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==
+  dependencies:
+    rc "^1.1.6"
+    safe-buffer "^5.0.1"
+
+registry-url@^3.0.3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
+  integrity sha1-PU74cPc93h138M+aOBQyRE4XSUI=
+  dependencies:
+    rc "^1.0.1"
+
+regjsgen@^0.2.0:
+  version "0.2.0"
+  resolved "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+  integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
+
+regjsparser@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+  integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=
+  dependencies:
+    jsesc "~0.5.0"
+
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
 repeat-element@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
 repeat-string@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae"
+  integrity sha1-x6jTI2BoNiBZp+RlH8aITosftK4=
 
 repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
 repeating@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
   dependencies:
     is-finite "^1.0.0"
 
 request@2.75.x:
   version "2.75.0"
   resolved "http://registry.npmjs.org/request/-/request-2.75.0.tgz#d2b8268a286da13eaa5d01adf5d18cc90f657d93"
+  integrity sha1-0rgmiihtoT6qXQGt9dGMyQ9lfZM=
   dependencies:
     aws-sign2 "~0.6.0"
     aws4 "^1.2.1"
@@ -4647,6 +8211,7 @@ request@2.75.x:
 request@2.85.0:
   version "2.85.0"
   resolved "http://registry.npmjs.org/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
+  integrity sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.6.0"
@@ -4671,9 +8236,10 @@ request@2.85.0:
     tunnel-agent "^0.6.0"
     uuid "^3.1.0"
 
-request@^2.0.0, request@^2.74.0:
+request@^2.0.0, request@^2.74.0, request@^2.83.0, request@^2.87.0, request@^2.88.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -4699,6 +8265,7 @@ request@^2.0.0, request@^2.74.0:
 requestretry@^1.2.2:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/requestretry/-/requestretry-1.13.0.tgz#213ec1006eeb750e8b8ce54176283d15a8d55d94"
+  integrity sha512-Lmh9qMvnQXADGAQxsXHP4rbgO6pffCfuR8XUBdP9aitJcLQJxhp7YZK4xAVYXnPJ5E52mwrfiKQtKonPL8xsmg==
   dependencies:
     extend "^3.0.0"
     lodash "^4.15.0"
@@ -4708,90 +8275,221 @@ requestretry@^1.2.2:
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
+require-from-string@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
 
 requirejs@2.3.5:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.5.tgz#617b9acbbcb336540ef4914d790323a8d4b861b0"
+  integrity sha512-svnO+aNcR/an9Dpi44C7KSAy5fFGLtmPbaaCeQaklUz8BQhS64tWWIIlvEA5jrWICzlO/X9KSzSeXFnZdBu8nw==
 
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
+
+resolve-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
+  dependencies:
+    resolve-from "^3.0.0"
+
+resolve-from@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
 
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@1.1.x:
+resolve@1.1.x, resolve@~1.1.6:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.1.5, resolve@^1.1.6, resolve@^1.3.2:
+resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
+  integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==
   dependencies:
     path-parse "^1.0.5"
 
 responselike@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
+  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
   dependencies:
     lowercase-keys "^1.0.0"
 
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
+  dependencies:
+    onetime "^2.0.0"
+    signal-exit "^3.0.2"
+
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
 retry@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
+  integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
 
 rfdc@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.2.tgz#e6e72d74f5dc39de8f538f65e00c36c18018e349"
+  integrity sha512-92ktAgvZhBzYTIK0Mja9uen5q5J3NRVMoDkJL2VMwq6SXjVCgqvQeVP2XAaUY6HT+XpQYeLSjb3UoitBryKmdA==
 
-rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
   dependencies:
     glob "^7.0.5"
 
 rimraf@~2.2.6:
   version "2.2.8"
   resolved "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
+  integrity sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=
+
+ripemd160@^2.0.0, ripemd160@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+
+rollup-plugin-commonjs@^9.1.3:
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.2.0.tgz#4604e25069e0c78a09e08faa95dc32dec27f7c89"
+  integrity sha512-0RM5U4Vd6iHjL6rLvr3lKBwnPsaVml+qxOGaaNUWN1lSq6S33KhITOfHmvxV3z2vy9Mk4t0g4rNlVaJJsNQPWA==
+  dependencies:
+    estree-walker "^0.5.2"
+    magic-string "^0.25.1"
+    resolve "^1.8.1"
+    rollup-pluginutils "^2.3.3"
+
+rollup-plugin-json@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-json/-/rollup-plugin-json-3.1.0.tgz#7c1daf60c46bc21021ea016bd00863561a03321b"
+  integrity sha512-BlYk5VspvGpjz7lAwArVzBXR60JK+4EKtPkCHouAWg39obk9S61hZYJDBfMK+oitPdoe11i69TlxKlMQNFC/Uw==
+  dependencies:
+    rollup-pluginutils "^2.3.1"
+
+rollup-plugin-node-resolve@^3.0.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.4.0.tgz#908585eda12e393caac7498715a01e08606abc89"
+  integrity sha512-PJcd85dxfSBWih84ozRtBkB731OjXk0KnzN0oGp7WOWcarAFkVa71cV5hTJg2qpVsV2U8EUwrzHP3tvy9vS3qg==
+  dependencies:
+    builtin-modules "^2.0.0"
+    is-module "^1.0.0"
+    resolve "^1.1.6"
+
+rollup-plugin-sourcemaps@^0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.4.2.tgz#62125aa94087aadf7b83ef4dfaf629b473135e87"
+  integrity sha1-YhJaqUCHqt97g+9N+vYptHMTXoc=
+  dependencies:
+    rollup-pluginutils "^2.0.1"
+    source-map-resolve "^0.5.0"
+
+rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.3.tgz#3aad9b1eb3e7fe8262820818840bf091e5ae6794"
+  integrity sha512-2XZwja7b6P5q4RZ5FhyX1+f46xi1Z3qBKigLRZ6VTZjwbN0K1IFGMlwm06Uu0Emcre2Z63l77nq/pzn+KxIEoA==
+  dependencies:
+    estree-walker "^0.5.2"
+    micromatch "^2.3.11"
+
+rollup@^0.66.0:
+  version "0.66.6"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.66.6.tgz#ce7d6185beb7acea644ce220c25e71ae03275482"
+  integrity sha512-J7/SWanrcb83vfIHqa8+aVVGzy457GcjA6GVZEnD0x2u4OnOd0Q1pCrEoNe8yLwM6z6LZP02zBT2uW0yh5TqOw==
+  dependencies:
+    "@types/estree" "0.0.39"
+    "@types/node" "*"
+
+run-async@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+  integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
+  dependencies:
+    is-promise "^2.1.0"
 
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
   dependencies:
     aproba "^1.1.1"
 
-rxjs@~6.3.0:
+rxjs@6.3.3, rxjs@^6.0.0, rxjs@^6.1.0, rxjs@~6.3.0:
   version "6.3.3"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
+  integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
   dependencies:
     ret "~0.1.10"
 
 "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+sass-graph@^2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
+  integrity sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=
+  dependencies:
+    glob "^7.0.0"
+    lodash "^4.0.0"
+    scss-tokenizer "^0.2.3"
+    yargs "^7.0.0"
+
+sass-loader@7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.1.0.tgz#16fd5138cb8b424bf8a759528a1972d72aad069d"
+  integrity sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==
+  dependencies:
+    clone-deep "^2.0.1"
+    loader-utils "^1.0.1"
+    lodash.tail "^4.1.1"
+    neo-async "^2.5.0"
+    pify "^3.0.0"
+    semver "^5.5.0"
 
 sauce-connect-launcher@^1.2.2:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sauce-connect-launcher/-/sauce-connect-launcher-1.2.4.tgz#8d38f85242a9fbede1b2303b559f7e20c5609a1c"
+  integrity sha512-X2vfwulR6brUGiicXKxPm1GJ7dBEeP1II450Uv4bHGrcGOapZNgzJvn9aioea5IC5BPp/7qjKdE3xbbTBIVXMA==
   dependencies:
     adm-zip "~0.4.3"
     async "^2.1.2"
@@ -4799,35 +8497,179 @@ sauce-connect-launcher@^1.2.2:
     lodash "^4.16.6"
     rimraf "^2.5.4"
 
-saucelabs@^1.4.0:
+saucelabs@^1.4.0, saucelabs@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-1.5.0.tgz#9405a73c360d449b232839919a86c396d379fd9d"
+  integrity sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==
   dependencies:
     https-proxy-agent "^2.2.1"
 
-sax@^1.2.4:
+sax@0.5.x:
+  version "0.5.8"
+  resolved "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
+  integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=
+
+sax@>=0.6.0, sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
+schema-utils@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
+  integrity sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=
+  dependencies:
+    ajv "^5.0.0"
+
+schema-utils@^0.4.4, schema-utils@^0.4.5:
+  version "0.4.7"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
+  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
+  dependencies:
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+
+schema-utils@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
+  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
+  dependencies:
+    ajv "^6.1.0"
+    ajv-errors "^1.0.0"
+    ajv-keywords "^3.1.0"
 
-"semver@2 >=2.2.1 || 3.x || 4 || 5", semver@^5.4.1, semver@^5.6.0:
+scss-tokenizer@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
+  integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE=
+  dependencies:
+    js-base64 "^2.1.8"
+    source-map "^0.4.2"
+
+seedrandom@^2.4.4:
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-2.4.4.tgz#b25ea98632c73e45f58b77cfaa931678df01f9ba"
+  integrity sha512-9A+PDmgm+2du77B5i0Ip2cxOqqHjgNxnBgglxLcX78A2D6c2rTo61z4jnVABpF4cKeDMDG+cmXXvdnqse2VqMA==
+
+select-hose@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
+  integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
+
+selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz#2ba87a1662c020b8988c981ae62cb2a01298eafc"
+  integrity sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==
+  dependencies:
+    jszip "^3.1.3"
+    rimraf "^2.5.4"
+    tmp "0.0.30"
+    xml2js "^0.4.17"
+
+selfsigned@^1.9.1:
+  version "1.10.4"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
+  integrity sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==
+  dependencies:
+    node-forge "0.7.5"
+
+semver-diff@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
+  integrity sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=
+  dependencies:
+    semver "^5.0.3"
+
+semver-dsl@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/semver-dsl/-/semver-dsl-1.0.1.tgz#d3678de5555e8a61f629eed025366ae5f27340a0"
+  integrity sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=
+  dependencies:
+    semver "^5.3.0"
+
+semver-intersect@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/semver-intersect/-/semver-intersect-1.4.0.tgz#bdd9c06bedcdd2fedb8cd352c3c43ee8c61321f3"
+  integrity sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==
+  dependencies:
+    semver "^5.0.0"
+
+"semver@2 >=2.2.1 || 3.x || 4 || 5", semver@^5.0.0, semver@^5.0.3, semver@^5.1.0, semver@^5.4.1, semver@^5.6.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0:
+"semver@2 || 3 || 4 || 5", semver@5.5.1, semver@^5.3.0, semver@^5.5.0:
   version "5.5.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
+  integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
+
+semver@~5.3.0:
+  version "5.3.0"
+  resolved "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+  integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
+
+send@0.16.2:
+  version "0.16.2"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
+  integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
+  dependencies:
+    debug "2.6.9"
+    depd "~1.1.2"
+    destroy "~1.0.4"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "~1.6.2"
+    mime "1.4.1"
+    ms "2.0.0"
+    on-finished "~2.3.0"
+    range-parser "~1.2.0"
+    statuses "~1.4.0"
+
+serialize-javascript@^1.4.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
+  integrity sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==
+
+serve-index@^1.7.2:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
+  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
+  dependencies:
+    accepts "~1.3.4"
+    batch "0.6.1"
+    debug "2.6.9"
+    escape-html "~1.0.3"
+    http-errors "~1.6.2"
+    mime-types "~2.1.17"
+    parseurl "~1.3.2"
+
+serve-static@1.13.2:
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
+  integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.2"
+    send "0.16.2"
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
 set-immediate-shim@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
 
 set-value@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -4837,73 +8679,109 @@ set-value@^0.4.3:
 set-value@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
     is-plain-object "^2.0.3"
     split-string "^3.0.1"
 
-setprototypeof@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+setimmediate@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
+
+setprototypeof@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
+
+sha.js@^2.4.0, sha.js@^2.4.8:
+  version "2.4.11"
+  resolved "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.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"
+  integrity sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==
+  dependencies:
+    is-extendable "^0.1.1"
+    kind-of "^5.0.0"
+    mixin-object "^2.0.1"
 
 shallow-copy@~0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz#415f42702d73d810330292cc5ee86eae1a11a170"
+  integrity sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=
 
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
   dependencies:
     shebang-regex "^1.0.0"
 
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
 shelljs@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.2.tgz#345b7df7763f4c2340d584abb532c5f752ca9e35"
+  integrity sha512-pRXeNrCA2Wd9itwhvLp5LZQvPJ0wU6bcjaTMywHHGX5XWhVN2nzSu7WV0q+oUY7mGK3mgSkDDzP3MgjqdyIgbQ==
   dependencies:
     glob "^7.0.0"
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
-signal-exit@^3.0.0:
+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"
+  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
 simple-swizzle@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
+  integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=
   dependencies:
     is-arrayish "^0.3.1"
 
 slack-node@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/slack-node/-/slack-node-0.2.0.tgz#de4b8dddaa8b793f61dbd2938104fdabf37dfa30"
+  integrity sha1-3kuN3aqLeT9h29KTgQT9q/N9+jA=
   dependencies:
     requestretry "^1.2.2"
 
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
 slide@^1.1.3, slide@~1.1.3:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
+  integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=
 
 smart-buffer@^1.0.4:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-1.1.15.tgz#7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"
+  integrity sha1-fxFLW2X6s+KjWqd1uxLw0cZJvxY=
 
 smart-buffer@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.1.tgz#07ea1ca8d4db24eb4cac86537d7d18995221ace3"
+  integrity sha512-RFqinRVJVcCAL9Uh1oVqE6FZkqsyLiVOYEZ20TqIOjuX7iFVJ+zsbs4RIghnw/pTs7mZvt8ZHhvm1ZUrR4fykg==
 
 smtp-connection@2.12.0:
   version "2.12.0"
   resolved "https://registry.yarnpkg.com/smtp-connection/-/smtp-connection-2.12.0.tgz#d76ef9127cb23c2259edb1e8349c2e8d5e2d74c1"
+  integrity sha1-1275EnyyPCJZ7bHoNJwujV4tdME=
   dependencies:
     httpntlm "1.6.1"
     nodemailer-shared "1.1.0"
@@ -4911,6 +8789,7 @@ smtp-connection@2.12.0:
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
   dependencies:
     define-property "^1.0.0"
     isobject "^3.0.0"
@@ -4919,12 +8798,14 @@ snapdragon-node@^2.0.1:
 snapdragon-util@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
   dependencies:
     kind-of "^3.2.0"
 
 snapdragon@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
   dependencies:
     base "^0.11.1"
     debug "^2.2.0"
@@ -4938,22 +8819,26 @@ snapdragon@^0.8.1:
 sntp@1.x.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
+  integrity sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=
   dependencies:
     hoek "2.x.x"
 
 sntp@2.x.x:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
+  integrity sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==
   dependencies:
     hoek "4.x.x"
 
 socket.io-adapter@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b"
+  integrity sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=
 
 socket.io-client@2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.0.4.tgz#0918a552406dc5e540b380dcd97afc4a64332f8e"
+  integrity sha1-CRilUkBtxeVAs4Dc2Xr8SmQzL44=
   dependencies:
     backo2 "1.0.2"
     base64-arraybuffer "0.1.5"
@@ -4972,6 +8857,7 @@ socket.io-client@2.0.4:
 socket.io-client@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.1.tgz#dcb38103436ab4578ddb026638ae2f21b623671f"
+  integrity sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==
   dependencies:
     backo2 "1.0.2"
     base64-arraybuffer "0.1.5"
@@ -4991,6 +8877,7 @@ socket.io-client@2.1.1:
 socket.io-parser@~3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.1.3.tgz#ed2da5ee79f10955036e3da413bfd7f1e4d86c8e"
+  integrity sha512-g0a2HPqLguqAczs3dMECuA1RgoGFPyvDqcbaDEdCWY9g59kdUAz3YRmaJBNKXflrHNwB7Q12Gkf/0CZXfdHR7g==
   dependencies:
     component-emitter "1.2.1"
     debug "~3.1.0"
@@ -5000,6 +8887,7 @@ socket.io-parser@~3.1.1:
 socket.io-parser@~3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz#e7c6228b6aa1f814e6148aea325b51aa9499e077"
+  integrity sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==
   dependencies:
     component-emitter "1.2.1"
     debug "~3.1.0"
@@ -5008,6 +8896,7 @@ socket.io-parser@~3.2.0:
 socket.io@2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.0.4.tgz#c1a4590ceff87ecf13c72652f046f716b29e6014"
+  integrity sha1-waRZDO/4fs8TxyZS8Eb3FrKeYBQ=
   dependencies:
     debug "~2.6.6"
     engine.io "~3.1.0"
@@ -5018,6 +8907,7 @@ socket.io@2.0.4:
 socket.io@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz#a069c5feabee3e6b214a75b40ce0652e1cfb9980"
+  integrity sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==
   dependencies:
     debug "~3.1.0"
     engine.io "~3.2.0"
@@ -5026,9 +8916,30 @@ socket.io@2.1.1:
     socket.io-client "2.1.1"
     socket.io-parser "~3.2.0"
 
+sockjs-client@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz#12fc9d6cb663da5739d3dc5fb6e8687da95cb177"
+  integrity sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==
+  dependencies:
+    debug "^3.2.5"
+    eventsource "^1.0.7"
+    faye-websocket "~0.11.1"
+    inherits "^2.0.3"
+    json3 "^3.3.2"
+    url-parse "^1.4.3"
+
+sockjs@0.3.19:
+  version "0.3.19"
+  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d"
+  integrity sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==
+  dependencies:
+    faye-websocket "^0.10.0"
+    uuid "^3.0.1"
+
 socks-proxy-agent@^4.0.0, socks-proxy-agent@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz#5936bf8b707a993079c6f37db2091821bffa6473"
+  integrity sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==
   dependencies:
     agent-base "~4.2.0"
     socks "~2.2.0"
@@ -5036,6 +8947,7 @@ socks-proxy-agent@^4.0.0, socks-proxy-agent@^4.0.1:
 socks@1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/socks/-/socks-1.1.9.tgz#628d7e4d04912435445ac0b6e459376cb3e6d691"
+  integrity sha1-Yo1+TQSRJDVEWsC25Fk3bLPm1pE=
   dependencies:
     ip "^1.1.2"
     smart-buffer "^1.0.4"
@@ -5043,6 +8955,7 @@ socks@1.1.9:
 socks@~2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/socks/-/socks-2.2.1.tgz#68ad678b3642fbc5d99c64c165bc561eab0215f9"
+  integrity sha512-0GabKw7n9mI46vcNrVfs0o6XzWzjVa3h6GaSo2UPxtWAROXUWavfJWh1M4PR5tnE0dcnQXZIDFP4yrAysLze/w==
   dependencies:
     ip "^1.1.5"
     smart-buffer "^4.0.1"
@@ -5050,12 +8963,32 @@ socks@~2.2.0:
 sort-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
+  integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=
   dependencies:
     is-plain-obj "^1.0.0"
 
+source-list-map@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
+  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
+
+source-list-map@~0.1.7:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
+  integrity sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=
+
+source-map-loader@0.2.4:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.4.tgz#c18b0dc6e23bf66f6792437557c569a11e072271"
+  integrity sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==
+  dependencies:
+    async "^2.5.0"
+    loader-utils "^1.1.0"
+
 source-map-resolve@^0.5.0:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
   dependencies:
     atob "^2.1.1"
     decode-uri-component "^0.2.0"
@@ -5063,38 +8996,76 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@0.5.9, source-map-support@^0.5.0, source-map-support@^0.5.3:
+source-map-support@0.5.9, source-map-support@^0.5.0, source-map-support@^0.5.3, source-map-support@^0.5.5, source-map-support@~0.5.6:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
+  integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
+source-map-support@~0.4.0:
+  version "0.4.18"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
+  dependencies:
+    source-map "^0.5.6"
+
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
+
+source-map@0.1.x:
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
+  dependencies:
+    amdefine ">=0.0.4"
+
+source-map@0.5.6:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+  integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
+
+source-map@0.7.3, source-map@^0.7.3:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+
+source-map@^0.4.2, source-map@~0.4.1:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
+  dependencies:
+    amdefine ">=0.0.4"
 
-source-map@^0.5.6:
+source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 source-map@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
+  integrity sha1-2rc/vPwrqBm03gO9b26qSBZLP50=
   dependencies:
     amdefine ">=0.0.4"
 
 sourcemap-codec@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz#c8fd92d91889e902a07aee392bdd2c5863958ba2"
+  integrity sha512-hX1eNBNuilj8yfFnECh0DzLgwKpBLMIvmhgEhixXNui8lMLBInTI8Kyxt++RwJnMNu7cAUo635L2+N1TxMJCzA==
 
 spdx-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/spdx-compare/-/spdx-compare-1.0.0.tgz#2c55f117362078d7409e6d7b08ce70a857cd3ed7"
+  integrity sha512-C1mDZOX0hnu0ep9dfmuoi03+eOdDoz2yvK79RxbcrVEG1NO1Ph35yW102DHWKN4pk80nwCgeMmSY5L25VE4D9A==
   dependencies:
     array-find-index "^1.0.2"
     spdx-expression-parse "^3.0.0"
@@ -5103,6 +9074,7 @@ spdx-compare@^1.0.0:
 spdx-correct@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
+  integrity sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
@@ -5110,14 +9082,17 @@ spdx-correct@^3.0.0:
 spdx-exceptions@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-1.0.5.tgz#9d21ac4da4bdb71d060fb74e5a67531d032cbba6"
+  integrity sha1-nSGsTaS9tx0GD7dOWmdTHQMsu6Y=
 
 spdx-exceptions@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
+  integrity sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==
 
 spdx-expression-parse@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
+  integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
@@ -5125,18 +9100,22 @@ spdx-expression-parse@^3.0.0:
 spdx-license-ids@^1.0.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+  integrity sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=
 
 spdx-license-ids@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz#e2a303236cac54b04031fa7a5a79c7e701df852f"
+  integrity sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w==
 
 spdx-ranges@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/spdx-ranges/-/spdx-ranges-2.0.0.tgz#257686798e5edb41d45c1aba3d3f1bb47af8d5ec"
+  integrity sha512-AUUXLfqkwD7GlzZkXv8ePPCpPjeVWI9xJCfysL8re/uKb6H10umMnC7bFRsHmLJan4fslUtekAgpHlSgLc/7mA==
 
 spdx-satisfies@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/spdx-satisfies/-/spdx-satisfies-4.0.0.tgz#ebc79eec88b68ac75618e2e5ee94fbc347587552"
+  integrity sha512-OcARj6U1OuVv98SVrRqgrR30sVocONtoPpnX8Xz4vXNrFVedqtbgkA+0KmQoXIQ2xjfltPPRVIMeNzKEFLWWKQ==
   dependencies:
     spdx-compare "^1.0.0"
     spdx-expression-parse "^3.0.0"
@@ -5145,35 +9124,78 @@ spdx-satisfies@^4.0.0:
 spdx@^0.5.1:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/spdx/-/spdx-0.5.2.tgz#76a428b9b97e7904ef83e62a4af0d06fdb50c265"
+  integrity sha512-WQbfCQT2uKLsDllnO9ItpcGUiiF1O/ZvBGCyqFZRg122HgiZubpwpZiM7BkmH19HC3XR3Z+DFMGJNzXSPebG8A==
   dependencies:
     spdx-exceptions "^1.0.0"
     spdx-license-ids "^1.0.0"
 
+spdy-transport@^2.0.18:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-2.1.0.tgz#4bbb15aaffed0beefdd56ad61dbdc8ba3e2cb7a1"
+  integrity sha512-bpUeGpZcmZ692rrTiqf9/2EUakI6/kXX1Rpe0ib/DyOzbiexVfXkw6GnvI9hVGvIwVaUhkaBojjCZwLNRGQg1g==
+  dependencies:
+    debug "^2.6.8"
+    detect-node "^2.0.3"
+    hpack.js "^2.1.6"
+    obuf "^1.1.1"
+    readable-stream "^2.2.9"
+    safe-buffer "^5.0.1"
+    wbuf "^1.7.2"
+
+spdy@^3.4.1:
+  version "3.4.7"
+  resolved "https://registry.yarnpkg.com/spdy/-/spdy-3.4.7.tgz#42ff41ece5cc0f99a3a6c28aabb73f5c3b03acbc"
+  integrity sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=
+  dependencies:
+    debug "^2.6.8"
+    handle-thing "^1.2.5"
+    http-deceiver "^1.2.7"
+    safe-buffer "^5.0.1"
+    select-hose "^2.0.0"
+    spdy-transport "^2.0.18"
+
+speed-measure-webpack-plugin@1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.2.3.tgz#de170b5cefbfa1c039d95e639edd3ad50cfc7c48"
+  integrity sha512-p+taQ69VkRUXYMoZOx2nxV/Tz8tt79ahctoZJyJDHWP7fEYvwFNf5Pd73k5kZ6auu0pTsPNLEUwWpM8mCk85Zw==
+  dependencies:
+    chalk "^2.0.1"
+
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
   dependencies:
     extend-shallow "^3.0.0"
 
 split2@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493"
+  integrity sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==
   dependencies:
     through2 "^2.0.2"
 
 split@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
+  integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==
   dependencies:
     through "2"
 
+sprintf-js@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.1.tgz#36be78320afe5801f6cea3ee78b6e5aab940ea0c"
+  integrity sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw=
+
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 sshpk@^1.7.0:
   version "1.14.2"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
+  integrity sha1-xvxhZIo9nE52T9P8306hBeSSupg=
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -5189,28 +9211,33 @@ sshpk@^1.7.0:
 ssri@^5.2.4:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
+  integrity sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==
   dependencies:
     safe-buffer "^5.1.1"
 
 ssri@^6.0.0, ssri@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
+  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
   dependencies:
     figgy-pudding "^3.5.1"
 
 stack-trace@0.0.x:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
+  integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
 
 static-eval@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.0.tgz#0e821f8926847def7b4b50cda5d55c04a9b13864"
+  integrity sha512-6flshd3F1Gwm+Ksxq463LtFd1liC77N/PX1FVVc3OzL3hAmo2fwHFbuArkcfi7s9rTNsLEhcRmXGFZhlgy40uw==
   dependencies:
     escodegen "^1.8.1"
 
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
   dependencies:
     define-property "^0.2.5"
     object-copy "^0.1.0"
@@ -5218,6 +9245,7 @@ static-extend@^0.1.1:
 static-module@^2.2.0:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/static-module/-/static-module-2.2.5.tgz#bd40abceae33da6b7afb84a0e4329ff8852bfbbf"
+  integrity sha512-D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ==
   dependencies:
     concat-stream "~1.6.0"
     convert-source-map "^1.5.1"
@@ -5234,34 +9262,78 @@ static-module@^2.2.0:
     static-eval "^2.0.0"
     through2 "~2.0.3"
 
+stats-webpack-plugin@0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/stats-webpack-plugin/-/stats-webpack-plugin-0.7.0.tgz#ccffe9b745de8bbb155571e063f8263fc0e2bc06"
+  integrity sha512-NT0YGhwuQ0EOX+uPhhUcI6/+1Sq/pMzNuSCBVT4GbFl/ac6I/JZefBcjlECNfAb1t3GOx5dEj1Z7x0cAxeeVLQ==
+  dependencies:
+    lodash "^4.17.4"
+
 "statuses@>= 1.4.0 < 2":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
 statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
+  integrity sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=
+
+statuses@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
+  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
+
+stdout-stream@^1.4.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
+  integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==
+  dependencies:
+    readable-stream "^2.0.1"
+
+stream-browserify@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
+  integrity sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=
+  dependencies:
+    inherits "~2.0.1"
+    readable-stream "^2.0.2"
 
 stream-each@^1.1.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
+  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
   dependencies:
     end-of-stream "^1.1.0"
     stream-shift "^1.0.0"
 
+stream-http@^2.7.2:
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
+  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
+  dependencies:
+    builtin-status-codes "^3.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.3.6"
+    to-arraybuffer "^1.0.0"
+    xtend "^4.0.0"
+
 stream-json@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/stream-json/-/stream-json-0.5.2.tgz#f4256c0ef1a905f2ef2d473706b4b3ff827653cf"
+  integrity sha512-/QlOLybrc6LkH/oVgXo1lJ8oemRIze/grdpfssLn1Pm8nZVhW4VMOqDDYGaORPodQFxiDEUquQJER5LiBu8Ehg==
   dependencies:
     parser-toolkit ">=0.0.3"
 
 stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
+  integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
 
 streamroller@0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-0.7.0.tgz#a1d1b7cf83d39afb0d63049a5acbf93493bdf64b"
+  integrity sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==
   dependencies:
     date-format "^1.2.0"
     debug "^3.1.0"
@@ -5271,102 +9343,160 @@ streamroller@0.7.0:
 strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
 
 string-to-stream@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string-to-stream/-/string-to-stream-1.1.1.tgz#aba78f73e70661b130ee3e1c0192be4fef6cb599"
+  integrity sha512-QySF2+3Rwq0SdO3s7BAp4x+c3qsClpPQ6abAmb0DGViiSBAkT5kL6JT2iyzEVP+T1SmzHrQD1TwlP9QAHCc+Sw==
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.1.0"
 
-string-width@^1.0.1:
+string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
   dependencies:
     code-point-at "^1.0.0"
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.0.0:
+"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
   dependencies:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-
-string_decoder@~1.1.1:
+string_decoder@^1.0.0, string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
     safe-buffer "~5.1.0"
 
+string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
+
 stringstream@~0.0.4, stringstream@~0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
+  integrity sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
   dependencies:
     ansi-regex "^3.0.0"
 
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
   dependencies:
     is-utf8 "^0.2.0"
 
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
 strip-indent@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
   dependencies:
     get-stdin "^4.0.1"
 
 strip-indent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
+  integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=
 
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+
+style-loader@0.23.1:
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz#cb9154606f3e771ab6c4ab637026a1049174d925"
+  integrity sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==
+  dependencies:
+    loader-utils "^1.1.0"
+    schema-utils "^1.0.0"
+
+stylus-loader@3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-3.0.2.tgz#27a706420b05a38e038e7cacb153578d450513c6"
+  integrity sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==
+  dependencies:
+    loader-utils "^1.0.2"
+    lodash.clonedeep "^4.5.0"
+    when "~3.6.x"
+
+stylus@0.54.5, stylus@^0.54.5:
+  version "0.54.5"
+  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
+  integrity sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=
+  dependencies:
+    css-parse "1.7.x"
+    debug "*"
+    glob "7.0.x"
+    mkdirp "0.5.x"
+    sax "0.5.x"
+    source-map "0.1.x"
 
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
 supports-color@^3.1.0:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^5.3.0:
+supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
+symbol-observable@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
+  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
+
+tapable@^1.0.0, tapable@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c"
+  integrity sha512-IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA==
+
 tar-stream@^1.5.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
+  integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
   dependencies:
     bl "^1.0.0"
     buffer-alloc "^1.2.0"
@@ -5376,9 +9506,19 @@ tar-stream@^1.5.0:
     to-buffer "^1.1.1"
     xtend "^4.0.0"
 
+tar@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+  integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
+  dependencies:
+    block-stream "*"
+    fstream "^1.0.2"
+    inherits "2"
+
 tar@^4, tar@^4.4.4, tar@^4.4.6:
   version "4.4.6"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
+  integrity sha512-tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg==
   dependencies:
     chownr "^1.0.1"
     fs-minipass "^1.2.5"
@@ -5391,68 +9531,146 @@ tar@^4, tar@^4.4.4, tar@^4.4.6:
 temp@^0.8.3:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59"
+  integrity sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=
   dependencies:
     os-tmpdir "^1.0.0"
     rimraf "~2.2.6"
 
+term-size@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
+  integrity sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=
+  dependencies:
+    execa "^0.7.0"
+
+terser-webpack-plugin@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.1.0.tgz#cf7c25a1eee25bf121f4a587bb9e004e3f80e528"
+  integrity sha512-61lV0DSxMAZ8AyZG7/A4a3UPlrbOBo8NIQ4tJzLPAdGOQ+yoNC7l5ijEow27lBAL2humer01KLS6bGIMYQxKoA==
+  dependencies:
+    cacache "^11.0.2"
+    find-cache-dir "^2.0.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^1.4.0"
+    source-map "^0.6.1"
+    terser "^3.8.1"
+    webpack-sources "^1.1.0"
+    worker-farm "^1.5.2"
+
+terser@^3.8.1:
+  version "3.10.8"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-3.10.8.tgz#2fe3967396a10cdc3d575074fe857efd30a2895a"
+  integrity sha512-GQJHWJ/vbx0EgRk+lBMONMmKaT+ifeo/XgT/hi3KpzEEFOERVyFuJSVXH8grcmJjiqKY35ds8rBCxvABUeyyuQ==
+  dependencies:
+    commander "~2.17.1"
+    source-map "~0.6.1"
+    source-map-support "~0.5.6"
+
 text-extensions@^1.0.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.8.0.tgz#6f343c62268843019b21a616a003557bdb952d2b"
+  integrity sha512-mVzjRxuWnDKs/qH1rbOJEVHLlSX9kty9lpi7lMvLgU9S74mQ8/Ozg9UPcKxShh0qG2NZ+NyPOPpcZU4C1Eld9A==
 
 text-hex@1.0.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5"
+  integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==
 
 through2@^2.0.0, through2@^2.0.2, through2@^2.0.3, through2@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
+  integrity sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=
   dependencies:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
-through@2, "through@>=2.2.7 <3":
+through@2, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
 thunkify@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/thunkify/-/thunkify-2.1.2.tgz#faa0e9d230c51acc95ca13a361ac05ca7e04553d"
+  integrity sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=
+
+thunky@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.3.tgz#f5df732453407b09191dae73e2a8cc73f381a826"
+  integrity sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==
 
-timed-out@^4.0.1:
+timed-out@^4.0.0, timed-out@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
+  integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
+
+timers-browserify@^2.0.4:
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
+  integrity sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==
+  dependencies:
+    setimmediate "^1.0.4"
 
 timespan@2.3.x:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/timespan/-/timespan-2.3.0.tgz#4902ce040bd13d845c8f59b27e9d59bad6f39929"
+  integrity sha1-SQLOBAvRPYRcj1myfp1ZutbzmSk=
 
 tiny-inflate@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.2.tgz#93d9decffc8805bd57eae4310f0b745e9b6fb3a7"
+  integrity sha1-k9nez/yIBb1X6uQxDwt0Xptvs6c=
+
+tmp@0.0.30:
+  version "0.0.30"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.30.tgz#72419d4a8be7d6ce75148fd8b324e593a711c2ed"
+  integrity sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=
+  dependencies:
+    os-tmpdir "~1.0.1"
 
-tmp@0.0.33, tmp@0.0.x:
+tmp@0.0.33, tmp@0.0.x, tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
   dependencies:
     os-tmpdir "~1.0.2"
 
 to-array@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
+  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
+
+to-arraybuffer@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
 to-buffer@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
+  integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==
+
+to-fast-properties@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
+
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
   dependencies:
     kind-of "^3.0.2"
 
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
   dependencies:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
@@ -5460,6 +9678,7 @@ to-regex-range@^2.1.0:
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
   dependencies:
     define-property "^2.0.2"
     extend-shallow "^3.0.2"
@@ -5469,43 +9688,64 @@ to-regex@^3.0.1, to-regex@^3.0.2:
 tough-cookie@~2.3.0, tough-cookie@~2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
+  integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==
   dependencies:
     punycode "^1.4.1"
 
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
+  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
   dependencies:
     psl "^1.1.24"
     punycode "^1.4.1"
 
-tree-kill@^1.2.0:
+tree-kill@1.2.0, tree-kill@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36"
+  integrity sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==
 
 treeify@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/treeify/-/treeify-1.1.0.tgz#4e31c6a463accd0943879f30667c4fdaff411bb8"
+  integrity sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A==
 
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
 
 trim-newlines@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
+  integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=
 
 trim-off-newlines@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
+  integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM=
+
+trim-right@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+  integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
 
 triple-beam@^1.2.0, triple-beam@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9"
+  integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==
+
+"true-case-path@^1.0.2":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
+  integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==
+  dependencies:
+    glob "^7.1.2"
 
 ts-node@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-5.0.1.tgz#78e5d1cb3f704de1b641e43b76be2d4094f06f81"
+  integrity sha512-XK7QmDcNHVmZkVtkiwNDWiERRHPyU8nBqZB1+iv2UhOG0q3RQ9HsZ2CMqISlFbxjrYFGfG2mX7bW4dAyxBVzUw==
   dependencies:
     arrify "^1.0.0"
     chalk "^2.3.0"
@@ -5519,29 +9759,43 @@ ts-node@^5.0.0:
 tsickle@0.28.0:
   version "0.28.0"
   resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.28.0.tgz#6cd6fa004766c6ad9261b599c83866ee97cc7875"
+  integrity sha512-cb/Z4NlKMPGiIIbgmklfBJIxDl4EQoYqC+0/BnPxZWzWcUvikeOHFkkkEmabJVqKh47jUqOwU/uMAu6UvhicZg==
   dependencies:
     minimist "^1.2.0"
     mkdirp "^0.5.1"
     source-map "^0.6.0"
     source-map-support "^0.5.0"
 
-tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
+tsickle@>=0.34.0:
+  version "0.34.0"
+  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.34.0.tgz#10187fa6401a288a65efb93a60bf28b2ff95f90b"
+  integrity sha512-O3wCPRtL18Hc/ZBnaiKwmmjVzeCWTOTpsi0btfC7FWL3RnXpxLPxD6hoJ0QEXuSfG/0QJk+MWNjqT9N6fOyyIg==
+  dependencies:
+    minimist "^1.2.0"
+    mkdirp "^0.5.1"
+    source-map "^0.7.3"
+
+tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
+  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
 tslint-no-circular-imports@^0.5.0:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/tslint-no-circular-imports/-/tslint-no-circular-imports-0.5.2.tgz#47ac9194ec531101ac19198d5144f7ac9f57d980"
+  integrity sha512-Uzu2NiVX7b/kAk9vPrLqUmoCkth0dXUUNOaqwfxpvYgsHfoH67cmj0IHOUMZ1bC0swksJjaTyq7acHe/gU8H4A==
 
 tslint-sonarts@^1.7.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/tslint-sonarts/-/tslint-sonarts-1.8.0.tgz#80f2e8addd418c3b8807fc0155dec33b5a81e8d1"
+  integrity sha512-tpijO5VR18e+Ny99uMNNov3Hw7diiYQ8KoJkezpHGw9hSFFrO5g2PhwdQQo7O9puhJKMIutLl9g+ICMgg+bh0w==
   dependencies:
     immutable "^3.8.2"
 
 tslint@^5.11.0:
   version "5.11.0"
   resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.11.0.tgz#98f30c02eae3cde7006201e4c33cb08b48581eed"
+  integrity sha1-mPMMAurjzecAYgHkwzywi0hYHu0=
   dependencies:
     babel-code-frame "^6.22.0"
     builtin-modules "^1.1.1"
@@ -5559,42 +9813,55 @@ tslint@^5.11.0:
 tsscmp@~1.0.0:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"
+  integrity sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==
 
 tsutils@2.27.2:
   version "2.27.2"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.27.2.tgz#60ba88a23d6f785ec4b89c6e8179cac9b431f1c7"
+  integrity sha512-qf6rmT84TFMuxAKez2pIfR8UCai49iQsfB7YWVjV1bKpy/d0PWT5rEOSM6La9PiHZ0k1RRZQiwVdVJfQ3BPHgg==
   dependencies:
     tslib "^1.8.1"
 
 tsutils@^2.27.2:
   version "2.29.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
+  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
   dependencies:
     tslib "^1.8.1"
 
+tty-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
   dependencies:
     safe-buffer "^5.0.1"
 
 tunnel-agent@~0.4.1:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
+  integrity sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=
 
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
   dependencies:
     prelude-ls "~1.1.2"
 
 type-is@~1.6.16:
   version "1.6.16"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
+  integrity sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==
   dependencies:
     media-typer "0.3.0"
     mime-types "~2.1.18"
@@ -5602,25 +9869,52 @@ type-is@~1.6.16:
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@~3.1.6:
+typescript@3.1.6, typescript@~3.1.6:
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68"
+  integrity sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==
+
+uglify-es@^3.3.4:
+  version "3.3.9"
+  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
+  integrity sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==
+  dependencies:
+    commander "~2.13.0"
+    source-map "~0.6.1"
 
-uglify-js@^3.1.4:
+uglify-js@^3.0.7, uglify-js@^3.1.4:
   version "3.4.9"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
+  integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==
   dependencies:
     commander "~2.17.1"
     source-map "~0.6.1"
 
+uglifyjs-webpack-plugin@^1.2.4:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz#75f548160858163a08643e086d5fefe18a5d67de"
+  integrity sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==
+  dependencies:
+    cacache "^10.0.4"
+    find-cache-dir "^1.0.0"
+    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"
+
 ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
+  integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
 
 underscore@~1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz#6bbaf0877500d36be34ecaa584e0db9fef035209"
+  integrity sha1-a7rwh3UA02vjTsqlhODbn+8DUgk=
 
 "unicode-properties@github:quicktype/unicode-properties#dist":
   version "1.1.0"
@@ -5632,6 +9926,7 @@ underscore@~1.7.0:
 unicode-trie@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/unicode-trie/-/unicode-trie-0.3.1.tgz#d671dddd89101a08bac37b6a5161010602052085"
+  integrity sha1-1nHd3YkQGgi6w3tqUWEBBgIFIIU=
   dependencies:
     pako "^0.2.5"
     tiny-inflate "^1.0.0"
@@ -5639,6 +9934,7 @@ unicode-trie@^0.3.0:
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
   dependencies:
     arr-union "^3.1.0"
     get-value "^2.0.6"
@@ -5648,61 +9944,129 @@ union-value@^1.0.0:
 unique-filename@^1.1.0, unique-filename@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
   dependencies:
     unique-slug "^2.0.0"
 
 unique-slug@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.1.tgz#5e9edc6d1ce8fb264db18a507ef9bd8544451ca6"
+  integrity sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==
   dependencies:
     imurmurhash "^0.1.4"
 
+unique-string@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
+  integrity sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=
+  dependencies:
+    crypto-random-string "^1.0.0"
+
+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
   dependencies:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
+unzip-response@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
+  integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
+
 upath@^1.0.5:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
+  integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==
+
+update-notifier@^2.3.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6"
+  integrity sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==
+  dependencies:
+    boxen "^1.2.1"
+    chalk "^2.0.1"
+    configstore "^3.0.0"
+    import-lazy "^2.1.0"
+    is-ci "^1.0.10"
+    is-installed-globally "^0.1.0"
+    is-npm "^1.0.0"
+    latest-version "^3.0.0"
+    semver-diff "^2.0.0"
+    xdg-basedir "^3.0.0"
 
 uri-js@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
   dependencies:
     punycode "^2.1.0"
 
 urijs@^1.19.1:
   version "1.19.1"
   resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.1.tgz#5b0ff530c0cbde8386f6342235ba5ca6e995d25a"
+  integrity sha512-xVrGVi94ueCJNrBSTjWqjvtgvl3cyOTThp2zaMaFNGp3F542TR6sM3f2o8RqZl+AwteClSVmoCyt0ka4RjQOQg==
 
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
+
+url-parse-lax@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
+  integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=
+  dependencies:
+    prepend-http "^1.0.1"
 
 url-parse-lax@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
+  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
   dependencies:
     prepend-http "^2.0.0"
 
+url-parse@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.3.tgz#bfaee455c889023219d757e045fa6a684ec36c15"
+  integrity sha512-rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==
+  dependencies:
+    querystringify "^2.0.0"
+    requires-port "^1.0.0"
+
 url-to-options@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
+  integrity sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=
+
+url@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
+  dependencies:
+    punycode "1.3.2"
+    querystring "0.2.0"
 
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
 useragent@2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.2.1.tgz#cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"
+  integrity sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=
   dependencies:
     lru-cache "2.2.x"
     tmp "0.0.x"
@@ -5710,6 +10074,7 @@ useragent@2.2.1:
 useragent@^2.1.12:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz#217f943ad540cb2128658ab23fc960f6a88c9972"
+  integrity sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==
   dependencies:
     lru-cache "4.1.x"
     tmp "0.0.x"
@@ -5717,26 +10082,46 @@ useragent@^2.1.12:
 util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
 util-extend@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f"
+  integrity sha1-p8IW0mdUUWljeztu3GypEZ4v+T8=
+
+util@0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
+  dependencies:
+    inherits "2.0.1"
+
+util@^0.10.3:
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
+  integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
+  dependencies:
+    inherits "2.0.3"
 
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@^3.1.0, uuid@^3.3.2:
+uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
 uws@~9.14.0:
   version "9.14.0"
   resolved "https://registry.yarnpkg.com/uws/-/uws-9.14.0.tgz#fac8386befc33a7a3705cbd58dc47b430ca4dd95"
+  integrity sha512-HNMztPP5A1sKuVFmdZ6BPVpBQd5bUjNC8EFMFiICK+oho/OQsAJy5hnIx4btMHiOk8j04f/DbIlqnEZ9d72dqg==
 
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
@@ -5744,16 +10129,24 @@ validate-npm-package-license@^3.0.1:
 validate-npm-package-name@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
+  integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34=
   dependencies:
     builtins "^1.0.3"
 
 vargs@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/vargs/-/vargs-0.1.0.tgz#6b6184da6520cc3204ce1b407cac26d92609ebff"
+  integrity sha1-a2GE2mUgzDIEzhtAfKwm2SYJ6/8=
+
+vary@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
   dependencies:
     assert-plus "^1.0.0"
     core-util-is "1.0.2"
@@ -5762,14 +10155,40 @@ verror@1.10.0:
 vlq@^0.2.2:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
+  integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==
+
+vm-browserify@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
+  integrity sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=
+  dependencies:
+    indexof "0.0.1"
 
 void-elements@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
+  integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
+
+watchpack@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
+  integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==
+  dependencies:
+    chokidar "^2.0.2"
+    graceful-fs "^4.1.2"
+    neo-async "^2.5.0"
+
+wbuf@^1.1.0, wbuf@^1.7.2:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
+  integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
+  dependencies:
+    minimalistic-assert "^1.0.0"
 
 wd@^1.4.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/wd/-/wd-1.11.0.tgz#b610deea7f79f5a520a573c09e047e42d31433f9"
+  integrity sha512-h2EBfJvmsWocIjOOg5BsHh9IJKrqZDG4Az4jEZhFugEH7sOPcX6feZQ30aFuktqDI0jquarZJmNpA6V0A0Q7Mg==
   dependencies:
     archiver "2.1.1"
     async "2.0.1"
@@ -5779,33 +10198,214 @@ wd@^1.4.0:
     request "2.85.0"
     vargs "0.1.0"
 
+webdriver-js-extender@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz#57d7a93c00db4cc8d556e4d3db4b5db0a80c3bb7"
+  integrity sha512-lcUKrjbBfCK6MNsh7xaY2UAUmZwe+/ib03AjVOpFobX4O7+83BUveSrLfU0Qsyb1DaKJdQRbuU+kM9aZ6QUhiQ==
+  dependencies:
+    "@types/selenium-webdriver" "^3.0.0"
+    selenium-webdriver "^3.0.1"
+
+webdriver-manager@^12.0.6:
+  version "12.1.0"
+  resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.0.tgz#f6601e52de5f0c97fc7024c889eeb2416f2f1d9d"
+  integrity sha512-oEc5fmkpz6Yh6udhwir5m0eN5mgRPq9P/NU5YWuT3Up5slt6Zz+znhLU7q4+8rwCZz/Qq3Fgpr/4oao7NPCm2A==
+  dependencies:
+    adm-zip "^0.4.9"
+    chalk "^1.1.1"
+    del "^2.2.0"
+    glob "^7.0.3"
+    ini "^1.3.4"
+    minimist "^1.2.0"
+    q "^1.4.1"
+    request "^2.87.0"
+    rimraf "^2.5.2"
+    semver "^5.3.0"
+    xml2js "^0.4.17"
+
+webpack-core@^0.6.8:
+  version "0.6.9"
+  resolved "https://registry.yarnpkg.com/webpack-core/-/webpack-core-0.6.9.tgz#fc571588c8558da77be9efb6debdc5a3b172bdc2"
+  integrity sha1-/FcViMhVjad76e+23r3Fo7FyvcI=
+  dependencies:
+    source-list-map "~0.1.7"
+    source-map "~0.4.1"
+
+webpack-dev-middleware@3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz#1132fecc9026fd90f0ecedac5cbff75d1fb45890"
+  integrity sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==
+  dependencies:
+    memory-fs "~0.4.1"
+    mime "^2.3.1"
+    range-parser "^1.0.3"
+    webpack-log "^2.0.0"
+
+webpack-dev-server@3.1.10, webpack-dev-server@^3.1.4:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.10.tgz#507411bee727ee8d2fdffdc621b66a64ab3dea2b"
+  integrity sha512-RqOAVjfqZJtQcB0LmrzJ5y4Jp78lv9CK0MZ1YJDTaTmedMZ9PU9FLMQNrMCfVu8hHzaVLVOJKBlGEHMN10z+ww==
+  dependencies:
+    ansi-html "0.0.7"
+    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 "^2.0.0"
+    internal-ip "^3.0.1"
+    ip "^1.1.5"
+    killable "^1.0.0"
+    loglevel "^1.4.1"
+    opn "^5.1.0"
+    portfinder "^1.0.9"
+    schema-utils "^1.0.0"
+    selfsigned "^1.9.1"
+    serve-index "^1.7.2"
+    sockjs "0.3.19"
+    sockjs-client "1.3.0"
+    spdy "^3.4.1"
+    strip-ansi "^3.0.0"
+    supports-color "^5.1.0"
+    webpack-dev-middleware "3.4.0"
+    webpack-log "^2.0.0"
+    yargs "12.0.2"
+
+webpack-log@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
+  integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
+  dependencies:
+    ansi-colors "^3.0.0"
+    uuid "^3.3.2"
+
+webpack-merge@4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.4.tgz#0fde38eabf2d5fd85251c24a5a8c48f8a3f4eb7b"
+  integrity sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==
+  dependencies:
+    lodash "^4.17.5"
+
+webpack-sources@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.2.0.tgz#18181e0d013fce096faf6f8e6d41eeffffdceac2"
+  integrity sha512-9BZwxR85dNsjWz3blyxdOhTgtnQvv3OEs5xofI0wPYTwu5kaWxS08UuD1oI7WLBLpRO+ylf0ofnXLXWmGb2WMw==
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"
+
+webpack-sources@1.3.0, webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
+  integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"
+
+webpack-subresource-integrity@1.1.0-rc.6:
+  version "1.1.0-rc.6"
+  resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz#37f6f1264e1eb378e41465a98da80fad76ab8886"
+  integrity sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==
+  dependencies:
+    webpack-core "^0.6.8"
+
+webpack@4.23.1, webpack@^4.0.0, webpack@^4.6.0:
+  version "4.23.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.23.1.tgz#db7467b116771ae020c58bdfe2a0822785bb8239"
+  integrity sha512-iE5Cu4rGEDk7ONRjisTOjVHv3dDtcFfwitSxT7evtYj/rANJpt1OuC/Kozh1pBa99AUBr1L/LsaNB+D9Xz3CEg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.10"
+    "@webassemblyjs/helper-module-context" "1.7.10"
+    "@webassemblyjs/wasm-edit" "1.7.10"
+    "@webassemblyjs/wasm-parser" "1.7.10"
+    acorn "^5.6.2"
+    acorn-dynamic-import "^3.0.0"
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+    chrome-trace-event "^1.0.0"
+    enhanced-resolve "^4.1.0"
+    eslint-scope "^4.0.0"
+    json-parse-better-errors "^1.0.2"
+    loader-runner "^2.3.0"
+    loader-utils "^1.1.0"
+    memory-fs "~0.4.1"
+    micromatch "^3.1.8"
+    mkdirp "~0.5.0"
+    neo-async "^2.5.0"
+    node-libs-browser "^2.0.0"
+    schema-utils "^0.4.4"
+    tapable "^1.1.0"
+    uglifyjs-webpack-plugin "^1.2.4"
+    watchpack "^1.5.0"
+    webpack-sources "^1.3.0"
+
+websocket-driver@>=0.5.1:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
+  integrity sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=
+  dependencies:
+    http-parser-js ">=0.4.0"
+    websocket-extensions ">=0.1.1"
+
+websocket-extensions@>=0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
+  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
+
 when@^3.7.7:
   version "3.7.8"
   resolved "https://registry.yarnpkg.com/when/-/when-3.7.8.tgz#c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"
+  integrity sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I=
+
+when@~3.6.x:
+  version "3.6.4"
+  resolved "https://registry.yarnpkg.com/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e"
+  integrity sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=
+
+which-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+  integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
 
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@^1.1.1, which@^1.2.1, which@^1.2.9, which@^1.3.1:
+which@1, which@^1.1.1, which@^1.2.1, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
 wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
   dependencies:
     string-width "^1.0.2 || 2"
 
+widest-line@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc"
+  integrity sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==
+  dependencies:
+    string-width "^2.1.1"
+
 window-size@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
+  integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=
 
 winston-transport@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.2.0.tgz#a20be89edf2ea2ca39ba25f3e50344d73e6520e5"
+  integrity sha512-0R1bvFqxSlK/ZKTH86nymOuKv/cT1PQBMuDdA7k7f0S9fM44dNH6bXnuxwXPrN8lefJgtZq08BKdyZ0DZIy/rg==
   dependencies:
     readable-stream "^2.3.6"
     triple-beam "^1.2.0"
@@ -5813,6 +10413,7 @@ winston-transport@^4.2.0:
 winston@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/winston/-/winston-3.1.0.tgz#80724376aef164e024f316100d5b178d78ac5331"
+  integrity sha512-FsQfEE+8YIEeuZEYhHDk5cILo1HOcWkGwvoidLrDgPog0r4bser1lEIOco2dN9zpDJ1M88hfDgZvxe5z4xNcwg==
   dependencies:
     async "^2.6.0"
     diagnostics "^1.1.1"
@@ -5827,18 +10428,29 @@ winston@^3.0.0:
 with-callback@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/with-callback/-/with-callback-1.0.2.tgz#a09629b9a920028d721404fb435bdcff5c91bc21"
+  integrity sha1-oJYpuakgAo1yFAT7Q1vc/1yRvCE=
 
 wordwrap@^1.0.0, wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
+
+worker-farm@^1.5.2:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
+  integrity sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==
+  dependencies:
+    errno "~0.1.7"
 
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -5846,52 +10458,139 @@ wrap-ansi@^2.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+write-file-atomic@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
+  integrity sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==
+  dependencies:
+    graceful-fs "^4.1.11"
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.2"
 
 ws@~3.3.1:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
+  integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==
   dependencies:
     async-limiter "~1.0.0"
     safe-buffer "~5.1.0"
     ultron "~1.1.0"
 
+xdg-basedir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
+  integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=
+
+xhr2@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.4.tgz#7f87658847716db5026323812f818cadab387a5f"
+  integrity sha1-f4dliEdxbbUCYyOBL4GMras4el8=
+
+xml2js@^0.4.17:
+  version "0.4.19"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
+  integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==
+  dependencies:
+    sax ">=0.6.0"
+    xmlbuilder "~9.0.1"
+
+xmlbuilder@~9.0.1:
+  version "9.0.7"
+  resolved "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
+  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
+
 xmlhttprequest-ssl@~1.5.4:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
+  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
 
 xregexp@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
+  integrity sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=
+
+xregexp@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
+  integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
 
 xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
+
+xxhashjs@^0.2.1:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/xxhashjs/-/xxhashjs-0.2.2.tgz#8a6251567621a1c46a5ae204da0249c7f8caa9d8"
+  integrity sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==
+  dependencies:
+    cuint "^0.2.2"
 
 y18n@^3.2.0, y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
 
-y18n@^4.0.0:
+"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
 yallist@^3.0.0, yallist@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+  integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=
+
+yargs-parser@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
+  integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
+  dependencies:
+    camelcase "^4.1.0"
+
+yargs-parser@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
+  integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=
+  dependencies:
+    camelcase "^3.0.0"
 
 yargs-parser@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
+  integrity sha1-jQrELxbqVd69MyyvTEA4s+P139k=
   dependencies:
     camelcase "^4.1.0"
 
+yargs@12.0.2:
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
+  integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^2.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^1.0.1"
+    os-locale "^3.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1 || ^4.0.0"
+    yargs-parser "^10.1.0"
+
 yargs@9.0.1:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
+  integrity sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=
   dependencies:
     camelcase "^4.1.0"
     cliui "^3.2.0"
@@ -5910,6 +10609,7 @@ yargs@9.0.1:
 yargs@^3.10.0:
   version "3.32.0"
   resolved "http://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995"
+  integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=
   dependencies:
     camelcase "^2.0.1"
     cliui "^3.0.3"
@@ -5919,23 +10619,51 @@ yargs@^3.10.0:
     window-size "^0.1.4"
     y18n "^3.2.0"
 
+yargs@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
+  integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=
+  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 "^5.0.0"
+
 yarn@^1.10.1:
   version "1.10.1"
   resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.10.1.tgz#b792ba28f050ae94cd7e719dbca80639d70da76f"
+  integrity sha512-EH0H1fyfFxkE4UpG4b+VCaVY4I488I2EyQNmGjGGKmvsSIb0G3b+1IcfGYPI2gqa1du43g4ZA3jH8fXlq6oVxg==
 
 yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
+  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
 
 yn@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
+  integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=
 
 zip-stream@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-1.2.0.tgz#a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"
+  integrity sha1-qLxF9MG0lpnGuQGYuqyqzbzUugQ=
   dependencies:
     archiver-utils "^1.3.0"
     compress-commons "^1.2.0"
     lodash "^4.8.0"
     readable-stream "^2.0.0"
+
+zone.js@^0.8.19:
+  version "0.8.26"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.26.tgz#7bdd72f7668c5a7ad6b118148b4ea39c59d08d2d"
+  integrity sha512-W9Nj+UmBJG251wkCacIkETgra4QgBo/vgoEkb4a2uoLzpQG7qF9nzwoLXWU5xj3Fg2mxGvEDh47mg24vXccYjA==

From a0b991310a407079f23afa9f0c234330d6c6cff4 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Thu, 6 Dec 2018 13:55:12 -0800
Subject: [PATCH 0505/1703] build: update unstable release numbers for 7.2 beta

---
 packages/schematics/angular/utility/latest-versions.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 3bc2df3fe9b9..19b2529f1ed8 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -14,6 +14,6 @@ export const latestVersions = {
   TypeScript: '~3.1.6',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.11.0',
-  DevkitBuildNgPackagr: '~0.11.0',
+  DevkitBuildAngular: '~0.12.0-beta.1',
+  DevkitBuildNgPackagr: '~0.12.0-beta.1',
 };

From 4567aa1de4d981285e20ad2b91ef14ac1b2772e9 Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Sat, 8 Dec 2018 11:21:11 +0100
Subject: [PATCH 0506/1703] style(@angular-devkit/build-angular): typo in
 stylesSourceMap

---
 .../angular-cli-files/models/webpack-configs/browser.ts   | 8 ++++----
 .../angular-cli-files/models/webpack-configs/common.ts    | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
index e9b23b927d3f..7f1153dbd010 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
@@ -22,13 +22,13 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
   let isEval = false;
   const { styles: stylesOptimization, scripts: scriptsOptimization } = buildOptions.optimization;
   const {
-    styles: stylesSouceMap,
+    styles: stylesSourceMap,
     scripts: scriptsSourceMap,
     hidden: hiddenSourceMap,
   } = buildOptions.sourceMap;
 
   // See https://webpack.js.org/configuration/devtool/ for sourcemap types.
-  if ((stylesSouceMap || scriptsSourceMap) &&
+  if ((stylesSourceMap || scriptsSourceMap) &&
     buildOptions.evalSourceMap &&
     !stylesOptimization &&
     !scriptsOptimization) {
@@ -64,10 +64,10 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
     }));
   }
 
-  if (!isEval && (scriptsSourceMap || stylesSouceMap)) {
+  if (!isEval && (scriptsSourceMap || stylesSourceMap)) {
     extraPlugins.push(getSourceMapDevTool(
       scriptsSourceMap,
-      stylesSouceMap,
+      stylesSourceMap,
       hiddenSourceMap,
     ));
   }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 1734dab3a0e9..96d292f34381 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -35,7 +35,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
   const { root, projectRoot, buildOptions } = wco;
   const { styles: stylesOptimization, scripts: scriptsOptimization } = buildOptions.optimization;
   const {
-    styles: stylesSouceMap,
+    styles: stylesSourceMap,
     scripts: scriptsSourceMap,
     vendor: vendorSourceMap,
   } = buildOptions.sourceMap;
@@ -164,7 +164,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
   }
 
   let sourceMapUseRule;
-  if ((scriptsSourceMap || stylesSouceMap) && vendorSourceMap) {
+  if ((scriptsSourceMap || stylesSourceMap) && vendorSourceMap) {
     sourceMapUseRule = {
       use: [
         {
@@ -214,7 +214,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
   if (stylesOptimization) {
     extraMinimizers.push(
       new CleanCssWebpackPlugin({
-        sourceMap: stylesSouceMap,
+        sourceMap: stylesSourceMap,
         // component styles retain their original file name
         test: (file) => /\.(?:css|scss|sass|less|styl)$/.test(file),
       }),

From 63a9bd464f29972f7522158ebff92d440cd5ce97 Mon Sep 17 00:00:00 2001
From: Pascal Honegger <pascal.honegger@bluewin.ch>
Date: Sun, 9 Dec 2018 12:39:09 +0100
Subject: [PATCH 0507/1703] docs: remove space for webpack-bundle-analyzer url

---
 docs/documentation/build.md                                   | 2 +-
 packages/angular_devkit/build_angular/src/browser/schema.d.ts | 2 +-
 packages/angular_devkit/build_angular/src/browser/schema.json | 2 +-
 packages/angular_devkit/build_angular/src/server/schema.d.ts  | 2 +-
 packages/angular_devkit/build_angular/src/server/schema.json  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/documentation/build.md b/docs/documentation/build.md
index 816acb63131d..38d52a5d1fcc 100644
--- a/docs/documentation/build.md
+++ b/docs/documentation/build.md
@@ -394,7 +394,7 @@ See https://github.com/angular/angular-cli/issues/7797 for details.
     <code>--stats-json</code>
   </p>
   <p>
-    Generates a 'stats.json' file which can be analyzed using tools such as: #webpack-bundle-analyzer' or https: //webpack.github.io/analyse.
+    Generates a 'stats.json' file which can be analyzed using tools such as: #webpack-bundle-analyzer' or https://webpack.github.io/analyse.
   </p>
 </details>
 <details>
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.d.ts b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
index 79f306045e52..243c8f84fc96 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
@@ -211,7 +211,7 @@ export interface BrowserBuilderSchema {
 
   /**
    * Generates a 'stats.json' file which can be analyzed using tools
-   * such as: #webpack-bundle-analyzer' or https: //webpack.github.io/analyse.
+   * such as: #webpack-bundle-analyzer' or https://webpack.github.io/analyse.
    */
   statsJson: boolean;
 
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index c959f449e059..817379b9fb42 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -271,7 +271,7 @@
     },
     "statsJson": {
       "type": "boolean",
-      "description": "Generates a 'stats.json' file which can be analyzed using tools such as: 'webpack-bundle-analyzer' or https: //webpack.github.io/analyse.",
+      "description": "Generates a 'stats.json' file which can be analyzed using tools such as: 'webpack-bundle-analyzer' or https://webpack.github.io/analyse.",
       "default": false
     },
     "forkTypeChecker": {
diff --git a/packages/angular_devkit/build_angular/src/server/schema.d.ts b/packages/angular_devkit/build_angular/src/server/schema.d.ts
index faadc64667df..76fee12790a5 100644
--- a/packages/angular_devkit/build_angular/src/server/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/server/schema.d.ts
@@ -62,7 +62,7 @@ export interface BuildWebpackServerSchema {
   resourcesOutputPath: string;
   /**
    * Generates a 'stats.json' file which can be analyzed using tools such as:
-   * #webpack-bundle-analyzer' or https: //webpack.github.io/analyse.
+   * #webpack-bundle-analyzer' or https://webpack.github.io/analyse.
    */
   statsJson?: boolean;
   /**
diff --git a/packages/angular_devkit/build_angular/src/server/schema.json b/packages/angular_devkit/build_angular/src/server/schema.json
index 705c8f0c8948..338933858d3a 100644
--- a/packages/angular_devkit/build_angular/src/server/schema.json
+++ b/packages/angular_devkit/build_angular/src/server/schema.json
@@ -201,7 +201,7 @@
     },
     "statsJson": {
       "type": "boolean",
-      "description": "Generates a 'stats.json' file which can be analyzed using tools such as: 'webpack-bundle-analyzer' or https: //webpack.github.io/analyse.",
+      "description": "Generates a 'stats.json' file which can be analyzed using tools such as: 'webpack-bundle-analyzer' or https://webpack.github.io/analyse.",
       "default": false
     },
     "forkTypeChecker": {

From 1cdeccfc9ebbe657250d570721645ff8d8cb9b6e Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 28 Nov 2018 08:08:37 +0100
Subject: [PATCH 0508/1703] build: update `quicktype-core` to generate
 camelCase acronyms

At the moment for insatance `Css` will be generated as `CSS` since it's an acronym

See: https://github.com/quicktype/quicktype/blob/master/src/quicktype-core/support/Acronyms.ts
---
 package.json              |  2 +-
 tools/quicktype_runner.js |  1 +
 yarn.lock                 | 42 ++++++++++-----------------------------
 3 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/package.json b/package.json
index 27fa9ebcd2a7..180a206446c9 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
   "dependencies": {
     "glob": "^7.0.3",
     "node-fetch": "^2.2.0",
-    "quicktype-core": "^5.0.41",
+    "quicktype-core": "^6.0.15",
     "temp": "^0.8.3",
     "tslint": "^5.11.0",
     "typescript": "~3.1.6",
diff --git a/tools/quicktype_runner.js b/tools/quicktype_runner.js
index 021e809b5862..d2e37b6fe48d 100644
--- a/tools/quicktype_runner.js
+++ b/tools/quicktype_runner.js
@@ -133,6 +133,7 @@ async function generate(inPath) {
     rendererOptions: {
       'just-types': 'true',
       'explicit-unions': 'true',
+      'acronym-style': 'camel',
     },
   });
 
diff --git a/yarn.lock b/yarn.lock
index 4b82b5ec463f..1616108afe84 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2033,10 +2033,10 @@ codelyzer@^4.2.1:
     source-map "^0.5.7"
     sprintf-js "^1.1.1"
 
-collection-utils@0.0.15:
-  version "0.0.15"
-  resolved "https://registry.yarnpkg.com/collection-utils/-/collection-utils-0.0.15.tgz#70f4c54299621699b3f38c66577c9d4284825125"
-  integrity sha512-eLGXa67rSilE5dNCcx2wenWcmmgl4QdlwUj1Z5idKkIBOhZh6PghEZFC3wP3AHH8xnMbIDsky0pR/+1epJBymQ==
+collection-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/collection-utils/-/collection-utils-1.0.1.tgz#31d14336488674f27aefc0a7c5eccacf6df78044"
+  integrity sha512-LA2YTIlR7biSpXkKYwwuzGjwL5rjWEZVOSnvdUc7gObvWe4WkjxOpfrdhoP7Hs09YWDVfg0Mal9BpAqLfVEzQg==
 
 collection-visit@^1.0.0:
   version "1.0.0"
@@ -7315,11 +7315,6 @@ parseqs@0.0.5:
   dependencies:
     better-assert "~1.0.0"
 
-parser-toolkit@>=0.0.3:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/parser-toolkit/-/parser-toolkit-0.0.5.tgz#ec4b61729c86318b56ea971bfba6b3c672d62c01"
-  integrity sha1-7EthcpyGMYtW6pcb+6azxnLWLAE=
-
 parseuri@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
@@ -7820,18 +7815,16 @@ quick-lru@^1.0.0:
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
   integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=
 
-quicktype-core@^5.0.41:
-  version "5.0.41"
-  resolved "https://registry.yarnpkg.com/quicktype-core/-/quicktype-core-5.0.41.tgz#83f090b1bddeefcff0581e0d9c754d83410ed453"
-  integrity sha512-CImdVo4M4TlDs0McPSql9HnaoG5/Z3w1bQIlAhc95qekxBx+jJ2HNIqXzEkIsvx7W7sIPZhOuCug9fvmqNkMKQ==
+quicktype-core@^6.0.15:
+  version "6.0.15"
+  resolved "https://registry.yarnpkg.com/quicktype-core/-/quicktype-core-6.0.15.tgz#44fddfa7ae00fcc06e2eb43829870341be12a34b"
+  integrity sha512-m8GHNFsd2yL9eZmIy0FoZCDuoxfKnvfQHCpcBTvV0760AV9kSNRAk8e2uRs2eYcgj/VUSx0qcUUqm/40CrwYOQ==
   dependencies:
     "@types/urijs" "github:quicktype/types-urijs"
-    collection-utils "0.0.15"
+    collection-utils "^1.0.1"
     js-base64 "^2.4.3"
     pako "^1.0.6"
     pluralize "^7.0.0"
-    stream-json "0.5.2"
-    string-to-stream "^1.1.0"
     unicode-properties "github:quicktype/unicode-properties#dist"
     urijs "^1.19.1"
     wordwrap "^1.0.0"
@@ -7991,7 +7984,7 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.0, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.3:
+"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.3:
   version "2.3.6"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
@@ -9318,13 +9311,6 @@ stream-http@^2.7.2:
     to-arraybuffer "^1.0.0"
     xtend "^4.0.0"
 
-stream-json@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/stream-json/-/stream-json-0.5.2.tgz#f4256c0ef1a905f2ef2d473706b4b3ff827653cf"
-  integrity sha512-/QlOLybrc6LkH/oVgXo1lJ8oemRIze/grdpfssLn1Pm8nZVhW4VMOqDDYGaORPodQFxiDEUquQJER5LiBu8Ehg==
-  dependencies:
-    parser-toolkit ">=0.0.3"
-
 stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
@@ -9345,14 +9331,6 @@ strict-uri-encode@^1.0.0:
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
   integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
 
-string-to-stream@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string-to-stream/-/string-to-stream-1.1.1.tgz#aba78f73e70661b130ee3e1c0192be4fef6cb599"
-  integrity sha512-QySF2+3Rwq0SdO3s7BAp4x+c3qsClpPQ6abAmb0DGViiSBAkT5kL6JT2iyzEVP+T1SmzHrQD1TwlP9QAHCc+Sw==
-  dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.1.0"
-
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"

From a12a4e02a4689b5bdbc6e740c0d9865afb55671a Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 30 Nov 2018 11:53:36 +0100
Subject: [PATCH 0509/1703] feat(@schematics/angular): consistent naming of
 options and arguments that do the same thing

This aligns options that do the same thing:
1) `skipSpecs` and `spec` has been deprecated in favor of `skipTests`.
2) `styleext` has been deprecated in favor of `style` since the latest is two words.

Fixes #12784
---
 packages/angular/cli/lib/config/schema.json   | 42 ++++++++++++++-----
 .../schematics/angular/application/index.ts   | 12 +++---
 .../angular/application/index_spec.ts         |  2 -
 .../application/other-files/app.component.ts  |  2 +-
 packages/schematics/angular/class/index.ts    |  5 ++-
 packages/schematics/angular/class/schema.json |  8 +++-
 ...=> __name@dasherize__.component.__style__} |  0
 .../__name@dasherize__.component.ts           |  2 +-
 .../schematics/angular/component/index.ts     | 13 ++++--
 .../angular/component/index_spec.ts           | 38 +++++++++++++++--
 .../schematics/angular/component/schema.json  | 14 ++++++-
 .../schematics/angular/directive/index.ts     |  5 ++-
 .../angular/directive/index_spec.ts           |  2 -
 .../schematics/angular/directive/schema.json  | 12 ++++--
 packages/schematics/angular/guard/index.ts    |  5 ++-
 .../schematics/angular/guard/index_spec.ts    |  6 +--
 packages/schematics/angular/guard/schema.json |  8 +++-
 packages/schematics/angular/pipe/index.ts     |  5 ++-
 packages/schematics/angular/pipe/schema.json  |  8 +++-
 packages/schematics/angular/service/index.ts  |  5 ++-
 .../schematics/angular/service/index_spec.ts  |  7 +---
 .../schematics/angular/service/schema.json    |  8 +++-
 tests/legacy-cli/e2e/tests/generate/class.ts  |  2 +-
 23 files changed, 158 insertions(+), 53 deletions(-)
 rename packages/schematics/angular/component/files/__name@dasherize@if-flat__/{__name@dasherize__.component.__styleext__ => __name@dasherize__.component.__style__} (100%)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index 8a313ea14553..81a110fa73c0 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -139,6 +139,11 @@
               "type": "string",
               "default": "css"
             },
+            "style": {
+              "description": "The file extension to use for style files.",
+              "type": "string",
+              "default": "css"
+            },
             "viewEncapsulation": {
               "description": "Specifies the view encapsulation strategy.",
               "enum": ["Emulated", "Native", "None", "ShadowDom"],
@@ -186,6 +191,11 @@
               "type": "boolean",
               "description": "Specifies if a spec file is generated.",
               "default": true
+            },
+            "skipTests": {
+              "type": "boolean",
+              "description": "When true, does not create test files.",
+              "default": false
             }
           }
         },
@@ -203,11 +213,6 @@
               "description": "The scope for the generated routing.",
               "default": "Child"
             },
-            "spec": {
-              "type": "boolean",
-              "description": "Specifies if a spec file is generated.",
-              "default": true
-            },
             "flat": {
               "type": "boolean",
               "description": "Flag to indicate if a directory is created.",
@@ -236,8 +241,13 @@
             },
             "spec": {
               "type": "boolean",
-              "default": true,
-              "description": "Specifies if a spec file is generated."
+              "description": "Specifies if a spec file is generated.",
+              "default": true
+            },
+            "skipTests": {
+              "type": "boolean",
+              "description": "When true, does not create test files.",
+              "default": false
             }
           }
         },
@@ -251,8 +261,13 @@
             },
             "spec": {
               "type": "boolean",
-              "default": true,
-              "description": "Specifies if a spec file is generated."
+              "description": "Specifies if a spec file is generated.",
+              "default": true
+            },
+            "skipTests": {
+              "type": "boolean",
+              "description": "When true, does not create test files.",
+              "default": false
             },
             "skipImport": {
               "type": "boolean",
@@ -277,8 +292,13 @@
           "properties": {
             "spec": {
               "type": "boolean",
-              "default": true,
-              "description": "Specifies if a spec file is generated."
+              "description": "Specifies if a spec file is generated.",
+              "default": true
+            },
+            "skipTests": {
+              "type": "boolean",
+              "description": "When true, does not create test files.",
+              "default": false
             }
           }
         }
diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 1739407d83b0..09608e0c0a58 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -136,7 +136,7 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
       if (!(`@schematics/angular:${type}` in schematics)) {
         schematics[`@schematics/angular:${type}`] = {};
       }
-      (schematics[`@schematics/angular:${type}`] as JsonObject).spec = false;
+      (schematics[`@schematics/angular:${type}`] as JsonObject).skipTests = true;
     });
   }
 
@@ -264,15 +264,15 @@ export default function (options: ApplicationOptions): Rule {
       {
         inlineStyle: options.inlineStyle,
         inlineTemplate: options.inlineTemplate,
-        spec: !options.skipTests,
-        styleext: options.style,
+        skipTests: options.skipTests,
+        style: options.style,
         viewEncapsulation: options.viewEncapsulation,
       } :
       {
         inlineStyle: true,
         inlineTemplate: true,
-        spec: false,
-        styleext: options.style,
+        skipTests: true,
+        style: options.style,
       };
 
     const workspace = getWorkspace(host);
@@ -361,7 +361,7 @@ export default function (options: ApplicationOptions): Rule {
       mergeWith(
         apply(url('./other-files'), [
           componentOptions.inlineTemplate ? filter(path => !path.endsWith('.html')) : noop(),
-          !componentOptions.spec ? filter(path => !path.endsWith('.spec.ts')) : noop(),
+          componentOptions.skipTests ? filter(path => !/[.|-]spec.ts$/.test(path)) : noop(),
           template({
             utils: strings,
             ...options as any,  // tslint:disable-line:no-any
diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
index 88b4c23ae487..a7262fa00ce4 100644
--- a/packages/schematics/angular/application/index_spec.ts
+++ b/packages/schematics/angular/application/index_spec.ts
@@ -29,8 +29,6 @@ describe('Application Schematic', () => {
     inlineStyle: false,
     inlineTemplate: false,
     routing: false,
-    style: 'css',
-    skipTests: false,
     skipPackageJson: false,
   };
 
diff --git a/packages/schematics/angular/application/other-files/app.component.ts b/packages/schematics/angular/application/other-files/app.component.ts
index fb3e8bf8a20e..36845433365f 100644
--- a/packages/schematics/angular/application/other-files/app.component.ts
+++ b/packages/schematics/angular/application/other-files/app.component.ts
@@ -28,7 +28,7 @@ import { Component } from '@angular/core';
   `,<% } else { %>
   templateUrl: './app.component.html',<% } if(inlineStyle) { %>
   styles: []<% } else { %>
-  styleUrls: ['./app.component.<%= styleext %>']<% } %>
+  styleUrls: ['./app.component.<%= style %>']<% } %>
 })
 export class AppComponent {
   title = '<%= name %>';
diff --git a/packages/schematics/angular/class/index.ts b/packages/schematics/angular/class/index.ts
index 32551fb97ef7..0c34613e8dc8 100644
--- a/packages/schematics/angular/class/index.ts
+++ b/packages/schematics/angular/class/index.ts
@@ -42,8 +42,11 @@ export default function (options: ClassOptions): Rule {
     options.name = parsedPath.name;
     options.path = parsedPath.path;
 
+    // todo remove these when we remove the deprecations
+    options.skipTests = options.skipTests || !options.spec;
+
     const templateSource = apply(url('./files'), [
-      options.spec ? noop() : filter(path => !path.endsWith('.spec.ts')),
+      options.skipTests ? filter(path => !path.endsWith('.spec.ts')) : noop(),
       template({
         ...strings,
         ...options,
diff --git a/packages/schematics/angular/class/schema.json b/packages/schematics/angular/class/schema.json
index 7d1d12877afb..c9b39d1d5abe 100644
--- a/packages/schematics/angular/class/schema.json
+++ b/packages/schematics/angular/class/schema.json
@@ -29,7 +29,13 @@
     },
     "spec": {
       "type": "boolean",
-      "description": "When true, generates a \"spec.ts\" test file for the new class.",
+      "description": "When true (the default), generates a  \"spec.ts\" test file for the new class.",
+      "default": true,
+      "x-deprecated": "Use \"skipTests\" instead."
+    },
+    "skipTests": {
+      "type": "boolean",
+      "description": "When true, does not create \"spec.ts\" test files for the new class.",
       "default": false
     },
     "type": {
diff --git a/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__ b/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.__style__
similarity index 100%
rename from packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.__styleext__
rename to packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.__style__
diff --git a/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.ts b/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.ts
index a314e02f22c0..05940077a7fb 100644
--- a/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.ts
+++ b/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.ts
@@ -9,7 +9,7 @@ import { Component, OnInit<% if(!!viewEncapsulation) { %>, ViewEncapsulation<% }
   `,<% } else { %>
   templateUrl: './<%= dasherize(name) %>.component.html',<% } if(inlineStyle) { %>
   styles: []<% } else { %>
-  styleUrls: ['./<%= dasherize(name) %>.component.<%= styleext %>']<% } %><% if(!!viewEncapsulation) { %>,
+  styleUrls: ['./<%= dasherize(name) %>.component.<%= style %>']<% } %><% if(!!viewEncapsulation) { %>,
   encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection !== 'Default') { %>,
   changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %>
 })
diff --git a/packages/schematics/angular/component/index.ts b/packages/schematics/angular/component/index.ts
index a62a471652cb..4b4da694d1b9 100644
--- a/packages/schematics/angular/component/index.ts
+++ b/packages/schematics/angular/component/index.ts
@@ -125,7 +125,7 @@ function buildSelector(options: ComponentOptions, projectPrefix: string) {
 }
 
 
-export default function(options: ComponentOptions): Rule {
+export default function (options: ComponentOptions): Rule {
   return (host: Tree) => {
     if (!options.project) {
       throw new SchematicsException('Option (project) is required.');
@@ -143,12 +143,19 @@ export default function(options: ComponentOptions): Rule {
     options.path = parsedPath.path;
     options.selector = options.selector || buildSelector(options, project.prefix);
 
+    // todo remove these when we remove the deprecations
+    options.style = (
+      options.style && options.style !== 'css'
+        ? options.style : options.styleext
+    ) || 'css';
+    options.skipTests = options.skipTests || !options.spec;
+
     validateName(options.name);
     validateHtmlSelector(options.selector);
 
     const templateSource = apply(url('./files'), [
-      options.spec ? noop() : filter(path => !path.endsWith('.spec.ts')),
-      options.inlineStyle ? filter(path => !path.endsWith('.__styleext__')) : noop(),
+      options.skipTests ? filter(path => !path.endsWith('.spec.ts')) : noop(),
+      options.inlineStyle ? filter(path => !path.endsWith('.__style__')) : noop(),
       options.inlineTemplate ? filter(path => !path.endsWith('.html')) : noop(),
       template({
         ...strings,
diff --git a/packages/schematics/angular/component/index_spec.ts b/packages/schematics/angular/component/index_spec.ts
index e1e035a21206..f131c1212b8c 100644
--- a/packages/schematics/angular/component/index_spec.ts
+++ b/packages/schematics/angular/component/index_spec.ts
@@ -24,8 +24,8 @@ describe('Component Schematic', () => {
     inlineStyle: false,
     inlineTemplate: false,
     changeDetection: ChangeDetection.Default,
-    styleext: 'css',
-    spec: true,
+    style: 'css',
+    skipTests: false,
     module: undefined,
     export: false,
     project: 'bar',
@@ -249,8 +249,8 @@ describe('Component Schematic', () => {
     expect(tree.files).not.toContain('/projects/bar/src/app/foo/foo.component.css');
   });
 
-  it('should respect the styleext option', () => {
-    const options = { ...defaultOptions, styleext: 'scss' };
+  it('should respect the style option', () => {
+    const options = { ...defaultOptions, style: 'scss' };
     const tree = schematicRunner.runSchematic('component', options, appTree);
     const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(content).toMatch(/styleUrls: \['.\/foo.component.scss/);
@@ -310,4 +310,34 @@ describe('Component Schematic', () => {
     appTree = schematicRunner.runSchematic('component', defaultOptions, appTree);
     expect(appTree.files).toContain('/projects/bar/custom/app/foo/foo.component.ts');
   });
+
+  // testing deprecating options don't cause conflicts
+  it('should respect the deprecated styleext (scss) option', () => {
+    const options = { ...defaultOptions, style: undefined, styleext: 'scss' };
+    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const files = tree.files;
+    expect(files).toContain('/projects/bar/src/app/foo/foo.component.scss');
+  });
+
+  it('should respect the deprecated styleext (css) option', () => {
+    const options = { ...defaultOptions, style: undefined, styleext: 'css' };
+    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const files = tree.files;
+    expect(files).toContain('/projects/bar/src/app/foo/foo.component.css');
+  });
+
+  it('should respect the deprecated spec option when false', () => {
+    const options = { ...defaultOptions, skipTests: undefined, spec: false };
+    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const files = tree.files;
+    expect(files).not.toContain('/projects/bar/src/app/foo/foo.component.spec.ts');
+  });
+
+  it('should respect the deprecated spec option when true', () => {
+    const options = { ...defaultOptions, skipTests: false, spec: true };
+    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const files = tree.files;
+    expect(files).toContain('/projects/bar/src/app/foo/foo.component.spec.ts');
+  });
+
 });
diff --git a/packages/schematics/angular/component/schema.json b/packages/schematics/angular/component/schema.json
index 8df70ceb9135..52f76592833e 100644
--- a/packages/schematics/angular/component/schema.json
+++ b/packages/schematics/angular/component/schema.json
@@ -67,6 +67,12 @@
       ]
     },
     "styleext": {
+      "description": "The file extension to use for style files.",
+      "type": "string",
+      "default": "css",
+      "x-deprecated": "Use \"style\" instead."
+    },
+    "style": {
       "description": "The file extension to use for style files.",
       "type": "string",
       "default": "css"
@@ -74,7 +80,13 @@
     "spec": {
       "type": "boolean",
       "description": "When true (the default), generates a  \"spec.ts\" test file for the new component.",
-      "default": true
+      "default": true,
+      "x-deprecated": "Use \"skipTests\" instead."
+    },
+    "skipTests": {
+      "type": "boolean",
+      "description": "When true, does not create \"spec.ts\" test files for the new component.",
+      "default": false
     },
     "flat": {
       "type": "boolean",
diff --git a/packages/schematics/angular/directive/index.ts b/packages/schematics/angular/directive/index.ts
index 053ba4ffa223..9d96b8e8a082 100644
--- a/packages/schematics/angular/directive/index.ts
+++ b/packages/schematics/angular/directive/index.ts
@@ -121,8 +121,11 @@ export default function (options: DirectiveOptions): Rule {
 
     validateHtmlSelector(options.selector);
 
+    // todo remove these when we remove the deprecations
+    options.skipTests = options.skipTests || !options.spec;
+
     const templateSource = apply(url('./files'), [
-      options.spec ? noop() : filter(path => !path.endsWith('.spec.ts')),
+      options.skipTests ? filter(path => !path.endsWith('.spec.ts')) : noop(),
       template({
         ...strings,
         'if-flat': (s: string) => options.flat ? '' : s,
diff --git a/packages/schematics/angular/directive/index_spec.ts b/packages/schematics/angular/directive/index_spec.ts
index 750115183479..cdcc3555d4a3 100644
--- a/packages/schematics/angular/directive/index_spec.ts
+++ b/packages/schematics/angular/directive/index_spec.ts
@@ -18,7 +18,6 @@ describe('Directive Schematic', () => {
   );
   const defaultOptions: DirectiveOptions = {
     name: 'foo',
-    spec: true,
     module: undefined,
     export: false,
     prefix: 'app',
@@ -37,7 +36,6 @@ describe('Directive Schematic', () => {
     inlineStyle: false,
     inlineTemplate: false,
     routing: false,
-    style: 'css',
     skipTests: false,
     skipPackageJson: false,
   };
diff --git a/packages/schematics/angular/directive/schema.json b/packages/schematics/angular/directive/schema.json
index e6ace492e30b..bc5aa7605233 100644
--- a/packages/schematics/angular/directive/schema.json
+++ b/packages/schematics/angular/directive/schema.json
@@ -44,7 +44,13 @@
     "spec": {
       "type": "boolean",
       "description": "When true (the default), generates a  \"spec.ts\" test file for the new directive.",
-      "default": true
+      "default": true,
+      "x-deprecated": "Use \"skipTests\" instead."
+    },
+    "skipTests": {
+      "type": "boolean",
+      "description": "When true, does not create \"spec.ts\" test files for the new class.",
+      "default": false
     },
     "skipImport": {
       "type": "boolean",
@@ -61,7 +67,7 @@
       "description": "When true (the default), creates the new files at the top level of the current project.",
       "default": true
     },
-    "module":  {
+    "module": {
       "type": "string",
       "description": "The declaring NgModule.",
       "alias": "m"
@@ -80,4 +86,4 @@
   "required": [
     "name"
   ]
-}
+}
\ No newline at end of file
diff --git a/packages/schematics/angular/guard/index.ts b/packages/schematics/angular/guard/index.ts
index 2c21622d5949..660caee84c35 100644
--- a/packages/schematics/angular/guard/index.ts
+++ b/packages/schematics/angular/guard/index.ts
@@ -41,8 +41,11 @@ export default function (options: GuardOptions): Rule {
     options.name = parsedPath.name;
     options.path = parsedPath.path;
 
+    // todo remove these when we remove the deprecations
+    options.skipTests = options.skipTests || !options.spec;
+
     const templateSource = apply(url('./files'), [
-      options.spec ? noop() : filter(path => !path.endsWith('.spec.ts')),
+      options.skipTests ? filter(path => !path.endsWith('.spec.ts')) : noop(),
       template({
         ...strings,
         ...options,
diff --git a/packages/schematics/angular/guard/index_spec.ts b/packages/schematics/angular/guard/index_spec.ts
index 919b47b470b4..7c0077fd089b 100644
--- a/packages/schematics/angular/guard/index_spec.ts
+++ b/packages/schematics/angular/guard/index_spec.ts
@@ -18,7 +18,6 @@ describe('Guard Schematic', () => {
   );
   const defaultOptions: GuardOptions = {
     name: 'foo',
-    spec: true,
     flat: true,
     project: 'bar',
   };
@@ -33,7 +32,6 @@ describe('Guard Schematic', () => {
     inlineStyle: false,
     inlineTemplate: false,
     routing: false,
-    style: 'css',
     skipTests: false,
     skipPackageJson: false,
   };
@@ -50,8 +48,8 @@ describe('Guard Schematic', () => {
     expect(files).toContain('/projects/bar/src/app/foo.guard.ts');
   });
 
-  it('should respect the spec flag', () => {
-    const options = { ...defaultOptions, spec: false };
+  it('should respect the skipTests flag', () => {
+    const options = { ...defaultOptions, skipTests: true };
 
     const tree = schematicRunner.runSchematic('guard', options, appTree);
     const files = tree.files;
diff --git a/packages/schematics/angular/guard/schema.json b/packages/schematics/angular/guard/schema.json
index c2a528deaa85..a71b831a974f 100644
--- a/packages/schematics/angular/guard/schema.json
+++ b/packages/schematics/angular/guard/schema.json
@@ -17,7 +17,13 @@
     "spec": {
       "type": "boolean",
       "description": "When true (the default), generates a  \"spec.ts\" test file for the new guard.",
-      "default": true
+      "default": true,
+      "x-deprecated": "Use \"skipTests\" instead."
+    },
+    "skipTests": {
+      "type": "boolean",
+      "description": "When true, does not create \"spec.ts\" test files for the new guard.",
+      "default": false
     },
     "flat": {
       "type": "boolean",
diff --git a/packages/schematics/angular/pipe/index.ts b/packages/schematics/angular/pipe/index.ts
index eaf28616d1b4..5b76749a5643 100644
--- a/packages/schematics/angular/pipe/index.ts
+++ b/packages/schematics/angular/pipe/index.ts
@@ -102,8 +102,11 @@ export default function (options: PipeOptions): Rule {
 
     options.module = findModuleFromOptions(host, options);
 
+    // todo remove these when we remove the deprecations
+    options.skipTests = options.skipTests || !options.spec;
+
     const templateSource = apply(url('./files'), [
-      options.spec ? noop() : filter(path => !path.endsWith('.spec.ts')),
+      options.skipTests ? filter(path => !path.endsWith('.spec.ts')) : noop(),
       template({
         ...strings,
         'if-flat': (s: string) => options.flat ? '' : s,
diff --git a/packages/schematics/angular/pipe/schema.json b/packages/schematics/angular/pipe/schema.json
index eb77636b1f10..a3360265f937 100644
--- a/packages/schematics/angular/pipe/schema.json
+++ b/packages/schematics/angular/pipe/schema.json
@@ -35,7 +35,13 @@
     "spec": {
       "type": "boolean",
       "default": true,
-      "description": "When true (the default), generates a  \"spec.ts\" test file for the new pipe."
+      "description": "When true (the default), generates a  \"spec.ts\" test file for the new pipe.",
+      "x-deprecated": "Use \"skipTests\" instead."
+    },
+    "skipTests": {
+      "type": "boolean",
+      "description": "When true, does not create \"spec.ts\" test files for the new pipe.",
+      "default": false
     },
     "skipImport": {
       "type": "boolean",
diff --git a/packages/schematics/angular/service/index.ts b/packages/schematics/angular/service/index.ts
index 2c9e57b3be58..c5547ebf67da 100644
--- a/packages/schematics/angular/service/index.ts
+++ b/packages/schematics/angular/service/index.ts
@@ -39,8 +39,11 @@ export default function (options: ServiceOptions): Rule {
     options.name = parsedPath.name;
     options.path = parsedPath.path;
 
+    // todo remove these when we remove the deprecations
+    options.skipTests = options.skipTests || !options.spec;
+
     const templateSource = apply(url('./files'), [
-      options.spec ? noop() : filter(path => !path.endsWith('.spec.ts')),
+      options.skipTests ? filter(path => !path.endsWith('.spec.ts')) : noop(),
       template({
         ...strings,
         'if-flat': (s: string) => options.flat ? '' : s,
diff --git a/packages/schematics/angular/service/index_spec.ts b/packages/schematics/angular/service/index_spec.ts
index 57367a7b7dc4..f974d83002b4 100644
--- a/packages/schematics/angular/service/index_spec.ts
+++ b/packages/schematics/angular/service/index_spec.ts
@@ -18,7 +18,6 @@ describe('Service Schematic', () => {
   );
   const defaultOptions: ServiceOptions = {
     name: 'foo',
-    spec: true,
     flat: false,
     project: 'bar',
   };
@@ -34,8 +33,6 @@ describe('Service Schematic', () => {
     inlineStyle: false,
     inlineTemplate: false,
     routing: false,
-    style: 'css',
-    skipTests: false,
     skipPackageJson: false,
   };
   let appTree: UnitTestTree;
@@ -61,8 +58,8 @@ describe('Service Schematic', () => {
     expect(content).toMatch(/providedIn: 'root'/);
   });
 
-  it('should respect the spec flag', () => {
-    const options = { ...defaultOptions, spec: false };
+  it('should respect the skipTests flag', () => {
+    const options = { ...defaultOptions, skipTests: true };
 
     const tree = schematicRunner.runSchematic('service', options, appTree);
     const files = tree.files;
diff --git a/packages/schematics/angular/service/schema.json b/packages/schematics/angular/service/schema.json
index c56b0fff0ade..112ad32b8e56 100644
--- a/packages/schematics/angular/service/schema.json
+++ b/packages/schematics/angular/service/schema.json
@@ -35,7 +35,13 @@
     "spec": {
       "type": "boolean",
       "default": true,
-      "description": "When true (the default), generates a  \"spec.ts\" test file for the new service."
+      "description": "When true (the default), generates a  \"spec.ts\" test file for the new service.",
+      "x-deprecated": "Use \"skipTests\" instead."
+    },
+    "skipTests": {
+      "type": "boolean",
+      "description": "When true, does not create \"spec.ts\" test files for the new service.",
+      "default": false
     },
     "lintFix": {
       "type": "boolean",
diff --git a/tests/legacy-cli/e2e/tests/generate/class.ts b/tests/legacy-cli/e2e/tests/generate/class.ts
index 42bbca037df5..aa3ba25b5899 100644
--- a/tests/legacy-cli/e2e/tests/generate/class.ts
+++ b/tests/legacy-cli/e2e/tests/generate/class.ts
@@ -6,7 +6,7 @@ import {expectFileToExist} from '../../utils/fs';
 export default function() {
   const projectDir = join('src', 'app');
 
-  return ng('generate', 'class', 'test-class', '--spec')
+  return ng('generate', 'class', 'test-class')
     .then(() => expectFileToExist(projectDir))
     .then(() => expectFileToExist(join(projectDir, 'test-class.ts')))
     .then(() => expectFileToExist(join(projectDir, 'test-class.spec.ts')))

From c83be5e555dbad53ad445ef0c3cacaf4ac5730dc Mon Sep 17 00:00:00 2001
From: JiaLiPassion <JiaLi.Passion@gmail.com>
Date: Wed, 5 Dec 2018 00:13:09 +0900
Subject: [PATCH 0510/1703] fix(@schematics/angular): import zone related flags
 in other files fix #12886

---
 .../application/files/src/polyfills.ts        | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/packages/schematics/angular/application/files/src/polyfills.ts b/packages/schematics/angular/application/files/src/polyfills.ts
index ee8b84da807c..a5b8c7f63e26 100644
--- a/packages/schematics/angular/application/files/src/polyfills.ts
+++ b/packages/schematics/angular/application/files/src/polyfills.ts
@@ -57,18 +57,27 @@
 /**
  * By default, zone.js will patch all possible macroTask and DomEvents
  * user can disable parts of macroTask/DomEvents patch by setting following flags
+ * because those flags need to be set before `zone.js` being loaded, and webpack
+ * will put import in the top of bundle, so user need to create a separate file
+ * in this directory (for example: zone-flags.ts), and put the following flags
+ * into that file, and then add the following code before importing zone.js.
+ * import './zone-flags.ts';
+ *
+ * The flags allowed in zone-flags.ts are listed here.
+ *
+ * The following flags will work for all browsers.
+ *
+ * (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
+ * (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
+ * (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
+ *
+ *  in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
+ *  with the following flag, it will bypass `zone.js` patch for IE/Edge
+ *
+ *  (window as any).__Zone_enable_cross_context_check = true;
+ *
  */
 
- // (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
- // (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
- // (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
-
- /*
- * in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
- * with the following flag, it will bypass `zone.js` patch for IE/Edge
- */
-// (window as any).__Zone_enable_cross_context_check = true;
-
 /***************************************************************************************************
  * Zone JS is required by default for Angular itself.
  */

From f066e99e3a8a39b4ea7e2ad15f0a86464e94451e Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 29 Nov 2018 12:22:15 -0500
Subject: [PATCH 0511/1703] feat(@angular/cli): initial minimal BEP support

---
 packages/angular/cli/commands/build.json      | 11 ++-
 packages/angular/cli/commands/serve.json      | 11 ++-
 .../angular/cli/models/architect-command.ts   | 62 +++++++++++++++--
 packages/angular/cli/utilities/bep.ts         | 68 +++++++++++++++++++
 4 files changed, 143 insertions(+), 9 deletions(-)
 create mode 100644 packages/angular/cli/utilities/bep.ts

diff --git a/packages/angular/cli/commands/build.json b/packages/angular/cli/commands/build.json
index 043b370a998c..62e962ad1aca 100644
--- a/packages/angular/cli/commands/build.json
+++ b/packages/angular/cli/commands/build.json
@@ -11,6 +11,15 @@
 
   "allOf": [
     { "$ref": "./definitions.json#/definitions/architect" },
-    { "$ref": "./definitions.json#/definitions/base" }
+    { "$ref": "./definitions.json#/definitions/base" },
+    {
+      "type": "object",
+      "properties": {
+        "buildEventLog": {
+          "type": "string",
+          "description": "(experimental) Output file path for Build Event Protocol events"
+        }
+      }
+    }
   ]
 }
diff --git a/packages/angular/cli/commands/serve.json b/packages/angular/cli/commands/serve.json
index 9b01a5039cb5..e9be2a0dedc1 100644
--- a/packages/angular/cli/commands/serve.json
+++ b/packages/angular/cli/commands/serve.json
@@ -12,6 +12,15 @@
   "type": "object",
   "allOf": [
     { "$ref": "./definitions.json#/definitions/architect" },
-    { "$ref": "./definitions.json#/definitions/base" }
+    { "$ref": "./definitions.json#/definitions/base" },
+    {
+      "type": "object",
+      "properties": {
+        "buildEventLog": {
+          "type": "string",
+          "description": "(experimental) Output file path for Build Event Protocol events"
+        }
+      }
+    }
   ]
 }
diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index d847788f31a3..36fa2afab0ca 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -7,11 +7,13 @@
  */
 import {
   Architect,
+  BuilderConfiguration,
   BuilderContext,
   TargetSpecifier,
 } from '@angular-devkit/architect';
 import { experimental, json, schema, tags } from '@angular-devkit/core';
-import { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node';
+import { NodeJsSyncHost } from '@angular-devkit/core/node';
+import { BepJsonWriter } from '../utilities/bep';
 import { parseJsonSchemaToOptions } from '../utilities/json-schema';
 import { BaseCommandOptions, Command } from './command';
 import { Arguments, Option } from './interface';
@@ -169,14 +171,46 @@ export abstract class ArchitectCommand<
     return await this.runArchitectTarget(options);
   }
 
-  protected async runSingleTarget(targetSpec: TargetSpecifier, options: string[]) {
+  protected async runBepTarget<T>(
+    command: string,
+    configuration: BuilderConfiguration<T>,
+    buildEventLog: string,
+  ): Promise<number> {
+    const bep = new BepJsonWriter(buildEventLog);
+
+    // Send start
+    bep.writeBuildStarted(command);
+
+    let last = 1;
+    let rebuild = false;
+    await this._architect.run(configuration, { logger: this.logger }).forEach(event => {
+      last = event.success ? 0 : 1;
+
+      if (rebuild) {
+        // NOTE: This will have an incorrect timestamp but this cannot be fixed
+        //       until builders report additional status events
+        bep.writeBuildStarted(command);
+      } else {
+        rebuild = true;
+      }
+
+      bep.writeBuildFinished(last);
+    });
+
+    return last;
+  }
+
+  protected async runSingleTarget(
+    targetSpec: TargetSpecifier,
+    targetOptions: string[],
+    commandOptions: ArchitectCommandOptions & Arguments) {
     // We need to build the builderSpec twice because architect does not understand
     // overrides separately (getting the configuration builds the whole project, including
     // overrides).
     const builderConf = this._architect.getBuilderConfiguration(targetSpec);
     const builderDesc = await this._architect.getBuilderDescription(builderConf).toPromise();
     const targetOptionArray = await parseJsonSchemaToOptions(this._registry, builderDesc.schema);
-    const overrides = parseArguments(options, targetOptionArray, this.logger);
+    const overrides = parseArguments(targetOptions, targetOptionArray, this.logger);
 
     if (overrides['--']) {
       (overrides['--'] || []).forEach(additional => {
@@ -190,9 +224,23 @@ export abstract class ArchitectCommand<
       logger: this.logger,
       targetSpecifier: targetSpec,
     };
-    const result = await this._architect.run(realBuilderConf, builderContext).toPromise();
 
-    return result.success ? 0 : 1;
+    if (commandOptions.buildEventLog && ['build', 'serve'].includes(this.description.name)) {
+      // The build/serve commands supports BEP messaging
+      this.logger.warn('BEP support is experimental and subject to change.');
+
+      return this.runBepTarget(
+        this.description.name,
+        realBuilderConf,
+        commandOptions.buildEventLog as string,
+      );
+    } else {
+      const result = await this._architect
+        .run(realBuilderConf, builderContext)
+        .toPromise();
+
+      return result.success ? 0 : 1;
+    }
   }
 
   protected async runArchitectTarget(
@@ -207,12 +255,12 @@ export abstract class ArchitectCommand<
         // Running them in parallel would jumble the log messages.
         let result = 0;
         for (const project of this.getProjectNamesByTarget(this.target)) {
-          result |= await this.runSingleTarget({ ...targetSpec, project }, extra);
+          result |= await this.runSingleTarget({ ...targetSpec, project }, extra, options);
         }
 
         return result;
       } else {
-        return await this.runSingleTarget(targetSpec, extra);
+        return await this.runSingleTarget(targetSpec, extra, options);
       }
     } catch (e) {
       if (e instanceof schema.SchemaValidationException) {
diff --git a/packages/angular/cli/utilities/bep.ts b/packages/angular/cli/utilities/bep.ts
new file mode 100644
index 000000000000..8acb5ec7cd3b
--- /dev/null
+++ b/packages/angular/cli/utilities/bep.ts
@@ -0,0 +1,68 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import * as fs from 'fs';
+
+
+export interface BuildEventMessage {
+  id: {};
+  [key: string]: {};
+}
+
+export class BepGenerator {
+  private constructor() {}
+
+  static createBuildStarted(command: string, time?: number): BuildEventMessage {
+    return {
+      id: { started: {} },
+      started: {
+        command,
+        start_time_millis: time == undefined ? Date.now() : time,
+      },
+    };
+  }
+
+  static createBuildFinished(code: number, time?: number): BuildEventMessage {
+    return {
+      id: { finished: {} },
+      finished: {
+        finish_time_millis: time == undefined ? Date.now() : time,
+        exit_code: { code },
+      },
+    };
+  }
+}
+
+export class BepJsonWriter {
+  private stream = fs.createWriteStream(this.filename);
+
+  constructor(public readonly filename: string) {
+
+  }
+
+  close(): void {
+    this.stream.close();
+  }
+
+  writeEvent(event: BuildEventMessage): void {
+    const raw = JSON.stringify(event);
+
+    this.stream.write(raw + '\n');
+  }
+
+  writeBuildStarted(command: string, time?: number): void {
+    const event = BepGenerator.createBuildStarted(command, time);
+
+    this.writeEvent(event);
+  }
+
+  writeBuildFinished(code: number, time?: number): void {
+    const event = BepGenerator.createBuildFinished(code, time);
+
+    this.writeEvent(event);
+  }
+}

From f2ae4fed42365f1416506eb5e21b0a0941d00f75 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 29 Nov 2018 12:41:30 -0500
Subject: [PATCH 0512/1703] test(@angular/cli): add e2e test for experimental
 initial BEP support

---
 tests/legacy-cli/e2e/tests/experimental/bep.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 tests/legacy-cli/e2e/tests/experimental/bep.ts

diff --git a/tests/legacy-cli/e2e/tests/experimental/bep.ts b/tests/legacy-cli/e2e/tests/experimental/bep.ts
new file mode 100644
index 000000000000..863b1cac9397
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/experimental/bep.ts
@@ -0,0 +1,10 @@
+import { ng } from '../../utils/process';
+import { expectFileToMatch } from '../../utils/fs';
+
+
+export default async function() {
+  await ng('build', '--build-event-log', 'bep-log.txt');
+
+  await expectFileToMatch('bep-log.txt', '{"id":{"started":{}},"started":{"command":"build",');
+  await expectFileToMatch('bep-log.txt', '{"id":{"finished":{}},"finished":{"finish_time_millis":');
+}

From 603e6f40e160d4eadfb87f72c63939ef92e32511 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 10 Dec 2018 16:38:22 +0100
Subject: [PATCH 0513/1703] refactor: add time logs in
 `_listLazyRoutesFromProgram`

Add these time logs as at the moment we are not logging anything for the discovery lazy loaded modules
---
 .../webpack/src/angular_compiler_plugin.ts    | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 8d1286937801..ae315372ed6e 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -21,7 +21,6 @@ import {
   DEFAULT_ERROR_CODE,
   Diagnostic,
   EmitFlags,
-  LazyRoute,
   Program,
   SOURCE,
   UNKNOWN_ERROR_CODE,
@@ -423,25 +422,33 @@ export class AngularCompilerPlugin {
   }
 
   private _listLazyRoutesFromProgram(): LazyRouteMap {
-    let lazyRoutes: LazyRoute[];
+    let entryRoute: string | undefined;
+    let ngProgram: Program;
+
     if (this._JitMode) {
       if (!this.entryModule) {
         return {};
       }
 
-      const ngProgram = createProgram({
+      time('AngularCompilerPlugin._listLazyRoutesFromProgram.createProgram');
+      ngProgram = createProgram({
         rootNames: this._rootNames,
         options: { ...this._compilerOptions, genDir: '', collectAllErrors: true },
         host: this._compilerHost,
       });
+      timeEnd('AngularCompilerPlugin._listLazyRoutesFromProgram.createProgram');
 
-      lazyRoutes = ngProgram.listLazyRoutes(
-        this.entryModule.path + '#' + this.entryModule.className,
-      );
+      entryRoute = this.entryModule.path + '#' + this.entryModule.className;
     } else {
-      lazyRoutes = (this._program as Program).listLazyRoutes();
+      ngProgram = this._program as Program;
     }
 
+    time('AngularCompilerPlugin._listLazyRoutesFromProgram.listLazyRoutes');
+    // entryRoute will only be defined in JIT.
+    // In AOT all routes within the program are returned.
+    const lazyRoutes = ngProgram.listLazyRoutes(entryRoute);
+    timeEnd('AngularCompilerPlugin._listLazyRoutesFromProgram.listLazyRoutes');
+
     return lazyRoutes.reduce(
       (acc, curr) => {
         const ref = curr.route;

From 42962571be6472d68b297d6272202faf23d2f159 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 11 Dec 2018 18:50:18 +0100
Subject: [PATCH 0514/1703] fix(@angular-devkit/build-angular): output non
 human readable lint result

At the moment, when the tslint formatted is non human readable, it is being fully silenced.

This changes this behaviour and only emit the formatted result.

Fixes #13173
---
 .../build_angular/src/tslint/index.ts             | 15 +++++++--------
 .../build_angular/test/tslint/works_spec_large.ts |  1 +
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/tslint/index.ts b/packages/angular_devkit/build_angular/src/tslint/index.ts
index 6fcf8b11854e..525334b47950 100644
--- a/packages/angular_devkit/build_angular/src/tslint/index.ts
+++ b/packages/angular_devkit/build_angular/src/tslint/index.ts
@@ -63,12 +63,11 @@ export default class TslintBuilder implements Builder<TslintBuilderOptions> {
     const targetSpecifier = this.context.targetSpecifier;
     const projectName = targetSpecifier && targetSpecifier.project || '';
 
-    // Print formatter output directly for non human-readable formats.
-    if (!['prose', 'verbose', 'stylish'].includes(options.format)) {
-      options.silent = true;
-    }
+    // Print formatter output only for non human-readable formats.
+    const printInfo = ['prose', 'verbose', 'stylish'].includes(options.format)
+      && !options.silent;
 
-    if (!options.silent) {
+    if (printInfo) {
       this.context.logger.info(`Linting ${JSON.stringify(projectName)}...`);
     }
 
@@ -127,15 +126,15 @@ export default class TslintBuilder implements Builder<TslintBuilderOptions> {
         }
       }
 
-      if (result.warningCount > 0 && !options.silent) {
+      if (result.warningCount > 0 && printInfo) {
         this.context.logger.warn('Lint warnings found in the listed files.');
       }
 
-      if (result.errorCount > 0 && !options.silent) {
+      if (result.errorCount > 0 && printInfo) {
         this.context.logger.error('Lint errors found in the listed files.');
       }
 
-      if (result.warningCount === 0 && result.errorCount === 0 && !options.silent) {
+      if (result.warningCount === 0 && result.errorCount === 0 && printInfo) {
         this.context.logger.info('All files pass linting.');
       }
 
diff --git a/packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts b/packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts
index 583557cdf3b9..b3789f669b47 100644
--- a/packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts
@@ -43,6 +43,7 @@ describe('Tslint Target', () => {
       tap((buildEvent) => expect(buildEvent.success).toBe(true)),
       tap(() => {
         expect(logger.includes('Linting "app"...')).toBe(false);
+        expect(logger.includes('<checkstyle')).toBe(true);
       }),
     ).toPromise().then(done, done.fail);
   }, 30000);

From bc9d6eb3e7620b2327c86888b45f436ab7ebd537 Mon Sep 17 00:00:00 2001
From: jonwrede <jonas@wrede.sh>
Date: Wed, 12 Dec 2018 11:14:51 +0100
Subject: [PATCH 0515/1703] fix(@angular-devkit/build-angular): remove invalid
 colors option of ProgressPlugin

ProgressPlugin has no option colors https://github.com/webpack/webpack/issues/8487
ng serve fails if progress is shown
---
 .../src/angular-cli-files/models/webpack-configs/common.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 96d292f34381..07e1d9842714 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -150,7 +150,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
   }
 
   if (buildOptions.progress) {
-    extraPlugins.push(new ProgressPlugin({ profile: buildOptions.verbose, colors: true }));
+    extraPlugins.push(new ProgressPlugin({ profile: buildOptions.verbose }));
   }
 
   if (buildOptions.showCircularDependencies) {

From 8a41a00f1f3b3b4f9926129d3b56a832df8611db Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Wed, 12 Dec 2018 11:21:20 -0800
Subject: [PATCH 0516/1703] release: v7.2.0-beta.2

---
 .monorepo.json                                | 76 +++++++++----------
 .../angular/utility/latest-versions.ts        |  4 +-
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index ac43db373416..2ceb72e049ed 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,16 +42,16 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.12.0-beta.1",
-      "hash": "ed6f2ae751fd3db351a20ae55349e8ad"
+      "version": "0.12.0-beta.2",
+      "hash": "6d499b7cc1fecfdca1ee530d68af2743"
     },
     "@_/builders": {
-      "version": "0.12.0-beta.1",
-      "hash": "569aef8bc23693c344e71b9755e62c50"
+      "version": "0.12.0-beta.2",
+      "hash": "a365103b30adf919f51d22b50194fdac"
     },
     "devkit": {
-      "version": "0.12.0-beta.1",
-      "hash": "b8f475958757c03aca252fd75dbaec76"
+      "version": "0.12.0-beta.2",
+      "hash": "a88a5c4369bdc3630c57b4e7d1adba2f"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -62,15 +62,15 @@
           "url": "/packages/angular/cli/README.md"
         }
       ],
-      "version": "7.2.0-beta.1",
+      "version": "7.2.0-beta.2",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "c39ce3c768bdb81c5a6ae0adb3d011e7"
+      "hash": "4f0668deec9a8351949cd62a6215f9b5"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.12.0-beta.1",
-      "hash": "1ed5eefdcc4ff58d2f4c85a4119bf507",
+      "version": "0.12.0-beta.2",
+      "hash": "c2e1da139fda43ec14cb64cfd897aa2c",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -81,21 +81,21 @@
           "url": "/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.12.0-beta.1",
-      "hash": "5b02798914abe02edbbb9635adaee498",
+      "version": "0.12.0-beta.2",
+      "hash": "efc0359601df53132f8bee3928734709",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.12.0-beta.1",
-      "hash": "d2f9b2a0098b3f5f7acb3e2f697d18c9",
+      "version": "0.12.0-beta.2",
+      "hash": "4b5c5b53f2b42d05a09540a2cf43f043",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
       "name": "Benchmark",
       "section": "Tooling",
-      "version": "1.1.0-beta.1",
-      "hash": "c83dcb430abfa6f8da3fe1d2c547266a"
+      "version": "1.1.0-beta.2",
+      "hash": "ab57042eab08c6a6b2534aab8ca8bf39"
     },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
@@ -105,8 +105,8 @@
           "url": "/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.12.0-beta.1",
-      "hash": "6b14427c17a68496050cac8223d36ef1",
+      "version": "0.12.0-beta.2",
+      "hash": "3926ec467580658d8ef1252d70c747ac",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -117,8 +117,8 @@
           "url": "/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.12.0-beta.1",
-      "hash": "aae59da1e9bd86d5829ebd102b94f6a8",
+      "version": "0.12.0-beta.2",
+      "hash": "62d5216fc50b7891ddf02d0b967d5d7f",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -129,8 +129,8 @@
           "url": "/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.12.0-beta.1",
-      "hash": "71cc6d780859973414b1140e734ddc58",
+      "version": "0.12.0-beta.2",
+      "hash": "38a6a211d7b675d00b217a795deffa74",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -141,9 +141,9 @@
           "url": "/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.12.0-beta.1",
+      "version": "0.12.0-beta.2",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "51e18a98d5903a7d6e128ed980c88563"
+      "hash": "b4f84ae743a2c0fa26fc98335c23a035"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -153,8 +153,8 @@
           "url": "/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "7.2.0-beta.1",
-      "hash": "6bd16480043b9ee2a0931eb9ce1c694a",
+      "version": "7.2.0-beta.2",
+      "hash": "d03ae41f4379bb7a0bdb9a07b4a1940c",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -165,43 +165,43 @@
           "url": "/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "7.2.0-beta.1",
-      "hash": "5ddc5a92a2162e27812f4827b08ddc25",
+      "version": "7.2.0-beta.2",
+      "hash": "9eb31b36b046e77ec97716782a5e560f",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.12.0-beta.1",
-      "hash": "431bcef3f3d7a8ac8b5658ab4710c962",
+      "version": "0.12.0-beta.2",
+      "hash": "3c86a3ea224824d96929b7d070fc8640",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "7.2.0-beta.1",
+      "version": "7.2.0-beta.2",
       "section": "Misc",
-      "hash": "c5b78bc13f0d27721541cadaf5a41ba3",
+      "hash": "c6313537a351ab4cebedb9304f8e72dc",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "7.2.0-beta.1",
-      "hash": "970471e2e3491aad1792c96bfd19b472",
+      "version": "7.2.0-beta.2",
+      "hash": "3db6f68537d632af47e2d9b2436ec709",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.12.0-beta.1",
+      "version": "0.12.0-beta.2",
       "section": "Schematics",
-      "hash": "16627c5f7f50286ae19527683b0b9455",
+      "hash": "b46f7e6b0cc32be9ced8ba699de050db",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.12.0-beta.1",
+      "version": "0.12.0-beta.2",
       "section": "Schematics",
-      "hash": "bb2d3299fd9cc43823751b6d12a7df5c",
+      "hash": "40f04f82263df788028797d32e99c352",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 19b2529f1ed8..b90ae56a89fa 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -14,6 +14,6 @@ export const latestVersions = {
   TypeScript: '~3.1.6',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.12.0-beta.1',
-  DevkitBuildNgPackagr: '~0.12.0-beta.1',
+  DevkitBuildAngular: '~0.12.0-beta.2',
+  DevkitBuildNgPackagr: '~0.12.0-beta.2',
 };

From 601134d2a64e919f9dc69e0ef23c451b57783862 Mon Sep 17 00:00:00 2001
From: mhartington <mikehartington@gmail.com>
Date: Thu, 13 Dec 2018 10:09:43 -0500
Subject: [PATCH 0517/1703] docs(@schematics/angular): add note about older
 chrome in polyfills

Add note about polyfills being required in older chrome environments.
Addresses confusion seen in Ionic projects that are loaded in an Android
5 emulator, but has chrome 37.
---
 .../angular/application/files/src/polyfills.ts       | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/packages/schematics/angular/application/files/src/polyfills.ts b/packages/schematics/angular/application/files/src/polyfills.ts
index a5b8c7f63e26..55ff1be003db 100644
--- a/packages/schematics/angular/application/files/src/polyfills.ts
+++ b/packages/schematics/angular/application/files/src/polyfills.ts
@@ -18,7 +18,10 @@
  * BROWSER POLYFILLS
  */
 
-/** IE9, IE10 and IE11 requires all of the following polyfills. **/
+/** IE9, IE10, IE11, and Chrome <55 requires all of the following polyfills.
+ *  This also includes Android Emulators with older versions of Chrome and Google Search/Googlebot
+ */
+
 // import 'core-js/es6/symbol';
 // import 'core-js/es6/object';
 // import 'core-js/es6/function';
@@ -34,13 +37,6 @@
 // import 'core-js/es6/weak-map';
 // import 'core-js/es6/set';
 
-/**
- * If the application will be indexed by Google Search, the following is required.
- * Googlebot uses a renderer based on Chrome 41.
- * https://developers.google.com/search/docs/guides/rendering
- **/
-// import 'core-js/es6/array';
-
 /** IE10 and IE11 requires the following for NgClass support on SVG elements */
 // import 'classlist.js';  // Run `npm install --save classlist.js`.
 

From b40dc77a55b0eabe88ab28730dd389540098be4c Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Wed, 12 Dec 2018 13:29:11 +0100
Subject: [PATCH 0518/1703] build: update path to install snapshots

---
 scripts/snapshots.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/snapshots.ts b/scripts/snapshots.ts
index 83fb0c7bc217..2fc62bfdde7b 100644
--- a/scripts/snapshots.ts
+++ b/scripts/snapshots.ts
@@ -29,7 +29,7 @@ released version of this package.
 To test this snapshot in your own project, use
 
 \`\`\`bash
-npm install github.com/${pkg.snapshotRepo}
+npm install git+https://github.com/${pkg.snapshotRepo}.git
 \`\`\`
 
 ----

From 0715beb65c037992b5295ec1417f80cfd2fc890c Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 6 Dec 2018 21:14:42 +0100
Subject: [PATCH 0519/1703] feat(@schematics/angular): add `lintFix` to several
 other schematics

At the moment some schematics contain this options for instance the `guard`, `component` etc.. But some others don't such as `module`

Fixes #12894 and Fixes #6272
---
 packages/schematics/angular/application/index.ts    | 2 ++
 packages/schematics/angular/application/schema.json | 5 +++++
 packages/schematics/angular/class/index.ts          | 7 ++++++-
 packages/schematics/angular/class/schema.json       | 5 +++++
 packages/schematics/angular/library/index.ts        | 2 ++
 packages/schematics/angular/library/schema.json     | 5 +++++
 packages/schematics/angular/module/index.ts         | 2 ++
 packages/schematics/angular/module/schema.json      | 5 +++++
 8 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 09608e0c0a58..f8e5e122e048 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -31,6 +31,7 @@ import {
 } from '../utility/config';
 import { NodeDependencyType, addPackageJsonDependency } from '../utility/dependencies';
 import { latestVersions } from '../utility/latest-versions';
+import { applyLintFix } from '../utility/lint-fix';
 import { validateProjectName } from '../utility/validation';
 import {
   Builders,
@@ -372,6 +373,7 @@ export default function (options: ApplicationOptions): Rule {
         ]), MergeStrategy.Overwrite),
       options.minimal ? noop() : schematic('e2e', e2eOptions),
       options.skipPackageJson ? noop() : addDependenciesToPackageJson(options),
+      options.lintFix ? applyLintFix(sourceDir) : noop(),
     ]);
   };
 }
diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json
index 9dde81b57487..9c245ced0ebc 100644
--- a/packages/schematics/angular/application/schema.json
+++ b/packages/schematics/angular/application/schema.json
@@ -78,6 +78,11 @@
       "description": "Skip installing dependency packages.",
       "type": "boolean",
       "default": false
+    },
+    "lintFix": {
+      "type": "boolean",
+      "default": false,
+      "description": "When true, applies lint fixes after generating the application."
     }
   },
   "required": [
diff --git a/packages/schematics/angular/class/index.ts b/packages/schematics/angular/class/index.ts
index 0c34613e8dc8..93d3ff880520 100644
--- a/packages/schematics/angular/class/index.ts
+++ b/packages/schematics/angular/class/index.ts
@@ -13,6 +13,7 @@ import {
   Tree,
   apply,
   branchAndMerge,
+  chain,
   filter,
   mergeWith,
   move,
@@ -20,6 +21,7 @@ import {
   template,
   url,
 } from '@angular-devkit/schematics';
+import { applyLintFix } from '../utility/lint-fix';
 import { parseName } from '../utility/parse-name';
 import { buildDefaultPath, getProject } from '../utility/project';
 import { Schema as ClassOptions } from './schema';
@@ -54,6 +56,9 @@ export default function (options: ClassOptions): Rule {
       move(parsedPath.path),
     ]);
 
-    return branchAndMerge(mergeWith(templateSource));
+    return chain([
+      branchAndMerge(mergeWith(templateSource)),
+      options.lintFix ? applyLintFix(options.path) : noop(),
+    ]);
   };
 }
diff --git a/packages/schematics/angular/class/schema.json b/packages/schematics/angular/class/schema.json
index c9b39d1d5abe..9a6362070519 100644
--- a/packages/schematics/angular/class/schema.json
+++ b/packages/schematics/angular/class/schema.json
@@ -42,6 +42,11 @@
       "type": "string",
       "description": "Adds a developer-defined type to the filename, in the format \"name.type.ts\".",
       "default": ""
+    },
+    "lintFix": {
+      "type": "boolean",
+      "default": false,
+      "description": "When true, applies lint fixes after generating the class."
     }
   },
   "required": [
diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index 48af3d281104..2629dd3a9603 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -27,6 +27,7 @@ import {
 } from '../utility/config';
 import { NodeDependencyType, addPackageJsonDependency } from '../utility/dependencies';
 import { latestVersions } from '../utility/latest-versions';
+import { applyLintFix } from '../utility/lint-fix';
 import { validateProjectName } from '../utility/validation';
 import {
   Builders,
@@ -246,6 +247,7 @@ export default function (options: LibraryOptions): Rule {
         path: sourceDir,
         project: options.name,
       }),
+      options.lintFix ? applyLintFix(sourceDir) : noop(),
       (_tree: Tree, context: SchematicContext) => {
         if (!options.skipPackageJson && !options.skipInstall) {
           context.addTask(new NodePackageInstallTask());
diff --git a/packages/schematics/angular/library/schema.json b/packages/schematics/angular/library/schema.json
index 3db99c2d029d..2739b644b174 100644
--- a/packages/schematics/angular/library/schema.json
+++ b/packages/schematics/angular/library/schema.json
@@ -42,6 +42,11 @@
       "type": "boolean",
       "default": false,
       "description": "When true, does not update \"tsconfig.json\" to add a path mapping for the new library. The path mapping is needed to use the library in an app, but can be disabled here to simplify development."
+    },
+    "lintFix": {
+      "type": "boolean",
+      "default": false,
+      "description": "When true, applies lint fixes after generating the library."
     }
   },
   "required": []
diff --git a/packages/schematics/angular/module/index.ts b/packages/schematics/angular/module/index.ts
index eccb6c415668..07c1cfea2e03 100644
--- a/packages/schematics/angular/module/index.ts
+++ b/packages/schematics/angular/module/index.ts
@@ -24,6 +24,7 @@ import * as ts from 'typescript';
 import { addImportToModule } from '../utility/ast-utils';
 import { InsertChange } from '../utility/change';
 import { buildRelativePath, findModuleFromOptions } from '../utility/find-module';
+import { applyLintFix } from '../utility/lint-fix';
 import { parseName } from '../utility/parse-name';
 import { buildDefaultPath, getProject } from '../utility/project';
 import { Schema as ModuleOptions } from './schema';
@@ -102,6 +103,7 @@ export default function (options: ModuleOptions): Rule {
         addDeclarationToNgModule(options),
         mergeWith(templateSource),
       ])),
+      options.lintFix ? applyLintFix(options.path) : noop(),
     ]);
   };
 }
diff --git a/packages/schematics/angular/module/schema.json b/packages/schematics/angular/module/schema.json
index f58e8299786d..5e5c1f608aac 100644
--- a/packages/schematics/angular/module/schema.json
+++ b/packages/schematics/angular/module/schema.json
@@ -53,6 +53,11 @@
       "type": "string",
       "description": "The declaring NgModule.",
       "alias": "m"
+    },
+    "lintFix": {
+      "type": "boolean",
+      "default": false,
+      "description": "When true, applies lint fixes after generating the module."
     }
   },
   "required": [

From 3684df8aca5dfb9d7cfa813161df6de5596598df Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Fri, 14 Dec 2018 14:59:46 +0100
Subject: [PATCH 0520/1703] fix(@angular/cli): remove redundant period in
 deprecation warning

As `parser.ts` currently always adds a period at the end of the warning message and the `x-deprecated` messages also have one, this removes the always added one to avoid a double period in the warning message.

Fixes:

    Option "styleext" is deprecated: Use "style" instead..

to:

    Option "styleext" is deprecated: Use "style" instead.
---
 packages/angular/cli/models/parser.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular/cli/models/parser.ts b/packages/angular/cli/models/parser.ts
index 8a9a3c3b8bea..8631a9e99900 100644
--- a/packages/angular/cli/models/parser.ts
+++ b/packages/angular/cli/models/parser.ts
@@ -206,7 +206,7 @@ function _assignOption(
 
         if (option.deprecated !== undefined && option.deprecated !== false) {
           warnings.push(`Option ${JSON.stringify(option.name)} is deprecated${
-            typeof option.deprecated == 'string' ? ': ' + option.deprecated : ''}.`);
+            typeof option.deprecated == 'string' ? ': ' + option.deprecated : '.'}`);
         }
       }
     } else {

From e4474894c1f9539a2d64838f6a19fd48b6f5d4d8 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Fri, 14 Dec 2018 09:29:09 +0100
Subject: [PATCH 0521/1703] fix(@schematics/angular):  cannot create pipe in
 sub-directory if module is in different sub-directory

Similar to other schematics, `findModuleFromOptions` should happen prior to `parseName` that modifies the name and path.

Fixes #13182
---
 packages/schematics/angular/pipe/index.ts      |  4 ++--
 packages/schematics/angular/pipe/index_spec.ts | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/pipe/index.ts b/packages/schematics/angular/pipe/index.ts
index 5b76749a5643..7e3d5e19b156 100644
--- a/packages/schematics/angular/pipe/index.ts
+++ b/packages/schematics/angular/pipe/index.ts
@@ -96,12 +96,12 @@ export default function (options: PipeOptions): Rule {
       options.path = buildDefaultPath(project);
     }
 
+    options.module = findModuleFromOptions(host, options);
+
     const parsedPath = parseName(options.path, options.name);
     options.name = parsedPath.name;
     options.path = parsedPath.path;
 
-    options.module = findModuleFromOptions(host, options);
-
     // todo remove these when we remove the deprecations
     options.skipTests = options.skipTests || !options.spec;
 
diff --git a/packages/schematics/angular/pipe/index_spec.ts b/packages/schematics/angular/pipe/index_spec.ts
index 50263fd34c0c..7872dd04f799 100644
--- a/packages/schematics/angular/pipe/index_spec.ts
+++ b/packages/schematics/angular/pipe/index_spec.ts
@@ -79,6 +79,20 @@ describe('Pipe Schematic', () => {
     expect(thrownError).toBeDefined();
   });
 
+  it('should handle a path in the name and module options', () => {
+    appTree = schematicRunner.runSchematic(
+      'module',
+      { name: 'admin/module', project: 'bar' },
+      appTree,
+    );
+
+    const options = { ...defaultOptions, module: 'admin/module' };
+    appTree = schematicRunner.runSchematic('pipe', options, appTree);
+
+    const content = appTree.readContent('/projects/bar/src/app/admin/module/module.module.ts');
+    expect(content).toMatch(/import { FooPipe } from '\.\.\/\.\.\/foo.pipe'/);
+  });
+
   it('should export the pipe', () => {
     const options = { ...defaultOptions, export: true };
 

From 17ba2bc4508af9bbd6beb234f59bdb992a5ec8ac Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 3 Dec 2018 13:25:52 +0100
Subject: [PATCH 0522/1703] fix(@schematics/angular): set `optimization` and
 `sourceMap` in universal production config

- When using Universal sourceMaps should not be enabled or at least `styles` sourceMaps should be disabled as these will otherwise be inlined and will be set as apart of the server side rendered page.

- While there is no benefit to optimize the scripts at server level, styles should always be minified so that the server side rendered page is smaller.

Fixes #12541 and Fixes #12940
---
 packages/schematics/angular/universal/index.ts          | 5 +++++
 packages/schematics/angular/utility/workspace-models.ts | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/packages/schematics/angular/universal/index.ts b/packages/schematics/angular/universal/index.ts
index 4991ef5ac363..de140e803377 100644
--- a/packages/schematics/angular/universal/index.ts
+++ b/packages/schematics/angular/universal/index.ts
@@ -67,6 +67,11 @@ function updateConfigFile(options: UniversalOptions, tsConfigDirectory: Path): R
       configurations: {
         production: {
           fileReplacements: getFileReplacements(projectTargets),
+          sourceMap: false,
+          optimization: {
+            scripts: false,
+            styles: true,
+          },
         },
       },
     };
diff --git a/packages/schematics/angular/utility/workspace-models.ts b/packages/schematics/angular/utility/workspace-models.ts
index 4cb08b3b5d7d..a297922be73f 100644
--- a/packages/schematics/angular/utility/workspace-models.ts
+++ b/packages/schematics/angular/utility/workspace-models.ts
@@ -74,6 +74,11 @@ export interface ServerBuilderOptions {
     tsConfig: string;
     main: string;
     fileReplacements?: FileReplacements[];
+    optimization?: {
+        scripts?: boolean;
+        styles?: boolean;
+    };
+    sourceMap?: boolean;
 }
 
 export interface AppShellBuilderOptions {

From 2b3f9de403dd4af8230ac9845bdaae9d6e33760d Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Thu, 15 Nov 2018 11:49:20 -0800
Subject: [PATCH 0523/1703] refactor: use Buffer.from instead of deprecated
 constructor

---
 lib/istanbul-local.js | 2 +-
 scripts/changelog.ts  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/istanbul-local.js b/lib/istanbul-local.js
index ef5782661a92..f1bdb1ebfe3e 100644
--- a/lib/istanbul-local.js
+++ b/lib/istanbul-local.js
@@ -46,7 +46,7 @@ exports.istanbulRequireHook = function(code, filename) {
 
     instrumentedCode = instrumentedCode.replace(inlineSourceMapRe, '')
       + '//# sourceMappingURL=data:application/json;base64,'
-      + new Buffer(sourceMapGenerator.toString()).toString('base64');
+      + Buffer.from(sourceMapGenerator.toString()).toString('base64');
 
     // Keep the consumer from the original source map, because the reports from Istanbul (not
     // Constantinople) are already mapped against the code.
diff --git a/scripts/changelog.ts b/scripts/changelog.ts
index 88e8c8030bf2..303111db38cc 100644
--- a/scripts/changelog.ts
+++ b/scripts/changelog.ts
@@ -55,7 +55,7 @@ export default function(args: ChangelogOptions, logger: logging.Logger) {
         const commit = chunk.toString('utf-8')
           .replace(/https?:\/\/github.com\/(.*?)\/issues\/(\d+)/g, '@$1#$2');
 
-        callback(undefined, new Buffer(commit));
+        callback(undefined, Buffer.from(commit));
       }))
       .pipe(conventionalCommitsParser({
         headerPattern: /^(\w*)(?:\(([^)]*)\))?: (.*)$/,

From 6bf80edf5492224264cdd43b3fb9c90225ab52dd Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Thu, 13 Dec 2018 15:00:38 -0800
Subject: [PATCH 0524/1703] ci: add golden-api file for core/node

This is necessary as we introduce namespaces in jobs.
---
 .../node/{index.d.ts => _golden-api.d.ts}     |  7 ++-
 .../angular_devkit/core/node/_golden-api.ts   | 11 +++++
 packages/angular_devkit/core/node/fs.ts       | 43 +++++++++----------
 packages/angular_devkit/core/node/index.ts    |  6 ++-
 packages/angular_devkit/core/node/resolve.ts  |  8 ++--
 5 files changed, 43 insertions(+), 32 deletions(-)
 rename etc/api/angular_devkit/core/node/{index.d.ts => _golden-api.d.ts} (94%)
 create mode 100644 packages/angular_devkit/core/node/_golden-api.ts

diff --git a/etc/api/angular_devkit/core/node/index.d.ts b/etc/api/angular_devkit/core/node/_golden-api.d.ts
similarity index 94%
rename from etc/api/angular_devkit/core/node/index.d.ts
rename to etc/api/angular_devkit/core/node/_golden-api.d.ts
index 6c2e882fc1cc..285d1d188bbe 100644
--- a/etc/api/angular_devkit/core/node/index.d.ts
+++ b/etc/api/angular_devkit/core/node/_golden-api.d.ts
@@ -1,9 +1,8 @@
 export declare function createConsoleLogger(verbose?: boolean, stdout?: ProcessOutput, stderr?: ProcessOutput): logging.Logger;
 
-export declare namespace fs {
-    function isFile(filePath: string): boolean;
-    function isDirectory(filePath: string): boolean;
-}
+export declare function isDirectory(filePath: string): boolean;
+
+export declare function isFile(filePath: string): boolean;
 
 export declare class ModuleNotFoundException extends BaseException {
     readonly basePath: string;
diff --git a/packages/angular_devkit/core/node/_golden-api.ts b/packages/angular_devkit/core/node/_golden-api.ts
new file mode 100644
index 000000000000..1008bfa1c3c9
--- /dev/null
+++ b/packages/angular_devkit/core/node/_golden-api.ts
@@ -0,0 +1,11 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+export * from './fs';
+export * from './cli-logger';
+export * from './host';
+export { ModuleNotFoundException, ResolveOptions, resolve } from './resolve';
diff --git a/packages/angular_devkit/core/node/fs.ts b/packages/angular_devkit/core/node/fs.ts
index 7f37baef6a8d..f6df37c3cb63 100644
--- a/packages/angular_devkit/core/node/fs.ts
+++ b/packages/angular_devkit/core/node/fs.ts
@@ -7,34 +7,31 @@
  */
 import { statSync } from 'fs';
 
-export namespace fs {
-  export function isFile(filePath: string): boolean {
-    let stat;
-    try {
-      stat = statSync(filePath);
-    } catch (e) {
-      if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR')) {
-        return false;
-      }
-      throw e;
+export function isFile(filePath: string): boolean {
+  let stat;
+  try {
+    stat = statSync(filePath);
+  } catch (e) {
+    if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR')) {
+      return false;
     }
-
-    return stat.isFile() || stat.isFIFO();
+    throw e;
   }
 
+  return stat.isFile() || stat.isFIFO();
+}
+
 
-  export function isDirectory(filePath: string): boolean {
-    let stat;
-    try {
-      stat = statSync(filePath);
-    } catch (e) {
-      if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR')) {
-        return false;
-      }
-      throw e;
+export function isDirectory(filePath: string): boolean {
+  let stat;
+  try {
+    stat = statSync(filePath);
+  } catch (e) {
+    if (e && (e.code === 'ENOENT' || e.code === 'ENOTDIR')) {
+      return false;
     }
-
-    return stat.isDirectory();
+    throw e;
   }
 
+  return stat.isDirectory();
 }
diff --git a/packages/angular_devkit/core/node/index.ts b/packages/angular_devkit/core/node/index.ts
index 1008bfa1c3c9..22d6d35a531d 100644
--- a/packages/angular_devkit/core/node/index.ts
+++ b/packages/angular_devkit/core/node/index.ts
@@ -5,7 +5,11 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-export * from './fs';
+import * as fs from './fs';
 export * from './cli-logger';
 export * from './host';
 export { ModuleNotFoundException, ResolveOptions, resolve } from './resolve';
+
+export {
+  fs,
+};
diff --git a/packages/angular_devkit/core/node/resolve.ts b/packages/angular_devkit/core/node/resolve.ts
index 1faaf247e052..5a3e0712e6f6 100644
--- a/packages/angular_devkit/core/node/resolve.ts
+++ b/packages/angular_devkit/core/node/resolve.ts
@@ -8,7 +8,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { BaseException } from '../src';
-import { fs as devkitFs } from './fs';
+import { isFile } from './fs';
 
 /**
  * Exception thrown when a module could not be resolved.
@@ -204,16 +204,16 @@ export function resolve(x: string, options: ResolveOptions): string {
   throw new ModuleNotFoundException(x, basePath);
 
   function loadAsFileSync(x: string): string | null {
-    if (devkitFs.isFile(x)) {
+    if (isFile(x)) {
       return x;
     }
 
-    return extensions.map(ex => x + ex).find(f => devkitFs.isFile(f)) || null;
+    return extensions.map(ex => x + ex).find(f => isFile(f)) || null;
   }
 
   function loadAsDirectorySync(x: string): string | null {
     const pkgfile = path.join(x, 'package.json');
-    if (devkitFs.isFile(pkgfile)) {
+    if (isFile(pkgfile)) {
       if (options.resolvePackageJson) {
         return pkgfile;
       }

From 8a796e7db56da0b9b1eb2496d95dcd72953db42e Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Thu, 15 Nov 2018 11:49:46 -0800
Subject: [PATCH 0525/1703] test: downgrade output of typescript to es2016 for
 istanbul

---
 lib/bootstrap-local.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/bootstrap-local.js b/lib/bootstrap-local.js
index e0772ea11740..c8194e11fb29 100644
--- a/lib/bootstrap-local.js
+++ b/lib/bootstrap-local.js
@@ -16,9 +16,16 @@ const ts = require('typescript');
 
 const tmpRoot = temp.mkdirSync('angular-devkit-');
 
+const compilerOptions = ts.readConfigFile(path.join(__dirname, '../tsconfig.json'), p => {
+  return fs.readFileSync(p, 'utf-8');
+}).config;
+
 let _istanbulRequireHook = null;
 if (process.env['CODE_COVERAGE'] || process.argv.indexOf('--code-coverage') !== -1) {
   _istanbulRequireHook = require('./istanbul-local').istanbulRequireHook;
+  // async keyword isn't supported by the Esprima version used by Istanbul version used by us.
+  // TODO: update istanbul to istanbul-lib-* (see http://istanbul.js.org/) and remove this hack.
+  compilerOptions.compilerOptions.target = 'es2016';
 }
 
 
@@ -62,11 +69,6 @@ global._DevKitIsLocal = true;
 global._DevKitRoot = path.resolve(__dirname, '..');
 
 
-const compilerOptions = ts.readConfigFile(path.join(__dirname, '../tsconfig.json'), p => {
-  return fs.readFileSync(p, 'utf-8');
-}).config;
-
-
 const oldRequireTs = require.extensions['.ts'];
 require.extensions['.ts'] = function (m, filename) {
   // If we're in node module, either call the old hook or simply compile the

From 7567e8e6a0435922f401bbfdffc341454d20baa1 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Thu, 15 Nov 2018 11:53:37 -0800
Subject: [PATCH 0526/1703] feat(@angular-devkit/core): add next() to Logger

It allows to pass through LogEntry which was not possible before.
---
 etc/api/angular_devkit/core/src/_golden-api.d.ts  | 1 +
 packages/angular_devkit/core/src/logger/logger.ts | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/etc/api/angular_devkit/core/src/_golden-api.d.ts b/etc/api/angular_devkit/core/src/_golden-api.d.ts
index 5075c710d4df..8fbcf7cf9a45 100644
--- a/etc/api/angular_devkit/core/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/core/src/_golden-api.d.ts
@@ -472,6 +472,7 @@ export declare class Logger extends Observable<LogEntry> implements LoggerApi {
     info(message: string, metadata?: JsonObject): void;
     lift<R>(operator: Operator<LogEntry, R>): Observable<R>;
     log(level: LogLevel, message: string, metadata?: JsonObject): void;
+    next(entry: LogEntry): void;
     subscribe(): Subscription;
     subscribe(observer: PartialObserver<LogEntry>): Subscription;
     subscribe(next?: (value: LogEntry) => void, error?: (error: Error) => void, complete?: () => void): Subscription;
diff --git a/packages/angular_devkit/core/src/logger/logger.ts b/packages/angular_devkit/core/src/logger/logger.ts
index e31cc7ce895b..f4682a80d41e 100644
--- a/packages/angular_devkit/core/src/logger/logger.ts
+++ b/packages/angular_devkit/core/src/logger/logger.ts
@@ -107,6 +107,9 @@ export class Logger extends Observable<LogEntry> implements LoggerApi {
     });
     this._subject.next(entry);
   }
+  next(entry: LogEntry): void {
+    this._subject.next(entry);
+  }
 
   debug(message: string, metadata: JsonObject = {}) {
     return this.log('debug', message, metadata);

From 3a28d4c142c2144e0c35d6e288a6fa365aef1ea3 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Thu, 15 Nov 2018 11:58:00 -0800
Subject: [PATCH 0527/1703] feat(@angular-devkit/core): add a new JsonSchema
 type

A Schema is either an Object or a boolean. We could reduce JsonSchema scope further
by adding properties, but a schema is a really complex type so its not worth the
effort.
---
 etc/api/angular_devkit/core/src/_golden-api.d.ts  |  6 +++---
 packages/angular/cli/utilities/json-schema.ts     |  4 +++-
 .../angular_devkit/core/src/json/schema/index.ts  |  1 +
 .../core/src/json/schema/registry.ts              | 14 +++++++++++++-
 .../angular_devkit/core/src/json/schema/schema.ts | 15 +++++++++++++++
 .../core/src/json/schema/utility.ts               |  3 ++-
 .../core/src/json/schema/visitor.ts               |  8 +++++++-
 7 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 packages/angular_devkit/core/src/json/schema/schema.ts

diff --git a/etc/api/angular_devkit/core/src/_golden-api.d.ts b/etc/api/angular_devkit/core/src/_golden-api.d.ts
index 8fbcf7cf9a45..063b753b1199 100644
--- a/etc/api/angular_devkit/core/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/core/src/_golden-api.d.ts
@@ -165,7 +165,7 @@ export declare class CoreSchemaRegistry implements SchemaRegistry {
     addPostTransform(visitor: JsonVisitor, deps?: JsonVisitor[]): void;
     addPreTransform(visitor: JsonVisitor, deps?: JsonVisitor[]): void;
     addSmartDefaultProvider<T>(source: string, provider: SmartDefaultProvider<T>): void;
-    compile(schema: JsonObject): Observable<SchemaValidator>;
+    compile(schema: JsonSchema): Observable<SchemaValidator>;
     flatten(schema: JsonObject): Observable<JsonObject>;
     registerUriHandler(handler: UriHandler): void;
     usePromptProvider(provider: PromptProvider): void;
@@ -226,7 +226,7 @@ export declare function fragment(path: string): PathFragment;
 
 export declare function getSystemPath(path: Path): string;
 
-export declare function getTypesOfSchema(schema: JsonObject | true): Set<string>;
+export declare function getTypesOfSchema(schema: JsonSchema): Set<string>;
 
 export declare const gray: (x: string) => string;
 
@@ -991,7 +991,7 @@ export declare type UriHandler = (uri: string) => Observable<JsonObject> | Promi
 
 export declare function visitJson<ContextT>(json: JsonValue, visitor: JsonVisitor, schema?: JsonObject, refResolver?: ReferenceResolver<ContextT>, context?: ContextT): Observable<JsonValue>;
 
-export declare function visitJsonSchema(schema: JsonObject, visitor: JsonSchemaVisitor): void;
+export declare function visitJsonSchema(schema: JsonSchema, visitor: JsonSchemaVisitor): void;
 
 export declare const white: (x: string) => string;
 
diff --git a/packages/angular/cli/utilities/json-schema.ts b/packages/angular/cli/utilities/json-schema.ts
index 434d24804d46..7b4422903801 100644
--- a/packages/angular/cli/utilities/json-schema.ts
+++ b/packages/angular/cli/utilities/json-schema.ts
@@ -36,7 +36,9 @@ function _getEnumFromValue<E, T extends E[keyof E]>(
   }
 
   if (Object.values(enumeration).indexOf(value) !== -1) {
-    return value as unknown as T;
+    // TODO: this should be unknown
+    // tslint:disable-next-line:no-any
+    return value as any as T;
   }
 
   return defaultValue;
diff --git a/packages/angular_devkit/core/src/json/schema/index.ts b/packages/angular_devkit/core/src/json/schema/index.ts
index e5ff6c4a63c5..92a977ffe736 100644
--- a/packages/angular_devkit/core/src/json/schema/index.ts
+++ b/packages/angular_devkit/core/src/json/schema/index.ts
@@ -8,6 +8,7 @@
 export * from './interface';
 export * from './pointer';
 export * from './registry';
+export * from './schema';
 export * from './visitor';
 export * from './utility';
 
diff --git a/packages/angular_devkit/core/src/json/schema/registry.ts b/packages/angular_devkit/core/src/json/schema/registry.ts
index b228a0896faa..aa98bac3e18c 100644
--- a/packages/angular_devkit/core/src/json/schema/registry.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry.ts
@@ -27,6 +27,7 @@ import {
   SchemaValidatorResult,
   SmartDefaultProvider,
 } from './interface';
+import { JsonSchema } from './schema';
 import { visitJson, visitJsonSchema } from './visitor';
 
 // This interface should be exported from ajv, but they only export the class and not the type.
@@ -299,7 +300,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
    * (using schema as a URI).
    * @returns An Observable of the Validation function.
    */
-  compile(schema: JsonObject): Observable<SchemaValidator> {
+  compile(schema: JsonSchema): Observable<SchemaValidator> {
     const schemaInfo: SchemaInfo = {
       smartDefaultRecord: new Map<string, JsonObject>(),
       promptDefinitions: [],
@@ -346,6 +347,10 @@ export class CoreSchemaRegistry implements SchemaRegistry {
             // tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
             result = (result as any).pipe(
               ...[...this._pre].map(visitor => concatMap((data: JsonValue) => {
+                if (schema === false || schema === true) {
+                  return of(data);
+                }
+
                 return visitJson(data, visitor, schema, this._resolver, validate);
               })),
             );
@@ -368,6 +373,9 @@ export class CoreSchemaRegistry implements SchemaRegistry {
 
                 return value;
               };
+              if (schema === false || schema === true) {
+                return of(updatedData);
+              }
 
               return visitJson(updatedData, visitor, schema, this._resolver, validate);
             }),
@@ -410,6 +418,10 @@ export class CoreSchemaRegistry implements SchemaRegistry {
                   // tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
                   result = (result as any).pipe(
                     ...[...this._post].map(visitor => concatMap((data: JsonValue) => {
+                      if (schema === false || schema === true) {
+                        return of(schema);
+                      }
+
                       return visitJson(data, visitor, schema, this._resolver, validate);
                     })),
                   );
diff --git a/packages/angular_devkit/core/src/json/schema/schema.ts b/packages/angular_devkit/core/src/json/schema/schema.ts
new file mode 100644
index 000000000000..f9b1e58dc98a
--- /dev/null
+++ b/packages/angular_devkit/core/src/json/schema/schema.ts
@@ -0,0 +1,15 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { JsonObject } from '../interface';
+
+/**
+ * A specialized interface for JsonSchema (to come). JsonSchemas are also JsonObject.
+ *
+ * @public
+ */
+export type JsonSchema = JsonObject | boolean;
diff --git a/packages/angular_devkit/core/src/json/schema/utility.ts b/packages/angular_devkit/core/src/json/schema/utility.ts
index 8c0cf990f1ac..b3f07ab5ccd9 100644
--- a/packages/angular_devkit/core/src/json/schema/utility.ts
+++ b/packages/angular_devkit/core/src/json/schema/utility.ts
@@ -6,11 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { JsonObject, isJsonArray, isJsonObject } from '../interface';
+import { JsonSchema } from './schema';
 
 
 const allTypes = ['string', 'integer', 'number', 'object', 'array', 'boolean', 'null'];
 
-export function getTypesOfSchema(schema: JsonObject | true): Set<string> {
+export function getTypesOfSchema(schema: JsonSchema): Set<string> {
   if (!schema) {
     return new Set();
   }
diff --git a/packages/angular_devkit/core/src/json/schema/visitor.ts b/packages/angular_devkit/core/src/json/schema/visitor.ts
index c0d68b2778dc..130ef4925846 100644
--- a/packages/angular_devkit/core/src/json/schema/visitor.ts
+++ b/packages/angular_devkit/core/src/json/schema/visitor.ts
@@ -11,6 +11,7 @@ import { isObservable } from '../../utils';
 import { JsonArray, JsonObject, JsonValue } from '../interface';
 import { JsonPointer, JsonSchemaVisitor, JsonVisitor } from './interface';
 import { buildJsonPointer, joinJsonPointer } from './pointer';
+import { JsonSchema } from './schema';
 
 
 export interface ReferenceResolver<ContextT> {
@@ -139,7 +140,12 @@ export function visitJson<ContextT>(
 }
 
 
-export function visitJsonSchema(schema: JsonObject, visitor: JsonSchemaVisitor) {
+export function visitJsonSchema(schema: JsonSchema, visitor: JsonSchemaVisitor) {
+  if (schema === false || schema === true) {
+    // Nothing to visit.
+    return;
+  }
+
   const keywords = {
     additionalItems: true,
     items: true,

From 64781f64d7440bc7e5d2f7ade801ac969acb1914 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Thu, 15 Nov 2018 11:58:41 -0800
Subject: [PATCH 0528/1703] refactor(@angular-devkit/core): UnknownException
 should still extend Base

---
 etc/api/angular_devkit/core/src/_golden-api.d.ts        | 2 +-
 packages/angular_devkit/core/src/exception/exception.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/api/angular_devkit/core/src/_golden-api.d.ts b/etc/api/angular_devkit/core/src/_golden-api.d.ts
index 063b753b1199..e07a427eb66f 100644
--- a/etc/api/angular_devkit/core/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/core/src/_golden-api.d.ts
@@ -979,7 +979,7 @@ export declare class UnimplementedException extends BaseException {
     constructor();
 }
 
-export declare class UnknownException extends Error {
+export declare class UnknownException extends BaseException {
     constructor(message: string);
 }
 
diff --git a/packages/angular_devkit/core/src/exception/exception.ts b/packages/angular_devkit/core/src/exception/exception.ts
index 9ad653342770..31dc67badb1a 100644
--- a/packages/angular_devkit/core/src/exception/exception.ts
+++ b/packages/angular_devkit/core/src/exception/exception.ts
@@ -13,7 +13,7 @@ export class BaseException extends Error {
 }
 
 
-export class UnknownException extends Error {
+export class UnknownException extends BaseException {
   constructor(message: string) { super(message); }
 }
 

From c89a0420d5611d074d2c8d3dcd5f0016db1ebdf7 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Thu, 15 Nov 2018 12:00:32 -0800
Subject: [PATCH 0529/1703] feat(@angular-devkit/core): add DeepReadonly<> and
 Readwrite<> types

Readwrite removes readonly, while DeepReadonly recursively sets it. A ReadonlyArray
should be used if the type is an array, but that is too much of a change to our API
(JsonValue includes JsonArray but then we would need a ReadonlyJsonValue, and same
for object, which has deep roots in our API).

We should fix this in a further refactor at some point.
---
 packages/angular_devkit/core/src/utils/index.ts | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/angular_devkit/core/src/utils/index.ts b/packages/angular_devkit/core/src/utils/index.ts
index 10b185560299..5e6749ee9b95 100644
--- a/packages/angular_devkit/core/src/utils/index.ts
+++ b/packages/angular_devkit/core/src/utils/index.ts
@@ -16,3 +16,20 @@ export * from './priority-queue';
 export * from './lang';
 
 export { tags, strings };
+
+export type DeepReadonly<T> =
+  T extends (infer R)[] ? DeepReadonlyArray<R> :
+    T extends Function ? T :
+      T extends object ? DeepReadonlyObject<T> :
+        T;
+
+// This should be ReadonlyArray but it has implications.
+export interface DeepReadonlyArray<T> extends Array<DeepReadonly<T>> {}
+
+export type DeepReadonlyObject<T> = {
+  readonly [P in keyof T]: DeepReadonly<T[P]>;
+};
+
+export type Readwrite<T> = {
+  -readonly [P in keyof T]: T[P];
+};

From a3a657f7e7c20eafd49dfe80ab8fad5a973be9b7 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Thu, 15 Nov 2018 12:01:07 -0800
Subject: [PATCH 0530/1703] feat(@angular-devkit/core): Jobs API added

See the README for more details about usage.
---
 .../angular_devkit/core/node/_golden-api.d.ts |   6 +
 packages/angular_devkit/core/BUILD            |   1 +
 .../angular_devkit/core/node/_golden-api.ts   |   7 +
 .../core/node/experimental/index.ts           |  12 +
 .../core/node/experimental/job-registry.ts    |  81 +++
 .../node/experimental/job-registry_spec.ts    |  26 +
 packages/angular_devkit/core/node/index.ts    |   2 +
 .../angular_devkit/core/src/experimental.ts   |   6 +-
 .../core/src/experimental/jobs/README.md      | 495 +++++++++++++++
 .../core/src/experimental/jobs/api.ts         | 478 ++++++++++++++
 .../src/experimental/jobs/architecture.md     | 257 ++++++++
 .../experimental/jobs/create-job-handler.ts   | 221 +++++++
 .../core/src/experimental/jobs/dispatcher.ts  |  89 +++
 .../src/experimental/jobs/dispatcher_spec.ts  |  38 ++
 .../core/src/experimental/jobs/exception.ts   |  21 +
 .../core/src/experimental/jobs/index.ts       |  14 +
 .../src/experimental/jobs/simple-registry.ts  | 144 +++++
 .../experimental/jobs/simple-registry_spec.ts |  34 +
 .../src/experimental/jobs/simple-scheduler.ts | 545 ++++++++++++++++
 .../jobs/simple-scheduler_spec.ts             | 594 ++++++++++++++++++
 .../core/src/experimental/jobs/strategy.ts    |  85 +++
 .../src/experimental/jobs/strategy_spec.ts    | 215 +++++++
 .../core/src/json/schema/schema.ts            |  38 +-
 tests/angular_devkit/core/node/jobs/BUILD     |  22 +
 tests/angular_devkit/core/node/jobs/add.ts    |  18 +
 25 files changed, 3447 insertions(+), 2 deletions(-)
 create mode 100644 packages/angular_devkit/core/node/experimental/index.ts
 create mode 100644 packages/angular_devkit/core/node/experimental/job-registry.ts
 create mode 100644 packages/angular_devkit/core/node/experimental/job-registry_spec.ts
 create mode 100644 packages/angular_devkit/core/src/experimental/jobs/README.md
 create mode 100644 packages/angular_devkit/core/src/experimental/jobs/api.ts
 create mode 100644 packages/angular_devkit/core/src/experimental/jobs/architecture.md
 create mode 100644 packages/angular_devkit/core/src/experimental/jobs/create-job-handler.ts
 create mode 100644 packages/angular_devkit/core/src/experimental/jobs/dispatcher.ts
 create mode 100644 packages/angular_devkit/core/src/experimental/jobs/dispatcher_spec.ts
 create mode 100644 packages/angular_devkit/core/src/experimental/jobs/exception.ts
 create mode 100644 packages/angular_devkit/core/src/experimental/jobs/index.ts
 create mode 100644 packages/angular_devkit/core/src/experimental/jobs/simple-registry.ts
 create mode 100644 packages/angular_devkit/core/src/experimental/jobs/simple-registry_spec.ts
 create mode 100644 packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts
 create mode 100644 packages/angular_devkit/core/src/experimental/jobs/simple-scheduler_spec.ts
 create mode 100644 packages/angular_devkit/core/src/experimental/jobs/strategy.ts
 create mode 100644 packages/angular_devkit/core/src/experimental/jobs/strategy_spec.ts
 create mode 100644 tests/angular_devkit/core/node/jobs/BUILD
 create mode 100644 tests/angular_devkit/core/node/jobs/add.ts

diff --git a/etc/api/angular_devkit/core/node/_golden-api.d.ts b/etc/api/angular_devkit/core/node/_golden-api.d.ts
index 285d1d188bbe..6059512644b1 100644
--- a/etc/api/angular_devkit/core/node/_golden-api.d.ts
+++ b/etc/api/angular_devkit/core/node/_golden-api.d.ts
@@ -39,6 +39,12 @@ export declare class NodeJsSyncHost implements virtualFs.Host<fs.Stats> {
     write(path: Path, content: virtualFs.FileBuffer): Observable<void>;
 }
 
+export declare class NodeModuleJobRegistry<MinimumArgumentValueT extends JsonValue = JsonValue, MinimumInputValueT extends JsonValue = JsonValue, MinimumOutputValueT extends JsonValue = JsonValue> implements core_experimental.jobs.Registry<MinimumArgumentValueT, MinimumInputValueT, MinimumOutputValueT> {
+    constructor(_resolveLocal?: boolean, _resolveGlobal?: boolean);
+    protected _resolve(name: string): string | null;
+    get<A extends MinimumArgumentValueT, I extends MinimumInputValueT, O extends MinimumOutputValueT>(name: core_experimental.jobs.JobName): Observable<core_experimental.jobs.JobHandler<A, I, O> | null>;
+}
+
 export interface ProcessOutput {
     write(buffer: string | Buffer): boolean;
 }
diff --git a/packages/angular_devkit/core/BUILD b/packages/angular_devkit/core/BUILD
index 39faa08980ec..6d64bb664eaa 100644
--- a/packages/angular_devkit/core/BUILD
+++ b/packages/angular_devkit/core/BUILD
@@ -109,6 +109,7 @@ ts_library(
     deps = [
         ":core",
         ":node",
+        "//tests/angular_devkit/core/node/jobs:jobs_test_lib",
         "@rxjs",
         "@rxjs//operators",
         "@npm//@types/node",
diff --git a/packages/angular_devkit/core/node/_golden-api.ts b/packages/angular_devkit/core/node/_golden-api.ts
index 1008bfa1c3c9..ca9054ed2649 100644
--- a/packages/angular_devkit/core/node/_golden-api.ts
+++ b/packages/angular_devkit/core/node/_golden-api.ts
@@ -5,6 +5,13 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
+// Start experimental namespace
+// Start jobs namespace
+export * from './experimental/job-registry';
+// End jobs namespace
+// End experimental namespace
+
 export * from './fs';
 export * from './cli-logger';
 export * from './host';
diff --git a/packages/angular_devkit/core/node/experimental/index.ts b/packages/angular_devkit/core/node/experimental/index.ts
new file mode 100644
index 000000000000..c32982a08d12
--- /dev/null
+++ b/packages/angular_devkit/core/node/experimental/index.ts
@@ -0,0 +1,12 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import * as jobs from './job-registry';
+
+export {
+  jobs,
+};
diff --git a/packages/angular_devkit/core/node/experimental/job-registry.ts b/packages/angular_devkit/core/node/experimental/job-registry.ts
new file mode 100644
index 000000000000..266773dc527b
--- /dev/null
+++ b/packages/angular_devkit/core/node/experimental/job-registry.ts
@@ -0,0 +1,81 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Observable, of } from 'rxjs';
+import { JsonValue, experimental as core_experimental, schema } from '../../src';
+import { ModuleNotFoundException, resolve } from '../resolve';
+
+export class NodeModuleJobRegistry<MinimumArgumentValueT extends JsonValue = JsonValue,
+  MinimumInputValueT extends JsonValue = JsonValue,
+  MinimumOutputValueT extends JsonValue = JsonValue,
+> implements core_experimental.jobs.Registry<MinimumArgumentValueT,
+  MinimumInputValueT,
+  MinimumOutputValueT> {
+  public constructor(private _resolveLocal = true, private _resolveGlobal = false) {
+  }
+
+  protected _resolve(name: string): string | null {
+    try {
+      return resolve(name, {
+        checkLocal: this._resolveLocal,
+        checkGlobal: this._resolveGlobal,
+        basedir: __dirname,
+      });
+    } catch (e) {
+      if (e instanceof ModuleNotFoundException) {
+        return null;
+      }
+      throw e;
+    }
+  }
+
+  /**
+   * Get a job description for a named job.
+   *
+   * @param name The name of the job.
+   * @returns A description, or null if the job is not registered.
+   */
+  get<A extends MinimumArgumentValueT,
+    I extends MinimumInputValueT,
+    O extends MinimumOutputValueT,
+    >(
+    name: core_experimental.jobs.JobName,
+  ): Observable<core_experimental.jobs.JobHandler<A, I, O> | null> {
+    const [moduleName, exportName] = name.split(/#/, 2);
+
+    const resolvedPath = this._resolve(moduleName);
+    if (!resolvedPath) {
+      return of(null);
+    }
+
+    const pkg = require(resolvedPath);
+    const handler = pkg[exportName || 'default'];
+    if (!handler) {
+      return of(null);
+    }
+
+    // TODO: this should be unknown
+    // tslint:disable-next-line:no-any
+    function _getValue(...fields: any[]) {
+      return fields.find(x => schema.isJsonSchema(x)) || true;
+    }
+
+    const argument = _getValue(pkg.argument, handler.argument);
+    const input = _getValue(pkg.input, handler.input);
+    const output = _getValue(pkg.output, handler.output);
+    const channels = _getValue(pkg.channels, handler.channels);
+
+    return of(Object.assign(handler.bind(undefined), {
+      jobDescription: {
+        argument,
+        input,
+        output,
+        channels,
+      },
+    }));
+  }
+}
diff --git a/packages/angular_devkit/core/node/experimental/job-registry_spec.ts b/packages/angular_devkit/core/node/experimental/job-registry_spec.ts
new file mode 100644
index 000000000000..b951f830c685
--- /dev/null
+++ b/packages/angular_devkit/core/node/experimental/job-registry_spec.ts
@@ -0,0 +1,26 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import * as path from 'path';
+import { experimental as core_experimental } from '../../src';
+import { NodeModuleJobRegistry } from './job-registry';
+
+const root = path.join(
+  path.dirname(require.resolve(__filename)),
+  '../../../../../tests/angular_devkit/core/node/jobs',
+);
+
+
+describe('NodeModuleJobScheduler', () => {
+  it('works', async () => {
+    const registry = new NodeModuleJobRegistry();
+    const scheduler = new core_experimental.jobs.SimpleScheduler(registry);
+
+    const job = scheduler.schedule(path.join(root, 'add'), [1, 2, 3]);
+    expect(await job.output.toPromise()).toBe(6);
+  });
+});
diff --git a/packages/angular_devkit/core/node/index.ts b/packages/angular_devkit/core/node/index.ts
index 22d6d35a531d..8b5f1d676693 100644
--- a/packages/angular_devkit/core/node/index.ts
+++ b/packages/angular_devkit/core/node/index.ts
@@ -5,11 +5,13 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import * as experimental from './experimental/job-registry';
 import * as fs from './fs';
 export * from './cli-logger';
 export * from './host';
 export { ModuleNotFoundException, ResolveOptions, resolve } from './resolve';
 
 export {
+  experimental,
   fs,
 };
diff --git a/packages/angular_devkit/core/src/experimental.ts b/packages/angular_devkit/core/src/experimental.ts
index 5e3dcf689ed7..a2f8e102b86a 100644
--- a/packages/angular_devkit/core/src/experimental.ts
+++ b/packages/angular_devkit/core/src/experimental.ts
@@ -5,6 +5,10 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import * as jobs from './experimental/jobs/index';
 import * as workspace from './workspace/index';
 
-export { workspace };
+export {
+  jobs,
+  workspace,
+};
diff --git a/packages/angular_devkit/core/src/experimental/jobs/README.md b/packages/angular_devkit/core/src/experimental/jobs/README.md
new file mode 100644
index 000000000000..3989c30d0d38
--- /dev/null
+++ b/packages/angular_devkit/core/src/experimental/jobs/README.md
@@ -0,0 +1,495 @@
+# Description
+
+Jobs is the Angular DevKit subsystem for scheduling and running generic functions with clearly 
+typed inputs and outputs. A `Job` instance is a function associated with metadata. You can
+schedule a job, synchronize it with other jobs, and use it to schedule other jobs.
+
+The whole API is serializable, allowing you to use a Node Stream or message channel to
+communicate between the job and the job scheduler.
+
+Jobs are lazy, cold, and guaranteed to execute exactly once when scheduled. Subscribing to a job
+returns messages from the point where the job is at.
+
+## Argument, Input, Output and Channels
+A job receives a single argument when scheduled and can also listen to an input channel. It can
+emit multiple outputs, and can also provide multiple output channels that emit asynchronous JSON 
+messages, which can be typed. 
+
+The I/O model is like that of an executable, where the argument corresponds to arguments on the 
+command line, the input channel to STDIN, the output channel to STDOUT, and the channels
+would be additional output streams.
+
+In addition, a `Job` has a logging channel that can be used to log messages to the user. The 
+code that schedules the job must listen for or forward these messages. You can think of those
+messages as STDERR.
+
+## LifeCycle
+A `Job` goes through multiple LifeCycle messages before its completion;
+1. `JobState.Queued`. The job was queued and is waiting. This is the default state from the
+    scheduler.
+1. `JobState.Ready`. The job's dependencies (see
+    ["Synchronizing and Dependencies"](#Dependencies)) are done running, the argument is 
+    validated, and the job is ready to execute.
+1. `JobState.Started`. The argument has been validated, the job has been called and is running. 
+    This is handled by the job itself (or `createJobHandler()`).
+1. `JobState.Ended`. The job has ended and is done running. This is handled by the job itself (or 
+    `createJobHandler()`).
+1. `JobState.Errored`. A unrecoverable error happened.
+
+Each state (except `Queued`) corresponds to a `JobOutboundMessage` on the `outboundBus` observable
+that triggers the state change. The `Scheduler` emits the `Ready` and `Errored` messages; the job 
+implementation should not emit them, and if it does they are filtered out. You can listen for 
+these messages or use the corresponding state member.
+
+The job implementation should emit the `Start` and `End` messages when it is starting the job logic
+itself. Only the first `Start` and `End` messages will be forwarded. Any more will be filtered out.
+
+The `Queued` state is set as the job is scheduled, so there is no need to listen for the message.
+
+## `Job<OutputType>` Object
+The `Job` object that is returned when you schedule a job provides access to the job's status and 
+utilities for tracking and modifying the job. 
+
+1. `id`. A unique symbol that can be used as a Map key.
+1. `description`. The description of the job from the scheduler. See `JobDescription` object.
+1. `argument`. The argument value that was used to start the job.
+1. `input`. An `Observer` that can be used to send validated inputs to the job itself.
+1. `output`. An `Observable<OutputType>` that filters out messages to get only the returned output
+    of a job.
+1. `promise`. A promise that waits for the last output of a job. Returns the last value outputted
+    (or no value if there's no last value).
+1. `state`. The current state of the job (see `LifeCycle`).
+1. `channels`. A map of side channels the user can listen to as `Observable`.
+1. `ping()`. A function that can be used to ping the job, receiving a `Promise` for when the ping
+    is answered.
+1. `stop()`. Sends a `stop` input to the job, which suggests to stop the job. The job itself can
+    choose to ignore this message.
+1. `inboundBus`. The raw input `Observer<JobInboundMessage>`. This can be used to send messages to
+    the `context.inboundBus` observable in the job. These are `JobInboundMessage` messages. See
+    ["Communicating With Jobs"](#Communicating).
+1. `outboundBus`. The raw output `Observable<JobOutput>`. This can be used to listen to messages
+    from the job. See ["Communicating With Jobs"](#Communicating).
+   
+## `JobHandlerContext<I, O>` Object
+The `JobHandlerContext<>` is passed to the job handler code in addition to its argument. The
+context contains the following members:
+
+1. `description`. The description of the job. Its name and schemas.
+1. `scheduler`. A `Scheduler<>` instance that can be used to create additional jobs.
+1. `dependencies`. A generic list of other job instances that were run as dependencies when
+    scheduling this job. Their `id` is not guaranteed to match the `id` of the `Job<>` instance 
+    itself (those `Job<>`s might just be proxies). The state of those `Job<>` is guaranteed to be
+    `JobState.Ended`, as `JobState.Errored` would have prevented this handler from running.
+1. `inboundBus`. The raw input observable, complement of the `inboundBus` observer from the `Job<>`.
+
+# Examples
+
+An example of a job that adds all input together and return the output value. We use a 
+simple synchronous job registry and a simple job scheduler.
+
+```typescript
+import { jobs } from '@angular-devkit/core';
+
+const add = jobs.createJobHandle<number[], number>(
+  input => input.reduce((total, curr) => total + curr, 0),
+);
+
+// Register the job in a SimpleJobRegistry. Different registries have different API.
+const registry = new jobs.SimpleJobRegistry();
+const scheduler = new jobs.SimpleScheduler(registry);
+registry.register(add, {
+  name: 'add',
+  input: { type: 'array', items: { type: 'number' } },
+  output: { type: 'number' },
+});
+
+scheduler.schedule('add', [1, 2, 3, 4]).promise
+  .then(output => console.log('1 + 2 + 3 + 4 is ' + output));
+```
+
+# Creating Jobs
+
+A job is at its core a function with a description object attached to it. The description object
+stores the JSON schemas used to validate the types of the argument passed in, the input and
+output values. By default, a job accepts and can output any JSON object.
+
+```typescript
+import { Observable } from 'rxjs';
+import { jobs } from '@angular-devkit/core';
+
+const argument = {
+  type: 'array', items: { type: 'number' },
+};
+const output = {
+  type: 'number',
+};
+
+export function add(argument: number[]): Observable<jobs.JobOutboundMessage<number>> {
+  return new Observable(o => {
+    o.next({ kind: jobs.JobOutboundMessageKind.Start });
+    o.next({
+      kind: jobs.JobOutboundMessageKind.Output,
+      output: argument.reduce((total, curr) => total + curr, 0),
+    });
+    o.next({ kind: jobs.JobOutboundMessageKind.End });
+    o.complete();
+  });
+}
+
+// Add a property to `add` to make it officially a JobHandler. The Job system does not recognize
+// any function as a JobHandler.
+add.jobDescription = {
+  argument: argument,
+  output: output,
+};
+
+// Call the job with an array as argument, and log its output.
+declare const scheduler: jobs.Scheduler;
+scheduler.schedule('add', [1, 2, 3, 4])
+    .output.subscribe(x => console.log(x));  // Will output 10.
+```
+
+This is a lot of boilerplate, so we made some helpers to improve readability and manage argument, 
+input and output automatically:
+
+```typescript
+// Add is a JobHandler function, like the above.
+export const add = jobs.createJobHandler<number[], number>(
+  argument => argument.reduce((total, curr) => total + curr, 0),
+);
+
+// Schedule like above.
+```
+
+You can also return a Promise or an Observable, as jobs are asynchronous. This helper will set
+start and end messages appropriately, and will pass in a logger. It will also manage channels
+automatically (see below).
+
+A more complex job can be declared like this:
+
+```typescript
+import { Observable } from 'rxjs';
+import { jobs } from '@angular-devkit/core';
+
+// Show progress with each count in a separate output channel. Output "more" in a channel.
+export const count = jobs.createJobHandler<number, number>(
+  // Receive a context that contains additional methods to create channels.
+  (argument: number, { createChannel }) => new Observable<number>(o => {
+    const side = createChannel('side', { type: 'string', const: 'more' });
+    const progress = createChannel('progress', { type: 'number' });
+    let i = 0;
+    function doCount() {
+      o.next(i++);
+      progress.next(i / argument);
+      side.next('more');
+  
+      if (i < argument) {
+        setTimeout(doCount, 100);
+      } else {
+        o.complete();
+      }
+    }
+    setTimeout(doCount, 100);
+  }),
+  {
+    argument: { type: 'number' },
+    output: { type: 'number' },
+  },
+);
+
+// Get a hold of a scheduler that refers to the job above.
+declare const scheduler: jobs.Scheduler;
+
+const job = scheduler.schedule('count', 0);
+job.getChannel('side').subscribe(x => console.log(x));
+// You can type a channel too. Messages will be filtered out.
+job.getChannel<number>('progress', { type: 'number' }).subscribe(x => console.log(x));
+```
+
+## <a name="Communicating"></a>Communicating With Jobs
+Jobs can be started and updated in a separate process or thread, and as such communication with a 
+job should avoid using global objects (which might not be shared). The jobs API and schedulers
+provide 2 communication streams (one for input and the other for output), named `inboundBus` and 
+`outboundBus`.
+
+### Raw Input Stream
+The `schedule()` function returns a `Job<>` interface that contains a `inboundBus` member of type
+`Observer<JobInboundMessage>`. All messages sent _to_ the job goes through this stream. The `kind`
+member of the `JobInboundMessage` interface dictates what kind of message it is sending:
+
+1. `JobInboundMessageKind.Ping`. A simple message that should be answered with
+    `JobOutboundMessageKind.Pong` when the job is responsive. The `id` field of the message should
+    be used when returning `Pong`.
+1. `JobInboundMessageKind.Stop`. The job should be stopped. This is used when
+    cancelling/unsubscribing from the `output` (or by calling `stop()`). Any inputs or outputs
+    after this message will be ignored.
+1. `JobInboundMessageKind.Input` is used when sending inputs to a job. These correspond to the
+    `next` methods of an `Observer` and are reported to the job through its `context.input`
+    Observable. There is no way to communicate an error to the job.
+
+Using the `createJobHandler()` helper, all those messages are automatically handled by the
+boilerplate code. If you need direct access to raw inputs, you should subscribe to the
+`context.inboundBus` Observable.
+
+### Raw Output Stream
+The `Job<>` interface also contains a `outboundBus` member (of type
+`Observable<JobOutboundMessage<O>>` where `O` is the typed output of the job) which is the output
+complement of `inboundBus`. All messages sent _from_ the job goes through this stream. The `kind`
+member of the `JobOutboundMessage<O>` interface dictates what kind of message it is sending:
+
+1. `JobOutboundMessageKind.Create`. The `Job<>` was created, its dependencies are done, and the
+    library is validating Argument and calling the internal job code.
+1. `JobOutboundMessageKind.Start`. The job code itself should send that message when started.
+    `createJobHandler()` will do it automatically.
+1. `JobOutboundMessageKind.End`. The job has ended. This is done by the job itself and should always
+    be sent when completed. The scheduler will listen to this message to set the state and unblock
+    dependent jobs. `createJobHandler()` automatically send this message.
+1. `JobOutboundMessageKind.Pong`. The job should answer a `JobInboundMessageKind.Ping` message with
+    this. Automatically done by `createJobHandler()`.
+1. `JobOutboundMessageKind.Log`. A logging message (side effect that should be shown to the user).
+1. `JobOutboundMessageKind.Output`. An `Output` has been generated by the job.
+1. `JobOutboundMessageKind.ChannelMessage`, `JobOutboundMessageKind.ChannelError` and
+    `JobOutboundMessageKind.ChannelComplete` are used for output channels. These correspond to the
+    `next`, `error` and `complete` methods of an `Observer` and are available to the callee through
+    the `job.channels` map of Observable.
+
+Those messages can be accessed directly through the `job.outboundBus` member. The job itself should
+return an `Observable<JobOutboundMessage<O>>`. The `createJobHandler()` helper handles most of use
+cases of this and makes it easier for jobs to handle this.
+
+## Job Dispatchers
+Dispatchers are a helper that redirect to different jobs given conditions. To create a job 
+dispatcher, use the `createDispatcher()` function:
+
+```typescript
+import { jobs } from '@angular-devkit/core';
+
+// A dispatcher that installs node modules given a user's preference.
+const dispatcher = jobs.createDispatcher({
+  name: 'node-install',
+  argument: { properties: { moduleName: { type: 'string' } } },
+  output: { type: 'boolean' },
+});
+
+const npmInstall = jobs.createJobHandler(/* ... */, { name: 'npm-install' });
+const yarnInstall = jobs.createJobHandler(/* ... */, { name: 'yarn-install' });
+const pnpmInstall = jobs.createJobHandler(/* ... */, { name: 'pnpm-install' });
+
+declare const registry: jobs.SimpleJobRegistry;
+registry.register(dispatcher);
+registry.register(npmInstall);
+registry.register(yarnInstall);
+registry.register(pnpmInstall);
+
+// Default to npm.
+dispatcher.setDefaultDelegate(npmInstall.name);
+// If the user is asking for yarn over npm, uses it.
+dispatcher.addConditionalDelegate(() => userWantsYarn, yarnInstall.name);
+```
+
+## Execution Strategy
+Jobs are always run in parallel and will always start, but many helper functions are provided 
+when creating a job to help you control the execution strategy;
+
+1. `serialize()`. Multiple runs of this job will be queued with each others.
+1. `memoize(replayMessages = false)` will create a job, or reuse the same job  when inputs are 
+matching. If the inputs don't match, a new job will be started and its outputs will be stored.
+
+These strategies can be used when creating the job:
+
+```typescript
+// Same input and output as above.
+
+export const add = jobs.strategy.memoize()(
+  jobs.createJobHandler<number[], number>(
+      argument => argument.reduce((total, curr) => total + curr, 0),
+  ),
+);
+```
+
+Strategies can be reused to synchronize between jobs. For example, given jobs `jobA` and `jobB`, 
+you can reuse the strategy to serialize both jobs together;
+
+```typescript
+const strategy = jobs.strategy.serialize();
+const jobA = strategy(jobs.createJobHandler(...));
+const jobB = strategy(jobs.createJobHandler(...));
+```
+
+Even further, we can have package A and package B run in serialization, and B and C also be 
+serialized. Running A and C will run in parallel, while running B will wait for both A and C 
+to finish.
+
+```typescript
+const strategy1 = jobs.strategy.serialize();
+const strategy2 = jobs.strategy.serialize();
+const jobA = strategy1(jobs.createJobHandler(...));
+const jobB = strategy1(strategy2(jobs.createJobHandler(...)));
+const jobC = strategy2(jobs.createJobHandler(...));
+```
+
+# Scheduling Jobs
+Jobs can be scheduled using a `Scheduler` interface, which contains a `schedule()` method:
+
+```typescript
+interface Scheduler {
+  /**
+   * Schedule a job to be run, using its name.
+   * @param name The name of job to be run.
+   * @param argument The argument to send to the job when starting it.
+   * @param options Scheduling options.
+   * @returns The Job being run.
+   */
+  schedule<I extends MinimumInputValueT, O extends MinimumOutputValueT>(
+    name: JobName,
+    argument: I,
+    options?: ScheduleJobOptions,
+  ): Job<JsonValue, O>;
+}
+```
+
+The scheduler also has a `getDescription()` method to get a `JobDescription` object for a certain 
+name; that description contains schemas for the argument, input, output, and other channels:
+
+```typescript
+interface Scheduler {
+  /**
+   * Get a job description for a named job.
+   *
+   * @param name The name of the job.
+   * @returns A description, or null if the job cannot be scheduled.
+   */
+  getDescription(name: JobName): JobDescription | null;
+    
+  /**
+   * Returns true if the job name has been registered.
+   * @param name The name of the job.
+   * @returns True if the job exists, false otherwise.
+   */
+  has(name: JobName): boolean;
+}
+```
+
+Finally, the scheduler interface has a `pause()` method to stop scheduling. This will queue all 
+jobs and wait for the unpause function to be called before unblocking all the jobs scheduled. 
+This does not affect already running jobs.
+
+```typescript
+interface Scheduler {
+  /**
+   * Pause the scheduler, temporary queueing _new_ jobs. Returns a resume function that should be
+   * used to resume execution. If multiple `pause()` were called, all their resume functions must
+   * be called before the Scheduler actually starts new jobs. Additional calls to the same resume
+   * function will have no effect.
+   *
+   * Jobs already running are NOT paused. This is pausing the scheduler only.
+   *
+   * @returns A function that can be run to resume the scheduler. If multiple `pause()` calls
+   *          were made, all their return function must be called (in any order) before the
+   *          scheduler can resume.
+   */
+  pause(): () => void;
+}
+```
+
+## <a name="Dependencies"></a>Synchronizing and Dependencies
+When scheduling jobs, it is often necessary to run jobs after certain other jobs are finished. 
+This is done through the `dependencies` options in the `schedule()` method.
+
+These jobs will also be passed to the job being scheduled, through its context. This can be
+useful if, for example, the output of those jobs are of a known type, or have known side channels.
+
+An example of this would be a compiler that needs to know the output directory of other compilers
+before it, in a tool chain.
+
+### Dependencies
+When scheduling jobs, the user can add a `dependencies` field to the scheduling options. The
+scheduler will wait for those dependencies to finish before running the job, and pass those jobs 
+in the context of the job.
+
+### Accessing Dependencies
+Jobs are called with a `JobHandlerContext` as a second argument, which contains a
+`dependencies: Job<JsonValue>[]` member which contains all dependencies that were used when 
+scheduling the job. Those aren't fully typed as they are determined by the user, and not the job
+itself. They also can contain jobs that are not finished, and the job should use the `state`
+member of the job itself before trying to access its content.
+
+### Scheduler Sub Jobs
+The `JobHandlerContext` also contains a `scheduler` member which can be used to schedule jobs
+using the same scheduler that was used for the job. This allows jobs to call other jobs
+and wait for them to end.
+
+## Available Schedulers
+The Core Angular DevKit library provides 2 implementations for the `Scheduler` interface:
+
+## SimpleJobRegistry
+Available in the jobs namespace. A registry that accept job registration, and can also schedule
+jobs.
+
+```typescript
+import { jobs } from '@angular-devkit/core';
+
+const add = jobs.createJobHandler<number[], number>(
+  argument => argument.reduce((total, curr) => total + curr, 0),
+);
+
+// Register the job in a SimpleJobRegistry. Different registries have different API.
+const registry = new jobs.SimpleJobRegistry();
+const scheduler = new SimpleJobScheduler(registry);
+
+registry.register(add, {
+  name: 'add',
+  argument: { type: 'array', items: { type: 'number' } },
+  output: { type: 'number' },
+});
+
+scheduler.schedule('add', [1, 2, 3, 4]);
+```
+
+## NodeModuleJobRegistry
+Available through `@angular-devkit/core/node`.
+
+A scheduler that loads jobs using their node package names. These jobs need to use the
+`createJobHandler()` helper and report their argument/input/output schemas that way.
+
+```typescript
+declare const registry: NodeModuleJobRegistry;
+const scheduler = new SimpleJobScheduler(registry);
+
+scheduler.schedule('some-node-package#someExport', 'input');
+```
+
+# Gotchas
+
+1. Deadlocking Dependencies  
+   It is impossible to add dependencies to an already running job, but it is entirely possible to 
+   get locked between jobs. Be aware of your own dependencies.
+
+1. Using `job.promise`  
+    `job.promise` waits for the job to ends. Don't rely on it unless you know the job is not 
+    watching and running for a long time. If you aren't sure, use
+    `job.output.pipe(first()).toPromise()` instead which will return the first next output, 
+    regardless of whether the job watches and rerun or not.
+
+
+# FAQ
+
+1. Laziness  
+    A job is lazy until executed, but its messages will be replayed when resubscribed.
+
+1. Serialize Strategy vs Dependencies  
+    Strategies are functions that transform the execution of a job, and can be used when
+    declaring the job, or registering it. Dependencies, on the other hand, are listed when
+    scheduling a job to order jobs during scheduling.
+    
+    A job has no control over the way it's scheduled, and its dependencies. It can, however,
+    declare that it shouldn't run at the same time as itself. Alternatively, a user could
+    schedule a job twice and imply that the second run should wait for the first to finish. In
+    practice, this would be equivalent to having the job be serialized, but the important detail 
+    is in _whom_ is defining the rules; using the `serialize()` strategy, the job implementation
+    is, while when using dependencies, the user is.
+    
+    The user does not need to know how to job needs to synchronize with itself, and the job does
+    not need to know how it synchronizes with other jobs that it doesn't know about. That's part 
+    of the strength of this system as every job can be developed in a vacuum, only caring about
+    its contracts (argument, input and output) and its own synchronization.
diff --git a/packages/angular_devkit/core/src/experimental/jobs/api.ts b/packages/angular_devkit/core/src/experimental/jobs/api.ts
new file mode 100644
index 000000000000..92f045e5369e
--- /dev/null
+++ b/packages/angular_devkit/core/src/experimental/jobs/api.ts
@@ -0,0 +1,478 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Observable, Observer } from 'rxjs';
+import { JsonObject, JsonValue, schema } from '../../json/index';
+import { LogEntry, LoggerApi } from '../../logger/index';
+import { DeepReadonly } from '../../utils/index';
+
+/**
+ * A job name is just a string (needs to be serializable).
+ */
+export type JobName = string;
+
+
+/**
+ * The job handler function, which is a method that's executed for the job.
+ */
+export interface JobHandler<
+  ArgT extends JsonValue,
+  InputT extends JsonValue,
+  OutputT extends JsonValue,
+> {
+  (
+    argument: ArgT,
+    context: JobHandlerContext<ArgT, InputT, OutputT>,
+  ): Observable<JobOutboundMessage<OutputT>>;
+
+  jobDescription: Partial<JobDescription>;
+}
+
+
+/**
+ * The context in which the job is run.
+ */
+export interface JobHandlerContext<
+  MinimumArgumentValueT extends JsonValue = JsonValue,
+  MinimumInputValueT extends JsonValue = JsonValue,
+  MinimumOutputValueT extends JsonValue = JsonValue,
+> {
+  readonly description: JobDescription;
+  readonly scheduler: Scheduler<MinimumArgumentValueT, MinimumInputValueT, MinimumOutputValueT>;
+
+  // In this context, JsonValue is comparable to `any`.
+  readonly dependencies: Job<JsonValue, JsonValue, JsonValue>[];
+
+  readonly inboundBus: Observable<JobInboundMessage<MinimumInputValueT>>;
+}
+
+
+/**
+ * Metadata associated with a job.
+ */
+export interface JobDescription extends JsonObject {
+  readonly name: JobName;
+
+  readonly argument: DeepReadonly<schema.JsonSchema>;
+  readonly input: DeepReadonly<schema.JsonSchema>;
+  readonly output: DeepReadonly<schema.JsonSchema>;
+}
+
+/**
+ * Messages that can be sent TO a job. The job needs to listen to those.
+ */
+export enum JobInboundMessageKind {
+  Ping = 'ip',
+  Stop = 'is',
+
+  // Channel specific messages.
+  Input = 'in',
+  // Input channel does not allow completion / error. Erroring this will just close the Subject
+  // but not notify the job.
+}
+
+/** Base interface for the all job inbound messages. */
+export interface JobInboundMessageBase extends JsonObject {
+  /**
+   * The kind of message this is.
+   */
+  readonly kind: JobInboundMessageKind;
+}
+
+/**
+ * A ping to the job. The job should reply with a pong as soon as possible.
+ */
+export interface JobInboundMessagePing extends JobInboundMessageBase {
+  readonly kind: JobInboundMessageKind.Ping;
+
+  /**
+   * An ID that should be returned in the corresponding Pong.
+   */
+  readonly id: number;
+}
+
+/**
+ * Stop the job. This is handled by the job itself and jobs might not handle it. It will also
+ * unsubscribe from the Observable<>.
+ * This is equivalent to SIGTERM.
+ */
+export interface JobInboundMessageStop extends JobInboundMessageBase {
+  readonly kind: JobInboundMessageKind.Stop;
+}
+
+/**
+ * A Job wants to send a message to a channel. This can be marshaled, and the Job object
+ * has helpers to transform this into an observable. The context also can create RxJS subjects that
+ * marshall messages through a channel.
+ */
+export interface JobInboundMessageInput<InputT extends JsonValue> extends JobInboundMessageBase {
+  readonly kind: JobInboundMessageKind.Input;
+
+  /**
+   * The input being sent to the job.
+   */
+  readonly value: InputT;
+}
+
+export type JobInboundMessage<InputT extends JsonValue> =
+  JobInboundMessagePing
+  | JobInboundMessageStop
+  | JobInboundMessageInput<InputT>
+  ;
+
+/**
+ * Kind of messages that can be outputted from a job.
+ */
+export enum JobOutboundMessageKind {
+  // Lifecycle specific messages.
+  OnReady = 'c',
+  Start = 's',
+  End = 'e',
+  Pong = 'p',
+
+  // Feedback messages.
+  Log = 'l',
+  Output = 'o',
+
+  // Channel specific messages.
+  ChannelCreate = 'cn',
+  ChannelMessage = 'cm',
+  ChannelError = 'ce',
+  ChannelComplete = 'cc',
+}
+
+/** Base interface for the all job messages. */
+export interface JobOutboundMessageBase {
+  /**
+   * The job description.
+   */
+  readonly description: JobDescription;
+
+  /**
+   * The kind of message this is.
+   */
+  readonly kind: JobOutboundMessageKind;
+}
+
+/**
+ * The job has been created and will validate its input.
+ */
+export interface JobOutboundMessageOnReady extends JobOutboundMessageBase {
+  readonly kind: JobOutboundMessageKind.OnReady;
+}
+
+/**
+ * The job started. This is done by the job itself.
+ */
+export interface JobOutboundMessageStart extends JobOutboundMessageBase {
+  readonly kind: JobOutboundMessageKind.Start;
+}
+
+/**
+ * A logging message, supporting the logging.LogEntry.
+ */
+export interface JobOutboundMessageLog extends JobOutboundMessageBase {
+  readonly kind: JobOutboundMessageKind.Log;
+  readonly entry: LogEntry;
+}
+
+/**
+ * An output value is available.
+ */
+export interface JobOutboundMessageOutput<
+  OutputT extends JsonValue,
+> extends JobOutboundMessageBase {
+  readonly kind: JobOutboundMessageKind.Output;
+
+  /**
+   * The message being outputted from the job.
+   */
+  readonly value: OutputT;
+}
+
+
+/**
+ * Base interface for all job message related to channels.
+ */
+export interface JobOutboundMessageChannelBase extends JobOutboundMessageBase {
+  /**
+   * The name of the channel.
+   */
+  readonly name: string;
+}
+
+/**
+ * A job wants to send a message to a channel. This can be marshaled, and the Job object
+ * has helpers to transform this into an observable. The context also can create RxJS subjects that
+ * marshall messages through a channel.
+ */
+export interface JobOutboundMessageChannelMessage extends JobOutboundMessageChannelBase {
+  readonly kind: JobOutboundMessageKind.ChannelMessage;
+
+  /**
+   * The message being sent to the channel.
+   */
+  readonly message: JsonValue;
+}
+
+/**
+ * A job wants to send an error to one of its channel. This is the equivalent of throwing through
+ * an Observable. The side channel will not receive any more messages after this, and will not
+ * complete.
+ */
+export interface JobOutboundMessageChannelError extends JobOutboundMessageChannelBase {
+  readonly kind: JobOutboundMessageKind.ChannelError;
+
+  /**
+   * The error message being sent to the channel.
+   */
+  readonly error: JsonValue;
+}
+
+/**
+ * A job wants to create a new channel.
+ */
+export interface JobOutboundMessageChannelCreate extends JobOutboundMessageChannelBase {
+  readonly kind: JobOutboundMessageKind.ChannelCreate;
+}
+
+/**
+ * A job wants to close the channel, as completed. This is done automatically when the job ends,
+ * or can be done from the job to close it. A closed channel might be reopened, but the user
+ * need to recall getChannel().
+ */
+export interface JobOutboundMessageChannelComplete extends JobOutboundMessageChannelBase {
+  readonly kind: JobOutboundMessageKind.ChannelComplete;
+}
+
+/**
+ * OnEnd of the job run.
+ */
+export interface JobOutboundMessageEnd extends JobOutboundMessageBase {
+  readonly kind: JobOutboundMessageKind.End;
+}
+
+/**
+ * A pong response from a ping input. The id is the same as the one passed in.
+ */
+export interface JobOutboundMessagePong extends JobOutboundMessageBase {
+  readonly kind: JobOutboundMessageKind.Pong;
+
+  /**
+   * The ID that was passed in the `Ping` messages.
+   */
+  readonly id: number;
+}
+
+/**
+ * Generic message type.
+ */
+export type JobOutboundMessage<OutputT extends JsonValue> =
+  JobOutboundMessageOnReady
+  | JobOutboundMessageStart
+  | JobOutboundMessageLog
+  | JobOutboundMessageOutput<OutputT>
+  | JobOutboundMessageChannelCreate
+  | JobOutboundMessageChannelMessage
+  | JobOutboundMessageChannelError
+  | JobOutboundMessageChannelComplete
+  | JobOutboundMessageEnd
+  | JobOutboundMessagePong
+  ;
+
+
+/**
+ * The state of a job. These are changed as the job reports a new state through its messages.
+ */
+export enum JobState {
+  /**
+   * The job was queued and is waiting to start.
+   */
+  Queued = 'queued',
+  /**
+   * The job description was found, its dependencies (see "Synchronizing and Dependencies")
+   * are done running, and the job's argument is validated and the job's code will be executed.
+   */
+  Ready = 'ready',
+  /**
+   * The job has been started. The job implementation is expected to send this as soon as its
+   * work is starting.
+   */
+  Started = 'started',
+  /**
+   * The job has ended and is done running.
+   */
+  Ended = 'ended',
+  /**
+   * An error occured and the job stopped because of internal state.
+   */
+  Errored = 'errored',
+}
+
+
+/**
+ * A Job instance, returned from scheduling a job. A Job instance is _not_ serializable.
+ */
+export interface Job<
+  ArgumentT extends JsonValue = JsonValue,
+  InputT extends JsonValue = JsonValue,
+  OutputT extends JsonValue = JsonValue,
+> {
+  /**
+   * Description of the job. Resolving the job's description can be done asynchronously, so this
+   * is an observable that will resolve when it's ready.
+   */
+  readonly description: Observable<JobDescription>;
+
+  /**
+   * Argument sent when scheduling the job. This is a copy of the argument.
+   */
+  readonly argument: ArgumentT;
+
+  /**
+   * The input to the job. This goes through the input channel as messages.
+   */
+  readonly input: Observer<InputT>;
+
+  /**
+   * Outputs of this job.
+   */
+  readonly output: Observable<OutputT>;
+
+  /**
+   * The current state of the job.
+   */
+  readonly state: JobState;
+
+  /**
+   * Get a channel that validates against the schema. Messages will be filtered by the schema.
+   * @param name The name of the channel.
+   * @param schema A schema to use to validate messages.
+   */
+  getChannel<T extends JsonValue>(name: string, schema?: schema.JsonSchema): Observable<T>;
+
+  /**
+   * Pings the job and wait for the resulting Pong before completing.
+   */
+  ping(): Observable<never>;
+
+  /**
+   * Stops the job from running. This is different than unsubscribing from the output as in it
+   * sends the JobInboundMessageKind.Stop raw input to the job.
+   */
+  stop(): void;
+
+  /**
+   * The JobInboundMessage messages TO the job.
+   */
+  readonly inboundBus: Observer<JobInboundMessage<InputT>>;
+
+  /**
+   * The JobOutboundMessage FROM the job.
+   */
+  readonly outboundBus: Observable<JobOutboundMessage<OutputT>>;
+}
+
+/**
+ * Options for scheduling jobs.
+ */
+export interface ScheduleJobOptions {
+  /**
+   * Where should logging be passed in. By default logging will be dropped.
+   */
+  logger?: LoggerApi;
+
+  /**
+   * Jobs that need to finish before scheduling this job. These dependencies will be passed
+   * to the job itself in its context.
+   */
+  dependencies?: Job | Job[];
+}
+
+export interface Registry<
+  MinimumArgumentValueT extends JsonValue = JsonValue,
+  MinimumInputValueT extends JsonValue = JsonValue,
+  MinimumOutputValueT extends JsonValue = JsonValue,
+> {
+  /**
+   * Get a job handler.
+   * @param name The name of the job to get a handler from.
+   */
+  get<
+    A extends MinimumArgumentValueT,
+    I extends MinimumInputValueT,
+    O extends MinimumOutputValueT,
+  >(name: JobName): Observable<JobHandler<A, I, O> | null>;
+}
+
+/**
+ * An interface that can schedule jobs.
+ */
+export interface Scheduler<
+  MinimumArgumentValueT extends JsonValue = JsonValue,
+  MinimumInputValueT extends JsonValue = JsonValue,
+  MinimumOutputValueT extends JsonValue = JsonValue,
+> {
+  /**
+   * Get a job description for a named job.
+   *
+   * @param name The name of the job.
+   * @returns A description, or null if no description is available for this job.
+   */
+  getDescription(name: JobName): Observable<JobDescription | null>;
+
+  /**
+   * Returns true if the job name has been registered.
+   * @param name The name of the job.
+   * @returns True if the job exists, false otherwise.
+   */
+  has(name: JobName): Observable<boolean>;
+
+  /**
+   * Pause the scheduler, temporary queueing _new_ jobs. Returns a resume function that should be
+   * used to resume execution. If multiple `pause()` were called, all their resume functions must
+   * be called before the Scheduler actually starts new jobs. Additional calls to the same resume
+   * function will have no effect.
+   *
+   * Jobs already running are NOT paused. This is pausing the scheduler only.
+   *
+   * @returns A function that can be run to resume the scheduler. If multiple `pause()` calls
+   *          were made, all their return function must be called (in any order) before the
+   *          scheduler can resume.
+   */
+  pause(): () => void;
+
+  /**
+   * Schedule a job to be run, using its name.
+   * @param name The name of job to be run.
+   * @param argument The argument to send to the job when starting it.
+   * @param options Scheduling options.
+   * @returns The job being run.
+   */
+  schedule<
+    A extends MinimumArgumentValueT,
+    I extends MinimumInputValueT,
+    O extends MinimumOutputValueT,
+  >(
+    name: JobName,
+    argument: A,
+    options?: ScheduleJobOptions,
+  ): Job<A, I, O>;
+}
+
+
+export function isJobHandler<
+  A extends JsonValue,
+  I extends JsonValue,
+  O extends JsonValue,
+// TODO: this should be unknown
+// tslint:disable-next-line:no-any
+>(value: any): value is JobHandler<A, I, O> {
+  return typeof value == 'function'
+      && typeof value.jobDescription == 'object'
+      && value.jobDescription !== null;
+}
diff --git a/packages/angular_devkit/core/src/experimental/jobs/architecture.md b/packages/angular_devkit/core/src/experimental/jobs/architecture.md
new file mode 100644
index 000000000000..216339f167dd
--- /dev/null
+++ b/packages/angular_devkit/core/src/experimental/jobs/architecture.md
@@ -0,0 +1,257 @@
+
+# Overview
+Jobs is a high-order API that adds inputs, runtime type checking, sequencing, and other
+functionality on top of RxJS' `Observable`s.
+
+# Background
+An `Observable` (at a higher level) is a function that receives a `Subscriber`, and outputs
+multiple values, and finishes once it calls the `Subscriber.prototype.complete()` method (in
+JavaScript):
+
+```javascript
+const output1To10EverySecond = function (subscriber) {
+  let t = 0;
+  const i = setInterval(() => {
+    t++;
+    subscriber.next(t);
+    if (t === 10) {
+      subscriber.complete(t);
+    }
+  }, 1000);
+  return () => clearInterval(i);
+};
+
+const stream$ = new Observable(output1To10EverySecond);
+// Start the function, and output 1 to 100, once per line.
+stream$.subscribe(x => console.log(x));
+```
+
+This, of course, can be typed in TypeScript, but those types are not enforced at runtime.
+
+# Glossary
+- `job handler`. The function that implements the job's logic.
+- `raw input`. The input observable sending messages to the job. These messages are of type
+    `JobInboundMessage`.
+- `raw output`. The output observer returned from the `job handler`. Messages on this observable
+    are of type `JobOutboundMessage`.
+
+# Description
+
+A `JobHandler`, similar to observables, is a function that receives an argument and a context, and
+returns an `Observable` of messages, which can include outputs that are typed at runtime (using a
+Json Schema):
+
+```javascript
+const output1ToXEverySecond = function (x, context) {
+  return new Observable(subscriber => {
+    let t = 0;
+
+    // Notify our users that the actual work is started.
+    subscriber.next({ kind: JobOutboundMessageKind.Start });
+    const i = setInterval(() => {
+      t++;
+      subscriber.next({ kind: JobOutboundMessageKind.Output, value: t });
+      if (t === x) {
+        subscriber.next({ kind: JobOutboundMessageKind.End });
+        subscriber.complete();
+      }
+    }, 1000);
+
+    return () => {
+      clearInterval(i);
+    };
+  })
+};
+
+// For now, jobs can not be called without a registry and scheduler.
+const registry = new SimpleJobRegistry();
+registry.register('output-from-1-to-x', output1ToXEverySecond, {
+  argument: { type: 'number' },
+  output: { type: 'number' },
+});
+const scheduler = new SimpleScheduler(registry);
+
+// Need to keep the same name that the registry would understand.
+// Count from 1 to 10.
+const job = scheduler.schedule('output-from-1-to-x', 10);
+
+// A Job<> instance has more members, but we only want the output values here.
+job.output.subscribe(x => console.log(x));
+```
+
+This seems like a lot of boilerplate in comparison, but there are a few advantages;
+
+1. lifecycle. Jobs can tell when they start doing work and when work is done.
+1. everything is typed, even at runtime.
+1. the context also contains an input Observable that receives typed input messages, including
+    input values, and stop requests.
+1. jobs can also schedule other jobs and wait for them, even if they don't know if a job is
+    implemented in the system.
+
+## Diagram
+A simpler way to think about jobs in contrast to observables is that job are closer to a Unix
+process. It has an argument (command line flags), receive inputs (STDIN and interupt signals),
+and output values (STDOUT) as well as diagnostic (STDERR). They can be plugged one into another
+(piping), and can be transformed, synchronized and scheduled (fork, exec, cron).
+
+```plain
+- given A the type of the argument
+- given I the type of the input
+- given O the type of the output
+
+                              ,______________________   
+    JobInboundMessage<I> --> | handler(argument: A) |  --> JobOutboundMessage<O>
+                              `⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻       - JobOutboundMessageKind.Log
+                                                            - JobOutboundMessageKind.Output
+                                                            - ...
+```
+
+`JobInboundMessage` includes:
+
+1. `JobInboundMessageKind.Ping`. A simple message that should be answered with
+    `JobOutboundMessageKind.Pong` when the job is responsive. The `id` field of the message should
+    be used when returning `Pong`.
+1. `JobInboundMessageKind.Stop`. The job should be stopped. This is used when
+    cancelling/unsubscribing from the `output` (or by calling `stop()`). Any inputs or outputs
+    after this message will be ignored.
+1. `JobInboundMessageKind.Input` is used when sending inputs to a job. These correspond to the
+    `next` methods of an `Observer` and are reported to the job through its `context.input`
+    Observable. There is no way to communicate an error to the job.
+
+`JobOutboundMessage` includes:
+
+1. `JobOutboundMessageKind.Ready`. The `Job<>` was created, its dependencies are done, and the
+    library is validating Argument and calling the internal job code.
+1. `JobOutboundMessageKind.Start`. The job code itself should send that message when started.
+    `createJobHandler()` will do it automatically.
+1. `JobOutboundMessageKind.End`. The job has ended. This is done by the job itself and should
+    always be sent when completed. The scheduler will listen to this message to set the state and
+    unblock dependent jobs. `createJobHandler()` automatically send this message.
+1. `JobOutboundMessageKind.Pong`. The job should answer a `JobInboundMessageKind.Ping` message with
+    this. Automatically done by `createJobHandler()`.
+1. `JobOutboundMessageKind.Log`. A logging message (side effect that should be shown to the user).
+1. `JobOutboundMessageKind.Output`. An `Output` has been generated by the job.
+1. `JobOutboundMessageKind.ChannelMessage`, `JobOutboundMessageKind.ChannelError` and
+    `JobOutboundMessageKind.ChannelComplete` are used for output channels. These correspond to
+    the `next`, `error` and `complete` methods of an `Observer` and are available to the callee
+    through the `job.channels` map of Observable.
+
+Utilities should have some filtering and dispatching to separate observables, as a convenience for
+the user. An example of this would be the `Job.prototype.output` observable which only contains
+the value contained by messages of type `JobOutboundMessageKind.Output`.
+
+# Higher Order Jobs
+Because jobs are expected to be pure functions, they can be composed or transformed to create
+more complex behaviour, similar to how RxJS operators can transform observables.
+
+```javascript
+// Runs a job on the hour, every hour, regardless of how long the job takes.
+// This creates a job function that can be registered by itself.
+function scheduleJobOnTheHour(jobFunction) {
+  return function(argument, context) {
+    return new Observable(observer => {
+      let timeout = 0;
+   
+      function _timeoutToNextHour() {
+        // Just wait until the next hour.
+        const t = new Date();
+        const secondsToNextHour = 3600 - t.getSeconds() - t.getMinutes() * 60;
+        timeout = setTimeout(_scheduleJobAndWaitAnHour, secondsToNextHour);
+      }
+   
+      function _scheduleJobAndWaitAnHour() {
+        jobFunction(argument, context).subscribe(
+          message => observer.next(message),
+          error => observer.error(error),
+          // Do not forward completion, but use it to schedule the next job run.
+          () => {
+            _timeoutToNextHour();
+          },
+        );
+      }
+   
+      // Kick off by waiting for next hour.
+      _timeoutToNextHour();
+   
+      return () => clearTimeout(timeout);
+    });
+  };
+}
+```
+
+Another way to compose jobs is to schedule jobs based on their name, from other jobs.
+
+```javascript
+// Runs a job on the hour, every hour, regardless of how long the job takes.
+// This creates a high order job by getting a job name and an argument, and scheduling the job
+// every hour.
+function scheduleJobOnTheHour(job, context) {
+  const { name, argument } = job;  // Destructure our input.
+
+  return new Observable(observer => {
+    let timeout = 0;
+
+    function _timeoutToNextHour() {
+      // Just wait until the next hour.
+      const t = new Date();
+      const secondsToNextHour = 3600 - t.getSeconds() - t.getMinutes() * 60;
+      timeout = setTimeout(_scheduleJobAndWaitAnHour, secondsToNextHour);
+    }
+
+    function _scheduleJobAndWaitAnHour() {
+      const subJob = context.scheduler.schedule(name, argument);
+      // We do not forward the input to the sub-job but that would be a valid example as well.
+      subJob.outboundBus.subscribe(
+        message => observer.next(message),
+        error => observer.error(error),
+        // Do not forward completion, but use it to schedule the next job run.
+        () => {
+          _timeoutToNextHour();
+        },
+      );
+    }
+
+    // Kick off by waiting for next hour.
+    _timeoutToNextHour();
+
+    return () => clearTimeout(timeout);
+  });
+}
+
+const registry = new SimpleJobRegistry();
+registry.register('schedule-job-on-the-hour', scheduleJobOnTheHour, {
+  argument: {
+    properties: {
+      name: { type: 'string' },
+      argument: { type: true },
+    },
+  },
+});
+
+// Implementation left to the reader.
+registry.register('copy-files-from-a-to-b', require('some-package/copy-job'));
+
+const scheduler = new SimpleScheduler(registry);
+
+// A rudimentary backup system.
+const job = scheduler.schedule('schedule-job-on-the-hour', {
+  name: 'copy-files-from-a-to-b',
+  argument: {
+    from: '/some-directory/to/backup',
+    to: '/volumes/usb-key',
+  },
+});
+job.output.subscribe(x => console.log(x));
+```
+
+# Limitations
+Jobs input, output and argument must be serializable to JSONs. This is a big limitation in usage,
+but comes with the benefit that jobs can be serialized and called across memory boundaries. An
+example would be an operator that takes a module path and run the job from that path in a separate
+process. Or even a separate server, using HTTP calls.
+ 
+Another limitation is that the boilerplate is complex. Manually managing start/end life cycle, and
+other messages such as logging, etc. is tedious and requires a lot of code. A good way to keep
+this limitation under control is to provide helpers to create `JobHandler`s which manage those
+messages for the developer. A simple handler could be to get a `Promise` and return the output of
+that promise automatically.
diff --git a/packages/angular_devkit/core/src/experimental/jobs/create-job-handler.ts b/packages/angular_devkit/core/src/experimental/jobs/create-job-handler.ts
new file mode 100644
index 000000000000..688644230896
--- /dev/null
+++ b/packages/angular_devkit/core/src/experimental/jobs/create-job-handler.ts
@@ -0,0 +1,221 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ *
+ */
+import { Observable, Observer, Subject, Subscription, from, isObservable } from 'rxjs';
+import { switchMap, tap } from 'rxjs/operators';
+import { BaseException } from '../../exception/index';
+import { JsonValue } from '../../json/index';
+import { Logger, LoggerApi } from '../../logger/index';
+import { isPromise } from '../../utils/index';
+import {
+  JobDescription,
+  JobHandler,
+  JobHandlerContext,
+  JobInboundMessageKind,
+  JobOutboundMessage,
+  JobOutboundMessageKind,
+} from './api';
+
+
+export class ChannelAlreadyExistException extends BaseException {
+  constructor(name: string) {
+    super(`Channel ${JSON.stringify(name)} already exist.`);
+  }
+}
+
+/**
+ * Interface for the JobHandler context that is used when using `createJobHandler()`. It extends
+ * the basic `JobHandlerContext` with additional functionality.
+ */
+export interface SimpleJobHandlerContext<
+  A extends JsonValue,
+  I extends JsonValue,
+  O extends JsonValue,
+> extends JobHandlerContext<A, I, O> {
+  logger: LoggerApi;
+  createChannel: (name: string) => Observer<JsonValue>;
+  input: Observable<JsonValue>;
+}
+
+
+/**
+ * A simple version of the JobHandler. This simplifies a lot of the interaction with the job
+ * scheduler and registry. For example, instead of returning a JobOutboundMessage observable, you
+ * can directly return an output.
+ */
+export type SimpleJobHandlerFn<A extends JsonValue, I extends JsonValue, O extends JsonValue> = (
+  input: A,
+  context: SimpleJobHandlerContext<A, I, O>,
+) => O | Promise<O> | Observable<O>;
+
+
+/**
+ * Make a simple job handler that sets start and end from a function that's synchronous.
+ *
+ * @param fn The function to create a handler for.
+ * @param options An optional set of properties to set on the handler. Some fields might be
+ *   required by registry or schedulers.
+ */
+export function createJobHandler<A extends JsonValue, I extends JsonValue, O extends JsonValue>(
+  fn: SimpleJobHandlerFn<A, I, O>,
+  options: Partial<JobDescription> = {},
+): JobHandler<A, I, O> {
+  const handler = (argument: A, context: JobHandlerContext<A, I, O>) => {
+    const description = context.description;
+    const inboundBus = context.inboundBus;
+    const inputChannel = new Subject<JsonValue>();
+    let subscription: Subscription;
+
+    return new Observable<JobOutboundMessage<O>>(subject => {
+      // Handle input.
+      inboundBus.subscribe(message => {
+        switch (message.kind) {
+          case JobInboundMessageKind.Ping:
+            subject.next({ kind: JobOutboundMessageKind.Pong, description, id: message.id });
+            break;
+
+          case JobInboundMessageKind.Stop:
+            // There's no way to cancel a promise or a synchronous function, but we do cancel
+            // observables where possible.
+            if (subscription) {
+              subscription.unsubscribe();
+            }
+            subject.next({ kind: JobOutboundMessageKind.End, description });
+            subject.complete();
+            // Close all channels.
+            channels.forEach(x => x.complete());
+            break;
+
+          case JobInboundMessageKind.Input:
+            inputChannel.next(message.value);
+            break;
+        }
+      });
+
+      // Configure a logger to pass in as additional context.
+      const logger = new Logger('job');
+      logger.subscribe(entry => {
+        subject.next({
+          kind: JobOutboundMessageKind.Log,
+          description,
+          entry,
+        });
+      });
+
+      // Execute the function with the additional context.
+      subject.next({ kind: JobOutboundMessageKind.Start, description });
+
+      const channels = new Map<string, Subject<JsonValue>>();
+
+      const newContext = {
+        ...context,
+        input: inputChannel.asObservable(),
+        logger,
+        createChannel(name: string) {
+          if (channels.has(name)) {
+            throw new ChannelAlreadyExistException(name);
+          }
+          const channelSubject = new Subject<JsonValue>();
+          channelSubject.subscribe(
+            message => {
+              subject.next({
+                kind: JobOutboundMessageKind.ChannelMessage, description, name, message,
+              });
+            },
+            error => {
+              subject.next({ kind: JobOutboundMessageKind.ChannelError, description, name, error });
+              // This can be reopened.
+              channels.delete(name);
+            },
+            () => {
+              subject.next({ kind: JobOutboundMessageKind.ChannelComplete, description, name });
+              // This can be reopened.
+              channels.delete(name);
+            },
+          );
+
+          channels.set(name, channelSubject);
+
+          return channelSubject;
+        },
+      };
+
+      const result = fn(argument, newContext);
+      // If the result is a promise, simply wait for it to complete before reporting the result.
+      if (isPromise(result)) {
+        result.then(result => {
+          subject.next({ kind: JobOutboundMessageKind.Output, description, value: result });
+          subject.next({ kind: JobOutboundMessageKind.End, description });
+          subject.complete();
+        }, err => subject.error(err));
+      } else if (isObservable(result)) {
+        subscription = (result as Observable<O>).subscribe(
+          (value: O) => subject.next({ kind: JobOutboundMessageKind.Output, description, value }),
+          error => subject.error(error),
+          () => {
+            subject.next({ kind: JobOutboundMessageKind.End, description });
+            subject.complete();
+          },
+        );
+
+        return subscription;
+      } else {
+        // If it's a scalar value, report it synchronously.
+        subject.next({ kind: JobOutboundMessageKind.Output, description, value: result as O });
+        subject.next({ kind: JobOutboundMessageKind.End, description });
+        subject.complete();
+      }
+    });
+  };
+
+  return Object.assign(handler, { jobDescription: options });
+}
+
+
+/**
+ * Lazily create a job using a function.
+ * @param loader A factory function that returns a promise/observable of a JobHandler.
+ * @param options Same options as createJob.
+ */
+export function createJobFactory<A extends JsonValue, I extends JsonValue, O extends JsonValue>(
+  loader: () => Promise<JobHandler<A, I, O>>,
+  options: Partial<JobDescription>,
+): JobHandler<A, I, O> {
+  const handler = (argument: A, context: JobHandlerContext<A, I, O>) => {
+    return from(loader())
+      .pipe(switchMap(fn => fn(argument, context)));
+  };
+
+  return Object.assign(handler, { jobDescription: options });
+}
+
+
+/**
+ * Creates a job that logs out input/output messages of another Job. The messages are still
+ * propagated to the other job.
+ */
+export function createLoggerJob<A extends JsonValue, I extends JsonValue, O extends JsonValue>(
+  job: JobHandler<A, I, O>,
+  logger: LoggerApi,
+): JobHandler<A, I, O> {
+  const handler = (argument: A, context: JobHandlerContext<A, I, O>) => {
+    context.inboundBus.pipe(
+      tap(message => logger.info(`Input: ${JSON.stringify(message)}`)),
+    ).subscribe();
+
+    return job(argument, context).pipe(
+      tap(
+        message => logger.info(`Message: ${JSON.stringify(message)}`),
+        error => logger.warn(`Error: ${JSON.stringify(error)}`),
+        () => logger.info(`Completed`),
+      ),
+    );
+  };
+
+  return Object.assign(handler, job);
+}
diff --git a/packages/angular_devkit/core/src/experimental/jobs/dispatcher.ts b/packages/angular_devkit/core/src/experimental/jobs/dispatcher.ts
new file mode 100644
index 000000000000..fc3841042d82
--- /dev/null
+++ b/packages/angular_devkit/core/src/experimental/jobs/dispatcher.ts
@@ -0,0 +1,89 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ *
+ */
+import { JsonValue } from '../../json/index';
+import { Readwrite } from '../../utils/index';
+import {
+  Job,
+  JobDescription,
+  JobHandler,
+  JobHandlerContext,
+  JobName,
+  isJobHandler,
+} from './api';
+import { JobDoesNotExistException } from './exception';
+
+/**
+ * A JobDispatcher can be used to dispatch between multiple jobs.
+ */
+export interface JobDispatcher<
+  A extends JsonValue,
+  I extends JsonValue,
+  O extends JsonValue,
+> extends JobHandler<A, I, O> {
+  /**
+   * Set the default job if all conditionals failed.
+   * @param name The default name if all conditions are false.
+   */
+  setDefaultJob(name: JobName | null | JobHandler<JsonValue, JsonValue, JsonValue>): void;
+
+  /**
+   * Add a conditional job that will be selected if the input fits a predicate.
+   * @param predicate
+   * @param name
+   */
+  addConditionalJob(predicate: (args: A) => boolean, name: string): void;
+}
+
+
+/**
+ * OnReady a dispatcher that can dispatch to a sub job, depending on conditions.
+ * @param options
+ */
+export function createDispatcher<
+  A extends JsonValue,
+  I extends JsonValue,
+  O extends JsonValue,
+>(
+  options: Partial<Readwrite<JobDescription>> = {},
+): JobDispatcher<A, I, O> {
+  let defaultDelegate: JobName | null = null;
+  const conditionalDelegateList: [(args: A) => boolean, JobName][] = [];
+
+  const job: JobHandler<A, I, O> = Object.assign((argument: A, context: JobHandlerContext) => {
+    const maybeDelegate = conditionalDelegateList.find(([predicate]) => predicate(argument));
+    let delegate: Job<A, I, O> | null = null;
+
+    if (maybeDelegate) {
+      delegate = context.scheduler.schedule(maybeDelegate[1], argument);
+    } else if (defaultDelegate) {
+      delegate = context.scheduler.schedule(defaultDelegate, argument);
+    } else {
+      throw new JobDoesNotExistException('<null>');
+    }
+
+    context.inboundBus.subscribe(delegate.inboundBus);
+
+    return delegate.outboundBus;
+  }, {
+    jobDescription: options,
+  });
+
+  return Object.assign(job, {
+    setDefaultJob(name: JobName | null | JobHandler<JsonValue, JsonValue, JsonValue>) {
+      if (isJobHandler(name)) {
+        name = name.jobDescription.name === undefined ? null : name.jobDescription.name;
+      }
+
+      defaultDelegate = name;
+    },
+    addConditionalJob(predicate: (args: A) => boolean, name: JobName) {
+      conditionalDelegateList.push([predicate, name]);
+    },
+  });
+}
diff --git a/packages/angular_devkit/core/src/experimental/jobs/dispatcher_spec.ts b/packages/angular_devkit/core/src/experimental/jobs/dispatcher_spec.ts
new file mode 100644
index 000000000000..d7cabe13a3da
--- /dev/null
+++ b/packages/angular_devkit/core/src/experimental/jobs/dispatcher_spec.ts
@@ -0,0 +1,38 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { createJobHandler } from './create-job-handler';
+import { createDispatcher } from './dispatcher';
+import { SimpleJobRegistry } from './simple-registry';
+import { SimpleScheduler } from './simple-scheduler';
+
+describe('createDispatcher', () => {
+  it('works', async () => {
+    const registry = new SimpleJobRegistry();
+    const scheduler = new SimpleScheduler(registry);
+
+    const dispatcher = createDispatcher({
+      name: 'add',
+      argument: { items: { type: 'number' } },
+      output: { type: 'number' },
+    });
+    const add0 = createJobHandler((input: number[]) => input.reduce((a, c) => a + c, 0), {
+      name: 'add0',
+    });
+    const add100 = createJobHandler((input: number[]) => input.reduce((a, c) => a + c, 100), {
+      name: 'add100',
+    });
+
+    registry.register(dispatcher);
+    registry.register(add0);
+    registry.register(add100);
+
+    dispatcher.setDefaultJob(add0);
+    const sum = scheduler.schedule('add', [1, 2, 3, 4]);
+    expect(await sum.output.toPromise()).toBe(10);
+  });
+});
diff --git a/packages/angular_devkit/core/src/experimental/jobs/exception.ts b/packages/angular_devkit/core/src/experimental/jobs/exception.ts
new file mode 100644
index 000000000000..0fcb761a978f
--- /dev/null
+++ b/packages/angular_devkit/core/src/experimental/jobs/exception.ts
@@ -0,0 +1,21 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { BaseException } from '../../exception/index';
+import { JobName } from './api';
+
+export class JobNameAlreadyRegisteredException extends BaseException {
+  constructor(name: JobName) {
+    super(`Job named ${JSON.stringify(name)} already exists.`);
+  }
+}
+
+export class JobDoesNotExistException extends BaseException {
+  constructor(name: JobName) {
+    super(`Job name ${JSON.stringify(name)} does not exist.`);
+  }
+}
diff --git a/packages/angular_devkit/core/src/experimental/jobs/index.ts b/packages/angular_devkit/core/src/experimental/jobs/index.ts
new file mode 100644
index 000000000000..f4cb091fc57a
--- /dev/null
+++ b/packages/angular_devkit/core/src/experimental/jobs/index.ts
@@ -0,0 +1,14 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+export * from './api';
+export * from './create-job-handler';
+export * from './exception';
+export * from './dispatcher';
+export * from './simple-registry';
+export * from './simple-scheduler';
+export * from './strategy';
diff --git a/packages/angular_devkit/core/src/experimental/jobs/simple-registry.ts b/packages/angular_devkit/core/src/experimental/jobs/simple-registry.ts
new file mode 100644
index 000000000000..b9a1b475427a
--- /dev/null
+++ b/packages/angular_devkit/core/src/experimental/jobs/simple-registry.ts
@@ -0,0 +1,144 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Observable, of } from 'rxjs';
+import { JsonValue, schema } from '../../json';
+import { JobDescription, JobHandler, JobName, Registry, isJobHandler } from './api';
+import { JobNameAlreadyRegisteredException } from './exception';
+
+
+/**
+ * SimpleJobRegistry job registration options.
+ */
+export interface RegisterJobOptions extends Partial<JobDescription> {}
+
+/**
+ * A simple job registry that keep a map of JobName => JobHandler internally.
+ */
+export class SimpleJobRegistry<
+  MinimumArgumentValueT extends JsonValue = JsonValue,
+  MinimumInputValueT extends JsonValue = JsonValue,
+  MinimumOutputValueT extends JsonValue = JsonValue,
+> implements Registry<MinimumArgumentValueT, MinimumInputValueT, MinimumOutputValueT> {
+  private _jobNames = new Map<
+    JobName,
+    JobHandler<MinimumArgumentValueT, MinimumInputValueT, MinimumOutputValueT>
+  >();
+
+  get<
+    A extends MinimumArgumentValueT = MinimumArgumentValueT,
+    I extends MinimumInputValueT = MinimumInputValueT,
+    O extends MinimumOutputValueT = MinimumOutputValueT,
+  >(name: JobName): Observable<JobHandler<A, I, O> | null> {
+    return of(this._jobNames.get(name) as (JobHandler<A, I, O> | null) || null);
+  }
+
+  /**
+   * Register a job handler. The name must be unique.
+   *
+   * @param name The name of the job.
+   * @param handler The function that will be called for the job.
+   * @param options An optional list of options to override the handler. {@see RegisterJobOptions}
+   */
+  register<
+    A extends MinimumArgumentValueT,
+    I extends MinimumInputValueT,
+    O extends MinimumOutputValueT,
+  >(
+    name: JobName,
+    handler: JobHandler<A, I, O>,
+    options?: RegisterJobOptions,
+  ): void;
+
+  /**
+   * Register a job handler. The name must be unique.
+   *
+   * @param handler The function that will be called for the job.
+   * @param options An optional list of options to override the handler. {@see RegisterJobOptions}
+   */
+  register<ArgumentT extends JsonValue, InputT extends JsonValue, OutputT extends JsonValue>(
+    handler: JobHandler<ArgumentT, InputT, OutputT>,
+    // This version MUST contain a name.
+    options?: RegisterJobOptions & { name: string },
+  ): void;
+
+  register<ArgumentT extends JsonValue, InputT extends JsonValue, OutputT extends JsonValue>(
+    nameOrHandler: JobName | JobHandler<ArgumentT, InputT, OutputT>,
+    handlerOrOptions: JobHandler<ArgumentT, InputT, OutputT> | RegisterJobOptions = {},
+    options: RegisterJobOptions = {},
+  ): void {
+    // Switch on the arguments.
+    if (typeof nameOrHandler == 'string') {
+      if (!isJobHandler(handlerOrOptions)) {
+        // This is an error.
+        throw new TypeError('Expected a JobHandler as second argument.');
+      }
+
+      this._register(nameOrHandler, handlerOrOptions, options);
+    } else if (isJobHandler(nameOrHandler)) {
+      if (typeof handlerOrOptions !== 'object') {
+        // This is an error.
+        throw new TypeError('Expected an object options as second argument.');
+      }
+
+      const name = options.name || nameOrHandler.jobDescription.name || handlerOrOptions.name;
+      if (name === undefined) {
+        throw new TypeError('Expected name to be a string.');
+      }
+
+      this._register(name, nameOrHandler, options);
+    } else {
+      throw new TypeError('Unrecognized arguments.');
+    }
+  }
+
+  protected _register<
+    ArgumentT extends JsonValue,
+    InputT extends JsonValue,
+    OutputT extends JsonValue,
+  >(
+    name: JobName,
+    handler: JobHandler<ArgumentT, InputT, OutputT>,
+    options: RegisterJobOptions,
+  ): void {
+    if (this._jobNames.has(name)) {
+      // We shouldn't allow conflicts.
+      throw new JobNameAlreadyRegisteredException(name);
+    }
+
+    // Merge all fields with the ones in the handler (to make sure we respect the handler).
+    const argument = schema.mergeSchemas(
+      handler.jobDescription.argument,
+      options.argument,
+    );
+    const input = schema.mergeSchemas(
+      handler.jobDescription.input,
+      options.input,
+    );
+    const output = schema.mergeSchemas(
+      handler.jobDescription.output,
+      options.output,
+    );
+
+    // Create the job description.
+    const jobDescription: JobDescription = {
+      name,
+      argument,
+      output,
+      input,
+    };
+
+    this._jobNames.set(name, Object.assign(handler.bind(undefined), { jobDescription }));
+  }
+
+  /**
+   * Returns the job names of all jobs.
+   */
+  getJobNames(): JobName[] {
+    return [...this._jobNames.keys()];
+  }
+}
diff --git a/packages/angular_devkit/core/src/experimental/jobs/simple-registry_spec.ts b/packages/angular_devkit/core/src/experimental/jobs/simple-registry_spec.ts
new file mode 100644
index 000000000000..770a14682357
--- /dev/null
+++ b/packages/angular_devkit/core/src/experimental/jobs/simple-registry_spec.ts
@@ -0,0 +1,34 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// tslint:disable:no-big-function no-non-null-assertion
+import { EMPTY, Observable, of, timer } from 'rxjs';
+import { map, take, toArray } from 'rxjs/operators';
+import { JobHandlerContext, JobOutboundMessage, JobOutboundMessageKind, JobState } from './api';
+import { createJobHandler } from './create-job-handler';
+import { SimpleJobRegistry } from './simple-registry';
+import { SimpleScheduler } from './simple-scheduler';
+
+describe('SimpleJobRegistry', () => {
+  let registry: SimpleJobRegistry;
+
+  beforeEach(() => {
+    registry = new SimpleJobRegistry();
+  });
+
+  it('works for a simple case', async () => {
+    registry.register(
+      'add', createJobHandler((arg: number[]) => arg.reduce((a, c) => a + c, 0)), {
+        argument: { items: { type: 'number' } },
+        output: { type: 'number' },
+      },
+    );
+
+    expect(await registry.get('add').toPromise()).not.toBeNull();
+    expect(await registry.get('add2').toPromise()).toBeNull();
+  });
+});
diff --git a/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts b/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts
new file mode 100644
index 000000000000..05b216171509
--- /dev/null
+++ b/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts
@@ -0,0 +1,545 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import {
+  EMPTY,
+  MonoTypeOperatorFunction,
+  Observable,
+  Observer,
+  Subject,
+  Subscription,
+  concat,
+  from,
+  merge,
+  of,
+} from 'rxjs';
+import {
+  concatMap,
+  filter,
+  first,
+  ignoreElements,
+  map,
+  shareReplay,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+import { JsonValue, schema } from '../../json';
+import { NullLogger } from '../../logger';
+import {
+  Job,
+  JobDescription,
+  JobHandler,
+  JobInboundMessage,
+  JobInboundMessageKind,
+  JobName,
+  JobOutboundMessage,
+  JobOutboundMessageKind,
+  JobOutboundMessageOutput,
+  JobState,
+  Registry,
+  ScheduleJobOptions,
+  Scheduler,
+} from './api';
+import { JobDoesNotExistException } from './exception';
+
+
+export class JobInboundMessageSchemaValidationError extends schema.SchemaValidationException {
+  constructor(errors?: schema.SchemaValidatorError[]) {
+    super(errors, 'Job Inbound Message failed to validate. Errors: ');
+  }
+}
+export class JobOutputSchemaValidationError extends schema.SchemaValidationException {
+  constructor(errors?: schema.SchemaValidatorError[]) {
+    super(errors, 'Job Output failed to validate. Errors: ');
+  }
+}
+
+
+interface JobHandlerWithExtra extends JobHandler<JsonValue, JsonValue, JsonValue> {
+  jobDescription: JobDescription;
+
+  argumentV: Observable<schema.SchemaValidator>;
+  outputV: Observable<schema.SchemaValidator>;
+  inputV: Observable<schema.SchemaValidator>;
+}
+
+
+function _jobShare<T>(): MonoTypeOperatorFunction<T> {
+  // This is the same code as a `shareReplay()` operator, but uses a dumber Subject rather than a
+  // ReplaySubject.
+  return (source: Observable<T>): Observable<T> => {
+    let refCount = 0;
+    let subject: Subject<T>;
+    let hasError = false;
+    let isComplete = false;
+    let subscription: Subscription;
+
+    return new Observable<T>(subscriber => {
+      let innerSub: Subscription;
+      refCount++;
+      if (!subject) {
+        subject = new Subject<T>();
+
+        innerSub = subject.subscribe(subscriber);
+        subscription = source.subscribe({
+          next(value) { subject.next(value); },
+          error(err) {
+            hasError = true;
+            subject.error(err);
+          },
+          complete() {
+            isComplete = true;
+            subject.complete();
+          },
+        });
+      } else {
+        innerSub = subject.subscribe(subscriber);
+      }
+
+      return () => {
+        refCount--;
+        innerSub.unsubscribe();
+        if (subscription && refCount === 0 && (isComplete || hasError)) {
+          subscription.unsubscribe();
+        }
+      };
+    });
+  };
+}
+
+
+/**
+ * Simple scheduler. Should be the base of all registries and schedulers.
+ */
+export class SimpleScheduler<
+  MinimumArgumentT extends JsonValue = JsonValue,
+  MinimumInputT extends JsonValue = JsonValue,
+  MinimumOutputT extends JsonValue = JsonValue,
+> implements Scheduler<MinimumArgumentT, MinimumInputT, MinimumOutputT> {
+  private _internalJobDescriptionMap = new Map<JobName, JobHandlerWithExtra>();
+  private _queue: (() => void)[] = [];
+  private _pauseCounter = 0;
+
+  constructor(
+    protected _jobRegistry: Registry<MinimumArgumentT, MinimumInputT, MinimumOutputT>,
+    protected _schemaRegistry: schema.SchemaRegistry = new schema.CoreSchemaRegistry(),
+  ) {}
+
+  private _getInternalDescription(name: JobName): Observable<JobHandlerWithExtra | null> {
+    const maybeHandler = this._internalJobDescriptionMap.get(name);
+    if (maybeHandler !== undefined) {
+      return of(maybeHandler);
+    }
+
+    const handler = this._jobRegistry.get<MinimumArgumentT, MinimumInputT, MinimumOutputT>(name);
+
+    return handler.pipe(
+      switchMap(handler => {
+        if (handler === null) {
+          return of(null);
+        }
+
+        const description: JobDescription = {
+          name,
+          argument: handler.jobDescription.argument || true,
+          input: handler.jobDescription.input || true,
+          output: handler.jobDescription.output || true,
+          channels: handler.jobDescription.channels || {},
+        };
+
+        const handlerWithExtra = Object.assign(handler.bind(undefined), {
+          jobDescription: description,
+          argumentV: this._schemaRegistry.compile(description.argument).pipe(shareReplay(1)),
+          inputV: this._schemaRegistry.compile(description.input).pipe(shareReplay(1)),
+          outputV: this._schemaRegistry.compile(description.output).pipe(shareReplay(1)),
+        });
+        this._internalJobDescriptionMap.set(name, handlerWithExtra);
+
+        return of(handlerWithExtra);
+      }),
+    );
+  }
+
+  /**
+   * Get a job description for a named job.
+   *
+   * @param name The name of the job.
+   * @returns A description, or null if the job is not registered.
+   */
+  getDescription(name: JobName) {
+    return concat(
+      this._getInternalDescription(name).pipe(map(x => x && x.jobDescription)),
+      of(null),
+    ).pipe(
+      first(),
+    );
+  }
+
+  /**
+   * Returns true if the job name has been registered.
+   * @param name The name of the job.
+   * @returns True if the job exists, false otherwise.
+   */
+  has(name: JobName) {
+    return this.getDescription(name).pipe(
+      map(x => x !== null),
+    );
+  }
+
+  /**
+   * Pause the scheduler, temporary queueing _new_ jobs. Returns a resume function that should be
+   * used to resume execution. If multiple `pause()` were called, all their resume functions must
+   * be called before the Scheduler actually starts new jobs. Additional calls to the same resume
+   * function will have no effect.
+   *
+   * Jobs already running are NOT paused. This is pausing the scheduler only.
+   */
+  pause() {
+    let called = false;
+    this._pauseCounter++;
+
+    return () => {
+      if (!called) {
+        called = true;
+        if (--this._pauseCounter == 0) {
+          // Resume the queue.
+          const q = this._queue;
+          this._queue = [];
+          q.forEach(fn => fn());
+        }
+      }
+    };
+  }
+
+  /**
+   * Schedule a job to be run, using its name.
+   * @param name The name of job to be run.
+   * @param argument The argument to send to the job when starting it.
+   * @param options Scheduling options.
+   * @returns The Job being run.
+   */
+  schedule<A extends MinimumArgumentT, I extends MinimumInputT, O extends MinimumOutputT>(
+    name: JobName,
+    argument: A,
+    options?: ScheduleJobOptions,
+  ): Job<A, I, O> {
+    if (this._pauseCounter > 0) {
+      const waitable = new Subject<never>();
+      this._queue.push(() => waitable.complete());
+
+      return this._scheduleJob<A, I, O>(name, argument, options || {}, waitable);
+    }
+
+    return this._scheduleJob<A, I, O>(name, argument, options || {}, EMPTY);
+  }
+
+  /**
+   * Filter messages.
+   * @private
+   */
+  private _filterJobOutboundMessages<O extends MinimumOutputT>(
+    message: JobOutboundMessage<O>,
+    state: JobState,
+  ) {
+    switch (message.kind) {
+      case JobOutboundMessageKind.OnReady:
+        return state == JobState.Queued;
+      case JobOutboundMessageKind.Start:
+        return state == JobState.Ready;
+
+      case JobOutboundMessageKind.End:
+        return state == JobState.Started || state == JobState.Ready;
+    }
+
+    return true;
+  }
+
+  /**
+   * Return a new state. This is just to simplify the reading of the _createJob method.
+   * @private
+   */
+  private _updateState<O extends MinimumOutputT>(
+    message: JobOutboundMessage<O>,
+    state: JobState,
+  ): JobState {
+    switch (message.kind) {
+      case JobOutboundMessageKind.OnReady:
+        return JobState.Ready;
+      case JobOutboundMessageKind.Start:
+        return JobState.Started;
+      case JobOutboundMessageKind.End:
+        return JobState.Ended;
+    }
+
+    return state;
+  }
+
+  /**
+   * Create the job.
+   * @private
+   */
+  private _createJob<A extends MinimumArgumentT, I extends MinimumInputT, O extends MinimumOutputT>(
+    name: JobName,
+    argument: A,
+    handler: Observable<JobHandlerWithExtra | null>,
+    inboundBus: Observer<JobInboundMessage<I>>,
+    outboundBus: Observable<JobOutboundMessage<O>>,
+    options: ScheduleJobOptions,
+  ): Job<A, I, O> {
+    const schemaRegistry = this._schemaRegistry;
+
+    const channelsSubject = new Map<string, Subject<JsonValue>>();
+    const channels = new Map<string, Observable<JsonValue>>();
+
+    let state = JobState.Queued;
+    let pingId = 0;
+
+    const logger = options.logger ? options.logger.createChild('job') : new NullLogger();
+
+    // Create the input channel by having a filter.
+    const input = new Subject<JsonValue>();
+    input.pipe(
+      switchMap(message => handler.pipe(
+        switchMap(handler => {
+          if (handler === null) {
+            throw new JobDoesNotExistException(name);
+          } else {
+            return handler.inputV.pipe(
+              switchMap(validate => validate(message)),
+            );
+          }
+        }),
+      )),
+      filter(result => result.success),
+      map(result => result.data as I),
+    ).subscribe(
+      value => inboundBus.next({ kind: JobInboundMessageKind.Input, value }),
+    );
+
+    outboundBus = concat(
+      outboundBus,
+      // Add an End message at completion. This will be filtered out if the job actually send an
+      // End.
+      handler.pipe(switchMap(handler => {
+        if (handler) {
+          return of<JobOutboundMessage<O>>({
+            kind: JobOutboundMessageKind.End, description: handler.jobDescription,
+          });
+        } else {
+          return EMPTY as Observable<JobOutboundMessage<O>>;
+        }
+      })),
+    ).pipe(
+      filter(message => this._filterJobOutboundMessages(message, state)),
+      // Update internal logic and Job<> members.
+      tap(message => {
+        // Update the state.
+        state = this._updateState(message, state);
+
+        switch (message.kind) {
+          case JobOutboundMessageKind.Log:
+            logger.next(message.entry);
+            break;
+
+          case JobOutboundMessageKind.ChannelCreate: {
+            const maybeSubject = channelsSubject.get(message.name);
+            // If it doesn't exist or it's closed on the other end.
+            if (!maybeSubject) {
+              const s = new Subject<JsonValue>();
+              channelsSubject.set(message.name, s);
+              channels.set(message.name, s.asObservable());
+            }
+            break;
+          }
+
+          case JobOutboundMessageKind.ChannelMessage: {
+            const maybeSubject = channelsSubject.get(message.name);
+            if (maybeSubject) {
+              maybeSubject.next(message.message);
+            }
+            break;
+          }
+
+          case JobOutboundMessageKind.ChannelComplete: {
+            const maybeSubject = channelsSubject.get(message.name);
+            if (maybeSubject) {
+              maybeSubject.complete();
+              channelsSubject.delete(message.name);
+            }
+            break;
+          }
+
+          case JobOutboundMessageKind.ChannelError: {
+            const maybeSubject = channelsSubject.get(message.name);
+            if (maybeSubject) {
+              maybeSubject.error(message.error);
+              channelsSubject.delete(message.name);
+            }
+            break;
+          }
+        }
+      }, () => {
+        state = JobState.Errored;
+      }),
+
+      // Do output validation (might include default values so this might have side
+      // effects). We keep all messages in order.
+      concatMap(message => {
+        if (message.kind !== JobOutboundMessageKind.Output) {
+          return of(message);
+        }
+
+        return handler.pipe(
+          switchMap(handler => {
+            if (handler === null) {
+              throw new JobDoesNotExistException(name);
+            } else {
+              return handler.outputV.pipe(
+                switchMap(validate => validate(message.value)),
+                switchMap(output => {
+                  if (!output.success) {
+                    throw new JobOutputSchemaValidationError(output.errors);
+                  }
+
+                  return of({
+                    ...message,
+                    output: output.data as O,
+                  } as JobOutboundMessageOutput<O>);
+                }),
+              );
+            }
+          }),
+        ) as Observable<JobOutboundMessage<O>>;
+      }),
+      _jobShare(),
+    );
+
+    const output = outboundBus.pipe(
+      filter(x => x.kind == JobOutboundMessageKind.Output),
+      map((x: JobOutboundMessageOutput<O>) => x.value),
+      shareReplay(1),
+    );
+
+    // Return the Job.
+    return {
+      get state() { return state; },
+      argument,
+      description: handler.pipe(
+        switchMap(handler => {
+          if (handler === null) {
+            throw new JobDoesNotExistException(name);
+          } else {
+            return of(handler.jobDescription);
+          }
+        }),
+      ),
+      output,
+      getChannel<T extends JsonValue>(
+        name: JobName,
+        schema: schema.JsonSchema = true,
+      ): Observable<T> {
+        let maybeObservable = channels.get(name);
+        if (!maybeObservable) {
+          const s = new Subject<T>();
+          channelsSubject.set(name, s);
+          channels.set(name, s.asObservable());
+
+          maybeObservable = s.asObservable();
+        }
+
+        return maybeObservable.pipe(
+          // Keep the order of messages.
+          concatMap(
+            message => {
+              return schemaRegistry.compile(schema).pipe(
+                switchMap(validate => validate(message)),
+                filter(x => x.success),
+                map(x => x.data as T),
+              );
+            },
+          ),
+        );
+      },
+      ping() {
+        const id = pingId++;
+        inboundBus.next({ kind: JobInboundMessageKind.Ping, id });
+
+        return outboundBus.pipe(
+          filter(x => x.kind === JobOutboundMessageKind.Pong && x.id == id),
+          first(),
+          ignoreElements(),
+        );
+      },
+      stop() {
+        inboundBus.next({ kind: JobInboundMessageKind.Stop });
+      },
+      input,
+      inboundBus,
+      outboundBus,
+    };
+  }
+
+  protected _scheduleJob<
+    A extends MinimumArgumentT,
+    I extends MinimumInputT,
+    O extends MinimumOutputT,
+  >(
+    name: JobName,
+    argument: A,
+    options: ScheduleJobOptions,
+    waitable: Observable<never>,
+  ): Job<A, I, O> {
+    // Get handler first, since this can error out if there's no handler for the job name.
+    const handler = this._getInternalDescription(name);
+
+    const optionsDeps = (options && options.dependencies) || [];
+    const dependencies = Array.isArray(optionsDeps) ? optionsDeps : [optionsDeps];
+
+    const inboundBus = new Subject<JobInboundMessage<I>>();
+    const outboundBus = concat(
+      // Wait for dependencies, make sure to not report messages from dependencies. Subscribe to
+      // all dependencies at the same time so they run concurrently.
+      merge(...dependencies.map(x => x.outboundBus)).pipe(ignoreElements()),
+
+      // Wait for pause() to clear (if necessary).
+      waitable,
+
+      from(handler).pipe(
+        switchMap(handler => new Observable((subscriber: Observer<JobOutboundMessage<O>>) => {
+          if (!handler) {
+            throw new JobDoesNotExistException(name);
+          }
+
+          // Validate the argument.
+          return handler.argumentV.pipe(
+            switchMap(validate => validate(argument)),
+            switchMap(output => {
+              if (!output.success) {
+                throw new JobInboundMessageSchemaValidationError(output.errors);
+              }
+
+              const argument: A = output.data as A;
+              const description = handler.jobDescription;
+              subscriber.next({ kind: JobOutboundMessageKind.OnReady, description });
+
+              const context = {
+                description,
+                dependencies: [...dependencies],
+                inboundBus: inboundBus.asObservable(),
+                scheduler: this as Scheduler<MinimumArgumentT, MinimumInputT, MinimumOutputT>,
+              };
+
+              return handler(argument, context);
+            }),
+          ).subscribe(subscriber);
+        })),
+      ),
+    );
+
+    return this._createJob(name, argument, handler, inboundBus, outboundBus, options);
+  }
+}
diff --git a/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler_spec.ts b/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler_spec.ts
new file mode 100644
index 000000000000..02a4755722ad
--- /dev/null
+++ b/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler_spec.ts
@@ -0,0 +1,594 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// tslint:disable:no-big-function no-non-null-assertion
+import { EMPTY, Observable, of, timer } from 'rxjs';
+import { map, take, toArray } from 'rxjs/operators';
+import { JobHandlerContext, JobOutboundMessage, JobOutboundMessageKind, JobState } from './api';
+import { createJobHandler } from './create-job-handler';
+import { SimpleJobRegistry } from './simple-registry';
+import {
+  JobInboundMessageSchemaValidationError,
+  JobOutputSchemaValidationError,
+  SimpleScheduler,
+} from './simple-scheduler';
+
+describe('SimpleScheduler', () => {
+  let registry: SimpleJobRegistry;
+  let scheduler: SimpleScheduler;
+
+  beforeEach(() => {
+    registry = new SimpleJobRegistry();
+    scheduler = new SimpleScheduler(registry);
+  });
+
+  it('works for a simple case', async () => {
+    registry.register(
+      'add', createJobHandler((arg: number[]) => arg.reduce((a, c) => a + c, 0)), {
+        argument: { items: { type: 'number' } },
+        output: { type: 'number' },
+      },
+    );
+
+    const sum = await (scheduler.schedule('add', [1, 2, 3, 4])).output.toPromise();
+    expect(sum).toBe(10);
+  });
+
+  it('calls jobs in parallel', async () => {
+    let started = 0;
+    let finished = 0;
+
+    registry.register(
+      'add',
+      createJobHandler((argument: number[]) => {
+        started++;
+
+        return new Promise<number>(
+          resolve => setTimeout(() => {
+            finished++;
+            resolve(argument.reduce((a, c) => a + c, 0));
+          }, 10),
+        );
+      }),
+      {
+        argument: { items: { type: 'number' } },
+        output: { type: 'number' },
+      },
+    );
+
+    const job1 = scheduler.schedule('add', [1, 2, 3, 4]);
+    const job2 = scheduler.schedule('add', [1, 2, 3, 4, 5]);
+    expect(started).toBe(0);
+
+    const p1 = job1.output.toPromise();
+    expect(started).toBe(1);
+
+    const p2 = job2.output.toPromise();
+    expect(started).toBe(2);
+    expect(finished).toBe(0);
+
+    const [sum, sum2] = await Promise.all([p1, p2]);
+    expect(started).toBe(2);
+    expect(finished).toBe(2);
+
+    expect(sum).toBe(10);
+    expect(sum2).toBe(15);
+  });
+
+  it('validates arguments', async () => {
+    registry.register(
+      'add', createJobHandler((arg: number[]) => arg.reduce((a, c) => a + c, 0)), {
+        argument: { items: { type: 'number' } },
+        output: { type: 'number' },
+      },
+    );
+
+    await (scheduler.schedule('add', [1, 2, 3, 4])).output.toPromise();
+    try {
+      await (scheduler.schedule('add', ['1', 2, 3, 4])).output.toPromise();
+      expect(true).toBe(false);
+    } catch (e) {
+      // TODO: enable this when https://github.com/bazelbuild/rules_typescript/commit/37807e2c4
+      // is released, otherwise this breaks because bazel downgrade to ES5 which does not support
+      // extending Error.
+      // expect(e instanceof JobInboundMessageSchemaValidationError).toBe(true);
+      expect(e.message).toMatch(/"\[0\]".*number/);
+    }
+  });
+
+  it('validates outputs', async () => {
+    registry.register(
+      'add', createJobHandler(() => 'hello world'), {
+        output: { type: 'number' },
+      },
+    );
+
+    try {
+      await (scheduler.schedule('add', [1, 2, 3, 4])).output.toPromise();
+      expect(true).toBe(false);
+    } catch (e) {
+      // TODO: enable this when https://github.com/bazelbuild/rules_typescript/commit/37807e2c4
+      // is released, otherwise this breaks because bazel downgrade to ES5 which does not support
+      // extending Error.
+      // expect(e instanceof JobOutputSchemaValidationError).toBe(true);
+      expect(e.message).toMatch(/"".*number/);
+    }
+  });
+
+  it('works with dependencies', async () => {
+    const done: number[] = [];
+
+    registry.register(
+      'job',
+      createJobHandler<number, number, number>((argument) => {
+        return new Promise(resolve => setImmediate(() => {
+          done.push(argument);
+          resolve(argument);
+        }));
+      }),
+      { argument: true, output: true },
+    );
+
+    // Run jobs.
+    const job1 = scheduler.schedule('job', 1);
+    const job2 = scheduler.schedule('job', 2);
+    const job3 = scheduler.schedule('job', 3);
+
+    // Run a job to wait for 1.
+    const job4 = scheduler.schedule('job', 4, { dependencies: job1 });
+
+    // Run a job to wait for 2.
+    const job5 = scheduler.schedule('job', 5, { dependencies: job2 });
+
+    // Run a job to wait for 3.
+    const job6 = scheduler.schedule('job', 6, { dependencies: job3 });
+
+    // Run a job to wait for 4, 5 and 6.
+    const job7 = scheduler.schedule('job', 7, { dependencies: [job4, job5, job6] });
+
+    expect(done.length).toBe(0);
+
+    await job1.output.toPromise();
+    expect(done).toContain(1);
+    expect(done).not.toContain(4);
+    expect(done).not.toContain(7);
+
+    await job5.output.toPromise();
+    expect(done).toContain(1);
+    expect(done).toContain(2);
+    expect(done).not.toContain(4);
+    expect(done).toContain(5);
+    expect(done).not.toContain(7);
+
+    await job7.output.toPromise();
+    expect(done.length).toBe(7);
+    // Might be out of order.
+    expect(done).toEqual(jasmine.arrayContaining([1, 2, 3, 4, 5, 6, 7]));
+    // Verify at least partial order.
+    expect(done[done.length - 1]).toBe(7);
+    expect(done.indexOf(4)).toBeGreaterThan(done.indexOf(1));
+    expect(done.indexOf(5)).toBeGreaterThan(done.indexOf(2));
+    expect(done.indexOf(6)).toBeGreaterThan(done.indexOf(3));
+  });
+
+  it('does not start dependencies until the last one is subscribed to', async () => {
+    // This test creates the following graph of dependencies:
+    //     1  <-.--  2  <-.--  4  <-.---------.--  6
+    //                    +--  3  <-+--  5  <-'
+    // Which can result only in the execution orders: [1, 2, 3, 4, 5, 6]
+    // Only subscribe to the last one.
+
+    const started: number[] = [];
+    const done: number[] = [];
+
+    registry.register(
+      'job',
+      createJobHandler<number, number, number>((argument: number) => {
+        started.push(argument);
+
+        return new Promise(resolve => setImmediate(() => {
+          done.push(argument);
+          resolve(argument);
+        }));
+      }),
+      { argument: true, output: true },
+    );
+
+    // Run jobs.
+    const job1 = scheduler.schedule('job', 1);
+    const job2 = scheduler.schedule('job', 2, { dependencies: job1 });
+    const job3 = scheduler.schedule('job', 3, { dependencies: job2 });
+    const job4 = scheduler.schedule('job', 4, { dependencies: [job2, job3] });
+    const job5 = scheduler.schedule('job', 5, { dependencies: [job1, job2, job4] });
+    const job6 = scheduler.schedule('job', 6, { dependencies: [job4, job5] });
+
+    // Just subscribe to the last job in the lot.
+    job6.outboundBus.subscribe();
+    // Expect the first one to start.
+    expect(started).toEqual([1]);
+    // Wait for the first one to finish.
+    await job1.output.toPromise();
+    // Expect the second one to have started, and the first one to be done.
+    expect(started).toEqual([1, 2]);
+    expect(done).toEqual([1]);
+
+    // Rinse and repeat.
+    await job2.output.toPromise();
+    expect(started).toEqual([1, 2, 3]);
+    expect(done).toEqual([1, 2]);
+
+    await job3.output.toPromise();
+    expect(started).toEqual([1, 2, 3, 4]);
+    expect(done).toEqual([1, 2, 3]);
+
+    await job4.output.toPromise();
+    expect(started).toEqual([1, 2, 3, 4, 5]);
+    expect(done).toEqual([1, 2, 3, 4]);
+
+    // Just skip job 5.
+    await job6.output.toPromise();
+    expect(done).toEqual(started);
+  });
+
+  it('can be paused', async () => {
+    let resume: (() => void) | null = null;
+
+    registry.register(
+      'job',
+      createJobHandler((argument, context) => {
+        return Promise.resolve()
+          .then(() => {
+            expect(resume).toBeNull();
+            resume = context.scheduler.pause();
+          })
+          .then(() => argument);
+      }),
+    );
+
+    // Run the job once. Wait for it to finish. We should have a `resume()` and the scheduler will
+    // be paused.
+    const p0 = (scheduler.schedule('job', 0)).output.toPromise();
+    expect(await p0).toBe(0);
+
+    // This will wait.
+    const p1 = (scheduler.schedule('job', 1)).output.toPromise();
+    await Promise.resolve();
+
+    expect(resume).not.toBeNull();
+    resume !();
+    resume = null;
+
+    // Running p1.
+    expect(await p1).toBe(1);
+    expect(resume).not.toBeNull();
+
+    const p2 = (scheduler.schedule('job', 2)).output.toPromise();
+
+    await Promise.resolve();
+    resume !();
+    resume = null;
+    expect(await p2).toBe(2);
+    expect(resume).not.toBeNull();
+
+    resume !();
+    // Should not error since all jobs have run.
+    await Promise.resolve();
+  });
+
+  it('can be paused (multiple)', async () => {
+    const done: number[] = [];
+
+    registry.register(
+      'jobA',
+      createJobHandler((argument: number) => {
+        done.push(argument);
+
+        return Promise.resolve()
+          .then(() => argument);
+      }),
+    );
+
+    // Pause manually.
+    const resume = scheduler.pause();
+    const p10 = (scheduler.schedule('jobA', 10)).output.toPromise();
+    const p11 = (scheduler.schedule('jobA', 11)).output.toPromise();
+    const p12 = (scheduler.schedule('jobA', 12)).output.toPromise();
+    await Promise.resolve();
+
+    expect(done).toEqual([]);
+    resume();
+    await Promise.resolve();
+    expect(done).not.toEqual([]);
+    expect(await p10).toBe(10);
+    expect(await p11).toBe(11);
+    expect(await p12).toBe(12);
+    expect(done).toEqual([10, 11, 12]);
+  });
+
+  it('can be cancelled by unsubscribing from the raw output', async () => {
+    const done: number[] = [];
+    const resolves: (() => void)[] = [];
+    let keepGoing = true;
+
+    registry.register(
+      'job',
+      createJobHandler((argument: number) => {
+        return new Observable<number>(observer => {
+          function fn() {
+            if (keepGoing) {
+              const p = new Promise(r => resolves.push(r));
+
+              observer.next(argument);
+              done.push(argument);
+              argument++;
+
+              // tslint:disable-next-line:no-floating-promises
+              p.then(fn);
+            } else {
+              done.push(-1);
+              observer.complete();
+            }
+          }
+
+          setImmediate(fn);
+
+          return () => {
+            keepGoing = false;
+          };
+        });
+      }),
+    );
+
+    const job = scheduler.schedule('job', 0);
+    await new Promise(r => setTimeout(r, 10));
+    expect(job.state).toBe(JobState.Queued);
+    const subscription = job.output.subscribe();
+
+    await new Promise(r => setTimeout(r, 10));
+    expect(job.state).toBe(JobState.Started);
+    expect(done).toEqual([0]);
+    expect(resolves.length).toBe(1);
+    resolves[0]();
+
+    await new Promise(r => setTimeout(r, 10));
+    expect(done).toEqual([0, 1]);
+    expect(resolves.length).toBe(2);
+    resolves[1]();
+
+    await new Promise(r => setTimeout(r, 10));
+    expect(done).toEqual([0, 1, 2]);
+    expect(resolves.length).toBe(3);
+    subscription.unsubscribe();
+    resolves[2]();
+
+    job.stop();
+    await job.output.toPromise();
+    expect(keepGoing).toBe(false);
+    expect(done).toEqual([0, 1, 2, -1]);
+    expect(job.state).toBe(JobState.Ended);
+  });
+
+  it('sequences raw outputs properly for all use cases', async () => {
+    registry.register('job-sync', createJobHandler<number, number, number>(arg => arg + 1));
+    registry.register('job-promise', createJobHandler<number, number, number>(arg => {
+      return Promise.resolve(arg + 1);
+    }));
+    registry.register('job-obs-sync', createJobHandler<number, number, number>(arg => of(arg + 1)));
+    registry.register('job-obs-async', createJobHandler<number, number, number>(arg => {
+      return timer(1).pipe(
+        take(3),
+        take(1),
+        map(() => arg + 1),
+      );
+    }));
+
+    const job1 = scheduler.schedule('job-sync', 100);
+    const job1OutboundBus = await job1.outboundBus.pipe(
+      // Descriptions are going to differ, so get rid of those.
+      map(x => ({ ...x, description: null })),
+      toArray(),
+    ).toPromise();
+
+    const job2 = scheduler.schedule('job-promise', 100);
+    const job2OutboundBus = await job2.outboundBus.pipe(
+      // Descriptions are going to differ, so get rid of those.
+      map(x => ({ ...x, description: null })),
+      toArray(),
+    ).toPromise();
+
+    const job3 = scheduler.schedule('job-obs-sync', 100);
+    const job3OutboundBus = await job3.outboundBus.pipe(
+      // Descriptions are going to differ, so get rid of those.
+      map(x => ({ ...x, description: null })),
+      toArray(),
+    ).toPromise();
+
+    const job4 = scheduler.schedule('job-obs-async', 100);
+    const job4OutboundBus = await job4.outboundBus.pipe(
+      // Descriptions are going to differ, so get rid of those.
+      map(x => ({ ...x, description: null })),
+      toArray(),
+    ).toPromise();
+
+    // The should all report the same stuff.
+    expect(job1OutboundBus).toEqual(job4OutboundBus);
+    expect(job2OutboundBus).toEqual(job4OutboundBus);
+    expect(job3OutboundBus).toEqual(job4OutboundBus);
+  });
+
+  describe('channels', () => {
+    it('works', async () => {
+      registry.register(
+        'job',
+        createJobHandler<number, number, number>((argument, context) => {
+          const channel = context.createChannel('any');
+          channel.next('hello world');
+          channel.complete();
+
+          return 0;
+        }),
+      );
+
+      const job = scheduler.schedule('job', 0);
+      let sideValue = '';
+      const c = job.getChannel('any') as Observable<string>;
+      c.subscribe(x => sideValue = x);
+
+      expect(await job.output.toPromise()).toBe(0);
+      expect(sideValue).toBe('hello world');
+    });
+
+    it('validates', async () => {
+      registry.register(
+        'job',
+        createJobHandler<number, number, number>((argument, context) => {
+          const channel = context.createChannel('any');
+          channel.next('hello world');
+          channel.complete();
+
+          return 0;
+        }), {
+          argument: true,
+          output: true,
+        },
+      );
+
+      const job = scheduler.schedule('job', 0);
+      let sideValue = '';
+      const c = job.getChannel('any', { type: 'number' }) as Observable<string>;
+      expect(c).toBeDefined(null);
+
+      if (c) {
+        c.subscribe(x => sideValue = x);
+      }
+
+      expect(await job.output.toPromise()).toBe(0);
+      expect(sideValue).not.toBe('hello world');
+    });
+  });
+
+  describe('lifecycle messages', () => {
+    it('sequences double start once', async () => {
+      const fn = (_: never, { description }: JobHandlerContext) => {
+        return new Observable<JobOutboundMessage<never>>(observer => {
+          observer.next({ kind: JobOutboundMessageKind.Start, description });
+          observer.next({ kind: JobOutboundMessageKind.Start, description });
+          observer.next({ kind: JobOutboundMessageKind.End, description });
+          observer.complete();
+        });
+      };
+
+      registry.register('job', Object.assign(fn, { jobDescription: {} }));
+      const allOutput = await scheduler.schedule('job', 0).outboundBus.pipe(
+        toArray(),
+      ).toPromise();
+
+      expect(allOutput.map(x => ({ ...x, description: null }))).toEqual([
+        { kind: JobOutboundMessageKind.OnReady, description: null },
+        { kind: JobOutboundMessageKind.Start, description: null },
+        { kind: JobOutboundMessageKind.End, description: null },
+      ]);
+    });
+
+    it('add an End if there is not one', async () => {
+      const fn = () => EMPTY;
+
+      registry.register('job', Object.assign(fn, { jobDescription: {} }));
+      const allOutput = await scheduler.schedule('job', 0).outboundBus.pipe(
+        toArray(),
+      ).toPromise();
+
+      expect(allOutput.map(x => ({ ...x, description: null }))).toEqual([
+        { kind: JobOutboundMessageKind.OnReady, description: null },
+        { kind: JobOutboundMessageKind.End, description: null },
+      ]);
+    });
+
+    it('only one End', async () => {
+      const fn = (_: never, { description }: JobHandlerContext) => {
+        return new Observable<JobOutboundMessage<never>>(observer => {
+          observer.next({ kind: JobOutboundMessageKind.End, description });
+          observer.next({ kind: JobOutboundMessageKind.End, description });
+          observer.complete();
+        });
+      };
+
+      registry.register('job', Object.assign(fn, { jobDescription: {} }));
+      const allOutput = await scheduler.schedule('job', 0).outboundBus.pipe(
+        toArray(),
+      ).toPromise();
+
+      expect(allOutput.map(x => ({ ...x, description: null }))).toEqual([
+        { kind: JobOutboundMessageKind.OnReady, description: null },
+        { kind: JobOutboundMessageKind.End, description: null },
+      ]);
+    });
+  });
+
+  describe('input', () => {
+    it('works', async () => {
+      registry.register(
+        'job',
+        createJobHandler<number, number, number>((argument, context) => {
+          return new Observable<number>(subscriber => {
+            context.input.subscribe(x => {
+              if (x === null) {
+                subscriber.complete();
+              } else {
+                subscriber.next(parseInt('' + x) + argument);
+              }
+            });
+          });
+        }),
+      );
+
+      const job = scheduler.schedule('job', 100);
+      const outputs: number[] = [];
+
+      job.output.subscribe(x => outputs.push(x as number));
+
+      job.input.next(1);
+      job.input.next('2');
+      job.input.next(3);
+      job.input.next(null);
+
+      expect(await job.output.toPromise()).toBe(103);
+      expect(outputs).toEqual([101, 102, 103]);
+    });
+
+    it('validates', async () => {
+      const handler = createJobHandler<number, number, number>((argument, context) => {
+        return new Observable<number>(subscriber => {
+          context.input.subscribe(x => {
+            if (x === null) {
+              subscriber.complete();
+            } else {
+              subscriber.next(parseInt('' + x) + argument);
+            }
+          });
+        });
+      }, {
+        input: { anyOf: [{ type: 'number' }, { type: 'null' }] },
+      });
+
+      registry.register('job', handler);
+
+      const job = scheduler.schedule('job', 100);
+      const outputs: number[] = [];
+
+      job.output.subscribe(x => outputs.push(x as number));
+
+      job.input.next(1);
+      job.input.next('2');
+      job.input.next(3);
+      job.input.next(null);
+
+      expect(await job.output.toPromise()).toBe(103);
+      expect(outputs).toEqual([101, 103]);
+    });
+  });
+});
diff --git a/packages/angular_devkit/core/src/experimental/jobs/strategy.ts b/packages/angular_devkit/core/src/experimental/jobs/strategy.ts
new file mode 100644
index 000000000000..146ba6b6decb
--- /dev/null
+++ b/packages/angular_devkit/core/src/experimental/jobs/strategy.ts
@@ -0,0 +1,85 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Observable, concat, of } from 'rxjs';
+import { ignoreElements, share, shareReplay } from 'rxjs/operators';
+import { JsonValue } from '../../json';
+import { JobDescription, JobHandler, JobHandlerContext, JobOutboundMessage } from './api';
+
+const stableStringify = require('fast-json-stable-stringify');
+
+export namespace strategy {
+
+  export type JobStrategy<A extends JsonValue, I extends JsonValue, O extends JsonValue> = (
+    handler: JobHandler<A, I, O>,
+    options?: Partial<Readonly<JobDescription>>,
+  ) => JobHandler<A, I, O>;
+
+  /**
+   * Creates a JobStrategy that serializes every call. This strategy can be mixed between jobs.
+   */
+  export function serialize<
+    A extends JsonValue = JsonValue,
+    I extends JsonValue = JsonValue,
+    O extends JsonValue = JsonValue,
+  >(): JobStrategy<A, I, O> {
+    let latest: Observable<JobOutboundMessage<O>> = of();
+
+    return (handler, options) => {
+      const newHandler = (argument: A, context: JobHandlerContext<A, I, O>) => {
+        const previous = latest;
+        latest = concat(
+          previous.pipe(ignoreElements()),
+          new Observable<JobOutboundMessage<O>>(o => handler(argument, context).subscribe(o)),
+        ).pipe(
+          shareReplay(0),
+        );
+
+        return latest;
+      };
+
+      return Object.assign(newHandler, {
+        jobDescription: Object.assign({}, handler.jobDescription, options),
+      });
+    };
+  }
+
+
+  /**
+   * Creates a JobStrategy that will reuse a running job if the argument matches.
+   * @param replayMessages Replay ALL messages if a job is reused, otherwise just hook up where it
+   *        is.
+   */
+  export function memoize<
+    A extends JsonValue = JsonValue,
+    I extends JsonValue = JsonValue,
+    O extends JsonValue = JsonValue,
+  >(replayMessages = false): JobStrategy<A, I, O> {
+    const runs = new Map<string, Observable<JobOutboundMessage<O>>>();
+
+    return (handler, options) => {
+      const newHandler = (argument: A, context: JobHandlerContext<A, I, O>) => {
+        const argumentJson = stableStringify(argument);
+        const maybeJob = runs.get(argumentJson);
+
+        if (maybeJob) {
+          return maybeJob;
+        }
+
+        const run = handler(argument, context).pipe(
+          replayMessages ? shareReplay() : share(),
+        );
+        runs.set(argumentJson, run);
+
+        return run;
+      };
+
+      return Object.assign(newHandler, handler, options || {});
+    };
+  }
+
+}
diff --git a/packages/angular_devkit/core/src/experimental/jobs/strategy_spec.ts b/packages/angular_devkit/core/src/experimental/jobs/strategy_spec.ts
new file mode 100644
index 000000000000..3fbef7e689bb
--- /dev/null
+++ b/packages/angular_devkit/core/src/experimental/jobs/strategy_spec.ts
@@ -0,0 +1,215 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { JobState } from './api';
+import { createJobHandler } from './create-job-handler';
+import { SimpleJobRegistry } from './simple-registry';
+import { SimpleScheduler } from './simple-scheduler';
+import { strategy } from './strategy';
+
+describe('strategy.serialize()', () => {
+  let registry: SimpleJobRegistry;
+  let scheduler: SimpleScheduler;
+
+  beforeEach(() => {
+    registry = new SimpleJobRegistry();
+    scheduler = new SimpleScheduler(registry);
+  });
+
+  it('works', async () => {
+    let started = 0;
+    let finished = 0;
+
+    registry.register(strategy.serialize()(createJobHandler((input: number[]) => {
+      started++;
+
+      return new Promise<number>(
+        resolve => setTimeout(() => {
+          finished++;
+          resolve(input.reduce((a, c) => a + c, 0));
+        }, 10),
+      );
+    })), {
+      argument: { items: { type: 'number' } },
+      output: { type: 'number' },
+      name: 'add',
+    });
+
+    const job1 = await scheduler.schedule('add', [1, 2, 3, 4]);
+    const job2 = await scheduler.schedule('add', [1, 2, 3, 4, 5]);
+    expect(started).toBe(0);
+    expect(finished).toBe(0);
+
+    job1.output.subscribe();
+    expect(started).toBe(1);
+
+    job2.output.subscribe();
+    expect(started).toBe(1);  // Job2 starts when Job1 ends.
+
+    expect(finished).toBe(0);
+
+    await Promise.all([
+      job1.output.toPromise().then(s => {
+        expect(finished).toBe(1);
+        expect(s).toBe(10);
+      }),
+      job2.output.toPromise().then(s => {
+        expect(finished).toBe(2);
+        expect(s).toBe(15);
+      }),
+    ]);
+
+    expect(started).toBe(2);
+    expect(finished).toBe(2);
+  });
+
+  it('works across jobs', async () => {
+    let started = 0;
+    let finished = 0;
+
+    const strategy1 = strategy.serialize();
+
+    registry.register(strategy1(createJobHandler((input: number[]) => {
+      started++;
+
+      return new Promise<number>(
+        resolve => setTimeout(() => {
+          finished++;
+          resolve(input.reduce((a, c) => a + c, 0));
+        }, 10),
+      );
+    })), {
+      argument: { items: { type: 'number' } },
+      output: { type: 'number' },
+      name: 'add',
+    });
+    registry.register(strategy1(createJobHandler((input: number[]) => {
+      started++;
+
+      return new Promise<number>(
+        resolve => setTimeout(() => {
+          finished++;
+          resolve(input.reduce((a, c) => a + c, 100));
+        }, 10),
+      );
+    })), {
+      argument: { items: { type: 'number' } },
+      output: { type: 'number' },
+      name: 'add100',
+    });
+
+    const job1 = await scheduler.schedule('add', [1, 2, 3, 4]);
+    const job2 = await scheduler.schedule('add100', [1, 2, 3, 4, 5]);
+    expect(started).toBe(0);
+    expect(finished).toBe(0);
+
+    job1.output.subscribe();
+    expect(started).toBe(1);
+
+    job2.output.subscribe();
+    expect(started).toBe(1);  // Job2 starts when Job1 ends.
+
+    expect(finished).toBe(0);
+
+    await Promise.all([
+      job1.output.toPromise().then(s => {
+        expect(finished).toBe(1);
+        expect(s).toBe(10);
+      }),
+      job2.output.toPromise().then(s => {
+        expect(finished).toBe(2);
+        expect(s).toBe(115);
+      }),
+    ]);
+
+    expect(started).toBe(2);
+    expect(finished).toBe(2);
+  });
+});
+
+describe('strategy.memoize()', () => {
+  let registry: SimpleJobRegistry;
+  let scheduler: SimpleScheduler;
+
+  beforeEach(() => {
+    registry = new SimpleJobRegistry();
+    scheduler = new SimpleScheduler(registry);
+  });
+
+  it('works', async () => {
+    let started = 0;
+    let finished = 0;
+
+    registry.register(strategy.memoize()(createJobHandler((input: number[]) => {
+      started++;
+
+      return new Promise<number>(
+        resolve => setTimeout(() => {
+          finished++;
+          resolve(input.reduce((a, c) => a + c, 0));
+        }, 10),
+      );
+    })), {
+      argument: { items: { type: 'number' } },
+      output: { type: 'number' },
+      name: 'add',
+    });
+
+    const job1 = await scheduler.schedule('add', [1, 2, 3, 4]);
+    const job2 = await scheduler.schedule('add', [1, 2, 3, 4]);
+    const job3 = await scheduler.schedule('add', [1, 2, 3, 4, 5]);
+    const job4 = await scheduler.schedule('add', [1, 2, 3, 4, 5]);
+    expect(started).toBe(0);
+    expect(finished).toBe(0);
+
+    job1.output.subscribe();
+    expect(started).toBe(1);
+    expect(finished).toBe(0);
+
+    job2.output.subscribe();
+    expect(started).toBe(1);  // job2 is reusing job1.
+    expect(finished).toBe(0);
+
+    job3.output.subscribe();
+    expect(started).toBe(2);
+    expect(finished).toBe(0);
+
+    job4.output.subscribe();
+    expect(started).toBe(2);  // job4 is reusing job3.
+    expect(finished).toBe(0);
+
+    await Promise.all([
+      job1.output.toPromise().then(s => {
+        // This is hard since job3 and job1 might finish out of order.
+        expect(finished).toBeGreaterThanOrEqual(1);
+        expect(s).toBe(10);
+      }),
+      job2.output.toPromise().then(s => {
+        // This is hard since job3 and job1 might finish out of order.
+        expect(finished).toBeGreaterThanOrEqual(1);
+        expect(job1.state).toBe(JobState.Ended);
+        expect(job2.state).toBe(JobState.Ended);
+        expect(s).toBe(10);
+      }),
+      job3.output.toPromise().then(s => {
+        // This is hard since job3 and job1 might finish out of order.
+        expect(finished).toBeGreaterThanOrEqual(1);
+        expect(s).toBe(15);
+      }),
+      job4.output.toPromise().then(s => {
+        expect(job3.state).toBe(JobState.Ended);
+        expect(job4.state).toBe(JobState.Ended);
+        // This is hard since job3 and job1 might finish out of order.
+        expect(finished).toBeGreaterThanOrEqual(1);
+        expect(s).toBe(15);
+      }),
+    ]);
+
+    expect(started).toBe(2);
+    expect(finished).toBe(2);
+  });
+});
diff --git a/packages/angular_devkit/core/src/json/schema/schema.ts b/packages/angular_devkit/core/src/json/schema/schema.ts
index f9b1e58dc98a..d7c5a653ebdc 100644
--- a/packages/angular_devkit/core/src/json/schema/schema.ts
+++ b/packages/angular_devkit/core/src/json/schema/schema.ts
@@ -5,7 +5,8 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { JsonObject } from '../interface';
+import { clean } from '../../utils';
+import { JsonObject, isJsonObject } from '../interface';
 
 /**
  * A specialized interface for JsonSchema (to come). JsonSchemas are also JsonObject.
@@ -13,3 +14,38 @@ import { JsonObject } from '../interface';
  * @public
  */
 export type JsonSchema = JsonObject | boolean;
+
+
+// TODO: this should be unknown
+// tslint:disable-next-line:no-any
+export function isJsonSchema(value: any): value is JsonSchema {
+  return isJsonObject(value) || value === false || value === true;
+}
+
+/**
+ * Return a schema that is the merge of all subschemas, ie. it should validate all the schemas
+ * that were passed in. It is possible to make an invalid schema this way, e.g. by using
+ * `mergeSchemas({ type: 'number' }, { type: 'string' })`, which will never validate.
+ * @param schemas All schemas to be merged.
+ */
+export function mergeSchemas(...schemas: (JsonSchema | undefined)[]): JsonSchema {
+  return clean(schemas).reduce((prev, curr) => {
+    if (prev === false || curr === false) {
+      return false;
+    } else if (prev === true) {
+      return curr;
+    } else if (curr === true) {
+      return prev;
+    } else if (Array.isArray(prev.allOf)) {
+      if (Array.isArray(curr.allOf)) {
+        return { ...prev, allOf: [...prev.allOf, ...curr.allOf] };
+      } else {
+        return { ...prev, allOf: [...prev.allOf, curr] };
+      }
+    } else if (Array.isArray(curr.allOf)) {
+      return { ...prev, allOf: [prev, ...curr.allOf] };
+    } else {
+      return { ...prev, allOf: [prev, curr] };
+    }
+  }, true as JsonSchema);
+}
diff --git a/tests/angular_devkit/core/node/jobs/BUILD b/tests/angular_devkit/core/node/jobs/BUILD
new file mode 100644
index 000000000000..8a79ee1a212f
--- /dev/null
+++ b/tests/angular_devkit/core/node/jobs/BUILD
@@ -0,0 +1,22 @@
+# Copyright Google Inc. All Rights Reserved.
+#
+# Use of this source code is governed by an MIT-style license that can be
+# found in the LICENSE file at https://angular.io/license
+package(default_visibility = ["//visibility:public"])
+
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+
+licenses(["notice"])  # MIT License
+
+ts_library(
+    name = "jobs_test_lib",
+    srcs = glob(
+        include = [
+            "**/*.ts",
+        ],
+    ),
+    deps = [
+        "//packages/angular_devkit/core",
+        "@npm//@types/node",
+    ],
+)
diff --git a/tests/angular_devkit/core/node/jobs/add.ts b/tests/angular_devkit/core/node/jobs/add.ts
new file mode 100644
index 000000000000..c271d8cfd031
--- /dev/null
+++ b/tests/angular_devkit/core/node/jobs/add.ts
@@ -0,0 +1,18 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// tslint:disable:no-global-tslint-disable
+// tslint:disable:no-implicit-dependencies
+import { experimental } from '@angular-devkit/core';
+
+// Export the job using a createJob. We use our own spec file here to do the job.
+export default experimental.jobs.createJobHandler<number[], null, number>(input => {
+  return input.reduce((a, c) => a + c, 0);
+}, {
+  input: { items: { type: 'number' } },
+  output: { type: 'number' },
+});

From 851d6948a45cd59821c93e262eff242a6947f491 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Tue, 20 Nov 2018 16:11:23 -0800
Subject: [PATCH 0531/1703] feat(@schematics/update): add packageGroup version
 map support

Fixes #13015
---
 packages/schematics/update/update/index.ts    | 54 ++++++++++++++-----
 .../schematics/update/update/index_spec.ts    | 34 ++++++++++++
 tests/schematics/update/packages/README.md    | 14 +++++
 .../update-package-group-1/package.json       | 11 ++++
 .../update-package-group-2/package.json       | 11 ++++
 5 files changed, 110 insertions(+), 14 deletions(-)
 create mode 100644 tests/schematics/update/packages/README.md
 create mode 100644 tests/schematics/update/packages/update-package-group-1/package.json
 create mode 100644 tests/schematics/update/packages/update-package-group-2/package.json

diff --git a/packages/schematics/update/update/index.ts b/packages/schematics/update/update/index.ts
index e56e18cc6fa8..8a9bcb14acef 100644
--- a/packages/schematics/update/update/index.ts
+++ b/packages/schematics/update/update/index.ts
@@ -76,7 +76,8 @@ interface PackageInfo {
 }
 
 interface UpdateMetadata {
-  packageGroup: string[];
+  packageGroupName?: string;
+  packageGroup: { [ packageName: string ]: string };
   requirements: { [packageName: string]: string };
   migrations?: string;
 }
@@ -88,9 +89,9 @@ function _updatePeerVersion(infoMap: Map<string, PackageInfo>, name: string, ran
     return range;
   }
   if (maybePackageInfo.target) {
-    name = maybePackageInfo.target.updateMetadata.packageGroup[0] || name;
+    name = maybePackageInfo.target.updateMetadata.packageGroupName || name;
   } else {
-    name = maybePackageInfo.installed.updateMetadata.packageGroup[0] || name;
+    name = maybePackageInfo.installed.updateMetadata.packageGroupName || name;
   }
 
   const maybeTransform = peerCompatibleWhitelist[name];
@@ -353,7 +354,7 @@ function _getUpdateMetadata(
   const metadata = packageJson['ng-update'];
 
   const result: UpdateMetadata = {
-    packageGroup: [],
+    packageGroup: {},
     requirements: {},
   };
 
@@ -363,15 +364,28 @@ function _getUpdateMetadata(
 
   if (metadata['packageGroup']) {
     const packageGroup = metadata['packageGroup'];
-    // Verify that packageGroup is an array of strings. This is not an error but we still warn
-    // the user and ignore the packageGroup keys.
-    if (!Array.isArray(packageGroup) || packageGroup.some(x => typeof x != 'string')) {
+    // Verify that packageGroup is an array of strings or an map of versions. This is not an error
+    // but we still warn the user and ignore the packageGroup keys.
+    if (Array.isArray(packageGroup) && packageGroup.every(x => typeof x == 'string')) {
+      result.packageGroup = packageGroup.reduce((group, name) => {
+        group[name] = packageJson.version;
+
+        return group;
+      }, result.packageGroup);
+    } else if (typeof packageGroup == 'object' && packageGroup
+               && Object.values(packageGroup).every(x => typeof x == 'string')) {
+      result.packageGroup = packageGroup;
+    } else {
       logger.warn(
         `packageGroup metadata of package ${packageJson.name} is malformed. Ignoring.`,
       );
-    } else {
-      result.packageGroup = packageGroup;
     }
+
+    result.packageGroupName = Object.keys(result.packageGroup)[0];
+  }
+
+  if (typeof metadata['packageGroupName'] == 'string') {
+    result.packageGroupName = metadata['packageGroupName'];
   }
 
   if (metadata['requirements']) {
@@ -654,22 +668,34 @@ function _addPackageGroup(
     return;
   }
 
-  const packageGroup = ngUpdateMetadata['packageGroup'];
+  let packageGroup = ngUpdateMetadata['packageGroup'];
   if (!packageGroup) {
     return;
   }
-  if (!Array.isArray(packageGroup) || packageGroup.some(x => typeof x != 'string')) {
+  if (Array.isArray(packageGroup) && !packageGroup.some(x => typeof x != 'string')) {
+    packageGroup = packageGroup.reduce((acc, curr) => {
+      acc[curr] = maybePackage;
+
+      return acc;
+    }, {} as { [name: string]: string });
+  }
+
+  // Only need to check if it's an object because we set it right the time before.
+  if (typeof packageGroup != 'object'
+      || packageGroup === null
+      || Object.values(packageGroup).some(v => typeof v != 'string')
+  ) {
     logger.warn(`packageGroup metadata of package ${npmPackageJson.name} is malformed.`);
 
     return;
   }
 
-  packageGroup
+  Object.keys(packageGroup)
     .filter(name => !packages.has(name))  // Don't override names from the command line.
     .filter(name => allDependencies.has(name))  // Remove packages that aren't installed.
     .forEach(name => {
-    packages.set(name, maybePackage);
-  });
+      packages.set(name, packageGroup[name]);
+    });
 }
 
 /**
diff --git a/packages/schematics/update/update/index_spec.ts b/packages/schematics/update/update/index_spec.ts
index b1c7c936eba4..e91a726e0363 100644
--- a/packages/schematics/update/update/index_spec.ts
+++ b/packages/schematics/update/update/index_spec.ts
@@ -222,6 +222,40 @@ describe('@schematics/update', () => {
     ).toPromise().then(done, done.fail);
   }, 45000);
 
+  it('uses packageGroup for versioning', async () => {
+    // Add the basic migration package.
+    const content = virtualFs.fileBufferToString(host.sync.read(normalize('/package.json')));
+    const packageJson = JSON.parse(content);
+    const dependencies = packageJson['dependencies'];
+    dependencies['@angular-devkit-tests/update-package-group-1'] = '1.0.0';
+    dependencies['@angular-devkit-tests/update-package-group-2'] = '1.0.0';
+    host.sync.write(
+      normalize('/package.json'),
+      virtualFs.stringToFileBuffer(JSON.stringify(packageJson)),
+    );
+
+    await schematicRunner.runSchematicAsync('update', {
+      packages: ['@angular-devkit-tests/update-package-group-1'],
+    }, appTree).pipe(
+      map(tree => {
+        const packageJson = JSON.parse(tree.readContent('/package.json'));
+        const deps = packageJson['dependencies'];
+        expect(deps['@angular-devkit-tests/update-package-group-1']).toBe('1.2.0');
+        expect(deps['@angular-devkit-tests/update-package-group-2']).toBe('2.0.0');
+
+        // Check install task.
+        expect(schematicRunner.tasks).toEqual([
+          {
+            name: 'node-package',
+            options: jasmine.objectContaining({
+              command: 'install',
+            }),
+          },
+        ]);
+      }),
+    ).toPromise();
+  }, 45000);
+
   it('can migrate only', done => {
     // Add the basic migration package.
     const content = virtualFs.fileBufferToString(host.sync.read(normalize('/package.json')));
diff --git a/tests/schematics/update/packages/README.md b/tests/schematics/update/packages/README.md
new file mode 100644
index 000000000000..83526f2cd776
--- /dev/null
+++ b/tests/schematics/update/packages/README.md
@@ -0,0 +1,14 @@
+
+## Update Package Group packages
+
+* `update-package-group-1@1.0.0` -> `update-package-group2@^1`
+* `update-package-group-2@1.0.0` -> `update-package-group1@1.0.0`
+----
+
+* `update-package-group-1@1.0.0` -> `update-package-group2@^1`
+* `update-package-group-2@1.1.0` -> `update-package-group1@1.0.0`
+----
+
+* `update-package-group-1@1.2.0` -> `update-package-group2@^2`
+* `update-package-group-2@2.0.0` -> `update-package-group1@^1`
+----
diff --git a/tests/schematics/update/packages/update-package-group-1/package.json b/tests/schematics/update/packages/update-package-group-1/package.json
new file mode 100644
index 000000000000..58a55973dd36
--- /dev/null
+++ b/tests/schematics/update/packages/update-package-group-1/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@angular-devkit-tests/update-package-group-1",
+  "version": "1.2.0",
+  "description": "Tests",
+  "ng-update": {
+    "packageGroup": {
+      "@angular-devkit-tests/update-package-group-1": "",
+      "@angular-devkit-tests/update-package-group-2": "^2"
+    }
+  }
+}
diff --git a/tests/schematics/update/packages/update-package-group-2/package.json b/tests/schematics/update/packages/update-package-group-2/package.json
new file mode 100644
index 000000000000..39231fc6a190
--- /dev/null
+++ b/tests/schematics/update/packages/update-package-group-2/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@angular-devkit-tests/update-package-group-2",
+  "version": "2.0.0",
+  "description": "Tests",
+  "ng-update": {
+    "packageGroup": {
+      "@angular-devkit-tests/update-package-group-1": "^1",
+      "@angular-devkit-tests/update-package-group-2": ""
+    }
+  }
+}

From 37f4d1d74202073d560d31bcd88df51df577fc82 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Fri, 14 Dec 2018 08:56:41 +0100
Subject: [PATCH 0532/1703] ci: add renovate configuration

Since we have a lot of pin dependencies renovate will help us automate dependency updates.

`source-map` is listed as ignored as at the moment we cannot update this since their API changed to async and and this repos Code Coverage is sync.

`webpack-subresource-integrity` - the newer version requires peerDependencies that we don't want to include.
---
 renovate.json | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 renovate.json

diff --git a/renovate.json b/renovate.json
new file mode 100644
index 000000000000..24ddeca3c4a2
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,47 @@
+{
+  "pinVersions": false,
+  "semanticCommits": true,
+  "semanticPrefix": "build",
+  "commitMessage": "{{semanticPrefix}} update {{depName}} to version {{newVersion}}",
+  "separateMajorMinor": false,
+  "prHourlyLimit": 2,
+  "timezone": "America/Tijuana",
+  "schedule": [
+    "after 10pm every weekday",
+    "before 4am every weekday",
+    "every weekend"
+  ],
+  "baseBranches": [
+    "master"
+  ],
+  "ignoreDeps": [
+    "source-map",
+    "webpack-subresource-integrity"
+  ],
+  "packageFiles": [
+    "package.json",
+    "packages/**/package.json"
+  ],
+  "packageRules": [
+    {
+      "packagePatterns": [
+        "^@angular\/.*"
+      ],
+      "groupName": "angular",
+      "pinVersions": false
+    },
+    {
+      "packagePatterns": [
+        "^@bazel\/.*"
+      ],
+      "groupName": "bazel",
+      "pinVersions": false
+    },
+    {
+      "packageNames": [
+        "typescript"
+      ],
+      "updateTypes": "patch"
+    }
+  ]
+}

From 32c96d615861e523c79c01e75d124e2c11cf5541 Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Tue, 18 Dec 2018 11:01:15 +0100
Subject: [PATCH 0533/1703] style(@schematics/angular): format jsdoc in
 polyfills.ts

This line makes the `jsdoc-format` tslint rule fails if activated as it is not a correct JSDoc formating.
---
 packages/schematics/angular/application/files/src/polyfills.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/application/files/src/polyfills.ts b/packages/schematics/angular/application/files/src/polyfills.ts
index 55ff1be003db..a6d34ea67a3b 100644
--- a/packages/schematics/angular/application/files/src/polyfills.ts
+++ b/packages/schematics/angular/application/files/src/polyfills.ts
@@ -47,7 +47,7 @@
  * Web Animations `@angular/platform-browser/animations`
  * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
  * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
- **/
+ */
 // import 'web-animations-js';  // Run `npm install --save web-animations-js`.
 
 /**

From 95c301a60ba8066e1ddf60fbe2b86ad134fa9310 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 19 Dec 2018 11:53:01 +0000
Subject: [PATCH 0534/1703] build: update license-webpack-plugin to version
 2.0.4

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 61b3093532d4..bb37de546d18 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -23,7 +23,7 @@
     "karma-source-map-support": "1.3.0",
     "less": "3.8.1",
     "less-loader": "4.1.0",
-    "license-webpack-plugin": "2.0.2",
+    "license-webpack-plugin": "2.0.4",
     "loader-utils": "1.1.0",
     "mini-css-extract-plugin": "0.4.4",
     "minimatch": "3.0.4",
diff --git a/yarn.lock b/yarn.lock
index 1616108afe84..d2e56811c579 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5717,11 +5717,12 @@ license-checker@^20.1.0:
     strip-ansi "^4.0.0"
     treeify "^1.1.0"
 
-license-webpack-plugin@2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.0.2.tgz#9d34b521cb7fca8527945310b05be6ef0248b687"
-  integrity sha512-GsomZw5VoT20ST8qH2tOjBgbyhn6Pgs9M94g0mbvfBIV1VXufm1iKY+4dbgfTObj1Mp6nSRE3Zf74deOZr0KwA==
+license-webpack-plugin@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.0.4.tgz#48532e7d7b45f6ceb21a68b6826ce7241d7ea6da"
+  integrity sha512-FQgOqrrIcD4C/VQo6ecWgXZULK5rs0kIDJtHcSVO6SBUrD63kEHZwmKOvBTquFQSgMQn/yeH68qooKDfqiBF2Q==
   dependencies:
+    "@types/webpack-sources" "^0.1.5"
     webpack-sources "^1.2.0"
 
 lie@~3.1.0:

From 8eca63d2632217b44f5f85d2f408f2ad0f641105 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 19 Dec 2018 09:48:33 +0000
Subject: [PATCH 0535/1703] build: update less to version 3.9.0

---
 .../angular_devkit/build_angular/package.json  |  2 +-
 yarn.lock                                      | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index bb37de546d18..deb8166eddb7 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -21,7 +21,7 @@
     "istanbul": "0.4.5",
     "istanbul-instrumenter-loader": "3.0.1",
     "karma-source-map-support": "1.3.0",
-    "less": "3.8.1",
+    "less": "3.9.0",
     "less-loader": "4.1.0",
     "license-webpack-plugin": "2.0.4",
     "loader-utils": "1.1.0",
diff --git a/yarn.lock b/yarn.lock
index d2e56811c579..48729d840aa3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5657,7 +5657,23 @@ less-plugin-npm-import@^2.1.0:
     promise "~7.0.1"
     resolve "~1.1.6"
 
-less@3.8.1, less@^3.8.0:
+less@3.9.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/less/-/less-3.9.0.tgz#b7511c43f37cf57dc87dffd9883ec121289b1474"
+  integrity sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==
+  dependencies:
+    clone "^2.1.2"
+  optionalDependencies:
+    errno "^0.1.1"
+    graceful-fs "^4.1.2"
+    image-size "~0.5.0"
+    mime "^1.4.1"
+    mkdirp "^0.5.0"
+    promise "^7.1.1"
+    request "^2.83.0"
+    source-map "~0.6.0"
+
+less@^3.8.0:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/less/-/less-3.8.1.tgz#f31758598ef5a1930dd4caefa9e4340641e71e1d"
   integrity sha512-8HFGuWmL3FhQR0aH89escFNBQH/nEiYPP2ltDFdQw2chE28Yx2E3lhAIq9Y2saYwLSwa699s4dBVEfCY8Drf7Q==

From 92ff5a193ab3ee3505a1a30167de66c5bb504410 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 19 Dec 2018 08:42:58 +0000
Subject: [PATCH 0536/1703] build: update inquirer to version 6.2.1

---
 packages/angular/cli/package.json             |  2 +-
 .../schematics_cli/package.json               |  2 +-
 yarn.lock                                     | 22 ++++++++++++++-----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 77603e72b77d..ee2bc7fdd32c 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -31,7 +31,7 @@
     "@angular-devkit/schematics": "0.0.0",
     "@schematics/angular": "0.0.0",
     "@schematics/update": "0.0.0",
-    "inquirer": "6.2.0",
+    "inquirer": "6.2.1",
     "opn": "5.3.0",
     "semver": "5.5.1",
     "symbol-observable": "1.2.0"
diff --git a/packages/angular_devkit/schematics_cli/package.json b/packages/angular_devkit/schematics_cli/package.json
index 6558e9d16a58..0d799b720d55 100644
--- a/packages/angular_devkit/schematics_cli/package.json
+++ b/packages/angular_devkit/schematics_cli/package.json
@@ -17,7 +17,7 @@
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
     "@schematics/schematics": "0.0.0",
-    "inquirer": "6.2.0",
+    "inquirer": "6.2.1",
     "minimist": "1.2.0",
     "rxjs": "6.3.3",
     "symbol-observable": "1.2.0"
diff --git a/yarn.lock b/yarn.lock
index 48729d840aa3..63261339d774 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -904,6 +904,11 @@ ansi-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
   integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
+ansi-regex@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
+  integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -4690,10 +4695,10 @@ injection-js@^2.2.1:
   resolved "https://registry.yarnpkg.com/injection-js/-/injection-js-2.2.1.tgz#a8d6a085b2f0b8d8650f6f4487f6abb8cc0d67ce"
   integrity sha512-zHI+E+dM0PXix5FFTO1Y4/UOyAzE7zG1l/QwAn4jchTThOoBq+UYRFK4AVG7lQgFL+go62SbrzSsjXy9DFEZUg==
 
-inquirer@6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"
-  integrity sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==
+inquirer@6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.1.tgz#9943fc4882161bdb0b0c9276769c75b32dbfcd52"
+  integrity sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.0"
@@ -4706,7 +4711,7 @@ inquirer@6.2.0:
     run-async "^2.2.0"
     rxjs "^6.1.0"
     string-width "^2.1.0"
-    strip-ansi "^4.0.0"
+    strip-ansi "^5.0.0"
     through "^2.3.6"
 
 internal-ip@^3.0.1:
@@ -9396,6 +9401,13 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
+strip-ansi@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
+  integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==
+  dependencies:
+    ansi-regex "^4.0.0"
+
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"

From 09cb5701ab9d4df4b90e0bc9fa6fae3e935b5e17 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 19 Dec 2018 08:42:46 +0000
Subject: [PATCH 0537/1703] build: update copy-webpack-plugin to version 4.6.0

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index deb8166eddb7..d519d58b5fa3 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -15,7 +15,7 @@
     "autoprefixer": "9.3.1",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
-    "copy-webpack-plugin": "4.5.4",
+    "copy-webpack-plugin": "4.6.0",
     "file-loader": "2.0.0",
     "glob": "7.1.3",
     "istanbul": "0.4.5",
diff --git a/yarn.lock b/yarn.lock
index 63261339d774..0ef32cd07b81 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2475,10 +2475,10 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-webpack-plugin@4.5.4:
-  version "4.5.4"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.4.tgz#f2b2782b3cd5225535c3dc166a80067e7d940f27"
-  integrity sha512-0lstlEyj74OAtYMrDxlNZsU7cwFijAI3Ofz2fD6Mpo9r4xCv4yegfa3uHIKvZY1NSuOtE9nvG6TAhJ+uz9gDaQ==
+copy-webpack-plugin@4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz#e7f40dd8a68477d405dd1b7a854aae324b158bae"
+  integrity sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==
   dependencies:
     cacache "^10.0.4"
     find-cache-dir "^1.0.0"

From 37c9513a8e67be81cef713e52be86dd395ee66a7 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 19 Dec 2018 07:52:44 +0000
Subject: [PATCH 0538/1703] build: update autoprefixer to version 9.4.3

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 49 ++++++++++++++++++-
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index d519d58b5fa3..b6ca4909fca3 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -12,7 +12,7 @@
     "@angular-devkit/core": "0.0.0",
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.5.3",
-    "autoprefixer": "9.3.1",
+    "autoprefixer": "9.4.3",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "4.6.0",
diff --git a/yarn.lock b/yarn.lock
index 0ef32cd07b81..1abda2b2a1e0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1174,7 +1174,19 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@9.3.1, autoprefixer@^9.0.0:
+autoprefixer@9.4.3:
+  version "9.4.3"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.3.tgz#c97384a8fd80477b78049163a91bbc725d9c41d9"
+  integrity sha512-/XSnzDepRkAU//xLcXA/lUWxpsBuw0WiriAHOqnxkuCtzLhaz+fL4it4gp20BQ8n5SyLzK/FOc7A0+u/rti2FQ==
+  dependencies:
+    browserslist "^4.3.6"
+    caniuse-lite "^1.0.30000921"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^7.0.6"
+    postcss-value-parser "^3.3.1"
+
+autoprefixer@^9.0.0:
   version "9.3.1"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.3.1.tgz#71b622174de2b783d5fd99f9ad617b7a3c78443e"
   integrity sha512-DY9gOh8z3tnCbJ13JIWaeQsoYncTGdsrgCceBaQSIL4nvdrLxgbRSBPevg2XbX7u4QCSfLheSJEEIUUSlkbx6Q==
@@ -1595,6 +1607,15 @@ browserslist@^4.0.0, browserslist@^4.3.3:
     electron-to-chromium "^1.3.82"
     node-releases "^1.0.1"
 
+browserslist@^4.3.6:
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.6.tgz#0f9d9081afc66b36f477c6bdf3813f784f42396a"
+  integrity sha512-kMGKs4BTzRWviZ8yru18xBpx+CyHG9eqgRbj9XbE3IMgtczf4aiA0Y1YCpVdvUieKGZ03kolSPXqTcscBCb9qw==
+  dependencies:
+    caniuse-lite "^1.0.30000921"
+    electron-to-chromium "^1.3.92"
+    node-releases "^1.1.1"
+
 browserstack@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.5.1.tgz#e2dfa66ffee940ebad0a07f7e00fd4687c455d66"
@@ -1821,6 +1842,11 @@ caniuse-lite@^1.0.30000898, caniuse-lite@^1.0.30000899:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000903.tgz#86d46227759279b3db345ddbe778335dbba9e858"
   integrity sha512-T1XVJEpGCoaq7MDw7/6hCdYUukmSaS+1l/OQJkLtw7Cr2+/+d67tNGKEbyiqf7Ck8x6EhNFUxjYFXXka0N/w5g==
 
+caniuse-lite@^1.0.30000921:
+  version "1.0.30000921"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000921.tgz#7a607c1623444b22351d834e093aedda3c42fbe8"
+  integrity sha512-Bu09ciy0lMWLgpYC77I0YGuI8eFRBPPzaSOYJK1jTI64txCphYCqnWbxJYjHABYVt/TYX/p3jNjLBR87u1Bfpw==
+
 canonical-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
@@ -3064,6 +3090,11 @@ electron-to-chromium@^1.3.82:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.82.tgz#7d13ae4437d2a783de3f4efba96b186c540b67b1"
   integrity sha512-NI4nB2IWGcU4JVT1AE8kBb/dFor4zjLHMLsOROPahppeHrR0FG5uslxMmkp/thO1MvPjM2xhlKoY29/I60s0ew==
 
+electron-to-chromium@^1.3.92:
+  version "1.3.95"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.95.tgz#79fac438813ca7f3db182a525c2ab432934f6484"
+  integrity sha512-0JZEDKOQAE05EO/4rk3vLAE+PYFI9OLCVLAS4QAq1y+Bb2y1N6MyQJz62ynzHN/y0Ka/nO5jVJcahbCEdfiXLQ==
+
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
@@ -6611,6 +6642,13 @@ node-releases@^1.0.1:
   dependencies:
     semver "^5.3.0"
 
+node-releases@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.2.tgz#93c17fba5eec8650ad908de5433fa8763baebe4d"
+  integrity sha512-j1gEV/zX821yxdWp/1vBMN0pSUjuH9oGUdLCb4PfUko6ZW7KdRs3Z+QGGwDUhYtSpQvdVVyLd2V0YvLsmdg5jQ==
+  dependencies:
+    semver "^5.3.0"
+
 node-sass-tilde-importer@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz#1a15105c153f648323b4347693fdb0f331bad1ce"
@@ -7581,6 +7619,15 @@ postcss@7.0.5, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
     source-map "^0.6.1"
     supports-color "^5.5.0"
 
+postcss@^7.0.6:
+  version "7.0.7"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.7.tgz#2754d073f77acb4ef08f1235c36c5721a7201614"
+  integrity sha512-HThWSJEPkupqew2fnuQMEI2YcTj/8gMV3n80cMdJsKxfIh5tHf7nM5JigNX6LxVMqo6zkgQNAI88hyFvBk41Pg==
+  dependencies:
+    chalk "^2.4.1"
+    source-map "^0.6.1"
+    supports-color "^5.5.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"

From 319f630b44afd7a362c906a09a2a928805051c23 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 19 Dec 2018 06:48:03 +0000
Subject: [PATCH 0539/1703] build: update @types/inquirer to version ^0.0.43

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 180a206446c9..5df71142c667 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "@types/copy-webpack-plugin": "^4.4.1",
     "@types/express": "^4.16.0",
     "@types/glob": "^5.0.35",
-    "@types/inquirer": "^0.0.42",
+    "@types/inquirer": "^0.0.43",
     "@types/istanbul": "^0.4.30",
     "@types/jasmine": "^2.8.8",
     "@types/loader-utils": "^1.1.3",
diff --git a/yarn.lock b/yarn.lock
index 1abda2b2a1e0..ff2fb6ff6e26 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -321,10 +321,10 @@
     "@types/events" "*"
     "@types/node" "*"
 
-"@types/inquirer@^0.0.42":
-  version "0.0.42"
-  resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-0.0.42.tgz#2310fd8623053bead72247adae416aa32bacdf0c"
-  integrity sha512-flMaNWU2g9NrtZ4bIV+7SEY2W7OdWNNhmJ0rE1lWVxGrkp3TfFGMcFCxRIBmGWigI8e6n+2HqLjizTTfgcpHLg==
+"@types/inquirer@^0.0.43":
+  version "0.0.43"
+  resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-0.0.43.tgz#1eb0bbb4648e6cc568bd396c1e989f620ad01273"
+  integrity sha512-xgyfKZVMFqE8aIKy1xfFVsX2MxyXUNgjgmbF6dRbR3sL+ZM5K4ka/9L4mmTwX8eTeVYtduyXu0gUVwVJa1HbNw==
   dependencies:
     "@types/rx" "*"
     "@types/through" "*"

From 18566b0442510e92ae6dcdd358a70e9cf213ddeb Mon Sep 17 00:00:00 2001
From: Amadou Sall <ahasall.dev@gmail.com>
Date: Wed, 19 Dec 2018 12:31:17 +0100
Subject: [PATCH 0540/1703] fix(@angular-devkit/build-angular): remove circular
 dependencies warnings in ngfactory files

Fixes #11135
---
 .../src/angular-cli-files/models/webpack-configs/common.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 07e1d9842714..bab2266a41f7 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -155,7 +155,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
 
   if (buildOptions.showCircularDependencies) {
     extraPlugins.push(new CircularDependencyPlugin({
-      exclude: /[\\\/]node_modules[\\\/]/,
+      exclude: /([\\\/]node_modules[\\\/])|(ngfactory\.js$)/,
     }));
   }
 

From 5111d15ff262031afc9cc6244b6fbd9f2ae7d41e Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Wed, 19 Dec 2018 11:18:45 +0100
Subject: [PATCH 0541/1703] build: update to TypeScript 3.2 and Angular 7.2 RC

---
 package.json                                  |   6 +-
 .../angular_devkit/build_angular/package.json |  24 ++--
 .../build_ng_packagr/package.json             |   4 +-
 .../build_optimizer/package.json              |   2 +-
 packages/ngtools/webpack/package.json         |   8 +-
 yarn.lock                                     | 104 +++++++++---------
 6 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/package.json b/package.json
index 5df71142c667..6b6df6812fb0 100644
--- a/package.json
+++ b/package.json
@@ -69,12 +69,12 @@
     "quicktype-core": "^6.0.15",
     "temp": "^0.8.3",
     "tslint": "^5.11.0",
-    "typescript": "~3.1.6",
+    "typescript": "~3.2.2",
     "yarn": "^1.10.1"
   },
   "devDependencies": {
-    "@angular/compiler": "^7.1.0",
-    "@angular/compiler-cli": "^7.1.0",
+    "@angular/compiler": "^7.2.0-rc.0",
+    "@angular/compiler-cli": "^7.2.0-rc.0",
     "@bazel/karma": "^0.20.3",
     "@bazel/typescript": "0.20.3",
     "@ngtools/json-schema": "^1.1.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index b6ca4909fca3..eb88d06b103c 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -57,19 +57,19 @@
     "node-sass": "4.10.0"
   },
   "devDependencies": {
-    "@angular/animations": "^7.1.0",
-    "@angular/cdk": "^7.1.0",
-    "@angular/common": "^7.1.0",
-    "@angular/compiler": "^7.1.0",
-    "@angular/compiler-cli": "^7.1.0",
-    "@angular/core": "^7.1.0",
-    "@angular/http": "^7.1.0",
+    "@angular/animations": "^7.2.0-rc.0",
+    "@angular/cdk": "^7.2.0-rc.0",
+    "@angular/common": "^7.2.0-rc.0",
+    "@angular/compiler": "^7.2.0-rc.0",
+    "@angular/compiler-cli": "^7.2.0-rc.0",
+    "@angular/core": "^7.2.0-rc.0",
+    "@angular/http": "^7.2.0-rc.0",
     "@angular/material": "^7.1.0",
-    "@angular/platform-browser": "^7.1.0",
-    "@angular/platform-browser-dynamic": "^7.1.0",
-    "@angular/platform-server": "^7.1.0",
-    "@angular/router": "^7.1.0",
-    "@angular/service-worker": "^7.1.0",
+    "@angular/platform-browser": "^7.2.0-rc.0",
+    "@angular/platform-browser-dynamic": "^7.2.0-rc.0",
+    "@angular/platform-server": "^7.2.0-rc.0",
+    "@angular/router": "^7.2.0-rc.0",
+    "@angular/service-worker": "^7.2.0-rc.0",
     "codelyzer": "^4.2.1",
     "core-js": "^2.4.1",
     "bootstrap": "^4.0.0",
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index 9a4692a8b905..2852b3d826ea 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -15,8 +15,8 @@
     "ng-packagr": "^2.2.0 || ^3.0.0 || ^4.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "^7.1.0",
-    "@angular/compiler-cli": "^7.1.0",
+    "@angular/compiler": "^7.2.0-rc.0",
+    "@angular/compiler-cli": "^7.2.0-rc.0",
     "ng-packagr": "^4.2.0",
     "tsickle": ">=0.34.0",
     "tslib": "^1.9.0"
diff --git a/packages/angular_devkit/build_optimizer/package.json b/packages/angular_devkit/build_optimizer/package.json
index 0e37192541c3..ca75522d3741 100644
--- a/packages/angular_devkit/build_optimizer/package.json
+++ b/packages/angular_devkit/build_optimizer/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "loader-utils": "1.1.0",
     "source-map": "0.5.6",
-    "typescript": "3.1.6",
+    "typescript": "3.2.2",
     "webpack-sources": "1.2.0"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 3e7c5552a25d..5b01ef4bc0f1 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -29,13 +29,13 @@
   },
   "peerDependencies": {
     "@angular/compiler-cli": ">=5.0.0 <8.0.0 || ^7.0.0-beta.0",
-    "typescript": ">=2.4.0 < 3.2",
+    "typescript": ">=2.4.0 < 3.3",
     "webpack": "^4.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "^7.1.0",
-    "@angular/compiler-cli": "^7.1.0",
-    "typescript": "~3.1.6",
+    "@angular/compiler": "^7.2.0-rc.0",
+    "@angular/compiler-cli": "^7.2.0-rc.0",
+    "typescript": "~3.2.2",
     "webpack": "^4.0.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index ff2fb6ff6e26..3c2b0f645dfd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,33 +2,33 @@
 # yarn lockfile v1
 
 
-"@angular/animations@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.1.0.tgz#3f03175217a45b72e53310d9ab35e69802ad9555"
-  integrity sha512-1Sje3qptVsTxPP4LwcvVPQun4P156wsEEwwCXoCO3NuP+tS67syU8M69uIpyDbpnx2ZeuWpJ9HfvKe1ljeqcuw==
+"@angular/animations@^7.2.0-rc.0":
+  version "7.2.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.0-rc.0.tgz#12849f8ab104d309ec99c0ceb170a895c15d3d44"
+  integrity sha512-CRQNQ6QVTuf4nCHVLVpKQx7YPpNPfnTF79KVWzHefkkyS3URRuEgvE4jCED4oTJ4BEsmkjXyt51VeDV0FgqQFg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cdk@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.1.0.tgz#7e5c3e3631947ef91413a83997ec4edec92cdd1c"
-  integrity sha512-dY740pKcIRtKr6n6NomrgqfdEj988urTZ9I/bfJjxF5fdhnSjyhEvDlB55EHsrF+bTTZbZXRmv7AwOQ9GJnD9w==
+"@angular/cdk@^7.2.0-rc.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.2.0.tgz#03bfbbcd5882fbdab71e6d5b5f36b612589724b4"
+  integrity sha512-ANGNIvyEdkMW6APl+6XDQC5VBS+mS/M+3UB/ROnj+7Om3xe2DSbEjqDXB/SpeJYUp6Qg/wQoWmyvd4y8HfjMwA==
   dependencies:
     tslib "^1.7.1"
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/common@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.1.0.tgz#89b0a34fd8f2a323704369551be4ac7491dda0b7"
-  integrity sha512-tu6Hv3/z3K2NLD4ndBioGtcykhbwhMJYUWb0NvaOLhaVYColWKPFpkflEorDWB+3/IWkpELGhA/HQ2zQh7EVyg==
+"@angular/common@^7.2.0-rc.0":
+  version "7.2.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.0-rc.0.tgz#60d3540c6cdcf3440f67e2c15cf8f1c7b1160d9d"
+  integrity sha512-Xv60KEP1kpF74kpN1xtps0W++PUXLUMK/0tDblUZH7tBWvS0XwEwtuK5B6wcs+I5nqZkPgvlvOyiVZvOLraWOg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.1.0.tgz#b02b2f94b9510caadc2b16bf1f97aa41d21a3ce2"
-  integrity sha512-Q42B3YmjMNYWTxTWfyDDFa6HSVqwY3rZO5Kp3Q/NKhQ6w/WddduxjARf/OCbtp0bVX3wZNObS6nO4H65rNCtsw==
+"@angular/compiler-cli@^7.2.0-rc.0":
+  version "7.2.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.0-rc.0.tgz#b3e80954d5c0d5a8973f224fc56eeb12fc4593bb"
+  integrity sha512-m0hfGVvVCGWFgApsDhh80YpdvXWs7/Oq1lgd0dXeo1wZFLOoTfM9Vq7nSnoummwwLeWeYLiZb67LMB6lY9uI2w==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^1.4.2"
@@ -42,24 +42,24 @@
     tslib "^1.9.0"
     yargs "9.0.1"
 
-"@angular/compiler@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.1.0.tgz#3455eeb575d0b9b68a099b5781d3cce78468146a"
-  integrity sha512-1Hjx6e+lVXZyXFFe4OW34ZpiaGEYyB1MQ7k2C+cMm0ABMQS3LsWT4DYhY7bk0mmMuuXQj66C62MX76ladDtdIg==
+"@angular/compiler@^7.2.0-rc.0":
+  version "7.2.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.0-rc.0.tgz#603dbec25d6c2beea08a293c68c39b40e2ea81e2"
+  integrity sha512-tvgGJx0urSz/qn6upmcjX3N3dyWQ9m5mQOwJxmN4qekxjOtSRml5yt2KtlaUTkGsjkEmEVfSHel+X1TwzBdhYw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.1.0.tgz#a55fbbc28b2c9da767121f433733683780266eb3"
-  integrity sha512-7mMoWuf8jAf4hcjQ0Exz2w9Qx9SRwNuDdtEZFGWH9dZWz5uPCewrN+Kt9MigMfSYGEdLAPcRMIuvFHDCS8B3Hg==
+"@angular/core@^7.2.0-rc.0":
+  version "7.2.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.0-rc.0.tgz#57c0e26130288c3b58466f079828c028bdf6221f"
+  integrity sha512-2u11TNlLorw3JhuczCPwl8UmxE+ja2Q/ghBl8iYi4SIBWiBO1K0wVT13Ts7eojk63yZcg60lyYYCegXBmHLTuw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.1.0.tgz#9243d6a0fae5b5fd12aa9408e3dbaffad54deb9b"
-  integrity sha512-Je3D374ccxTFGpFu9tXi6k95vTaG+3jYYtEQ7i43CHbaGyHR/KwMEr8DEzrABd1zCSxBX71WwHuReG2wBANfcA==
+"@angular/http@^7.2.0-rc.0":
+  version "7.2.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.0-rc.0.tgz#5814a751eb3df7d8af9bcfb20e4a2602c604d7e0"
+  integrity sha512-iNLSeX/RzrnjI+C2EMvvrZtFzhByMf7RJ7Db/hGHq8p6OvcpWvNrpP8UR4SeQs2ZyvF7zuC7P6bbRywV9Sd39g==
   dependencies:
     tslib "^1.9.0"
 
@@ -70,40 +70,40 @@
   dependencies:
     tslib "^1.7.1"
 
-"@angular/platform-browser-dynamic@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.1.0.tgz#c7d07f6b1c08fa12c54b4e310da930da613c7e6e"
-  integrity sha512-0yG6e/ZOI9LNUGgSjJ7xUWZhC41z87klO0oEHhEzQeaDxO/SOBasbMiws4ETuhulMgOR81UCAVobXMoOQJbfWg==
+"@angular/platform-browser-dynamic@^7.2.0-rc.0":
+  version "7.2.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.0-rc.0.tgz#5ea47d094c53a0ba34ecbb0dfdcef452fa05dc9a"
+  integrity sha512-uqT27oh9m58L6MUjgvT+7NpAFbigOnnTUWMsCLijNUKd7i37T6UxTVKPvuqNHlaLXsmDRxVHN3INI0IrWZ3R+w==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.1.0.tgz#0d40fed536a08d66ea580f6c4d2976310d559111"
-  integrity sha512-kCrmaNZukWaXk6qlvzyE1Dln/YB2XOGbhb9e+y3NE94beCgDTWseKViMevIoGm/H+Lzf0I2RPg8GMKkQ7pQwNQ==
+"@angular/platform-browser@^7.2.0-rc.0":
+  version "7.2.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.0-rc.0.tgz#c6d1f0b2328b1d81649bea70c23edc33de729015"
+  integrity sha512-r0ak7SVLWrivd4S0MXWmqNLeF6NNOBAopnjrhUu2j5I00u7/QfLrX0E5zRlJ8JkARVjer6Wm+D1ztlOWw5jHag==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-server@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.1.0.tgz#d5bfd11981abe7a6cae8788d9c102806a2ae7a2c"
-  integrity sha512-aQk62TT40dS1DtOvmbgVzz2bxB9iDn231AzIfJnsWJCwFqYF6sqwJQTIrdEyHYdSQDl7V+i40nJH6lSYjd3tBA==
+"@angular/platform-server@^7.2.0-rc.0":
+  version "7.2.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.2.0-rc.0.tgz#3c4e78c13b918a82e59f17d28eb508b173219ee9"
+  integrity sha512-C7zzHQRFbAQFL9NI1/Lg6wGnKrCg2luPlzegk0j+uw9hb/1fakadlASirNyNpckfzsB/54ZJQ6vU8JfZEQetQg==
   dependencies:
     domino "^2.1.0"
     tslib "^1.9.0"
     xhr2 "^0.1.4"
 
-"@angular/router@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.1.0.tgz#19b66e127065dfc2106793e81d660790422e73b0"
-  integrity sha512-yrjNvCj7XbXmZSmQfXGEkWJ9ogRZmIk5GHyOfGKNNRXhQK2OBznY0Avyer2r3mcgV/RLrI1FYQyKN9mdLftf6g==
+"@angular/router@^7.2.0-rc.0":
+  version "7.2.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.0-rc.0.tgz#b368583c68d9b3768261ef9f62e34695539b4bf4"
+  integrity sha512-OKJBzF8JhQQDLxBH6Yv8R1KRhrXu0L+VlIJGQhuw4p1z51WEHewnH7i9DAtRCMhaiXzy3QvoYTz1czrTIVyR0Q==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.1.0.tgz#35f287534febe40e71fc371d1893a5dffe8f5466"
-  integrity sha512-lmeJl8JDvmtDFM7h1gUs8vVsJhMuRKakBIwtQTWEX8TYRh/6fZCObHNjoGGps3BAPrgAbCyxJE2g3rhb/Y4YqA==
+"@angular/service-worker@^7.2.0-rc.0":
+  version "7.2.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.2.0-rc.0.tgz#bd3a223e37d7a79546ffef333ada66a6a11f10b2"
+  integrity sha512-61t9ecjPLzg/xvSPp6jL5vj3WmqXtOU04Re82xltcUZ51szYAmKeZ3q9K4ZEQCfDT+J0qTCsXDCOhHRL2TDfFg==
   dependencies:
     tslib "^1.9.0"
 
@@ -9925,10 +9925,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@3.1.6, typescript@~3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68"
-  integrity sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==
+typescript@3.2.2, typescript@~3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.2.tgz#fe8101c46aa123f8353523ebdcf5730c2ae493e5"
+  integrity sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==
 
 uglify-es@^3.3.4:
   version "3.3.9"

From 3e0128e110aae32fccc4fabc4c3f2aeaccd95144 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Wed, 19 Dec 2018 11:19:34 +0100
Subject: [PATCH 0542/1703] feat(@schematics/angular): add support for
 TypeScript 3.2 and Angular 7.2.0-rc.0

---
 packages/schematics/angular/package.json               | 2 +-
 packages/schematics/angular/utility/latest-versions.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/schematics/angular/package.json b/packages/schematics/angular/package.json
index 17fa20594002..00ab86792635 100644
--- a/packages/schematics/angular/package.json
+++ b/packages/schematics/angular/package.json
@@ -11,6 +11,6 @@
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
-    "typescript": "3.1.6"
+    "typescript": "3.2.2"
   }
 }
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index b90ae56a89fa..51f3b22d499d 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -8,10 +8,10 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~7.1.0',
+  Angular: '~7.2.0-rc.0',
   RxJs: '~6.3.3',
   ZoneJs: '~0.8.26',
-  TypeScript: '~3.1.6',
+  TypeScript: '~3.2.2',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
   DevkitBuildAngular: '~0.12.0-beta.2',

From ad9dd1fc3ed65567399acd3cc14e18c089e036ae Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Wed, 19 Dec 2018 11:20:02 +0100
Subject: [PATCH 0543/1703] feat(@schematics/schematics): add support for
 TypeScript 3.2

---
 packages/schematics/schematics/blank/project-files/package.json | 2 +-
 packages/schematics/schematics/schematic/files/package.json     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/schematics/blank/project-files/package.json b/packages/schematics/schematics/blank/project-files/package.json
index 2479ef312f33..d06d6ae0e37b 100644
--- a/packages/schematics/schematics/blank/project-files/package.json
+++ b/packages/schematics/schematics/blank/project-files/package.json
@@ -18,6 +18,6 @@
     "@types/jasmine": "^2.6.0",
     "@types/node": "^8.0.31",
     "jasmine": "^2.8.0",
-    "typescript": "~3.1.6"
+    "typescript": "~3.2.2"
   }
 }
diff --git a/packages/schematics/schematics/schematic/files/package.json b/packages/schematics/schematics/schematic/files/package.json
index 0c82a10e4339..5344c487a978 100644
--- a/packages/schematics/schematics/schematic/files/package.json
+++ b/packages/schematics/schematics/schematic/files/package.json
@@ -18,6 +18,6 @@
     "@types/jasmine": "^2.6.0",
     "@types/node": "^8.0.31",
     "jasmine": "^2.8.0",
-    "typescript": "~3.1.6"
+    "typescript": "~3.2.2"
   }
 }

From 8bded93d8af3541bb3d49a56f3738b8b128f3262 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Wed, 19 Dec 2018 11:27:55 +0100
Subject: [PATCH 0544/1703] fix(@ngtools/webpack): `import as` results in the
 alias being undefined with Typescript 3.2

When using the `specifier.propertyName` with `typeChecker.getSymbolAtLocation` it will return a more detailed symbol then we originally have in the `usedSymbols` set.

We should probably use `symbol.id` to actually check if the symbols are the same, however the `id` is not exposed in the Symbol interface.

Using `node.name` will return the same symbol that we have stored in the set.

Fixes #13212
---
 .../test/browser/aot_spec_large.ts            | 109 ++++++++++++++++++
 .../webpack/src/transformers/elide_imports.ts |   2 +-
 2 files changed, 110 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
index 86259541d359..1bbea3c2b586 100644
--- a/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
@@ -30,4 +30,113 @@ describe('Browser Builder AOT', () => {
       }),
     ).toPromise().then(done, done.fail);
   });
+
+  it('works with aliased imports', (done) => {
+    const overrides = { aot: true };
+
+    host.writeMultipleFiles({
+      'src/app/app.component.ts': `import { Component } from '@angular/core';
+       import { from as fromPromise } from 'rxjs';
+
+       @Component({
+         selector: 'app-root',
+         templateUrl: './app.component.html',
+         styleUrls: ['./app.component.css']
+       })
+       export class AppComponent {
+         title = 'app-component';
+
+         constructor() {
+           console.log(fromPromise(Promise.resolve('test')));
+         }
+       }`,
+    });
+
+    runTargetSpec(host, browserTargetSpec, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => {
+        const fileName = join(outputPath, 'main.js');
+        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
+        // if the aliased import was dropped this won't be rewired to a webpack module.
+        expect(content).toMatch(/rxjs__WEBPACK_IMPORTED_.+[\"from\"]/);
+        expect(content).not.toContain('fromPromise');
+      }),
+    ).toPromise().then(done, done.fail);
+  });
+
+  it('works with aliased imports from an exported object literal', (done) => {
+    const overrides = { aot: true };
+
+    host.writeMultipleFiles({
+      'src/foo.ts': `
+        import { from as fromPromise } from 'rxjs';
+        export { fromPromise };
+      `,
+      'src/app/app.component.ts': `
+      import { Component } from '@angular/core';
+      import { fromPromise } from '../foo';
+
+       @Component({
+         selector: 'app-root',
+         templateUrl: './app.component.html',
+         styleUrls: ['./app.component.css']
+       })
+       export class AppComponent {
+         title = 'app-component';
+
+         constructor() {
+           console.log(fromPromise(Promise.resolve('test')));
+         }
+       }`,
+    });
+
+    runTargetSpec(host, browserTargetSpec, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => {
+        const fileName = join(outputPath, 'main.js');
+        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
+        // if the aliased import was dropped this won't be rewired to a webpack module.
+        expect(content).toMatch(/rxjs__WEBPACK_IMPORTED_.+[\"from\"]/);
+        expect(content).toMatch(/rxjs__WEBPACK_IMPORTED_.+[\"fromPromise\"]/);
+      }),
+    ).toPromise().then(done, done.fail);
+  });
+
+  it('works with aliased imports from an alias export', (done) => {
+    const overrides = { aot: true };
+
+    host.writeMultipleFiles({
+      'src/foo.ts': `
+        export { from as fromPromise } from 'rxjs';
+      `,
+      'src/app/app.component.ts': `
+      import { Component } from '@angular/core';
+      import { fromPromise } from '../foo';
+
+       @Component({
+         selector: 'app-root',
+         templateUrl: './app.component.html',
+         styleUrls: ['./app.component.css']
+       })
+       export class AppComponent {
+         title = 'app-component';
+
+         constructor() {
+           console.log(fromPromise(Promise.resolve('test')));
+         }
+       }`,
+    });
+
+    runTargetSpec(host, browserTargetSpec, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => {
+        const fileName = join(outputPath, 'main.js');
+        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
+        // if the aliased import was dropped this won't be rewired to a webpack module.
+        expect(content).toMatch(/rxjs__WEBPACK_IMPORTED_.+[\"from\"]/);
+        expect(content).toMatch(/rxjs__WEBPACK_IMPORTED_.+[\"fromPromise\"]/);
+      }),
+    ).toPromise().then(done, done.fail);
+  });
+
 });
diff --git a/packages/ngtools/webpack/src/transformers/elide_imports.ts b/packages/ngtools/webpack/src/transformers/elide_imports.ts
index 0bdd9dea6d86..89fb55a8f88e 100644
--- a/packages/ngtools/webpack/src/transformers/elide_imports.ts
+++ b/packages/ngtools/webpack/src/transformers/elide_imports.ts
@@ -100,7 +100,7 @@ export function elideImports(
       // "import { XYZ, ... } from 'abc';"
       const specifierOps = [];
       for (const specifier of node.importClause.namedBindings.elements) {
-        if (isUnused(specifier.propertyName || specifier.name)) {
+        if (isUnused(specifier.name)) {
           specifierOps.push(new RemoveNodeOperation(sourceFile, specifier));
         }
       }

From 24d9318525e37c625d6a541c98dd713c90552758 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Wed, 19 Dec 2018 11:47:18 +0100
Subject: [PATCH 0545/1703] test: update api golden file

---
 etc/api/angular_devkit/schematics/tools/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/api/angular_devkit/schematics/tools/index.d.ts b/etc/api/angular_devkit/schematics/tools/index.d.ts
index 785039f4c799..328f5cc67fbe 100644
--- a/etc/api/angular_devkit/schematics/tools/index.d.ts
+++ b/etc/api/angular_devkit/schematics/tools/index.d.ts
@@ -147,4 +147,4 @@ export declare class SchematicNameCollisionException extends BaseException {
     constructor(name: string);
 }
 
-export declare function validateOptionsWithSchema(registry: schema.SchemaRegistry): <T extends {}>(schematic: FileSystemSchematicDescription, options: T, context?: import("@angular-devkit/schematics/src/engine/interface").TypedSchematicContext<import("@angular-devkit/schematics/tools/tools/description").FileSystemCollectionDescription, FileSystemSchematicDescription> | undefined) => Observable<T>;
+export declare function validateOptionsWithSchema(registry: schema.SchemaRegistry): <T extends {}>(schematic: FileSystemSchematicDescription, options: T, context?: import("@angular-devkit/schematics").TypedSchematicContext<import("@angular-devkit/schematics/tools/tools/description").FileSystemCollectionDescription, FileSystemSchematicDescription> | undefined) => Observable<T>;

From 5a02a83d563bcf1faf7c16dc00105184832e89fb Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 19 Dec 2018 19:54:45 +0000
Subject: [PATCH 0546/1703] build: update ajv to version 6.6.2

---
 package.json                                       | 2 +-
 packages/angular_devkit/build_angular/package.json | 2 +-
 packages/angular_devkit/core/package.json          | 2 +-
 yarn.lock                                          | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 6b6df6812fb0..0f84cb8f6fa9 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
     "@types/webpack-dev-server": "^3.1.0",
     "@types/webpack-sources": "^0.1.5",
     "@yarnpkg/lockfile": "1.1.0",
-    "ajv": "6.5.3",
+    "ajv": "6.6.2",
     "common-tags": "^1.8.0",
     "conventional-changelog": "^1.1.0",
     "conventional-commits-parser": "^3.0.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index eb88d06b103c..fc747a3a4346 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -11,7 +11,7 @@
     "@angular-devkit/build-webpack": "0.0.0",
     "@angular-devkit/core": "0.0.0",
     "@ngtools/webpack": "0.0.0",
-    "ajv": "6.5.3",
+    "ajv": "6.6.2",
     "autoprefixer": "9.4.3",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json
index b6ae6091af4f..eb30c9353dd7 100644
--- a/packages/angular_devkit/core/package.json
+++ b/packages/angular_devkit/core/package.json
@@ -8,7 +8,7 @@
     "core"
   ],
   "dependencies": {
-    "ajv": "6.5.3",
+    "ajv": "6.6.2",
     "chokidar": "2.0.4",
     "fast-json-stable-stringify": "2.0.0",
     "rxjs": "6.3.3",
diff --git a/yarn.lock b/yarn.lock
index 3c2b0f645dfd..60330493ae2f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -826,10 +826,10 @@ ajv-keywords@^3.1.0:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
   integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
 
-ajv@6.5.3:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9"
-  integrity sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==
+ajv@6.6.2:
+  version "6.6.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.2.tgz#caceccf474bf3fc3ce3b147443711a24063cc30d"
+  integrity sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"

From 25a277400b0245a0db8845f6762f33ff7dbbb6b1 Mon Sep 17 00:00:00 2001
From: Minko Gechev <mgechev@google.com>
Date: Wed, 19 Dec 2018 15:15:07 -0800
Subject: [PATCH 0547/1703] release: v7.2.0-rc.0

---
 .monorepo.json                                | 76 +++++++++----------
 .../angular/utility/latest-versions.ts        |  4 +-
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index 2ceb72e049ed..51ea18c63a32 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,16 +42,16 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.12.0-beta.2",
-      "hash": "6d499b7cc1fecfdca1ee530d68af2743"
+      "version": "0.12.0-rc.0",
+      "hash": "4eecb4a76317039defc5c2b4bd31e4f9"
     },
     "@_/builders": {
-      "version": "0.12.0-beta.2",
-      "hash": "a365103b30adf919f51d22b50194fdac"
+      "version": "0.12.0-rc.0",
+      "hash": "796f00a3b325334632fd8bb9d1b46b02"
     },
     "devkit": {
-      "version": "0.12.0-beta.2",
-      "hash": "a88a5c4369bdc3630c57b4e7d1adba2f"
+      "version": "0.12.0-rc.0",
+      "hash": "8cb2abef5a244ec6834bdaec41c10c65"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -62,15 +62,15 @@
           "url": "/packages/angular/cli/README.md"
         }
       ],
-      "version": "7.2.0-beta.2",
+      "version": "7.2.0-rc.0",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "4f0668deec9a8351949cd62a6215f9b5"
+      "hash": "d0a5c778b9c03df8abd13485e881feea"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.12.0-beta.2",
-      "hash": "c2e1da139fda43ec14cb64cfd897aa2c",
+      "version": "0.12.0-rc.0",
+      "hash": "3ed62177f8227f5b756a92863136cae4",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -81,21 +81,21 @@
           "url": "/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.12.0-beta.2",
-      "hash": "efc0359601df53132f8bee3928734709",
+      "version": "0.12.0-rc.0",
+      "hash": "d382c41402ef70445c5662faefbe959d",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.12.0-beta.2",
-      "hash": "4b5c5b53f2b42d05a09540a2cf43f043",
+      "version": "0.12.0-rc.0",
+      "hash": "1c9d6b5574b4021d1ba6bf5f69cd580b",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
       "name": "Benchmark",
       "section": "Tooling",
-      "version": "1.1.0-beta.2",
-      "hash": "ab57042eab08c6a6b2534aab8ca8bf39"
+      "version": "1.1.0-rc.0",
+      "hash": "d33b6fb20d1b8a12e9f019f3e3987d0c"
     },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
@@ -105,8 +105,8 @@
           "url": "/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.12.0-beta.2",
-      "hash": "3926ec467580658d8ef1252d70c747ac",
+      "version": "0.12.0-rc.0",
+      "hash": "52a7d57f1714fc165d83d478af637926",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -117,8 +117,8 @@
           "url": "/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.12.0-beta.2",
-      "hash": "62d5216fc50b7891ddf02d0b967d5d7f",
+      "version": "0.12.0-rc.0",
+      "hash": "c84a861c274827aae116a72b961cf424",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -129,8 +129,8 @@
           "url": "/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.12.0-beta.2",
-      "hash": "38a6a211d7b675d00b217a795deffa74",
+      "version": "0.12.0-rc.0",
+      "hash": "ae32dea620c757fc8348cdeea63f3f85",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -141,9 +141,9 @@
           "url": "/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-rc.0",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "b4f84ae743a2c0fa26fc98335c23a035"
+      "hash": "2de37a912e57077f67da4dee818b1769"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -153,8 +153,8 @@
           "url": "/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "7.2.0-beta.2",
-      "hash": "d03ae41f4379bb7a0bdb9a07b4a1940c",
+      "version": "7.2.0-rc.0",
+      "hash": "7b0286aca578c60324c5efa4597cdc9d",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -165,43 +165,43 @@
           "url": "/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "7.2.0-beta.2",
-      "hash": "9eb31b36b046e77ec97716782a5e560f",
+      "version": "7.2.0-rc.0",
+      "hash": "c282e38cd60531cffb93a0fd3c30feb2",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.12.0-beta.2",
-      "hash": "3c86a3ea224824d96929b7d070fc8640",
+      "version": "0.12.0-rc.0",
+      "hash": "eec7ff8704cff8d7673aab1bcb5c38b7",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "7.2.0-beta.2",
+      "version": "7.2.0-rc.0",
       "section": "Misc",
-      "hash": "c6313537a351ab4cebedb9304f8e72dc",
+      "hash": "1d89a340c12d65afffa8f2d0f641601c",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "7.2.0-beta.2",
-      "hash": "3db6f68537d632af47e2d9b2436ec709",
+      "version": "7.2.0-rc.0",
+      "hash": "ec595b6e0d6dc11d134e79e3010a3cc2",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-rc.0",
       "section": "Schematics",
-      "hash": "b46f7e6b0cc32be9ced8ba699de050db",
+      "hash": "e8e0efbd01906eddf9eb0dd1087a78f5",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.12.0-beta.2",
+      "version": "0.12.0-rc.0",
       "section": "Schematics",
-      "hash": "40f04f82263df788028797d32e99c352",
+      "hash": "0f8c64183dec8611c8986c6456cf932b",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 51f3b22d499d..23487689ba7f 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -14,6 +14,6 @@ export const latestVersions = {
   TypeScript: '~3.2.2',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.12.0-beta.2',
-  DevkitBuildNgPackagr: '~0.12.0-beta.2',
+  DevkitBuildAngular: '~0.12.0-rc.0',
+  DevkitBuildNgPackagr: '~0.12.0-rc.0',
 };

From 2bf376516b83197599e75341cd2495ebf5ce9ec0 Mon Sep 17 00:00:00 2001
From: Tiago Temporin <tiaguinhocab@gmail.com>
Date: Tue, 11 Dec 2018 10:31:30 +0000
Subject: [PATCH 0548/1703] fix(@schematics/update): ignore npm 404 error

Fixes 10614

style(@schematics/update): lint error

fix(@schematics/update): remove full stack trace

style(@schematics/update): organize import order

refactor(@schematics/update): use empty constant
---
 packages/schematics/update/update/npm.ts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/schematics/update/update/npm.ts b/packages/schematics/update/update/npm.ts
index 9e3e9e3a4811..cea0ff5c83b8 100644
--- a/packages/schematics/update/update/npm.ts
+++ b/packages/schematics/update/update/npm.ts
@@ -9,8 +9,8 @@ import { logging } from '@angular-devkit/core';
 import { existsSync, readFileSync } from 'fs';
 import { homedir } from 'os';
 import * as path from 'path';
-import { Observable, from } from 'rxjs';
-import { shareReplay } from 'rxjs/operators';
+import { EMPTY, Observable, from } from 'rxjs';
+import { catchError, shareReplay } from 'rxjs/operators';
 import { NpmRepositoryPackageJson } from './npm-package-json';
 
 const ini = require('ini');
@@ -133,7 +133,15 @@ export function getNpmPackageJson(
     },
   );
 
-  const response = from<NpmRepositoryPackageJson>(resultPromise).pipe(shareReplay());
+  // TODO: find some way to test this
+  const response = from<NpmRepositoryPackageJson>(resultPromise).pipe(
+    shareReplay(),
+    catchError(err => {
+      logger.warn(err.message || err);
+
+      return EMPTY;
+    }),
+  );
   npmPackageJsonCache.set(packageName, response);
 
   return response;

From 02c52515928650e160b5155d9c7c66e30d189d80 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 19 Dec 2018 17:09:17 +0100
Subject: [PATCH 0549/1703] ci: add labels to Prs opened by renovate

---
 renovate.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/renovate.json b/renovate.json
index 24ddeca3c4a2..d62ddff98180 100644
--- a/renovate.json
+++ b/renovate.json
@@ -5,6 +5,9 @@
   "commitMessage": "{{semanticPrefix}} update {{depName}} to version {{newVersion}}",
   "separateMajorMinor": false,
   "prHourlyLimit": 2,
+  "labels": [
+    "PR target: master-only"
+  ],
   "timezone": "America/Tijuana",
   "schedule": [
     "after 10pm every weekday",

From 1e97eb124f775a196a2f3c0b13579173dc8bd768 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@umich.edu>
Date: Wed, 19 Dec 2018 14:04:20 -0800
Subject: [PATCH 0550/1703] fix(@schematics/angular): assert no error logs in
 e2e

This commit adds an assertion to the e2e test to make sure there are
no error logs emitted by the browser.
---
 .../schematics/angular/e2e/files/src/app.e2e-spec.ts     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/schematics/angular/e2e/files/src/app.e2e-spec.ts b/packages/schematics/angular/e2e/files/src/app.e2e-spec.ts
index 7f2323bf37cf..fb169a4ded40 100644
--- a/packages/schematics/angular/e2e/files/src/app.e2e-spec.ts
+++ b/packages/schematics/angular/e2e/files/src/app.e2e-spec.ts
@@ -1,4 +1,5 @@
 import { AppPage } from './app.po';
+import { browser, logging } from 'protractor';
 
 describe('workspace-project App', () => {
   let page: AppPage;
@@ -11,4 +12,12 @@ describe('workspace-project App', () => {
     page.navigateTo();
     expect(page.getTitleText()).toEqual('Welcome to <%= relatedAppName %>!');
   });
+
+  afterEach(async () => {
+    // Assert that there are no errors emitted from the browser
+    const logs = await browser.manage().logs().get(logging.Type.BROWSER);
+    expect(logs).not.toContain(jasmine.objectContaining({
+      level: logging.Level.SEVERE,
+    }));
+  });
 });

From 719d6abdbcfd269561e7d65ef896dc397b1d21a9 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 20 Dec 2018 06:32:04 +0000
Subject: [PATCH 0551/1703] build: update mini-css-extract-plugin to version
 0.5.0

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index fc747a3a4346..f489c04869ad 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -25,7 +25,7 @@
     "less-loader": "4.1.0",
     "license-webpack-plugin": "2.0.4",
     "loader-utils": "1.1.0",
-    "mini-css-extract-plugin": "0.4.4",
+    "mini-css-extract-plugin": "0.5.0",
     "minimatch": "3.0.4",
     "parse5": "4.0.0",
     "opn": "5.3.0",
diff --git a/yarn.lock b/yarn.lock
index 60330493ae2f..addf43ed1fd0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6292,10 +6292,10 @@ mimic-response@^1.0.0:
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
   integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
 
-mini-css-extract-plugin@0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.4.tgz#c10410a004951bd3cedac1da69053940fccb625d"
-  integrity sha512-o+Jm+ocb0asEngdM6FsZWtZsRzA8koFUudIDwYUfl94M3PejPHG7Vopw5hN9V8WsMkSFpm3tZP3Fesz89EyrfQ==
+mini-css-extract-plugin@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz#ac0059b02b9692515a637115b0cc9fed3a35c7b0"
+  integrity sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==
   dependencies:
     loader-utils "^1.1.0"
     schema-utils "^1.0.0"

From acca02383d70d87263ae7f92e6c7398b3a28fe2b Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 20 Dec 2018 06:32:21 +0000
Subject: [PATCH 0552/1703] build: update node-sass to version 4.11.0

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index f489c04869ad..675a57658047 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -54,7 +54,7 @@
     "webpack-subresource-integrity": "1.1.0-rc.6"
   },
   "optionalDependencies": {
-    "node-sass": "4.10.0"
+    "node-sass": "4.11.0"
   },
   "devDependencies": {
     "@angular/animations": "^7.2.0-rc.0",
diff --git a/yarn.lock b/yarn.lock
index addf43ed1fd0..a020e331c0a6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6656,10 +6656,10 @@ node-sass-tilde-importer@^1.0.0:
   dependencies:
     find-parent-dir "^0.3.0"
 
-node-sass@4.10.0:
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.10.0.tgz#dcc2b364c0913630945ccbf7a2bbf1f926effca4"
-  integrity sha512-fDQJfXszw6vek63Fe/ldkYXmRYK/QS6NbvM3i5oEo9ntPDy4XX7BcKZyTKv+/kSSxRtXXc7l+MSwEmYc0CSy6Q==
+node-sass@4.11.0:
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a"
+  integrity sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"

From e1c9eec86a5a98fcd3601d6d67232876cdf19167 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 20 Dec 2018 07:26:56 +0000
Subject: [PATCH 0553/1703] build: update opn to version 5.4.0

---
 packages/angular/cli/package.json                  | 2 +-
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 9 +--------
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index ee2bc7fdd32c..f328445a0ebd 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -32,7 +32,7 @@
     "@schematics/angular": "0.0.0",
     "@schematics/update": "0.0.0",
     "inquirer": "6.2.1",
-    "opn": "5.3.0",
+    "opn": "5.4.0",
     "semver": "5.5.1",
     "symbol-observable": "1.2.0"
   },
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 675a57658047..5da5ff3ea668 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -28,7 +28,7 @@
     "mini-css-extract-plugin": "0.5.0",
     "minimatch": "3.0.4",
     "parse5": "4.0.0",
-    "opn": "5.3.0",
+    "opn": "5.4.0",
     "portfinder": "1.0.17",
     "postcss": "7.0.5",
     "postcss-import": "12.0.0",
diff --git a/yarn.lock b/yarn.lock
index a020e331c0a6..7de05b1a384c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7018,14 +7018,7 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-opn@5.3.0:
-  version "5.3.0"
-  resolved "http://registry.npmjs.org/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
-  integrity sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==
-  dependencies:
-    is-wsl "^1.1.0"
-
-opn@^5.1.0:
+opn@5.4.0, opn@^5.1.0:
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
   integrity sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==

From 7beb07b148c4761ef37efebdeb8397930e2088c8 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 20 Dec 2018 07:27:07 +0000
Subject: [PATCH 0554/1703] build: update pacote to version 9.2.3

---
 packages/schematics/update/package.json |  2 +-
 yarn.lock                               | 37 ++-----------------------
 2 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index 5d88f9179dd9..0dabc3579734 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -14,7 +14,7 @@
     "@angular-devkit/schematics": "0.0.0",
     "@yarnpkg/lockfile": "1.1.0",
     "ini": "1.3.5",
-    "pacote": "9.1.1",
+    "pacote": "9.2.3",
     "semver": "5.5.1",
     "semver-intersect": "1.4.0",
     "rxjs": "6.3.3"
diff --git a/yarn.lock b/yarn.lock
index 7de05b1a384c..386876139569 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6849,7 +6849,7 @@ npm-packlist@^1.1.6:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
-npm-pick-manifest@^2.1.0, npm-pick-manifest@^2.2.3:
+npm-pick-manifest@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40"
   integrity sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==
@@ -7210,40 +7210,7 @@ package-json@^4.0.0:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
-pacote@9.1.1:
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.1.1.tgz#25091f75a25021de8be8d34cc6408728fca3579b"
-  integrity sha512-f28Rq5ozzKAA9YwIKw61/ipwAatUZseYmVssDbHHaexF0wRIVotapVEZPAjOT7Eu3LYVqEp0NVpNizoAnYBUaA==
-  dependencies:
-    bluebird "^3.5.2"
-    cacache "^11.2.0"
-    figgy-pudding "^3.5.1"
-    get-stream "^4.1.0"
-    glob "^7.1.3"
-    lru-cache "^4.1.3"
-    make-fetch-happen "^4.0.1"
-    minimatch "^3.0.4"
-    minipass "^2.3.5"
-    mississippi "^3.0.0"
-    mkdirp "^0.5.1"
-    normalize-package-data "^2.4.0"
-    npm-package-arg "^6.1.0"
-    npm-packlist "^1.1.12"
-    npm-pick-manifest "^2.1.0"
-    npm-registry-fetch "^3.8.0"
-    osenv "^0.1.5"
-    promise-inflight "^1.0.1"
-    promise-retry "^1.1.1"
-    protoduck "^5.0.1"
-    rimraf "^2.6.2"
-    safe-buffer "^5.1.2"
-    semver "^5.6.0"
-    ssri "^6.0.1"
-    tar "^4.4.6"
-    unique-filename "^1.1.1"
-    which "^1.3.1"
-
-pacote@^9.2.3:
+pacote@9.2.3, pacote@^9.2.3:
   version "9.2.3"
   resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.2.3.tgz#48cfe87beb9177acd6594355a584a538835424b3"
   integrity sha512-Y3+yY3nBRAxMlZWvr62XLJxOwCmG9UmkGZkFurWHoCjqF0cZL72cTOCRJTvWw8T4OhJS2RTg13x4oYYriauvEw==

From bdef022ea247458b58147b6139c1353c2edb1e55 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 20 Dec 2018 11:53:12 +0000
Subject: [PATCH 0555/1703] build: update tree-kill to version 1.2.1

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 packages/ngtools/webpack/package.json              | 2 +-
 yarn.lock                                          | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 5da5ff3ea668..ea18a8f4fb47 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -44,7 +44,7 @@
     "style-loader": "0.23.1",
     "stylus": "0.54.5",
     "stylus-loader": "3.0.2",
-    "tree-kill": "1.2.0",
+    "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.1.0",
     "webpack": "4.23.1",
     "webpack-dev-middleware": "3.4.0",
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 5b01ef4bc0f1..e6960ebbf279 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -24,7 +24,7 @@
     "@angular-devkit/core": "0.0.0",
     "enhanced-resolve": "4.1.0",
     "rxjs": "6.3.3",
-    "tree-kill": "1.2.0",
+    "tree-kill": "1.2.1",
     "webpack-sources": "1.2.0"
   },
   "peerDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 386876139569..364a695ced36 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9714,7 +9714,12 @@ tough-cookie@~2.4.3:
     psl "^1.1.24"
     punycode "^1.4.1"
 
-tree-kill@1.2.0, tree-kill@^1.2.0:
+tree-kill@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.1.tgz#5398f374e2f292b9dcc7b2e71e30a5c3bb6c743a"
+  integrity sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==
+
+tree-kill@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36"
   integrity sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==

From 5e6b42c5e353ea8fb28d2f8e3852218b534da02a Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Thu, 20 Dec 2018 11:46:08 +0100
Subject: [PATCH 0556/1703] test: add tests for elide imports This also adds
 the option to provide addition files when using `createTypescriptContext`
 this is paramount for the elide imports tests as without this certain symbols
 won't have the full details.

Which will cause tests to be false positive and re-surface issues like #13212
---
 .../test/browser/aot_spec_large.ts            | 109 --------
 .../webpack/src/transformers/ast_helpers.ts   |   9 +-
 .../src/transformers/elide_imports_spec.ts    | 263 ++++++++++++++++++
 3 files changed, 271 insertions(+), 110 deletions(-)
 create mode 100644 packages/ngtools/webpack/src/transformers/elide_imports_spec.ts

diff --git a/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
index 1bbea3c2b586..86259541d359 100644
--- a/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
@@ -30,113 +30,4 @@ describe('Browser Builder AOT', () => {
       }),
     ).toPromise().then(done, done.fail);
   });
-
-  it('works with aliased imports', (done) => {
-    const overrides = { aot: true };
-
-    host.writeMultipleFiles({
-      'src/app/app.component.ts': `import { Component } from '@angular/core';
-       import { from as fromPromise } from 'rxjs';
-
-       @Component({
-         selector: 'app-root',
-         templateUrl: './app.component.html',
-         styleUrls: ['./app.component.css']
-       })
-       export class AppComponent {
-         title = 'app-component';
-
-         constructor() {
-           console.log(fromPromise(Promise.resolve('test')));
-         }
-       }`,
-    });
-
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'main.js');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        // if the aliased import was dropped this won't be rewired to a webpack module.
-        expect(content).toMatch(/rxjs__WEBPACK_IMPORTED_.+[\"from\"]/);
-        expect(content).not.toContain('fromPromise');
-      }),
-    ).toPromise().then(done, done.fail);
-  });
-
-  it('works with aliased imports from an exported object literal', (done) => {
-    const overrides = { aot: true };
-
-    host.writeMultipleFiles({
-      'src/foo.ts': `
-        import { from as fromPromise } from 'rxjs';
-        export { fromPromise };
-      `,
-      'src/app/app.component.ts': `
-      import { Component } from '@angular/core';
-      import { fromPromise } from '../foo';
-
-       @Component({
-         selector: 'app-root',
-         templateUrl: './app.component.html',
-         styleUrls: ['./app.component.css']
-       })
-       export class AppComponent {
-         title = 'app-component';
-
-         constructor() {
-           console.log(fromPromise(Promise.resolve('test')));
-         }
-       }`,
-    });
-
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'main.js');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        // if the aliased import was dropped this won't be rewired to a webpack module.
-        expect(content).toMatch(/rxjs__WEBPACK_IMPORTED_.+[\"from\"]/);
-        expect(content).toMatch(/rxjs__WEBPACK_IMPORTED_.+[\"fromPromise\"]/);
-      }),
-    ).toPromise().then(done, done.fail);
-  });
-
-  it('works with aliased imports from an alias export', (done) => {
-    const overrides = { aot: true };
-
-    host.writeMultipleFiles({
-      'src/foo.ts': `
-        export { from as fromPromise } from 'rxjs';
-      `,
-      'src/app/app.component.ts': `
-      import { Component } from '@angular/core';
-      import { fromPromise } from '../foo';
-
-       @Component({
-         selector: 'app-root',
-         templateUrl: './app.component.html',
-         styleUrls: ['./app.component.css']
-       })
-       export class AppComponent {
-         title = 'app-component';
-
-         constructor() {
-           console.log(fromPromise(Promise.resolve('test')));
-         }
-       }`,
-    });
-
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'main.js');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        // if the aliased import was dropped this won't be rewired to a webpack module.
-        expect(content).toMatch(/rxjs__WEBPACK_IMPORTED_.+[\"from\"]/);
-        expect(content).toMatch(/rxjs__WEBPACK_IMPORTED_.+[\"fromPromise\"]/);
-      }),
-    ).toPromise().then(done, done.fail);
-  });
-
 });
diff --git a/packages/ngtools/webpack/src/transformers/ast_helpers.ts b/packages/ngtools/webpack/src/transformers/ast_helpers.ts
index 1c894b5bbafa..57cf11e720ad 100644
--- a/packages/ngtools/webpack/src/transformers/ast_helpers.ts
+++ b/packages/ngtools/webpack/src/transformers/ast_helpers.ts
@@ -45,12 +45,13 @@ export function getLastNode(sourceFile: ts.SourceFile): ts.Node | null {
 const basePath = '/project/src/';
 const fileName = basePath + 'test-file.ts';
 
-export function createTypescriptContext(content: string) {
+export function createTypescriptContext(content: string, additionalFiles?: Record<string, string>) {
   // Set compiler options.
   const compilerOptions: ts.CompilerOptions = {
     noEmitOnError: false,
     allowJs: true,
     newLine: ts.NewLineKind.LineFeed,
+    moduleResolution: ts.ModuleResolutionKind.NodeJs,
     target: ts.ScriptTarget.ESNext,
     skipLibCheck: true,
     sourceMap: false,
@@ -68,6 +69,12 @@ export function createTypescriptContext(content: string) {
   // Add a dummy file to host content.
   compilerHost.writeFile(fileName, content, false);
 
+  if (additionalFiles) {
+    for (const key in additionalFiles) {
+      compilerHost.writeFile(basePath + key, additionalFiles[key], false);
+    }
+  }
+
   // Create the TypeScript program.
   const program = ts.createProgram([fileName], compilerOptions, compilerHost);
 
diff --git a/packages/ngtools/webpack/src/transformers/elide_imports_spec.ts b/packages/ngtools/webpack/src/transformers/elide_imports_spec.ts
new file mode 100644
index 000000000000..07ae53b5b173
--- /dev/null
+++ b/packages/ngtools/webpack/src/transformers/elide_imports_spec.ts
@@ -0,0 +1,263 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// tslint:disable:no-big-function
+import { tags } from '@angular-devkit/core';  // tslint:disable-line:no-implicit-dependencies
+import * as ts from 'typescript';
+import { createTypescriptContext, getLastNode, transformTypescript } from './ast_helpers';
+import { RemoveNodeOperation } from './interfaces';
+import { makeTransform } from './make_transform';
+
+describe('@ngtools/webpack transformers', () => {
+  describe('elide_imports', () => {
+
+    const dummyNode = `const remove = ''`;
+
+    const transformer = (program: ts.Program) => (
+      makeTransform(
+        (sourceFile: ts.SourceFile) =>
+          [new RemoveNodeOperation(sourceFile, getLastNode(sourceFile) as ts.Node)],
+        () => program.getTypeChecker(),
+      )
+    );
+
+    const additionalFiles: Record<string, string> = {
+      'const.ts': `
+        export const promise = () => null;
+        export const take = () => null;
+        export default promise;
+      `,
+    };
+
+    it('should remove unused aliased imports', () => {
+      const input = tags.stripIndent`
+        import { promise as fromPromise } from './const';
+        const unused = fromPromise;
+      `;
+
+      const { program, compilerHost } = createTypescriptContext(input, additionalFiles);
+      const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
+
+      expect(tags.oneLine`${result}`).toEqual('');
+    });
+
+    it('should retain used aliased imports', () => {
+      const input = tags.stripIndent`
+        import { promise as fromPromise } from './const';
+        const used = fromPromise;
+
+        ${dummyNode}
+      `;
+
+      const output = tags.stripIndent`
+        import { promise as fromPromise } from './const';
+        const used = fromPromise;
+      `;
+
+      const { program, compilerHost } = createTypescriptContext(input, additionalFiles);
+      const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
+
+      expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it('should retain used namespaced imports', () => {
+      const input = tags.stripIndent`
+        import * as namespaced from './const';
+        const used = namespaced;
+
+        ${dummyNode}
+      `;
+
+      const output = tags.stripIndent`
+        import * as namespaced from './const';
+        const used = namespaced;
+      `;
+
+      const { program, compilerHost } = createTypescriptContext(input, additionalFiles);
+      const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
+
+      expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it('should drop unused namespaced imports', () => {
+      const input = tags.stripIndent`
+        import * as namespaced from './const';
+        const used = namespaced;
+      `;
+
+      const { program, compilerHost } = createTypescriptContext(input, additionalFiles);
+      const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
+
+      expect(tags.oneLine`${result}`).toEqual('');
+    });
+
+    it('should drop unused imports in export specifier', () => {
+      const input = tags.stripIndent`
+        import { promise as fromPromise } from './const';
+        export { fromPromise };
+      `;
+
+      const { program, compilerHost } = createTypescriptContext(input, additionalFiles);
+      const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
+
+      expect(tags.oneLine`${result}`).toEqual('');
+    });
+
+    it('should retain used imports in export specifier', () => {
+      const input = tags.stripIndent`
+        import { promise as fromPromise } from './const';
+        export { fromPromise };
+
+        ${dummyNode}
+      `;
+
+      const output = tags.stripIndent`
+        import { promise as fromPromise } from './const';
+        export { fromPromise };
+      `;
+
+      const { program, compilerHost } = createTypescriptContext(input, additionalFiles);
+      const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
+
+      expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it('should drop unused in shorthand property assignment', () => {
+      const input = tags.stripIndent`
+        import { promise as fromPromise } from './const';
+        const unused = { fromPromise };
+      `;
+
+      const { program, compilerHost } = createTypescriptContext(input, additionalFiles);
+      const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
+
+      expect(tags.oneLine`${result}`).toEqual('');
+    });
+
+    it('should retain used imports in shorthand property assignment', () => {
+      const input = tags.stripIndent`
+        import { promise as fromPromise } from './const';
+        const used = { fromPromise };
+
+        ${dummyNode}
+      `;
+
+      const output = tags.stripIndent`
+        import { promise as fromPromise } from './const';
+        const used = { fromPromise };
+      `;
+
+      const { program, compilerHost } = createTypescriptContext(input, additionalFiles);
+      const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
+
+      expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it('should drop unused default import', () => {
+      const input = tags.stripIndent`
+        import defaultPromise from './const';
+        const unused = defaultPromise;
+      `;
+
+      const { program, compilerHost } = createTypescriptContext(input, additionalFiles);
+      const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
+
+      expect(tags.oneLine`${result}`).toEqual('');
+    });
+
+    it('should retain used default import', () => {
+      const input = tags.stripIndent`
+        import defaultPromise from './const';
+        const used = defaultPromise;
+
+        ${dummyNode}
+      `;
+
+      const output = tags.stripIndent`
+        import defaultPromise from './const';
+        const used = defaultPromise;
+      `;
+
+      const { program, compilerHost } = createTypescriptContext(input, additionalFiles);
+      const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
+
+      expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it('should only drop unused default imports when named and default', () => {
+      const input = tags.stripIndent`
+        import promise, { promise as fromPromise } from './const';
+        const used = fromPromise;
+        const unused = promise;
+      `;
+
+      const output = tags.stripIndent`
+        import { promise as fromPromise } from './const';
+        const used = fromPromise;
+      `;
+
+      const { program, compilerHost } = createTypescriptContext(input, additionalFiles);
+      const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
+
+      expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it('should only drop unused named imports when named and default', () => {
+      const input = tags.stripIndent`
+        import promise, { promise as fromPromise, take } from './const';
+        const used = fromPromise;
+        const unused = promise;
+      `;
+
+      const output = tags.stripIndent`
+        import { promise as fromPromise } from './const';
+        const used = fromPromise;
+      `;
+
+      const { program, compilerHost } = createTypescriptContext(input, additionalFiles);
+      const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
+
+      expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it('should only drop default imports when having named and default', () => {
+      const input = tags.stripIndent`
+        import promise, { fromPromise } from './const';
+        const used = promise;
+        const unused = fromPromise;
+      `;
+
+      const output = tags.stripIndent`
+        import promise from './const';
+        const used = promise;
+      `;
+
+      const { program, compilerHost } = createTypescriptContext(input, additionalFiles);
+      const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
+
+      expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it('should retain import clause', () => {
+      const input = tags.stripIndent`
+        import './const';
+
+        ${dummyNode}
+      `;
+
+      const output = tags.stripIndent`
+        import './const';
+      `;
+
+      const { program, compilerHost } = createTypescriptContext(input, additionalFiles);
+      const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
+
+      expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+    });
+
+  });
+});

From 5e294ec7e068ae0bc1df798eb6b92e9559fbb5c5 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Thu, 20 Dec 2018 12:23:07 +0100
Subject: [PATCH 0557/1703] fix(@ngtools/webpack): drop only unused default
 import when used with named imports

At the moment when having a default import together with a named import example:
```
import abc, { def } from './foo';
```

And the default import becomes unused it will drop the entire node which will caused used named imports to be dropped as well.
---
 .../webpack/src/transformers/elide_imports.ts | 49 +++++++++++++------
 1 file changed, 33 insertions(+), 16 deletions(-)

diff --git a/packages/ngtools/webpack/src/transformers/elide_imports.ts b/packages/ngtools/webpack/src/transformers/elide_imports.ts
index 89fb55a8f88e..ca4d88a525bc 100644
--- a/packages/ngtools/webpack/src/transformers/elide_imports.ts
+++ b/packages/ngtools/webpack/src/transformers/elide_imports.ts
@@ -31,7 +31,7 @@ export function elideImports(
   // Collect all imports and used identifiers
   const specialCaseNames = new Set<string>();
   const usedSymbols = new Set<ts.Symbol>();
-  const imports = [] as ts.ImportDeclaration[];
+  const imports: ts.ImportDeclaration[] = [];
   ts.forEachChild(sourceFile, function visit(node) {
     // Skip removed nodes
     if (removedNodes.includes(node)) {
@@ -84,28 +84,45 @@ export function elideImports(
       continue;
     }
 
-    if (node.importClause.name) {
-      // "import XYZ from 'abc';"
-      if (isUnused(node.importClause.name)) {
-        ops.push(new RemoveNodeOperation(sourceFile, node));
-      }
-    } else if (node.importClause.namedBindings
-               && ts.isNamespaceImport(node.importClause.namedBindings)) {
+    const namedBindings = node.importClause.namedBindings;
+
+    if (namedBindings && ts.isNamespaceImport(namedBindings)) {
       // "import * as XYZ from 'abc';"
-      if (isUnused(node.importClause.namedBindings.name)) {
+      if (isUnused(namedBindings.name)) {
         ops.push(new RemoveNodeOperation(sourceFile, node));
       }
-    } else if (node.importClause.namedBindings
-               && ts.isNamedImports(node.importClause.namedBindings)) {
-      // "import { XYZ, ... } from 'abc';"
+    } else {
       const specifierOps = [];
-      for (const specifier of node.importClause.namedBindings.elements) {
-        if (isUnused(specifier.name)) {
-          specifierOps.push(new RemoveNodeOperation(sourceFile, specifier));
+      let clausesCount = 0;
+
+      // "import { XYZ, ... } from 'abc';"
+      if (namedBindings && ts.isNamedImports(namedBindings)) {
+        let removedClausesCount = 0;
+        clausesCount += namedBindings.elements.length;
+
+        for (const specifier of namedBindings.elements) {
+          if (isUnused(specifier.name)) {
+            removedClausesCount++;
+            // in case we don't have any more namedImports we should remove the parent ie the {}
+            const nodeToRemove = clausesCount === removedClausesCount
+              ? specifier.parent
+              : specifier;
+
+            specifierOps.push(new RemoveNodeOperation(sourceFile, nodeToRemove));
+          }
+        }
+      }
+
+      // "import XYZ from 'abc';"
+      if (node.importClause.name) {
+        clausesCount++;
+
+        if (isUnused(node.importClause.name)) {
+          specifierOps.push(new RemoveNodeOperation(sourceFile, node.importClause.name));
         }
       }
 
-      if (specifierOps.length === node.importClause.namedBindings.elements.length) {
+      if (specifierOps.length === clausesCount) {
         ops.push(new RemoveNodeOperation(sourceFile, node));
       } else {
         ops.push(...specifierOps);

From 3bc347cf47ce267a6a077dd139c266039de92303 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Thu, 20 Dec 2018 15:45:22 +0100
Subject: [PATCH 0558/1703] refactor: use `getExportSpecifierLocalTargetSymbol`
 and `getShorthandAssignmentValueSymbol` to handle symbols lookups

Use typechecker methods to handle special cases for `ExportSpecifier` and `ShorthandPropertyAssignment`
---
 .../webpack/src/transformers/elide_imports.ts | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/packages/ngtools/webpack/src/transformers/elide_imports.ts b/packages/ngtools/webpack/src/transformers/elide_imports.ts
index ca4d88a525bc..c7b2cd10654e 100644
--- a/packages/ngtools/webpack/src/transformers/elide_imports.ts
+++ b/packages/ngtools/webpack/src/transformers/elide_imports.ts
@@ -29,9 +29,9 @@ export function elideImports(
   const typeChecker = getTypeChecker();
 
   // Collect all imports and used identifiers
-  const specialCaseNames = new Set<string>();
   const usedSymbols = new Set<ts.Symbol>();
   const imports: ts.ImportDeclaration[] = [];
+
   ts.forEachChild(sourceFile, function visit(node) {
     // Skip removed nodes
     if (removedNodes.includes(node)) {
@@ -45,20 +45,22 @@ export function elideImports(
       return;
     }
 
-    if (ts.isIdentifier(node)) {
-      const symbol = typeChecker.getSymbolAtLocation(node);
-      if (symbol) {
-        usedSymbols.add(symbol);
-      }
-    } else if (ts.isExportSpecifier(node)) {
-      // Export specifiers return the non-local symbol from the above
-      // so check the name string instead
-      specialCaseNames.add((node.propertyName || node.name).text);
+    let symbol: ts.Symbol | undefined;
+
+    switch (node.kind) {
+      case ts.SyntaxKind.Identifier:
+        symbol = typeChecker.getSymbolAtLocation(node);
+        break;
+      case ts.SyntaxKind.ExportSpecifier:
+        symbol = typeChecker.getExportSpecifierLocalTargetSymbol(node as ts.ExportSpecifier);
+        break;
+      case ts.SyntaxKind.ShorthandPropertyAssignment:
+        symbol = typeChecker.getShorthandAssignmentValueSymbol(node);
+        break;
+    }
 
-      return;
-    } else if (ts.isShorthandPropertyAssignment(node)) {
-      // Shorthand property assignments return the object property's symbol not the import's
-      specialCaseNames.add(node.name.text);
+    if (symbol) {
+      usedSymbols.add(symbol);
     }
 
     ts.forEachChild(node, visit);
@@ -69,10 +71,6 @@ export function elideImports(
   }
 
   const isUnused = (node: ts.Identifier) => {
-    if (specialCaseNames.has(node.text)) {
-      return false;
-    }
-
     const symbol = typeChecker.getSymbolAtLocation(node);
 
     return symbol && !usedSymbols.has(symbol);

From 60d1afcfdaf666fa5e0aa3dc9825ef07c9a35075 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 20 Dec 2018 11:53:25 +0000
Subject: [PATCH 0559/1703] build: update tslint-no-circular-imports to version
 ^0.6.0

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 0f84cb8f6fa9..40585cde4a4a 100644
--- a/package.json
+++ b/package.json
@@ -122,7 +122,7 @@
     "through2": "^2.0.3",
     "tree-kill": "^1.2.0",
     "ts-node": "^5.0.0",
-    "tslint-no-circular-imports": "^0.5.0",
+    "tslint-no-circular-imports": "^0.6.0",
     "tslint-sonarts": "^1.7.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 364a695ced36..15d21189c1b8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9799,10 +9799,10 @@ tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
   integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
-tslint-no-circular-imports@^0.5.0:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/tslint-no-circular-imports/-/tslint-no-circular-imports-0.5.2.tgz#47ac9194ec531101ac19198d5144f7ac9f57d980"
-  integrity sha512-Uzu2NiVX7b/kAk9vPrLqUmoCkth0dXUUNOaqwfxpvYgsHfoH67cmj0IHOUMZ1bC0swksJjaTyq7acHe/gU8H4A==
+tslint-no-circular-imports@^0.6.0:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/tslint-no-circular-imports/-/tslint-no-circular-imports-0.6.1.tgz#a91358395a81c067bf104a641f269655057715cd"
+  integrity sha512-XuRgHZKFu6dv7fm/tuilmvynLHgtCTd63/p3744dYVEpnMExp2Jd9IwTiBOGmy5bUDlpTy117vtBcLd028RsBA==
 
 tslint-sonarts@^1.7.0:
   version "1.8.0"

From e05f0ab19e2f50af0c4b39dc4ecc0499d693ec46 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 20 Dec 2018 08:57:20 +0000
Subject: [PATCH 0560/1703] build: update postcss to version 7.0.7

---
 .../angular_devkit/build_angular/package.json    |  2 +-
 yarn.lock                                        | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index ea18a8f4fb47..05c16d6257ca 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -30,7 +30,7 @@
     "parse5": "4.0.0",
     "opn": "5.4.0",
     "portfinder": "1.0.17",
-    "postcss": "7.0.5",
+    "postcss": "7.0.7",
     "postcss-import": "12.0.0",
     "postcss-loader": "3.0.0",
     "raw-loader": "0.5.1",
diff --git a/yarn.lock b/yarn.lock
index 15d21189c1b8..defed0cfec37 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7570,19 +7570,19 @@ postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.1:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss@7.0.5, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.5.tgz#70e6443e36a6d520b0fd4e7593fcca3635ee9f55"
-  integrity sha512-HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ==
+postcss@7.0.7, postcss@^7.0.6:
+  version "7.0.7"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.7.tgz#2754d073f77acb4ef08f1235c36c5721a7201614"
+  integrity sha512-HThWSJEPkupqew2fnuQMEI2YcTj/8gMV3n80cMdJsKxfIh5tHf7nM5JigNX6LxVMqo6zkgQNAI88hyFvBk41Pg==
   dependencies:
     chalk "^2.4.1"
     source-map "^0.6.1"
     supports-color "^5.5.0"
 
-postcss@^7.0.6:
-  version "7.0.7"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.7.tgz#2754d073f77acb4ef08f1235c36c5721a7201614"
-  integrity sha512-HThWSJEPkupqew2fnuQMEI2YcTj/8gMV3n80cMdJsKxfIh5tHf7nM5JigNX6LxVMqo6zkgQNAI88hyFvBk41Pg==
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.5.tgz#70e6443e36a6d520b0fd4e7593fcca3635ee9f55"
+  integrity sha512-HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ==
   dependencies:
     chalk "^2.4.1"
     source-map "^0.6.1"

From 9424fffa8b79a1289d30e9dffd1ee02ca557bc07 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 20 Dec 2018 10:46:51 +0000
Subject: [PATCH 0561/1703] build: update temp to version ^0.9.0

---
 package.json |  2 +-
 yarn.lock    | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 40585cde4a4a..d56471622cb8 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "glob": "^7.0.3",
     "node-fetch": "^2.2.0",
     "quicktype-core": "^6.0.15",
-    "temp": "^0.8.3",
+    "temp": "^0.9.0",
     "tslint": "^5.11.0",
     "typescript": "~3.2.2",
     "yarn": "^1.10.1"
diff --git a/yarn.lock b/yarn.lock
index defed0cfec37..999d942e2347 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8378,18 +8378,13 @@ rfdc@^1.1.2:
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.2.tgz#e6e72d74f5dc39de8f538f65e00c36c18018e349"
   integrity sha512-92ktAgvZhBzYTIK0Mja9uen5q5J3NRVMoDkJL2VMwq6SXjVCgqvQeVP2XAaUY6HT+XpQYeLSjb3UoitBryKmdA==
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
   dependencies:
     glob "^7.0.5"
 
-rimraf@~2.2.6:
-  version "2.2.8"
-  resolved "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
-  integrity sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=
-
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -9542,13 +9537,12 @@ tar@^4, tar@^4.4.4, tar@^4.4.6:
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
 
-temp@^0.8.3:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59"
-  integrity sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=
+temp@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.0.tgz#61391795a11bd9738d4c4d7f55f012cb8f55edaa"
+  integrity sha512-YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ==
   dependencies:
-    os-tmpdir "^1.0.0"
-    rimraf "~2.2.6"
+    rimraf "~2.6.2"
 
 term-size@^1.2.0:
   version "1.2.0"

From 524cf3cbd5bdf721f0cd300089a067cd3ad193ae Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 20 Dec 2018 11:51:54 -0500
Subject: [PATCH 0562/1703] ci: temporarily disable size check comments

Disabled while double github event notification issue is investigated.
---
 .github/angular-robot.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/angular-robot.yml b/.github/angular-robot.yml
index 5e6b231c9d62..3cf5b4b9eea3 100644
--- a/.github/angular-robot.yml
+++ b/.github/angular-robot.yml
@@ -96,4 +96,4 @@ triage:
 size:
   circleCiStatusName: "ci/circleci: e2e-cli"
   maxSizeIncrease: 10000
-  comment: true
+  comment: false

From 80823ac280f960e41600273df485285cd805e858 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 20 Dec 2018 19:44:41 +0000
Subject: [PATCH 0563/1703] build: update portfinder to version 1.0.20

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 05c16d6257ca..3b631b95bc6a 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -29,7 +29,7 @@
     "minimatch": "3.0.4",
     "parse5": "4.0.0",
     "opn": "5.4.0",
-    "portfinder": "1.0.17",
+    "portfinder": "1.0.20",
     "postcss": "7.0.7",
     "postcss-import": "12.0.0",
     "postcss-loader": "3.0.0",
diff --git a/yarn.lock b/yarn.lock
index 999d942e2347..e394e0a1edc7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7503,10 +7503,10 @@ popper.js@^1.14.1:
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.4.tgz#8eec1d8ff02a5a3a152dd43414a15c7b79fd69b6"
   integrity sha1-juwdj/AqWjoVLdQ0FKFce3n9abY=
 
-portfinder@1.0.17:
-  version "1.0.17"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.17.tgz#a8a1691143e46c4735edefcf4fbcccedad26456a"
-  integrity sha512-syFcRIRzVI1BoEFOCaAiizwDolh1S1YXSodsVhncbhjzjZQulhczNRbqnUl9N31Q4dKGOXsNDqxC2BWBgSMqeQ==
+portfinder@1.0.20:
+  version "1.0.20"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
+  integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==
   dependencies:
     async "^1.5.2"
     debug "^2.2.0"

From c717d61b1a9dd9588012b7766bf19355a474bd05 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 20 Dec 2018 19:44:51 +0000
Subject: [PATCH 0564/1703] build: update postcss-import to version 12.0.1

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 3b631b95bc6a..033fe1d77b34 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -31,7 +31,7 @@
     "opn": "5.4.0",
     "portfinder": "1.0.20",
     "postcss": "7.0.7",
-    "postcss-import": "12.0.0",
+    "postcss-import": "12.0.1",
     "postcss-loader": "3.0.0",
     "raw-loader": "0.5.1",
     "rxjs": "6.3.3",
diff --git a/yarn.lock b/yarn.lock
index e394e0a1edc7..1e97ff348ff1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7526,10 +7526,10 @@ posix-character-classes@^0.1.0:
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
-postcss-import@12.0.0:
-  version "12.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.0.tgz#149f96a4ef0b27525c419784be8517ebd17e92c5"
-  integrity sha512-3KqKRZcaZAvxbY8DVLdd81tG5uKzbUQuiWIvy0o0fzEC42bKacqPYFWbfCQyw6L4LWUaqPz/idvIdbhpgQ32eQ==
+postcss-import@12.0.1:
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.1.tgz#cf8c7ab0b5ccab5649024536e565f841928b7153"
+  integrity sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==
   dependencies:
     postcss "^7.0.1"
     postcss-value-parser "^3.2.3"

From ce42a4ce4e174808c0b9e0425b94cc3eaf8a678d Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 20 Dec 2018 19:45:04 +0000
Subject: [PATCH 0565/1703] build: update semver to version 5.6.0

---
 packages/angular/cli/package.json                     | 2 +-
 packages/angular_devkit/build_angular/package.json    | 2 +-
 packages/angular_devkit/build_ng_packagr/package.json | 2 +-
 packages/schematics/update/package.json               | 2 +-
 yarn.lock                                             | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index f328445a0ebd..4594d7435e90 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -33,7 +33,7 @@
     "@schematics/update": "0.0.0",
     "inquirer": "6.2.1",
     "opn": "5.4.0",
-    "semver": "5.5.1",
+    "semver": "5.6.0",
     "symbol-observable": "1.2.0"
   },
   "ng-update": {
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 033fe1d77b34..96cb94fd7859 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -36,7 +36,7 @@
     "raw-loader": "0.5.1",
     "rxjs": "6.3.3",
     "sass-loader": "7.1.0",
-    "semver": "5.5.1",
+    "semver": "5.6.0",
     "source-map-support": "0.5.9",
     "source-map-loader": "0.2.4",
     "speed-measure-webpack-plugin": "1.2.3",
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index 2852b3d826ea..2d7e8d0d018c 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -9,7 +9,7 @@
     "@angular-devkit/architect": "0.0.0",
     "@angular-devkit/core": "0.0.0",
     "rxjs": "6.3.3",
-    "semver": "5.5.1"
+    "semver": "5.6.0"
   },
   "peerDependencies": {
     "ng-packagr": "^2.2.0 || ^3.0.0 || ^4.0.0"
diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index 0dabc3579734..c002876e642f 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -15,7 +15,7 @@
     "@yarnpkg/lockfile": "1.1.0",
     "ini": "1.3.5",
     "pacote": "9.2.3",
-    "semver": "5.5.1",
+    "semver": "5.6.0",
     "semver-intersect": "1.4.0",
     "rxjs": "6.3.3"
   }
diff --git a/yarn.lock b/yarn.lock
index 1e97ff348ff1..9d50f269f80b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8611,12 +8611,12 @@ semver-intersect@1.4.0:
   dependencies:
     semver "^5.0.0"
 
-"semver@2 >=2.2.1 || 3.x || 4 || 5", semver@^5.0.0, semver@^5.0.3, semver@^5.1.0, semver@^5.4.1, semver@^5.6.0:
+"semver@2 >=2.2.1 || 3.x || 4 || 5", semver@5.6.0, semver@^5.0.0, semver@^5.0.3, semver@^5.1.0, semver@^5.4.1, semver@^5.6.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
-"semver@2 || 3 || 4 || 5", semver@5.5.1, semver@^5.3.0, semver@^5.5.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0:
   version "5.5.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
   integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==

From 852854ae3a2ec92688e94378230f0b345ba589af Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 21 Dec 2018 07:26:25 +0000
Subject: [PATCH 0566/1703] build: update @types/glob to version ^7.0.0

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d56471622cb8..9814c6a8bfc3 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "@ngtools/json-schema": "^1.1.0",
     "@types/copy-webpack-plugin": "^4.4.1",
     "@types/express": "^4.16.0",
-    "@types/glob": "^5.0.35",
+    "@types/glob": "^7.0.0",
     "@types/inquirer": "^0.0.43",
     "@types/istanbul": "^0.4.30",
     "@types/jasmine": "^2.8.8",
diff --git a/yarn.lock b/yarn.lock
index 9d50f269f80b..3c2d1fc9319e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -294,10 +294,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/glob@^5.0.35":
-  version "5.0.35"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.35.tgz#1ae151c802cece940443b5ac246925c85189f32a"
-  integrity sha512-wc+VveszMLyMWFvXLkloixT4n0harUIVZjnpzztaZ0nKLuul7Z32iMt2fUFGAaZ4y1XWjFRMtCI5ewvyh4aIeg==
+"@types/glob@^7.0.0":
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
+  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
   dependencies:
     "@types/events" "*"
     "@types/minimatch" "*"

From 5ca7f25159bf61cc6568227f93aef976353f6396 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 21 Dec 2018 14:05:06 +0100
Subject: [PATCH 0567/1703] ci: disable major `devDependencies` updates

---
 renovate.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/renovate.json b/renovate.json
index d62ddff98180..106f8e0fdf29 100644
--- a/renovate.json
+++ b/renovate.json
@@ -19,12 +19,18 @@
   ],
   "ignoreDeps": [
     "source-map",
+    "@types/node",
     "webpack-subresource-integrity"
   ],
   "packageFiles": [
     "package.json",
     "packages/**/package.json"
   ],
+  "major": {
+    "devDependencies": {
+      "enabled": false
+    }
+  },
   "packageRules": [
     {
       "packagePatterns": [

From b071d1cd1d3812609f933739db999ad573b6b9d6 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 21 Dec 2018 17:37:42 +0100
Subject: [PATCH 0568/1703] build: update several dependencies

This is so that renovate won't trigger for these dependencies
---
 package.json                                  |   5 +-
 .../angular_devkit/benchmark/package.json     |   8 +-
 .../angular_devkit/build_angular/package.json |   6 +-
 .../build_optimizer/package.json              |   2 +-
 packages/ngtools/webpack/package.json         |   2 +-
 yarn.lock                                     | 258 +++++++-----------
 6 files changed, 105 insertions(+), 176 deletions(-)

diff --git a/package.json b/package.json
index 9814c6a8bfc3..b35897b54be8 100644
--- a/package.json
+++ b/package.json
@@ -69,8 +69,7 @@
     "quicktype-core": "^6.0.15",
     "temp": "^0.9.0",
     "tslint": "^5.11.0",
-    "typescript": "~3.2.2",
-    "yarn": "^1.10.1"
+    "typescript": "~3.2.2"
   },
   "devDependencies": {
     "@angular/compiler": "^7.2.0-rc.0",
@@ -98,7 +97,7 @@
     "common-tags": "^1.8.0",
     "conventional-changelog": "^1.1.0",
     "conventional-commits-parser": "^3.0.0",
-    "gh-got": "^7.0.0",
+    "gh-got": "^8.0.1",
     "git-raw-commits": "^2.0.0",
     "husky": "^0.14.3",
     "istanbul": "^0.4.5",
diff --git a/packages/angular_devkit/benchmark/package.json b/packages/angular_devkit/benchmark/package.json
index 1be3376670e7..24fd4941de6b 100644
--- a/packages/angular_devkit/benchmark/package.json
+++ b/packages/angular_devkit/benchmark/package.json
@@ -15,10 +15,10 @@
   },
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
-    "minimist": "^1.2.0",
-    "pidusage": "^2.0.17",
-    "pidtree": "^0.3.0",
-    "rxjs": "~6.3.0",
+    "minimist": "1.2.0",
+    "pidusage": "2.0.17",
+    "pidtree": "0.3.0",
+    "rxjs": "6.3.3",
     "tree-kill": "^1.2.0"
   }
 }
\ No newline at end of file
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 96cb94fd7859..1def90839ae6 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -16,7 +16,7 @@
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "4.6.0",
-    "file-loader": "2.0.0",
+    "file-loader": "3.0.1",
     "glob": "7.1.3",
     "istanbul": "0.4.5",
     "istanbul-instrumenter-loader": "3.0.1",
@@ -33,7 +33,7 @@
     "postcss": "7.0.7",
     "postcss-import": "12.0.1",
     "postcss-loader": "3.0.0",
-    "raw-loader": "0.5.1",
+    "raw-loader": "1.0.0",
     "rxjs": "6.3.3",
     "sass-loader": "7.1.0",
     "semver": "5.6.0",
@@ -49,7 +49,7 @@
     "webpack": "4.23.1",
     "webpack-dev-middleware": "3.4.0",
     "webpack-dev-server": "3.1.10",
-    "webpack-merge": "4.1.4",
+    "webpack-merge": "4.1.5",
     "webpack-sources": "1.3.0",
     "webpack-subresource-integrity": "1.1.0-rc.6"
   },
diff --git a/packages/angular_devkit/build_optimizer/package.json b/packages/angular_devkit/build_optimizer/package.json
index ca75522d3741..f63affb523df 100644
--- a/packages/angular_devkit/build_optimizer/package.json
+++ b/packages/angular_devkit/build_optimizer/package.json
@@ -11,6 +11,6 @@
     "loader-utils": "1.1.0",
     "source-map": "0.5.6",
     "typescript": "3.2.2",
-    "webpack-sources": "1.2.0"
+    "webpack-sources": "1.3.0"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index e6960ebbf279..da300a3bbabb 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -25,7 +25,7 @@
     "enhanced-resolve": "4.1.0",
     "rxjs": "6.3.3",
     "tree-kill": "1.2.1",
-    "webpack-sources": "1.2.0"
+    "webpack-sources": "1.3.0"
   },
   "peerDependencies": {
     "@angular/compiler-cli": ">=5.0.0 <8.0.0 || ^7.0.0-beta.0",
diff --git a/yarn.lock b/yarn.lock
index 3c2d1fc9319e..c6f815cd2d18 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -226,10 +226,17 @@
   resolved "https://registry.yarnpkg.com/@ngtools/json-schema/-/json-schema-1.1.0.tgz#c3a0c544d62392acc2813a42c8a0dc6f58f86922"
   integrity sha1-w6DFRNYjkqzCgTpCyKDcb1j4aSI=
 
-"@sindresorhus/is@^0.7.0":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
-  integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
+"@sindresorhus/is@^0.14.0":
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
+  integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
+
+"@szmarczak/http-timer@^1.1.0":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.1.tgz#6402258dfe467532b26649ef076b4d11f74fb612"
+  integrity sha512-WljfOGkmSJe8SUkl+4TPvN2ec0dpUGVyfTBQLoXJUiILs+wBSc4Kvp2N3aAWE4VwwDSLGdmD3/bufS5BgZpVSQ==
+  dependencies:
+    defer-to-connect "^1.0.1"
 
 "@types/body-parser@*":
   version "1.17.0"
@@ -1787,18 +1794,18 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
-cacheable-request@^2.1.1:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d"
-  integrity sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=
+cacheable-request@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-5.2.0.tgz#00c87097835af4caf92a97390660ecadce51187d"
+  integrity sha512-h1n0vjpFaByTvU6PiyTKk2kx4OnuV1aVUynCUd/FiKl4icpPSceowk3rHczwFEBuZvz+E1EU4KExR0MCPeQfaQ==
   dependencies:
-    clone-response "1.0.2"
-    get-stream "3.0.0"
-    http-cache-semantics "3.8.1"
-    keyv "3.0.0"
-    lowercase-keys "1.0.0"
-    normalize-url "2.0.1"
-    responselike "1.0.2"
+    clone-response "^1.0.2"
+    get-stream "^4.0.0"
+    http-cache-semantics "^4.0.0"
+    keyv "^3.0.0"
+    lowercase-keys "^1.0.1"
+    normalize-url "^3.1.0"
+    responselike "^1.0.2"
 
 callsite@1.0.0:
   version "1.0.0"
@@ -2030,7 +2037,7 @@ clone-deep@^2.0.1:
     kind-of "^6.0.0"
     shallow-clone "^1.0.0"
 
-clone-response@1.0.2:
+clone-response@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
   integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
@@ -2841,6 +2848,11 @@ default-require-extensions@^2.0.0:
   dependencies:
     strip-bom "^3.0.0"
 
+defer-to-connect@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.0.1.tgz#41ec1dd670dc4c6dcbe7e54c9e44d784d025fe63"
+  integrity sha512-2e0FJesseUqQj671gvZWfUyxpnFx/5n4xleamlpCD3U6Fm5dh5qzmmLNxNhtmHF06+SYVHH8QU6FACffYTnj0Q==
+
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
@@ -3633,10 +3645,10 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-file-loader@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-2.0.0.tgz#39749c82f020b9e85901dcff98e8004e6401cfde"
-  integrity sha512-YCsBfd1ZGCyonOKLxPiKPdu+8ld9HAaMEvJewzz+b2eTF7uL5Zm/HdBF6FjCrpCMRq25Mi0U1gl4pwn2TlH7hQ==
+file-loader@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz#f8e0ba0b599918b51adfe45d66d1e771ad560faa"
+  integrity sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==
   dependencies:
     loader-utils "^1.0.2"
     schema-utils "^1.0.0"
@@ -3856,7 +3868,7 @@ fresh@0.5.2:
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
-from2@^2.1.0, from2@^2.1.1:
+from2@^2.1.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
   integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
@@ -3999,12 +4011,12 @@ get-stdin@^4.0.1:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
   integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
-get-stream@3.0.0, get-stream@^3.0.0:
+get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
   integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
 
-get-stream@^4.1.0:
+get-stream@^4.0.0, get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
   integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
@@ -4035,13 +4047,12 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-gh-got@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/gh-got/-/gh-got-7.1.0.tgz#f2b14eef375ce49b66d5f034a1c124f56dc5bcf0"
-  integrity sha512-KeWkkhresa7sbpzQLYzITMgez5rMigUsijhmSAHcLDORIMUbdlkdoZyaN1wQvIjmUZnyb/wkAPaXb4MQKX0mdQ==
+gh-got@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/gh-got/-/gh-got-8.0.1.tgz#857c5e9bcd52956e14a9f200d010c641a2f992b3"
+  integrity sha512-i2TkU/u5ti1Wgc34y65FDSCKDuuuVH1Qa6192e0E2Z2CvleS0zPgArpiPZroiQdp9f5gbohw9UZCTTcrjIzwFw==
   dependencies:
-    got "^8.0.0"
-    is-plain-obj "^1.1.0"
+    got "^9.1.0"
 
 git-raw-commits@^1.3.6:
   version "1.3.6"
@@ -4224,28 +4235,22 @@ got@^6.7.1:
     unzip-response "^2.0.1"
     url-parse-lax "^1.0.0"
 
-got@^8.0.0:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937"
-  integrity sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==
+got@^9.1.0:
+  version "9.5.0"
+  resolved "https://registry.yarnpkg.com/got/-/got-9.5.0.tgz#6fd0312c6b694c0a11d9119d95fd7daed174eb49"
+  integrity sha512-N+4kb6i9t1lauJ4NwLVVoFVLxZNa6i+iivtNzCSVw7+bVbTXoq0qXctdd8i9rj3lrI0zDk5NGzcO4bfpEP6Uuw==
   dependencies:
-    "@sindresorhus/is" "^0.7.0"
-    cacheable-request "^2.1.1"
+    "@sindresorhus/is" "^0.14.0"
+    "@szmarczak/http-timer" "^1.1.0"
+    cacheable-request "^5.1.0"
     decompress-response "^3.3.0"
     duplexer3 "^0.1.4"
-    get-stream "^3.0.0"
-    into-stream "^3.1.0"
-    is-retry-allowed "^1.1.0"
-    isurl "^1.0.0-alpha5"
-    lowercase-keys "^1.0.0"
-    mimic-response "^1.0.0"
-    p-cancelable "^0.4.0"
-    p-timeout "^2.0.1"
-    pify "^3.0.0"
-    safe-buffer "^5.1.1"
-    timed-out "^4.0.1"
+    get-stream "^4.1.0"
+    lowercase-keys "^1.0.1"
+    mimic-response "^1.0.1"
+    p-cancelable "^1.0.0"
+    to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
-    url-to-options "^1.0.1"
 
 graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.11"
@@ -4328,18 +4333,6 @@ has-flag@^3.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
-has-symbol-support-x@^1.4.1:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
-  integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==
-
-has-to-string-tag-x@^1.2.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
-  integrity sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==
-  dependencies:
-    has-symbol-support-x "^1.4.1"
-
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -4466,11 +4459,16 @@ html-entities@^1.2.0:
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
   integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
 
-http-cache-semantics@3.8.1, http-cache-semantics@^3.8.1:
+http-cache-semantics@^3.8.1:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
   integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
 
+http-cache-semantics@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#6c2ef57e22090b177828708a52eaeae9d1d63e1b"
+  integrity sha512-OO/9K7uFN30qwAKvslzmCTbimZ/uRjtdN5S50vvWLwUKqFuZj0n96XyCzF5tHRHEO/Q4JYC01hv41gkX06gmHA==
+
 http-deceiver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
@@ -4758,14 +4756,6 @@ interpret@^1.0.0:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
   integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
 
-into-stream@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
-  integrity sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=
-  dependencies:
-    from2 "^2.1.1"
-    p-is-promise "^1.1.0"
-
 invariant@^2.2.2:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
@@ -5027,11 +5017,6 @@ is-obj@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
   integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
 
-is-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
-  integrity sha1-iVJojF7C/9awPsyF52ngKQMINHA=
-
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
@@ -5051,7 +5036,7 @@ is-path-inside@^1.0.0:
   dependencies:
     path-is-inside "^1.0.1"
 
-is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
+is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
@@ -5088,7 +5073,7 @@ is-redirect@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
   integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=
 
-is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0:
+is-retry-allowed@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
   integrity sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=
@@ -5292,14 +5277,6 @@ istanbul@0.4.5, istanbul@^0.4.5:
     which "^1.1.1"
     wordwrap "^1.0.0"
 
-isurl@^1.0.0-alpha5:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
-  integrity sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==
-  dependencies:
-    has-to-string-tag-x "^1.2.0"
-    is-object "^1.0.1"
-
 jasmine-core@2.8.0, jasmine-core@~2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
@@ -5605,10 +5582,10 @@ karma@~3.1.1:
     tmp "0.0.33"
     useragent "2.2.1"
 
-keyv@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
-  integrity sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==
+keyv@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
+  integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
   dependencies:
     json-buffer "3.0.0"
 
@@ -5976,12 +5953,7 @@ loud-rejection@^1.0.0:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
 
-lowercase-keys@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
-  integrity sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=
-
-lowercase-keys@^1.0.0:
+lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
   integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
@@ -6287,7 +6259,7 @@ mimic-fn@^1.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
   integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
-mimic-response@^1.0.0:
+mimic-response@^1.0.0, mimic-response@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
   integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
@@ -6809,14 +6781,10 @@ normalize-range@^0.1.2:
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
   integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
-normalize-url@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
-  integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==
-  dependencies:
-    prepend-http "^2.0.0"
-    query-string "^5.0.1"
-    sort-keys "^2.0.0"
+normalize-url@^3.1.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
+  integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
 
 npm-bundled@^1.0.1:
   version "1.0.5"
@@ -7105,10 +7073,10 @@ osenv@0, osenv@^0.1.4, osenv@^0.1.5:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
-p-cancelable@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"
-  integrity sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==
+p-cancelable@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.0.0.tgz#07e9c6d22c31f9c6784cb4f1e1454a79b6d9e2d6"
+  integrity sha512-USgPoaC6tkTGlS831CxsVdmZmyb8tR1D+hStI84MyckLOzfJlYQUweomrwE3D8T7u5u5GVuW064LT501wHTYYA==
 
 p-defer@^1.0.0:
   version "1.0.0"
@@ -7158,13 +7126,6 @@ p-map@^1.1.1:
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
   integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
 
-p-timeout@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
-  integrity sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==
-  dependencies:
-    p-finally "^1.0.0"
-
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
@@ -7445,12 +7406,12 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-pidtree@^0.3.0:
+pidtree@0.3.0, pidtree@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.0.tgz#f6fada10fccc9f99bf50e90d0b23d72c9ebc2e6b"
   integrity sha512-9CT4NFlDcosssyg8KVFltgokyKZIFjoBxw8CTGy+5F38Y1eQWrt8tRayiUOXE+zVKQnYu5BR8JjCtvK3BcnBhg==
 
-pidusage@^2.0.17:
+pidusage@2.0.17, pidusage@^2.0.17:
   version "2.0.17"
   resolved "https://registry.yarnpkg.com/pidusage/-/pidusage-2.0.17.tgz#6b4a2b4a09026f0e9828f7e5627837e4c0672581"
   integrity sha512-N8X5v18rBmlBoArfS83vrnD0gIFyZkXEo7a5pAS2aT0i2OLVymFb2AzVg+v8l/QcXnE1JwZcaXR8daJcoJqtjw==
@@ -7815,15 +7776,6 @@ qs@~6.2.0:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"
   integrity sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=
 
-query-string@^5.0.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
-  integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==
-  dependencies:
-    decode-uri-component "^0.2.0"
-    object-assign "^4.1.0"
-    strict-uri-encode "^1.0.0"
-
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
@@ -7906,10 +7858,13 @@ raw-body@2.3.3, raw-body@^2.2.0:
     iconv-lite "0.4.23"
     unpipe "1.0.0"
 
-raw-loader@0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
-  integrity sha1-DD0L6u2KAclm2Xh793goElKpeao=
+raw-loader@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-1.0.0.tgz#3f9889e73dadbda9a424bce79809b4133ad46405"
+  integrity sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==
+  dependencies:
+    loader-utils "^1.1.0"
+    schema-utils "^1.0.0"
 
 rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
   version "1.2.8"
@@ -8348,7 +8303,7 @@ resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.8.1:
   dependencies:
     path-parse "^1.0.5"
 
-responselike@1.0.2:
+responselike@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
   integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
@@ -8977,13 +8932,6 @@ socks@~2.2.0:
     ip "^1.1.5"
     smart-buffer "^4.0.1"
 
-sort-keys@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
-  integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=
-  dependencies:
-    is-plain-obj "^1.0.0"
-
 source-list-map@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
@@ -9350,11 +9298,6 @@ streamroller@0.7.0:
     mkdirp "^0.5.1"
     readable-stream "^2.3.0"
 
-strict-uri-encode@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
-
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -9607,7 +9550,7 @@ thunky@^1.0.2:
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.3.tgz#f5df732453407b09191dae73e2a8cc73f381a826"
   integrity sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==
 
-timed-out@^4.0.0, timed-out@^4.0.1:
+timed-out@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
   integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
@@ -9675,6 +9618,11 @@ to-object-path@^0.3.0:
   dependencies:
     kind-of "^3.0.2"
 
+to-readable-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
+  integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
+
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
@@ -10058,11 +10006,6 @@ url-parse@^1.4.3:
     querystringify "^2.0.0"
     requires-port "^1.0.0"
 
-url-to-options@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
-  integrity sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=
-
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -10296,21 +10239,13 @@ webpack-log@^2.0.0:
     ansi-colors "^3.0.0"
     uuid "^3.3.2"
 
-webpack-merge@4.1.4:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.4.tgz#0fde38eabf2d5fd85251c24a5a8c48f8a3f4eb7b"
-  integrity sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==
+webpack-merge@4.1.5:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.5.tgz#2be31e846c20767d1bef56bdca64c328a681190a"
+  integrity sha512-sVcM+MMJv6DO0C0GLLltx8mUlGMKXE0zBsuMqZ9jz2X9gsekALw6Rs0cAfTWc97VuWS6NpVUa78959zANnMMLQ==
   dependencies:
     lodash "^4.17.5"
 
-webpack-sources@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.2.0.tgz#18181e0d013fce096faf6f8e6d41eeffffdceac2"
-  integrity sha512-9BZwxR85dNsjWz3blyxdOhTgtnQvv3OEs5xofI0wPYTwu5kaWxS08UuD1oI7WLBLpRO+ylf0ofnXLXWmGb2WMw==
-  dependencies:
-    source-list-map "^2.0.0"
-    source-map "~0.6.1"
-
 webpack-sources@1.3.0, webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
@@ -10651,11 +10586,6 @@ yargs@^7.0.0:
     y18n "^3.2.1"
     yargs-parser "^5.0.0"
 
-yarn@^1.10.1:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.10.1.tgz#b792ba28f050ae94cd7e719dbca80639d70da76f"
-  integrity sha512-EH0H1fyfFxkE4UpG4b+VCaVY4I488I2EyQNmGjGGKmvsSIb0G3b+1IcfGYPI2gqa1du43g4ZA3jH8fXlq6oVxg==
-
 yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"

From 0b7dd0e9c0a76b1f46feafa01104e5f0d3b4d8b6 Mon Sep 17 00:00:00 2001
From: Bart Duisters <43420049+bartduisters@users.noreply.github.com>
Date: Thu, 20 Dec 2018 22:07:00 +0100
Subject: [PATCH 0569/1703] docs: typo 'they changes' -> 'the changes'

---
 docs/documentation/stories/configure-hmr.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/documentation/stories/configure-hmr.md b/docs/documentation/stories/configure-hmr.md
index 58e34ac9245b..e3551578d90d 100644
--- a/docs/documentation/stories/configure-hmr.md
+++ b/docs/documentation/stories/configure-hmr.md
@@ -176,6 +176,6 @@ When starting the server Webpack will tell you that it’s enabled:
     NOTICE Hot Module Replacement (HMR) is enabled for the dev server.
 
 
-Now if you make changes to one of your components they changes should be visible automatically without a complete browser refresh.
+Now if you make changes to one of your components the changes should be visible automatically without a complete browser refresh.
 
 

From 02a498ef39c50493fc5032b9b84bf1a4c237ad7d Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 25 Dec 2018 20:02:36 +0100
Subject: [PATCH 0570/1703] build: update webpack to 4.28.2

---
 .../angular_devkit/build_angular/package.json |   2 +-
 yarn.lock                                     | 325 +++++++++---------
 2 files changed, 157 insertions(+), 170 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 1def90839ae6..67029636835e 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -46,7 +46,7 @@
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.1.0",
-    "webpack": "4.23.1",
+    "webpack": "4.28.2",
     "webpack-dev-middleware": "3.4.0",
     "webpack-dev-server": "3.1.10",
     "webpack-merge": "4.1.5",
diff --git a/yarn.lock b/yarn.lock
index c6f815cd2d18..2088dbafb0a6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -590,147 +590,147 @@
     "@types/uglify-js" "*"
     source-map "^0.6.0"
 
-"@webassemblyjs/ast@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.10.tgz#0cfc61d61286240b72fc522cb755613699eea40a"
-  integrity sha512-wTUeaByYN2EA6qVqhbgavtGc7fLTOx0glG2IBsFlrFG51uXIGlYBTyIZMf4SPLo3v1bgV/7lBN3l7Z0R6Hswew==
-  dependencies:
-    "@webassemblyjs/helper-module-context" "1.7.10"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
-    "@webassemblyjs/wast-parser" "1.7.10"
-
-"@webassemblyjs/floating-point-hex-parser@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.10.tgz#ee63d729c6311a85863e369a473f9983f984e4d9"
-  integrity sha512-gMsGbI6I3p/P1xL2UxqhNh1ga2HCsx5VBB2i5VvJFAaqAjd2PBTRULc3BpTydabUQEGlaZCzEUQhLoLG7TvEYQ==
-
-"@webassemblyjs/helper-api-error@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.10.tgz#bfcb3bbe59775357475790a2ad7b289f09b2f198"
-  integrity sha512-DoYRlPWtuw3yd5BOr9XhtrmB6X1enYF0/54yNvQWGXZEPDF5PJVNI7zQ7gkcKfTESzp8bIBWailaFXEK/jjCsw==
-
-"@webassemblyjs/helper-buffer@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.10.tgz#0a8c624c67ad0b214d2e003859921a1988cb151b"
-  integrity sha512-+RMU3dt/dPh4EpVX4u5jxsOlw22tp3zjqE0m3ftU2tsYxnPULb4cyHlgaNd2KoWuwasCQqn8Mhr+TTdbtj3LlA==
-
-"@webassemblyjs/helper-code-frame@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.10.tgz#0ab7e22fad0241a173178c73976fc0edf50832ce"
-  integrity sha512-UiytbpKAULOEab2hUZK2ywXen4gWJVrgxtwY3Kn+eZaaSWaRM8z/7dAXRSoamhKFiBh1uaqxzE/XD9BLlug3gw==
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.7.10"
-
-"@webassemblyjs/helper-fsm@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.10.tgz#0915e7713fbbb735620a9d3e4fa3d7951f97ac64"
-  integrity sha512-w2vDtUK9xeSRtt5+RnnlRCI7wHEvLjF0XdnxJpgx+LJOvklTZPqWkuy/NhwHSLP19sm9H8dWxKeReMR7sCkGZA==
-
-"@webassemblyjs/helper-module-context@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.10.tgz#9beb83f72740f5ac8075313b5cac5e796510f755"
-  integrity sha512-yE5x/LzZ3XdPdREmJijxzfrf+BDRewvO0zl8kvORgSWmxpRrkqY39KZSq6TSgIWBxkK4SrzlS3BsMCv2s1FpsQ==
-
-"@webassemblyjs/helper-wasm-bytecode@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.10.tgz#797b1e734bbcfdea8399669cdc58308ef1c7ffc0"
-  integrity sha512-u5qy4SJ/OrxKxZqJ9N3qH4ZQgHaAzsopsYwLvoWJY6Q33r8PhT3VPyNMaJ7ZFoqzBnZlCcS/0f4Sp8WBxylXfg==
-
-"@webassemblyjs/helper-wasm-section@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.10.tgz#c0ea3703c615d7bc3e3507c3b7991c8767b2f20e"
-  integrity sha512-Ecvww6sCkcjatcyctUrn22neSJHLN/TTzolMGG/N7S9rpbsTZ8c6Bl98GpSpV77EvzNijiNRHBG0+JO99qKz6g==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.10"
-    "@webassemblyjs/helper-buffer" "1.7.10"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
-    "@webassemblyjs/wasm-gen" "1.7.10"
-
-"@webassemblyjs/ieee754@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.10.tgz#62c1728b7ef0f66ef8221e2966a0afd75db430df"
-  integrity sha512-HRcWcY+YWt4+s/CvQn+vnSPfRaD4KkuzQFt5MNaELXXHSjelHlSEA8ZcqT69q0GTIuLWZ6JaoKar4yWHVpZHsQ==
+"@webassemblyjs/ast@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace"
+  integrity sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/wast-parser" "1.7.11"
+
+"@webassemblyjs/floating-point-hex-parser@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313"
+  integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==
+
+"@webassemblyjs/helper-api-error@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a"
+  integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==
+
+"@webassemblyjs/helper-buffer@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b"
+  integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==
+
+"@webassemblyjs/helper-code-frame@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b"
+  integrity sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.7.11"
+
+"@webassemblyjs/helper-fsm@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181"
+  integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==
+
+"@webassemblyjs/helper-module-context@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209"
+  integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==
+
+"@webassemblyjs/helper-wasm-bytecode@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06"
+  integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==
+
+"@webassemblyjs/helper-wasm-section@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a"
+  integrity sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-buffer" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/wasm-gen" "1.7.11"
+
+"@webassemblyjs/ieee754@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b"
+  integrity sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.10.tgz#167e0bb4b06d7701585772a73fba9f4df85439f6"
-  integrity sha512-og8MciYlA8hvzCLR71hCuZKPbVBfLQeHv7ImKZ4nlyxrYbG7uJHYtHiHu6OV9SqrGuD03H/HtXC4Bgdjfm9FHw==
+"@webassemblyjs/leb128@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63"
+  integrity sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==
   dependencies:
     "@xtuc/long" "4.2.1"
 
-"@webassemblyjs/utf8@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.10.tgz#b6728f5b6f50364abc155be029f9670e6685605a"
-  integrity sha512-Ng6Pxv6siyZp635xCSnH3mKmIFgqWPCcGdoo0GBYgyGdxu7cUj4agV7Uu1a8REP66UYUFXJLudeGgd4RvuJAnQ==
-
-"@webassemblyjs/wasm-edit@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.10.tgz#83fe3140f5a58f5a30b914702be9f0e59a399092"
-  integrity sha512-e9RZFQlb+ZuYcKRcW9yl+mqX/Ycj9+3/+ppDI8nEE/NCY6FoK8f3dKBcfubYV/HZn44b+ND4hjh+4BYBt+sDnA==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.10"
-    "@webassemblyjs/helper-buffer" "1.7.10"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
-    "@webassemblyjs/helper-wasm-section" "1.7.10"
-    "@webassemblyjs/wasm-gen" "1.7.10"
-    "@webassemblyjs/wasm-opt" "1.7.10"
-    "@webassemblyjs/wasm-parser" "1.7.10"
-    "@webassemblyjs/wast-printer" "1.7.10"
-
-"@webassemblyjs/wasm-gen@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.10.tgz#4de003806ae29c97ab3707782469b53299570174"
-  integrity sha512-M0lb6cO2Y0PzDye/L39PqwV+jvO+2YxEG5ax+7dgq7EwXdAlpOMx1jxyXJTScQoeTpzOPIb+fLgX/IkLF8h2yw==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.10"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
-    "@webassemblyjs/ieee754" "1.7.10"
-    "@webassemblyjs/leb128" "1.7.10"
-    "@webassemblyjs/utf8" "1.7.10"
-
-"@webassemblyjs/wasm-opt@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.10.tgz#d151e31611934a556c82789fdeec41a814993c2a"
-  integrity sha512-R66IHGCdicgF5ZliN10yn5HaC7vwYAqrSVJGjtJJQp5+QNPBye6heWdVH/at40uh0uoaDN/UVUfXK0gvuUqtVg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.10"
-    "@webassemblyjs/helper-buffer" "1.7.10"
-    "@webassemblyjs/wasm-gen" "1.7.10"
-    "@webassemblyjs/wasm-parser" "1.7.10"
-
-"@webassemblyjs/wasm-parser@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.10.tgz#0367be7bf8f09e3e6abc95f8e483b9206487ec65"
-  integrity sha512-AEv8mkXVK63n/iDR3T693EzoGPnNAwKwT3iHmKJNBrrALAhhEjuPzo/lTE4U7LquEwyvg5nneSNdTdgrBaGJcA==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.10"
-    "@webassemblyjs/helper-api-error" "1.7.10"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.10"
-    "@webassemblyjs/ieee754" "1.7.10"
-    "@webassemblyjs/leb128" "1.7.10"
-    "@webassemblyjs/utf8" "1.7.10"
-
-"@webassemblyjs/wast-parser@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.10.tgz#058f598b52f730b23fc874d4775b6286b6247264"
-  integrity sha512-YTPEtOBljkCL0VjDp4sHe22dAYSm3ZwdJ9+2NTGdtC7ayNvuip1wAhaAS8Zt9Q6SW9E5Jf5PX7YE3XWlrzR9cw==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.10"
-    "@webassemblyjs/floating-point-hex-parser" "1.7.10"
-    "@webassemblyjs/helper-api-error" "1.7.10"
-    "@webassemblyjs/helper-code-frame" "1.7.10"
-    "@webassemblyjs/helper-fsm" "1.7.10"
+"@webassemblyjs/utf8@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82"
+  integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==
+
+"@webassemblyjs/wasm-edit@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005"
+  integrity sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-buffer" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/helper-wasm-section" "1.7.11"
+    "@webassemblyjs/wasm-gen" "1.7.11"
+    "@webassemblyjs/wasm-opt" "1.7.11"
+    "@webassemblyjs/wasm-parser" "1.7.11"
+    "@webassemblyjs/wast-printer" "1.7.11"
+
+"@webassemblyjs/wasm-gen@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8"
+  integrity sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/ieee754" "1.7.11"
+    "@webassemblyjs/leb128" "1.7.11"
+    "@webassemblyjs/utf8" "1.7.11"
+
+"@webassemblyjs/wasm-opt@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7"
+  integrity sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-buffer" "1.7.11"
+    "@webassemblyjs/wasm-gen" "1.7.11"
+    "@webassemblyjs/wasm-parser" "1.7.11"
+
+"@webassemblyjs/wasm-parser@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a"
+  integrity sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-api-error" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/ieee754" "1.7.11"
+    "@webassemblyjs/leb128" "1.7.11"
+    "@webassemblyjs/utf8" "1.7.11"
+
+"@webassemblyjs/wast-parser@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c"
+  integrity sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/floating-point-hex-parser" "1.7.11"
+    "@webassemblyjs/helper-api-error" "1.7.11"
+    "@webassemblyjs/helper-code-frame" "1.7.11"
+    "@webassemblyjs/helper-fsm" "1.7.11"
     "@xtuc/long" "4.2.1"
 
-"@webassemblyjs/wast-printer@1.7.10":
-  version "1.7.10"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.10.tgz#d817909d2450ae96c66b7607624d98a33b84223b"
-  integrity sha512-mJ3QKWtCchL1vhU/kZlJnLPuQZnlDOdZsyP0bbLWPGdYsQDnSBvyTLhzwBA3QAMlzEL9V4JHygEmK6/OTEyytA==
+"@webassemblyjs/wast-printer@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813"
+  integrity sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==
   dependencies:
-    "@webassemblyjs/ast" "1.7.10"
-    "@webassemblyjs/wast-parser" "1.7.10"
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/wast-parser" "1.7.11"
     "@xtuc/long" "4.2.1"
 
 "@xtuc/ieee754@^1.2.0":
@@ -2171,11 +2171,6 @@ commander@^2.12.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
   integrity sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==
 
-commander@~2.13.0:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
-  integrity sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==
-
 commander@~2.17.1:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
@@ -8493,7 +8488,7 @@ schema-utils@^0.3.0:
   dependencies:
     ajv "^5.0.0"
 
-schema-utils@^0.4.4, schema-utils@^0.4.5:
+schema-utils@^0.4.4:
   version "0.4.7"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
   integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
@@ -9508,6 +9503,20 @@ terser-webpack-plugin@1.1.0:
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
+terser-webpack-plugin@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.0.tgz#24697213f2128009080f39f081c18cb2221d91ff"
+  integrity sha512-QW7RACLS89RalHtLDb0s8+Iqcs/IAEw1rnVrV+mS7Gx1kgPG8o1g33JhAGDgc/CQ84hLsTW5WrAMdVysh692yg==
+  dependencies:
+    cacache "^11.0.2"
+    find-cache-dir "^2.0.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^1.4.0"
+    source-map "^0.6.1"
+    terser "^3.8.1"
+    webpack-sources "^1.1.0"
+    worker-farm "^1.5.2"
+
 terser@^3.8.1:
   version "3.10.8"
   resolved "https://registry.yarnpkg.com/terser/-/terser-3.10.8.tgz#2fe3967396a10cdc3d575074fe857efd30a2895a"
@@ -9837,14 +9846,6 @@ typescript@3.2.2, typescript@~3.2.2:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.2.tgz#fe8101c46aa123f8353523ebdcf5730c2ae493e5"
   integrity sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==
 
-uglify-es@^3.3.4:
-  version "3.3.9"
-  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
-  integrity sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==
-  dependencies:
-    commander "~2.13.0"
-    source-map "~0.6.1"
-
 uglify-js@^3.0.7, uglify-js@^3.1.4:
   version "3.4.9"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
@@ -9853,20 +9854,6 @@ uglify-js@^3.0.7, uglify-js@^3.1.4:
     commander "~2.17.1"
     source-map "~0.6.1"
 
-uglifyjs-webpack-plugin@^1.2.4:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz#75f548160858163a08643e086d5fefe18a5d67de"
-  integrity sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==
-  dependencies:
-    cacache "^10.0.4"
-    find-cache-dir "^1.0.0"
-    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"
-
 ultron@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
@@ -10261,15 +10248,15 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.23.1, webpack@^4.0.0, webpack@^4.6.0:
-  version "4.23.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.23.1.tgz#db7467b116771ae020c58bdfe2a0822785bb8239"
-  integrity sha512-iE5Cu4rGEDk7ONRjisTOjVHv3dDtcFfwitSxT7evtYj/rANJpt1OuC/Kozh1pBa99AUBr1L/LsaNB+D9Xz3CEg==
+webpack@4.28.2, webpack@^4.0.0, webpack@^4.6.0:
+  version "4.28.2"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.28.2.tgz#6b534a8bc91a45787ed631dc2e87aec94e9e4db7"
+  integrity sha512-PK3uVg3/NuNVOjPfYleFI6JF7khO7c2kIlksH7mivQm+QDcwiqV1x6+q89dDeOioh5FNxJHr3LKbDu3oSAhl9g==
   dependencies:
-    "@webassemblyjs/ast" "1.7.10"
-    "@webassemblyjs/helper-module-context" "1.7.10"
-    "@webassemblyjs/wasm-edit" "1.7.10"
-    "@webassemblyjs/wasm-parser" "1.7.10"
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-module-context" "1.7.11"
+    "@webassemblyjs/wasm-edit" "1.7.11"
+    "@webassemblyjs/wasm-parser" "1.7.11"
     acorn "^5.6.2"
     acorn-dynamic-import "^3.0.0"
     ajv "^6.1.0"
@@ -10287,7 +10274,7 @@ webpack@4.23.1, webpack@^4.0.0, webpack@^4.6.0:
     node-libs-browser "^2.0.0"
     schema-utils "^0.4.4"
     tapable "^1.1.0"
-    uglifyjs-webpack-plugin "^1.2.4"
+    terser-webpack-plugin "^1.1.0"
     watchpack "^1.5.0"
     webpack-sources "^1.3.0"
 

From 3e8c4616702aa367365d1bc3072a4b05922db5b0 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 25 Dec 2018 12:30:23 +0000
Subject: [PATCH 0571/1703] build: update loader-utils to version 1.2.1

---
 .../angular_devkit/build_angular/package.json |  2 +-
 .../build_optimizer/package.json              |  2 +-
 yarn.lock                                     | 23 ++++++++++++++++++-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 67029636835e..c5f4a88ae60e 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -24,7 +24,7 @@
     "less": "3.9.0",
     "less-loader": "4.1.0",
     "license-webpack-plugin": "2.0.4",
-    "loader-utils": "1.1.0",
+    "loader-utils": "1.2.1",
     "mini-css-extract-plugin": "0.5.0",
     "minimatch": "3.0.4",
     "parse5": "4.0.0",
diff --git a/packages/angular_devkit/build_optimizer/package.json b/packages/angular_devkit/build_optimizer/package.json
index f63affb523df..6c31b5f2d290 100644
--- a/packages/angular_devkit/build_optimizer/package.json
+++ b/packages/angular_devkit/build_optimizer/package.json
@@ -8,7 +8,7 @@
     "build-optimizer": "./src/build-optimizer/cli.js"
   },
   "dependencies": {
-    "loader-utils": "1.1.0",
+    "loader-utils": "1.2.1",
     "source-map": "0.5.6",
     "typescript": "3.2.2",
     "webpack-sources": "1.3.0"
diff --git a/yarn.lock b/yarn.lock
index 2088dbafb0a6..86175fe07d42 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1368,6 +1368,11 @@ big.js@^3.1.3:
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
   integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
 
+big.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
+
 binary-extensions@^1.0.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
@@ -5407,6 +5412,13 @@ json5@^0.5.0:
   resolved "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
   integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
 
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
+
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -5792,7 +5804,16 @@ loader-runner@^2.3.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.1.tgz#026f12fe7c3115992896ac02ba022ba92971b979"
   integrity sha512-By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw==
 
-loader-utils@1.1.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
+loader-utils@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.1.tgz#64bbbac69aa5840d03754ba676a963dec568e844"
+  integrity sha512-3Zhx4qDqBQ9U8udWB3RMJ29nLu5a3ObNOSzk87woPvge01pi0wABowgv7F79Z4mL0DGtHRi/oOndT34EVhInoQ==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^2.0.0"
+    json5 "^1.0.1"
+
+loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
   integrity sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=

From a875b61b71c291c8b9c895187592322f9f89b63f Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Fri, 14 Dec 2018 08:40:01 +0100
Subject: [PATCH 0572/1703] fix(@schematics/angular): wrapping bootstrap code
 in a DOMContentLoaded in variable declaration

Fixes #13042
---
 .../schematics/angular/universal/index.ts     | 50 +++++++++++++++++--
 .../angular/universal/index_spec.ts           | 30 +++++++++++
 2 files changed, 76 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/angular/universal/index.ts b/packages/schematics/angular/universal/index.ts
index de140e803377..a912c328294c 100644
--- a/packages/schematics/angular/universal/index.ts
+++ b/packages/schematics/angular/universal/index.ts
@@ -115,21 +115,63 @@ function wrapBootstrapCall(options: UniversalOptions): Rule {
     let currentCall = bootstrapCall;
     while (bootstrapCallExpression === null && currentCall.parent) {
       currentCall = currentCall.parent;
-      if (currentCall.kind === ts.SyntaxKind.ExpressionStatement) {
+      if (ts.isExpressionStatement(currentCall) || ts.isVariableStatement(currentCall)) {
         bootstrapCallExpression = currentCall;
       }
     }
     bootstrapCall = currentCall;
 
+    // In case the bootstrap code is a variable statement
+    // we need to determine it's usage
+    if (bootstrapCallExpression && ts.isVariableStatement(bootstrapCallExpression)) {
+      const declaration = bootstrapCallExpression.declarationList.declarations[0];
+      const bootstrapVar = (declaration.name as ts.Identifier).text;
+      const sf = bootstrapCallExpression.getSourceFile();
+      bootstrapCall = findCallExpressionNode(sf, bootstrapVar) || currentCall;
+    }
+
+    // indent contents
+    const triviaWidth = bootstrapCall.getLeadingTriviaWidth();
+    const beforeText = `document.addEventListener('DOMContentLoaded', () => {\n`
+      + ' '.repeat(triviaWidth > 2 ? triviaWidth + 1 : triviaWidth);
+    const afterText = `\n${triviaWidth > 2 ? ' '.repeat(triviaWidth - 1) : ''});`;
+
+    // in some cases we need to cater for a trailing semicolon such as;
+    // bootstrap().catch(err => console.log(err));
+    const lastToken = bootstrapCall.parent.getLastToken();
+    let endPos = bootstrapCall.getEnd();
+    if (lastToken && lastToken.kind === ts.SyntaxKind.SemicolonToken) {
+      endPos = lastToken.getEnd();
+    }
+
     const recorder = host.beginUpdate(mainPath);
-    const beforeText = `document.addEventListener('DOMContentLoaded', () => {\n  `;
-    const afterText = `\n});`;
     recorder.insertLeft(bootstrapCall.getStart(), beforeText);
-    recorder.insertRight(bootstrapCall.getEnd(), afterText);
+    recorder.insertRight(endPos, afterText);
     host.commitUpdate(recorder);
   };
 }
 
+function findCallExpressionNode(node: ts.Node, text: string): ts.Node | null {
+  if (
+    ts.isCallExpression(node)
+    && ts.isIdentifier(node.expression)
+    && node.expression.text === text
+  ) {
+    return node;
+  }
+
+  let foundNode: ts.Node | null = null;
+  ts.forEachChild(node, childNode => {
+    foundNode = findCallExpressionNode(childNode, text);
+
+    if (foundNode) {
+      return true;
+    }
+  });
+
+  return foundNode;
+}
+
 function addServerTransition(options: UniversalOptions): Rule {
   return (host: Tree) => {
     const clientProject = getProject(host, options.clientProject);
diff --git a/packages/schematics/angular/universal/index_spec.ts b/packages/schematics/angular/universal/index_spec.ts
index 9f228e3529d9..e1a85803b928 100644
--- a/packages/schematics/angular/universal/index_spec.ts
+++ b/packages/schematics/angular/universal/index_spec.ts
@@ -153,6 +153,36 @@ describe('Universal Schematic', () => {
     expect(contents).toMatch(/document.addEventListener\('DOMContentLoaded', \(\) => {/);
   });
 
+  it('should wrap the bootstrap decleration in a DOMContentLoaded event handler', () => {
+    const filePath = '/projects/bar/src/main.ts';
+    appTree.overwrite(
+      filePath,
+      `
+      import { enableProdMode } from '@angular/core';
+      import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+      import { AppModule } from './app/app.module';
+      import { environment } from './environments/environment';
+      import { hmrBootstrap } from './hmr';
+
+      if (environment.production) {
+        enableProdMode();
+      }
+
+      const bootstrap = () => platformBrowserDynamic().bootstrapModule(AppModule);
+
+      if (!hmrBootstrap) {
+        bootstrap().catch(err => console.log(err));
+      }
+      `,
+    );
+
+    const tree = schematicRunner.runSchematic('universal', defaultOptions, appTree);
+    const contents = tree.readContent(filePath);
+    expect(contents).toMatch(
+      /document.addEventListener\('DOMContentLoaded', \(\) => {[\n\r\s]+bootstrap\(\)/,
+    );
+  });
+
   it('should install npm dependencies', () => {
     schematicRunner.runSchematic('universal', defaultOptions, appTree);
     expect(schematicRunner.tasks.length).toBe(1);

From d6c0e6fdef44a8e5441067959984ee52ae795efe Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Mon, 17 Dec 2018 09:03:53 -0800
Subject: [PATCH 0573/1703] docs: edit ng serve option doc

---
 packages/angular/cli/lib/config/schema.json | 44 ++++++++++-----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index 81a110fa73c0..1156fc23713c 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -1063,18 +1063,18 @@
             },
             "open": {
               "type": "boolean",
-              "description": "Opens the url in default browser.",
+              "description": "When true, open the live-reload URL in default browser.",
               "default": false,
               "alias": "o"
             },
             "liveReload": {
               "type": "boolean",
-              "description": "Whether to reload the page on change, using live-reload.",
+              "description": "When true, reload the page on change using live-reload.",
               "default": true
             },
             "publicHost": {
               "type": "string",
-              "description": "Specify the URL that the browser client will use."
+              "description": "The URL that the browser client will use for live reload."
             },
             "servePath": {
               "type": "string",
@@ -1082,43 +1082,43 @@
             },
             "disableHostCheck": {
               "type": "boolean",
-              "description": "Don't verify connected clients are part of allowed hosts.",
+              "description": "When true, don't verify that connected clients are part of allowed hosts.",
               "default": false
             },
             "hmr": {
               "type": "boolean",
-              "description": "Enable hot module replacement.",
+              "description": "When true, enable hot module replacement.",
               "default": false
             },
             "watch": {
               "type": "boolean",
-              "description": "Rebuild on change.",
+              "description": "When true, rebuild on change.",
               "default": true
             },
             "hmrWarning": {
               "type": "boolean",
-              "description": "Show a warning when the --hmr option is enabled.",
+              "description": "When true, show a warning when the --hmr option is enabled.",
               "default": true
             },
             "servePathDefaultWarning": {
               "type": "boolean",
-              "description": "Show a warning when deploy-url/base-href use unsupported serve path values.",
+              "description": "When true, show a warning when deploy-url/base-href use unsupported serve path values.",
               "default": true
             },
             "optimization": {
-              "description": "Enables optimization of the build output.",
+              "description": "Enable optimization of the build output.",
               "oneOf": [
                 {
                   "type": "object",
                   "properties": {
                     "scripts": {
                       "type": "boolean",
-                      "description": "Enables optimization of the scripts output.",
+                      "description": "When true, enable optimization of the scripts output.",
                       "default": true
                     },
                     "styles": {
                       "type": "boolean",
-                      "description": "Enables optimization of the styles output.",
+                      "description": "When true, enable optimization of the styles output.",
                       "default": true
                     }
                   },
@@ -1131,10 +1131,10 @@
             },
             "aot": {
               "type": "boolean",
-              "description": "Build using Ahead of Time compilation."
+              "description": "Build using ahead-of-time compilation."
             },
             "sourceMap": {
-              "description": "Output sourcemaps.",
+              "description": "When true, output sourcemaps.",
               "default": true,
               "oneOf": [
                 {
@@ -1142,17 +1142,17 @@
                   "properties": {
                     "scripts": {
                       "type": "boolean",
-                      "description": "Output sourcemaps for all scripts.",
+                      "description": "When true, output sourcemaps for all scripts.",
                       "default": true
                     },
                     "styles": {
                       "type": "boolean",
-                      "description": "Output sourcemaps for all styles.",
+                      "description": "When true, output sourcemaps for all styles.",
                       "default": true
                     },
                     "vendor": {
                       "type": "boolean",
-                      "description": "Resolve vendor packages sourcemaps.",
+                      "description": "When true, resolve vendor packages sourcemaps.",
                       "default": false
                     }
                   },
@@ -1165,20 +1165,20 @@
             },
             "vendorSourceMap": {
               "type": "boolean",
-              "description": "Resolve vendor packages sourcemaps.",
+              "description": "When true, resolve vendor packages sourcemaps.",
               "default": false
             },
             "evalSourceMap": {
               "type": "boolean",
-              "description": "Output in-file eval sourcemaps."
+              "description": "When true, output in-file eval sourcemaps."
             },
             "vendorChunk": {
               "type": "boolean",
-              "description": "Use a separate bundle containing only vendor libraries."
+              "description": "When true, use a separate bundle containing only vendor libraries."
             },
             "commonChunk": {
               "type": "boolean",
-              "description": "Use a separate bundle containing code used across multiple bundles."
+              "description": "When true, use a separate bundle containing code used across multiple bundles."
             },
             "baseHref": {
               "type": "string",
@@ -1190,11 +1190,11 @@
             },
             "verbose": {
               "type": "boolean",
-              "description": "Adds more details to output logging."
+              "description": "When true, add more details to output logging."
             },
             "progress": {
               "type": "boolean",
-              "description": "Log progress to the console while building."
+              "description": "When true, log progress to the console while building."
             }
           },
           "additionalProperties": false

From 019a4df631a39a189c4e7aa0af026e9eceac9ab9 Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Thu, 20 Dec 2018 10:45:42 -0800
Subject: [PATCH 0574/1703] docs: clarify public-host option

---
 packages/angular/cli/lib/config/schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index 1156fc23713c..120220201b35 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -1074,7 +1074,7 @@
             },
             "publicHost": {
               "type": "string",
-              "description": "The URL that the browser client will use for live reload."
+              "description": "The URL that the browser client (or live-reload client, if enabled) should use to connect to the development server. Use for a complex server setup, such as one with reverse proxies."
             },
             "servePath": {
               "type": "string",

From 4729397a680010ceb79b8cdfea96295a74e16715 Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Fri, 21 Dec 2018 14:39:38 -0800
Subject: [PATCH 0575/1703] docs: dev server

---
 packages/angular/cli/lib/config/schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index 120220201b35..7006c36b84ca 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -1074,7 +1074,7 @@
             },
             "publicHost": {
               "type": "string",
-              "description": "The URL that the browser client (or live-reload client, if enabled) should use to connect to the development server. Use for a complex server setup, such as one with reverse proxies."
+              "description": "The URL that the browser client (or live-reload client, if enabled) should use to connect to the development server. Use for a complex dev server setup, such as one with reverse proxies."
             },
             "servePath": {
               "type": "string",

From 3b52fa43d318ec227267155bc600e041a36ba267 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Fri, 21 Dec 2018 13:18:25 +0000
Subject: [PATCH 0576/1703] fix(@angular-devkit/build-angular): resolve project
 root for fork process

Fix https://github.com/angular/angular-cli/issues/13113
---
 packages/angular_devkit/build_angular/src/protractor/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/protractor/index.ts b/packages/angular_devkit/build_angular/src/protractor/index.ts
index ddbd55e85a77..d00e92608e1b 100644
--- a/packages/angular_devkit/build_angular/src/protractor/index.ts
+++ b/packages/angular_devkit/build_angular/src/protractor/index.ts
@@ -142,7 +142,7 @@ export class ProtractorBuilder implements Builder<ProtractorBuilderOptions> {
     // process. To work around this we run it in a subprocess.
     // https://github.com/angular/protractor/issues/4160
     return runModuleAsObservableFork(
-      root,
+      getSystemPath(root),
       'protractor/built/launcher',
       'init',
       [

From de0c5b84b4e71d3ca6f7d5c72650128360b5f8cf Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 22 Dec 2018 06:37:51 +0000
Subject: [PATCH 0577/1703] build: update pacote to version 9.3.0

---
 packages/schematics/update/package.json |  2 +-
 yarn.lock                               | 99 ++++++++++++++++++++++++-
 2 files changed, 98 insertions(+), 3 deletions(-)

diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index c002876e642f..a07e4f22f229 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -14,7 +14,7 @@
     "@angular-devkit/schematics": "0.0.0",
     "@yarnpkg/lockfile": "1.1.0",
     "ini": "1.3.5",
-    "pacote": "9.2.3",
+    "pacote": "9.3.0",
     "semver": "5.6.0",
     "semver-intersect": "1.4.0",
     "rxjs": "6.3.3"
diff --git a/yarn.lock b/yarn.lock
index 86175fe07d42..c341008e0715 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1424,6 +1424,11 @@ bluebird@^3.3.0, bluebird@^3.4.6, bluebird@^3.5.1, bluebird@^3.5.2:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a"
   integrity sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==
 
+bluebird@^3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
+  integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
+
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
@@ -1784,6 +1789,26 @@ cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0:
     unique-filename "^1.1.0"
     y18n "^4.0.0"
 
+cacache@^11.3.2:
+  version "11.3.2"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
+  integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==
+  dependencies:
+    bluebird "^3.5.3"
+    chownr "^1.1.1"
+    figgy-pudding "^3.5.1"
+    glob "^7.1.3"
+    graceful-fs "^4.1.15"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.2"
+    ssri "^6.0.1"
+    unique-filename "^1.1.1"
+    y18n "^4.0.0"
+
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -1945,6 +1970,11 @@ chownr@^1.0.1:
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
   integrity sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=
 
+chownr@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
+  integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
+
 chrome-trace-event@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"
@@ -4257,6 +4287,11 @@ graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
   integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
 
+graceful-fs@^4.1.15:
+  version "4.1.15"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
+  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
+
 handle-thing@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
@@ -5987,6 +6022,13 @@ lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
 magic-string@^0.22.4:
   version "0.22.5"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
@@ -6337,7 +6379,7 @@ minipass@^2.2.1, minipass@^2.3.3:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
-minipass@^2.3.5:
+minipass@^2.3.4, minipass@^2.3.5:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
   integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
@@ -6352,6 +6394,13 @@ minizlib@^1.1.0:
   dependencies:
     minipass "^2.2.1"
 
+minizlib@^1.1.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
+  integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==
+  dependencies:
+    minipass "^2.2.1"
+
 mississippi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
@@ -7187,7 +7236,40 @@ package-json@^4.0.0:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
-pacote@9.2.3, pacote@^9.2.3:
+pacote@9.3.0:
+  version "9.3.0"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.3.0.tgz#ec0d21b739a625d81a19ae546386fedee3300bc1"
+  integrity sha512-uy5xghB5wUtmFS+uNhQGhlsIF9rfsfxw6Zsu2VpmSz4/f+8D2+5V1HwjHdSn7W6aQTrxNNmmoUF5qNE10/EVdA==
+  dependencies:
+    bluebird "^3.5.3"
+    cacache "^11.3.2"
+    figgy-pudding "^3.5.1"
+    get-stream "^4.1.0"
+    glob "^7.1.3"
+    lru-cache "^5.1.1"
+    make-fetch-happen "^4.0.1"
+    minimatch "^3.0.4"
+    minipass "^2.3.5"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    normalize-package-data "^2.4.0"
+    npm-package-arg "^6.1.0"
+    npm-packlist "^1.1.12"
+    npm-pick-manifest "^2.2.3"
+    npm-registry-fetch "^3.8.0"
+    osenv "^0.1.5"
+    promise-inflight "^1.0.1"
+    promise-retry "^1.1.1"
+    protoduck "^5.0.1"
+    rimraf "^2.6.2"
+    safe-buffer "^5.1.2"
+    semver "^5.6.0"
+    ssri "^6.0.1"
+    tar "^4.4.8"
+    unique-filename "^1.1.1"
+    which "^1.3.1"
+
+pacote@^9.2.3:
   version "9.2.3"
   resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.2.3.tgz#48cfe87beb9177acd6594355a584a538835424b3"
   integrity sha512-Y3+yY3nBRAxMlZWvr62XLJxOwCmG9UmkGZkFurWHoCjqF0cZL72cTOCRJTvWw8T4OhJS2RTg13x4oYYriauvEw==
@@ -9496,6 +9578,19 @@ tar@^4, tar@^4.4.4, tar@^4.4.6:
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
 
+tar@^4.4.8:
+  version "4.4.8"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
+  integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==
+  dependencies:
+    chownr "^1.1.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.3.4"
+    minizlib "^1.1.1"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.2"
+
 temp@^0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.0.tgz#61391795a11bd9738d4c4d7f55f012cb8f55edaa"

From 28b97db93ad4d216ae621ba36ffb10cea1399919 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 24 Dec 2018 10:10:10 +0000
Subject: [PATCH 0578/1703] build: update webpack-dev-server to version 3.1.14

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 97 ++++++++++++++++++-
 2 files changed, 93 insertions(+), 6 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index c5f4a88ae60e..63cdbff4b4fd 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -48,7 +48,7 @@
     "terser-webpack-plugin": "1.1.0",
     "webpack": "4.28.2",
     "webpack-dev-middleware": "3.4.0",
-    "webpack-dev-server": "3.1.10",
+    "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.1.5",
     "webpack-sources": "1.3.0",
     "webpack-subresource-integrity": "1.1.0-rc.6"
diff --git a/yarn.lock b/yarn.lock
index c341008e0715..4701ac72e859 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2811,6 +2811,13 @@ debug@^3.2.5:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+  dependencies:
+    ms "^2.1.1"
+
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
@@ -2984,7 +2991,7 @@ detect-libc@^1.0.2:
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
   integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
 
-detect-node@^2.0.3:
+detect-node@^2.0.3, detect-node@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
   integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
@@ -4297,6 +4304,11 @@ handle-thing@^1.2.5:
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
   integrity sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=
 
+handle-thing@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754"
+  integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
+
 handlebars@^4.0.1, handlebars@^4.0.11, handlebars@^4.0.2:
   version "4.0.12"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5"
@@ -7015,7 +7027,7 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-obuf@^1.0.0, obuf@^1.1.1:
+obuf@^1.0.0, obuf@^1.1.1, obuf@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
   integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
@@ -8089,6 +8101,15 @@ readable-stream@1.1.x, "readable-stream@1.x >=1.1.9":
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
+readable-stream@^3.0.6:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.1.1.tgz#ed6bbc6c5ba58b090039ff18ce670515795aeb06"
+  integrity sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
 readable-stream@~2.0.5, readable-stream@~2.0.6:
   version "2.0.6"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
@@ -9205,6 +9226,18 @@ spdy-transport@^2.0.18:
     safe-buffer "^5.0.1"
     wbuf "^1.7.2"
 
+spdy-transport@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
+  integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==
+  dependencies:
+    debug "^4.1.0"
+    detect-node "^2.0.4"
+    hpack.js "^2.1.6"
+    obuf "^1.1.2"
+    readable-stream "^3.0.6"
+    wbuf "^1.7.3"
+
 spdy@^3.4.1:
   version "3.4.7"
   resolved "https://registry.yarnpkg.com/spdy/-/spdy-3.4.7.tgz#42ff41ece5cc0f99a3a6c28aabb73f5c3b03acbc"
@@ -9217,6 +9250,17 @@ spdy@^3.4.1:
     select-hose "^2.0.0"
     spdy-transport "^2.0.18"
 
+spdy@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.0.tgz#81f222b5a743a329aa12cea6a390e60e9b613c52"
+  integrity sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==
+  dependencies:
+    debug "^4.1.0"
+    handle-thing "^2.0.0"
+    http-deceiver "^1.2.7"
+    select-hose "^2.0.0"
+    spdy-transport "^3.0.0"
+
 speed-measure-webpack-plugin@1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.2.3.tgz#de170b5cefbfa1c039d95e639edd3ad50cfc7c48"
@@ -9420,6 +9464,13 @@ string_decoder@^1.0.0, string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+string_decoder@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
+  integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==
+  dependencies:
+    safe-buffer "~5.1.0"
+
 string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
@@ -10138,7 +10189,7 @@ useragent@^2.1.12:
     lru-cache "4.1.x"
     tmp "0.0.x"
 
-util-deprecate@~1.0.1:
+util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
@@ -10237,7 +10288,7 @@ watchpack@^1.5.0:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
 
-wbuf@^1.1.0, wbuf@^1.7.2:
+wbuf@^1.1.0, wbuf@^1.7.2, wbuf@^1.7.3:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
   integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
@@ -10300,7 +10351,43 @@ webpack-dev-middleware@3.4.0:
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
-webpack-dev-server@3.1.10, webpack-dev-server@^3.1.4:
+webpack-dev-server@3.1.14:
+  version "3.1.14"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz#60fb229b997fc5a0a1fc6237421030180959d469"
+  integrity sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==
+  dependencies:
+    ansi-html "0.0.7"
+    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 "^2.0.0"
+    internal-ip "^3.0.1"
+    ip "^1.1.5"
+    killable "^1.0.0"
+    loglevel "^1.4.1"
+    opn "^5.1.0"
+    portfinder "^1.0.9"
+    schema-utils "^1.0.0"
+    selfsigned "^1.9.1"
+    semver "^5.6.0"
+    serve-index "^1.7.2"
+    sockjs "0.3.19"
+    sockjs-client "1.3.0"
+    spdy "^4.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^5.1.0"
+    url "^0.11.0"
+    webpack-dev-middleware "3.4.0"
+    webpack-log "^2.0.0"
+    yargs "12.0.2"
+
+webpack-dev-server@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.10.tgz#507411bee727ee8d2fdffdc621b66a64ab3dea2b"
   integrity sha512-RqOAVjfqZJtQcB0LmrzJ5y4Jp78lv9CK0MZ1YJDTaTmedMZ9PU9FLMQNrMCfVu8hHzaVLVOJKBlGEHMN10z+ww==

From 0649f37ea31e9dee8e95bf4be271f1f1f4ac76ad Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Sat, 22 Dec 2018 10:19:09 +0100
Subject: [PATCH 0579/1703] docs: remove autocomplete link

Autocomplete is not longer available in version 6/7
---
 docs/documentation/stories.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/documentation/stories.md b/docs/documentation/stories.md
index 3d21cda0a10c..b32673dcf112 100644
--- a/docs/documentation/stories.md
+++ b/docs/documentation/stories.md
@@ -5,7 +5,6 @@
  - [1.0 Update](stories/1.0-update)
  - [App Shell](stories/app-shell)
  - [Asset Configuration](stories/asset-configuration)
- - [Autocompletion](stories/autocompletion)
  - [Configure Hot Module Replacement](stories/configure-hmr)
  - [CSS Preprocessors](stories/css-preprocessors)
  - [Global Lib](stories/global-lib)

From 5b7464ace835bc5ca8fb73c9ff9fc295449635bc Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 26 Dec 2018 19:54:29 +0000
Subject: [PATCH 0580/1703] build: update terser-webpack-plugin to version
 1.2.0

---
 .../angular_devkit/build_angular/package.json    |  2 +-
 yarn.lock                                        | 16 +---------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 63cdbff4b4fd..c88682b15be7 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -45,7 +45,7 @@
     "stylus": "0.54.5",
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
-    "terser-webpack-plugin": "1.1.0",
+    "terser-webpack-plugin": "1.2.0",
     "webpack": "4.28.2",
     "webpack-dev-middleware": "3.4.0",
     "webpack-dev-server": "3.1.14",
diff --git a/yarn.lock b/yarn.lock
index 4701ac72e859..e8119a0f3f07 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9656,21 +9656,7 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
-terser-webpack-plugin@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.1.0.tgz#cf7c25a1eee25bf121f4a587bb9e004e3f80e528"
-  integrity sha512-61lV0DSxMAZ8AyZG7/A4a3UPlrbOBo8NIQ4tJzLPAdGOQ+yoNC7l5ijEow27lBAL2humer01KLS6bGIMYQxKoA==
-  dependencies:
-    cacache "^11.0.2"
-    find-cache-dir "^2.0.0"
-    schema-utils "^1.0.0"
-    serialize-javascript "^1.4.0"
-    source-map "^0.6.1"
-    terser "^3.8.1"
-    webpack-sources "^1.1.0"
-    worker-farm "^1.5.2"
-
-terser-webpack-plugin@^1.1.0:
+terser-webpack-plugin@1.2.0, terser-webpack-plugin@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.0.tgz#24697213f2128009080f39f081c18cb2221d91ff"
   integrity sha512-QW7RACLS89RalHtLDb0s8+Iqcs/IAEw1rnVrV+mS7Gx1kgPG8o1g33JhAGDgc/CQ84hLsTW5WrAMdVysh692yg==

From 2f262bb75f7b072237a5d14d8d10abe64aae2de1 Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Tue, 18 Dec 2018 10:10:05 +0100
Subject: [PATCH 0581/1703] feat(@schematics/angular): extend
 tslint:recommended

Updates the `tslint.json` file to extend to the `tslint:recommended` set.
Removes the rules that have the same value as the recommended one and explicitely deactivates some rules that are activated in the recommended set, but were not in ours.
---
 .../angular/workspace/files/tslint.json       | 70 ++++++++-----------
 1 file changed, 28 insertions(+), 42 deletions(-)

diff --git a/packages/schematics/angular/workspace/files/tslint.json b/packages/schematics/angular/workspace/files/tslint.json
index c740a7b2a595..91c17188f18d 100644
--- a/packages/schematics/angular/workspace/files/tslint.json
+++ b/packages/schematics/angular/workspace/files/tslint.json
@@ -1,32 +1,25 @@
 {
+  "extends": "tslint:recommended",
   "rulesDirectory": [
     "codelyzer"
   ],
   "rules": {
-    "arrow-return-shorthand": true,
-    "callable-types": true,
-    "class-name": true,
-    "comment-format": [
-      true,
-      "check-space"
-    ],
-    "curly": true,
+    "adjacent-overload-signatures": false,
+    "align": false,
+    "array-type": false,
+    "arrow-parens": false,
+    "ban-types": false,
     "deprecation": {
       "severity": "warn"
     },
-    "eofline": true,
-    "forin": true,
+    "function-constructor": false,
     "import-blacklist": [
       true,
       "rxjs/Rx"
     ],
-    "import-spacing": true,
-    "indent": [
-      true,
-      "spaces"
-    ],
-    "interface-over-type-literal": true,
-    "label-position": true,
+    "interface-name": false,
+    "jsdoc-format": false,
+    "max-classes-per-file": false,
     "max-line-length": [
       true,
       140
@@ -43,8 +36,10 @@
         ]
       }
     ],
-    "no-arg": true,
-    "no-bitwise": true,
+    "new-parens": false,
+    "no-angle-bracket-type-assertion": false,
+    "no-conditional-assignment": false,
+    "no-consecutive-blank-lines": false,
     "no-console": [
       true,
       "debug",
@@ -53,28 +48,23 @@
       "timeEnd",
       "trace"
     ],
-    "no-construct": true,
-    "no-debugger": true,
-    "no-duplicate-super": true,
     "no-empty": false,
-    "no-empty-interface": true,
-    "no-eval": true,
     "no-inferrable-types": [
       true,
       "ignore-params"
     ],
-    "no-misused-new": true,
+    "no-namespace": false,
     "no-non-null-assertion": true,
     "no-redundant-jsdoc": true,
-    "no-shadowed-variable": true,
+    "no-reference": false,
+    "no-reference-import": false,
     "no-string-literal": false,
-    "no-string-throw": true,
     "no-switch-case-fall-through": true,
-    "no-trailing-whitespace": true,
-    "no-unnecessary-initializer": true,
-    "no-unused-expression": true,
+    "no-unsafe-finally": false,
     "no-use-before-declare": true,
-    "no-var-keyword": true,
+    "no-var-requires": false,
+    "object-literal-key-quotes": false,
+    "object-literal-shorthand": false,
     "object-literal-sort-keys": false,
     "one-line": [
       true,
@@ -83,20 +73,16 @@
       "check-else",
       "check-whitespace"
     ],
-    "prefer-const": true,
+    "one-variable-per-declaration": false,
+    "only-arrow-functions": false,
+    "ordered-imports": false,
+    "prefer-for-of": false,
     "quotemark": [
       true,
       "single"
     ],
-    "radix": true,
-    "semicolon": [
-      true,
-      "always"
-    ],
-    "triple-equals": [
-      true,
-      "allow-null-check"
-    ],
+    "space-before-function-paren": false,
+    "trailing-comma": false,
     "typedef-whitespace": [
       true,
       {
@@ -107,7 +93,7 @@
         "variable-declaration": "nospace"
       }
     ],
-    "unified-signatures": true,
+    "use-isnan": false,
     "variable-name": false,
     "whitespace": [
       true,

From 2326850374cd393a825e339beb5846afcff87f8a Mon Sep 17 00:00:00 2001
From: Christian Liebel <christian.liebel@thinktecture.com>
Date: Fri, 9 Nov 2018 23:24:42 +0100
Subject: [PATCH 0582/1703] refactor(@angular/pwa): rename manifest.json to
 manifest.webmanifest

Using the `webmanifest` file extension makes it easier to target the web app manifest in server configs and apply the correct MIME type (see https://github.com/w3c/manifest/issues/689#issuecomment-402773032).
---
 .../root/{manifest.json => manifest.webmanifest}     |  0
 packages/angular/pwa/pwa/index.ts                    |  4 ++--
 packages/angular/pwa/pwa/index_spec.ts               | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename packages/angular/pwa/pwa/files/root/{manifest.json => manifest.webmanifest} (100%)

diff --git a/packages/angular/pwa/pwa/files/root/manifest.json b/packages/angular/pwa/pwa/files/root/manifest.webmanifest
similarity index 100%
rename from packages/angular/pwa/pwa/files/root/manifest.json
rename to packages/angular/pwa/pwa/files/root/manifest.webmanifest
diff --git a/packages/angular/pwa/pwa/index.ts b/packages/angular/pwa/pwa/index.ts
index 9eb869c7c5cf..45ce584abe6c 100644
--- a/packages/angular/pwa/pwa/index.ts
+++ b/packages/angular/pwa/pwa/index.ts
@@ -74,7 +74,7 @@ function updateIndexFile(path: string): Rule {
 
     rewriter.on('endTag', (endTag: { tagName: string }) => {
       if (endTag.tagName === 'head') {
-        rewriter.emitRaw('  <link rel="manifest" href="manifest.json">\n');
+        rewriter.emitRaw('  <link rel="manifest" href="manifest.webmanifest">\n');
         rewriter.emitRaw('  <meta name="theme-color" content="#1976d2">\n');
       } else if (endTag.tagName === 'body' && needsNoScript) {
         rewriter.emitRaw(
@@ -156,7 +156,7 @@ export default function (options: PwaOptions): Rule {
     }
 
     // Add manifest to asset configuration
-    const assetEntry = join(normalize(project.root), 'src', 'manifest.json');
+    const assetEntry = join(normalize(project.root), 'src', 'manifest.webmanifest');
     for (const target of [...buildTargets, ...testTargets]) {
       if (target.options) {
         if (target.options.assets) {
diff --git a/packages/angular/pwa/pwa/index_spec.ts b/packages/angular/pwa/pwa/index_spec.ts
index f716847f47ff..e051ee1729cc 100644
--- a/packages/angular/pwa/pwa/index_spec.ts
+++ b/packages/angular/pwa/pwa/index_spec.ts
@@ -71,14 +71,14 @@ describe('PWA Schematic', () => {
 
   it('should create a manifest file', (done) => {
     schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise().then(tree => {
-      expect(tree.exists('/projects/bar/src/manifest.json')).toEqual(true);
+      expect(tree.exists('/projects/bar/src/manifest.webmanifest')).toEqual(true);
       done();
     }, done.fail);
   });
 
   it('should set the name & short_name in the manifest file', (done) => {
     schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise().then(tree => {
-      const manifestText = tree.readContent('/projects/bar/src/manifest.json');
+      const manifestText = tree.readContent('/projects/bar/src/manifest.webmanifest');
       const manifest = JSON.parse(manifestText);
 
       expect(manifest.name).toEqual(defaultOptions.title);
@@ -90,7 +90,7 @@ describe('PWA Schematic', () => {
   it('should set the name & short_name in the manifest file when no title provided', (done) => {
     const options = {...defaultOptions, title: undefined};
     schematicRunner.runSchematicAsync('ng-add', options, appTree).toPromise().then(tree => {
-      const manifestText = tree.readContent('/projects/bar/src/manifest.json');
+      const manifestText = tree.readContent('/projects/bar/src/manifest.webmanifest');
       const manifest = JSON.parse(manifestText);
 
       expect(manifest.name).toEqual(defaultOptions.project);
@@ -103,7 +103,7 @@ describe('PWA Schematic', () => {
     schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise().then(tree => {
       const content = tree.readContent('projects/bar/src/index.html');
 
-      expect(content).toMatch(/<link rel="manifest" href="manifest.json">/);
+      expect(content).toMatch(/<link rel="manifest" href="manifest.webmanifest">/);
       expect(content).toMatch(/<meta name="theme-color" content="#1976d2">/);
       expect(content)
         .toMatch(/<noscript>Please enable JavaScript to continue using this application.<\/noscript>/);
@@ -118,7 +118,7 @@ describe('PWA Schematic', () => {
     schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise().then(tree => {
       const content = tree.readContent('projects/bar/src/index.html');
 
-      expect(content).toMatch(/<link rel="manifest" href="manifest.json">/);
+      expect(content).toMatch(/<link rel="manifest" href="manifest.webmanifest">/);
       expect(content).toMatch(/<meta name="theme-color" content="#1976d2">/);
       expect(content).not
         .toMatch(/<noscript>Please enable JavaScript to continue using this application.<\/noscript>/);
@@ -134,7 +134,7 @@ describe('PWA Schematic', () => {
       const targets = config.projects.bar.architect;
 
       ['build', 'test'].forEach((target) => {
-        expect(targets[target].options.assets).toContain('projects/bar/src/manifest.json');
+        expect(targets[target].options.assets).toContain('projects/bar/src/manifest.webmanifest');
       });
       done();
     }, done.fail);

From 886b5c365eafaeaa86f73604458af554e936bb93 Mon Sep 17 00:00:00 2001
From: Deddy Kosasih <dkosasih@gmail.com>
Date: Mon, 24 Dec 2018 11:47:24 +1100
Subject: [PATCH 0583/1703] docs: add documentation for using font awesome and
 scss

fixes #10861
---
 .../stories/include-font-awesome.md           | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/docs/documentation/stories/include-font-awesome.md b/docs/documentation/stories/include-font-awesome.md
index dad47e6d2d7b..66b104a8fcc6 100644
--- a/docs/documentation/stories/include-font-awesome.md
+++ b/docs/documentation/stories/include-font-awesome.md
@@ -23,13 +23,31 @@ To add Font Awesome CSS icons to your app...
 "build": {
   "options": {
     "styles": [
-      "../node_modules/font-awesome/css/font-awesome.css"
-      "styles.css"
+      "../node_modules/font-awesome/css/font-awesome.css",
+      "src/styles.css"
     ],
   }
 }
 ```
 ### Using SASS
+Create new project with SASS:
+```
+ng new cli-app --style=scss
+```
+To use with existing project with `CSS`:
+1. Rename `src/styles.css` to `src/styles.scss`
+2. Change `angular.json` to look for `styles.scss` instead of css:
+```
+// in angular.json
+"build": {
+  "options": {
+    "styles": [
+      "src/styles.scss"
+    ],
+  }
+}
+```
+Make sure to change `styles.css` to `styles.scss`.
 
 Create an empty file _variables.scss in src/.
 

From b233e8f59df501c044dba7d300e2d3f13381a13d Mon Sep 17 00:00:00 2001
From: Tiago Temporin <tiaguinhocab@gmail.com>
Date: Mon, 24 Dec 2018 10:57:23 +0000
Subject: [PATCH 0584/1703] refactor(@angular-devkit/build-angular): improve
 check port

Closes 8595
---
 .../angular_devkit/build_angular/package.json |  1 -
 .../angular-cli-files/utilities/check-port.ts | 46 +++++++++++--------
 .../build_angular/src/dev-server/index.ts     |  4 +-
 yarn.lock                                     |  9 ----
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index c88682b15be7..f312652f5379 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -29,7 +29,6 @@
     "minimatch": "3.0.4",
     "parse5": "4.0.0",
     "opn": "5.4.0",
-    "portfinder": "1.0.20",
     "postcss": "7.0.7",
     "postcss-import": "12.0.1",
     "postcss-loader": "3.0.0",
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/check-port.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/check-port.ts
index 316dac751e02..9c649cad133b 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/check-port.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/check-port.ts
@@ -5,26 +5,36 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import * as net from 'net';
 
-import { Observable } from 'rxjs';
-const portfinder = require('portfinder');
+export function checkPort(port: number, host: string, basePort = 49152): Promise<number> {
+  return new Promise<number>((resolve, reject) => {
+    function _getPort(portNumber: number) {
+      if (portNumber > 65535) {
+        reject(new Error(`There is no port available.`));
+      }
 
+      const server = net.createServer();
 
-export function checkPort(port: number, host: string, basePort = 49152): Observable<number> {
-  return new Observable(obs => {
-    portfinder.basePort = basePort;
-    // tslint:disable:no-any
-    portfinder.getPort({ port, host }, (err: any, foundPort: number) => {
-      if (err) {
-        obs.error(err);
-      } else if (port !== foundPort && port !== 0) {
-        // If the port isn't available and we weren't looking for any port, throw error.
-        obs.error(`Port ${port} is already in use. Use '--port' to specify a different port.`);
-      } else {
-        // Otherwise, our found port is good.
-        obs.next(foundPort);
-        obs.complete();
-      }
-    });
+      server.once('error', (err: Error & {code: string}) => {
+        if (err.code !== 'EADDRINUSE') {
+          reject(err);
+        } else if (port === 0) {
+          _getPort(portNumber + 1);
+        } else {
+          // If the port isn't available and we weren't looking for any port, throw error.
+          reject(
+            new Error(`Port ${port} is already in use. Use '--port' to specify a different port.`),
+          );
+        }
+      })
+      .once('listening', () => {
+        server.close();
+        resolve(portNumber);
+      })
+      .listen(portNumber, host);
+    }
+
+    _getPort(port || basePort);
   });
 }
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index 62485375f8ab..51bc0c5cf153 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -16,7 +16,7 @@ import { WebpackDevServerBuilder } from '@angular-devkit/build-webpack';
 import { Path, getSystemPath, resolve, tags, virtualFs } from '@angular-devkit/core';
 import { Stats, existsSync, readFileSync } from 'fs';
 import * as path from 'path';
-import { Observable, throwError } from 'rxjs';
+import { Observable, from, throwError } from 'rxjs';
 import { concatMap, map, tap } from 'rxjs/operators';
 import * as url from 'url';
 import * as webpack from 'webpack';
@@ -67,7 +67,7 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
     let first = true;
     let opnAddress: string;
 
-    return checkPort(options.port, options.host).pipe(
+    return from(checkPort(options.port, options.host)).pipe(
       tap((port) => options.port = port),
       concatMap(() => this._getBrowserOptions(options)),
       tap(opts => browserOptions = normalizeBuilderSchema(
diff --git a/yarn.lock b/yarn.lock
index e8119a0f3f07..362ea87c257a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7574,15 +7574,6 @@ popper.js@^1.14.1:
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.4.tgz#8eec1d8ff02a5a3a152dd43414a15c7b79fd69b6"
   integrity sha1-juwdj/AqWjoVLdQ0FKFce3n9abY=
 
-portfinder@1.0.20:
-  version "1.0.20"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
-  integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==
-  dependencies:
-    async "^1.5.2"
-    debug "^2.2.0"
-    mkdirp "0.5.x"
-
 portfinder@^1.0.9:
   version "1.0.19"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.19.tgz#07e87914a55242dcda5b833d42f018d6875b595f"

From c045a7fea43583246f19bc302679c8780a6fd1db Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 27 Dec 2018 06:45:38 +0000
Subject: [PATCH 0585/1703] build: update speed-measure-webpack-plugin to
 version 1.2.5

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index f312652f5379..faf4ac15a177 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -38,7 +38,7 @@
     "semver": "5.6.0",
     "source-map-support": "0.5.9",
     "source-map-loader": "0.2.4",
-    "speed-measure-webpack-plugin": "1.2.3",
+    "speed-measure-webpack-plugin": "1.2.5",
     "stats-webpack-plugin": "0.7.0",
     "style-loader": "0.23.1",
     "stylus": "0.54.5",
diff --git a/yarn.lock b/yarn.lock
index 362ea87c257a..8b5a9427e959 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9252,10 +9252,10 @@ spdy@^4.0.0:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
-speed-measure-webpack-plugin@1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.2.3.tgz#de170b5cefbfa1c039d95e639edd3ad50cfc7c48"
-  integrity sha512-p+taQ69VkRUXYMoZOx2nxV/Tz8tt79ahctoZJyJDHWP7fEYvwFNf5Pd73k5kZ6auu0pTsPNLEUwWpM8mCk85Zw==
+speed-measure-webpack-plugin@1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.2.5.tgz#8179936eb8c5e891f7481bd5075a9ea9a0f74823"
+  integrity sha512-S/guYjC4Izn5wY2d0+M4zowED/F77Lxh9yjkTZ+XAr244pr9c1MYNcXcRe9lx2hmAj0GPbOrBXgOF2YIp/CZ8A==
   dependencies:
     chalk "^2.0.1"
 

From 36c242304280c6036a8e359c47af1dc7336a9cb8 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Thu, 27 Dec 2018 11:43:28 +0100
Subject: [PATCH 0586/1703] revert: fix(@ngtools/webpack): emit lazy routes
 errors on rebuilds

This reverts commit edb84b340ff996df2ca6a2aaf765304cc64fef3e

The team has decided to bring back the faster but potentially less accurate method of detecting lazy routes upon JIT rebuilds (first builds will always use the more complete Angular compiler method). Applications that do not have lazy routes within libraries and that only use direct string literals with loadChildren should not be affected by the potential of less accurate detection. Note that the function overload of loadChildren also does not apply to this situation.

For those projects where correctness of lazy route detection outweighs rebuild speed, please consider using AOT mode for development. AOT mode will also provide a full set of template errors as well which JIT mode is not capable of doing.

Fixes #13102
---
 .../test/browser/lazy-module_spec_large.ts    |  49 +--------
 .../test/browser/rebuild_spec_large.ts        |  27 -----
 .../webpack/src/angular_compiler_plugin.ts    |  45 +++++++-
 packages/ngtools/webpack/src/lazy_routes.ts   | 100 ++++++++++++++++++
 .../transformers/export_lazy_module_map.ts    |   5 +-
 5 files changed, 144 insertions(+), 82 deletions(-)
 create mode 100644 packages/ngtools/webpack/src/lazy_routes.ts

diff --git a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
index 001751bb86d2..2177de386354 100644
--- a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { DefaultTimeout, TestLogger, runTargetSpec } from '@angular-devkit/architect/testing';
+import { DefaultTimeout, runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, normalize } from '@angular-devkit/core';
-import { take, tap } from 'rxjs/operators';
+import { tap } from 'rxjs/operators';
 import { BrowserBuilderSchema } from '../../src';
 import { browserTargetSpec, host } from '../utils';
 
@@ -70,7 +70,6 @@ export const lazyModuleImport: { [path: string]: string } = {
   `,
 };
 
-// tslint:disable-next-line:no-big-function
 describe('Browser Builder lazy modules', () => {
 
   const outputPath = normalize('dist');
@@ -90,50 +89,6 @@ describe('Browser Builder lazy modules', () => {
     ).toPromise().then(done, done.fail);
   });
 
-  it('should show error when lazy route is invalid on watch mode AOT', (done) => {
-    host.writeMultipleFiles(lazyModuleFiles);
-    host.writeMultipleFiles(lazyModuleImport);
-    host.replaceInFile(
-      'src/app/app.module.ts',
-      'lazy.module#LazyModule',
-      'invalid.module#LazyModule',
-    );
-
-    const logger = new TestLogger('rebuild-lazy-errors');
-    const overrides = { watch: true, aot: true };
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout, logger).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(false)),
-      tap(() => {
-        expect(logger.includes('Could not resolve module')).toBe(true);
-        logger.clear();
-        host.appendToFile('src/main.ts', ' ');
-      }),
-      take(2),
-    ).toPromise().then(done, done.fail);
-  });
-
-  it('should show error when lazy route is invalid on watch mode JIT', (done) => {
-    host.writeMultipleFiles(lazyModuleFiles);
-    host.writeMultipleFiles(lazyModuleImport);
-    host.replaceInFile(
-      'src/app/app.module.ts',
-      'lazy.module#LazyModule',
-      'invalid.module#LazyModule',
-    );
-
-    const logger = new TestLogger('rebuild-lazy-errors');
-    const overrides = { watch: true, aot: false };
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout, logger).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(false)),
-      tap(() => {
-        expect(logger.includes('Could not resolve module')).toBe(true);
-        logger.clear();
-        host.appendToFile('src/main.ts', ' ');
-      }),
-      take(2),
-    ).toPromise().then(done, done.fail);
-  });
-
   it('supports lazy bundle for lazy routes with AOT', (done) => {
     host.writeMultipleFiles(lazyModuleFiles);
     host.writeMultipleFiles(lazyModuleImport);
diff --git a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
index 778b3b687376..acd6354a4aca 100644
--- a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
@@ -198,33 +198,6 @@ describe('Browser Builder rebuilds', () => {
     ).toPromise().then(done, done.fail);
   });
 
-  it('rebuilds shows error', (done) => {
-    host.replaceInFile('./src/app/app.component.ts', 'AppComponent', 'AppComponentZ');
-
-    const overrides = { watch: true, aot: false };
-    let buildCount = 1;
-    const logger = new TestLogger('rebuild-errors');
-
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 3, logger).pipe(
-      tap((buildEvent) => {
-        switch (buildCount) {
-          case 1:
-            expect(buildEvent.success).toBe(false);
-            expect(logger.includes('AppComponent cannot be used as an entry component')).toBe(true);
-            logger.clear();
-
-            host.replaceInFile('./src/app/app.component.ts', 'AppComponentZ', 'AppComponent');
-            break;
-
-          default:
-            expect(buildEvent.success).toBe(true);
-            break;
-        }
-        buildCount ++;
-      }),
-      take(2),
-    ).toPromise().then(done, done.fail);
-  });
 
   it('rebuilds after errors in AOT', (done) => {
     // Save the original contents of `./src/app/app.component.ts`.
diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index ae315372ed6e..d30cb42abcca 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -39,10 +39,10 @@ import { time, timeEnd } from './benchmark';
 import { WebpackCompilerHost, workaroundResolve } from './compiler_host';
 import { resolveEntryModuleFromMain } from './entry_resolver';
 import { DiagnosticMode, gatherDiagnostics, hasErrors } from './gather_diagnostics';
+import { LazyRouteMap, findLazyRoutes } from './lazy_routes';
 import { TypeScriptPathsPlugin } from './paths-plugin';
 import { WebpackResourceLoader } from './resource_loader';
 import {
-  LazyRouteMap,
   exportLazyModuleMap,
   exportNgFactory,
   findResources,
@@ -135,7 +135,7 @@ export class AngularCompilerPlugin {
   private _moduleResolutionCache: ts.ModuleResolutionCache;
   private _resourceLoader?: WebpackResourceLoader;
   // Contains `moduleImportPath#exportName` => `fullModulePath`.
-  private _lazyRoutes: LazyRouteMap = Object.create(null);
+  private _lazyRoutes: LazyRouteMap = {};
   private _tsConfigPath: string;
   private _entryModule: string | null;
   private _mainPath: string | undefined;
@@ -421,6 +421,22 @@ export class AngularCompilerPlugin {
     }
   }
 
+  private _findLazyRoutesInAst(changedFilePaths: string[]): LazyRouteMap {
+    time('AngularCompilerPlugin._findLazyRoutesInAst');
+    const result: LazyRouteMap = {};
+    for (const filePath of changedFilePaths) {
+      const fileLazyRoutes = findLazyRoutes(filePath, this._compilerHost, undefined,
+        this._compilerOptions);
+      for (const routeKey of Object.keys(fileLazyRoutes)) {
+        const route = fileLazyRoutes[routeKey];
+        result[routeKey] = route;
+      }
+    }
+    timeEnd('AngularCompilerPlugin._findLazyRoutesInAst');
+
+    return result;
+  }
+
   private _listLazyRoutesFromProgram(): LazyRouteMap {
     let entryRoute: string | undefined;
     let ngProgram: Program;
@@ -876,6 +892,12 @@ export class AngularCompilerPlugin {
     }
   }
 
+  private _getChangedTsFiles() {
+    return this._getChangedCompilationFiles()
+      .filter(k => (k.endsWith('.ts') || k.endsWith('.tsx')) && !k.endsWith('.d.ts'))
+      .filter(k => this._compilerHost.fileExists(k));
+  }
+
   private async _update() {
     time('AngularCompilerPlugin._update');
     // We only want to update on TS and template changes, but all kinds of files are on this
@@ -890,11 +912,26 @@ export class AngularCompilerPlugin {
     // Make a new program and load the Angular structure.
     await this._createOrUpdateProgram();
 
+    // Try to find lazy routes if we have an entry module.
+    // We need to run the `listLazyRoutes` the first time because it also navigates libraries
+    // and other things that we might miss using the (faster) findLazyRoutesInAst.
+    // Lazy routes modules will be read with compilerHost and added to the changed files.
+    let lazyRouteMap: LazyRouteMap = {};
+    if (!this._JitMode || this._firstRun) {
+      lazyRouteMap = this._listLazyRoutesFromProgram();
+    } else {
+      const changedTsFiles = this._getChangedTsFiles();
+      if (changedTsFiles.length > 0) {
+        lazyRouteMap = this._findLazyRoutesInAst(changedTsFiles);
+      }
+    }
+
     // Find lazy routes
-    const lazyRouteMap: LazyRouteMap = {
-      ...this._listLazyRoutesFromProgram(),
+    lazyRouteMap = {
+      ...lazyRouteMap,
       ...this._options.additionalLazyModules,
     };
+
     this._processLazyRoutes(lazyRouteMap);
 
     // Emit files.
diff --git a/packages/ngtools/webpack/src/lazy_routes.ts b/packages/ngtools/webpack/src/lazy_routes.ts
new file mode 100644
index 000000000000..dc32ebcea8c5
--- /dev/null
+++ b/packages/ngtools/webpack/src/lazy_routes.ts
@@ -0,0 +1,100 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { dirname, join } from 'path';
+import * as ts from 'typescript';
+import { findAstNodes, resolve } from './refactor';
+
+
+function _getContentOfKeyLiteral(_source: ts.SourceFile, node: ts.Node): string | null {
+  if (node.kind == ts.SyntaxKind.Identifier) {
+    return (node as ts.Identifier).text;
+  } else if (node.kind == ts.SyntaxKind.StringLiteral) {
+    return (node as ts.StringLiteral).text;
+  } else {
+    return null;
+  }
+}
+
+
+export interface LazyRouteMap {
+  [path: string]: string;
+}
+
+
+export function findLazyRoutes(
+  filePath: string,
+  host: ts.CompilerHost,
+  program?: ts.Program,
+  compilerOptions?: ts.CompilerOptions,
+): LazyRouteMap {
+  if (!compilerOptions) {
+    if (!program) {
+      throw new Error('Must pass either program or compilerOptions to findLazyRoutes.');
+    }
+    compilerOptions = program.getCompilerOptions();
+  }
+  const fileName = resolve(filePath, host, compilerOptions).replace(/\\/g, '/');
+  let sourceFile: ts.SourceFile | undefined;
+  if (program) {
+    sourceFile = program.getSourceFile(fileName);
+  }
+
+  if (!sourceFile) {
+    const content = host.readFile(fileName);
+    if (content) {
+      sourceFile = ts.createSourceFile(fileName, content, ts.ScriptTarget.Latest, true);
+    }
+  }
+
+  if (!sourceFile) {
+    throw new Error(`Source file not found: '${fileName}'.`);
+  }
+  const sf: ts.SourceFile = sourceFile;
+
+  return findAstNodes(null, sourceFile, ts.SyntaxKind.ObjectLiteralExpression, true)
+    // Get all their property assignments.
+    .map((node: ts.ObjectLiteralExpression) => {
+      return findAstNodes(node, sf, ts.SyntaxKind.PropertyAssignment, false);
+    })
+    // Take all `loadChildren` elements.
+    .reduce((acc: ts.PropertyAssignment[], props: ts.PropertyAssignment[]) => {
+      return acc.concat(props.filter(literal => {
+        return _getContentOfKeyLiteral(sf, literal.name) == 'loadChildren';
+      }));
+    }, [])
+    // Get only string values.
+    .filter((node: ts.PropertyAssignment) => node.initializer.kind == ts.SyntaxKind.StringLiteral)
+    // Get the string value.
+    .map((node: ts.PropertyAssignment) => (node.initializer as ts.StringLiteral).text)
+    // Map those to either [path, absoluteModulePath], or [path, null] if the module pointing to
+    // does not exist.
+    .map((routePath: string) => {
+      const moduleName = routePath.split('#')[0];
+      const compOptions = (program && program.getCompilerOptions()) || compilerOptions || {};
+      const resolvedModuleName: ts.ResolvedModuleWithFailedLookupLocations = moduleName[0] == '.'
+        ? ({
+            resolvedModule: { resolvedFileName: join(dirname(filePath), moduleName) + '.ts' },
+          } as ts.ResolvedModuleWithFailedLookupLocations)
+        : ts.resolveModuleName(moduleName, filePath, compOptions, host);
+      if (resolvedModuleName.resolvedModule
+          && resolvedModuleName.resolvedModule.resolvedFileName
+          && host.fileExists(resolvedModuleName.resolvedModule.resolvedFileName)) {
+        return [routePath, resolvedModuleName.resolvedModule.resolvedFileName];
+      } else {
+        return [routePath, null];
+      }
+    })
+    // Reduce to the LazyRouteMap map.
+    .reduce((acc: LazyRouteMap, [routePath, resolvedModuleName]: [string, string | null]) => {
+      if (resolvedModuleName) {
+        acc[routePath] = resolvedModuleName;
+      }
+
+      return acc;
+    }, {});
+}
diff --git a/packages/ngtools/webpack/src/transformers/export_lazy_module_map.ts b/packages/ngtools/webpack/src/transformers/export_lazy_module_map.ts
index 02b02058e66e..9cfc9be42db7 100644
--- a/packages/ngtools/webpack/src/transformers/export_lazy_module_map.ts
+++ b/packages/ngtools/webpack/src/transformers/export_lazy_module_map.ts
@@ -7,14 +7,11 @@
  */
 import * as path from 'path';
 import * as ts from 'typescript';
+import { LazyRouteMap } from '../lazy_routes';
 import { getFirstNode, getLastNode } from './ast_helpers';
 import { AddNodeOperation, StandardTransform, TransformOperation } from './interfaces';
 import { makeTransform } from './make_transform';
 
-export interface LazyRouteMap {
-  [path: string]: string;
-}
-
 export function exportLazyModuleMap(
   shouldTransform: (fileName: string) => boolean,
   lazyRoutesCb: () => LazyRouteMap,

From d8048e520bb8c16520f4071f1f9815c33cf81467 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Thu, 27 Dec 2018 12:52:02 +0100
Subject: [PATCH 0587/1703] test: add test for invalid lazy routes in AOT

---
 .../test/browser/lazy-module_spec_large.ts    | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
index 2177de386354..121aaf43f222 100644
--- a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { DefaultTimeout, runTargetSpec } from '@angular-devkit/architect/testing';
+import { DefaultTimeout, TestLogger, runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, normalize } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
+import { take, tap } from 'rxjs/operators';
 import { BrowserBuilderSchema } from '../../src';
 import { browserTargetSpec, host } from '../utils';
 
@@ -70,6 +70,7 @@ export const lazyModuleImport: { [path: string]: string } = {
   `,
 };
 
+// tslint:disable-next-line:no-big-function
 describe('Browser Builder lazy modules', () => {
 
   const outputPath = normalize('dist');
@@ -89,6 +90,28 @@ describe('Browser Builder lazy modules', () => {
     ).toPromise().then(done, done.fail);
   });
 
+  it('should show error when lazy route is invalid on watch mode AOT', (done) => {
+    host.writeMultipleFiles(lazyModuleFiles);
+    host.writeMultipleFiles(lazyModuleImport);
+    host.replaceInFile(
+      'src/app/app.module.ts',
+      'lazy.module#LazyModule',
+      'invalid.module#LazyModule',
+    );
+
+    const logger = new TestLogger('rebuild-lazy-errors');
+    const overrides = { watch: true, aot: true };
+    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout, logger).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(false)),
+      tap(() => {
+        expect(logger.includes('Could not resolve module')).toBe(true);
+        logger.clear();
+        host.appendToFile('src/main.ts', ' ');
+      }),
+      take(2),
+    ).toPromise().then(done, done.fail);
+  });
+
   it('supports lazy bundle for lazy routes with AOT', (done) => {
     host.writeMultipleFiles(lazyModuleFiles);
     host.writeMultipleFiles(lazyModuleImport);

From 881966bbc86edab138173eb34a85ea646890f3a6 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 27 Dec 2018 12:25:10 +0000
Subject: [PATCH 0588/1703] build: update loader-utils to version 1.2.3

---
 packages/angular_devkit/build_angular/package.json   | 2 +-
 packages/angular_devkit/build_optimizer/package.json | 2 +-
 yarn.lock                                            | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index faf4ac15a177..0d0f26dbda6e 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -24,7 +24,7 @@
     "less": "3.9.0",
     "less-loader": "4.1.0",
     "license-webpack-plugin": "2.0.4",
-    "loader-utils": "1.2.1",
+    "loader-utils": "1.2.3",
     "mini-css-extract-plugin": "0.5.0",
     "minimatch": "3.0.4",
     "parse5": "4.0.0",
diff --git a/packages/angular_devkit/build_optimizer/package.json b/packages/angular_devkit/build_optimizer/package.json
index 6c31b5f2d290..4ce4f5b20423 100644
--- a/packages/angular_devkit/build_optimizer/package.json
+++ b/packages/angular_devkit/build_optimizer/package.json
@@ -8,7 +8,7 @@
     "build-optimizer": "./src/build-optimizer/cli.js"
   },
   "dependencies": {
-    "loader-utils": "1.2.1",
+    "loader-utils": "1.2.3",
     "source-map": "0.5.6",
     "typescript": "3.2.2",
     "webpack-sources": "1.3.0"
diff --git a/yarn.lock b/yarn.lock
index 8b5a9427e959..9e406e39c50d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5851,10 +5851,10 @@ loader-runner@^2.3.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.1.tgz#026f12fe7c3115992896ac02ba022ba92971b979"
   integrity sha512-By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw==
 
-loader-utils@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.1.tgz#64bbbac69aa5840d03754ba676a963dec568e844"
-  integrity sha512-3Zhx4qDqBQ9U8udWB3RMJ29nLu5a3ObNOSzk87woPvge01pi0wABowgv7F79Z4mL0DGtHRi/oOndT34EVhInoQ==
+loader-utils@1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
+  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^2.0.0"

From 6db7038c1bb07604348fbe804534561c0a6f7b7a Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 28 Dec 2018 09:34:18 +0100
Subject: [PATCH 0589/1703] feat(@angular-devkit/build-angular): add support
 for port 0 when using protractor

Fixes #13129
---
 .../build_angular/src/protractor/index.ts     | 22 ++++++++++++-------
 .../test/protractor/works_spec_large.ts       |  6 +++++
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/protractor/index.ts b/packages/angular_devkit/build_angular/src/protractor/index.ts
index d00e92608e1b..a6effc5032f8 100644
--- a/packages/angular_devkit/build_angular/src/protractor/index.ts
+++ b/packages/angular_devkit/build_angular/src/protractor/index.ts
@@ -13,9 +13,10 @@ import {
   BuilderContext,
   BuilderDescription,
 } from '@angular-devkit/architect';
+import { DevServerResult } from '@angular-devkit/build-webpack';
 import { Path, getSystemPath, normalize, resolve, tags } from '@angular-devkit/core';
 import { Observable, from, of } from 'rxjs';
-import { concatMap, take, tap } from 'rxjs/operators';
+import { concatMap, map, take, tap } from 'rxjs/operators';
 import * as url from 'url';
 import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
 import { DevServerBuilderOptions } from '../dev-server';
@@ -70,9 +71,15 @@ export class ProtractorBuilder implements Builder<ProtractorBuilderOptions> {
 
     return architect.getBuilderDescription(builderConfig).pipe(
       tap(description => devServerDescription = description),
-      concatMap(devServerDescription => architect.validateBuilderOptions(
-        builderConfig, devServerDescription)),
-      concatMap(() => {
+      concatMap(devServerDescription =>
+        architect.validateBuilderOptions(builderConfig, devServerDescription)),
+      map(() => this.context.architect.getBuilder(devServerDescription, this.context)),
+      concatMap(builder => builder.run(builderConfig)),
+      tap(buildEvent => {
+        if (!buildEvent.success) {
+          return;
+        }
+
         // Compute baseUrl from devServerOptions.
         if (options.devServerTarget && builderConfig.options.publicHost) {
           let publicHost = builderConfig.options.publicHost;
@@ -84,19 +91,18 @@ export class ProtractorBuilder implements Builder<ProtractorBuilderOptions> {
           const clientUrl = url.parse(publicHost);
           baseUrl = url.format(clientUrl);
         } else if (options.devServerTarget) {
+          const result: DevServerResult | undefined = buildEvent.result;
+
           baseUrl = url.format({
             protocol: builderConfig.options.ssl ? 'https' : 'http',
             hostname: options.host,
-            port: builderConfig.options.port.toString(),
+            port: result && result.port.toString(),
           });
         }
 
         // Save the computed baseUrl back so that Protractor can use it.
         options.baseUrl = baseUrl;
-
-        return of(this.context.architect.getBuilder(devServerDescription, this.context));
       }),
-      concatMap(builder => builder.run(builderConfig)),
     );
   }
 
diff --git a/packages/angular_devkit/build_angular/test/protractor/works_spec_large.ts b/packages/angular_devkit/build_angular/test/protractor/works_spec_large.ts
index 0970512d951b..ecbb8f62ee36 100644
--- a/packages/angular_devkit/build_angular/test/protractor/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/protractor/works_spec_large.ts
@@ -60,6 +60,12 @@ describe('Protractor Builder', () => {
     ).toPromise().then(done, done.fail);
   }, 60000);
 
+  it('works with port 0', (done) => {
+    runTargetSpec(host, protractorTargetSpec, { port: 0 }).pipe(
+      retry(3),
+    ).toPromise().then(done, done.fail);
+  }, 30000);
+
   // TODO: test `element-explorer` when the protractor builder emits build events with text.
   // .then(() => execAndWaitForOutputToMatch('ng', ['e2e', '--element-explorer'],
   // /Element Explorer/))

From 73a35071a0d5ebdb65a47fd24f5f18db06a922d3 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 28 Dec 2018 09:37:03 +0100
Subject: [PATCH 0590/1703] feat(@angular-devkit/architect): add `result`
 property to `BuildEvent`

---
 etc/api/angular_devkit/architect/src/index.d.ts    | 3 ++-
 packages/angular_devkit/architect/src/architect.ts | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/etc/api/angular_devkit/architect/src/index.d.ts b/etc/api/angular_devkit/architect/src/index.d.ts
index 6abeeeb4c133..80731d409f38 100644
--- a/etc/api/angular_devkit/architect/src/index.d.ts
+++ b/etc/api/angular_devkit/architect/src/index.d.ts
@@ -63,7 +63,8 @@ export interface BuilderPathsMap {
     };
 }
 
-export interface BuildEvent {
+export interface BuildEvent<BuildResultT = any> {
+    result?: BuildResultT;
     success: boolean;
 }
 
diff --git a/packages/angular_devkit/architect/src/architect.ts b/packages/angular_devkit/architect/src/architect.ts
index c83994aa33c6..2464f6551d94 100644
--- a/packages/angular_devkit/architect/src/architect.ts
+++ b/packages/angular_devkit/architect/src/architect.ts
@@ -70,8 +70,11 @@ export interface BuilderContext {
 // TODO: use Build Event Protocol
 // https://docs.bazel.build/versions/master/build-event-protocol.html
 // https://github.com/googleapis/googleapis/tree/master/google/devtools/build/v1
-export interface BuildEvent {
+// TODO: use unknown
+// tslint:disable-next-line:no-any
+export interface BuildEvent<BuildResultT = any> {
   success: boolean;
+  result?: BuildResultT;
 }
 
 export interface Builder<OptionsT> {

From 030d5fa06cd014834995033df651fd86f1d41028 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 28 Dec 2018 10:14:45 +0100
Subject: [PATCH 0591/1703] feat(@angular-devkit/build-webpack): expose
 `DevServerResult`  in `BuildEvent`

---
 .../src/webpack-dev-server/index.ts           | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts
index 16a71eb93915..d99bfeddf460 100644
--- a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts
@@ -12,7 +12,8 @@ import {
   BuilderConfiguration,
   BuilderContext,
 } from '@angular-devkit/architect';
-import { Path, getSystemPath, normalize, resolve } from '@angular-devkit/core';
+import { getSystemPath, normalize, resolve } from '@angular-devkit/core';
+import * as net from 'net';
 import { Observable, from } from 'rxjs';
 import { concatMap } from 'rxjs/operators';
 import * as webpack from 'webpack';
@@ -20,12 +21,18 @@ import * as WebpackDevServer from 'webpack-dev-server';
 import { LoggingCallback, defaultLoggingCb } from '../webpack';
 import { WebpackDevServerBuilderSchema } from './schema';
 
+export interface DevServerResult {
+  port: number;
+  family: string;
+  address: string;
+}
 
 export class WebpackDevServerBuilder implements Builder<WebpackDevServerBuilderSchema> {
 
   constructor(public context: BuilderContext) { }
 
-  run(builderConfig: BuilderConfiguration<WebpackDevServerBuilderSchema>): Observable<BuildEvent> {
+  run(builderConfig: BuilderConfiguration<WebpackDevServerBuilderSchema>)
+    : Observable<BuildEvent<DevServerResult>> {
     const configPath = resolve(this.context.workspace.root,
       normalize(builderConfig.options.webpackConfig));
 
@@ -42,11 +49,13 @@ export class WebpackDevServerBuilder implements Builder<WebpackDevServerBuilderS
     webpackConfig: webpack.Configuration,
     devServerCfg?: WebpackDevServer.Configuration,
     loggingCb: LoggingCallback = defaultLoggingCb,
-  ): Observable<BuildEvent> {
+  ): Observable<BuildEvent<DevServerResult>> {
     return new Observable(obs => {
       const devServerConfig = devServerCfg || webpackConfig.devServer || {};
       devServerConfig.host = devServerConfig.host || 'localhost';
-      devServerConfig.port = devServerConfig.port || 8080;
+      if (devServerConfig.port == undefined) {
+        devServerConfig.port = 8080;
+      }
 
       if (devServerConfig.stats) {
         webpackConfig.stats = devServerConfig.stats as webpack.Stats.ToStringOptionsObject;
@@ -56,20 +65,26 @@ export class WebpackDevServerBuilder implements Builder<WebpackDevServerBuilderS
 
       const webpackCompiler = webpack(webpackConfig);
       const server = new WebpackDevServer(webpackCompiler, devServerConfig);
+      let result: undefined | DevServerResult;
 
       webpackCompiler.hooks.done.tap('build-webpack', (stats) => {
         // Log stats.
         loggingCb(stats, webpackConfig, this.context.logger);
 
-        obs.next({ success: !stats.hasErrors() });
+        obs.next({ success: !stats.hasErrors(), result });
       });
 
       server.listen(
         devServerConfig.port,
         devServerConfig.host,
-        (err) => {
+        function (err) {
           if (err) {
             obs.error(err);
+          } else {
+            // this is ignored because of ts errors
+            // that this is overshadowed by it's outer contain
+            // @ts-ignore;
+            result = (this as net.Server).address();
           }
         },
       );

From 10e969cbeec95f5f8a3d13a6a758babad6ab858e Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 28 Dec 2018 06:31:11 +0000
Subject: [PATCH 0592/1703] build: update terser-webpack-plugin to version
 1.2.1

---
 .../angular_devkit/build_angular/package.json    |  2 +-
 yarn.lock                                        | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 0d0f26dbda6e..275a66c31bb6 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -44,7 +44,7 @@
     "stylus": "0.54.5",
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
-    "terser-webpack-plugin": "1.2.0",
+    "terser-webpack-plugin": "1.2.1",
     "webpack": "4.28.2",
     "webpack-dev-middleware": "3.4.0",
     "webpack-dev-server": "3.1.14",
diff --git a/yarn.lock b/yarn.lock
index 9e406e39c50d..18e3ff9a35d2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9647,7 +9647,21 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
-terser-webpack-plugin@1.2.0, terser-webpack-plugin@^1.1.0:
+terser-webpack-plugin@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.1.tgz#7545da9ae5f4f9ae6a0ac961eb46f5e7c845cc26"
+  integrity sha512-GGSt+gbT0oKcMDmPx4SRSfJPE1XaN3kQRWG4ghxKQw9cn5G9x6aCKSsgYdvyM0na9NJ4Drv0RG6jbBByZ5CMjw==
+  dependencies:
+    cacache "^11.0.2"
+    find-cache-dir "^2.0.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^1.4.0"
+    source-map "^0.6.1"
+    terser "^3.8.1"
+    webpack-sources "^1.1.0"
+    worker-farm "^1.5.2"
+
+terser-webpack-plugin@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.0.tgz#24697213f2128009080f39f081c18cb2221d91ff"
   integrity sha512-QW7RACLS89RalHtLDb0s8+Iqcs/IAEw1rnVrV+mS7Gx1kgPG8o1g33JhAGDgc/CQ84hLsTW5WrAMdVysh692yg==

From 100cf47cb9567ddc8b34540a5b8e8fe5bbb6295a Mon Sep 17 00:00:00 2001
From: Klaus Kazlauskas <klausmachado@gmail.com>
Date: Thu, 27 Dec 2018 01:02:34 -0200
Subject: [PATCH 0593/1703] feat(@schematics/angular): generate a library with
 a README.md file

Fixes #13296
---
 .../library/files/__projectRoot__/README.md   | 24 +++++++++++++++++++
 .../schematics/angular/library/index_spec.ts  |  7 ++++++
 2 files changed, 31 insertions(+)
 create mode 100644 packages/schematics/angular/library/files/__projectRoot__/README.md

diff --git a/packages/schematics/angular/library/files/__projectRoot__/README.md b/packages/schematics/angular/library/files/__projectRoot__/README.md
new file mode 100644
index 000000000000..d30000860412
--- /dev/null
+++ b/packages/schematics/angular/library/files/__projectRoot__/README.md
@@ -0,0 +1,24 @@
+# <%= classify(name) %>
+
+This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version <%= angularLatestVersion %>.
+
+## Code scaffolding
+
+Run `ng generate component component-name --project <%= name %>` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project <%= name %>`.
+> Note: Don't forget to add `--project <%= name %>` or else it will be added to the default project in your `angular.json` file. 
+
+## Build
+
+Run `ng build <%= name %>` to build the project. The build artifacts will be stored in the `dist/` directory.
+
+## Publishing
+
+After building your library with `ng build <%= name %>`, go to the dist folder `cd dist/<%= dasherize(name) %>` and run `npm publish`.
+
+## Running unit tests
+
+Run `ng test <%= name %>` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
diff --git a/packages/schematics/angular/library/index_spec.ts b/packages/schematics/angular/library/index_spec.ts
index 277d5eaec9f0..fa47f5dce23b 100644
--- a/packages/schematics/angular/library/index_spec.ts
+++ b/packages/schematics/angular/library/index_spec.ts
@@ -48,6 +48,7 @@ describe('Library Schematic', () => {
       '/projects/foo/karma.conf.js',
       '/projects/foo/ng-package.json',
       '/projects/foo/package.json',
+      '/projects/foo/README.md',
       '/projects/foo/tslint.json',
       '/projects/foo/src/test.ts',
       '/projects/foo/src/my_index.ts',
@@ -72,6 +73,12 @@ describe('Library Schematic', () => {
     expect(fileContent.peerDependencies['@angular/core']).toBe(`^${angularVersion}`);
   });
 
+  it('should create a README.md named "foo"', () => {
+    const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
+    const fileContent = getFileContent(tree, '/projects/foo/README.md');
+    expect(fileContent).toMatch(/# Foo/);
+  });
+
   it('should create a tsconfig for library', () => {
     const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
     const fileContent = getJsonFileContent(tree, '/projects/foo/tsconfig.lib.json');

From 554f5d29fccedb103e093356e6f44c217edd0fd2 Mon Sep 17 00:00:00 2001
From: James George <jamesgeorge998001@gmail.com>
Date: Tue, 1 Jan 2019 17:36:22 +0530
Subject: [PATCH 0594/1703] docs: update license badge url

pointed license section to the license file
---
 packages/angular/cli/README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/angular/cli/README.md b/packages/angular/cli/README.md
index ba394eabc9b0..fb5082a4d200 100644
--- a/packages/angular/cli/README.md
+++ b/packages/angular/cli/README.md
@@ -6,7 +6,7 @@
 
 [![npm](https://img.shields.io/npm/v/%40angular/cli.svg)][npm-badge-url]
 [![npm](https://img.shields.io/npm/v/%40angular/cli/next.svg)][npm-badge-url]
-[![npm](https://img.shields.io/npm/l/@angular/cli.svg)][npm-badge-url]
+[![npm](https://img.shields.io/npm/l/@angular/cli.svg)][license-url]
 [![npm](https://img.shields.io/npm/dm/@angular/cli.svg)][npm-badge-url]
 
 [![Join the chat at https://gitter.im/angular/angular-cli](https://img.shields.io/gitter/room/nwjs/nw.js.svg)](https://gitter.im/angular/angular-cli?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -254,7 +254,7 @@ The documentation for the Angular CLI is located in this repo's [wiki](https://a
 
 ## License
 
-MIT
+[MIT](https://github.com/angular/angular-cli/blob/master/LICENSE)
 
 
 [travis-badge]: https://travis-ci.org/angular/angular-cli.svg?branch=master
@@ -265,4 +265,5 @@ MIT
 [david-dev-badge-url]: https://david-dm.org/angular/angular-cli?type=dev
 [npm-badge]: https://img.shields.io/npm/v/@angular/cli.svg
 [npm-badge-url]: https://www.npmjs.com/package/@angular/cli
+[license-url]: https://github.com/angular/angular-cli/blob/master/LICENSE
 

From dcc53d00cc2527d72101fe969f2db56eb073efdc Mon Sep 17 00:00:00 2001
From: ManfredSteyer <manfred.steyer@gmx.net>
Date: Tue, 1 Jan 2019 21:07:27 +0100
Subject: [PATCH 0595/1703] feat(@angular-devkit/build-angular): add factory
 methods for WebpackBuilder and LoggingFactory

---
 .../build_angular/src/browser/index.ts              | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index f22674d5ebbe..b13b08eb1823 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -43,11 +43,20 @@ export class BrowserBuilder implements Builder<BrowserBuilderSchema> {
 
   constructor(public context: BuilderContext) { }
 
+  protected createWebpackBuilder(context: BuilderContext): WebpackBuilder {
+    return new WebpackBuilder(context);
+  }
+
+  protected createLoggingFactory(): (verbose: boolean) => LoggingCallback  {
+    return getBrowserLoggingCb;
+  }
+
   run(builderConfig: BuilderConfiguration<BrowserBuilderSchema>): Observable<BuildEvent> {
     const root = this.context.workspace.root;
     const projectRoot = resolve(root, builderConfig.root);
     const host = new virtualFs.AliasHost(this.context.host as virtualFs.Host<fs.Stats>);
-    const webpackBuilder = new WebpackBuilder({ ...this.context, host });
+    const webpackBuilder = this.createWebpackBuilder({ ...this.context, host });
+    const getLoggingCb = this.createLoggingFactory();
 
     const options = normalizeBuilderSchema(
       host,
@@ -67,7 +76,7 @@ export class BrowserBuilder implements Builder<BrowserBuilderSchema> {
           return throwError(e);
         }
 
-        return webpackBuilder.runWebpack(webpackConfig, getBrowserLoggingCb(options.verbose));
+        return webpackBuilder.runWebpack(webpackConfig, getLoggingCb(options.verbose));
       }),
       concatMap(buildEvent => {
         if (buildEvent.success && !options.watch && options.serviceWorker) {

From b2c9e46fa972eb99e545f53824fc1e356bffbd23 Mon Sep 17 00:00:00 2001
From: ManfredSteyer <manfred.steyer@gmx.net>
Date: Tue, 1 Jan 2019 21:10:43 +0100
Subject: [PATCH 0596/1703] feat(@angular-devkit/build-webpack): add factory
 for creating webpack compiler

---
 packages/angular_devkit/build_webpack/src/webpack/index.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_webpack/src/webpack/index.ts b/packages/angular_devkit/build_webpack/src/webpack/index.ts
index 9f245527b28d..1074ddb4d2f4 100644
--- a/packages/angular_devkit/build_webpack/src/webpack/index.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack/index.ts
@@ -42,11 +42,15 @@ export class WebpackBuilder implements Builder<WebpackBuilderSchema> {
     return from(import(webpackConfigPath));
   }
 
+  protected createWebpackCompiler(config: webpack.Configuration): webpack.Compiler {
+    return webpack(config);
+  }
+
   public runWebpack(
     config: webpack.Configuration, loggingCb = defaultLoggingCb,
   ): Observable<BuildEvent> {
     return new Observable(obs => {
-      const webpackCompiler = webpack(config);
+      const webpackCompiler = this.createWebpackCompiler(config);
 
       const callback: webpack.compiler.CompilerCallback = (err, stats) => {
         if (err) {

From 263e8c1333953499b1fcd930e7941e2757e29b0d Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Wed, 2 Jan 2019 12:14:15 +0100
Subject: [PATCH 0597/1703] feat(@schematics/angular): generate
 ngsw-config.json under the project

Generate `ngsw-config.json` under the project sourceRoot if root is empty similar to the `karma.conf.js`

Now:
```
-- src
---- ngsw-config.json
-- project
---- app
------ ngsw-config.json
```
Current:
```
-- ngsw-config.json
-- src
-- project
---- app
------ ngsw-config.json
```

Fixes #10793
---
 .../angular/service-worker/index.ts           | 15 ++++++-----
 .../angular/service-worker/index_spec.ts      | 25 +++++++++++++++++++
 .../angular/utility/workspace-models.ts       |  1 +
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/packages/schematics/angular/service-worker/index.ts b/packages/schematics/angular/service-worker/index.ts
index c0437bad5774..2e82f7135400 100644
--- a/packages/schematics/angular/service-worker/index.ts
+++ b/packages/schematics/angular/service-worker/index.ts
@@ -10,7 +10,6 @@ import {
   SchematicContext,
   SchematicsException,
   Tree,
-  UpdateRecorder,
   apply,
   chain,
   mergeWith,
@@ -54,13 +53,14 @@ function getProjectConfiguration(
   return applyTo;
 }
 
-function updateConfigFile(options: ServiceWorkerOptions): Rule {
+function updateConfigFile(options: ServiceWorkerOptions, root: string): Rule {
   return (host: Tree, context: SchematicContext) => {
     context.logger.debug('updating config file.');
     const workspace = getWorkspace(host);
 
     const config = getProjectConfiguration(workspace, options);
     config.serviceWorker = true;
+    config.ngswConfigPath = `${root.endsWith('/') ? root : root + '/'}ngsw-config.json`;
 
     return updateWorkspace(workspace);
   };
@@ -103,8 +103,7 @@ function updateAppModule(options: ServiceWorkerOptions): Rule {
     let importModule = 'ServiceWorkerModule';
     let importPath = '@angular/service-worker';
     if (!isImported(moduleSource, importModule, importPath)) {
-      const change = insertImport
-      (moduleSource, modulePath, importModule, importPath);
+      const change = insertImport(moduleSource, modulePath, importModule, importPath);
       if (change) {
         const recorder = host.beginUpdate(modulePath);
         recorder.insertLeft((change as InsertChange).pos, (change as InsertChange).toAdd);
@@ -119,8 +118,7 @@ function updateAppModule(options: ServiceWorkerOptions): Rule {
     // TODO: dynamically find environments relative path
     importPath = '../environments/environment';
     if (!isImported(moduleSource, importModule, importPath)) {
-      const change = insertImport
-      (moduleSource, modulePath, importModule, importPath);
+      const change = insertImport(moduleSource, modulePath, importModule, importPath);
       if (change) {
         const recorder = host.beginUpdate(modulePath);
         recorder.insertLeft((change as InsertChange).pos, (change as InsertChange).toAdd);
@@ -176,16 +174,17 @@ export default function (options: ServiceWorkerOptions): Rule {
       resourcesOutputPath = '/' + resourcesOutputPath.split('/').filter(x => !!x).join('/');
     }
 
+    const root = project.root || project.sourceRoot || '';
     const templateSource = apply(url('./files'), [
       template({ ...options, resourcesOutputPath }),
-      move(project.root),
+      move(root),
     ]);
 
     context.addTask(new NodePackageInstallTask());
 
     return chain([
       mergeWith(templateSource),
-      updateConfigFile(options),
+      updateConfigFile(options, root),
       addDependencies(),
       updateAppModule(options),
     ]);
diff --git a/packages/schematics/angular/service-worker/index_spec.ts b/packages/schematics/angular/service-worker/index_spec.ts
index 24718e9fe576..0c9dfe3a52e2 100644
--- a/packages/schematics/angular/service-worker/index_spec.ts
+++ b/packages/schematics/angular/service-worker/index_spec.ts
@@ -96,6 +96,10 @@ describe('Service Worker Schematic', () => {
     const tree = schematicRunner.runSchematic('service-worker', defaultOptions, appTree);
     const path = '/projects/bar/ngsw-config.json';
     expect(tree.exists(path)).toEqual(true);
+
+    const { projects } = JSON.parse(tree.readContent('/angular.json'));
+    expect(projects.bar.architect.build.configurations.production.ngswConfigPath)
+      .toBe('projects/bar/ngsw-config.json');
   });
 
   it('should add root assets RegExp', () => {
@@ -117,4 +121,25 @@ describe('Service Worker Schematic', () => {
       .toContain('/outDir/*.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)');
   });
 
+  it('should generate ngsw-config.json in src when the application is at root level', () => {
+    const name = 'foo';
+    const rootAppOptions: ApplicationOptions = {
+      ...appOptions,
+      name,
+      projectRoot: '',
+    };
+    const rootSWOptions: ServiceWorkerOptions = {
+      ...defaultOptions,
+      project: name,
+    };
+
+    let tree = schematicRunner.runSchematic('application', rootAppOptions, appTree);
+    tree = schematicRunner.runSchematic('service-worker', rootSWOptions, tree);
+    expect(tree.exists('/src/ngsw-config.json')).toBe(true);
+
+    const { projects } = JSON.parse(tree.readContent('/angular.json'));
+    expect(projects.foo.architect.build.configurations.production.ngswConfigPath)
+      .toBe('src/ngsw-config.json');
+  });
+
 });
diff --git a/packages/schematics/angular/utility/workspace-models.ts b/packages/schematics/angular/utility/workspace-models.ts
index a297922be73f..051354129d01 100644
--- a/packages/schematics/angular/utility/workspace-models.ts
+++ b/packages/schematics/angular/utility/workspace-models.ts
@@ -54,6 +54,7 @@ export interface BrowserBuilderOptions extends BrowserBuilderBaseOptions {
     extractLicenses?: boolean;
     vendorChunk?: boolean;
     buildOptimizer?: boolean;
+    ngswConfigPath?: string;
     budgets?: {
         type: string;
         maximumWarning?: string;

From 7d3b8b4223b69af1b09a084df28a862c7a6fe3ec Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Wed, 2 Jan 2019 15:44:32 +0100
Subject: [PATCH 0598/1703] docs: fix grammar error

Fix the "limitation" word
---
 CONTRIBUTING.md                    | 2 +-
 scripts/templates/contributing.ejs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fb1f9f06606b..eb9d2a2d7c66 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -307,6 +307,6 @@ import * as foo from './foo';
 export { foo };
 ```
 There are currently not supported by the API guardian. 
-To overcome this limitiation we created `_golden-api.ts` in certain packages.
+To overcome this limitation we created `_golden-api.ts` in certain packages.
 
 When adding a new API, it might be the case that you need to add it to `_golden-api.ts`.
diff --git a/scripts/templates/contributing.ejs b/scripts/templates/contributing.ejs
index d9c497a0d3b5..20c858939e20 100644
--- a/scripts/templates/contributing.ejs
+++ b/scripts/templates/contributing.ejs
@@ -296,6 +296,6 @@ import * as foo from './foo';
 export { foo };
 ```
 There are currently not supported by the API guardian. 
-To overcome this limitiation we created `_golden-api.ts` in certain packages.
+To overcome this limitation we created `_golden-api.ts` in certain packages.
 
 When adding a new API, it might be the case that you need to add it to `_golden-api.ts`.

From 45160acb77d172f9a1a55e40f1c7191368d369f4 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Thu, 3 Jan 2019 11:20:28 +0100
Subject: [PATCH 0599/1703] feat(@schematics/angular): add support for
 `tslint.yaml` in lint fix

tslint config file can be either json or yaml format. See https://palantir.github.io/tslint/usage/configuration

Fixes #12545
---
 packages/schematics/angular/utility/lint-fix.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/schematics/angular/utility/lint-fix.ts b/packages/schematics/angular/utility/lint-fix.ts
index 6376942c548c..f794bf681fd2 100644
--- a/packages/schematics/angular/utility/lint-fix.ts
+++ b/packages/schematics/angular/utility/lint-fix.ts
@@ -16,11 +16,11 @@ import { TslintFixTask } from '@angular-devkit/schematics/tasks';
 
 export function applyLintFix(path = '/'): Rule {
   return (tree: Tree, context: SchematicContext) => {
-    // Find the closest tsling.json
+    // Find the closest tslint.json or tslint.yaml
     let dir: DirEntry | null = tree.getDir(path.substr(0, path.lastIndexOf('/')));
 
     do {
-      if ((dir.subfiles as string[]).includes('tslint.json')) {
+      if ((dir.subfiles as string[]).some(f => f === 'tslint.json' || f === 'tslint.yaml')) {
         break;
       }
 
@@ -28,7 +28,8 @@ export function applyLintFix(path = '/'): Rule {
     } while (dir !== null);
 
     if (dir === null) {
-      throw new SchematicsException('Asked to run lint fixes, but could not find a tslint.json.');
+      throw new SchematicsException(
+        'Asked to run lint fixes, but could not find a tslint.json or tslint.yaml config file.');
     }
 
     // Only include files that have been touched.

From 3d8cae1b2396991ccbb417fcf8c5dae359fe7035 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 3 Jan 2019 11:53:01 +0000
Subject: [PATCH 0600/1703] build: update autoprefixer to version 9.4.4

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 54 +++++++++----------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 275a66c31bb6..d5269518ab62 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -12,7 +12,7 @@
     "@angular-devkit/core": "0.0.0",
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.6.2",
-    "autoprefixer": "9.4.3",
+    "autoprefixer": "9.4.4",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "4.6.0",
diff --git a/yarn.lock b/yarn.lock
index 18e3ff9a35d2..cdd687dc1b4e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1181,16 +1181,16 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@9.4.3:
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.3.tgz#c97384a8fd80477b78049163a91bbc725d9c41d9"
-  integrity sha512-/XSnzDepRkAU//xLcXA/lUWxpsBuw0WiriAHOqnxkuCtzLhaz+fL4it4gp20BQ8n5SyLzK/FOc7A0+u/rti2FQ==
+autoprefixer@9.4.4:
+  version "9.4.4"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.4.tgz#40c42b335bdb22efe8cd80389ca82ffb5e32d68d"
+  integrity sha512-7tpjBadJyHKf+gOJEmKhZIksWxdZCSrnKbbTJNsw+/zX9+f//DLELRQPWjjjVoDbbWlCuNRkN7RfmZwDVgWMLw==
   dependencies:
-    browserslist "^4.3.6"
-    caniuse-lite "^1.0.30000921"
+    browserslist "^4.3.7"
+    caniuse-lite "^1.0.30000926"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.6"
+    postcss "^7.0.7"
     postcss-value-parser "^3.3.1"
 
 autoprefixer@^9.0.0:
@@ -1624,14 +1624,14 @@ browserslist@^4.0.0, browserslist@^4.3.3:
     electron-to-chromium "^1.3.82"
     node-releases "^1.0.1"
 
-browserslist@^4.3.6:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.6.tgz#0f9d9081afc66b36f477c6bdf3813f784f42396a"
-  integrity sha512-kMGKs4BTzRWviZ8yru18xBpx+CyHG9eqgRbj9XbE3IMgtczf4aiA0Y1YCpVdvUieKGZ03kolSPXqTcscBCb9qw==
+browserslist@^4.3.7:
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.7.tgz#f1de479a6466ea47a0a26dcc725e7504817e624a"
+  integrity sha512-pWQv51Ynb0MNk9JGMCZ8VkM785/4MQNXiFYtPqI7EEP0TJO+/d/NqRVn1uiAN0DNbnlUSpL2sh16Kspasv3pUQ==
   dependencies:
-    caniuse-lite "^1.0.30000921"
-    electron-to-chromium "^1.3.92"
-    node-releases "^1.1.1"
+    caniuse-lite "^1.0.30000925"
+    electron-to-chromium "^1.3.96"
+    node-releases "^1.1.3"
 
 browserstack@^1.5.1:
   version "1.5.1"
@@ -1879,10 +1879,10 @@ caniuse-lite@^1.0.30000898, caniuse-lite@^1.0.30000899:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000903.tgz#86d46227759279b3db345ddbe778335dbba9e858"
   integrity sha512-T1XVJEpGCoaq7MDw7/6hCdYUukmSaS+1l/OQJkLtw7Cr2+/+d67tNGKEbyiqf7Ck8x6EhNFUxjYFXXka0N/w5g==
 
-caniuse-lite@^1.0.30000921:
-  version "1.0.30000921"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000921.tgz#7a607c1623444b22351d834e093aedda3c42fbe8"
-  integrity sha512-Bu09ciy0lMWLgpYC77I0YGuI8eFRBPPzaSOYJK1jTI64txCphYCqnWbxJYjHABYVt/TYX/p3jNjLBR87u1Bfpw==
+caniuse-lite@^1.0.30000925, caniuse-lite@^1.0.30000926:
+  version "1.0.30000926"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000926.tgz#4361a99d818ca6e521dbe89a732de62a194a789c"
+  integrity sha512-diMkEvxfFw09SkbErCLmw/1Fx1ZZe9xfWm4aeA2PUffB48x1tfZeMsK5j4BW7zN7Y4PdqmPVVdG2eYjE5IRTag==
 
 canonical-path@1.0.0:
   version "1.0.0"
@@ -3139,10 +3139,10 @@ electron-to-chromium@^1.3.82:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.82.tgz#7d13ae4437d2a783de3f4efba96b186c540b67b1"
   integrity sha512-NI4nB2IWGcU4JVT1AE8kBb/dFor4zjLHMLsOROPahppeHrR0FG5uslxMmkp/thO1MvPjM2xhlKoY29/I60s0ew==
 
-electron-to-chromium@^1.3.92:
-  version "1.3.95"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.95.tgz#79fac438813ca7f3db182a525c2ab432934f6484"
-  integrity sha512-0JZEDKOQAE05EO/4rk3vLAE+PYFI9OLCVLAS4QAq1y+Bb2y1N6MyQJz62ynzHN/y0Ka/nO5jVJcahbCEdfiXLQ==
+electron-to-chromium@^1.3.96:
+  version "1.3.96"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.96.tgz#25770ec99b8b07706dedf3a5f43fa50cb54c4f9a"
+  integrity sha512-ZUXBUyGLeoJxp4Nt6G/GjBRLnyz8IKQGexZ2ndWaoegThgMGFO1tdDYID5gBV32/1S83osjJHyfzvanE/8HY4Q==
 
 elliptic@^6.0.0:
   version "6.4.1"
@@ -6691,10 +6691,10 @@ node-releases@^1.0.1:
   dependencies:
     semver "^5.3.0"
 
-node-releases@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.2.tgz#93c17fba5eec8650ad908de5433fa8763baebe4d"
-  integrity sha512-j1gEV/zX821yxdWp/1vBMN0pSUjuH9oGUdLCb4PfUko6ZW7KdRs3Z+QGGwDUhYtSpQvdVVyLd2V0YvLsmdg5jQ==
+node-releases@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.3.tgz#aad9ce0dcb98129c753f772c0aa01360fb90fbd2"
+  integrity sha512-6VrvH7z6jqqNFY200kdB6HdzkgM96Oaj9v3dqGfgp6mF+cHmU4wyQKZ2/WPDRVoR0Jz9KqbamaBN0ZhdUaysUQ==
   dependencies:
     semver "^5.3.0"
 
@@ -7632,7 +7632,7 @@ postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.1:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss@7.0.7, postcss@^7.0.6:
+postcss@7.0.7, postcss@^7.0.7:
   version "7.0.7"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.7.tgz#2754d073f77acb4ef08f1235c36c5721a7201614"
   integrity sha512-HThWSJEPkupqew2fnuQMEI2YcTj/8gMV3n80cMdJsKxfIh5tHf7nM5JigNX6LxVMqo6zkgQNAI88hyFvBk41Pg==

From 7a530d0a1f3b2e7feafd54865fe49babeb5bcb8e Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 5 Jan 2019 06:13:56 +0000
Subject: [PATCH 0601/1703] build: update webpack-dev-middleware to version
 3.5.0

---
 packages/angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                          | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index d5269518ab62..a7abdb109dc6 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -46,7 +46,7 @@
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.2.1",
     "webpack": "4.28.2",
-    "webpack-dev-middleware": "3.4.0",
+    "webpack-dev-middleware": "3.5.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.1.5",
     "webpack-sources": "1.3.0",
diff --git a/yarn.lock b/yarn.lock
index cdd687dc1b4e..b4a2492550f8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10342,6 +10342,16 @@ webpack-dev-middleware@3.4.0:
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
+webpack-dev-middleware@3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.5.0.tgz#fff0a07b0461314fb6ca82df3642c2423f768429"
+  integrity sha512-1Zie7+dMr4Vv3nGyhr8mxGQkzTQK1PTS8K3yJ4yB1mfRGwO1DzQibgmNfUqbEfQY6eEtEEUzC+o7vhpm/Sfn5w==
+  dependencies:
+    memory-fs "~0.4.1"
+    mime "^2.3.1"
+    range-parser "^1.0.3"
+    webpack-log "^2.0.0"
+
 webpack-dev-server@3.1.14:
   version "3.1.14"
   resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz#60fb229b997fc5a0a1fc6237421030180959d469"

From 978693daf597a6166d1e4d8a0dfe8abecd53f437 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 5 Jan 2019 06:14:06 +0000
Subject: [PATCH 0602/1703] build: update webpack-merge to version 4.2.1

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index a7abdb109dc6..230e6f8a4be4 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -48,7 +48,7 @@
     "webpack": "4.28.2",
     "webpack-dev-middleware": "3.5.0",
     "webpack-dev-server": "3.1.14",
-    "webpack-merge": "4.1.5",
+    "webpack-merge": "4.2.1",
     "webpack-sources": "1.3.0",
     "webpack-subresource-integrity": "1.1.0-rc.6"
   },
diff --git a/yarn.lock b/yarn.lock
index b4a2492550f8..d42fa60390ff 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10430,10 +10430,10 @@ webpack-log@^2.0.0:
     ansi-colors "^3.0.0"
     uuid "^3.3.2"
 
-webpack-merge@4.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.5.tgz#2be31e846c20767d1bef56bdca64c328a681190a"
-  integrity sha512-sVcM+MMJv6DO0C0GLLltx8mUlGMKXE0zBsuMqZ9jz2X9gsekALw6Rs0cAfTWc97VuWS6NpVUa78959zANnMMLQ==
+webpack-merge@4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.1.tgz#5e923cf802ea2ace4fd5af1d3247368a633489b4"
+  integrity sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==
   dependencies:
     lodash "^4.17.5"
 

From 068bb4001d5d011bc1e9029ce620d8e197efa1b1 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Mon, 7 Jan 2019 07:31:29 +0100
Subject: [PATCH 0603/1703] docs: add deprecation and pr note

Docs are deprecated in favor of the the new pages in AIO which are WIP.
---
 docs/documentation/add.md                              | 2 +-
 docs/documentation/angular-workspace.md                | 1 +
 docs/documentation/build.md                            | 2 +-
 docs/documentation/config.md                           | 2 +-
 docs/documentation/doc.md                              | 2 +-
 docs/documentation/e2e.md                              | 2 +-
 docs/documentation/eject.md                            | 2 +-
 docs/documentation/generate.md                         | 2 +-
 docs/documentation/generate/app-shell.md               | 2 +-
 docs/documentation/generate/application.md             | 2 +-
 docs/documentation/generate/class.md                   | 2 +-
 docs/documentation/generate/component.md               | 2 +-
 docs/documentation/generate/directive.md               | 2 +-
 docs/documentation/generate/enum.md                    | 2 +-
 docs/documentation/generate/guard.md                   | 2 +-
 docs/documentation/generate/interface.md               | 2 +-
 docs/documentation/generate/library.md                 | 2 +-
 docs/documentation/generate/module.md                  | 2 +-
 docs/documentation/generate/pipe.md                    | 2 +-
 docs/documentation/generate/service.md                 | 2 +-
 docs/documentation/generate/universal.md               | 2 +-
 docs/documentation/help.md                             | 2 +-
 docs/documentation/lint.md                             | 2 +-
 docs/documentation/new.md                              | 2 +-
 docs/documentation/run.md                              | 2 +-
 docs/documentation/serve.md                            | 2 +-
 docs/documentation/stories/1.0-update.md               | 2 ++
 docs/documentation/stories/app-shell.md                | 1 +
 docs/documentation/stories/application-environments.md | 2 +-
 docs/documentation/stories/asset-configuration.md      | 2 ++
 docs/documentation/stories/autoprefixer.md             | 2 ++
 docs/documentation/stories/budgets.md                  | 2 +-
 docs/documentation/stories/code-coverage.md            | 2 +-
 docs/documentation/stories/configure-hmr.md            | 2 ++
 docs/documentation/stories/continuous-integration.md   | 2 +-
 docs/documentation/stories/create-library.md           | 2 ++
 docs/documentation/stories/css-preprocessors.md        | 2 ++
 docs/documentation/stories/disk-serve.md               | 2 ++
 docs/documentation/stories/github-pages.md             | 2 +-
 docs/documentation/stories/global-lib.md               | 2 ++
 docs/documentation/stories/global-scripts.md           | 2 ++
 docs/documentation/stories/global-styles.md            | 2 ++
 docs/documentation/stories/include-angular-flex.md     | 2 ++
 docs/documentation/stories/include-angular-material.md | 2 ++
 docs/documentation/stories/include-angularfire.md      | 1 +
 docs/documentation/stories/include-bootstrap.md        | 1 +
 docs/documentation/stories/include-font-awesome.md     | 1 +
 docs/documentation/stories/internationalization.md     | 2 +-
 docs/documentation/stories/multiple-projects.md        | 2 ++
 docs/documentation/stories/proxy.md                    | 2 +-
 docs/documentation/stories/routing.md                  | 2 +-
 docs/documentation/stories/third-party-lib.md          | 2 ++
 docs/documentation/stories/universal-rendering.md      | 2 +-
 docs/documentation/test.md                             | 2 +-
 docs/documentation/update.md                           | 2 +-
 docs/documentation/version.md                          | 2 +-
 docs/documentation/xi18n.md                            | 2 +-
 57 files changed, 71 insertions(+), 38 deletions(-)

diff --git a/docs/documentation/add.md b/docs/documentation/add.md
index 8ec0068cb337..1b208274a1e5 100644
--- a/docs/documentation/add.md
+++ b/docs/documentation/add.md
@@ -1,6 +1,6 @@
 <!-- Links in /docs/documentation should NOT have \`.md\` at the end, because they end up in our wiki at release. -->
 
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/add).**
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/add).**
 
 # ng add
 
diff --git a/docs/documentation/angular-workspace.md b/docs/documentation/angular-workspace.md
index 48be62aa0e8f..fbe3761870dc 100644
--- a/docs/documentation/angular-workspace.md
+++ b/docs/documentation/angular-workspace.md
@@ -1,4 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
+**Documentation below is deprecated and we no longer accept PRs to improve this. The new documentation will be available in [angular.io](https://angular.io)**.
 
 # Angular CLI workspace file (angular.json) schema
 
diff --git a/docs/documentation/build.md b/docs/documentation/build.md
index 38d52a5d1fcc..20b765306349 100644
--- a/docs/documentation/build.md
+++ b/docs/documentation/build.md
@@ -1,5 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/build)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/build)**.
 
 
 # ng build
diff --git a/docs/documentation/config.md b/docs/documentation/config.md
index 62d554d1e05c..6fc6bcc14172 100644
--- a/docs/documentation/config.md
+++ b/docs/documentation/config.md
@@ -1,5 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/config)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/config)**.
 
 # ng config
 
diff --git a/docs/documentation/doc.md b/docs/documentation/doc.md
index 098d84f04f5c..3defe5f6e8aa 100644
--- a/docs/documentation/doc.md
+++ b/docs/documentation/doc.md
@@ -1,5 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/doc)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/doc)**.
 
 # ng doc
 
diff --git a/docs/documentation/e2e.md b/docs/documentation/e2e.md
index 120dab85ab94..85c1bd4c401b 100644
--- a/docs/documentation/e2e.md
+++ b/docs/documentation/e2e.md
@@ -1,5 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/e2e)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/e2e)**.
 
 # ng e2e
 
diff --git a/docs/documentation/eject.md b/docs/documentation/eject.md
index 515283790dcc..9d0ca516438d 100644
--- a/docs/documentation/eject.md
+++ b/docs/documentation/eject.md
@@ -1,5 +1,5 @@
 <!-- Links in /docs/documentation should NOT have \`.md\` at the end, because they end up in our wiki at release. -->
-**Documentation below is for CLI version 6.**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this.**.
 
 # ng eject
 
diff --git a/docs/documentation/generate.md b/docs/documentation/generate.md
index af88444ac51c..11ecd055b66a 100644
--- a/docs/documentation/generate.md
+++ b/docs/documentation/generate.md
@@ -1,6 +1,6 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
 
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/generate)**.
 
 # ng generate
 
diff --git a/docs/documentation/generate/app-shell.md b/docs/documentation/generate/app-shell.md
index af5ee13d76be..384b87e58ae5 100644
--- a/docs/documentation/generate/app-shell.md
+++ b/docs/documentation/generate/app-shell.md
@@ -1,6 +1,6 @@
 <!-- Links in /docs/documentation should NOT have \`.md\` at the end, because they end up in our wiki at release. -->
 
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/generate)**.
 
 # ng generate app-shell
 
diff --git a/docs/documentation/generate/application.md b/docs/documentation/generate/application.md
index 0f5c21c65862..c6e8bfc5e3fd 100644
--- a/docs/documentation/generate/application.md
+++ b/docs/documentation/generate/application.md
@@ -1,6 +1,6 @@
 <!-- Links in /docs/documentation should NOT have \`.md\` at the end, because they end up in our wiki at release. -->
 
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/generate)**.
 
 # ng generate application
 
diff --git a/docs/documentation/generate/class.md b/docs/documentation/generate/class.md
index d8c562c0abb4..911a9f3c14f2 100644
--- a/docs/documentation/generate/class.md
+++ b/docs/documentation/generate/class.md
@@ -1,5 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/generate)**.
 # ng generate class
 
 ## Overview
diff --git a/docs/documentation/generate/component.md b/docs/documentation/generate/component.md
index b02e9ca88466..3e1e4dca8fda 100644
--- a/docs/documentation/generate/component.md
+++ b/docs/documentation/generate/component.md
@@ -1,6 +1,6 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
 
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/generate)**.
 
 # ng generate component
 
diff --git a/docs/documentation/generate/directive.md b/docs/documentation/generate/directive.md
index f14d0cdde3ae..94d7bc71783d 100644
--- a/docs/documentation/generate/directive.md
+++ b/docs/documentation/generate/directive.md
@@ -1,5 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/generate)**.
 
 # ng generate directive
 
diff --git a/docs/documentation/generate/enum.md b/docs/documentation/generate/enum.md
index 7eec3eacb13a..82733a176401 100644
--- a/docs/documentation/generate/enum.md
+++ b/docs/documentation/generate/enum.md
@@ -1,5 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/generate)**.
 # ng generate enum
 
 ## Overview
diff --git a/docs/documentation/generate/guard.md b/docs/documentation/generate/guard.md
index 5f37f49aae32..5dd19b883a31 100644
--- a/docs/documentation/generate/guard.md
+++ b/docs/documentation/generate/guard.md
@@ -1,4 +1,4 @@
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/generate)**.
 
 # ng generate guard
 
diff --git a/docs/documentation/generate/interface.md b/docs/documentation/generate/interface.md
index 0afd4b9f80bf..bd749ebd2d52 100644
--- a/docs/documentation/generate/interface.md
+++ b/docs/documentation/generate/interface.md
@@ -1,5 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/generate)**.
 
 # ng generate interface
 
diff --git a/docs/documentation/generate/library.md b/docs/documentation/generate/library.md
index c79fdb6f91f1..48f4d0f40614 100644
--- a/docs/documentation/generate/library.md
+++ b/docs/documentation/generate/library.md
@@ -1,5 +1,5 @@
 <!-- Links in /docs/documentation should NOT have \`.md\` at the end, because they end up in our wiki at release. -->
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/generate)**.
 
 
 # ng generate library
diff --git a/docs/documentation/generate/module.md b/docs/documentation/generate/module.md
index c0cae09d6d0a..25055ee35565 100644
--- a/docs/documentation/generate/module.md
+++ b/docs/documentation/generate/module.md
@@ -1,5 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/generate)**.
 
 # ng generate module
 
diff --git a/docs/documentation/generate/pipe.md b/docs/documentation/generate/pipe.md
index 68bffd3644e1..cebbc9ce3c3e 100644
--- a/docs/documentation/generate/pipe.md
+++ b/docs/documentation/generate/pipe.md
@@ -1,5 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/generate)**.
 
 # ng generate pipe
 
diff --git a/docs/documentation/generate/service.md b/docs/documentation/generate/service.md
index c114bd9826c3..c3da41708494 100644
--- a/docs/documentation/generate/service.md
+++ b/docs/documentation/generate/service.md
@@ -1,5 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/generate)**.
 
 # ng generate service
 
diff --git a/docs/documentation/generate/universal.md b/docs/documentation/generate/universal.md
index 870c13d7bc4b..053689b12151 100644
--- a/docs/documentation/generate/universal.md
+++ b/docs/documentation/generate/universal.md
@@ -1,5 +1,5 @@
 <!-- Links in /docs/documentation should NOT have \`.md\` at the end, because they end up in our wiki at release. -->
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/generate)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/generate)**.
 
 # ng generate universal
 
diff --git a/docs/documentation/help.md b/docs/documentation/help.md
index 45e7bde46c8a..98f898764364 100644
--- a/docs/documentation/help.md
+++ b/docs/documentation/help.md
@@ -1,5 +1,5 @@
 <!-- Links in /docs/documentation should NOT have \`.md\` at the end, because they end up in our wiki at release. -->
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/help)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/help)**.
 
 
 # ng help
diff --git a/docs/documentation/lint.md b/docs/documentation/lint.md
index 6c0c48ee3095..5418a991d338 100644
--- a/docs/documentation/lint.md
+++ b/docs/documentation/lint.md
@@ -1,5 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/lint)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/lint)**.
 
 # ng lint
 
diff --git a/docs/documentation/new.md b/docs/documentation/new.md
index eed0ab4afbcd..8ed2220272b4 100644
--- a/docs/documentation/new.md
+++ b/docs/documentation/new.md
@@ -1,6 +1,6 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
 
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/new)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/new)**.
 
 # ng new
 
diff --git a/docs/documentation/run.md b/docs/documentation/run.md
index 06caa0658bb4..f5b107733158 100644
--- a/docs/documentation/run.md
+++ b/docs/documentation/run.md
@@ -1,5 +1,5 @@
 <!-- Links in /docs/documentation should NOT have \`.md\` at the end, because they end up in our wiki at release. -->
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/run)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/run)**.
 
 # ng run
 
diff --git a/docs/documentation/serve.md b/docs/documentation/serve.md
index f583dd0dba16..1a7ba7ba0bc2 100644
--- a/docs/documentation/serve.md
+++ b/docs/documentation/serve.md
@@ -1,5 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/serve)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/serve)**.
 
 # ng serve
 
diff --git a/docs/documentation/stories/1.0-update.md b/docs/documentation/stories/1.0-update.md
index d5c065c1a07b..b3c1f8fde90b 100644
--- a/docs/documentation/stories/1.0-update.md
+++ b/docs/documentation/stories/1.0-update.md
@@ -1,3 +1,5 @@
+**Documentation below is deprecated and we no longer accept PRs to improve this. The new documentation will be available in [angular.io](https://angular.io)**.
+
 # Angular CLI migration guide
 
 In this migration guide we'll be looking at some of the major changes to CLI projects in the
diff --git a/docs/documentation/stories/app-shell.md b/docs/documentation/stories/app-shell.md
index 2709de187f36..66c27058bb31 100644
--- a/docs/documentation/stories/app-shell.md
+++ b/docs/documentation/stories/app-shell.md
@@ -1,4 +1,5 @@
 <!-- Links in /docs/documentation should NOT have \`.md\` at the end, because they end up in our wiki at release. -->
+**Documentation below is deprecated and we no longer accept PRs to improve this. The new documentation will be available in [angular.io](https://angular.io)**.
 
 # App shell
 
diff --git a/docs/documentation/stories/application-environments.md b/docs/documentation/stories/application-environments.md
index ac65f31c0c46..f263ec36419e 100644
--- a/docs/documentation/stories/application-environments.md
+++ b/docs/documentation/stories/application-environments.md
@@ -1,4 +1,4 @@
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/build#configuring-application-environments)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/guide/build#configuring-application-environments)**.
 
 # Application Environments
 
diff --git a/docs/documentation/stories/asset-configuration.md b/docs/documentation/stories/asset-configuration.md
index f448de26ad0d..c19602ff18a2 100644
--- a/docs/documentation/stories/asset-configuration.md
+++ b/docs/documentation/stories/asset-configuration.md
@@ -1,3 +1,5 @@
+**Documentation below is deprecated and we no longer accept PRs to improve this. The new documentation is available [here](https://angular.io/guide/build)**.
+
 # Project assets
 
 You use the `assets` array inside the build target in `angular.json` to list files or folders
diff --git a/docs/documentation/stories/autoprefixer.md b/docs/documentation/stories/autoprefixer.md
index c6902fccaf3b..7c3e0a202e11 100644
--- a/docs/documentation/stories/autoprefixer.md
+++ b/docs/documentation/stories/autoprefixer.md
@@ -1,3 +1,5 @@
+**Documentation below is deprecated and we no longer accept PRs to improve this. The new documentation is available [here](https://angular.io/guide/build#configuring-browser-compatibility)**.
+
 # Change target browsers for Autoprefixer
 
 Currently, the CLI uses [Autoprefixer](https://github.com/postcss/autoprefixer) to ensure compatibility
diff --git a/docs/documentation/stories/budgets.md b/docs/documentation/stories/budgets.md
index 3c24a22961c5..726f352e8a08 100644
--- a/docs/documentation/stories/budgets.md
+++ b/docs/documentation/stories/budgets.md
@@ -1,4 +1,4 @@
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/build#configure-size-budgets)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/guide/build#configure-size-budgets)**.
 
 # Budgets
 
diff --git a/docs/documentation/stories/code-coverage.md b/docs/documentation/stories/code-coverage.md
index 934adc3853d6..da623b42ff1d 100644
--- a/docs/documentation/stories/code-coverage.md
+++ b/docs/documentation/stories/code-coverage.md
@@ -1,4 +1,4 @@
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/testing#enable-code-coverage-reports)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/guide/testing#enable-code-coverage-reports)**.
 
 # Code Coverage
 
diff --git a/docs/documentation/stories/configure-hmr.md b/docs/documentation/stories/configure-hmr.md
index e3551578d90d..0fa6ae1d84d3 100644
--- a/docs/documentation/stories/configure-hmr.md
+++ b/docs/documentation/stories/configure-hmr.md
@@ -1,3 +1,5 @@
+**Documentation below is deprecated and we no longer accept PRs to improve this. The new documentation is available [here](https://angular.io/guide/build)**.
+
 # Configure Hot Module Replacement
 
 Hot Module Replacement (HMR) is a WebPack feature to update code in a running app without rebuilding it.
diff --git a/docs/documentation/stories/continuous-integration.md b/docs/documentation/stories/continuous-integration.md
index 11820cf9b3ca..afecbd429674 100644
--- a/docs/documentation/stories/continuous-integration.md
+++ b/docs/documentation/stories/continuous-integration.md
@@ -1,4 +1,4 @@
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/testing#set-up-continuous-integration)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/guide/testing#set-up-continuous-integration)**.
 
 # Continuous Integration
 
diff --git a/docs/documentation/stories/create-library.md b/docs/documentation/stories/create-library.md
index 529cfb8becfc..f4be4e7a3dc5 100644
--- a/docs/documentation/stories/create-library.md
+++ b/docs/documentation/stories/create-library.md
@@ -1,3 +1,5 @@
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/guide/creating-libs)**.
+
 # Library support in Angular CLI 6
 
 Angular CLI v6 comes with library support via [ng-packagr](https://github.com/dherges/ng-packagr)
diff --git a/docs/documentation/stories/css-preprocessors.md b/docs/documentation/stories/css-preprocessors.md
index 90d93282d498..35e7441ffa7a 100644
--- a/docs/documentation/stories/css-preprocessors.md
+++ b/docs/documentation/stories/css-preprocessors.md
@@ -1,3 +1,5 @@
+**Documentation below is deprecated and we no longer accept PRs to improve this. The new documentation will be available here [angular.io](https://angular.io/guide/build)**.
+
 # CSS Preprocessor integration
 
 Angular CLI supports all major CSS preprocessors:
diff --git a/docs/documentation/stories/disk-serve.md b/docs/documentation/stories/disk-serve.md
index b3f4663b630b..3d7be396125b 100644
--- a/docs/documentation/stories/disk-serve.md
+++ b/docs/documentation/stories/disk-serve.md
@@ -1,3 +1,5 @@
+**Documentation below is deprecated and we no longer accept PRs to improve this. The new documentation will be available here [angular.io](https://angular.io/guide/build)**.
+
 # Serve from Disk
 
 The CLI supports running a live browser reload experience to users by running `ng serve`. This will compile the application upon file saves and reload the browser with the newly compiled application. This is done by hosting the application in memory and serving it via [webpack-dev-server](https://webpack.js.org/guides/development/#webpack-dev-server).
diff --git a/docs/documentation/stories/github-pages.md b/docs/documentation/stories/github-pages.md
index 89f2795131bc..a41b375c7e99 100644
--- a/docs/documentation/stories/github-pages.md
+++ b/docs/documentation/stories/github-pages.md
@@ -1,4 +1,4 @@
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/deployment#deploy-to-github-pages)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/guide/deployment#deploy-to-github-pages)**.
 
 # Deploy to GitHub Pages
 
diff --git a/docs/documentation/stories/global-lib.md b/docs/documentation/stories/global-lib.md
index 74f1f3a64587..d82089140668 100644
--- a/docs/documentation/stories/global-lib.md
+++ b/docs/documentation/stories/global-lib.md
@@ -1,3 +1,5 @@
+**Documentation below is deprecated and we no longer accept PRs to improve this. The new documentation will be available here [angular.io](https://angular.io/guide/build)**.
+
 # Global Library Installation
 
 Some javascript libraries need to be added to the global scope and loaded as if
diff --git a/docs/documentation/stories/global-scripts.md b/docs/documentation/stories/global-scripts.md
index c67a052629f3..c0cecbd8b809 100644
--- a/docs/documentation/stories/global-scripts.md
+++ b/docs/documentation/stories/global-scripts.md
@@ -1,3 +1,5 @@
+**Documentation below is deprecated and we no longer accept PRs to improve this. The new documentation will be available here [angular.io](https://angular.io/guide/build)**.
+
 # Global scripts
 
 You can add Javascript files to the global scope via the `scripts` option inside your
diff --git a/docs/documentation/stories/global-styles.md b/docs/documentation/stories/global-styles.md
index 32ff05b4cd23..300a7e953837 100644
--- a/docs/documentation/stories/global-styles.md
+++ b/docs/documentation/stories/global-styles.md
@@ -1,3 +1,5 @@
+**Documentation below is deprecated and we no longer accept PRs to improve this. The new documentation will be available here [angular.io](https://angular.io/guide/build)**.
+
 # Global styles
 
 The `styles.css` file allows users to add global styles and supports
diff --git a/docs/documentation/stories/include-angular-flex.md b/docs/documentation/stories/include-angular-flex.md
index 107db0e9c1c9..fa381baaacb1 100644
--- a/docs/documentation/stories/include-angular-flex.md
+++ b/docs/documentation/stories/include-angular-flex.md
@@ -1,3 +1,5 @@
+**Documentation below is deprecated and we no longer accept PRs to improve this.**
+
 ## Include [Flex Layout](https://github.com/angular/flex-layout) in your CLI application
 
 <a href="https://tburleson-layouts-demos.firebaseapp.com/#/docs" target="_blank">
diff --git a/docs/documentation/stories/include-angular-material.md b/docs/documentation/stories/include-angular-material.md
index e4e36bc015d5..9c6a440a051b 100644
--- a/docs/documentation/stories/include-angular-material.md
+++ b/docs/documentation/stories/include-angular-material.md
@@ -1,3 +1,5 @@
+**Documentation below is deprecated and we no longer accept PRs to improve this.**
+
 # Include [Angular Material](https://material.angular.io)
 
 [Angular Material](https://material.angular.io) is a set of Material Design components for Angular apps. To get started please visit these links to the Angular Material project:
diff --git a/docs/documentation/stories/include-angularfire.md b/docs/documentation/stories/include-angularfire.md
index a99f15caae3a..9c3ab4ba3eaf 100644
--- a/docs/documentation/stories/include-angularfire.md
+++ b/docs/documentation/stories/include-angularfire.md
@@ -1,4 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
+**Documentation below is deprecated and we no longer accept PRs to improve this.**
 
 # Include AngularFire
 
diff --git a/docs/documentation/stories/include-bootstrap.md b/docs/documentation/stories/include-bootstrap.md
index 82acb4dc4dae..f4efc8169996 100644
--- a/docs/documentation/stories/include-bootstrap.md
+++ b/docs/documentation/stories/include-bootstrap.md
@@ -1,4 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
+**Documentation below is deprecated and we no longer accept PRs to improve this.**
 
 # Include [Bootstrap](http://getbootstrap.com/)
 
diff --git a/docs/documentation/stories/include-font-awesome.md b/docs/documentation/stories/include-font-awesome.md
index 66b104a8fcc6..93036b3461cc 100644
--- a/docs/documentation/stories/include-font-awesome.md
+++ b/docs/documentation/stories/include-font-awesome.md
@@ -1,4 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
+**Documentation below is deprecated and we no longer accept PRs to improve this.**
 
 # Include [Font Awesome](https://fontawesome.com/)
 
diff --git a/docs/documentation/stories/internationalization.md b/docs/documentation/stories/internationalization.md
index 20210930a696..d71b8bfef2ac 100644
--- a/docs/documentation/stories/internationalization.md
+++ b/docs/documentation/stories/internationalization.md
@@ -1,4 +1,4 @@
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/i18n)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/guide/i18n)**.
 
 # Internationalization (i18n)
 
diff --git a/docs/documentation/stories/multiple-projects.md b/docs/documentation/stories/multiple-projects.md
index d1a49bce61e4..96f2dfba45b6 100644
--- a/docs/documentation/stories/multiple-projects.md
+++ b/docs/documentation/stories/multiple-projects.md
@@ -1,3 +1,5 @@
+**Documentation below is deprecated and we no longer accept PRs to improve this. The new documentation is available [here](https://next.angular.io/guide/build)**.
+
 # Multiple Projects
 
 Angular CLI supports multiple applications within one workspace.
diff --git a/docs/documentation/stories/proxy.md b/docs/documentation/stories/proxy.md
index ceedd3c0ac69..5ce38cb24b93 100644
--- a/docs/documentation/stories/proxy.md
+++ b/docs/documentation/stories/proxy.md
@@ -1,4 +1,4 @@
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/build#using-corporate-proxy)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/guide/build#using-corporate-proxy)**.
 
 # Proxy To Backend
 
diff --git a/docs/documentation/stories/routing.md b/docs/documentation/stories/routing.md
index 4e73e7059c83..023f8a43461c 100644
--- a/docs/documentation/stories/routing.md
+++ b/docs/documentation/stories/routing.md
@@ -1,4 +1,4 @@
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/router#integrate-routing-with-your-app)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/guide/router#integrate-routing-with-your-app)**.
 
 # Generating a route
 
diff --git a/docs/documentation/stories/third-party-lib.md b/docs/documentation/stories/third-party-lib.md
index 272635865808..44b0addb2431 100644
--- a/docs/documentation/stories/third-party-lib.md
+++ b/docs/documentation/stories/third-party-lib.md
@@ -1,3 +1,5 @@
+**Documentation below is deprecated and we no longer accept PRs to improve this. The new documentation is available [here](https://next.angular.io/guide/build)**.
+
 # 3rd Party Library Installation
 
 Simply install your library via `npm install lib-name --save` and import it in your code.
diff --git a/docs/documentation/stories/universal-rendering.md b/docs/documentation/stories/universal-rendering.md
index 92f45d24324b..f05c5769f640 100644
--- a/docs/documentation/stories/universal-rendering.md
+++ b/docs/documentation/stories/universal-rendering.md
@@ -1,4 +1,4 @@
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/guide/universal)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/guide/universal)**.
 
 # Angular Universal Integration
 
diff --git a/docs/documentation/test.md b/docs/documentation/test.md
index dacb212dbbdc..5b00f3286c71 100644
--- a/docs/documentation/test.md
+++ b/docs/documentation/test.md
@@ -1,5 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/test)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/test)**.
 
 
 # ng test
diff --git a/docs/documentation/update.md b/docs/documentation/update.md
index 2d9373dcfca9..2a540e5693e9 100644
--- a/docs/documentation/update.md
+++ b/docs/documentation/update.md
@@ -1,5 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/update)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/update)**.
 
 # ng update
 
diff --git a/docs/documentation/version.md b/docs/documentation/version.md
index 55240da18e7b..4e58dc803a6b 100644
--- a/docs/documentation/version.md
+++ b/docs/documentation/version.md
@@ -1,5 +1,5 @@
 <!-- Links in /docs/documentation should NOT have \`.md\` at the end, because they end up in our wiki at release. -->
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/version)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/version)**.
 
 # ng version
 
diff --git a/docs/documentation/xi18n.md b/docs/documentation/xi18n.md
index 8f7716a95a45..01c00ca475f8 100644
--- a/docs/documentation/xi18n.md
+++ b/docs/documentation/xi18n.md
@@ -1,5 +1,5 @@
 <!-- Links in /docs/documentation should NOT have `.md` at the end, because they end up in our wiki at release. -->
-**Documentation below is for CLI version 6. For version 7 see [here](https://angular.io/cli/xi18n)**.
+**Documentation below is for CLI version 6 and we no longer accept PRs to improve this. For version 7 see [here](https://angular.io/cli/xi18n)**.
 
 # ng xi18n
 

From 32e230d2529e0f9d1e6c5915369f0f3efbe850c3 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Wed, 26 Dec 2018 18:53:39 -0800
Subject: [PATCH 0604/1703] feat(@angular-devkit/architect): deprecate the
 current architect API

This is done in short notice since it was always considered
experimental. Most developers already know that the API is going to
change.
---
 .../src/{architect.ts => architect-legacy.ts} | 59 ++++++++++++++++++-
 .../architect/src/architect_spec.ts           |  2 +-
 .../angular_devkit/architect/src/index.ts     |  6 +-
 3 files changed, 61 insertions(+), 6 deletions(-)
 rename packages/angular_devkit/architect/src/{architect.ts => architect-legacy.ts} (95%)

diff --git a/packages/angular_devkit/architect/src/architect.ts b/packages/angular_devkit/architect/src/architect-legacy.ts
similarity index 95%
rename from packages/angular_devkit/architect/src/architect.ts
rename to packages/angular_devkit/architect/src/architect-legacy.ts
index 2464f6551d94..eba23fa02ed6 100644
--- a/packages/angular_devkit/architect/src/architect.ts
+++ b/packages/angular_devkit/architect/src/architect-legacy.ts
@@ -24,18 +24,27 @@ import { resolve as nodeResolve } from '@angular-devkit/core/node';
 import { Observable, forkJoin, of, throwError } from 'rxjs';
 import { concatMap, map, tap } from 'rxjs/operators';
 
+/**
+ * @deprecated
+ */
 export class ProjectNotFoundException extends BaseException {
   constructor(projectName: string) {
     super(`Project '${projectName}' could not be found in Workspace.`);
   }
 }
 
+/**
+ * @deprecated
+ */
 export class TargetNotFoundException extends BaseException {
   constructor(projectName: string, targetName: string) {
     super(`Target '${targetName}' could not be found in project '${projectName}'.`);
   }
 }
 
+/**
+ * @deprecated
+ */
 export class ConfigurationNotFoundException extends BaseException {
   constructor(projectName: string, configurationName: string) {
     super(`Configuration '${configurationName}' could not be found in project '${projectName}'.`);
@@ -43,22 +52,34 @@ export class ConfigurationNotFoundException extends BaseException {
 }
 
 // TODO: break this exception apart into more granular ones.
+/**
+ * @deprecated
+ */
 export class BuilderCannotBeResolvedException extends BaseException {
   constructor(builder: string) {
     super(`Builder '${builder}' cannot be resolved.`);
   }
 }
 
+/**
+ * @deprecated
+ */
 export class ArchitectNotYetLoadedException extends BaseException {
   constructor() { super(`Architect needs to be loaded before Architect is used.`); }
 }
 
+/**
+ * @deprecated
+ */
 export class BuilderNotFoundException extends BaseException {
   constructor(builder: string) {
     super(`Builder ${builder} could not be found.`);
   }
 }
 
+/**
+ * @deprecated
+ */
 export interface BuilderContext {
   logger: logging.Logger;
   host: virtualFs.Host<{}>;
@@ -70,37 +91,57 @@ export interface BuilderContext {
 // TODO: use Build Event Protocol
 // https://docs.bazel.build/versions/master/build-event-protocol.html
 // https://github.com/googleapis/googleapis/tree/master/google/devtools/build/v1
-// TODO: use unknown
-// tslint:disable-next-line:no-any
-export interface BuildEvent<BuildResultT = any> {
+/**
+ * TODO: use unknown
+ * @deprecated
+ */
+export interface BuildEvent<BuildResultT = any> {  // tslint:disable-line:no-any
   success: boolean;
   result?: BuildResultT;
 }
 
+/**
+ * @deprecated
+ */
 export interface Builder<OptionsT> {
   run(builderConfig: BuilderConfiguration<Partial<OptionsT>>): Observable<BuildEvent>;
 }
 
+/**
+ * @deprecated
+ */
 export interface BuilderPathsMap {
   builders: { [k: string]: BuilderPaths };
 }
 
+/**
+ * @deprecated
+ */
 export interface BuilderPaths {
   class: Path;
   schema: Path;
   description: string;
 }
 
+/**
+ * @deprecated
+ */
 export interface BuilderDescription {
   name: string;
   schema: JsonObject;
   description: string;
 }
 
+/**
+ * @deprecated
+ */
 export interface BuilderConstructor<OptionsT> {
   new(context: BuilderContext): Builder<OptionsT>;
 }
 
+/**
+ * @deprecated
+ */
 export interface BuilderConfiguration<OptionsT = {}> {
   root: Path;
   sourceRoot?: Path;
@@ -109,6 +150,9 @@ export interface BuilderConfiguration<OptionsT = {}> {
   options: OptionsT;
 }
 
+/**
+ * @deprecated
+ */
 export interface TargetSpecifier<OptionsT = {}> {
   project: string;
   target: string;
@@ -116,6 +160,9 @@ export interface TargetSpecifier<OptionsT = {}> {
   overrides?: Partial<OptionsT>;
 }
 
+/**
+ * @deprecated
+ */
 export interface TargetMap {
   [k: string]: Target;
 }
@@ -123,12 +170,18 @@ export interface TargetMap {
 export declare type TargetOptions<T = JsonObject> = T;
 export declare type TargetConfiguration<T = JsonObject> = Partial<T>;
 
+/**
+ * @deprecated
+ */
 export interface Target<T = JsonObject> {
   builder: string;
   options: TargetOptions<T>;
   configurations?: { [k: string]: TargetConfiguration<T> };
 }
 
+/**
+ * @deprecated
+ */
 export class Architect {
   private readonly _targetsSchemaPath = join(normalize(__dirname), 'targets-schema.json');
   private readonly _buildersSchemaPath = join(normalize(__dirname), 'builders-schema.json');
diff --git a/packages/angular_devkit/architect/src/architect_spec.ts b/packages/angular_devkit/architect/src/architect_spec.ts
index f75472f39e6f..54a36b148447 100644
--- a/packages/angular_devkit/architect/src/architect_spec.ts
+++ b/packages/angular_devkit/architect/src/architect_spec.ts
@@ -15,7 +15,7 @@ import {
   BuilderCannotBeResolvedException,
   ConfigurationNotFoundException,
   TargetNotFoundException,
-} from './architect';
+} from './architect-legacy';
 
 
 describe('Architect', () => {
diff --git a/packages/angular_devkit/architect/src/index.ts b/packages/angular_devkit/architect/src/index.ts
index c4635420df03..1041aa4e5be0 100644
--- a/packages/angular_devkit/architect/src/index.ts
+++ b/packages/angular_devkit/architect/src/index.ts
@@ -5,5 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-export * from './architect';
+/**
+ * @deprecated
+ */
+export * from './architect-legacy';

From 3dafcf416f11cb9ae8070abaafae3fbe3dade79a Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 27 Dec 2018 14:05:25 -0800
Subject: [PATCH 0605/1703] feat(@angular-devkit/core): deprecate
 @angular-devkit/architect/testing

---
 packages/angular_devkit/architect/testing/request.ts        | 3 +++
 .../angular_devkit/architect/testing/run-target-spec.ts     | 6 ++++++
 packages/angular_devkit/architect/testing/test-logger.ts    | 3 +++
 .../angular_devkit/architect/testing/test-project-host.ts   | 3 +++
 4 files changed, 15 insertions(+)

diff --git a/packages/angular_devkit/architect/testing/request.ts b/packages/angular_devkit/architect/testing/request.ts
index 6e3450a63bc5..107140f7b725 100644
--- a/packages/angular_devkit/architect/testing/request.ts
+++ b/packages/angular_devkit/architect/testing/request.ts
@@ -9,6 +9,9 @@ import * as http from 'http';
 import * as https from 'https';
 import * as Url from 'url';
 
+/**
+ * @deprecated
+ */
 export function request(url: string, headers = {}): Promise<string> {
   return new Promise((resolve, reject) => {
     const u = Url.parse(url);
diff --git a/packages/angular_devkit/architect/testing/run-target-spec.ts b/packages/angular_devkit/architect/testing/run-target-spec.ts
index 20688782b5c6..9073336b23d4 100644
--- a/packages/angular_devkit/architect/testing/run-target-spec.ts
+++ b/packages/angular_devkit/architect/testing/run-target-spec.ts
@@ -12,8 +12,14 @@ import { concatMap, concatMapTo, finalize, takeUntil } from 'rxjs/operators';
 import { Architect, BuildEvent, BuilderContext, TargetSpecifier } from '../src';
 import { TestProjectHost } from './test-project-host';
 
+/**
+ * @deprecated
+ */
 export const DefaultTimeout = 45000;
 
+/**
+ * @deprecated
+ */
 export function runTargetSpec(
   host: TestProjectHost,
   targetSpec: TargetSpecifier,
diff --git a/packages/angular_devkit/architect/testing/test-logger.ts b/packages/angular_devkit/architect/testing/test-logger.ts
index cda17fad250c..d79ddf680935 100644
--- a/packages/angular_devkit/architect/testing/test-logger.ts
+++ b/packages/angular_devkit/architect/testing/test-logger.ts
@@ -9,6 +9,9 @@
 import { logging } from '@angular-devkit/core';
 
 
+/**
+ * @deprecated
+ */
 export class TestLogger extends logging.Logger {
   private _latestEntries: logging.LogEntry[] = [];
   constructor(name: string, parent: logging.Logger | null = null) {
diff --git a/packages/angular_devkit/architect/testing/test-project-host.ts b/packages/angular_devkit/architect/testing/test-project-host.ts
index 82b75036cf56..f8766c3a8260 100644
--- a/packages/angular_devkit/architect/testing/test-project-host.ts
+++ b/packages/angular_devkit/architect/testing/test-project-host.ts
@@ -22,6 +22,9 @@ import { EMPTY, Observable, from, of } from 'rxjs';
 import { concatMap, delay, finalize, map, mergeMap, retry, tap } from 'rxjs/operators';
 
 
+/**
+ * @deprecated
+ */
 export class TestProjectHost extends NodeJsSyncHost {
   private _currentRoot: Path | null = null;
   private _scopedSyncHost: virtualFs.SyncDelegateHost<Stats> | null = null;

From f8bf4ea70e1ed18f69f50157412f1fe5b11d660e Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Mon, 7 Jan 2019 08:20:32 +0100
Subject: [PATCH 0606/1703] fix(@schematics/angular): remove properties which
 are set by default from required

At the moment, these would end up being required to be passed even though a default is provided.

Fixes #13010
---
 packages/schematics/angular/service-worker/schema.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/schematics/angular/service-worker/schema.json b/packages/schematics/angular/service-worker/schema.json
index 56312e7e4c4e..93dfea349318 100644
--- a/packages/schematics/angular/service-worker/schema.json
+++ b/packages/schematics/angular/service-worker/schema.json
@@ -24,8 +24,6 @@
     }
   },
   "required": [
-    "project",
-    "target",
-    "configuration"
+    "project"
   ]
 }

From f94576b23248ac5bfe614f00dd24f2e383d39504 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 8 Jan 2019 10:41:41 +0100
Subject: [PATCH 0607/1703] feat(@schematics/angular): `experimentalIvy` should
 generates backwards compatible solution

Usage:
```
ng new foo --experimentalIvy
```

Users will need to use `ngcc` so to process code coming from NPM and produce the equivalent Ivy version. This needs to be done once after installing the node packages.

```
node_modules/.bin/ivy-ngcc
```

`ngtsc` compilter will then be used when building using the `--aot` or `--prod` flag.

Fixes #13024
---
 .../angular/application/files/src/main.ts     | 27 ++++-------
 .../schematics/angular/application/index.ts   | 46 ++++++++++++++++++-
 .../angular/application/index_spec.ts         |  6 +++
 .../application/other-files/app.module.ts     |  8 ++--
 4 files changed, 65 insertions(+), 22 deletions(-)

diff --git a/packages/schematics/angular/application/files/src/main.ts b/packages/schematics/angular/application/files/src/main.ts
index ad5a6269c3af..c7b673cf44b3 100644
--- a/packages/schematics/angular/application/files/src/main.ts
+++ b/packages/schematics/angular/application/files/src/main.ts
@@ -1,19 +1,12 @@
-<%= experimentalIvy ? '// ' : '' %>import { enableProdMode } from '@angular/core';
-<%= experimentalIvy ? '// ' : '' %>import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-<%= experimentalIvy ? '// ' : '' %>
-<%= experimentalIvy ? '// ' : '' %>import { AppModule } from './app/app.module';
-<%= experimentalIvy ? '// ' : '' %>import { environment } from './environments/environment';
-<%= experimentalIvy ? '// ' : '' %>
-<%= experimentalIvy ? '// ' : '' %>if (environment.production) {
-<%= experimentalIvy ? '// ' : '' %>  enableProdMode();
-<%= experimentalIvy ? '// ' : '' %>}
-<%= experimentalIvy ? '// ' : '' %>
-<%= experimentalIvy ? '// ' : '' %>platformBrowserDynamic().bootstrapModule(AppModule)
-<%= experimentalIvy ? '// ' : '' %>  .catch(err => console.error(err));
-<% if (experimentalIvy) { %>
-import { AppComponent } from './app/app.component';
-import { ɵrenderComponent as renderComponent } from '@angular/core';
+import { enableProdMode } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
-renderComponent(AppComponent);
+import { AppModule } from './app/app.module';
+import { environment } from './environments/environment';
 
-<% } %>
\ No newline at end of file
+if (environment.production) {
+  enableProdMode();
+}
+
+platformBrowserDynamic().bootstrapModule(AppModule)
+  .catch(err => console.error(err));
diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index f8e5e122e048..b5e6ba471a93 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -5,7 +5,15 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { JsonObject, join, normalize, relative, strings } from '@angular-devkit/core';
+import {
+  JsonObject,
+  JsonParseMode,
+  join,
+  normalize,
+  parseJsonAst,
+  relative,
+  strings,
+} from '@angular-devkit/core';
 import {
   MergeStrategy,
   Rule,
@@ -30,6 +38,7 @@ import {
   getWorkspace,
 } from '../utility/config';
 import { NodeDependencyType, addPackageJsonDependency } from '../utility/dependencies';
+import { findPropertyInAstObject, insertPropertyInAstObjectInOrder } from '../utility/json-utils';
 import { latestVersions } from '../utility/latest-versions';
 import { applyLintFix } from '../utility/lint-fix';
 import { validateProjectName } from '../utility/validation';
@@ -94,6 +103,40 @@ function addDependenciesToPackageJson(options: ApplicationOptions) {
   };
 }
 
+function addPostInstallScript() {
+  return (host: Tree) => {
+    const pkgJsonPath = '/package.json';
+    const buffer = host.read(pkgJsonPath);
+    if (!buffer) {
+      throw new SchematicsException('Could not read package.json.');
+    }
+
+    const packageJsonAst = parseJsonAst(buffer.toString(), JsonParseMode.Strict);
+    if (packageJsonAst.kind !== 'object') {
+      throw new SchematicsException('Invalid package.json. Was expecting an object.');
+    }
+
+    const scriptsNode = findPropertyInAstObject(packageJsonAst, 'scripts');
+    if (scriptsNode && scriptsNode.kind === 'object') {
+      const recorder = host.beginUpdate(pkgJsonPath);
+      const postInstall = findPropertyInAstObject(scriptsNode, 'postinstall');
+
+      if (!postInstall) {
+        // postinstall script not found, add it.
+        insertPropertyInAstObjectInOrder(
+          recorder,
+          scriptsNode,
+          'postinstall',
+          'ivy-ngcc',
+          4,
+        );
+      }
+
+      host.commitUpdate(recorder);
+    }
+  };
+}
+
 function addAppToWorkspaceFile(options: ApplicationOptions, workspace: WorkspaceSchema): Rule {
   // TODO: use JsonAST
   // const workspacePath = '/angular.json';
@@ -372,6 +415,7 @@ export default function (options: ApplicationOptions): Rule {
           move(sourceDir),
         ]), MergeStrategy.Overwrite),
       options.minimal ? noop() : schematic('e2e', e2eOptions),
+      options.experimentalIvy ? addPostInstallScript() : noop(),
       options.skipPackageJson ? noop() : addDependenciesToPackageJson(options),
       options.lintFix ? applyLintFix(sourceDir) : noop(),
     ]);
diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
index a7262fa00ce4..637760945a16 100644
--- a/packages/schematics/angular/application/index_spec.ts
+++ b/packages/schematics/angular/application/index_spec.ts
@@ -190,6 +190,12 @@ describe('Application Schematic', () => {
       expect(pkg.devDependencies['typescript']).toEqual(latestVersions.TypeScript);
     });
 
+    it(`should add a postinstall in package.json when 'experimentalIvy'`, () => {
+      const tree = schematicRunner.runSchematic('application', { ...defaultOptions, experimentalIvy: true }, workspaceTree);
+      const pkg = JSON.parse(tree.readContent('/package.json'));
+      expect(pkg.scripts.postinstall).toEqual('ivy-ngcc');
+    });
+
     it(`should not override existing users dependencies`, () => {
       const oldPackageJson = workspaceTree.readContent('package.json');
       workspaceTree.overwrite('package.json', oldPackageJson.replace(
diff --git a/packages/schematics/angular/application/other-files/app.module.ts b/packages/schematics/angular/application/other-files/app.module.ts
index 4ef3c6e953a1..2c4bc05c64e6 100644
--- a/packages/schematics/angular/application/other-files/app.module.ts
+++ b/packages/schematics/angular/application/other-files/app.module.ts
@@ -1,6 +1,6 @@
-<% if (!experimentalIvy) { %>import { BrowserModule } from '@angular/platform-browser';<% } %>
+import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
-<% if (routing && !experimentalIvy) { %>
+<% if (routing) { %>
 import { AppRoutingModule } from './app-routing.module';<% } %>
 import { AppComponent } from './app.component';
 
@@ -8,10 +8,10 @@ import { AppComponent } from './app.component';
   declarations: [
     AppComponent
   ],
-  imports: [<% if (!experimentalIvy) { %>
+  imports: [
     BrowserModule<% if (routing) { %>,
     AppRoutingModule<% } %>
-  <% } %>],
+  ],
   providers: [],
   bootstrap: [AppComponent]
 })

From 7347d881925130ce325009588b20d5b39ac73258 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 8 Jan 2019 10:58:16 +0100
Subject: [PATCH 0608/1703] feat(@ngtools/webpack): add support for Ivy
 compatible solution

Ivy compatible solution still uses the 'standard' bootstrapping code, however the difference is that there are no factories.

Using a similar approach for `ngc` but without factories and instead of `bootstrapModuleFactory` it uses `bootstrapModule`.
---
 .../webpack/src/angular_compiler_plugin.ts    | 11 +++--
 .../src/transformers/replace_bootstrap.ts     | 23 ++++++----
 .../transformers/replace_bootstrap_spec.ts    | 42 +++++++++++++++++++
 3 files changed, 65 insertions(+), 11 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index d30cb42abcca..67a26cf8d66d 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -406,12 +406,12 @@ export class AngularCompilerPlugin {
     }
 
     // If there's still no entryModule try to resolve from mainPath.
-    if (!this._entryModule && this._mainPath && !this._compilerOptions.enableIvy) {
+    if (!this._entryModule && this._mainPath) {
       time('AngularCompilerPlugin._make.resolveEntryModuleFromMain');
       this._entryModule = resolveEntryModuleFromMain(
         this._mainPath, this._compilerHost, this._getTsProgram() as ts.Program);
 
-      if (!this.entryModule) {
+      if (!this.entryModule && !this._compilerOptions.enableIvy) {
         this._warnings.push('Lazy routes discovery is not enabled. '
           + 'Because there is neither an entryModule nor a '
           + 'statically analyzable bootstrap code in the main file.',
@@ -879,7 +879,12 @@ export class AngularCompilerPlugin {
 
         if (!this._JitMode) {
           // Replace bootstrap in browser AOT.
-          this._transformers.push(replaceBootstrap(isAppPath, getEntryModule, getTypeChecker));
+          this._transformers.push(replaceBootstrap(
+            isAppPath,
+            getEntryModule,
+            getTypeChecker,
+            !!this._compilerOptions.enableIvy,
+          ));
         }
       } else if (this._platform === PLATFORM.Server) {
         this._transformers.push(exportLazyModuleMap(isMainPath, getLazyRoutes));
diff --git a/packages/ngtools/webpack/src/transformers/replace_bootstrap.ts b/packages/ngtools/webpack/src/transformers/replace_bootstrap.ts
index fc05f86b92e0..064e8acedd67 100644
--- a/packages/ngtools/webpack/src/transformers/replace_bootstrap.ts
+++ b/packages/ngtools/webpack/src/transformers/replace_bootstrap.ts
@@ -17,6 +17,7 @@ export function replaceBootstrap(
   shouldTransform: (fileName: string) => boolean,
   getEntryModule: () => { path: string, className: string } | null,
   getTypeChecker: () => ts.TypeChecker,
+  enableIvy?: boolean,
 ): ts.TransformerFactory<ts.SourceFile> {
 
   const standardTransform: StandardTransform = function (sourceFile: ts.SourceFile) {
@@ -37,9 +38,6 @@ export function replaceBootstrap(
       return [];
     }
 
-    const relativeEntryModulePath = relative(dirname(sourceFile.fileName), entryModule.path);
-    const normalizedEntryModulePath = `./${relativeEntryModulePath}`.replace(/\\/g, '/');
-
     // Find the bootstrap calls.
     entryModuleIdentifiers.forEach(entryModuleIdentifier => {
       // Figure out if it's a `platformBrowserDynamic().bootstrapModule(AppModule)` call.
@@ -79,19 +77,28 @@ export function replaceBootstrap(
       const idNgFactory = ts.createUniqueName('__NgCli_bootstrap_');
 
       // Add the transform operations.
-      const factoryClassName = entryModule.className + 'NgFactory';
-      const factoryModulePath = normalizedEntryModulePath + '.ngfactory';
+      const relativeEntryModulePath = relative(dirname(sourceFile.fileName), entryModule.path);
+      let className = entryModule.className;
+      let modulePath = `./${relativeEntryModulePath}`.replace(/\\/g, '/');
+      let bootstrapIdentifier = 'bootstrapModule';
+
+      if (!enableIvy) {
+        className += 'NgFactory';
+        modulePath += '.ngfactory';
+        bootstrapIdentifier = 'bootstrapModuleFactory';
+      }
+
       ops.push(
         // Replace the entry module import.
-        ...insertStarImport(sourceFile, idNgFactory, factoryModulePath),
+        ...insertStarImport(sourceFile, idNgFactory, modulePath),
         new ReplaceNodeOperation(sourceFile, entryModuleIdentifier,
-          ts.createPropertyAccess(idNgFactory, ts.createIdentifier(factoryClassName))),
+          ts.createPropertyAccess(idNgFactory, ts.createIdentifier(className))),
         // Replace the platformBrowserDynamic import.
         ...insertStarImport(sourceFile, idPlatformBrowser, '@angular/platform-browser'),
         new ReplaceNodeOperation(sourceFile, platformBrowserDynamicIdentifier,
           ts.createPropertyAccess(idPlatformBrowser, 'platformBrowser')),
         new ReplaceNodeOperation(sourceFile, bootstrapModuleIdentifier,
-          ts.createIdentifier('bootstrapModuleFactory')),
+          ts.createIdentifier(bootstrapIdentifier)),
       );
     });
 
diff --git a/packages/ngtools/webpack/src/transformers/replace_bootstrap_spec.ts b/packages/ngtools/webpack/src/transformers/replace_bootstrap_spec.ts
index c56e6d8f7445..31358da6e4dd 100644
--- a/packages/ngtools/webpack/src/transformers/replace_bootstrap_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/replace_bootstrap_spec.ts
@@ -52,6 +52,48 @@ describe('@ngtools/webpack transformers', () => {
       expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
     });
 
+    it('should replace bootstrap for Ivy without referencing ngFactory', () => {
+      const input = tags.stripIndent`
+        import { enableProdMode } from '@angular/core';
+        import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+        import { AppModule } from './app/app.module';
+        import { environment } from './environments/environment';
+
+        if (environment.production) {
+          enableProdMode();
+        }
+
+        platformBrowserDynamic().bootstrapModule(AppModule);
+      `;
+
+      // tslint:disable:max-line-length
+      const output = tags.stripIndent`
+        import { enableProdMode } from '@angular/core';
+        import { environment } from './environments/environment';
+
+        import * as __NgCli_bootstrap_1 from "./app/app.module";
+        import * as __NgCli_bootstrap_2 from "@angular/platform-browser";
+
+        if (environment.production) {
+          enableProdMode();
+        }
+        __NgCli_bootstrap_2.platformBrowser().bootstrapModule(__NgCli_bootstrap_1.AppModule);
+      `;
+      // tslint:enable:max-line-length
+
+      const { program, compilerHost } = createTypescriptContext(input);
+      const transformer = replaceBootstrap(
+        () => true,
+        () => ({ path: '/project/src/app/app.module', className: 'AppModule' }),
+        () => program.getTypeChecker(),
+        true,
+      );
+      const result = transformTypescript(undefined, [transformer], program, compilerHost);
+
+      expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+    });
+
     it('should replace bootstrap when barrel files are used', () => {
       const input = tags.stripIndent`
         import { enableProdMode } from '@angular/core';

From 08d067a06f1e03a96eb1a28e183f1565cfab0329 Mon Sep 17 00:00:00 2001
From: Johannes Steier <joeson1@users.noreply.github.com>
Date: Wed, 9 Jan 2019 18:31:48 +0100
Subject: [PATCH 0609/1703] fix(@schematics/update): ensure option is string
 when replacing environment variable references

When substituting environment variables in npmrc options, string replace was also applied on boolean values. This caused the ng update process to fail
---
 packages/schematics/update/update/npm.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/update/update/npm.ts b/packages/schematics/update/update/npm.ts
index cea0ff5c83b8..721c97e1f356 100644
--- a/packages/schematics/update/update/npm.ts
+++ b/packages/schematics/update/update/npm.ts
@@ -84,7 +84,9 @@ function readOptions(
 
   // Substitute any environment variable references
   for (const key in options) {
-    options[key] = options[key].replace(/\$\{([^\}]+)\}/, (_, name) => process.env[name] || '');
+    if (typeof options[key] === 'string') {
+      options[key] = options[key].replace(/\$\{([^\}]+)\}/, (_, name) => process.env[name] || '');
+    }
   }
 
   return options;

From 506401264b1a9862cf95754e22e10c2139e8186a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20Benzenho=CC=88fer?= <moritz.benzenhoefer@gmail.com>
Date: Wed, 9 Jan 2019 23:28:36 +0100
Subject: [PATCH 0610/1703] fix(@schematics/angular): fix syntax error in
 main.ts after generating universal Add missing curly brace for application
 boostrap wrapper and test Fixes #13392

---
 packages/schematics/angular/universal/index.ts      | 2 +-
 packages/schematics/angular/universal/index_spec.ts | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/schematics/angular/universal/index.ts b/packages/schematics/angular/universal/index.ts
index a912c328294c..5909e5cf5b78 100644
--- a/packages/schematics/angular/universal/index.ts
+++ b/packages/schematics/angular/universal/index.ts
@@ -134,7 +134,7 @@ function wrapBootstrapCall(options: UniversalOptions): Rule {
     const triviaWidth = bootstrapCall.getLeadingTriviaWidth();
     const beforeText = `document.addEventListener('DOMContentLoaded', () => {\n`
       + ' '.repeat(triviaWidth > 2 ? triviaWidth + 1 : triviaWidth);
-    const afterText = `\n${triviaWidth > 2 ? ' '.repeat(triviaWidth - 1) : ''});`;
+    const afterText = `\n${triviaWidth > 2 ? ' '.repeat(triviaWidth - 1) : ''}});`;
 
     // in some cases we need to cater for a trailing semicolon such as;
     // bootstrap().catch(err => console.log(err));
diff --git a/packages/schematics/angular/universal/index_spec.ts b/packages/schematics/angular/universal/index_spec.ts
index e1a85803b928..dd0f00759778 100644
--- a/packages/schematics/angular/universal/index_spec.ts
+++ b/packages/schematics/angular/universal/index_spec.ts
@@ -150,10 +150,11 @@ describe('Universal Schematic', () => {
     const tree = schematicRunner.runSchematic('universal', defaultOptions, appTree);
     const filePath = '/projects/bar/src/main.ts';
     const contents = tree.readContent(filePath);
-    expect(contents).toMatch(/document.addEventListener\('DOMContentLoaded', \(\) => {/);
+    expect(contents)
+      .toMatch(/document.addEventListener\('DOMContentLoaded', \(\) => {[\w\W]+;[\r\n]}\);/);
   });
 
-  it('should wrap the bootstrap decleration in a DOMContentLoaded event handler', () => {
+  it('should wrap the bootstrap declaration in a DOMContentLoaded event handler', () => {
     const filePath = '/projects/bar/src/main.ts';
     appTree.overwrite(
       filePath,

From bf93f5236d575350ded4748d1743c7124ed98c86 Mon Sep 17 00:00:00 2001
From: "SIDENIS\\Andrey.Chalkin" <andrey.chalkin@sidenis.com>
Date: Thu, 10 Jan 2019 18:40:56 +0700
Subject: [PATCH 0611/1703] feat(@schematics/angular): add UrlTree to
 CanActivate method signature

---
 .../angular/guard/files/__name@dasherize__.guard.ts           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/guard/files/__name@dasherize__.guard.ts b/packages/schematics/angular/guard/files/__name@dasherize__.guard.ts
index f74fe9af0541..1aa0068e9aef 100644
--- a/packages/schematics/angular/guard/files/__name@dasherize__.guard.ts
+++ b/packages/schematics/angular/guard/files/__name@dasherize__.guard.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree } from '@angular/router';
 import { Observable } from 'rxjs';
 
 @Injectable({
@@ -8,7 +8,7 @@ import { Observable } from 'rxjs';
 export class <%= classify(name) %>Guard implements CanActivate {
   canActivate(
     next: ActivatedRouteSnapshot,
-    state: RouterStateSnapshot): Observable<boolean> | Promise<boolean> | boolean {
+    state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
     return true;
   }
 }

From f7c6719f7306abd23ded6a4edff0f86b84678d09 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 10 Jan 2019 19:28:07 +0000
Subject: [PATCH 0612/1703] fix(@angular-devkit/build-optimizer): support
 windows paths in rollup plugin

---
 .../build_optimizer/src/build-optimizer/rollup-plugin.ts  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_optimizer/src/build-optimizer/rollup-plugin.ts b/packages/angular_devkit/build_optimizer/src/build-optimizer/rollup-plugin.ts
index de02a159f6ab..54742407e872 100644
--- a/packages/angular_devkit/build_optimizer/src/build-optimizer/rollup-plugin.ts
+++ b/packages/angular_devkit/build_optimizer/src/build-optimizer/rollup-plugin.ts
@@ -23,11 +23,17 @@ export interface Options {
 }
 
 export default function optimizer(options: Options) {
+  // Normalize paths for comparison.
+  if (options.sideEffectFreeModules) {
+    options.sideEffectFreeModules = options.sideEffectFreeModules.map(p => p.replace(/\\/g, '/'));
+  }
+
   return {
     name: 'build-optimizer',
     transform: (content: string, id: string): {code: string, map: RawSourceMap}|null => {
+      const normalizedId = id.replace(/\\/g, '/');
       const isSideEffectFree = options.sideEffectFreeModules &&
-        options.sideEffectFreeModules.some(m => id.indexOf(m) >= 0);
+        options.sideEffectFreeModules.some(m => normalizedId.indexOf(m) >= 0);
       const { content: code, sourceMap: map } = buildOptimizer({
         content, inputFilePath: id, emitSourceMap: true, isSideEffectFree,
       });

From 95c72677a5884eb8aa2b869b8a499f41b9aaafc9 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 11 Jan 2019 08:30:38 +0100
Subject: [PATCH 0613/1703] build: terminate process with non zero error code
 when build fails

At the moment, error can be undefined sometimes which is causing the process not to be terminated with a non zero error code.
---
 bin/devkit-admin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/devkit-admin b/bin/devkit-admin
index 45abb60cc659..f356b0d42e96 100755
--- a/bin/devkit-admin
+++ b/bin/devkit-admin
@@ -68,7 +68,7 @@ try {
     .then(() => require(scriptPath).default(args, logger, cwd))
     .then(exitCode => process.exit(exitCode || 0))
     .catch(err => {
-      logger.fatal(err.stack);
+      logger.fatal(err && err.stack);
       process.exit(99);
     });
 } catch (err) {

From 04a7dca3cfd12637ba74350ef5f8255a9afccfb8 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 11 Jan 2019 08:38:04 +0100
Subject: [PATCH 0614/1703] docs: add clause that states the `minimal` projects
 are for learning purposes.

Minimal projects contains limited functionality and certain commands might not work at all.

This projects should be considered as a throw away.

Fixes #13054
---
 packages/schematics/angular/application/schema.json | 2 +-
 packages/schematics/angular/ng-new/schema.json      | 2 +-
 packages/schematics/angular/workspace/schema.json   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json
index 9c245ced0ebc..b0245b8e7ca2 100644
--- a/packages/schematics/angular/application/schema.json
+++ b/packages/schematics/angular/application/schema.json
@@ -70,7 +70,7 @@
       "description": "When true, does not add dependencies to the \"package.json\" file."
     },
     "minimal": {
-      "description": "When true, creates a bare-bones project without any testing frameworks.",
+      "description": "When true, creates a bare-bones project without any testing frameworks and should be used for learning purposes.",
       "type": "boolean",
       "default": false
     },
diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
index f577547de0c6..0247b1cbd673 100644
--- a/packages/schematics/angular/ng-new/schema.json
+++ b/packages/schematics/angular/ng-new/schema.json
@@ -138,7 +138,7 @@
       "default": true
     },
     "minimal": {
-      "description": "When true, creates a project without any testing frameworks.",
+      "description": "When true, creates a project without any testing frameworks and should be used for learning purposes only.",
       "type": "boolean",
       "default": false
     }
diff --git a/packages/schematics/angular/workspace/schema.json b/packages/schematics/angular/workspace/schema.json
index b8d377dd76a6..1728a64ca229 100644
--- a/packages/schematics/angular/workspace/schema.json
+++ b/packages/schematics/angular/workspace/schema.json
@@ -70,7 +70,7 @@
       }
     },
     "minimal": {
-      "description": "When true, creates a project without any testing frameworks",
+      "description": "When true, creates a workspace without any testing frameworks and should be used for learning.",
       "type": "boolean",
       "default": false
     }

From 63748ab6fceeda5ee51e9d058a75d0e70979c924 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@umich.edu>
Date: Thu, 10 Jan 2019 18:23:38 -0800
Subject: [PATCH 0615/1703] fix(@schematics/angular): Add types to AppPage in
 e2e

When app.po.ts is compiled under Bazel with Typescript 3.2,
AppPage produces the following error:

e2e/src/app.po.ts:4:3 - error TS2742: The inferred type of 'navigateTo' cannot be named without a reference to '../../external/npm/node_modules/@types/selenium-webdriver/index'. This is likely not portable. A type annotation is necessary.

4   navigateTo() {
    ~~~~~~~~~~
e2e/src/app.po.ts:8:3 - error TS2742: The inferred type of 'getTitleText' cannot be named without a reference to '../../external/npm/node_modules/@types/selenium-webdriver/index'. This is likely not portable. A type annotation is necessary.

8   getTitleText() {
    ~~~~~~~~~~~~
---
 packages/schematics/angular/e2e/files/src/app.po.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/e2e/files/src/app.po.ts b/packages/schematics/angular/e2e/files/src/app.po.ts
index e071a4c8b39e..cb95601b81e3 100644
--- a/packages/schematics/angular/e2e/files/src/app.po.ts
+++ b/packages/schematics/angular/e2e/files/src/app.po.ts
@@ -2,10 +2,10 @@ import { browser, by, element } from 'protractor';
 
 export class AppPage {
   navigateTo() {
-    return browser.get('/');
+    return browser.get('/') as Promise<any>;
   }
 
   getTitleText() {
-    return element(by.css('<%= rootSelector %> h1')).getText();
+    return element(by.css('<%= rootSelector %> h1')).getText() as Promise<string>;
   }
 }

From 3e1415828390a345f578b3aea2d606e1a5df5b9f Mon Sep 17 00:00:00 2001
From: Amadou Sall <ahasall.dev@gmail.com>
Date: Thu, 20 Dec 2018 13:13:14 +0100
Subject: [PATCH 0616/1703] fix(@schematics/angular): generate coverage for
 libs in their own folder

---
 .../angular/library/files/__projectRoot__/karma.conf.js  | 2 +-
 packages/schematics/angular/library/index.ts             | 1 +
 packages/schematics/angular/library/index_spec.ts        | 9 +++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/angular/library/files/__projectRoot__/karma.conf.js b/packages/schematics/angular/library/files/__projectRoot__/karma.conf.js
index 1f4b7215d02b..04af0229f689 100644
--- a/packages/schematics/angular/library/files/__projectRoot__/karma.conf.js
+++ b/packages/schematics/angular/library/files/__projectRoot__/karma.conf.js
@@ -16,7 +16,7 @@ module.exports = function (config) {
       clearContext: false // leave Jasmine Spec Runner output visible in browser
     },
     coverageIstanbulReporter: {
-      dir: require('path').join(__dirname, '<%= relativePathToWorkspaceRoot %>/coverage'),
+      dir: require('path').join(__dirname, '<%= relativePathToWorkspaceRoot %>/coverage/<%= folderName %>'),
       reports: ['html', 'lcovonly'],
       fixWebpackSourcePaths: true
     },
diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index 2629dd3a9603..b28b4eba122d 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -213,6 +213,7 @@ export default function (options: LibraryOptions): Rule {
         relativePathToWorkspaceRoot,
         prefix,
         angularLatestVersion: latestVersions.Angular.replace('~', '').replace('^', ''),
+        folderName,
       }),
       // TODO: Moving inside `branchAndMerge` should work but is bugged right now.
       // The __projectRoot__ is being used meanwhile.
diff --git a/packages/schematics/angular/library/index_spec.ts b/packages/schematics/angular/library/index_spec.ts
index fa47f5dce23b..a0d6c7acec5d 100644
--- a/packages/schematics/angular/library/index_spec.ts
+++ b/packages/schematics/angular/library/index_spec.ts
@@ -262,6 +262,9 @@ describe('Library Schematic', () => {
 
     const rootTsCfg = JSON.parse(tree.readContent('/tsconfig.json'));
     expect(rootTsCfg.compilerOptions.paths['@myscope/mylib']).toEqual(['dist/myscope/mylib']);
+
+    const karmaConf = getFileContent(tree, '/projects/myscope/mylib/karma.conf.js');
+    expect(karmaConf).toContain(`dir: require('path').join(__dirname, '../../../coverage/myscope/mylib')`);
   });
 
   it(`should dasherize scoped libraries`, () => {
@@ -283,4 +286,10 @@ describe('Library Schematic', () => {
     const cfg = JSON.parse(tree.readContent('/angular.json'));
     expect(cfg.projects['@myScope/myLib']).toBeDefined();
   });
+
+  it(`should set coverage folder to "coverage/foo"`, () => {
+    const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
+    const karmaConf = getFileContent(tree, '/projects/foo/karma.conf.js');
+    expect(karmaConf).toContain(`dir: require('path').join(__dirname, '../../coverage/foo')`);
+  });
 });

From f01c156d002a8b697820eacdb30b2db96a0893ab Mon Sep 17 00:00:00 2001
From: Amadou Sall <ahasall.dev@gmail.com>
Date: Tue, 1 Jan 2019 17:46:58 +0100
Subject: [PATCH 0617/1703] fix(@schematics/angular): apps code coverage should
 resides in their own folder

---
 .../angular/application/files/root/karma.conf.js           | 4 ++--
 packages/schematics/angular/application/index.ts           | 1 +
 packages/schematics/angular/application/index_spec.ts      | 7 +++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/application/files/root/karma.conf.js b/packages/schematics/angular/application/files/root/karma.conf.js
index fe5a99719022..a4d11df3425d 100644
--- a/packages/schematics/angular/application/files/root/karma.conf.js
+++ b/packages/schematics/angular/application/files/root/karma.conf.js
@@ -16,7 +16,7 @@ module.exports = function (config) {
       clearContext: false // leave Jasmine Spec Runner output visible in browser
     },
     coverageIstanbulReporter: {
-      dir: require('path').join(__dirname, '<%= relativePathToWorkspaceRoot %>/coverage'),
+      dir: require('path').join(__dirname, '<%= relativePathToWorkspaceRoot %>/coverage/<%= appName%>'),
       reports: ['html', 'lcovonly', 'text-summary'],
       fixWebpackSourcePaths: true
     },
@@ -28,4 +28,4 @@ module.exports = function (config) {
     browsers: ['Chrome'],
     singleRun: false
   });
-};
\ No newline at end of file
+};
diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index b5e6ba471a93..cc2af68a0ff7 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -367,6 +367,7 @@ export default function (options: ApplicationOptions): Rule {
             'dot': '.',
             relativePathToWorkspaceRoot,
             rootInSrc,
+            appName: options.name,
           }),
           move(appDir),
         ])),
diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
index 637760945a16..290f7978e26e 100644
--- a/packages/schematics/angular/application/index_spec.ts
+++ b/packages/schematics/angular/application/index_spec.ts
@@ -8,6 +8,7 @@
 // tslint:disable:no-big-function
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { latestVersions } from '../utility/latest-versions';
+import { getFileContent } from '../utility/test';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { Schema as ApplicationOptions } from './schema';
 
@@ -136,6 +137,12 @@ describe('Application Schematic', () => {
     expect(content.rules['component-selector'][2]).toMatch('app');
   });
 
+  it('should set the right coverage folder in the karma.json file', () => {
+    const tree = schematicRunner.runSchematic('application', defaultOptions, workspaceTree);
+    const karmaConf = getFileContent(tree, '/projects/foo/karma.conf.js');
+    expect(karmaConf).toContain(`dir: require('path').join(__dirname, '../../coverage/foo')`);
+  });
+
   it('minimal=true should not create e2e project', () => {
     const options = { ...defaultOptions, minimal: true };
 

From 5c73ee353757cbeb937bdeafd8c9597f46633c69 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 21 Dec 2018 18:09:38 +0000
Subject: [PATCH 0618/1703] build: update @types/jasmine to version ^3.0.0

---
 .../schematics/schematics/blank/project-files/package.json    | 4 ++--
 packages/schematics/schematics/schematic/files/package.json   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/schematics/blank/project-files/package.json b/packages/schematics/schematics/blank/project-files/package.json
index d06d6ae0e37b..d3801bda9524 100644
--- a/packages/schematics/schematics/blank/project-files/package.json
+++ b/packages/schematics/schematics/blank/project-files/package.json
@@ -15,9 +15,9 @@
   "dependencies": {
     "@angular-devkit/core": "^<%= coreVersion %>",
     "@angular-devkit/schematics": "^<%= schematicsVersion %>",
-    "@types/jasmine": "^2.6.0",
+    "@types/jasmine": "^3.0.0",
     "@types/node": "^8.0.31",
-    "jasmine": "^2.8.0",
+    "jasmine": "^3.0.0",
     "typescript": "~3.2.2"
   }
 }
diff --git a/packages/schematics/schematics/schematic/files/package.json b/packages/schematics/schematics/schematic/files/package.json
index 5344c487a978..5b9b9e4a7dc8 100644
--- a/packages/schematics/schematics/schematic/files/package.json
+++ b/packages/schematics/schematics/schematic/files/package.json
@@ -15,9 +15,9 @@
   "dependencies": {
     "@angular-devkit/core": "^<%= coreVersion %>",
     "@angular-devkit/schematics": "^<%= schematicsVersion %>",
-    "@types/jasmine": "^2.6.0",
+    "@types/jasmine": "^3.0.0",
     "@types/node": "^8.0.31",
-    "jasmine": "^2.8.0",
+    "jasmine": "^3.0.0",
     "typescript": "~3.2.2"
   }
 }

From a0ac4b0e3dd60c75e1edafd6bb8cced47d10a8d3 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 21 Dec 2018 16:05:34 -0500
Subject: [PATCH 0619/1703] feat(@angular-devkit/schematics): support executing
 a schematic rule on a subtree

---
 .../schematics/src/_golden-api.d.ts           |   1 +
 .../schematics/src/engine/interface.ts        |   1 +
 .../schematics/src/engine/schematic.ts        |  24 ++-
 .../schematics/src/engine/schematic_spec.ts   |  20 +++
 .../schematics/src/tree/scoped.ts             | 139 +++++++++++++++++
 .../schematics/src/tree/scoped_spec.ts        | 141 ++++++++++++++++++
 6 files changed, 325 insertions(+), 1 deletion(-)
 create mode 100644 packages/angular_devkit/schematics/src/tree/scoped.ts
 create mode 100644 packages/angular_devkit/schematics/src/tree/scoped_spec.ts

diff --git a/etc/api/angular_devkit/schematics/src/_golden-api.d.ts b/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
index 026a5893cfcf..707521eac039 100644
--- a/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
@@ -218,6 +218,7 @@ export interface EngineHost<CollectionMetadataT extends object, SchematicMetadat
 
 export interface ExecutionOptions {
     interactive: boolean;
+    scope: string;
 }
 
 export declare function externalSchematic<OptionT extends object>(collectionName: string, schematicName: string, options: OptionT, executionOptions?: Partial<ExecutionOptions>): Rule;
diff --git a/packages/angular_devkit/schematics/src/engine/interface.ts b/packages/angular_devkit/schematics/src/engine/interface.ts
index 0e43788c2340..eba154db2af0 100644
--- a/packages/angular_devkit/schematics/src/engine/interface.ts
+++ b/packages/angular_devkit/schematics/src/engine/interface.ts
@@ -42,6 +42,7 @@ export interface TaskInfo {
 }
 
 export interface ExecutionOptions {
+  scope: string;
   interactive: boolean;
 }
 
diff --git a/packages/angular_devkit/schematics/src/engine/schematic.ts b/packages/angular_devkit/schematics/src/engine/schematic.ts
index fd3acbf774df..594bc4a1f151 100644
--- a/packages/angular_devkit/schematics/src/engine/schematic.ts
+++ b/packages/angular_devkit/schematics/src/engine/schematic.ts
@@ -10,6 +10,7 @@ import { Observable, of as observableOf } from 'rxjs';
 import { concatMap, first, map } from 'rxjs/operators';
 import { callRule } from '../rules/call';
 import { Tree } from '../tree/interface';
+import { ScopedTree } from '../tree/scoped';
 import {
   Collection,
   Engine,
@@ -58,7 +59,28 @@ export class SchematicImpl<CollectionT extends object, SchematicT extends object
           map(o => [tree, o]),
         )),
         concatMap(([tree, transformedOptions]: [Tree, OptionT]) => {
-          return callRule(this._factory(transformedOptions), observableOf(tree), context);
+          let input: Tree;
+          let scoped = false;
+          if (executionOptions && executionOptions.scope) {
+            scoped = true;
+            input = new ScopedTree(tree, executionOptions.scope);
+          } else {
+            input = tree;
+          }
+
+          return callRule(this._factory(transformedOptions), observableOf(input), context).pipe(
+            map(output => {
+              if (output === input) {
+                return tree;
+              } else if (scoped) {
+                tree.merge(output);
+
+                return tree;
+              } else {
+                return output;
+              }
+            }),
+          );
         }),
       );
   }
diff --git a/packages/angular_devkit/schematics/src/engine/schematic_spec.ts b/packages/angular_devkit/schematics/src/engine/schematic_spec.ts
index 7a3fbcfa93f9..5f16ed347644 100644
--- a/packages/angular_devkit/schematics/src/engine/schematic_spec.ts
+++ b/packages/angular_devkit/schematics/src/engine/schematic_spec.ts
@@ -147,4 +147,24 @@ describe('Schematic', () => {
       .then(done, done.fail);
   });
 
+  it('can be called with a scope', done => {
+    const desc: SchematicDescription<CollectionT, SchematicT> = {
+      collection,
+      name: 'test',
+      description: '',
+      path: '/a/b/c',
+      factory: () => (tree: Tree) => {
+        tree.create('a/b/c', 'some content');
+      },
+    };
+
+    const schematic = new SchematicImpl(desc, desc.factory, null !, engine);
+    schematic.call({}, observableOf(empty()), {}, { scope: 'base' })
+      .toPromise()
+      .then(x => {
+        expect(files(x)).toEqual(['/base/a/b/c']);
+      })
+      .then(done, done.fail);
+  });
+
 });
diff --git a/packages/angular_devkit/schematics/src/tree/scoped.ts b/packages/angular_devkit/schematics/src/tree/scoped.ts
new file mode 100644
index 000000000000..210181839fe8
--- /dev/null
+++ b/packages/angular_devkit/schematics/src/tree/scoped.ts
@@ -0,0 +1,139 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import {
+  NormalizedRoot,
+  Path,
+  PathFragment,
+  join,
+  normalize,
+  relative,
+} from '@angular-devkit/core';
+import { Action } from './action';
+import {
+  DirEntry,
+  FileEntry,
+  FileVisitor,
+  MergeStrategy,
+  Tree,
+  TreeSymbol,
+  UpdateRecorder,
+} from './interface';
+
+class ScopedFileEntry implements FileEntry {
+  constructor(private _base: FileEntry, private scope: Path) {}
+
+  get path(): Path {
+    return join(NormalizedRoot, relative(this.scope, this._base.path));
+  }
+
+  get content(): Buffer { return this._base.content; }
+}
+
+class ScopedDirEntry implements DirEntry {
+  constructor(private _base: DirEntry, readonly scope: Path) {}
+
+  get parent(): DirEntry | null {
+    if (!this._base.parent || this._base.path == this.scope) {
+      return null;
+    }
+
+    return new ScopedDirEntry(this._base.parent, this.scope);
+  }
+
+  get path(): Path {
+    return join(NormalizedRoot, relative(this.scope, this._base.path));
+  }
+
+  get subdirs(): PathFragment[] {
+    return this._base.subdirs;
+  }
+  get subfiles(): PathFragment[] {
+    return this._base.subfiles;
+  }
+
+  dir(name: PathFragment): DirEntry {
+    const entry = this._base.dir(name);
+
+    return entry && new ScopedDirEntry(entry, this.scope);
+  }
+
+  file(name: PathFragment): FileEntry | null {
+    const entry = this._base.file(name);
+
+    return entry && new ScopedFileEntry(entry, this.scope);
+  }
+
+  visit(visitor: FileVisitor): void {
+    return this._base.visit((path, entry) => {
+      visitor(
+        join(NormalizedRoot, relative(this.scope, path)),
+        entry && new ScopedFileEntry(entry, this.scope),
+      );
+    });
+  }
+}
+
+export class ScopedTree implements Tree {
+  readonly _root: ScopedDirEntry;
+
+  constructor(private _base: Tree, scope: string) {
+    const normalizedScope = normalize('/' + scope);
+    this._root = new ScopedDirEntry(this._base.getDir(normalizedScope), normalizedScope);
+  }
+
+  get root(): DirEntry { return this._root; }
+
+  branch(): Tree { return new ScopedTree(this._base.branch(), this._root.scope); }
+  merge(other: Tree, strategy?: MergeStrategy): void { this._base.merge(other, strategy); }
+
+  // Readonly.
+  read(path: string): Buffer | null { return this._base.read(this._fullPath(path)); }
+  exists(path: string): boolean { return this._base.exists(this._fullPath(path)); }
+  get(path: string): FileEntry | null {
+    const entry = this._base.get(this._fullPath(path));
+
+    return entry && new ScopedFileEntry(entry, this._root.scope);
+  }
+  getDir(path: string): DirEntry {
+    const entry = this._base.getDir(this._fullPath(path));
+
+    return entry && new ScopedDirEntry(entry, this._root.scope);
+  }
+  visit(visitor: FileVisitor): void { return this._root.visit(visitor); }
+
+  // Change content of host files.
+  overwrite(path: string, content: Buffer | string): void {
+    return this._base.overwrite(this._fullPath(path), content);
+  }
+  beginUpdate(path: string): UpdateRecorder {
+    return this._base.beginUpdate(this._fullPath(path));
+  }
+  commitUpdate(record: UpdateRecorder): void { return this._base.commitUpdate(record); }
+
+  // Structural methods.
+  create(path: string, content: Buffer | string): void {
+    return this._base.create(this._fullPath(path), content);
+  }
+  delete(path: string): void { return this._base.delete(this._fullPath(path)); }
+  rename(from: string, to: string): void {
+    return this._base.rename(this._fullPath(from), this._fullPath(to));
+  }
+
+  apply(action: Action, strategy?: MergeStrategy): void {
+    return this._base.apply(action, strategy);
+  }
+  get actions(): Action[] { return this._base.actions; }
+
+  [TreeSymbol]() {
+    return this;
+  }
+
+  private _fullPath(path: string) {
+    return join(this._root.scope, normalize('/' + path));
+  }
+}
diff --git a/packages/angular_devkit/schematics/src/tree/scoped_spec.ts b/packages/angular_devkit/schematics/src/tree/scoped_spec.ts
new file mode 100644
index 000000000000..43e32e1dd531
--- /dev/null
+++ b/packages/angular_devkit/schematics/src/tree/scoped_spec.ts
@@ -0,0 +1,141 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { UnitTestTree } from '../../testing';
+import { HostTree } from './host-tree';
+import { ScopedTree } from './scoped';
+
+
+describe('ScopedTree', () => {
+  let base: HostTree;
+  let scoped: ScopedTree;
+
+  beforeEach(() => {
+    base = new HostTree();
+    base.create('/file-0-1', '0-1');
+    base.create('/file-0-2', '0-2');
+    base.create('/file-0-3', '0-3');
+    base.create('/level-1/file-1-1', '1-1');
+    base.create('/level-1/file-1-2', '1-2');
+    base.create('/level-1/file-1-3', '1-3');
+    base.create('/level-1/level-2/file-2-1', '2-1');
+    base.create('/level-1/level-2/file-2-2', '2-2');
+    base.create('/level-1/level-2/file-2-3', '2-3');
+
+    scoped = new ScopedTree(base, 'level-1');
+  });
+
+  it('supports exists', () => {
+    expect(scoped.exists('/file-1-1')).toBeTruthy();
+    expect(scoped.exists('file-1-1')).toBeTruthy();
+    expect(scoped.exists('/level-2/file-2-1')).toBeTruthy();
+    expect(scoped.exists('level-2/file-2-1')).toBeTruthy();
+
+    expect(scoped.exists('/file-1-4')).toBeFalsy();
+    expect(scoped.exists('file-1-4')).toBeFalsy();
+
+    expect(scoped.exists('/file-0-1')).toBeFalsy();
+    expect(scoped.exists('file-0-1')).toBeFalsy();
+    expect(scoped.exists('/level-1/file-1-1')).toBeFalsy();
+    expect(scoped.exists('level-1/file-1-1')).toBeFalsy();
+  });
+
+  it('supports read', () => {
+    expect(scoped.read('/file-1-2')).not.toBeNull();
+    expect(scoped.read('file-1-2')).not.toBeNull();
+
+    const test = new UnitTestTree(scoped);
+    expect(test.readContent('/file-1-2')).toBe('1-2');
+    expect(test.readContent('file-1-2')).toBe('1-2');
+
+    expect(scoped.read('/file-0-2')).toBeNull();
+    expect(scoped.read('file-0-2')).toBeNull();
+  });
+
+  it('supports create', () => {
+    expect(() => scoped.create('/file-1-4', '1-4')).not.toThrow();
+
+    const test = new UnitTestTree(scoped);
+    expect(test.readContent('/file-1-4')).toBe('1-4');
+    expect(test.readContent('file-1-4')).toBe('1-4');
+
+    expect(base.exists('/level-1/file-1-4')).toBeTruthy();
+  });
+
+  it('supports delete', () => {
+    expect(() => scoped.delete('/file-0-3')).toThrow();
+
+    expect(() => scoped.delete('/file-1-3')).not.toThrow();
+    expect(scoped.exists('/file-1-3')).toBeFalsy();
+
+    expect(base.exists('/level-1/file-1-3')).toBeFalsy();
+  });
+
+  it('supports overwrite', () => {
+    expect(() => scoped.overwrite('/file-1-1', '1-1*')).not.toThrow();
+    expect(() => scoped.overwrite('/file-1-4', '1-4*')).toThrow();
+
+    const test = new UnitTestTree(scoped);
+    expect(test.readContent('/file-1-1')).toBe('1-1*');
+    expect(test.readContent('file-1-1')).toBe('1-1*');
+  });
+
+  it('supports rename', () => {
+    expect(() => scoped.rename('/file-1-1', '/file-1-1-new')).not.toThrow();
+    expect(() => scoped.rename('/file-1-4', '/file-1-4-new')).toThrow();
+
+    const test = new UnitTestTree(scoped);
+    expect(test.readContent('/file-1-1-new')).toBe('1-1');
+    expect(test.readContent('file-1-1-new')).toBe('1-1');
+  });
+
+  it('supports get', () => {
+    expect(scoped.get('/file-1-1')).not.toBeNull();
+
+    const file = scoped.get('file-1-1');
+    expect(file && file.path as string).toBe('/file-1-1');
+
+    expect(scoped.get('/file-0-1')).toBeNull();
+    expect(scoped.get('file-0-1')).toBeNull();
+  });
+
+  it('supports getDir', () => {
+    expect(scoped.getDir('/level-2')).not.toBeNull();
+
+    const dir = scoped.getDir('level-2');
+    expect(dir.path as string).toBe('/level-2');
+    expect(dir.parent).not.toBeNull();
+    const files: string[] = [];
+    dir.visit(path => files.push(path));
+    files.sort();
+    expect(files).toEqual([
+      '/level-2/file-2-1',
+      '/level-2/file-2-2',
+      '/level-2/file-2-3',
+    ]);
+  });
+
+  it('supports visit', () => {
+    const files: string[] = [];
+    scoped.visit(path => files.push(path));
+    files.sort();
+    expect(files).toEqual([
+      '/file-1-1',
+      '/file-1-2',
+      '/file-1-3',
+      '/level-2/file-2-1',
+      '/level-2/file-2-2',
+      '/level-2/file-2-3',
+    ]);
+  });
+
+  it('supports root', () => {
+    expect(scoped.root).not.toBeNull();
+    expect(scoped.root.path as string).toBe('/');
+    expect(scoped.root.parent).toBeNull();
+  });
+});

From f9a311a66fd9f04d764b8440d9f59e9810487f96 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Fri, 11 Jan 2019 11:35:34 -0800
Subject: [PATCH 0620/1703] fix(@angular-devkit/build-angular): prints a
 warning on --host on serve

The warning points to a solution for the WDS disconnect issue. Using --disable-host-check
will additionally warn the user that this might be insecure.

Fixes #11060
---
 .../build_angular/src/dev-server/index.ts          | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index 51bc0c5cf153..f32a3f102e5f 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -184,6 +184,20 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
     browserOptions: NormalizedBrowserBuilderSchema,
   ) {
     const systemRoot = getSystemPath(root);
+    if (options.host) {
+      // Check that the host is either localhost or prints out a message.
+      if (!/^127\.\d+\.\d+\.\d+/g.test(options.host) && options.host !== 'localhost') {
+        this.context.logger.warn(tags.stripIndent`
+          WARNING: This is a simple server for use in testing or debugging Angular applications
+          locally. It hasn't been reviewed for security issues.
+
+          Binding this server to an open connection can result in compromising your application or
+          computer. Using a different host than the one passed to the "--host" flag might result in
+          websocket connection issues. You might need to use "--disableHostCheck" if that's the
+          case.
+        `);
+      }
+    }
     if (options.disableHostCheck) {
       this.context.logger.warn(tags.oneLine`
         WARNING: Running a server with --disable-host-check is a security risk.

From 21aa3d200fdee1f38ef936214656c16c07438b9d Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 12 Jan 2019 06:50:51 +0000
Subject: [PATCH 0621/1703] build: update source-map-support to version 0.5.10

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 230e6f8a4be4..8cb20ff3f246 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -36,7 +36,7 @@
     "rxjs": "6.3.3",
     "sass-loader": "7.1.0",
     "semver": "5.6.0",
-    "source-map-support": "0.5.9",
+    "source-map-support": "0.5.10",
     "source-map-loader": "0.2.4",
     "speed-measure-webpack-plugin": "1.2.5",
     "stats-webpack-plugin": "0.7.0",
diff --git a/yarn.lock b/yarn.lock
index d42fa60390ff..c75217931f26 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9071,6 +9071,14 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
+source-map-support@0.5.10:
+  version "0.5.10"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
+  integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map-support@0.5.9, source-map-support@^0.5.0, source-map-support@^0.5.3, source-map-support@^0.5.5, source-map-support@~0.5.6:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"

From 59d973519377213f1040e117c65d5e51e986f57b Mon Sep 17 00:00:00 2001
From: Matthias Gaudin <gatthias@gmail.com>
Date: Sat, 12 Jan 2019 17:32:37 +0100
Subject: [PATCH 0622/1703] fix(@angular-devkit/build-angular): add missing
 declaration types in build_angular schemas.

Fixes issue #13388
---
 .../src/angular-cli-files/models/build-options.ts   |  3 ++-
 .../build_angular/src/browser/schema.d.ts           | 13 +++++++++++++
 .../build_angular/src/karma/schema.d.ts             |  7 ++++++-
 .../build_angular/src/server/schema.d.ts            |  3 +++
 .../src/utils/normalize-optimization.ts             | 11 +++++------
 .../src/utils/normalize-source-maps.ts              |  9 +--------
 6 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
index 552b515b53cd..80a9a17a515b 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
@@ -15,8 +15,9 @@ import {
   Budget,
   CurrentFileReplacement,
   ExtraEntryPoint,
+  NormalizedOptimization,
+  NormalizedSourceMaps,
 } from '../../browser/schema';
-import { NormalizedOptimization, NormalizedSourceMaps } from '../../utils/index';
 
 export interface BuildOptions {
   optimization: NormalizedOptimization;
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.d.ts b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
index 243c8f84fc96..1a2bd717ea52 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
@@ -5,6 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 export interface BrowserBuilderSchema {
   /**
    * List of static application assets.
@@ -409,6 +410,18 @@ export enum BudgetType {
 // Right now this normalization has to be done in all other builders that make use of the
 // BrowserBuildSchema and BrowserBuilder.buildWebpackConfig.
 // It would really help if it happens during architect.validateBuilderOptions, or similar.
+export interface NormalizedOptimization {
+  scripts: boolean;
+  styles: boolean;
+}
+
+export interface NormalizedSourceMaps {
+  scripts: boolean;
+  styles: boolean;
+  hidden: boolean;
+  vendor: boolean;
+}
+
 export interface NormalizedBrowserBuilderSchema extends
   Pick<
   BrowserBuilderSchema,
diff --git a/packages/angular_devkit/build_angular/src/karma/schema.d.ts b/packages/angular_devkit/build_angular/src/karma/schema.d.ts
index f2fbc1ca9342..809a735925b7 100644
--- a/packages/angular_devkit/build_angular/src/karma/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/karma/schema.d.ts
@@ -5,7 +5,12 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { BrowserBuilderSchema } from '../browser/schema';
+import {
+  AssetPatternObject,
+  BrowserBuilderSchema,
+  CurrentFileReplacement,
+  NormalizedSourceMaps,
+} from '../browser/schema';
 
 export interface KarmaBuilderSchema extends Pick<BrowserBuilderSchema,
   'assets' | 'main' | 'polyfills' | 'tsConfig' | 'scripts' | 'styles' | 'stylePreprocessorOptions'
diff --git a/packages/angular_devkit/build_angular/src/server/schema.d.ts b/packages/angular_devkit/build_angular/src/server/schema.d.ts
index 76fee12790a5..b4741afec2f6 100644
--- a/packages/angular_devkit/build_angular/src/server/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/server/schema.d.ts
@@ -8,7 +8,10 @@
 
 import {
   BrowserBuilderSchema,
+  CurrentFileReplacement,
   FileReplacement,
+  NormalizedOptimization,
+  NormalizedSourceMaps,
   OptimizationObject,
   SourceMapOptions,
 } from '../browser/schema';
diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-optimization.ts b/packages/angular_devkit/build_angular/src/utils/normalize-optimization.ts
index 36aa1e00420a..f7f9d58cd576 100644
--- a/packages/angular_devkit/build_angular/src/utils/normalize-optimization.ts
+++ b/packages/angular_devkit/build_angular/src/utils/normalize-optimization.ts
@@ -6,12 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { OptimizationOptions, SourceMapOptions } from '../browser/schema';
-
-export interface NormalizedOptimization {
-  scripts: boolean;
-  styles: boolean;
-}
+import {
+  NormalizedOptimization,
+  OptimizationOptions,
+  SourceMapOptions,
+} from '../browser/schema';
 
 export function normalizeOptimization(optimization: OptimizationOptions): NormalizedOptimization {
   const scripts = !!(typeof optimization === 'object' ? optimization.scripts : optimization);
diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-source-maps.ts b/packages/angular_devkit/build_angular/src/utils/normalize-source-maps.ts
index 69d403219792..1689e7da9997 100644
--- a/packages/angular_devkit/build_angular/src/utils/normalize-source-maps.ts
+++ b/packages/angular_devkit/build_angular/src/utils/normalize-source-maps.ts
@@ -6,14 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { SourceMapOptions } from '../browser/schema';
-
-export interface NormalizedSourceMaps {
-  scripts: boolean;
-  styles: boolean;
-  hidden: boolean;
-  vendor: boolean;
-}
+import { NormalizedSourceMaps, SourceMapOptions } from '../browser/schema';
 
 export function normalizeSourceMaps(sourceMap: SourceMapOptions): NormalizedSourceMaps {
   const scripts = !!(typeof sourceMap === 'object' ? sourceMap.scripts : sourceMap);

From 9e8ca810411a310c89d3890c9edc3b050f06273f Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 12 Jan 2019 17:17:59 +0000
Subject: [PATCH 0623/1703] build: update autoprefixer to version 9.4.5

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 71 +++++++++++++------
 2 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 8cb20ff3f246..3c1f54a57004 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -12,7 +12,7 @@
     "@angular-devkit/core": "0.0.0",
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.6.2",
-    "autoprefixer": "9.4.4",
+    "autoprefixer": "9.4.5",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "4.6.0",
diff --git a/yarn.lock b/yarn.lock
index c75217931f26..ed7e360c7edd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1181,16 +1181,16 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@9.4.4:
-  version "9.4.4"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.4.tgz#40c42b335bdb22efe8cd80389ca82ffb5e32d68d"
-  integrity sha512-7tpjBadJyHKf+gOJEmKhZIksWxdZCSrnKbbTJNsw+/zX9+f//DLELRQPWjjjVoDbbWlCuNRkN7RfmZwDVgWMLw==
+autoprefixer@9.4.5:
+  version "9.4.5"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.5.tgz#a13ccb001e4bc8837f71c3354005b42f02cc03d7"
+  integrity sha512-M602C0ZxzFpJKqD4V6eq2j+K5CkzlhekCrcQupJmAOrPEZjWJyj/wSeo6qRSNoN6M3/9mtLPQqTTrABfReytQg==
   dependencies:
-    browserslist "^4.3.7"
-    caniuse-lite "^1.0.30000926"
+    browserslist "^4.4.0"
+    caniuse-lite "^1.0.30000928"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.7"
+    postcss "^7.0.11"
     postcss-value-parser "^3.3.1"
 
 autoprefixer@^9.0.0:
@@ -1624,13 +1624,13 @@ browserslist@^4.0.0, browserslist@^4.3.3:
     electron-to-chromium "^1.3.82"
     node-releases "^1.0.1"
 
-browserslist@^4.3.7:
-  version "4.3.7"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.7.tgz#f1de479a6466ea47a0a26dcc725e7504817e624a"
-  integrity sha512-pWQv51Ynb0MNk9JGMCZ8VkM785/4MQNXiFYtPqI7EEP0TJO+/d/NqRVn1uiAN0DNbnlUSpL2sh16Kspasv3pUQ==
+browserslist@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.0.tgz#7050d1412cbfc5274aba609ed5e50359ca1a5fdf"
+  integrity sha512-tQkHS8VVxWbrjnNDXgt7/+SuPJ7qDvD0Y2e6bLtoQluR2SPvlmPUcfcU75L1KAalhqULlIFJlJ6BDfnYyJxJsw==
   dependencies:
-    caniuse-lite "^1.0.30000925"
-    electron-to-chromium "^1.3.96"
+    caniuse-lite "^1.0.30000928"
+    electron-to-chromium "^1.3.100"
     node-releases "^1.1.3"
 
 browserstack@^1.5.1:
@@ -1879,10 +1879,10 @@ caniuse-lite@^1.0.30000898, caniuse-lite@^1.0.30000899:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000903.tgz#86d46227759279b3db345ddbe778335dbba9e858"
   integrity sha512-T1XVJEpGCoaq7MDw7/6hCdYUukmSaS+1l/OQJkLtw7Cr2+/+d67tNGKEbyiqf7Ck8x6EhNFUxjYFXXka0N/w5g==
 
-caniuse-lite@^1.0.30000925, caniuse-lite@^1.0.30000926:
-  version "1.0.30000926"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000926.tgz#4361a99d818ca6e521dbe89a732de62a194a789c"
-  integrity sha512-diMkEvxfFw09SkbErCLmw/1Fx1ZZe9xfWm4aeA2PUffB48x1tfZeMsK5j4BW7zN7Y4PdqmPVVdG2eYjE5IRTag==
+caniuse-lite@^1.0.30000928:
+  version "1.0.30000928"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000928.tgz#805e828dc72b06498e3683a32e61c7507fd67b88"
+  integrity sha512-aSpMWRXL6ZXNnzm8hgE4QDLibG5pVJ2Ujzsuj3icazlIkxXkPXtL+BWnMx6FBkWmkZgBHGUxPZQvrbRw2ZTxhg==
 
 canonical-path@1.0.0:
   version "1.0.0"
@@ -1924,6 +1924,15 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -3134,16 +3143,16 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
+electron-to-chromium@^1.3.100:
+  version "1.3.102"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.102.tgz#3ac43a037c8a63bca3dfa189eb3d90f097196787"
+  integrity sha512-2nzZuXw/KBPnI3QX3UOCSRvJiVy7o9+VHRDQ3D/EHCvVc89X6aj/GlNmEgiR2GBIhmSWXIi4W1M5okA5ScSlNg==
+
 electron-to-chromium@^1.3.82:
   version "1.3.82"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.82.tgz#7d13ae4437d2a783de3f4efba96b186c540b67b1"
   integrity sha512-NI4nB2IWGcU4JVT1AE8kBb/dFor4zjLHMLsOROPahppeHrR0FG5uslxMmkp/thO1MvPjM2xhlKoY29/I60s0ew==
 
-electron-to-chromium@^1.3.96:
-  version "1.3.96"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.96.tgz#25770ec99b8b07706dedf3a5f43fa50cb54c4f9a"
-  integrity sha512-ZUXBUyGLeoJxp4Nt6G/GjBRLnyz8IKQGexZ2ndWaoegThgMGFO1tdDYID5gBV32/1S83osjJHyfzvanE/8HY4Q==
-
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
@@ -7632,7 +7641,7 @@ postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.1:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss@7.0.7, postcss@^7.0.7:
+postcss@7.0.7:
   version "7.0.7"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.7.tgz#2754d073f77acb4ef08f1235c36c5721a7201614"
   integrity sha512-HThWSJEPkupqew2fnuQMEI2YcTj/8gMV3n80cMdJsKxfIh5tHf7nM5JigNX6LxVMqo6zkgQNAI88hyFvBk41Pg==
@@ -7650,6 +7659,15 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
     source-map "^0.6.1"
     supports-color "^5.5.0"
 
+postcss@^7.0.11:
+  version "7.0.11"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.11.tgz#f63c513b78026d66263bb2ca995bf02e3d1a697d"
+  integrity sha512-9AXb//5UcjeOEof9T+yPw3XTa5SL207ZOIC/lHYP4mbUTEh4M0rDAQekQpVANCZdwQwKhBtFZCk3i3h3h2hdWg==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -9583,6 +9601,13 @@ supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.4.0, supports-co
   dependencies:
     has-flag "^3.0.0"
 
+supports-color@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
+  dependencies:
+    has-flag "^3.0.0"
+
 symbol-observable@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"

From b47f1c53d2d87f3538fa9a390110f379a6772c9e Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 12 Jan 2019 18:36:28 +0000
Subject: [PATCH 0624/1703] build: update license-webpack-plugin to version
 2.1.0

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 3c1f54a57004..b070d92ac966 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -23,7 +23,7 @@
     "karma-source-map-support": "1.3.0",
     "less": "3.9.0",
     "less-loader": "4.1.0",
-    "license-webpack-plugin": "2.0.4",
+    "license-webpack-plugin": "2.1.0",
     "loader-utils": "1.2.3",
     "mini-css-extract-plugin": "0.5.0",
     "minimatch": "3.0.4",
diff --git a/yarn.lock b/yarn.lock
index ed7e360c7edd..5049a8baeca2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5809,10 +5809,10 @@ license-checker@^20.1.0:
     strip-ansi "^4.0.0"
     treeify "^1.1.0"
 
-license-webpack-plugin@2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.0.4.tgz#48532e7d7b45f6ceb21a68b6826ce7241d7ea6da"
-  integrity sha512-FQgOqrrIcD4C/VQo6ecWgXZULK5rs0kIDJtHcSVO6SBUrD63kEHZwmKOvBTquFQSgMQn/yeH68qooKDfqiBF2Q==
+license-webpack-plugin@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.1.0.tgz#83acaa6e89c3c5316effdd80cb4ec9c5cd8efc2f"
+  integrity sha512-vDiBeMWxjE9n6TabQ9J4FH8urFdsRK0Nvxn1cit9biCiR9aq1zBR0X2BlAkEiIG6qPamLeU0GzvIgLkrFc398A==
   dependencies:
     "@types/webpack-sources" "^0.1.5"
     webpack-sources "^1.2.0"

From a52fc53f0461c506c436b3a0450a2ba2984f8811 Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Sun, 13 Jan 2019 16:27:21 +0100
Subject: [PATCH 0625/1703] feat(@schematics/angular): activate recommended
 tslint rules

---
 .../angular/workspace/files/tslint.json       | 48 ++-----------------
 1 file changed, 3 insertions(+), 45 deletions(-)

diff --git a/packages/schematics/angular/workspace/files/tslint.json b/packages/schematics/angular/workspace/files/tslint.json
index 91c17188f18d..868ecba0db1b 100644
--- a/packages/schematics/angular/workspace/files/tslint.json
+++ b/packages/schematics/angular/workspace/files/tslint.json
@@ -4,21 +4,16 @@
     "codelyzer"
   ],
   "rules": {
-    "adjacent-overload-signatures": false,
-    "align": false,
     "array-type": false,
     "arrow-parens": false,
-    "ban-types": false,
     "deprecation": {
       "severity": "warn"
     },
-    "function-constructor": false,
     "import-blacklist": [
       true,
       "rxjs/Rx"
     ],
     "interface-name": false,
-    "jsdoc-format": false,
     "max-classes-per-file": false,
     "max-line-length": [
       true,
@@ -36,9 +31,6 @@
         ]
       }
     ],
-    "new-parens": false,
-    "no-angle-bracket-type-assertion": false,
-    "no-conditional-assignment": false,
     "no-consecutive-blank-lines": false,
     "no-console": [
       true,
@@ -53,56 +45,22 @@
       true,
       "ignore-params"
     ],
-    "no-namespace": false,
     "no-non-null-assertion": true,
     "no-redundant-jsdoc": true,
-    "no-reference": false,
-    "no-reference-import": false,
-    "no-string-literal": false,
     "no-switch-case-fall-through": true,
-    "no-unsafe-finally": false,
     "no-use-before-declare": true,
     "no-var-requires": false,
-    "object-literal-key-quotes": false,
-    "object-literal-shorthand": false,
-    "object-literal-sort-keys": false,
-    "one-line": [
+    "object-literal-key-quotes": [
       true,
-      "check-open-brace",
-      "check-catch",
-      "check-else",
-      "check-whitespace"
+      "as-needed"
     ],
-    "one-variable-per-declaration": false,
-    "only-arrow-functions": false,
+    "object-literal-sort-keys": false,
     "ordered-imports": false,
-    "prefer-for-of": false,
     "quotemark": [
       true,
       "single"
     ],
-    "space-before-function-paren": false,
     "trailing-comma": false,
-    "typedef-whitespace": [
-      true,
-      {
-        "call-signature": "nospace",
-        "index-signature": "nospace",
-        "parameter": "nospace",
-        "property-declaration": "nospace",
-        "variable-declaration": "nospace"
-      }
-    ],
-    "use-isnan": false,
-    "variable-name": false,
-    "whitespace": [
-      true,
-      "check-branch",
-      "check-decl",
-      "check-operator",
-      "check-separator",
-      "check-type"
-    ],
     "no-output-on-prefix": true,
     "use-input-property-decorator": true,
     "use-output-property-decorator": true,

From b66e0bbc6069388cb02d61562d205f3a8459aa29 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Mon, 14 Jan 2019 07:48:25 +0100
Subject: [PATCH 0626/1703] fix(@angular-devkit/build-angular): only show
 production warning when having either styles on scripts optimization turn on

Fixes #13415
---
 packages/angular_devkit/build_angular/src/dev-server/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index f32a3f102e5f..2948042a1bd9 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -128,7 +128,7 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
           });
         }
 
-        if (browserOptions.optimization) {
+        if (browserOptions.optimization.scripts || browserOptions.optimization.styles) {
           this.context.logger.error(tags.stripIndents`
             ****************************************************************************************
             This is a simple server for use in testing or debugging Angular applications locally.

From d10f125cc1a0c7d00343f80f3853a06ac1c21ed0 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Mon, 14 Jan 2019 08:56:15 +0100
Subject: [PATCH 0627/1703] fix(@angular-devkit/build-angular):
 `vendorSourceMap` not being recognized when passed directly

Fixes #13414
---
 .../src/utils/normalize-builder-schema.ts     |  2 +-
 .../browser/vendor-source-map_spec_large.ts   | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-builder-schema.ts b/packages/angular_devkit/build_angular/src/utils/normalize-builder-schema.ts
index 2a7617d489f0..63dbffd75d80 100644
--- a/packages/angular_devkit/build_angular/src/utils/normalize-builder-schema.ts
+++ b/packages/angular_devkit/build_angular/src/utils/normalize-builder-schema.ts
@@ -72,6 +72,6 @@ export function normalizeBuilderSchema<BuilderConfigurationT extends
         ...assets,
         fileReplacements: normalizeFileReplacements(options.fileReplacements, syncHost, root),
         optimization: normalizeOptimization(optimization),
-        sourceMap: normalizeSourceMaps(options.sourceMap),
+        sourceMap: normalizedSourceMapOptions,
     };
 }
diff --git a/packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts
index 00f7f52002df..ac0e57243e40 100644
--- a/packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts
@@ -41,6 +41,29 @@ describe('Browser Builder external source map', () => {
     ).toPromise().then(done, done.fail);
   });
 
+  it(`works when using deprecated 'vendorSourceMap'`, (done) => {
+    const overrides: Partial<BrowserBuilderSchema> = {
+      sourceMap: {
+        scripts: true,
+        styles: true,
+      },
+      vendorSourceMap: true,
+    };
+
+    runTargetSpec(host, browserTargetSpec, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => {
+        const fileName = join(outputPath, 'vendor.js.map');
+        expect(host.scopedSync().exists(fileName)).toBe(true);
+        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
+        // this is due the fact that some vendors like `tslib` sourcemaps to js files
+        const sourcePath = JSON.parse(content).sources[0];
+        expect(path.extname(sourcePath)).toBe('.ts', `${sourcePath} extention should be '.ts'`);
+      }),
+    ).toPromise().then(done, done.fail);
+  });
+
+
   it('does not map sourcemaps from external library when disabled', (done) => {
     const overrides: Partial<BrowserBuilderSchema> = {
       sourceMap: {

From 8d177e878919e1b7def5ff90c592386622661ede Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 13 Dec 2018 21:07:46 -0500
Subject: [PATCH 0628/1703] feat(@angular-devkit/schematics): support calling a
 task by file path when using a FileSystemEngineHost

---
 .../schematics/tools/index.d.ts               |  2 +
 .../tools/file-system-engine-host.ts          | 33 +++++++++++++++-
 .../tools/file-system-engine-host_spec.ts     | 38 ++++++++++++++++++-
 .../tools/file-system-engine-host/BUILD       |  2 +-
 .../file-tasks/collection.json                |  9 +++++
 .../file-tasks/factory.ts                     | 19 ++++++++++
 .../file-tasks/file-task.js                   |  7 ++++
 7 files changed, 107 insertions(+), 3 deletions(-)
 create mode 100644 tests/angular_devkit/schematics/tools/file-system-engine-host/file-tasks/collection.json
 create mode 100644 tests/angular_devkit/schematics/tools/file-system-engine-host/file-tasks/factory.ts
 create mode 100644 tests/angular_devkit/schematics/tools/file-system-engine-host/file-tasks/file-task.js

diff --git a/etc/api/angular_devkit/schematics/tools/index.d.ts b/etc/api/angular_devkit/schematics/tools/index.d.ts
index 328f5cc67fbe..ded2fac77a2b 100644
--- a/etc/api/angular_devkit/schematics/tools/index.d.ts
+++ b/etc/api/angular_devkit/schematics/tools/index.d.ts
@@ -43,6 +43,8 @@ export declare class FileSystemEngineHost extends FileSystemEngineHostBase {
     } | null;
     protected _transformCollectionDescription(name: string, desc: Partial<FileSystemCollectionDesc>): FileSystemCollectionDesc;
     protected _transformSchematicDescription(name: string, _collection: FileSystemCollectionDesc, desc: Partial<FileSystemSchematicDesc>): FileSystemSchematicDesc;
+    createTaskExecutor(name: string): Observable<TaskExecutor>;
+    hasTaskExecutor(name: string): boolean;
 }
 
 export declare abstract class FileSystemEngineHostBase implements EngineHost<FileSystemCollectionDescription, FileSystemSchematicDescription> {
diff --git a/packages/angular_devkit/schematics/tools/file-system-engine-host.ts b/packages/angular_devkit/schematics/tools/file-system-engine-host.ts
index 431090dd3d55..3b200afe7a05 100644
--- a/packages/angular_devkit/schematics/tools/file-system-engine-host.ts
+++ b/packages/angular_devkit/schematics/tools/file-system-engine-host.ts
@@ -7,7 +7,9 @@
  */
 import { existsSync } from 'fs';
 import { join } from 'path';
-import { RuleFactory } from '../src';
+import { Observable, from, throwError } from 'rxjs';
+import { catchError } from 'rxjs/operators';
+import { RuleFactory, TaskExecutor, UnregisteredTaskException } from '../src';
 import { FileSystemCollectionDesc, FileSystemSchematicDesc } from './description';
 import { ExportStringRef } from './export-ref';
 import {
@@ -81,4 +83,33 @@ export class FileSystemEngineHost extends FileSystemEngineHostBase {
 
     return desc as FileSystemSchematicDesc;
   }
+
+  hasTaskExecutor(name: string): boolean {
+    if (super.hasTaskExecutor(name)) {
+      return true;
+    }
+
+    try {
+      const maybePath = require.resolve(join(this._root, name));
+      if (existsSync(maybePath)) {
+        return true;
+      }
+    } catch {}
+
+    return false;
+  }
+
+  createTaskExecutor(name: string): Observable<TaskExecutor> {
+    if (!super.hasTaskExecutor(name)) {
+      try {
+        const path = require.resolve(join(this._root, name));
+
+        return from(import(path).then(mod => mod.default())).pipe(
+          catchError(() => throwError(new UnregisteredTaskException(name))),
+        );
+      } catch {}
+    }
+
+    return super.createTaskExecutor(name);
+  }
 }
diff --git a/packages/angular_devkit/schematics/tools/file-system-engine-host_spec.ts b/packages/angular_devkit/schematics/tools/file-system-engine-host_spec.ts
index be374c5ac934..905525e2aa79 100644
--- a/packages/angular_devkit/schematics/tools/file-system-engine-host_spec.ts
+++ b/packages/angular_devkit/schematics/tools/file-system-engine-host_spec.ts
@@ -10,7 +10,7 @@ import { normalize, virtualFs } from '@angular-devkit/core';
 import { HostSink, HostTree, SchematicEngine } from '@angular-devkit/schematics';
 import { FileSystemEngineHost } from '@angular-devkit/schematics/tools';
 import * as path from 'path';
-import { of as observableOf } from 'rxjs';
+import { from, of as observableOf } from 'rxjs';
 
 
 describe('FileSystemEngineHost', () => {
@@ -300,4 +300,40 @@ describe('FileSystemEngineHost', () => {
       })
       .then(done, done.fail);
   });
+
+  it('discovers a file-based task', () => {
+    const engineHost = new FileSystemEngineHost(root);
+
+    expect(engineHost.hasTaskExecutor('file-tasks/file-task.js')).toBeTruthy();
+  });
+
+  it('creates a file-based task', done => {
+    const engineHost = new FileSystemEngineHost(root);
+
+    engineHost.createTaskExecutor('file-tasks/file-task.js').subscribe(executor => {
+      expect(executor).toBeTruthy();
+      from(executor(undefined, undefined as any)).toPromise().then(() => done.fail, () => done());
+    }, done.fail);
+  });
+
+  it('allows executing a schematic with a file-based task', done => {
+    const engineHost = new FileSystemEngineHost(root);
+    const engine = new SchematicEngine(engineHost);
+    const host = new virtualFs.test.TestHost();
+
+    const collection = engine.createCollection('file-tasks');
+    const schematic = collection.createSchematic('schematic-1');
+
+    schematic.call({}, observableOf(new HostTree(host))).toPromise()
+      .then(tree => new HostSink(host).commit(tree).toPromise())
+      .then(() => engine.executePostTasks().toPromise())
+      .then(() => done.fail())
+      .catch(reason => {
+        if (reason.message === 'task exception') {
+          done();
+        } else {
+          done.fail();
+        }
+      });
+  });
 });
diff --git a/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD b/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD
index 0ed6399fcbd3..b44a0bdd8118 100644
--- a/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD
+++ b/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD
@@ -16,7 +16,7 @@ ts_library(
         ],
     ),
     data = glob(
-        include = ["**/collection.json"],
+        include = ["**/collection.json", "**/*.js"],
     ),
     deps = [
         "//packages/angular_devkit/schematics",
diff --git a/tests/angular_devkit/schematics/tools/file-system-engine-host/file-tasks/collection.json b/tests/angular_devkit/schematics/tools/file-system-engine-host/file-tasks/collection.json
new file mode 100644
index 000000000000..8d8d22c17b0c
--- /dev/null
+++ b/tests/angular_devkit/schematics/tools/file-system-engine-host/file-tasks/collection.json
@@ -0,0 +1,9 @@
+{
+    "name": "file-tasks",
+    "schematics": {
+      "schematic-1": {
+        "description": "1",
+        "factory": "./factory"
+      }
+    }
+  }
\ No newline at end of file
diff --git a/tests/angular_devkit/schematics/tools/file-system-engine-host/file-tasks/factory.ts b/tests/angular_devkit/schematics/tools/file-system-engine-host/file-tasks/factory.ts
new file mode 100644
index 000000000000..dba7a8f554c5
--- /dev/null
+++ b/tests/angular_devkit/schematics/tools/file-system-engine-host/file-tasks/factory.ts
@@ -0,0 +1,19 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// tslint:disable-next-line:no-implicit-dependencies
+import { SchematicContext, Tree } from '@angular-devkit/schematics';
+
+export default function() {
+  return (_: Tree, context: SchematicContext) => {
+    context.addTask({
+      toConfiguration() {
+        return { name: 'file-tasks/file-task.js' };
+      },
+    });
+  };
+}
diff --git a/tests/angular_devkit/schematics/tools/file-system-engine-host/file-tasks/file-task.js b/tests/angular_devkit/schematics/tools/file-system-engine-host/file-tasks/file-task.js
new file mode 100644
index 000000000000..c975522c3658
--- /dev/null
+++ b/tests/angular_devkit/schematics/tools/file-system-engine-host/file-tasks/file-task.js
@@ -0,0 +1,7 @@
+function default_1() {
+    return async () => {
+        throw new Error('task exception');
+    }
+}
+
+exports.default = default_1;
\ No newline at end of file

From b972d57537ea76a81c44678e1a7f1d7b677edc65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AA=BF=E6=9C=88=E5=A5=8F?=
 <9085560+Tsuki@users.noreply.github.com>
Date: Wed, 19 Dec 2018 15:42:25 +0700
Subject: [PATCH 0629/1703] fix(@angular-devkit/build-angular): script chunk in
 angular.json return false then calling isInitial

This commit add the webpack chunk with it related chunkgroup or entrypoint
---
 .../plugins/scripts-webpack-plugin.ts         |  2 +-
 .../test/browser/scripts-array_spec_large.ts  | 20 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/scripts-webpack-plugin.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/scripts-webpack-plugin.ts
index 51d0c8ed8b2b..acb79134e8bd 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/scripts-webpack-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/scripts-webpack-plugin.ts
@@ -83,7 +83,7 @@ export class ScriptsWebpackPlugin {
 
     const entrypoint = new EntryPoint(this.options.name);
     entrypoint.pushChunk(chunk);
-
+    chunk.addGroup(entrypoint);
     compilation.entrypoints.set(this.options.name, entrypoint);
     compilation.chunks.push(chunk);
     compilation.assets[filename] = source;
diff --git a/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
index 40ab2b5fa8d0..3e384dd48efa 100644
--- a/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { DefaultTimeout, runTargetSpec } from '@angular-devkit/architect/testing';
+import { DefaultTimeout, TestLogger, runTargetSpec } from '@angular-devkit/architect/testing';
 import { PathFragment, join, normalize, virtualFs } from '@angular-devkit/core';
 import { tap } from 'rxjs/operators';
 import { browserTargetSpec, host } from '../utils';
@@ -133,4 +133,22 @@ describe('Browser Builder scripts array', () => {
       }),
     ).toPromise().then(done, done.fail);
   });
+
+  it('chunk in entry', (done) => {
+    host.writeMultipleFiles(scripts);
+
+    const overrides = { scripts: getScriptsOption() };
+    const logger = new TestLogger('build-script-entry');
+
+    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout, logger).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => {
+        const validate = ` [entry] [rendered]`;
+        expect(logger.includes(`(lazy-script) 69 bytes${validate}`)).toBe(true);
+        expect(logger.includes(`(renamed-script) 78 bytes${validate}`)).toBe(true);
+        expect(logger.includes(`(renamed-lazy-script) 88 bytes${validate}`)).toBe(true);
+        logger.clear();
+      }),
+    ).toPromise().then(done, done.fail);
+  });
 });

From 3a70eb73c4de534a95c4aff68eb543edb5db84b4 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 27 Nov 2018 16:06:01 +0000
Subject: [PATCH 0630/1703] ci: add windows buildkite

---
 .buildkite/pipeline.yml                       | 25 +++++++++++++++++++
 appveyor-e2e.bat                              | 14 ++++++++---
 .../core/src/json/schema/registry_spec.ts     |  8 ++++++
 3 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 .buildkite/pipeline.yml

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
new file mode 100644
index 000000000000..411de648250b
--- /dev/null
+++ b/.buildkite/pipeline.yml
@@ -0,0 +1,25 @@
+steps:
+  - label: windows-test
+    commands:
+      # Yarn workspaces creates directory junctions inside node_modules, but these fail in docker.
+      # E.g. inside the container, `mklink /J "C:\src\_" "C:\src\packages\_"` will fail with 
+      # `Access is denied.`
+      # https://github.com/moby/moby/issues/37024
+      # As a workaround, we copy all files in the shared volume and run the commands in the new dir.
+      - xcopy C:\workdir C:\workdir-copy /E /H /K /S /Q /I
+      - cd C:\workdir-copy
+      # Actual CI commands
+      # --network-timeout is a workaround for https://github.com/yarnpkg/yarn/issues/6221
+      - yarn install --frozen-lockfile --non-interactive --network-timeout 500000
+      - yarn webdriver-update-appveyor
+      - node --version
+      - yarn --version
+      - yarn test
+      # Move this file into the .buildkite folder if Appveyor is removed.
+      - appveyor-e2e.bat
+      # - bazel test ...
+    plugins:
+      - docker#v2.1.0:
+          image: "filipesilva/node-bazel-windows:0.0.2"
+    agents:
+      windows: true
diff --git a/appveyor-e2e.bat b/appveyor-e2e.bat
index 9d8e8b2d5888..d1f6c0eabb16 100644
--- a/appveyor-e2e.bat
+++ b/appveyor-e2e.bat
@@ -1,6 +1,12 @@
 @ECHO OFF
-IF defined APPVEYOR_PULL_REQUEST_NUMBER (
-    node tests\legacy-cli\run_e2e.js --appveyor "--glob=tests/basic/**"
-) ELSE (
+IF not defined APPVEYOR_PULL_REQUEST_NUMBER (
+  IF not defined BUILDKITE_PULL_REQUEST (
+    REM Run full test suite if not on a Appveyor/Buildkite PR.
     node tests\legacy-cli\run_e2e.js --appveyor "--glob=tests/{basic,commands,generate,build/styles}/**"
-)
\ No newline at end of file
+    exit
+  )
+) 
+
+REM Run partial test suite.
+node tests\legacy-cli\run_e2e.js --appveyor "--glob=tests/basic/**"
+
diff --git a/packages/angular_devkit/core/src/json/schema/registry_spec.ts b/packages/angular_devkit/core/src/json/schema/registry_spec.ts
index b221ac9cde91..c20fb276e11a 100644
--- a/packages/angular_devkit/core/src/json/schema/registry_spec.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry_spec.ts
@@ -14,6 +14,14 @@ import { addUndefinedDefaults } from './transforms';
 
 describe('CoreSchemaRegistry', () => {
   it('works asynchronously', done => {
+    if (process.env.BUILDKITE === 'true') {
+      // This test consistently fails on Windows BuildKite, but doesn't fail on local Windows
+      // or in Appveyor. Many tests test the async behaviour of the registry, but this is the only
+      // one that also fetches an async ref. Perhaps that is why.
+      done();
+
+      return;
+    }
     const registry = new CoreSchemaRegistry();
     registry.addPostTransform(addUndefinedDefaults);
     const data: any = {};  // tslint:disable-line:no-any

From 5a847298e556d1be7f766f18964081e316b6f6c8 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 3 Jan 2019 15:27:50 +0000
Subject: [PATCH 0631/1703] ci: use puppeteer

---
 .appveyor.yml                                 |  2 +-
 .buildkite/pipeline.yml                       |  2 +-
 .circleci/config.yml                          |  2 +-
 Dockerfile                                    |  2 +
 package.json                                  |  4 +-
 .../core/src/json/schema/registry_spec.ts     |  2 +-
 .../hello-world-app/angular.json              |  2 +-
 .../hello-world-app/karma.conf.js             |  6 ++
 .../hello-world-app/protractor.conf.js        |  3 +-
 .../build_ng_packagr/ng-packaged/angular.json |  2 +-
 .../ng-packaged/projects/lib/karma.conf.js    |  6 ++
 .../generate/application/application-basic.ts |  2 +-
 .../tests/generate/library/library-basic.ts   |  2 +-
 tests/legacy-cli/e2e/utils/project.ts         | 84 ++++++++++---------
 yarn.lock                                     | 64 +++++++++++++-
 15 files changed, 132 insertions(+), 53 deletions(-)
 create mode 100644 Dockerfile

diff --git a/.appveyor.yml b/.appveyor.yml
index c7d7537d1596..19fa94a43d83 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -11,7 +11,7 @@ install:
   - ps: Install-Product node $env:nodejs_version
   # --network-timeout is a workaround for https://github.com/yarnpkg/yarn/issues/6221
   - yarn --frozen-lockfile --network-timeout=500000
-  - yarn webdriver-update-appveyor
+  - yarn webdriver-update
 
 test_script:
   - node --version
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 411de648250b..6ef51ff92554 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -11,7 +11,7 @@ steps:
       # Actual CI commands
       # --network-timeout is a workaround for https://github.com/yarnpkg/yarn/issues/6221
       - yarn install --frozen-lockfile --non-interactive --network-timeout 500000
-      - yarn webdriver-update-appveyor
+      - yarn webdriver-update
       - node --version
       - yarn --version
       - yarn test
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 98faf1532252..e01c902c4cfc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -74,7 +74,7 @@ jobs:
     parallelism: 4
     steps:
       - attach_workspace: *attach_options
-      - run: npm run webdriver-update-circleci
+      - run: npm run webdriver-update
       - run: npm run test-large -- --full --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
 
   e2e-cli:
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000000..8fef94100787
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,2 @@
+FROM node:10.12
+ENTRYPOINT [ "sh" ]
diff --git a/package.json b/package.json
index b35897b54be8..cfa310a58f7a 100644
--- a/package.json
+++ b/package.json
@@ -35,8 +35,7 @@
     "validate-commits": "./bin/devkit-admin validate-commits",
     "prepush": "node ./bin/devkit-admin hooks/pre-push",
     "preinstall": "node ./tools/yarn/check-yarn.js",
-    "webdriver-update-appveyor": "webdriver-manager update --standalone false --gecko false --versions.chrome 2.37",
-    "webdriver-update-circleci": "webdriver-manager update --standalone false --gecko false --versions.chrome $CHROMEDRIVER_VERSION_ARG "
+    "webdriver-update": "webdriver-manager update --standalone false --gecko false --versions.chrome 2.45"
   },
   "repository": {
     "type": "git",
@@ -66,6 +65,7 @@
   "dependencies": {
     "glob": "^7.0.3",
     "node-fetch": "^2.2.0",
+    "puppeteer": "1.11.0",
     "quicktype-core": "^6.0.15",
     "temp": "^0.9.0",
     "tslint": "^5.11.0",
diff --git a/packages/angular_devkit/core/src/json/schema/registry_spec.ts b/packages/angular_devkit/core/src/json/schema/registry_spec.ts
index c20fb276e11a..fa512977605f 100644
--- a/packages/angular_devkit/core/src/json/schema/registry_spec.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry_spec.ts
@@ -14,7 +14,7 @@ import { addUndefinedDefaults } from './transforms';
 
 describe('CoreSchemaRegistry', () => {
   it('works asynchronously', done => {
-    if (process.env.BUILDKITE === 'true') {
+    if (process.platform.startsWith('win')) {
       // This test consistently fails on Windows BuildKite, but doesn't fail on local Windows
       // or in Appveyor. Many tests test the async behaviour of the registry, but this is the only
       // one that also fetches an async ref. Perhaps that is why.
diff --git a/tests/angular_devkit/build_angular/hello-world-app/angular.json b/tests/angular_devkit/build_angular/hello-world-app/angular.json
index a5ea30273883..25e2f12f40e5 100644
--- a/tests/angular_devkit/build_angular/hello-world-app/angular.json
+++ b/tests/angular_devkit/build_angular/hello-world-app/angular.json
@@ -97,7 +97,7 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "src/tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",
-            "browsers": "ChromeHeadless",
+            "browsers": "ChromeHeadlessCI",
             "progress": false,
             "watch": false,
             "styles": [
diff --git a/tests/angular_devkit/build_angular/hello-world-app/karma.conf.js b/tests/angular_devkit/build_angular/hello-world-app/karma.conf.js
index deec58129cdd..29b0a92e1fde 100644
--- a/tests/angular_devkit/build_angular/hello-world-app/karma.conf.js
+++ b/tests/angular_devkit/build_angular/hello-world-app/karma.conf.js
@@ -35,6 +35,12 @@ module.exports = function (config) {
     logLevel: config.LOG_INFO,
     autoWatch: true,
     browsers: ['Chrome'],
+    customLaunchers: {
+      ChromeHeadlessCI: {
+        base: 'ChromeHeadless',
+        flags: ['--disable-gpu']
+      }
+    },
     singleRun: false
   });
 };
diff --git a/tests/angular_devkit/build_angular/hello-world-app/protractor.conf.js b/tests/angular_devkit/build_angular/hello-world-app/protractor.conf.js
index 445801606d60..5ae5970f346e 100644
--- a/tests/angular_devkit/build_angular/hello-world-app/protractor.conf.js
+++ b/tests/angular_devkit/build_angular/hello-world-app/protractor.conf.js
@@ -19,7 +19,8 @@ exports.config = {
   capabilities: {
     'browserName': 'chrome',
     chromeOptions: {
-      args: ["--headless", "--disable-gpu", "--window-size=800,600"]
+      args: ['--headless', '--disable-gpu', '--window-size=800,600'],
+      binary: require('puppeteer').executablePath()
     }
   },
   directConnect: true,
diff --git a/tests/angular_devkit/build_ng_packagr/ng-packaged/angular.json b/tests/angular_devkit/build_ng_packagr/ng-packaged/angular.json
index 57961ebcc962..4f23a860aec1 100644
--- a/tests/angular_devkit/build_ng_packagr/ng-packaged/angular.json
+++ b/tests/angular_devkit/build_ng_packagr/ng-packaged/angular.json
@@ -19,7 +19,7 @@
             "main": "projects/lib/src/test.ts",
             "tsConfig": "projects/lib/tsconfig.spec.json",
             "karmaConfig": "projects/lib/karma.conf.js",
-            "browsers": "ChromeHeadless",
+            "browsers": "ChromeHeadlessCI",
             "progress": false,
             "watch": false
           }
diff --git a/tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/karma.conf.js b/tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/karma.conf.js
index 0a81bfc617a5..2f49ecb6df61 100644
--- a/tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/karma.conf.js
+++ b/tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/karma.conf.js
@@ -33,6 +33,12 @@ module.exports = function (config) {
     logLevel: config.LOG_INFO,
     autoWatch: true,
     browsers: ['Chrome'],
+    customLaunchers: {
+      ChromeHeadlessCI: {
+        base: 'ChromeHeadless',
+        flags: ['--disable-gpu']
+      }
+    },
     singleRun: false
   });
 };
diff --git a/tests/legacy-cli/e2e/tests/generate/application/application-basic.ts b/tests/legacy-cli/e2e/tests/generate/application/application-basic.ts
index ff96506e53df..340f4ac4807b 100644
--- a/tests/legacy-cli/e2e/tests/generate/application/application-basic.ts
+++ b/tests/legacy-cli/e2e/tests/generate/application/application-basic.ts
@@ -8,5 +8,5 @@ export default function() {
     .then(() => expectFileToMatch('angular.json', /\"app2\":/))
     .then(() => useCIChrome('projects/app2'))
     .then(() => useCIChrome('projects/app2-e2e'))
-    .then(() => ng('test', 'app2', '--watch=false'));
+    .then(() => ng('test', 'app2', '--watch=false', '--browsers=ChromeHeadlessCI'));
 }
diff --git a/tests/legacy-cli/e2e/tests/generate/library/library-basic.ts b/tests/legacy-cli/e2e/tests/generate/library/library-basic.ts
index 8e5f10848de7..a4a29f2be493 100644
--- a/tests/legacy-cli/e2e/tests/generate/library/library-basic.ts
+++ b/tests/legacy-cli/e2e/tests/generate/library/library-basic.ts
@@ -7,5 +7,5 @@ export default function () {
     .then(() => expectFileToMatch('angular.json', /\"my-lib\":/))
     .then(() => useCIChrome('projects/my-lib'))
     .then(() => ng('build', 'my-lib'))
-    .then(() => ng('test', 'my-lib', '--watch=false'));
+    .then(() => ng('test', 'my-lib', '--watch=false', '--browsers=ChromeHeadlessCI'));
 }
diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts
index ca292e3c682e..c86868dc7026 100644
--- a/tests/legacy-cli/e2e/utils/project.ts
+++ b/tests/legacy-cli/e2e/utils/project.ts
@@ -1,4 +1,5 @@
-import { readFile, writeFile, replaceInFile } from './fs';
+import * as fs from 'fs-extra';
+import { readFile, writeFile, replaceInFile, prependToFile } from './fs';
 import { execAndWaitForOutputToMatch, npm, silentNpm, ng } from './process';
 import { getGlobalVariable } from './env';
 
@@ -186,58 +187,61 @@ export function useCIDefaults(projectName = 'test-project') {
     const appTargets = project.targets || project.architect;
     appTargets.build.options.progress = false;
     appTargets.test.options.progress = false;
+    // Use the CI chrome setup in karma.
+    appTargets.test.options.browsers = 'ChromeHeadlessCI';
     // Disable auto-updating webdriver in e2e.
     const e2eProject = workspaceJson.projects[projectName + '-e2e'];
     const e2eTargets = e2eProject.targets || e2eProject.architect;
     e2eTargets.e2e.options.webdriverUpdate = false;
   })
   .then(() => updateJsonFile('package.json', json => {
-    // We want to always use the same version of webdriver but can only do so on CircleCI.
-    // Appveyor and Travis will use latest Chrome stable.
-    // CircleCI (via ngcontainer:0.1.1) uses Chrome 63.0.3239.84.
-    // Appveyor (via chocolatey) cannot use older versions of Chrome at all:
-    // https://github.com/chocolatey/chocolatey-coreteampackages/tree/master/automatic/googlechrome
-    // webdriver 2.33 matches Chrome 63.0.3239.84.
-    // webdriver 2.37 matches Chrome 65.0.3325.18100 (latest stable).
-    // The webdriver versions for latest stable will need to be manually updated.
-    const webdriverVersion = process.env['CIRCLECI'] ? '2.33' : '2.37';
-    const driverOption = process.env['CHROMEDRIVER_VERSION_ARG']
-                         || `--versions.chrome ${webdriverVersion}`;
+    // Use matching versions of Chrome and Webdriver.
     json['scripts']['webdriver-update'] = 'webdriver-manager update' +
-      ` --standalone false --gecko false ${driverOption}`;
+      ` --standalone false --gecko false --versions.chrome 2.45`; // Supports Chrome v70-72
+
   }))
   .then(() => npm('run', 'webdriver-update'));
 }
 
 export function useCIChrome(projectDir: string) {
-  // There's a race condition happening in Chrome. Enabling logging in chrome used by
-  // protractor actually fixes it. Logging is piped to a file so it doesn't affect our setup.
-  // --no-sandbox is needed for Circle CI.
-  // Travis can use headless chrome, but not appveyor.
+  const protractorConf = `${projectDir}/protractor.conf.js`;
+  const karmaConf = `${projectDir}/karma.conf.js`;
+
   return Promise.resolve()
-    .then(() => replaceInFile(`${projectDir}/protractor.conf.js`,
-      `'browserName': 'chrome'`,
-      `'browserName': 'chrome',
-        chromeOptions: {
-          args: [
-            "--enable-logging",
-            // "--no-sandbox",
-            // "--headless"
-          ]
-        }
-    `))
-    // Not a problem if the file can't be found.
-    // .catch(() => null)
-    // .then(() => replaceInFile(`${projectDir}/karma.conf.js`, `browsers: ['Chrome'],`,
-    //   `browsers: ['ChromeCI'],
-    //   customLaunchers: {
-    //     ChromeCI: {
-    //       base: 'ChromeHeadless',
-    //       flags: ['--no-sandbox']
-    //     }
-    //   },
-    // `))
-    .catch(() => null);
+    .then(() => updateJsonFile('package.json', json => {
+      // Use matching versions of Chrome and Webdriver.
+      json['devDependencies']['puppeteer'] = '1.11.0'; // Chromium 72.0.3618.0 (r609904)
+      json['devDependencies']['karma-chrome-launcher'] = '~2.2.0'; // Minimum for ChromeHeadless.
+    }))
+    // Use Pupeteer in protractor if a config is found on the project.
+    .then(() =>  {
+      if (fs.existsSync(protractorConf)) {
+        return replaceInFile(protractorConf,
+          `'browserName': 'chrome'`,
+          `'browserName': 'chrome',
+          chromeOptions: {
+            args: ['--headless'],
+            binary: require('puppeteer').executablePath()
+          }
+        `);
+      }
+    })
+    // Use Pupeteer in karma if a config is found on the project.
+    .then(() =>  {
+      if (fs.existsSync(karmaConf)) {
+        return prependToFile(karmaConf,
+          `process.env.CHROME_BIN = require('puppeteer').executablePath();`)
+        .then(() => replaceInFile(karmaConf,
+          `browsers: ['Chrome']`,
+          `browsers: ['Chrome'],
+          customLaunchers: {
+            ChromeHeadlessCI: {
+              base: 'ChromeHeadless',
+            }
+          }
+        `));
+      }
+    });
 }
 
 // Convert a Angular 5 project to Angular 2.
diff --git a/yarn.lock b/yarn.lock
index 5049a8baeca2..462a3149589f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2293,7 +2293,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@~1.6.0:
+concat-stream@1.6.2, concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@~1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -3610,6 +3610,16 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+extract-zip@^1.6.6:
+  version "1.6.7"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9"
+  integrity sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=
+  dependencies:
+    concat-stream "1.6.2"
+    debug "2.6.9"
+    mkdirp "0.5.1"
+    yauzl "2.4.1"
+
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -3674,6 +3684,13 @@ faye-websocket@~0.11.1:
   dependencies:
     websocket-driver ">=0.5.1"
 
+fd-slicer@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"
+  integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=
+  dependencies:
+    pend "~1.2.0"
+
 fecha@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd"
@@ -6328,6 +6345,11 @@ mime@^1.3.4, mime@^1.4.1:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
+mime@^2.0.3:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6"
+  integrity sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==
+
 mime@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
@@ -6470,7 +6492,7 @@ mixin-object@^2.0.1:
     for-in "^0.1.3"
     is-extendable "^0.1.1"
 
-mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
+mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
   version "0.5.1"
   resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
@@ -7520,6 +7542,11 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+pend@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
+  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
+
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
@@ -7703,6 +7730,11 @@ process@^0.11.10:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
+progress@^2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
+  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
+
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
@@ -7870,6 +7902,20 @@ punycode@^2.1.0:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
+puppeteer@1.11.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.11.0.tgz#63cdbe12b07275cd6e0b94bce41f3fcb20305770"
+  integrity sha512-iG4iMOHixc2EpzqRV+pv7o3GgmU2dNYEMkvKwSaQO/vMZURakwSOn/EYJ6OIRFYOque1qorzIBvrytPIQB3YzQ==
+  dependencies:
+    debug "^4.1.0"
+    extract-zip "^1.6.6"
+    https-proxy-agent "^2.2.1"
+    mime "^2.0.3"
+    progress "^2.0.1"
+    proxy-from-env "^1.0.0"
+    rimraf "^2.6.1"
+    ws "^6.1.0"
+
 q@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
@@ -10641,6 +10687,13 @@ write-file-atomic@^2.0.0:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
+ws@^6.1.0:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.2.tgz#3cc7462e98792f0ac679424148903ded3b9c3ad8"
+  integrity sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw==
+  dependencies:
+    async-limiter "~1.0.0"
+
 ws@~3.3.1:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
@@ -10810,6 +10863,13 @@ yargs@^7.0.0:
     y18n "^3.2.1"
     yargs-parser "^5.0.0"
 
+yauzl@2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005"
+  integrity sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=
+  dependencies:
+    fd-slicer "~1.0.1"
+
 yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"

From 3a9230f31129b4ffbb80ac6b513e49e12c768896 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 14 Jan 2019 16:33:02 +0000
Subject: [PATCH 0632/1703] ci: add timeout and retry to Buildkite

---
 .buildkite/pipeline.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 6ef51ff92554..d64c71597ddb 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -21,5 +21,12 @@ steps:
     plugins:
       - docker#v2.1.0:
           image: "filipesilva/node-bazel-windows:0.0.2"
+    # Times out in 2h
+    timeout_in_minutes: 120
+    # Automatically retries up to 2 times.
+    retry:
+      automatic:
+        exit_status: "*"
+        limit: 2    
     agents:
       windows: true

From a38db5dbf2862c195f0b60ad5e7ad7f6f3a224b8 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Mon, 14 Jan 2019 10:28:16 +0100
Subject: [PATCH 0633/1703] build: update `webpack` and `postcss`

Update `webpack` to `4.28.4` and `postcss` to `7.0.11`
---
 .../angular_devkit/build_angular/package.json |  4 +--
 .../plugins/postcss-cli-resources.ts          |  3 +-
 yarn.lock                                     | 29 +++++++------------
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index b070d92ac966..399f5f9ffdd4 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -29,7 +29,7 @@
     "minimatch": "3.0.4",
     "parse5": "4.0.0",
     "opn": "5.4.0",
-    "postcss": "7.0.7",
+    "postcss": "7.0.11",
     "postcss-import": "12.0.1",
     "postcss-loader": "3.0.0",
     "raw-loader": "1.0.0",
@@ -45,7 +45,7 @@
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.2.1",
-    "webpack": "4.28.2",
+    "webpack": "4.28.4",
     "webpack-dev-middleware": "3.5.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.2.1",
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts
index e885293ede46..3c7c7139e5ce 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts
@@ -169,7 +169,8 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
       let modified = false;
 
       // We want to load it relative to the file that imports
-      const context = path.dirname(decl.source.input.file);
+      const inputFile = decl.source && decl.source.input.file;
+      const context = inputFile && path.dirname(inputFile) || loader.context;
 
       // tslint:disable-next-line:no-conditional-assignment
       while (match = urlRegex.exec(value)) {
diff --git a/yarn.lock b/yarn.lock
index 462a3149589f..60032b7ead27 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7668,14 +7668,14 @@ postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.1:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss@7.0.7:
-  version "7.0.7"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.7.tgz#2754d073f77acb4ef08f1235c36c5721a7201614"
-  integrity sha512-HThWSJEPkupqew2fnuQMEI2YcTj/8gMV3n80cMdJsKxfIh5tHf7nM5JigNX6LxVMqo6zkgQNAI88hyFvBk41Pg==
+postcss@7.0.11, postcss@^7.0.11:
+  version "7.0.11"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.11.tgz#f63c513b78026d66263bb2ca995bf02e3d1a697d"
+  integrity sha512-9AXb//5UcjeOEof9T+yPw3XTa5SL207ZOIC/lHYP4mbUTEh4M0rDAQekQpVANCZdwQwKhBtFZCk3i3h3h2hdWg==
   dependencies:
-    chalk "^2.4.1"
+    chalk "^2.4.2"
     source-map "^0.6.1"
-    supports-color "^5.5.0"
+    supports-color "^6.1.0"
 
 postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
   version "7.0.5"
@@ -7686,15 +7686,6 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
     source-map "^0.6.1"
     supports-color "^5.5.0"
 
-postcss@^7.0.11:
-  version "7.0.11"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.11.tgz#f63c513b78026d66263bb2ca995bf02e3d1a697d"
-  integrity sha512-9AXb//5UcjeOEof9T+yPw3XTa5SL207ZOIC/lHYP4mbUTEh4M0rDAQekQpVANCZdwQwKhBtFZCk3i3h3h2hdWg==
-  dependencies:
-    chalk "^2.4.2"
-    source-map "^0.6.1"
-    supports-color "^6.1.0"
-
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -10531,10 +10522,10 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.28.2, webpack@^4.0.0, webpack@^4.6.0:
-  version "4.28.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.28.2.tgz#6b534a8bc91a45787ed631dc2e87aec94e9e4db7"
-  integrity sha512-PK3uVg3/NuNVOjPfYleFI6JF7khO7c2kIlksH7mivQm+QDcwiqV1x6+q89dDeOioh5FNxJHr3LKbDu3oSAhl9g==
+webpack@4.28.4, webpack@^4.0.0, webpack@^4.6.0:
+  version "4.28.4"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.28.4.tgz#1ddae6c89887d7efb752adf0c3cd32b9b07eacd0"
+  integrity sha512-NxjD61WsK/a3JIdwWjtIpimmvE6UrRi3yG54/74Hk9rwNj5FPkA4DJCf1z4ByDWLkvZhTZE+P3C/eh6UD5lDcw==
   dependencies:
     "@webassemblyjs/ast" "1.7.11"
     "@webassemblyjs/helper-module-context" "1.7.11"

From 8863bc002aad20329194a5f7716b87b32b4a0b3a Mon Sep 17 00:00:00 2001
From: Unknown <okeefem355@gmail.com>
Date: Tue, 15 Jan 2019 06:06:36 -0500
Subject: [PATCH 0634/1703] feat(@schematics/angular): Added multiselect guard
 implements option

Adds support for the guard schematic to use multiselect for which interfaces the guard should implement.

Fixes #13400
---
 .../guard/files/__name@dasherize__.guard.ts   | 16 ++++++++---
 packages/schematics/angular/guard/index.ts    | 16 +++++++++++
 .../schematics/angular/guard/index_spec.ts    | 27 ++++++++++++++++++-
 packages/schematics/angular/guard/schema.json | 18 +++++++++++++
 4 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/angular/guard/files/__name@dasherize__.guard.ts b/packages/schematics/angular/guard/files/__name@dasherize__.guard.ts
index 1aa0068e9aef..02babf15472d 100644
--- a/packages/schematics/angular/guard/files/__name@dasherize__.guard.ts
+++ b/packages/schematics/angular/guard/files/__name@dasherize__.guard.ts
@@ -1,14 +1,24 @@
 import { Injectable } from '@angular/core';
-import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree } from '@angular/router';
+import { <%= implementationImports %>ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree } from '@angular/router';
 import { Observable } from 'rxjs';
 
 @Injectable({
   providedIn: 'root'
 })
-export class <%= classify(name) %>Guard implements CanActivate {
-  canActivate(
+export class <%= classify(name) %>Guard implements <%= implementations %> {
+  <% if (implements.includes('CanActivate')) { %>canActivate(
     next: ActivatedRouteSnapshot,
     state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
     return true;
   }
+  <% } %><% if (implements.includes('CanActivateChild')) { %>canActivateChild(
+    next: ActivatedRouteSnapshot,
+    state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
+    return true;
+  }
+  <% } %><% if (implements.includes('CanLoad')) { %>canLoad(
+    route: Route,
+    segments: UrlSegment[]): Observable<boolean> | Promise<boolean> | boolean {
+    return true;
+  }<% } %>
 }
diff --git a/packages/schematics/angular/guard/index.ts b/packages/schematics/angular/guard/index.ts
index 660caee84c35..efd617b94287 100644
--- a/packages/schematics/angular/guard/index.ts
+++ b/packages/schematics/angular/guard/index.ts
@@ -36,6 +36,20 @@ export default function (options: GuardOptions): Rule {
     if (options.path === undefined) {
       options.path = buildDefaultPath(project);
     }
+    if (options.implements === undefined) {
+      options.implements = [];
+    }
+
+    let implementations = '';
+    let implementationImports = '';
+    if (options.implements.length > 0) {
+      implementations = options.implements.join(', ');
+      implementationImports = `${implementations}, `;
+      // As long as we aren't in IE... ;)
+      if (options.implements.includes('CanLoad')) {
+        implementationImports = `${implementationImports}Route, UrlSegment, `;
+      }
+    }
 
     const parsedPath = parseName(options.path, options.name);
     options.name = parsedPath.name;
@@ -47,6 +61,8 @@ export default function (options: GuardOptions): Rule {
     const templateSource = apply(url('./files'), [
       options.skipTests ? filter(path => !path.endsWith('.spec.ts')) : noop(),
       template({
+        implementations,
+        implementationImports,
         ...strings,
         ...options,
       }),
diff --git a/packages/schematics/angular/guard/index_spec.ts b/packages/schematics/angular/guard/index_spec.ts
index 7c0077fd089b..0c8c413ab970 100644
--- a/packages/schematics/angular/guard/index_spec.ts
+++ b/packages/schematics/angular/guard/index_spec.ts
@@ -10,7 +10,6 @@ import { Schema as ApplicationOptions } from '../application/schema';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { Schema as GuardOptions } from './schema';
 
-
 describe('Guard Schematic', () => {
   const schematicRunner = new SchematicTestRunner(
     '@schematics/angular',
@@ -64,4 +63,30 @@ describe('Guard Schematic', () => {
     appTree = schematicRunner.runSchematic('guard', defaultOptions, appTree);
     expect(appTree.files).toContain('/projects/bar/custom/app/foo.guard.ts');
   });
+
+  it('should respect the implements value', () => {
+    const options = { ...defaultOptions, implements: ['CanActivate']};
+    const tree = schematicRunner.runSchematic('guard', options, appTree);
+    const fileString = tree.readContent('/projects/bar/src/app/foo.guard.ts');
+    expect(fileString).toContain('CanActivate');
+    expect(fileString).toContain('canActivate');
+    expect(fileString).not.toContain('CanActivateChild');
+    expect(fileString).not.toContain('canActivateChild');
+    expect(fileString).not.toContain('CanLoad');
+    expect(fileString).not.toContain('canLoad');
+  });
+
+  it('should respect the implements values', () => {
+    const implementationOptions = ['CanActivate', 'CanLoad', 'CanActivateChild'];
+    const options = { ...defaultOptions, implements: implementationOptions};
+    const tree = schematicRunner.runSchematic('guard', options, appTree);
+    const fileString = tree.readContent('/projects/bar/src/app/foo.guard.ts');
+
+    // Should contain all implementations
+    implementationOptions.forEach((implementation: string) => {
+      expect(fileString).toContain(implementation);
+      const functionName = `${implementation.charAt(0).toLowerCase()}${implementation.slice(1)}`;
+      expect(fileString).toContain(functionName);
+    });
+  });
 });
diff --git a/packages/schematics/angular/guard/schema.json b/packages/schematics/angular/guard/schema.json
index a71b831a974f..2ad3a42e9e66 100644
--- a/packages/schematics/angular/guard/schema.json
+++ b/packages/schematics/angular/guard/schema.json
@@ -47,6 +47,24 @@
       "type": "boolean",
       "default": false,
       "description": "When true, applies lint fixes after generating the guard."
+    },
+    "implements": {
+      "type": "array",
+      "description": "Specifies which interfaces to implement.",
+      "uniqueItems": true,
+      "items": {
+        "type": "string"
+      },
+      "x-prompt": {
+        "message": "Which interfaces would you like to implement?",
+        "type": "list",
+        "multiselect": true,
+        "items": [
+          "CanActivate",
+          "CanActivateChild",
+          "CanLoad"
+        ]
+      }
     }
   },
   "required": [

From e3a148a74bd85de6fe67087c50d92a2723bb182d Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 20 Sep 2018 21:43:18 -0400
Subject: [PATCH 0635/1703] feat(@angular-devkit/build-angular): conditional
 ES2015 polyfill loading

---
 packages/angular/cli/lib/config/schema.json   |  5 +++
 .../angular-cli-files/models/build-options.ts |  1 +
 .../models/es2015-jit-polyfills.js            |  8 +++++
 .../models/es2015-polyfills.js                | 21 ++++++++++++
 .../models/webpack-configs/browser.ts         |  3 +-
 .../models/webpack-configs/common.ts          | 11 ++++++
 .../plugins/index-html-webpack-plugin.ts      | 34 +++++++++++++++----
 .../utilities/package-chunk-sort.ts           |  2 +-
 .../build_angular/src/browser/schema.d.ts     |  5 +++
 .../build_angular/src/browser/schema.json     |  5 +++
 10 files changed, 86 insertions(+), 9 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/src/angular-cli-files/models/es2015-jit-polyfills.js
 create mode 100644 packages/angular_devkit/build_angular/src/angular-cli-files/models/es2015-polyfills.js

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index 7006c36b84ca..bc31fb6c324c 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -863,6 +863,11 @@
                 "$ref": "#/definitions/targetOptions/definitions/browser/definitions/budget"
               },
               "default": []
+            },
+            "es5BrowserSupport": {
+              "description": "Enables conditionally loaded ES2015 polyfills.",
+              "type": "boolean",
+              "default": false
             }
           },
           "additionalProperties": false,
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
index 80a9a17a515b..eaabcc68ae91 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
@@ -58,6 +58,7 @@ export interface BuildOptions {
   statsJson: boolean;
   forkTypeChecker: boolean;
   profile?: boolean;
+  es5BrowserSupport?: boolean;
 
   main: string;
   index: string;
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/es2015-jit-polyfills.js b/packages/angular_devkit/build_angular/src/angular-cli-files/models/es2015-jit-polyfills.js
new file mode 100644
index 000000000000..0e68685db11f
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/es2015-jit-polyfills.js
@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import 'core-js/es6/reflect';
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/es2015-polyfills.js b/packages/angular_devkit/build_angular/src/angular-cli-files/models/es2015-polyfills.js
new file mode 100644
index 000000000000..08e69267c5e8
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/es2015-polyfills.js
@@ -0,0 +1,21 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import 'core-js/es6/symbol';
+import 'core-js/es6/object';
+import 'core-js/es6/function';
+import 'core-js/es6/parse-int';
+import 'core-js/es6/parse-float';
+import 'core-js/es6/number';
+import 'core-js/es6/math';
+import 'core-js/es6/string';
+import 'core-js/es6/date';
+import 'core-js/es6/array';
+import 'core-js/es6/regexp';
+import 'core-js/es6/map';
+import 'core-js/es6/weak-map';
+import 'core-js/es6/set';
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
index 7f1153dbd010..8bfc0679ef51 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
@@ -44,6 +44,7 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
       entrypoints: generateEntryPoints(buildOptions),
       deployUrl: buildOptions.deployUrl,
       sri: buildOptions.subresourceIntegrity,
+      noModuleEntrypoints: ['es2015-polyfills'],
     }));
   }
 
@@ -112,7 +113,7 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
               const moduleName = module.nameForCondition ? module.nameForCondition() : '';
 
               return /[\\/]node_modules[\\/]/.test(moduleName)
-                && !chunks.some(({ name }) => name === 'polyfills'
+                && !chunks.some(({ name }) => name === 'polyfills' || name === 'es2015-polyfills'
                   || globalStylesBundleNames.includes(name));
             },
           },
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index bab2266a41f7..7225fcb0381a 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -53,6 +53,10 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
     entryPoints['main'] = [path.resolve(root, buildOptions.main)];
   }
 
+  if (buildOptions.es5BrowserSupport) {
+    entryPoints['es2015-polyfills'] = [path.join(__dirname, '..', 'es2015-polyfills.js')];
+  }
+
   if (buildOptions.polyfills) {
     entryPoints['polyfills'] = [path.resolve(root, buildOptions.polyfills)];
   }
@@ -62,6 +66,13 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
       ...(entryPoints['polyfills'] || []),
       path.join(__dirname, '..', 'jit-polyfills.js'),
     ];
+
+    if (buildOptions.es5BrowserSupport) {
+      entryPoints['es2015-polyfills'] = [
+        ...entryPoints['es2015-polyfills'],
+        path.join(__dirname, '..', 'es2015-jit-polyfills.js'),
+      ];
+    }
   }
 
   if (buildOptions.profile) {
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
index be4c1497cd73..a06ed3964bd5 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
@@ -18,6 +18,7 @@ export interface IndexHtmlWebpackPluginOptions {
   entrypoints: string[];
   deployUrl?: string;
   sri: boolean;
+  noModuleEntrypoints: string[];
 }
 
 function readFile(filename: string, compilation: compilation.Compilation): Promise<string> {
@@ -53,6 +54,7 @@ export class IndexHtmlWebpackPlugin {
       input: 'index.html',
       output: 'index.html',
       entrypoints: ['polyfills', 'main'],
+      noModuleEntrypoints: [],
       sri: false,
       ...options,
     };
@@ -67,14 +69,26 @@ export class IndexHtmlWebpackPlugin {
 
 
       // Get all files for selected entrypoints
-      let unfilteredSortedFiles: string[] = [];
+      const unfilteredSortedFiles: string[] = [];
+      const noModuleFiles = new Set<string>();
+      const otherFiles = new Set<string>();
       for (const entryName of this._options.entrypoints) {
         const entrypoint = compilation.entrypoints.get(entryName);
         if (entrypoint && entrypoint.getFiles) {
-          unfilteredSortedFiles = unfilteredSortedFiles.concat(entrypoint.getFiles() || []);
+          const files: string[] = entrypoint.getFiles() || [];
+          unfilteredSortedFiles.push(...files);
+
+          if (this._options.noModuleEntrypoints.includes(entryName)) {
+            files.forEach(file => noModuleFiles.add(file));
+          } else {
+            files.forEach(file => otherFiles.add(file));
+          }
         }
       }
 
+      // Clean out files that are used in all types of entrypoints
+      otherFiles.forEach(file => noModuleFiles.delete(file));
+
       // Filter files
       const existingFiles = new Set<string>();
       const stylesheets: string[] = [];
@@ -137,25 +151,31 @@ export class IndexHtmlWebpackPlugin {
       // Inject into the html
       const indexSource = new ReplaceSource(new RawSource(inputContent), this._options.input);
 
-      const scriptElements = treeAdapter.createDocumentFragment();
+      let scriptElements = '';
       for (const script of scripts) {
-        const attrs = [
+        const attrs: { name: string, value: string | null }[] = [
           { name: 'type', value: 'text/javascript' },
           { name: 'src', value: (this._options.deployUrl || '') + script },
         ];
 
+        if (noModuleFiles.has(script)) {
+          attrs.push({ name: 'nomodule', value: null });
+        }
+
         if (this._options.sri) {
           const content = compilation.assets[script].source();
           attrs.push(...this._generateSriAttributes(content));
         }
 
-        const element = treeAdapter.createElement('script', undefined, attrs);
-        treeAdapter.appendChild(scriptElements, element);
+        const attributes = attrs
+          .map(attr => attr.value === null ? attr.name : `${attr.name}="${attr.value}"`)
+          .join(' ');
+        scriptElements += `<script ${attributes}></script>`;
       }
 
       indexSource.insert(
         scriptInsertionPoint,
-        parse5.serialize(scriptElements, { treeAdapter }),
+        scriptElements,
       );
 
       // Adjust base href if specified
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts
index 2e443db69a22..d6ccf6e569ac 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts
@@ -11,7 +11,7 @@ import { normalizeExtraEntryPoints } from '../models/webpack-configs/utils';
 export function generateEntryPoints(
   appConfig: { styles: ExtraEntryPoint[], scripts: ExtraEntryPoint[] },
 ) {
-  const entryPoints = ['polyfills', 'sw-register'];
+  const entryPoints = ['es2015-polyfills', 'polyfills', 'sw-register'];
 
   // Add all styles/scripts, except lazy-loaded ones.
   [
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.d.ts b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
index 1a2bd717ea52..de31a4eef072 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
@@ -236,6 +236,11 @@ export interface BrowserBuilderSchema {
    * Output profile events for Chrome profiler.
    */
   profile: boolean;
+
+  /**
+   * Enables conditionally loaded IE9-11 polyfills.
+   */
+  es5BrowserSupport: boolean;
 }
 
 export type OptimizationOptions = boolean | OptimizationObject;
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index 817379b9fb42..9fff2eea5f6d 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -299,6 +299,11 @@
       "type": "boolean",
       "description": "Output profile events for Chrome profiler.",
       "default": false
+    },
+    "es5BrowserSupport": {
+      "description": "Enables conditionally loaded ES2015 polyfills.",
+      "type": "boolean",
+      "default": false
     }
   },
   "additionalProperties": false,

From cdb99bc324373cfc1341f04f529d28b23d55ed82 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 20 Sep 2018 21:43:50 -0400
Subject: [PATCH 0636/1703] fix(@schematics/angular): remove redundant ES2015
 polyfills

---
 .../application/files/src/polyfills.ts        | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/packages/schematics/angular/application/files/src/polyfills.ts b/packages/schematics/angular/application/files/src/polyfills.ts
index a6d34ea67a3b..75d639398924 100644
--- a/packages/schematics/angular/application/files/src/polyfills.ts
+++ b/packages/schematics/angular/application/files/src/polyfills.ts
@@ -18,31 +18,9 @@
  * BROWSER POLYFILLS
  */
 
-/** IE9, IE10, IE11, and Chrome <55 requires all of the following polyfills.
- *  This also includes Android Emulators with older versions of Chrome and Google Search/Googlebot
- */
-
-// import 'core-js/es6/symbol';
-// import 'core-js/es6/object';
-// import 'core-js/es6/function';
-// import 'core-js/es6/parse-int';
-// import 'core-js/es6/parse-float';
-// import 'core-js/es6/number';
-// import 'core-js/es6/math';
-// import 'core-js/es6/string';
-// import 'core-js/es6/date';
-// import 'core-js/es6/array';
-// import 'core-js/es6/regexp';
-// import 'core-js/es6/map';
-// import 'core-js/es6/weak-map';
-// import 'core-js/es6/set';
-
 /** IE10 and IE11 requires the following for NgClass support on SVG elements */
 // import 'classlist.js';  // Run `npm install --save classlist.js`.
 
-/** IE10 and IE11 requires the following for the Reflect API. */
-// import 'core-js/es6/reflect';
-
 /**
  * Web Animations `@angular/platform-browser/animations`
  * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.

From 66604efacab6bf19cf1db5210982e645484ee78c Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 20 Sep 2018 22:03:13 -0400
Subject: [PATCH 0637/1703] feat(@schematics/angular): enabled conditional
 ES2015 polyfills for new apps

---
 packages/schematics/angular/application/index.ts        | 1 +
 packages/schematics/angular/utility/workspace-models.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index cc2af68a0ff7..483a44902698 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -207,6 +207,7 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
             `${projectRoot}src/styles.${options.style}`,
           ],
           scripts: [],
+          es5BrowserSupport: true,
         },
         configurations: {
           production: {
diff --git a/packages/schematics/angular/utility/workspace-models.ts b/packages/schematics/angular/utility/workspace-models.ts
index 051354129d01..d697a4bb121d 100644
--- a/packages/schematics/angular/utility/workspace-models.ts
+++ b/packages/schematics/angular/utility/workspace-models.ts
@@ -60,6 +60,7 @@ export interface BrowserBuilderOptions extends BrowserBuilderBaseOptions {
         maximumWarning?: string;
         maximumError?: string;
     }[];
+    es5BrowserSupport?: boolean;
 }
 
 export interface ServeBuilderOptions {

From 057d57211e61849bb025036767995eeacef8d283 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 21 Sep 2018 11:10:19 -0400
Subject: [PATCH 0638/1703] test: update CLI E2E with additional script element

---
 tests/legacy-cli/e2e/tests/basic/scripts-array.ts      | 1 +
 tests/legacy-cli/e2e/tests/basic/styles-array.ts       | 1 +
 tests/legacy-cli/e2e/tests/build/polyfills.ts          | 1 +
 tests/legacy-cli/e2e/tests/build/styles/extract-css.ts | 2 ++
 tests/legacy-cli/e2e/tests/third-party/bootstrap.ts    | 2 ++
 5 files changed, 7 insertions(+)

diff --git a/tests/legacy-cli/e2e/tests/basic/scripts-array.ts b/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
index 2bea2dabfcd2..44efea1fd6f8 100644
--- a/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
+++ b/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
@@ -54,6 +54,7 @@ export default function () {
     // index.html lists the right bundles
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script type="text/javascript" src="runtime.js"></script>
+      <script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
       <script type="text/javascript" src="polyfills.js"></script>
       <script type="text/javascript" src="scripts.js"></script>
       <script type="text/javascript" src="renamed-script.js"></script>
diff --git a/tests/legacy-cli/e2e/tests/basic/styles-array.ts b/tests/legacy-cli/e2e/tests/basic/styles-array.ts
index 4815c503d12b..4b6457b220ed 100644
--- a/tests/legacy-cli/e2e/tests/basic/styles-array.ts
+++ b/tests/legacy-cli/e2e/tests/basic/styles-array.ts
@@ -43,6 +43,7 @@ export default function () {
     `))
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script type="text/javascript" src="runtime.js"></script>
+      <script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
       <script type="text/javascript" src="polyfills.js"></script>
       <script type="text/javascript" src="vendor.js"></script>
       <script type="text/javascript" src="main.js"></script>
diff --git a/tests/legacy-cli/e2e/tests/build/polyfills.ts b/tests/legacy-cli/e2e/tests/build/polyfills.ts
index cc0e147afd4e..d760f4634047 100644
--- a/tests/legacy-cli/e2e/tests/build/polyfills.ts
+++ b/tests/legacy-cli/e2e/tests/build/polyfills.ts
@@ -27,6 +27,7 @@ export default async function () {
     await expectFileToMatch('dist/test-project/polyfills.js', 'zone.js');
     expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script type="text/javascript" src="runtime.js"></script>
+      <script type="text/javascript" src="ie-support.js" nomodule></script>
       <script type="text/javascript" src="polyfills.js"></script>
     `);
 }
diff --git a/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts b/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
index 35c993cf332c..590f45657c37 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
@@ -48,6 +48,7 @@ export default function () {
     `)))
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script type="text/javascript" src="runtime.js"></script>
+      <script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
       <script type="text/javascript" src="polyfills.js"></script>
       <script type="text/javascript" src="vendor.js"></script>
       <script type="text/javascript" src="main.js"></script>
@@ -63,6 +64,7 @@ export default function () {
     // index.html lists the right bundles
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script type="text/javascript" src="runtime.js"></script>
+      <script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
       <script type="text/javascript" src="polyfills.js"></script>
       <script type="text/javascript" src="styles.js"></script>
       <script type="text/javascript" src="renamed-style.js"></script>
diff --git a/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts b/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts
index 847bce3bba42..871b3c428189 100644
--- a/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts
+++ b/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts
@@ -23,6 +23,7 @@ export default function() {
     .then(() => expectFileToMatch('dist/test-project/styles.css', '* Bootstrap'))
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script type="text/javascript" src="runtime.js"></script>
+      <script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
       <script type="text/javascript" src="polyfills.js"></script>
       <script type="text/javascript" src="scripts.js"></script>
       <script type="text/javascript" src="vendor.js"></script>
@@ -39,6 +40,7 @@ export default function() {
     .then(() => expectFileToMatch('dist/test-project/styles.css', '* Bootstrap'))
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script type="text/javascript" src="runtime.js"></script>
+      <script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
       <script type="text/javascript" src="polyfills.js"></script>
       <script type="text/javascript" src="scripts.js"></script>
       <script type="text/javascript" src="main.js"></script>

From 668e790fdc312a8d1b458c846ebb16505037bcfa Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 21 Sep 2018 13:46:44 -0400
Subject: [PATCH 0639/1703] test: additional tests for conditional ES2015
 polyfills

---
 tests/legacy-cli/e2e/tests/build/polyfills.ts |  3 +-
 tests/legacy-cli/e2e/tests/misc/support-ie.ts | 32 +++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 tests/legacy-cli/e2e/tests/misc/support-ie.ts

diff --git a/tests/legacy-cli/e2e/tests/build/polyfills.ts b/tests/legacy-cli/e2e/tests/build/polyfills.ts
index d760f4634047..29b1930b199a 100644
--- a/tests/legacy-cli/e2e/tests/build/polyfills.ts
+++ b/tests/legacy-cli/e2e/tests/build/polyfills.ts
@@ -15,6 +15,7 @@ export default async function () {
     await expectFileToMatch('dist/test-project/polyfills.js', 'zone.js');
     expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script type="text/javascript" src="runtime.js"></script>
+      <script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
       <script type="text/javascript" src="polyfills.js"></script>
     `);
     const jitPolyfillSize = await getFileSize('dist/test-project/polyfills.js');
@@ -27,7 +28,7 @@ export default async function () {
     await expectFileToMatch('dist/test-project/polyfills.js', 'zone.js');
     expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script type="text/javascript" src="runtime.js"></script>
-      <script type="text/javascript" src="ie-support.js" nomodule></script>
+      <script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
       <script type="text/javascript" src="polyfills.js"></script>
     `);
 }
diff --git a/tests/legacy-cli/e2e/tests/misc/support-ie.ts b/tests/legacy-cli/e2e/tests/misc/support-ie.ts
new file mode 100644
index 000000000000..2bbe31b19337
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/misc/support-ie.ts
@@ -0,0 +1,32 @@
+import { oneLineTrim } from 'common-tags';
+import { expectFileNotToExist, expectFileToMatch } from '../../utils/fs';
+import { ng } from '../../utils/process';
+import { updateJsonFile } from '../../utils/project';
+
+export default async function () {
+  await updateJsonFile('angular.json', workspaceJson => {
+      const appArchitect = workspaceJson.projects['test-project'].architect;
+      appArchitect.build.options.es5BrowserSupport = false;
+  });
+
+  await ng('build');
+  await expectFileNotToExist('dist/test-project/es2015-polyfills.js');
+  await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
+    <script type="text/javascript" src="runtime.js"></script>
+    <script type="text/javascript" src="polyfills.js"></script>
+    <script type="text/javascript" src="styles.js"></script>
+    <script type="text/javascript" src="vendor.js"></script>
+    <script type="text/javascript" src="main.js"></script>
+  `);
+
+  await ng('build', `--es5BrowserSupport`);
+  await expectFileToMatch('dist/test-project/es2015-polyfills.js', 'core-js');
+  await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
+    <script type="text/javascript" src="runtime.js"></script>
+    <script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
+    <script type="text/javascript" src="polyfills.js"></script>
+    <script type="text/javascript" src="styles.js"></script>
+    <script type="text/javascript" src="vendor.js"></script>
+    <script type="text/javascript" src="main.js"></script>
+  `);
+}

From 83bbfec54b7889d82525d401c50e56dd8facf11d Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 14 Jan 2019 19:55:38 +0000
Subject: [PATCH 0640/1703] build: update ajv to version 6.7.0

---
 package.json                                       | 2 +-
 packages/angular_devkit/build_angular/package.json | 2 +-
 packages/angular_devkit/core/package.json          | 2 +-
 yarn.lock                                          | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index cfa310a58f7a..1a22cf0587cd 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "@types/webpack-dev-server": "^3.1.0",
     "@types/webpack-sources": "^0.1.5",
     "@yarnpkg/lockfile": "1.1.0",
-    "ajv": "6.6.2",
+    "ajv": "6.7.0",
     "common-tags": "^1.8.0",
     "conventional-changelog": "^1.1.0",
     "conventional-commits-parser": "^3.0.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 399f5f9ffdd4..be432e3234b1 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -11,7 +11,7 @@
     "@angular-devkit/build-webpack": "0.0.0",
     "@angular-devkit/core": "0.0.0",
     "@ngtools/webpack": "0.0.0",
-    "ajv": "6.6.2",
+    "ajv": "6.7.0",
     "autoprefixer": "9.4.5",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json
index eb30c9353dd7..8895ba09e704 100644
--- a/packages/angular_devkit/core/package.json
+++ b/packages/angular_devkit/core/package.json
@@ -8,7 +8,7 @@
     "core"
   ],
   "dependencies": {
-    "ajv": "6.6.2",
+    "ajv": "6.7.0",
     "chokidar": "2.0.4",
     "fast-json-stable-stringify": "2.0.0",
     "rxjs": "6.3.3",
diff --git a/yarn.lock b/yarn.lock
index 60032b7ead27..7307ed248ce0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -833,10 +833,10 @@ ajv-keywords@^3.1.0:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
   integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
 
-ajv@6.6.2:
-  version "6.6.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.2.tgz#caceccf474bf3fc3ce3b147443711a24063cc30d"
-  integrity sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==
+ajv@6.7.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.7.0.tgz#e3ce7bb372d6577bb1839f1dfdfcbf5ad2948d96"
+  integrity sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"

From aee5a4024e1cca1c1369eb6439bc9d007efb58f2 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 15 Jan 2019 06:55:26 +0000
Subject: [PATCH 0641/1703] build: update pacote to version 9.4.0

---
 packages/schematics/update/package.json | 2 +-
 yarn.lock                               | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index a07e4f22f229..50341bd25bcf 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -14,7 +14,7 @@
     "@angular-devkit/schematics": "0.0.0",
     "@yarnpkg/lockfile": "1.1.0",
     "ini": "1.3.5",
-    "pacote": "9.3.0",
+    "pacote": "9.4.0",
     "semver": "5.6.0",
     "semver-intersect": "1.4.0",
     "rxjs": "6.3.3"
diff --git a/yarn.lock b/yarn.lock
index 7307ed248ce0..62c1a4dd5271 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7279,10 +7279,10 @@ package-json@^4.0.0:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
-pacote@9.3.0:
-  version "9.3.0"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.3.0.tgz#ec0d21b739a625d81a19ae546386fedee3300bc1"
-  integrity sha512-uy5xghB5wUtmFS+uNhQGhlsIF9rfsfxw6Zsu2VpmSz4/f+8D2+5V1HwjHdSn7W6aQTrxNNmmoUF5qNE10/EVdA==
+pacote@9.4.0:
+  version "9.4.0"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.4.0.tgz#af979abdeb175cd347c3e33be3241af1ed254807"
+  integrity sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==
   dependencies:
     bluebird "^3.5.3"
     cacache "^11.3.2"

From 4f358f48f850a5a5c80d51a597b5dec809cd208e Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Tue, 15 Jan 2019 14:14:29 -0800
Subject: [PATCH 0642/1703] fix(@schematics/angular): stop offering SASS option
 for ng new

The old Sass language referred to as "SASS" here is no longer relevant. This was denoted with the file extension ".sass"
Any new projects should use the modern Sass language which is expressed in ".scss" files.
This change does not remove any support for projects which were already created with ".sass" files, we simply stop offering
this option when creating new projects.

Also correct the capitalization of Less based on how they spell it on their website.
---
 packages/ngtools/webpack/README.md             | 2 +-
 packages/schematics/angular/ng-new/schema.json | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/ngtools/webpack/README.md b/packages/ngtools/webpack/README.md
index 9163c1e3b007..9c4b1dec9d73 100644
--- a/packages/ngtools/webpack/README.md
+++ b/packages/ngtools/webpack/README.md
@@ -48,7 +48,7 @@ The loader works with webpack plugin to compile your TypeScript. It's important
 ## Features
 The benefits and ability of using [`@ngtools/webpack`](https://www.npmjs.com/~ngtools) standalone from the Angular CLI as presented in [Stephen Fluin's Angular CLI talk](https://youtu.be/uBRK6cTr4Vk?t=6m45s) at Angular Connect 2016:
 
-* Compiles SCSS/LESS
+* Compiles Sass/Less into CSS
 * TypeScript transpilation
 * Bundles JavaScript, CSS
 * Asset optimization
diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
index 0247b1cbd673..7d0abced615a 100644
--- a/packages/schematics/angular/ng-new/schema.json
+++ b/packages/schematics/angular/ng-new/schema.json
@@ -119,9 +119,8 @@
         "type": "list",
         "items": [
           { "value": "css", "label": "CSS" },
-          { "value": "scss", "label": "SCSS   [ http://sass-lang.com   ]" },
-          { "value": "sass", "label": "SASS   [ http://sass-lang.com   ]" },
-          { "value": "less", "label": "LESS   [ http://lesscss.org     ]" },
+          { "value": "scss", "label": "Sass   [ http://sass-lang.com   ]" },
+          { "value": "less", "label": "Less   [ http://lesscss.org     ]" },
           { "value": "styl", "label": "Stylus [ http://stylus-lang.com ]" }
         ]
       }

From 7d15c5dd0284ea2d8e8097172c5b14afeb37489e Mon Sep 17 00:00:00 2001
From: Mikel Ward <mbw@google.com>
Date: Tue, 15 Jan 2019 11:10:30 -0800
Subject: [PATCH 0643/1703] fix(@angular-devkit/core): Make default and info
 log messages use default colors

Previously, we set the color to white, which is (nearly) invisible on
terminals with a white background.

Fixes #13439.
---
 packages/angular_devkit/core/node/cli-logger.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/angular_devkit/core/node/cli-logger.ts b/packages/angular_devkit/core/node/cli-logger.ts
index cfb4232556ab..83ea08efa084 100644
--- a/packages/angular_devkit/core/node/cli-logger.ts
+++ b/packages/angular_devkit/core/node/cli-logger.ts
@@ -25,19 +25,19 @@ export function createConsoleLogger(
   logger
     .pipe(filter(entry => (entry.level != 'debug' || verbose)))
     .subscribe(entry => {
-      let color: (s: string) => string = x => terminal.dim(terminal.white(x));
+      let color = terminal.dim;
       let output = stdout;
       switch (entry.level) {
         case 'info':
-          color = terminal.white;
+          color = terminal.reset;
           break;
         case 'warn':
-          color = (x: string) => terminal.bold(terminal.yellow(x));
+          color = (s: string) => terminal.bold(terminal.yellow(s));
           output = stderr;
           break;
         case 'fatal':
         case 'error':
-          color = (x: string) => terminal.bold(terminal.red(x));
+          color = (s: string) => terminal.bold(terminal.red(s));
           output = stderr;
           break;
       }

From 36eba0c9fcf17305a7ef99096c860ad271c5aaf7 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 11 Jan 2019 15:02:37 +0100
Subject: [PATCH 0644/1703] refactor: use `.template` suffix for all schematic
 files

Currently when using `ivy-ngcc` it will print out a warning

```
Failed to read entry point info from //node_modules/@schematics/angular/workspace/files/package.json with error SyntaxError: Unexpected token < in JSON at position 1121.
```

Fixes #13378
---
 .../{tslint.json => tslint.json.template}     |   0
 .../{browserslist => browserslist.template}   |   0
 .../{karma.conf.js => karma.conf.js.template} |   0
 ...ig.app.json => tsconfig.app.json.template} |   0
 ....spec.json => tsconfig.spec.json.template} |   0
 ...__dot__gitkeep => __dot__gitkeep.template} |   0
 ...t.prod.ts => environment.prod.ts.template} |   0
 ...environment.ts => environment.ts.template} |   0
 .../src/{favicon.ico => favicon.ico.template} | Bin
 .../src/{index.html => index.html.template}   |   0
 .../files/src/{main.ts => main.ts.template}   |   0
 .../{polyfills.ts => polyfills.ts.template}   |   0
 ...es.__style__ => styles.__style__.template} |   0
 .../files/src/{test.ts => test.ts.template}   |   0
 .../schematics/angular/application/index.ts   |  20 +++++++++++-------
 ...onent.html => app.component.html.template} |   0
 ...spec.ts => app.component.spec.ts.template} |   0
 ...component.ts => app.component.ts.template} |   0
 .../{app.module.ts => app.module.ts.template} |   0
 ...name@dasherize____type__.spec.ts.template} |   0
 ...=> __name@dasherize____type__.ts.template} |   0
 packages/schematics/angular/class/index.ts    |   6 +++---
 ...@dasherize__.component.__style__.template} |   0
 ..._name@dasherize__.component.html.template} |   0
 ...me@dasherize__.component.spec.ts.template} |   0
 ... __name@dasherize__.component.ts.template} |   0
 .../schematics/angular/component/index.ts     |  10 ++++-----
 ...me@dasherize__.directive.spec.ts.template} |   0
 ... __name@dasherize__.directive.ts.template} |   0
 .../schematics/angular/directive/index.ts     |   6 +++---
 ...or.conf.js => protractor.conf.js.template} |   0
 ...p.e2e-spec.ts => app.e2e-spec.ts.template} |   0
 .../src/{app.po.ts => app.po.ts.template}     |   0
 ...ig.e2e.json => tsconfig.e2e.json.template} |   0
 packages/schematics/angular/e2e/index.ts      |   4 ++--
 ...ts => __name@dasherize__.enum.ts.template} |   0
 packages/schematics/angular/enum/index.ts     |   4 ++--
 ...__name@dasherize__.guard.spec.ts.template} |   0
 ...s => __name@dasherize__.guard.ts.template} |   0
 packages/schematics/angular/guard/index.ts    |   6 +++---
 ...=> __name@dasherize____type__.ts.template} |   0
 .../schematics/angular/interface/index.ts     |   4 ++--
 .../{README.md => README.md.template}         |   0
 .../{karma.conf.js => karma.conf.js.template} |   0
 ...-package.json => ng-package.json.template} |   0
 .../{package.json => package.json.template}   |   0
 ...tryFile__.ts => __entryFile__.ts.template} |   0
 .../src/{test.ts => test.ts.template}         |   0
 ...ig.lib.json => tsconfig.lib.json.template} |   0
 ....spec.json => tsconfig.spec.json.template} |   0
 .../{tslint.json => tslint.json.template}     |   0
 packages/schematics/angular/library/index.ts  |   4 ++--
 ...me@dasherize__-routing.module.ts.template} |   0
 ... => __name@dasherize__.module.ts.template} |   0
 packages/schematics/angular/module/index.ts   |   6 +++---
 ... __name@dasherize__.pipe.spec.ts.template} |   0
 ...ts => __name@dasherize__.pipe.ts.template} |   0
 packages/schematics/angular/pipe/index.ts     |   6 +++---
 ...-config.json => ngsw-config.json.template} |   0
 .../angular/service-worker/index.ts           |   4 ++--
 ...name@dasherize__.service.spec.ts.template} |   0
 ...=> __name@dasherize__.service.ts.template} |   0
 packages/schematics/angular/service/index.ts  |   6 +++---
 ...son => __tsconfigFileName__.json.template} |   0
 ... => __main@stripTsExtension__.ts.template} |   0
 ...Name__ => __rootModuleFileName__.template} |   0
 .../schematics/angular/universal/index.ts     |   6 +++---
 .../files/{README.md => README.md.template}   |   0
 ...torconfig => __dot__editorconfig.template} |   0
 ...t__gitignore => __dot__gitignore.template} |   0
 .../{angular.json => angular.json.template}   |   0
 .../{package.json => package.json.template}   |   0
 .../{tsconfig.json => tsconfig.json.template} |   0
 .../{tslint.json => tslint.json.template}     |   0
 .../schematics/angular/workspace/index.ts     |   6 +++---
 .../schematics/schematics/blank/factory.ts    |   6 +++---
 .../{README.md => README.md.template}         |   0
 ...t__gitignore => __dot__gitignore.template} |   0
 ...t__npmignore => __dot__npmignore.template} |   0
 .../{package.json => package.json.template}   |   0
 ...llection.json => collection.json.template} |   0
 .../{tsconfig.json => tsconfig.json.template} |   0
 .../{index.ts => index.ts.template}           |   0
 .../{index_spec.ts => index_spec.ts.template} |   0
 84 files changed, 54 insertions(+), 50 deletions(-)
 rename packages/schematics/angular/application/files/lint/__tsLintRoot__/{tslint.json => tslint.json.template} (100%)
 rename packages/schematics/angular/application/files/root/{browserslist => browserslist.template} (100%)
 rename packages/schematics/angular/application/files/root/{karma.conf.js => karma.conf.js.template} (100%)
 rename packages/schematics/angular/application/files/root/{tsconfig.app.json => tsconfig.app.json.template} (100%)
 rename packages/schematics/angular/application/files/root/{tsconfig.spec.json => tsconfig.spec.json.template} (100%)
 rename packages/schematics/angular/application/files/src/assets/{__dot__gitkeep => __dot__gitkeep.template} (100%)
 rename packages/schematics/angular/application/files/src/environments/{environment.prod.ts => environment.prod.ts.template} (100%)
 rename packages/schematics/angular/application/files/src/environments/{environment.ts => environment.ts.template} (100%)
 rename packages/schematics/angular/application/files/src/{favicon.ico => favicon.ico.template} (100%)
 rename packages/schematics/angular/application/files/src/{index.html => index.html.template} (100%)
 rename packages/schematics/angular/application/files/src/{main.ts => main.ts.template} (100%)
 rename packages/schematics/angular/application/files/src/{polyfills.ts => polyfills.ts.template} (100%)
 rename packages/schematics/angular/application/files/src/{styles.__style__ => styles.__style__.template} (100%)
 rename packages/schematics/angular/application/files/src/{test.ts => test.ts.template} (100%)
 rename packages/schematics/angular/application/other-files/{app.component.html => app.component.html.template} (100%)
 rename packages/schematics/angular/application/other-files/{app.component.spec.ts => app.component.spec.ts.template} (100%)
 rename packages/schematics/angular/application/other-files/{app.component.ts => app.component.ts.template} (100%)
 rename packages/schematics/angular/application/other-files/{app.module.ts => app.module.ts.template} (100%)
 rename packages/schematics/angular/class/files/{__name@dasherize____type__.spec.ts => __name@dasherize____type__.spec.ts.template} (100%)
 rename packages/schematics/angular/class/files/{__name@dasherize____type__.ts => __name@dasherize____type__.ts.template} (100%)
 rename packages/schematics/angular/component/files/__name@dasherize@if-flat__/{__name@dasherize__.component.__style__ => __name@dasherize__.component.__style__.template} (100%)
 rename packages/schematics/angular/component/files/__name@dasherize@if-flat__/{__name@dasherize__.component.html => __name@dasherize__.component.html.template} (100%)
 rename packages/schematics/angular/component/files/__name@dasherize@if-flat__/{__name@dasherize__.component.spec.ts => __name@dasherize__.component.spec.ts.template} (100%)
 rename packages/schematics/angular/component/files/__name@dasherize@if-flat__/{__name@dasherize__.component.ts => __name@dasherize__.component.ts.template} (100%)
 rename packages/schematics/angular/directive/files/__name@dasherize@if-flat__/{__name@dasherize__.directive.spec.ts => __name@dasherize__.directive.spec.ts.template} (100%)
 rename packages/schematics/angular/directive/files/__name@dasherize@if-flat__/{__name@dasherize__.directive.ts => __name@dasherize__.directive.ts.template} (100%)
 rename packages/schematics/angular/e2e/files/{protractor.conf.js => protractor.conf.js.template} (100%)
 rename packages/schematics/angular/e2e/files/src/{app.e2e-spec.ts => app.e2e-spec.ts.template} (100%)
 rename packages/schematics/angular/e2e/files/src/{app.po.ts => app.po.ts.template} (100%)
 rename packages/schematics/angular/e2e/files/{tsconfig.e2e.json => tsconfig.e2e.json.template} (100%)
 rename packages/schematics/angular/enum/files/{__name@dasherize__.enum.ts => __name@dasherize__.enum.ts.template} (100%)
 rename packages/schematics/angular/guard/files/{__name@dasherize__.guard.spec.ts => __name@dasherize__.guard.spec.ts.template} (100%)
 rename packages/schematics/angular/guard/files/{__name@dasherize__.guard.ts => __name@dasherize__.guard.ts.template} (100%)
 rename packages/schematics/angular/interface/files/{__name@dasherize____type__.ts => __name@dasherize____type__.ts.template} (100%)
 rename packages/schematics/angular/library/files/__projectRoot__/{README.md => README.md.template} (100%)
 rename packages/schematics/angular/library/files/__projectRoot__/{karma.conf.js => karma.conf.js.template} (100%)
 rename packages/schematics/angular/library/files/__projectRoot__/{ng-package.json => ng-package.json.template} (100%)
 rename packages/schematics/angular/library/files/__projectRoot__/{package.json => package.json.template} (100%)
 rename packages/schematics/angular/library/files/__projectRoot__/src/{__entryFile__.ts => __entryFile__.ts.template} (100%)
 rename packages/schematics/angular/library/files/__projectRoot__/src/{test.ts => test.ts.template} (100%)
 rename packages/schematics/angular/library/files/__projectRoot__/{tsconfig.lib.json => tsconfig.lib.json.template} (100%)
 rename packages/schematics/angular/library/files/__projectRoot__/{tsconfig.spec.json => tsconfig.spec.json.template} (100%)
 rename packages/schematics/angular/library/files/__projectRoot__/{tslint.json => tslint.json.template} (100%)
 rename packages/schematics/angular/module/files/__name@dasherize@if-flat__/{__name@dasherize__-routing.module.ts => __name@dasherize__-routing.module.ts.template} (100%)
 rename packages/schematics/angular/module/files/__name@dasherize@if-flat__/{__name@dasherize__.module.ts => __name@dasherize__.module.ts.template} (100%)
 rename packages/schematics/angular/pipe/files/__name@dasherize@if-flat__/{__name@dasherize__.pipe.spec.ts => __name@dasherize__.pipe.spec.ts.template} (100%)
 rename packages/schematics/angular/pipe/files/__name@dasherize@if-flat__/{__name@dasherize__.pipe.ts => __name@dasherize__.pipe.ts.template} (100%)
 rename packages/schematics/angular/service-worker/files/{ngsw-config.json => ngsw-config.json.template} (100%)
 rename packages/schematics/angular/service/files/__name@dasherize@if-flat__/{__name@dasherize__.service.spec.ts => __name@dasherize__.service.spec.ts.template} (100%)
 rename packages/schematics/angular/service/files/__name@dasherize@if-flat__/{__name@dasherize__.service.ts => __name@dasherize__.service.ts.template} (100%)
 rename packages/schematics/angular/universal/files/root/{__tsconfigFileName__.json => __tsconfigFileName__.json.template} (100%)
 rename packages/schematics/angular/universal/files/src/{__main@stripTsExtension__.ts => __main@stripTsExtension__.ts.template} (100%)
 rename packages/schematics/angular/universal/files/src/app/{__rootModuleFileName__ => __rootModuleFileName__.template} (100%)
 rename packages/schematics/angular/workspace/files/{README.md => README.md.template} (100%)
 mode change 100755 => 100644
 rename packages/schematics/angular/workspace/files/{__dot__editorconfig => __dot__editorconfig.template} (100%)
 rename packages/schematics/angular/workspace/files/{__dot__gitignore => __dot__gitignore.template} (100%)
 mode change 100755 => 100644
 rename packages/schematics/angular/workspace/files/{angular.json => angular.json.template} (100%)
 rename packages/schematics/angular/workspace/files/{package.json => package.json.template} (100%)
 rename packages/schematics/angular/workspace/files/{tsconfig.json => tsconfig.json.template} (100%)
 rename packages/schematics/angular/workspace/files/{tslint.json => tslint.json.template} (100%)
 rename packages/schematics/schematics/blank/project-files/{README.md => README.md.template} (100%)
 rename packages/schematics/schematics/blank/project-files/{__dot__gitignore => __dot__gitignore.template} (100%)
 rename packages/schematics/schematics/blank/project-files/{__dot__npmignore => __dot__npmignore.template} (100%)
 rename packages/schematics/schematics/blank/project-files/{package.json => package.json.template} (100%)
 rename packages/schematics/schematics/blank/project-files/src/{collection.json => collection.json.template} (100%)
 rename packages/schematics/schematics/blank/project-files/{tsconfig.json => tsconfig.json.template} (100%)
 rename packages/schematics/schematics/blank/schematic-files/src/__name@dasherize__/{index.ts => index.ts.template} (100%)
 rename packages/schematics/schematics/blank/schematic-files/src/__name@dasherize__/{index_spec.ts => index_spec.ts.template} (100%)

diff --git a/packages/schematics/angular/application/files/lint/__tsLintRoot__/tslint.json b/packages/schematics/angular/application/files/lint/__tsLintRoot__/tslint.json.template
similarity index 100%
rename from packages/schematics/angular/application/files/lint/__tsLintRoot__/tslint.json
rename to packages/schematics/angular/application/files/lint/__tsLintRoot__/tslint.json.template
diff --git a/packages/schematics/angular/application/files/root/browserslist b/packages/schematics/angular/application/files/root/browserslist.template
similarity index 100%
rename from packages/schematics/angular/application/files/root/browserslist
rename to packages/schematics/angular/application/files/root/browserslist.template
diff --git a/packages/schematics/angular/application/files/root/karma.conf.js b/packages/schematics/angular/application/files/root/karma.conf.js.template
similarity index 100%
rename from packages/schematics/angular/application/files/root/karma.conf.js
rename to packages/schematics/angular/application/files/root/karma.conf.js.template
diff --git a/packages/schematics/angular/application/files/root/tsconfig.app.json b/packages/schematics/angular/application/files/root/tsconfig.app.json.template
similarity index 100%
rename from packages/schematics/angular/application/files/root/tsconfig.app.json
rename to packages/schematics/angular/application/files/root/tsconfig.app.json.template
diff --git a/packages/schematics/angular/application/files/root/tsconfig.spec.json b/packages/schematics/angular/application/files/root/tsconfig.spec.json.template
similarity index 100%
rename from packages/schematics/angular/application/files/root/tsconfig.spec.json
rename to packages/schematics/angular/application/files/root/tsconfig.spec.json.template
diff --git a/packages/schematics/angular/application/files/src/assets/__dot__gitkeep b/packages/schematics/angular/application/files/src/assets/__dot__gitkeep.template
similarity index 100%
rename from packages/schematics/angular/application/files/src/assets/__dot__gitkeep
rename to packages/schematics/angular/application/files/src/assets/__dot__gitkeep.template
diff --git a/packages/schematics/angular/application/files/src/environments/environment.prod.ts b/packages/schematics/angular/application/files/src/environments/environment.prod.ts.template
similarity index 100%
rename from packages/schematics/angular/application/files/src/environments/environment.prod.ts
rename to packages/schematics/angular/application/files/src/environments/environment.prod.ts.template
diff --git a/packages/schematics/angular/application/files/src/environments/environment.ts b/packages/schematics/angular/application/files/src/environments/environment.ts.template
similarity index 100%
rename from packages/schematics/angular/application/files/src/environments/environment.ts
rename to packages/schematics/angular/application/files/src/environments/environment.ts.template
diff --git a/packages/schematics/angular/application/files/src/favicon.ico b/packages/schematics/angular/application/files/src/favicon.ico.template
similarity index 100%
rename from packages/schematics/angular/application/files/src/favicon.ico
rename to packages/schematics/angular/application/files/src/favicon.ico.template
diff --git a/packages/schematics/angular/application/files/src/index.html b/packages/schematics/angular/application/files/src/index.html.template
similarity index 100%
rename from packages/schematics/angular/application/files/src/index.html
rename to packages/schematics/angular/application/files/src/index.html.template
diff --git a/packages/schematics/angular/application/files/src/main.ts b/packages/schematics/angular/application/files/src/main.ts.template
similarity index 100%
rename from packages/schematics/angular/application/files/src/main.ts
rename to packages/schematics/angular/application/files/src/main.ts.template
diff --git a/packages/schematics/angular/application/files/src/polyfills.ts b/packages/schematics/angular/application/files/src/polyfills.ts.template
similarity index 100%
rename from packages/schematics/angular/application/files/src/polyfills.ts
rename to packages/schematics/angular/application/files/src/polyfills.ts.template
diff --git a/packages/schematics/angular/application/files/src/styles.__style__ b/packages/schematics/angular/application/files/src/styles.__style__.template
similarity index 100%
rename from packages/schematics/angular/application/files/src/styles.__style__
rename to packages/schematics/angular/application/files/src/styles.__style__.template
diff --git a/packages/schematics/angular/application/files/src/test.ts b/packages/schematics/angular/application/files/src/test.ts.template
similarity index 100%
rename from packages/schematics/angular/application/files/src/test.ts
rename to packages/schematics/angular/application/files/src/test.ts.template
diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 483a44902698..e978ac67a516 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -21,13 +21,13 @@ import {
   SchematicsException,
   Tree,
   apply,
+  applyTemplates,
   chain,
   filter,
   mergeWith,
   move,
   noop,
   schematic,
-  template,
   url,
 } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
@@ -292,7 +292,7 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
 }
 
 function minimalPathFilter(path: string): boolean {
-  const toRemoveList = /(test.ts|tsconfig.spec.json|karma.conf.js)$/;
+  const toRemoveList = /(test.ts|tsconfig.spec.json|karma.conf.js).template$/;
 
   return !toRemoveList.test(path);
 }
@@ -351,7 +351,7 @@ export default function (options: ApplicationOptions): Rule {
       mergeWith(
         apply(url('./files/src'), [
           options.minimal ? filter(minimalPathFilter) : noop(),
-          template({
+          applyTemplates({
             utils: strings,
             ...options,
             'dot': '.',
@@ -362,7 +362,7 @@ export default function (options: ApplicationOptions): Rule {
       mergeWith(
         apply(url('./files/root'), [
           options.minimal ? filter(minimalPathFilter) : noop(),
-          template({
+          applyTemplates({
             utils: strings,
             ...options,
             'dot': '.',
@@ -374,7 +374,7 @@ export default function (options: ApplicationOptions): Rule {
         ])),
       options.minimal ? noop() : mergeWith(
         apply(url('./files/lint'), [
-          template({
+          applyTemplates({
             utils: strings,
             ...options,
             tsLintRoot,
@@ -406,9 +406,13 @@ export default function (options: ApplicationOptions): Rule {
       }),
       mergeWith(
         apply(url('./other-files'), [
-          componentOptions.inlineTemplate ? filter(path => !path.endsWith('.html')) : noop(),
-          componentOptions.skipTests ? filter(path => !/[.|-]spec.ts$/.test(path)) : noop(),
-          template({
+          componentOptions.inlineTemplate
+            ? filter(path => !path.endsWith('.html.template'))
+            : noop(),
+          componentOptions.skipTests
+            ? filter(path => !/[.|-]spec.ts.template$/.test(path))
+            : noop(),
+          applyTemplates({
             utils: strings,
             ...options as any,  // tslint:disable-line:no-any
             selector: appRootSelector,
diff --git a/packages/schematics/angular/application/other-files/app.component.html b/packages/schematics/angular/application/other-files/app.component.html.template
similarity index 100%
rename from packages/schematics/angular/application/other-files/app.component.html
rename to packages/schematics/angular/application/other-files/app.component.html.template
diff --git a/packages/schematics/angular/application/other-files/app.component.spec.ts b/packages/schematics/angular/application/other-files/app.component.spec.ts.template
similarity index 100%
rename from packages/schematics/angular/application/other-files/app.component.spec.ts
rename to packages/schematics/angular/application/other-files/app.component.spec.ts.template
diff --git a/packages/schematics/angular/application/other-files/app.component.ts b/packages/schematics/angular/application/other-files/app.component.ts.template
similarity index 100%
rename from packages/schematics/angular/application/other-files/app.component.ts
rename to packages/schematics/angular/application/other-files/app.component.ts.template
diff --git a/packages/schematics/angular/application/other-files/app.module.ts b/packages/schematics/angular/application/other-files/app.module.ts.template
similarity index 100%
rename from packages/schematics/angular/application/other-files/app.module.ts
rename to packages/schematics/angular/application/other-files/app.module.ts.template
diff --git a/packages/schematics/angular/class/files/__name@dasherize____type__.spec.ts b/packages/schematics/angular/class/files/__name@dasherize____type__.spec.ts.template
similarity index 100%
rename from packages/schematics/angular/class/files/__name@dasherize____type__.spec.ts
rename to packages/schematics/angular/class/files/__name@dasherize____type__.spec.ts.template
diff --git a/packages/schematics/angular/class/files/__name@dasherize____type__.ts b/packages/schematics/angular/class/files/__name@dasherize____type__.ts.template
similarity index 100%
rename from packages/schematics/angular/class/files/__name@dasherize____type__.ts
rename to packages/schematics/angular/class/files/__name@dasherize____type__.ts.template
diff --git a/packages/schematics/angular/class/index.ts b/packages/schematics/angular/class/index.ts
index 93d3ff880520..b008d1d443c8 100644
--- a/packages/schematics/angular/class/index.ts
+++ b/packages/schematics/angular/class/index.ts
@@ -12,13 +12,13 @@ import {
   SchematicsException,
   Tree,
   apply,
+  applyTemplates,
   branchAndMerge,
   chain,
   filter,
   mergeWith,
   move,
   noop,
-  template,
   url,
 } from '@angular-devkit/schematics';
 import { applyLintFix } from '../utility/lint-fix';
@@ -48,8 +48,8 @@ export default function (options: ClassOptions): Rule {
     options.skipTests = options.skipTests || !options.spec;
 
     const templateSource = apply(url('./files'), [
-      options.skipTests ? filter(path => !path.endsWith('.spec.ts')) : noop(),
-      template({
+      options.skipTests ? filter(path => !path.endsWith('.spec.ts.template')) : noop(),
+      applyTemplates({
         ...strings,
         ...options,
       }),
diff --git a/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.__style__ b/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.__style__.template
similarity index 100%
rename from packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.__style__
rename to packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.__style__.template
diff --git a/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.html b/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.html.template
similarity index 100%
rename from packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.html
rename to packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.html.template
diff --git a/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts b/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts.template
similarity index 100%
rename from packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts
rename to packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.spec.ts.template
diff --git a/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.ts b/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template
similarity index 100%
rename from packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.ts
rename to packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template
diff --git a/packages/schematics/angular/component/index.ts b/packages/schematics/angular/component/index.ts
index 4b4da694d1b9..24a399d4c738 100644
--- a/packages/schematics/angular/component/index.ts
+++ b/packages/schematics/angular/component/index.ts
@@ -11,13 +11,13 @@ import {
   SchematicsException,
   Tree,
   apply,
+  applyTemplates,
   branchAndMerge,
   chain,
   filter,
   mergeWith,
   move,
   noop,
-  template,
   url,
 } from '@angular-devkit/schematics';
 import * as ts from 'typescript';
@@ -154,10 +154,10 @@ export default function (options: ComponentOptions): Rule {
     validateHtmlSelector(options.selector);
 
     const templateSource = apply(url('./files'), [
-      options.skipTests ? filter(path => !path.endsWith('.spec.ts')) : noop(),
-      options.inlineStyle ? filter(path => !path.endsWith('.__style__')) : noop(),
-      options.inlineTemplate ? filter(path => !path.endsWith('.html')) : noop(),
-      template({
+      options.skipTests ? filter(path => !path.endsWith('.spec.ts.template')) : noop(),
+      options.inlineStyle ? filter(path => !path.endsWith('.__style__.template')) : noop(),
+      options.inlineTemplate ? filter(path => !path.endsWith('.html.template')) : noop(),
+      applyTemplates({
         ...strings,
         'if-flat': (s: string) => options.flat ? '' : s,
         ...options,
diff --git a/packages/schematics/angular/directive/files/__name@dasherize@if-flat__/__name@dasherize__.directive.spec.ts b/packages/schematics/angular/directive/files/__name@dasherize@if-flat__/__name@dasherize__.directive.spec.ts.template
similarity index 100%
rename from packages/schematics/angular/directive/files/__name@dasherize@if-flat__/__name@dasherize__.directive.spec.ts
rename to packages/schematics/angular/directive/files/__name@dasherize@if-flat__/__name@dasherize__.directive.spec.ts.template
diff --git a/packages/schematics/angular/directive/files/__name@dasherize@if-flat__/__name@dasherize__.directive.ts b/packages/schematics/angular/directive/files/__name@dasherize@if-flat__/__name@dasherize__.directive.ts.template
similarity index 100%
rename from packages/schematics/angular/directive/files/__name@dasherize@if-flat__/__name@dasherize__.directive.ts
rename to packages/schematics/angular/directive/files/__name@dasherize@if-flat__/__name@dasherize__.directive.ts.template
diff --git a/packages/schematics/angular/directive/index.ts b/packages/schematics/angular/directive/index.ts
index 9d96b8e8a082..0b1fa6d076a0 100644
--- a/packages/schematics/angular/directive/index.ts
+++ b/packages/schematics/angular/directive/index.ts
@@ -11,13 +11,13 @@ import {
   SchematicsException,
   Tree,
   apply,
+  applyTemplates,
   branchAndMerge,
   chain,
   filter,
   mergeWith,
   move,
   noop,
-  template,
   url,
 } from '@angular-devkit/schematics';
 import * as ts from 'typescript';
@@ -125,8 +125,8 @@ export default function (options: DirectiveOptions): Rule {
     options.skipTests = options.skipTests || !options.spec;
 
     const templateSource = apply(url('./files'), [
-      options.skipTests ? filter(path => !path.endsWith('.spec.ts')) : noop(),
-      template({
+      options.skipTests ? filter(path => !path.endsWith('.spec.ts.template')) : noop(),
+      applyTemplates({
         ...strings,
         'if-flat': (s: string) => options.flat ? '' : s,
         ...options,
diff --git a/packages/schematics/angular/e2e/files/protractor.conf.js b/packages/schematics/angular/e2e/files/protractor.conf.js.template
similarity index 100%
rename from packages/schematics/angular/e2e/files/protractor.conf.js
rename to packages/schematics/angular/e2e/files/protractor.conf.js.template
diff --git a/packages/schematics/angular/e2e/files/src/app.e2e-spec.ts b/packages/schematics/angular/e2e/files/src/app.e2e-spec.ts.template
similarity index 100%
rename from packages/schematics/angular/e2e/files/src/app.e2e-spec.ts
rename to packages/schematics/angular/e2e/files/src/app.e2e-spec.ts.template
diff --git a/packages/schematics/angular/e2e/files/src/app.po.ts b/packages/schematics/angular/e2e/files/src/app.po.ts.template
similarity index 100%
rename from packages/schematics/angular/e2e/files/src/app.po.ts
rename to packages/schematics/angular/e2e/files/src/app.po.ts.template
diff --git a/packages/schematics/angular/e2e/files/tsconfig.e2e.json b/packages/schematics/angular/e2e/files/tsconfig.e2e.json.template
similarity index 100%
rename from packages/schematics/angular/e2e/files/tsconfig.e2e.json
rename to packages/schematics/angular/e2e/files/tsconfig.e2e.json.template
diff --git a/packages/schematics/angular/e2e/index.ts b/packages/schematics/angular/e2e/index.ts
index bf96319678c4..e168a9e91507 100644
--- a/packages/schematics/angular/e2e/index.ts
+++ b/packages/schematics/angular/e2e/index.ts
@@ -12,10 +12,10 @@ import {
   SchematicsException,
   Tree,
   apply,
+  applyTemplates,
   chain,
   mergeWith,
   move,
-  template,
   url,
 } from '@angular-devkit/schematics';
 import { getWorkspace, updateWorkspace } from '../utility/config';
@@ -127,7 +127,7 @@ export default function (options: E2eOptions): Rule {
       addAppToWorkspaceFile(options, workspace),
       mergeWith(
         apply(url('./files'), [
-          template({
+          applyTemplates({
             utils: strings,
             ...options,
             'dot': '.',
diff --git a/packages/schematics/angular/enum/files/__name@dasherize__.enum.ts b/packages/schematics/angular/enum/files/__name@dasherize__.enum.ts.template
similarity index 100%
rename from packages/schematics/angular/enum/files/__name@dasherize__.enum.ts
rename to packages/schematics/angular/enum/files/__name@dasherize__.enum.ts.template
diff --git a/packages/schematics/angular/enum/index.ts b/packages/schematics/angular/enum/index.ts
index 5ad6e48d6a73..214c969168f4 100644
--- a/packages/schematics/angular/enum/index.ts
+++ b/packages/schematics/angular/enum/index.ts
@@ -12,12 +12,12 @@ import {
   SchematicsException,
   Tree,
   apply,
+  applyTemplates,
   branchAndMerge,
   chain,
   mergeWith,
   move,
   noop,
-  template,
   url,
 } from '@angular-devkit/schematics';
 import { applyLintFix } from '../utility/lint-fix';
@@ -42,7 +42,7 @@ export default function (options: EnumOptions): Rule {
     options.path = parsedPath.path;
 
     const templateSource = apply(url('./files'), [
-      template({
+      applyTemplates({
         ...strings,
         ...options,
       }),
diff --git a/packages/schematics/angular/guard/files/__name@dasherize__.guard.spec.ts b/packages/schematics/angular/guard/files/__name@dasherize__.guard.spec.ts.template
similarity index 100%
rename from packages/schematics/angular/guard/files/__name@dasherize__.guard.spec.ts
rename to packages/schematics/angular/guard/files/__name@dasherize__.guard.spec.ts.template
diff --git a/packages/schematics/angular/guard/files/__name@dasherize__.guard.ts b/packages/schematics/angular/guard/files/__name@dasherize__.guard.ts.template
similarity index 100%
rename from packages/schematics/angular/guard/files/__name@dasherize__.guard.ts
rename to packages/schematics/angular/guard/files/__name@dasherize__.guard.ts.template
diff --git a/packages/schematics/angular/guard/index.ts b/packages/schematics/angular/guard/index.ts
index efd617b94287..3c166049e1fa 100644
--- a/packages/schematics/angular/guard/index.ts
+++ b/packages/schematics/angular/guard/index.ts
@@ -11,13 +11,13 @@ import {
   SchematicsException,
   Tree,
   apply,
+  applyTemplates,
   branchAndMerge,
   chain,
   filter,
   mergeWith,
   move,
   noop,
-  template,
   url,
 } from '@angular-devkit/schematics';
 import { applyLintFix } from '../utility/lint-fix';
@@ -59,8 +59,8 @@ export default function (options: GuardOptions): Rule {
     options.skipTests = options.skipTests || !options.spec;
 
     const templateSource = apply(url('./files'), [
-      options.skipTests ? filter(path => !path.endsWith('.spec.ts')) : noop(),
-      template({
+      options.skipTests ? filter(path => !path.endsWith('.spec.ts.template')) : noop(),
+      applyTemplates({
         implementations,
         implementationImports,
         ...strings,
diff --git a/packages/schematics/angular/interface/files/__name@dasherize____type__.ts b/packages/schematics/angular/interface/files/__name@dasherize____type__.ts.template
similarity index 100%
rename from packages/schematics/angular/interface/files/__name@dasherize____type__.ts
rename to packages/schematics/angular/interface/files/__name@dasherize____type__.ts.template
diff --git a/packages/schematics/angular/interface/index.ts b/packages/schematics/angular/interface/index.ts
index 84ecfe52530d..d1d7e77aad62 100644
--- a/packages/schematics/angular/interface/index.ts
+++ b/packages/schematics/angular/interface/index.ts
@@ -11,12 +11,12 @@ import {
   SchematicsException,
   Tree,
   apply,
+  applyTemplates,
   branchAndMerge,
   chain,
   mergeWith,
   move,
   noop,
-  template,
   url,
 } from '@angular-devkit/schematics';
 import { applyLintFix } from '../utility/lint-fix';
@@ -44,7 +44,7 @@ export default function (options: InterfaceOptions): Rule {
     options.type = !!options.type ? `.${options.type}` : '';
 
     const templateSource = apply(url('./files'), [
-      template({
+      applyTemplates({
         ...strings,
         ...options,
       }),
diff --git a/packages/schematics/angular/library/files/__projectRoot__/README.md b/packages/schematics/angular/library/files/__projectRoot__/README.md.template
similarity index 100%
rename from packages/schematics/angular/library/files/__projectRoot__/README.md
rename to packages/schematics/angular/library/files/__projectRoot__/README.md.template
diff --git a/packages/schematics/angular/library/files/__projectRoot__/karma.conf.js b/packages/schematics/angular/library/files/__projectRoot__/karma.conf.js.template
similarity index 100%
rename from packages/schematics/angular/library/files/__projectRoot__/karma.conf.js
rename to packages/schematics/angular/library/files/__projectRoot__/karma.conf.js.template
diff --git a/packages/schematics/angular/library/files/__projectRoot__/ng-package.json b/packages/schematics/angular/library/files/__projectRoot__/ng-package.json.template
similarity index 100%
rename from packages/schematics/angular/library/files/__projectRoot__/ng-package.json
rename to packages/schematics/angular/library/files/__projectRoot__/ng-package.json.template
diff --git a/packages/schematics/angular/library/files/__projectRoot__/package.json b/packages/schematics/angular/library/files/__projectRoot__/package.json.template
similarity index 100%
rename from packages/schematics/angular/library/files/__projectRoot__/package.json
rename to packages/schematics/angular/library/files/__projectRoot__/package.json.template
diff --git a/packages/schematics/angular/library/files/__projectRoot__/src/__entryFile__.ts b/packages/schematics/angular/library/files/__projectRoot__/src/__entryFile__.ts.template
similarity index 100%
rename from packages/schematics/angular/library/files/__projectRoot__/src/__entryFile__.ts
rename to packages/schematics/angular/library/files/__projectRoot__/src/__entryFile__.ts.template
diff --git a/packages/schematics/angular/library/files/__projectRoot__/src/test.ts b/packages/schematics/angular/library/files/__projectRoot__/src/test.ts.template
similarity index 100%
rename from packages/schematics/angular/library/files/__projectRoot__/src/test.ts
rename to packages/schematics/angular/library/files/__projectRoot__/src/test.ts.template
diff --git a/packages/schematics/angular/library/files/__projectRoot__/tsconfig.lib.json b/packages/schematics/angular/library/files/__projectRoot__/tsconfig.lib.json.template
similarity index 100%
rename from packages/schematics/angular/library/files/__projectRoot__/tsconfig.lib.json
rename to packages/schematics/angular/library/files/__projectRoot__/tsconfig.lib.json.template
diff --git a/packages/schematics/angular/library/files/__projectRoot__/tsconfig.spec.json b/packages/schematics/angular/library/files/__projectRoot__/tsconfig.spec.json.template
similarity index 100%
rename from packages/schematics/angular/library/files/__projectRoot__/tsconfig.spec.json
rename to packages/schematics/angular/library/files/__projectRoot__/tsconfig.spec.json.template
diff --git a/packages/schematics/angular/library/files/__projectRoot__/tslint.json b/packages/schematics/angular/library/files/__projectRoot__/tslint.json.template
similarity index 100%
rename from packages/schematics/angular/library/files/__projectRoot__/tslint.json
rename to packages/schematics/angular/library/files/__projectRoot__/tslint.json.template
diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index b28b4eba122d..725d9fc50b3d 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -12,12 +12,12 @@ import {
   SchematicsException,
   Tree,
   apply,
+  applyTemplates,
   branchAndMerge,
   chain,
   mergeWith,
   noop,
   schematic,
-  template,
   url,
 } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
@@ -204,7 +204,7 @@ export default function (options: LibraryOptions): Rule {
     const relativePathToWorkspaceRoot = projectRoot.split('/').map(x => '..').join('/');
 
     const templateSource = apply(url('./files'), [
-      template({
+      applyTemplates({
         ...strings,
         ...options,
         packageName,
diff --git a/packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__-routing.module.ts b/packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__-routing.module.ts.template
similarity index 100%
rename from packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__-routing.module.ts
rename to packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__-routing.module.ts.template
diff --git a/packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__.module.ts b/packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__.module.ts.template
similarity index 100%
rename from packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__.module.ts
rename to packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__.module.ts.template
diff --git a/packages/schematics/angular/module/index.ts b/packages/schematics/angular/module/index.ts
index 07c1cfea2e03..31ac6fc6bd98 100644
--- a/packages/schematics/angular/module/index.ts
+++ b/packages/schematics/angular/module/index.ts
@@ -11,13 +11,13 @@ import {
   SchematicsException,
   Tree,
   apply,
+  applyTemplates,
   branchAndMerge,
   chain,
   filter,
   mergeWith,
   move,
   noop,
-  template,
   url,
 } from '@angular-devkit/schematics';
 import * as ts from 'typescript';
@@ -89,8 +89,8 @@ export default function (options: ModuleOptions): Rule {
     options.path = parsedPath.path;
 
     const templateSource = apply(url('./files'), [
-      options.routing ? noop() : filter(path => !path.endsWith('-routing.module.ts')),
-      template({
+      options.routing ? noop() : filter(path => !path.endsWith('-routing.module.ts.template')),
+      applyTemplates({
         ...strings,
         'if-flat': (s: string) => options.flat ? '' : s,
         ...options,
diff --git a/packages/schematics/angular/pipe/files/__name@dasherize@if-flat__/__name@dasherize__.pipe.spec.ts b/packages/schematics/angular/pipe/files/__name@dasherize@if-flat__/__name@dasherize__.pipe.spec.ts.template
similarity index 100%
rename from packages/schematics/angular/pipe/files/__name@dasherize@if-flat__/__name@dasherize__.pipe.spec.ts
rename to packages/schematics/angular/pipe/files/__name@dasherize@if-flat__/__name@dasherize__.pipe.spec.ts.template
diff --git a/packages/schematics/angular/pipe/files/__name@dasherize@if-flat__/__name@dasherize__.pipe.ts b/packages/schematics/angular/pipe/files/__name@dasherize@if-flat__/__name@dasherize__.pipe.ts.template
similarity index 100%
rename from packages/schematics/angular/pipe/files/__name@dasherize@if-flat__/__name@dasherize__.pipe.ts
rename to packages/schematics/angular/pipe/files/__name@dasherize@if-flat__/__name@dasherize__.pipe.ts.template
diff --git a/packages/schematics/angular/pipe/index.ts b/packages/schematics/angular/pipe/index.ts
index 7e3d5e19b156..919704c07db0 100644
--- a/packages/schematics/angular/pipe/index.ts
+++ b/packages/schematics/angular/pipe/index.ts
@@ -11,13 +11,13 @@ import {
   SchematicsException,
   Tree,
   apply,
+  applyTemplates,
   branchAndMerge,
   chain,
   filter,
   mergeWith,
   move,
   noop,
-  template,
   url,
 } from '@angular-devkit/schematics';
 import * as ts from 'typescript';
@@ -106,8 +106,8 @@ export default function (options: PipeOptions): Rule {
     options.skipTests = options.skipTests || !options.spec;
 
     const templateSource = apply(url('./files'), [
-      options.skipTests ? filter(path => !path.endsWith('.spec.ts')) : noop(),
-      template({
+      options.skipTests ? filter(path => !path.endsWith('.spec.ts.template')) : noop(),
+      applyTemplates({
         ...strings,
         'if-flat': (s: string) => options.flat ? '' : s,
         ...options,
diff --git a/packages/schematics/angular/service-worker/files/ngsw-config.json b/packages/schematics/angular/service-worker/files/ngsw-config.json.template
similarity index 100%
rename from packages/schematics/angular/service-worker/files/ngsw-config.json
rename to packages/schematics/angular/service-worker/files/ngsw-config.json.template
diff --git a/packages/schematics/angular/service-worker/index.ts b/packages/schematics/angular/service-worker/index.ts
index 2e82f7135400..6e0c4b76816e 100644
--- a/packages/schematics/angular/service-worker/index.ts
+++ b/packages/schematics/angular/service-worker/index.ts
@@ -11,10 +11,10 @@ import {
   SchematicsException,
   Tree,
   apply,
+  applyTemplates,
   chain,
   mergeWith,
   move,
-  template,
   url,
 } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
@@ -176,7 +176,7 @@ export default function (options: ServiceWorkerOptions): Rule {
 
     const root = project.root || project.sourceRoot || '';
     const templateSource = apply(url('./files'), [
-      template({ ...options, resourcesOutputPath }),
+      applyTemplates({ ...options, resourcesOutputPath }),
       move(root),
     ]);
 
diff --git a/packages/schematics/angular/service/files/__name@dasherize@if-flat__/__name@dasherize__.service.spec.ts b/packages/schematics/angular/service/files/__name@dasherize@if-flat__/__name@dasherize__.service.spec.ts.template
similarity index 100%
rename from packages/schematics/angular/service/files/__name@dasherize@if-flat__/__name@dasherize__.service.spec.ts
rename to packages/schematics/angular/service/files/__name@dasherize@if-flat__/__name@dasherize__.service.spec.ts.template
diff --git a/packages/schematics/angular/service/files/__name@dasherize@if-flat__/__name@dasherize__.service.ts b/packages/schematics/angular/service/files/__name@dasherize@if-flat__/__name@dasherize__.service.ts.template
similarity index 100%
rename from packages/schematics/angular/service/files/__name@dasherize@if-flat__/__name@dasherize__.service.ts
rename to packages/schematics/angular/service/files/__name@dasherize@if-flat__/__name@dasherize__.service.ts.template
diff --git a/packages/schematics/angular/service/index.ts b/packages/schematics/angular/service/index.ts
index c5547ebf67da..6bd3b3f1cad6 100644
--- a/packages/schematics/angular/service/index.ts
+++ b/packages/schematics/angular/service/index.ts
@@ -11,12 +11,12 @@ import {
   SchematicsException,
   Tree,
   apply,
+  applyTemplates,
   chain,
   filter,
   mergeWith,
   move,
   noop,
-  template,
   url,
 } from '@angular-devkit/schematics';
 import { applyLintFix } from '../utility/lint-fix';
@@ -43,8 +43,8 @@ export default function (options: ServiceOptions): Rule {
     options.skipTests = options.skipTests || !options.spec;
 
     const templateSource = apply(url('./files'), [
-      options.skipTests ? filter(path => !path.endsWith('.spec.ts')) : noop(),
-      template({
+      options.skipTests ? filter(path => !path.endsWith('.spec.ts.template')) : noop(),
+      applyTemplates({
         ...strings,
         'if-flat': (s: string) => options.flat ? '' : s,
         ...options,
diff --git a/packages/schematics/angular/universal/files/root/__tsconfigFileName__.json b/packages/schematics/angular/universal/files/root/__tsconfigFileName__.json.template
similarity index 100%
rename from packages/schematics/angular/universal/files/root/__tsconfigFileName__.json
rename to packages/schematics/angular/universal/files/root/__tsconfigFileName__.json.template
diff --git a/packages/schematics/angular/universal/files/src/__main@stripTsExtension__.ts b/packages/schematics/angular/universal/files/src/__main@stripTsExtension__.ts.template
similarity index 100%
rename from packages/schematics/angular/universal/files/src/__main@stripTsExtension__.ts
rename to packages/schematics/angular/universal/files/src/__main@stripTsExtension__.ts.template
diff --git a/packages/schematics/angular/universal/files/src/app/__rootModuleFileName__ b/packages/schematics/angular/universal/files/src/app/__rootModuleFileName__.template
similarity index 100%
rename from packages/schematics/angular/universal/files/src/app/__rootModuleFileName__
rename to packages/schematics/angular/universal/files/src/app/__rootModuleFileName__.template
diff --git a/packages/schematics/angular/universal/index.ts b/packages/schematics/angular/universal/index.ts
index 5909e5cf5b78..85886ab2bcae 100644
--- a/packages/schematics/angular/universal/index.ts
+++ b/packages/schematics/angular/universal/index.ts
@@ -20,10 +20,10 @@ import {
   SchematicsException,
   Tree,
   apply,
+  applyTemplates,
   chain,
   mergeWith,
   move,
-  template,
   url,
 } from '@angular-devkit/schematics';
 import {
@@ -257,7 +257,7 @@ export default function (options: UniversalOptions): Rule {
     }
 
     const templateSource = apply(url('./files/src'), [
-      template({
+      applyTemplates({
         ...strings,
         ...options as object,
         stripTsExtension: (s: string) => s.replace(/\.ts$/, ''),
@@ -266,7 +266,7 @@ export default function (options: UniversalOptions): Rule {
     ]);
 
     const rootSource = apply(url('./files/root'), [
-      template({
+      applyTemplates({
         ...strings,
         ...options as object,
         stripTsExtension: (s: string) => s.replace(/\.ts$/, ''),
diff --git a/packages/schematics/angular/workspace/files/README.md b/packages/schematics/angular/workspace/files/README.md.template
old mode 100755
new mode 100644
similarity index 100%
rename from packages/schematics/angular/workspace/files/README.md
rename to packages/schematics/angular/workspace/files/README.md.template
diff --git a/packages/schematics/angular/workspace/files/__dot__editorconfig b/packages/schematics/angular/workspace/files/__dot__editorconfig.template
similarity index 100%
rename from packages/schematics/angular/workspace/files/__dot__editorconfig
rename to packages/schematics/angular/workspace/files/__dot__editorconfig.template
diff --git a/packages/schematics/angular/workspace/files/__dot__gitignore b/packages/schematics/angular/workspace/files/__dot__gitignore.template
old mode 100755
new mode 100644
similarity index 100%
rename from packages/schematics/angular/workspace/files/__dot__gitignore
rename to packages/schematics/angular/workspace/files/__dot__gitignore.template
diff --git a/packages/schematics/angular/workspace/files/angular.json b/packages/schematics/angular/workspace/files/angular.json.template
similarity index 100%
rename from packages/schematics/angular/workspace/files/angular.json
rename to packages/schematics/angular/workspace/files/angular.json.template
diff --git a/packages/schematics/angular/workspace/files/package.json b/packages/schematics/angular/workspace/files/package.json.template
similarity index 100%
rename from packages/schematics/angular/workspace/files/package.json
rename to packages/schematics/angular/workspace/files/package.json.template
diff --git a/packages/schematics/angular/workspace/files/tsconfig.json b/packages/schematics/angular/workspace/files/tsconfig.json.template
similarity index 100%
rename from packages/schematics/angular/workspace/files/tsconfig.json
rename to packages/schematics/angular/workspace/files/tsconfig.json.template
diff --git a/packages/schematics/angular/workspace/files/tslint.json b/packages/schematics/angular/workspace/files/tslint.json.template
similarity index 100%
rename from packages/schematics/angular/workspace/files/tslint.json
rename to packages/schematics/angular/workspace/files/tslint.json.template
diff --git a/packages/schematics/angular/workspace/index.ts b/packages/schematics/angular/workspace/index.ts
index 6f2dd14589af..05282267baf5 100644
--- a/packages/schematics/angular/workspace/index.ts
+++ b/packages/schematics/angular/workspace/index.ts
@@ -9,10 +9,10 @@ import { strings } from '@angular-devkit/core';
 import {
   Rule,
   apply,
+  applyTemplates,
   filter,
   mergeWith,
   noop,
-  template,
   url,
 } from '@angular-devkit/schematics';
 import { latestVersions } from '../utility/latest-versions';
@@ -20,11 +20,11 @@ import { Schema as WorkspaceOptions } from './schema';
 
 
 export default function (options: WorkspaceOptions): Rule {
-  const minimalFilesRegExp = /(.editorconfig|tslint.json)$/;
+  const minimalFilesRegExp = /(.editorconfig|tslint.json)\.template$/;
 
   return mergeWith(apply(url('./files'), [
     options.minimal ? filter(path => !minimalFilesRegExp.test(path)) : noop(),
-    template({
+    applyTemplates({
       utils: strings,
       ...options,
       'dot': '.',
diff --git a/packages/schematics/schematics/blank/factory.ts b/packages/schematics/schematics/blank/factory.ts
index 476d293a6c8c..7c033f9a4fcc 100644
--- a/packages/schematics/schematics/blank/factory.ts
+++ b/packages/schematics/schematics/blank/factory.ts
@@ -21,10 +21,10 @@ import {
   Tree,
   UpdateRecorder,
   apply,
+  applyTemplates,
   chain,
   mergeWith,
   move,
-  template,
   url,
 } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
@@ -114,7 +114,7 @@ export default function (options: Schema): Rule {
     }
 
     let source = apply(url('./schematic-files'), [
-        template({
+        applyTemplates({
           ...options as object,
           coreVersion,
           schematicsVersion,
@@ -128,7 +128,7 @@ export default function (options: Schema): Rule {
     if (!collectionPath) {
       collectionPath = normalize('/' + options.name + '/src/collection.json');
       source = apply(url('./project-files'), [
-        template({
+        applyTemplates({
           ...options as object,
           coreVersion,
           schematicsVersion,
diff --git a/packages/schematics/schematics/blank/project-files/README.md b/packages/schematics/schematics/blank/project-files/README.md.template
similarity index 100%
rename from packages/schematics/schematics/blank/project-files/README.md
rename to packages/schematics/schematics/blank/project-files/README.md.template
diff --git a/packages/schematics/schematics/blank/project-files/__dot__gitignore b/packages/schematics/schematics/blank/project-files/__dot__gitignore.template
similarity index 100%
rename from packages/schematics/schematics/blank/project-files/__dot__gitignore
rename to packages/schematics/schematics/blank/project-files/__dot__gitignore.template
diff --git a/packages/schematics/schematics/blank/project-files/__dot__npmignore b/packages/schematics/schematics/blank/project-files/__dot__npmignore.template
similarity index 100%
rename from packages/schematics/schematics/blank/project-files/__dot__npmignore
rename to packages/schematics/schematics/blank/project-files/__dot__npmignore.template
diff --git a/packages/schematics/schematics/blank/project-files/package.json b/packages/schematics/schematics/blank/project-files/package.json.template
similarity index 100%
rename from packages/schematics/schematics/blank/project-files/package.json
rename to packages/schematics/schematics/blank/project-files/package.json.template
diff --git a/packages/schematics/schematics/blank/project-files/src/collection.json b/packages/schematics/schematics/blank/project-files/src/collection.json.template
similarity index 100%
rename from packages/schematics/schematics/blank/project-files/src/collection.json
rename to packages/schematics/schematics/blank/project-files/src/collection.json.template
diff --git a/packages/schematics/schematics/blank/project-files/tsconfig.json b/packages/schematics/schematics/blank/project-files/tsconfig.json.template
similarity index 100%
rename from packages/schematics/schematics/blank/project-files/tsconfig.json
rename to packages/schematics/schematics/blank/project-files/tsconfig.json.template
diff --git a/packages/schematics/schematics/blank/schematic-files/src/__name@dasherize__/index.ts b/packages/schematics/schematics/blank/schematic-files/src/__name@dasherize__/index.ts.template
similarity index 100%
rename from packages/schematics/schematics/blank/schematic-files/src/__name@dasherize__/index.ts
rename to packages/schematics/schematics/blank/schematic-files/src/__name@dasherize__/index.ts.template
diff --git a/packages/schematics/schematics/blank/schematic-files/src/__name@dasherize__/index_spec.ts b/packages/schematics/schematics/blank/schematic-files/src/__name@dasherize__/index_spec.ts.template
similarity index 100%
rename from packages/schematics/schematics/blank/schematic-files/src/__name@dasherize__/index_spec.ts
rename to packages/schematics/schematics/blank/schematic-files/src/__name@dasherize__/index_spec.ts.template

From 8e3c7dcca4883da557885061090e93487402c538 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Wed, 16 Jan 2019 11:08:30 -0800
Subject: [PATCH 0645/1703] build: Update Bazel workspace

While doing a Bazel query using Bazel 0.21.0, Bazel complains that
the http_archive must now be an explicit rule. This commit fixes
that.

In addition, versions for rules_typescript and angular have also
been updated.
---
 WORKSPACE                                     | 13 +++++---
 .../schematics/src/_golden-api.d.ts           |  2 +-
 package.json                                  |  4 +--
 yarn.lock                                     | 31 +++++++------------
 4 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 406f14f95d7e..729055b85c58 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,5 +1,7 @@
 workspace(name = "angular_cli")
 
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
 # This is required by Angular Workspace
 http_archive(
     name = "bazel_skylib",
@@ -19,8 +21,9 @@ http_archive(
 # Load the TypeScript rules, its dependencies, and setup the workspace.
 http_archive(
     name = "build_bazel_rules_typescript",
-    url = "https://github.com/bazelbuild/rules_typescript/archive/8ea1a55cf5cf8be84ddfeefc0940769b80da792f.zip",
-    strip_prefix = "rules_typescript-8ea1a55cf5cf8be84ddfeefc0940769b80da792f",
+    url = "https://github.com/bazelbuild/rules_typescript/archive/0.22.1.zip",
+    strip_prefix = "rules_typescript-0.22.1",
+    sha256 = "351abe89b291a3b3d6af38d9d04c6270f5d2ed8781e2fda25bc65fd12db25e66",
 )
 
 load("@build_bazel_rules_typescript//:package.bzl", "rules_typescript_dependencies")
@@ -37,9 +40,9 @@ go_register_toolchains()
 # TS API Guardian resides in Angular
 http_archive(
     name = "angular",
-    url = "https://github.com/angular/angular/archive/7.1.0-rc.0.zip",
-    strip_prefix = "angular-7.1.0-rc.0",
-    sha256 = "dbf3ae2d60b5384715bc002c695be0141f8c9219396ac1edbdc7023bd400c8a1",
+    url = "https://github.com/angular/angular/archive/7.2.0.zip",
+    strip_prefix = "angular-7.2.0",
+    sha256 = "8a4915a524f3fed17424da4b77cd7a943fbbddba44275f06671493339713914b",
 )
 
 load("@angular//:index.bzl", "ng_setup_workspace")
diff --git a/etc/api/angular_devkit/schematics/src/_golden-api.d.ts b/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
index 707521eac039..f1137b3be8e1 100644
--- a/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
@@ -566,7 +566,7 @@ export declare function template<T>(options: T): Rule;
 
 export declare const TEMPLATE_FILENAME_RE: RegExp;
 
-export declare const Tree: TreeConstructor;
+export declare type Tree = TreeInterface;
 
 export interface TreeConstructor {
     branch(tree: TreeInterface): TreeInterface;
diff --git a/package.json b/package.json
index 1a22cf0587cd..dcae2a127d2d 100644
--- a/package.json
+++ b/package.json
@@ -74,8 +74,8 @@
   "devDependencies": {
     "@angular/compiler": "^7.2.0-rc.0",
     "@angular/compiler-cli": "^7.2.0-rc.0",
-    "@bazel/karma": "^0.20.3",
-    "@bazel/typescript": "0.20.3",
+    "@bazel/karma": "^0.22.1",
+    "@bazel/typescript": "0.22.1",
     "@ngtools/json-schema": "^1.1.0",
     "@types/copy-webpack-plugin": "^4.4.1",
     "@types/express": "^4.16.0",
diff --git a/yarn.lock b/yarn.lock
index 62c1a4dd5271..1ea9d8334b3e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -195,10 +195,10 @@
     lodash "^4.17.10"
     to-fast-properties "^2.0.0"
 
-"@bazel/karma@^0.20.3":
-  version "0.20.3"
-  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.20.3.tgz#a63bb82b4887ae8c0d01f3028c6fa4764470851d"
-  integrity sha512-IgWfTpK9XLEI977DS2kHIEO1QfFTEOBxeNDDjHtd1onmzyMCLROphTOBZ/g42ybUIWyJhS9DK4U3bLSMQE0Bng==
+"@bazel/karma@^0.22.1":
+  version "0.22.1"
+  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.22.1.tgz#1bd7028b7939e19d67a94a95ea8e7afada679a16"
+  integrity sha512-QPJbvCvxpQF4Wvcrl8efQY095+5OMh/uCPB7REGD728KmFKCPz0R/RhaU5dyNOoaZlR7yTGPkvVcN0nNUKqKKQ==
   dependencies:
     jasmine-core "2.8.0"
     karma alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a
@@ -209,16 +209,17 @@
     karma-sauce-launcher "1.2.0"
     karma-sourcemap-loader "0.3.7"
     requirejs "2.3.5"
+    semver "5.6.0"
     tmp "0.0.33"
 
-"@bazel/typescript@0.20.3":
-  version "0.20.3"
-  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.20.3.tgz#51dcc369c2af0d7f2311d6e692d07776492060f4"
-  integrity sha512-BZmfzaNkgS++53CGEUk5p9FXOG+k8FNWCDbxzYljoIGP60aIkw4UgRQ24ReBwhCMg6M6KW609yje7AvDZkA6bg==
+"@bazel/typescript@0.22.1":
+  version "0.22.1"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.22.1.tgz#b52c00e8560019e2f9d273d45c04785e0ec9d9bd"
+  integrity sha512-88DaCCnNg8rPlKP0eAQEZuoiJkEPeiItpUS3oBR1sFQNBRJb56D25ahK8+N6LJk4qaH+ZQ1/AHOPDhfEEWvDzA==
   dependencies:
     protobufjs "5.0.3"
+    semver "5.6.0"
     source-map-support "0.5.9"
-    tsickle "0.28.0"
     tsutils "2.27.2"
 
 "@ngtools/json-schema@^1.1.0":
@@ -5597,7 +5598,7 @@ karma-sourcemap-loader@0.3.7:
   dependencies:
     graceful-fs "^4.1.2"
 
-karma@alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a:
+"karma@github:alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a":
   version "1.7.1"
   resolved "https://codeload.github.com/alexeagle/karma/tar.gz/fa1a84ac881485b5657cb669e9b4e5da77b79f0a"
   dependencies:
@@ -9954,16 +9955,6 @@ ts-node@^5.0.0:
     source-map-support "^0.5.3"
     yn "^2.0.0"
 
-tsickle@0.28.0:
-  version "0.28.0"
-  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.28.0.tgz#6cd6fa004766c6ad9261b599c83866ee97cc7875"
-  integrity sha512-cb/Z4NlKMPGiIIbgmklfBJIxDl4EQoYqC+0/BnPxZWzWcUvikeOHFkkkEmabJVqKh47jUqOwU/uMAu6UvhicZg==
-  dependencies:
-    minimist "^1.2.0"
-    mkdirp "^0.5.1"
-    source-map "^0.6.0"
-    source-map-support "^0.5.0"
-
 tsickle@>=0.34.0:
   version "0.34.0"
   resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.34.0.tgz#10187fa6401a288a65efb93a60bf28b2ff95f90b"

From c5de8e3b0e5c1499a0a17da0208297cd82b36095 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Wed, 16 Jan 2019 16:41:24 -0800
Subject: [PATCH 0646/1703] release: v7.3.0-beta.0

---
 .monorepo.json | 76 +++++++++++++++++++++++++-------------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index 51ea18c63a32..86ebfa52200e 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,16 +42,16 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.12.0-rc.0",
-      "hash": "4eecb4a76317039defc5c2b4bd31e4f9"
+      "version": "0.13.0-beta.0",
+      "hash": "6d499b7cc1fecfdca1ee530d68af2743"
     },
     "@_/builders": {
-      "version": "0.12.0-rc.0",
-      "hash": "796f00a3b325334632fd8bb9d1b46b02"
+      "version": "0.13.0-beta.0",
+      "hash": "a365103b30adf919f51d22b50194fdac"
     },
     "devkit": {
-      "version": "0.12.0-rc.0",
-      "hash": "8cb2abef5a244ec6834bdaec41c10c65"
+      "version": "0.13.0-beta.0",
+      "hash": "9e3df175b7cdbd427f94fe6ea869275a"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -62,15 +62,15 @@
           "url": "/packages/angular/cli/README.md"
         }
       ],
-      "version": "7.2.0-rc.0",
+      "version": "7.3.0-beta.0",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "d0a5c778b9c03df8abd13485e881feea"
+      "hash": "726669cc233ebcc7fd886b2ac10e10c8"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.12.0-rc.0",
-      "hash": "3ed62177f8227f5b756a92863136cae4",
+      "version": "0.13.0-beta.0",
+      "hash": "b2a93aad732adc4420291773c2557e9d",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -81,21 +81,21 @@
           "url": "/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.12.0-rc.0",
-      "hash": "d382c41402ef70445c5662faefbe959d",
+      "version": "0.13.0-beta.0",
+      "hash": "30f0656d34bee230efc9b0895de4c428",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.12.0-rc.0",
-      "hash": "1c9d6b5574b4021d1ba6bf5f69cd580b",
+      "version": "0.13.0-beta.0",
+      "hash": "cc86b1046bc2bd94a964afaffebe49af",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
       "name": "Benchmark",
       "section": "Tooling",
-      "version": "1.1.0-rc.0",
-      "hash": "d33b6fb20d1b8a12e9f019f3e3987d0c"
+      "version": "1.2.0-beta.0",
+      "hash": "adce731cbc698d3f6598d39fbcce5bed"
     },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
@@ -105,8 +105,8 @@
           "url": "/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.12.0-rc.0",
-      "hash": "52a7d57f1714fc165d83d478af637926",
+      "version": "0.13.0-beta.0",
+      "hash": "e6c5f5f9a3bc0dc7b42e9fe9fe445d5c",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -117,8 +117,8 @@
           "url": "/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.12.0-rc.0",
-      "hash": "c84a861c274827aae116a72b961cf424",
+      "version": "0.13.0-beta.0",
+      "hash": "e5c1bebd49b8b2b5a6db0a59427c3daa",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -129,8 +129,8 @@
           "url": "/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.12.0-rc.0",
-      "hash": "ae32dea620c757fc8348cdeea63f3f85",
+      "version": "0.13.0-beta.0",
+      "hash": "ef614518589fe86609d91174f4c4dd22",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -141,9 +141,9 @@
           "url": "/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.12.0-rc.0",
+      "version": "0.13.0-beta.0",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "2de37a912e57077f67da4dee818b1769"
+      "hash": "52271aa953c59b0eba5e57b48c630a60"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -153,8 +153,8 @@
           "url": "/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "7.2.0-rc.0",
-      "hash": "7b0286aca578c60324c5efa4597cdc9d",
+      "version": "7.3.0-beta.0",
+      "hash": "dfe70517435acc2bde59dc909a81a2e0",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -165,43 +165,43 @@
           "url": "/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "7.2.0-rc.0",
-      "hash": "c282e38cd60531cffb93a0fd3c30feb2",
+      "version": "7.3.0-beta.0",
+      "hash": "19ea3c709b4161f2962e6517be3a702c",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.12.0-rc.0",
-      "hash": "eec7ff8704cff8d7673aab1bcb5c38b7",
+      "version": "0.13.0-beta.0",
+      "hash": "a72e1bf8b28cf9f1efae876c71b1342c",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "7.2.0-rc.0",
+      "version": "7.3.0-beta.0",
       "section": "Misc",
-      "hash": "1d89a340c12d65afffa8f2d0f641601c",
+      "hash": "df0983f56c62d06793be9c5d7df4b66e",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "7.2.0-rc.0",
-      "hash": "ec595b6e0d6dc11d134e79e3010a3cc2",
+      "version": "7.3.0-beta.0",
+      "hash": "003087095d6db80f88853ed372c6012d",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.12.0-rc.0",
+      "version": "0.13.0-beta.0",
       "section": "Schematics",
-      "hash": "e8e0efbd01906eddf9eb0dd1087a78f5",
+      "hash": "77ea160b6188f658332e02ed4ac0aab6",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.12.0-rc.0",
+      "version": "0.13.0-beta.0",
       "section": "Schematics",
-      "hash": "0f8c64183dec8611c8986c6456cf932b",
+      "hash": "507b09653ac3cdd985f128b2b80e27f1",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }

From b1b365e4fd07098b1fc0971a971ddb4a94d86e0f Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Fri, 18 Jan 2019 16:16:20 +0100
Subject: [PATCH 0647/1703] fix(@schematics/angular): update latest version of
 devkit

---
 packages/schematics/angular/utility/latest-versions.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 23487689ba7f..bcc335b079f3 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -14,6 +14,6 @@ export const latestVersions = {
   TypeScript: '~3.2.2',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.12.0-rc.0',
-  DevkitBuildNgPackagr: '~0.12.0-rc.0',
+  DevkitBuildAngular: '~0.13.0-beta.0',
+  DevkitBuildNgPackagr: '~0.13.0-beta.0',
 };

From 4718de4dae9bbdf25882091610dfc0afc54341b0 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Fri, 18 Jan 2019 15:56:34 +0100
Subject: [PATCH 0648/1703] feat(@schematics/angular): only support known style
 extentions

Fixes #13149
---
 packages/angular/cli/lib/config/schema.json   | 11 ++++++++--
 .../angular/app-shell/index_spec.ts           |  1 -
 ....template => styles.__styleExt__.template} |  0
 .../schematics/angular/application/index.ts   | 11 +++++++---
 .../other-files/app.component.ts.template     |  2 +-
 .../angular/application/schema.json           | 11 ++++++++--
 .../schematics/angular/class/index_spec.ts    |  1 -
 ...sherize__.component.__styleExt__.template} |  0
 .../__name@dasherize__.component.ts.template  |  2 +-
 .../schematics/angular/component/index.ts     | 20 ++++++++++++++-----
 .../angular/component/index_spec.ts           | 17 ++++++++++++----
 .../schematics/angular/component/schema.json  | 11 ++++++++--
 .../schematics/angular/enum/index_spec.ts     |  1 -
 .../angular/interface/index_spec.ts           |  1 -
 .../schematics/angular/module/index_spec.ts   |  1 -
 .../schematics/angular/ng-new/schema.json     | 11 ++++++++--
 .../schematics/angular/pipe/index_spec.ts     |  1 -
 .../angular/service-worker/index_spec.ts      |  1 -
 .../angular/universal/index_spec.ts           |  6 +++---
 19 files changed, 77 insertions(+), 32 deletions(-)
 rename packages/schematics/angular/application/files/src/{styles.__style__.template => styles.__styleExt__.template} (100%)
 rename packages/schematics/angular/component/files/__name@dasherize@if-flat__/{__name@dasherize__.component.__style__.template => __name@dasherize__.component.__styleExt__.template} (100%)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index bc31fb6c324c..50b56f08650e 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -140,9 +140,16 @@
               "default": "css"
             },
             "style": {
-              "description": "The file extension to use for style files.",
+              "description": "The file extension or preprocessor to use for style files.",
               "type": "string",
-              "default": "css"
+              "default": "css",
+              "enum": [
+                "css",
+                "scss",
+                "sass",
+                "less",
+                "styl"
+              ]
             },
             "viewEncapsulation": {
               "description": "Specifies the view encapsulation strategy.",
diff --git a/packages/schematics/angular/app-shell/index_spec.ts b/packages/schematics/angular/app-shell/index_spec.ts
index ca7bf55929f9..9e1b1626b8d9 100644
--- a/packages/schematics/angular/app-shell/index_spec.ts
+++ b/packages/schematics/angular/app-shell/index_spec.ts
@@ -33,7 +33,6 @@ describe('App Shell Schematic', () => {
     inlineStyle: false,
     inlineTemplate: false,
     routing: true,
-    style: 'css',
     skipTests: false,
     skipPackageJson: false,
   };
diff --git a/packages/schematics/angular/application/files/src/styles.__style__.template b/packages/schematics/angular/application/files/src/styles.__styleExt__.template
similarity index 100%
rename from packages/schematics/angular/application/files/src/styles.__style__.template
rename to packages/schematics/angular/application/files/src/styles.__styleExt__.template
diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index e978ac67a516..f3234133b8a5 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -31,6 +31,7 @@ import {
   url,
 } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
+import { styleToFileExtention } from '../component/index';
 import { Schema as ComponentOptions } from '../component/schema';
 import { Schema as E2eOptions } from '../e2e/schema';
 import {
@@ -48,7 +49,7 @@ import {
   WorkspaceProject,
   WorkspaceSchema,
 } from '../utility/workspace-models';
-import { Schema as ApplicationOptions } from './schema';
+import { Schema as ApplicationOptions, Style } from './schema';
 
 
 // TODO: use JsonAST
@@ -162,7 +163,7 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
 
   if (options.inlineTemplate === true
     || options.inlineStyle === true
-    || options.style !== 'css') {
+    || options.style !== Style.Css) {
     schematics['@schematics/angular:component'] = {};
     if (options.inlineTemplate === true) {
       (schematics['@schematics/angular:component'] as JsonObject).inlineTemplate = true;
@@ -170,7 +171,7 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
     if (options.inlineStyle === true) {
       (schematics['@schematics/angular:component'] as JsonObject).inlineStyle = true;
     }
-    if (options.style && options.style !== 'css') {
+    if (options.style && options.style !== Style.Css) {
       (schematics['@schematics/angular:component'] as JsonObject).styleext = options.style;
     }
   }
@@ -346,6 +347,8 @@ export default function (options: ApplicationOptions): Rule {
       projectRoot: newProjectRoot ? `${newProjectRoot}/${options.name}-e2e` : 'e2e',
     };
 
+    const styleExt = styleToFileExtention(options.style);
+
     return chain([
       addAppToWorkspaceFile(options, workspace),
       mergeWith(
@@ -356,6 +359,7 @@ export default function (options: ApplicationOptions): Rule {
             ...options,
             'dot': '.',
             relativePathToWorkspaceRoot,
+            styleExt,
           }),
           move(sourceRoot),
         ])),
@@ -417,6 +421,7 @@ export default function (options: ApplicationOptions): Rule {
             ...options as any,  // tslint:disable-line:no-any
             selector: appRootSelector,
             ...componentOptions,
+            styleExt,
           }),
           move(sourceDir),
         ]), MergeStrategy.Overwrite),
diff --git a/packages/schematics/angular/application/other-files/app.component.ts.template b/packages/schematics/angular/application/other-files/app.component.ts.template
index 36845433365f..91aad371b12d 100644
--- a/packages/schematics/angular/application/other-files/app.component.ts.template
+++ b/packages/schematics/angular/application/other-files/app.component.ts.template
@@ -28,7 +28,7 @@ import { Component } from '@angular/core';
   `,<% } else { %>
   templateUrl: './app.component.html',<% } if(inlineStyle) { %>
   styles: []<% } else { %>
-  styleUrls: ['./app.component.<%= style %>']<% } %>
+  styleUrls: ['./app.component.<%= styleExt %>']<% } %>
 })
 export class AppComponent {
   title = '<%= name %>';
diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json
index b0245b8e7ca2..7ebf9f6ec4d8 100644
--- a/packages/schematics/angular/application/schema.json
+++ b/packages/schematics/angular/application/schema.json
@@ -54,9 +54,16 @@
       "alias": "p"
     },
     "style": {
-      "description": "The file extension to use for style files.",
+      "description": "The file extension or preprocessor to use for style files.",
       "type": "string",
-      "default": "css"
+      "default": "css",
+      "enum": [
+        "css",
+        "scss",
+        "sass",
+        "less",
+        "styl"
+      ]
     },
     "skipTests": {
       "description": "When true, does not create \"spec.ts\" test files for the app.",
diff --git a/packages/schematics/angular/class/index_spec.ts b/packages/schematics/angular/class/index_spec.ts
index 7408e6701551..09a211437d79 100644
--- a/packages/schematics/angular/class/index_spec.ts
+++ b/packages/schematics/angular/class/index_spec.ts
@@ -35,7 +35,6 @@ describe('Class Schematic', () => {
     inlineStyle: false,
     inlineTemplate: false,
     routing: false,
-    style: 'css',
     skipTests: false,
     skipPackageJson: false,
   };
diff --git a/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.__style__.template b/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.__styleExt__.template
similarity index 100%
rename from packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.__style__.template
rename to packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.__styleExt__.template
diff --git a/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template b/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template
index 05940077a7fb..b78148e8ed09 100644
--- a/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template
+++ b/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template
@@ -9,7 +9,7 @@ import { Component, OnInit<% if(!!viewEncapsulation) { %>, ViewEncapsulation<% }
   `,<% } else { %>
   templateUrl: './<%= dasherize(name) %>.component.html',<% } if(inlineStyle) { %>
   styles: []<% } else { %>
-  styleUrls: ['./<%= dasherize(name) %>.component.<%= style %>']<% } %><% if(!!viewEncapsulation) { %>,
+  styleUrls: ['./<%= dasherize(name) %>.component.<%= styleExt %>']<% } %><% if(!!viewEncapsulation) { %>,
   encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection !== 'Default') { %>,
   changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %>
 })
diff --git a/packages/schematics/angular/component/index.ts b/packages/schematics/angular/component/index.ts
index 24a399d4c738..fac77746a981 100644
--- a/packages/schematics/angular/component/index.ts
+++ b/packages/schematics/angular/component/index.ts
@@ -32,7 +32,7 @@ import { applyLintFix } from '../utility/lint-fix';
 import { parseName } from '../utility/parse-name';
 import { buildDefaultPath, getProject } from '../utility/project';
 import { validateHtmlSelector, validateName } from '../utility/validation';
-import { Schema as ComponentOptions } from './schema';
+import { Schema as ComponentOptions, Style } from './schema';
 
 function readIntoSourceFile(host: Tree, modulePath: string): ts.SourceFile {
   const text = host.read(modulePath);
@@ -145,9 +145,9 @@ export default function (options: ComponentOptions): Rule {
 
     // todo remove these when we remove the deprecations
     options.style = (
-      options.style && options.style !== 'css'
-        ? options.style : options.styleext
-    ) || 'css';
+      options.style && options.style !== Style.Css
+        ? options.style : options.styleext as Style
+    ) || Style.Css;
     options.skipTests = options.skipTests || !options.spec;
 
     validateName(options.name);
@@ -155,12 +155,13 @@ export default function (options: ComponentOptions): Rule {
 
     const templateSource = apply(url('./files'), [
       options.skipTests ? filter(path => !path.endsWith('.spec.ts.template')) : noop(),
-      options.inlineStyle ? filter(path => !path.endsWith('.__style__.template')) : noop(),
+      options.inlineStyle ? filter(path => !path.endsWith('.__styleExt__.template')) : noop(),
       options.inlineTemplate ? filter(path => !path.endsWith('.html.template')) : noop(),
       applyTemplates({
         ...strings,
         'if-flat': (s: string) => options.flat ? '' : s,
         ...options,
+        styleExt: styleToFileExtention(options.style),
       }),
       move(parsedPath.path),
     ]);
@@ -174,3 +175,12 @@ export default function (options: ComponentOptions): Rule {
     ]);
   };
 }
+
+export function styleToFileExtention(style: Style | undefined): string {
+  switch (style) {
+    case Style.Sass:
+      return 'scss';
+    default:
+      return style || 'css';
+  }
+}
diff --git a/packages/schematics/angular/component/index_spec.ts b/packages/schematics/angular/component/index_spec.ts
index f131c1212b8c..516f126c5005 100644
--- a/packages/schematics/angular/component/index_spec.ts
+++ b/packages/schematics/angular/component/index_spec.ts
@@ -10,7 +10,7 @@ import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/te
 import { Schema as ApplicationOptions } from '../application/schema';
 import { createAppModule } from '../utility/test';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
-import { ChangeDetection, Schema as ComponentOptions } from './schema';
+import { ChangeDetection, Schema as ComponentOptions, Style } from './schema';
 
 // tslint:disable:max-line-length
 describe('Component Schematic', () => {
@@ -24,7 +24,7 @@ describe('Component Schematic', () => {
     inlineStyle: false,
     inlineTemplate: false,
     changeDetection: ChangeDetection.Default,
-    style: 'css',
+    style: Style.Css,
     skipTests: false,
     module: undefined,
     export: false,
@@ -43,7 +43,7 @@ describe('Component Schematic', () => {
     inlineStyle: false,
     inlineTemplate: false,
     routing: false,
-    style: 'css',
+    style: Style.Css,
     skipTests: false,
     skipPackageJson: false,
   };
@@ -250,7 +250,16 @@ describe('Component Schematic', () => {
   });
 
   it('should respect the style option', () => {
-    const options = { ...defaultOptions, style: 'scss' };
+    const options = { ...defaultOptions, style: Style.Scss };
+    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
+    expect(content).toMatch(/styleUrls: \['.\/foo.component.scss/);
+    expect(tree.files).toContain('/projects/bar/src/app/foo/foo.component.scss');
+    expect(tree.files).not.toContain('/projects/bar/src/app/foo/foo.component.css');
+  });
+
+  it('should respect the style preprocessor option', () => {
+    const options = { ...defaultOptions, style: Style.Sass };
     const tree = schematicRunner.runSchematic('component', options, appTree);
     const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(content).toMatch(/styleUrls: \['.\/foo.component.scss/);
diff --git a/packages/schematics/angular/component/schema.json b/packages/schematics/angular/component/schema.json
index 52f76592833e..38edf1c884c4 100644
--- a/packages/schematics/angular/component/schema.json
+++ b/packages/schematics/angular/component/schema.json
@@ -73,9 +73,16 @@
       "x-deprecated": "Use \"style\" instead."
     },
     "style": {
-      "description": "The file extension to use for style files.",
+      "description": "The file extension or preprocessor to use for style files.",
       "type": "string",
-      "default": "css"
+      "default": "css",
+      "enum": [
+        "css",
+        "scss",
+        "sass",
+        "less",
+        "styl"
+      ]
     },
     "spec": {
       "type": "boolean",
diff --git a/packages/schematics/angular/enum/index_spec.ts b/packages/schematics/angular/enum/index_spec.ts
index ef1b03cf9478..e65376e93e03 100644
--- a/packages/schematics/angular/enum/index_spec.ts
+++ b/packages/schematics/angular/enum/index_spec.ts
@@ -32,7 +32,6 @@ describe('Enum Schematic', () => {
     inlineStyle: false,
     inlineTemplate: false,
     routing: false,
-    style: 'css',
     skipTests: false,
     skipPackageJson: false,
   };
diff --git a/packages/schematics/angular/interface/index_spec.ts b/packages/schematics/angular/interface/index_spec.ts
index d64a823c18cb..3d9cdde7f9bf 100644
--- a/packages/schematics/angular/interface/index_spec.ts
+++ b/packages/schematics/angular/interface/index_spec.ts
@@ -34,7 +34,6 @@ describe('Interface Schematic', () => {
     inlineStyle: false,
     inlineTemplate: false,
     routing: false,
-    style: 'css',
     skipTests: false,
     skipPackageJson: false,
   };
diff --git a/packages/schematics/angular/module/index_spec.ts b/packages/schematics/angular/module/index_spec.ts
index f934f2dba520..c7911bfc877e 100644
--- a/packages/schematics/angular/module/index_spec.ts
+++ b/packages/schematics/angular/module/index_spec.ts
@@ -34,7 +34,6 @@ describe('Module Schematic', () => {
     inlineStyle: false,
     inlineTemplate: false,
     routing: false,
-    style: 'css',
     skipTests: false,
     skipPackageJson: false,
   };
diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
index 7d0abced615a..26f354730b6e 100644
--- a/packages/schematics/angular/ng-new/schema.json
+++ b/packages/schematics/angular/ng-new/schema.json
@@ -111,15 +111,22 @@
       "alias": "p"
     },
     "style": {
-      "description": "The file extension to use for style files.",
+      "description": "The file extension or preprocessor to use for style files.",
       "type": "string",
       "default": "css",
+      "enum": [
+        "css",
+        "scss",
+        "sass",
+        "less",
+        "styl"
+      ],
       "x-prompt": {
         "message": "Which stylesheet format would you like to use?",
         "type": "list",
         "items": [
           { "value": "css", "label": "CSS" },
-          { "value": "scss", "label": "Sass   [ http://sass-lang.com   ]" },
+          { "value": "sass", "label": "Sass   [ http://sass-lang.com   ]" },
           { "value": "less", "label": "Less   [ http://lesscss.org     ]" },
           { "value": "styl", "label": "Stylus [ http://stylus-lang.com ]" }
         ]
diff --git a/packages/schematics/angular/pipe/index_spec.ts b/packages/schematics/angular/pipe/index_spec.ts
index 7872dd04f799..88667807e321 100644
--- a/packages/schematics/angular/pipe/index_spec.ts
+++ b/packages/schematics/angular/pipe/index_spec.ts
@@ -37,7 +37,6 @@ describe('Pipe Schematic', () => {
     inlineStyle: false,
     inlineTemplate: false,
     routing: false,
-    style: 'css',
     skipTests: false,
     skipPackageJson: false,
   };
diff --git a/packages/schematics/angular/service-worker/index_spec.ts b/packages/schematics/angular/service-worker/index_spec.ts
index 0c9dfe3a52e2..9fdea0520bfa 100644
--- a/packages/schematics/angular/service-worker/index_spec.ts
+++ b/packages/schematics/angular/service-worker/index_spec.ts
@@ -35,7 +35,6 @@ describe('Service Worker Schematic', () => {
     inlineStyle: false,
     inlineTemplate: false,
     routing: false,
-    style: 'css',
     skipTests: false,
     skipPackageJson: false,
   };
diff --git a/packages/schematics/angular/universal/index_spec.ts b/packages/schematics/angular/universal/index_spec.ts
index dd0f00759778..e91de58f7e66 100644
--- a/packages/schematics/angular/universal/index_spec.ts
+++ b/packages/schematics/angular/universal/index_spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
-import { Schema as ApplicationOptions } from '../application/schema';
+import { Schema as ApplicationOptions, Style } from '../application/schema';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { Schema as UniversalOptions } from './schema';
 
@@ -33,7 +33,7 @@ describe('Universal Schematic', () => {
     inlineStyle: false,
     inlineTemplate: false,
     routing: false,
-    style: 'css',
+    style: Style.Css,
     skipTests: false,
     skipPackageJson: false,
   };
@@ -44,7 +44,7 @@ describe('Universal Schematic', () => {
     inlineStyle: false,
     inlineTemplate: false,
     routing: false,
-    style: 'css',
+    style: Style.Css,
     skipTests: false,
     skipPackageJson: false,
   };

From a6102b2d5075a1581acf07616215bce933d2d6a4 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 18 Jan 2019 08:48:15 +0100
Subject: [PATCH 0649/1703] build: pin typescript and webpack

Pin these two dependencies so that Renovate can succesfully update all these within the monorepo at once without the need of any manual interventation
---
 package.json                                  |  2 +-
 .../build_optimizer/package.json              |  2 +-
 .../angular_devkit/build_webpack/package.json |  2 +-
 packages/ngtools/webpack/package.json         |  4 +-
 yarn.lock                                     | 44 ++++++++++++++++---
 5 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index dcae2a127d2d..bcb8584a444d 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "quicktype-core": "^6.0.15",
     "temp": "^0.9.0",
     "tslint": "^5.11.0",
-    "typescript": "~3.2.2"
+    "typescript": "3.2.4"
   },
   "devDependencies": {
     "@angular/compiler": "^7.2.0-rc.0",
diff --git a/packages/angular_devkit/build_optimizer/package.json b/packages/angular_devkit/build_optimizer/package.json
index 4ce4f5b20423..f4d03306a700 100644
--- a/packages/angular_devkit/build_optimizer/package.json
+++ b/packages/angular_devkit/build_optimizer/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "loader-utils": "1.2.3",
     "source-map": "0.5.6",
-    "typescript": "3.2.2",
+    "typescript": "3.2.4",
     "webpack-sources": "1.3.0"
   }
 }
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index 0d2788e7924d..f92efc318da7 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -15,7 +15,7 @@
     "webpack-dev-server": "^3.1.4"
   },
   "devDependencies": {
-    "webpack": "^4.6.0",
+    "webpack": "4.28.4",
     "webpack-dev-server": "^3.1.4"
   }
 }
\ No newline at end of file
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index da300a3bbabb..c4f9462de14c 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -35,7 +35,7 @@
   "devDependencies": {
     "@angular/compiler": "^7.2.0-rc.0",
     "@angular/compiler-cli": "^7.2.0-rc.0",
-    "typescript": "~3.2.2",
-    "webpack": "^4.0.0"
+    "typescript": "3.2.4",
+    "webpack": "4.28.4"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 1ea9d8334b3e..803d930acada 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6170,11 +6170,6 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-material-design-icons@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/material-design-icons/-/material-design-icons-3.0.1.tgz#9a71c48747218ebca51e51a66da682038cdcb7bf"
-  integrity sha1-mnHEh0chjrylHlGmbaaCA4zct78=
-
 math-random@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
@@ -10060,11 +10055,16 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@3.2.2, typescript@~3.2.2:
+typescript@3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.2.tgz#fe8101c46aa123f8353523ebdcf5730c2ae493e5"
   integrity sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==
 
+typescript@3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d"
+  integrity sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==
+
 uglify-js@^3.0.7, uglify-js@^3.1.4:
   version "3.4.9"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
@@ -10513,7 +10513,37 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.28.4, webpack@^4.0.0, webpack@^4.6.0:
+webpack@4.28.4:
+  version "4.28.4"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.28.4.tgz#1ddae6c89887d7efb752adf0c3cd32b9b07eacd0"
+  integrity sha512-NxjD61WsK/a3JIdwWjtIpimmvE6UrRi3yG54/74Hk9rwNj5FPkA4DJCf1z4ByDWLkvZhTZE+P3C/eh6UD5lDcw==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-module-context" "1.7.11"
+    "@webassemblyjs/wasm-edit" "1.7.11"
+    "@webassemblyjs/wasm-parser" "1.7.11"
+    acorn "^5.6.2"
+    acorn-dynamic-import "^3.0.0"
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+    chrome-trace-event "^1.0.0"
+    enhanced-resolve "^4.1.0"
+    eslint-scope "^4.0.0"
+    json-parse-better-errors "^1.0.2"
+    loader-runner "^2.3.0"
+    loader-utils "^1.1.0"
+    memory-fs "~0.4.1"
+    micromatch "^3.1.8"
+    mkdirp "~0.5.0"
+    neo-async "^2.5.0"
+    node-libs-browser "^2.0.0"
+    schema-utils "^0.4.4"
+    tapable "^1.1.0"
+    terser-webpack-plugin "^1.1.0"
+    watchpack "^1.5.0"
+    webpack-sources "^1.3.0"
+
+webpack@4.28.4:
   version "4.28.4"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.28.4.tgz#1ddae6c89887d7efb752adf0c3cd32b9b07eacd0"
   integrity sha512-NxjD61WsK/a3JIdwWjtIpimmvE6UrRi3yG54/74Hk9rwNj5FPkA4DJCf1z4ByDWLkvZhTZE+P3C/eh6UD5lDcw==

From abe6c8d95286e3321559a372c58d147bb5d52fd1 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 18 Jan 2019 20:57:34 +0100
Subject: [PATCH 0650/1703] docs: new GitHub Issue templates (#13461)

These templates take advatange of github's feature that allows
us to define multiple templates anand whyd which the UI presents to the
user similar to the one in Angular/Angular.
---
 .github/ISSUE_TEMPLATE.md                     | 58 ++------------
 .github/ISSUE_TEMPLATE/1-bug-report.md        | 80 +++++++++++++++++++
 .github/ISSUE_TEMPLATE/2-feature-request.md   | 49 ++++++++++++
 .github/ISSUE_TEMPLATE/3-docs-bug.md          | 13 +++
 .../4-security-issue-disclosure.md            | 11 +++
 .github/ISSUE_TEMPLATE/5-support-request.md   | 16 ++++
 .github/ISSUE_TEMPLATE/6-angular-framework.md | 13 +++
 .github/ISSUE_TEMPLATE/7-angular-material.md  | 13 +++
 8 files changed, 201 insertions(+), 52 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/1-bug-report.md
 create mode 100644 .github/ISSUE_TEMPLATE/2-feature-request.md
 create mode 100644 .github/ISSUE_TEMPLATE/3-docs-bug.md
 create mode 100644 .github/ISSUE_TEMPLATE/4-security-issue-disclosure.md
 create mode 100644 .github/ISSUE_TEMPLATE/5-support-request.md
 create mode 100644 .github/ISSUE_TEMPLATE/6-angular-framework.md
 create mode 100644 .github/ISSUE_TEMPLATE/7-angular-material.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 524740f30080..b5135def5125 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,56 +1,10 @@
-<!--
-IF YOU DON'T FILL OUT THE FOLLOWING INFORMATION YOUR ISSUE MIGHT BE CLOSED WITHOUT INVESTIGATING
--->
-### Bug Report or Feature Request (mark with an `x`)
-```
-- [ ] bug report -> please search issues before submitting
-- [ ] feature request
-```
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
 
-### Command (mark with an `x`)
-```
-- [ ] new
-- [ ] build
-- [ ] serve
-- [ ] test
-- [ ] e2e
-- [ ] generate
-- [ ] add
-- [ ] update
-- [ ] lint
-- [ ] xi18n
-- [ ] run
-- [ ] config
-- [ ] help
-- [ ] version
-- [ ] doc
-```
+Please help us process issues more efficiently by filing an
+issue using one of the following templates:
 
-### Versions
-<!--
-Output from: `node --version`, `npm --version` and `ng --version`.
-  Windows (7/8/10). Linux (incl. distribution). macOS (El Capitan? Sierra? High Sierra?)
--->
+https://github.com/angular/angular-cli/issues/new/choose
 
+Thank you!
 
-### Repro steps
-<!--
-Simple steps to reproduce this bug.
-Please include: commands run (incl args), packages added, related code changes.
-A link to a sample repo would help too.
--->
-
-
-### The log given by the failure
-<!-- Normally this include a stack trace and some more information. -->
-
-
-### Desired functionality
-<!--
-What would like to see implemented?
-What is the usecase?
--->
-
-
-### Mention any other details that might be useful
-<!-- Please include a link to the repo if this is related to an OSS project. -->
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.md b/.github/ISSUE_TEMPLATE/1-bug-report.md
new file mode 100644
index 000000000000..c25ee3a88f66
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/1-bug-report.md
@@ -0,0 +1,80 @@
+---
+name: "\U0001F41EBug report"
+about: Report a bug in Angular CLI
+---
+<!--🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅
+
+Oh hi there! 😄
+
+To expedite issue processing please search open and closed issues before submitting a new one.
+Existing issues often contain information about workarounds, resolution, or progress updates.
+
+🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅-->
+
+
+# 🐞 Bug report
+
+### Command (mark with an `x`)
+<!-- Can you pin-point the command or commands that are effected by this bug? -->
+<!-- ✍️edit: -->
+```
+- [ ] new
+- [ ] build
+- [ ] serve
+- [ ] test
+- [ ] e2e
+- [ ] generate
+- [ ] add
+- [ ] update
+- [ ] lint
+- [ ] xi18n
+- [ ] run
+- [ ] config
+- [ ] help
+- [ ] version
+- [ ] doc
+```
+
+### Is this a regression?
+
+<!-- Did this behavior use to work in the previous version? -->
+<!-- ✍️--> Yes, the previous version in which this bug was not present was: ....
+
+
+### Description
+
+<!-- ✍️--> A clear and concise description of the problem...
+
+
+## 🔬 Minimal Reproduction
+<!--
+Simple steps to reproduce this bug.
+
+Please include: commands run (including args), packages added, related code changes.
+
+If reproduction steps are not enough for reproduction of your issue, please create a minimal GitHub repository with the reproduction of the issue. Share the link to the repo below along with step-by-step instructions to reproduce the problem, as well as expected and actual behavior.
+
+Issues that don't have enough info and can't be reproduced will be closed.
+
+You can read more about issue submission guidelines here: https://github.com/angular/angular-cli/blob/master/CONTRIBUTING.md#-submitting-an-issue
+-->
+
+## 🔥 Exception or Error
+<pre><code>
+<!-- If the issue is accompanied by an exception or an error, please share it below: -->
+<!-- ✍️-->
+
+</code></pre>
+
+
+## 🌍 Your Environment
+<pre><code>
+<!-- run `ng version` and paste output below -->
+<!-- ✍️-->
+
+</code></pre>
+
+**Anything else relevant?**
+<!-- ✍️Is this a browser specific issue? If so, please specify the browser and version. -->
+
+<!-- ✍️Do any of these matter: operating system, IDE, package manager, HTTP server, ...? If so, please mention it below. -->
diff --git a/.github/ISSUE_TEMPLATE/2-feature-request.md b/.github/ISSUE_TEMPLATE/2-feature-request.md
new file mode 100644
index 000000000000..4c8292f45157
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2-feature-request.md
@@ -0,0 +1,49 @@
+---
+name: "\U0001F680Feature request"
+about: Suggest a feature for Angular CLI
+
+---
+<!--🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅
+
+Oh hi there! 😄
+
+To expedite issue processing please search open and closed issues before submitting a new one.
+Existing issues often contain information about workarounds, resolution, or progress updates.
+
+🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅-->
+
+
+# 🚀 Feature request
+
+
+### Command (mark with an `x`)
+<!-- Can you pin-point the command or commands that are relevant for this feature request? -->
+<!-- ✍️edit: -->
+```
+- [ ] new
+- [ ] build
+- [ ] serve
+- [ ] test
+- [ ] e2e
+- [ ] generate
+- [ ] add
+- [ ] update
+- [ ] lint
+- [ ] xi18n
+- [ ] run
+- [ ] config
+- [ ] help
+- [ ] version
+- [ ] doc
+```
+
+### Description
+<!-- ✍️--> A clear and concise description of the problem or missing capability...
+
+
+### Describe the solution you'd like
+<!-- ✍️--> If you have a solution in mind, please describe it.
+
+
+### Describe alternatives you've considered
+<!-- ✍️--> Have you considered any alternative solutions or workarounds?
diff --git a/.github/ISSUE_TEMPLATE/3-docs-bug.md b/.github/ISSUE_TEMPLATE/3-docs-bug.md
new file mode 100644
index 000000000000..7cd9ec28753a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/3-docs-bug.md
@@ -0,0 +1,13 @@
+---
+name: "📚 Docs or angular.io issue report"
+about: Report an issue in Angular's documentation or angular.io application
+
+---
+
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
+
+Please file any Docs or angular.io issues at: https://github.com/angular/angular/issues/new/choose
+
+For the time being, we keep Angular AIO issues in a separate repository.
+
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
diff --git a/.github/ISSUE_TEMPLATE/4-security-issue-disclosure.md b/.github/ISSUE_TEMPLATE/4-security-issue-disclosure.md
new file mode 100644
index 000000000000..b789da9f6da1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/4-security-issue-disclosure.md
@@ -0,0 +1,11 @@
+---
+name: ⚠️Security issue disclosure
+about: Report a security issue in Angular Framework, Material, or CLI
+
+---
+
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
+
+Please read https://angular.io/guide/security#report-issues on how to disclose security related issues.
+
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
diff --git a/.github/ISSUE_TEMPLATE/5-support-request.md b/.github/ISSUE_TEMPLATE/5-support-request.md
new file mode 100644
index 000000000000..f6e6e66ff893
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/5-support-request.md
@@ -0,0 +1,16 @@
+---
+name: "❓Support request"
+about: Questions and requests for support
+
+---
+
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
+
+Please do not file questions or support requests on the GitHub issues tracker.
+
+You can get your questions answered using other communication channels. Please see: 
+https://github.com/angular/angular-cli/blob/master/CONTRIBUTING.md#question
+
+Thank you!
+
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
diff --git a/.github/ISSUE_TEMPLATE/6-angular-framework.md b/.github/ISSUE_TEMPLATE/6-angular-framework.md
new file mode 100644
index 000000000000..8a689c55de35
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/6-angular-framework.md
@@ -0,0 +1,13 @@
+---
+name: "⚡Angular Framework"
+about: Issues and feature requests for Angular Framework
+
+---
+
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
+
+Please file any Angular Framework issues at: https://github.com/angular/angular/issues/new/choose
+
+For the time being, we keep Angular issues in a separate repository.
+
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
diff --git a/.github/ISSUE_TEMPLATE/7-angular-material.md b/.github/ISSUE_TEMPLATE/7-angular-material.md
new file mode 100644
index 000000000000..b023135b0cc5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/7-angular-material.md
@@ -0,0 +1,13 @@
+---
+name: "\U0001F48EAngular Material"
+about: Issues and feature requests for Angular Material
+
+---
+
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
+
+Please file any Angular Material issues at: https://github.com/angular/material2/issues/new
+
+For the time being, we keep Angular Material issues in a separate repository.
+
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑

From 1d87ff9ab2bb9dd949d9a61e20f38941f7ae24af Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 17 Jan 2019 11:48:32 +0000
Subject: [PATCH 0651/1703] build: update webpack-dev-middleware to version
 3.5.1

---
 packages/angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                          | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index be432e3234b1..ccbd82a69239 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -46,7 +46,7 @@
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.2.1",
     "webpack": "4.28.4",
-    "webpack-dev-middleware": "3.5.0",
+    "webpack-dev-middleware": "3.5.1",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.2.1",
     "webpack-sources": "1.3.0",
diff --git a/yarn.lock b/yarn.lock
index 803d930acada..5f6ad771095f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5598,8 +5598,9 @@ karma-sourcemap-loader@0.3.7:
   dependencies:
     graceful-fs "^4.1.2"
 
-"karma@github:alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a":
+karma@alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a:
   version "1.7.1"
+  uid fa1a84ac881485b5657cb669e9b4e5da77b79f0a
   resolved "https://codeload.github.com/alexeagle/karma/tar.gz/fa1a84ac881485b5657cb669e9b4e5da77b79f0a"
   dependencies:
     bluebird "^3.3.0"
@@ -10403,10 +10404,10 @@ webpack-dev-middleware@3.4.0:
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
-webpack-dev-middleware@3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.5.0.tgz#fff0a07b0461314fb6ca82df3642c2423f768429"
-  integrity sha512-1Zie7+dMr4Vv3nGyhr8mxGQkzTQK1PTS8K3yJ4yB1mfRGwO1DzQibgmNfUqbEfQY6eEtEEUzC+o7vhpm/Sfn5w==
+webpack-dev-middleware@3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.5.1.tgz#9265b7742ef50f54f54c1d9af022fc17c1be9b88"
+  integrity sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==
   dependencies:
     memory-fs "~0.4.1"
     mime "^2.3.1"

From 44a415be47e611262bafdfc6da0fbe2d2e7d43e3 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Tue, 15 Jan 2019 10:36:32 -0800
Subject: [PATCH 0652/1703] build: add Alan to the mailmap file

He uses many addresses and some of his computers are not configured
properly :P
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index bf8640d5dec9..d10bc39a19a7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -16,6 +16,8 @@ Charles Lyding <clydin@users.noreply.github.com>
     Charles Lyding <clydin@users.noreply.github.com> <19598772+clydin@users.noreply.github.com>
 Filipe Silva <filipematossilva@gmail.com>
 Mike Brocchi <mbrocchi@gmail.com>
+Alan Agius <alan.agius4@users.noreply.github.com>
+    Alan Agius <alan.agius4@users.noreply.github.com> <alan.agius4@gmail.com> <alan.agius@betssongroup.com>
 
 
 ################################################################################

From 07ceb05985043f85142ac4462e5a1279c9bb5a3b Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Fri, 18 Jan 2019 13:32:34 +0000
Subject: [PATCH 0653/1703] fix(@angular-devkit/build-optimizer): prefix
 renamed classes

Module concatenation may rename classes with the same name. The renaming logic is specific to the bundler so we can't really foresee it.

But the fact remains that the inner function declaration doesn't need to have the same name as the outer one.
---
 .../src/transforms/prefix-classes.ts          |  9 ++-------
 .../src/transforms/prefix-classes_spec.ts     | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts b/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts
index 3535cbf7cfaf..cc8797d7751a 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts
@@ -11,7 +11,7 @@ import * as ts from 'typescript';
  * @deprecated From 0.9.0
  */
 export function testPrefixClasses(content: string) {
-  const exportVarSetter = /(?:export )?(?:var|const)\s+(\S+)\s*=\s*/;
+  const exportVarSetter = /(?:export )?(?:var|const)\s+(?:\S+)\s*=\s*/;
   const multiLineComment = /\s*(?:\/\*[\s\S]*?\*\/)?\s*/;
   const newLine = /\s*\r?\n\s*/;
 
@@ -22,7 +22,7 @@ export function testPrefixClasses(content: string) {
       /\(/, multiLineComment,
       /\s*function \(\) {/, newLine,
       multiLineComment,
-      /function \1\([^\)]*\) \{/, newLine,
+      /function (?:\S+)\([^\)]*\) \{/, newLine,
     ],
     [
       /^/,
@@ -142,9 +142,6 @@ function isDownleveledClass(node: ts.Node): boolean {
     return false;
   }
 
-  // The variable name should be the class name.
-  const className = variableDeclaration.name.text;
-
   const firstStatement = functionStatements[0];
 
   // find return statement - may not be last statement
@@ -166,7 +163,6 @@ function isDownleveledClass(node: ts.Node): boolean {
     // potential non-extended class or wrapped es2015 class
     return (ts.isFunctionDeclaration(firstStatement) || ts.isClassDeclaration(firstStatement))
            && firstStatement.name !== undefined
-           && firstStatement.name.text === className
            && returnStatement.expression.text === firstStatement.name.text;
   } else if (functionExpression.parameters.length !== 1) {
     return false;
@@ -216,6 +212,5 @@ function isDownleveledClass(node: ts.Node): boolean {
 
   return ts.isFunctionDeclaration(secondStatement)
          && secondStatement.name !== undefined
-         && className.endsWith(secondStatement.name.text)
          && returnStatement.expression.text === secondStatement.name.text;
 }
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes_spec.ts
index 211b0175aa4c..d8b92f70ee77 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes_spec.ts
@@ -173,6 +173,26 @@ describe('prefix-classes', () => {
     expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
   });
 
+  it('prefix TS 2.5 - 2.6 renamed downlevel class', () => {
+    const input = tags.stripIndent`
+      var ComponentFactoryResolver$1 = /** @class */ (function () {
+        function ComponentFactoryResolver$$1() {
+        }
+        return ComponentFactoryResolver$$1;
+      }());
+    `;
+    const output = tags.stripIndent`
+      var ComponentFactoryResolver$1 = /** @class */ /*@__PURE__*/ (function () {
+        function ComponentFactoryResolver$$1() {
+        }
+        return ComponentFactoryResolver$$1;
+      }());
+    `;
+
+    expect(testPrefixClasses(input)).toBeTruthy();
+    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+  });
+
   it('prefix TS 2.5 - 2.6 downlevel class with static variable', () => {
     const input = tags.stripIndent`
       var StaticTestCase = /** @class */ (function () {

From 6f8c336346e921ea0ca66f574267f69c9ef0c479 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Fri, 18 Jan 2019 15:43:46 +0000
Subject: [PATCH 0654/1703] fix(@angular-devkit/build-optimizer): identify
 relative imports in angular core

Build optimizer was broken for non-FESM files inside @angular/core because it couldn't identify relative imports were still inside core.

This change adds a known list of angular core files as a default, and also allows passing in a override.
---
 .../build_optimizer/src/_golden-api.d.ts      |  2 +
 .../src/build-optimizer/build-optimizer.ts    | 34 +++++++++++--
 .../src/build-optimizer/rollup-plugin.ts      |  5 +-
 .../build_optimizer/src/index.ts              |  6 ++-
 .../src/transforms/scrub-file.ts              | 51 ++++++++++++++-----
 .../src/transforms/scrub-file_spec.ts         | 49 +++++++++++++++++-
 6 files changed, 127 insertions(+), 20 deletions(-)

diff --git a/etc/api/angular_devkit/build_optimizer/src/_golden-api.d.ts b/etc/api/angular_devkit/build_optimizer/src/_golden-api.d.ts
index e3e9a7ef1a8d..efd778ab0f9e 100644
--- a/etc/api/angular_devkit/build_optimizer/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/build_optimizer/src/_golden-api.d.ts
@@ -12,6 +12,8 @@ export declare function getPrefixFunctionsTransformer(): ts.TransformerFactory<t
 
 export declare function getScrubFileTransformer(program: ts.Program): ts.TransformerFactory<ts.SourceFile>;
 
+export declare function getScrubFileTransformerForCore(program: ts.Program): ts.TransformerFactory<ts.SourceFile>;
+
 export declare function getWrapEnumsTransformer(): ts.TransformerFactory<ts.SourceFile>;
 
 export declare function testImportTslib(content: string): boolean;
diff --git a/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer.ts b/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer.ts
index 13e69da33d83..2ca30df2b7af 100644
--- a/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer.ts
+++ b/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer.ts
@@ -15,7 +15,11 @@ import { getFoldFileTransformer } from '../transforms/class-fold';
 import { getImportTslibTransformer, testImportTslib } from '../transforms/import-tslib';
 import { getPrefixClassesTransformer, testPrefixClasses } from '../transforms/prefix-classes';
 import { getPrefixFunctionsTransformer } from '../transforms/prefix-functions';
-import { getScrubFileTransformer, testScrubFile } from '../transforms/scrub-file';
+import {
+  getScrubFileTransformer,
+  getScrubFileTransformerForCore,
+  testScrubFile,
+} from '../transforms/scrub-file';
 import { getWrapEnumsTransformer } from '../transforms/wrap-enums';
 
 
@@ -44,6 +48,18 @@ const ngFactories = [
   /\.ngstyle\.[jt]s/,
 ];
 
+// Known locations for the source files of @angular/core.
+const coreFilesRegex = [
+  /[\\/]node_modules[\\/]@angular[\\/]core[\\/]esm5[\\/]/,
+  /[\\/]node_modules[\\/]@angular[\\/]core[\\/]fesm5[\\/]/,
+  /[\\/]node_modules[\\/]@angular[\\/]core[\\/]esm2015[\\/]/,
+  /[\\/]node_modules[\\/]@angular[\\/]core[\\/]fesm2015[\\/]/,
+];
+
+function isKnownCoreFile(filePath: string) {
+  return coreFilesRegex.some(re => re.test(filePath));
+}
+
 function isKnownSideEffectFree(filePath: string) {
   return ngFactories.some((re) => re.test(filePath)) ||
     whitelistedAngularModules.some((re) => re.test(filePath));
@@ -57,11 +73,12 @@ export interface BuildOptimizerOptions {
   emitSourceMap?: boolean;
   strict?: boolean;
   isSideEffectFree?: boolean;
+  isAngularCoreFile?: boolean;
 }
 
 export function buildOptimizer(options: BuildOptimizerOptions): TransformJavascriptOutput {
 
-  const { inputFilePath } = options;
+  const { inputFilePath, isAngularCoreFile } = options;
   let { originalFilePath, content } = options;
 
   if (!originalFilePath && inputFilePath) {
@@ -84,6 +101,15 @@ export function buildOptimizer(options: BuildOptimizerOptions): TransformJavascr
     };
   }
 
+  let selectedGetScrubFileTransformer = getScrubFileTransformer;
+
+  if (
+    isAngularCoreFile === true ||
+    (isAngularCoreFile === undefined && originalFilePath && isKnownCoreFile(originalFilePath))
+  ) {
+    selectedGetScrubFileTransformer = getScrubFileTransformerForCore;
+  }
+
   const isWebpackBundle = content.indexOf('__webpack_require__') !== -1;
 
   // Determine which transforms to apply.
@@ -97,14 +123,14 @@ export function buildOptimizer(options: BuildOptimizerOptions): TransformJavascr
       // We only apply it to whitelisted modules, since we know they are safe.
       // getPrefixFunctionsTransformer needs to be before getFoldFileTransformer.
       getPrefixFunctionsTransformer,
-      getScrubFileTransformer,
+      selectedGetScrubFileTransformer,
       getFoldFileTransformer,
     );
     typeCheck = true;
   } else if (testScrubFile(content)) {
     // Always test as these require the type checker
     getTransforms.push(
-      getScrubFileTransformer,
+      selectedGetScrubFileTransformer,
       getFoldFileTransformer,
     );
     typeCheck = true;
diff --git a/packages/angular_devkit/build_optimizer/src/build-optimizer/rollup-plugin.ts b/packages/angular_devkit/build_optimizer/src/build-optimizer/rollup-plugin.ts
index 54742407e872..29b85fd7ceb9 100644
--- a/packages/angular_devkit/build_optimizer/src/build-optimizer/rollup-plugin.ts
+++ b/packages/angular_devkit/build_optimizer/src/build-optimizer/rollup-plugin.ts
@@ -20,6 +20,7 @@ const DEBUG = false;
 
 export interface Options {
   sideEffectFreeModules?: string[];
+  angularCoreModules?: string[];
 }
 
 export default function optimizer(options: Options) {
@@ -34,8 +35,10 @@ export default function optimizer(options: Options) {
       const normalizedId = id.replace(/\\/g, '/');
       const isSideEffectFree = options.sideEffectFreeModules &&
         options.sideEffectFreeModules.some(m => normalizedId.indexOf(m) >= 0);
+      const isAngularCoreFile = options.angularCoreModules &&
+        options.angularCoreModules.some(m => normalizedId.indexOf(m) >= 0);
       const { content: code, sourceMap: map } = buildOptimizer({
-        content, inputFilePath: id, emitSourceMap: true, isSideEffectFree,
+        content, inputFilePath: id, emitSourceMap: true, isSideEffectFree, isAngularCoreFile,
       });
       if (!code) {
         if (DEBUG) {
diff --git a/packages/angular_devkit/build_optimizer/src/index.ts b/packages/angular_devkit/build_optimizer/src/index.ts
index 1cc3bda13f17..56f62c1f4b56 100644
--- a/packages/angular_devkit/build_optimizer/src/index.ts
+++ b/packages/angular_devkit/build_optimizer/src/index.ts
@@ -14,5 +14,9 @@ export { getFoldFileTransformer } from './transforms/class-fold';
 export { getImportTslibTransformer, testImportTslib } from './transforms/import-tslib';
 export { getPrefixClassesTransformer, testPrefixClasses } from './transforms/prefix-classes';
 export { getPrefixFunctionsTransformer } from './transforms/prefix-functions';
-export { getScrubFileTransformer, testScrubFile } from './transforms/scrub-file';
+export {
+  getScrubFileTransformer,
+  getScrubFileTransformerForCore,
+  testScrubFile,
+} from './transforms/scrub-file';
 export { getWrapEnumsTransformer } from './transforms/wrap-enums';
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/scrub-file.ts b/packages/angular_devkit/build_optimizer/src/transforms/scrub-file.ts
index 2f89eb1336d4..6ddb861be181 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/scrub-file.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/scrub-file.ts
@@ -50,13 +50,21 @@ const angularSpecifiers = [
 ];
 
 export function getScrubFileTransformer(program: ts.Program): ts.TransformerFactory<ts.SourceFile> {
-  const checker = program.getTypeChecker();
+  return scrubFileTransformer(program.getTypeChecker(), false);
+}
+
+export function getScrubFileTransformerForCore(
+  program: ts.Program,
+): ts.TransformerFactory<ts.SourceFile> {
+  return scrubFileTransformer(program.getTypeChecker(), true);
+}
 
+function scrubFileTransformer(checker: ts.TypeChecker, isAngularCoreFile: boolean) {
   return (context: ts.TransformationContext): ts.Transformer<ts.SourceFile> => {
 
     const transformer: ts.Transformer<ts.SourceFile> = (sf: ts.SourceFile) => {
 
-      const ngMetadata = findAngularMetadata(sf);
+      const ngMetadata = findAngularMetadata(sf, isAngularCoreFile);
       const tslibImports = findTslibImports(sf);
 
       const nodes: ts.Node[] = [];
@@ -116,22 +124,27 @@ function nameOfSpecifier(node: ts.ImportSpecifier): string {
   return node.name && node.name.text || '<unknown>';
 }
 
-function findAngularMetadata(node: ts.Node): ts.Node[] {
+function findAngularMetadata(node: ts.Node, isAngularCoreFile: boolean): ts.Node[] {
   let specs: ts.Node[] = [];
+  // Find all specifiers from imports of `@angular/core`.
   ts.forEachChild(node, (child) => {
     if (child.kind === ts.SyntaxKind.ImportDeclaration) {
       const importDecl = child as ts.ImportDeclaration;
-      if (isAngularCoreImport(importDecl)) {
+      if (isAngularCoreImport(importDecl, isAngularCoreFile)) {
         specs.push(...collectDeepNodes<ts.ImportSpecifier>(node, ts.SyntaxKind.ImportSpecifier)
           .filter((spec) => isAngularCoreSpecifier(spec)));
       }
     }
   });
 
-  const localDecl = findAllDeclarations(node)
-    .filter((decl) => angularSpecifiers.indexOf((decl.name as ts.Identifier).text) !== -1);
-  if (localDecl.length === angularSpecifiers.length) {
-    specs = specs.concat(localDecl);
+  // Check if the current module contains all know `@angular/core` specifiers.
+  // If it does, we assume it's a `@angular/core` FESM.
+  if (isAngularCoreFile) {
+    const localDecl = findAllDeclarations(node)
+      .filter((decl) => angularSpecifiers.indexOf((decl.name as ts.Identifier).text) !== -1);
+    if (localDecl.length === angularSpecifiers.length) {
+      specs = specs.concat(localDecl);
+    }
   }
 
   return specs;
@@ -154,11 +167,23 @@ function findAllDeclarations(node: ts.Node): ts.VariableDeclaration[] {
   return nodes;
 }
 
-function isAngularCoreImport(node: ts.ImportDeclaration): boolean {
-  return true &&
-    node.moduleSpecifier &&
-    node.moduleSpecifier.kind === ts.SyntaxKind.StringLiteral &&
-    (node.moduleSpecifier as ts.StringLiteral).text === '@angular/core';
+function isAngularCoreImport(node: ts.ImportDeclaration, isAngularCoreFile: boolean): boolean {
+  if (!(node.moduleSpecifier && ts.isStringLiteral(node.moduleSpecifier))) {
+    return false;
+  }
+  const importText = node.moduleSpecifier.text;
+
+  // Imports to `@angular/core` are always core imports.
+  if (importText === '@angular/core') {
+    return true;
+  }
+
+  // Relative imports from a Angular core file are also core imports.
+  if (isAngularCoreFile && (importText.startsWith('./') || importText.startsWith('../'))) {
+    return true;
+  }
+
+  return false;
 }
 
 function isAngularCoreSpecifier(node: ts.ImportSpecifier): boolean {
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/scrub-file_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/scrub-file_spec.ts
index f9bae119b78c..918924c751c8 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/scrub-file_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/scrub-file_spec.ts
@@ -9,11 +9,17 @@
 // tslint:disable-next-line:no-implicit-dependencies
 import { tags } from '@angular-devkit/core';
 import { transformJavascript } from '../helpers/transform-javascript';
-import { getScrubFileTransformer, testScrubFile } from './scrub-file';
+import {
+  getScrubFileTransformer,
+  getScrubFileTransformerForCore,
+  testScrubFile,
+} from './scrub-file';
 
 
 const transform = (content: string) => transformJavascript(
   { content, getTransforms: [getScrubFileTransformer], typeCheck: true }).content;
+const transformCore = (content: string) => transformJavascript(
+  { content, getTransforms: [getScrubFileTransformerForCore], typeCheck: true }).content;
 
 describe('scrub-file', () => {
   const clazz = 'var Clazz = (function () { function Clazz() { } return Clazz; }());';
@@ -289,6 +295,47 @@ describe('scrub-file', () => {
       expect(testScrubFile(input)).toBeTruthy();
       expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
     });
+
+    it('recognizes decorator imports in Angular core', () => {
+      const input = tags.stripIndent`
+        import * as tslib_1 from "tslib";
+        import { Injectable } from './di';
+        var Console = /** @class */ (function () {
+            function Console() {
+            }
+            Console.prototype.log = function (message) {
+                console.log(message);
+            };
+            Console.prototype.warn = function (message) {
+                console.warn(message);
+            };
+            Console = tslib_1.__decorate([
+                Injectable()
+            ], Console);
+            return Console;
+        }());
+        export { Console };
+      `;
+      const output = tags.stripIndent`
+        import * as tslib_1 from "tslib";
+        import { Injectable } from './di';
+        var Console = /** @class */ (function () {
+            function Console() {
+            }
+            Console.prototype.log = function (message) {
+                console.log(message);
+            };
+            Console.prototype.warn = function (message) {
+                console.warn(message);
+            };
+            return Console;
+        }());
+        export { Console };
+      `;
+
+      expect(testScrubFile(input)).toBeTruthy();
+      expect(tags.oneLine`${transformCore(input)}`).toEqual(tags.oneLine`${output}`);
+    });
   });
 
   describe('__metadata', () => {

From 5e9324f5eaafac55e7c6584e903241f95ac40018 Mon Sep 17 00:00:00 2001
From: Peter Smith <peterbutlersmith@gmail.com>
Date: Thu, 17 Jan 2019 13:52:53 -0500
Subject: [PATCH 0655/1703] docs(@angular-devkit/schematics): include npm link

---
 packages/angular_devkit/schematics/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/schematics/README.md b/packages/angular_devkit/schematics/README.md
index 9b9cb0ac35f7..76e9fa6e8f78 100644
--- a/packages/angular_devkit/schematics/README.md
+++ b/packages/angular_devkit/schematics/README.md
@@ -20,7 +20,7 @@ What distinguishes Schematics from other generators, such as Yeoman or Yarn Crea
 | **Sink**       | The final destination of all `Action`s. |
 
 # Tooling
-Schematics is a library, and does not work by itself. A [reference CLI](https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics_cli/bin/schematics.ts) is available on this repository, but is not published on NPM. This document explains the library usage and the tooling API, but does not go into the tool implementation itself.
+Schematics is a library, and does not work by itself. A [reference CLI](https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics_cli/bin/schematics.ts) is available on this repository, and is published on NPM at [@angular-devkit/schematics-cli](https://www.npmjs.com/package/@angular-devkit/schematics-cli). This document explains the library usage and the tooling API, but does not go into the tool implementation itself.
 
 The tooling is responsible for the following tasks:
 

From be3fa89dc3e73035466d6cc117d98e683919dc04 Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Wed, 16 Jan 2019 08:15:46 -0800
Subject: [PATCH 0656/1703] docs: highlight creating workspace without initial
 app

---
 packages/schematics/angular/ng-new/schema.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
index 26f354730b6e..3609fdff7d32 100644
--- a/packages/schematics/angular/ng-new/schema.json
+++ b/packages/schematics/angular/ng-new/schema.json
@@ -139,12 +139,12 @@
       "alias": "S"
     },
     "createApplication": {
-      "description": "When true (the default), creates a new initial app project in the new workspace.",
+      "description": "When true (the default), creates a new initial app project in the src folder of the new workspace. When false, creates an empty workspace with no initial app. You can then use the generate application command so that all apps are created in the projects folder.",
       "type": "boolean",
       "default": true
     },
     "minimal": {
-      "description": "When true, creates a project without any testing frameworks and should be used for learning purposes only.",
+      "description": "When true, creates a project without any testing frameworks. (Use for learning purposes only).",
       "type": "boolean",
       "default": false
     }

From 21894b714b6d0d4905120fbdce627d8683d6ba8b Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Wed, 16 Jan 2019 08:39:22 -0800
Subject: [PATCH 0657/1703] docs: add multi-app technique to ng new description

---
 packages/angular/cli/commands/new.md | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/angular/cli/commands/new.md b/packages/angular/cli/commands/new.md
index 64c30ae9582e..a11cac0c6d89 100644
--- a/packages/angular/cli/commands/new.md
+++ b/packages/angular/cli/commands/new.md
@@ -3,8 +3,14 @@ Creates and initializes a new Angular app that is the default project for a new
 Provides interactive prompts for optional configuration, such as adding routing support.
 All prompts can safely be allowed to default.
 
-* The new workspace folder is given the specified project name, and contains configuration files at the top level. 
+* The new workspace folder is given the specified project name, and contains configuration files at the top level.
 
-* The new app files are placed in the `src/` subfolder. A corresponding end-to-end test app is placed in the `e2e/` subfolder.
+* By default, the files for a new initial app (with the same name as the workspace) are placed in the `src/` subfolder. A corresponding end-to-end test app is placed in the `e2e/` subfolder.
 
-* The new app's configuration appears in the `projects` section of the `angular.json` workspace configuration file, under its project name.
\ No newline at end of file
+* The new app's configuration appears in the `projects` section of the `angular.json` workspace configuration file, under its project name.
+
+* Subsequent apps that you generate in the workspace reside in the `projects/` subfolder.
+
+If you plan to have multiple apps in the workspace, you can create an empty workspace by setting the `--createApplication` option to false.
+You can then use `ng generate application` to create an initial app.
+This allows a workspace name different from the initial app name, and ensures that all apps reside in the `/projects` subfolder, matching the structure of the configuration file.
\ No newline at end of file

From 3a4396580ee8745dfb6447568f3038d00132c4d0 Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Thu, 17 Jan 2019 09:29:07 -0800
Subject: [PATCH 0658/1703] docs: description of minimal option consistent
 across commands

---
 packages/schematics/angular/application/schema.json | 2 +-
 packages/schematics/angular/ng-new/schema.json      | 2 +-
 packages/schematics/angular/workspace/schema.json   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json
index 7ebf9f6ec4d8..8041d438a8aa 100644
--- a/packages/schematics/angular/application/schema.json
+++ b/packages/schematics/angular/application/schema.json
@@ -77,7 +77,7 @@
       "description": "When true, does not add dependencies to the \"package.json\" file."
     },
     "minimal": {
-      "description": "When true, creates a bare-bones project without any testing frameworks and should be used for learning purposes.",
+      "description": "When true, creates a bare-bones project without any testing frameworks. (Use for learning purposes only.)",
       "type": "boolean",
       "default": false
     },
diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
index 3609fdff7d32..e8dda08442cc 100644
--- a/packages/schematics/angular/ng-new/schema.json
+++ b/packages/schematics/angular/ng-new/schema.json
@@ -144,7 +144,7 @@
       "default": true
     },
     "minimal": {
-      "description": "When true, creates a project without any testing frameworks. (Use for learning purposes only).",
+      "description": "When true, creates a project without any testing frameworks. (Use for learning purposes only.)",
       "type": "boolean",
       "default": false
     }
diff --git a/packages/schematics/angular/workspace/schema.json b/packages/schematics/angular/workspace/schema.json
index 1728a64ca229..be507a3581b3 100644
--- a/packages/schematics/angular/workspace/schema.json
+++ b/packages/schematics/angular/workspace/schema.json
@@ -70,7 +70,7 @@
       }
     },
     "minimal": {
-      "description": "When true, creates a workspace without any testing frameworks and should be used for learning.",
+      "description": "When true, creates a workspace without any testing frameworks. (Use for learning purposes only.)",
       "type": "boolean",
       "default": false
     }

From caf1716fd7e2e3e58f82210f255463d62a3f48d6 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 16 Jan 2019 07:46:01 +0000
Subject: [PATCH 0659/1703] build: update postcss to version 7.0.13

---
 .../angular_devkit/build_angular/package.json   |  2 +-
 yarn.lock                                       | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index ccbd82a69239..4855a528e28d 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -29,7 +29,7 @@
     "minimatch": "3.0.4",
     "parse5": "4.0.0",
     "opn": "5.4.0",
-    "postcss": "7.0.11",
+    "postcss": "7.0.13",
     "postcss-import": "12.0.1",
     "postcss-loader": "3.0.0",
     "raw-loader": "1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 5f6ad771095f..9f8784d04c87 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7665,10 +7665,10 @@ postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.1:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss@7.0.11, postcss@^7.0.11:
-  version "7.0.11"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.11.tgz#f63c513b78026d66263bb2ca995bf02e3d1a697d"
-  integrity sha512-9AXb//5UcjeOEof9T+yPw3XTa5SL207ZOIC/lHYP4mbUTEh4M0rDAQekQpVANCZdwQwKhBtFZCk3i3h3h2hdWg==
+postcss@7.0.13:
+  version "7.0.13"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.13.tgz#42bf716413e8f1c786ab71dc6e722b3671b16708"
+  integrity sha512-h8SY6kQTd1wISHWjz+E6cswdhMuyBZRb16pSTv3W4zYZ3/YbyWeJdNUeOXB5IdZqE1U76OUEjjjqsC3z2f3hVg==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -7683,6 +7683,15 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
     source-map "^0.6.1"
     supports-color "^5.5.0"
 
+postcss@^7.0.11:
+  version "7.0.11"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.11.tgz#f63c513b78026d66263bb2ca995bf02e3d1a697d"
+  integrity sha512-9AXb//5UcjeOEof9T+yPw3XTa5SL207ZOIC/lHYP4mbUTEh4M0rDAQekQpVANCZdwQwKhBtFZCk3i3h3h2hdWg==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"

From 49133163e51205837dd1f23925244be8b637a211 Mon Sep 17 00:00:00 2001
From: isychevskyi <arhell333@gmail.com>
Date: Thu, 3 Jan 2019 11:30:46 +0200
Subject: [PATCH 0660/1703] style: remove copyright date

---
 etc/cli.angular.io/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/cli.angular.io/index.html b/etc/cli.angular.io/index.html
index 94cfc1373881..4fae95573ff8 100644
--- a/etc/cli.angular.io/index.html
+++ b/etc/cli.angular.io/index.html
@@ -126,7 +126,7 @@ <h4>Test, Lint, Format</h4>
                 </ul>
             </div>
             <div class="mdl-cell mdl-cell--9-col">
-                <p class="mdl-typography--font-light power-text"> Powered by Google ©2010-2016. Code licensed under an <a href="/license.html">MIT-style License</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.</p>
+                <p class="mdl-typography--font-light power-text"> Powered by Google. Code licensed under an <a href="/license.html">MIT-style License</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.</p>
             </div>
         </div>
     </div>

From 0563e96cd2719e0bcbf382ffb34dbbdb77a54dee Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 17 Jan 2019 12:52:21 -0500
Subject: [PATCH 0661/1703] feat(@angular-devkit/schematics): add
 `applyToSubTree` rule

This rule allows a group of rules to be applied to a scoped subdirectory of the current tree.
---
 .../schematics/src/_golden-api.d.ts           |  2 ++
 .../schematics/src/rules/base.ts              | 19 +++++++++++++++++
 .../schematics/src/rules/base_spec.ts         | 21 ++++++++++++++++++-
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/etc/api/angular_devkit/schematics/src/_golden-api.d.ts b/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
index f1137b3be8e1..8211253cbaab 100644
--- a/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
@@ -30,6 +30,8 @@ export declare function applyPathTemplate<T extends PathTemplateData>(data: T, o
 
 export declare function applyTemplates<T>(options: T): Rule;
 
+export declare function applyToSubtree(path: string, rules: Rule[]): Rule;
+
 export declare function asSource(rule: Rule): Source;
 
 export declare type AsyncFileOperator = (tree: FileEntry) => Observable<FileEntry | null>;
diff --git a/packages/angular_devkit/schematics/src/rules/base.ts b/packages/angular_devkit/schematics/src/rules/base.ts
index 2be938161ad3..1b97678a1b52 100644
--- a/packages/angular_devkit/schematics/src/rules/base.ts
+++ b/packages/angular_devkit/schematics/src/rules/base.ts
@@ -12,6 +12,7 @@ import { SchematicsException } from '../exception/exception';
 import { FilteredTree } from '../tree/filtered';
 import { FilterHostTree, HostTree } from '../tree/host-tree';
 import { FileEntry, FilePredicate, MergeStrategy, Tree } from '../tree/interface';
+import { ScopedTree } from '../tree/scoped';
 import {
   branch,
   empty as staticEmpty,
@@ -202,3 +203,21 @@ export function composeFileOperators(operators: FileOperator[]): FileOperator {
     return current;
   };
 }
+
+export function applyToSubtree(path: string, rules: Rule[]): Rule {
+  return (tree, context) => {
+    const scoped = new ScopedTree(tree, path);
+
+    return callRule(chain(rules), observableOf(scoped), context).pipe(
+      map(result => {
+        if (result === scoped) {
+          return tree;
+        } else {
+          throw new SchematicsException(
+            'Original tree must be returned from all rules when using "applyToSubtree".',
+          );
+        }
+      }),
+    );
+  };
+}
diff --git a/packages/angular_devkit/schematics/src/rules/base_spec.ts b/packages/angular_devkit/schematics/src/rules/base_spec.ts
index b504d3c01db1..0b2c3f13a22a 100644
--- a/packages/angular_devkit/schematics/src/rules/base_spec.ts
+++ b/packages/angular_devkit/schematics/src/rules/base_spec.ts
@@ -17,8 +17,9 @@ import { of as observableOf } from 'rxjs';
 import { Rule, SchematicContext, Source } from '../engine/interface';
 import { Tree } from '../tree/interface';
 import { empty } from '../tree/static';
-import { apply, chain } from './base';
+import { apply, applyToSubtree, chain } from './base';
 import { callRule, callSource } from './call';
+import { move } from './move';
 
 
 const context: SchematicContext = {
@@ -163,3 +164,21 @@ describe('partitionApplyMerge', () => {
       .then(done, done.fail);
   });
 });
+
+describe('applyToSubtree', () => {
+  it('works', done => {
+    const tree = new HostTree();
+    tree.create('a/b/file1', 'hello world');
+    tree.create('a/b/file2', 'hello world');
+    tree.create('a/c/file3', 'hello world');
+
+    callRule(applyToSubtree('a/b', [move('x')]), observableOf(tree), context)
+      .toPromise()
+      .then(result => {
+        expect(result.exists('a/b/x/file1')).toBe(true);
+        expect(result.exists('a/b/x/file2')).toBe(true);
+        expect(result.exists('a/c/file3')).toBe(true);
+      })
+      .then(done, done.fail);
+  });
+});

From 757bca4edc0fb89f51ba2a961ec2749cbd46291b Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 17 Jan 2019 19:42:26 -0500
Subject: [PATCH 0662/1703] fix(@angular-devkit/schematics): fully scope merge
 actions in ScopedTree

---
 .../schematics/src/tree/scoped.ts             | 60 +++++++++++++++++--
 .../schematics/src/tree/scoped_spec.ts        | 25 ++++++++
 2 files changed, 81 insertions(+), 4 deletions(-)

diff --git a/packages/angular_devkit/schematics/src/tree/scoped.ts b/packages/angular_devkit/schematics/src/tree/scoped.ts
index 210181839fe8..e503d76878f1 100644
--- a/packages/angular_devkit/schematics/src/tree/scoped.ts
+++ b/packages/angular_devkit/schematics/src/tree/scoped.ts
@@ -14,6 +14,7 @@ import {
   relative,
 } from '@angular-devkit/core';
 import { Action } from './action';
+import { DelegateTree } from './delegate';
 import {
   DirEntry,
   FileEntry,
@@ -89,7 +90,16 @@ export class ScopedTree implements Tree {
   get root(): DirEntry { return this._root; }
 
   branch(): Tree { return new ScopedTree(this._base.branch(), this._root.scope); }
-  merge(other: Tree, strategy?: MergeStrategy): void { this._base.merge(other, strategy); }
+  merge(other: Tree, strategy?: MergeStrategy): void {
+    const self = this;
+    const delegate = new class extends DelegateTree {
+      get actions(): Action[] {
+        return other.actions.map(action => self._fullPathAction(action));
+      }
+    }(other);
+
+    this._base.merge(delegate, strategy);
+  }
 
   // Readonly.
   read(path: string): Buffer | null { return this._base.read(this._fullPath(path)); }
@@ -125,15 +135,57 @@ export class ScopedTree implements Tree {
   }
 
   apply(action: Action, strategy?: MergeStrategy): void {
-    return this._base.apply(action, strategy);
+    return this._base.apply(this._fullPathAction(action), strategy);
+  }
+
+  get actions(): Action[] {
+    const scopedActions = [];
+
+    for (const action of this._base.actions) {
+      if (!action.path.startsWith(this._root.scope + '/')) {
+        continue;
+      }
+
+      if (action.kind !== 'r') {
+        scopedActions.push({
+          ...action,
+          path: join(NormalizedRoot, relative(this._root.scope, action.path)),
+        });
+      } else if (action.to.startsWith(this._root.scope + '/')) {
+        scopedActions.push({
+          ...action,
+          path: join(NormalizedRoot, relative(this._root.scope, action.path)),
+          to: join(NormalizedRoot, relative(this._root.scope, action.to)),
+        });
+      }
+    }
+
+    return scopedActions;
   }
-  get actions(): Action[] { return this._base.actions; }
 
   [TreeSymbol]() {
     return this;
   }
 
-  private _fullPath(path: string) {
+  private _fullPath(path: string): Path {
     return join(this._root.scope, normalize('/' + path));
   }
+
+  private _fullPathAction(action: Action) {
+    let fullPathAction: Action;
+    if (action.kind === 'r') {
+      fullPathAction = {
+        ...action,
+        path: this._fullPath(action.path),
+        to: this._fullPath(action.to),
+      };
+    } else {
+      fullPathAction = {
+        ...action,
+        path: this._fullPath(action.path),
+      };
+    }
+
+    return fullPathAction;
+  }
 }
diff --git a/packages/angular_devkit/schematics/src/tree/scoped_spec.ts b/packages/angular_devkit/schematics/src/tree/scoped_spec.ts
index 43e32e1dd531..35fb3ae3a83e 100644
--- a/packages/angular_devkit/schematics/src/tree/scoped_spec.ts
+++ b/packages/angular_devkit/schematics/src/tree/scoped_spec.ts
@@ -133,6 +133,31 @@ describe('ScopedTree', () => {
     ]);
   });
 
+  it('supports merge into a scoped tree', () => {
+    const other = new HostTree();
+    other.create('other-file', 'other');
+
+    scoped.merge(other);
+
+    expect(base.exists('/level-1/other-file')).toBeTruthy();
+    expect(base.exists('/other-file')).toBeFalsy();
+  });
+
+  it('supports merge from a scoped tree', () => {
+    const other = new HostTree();
+
+    other.merge(scoped);
+
+    expect(other.exists('/file-1-1')).toBeTruthy();
+    expect(other.exists('file-1-1')).toBeTruthy();
+    expect(other.exists('/file-1-2')).toBeTruthy();
+
+    expect(other.exists('/file-0-1')).toBeFalsy();
+    expect(other.exists('file-0-1')).toBeFalsy();
+    expect(other.exists('/level-1/file-1-1')).toBeFalsy();
+    expect(other.exists('level-1/file-1-1')).toBeFalsy();
+  });
+
   it('supports root', () => {
     expect(scoped.root).not.toBeNull();
     expect(scoped.root.path as string).toBe('/');

From 6c0b4db7dec47af3a7abf353184631d45c3b631c Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Thu, 17 Jan 2019 11:34:30 +0100
Subject: [PATCH 0663/1703] fix(@schematics/angular): tsconfig.json can't be
 parsed if it contains comments

Fixes #13455
Closes #13456
---
 packages/schematics/angular/library/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index 725d9fc50b3d..57b9e55fb551 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { parseJson, strings } from '@angular-devkit/core';
+import { JsonParseMode, parseJson, strings } from '@angular-devkit/core';
 import {
   Rule,
   SchematicContext,
@@ -54,7 +54,7 @@ function updateJsonFile<T>(host: Tree, path: string, callback: UpdateJsonFn<T>):
   const source = host.read(path);
   if (source) {
     const sourceText = source.toString('utf-8');
-    const json = parseJson(sourceText);
+    const json = parseJson(sourceText, JsonParseMode.Loose);
     callback(json as {} as T);
     host.overwrite(path, JSON.stringify(json, null, 2));
   }

From 1deb74fd2043fdc04f7e0e6884851a1a7107e338 Mon Sep 17 00:00:00 2001
From: Youcef Mammar <youcef.mammar@algolia.com>
Date: Tue, 30 Oct 2018 13:47:46 +0100
Subject: [PATCH 0664/1703] fix(@schematics/update): add check for invalid
 ranges

Fixes #12644
Closes #12806
---
 packages/schematics/update/update/index.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/update/update/index.ts b/packages/schematics/update/update/index.ts
index 8a9bcb14acef..48bc641fcf8a 100644
--- a/packages/schematics/update/update/index.ts
+++ b/packages/schematics/update/update/index.ts
@@ -32,21 +32,24 @@ type PeerVersionTransform = string | ((range: string) => string);
 // supports 6.0, by adding that compatibility to the range, so it is `^5.0.0 || ^6.0.0`.
 // We export it to allow for testing.
 export function angularMajorCompatGuarantee(range: string) {
-  range = semver.validRange(range);
+  let newRange = semver.validRange(range);
+  if (!newRange) {
+    return range;
+  }
   let major = 1;
-  while (!semver.gtr(major + '.0.0', range)) {
+  while (!semver.gtr(major + '.0.0', newRange)) {
     major++;
     if (major >= 99) {
       // Use original range if it supports a major this high
       // Range is most likely unbounded (e.g., >=5.0.0)
-      return range;
+      return newRange;
     }
   }
 
   // Add the major version as compatible with the angular compatible, with all minors. This is
   // already one major above the greatest supported, because we increment `major` before checking.
   // We add minors like this because a minor beta is still compatible with a minor non-beta.
-  let newRange = range;
+  newRange = range;
   for (let minor = 0; minor < 20; minor++) {
     newRange += ` || ^${major}.${minor}.0-alpha.0 `;
   }

From 7bd6e5797997a22ef85030e3271f9550f45d1088 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 19 Jan 2019 18:35:31 +0000
Subject: [PATCH 0665/1703] build: update speed-measure-webpack-plugin to
 version 1.3.0

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 43 ++++---------------
 2 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 4855a528e28d..7416729ffd9a 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -38,7 +38,7 @@
     "semver": "5.6.0",
     "source-map-support": "0.5.10",
     "source-map-loader": "0.2.4",
-    "speed-measure-webpack-plugin": "1.2.5",
+    "speed-measure-webpack-plugin": "1.3.0",
     "stats-webpack-plugin": "0.7.0",
     "style-loader": "0.23.1",
     "stylus": "0.54.5",
diff --git a/yarn.lock b/yarn.lock
index 9f8784d04c87..8663e8608dee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6171,6 +6171,11 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
+material-design-icons@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/material-design-icons/-/material-design-icons-3.0.1.tgz#9a71c48747218ebca51e51a66da682038cdcb7bf"
+  integrity sha1-mnHEh0chjrylHlGmbaaCA4zct78=
+
 math-random@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
@@ -9321,10 +9326,10 @@ spdy@^4.0.0:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
-speed-measure-webpack-plugin@1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.2.5.tgz#8179936eb8c5e891f7481bd5075a9ea9a0f74823"
-  integrity sha512-S/guYjC4Izn5wY2d0+M4zowED/F77Lxh9yjkTZ+XAr244pr9c1MYNcXcRe9lx2hmAj0GPbOrBXgOF2YIp/CZ8A==
+speed-measure-webpack-plugin@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.0.tgz#c7ffafef513df3d63d5d546c8fc1986dfc4969aa"
+  integrity sha512-b9Yd0TrzceMVYSbuamM1sFsGM1oVfyFTM22gOoyLhymNvBVApuYpkdFOgYkKJpN/KhTpcCYcTGHg7X+FJ33Vvw==
   dependencies:
     chalk "^2.0.1"
 
@@ -10553,36 +10558,6 @@ webpack@4.28.4:
     watchpack "^1.5.0"
     webpack-sources "^1.3.0"
 
-webpack@4.28.4:
-  version "4.28.4"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.28.4.tgz#1ddae6c89887d7efb752adf0c3cd32b9b07eacd0"
-  integrity sha512-NxjD61WsK/a3JIdwWjtIpimmvE6UrRi3yG54/74Hk9rwNj5FPkA4DJCf1z4ByDWLkvZhTZE+P3C/eh6UD5lDcw==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-module-context" "1.7.11"
-    "@webassemblyjs/wasm-edit" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
-    acorn "^5.6.2"
-    acorn-dynamic-import "^3.0.0"
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-    chrome-trace-event "^1.0.0"
-    enhanced-resolve "^4.1.0"
-    eslint-scope "^4.0.0"
-    json-parse-better-errors "^1.0.2"
-    loader-runner "^2.3.0"
-    loader-utils "^1.1.0"
-    memory-fs "~0.4.1"
-    micromatch "^3.1.8"
-    mkdirp "~0.5.0"
-    neo-async "^2.5.0"
-    node-libs-browser "^2.0.0"
-    schema-utils "^0.4.4"
-    tapable "^1.1.0"
-    terser-webpack-plugin "^1.1.0"
-    watchpack "^1.5.0"
-    webpack-sources "^1.3.0"
-
 websocket-driver@>=0.5.1:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"

From 1a3ba03a5974575ce34fe02d36b906d17691523a Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Fri, 18 Jan 2019 09:20:24 -0800
Subject: [PATCH 0666/1703] docs: add long description to app-shell subcommand

---
 .../angular/app-shell/app-shell-long.md       | 47 +++++++++++++++++++
 .../schematics/angular/app-shell/schema.json  |  2 +-
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/angular/app-shell/app-shell-long.md b/packages/schematics/angular/app-shell/app-shell-long.md
index e69de29bb2d1..260a3ce6da1e 100644
--- a/packages/schematics/angular/app-shell/app-shell-long.md
+++ b/packages/schematics/angular/app-shell/app-shell-long.md
@@ -0,0 +1,47 @@
+An app shell lets Universal render a portion of your application via a route at build time.
+This gives users a meaningful first paint of your application that appears quickly
+because the browser can simply render the HTML without the need to initialize any JavaScript.
+
+Use this command with a routing app that is accompanied by a Universal server-side app.
+
+To create an app shell, use the following command.
+
+<code-example format="." language="bash">
+ ng generate app-shell --client-project my-app --universal-project server-app
+</code-example>
+
+* `my-app` is the name of your client application
+* `server-app` is the name of the Universal (server) application
+
+The command adds two new architect build targets to your `angular.json` configuration file (along with a few other changes).
+
+<code-example  format="." language="none" linenums="false">
+"server": {
+  "builder": "@angular-devkit/build-angular:server",
+  "options": {
+    "outputPath": "dist/my-app-server",
+    "main": "src/main.server.ts",
+    "tsConfig": "src/tsconfig.server.json"
+  }
+},
+"app-shell": {
+  "builder": "@angular-devkit/build-angular:app-shell",
+  "options": {
+    "browserTarget": "my-app:build",
+    "serverTarget": "my-app:server",
+    "route": "shell"
+  }
+}
+</code-example>
+
+To verify the that the app has been built with the default shell content:
+
+1. Run the app-shell target.
+
+   <code-example format="." language="bash">
+       ng run my-app:app-shell
+    </code-example>
+
+1. Open `dist/app-shell/index.html` in your browser.
+
+The default text "app-shell works!" verifies that the app-shell route was rendered as part of the output.
\ No newline at end of file
diff --git a/packages/schematics/angular/app-shell/schema.json b/packages/schematics/angular/app-shell/schema.json
index 975921de5784..beb4e71c6963 100644
--- a/packages/schematics/angular/app-shell/schema.json
+++ b/packages/schematics/angular/app-shell/schema.json
@@ -4,7 +4,7 @@
   "title": "Angular AppShell Options Schema",
   "type": "object",
   "description": "Generates an app shell for running a server-side version of an app.",
-  "long-description": "",
+  "long-description": "./app-shell-long.md",
   "properties": {
     "clientProject": {
       "type": "string",

From b956db6262a8e5911f02daa95a4da741a823edc9 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 11 Dec 2018 12:51:27 -0500
Subject: [PATCH 0667/1703] fix(@angular/cli): 'ng add' selects supported
 version via peer dependencies

If no version specifier is supplied `ng add` will now try to find the most recent version of the package that has peer dependencies that match the package versions supplied in the project's package.json
---
 packages/angular/cli/commands/add-impl.ts     | 212 ++++++++++++++--
 packages/angular/cli/package.json             |   4 +
 packages/angular/cli/tasks/npm-install.ts     |  12 -
 .../angular/cli/utilities/package-metadata.ts | 238 ++++++++++++++++++
 .../add-collection-peer-bad/collection.json   |   8 +
 .../assets/add-collection-peer-bad/index.js   |   1 +
 .../add-collection-peer-bad/package.json      |   8 +
 .../add-collection-peer-good/collection.json  |   8 +
 .../assets/add-collection-peer-good/index.js  |   1 +
 .../add-collection-peer-good/package.json     |   8 +
 .../legacy-cli/e2e/assets/add-collection.tgz  | Bin 0 -> 422 bytes
 .../e2e/assets/add-collection/package.json    |   1 +
 .../e2e/tests/commands/add/add-material.ts    |   8 +
 .../legacy-cli/e2e/tests/commands/add/base.ts |   6 +-
 .../legacy-cli/e2e/tests/commands/add/dir.ts  |   9 +
 .../legacy-cli/e2e/tests/commands/add/file.ts |   9 +
 .../legacy-cli/e2e/tests/commands/add/peer.ts |  21 ++
 yarn.lock                                     |   2 +-
 18 files changed, 522 insertions(+), 34 deletions(-)
 create mode 100644 packages/angular/cli/utilities/package-metadata.ts
 create mode 100644 tests/legacy-cli/e2e/assets/add-collection-peer-bad/collection.json
 create mode 100644 tests/legacy-cli/e2e/assets/add-collection-peer-bad/index.js
 create mode 100644 tests/legacy-cli/e2e/assets/add-collection-peer-bad/package.json
 create mode 100644 tests/legacy-cli/e2e/assets/add-collection-peer-good/collection.json
 create mode 100644 tests/legacy-cli/e2e/assets/add-collection-peer-good/index.js
 create mode 100644 tests/legacy-cli/e2e/assets/add-collection-peer-good/package.json
 create mode 100644 tests/legacy-cli/e2e/assets/add-collection.tgz
 create mode 100644 tests/legacy-cli/e2e/tests/commands/add/add-material.ts
 create mode 100644 tests/legacy-cli/e2e/tests/commands/add/dir.ts
 create mode 100644 tests/legacy-cli/e2e/tests/commands/add/file.ts
 create mode 100644 tests/legacy-cli/e2e/tests/commands/add/peer.ts

diff --git a/packages/angular/cli/commands/add-impl.ts b/packages/angular/cli/commands/add-impl.ts
index 400b7c05aef7..1e915ec4460b 100644
--- a/packages/angular/cli/commands/add-impl.ts
+++ b/packages/angular/cli/commands/add-impl.ts
@@ -5,18 +5,27 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-// tslint:disable:no-global-tslint-disable no-any
 import { tags, terminal } from '@angular-devkit/core';
+import { ModuleNotFoundException, resolve } from '@angular-devkit/core/node';
 import { NodePackageDoesNotSupportSchematics } from '@angular-devkit/schematics/tools';
+import { dirname } from 'path';
+import { intersects, prerelease, rcompare, satisfies, valid, validRange } from 'semver';
 import { Arguments } from '../models/interface';
 import { SchematicCommand } from '../models/schematic-command';
-import { NpmInstall } from '../tasks/npm-install';
+import npmInstall from '../tasks/npm-install';
 import { getPackageManager } from '../utilities/package-manager';
+import {
+  PackageManifest,
+  fetchPackageManifest,
+  fetchPackageMetadata,
+} from '../utilities/package-metadata';
 import { Schema as AddCommandSchema } from './add';
 
+const npa = require('npm-package-arg');
+
 export class AddCommand extends SchematicCommand<AddCommandSchema> {
   readonly allowPrivateSchematics = true;
+  readonly packageManager = getPackageManager(this.workspace.root);
 
   async run(options: AddCommandSchema & Arguments) {
     if (!options.collection) {
@@ -28,32 +37,127 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
       return 1;
     }
 
-    const packageManager = getPackageManager(this.workspace.root);
+    let packageIdentifier;
+    try {
+      packageIdentifier = npa(options.collection);
+    } catch (e) {
+      this.logger.error(e.message);
+
+      return 1;
+    }
+
+    if (packageIdentifier.registry && this.isPackageInstalled(packageIdentifier.name)) {
+      // Already installed so just run schematic
+      this.logger.info('Skipping installation: Package already installed');
+
+      return this.executeSchematic(packageIdentifier.name, options['--']);
+    }
+
+    const usingYarn = this.packageManager === 'yarn';
+
+    if (packageIdentifier.type === 'tag' && !packageIdentifier.rawSpec) {
+      // only package name provided; search for viable version
+      // plus special cases for packages that did not have peer deps setup
+      let packageMetadata;
+      try {
+        packageMetadata = await fetchPackageMetadata(
+          packageIdentifier.name,
+          this.logger,
+          { usingYarn },
+        );
+      } catch (e) {
+        this.logger.error('Unable to fetch package metadata: ' + e.message);
+
+        return 1;
+      }
+
+      const latestManifest = packageMetadata.tags['latest'];
+      if (latestManifest && Object.keys(latestManifest.peerDependencies).length === 0) {
+        if (latestManifest.name === '@angular/pwa') {
+          const version = await this.findProjectVersion('@angular/cli');
+          // tslint:disable-next-line:no-any
+          const semverOptions = { includePrerelease: true } as any;
+
+          if (version
+              && ((validRange(version) && intersects(version, '7', semverOptions))
+                  || (valid(version) && satisfies(version, '7', semverOptions)))) {
+            packageIdentifier = npa.resolve('@angular/pwa', '0.12');
+          }
+        }
+      } else if (!latestManifest || (await this.hasMismatchedPeer(latestManifest))) {
+        // 'latest' is invalid so search for most recent matching package
+        const versionManifests = Array.from(packageMetadata.versions.values())
+          .filter(value => !prerelease(value.version));
+
+        versionManifests.sort((a, b) => rcompare(a.version, b.version, true));
+
+        let newIdentifier;
+        for (const versionManifest of versionManifests) {
+          if (!(await this.hasMismatchedPeer(versionManifest))) {
+            newIdentifier = npa.resolve(packageIdentifier.name, versionManifest.version);
+            break;
+          }
+        }
+
+        if (!newIdentifier) {
+          this.logger.warn('Unable to find compatible package.  Using \'latest\'.');
+        } else {
+          packageIdentifier = newIdentifier;
+        }
+      }
+    }
+
+    let collectionName = packageIdentifier.name;
+    if (!packageIdentifier.registry) {
+      try {
+        const manifest = await fetchPackageManifest(
+          packageIdentifier,
+          this.logger,
+          { usingYarn },
+        );
 
-    const npmInstall: NpmInstall = require('../tasks/npm-install').default;
+        collectionName = manifest.name;
 
-    const packageName = options.collection.startsWith('@')
-      ? options.collection.split('/', 2).join('/')
-      : options.collection.split('/', 1)[0];
+        if (await this.hasMismatchedPeer(manifest)) {
+          console.warn('Package has unmet peer dependencies. Adding the package may not succeed.');
+        }
+      } catch (e) {
+        this.logger.error('Unable to fetch package manifest: ' + e.message);
 
-    // Remove the tag/version from the package name.
-    const collectionName = (
-      packageName.startsWith('@')
-        ? packageName.split('@', 2).join('@')
-        : packageName.split('@', 1).join('@')
-    ) + options.collection.slice(packageName.length);
+        return 1;
+      }
+    }
 
-    // We don't actually add the package to package.json, that would be the work of the package
-    // itself.
     await npmInstall(
-      packageName,
+      packageIdentifier.raw,
       this.logger,
-      packageManager,
+      this.packageManager,
       this.workspace.root,
     );
 
+    return this.executeSchematic(collectionName, options['--']);
+  }
+
+  private isPackageInstalled(name: string): boolean {
+    try {
+      resolve(name, { checkLocal: true, basedir: this.workspace.root });
+
+      return true;
+    } catch (e) {
+      if (!(e instanceof ModuleNotFoundException)) {
+        throw e;
+      }
+    }
+
+    return false;
+  }
+
+  private async executeSchematic(
+    collectionName: string,
+    options: string[] = [],
+  ): Promise<number | void> {
     const runOptions = {
-      schematicOptions: options['--'] || [],
+      schematicOptions: options,
       workingDir: this.workspace.root,
       collectionName,
       schematicName: 'ng-add',
@@ -77,4 +181,74 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
       throw e;
     }
   }
+
+  private async findProjectVersion(name: string): Promise<string | null> {
+    let installedPackage;
+    try {
+      installedPackage = resolve(
+        name,
+        { checkLocal: true, basedir: this.workspace.root, resolvePackageJson: true },
+      );
+    } catch { }
+
+    if (installedPackage) {
+      try {
+        const installed = await fetchPackageManifest(dirname(installedPackage), this.logger);
+
+        return installed.version;
+      } catch {}
+    }
+
+    let projectManifest;
+    try {
+      projectManifest = await fetchPackageManifest(this.workspace.root, this.logger);
+    } catch {}
+
+    if (projectManifest) {
+      const version = projectManifest.dependencies[name] || projectManifest.devDependencies[name];
+      if (version) {
+        return version;
+      }
+    }
+
+    return null;
+  }
+
+  private async hasMismatchedPeer(manifest: PackageManifest): Promise<boolean> {
+    for (const peer in manifest.peerDependencies) {
+      let peerIdentifier;
+      try {
+        peerIdentifier = npa.resolve(peer, manifest.peerDependencies[peer]);
+      } catch {
+        this.logger.warn(`Invalid peer dependency ${peer} found in package.`);
+        continue;
+      }
+
+      if (peerIdentifier.type === 'version' || peerIdentifier.type === 'range') {
+        try {
+          const version = await this.findProjectVersion(peer);
+          if (!version) {
+            continue;
+          }
+
+          // tslint:disable-next-line:no-any
+          const options = { includePrerelease: true } as any;
+
+          if (!intersects(version, peerIdentifier.rawSpec, options)
+              && !satisfies(version, peerIdentifier.rawSpec, options)) {
+            return true;
+          }
+        } catch {
+          // Not found or invalid so ignore
+          continue;
+        }
+      } else {
+        // type === 'tag' | 'file' | 'directory' | 'remote' | 'git'
+        // Cannot accurately compare these as the tag/location may have changed since install
+      }
+
+    }
+
+    return false;
+  }
 }
diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 4594d7435e90..4afada26f829 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -31,8 +31,12 @@
     "@angular-devkit/schematics": "0.0.0",
     "@schematics/angular": "0.0.0",
     "@schematics/update": "0.0.0",
+    "@yarnpkg/lockfile": "1.1.0",
+    "ini": "1.3.5",
     "inquirer": "6.2.1",
+    "npm-package-arg": "6.1.0",
     "opn": "5.4.0",
+    "pacote": "9.4.0",
     "semver": "5.6.0",
     "symbol-observable": "1.2.0"
   },
diff --git a/packages/angular/cli/tasks/npm-install.ts b/packages/angular/cli/tasks/npm-install.ts
index 243587054b88..70cbbd8a06ad 100644
--- a/packages/angular/cli/tasks/npm-install.ts
+++ b/packages/angular/cli/tasks/npm-install.ts
@@ -7,7 +7,6 @@
  */
 
 import { logging, terminal } from '@angular-devkit/core';
-import { ModuleNotFoundException, resolve } from '@angular-devkit/core/node';
 import { spawn } from 'child_process';
 
 
@@ -42,17 +41,6 @@ export default async function (packageName: string,
   logger.info(terminal.green(`Installing packages for tooling via ${packageManager}.`));
 
   if (packageName) {
-    try {
-      // Verify if we need to install the package (it might already be there).
-      // If it's available and we shouldn't save, simply return. Nothing to be done.
-      resolve(packageName, { checkLocal: true, basedir: projectRoot });
-
-      return;
-    } catch (e) {
-      if (!(e instanceof ModuleNotFoundException)) {
-        throw e;
-      }
-    }
     installArgs.push(packageName);
   }
 
diff --git a/packages/angular/cli/utilities/package-metadata.ts b/packages/angular/cli/utilities/package-metadata.ts
new file mode 100644
index 000000000000..aabe530ca10f
--- /dev/null
+++ b/packages/angular/cli/utilities/package-metadata.ts
@@ -0,0 +1,238 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { logging } from '@angular-devkit/core';
+import { existsSync, readFileSync } from 'fs';
+import { homedir } from 'os';
+import * as path from 'path';
+
+const ini = require('ini');
+const lockfile = require('@yarnpkg/lockfile');
+const pacote = require('pacote');
+
+export interface PackageDependencies {
+  [dependency: string]: string;
+}
+
+export interface PackageIdentifier {
+  type: 'git' | 'tag' | 'version' | 'range' | 'file' | 'directory' | 'remote';
+  name: string;
+  scope: string | null;
+  registry: boolean;
+  raw: string;
+}
+
+export interface PackageManifest {
+  name: string;
+  version: string;
+  license?: string;
+  private?: boolean;
+  deprecated?: boolean;
+
+  dependencies: PackageDependencies;
+  devDependencies: PackageDependencies;
+  peerDependencies: PackageDependencies;
+  optionalDependencies: PackageDependencies;
+
+  'ng-add'?: {
+
+  };
+  'ng-update'?: {
+    migrations: string,
+    packageGroup: { [name: string]: string },
+  };
+}
+
+export interface PackageMetadata {
+  name: string;
+  tags: { [tag: string]: PackageManifest | undefined };
+  versions: Map<string, PackageManifest>;
+}
+
+let npmrc: { [key: string]: string };
+
+function ensureNpmrc(logger: logging.LoggerApi, usingYarn: boolean, verbose: boolean): void {
+  if (!npmrc) {
+    try {
+      npmrc = readOptions(logger, false, verbose);
+    } catch { }
+
+    if (usingYarn) {
+      try {
+        npmrc = { ...npmrc, ...readOptions(logger, true, verbose) };
+      } catch { }
+    }
+  }
+}
+
+function readOptions(
+  logger: logging.LoggerApi,
+  yarn = false,
+  showPotentials = false,
+): Record<string, string> {
+  const cwd = process.cwd();
+  const baseFilename = yarn ? 'yarnrc' : 'npmrc';
+  const dotFilename = '.' + baseFilename;
+
+  let globalPrefix: string;
+  if (process.env.PREFIX) {
+    globalPrefix = process.env.PREFIX;
+  } else {
+    globalPrefix = path.dirname(process.execPath);
+    if (process.platform !== 'win32') {
+      globalPrefix = path.dirname(globalPrefix);
+    }
+  }
+
+  const defaultConfigLocations = [
+    path.join(globalPrefix, 'etc', baseFilename),
+    path.join(homedir(), dotFilename),
+  ];
+
+  const projectConfigLocations: string[] = [
+    path.join(cwd, dotFilename),
+  ];
+  const root = path.parse(cwd).root;
+  for (let curDir = path.dirname(cwd); curDir && curDir !== root; curDir = path.dirname(curDir)) {
+    projectConfigLocations.unshift(path.join(curDir, dotFilename));
+  }
+
+  if (showPotentials) {
+    logger.info(`Locating potential ${baseFilename} files:`);
+  }
+
+  let options: { [key: string]: string } = {};
+  for (const location of [...defaultConfigLocations, ...projectConfigLocations]) {
+    if (existsSync(location)) {
+      if (showPotentials) {
+        logger.info(`Trying '${location}'...found.`);
+      }
+
+      const data = readFileSync(location, 'utf8');
+      options = {
+        ...options,
+        ...(yarn ? lockfile.parse(data) : ini.parse(data)),
+      };
+
+      if (options.cafile) {
+        const cafile = path.resolve(path.dirname(location), options.cafile);
+        delete options.cafile;
+        try {
+          options.ca = readFileSync(cafile, 'utf8').replace(/\r?\n/, '\\n');
+        } catch { }
+      }
+    } else if (showPotentials) {
+      logger.info(`Trying '${location}'...not found.`);
+    }
+  }
+
+  // Substitute any environment variable references
+  for (const key in options) {
+    if (typeof options[key] === 'string') {
+      options[key] = options[key].replace(/\$\{([^\}]+)\}/, (_, name) => process.env[name] || '');
+    }
+  }
+
+  return options;
+}
+
+function normalizeManifest(rawManifest: {}): PackageManifest {
+  // TODO: Fully normalize and sanitize
+
+  return {
+    dependencies: {},
+    devDependencies: {},
+    peerDependencies: {},
+    optionalDependencies: {},
+    // tslint:disable-next-line:no-any
+    ...rawManifest as any,
+  };
+}
+
+export async function fetchPackageMetadata(
+  name: string,
+  logger: logging.LoggerApi,
+  options?: {
+    registry?: string;
+    usingYarn?: boolean;
+    verbose?: boolean;
+  },
+): Promise<PackageMetadata> {
+  const { usingYarn, verbose, registry } = {
+    registry: undefined,
+    usingYarn: false,
+    verbose: false,
+    ...options,
+  };
+
+  ensureNpmrc(logger, usingYarn, verbose);
+
+  const response = await pacote.packument(
+    name,
+    {
+      'full-metadata': true,
+      ...npmrc,
+      ...(registry ? { registry } : {}),
+    },
+  );
+
+  // Normalize the response
+  const metadata: PackageMetadata = {
+    name: response.name,
+    tags: {},
+    versions: new Map(),
+  };
+
+  if (response.versions) {
+    for (const [version, manifest] of Object.entries(response.versions)) {
+      metadata.versions.set(version, normalizeManifest(manifest));
+    }
+  }
+
+  if (response['dist-tags']) {
+    for (const [tag, version] of Object.entries(response['dist-tags'])) {
+      const manifest = metadata.versions.get(version as string);
+      if (manifest) {
+        metadata.tags[tag] = manifest;
+      } else if (verbose) {
+        logger.warn(`Package ${metadata.name} has invalid version metadata for '${tag}'.`);
+      }
+    }
+  }
+
+  return metadata;
+}
+
+export async function fetchPackageManifest(
+  name: string,
+  logger: logging.LoggerApi,
+  options?: {
+    registry?: string;
+    usingYarn?: boolean;
+    verbose?: boolean;
+  },
+): Promise<PackageManifest> {
+  const { usingYarn, verbose, registry } = {
+    registry: undefined,
+    usingYarn: false,
+    verbose: false,
+    ...options,
+  };
+
+  ensureNpmrc(logger, usingYarn, verbose);
+
+  const response = await pacote.manifest(
+    name,
+    {
+      'full-metadata': true,
+      ...npmrc,
+      ...(registry ? { registry } : {}),
+    },
+  );
+
+  return normalizeManifest(response);
+}
diff --git a/tests/legacy-cli/e2e/assets/add-collection-peer-bad/collection.json b/tests/legacy-cli/e2e/assets/add-collection-peer-bad/collection.json
new file mode 100644
index 000000000000..94de98d0f82c
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/add-collection-peer-bad/collection.json
@@ -0,0 +1,8 @@
+{
+  "schematics": {
+    "ng-add": {
+      "factory": "./index.js",
+      "description": "Add empty file to your application."
+    }
+  }
+}
diff --git a/tests/legacy-cli/e2e/assets/add-collection-peer-bad/index.js b/tests/legacy-cli/e2e/assets/add-collection-peer-bad/index.js
new file mode 100644
index 000000000000..867b3a4eb6fd
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/add-collection-peer-bad/index.js
@@ -0,0 +1 @@
+exports.default = (options) => tree => tree.create(options.name || 'empty-file-peer-bad', '');
diff --git a/tests/legacy-cli/e2e/assets/add-collection-peer-bad/package.json b/tests/legacy-cli/e2e/assets/add-collection-peer-bad/package.json
new file mode 100644
index 000000000000..9a3f5aca40a8
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/add-collection-peer-bad/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "add-collection-peer-bad",
+  "version": "0.0.1",
+  "schematics": "./collection.json",
+  "peerDependencies": {
+    "typescript": "2.x"
+  }
+}
diff --git a/tests/legacy-cli/e2e/assets/add-collection-peer-good/collection.json b/tests/legacy-cli/e2e/assets/add-collection-peer-good/collection.json
new file mode 100644
index 000000000000..94de98d0f82c
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/add-collection-peer-good/collection.json
@@ -0,0 +1,8 @@
+{
+  "schematics": {
+    "ng-add": {
+      "factory": "./index.js",
+      "description": "Add empty file to your application."
+    }
+  }
+}
diff --git a/tests/legacy-cli/e2e/assets/add-collection-peer-good/index.js b/tests/legacy-cli/e2e/assets/add-collection-peer-good/index.js
new file mode 100644
index 000000000000..4d5dbdca2f69
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/add-collection-peer-good/index.js
@@ -0,0 +1 @@
+exports.default = (options) => tree => tree.create(options.name || 'empty-file-peer-good', '');
diff --git a/tests/legacy-cli/e2e/assets/add-collection-peer-good/package.json b/tests/legacy-cli/e2e/assets/add-collection-peer-good/package.json
new file mode 100644
index 000000000000..db3d21ce2353
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/add-collection-peer-good/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "add-collection-peer-good",
+  "version": "0.0.1",
+  "schematics": "./collection.json",
+  "peerDependencies": {
+    "@angular/cli": "*"
+  }
+}
diff --git a/tests/legacy-cli/e2e/assets/add-collection.tgz b/tests/legacy-cli/e2e/assets/add-collection.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..4714044f562cab958ec22689cf2d26f9ed06805e
GIT binary patch
literal 422
zcmV;X0a^YZiwFSQAQ@Z$1MQaKZh|ln$NlV6T=>G4D7IK?vc)BPl%^DAA`mExMt%3S
zpe|!kmkeFZ?w61YcO`AP`(G=<a454RQBucQI_g~mLdYZtptiiR#Al7&19UtloG=<N
z3WPE`VLb@0vYHlEsYPLyBIlJ{oEc|^MbVk~eji7BCy1~4kJC`CytlH`In4jyjGfLu
z^?57*0cWHKq|;TL;GgGTt@5nUr5CD5REdTuJY=~oh4K-mFQ5yh4%U-}5?USNUMiLf
zwp(!3GS};26er3Zfa^X!_y2lV$WLkMKNoT#X3BJcEbVNL%lZ$D{u$xEPl!1v2<42U
z{%^vj58zlOJ5S&=LKb=M46OTI6{RT(8zCO?XyYyATrGu;WoZN6=(Bq2s&V=|l>hzE
z(tj(N-OO=G|339w=l{f~0qXx2Y`#g_dTdXa4NYwv-;E~{QfI}wQT^efSoefF9I8?l
zaeX(iLteuW>V5+DVgNdWbygK%noAN(QCFB#f4b}22b%_hAP9mW2!bF8f*=TjAP9mW
Q2!i~c4@^#Ll>jIJ05XuoXaE2J

literal 0
HcmV?d00001

diff --git a/tests/legacy-cli/e2e/assets/add-collection/package.json b/tests/legacy-cli/e2e/assets/add-collection/package.json
index 1ded34bbece6..fe33ea6c6f95 100644
--- a/tests/legacy-cli/e2e/assets/add-collection/package.json
+++ b/tests/legacy-cli/e2e/assets/add-collection/package.json
@@ -1,4 +1,5 @@
 {
   "name": "empty-app",
+  "version": "0.0.1",
   "schematics": "./collection.json"
 }
diff --git a/tests/legacy-cli/e2e/tests/commands/add/add-material.ts b/tests/legacy-cli/e2e/tests/commands/add/add-material.ts
new file mode 100644
index 000000000000..e9249a37f596
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/commands/add/add-material.ts
@@ -0,0 +1,8 @@
+import { expectFileToMatch } from '../../../utils/fs';
+import { ng } from '../../../utils/process';
+
+
+export default async function () {
+  await ng('add', '@angular/material');
+  await expectFileToMatch('package.json', /@angular\/material/);
+}
diff --git a/tests/legacy-cli/e2e/tests/commands/add/base.ts b/tests/legacy-cli/e2e/tests/commands/add/base.ts
index 08a1f098f6a6..b22583909076 100644
--- a/tests/legacy-cli/e2e/tests/commands/add/base.ts
+++ b/tests/legacy-cli/e2e/tests/commands/add/base.ts
@@ -1,5 +1,5 @@
 import { assetDir } from '../../../utils/assets';
-import { expectFileToExist, symlinkFile } from '../../../utils/fs';
+import { expectFileToExist, rimraf, symlinkFile } from '../../../utils/fs';
 import { ng } from '../../../utils/process';
 import { expectToFail } from '../../../utils/utils';
 
@@ -13,6 +13,8 @@ export default async function () {
   await ng('add', 'add-collection', '--name=blah');
   await expectFileToExist('blah');
 
-  // TODO: reenable this check when schematics fail the CLI command.
   await expectToFail(() => ng('add', 'add-collection'));  // File already exists.
+
+  // Cleanup the package
+  await rimraf('node_modules/add-collection');
 }
diff --git a/tests/legacy-cli/e2e/tests/commands/add/dir.ts b/tests/legacy-cli/e2e/tests/commands/add/dir.ts
new file mode 100644
index 000000000000..d3c4b01d82e7
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/commands/add/dir.ts
@@ -0,0 +1,9 @@
+import { assetDir } from '../../../utils/assets';
+import { expectFileToExist } from '../../../utils/fs';
+import { ng } from '../../../utils/process';
+
+
+export default async function () {
+  await ng('add', assetDir('add-collection'), '--name=blah');
+  await expectFileToExist('blah');
+}
diff --git a/tests/legacy-cli/e2e/tests/commands/add/file.ts b/tests/legacy-cli/e2e/tests/commands/add/file.ts
new file mode 100644
index 000000000000..7cd61da0374b
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/commands/add/file.ts
@@ -0,0 +1,9 @@
+import { assetDir } from '../../../utils/assets';
+import { expectFileToExist } from '../../../utils/fs';
+import { ng } from '../../../utils/process';
+
+
+export default async function () {
+  await ng('add', assetDir('add-collection.tgz'), '--name=blah');
+  await expectFileToExist('blah');
+}
diff --git a/tests/legacy-cli/e2e/tests/commands/add/peer.ts b/tests/legacy-cli/e2e/tests/commands/add/peer.ts
new file mode 100644
index 000000000000..ee1ece6dab6a
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/commands/add/peer.ts
@@ -0,0 +1,21 @@
+import { assetDir } from '../../../utils/assets';
+import { ng } from '../../../utils/process';
+
+const warning = 'Adding the package may not succeed.';
+
+export default async function () {
+  const { stderr: bad } = await ng('add', assetDir('add-collection-peer-bad'));
+  if (!bad.includes(warning)) {
+    throw new Error('peer warning not shown on bad package');
+  }
+
+  const { stderr: base  } = await ng('add', assetDir('add-collection'));
+  if (base.includes(warning)) {
+    throw new Error('peer warning shown on base package');
+  }
+
+  const { stderr: good  } = await ng('add', assetDir('add-collection-peer-good'));
+  if (good.includes(warning)) {
+    throw new Error('peer warning shown on good package');
+  }
+}
diff --git a/yarn.lock b/yarn.lock
index 8663e8608dee..8f89644621e8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6901,7 +6901,7 @@ npm-bundled@^1.0.1:
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
   integrity sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==
 
-"npm-package-arg@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
+npm-package-arg@6.1.0, "npm-package-arg@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
   integrity sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==

From 35b0594f917854bee659612c1c0c8a715fdf957d Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 22 Jan 2019 14:27:49 +0000
Subject: [PATCH 0668/1703] feat(@angular-devkit/build-optimizer): also fold
 ES2015 classes

Although ES5 classes had their static properties folded in, ES2015 ones did not.

This PR adds that new functionality.

It should also make this particular transform a bit faster since it will stop early.

Fix https://github.com/angular/angular-cli/issues/13487
---
 .../src/transforms/class-fold.ts              | 102 ++++++++++++++----
 .../src/transforms/class-fold_spec.ts         |  71 +++++++++---
 2 files changed, 138 insertions(+), 35 deletions(-)

diff --git a/packages/angular_devkit/build_optimizer/src/transforms/class-fold.ts b/packages/angular_devkit/build_optimizer/src/transforms/class-fold.ts
index 0b466f66b78c..ecc49220abb2 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/class-fold.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/class-fold.ts
@@ -9,8 +9,8 @@ import * as ts from 'typescript';
 
 interface ClassData {
   name: string;
-  class: ts.VariableDeclaration;
-  classFunction: ts.FunctionExpression;
+  declaration: ts.VariableDeclaration | ts.ClassDeclaration;
+  function?: ts.FunctionExpression;
   statements: StatementData[];
 }
 
@@ -26,28 +26,34 @@ export function getFoldFileTransformer(program: ts.Program): ts.TransformerFacto
 
     const transformer: ts.Transformer<ts.SourceFile> = (sf: ts.SourceFile) => {
 
-      const classes = findClassDeclarations(sf);
-      const statements = findClassStaticPropertyAssignments(sf, checker, classes);
+      const statementsToRemove: ts.ExpressionStatement[] = [];
+      const classesWithoutStatements = findClassDeclarations(sf);
+      let classes = findClassesWithStaticPropertyAssignments(sf, checker, classesWithoutStatements);
 
       const visitor: ts.Visitor = (node: ts.Node): ts.VisitResult<ts.Node> => {
+        if (classes.length === 0 && statementsToRemove.length === 0) {
+          // There are no more statements to fold.
+          return ts.visitEachChild(node, visitor, context);
+        }
+
         // Check if node is a statement to be dropped.
-        if (statements.find((st) => st.expressionStatement === node)) {
+        const stmtIdx = statementsToRemove.indexOf(node as ts.ExpressionStatement);
+        if (stmtIdx != -1) {
+          statementsToRemove.splice(stmtIdx, 1);
+
           return undefined;
         }
 
-        // Check if node is a class to add statements to.
-        const clazz = classes.find((cl) => cl.classFunction === node);
+        // Check if node is a ES5 class to add statements to.
+        let clazz = classes.find((cl) => cl.function === node);
         if (clazz) {
-          const functionExpression: ts.FunctionExpression = node as ts.FunctionExpression;
-
-          const newExpressions = clazz.statements.map((st) =>
-            ts.createStatement(st.expressionStatement.expression));
+          const functionExpression = node as ts.FunctionExpression;
 
           // Create a new body with all the original statements, plus new ones,
           // plus return statement.
           const newBody = ts.createBlock([
             ...functionExpression.body.statements.slice(0, -1),
-            ...newExpressions,
+            ...clazz.statements.map(st => st.expressionStatement),
             ...functionExpression.body.statements.slice(-1),
           ]);
 
@@ -61,8 +67,47 @@ export function getFoldFileTransformer(program: ts.Program): ts.TransformerFacto
             newBody,
           );
 
+          // Update remaining classes and statements.
+          statementsToRemove.push(...clazz.statements.map(st => st.expressionStatement));
+          classes = classes.filter(cl => cl != clazz);
+
           // Replace node with modified one.
-          return ts.visitEachChild(newNode, visitor, context);
+          return newNode;
+        }
+
+        // Check if node is a ES2015 class to replace with a pure IIFE.
+        clazz = classes.find((cl) => !cl.function && cl.declaration === node);
+        if (clazz) {
+          const classStatement = clazz.declaration as ts.ClassDeclaration;
+          const innerReturn = ts.createReturn(ts.createIdentifier(clazz.name));
+
+          const iife = ts.createImmediatelyInvokedFunctionExpression([
+            classStatement,
+            ...clazz.statements.map(st => st.expressionStatement),
+            innerReturn,
+          ]);
+
+          const pureIife = ts.addSyntheticLeadingComment(
+            iife,
+            ts.SyntaxKind.MultiLineCommentTrivia,
+            '@__PURE__',
+            false,
+          );
+
+          // Move the original class modifiers to the var statement.
+          const newNode = ts.createVariableStatement(
+            clazz.declaration.modifiers,
+            ts.createVariableDeclarationList([
+              ts.createVariableDeclaration(clazz.name, undefined, pureIife),
+            ], ts.NodeFlags.Const),
+          );
+          clazz.declaration.modifiers = undefined;
+
+          // Update remaining classes and statements.
+          statementsToRemove.push(...clazz.statements.map(st => st.expressionStatement));
+          classes = classes.filter(cl => cl != clazz);
+
+          return newNode;
         }
 
         // Otherwise return node as is.
@@ -80,6 +125,19 @@ function findClassDeclarations(node: ts.Node): ClassData[] {
   const classes: ClassData[] = [];
   // Find all class declarations, build a ClassData for each.
   ts.forEachChild(node, (child) => {
+    // Check if it is a named class declaration first.
+    // Technically it doesn't need a name in TS if it's the default export, but when downleveled
+    // it will be have a name (e.g. `default_1`).
+    if (ts.isClassDeclaration(child) && child.name) {
+      classes.push({
+        name: child.name.text,
+        declaration: child,
+        statements: [],
+      });
+
+      return;
+    }
+
     if (child.kind !== ts.SyntaxKind.VariableStatement) {
       return;
     }
@@ -122,8 +180,8 @@ function findClassDeclarations(node: ts.Node): ClassData[] {
     }
     classes.push({
       name,
-      class: varDecl,
-      classFunction: fn,
+      declaration: varDecl,
+      function: fn,
       statements: [],
     });
   });
@@ -131,13 +189,11 @@ function findClassDeclarations(node: ts.Node): ClassData[] {
   return classes;
 }
 
-function findClassStaticPropertyAssignments(
+function findClassesWithStaticPropertyAssignments(
   node: ts.Node,
   checker: ts.TypeChecker,
-  classes: ClassData[]): StatementData[] {
-
-  const statements: StatementData[] = [];
-
+  classes: ClassData[],
+) {
   // Find each assignment outside of the declaration.
   ts.forEachChild(node, (child) => {
     if (child.kind !== ts.SyntaxKind.ExpressionStatement) {
@@ -166,15 +222,15 @@ function findClassStaticPropertyAssignments(
       return;
     }
 
-    const hostClass = classes.find((clazz => decls.includes(clazz.class)));
+    const hostClass = classes.find((clazz => decls.includes(clazz.declaration)));
     if (!hostClass) {
       return;
     }
     const statement: StatementData = { expressionStatement, hostClass };
 
     hostClass.statements.push(statement);
-    statements.push(statement);
   });
 
-  return statements;
+  // Only return classes that have static property assignments.
+  return classes.filter(cl => cl.statements.length != 0);
 }
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/class-fold_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/class-fold_spec.ts
index 4af639ca0dcc..1b50bbe38691 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/class-fold_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/class-fold_spec.ts
@@ -15,33 +15,80 @@ const transform = (content: string) => transformJavascript(
   { content, getTransforms: [getFoldFileTransformer], typeCheck: true }).content;
 
 describe('class-fold', () => {
-  it('folds static properties into class', () => {
-    const staticProperty = 'Clazz.prop = 1;';
-    const input = tags.stripIndent`
+  describe('es5', () => {
+    it('folds static properties into class', () => {
+      const staticProperty = 'Clazz.prop = 1;';
+      const input = tags.stripIndent`
       var Clazz = (function () { function Clazz() { } return Clazz; }());
       ${staticProperty}
     `;
-    const output = tags.stripIndent`
+      const output = tags.stripIndent`
       var Clazz = (function () { function Clazz() { }
       ${staticProperty} return Clazz; }());
     `;
 
-    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
-  });
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
 
-  it('folds multiple static properties into class', () => {
-    const staticProperty = 'Clazz.prop = 1;';
-    const anotherStaticProperty = 'Clazz.anotherProp = 2;';
-    const input = tags.stripIndent`
+    it('folds multiple static properties into class', () => {
+      const staticProperty = 'Clazz.prop = 1;';
+      const anotherStaticProperty = 'Clazz.anotherProp = 2;';
+      const input = tags.stripIndent`
       var Clazz = (function () { function Clazz() { } return Clazz; }());
       ${staticProperty}
       ${anotherStaticProperty}
     `;
-    const output = tags.stripIndent`
+      const output = tags.stripIndent`
       var Clazz = (function () { function Clazz() { }
       ${staticProperty} ${anotherStaticProperty} return Clazz; }());
     `;
 
-    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+  });
+
+  describe('es2015', () => {
+    it('folds static properties in IIFE', () => {
+      const input = tags.stripIndent`
+      export class TemplateRef { }
+      TemplateRef.__NG_ELEMENT_ID__ = () => SWITCH_TEMPLATE_REF_FACTORY(TemplateRef, ElementRef);
+    `;
+      const output = tags.stripIndent`
+      export const TemplateRef = /*@__PURE__*/ function () {
+        class TemplateRef { }
+        TemplateRef.__NG_ELEMENT_ID__ = () => SWITCH_TEMPLATE_REF_FACTORY(TemplateRef, ElementRef);
+        return TemplateRef;
+      }();
+    `;
+
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it('folds multiple static properties into class', () => {
+      const input = tags.stripIndent`
+      export class TemplateRef { }
+      TemplateRef.__NG_ELEMENT_ID__ = () => SWITCH_TEMPLATE_REF_FACTORY(TemplateRef, ElementRef);
+      TemplateRef.somethingElse = true;
+    `;
+      const output = tags.stripIndent`
+      export const TemplateRef = /*@__PURE__*/ function () {
+        class TemplateRef {
+        }
+        TemplateRef.__NG_ELEMENT_ID__ = () => SWITCH_TEMPLATE_REF_FACTORY(TemplateRef, ElementRef);
+        TemplateRef.somethingElse = true;
+        return TemplateRef;
+      }();
+    `;
+
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it(`doesn't wrap classes without static properties in IIFE`, () => {
+      const input = tags.stripIndent`
+        export class TemplateRef { }
+      `;
+
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${input}`);
+    });
   });
 });

From 7d868947e2a4862d34648a5afd6fe696513a9d6e Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Tue, 22 Jan 2019 15:26:54 +0100
Subject: [PATCH 0669/1703] feat(@angular-devkit/build-optimizer): add support
 for es2015 enums emitted by tsickle

tsickle emits es2015 enums with an object literal followed by an export declaration

Example:
```
      const RendererStyleFlags3 = {
          Important: 1,
          DashCase: 2,
      };
      export { RendererStyleFlags3 };
      RendererStyleFlags3[RendererStyleFlags3.Important] = 'Important';
      RendererStyleFlags3[RendererStyleFlags3.DashCase] = 'DashCase';
```

This PR adds support for the enums to be optimized by wrapping them in an iife and marks them as pure.

Fixes #13488
---
 .../src/transforms/wrap-enums.ts              | 24 +++++++-
 .../src/transforms/wrap-enums_spec.ts         | 58 +++++++++++++++++++
 2 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
index 6a31fdcb5172..394c122ffb7a 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
@@ -120,6 +120,14 @@ function visitBlockStatements(
         } else if (ts.isObjectLiteralExpression(variableDeclaration.initializer)
           && variableDeclaration.initializer.properties.length !== 0) {
           const literalPropertyCount = variableDeclaration.initializer.properties.length;
+
+          // tsickle es2015 enums first statement is an export declaration
+          const isPotentialEnumExport = ts.isExportDeclaration(statements[oIndex + 1]);
+          if (isPotentialEnumExport) {
+            // skip the export
+            oIndex ++;
+          }
+
           const enumStatements = findEnumNameStatements(name, statements, oIndex + 1);
           if (enumStatements.length === literalPropertyCount) {
             // found an enum
@@ -127,11 +135,13 @@ function visitBlockStatements(
               updatedStatements = statements.slice();
             }
             // create wrapper and replace variable statement and enum member statements
-            updatedStatements.splice(uIndex, enumStatements.length + 1, createWrappedEnum(
+            const deleteCount = enumStatements.length + (isPotentialEnumExport ? 2 : 1);
+            updatedStatements.splice(uIndex, deleteCount, createWrappedEnum(
               name,
               currentStatement,
               enumStatements,
               variableDeclaration.initializer,
+              isPotentialEnumExport,
             ));
             // skip enum member declarations
             oIndex += enumStatements.length;
@@ -475,8 +485,18 @@ function createWrappedEnum(
   hostNode: ts.VariableStatement,
   statements: Array<ts.Statement>,
   literalInitializer: ts.ObjectLiteralExpression | undefined,
+  addExportModifier = false,
 ): ts.Statement {
   literalInitializer = literalInitializer || ts.createObjectLiteral();
+
+  const node = addExportModifier
+    ? ts.updateVariableStatement(
+      hostNode,
+      [ts.createToken(ts.SyntaxKind.ExportKeyword)],
+      hostNode.declarationList,
+    )
+    : hostNode;
+
   const innerVarStmt = ts.createVariableStatement(
     undefined,
     ts.createVariableDeclarationList([
@@ -492,5 +512,5 @@ function createWrappedEnum(
     innerReturn,
   ]);
 
-  return updateHostNode(hostNode, addPureComment(ts.createParen(iife)));
+  return updateHostNode(node, addPureComment(ts.createParen(iife)));
 }
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
index 7f1319fde9cb..8c72b04ead37 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
@@ -38,6 +38,64 @@ describe('wrap-enums', () => {
     expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
   });
 
+  it('wraps ES2015 tsickle enums in IIFE', () => {
+    const input = tags.stripIndent`
+      const ChangeDetectionStrategy = {
+          OnPush: 0,
+          Default: 1,
+      };
+      export { ChangeDetectionStrategy };
+      ChangeDetectionStrategy[ChangeDetectionStrategy.OnPush] = 'OnPush';
+      ChangeDetectionStrategy[ChangeDetectionStrategy.Default] = 'Default';
+    `;
+
+    const output = tags.stripIndent`
+      export const ChangeDetectionStrategy = /*@__PURE__*/ (function () {
+          var ChangeDetectionStrategy = { OnPush: 0, Default: 1, };
+
+          ChangeDetectionStrategy[ChangeDetectionStrategy.OnPush] = 'OnPush';
+          ChangeDetectionStrategy[ChangeDetectionStrategy.Default] = 'Default';
+          return ChangeDetectionStrategy;
+      }());
+    `;
+
+    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+  });
+
+  it('wraps only ES2015 tsickle enums in IIFE', () => {
+    const input = tags.stripIndent`
+      const RendererStyleFlags3 = {
+          Important: 1,
+          DashCase: 2,
+      };
+      export { RendererStyleFlags3 };
+      RendererStyleFlags3[RendererStyleFlags3.Important] = 'Important';
+      RendererStyleFlags3[RendererStyleFlags3.DashCase] = 'DashCase';
+
+      export const domRendererFactory3 = {
+          createRenderer: (hostElement, rendererType) => { return document; }
+      };
+
+      export const unusedValueExportToPlacateAjd = 1;
+    `;
+    const output = tags.stripIndent`
+      export const RendererStyleFlags3 = /*@__PURE__*/ (function () {
+        var RendererStyleFlags3 = { Important: 1, DashCase: 2, };
+        RendererStyleFlags3[RendererStyleFlags3.Important] = 'Important';
+        RendererStyleFlags3[RendererStyleFlags3.DashCase] = 'DashCase';
+        return RendererStyleFlags3;
+      }());
+
+      export const domRendererFactory3 = {
+        createRenderer: (hostElement, rendererType) => { return document; }
+      };
+
+      export const unusedValueExportToPlacateAjd = 1;
+    `;
+
+    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+  });
+
   it('wraps ts >2.3 enums in IIFE', () => {
     const input = tags.stripIndent`
       export var ChangeDetectionStrategy;

From d536df95f2f51745f6bab30fa4870fe3c41d137d Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 22 Jan 2019 09:53:08 +0000
Subject: [PATCH 0670/1703] feat(@angular-devkit/build-angular): update webpack
 to 4.29

This version (https://github.com/webpack/webpack/releases/tag/v4.29.0) includes a memory leak fix for assets (https://github.com/webpack/webpack/pull/8609, https://github.com/webpack/webpack/pull/8642).

Thanks to @meligy for pinging about this!
---
 .../angular_devkit/build_angular/package.json |  2 +-
 .../models/webpack-configs/common.ts          |  1 +
 .../angular_devkit/build_webpack/package.json |  2 +-
 packages/ngtools/webpack/package.json         |  2 +-
 yarn.lock                                     | 30 ++++++++++---------
 5 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 7416729ffd9a..7323e43cf8bf 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -45,7 +45,7 @@
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.2.1",
-    "webpack": "4.28.4",
+    "webpack": "4.29.0",
     "webpack-dev-middleware": "3.5.1",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.2.1",
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 7225fcb0381a..372a5e05e330 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -292,6 +292,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
     context: projectRoot,
     entry: entryPoints,
     output: {
+      futureEmitAssets: true,
       path: path.resolve(root, buildOptions.outputPath as string),
       publicPath: buildOptions.deployUrl,
       filename: `[name]${hashFormat.chunk}.js`,
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index f92efc318da7..7cb0241a80c4 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -15,7 +15,7 @@
     "webpack-dev-server": "^3.1.4"
   },
   "devDependencies": {
-    "webpack": "4.28.4",
+    "webpack": "4.29.0",
     "webpack-dev-server": "^3.1.4"
   }
 }
\ No newline at end of file
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index c4f9462de14c..87b8235f346a 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -36,6 +36,6 @@
     "@angular/compiler": "^7.2.0-rc.0",
     "@angular/compiler-cli": "^7.2.0-rc.0",
     "typescript": "3.2.4",
-    "webpack": "4.28.4"
+    "webpack": "4.29.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 8f89644621e8..109206e9e181 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -783,18 +783,21 @@ accepts@~1.3.4, accepts@~1.3.5:
     mime-types "~2.1.18"
     negotiator "0.6.1"
 
-acorn-dynamic-import@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
-  integrity sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==
-  dependencies:
-    acorn "^5.0.0"
+acorn-dynamic-import@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
+  integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
 
-acorn@^5.0.0, acorn@^5.6.2:
+acorn@^5.0.0:
   version "5.7.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
   integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
+acorn@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.5.tgz#81730c0815f3f3b34d8efa95cb7430965f4d887a"
+  integrity sha512-i33Zgp3XWtmZBMNvCr4azvOFeWVw1Rk6p3hfi3LUDvIFraOMywb1kAtrbi+med14m4Xfpqm3zRZMT+c0FNE7kg==
+
 addressparser@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/addressparser/-/addressparser-1.0.1.tgz#47afbe1a2a9262191db6838e4fd1d39b40821746"
@@ -5600,7 +5603,6 @@ karma-sourcemap-loader@0.3.7:
 
 karma@alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a:
   version "1.7.1"
-  uid fa1a84ac881485b5657cb669e9b4e5da77b79f0a
   resolved "https://codeload.github.com/alexeagle/karma/tar.gz/fa1a84ac881485b5657cb669e9b4e5da77b79f0a"
   dependencies:
     bluebird "^3.3.0"
@@ -10528,17 +10530,17 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.28.4:
-  version "4.28.4"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.28.4.tgz#1ddae6c89887d7efb752adf0c3cd32b9b07eacd0"
-  integrity sha512-NxjD61WsK/a3JIdwWjtIpimmvE6UrRi3yG54/74Hk9rwNj5FPkA4DJCf1z4ByDWLkvZhTZE+P3C/eh6UD5lDcw==
+webpack@4.29.0:
+  version "4.29.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.0.tgz#f2cfef83f7ae404ba889ff5d43efd285ca26e750"
+  integrity sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w==
   dependencies:
     "@webassemblyjs/ast" "1.7.11"
     "@webassemblyjs/helper-module-context" "1.7.11"
     "@webassemblyjs/wasm-edit" "1.7.11"
     "@webassemblyjs/wasm-parser" "1.7.11"
-    acorn "^5.6.2"
-    acorn-dynamic-import "^3.0.0"
+    acorn "^6.0.5"
+    acorn-dynamic-import "^4.0.0"
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
     chrome-trace-event "^1.0.0"

From 13bf1c5e9b2855f4bad1930cda43caa12a9614a6 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 22 Jan 2019 06:53:45 +0000
Subject: [PATCH 0671/1703] build: update autoprefixer to version 9.4.6

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 53 ++++++++-----------
 2 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 7323e43cf8bf..05da0f8ab95c 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -12,7 +12,7 @@
     "@angular-devkit/core": "0.0.0",
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.7.0",
-    "autoprefixer": "9.4.5",
+    "autoprefixer": "9.4.6",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "4.6.0",
diff --git a/yarn.lock b/yarn.lock
index 109206e9e181..dcff00a29456 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1185,16 +1185,16 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@9.4.5:
-  version "9.4.5"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.5.tgz#a13ccb001e4bc8837f71c3354005b42f02cc03d7"
-  integrity sha512-M602C0ZxzFpJKqD4V6eq2j+K5CkzlhekCrcQupJmAOrPEZjWJyj/wSeo6qRSNoN6M3/9mtLPQqTTrABfReytQg==
+autoprefixer@9.4.6:
+  version "9.4.6"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.6.tgz#0ace275e33b37de16b09a5547dbfe73a98c1d446"
+  integrity sha512-Yp51mevbOEdxDUy5WjiKtpQaecqYq9OqZSL04rSoCiry7Tc5I9FEyo3bfxiTJc1DfHeKwSFCUYbBAiOQ2VGfiw==
   dependencies:
-    browserslist "^4.4.0"
-    caniuse-lite "^1.0.30000928"
+    browserslist "^4.4.1"
+    caniuse-lite "^1.0.30000929"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.11"
+    postcss "^7.0.13"
     postcss-value-parser "^3.3.1"
 
 autoprefixer@^9.0.0:
@@ -1628,13 +1628,13 @@ browserslist@^4.0.0, browserslist@^4.3.3:
     electron-to-chromium "^1.3.82"
     node-releases "^1.0.1"
 
-browserslist@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.0.tgz#7050d1412cbfc5274aba609ed5e50359ca1a5fdf"
-  integrity sha512-tQkHS8VVxWbrjnNDXgt7/+SuPJ7qDvD0Y2e6bLtoQluR2SPvlmPUcfcU75L1KAalhqULlIFJlJ6BDfnYyJxJsw==
+browserslist@^4.4.1:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.1.tgz#42e828954b6b29a7a53e352277be429478a69062"
+  integrity sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==
   dependencies:
-    caniuse-lite "^1.0.30000928"
-    electron-to-chromium "^1.3.100"
+    caniuse-lite "^1.0.30000929"
+    electron-to-chromium "^1.3.103"
     node-releases "^1.1.3"
 
 browserstack@^1.5.1:
@@ -1883,10 +1883,10 @@ caniuse-lite@^1.0.30000898, caniuse-lite@^1.0.30000899:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000903.tgz#86d46227759279b3db345ddbe778335dbba9e858"
   integrity sha512-T1XVJEpGCoaq7MDw7/6hCdYUukmSaS+1l/OQJkLtw7Cr2+/+d67tNGKEbyiqf7Ck8x6EhNFUxjYFXXka0N/w5g==
 
-caniuse-lite@^1.0.30000928:
-  version "1.0.30000928"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000928.tgz#805e828dc72b06498e3683a32e61c7507fd67b88"
-  integrity sha512-aSpMWRXL6ZXNnzm8hgE4QDLibG5pVJ2Ujzsuj3icazlIkxXkPXtL+BWnMx6FBkWmkZgBHGUxPZQvrbRw2ZTxhg==
+caniuse-lite@^1.0.30000929:
+  version "1.0.30000929"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000929.tgz#7b391b781a9c3097ecc39ea053301aea8ea16317"
+  integrity sha512-n2w1gPQSsYyorSVYqPMqbSaz1w7o9ZC8VhOEGI9T5MfGDzp7sbopQxG6GaQmYsaq13Xfx/mkxJUWC1Dz3oZfzw==
 
 canonical-path@1.0.0:
   version "1.0.0"
@@ -3147,10 +3147,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.100:
-  version "1.3.102"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.102.tgz#3ac43a037c8a63bca3dfa189eb3d90f097196787"
-  integrity sha512-2nzZuXw/KBPnI3QX3UOCSRvJiVy7o9+VHRDQ3D/EHCvVc89X6aj/GlNmEgiR2GBIhmSWXIi4W1M5okA5ScSlNg==
+electron-to-chromium@^1.3.103:
+  version "1.3.103"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.103.tgz#a695777efdbc419cad6cbb0e58458251302cd52f"
+  integrity sha512-tObPqGmY9X8MUM8i3MEimYmbnLLf05/QV5gPlkR8MQ3Uj8G8B2govE1U4cQcBYtv3ymck9Y8cIOu4waoiykMZQ==
 
 electron-to-chromium@^1.3.82:
   version "1.3.82"
@@ -7672,7 +7672,7 @@ postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.1:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss@7.0.13:
+postcss@7.0.13, postcss@^7.0.13:
   version "7.0.13"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.13.tgz#42bf716413e8f1c786ab71dc6e722b3671b16708"
   integrity sha512-h8SY6kQTd1wISHWjz+E6cswdhMuyBZRb16pSTv3W4zYZ3/YbyWeJdNUeOXB5IdZqE1U76OUEjjjqsC3z2f3hVg==
@@ -7690,15 +7690,6 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
     source-map "^0.6.1"
     supports-color "^5.5.0"
 
-postcss@^7.0.11:
-  version "7.0.11"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.11.tgz#f63c513b78026d66263bb2ca995bf02e3d1a697d"
-  integrity sha512-9AXb//5UcjeOEof9T+yPw3XTa5SL207ZOIC/lHYP4mbUTEh4M0rDAQekQpVANCZdwQwKhBtFZCk3i3h3h2hdWg==
-  dependencies:
-    chalk "^2.4.2"
-    source-map "^0.6.1"
-    supports-color "^6.1.0"
-
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"

From f6c80be867b1b03ae35c358b5589d90fc693402c Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sat, 19 Jan 2019 20:03:30 +0100
Subject: [PATCH 0672/1703] fix(@schematics/angular): add non deprecated
 `style` as default

When adding default in the application schematics we should use the non deprecated `style` option.
---
 packages/schematics/angular/application/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index f3234133b8a5..946a43970c7e 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -172,7 +172,7 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
       (schematics['@schematics/angular:component'] as JsonObject).inlineStyle = true;
     }
     if (options.style && options.style !== Style.Css) {
-      (schematics['@schematics/angular:component'] as JsonObject).styleext = options.style;
+      (schematics['@schematics/angular:component'] as JsonObject).style = options.style;
     }
   }
 

From 6b2699d53065ae2b1c0b2914e6a797a887802b3f Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 23 Jan 2019 06:48:01 +0000
Subject: [PATCH 0673/1703] build: update postcss to version 7.0.14

---
 .../angular_devkit/build_angular/package.json   |  2 +-
 yarn.lock                                       | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 05da0f8ab95c..0176aa0db1ab 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -29,7 +29,7 @@
     "minimatch": "3.0.4",
     "parse5": "4.0.0",
     "opn": "5.4.0",
-    "postcss": "7.0.13",
+    "postcss": "7.0.14",
     "postcss-import": "12.0.1",
     "postcss-loader": "3.0.0",
     "raw-loader": "1.0.0",
diff --git a/yarn.lock b/yarn.lock
index dcff00a29456..59d204cb7460 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7672,10 +7672,10 @@ postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.1:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss@7.0.13, postcss@^7.0.13:
-  version "7.0.13"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.13.tgz#42bf716413e8f1c786ab71dc6e722b3671b16708"
-  integrity sha512-h8SY6kQTd1wISHWjz+E6cswdhMuyBZRb16pSTv3W4zYZ3/YbyWeJdNUeOXB5IdZqE1U76OUEjjjqsC3z2f3hVg==
+postcss@7.0.14:
+  version "7.0.14"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
+  integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -7690,6 +7690,15 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
     source-map "^0.6.1"
     supports-color "^5.5.0"
 
+postcss@^7.0.13:
+  version "7.0.13"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.13.tgz#42bf716413e8f1c786ab71dc6e722b3671b16708"
+  integrity sha512-h8SY6kQTd1wISHWjz+E6cswdhMuyBZRb16pSTv3W4zYZ3/YbyWeJdNUeOXB5IdZqE1U76OUEjjjqsC3z2f3hVg==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"

From e12adf4dcb49faffb5ff6e9469665e239103834e Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 22 Jan 2019 18:51:39 +0100
Subject: [PATCH 0674/1703] refactor: create helper functions for pure comments

---
 .../build_optimizer/src/helpers/ast-utils.ts  | 21 +++++++++++++++++++
 .../src/transforms/class-fold.ts              | 19 +++++++----------
 .../src/transforms/prefix-classes.ts          | 11 ++--------
 .../src/transforms/prefix-functions.ts        | 16 ++------------
 .../src/transforms/wrap-enums.ts              | 12 +----------
 5 files changed, 33 insertions(+), 46 deletions(-)

diff --git a/packages/angular_devkit/build_optimizer/src/helpers/ast-utils.ts b/packages/angular_devkit/build_optimizer/src/helpers/ast-utils.ts
index 131dfbf8d420..8c34506d3283 100644
--- a/packages/angular_devkit/build_optimizer/src/helpers/ast-utils.ts
+++ b/packages/angular_devkit/build_optimizer/src/helpers/ast-utils.ts
@@ -7,6 +7,8 @@
  */
 import * as ts from 'typescript';
 
+const pureFunctionComment = '@__PURE__';
+
 // Find all nodes from the AST in the subtree of node of SyntaxKind kind.
 export function collectDeepNodes<T extends ts.Node>(node: ts.Node, kind: ts.SyntaxKind): T[] {
   const nodes: T[] = [];
@@ -20,3 +22,22 @@ export function collectDeepNodes<T extends ts.Node>(node: ts.Node, kind: ts.Synt
 
   return nodes;
 }
+
+export function addPureComment<T extends ts.Node>(node: T): T {
+  return ts.addSyntheticLeadingComment(
+    node,
+    ts.SyntaxKind.MultiLineCommentTrivia,
+    pureFunctionComment,
+    false,
+  );
+}
+
+export function hasPureComment(node: ts.Node): boolean {
+  if (!node) {
+    return false;
+  }
+
+  const leadingComment = ts.getSyntheticLeadingComments(node);
+
+  return !!leadingComment && leadingComment.some(comment => comment.text === pureFunctionComment);
+}
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/class-fold.ts b/packages/angular_devkit/build_optimizer/src/transforms/class-fold.ts
index ecc49220abb2..206a1b4ab420 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/class-fold.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/class-fold.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import * as ts from 'typescript';
+import { addPureComment } from '../helpers/ast-utils';
 
 interface ClassData {
   name: string;
@@ -81,18 +82,12 @@ export function getFoldFileTransformer(program: ts.Program): ts.TransformerFacto
           const classStatement = clazz.declaration as ts.ClassDeclaration;
           const innerReturn = ts.createReturn(ts.createIdentifier(clazz.name));
 
-          const iife = ts.createImmediatelyInvokedFunctionExpression([
-            classStatement,
-            ...clazz.statements.map(st => st.expressionStatement),
-            innerReturn,
-          ]);
-
-          const pureIife = ts.addSyntheticLeadingComment(
-            iife,
-            ts.SyntaxKind.MultiLineCommentTrivia,
-            '@__PURE__',
-            false,
-          );
+          const pureIife = addPureComment(
+            ts.createImmediatelyInvokedFunctionExpression([
+              classStatement,
+              ...clazz.statements.map(st => st.expressionStatement),
+              innerReturn,
+            ]));
 
           // Move the original class modifiers to the var statement.
           const newNode = ts.createVariableStatement(
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts b/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts
index cc8797d7751a..0ade653c54f8 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import * as ts from 'typescript';
+import { addPureComment } from '../helpers/ast-utils';
 
 /**
  * @deprecated From 0.9.0
@@ -42,9 +43,6 @@ const extendsHelperName = '__extends';
 export function getPrefixClassesTransformer(): ts.TransformerFactory<ts.SourceFile> {
   return (context: ts.TransformationContext): ts.Transformer<ts.SourceFile> => {
     const transformer: ts.Transformer<ts.SourceFile> = (sf: ts.SourceFile) => {
-
-      const pureFunctionComment = '@__PURE__';
-
       const visitor: ts.Visitor = (node: ts.Node): ts.VisitResult<ts.Node> => {
 
         // Add pure comment to downleveled classes.
@@ -63,12 +61,7 @@ export function getPrefixClassesTransformer(): ts.TransformerFactory<ts.SourceFi
                   varDecl,
                   varDecl.name,
                   varDecl.type,
-                  ts.addSyntheticLeadingComment(
-                    varInitializer,
-                    ts.SyntaxKind.MultiLineCommentTrivia,
-                    pureFunctionComment,
-                    false,
-                  ),
+                  addPureComment(varInitializer),
                 ),
               ],
             ),
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions.ts b/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions.ts
index 99d6227b65a5..05ac4f0bac23 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions.ts
@@ -6,9 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import * as ts from 'typescript';
-
-
-const pureFunctionComment = '@__PURE__';
+import { addPureComment, hasPureComment } from '../helpers/ast-utils';
 
 export function getPrefixFunctionsTransformer(): ts.TransformerFactory<ts.SourceFile> {
   return (context: ts.TransformationContext): ts.Transformer<ts.SourceFile> => {
@@ -19,8 +17,7 @@ export function getPrefixFunctionsTransformer(): ts.TransformerFactory<ts.Source
       const visitor: ts.Visitor = (node: ts.Node): ts.Node => {
         // Add pure function comment to top level functions.
         if (topLevelFunctions.has(node)) {
-          const newNode = ts.addSyntheticLeadingComment(
-            node, ts.SyntaxKind.MultiLineCommentTrivia, pureFunctionComment, false);
+          const newNode = addPureComment(node);
 
           // Replace node with modified one.
           return ts.visitEachChild(newNode, visitor, context);
@@ -96,12 +93,3 @@ export function findTopLevelFunctions(parentNode: ts.Node): Set<ts.Node> {
 
   return topLevelFunctions;
 }
-
-function hasPureComment(node: ts.Node) {
-  if (!node) {
-    return false;
-  }
-  const leadingComment = ts.getSyntheticLeadingComments(node);
-
-  return leadingComment && leadingComment.some((comment) => comment.text === pureFunctionComment);
-}
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
index 394c122ffb7a..8b2341cdd00f 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import * as ts from 'typescript';
+import { addPureComment } from '../helpers/ast-utils';
 
 function isBlockLike(node: ts.Node): node is ts.BlockLike {
   return node.kind === ts.SyntaxKind.Block
@@ -384,17 +385,6 @@ function findEnumNameStatements(
   return enumStatements;
 }
 
-function addPureComment<T extends ts.Node>(node: T): T {
-  const pureFunctionComment = '@__PURE__';
-
-  return ts.addSyntheticLeadingComment(
-    node,
-    ts.SyntaxKind.MultiLineCommentTrivia,
-    pureFunctionComment,
-    false,
-  );
-}
-
 function updateHostNode(
   hostNode: ts.VariableStatement,
   expression: ts.Expression,

From 0c65664f03ed79029b6424267ed39014b18ad996 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Wed, 23 Jan 2019 10:59:44 +0100
Subject: [PATCH 0675/1703] fix(@angular-devkit/build-angular): error only when
 file is not found in non of the programs

At the moment, if a user provides multiple tsconfig, a file needs to be part of all compilations as otherwise it will fail.

This PR changes this behavour and as long as it's in one of the compilations it will not error out.

Fixes #13399
---
 .../build_angular/src/tslint/index.ts         | 44 ++++++++++---------
 .../test/tslint/works_spec_large.ts           | 34 +++++++++++++-
 2 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/tslint/index.ts b/packages/angular_devkit/build_angular/src/tslint/index.ts
index 525334b47950..9abae70d5733 100644
--- a/packages/angular_devkit/build_angular/src/tslint/index.ts
+++ b/packages/angular_devkit/build_angular/src/tslint/index.ts
@@ -84,10 +84,12 @@ export default class TslintBuilder implements Builder<TslintBuilderOptions> {
       let result: undefined | tslint.LintResult;
       if (options.tsConfig) {
         const tsConfigs = Array.isArray(options.tsConfig) ? options.tsConfig : [options.tsConfig];
+        const allPrograms =
+          tsConfigs.map(tsConfig => Linter.createProgram(path.resolve(systemRoot, tsConfig)));
 
-        for (const tsConfig of tsConfigs) {
-          const program = Linter.createProgram(path.resolve(systemRoot, tsConfig));
-          const partial = lint(projectTslint, systemRoot, tslintConfigPath, options, program);
+        for (const program of allPrograms) {
+          const partial
+            = lint(projectTslint, systemRoot, tslintConfigPath, options, program, allPrograms);
           if (result == undefined) {
             result = partial;
           } else {
@@ -152,6 +154,7 @@ function lint(
   tslintConfigPath: string | null,
   options: TslintBuilderOptions,
   program?: ts.Program,
+  allPrograms?: ts.Program[],
 ) {
   const Linter = projectTslint.Linter;
   const Configuration = projectTslint.Configuration;
@@ -167,7 +170,21 @@ function lint(
   let lastDirectory;
   let configLoad;
   for (const file of files) {
-    const contents = getFileContents(file, options, program);
+    let contents = '';
+    if (program && allPrograms) {
+      if (!program.getSourceFile(file)) {
+        if (!allPrograms.some(p => p.getSourceFile(file) !== undefined)) {
+          // File is not part of any typescript program
+          throw new Error(
+            `File '${file}' is not part of a TypeScript project '${options.tsConfig}'.`);
+        }
+
+        // if the Source file exists but it's not in the current program skip
+        continue;
+      }
+    } else {
+      contents = getFileContents(file);
+    }
 
     // Only check for a new tslint config if the path changes.
     const currentDirectory = path.dirname(file);
@@ -176,7 +193,7 @@ function lint(
       lastDirectory = currentDirectory;
     }
 
-    if (contents && configLoad) {
+    if (configLoad) {
       linter.lint(file, contents, configLoad.results);
     }
   }
@@ -217,22 +234,7 @@ function getFilesToLint(
   return programFiles;
 }
 
-function getFileContents(
-  file: string,
-  options: TslintBuilderOptions,
-  program?: ts.Program,
-): string | undefined {
-  // The linter retrieves the SourceFile TS node directly if a program is used
-  if (program) {
-    if (program.getSourceFile(file) == undefined) {
-      const message = `File '${file}' is not part of the TypeScript project '${options.tsConfig}'.`;
-      throw new Error(message);
-    }
-
-    // TODO: this return had to be commented out otherwise no file would be linted, figure out why.
-    // return undefined;
-  }
-
+function getFileContents(file: string): string {
   // NOTE: The tslint CLI checks for and excludes MPEG transport streams; this does not.
   try {
     return stripBom(readFileSync(file, 'utf-8'));
diff --git a/packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts b/packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts
index b3789f669b47..8f677cf751a1 100644
--- a/packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts
@@ -8,7 +8,8 @@
 
 import { DefaultTimeout, TestLogger, runTargetSpec } from '@angular-devkit/architect/testing';
 import { normalize, virtualFs } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
+import { EMPTY } from 'rxjs';
+import { catchError, tap } from 'rxjs/operators';
 import { TslintBuilderOptions } from '../../src';
 import { host, tslintTargetSpec } from '../utils';
 
@@ -215,6 +216,37 @@ describe('Tslint Target', () => {
     ).toPromise().then(done, done.fail);
   }, 30000);
 
+  it('works when a file is only part of one project when using two program', (done) => {
+    const overrides: Partial<TslintBuilderOptions> = {
+      tsConfig: ['src/tsconfig.app.json', 'src/tsconfig.spec.json'],
+      files: ['src/foo/foo.component.ts'],
+    };
+
+    host.writeMultipleFiles({ 'src/foo/foo.component.ts': `const foo = '';\n` });
+
+    runTargetSpec(host, tslintTargetSpec, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+    ).toPromise().then(done, done.fail);
+  }, 30000);
+
+  it('errors when file is not part of any typescript program', (done) => {
+    const overrides: Partial<TslintBuilderOptions> = {
+      tsConfig: ['src/tsconfig.spec.json'],
+      files: ['src/foo/foo.component.ts'],
+    };
+
+    host.writeMultipleFiles({ 'src/foo/foo.component.ts': `const foo = '';\n` });
+
+    runTargetSpec(host, tslintTargetSpec, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(false)),
+      catchError((err) => {
+        expect(err).toMatch(`foo.component.ts' is not part of a TypeScript project`);
+
+        return EMPTY;
+      }),
+    ).toPromise().then(done, done.fail);
+  }, 30000);
+
   it('errors when type checking is used without a project', (done) => {
     const overrides: Partial<TslintBuilderOptions> = {
       tsConfig: undefined,

From bf648a2c689a643fbd2c22fcb3e1811b93ee8142 Mon Sep 17 00:00:00 2001
From: Edy Segura <edysegura@users.noreply.github.com>
Date: Tue, 22 Jan 2019 16:23:46 -0200
Subject: [PATCH 0676/1703] docs: fix typo in index.html

Fix "unittest" typo in index.html
---
 etc/cli.angular.io/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/cli.angular.io/index.html b/etc/cli.angular.io/index.html
index 4fae95573ff8..b64057ce2540 100644
--- a/etc/cli.angular.io/index.html
+++ b/etc/cli.angular.io/index.html
@@ -102,7 +102,7 @@ <h4>ng serve</h4>
 
     <div class="features-list">
         <h4>Test, Lint, Format</h4>
-        <p>Make your code really shine. Run your unittests or your end-to-end tests with the breeze of a command. Execute the official Angular linter and run clang format.</p>
+        <p>Make your code really shine. Run your unit tests or your end-to-end tests with the breeze of a command. Execute the official Angular linter and run clang format.</p>
     </div>
 
 

From 2ed1719eaa29fe17d7763a893e13ac16d09abf25 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 23 Jan 2019 19:06:23 +0100
Subject: [PATCH 0677/1703] fix(@angular-devkit/core): remove colors for info
 messages

Rely on the terminal to provide the color for info messages

fixes #13497
---
 packages/angular_devkit/benchmark/src/main.ts   | 3 ++-
 packages/angular_devkit/core/node/cli-logger.ts | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/benchmark/src/main.ts b/packages/angular_devkit/benchmark/src/main.ts
index 2723728c6bc8..18d09d54c1e9 100644
--- a/packages/angular_devkit/benchmark/src/main.ts
+++ b/packages/angular_devkit/benchmark/src/main.ts
@@ -98,10 +98,11 @@ export async function main({
       let output = stdout;
       switch (entry.level) {
         case 'info':
-          color = terminal.white;
+          color = s => s;
           break;
         case 'warn':
           color = terminal.yellow;
+          output = stderr;
           break;
         case 'error':
           color = terminal.red;
diff --git a/packages/angular_devkit/core/node/cli-logger.ts b/packages/angular_devkit/core/node/cli-logger.ts
index 83ea08efa084..25636fe13d8a 100644
--- a/packages/angular_devkit/core/node/cli-logger.ts
+++ b/packages/angular_devkit/core/node/cli-logger.ts
@@ -29,7 +29,7 @@ export function createConsoleLogger(
       let output = stdout;
       switch (entry.level) {
         case 'info':
-          color = terminal.reset;
+          color = s => s;
           break;
         case 'warn':
           color = (s: string) => terminal.bold(terminal.yellow(s));

From bf228a064c24779a57e5592debb367831b5abb9b Mon Sep 17 00:00:00 2001
From: Minko Gechev <mgechev@google.com>
Date: Wed, 23 Jan 2019 11:49:02 -0800
Subject: [PATCH 0678/1703] release: v7.3.0-rc.0

---
 .monorepo.json | 76 +++++++++++++++++++++++++-------------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index 86ebfa52200e..509606bc5535 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,16 +42,16 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.13.0-beta.0",
-      "hash": "6d499b7cc1fecfdca1ee530d68af2743"
+      "version": "0.13.0-rc.0",
+      "hash": "4eecb4a76317039defc5c2b4bd31e4f9"
     },
     "@_/builders": {
-      "version": "0.13.0-beta.0",
-      "hash": "a365103b30adf919f51d22b50194fdac"
+      "version": "0.13.0-rc.0",
+      "hash": "796f00a3b325334632fd8bb9d1b46b02"
     },
     "devkit": {
-      "version": "0.13.0-beta.0",
-      "hash": "9e3df175b7cdbd427f94fe6ea869275a"
+      "version": "0.13.0-rc.0",
+      "hash": "10155f9a3d1491f01029f3e1f17e53c5"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -62,15 +62,15 @@
           "url": "/packages/angular/cli/README.md"
         }
       ],
-      "version": "7.3.0-beta.0",
+      "version": "7.3.0-rc.0",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "726669cc233ebcc7fd886b2ac10e10c8"
+      "hash": "98ba66c65bd76e6416c395168ea36942"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.13.0-beta.0",
-      "hash": "b2a93aad732adc4420291773c2557e9d",
+      "version": "0.13.0-rc.0",
+      "hash": "d083cd4c874ab24a9e64a688a46819d5",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -81,21 +81,21 @@
           "url": "/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.13.0-beta.0",
-      "hash": "30f0656d34bee230efc9b0895de4c428",
+      "version": "0.13.0-rc.0",
+      "hash": "cad5e9583409b4aaa4265c9058570e1c",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.13.0-beta.0",
-      "hash": "cc86b1046bc2bd94a964afaffebe49af",
+      "version": "0.13.0-rc.0",
+      "hash": "79975f9eddbd7c9da181621757242159",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
       "name": "Benchmark",
       "section": "Tooling",
-      "version": "1.2.0-beta.0",
-      "hash": "adce731cbc698d3f6598d39fbcce5bed"
+      "version": "1.2.0-rc.0",
+      "hash": "2fd80ee178831cf05f721dc60d427045"
     },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
@@ -105,8 +105,8 @@
           "url": "/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.13.0-beta.0",
-      "hash": "e6c5f5f9a3bc0dc7b42e9fe9fe445d5c",
+      "version": "0.13.0-rc.0",
+      "hash": "963623296eed8991da173b36ae133422",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -117,8 +117,8 @@
           "url": "/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.13.0-beta.0",
-      "hash": "e5c1bebd49b8b2b5a6db0a59427c3daa",
+      "version": "0.13.0-rc.0",
+      "hash": "204d6049be4dc38231ad340f6647234e",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -129,8 +129,8 @@
           "url": "/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.13.0-beta.0",
-      "hash": "ef614518589fe86609d91174f4c4dd22",
+      "version": "0.13.0-rc.0",
+      "hash": "62c5c47288d1e6253aee2b87f58d23ea",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -141,9 +141,9 @@
           "url": "/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.13.0-beta.0",
+      "version": "0.13.0-rc.0",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "52271aa953c59b0eba5e57b48c630a60"
+      "hash": "f969c837647b6e7b2252e8043d5f51a4"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -153,8 +153,8 @@
           "url": "/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "7.3.0-beta.0",
-      "hash": "dfe70517435acc2bde59dc909a81a2e0",
+      "version": "7.3.0-rc.0",
+      "hash": "3b41fea05a2407f68376577c7e187125",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -165,43 +165,43 @@
           "url": "/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "7.3.0-beta.0",
-      "hash": "19ea3c709b4161f2962e6517be3a702c",
+      "version": "7.3.0-rc.0",
+      "hash": "1c02c44f881d843eb073203f3dc6d595",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.13.0-beta.0",
-      "hash": "a72e1bf8b28cf9f1efae876c71b1342c",
+      "version": "0.13.0-rc.0",
+      "hash": "e7387a3eacefb5cfbcacd7c652a4cce4",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "7.3.0-beta.0",
+      "version": "7.3.0-rc.0",
       "section": "Misc",
-      "hash": "df0983f56c62d06793be9c5d7df4b66e",
+      "hash": "29ac1ec6a3c2011594995d1cec89cab4",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "7.3.0-beta.0",
-      "hash": "003087095d6db80f88853ed372c6012d",
+      "version": "7.3.0-rc.0",
+      "hash": "fcadd5d025797bdb162ce731e1515b99",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.13.0-beta.0",
+      "version": "0.13.0-rc.0",
       "section": "Schematics",
-      "hash": "77ea160b6188f658332e02ed4ac0aab6",
+      "hash": "edbe388e57e8805d49bdd41410b147bc",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.13.0-beta.0",
+      "version": "0.13.0-rc.0",
       "section": "Schematics",
-      "hash": "507b09653ac3cdd985f128b2b80e27f1",
+      "hash": "128b864b9f5d8d844cee04103a639d5c",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }

From b360206b31689fdd1675f8b7d0177dc2ce4c2f84 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Wed, 23 Jan 2019 11:54:59 -0800
Subject: [PATCH 0679/1703] ci: checkout existing branch on snapshots

---
 scripts/snapshots.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/snapshots.ts b/scripts/snapshots.ts
index 2fc62bfdde7b..2c65de4b083f 100644
--- a/scripts/snapshots.ts
+++ b/scripts/snapshots.ts
@@ -91,7 +91,12 @@ async function _publishSnapshot(
 
   _exec('git', ['clone', url], { cwd: root }, publishLogger);
   if (branch) {
-    _exec('git', ['checkout', '-B', branch], { cwd: destPath }, publishLogger);
+    // Try to checkout an existing branch, otherwise create it.
+    try {
+      _exec('git', ['checkout', branch], { cwd: destPath }, publishLogger);
+    } catch {
+      _exec('git', ['checkout', '-b', branch], { cwd: destPath }, publishLogger);
+    }
   }
 
   // Clear snapshot directory before publishing to remove deleted build files.

From d07cbe2395561ef9c4e8113ceb3ff86bf246d1c6 Mon Sep 17 00:00:00 2001
From: Minko Gechev <mgechev@google.com>
Date: Thu, 24 Jan 2019 11:21:36 -0800
Subject: [PATCH 0680/1703] docs: update release process

---
 docs/process/release.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/process/release.md b/docs/process/release.md
index ae7a3c0ca00e..d4d4d4c340ae 100644
--- a/docs/process/release.md
+++ b/docs/process/release.md
@@ -56,6 +56,11 @@ See `scripts/release.ts` for the full list of release types, e.g. patch updates
 
 ```bash
 devkit-admin release patch --force # replace with minor-beta etc.
+```
+
+Make sure you update the package versions in `packages/schematics/angular/utility/latest-versions.ts`. After that:
+
+```bash
 git commit -a -m 'release: vXX'
 git tag 'vXX'
 git push upstream && git push upstream --tags

From 8cdf4ca7463c1065d8594cf0ddfaf90f4b4a1b19 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 25 Jan 2019 06:47:15 +0000
Subject: [PATCH 0681/1703] build: update pacote to version 9.4.1

---
 packages/angular/cli/package.json       | 2 +-
 packages/schematics/update/package.json | 2 +-
 yarn.lock                               | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 4afada26f829..cb98f7c64a5e 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -36,7 +36,7 @@
     "inquirer": "6.2.1",
     "npm-package-arg": "6.1.0",
     "opn": "5.4.0",
-    "pacote": "9.4.0",
+    "pacote": "9.4.1",
     "semver": "5.6.0",
     "symbol-observable": "1.2.0"
   },
diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index 50341bd25bcf..87bc3fb3559b 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -14,7 +14,7 @@
     "@angular-devkit/schematics": "0.0.0",
     "@yarnpkg/lockfile": "1.1.0",
     "ini": "1.3.5",
-    "pacote": "9.4.0",
+    "pacote": "9.4.1",
     "semver": "5.6.0",
     "semver-intersect": "1.4.0",
     "rxjs": "6.3.3"
diff --git a/yarn.lock b/yarn.lock
index 59d204cb7460..8fda0087cd7c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7283,10 +7283,10 @@ package-json@^4.0.0:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
-pacote@9.4.0:
-  version "9.4.0"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.4.0.tgz#af979abdeb175cd347c3e33be3241af1ed254807"
-  integrity sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==
+pacote@9.4.1:
+  version "9.4.1"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.4.1.tgz#f0af2a52d241bce523d39280ac810c671db62279"
+  integrity sha512-YKSRsQqmeHxgra0KCdWA2FtVxDPUlBiCdmew+mSe44pzlx5t1ViRMWiQg18T+DREA+vSqYfKzynaToFR4hcKHw==
   dependencies:
     bluebird "^3.5.3"
     cacache "^11.3.2"

From 926b569a451b52201e713d408f1762ca1d371b3e Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Thu, 24 Jan 2019 16:04:39 +0100
Subject: [PATCH 0682/1703] docs: remove non existing format command

---
 etc/cli.angular.io/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/cli.angular.io/index.html b/etc/cli.angular.io/index.html
index b64057ce2540..24375b764f1a 100644
--- a/etc/cli.angular.io/index.html
+++ b/etc/cli.angular.io/index.html
@@ -101,8 +101,8 @@ <h4>ng serve</h4>
     </div>
 
     <div class="features-list">
-        <h4>Test, Lint, Format</h4>
-        <p>Make your code really shine. Run your unit tests or your end-to-end tests with the breeze of a command. Execute the official Angular linter and run clang format.</p>
+        <h4>Test, Lint</h4>
+        <p>Make your code really shine. Run your unit tests, your end-to-end tests, or execute the official Angular linter with the breeze of a command.</p>
     </div>
 
 

From d18f89d483bea0101e3434eee5b9d961db0f91b5 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 18 Jan 2019 11:47:47 -0500
Subject: [PATCH 0683/1703] refactor(@angular-devkit/schematics): remove unused
 VirtualTree classes

---
 .../schematics/src/_golden-api.d.ts           |  79 ----
 .../angular_devkit/schematics/src/index.ts    |   2 -
 .../schematics/src/rules/base.ts              |  27 +-
 .../schematics/src/tree/filesystem.ts         | 185 --------
 .../schematics/src/tree/filesystem_spec.ts    | 107 -----
 .../schematics/src/tree/filtered.ts           |  40 --
 .../schematics/src/tree/filtered_spec.ts      |  23 -
 .../schematics/src/tree/host-tree_spec.ts     |  25 --
 .../schematics/src/tree/static.ts             |  26 +-
 .../schematics/src/tree/virtual.ts            | 394 ------------------
 .../schematics/src/tree/virtual_spec.ts       | 304 --------------
 11 files changed, 4 insertions(+), 1208 deletions(-)
 delete mode 100644 packages/angular_devkit/schematics/src/tree/filesystem.ts
 delete mode 100644 packages/angular_devkit/schematics/src/tree/filesystem_spec.ts
 delete mode 100644 packages/angular_devkit/schematics/src/tree/filtered.ts
 delete mode 100644 packages/angular_devkit/schematics/src/tree/filtered_spec.ts
 delete mode 100644 packages/angular_devkit/schematics/src/tree/virtual.ts
 delete mode 100644 packages/angular_devkit/schematics/src/tree/virtual_spec.ts

diff --git a/etc/api/angular_devkit/schematics/src/_golden-api.d.ts b/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
index 8211253cbaab..13d616c3e643 100644
--- a/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
@@ -244,35 +244,10 @@ export interface FilePredicate<T> {
     (path: Path, entry?: Readonly<FileEntry> | null): T;
 }
 
-export declare class FileSystemCreateTree extends FileSystemTree {
-    constructor(host: virtualFs.Host);
-}
-
-export declare class FileSystemDirEntry extends VirtualDirEntry {
-    protected _host: virtualFs.SyncDelegateHost<{}>;
-    readonly parent: DirEntry | null;
-    readonly subdirs: PathFragment[];
-    readonly subfiles: PathFragment[];
-    constructor(_host: virtualFs.SyncDelegateHost<{}>, tree: FileSystemTree, path?: Path);
-    protected _createDir(name: PathFragment): DirEntry;
-    file(name: PathFragment): FileEntry | null;
-}
-
 export declare class FileSystemSink extends HostSink {
     constructor(dir: string, force?: boolean);
 }
 
-export declare class FileSystemTree extends VirtualTree {
-    protected _host: virtualFs.SyncDelegateHost<{}>;
-    protected _initialized: boolean;
-    readonly tree: Map<Path, FileEntry>;
-    constructor(host: virtualFs.Host);
-    protected _copyTo<T extends VirtualTree>(tree: T): void;
-    protected _recursiveFileList(): Path[];
-    branch(): Tree;
-    get(path: string): FileEntry | null;
-}
-
 export declare type FileVisitor = FilePredicate<void>;
 
 export declare const FileVisitorCancelToken: symbol;
@@ -634,60 +609,6 @@ export interface UpdateRecorder {
 
 export declare function url(urlString: string): Source;
 
-export declare class VirtualDirEntry implements DirEntry {
-    protected _path: Path;
-    protected _subdirs: Map<PathFragment, DirEntry>;
-    protected _tree: VirtualTree;
-    readonly parent: DirEntry | null;
-    readonly path: Path;
-    readonly subdirs: PathFragment[];
-    readonly subfiles: PathFragment[];
-    constructor(_tree: VirtualTree, _path?: Path);
-    protected _createDir(name: PathFragment): DirEntry;
-    dir(name: PathFragment): DirEntry;
-    file(name: PathFragment): FileEntry | null;
-    visit(visitor: FileVisitor): void;
-}
-
-export declare class VirtualTree implements Tree {
-    protected _actions: ActionList;
-    protected _cacheMap: Map<Path, FileEntry>;
-    protected _root: VirtualDirEntry;
-    protected _tree: Map<Path, FileEntry>;
-    readonly actions: Action[];
-    readonly files: Path[];
-    readonly root: DirEntry;
-    readonly staging: ReadonlyMap<Path, FileEntry>;
-    protected readonly tree: ReadonlyMap<Path, FileEntry>;
-    protected _copyTo<T extends VirtualTree>(tree: T): void;
-    protected _create(path: Path, content: Buffer, action?: Action): void;
-    protected _delete(path: Path, action?: Action): void;
-    protected _normalizePath(path: string): Path;
-    protected _overwrite(path: Path, content: Buffer, action?: Action): void;
-    protected _rename(path: Path, to: Path, action?: Action, force?: boolean): void;
-    apply(action: Action, strategy: MergeStrategy): void;
-    beginUpdate(path: string): UpdateRecorder;
-    branch(): Tree;
-    commitUpdate(record: UpdateRecorder): void;
-    create(path: string, content: Buffer | string): void;
-    delete(path: string): void;
-    exists(path: string): boolean;
-    get(path: string): FileEntry | null;
-    getDir(path: string): DirEntry;
-    has(path: string): boolean;
-    merge(other: Tree, strategy?: MergeStrategy): void;
-    optimize(): void;
-    overwrite(path: string, content: Buffer | string): void;
-    read(path: string): Buffer | null;
-    rename(path: string, to: string): void;
-    set(entry: FileEntry): Map<Path, FileEntry>;
-    visit(visitor: FileVisitor): void;
-    static branch(tree: Tree): Tree;
-    static isVirtualTree(tree: Tree): tree is VirtualTree;
-    static merge(tree: Tree, other: Tree, strategy?: MergeStrategy): Tree;
-    static optimize(tree: Tree): VirtualTree;
-}
-
 export declare function when(predicate: FilePredicate<boolean>, operator: FileOperator): FileOperator;
 
 export interface Workflow {
diff --git a/packages/angular_devkit/schematics/src/index.ts b/packages/angular_devkit/schematics/src/index.ts
index 52c8b314e8eb..186d53b51117 100644
--- a/packages/angular_devkit/schematics/src/index.ts
+++ b/packages/angular_devkit/schematics/src/index.ts
@@ -25,8 +25,6 @@ export * from './rules/url';
 export * from './tree/delegate';
 export * from './tree/empty';
 export * from './tree/host-tree';
-export * from './tree/filesystem';
-export * from './tree/virtual';
 export {UpdateRecorder} from './tree/interface';
 export * from './engine/schematic';
 export * from './sink/dryrun';
diff --git a/packages/angular_devkit/schematics/src/rules/base.ts b/packages/angular_devkit/schematics/src/rules/base.ts
index 1b97678a1b52..8784ff4bed7d 100644
--- a/packages/angular_devkit/schematics/src/rules/base.ts
+++ b/packages/angular_devkit/schematics/src/rules/base.ts
@@ -9,7 +9,6 @@ import { Observable, of as observableOf } from 'rxjs';
 import { concatMap, last, map } from 'rxjs/operators';
 import { FileOperator, Rule, SchematicContext, Source } from '../engine/interface';
 import { SchematicsException } from '../exception/exception';
-import { FilteredTree } from '../tree/filtered';
 import { FilterHostTree, HostTree } from '../tree/host-tree';
 import { FileEntry, FilePredicate, MergeStrategy, Tree } from '../tree/interface';
 import { ScopedTree } from '../tree/scoped';
@@ -17,10 +16,8 @@ import {
   branch,
   empty as staticEmpty,
   merge as staticMerge,
-  optimize as staticOptimize,
   partition as staticPartition,
 } from '../tree/static';
-import { VirtualTree } from '../tree/virtual';
 import { callRule, callSource } from './call';
 
 
@@ -56,24 +53,7 @@ export function chain(rules: Rule[]): Rule {
  * Apply multiple rules to a source, and returns the source transformed.
  */
 export function apply(source: Source, rules: Rule[]): Source {
-  return (context: SchematicContext) => {
-    return callRule(chain([
-      ...rules,
-      // Optimize the tree. Since this is a source tree, there's not much harm here and this might
-      // avoid further issues.
-      tree => {
-        if (tree instanceof VirtualTree) {
-          tree.optimize();
-
-          return tree;
-        } else if (tree.actions.length != 0) {
-          return staticOptimize(tree);
-        } else {
-          return tree;
-        }
-      },
-    ]), callSource(source, context), context);
-  };
+  return context => callRule(chain(rules), callSource(source, context), context);
 }
 
 
@@ -96,10 +76,7 @@ export function noop(): Rule {
 
 export function filter(predicate: FilePredicate<boolean>): Rule {
   return ((tree: Tree) => {
-    // TODO: Remove VirtualTree usage in 7.0
-    if (VirtualTree.isVirtualTree(tree)) {
-      return new FilteredTree(tree, predicate);
-    } else if (HostTree.isHostTree(tree)) {
+    if (HostTree.isHostTree(tree)) {
       return new FilterHostTree(tree, predicate);
     } else {
       throw new SchematicsException('Tree type is not supported.');
diff --git a/packages/angular_devkit/schematics/src/tree/filesystem.ts b/packages/angular_devkit/schematics/src/tree/filesystem.ts
deleted file mode 100644
index bdddbae80c09..000000000000
--- a/packages/angular_devkit/schematics/src/tree/filesystem.ts
+++ /dev/null
@@ -1,185 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import {
-  Path,
-  PathFragment,
-  basename,
-  dirname,
-  fragment,
-  join,
-  normalize,
-  virtualFs,
-} from '@angular-devkit/core';
-import { LazyFileEntry } from './entry';
-import { DirEntry, FileEntry, Tree } from './interface';
-import { VirtualDirEntry, VirtualTree } from './virtual';
-
-
-export class FileSystemDirEntry extends VirtualDirEntry {
-  constructor(
-    protected _host: virtualFs.SyncDelegateHost<{}>,
-    tree: FileSystemTree,
-    path: Path = normalize('/'),
-  ) {
-    super(tree, path);
-  }
-
-  protected _createDir(name: PathFragment): DirEntry {
-    return new FileSystemDirEntry(this._host, this._tree as FileSystemTree, join(this._path, name));
-  }
-
-  get parent() {
-    return this._path == '/' ? null : this._tree.getDir(dirname(this._path));
-  }
-  get subdirs() {
-    const result = new Set<PathFragment>();
-
-    try {
-      this._host.list(this._path)
-          .filter(name => this._host.isDirectory(join(this._path, name)))
-          .forEach(name => result.add(fragment(name)));
-    } catch (e) {
-      if (e.code != 'ENOENT' && e.code != 'ENOTDIR') {
-        throw e;
-      }
-    }
-
-    for (const path of this._tree.staging.keys()) {
-      if (path.startsWith(this._path) && dirname(path) != this._path) {
-        result.add(basename(path));
-      }
-    }
-
-    return [...result];
-  }
-  get subfiles() {
-    const result = new Set<PathFragment>();
-
-    try {
-      this._host.list(this._path)
-        .filter(name => !this._host.isDirectory(join(this._path, name)))
-        .forEach(name => result.add(fragment(name)));
-    } catch (e) {
-      if (e.code != 'ENOENT' && e.code != 'ENOTDIR') {
-        throw e;
-      }
-    }
-
-    for (const path of this._tree.staging.keys()) {
-      if (path.startsWith(this._path) && dirname(path) == this._path) {
-        result.add(basename(path));
-      }
-    }
-
-    return [...result];
-  }
-
-  file(name: PathFragment) {
-    return this._tree.get(join(this._path, name));
-  }
-}
-
-
-export class FileSystemTree extends VirtualTree {
-  // This needs to be SyncDelegateHost because schematics Trees are synchronous.
-  protected _host: virtualFs.SyncDelegateHost<{}>;
-  protected _initialized = false;
-
-  constructor(host: virtualFs.Host) {
-    super();
-    this._host = new virtualFs.SyncDelegateHost<{}>(host);
-    this._root = new FileSystemDirEntry(this._host, this);
-  }
-
-  get tree(): Map<Path, FileEntry> {
-    const host = this._host;
-    if (!this._initialized) {
-      this._initialized = true;
-      this._recursiveFileList().forEach(path => {
-        this._tree.set(path, new LazyFileEntry(path, () => {
-          return Buffer.from(host.read(path));
-        }));
-      });
-    }
-
-    return this._tree;
-  }
-
-  get(path: string): FileEntry | null {
-    const normalizedPath = this._normalizePath(path);
-
-    let entry = this._cacheMap.get(normalizedPath) || this._tree.get(normalizedPath) || null;
-
-    if (entry == null && !this._initialized) {
-      const systemPath = normalizedPath;
-      const fileExists = this._host.exists(systemPath) && !this._host.isDirectory(systemPath);
-
-      if (fileExists) {
-        const host = this._host;
-        entry = new LazyFileEntry(normalizedPath, () => Buffer.from(host.read(systemPath)));
-        this._tree.set(normalizedPath, entry);
-      }
-    }
-
-    return entry;
-  }
-
-  branch(): Tree {
-    const newTree = new FileSystemTree(this._host.delegate);
-    this._copyTo(newTree);
-
-    return newTree;
-  }
-
-  protected _copyTo<T extends VirtualTree>(tree: T): void {
-    if (tree instanceof FileSystemTree) {
-      const x = tree as FileSystemTree;
-      x._tree = this._tree;
-      x._initialized = this._initialized;
-
-      this._actions.forEach(action => x._actions.push(action));
-      [...this._cacheMap.entries()].forEach(([path, entry]) => {
-        x._cacheMap.set(path, entry);
-      });
-    } else {
-      super._copyTo(tree);
-    }
-  }
-
-  protected _recursiveFileList(): Path[] {
-    const host = this._host;
-    const list: Path[] = [];
-
-    function recurse(schematicPath: Path) {
-      for (const name of host.list(schematicPath)) {
-        const normalizedPath = join(schematicPath, name);
-        if (host.isDirectory(normalizedPath)) {
-          recurse(normalizedPath);
-        } else {
-          list.push(normalizedPath);
-        }
-      }
-    }
-
-    recurse(normalize('/'));
-
-    return list;
-  }
-}
-
-
-export class FileSystemCreateTree extends FileSystemTree {
-  constructor(host: virtualFs.Host) {
-    super(host);
-
-    this._recursiveFileList().forEach(path => {
-      this.create(path, Buffer.from(this._host.read(path)));
-    });
-    this._initialized = true;
-  }
-}
diff --git a/packages/angular_devkit/schematics/src/tree/filesystem_spec.ts b/packages/angular_devkit/schematics/src/tree/filesystem_spec.ts
deleted file mode 100644
index 894494505618..000000000000
--- a/packages/angular_devkit/schematics/src/tree/filesystem_spec.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-// tslint:disable:no-non-null-assertion
-import { PathIsFileException, normalize, virtualFs } from '@angular-devkit/core';
-import { testTreeVisit } from './common_spec';
-import { FileSystemTree } from './filesystem';
-
-
-describe('FileSystemDirEntry', () => {
-  testTreeVisit({
-    createTree: paths => {
-      const files: {[key: string]: string} = {};
-      paths.forEach(path => files[path] = path);
-
-      const host = new virtualFs.test.TestHost(files);
-      const tree = new FileSystemTree(host);
-
-      return tree;
-    },
-    sets: [
-      {
-        name: 'empty',
-        files: [],
-        visits: [
-          {root: '/', expected: []},
-        ],
-      },
-
-      {
-        name: 'file at root',
-        files: ['/file'],
-        visits: [
-          {root: '/'},
-          {root: '/file', exception: ({path}) => new PathIsFileException(path)},
-        ],
-      },
-      {
-        name: 'file under first level folder',
-        // duplicate use case: folder of single file at root
-        files: ['/folder/file'],
-        visits: [
-          {root: '/'},
-          {root: '/folder', expected: ['/folder/file']},
-          {root: '/folder/file', exception: ({path}) => new PathIsFileException(path)},
-          {root: '/wrong', expected: []},
-        ],
-      },
-      {
-        name: 'file under nested folder',
-        // duplicate use case: nested folder of files
-        files: ['/folder/nested_folder/file'],
-        visits: [
-          {root: '/'},
-          {root: '/folder', expected: ['/folder/nested_folder/file']},
-          {root: '/folder/nested_folder', expected: ['/folder/nested_folder/file']},
-          {
-            root: '/folder/nested_folder/file',
-            exception: ({path}) => new PathIsFileException(path),
-          },
-        ],
-      },
-
-      {
-        name: 'nested folders',
-        // duplicate use case: folder of folders at root
-        // duplicate use case: folders of mixed
-        files: [
-          '/folder/nested_folder0/file',
-          '/folder/nested_folder1/folder/file',
-          '/folder/nested_folder2/file',
-          '/folder/nested_folder2/folder/file',
-        ],
-        visits: [
-          {root: '/'},
-          {root: '/folder'},
-          {root: '/folder/nested_folder0', expected: ['/folder/nested_folder0/file']},
-          {root: '/folder/nested_folder1', expected: ['/folder/nested_folder1/folder/file']},
-          {root: '/folder/nested_folder1/folder', expected: ['/folder/nested_folder1/folder/file']},
-          {root: '/folder/nested_folder2', expected: [
-            '/folder/nested_folder2/file',
-            '/folder/nested_folder2/folder/file',
-          ]},
-          {root: '/folder/nested_folder2/folder', expected: ['/folder/nested_folder2/folder/file']},
-        ],
-      },
-    ],
-  });
-});
-
-
-describe('FileSystem', () => {
-  it('can create files', () => {
-    const host = new virtualFs.test.TestHost({
-      '/hello': 'world',
-      '/sub/directory/file2': '',
-      '/sub/file1': '',
-    });
-    const tree = new FileSystemTree(host);
-
-    expect(tree.files).toEqual(['/hello', '/sub/directory/file2', '/sub/file1'].map(normalize));
-  });
-});
diff --git a/packages/angular_devkit/schematics/src/tree/filtered.ts b/packages/angular_devkit/schematics/src/tree/filtered.ts
deleted file mode 100644
index cf9e04810669..000000000000
--- a/packages/angular_devkit/schematics/src/tree/filtered.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { FilePredicate, Tree } from './interface';
-import { VirtualTree } from './virtual';
-
-// TODO: Remove this along with VirtualTree in 7.0
-export class FilteredTree extends VirtualTree {
-  constructor(tree: Tree, filter: FilePredicate<boolean> = () => true) {
-    super();
-
-    const virtualTree = (tree instanceof VirtualTree
-      ? tree : VirtualTree.optimize(tree)) as VirtualTree;
-
-    // We don't know for sure that it's a FilteredTree, but we don't care;
-    // VirtualTree has `tree`, we just need access to it because it's protected.
-    const root = (virtualTree as FilteredTree).tree;
-    const staging = virtualTree.staging;
-
-    [...root.entries()].forEach(([path, entry]) => {
-      if (filter(path, entry)) {
-        this._tree.set(path, entry);
-      }
-    });
-    [...staging.entries()].forEach(([path, entry]) => {
-      if (filter(path, entry)) {
-        this._cacheMap.set(path, entry);
-      }
-    });
-    virtualTree.actions.forEach(action => {
-      if (this._cacheMap.has(action.path) || this._tree.has(action.path)) {
-        this._actions.push(action);
-      }
-    });
-  }
-}
diff --git a/packages/angular_devkit/schematics/src/tree/filtered_spec.ts b/packages/angular_devkit/schematics/src/tree/filtered_spec.ts
deleted file mode 100644
index a164e9ec13f9..000000000000
--- a/packages/angular_devkit/schematics/src/tree/filtered_spec.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { normalize } from '@angular-devkit/core';
-import { FilteredTree } from './filtered';
-import { VirtualTree } from './virtual';
-
-
-describe('FilteredTree', () => {
-  it('works', () => {
-    const tree = new VirtualTree;
-    tree.create('/file1', '');
-    tree.create('/file2', '');
-    tree.create('/file3', '');
-
-    const filtered = new FilteredTree(tree, p => p != '/file2');
-    expect(filtered.files.sort()).toEqual(['/file1', '/file3'].map(normalize));
-  });
-});
diff --git a/packages/angular_devkit/schematics/src/tree/host-tree_spec.ts b/packages/angular_devkit/schematics/src/tree/host-tree_spec.ts
index 6e24d7019a0c..476046d6c88b 100644
--- a/packages/angular_devkit/schematics/src/tree/host-tree_spec.ts
+++ b/packages/angular_devkit/schematics/src/tree/host-tree_spec.ts
@@ -5,36 +5,11 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable:no-any
 import { normalize, virtualFs } from '@angular-devkit/core';
-import { Action } from './action';
 import { FilterHostTree, HostTree } from './host-tree';
-import { VirtualTree } from './virtual';
 
 describe('HostTree', () => {
-  it('is backward compatible with VirtualTree', () => {
 
-    const fs = new virtualFs.test.TestHost({
-      '/file1': '',
-    });
-
-    const tree = new HostTree(fs);
-    const vTree = new VirtualTree();
-
-    tree.create('/file2', '');
-    vTree.create('/file3', '');
-
-    // This is the behaviour of 6.0.x merge (returning the branch).
-    // We need to be compatible with it.
-    const tree2 = tree.branch();
-    tree2.merge(vTree);
-
-    const actions = tree2.actions;
-    expect(actions).toEqual([
-        jasmine.objectContaining<Action>({ kind: 'c', path: normalize('/file2') }),
-        jasmine.objectContaining<Action>({ kind: 'c', path: normalize('/file3') }),
-    ] as any);
-  });
 });
 
 describe('FilterHostTree', () => {
diff --git a/packages/angular_devkit/schematics/src/tree/static.ts b/packages/angular_devkit/schematics/src/tree/static.ts
index 88fb63c647bb..02a45b61dd72 100644
--- a/packages/angular_devkit/schematics/src/tree/static.ts
+++ b/packages/angular_devkit/schematics/src/tree/static.ts
@@ -6,10 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { SchematicsException } from '../exception/exception';
-import { FilteredTree } from './filtered';
 import { FilterHostTree, HostTree } from './host-tree';
 import { FilePredicate, MergeStrategy, Tree } from './interface';
-import { VirtualTree } from './virtual';
 
 
 export function empty() {
@@ -17,33 +15,17 @@ export function empty() {
 }
 
 export function branch(tree: Tree) {
-  // TODO: Remove VirtualTree usage in 7.0
-  if (tree instanceof VirtualTree) {
-    return VirtualTree.branch(tree);
-  }
-
   return tree.branch();
 }
 
 export function merge(tree: Tree, other: Tree, strategy: MergeStrategy = MergeStrategy.Default) {
-  // TODO: Remove VirtualTree usage in 7.0
-  if (tree instanceof VirtualTree) {
-    return VirtualTree.merge(tree, other, strategy);
-  }
-
   tree.merge(other, strategy);
 
   return tree;
 }
 
 export function partition(tree: Tree, predicate: FilePredicate<boolean>): [Tree, Tree] {
-  // TODO: Remove VirtualTree usage in 7.0
-  if (tree instanceof VirtualTree) {
-    return [
-      new FilteredTree(tree, predicate),
-      new FilteredTree(tree, (path, entry) => !predicate(path, entry)),
-    ];
-  } else if (tree instanceof HostTree) {
+  if (tree instanceof HostTree) {
     return [
       new FilterHostTree(tree, predicate),
       new FilterHostTree(tree, (path, entry) => !predicate(path, entry)),
@@ -53,11 +35,7 @@ export function partition(tree: Tree, predicate: FilePredicate<boolean>): [Tree,
   }
 }
 
+/** @deprecated Tree's are automically optimized */
 export function optimize(tree: Tree) {
-  // TODO: Remove VirtualTree usage in 7.0
-  if (tree instanceof VirtualTree) {
-    return VirtualTree.optimize(tree);
-  }
-
   return tree;
 }
diff --git a/packages/angular_devkit/schematics/src/tree/virtual.ts b/packages/angular_devkit/schematics/src/tree/virtual.ts
deleted file mode 100644
index d34c5c070be4..000000000000
--- a/packages/angular_devkit/schematics/src/tree/virtual.ts
+++ /dev/null
@@ -1,394 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import {
-  Path,
-  PathFragment,
-  basename,
-  dirname,
-  join,
-  normalize,
-  split,
-} from '@angular-devkit/core';
-import {
-  ContentHasMutatedException,
-  FileAlreadyExistException,
-  FileDoesNotExistException,
-  InvalidUpdateRecordException,
-  MergeConflictException,
-} from '../exception/exception';
-import { Action, ActionList, UnknownActionException } from './action';
-import { SimpleFileEntry } from './entry';
-import {
-  DirEntry,
-  FileEntry,
-  FileVisitor,
-  FileVisitorCancelToken,
-  MergeStrategy,
-  Tree,
-  TreeSymbol,
-  UpdateRecorder,
-} from './interface';
-import { UpdateRecorderBase } from './recorder';
-
-
-export class VirtualDirEntry implements DirEntry {
-  protected _subdirs = new Map<PathFragment, DirEntry>();
-
-  constructor(protected _tree: VirtualTree, protected _path: Path = normalize('/')) {}
-
-  protected _createDir(name: PathFragment): DirEntry {
-    return new VirtualDirEntry(this._tree, join(this._path, name));
-  }
-
-  get parent() {
-    return this._path == '/' ? null : this._tree.getDir(dirname(this._path));
-  }
-  get path() { return this._path; }
-
-  get subdirs() {
-    const directChildPartsCount = split(normalize(this._path)).length + 1;
-
-    const directories = this._tree.files
-    // make sure entries belong to proper subbranch
-    .filter(path => path.startsWith(this._path))
-    // get all existing directories & prune to direct children
-    .map(path => split(normalize(path)).slice(0, -1).slice(0, directChildPartsCount))
-    // exclude current directory
-    .filter(parts => parts.length === directChildPartsCount)
-    // get directory name only
-    .map(parts => parts[parts.length - 1]);
-
-    // make sure to have a unique set (directories contain multiple files so appear multiple times)
-    return Array.from(new Set(directories));
-  }
-  get subfiles() {
-    return this._tree.files
-      .filter(path => dirname(path) === this._path)
-      .map(path => basename(path));
-  }
-
-  dir(name: PathFragment) {
-    let maybe = this._subdirs.get(name);
-    if (!maybe) {
-      this._subdirs.set(name, maybe = this._createDir(name));
-    }
-
-    return maybe;
-  }
-  file(name: PathFragment) {
-    return this._tree.get(join(this._path, name));
-  }
-
-  visit(visitor: FileVisitor): void {
-    try {
-      this.getSubfilesRecursively().forEach(file => visitor(file.path, file));
-    } catch (e) {
-      if (e !== FileVisitorCancelToken) {
-        throw e;
-      }
-    }
-  }
-
-  private getSubfilesRecursively() {
-    function _recurse(entry: DirEntry): FileEntry[] {
-      return entry.subdirs.reduce((files, subdir) => [
-        ...files,
-        ..._recurse(entry.dir(subdir)),
-      ], entry.subfiles.map(subfile => entry.file(subfile) as FileEntry));
-    }
-
-    return _recurse(this);
-  }
-}
-
-/**
- * The root class of most trees.
- */
-export class VirtualTree implements Tree {
-  protected _actions = new ActionList();
-  protected _cacheMap = new Map<Path, FileEntry>();
-  protected _root = new VirtualDirEntry(this);
-  protected _tree = new Map<Path, FileEntry>();
-
-  static isVirtualTree(tree: Tree): tree is VirtualTree {
-    if (tree instanceof VirtualTree) {
-      return true;
-    }
-
-    if (typeof tree === 'object' && typeof (tree as VirtualTree)._copyTo === 'function') {
-      return true;
-    }
-
-    return false;
-  }
-
-  /**
-   * Normalize the path. Made available to subclasses to overload.
-   * @param path The path to normalize.
-   * @returns {string} A path that is resolved and normalized.
-   */
-  protected _normalizePath(path: string): Path {
-    return normalize('/' + path);
-  }
-  protected get tree(): ReadonlyMap<Path, FileEntry> { return this._tree; }
-  get staging(): ReadonlyMap<Path, FileEntry> { return this._cacheMap; }
-
-  [TreeSymbol]() {
-    return this;
-  }
-
-  /**
-   * A list of file names contained by this Tree.
-   * @returns {[string]} File paths.
-   */
-  get files(): Path[] {
-    return [...new Set<Path>([...this.tree.keys(), ...this._cacheMap.keys()]).values()];
-  }
-
-  get root(): DirEntry { return this._root; }
-
-  get(path: string): FileEntry | null {
-    const normalizedPath = this._normalizePath(path);
-
-    return this._cacheMap.get(normalizedPath) || this.tree.get(normalizedPath) || null;
-  }
-  has(path: string) {
-    return this.get(path) != null;
-  }
-  set(entry: FileEntry) {
-    return this._cacheMap.set(entry.path, entry);
-  }
-
-  exists(path: string): boolean {
-    return this.has(path);
-  }
-
-  read(path: string): Buffer | null {
-    const entry = this.get(path);
-
-    return entry ? entry.content : null;
-  }
-
-  getDir(path: string): DirEntry {
-    let dir: DirEntry = this.root;
-    split(this._normalizePath(path)).slice(1).forEach(fragment => {
-      dir = dir.dir(fragment);
-    });
-
-    return dir;
-  }
-
-  visit(visitor: FileVisitor) {
-    try {
-      this.files.forEach(path => visitor(path, this.get(path)));
-    } catch (e) {
-      if (e !== FileVisitorCancelToken) {
-        throw e;
-      }
-    }
-  }
-
-  beginUpdate(path: string): UpdateRecorder {
-    const entry = this.get(path);
-    if (!entry) {
-      throw new FileDoesNotExistException(path);
-    }
-
-    return UpdateRecorderBase.createFromFileEntry(entry);
-  }
-
-  commitUpdate(record: UpdateRecorder) {
-    if (record instanceof UpdateRecorderBase) {
-      const path = record.path;
-      const entry = this.get(path);
-      if (!entry) {
-        throw new ContentHasMutatedException(path);
-      } else {
-        const newContent = record.apply(entry.content);
-        this.overwrite(path, newContent);
-      }
-    } else {
-      throw new InvalidUpdateRecordException();
-    }
-  }
-
-  overwrite(path: string, content: Buffer | string) {
-    const normalizedTo = this._normalizePath(path);
-    if (typeof content == 'string') {
-      content = Buffer.from(content, 'utf-8');
-    }
-    const maybeEntry = this.get(normalizedTo);
-    if (maybeEntry && maybeEntry.content.equals(content)) {
-      return;
-    }
-    this._overwrite(normalizedTo, content);
-  }
-  create(path: string, content: Buffer | string): void {
-    const normalizedTo = this._normalizePath(path);
-    if (typeof content == 'string') {
-      content = Buffer.from(content);
-    }
-    this._create(normalizedTo, content);
-  }
-  rename(path: string, to: string): void {
-    const normalizedPath = this._normalizePath(path);
-    const normalizedTo = this._normalizePath(to);
-    if (normalizedPath === normalizedTo) {
-      // Nothing to do.
-      return;
-    }
-    this._rename(normalizedPath, normalizedTo);
-  }
-
-  delete(path: string): void {
-    this._delete(this._normalizePath(path));
-  }
-
-  protected _overwrite(path: Path, content: Buffer, action?: Action) {
-    if (!this.has(path)) {
-      throw new FileDoesNotExistException(path);
-    }
-    // Update the action buffer.
-    if (action) {
-      this._actions.push(action);
-    } else {
-      this._actions.overwrite(path, content);
-    }
-    this.set(new SimpleFileEntry(path, content));
-  }
-  protected _create(path: Path, content: Buffer, action?: Action) {
-    if (this._cacheMap.has(path)) {
-      throw new FileAlreadyExistException(path);
-    }
-
-    if (action) {
-      this._actions.push(action);
-    } else {
-      this._actions.create(path, content);
-    }
-    this.set(new SimpleFileEntry(path, content as Buffer));
-  }
-  protected _rename(path: Path, to: Path, action?: Action, force = false) {
-    const entry = this.get(path);
-    if (!entry) {
-      throw new FileDoesNotExistException(path);
-    }
-    if (this._cacheMap.has(to) && !force) {
-      throw new FileAlreadyExistException(to);
-    }
-
-    if (action) {
-      this._actions.push(action);
-    } else {
-      this._actions.rename(path, to);
-    }
-
-    this.set(new SimpleFileEntry(to, entry.content));
-    this._cacheMap.delete(path);
-  }
-  protected _delete(path: Path, action?: Action) {
-    if (!this.has(path)) {
-      throw new FileDoesNotExistException(path);
-    }
-
-    if (action) {
-      this._actions.push(action);
-    } else {
-      this._actions.delete(path);
-    }
-    this._cacheMap.delete(path);
-  }
-
-
-  apply(action: Action, strategy: MergeStrategy) {
-    if (this._actions.has(action)) {
-      return;
-    }
-    switch (action.kind) {
-      case 'o':
-        // Update the action buffer.
-        this._overwrite(action.path, action.content, action);
-        break;
-
-      case 'c':
-        if (this._cacheMap.has(action.path)) {
-          switch (strategy) {
-            case MergeStrategy.Error: throw new MergeConflictException(action.path);
-            case MergeStrategy.Overwrite:
-              this._overwrite(action.path, action.content, action);
-              break;
-          }
-        } else {
-          this._create(action.path, action.content, action);
-        }
-        break;
-
-      case 'r':
-        const force = (strategy & MergeStrategy.AllowOverwriteConflict) != 0;
-        this._rename(action.path, action.to, action, force);
-        break;
-
-      case 'd': this._delete(action.path, action); break;
-
-      default: throw new UnknownActionException(action);
-    }
-  }
-
-  // Returns an ordered list of Action to get this host.
-  get actions(): Action[] {
-    return [...this._actions];
-  }
-
-  /**
-   * Allow subclasses to copy to a tree their own properties.
-   * @return {Tree}
-   * @private
-   */
-  protected _copyTo<T extends VirtualTree>(tree: T): void {
-    tree._tree = new Map(this.tree);
-    this._actions.forEach(action => tree._actions.push(action));
-    [...this._cacheMap.entries()].forEach(([path, entry]) => {
-      tree._cacheMap.set(path, entry);
-    });
-  }
-
-  branch(): Tree {
-    const newTree = new VirtualTree();
-    this._copyTo(newTree);
-
-    return newTree;
-  }
-
-  // Creates a new host from 2 hosts.
-  merge(other: Tree, strategy: MergeStrategy = MergeStrategy.Default) {
-    other.actions.forEach(action => this.apply(action, strategy));
-  }
-
-  optimize() {
-    // This destroys the history. Hope you know what you're doing.
-    this._actions.optimize();
-  }
-
-  static branch(tree: Tree) {
-    return tree.branch();
-  }
-
-  static merge(tree: Tree, other: Tree, strategy: MergeStrategy = MergeStrategy.Default): Tree {
-    const newTree = tree.branch();
-    newTree.merge(other, strategy);
-
-    return newTree;
-  }
-
-  static optimize(tree: Tree) {
-    const newTree = (tree as VirtualTree).branch() as VirtualTree;
-    newTree.optimize();
-
-    return newTree;
-  }
-}
diff --git a/packages/angular_devkit/schematics/src/tree/virtual_spec.ts b/packages/angular_devkit/schematics/src/tree/virtual_spec.ts
deleted file mode 100644
index afd8d9f8340e..000000000000
--- a/packages/angular_devkit/schematics/src/tree/virtual_spec.ts
+++ /dev/null
@@ -1,304 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-// tslint:disable:no-non-null-assertion no-big-function
-import { normalize, virtualFs } from '@angular-devkit/core';
-import { FileAlreadyExistException, FileDoesNotExistException } from '../exception/exception';
-import { testTreeVisit } from './common_spec';
-import { FileSystemTree } from './filesystem';
-import { FileEntry, MergeStrategy, Tree } from './interface';
-import { merge, partition } from './static';
-import { VirtualTree } from './virtual';
-
-
-function files(tree: Tree) {
-  const treeFiles: string[] = [];
-  tree.visit(x => treeFiles.push(x));
-
-  return treeFiles;
-}
-
-
-describe('VirtualDirEntry', () => {
-  testTreeVisit({
-    createTree: paths => {
-      const tree = new VirtualTree();
-      paths.forEach(path => tree.create(path, path));
-
-      return tree;
-    },
-    sets: [
-      {
-        name: 'empty',
-        files: [],
-        visits: [
-          {root: '/', expected: []},
-        ],
-      },
-
-      {
-        name: 'file at root',
-        files: ['/file'],
-        visits: [
-          {root: '/'},
-          {root: '/file', expected: []},
-        ],
-      },
-      {
-        name: 'file under first level folder',
-        // duplicate use case: folder of single file at root
-        files: ['/folder/file'],
-        visits: [
-          {root: '/'},
-          {root: '/folder', expected: ['/folder/file']},
-          {root: '/folder/file', expected: []},
-          {root: '/wrong', expected: []},
-        ],
-      },
-      {
-        name: 'file under nested folder',
-        // duplicate use case: nested folder of files
-        files: ['/folder/nested_folder/file'],
-        visits: [
-          {root: '/'},
-          {root: '/folder', expected: ['/folder/nested_folder/file']},
-          {root: '/folder/nested_folder', expected: ['/folder/nested_folder/file']},
-          {root: '/folder/nested_folder/file', expected: []},
-        ],
-      },
-
-      {
-        name: 'nested folders',
-        // duplicate use case: folder of folders at root
-        // duplicate use case: folders of mixed
-        files: [
-          '/folder/nested_folder0/file',
-          '/folder/nested_folder1/folder/file',
-          '/folder/nested_folder2/file',
-          '/folder/nested_folder2/folder/file',
-        ],
-        visits: [
-          {root: '/'},
-          {root: '/folder'},
-          {root: '/folder/nested_folder0', expected: ['/folder/nested_folder0/file']},
-          {root: '/folder/nested_folder1', expected: ['/folder/nested_folder1/folder/file']},
-          {root: '/folder/nested_folder1/folder', expected: ['/folder/nested_folder1/folder/file']},
-          {root: '/folder/nested_folder2', expected: [
-            '/folder/nested_folder2/file',
-            '/folder/nested_folder2/folder/file',
-          ]},
-          {root: '/folder/nested_folder2/folder', expected: ['/folder/nested_folder2/folder/file']},
-        ],
-      },
-    ],
-  });
-});
-
-
-describe('VirtualTree', () => {
-  describe('exists()', () => {
-    it('works', () => {
-      const tree = new VirtualTree();
-      tree.create('/some/file', 'some _content');
-      expect(tree.exists('/some/file')).toBe(true);
-      expect(tree.exists('/other/file')).toBe(false);
-    });
-  });
-  describe('read()', () => {
-    it('works', () => {
-      const tree = new VirtualTree();
-      tree.create('/some/file', 'some _content');
-      expect(tree.read('/some/file') !.toString()).toBe('some _content');
-      expect(tree.read('/other/file')).toBe(null);
-    });
-  });
-  describe('files', () => {
-    it('works', () => {
-      const tree = new VirtualTree();
-      tree.create('/some/file', 'some _content');
-      tree.create('/some/other-file', 'some _content');
-      tree.create('/some/other-file2', 'some _content');
-
-      expect(files(tree)).toEqual([
-        '/some/file', '/some/other-file', '/some/other-file2',
-      ].map(normalize));
-    });
-  });
-
-  describe('overwrite()', () => {
-    it('works', () => {
-      const tree = new VirtualTree();
-      tree.create('/some/file', 'some content');
-      tree.overwrite('/some/file', 'some other content');
-
-      expect(tree.read('/some/file') !.toString()).toEqual('some other content');
-    });
-  });
-
-  describe('insertContent()', () => {
-    it('works', () => {
-      const tree = new VirtualTree();
-      tree.create('/some/file', 'some _content');
-      const recorder = tree.beginUpdate('/some/file');
-      recorder.insertLeft(4, ' hello');
-      tree.commitUpdate(recorder);
-
-      expect(tree.actions.length).toBe(2);
-      expect(tree.read('/some/file') !.toString()).toBe('some hello _content');
-    });
-
-    it('throws when the file does not exist', () => {
-      const tree = new VirtualTree();
-      expect(() => tree.beginUpdate('/some/file'))
-        .toThrow(new FileDoesNotExistException('/some/file'));
-    });
-  });
-
-  describe('combinatorics', () => {
-    it('works', () => {
-      const tree = new VirtualTree();
-      tree.create('file1', 'some _content');
-      tree.create('file2', 'some _content');
-      tree.create('file3', 'some _content');
-
-      const [tree1, tree2] = partition(tree, p => p == '/file1');
-      expect(tree1.exists('file1')).toBe(true);
-      expect(tree1.exists('file2')).toBe(false);
-      expect(tree1.exists('file3')).toBe(false);
-
-      expect(tree2.exists('file1')).toBe(false);
-      expect(tree2.exists('file2')).toBe(true);
-      expect(tree2.exists('file3')).toBe(true);
-
-      const tree3 = merge(tree1, tree2, MergeStrategy.Error);
-      expect(files(tree3).sort()).toEqual(files(tree).sort());
-    });
-  });
-
-  describe('optimize', () => {
-    it('works', () => {
-      const host = new virtualFs.test.TestHost({
-        '/hello': 'world',
-      });
-      const tree = new FileSystemTree(host);
-
-      tree.create('/created', 'test 1');
-      tree.create('/hello1', 'test 2');
-      tree.overwrite('/hello1', 'beautiful world');
-      tree.overwrite('/hello', 'beautiful world');
-
-      expect(tree.actions.length).toBe(4);
-      tree.optimize();
-      expect(tree.actions.length).toBe(3);
-    });
-
-    it('works with branching', () => {
-      const host = new virtualFs.test.TestHost({
-        '/hello': '',
-        '/sub/file1': '',
-        '/sub/directory/file2': '',
-      });
-      const tree = new FileSystemTree(host);
-
-      tree.create('/test', 'testing 1 2');
-      const recorder = tree.beginUpdate('/test');
-      recorder.insertLeft(8, 'testing ');
-      tree.commitUpdate(recorder);
-      tree.overwrite('/hello', 'world');
-      tree.overwrite('/test', 'test 3');
-
-      const expected = ['/hello', '/sub/directory/file2', '/sub/file1', '/test'];
-      expect(files(tree).sort()).toEqual(expected.map(normalize));
-
-      const tree2 = tree.branch() as VirtualTree;
-      expect(tree.actions.length).toBe(4);
-      expect(tree2.actions.length).toBe(4);
-
-      tree2.optimize();
-      expect(tree.actions.length).toBe(4);
-      expect(tree2.actions.length).toBe(2);
-    });
-  });
-
-  describe('rename', () => {
-    it('conflict fails', () => {
-      const host = new virtualFs.test.TestHost({
-        '/hello': 'world',
-      });
-      const tree = new FileSystemTree(host);
-      tree.create('/base', 'base content');
-      const tree2 = new FileSystemTree(host);
-      tree2.create('/other-base', 'base content');
-      tree2.rename('/other-base', '/base');
-
-      expect(() => tree.merge(tree2))
-        .toThrow(new FileAlreadyExistException('/base'));
-    });
-
-    it('conflict works with overwrite', () => {
-      const host = new virtualFs.test.TestHost({
-        '/hello': 'world',
-      });
-      const tree = new FileSystemTree(host);
-
-      const tree2 = new FileSystemTree(host);
-      const newContent = 'new content';
-      tree2.create('/greetings', newContent);
-      tree2.rename('/greetings', '/hello');
-
-      tree.merge(tree2, MergeStrategy.Overwrite);
-      const fileEntry = tree.get('/hello');
-      expect((fileEntry as FileEntry).content.toString()).toEqual(newContent);
-    });
-
-    it('can rename files in base', () => {
-      const host = new virtualFs.test.TestHost({
-        '/hello': 'world',
-      });
-      const tree = new FileSystemTree(host);
-
-      tree.rename('/hello', '/world');
-
-      const fileEntry = tree.get('/hello');
-      const fileEntry2 = tree.get('/world');
-      expect((fileEntry as FileEntry).content.toString())
-        .toEqual((fileEntry2 as FileEntry).content.toString());
-    });
-
-    it('can rename files created in staging', () => {
-      const host = new virtualFs.test.TestHost({
-      });
-      const tree = new FileSystemTree(host);
-
-      tree.create('/hello', 'world');
-      tree.rename('/hello', '/hello2');
-
-      expect(tree.exists('/hello')).toBe(false);
-      const fileEntry = tree.get('/hello2');
-      expect((fileEntry as FileEntry).content.toString())
-        .toEqual('world');
-    });
-
-    it('can rename branched and merged trees', () => {
-      const host = new virtualFs.test.TestHost({
-        '/hello': 'world',
-      });
-      const tree = new FileSystemTree(host);
-      const tree2 = tree.branch();
-
-      expect(tree2.exists('/hello')).toBe(true);
-      tree2.rename('/hello', '/hello2');
-      expect(tree2.exists('/hello2')).toBe(true);
-
-      tree.merge(tree2);
-      expect(tree.exists('/hello2')).toBe(true);
-      const fileEntry = tree.get('/hello2');
-      expect((fileEntry as FileEntry).content.toString())
-        .toEqual('world');
-    });
-  });
-});

From c53e875df03a4d6af492138aa1392bf7a076c97e Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Mon, 28 Jan 2019 13:27:46 -0800
Subject: [PATCH 0684/1703] fix(@angular/cli): ng-add should resolve
 package.json

ng-add checks if a specified collection is installed, and if not it'd
proceed to install the package. However, `isPackageInstalled` would, by
default, resolve the main field or the index of the package. Not all NPM
packages specify the main field or provide an index file. It should
be sufficient to just check the presence of `package.json` to detect
whether a package is installed or not.

For example, `ng add @angular/bazel` should not install the package if
it's already installed locally. `@angular/bazel` does not specify a main
field not an index file in its `package.json`.
---
 packages/angular/cli/commands/add-impl.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/commands/add-impl.ts b/packages/angular/cli/commands/add-impl.ts
index 1e915ec4460b..34c9b75b1fbc 100644
--- a/packages/angular/cli/commands/add-impl.ts
+++ b/packages/angular/cli/commands/add-impl.ts
@@ -140,7 +140,11 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
 
   private isPackageInstalled(name: string): boolean {
     try {
-      resolve(name, { checkLocal: true, basedir: this.workspace.root });
+      resolve(name, {
+        checkLocal: true,
+        basedir: this.workspace.root,
+        resolvePackageJson: true,
+      });
 
       return true;
     } catch (e) {

From f0807c0fefe66b9ab90c8c97cd83fe98b35eee85 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 29 Jan 2019 06:45:09 +0000
Subject: [PATCH 0685/1703] build: update autoprefixer to version 9.4.7

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 28 ++++++++-----------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 0176aa0db1ab..60e2f64b97ce 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -12,7 +12,7 @@
     "@angular-devkit/core": "0.0.0",
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.7.0",
-    "autoprefixer": "9.4.6",
+    "autoprefixer": "9.4.7",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "4.6.0",
diff --git a/yarn.lock b/yarn.lock
index 8fda0087cd7c..fe8716621733 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1185,16 +1185,16 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@9.4.6:
-  version "9.4.6"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.6.tgz#0ace275e33b37de16b09a5547dbfe73a98c1d446"
-  integrity sha512-Yp51mevbOEdxDUy5WjiKtpQaecqYq9OqZSL04rSoCiry7Tc5I9FEyo3bfxiTJc1DfHeKwSFCUYbBAiOQ2VGfiw==
+autoprefixer@9.4.7:
+  version "9.4.7"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.7.tgz#f997994f9a810eae47b38fa6d8a119772051c4ff"
+  integrity sha512-qS5wW6aXHkm53Y4z73tFGsUhmZu4aMPV9iHXYlF0c/wxjknXNHuj/1cIQb+6YH692DbJGGWcckAXX+VxKvahMA==
   dependencies:
     browserslist "^4.4.1"
-    caniuse-lite "^1.0.30000929"
+    caniuse-lite "^1.0.30000932"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.13"
+    postcss "^7.0.14"
     postcss-value-parser "^3.3.1"
 
 autoprefixer@^9.0.0:
@@ -1888,6 +1888,11 @@ caniuse-lite@^1.0.30000929:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000929.tgz#7b391b781a9c3097ecc39ea053301aea8ea16317"
   integrity sha512-n2w1gPQSsYyorSVYqPMqbSaz1w7o9ZC8VhOEGI9T5MfGDzp7sbopQxG6GaQmYsaq13Xfx/mkxJUWC1Dz3oZfzw==
 
+caniuse-lite@^1.0.30000932:
+  version "1.0.30000932"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000932.tgz#d01763e9ce77810962ca7391ff827b5949ce4272"
+  integrity sha512-4bghJFItvzz8m0T3lLZbacmEY9X1Z2AtIzTr7s7byqZIOumASfr4ynDx7rtm0J85nDmx8vsgR6vnaSoeU8Oh0A==
+
 canonical-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
@@ -7672,7 +7677,7 @@ postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.1:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss@7.0.14:
+postcss@7.0.14, postcss@^7.0.14:
   version "7.0.14"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
   integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==
@@ -7690,15 +7695,6 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
     source-map "^0.6.1"
     supports-color "^5.5.0"
 
-postcss@^7.0.13:
-  version "7.0.13"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.13.tgz#42bf716413e8f1c786ab71dc6e722b3671b16708"
-  integrity sha512-h8SY6kQTd1wISHWjz+E6cswdhMuyBZRb16pSTv3W4zYZ3/YbyWeJdNUeOXB5IdZqE1U76OUEjjjqsC3z2f3hVg==
-  dependencies:
-    chalk "^2.4.2"
-    source-map "^0.6.1"
-    supports-color "^6.1.0"
-
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"

From 08e24837a0af8a92bd54c7388073b1943382bcf9 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 28 Jan 2019 12:04:48 +0000
Subject: [PATCH 0686/1703] fix(@ngtools/webpack): provide a TS-like path to
 ngProgram.listLazyRoutes

The webpack plugin was leaking our internal Path abstraction to the Angular compiler via the `ngProgram.listLazyRoutes` call.

This Path abstraction is provided by `@angular-devkit/core` and shouldn't leak. Instead a TS-like path should be provided to the Angular program.

Fix #13531
---
 packages/ngtools/webpack/src/angular_compiler_plugin.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 67a26cf8d66d..37f687df5c84 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -454,7 +454,7 @@ export class AngularCompilerPlugin {
       });
       timeEnd('AngularCompilerPlugin._listLazyRoutesFromProgram.createProgram');
 
-      entryRoute = this.entryModule.path + '#' + this.entryModule.className;
+      entryRoute = workaroundResolve(this.entryModule.path) + '#' + this.entryModule.className;
     } else {
       ngProgram = this._program as Program;
     }

From 6ae1752891d5d6e76ed00f340c00df02e5b94d04 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 30 Jan 2019 20:24:04 +0100
Subject: [PATCH 0687/1703] feat(@schematics/angular): remove
 `annotateForClosureCompiler` in libraries tsconfig (#13546)

Users outside of Google don't usually need closure annotations.

We should also follow up with ng-packagr to remove tsickle from peerDependency and afterwards, we be able to remove tsickle from the added dependencies when running this schematic
---
 .../library/files/__projectRoot__/tsconfig.lib.json.template     | 1 -
 .../build_ng_packagr/ng-packaged/projects/lib/tsconfig.lib.json  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/packages/schematics/angular/library/files/__projectRoot__/tsconfig.lib.json.template b/packages/schematics/angular/library/files/__projectRoot__/tsconfig.lib.json.template
index 3d970df9fad9..d0e432aa214e 100644
--- a/packages/schematics/angular/library/files/__projectRoot__/tsconfig.lib.json.template
+++ b/packages/schematics/angular/library/files/__projectRoot__/tsconfig.lib.json.template
@@ -18,7 +18,6 @@
     ]
   },
   "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
     "skipTemplateCodegen": true,
     "strictMetadataEmit": true,
     "fullTemplateTypeCheck": true,
diff --git a/tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/tsconfig.lib.json b/tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/tsconfig.lib.json
index 0f284c4cad7e..f7929f05dbfb 100644
--- a/tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/tsconfig.lib.json
+++ b/tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/tsconfig.lib.json
@@ -16,7 +16,6 @@
     ]
   },
   "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
     "skipTemplateCodegen": true,
     "strictMetadataEmit": true,
     "fullTemplateTypeCheck": true,

From d832c8791d3a061414775164db26bc12beba07bb Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 30 Jan 2019 20:38:11 +0100
Subject: [PATCH 0688/1703] fix(@schematics/angular): remove leading comments
 when removing `core-js/es7/reflect` (#13528)

Fixes #13491
---
 .../migrations/update-7/polyfill-metadata.ts  | 11 +++----
 .../update-7/polyfill-metadata_spec.ts        | 32 +++++++++++++++++--
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-7/polyfill-metadata.ts b/packages/schematics/angular/migrations/update-7/polyfill-metadata.ts
index cbc2fb4ac8b9..04bfa1bc69e4 100644
--- a/packages/schematics/angular/migrations/update-7/polyfill-metadata.ts
+++ b/packages/schematics/angular/migrations/update-7/polyfill-metadata.ts
@@ -29,18 +29,15 @@ function _removeReflectFromPolyfills(tree: Tree, path: string) {
   const recorder = tree.beginUpdate(path);
 
   const sourceFile = ts.createSourceFile(path, source.toString(), ts.ScriptTarget.Latest);
-  const imports = (
-    sourceFile.statements
-      .filter(s => s.kind === ts.SyntaxKind.ImportDeclaration) as ts.ImportDeclaration[]
-  );
+  const imports = sourceFile.statements
+      .filter(s => s.kind === ts.SyntaxKind.ImportDeclaration) as ts.ImportDeclaration[];
 
   for (const i of imports) {
-    const module = i.moduleSpecifier.kind == ts.SyntaxKind.StringLiteral
-      && (i.moduleSpecifier as ts.StringLiteral).text;
+    const module = ts.isStringLiteral(i.moduleSpecifier) && i.moduleSpecifier.text;
 
     switch (module) {
       case 'core-js/es7/reflect':
-        recorder.remove(i.getStart(sourceFile), i.getWidth(sourceFile));
+        recorder.remove(i.getFullStart(), i.getFullWidth());
         break;
     }
   }
diff --git a/packages/schematics/angular/migrations/update-7/polyfill-metadata_spec.ts b/packages/schematics/angular/migrations/update-7/polyfill-metadata_spec.ts
index a696e8ac9bc4..bf3c8ae80e55 100644
--- a/packages/schematics/angular/migrations/update-7/polyfill-metadata_spec.ts
+++ b/packages/schematics/angular/migrations/update-7/polyfill-metadata_spec.ts
@@ -42,6 +42,34 @@ import 'web-animations-js';  // Run \`npm install --save web-animations-js\`.
 import 'zone.js/dist/zone';  // Included with Angular CLI.
 `;
 
+const newPolyfills = `
+/** IE9, IE10 and IE11 requires all of the following polyfills. **/
+// import 'core-js/es6/symbol';
+// import 'core-js/es6/object';
+import 'core-js/es6/function';
+import 'core-js/es6/parse-int';
+// import 'core-js/es6/parse-float';
+import 'core-js/es6/number';
+// import 'core-js/es6/math';
+// import 'core-js/es6/string';
+import 'core-js/es6/date';
+// import 'core-js/es6/array';
+// import 'core-js/es6/regexp';
+
+/** IE10 and IE11 requires the following for the Reflect API. */
+import 'core-js/es6/reflect';
+
+import 'web-animations-js';  // Run \`npm install --save web-animations-js\`.
+
+ (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
+ (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
+
+/***************************************************************************************************
+ * Zone JS is required by default for Angular itself.
+ */
+import 'zone.js/dist/zone';  // Included with Angular CLI.
+`;
+
 
 describe('polyfillMetadataRule', () => {
   const schematicRunner = new SchematicTestRunner(
@@ -84,7 +112,7 @@ describe('polyfillMetadataRule', () => {
     const tree2 = await schematicRunner.runSchematicAsync('migration-03', {}, tree.branch())
       .toPromise();
 
-    expect(tree2.readContent(polyfillPath)).not.toMatch(/import .*es7.*reflect.*;/);
+    expect(tree2.readContent(polyfillPath)).toBe(newPolyfills);
   });
 
   it('should work as expected for a project with a root', async () => {
@@ -96,6 +124,6 @@ describe('polyfillMetadataRule', () => {
     const tree2 = await schematicRunner.runSchematicAsync('migration-03', {}, tree.branch())
       .toPromise();
 
-    expect(tree2.readContent(polyfillPath)).not.toMatch(/import .*es7.*reflect.*;/);
+    expect(tree2.readContent(polyfillPath)).toBe(newPolyfills);
   });
 });

From 8a6e497687c790a454fcc4da1e848e109392330e Mon Sep 17 00:00:00 2001
From: Logan Mzz <loganmzz@users.noreply.github.com>
Date: Fri, 25 Jan 2019 16:02:37 +0100
Subject: [PATCH 0689/1703] fix(@schematics/angular): use baseUrl for default
 e2e test

replace usage of `'/'` for default end-to-end test by `browser.baseUrl`
to take into account any accesspath and rely on provided setting.
---
 packages/schematics/angular/e2e/files/src/app.po.ts.template    | 2 +-
 .../angular_devkit/build_angular/hello-world-app/e2e/app.po.ts  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/e2e/files/src/app.po.ts.template b/packages/schematics/angular/e2e/files/src/app.po.ts.template
index cb95601b81e3..4e1cf115d60f 100644
--- a/packages/schematics/angular/e2e/files/src/app.po.ts.template
+++ b/packages/schematics/angular/e2e/files/src/app.po.ts.template
@@ -2,7 +2,7 @@ import { browser, by, element } from 'protractor';
 
 export class AppPage {
   navigateTo() {
-    return browser.get('/') as Promise<any>;
+    return browser.get(browser.baseUrl) as Promise<any>;
   }
 
   getTitleText() {
diff --git a/tests/angular_devkit/build_angular/hello-world-app/e2e/app.po.ts b/tests/angular_devkit/build_angular/hello-world-app/e2e/app.po.ts
index 04d4aa2b9143..ba8e25c4823e 100644
--- a/tests/angular_devkit/build_angular/hello-world-app/e2e/app.po.ts
+++ b/tests/angular_devkit/build_angular/hello-world-app/e2e/app.po.ts
@@ -9,7 +9,7 @@ import { browser, by, element } from 'protractor';
 
 export class AppPage {
   navigateTo() {
-    return browser.get('/');
+    return browser.get(browser.baseUrl);
   }
 
   getTitleText() {

From bae67c2de6f8f9ee760e7197ca5c7593f3ad2aca Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Fri, 25 Jan 2019 16:02:23 +0100
Subject: [PATCH 0690/1703] fix(@angular/cli): remove unsupported `dryRun` and
 `force` from `ng add`

Fixes #13479
---
 packages/angular/cli/commands/add.json         | 2 +-
 packages/angular/cli/commands/definitions.json | 6 +++++-
 packages/angular/cli/commands/generate.json    | 3 ++-
 packages/angular/cli/commands/new.json         | 3 ++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/angular/cli/commands/add.json b/packages/angular/cli/commands/add.json
index 9dabd06b8ef0..97d7400dd739 100644
--- a/packages/angular/cli/commands/add.json
+++ b/packages/angular/cli/commands/add.json
@@ -24,7 +24,7 @@
       ]
     },
     {
-      "$ref": "./definitions.json#/definitions/schematic"
+      "$ref": "./definitions.json#/definitions/interactive"
     },
     {
       "$ref": "./definitions.json#/definitions/base"
diff --git a/packages/angular/cli/commands/definitions.json b/packages/angular/cli/commands/definitions.json
index 2adccc4a0693..6c6f6f0b90a6 100644
--- a/packages/angular/cli/commands/definitions.json
+++ b/packages/angular/cli/commands/definitions.json
@@ -49,7 +49,11 @@
           "default": false,
           "aliases": [ "f" ],
           "description": "When true, forces overwriting of existing files."
-        },
+        }
+      }
+    },
+    "interactive": {
+      "properties": {
         "interactive": {
           "type": "boolean",
           "default": "true",
diff --git a/packages/angular/cli/commands/generate.json b/packages/angular/cli/commands/generate.json
index f8668058cc9f..be287dd307c8 100644
--- a/packages/angular/cli/commands/generate.json
+++ b/packages/angular/cli/commands/generate.json
@@ -26,6 +26,7 @@
       ]
     },
     { "$ref": "./definitions.json#/definitions/base" },
-    { "$ref": "./definitions.json#/definitions/schematic" }
+    { "$ref": "./definitions.json#/definitions/schematic" },
+    { "$ref": "./definitions.json#/definitions/interactive" }
   ]
 }
diff --git a/packages/angular/cli/commands/new.json b/packages/angular/cli/commands/new.json
index aeffbfe5255f..89cfbda500dd 100644
--- a/packages/angular/cli/commands/new.json
+++ b/packages/angular/cli/commands/new.json
@@ -28,6 +28,7 @@
       "required": []
     },
     { "$ref": "./definitions.json#/definitions/base" },
-    { "$ref": "./definitions.json#/definitions/schematic" }
+    { "$ref": "./definitions.json#/definitions/schematic" },
+    { "$ref": "./definitions.json#/definitions/interactive" }
   ]
 }

From 0b7ee649455355f064e2887c286d09face46b51a Mon Sep 17 00:00:00 2001
From: Louis Larry <louis.larry@gmail.com>
Date: Thu, 24 Jan 2019 00:24:25 +0700
Subject: [PATCH 0691/1703] fix(@schematics/schematics): use correct
 collection.json path

---
 .../schematics/schematics/schematic/files/src/collection.json   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/schematics/schematic/files/src/collection.json b/packages/schematics/schematics/schematic/files/src/collection.json
index e9802c819a23..b5cebc776eec 100644
--- a/packages/schematics/schematics/schematic/files/src/collection.json
+++ b/packages/schematics/schematics/schematic/files/src/collection.json
@@ -5,7 +5,7 @@
 // We read package.json using a require() call, which is standard JSON.
 {
   // This is just to indicate to your IDE that there is a schema for collection.json.
-  "$schema": "./node_modules/@angular-devkit/schematics/collection-schema.json",
+  "$schema": "../node_modules/@angular-devkit/schematics/collection-schema.json",
 
   // Schematics are listed as a map of schematicName => schematicDescription.
   // Each description contains a description field which is required, a factory reference,

From f8e873b645d6ccecaa50bc456c088e878546a26b Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sat, 19 Jan 2019 18:59:38 +0100
Subject: [PATCH 0692/1703] fix(@angular/cli): schematics commands should fail
 on unknown options

When an addition argument is parsed the schematic commands should fail with an error.

Fixes #12549
---
 packages/angular/cli/models/schematic-command.ts      | 9 +++++++++
 tests/legacy-cli/e2e/tests/commands/unknown-option.ts | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index ded5925dfab8..833026d30b8f 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -437,6 +437,15 @@ export abstract class SchematicCommand<
       args = await this.parseArguments(schematicOptions || [], o);
     }
 
+    // ng-add is special because we don't know all possible options at this point
+    if (args['--'] && schematicName !== 'ng-add') {
+      args['--'].forEach(additional => {
+        this.logger.fatal(`Unknown option: '${additional.split(/=/)[0]}'`);
+      });
+
+      return 1;
+    }
+
     const pathOptions = o ? this.setPathOptions(o, workingDir) : {};
     let input = Object.assign(pathOptions, args);
 
diff --git a/tests/legacy-cli/e2e/tests/commands/unknown-option.ts b/tests/legacy-cli/e2e/tests/commands/unknown-option.ts
index cc1e994dbae9..220d74bc1646 100644
--- a/tests/legacy-cli/e2e/tests/commands/unknown-option.ts
+++ b/tests/legacy-cli/e2e/tests/commands/unknown-option.ts
@@ -15,4 +15,13 @@ export default async function() {
     [ 'build', '--notanoption' ],
     /should NOT have additional properties\(notanoption\)./,
   ));
+
+  const ngGenerateArgs = [ 'generate', 'component', 'component-name', '--notanoption' ];
+  await expectToFail(() => ng(...ngGenerateArgs));
+
+  await execAndWaitForOutputToMatch(
+    'ng',
+    ngGenerateArgs,
+    /Unknown option: '--notanoption'/,
+  );
 }

From 0e9cb22165c00e90a691e224207611a0a98cfad6 Mon Sep 17 00:00:00 2001
From: clydin <19598772+clydin@users.noreply.github.com>
Date: Wed, 6 Feb 2019 00:12:00 -0500
Subject: [PATCH 0693/1703] test: ensure add material test has clean material
 package (#13548)

---
 tests/legacy-cli/e2e/tests/commands/add/add-material.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/legacy-cli/e2e/tests/commands/add/add-material.ts b/tests/legacy-cli/e2e/tests/commands/add/add-material.ts
index e9249a37f596..44b075a20a0a 100644
--- a/tests/legacy-cli/e2e/tests/commands/add/add-material.ts
+++ b/tests/legacy-cli/e2e/tests/commands/add/add-material.ts
@@ -1,8 +1,11 @@
-import { expectFileToMatch } from '../../../utils/fs';
+import { expectFileToMatch, rimraf } from '../../../utils/fs';
 import { ng } from '../../../utils/process';
 
 
 export default async function () {
+  // forcibly remove in case another test doesn't clean itself up
+  await rimraf('node_modules/@angular/material');
+
   await ng('add', '@angular/material');
   await expectFileToMatch('package.json', /@angular\/material/);
 }

From fa6795a8471d1c9ae4d583f8e698e49f74a137e6 Mon Sep 17 00:00:00 2001
From: clydin <19598772+clydin@users.noreply.github.com>
Date: Wed, 6 Feb 2019 00:12:31 -0500
Subject: [PATCH 0694/1703] Fully resolve correct `@ngtools/webpack` loader
 (#13549)

* refactor(@ngtools/webpack): support import-based loader resolution

* fix(@angular-devkit/build-angular): ensure correct ngtools loader version

By using the the direct import approach, the loader will be guaranteed to originate from the same package version/location as the other `@ngtools/webpack` imports.

Fixes #13539
---
 .../models/webpack-configs/typescript.ts            | 13 ++++---------
 packages/ngtools/webpack/src/index.ts               |  2 ++
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
index 1c5539c6ee77..3971f9621ccc 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
@@ -13,18 +13,13 @@ import * as path from 'path';
 import {
   AngularCompilerPlugin,
   AngularCompilerPluginOptions,
+  NgToolsLoader,
   PLATFORM
 } from '@ngtools/webpack';
 import { buildOptimizerLoader } from './common';
 import { WebpackConfigOptions } from '../build-options';
 
 
-const g: any = typeof global !== 'undefined' ? global : {};
-const webpackLoader: string = g['_DevKitIsLocal']
-  ? require.resolve('@ngtools/webpack')
-  : '@ngtools/webpack';
-
-
 function _createAotPlugin(
   wco: WebpackConfigOptions,
   options: any,
@@ -92,7 +87,7 @@ export function getNonAotConfig(wco: WebpackConfigOptions, host: virtualFs.Host<
   const { tsConfigPath } = wco;
 
   return {
-    module: { rules: [{ test: /\.tsx?$/, loader: webpackLoader }] },
+    module: { rules: [{ test: /\.tsx?$/, loader: NgToolsLoader }] },
     plugins: [_createAotPlugin(wco, { tsConfigPath, skipCodeGeneration: true }, host)]
   };
 }
@@ -104,7 +99,7 @@ export function getAotConfig(
 ) {
   const { tsConfigPath, buildOptions } = wco;
 
-  const loaders: any[] = [webpackLoader];
+  const loaders: any[] = [NgToolsLoader];
   if (buildOptions.buildOptimizer) {
     loaders.unshift({
       loader: buildOptimizerLoader,
@@ -124,7 +119,7 @@ export function getNonAotTestConfig(wco: WebpackConfigOptions, host: virtualFs.H
   const { tsConfigPath } = wco;
 
   return {
-    module: { rules: [{ test: /\.tsx?$/, loader: webpackLoader }] },
+    module: { rules: [{ test: /\.tsx?$/, loader: NgToolsLoader }] },
     plugins: [_createAotPlugin(wco, { tsConfigPath, skipCodeGeneration: true }, host, false)]
   };
 }
diff --git a/packages/ngtools/webpack/src/index.ts b/packages/ngtools/webpack/src/index.ts
index 0ac24959c8f6..68ee8c1ecb39 100644
--- a/packages/ngtools/webpack/src/index.ts
+++ b/packages/ngtools/webpack/src/index.ts
@@ -8,3 +8,5 @@
 
 export * from './angular_compiler_plugin';
 export { ngcLoader as default } from './loader';
+
+export const NgToolsLoader = __filename;

From 86356a747dccad75e4721a7d57e68c856a431c0b Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 6 Feb 2019 06:13:03 +0100
Subject: [PATCH 0695/1703] fix(@schematics/angular): set cortrect file
 extention in config when using preprocessors (#13552)

Fixes #13550
---
 .../schematics/angular/application/index.ts    |  6 ++++--
 .../angular/application/index_spec.ts          | 18 +++++++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 946a43970c7e..0f7a6b4e2220 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -185,6 +185,8 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
     });
   }
 
+  const styleExt = styleToFileExtention(options.style);
+
   const project: WorkspaceProject = {
     root: projectRoot,
     sourceRoot: join(normalize(projectRoot), 'src'),
@@ -205,7 +207,7 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
             join(normalize(projectRoot), 'src', 'assets'),
           ],
           styles: [
-            `${projectRoot}src/styles.${options.style}`,
+            `${projectRoot}src/styles.${styleExt}`,
           ],
           scripts: [],
           es5BrowserSupport: true,
@@ -258,7 +260,7 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
           tsConfig: `${rootFilesRoot}tsconfig.spec.json`,
           karmaConfig: `${rootFilesRoot}karma.conf.js`,
           styles: [
-            `${projectRoot}src/styles.${options.style}`,
+            `${projectRoot}src/styles.${styleExt}`,
           ],
           scripts: [],
           assets: [
diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
index 290f7978e26e..f733a6c5e49d 100644
--- a/packages/schematics/angular/application/index_spec.ts
+++ b/packages/schematics/angular/application/index_spec.ts
@@ -10,7 +10,7 @@ import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/te
 import { latestVersions } from '../utility/latest-versions';
 import { getFileContent } from '../utility/test';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
-import { Schema as ApplicationOptions } from './schema';
+import { Schema as ApplicationOptions, Style } from './schema';
 
 // tslint:disable:max-line-length
 describe('Application Schematic', () => {
@@ -275,6 +275,22 @@ describe('Application Schematic', () => {
       ]);
     });
 
+    it('should set values in angular.json correctly when using a style preprocessor', () => {
+      const options = { ...defaultOptions, projectRoot: '', style: Style.Sass };
+      const tree = schematicRunner.runSchematic('application', options, workspaceTree);
+      const config = JSON.parse(tree.readContent('/angular.json'));
+      const prj = config.projects.foo;
+      const buildOpt = prj.architect.build.options;
+      expect(buildOpt.styles).toEqual([
+        'src/styles.scss',
+      ]);
+      const testOpt = prj.architect.test.options;
+      expect(testOpt.styles).toEqual([
+        'src/styles.scss',
+      ]);
+      expect(tree.exists('src/styles.scss')).toBe(true);
+    });
+
     it('should set the relative tsconfig paths', () => {
       const options = { ...defaultOptions, projectRoot: '' };
 

From 95dee5a649560a4c13c751cd82cb050fff9cdd22 Mon Sep 17 00:00:00 2001
From: Andrey Chalkin <L2jLiga@gmail.com>
Date: Wed, 6 Feb 2019 12:13:26 +0700
Subject: [PATCH 0696/1703] fix(@schematics/angular): update typescript to
 3.2.4 (#13554)

Fixed inconsistency in typescript versions, all other pkgs have pinned ts 3.2.4
---
 packages/schematics/angular/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/package.json b/packages/schematics/angular/package.json
index 00ab86792635..4fee8391d0b7 100644
--- a/packages/schematics/angular/package.json
+++ b/packages/schematics/angular/package.json
@@ -11,6 +11,6 @@
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
-    "typescript": "3.2.2"
+    "typescript": "3.2.4"
   }
 }

From 71c6cc506e52bd14cf514b305f45b2f9914ceb36 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 6 Feb 2019 06:13:45 +0100
Subject: [PATCH 0697/1703] refactor: add `allowAdditionalArgs` to be able to
 bypass extra params validations (#13556)

---
 packages/angular/cli/commands/add-impl.ts        | 1 +
 packages/angular/cli/models/schematic-command.ts | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/commands/add-impl.ts b/packages/angular/cli/commands/add-impl.ts
index 34c9b75b1fbc..42c1b5b09c3f 100644
--- a/packages/angular/cli/commands/add-impl.ts
+++ b/packages/angular/cli/commands/add-impl.ts
@@ -25,6 +25,7 @@ const npa = require('npm-package-arg');
 
 export class AddCommand extends SchematicCommand<AddCommandSchema> {
   readonly allowPrivateSchematics = true;
+  readonly allowAdditionalArgs = true;
   readonly packageManager = getPackageManager(this.workspace.root);
 
   async run(options: AddCommandSchema & Arguments) {
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index 833026d30b8f..63c8b29319ea 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -77,6 +77,7 @@ export abstract class SchematicCommand<
   T extends (BaseSchematicSchema & BaseCommandOptions),
 > extends Command<T> {
   readonly allowPrivateSchematics: boolean = false;
+  readonly allowAdditionalArgs: boolean = false;
   private _host = new NodeJsSyncHost();
   private _workspace: experimental.workspace.Workspace;
   private readonly _engine: Engine<FileSystemCollectionDesc, FileSystemSchematicDesc>;
@@ -438,7 +439,7 @@ export abstract class SchematicCommand<
     }
 
     // ng-add is special because we don't know all possible options at this point
-    if (args['--'] && schematicName !== 'ng-add') {
+    if (args['--'] && !this.allowAdditionalArgs) {
       args['--'].forEach(additional => {
         this.logger.fatal(`Unknown option: '${additional.split(/=/)[0]}'`);
       });

From 8340bfda47c59a5364702a8035a2f3c62e32e008 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovatebot@gmail.com>
Date: Wed, 6 Feb 2019 06:13:59 +0100
Subject: [PATCH 0698/1703] build: update inquirer to version 6.2.2 (#13557)

---
 packages/angular/cli/package.json             |  2 +-
 .../schematics_cli/package.json               |  2 +-
 yarn.lock                                     | 39 +++++++++++--------
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index cb98f7c64a5e..9180332da6a3 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -33,7 +33,7 @@
     "@schematics/update": "0.0.0",
     "@yarnpkg/lockfile": "1.1.0",
     "ini": "1.3.5",
-    "inquirer": "6.2.1",
+    "inquirer": "6.2.2",
     "npm-package-arg": "6.1.0",
     "opn": "5.4.0",
     "pacote": "9.4.1",
diff --git a/packages/angular_devkit/schematics_cli/package.json b/packages/angular_devkit/schematics_cli/package.json
index 0d799b720d55..f03f6e437612 100644
--- a/packages/angular_devkit/schematics_cli/package.json
+++ b/packages/angular_devkit/schematics_cli/package.json
@@ -17,7 +17,7 @@
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
     "@schematics/schematics": "0.0.0",
-    "inquirer": "6.2.1",
+    "inquirer": "6.2.2",
     "minimist": "1.2.0",
     "rxjs": "6.3.3",
     "symbol-observable": "1.2.0"
diff --git a/yarn.lock b/yarn.lock
index fe8716621733..7bd494c42ea7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -895,10 +895,10 @@ ansi-colors@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.1.tgz#9638047e4213f3428a11944a7d4b31cba0a3ff95"
   integrity sha512-Xt+zb6nqgvV9SWAVp0EG3lRsHcbq5DDgqjPPz6pwgtj6RKz65zGXMNa82oJfOSBA/to6GmRP7Dr+6o+kbApTzQ==
 
-ansi-escapes@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
-  integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==
+ansi-escapes@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
+  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
 ansi-html@0.0.7:
   version "0.0.7"
@@ -3589,7 +3589,7 @@ extend@3, extend@^3.0.0, extend@~3.0.0, extend@~3.0.1, extend@~3.0.2:
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
-external-editor@^3.0.0:
+external-editor@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
   integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
@@ -4806,21 +4806,21 @@ injection-js@^2.2.1:
   resolved "https://registry.yarnpkg.com/injection-js/-/injection-js-2.2.1.tgz#a8d6a085b2f0b8d8650f6f4487f6abb8cc0d67ce"
   integrity sha512-zHI+E+dM0PXix5FFTO1Y4/UOyAzE7zG1l/QwAn4jchTThOoBq+UYRFK4AVG7lQgFL+go62SbrzSsjXy9DFEZUg==
 
-inquirer@6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.1.tgz#9943fc4882161bdb0b0c9276769c75b32dbfcd52"
-  integrity sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==
+inquirer@6.2.2:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.2.tgz#46941176f65c9eb20804627149b743a218f25406"
+  integrity sha512-Z2rREiXA6cHRR9KBOarR3WuLlFzlIfAEIiB45ll5SSadMg7WqOh1MKEjjndfuH5ewXdixWCxqnVfGOQzPeiztA==
   dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.0"
+    ansi-escapes "^3.2.0"
+    chalk "^2.4.2"
     cli-cursor "^2.1.0"
     cli-width "^2.0.0"
-    external-editor "^3.0.0"
+    external-editor "^3.0.3"
     figures "^2.0.0"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
     mute-stream "0.0.7"
     run-async "^2.2.0"
-    rxjs "^6.1.0"
+    rxjs "^6.4.0"
     string-width "^2.1.0"
     strip-ansi "^5.0.0"
     through "^2.3.6"
@@ -5970,7 +5970,7 @@ lodash@4.17.10, lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.2.1, l
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
   integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==
 
-lodash@^4.15.0, lodash@^4.16.6, lodash@^4.17.5, lodash@^4.8.0, lodash@~4.17.10:
+lodash@^4.15.0, lodash@^4.16.6, lodash@^4.17.11, lodash@^4.17.5, lodash@^4.8.0, lodash@~4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
@@ -8586,13 +8586,20 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs@6.3.3, rxjs@^6.0.0, rxjs@^6.1.0, rxjs@~6.3.0:
+rxjs@6.3.3, rxjs@^6.0.0, rxjs@~6.3.0:
   version "6.3.3"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
   integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
+  integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
+  dependencies:
+    tslib "^1.9.0"
+
 safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"

From 7610f972432a7bf5efb9e90eaf50c5d1a3f8d109 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovatebot@gmail.com>
Date: Wed, 6 Feb 2019 06:14:11 +0100
Subject: [PATCH 0699/1703] build: update puppeteer to version 1.12.2 (#13563)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index bcb8584a444d..869e9d04a656 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
   "dependencies": {
     "glob": "^7.0.3",
     "node-fetch": "^2.2.0",
-    "puppeteer": "1.11.0",
+    "puppeteer": "1.12.2",
     "quicktype-core": "^6.0.15",
     "temp": "^0.9.0",
     "tslint": "^5.11.0",
diff --git a/yarn.lock b/yarn.lock
index 7bd494c42ea7..83917d782799 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7902,10 +7902,10 @@ punycode@^2.1.0:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-puppeteer@1.11.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.11.0.tgz#63cdbe12b07275cd6e0b94bce41f3fcb20305770"
-  integrity sha512-iG4iMOHixc2EpzqRV+pv7o3GgmU2dNYEMkvKwSaQO/vMZURakwSOn/EYJ6OIRFYOque1qorzIBvrytPIQB3YzQ==
+puppeteer@1.12.2:
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.12.2.tgz#dbc36afc3ba2d7182b1a37523c0081a0e8507c9a"
+  integrity sha512-xWSyCeD6EazGlfnQweMpM+Hs6X6PhUYhNTHKFj/axNZDq4OmrVERf70isBf7HsnFgB3zOC1+23/8+wCAZYg+Pg==
   dependencies:
     debug "^4.1.0"
     extract-zip "^1.6.6"

From 290b68c03af268469ea0009701942b58c37a9452 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 6 Feb 2019 06:14:54 +0100
Subject: [PATCH 0700/1703] fix(@angular-devkit/build-angular): add missing
 open parenthesis in stacktrace (#13565)

Fixes #13558
---
 .../build_angular/src/angular-cli-files/plugins/karma.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
index bdc4e2a04744..ea1d78aeeae9 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
@@ -285,7 +285,7 @@ const sourceMapReporter: any = function (this: any, baseReporterDecorator: any,
 
   muteDuplicateReporterLogging(this, config);
 
-  const urlRegexp = /\(http:\/\/localhost:\d+\/_karma_webpack_\/webpack:\//gi;
+  const urlRegexp = /http:\/\/localhost:\d+\/_karma_webpack_\/webpack:\//gi;
 
   this.onSpecComplete = function (_browser: any, result: any) {
     if (!result.success && result.log.length > 0) {

From bf566c710181b0e23af0070540294de99f259fe9 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 6 Feb 2019 06:15:08 +0100
Subject: [PATCH 0701/1703]  build: update karma and jasmine dependencies
 (#13566)

* feat(@schematics/angular): update karma and jasmine dependencies

* feat(@angular-devkit/build-angular): update karma and jasmine dependencies

* build: update karma and jasmine dependencies

* test: add test expectations in shell component
---
 package.json                                  |  9 ++-
 .../angular_devkit/build_angular/package.json |  8 +-
 .../angular/app-shell/index_spec.ts           |  2 +-
 .../workspace/files/package.json.template     |  8 +-
 yarn.lock                                     | 75 ++++++++-----------
 5 files changed, 47 insertions(+), 55 deletions(-)

diff --git a/package.json b/package.json
index 869e9d04a656..1ddf4179ccf3 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "@types/glob": "^7.0.0",
     "@types/inquirer": "^0.0.43",
     "@types/istanbul": "^0.4.30",
-    "@types/jasmine": "^2.8.8",
+    "@types/jasmine": "^3.3.8",
     "@types/loader-utils": "^1.1.3",
     "@types/minimist": "^1.2.0",
     "@types/node": "8.10.10",
@@ -102,9 +102,10 @@
     "husky": "^0.14.3",
     "istanbul": "^0.4.5",
     "jasmine": "^2.6.0",
-    "jasmine-spec-reporter": "^3.2.0",
-    "karma": "~3.1.1",
-    "karma-jasmine-html-reporter": "^0.2.2",
+    "jasmine-spec-reporter": "^4.2.1",
+    "karma": "~4.0.0",
+    "karma-jasmine": "^2.0.1",
+    "karma-jasmine-html-reporter": "^1.4.0",
     "license-checker": "^20.1.0",
     "minimatch": "^3.0.4",
     "minimist": "^1.2.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 60e2f64b97ce..11c8fdaf603f 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -74,13 +74,13 @@
     "bootstrap": "^4.0.0",
     "font-awesome": "^4.7.0",
     "jquery": "^3.3.1",
-    "jasmine-core": "~2.8.0",
+    "jasmine-core": "~3.3.0",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~3.1.1",
+    "karma": "~4.0.0",
     "karma-chrome-launcher": "~2.2.0",
     "karma-coverage-istanbul-reporter": "~2.0.0",
-    "karma-jasmine": "~1.1.0",
-    "karma-jasmine-html-reporter": "^0.2.2",
+    "karma-jasmine": "~2.0.1",
+    "karma-jasmine-html-reporter": "^1.4.0",
     "material-design-icons": "^3.0.1",
     "popper.js": "^1.14.1",
     "protractor": "~5.4.0",
diff --git a/packages/schematics/angular/app-shell/index_spec.ts b/packages/schematics/angular/app-shell/index_spec.ts
index 9e1b1626b8d9..75cb959ff69b 100644
--- a/packages/schematics/angular/app-shell/index_spec.ts
+++ b/packages/schematics/angular/app-shell/index_spec.ts
@@ -166,7 +166,7 @@ describe('App Shell Schematic', () => {
 
   it('should create the shell component', () => {
     const tree = schematicRunner.runSchematic('appShell', defaultOptions, appTree);
-    expect(tree.exists('/projects/bar/src/app/app-shell/app-shell.component.ts'));
+    expect(tree.exists('/projects/bar/src/app/app-shell/app-shell.component.ts')).toBe(true);
     const content = tree.readContent('/projects/bar/src/app/app.server.module.ts');
     expect(content).toMatch(/app\-shell\.component/);
   });
diff --git a/packages/schematics/angular/workspace/files/package.json.template b/packages/schematics/angular/workspace/files/package.json.template
index 4c6f3a0b0a71..2ff1143f4973 100644
--- a/packages/schematics/angular/workspace/files/package.json.template
+++ b/packages/schematics/angular/workspace/files/package.json.template
@@ -29,16 +29,16 @@
     "@angular/compiler-cli": "<%= latestVersions.Angular %>",
     "@angular/language-service": "<%= latestVersions.Angular %>",
     "@types/node": "~8.9.4",<% if (!minimal) { %>
-    "@types/jasmine": "~2.8.8",
+    "@types/jasmine": "~3.3.8",
     "@types/jasminewd2": "~2.0.3",
     "codelyzer": "~4.5.0",
     "jasmine-core": "~2.99.1",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~3.1.1",
+    "karma": "~4.0.0",
     "karma-chrome-launcher": "~2.2.0",
     "karma-coverage-istanbul-reporter": "~2.0.1",
-    "karma-jasmine": "~1.1.2",
-    "karma-jasmine-html-reporter": "^0.2.2",
+    "karma-jasmine": "~2.0.1",
+    "karma-jasmine-html-reporter": "^1.4.0",
     "protractor": "~5.4.0",<% } %>
     "ts-node": "~7.0.0",
     "tslint": "~5.11.0",
diff --git a/yarn.lock b/yarn.lock
index 83917d782799..b11a8e0669c2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -342,10 +342,10 @@
   resolved "https://registry.yarnpkg.com/@types/istanbul/-/istanbul-0.4.30.tgz#073159320ab3296b2cfeb481f756a1f8f4c9c8e4"
   integrity sha512-+hQU4fh2G96ze78uI5/V6+SRDZD1UnVrFn23i2eDetwfbBq3s0/zYP92xj/3qyvVMM3WnvS88N56zjz+HmL04A==
 
-"@types/jasmine@^2.8.8":
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.8.tgz#bf53a7d193ea8b03867a38bfdb4fbb0e0bf066c9"
-  integrity sha512-OJSUxLaxXsjjhob2DBzqzgrkLmukM3+JMpRp0r0E4HTdT1nwDCWhaswjYxazPij6uOdzHCJfNbDjmQ1/rnNbCg==
+"@types/jasmine@^3.3.8":
+  version "3.3.8"
+  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.3.8.tgz#fc6abd92f7121431685ec986f0ec8f77b4390a3e"
+  integrity sha512-BaOFpaddRVV8qykJoWHrHtamml880oh0+DIZWbtJgx0pu+KhDF1gER5hSfCIfzyMrbjMuYFnLUfyo1l0JUVU3Q==
 
 "@types/loader-utils@^1.1.3":
   version "1.1.3"
@@ -3835,6 +3835,11 @@ find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
+flatted@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916"
+  integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==
+
 flush-write-stream@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
@@ -5364,19 +5369,17 @@ jasmine-core@2.8.0, jasmine-core@~2.8.0:
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
   integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
 
+jasmine-core@^3.3, jasmine-core@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.3.0.tgz#dea1cdc634bc93c7e0d4ad27185df30fa971b10e"
+  integrity sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA==
+
 jasmine-core@~2.99.0:
   version "2.99.1"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15"
   integrity sha1-5kAN8ea1bhMLYcS80JPap/boyhU=
 
-jasmine-spec-reporter@^3.2.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-3.3.0.tgz#c63c3d43bacfd16e6da86c46d265957e0075f14c"
-  integrity sha1-xjw9Q7rP0W5tqGxG0mWVfgB18Uw=
-  dependencies:
-    colors "1.1.2"
-
-jasmine-spec-reporter@~4.2.1:
+jasmine-spec-reporter@^4.2.1, jasmine-spec-reporter@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz#1d632aec0341670ad324f92ba84b4b32b35e9e22"
   integrity sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==
@@ -5560,22 +5563,22 @@ karma-firefox-launcher@1.1.0:
   resolved "https://registry.yarnpkg.com/karma-firefox-launcher/-/karma-firefox-launcher-1.1.0.tgz#2c47030452f04531eb7d13d4fc7669630bb93339"
   integrity sha512-LbZ5/XlIXLeQ3cqnCbYLn+rOVhuMIK9aZwlP6eOLGzWdo1UVp7t6CN3DP4SafiRLjexKwHeKHDm0c38Mtd3VxA==
 
-karma-jasmine-html-reporter@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-0.2.2.tgz#48a8e5ef18807617ee2b5e33c1194c35b439524c"
-  integrity sha1-SKjl7xiAdhfuK14zwRlMNbQ5Ukw=
-  dependencies:
-    karma-jasmine "^1.0.2"
+karma-jasmine-html-reporter@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.4.0.tgz#1abbd30d4509a8c82b96707ae7d2fa4da459ca19"
+  integrity sha512-0wxhwA8PLPpICZ4o2GRnPi67hf3JhfQm5WCB8nElh4qsE6wRNOTtrqooyBPNqI087Xr2SBhxLg5fU+BJ/qxRrw==
 
 karma-jasmine@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.1.tgz#6fe840e75a11600c9d91e84b33c458e1c46a3529"
   integrity sha1-b+hA51oRYAydkehLM8RY4cRqNSk=
 
-karma-jasmine@^1.0.2, karma-jasmine@~1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.2.tgz#394f2b25ffb4a644b9ada6f22d443e2fd08886c3"
-  integrity sha1-OU8rJf+0pkS5rabyLUQ+L9CIhsM=
+karma-jasmine@^2.0.1, karma-jasmine@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-2.0.1.tgz#26e3e31f2faf272dd80ebb0e1898914cc3a19763"
+  integrity sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==
+  dependencies:
+    jasmine-core "^3.3"
 
 karma-requirejs@1.1.0:
   version "1.1.0"
@@ -5638,10 +5641,10 @@ karma@alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a:
     tmp "0.0.33"
     useragent "^2.1.12"
 
-karma@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-3.1.1.tgz#94c8edd20fb9597ccde343326da009737fb0423a"
-  integrity sha512-NetT3wPCQMNB36uiL9LLyhrOt8SQwrEKt0xD3+KpTCfm0VxVyUJdPL5oTq2Ic5ouemgL/Iz4wqXEbF3zea9kQQ==
+karma@~4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-4.0.0.tgz#f28e38a2b66243fde3f98e12a8dcaa2c6ff8ca9c"
+  integrity sha512-EFoFs3F6G0BcUGPNOn/YloGOb3h09hzTguyXlg6loHlKY76qbJikkcyPk43m2kfRF65TUGda/mig29QQtyhm1g==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
@@ -5653,11 +5656,12 @@ karma@~3.1.1:
     di "^0.0.1"
     dom-serialize "^2.2.0"
     expand-braces "^0.1.1"
+    flatted "^2.0.0"
     glob "^7.1.1"
     graceful-fs "^4.1.2"
     http-proxy "^1.13.0"
     isbinaryfile "^3.0.0"
-    lodash "^4.17.4"
+    lodash "^4.17.5"
     log4js "^3.0.0"
     mime "^2.3.1"
     minimatch "^3.0.2"
@@ -5669,7 +5673,7 @@ karma@~3.1.1:
     socket.io "2.1.1"
     source-map "^0.6.1"
     tmp "0.0.33"
-    useragent "2.2.1"
+    useragent "2.3.0"
 
 keyv@^3.0.0:
   version "3.1.0"
@@ -6056,11 +6060,6 @@ lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
   integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
 
-lru-cache@2.2.x:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d"
-  integrity sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=
-
 lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
@@ -10245,15 +10244,7 @@ use@^3.1.0:
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
   integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
-useragent@2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.2.1.tgz#cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"
-  integrity sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=
-  dependencies:
-    lru-cache "2.2.x"
-    tmp "0.0.x"
-
-useragent@^2.1.12:
+useragent@2.3.0, useragent@^2.1.12:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz#217f943ad540cb2128658ab23fc960f6a88c9972"
   integrity sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==

From b27fabe786aba35f3bfb6d7423467d7f346aaa7d Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 6 Feb 2019 06:15:25 +0100
Subject: [PATCH 0702/1703] fix(@angular-devkit/build-angular): remove
 deprecated `istanbul` from dependencies (#13567)

It also seems this package was unused

Fix #13562
---
 packages/angular_devkit/build_angular/package.json | 1 -
 yarn.lock                                          | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 11c8fdaf603f..564b54059191 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -18,7 +18,6 @@
     "copy-webpack-plugin": "4.6.0",
     "file-loader": "3.0.1",
     "glob": "7.1.3",
-    "istanbul": "0.4.5",
     "istanbul-instrumenter-loader": "3.0.1",
     "karma-source-map-support": "1.3.0",
     "less": "3.9.0",
diff --git a/yarn.lock b/yarn.lock
index b11a8e0669c2..b5c80b313eb3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5344,7 +5344,7 @@ istanbul-reports@^2.0.1:
   dependencies:
     handlebars "^4.0.11"
 
-istanbul@0.4.5, istanbul@^0.4.5:
+istanbul@^0.4.5:
   version "0.4.5"
   resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-0.4.5.tgz#65c7d73d4c4da84d4f3ac310b918fb0b8033733b"
   integrity sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=

From 0496b514adf94b351df65a619b8c6dc770f15344 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovatebot@gmail.com>
Date: Wed, 6 Feb 2019 06:15:36 +0100
Subject: [PATCH 0703/1703] build: update ajv to version 6.8.1 (#13583)

---
 package.json                                       | 2 +-
 packages/angular_devkit/build_angular/package.json | 2 +-
 packages/angular_devkit/core/package.json          | 2 +-
 yarn.lock                                          | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 1ddf4179ccf3..5098c2a4fef8 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "@types/webpack-dev-server": "^3.1.0",
     "@types/webpack-sources": "^0.1.5",
     "@yarnpkg/lockfile": "1.1.0",
-    "ajv": "6.7.0",
+    "ajv": "6.8.1",
     "common-tags": "^1.8.0",
     "conventional-changelog": "^1.1.0",
     "conventional-commits-parser": "^3.0.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 564b54059191..681bd51d07e1 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -11,7 +11,7 @@
     "@angular-devkit/build-webpack": "0.0.0",
     "@angular-devkit/core": "0.0.0",
     "@ngtools/webpack": "0.0.0",
-    "ajv": "6.7.0",
+    "ajv": "6.8.1",
     "autoprefixer": "9.4.7",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json
index 8895ba09e704..220b173d8b87 100644
--- a/packages/angular_devkit/core/package.json
+++ b/packages/angular_devkit/core/package.json
@@ -8,7 +8,7 @@
     "core"
   ],
   "dependencies": {
-    "ajv": "6.7.0",
+    "ajv": "6.8.1",
     "chokidar": "2.0.4",
     "fast-json-stable-stringify": "2.0.0",
     "rxjs": "6.3.3",
diff --git a/yarn.lock b/yarn.lock
index b5c80b313eb3..14db1df849e4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -837,10 +837,10 @@ ajv-keywords@^3.1.0:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
   integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
 
-ajv@6.7.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.7.0.tgz#e3ce7bb372d6577bb1839f1dfdfcbf5ad2948d96"
-  integrity sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==
+ajv@6.8.1:
+  version "6.8.1"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.8.1.tgz#0890b93742985ebf8973cd365c5b23920ce3cb20"
+  integrity sha512-eqxCp82P+JfqL683wwsL73XmFs1eG6qjw+RD3YHx+Jll1r0jNd4dh8QG9NYAeNGA/hnZjeEDgtTskgJULbxpWQ==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"

From e6f96fb74499006dc339e2f14a554e87488aeb3f Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 6 Feb 2019 05:15:49 +0000
Subject: [PATCH 0704/1703] fix(@angular-devkit/build-angular): use sourcemap
 object in karma plugin (#13584)

Followup to https://github.com/angular/angular-cli/pull/13062

Fix https://github.com/angular/angular-cli/issues/13580
---
 .../build_angular/src/angular-cli-files/plugins/karma.ts     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
index ea1d78aeeae9..a009ab2abab5 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
@@ -18,6 +18,7 @@ import { statsErrorsToString } from '../utilities/stats';
 import { getWebpackStatsConfig } from '../models/webpack-configs/stats';
 import { createConsoleLogger } from '@angular-devkit/core/node';
 import { logging } from '@angular-devkit/core';
+import { WebpackTestOptions } from '../models/build-options';
 
 /**
  * Enumerate needed (but not require/imported) dependencies from this file
@@ -63,7 +64,7 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
     ` be used from within Angular CLI and will not work correctly outside of it.`
     )
   }
-  const options = config.buildWebpack.options;
+  const options = config.buildWebpack.options as WebpackTestOptions;
   const logger: logging.Logger = config.buildWebpack.logger || createConsoleLogger();
   successCb = config.buildWebpack.successCb;
   failureCb = config.buildWebpack.failureCb;
@@ -77,7 +78,7 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
   }
 
   // Add a reporter that fixes sourcemap urls.
-  if (options.sourceMap) {
+  if (options.sourceMap.scripts) {
     config.reporters.unshift('@angular-devkit/build-angular--sourcemap-reporter');
 
     // Code taken from https://github.com/tschaub/karma-source-map-support.

From 87caf2118b3d5f4696abf5eedff9339c28c4bb7f Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 6 Feb 2019 05:16:05 +0000
Subject: [PATCH 0705/1703] fix(@angular/cli): update terser-webpack-plugin
 (#13589)

Fix #13582
---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 21 +++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 681bd51d07e1..ba8152c6a3f9 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -43,7 +43,7 @@
     "stylus": "0.54.5",
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
-    "terser-webpack-plugin": "1.2.1",
+    "terser-webpack-plugin": "1.2.2",
     "webpack": "4.29.0",
     "webpack-dev-middleware": "3.5.1",
     "webpack-dev-server": "3.1.14",
diff --git a/yarn.lock b/yarn.lock
index 14db1df849e4..07182344b484 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9141,7 +9141,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@0.5.10:
+source-map-support@0.5.10, source-map-support@~0.5.9:
   version "0.5.10"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
   integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==
@@ -9732,17 +9732,17 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
-terser-webpack-plugin@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.1.tgz#7545da9ae5f4f9ae6a0ac961eb46f5e7c845cc26"
-  integrity sha512-GGSt+gbT0oKcMDmPx4SRSfJPE1XaN3kQRWG4ghxKQw9cn5G9x6aCKSsgYdvyM0na9NJ4Drv0RG6jbBByZ5CMjw==
+terser-webpack-plugin@1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz#9bff3a891ad614855a7dde0d707f7db5a927e3d9"
+  integrity sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==
   dependencies:
     cacache "^11.0.2"
     find-cache-dir "^2.0.0"
     schema-utils "^1.0.0"
     serialize-javascript "^1.4.0"
     source-map "^0.6.1"
-    terser "^3.8.1"
+    terser "^3.16.1"
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
@@ -9760,6 +9760,15 @@ terser-webpack-plugin@^1.1.0:
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
+terser@^3.16.1:
+  version "3.16.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-3.16.1.tgz#5b0dd4fa1ffd0b0b43c2493b2c364fd179160493"
+  integrity sha512-JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow==
+  dependencies:
+    commander "~2.17.1"
+    source-map "~0.6.1"
+    source-map-support "~0.5.9"
+
 terser@^3.8.1:
   version "3.10.8"
   resolved "https://registry.yarnpkg.com/terser/-/terser-3.10.8.tgz#2fe3967396a10cdc3d575074fe857efd30a2895a"

From 37b4714b9746bb1bec340ade910761ce281db8ec Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 5 Feb 2019 07:35:57 +0000
Subject: [PATCH 0706/1703] build: update webpack to version 4.29.1

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 packages/angular_devkit/build_webpack/package.json | 2 +-
 packages/ngtools/webpack/package.json              | 2 +-
 yarn.lock                                          | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index ba8152c6a3f9..1d439bfe226c 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -44,7 +44,7 @@
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.2.2",
-    "webpack": "4.29.0",
+    "webpack": "4.29.1",
     "webpack-dev-middleware": "3.5.1",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.2.1",
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index 7cb0241a80c4..acad0922e297 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -15,7 +15,7 @@
     "webpack-dev-server": "^3.1.4"
   },
   "devDependencies": {
-    "webpack": "4.29.0",
+    "webpack": "4.29.1",
     "webpack-dev-server": "^3.1.4"
   }
 }
\ No newline at end of file
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 87b8235f346a..8c715fb45fb9 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -36,6 +36,6 @@
     "@angular/compiler": "^7.2.0-rc.0",
     "@angular/compiler-cli": "^7.2.0-rc.0",
     "typescript": "3.2.4",
-    "webpack": "4.29.0"
+    "webpack": "4.29.1"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 07182344b484..a2815e26cc05 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10533,10 +10533,10 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.29.0:
-  version "4.29.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.0.tgz#f2cfef83f7ae404ba889ff5d43efd285ca26e750"
-  integrity sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w==
+webpack@4.29.1:
+  version "4.29.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.1.tgz#a6533d7bc6a6b1ed188cb029d53d231be777e175"
+  integrity sha512-dY3KyQIVeg6cDPj9G5Bnjy9Pt9SoCpbNWl0RDKHstbd3MWe0dG9ri4RQRpCm43iToy3zoA1IMOpFkJ8Clnc7FQ==
   dependencies:
     "@webassemblyjs/ast" "1.7.11"
     "@webassemblyjs/helper-module-context" "1.7.11"

From be61e3d3cd48f41fba4225ccf62e4a6d8fe4ba9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Exbrayat?=
 <cexbrayat@users.noreply.github.com>
Date: Thu, 7 Feb 2019 17:22:53 +0100
Subject: [PATCH 0707/1703] docs: link to angular.io/cli instead of old wiki
 (#13596)

---
 etc/cli.angular.io/index.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/cli.angular.io/index.html b/etc/cli.angular.io/index.html
index 24375b764f1a..71f55c419027 100644
--- a/etc/cli.angular.io/index.html
+++ b/etc/cli.angular.io/index.html
@@ -33,7 +33,7 @@
         <label for="site-nav-checkbox">SITE MENU</label>
         <nav class="mdl-navigation">
 
-            <a class="mdl-navigation__link" href="https://github.com/angular/angular-cli/wiki">Documentation</a>
+            <a class="mdl-navigation__link" href="https://angular.io/cli">Documentation</a>
 
             <a class="mdl-navigation__link" href="https://github.com/angular/angular-cli">GitHub</a>
 
@@ -41,7 +41,7 @@
         <div class="mdl-layout-spacer"></div>
         <nav class="mdl-navigation">
             <a class="mdl-navigation__link" href="https://github.com/angular/angular-cli/releases"> Releases </a>
-            <a class="mdl-navigation__link" href="https://github.com/angular/angular-cli/wiki"> Get Started </a>
+            <a class="mdl-navigation__link" href="https://angular.io/cli"> Get Started </a>
         </nav>
     </div>
     </div>
@@ -72,7 +72,7 @@
         <div class="mdl-cell mdl-cell--6-col-desktop mdl-cell--12-col-tablet mdl-cell--12-col-phone">
             <h4 class="">Angular CLI</h4>
             <h5 class="tagline">A command line interface for Angular</h5>
-            <a href="https://github.com/angular/angular-cli/wiki" class="mdl-typography--font-regular cta mdl-button mdl-button--raised mdl-button--primary">
+            <a href="https://angular.io/cli" class="mdl-typography--font-regular cta mdl-button mdl-button--raised mdl-button--primary">
                 Get Started
             </a>
         </div>
@@ -107,7 +107,7 @@ <h4>Test, Lint</h4>
 
 
     <div class="button-container mdl-cell mdl-cell--12-col-desktop center">
-        <a href="https://github.com/angular/angular-cli/wiki" class="cta-button mdl-typography--font-regular mdl-button mdl-button--raised mdl-button--accent">
+        <a href="https://angular.io/cli" class="cta-button mdl-typography--font-regular mdl-button mdl-button--raised mdl-button--accent">
             Get Started
         </a>
     </div>

From be79d2a662bfd0e2810f77353d4595e00cc3710f Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovatebot@gmail.com>
Date: Thu, 7 Feb 2019 17:24:05 +0100
Subject: [PATCH 0708/1703] build: update chokidar to version 2.1.0 (#13599)

---
 packages/angular_devkit/core/package.json |  2 +-
 yarn.lock                                 | 78 +++++++++++++++++------
 2 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json
index 220b173d8b87..5aaa3e28dd7d 100644
--- a/packages/angular_devkit/core/package.json
+++ b/packages/angular_devkit/core/package.json
@@ -9,7 +9,7 @@
   ],
   "dependencies": {
     "ajv": "6.8.1",
-    "chokidar": "2.0.4",
+    "chokidar": "2.1.0",
     "fast-json-stable-stringify": "2.0.0",
     "rxjs": "6.3.3",
     "source-map": "0.7.3"
diff --git a/yarn.lock b/yarn.lock
index a2815e26cc05..2b2fa6b5fb0f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1141,7 +1141,7 @@ ast-types@0.x.x:
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.6.tgz#4e2266c2658829aef3b40cc33ad599c4e9eb89ef"
   integrity sha512-nHiuV14upVGl7MWwFUYbzJ6YlfwWS084CU9EA8HajfYQjMSli5TQi3UTRygGF58LFWVkXxS1rbgRhROEqlQkXg==
 
-async-each@^1.0.0:
+async-each@^1.0.0, async-each@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
   integrity sha1-GdOGodntxufByF04iu28xW0zYC0=
@@ -1529,7 +1529,7 @@ braces@^1.8.2:
     preserve "^0.2.0"
     repeat-element "^1.1.2"
 
-braces@^2.3.0, braces@^2.3.1:
+braces@^2.3.0, braces@^2.3.1, braces@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
   integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
@@ -1947,25 +1947,24 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-chokidar@2.0.4, chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
-  integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==
+chokidar@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.0.tgz#5fcb70d0b28ebe0867eb0f09d5f6a08f29a1efa0"
+  integrity sha512-5t6G2SH8eO6lCvYOoUpaRnF5Qfd//gd7qJAkwRUw9qlGVkiQ13uwQngqbWWaurOsaAm9+kUGbITADxt6H0XFNQ==
   dependencies:
     anymatch "^2.0.0"
-    async-each "^1.0.0"
-    braces "^2.3.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
     glob-parent "^3.1.0"
-    inherits "^2.0.1"
+    inherits "^2.0.3"
     is-binary-path "^1.0.0"
     is-glob "^4.0.0"
-    lodash.debounce "^4.0.8"
-    normalize-path "^2.1.1"
+    normalize-path "^3.0.0"
     path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-    upath "^1.0.5"
+    readdirp "^2.2.1"
+    upath "^1.1.0"
   optionalDependencies:
-    fsevents "^1.2.2"
+    fsevents "^1.2.7"
 
 chokidar@^1.4.1, chokidar@^1.4.2:
   version "1.7.0"
@@ -1983,6 +1982,26 @@ chokidar@^1.4.1, chokidar@^1.4.2:
   optionalDependencies:
     fsevents "^1.0.0"
 
+chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
+  integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.0"
+    braces "^2.3.0"
+    glob-parent "^3.1.0"
+    inherits "^2.0.1"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    lodash.debounce "^4.0.8"
+    normalize-path "^2.1.1"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.0.0"
+    upath "^1.0.5"
+  optionalDependencies:
+    fsevents "^1.2.2"
+
 chownr@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
@@ -4004,6 +4023,14 @@ fsevents@^1.0.0, fsevents@^1.2.2:
     nan "^2.9.2"
     node-pre-gyp "^0.10.0"
 
+fsevents@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
+  integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==
+  dependencies:
+    nan "^2.9.2"
+    node-pre-gyp "^0.10.0"
+
 fstream@^1.0.0, fstream@^1.0.2:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
@@ -6292,7 +6319,7 @@ micromatch@^2.1.5, micromatch@^2.3.11:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
-micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
+micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
@@ -6892,6 +6919,11 @@ normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
+normalize-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
 normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
@@ -8196,6 +8228,15 @@ readdirp@^2.0.0:
     readable-stream "^2.0.2"
     set-immediate-shim "^1.0.1"
 
+readdirp@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
+  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+    micromatch "^3.1.10"
+    readable-stream "^2.0.2"
+
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
@@ -10083,11 +10124,6 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.2.tgz#fe8101c46aa123f8353523ebdcf5730c2ae493e5"
-  integrity sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==
-
 typescript@3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d"
@@ -10180,7 +10216,7 @@ unzip-response@^2.0.1:
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
   integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
 
-upath@^1.0.5:
+upath@^1.0.5, upath@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
   integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==

From 416b05061f238ab1b60caa8f04de07eccb2ece2a Mon Sep 17 00:00:00 2001
From: William KOZA <william.koza@gmail.com>
Date: Thu, 7 Feb 2019 17:24:29 +0100
Subject: [PATCH 0709/1703] fix(@angular/cli): Add an error message when we
 call `ng doc` without keyword. Currently, we open a page with the keyword
 `undefined`. (#13604)

---
 packages/angular/cli/commands/doc-impl.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/angular/cli/commands/doc-impl.ts b/packages/angular/cli/commands/doc-impl.ts
index 6a0e7a265ecf..b20c8584cf0c 100644
--- a/packages/angular/cli/commands/doc-impl.ts
+++ b/packages/angular/cli/commands/doc-impl.ts
@@ -14,6 +14,11 @@ const opn = require('opn');
 
 export class DocCommand extends Command<DocCommandSchema> {
   public async run(options: DocCommandSchema & Arguments) {
+    if (!options.keyword) {
+      this.logger.error('You should specify a keyword, for instance, `ng doc ActivatedRoute`.');
+
+      return 0;
+    }
     let searchUrl = `https://angular.io/api?query=${options.keyword}`;
     if (options.search) {
       searchUrl = `https://www.google.com/search?q=site%3Aangular.io+${options.keyword}`;

From 4ecd232733047184627bd253c29f791e494f411c Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovatebot@gmail.com>
Date: Thu, 7 Feb 2019 17:24:43 +0100
Subject: [PATCH 0710/1703] build: update webpack to version 4.29.3 (#13608)

---
 .../angular_devkit/build_angular/package.json  |  2 +-
 .../angular_devkit/build_webpack/package.json  |  2 +-
 packages/ngtools/webpack/package.json          |  2 +-
 yarn.lock                                      | 18 +++++-------------
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 1d439bfe226c..04284aaafe74 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -44,7 +44,7 @@
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.2.2",
-    "webpack": "4.29.1",
+    "webpack": "4.29.3",
     "webpack-dev-middleware": "3.5.1",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.2.1",
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index acad0922e297..f69964c4a38d 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -15,7 +15,7 @@
     "webpack-dev-server": "^3.1.4"
   },
   "devDependencies": {
-    "webpack": "4.29.1",
+    "webpack": "4.29.3",
     "webpack-dev-server": "^3.1.4"
   }
 }
\ No newline at end of file
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 8c715fb45fb9..64ea23a70d12 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -36,6 +36,6 @@
     "@angular/compiler": "^7.2.0-rc.0",
     "@angular/compiler-cli": "^7.2.0-rc.0",
     "typescript": "3.2.4",
-    "webpack": "4.29.1"
+    "webpack": "4.29.3"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 2b2fa6b5fb0f..726c6f942237 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8714,14 +8714,6 @@ schema-utils@^0.3.0:
   dependencies:
     ajv "^5.0.0"
 
-schema-utils@^0.4.4:
-  version "0.4.7"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
-  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
-  dependencies:
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-
 schema-utils@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
@@ -10569,10 +10561,10 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.29.1:
-  version "4.29.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.1.tgz#a6533d7bc6a6b1ed188cb029d53d231be777e175"
-  integrity sha512-dY3KyQIVeg6cDPj9G5Bnjy9Pt9SoCpbNWl0RDKHstbd3MWe0dG9ri4RQRpCm43iToy3zoA1IMOpFkJ8Clnc7FQ==
+webpack@4.29.3:
+  version "4.29.3"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.3.tgz#e0b406a7b4201ed5e4fb4f84fd7359f9a7db4647"
+  integrity sha512-xPJvFeB+8tUflXFq+OgdpiSnsCD5EANyv56co5q8q8+YtEasn5Sj3kzY44mta+csCIEB0vneSxnuaHkOL2h94A==
   dependencies:
     "@webassemblyjs/ast" "1.7.11"
     "@webassemblyjs/helper-module-context" "1.7.11"
@@ -10593,7 +10585,7 @@ webpack@4.29.1:
     mkdirp "~0.5.0"
     neo-async "^2.5.0"
     node-libs-browser "^2.0.0"
-    schema-utils "^0.4.4"
+    schema-utils "^1.0.0"
     tapable "^1.1.0"
     terser-webpack-plugin "^1.1.0"
     watchpack "^1.5.0"

From 733efe71e38a22e72d76444a7dc528009b847584 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 7 Feb 2019 16:28:19 +0000
Subject: [PATCH 0711/1703] fix(@angular-devkit/build-optimizer): prefix
 renamed extended classes (#13613)

Fix #11796
---
 .../src/transforms/prefix-classes.ts          |  2 +-
 .../src/transforms/prefix-classes_spec.ts     | 34 +++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts b/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts
index 0ade653c54f8..8637c66baa71 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts
@@ -30,7 +30,7 @@ export function testPrefixClasses(content: string) {
       exportVarSetter, multiLineComment,
       /\(/, multiLineComment,
       /\s*function \(_super\) {/, newLine,
-      /\w*\.?__extends\(\w+, _super\);/,
+      /\S*\.?__extends\(\S+, _super\);/,
     ],
   ].map(arr => new RegExp(arr.map(x => x.source).join(''), 'm'));
 
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes_spec.ts
index d8b92f70ee77..21149b28bf00 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes_spec.ts
@@ -193,6 +193,40 @@ describe('prefix-classes', () => {
     expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
   });
 
+  it('prefix TS 2.5 - 2.6 renamed downlevel class with extends', () => {
+    const input = tags.stripIndent`
+      var NgModuleFactory$1 = /** @class */ (function (_super) {
+          __extends(NgModuleFactory$$1, _super);
+          function NgModuleFactory$$1(moduleType) {
+              var _this = _super.call(this) || this;
+              _this.moduleType = moduleType;
+              return _this;
+          }
+          NgModuleFactory$$1.prototype.create = function (parentInjector) {
+              return new NgModuleRef$1(this.moduleType, parentInjector);
+          };
+          return NgModuleFactory$$1;
+      }(NgModuleFactory));
+    `;
+    const output = tags.stripIndent`
+      var NgModuleFactory$1 = /** @class */ /*@__PURE__*/ (function (_super) {
+          __extends(NgModuleFactory$$1, _super);
+          function NgModuleFactory$$1(moduleType) {
+              var _this = _super.call(this) || this;
+              _this.moduleType = moduleType;
+              return _this;
+          }
+          NgModuleFactory$$1.prototype.create = function (parentInjector) {
+              return new NgModuleRef$1(this.moduleType, parentInjector);
+          };
+          return NgModuleFactory$$1;
+      }(NgModuleFactory));
+    `;
+
+    expect(testPrefixClasses(input)).toBeTruthy();
+    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+  });
+
   it('prefix TS 2.5 - 2.6 downlevel class with static variable', () => {
     const input = tags.stripIndent`
       var StaticTestCase = /** @class */ (function () {

From b5a5e99bafbbe93b0a27d31441038df7947e058a Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovatebot@gmail.com>
Date: Thu, 7 Feb 2019 17:32:49 +0100
Subject: [PATCH 0712/1703] build: update webpack-dev-middleware to version
 3.5.2 (#13609)

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 04284aaafe74..fbf58859e37c 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -45,7 +45,7 @@
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.2.2",
     "webpack": "4.29.3",
-    "webpack-dev-middleware": "3.5.1",
+    "webpack-dev-middleware": "3.5.2",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.2.1",
     "webpack-sources": "1.3.0",
diff --git a/yarn.lock b/yarn.lock
index 726c6f942237..16f1aaee0485 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10451,10 +10451,10 @@ webpack-dev-middleware@3.4.0:
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
-webpack-dev-middleware@3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.5.1.tgz#9265b7742ef50f54f54c1d9af022fc17c1be9b88"
-  integrity sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==
+webpack-dev-middleware@3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.5.2.tgz#d768b6194f3fe8d72d51feded49de359e8d96ffb"
+  integrity sha512-nPmshdt1ckcwWjI0Ubrdp8KroeuprW6xFKYqk0u3MflNMBXvHPnMATsC7/L/enwav2zvLCfj/Usr47qnF3KQyA==
   dependencies:
     memory-fs "~0.4.1"
     mime "^2.3.1"

From a027f308975d784d59f6266fd63684bbb631820b Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 7 Feb 2019 09:43:13 -0800
Subject: [PATCH 0713/1703] release: 8.0.0-beta.0

---
 .monorepo.json | 76 +++++++++++++++++++++++++-------------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index 509606bc5535..b3952e269f9b 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,16 +42,16 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.13.0-rc.0",
-      "hash": "4eecb4a76317039defc5c2b4bd31e4f9"
+      "version": "0.14.0-beta.0",
+      "hash": "5225044ecf49d630564a68b710f6b82f"
     },
     "@_/builders": {
-      "version": "0.13.0-rc.0",
-      "hash": "796f00a3b325334632fd8bb9d1b46b02"
+      "version": "0.14.0-beta.0",
+      "hash": "f34470f978203f13c312094472b0a343"
     },
     "devkit": {
-      "version": "0.13.0-rc.0",
-      "hash": "10155f9a3d1491f01029f3e1f17e53c5"
+      "version": "0.14.0-beta.0",
+      "hash": "fffa4754a8961c7ba96f239e123a318e"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -62,15 +62,15 @@
           "url": "/packages/angular/cli/README.md"
         }
       ],
-      "version": "7.3.0-rc.0",
+      "version": "8.0.0-beta.0",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "98ba66c65bd76e6416c395168ea36942"
+      "hash": "20c8f4273a7193547c18a7f6932821aa"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.13.0-rc.0",
-      "hash": "d083cd4c874ab24a9e64a688a46819d5",
+      "version": "0.14.0-beta.0",
+      "hash": "cb7dc6cb2234e386312191e8c34bfe8d",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -81,21 +81,21 @@
           "url": "/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.13.0-rc.0",
-      "hash": "cad5e9583409b4aaa4265c9058570e1c",
+      "version": "0.14.0-beta.0",
+      "hash": "fe48b17f505ea8e25c42d1ed56675678",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.13.0-rc.0",
-      "hash": "79975f9eddbd7c9da181621757242159",
+      "version": "0.14.0-beta.0",
+      "hash": "4083882f4d9f75d508f8bc7f7cac41ba",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
       "name": "Benchmark",
       "section": "Tooling",
-      "version": "1.2.0-rc.0",
-      "hash": "2fd80ee178831cf05f721dc60d427045"
+      "version": "1.2.0-beta.0",
+      "hash": "9c7b0dfb36d6bcce8bed49229983ae06"
     },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
@@ -105,8 +105,8 @@
           "url": "/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.13.0-rc.0",
-      "hash": "963623296eed8991da173b36ae133422",
+      "version": "0.14.0-beta.0",
+      "hash": "a161a1260ca78180d05fa9d15fffd3bb",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -117,8 +117,8 @@
           "url": "/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.13.0-rc.0",
-      "hash": "204d6049be4dc38231ad340f6647234e",
+      "version": "0.14.0-beta.0",
+      "hash": "169e19ba11205591f060580bbb12d173",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -129,8 +129,8 @@
           "url": "/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.13.0-rc.0",
-      "hash": "62c5c47288d1e6253aee2b87f58d23ea",
+      "version": "0.14.0-beta.0",
+      "hash": "e93941d8f914b5343bbf6ef560a1e618",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -141,9 +141,9 @@
           "url": "/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.13.0-rc.0",
+      "version": "0.14.0-beta.0",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "f969c837647b6e7b2252e8043d5f51a4"
+      "hash": "7591415bda6620b1bf8591e10e917790"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -153,8 +153,8 @@
           "url": "/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "7.3.0-rc.0",
-      "hash": "3b41fea05a2407f68376577c7e187125",
+      "version": "8.0.0-beta.0",
+      "hash": "f77c01a3ada695d086cdbc51eab279e3",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -165,43 +165,43 @@
           "url": "/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "7.3.0-rc.0",
-      "hash": "1c02c44f881d843eb073203f3dc6d595",
+      "version": "8.0.0-beta.0",
+      "hash": "364c25476faaa91051a1980bd5188b65",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.13.0-rc.0",
-      "hash": "e7387a3eacefb5cfbcacd7c652a4cce4",
+      "version": "0.14.0-beta.0",
+      "hash": "0667d56180e64950473c3e26193088e6",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "7.3.0-rc.0",
+      "version": "8.0.0-beta.0",
       "section": "Misc",
-      "hash": "29ac1ec6a3c2011594995d1cec89cab4",
+      "hash": "b196c6c249af9f61dddb807ad6df5b1f",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "7.3.0-rc.0",
-      "hash": "fcadd5d025797bdb162ce731e1515b99",
+      "version": "8.0.0-beta.0",
+      "hash": "1bb7fd9d494f707e0572aa4f66da3bbb",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.13.0-rc.0",
+      "version": "0.14.0-beta.0",
       "section": "Schematics",
-      "hash": "edbe388e57e8805d49bdd41410b147bc",
+      "hash": "b55067e414fadf96b4388efaf88422cc",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.13.0-rc.0",
+      "version": "0.14.0-beta.0",
       "section": "Schematics",
-      "hash": "128b864b9f5d8d844cee04103a639d5c",
+      "hash": "80c58bc59c4e0909692225d897ffcf99",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }

From 5f73b17f7a8f6d86ca0a516c231d4f6d6bc03d1c Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 7 Feb 2019 11:03:21 -0800
Subject: [PATCH 0714/1703] refactor(@angular-devkit/core): add invalid
 argument exception class

Before we were (wrongly) using the InboundMessage exception class. This was
an oversight. This commit introduces a new InvalidArgument exception for this
special case.
---
 .../core/src/experimental/jobs/simple-scheduler.ts  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts b/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts
index 05b216171509..c7edcd907613 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts
@@ -22,7 +22,7 @@ import {
   filter,
   first,
   ignoreElements,
-  map,
+  map, share,
   shareReplay,
   switchMap,
   tap,
@@ -47,6 +47,11 @@ import {
 import { JobDoesNotExistException } from './exception';
 
 
+export class JobArgumentSchemaValidationError extends schema.SchemaValidationException {
+  constructor(errors?: schema.SchemaValidatorError[]) {
+    super(errors, 'Job Argument failed to validate. Errors: ');
+  }
+}
 export class JobInboundMessageSchemaValidationError extends schema.SchemaValidationException {
   constructor(errors?: schema.SchemaValidatorError[]) {
     super(errors, 'Job Inbound Message failed to validate. Errors: ');
@@ -144,7 +149,9 @@ export class SimpleScheduler<
         }
 
         const description: JobDescription = {
-          name,
+          // Make a copy of it to be sure it's proper JSON.
+          ...JSON.parse(JSON.stringify(handler.jobDescription)),
+          name: handler.jobDescription.name || name,
           argument: handler.jobDescription.argument || true,
           input: handler.jobDescription.input || true,
           output: handler.jobDescription.output || true,
@@ -519,7 +526,7 @@ export class SimpleScheduler<
             switchMap(validate => validate(argument)),
             switchMap(output => {
               if (!output.success) {
-                throw new JobInboundMessageSchemaValidationError(output.errors);
+                throw new JobArgumentSchemaValidationError(output.errors);
               }
 
               const argument: A = output.data as A;

From ca316405054e0505fd3da8b8479e94d08ba8f023 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 7 Feb 2019 11:05:28 -0800
Subject: [PATCH 0715/1703] refactor(@angular-devkit/core): change the job
 context scheduler to generic

That scheduler is really an any scheduler and would need to be typed
appropriately. There could be multiple schedulers that this job is
part of and it is impossible to ensure the scheduler is a more specific
type than unknown.

Note: This was wrongly typed before.

Context: JsonValue is the JSON equivalent of the unknown TS type.
---
 packages/angular_devkit/core/src/experimental/jobs/api.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/core/src/experimental/jobs/api.ts b/packages/angular_devkit/core/src/experimental/jobs/api.ts
index 92f045e5369e..227c7e2eb51d 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/api.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/api.ts
@@ -42,7 +42,7 @@ export interface JobHandlerContext<
   MinimumOutputValueT extends JsonValue = JsonValue,
 > {
   readonly description: JobDescription;
-  readonly scheduler: Scheduler<MinimumArgumentValueT, MinimumInputValueT, MinimumOutputValueT>;
+  readonly scheduler: Scheduler<JsonValue, JsonValue, JsonValue>;
 
   // In this context, JsonValue is comparable to `any`.
   readonly dependencies: Job<JsonValue, JsonValue, JsonValue>[];

From ef93ff8c7836b3531434b9ed4faf6b016265788a Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 7 Feb 2019 11:23:11 -0800
Subject: [PATCH 0716/1703] refactor(@angular-devkit/core): Type
 JobHandlerContext properly

The input field is not an unknown JsonValue, the type is part of the
generic. It's validated by the scheduler.
---
 .../core/src/experimental/jobs/create-job-handler.ts        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/core/src/experimental/jobs/create-job-handler.ts b/packages/angular_devkit/core/src/experimental/jobs/create-job-handler.ts
index 688644230896..65bd3a044e88 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/create-job-handler.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/create-job-handler.ts
@@ -39,7 +39,7 @@ export interface SimpleJobHandlerContext<
 > extends JobHandlerContext<A, I, O> {
   logger: LoggerApi;
   createChannel: (name: string) => Observer<JsonValue>;
-  input: Observable<JsonValue>;
+  input: Observable<I>;
 }
 
 
@@ -68,7 +68,7 @@ export function createJobHandler<A extends JsonValue, I extends JsonValue, O ext
   const handler = (argument: A, context: JobHandlerContext<A, I, O>) => {
     const description = context.description;
     const inboundBus = context.inboundBus;
-    const inputChannel = new Subject<JsonValue>();
+    const inputChannel = new Subject<I>();
     let subscription: Subscription;
 
     return new Observable<JobOutboundMessage<O>>(subject => {
@@ -112,7 +112,7 @@ export function createJobHandler<A extends JsonValue, I extends JsonValue, O ext
 
       const channels = new Map<string, Subject<JsonValue>>();
 
-      const newContext = {
+      const newContext: SimpleJobHandlerContext<A, I, O> = {
         ...context,
         input: inputChannel.asObservable(),
         logger,

From 0e6384b8c41503f20a4bef3242f4d05caabfdf66 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 7 Feb 2019 11:25:15 -0800
Subject: [PATCH 0717/1703] fix(@angular-devkit/core): Properly
 subscribe/unsubscribe to observables

This has been a source of headaches when debugging the Architect jobs.
We keep all subscriptions now and unsubscribe them when the result is
done.
---
 .../experimental/jobs/create-job-handler.ts   | 67 +++++++++----------
 1 file changed, 32 insertions(+), 35 deletions(-)

diff --git a/packages/angular_devkit/core/src/experimental/jobs/create-job-handler.ts b/packages/angular_devkit/core/src/experimental/jobs/create-job-handler.ts
index 65bd3a044e88..c706359f47dd 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/create-job-handler.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/create-job-handler.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  *
  */
-import { Observable, Observer, Subject, Subscription, from, isObservable } from 'rxjs';
+import { Observable, Observer, Subject, Subscription, from, isObservable, of } from 'rxjs';
 import { switchMap, tap } from 'rxjs/operators';
 import { BaseException } from '../../exception/index';
 import { JsonValue } from '../../json/index';
@@ -72,8 +72,17 @@ export function createJobHandler<A extends JsonValue, I extends JsonValue, O ext
     let subscription: Subscription;
 
     return new Observable<JobOutboundMessage<O>>(subject => {
+      function complete() {
+        if (subscription) {
+          subscription.unsubscribe();
+        }
+        subject.next({ kind: JobOutboundMessageKind.End, description });
+        subject.complete();
+        inputChannel.complete();
+      }
+
       // Handle input.
-      inboundBus.subscribe(message => {
+      const inboundSub = inboundBus.subscribe(message => {
         switch (message.kind) {
           case JobInboundMessageKind.Ping:
             subject.next({ kind: JobOutboundMessageKind.Pong, description, id: message.id });
@@ -82,13 +91,7 @@ export function createJobHandler<A extends JsonValue, I extends JsonValue, O ext
           case JobInboundMessageKind.Stop:
             // There's no way to cancel a promise or a synchronous function, but we do cancel
             // observables where possible.
-            if (subscription) {
-              subscription.unsubscribe();
-            }
-            subject.next({ kind: JobOutboundMessageKind.End, description });
-            subject.complete();
-            // Close all channels.
-            channels.forEach(x => x.complete());
+            complete();
             break;
 
           case JobInboundMessageKind.Input:
@@ -99,7 +102,7 @@ export function createJobHandler<A extends JsonValue, I extends JsonValue, O ext
 
       // Configure a logger to pass in as additional context.
       const logger = new Logger('job');
-      logger.subscribe(entry => {
+      const logSub = logger.subscribe(entry => {
         subject.next({
           kind: JobOutboundMessageKind.Log,
           description,
@@ -108,8 +111,6 @@ export function createJobHandler<A extends JsonValue, I extends JsonValue, O ext
       });
 
       // Execute the function with the additional context.
-      subject.next({ kind: JobOutboundMessageKind.Start, description });
-
       const channels = new Map<string, Subject<JsonValue>>();
 
       const newContext: SimpleJobHandlerContext<A, I, O> = {
@@ -121,7 +122,7 @@ export function createJobHandler<A extends JsonValue, I extends JsonValue, O ext
             throw new ChannelAlreadyExistException(name);
           }
           const channelSubject = new Subject<JsonValue>();
-          channelSubject.subscribe(
+          const channelSub = channelSubject.subscribe(
             message => {
               subject.next({
                 kind: JobOutboundMessageKind.ChannelMessage, description, name, message,
@@ -140,36 +141,32 @@ export function createJobHandler<A extends JsonValue, I extends JsonValue, O ext
           );
 
           channels.set(name, channelSubject);
+          if (subscription) {
+            subscription.add(channelSub);
+          }
 
           return channelSubject;
         },
       };
 
-      const result = fn(argument, newContext);
+      subject.next({ kind: JobOutboundMessageKind.Start, description });
+      let result = fn(argument, newContext);
       // If the result is a promise, simply wait for it to complete before reporting the result.
       if (isPromise(result)) {
-        result.then(result => {
-          subject.next({ kind: JobOutboundMessageKind.Output, description, value: result });
-          subject.next({ kind: JobOutboundMessageKind.End, description });
-          subject.complete();
-        }, err => subject.error(err));
-      } else if (isObservable(result)) {
-        subscription = (result as Observable<O>).subscribe(
-          (value: O) => subject.next({ kind: JobOutboundMessageKind.Output, description, value }),
-          error => subject.error(error),
-          () => {
-            subject.next({ kind: JobOutboundMessageKind.End, description });
-            subject.complete();
-          },
-        );
-
-        return subscription;
-      } else {
-        // If it's a scalar value, report it synchronously.
-        subject.next({ kind: JobOutboundMessageKind.Output, description, value: result as O });
-        subject.next({ kind: JobOutboundMessageKind.End, description });
-        subject.complete();
+        result = from(result);
+      } else if (!isObservable(result)) {
+        result = of(result as O);
       }
+
+      subscription = (result as Observable<O>).subscribe(
+        (value: O) => subject.next({ kind: JobOutboundMessageKind.Output, description, value }),
+        error => subject.error(error),
+        () => complete(),
+      );
+      subscription.add(inboundSub);
+      subscription.add(logSub);
+
+      return subscription;
     });
   };
 

From c461ed5960ab659f9e32a476908313af7eff980f Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 7 Feb 2019 11:31:08 -0800
Subject: [PATCH 0718/1703] feat(@angular-devkit/core): createJobFactory does
 not have to have options

It matches the other factories.
---
 .../core/src/experimental/jobs/create-job-handler.ts            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/core/src/experimental/jobs/create-job-handler.ts b/packages/angular_devkit/core/src/experimental/jobs/create-job-handler.ts
index c706359f47dd..5e62439a078b 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/create-job-handler.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/create-job-handler.ts
@@ -181,7 +181,7 @@ export function createJobHandler<A extends JsonValue, I extends JsonValue, O ext
  */
 export function createJobFactory<A extends JsonValue, I extends JsonValue, O extends JsonValue>(
   loader: () => Promise<JobHandler<A, I, O>>,
-  options: Partial<JobDescription>,
+  options: Partial<JobDescription> = {},
 ): JobHandler<A, I, O> {
   const handler = (argument: A, context: JobHandlerContext<A, I, O>) => {
     return from(loader())

From 4571197326c65990b93bb7083294465185aa59a2 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 7 Feb 2019 11:32:46 -0800
Subject: [PATCH 0719/1703] feat(@angular-devkit/core): add a fallback registry

Its get method goes through an array of registries and return the first
one found.
---
 .../experimental/jobs/fallback-registry.ts    | 43 +++++++++++++++++++
 .../core/src/experimental/jobs/index.ts       |  1 +
 2 files changed, 44 insertions(+)
 create mode 100644 packages/angular_devkit/core/src/experimental/jobs/fallback-registry.ts

diff --git a/packages/angular_devkit/core/src/experimental/jobs/fallback-registry.ts b/packages/angular_devkit/core/src/experimental/jobs/fallback-registry.ts
new file mode 100644
index 000000000000..efa12b769abf
--- /dev/null
+++ b/packages/angular_devkit/core/src/experimental/jobs/fallback-registry.ts
@@ -0,0 +1,43 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Observable, from, of } from 'rxjs';
+import { concatMap, first } from 'rxjs/operators';
+import { JsonValue, schema } from '../../json';
+import { JobDescription, JobHandler, JobName, Registry, isJobHandler } from './api';
+import { JobNameAlreadyRegisteredException } from './exception';
+
+
+/**
+ * A simple job registry that keep a map of JobName => JobHandler internally.
+ */
+export class FallbackRegistry<
+  MinimumArgumentValueT extends JsonValue = JsonValue,
+  MinimumInputValueT extends JsonValue = JsonValue,
+  MinimumOutputValueT extends JsonValue = JsonValue,
+> implements Registry<MinimumArgumentValueT, MinimumInputValueT, MinimumOutputValueT> {
+  constructor(protected _fallbacks: Registry<
+    MinimumArgumentValueT,
+    MinimumInputValueT,
+    MinimumOutputValueT
+  >[] = []) {}
+
+  addFallback(registry: Registry) {
+    this._fallbacks.push(registry);
+  }
+
+  get<
+    A extends MinimumArgumentValueT = MinimumArgumentValueT,
+    I extends MinimumInputValueT = MinimumInputValueT,
+    O extends MinimumOutputValueT = MinimumOutputValueT,
+  >(name: JobName): Observable<JobHandler<A, I, O> | null> {
+    return from(this._fallbacks).pipe(
+      concatMap(fb => fb.get<A, I, O>(name)),
+      first(x => x !== null, null),
+    );
+  }
+}
diff --git a/packages/angular_devkit/core/src/experimental/jobs/index.ts b/packages/angular_devkit/core/src/experimental/jobs/index.ts
index f4cb091fc57a..70210cb22e9f 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/index.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/index.ts
@@ -9,6 +9,7 @@ export * from './api';
 export * from './create-job-handler';
 export * from './exception';
 export * from './dispatcher';
+export * from './fallback-registry';
 export * from './simple-registry';
 export * from './simple-scheduler';
 export * from './strategy';

From 988835d024ab64a0642f3a4f46bc3e1be4f60d87 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 7 Feb 2019 11:34:10 -0800
Subject: [PATCH 0720/1703] feat(@angular-devkit/core): add a reuse JobStrategy

It allows a job to be reused if it's still running. This includes redirecting
the inputs to the new job.
---
 .../core/src/experimental/jobs/strategy.ts    | 70 ++++++++++++++++++-
 .../src/experimental/jobs/strategy_spec.ts    | 67 ++++++++++++++++++
 2 files changed, 134 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/core/src/experimental/jobs/strategy.ts b/packages/angular_devkit/core/src/experimental/jobs/strategy.ts
index 146ba6b6decb..d706afdbb110 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/strategy.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/strategy.ts
@@ -5,10 +5,16 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Observable, concat, of } from 'rxjs';
-import { ignoreElements, share, shareReplay } from 'rxjs/operators';
+import { Observable, Subject, concat, of } from 'rxjs';
+import { finalize, ignoreElements, share, shareReplay, tap } from 'rxjs/operators';
 import { JsonValue } from '../../json';
-import { JobDescription, JobHandler, JobHandlerContext, JobOutboundMessage } from './api';
+import {
+  JobDescription,
+  JobHandler,
+  JobHandlerContext, JobInboundMessage,
+  JobOutboundMessage,
+  JobOutboundMessageKind,
+} from './api';
 
 const stableStringify = require('fast-json-stable-stringify');
 
@@ -49,6 +55,64 @@ export namespace strategy {
   }
 
 
+  /**
+   * Creates a JobStrategy that will always reuse a running job, and restart it if the job ended.
+   * @param replayMessages Replay ALL messages if a job is reused, otherwise just hook up where it
+   *        is.
+   */
+  export function reuse<
+    A extends JsonValue = JsonValue,
+    I extends JsonValue = JsonValue,
+    O extends JsonValue = JsonValue,
+  >(replayMessages = false): JobStrategy<A, I, O> {
+    let inboundBus = new Subject<JobInboundMessage<I>>();
+    let runContext: JobHandlerContext | null = null;
+    let run: Observable<JobOutboundMessage<O>> | null = null;
+    let state: JobOutboundMessage<O> | null = null;
+
+    return (handler, options) => {
+      const newHandler = (argument: A, context: JobHandlerContext<A, I, O>) => {
+        // Forward inputs.
+        const subscription = context.inboundBus.subscribe(inboundBus);
+
+        if (run) {
+          return concat(
+            // Update state.
+            of(state),
+            run,
+          ).pipe(
+            finalize(() => subscription.unsubscribe()),
+          );
+        }
+
+        run = handler(argument, { ...context, inboundBus: inboundBus.asObservable() }).pipe(
+          tap(
+            message => {
+              if (message.kind == JobOutboundMessageKind.Start
+                  || message.kind == JobOutboundMessageKind.OnReady
+                  || message.kind == JobOutboundMessageKind.End) {
+                state = message;
+              }
+            },
+            undefined,
+            () => {
+              subscription.unsubscribe();
+              inboundBus = new Subject<JobInboundMessage<I>>();
+              run = null;
+            },
+          ),
+          replayMessages ? shareReplay() : share(),
+        );
+        runContext = context;
+
+        return run;
+      };
+
+      return Object.assign(newHandler, handler, options || {});
+    };
+  }
+
+
   /**
    * Creates a JobStrategy that will reuse a running job if the argument matches.
    * @param replayMessages Replay ALL messages if a job is reused, otherwise just hook up where it
diff --git a/packages/angular_devkit/core/src/experimental/jobs/strategy_spec.ts b/packages/angular_devkit/core/src/experimental/jobs/strategy_spec.ts
index 3fbef7e689bb..b0b575bec755 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/strategy_spec.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/strategy_spec.ts
@@ -131,6 +131,73 @@ describe('strategy.serialize()', () => {
   });
 });
 
+describe('strategy.reuse()', () => {
+  let registry: SimpleJobRegistry;
+  let scheduler: SimpleScheduler;
+
+  beforeEach(() => {
+    registry = new SimpleJobRegistry();
+    scheduler = new SimpleScheduler(registry);
+  });
+
+  it('works', async () => {
+    let started = 0;
+    let finished = 0;
+
+    registry.register(strategy.reuse()(createJobHandler((input: number[]) => {
+      started++;
+
+      return new Promise<number>(
+        resolve => setTimeout(() => {
+          finished++;
+          resolve(input.reduce((a, c) => a + c, 0));
+        }, 10),
+      );
+    })), {
+      argument: { items: { type: 'number' } },
+      output: { type: 'number' },
+      name: 'add',
+    });
+
+    const job1 = await scheduler.schedule('add', [1, 2, 3, 4]);
+    const job2 = await scheduler.schedule('add', []);
+    expect(started).toBe(0);
+    expect(finished).toBe(0);
+
+    job1.output.subscribe();
+    expect(started).toBe(1);
+    expect(finished).toBe(0);
+
+    job2.output.subscribe();
+    expect(started).toBe(1);  // job2 is reusing job1.
+    expect(finished).toBe(0);
+
+    let result = await job1.output.toPromise();
+    expect(result).toBe(10);
+    expect(started).toBe(1);
+    expect(finished).toBe(1);
+    expect(job1.state).toBe(JobState.Ended);
+    expect(job2.state).toBe(JobState.Ended);
+
+    const job3 = await scheduler.schedule('add', [1, 2, 3, 4, 5]);
+    const job4 = await scheduler.schedule('add', []);
+    job3.output.subscribe();
+    expect(started).toBe(2);
+    expect(finished).toBe(1);
+
+    job4.output.subscribe();
+    expect(started).toBe(2);  // job4 is reusing job3.
+    expect(finished).toBe(1);
+
+    result = await job3.output.toPromise();
+    expect(result).toBe(15);
+    expect(started).toBe(2);
+    expect(finished).toBe(2);
+    expect(job3.state).toBe(JobState.Ended);
+    expect(job4.state).toBe(JobState.Ended);
+  });
+});
+
 describe('strategy.memoize()', () => {
   let registry: SimpleJobRegistry;
   let scheduler: SimpleScheduler;

From 445946515d926c390e51ed0a0a084f8352b8f193 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 7 Feb 2019 11:35:27 -0800
Subject: [PATCH 0721/1703] refactor(@angular-devkit/core): set JobStrategy
 type arguments default

---
 .../angular_devkit/core/src/experimental/jobs/strategy.ts   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/core/src/experimental/jobs/strategy.ts b/packages/angular_devkit/core/src/experimental/jobs/strategy.ts
index d706afdbb110..705c500581bc 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/strategy.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/strategy.ts
@@ -20,7 +20,11 @@ const stableStringify = require('fast-json-stable-stringify');
 
 export namespace strategy {
 
-  export type JobStrategy<A extends JsonValue, I extends JsonValue, O extends JsonValue> = (
+  export type JobStrategy<
+    A extends JsonValue = JsonValue,
+    I extends JsonValue = JsonValue,
+    O extends JsonValue = JsonValue,
+  > = (
     handler: JobHandler<A, I, O>,
     options?: Partial<Readonly<JobDescription>>,
   ) => JobHandler<A, I, O>;

From c4798b69d682aaad12e8d0a87f89b98d2c14c0f2 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 7 Feb 2019 11:37:53 -0800
Subject: [PATCH 0722/1703] refactor(@angular-devkit/core): move core/node
 experimental files to own directory

It's just cleaner that way.
---
 packages/angular_devkit/core/node/_golden-api.ts          | 2 +-
 packages/angular_devkit/core/node/experimental/index.ts   | 2 +-
 .../angular_devkit/core/node/experimental/jobs/index.ts   | 8 ++++++++
 .../core/node/experimental/{ => jobs}/job-registry.ts     | 4 ++--
 .../node/experimental/{ => jobs}/job-registry_spec.ts     | 4 ++--
 packages/angular_devkit/core/node/index.ts                | 2 +-
 6 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 packages/angular_devkit/core/node/experimental/jobs/index.ts
 rename packages/angular_devkit/core/node/experimental/{ => jobs}/job-registry.ts (96%)
 rename packages/angular_devkit/core/node/experimental/{ => jobs}/job-registry_spec.ts (84%)

diff --git a/packages/angular_devkit/core/node/_golden-api.ts b/packages/angular_devkit/core/node/_golden-api.ts
index ca9054ed2649..47ee07c9b864 100644
--- a/packages/angular_devkit/core/node/_golden-api.ts
+++ b/packages/angular_devkit/core/node/_golden-api.ts
@@ -8,7 +8,7 @@
 
 // Start experimental namespace
 // Start jobs namespace
-export * from './experimental/job-registry';
+export * from './experimental/jobs/job-registry';
 // End jobs namespace
 // End experimental namespace
 
diff --git a/packages/angular_devkit/core/node/experimental/index.ts b/packages/angular_devkit/core/node/experimental/index.ts
index c32982a08d12..012ac72a4ae5 100644
--- a/packages/angular_devkit/core/node/experimental/index.ts
+++ b/packages/angular_devkit/core/node/experimental/index.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import * as jobs from './job-registry';
+import * as jobs from './jobs';
 
 export {
   jobs,
diff --git a/packages/angular_devkit/core/node/experimental/jobs/index.ts b/packages/angular_devkit/core/node/experimental/jobs/index.ts
new file mode 100644
index 000000000000..d931a0289414
--- /dev/null
+++ b/packages/angular_devkit/core/node/experimental/jobs/index.ts
@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+export * from './job-registry';
diff --git a/packages/angular_devkit/core/node/experimental/job-registry.ts b/packages/angular_devkit/core/node/experimental/jobs/job-registry.ts
similarity index 96%
rename from packages/angular_devkit/core/node/experimental/job-registry.ts
rename to packages/angular_devkit/core/node/experimental/jobs/job-registry.ts
index 266773dc527b..8bc636fa7ebe 100644
--- a/packages/angular_devkit/core/node/experimental/job-registry.ts
+++ b/packages/angular_devkit/core/node/experimental/jobs/job-registry.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { Observable, of } from 'rxjs';
-import { JsonValue, experimental as core_experimental, schema } from '../../src';
-import { ModuleNotFoundException, resolve } from '../resolve';
+import { JsonValue, experimental as core_experimental, schema } from '../../../src';
+import { ModuleNotFoundException, resolve } from '../../resolve';
 
 export class NodeModuleJobRegistry<MinimumArgumentValueT extends JsonValue = JsonValue,
   MinimumInputValueT extends JsonValue = JsonValue,
diff --git a/packages/angular_devkit/core/node/experimental/job-registry_spec.ts b/packages/angular_devkit/core/node/experimental/jobs/job-registry_spec.ts
similarity index 84%
rename from packages/angular_devkit/core/node/experimental/job-registry_spec.ts
rename to packages/angular_devkit/core/node/experimental/jobs/job-registry_spec.ts
index b951f830c685..2a46aa873995 100644
--- a/packages/angular_devkit/core/node/experimental/job-registry_spec.ts
+++ b/packages/angular_devkit/core/node/experimental/jobs/job-registry_spec.ts
@@ -6,12 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import * as path from 'path';
-import { experimental as core_experimental } from '../../src';
+import { experimental as core_experimental } from '../../../src';
 import { NodeModuleJobRegistry } from './job-registry';
 
 const root = path.join(
   path.dirname(require.resolve(__filename)),
-  '../../../../../tests/angular_devkit/core/node/jobs',
+  '../../../../../../tests/angular_devkit/core/node/jobs',
 );
 
 
diff --git a/packages/angular_devkit/core/node/index.ts b/packages/angular_devkit/core/node/index.ts
index 8b5f1d676693..fa96ae914e54 100644
--- a/packages/angular_devkit/core/node/index.ts
+++ b/packages/angular_devkit/core/node/index.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import * as experimental from './experimental/job-registry';
+import * as experimental from './experimental/jobs/job-registry';
 import * as fs from './fs';
 export * from './cli-logger';
 export * from './host';

From e2bebe98714035fca067be6947a950ae26575ddb Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 7 Feb 2019 11:38:57 -0800
Subject: [PATCH 0723/1703] test: add a test for deferred jobs

Just one more bit of coverage.
---
 .../jobs/simple-scheduler_spec.ts             | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler_spec.ts b/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler_spec.ts
index 02a4755722ad..e5e3c9855390 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler_spec.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler_spec.ts
@@ -590,5 +590,36 @@ describe('SimpleScheduler', () => {
       expect(await job.output.toPromise()).toBe(103);
       expect(outputs).toEqual([101, 103]);
     });
+
+    it('works deferred', async () => {
+      // This is a more complex test. The job returns an output deferred from the input
+      registry.register(
+        'job',
+        createJobHandler<number, number, number>((argument, context) => {
+          return new Observable<number>(subscriber => {
+            context.input.subscribe(x => {
+              if (x === null) {
+                setTimeout(() => subscriber.complete(), 10);
+              } else {
+                setTimeout(() => subscriber.next(parseInt('' + x) + argument), x);
+              }
+            });
+          });
+        }),
+      );
+
+      const job = scheduler.schedule('job', 100);
+      const outputs: number[] = [];
+
+      job.output.subscribe(x => outputs.push(x as number));
+
+      job.input.next(1);
+      job.input.next(2);
+      job.input.next(3);
+      job.input.next(null);
+
+      expect(await job.output.toPromise()).toBe(103);
+      expect(outputs).toEqual(jasmine.arrayWithExactContents([101, 102, 103]));
+    });
   });
 });

From 6f816cac70ae97359ae81799e6913c5f368fe21c Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Fri, 8 Feb 2019 12:21:21 +0100
Subject: [PATCH 0724/1703] fix(@schematics/angular): update latest version of
 devkit

---
 packages/schematics/angular/utility/latest-versions.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index bcc335b079f3..38930c69a2f5 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -14,6 +14,6 @@ export const latestVersions = {
   TypeScript: '~3.2.2',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.13.0-beta.0',
-  DevkitBuildNgPackagr: '~0.13.0-beta.0',
+  DevkitBuildAngular: '~0.14.0-beta.0',
+  DevkitBuildNgPackagr: '~0.14.0-beta.0',
 };

From 87fd5d1f3e14385dba12e59f9a6ef2b86785ff48 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 8 Feb 2019 06:39:10 +0000
Subject: [PATCH 0725/1703] build: update karma-source-map-support to version
 1.4.0

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index fbf58859e37c..a515ec462027 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -19,7 +19,7 @@
     "file-loader": "3.0.1",
     "glob": "7.1.3",
     "istanbul-instrumenter-loader": "3.0.1",
-    "karma-source-map-support": "1.3.0",
+    "karma-source-map-support": "1.4.0",
     "less": "3.9.0",
     "less-loader": "4.1.0",
     "license-webpack-plugin": "2.1.0",
diff --git a/yarn.lock b/yarn.lock
index 16f1aaee0485..e52c4ac0ef34 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5622,10 +5622,10 @@ karma-sauce-launcher@1.2.0:
     saucelabs "^1.4.0"
     wd "^1.4.0"
 
-karma-source-map-support@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz#36dd4d8ca154b62ace95696236fae37caf0a7dde"
-  integrity sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==
+karma-source-map-support@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz#58526ceccf7e8730e56effd97a4de8d712ac0d6b"
+  integrity sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==
   dependencies:
     source-map-support "^0.5.5"
 

From a6f51f566e46e118f22314ad1fcd0c7b4bd868b3 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 7 Feb 2019 19:38:22 -0500
Subject: [PATCH 0726/1703] feat(@angular/cli): support pnpm as a package
 manager option

---
 packages/angular/cli/lib/config/schema.json | 2 +-
 packages/angular/cli/tasks/npm-install.ts   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index 50b56f08650e..b2dbc1bb98a9 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -49,7 +49,7 @@
         "packageManager": {
           "description": "Specify which package manager tool to use.",
           "type": "string",
-          "enum": [ "npm", "cnpm", "yarn" ]
+          "enum": [ "npm", "cnpm", "yarn", "pnpm" ]
         },
         "warnings": {
           "description": "Control CLI specific console warnings",
diff --git a/packages/angular/cli/tasks/npm-install.ts b/packages/angular/cli/tasks/npm-install.ts
index 70cbbd8a06ad..8f3c2500b020 100644
--- a/packages/angular/cli/tasks/npm-install.ts
+++ b/packages/angular/cli/tasks/npm-install.ts
@@ -24,8 +24,9 @@ export default async function (packageName: string,
   const installArgs: string[] = [];
   switch (packageManager) {
     case 'cnpm':
+    case 'pnpm':
     case 'npm':
-      installArgs.push('install', '--quiet');
+      installArgs.push('install', '--silent');
       break;
 
     case 'yarn':

From 43a968942c58c6580c90ced79e605e48d81fc266 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 7 Feb 2019 19:38:42 -0500
Subject: [PATCH 0727/1703] feat(@angular-devkit/schematics): support pnpm as a
 package manager option

---
 .../schematics/tasks/node-package/executor.ts              | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/angular_devkit/schematics/tasks/node-package/executor.ts b/packages/angular_devkit/schematics/tasks/node-package/executor.ts
index 3eedd3a14f5c..0a704cd43859 100644
--- a/packages/angular_devkit/schematics/tasks/node-package/executor.ts
+++ b/packages/angular_devkit/schematics/tasks/node-package/executor.ts
@@ -40,6 +40,13 @@ const packageManagers: { [name: string]: PackageManagerProfile } = {
       installPackage: 'add',
     },
   },
+  'pnpm': {
+    quietArgument: '--silent',
+    commands: {
+      installAll: 'install',
+      installPackage: 'install',
+    },
+  },
 };
 
 export class UnknownPackageManagerException extends BaseException {

From a7c811a2d92fdf7ba7290fd46d54b0166293545a Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Fri, 8 Feb 2019 07:34:33 +0100
Subject: [PATCH 0728/1703] feat(@schematics/angular): scaffold new projects
 with angular packages version 8

---
 packages/schematics/angular/utility/latest-versions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 38930c69a2f5..2a04497d1408 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -8,7 +8,7 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~7.2.0-rc.0',
+  Angular: '~8.0.0-beta.0',
   RxJs: '~6.3.3',
   ZoneJs: '~0.8.26',
   TypeScript: '~3.2.2',

From e0e129c22ac0fb1e766356b2befd7695935355b2 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Fri, 8 Feb 2019 07:34:52 +0100
Subject: [PATCH 0729/1703] build: update angular packages to version 8

---
 package.json                                  |   4 +-
 .../angular_devkit/build_angular/package.json |  24 ++--
 .../build_ng_packagr/package.json             |   4 +-
 yarn.lock                                     | 104 +++++++++++-------
 4 files changed, 80 insertions(+), 56 deletions(-)

diff --git a/package.json b/package.json
index 5098c2a4fef8..1896c535043d 100644
--- a/package.json
+++ b/package.json
@@ -72,8 +72,8 @@
     "typescript": "3.2.4"
   },
   "devDependencies": {
-    "@angular/compiler": "^7.2.0-rc.0",
-    "@angular/compiler-cli": "^7.2.0-rc.0",
+    "@angular/compiler": "^8.0.0-beta.0",
+    "@angular/compiler-cli": "^8.0.0-beta.0",
     "@bazel/karma": "^0.22.1",
     "@bazel/typescript": "0.22.1",
     "@ngtools/json-schema": "^1.1.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index a515ec462027..02b6104f1ad6 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -55,19 +55,19 @@
     "node-sass": "4.11.0"
   },
   "devDependencies": {
-    "@angular/animations": "^7.2.0-rc.0",
-    "@angular/cdk": "^7.2.0-rc.0",
-    "@angular/common": "^7.2.0-rc.0",
-    "@angular/compiler": "^7.2.0-rc.0",
-    "@angular/compiler-cli": "^7.2.0-rc.0",
-    "@angular/core": "^7.2.0-rc.0",
-    "@angular/http": "^7.2.0-rc.0",
+    "@angular/animations": "^8.0.0-beta.0",
+    "@angular/cdk": "^7.1.0",
+    "@angular/common": "^8.0.0-beta.0",
+    "@angular/compiler": "^8.0.0-beta.0",
+    "@angular/compiler-cli": "^8.0.0-beta.0",
+    "@angular/core": "^8.0.0-beta.0",
+    "@angular/http": "^8.0.0-beta.0",
     "@angular/material": "^7.1.0",
-    "@angular/platform-browser": "^7.2.0-rc.0",
-    "@angular/platform-browser-dynamic": "^7.2.0-rc.0",
-    "@angular/platform-server": "^7.2.0-rc.0",
-    "@angular/router": "^7.2.0-rc.0",
-    "@angular/service-worker": "^7.2.0-rc.0",
+    "@angular/platform-browser": "^8.0.0-beta.0",
+    "@angular/platform-browser-dynamic": "^8.0.0-beta.0",
+    "@angular/platform-server": "^8.0.0-beta.0",
+    "@angular/router": "^8.0.0-beta.0",
+    "@angular/service-worker": "^8.0.0-beta.0",
     "codelyzer": "^4.2.1",
     "core-js": "^2.4.1",
     "bootstrap": "^4.0.0",
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index 2d7e8d0d018c..d90646b61c9e 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -15,8 +15,8 @@
     "ng-packagr": "^2.2.0 || ^3.0.0 || ^4.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "^7.2.0-rc.0",
-    "@angular/compiler-cli": "^7.2.0-rc.0",
+    "@angular/compiler": "^8.0.0-beta.0",
+    "@angular/compiler-cli": "^8.0.0-beta.0",
     "ng-packagr": "^4.2.0",
     "tsickle": ">=0.34.0",
     "tslib": "^1.9.0"
diff --git a/yarn.lock b/yarn.lock
index e52c4ac0ef34..f61215281e56 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,26 +2,26 @@
 # yarn lockfile v1
 
 
-"@angular/animations@^7.2.0-rc.0":
-  version "7.2.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.0-rc.0.tgz#12849f8ab104d309ec99c0ceb170a895c15d3d44"
-  integrity sha512-CRQNQ6QVTuf4nCHVLVpKQx7YPpNPfnTF79KVWzHefkkyS3URRuEgvE4jCED4oTJ4BEsmkjXyt51VeDV0FgqQFg==
+"@angular/animations@^8.0.0-beta.0":
+  version "8.0.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0-beta.3.tgz#51d41b7b800f569a82f77e6f54f0a74c85b7e8d7"
+  integrity sha512-DpeTE/HVZxsem8IkMjxNPIi71+juKlCwmZX+IsD+txR3o9xj8XdDXEliBdC1bulA8/6rFqfmwbvru0wonX+UCA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cdk@^7.2.0-rc.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.2.0.tgz#03bfbbcd5882fbdab71e6d5b5f36b612589724b4"
-  integrity sha512-ANGNIvyEdkMW6APl+6XDQC5VBS+mS/M+3UB/ROnj+7Om3xe2DSbEjqDXB/SpeJYUp6Qg/wQoWmyvd4y8HfjMwA==
+"@angular/cdk@^7.1.0":
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.3.1.tgz#08850f42dd7d40c5f5af235126f8a70ad34a9892"
+  integrity sha512-m6hy+HPLDgVM+Y2C3UWvIG06euIV8oG5QxrCitZui8JZ/dj/0V5bxATKgWN62haYnYR4en4z1bfH0kOvQj+LEA==
   dependencies:
     tslib "^1.7.1"
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/common@^7.2.0-rc.0":
-  version "7.2.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.0-rc.0.tgz#60d3540c6cdcf3440f67e2c15cf8f1c7b1160d9d"
-  integrity sha512-Xv60KEP1kpF74kpN1xtps0W++PUXLUMK/0tDblUZH7tBWvS0XwEwtuK5B6wcs+I5nqZkPgvlvOyiVZvOLraWOg==
+"@angular/common@^8.0.0-beta.0":
+  version "8.0.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0-beta.3.tgz#2fd3e37eff063e74aaa5f64845f5d79a1599ecdd"
+  integrity sha512-x9C8y7teynT/5u1MreBcUpoScW4QFGS+NM2ayYBslvWPK8ate0ayrDerGjm297oiQd49+4GFKODiirF/s3/hDA==
   dependencies:
     tslib "^1.9.0"
 
@@ -42,6 +42,23 @@
     tslib "^1.9.0"
     yargs "9.0.1"
 
+"@angular/compiler-cli@^8.0.0-beta.0":
+  version "8.0.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0-beta.3.tgz#b3de03b9fafa9b4445884805b519ebd1378dfa95"
+  integrity sha512-BrM6btVA2ZUMr2/xOXnCcWoVMXUK/CB21MvifHr7mIy5KZeXJ6dQc0pLPxz9fkRTNshgl5EkRKDZ47ie6KFTmg==
+  dependencies:
+    canonical-path "1.0.0"
+    chokidar "^1.4.2"
+    convert-source-map "^1.5.1"
+    dependency-graph "^0.7.2"
+    magic-string "^0.25.0"
+    minimist "^1.2.0"
+    reflect-metadata "^0.1.2"
+    shelljs "^0.8.1"
+    source-map "^0.6.1"
+    tslib "^1.9.0"
+    yargs "9.0.1"
+
 "@angular/compiler@^7.2.0-rc.0":
   version "7.2.0-rc.0"
   resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.0-rc.0.tgz#603dbec25d6c2beea08a293c68c39b40e2ea81e2"
@@ -49,17 +66,24 @@
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^7.2.0-rc.0":
-  version "7.2.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.0-rc.0.tgz#57c0e26130288c3b58466f079828c028bdf6221f"
-  integrity sha512-2u11TNlLorw3JhuczCPwl8UmxE+ja2Q/ghBl8iYi4SIBWiBO1K0wVT13Ts7eojk63yZcg60lyYYCegXBmHLTuw==
+"@angular/compiler@^8.0.0-beta.0":
+  version "8.0.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0-beta.3.tgz#e18f25c5914056c8ce76ecc584ef5cc3e06a476b"
+  integrity sha512-iP22eBULIR+S7+kNqeDlwMnFNsvREL2RTPUC/9YgnAdYbyhw4dlAUdR+pK9kpuPVuBoH9i39Ysrwo8R/WHaMRg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^7.2.0-rc.0":
-  version "7.2.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.0-rc.0.tgz#5814a751eb3df7d8af9bcfb20e4a2602c604d7e0"
-  integrity sha512-iNLSeX/RzrnjI+C2EMvvrZtFzhByMf7RJ7Db/hGHq8p6OvcpWvNrpP8UR4SeQs2ZyvF7zuC7P6bbRywV9Sd39g==
+"@angular/core@^8.0.0-beta.0":
+  version "8.0.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0-beta.3.tgz#4fe4175898bf33cca5bfe5aaf80ccc4ef4ab3895"
+  integrity sha512-2EDRSK31tt/Uoj/Akcy19n4Q/3Yx/doYhBV66tZg/0ceVLo50Wfcxlyz13Zq+D3FP8hQ4vnGTV03UOX5nR7VAw==
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/http@^8.0.0-beta.0":
+  version "8.0.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-8.0.0-beta.3.tgz#78df1f853b73ca073c375f7eae8a0b1ba28093b2"
+  integrity sha512-m4UqiZj9uF8f+DaiZOvjUGNYkkffUp9gIfbxyd+lG0TWVq8cW5T6I3nO7d/codTx1rQlHncAiA8XzAiWX8kfJw==
   dependencies:
     tslib "^1.9.0"
 
@@ -70,40 +94,40 @@
   dependencies:
     tslib "^1.7.1"
 
-"@angular/platform-browser-dynamic@^7.2.0-rc.0":
-  version "7.2.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.0-rc.0.tgz#5ea47d094c53a0ba34ecbb0dfdcef452fa05dc9a"
-  integrity sha512-uqT27oh9m58L6MUjgvT+7NpAFbigOnnTUWMsCLijNUKd7i37T6UxTVKPvuqNHlaLXsmDRxVHN3INI0IrWZ3R+w==
+"@angular/platform-browser-dynamic@^8.0.0-beta.0":
+  version "8.0.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0-beta.3.tgz#d9c4f92f6997dc301c343d0d73d8bf8b928a40be"
+  integrity sha512-4wehYAOV+RB9xvGNI09f0xXIDDMlFlNgraD0TZQkFlxRkaTkSn3uJZj56lx5LYNn2J64VzdW5uYib5IrqSuf/g==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^7.2.0-rc.0":
-  version "7.2.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.0-rc.0.tgz#c6d1f0b2328b1d81649bea70c23edc33de729015"
-  integrity sha512-r0ak7SVLWrivd4S0MXWmqNLeF6NNOBAopnjrhUu2j5I00u7/QfLrX0E5zRlJ8JkARVjer6Wm+D1ztlOWw5jHag==
+"@angular/platform-browser@^8.0.0-beta.0":
+  version "8.0.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0-beta.3.tgz#70004fecc9d25ccaac6e18e909d91efae7f34d11"
+  integrity sha512-4DKieNasMPZn+/phqEnStdRlH+VHEoSs5AYNsxRsluLbXRorywJYuurBBnDyJmQa6flNbTOVfAWHt4IOUYLF9g==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-server@^7.2.0-rc.0":
-  version "7.2.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.2.0-rc.0.tgz#3c4e78c13b918a82e59f17d28eb508b173219ee9"
-  integrity sha512-C7zzHQRFbAQFL9NI1/Lg6wGnKrCg2luPlzegk0j+uw9hb/1fakadlASirNyNpckfzsB/54ZJQ6vU8JfZEQetQg==
+"@angular/platform-server@^8.0.0-beta.0":
+  version "8.0.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.0.0-beta.3.tgz#80e05be91501d661523ae55d7ce2f1cbd294974a"
+  integrity sha512-wxb994hEzSiqm3Sx7tetBqTdGjYwTc3L/e1mgtxECSC9eAEGtAxxP5BraUb137arKk0O+bAZ3JEE2t4lcS6voQ==
   dependencies:
     domino "^2.1.0"
     tslib "^1.9.0"
     xhr2 "^0.1.4"
 
-"@angular/router@^7.2.0-rc.0":
-  version "7.2.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.0-rc.0.tgz#b368583c68d9b3768261ef9f62e34695539b4bf4"
-  integrity sha512-OKJBzF8JhQQDLxBH6Yv8R1KRhrXu0L+VlIJGQhuw4p1z51WEHewnH7i9DAtRCMhaiXzy3QvoYTz1czrTIVyR0Q==
+"@angular/router@^8.0.0-beta.0":
+  version "8.0.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0-beta.3.tgz#2353491eb1578657c107bcc4d8bf1d2a7c5f7ea8"
+  integrity sha512-MJTIiMYfWdXH3KzASyBkn+wS2UB62rGcg+3QtUTPyeAaJy4DbQYS37pOB9gmqtvwxeL3qtSFJ+TSiYyEyjrefw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@^7.2.0-rc.0":
-  version "7.2.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-7.2.0-rc.0.tgz#bd3a223e37d7a79546ffef333ada66a6a11f10b2"
-  integrity sha512-61t9ecjPLzg/xvSPp6jL5vj3WmqXtOU04Re82xltcUZ51szYAmKeZ3q9K4ZEQCfDT+J0qTCsXDCOhHRL2TDfFg==
+"@angular/service-worker@^8.0.0-beta.0":
+  version "8.0.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.0.0-beta.3.tgz#db7761a7e381fe0194d8b808bba94f49cd83fa4e"
+  integrity sha512-OUDnLGpfEJVbr67vHK/XSbs7MTnQF1TPP5191tlqwI54KbtUMGd3jFz22DmiT2hSBCKrRO4vH7jbpRtMi4pY7A==
   dependencies:
     tslib "^1.9.0"
 

From 28489647076beaa0dff5e357d72dd13a66306b83 Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Tue, 22 Jan 2019 08:52:31 +0100
Subject: [PATCH 0730/1703] fix(@schematics/angular): e2e test fails strict TS
 config

If using `strictFunctionTypes: true` in `tsconfig.json`, the default e2e test is failing compilation with:

```
error TS2345: Argument of type 'ObjectContaining<{ level: Level; }>' is not assignable to parameter of type 'Expected<Entry>'.
  Type 'ObjectContaining<{ level: Level; }>' is not assignable to type 'ObjectContaining<Entry>'.
    Type 'Partial<{ level: Level; }>' is not assignable to type 'Partial<Entry>'.
     Type '{ level: Level; }' is not assignable to type 'Entry'.
```

Explictely using `as logging.Entry` fixes the issue.
---
 .../schematics/angular/e2e/files/src/app.e2e-spec.ts.template   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/e2e/files/src/app.e2e-spec.ts.template b/packages/schematics/angular/e2e/files/src/app.e2e-spec.ts.template
index fb169a4ded40..1ff95e3adebe 100644
--- a/packages/schematics/angular/e2e/files/src/app.e2e-spec.ts.template
+++ b/packages/schematics/angular/e2e/files/src/app.e2e-spec.ts.template
@@ -18,6 +18,6 @@ describe('workspace-project App', () => {
     const logs = await browser.manage().logs().get(logging.Type.BROWSER);
     expect(logs).not.toContain(jasmine.objectContaining({
       level: logging.Level.SEVERE,
-    }));
+    } as logging.Entry));
   });
 });

From 7bc2e396d339bfa596f5e3b38f3067249344bb93 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Thu, 7 Feb 2019 13:58:43 +0100
Subject: [PATCH 0731/1703] refactor: change error message to use option name
 instead of args

---
 packages/angular_devkit/build_angular/src/browser/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index b13b08eb1823..d81bd9748147 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -113,7 +113,7 @@ export class BrowserBuilder implements Builder<BrowserBuilderSchema> {
   ) {
     // Ensure Build Optimizer is only used with AOT.
     if (options.buildOptimizer && !options.aot) {
-      throw new Error('The `--build-optimizer` option cannot be used without `--aot`.');
+      throw new Error(`The 'buildOptimizer' option cannot be used without 'aot'.`);
     }
 
     let wco: WebpackConfigOptions<NormalizedBrowserBuilderSchema>;

From 8252f20615463a911f73742cc949ee23e0136274 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Fri, 8 Feb 2019 07:53:33 +0100
Subject: [PATCH 0732/1703] fix(@angular-devkit/build-angular): error when both
 `baseUrl` and `devServerTarget` are used in protractor

Users cannot use both baseUrl and devServerTarget, and the later superseeds the baseUrl.

Fixes #13611
---
 .../build_angular/src/protractor/index.ts           | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/protractor/index.ts b/packages/angular_devkit/build_angular/src/protractor/index.ts
index a6effc5032f8..8e37fc796ddb 100644
--- a/packages/angular_devkit/build_angular/src/protractor/index.ts
+++ b/packages/angular_devkit/build_angular/src/protractor/index.ts
@@ -44,7 +44,14 @@ export class ProtractorBuilder implements Builder<ProtractorBuilderOptions> {
     const options = builderConfig.options;
     const root = this.context.workspace.root;
     const projectRoot = resolve(root, builderConfig.root);
-    // const projectSystemRoot = getSystemPath(projectRoot);
+
+    // ensure that either one of this option is used
+    if (options.devServerTarget && options.baseUrl) {
+      throw new Error(tags.stripIndents`
+      The 'baseUrl' option cannot be used with 'devServerTarget'.
+      When present, 'devServerTarget' will be used to automatically setup 'baseUrl' for Protractor.
+      `);
+    }
 
     // TODO: verify using of(null) to kickstart things is a pattern.
     return of(null).pipe(
@@ -81,7 +88,7 @@ export class ProtractorBuilder implements Builder<ProtractorBuilderOptions> {
         }
 
         // Compute baseUrl from devServerOptions.
-        if (options.devServerTarget && builderConfig.options.publicHost) {
+        if (builderConfig.options.publicHost) {
           let publicHost = builderConfig.options.publicHost;
           if (!/^\w+:\/\//.test(publicHost)) {
             publicHost = `${builderConfig.options.ssl
@@ -90,7 +97,7 @@ export class ProtractorBuilder implements Builder<ProtractorBuilderOptions> {
           }
           const clientUrl = url.parse(publicHost);
           baseUrl = url.format(clientUrl);
-        } else if (options.devServerTarget) {
+        } else {
           const result: DevServerResult | undefined = buildEvent.result;
 
           baseUrl = url.format({

From 5415bcc6f872b181b6b05b2a5c718a9146ea3113 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Fri, 8 Feb 2019 07:55:28 +0100
Subject: [PATCH 0733/1703] refactor: deprecate protractor baseUrl option from
 builder

Users should use baseUrl property in the Protractor config file
---
 .../angular_devkit/build_angular/src/protractor/schema.json    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/protractor/schema.json b/packages/angular_devkit/build_angular/src/protractor/schema.json
index f01e86bc81e6..6e9998bc6dea 100644
--- a/packages/angular_devkit/build_angular/src/protractor/schema.json
+++ b/packages/angular_devkit/build_angular/src/protractor/schema.json
@@ -45,7 +45,8 @@
     },
     "baseUrl": {
       "type": "string",
-      "description": "Base URL for protractor to connect to."
+      "description": "Base URL for protractor to connect to.",
+      "x-deprecated": "Use \"baseUrl\" in the Protractor config file instead."
     }
   },
   "additionalProperties": false,

From ec94f42108b663ec2a84fd319d90087f9d930272 Mon Sep 17 00:00:00 2001
From: WilliamKoza <william.koza@gmail.com>
Date: Thu, 7 Feb 2019 15:42:57 +0100
Subject: [PATCH 0734/1703] fix(@angular/cli): wrap `opn` in a new Promise
 because `opn` is already resolve is already resolve.

---
 packages/angular/cli/commands/doc-impl.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/angular/cli/commands/doc-impl.ts b/packages/angular/cli/commands/doc-impl.ts
index b20c8584cf0c..b93a82333ceb 100644
--- a/packages/angular/cli/commands/doc-impl.ts
+++ b/packages/angular/cli/commands/doc-impl.ts
@@ -24,8 +24,11 @@ export class DocCommand extends Command<DocCommandSchema> {
       searchUrl = `https://www.google.com/search?q=site%3Aangular.io+${options.keyword}`;
     }
 
-    return opn(searchUrl, {
-      wait: false,
+    // We should wrap `opn` in a new Promise because `opn` is already resolved
+    await new Promise(() => {
+      opn(searchUrl, {
+        wait: false,
+      });
     });
   }
 }

From 1f9c84f98c811e2b0d3cfffece02310ea64a37ca Mon Sep 17 00:00:00 2001
From: Luis Confraria <lconfraria@gmail.com>
Date: Fri, 8 Feb 2019 15:11:47 +0000
Subject: [PATCH 0735/1703] fix(@schematics/angular): set restartOnFileChange
 to true in karma.conf templates

Fix #13542
---
 .../angular/application/files/root/karma.conf.js.template      | 3 ++-
 .../library/files/__projectRoot__/karma.conf.js.template       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/application/files/root/karma.conf.js.template b/packages/schematics/angular/application/files/root/karma.conf.js.template
index a4d11df3425d..88505e166a08 100644
--- a/packages/schematics/angular/application/files/root/karma.conf.js.template
+++ b/packages/schematics/angular/application/files/root/karma.conf.js.template
@@ -26,6 +26,7 @@ module.exports = function (config) {
     logLevel: config.LOG_INFO,
     autoWatch: true,
     browsers: ['Chrome'],
-    singleRun: false
+    singleRun: false,
+    restartOnFileChange: true
   });
 };
diff --git a/packages/schematics/angular/library/files/__projectRoot__/karma.conf.js.template b/packages/schematics/angular/library/files/__projectRoot__/karma.conf.js.template
index 04af0229f689..87b2dd32d60d 100644
--- a/packages/schematics/angular/library/files/__projectRoot__/karma.conf.js.template
+++ b/packages/schematics/angular/library/files/__projectRoot__/karma.conf.js.template
@@ -26,6 +26,7 @@ module.exports = function (config) {
     logLevel: config.LOG_INFO,
     autoWatch: true,
     browsers: ['Chrome'],
-    singleRun: false
+    singleRun: false,
+    restartOnFileChange: true
   });
 };

From 6fc6e84b0a0d84f04be5b21cf7c0a6411829c554 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Fri, 8 Feb 2019 15:43:37 -0800
Subject: [PATCH 0736/1703] fix(@schematics/angular): Include bazel-out in
 .gitignore

We could do this only when we know the user has opted into using Bazel, like in the @angular/bazel schematics.
However, the complexity of amending new lines to the .gitignore isn't worth it, when we can just add one line here.

Fixes #13636
---
 .../angular/workspace/files/__dot__gitignore.template           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/schematics/angular/workspace/files/__dot__gitignore.template b/packages/schematics/angular/workspace/files/__dot__gitignore.template
index 47765ada9d86..f4f46a5feeb9 100644
--- a/packages/schematics/angular/workspace/files/__dot__gitignore.template
+++ b/packages/schematics/angular/workspace/files/__dot__gitignore.template
@@ -4,6 +4,8 @@
 /dist
 /tmp
 /out-tsc
+# Only exists if Bazel was run
+/bazel-out
 
 # dependencies
 /node_modules

From 1efc9d29afea9c0f3f17dc88ebd4abed0a6207e0 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Wed, 6 Feb 2019 08:23:37 +0100
Subject: [PATCH 0737/1703] fix(@angular-devkit/build-angular): throw error
 when multiple bundles have been name the same

Naming more than 1 bundle with the same name might cause undefined behavior.

Fixes #13568
---
 .../utilities/package-chunk-sort.ts           | 39 ++++++++++++-------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts
index d6ccf6e569ac..ee2a2e450e7e 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts
@@ -11,23 +11,36 @@ import { normalizeExtraEntryPoints } from '../models/webpack-configs/utils';
 export function generateEntryPoints(
   appConfig: { styles: ExtraEntryPoint[], scripts: ExtraEntryPoint[] },
 ) {
-  const entryPoints = ['es2015-polyfills', 'polyfills', 'sw-register'];
 
   // Add all styles/scripts, except lazy-loaded ones.
-  [
-    ...normalizeExtraEntryPoints(appConfig.styles, 'styles')
+  const extraEntryPoints = (
+    extraEntryPoints: ExtraEntryPoint[],
+    defaultBundleName: string,
+  ): string[] => {
+    const entryPoints = normalizeExtraEntryPoints(extraEntryPoints, defaultBundleName)
       .filter(entry => !entry.lazy)
-      .map(entry => entry.bundleName),
-    ...normalizeExtraEntryPoints(appConfig.scripts, 'scripts')
-      .filter(entry => !entry.lazy)
-      .map(entry => entry.bundleName),
-  ].forEach(bundleName => {
-    if (entryPoints.indexOf(bundleName) === -1) {
-      entryPoints.push(bundleName);
-    }
-  });
+      .map(entry => entry.bundleName);
+
+    // remove duplicates
+    return [...new Set(entryPoints)];
+  };
+
+  const entryPoints = [
+    'es2015-polyfills',
+    'polyfills',
+    'sw-register',
+    ...extraEntryPoints(appConfig.styles, 'styles'),
+    ...extraEntryPoints(appConfig.scripts, 'scripts'),
+    'main',
+  ];
+
+  const duplicates = [...new Set(
+    entryPoints.filter(x => entryPoints.indexOf(x) !== entryPoints.lastIndexOf(x)),
+  )];
 
-  entryPoints.push('main');
+  if (duplicates.length > 0) {
+    throw new Error(`Multiple bundles have been named the same: '${duplicates.join(`', '`)}'.`);
+  }
 
   return entryPoints;
 }

From a6bf9fa08282474a1c15013b611f4049fb62804a Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 5 Feb 2019 14:55:04 +0000
Subject: [PATCH 0738/1703] ci: refactor common logic for preparing test
 project

---
 .../e2e/setup/500-create-project.ts           | 38 +++-------------
 tests/legacy-cli/e2e/utils/project.ts         | 44 ++++++++++++-------
 2 files changed, 34 insertions(+), 48 deletions(-)

diff --git a/tests/legacy-cli/e2e/setup/500-create-project.ts b/tests/legacy-cli/e2e/setup/500-create-project.ts
index a0a30032dba3..f8ab0a04beb3 100644
--- a/tests/legacy-cli/e2e/setup/500-create-project.ts
+++ b/tests/legacy-cli/e2e/setup/500-create-project.ts
@@ -1,17 +1,8 @@
 import {join} from 'path';
-import {git, ng, silentNpm} from '../utils/process';
-import { expectFileToExist, writeFile } from '../utils/fs';
-import {
-  useSha,
-  useNgVersion,
-  useCIChrome,
-  useCIDefaults,
-  useBuiltPackages,
-  useDevKit,
-  useDevKitSnapshots,
-  updateJsonFile,
-} from '../utils/project';
-import {gitClean, gitCommit} from '../utils/git';
+import {ng} from '../utils/process';
+import {expectFileToExist} from '../utils/fs';
+import {prepareProjectForE2e} from '../utils/project';
+import {gitClean} from '../utils/git';
 import {getGlobalVariable} from '../utils/env';
 
 
@@ -31,23 +22,6 @@ export default async function() {
     process.chdir('./test-project');
   }
 
-  return Promise.resolve()
-    .then(() => useBuiltPackages())
-    .then(() => argv.devkit ? useDevKit(argv.devkit) : useDevKitSnapshots())
-    .then(() => useCIChrome('e2e'))
-    .then(() => useCIChrome('src'))
-    .then(() => argv['ng-version'] ? useNgVersion(argv['ng-version']) : Promise.resolve())
-    .then(() => argv['ng-snapshots'] || argv['ng-tag'] ? useSha() : Promise.resolve())
-    // npm link on Circle CI is very noisy.
-    .then(() => silentNpm('install'))
-    .then(() => ng('version'))
-    // Force sourcemaps to be from the root of the filesystem.
-    .then(() => updateJsonFile('tsconfig.json', json => {
-      json['compilerOptions']['sourceRoot'] = '/';
-    }))
-    .then(() => git('config', 'user.email', 'angular-core+e2e@google.com'))
-    .then(() => git('config', 'user.name', 'Angular CLI E2e'))
-    .then(() => git('config', 'commit.gpgSign', 'false'))
-    .then(() => useCIDefaults())
-    .then(() => gitCommit('tsconfig-e2e-update'));
+  await prepareProjectForE2e('test-project');
+  await ng('version');
 }
diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts
index c86868dc7026..f7979c0959c0 100644
--- a/tests/legacy-cli/e2e/utils/project.ts
+++ b/tests/legacy-cli/e2e/utils/project.ts
@@ -1,7 +1,8 @@
 import * as fs from 'fs-extra';
 import { readFile, writeFile, replaceInFile, prependToFile } from './fs';
-import { execAndWaitForOutputToMatch, npm, silentNpm, ng } from './process';
+import { execAndWaitForOutputToMatch, npm, silentNpm, ng, git } from './process';
 import { getGlobalVariable } from './env';
+import { gitCommit } from './git';
 
 const packages = require('../../../../lib/packages').packages;
 
@@ -32,23 +33,34 @@ export function ngServe(...args: string[]) {
 }
 
 
-export function createProject(name: string, ...args: string[]) {
+export async function createProject(name: string, ...args: string[]) {
+  process.chdir(getGlobalVariable('tmp-root'));
+  await ng('new', name, '--skip-install', ...args);
+  process.chdir(name);
+  await prepareProjectForE2e(name);
+}
+
+export async function prepareProjectForE2e(name) {
   const argv: any = getGlobalVariable('argv');
 
-  return Promise.resolve()
-    .then(() => process.chdir(getGlobalVariable('tmp-root')))
-    .then(() => ng('new', name, '--skip-install', ...args))
-    .then(() => process.chdir(name))
-    .then(() => useBuiltPackages())
-    .then(() => useCIChrome('e2e'))
-    .then(() => useCIChrome('src'))
-    .then(() => useDevKitSnapshots())
-    .then(() => argv['ng2'] ? useNg2() : Promise.resolve())
-    .then(() => argv['ng4'] ? useNg4() : Promise.resolve())
-    .then(() => argv['ng-snapshots'] || argv['ng-tag'] ? useSha() : Promise.resolve())
-    .then(() => console.log(`Project ${name} created... Installing npm.`))
-    .then(() => silentNpm('install'))
-    .then(() => useCIDefaults(name));
+  await git('config', 'user.email', 'angular-core+e2e@google.com');
+  await git('config', 'user.name', 'Angular CLI E2e');
+  await git('config', 'commit.gpgSign', 'false');
+  await useBuiltPackages();
+  await useCIChrome('e2e');
+  await useCIChrome('src');
+  await useDevKitSnapshots();
+  await argv['ng2'] ? useNg2() : Promise.resolve();
+  await argv['ng4'] ? useNg4() : Promise.resolve();
+  await argv['ng-snapshots'] || argv['ng-tag'] ? useSha() : Promise.resolve();
+  await console.log(`Project ${name} created... Installing npm.`);
+  await silentNpm('install');
+  await useCIDefaults(name);
+  // Force sourcemaps to be from the root of the filesystem.
+  await updateJsonFile('tsconfig.json', json => {
+    json['compilerOptions']['sourceRoot'] = '/';
+  });
+  await gitCommit('prepare-project-for-e2e');
 }
 
 

From 5c6b2cf999324e7fb4b158caa52e23fa2ba132c4 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 5 Feb 2019 14:58:28 +0000
Subject: [PATCH 0739/1703] ci: add ivy snapshots CI job

---
 .circleci/config.yml                             | 16 ++++++++++++++++
 tests/legacy-cli/e2e/setup/500-create-project.ts |  7 ++++++-
 tests/legacy-cli/e2e/utils/project.ts            |  9 ++++++++-
 tests/legacy-cli/e2e_runner.ts                   |  2 ++
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e01c902c4cfc..b686450d52af 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -114,6 +114,16 @@ jobs:
       - attach_workspace: *attach_options
       - run: xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} --ng-snapshots
 
+  e2e-cli-ivy-snapshots:
+    <<: *defaults
+    environment:
+      BASH_ENV: ~/.profile
+    resource_class: xlarge
+    parallelism: 4
+    steps:
+      - attach_workspace: *attach_options
+      - run: xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} --ng-snapshots --ivy
+
   build:
     <<: *defaults
     steps:
@@ -200,6 +210,12 @@ workflows:
           filters:
             branches:
               only: master
+      - e2e-cli-ivy-snapshots:
+          requires:
+            - build
+          filters:
+            branches:
+              only: master
       - snapshot_publish:
           requires:
             - test
diff --git a/tests/legacy-cli/e2e/setup/500-create-project.ts b/tests/legacy-cli/e2e/setup/500-create-project.ts
index f8ab0a04beb3..7a2bf8d31cd1 100644
--- a/tests/legacy-cli/e2e/setup/500-create-project.ts
+++ b/tests/legacy-cli/e2e/setup/500-create-project.ts
@@ -8,6 +8,11 @@ import {getGlobalVariable} from '../utils/env';
 
 export default async function() {
   const argv = getGlobalVariable('argv');
+  const extraArgs = [];
+
+  if (argv['ivy']) {
+    extraArgs.push('--experimentalIvy');
+  }
 
   if (argv.noproject) {
     return;
@@ -17,7 +22,7 @@ export default async function() {
     process.chdir(argv.reuse);
     await gitClean();
   } else {
-    await ng('new', 'test-project', '--skip-install');
+    await ng('new', 'test-project', '--skip-install', ...extraArgs);
     await expectFileToExist(join(process.cwd(), 'test-project'));
     process.chdir('./test-project');
   }
diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts
index f7979c0959c0..073b01036264 100644
--- a/tests/legacy-cli/e2e/utils/project.ts
+++ b/tests/legacy-cli/e2e/utils/project.ts
@@ -34,8 +34,15 @@ export function ngServe(...args: string[]) {
 
 
 export async function createProject(name: string, ...args: string[]) {
+  const argv: any = getGlobalVariable('argv');
+  const extraArgs = [];
+
+  if (argv['ivy']) {
+    extraArgs.push('--experimentalIvy');
+  }
+
   process.chdir(getGlobalVariable('tmp-root'));
-  await ng('new', name, '--skip-install', ...args);
+  await ng('new', name, '--skip-install', ...extraArgs, ...args);
   process.chdir(name);
   await prepareProjectForE2e(name);
 }
diff --git a/tests/legacy-cli/e2e_runner.ts b/tests/legacy-cli/e2e_runner.ts
index da4c125f0ffe..4e424476da5d 100644
--- a/tests/legacy-cli/e2e_runner.ts
+++ b/tests/legacy-cli/e2e_runner.ts
@@ -29,6 +29,7 @@ Error.stackTraceLimit = Infinity;
  *   --ng-tag=TAG     Use a specific tag for build snapshots. Similar to ng-snapshots but point to a
  *                    tag of using the latest master.
  *   --ng-snapshots   Install angular snapshot builds in the test project.
+ *   --ivy	          Use the Ivy compiler.
  *   --glob           Run tests matching this glob pattern (relative to tests/e2e/).
  *   --ignore         Ignore tests matching this glob pattern.
  *   --reuse=/path    Use a path instead of create a new project. That project should have been
@@ -51,6 +52,7 @@ const argv = minimist(process.argv.slice(2), {
     'nosilent',
     'noproject',
     'verbose',
+    'ivy',
   ],
   'string': ['devkit', 'glob', 'ignore', 'reuse', 'ng-tag', 'tmpdir', 'ng-version'],
   'number': ['nb-shards', 'shard'],

From f7fada864856af28c98729e9d0aaa77e93c34559 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Fri, 8 Feb 2019 13:42:51 +0000
Subject: [PATCH 0740/1703] test: add ivy-snapshot e2e test exclusions

---
 .../e2e/tests/build/build-errors.ts           |  3 ++-
 tests/legacy-cli/e2e_runner.ts                | 27 ++++++++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/build/build-errors.ts b/tests/legacy-cli/e2e/tests/build/build-errors.ts
index bf66ca0b95bb..538a26690868 100644
--- a/tests/legacy-cli/e2e/tests/build/build-errors.ts
+++ b/tests/legacy-cli/e2e/tests/build/build-errors.ts
@@ -70,7 +70,8 @@ export default function () {
     .then(() => expectToFail(() => ng('build', '--aot')))
     .then(({ message }) => {
       if (!message.includes('Function calls are not supported')
-        && !message.includes('Function expressions are not supported in decorators')) {
+        && !message.includes('Function expressions are not supported in decorators')
+        && !message.includes('selector must be a string')) {
         throw new Error(`Expected static analysis error, got this instead:\n${message}`);
       }
       if (extraErrors.some((e) => message.includes(e))) {
diff --git a/tests/legacy-cli/e2e_runner.ts b/tests/legacy-cli/e2e_runner.ts
index 4e424476da5d..841de902654d 100644
--- a/tests/legacy-cli/e2e_runner.ts
+++ b/tests/legacy-cli/e2e_runner.ts
@@ -110,11 +110,14 @@ const e2eRoot = path.join(__dirname, 'e2e');
 const allSetups = glob.sync(path.join(e2eRoot, 'setup/**/*.ts'), { nodir: true })
   .map(name => path.relative(e2eRoot, name))
   .sort();
-const allTests = glob.sync(path.join(e2eRoot, testGlob), { nodir: true, ignore: argv.ignore })
+let allTests = glob.sync(path.join(e2eRoot, testGlob), { nodir: true, ignore: argv.ignore })
   .map(name => path.relative(e2eRoot, name))
-  // TODO: UPDATE TESTS
   // Replace windows slashes.
   .map(name => name.replace(/\\/g, '/'))
+  .sort();
+
+// TODO: either update or remove these tests.
+allTests = allTests
   .filter(name => !name.endsWith('/build-app-shell-with-schematic.ts'))
   // IS this test still valid? \/
   .filter(name => !name.endsWith('/module-id.ts'))
@@ -127,8 +130,24 @@ const allTests = glob.sync(path.join(e2eRoot, testGlob), { nodir: true, ignore:
   // NEEDS devkit change
   .filter(name => !name.endsWith('/existing-directory.ts'))
   // Disabled on rc.0 due to needed sync with devkit for changes.
-  .filter(name => !name.endsWith('/service-worker.ts'))
-  .sort();
+  .filter(name => !name.endsWith('/service-worker.ts'));
+
+if (argv.ivy) {
+  // These tests are disabled on the Ivy-only CI job because:
+  // - Ivy doesn't support the functionality yet
+  // - The test itself is not applicable to Ivy
+  // As we transition into using Ivy as the default this list should be reassessed.
+  allTests = allTests
+    // The basic AOT check is different with Ivy and being checked in /experimental/ivy.ts.
+    .filter(name => !name.endsWith('tests/basic/aot.ts'))
+    // Ivy doesn't support i18n externally at the moment.
+    .filter(name => !name.includes('tests/i18n/'))
+    .filter(name => !name.endsWith('tests/build/aot/aot-i18n.ts'))
+    // Lazy load support is WIP https://github.com/angular/angular-cli/pull/13524
+    .filter(name => !name.endsWith('tests/misc/lazy-module.ts'))
+    // We don't have a library consumption story yet for Ivy.
+    .filter(name => !name.endsWith('tests/generate/library/library-consumption.ts'));
+}
 
 const shardId = ('shard' in argv) ? argv['shard'] : null;
 const nbShards = (shardId === null ? 1 : argv['nb-shards']) || 2;

From af88936ef504836f77838438c8bdbe99f40d197d Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 7 Feb 2019 19:16:12 -0500
Subject: [PATCH 0741/1703] fix(@angular-devkit/build-angular): remove unneeded
 script element type

---
 .../plugins/index-html-webpack-plugin.ts      |  1 -
 .../plugins/karma-context.html                | 12 +++++-----
 .../plugins/karma-debug.html                  | 12 +++++-----
 .../test/browser/index_spec_large.ts          |  8 +++----
 .../test/browser/scripts-array_spec_large.ts  | 12 +++++-----
 .../test/browser/service-worker_spec_large.ts |  4 ++--
 .../test/browser/styles_spec_large.ts         | 12 +++++-----
 .../e2e/tests/basic/scripts-array.ts          | 14 +++++------
 .../e2e/tests/basic/styles-array.ts           | 10 ++++----
 tests/legacy-cli/e2e/tests/build/polyfills.ts | 12 +++++-----
 .../e2e/tests/build/styles/extract-css.ts     | 24 +++++++++----------
 tests/legacy-cli/e2e/tests/misc/support-ie.ts | 22 ++++++++---------
 .../e2e/tests/third-party/bootstrap.ts        | 22 ++++++++---------
 13 files changed, 82 insertions(+), 83 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
index a06ed3964bd5..e8575642123b 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
@@ -154,7 +154,6 @@ export class IndexHtmlWebpackPlugin {
       let scriptElements = '';
       for (const script of scripts) {
         const attrs: { name: string, value: string | null }[] = [
-          { name: 'type', value: 'text/javascript' },
           { name: 'src', value: (this._options.deployUrl || '') + script },
         ];
 
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html
index 17937eee4920..5de33896d7db 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html
@@ -27,14 +27,14 @@
     // All served files with the latest timestamps
     %MAPPINGS%
   </script>
-  <script type="text/javascript" src="_karma_webpack_/runtime.js" crossorigin="anonymous"></script>
-  <script type="text/javascript" src="_karma_webpack_/polyfills.js" crossorigin="anonymous"></script>
+  <script src="_karma_webpack_/runtime.js" crossorigin="anonymous"></script>
+  <script src="_karma_webpack_/polyfills.js" crossorigin="anonymous"></script>
   <!-- Dynamically replaced with <script> tags -->
   %SCRIPTS%
-  <script type="text/javascript" src="_karma_webpack_/styles.js" crossorigin="anonymous"></script>
-  <script type="text/javascript" src="_karma_webpack_/scripts.js" crossorigin="anonymous"></script>
-  <script type="text/javascript" src="_karma_webpack_/vendor.js" crossorigin="anonymous"></script>
-  <script type="text/javascript" src="_karma_webpack_/main.js" crossorigin="anonymous"></script>
+  <script src="_karma_webpack_/styles.js" crossorigin="anonymous"></script>
+  <script src="_karma_webpack_/scripts.js" crossorigin="anonymous"></script>
+  <script src="_karma_webpack_/vendor.js" crossorigin="anonymous"></script>
+  <script src="_karma_webpack_/main.js" crossorigin="anonymous"></script>
   <script type="text/javascript">
       window.__karma__.loaded();
   </script>
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-debug.html b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-debug.html
index 79d8708fdc87..93a8a2005d6f 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-debug.html
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-debug.html
@@ -28,14 +28,14 @@
     // All served files with the latest timestamps
     %MAPPINGS%
   </script>
-  <script type="text/javascript" src="_karma_webpack_/runtime.js" crossorigin="anonymous"></script>
-  <script type="text/javascript" src="_karma_webpack_/polyfills.js" crossorigin="anonymous"></script>
+  <script src="_karma_webpack_/runtime.js" crossorigin="anonymous"></script>
+  <script src="_karma_webpack_/polyfills.js" crossorigin="anonymous"></script>
   <!-- Dynamically replaced with <script> tags -->
   %SCRIPTS%
-  <script type="text/javascript" src="_karma_webpack_/styles.js" crossorigin="anonymous"></script>
-  <script type="text/javascript" src="_karma_webpack_/scripts.js" crossorigin="anonymous"></script>
-  <script type="text/javascript" src="_karma_webpack_/vendor.js" crossorigin="anonymous"></script>
-  <script type="text/javascript" src="_karma_webpack_/main.js" crossorigin="anonymous"></script>
+  <script src="_karma_webpack_/styles.js" crossorigin="anonymous"></script>
+  <script src="_karma_webpack_/scripts.js" crossorigin="anonymous"></script>
+  <script src="_karma_webpack_/vendor.js" crossorigin="anonymous"></script>
+  <script src="_karma_webpack_/main.js" crossorigin="anonymous"></script>
   <script type="text/javascript">
       window.__karma__.loaded();
   </script>
diff --git a/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts
index 7d2a8eb85603..09be465f7b90 100644
--- a/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts
@@ -31,7 +31,7 @@ describe('Browser Builder works with BOM index.html', () => {
         const fileName = join(outputPath, 'index.html');
         const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
         // tslint:disable-next-line:max-line-length
-        expect(content).toBe(`<html><head><base href="/"></head><body><app-root></app-root><script type="text/javascript" src="runtime.js"></script><script type="text/javascript" src="polyfills.js"></script><script type="text/javascript" src="styles.js"></script><script type="text/javascript" src="vendor.js"></script><script type="text/javascript" src="main.js"></script></body></html>`);
+        expect(content).toBe(`<html><head><base href="/"></head><body><app-root></app-root><script src="runtime.js"></script><script src="polyfills.js"></script><script src="styles.js"></script><script src="vendor.js"></script><script src="main.js"></script></body></html>`);
       }),
     ).toPromise().then(done, done.fail);
   });
@@ -49,7 +49,7 @@ describe('Browser Builder works with BOM index.html', () => {
         const fileName = join(outputPath, 'index.html');
         const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
         // tslint:disable-next-line:max-line-length
-        expect(content).toBe(`<html><head><base href="/"></head><body><app-root></app-root><script type="text/javascript" src="runtime.js"></script><script type="text/javascript" src="polyfills.js"></script><script type="text/javascript" src="styles.js"></script><script type="text/javascript" src="vendor.js"></script><script type="text/javascript" src="main.js"></script></body></html>`);
+        expect(content).toBe(`<html><head><base href="/"></head><body><app-root></app-root><script src="runtime.js"></script><script src="polyfills.js"></script><script src="styles.js"></script><script src="vendor.js"></script><script src="main.js"></script></body></html>`);
       }),
     ).toPromise().then(done, done.fail);
   });
@@ -68,7 +68,7 @@ describe('Browser Builder works with BOM index.html', () => {
         const fileName = join(outputPath, 'index.html');
         const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
         // tslint:disable-next-line:max-line-length
-        expect(content).toBe(`<html><head><title>&iacute;</title><base href="/"></head> <body><app-root></app-root><script type="text/javascript" src="runtime.js"></script><script type="text/javascript" src="polyfills.js"></script><script type="text/javascript" src="styles.js"></script><script type="text/javascript" src="vendor.js"></script><script type="text/javascript" src="main.js"></script></body></html>`);
+        expect(content).toBe(`<html><head><title>&iacute;</title><base href="/"></head> <body><app-root></app-root><script src="runtime.js"></script><script src="polyfills.js"></script><script src="styles.js"></script><script src="vendor.js"></script><script src="main.js"></script></body></html>`);
       }),
     ).toPromise().then(done, done.fail);
   });
@@ -87,7 +87,7 @@ describe('Browser Builder works with BOM index.html', () => {
         const fileName = join(outputPath, 'index.html');
         const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
         // tslint:disable-next-line:max-line-length
-        expect(content).toBe(`<html><head><base href="/"><%= csrf_meta_tags %></head> <body><app-root></app-root><script type="text/javascript" src="runtime.js"></script><script type="text/javascript" src="polyfills.js"></script><script type="text/javascript" src="styles.js"></script><script type="text/javascript" src="vendor.js"></script><script type="text/javascript" src="main.js"></script></body></html>`);
+        expect(content).toBe(`<html><head><base href="/"><%= csrf_meta_tags %></head> <body><app-root></app-root><script src="runtime.js"></script><script src="polyfills.js"></script><script src="styles.js"></script><script src="vendor.js"></script><script src="main.js"></script></body></html>`);
       }),
     ).toPromise().then(done, done.fail);
   });
diff --git a/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
index 3e384dd48efa..3775e380de82 100644
--- a/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
@@ -50,12 +50,12 @@ describe('Browser Builder scripts array', () => {
       './dist/renamed-script.js': 'pre-rename-script',
       './dist/renamed-lazy-script.js': 'pre-rename-lazy-script',
       './dist/main.js': 'input-script',
-      './dist/index.html': '<script type="text/javascript" src="runtime.js"></script>'
-        + '<script type="text/javascript" src="polyfills.js"></script>'
-        + '<script type="text/javascript" src="scripts.js"></script>'
-        + '<script type="text/javascript" src="renamed-script.js"></script>'
-        + '<script type="text/javascript" src="vendor.js"></script>'
-        + '<script type="text/javascript" src="main.js"></script>',
+      './dist/index.html': '<script src="runtime.js"></script>'
+        + '<script src="polyfills.js"></script>'
+        + '<script src="scripts.js"></script>'
+        + '<script src="renamed-script.js"></script>'
+        + '<script src="vendor.js"></script>'
+        + '<script src="main.js"></script>',
     };
 
     host.writeMultipleFiles(scripts);
diff --git a/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts
index a9d4a4e808fb..327b4b801d56 100644
--- a/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts
@@ -105,7 +105,7 @@ describe('Browser Builder service worker', () => {
           hashTable: {
             '/favicon.ico': '84161b857f5c547e3699ddfbffc6d8d737542e01',
             '/assets/folder-asset.txt': '617f202968a6a81050aa617c2e28e1dca11ce8d4',
-            '/index.html': '843c96f0aeadc8f093b1b2203c08891ecd8f7425',
+            '/index.html': '1bcafd53046ffb270ac5e6f3cab23e0442f95c4f',
             '/spectrum.png': '8d048ece46c0f3af4b598a95fd8e4709b631c3c0',
           },
         });
@@ -161,7 +161,7 @@ describe('Browser Builder service worker', () => {
           hashTable: {
             '/foo/bar/favicon.ico': '84161b857f5c547e3699ddfbffc6d8d737542e01',
             '/foo/bar/assets/folder-asset.txt': '617f202968a6a81050aa617c2e28e1dca11ce8d4',
-            '/foo/bar/index.html': '9ef50361678004b3b197c12cbc74962e5a15b844',
+            '/foo/bar/index.html': '925d80777b6ba64b526b0be79761d254dfe94c65',
           },
         });
       }),
diff --git a/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
index d22d251e84fa..05572f59e303 100644
--- a/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
@@ -56,12 +56,12 @@ describe('Browser Builder styles', () => {
       './dist/renamed-lazy-style.js': '.pre-rename-lazy-style',
     };
     const jsIndexMatches: { [path: string]: string } = {
-      './dist/index.html': '<script type="text/javascript" src="runtime.js"></script>'
-        + '<script type="text/javascript" src="polyfills.js"></script>'
-        + '<script type="text/javascript" src="styles.js"></script>'
-        + '<script type="text/javascript" src="renamed-style.js"></script>'
-        + '<script type="text/javascript" src="vendor.js"></script>'
-        + '<script type="text/javascript" src="main.js"></script>',
+      './dist/index.html': '<script src="runtime.js"></script>'
+        + '<script src="polyfills.js"></script>'
+        + '<script src="styles.js"></script>'
+        + '<script src="renamed-style.js"></script>'
+        + '<script src="vendor.js"></script>'
+        + '<script src="main.js"></script>',
     };
 
     host.writeMultipleFiles(styles);
diff --git a/tests/legacy-cli/e2e/tests/basic/scripts-array.ts b/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
index 44efea1fd6f8..54a221ad0194 100644
--- a/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
+++ b/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
@@ -53,13 +53,13 @@ export default function () {
     .then(() => expectFileToMatch('dist/test-project/renamed-lazy-script.js', 'pre-rename-lazy-script'))
     // index.html lists the right bundles
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
-      <script type="text/javascript" src="runtime.js"></script>
-      <script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
-      <script type="text/javascript" src="polyfills.js"></script>
-      <script type="text/javascript" src="scripts.js"></script>
-      <script type="text/javascript" src="renamed-script.js"></script>
-      <script type="text/javascript" src="vendor.js"></script>
-      <script type="text/javascript" src="main.js"></script>
+      <script src="runtime.js"></script>
+      <script src="es2015-polyfills.js" nomodule></script>
+      <script src="polyfills.js"></script>
+      <script src="scripts.js"></script>
+      <script src="renamed-script.js"></script>
+      <script src="vendor.js"></script>
+      <script src="main.js"></script>
     `))
     // Ensure scripts can be separately imported from the app.
     .then(() => expectFileToMatch('dist/test-project/main.js', 'console.log(\'string-script\');'));
diff --git a/tests/legacy-cli/e2e/tests/basic/styles-array.ts b/tests/legacy-cli/e2e/tests/basic/styles-array.ts
index 4b6457b220ed..114aa641e7bb 100644
--- a/tests/legacy-cli/e2e/tests/basic/styles-array.ts
+++ b/tests/legacy-cli/e2e/tests/basic/styles-array.ts
@@ -42,10 +42,10 @@ export default function () {
       <link rel="stylesheet" href="renamed-style.css">
     `))
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
-      <script type="text/javascript" src="runtime.js"></script>
-      <script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
-      <script type="text/javascript" src="polyfills.js"></script>
-      <script type="text/javascript" src="vendor.js"></script>
-      <script type="text/javascript" src="main.js"></script>
+      <script src="runtime.js"></script>
+      <script src="es2015-polyfills.js" nomodule></script>
+      <script src="polyfills.js"></script>
+      <script src="vendor.js"></script>
+      <script src="main.js"></script>
     `));
 }
diff --git a/tests/legacy-cli/e2e/tests/build/polyfills.ts b/tests/legacy-cli/e2e/tests/build/polyfills.ts
index 29b1930b199a..fe86643c079a 100644
--- a/tests/legacy-cli/e2e/tests/build/polyfills.ts
+++ b/tests/legacy-cli/e2e/tests/build/polyfills.ts
@@ -14,9 +14,9 @@ export default async function () {
     await expectFileToMatch('dist/test-project/polyfills.js', 'core-js/es7/reflect');
     await expectFileToMatch('dist/test-project/polyfills.js', 'zone.js');
     expectFileToMatch('dist/test-project/index.html', oneLineTrim`
-      <script type="text/javascript" src="runtime.js"></script>
-      <script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
-      <script type="text/javascript" src="polyfills.js"></script>
+      <script src="runtime.js"></script>
+      <script src="es2015-polyfills.js" nomodule></script>
+      <script src="polyfills.js"></script>
     `);
     const jitPolyfillSize = await getFileSize('dist/test-project/polyfills.js');
 
@@ -27,8 +27,8 @@ export default async function () {
     await expectToFail(() => expectFileToMatch('dist/test-project/polyfills.js', 'core-js/es7/reflect'));
     await expectFileToMatch('dist/test-project/polyfills.js', 'zone.js');
     expectFileToMatch('dist/test-project/index.html', oneLineTrim`
-      <script type="text/javascript" src="runtime.js"></script>
-      <script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
-      <script type="text/javascript" src="polyfills.js"></script>
+      <script src="runtime.js"></script>
+      <script src="es2015-polyfills.js" nomodule></script>
+      <script src="polyfills.js"></script>
     `);
 }
diff --git a/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts b/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
index 590f45657c37..1f3b30c92c6f 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
@@ -47,11 +47,11 @@ export default function () {
       <link rel="stylesheet" href="renamed-style\.css"/?>
     `)))
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
-      <script type="text/javascript" src="runtime.js"></script>
-      <script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
-      <script type="text/javascript" src="polyfills.js"></script>
-      <script type="text/javascript" src="vendor.js"></script>
-      <script type="text/javascript" src="main.js"></script>
+      <script src="runtime.js"></script>
+      <script src="es2015-polyfills.js" nomodule></script>
+      <script src="polyfills.js"></script>
+      <script src="vendor.js"></script>
+      <script src="main.js"></script>
     `))
     // also check when css isn't extracted
     .then(() => ng('build', '--no-extract-css'))
@@ -63,12 +63,12 @@ export default function () {
     .then(() => expectFileToMatch('dist/test-project/renamed-lazy-style.js', '.pre-rename-lazy-style'))
     // index.html lists the right bundles
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
-      <script type="text/javascript" src="runtime.js"></script>
-      <script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
-      <script type="text/javascript" src="polyfills.js"></script>
-      <script type="text/javascript" src="styles.js"></script>
-      <script type="text/javascript" src="renamed-style.js"></script>
-      <script type="text/javascript" src="vendor.js"></script>
-      <script type="text/javascript" src="main.js"></script>
+      <script src="runtime.js"></script>
+      <script src="es2015-polyfills.js" nomodule></script>
+      <script src="polyfills.js"></script>
+      <script src="styles.js"></script>
+      <script src="renamed-style.js"></script>
+      <script src="vendor.js"></script>
+      <script src="main.js"></script>
     `));
 }
diff --git a/tests/legacy-cli/e2e/tests/misc/support-ie.ts b/tests/legacy-cli/e2e/tests/misc/support-ie.ts
index 2bbe31b19337..5d82fd3aba83 100644
--- a/tests/legacy-cli/e2e/tests/misc/support-ie.ts
+++ b/tests/legacy-cli/e2e/tests/misc/support-ie.ts
@@ -12,21 +12,21 @@ export default async function () {
   await ng('build');
   await expectFileNotToExist('dist/test-project/es2015-polyfills.js');
   await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
-    <script type="text/javascript" src="runtime.js"></script>
-    <script type="text/javascript" src="polyfills.js"></script>
-    <script type="text/javascript" src="styles.js"></script>
-    <script type="text/javascript" src="vendor.js"></script>
-    <script type="text/javascript" src="main.js"></script>
+    <script src="runtime.js"></script>
+    <script src="polyfills.js"></script>
+    <script src="styles.js"></script>
+    <script src="vendor.js"></script>
+    <script src="main.js"></script>
   `);
 
   await ng('build', `--es5BrowserSupport`);
   await expectFileToMatch('dist/test-project/es2015-polyfills.js', 'core-js');
   await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
-    <script type="text/javascript" src="runtime.js"></script>
-    <script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
-    <script type="text/javascript" src="polyfills.js"></script>
-    <script type="text/javascript" src="styles.js"></script>
-    <script type="text/javascript" src="vendor.js"></script>
-    <script type="text/javascript" src="main.js"></script>
+    <script src="runtime.js"></script>
+    <script src="es2015-polyfills.js" nomodule></script>
+    <script src="polyfills.js"></script>
+    <script src="styles.js"></script>
+    <script src="vendor.js"></script>
+    <script src="main.js"></script>
   `);
 }
diff --git a/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts b/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts
index 871b3c428189..bfd35c545301 100644
--- a/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts
+++ b/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts
@@ -22,12 +22,12 @@ export default function() {
     .then(() => expectFileToMatch('dist/test-project/scripts.js', '* Bootstrap'))
     .then(() => expectFileToMatch('dist/test-project/styles.css', '* Bootstrap'))
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
-      <script type="text/javascript" src="runtime.js"></script>
-      <script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
-      <script type="text/javascript" src="polyfills.js"></script>
-      <script type="text/javascript" src="scripts.js"></script>
-      <script type="text/javascript" src="vendor.js"></script>
-      <script type="text/javascript" src="main.js"></script>
+      <script src="runtime.js"></script>
+      <script src="es2015-polyfills.js" nomodule></script>
+      <script src="polyfills.js"></script>
+      <script src="scripts.js"></script>
+      <script src="vendor.js"></script>
+      <script src="main.js"></script>
     `))
     .then(() => ng(
       'build',
@@ -39,10 +39,10 @@ export default function() {
     .then(() => expectFileToMatch('dist/test-project/scripts.js', 'jQuery'))
     .then(() => expectFileToMatch('dist/test-project/styles.css', '* Bootstrap'))
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
-      <script type="text/javascript" src="runtime.js"></script>
-      <script type="text/javascript" src="es2015-polyfills.js" nomodule></script>
-      <script type="text/javascript" src="polyfills.js"></script>
-      <script type="text/javascript" src="scripts.js"></script>
-      <script type="text/javascript" src="main.js"></script>
+      <script src="runtime.js"></script>
+      <script src="es2015-polyfills.js" nomodule></script>
+      <script src="polyfills.js"></script>
+      <script src="scripts.js"></script>
+      <script src="main.js"></script>
     `));
 }

From b611e7fc58805c0b8e793ec6c5828f9651157a19 Mon Sep 17 00:00:00 2001
From: hrocha16 <rochagza@gmail.com>
Date: Sat, 9 Feb 2019 13:38:07 -0600
Subject: [PATCH 0742/1703] fix(@angular-devkit/build-angular): added warning
 for ES2017

---
 .../angular-cli-files/models/webpack-configs/common.ts   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 372a5e05e330..1a40ab83023f 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -5,6 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import { tags } from '@angular-devkit/core';
 import * as CopyWebpackPlugin from 'copy-webpack-plugin';
 import * as path from 'path';
 import { HashedModuleIdsPlugin, debug } from 'webpack';
@@ -272,6 +273,14 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
     );
   }
 
+  if (wco.tsConfig.options.target === 4) {
+    wco.logger.warn(tags.stripIndent`
+      WARNING: Zone.js does not support native async/await in ES2017.
+      These blocks are not intercepted by zone.js and will not triggering change detection.
+      See: https://github.com/angular/zone.js/pull/1140 for more information.
+    `);
+  }
+
   return {
     mode: scriptsOptimization || stylesOptimization
       ? 'production'

From 91d457af737cc01a45b35750126232bd730522f5 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Sat, 9 Feb 2019 17:02:23 -0500
Subject: [PATCH 0743/1703] refactor(@schematics/angular): remove redundant
 branchAndMerge rules

---
 packages/schematics/angular/class/index.ts          |  3 +--
 packages/schematics/angular/component/index.ts      |  7 ++-----
 packages/schematics/angular/directive/index.ts      |  7 ++-----
 packages/schematics/angular/enum/index.ts           |  5 +----
 packages/schematics/angular/guard/index.ts          |  5 +----
 packages/schematics/angular/interface/index.ts      |  5 +----
 .../files/{__projectRoot__ => }/README.md.template  |  0
 .../{__projectRoot__ => }/karma.conf.js.template    |  0
 .../{__projectRoot__ => }/ng-package.json.template  |  0
 .../{__projectRoot__ => }/package.json.template     |  0
 .../src/__entryFile__.ts.template                   |  0
 .../{__projectRoot__ => }/src/test.ts.template      |  0
 .../tsconfig.lib.json.template                      |  0
 .../tsconfig.spec.json.template                     |  0
 .../{__projectRoot__ => }/tslint.json.template      |  0
 packages/schematics/angular/library/index.ts        |  8 +++-----
 packages/schematics/angular/module/index.ts         |  7 ++-----
 packages/schematics/angular/pipe/index.ts           | 13 +++++--------
 18 files changed, 18 insertions(+), 42 deletions(-)
 rename packages/schematics/angular/library/files/{__projectRoot__ => }/README.md.template (100%)
 rename packages/schematics/angular/library/files/{__projectRoot__ => }/karma.conf.js.template (100%)
 rename packages/schematics/angular/library/files/{__projectRoot__ => }/ng-package.json.template (100%)
 rename packages/schematics/angular/library/files/{__projectRoot__ => }/package.json.template (100%)
 rename packages/schematics/angular/library/files/{__projectRoot__ => }/src/__entryFile__.ts.template (100%)
 rename packages/schematics/angular/library/files/{__projectRoot__ => }/src/test.ts.template (100%)
 rename packages/schematics/angular/library/files/{__projectRoot__ => }/tsconfig.lib.json.template (100%)
 rename packages/schematics/angular/library/files/{__projectRoot__ => }/tsconfig.spec.json.template (100%)
 rename packages/schematics/angular/library/files/{__projectRoot__ => }/tslint.json.template (100%)

diff --git a/packages/schematics/angular/class/index.ts b/packages/schematics/angular/class/index.ts
index b008d1d443c8..ff1a68906ef8 100644
--- a/packages/schematics/angular/class/index.ts
+++ b/packages/schematics/angular/class/index.ts
@@ -13,7 +13,6 @@ import {
   Tree,
   apply,
   applyTemplates,
-  branchAndMerge,
   chain,
   filter,
   mergeWith,
@@ -57,7 +56,7 @@ export default function (options: ClassOptions): Rule {
     ]);
 
     return chain([
-      branchAndMerge(mergeWith(templateSource)),
+      mergeWith(templateSource),
       options.lintFix ? applyLintFix(options.path) : noop(),
     ]);
   };
diff --git a/packages/schematics/angular/component/index.ts b/packages/schematics/angular/component/index.ts
index fac77746a981..9fd2be9d3007 100644
--- a/packages/schematics/angular/component/index.ts
+++ b/packages/schematics/angular/component/index.ts
@@ -12,7 +12,6 @@ import {
   Tree,
   apply,
   applyTemplates,
-  branchAndMerge,
   chain,
   filter,
   mergeWith,
@@ -167,10 +166,8 @@ export default function (options: ComponentOptions): Rule {
     ]);
 
     return chain([
-      branchAndMerge(chain([
-        addDeclarationToNgModule(options),
-        mergeWith(templateSource),
-      ])),
+      addDeclarationToNgModule(options),
+      mergeWith(templateSource),
       options.lintFix ? applyLintFix(options.path) : noop(),
     ]);
   };
diff --git a/packages/schematics/angular/directive/index.ts b/packages/schematics/angular/directive/index.ts
index 0b1fa6d076a0..1630dde98c6f 100644
--- a/packages/schematics/angular/directive/index.ts
+++ b/packages/schematics/angular/directive/index.ts
@@ -12,7 +12,6 @@ import {
   Tree,
   apply,
   applyTemplates,
-  branchAndMerge,
   chain,
   filter,
   mergeWith,
@@ -135,10 +134,8 @@ export default function (options: DirectiveOptions): Rule {
     ]);
 
     return chain([
-      branchAndMerge(chain([
-        addDeclarationToNgModule(options),
-        mergeWith(templateSource),
-      ])),
+      addDeclarationToNgModule(options),
+      mergeWith(templateSource),
       options.lintFix ? applyLintFix(options.path) : noop(),
     ]);
   };
diff --git a/packages/schematics/angular/enum/index.ts b/packages/schematics/angular/enum/index.ts
index 214c969168f4..5c2d489f784f 100644
--- a/packages/schematics/angular/enum/index.ts
+++ b/packages/schematics/angular/enum/index.ts
@@ -13,7 +13,6 @@ import {
   Tree,
   apply,
   applyTemplates,
-  branchAndMerge,
   chain,
   mergeWith,
   move,
@@ -50,9 +49,7 @@ export default function (options: EnumOptions): Rule {
     ]);
 
     return chain([
-      branchAndMerge(chain([
-        mergeWith(templateSource),
-      ])),
+      mergeWith(templateSource),
       options.lintFix ? applyLintFix(options.path) : noop(),
     ]);
   };
diff --git a/packages/schematics/angular/guard/index.ts b/packages/schematics/angular/guard/index.ts
index 3c166049e1fa..2b4590d3b591 100644
--- a/packages/schematics/angular/guard/index.ts
+++ b/packages/schematics/angular/guard/index.ts
@@ -12,7 +12,6 @@ import {
   Tree,
   apply,
   applyTemplates,
-  branchAndMerge,
   chain,
   filter,
   mergeWith,
@@ -70,9 +69,7 @@ export default function (options: GuardOptions): Rule {
     ]);
 
     return chain([
-      branchAndMerge(chain([
-        mergeWith(templateSource),
-      ])),
+      mergeWith(templateSource),
       options.lintFix ? applyLintFix(options.path) : noop(),
     ]);
   };
diff --git a/packages/schematics/angular/interface/index.ts b/packages/schematics/angular/interface/index.ts
index d1d7e77aad62..a008e6a3ec37 100644
--- a/packages/schematics/angular/interface/index.ts
+++ b/packages/schematics/angular/interface/index.ts
@@ -12,7 +12,6 @@ import {
   Tree,
   apply,
   applyTemplates,
-  branchAndMerge,
   chain,
   mergeWith,
   move,
@@ -52,9 +51,7 @@ export default function (options: InterfaceOptions): Rule {
     ]);
 
     return chain([
-      branchAndMerge(chain([
-        mergeWith(templateSource),
-      ])),
+      mergeWith(templateSource),
       options.lintFix ? applyLintFix(options.path) : noop(),
     ]);
   };
diff --git a/packages/schematics/angular/library/files/__projectRoot__/README.md.template b/packages/schematics/angular/library/files/README.md.template
similarity index 100%
rename from packages/schematics/angular/library/files/__projectRoot__/README.md.template
rename to packages/schematics/angular/library/files/README.md.template
diff --git a/packages/schematics/angular/library/files/__projectRoot__/karma.conf.js.template b/packages/schematics/angular/library/files/karma.conf.js.template
similarity index 100%
rename from packages/schematics/angular/library/files/__projectRoot__/karma.conf.js.template
rename to packages/schematics/angular/library/files/karma.conf.js.template
diff --git a/packages/schematics/angular/library/files/__projectRoot__/ng-package.json.template b/packages/schematics/angular/library/files/ng-package.json.template
similarity index 100%
rename from packages/schematics/angular/library/files/__projectRoot__/ng-package.json.template
rename to packages/schematics/angular/library/files/ng-package.json.template
diff --git a/packages/schematics/angular/library/files/__projectRoot__/package.json.template b/packages/schematics/angular/library/files/package.json.template
similarity index 100%
rename from packages/schematics/angular/library/files/__projectRoot__/package.json.template
rename to packages/schematics/angular/library/files/package.json.template
diff --git a/packages/schematics/angular/library/files/__projectRoot__/src/__entryFile__.ts.template b/packages/schematics/angular/library/files/src/__entryFile__.ts.template
similarity index 100%
rename from packages/schematics/angular/library/files/__projectRoot__/src/__entryFile__.ts.template
rename to packages/schematics/angular/library/files/src/__entryFile__.ts.template
diff --git a/packages/schematics/angular/library/files/__projectRoot__/src/test.ts.template b/packages/schematics/angular/library/files/src/test.ts.template
similarity index 100%
rename from packages/schematics/angular/library/files/__projectRoot__/src/test.ts.template
rename to packages/schematics/angular/library/files/src/test.ts.template
diff --git a/packages/schematics/angular/library/files/__projectRoot__/tsconfig.lib.json.template b/packages/schematics/angular/library/files/tsconfig.lib.json.template
similarity index 100%
rename from packages/schematics/angular/library/files/__projectRoot__/tsconfig.lib.json.template
rename to packages/schematics/angular/library/files/tsconfig.lib.json.template
diff --git a/packages/schematics/angular/library/files/__projectRoot__/tsconfig.spec.json.template b/packages/schematics/angular/library/files/tsconfig.spec.json.template
similarity index 100%
rename from packages/schematics/angular/library/files/__projectRoot__/tsconfig.spec.json.template
rename to packages/schematics/angular/library/files/tsconfig.spec.json.template
diff --git a/packages/schematics/angular/library/files/__projectRoot__/tslint.json.template b/packages/schematics/angular/library/files/tslint.json.template
similarity index 100%
rename from packages/schematics/angular/library/files/__projectRoot__/tslint.json.template
rename to packages/schematics/angular/library/files/tslint.json.template
diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index 57b9e55fb551..c8e561dbf773 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -13,9 +13,9 @@ import {
   Tree,
   apply,
   applyTemplates,
-  branchAndMerge,
   chain,
   mergeWith,
+  move,
   noop,
   schematic,
   url,
@@ -215,13 +215,11 @@ export default function (options: LibraryOptions): Rule {
         angularLatestVersion: latestVersions.Angular.replace('~', '').replace('^', ''),
         folderName,
       }),
-      // TODO: Moving inside `branchAndMerge` should work but is bugged right now.
-      // The __projectRoot__ is being used meanwhile.
-      // move(projectRoot),
+      move(projectRoot),
     ]);
 
     return chain([
-      branchAndMerge(mergeWith(templateSource)),
+      mergeWith(templateSource),
       addAppToWorkspaceFile(options, workspace, projectRoot, projectName),
       options.skipPackageJson ? noop() : addDependenciesToPackageJson(),
       options.skipTsConfig ? noop() : updateTsConfig(packageName, distRoot),
diff --git a/packages/schematics/angular/module/index.ts b/packages/schematics/angular/module/index.ts
index 31ac6fc6bd98..041eb005bcf3 100644
--- a/packages/schematics/angular/module/index.ts
+++ b/packages/schematics/angular/module/index.ts
@@ -12,7 +12,6 @@ import {
   Tree,
   apply,
   applyTemplates,
-  branchAndMerge,
   chain,
   filter,
   mergeWith,
@@ -99,10 +98,8 @@ export default function (options: ModuleOptions): Rule {
     ]);
 
     return chain([
-      branchAndMerge(chain([
-        addDeclarationToNgModule(options),
-        mergeWith(templateSource),
-      ])),
+      addDeclarationToNgModule(options),
+      mergeWith(templateSource),
       options.lintFix ? applyLintFix(options.path) : noop(),
     ]);
   };
diff --git a/packages/schematics/angular/pipe/index.ts b/packages/schematics/angular/pipe/index.ts
index 919704c07db0..5954738dcfd3 100644
--- a/packages/schematics/angular/pipe/index.ts
+++ b/packages/schematics/angular/pipe/index.ts
@@ -12,7 +12,6 @@ import {
   Tree,
   apply,
   applyTemplates,
-  branchAndMerge,
   chain,
   filter,
   mergeWith,
@@ -115,12 +114,10 @@ export default function (options: PipeOptions): Rule {
       move(parsedPath.path),
     ]);
 
-    return branchAndMerge(
-      chain([
-        addDeclarationToNgModule(options),
-        mergeWith(templateSource),
-        options.lintFix ? applyLintFix(options.path) : noop(),
-      ]),
-    );
+    return chain([
+      addDeclarationToNgModule(options),
+      mergeWith(templateSource),
+      options.lintFix ? applyLintFix(options.path) : noop(),
+    ]);
   };
 }

From 17388866a56f90209b3a8b8c2b7c775aec847897 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sun, 10 Feb 2019 08:45:21 +0000
Subject: [PATCH 0744/1703] build: update ajv to version 6.9.1

---
 package.json                                       | 2 +-
 packages/angular_devkit/build_angular/package.json | 2 +-
 packages/angular_devkit/core/package.json          | 2 +-
 yarn.lock                                          | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 1896c535043d..b58e937118a3 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "@types/webpack-dev-server": "^3.1.0",
     "@types/webpack-sources": "^0.1.5",
     "@yarnpkg/lockfile": "1.1.0",
-    "ajv": "6.8.1",
+    "ajv": "6.9.1",
     "common-tags": "^1.8.0",
     "conventional-changelog": "^1.1.0",
     "conventional-commits-parser": "^3.0.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 02b6104f1ad6..012bd0c093ce 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -11,7 +11,7 @@
     "@angular-devkit/build-webpack": "0.0.0",
     "@angular-devkit/core": "0.0.0",
     "@ngtools/webpack": "0.0.0",
-    "ajv": "6.8.1",
+    "ajv": "6.9.1",
     "autoprefixer": "9.4.7",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json
index 5aaa3e28dd7d..14a5e6ece7e7 100644
--- a/packages/angular_devkit/core/package.json
+++ b/packages/angular_devkit/core/package.json
@@ -8,7 +8,7 @@
     "core"
   ],
   "dependencies": {
-    "ajv": "6.8.1",
+    "ajv": "6.9.1",
     "chokidar": "2.1.0",
     "fast-json-stable-stringify": "2.0.0",
     "rxjs": "6.3.3",
diff --git a/yarn.lock b/yarn.lock
index f61215281e56..6f418ff63082 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -861,10 +861,10 @@ ajv-keywords@^3.1.0:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
   integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
 
-ajv@6.8.1:
-  version "6.8.1"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.8.1.tgz#0890b93742985ebf8973cd365c5b23920ce3cb20"
-  integrity sha512-eqxCp82P+JfqL683wwsL73XmFs1eG6qjw+RD3YHx+Jll1r0jNd4dh8QG9NYAeNGA/hnZjeEDgtTskgJULbxpWQ==
+ajv@6.9.1:
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1"
+  integrity sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"

From daab54773120b7e0c5f6d980e66699c72536caa5 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Tue, 12 Feb 2019 09:47:16 +0100
Subject: [PATCH 0745/1703] docs: remove analyse link from statsJson
 description

https://webpack.github.io/analyse has been broken for over a year and it seems that it is no longer maintained.

See  https://github.com/webpack/analyse/issues/30

Closes #10589
---
 packages/angular/cli/lib/config/schema.json                   | 4 ++--
 packages/angular_devkit/build_angular/src/browser/schema.json | 2 +-
 packages/angular_devkit/build_angular/src/server/schema.json  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index b2dbc1bb98a9..5775a13c7a36 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -847,7 +847,7 @@
             },
             "statsJson": {
               "type": "boolean",
-              "description": "Generates a 'stats.json' file which can be analyzed using tools such as: #webpack-bundle-analyzer' or https://webpack.github.io/analyse .",
+              "description": "Generates a 'stats.json' file which can be analyzed using tools such as 'webpack-bundle-analyzer'.",
               "default": false
             },
             "forkTypeChecker": {
@@ -1753,7 +1753,7 @@
             },
             "statsJson": {
               "type": "boolean",
-              "description": "Generates a 'stats.json' file which can be analyzed using tools such as: #webpack-bundle-analyzer' or https://webpack.github.io/analyse .",
+              "description": "Generates a 'stats.json' file which can be analyzed using tools such as 'webpack-bundle-analyzer'.",
               "default": false
             },
             "forkTypeChecker": {
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index 9fff2eea5f6d..ee7ea8a26e00 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -271,7 +271,7 @@
     },
     "statsJson": {
       "type": "boolean",
-      "description": "Generates a 'stats.json' file which can be analyzed using tools such as: 'webpack-bundle-analyzer' or https://webpack.github.io/analyse.",
+      "description": "Generates a 'stats.json' file which can be analyzed using tools such as 'webpack-bundle-analyzer'.",
       "default": false
     },
     "forkTypeChecker": {
diff --git a/packages/angular_devkit/build_angular/src/server/schema.json b/packages/angular_devkit/build_angular/src/server/schema.json
index 338933858d3a..82aa03077af3 100644
--- a/packages/angular_devkit/build_angular/src/server/schema.json
+++ b/packages/angular_devkit/build_angular/src/server/schema.json
@@ -201,7 +201,7 @@
     },
     "statsJson": {
       "type": "boolean",
-      "description": "Generates a 'stats.json' file which can be analyzed using tools such as: 'webpack-bundle-analyzer' or https://webpack.github.io/analyse.",
+      "description": "Generates a 'stats.json' file which can be analyzed using tools such as 'webpack-bundle-analyzer'.",
       "default": false
     },
     "forkTypeChecker": {

From 1fd4ed6c5d5f77d6c9ec998210b24e7c64d4d0a3 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 12 Feb 2019 15:56:07 +0100
Subject: [PATCH 0746/1703] fix(@angular-devkit/schematics): use `join` instead
 of normal string concatenation

This leads to cleaner paths while debugging

Fixes #13654
---
 packages/angular_devkit/schematics/src/rules/move.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/schematics/src/rules/move.ts b/packages/angular_devkit/schematics/src/rules/move.ts
index b11e9de5f0d8..211d00f01837 100644
--- a/packages/angular_devkit/schematics/src/rules/move.ts
+++ b/packages/angular_devkit/schematics/src/rules/move.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { normalize } from '@angular-devkit/core';
+import { join, normalize } from '@angular-devkit/core';
 import { Rule } from '../engine/interface';
 import { noop } from './base';
 
@@ -30,7 +30,7 @@ export function move(from: string, to?: string): Rule {
     } else {
       // fromPath is a directory
       tree.getDir(fromPath).visit(path => {
-        tree.rename(path, toPath + '/' + path.substr(fromPath.length));
+        tree.rename(path, join(toPath, path.substr(fromPath.length)));
       });
     }
 

From 02410e4633b7eb12cbd7aa91b62db88c7c85dca9 Mon Sep 17 00:00:00 2001
From: WilliamKoza <william.koza@gmail.com>
Date: Wed, 13 Feb 2019 16:54:51 +0100
Subject: [PATCH 0747/1703] fix(@schematics/angular): respect the flag when we
 create a guard with schematics

---
 packages/schematics/angular/guard/index.ts      | 2 +-
 packages/schematics/angular/guard/index_spec.ts | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/angular/guard/index.ts b/packages/schematics/angular/guard/index.ts
index 2b4590d3b591..95666fea1583 100644
--- a/packages/schematics/angular/guard/index.ts
+++ b/packages/schematics/angular/guard/index.ts
@@ -65,7 +65,7 @@ export default function (options: GuardOptions): Rule {
         ...strings,
         ...options,
       }),
-      move(parsedPath.path),
+      move(parsedPath.path + (options.flat ? '' : '/' + strings.dasherize(options.name))),
     ]);
 
     return chain([
diff --git a/packages/schematics/angular/guard/index_spec.ts b/packages/schematics/angular/guard/index_spec.ts
index 0c8c413ab970..a98bf7f148c0 100644
--- a/packages/schematics/angular/guard/index_spec.ts
+++ b/packages/schematics/angular/guard/index_spec.ts
@@ -56,6 +56,15 @@ describe('Guard Schematic', () => {
     expect(files).toContain('/projects/bar/src/app/foo.guard.ts');
   });
 
+  it('should respect the flat flag', () => {
+    const options = { ...defaultOptions, flat: false };
+
+    const tree = schematicRunner.runSchematic('guard', options, appTree);
+    const files = tree.files;
+    expect(files).toContain('/projects/bar/src/app/foo/foo.guard.spec.ts');
+    expect(files).toContain('/projects/bar/src/app/foo/foo.guard.ts');
+  });
+
   it('should respect the sourceRoot value', () => {
     const config = JSON.parse(appTree.readContent('/angular.json'));
     config.projects.bar.sourceRoot = 'projects/bar/custom';

From a5c1faa5c59da0aab5020f27f0661eff79ae54b8 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 13 Feb 2019 14:08:20 -0800
Subject: [PATCH 0748/1703] build: fix invalid commits that made it through

And remove the usage of "blacklist" while Im at it.
---
 scripts/validate-commits.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/validate-commits.ts b/scripts/validate-commits.ts
index f176ec473c2d..aafd3e9788fb 100644
--- a/scripts/validate-commits.ts
+++ b/scripts/validate-commits.ts
@@ -11,7 +11,7 @@ import { execSync } from 'child_process';
 import { packages } from '../lib/packages';
 
 
-const blacklist = [
+const ignoreCommitShaList = [
   '9ce1aed331ad0742463b587f1f5555486ccc202f',
   'de7a44f23514594274394322adaf40ac87c38d8b',
   '21d87e93955b12d137417a2bb0536d7faef3ad07',
@@ -25,6 +25,8 @@ const blacklist = [
   'fb1c2af810d069229760800c2f539e8a764fe1eb',
   '7ba94c8084eb65407abd5531dcbb7275401969c9',
   '8475b3dadba3d50a96a2f876188bbf78d55039aa',
+  'bf566c710181b0e23af0070540294de99f259fe9',
+  'fa6795a8471d1c9ae4d583f8e698e49f74a137e6',
 ];
 
 
@@ -140,7 +142,7 @@ export default function (argv: ValidateCommitsOptions, logger: logging.Logger) {
   }
 
   for (const [sha, message] of commits) {
-    if (blacklist.find(i => i.startsWith(sha))) {
+    if (ignoreCommitShaList.find(i => i.startsWith(sha))) {
       // Some commits are better ignored.
       continue;
     }

From a13924364482cbf9a61ba4c3ac1171d3feaf8034 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Mon, 11 Feb 2019 08:50:49 +0100
Subject: [PATCH 0749/1703] refactor: clean up library tsconfig

These properties are already defined in the root tsconfig
---
 .../angular/library/files/tsconfig.lib.json.template     | 6 ------
 .../ng-packaged/projects/lib/tsconfig.lib.json           | 9 ++-------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/packages/schematics/angular/library/files/tsconfig.lib.json.template b/packages/schematics/angular/library/files/tsconfig.lib.json.template
index d0e432aa214e..730ff84bbeaf 100644
--- a/packages/schematics/angular/library/files/tsconfig.lib.json.template
+++ b/packages/schematics/angular/library/files/tsconfig.lib.json.template
@@ -3,14 +3,8 @@
   "compilerOptions": {
     "outDir": "<%= relativePathToWorkspaceRoot %>/out-tsc/lib",
     "target": "es2015",
-    "module": "es2015",
-    "moduleResolution": "node",
     "declaration": true,
-    "sourceMap": true,
     "inlineSources": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "importHelpers": true,
     "types": [],
     "lib": [
       "dom",
diff --git a/tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/tsconfig.lib.json b/tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/tsconfig.lib.json
index f7929f05dbfb..a23fa5f5a0e7 100644
--- a/tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/tsconfig.lib.json
+++ b/tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/tsconfig.lib.json
@@ -2,17 +2,12 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "target": "es2015",
-    "module": "es2015",
-    "moduleResolution": "node",
     "declaration": true,
-    "sourceMap": true,
     "inlineSources": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "importHelpers": true,
+    "types": [],
     "lib": [
       "dom",
-      "es2016"
+      "es2018"
     ]
   },
   "angularCompilerOptions": {

From d9166b04fccc708bc3856a6b243a8752120f312d Mon Sep 17 00:00:00 2001
From: mrmeku <mrmeku@gmail.com>
Date: Wed, 6 Feb 2019 16:20:57 -0700
Subject: [PATCH 0750/1703] feat(@angular/cli): Add VsCode extension
 recommendations

---
 .../migrations/migration-collection.json      |  5 ++
 .../ast-utils.ts                              | 41 ++++++++++++
 .../update-8.0.0.ts                           | 27 ++++++++
 .../update-8.0.0_spec.ts                      | 62 +++++++++++++++++++
 .../__dot__vscode/extensions.json.template    |  6 ++
 5 files changed, 141 insertions(+)
 create mode 100644 packages/schematics/angular/migrations/update-vscode-recommendations/ast-utils.ts
 create mode 100644 packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0.ts
 create mode 100644 packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0_spec.ts
 create mode 100644 packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template

diff --git a/packages/schematics/angular/migrations/migration-collection.json b/packages/schematics/angular/migrations/migration-collection.json
index 0e03d24ae78f..a14615222e3a 100644
--- a/packages/schematics/angular/migrations/migration-collection.json
+++ b/packages/schematics/angular/migrations/migration-collection.json
@@ -29,6 +29,11 @@
       "version": "7.0.3",
       "factory": "./update-7/index#updateDevkitBuildNgPackagr",
       "description": "Update an Angular CLI project to version 7."
+    },
+    "migration-07": {
+      "version": "8.0.0",
+      "factory": "./update-vscode-recommendations/update-8.0.0",
+      "description": "Update an Angular CLI project to version 8.0.0"
     }
   }
 }
diff --git a/packages/schematics/angular/migrations/update-vscode-recommendations/ast-utils.ts b/packages/schematics/angular/migrations/update-vscode-recommendations/ast-utils.ts
new file mode 100644
index 000000000000..88bfc903fc08
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-vscode-recommendations/ast-utils.ts
@@ -0,0 +1,41 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Rule, Tree } from '@angular-devkit/schematics';
+
+export function readJsonInTree<T>(host: Tree, path: string): T {
+  if (!host.exists(path)) {
+    throw new Error(`Cannot find ${path}`);
+  }
+
+  const json = host.read(path);
+  if (!json) {
+    throw new Error(`Cannot read ${path}`);
+  }
+
+  return JSON.parse(json.toString('utf-8'));
+}
+
+export function serializeJson<T>(json: T): string {
+  return `${JSON.stringify(json, null, 2)}\n`;
+}
+
+export function updateJsonInTree<T, O = T>(
+  path: string,
+  callback: (json: T) => O,
+): Rule {
+  return (host: Tree): Tree => {
+    if (!host.exists(path)) {
+      host.create(path, serializeJson(callback({} as T)));
+
+      return host;
+    }
+    host.overwrite(path, serializeJson(callback(readJsonInTree(host, path))));
+
+    return host;
+  };
+}
diff --git a/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0.ts b/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0.ts
new file mode 100644
index 000000000000..41101d48def4
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0.ts
@@ -0,0 +1,27 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Rule, chain } from '@angular-devkit/schematics';
+import { updateJsonInTree } from './ast-utils';
+
+export default function (): Rule {
+  return chain([addExtensionRecommendations]);
+}
+
+const addExtensionRecommendations = updateJsonInTree(
+  '.vscode/extensions.json',
+  (json: { recommendations?: string[] }) => {
+    ['angular.ng-template', 'ms-vscode.vscode-typescript-tslint-plugin'].forEach(extension => {
+      json.recommendations = json.recommendations || [];
+      if (!json.recommendations.includes(extension)) {
+        json.recommendations.push(extension);
+      }
+    });
+
+    return json;
+  },
+);
diff --git a/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0_spec.ts b/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0_spec.ts
new file mode 100644
index 000000000000..40be71afa9a3
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0_spec.ts
@@ -0,0 +1,62 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Tree } from '@angular-devkit/schematics';
+import { SchematicTestRunner } from '@angular-devkit/schematics/testing';
+import { readJsonInTree, serializeJson, updateJsonInTree } from './ast-utils';
+
+describe('Update 8.0.0', () => {
+  let initialTree: Tree;
+  let schematicRunner: SchematicTestRunner;
+
+  beforeEach(() => {
+    initialTree = Tree.empty();
+
+    initialTree.create(
+      'package.json',
+      serializeJson({
+        devDependencies: { '@angular/cli': '7.1.0', typescript: '~3.1.0' },
+      }),
+    );
+
+    schematicRunner = new SchematicTestRunner(
+      'migrations',
+      require.resolve('../migration-collection.json'),
+    );
+  });
+
+  it('should add vscode extension recommendations', async () => {
+    const result = await schematicRunner
+      .runSchematicAsync('migration-07', {}, initialTree)
+      .toPromise();
+
+    expect(readJsonInTree(result, '.vscode/extensions.json')).toEqual({
+      recommendations: ['angular.ng-template', 'ms-vscode.vscode-typescript-tslint-plugin'],
+    });
+  });
+
+  it('should add to existing vscode extension recommendations', async () => {
+    initialTree = await schematicRunner
+      .callRule(
+        updateJsonInTree('.vscode/extensions.json', () => ({
+          recommendations: [
+            'eamodio.gitlens', 'angular.ng-template', 'ms-vscode.vscode-typescript-tslint-plugin'],
+        })),
+        initialTree,
+      )
+      .toPromise();
+
+    const result = await schematicRunner
+      .runSchematicAsync('migration-07', {}, initialTree)
+      .toPromise();
+
+    expect(readJsonInTree(result, '.vscode/extensions.json')).toEqual({
+      recommendations: [
+        'eamodio.gitlens', 'angular.ng-template', 'ms-vscode.vscode-typescript-tslint-plugin'],
+    });
+  });
+});
diff --git a/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template b/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template
new file mode 100644
index 000000000000..4eb9de447041
--- /dev/null
+++ b/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template
@@ -0,0 +1,6 @@
+{
+  "recommendations": [
+    "angular.ng-template",
+    "ms-vscode.vscode-typescript-tslint-plugin
+  ]
+}

From 889c2549d1cc1d0898d4459d8a18c5feda9ef547 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Wed, 13 Feb 2019 13:29:21 -0800
Subject: [PATCH 0751/1703] fix(@angular-devkit/core): remove static
 initialization using process object

It does not work in a browser.
---
 .../angular_devkit/core/src/terminal/caps.ts  |  9 +--
 .../angular_devkit/core/src/terminal/text.ts  | 55 ++++++++++---------
 2 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/packages/angular_devkit/core/src/terminal/caps.ts b/packages/angular_devkit/core/src/terminal/caps.ts
index 0de9af74b88d..d27e455b9e71 100644
--- a/packages/angular_devkit/core/src/terminal/caps.ts
+++ b/packages/angular_devkit/core/src/terminal/caps.ts
@@ -152,10 +152,10 @@ function _getColorLevel(stream: Socket): 0 | 1 | 2 | 3 {
 
 
 function _getRows() {
-  return process.stdout.rows || null;
+  return typeof process == 'object' && process.stdout.rows || null;
 }
 function _getColumns() {
-  return process.stdout.columns || null;
+  return typeof process == 'object' && process.stdout.columns || null;
 }
 
 
@@ -189,8 +189,3 @@ export function getCapabilities(
 
   return maybeCaps;
 }
-
-
-export const stdin = getCapabilities(process.stdin as Socket);
-export const stdout = getCapabilities(process.stdout);
-export const stderr = getCapabilities(process.stderr);
diff --git a/packages/angular_devkit/core/src/terminal/text.ts b/packages/angular_devkit/core/src/terminal/text.ts
index 3636270a62a1..4d1654e36ad3 100644
--- a/packages/angular_devkit/core/src/terminal/text.ts
+++ b/packages/angular_devkit/core/src/terminal/text.ts
@@ -8,31 +8,34 @@
 import * as caps from './caps';
 import { colors } from './colors';
 
-export const reset = caps.stdout.colors ? colors.reset : (x: string) => x;
-export const bold = caps.stdout.colors ? colors.bold : (x: string) => x;
-export const dim = caps.stdout.colors ? colors.dim : (x: string) => x;
-export const italic = caps.stdout.colors ? colors.italic : (x: string) => x;
-export const underline = caps.stdout.colors ? colors.underline : (x: string) => x;
-export const inverse = caps.stdout.colors ? colors.inverse : (x: string) => x;
-export const hidden = caps.stdout.colors ? colors.hidden : (x: string) => x;
-export const strikethrough = caps.stdout.colors ? colors.strikethrough : (x: string) => x;
+const stdout = typeof process == 'object'
+  ? caps.getCapabilities(process.stdout) : { colors: false };
 
-export const black = caps.stdout.colors ? colors.black : (x: string) => x;
-export const red = caps.stdout.colors ? colors.red : (x: string) => x;
-export const green = caps.stdout.colors ? colors.green : (x: string) => x;
-export const yellow = caps.stdout.colors ? colors.yellow : (x: string) => x;
-export const blue = caps.stdout.colors ? colors.blue : (x: string) => x;
-export const magenta = caps.stdout.colors ? colors.magenta : (x: string) => x;
-export const cyan = caps.stdout.colors ? colors.cyan : (x: string) => x;
-export const white = caps.stdout.colors ? colors.white : (x: string) => x;
-export const grey = caps.stdout.colors ? colors.gray : (x: string) => x;
-export const gray = caps.stdout.colors ? colors.gray : (x: string) => x;
+export const reset = stdout.colors ? colors.reset : (x: string) => x;
+export const bold = stdout.colors ? colors.bold : (x: string) => x;
+export const dim = stdout.colors ? colors.dim : (x: string) => x;
+export const italic = stdout.colors ? colors.italic : (x: string) => x;
+export const underline = stdout.colors ? colors.underline : (x: string) => x;
+export const inverse = stdout.colors ? colors.inverse : (x: string) => x;
+export const hidden = stdout.colors ? colors.hidden : (x: string) => x;
+export const strikethrough = stdout.colors ? colors.strikethrough : (x: string) => x;
 
-export const bgBlack = caps.stdout.colors ? colors.bgBlack : (x: string) => x;
-export const bgRed = caps.stdout.colors ? colors.bgRed : (x: string) => x;
-export const bgGreen = caps.stdout.colors ? colors.bgGreen : (x: string) => x;
-export const bgYellow = caps.stdout.colors ? colors.bgYellow : (x: string) => x;
-export const bgBlue = caps.stdout.colors ? colors.bgBlue : (x: string) => x;
-export const bgMagenta = caps.stdout.colors ? colors.bgMagenta : (x: string) => x;
-export const bgCyan = caps.stdout.colors ? colors.bgCyan : (x: string) => x;
-export const bgWhite = caps.stdout.colors ? colors.bgWhite : (x: string) => x;
+export const black = stdout.colors ? colors.black : (x: string) => x;
+export const red = stdout.colors ? colors.red : (x: string) => x;
+export const green = stdout.colors ? colors.green : (x: string) => x;
+export const yellow = stdout.colors ? colors.yellow : (x: string) => x;
+export const blue = stdout.colors ? colors.blue : (x: string) => x;
+export const magenta = stdout.colors ? colors.magenta : (x: string) => x;
+export const cyan = stdout.colors ? colors.cyan : (x: string) => x;
+export const white = stdout.colors ? colors.white : (x: string) => x;
+export const grey = stdout.colors ? colors.gray : (x: string) => x;
+export const gray = stdout.colors ? colors.gray : (x: string) => x;
+
+export const bgBlack = stdout.colors ? colors.bgBlack : (x: string) => x;
+export const bgRed = stdout.colors ? colors.bgRed : (x: string) => x;
+export const bgGreen = stdout.colors ? colors.bgGreen : (x: string) => x;
+export const bgYellow = stdout.colors ? colors.bgYellow : (x: string) => x;
+export const bgBlue = stdout.colors ? colors.bgBlue : (x: string) => x;
+export const bgMagenta = stdout.colors ? colors.bgMagenta : (x: string) => x;
+export const bgCyan = stdout.colors ? colors.bgCyan : (x: string) => x;
+export const bgWhite = stdout.colors ? colors.bgWhite : (x: string) => x;

From d849834445b918a1587f441faaac423b8f862804 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 15 Feb 2019 06:30:09 -0500
Subject: [PATCH 0752/1703] feat(@angular-devkit/core): support console logger
 color customization

---
 etc/api/angular_devkit/core/node/_golden-api.d.ts |  2 +-
 packages/angular_devkit/core/node/cli-logger.ts   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/etc/api/angular_devkit/core/node/_golden-api.d.ts b/etc/api/angular_devkit/core/node/_golden-api.d.ts
index 6059512644b1..6577971a1802 100644
--- a/etc/api/angular_devkit/core/node/_golden-api.d.ts
+++ b/etc/api/angular_devkit/core/node/_golden-api.d.ts
@@ -1,4 +1,4 @@
-export declare function createConsoleLogger(verbose?: boolean, stdout?: ProcessOutput, stderr?: ProcessOutput): logging.Logger;
+export declare function createConsoleLogger(verbose?: boolean, stdout?: ProcessOutput, stderr?: ProcessOutput, colors?: Partial<Record<logging.LogLevel, (s: string) => string>>): logging.Logger;
 
 export declare function isDirectory(filePath: string): boolean;
 
diff --git a/packages/angular_devkit/core/node/cli-logger.ts b/packages/angular_devkit/core/node/cli-logger.ts
index 25636fe13d8a..2a9eb1562f47 100644
--- a/packages/angular_devkit/core/node/cli-logger.ts
+++ b/packages/angular_devkit/core/node/cli-logger.ts
@@ -19,25 +19,25 @@ export function createConsoleLogger(
   verbose = false,
   stdout: ProcessOutput = process.stdout,
   stderr: ProcessOutput = process.stderr,
+  colors?: Partial<Record<logging.LogLevel, (s: string) => string>>,
 ): logging.Logger {
   const logger = new logging.IndentLogger('cling');
 
   logger
     .pipe(filter(entry => (entry.level != 'debug' || verbose)))
     .subscribe(entry => {
-      let color = terminal.dim;
+      let color = colors && colors[entry.level];
       let output = stdout;
       switch (entry.level) {
         case 'info':
-          color = s => s;
           break;
         case 'warn':
-          color = (s: string) => terminal.bold(terminal.yellow(s));
+          color = color || (s => terminal.bold(terminal.yellow(s)));
           output = stderr;
           break;
         case 'fatal':
         case 'error':
-          color = (s: string) => terminal.bold(terminal.red(s));
+          color = color || (s => terminal.bold(terminal.red(s)));
           output = stderr;
           break;
       }
@@ -66,7 +66,7 @@ export function createConsoleLogger(
       while (message) {
         const chunk = message.slice(0, chunkSize);
         message = message.slice(chunkSize);
-        output.write(color(chunk));
+        output.write(color ? color(chunk) : chunk);
       }
       output.write('\n');
     });

From c4376d067f223ac07a978e5642f7f07ac8ab5d86 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 15 Feb 2019 06:30:57 -0500
Subject: [PATCH 0753/1703] fix(@angular/cli): explicitly define console color
 logging

---
 packages/angular/cli/lib/cli/index.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/angular/cli/lib/cli/index.ts b/packages/angular/cli/lib/cli/index.ts
index b18556c0d86f..aac8708aba36 100644
--- a/packages/angular/cli/lib/cli/index.ts
+++ b/packages/angular/cli/lib/cli/index.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
+import { terminal } from '@angular-devkit/core';
 import { createConsoleLogger } from '@angular-devkit/core/node';
 import { runCommand } from '../../models/command-runner';
 import { getWorkspaceRaw } from '../../utilities/config';
@@ -13,7 +13,16 @@ import { getWorkspaceDetails } from '../../utilities/project';
 
 
 export default async function(options: { testing?: boolean, cliArgs: string[] }) {
-  const logger = createConsoleLogger();
+  const logger = createConsoleLogger(
+    false,
+    process.stdout,
+    process.stderr,
+    {
+      warn: s => terminal.bold(terminal.yellow(s)),
+      error: s => terminal.bold(terminal.red(s)),
+      fatal: s => terminal.bold(terminal.red(s)),
+    },
+  );
 
   let projectDetails = getWorkspaceDetails();
   if (projectDetails === null) {

From f58a7ded00c57f6546f1e0f9d6369dd45fcde85a Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 15 Feb 2019 11:54:53 -0500
Subject: [PATCH 0754/1703] fix(@angular/cli): remove deprecated eject command

---
 packages/angular/cli/BUILD                  |  9 -------
 packages/angular/cli/commands.json          |  1 -
 packages/angular/cli/commands/eject-impl.ts | 28 ---------------------
 packages/angular/cli/commands/eject-long.md |  8 ------
 packages/angular/cli/commands/eject.json    | 15 -----------
 5 files changed, 61 deletions(-)
 delete mode 100644 packages/angular/cli/commands/eject-impl.ts
 delete mode 100644 packages/angular/cli/commands/eject-long.md
 delete mode 100644 packages/angular/cli/commands/eject.json

diff --git a/packages/angular/cli/BUILD b/packages/angular/cli/BUILD
index 716ec2cd69c1..5512fc1e01fa 100644
--- a/packages/angular/cli/BUILD
+++ b/packages/angular/cli/BUILD
@@ -47,7 +47,6 @@ ts_library(
         ":doc_schema",
         ":e2e_schema",
         ":easter_egg_schema",
-        ":eject_schema",
         ":generate_schema",
         ":help_schema",
         ":lint_schema",
@@ -117,14 +116,6 @@ ts_json_schema(
     ],
 )
 
-ts_json_schema(
-    name = "eject_schema",
-    src = "commands/eject.json",
-    data = [
-        "commands/definitions.json",
-    ],
-)
-
 ts_json_schema(
     name = "generate_schema",
     src = "commands/generate.json",
diff --git a/packages/angular/cli/commands.json b/packages/angular/cli/commands.json
index be69ff2dbe62..142180ea7997 100644
--- a/packages/angular/cli/commands.json
+++ b/packages/angular/cli/commands.json
@@ -5,7 +5,6 @@
   "doc": "./commands/doc.json",
   "e2e": "./commands/e2e.json",
   "make-this-awesome": "./commands/easter-egg.json",
-  "eject": "./commands/eject.json",
   "generate": "./commands/generate.json",
   "get": "./commands/deprecated.json",
   "set": "./commands/deprecated.json",
diff --git a/packages/angular/cli/commands/eject-impl.ts b/packages/angular/cli/commands/eject-impl.ts
deleted file mode 100644
index add0d12850fd..000000000000
--- a/packages/angular/cli/commands/eject-impl.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { tags } from '@angular-devkit/core';
-import { Command } from '../models/command';
-import { Schema as EjectCommandSchema } from './eject';
-
-export class EjectCommand extends Command<EjectCommandSchema> {
-  async run() {
-    this.logger.error(tags.stripIndents`
-      The 'eject' command has been disabled and will be removed completely in 8.0.
-      The new configuration format provides increased flexibility to modify the
-      configuration of your workspace without ejecting.
-
-      There are several projects that can be used in conjuction with the new
-      configuration format that provide the benefits of ejecting without the maintenance
-      overhead.  One such project is ngx-build-plus found here:
-      https://github.com/manfredsteyer/ngx-build-plus
-    `);
-
-    return 1;
-  }
-}
diff --git a/packages/angular/cli/commands/eject-long.md b/packages/angular/cli/commands/eject-long.md
deleted file mode 100644
index 4509f1b7bdec..000000000000
--- a/packages/angular/cli/commands/eject-long.md
+++ /dev/null
@@ -1,8 +0,0 @@
-The 'eject' command has been disabled and will be removed completely in 8.0.
-The new configuration format provides increased flexibility to modify the
-configuration of your workspace without ejecting.
-
-There are several projects that can be used in conjuction with the new
-configuration format that provide the benefits of ejecting without the maintenance
-overhead.  One such project is ngx-build-plus found here:
-https://github.com/manfredsteyer/ngx-build-plus
\ No newline at end of file
diff --git a/packages/angular/cli/commands/eject.json b/packages/angular/cli/commands/eject.json
deleted file mode 100644
index 714e63884399..000000000000
--- a/packages/angular/cli/commands/eject.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "$schema": "http://json-schema.org/schema",
-  "$id": "ng-cli://commands/eject.json",
-  "description": "Deprecated, will be removed in Angular 8.0.",
-  "$longDescription": "./eject-long.md",
-
-  "$hidden": true,
-  "$scope": "in",
-  "$impl": "./eject-impl#EjectCommand",
-
-  "type": "object",
-  "allOf": [
-    { "$ref": "./definitions.json#/definitions/base" }
-  ]
-}

From 31abb8148207a6d7bbdd0e4d55ce826d39a2cdb9 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 15 Feb 2019 12:02:41 -0500
Subject: [PATCH 0755/1703] test: remove all references to eject from CLI E2E
 tests

---
 tests/legacy-cli/e2e/tests/basic/assets.ts        |  8 +++-----
 tests/legacy-cli/e2e/tests/basic/rebuild.ts       |  5 -----
 .../tests/build/build-app-shell-with-schematic.ts |  5 -----
 .../legacy-cli/e2e/tests/build/build-app-shell.ts |  5 -----
 tests/legacy-cli/e2e/tests/build/build-errors.ts  |  5 -----
 .../e2e/tests/build/delete-output-path.ts         |  5 -----
 tests/legacy-cli/e2e/tests/build/deploy-url.ts    |  6 ++----
 .../legacy-cli/e2e/tests/build/eval-sourcemap.ts  |  6 ------
 tests/legacy-cli/e2e/tests/build/json.ts          |  5 -----
 tests/legacy-cli/e2e/tests/build/output-dir.ts    |  5 -----
 .../legacy-cli/e2e/tests/build/platform-server.ts |  5 -----
 tests/legacy-cli/e2e/tests/build/prod-build.ts    |  5 +----
 .../e2e/tests/build/rebuild-css-change.ts         |  5 -----
 .../e2e/tests/build/rebuild-deps-type-check.ts    |  4 ----
 tests/legacy-cli/e2e/tests/build/rebuild-error.ts |  4 ----
 .../e2e/tests/build/rebuild-ngfactories.ts        |  4 ----
 tests/legacy-cli/e2e/tests/build/rebuild-types.ts |  4 ----
 .../legacy-cli/e2e/tests/build/service-worker.ts  | 13 -------------
 .../legacy-cli/e2e/tests/build/styles/imports.ts  |  5 +----
 .../e2e/tests/commands/build/build-outdir.ts      |  3 +--
 tests/legacy-cli/e2e/utils/process.ts             | 15 +--------------
 tests/legacy-cli/e2e_runner.ts                    |  1 -
 22 files changed, 9 insertions(+), 114 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/basic/assets.ts b/tests/legacy-cli/e2e/tests/basic/assets.ts
index f35ebc69792a..1d20c8bb3873 100644
--- a/tests/legacy-cli/e2e/tests/basic/assets.ts
+++ b/tests/legacy-cli/e2e/tests/basic/assets.ts
@@ -8,7 +8,6 @@ import {
 import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
-import {getGlobalVariable} from '../../utils/env';
 
 
 // const temp = require('temp');
@@ -17,7 +16,6 @@ import {getGlobalVariable} from '../../utils/env';
 // tslint:disable:max-line-length
 export default function () {
   // Disable parts of it in webpack tests.
-  const ejected = getGlobalVariable('argv').eject;
 
   // TODO: update test
   return;
@@ -110,7 +108,7 @@ export default function () {
     // .gitkeep shouldn't be copied.
     .then(() => expectToFail(() => expectFileToExist('dist/assets/.gitkeep')))
     // Update app to test assets are present.
-    .then(_ => !ejected && writeMultipleFiles({
+    .then(_ => writeMultipleFiles({
       'src/app/app.module.ts': `
         import { BrowserModule } from '@angular/platform-browser';
         import { NgModule } from '@angular/core';
@@ -191,6 +189,6 @@ export default function () {
           });
         });`,
     }))
-    .then(() => !ejected && ng('test', '--watch=false'))
-    .then(() => !ejected && ng('e2e', 'test-project-e2e'));
+    .then(() => ng('test', '--watch=false'))
+    .then(() => ng('e2e', 'test-project-e2e'));
 }
diff --git a/tests/legacy-cli/e2e/tests/basic/rebuild.ts b/tests/legacy-cli/e2e/tests/basic/rebuild.ts
index 6eda126667ad..3ca37f3bc175 100644
--- a/tests/legacy-cli/e2e/tests/basic/rebuild.ts
+++ b/tests/legacy-cli/e2e/tests/basic/rebuild.ts
@@ -7,7 +7,6 @@ import {
 import {writeFile, writeMultipleFiles} from '../../utils/fs';
 import {wait} from '../../utils/utils';
 import {request} from '../../utils/http';
-import {getGlobalVariable} from '../../utils/env';
 
 const validBundleRegEx = /: Compiled successfully./;
 
@@ -15,10 +14,6 @@ export default function() {
   if (process.platform.startsWith('win')) {
     return Promise.resolve();
   }
-  // Skip this in ejected tests.
-  if (getGlobalVariable('argv').eject) {
-    return Promise.resolve();
-  }
 
   const lazyChunkRegExp = /lazy-module\.js/g;
 
diff --git a/tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts b/tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts
index 85bef90848ed..001eb29e9a4a 100644
--- a/tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts
+++ b/tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts
@@ -7,11 +7,6 @@ import { readNgVersion } from '../../utils/version';
 
 
 export default function () {
-  // Skip this in ejected tests.
-  if (getGlobalVariable('argv').eject) {
-    return Promise.resolve();
-  }
-
   // Skip this test in Angular 2/4.
   if (getGlobalVariable('argv').ng2 || getGlobalVariable('argv').ng4) {
     return Promise.resolve();
diff --git a/tests/legacy-cli/e2e/tests/build/build-app-shell.ts b/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
index a2fac7d400ef..ee8fe2b672cd 100644
--- a/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
+++ b/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
@@ -8,11 +8,6 @@ import { stripIndent } from 'common-tags';
 
 
 export default function () {
-  // Skip this in ejected tests.
-  if (getGlobalVariable('argv').eject) {
-    return Promise.resolve();
-  }
-
   // Skip this test in Angular 2/4.
   if (getGlobalVariable('argv').ng2 || getGlobalVariable('argv').ng4) {
     return Promise.resolve();
diff --git a/tests/legacy-cli/e2e/tests/build/build-errors.ts b/tests/legacy-cli/e2e/tests/build/build-errors.ts
index 538a26690868..66f4b36807ee 100644
--- a/tests/legacy-cli/e2e/tests/build/build-errors.ts
+++ b/tests/legacy-cli/e2e/tests/build/build-errors.ts
@@ -19,11 +19,6 @@ export default function () {
     return Promise.resolve();
   }
 
-  // Skip this in ejected tests.
-  if (getGlobalVariable('argv').eject) {
-    return Promise.resolve();
-  }
-
   // Skip this test in Angular 2/4.
   if (getGlobalVariable('argv').ng2 || getGlobalVariable('argv').ng4) {
     return Promise.resolve();
diff --git a/tests/legacy-cli/e2e/tests/build/delete-output-path.ts b/tests/legacy-cli/e2e/tests/build/delete-output-path.ts
index 3e8047418aa0..abb646d85d68 100644
--- a/tests/legacy-cli/e2e/tests/build/delete-output-path.ts
+++ b/tests/legacy-cli/e2e/tests/build/delete-output-path.ts
@@ -6,11 +6,6 @@ import {getGlobalVariable} from '../../utils/env';
 export default function() {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
-  // Skip this in ejected tests.
-  if (getGlobalVariable('argv').eject) {
-    return Promise.resolve();
-  }
-
   return ng('build')
     // This is supposed to fail since there's a missing file
     .then(() => deleteFile('src/app/app.component.ts'))
diff --git a/tests/legacy-cli/e2e/tests/build/deploy-url.ts b/tests/legacy-cli/e2e/tests/build/deploy-url.ts
index 929b5006c321..ff5051ae484d 100644
--- a/tests/legacy-cli/e2e/tests/build/deploy-url.ts
+++ b/tests/legacy-cli/e2e/tests/build/deploy-url.ts
@@ -27,8 +27,6 @@ export default function () {
       /__webpack_require__\.p = "deployUrl\/";/));
     // // verify slash is appended to the end of --deploy-url if missing
     // .then(() => ng('build', '--deploy-url=deployUrl', '--extract-css=false'))
-    // // skip this in ejected tests
-    // .then(() => getGlobalVariable('argv').eject
-    //   ? Promise.resolve()
-    //   : expectFileToMatch('dist/test-project/untime.js', /__webpack_require__\.p = "deployUrl\/";/));
+    // .then(() =>
+    //   expectFileToMatch('dist/test-project/untime.js', /__webpack_require__\.p = "deployUrl\/";/));
 }
diff --git a/tests/legacy-cli/e2e/tests/build/eval-sourcemap.ts b/tests/legacy-cli/e2e/tests/build/eval-sourcemap.ts
index 2c62f4b25fde..37c811700c5b 100644
--- a/tests/legacy-cli/e2e/tests/build/eval-sourcemap.ts
+++ b/tests/legacy-cli/e2e/tests/build/eval-sourcemap.ts
@@ -1,16 +1,10 @@
 import {execAndWaitForOutputToMatch, killAllProcesses} from '../../utils/process';
-import {getGlobalVariable} from '../../utils/env';
 
 
 export default function() {
   // TODO(architect): Dev-server does not yet do this. Fix, reenable, validate, then delete this test.
   return;
 
-  // Skip this in ejected tests.
-  if (getGlobalVariable('argv').eject) {
-    return Promise.resolve();
-  }
-
   return Promise.resolve()
     // Check that ng serve has eval sourcemaps by default.
     .then(() => execAndWaitForOutputToMatch('ng', ['serve'], /: Compiled successfully/))
diff --git a/tests/legacy-cli/e2e/tests/build/json.ts b/tests/legacy-cli/e2e/tests/build/json.ts
index f67f50fd2bfd..d47e9aa9cf3d 100644
--- a/tests/legacy-cli/e2e/tests/build/json.ts
+++ b/tests/legacy-cli/e2e/tests/build/json.ts
@@ -7,11 +7,6 @@ import {getGlobalVariable} from '../../utils/env';
 export default function() {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
-  // Skip this in ejected tests.
-  if (getGlobalVariable('argv').eject) {
-    return Promise.resolve();
-  }
-
   return ng('build', '--stats-json')
     .then(() => expectFileToExist('./dist/test-project/stats.json'))
     .then(() => expectGitToBeClean());
diff --git a/tests/legacy-cli/e2e/tests/build/output-dir.ts b/tests/legacy-cli/e2e/tests/build/output-dir.ts
index 5b245bb3d983..26ed3c38f306 100644
--- a/tests/legacy-cli/e2e/tests/build/output-dir.ts
+++ b/tests/legacy-cli/e2e/tests/build/output-dir.ts
@@ -9,11 +9,6 @@ import {expectToFail} from '../../utils/utils';
 export default function() {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
-  // Skip this in ejected tests.
-  if (getGlobalVariable('argv').eject) {
-    return Promise.resolve();
-  }
-
   return ng('build', '--output-path', 'build-output')
     .then(() => expectFileToExist('./build-output/index.html'))
     .then(() => expectFileToExist('./build-output/main.js'))
diff --git a/tests/legacy-cli/e2e/tests/build/platform-server.ts b/tests/legacy-cli/e2e/tests/build/platform-server.ts
index 1aeab4b099a6..3c7ab71a42b7 100644
--- a/tests/legacy-cli/e2e/tests/build/platform-server.ts
+++ b/tests/legacy-cli/e2e/tests/build/platform-server.ts
@@ -14,11 +14,6 @@ import { readNgVersion } from '../../utils/version';
 import { expectToFail } from '../../utils/utils';
 
 export default function () {
-  // Skip this for ejected tests.
-  if (getGlobalVariable('argv').eject) {
-    return Promise.resolve();
-  }
-
   let platformServerVersion = readNgVersion();
   let httpVersion = readNgVersion();
 
diff --git a/tests/legacy-cli/e2e/tests/build/prod-build.ts b/tests/legacy-cli/e2e/tests/build/prod-build.ts
index 674f77161f3a..72e9f9b88fff 100644
--- a/tests/legacy-cli/e2e/tests/build/prod-build.ts
+++ b/tests/legacy-cli/e2e/tests/build/prod-build.ts
@@ -9,9 +9,6 @@ import {getGlobalVariable} from '../../utils/env';
 export default function() {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
-  // Skip this in ejected tests.
-  const ejected = getGlobalVariable('argv').eject;
-
   // Can't use the `ng` helper because somewhere the environment gets
   // stuck to the first build done
   return ng('build', '--prod')
@@ -26,5 +23,5 @@ export default function() {
       expectFileToMatch(`dist/test-project/${main}`, /bootstrapModuleFactory\(/);
     })
     // Check that the process didn't change local files.
-    .then(() => !ejected && expectGitToBeClean());
+    .then(() => expectGitToBeClean());
 }
diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-css-change.ts b/tests/legacy-cli/e2e/tests/build/rebuild-css-change.ts
index 5104466a77b0..739e946bd8ff 100644
--- a/tests/legacy-cli/e2e/tests/build/rebuild-css-change.ts
+++ b/tests/legacy-cli/e2e/tests/build/rebuild-css-change.ts
@@ -14,11 +14,6 @@ export default function() {
   if (process.platform.startsWith('win')) {
     return Promise.resolve();
   }
-  // Skip this in ejected tests.
-  if (getGlobalVariable('argv').eject) {
-    return Promise.resolve();
-  }
-
 
   return execAndWaitForOutputToMatch('ng', ['serve'], webpackGoodRegEx)
     // Should trigger a rebuild.
diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-deps-type-check.ts b/tests/legacy-cli/e2e/tests/build/rebuild-deps-type-check.ts
index db433abfb735..c73e9e983aa4 100644
--- a/tests/legacy-cli/e2e/tests/build/rebuild-deps-type-check.ts
+++ b/tests/legacy-cli/e2e/tests/build/rebuild-deps-type-check.ts
@@ -18,10 +18,6 @@ export default function() {
   if (process.platform.startsWith('win')) {
     return Promise.resolve();
   }
-  // Skip this in ejected tests.
-  if (getGlobalVariable('argv').eject) {
-    return Promise.resolve();
-  }
 
   return Promise.resolve()
     // Create and import files.
diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-error.ts b/tests/legacy-cli/e2e/tests/build/rebuild-error.ts
index f282d25d7434..ac5070a29e40 100644
--- a/tests/legacy-cli/e2e/tests/build/rebuild-error.ts
+++ b/tests/legacy-cli/e2e/tests/build/rebuild-error.ts
@@ -25,10 +25,6 @@ export default function () {
   if (process.platform.startsWith('win')) {
     return Promise.resolve();
   }
-  // Skip this in ejected tests.
-  if (getGlobalVariable('argv').eject) {
-    return Promise.resolve();
-  }
 
   // Skip this test in Angular 2/4.
   if (getGlobalVariable('argv').ng2 || getGlobalVariable('argv').ng4) {
diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-ngfactories.ts b/tests/legacy-cli/e2e/tests/build/rebuild-ngfactories.ts
index 5af00acbc546..1828ca8efaf7 100644
--- a/tests/legacy-cli/e2e/tests/build/rebuild-ngfactories.ts
+++ b/tests/legacy-cli/e2e/tests/build/rebuild-ngfactories.ts
@@ -16,10 +16,6 @@ export default function () {
   if (process.platform.startsWith('win')) {
     return Promise.resolve();
   }
-  // Skip this in ejected tests.
-  if (getGlobalVariable('argv').eject) {
-    return Promise.resolve();
-  }
 
   // Skip this test in Angular 2/4.
   if (getGlobalVariable('argv').ng2 || getGlobalVariable('argv').ng4) {
diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-types.ts b/tests/legacy-cli/e2e/tests/build/rebuild-types.ts
index 4f9a56e36e8c..4056dee0b802 100644
--- a/tests/legacy-cli/e2e/tests/build/rebuild-types.ts
+++ b/tests/legacy-cli/e2e/tests/build/rebuild-types.ts
@@ -15,10 +15,6 @@ export default async function() {
   if (process.platform.startsWith('win')) {
     return;
   }
-  // Skip this in ejected tests.
-  if (getGlobalVariable('argv').eject) {
-    return;
-  }
 
   await writeFile('src/app/type.ts', `export type MyType = number;`);
   await prependToFile('src/app/app.component.ts', 'import { MyType } from "./type";\n');
diff --git a/tests/legacy-cli/e2e/tests/build/service-worker.ts b/tests/legacy-cli/e2e/tests/build/service-worker.ts
index ff2d165256ba..670f40e1e4df 100644
--- a/tests/legacy-cli/e2e/tests/build/service-worker.ts
+++ b/tests/legacy-cli/e2e/tests/build/service-worker.ts
@@ -23,11 +23,6 @@ const MANIFEST = {
 };
 
 export default function() {
-  // Skip this in ejected tests.
-  if (getGlobalVariable('argv').eject) {
-    return Promise.resolve();
-  }
-
   // Can't use the `ng` helper because somewhere the environment gets
   // stuck to the first build done
   return silentNpm('remove', '@angular/service-worker')
@@ -46,12 +41,4 @@ export default function() {
     .then(() => ng('build', '--optimization'))
     .then(() => expectFileToExist('dist/test-project/safety-worker.js'))
     .then(() => expectFileToExist('dist/test-project/worker-basic.min.js'));
-    // WEBPACK4_DISABLED - eject temporarily disabled for webpack 4 integration
-    // .then(() => ng('eject', '--prod'))
-    // .then(() => silentNpm('install'))
-    // .then(() => npm('run', 'build'))
-    // .then(() => expectFileToMatch('package.json', /"sw-config"/))
-    // .then(() => expectFileToExist(join(process.cwd(), 'dist/ngsw-worker.js')))
-    // .then(() => expectFileToExist(join(process.cwd(), 'dist/ngsw.json')))
-    // .then(() => ng('set', 'apps.0.serviceWorker=false'));
 }
diff --git a/tests/legacy-cli/e2e/tests/build/styles/imports.ts b/tests/legacy-cli/e2e/tests/build/styles/imports.ts
index c7a5f7cc1e26..41bb0dc4b571 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/imports.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/imports.ts
@@ -12,9 +12,6 @@ import { getGlobalVariable } from '../../../utils/env';
 export default function () {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
-  // Disable parts of it in webpack tests.
-  const ejected = getGlobalVariable('argv').eject;
-
   const extensions = ['css', 'scss', 'less', 'styl'];
   let promise = Promise.resolve();
 
@@ -64,7 +61,7 @@ export default function () {
         .then(() => expectFileToMatch('dist/test-project/main.js',
           /h1.*background:\s*#000+/))
         // Also check imports work on ng test
-        .then(() => !ejected && ng('test', '--watch=false'))
+        .then(() => ng('test', '--watch=false'))
         .then(() => updateJsonFile('angular.json', workspaceJson => {
           const appArchitect = workspaceJson.projects['test-project'].architect;
           appArchitect.build.options.styles = [
diff --git a/tests/legacy-cli/e2e/tests/commands/build/build-outdir.ts b/tests/legacy-cli/e2e/tests/commands/build/build-outdir.ts
index 38de272bdeff..e83b6b04552b 100644
--- a/tests/legacy-cli/e2e/tests/commands/build/build-outdir.ts
+++ b/tests/legacy-cli/e2e/tests/commands/build/build-outdir.ts
@@ -12,6 +12,5 @@ export default function() {
       appArchitect.build.options.outputPath = './';
     }))
     .then(() => expectToFail(() => ng('build')))
-    .then(() => expectToFail(() => ng('serve')))
-    .then(() => expectToFail(() => ng('eject')));
+    .then(() => expectToFail(() => ng('serve')));
 }
diff --git a/tests/legacy-cli/e2e/utils/process.ts b/tests/legacy-cli/e2e/utils/process.ts
index 31bd37a724ff..0864042796f1 100644
--- a/tests/legacy-cli/e2e/utils/process.ts
+++ b/tests/legacy-cli/e2e/utils/process.ts
@@ -181,24 +181,11 @@ export function execAndWaitForOutputToMatch(cmd: string, args: string[], match:
   }
 }
 
-let npmInstalledEject = false;
 export function ng(...args: string[]) {
   const argv = getGlobalVariable('argv');
   const maybeSilentNg = argv['nosilent'] ? noSilentNg : silentNg;
   if (['build', 'serve', 'test', 'e2e', 'xi18n'].indexOf(args[0]) != -1) {
-    // If we have the --eject, use webpack for the test.
-    if (args[0] == 'build' && argv.eject) {
-      return maybeSilentNg('eject', ...args.slice(1), '--force')
-        .then(() => {
-          if (!npmInstalledEject) {
-            npmInstalledEject = true;
-            // We need to delete node_modules, then run npm install on the first eject.
-            return rimraf('node_modules').then(() => silentNpm('install'));
-          }
-        })
-        .then(() => rimraf('dist'))
-        .then(() => _exec({silent: true}, 'node_modules/.bin/webpack', []));
-    } else if (args[0] == 'e2e') {
+    if (args[0] == 'e2e') {
       // Wait 1 second before running any end-to-end test.
       return new Promise(resolve => setTimeout(resolve, 1000))
         .then(() => maybeSilentNg(...args));
diff --git a/tests/legacy-cli/e2e_runner.ts b/tests/legacy-cli/e2e_runner.ts
index 841de902654d..5bb117aa8db5 100644
--- a/tests/legacy-cli/e2e_runner.ts
+++ b/tests/legacy-cli/e2e_runner.ts
@@ -46,7 +46,6 @@ const argv = minimist(process.argv.slice(2), {
   'boolean': [
     'appveyor',
     'debug',
-    'eject',
     'ng-snapshots',
     'noglobal',
     'nosilent',

From 5016843c39a6afdb5edb7c1bd9fa8a0c90e3f9a6 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 15 Feb 2019 12:03:09 -0500
Subject: [PATCH 0756/1703] style(@angular-devkit/build-angular): remove
 comment reference to eject

---
 packages/angular_devkit/build_angular/src/protractor/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/protractor/index.ts b/packages/angular_devkit/build_angular/src/protractor/index.ts
index 8e37fc796ddb..bf28fcfbf733 100644
--- a/packages/angular_devkit/build_angular/src/protractor/index.ts
+++ b/packages/angular_devkit/build_angular/src/protractor/index.ts
@@ -135,7 +135,7 @@ export class ProtractorBuilder implements Builder<ProtractorBuilderOptions> {
     }
 
     // run `webdriver-manager update --standalone false --gecko false --quiet`
-    // if you change this, update the command comment in prev line, and in `eject` task
+    // if you change this, update the command comment in prev line
     return from(webdriverUpdate.program.run({
       standalone: false,
       gecko: false,

From 91f5be769d51081737a90b4bb848f1c6fc4e9162 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 13 Feb 2019 13:11:27 +0000
Subject: [PATCH 0757/1703] fix(@ngtools/webpack): don't load ngfactories for
 lazy routes with Ivy

Supersedes https://github.com/angular/angular-cli/pull/13524
---
 .../webpack/src/angular_compiler_plugin.ts    |  6 ++++-
 .../e2e/tests/experimental/ivy-lazy-load.ts   | 27 +++++++++++++++++++
 tests/legacy-cli/e2e_runner.ts                |  6 +++--
 3 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 37f687df5c84..06a751ed635f 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -500,10 +500,14 @@ export class AngularCompilerPlugin {
         const lazyRouteTSFile = discoveredLazyRoutes[lazyRouteKey].replace(/\\/g, '/');
         let modulePath: string, moduleKey: string;
 
-        if (this._JitMode) {
+        if (this._JitMode ||
+          // When using Ivy and not using allowEmptyCodegenFiles, factories are not generated.
+          (this._compilerOptions.enableIvy && !this._compilerOptions.allowEmptyCodegenFiles)
+        ) {
           modulePath = lazyRouteTSFile;
           moduleKey = `${lazyRouteModule}${moduleName ? '#' + moduleName : ''}`;
         } else {
+          // NgFactories are only used with AOT on ngc (legacy) mode.
           modulePath = lazyRouteTSFile.replace(/(\.d)?\.tsx?$/, '');
           modulePath += '.ngfactory.js';
           const factoryModuleName = moduleName ? `#${moduleName}NgFactory` : '';
diff --git a/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts b/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts
new file mode 100644
index 000000000000..f4225a38212c
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts
@@ -0,0 +1,27 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { readdirSync } from 'fs';
+import { prependToFile, replaceInFile } from '../../utils/fs';
+import { ng } from '../../utils/process';
+import { createProject } from '../../utils/project';
+
+export default async function() {
+  await createProject('ivy-project', '--experimental-ivy');
+
+  await ng('generate', 'module', 'lazy', '--routing');
+  await prependToFile('src/app/app.module.ts', `import { RouterModule } from '@angular/router';`);
+  await replaceInFile('src/app/app.module.ts', 'imports: [', `imports: [
+    RouterModule.forRoot([{ path: "lazy", loadChildren: "src/app/lazy/lazy.module#LazyModule" }]),
+  `);
+  await ng('build', '--named-chunks', '--aot');
+  const distFiles = await readdirSync('dist/ivy-project');
+  if (!distFiles.includes('lazy-lazy-module.js')
+    || distFiles.includes('lazy-lazy-module-ngfactory.js')) {
+    throw new Error('The lazy module chunk should not be a ngfactory.');
+  }
+}
diff --git a/tests/legacy-cli/e2e_runner.ts b/tests/legacy-cli/e2e_runner.ts
index 5bb117aa8db5..a7e741c5ffed 100644
--- a/tests/legacy-cli/e2e_runner.ts
+++ b/tests/legacy-cli/e2e_runner.ts
@@ -129,7 +129,9 @@ allTests = allTests
   // NEEDS devkit change
   .filter(name => !name.endsWith('/existing-directory.ts'))
   // Disabled on rc.0 due to needed sync with devkit for changes.
-  .filter(name => !name.endsWith('/service-worker.ts'));
+  .filter(name => !name.endsWith('/service-worker.ts'))
+  // Lazy load support is WIP https://github.com/angular/angular/pull/28685
+  .filter(name => !name.endsWith('tests/experimental/ivy-lazy-load.ts'));
 
 if (argv.ivy) {
   // These tests are disabled on the Ivy-only CI job because:
@@ -142,7 +144,7 @@ if (argv.ivy) {
     // Ivy doesn't support i18n externally at the moment.
     .filter(name => !name.includes('tests/i18n/'))
     .filter(name => !name.endsWith('tests/build/aot/aot-i18n.ts'))
-    // Lazy load support is WIP https://github.com/angular/angular-cli/pull/13524
+    // Lazy load support is WIP https://github.com/angular/angular/pull/28685
     .filter(name => !name.endsWith('tests/misc/lazy-module.ts'))
     // We don't have a library consumption story yet for Ivy.
     .filter(name => !name.endsWith('tests/generate/library/library-consumption.ts'));

From 32d85622ed96a82481d822fe587fa027ff38ecab Mon Sep 17 00:00:00 2001
From: Louis Larry <louis.larry@gmail.com>
Date: Thu, 24 Jan 2019 08:37:26 +0700
Subject: [PATCH 0758/1703] fix(@angular-devkit/schematics): add aliases to
 collection-schema.json

---
 packages/angular_devkit/schematics/collection-schema.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/angular_devkit/schematics/collection-schema.json b/packages/angular_devkit/schematics/collection-schema.json
index 83ad73562af6..497504442015 100644
--- a/packages/angular_devkit/schematics/collection-schema.json
+++ b/packages/angular_devkit/schematics/collection-schema.json
@@ -26,6 +26,12 @@
       "additionalProperties": {
         "type": "object",
         "properties": {
+          "aliases": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
           "factory": {
             "type": "string",
             "description": "A folder or file path to the schematic factory"

From 040dcb8365d528e0d0d5ef8ddd27b631c63db918 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@umich.edu>
Date: Sun, 17 Feb 2019 17:22:21 +0800
Subject: [PATCH 0759/1703] feat(@schematics/angular): Update rxjs to 6.4.0

6.4.0 is needed so that Bazel does not have to build rxjs from source

See [angular/angular#28720](https://github.com/angular/angular/pull/28720)
---
 packages/schematics/angular/utility/latest-versions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 2a04497d1408..2e8ebd5c73c2 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -9,7 +9,7 @@
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
   Angular: '~8.0.0-beta.0',
-  RxJs: '~6.3.3',
+  RxJs: '~6.4.0',
   ZoneJs: '~0.8.26',
   TypeScript: '~3.2.2',
   TsLib: '^1.9.0',

From 1bba17fa0d40f7e15f91dec08da67486a26c0f06 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 16 Feb 2019 06:50:18 +0000
Subject: [PATCH 0760/1703] build: update webpack to version 4.29.4

---
 .../angular_devkit/build_angular/package.json |   2 +-
 .../angular_devkit/build_webpack/package.json |   2 +-
 packages/ngtools/webpack/package.json         |   2 +-
 yarn.lock                                     | 304 +++++++++---------
 4 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 012bd0c093ce..d77f15991826 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -44,7 +44,7 @@
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.2.2",
-    "webpack": "4.29.3",
+    "webpack": "4.29.4",
     "webpack-dev-middleware": "3.5.2",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.2.1",
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index f69964c4a38d..7f87bf28014d 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -15,7 +15,7 @@
     "webpack-dev-server": "^3.1.4"
   },
   "devDependencies": {
-    "webpack": "4.29.3",
+    "webpack": "4.29.4",
     "webpack-dev-server": "^3.1.4"
   }
 }
\ No newline at end of file
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 64ea23a70d12..b2c9e49d93f2 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -36,6 +36,6 @@
     "@angular/compiler": "^7.2.0-rc.0",
     "@angular/compiler-cli": "^7.2.0-rc.0",
     "typescript": "3.2.4",
-    "webpack": "4.29.3"
+    "webpack": "4.29.4"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 6f418ff63082..91f7c7d4820f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -615,159 +615,154 @@
     "@types/uglify-js" "*"
     source-map "^0.6.0"
 
-"@webassemblyjs/ast@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace"
-  integrity sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==
-  dependencies:
-    "@webassemblyjs/helper-module-context" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/wast-parser" "1.7.11"
-
-"@webassemblyjs/floating-point-hex-parser@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313"
-  integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==
-
-"@webassemblyjs/helper-api-error@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a"
-  integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==
-
-"@webassemblyjs/helper-buffer@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b"
-  integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==
-
-"@webassemblyjs/helper-code-frame@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b"
-  integrity sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.7.11"
-
-"@webassemblyjs/helper-fsm@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181"
-  integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==
-
-"@webassemblyjs/helper-module-context@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209"
-  integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==
-
-"@webassemblyjs/helper-wasm-bytecode@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06"
-  integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==
-
-"@webassemblyjs/helper-wasm-section@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a"
-  integrity sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-buffer" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/wasm-gen" "1.7.11"
-
-"@webassemblyjs/ieee754@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b"
-  integrity sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==
+"@webassemblyjs/ast@1.8.2":
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.2.tgz#89297cd602cf8148e08d5fe1efbbba0cdb913ca7"
+  integrity sha512-5LLqqVsXZAhAJN0S7fTi11jwMJOjfR8290V0V7BWKgmZ36VVE6ZGuH4BN3eLt7LvNMIgyuYwyrPwiz6f3SGlBQ==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.8.2"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.2"
+    "@webassemblyjs/wast-parser" "1.8.2"
+
+"@webassemblyjs/floating-point-hex-parser@1.8.2":
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.2.tgz#c304fac0e5c2dd69a6d0f29000f4d6c4bf583203"
+  integrity sha512-5WIj+pSzbs8ao7NM31xFcGeOSnXgpCikmCFRYkXygVDqVaXTq/Hr9roqarUVMNfAegNc61oKEhe3pi+HUCXJEw==
+
+"@webassemblyjs/helper-api-error@1.8.2":
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.2.tgz#e4c5325b264f08513bcf0e48cf3c0a3ea690b508"
+  integrity sha512-TJBDJPXO9DSC4qf5FZT0VFlTdJSm4DKxzcoyWwVike1aQQQEbCk167MJxYLi0SuHeOtULLtDDSZL7yDL3XXMKA==
+
+"@webassemblyjs/helper-buffer@1.8.2":
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.2.tgz#c133435f8482240fab1994151c09d7bdd7b8f5a8"
+  integrity sha512-6fTynU6b0bC+yBH7+M6/BBRZId4F1fIuX00G1ZX45EAQOrB8p4TK5bccAEPG2vuyvnd4tgB1/4cYXq5GpszMGA==
+
+"@webassemblyjs/helper-code-frame@1.8.2":
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.2.tgz#def3d079fe6ce38d997e939af3ed6cc3a37ff0f8"
+  integrity sha512-5beYTZS4Wsscu8ys2cLZ0SiToEe1wNitzrV/jCr02wGPOcpPHf0ERImR6iBGe/LX0O2cV9Pgi78hFp5WfNKeAg==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.8.2"
+
+"@webassemblyjs/helper-fsm@1.8.2":
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.2.tgz#7d1a8186c51df38d39e8a742aafdd002965d397c"
+  integrity sha512-7xRO1lFNj1fGm+ik73n8TuWXKeAqTuqeApqnxWnW+nI2lPyj4awrt+n1XkQr8OwmVK7mFJSRuTZc568qtgOyzQ==
+
+"@webassemblyjs/helper-module-context@1.8.2":
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.2.tgz#3bfb0e7b889876bb8a7d1ccadca47e013721163e"
+  integrity sha512-EBr+n9M2F7PQ02s0f87KnSPva0KlT2S4IGDP+7aYqt2FCaMZzCtXcVahGSGg3ESZBSD0gzFU4486zD7SUsSD0Q==
+
+"@webassemblyjs/helper-wasm-bytecode@1.8.2":
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.2.tgz#72a7fc29949af10d2960338fc84192df23ef030e"
+  integrity sha512-gS0trUUPYevbs5Rsv9E+VbzDuZ9KB4Tu/QymTfHtnSDpX4wxhs9u9/y/KiH84r0Z4xvm8/pqWnGvM77oxSPHYw==
+
+"@webassemblyjs/helper-wasm-section@1.8.2":
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.2.tgz#4b36c105bfcc3dbabea9e8d04617127b3178f92f"
+  integrity sha512-HLHOR6/Vc+f5UziOUNQ3f5YedCMCuU46BdMEhjQBQwlOWqVAxgwqUn/KJkuhMvvjQ2FkASaDup8ohZrjyCKDKg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.2"
+    "@webassemblyjs/helper-buffer" "1.8.2"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.2"
+    "@webassemblyjs/wasm-gen" "1.8.2"
+
+"@webassemblyjs/ieee754@1.8.2":
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.2.tgz#43f8969f90e08b70101f35c93df07afaca5c9d5a"
+  integrity sha512-v9RtqGJ+z8UweiRh47DheXVtV0d/o9sQfXzAX1/1n/nw5G85yEQJdHcmwiRdu+SXmqlZQeymsnmve2oianzW4g==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63"
-  integrity sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==
-  dependencies:
-    "@xtuc/long" "4.2.1"
-
-"@webassemblyjs/utf8@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82"
-  integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==
-
-"@webassemblyjs/wasm-edit@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005"
-  integrity sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-buffer" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/helper-wasm-section" "1.7.11"
-    "@webassemblyjs/wasm-gen" "1.7.11"
-    "@webassemblyjs/wasm-opt" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
-    "@webassemblyjs/wast-printer" "1.7.11"
-
-"@webassemblyjs/wasm-gen@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8"
-  integrity sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/ieee754" "1.7.11"
-    "@webassemblyjs/leb128" "1.7.11"
-    "@webassemblyjs/utf8" "1.7.11"
-
-"@webassemblyjs/wasm-opt@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7"
-  integrity sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-buffer" "1.7.11"
-    "@webassemblyjs/wasm-gen" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
-
-"@webassemblyjs/wasm-parser@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a"
-  integrity sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-api-error" "1.7.11"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
-    "@webassemblyjs/ieee754" "1.7.11"
-    "@webassemblyjs/leb128" "1.7.11"
-    "@webassemblyjs/utf8" "1.7.11"
-
-"@webassemblyjs/wast-parser@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c"
-  integrity sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/floating-point-hex-parser" "1.7.11"
-    "@webassemblyjs/helper-api-error" "1.7.11"
-    "@webassemblyjs/helper-code-frame" "1.7.11"
-    "@webassemblyjs/helper-fsm" "1.7.11"
-    "@xtuc/long" "4.2.1"
-
-"@webassemblyjs/wast-printer@1.7.11":
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813"
-  integrity sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==
-  dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/wast-parser" "1.7.11"
-    "@xtuc/long" "4.2.1"
+"@webassemblyjs/leb128@1.8.2":
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.2.tgz#d32c149f196d4fbb639dfec9557e5e950f8e5ae4"
+  integrity sha512-41zX+6xpo6G2bkq3mdr+K5nXx5OOL6V979ucbLyq1ra5dFI3ReLiw6+HOCF5ih0t5HMQVIQBhInZIdxqcpc/Qg==
+  dependencies:
+    long "git://github.com/dcodeIO/long.js.git#8181a6b50a2a230f0b2a1e4c4093f9b9d19c8b69"
+
+"@webassemblyjs/utf8@1.8.2":
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.2.tgz#6b262c1cba9052a8fd01a63eea50265ccd7f3b16"
+  integrity sha512-fP2Q4igo9/R82xeVra+zIQOjnmknSiAhykg//fz7c1UjghzoutQtldcbKOaL0+0j31RRFMDHgrUL+12RQExOYg==
+
+"@webassemblyjs/wasm-edit@1.8.2":
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.2.tgz#3d3bbf10c46084e6525a1d9e2476bd072f0edd5b"
+  integrity sha512-rM1sgdLQrXQs4ZapglK86mW8QMml0FJ+jwZ5961sEmHISTkJRvheILuzA9jcKy5vwhWgkPf/nIhO2I6A9rkGww==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.2"
+    "@webassemblyjs/helper-buffer" "1.8.2"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.2"
+    "@webassemblyjs/helper-wasm-section" "1.8.2"
+    "@webassemblyjs/wasm-gen" "1.8.2"
+    "@webassemblyjs/wasm-opt" "1.8.2"
+    "@webassemblyjs/wasm-parser" "1.8.2"
+    "@webassemblyjs/wast-printer" "1.8.2"
+
+"@webassemblyjs/wasm-gen@1.8.2":
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.2.tgz#389670ade8398275cbf7c7c92e38f6f5eadc4c1a"
+  integrity sha512-WTBesrMydDwJbbB48OZGcMq6zDsT6CJd1UalvGuXtHJLargazOron+JBdmt8Nnd+Z2s3TPfCPP54EpQBsDVR7Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.2"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.2"
+    "@webassemblyjs/ieee754" "1.8.2"
+    "@webassemblyjs/leb128" "1.8.2"
+    "@webassemblyjs/utf8" "1.8.2"
+
+"@webassemblyjs/wasm-opt@1.8.2":
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.2.tgz#967019ac1b6d577177d241b912f61f01122d6b49"
+  integrity sha512-tzXn0xNQNyoUBr1+O1rwYXZd2bcUdXSOUTu0fLAIPl01dcTY6hjIi2B2DXYqk9OVQRnjPyX2Ew6rkeCTxfaYaQ==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.2"
+    "@webassemblyjs/helper-buffer" "1.8.2"
+    "@webassemblyjs/wasm-gen" "1.8.2"
+    "@webassemblyjs/wasm-parser" "1.8.2"
+
+"@webassemblyjs/wasm-parser@1.8.2":
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.2.tgz#7a9d587a3edab32fc800dc9498bdbdf90896bb79"
+  integrity sha512-uc6nVjvUjZzHa8fSl0ko684puuw0ujfCYn19v5tTu0DQ7tXx9jlZXzYw0aW7fmROxyez7BcbJloYLmXg723vVQ==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.2"
+    "@webassemblyjs/helper-api-error" "1.8.2"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.2"
+    "@webassemblyjs/ieee754" "1.8.2"
+    "@webassemblyjs/leb128" "1.8.2"
+    "@webassemblyjs/utf8" "1.8.2"
+
+"@webassemblyjs/wast-parser@1.8.2":
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.2.tgz#c3ded4de843756ab5f435c422a36fdd48aa518ad"
+  integrity sha512-idk8cCqM+T6/iIxoQCOz85vKvWhyHghJbICob/H1AN8byN1O6a2Jxk+g1ZJA7sZDc6/q8pYV6dVkHKgm8y1oUA==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.2"
+    "@webassemblyjs/floating-point-hex-parser" "1.8.2"
+    "@webassemblyjs/helper-api-error" "1.8.2"
+    "@webassemblyjs/helper-code-frame" "1.8.2"
+    "@webassemblyjs/helper-fsm" "1.8.2"
+    long "git://github.com/dcodeIO/long.js.git#8181a6b50a2a230f0b2a1e4c4093f9b9d19c8b69"
+
+"@webassemblyjs/wast-printer@1.8.2":
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.2.tgz#a7dbb0e6eba3721fd06a949ac1917fd289b3db4d"
+  integrity sha512-TENFBgf5bKKfs2LbW8fd/0xvamccbEHoR83lQlEP7Qi0nkpXAP77VpvIITy0J+UZAa/Y3j6K6MPw1tNMbdjf4A==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.2"
+    "@webassemblyjs/wast-parser" "1.8.2"
+    long "git://github.com/dcodeIO/long.js.git#8181a6b50a2a230f0b2a1e4c4093f9b9d19c8b69"
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
   integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
 
-"@xtuc/long@4.2.1":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
-  integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
-
 "@yarnpkg/lockfile@1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
@@ -6086,6 +6081,11 @@ loglevel@^1.4.1:
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
   integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
 
+"long@git://github.com/dcodeIO/long.js.git#8181a6b50a2a230f0b2a1e4c4093f9b9d19c8b69":
+  version "4.0.1"
+  uid "8181a6b50a2a230f0b2a1e4c4093f9b9d19c8b69"
+  resolved "git://github.com/dcodeIO/long.js.git#8181a6b50a2a230f0b2a1e4c4093f9b9d19c8b69"
+
 long@~3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
@@ -10585,15 +10585,15 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.29.3:
-  version "4.29.3"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.3.tgz#e0b406a7b4201ed5e4fb4f84fd7359f9a7db4647"
-  integrity sha512-xPJvFeB+8tUflXFq+OgdpiSnsCD5EANyv56co5q8q8+YtEasn5Sj3kzY44mta+csCIEB0vneSxnuaHkOL2h94A==
+webpack@4.29.4:
+  version "4.29.4"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.4.tgz#c0a2a12635142015f931b92efee7de6559f264dd"
+  integrity sha512-Uu/QgPFZG+w+5wjWIFBgIy+g9vOF3QiLmT2Bl783MQSLjRF/K+GMv2TH3TVNFyPQVEHY8rVnPoQtcqrnqK2H7Q==
   dependencies:
-    "@webassemblyjs/ast" "1.7.11"
-    "@webassemblyjs/helper-module-context" "1.7.11"
-    "@webassemblyjs/wasm-edit" "1.7.11"
-    "@webassemblyjs/wasm-parser" "1.7.11"
+    "@webassemblyjs/ast" "1.8.2"
+    "@webassemblyjs/helper-module-context" "1.8.2"
+    "@webassemblyjs/wasm-edit" "1.8.2"
+    "@webassemblyjs/wasm-parser" "1.8.2"
     acorn "^6.0.5"
     acorn-dynamic-import "^4.0.0"
     ajv "^6.1.0"

From 33bade74af286976cb89c2eab8ba3b309e250fce Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Mon, 18 Feb 2019 07:43:06 -0800
Subject: [PATCH 0761/1703] release: v8.0.0-beta.1

---
 .monorepo.json | 76 +++++++++++++++++++++++++-------------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index b3952e269f9b..fc3e14f82f02 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,16 +42,16 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.14.0-beta.0",
-      "hash": "5225044ecf49d630564a68b710f6b82f"
+      "version": "0.14.0-beta.1",
+      "hash": "ed6f2ae751fd3db351a20ae55349e8ad"
     },
     "@_/builders": {
-      "version": "0.14.0-beta.0",
-      "hash": "f34470f978203f13c312094472b0a343"
+      "version": "0.14.0-beta.1",
+      "hash": "569aef8bc23693c344e71b9755e62c50"
     },
     "devkit": {
-      "version": "0.14.0-beta.0",
-      "hash": "fffa4754a8961c7ba96f239e123a318e"
+      "version": "0.14.0-beta.1",
+      "hash": "5a304dda98fa5ef5cda65c81f10757ae"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -62,15 +62,15 @@
           "url": "/packages/angular/cli/README.md"
         }
       ],
-      "version": "8.0.0-beta.0",
+      "version": "8.0.0-beta.1",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "20c8f4273a7193547c18a7f6932821aa"
+      "hash": "47e185bb406b8b1a2791bd93b3881103"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.14.0-beta.0",
-      "hash": "cb7dc6cb2234e386312191e8c34bfe8d",
+      "version": "0.14.0-beta.1",
+      "hash": "44a555d64768f0ed1bc00b87e2b6e7b2",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -81,21 +81,21 @@
           "url": "/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.14.0-beta.0",
-      "hash": "fe48b17f505ea8e25c42d1ed56675678",
+      "version": "0.14.0-beta.1",
+      "hash": "e2f0e9f241ca20b832a104df98208d5a",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.14.0-beta.0",
-      "hash": "4083882f4d9f75d508f8bc7f7cac41ba",
+      "version": "0.14.0-beta.1",
+      "hash": "1d57d845c9724dab1b2199cf1285cc8d",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
       "name": "Benchmark",
       "section": "Tooling",
-      "version": "1.2.0-beta.0",
-      "hash": "9c7b0dfb36d6bcce8bed49229983ae06"
+      "version": "1.2.0-beta.1",
+      "hash": "5e33515b5f25323b0aa481f0f9eff5be"
     },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
@@ -105,8 +105,8 @@
           "url": "/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.14.0-beta.0",
-      "hash": "a161a1260ca78180d05fa9d15fffd3bb",
+      "version": "0.14.0-beta.1",
+      "hash": "c5c1fbd350c66295c067a22dbf07d9bc",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -117,8 +117,8 @@
           "url": "/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.14.0-beta.0",
-      "hash": "169e19ba11205591f060580bbb12d173",
+      "version": "0.14.0-beta.1",
+      "hash": "3a5d81adb4814eb343404259921f0c25",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -129,8 +129,8 @@
           "url": "/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.14.0-beta.0",
-      "hash": "e93941d8f914b5343bbf6ef560a1e618",
+      "version": "0.14.0-beta.1",
+      "hash": "52feb0fa93e6b81ca398912c6935aced",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -141,9 +141,9 @@
           "url": "/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.14.0-beta.0",
+      "version": "0.14.0-beta.1",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "7591415bda6620b1bf8591e10e917790"
+      "hash": "b33b6932f7993c027de4ebbecfaf6e33"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -153,8 +153,8 @@
           "url": "/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "8.0.0-beta.0",
-      "hash": "f77c01a3ada695d086cdbc51eab279e3",
+      "version": "8.0.0-beta.1",
+      "hash": "91fe1fdcc7d07fe5361706b69ebd16a4",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -165,43 +165,43 @@
           "url": "/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "8.0.0-beta.0",
-      "hash": "364c25476faaa91051a1980bd5188b65",
+      "version": "8.0.0-beta.1",
+      "hash": "9d009b19ea6c5c18429ff795aad2ed80",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.14.0-beta.0",
-      "hash": "0667d56180e64950473c3e26193088e6",
+      "version": "0.14.0-beta.1",
+      "hash": "3d260a0e40c45524a94b700bb0c27993",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "8.0.0-beta.0",
+      "version": "8.0.0-beta.1",
       "section": "Misc",
-      "hash": "b196c6c249af9f61dddb807ad6df5b1f",
+      "hash": "782867392b4160cc8c8c12ec36b707e9",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "8.0.0-beta.0",
-      "hash": "1bb7fd9d494f707e0572aa4f66da3bbb",
+      "version": "8.0.0-beta.1",
+      "hash": "8edc94fa4b93dcb2025c880740066c83",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.14.0-beta.0",
+      "version": "0.14.0-beta.1",
       "section": "Schematics",
-      "hash": "b55067e414fadf96b4388efaf88422cc",
+      "hash": "255662ab7cae61de381fc12a94245c25",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.14.0-beta.0",
+      "version": "0.14.0-beta.1",
       "section": "Schematics",
-      "hash": "80c58bc59c4e0909692225d897ffcf99",
+      "hash": "de121f11cd0e825d53c4ec3c3569cd33",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }

From fae77e92578f0e457ad4e0223703701c5ab8b40d Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Thu, 14 Feb 2019 08:55:51 -0800
Subject: [PATCH 0762/1703] build: vendor chalk/supports-color in third_party

Also requires vendoring its single dependency
---
 .../github.com/chalk/supports-color/BUILD     |  11 ++
 .../github.com/chalk/supports-color/index.js  | 138 ++++++++++++++++++
 .../github.com/chalk/supports-color/license   |   9 ++
 .../github.com/sindresorhus/has-flag/BUILD    |  12 ++
 .../github.com/sindresorhus/has-flag/index.js |   8 +
 .../github.com/sindresorhus/has-flag/license  |   9 ++
 third_party/README.md                         |   9 ++
 7 files changed, 196 insertions(+)
 create mode 100644 packages/angular_devkit/core/third_party/github.com/chalk/supports-color/BUILD
 create mode 100644 packages/angular_devkit/core/third_party/github.com/chalk/supports-color/index.js
 create mode 100644 packages/angular_devkit/core/third_party/github.com/chalk/supports-color/license
 create mode 100644 packages/angular_devkit/core/third_party/github.com/sindresorhus/has-flag/BUILD
 create mode 100644 packages/angular_devkit/core/third_party/github.com/sindresorhus/has-flag/index.js
 create mode 100644 packages/angular_devkit/core/third_party/github.com/sindresorhus/has-flag/license
 create mode 100644 third_party/README.md

diff --git a/packages/angular_devkit/core/third_party/github.com/chalk/supports-color/BUILD b/packages/angular_devkit/core/third_party/github.com/chalk/supports-color/BUILD
new file mode 100644
index 000000000000..746aef277348
--- /dev/null
+++ b/packages/angular_devkit/core/third_party/github.com/chalk/supports-color/BUILD
@@ -0,0 +1,11 @@
+licenses(["notice"])
+
+# Downloaded from: https://github.com/chalk/supports-color/tree/17e9579fec886a1058553b6f7529f05e4f7a90dc
+# Timestamp: 2019 Feb 14
+exports_files(["license"])
+
+filegroup(
+    name = "supports-color",
+    srcs = ["index.js"],
+    visibility = ["//:__subpackages__"],
+)
diff --git a/packages/angular_devkit/core/third_party/github.com/chalk/supports-color/index.js b/packages/angular_devkit/core/third_party/github.com/chalk/supports-color/index.js
new file mode 100644
index 000000000000..effa56d760d0
--- /dev/null
+++ b/packages/angular_devkit/core/third_party/github.com/chalk/supports-color/index.js
@@ -0,0 +1,138 @@
+'use strict';
+const os = require('os');
+const hasFlag = require('has-flag');
+
+const {env} = process;
+
+let forceColor;
+if (hasFlag('no-color') ||
+	hasFlag('no-colors') ||
+	hasFlag('color=false') ||
+	hasFlag('color=never')) {
+	forceColor = 0;
+} else if (hasFlag('color') ||
+	hasFlag('colors') ||
+	hasFlag('color=true') ||
+	hasFlag('color=always')) {
+	forceColor = 1;
+}
+if ('FORCE_COLOR' in env) {
+	if (env.FORCE_COLOR === true || env.FORCE_COLOR === 'true') {
+		forceColor = 1;
+	} else if (env.FORCE_COLOR === false || env.FORCE_COLOR === 'false') {
+		forceColor = 0;
+	} else {
+		forceColor = env.FORCE_COLOR.length === 0 ? 1 : Math.min(parseInt(env.FORCE_COLOR, 10), 3);
+	}
+}
+
+function translateLevel(level) {
+	if (level === 0) {
+		return false;
+	}
+
+	return {
+		level,
+		hasBasic: true,
+		has256: level >= 2,
+		has16m: level >= 3
+	};
+}
+
+function supportsColor(stream) {
+	if (forceColor === 0) {
+		return 0;
+	}
+
+	if (hasFlag('color=16m') ||
+		hasFlag('color=full') ||
+		hasFlag('color=truecolor')) {
+		return 3;
+	}
+
+	if (hasFlag('color=256')) {
+		return 2;
+	}
+
+	if (stream && !stream.isTTY && forceColor === undefined) {
+		return 0;
+	}
+
+	const min = forceColor || 0;
+
+	if (env.TERM === 'dumb') {
+		return min;
+	}
+
+	if (process.platform === 'win32') {
+		// Node.js 7.5.0 is the first version of Node.js to include a patch to
+		// libuv that enables 256 color output on Windows. Anything earlier and it
+		// won't work. However, here we target Node.js 8 at minimum as it is an LTS
+		// release, and Node.js 7 is not. Windows 10 build 10586 is the first Windows
+		// release that supports 256 colors. Windows 10 build 14931 is the first release
+		// that supports 16m/TrueColor.
+		const osRelease = os.release().split('.');
+		if (
+			Number(process.versions.node.split('.')[0]) >= 8 &&
+			Number(osRelease[0]) >= 10 &&
+			Number(osRelease[2]) >= 10586
+		) {
+			return Number(osRelease[2]) >= 14931 ? 3 : 2;
+		}
+
+		return 1;
+	}
+
+	if ('CI' in env) {
+		if (['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'].some(sign => sign in env) || env.CI_NAME === 'codeship') {
+			return 1;
+		}
+
+		return min;
+	}
+
+	if ('TEAMCITY_VERSION' in env) {
+		return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
+	}
+
+	if (env.COLORTERM === 'truecolor') {
+		return 3;
+	}
+
+	if ('TERM_PROGRAM' in env) {
+		const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
+
+		switch (env.TERM_PROGRAM) {
+			case 'iTerm.app':
+				return version >= 3 ? 3 : 2;
+			case 'Apple_Terminal':
+				return 2;
+			// No default
+		}
+	}
+
+	if (/-256(color)?$/i.test(env.TERM)) {
+		return 2;
+	}
+
+	if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
+		return 1;
+	}
+
+	if ('COLORTERM' in env) {
+		return 1;
+	}
+
+	return min;
+}
+
+function getSupportLevel(stream) {
+	const level = supportsColor(stream);
+	return translateLevel(level);
+}
+
+module.exports = {
+	supportsColor: getSupportLevel,
+	stdout: getSupportLevel(process.stdout),
+	stderr: getSupportLevel(process.stderr)
+};
\ No newline at end of file
diff --git a/packages/angular_devkit/core/third_party/github.com/chalk/supports-color/license b/packages/angular_devkit/core/third_party/github.com/chalk/supports-color/license
new file mode 100644
index 000000000000..e7af2f77107d
--- /dev/null
+++ b/packages/angular_devkit/core/third_party/github.com/chalk/supports-color/license
@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/packages/angular_devkit/core/third_party/github.com/sindresorhus/has-flag/BUILD b/packages/angular_devkit/core/third_party/github.com/sindresorhus/has-flag/BUILD
new file mode 100644
index 000000000000..f84eb4fcf292
--- /dev/null
+++ b/packages/angular_devkit/core/third_party/github.com/sindresorhus/has-flag/BUILD
@@ -0,0 +1,12 @@
+# TODO(alexeagle): move this file to /third_party so Bazel can enforce the licensing
+licenses(["notice"])
+
+# Downloaded from: https://github.com/sindresorhus/has-flag/tree/a6208ceaf26b5e58dbd29cb4f9e62ad02034104d
+# Timestamp: 2019 Feb 14
+exports_files(["license"])
+
+filegroup(
+    name = "has-flag",
+    srcs = ["index.js"],
+    visibility = ["//:__subpackages__"],
+)
diff --git a/packages/angular_devkit/core/third_party/github.com/sindresorhus/has-flag/index.js b/packages/angular_devkit/core/third_party/github.com/sindresorhus/has-flag/index.js
new file mode 100644
index 000000000000..6a1a0e847022
--- /dev/null
+++ b/packages/angular_devkit/core/third_party/github.com/sindresorhus/has-flag/index.js
@@ -0,0 +1,8 @@
+'use strict';
+module.exports = (flag, argv) => {
+	argv = argv || process.argv;
+	const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--');
+	const pos = argv.indexOf(prefix + flag);
+	const terminatorPos = argv.indexOf('--');
+	return pos !== -1 && (terminatorPos === -1 || pos < terminatorPos);
+};
diff --git a/packages/angular_devkit/core/third_party/github.com/sindresorhus/has-flag/license b/packages/angular_devkit/core/third_party/github.com/sindresorhus/has-flag/license
new file mode 100644
index 000000000000..e7af2f77107d
--- /dev/null
+++ b/packages/angular_devkit/core/third_party/github.com/sindresorhus/has-flag/license
@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/third_party/README.md b/third_party/README.md
new file mode 100644
index 000000000000..5fb5405151e4
--- /dev/null
+++ b/third_party/README.md
@@ -0,0 +1,9 @@
+# third_party vendored sources in Angular CLI
+
+## TL;DR: don't copy sources into this repo
+
+All sources in this repo should be authored from scratch by the committer.
+Don't copy sources you've found in any other location.
+
+For more info, see the longer version of this README:
+https://github.com/angular/angular/blob/master/third_party/README.md

From 9f33253f36de46f6cb934316fb93a2ac2fd50656 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Thu, 14 Feb 2019 12:05:43 -0800
Subject: [PATCH 0763/1703] refactor: use vendored supports-color

---
 packages/angular_devkit/core/BUILD            |  4 +-
 .../angular_devkit/core/src/terminal/caps.ts  | 94 ++-----------------
 .../github.com/chalk/supports-color/BUILD     |  6 +-
 .../chalk/supports-color/LOCAL_MODS.md        |  3 +
 .../github.com/chalk/supports-color/index.js  | 24 +++--
 third_party/README.md                         |  4 +
 6 files changed, 37 insertions(+), 98 deletions(-)
 create mode 100644 packages/angular_devkit/core/third_party/github.com/chalk/supports-color/LOCAL_MODS.md

diff --git a/packages/angular_devkit/core/BUILD b/packages/angular_devkit/core/BUILD
index 6d64bb664eaa..c164400b74cf 100644
--- a/packages/angular_devkit/core/BUILD
+++ b/packages/angular_devkit/core/BUILD
@@ -21,7 +21,9 @@ ts_library(
             "src/**/*_benchmark.ts",
         ],
     ),
-    data = glob(["**/*.json"]),
+    data = glob(["**/*.json"]) + [
+        "//packages/angular_devkit/core/third_party/github.com/chalk/supports-color",
+    ],
     module_name = "@angular-devkit/core",
     module_root = "src/index.d.ts",
     # strict_checks = False,
diff --git a/packages/angular_devkit/core/src/terminal/caps.ts b/packages/angular_devkit/core/src/terminal/caps.ts
index d27e455b9e71..2dc11534a0f0 100644
--- a/packages/angular_devkit/core/src/terminal/caps.ts
+++ b/packages/angular_devkit/core/src/terminal/caps.ts
@@ -8,7 +8,7 @@
 import ReadableStream = NodeJS.ReadableStream;
 import WriteStream = NodeJS.WriteStream;
 import Socket = NodeJS.Socket;
-
+const supportsColor = require('../../third_party/github.com/chalk/supports-color');
 
 /**
  * Node specific stuff.
@@ -29,11 +29,6 @@ declare const os: {
 };
 
 
-const _env = (typeof process == 'object' && process.env) || {};
-const _platform = (typeof process == 'object' && process.platform) || '';
-const _versions = (typeof process == 'object' && process.versions) || { node: '' };
-const _os = (typeof os == 'object' && os) || { release: () => '' };
-
 const streamMap = new WeakMap<{}, StreamCapabilities>();
 
 
@@ -72,85 +67,6 @@ export interface StreamCapabilities {
   columns: number | null;
 }
 
-
-const ciVars = ['TRAVIS', 'CIRCLECI', 'APPVEYOR', 'GITLAB_CI'];
-
-function _getColorLevel(stream: Socket): 0 | 1 | 2 | 3 {
-  if ('FORCE_COLOR' in _env) {
-    if (_env.FORCE_COLOR === '1') {
-      return 3;
-    } else if (_env.FORCE_COLOR === '0') {
-      return 0;
-    }
-  }
-
-  if (stream && !stream.isTTY && !_env.MSYSTEM) {
-    return 0;
-  }
-
-  if (_platform.startsWith('win32') && !_env.MSYSTEM) {
-    // Node.js 7.5.0 is the first version of Node.js to include a patch to
-    // libuv that enables 256 color output on Windows. Anything earlier and it
-    // won't work. However, here we target Node.js 8 at minimum as it is an LTS
-    // release, and Node.js 7 is not. Windows 10 build 10586 is the first Windows
-    // release that supports 256 colors.
-    const osRelease = _os.release().split('.');
-    if (Number(_versions.node.split('.')[0]) >= 8
-        && Number(osRelease[0]) >= 10
-        && Number(osRelease[2]) >= 10586) {
-      return 2;
-    }
-
-    return 1;
-  }
-
-  if ('CI' in _env) {
-    if (ciVars.some(sign => sign in _env) || _env.CI_NAME === 'codeship') {
-      return 1;
-    }
-
-    return 0;
-  }
-
-  if ('TEAMCITY_VERSION' in _env) {
-    return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(_env.TEAMCITY_VERSION) ? 1 : 0;
-  }
-
-  if ('TERM_PROGRAM' in _env) {
-    const version = parseInt((_env.TERM_PROGRAM_VERSION || '').split('.')[0], 10);
-
-    switch (_env.TERM_PROGRAM) {
-      case 'iTerm.app':
-        return version >= 3 ? 3 : 2;
-      case 'Hyper':
-        return 3;
-      case 'Apple_Terminal':
-        return 2;
-
-      // No default
-    }
-  }
-
-  if (/-256(color)?$/i.test(_env.TERM)) {
-    return 2;
-  }
-
-  if (/^screen|^xterm|^vt100|^rxvt|color|ansi|cygwin|linux/i.test(_env.TERM)) {
-    return 1;
-  }
-
-  if ('COLORTERM' in _env) {
-    return 1;
-  }
-
-  if (_env.TERM === 'dumb') {
-    return 0;
-  }
-
-  return 0;
-}
-
-
 function _getRows() {
   return typeof process == 'object' && process.stdout.rows || null;
 }
@@ -159,9 +75,11 @@ function _getColumns() {
 }
 
 
-function _createCapabilities(stream: Socket, isTerminalStream: boolean): StreamCapabilities {
-  const level = _getColorLevel(stream);
-
+function _createCapabilities(
+  stream: Socket,
+  isTerminalStream: boolean,
+  level: 0|1|2|3 = supportsColor.stdout.level,
+): StreamCapabilities {
   return {
     readable: stream.readable,
     writable: stream.writable,
diff --git a/packages/angular_devkit/core/third_party/github.com/chalk/supports-color/BUILD b/packages/angular_devkit/core/third_party/github.com/chalk/supports-color/BUILD
index 746aef277348..a20ce77d2e17 100644
--- a/packages/angular_devkit/core/third_party/github.com/chalk/supports-color/BUILD
+++ b/packages/angular_devkit/core/third_party/github.com/chalk/supports-color/BUILD
@@ -1,3 +1,4 @@
+# TODO(alexeagle): move this file to /third_party so Bazel can enforce the licensing
 licenses(["notice"])
 
 # Downloaded from: https://github.com/chalk/supports-color/tree/17e9579fec886a1058553b6f7529f05e4f7a90dc
@@ -6,6 +7,9 @@ exports_files(["license"])
 
 filegroup(
     name = "supports-color",
-    srcs = ["index.js"],
+    srcs = [
+        "index.js",
+        "//packages/angular_devkit/core/third_party/github.com/sindresorhus/has-flag",
+    ],
     visibility = ["//:__subpackages__"],
 )
diff --git a/packages/angular_devkit/core/third_party/github.com/chalk/supports-color/LOCAL_MODS.md b/packages/angular_devkit/core/third_party/github.com/chalk/supports-color/LOCAL_MODS.md
new file mode 100644
index 000000000000..76d5851aa34f
--- /dev/null
+++ b/packages/angular_devkit/core/third_party/github.com/chalk/supports-color/LOCAL_MODS.md
@@ -0,0 +1,3 @@
+* Added check for `env.MSYSTEM` in windows case, see https://github.com/angular/angular-cli/commit/b8d4e19fc4209ff6a52b6e6a151927f6fe34b60e
+* require the locally vendored has-flag rather than npm package
+* support browser runtimes by mocking out the process object if it doesn't exist
diff --git a/packages/angular_devkit/core/third_party/github.com/chalk/supports-color/index.js b/packages/angular_devkit/core/third_party/github.com/chalk/supports-color/index.js
index effa56d760d0..06e16d0b740e 100644
--- a/packages/angular_devkit/core/third_party/github.com/chalk/supports-color/index.js
+++ b/packages/angular_devkit/core/third_party/github.com/chalk/supports-color/index.js
@@ -1,8 +1,14 @@
 'use strict';
 const os = require('os');
-const hasFlag = require('has-flag');
+// LOCAL MOD: import the dependency from local vendored location
+const hasFlag = require('../../sindresorhus/has-flag');
 
-const {env} = process;
+// LOCAL MOD: support loading this file in a browser
+const {env, versions, stdout, stderr, platform} = typeof process == 'object' ? process : {
+	platform: '',
+	env: {},
+	versions: {node: ''},
+};
 
 let forceColor;
 if (hasFlag('no-color') ||
@@ -54,7 +60,8 @@ function supportsColor(stream) {
 		return 2;
 	}
 
-	if (stream && !stream.isTTY && forceColor === undefined) {
+	// LOCAL MOD: support mingw
+	if (stream && !stream.isTTY && forceColor === undefined && !env.MSYSTEM) {
 		return 0;
 	}
 
@@ -64,7 +71,8 @@ function supportsColor(stream) {
 		return min;
 	}
 
-	if (process.platform === 'win32') {
+	// LOCAL MOD: support mingw
+	if (platform.startsWith('win32') && !env.MSYSTEM) {
 		// Node.js 7.5.0 is the first version of Node.js to include a patch to
 		// libuv that enables 256 color output on Windows. Anything earlier and it
 		// won't work. However, here we target Node.js 8 at minimum as it is an LTS
@@ -73,7 +81,7 @@ function supportsColor(stream) {
 		// that supports 16m/TrueColor.
 		const osRelease = os.release().split('.');
 		if (
-			Number(process.versions.node.split('.')[0]) >= 8 &&
+			Number(versions.node.split('.')[0]) >= 8 &&
 			Number(osRelease[0]) >= 10 &&
 			Number(osRelease[2]) >= 10586
 		) {
@@ -133,6 +141,6 @@ function getSupportLevel(stream) {
 
 module.exports = {
 	supportsColor: getSupportLevel,
-	stdout: getSupportLevel(process.stdout),
-	stderr: getSupportLevel(process.stderr)
-};
\ No newline at end of file
+	stdout: getSupportLevel(stdout),
+	stderr: getSupportLevel(stderr)
+};
diff --git a/third_party/README.md b/third_party/README.md
index 5fb5405151e4..b154dd489c2a 100644
--- a/third_party/README.md
+++ b/third_party/README.md
@@ -1,5 +1,9 @@
 # third_party vendored sources in Angular CLI
 
+Note, other third_party directories under subpackages currently exist to support the legacy pre-bazel build system.
+
+For example, `/packages/angular_devkit/core/third_party`
+
 ## TL;DR: don't copy sources into this repo
 
 All sources in this repo should be authored from scratch by the committer.

From 94b087c9e1cb9440c2732af754730a288fd215b7 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 15 Feb 2019 11:17:34 -0500
Subject: [PATCH 0764/1703] fix(@angular-devkit/build-angular): disable by
 default stylesheet root relative URL rebasing

BREAKING CHANGE:
Root relative URLs are a standardized method to reference a resource path from the root of a host.  The previous behavior of the Angular CLI prevented this from occuring and resulted in an inability to reference stylesheet assets in this manner.  The initial reason for this behavior is no longer present in the internal implementation of the Angular CLI.  Therefore, this now unnecessary and non-standard behavior is being phased out.  If an application currently relies on this behavior, a compatibility option `rebaseRootRelativeCssUrls` has been provided for the 8.x release cycle to facilitate transition away from this non-standard and limiting behavior.  The recommended method to transition is to use relative paths within the source stylesheet.  This allows the build system to process and generate a full URL for the asset.
---
 packages/angular/cli/lib/config/schema.json   |   6 +
 .../angular-cli-files/models/build-options.ts |   2 +
 .../models/webpack-configs/styles.ts          |  11 +-
 .../plugins/postcss-cli-resources.ts          |   6 +
 .../build_angular/src/browser/schema.d.ts     |   8 +
 .../build_angular/src/browser/schema.json     |   6 +
 .../test/browser/styles_spec_large.ts         | 138 +++++++++++++++++-
 tests/legacy-cli/e2e/tests/build/css-urls.ts  |  25 ++--
 8 files changed, 176 insertions(+), 26 deletions(-)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index 5775a13c7a36..02646083fc73 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -875,6 +875,12 @@
               "description": "Enables conditionally loaded ES2015 polyfills.",
               "type": "boolean",
               "default": false
+            },
+            "rebaseRootRelativeCssUrls": {
+              "description": "Change root relative URLs in stylesheets to include base HREF and deploy URL. Use only for compatibility and transition. The behavior of this option is non-standard and will be removed in the next major release.",
+              "type": "boolean",
+              "default": false,
+              "x-deprecated": true
             }
           },
           "additionalProperties": false,
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
index eaabcc68ae91..7ebeb40582b3 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
@@ -71,6 +71,8 @@ export interface BuildOptions {
   lazyModules: string[];
   platform?: 'browser' | 'server';
   fileReplacements: CurrentFileReplacement[];
+    /** @deprecated use only for compatibility in 8.x; will be removed in 9.0 */
+  rebaseRootRelativeCssUrls?: boolean;
 }
 
 export interface WebpackTestOptions extends BuildOptions {
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
index ead6d9791bbe..c88f0386a2f6 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
@@ -45,10 +45,6 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
 
   // Determine hashing format.
   const hashFormat = getOutputHashFormat(buildOptions.outputHashing as string);
-  // Convert absolute resource URLs to account for base-href and deploy-url.
-  const baseHref = buildOptions.baseHref || '';
-  const deployUrl = buildOptions.deployUrl || '';
-  const resourcesOutputPath = buildOptions.resourcesOutputPath || '';
 
   const postcssPluginCreator = function (loader: webpack.loader.LoaderContext) {
     return [
@@ -70,10 +66,11 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
         },
       }),
       PostcssCliResources({
-        baseHref,
-        deployUrl,
-        resourcesOutputPath,
+        baseHref: buildOptions.baseHref,
+        deployUrl: buildOptions.deployUrl,
+        resourcesOutputPath: buildOptions.resourcesOutputPath,
         loader,
+        rebaseRootRelative: buildOptions.rebaseRootRelativeCssUrls,
         filename: `[name]${hashFormat.file}.[ext]`,
       }),
       autoprefixer(),
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts
index 3c7c7139e5ce..7588d50ec7c1 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts
@@ -28,6 +28,7 @@ export interface PostcssCliResourcesOptions {
   baseHref?: string;
   deployUrl?: string;
   resourcesOutputPath?: string;
+  rebaseRootRelative?: boolean;
   filename: string;
   loader: webpack.loader.LoaderContext;
 }
@@ -49,6 +50,7 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
     deployUrl = '',
     baseHref = '',
     resourcesOutputPath = '',
+    rebaseRootRelative = false,
     filename,
     loader,
   } = options;
@@ -61,6 +63,10 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
       return inputUrl;
     }
 
+    if (!rebaseRootRelative && /^\//.test(inputUrl)) {
+      return inputUrl;
+    }
+
     // If starts with a caret, remove and return remainder
     // this supports bypassing asset processing
     if (inputUrl.startsWith('^')) {
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.d.ts b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
index de31a4eef072..fa6b6a25eba9 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
@@ -241,6 +241,14 @@ export interface BrowserBuilderSchema {
    * Enables conditionally loaded IE9-11 polyfills.
    */
   es5BrowserSupport: boolean;
+
+  /**
+   * @deprecated
+   * Change root relative URLs in stylesheets to include base HREF and deploy URL.
+   * Use only for compatibility and transition.
+   * The behavior of this option is non-standard and will be removed in the next major release.
+   */
+  rebaseRootRelativeCssUrls: boolean;
 }
 
 export type OptimizationOptions = boolean | OptimizationObject;
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index ee7ea8a26e00..3c870cd628d9 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -304,6 +304,12 @@
       "description": "Enables conditionally loaded ES2015 polyfills.",
       "type": "boolean",
       "default": false
+    },
+    "rebaseRootRelativeCssUrls": {
+      "description": "Change root relative URLs in stylesheets to include base HREF and deploy URL. Use only for compatibility and transition. The behavior of this option is non-standard and will be removed in the next major release.",
+      "type": "boolean",
+      "default": false,
+      "x-deprecated": true
     }
   },
   "additionalProperties": false,
diff --git a/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
index 05572f59e303..b7c1a2fc7ddc 100644
--- a/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
@@ -352,7 +352,7 @@ describe('Browser Builder styles', () => {
   });
 
   // TODO: consider making this a unit test in the url processing plugins.
-  it(`supports baseHref and deployUrl in resource urls`, (done) => {
+  it(`supports baseHref/deployUrl in resource urls without rebaseRootRelativeCssUrls`, (done) => {
     // Use a large image for the relative ref so it cannot be inlined.
     host.copyFile('src/spectrum.png', './src/assets/global-img-relative.png');
     host.copyFile('src/spectrum.png', './src/assets/component-img-relative.png');
@@ -396,6 +396,132 @@ describe('Browser Builder styles', () => {
       concatMap(() => runTargetSpec(host, browserTargetSpec,
         { extractCss: true, baseHref: '/base/', deployUrl: 'http://deploy.url/' },
       )),
+      tap(() => {
+        const styles = virtualFs.fileBufferToString(
+          host.scopedSync().read(normalize(stylesBundle)),
+        );
+        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
+        expect(styles)
+          .toContain(`url('/assets/global-img-absolute.svg')`);
+        expect(main)
+          .toContain(`url('/assets/component-img-absolute.svg')`);
+      }),
+      // Check urls with base-href scheme are used as is (with deploy-url).
+      concatMap(() => runTargetSpec(host, browserTargetSpec,
+        { extractCss: true, baseHref: 'http://base.url/', deployUrl: 'deploy/' },
+      )),
+      tap(() => {
+        const styles = virtualFs.fileBufferToString(
+          host.scopedSync().read(normalize(stylesBundle)),
+        );
+        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
+        expect(styles)
+          .toContain(`url('/assets/global-img-absolute.svg')`);
+        expect(main)
+          .toContain(`url('/assets/component-img-absolute.svg')`);
+      }),
+      // Check urls with deploy-url and base-href scheme only use deploy-url.
+      concatMap(() => runTargetSpec(host, browserTargetSpec, {
+        extractCss: true,
+        baseHref: 'http://base.url/',
+        deployUrl: 'http://deploy.url/',
+      },
+      )),
+      tap(() => {
+        const styles = virtualFs.fileBufferToString(
+          host.scopedSync().read(normalize(stylesBundle)),
+        );
+        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
+        expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+        expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+      }),
+      // Check with schemeless base-href and deploy-url flags.
+      concatMap(() => runTargetSpec(host, browserTargetSpec,
+        { extractCss: true, baseHref: '/base/', deployUrl: 'deploy/' },
+      )),
+      tap(() => {
+        const styles = virtualFs.fileBufferToString(
+          host.scopedSync().read(normalize(stylesBundle)),
+        );
+        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
+        expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+        expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+      }),
+      // Check with identical base-href and deploy-url flags.
+      concatMap(() => runTargetSpec(host, browserTargetSpec,
+        { extractCss: true, baseHref: '/base/', deployUrl: '/base/' },
+      )),
+      tap(() => {
+        const styles = virtualFs.fileBufferToString(
+          host.scopedSync().read(normalize(stylesBundle)),
+        );
+        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
+        expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+        expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+      }),
+      // Check with only base-href flag.
+      concatMap(() => runTargetSpec(host, browserTargetSpec,
+        { extractCss: true, baseHref: '/base/' },
+      )),
+      tap(() => {
+        const styles = virtualFs.fileBufferToString(
+          host.scopedSync().read(normalize(stylesBundle)),
+        );
+        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
+        expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+        expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+      }),
+    ).toPromise().then(done, done.fail);
+  }, 90000);
+
+  it(`supports baseHref/deployUrl in resource urls with rebaseRootRelativeCssUrls`, (done) => {
+    // Use a large image for the relative ref so it cannot be inlined.
+    host.copyFile('src/spectrum.png', './src/assets/global-img-relative.png');
+    host.copyFile('src/spectrum.png', './src/assets/component-img-relative.png');
+    host.writeMultipleFiles({
+      'src/styles.css': `
+        h1 { background: url('/assets/global-img-absolute.svg'); }
+        h2 { background: url('./assets/global-img-relative.png'); }
+      `,
+      'src/app/app.component.css': `
+        h3 { background: url('/assets/component-img-absolute.svg'); }
+        h4 { background: url('../assets/component-img-relative.png'); }
+      `,
+      'src/assets/global-img-absolute.svg': imgSvg,
+      'src/assets/component-img-absolute.svg': imgSvg,
+    });
+
+    const stylesBundle = 'dist/styles.css';
+    const mainBundle = 'dist/main.js';
+
+    // Check base paths are correctly generated.
+    const overrides = {
+      extractCss: true,
+      rebaseRootRelativeCssUrls: true,
+    };
+    runTargetSpec(host, browserTargetSpec, { ...overrides, aot: true }).pipe(
+      tap(() => {
+        const styles = virtualFs.fileBufferToString(
+          host.scopedSync().read(normalize(stylesBundle)),
+        );
+        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
+        expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+        expect(styles).toContain(`url('global-img-relative.png')`);
+        expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+        expect(main).toContain(`url('component-img-relative.png')`);
+        expect(host.scopedSync().exists(normalize('dist/assets/global-img-absolute.svg')))
+          .toBe(true);
+        expect(host.scopedSync().exists(normalize('dist/global-img-relative.png')))
+          .toBe(true);
+        expect(host.scopedSync().exists(normalize('dist/assets/component-img-absolute.svg')))
+          .toBe(true);
+        expect(host.scopedSync().exists(normalize('dist/component-img-relative.png')))
+          .toBe(true);
+      }),
+      // Check urls with deploy-url scheme are used as is.
+      concatMap(() => runTargetSpec(host, browserTargetSpec,
+        { ...overrides, baseHref: '/base/', deployUrl: 'http://deploy.url/' },
+      )),
       tap(() => {
         const styles = virtualFs.fileBufferToString(
           host.scopedSync().read(normalize(stylesBundle)),
@@ -408,7 +534,7 @@ describe('Browser Builder styles', () => {
       }),
       // Check urls with base-href scheme are used as is (with deploy-url).
       concatMap(() => runTargetSpec(host, browserTargetSpec,
-        { extractCss: true, baseHref: 'http://base.url/', deployUrl: 'deploy/' },
+        { ...overrides, baseHref: 'http://base.url/', deployUrl: 'deploy/' },
       )),
       tap(() => {
         const styles = virtualFs.fileBufferToString(
@@ -422,7 +548,7 @@ describe('Browser Builder styles', () => {
       }),
       // Check urls with deploy-url and base-href scheme only use deploy-url.
       concatMap(() => runTargetSpec(host, browserTargetSpec, {
-        extractCss: true,
+        ...overrides,
         baseHref: 'http://base.url/',
         deployUrl: 'http://deploy.url/',
       },
@@ -437,7 +563,7 @@ describe('Browser Builder styles', () => {
       }),
       // Check with schemeless base-href and deploy-url flags.
       concatMap(() => runTargetSpec(host, browserTargetSpec,
-        { extractCss: true, baseHref: '/base/', deployUrl: 'deploy/' },
+        { ...overrides, baseHref: '/base/', deployUrl: 'deploy/' },
       )),
       tap(() => {
         const styles = virtualFs.fileBufferToString(
@@ -449,7 +575,7 @@ describe('Browser Builder styles', () => {
       }),
       // Check with identical base-href and deploy-url flags.
       concatMap(() => runTargetSpec(host, browserTargetSpec,
-        { extractCss: true, baseHref: '/base/', deployUrl: '/base/' },
+        { ...overrides, baseHref: '/base/', deployUrl: '/base/' },
       )),
       tap(() => {
         const styles = virtualFs.fileBufferToString(
@@ -461,7 +587,7 @@ describe('Browser Builder styles', () => {
       }),
       // Check with only base-href flag.
       concatMap(() => runTargetSpec(host, browserTargetSpec,
-        { extractCss: true, baseHref: '/base/' },
+        { ...overrides, baseHref: '/base/' },
       )),
       tap(() => {
         const styles = virtualFs.fileBufferToString(
diff --git a/tests/legacy-cli/e2e/tests/build/css-urls.ts b/tests/legacy-cli/e2e/tests/build/css-urls.ts
index e626ba4e4108..05b199982a82 100644
--- a/tests/legacy-cli/e2e/tests/build/css-urls.ts
+++ b/tests/legacy-cli/e2e/tests/build/css-urls.ts
@@ -29,7 +29,6 @@ export default function () {
       'src/assets/global-img-absolute.svg': imgSvg,
       'src/assets/component-img-absolute.svg': imgSvg
     }))
-    // use image with file size >10KB to prevent inlining
     .then(() => copyProjectAsset('images/spectrum.png', './src/assets/global-img-relative.png'))
     .then(() => copyProjectAsset('images/spectrum.png', './src/assets/component-img-relative.png'))
     .then(() => ng('build', '--extract-css', '--aot'))
@@ -52,54 +51,54 @@ export default function () {
     .then(() => ng('build', '--base-href=/base/', '--deploy-url=http://deploy.url/',
       '--extract-css'))
     .then(() => expectFileToMatch('dist/test-project/styles.css',
-      /url\(\'http:\/\/deploy\.url\/assets\/global-img-absolute\.svg\'\)/))
+      /url\(\'\/assets\/global-img-absolute\.svg\'\)/))
     .then(() => expectFileToMatch('dist/test-project/main.js',
-      /url\(\'http:\/\/deploy\.url\/assets\/component-img-absolute\.svg\'\)/))
+      /url\(\'\/assets\/component-img-absolute\.svg\'\)/))
     // Check urls with base-href scheme are used as is (with deploy-url).
     .then(() => ng('build', '--base-href=http://base.url/', '--deploy-url=deploy/',
       '--extract-css'))
     .then(() => expectFileToMatch('dist/test-project/styles.css',
-      /url\(\'http:\/\/base\.url\/deploy\/assets\/global-img-absolute\.svg\'\)/))
+      /url\(\'\/assets\/global-img-absolute\.svg\'\)/))
     .then(() => expectFileToMatch('dist/test-project/main.js',
-      /url\(\'http:\/\/base\.url\/deploy\/assets\/component-img-absolute\.svg\'\)/))
+      /url\(\'\/assets\/component-img-absolute\.svg\'\)/))
     // Check urls with deploy-url and base-href scheme only use deploy-url.
     .then(() => ng('build', '--base-href=http://base.url/', '--deploy-url=http://deploy.url/',
       '--extract-css'))
     .then(() => expectFileToMatch('dist/test-project/styles.css',
-      /url\(\'http:\/\/deploy\.url\/assets\/global-img-absolute\.svg\'\)/))
+      /url\(\'\/assets\/global-img-absolute\.svg\'\)/))
     .then(() => expectFileToMatch('dist/test-project/main.js',
-      /url\(\'http:\/\/deploy\.url\/assets\/component-img-absolute\.svg\'\)/))
+      /url\(\'\/assets\/component-img-absolute\.svg\'\)/))
     // Check with base-href and deploy-url flags.
     .then(() => ng('build', '--base-href=/base/', '--deploy-url=deploy/',
       '--extract-css', '--aot'))
     .then(() => expectFileToMatch('dist/test-project/styles.css',
-      '/base/deploy/assets/global-img-absolute.svg'))
+      '/assets/global-img-absolute.svg'))
     .then(() => expectFileToMatch('dist/test-project/styles.css',
       /global-img-relative\.png/))
     .then(() => expectFileToMatch('dist/test-project/main.js',
-      '/base/deploy/assets/component-img-absolute.svg'))
+      '/assets/component-img-absolute.svg'))
     .then(() => expectFileToMatch('dist/test-project/main.js',
       /deploy\/component-img-relative\.png/))
     // Check with identical base-href and deploy-url flags.
     .then(() => ng('build', '--base-href=/base/', '--deploy-url=/base/',
       '--extract-css', '--aot'))
     .then(() => expectFileToMatch('dist/test-project/styles.css',
-      '/base/assets/global-img-absolute.svg'))
+      '/assets/global-img-absolute.svg'))
     .then(() => expectFileToMatch('dist/test-project/styles.css',
       /global-img-relative\.png/))
     .then(() => expectFileToMatch('dist/test-project/main.js',
-      '/base/assets/component-img-absolute.svg'))
+      '/assets/component-img-absolute.svg'))
     .then(() => expectFileToMatch('dist/test-project/main.js',
       /\/base\/component-img-relative\.png/))
     // Check with only base-href flag.
     .then(() => ng('build', '--base-href=/base/',
       '--extract-css', '--aot'))
     .then(() => expectFileToMatch('dist/test-project/styles.css',
-      '/base/assets/global-img-absolute.svg'))
+      '/assets/global-img-absolute.svg'))
     .then(() => expectFileToMatch('dist/test-project/styles.css',
       /global-img-relative\.png/))
     .then(() => expectFileToMatch('dist/test-project/main.js',
-      '/base/assets/component-img-absolute.svg'))
+      '/assets/component-img-absolute.svg'))
     .then(() => expectFileToMatch('dist/test-project/main.js',
       /component-img-relative\.png/));
 }

From d5144c3bf35450db92a67f6ebb5672314157a600 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 19 Feb 2019 06:57:13 +0000
Subject: [PATCH 0765/1703] build: update chokidar to version 2.1.2

---
 packages/angular_devkit/core/package.json | 2 +-
 yarn.lock                                 | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json
index 14a5e6ece7e7..1f4f85901082 100644
--- a/packages/angular_devkit/core/package.json
+++ b/packages/angular_devkit/core/package.json
@@ -9,7 +9,7 @@
   ],
   "dependencies": {
     "ajv": "6.9.1",
-    "chokidar": "2.1.0",
+    "chokidar": "2.1.2",
     "fast-json-stable-stringify": "2.0.0",
     "rxjs": "6.3.3",
     "source-map": "0.7.3"
diff --git a/yarn.lock b/yarn.lock
index 91f7c7d4820f..97dec2c4096b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1966,10 +1966,10 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-chokidar@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.0.tgz#5fcb70d0b28ebe0867eb0f09d5f6a08f29a1efa0"
-  integrity sha512-5t6G2SH8eO6lCvYOoUpaRnF5Qfd//gd7qJAkwRUw9qlGVkiQ13uwQngqbWWaurOsaAm9+kUGbITADxt6H0XFNQ==
+chokidar@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.2.tgz#9c23ea40b01638439e0513864d362aeacc5ad058"
+  integrity sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.1"

From 6a41621966c23d08e966653d631f4c4510a0b353 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 19 Feb 2019 06:57:37 +0000
Subject: [PATCH 0766/1703] build: update pacote to version 9.5.0

---
 packages/angular/cli/package.json       | 2 +-
 packages/schematics/update/package.json | 2 +-
 yarn.lock                               | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 9180332da6a3..eef77dd2d760 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -36,7 +36,7 @@
     "inquirer": "6.2.2",
     "npm-package-arg": "6.1.0",
     "opn": "5.4.0",
-    "pacote": "9.4.1",
+    "pacote": "9.5.0",
     "semver": "5.6.0",
     "symbol-observable": "1.2.0"
   },
diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index 87bc3fb3559b..c6152992d937 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -14,7 +14,7 @@
     "@angular-devkit/schematics": "0.0.0",
     "@yarnpkg/lockfile": "1.1.0",
     "ini": "1.3.5",
-    "pacote": "9.4.1",
+    "pacote": "9.5.0",
     "semver": "5.6.0",
     "semver-intersect": "1.4.0",
     "rxjs": "6.3.3"
diff --git a/yarn.lock b/yarn.lock
index 97dec2c4096b..fbb2d72aaa8a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7343,10 +7343,10 @@ package-json@^4.0.0:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
-pacote@9.4.1:
-  version "9.4.1"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.4.1.tgz#f0af2a52d241bce523d39280ac810c671db62279"
-  integrity sha512-YKSRsQqmeHxgra0KCdWA2FtVxDPUlBiCdmew+mSe44pzlx5t1ViRMWiQg18T+DREA+vSqYfKzynaToFR4hcKHw==
+pacote@9.5.0:
+  version "9.5.0"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.0.tgz#85f3013a3f6dd51c108b0ccabd3de8102ddfaeda"
+  integrity sha512-aUplXozRbzhaJO48FaaeClmN+2Mwt741MC6M3bevIGZwdCaP7frXzbUOfOWa91FPHoLITzG0hYaKY363lxO3bg==
   dependencies:
     bluebird "^3.5.3"
     cacache "^11.3.2"

From b7a85c26e90fa6a19962bc631d2d4b9e98b75e68 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Wed, 13 Feb 2019 10:56:21 -0800
Subject: [PATCH 0767/1703] refactor: remove _/builders private package

It was only used when manually testing the old Architect.
---
 packages/_/builders/builders.json        | 10 ----------
 packages/_/builders/package.json         | 12 ------------
 packages/_/builders/src/noop-schema.json |  4 ----
 packages/_/builders/src/true.ts          | 20 --------------------
 4 files changed, 46 deletions(-)
 delete mode 100644 packages/_/builders/builders.json
 delete mode 100644 packages/_/builders/package.json
 delete mode 100644 packages/_/builders/src/noop-schema.json
 delete mode 100644 packages/_/builders/src/true.ts

diff --git a/packages/_/builders/builders.json b/packages/_/builders/builders.json
deleted file mode 100644
index 87914ed792d2..000000000000
--- a/packages/_/builders/builders.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "$schema": "../architect/src/builders-schema.json",
-  "builders": {
-    "true": {
-      "class": "./src/true",
-      "schema": "./src/noop-schema.json",
-      "description": "Always succeed."
-    }
-  }
-}
diff --git a/packages/_/builders/package.json b/packages/_/builders/package.json
deleted file mode 100644
index 0f9d3729d481..000000000000
--- a/packages/_/builders/package.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "name": "@_/builders",
-  "version": "0.0.0",
-  "description": "CLI tool for Angular",
-  "main": "src/index.js",
-  "typings": "src/index.d.ts",
-  "builders": "builders.json",
-  "private": true,
-  "dependencies": {
-    "rxjs": "6.3.3"
-  }
-}
diff --git a/packages/_/builders/src/noop-schema.json b/packages/_/builders/src/noop-schema.json
deleted file mode 100644
index afadf0925f37..000000000000
--- a/packages/_/builders/src/noop-schema.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "$schema": "http://json-schema.org/schema",
-  "type": "object"
-}
\ No newline at end of file
diff --git a/packages/_/builders/src/true.ts b/packages/_/builders/src/true.ts
deleted file mode 100644
index efe9b7cb0046..000000000000
--- a/packages/_/builders/src/true.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { Observable, of } from 'rxjs';
-
-export class TrueBuilder {
-  constructor() {}
-
-  run(): Observable<{ success: boolean }> {
-    return of({
-      success: true,
-    });
-  }
-}
-
-export default TrueBuilder;

From d856f8f8f868f8156f10f5cfab8914a1b4380fdf Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Wed, 13 Feb 2019 10:57:51 -0800
Subject: [PATCH 0768/1703] feat(@angular-devkit/core): export terminal
 capabilities

---
 packages/angular_devkit/core/src/terminal/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/angular_devkit/core/src/terminal/index.ts b/packages/angular_devkit/core/src/terminal/index.ts
index a33a3ba65ac9..d853f3c1c9bb 100644
--- a/packages/angular_devkit/core/src/terminal/index.ts
+++ b/packages/angular_devkit/core/src/terminal/index.ts
@@ -6,4 +6,5 @@
  * found in the LICENSE file at https://angular.io/license
  */
 export * from './text';
+export * from './caps';
 export * from './colors';

From 81967900d09b34f1b69d57b5bc9283a656d8c8ef Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Wed, 13 Feb 2019 11:03:59 -0800
Subject: [PATCH 0769/1703] feat(@angular-devkit/core): logger.log() should
 keep own metadata

It was possible to overwrite the metadata of the logger itself (name, path)
when calling "log()". This should not happen. If there is a need to overwrite
the loggers metadata itself one should use "next()" and construct or forward
their own log entry.
---
 packages/angular_devkit/core/src/logger/logger.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/core/src/logger/logger.ts b/packages/angular_devkit/core/src/logger/logger.ts
index f4682a80d41e..08bb66a117cd 100644
--- a/packages/angular_devkit/core/src/logger/logger.ts
+++ b/packages/angular_devkit/core/src/logger/logger.ts
@@ -102,7 +102,7 @@ export class Logger extends Observable<LogEntry> implements LoggerApi {
   }
 
   log(level: LogLevel, message: string, metadata: JsonObject = {}): void {
-    const entry: LogEntry = Object.assign({}, this._metadata, metadata, {
+    const entry: LogEntry = Object.assign({}, metadata, this._metadata, {
       level, message, timestamp: +Date.now(),
     });
     this._subject.next(entry);

From 7023255c3d0e972979f9233e33e0d6facb7cbd52 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Wed, 13 Feb 2019 11:15:58 -0800
Subject: [PATCH 0770/1703] feat(@angular-devkit/core): jobs should re-log
 instead of forwarding

Current behaviour is to have logs forwarded, but this is flawed because on the
job side the logger is actually re-created. This allows logs to be actually part
of the caller side logging infrastructure.
---
 .../core/src/experimental/jobs/create-job-handler.ts         | 2 +-
 .../core/src/experimental/jobs/simple-scheduler.ts           | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/core/src/experimental/jobs/create-job-handler.ts b/packages/angular_devkit/core/src/experimental/jobs/create-job-handler.ts
index 5e62439a078b..40b63c94bd05 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/create-job-handler.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/create-job-handler.ts
@@ -101,7 +101,7 @@ export function createJobHandler<A extends JsonValue, I extends JsonValue, O ext
       });
 
       // Configure a logger to pass in as additional context.
-      const logger = new Logger('job');
+      const logger = new Logger('-internal-job-logger-');
       const logSub = logger.subscribe(entry => {
         subject.next({
           kind: JobOutboundMessageKind.Log,
diff --git a/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts b/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts
index c7edcd907613..76ade7049bb1 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts
@@ -305,7 +305,7 @@ export class SimpleScheduler<
     let state = JobState.Queued;
     let pingId = 0;
 
-    const logger = options.logger ? options.logger.createChild('job') : new NullLogger();
+    const logger = options.logger ? options.logger : new NullLogger();
 
     // Create the input channel by having a filter.
     const input = new Subject<JsonValue>();
@@ -349,7 +349,8 @@ export class SimpleScheduler<
 
         switch (message.kind) {
           case JobOutboundMessageKind.Log:
-            logger.next(message.entry);
+            const entry = message.entry;
+            logger.log(entry.level, entry.message, entry);
             break;
 
           case JobOutboundMessageKind.ChannelCreate: {

From 68220f13e4847d2b8369b0767f97711e2df32c4d Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Wed, 13 Feb 2019 11:30:45 -0800
Subject: [PATCH 0771/1703] feat(@angular-devkit/architect): New Architect API
 first draft

The new API has been described in this design doc:
https://docs.google.com/document/d/1SpN_2XEooI9_CPjqspAcNEBjVY874OWPZqOenjuF0qo/view

This first drafts add support for the API (given some deep imports). It is
still in draft mode but is committed to make it available to people to
start testing and moving their own builders.

This API rebuilds (not backward compatible) the Architect API package. To
use it people will need to import "@angular-devkit/architect/src/index2"
to start using it. A reference builder will be added in the next commit.

There are 2 pieces missing from this commit that will be added in the
same PR; 1) the architect-host and CLI to test, and 2) a reference
builder moved from the old API to the new one. These will be part of
the same PR.

Finally, there are missing tests in this package, but everything tested
manually and automatically works so far. Test coverage will be added
before the package is considered finished.

Due to a desire to keep architect, our tests and the scope of this PR
limited and keep the two APIs separated, every clashing files will
have a "2" suffix added to it. Once all builders have been moved and
we are sure everything works, all those files will be moved to their
final destination and the old API will be removed, in one PR.
---
 .../src/{index.d.ts => _golden-api.d.ts}      |   0
 packages/angular_devkit/architect/BUILD       |  21 ++
 .../architect/src/_golden-api.d.ts            |  11 +
 packages/angular_devkit/architect/src/api.ts  | 230 ++++++++++++++
 .../angular_devkit/architect/src/architect.ts | 288 ++++++++++++++++++
 .../architect/src/builders-schema.json        |  63 ++--
 .../architect/src/create-builder.ts           | 171 +++++++++++
 .../angular_devkit/architect/src/index.ts     |   5 +
 .../angular_devkit/architect/src/index2.ts    |  10 +
 .../architect/src/index2_spec.ts              | 138 +++++++++
 .../architect/src/input-schema.json           |  47 +++
 .../angular_devkit/architect/src/internal.ts  |  81 +++++
 .../architect/src/output-schema.json          |  34 +++
 .../architect/src/progress-schema.json        | 102 +++++++
 .../architect/src/schedule-by-name.ts         | 121 ++++++++
 .../architect/testing/index2.ts               |   9 +
 .../testing/testing-architect-host.ts         | 108 +++++++
 17 files changed, 1422 insertions(+), 17 deletions(-)
 rename etc/api/angular_devkit/architect/src/{index.d.ts => _golden-api.d.ts} (100%)
 create mode 100644 packages/angular_devkit/architect/src/_golden-api.d.ts
 create mode 100644 packages/angular_devkit/architect/src/api.ts
 create mode 100644 packages/angular_devkit/architect/src/architect.ts
 create mode 100644 packages/angular_devkit/architect/src/create-builder.ts
 create mode 100644 packages/angular_devkit/architect/src/index2.ts
 create mode 100644 packages/angular_devkit/architect/src/index2_spec.ts
 create mode 100644 packages/angular_devkit/architect/src/input-schema.json
 create mode 100644 packages/angular_devkit/architect/src/internal.ts
 create mode 100644 packages/angular_devkit/architect/src/output-schema.json
 create mode 100644 packages/angular_devkit/architect/src/progress-schema.json
 create mode 100644 packages/angular_devkit/architect/src/schedule-by-name.ts
 create mode 100644 packages/angular_devkit/architect/testing/index2.ts
 create mode 100644 packages/angular_devkit/architect/testing/testing-architect-host.ts

diff --git a/etc/api/angular_devkit/architect/src/index.d.ts b/etc/api/angular_devkit/architect/src/_golden-api.d.ts
similarity index 100%
rename from etc/api/angular_devkit/architect/src/index.d.ts
rename to etc/api/angular_devkit/architect/src/_golden-api.d.ts
diff --git a/packages/angular_devkit/architect/BUILD b/packages/angular_devkit/architect/BUILD
index 49dc46ed8807..98e2432d239d 100644
--- a/packages/angular_devkit/architect/BUILD
+++ b/packages/angular_devkit/architect/BUILD
@@ -7,9 +7,27 @@ licenses(["notice"])  # MIT
 
 load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package")
+load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
 package(default_visibility = ["//visibility:public"])
 
+ts_json_schema(
+    name = "builder_input_schema",
+    src = "src/input-schema.json",
+)
+ts_json_schema(
+    name = "builder_output_schema",
+    src = "src/output-schema.json",
+)
+ts_json_schema(
+    name = "builder_builders_schema",
+    src = "src/builders-schema.json",
+)
+ts_json_schema(
+    name = "progress_schema",
+    src = "src/progress-schema.json",
+)
+
 ts_library(
     name = "architect",
     srcs = glob(
@@ -29,6 +47,9 @@ ts_library(
         "@rxjs",
         "@rxjs//operators",
         "@npm//@types/node",
+        ":builder_input_schema",
+        ":builder_output_schema",
+        ":progress_schema",
     ],
 )
 
diff --git a/packages/angular_devkit/architect/src/_golden-api.d.ts b/packages/angular_devkit/architect/src/_golden-api.d.ts
new file mode 100644
index 000000000000..3e50b7278e3e
--- /dev/null
+++ b/packages/angular_devkit/architect/src/_golden-api.d.ts
@@ -0,0 +1,11 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+export * from './architect-legacy';
+// export * from './api';
+// export { Architect, ScheduleOptions } from './architect';
+// export { createBuilder } from './create-builder';
diff --git a/packages/angular_devkit/architect/src/api.ts b/packages/angular_devkit/architect/src/api.ts
new file mode 100644
index 000000000000..6aabb6160448
--- /dev/null
+++ b/packages/angular_devkit/architect/src/api.ts
@@ -0,0 +1,230 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { experimental, json, logging } from '@angular-devkit/core';
+import { Observable } from 'rxjs';
+import { Schema as RealBuilderInput, Target as RealTarget } from './input-schema';
+import { Schema as RealBuilderOutput } from './output-schema';
+import { Schema as RealBuilderProgress, State as BuilderProgressState } from './progress-schema';
+
+export type Target = json.JsonObject & RealTarget;
+export {
+  BuilderProgressState,
+};
+
+// Type short hands.
+export type BuilderRegistry =
+  experimental.jobs.Registry<json.JsonObject, BuilderInput, BuilderOutput>;
+
+
+/**
+ * An API typed BuilderProgress. The interface generated from the schema is too permissive,
+ * so this API is the one we show in our API. Please note that not all fields are in there; this
+ * is in addition to fields in the schema.
+ */
+export type TypedBuilderProgress = (
+    { state: BuilderProgressState.Stopped; }
+  | { state: BuilderProgressState.Error; error: json.JsonValue; }
+  | { state: BuilderProgressState.Waiting; status?: string; }
+  | { state: BuilderProgressState.Running; status?: string; current: number; total?: number; }
+);
+
+/**
+ * Declaration of those types as JsonObject compatible. JsonObject is not compatible with
+ * optional members, so those wouldn't be directly assignable to our internal Json typings.
+ * Forcing the type to be both a JsonObject and the type from the Schema tells Typescript they
+ * are compatible (which they are).
+ * These types should be used everywhere.
+ */
+export type BuilderInput = json.JsonObject & RealBuilderInput;
+export type BuilderOutput = json.JsonObject & RealBuilderOutput;
+export type BuilderProgress = json.JsonObject & RealBuilderProgress & TypedBuilderProgress;
+
+/**
+ * A progress report is what the tooling will receive. It contains the builder info and the target.
+ * Although these are serializable, they are only exposed through the tooling interface, not the
+ * builder interface. The watch dog sends BuilderProgress and the Builder has a set of functions
+ * to manage the state.
+ */
+export type BuilderProgressReport = BuilderProgress & ({
+  target?: Target;
+  builder: BuilderInfo;
+});
+
+/**
+ * A Run, which is what is returned by scheduleBuilder or scheduleTarget functions. This should
+ * be reconstructed across memory boundaries (it's not serializable but all internal information
+ * are).
+ */
+export interface BuilderRun {
+  /**
+   * Unique amongst runs. This is the same ID as the context generated for the run. It can be
+   * used to identify multiple unique runs. There is no guarantee that a run is a single output;
+   * a builder can rebuild on its own and will generate multiple outputs.
+   */
+  id: number;
+
+  /**
+   * The builder information.
+   */
+  info: BuilderInfo;
+
+  /**
+   * The next output from a builder. This is recommended when scheduling a builder and only being
+   * interested in the result of that single run, not of a watch-mode builder.
+   */
+  result: Promise<BuilderOutput>;
+
+  /**
+   * The output(s) from the builder. A builder can have multiple outputs.
+   * This always replay the last output when subscribed.
+   */
+  output: Observable<BuilderOutput>;
+
+  /**
+   * The progress report. A progress also contains an ID, which can be different than this run's
+   * ID (if the builder calls scheduleBuilder or scheduleTarget).
+   * This will always replay the last progress on new subscriptions.
+   */
+  progress: Observable<BuilderProgressReport>;
+
+  /**
+   * Stop the builder from running. Returns a promise that resolves when the builder is stopped.
+   * Some builders might not handle stopping properly and should have a timeout here.
+   */
+  stop(): Promise<void>;
+}
+
+/**
+ * The context received as a second argument in your builder.
+ */
+export interface BuilderContext {
+  /**
+   * Unique amongst contexts. Contexts instances are not guaranteed to be the same (but it could
+   * be the same context), and all the fields in a context could be the same, yet the builder's
+   * context could be different. This is the same ID as the corresponding run.
+   */
+  id: number;
+
+  /**
+   * The builder info that called your function. Since the builder info is from the builder.json
+   * (or the host), it could contain information that is different than expected.
+   */
+  builder: BuilderInfo;
+
+  /**
+   * A logger that appends messages to a log. This could be a separate interface or completely
+   * ignored. `console.log` could also be completely ignored.
+   */
+  logger: logging.LoggerApi;
+
+  /**
+   * The absolute workspace root of this run. This is a system path and will not be normalized;
+   * ie. on Windows it will starts with `C:\\` (or whatever drive).
+   */
+  workspaceRoot: string;
+
+  /**
+   * The current directory the user is in. This could be outside the workspace root. This is a
+   * system path and will not be normalized; ie. on Windows it will starts with `C:\\` (or
+   * whatever drive).
+   */
+  currentDirectory: string;
+
+  /**
+   * The target that was used to run this builder.
+   * Target is optional if a builder was ran using `scheduleBuilder()`.
+   */
+  target?: Target;
+
+  /**
+   * Schedule a target in the same workspace. This can be the same target that is being executed
+   * right now, but targets of the same name are serialized.
+   * Running the same target and waiting for it to end will result in a deadlocking scenario.
+   * Targets are considered the same if the project, the target AND the configuration are the same.
+   * @param target The target to schedule.
+   * @param overrides A set of options to override the workspace set of options.
+   * @return A promise of a run. It will resolve when all the members of the run are available.
+   */
+  scheduleTarget(
+    target: Target,
+    overrides?: json.JsonObject,
+  ): Promise<BuilderRun>;
+
+  /**
+   * Schedule a builder by its name. This can be the same builder that is being executed.
+   * @param builderName The name of the builder, ie. its `packageName:builderName` tuple.
+   * @param options All options to use for the builder (by default empty object). There is no
+   *     additional options added, e.g. from the workspace.
+   * @return A promise of a run. It will resolve when all the members of the run are available.
+   */
+  scheduleBuilder(
+    builderName: string,
+    options?: json.JsonObject,
+  ): Promise<BuilderRun>;
+
+  /**
+   * Set the builder to running. This should be used if an external event triggered a re-run,
+   * e.g. a file watched was changed.
+   */
+  reportRunning(): void;
+
+  /**
+   * Update the status string shown on the interface.
+   * @param status The status to set it to. An empty string can be used to remove the status.
+   */
+  reportStatus(status: string): void;
+
+  /**
+   * Update the progress for this builder run.
+   * @param current The current progress. This will be between 0 and total.
+   * @param total A new total to set. By default at the start of a run this is 1. If omitted it
+   *     will use the same value as the last total.
+   * @param status Update the status string. If omitted the status string is not modified.
+   */
+  reportProgress(current: number, total?: number, status?: string): void;
+}
+
+
+/**
+ * An accepted return value from a builder. Can be either an Observable, a Promise or a vector.
+ */
+export type BuilderOutputLike = Observable<BuilderOutput> | Promise<BuilderOutput> | BuilderOutput;
+
+
+/**
+ * A builder handler function. The function signature passed to `createBuilder()`.
+ */
+export interface BuilderHandlerFn<A extends json.JsonObject> {
+  /**
+   * Builders are defined by users to perform any kind of task, like building, testing or linting,
+   * and should use this interface.
+   * @param input The options (a JsonObject), validated by the schema and received by the
+   *     builder. This can include resolved options from the CLI or the workspace.
+   * @param context A context that can be used to interact with the Architect framework.
+   * @return One or many builder output.
+   */
+  (input: A, context: BuilderContext): BuilderOutputLike;
+}
+
+/**
+ * A Builder general information. This is generated by the host and is expanded by the host, but
+ * the public API contains those fields.
+ */
+export type BuilderInfo = json.JsonObject & {
+  builderName: string;
+  description: string;
+  optionSchema: json.schema.JsonSchema;
+};
+
+
+/**
+ * Returns a string of "project:target[:configuration]" for the target object.
+ */
+export function targetStringFromTarget({project, target, configuration}: Target) {
+  return `${project}:${target}${configuration !== undefined ? ':' + configuration : ''}`;
+}
diff --git a/packages/angular_devkit/architect/src/architect.ts b/packages/angular_devkit/architect/src/architect.ts
new file mode 100644
index 000000000000..36f46a7eca1e
--- /dev/null
+++ b/packages/angular_devkit/architect/src/architect.ts
@@ -0,0 +1,288 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { experimental, json, logging } from '@angular-devkit/core';
+import { Observable, from, of } from 'rxjs';
+import { concatMap, first, map, shareReplay } from 'rxjs/operators';
+import {
+  BuilderInfo,
+  BuilderInput,
+  BuilderOutput,
+  BuilderRegistry,
+  BuilderRun,
+  Target,
+  targetStringFromTarget,
+} from './api';
+import { ArchitectHost, BuilderDescription, BuilderJobHandler } from './internal';
+import { scheduleByName, scheduleByTarget } from './schedule-by-name';
+
+const inputSchema = require('./input-schema.json');
+const outputSchema = require('./output-schema.json');
+
+function _createJobHandlerFromBuilderInfo(
+  info: BuilderInfo,
+  target: Target | undefined,
+  host: ArchitectHost,
+  registry: json.schema.SchemaRegistry,
+  baseOptions: json.JsonObject,
+): Observable<BuilderJobHandler> {
+  const jobDescription: BuilderDescription = {
+    name: target ? `{${targetStringFromTarget(target)}}` : info.builderName,
+    argument: { type: 'object' },
+    input: inputSchema,
+    output: outputSchema,
+    info,
+  };
+
+  function handler(argument: json.JsonObject, context: experimental.jobs.JobHandlerContext) {
+    const inboundBus = context.inboundBus.pipe(
+      concatMap(message => {
+        if (message.kind === experimental.jobs.JobInboundMessageKind.Input) {
+          const v = message.value as BuilderInput;
+          const options = {
+            ...baseOptions,
+            ...v.options,
+          };
+
+          // Validate v against the options schema.
+          return registry.compile(info.optionSchema).pipe(
+            concatMap(validation => validation(options)),
+            map(result => {
+              if (result.success) {
+                return { ...v, options: result.data } as BuilderInput;
+              } else if (result.errors) {
+                throw new Error('Options did not validate.' + result.errors.join());
+              } else {
+                return v;
+              }
+            }),
+            map(value => ({ ...message, value })),
+          );
+        } else {
+          return of(message as experimental.jobs.JobInboundMessage<BuilderInput>);
+        }
+      }),
+      // Using a share replay because the job might be synchronously sending input, but
+      // asynchronously listening to it.
+      shareReplay(1),
+    );
+
+    return from(host.loadBuilder(info)).pipe(
+      concatMap(builder => {
+        if (builder === null) {
+          throw new Error(`Cannot load builder for builderInfo ${JSON.stringify(info, null, 2)}`);
+        }
+
+        return builder.handler(argument, { ...context, inboundBus }).pipe(
+          map(output => {
+            if (output.kind === experimental.jobs.JobOutboundMessageKind.Output) {
+              // Add target to it.
+              return {
+                ...output,
+                value: {
+                  ...output.value,
+                  ...target ? { target } : 0,
+                } as json.JsonObject,
+              };
+            } else {
+              return output;
+            }
+          }),
+        );
+      }),
+    );
+  }
+
+  return of(Object.assign(handler, { jobDescription }) as BuilderJobHandler);
+}
+
+export interface ScheduleOptions {
+  logger?: logging.Logger;
+}
+
+
+/**
+ * A JobRegistry that resolves builder targets from the host.
+ */
+export class ArchitectBuilderJobRegistry implements BuilderRegistry {
+  constructor(
+    protected _host: ArchitectHost,
+    protected _registry: json.schema.SchemaRegistry,
+    protected _jobCache?: Map<string, Observable<BuilderJobHandler | null>>,
+    protected _infoCache?: Map<string, Observable<BuilderInfo | null>>,
+  ) {}
+
+  protected _resolveBuilder(name: string): Observable<BuilderInfo | null> {
+    const cache = this._infoCache;
+    if (cache) {
+      const maybeCache = cache.get(name);
+      if (maybeCache !== undefined) {
+        return maybeCache;
+      }
+
+      const info = from(this._host.resolveBuilder(name)).pipe(
+        shareReplay(1),
+      );
+      cache.set(name, info);
+
+      return info;
+    }
+
+    return from(this._host.resolveBuilder(name));
+  }
+
+  protected _createBuilder(
+    info: BuilderInfo,
+    target?: Target,
+    options?: json.JsonObject,
+  ): Observable<BuilderJobHandler | null> {
+    const cache = this._jobCache;
+    if (target) {
+      const maybeHit = cache && cache.get(targetStringFromTarget(target));
+      if (maybeHit) {
+        return maybeHit;
+      }
+    } else {
+      const maybeHit = cache && cache.get(info.builderName);
+      if (maybeHit) {
+        return maybeHit;
+      }
+    }
+
+    const result = _createJobHandlerFromBuilderInfo(
+      info,
+      target,
+      this._host,
+      this._registry,
+      options || {},
+    );
+
+    if (cache) {
+      if (target) {
+        cache.set(targetStringFromTarget(target), result.pipe(shareReplay(1)));
+      } else {
+        cache.set(info.builderName, result.pipe(shareReplay(1)));
+      }
+    }
+
+    return result;
+  }
+
+  get<
+    A extends json.JsonObject,
+    I extends BuilderInput,
+    O extends BuilderOutput,
+    >(name: string): Observable<experimental.jobs.JobHandler<A, I, O> | null> {
+    const m = name.match(/^([^:]+):([^:]+)$/i);
+    if (!m) {
+      return of(null);
+    }
+
+    return from(this._resolveBuilder(name)).pipe(
+      concatMap(builderInfo => builderInfo ? this._createBuilder(builderInfo) : of(null)),
+      first(null, null),
+    ) as Observable<experimental.jobs.JobHandler<A, I, O> | null>;
+  }
+}
+
+/**
+ * A JobRegistry that resolves targets from the host.
+ */
+export class ArchitectTargetJobRegistry extends ArchitectBuilderJobRegistry {
+  get<
+    A extends json.JsonObject,
+    I extends BuilderInput,
+    O extends BuilderOutput,
+    >(name: string): Observable<experimental.jobs.JobHandler<A, I, O> | null> {
+    const m = name.match(/^{([^:]+):([^:]+)(?::([^:]*))?}$/i);
+    if (!m) {
+      return of(null);
+    }
+
+    const target = {
+      project: m[1],
+      target: m[2],
+      configuration: m[3],
+    };
+
+    return from(Promise.all([
+      this._host.getBuilderNameForTarget(target),
+      this._host.getOptionsForTarget(target),
+    ])).pipe(
+      concatMap(([builderStr, options]) => {
+        if (builderStr === null || options === null) {
+          return of(null);
+        }
+
+        return this._resolveBuilder(builderStr).pipe(
+          concatMap(builderInfo => {
+            if (builderInfo === null) {
+              return of(null);
+            }
+
+            return this._createBuilder(builderInfo, target, options);
+          }),
+        );
+      }),
+      first(null, null),
+    ) as Observable<experimental.jobs.JobHandler<A, I, O> | null>;
+  }
+}
+
+
+export class Architect {
+  private readonly _scheduler: experimental.jobs.Scheduler;
+  private readonly _jobCache = new Map<string, Observable<BuilderJobHandler>>();
+  private readonly _infoCache = new Map<string, Observable<BuilderInfo>>();
+
+  constructor(
+    private _host: ArchitectHost,
+    private _registry: json.schema.SchemaRegistry = new json.schema.CoreSchemaRegistry(),
+    additionalJobRegistry?: experimental.jobs.Registry,
+  ) {
+    const jobRegistry = new experimental.jobs.FallbackRegistry([
+      new ArchitectTargetJobRegistry(_host, _registry, this._jobCache, this._infoCache),
+      new ArchitectBuilderJobRegistry(_host, _registry, this._jobCache, this._infoCache),
+      ...(additionalJobRegistry ? [additionalJobRegistry] : []),
+    ] as experimental.jobs.Registry[]);
+
+    this._scheduler = new experimental.jobs.SimpleScheduler(jobRegistry, _registry);
+  }
+
+  has(name: experimental.jobs.JobName) {
+    return this._scheduler.has(name);
+  }
+
+  scheduleBuilder(
+    name: string,
+    options: json.JsonObject,
+    scheduleOptions: ScheduleOptions = {},
+  ): Promise<BuilderRun> {
+    if (!/^[^:]+:[^:]+$/.test(name)) {
+      throw new Error('Invalid builder name: ' + JSON.stringify(name));
+    }
+
+    return scheduleByName(name, options, {
+      scheduler: this._scheduler,
+      logger: scheduleOptions.logger || new logging.NullLogger(),
+      currentDirectory: this._host.getCurrentDirectory(),
+      workspaceRoot: this._host.getWorkspaceRoot(),
+    });
+  }
+  scheduleTarget(
+    target: Target,
+    overrides: json.JsonObject = {},
+    scheduleOptions: ScheduleOptions = {},
+  ): Promise<BuilderRun> {
+    return scheduleByTarget(target, overrides, {
+      scheduler: this._scheduler,
+      logger: scheduleOptions.logger || new logging.NullLogger(),
+      currentDirectory: this._host.getCurrentDirectory(),
+      workspaceRoot: this._host.getWorkspaceRoot(),
+    });
+  }
+}
diff --git a/packages/angular_devkit/architect/src/builders-schema.json b/packages/angular_devkit/architect/src/builders-schema.json
index d111b24f0103..8c3f3e6cbc24 100644
--- a/packages/angular_devkit/architect/src/builders-schema.json
+++ b/packages/angular_devkit/architect/src/builders-schema.json
@@ -9,33 +9,62 @@
       "description": "Link to schema."
     },
     "builders": {
+      "type": "object",
       "additionalProperties": {
         "$ref": "#/definitions/builder"
       }
     }
   },
+  "required": [
+    "builders"
+  ],
   "definitions": {
     "builder": {
       "type": "object",
-      "description": "Target options.",
-      "properties": {
-        "class": {
-          "type": "string",
-          "description": "The builder class module."
-        },
-        "schema": {
-          "type": "string",
-          "description": "Schema for builder option validation."
+      "description": "Target options for Builders.",
+      "allOf": [
+        {
+          "properties": {
+            "schema": {
+              "type": "string",
+              "description": "Schema for builder option validation."
+            },
+            "description": {
+              "type": "string",
+              "description": "Builder description."
+            }
+          },
+          "required": [
+            "schema",
+            "description"
+          ]
         },
-        "description": {
-          "type": "string",
-          "description": "Builder description."
+        {
+          "anyOf": [
+            {
+              "properties": {
+                "implementation": {
+                  "type": "string",
+                  "description": "The next generation builder module."
+                }
+              },
+              "required": [
+                "implementation"
+              ]
+            },
+            {
+              "properties": {
+                "class": {
+                  "type": "string",
+                  "description": "The builder class module."
+                }
+              },
+              "required": [
+                "class"
+              ]
+            }
+          ]
         }
-      },
-      "required": [
-        "class",
-        "schema",
-        "description"
       ]
     }
   }
diff --git a/packages/angular_devkit/architect/src/create-builder.ts b/packages/angular_devkit/architect/src/create-builder.ts
new file mode 100644
index 000000000000..56053ad81a27
--- /dev/null
+++ b/packages/angular_devkit/architect/src/create-builder.ts
@@ -0,0 +1,171 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { experimental, isPromise, json } from '@angular-devkit/core';
+import { Observable, Subscription, from, isObservable, of } from 'rxjs';
+import { tap } from 'rxjs/operators';
+import {
+  BuilderContext,
+  BuilderHandlerFn,
+  BuilderInfo,
+  BuilderInput,
+  BuilderOutput,
+  BuilderProgressState,
+  Target,
+  TypedBuilderProgress,
+} from './api';
+import { Builder, BuilderSymbol, BuilderVersionSymbol } from './internal';
+import { scheduleByName, scheduleByTarget } from './schedule-by-name';
+
+
+export function createBuilder<OptT extends json.JsonObject>(
+  fn: BuilderHandlerFn<OptT>,
+): Builder<OptT> {
+  const cjh = experimental.jobs.createJobHandler;
+  const handler = cjh<json.JsonObject, BuilderInput, BuilderOutput>((options, context) => {
+    const scheduler = context.scheduler;
+    const logger = context.logger;
+    const progressChannel = context.createChannel('progress');
+    let currentState: BuilderProgressState = BuilderProgressState.Stopped;
+    let current = 0;
+    let status = '';
+    let total = 1;
+
+    function progress(progress: TypedBuilderProgress, context: BuilderContext) {
+      currentState = progress.state;
+      if (progress.state === BuilderProgressState.Running) {
+        current = progress.current;
+        total = progress.total !== undefined ? progress.total : total;
+
+        if (progress.status === undefined) {
+          progress.status = status;
+        } else {
+          status = progress.status;
+        }
+      }
+
+      progressChannel.next({
+        ...progress as json.JsonObject,
+        ...(context.target && { target: context.target }),
+        ...(context.builder && { builder: context.builder }),
+        id: context.id,
+      });
+    }
+
+    return new Observable<BuilderOutput>(observer => {
+      const subscriptions: Subscription[] = [];
+
+      const inputSubscription = context.inboundBus.subscribe(
+        i => {
+          switch (i.kind) {
+            case experimental.jobs.JobInboundMessageKind.Stop:
+              observer.complete();
+              break;
+            case experimental.jobs.JobInboundMessageKind.Input:
+              onInput(i.value);
+              break;
+          }
+        },
+      );
+
+      function onInput(i: BuilderInput) {
+        const builder = i.info as BuilderInfo;
+        const context: BuilderContext = {
+          builder,
+          workspaceRoot: i.workspaceRoot,
+          currentDirectory: i.currentDirectory,
+          target: i.target as Target,
+          logger: logger,
+          id: i.id,
+          async scheduleTarget(target: Target, overrides: json.JsonObject = {}) {
+            const run = await scheduleByTarget(target, overrides, {
+              scheduler,
+              logger: logger.createChild(''),
+              workspaceRoot: i.workspaceRoot,
+              currentDirectory: i.currentDirectory,
+            });
+
+            // We don't want to subscribe errors and complete.
+            subscriptions.push(run.progress.subscribe(event => progressChannel.next(event)));
+
+            return run;
+          },
+          async scheduleBuilder(builderName: string, options: json.JsonObject = {}) {
+            const run = await scheduleByName(builderName, options, {
+              scheduler,
+              logger: logger.createChild(''),
+              workspaceRoot: i.workspaceRoot,
+              currentDirectory: i.currentDirectory,
+            });
+
+            // We don't want to subscribe errors and complete.
+            subscriptions.push(run.progress.subscribe(event => progressChannel.next(event)));
+
+            return run;
+          },
+          reportRunning() {
+            switch (currentState) {
+              case BuilderProgressState.Waiting:
+              case BuilderProgressState.Stopped:
+                progress({state: BuilderProgressState.Running, current: 0, total}, context);
+                break;
+            }
+          },
+          reportStatus(status: string) {
+            switch (currentState) {
+              case BuilderProgressState.Running:
+                progress({ state: currentState, status, current, total }, context);
+                break;
+              case BuilderProgressState.Waiting:
+                progress({ state: currentState, status }, context);
+                break;
+            }
+          },
+          reportProgress(current: number, total?: number, status?: string) {
+            switch (currentState) {
+              case BuilderProgressState.Running:
+                progress({ state: currentState, current, total, status }, context);
+            }
+          },
+        };
+
+        context.reportRunning();
+        let result = fn(i.options as OptT, context);
+
+        if (isPromise(result)) {
+          result = from(result);
+        } else if (!isObservable(result)) {
+          result = of(result);
+        }
+
+        // Manage some state automatically.
+        progress({ state: BuilderProgressState.Running, current: 0, total: 1 }, context);
+        subscriptions.push(result.pipe(
+          tap(() => {
+            progress({ state: BuilderProgressState.Running, current: total }, context);
+            progress({ state: BuilderProgressState.Stopped }, context);
+          }),
+        ).subscribe(
+          message => observer.next(message),
+          error => observer.error(error),
+          () => observer.complete(),
+        ));
+      }
+
+      return () => {
+        subscriptions.forEach(x => x.unsubscribe());
+        inputSubscription.unsubscribe();
+      };
+    });
+  });
+
+  return {
+    handler,
+    [BuilderSymbol]: true,
+    [BuilderVersionSymbol]: require('../package.json').version,
+  };
+}
diff --git a/packages/angular_devkit/architect/src/index.ts b/packages/angular_devkit/architect/src/index.ts
index 1041aa4e5be0..d219e68bc09d 100644
--- a/packages/angular_devkit/architect/src/index.ts
+++ b/packages/angular_devkit/architect/src/index.ts
@@ -9,3 +9,8 @@
  * @deprecated
  */
 export * from './architect-legacy';
+
+import * as index2 from './index2';
+export {
+  index2,
+};
diff --git a/packages/angular_devkit/architect/src/index2.ts b/packages/angular_devkit/architect/src/index2.ts
new file mode 100644
index 000000000000..a21d4ff324b2
--- /dev/null
+++ b/packages/angular_devkit/architect/src/index2.ts
@@ -0,0 +1,10 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+export * from './api';
+export { Architect, ScheduleOptions } from './architect';
+export { createBuilder } from './create-builder';
diff --git a/packages/angular_devkit/architect/src/index2_spec.ts b/packages/angular_devkit/architect/src/index2_spec.ts
new file mode 100644
index 000000000000..d8c7b876c844
--- /dev/null
+++ b/packages/angular_devkit/architect/src/index2_spec.ts
@@ -0,0 +1,138 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { schema } from '@angular-devkit/core';
+import { timer } from 'rxjs';
+import { map, take, tap, toArray } from 'rxjs/operators';
+import { TestingArchitectHost } from '../testing/testing-architect-host';
+import { BuilderOutput } from './api';
+import { Architect } from './architect';
+import { createBuilder } from './create-builder';
+
+describe('architect', () => {
+  let testArchitectHost: TestingArchitectHost;
+  let architect: Architect;
+  let called = 0;
+  let options: {} = {};
+  const target1 = {
+    project: 'test',
+    target: 'test',
+  };
+  const target2 = {
+    project: 'test',
+    target: 'abc',
+  };
+
+  beforeEach(async () => {
+    const registry = new schema.CoreSchemaRegistry();
+    registry.addPostTransform(schema.transforms.addUndefinedDefaults);
+    testArchitectHost = new TestingArchitectHost();
+    architect = new Architect(testArchitectHost, registry);
+
+    called = 0;
+    testArchitectHost.addBuilder('package:test', createBuilder(async () => {
+      called++;
+
+      return new Promise<BuilderOutput>(resolve => {
+        setTimeout(() => resolve({ success: true }), 10);
+      });
+    }));
+    testArchitectHost.addBuilder('package:test-options', createBuilder(o => {
+      options = o;
+
+      return { success: true };
+    }));
+
+    testArchitectHost.addTarget(target1, 'package:test');
+    testArchitectHost.addTarget(target2, 'package:test');
+  });
+
+  it('works', async () => {
+    testArchitectHost.addBuilder('package:test', createBuilder(() => ({ success: true })));
+
+    const run = await architect.scheduleBuilder('package:test', {});
+    expect(await run.result).toEqual(jasmine.objectContaining({ success: true }));
+    await run.stop();
+  });
+
+  it('works with async builders', async () => {
+    testArchitectHost.addBuilder('package:test', createBuilder(async () => ({ success: true })));
+
+    const run = await architect.scheduleBuilder('package:test', {});
+    expect(await run.result).toEqual(jasmine.objectContaining({ success: true }));
+    await run.stop();
+  });
+
+  it('runs builders parallel', async () => {
+    const run = await architect.scheduleBuilder('package:test', {});
+    const run2 = await architect.scheduleBuilder('package:test', {});
+    expect(called).toBe(2);
+    expect(await run.result).toEqual(jasmine.objectContaining({ success: true }));
+    expect(await run2.result).toEqual(jasmine.objectContaining({ success: true }));
+    expect(called).toBe(2);
+    await run.stop();
+  });
+
+  it('runs targets parallel', async () => {
+    const run = await architect.scheduleTarget(target1, {});
+    const run2 = await architect.scheduleTarget(target1, {});
+    expect(called).toBe(2);
+    expect(await run.result).toEqual(jasmine.objectContaining({ success: true }));
+    expect(await run2.result).toEqual(jasmine.objectContaining({ success: true }));
+    expect(called).toBe(2);
+    await run.stop();
+  });
+
+  it('passes options to builders', async () => {
+    const o = { hello: 'world' };
+    const run = await architect.scheduleBuilder('package:test-options', o);
+    expect(await run.result).toEqual(jasmine.objectContaining({ success: true }));
+    expect(options).toEqual(o);
+  });
+
+  it('passes options to targets', async () => {
+    const o = { hello: 'world' };
+    const run = await architect.scheduleTarget(target1, o);
+    expect(await run.result).toEqual(jasmine.objectContaining({ success: true }));
+    expect(options).toEqual(o);
+  });
+
+  it('errors when builder cannot be resolved', async () => {
+    try {
+      await architect.scheduleBuilder('non:existent', {});
+      expect('to throw').not.toEqual('to throw');
+    } catch {
+    }
+  });
+
+  it('works with watching builders', async () => {
+    let results = 0;
+    testArchitectHost.addBuilder('package:test-watch', createBuilder((_, context) => {
+      called++;
+
+      return timer(10, 10).pipe(
+        take(10),
+        map(() => {
+          context.reportRunning();
+
+          return { success: true };
+        }),
+        tap(() => results++),
+      );
+    }));
+
+    const run = await architect.scheduleBuilder('package:test-watch', {});
+    await run.result;
+    expect(called).toBe(1);
+    expect(results).toBe(1);
+
+    const all = await run.output.pipe(toArray()).toPromise();
+    expect(called).toBe(1);
+    expect(results).toBe(10);
+    expect(all.length).toBe(10);
+  });
+});
diff --git a/packages/angular_devkit/architect/src/input-schema.json b/packages/angular_devkit/architect/src/input-schema.json
new file mode 100644
index 000000000000..47d9c30014e5
--- /dev/null
+++ b/packages/angular_devkit/architect/src/input-schema.json
@@ -0,0 +1,47 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "BuilderInputSchema",
+  "title": "Input schema for builders.",
+  "type": "object",
+  "properties": {
+    "workspaceRoot": {
+      "type": "string"
+    },
+    "currentDirectory": {
+      "type": "string"
+    },
+    "id": {
+      "type": "number"
+    },
+    "target": {
+      "type": "object",
+      "properties": {
+        "project": {
+          "type": "string"
+        },
+        "target": {
+          "type": "string"
+        },
+        "configuration": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "project",
+        "target"
+      ]
+    },
+    "info": {
+      "type": "object"
+    },
+    "options": {
+      "type": "object"
+    }
+  },
+  "required": [
+    "currentDirectory",
+    "id",
+    "info",
+    "workspaceRoot"
+  ]
+}
diff --git a/packages/angular_devkit/architect/src/internal.ts b/packages/angular_devkit/architect/src/internal.ts
new file mode 100644
index 000000000000..0ccf439926ee
--- /dev/null
+++ b/packages/angular_devkit/architect/src/internal.ts
@@ -0,0 +1,81 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { experimental, json } from '@angular-devkit/core';
+import { BuilderInfo, BuilderInput, BuilderOutput, Target } from './api';
+
+// Internal types that should not be exported directly. These are used by the host and architect
+// itself. Host implementations should import the host.ts file.
+
+/**
+ * BuilderSymbol used for knowing if a function was created using createBuilder(). This is a
+ * property set on the function that should be `true`.
+ * Using Symbol.for() as it's a global registry that's the same for all installations of
+ * Architect (if some libraries depends directly on architect instead of sharing the files).
+ */
+export const BuilderSymbol = Symbol.for('@angular-devkit/architect:builder');
+
+/**
+ * BuilderVersionSymbol used for knowing which version of the library createBuilder() came from.
+ * This is to make sure we don't try to use an incompatible builder.
+ * Using Symbol.for() as it's a global registry that's the same for all installations of
+ * Architect (if some libraries depends directly on architect instead of sharing the files).
+ */
+export const BuilderVersionSymbol = Symbol.for('@angular-devkit/architect:version');
+
+/**
+ * A Specialization of the JobHandler type. This exposes BuilderDescription as the job description
+ * type.
+ */
+export type BuilderJobHandler<
+  A extends json.JsonObject = json.JsonObject,
+  I extends BuilderInput = BuilderInput,
+  O extends BuilderOutput = BuilderOutput,
+> = experimental.jobs.JobHandler<A, I, O> & { jobDescription: BuilderDescription };
+
+/**
+ * A Builder description, which is used internally. Adds the builder info which is the
+ * metadata attached to a builder in Architect.
+ */
+export interface BuilderDescription extends experimental.jobs.JobDescription {
+  info: BuilderInfo;
+}
+
+/**
+ * A Builder instance. Use createBuilder() to create one of these.
+ */
+export interface Builder<OptionT extends json.JsonObject = json.JsonObject> {
+  // A fully compatible job handler.
+  handler: experimental.jobs.JobHandler<json.JsonObject, BuilderInput, BuilderOutput>;
+
+  // Metadata associated with this builder.
+  [BuilderSymbol]: true;
+  [BuilderVersionSymbol]: string;
+}
+
+export interface ArchitectHost<BuilderInfoT extends BuilderInfo = BuilderInfo> {
+  /**
+   * Get the builder name for a target.
+   * @param target The target to inspect.
+   */
+  getBuilderNameForTarget(target: Target): Promise<string | null>;
+
+  /**
+   * Resolve a builder. This needs to return a string which will be used in a dynamic `import()`
+   * clause. This should throw if no builder can be found. The dynamic import will throw if
+   * it is unsupported.
+   * @param builderName The name of the builder to be used.
+   * @returns All the info needed for the builder itself.
+   */
+  resolveBuilder(builderName: string): Promise<BuilderInfoT | null>;
+  loadBuilder(info: BuilderInfoT): Promise<Builder | null>;
+
+  getCurrentDirectory(): Promise<string>;
+  getWorkspaceRoot(): Promise<string>;
+
+  getOptionsForTarget(target: Target): Promise<json.JsonObject | null>;
+}
diff --git a/packages/angular_devkit/architect/src/output-schema.json b/packages/angular_devkit/architect/src/output-schema.json
new file mode 100644
index 000000000000..8dbcc54add57
--- /dev/null
+++ b/packages/angular_devkit/architect/src/output-schema.json
@@ -0,0 +1,34 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "BuilderOutputSchema",
+  "title": "Output schema for builders.",
+  "type": "object",
+  "properties": {
+    "success": {
+      "type": "boolean"
+    },
+    "error": {
+      "type": "string"
+    },
+    "target": {
+      "type": "object",
+      "properties": {
+        "project": {
+          "type": "string"
+        },
+        "target": {
+          "type": "string"
+        },
+        "configuration": {
+          "type": "string"
+        }
+      }
+    },
+    "info": {
+      "type": "object"
+    }
+  },
+  "required": [
+    "success"
+  ]
+}
diff --git a/packages/angular_devkit/architect/src/progress-schema.json b/packages/angular_devkit/architect/src/progress-schema.json
new file mode 100644
index 000000000000..24cd967a4f92
--- /dev/null
+++ b/packages/angular_devkit/architect/src/progress-schema.json
@@ -0,0 +1,102 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "BuilderProgressSchema",
+  "title": "Progress schema for builders.",
+  "type": "object",
+  "allOf": [
+    {
+      "type": "object",
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
+            "state": {
+              "type": "string",
+              "enum": [
+                "stopped"
+              ]
+            }
+          },
+          "required": [
+            "state"
+          ]
+        },
+        {
+          "type": "object",
+          "properties": {
+            "state": {
+              "type": "string",
+              "enum": [
+                "waiting"
+              ]
+            },
+            "status": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "state"
+          ]
+        },
+        {
+          "type": "object",
+          "properties": {
+            "state": {
+              "type": "string",
+              "enum": [
+                "running"
+              ]
+            },
+            "current": {
+              "type": "number",
+              "minimum": 0
+            },
+            "total": {
+              "type": "number",
+              "minimum": 0
+            },
+            "status": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "state"
+          ]
+        },
+        {
+          "type": "object",
+          "properties": {
+            "state": {
+              "type": "string",
+              "enum": [
+                "error"
+              ]
+            },
+            "error": true
+          },
+          "required": [
+            "state"
+          ]
+        }
+      ]
+    },
+    {
+      "type": "object",
+      "properties": {
+        "builder": {
+          "type": "object"
+        },
+        "target": {
+          "type": "object"
+        },
+        "id": {
+          "type": "number"
+        }
+      },
+      "required": [
+        "builder",
+        "id"
+      ]
+    }
+  ]
+}
diff --git a/packages/angular_devkit/architect/src/schedule-by-name.ts b/packages/angular_devkit/architect/src/schedule-by-name.ts
new file mode 100644
index 000000000000..d3bc12b07040
--- /dev/null
+++ b/packages/angular_devkit/architect/src/schedule-by-name.ts
@@ -0,0 +1,121 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { experimental, json, logging } from '@angular-devkit/core';
+import { Subscription } from 'rxjs';
+import { first, ignoreElements, map, shareReplay } from 'rxjs/operators';
+import {
+  BuilderInfo,
+  BuilderInput,
+  BuilderOutput, BuilderProgressReport,
+  BuilderRun,
+  Target,
+  targetStringFromTarget,
+} from './api';
+
+const progressSchema = require('./progress-schema.json');
+
+
+let _uniqueId = 0;
+
+export async function scheduleByName(
+  name: string,
+  buildOptions: json.JsonObject,
+  options: {
+    target?: Target,
+    scheduler: experimental.jobs.Scheduler,
+    logger: logging.LoggerApi,
+    workspaceRoot: string | Promise<string>,
+    currentDirectory: string | Promise<string>,
+  },
+): Promise<BuilderRun> {
+  const childLoggerName = options.target ? `{${targetStringFromTarget(options.target)}}` : name;
+  const logger = options.logger.createChild(childLoggerName);
+  const job = options.scheduler.schedule<{}, BuilderInput, BuilderOutput>(name, {});
+  let stateSubscription: Subscription;
+
+  const workspaceRoot = await options.workspaceRoot;
+  const currentDirectory = await options.currentDirectory;
+
+  const description = await job.description.toPromise();
+  const info = description.info as BuilderInfo;
+  const id = ++_uniqueId;
+
+  const message = {
+    id,
+    currentDirectory: workspaceRoot,
+    workspaceRoot: currentDirectory,
+    info: info,
+    options: buildOptions,
+    ...(options.target ? { target: options.target } : {}),
+  };
+
+  // Wait for the job to be ready.
+  if (job.state !== experimental.jobs.JobState.Started) {
+    stateSubscription = job.outboundBus.subscribe(event => {
+      if (event.kind === experimental.jobs.JobOutboundMessageKind.Start) {
+        job.input.next(message);
+      }
+    });
+  } else {
+    job.input.next(message);
+  }
+
+  const s = job.outboundBus.subscribe(
+    message => {
+      if (message.kind == experimental.jobs.JobOutboundMessageKind.Log) {
+        logger.log(message.entry.level, message.entry.message, message.entry);
+      }
+    },
+    undefined,
+    () => {
+      s.unsubscribe();
+      if (stateSubscription) {
+        stateSubscription.unsubscribe();
+      }
+    },
+  );
+  const output = job.output.pipe(
+    map(output => ({
+      ...output,
+      ...options.target ? { target: options.target } : 0,
+      info,
+    } as BuilderOutput)),
+  );
+
+  return {
+    id,
+    info,
+    result: output.pipe(first()).toPromise(),
+    output,
+    progress: job.getChannel<BuilderProgressReport>('progress', progressSchema).pipe(
+      shareReplay(1),
+    ),
+    stop() {
+      job.stop();
+
+      return output.pipe(ignoreElements()).toPromise();
+    },
+  };
+}
+
+export async function scheduleByTarget(
+  target: Target,
+  overrides: json.JsonObject,
+  options: {
+    scheduler: experimental.jobs.Scheduler,
+    logger: logging.LoggerApi,
+    workspaceRoot: string | Promise<string>,
+    currentDirectory: string | Promise<string>,
+  },
+): Promise<BuilderRun> {
+  return scheduleByName(`{${targetStringFromTarget(target)}}`, overrides, {
+    ...options,
+    target,
+    logger: options.logger,
+  });
+}
diff --git a/packages/angular_devkit/architect/testing/index2.ts b/packages/angular_devkit/architect/testing/index2.ts
new file mode 100644
index 000000000000..783d596d1a54
--- /dev/null
+++ b/packages/angular_devkit/architect/testing/index2.ts
@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export * from './testing-architect-host';
diff --git a/packages/angular_devkit/architect/testing/testing-architect-host.ts b/packages/angular_devkit/architect/testing/testing-architect-host.ts
new file mode 100644
index 000000000000..1e4824aac36f
--- /dev/null
+++ b/packages/angular_devkit/architect/testing/testing-architect-host.ts
@@ -0,0 +1,108 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { json } from '@angular-devkit/core';
+import { BuilderInfo, Target, targetStringFromTarget } from '../src/index2';
+import { ArchitectHost, Builder } from '../src/internal';
+
+export class TestingArchitectHost implements ArchitectHost {
+  private _builderImportMap = new Map<string, Builder>();
+  private _builderMap = new Map<string, BuilderInfo>();
+  private _targetMap = new Map<string, { builderName: string, options: json.JsonObject }>();
+
+  /**
+   * Can provide a backend host, in case of integration tests.
+   * @param workspaceRoot The workspace root to use.
+   * @param currentDirectory The current directory to use.
+   * @param _backendHost A host to defer calls that aren't resolved here.
+   */
+  constructor(
+    public workspaceRoot = '',
+    public currentDirectory = workspaceRoot,
+    private _backendHost: ArchitectHost | null = null,
+  ) {}
+
+  addBuilder(
+    builderName: string,
+    builder: Builder,
+    description = 'Testing only builder.',
+    optionSchema: json.schema.JsonSchema = { type: 'object' },
+  ) {
+    this._builderImportMap.set(builderName, builder);
+    this._builderMap.set(builderName, { builderName, description, optionSchema });
+  }
+  async addBuilderFromPackage(packageName: string) {
+    const packageJson = await import(packageName + '/package.json');
+    if (!('builders' in packageJson)) {
+      throw new Error('Invalid package.json, builders key not found.');
+    }
+
+    const builderJsonPath = packageName + '/' + packageJson['builders'];
+    const builderJson = await import(builderJsonPath);
+    const builders = builderJson['builders'];
+    if (!builders) {
+      throw new Error('Invalid builders.json, builders key not found.');
+    }
+
+    for (const builderName of Object.keys(builders)) {
+      const b = builders[builderName];
+      // TODO: remove this check as v1 is not supported anymore.
+      if (!b.implementation) { continue; }
+      const handler = await import(builderJsonPath + '/../' + b.implementation);
+      const optionsSchema = await import(builderJsonPath + '/../' + b.schema);
+      this.addBuilder(builderName, handler, b.description, optionsSchema);
+    }
+  }
+  addTarget(target: Target, builderName: string, options: json.JsonObject = {}) {
+    this._targetMap.set(targetStringFromTarget(target), { builderName, options });
+  }
+
+  async getBuilderNameForTarget(target: Target): Promise<string | null> {
+    const name = targetStringFromTarget(target);
+    const maybeTarget = this._targetMap.get(name);
+    if (!maybeTarget) {
+      return this._backendHost && this._backendHost.getBuilderNameForTarget(target);
+    }
+
+    return maybeTarget.builderName;
+  }
+
+  /**
+   * Resolve a builder. This needs to return a string which will be used in a dynamic `import()`
+   * clause. This should throw if no builder can be found. The dynamic import will throw if
+   * it is unsupported.
+   * @param builderName The name of the builder to be used.
+   * @returns All the info needed for the builder itself.
+   */
+  async resolveBuilder(builderName: string): Promise<BuilderInfo | null> {
+    return this._builderMap.get(builderName)
+        || (this._backendHost && this._backendHost.resolveBuilder(builderName));
+  }
+
+  async getCurrentDirectory(): Promise<string> {
+    return this.currentDirectory;
+  }
+  async getWorkspaceRoot(): Promise<string> {
+    return this.workspaceRoot;
+  }
+
+  async getOptionsForTarget(target: Target): Promise<json.JsonObject | null> {
+    const name = targetStringFromTarget(target);
+    const maybeTarget = this._targetMap.get(name);
+    if (!maybeTarget) {
+      return this._backendHost && this._backendHost.getOptionsForTarget(target);
+    }
+
+    return maybeTarget.options;
+  }
+
+  async loadBuilder(info: BuilderInfo): Promise<Builder | null> {
+    return this._builderImportMap.get(info.builderName)
+        || (this._backendHost && this._backendHost.loadBuilder(info));
+  }
+
+}

From 79a69882751f2b9df9954b6b926143519fb2e78f Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Wed, 13 Feb 2019 11:52:07 -0800
Subject: [PATCH 0772/1703] feat(@angular-devkit/architect): add node architect
 host

This host resolves using the package resolution and reading the targets
from the workspace API.
---
 packages/angular_devkit/architect/BUILD       |  25 ++++
 .../angular_devkit/architect/node/index.ts    |   8 ++
 .../node/node-modules-architect-host.ts       | 109 ++++++++++++++++++
 3 files changed, 142 insertions(+)
 create mode 100644 packages/angular_devkit/architect/node/index.ts
 create mode 100644 packages/angular_devkit/architect/node/node-modules-architect-host.ts

diff --git a/packages/angular_devkit/architect/BUILD b/packages/angular_devkit/architect/BUILD
index 98e2432d239d..e54ab10149c2 100644
--- a/packages/angular_devkit/architect/BUILD
+++ b/packages/angular_devkit/architect/BUILD
@@ -28,6 +28,31 @@ ts_json_schema(
     src = "src/progress-schema.json",
 )
 
+ts_library(
+    name = "node",
+    srcs = glob(
+        include = ["node/**/*.ts"],
+        exclude = [
+            "**/*_spec.ts",
+            "**/*_spec_large.ts",
+        ],
+    ),
+    module_name = "@angular-devkit/architect/node",
+    module_root = "node/index.d.ts",
+    # strict_checks = False,
+    deps = [
+        "//packages/angular_devkit/core",
+        "//packages/angular_devkit/core:node",
+        "@rxjs",
+        "@rxjs//operators",
+        "@npm//@types/node",
+        ":architect",
+        ":builder_builders_schema",
+        ":builder_input_schema",
+        ":builder_output_schema",
+    ],
+)
+
 ts_library(
     name = "architect",
     srcs = glob(
diff --git a/packages/angular_devkit/architect/node/index.ts b/packages/angular_devkit/architect/node/index.ts
new file mode 100644
index 000000000000..721047f44093
--- /dev/null
+++ b/packages/angular_devkit/architect/node/index.ts
@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+export * from './node-modules-architect-host';
diff --git a/packages/angular_devkit/architect/node/node-modules-architect-host.ts b/packages/angular_devkit/architect/node/node-modules-architect-host.ts
new file mode 100644
index 000000000000..7574f0e78eed
--- /dev/null
+++ b/packages/angular_devkit/architect/node/node-modules-architect-host.ts
@@ -0,0 +1,109 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { experimental, json } from '@angular-devkit/core';
+import { resolve } from '@angular-devkit/core/node';
+import * as path from 'path';
+import { Schema as BuilderSchema } from '../src/builders-schema';
+import { BuilderInfo } from '../src/index2';
+import { Target } from '../src/input-schema';
+import { ArchitectHost, Builder, BuilderSymbol } from '../src/internal';
+
+
+export type NodeModulesBuilderInfo = BuilderInfo & {
+  import: string;
+};
+
+
+// TODO: create a base class for all workspace related hosts.
+export class WorkspaceNodeModulesArchitectHost implements ArchitectHost<NodeModulesBuilderInfo> {
+  constructor(
+    protected _workspace: experimental.workspace.Workspace,
+    protected _root: string,
+  ) {}
+
+  async getBuilderNameForTarget(target: Target) {
+    return this._workspace.getProjectTargets(target.project)[target.target]['builder'];
+  }
+
+  /**
+   * Resolve a builder. This needs to be a string which will be used in a dynamic `import()`
+   * clause. This should throw if no builder can be found. The dynamic import will throw if
+   * it is unsupported.
+   * @param builderStr The name of the builder to be used.
+   * @returns All the info needed for the builder itself.
+   */
+  resolveBuilder(builderStr: string): Promise<NodeModulesBuilderInfo> {
+    const [packageName, builderName] = builderStr.split(':', 2);
+    if (!builderName) {
+      throw new Error('No builder name specified.');
+    }
+
+    const packageJsonPath = resolve(packageName, {
+      basedir: this._root,
+      checkLocal: true,
+      checkGlobal: true,
+      resolvePackageJson: true,
+    });
+
+    const packageJson = require(packageJsonPath);
+    if (!packageJson['builders']) {
+      throw new Error(`Package ${JSON.stringify(packageName)} has no builders defined.`);
+    }
+
+    const builderJsonPath = path.resolve(path.dirname(packageJsonPath), packageJson['builders']);
+    const builderJson = require(builderJsonPath) as BuilderSchema;
+
+    const builder = builderJson.builders && builderJson.builders[builderName];
+
+    if (!builder) {
+      throw new Error(`Cannot find builder ${JSON.stringify(builderName)}.`);
+    }
+
+    const importPath = builder.implementation;
+    if (!importPath) {
+      throw new Error('Invalid builder JSON');
+    }
+
+    return Promise.resolve({
+      name: builderStr,
+      builderName,
+      description: builder['description'],
+      optionSchema: require(path.resolve(path.dirname(builderJsonPath), builder.schema)),
+      import: path.resolve(path.dirname(builderJsonPath), importPath),
+    });
+  }
+
+  async getCurrentDirectory() {
+    return process.cwd();
+  }
+
+  async getWorkspaceRoot() {
+    return this._root;
+  }
+
+  async getOptionsForTarget(target: Target): Promise<json.JsonObject> {
+    const targetSpec = this._workspace.getProjectTargets(target.project)[target.target];
+    if (target.configuration && !targetSpec['configurations']) {
+      throw new Error('Configuration not set in the workspace.');
+    }
+
+    return {
+      ...targetSpec['options'],
+      ...(target.configuration ? targetSpec['configurations'][target.configuration] : 0),
+    };
+  }
+
+  async loadBuilder(info: NodeModulesBuilderInfo): Promise<Builder> {
+    const builder = (await import(info.import)).default;
+    if (builder[BuilderSymbol]) {
+      return builder;
+    }
+
+    throw new Error('Builder is not a builder');
+  }
+}

From 685d4d0c6c66a6cada4d2b6d6a2a24b1b14ca3d8 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Wed, 13 Feb 2019 11:54:56 -0800
Subject: [PATCH 0773/1703] feat(@angular-devkit/architect): add generic
 architect builders

Four builders were added;
- true, always succeed
- false, always fails
- concat, runs all targets or builders in succession
- allOf, runs all targets or builders in parallel
---
 .../architect/builders/all-of.ts              | 59 +++++++++++++++++++
 .../architect/builders/builders.json          | 25 ++++++++
 .../architect/builders/concat.ts              | 56 ++++++++++++++++++
 .../architect/builders/false.ts               | 14 +++++
 .../architect/builders/noop-schema.json       |  4 ++
 .../architect/builders/operator-schema.json   | 45 ++++++++++++++
 .../angular_devkit/architect/builders/true.ts | 11 ++++
 .../angular_devkit/architect/package.json     |  5 +-
 8 files changed, 217 insertions(+), 2 deletions(-)
 create mode 100644 packages/angular_devkit/architect/builders/all-of.ts
 create mode 100644 packages/angular_devkit/architect/builders/builders.json
 create mode 100644 packages/angular_devkit/architect/builders/concat.ts
 create mode 100644 packages/angular_devkit/architect/builders/false.ts
 create mode 100644 packages/angular_devkit/architect/builders/noop-schema.json
 create mode 100644 packages/angular_devkit/architect/builders/operator-schema.json
 create mode 100644 packages/angular_devkit/architect/builders/true.ts

diff --git a/packages/angular_devkit/architect/builders/all-of.ts b/packages/angular_devkit/architect/builders/all-of.ts
new file mode 100644
index 000000000000..491bdd682322
--- /dev/null
+++ b/packages/angular_devkit/architect/builders/all-of.ts
@@ -0,0 +1,59 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { json } from '@angular-devkit/core';
+import { EMPTY, from, of } from 'rxjs';
+import { map, mergeMap } from 'rxjs/operators';
+import { BuilderOutput, BuilderRun, createBuilder } from '../src/index2';
+import { Schema as OperatorSchema } from './operator-schema';
+
+export default createBuilder<json.JsonObject & OperatorSchema>((options, context) => {
+  const allRuns: Promise<[number, BuilderRun]>[] = [];
+
+  context.reportProgress(0,
+    (options.targets ? options.targets.length : 0)
+    + (options.builders ? options.builders.length : 0),
+  );
+
+  if (options.targets) {
+    allRuns.push(...options.targets.map(({ target: targetStr, overrides }, i) => {
+      const [project, target, configuration] = targetStr.split(/:/g, 3);
+
+      return context.scheduleTarget({ project, target, configuration }, overrides || {})
+        .then(run => [i, run] as [number, BuilderRun]);
+    }));
+  }
+
+  if (options.builders) {
+    allRuns.push(...options.builders.map(({ builder, options }, i) => {
+      return context.scheduleBuilder(builder, options || {})
+        .then(run => [i, run] as [number, BuilderRun]);
+    }));
+  }
+
+  const allResults: (BuilderOutput | null)[] = allRuns.map(() => null);
+  let n = 0;
+  context.reportProgress(n++, allRuns.length);
+
+  return from(allRuns).pipe(
+    mergeMap(runPromise => from(runPromise)),
+    mergeMap(([i, run]: [number, BuilderRun]) => run.output.pipe(map(output => [i, output]))),
+    mergeMap<[number, BuilderOutput], BuilderOutput>(([i, output]) => {
+      allResults[i] = output;
+      context.reportProgress(n++, allRuns.length);
+
+      if (allResults.some(x => x === null)) {
+        // Some builders aren't done running yet.
+        return EMPTY;
+      } else {
+        return of({
+          success: allResults.every(x => x ? x.success : false),
+        });
+      }
+    }),
+  );
+});
diff --git a/packages/angular_devkit/architect/builders/builders.json b/packages/angular_devkit/architect/builders/builders.json
new file mode 100644
index 000000000000..5bbff8289447
--- /dev/null
+++ b/packages/angular_devkit/architect/builders/builders.json
@@ -0,0 +1,25 @@
+{
+  "$schema": "../src/builders-schema.json",
+  "builders": {
+    "true": {
+      "implementation": "./true",
+      "schema": "./noop-schema.json",
+      "description": "Always succeed."
+    },
+    "false": {
+      "implementation": "./false",
+      "schema": "./noop-schema.json",
+      "description": "Always fails."
+    },
+    "allOf": {
+      "implementation": "./all-of",
+      "schema": "./operator-schema.json",
+      "description": "A builder that executes many builders in parallel, and succeed if both succeeds."
+    },
+    "concat": {
+      "implementation": "./concat",
+      "schema": "./operator-schema.json",
+      "description": "A builder that executes many builders one after the other, and stops when one fail. It will succeed if all builders succeeds (and return the last output)"
+    }
+  }
+}
diff --git a/packages/angular_devkit/architect/builders/concat.ts b/packages/angular_devkit/architect/builders/concat.ts
new file mode 100644
index 000000000000..53ed963be610
--- /dev/null
+++ b/packages/angular_devkit/architect/builders/concat.ts
@@ -0,0 +1,56 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { json } from '@angular-devkit/core';
+import { from, of } from 'rxjs';
+import { concatMap, first, last, map, switchMap } from 'rxjs/operators';
+import { BuilderOutput, BuilderRun, createBuilder } from '../src/index2';
+import { Schema as OperatorSchema } from './operator-schema';
+
+export default createBuilder<json.JsonObject & OperatorSchema>((options, context) => {
+  const allRuns: (() => Promise<BuilderRun>)[] = [];
+
+  context.reportProgress(0,
+    (options.targets ? options.targets.length : 0)
+    + (options.builders ? options.builders.length : 0),
+  );
+
+  if (options.targets) {
+    allRuns.push(...options.targets.map(({ target: targetStr, overrides }) => {
+      const [project, target, configuration] = targetStr.split(/:/g, 3);
+
+      return () => context.scheduleTarget({ project, target, configuration }, overrides || {});
+    }));
+  }
+
+  if (options.builders) {
+    allRuns.push(...options.builders.map(({ builder, options }) => {
+      return () => context.scheduleBuilder(builder, options || {});
+    }));
+  }
+
+  let stop: BuilderOutput | null = null;
+  let i = 0;
+  context.reportProgress(i++, allRuns.length);
+
+  return from(allRuns).pipe(
+    concatMap(fn => stop ? of(null) : from(fn()).pipe(
+      switchMap(run => run === null ? of(null) : run.output.pipe(first())),
+    )),
+    map(output => {
+      context.reportProgress(i++, allRuns.length);
+      if (output === null || stop !== null) {
+        return stop || { success: false };
+      } else if (output.success === false) {
+        return stop = output;
+      } else {
+        return output;
+      }
+    }),
+    last(),
+  );
+});
diff --git a/packages/angular_devkit/architect/builders/false.ts b/packages/angular_devkit/architect/builders/false.ts
new file mode 100644
index 000000000000..4c980ae57752
--- /dev/null
+++ b/packages/angular_devkit/architect/builders/false.ts
@@ -0,0 +1,14 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { of } from 'rxjs';
+import { createBuilder } from '../src/index2';
+
+export default createBuilder(() => of({
+  success: false,
+  error: 'False builder always errors.',
+}));
diff --git a/packages/angular_devkit/architect/builders/noop-schema.json b/packages/angular_devkit/architect/builders/noop-schema.json
new file mode 100644
index 000000000000..afadf0925f37
--- /dev/null
+++ b/packages/angular_devkit/architect/builders/noop-schema.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "type": "object"
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/architect/builders/operator-schema.json b/packages/angular_devkit/architect/builders/operator-schema.json
new file mode 100644
index 000000000000..8519c83ee7d4
--- /dev/null
+++ b/packages/angular_devkit/architect/builders/operator-schema.json
@@ -0,0 +1,45 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "description": "All input types of builders that perform operations on one or multiple sub-builders.",
+  "type": "object",
+  "properties": {
+    "builders": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "builder": {
+            "type": "string",
+            "pattern": ".*:.*"
+          },
+          "options": {
+            "type": "object"
+          }
+        },
+        "required": [
+          "builder"
+        ]
+      },
+      "minItems": 1
+    },
+    "targets": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "target": {
+            "type": "string",
+            "pattern": ".*:.*"
+          },
+          "overrides": {
+            "type": "object"
+          }
+        },
+        "required": [
+          "target"
+        ]
+      },
+      "minItems": 1
+    }
+  }
+}
diff --git a/packages/angular_devkit/architect/builders/true.ts b/packages/angular_devkit/architect/builders/true.ts
new file mode 100644
index 000000000000..cbb1e2ee55a3
--- /dev/null
+++ b/packages/angular_devkit/architect/builders/true.ts
@@ -0,0 +1,11 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { of } from 'rxjs';
+import { createBuilder } from '../src/index2';
+
+export default createBuilder(() => of({ success: true }));
diff --git a/packages/angular_devkit/architect/package.json b/packages/angular_devkit/architect/package.json
index f04b3a985ffa..1a5c8b0c3c93 100644
--- a/packages/angular_devkit/architect/package.json
+++ b/packages/angular_devkit/architect/package.json
@@ -7,5 +7,6 @@
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
     "rxjs": "6.3.3"
-  }
-}
\ No newline at end of file
+  },
+  "builders": "./builders/builders.json"
+}

From df1b56c2518f00dcbbd0f36c009f2a4012d28c13 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Wed, 13 Feb 2019 11:57:14 -0800
Subject: [PATCH 0774/1703] feat(@angular-devkit/build-angular): move tslint to
 new API

It is only new files and the old builder is still available. The new
one can only be used by the new Architect API.
---
 .../build_angular/builders.json               |   1 +
 .../build_angular/src/tslint/index2.ts        | 234 +++++++++++++++
 .../test/tslint/works2_spec_large.ts          | 278 ++++++++++++++++++
 3 files changed, 513 insertions(+)
 create mode 100644 packages/angular_devkit/build_angular/src/tslint/index2.ts
 create mode 100644 packages/angular_devkit/build_angular/test/tslint/works2_spec_large.ts

diff --git a/packages/angular_devkit/build_angular/builders.json b/packages/angular_devkit/build_angular/builders.json
index bf8b1a6ca284..6d299c5751b3 100644
--- a/packages/angular_devkit/build_angular/builders.json
+++ b/packages/angular_devkit/build_angular/builders.json
@@ -32,6 +32,7 @@
       "description": "Run protractor over a dev server."
     },
     "tslint": {
+      "implementation": "./src/tslint/index2",
       "class": "./src/tslint",
       "schema": "./src/tslint/schema.json",
       "description": "Run tslint over a TS project."
diff --git a/packages/angular_devkit/build_angular/src/tslint/index2.ts b/packages/angular_devkit/build_angular/src/tslint/index2.ts
new file mode 100644
index 000000000000..c301628db64e
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/tslint/index2.ts
@@ -0,0 +1,234 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect/src/index2';
+import { json } from '@angular-devkit/core';
+import { readFileSync } from 'fs';
+import * as glob from 'glob';
+import { Minimatch } from 'minimatch';
+import * as path from 'path';
+import * as tslint from 'tslint'; // tslint:disable-line:no-implicit-dependencies
+import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
+import { stripBom } from '../angular-cli-files/utilities/strip-bom';
+import { Schema as RealTslintBuilderOptions } from './schema';
+
+
+type TslintBuilderOptions = RealTslintBuilderOptions & json.JsonObject;
+
+
+async function _loadTslint() {
+  let tslint;
+  try {
+    tslint = await import('tslint'); // tslint:disable-line:no-implicit-dependencies
+  } catch {
+    throw new Error('Unable to find TSLint. Ensure TSLint is installed.');
+  }
+
+  const version = tslint.Linter.VERSION && tslint.Linter.VERSION.split('.');
+  if (!version || version.length < 2 || Number(version[0]) < 5 || Number(version[1]) < 5) {
+    throw new Error('TSLint must be version 5.5 or higher.');
+  }
+
+  return tslint;
+}
+
+
+async function _run(config: TslintBuilderOptions, context: BuilderContext): Promise<BuilderOutput> {
+  const systemRoot = context.workspaceRoot;
+  process.chdir(context.currentDirectory);
+  const options = config;
+  const projectName = context.target && context.target.project || '<???>';
+
+  // Print formatter output only for non human-readable formats.
+  const printInfo = ['prose', 'verbose', 'stylish'].includes(options.format || '')
+                    && !options.silent;
+
+  context.reportStatus(`Linting ${JSON.stringify(projectName)}...`);
+  if (printInfo) {
+    context.logger.info(`Linting ${JSON.stringify(projectName)}...`);
+  }
+
+  if (!options.tsConfig && options.typeCheck) {
+    throw new Error('A "project" must be specified to enable type checking.');
+  }
+
+  const projectTslint = await _loadTslint();
+  const tslintConfigPath = options.tslintConfig
+    ? path.resolve(systemRoot, options.tslintConfig)
+    : null;
+  const Linter = projectTslint.Linter;
+
+  let result: undefined | tslint.LintResult = undefined;
+  if (options.tsConfig) {
+    const tsConfigs = Array.isArray(options.tsConfig) ? options.tsConfig : [options.tsConfig];
+    context.reportProgress(0, tsConfigs.length);
+    const allPrograms = tsConfigs.map(tsConfig => {
+      return Linter.createProgram(path.resolve(systemRoot, tsConfig));
+    });
+
+    let i = 0;
+    for (const program of allPrograms) {
+      const partial
+        = await _lint(projectTslint, systemRoot, tslintConfigPath, options, program, allPrograms);
+      if (result === undefined) {
+        result = partial;
+      } else {
+        result.failures = result.failures
+          .filter(curr => {
+            return !partial.failures.some(prev => curr.equals(prev));
+          })
+          .concat(partial.failures);
+
+        // we are not doing much with 'errorCount' and 'warningCount'
+        // apart from checking if they are greater than 0 thus no need to dedupe these.
+        result.errorCount += partial.errorCount;
+        result.warningCount += partial.warningCount;
+
+        if (partial.fixes) {
+          result.fixes = result.fixes ? result.fixes.concat(partial.fixes) : partial.fixes;
+        }
+      }
+
+      context.reportProgress(++i, allPrograms.length);
+    }
+  } else {
+    result = await _lint(projectTslint, systemRoot, tslintConfigPath, options);
+  }
+
+  if (result == undefined) {
+    throw new Error('Invalid lint configuration. Nothing to lint.');
+  }
+
+  if (!options.silent) {
+    const Formatter = projectTslint.findFormatter(options.format || '');
+    if (!Formatter) {
+      throw new Error(`Invalid lint format "${options.format}".`);
+    }
+    const formatter = new Formatter();
+
+    const output = formatter.format(result.failures, result.fixes);
+    if (output.trim()) {
+      context.logger.info(output);
+    }
+  }
+
+  if (result.warningCount > 0 && printInfo) {
+    context.logger.warn('Lint warnings found in the listed files.');
+  }
+
+  if (result.errorCount > 0 && printInfo) {
+    context.logger.error('Lint errors found in the listed files.');
+  }
+
+  if (result.warningCount === 0 && result.errorCount === 0 && printInfo) {
+    context.logger.info('All files pass linting.');
+  }
+
+  return {
+    success: options.force || result.errorCount === 0,
+  };
+}
+
+
+export default createBuilder<TslintBuilderOptions>(_run);
+
+
+async function _lint(
+  projectTslint: typeof tslint,
+  systemRoot: string,
+  tslintConfigPath: string | null,
+  options: TslintBuilderOptions,
+  program?: ts.Program,
+  allPrograms?: ts.Program[],
+) {
+  const Linter = projectTslint.Linter;
+  const Configuration = projectTslint.Configuration;
+
+  const files = getFilesToLint(systemRoot, options, Linter, program);
+  const lintOptions = {
+    fix: !!options.fix,
+    formatter: options.format,
+  };
+
+  const linter = new Linter(lintOptions, program);
+
+  let lastDirectory: string | undefined = undefined;
+  let configLoad;
+  for (const file of files) {
+    if (program && allPrograms) {
+      // If it cannot be found in ANY program, then this is an error.
+      if (allPrograms.every(p => p.getSourceFile(file) === undefined)) {
+        throw new Error(
+          `File ${JSON.stringify(file)} is not part of a TypeScript project '${options.tsConfig}'.`,
+        );
+      } else if (program.getSourceFile(file) === undefined) {
+        // The file exists in some other programs. We will lint it later (or earlier) in the loop.
+        continue;
+      }
+    }
+
+    const contents = getFileContents(file);
+
+    // Only check for a new tslint config if the path changes.
+    const currentDirectory = path.dirname(file);
+    if (currentDirectory !== lastDirectory) {
+      configLoad = Configuration.findConfiguration(tslintConfigPath, file);
+      lastDirectory = currentDirectory;
+    }
+
+    if (configLoad) {
+      // Give some breathing space to other promises that might be waiting.
+      await Promise.resolve();
+      linter.lint(file, contents, configLoad.results);
+    }
+  }
+
+  return linter.getResult();
+}
+
+function getFilesToLint(
+  root: string,
+  options: TslintBuilderOptions,
+  linter: typeof tslint.Linter,
+  program?: ts.Program,
+): string[] {
+  const ignore = options.exclude;
+  const files = options.files || [];
+
+  if (files.length > 0) {
+    return files
+      .map(file => glob.sync(file, { cwd: root, ignore, nodir: true }))
+      .reduce((prev, curr) => prev.concat(curr), [])
+      .map(file => path.join(root, file));
+  }
+
+  if (!program) {
+    return [];
+  }
+
+  let programFiles = linter.getFileNames(program);
+
+  if (ignore && ignore.length > 0) {
+    // normalize to support ./ paths
+    const ignoreMatchers = ignore
+      .map(pattern => new Minimatch(path.normalize(pattern), { dot: true }));
+
+    programFiles = programFiles
+      .filter(file => !ignoreMatchers.some(matcher => matcher.match(path.relative(root, file))));
+  }
+
+  return programFiles;
+}
+
+function getFileContents(file: string): string {
+  // NOTE: The tslint CLI checks for and excludes MPEG transport streams; this does not.
+  try {
+    return stripBom(readFileSync(file, 'utf-8'));
+  } catch {
+    throw new Error(`Could not read file '${file}'.`);
+  }
+}
diff --git a/packages/angular_devkit/build_angular/test/tslint/works2_spec_large.ts b/packages/angular_devkit/build_angular/test/tslint/works2_spec_large.ts
new file mode 100644
index 000000000000..4fcb9d15916f
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/tslint/works2_spec_large.ts
@@ -0,0 +1,278 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
+import { Architect, Target } from '@angular-devkit/architect/src/index2';
+import { TestingArchitectHost } from '@angular-devkit/architect/testing/index2';
+import { experimental, join, logging, normalize, schema } from '@angular-devkit/core';
+import { NodeJsSyncHost } from '@angular-devkit/core/node';
+import * as fs from 'fs';
+import * as path from 'path';
+
+const devkitRoot = normalize((global as any)._DevKitRoot); // tslint:disable-line:no-any
+const workspaceRoot = join(devkitRoot, 'tests/angular_devkit/build_angular/hello-world-app/');
+const lintTarget: Target = { project: 'app', target: 'lint' };
+
+// tslint:disable-next-line:no-big-function
+describe('Tslint Target', () => {
+  // const filesWithErrors = { 'src/foo.ts': 'const foo = "";\n' };
+  let testArchitectHost: TestingArchitectHost;
+  let architect: Architect;
+
+  beforeEach(async () => {
+    const vfHost = new NodeJsSyncHost();
+    const configContent = fs.readFileSync(path.join(workspaceRoot, 'angular.json'), 'utf-8');
+    const workspaceJson = JSON.parse(configContent);
+
+    const registry = new schema.CoreSchemaRegistry();
+    registry.addPostTransform(schema.transforms.addUndefinedDefaults);
+
+    const workspace = new experimental.workspace.Workspace(workspaceRoot, vfHost);
+    await workspace.loadWorkspaceFromJson(workspaceJson).toPromise();
+
+    testArchitectHost = new TestingArchitectHost(
+      workspaceRoot, workspaceRoot,
+      new WorkspaceNodeModulesArchitectHost(workspace, workspaceRoot),
+    );
+    architect = new Architect(testArchitectHost, registry);
+  });
+
+  it('works', async () => {
+    const run = await architect.scheduleTarget({ project: 'app', target: 'lint' });
+    const output = await run.result;
+    expect(output.success).toBe(true);
+    await run.stop();
+  }, 30000);
+
+  it(`should show project name as status and in the logs`, async () => {
+    // Check logs.
+    const logger = new logging.Logger('lint-info');
+    const allLogs: string[] = [];
+    logger.subscribe(entry => allLogs.push(entry.message));
+
+    const run = await architect.scheduleTarget(lintTarget, {}, { logger });
+
+    // Check status updates.
+    const allStatus: string[] = [];
+    run.progress.subscribe(progress => {
+      if (progress.status !== undefined) {
+        allStatus.push(progress.status);
+      }
+    });
+
+    const output = await run.result;
+    expect(output.success).toBe(true);
+    expect(allStatus).toContain(jasmine.stringMatching(/linting.*"app".*/i));
+    expect(allLogs).toContain(jasmine.stringMatching(/linting.*"app".*/i));
+    await run.stop();
+  });
+
+  it(`should not show project name when formatter is non human readable`, async () => {
+    const overrides = {
+      format: 'checkstyle',
+    };
+
+    // Check logs.
+    const logger = new logging.Logger('lint-info');
+    const allLogs: string[] = [];
+    logger.subscribe(entry => allLogs.push(entry.message));
+
+    const run = await architect.scheduleTarget(lintTarget, overrides, { logger });
+
+    // Check status updates.
+    const allStatus: string[] = [];
+    run.progress.subscribe(progress => {
+      if (progress.status !== undefined) {
+        allStatus.push(progress.status);
+      }
+    });
+
+    const output = await run.result;
+    expect(output.success).toBe(true);
+    expect(allStatus).toContain(jasmine.stringMatching(/linting.*"app".*/i));
+    expect(allLogs).not.toContain(jasmine.stringMatching(/linting.*"app".*/i));
+    await run.stop();
+  }, 30000);
+
+  // it('should report lint error once', (done) => {
+  //   host.writeMultipleFiles({'src/app/app.component.ts': 'const foo = "";\n' });
+  //   const logger = new TestLogger('lint-error');
+  //
+  //   runTargetSpec(host, tslintTargetSpec, undefined, DefaultTimeout, logger).pipe(
+  //     tap((buildEvent) => expect(buildEvent.success).toBe(false)),
+  //     tap(() => {
+  //       // this is to make sure there are no duplicates
+  //       expect(logger.includes(`" should be \'\nERROR`)).toBe(false);
+  //
+  //       expect(logger.includes(`" should be '`)).toBe(true);
+  //       expect(logger.includes(`Lint errors found in the listed files`)).toBe(true);
+  //     }),
+  //   ).toPromise().then(done, done.fail);
+  // }, 30000);
+  //
+  // it('supports exclude with glob', (done) => {
+  //   host.writeMultipleFiles(filesWithErrors);
+  //   const overrides: Partial<TslintBuilderOptions> = { exclude: ['**/foo.ts'] };
+  //
+  //   runTargetSpec(host, tslintTargetSpec, overrides).pipe(
+  //     tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+  //   ).toPromise().then(done, done.fail);
+  // }, 30000);
+  //
+  // it('supports exclude with relative paths', (done) => {
+  //   host.writeMultipleFiles(filesWithErrors);
+  //   const overrides: Partial<TslintBuilderOptions> = { exclude: ['src/foo.ts'] };
+  //
+  //   runTargetSpec(host, tslintTargetSpec, overrides).pipe(
+  //     tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+  //   ).toPromise().then(done, done.fail);
+  // }, 30000);
+  //
+  // it(`supports exclude with paths starting with './'`, (done) => {
+  //   host.writeMultipleFiles(filesWithErrors);
+  //   const overrides: Partial<TslintBuilderOptions> = { exclude: ['./src/foo.ts'] };
+  //
+  //   runTargetSpec(host, tslintTargetSpec, overrides).pipe(
+  //     tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+  //   ).toPromise().then(done, done.fail);
+  // }, 30000);
+  //
+  // it('supports fix', (done) => {
+  //   host.writeMultipleFiles(filesWithErrors);
+  //   const overrides: Partial<TslintBuilderOptions> = { fix: true };
+  //
+  //   runTargetSpec(host, tslintTargetSpec, overrides).pipe(
+  //     tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+  //     tap(() => {
+  //       const fileName = normalize('src/foo.ts');
+  //       const content = virtualFs.fileBufferToString(host.scopedSync().read(fileName));
+  //       expect(content).toContain(`const foo = '';`);
+  //     }),
+  //   ).toPromise().then(done, done.fail);
+  // }, 30000);
+  //
+  // it('supports force', (done) => {
+  //   host.writeMultipleFiles(filesWithErrors);
+  //   const logger = new TestLogger('lint-force');
+  //   const overrides: Partial<TslintBuilderOptions> = { force: true };
+  //
+  //   runTargetSpec(host, tslintTargetSpec, overrides, DefaultTimeout, logger).pipe(
+  //     tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+  //     tap(() => {
+  //       expect(logger.includes(`" should be '`)).toBe(true);
+  //       expect(logger.includes(`Lint errors found in the listed files`)).toBe(true);
+  //     }),
+  //   ).toPromise().then(done, done.fail);
+  // }, 30000);
+  //
+  // it('supports format', (done) => {
+  //   host.writeMultipleFiles(filesWithErrors);
+  //   const logger = new TestLogger('lint-format');
+  //   const overrides: Partial<TslintBuilderOptions> = { format: 'stylish' };
+  //
+  //   runTargetSpec(host, tslintTargetSpec, overrides, DefaultTimeout, logger).pipe(
+  //     tap((buildEvent) => expect(buildEvent.success).toBe(false)),
+  //     tap(() => {
+  //       expect(logger.includes(`quotemark`)).toBe(true);
+  //     }),
+  //   ).toPromise().then(done, done.fail);
+  // }, 30000);
+  //
+  // it('supports finding configs', (done) => {
+  //   host.writeMultipleFiles({
+  //     'src/app/foo/foo.ts': `const foo = '';\n`,
+  //     'src/app/foo/tslint.json': `
+  //       {
+  //         "rules": {
+  //           "quotemark": [
+  //             true,
+  //             "double"
+  //           ]
+  //         }
+  //       }
+  //     `,
+  //   });
+  //   const overrides: Partial<TslintBuilderOptions> = { tslintConfig: undefined };
+  //
+  //   runTargetSpec(host, tslintTargetSpec, overrides).pipe(
+  //     tap((buildEvent) => expect(buildEvent.success).toBe(false)),
+  //   ).toPromise().then(done, done.fail);
+  // }, 30000);
+  //
+  // it('supports overriding configs', (done) => {
+  //   host.writeMultipleFiles({
+  //     'src/app/foo/foo.ts': `const foo = '';\n`,
+  //     'src/app/foo/tslint.json': `
+  //       {
+  //         "rules": {
+  //           "quotemark": [
+  //             true,
+  //             "double"
+  //           ]
+  //         }
+  //       }
+  //     `,
+  //   });
+  //   const overrides: Partial<TslintBuilderOptions> = { tslintConfig: 'tslint.json' };
+  //
+  //   runTargetSpec(host, tslintTargetSpec, overrides).pipe(
+  //     tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+  //   ).toPromise().then(done, done.fail);
+  // }, 30000);
+  //
+  // it('supports using files with no project', (done) => {
+  //   const overrides: Partial<TslintBuilderOptions> = {
+  //     tsConfig: undefined,
+  //     files: ['src/app/**/*.ts'],
+  //   };
+  //
+  //   runTargetSpec(host, tslintTargetSpec, overrides).pipe(
+  //     tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+  //   ).toPromise().then(done, done.fail);
+  // }, 30000);
+  //
+  // it('supports using one project as a string', (done) => {
+  //   const overrides: Partial<TslintBuilderOptions> = {
+  //     tsConfig: 'src/tsconfig.app.json',
+  //   };
+  //
+  //   runTargetSpec(host, tslintTargetSpec, overrides).pipe(
+  //     tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+  //   ).toPromise().then(done, done.fail);
+  // }, 30000);
+  //
+  // it('supports using one project as an array', (done) => {
+  //   const overrides: Partial<TslintBuilderOptions> = {
+  //     tsConfig: ['src/tsconfig.app.json'],
+  //   };
+  //
+  //   runTargetSpec(host, tslintTargetSpec, overrides).pipe(
+  //     tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+  //   ).toPromise().then(done, done.fail);
+  // }, 30000);
+  //
+  // it('supports using two projects', (done) => {
+  //   const overrides: Partial<TslintBuilderOptions> = {
+  //     tsConfig: ['src/tsconfig.app.json', 'src/tsconfig.spec.json'],
+  //   };
+  //
+  //   runTargetSpec(host, tslintTargetSpec, overrides).pipe(
+  //     tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+  //   ).toPromise().then(done, done.fail);
+  // }, 30000);
+  //
+  // it('errors when type checking is used without a project', (done) => {
+  //   const overrides: Partial<TslintBuilderOptions> = {
+  //     tsConfig: undefined,
+  //     typeCheck: true,
+  //   };
+  //
+  //   runTargetSpec(host, tslintTargetSpec, overrides)
+  //     .subscribe(undefined, () => done(), done.fail);
+  // }, 30000);
+});

From 558ef0052344f0950b4978c8ad7e9f3963ff8d3d Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Wed, 13 Feb 2019 11:58:29 -0800
Subject: [PATCH 0775/1703] feat(@angular-devkit/architect-cli): CLI tool to
 use new Architect API

Move the entire Architect CLI to use the new API, and report progress using
a progress bar for each worker currently executing. Shows log at the end
of the execution.

This is meant to be used as a debugging tool to help people move their builders
to the new API.
---
 package.json                                  |   1 +
 packages/angular_devkit/architect_cli/BUILD   |   4 +-
 .../architect_cli/bin/architect.ts            | 239 ++++++++++++------
 .../angular_devkit/architect_cli/package.json |   9 +-
 .../architect_cli/src/progress.ts             |  98 +++++++
 yarn.lock                                     |  52 +++-
 6 files changed, 320 insertions(+), 83 deletions(-)
 create mode 100644 packages/angular_devkit/architect_cli/src/progress.ts

diff --git a/package.json b/package.json
index b58e937118a3..1c9a03e88c25 100644
--- a/package.json
+++ b/package.json
@@ -63,6 +63,7 @@
     ]
   },
   "dependencies": {
+    "@types/progress": "^2.0.3",
     "glob": "^7.0.3",
     "node-fetch": "^2.2.0",
     "puppeteer": "1.12.2",
diff --git a/packages/angular_devkit/architect_cli/BUILD b/packages/angular_devkit/architect_cli/BUILD
index 225116f0cf1d..d7d12f885ea4 100644
--- a/packages/angular_devkit/architect_cli/BUILD
+++ b/packages/angular_devkit/architect_cli/BUILD
@@ -12,15 +12,17 @@ ts_library(
     name = "architect_cli",
     srcs = [
         "bin/architect.ts",
-    ],
+    ] + glob(["src/**/*.ts"]),
     module_name = "@angular-devkit/architect-cli",
     deps = [
         "//packages/angular_devkit/architect",
+        "//packages/angular_devkit/architect:node",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
         "@rxjs",
         "@rxjs//operators",
         "@npm//@types/node",
         "@npm//@types/minimist",
+        "@npm//@types/progress",
     ],
 )
diff --git a/packages/angular_devkit/architect_cli/bin/architect.ts b/packages/angular_devkit/architect_cli/bin/architect.ts
index 36aa58b7f53e..4af723751d42 100644
--- a/packages/angular_devkit/architect_cli/bin/architect.ts
+++ b/packages/angular_devkit/architect_cli/bin/architect.ts
@@ -6,18 +6,22 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import 'symbol-observable';
-// symbol polyfill must go first
-// tslint:disable-next-line:ordered-imports import-groups
-import { Architect } from '@angular-devkit/architect';
-import { dirname, experimental, normalize, tags } from '@angular-devkit/core';
+import { index2 } from '@angular-devkit/architect';
+import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
+import {
+  dirname,
+  experimental,
+  json,
+  logging,
+  normalize,
+  schema,
+  tags, terminal,
+} from '@angular-devkit/core';
 import { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node';
 import { existsSync, readFileSync } from 'fs';
 import * as minimist from 'minimist';
 import * as path from 'path';
-import { throwError } from 'rxjs';
-import { concatMap } from 'rxjs/operators';
+import { MultiProgressBar } from '../src/progress';
 
 
 function findUp(names: string | string[], from: string) {
@@ -44,7 +48,7 @@ function findUp(names: string | string[], from: string) {
 /**
  * Show usage of the CLI tool, and exit the process.
  */
-function usage(exitCode = 0): never {
+function usage(logger: logging.Logger, exitCode = 0): never {
   logger.info(tags.stripIndent`
     architect [project][:target][:configuration] [options, ...]
 
@@ -63,86 +67,165 @@ function usage(exitCode = 0): never {
   throw 0;  // The node typing sometimes don't have a never type for process.exit().
 }
 
-/** Parse the command line. */
-const argv = minimist(process.argv.slice(2), { boolean: ['help'] });
+function _targetStringFromTarget({project, target, configuration}: index2.Target) {
+  return `${project}:${target}${configuration !== undefined ? ':' + configuration : ''}`;
+}
 
-/** Create the DevKit Logger used through the CLI. */
-const logger = createConsoleLogger(argv['verbose']);
 
-// Check the target.
-const targetStr = argv._.shift();
-if (!targetStr && argv.help) {
-  // Show architect usage if there's no target.
-  usage();
+interface BarInfo {
+  status?: string;
+  builder: index2.BuilderInfo;
+  target?: index2.Target;
 }
 
-// Split a target into its parts.
-let project: string, targetName: string, configuration: string;
-if (targetStr) {
-  [project, targetName, configuration] = targetStr.split(':');
-}
 
-// Load workspace configuration file.
-const currentPath = process.cwd();
-const configFileNames = [
-  'angular.json',
-  '.angular.json',
-  'workspace.json',
-  '.workspace.json',
-];
-
-const configFilePath = findUp(configFileNames, currentPath);
-
-if (!configFilePath) {
-  logger.fatal(`Workspace configuration file (${configFileNames.join(', ')}) cannot be found in `
-    + `'${currentPath}' or in parent directories.`);
-  process.exit(3);
-  throw 3;  // TypeScript doesn't know that process.exit() never returns.
+async function _executeTarget(
+  parentLogger: logging.Logger,
+  workspace: experimental.workspace.Workspace,
+  root: string,
+  argv: minimist.ParsedArgs,
+  registry: json.schema.SchemaRegistry,
+) {
+  const architectHost = new WorkspaceNodeModulesArchitectHost(workspace, root);
+  const architect = new index2.Architect(architectHost, registry);
+
+  // Split a target into its parts.
+  const targetStr = argv._.shift() || '';
+  const [project, target, configuration] = targetStr.split(':');
+  const targetSpec = { project, target, configuration };
+
+  delete argv['help'];
+  delete argv['_'];
+
+  const logger = new logging.Logger('jobs');
+  const logs: logging.LogEntry[] = [];
+  logger.subscribe(entry => logs.push({ ...entry, message: `${entry.name}: ` + entry.message }));
+
+  const run = await architect.scheduleTarget(targetSpec, argv, { logger });
+  const bars = new MultiProgressBar<number, BarInfo>(':name :bar (:current/:total) :status');
+
+  run.progress.subscribe(
+    update => {
+      const data = bars.get(update.id) || {
+        id: update.id,
+        builder: update.builder,
+        target: update.target,
+        status: update.status || '',
+        name: ((update.target ? _targetStringFromTarget(update.target) : update.builder.name)
+                + ' '.repeat(80)
+              ).substr(0, 40),
+      };
+
+      if (update.status !== undefined) {
+        data.status = update.status;
+      }
+
+      switch (update.state) {
+        case index2.BuilderProgressState.Error:
+          data.status = 'Error: ' + update.error;
+          bars.update(update.id, data);
+          break;
+
+        case index2.BuilderProgressState.Stopped:
+          data.status = 'Done.';
+          bars.complete(update.id);
+          bars.update(update.id, data, update.total, update.total);
+          break;
+
+        case index2.BuilderProgressState.Waiting:
+          bars.update(update.id, data);
+          break;
+
+        case index2.BuilderProgressState.Running:
+          bars.update(update.id, data, update.current, update.total);
+          break;
+      }
+
+      bars.render();
+    },
+  );
+
+  // Wait for full completion of the builder.
+  try {
+    const result = await run.result;
+
+    if (result.success) {
+      parentLogger.info(terminal.green('SUCCESS'));
+    } else {
+      parentLogger.info(terminal.yellow('FAILURE'));
+    }
+
+    parentLogger.info('\nLogs:');
+    logs.forEach(l => parentLogger.next(l));
+
+    await run.stop();
+    bars.terminate();
+
+    return result.success ? 0 : 1;
+  } catch (err) {
+    parentLogger.info(terminal.red('ERROR'));
+    parentLogger.info('\nLogs:');
+    logs.forEach(l => parentLogger.next(l));
+
+    parentLogger.fatal('Exception:');
+    parentLogger.fatal(err.stack);
+
+    return 2;
+  }
 }
 
-const root = dirname(normalize(configFilePath));
-const configContent = readFileSync(configFilePath, 'utf-8');
-const workspaceJson = JSON.parse(configContent);
 
-const host = new NodeJsSyncHost();
-const workspace = new experimental.workspace.Workspace(root, host);
+async function main(args: string[]): Promise<number> {
+  /** Parse the command line. */
+  const argv = minimist(args, { boolean: ['help'] });
 
-let lastBuildEvent = { success: true };
+  /** Create the DevKit Logger used through the CLI. */
+  const logger = createConsoleLogger(argv['verbose']);
 
-workspace.loadWorkspaceFromJson(workspaceJson).pipe(
-  concatMap(ws => new Architect(ws).loadArchitect()),
-  concatMap(architect => {
+  // Check the target.
+  const targetStr = argv._[0] || '';
+  if (!targetStr || argv.help) {
+    // Show architect usage if there's no target.
+    usage(logger);
+  }
 
-    const overrides = { ...argv };
-    delete overrides['help'];
-    delete overrides['_'];
+  // Load workspace configuration file.
+  const currentPath = process.cwd();
+  const configFileNames = [
+    'angular.json',
+    '.angular.json',
+    'workspace.json',
+    '.workspace.json',
+  ];
 
-    const targetSpec = {
-      project,
-      target: targetName,
-      configuration,
-      overrides,
-    };
+  const configFilePath = findUp(configFileNames, currentPath);
 
-    // TODO: better logging of what's happening.
-    if (argv.help) {
-      // TODO: add target help
-      return throwError('Target help NYI.');
-      // architect.help(targetOptions, logger);
-    } else {
-      const builderConfig = architect.getBuilderConfiguration(targetSpec);
+  if (!configFilePath) {
+    logger.fatal(`Workspace configuration file (${configFileNames.join(', ')}) cannot be found in `
+      + `'${currentPath}' or in parent directories.`);
 
-      return architect.run(builderConfig, { logger });
-    }
-  }),
-).subscribe({
-  next: (buildEvent => lastBuildEvent = buildEvent),
-  complete: () => process.exit(lastBuildEvent.success ? 0 : 1),
-  error: (err: Error) => {
-    logger.fatal(err.message);
-    if (err.stack) {
-      logger.fatal(err.stack);
-    }
-    process.exit(1);
-  },
-});
+    return 3;
+  }
+
+  const root = dirname(normalize(configFilePath));
+  const configContent = readFileSync(configFilePath, 'utf-8');
+  const workspaceJson = JSON.parse(configContent);
+
+  const registry = new schema.CoreSchemaRegistry();
+  registry.addPostTransform(schema.transforms.addUndefinedDefaults);
+
+  const host = new NodeJsSyncHost();
+  const workspace = new experimental.workspace.Workspace(root, host);
+
+  await workspace.loadWorkspaceFromJson(workspaceJson).toPromise();
+
+  return await _executeTarget(logger, workspace, root, argv, registry);
+}
+
+main(process.argv.slice(2))
+  .then(code => {
+    process.exit(code);
+  }, err => {
+    console.error('Error: ' + err.stack || err.message || err);
+    process.exit(-1);
+  });
diff --git a/packages/angular_devkit/architect_cli/package.json b/packages/angular_devkit/architect_cli/package.json
index 183dee060281..c90812606347 100644
--- a/packages/angular_devkit/architect_cli/package.json
+++ b/packages/angular_devkit/architect_cli/package.json
@@ -12,10 +12,13 @@
     "tooling"
   ],
   "dependencies": {
-    "@angular-devkit/core": "0.0.0",
     "@angular-devkit/architect": "0.0.0",
+    "@angular-devkit/core": "0.0.0",
+    "@types/progress": "^2.0.3",
+    "ascii-progress": "^1.0.5",
     "minimist": "1.2.0",
-    "symbol-observable": "1.2.0",
-    "rxjs": "6.3.3"
+    "progress": "^2.0.3",
+    "rxjs": "6.3.3",
+    "symbol-observable": "1.2.0"
   }
 }
diff --git a/packages/angular_devkit/architect_cli/src/progress.ts b/packages/angular_devkit/architect_cli/src/progress.ts
new file mode 100644
index 000000000000..d85763ceb56f
--- /dev/null
+++ b/packages/angular_devkit/architect_cli/src/progress.ts
@@ -0,0 +1,98 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { terminal } from '@angular-devkit/core';
+import * as ProgressBar from 'progress';
+import * as readline from 'readline';
+
+export class MultiProgressBar<Key, T> {
+  private _bars = new Map<Key, { data: T, bar: ProgressBar }>();
+
+  constructor(private _status: string, private _stream = process.stderr) {}
+  private _add(id: Key, data: T): { data: T, bar: ProgressBar } {
+    const width = Math.min(80, terminal.getCapabilities(this._stream).columns || 80);
+    const value = {
+      data,
+      bar: new ProgressBar(this._status, {
+        clear: true,
+        total: 1,
+        width: width,
+        complete: '#',
+        incomplete: '.',
+        stream: this._stream,
+      }),
+    };
+    this._bars.set(id, value);
+    readline.moveCursor(this._stream, 0, 1);
+
+    return value;
+  }
+
+  complete(id: Key) {
+    const maybeBar = this._bars.get(id);
+    if (maybeBar) {
+      maybeBar.bar.complete = true;
+    }
+  }
+
+  add(id: Key, data: T) {
+    this._add(id, data);
+  }
+
+  get(key: Key): T | undefined {
+    const maybeValue = this._bars.get(key);
+
+    return maybeValue && maybeValue.data;
+  }
+  has(key: Key) {
+    return this._bars.has(key);
+  }
+  update(key: Key, data: T, current?: number, total?: number) {
+    let maybeBar = this._bars.get(key);
+
+    if (!maybeBar) {
+      maybeBar = this._add(key, data);
+    }
+
+    maybeBar.data = data;
+    if (total !== undefined) {
+      maybeBar.bar.total = total;
+    }
+    if (current !== undefined) {
+      maybeBar.bar.curr = Math.max(0, Math.min(current, maybeBar.bar.total));
+    }
+  }
+
+  render(max = Infinity, sort?: (a: T, b: T) => number) {
+    const stream = this._stream;
+
+    readline.moveCursor(stream, 0, -this._bars.size);
+    readline.cursorTo(stream, 0);
+
+    let values: Iterable<{ data: T, bar: ProgressBar }> = this._bars.values();
+    if (sort) {
+      values = [...values].sort((a, b) => sort(a.data, b.data));
+    }
+
+    for (const { data, bar } of values) {
+      if (max-- == 0) {
+        return;
+      }
+
+      bar.render(data);
+      readline.moveCursor(stream, 0, 1);
+      readline.cursorTo(stream, 0);
+    }
+  }
+
+  terminate() {
+    for (const { bar } of this._bars.values()) {
+      bar.terminate();
+    }
+    this._bars.clear();
+  }
+}
diff --git a/yarn.lock b/yarn.lock
index fbb2d72aaa8a..94e9afde1add 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -409,6 +409,13 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.0.tgz#85c6998293fc6f2945915419296c7fbb63384f66"
   integrity sha512-6tQyh4Q4B5pECcXBOQDZ5KjyBIxRZGzrweGPM47sAYTdVG4+7R+2EGMTmp0h6ZwgqHrFRCeg2gdhsG9xXEl2Sg==
 
+"@types/progress@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/progress/-/progress-2.0.3.tgz#7ccbd9c6d4d601319126c469e73b5bb90dfc8ccc"
+  integrity sha512-bPOsfCZ4tsTlKiBjBhKnM8jpY5nmIll166IPD58D92hR7G7kZDfx5iB9wGF4NfZrdKolebjeAr3GouYkSGoJ/A==
+  dependencies:
+    "@types/node" "*"
+
 "@types/q@^0.0.32":
   version "0.0.32"
   resolved "http://registry.npmjs.org/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
@@ -951,6 +958,13 @@ ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
+ansi.js@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/ansi.js/-/ansi.js-0.0.5.tgz#e3e9e45eb6977ba0eeeeed11677d12144675348c"
+  integrity sha1-4+nkXraXe6Du7u0RZ30SFEZ1NIw=
+  dependencies:
+    on-new-line "0.0.1"
+
 anymatch@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
@@ -1109,6 +1123,17 @@ asap@^2.0.0, asap@~2.0.3:
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
+ascii-progress@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/ascii-progress/-/ascii-progress-1.0.5.tgz#9610aa127ab794af561e893613c36c906f78d9ee"
+  integrity sha1-lhCqEnq3lK9WHok2E8NskG942e4=
+  dependencies:
+    ansi.js "0.0.5"
+    end-with "^1.0.2"
+    get-cursor-position "1.0.3"
+    on-new-line "1.0.0"
+    start-with "^1.0.2"
+
 ascli@~1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ascli/-/ascli-1.0.1.tgz#bcfa5974a62f18e81cabaeb49732ab4a88f906bc"
@@ -3244,6 +3269,11 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
+end-with@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/end-with/-/end-with-1.0.2.tgz#a432755ab4f51e7fc74f3a719c6b81df5d668bdc"
+  integrity sha1-pDJ1WrT1Hn/HTzpxnGuB311mi9w=
+
 engine.io-client@~3.1.0:
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.1.6.tgz#5bdeb130f8b94a50ac5cbeb72583e7a4a063ddfd"
@@ -4118,6 +4148,11 @@ get-caller-file@^1.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
   integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
+get-cursor-position@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/get-cursor-position/-/get-cursor-position-1.0.3.tgz#0e41d60343b705836a528d69a5e099e2c5108d63"
+  integrity sha1-DkHWA0O3BYNqUo1ppeCZ4sUQjWM=
+
 get-pkg-repo@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
@@ -7139,6 +7174,16 @@ on-headers@~1.0.1:
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
   integrity sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=
 
+on-new-line@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/on-new-line/-/on-new-line-0.0.1.tgz#99339cb06dcfe3e78d6964a2ef2af374a145f8fb"
+  integrity sha1-mTOcsG3P4+eNaWSi7yrzdKFF+Ps=
+
+on-new-line@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/on-new-line/-/on-new-line-1.0.0.tgz#8585bc2866c8c0e192e410a6d63bdd1722148ae7"
+  integrity sha1-hYW8KGbIwOGS5BCm1jvdFyIUiuc=
+
 once@1.x, once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -7785,7 +7830,7 @@ process@^0.11.10:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
-progress@^2.0.1:
+progress@^2.0.1, progress@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
@@ -9460,6 +9505,11 @@ stack-trace@0.0.x:
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
   integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
 
+start-with@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/start-with/-/start-with-1.0.2.tgz#a069a5f46a95fca7f0874f85a28f653d0095c267"
+  integrity sha1-oGml9GqV/Kfwh0+Foo9lPQCVwmc=
+
 static-eval@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.0.tgz#0e821f8926847def7b4b50cda5d55c04a9b13864"

From 0f0f289bf738c53ec091b65f2838d3d9f0e569f7 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Thu, 14 Feb 2019 13:26:46 -0800
Subject: [PATCH 0776/1703] fix(@angular-devkit/core): fix true schemas post
 transform step

Also tighten the types a bit, and add a test that failed before and works now.
---
 etc/api/angular_devkit/core/src/_golden-api.d.ts     |  4 ++--
 .../angular_devkit/core/src/json/schema/registry.ts  |  8 --------
 .../core/src/json/schema/registry_spec.ts            | 12 ++++++++++++
 .../core/src/json/schema/transforms.ts               |  8 ++++++--
 .../angular_devkit/core/src/json/schema/visitor.ts   | 10 +++++++---
 5 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/etc/api/angular_devkit/core/src/_golden-api.d.ts b/etc/api/angular_devkit/core/src/_golden-api.d.ts
index e07a427eb66f..7dab611a0ced 100644
--- a/etc/api/angular_devkit/core/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/core/src/_golden-api.d.ts
@@ -5,7 +5,7 @@ export interface AdditionalPropertiesValidatorError extends SchemaValidatorError
     };
 }
 
-export declare function addUndefinedDefaults(value: JsonValue, _pointer: JsonPointer, schema?: JsonObject): JsonValue;
+export declare function addUndefinedDefaults(value: JsonValue, _pointer: JsonPointer, schema?: JsonSchema): JsonValue;
 
 export declare class AliasHost<StatsT extends object = {}> extends ResolverHost<StatsT> {
     protected _aliases: Map<Path, Path>;
@@ -989,7 +989,7 @@ export declare class UnsupportedPlatformException extends BaseException {
 
 export declare type UriHandler = (uri: string) => Observable<JsonObject> | Promise<JsonObject> | null | undefined;
 
-export declare function visitJson<ContextT>(json: JsonValue, visitor: JsonVisitor, schema?: JsonObject, refResolver?: ReferenceResolver<ContextT>, context?: ContextT): Observable<JsonValue>;
+export declare function visitJson<ContextT>(json: JsonValue, visitor: JsonVisitor, schema?: JsonSchema, refResolver?: ReferenceResolver<ContextT>, context?: ContextT): Observable<JsonValue>;
 
 export declare function visitJsonSchema(schema: JsonSchema, visitor: JsonSchemaVisitor): void;
 
diff --git a/packages/angular_devkit/core/src/json/schema/registry.ts b/packages/angular_devkit/core/src/json/schema/registry.ts
index aa98bac3e18c..b04bbc8c7b82 100644
--- a/packages/angular_devkit/core/src/json/schema/registry.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry.ts
@@ -347,10 +347,6 @@ export class CoreSchemaRegistry implements SchemaRegistry {
             // tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
             result = (result as any).pipe(
               ...[...this._pre].map(visitor => concatMap((data: JsonValue) => {
-                if (schema === false || schema === true) {
-                  return of(data);
-                }
-
                 return visitJson(data, visitor, schema, this._resolver, validate);
               })),
             );
@@ -418,10 +414,6 @@ export class CoreSchemaRegistry implements SchemaRegistry {
                   // tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
                   result = (result as any).pipe(
                     ...[...this._post].map(visitor => concatMap((data: JsonValue) => {
-                      if (schema === false || schema === true) {
-                        return of(schema);
-                      }
-
                       return visitJson(data, visitor, schema, this._resolver, validate);
                     })),
                   );
diff --git a/packages/angular_devkit/core/src/json/schema/registry_spec.ts b/packages/angular_devkit/core/src/json/schema/registry_spec.ts
index fa512977605f..337e82e719df 100644
--- a/packages/angular_devkit/core/src/json/schema/registry_spec.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry_spec.ts
@@ -382,6 +382,18 @@ describe('CoreSchemaRegistry', () => {
       .toPromise().then(done, done.fail);
   });
 
+  it('works with true as a schema and post-transforms', async () => {
+    const registry = new CoreSchemaRegistry();
+    registry.addPostTransform(addUndefinedDefaults);
+    const data: any = { a: 1, b: 2 };  // tslint:disable-line:no-any
+
+    const validate = await registry.compile(true).toPromise();
+    const result = await validate(data).toPromise();
+
+    expect(result.success).toBe(true);
+    expect(result.data).toBe(data);
+  });
+
   it('adds undefined properties', done => {
     const registry = new CoreSchemaRegistry();
     registry.addPostTransform(addUndefinedDefaults);
diff --git a/packages/angular_devkit/core/src/json/schema/transforms.ts b/packages/angular_devkit/core/src/json/schema/transforms.ts
index 9c6694e4e32e..e047d3c38f2a 100644
--- a/packages/angular_devkit/core/src/json/schema/transforms.ts
+++ b/packages/angular_devkit/core/src/json/schema/transforms.ts
@@ -7,14 +7,18 @@
  */
 import { JsonObject, JsonValue, isJsonObject } from '../interface';
 import { JsonPointer } from './interface';
+import { JsonSchema } from './schema';
 import { getTypesOfSchema } from './utility';
 
 export function addUndefinedDefaults(
   value: JsonValue,
   _pointer: JsonPointer,
-  schema?: JsonObject,
+  schema?: JsonSchema,
 ): JsonValue {
-  if (!schema) {
+  if (schema === true || schema === false) {
+    return value;
+  }
+  if (schema === undefined) {
     return value;
   }
 
diff --git a/packages/angular_devkit/core/src/json/schema/visitor.ts b/packages/angular_devkit/core/src/json/schema/visitor.ts
index 130ef4925846..b3b46c40df9f 100644
--- a/packages/angular_devkit/core/src/json/schema/visitor.ts
+++ b/packages/angular_devkit/core/src/json/schema/visitor.ts
@@ -19,7 +19,7 @@ export interface ReferenceResolver<ContextT> {
 }
 
 function _getObjectSubSchema(
-  schema: JsonObject | undefined,
+  schema: JsonSchema | undefined,
   key: string,
 ): JsonObject | undefined {
   if (typeof schema !== 'object' || schema === null) {
@@ -51,11 +51,15 @@ function _visitJsonRecursive<ContextT>(
   json: JsonValue,
   visitor: JsonVisitor,
   ptr: JsonPointer,
-  schema?: JsonObject,
+  schema?: JsonSchema,
   refResolver?: ReferenceResolver<ContextT>,
   context?: ContextT,  // tslint:disable-line:no-any
   root?: JsonObject | JsonArray,
 ): Observable<JsonValue> {
+  if (schema === true || schema === false) {
+    // There's no schema definition, so just visit the JSON recursively.
+    schema = undefined;
+  }
   if (schema && schema.hasOwnProperty('$ref') && typeof schema['$ref'] == 'string') {
     if (refResolver) {
       const resolved = refResolver(schema['$ref'] as string, context);
@@ -132,7 +136,7 @@ function _visitJsonRecursive<ContextT>(
 export function visitJson<ContextT>(
   json: JsonValue,
   visitor: JsonVisitor,
-  schema?: JsonObject,
+  schema?: JsonSchema,
   refResolver?: ReferenceResolver<ContextT>,
   context?: ContextT,  // tslint:disable-line:no-any
 ): Observable<JsonValue> {

From 1aa1b47f90216dcc76a6da563196fba22e7e599a Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Thu, 14 Feb 2019 13:29:39 -0800
Subject: [PATCH 0777/1703] feat(@angular-devkit/core): remove Log messages
 from Job API

If a system wants to have logging it should multiplex it itself on a channel.

Also changed the previous Architect commits to remove usage of Logs and move
to a "log" channel.
---
 .../architect/src/create-builder.ts              | 15 +++++++++++++--
 .../architect/src/schedule-by-name.ts            | 11 ++++++-----
 .../core/src/experimental/jobs/README.md         |  8 +-------
 .../core/src/experimental/jobs/api.ts            | 16 ----------------
 .../core/src/experimental/jobs/architecture.md   |  4 +---
 .../src/experimental/jobs/create-job-handler.ts  | 15 +--------------
 .../src/experimental/jobs/simple-scheduler.ts    | 10 +---------
 7 files changed, 23 insertions(+), 56 deletions(-)

diff --git a/packages/angular_devkit/architect/src/create-builder.ts b/packages/angular_devkit/architect/src/create-builder.ts
index 56053ad81a27..9ff2ff6824b8 100644
--- a/packages/angular_devkit/architect/src/create-builder.ts
+++ b/packages/angular_devkit/architect/src/create-builder.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { experimental, isPromise, json } from '@angular-devkit/core';
+import { experimental, isPromise, json, logging } from '@angular-devkit/core';
 import { Observable, Subscription, from, isObservable, of } from 'rxjs';
 import { tap } from 'rxjs/operators';
 import {
@@ -17,6 +17,7 @@ import {
   BuilderProgressState,
   Target,
   TypedBuilderProgress,
+  targetStringFromTarget,
 } from './api';
 import { Builder, BuilderSymbol, BuilderVersionSymbol } from './internal';
 import { scheduleByName, scheduleByTarget } from './schedule-by-name';
@@ -28,13 +29,16 @@ export function createBuilder<OptT extends json.JsonObject>(
   const cjh = experimental.jobs.createJobHandler;
   const handler = cjh<json.JsonObject, BuilderInput, BuilderOutput>((options, context) => {
     const scheduler = context.scheduler;
-    const logger = context.logger;
     const progressChannel = context.createChannel('progress');
+    const logChannel = context.createChannel('log');
     let currentState: BuilderProgressState = BuilderProgressState.Stopped;
     let current = 0;
     let status = '';
     let total = 1;
 
+    function log(entry: logging.LogEntry) {
+      logChannel.next(entry);
+    }
     function progress(progress: TypedBuilderProgress, context: BuilderContext) {
       currentState = progress.state;
       if (progress.state === BuilderProgressState.Running) {
@@ -74,6 +78,13 @@ export function createBuilder<OptT extends json.JsonObject>(
 
       function onInput(i: BuilderInput) {
         const builder = i.info as BuilderInfo;
+        const loggerName = i.target
+          ? targetStringFromTarget(i.target as Target)
+          : builder.builderName;
+        const logger = new logging.Logger(loggerName);
+
+        subscriptions.push(logger.subscribe(entry => log(entry)));
+
         const context: BuilderContext = {
           builder,
           workspaceRoot: i.workspaceRoot,
diff --git a/packages/angular_devkit/architect/src/schedule-by-name.ts b/packages/angular_devkit/architect/src/schedule-by-name.ts
index d3bc12b07040..0022c9b53207 100644
--- a/packages/angular_devkit/architect/src/schedule-by-name.ts
+++ b/packages/angular_devkit/architect/src/schedule-by-name.ts
@@ -65,15 +65,16 @@ export async function scheduleByName(
     job.input.next(message);
   }
 
+  const logChannelSub = job.getChannel<logging.LogEntry>('log').subscribe(entry => {
+    logger.next(entry);
+  });
+
   const s = job.outboundBus.subscribe(
-    message => {
-      if (message.kind == experimental.jobs.JobOutboundMessageKind.Log) {
-        logger.log(message.entry.level, message.entry.message, message.entry);
-      }
-    },
+    undefined,
     undefined,
     () => {
       s.unsubscribe();
+      logChannelSub.unsubscribe();
       if (stateSubscription) {
         stateSubscription.unsubscribe();
       }
diff --git a/packages/angular_devkit/core/src/experimental/jobs/README.md b/packages/angular_devkit/core/src/experimental/jobs/README.md
index 3989c30d0d38..e1640a5382b9 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/README.md
+++ b/packages/angular_devkit/core/src/experimental/jobs/README.md
@@ -19,10 +19,6 @@ The I/O model is like that of an executable, where the argument corresponds to a
 command line, the input channel to STDIN, the output channel to STDOUT, and the channels
 would be additional output streams.
 
-In addition, a `Job` has a logging channel that can be used to log messages to the user. The 
-code that schedules the job must listen for or forward these messages. You can think of those
-messages as STDERR.
-
 ## LifeCycle
 A `Job` goes through multiple LifeCycle messages before its completion;
 1. `JobState.Queued`. The job was queued and is waiting. This is the default state from the
@@ -162,8 +158,7 @@ export const add = jobs.createJobHandler<number[], number>(
 ```
 
 You can also return a Promise or an Observable, as jobs are asynchronous. This helper will set
-start and end messages appropriately, and will pass in a logger. It will also manage channels
-automatically (see below).
+start and end messages appropriately. It will also manage channels automatically (see below).
 
 A more complex job can be declared like this:
 
@@ -246,7 +241,6 @@ member of the `JobOutboundMessage<O>` interface dictates what kind of message it
     dependent jobs. `createJobHandler()` automatically send this message.
 1. `JobOutboundMessageKind.Pong`. The job should answer a `JobInboundMessageKind.Ping` message with
     this. Automatically done by `createJobHandler()`.
-1. `JobOutboundMessageKind.Log`. A logging message (side effect that should be shown to the user).
 1. `JobOutboundMessageKind.Output`. An `Output` has been generated by the job.
 1. `JobOutboundMessageKind.ChannelMessage`, `JobOutboundMessageKind.ChannelError` and
     `JobOutboundMessageKind.ChannelComplete` are used for output channels. These correspond to the
diff --git a/packages/angular_devkit/core/src/experimental/jobs/api.ts b/packages/angular_devkit/core/src/experimental/jobs/api.ts
index 227c7e2eb51d..5d109bf0904b 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/api.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/api.ts
@@ -7,7 +7,6 @@
  */
 import { Observable, Observer } from 'rxjs';
 import { JsonObject, JsonValue, schema } from '../../json/index';
-import { LogEntry, LoggerApi } from '../../logger/index';
 import { DeepReadonly } from '../../utils/index';
 
 /**
@@ -135,7 +134,6 @@ export enum JobOutboundMessageKind {
   Pong = 'p',
 
   // Feedback messages.
-  Log = 'l',
   Output = 'o',
 
   // Channel specific messages.
@@ -172,14 +170,6 @@ export interface JobOutboundMessageStart extends JobOutboundMessageBase {
   readonly kind: JobOutboundMessageKind.Start;
 }
 
-/**
- * A logging message, supporting the logging.LogEntry.
- */
-export interface JobOutboundMessageLog extends JobOutboundMessageBase {
-  readonly kind: JobOutboundMessageKind.Log;
-  readonly entry: LogEntry;
-}
-
 /**
  * An output value is available.
  */
@@ -274,7 +264,6 @@ export interface JobOutboundMessagePong extends JobOutboundMessageBase {
 export type JobOutboundMessage<OutputT extends JsonValue> =
   JobOutboundMessageOnReady
   | JobOutboundMessageStart
-  | JobOutboundMessageLog
   | JobOutboundMessageOutput<OutputT>
   | JobOutboundMessageChannelCreate
   | JobOutboundMessageChannelMessage
@@ -381,11 +370,6 @@ export interface Job<
  * Options for scheduling jobs.
  */
 export interface ScheduleJobOptions {
-  /**
-   * Where should logging be passed in. By default logging will be dropped.
-   */
-  logger?: LoggerApi;
-
   /**
    * Jobs that need to finish before scheduling this job. These dependencies will be passed
    * to the job itself in its context.
diff --git a/packages/angular_devkit/core/src/experimental/jobs/architecture.md b/packages/angular_devkit/core/src/experimental/jobs/architecture.md
index 216339f167dd..ded5a0bd5f83 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/architecture.md
+++ b/packages/angular_devkit/core/src/experimental/jobs/architecture.md
@@ -101,7 +101,6 @@ and output values (STDOUT) as well as diagnostic (STDERR). They can be plugged o
 
                               ,______________________   
     JobInboundMessage<I> --> | handler(argument: A) |  --> JobOutboundMessage<O>
-                              `⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻⎻       - JobOutboundMessageKind.Log
                                                             - JobOutboundMessageKind.Output
                                                             - ...
 ```
@@ -129,7 +128,6 @@ and output values (STDOUT) as well as diagnostic (STDERR). They can be plugged o
     unblock dependent jobs. `createJobHandler()` automatically send this message.
 1. `JobOutboundMessageKind.Pong`. The job should answer a `JobInboundMessageKind.Ping` message with
     this. Automatically done by `createJobHandler()`.
-1. `JobOutboundMessageKind.Log`. A logging message (side effect that should be shown to the user).
 1. `JobOutboundMessageKind.Output`. An `Output` has been generated by the job.
 1. `JobOutboundMessageKind.ChannelMessage`, `JobOutboundMessageKind.ChannelError` and
     `JobOutboundMessageKind.ChannelComplete` are used for output channels. These correspond to
@@ -251,7 +249,7 @@ example would be an operator that takes a module path and run the job from that
 process. Or even a separate server, using HTTP calls.
  
 Another limitation is that the boilerplate is complex. Manually managing start/end life cycle, and
-other messages such as logging, etc. is tedious and requires a lot of code. A good way to keep
+other messages such as ping/pong, etc. is tedious and requires a lot of code. A good way to keep
 this limitation under control is to provide helpers to create `JobHandler`s which manage those
 messages for the developer. A simple handler could be to get a `Promise` and return the output of
 that promise automatically.
diff --git a/packages/angular_devkit/core/src/experimental/jobs/create-job-handler.ts b/packages/angular_devkit/core/src/experimental/jobs/create-job-handler.ts
index 40b63c94bd05..08f381dc081f 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/create-job-handler.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/create-job-handler.ts
@@ -10,7 +10,7 @@ import { Observable, Observer, Subject, Subscription, from, isObservable, of } f
 import { switchMap, tap } from 'rxjs/operators';
 import { BaseException } from '../../exception/index';
 import { JsonValue } from '../../json/index';
-import { Logger, LoggerApi } from '../../logger/index';
+import { LoggerApi } from '../../logger';
 import { isPromise } from '../../utils/index';
 import {
   JobDescription,
@@ -37,7 +37,6 @@ export interface SimpleJobHandlerContext<
   I extends JsonValue,
   O extends JsonValue,
 > extends JobHandlerContext<A, I, O> {
-  logger: LoggerApi;
   createChannel: (name: string) => Observer<JsonValue>;
   input: Observable<I>;
 }
@@ -100,23 +99,12 @@ export function createJobHandler<A extends JsonValue, I extends JsonValue, O ext
         }
       });
 
-      // Configure a logger to pass in as additional context.
-      const logger = new Logger('-internal-job-logger-');
-      const logSub = logger.subscribe(entry => {
-        subject.next({
-          kind: JobOutboundMessageKind.Log,
-          description,
-          entry,
-        });
-      });
-
       // Execute the function with the additional context.
       const channels = new Map<string, Subject<JsonValue>>();
 
       const newContext: SimpleJobHandlerContext<A, I, O> = {
         ...context,
         input: inputChannel.asObservable(),
-        logger,
         createChannel(name: string) {
           if (channels.has(name)) {
             throw new ChannelAlreadyExistException(name);
@@ -164,7 +152,6 @@ export function createJobHandler<A extends JsonValue, I extends JsonValue, O ext
         () => complete(),
       );
       subscription.add(inboundSub);
-      subscription.add(logSub);
 
       return subscription;
     });
diff --git a/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts b/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts
index 76ade7049bb1..9c1c4fb7d88a 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts
@@ -22,13 +22,12 @@ import {
   filter,
   first,
   ignoreElements,
-  map, share,
+  map,
   shareReplay,
   switchMap,
   tap,
 } from 'rxjs/operators';
 import { JsonValue, schema } from '../../json';
-import { NullLogger } from '../../logger';
 import {
   Job,
   JobDescription,
@@ -305,8 +304,6 @@ export class SimpleScheduler<
     let state = JobState.Queued;
     let pingId = 0;
 
-    const logger = options.logger ? options.logger : new NullLogger();
-
     // Create the input channel by having a filter.
     const input = new Subject<JsonValue>();
     input.pipe(
@@ -348,11 +345,6 @@ export class SimpleScheduler<
         state = this._updateState(message, state);
 
         switch (message.kind) {
-          case JobOutboundMessageKind.Log:
-            const entry = message.entry;
-            logger.log(entry.level, entry.message, entry);
-            break;
-
           case JobOutboundMessageKind.ChannelCreate: {
             const maybeSubject = channelsSubject.get(message.name);
             // If it doesn't exist or it's closed on the other end.

From 9efa9339371bf8e5a9fcc15202f60ff122b02dae Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 18 Feb 2019 20:41:17 +0000
Subject: [PATCH 0778/1703] build: update webpack to version 4.29.5

---
 .../angular_devkit/build_angular/package.json |   2 +-
 .../angular_devkit/build_webpack/package.json |   2 +-
 packages/ngtools/webpack/package.json         |   2 +-
 yarn.lock                                     | 312 +++++++++---------
 4 files changed, 163 insertions(+), 155 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index d77f15991826..5434f220723a 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -44,7 +44,7 @@
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.2.2",
-    "webpack": "4.29.4",
+    "webpack": "4.29.5",
     "webpack-dev-middleware": "3.5.2",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.2.1",
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index 7f87bf28014d..7b329239a889 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -15,7 +15,7 @@
     "webpack-dev-server": "^3.1.4"
   },
   "devDependencies": {
-    "webpack": "4.29.4",
+    "webpack": "4.29.5",
     "webpack-dev-server": "^3.1.4"
   }
 }
\ No newline at end of file
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index b2c9e49d93f2..75fde0b37756 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -36,6 +36,6 @@
     "@angular/compiler": "^7.2.0-rc.0",
     "@angular/compiler-cli": "^7.2.0-rc.0",
     "typescript": "3.2.4",
-    "webpack": "4.29.4"
+    "webpack": "4.29.5"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 94e9afde1add..3f5122b91d49 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -622,154 +622,162 @@
     "@types/uglify-js" "*"
     source-map "^0.6.0"
 
-"@webassemblyjs/ast@1.8.2":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.2.tgz#89297cd602cf8148e08d5fe1efbbba0cdb913ca7"
-  integrity sha512-5LLqqVsXZAhAJN0S7fTi11jwMJOjfR8290V0V7BWKgmZ36VVE6ZGuH4BN3eLt7LvNMIgyuYwyrPwiz6f3SGlBQ==
-  dependencies:
-    "@webassemblyjs/helper-module-context" "1.8.2"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.2"
-    "@webassemblyjs/wast-parser" "1.8.2"
-
-"@webassemblyjs/floating-point-hex-parser@1.8.2":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.2.tgz#c304fac0e5c2dd69a6d0f29000f4d6c4bf583203"
-  integrity sha512-5WIj+pSzbs8ao7NM31xFcGeOSnXgpCikmCFRYkXygVDqVaXTq/Hr9roqarUVMNfAegNc61oKEhe3pi+HUCXJEw==
-
-"@webassemblyjs/helper-api-error@1.8.2":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.2.tgz#e4c5325b264f08513bcf0e48cf3c0a3ea690b508"
-  integrity sha512-TJBDJPXO9DSC4qf5FZT0VFlTdJSm4DKxzcoyWwVike1aQQQEbCk167MJxYLi0SuHeOtULLtDDSZL7yDL3XXMKA==
-
-"@webassemblyjs/helper-buffer@1.8.2":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.2.tgz#c133435f8482240fab1994151c09d7bdd7b8f5a8"
-  integrity sha512-6fTynU6b0bC+yBH7+M6/BBRZId4F1fIuX00G1ZX45EAQOrB8p4TK5bccAEPG2vuyvnd4tgB1/4cYXq5GpszMGA==
-
-"@webassemblyjs/helper-code-frame@1.8.2":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.2.tgz#def3d079fe6ce38d997e939af3ed6cc3a37ff0f8"
-  integrity sha512-5beYTZS4Wsscu8ys2cLZ0SiToEe1wNitzrV/jCr02wGPOcpPHf0ERImR6iBGe/LX0O2cV9Pgi78hFp5WfNKeAg==
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.8.2"
-
-"@webassemblyjs/helper-fsm@1.8.2":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.2.tgz#7d1a8186c51df38d39e8a742aafdd002965d397c"
-  integrity sha512-7xRO1lFNj1fGm+ik73n8TuWXKeAqTuqeApqnxWnW+nI2lPyj4awrt+n1XkQr8OwmVK7mFJSRuTZc568qtgOyzQ==
-
-"@webassemblyjs/helper-module-context@1.8.2":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.2.tgz#3bfb0e7b889876bb8a7d1ccadca47e013721163e"
-  integrity sha512-EBr+n9M2F7PQ02s0f87KnSPva0KlT2S4IGDP+7aYqt2FCaMZzCtXcVahGSGg3ESZBSD0gzFU4486zD7SUsSD0Q==
-
-"@webassemblyjs/helper-wasm-bytecode@1.8.2":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.2.tgz#72a7fc29949af10d2960338fc84192df23ef030e"
-  integrity sha512-gS0trUUPYevbs5Rsv9E+VbzDuZ9KB4Tu/QymTfHtnSDpX4wxhs9u9/y/KiH84r0Z4xvm8/pqWnGvM77oxSPHYw==
-
-"@webassemblyjs/helper-wasm-section@1.8.2":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.2.tgz#4b36c105bfcc3dbabea9e8d04617127b3178f92f"
-  integrity sha512-HLHOR6/Vc+f5UziOUNQ3f5YedCMCuU46BdMEhjQBQwlOWqVAxgwqUn/KJkuhMvvjQ2FkASaDup8ohZrjyCKDKg==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.2"
-    "@webassemblyjs/helper-buffer" "1.8.2"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.2"
-    "@webassemblyjs/wasm-gen" "1.8.2"
-
-"@webassemblyjs/ieee754@1.8.2":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.2.tgz#43f8969f90e08b70101f35c93df07afaca5c9d5a"
-  integrity sha512-v9RtqGJ+z8UweiRh47DheXVtV0d/o9sQfXzAX1/1n/nw5G85yEQJdHcmwiRdu+SXmqlZQeymsnmve2oianzW4g==
+"@webassemblyjs/ast@1.8.3":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.3.tgz#63a741bd715a6b6783f2ea5c6ab707516aa215eb"
+  integrity sha512-xy3m06+Iu4D32+6soz6zLnwznigXJRuFNTovBX2M4GqVqLb0dnyWLbPnpcXvUSdEN+9DVyDeaq2jyH1eIL2LZQ==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.8.3"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.3"
+    "@webassemblyjs/wast-parser" "1.8.3"
+
+"@webassemblyjs/floating-point-hex-parser@1.8.3":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.3.tgz#f198a2d203b3c50846a064f5addd6a133ef9bc0e"
+  integrity sha512-vq1TISG4sts4f0lDwMUM0f3kpe0on+G3YyV5P0IySHFeaLKRYZ++n2fCFfG4TcCMYkqFeTUYFxm75L3ddlk2xA==
+
+"@webassemblyjs/helper-api-error@1.8.3":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.3.tgz#3b708f6926accd64dcbaa7ba5b63db5660ff4f66"
+  integrity sha512-BmWEynI4FnZbjk8CaYZXwcv9a6gIiu+rllRRouQUo73hglanXD3AGFJE7Q4JZCoVE0p5/jeX6kf5eKa3D4JxwQ==
+
+"@webassemblyjs/helper-buffer@1.8.3":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.3.tgz#f3150a23ffaba68621e1f094c8a14bebfd53dd48"
+  integrity sha512-iVIMhWnNHoFB94+/2l7LpswfCsXeMRnWfExKtqsZ/E2NxZyUx9nTeKK/MEMKTQNEpyfznIUX06OchBHQ+VKi/Q==
+
+"@webassemblyjs/helper-code-frame@1.8.3":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.3.tgz#f43ac605789b519d95784ef350fd2968aebdd3ef"
+  integrity sha512-K1UxoJML7GKr1QXR+BG7eXqQkvu+eEeTjlSl5wUFQ6W6vaOc5OwSxTcb3oE9x/3+w4NHhrIKD4JXXCZmLdL2cg==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.8.3"
+
+"@webassemblyjs/helper-fsm@1.8.3":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.3.tgz#46aaa03f41082a916850ebcb97e9fc198ef36a9c"
+  integrity sha512-387zipfrGyO77/qm7/SDUiZBjQ5KGk4qkrVIyuoubmRNIiqn3g+6ijY8BhnlGqsCCQX5bYKOnttJobT5xoyviA==
+
+"@webassemblyjs/helper-module-context@1.8.3":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.3.tgz#150da405d90c8ea81ae0b0e1965b7b64e585634f"
+  integrity sha512-lPLFdQfaRssfnGEJit5Sk785kbBPPPK4ZS6rR5W/8hlUO/5v3F+rN8XuUcMj/Ny9iZiyKhhuinWGTUuYL4VKeQ==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.3"
+    mamacro "^0.0.3"
+
+"@webassemblyjs/helper-wasm-bytecode@1.8.3":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.3.tgz#12f55bbafbbc7ddf9d8059a072cb7b0c17987901"
+  integrity sha512-R1nJW7bjyJLjsJQR5t3K/9LJ0QWuZezl8fGa49DZq4IVaejgvkbNlKEQxLYTC579zgT4IIIVHb5JA59uBPHXyw==
+
+"@webassemblyjs/helper-wasm-section@1.8.3":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.3.tgz#9e79456d9719e116f4f8998ee62ab54ba69a6cf3"
+  integrity sha512-P6F7D61SJY73Yz+fs49Q3+OzlYAZP86OfSpaSY448KzUy65NdfzDmo2NPVte+Rw4562MxEAacvq/mnDuvRWOcg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.3"
+    "@webassemblyjs/helper-buffer" "1.8.3"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.3"
+    "@webassemblyjs/wasm-gen" "1.8.3"
+
+"@webassemblyjs/ieee754@1.8.3":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.3.tgz#0a89355b1f6c9d08d0605c2acbc2a6fe3141f5b4"
+  integrity sha512-UD4HuLU99hjIvWz1pD68b52qsepWQlYCxDYVFJQfHh3BHyeAyAlBJ+QzLR1nnS5J6hAzjki3I3AoJeobNNSZlg==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.8.2":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.2.tgz#d32c149f196d4fbb639dfec9557e5e950f8e5ae4"
-  integrity sha512-41zX+6xpo6G2bkq3mdr+K5nXx5OOL6V979ucbLyq1ra5dFI3ReLiw6+HOCF5ih0t5HMQVIQBhInZIdxqcpc/Qg==
-  dependencies:
-    long "git://github.com/dcodeIO/long.js.git#8181a6b50a2a230f0b2a1e4c4093f9b9d19c8b69"
-
-"@webassemblyjs/utf8@1.8.2":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.2.tgz#6b262c1cba9052a8fd01a63eea50265ccd7f3b16"
-  integrity sha512-fP2Q4igo9/R82xeVra+zIQOjnmknSiAhykg//fz7c1UjghzoutQtldcbKOaL0+0j31RRFMDHgrUL+12RQExOYg==
-
-"@webassemblyjs/wasm-edit@1.8.2":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.2.tgz#3d3bbf10c46084e6525a1d9e2476bd072f0edd5b"
-  integrity sha512-rM1sgdLQrXQs4ZapglK86mW8QMml0FJ+jwZ5961sEmHISTkJRvheILuzA9jcKy5vwhWgkPf/nIhO2I6A9rkGww==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.2"
-    "@webassemblyjs/helper-buffer" "1.8.2"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.2"
-    "@webassemblyjs/helper-wasm-section" "1.8.2"
-    "@webassemblyjs/wasm-gen" "1.8.2"
-    "@webassemblyjs/wasm-opt" "1.8.2"
-    "@webassemblyjs/wasm-parser" "1.8.2"
-    "@webassemblyjs/wast-printer" "1.8.2"
-
-"@webassemblyjs/wasm-gen@1.8.2":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.2.tgz#389670ade8398275cbf7c7c92e38f6f5eadc4c1a"
-  integrity sha512-WTBesrMydDwJbbB48OZGcMq6zDsT6CJd1UalvGuXtHJLargazOron+JBdmt8Nnd+Z2s3TPfCPP54EpQBsDVR7Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.2"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.2"
-    "@webassemblyjs/ieee754" "1.8.2"
-    "@webassemblyjs/leb128" "1.8.2"
-    "@webassemblyjs/utf8" "1.8.2"
-
-"@webassemblyjs/wasm-opt@1.8.2":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.2.tgz#967019ac1b6d577177d241b912f61f01122d6b49"
-  integrity sha512-tzXn0xNQNyoUBr1+O1rwYXZd2bcUdXSOUTu0fLAIPl01dcTY6hjIi2B2DXYqk9OVQRnjPyX2Ew6rkeCTxfaYaQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.2"
-    "@webassemblyjs/helper-buffer" "1.8.2"
-    "@webassemblyjs/wasm-gen" "1.8.2"
-    "@webassemblyjs/wasm-parser" "1.8.2"
-
-"@webassemblyjs/wasm-parser@1.8.2":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.2.tgz#7a9d587a3edab32fc800dc9498bdbdf90896bb79"
-  integrity sha512-uc6nVjvUjZzHa8fSl0ko684puuw0ujfCYn19v5tTu0DQ7tXx9jlZXzYw0aW7fmROxyez7BcbJloYLmXg723vVQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.2"
-    "@webassemblyjs/helper-api-error" "1.8.2"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.2"
-    "@webassemblyjs/ieee754" "1.8.2"
-    "@webassemblyjs/leb128" "1.8.2"
-    "@webassemblyjs/utf8" "1.8.2"
-
-"@webassemblyjs/wast-parser@1.8.2":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.2.tgz#c3ded4de843756ab5f435c422a36fdd48aa518ad"
-  integrity sha512-idk8cCqM+T6/iIxoQCOz85vKvWhyHghJbICob/H1AN8byN1O6a2Jxk+g1ZJA7sZDc6/q8pYV6dVkHKgm8y1oUA==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.2"
-    "@webassemblyjs/floating-point-hex-parser" "1.8.2"
-    "@webassemblyjs/helper-api-error" "1.8.2"
-    "@webassemblyjs/helper-code-frame" "1.8.2"
-    "@webassemblyjs/helper-fsm" "1.8.2"
-    long "git://github.com/dcodeIO/long.js.git#8181a6b50a2a230f0b2a1e4c4093f9b9d19c8b69"
-
-"@webassemblyjs/wast-printer@1.8.2":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.2.tgz#a7dbb0e6eba3721fd06a949ac1917fd289b3db4d"
-  integrity sha512-TENFBgf5bKKfs2LbW8fd/0xvamccbEHoR83lQlEP7Qi0nkpXAP77VpvIITy0J+UZAa/Y3j6K6MPw1tNMbdjf4A==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.2"
-    "@webassemblyjs/wast-parser" "1.8.2"
-    long "git://github.com/dcodeIO/long.js.git#8181a6b50a2a230f0b2a1e4c4093f9b9d19c8b69"
+"@webassemblyjs/leb128@1.8.3":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.3.tgz#b7fd9d7c039e34e375c4473bd4dc89ce8228b920"
+  integrity sha512-XXd3s1BmkC1gpGABuCRLqCGOD6D2L+Ma2BpwpjrQEHeQATKWAQtxAyU9Z14/z8Ryx6IG+L4/NDkIGHrccEhRUg==
+  dependencies:
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/utf8@1.8.3":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.3.tgz#75712db52cfdda868731569ddfe11046f1f1e7a2"
+  integrity sha512-Wv/WH9Zo5h5ZMyfCNpUrjFsLZ3X1amdfEuwdb7MLdG3cPAjRS6yc6ElULlpjLiiBTuzvmLhr3ENsuGyJ3wyCgg==
+
+"@webassemblyjs/wasm-edit@1.8.3":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.3.tgz#23c3c6206b096f9f6aa49623a5310a102ef0fb87"
+  integrity sha512-nB19eUx3Yhi1Vvv3yev5r+bqQixZprMtaoCs1brg9Efyl8Hto3tGaUoZ0Yb4Umn/gQCyoEGFfUxPLp1/8+Jvnw==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.3"
+    "@webassemblyjs/helper-buffer" "1.8.3"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.3"
+    "@webassemblyjs/helper-wasm-section" "1.8.3"
+    "@webassemblyjs/wasm-gen" "1.8.3"
+    "@webassemblyjs/wasm-opt" "1.8.3"
+    "@webassemblyjs/wasm-parser" "1.8.3"
+    "@webassemblyjs/wast-printer" "1.8.3"
+
+"@webassemblyjs/wasm-gen@1.8.3":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.3.tgz#1a433b8ab97e074e6ac2e25fcbc8cb6125400813"
+  integrity sha512-sDNmu2nLBJZ/huSzlJvd9IK8B1EjCsOl7VeMV9VJPmxKYgTJ47lbkSP+KAXMgZWGcArxmcrznqm7FrAPQ7vVGg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.3"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.3"
+    "@webassemblyjs/ieee754" "1.8.3"
+    "@webassemblyjs/leb128" "1.8.3"
+    "@webassemblyjs/utf8" "1.8.3"
+
+"@webassemblyjs/wasm-opt@1.8.3":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.3.tgz#54754bcf88f88e92b909416a91125301cc81419c"
+  integrity sha512-j8lmQVFR+FR4/645VNgV4R/Jz8i50eaPAj93GZyd3EIJondVshE/D9pivpSDIXyaZt+IkCodlzOoZUE4LnQbeA==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.3"
+    "@webassemblyjs/helper-buffer" "1.8.3"
+    "@webassemblyjs/wasm-gen" "1.8.3"
+    "@webassemblyjs/wasm-parser" "1.8.3"
+
+"@webassemblyjs/wasm-parser@1.8.3":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.3.tgz#d12ed19d1b8e8667a7bee040d2245aaaf215340b"
+  integrity sha512-NBI3SNNtRoy4T/KBsRZCAWUzE9lI94RH2nneLwa1KKIrt/2zzcTavWg6oY05ArCbb/PZDk3OUi63CD1RYtN65w==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.3"
+    "@webassemblyjs/helper-api-error" "1.8.3"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.3"
+    "@webassemblyjs/ieee754" "1.8.3"
+    "@webassemblyjs/leb128" "1.8.3"
+    "@webassemblyjs/utf8" "1.8.3"
+
+"@webassemblyjs/wast-parser@1.8.3":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.3.tgz#44aa123e145503e995045dc3e5e2770069da117b"
+  integrity sha512-gZPst4CNcmGtKC1eYQmgCx6gwQvxk4h/nPjfPBbRoD+Raw3Hs+BS3yhrfgyRKtlYP+BJ8LcY9iFODEQofl2qbg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.3"
+    "@webassemblyjs/floating-point-hex-parser" "1.8.3"
+    "@webassemblyjs/helper-api-error" "1.8.3"
+    "@webassemblyjs/helper-code-frame" "1.8.3"
+    "@webassemblyjs/helper-fsm" "1.8.3"
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/wast-printer@1.8.3":
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.3.tgz#b1177780b266b1305f2eeba87c4d6aa732352060"
+  integrity sha512-DTA6kpXuHK4PHu16yAD9QVuT1WZQRT7079oIFFmFSjqjLWGXS909I/7kiLTn931mcj7wGsaUNungjwNQ2lGQ3Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.3"
+    "@webassemblyjs/wast-parser" "1.8.3"
+    "@xtuc/long" "4.2.2"
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
   integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
 
+"@xtuc/long@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
+
 "@yarnpkg/lockfile@1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
@@ -6116,11 +6124,6 @@ loglevel@^1.4.1:
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
   integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
 
-"long@git://github.com/dcodeIO/long.js.git#8181a6b50a2a230f0b2a1e4c4093f9b9d19c8b69":
-  version "4.0.1"
-  uid "8181a6b50a2a230f0b2a1e4c4093f9b9d19c8b69"
-  resolved "git://github.com/dcodeIO/long.js.git#8181a6b50a2a230f0b2a1e4c4093f9b9d19c8b69"
-
 long@~3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
@@ -6234,6 +6237,11 @@ make-fetch-happen@^4.0.1:
     socks-proxy-agent "^4.0.0"
     ssri "^6.0.0"
 
+mamacro@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
+  integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
+
 map-age-cleaner@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz#098fb15538fd3dbe461f12745b0ca8568d4e3f74"
@@ -10635,15 +10643,15 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.29.4:
-  version "4.29.4"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.4.tgz#c0a2a12635142015f931b92efee7de6559f264dd"
-  integrity sha512-Uu/QgPFZG+w+5wjWIFBgIy+g9vOF3QiLmT2Bl783MQSLjRF/K+GMv2TH3TVNFyPQVEHY8rVnPoQtcqrnqK2H7Q==
+webpack@4.29.5:
+  version "4.29.5"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.5.tgz#52b60a7b0838427c3a894cd801a11dc0836bc79f"
+  integrity sha512-DuWlYUT982c7XVHodrLO9quFbNpVq5FNxLrMUfYUTlgKW0+yPimynYf1kttSQpEneAL1FH3P3OLNgkyImx8qIQ==
   dependencies:
-    "@webassemblyjs/ast" "1.8.2"
-    "@webassemblyjs/helper-module-context" "1.8.2"
-    "@webassemblyjs/wasm-edit" "1.8.2"
-    "@webassemblyjs/wasm-parser" "1.8.2"
+    "@webassemblyjs/ast" "1.8.3"
+    "@webassemblyjs/helper-module-context" "1.8.3"
+    "@webassemblyjs/wasm-edit" "1.8.3"
+    "@webassemblyjs/wasm-parser" "1.8.3"
     acorn "^6.0.5"
     acorn-dynamic-import "^4.0.0"
     ajv "^6.1.0"

From 05e2a0eafe55a78fd84e6d1a156ac44c266ed144 Mon Sep 17 00:00:00 2001
From: hrocha16 <rochagza@gmail.com>
Date: Fri, 8 Feb 2019 21:44:55 -0600
Subject: [PATCH 0779/1703] fix(@angular-devkit/build-angular): minimum
 threshold

---
 .../src/angular-cli-files/utilities/bundle-calculator.ts  | 8 ++++++--
 .../angular-cli-files/utilities/bundle-calculator_spec.ts | 4 ++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator.ts
index ca20d6fb386c..62c9fb652e69 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator.ts
@@ -154,7 +154,7 @@ export function calculateBytes(
   let value = Number(matches[1]);
   switch (matches[2] && matches[2].toLowerCase()) {
     case '%':
-      value = baselineBytes * value / 100 * factor;
+      value = baselineBytes * value / 100;
       break;
     case 'kb':
       value *= 1024;
@@ -167,5 +167,9 @@ export function calculateBytes(
       break;
   }
 
-  return value + baselineBytes;
+  if (baselineBytes === 0) {
+    return value;
+  }
+
+  return baselineBytes + value * factor;
 }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator_spec.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator_spec.ts
index c610706ebe0c..c2d3774b7ea3 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator_spec.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator_spec.ts
@@ -67,6 +67,10 @@ describe('bundle-calculator', () => {
     expect(calculateBytes('25.0gB')).toBe(25 * 1024 * 1024 * 1024);
   });
 
+  it ('converts a decimal with mb and baseline', () => {
+    expect(calculateBytes('3mb', '5mb', -1)).toBe(2 * 1024 * 1024);
+  });
+
   it ('converts a percentage with baseline', () => {
     expect(calculateBytes('20%', '1mb')).toBe(1024 * 1024 * 1.2);
     expect(calculateBytes('20%', '1mb', -1)).toBe(1024 * 1024 * 0.8);

From 4751fc02d41329e113e4feb1b3703bc25d8a8a81 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 15 Feb 2019 20:48:55 -0500
Subject: [PATCH 0780/1703] fix(@angular-devkit/build-angular): improve webpack
 loader resolution

Previously, all loaders either needed to be in the workspace's node modules directory or a node modules directory directly within the build angular package.  A package manager can potentially hoist a loader to a node modules location inbetween the two and causing loader resolution to fail.  This change causes webpack to check all intermediate node modules directories in addition to the initial two locations.
---
 .../models/webpack-configs/common.ts          | 14 +++-------
 .../angular-cli-files/utilities/find-up.ts    | 26 ++++++++++++++++---
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 1a40ab83023f..53db8b5761cf 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -13,8 +13,7 @@ import { AssetPatternObject } from '../../../browser/schema';
 import { BundleBudgetPlugin } from '../../plugins/bundle-budget';
 import { CleanCssWebpackPlugin } from '../../plugins/cleancss-webpack-plugin';
 import { ScriptsWebpackPlugin } from '../../plugins/scripts-webpack-plugin';
-import { findUp } from '../../utilities/find-up';
-import { isDirectory } from '../../utilities/is-directory';
+import { findAllNodeModules, findUp } from '../../utilities/find-up';
 import { requireProjectModule } from '../../utilities/require-project-module';
 import { BuildOptions, WebpackConfigOptions } from '../build-options';
 import { getOutputHashFormat, normalizeExtraEntryPoints } from './utils';
@@ -201,15 +200,8 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
   // Allow loaders to be in a node_modules nested inside the devkit/build-angular package.
   // This is important in case loaders do not get hoisted.
   // If this file moves to another location, alter potentialNodeModules as well.
-  const loaderNodeModules = ['node_modules'];
-  const buildAngularNodeModules = findUp('node_modules', __dirname);
-  if (buildAngularNodeModules
-    && isDirectory(buildAngularNodeModules)
-    && buildAngularNodeModules !== nodeModules
-    && buildAngularNodeModules.startsWith(nodeModules)
-  ) {
-    loaderNodeModules.push(buildAngularNodeModules);
-  }
+  const loaderNodeModules = findAllNodeModules(__dirname, projectRoot);
+  loaderNodeModules.unshift('node_modules');
 
   // Load rxjs path aliases.
   // https://github.com/ReactiveX/rxjs/blob/master/doc/lettable-operators.md#build-and-treeshaking
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/find-up.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/find-up.ts
index a57d2b64fccc..037e99235956 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/find-up.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/find-up.ts
@@ -5,11 +5,9 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable
-// TODO: cleanup this file, it's copied as is from Angular CLI.
-
-import * as path from 'path';
 import { existsSync } from 'fs';
+import * as path from 'path';
+import { isDirectory } from './is-directory';
 
 export function findUp(names: string | string[], from: string, stopOnNodeModules = false) {
   if (!Array.isArray(names)) {
@@ -38,3 +36,23 @@ export function findUp(names: string | string[], from: string, stopOnNodeModules
 
   return null;
 }
+
+export function findAllNodeModules(from: string, root?: string) {
+  const nodeModules: string[] = [];
+
+  let current = from;
+  while (current && current !== root) {
+    const potential = path.join(current, 'node_modules');
+    if (existsSync(potential) && isDirectory(potential)) {
+      nodeModules.push(potential);
+    }
+
+    const next = path.dirname(current);
+    if (next === current) {
+      break;
+    }
+    current = next;
+  }
+
+  return nodeModules;
+}

From 89797900db46eb9ee9a6590e6aee97649325ae0c Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 18 Feb 2019 21:29:23 +0100
Subject: [PATCH 0781/1703] fix(@schematics/angular): fixes issue that
 `ViewEncapsulation` is not being configured when provided

Fixes #13689
---
 .../angular/application/files/src/main.ts.template | 10 ++++++++--
 packages/schematics/angular/application/index.ts   | 10 ++++++----
 .../schematics/angular/application/index_spec.ts   | 14 ++++++++++++--
 .../other-files/app.component.ts.template          |  5 +++--
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/packages/schematics/angular/application/files/src/main.ts.template b/packages/schematics/angular/application/files/src/main.ts.template
index c7b673cf44b3..3d492bb9626b 100644
--- a/packages/schematics/angular/application/files/src/main.ts.template
+++ b/packages/schematics/angular/application/files/src/main.ts.template
@@ -1,4 +1,4 @@
-import { enableProdMode } from '@angular/core';
+import { enableProdMode<% if(!!viewEncapsulation) { %>, ViewEncapsulation<% }%> } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
 import { AppModule } from './app/app.module';
@@ -7,6 +7,12 @@ import { environment } from './environments/environment';
 if (environment.production) {
   enableProdMode();
 }
-
+<% if(!!viewEncapsulation) { %>
+platformBrowserDynamic().bootstrapModule(AppModule, {
+  defaultEncapsulation: ViewEncapsulation.<%= viewEncapsulation %>
+})
+  .catch(err => console.error(err));
+<% } else { %>
 platformBrowserDynamic().bootstrapModule(AppModule)
   .catch(err => console.error(err));
+<% } %>
\ No newline at end of file
diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 0f7a6b4e2220..42f3ea3c7e92 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -164,16 +164,18 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
   if (options.inlineTemplate === true
     || options.inlineStyle === true
     || options.style !== Style.Css) {
-    schematics['@schematics/angular:component'] = {};
+    const componentSchematicsOptions: JsonObject = {};
     if (options.inlineTemplate === true) {
-      (schematics['@schematics/angular:component'] as JsonObject).inlineTemplate = true;
+      componentSchematicsOptions.inlineTemplate = true;
     }
     if (options.inlineStyle === true) {
-      (schematics['@schematics/angular:component'] as JsonObject).inlineStyle = true;
+      componentSchematicsOptions.inlineStyle = true;
     }
     if (options.style && options.style !== Style.Css) {
-      (schematics['@schematics/angular:component'] as JsonObject).style = options.style;
+      componentSchematicsOptions.style = options.style;
     }
+
+    schematics['@schematics/angular:component'] = componentSchematicsOptions;
   }
 
   if (options.skipTests === true) {
diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
index f733a6c5e49d..352d318548fa 100644
--- a/packages/schematics/angular/application/index_spec.ts
+++ b/packages/schematics/angular/application/index_spec.ts
@@ -10,7 +10,7 @@ import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/te
 import { latestVersions } from '../utility/latest-versions';
 import { getFileContent } from '../utility/test';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
-import { Schema as ApplicationOptions, Style } from './schema';
+import { Schema as ApplicationOptions, Style, ViewEncapsulation } from './schema';
 
 // tslint:disable:max-line-length
 describe('Application Schematic', () => {
@@ -116,6 +116,17 @@ describe('Application Schematic', () => {
     expect(content).toMatch(/import { AppComponent } from \'\.\/app\.component\';/);
   });
 
+  it(`should set 'defaultEncapsulation' in main.ts when 'ViewEncapsulation' is provided`, () => {
+    const tree = schematicRunner.runSchematic('application', {
+      ...defaultOptions,
+      viewEncapsulation: ViewEncapsulation.ShadowDom,
+    }, workspaceTree);
+    const path = '/projects/foo/src/main.ts';
+    const content = tree.readContent(path);
+    expect(content).toContain('defaultEncapsulation: ViewEncapsulation.ShadowDom');
+    expect(content).toContain(`import { enableProdMode, ViewEncapsulation } from '@angular/core'`);
+  });
+
   it('should set the right paths in the tsconfig files', () => {
     const tree = schematicRunner.runSchematic('application', defaultOptions, workspaceTree);
     let path = '/projects/foo/tsconfig.app.json';
@@ -293,7 +304,6 @@ describe('Application Schematic', () => {
 
     it('should set the relative tsconfig paths', () => {
       const options = { ...defaultOptions, projectRoot: '' };
-
       const tree = schematicRunner.runSchematic('application', options, workspaceTree);
       const appTsConfig = JSON.parse(tree.readContent('/src/tsconfig.app.json'));
       expect(appTsConfig.extends).toEqual('../tsconfig.json');
diff --git a/packages/schematics/angular/application/other-files/app.component.ts.template b/packages/schematics/angular/application/other-files/app.component.ts.template
index 91aad371b12d..ac8740a208da 100644
--- a/packages/schematics/angular/application/other-files/app.component.ts.template
+++ b/packages/schematics/angular/application/other-files/app.component.ts.template
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component<% if(!!viewEncapsulation) { %>, ViewEncapsulation<% }%> } from '@angular/core';
 
 @Component({
   selector: '<%= selector %>',<% if(inlineTemplate) { %>
@@ -28,7 +28,8 @@ import { Component } from '@angular/core';
   `,<% } else { %>
   templateUrl: './app.component.html',<% } if(inlineStyle) { %>
   styles: []<% } else { %>
-  styleUrls: ['./app.component.<%= styleExt %>']<% } %>
+  styleUrls: ['./app.component.<%= styleExt %>']<% } %>,<% if(!!viewEncapsulation) { %>,
+  encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } %>
 })
 export class AppComponent {
   title = '<%= name %>';

From 81acdd7066f25172a66f8bb3ce2b992450e369e0 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Tue, 19 Feb 2019 15:01:43 +0100
Subject: [PATCH 0782/1703] fix(@schematics/angular): add file extensions to
 style prompt

This is causing major confusion as users are not aware that choosing `sass` will generate files with `scss` extension.

Another reason for this confusion is that in other schematics, `style` accepts either a preprocessor or file extension while in this prompt only a preprocessor is provided.
---
 packages/schematics/angular/ng-new/schema.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
index e8dda08442cc..ea4c18bd2214 100644
--- a/packages/schematics/angular/ng-new/schema.json
+++ b/packages/schematics/angular/ng-new/schema.json
@@ -125,10 +125,10 @@
         "message": "Which stylesheet format would you like to use?",
         "type": "list",
         "items": [
-          { "value": "css", "label": "CSS" },
-          { "value": "sass", "label": "Sass   [ http://sass-lang.com   ]" },
-          { "value": "less", "label": "Less   [ http://lesscss.org     ]" },
-          { "value": "styl", "label": "Stylus [ http://stylus-lang.com ]" }
+          { "value": "css",  "label": "CSS    (.css )" },
+          { "value": "sass", "label": "Sass   (.scss) [ http://sass-lang.com   ]" },
+          { "value": "less", "label": "Less   (.less) [ http://lesscss.org     ]" },
+          { "value": "styl", "label": "Stylus (.styl) [ http://stylus-lang.com ]" }
         ]
       }
     },

From 2241e07c2207bff4f6f80c10a24882abd67d960e Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 20 Feb 2019 06:20:39 +0000
Subject: [PATCH 0783/1703] build: update autoprefixer to version 9.4.8

---
 .../angular_devkit/build_angular/package.json  |  2 +-
 yarn.lock                                      | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 5434f220723a..bef85739bf9c 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -12,7 +12,7 @@
     "@angular-devkit/core": "0.0.0",
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.9.1",
-    "autoprefixer": "9.4.7",
+    "autoprefixer": "9.4.8",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "4.6.0",
diff --git a/yarn.lock b/yarn.lock
index 3f5122b91d49..263f547a5ef6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1237,13 +1237,13 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@9.4.7:
-  version "9.4.7"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.7.tgz#f997994f9a810eae47b38fa6d8a119772051c4ff"
-  integrity sha512-qS5wW6aXHkm53Y4z73tFGsUhmZu4aMPV9iHXYlF0c/wxjknXNHuj/1cIQb+6YH692DbJGGWcckAXX+VxKvahMA==
+autoprefixer@9.4.8:
+  version "9.4.8"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.8.tgz#575dcdfd984228c7bccbc08c5fe53f0ea6915593"
+  integrity sha512-DIhd0KMi9Nql3oJkJ2HCeOVihrXFPtWXc6ckwaUNwliDOt9OGr0fk8vV8jCLWXnZc1EXvQ2uLUzGpcPxFAQHEQ==
   dependencies:
     browserslist "^4.4.1"
-    caniuse-lite "^1.0.30000932"
+    caniuse-lite "^1.0.30000938"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
     postcss "^7.0.14"
@@ -1940,10 +1940,10 @@ caniuse-lite@^1.0.30000929:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000929.tgz#7b391b781a9c3097ecc39ea053301aea8ea16317"
   integrity sha512-n2w1gPQSsYyorSVYqPMqbSaz1w7o9ZC8VhOEGI9T5MfGDzp7sbopQxG6GaQmYsaq13Xfx/mkxJUWC1Dz3oZfzw==
 
-caniuse-lite@^1.0.30000932:
-  version "1.0.30000932"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000932.tgz#d01763e9ce77810962ca7391ff827b5949ce4272"
-  integrity sha512-4bghJFItvzz8m0T3lLZbacmEY9X1Z2AtIzTr7s7byqZIOumASfr4ynDx7rtm0J85nDmx8vsgR6vnaSoeU8Oh0A==
+caniuse-lite@^1.0.30000938:
+  version "1.0.30000938"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000938.tgz#b64bf1427438df40183fce910fe24e34feda7a3f"
+  integrity sha512-ekW8NQ3/FvokviDxhdKLZZAx7PptXNwxKgXtnR5y+PR3hckwuP3yJ1Ir+4/c97dsHNqtAyfKUGdw8P4EYzBNgw==
 
 canonical-path@1.0.0:
   version "1.0.0"

From bd6fe982deb6c0bce75493f0f3def7c5b7d12bf3 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 20 Feb 2019 06:20:53 +0000
Subject: [PATCH 0784/1703] build: update webpack-dev-middleware to version
 3.6.0

---
 packages/angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                          | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index bef85739bf9c..33d73dd16fac 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -45,7 +45,7 @@
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.2.2",
     "webpack": "4.29.5",
-    "webpack-dev-middleware": "3.5.2",
+    "webpack-dev-middleware": "3.6.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.2.1",
     "webpack-sources": "1.3.0",
diff --git a/yarn.lock b/yarn.lock
index 263f547a5ef6..29629b2eaf3e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6311,7 +6311,7 @@ mem@^4.0.0:
     mimic-fn "^1.0.0"
     p-is-promise "^1.1.0"
 
-memory-fs@^0.4.0, memory-fs@~0.4.1:
+memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
   integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
@@ -10533,12 +10533,12 @@ webpack-dev-middleware@3.4.0:
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
-webpack-dev-middleware@3.5.2:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.5.2.tgz#d768b6194f3fe8d72d51feded49de359e8d96ffb"
-  integrity sha512-nPmshdt1ckcwWjI0Ubrdp8KroeuprW6xFKYqk0u3MflNMBXvHPnMATsC7/L/enwav2zvLCfj/Usr47qnF3KQyA==
+webpack-dev-middleware@3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.0.tgz#71f1b04e52ff8d442757af2be3a658237d53a3e5"
+  integrity sha512-oeXA3m+5gbYbDBGo4SvKpAHJJEGMoekUbHgo1RK7CP1sz7/WOSeu/dWJtSTk+rzDCLkPwQhGocgIq6lQqOyOwg==
   dependencies:
-    memory-fs "~0.4.1"
+    memory-fs "^0.4.1"
     mime "^2.3.1"
     range-parser "^1.0.3"
     webpack-log "^2.0.0"

From be5e2fbfe52faa7bea50948e59b55b005a4aeaed Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 19 Feb 2019 13:00:00 -0500
Subject: [PATCH 0785/1703] fix(@angular/cli): remove redundant
 typescript/compiler-cli compatibility check

Angular 5.0+ has a full peer dependencies setup (with 6.0+ also having a configurable runtime error check) to ensure that an appropriate version of typescript is available for compilation.  Angular CLI 8.0+ does not support Angular versions prior to these and therefore the warning is redundant.  For the case where the developer wishes to use an unsupported TypeScript version, the developer would need to adjust two similar but differently name settings in two different configuration files.
---
 packages/angular/cli/commands/build-impl.ts   |  3 +-
 packages/angular/cli/commands/config-impl.ts  | 18 ++++-
 packages/angular/cli/commands/serve-impl.ts   |  3 +-
 packages/angular/cli/lib/config/schema.json   |  3 +-
 packages/angular/cli/upgrade/version.ts       | 66 +------------------
 packages/angular/cli/utilities/config.ts      |  3 -
 .../angular/migrations/update-6/index.ts      |  6 --
 .../schema/serializers/schema_benchmark.json  |  5 --
 .../e2e/tests/commands/config/config-set.ts   |  8 +--
 .../e2e/tests/misc/typescript-warning.ts      | 54 ---------------
 10 files changed, 26 insertions(+), 143 deletions(-)
 delete mode 100644 tests/legacy-cli/e2e/tests/misc/typescript-warning.ts

diff --git a/packages/angular/cli/commands/build-impl.ts b/packages/angular/cli/commands/build-impl.ts
index 39154941098b..0934c55e2961 100644
--- a/packages/angular/cli/commands/build-impl.ts
+++ b/packages/angular/cli/commands/build-impl.ts
@@ -15,9 +15,8 @@ export class BuildCommand extends ArchitectCommand<BuildCommandSchema> {
   public readonly target = 'build';
 
   public async run(options: ArchitectCommandOptions & Arguments) {
-    // Check Angular and TypeScript versions.
+    // Check Angular version.
     Version.assertCompatibleAngularVersion(this.workspace.root);
-    Version.assertTypescriptVersion(this.workspace.root);
 
     return this.runArchitectTarget(options);
   }
diff --git a/packages/angular/cli/commands/config-impl.ts b/packages/angular/cli/commands/config-impl.ts
index b6ad2d52e0d5..4a7cca9a36c7 100644
--- a/packages/angular/cli/commands/config-impl.ts
+++ b/packages/angular/cli/commands/config-impl.ts
@@ -30,7 +30,6 @@ import { Schema as ConfigCommandSchema, Value as ConfigCommandSchemaValue } from
 
 const validCliPaths = new Map([
   ['cli.warnings.versionMismatch', 'boolean'],
-  ['cli.warnings.typescriptMismatch', 'boolean'],
   ['cli.defaultCollection', 'string'],
   ['cli.packageManager', 'string'],
 ]);
@@ -213,6 +212,15 @@ export class ConfigCommand extends Command<ConfigCommandSchema> {
   private get(config: experimental.workspace.WorkspaceSchema, options: ConfigCommandSchema) {
     let value;
     if (options.jsonPath) {
+      if (options.jsonPath === 'cli.warnings.typescriptMismatch') {
+        // NOTE: Remove this in 9.0.
+        this.logger.warn('The "typescriptMismatch" warning has been removed in 8.0.');
+        // Since there is no actual warning, this value is always false.
+        this.logger.info('false');
+
+        return 0;
+      }
+
       value = getValueFromPath(config as {} as JsonObject, options.jsonPath);
     } else {
       value = config;
@@ -235,6 +243,14 @@ export class ConfigCommand extends Command<ConfigCommandSchema> {
     if (!options.jsonPath || !options.jsonPath.trim()) {
       throw new Error('Invalid Path.');
     }
+
+    if (options.jsonPath === 'cli.warnings.typescriptMismatch') {
+      // NOTE: Remove this in 9.0.
+      this.logger.warn('The "typescriptMismatch" warning has been removed in 8.0.');
+
+      return 0;
+    }
+
     if (options.global
         && !options.jsonPath.startsWith('schematics.')
         && !validCliPaths.has(options.jsonPath)) {
diff --git a/packages/angular/cli/commands/serve-impl.ts b/packages/angular/cli/commands/serve-impl.ts
index ba365974e310..d27bd7d5aa03 100644
--- a/packages/angular/cli/commands/serve-impl.ts
+++ b/packages/angular/cli/commands/serve-impl.ts
@@ -15,9 +15,8 @@ export class ServeCommand extends ArchitectCommand<ServeCommandSchema> {
   public readonly target = 'serve';
 
   public validate(_options: ArchitectCommandOptions & Arguments) {
-    // Check Angular and TypeScript versions.
+    // Check Angular versions.
     Version.assertCompatibleAngularVersion(this.workspace.root);
-    Version.assertTypescriptVersion(this.workspace.root);
 
     return true;
   }
diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index 02646083fc73..0e0383fbe6d6 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -61,7 +61,8 @@
             },
             "typescriptMismatch": {
               "description": "Show a warning when the TypeScript version is incompatible.",
-              "type": "boolean"
+              "type": "boolean",
+              "x-deprecated": true
             }
           }
         }
diff --git a/packages/angular/cli/upgrade/version.ts b/packages/angular/cli/upgrade/version.ts
index 89e013a0f795..f63e18154a3d 100644
--- a/packages/angular/cli/upgrade/version.ts
+++ b/packages/angular/cli/upgrade/version.ts
@@ -9,8 +9,7 @@
 import { tags, terminal } from '@angular-devkit/core';
 import { resolve } from '@angular-devkit/core/node';
 import * as path from 'path';
-import { SemVer, satisfies } from 'semver';
-import { isWarningEnabled } from '../utilities/config';
+import { SemVer } from 'semver';
 
 
 export class Version {
@@ -110,67 +109,4 @@ export class Version {
     }
   }
 
-  static assertTypescriptVersion(projectRoot: string) {
-    if (!isWarningEnabled('typescriptMismatch')) {
-      return;
-    }
-
-    let compilerVersion: string;
-    let tsVersion: string;
-    let compilerTypeScriptPeerVersion: string;
-    try {
-      const resolveOptions = {
-        basedir: projectRoot,
-        checkGlobal: false,
-        checkLocal: true,
-      };
-      const compilerPackagePath = resolve('@angular/compiler-cli/package.json', resolveOptions);
-      const typescriptProjectPath = resolve('typescript', resolveOptions);
-      const compilerPackageInfo = require(compilerPackagePath);
-
-      compilerVersion = compilerPackageInfo['version'];
-      compilerTypeScriptPeerVersion = compilerPackageInfo['peerDependencies']['typescript'];
-      tsVersion = require(typescriptProjectPath).version;
-    } catch {
-      console.error(terminal.bold(terminal.red(tags.stripIndents`
-        Versions of @angular/compiler-cli and typescript could not be determined.
-        The most common reason for this is a broken npm install.
-
-        Please make sure your package.json contains both @angular/compiler-cli and typescript in
-        devDependencies, then delete node_modules and package-lock.json (if you have one) and
-        run npm install again.
-      `)));
-      process.exit(2);
-
-      return;
-    }
-
-    // These versions do not have accurate typescript peer dependencies
-    const versionCombos = [
-      { compiler: '>=2.3.1 <3.0.0', typescript: '>=2.0.2 <2.3.0' },
-      { compiler: '>=4.0.0-beta.0 <5.0.0', typescript: '>=2.1.0 <2.4.0' },
-      { compiler: '5.0.0-beta.0 - 5.0.0-rc.2', typescript: '>=2.4.2 <2.5.0' },
-    ];
-
-    let currentCombo = versionCombos.find((combo) => satisfies(compilerVersion, combo.compiler));
-    if (!currentCombo && compilerTypeScriptPeerVersion) {
-      currentCombo = { compiler: compilerVersion, typescript: compilerTypeScriptPeerVersion };
-    }
-
-    if (currentCombo && !satisfies(tsVersion, currentCombo.typescript)) {
-      // First line of warning looks weird being split in two, disable tslint for it.
-      console.error((terminal.yellow('\n' + tags.stripIndent`
-        @angular/compiler-cli@${compilerVersion} requires typescript@'${
-        currentCombo.typescript}' but ${tsVersion} was found instead.
-        Using this version can result in undefined behaviour and difficult to debug problems.
-
-        Please run the following command to install a compatible version of TypeScript.
-
-            npm install typescript@"${currentCombo.typescript}"
-
-        To disable this warning run "ng config cli.warnings.typescriptMismatch false".
-      ` + '\n')));
-    }
-  }
-
 }
diff --git a/packages/angular/cli/utilities/config.ts b/packages/angular/cli/utilities/config.ts
index 336813c19d15..3351b5d7fb4b 100644
--- a/packages/angular/cli/utilities/config.ts
+++ b/packages/angular/cli/utilities/config.ts
@@ -221,9 +221,6 @@ export function migrateLegacyGlobalConfig(): boolean {
         if (typeof legacy.warnings.versionMismatch == 'boolean') {
           warnings['versionMismatch'] = legacy.warnings.versionMismatch;
         }
-        if (typeof legacy.warnings.typescriptMismatch == 'boolean') {
-          warnings['typescriptMismatch'] = legacy.warnings.typescriptMismatch;
-        }
 
         if (Object.getOwnPropertyNames(warnings).length > 0) {
           cli['warnings'] = warnings;
diff --git a/packages/schematics/angular/migrations/update-6/index.ts b/packages/schematics/angular/migrations/update-6/index.ts
index f64ab8aa1ee7..eb5c5d9bd1b4 100644
--- a/packages/schematics/angular/migrations/update-6/index.ts
+++ b/packages/schematics/angular/migrations/update-6/index.ts
@@ -145,12 +145,6 @@ function extractCliConfig(config: CliConfig): JsonObject | null {
         ...{ versionMismatch: config.warnings.versionMismatch },
       };
     }
-    if (config.warnings.typescriptMismatch !== undefined) {
-      newConfig.warnings = {
-        ...((newConfig.warnings as JsonObject | null) || {}),
-        ...{ typescriptMismatch: config.warnings.typescriptMismatch },
-      };
-    }
   }
 
   return Object.getOwnPropertyNames(newConfig).length == 0 ? null : newConfig;
diff --git a/tests/angular_devkit/core/json/schema/serializers/schema_benchmark.json b/tests/angular_devkit/core/json/schema/serializers/schema_benchmark.json
index 7418a03fd48b..90f18d86fcd7 100644
--- a/tests/angular_devkit/core/json/schema/serializers/schema_benchmark.json
+++ b/tests/angular_devkit/core/json/schema/serializers/schema_benchmark.json
@@ -586,11 +586,6 @@
           "description": "Show a warning when the global version is newer than the local one.",
           "type": "boolean",
           "default": true
-        },
-        "typescriptMismatch": {
-          "description": "Show a warning when the TypeScript version is incompatible",
-          "type": "boolean",
-          "default": true
         }
       }
     }
diff --git a/tests/legacy-cli/e2e/tests/commands/config/config-set.ts b/tests/legacy-cli/e2e/tests/commands/config/config-set.ts
index 436c6dff2865..cabf4c1373a6 100644
--- a/tests/legacy-cli/e2e/tests/commands/config/config-set.ts
+++ b/tests/legacy-cli/e2e/tests/commands/config/config-set.ts
@@ -1,11 +1,11 @@
-import {ng} from '../../../utils/process';
-import {expectToFail} from '../../../utils/utils';
+import { ng } from '../../../utils/process';
+import { expectToFail } from '../../../utils/utils';
 
 export default function() {
   return Promise.resolve()
     .then(() => expectToFail(() => ng('config', 'cli.warnings.zzzz')))
-    .then(() => ng('config', 'cli.warnings.typescriptMismatch' , 'false'))
-    .then(() => ng('config', 'cli.warnings.typescriptMismatch'))
+    .then(() => ng('config', 'cli.warnings.versionMismatch' , 'false'))
+    .then(() => ng('config', 'cli.warnings.versionMismatch'))
     .then(({ stdout }) => {
       if (!stdout.match(/false/)) {
         throw new Error(`Expected "false", received "${JSON.stringify(stdout)}".`);
diff --git a/tests/legacy-cli/e2e/tests/misc/typescript-warning.ts b/tests/legacy-cli/e2e/tests/misc/typescript-warning.ts
deleted file mode 100644
index 267b9715cfbb..000000000000
--- a/tests/legacy-cli/e2e/tests/misc/typescript-warning.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { ng, silentNpm } from '../../utils/process';
-import { updateJsonFile } from '../../utils/project';
-
-export default async function () {
-  // typescript@3.0.1 is not part of the officially supported range in latest stable.
-  const unsupportedTsVersion = '3.0.1';
-
-  await updateJsonFile('src/tsconfig.app.json', configJson => {
-    // skipLibCheck is required because declerations
-    // emitted in TS 3.1 are not compatable with TS 2.8
-    // Thus it will exit with a non zero error code.
-    configJson.compilerOptions = {
-      ...configJson.compilerOptions,
-      skipLibCheck: true,
-    };
-    configJson.angularCompilerOptions = {
-      ...configJson.angularCompilerOptions,
-      disableTypeScriptVersionCheck: true,
-    };
-  });
-
-  return Promise.resolve()
-    // Warning should show.
-    .then(() => silentNpm('install', `typescript@${unsupportedTsVersion}`, '--no-save'))
-    .then(() => ng('build'))
-    .then((output) => {
-      if (!output.stderr.match('Using this version can result in undefined behaviour')) {
-        throw new Error('Expected to have typescript version mismatch warning in output.');
-      }
-    });
-    /*
-    // Warning should be disabled with global flag.
-    .then(() => ng('config', '--global', 'warnings.typescriptMismatch', 'false'))
-    .then(() => ng('build'))
-    .then((output) => {
-      if (output.stdout.match('Using this version can result in undefined behaviour')) {
-        throw new Error('Expected to not have typescript version mismatch warning in output.');
-      }
-    })
-    .then(() => ng('config', '--global', 'warnings.typescriptMismatch', 'true'))
-    // Warning should be disabled with local flag.
-    .then(() => ng('config', 'warnings.typescriptMismatch', 'false'))
-    .then(() => ng('build'))
-    .then((output) => {
-      if (output.stdout.match('Using this version can result in undefined behaviour')) {
-        throw new Error('Expected to not have typescript version mismatch warning in output.');
-      }
-    })
-    .then(() => ng('config', 'warnings.typescriptMismatch', 'true'))
-    // Cleanup
-    .then(() => silentNpm('install'));
-    */
-}
-

From 1a927aca4d9984647b68633573b71f23ae8943bb Mon Sep 17 00:00:00 2001
From: cipchk <cipchk@qq.com>
Date: Wed, 20 Feb 2019 11:24:20 +0800
Subject: [PATCH 0786/1703] fix(@schematics/angular): fix missing semicolons in
 extensions.json.template

---
 .../workspace/files/__dot__vscode/extensions.json.template      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template b/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template
index 4eb9de447041..a69da09b88fd 100644
--- a/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template
+++ b/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template
@@ -1,6 +1,6 @@
 {
   "recommendations": [
     "angular.ng-template",
-    "ms-vscode.vscode-typescript-tslint-plugin
+    "ms-vscode.vscode-typescript-tslint-plugin"
   ]
 }

From 79aa8d602d92e858e188e75a7e425b728746b29a Mon Sep 17 00:00:00 2001
From: Amadou Sall <ahasall.dev@gmail.com>
Date: Mon, 18 Feb 2019 22:48:01 +0100
Subject: [PATCH 0787/1703] fix(@schematics/angular): undefined is used as
 newProjectRoot when none is set

Fixes #13703
---
 packages/schematics/angular/application/index.ts | 2 +-
 packages/schematics/angular/library/index.ts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 42f3ea3c7e92..2a02c9af23d8 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -326,7 +326,7 @@ export default function (options: ApplicationOptions): Rule {
       };
 
     const workspace = getWorkspace(host);
-    let newProjectRoot = workspace.newProjectRoot;
+    let newProjectRoot = workspace.newProjectRoot || 'projects';
     let appDir = `${newProjectRoot}/${options.name}`;
     let sourceRoot = `${appDir}/src`;
     let sourceDir = `${sourceRoot}/app`;
diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index c8e561dbf773..7f2573bc98a4 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -193,7 +193,7 @@ export default function (options: LibraryOptions): Rule {
     }
 
     const workspace = getWorkspace(host);
-    const newProjectRoot = workspace.newProjectRoot;
+    const newProjectRoot = workspace.newProjectRoot || 'projects';
 
     const scopeFolder = scopeName ? strings.dasherize(scopeName) + '/' : '';
     const folderName = `${scopeFolder}${strings.dasherize(options.name)}`;

From 9bf8b3e65a26f56b3c01230cb2b6bf674f2ac677 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 20 Feb 2019 17:30:28 +0100
Subject: [PATCH 0788/1703] fix(@schematics/angular): `findModuleFromOptions`
 not handling properly different casing in name

At the moment users can have various casing and seperatirs in paths, we should not always dasherize the name when resolving modules.

As for example when providing something like:

```
/module/SubModule/feature
```

It won't be able to resolve the modules properly as `sub-module` does't exist.

This PR also updates the test for underscore as previously it was not properly testing this usercase, since the formatter was used on name and not th path.

Fixes #13714
---
 .../schematics/angular/utility/find-module.ts  |  5 +----
 .../angular/utility/find-module_spec.ts        | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/packages/schematics/angular/utility/find-module.ts b/packages/schematics/angular/utility/find-module.ts
index 4d439a99aebf..7ff53bf7ca14 100644
--- a/packages/schematics/angular/utility/find-module.ts
+++ b/packages/schematics/angular/utility/find-module.ts
@@ -12,7 +12,6 @@ import {
   join,
   normalize,
   relative,
-  strings,
 } from '@angular-devkit/core';
 import { DirEntry, Tree } from '@angular-devkit/schematics';
 
@@ -25,7 +24,6 @@ export interface ModuleOptions {
   skipImport?: boolean;
   moduleExt?: string;
   routingModuleExt?: string;
-  nameFormatter?: (str: string) => string;
 }
 
 const MODULE_EXT = '.module.ts';
@@ -43,8 +41,7 @@ export function findModuleFromOptions(host: Tree, options: ModuleOptions): Path
   const routingModuleExt = options.routingModuleExt || ROUTING_MODULE_EXT;
 
   if (!options.module) {
-    options.nameFormatter = options.nameFormatter || strings.dasherize;
-    const pathToCheck = (options.path || '') + '/' + options.nameFormatter(options.name);
+    const pathToCheck = (options.path || '') + '/' + options.name;
 
     return normalize(findModule(host, pathToCheck, moduleExt, routingModuleExt));
   } else {
diff --git a/packages/schematics/angular/utility/find-module_spec.ts b/packages/schematics/angular/utility/find-module_spec.ts
index 643eda8324de..b47faf1db2e6 100644
--- a/packages/schematics/angular/utility/find-module_spec.ts
+++ b/packages/schematics/angular/utility/find-module_spec.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Path, strings } from '@angular-devkit/core';
+import { Path } from '@angular-devkit/core';
 import { EmptyTree, Tree } from '@angular-devkit/schematics';
 import { ModuleOptions, findModule, findModuleFromOptions } from './find-module';
 
@@ -111,12 +111,20 @@ describe('find-module', () => {
       expect(modPath).toEqual('/projects/my-proj/src/app.module.ts' as Path);
     });
 
-    it('should find a module if nameFormatter is provided', () => {
-      tree.create('/projects/my-proj/src/app_test.module.ts', '');
+    it('should find a module when name has underscore', () => {
+      tree.create('/projects/my-proj/src/feature_module/app_test.module.ts', '');
       options.path = '/projects/my-proj/src';
-      options.nameFormatter = strings.underscore;
+      options.name = 'feature_module/new_component';
       const modPath = findModuleFromOptions(tree, options);
-      expect(modPath).toEqual('/projects/my-proj/src/app_test.module.ts' as Path);
+      expect(modPath).toEqual('/projects/my-proj/src/feature_module/app_test.module.ts' as Path);
+    });
+
+    it('should find a module when name has uppercase', () => {
+      tree.create('/projects/my-proj/src/featureModule/appTest.module.ts', '');
+      options.path = '/projects/my-proj/src';
+      options.name = 'featureModule/newComponent';
+      const modPath = findModuleFromOptions(tree, options);
+      expect(modPath).toEqual('/projects/my-proj/src/featureModule/appTest.module.ts' as Path);
     });
 
     it('should find a module if flat is true', () => {

From 4a5084f3a3d54aff7601c2e0d08caeab41010411 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 21 Feb 2019 06:03:29 +0000
Subject: [PATCH 0789/1703] build: update copy-webpack-plugin to version 5.0.0

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 84 +++++--------------
 2 files changed, 22 insertions(+), 64 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 33d73dd16fac..e1ad778a944b 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -15,7 +15,7 @@
     "autoprefixer": "9.4.8",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
-    "copy-webpack-plugin": "4.6.0",
+    "copy-webpack-plugin": "5.0.0",
     "file-loader": "3.0.1",
     "glob": "7.1.3",
     "istanbul-instrumenter-loader": "3.0.1",
diff --git a/yarn.lock b/yarn.lock
index 29629b2eaf3e..ec1df9963371 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1806,25 +1806,6 @@ bytes@3.0.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
   integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
-cacache@^10.0.4:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
-  integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==
-  dependencies:
-    bluebird "^3.5.1"
-    chownr "^1.0.1"
-    glob "^7.1.2"
-    graceful-fs "^4.1.11"
-    lru-cache "^4.1.1"
-    mississippi "^2.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.2"
-    ssri "^5.2.4"
-    unique-filename "^1.1.0"
-    y18n "^4.0.0"
-
 cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0:
   version "11.2.0"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.2.0.tgz#617bdc0b02844af56310e411c0878941d5739965"
@@ -1845,7 +1826,7 @@ cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0:
     unique-filename "^1.1.0"
     y18n "^4.0.0"
 
-cacache@^11.3.2:
+cacache@^11.3.1, cacache@^11.3.2:
   version "11.3.2"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
   integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==
@@ -2627,19 +2608,21 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-webpack-plugin@4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz#e7f40dd8a68477d405dd1b7a854aae324b158bae"
-  integrity sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==
+copy-webpack-plugin@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.0.tgz#db3269ab83e8a2c3316c1bc9cba54019bbcf5c17"
+  integrity sha512-iiDj+8nnZeW/i8vYJ3+ABSZkOefJnDYIGLojiZKKFDvf1wcEInABXH1+hN7axQMn04qvJxKjgVOee0e14XPtCg==
   dependencies:
-    cacache "^10.0.4"
-    find-cache-dir "^1.0.0"
+    cacache "^11.3.1"
+    find-cache-dir "^2.0.0"
     globby "^7.1.1"
     is-glob "^4.0.0"
     loader-utils "^1.1.0"
     minimatch "^3.0.4"
-    p-limit "^1.0.0"
+    normalize-path "^3.0.0"
+    p-limit "^2.1.0"
     serialize-javascript "^1.4.0"
+    webpack-log "^2.0.0"
 
 core-js@^2.2.0, core-js@^2.4.0, core-js@^2.4.1:
   version "2.5.7"
@@ -3866,15 +3849,6 @@ finalhandler@1.1.1:
     statuses "~1.4.0"
     unpipe "~1.0.0"
 
-find-cache-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
-  integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^1.0.0"
-    pkg-dir "^2.0.0"
-
 find-cache-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d"
@@ -3897,7 +3871,7 @@ find-up@^1.0.0:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
-find-up@^2.0.0, find-up@^2.1.0:
+find-up@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
@@ -6149,7 +6123,7 @@ lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
   integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
 
-lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
+lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
   integrity sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==
@@ -6546,22 +6520,6 @@ minizlib@^1.1.1:
   dependencies:
     minipass "^2.2.1"
 
-mississippi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
-  integrity sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==
-  dependencies:
-    concat-stream "^1.5.0"
-    duplexify "^3.4.2"
-    end-of-stream "^1.1.0"
-    flush-write-stream "^1.0.0"
-    from2 "^2.1.0"
-    parallel-transform "^1.1.0"
-    pump "^2.0.1"
-    pumpify "^1.3.3"
-    stream-each "^1.1.0"
-    through2 "^2.0.0"
-
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -7318,7 +7276,7 @@ p-is-promise@^1.1.0:
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
   integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
 
-p-limit@^1.0.0, p-limit@^1.1.0:
+p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
   integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
@@ -7332,6 +7290,13 @@ p-limit@^2.0.0:
   dependencies:
     p-try "^2.0.0"
 
+p-limit@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.1.0.tgz#1d5a0d20fb12707c758a655f6bbc4386b5930d68"
+  integrity sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==
+  dependencies:
+    p-try "^2.0.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -7703,13 +7668,6 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pkg-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
-  dependencies:
-    find-up "^2.1.0"
-
 pkg-dir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
@@ -7970,7 +7928,7 @@ public-encrypt@^4.0.0:
     randombytes "^2.0.1"
     safe-buffer "^5.1.2"
 
-pump@^2.0.0, pump@^2.0.1:
+pump@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
   integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==

From a5738dbbf5ac307ac9d679bc34ba4d65cfbc81b8 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Thu, 21 Feb 2019 10:27:30 -0800
Subject: [PATCH 0790/1703] release: v8.0.0-beta.2

---
 .monorepo.json                                | 72 +++++++++----------
 .../angular/utility/latest-versions.ts        |  6 +-
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index fc3e14f82f02..6d3eb2415048 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,16 +42,16 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.14.0-beta.1",
-      "hash": "ed6f2ae751fd3db351a20ae55349e8ad"
+      "version": "0.14.0-beta.2",
+      "hash": "6d499b7cc1fecfdca1ee530d68af2743"
     },
     "@_/builders": {
       "version": "0.14.0-beta.1",
       "hash": "569aef8bc23693c344e71b9755e62c50"
     },
     "devkit": {
-      "version": "0.14.0-beta.1",
-      "hash": "5a304dda98fa5ef5cda65c81f10757ae"
+      "version": "0.14.0-beta.2",
+      "hash": "f4155e92618ee6993c6f694116c30bea"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -62,15 +62,15 @@
           "url": "/packages/angular/cli/README.md"
         }
       ],
-      "version": "8.0.0-beta.1",
+      "version": "8.0.0-beta.2",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "47e185bb406b8b1a2791bd93b3881103"
+      "hash": "b03ed9014b1a21a430224d09a75a1529"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.14.0-beta.1",
-      "hash": "44a555d64768f0ed1bc00b87e2b6e7b2",
+      "version": "0.14.0-beta.2",
+      "hash": "3bf43188af6a0db1f2d91181635ebc13",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -81,21 +81,21 @@
           "url": "/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.14.0-beta.1",
-      "hash": "e2f0e9f241ca20b832a104df98208d5a",
+      "version": "0.14.0-beta.2",
+      "hash": "576c3ba30f7079d25574a7ee7cf38e1e",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.14.0-beta.1",
-      "hash": "1d57d845c9724dab1b2199cf1285cc8d",
+      "version": "0.14.0-beta.2",
+      "hash": "946fbd673b1bc1c7e3e295482f63146b",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
       "name": "Benchmark",
       "section": "Tooling",
-      "version": "1.2.0-beta.1",
-      "hash": "5e33515b5f25323b0aa481f0f9eff5be"
+      "version": "1.2.0-beta.2",
+      "hash": "2e9e910a18948b91c75d89401de25d92"
     },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
@@ -105,8 +105,8 @@
           "url": "/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.14.0-beta.1",
-      "hash": "c5c1fbd350c66295c067a22dbf07d9bc",
+      "version": "0.14.0-beta.2",
+      "hash": "ce2f3ab5e27be7cf1a2ddbf4da6ff872",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -117,8 +117,8 @@
           "url": "/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.14.0-beta.1",
-      "hash": "3a5d81adb4814eb343404259921f0c25",
+      "version": "0.14.0-beta.2",
+      "hash": "af2ce927c08dee654f48d2dc9c66eb8c",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -129,8 +129,8 @@
           "url": "/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.14.0-beta.1",
-      "hash": "52feb0fa93e6b81ca398912c6935aced",
+      "version": "0.14.0-beta.2",
+      "hash": "a10e2a0a49a132804b86c66e0aec7ca2",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -141,9 +141,9 @@
           "url": "/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.14.0-beta.1",
+      "version": "0.14.0-beta.2",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "b33b6932f7993c027de4ebbecfaf6e33"
+      "hash": "947b165cf6d3f4a83969d61995b59398"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -153,8 +153,8 @@
           "url": "/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "8.0.0-beta.1",
-      "hash": "91fe1fdcc7d07fe5361706b69ebd16a4",
+      "version": "8.0.0-beta.2",
+      "hash": "2605c9237089b5a435e22d40e17a6446",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -165,43 +165,43 @@
           "url": "/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "8.0.0-beta.1",
-      "hash": "9d009b19ea6c5c18429ff795aad2ed80",
+      "version": "8.0.0-beta.2",
+      "hash": "6d3ccb48e590f72d9938986b305f5917",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.14.0-beta.1",
-      "hash": "3d260a0e40c45524a94b700bb0c27993",
+      "version": "0.14.0-beta.2",
+      "hash": "077df71a7393d41fa7a8c682653df480",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "8.0.0-beta.1",
+      "version": "8.0.0-beta.2",
       "section": "Misc",
-      "hash": "782867392b4160cc8c8c12ec36b707e9",
+      "hash": "c043695955614e9b16a54c1898ddc814",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "8.0.0-beta.1",
-      "hash": "8edc94fa4b93dcb2025c880740066c83",
+      "version": "8.0.0-beta.2",
+      "hash": "d2796741df237d275312d72f83a9e15d",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.14.0-beta.1",
+      "version": "0.14.0-beta.2",
       "section": "Schematics",
-      "hash": "255662ab7cae61de381fc12a94245c25",
+      "hash": "e58845b72332ba96f1ea569b44fcf96b",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.14.0-beta.1",
+      "version": "0.14.0-beta.2",
       "section": "Schematics",
-      "hash": "de121f11cd0e825d53c4ec3c3569cd33",
+      "hash": "578aa7c163808ccc04c8138723d7b118",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 2e8ebd5c73c2..f245ddfc71c7 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -8,12 +8,12 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~8.0.0-beta.0',
+  Angular: '~8.0.0-beta.5',
   RxJs: '~6.4.0',
   ZoneJs: '~0.8.26',
   TypeScript: '~3.2.2',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.14.0-beta.0',
-  DevkitBuildNgPackagr: '~0.14.0-beta.0',
+  DevkitBuildAngular: '~0.14.0-beta.2',
+  DevkitBuildNgPackagr: '~0.14.0-beta.2',
 };

From ac77a5e9abe2246c393a36d38514aad8a186172b Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Thu, 21 Feb 2019 13:20:02 -0800
Subject: [PATCH 0791/1703] fix(@schematics/angular): JsonUtils should respect
 indent

This commit fixes a few issues with json-utils:

1. The implementation is lacking tests
2. The implementation hardcodes indent = 2 in many places and
   does not respect the `indent` parameter passed by users
3. The implementation is buggy when passed an empty object or array
---
 .../schematics/angular/utility/json-utils.ts  |  43 +++--
 .../angular/utility/json-utils_spec.ts        | 182 +++++++++++++-----
 2 files changed, 155 insertions(+), 70 deletions(-)

diff --git a/packages/schematics/angular/utility/json-utils.ts b/packages/schematics/angular/utility/json-utils.ts
index 6a509ca7cd4c..c42171214788 100644
--- a/packages/schematics/angular/utility/json-utils.ts
+++ b/packages/schematics/angular/utility/json-utils.ts
@@ -22,18 +22,22 @@ export function appendPropertyInAstObject(
   indent: number,
 ) {
   const indentStr = _buildIndent(indent);
-
+  let index = node.start.offset + 1;
   if (node.properties.length > 0) {
     // Insert comma.
     const last = node.properties[node.properties.length - 1];
-    recorder.insertRight(last.start.offset + last.text.replace(/\s+$/, '').length, ',');
+    const {text, end} = last;
+    const commaIndex = text.endsWith('\n') ? end.offset - 1 : end.offset;
+    recorder.insertRight(commaIndex, ',');
+    index = end.offset;
   }
-
-  recorder.insertLeft(
-    node.end.offset - 1,
-    '  '
-    + `"${propertyName}": ${JSON.stringify(value, null, 2).replace(/\n/g, indentStr)}`
-    + indentStr.slice(0, -2),
+  const content = JSON.stringify(value, null, indent).replace(/\n/g, indentStr);
+  recorder.insertRight(
+    index,
+    (node.properties.length === 0 && indent ? '\n' : '')
+    + ' '.repeat(indent)
+    + `"${propertyName}":${indent ? ' ' : ''}${content}`
+    + indentStr.slice(0, -indent),
   );
 }
 
@@ -77,15 +81,14 @@ export function insertPropertyInAstObjectInOrder(
   }
 
   const indentStr = _buildIndent(indent);
-
   const insertIndex = insertAfterProp === null
     ? node.start.offset + 1
     : insertAfterProp.end.offset + 1;
-
+  const content = JSON.stringify(value, null, indent).replace(/\n/g, indentStr);
   recorder.insertRight(
     insertIndex,
     indentStr
-    + `"${propertyName}": ${JSON.stringify(value, null, 2).replace(/\n/g, indentStr)}`
+    + `"${propertyName}":${indent ? ' ' : ''}${content}`
     + ',',
   );
 }
@@ -98,18 +101,20 @@ export function appendValueInAstArray(
   indent = 4,
 ) {
   const indentStr = _buildIndent(indent);
-
+  let index = node.start.offset + 1;
   if (node.elements.length > 0) {
     // Insert comma.
     const last = node.elements[node.elements.length - 1];
-    recorder.insertRight(last.start.offset + last.text.replace(/\s+$/, '').length, ',');
+    recorder.insertRight(last.end.offset, ',');
+    index = indent ? last.end.offset + 1 : last.end.offset;
   }
 
-  recorder.insertLeft(
-    node.end.offset - 1,
-    '  '
-    + JSON.stringify(value, null, 2).replace(/\n/g, indentStr)
-    + indentStr.slice(0, -2),
+  recorder.insertRight(
+    index,
+    (node.elements.length === 0 && indent ? '\n' : '')
+    + ' '.repeat(indent)
+    + JSON.stringify(value, null, indent).replace(/\n/g, indentStr)
+    + indentStr.slice(0, -indent),
   );
 }
 
@@ -129,5 +134,5 @@ export function findPropertyInAstObject(
 }
 
 function _buildIndent(count: number): string {
-  return '\n' + new Array(count + 1).join(' ');
+  return count ? '\n' + ' '.repeat(count) : '';
 }
diff --git a/packages/schematics/angular/utility/json-utils_spec.ts b/packages/schematics/angular/utility/json-utils_spec.ts
index 98ab24c1bc90..14cea6c8c06f 100644
--- a/packages/schematics/angular/utility/json-utils_spec.ts
+++ b/packages/schematics/angular/utility/json-utils_spec.ts
@@ -5,77 +5,157 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { parseJsonAst } from '@angular-devkit/core';
-import { HostTree } from '@angular-devkit/schematics';
+import { JsonAstArray, JsonAstObject, JsonValue, parseJsonAst } from '@angular-devkit/core';
+import { HostTree, UpdateRecorder } from '@angular-devkit/schematics';
 import { UnitTestTree } from '@angular-devkit/schematics/testing';
-import { insertPropertyInAstObjectInOrder } from './json-utils';
-
-type Pojso = {
-  [key: string]: string;
-};
+import {
+  appendPropertyInAstObject,
+  appendValueInAstArray,
+  insertPropertyInAstObjectInOrder,
+} from './json-utils';
 
 describe('json-utils', () => {
+  const a = 'a';
+  const b = 'b';
+  const m = 'm';
+  const z = 'z';
   const filePath = '/temp';
   let tree: UnitTestTree;
+
+  function runTest(testFn: Function, obj: JsonValue, indent: number): string {
+    const content = JSON.stringify(obj, null, indent);
+    tree.create(filePath, content);
+    const ast = parseJsonAst(content);
+    const rec = tree.beginUpdate(filePath);
+    testFn(rec, ast);
+    tree.commitUpdate(rec);
+
+    const result = tree.readContent(filePath);
+    // Clean up the tree by deleting the file.
+    tree.delete(filePath);
+
+    return result;
+  }
+
   beforeEach(() => {
     tree = new UnitTestTree(new HostTree());
   });
 
-  describe('insertPropertyInAstObjectInOrder', () => {
-    function runTest(obj: Pojso, prop: string, val: string): Pojso {
-      const content = JSON.stringify(obj, null, 2);
-      tree.create(filePath, content);
-      const ast = parseJsonAst(content);
-      const rec = tree.beginUpdate(filePath);
-      if (ast.kind === 'object') {
-        insertPropertyInAstObjectInOrder(rec, ast, prop, val, 2);
+  describe('appendPropertyInAstObject', () => {
+    it('should insert multiple props with different indentations', () => {
+      const cases: Array<[{}, string, {}, number]> = [
+        // initial | prop | want | indent
+        [{}, z, {z}, 0],
+        [{z}, m, {z, m}, 0],
+        [{m, z}, a, {m, z, a}, 0],
+        [{a, m, z}, b, {a, m, z, b}, 0],
+        [{}, z, {z}, 2],
+        [{z}, m, {z, m}, 2],
+        [{m, z}, a, {m, z, a}, 2],
+        [{a, m, z}, b, {a, m, z, b}, 2],
+        [{}, z, {z}, 4],
+        [{z}, m, {z, m}, 4],
+        [{m, z}, a, {m, z, a}, 4],
+        [{a, m, z}, b, {a, m, z, b}, 4],
+      ];
+      for (const c of cases) {
+        const [initial, prop, want, indent] = c;
+        const got = runTest((rec: UpdateRecorder, ast: JsonAstObject) => {
+          expect(ast.kind).toBe('object');
+          appendPropertyInAstObject(rec, ast, prop, prop, indent);
+        }, initial, indent);
+        expect(got).toBe(JSON.stringify(want, null, indent));
+        expect(JSON.parse(got)).toEqual(want);
       }
-      tree.commitUpdate(rec);
-
-      const result = JSON.parse(tree.readContent(filePath));
-      // Clean up the tree by deleting the file.
-      tree.delete(filePath);
-
-      return result;
-    }
+    });
+  });
 
+  describe('insertPropertyInAstObjectInOrder', () => {
     it('should insert a first prop', () => {
-      const obj = {
-        m: 'm',
-        z: 'z',
-      };
-      const result = runTest(obj, 'a', 'val');
-      expect(Object.keys(result)).toEqual(['a', 'm', 'z']);
+      const indent = 2;
+      const result = runTest((rec: UpdateRecorder, ast: JsonAstObject) => {
+        expect(ast.kind).toBe('object');
+        insertPropertyInAstObjectInOrder(rec, ast, a, a, indent);
+      }, {m, z}, indent);
+      expect(result).toBe(JSON.stringify({a, m, z}, null, indent));
+      expect(JSON.parse(result)).toEqual({a, m, z});
     });
 
     it('should insert a middle prop', () => {
-      const obj = {
-        a: 'a',
-        z: 'z',
-      };
-      const result = runTest(obj, 'm', 'val');
-      expect(Object.keys(result)).toEqual(['a', 'm', 'z']);
+      const indent = 2;
+      const result = runTest((rec: UpdateRecorder, ast: JsonAstObject) => {
+        expect(ast.kind).toBe('object');
+        insertPropertyInAstObjectInOrder(rec, ast, m, m, indent);
+      }, {a, z}, indent);
+      expect(result).toBe(JSON.stringify({a, m, z}, null, indent));
+      expect(JSON.parse(result)).toEqual({a, m, z});
     });
 
     it('should insert a last prop', () => {
-      const obj = {
-        a: 'a',
-        m: 'm',
-      };
-      const result = runTest(obj, 'z', 'val');
-      expect(Object.keys(result)).toEqual(['a', 'm', 'z']);
+      const indent = 2;
+      const result = runTest((rec: UpdateRecorder, ast: JsonAstObject) => {
+        expect(ast.kind).toBe('object');
+        insertPropertyInAstObjectInOrder(rec, ast, z, z, indent);
+      }, {a, m}, indent);
+      expect(result).toBe(JSON.stringify({a, m, z}, null, indent));
+      expect(JSON.parse(result)).toEqual({a, m, z});
+    });
+
+    it('should insert multiple props with different indentations', () => {
+      const cases: Array<[{}, string, {}, number]> = [
+        // initial | prop | want | indent
+        [{}, z, {z}, 0],
+        [{z}, m, {m, z}, 0],
+        [{m, z}, a, {a, m, z}, 0],
+        [{a, m, z}, b, {a, b, m, z}, 0],
+        [{}, z, {z}, 2],
+        [{z}, m, {m, z}, 2],
+        [{m, z}, a, {a, m, z}, 2],
+        [{a, m, z}, b, {a, b, m, z}, 2],
+        [{}, z, {z}, 4],
+        [{z}, m, {m, z}, 4],
+        [{m, z}, a, {a, m, z}, 4],
+        [{a, m, z}, b, {a, b, m, z}, 4],
+      ];
+      for (const c of cases) {
+        const [initial, prop, want, indent] = c;
+        const got = runTest((rec: UpdateRecorder, ast: JsonAstObject) => {
+          expect(ast.kind).toBe('object');
+          insertPropertyInAstObjectInOrder(rec, ast, prop, prop, indent);
+        }, initial, indent);
+        expect(got).toBe(JSON.stringify(want, null, indent));
+        expect(JSON.parse(got)).toEqual(want);
+      }
     });
+  });
 
-    it('should insert multiple props', () => {
-      let obj = {};
-      obj = runTest(obj, 'z', 'val');
-      expect(Object.keys(obj)).toEqual(['z']);
-      obj = runTest(obj, 'm', 'val');
-      expect(Object.keys(obj)).toEqual(['m', 'z']);
-      obj = runTest(obj, 'a', 'val');
-      expect(Object.keys(obj)).toEqual(['a', 'm', 'z']);
-      obj = runTest(obj, 'b', 'val');
-      expect(Object.keys(obj)).toEqual(['a', 'b', 'm', 'z']);
+  describe('appendValueInAstArray', () => {
+    it('should insert multiple props with different indentations', () => {
+      const cases: Array<[string[], string, {}, number]> = [
+        // initial | value | want | indent
+        [[], z, [z], 0],
+        [[z], m, [z, m], 0],
+        [[m, z], a, [m, z, a], 0],
+        [[a, m, z], b, [a, m, z, b], 0],
+        [[], z, [z], 2],
+        [[z], m, [z, m], 2],
+        [[m, z], a, [m, z, a], 2],
+        [[a, m, z], b, [a, m, z, b], 2],
+        [[], z, [z], 4],
+        [[z], m, [z, m], 4],
+        [[m, z], a, [m, z, a], 4],
+        [[a, m, z], b, [a, m, z, b], 4],
+      ];
+      for (const c of cases) {
+        const [initial, value, want, indent] = c;
+        const got = runTest((rec: UpdateRecorder, ast: JsonAstArray) => {
+          expect(ast.kind).toBe('array');
+          appendValueInAstArray(rec, ast, value, indent);
+        }, initial, indent);
+        expect(got).toBe(JSON.stringify(want, null, indent));
+        expect(JSON.parse(got)).toEqual(want);
+      }
     });
   });
+
 });

From b3857b41a47db38524c7f7c43d711a4b6339dd15 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 20 Feb 2019 12:20:17 -0800
Subject: [PATCH 0792/1703] build: add build-schema script to build schemas

---
 scripts/build-schema.ts | 61 +++++++++++++++++++++++++++++++++++++++++
 scripts/build.ts        | 35 ++---------------------
 2 files changed, 63 insertions(+), 33 deletions(-)
 create mode 100644 scripts/build-schema.ts

diff --git a/scripts/build-schema.ts b/scripts/build-schema.ts
new file mode 100644
index 000000000000..dafa6fb5b88c
--- /dev/null
+++ b/scripts/build-schema.ts
@@ -0,0 +1,61 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// tslint:disable:no-implicit-dependencies
+import { logging } from '@angular-devkit/core';
+import * as fs from 'fs';
+import * as glob from 'glob';
+import * as path from 'path';
+
+
+function _mkdirp(p: string) {
+  // Create parent folder if necessary.
+  if (!fs.existsSync(path.dirname(p))) {
+    _mkdirp(path.dirname(p));
+  }
+  if (!fs.existsSync(p)) {
+    fs.mkdirSync(p);
+  }
+}
+
+
+export default async function(
+  argv: { },
+  logger: logging.Logger,
+) {
+  const allJsonFiles = glob.sync('packages/**/*.json', {
+    ignore: [
+      '**/node_modules/**',
+      '**/files/**',
+      '**/*-files/**',
+      '**/package.json',
+    ],
+  });
+
+  const quicktypeRunner = require('../tools/quicktype_runner');
+  logger.info('Generating JSON Schema....');
+
+  for (const fileName of allJsonFiles) {
+    if (fs.existsSync(fileName.replace(/\.json$/, '.ts'))
+      || fs.existsSync(fileName.replace(/\.json$/, '.d.ts'))) {
+      // Skip files that already exist.
+      continue;
+    }
+    const content = fs.readFileSync(fileName, 'utf-8');
+
+    const json = JSON.parse(content);
+    if (!json.$schema) {
+      // Skip non-schema files.
+      continue;
+    }
+    const tsContent = await quicktypeRunner.generate(fileName);
+    const tsPath = path.join(__dirname, '../dist-schema', fileName.replace(/\.json$/, '.ts'));
+
+    _mkdirp(path.dirname(tsPath));
+    fs.writeFileSync(tsPath, tsContent, 'utf-8');
+  }
+}
diff --git a/scripts/build.ts b/scripts/build.ts
index df1c75b23fdd..21008b42dc37 100644
--- a/scripts/build.ts
+++ b/scripts/build.ts
@@ -12,6 +12,7 @@ import * as fs from 'fs';
 import * as glob from 'glob';
 import * as path from 'path';
 import { packages } from '../lib/packages';
+import buildSchema from './build-schema';
 
 const minimatch = require('minimatch');
 const tar = require('tar');
@@ -200,41 +201,8 @@ async function _bazel(logger: logging.Logger) {
   // TODO: undo this when we fully support bazel on windows.
   // logger.info('Bazel build...');
   // _exec('bazel', ['build', '//packages/...'], {}, logger);
-
-  const allJsonFiles = glob.sync('packages/**/*.json', {
-    ignore: [
-      '**/node_modules/**',
-      '**/files/**',
-      '**/*-files/**',
-      '**/package.json',
-    ],
-  });
-
-  const quicktypeRunner = require('../tools/quicktype_runner');
-  logger.info('Generating JSON Schema....');
-
-  for (const fileName of allJsonFiles) {
-    if (fs.existsSync(fileName.replace(/\.json$/, '.ts'))
-        || fs.existsSync(fileName.replace(/\.json$/, '.d.ts'))) {
-      // Skip files that already exist.
-      continue;
-    }
-    const content = fs.readFileSync(fileName, 'utf-8');
-
-    const json = JSON.parse(content);
-    if (!json.$schema) {
-      // Skip non-schema files.
-      continue;
-    }
-    const tsContent = await quicktypeRunner.generate(fileName);
-    const tsPath = path.join(__dirname, '../dist-schema', fileName.replace(/\.json$/, '.ts'));
-
-    _mkdirp(path.dirname(tsPath));
-    fs.writeFileSync(tsPath, tsContent, 'utf-8');
-  }
 }
 
-
 export default async function(
   argv: { local?: boolean, snapshot?: boolean },
   logger: logging.Logger,
@@ -243,6 +211,7 @@ export default async function(
 
   const sortedPackages = _sortPackages();
   await _bazel(logger);
+  await buildSchema({}, logger);
   _build(logger);
 
   logger.info('Moving packages to dist/');

From 13c214a5ce7e713a7cb8f1662d40228e565ca9a0 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 20 Feb 2019 12:20:35 -0800
Subject: [PATCH 0793/1703] build: add timeout argument to test script

---
 scripts/test.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/test.ts b/scripts/test.ts
index 14495c880af9..c759788a8f31 100644
--- a/scripts/test.ts
+++ b/scripts/test.ts
@@ -176,6 +176,10 @@ export default function (args: ParsedArgs, logger: logging.Logger) {
     jasmine.DEFAULT_TIMEOUT_INTERVAL = 150000;
   }
 
+  if (args.timeout && Number.parseInt(args.timeout) > 0) {
+    jasmine.DEFAULT_TIMEOUT_INTERVAL = Number.parseInt(args.timeout);
+  }
+
   // Run the tests.
   const allTests =
     glob.sync(regex)

From 78f5c287d840c1411e2dce028afba3b02c10d868 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 20 Feb 2019 12:29:54 -0800
Subject: [PATCH 0794/1703] refactor(@angular-devkit/build-angular): clean up
 some interfaces and schemas

Remove the manually maintained schema.d.ts from the browser builder, and use
the Schema JSON file to generate it. This had a lot of repercussions around
the whole build-angular code base and the different interfaces that were
manually kept.
---
 .../angular-cli-files/models/build-options.ts |  16 +-
 .../models/webpack-configs/browser.ts         |   4 +-
 .../models/webpack-configs/common.ts          |   6 +-
 .../models/webpack-configs/server.ts          |   6 +-
 .../models/webpack-configs/test.ts            |   4 +-
 .../models/webpack-configs/utils.ts           |   4 +-
 .../build_angular/src/app-shell/index.ts      |   2 +-
 .../build_angular/src/browser/index.ts        |  14 +-
 .../build_angular/src/browser/schema.d.ts     | 447 ------------------
 .../build_angular/src/browser/schema.json     |   4 +-
 .../build_angular/src/dev-server/index.ts     |  71 ++-
 .../build_angular/src/dev-server/schema.json  |   3 +-
 .../build_angular/src/extract-i18n/index.ts   |   3 +-
 .../angular_devkit/build_angular/src/index.ts |   2 -
 .../build_angular/src/karma/index.ts          |  10 +-
 .../build_angular/src/karma/schema.d.ts       |  24 +-
 .../build_angular/src/protractor/index.ts     |   2 +-
 .../build_angular/src/server/index.ts         |   8 +-
 .../build_angular/src/utils/index.ts          |   2 +
 .../src/utils/normalize-asset-patterns.ts     |   4 +-
 .../src/utils/normalize-builder-schema.ts     | 106 ++---
 .../src/utils/normalize-file-replacements.ts  |  21 +-
 .../src/utils/normalize-karma-schema.ts       |  52 ++
 .../src/utils/normalize-optimization.ts       |  17 +-
 .../src/utils/normalize-source-maps.ts        |  12 +-
 .../utils/normalize-webpack-server-schema.ts  |  51 ++
 .../test/browser/lazy-module_spec_large.ts    |   2 +-
 .../browser/optimization-level_spec_large.ts  |   2 +-
 .../test/browser/source-map_spec_large.ts     |   2 +-
 .../browser/vendor-source-map_spec_large.ts   |   2 +-
 .../test/dev-server/deploy-url_spec_large.ts  |   2 +-
 .../test/dev-server/proxy_spec_large.ts       |   2 +-
 .../test/dev-server/public-host_spec_large.ts |   2 +-
 .../test/dev-server/serve-path_spec_large.ts  |   2 +-
 .../test/dev-server/ssl_spec_large.ts         |   2 +-
 .../test/dev-server/works_spec_large.ts       |   2 +-
 .../test/karma/code-coverage_spec_large.ts    |   2 +-
 .../build_webpack/src/webpack/index.ts        |   2 +-
 .../build_webpack/src/webpack/schema.d.ts     |  13 -
 .../build_webpack/src/webpack/schema.json     |   6 +-
 40 files changed, 269 insertions(+), 669 deletions(-)
 delete mode 100644 packages/angular_devkit/build_angular/src/browser/schema.d.ts
 create mode 100644 packages/angular_devkit/build_angular/src/utils/normalize-karma-schema.ts
 create mode 100644 packages/angular_devkit/build_angular/src/utils/normalize-webpack-server-schema.ts
 delete mode 100644 packages/angular_devkit/build_webpack/src/webpack/schema.d.ts

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
index 7ebeb40582b3..2397878332ac 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
@@ -11,21 +11,21 @@
 import { logging } from '@angular-devkit/core';
 import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
 import {
-  AssetPatternObject,
+  AssetPatternClass,
   Budget,
-  CurrentFileReplacement,
   ExtraEntryPoint,
-  NormalizedOptimization,
-  NormalizedSourceMaps,
+  OptimizationClass,
+  SourceMapClass,
 } from '../../browser/schema';
+import { NormalizedFileReplacement } from '../../utils/normalize-file-replacements';
 
 export interface BuildOptions {
-  optimization: NormalizedOptimization;
+  optimization: OptimizationClass;
   environment?: string;
   outputPath: string;
   resourcesOutputPath?: string;
   aot?: boolean;
-  sourceMap: NormalizedSourceMaps;
+  sourceMap: SourceMapClass;
   /** @deprecated use sourceMap instead */
   vendorSourceMap?: boolean;
   /** @deprecated  */
@@ -64,13 +64,13 @@ export interface BuildOptions {
   index: string;
   polyfills?: string;
   budgets: Budget[];
-  assets: AssetPatternObject[];
+  assets: AssetPatternClass[];
   scripts: ExtraEntryPoint[];
   styles: ExtraEntryPoint[];
   stylePreprocessorOptions?: { includePaths: string[] };
   lazyModules: string[];
   platform?: 'browser' | 'server';
-  fileReplacements: CurrentFileReplacement[];
+  fileReplacements: NormalizedFileReplacement[];
     /** @deprecated use only for compatibility in 8.x; will be removed in 9.0 */
   rebaseRootRelativeCssUrls?: boolean;
 }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
index 8bfc0679ef51..7930a438c08f 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
@@ -67,8 +67,8 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
 
   if (!isEval && (scriptsSourceMap || stylesSourceMap)) {
     extraPlugins.push(getSourceMapDevTool(
-      scriptsSourceMap,
-      stylesSourceMap,
+      !!scriptsSourceMap,
+      !!stylesSourceMap,
       hiddenSourceMap,
     ));
   }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 53db8b5761cf..59d5c3152f60 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -9,7 +9,7 @@ import { tags } from '@angular-devkit/core';
 import * as CopyWebpackPlugin from 'copy-webpack-plugin';
 import * as path from 'path';
 import { HashedModuleIdsPlugin, debug } from 'webpack';
-import { AssetPatternObject } from '../../../browser/schema';
+import { AssetPatternClass } from '../../../browser/schema';
 import { BundleBudgetPlugin } from '../../plugins/bundle-budget';
 import { CleanCssWebpackPlugin } from '../../plugins/cleancss-webpack-plugin';
 import { ScriptsWebpackPlugin } from '../../plugins/scripts-webpack-plugin';
@@ -103,7 +103,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
           prev.push({
             bundleName,
             paths: [resolvedPath],
-            lazy: curr.lazy,
+            lazy: curr.lazy || false,
           });
         }
 
@@ -129,7 +129,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
 
   // process asset entries
   if (buildOptions.assets) {
-    const copyWebpackPluginPatterns = buildOptions.assets.map((asset: AssetPatternObject) => {
+    const copyWebpackPluginPatterns = buildOptions.assets.map((asset: AssetPatternClass) => {
 
       // Resolve input paths relative to workspace root and add slash at the end.
       asset.input = path.resolve(root, asset.input).replace(/\\/g, '/');
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts
index 12bf23f720df..b1e323c69aa6 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts
@@ -21,9 +21,9 @@ export function getServerConfig(wco: WebpackConfigOptions) {
     const { scripts, styles, hidden } = wco.buildOptions.sourceMap;
 
     extraPlugins.push(getSourceMapDevTool(
-      scripts,
-      styles,
-      hidden,
+      scripts || false,
+      styles || false,
+      hidden || false,
     ));
   }
 
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts
index a61ada1d7a5e..7e0d9b5a907f 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts
@@ -60,8 +60,8 @@ export function getTestConfig(
     const { styles, scripts } = wco.buildOptions.sourceMap;
 
     extraPlugins.push(getSourceMapDevTool(
-      styles,
-      scripts,
+      styles || false,
+      scripts || false,
       false,
       true,
     ));
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
index 2fe43e7ea98a..27d6a37c60c5 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
@@ -10,7 +10,7 @@
 
 import * as path from 'path';
 import { basename, normalize } from '@angular-devkit/core';
-import { ExtraEntryPoint, ExtraEntryPointObject } from '../../../browser/schema';
+import { ExtraEntryPoint, ExtraEntryPointClass } from '../../../browser/schema';
 import { SourceMapDevToolPlugin } from 'webpack';
 
 export const ngAppResolve = (resolvePath: string): string => {
@@ -36,7 +36,7 @@ export function getOutputHashFormat(option: string, length = 20): HashFormat {
   return hashFormats[option] || hashFormats['none'];
 }
 
-export type NormalizedEntryPoint = ExtraEntryPointObject & { bundleName: string };
+export type NormalizedEntryPoint = ExtraEntryPointClass & { bundleName: string };
 
 export function normalizeExtraEntryPoints(
   extraEntryPoints: ExtraEntryPoint[],
diff --git a/packages/angular_devkit/build_angular/src/app-shell/index.ts b/packages/angular_devkit/build_angular/src/app-shell/index.ts
index 2d1bc1cdef92..406aac361b19 100644
--- a/packages/angular_devkit/build_angular/src/app-shell/index.ts
+++ b/packages/angular_devkit/build_angular/src/app-shell/index.ts
@@ -16,7 +16,7 @@ import { Observable, forkJoin, from, merge, of, throwError } from 'rxjs';
 import { concatMap, map, switchMap } from 'rxjs/operators';
 import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
 import { augmentAppWithServiceWorker } from '../angular-cli-files/utilities/service-worker';
-import { BrowserBuilderSchema } from '../browser/schema';
+import { Schema as BrowserBuilderSchema } from '../browser/schema';
 import { BuildWebpackServerSchema } from '../server/schema';
 import { BuildWebpackAppShellSchema } from './schema';
 
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index d81bd9748147..352b96f14d36 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -15,7 +15,7 @@ import { LoggingCallback, WebpackBuilder } from '@angular-devkit/build-webpack';
 import { Path, getSystemPath, join, normalize, resolve, virtualFs } from '@angular-devkit/core';
 import * as fs from 'fs';
 import { Observable, concat, of, throwError } from 'rxjs';
-import { concatMap, last, tap } from 'rxjs/operators';
+import { concatMap, last } from 'rxjs/operators';
 import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
 import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
 import {
@@ -34,8 +34,8 @@ import {
   statsToString,
   statsWarningsToString,
 } from '../angular-cli-files/utilities/stats';
-import { defaultProgress, normalizeBuilderSchema } from '../utils';
-import { BrowserBuilderSchema, NormalizedBrowserBuilderSchema } from './schema';
+import { NormalizedBrowserBuilderSchema, defaultProgress, normalizeBrowserSchema } from '../utils';
+import { Schema as BrowserBuilderSchema } from './schema';
 const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');
 const webpackMerge = require('webpack-merge');
 
@@ -58,10 +58,12 @@ export class BrowserBuilder implements Builder<BrowserBuilderSchema> {
     const webpackBuilder = this.createWebpackBuilder({ ...this.context, host });
     const getLoggingCb = this.createLoggingFactory();
 
-    const options = normalizeBuilderSchema(
+    const options = normalizeBrowserSchema(
       host,
       root,
-      builderConfig,
+      resolve(root, builderConfig.root),
+      builderConfig.sourceRoot,
+      builderConfig.options,
     );
 
     return of(null).pipe(
@@ -76,7 +78,7 @@ export class BrowserBuilder implements Builder<BrowserBuilderSchema> {
           return throwError(e);
         }
 
-        return webpackBuilder.runWebpack(webpackConfig, getLoggingCb(options.verbose));
+        return webpackBuilder.runWebpack(webpackConfig, getLoggingCb(options.verbose || false));
       }),
       concatMap(buildEvent => {
         if (buildEvent.success && !options.watch && options.serviceWorker) {
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.d.ts b/packages/angular_devkit/build_angular/src/browser/schema.d.ts
deleted file mode 100644
index fa6b6a25eba9..000000000000
--- a/packages/angular_devkit/build_angular/src/browser/schema.d.ts
+++ /dev/null
@@ -1,447 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export interface BrowserBuilderSchema {
-  /**
-   * List of static application assets.
-   */
-  assets: AssetPattern[];
-
-  /**
-   * The name of the main entry-point file.
-   */
-  main: string;
-
-  /**
-   * The name of the polyfills file.
-   */
-  polyfills?: string;
-
-  /**
-   * The name of the TypeScript configuration file.
-   */
-  tsConfig: string;
-
-  /**
-   * Global scripts to be included in the build.
-   */
-  scripts: ExtraEntryPoint[];
-
-  /**
-   * Global styles to be included in the build.
-   */
-  styles: ExtraEntryPoint[];
-
-  /**
-   * Options to pass to style preprocessors.
-   */
-  stylePreprocessorOptions?: StylePreprocessorOptions;
-
-  /**
-   * Enables optimization of the build output.
-   */
-  optimization: OptimizationOptions;
-
-  /**
-   * Replace files with other files in the build.
-   */
-  fileReplacements: FileReplacement[];
-
-  /**
-   * Path where output will be placed.
-   */
-  outputPath: string;
-
-  /**
-   * Path where style resources will be placed (Relative to outputPath).
-   */
-  resourcesOutputPath: string;
-
-  /**
-   * Build using Ahead of Time compilation.
-   */
-  aot: boolean;
-
-  /**
-   * Output sourcemaps.
-   */
-  sourceMap: SourceMapOptions;
-
-  /**
-   * Resolve vendor packages sourcemaps.
-   * @deprecated - use `sourceMap.vendor` instead
-   */
-  vendorSourceMap?: boolean;
-
-  /**
-    @deprecated
-   * Output in-file eval sourcemaps.
-   */
-  evalSourceMap: boolean;
-
-  /**
-   * Use a separate bundle containing only vendor libraries.
-   */
-  vendorChunk: boolean;
-
-  /**
-   * Use a separate bundle containing code used across multiple bundles.
-   */
-  commonChunk: boolean;
-
-  /**
-   * Base url for the application being built.
-   */
-  baseHref?: string;
-
-  /**
-   * URL where files will be deployed.
-   */
-  deployUrl?: string;
-
-  /**
-   * Adds more details to output logging.
-   */
-  verbose: boolean;
-
-  /**
-   * Log progress to the console while building.
-   */
-  progress?: boolean;
-
-  /**
-   * Localization file to use for i18n.
-   */
-  i18nFile?: string;
-
-  /**
-   * Format of the localization file specified with --i18n-file.
-   */
-  i18nFormat?: string;
-
-  /**
-   * Locale to use for i18n.
-   */
-  i18nLocale?: string;
-
-  /**
-   * How to handle missing translations for i18n.
-   */
-  i18nMissingTranslation?: string;
-
-  /**
-   * Extract css from global styles onto css files instead of js ones.
-   */
-  extractCss: boolean;
-
-  /**
-   * Run build when files change.
-   */
-  watch: boolean;
-
-  /**
-   * Define the output filename cache-busting hashing mode.
-   */
-  outputHashing: OutputHashing;
-
-  /**
-   * Enable and define the file watching poll time period in milliseconds.
-   */
-  poll?: number;
-
-  /**
-   * Delete the output path before building.
-   */
-  deleteOutputPath: boolean;
-
-  /**
-   * Do not use the real path when resolving modules.
-   */
-  preserveSymlinks: boolean;
-
-  /**
-   * Extract all licenses in a separate file, in the case of production builds only.
-   */
-  extractLicenses: boolean;
-
-  /**
-   * Show circular dependency warnings on builds.
-   */
-  showCircularDependencies: boolean;
-
-  /**
-   * Enables @angular-devkit/build-optimizer optimizations when using the 'aot' option.
-   */
-  buildOptimizer: boolean;
-
-  /**
-   * Use file name for lazy loaded chunks.
-   */
-  namedChunks: boolean;
-
-  /**
-   * Enables the use of subresource integrity validation.
-   */
-  subresourceIntegrity: boolean;
-
-  /**
-   * Generates a service worker config for production builds.
-   */
-  serviceWorker: boolean;
-
-  /**
-   * Path to ngsw-config.json.
-   */
-  ngswConfigPath?: string;
-
-  /**
-   * @deprecated
-   * Flag to prevent building an app shell.
-   */
-  skipAppShell: boolean;
-
-  /**
-   * The name of the index HTML file.
-   */
-  index: string;
-
-  /**
-   * Generates a 'stats.json' file which can be analyzed using tools
-   * such as: #webpack-bundle-analyzer' or https://webpack.github.io/analyse.
-   */
-  statsJson: boolean;
-
-  /**
-   * Run the TypeScript type checker in a forked process.
-   */
-  forkTypeChecker: boolean;
-
-  /**
-   * List of additional NgModule files that will be lazy loaded.
-   * Lazy router modules with be discovered automatically.
-   */
-  lazyModules: string[];
-
-  /**
-   * Budget thresholds to ensure parts of your application stay within boundaries which you set.
-   */
-  budgets: Budget[];
-
-  /**
-   * Output profile events for Chrome profiler.
-   */
-  profile: boolean;
-
-  /**
-   * Enables conditionally loaded IE9-11 polyfills.
-   */
-  es5BrowserSupport: boolean;
-
-  /**
-   * @deprecated
-   * Change root relative URLs in stylesheets to include base HREF and deploy URL.
-   * Use only for compatibility and transition.
-   * The behavior of this option is non-standard and will be removed in the next major release.
-   */
-  rebaseRootRelativeCssUrls: boolean;
-}
-
-export type OptimizationOptions = boolean | OptimizationObject;
-
-export interface OptimizationObject {
-  /** Enables optimization of the scripts output. */
-  scripts?: boolean;
-  /** Enables optimization of the styles output. */
-  styles?: boolean;
-}
-
-export type SourceMapOptions = boolean | SourceMapObject;
-
-export interface SourceMapObject {
-  /** Output sourcemaps used for error reports. */
-  hidden?: boolean;
-  /** Resolve vendor packages sourcemaps */
-  vendor?: boolean;
-  /** Output sourcemaps for all scripts */
-  scripts?: boolean;
-  /** Output sourcemaps for all styles. */
-  styles?: boolean;
-}
-
-export type AssetPattern = string | AssetPatternObject;
-
-export interface AssetPatternObject {
-  /**
-   * The pattern to match.
-   */
-  glob: string;
-
-  /**
-   * The input path dir in which to apply 'glob'. Defaults to the project root.
-   */
-  input: string;
-
-  /**
-   * 	An array of globs to ignore.
-   */
-  ignore?: string[];
-
-  /**
-   * Absolute path within the output.
-   */
-  output: string;
-}
-
-export type ExtraEntryPoint = string | ExtraEntryPointObject;
-
-export interface ExtraEntryPointObject {
-  /**
-   * The file to include.
-   */
-  input: string;
-
-  /**
-   * The bundle name for this extra entry point.
-   */
-  bundleName?: string;
-
-  /**
-   * If the bundle will be lazy loaded.
-   */
-  lazy: boolean;
-}
-
-export declare type FileReplacement = DeprecatedFileReplacment | CurrentFileReplacement;
-
-export interface DeprecatedFileReplacment {
-  /**
-   * The file that should be replaced.
-   */
-  src: string;
-
-  /**
-   * The file that should replace.
-   */
-  replaceWith: string;
-}
-
-export interface CurrentFileReplacement {
-  /**
-   * The file that should be replaced.
-   */
-  replace: string;
-
-  /**
-   * The file that should replace.
-   */
-  with: string;
-}
-
-/**
- * Define the output filename cache-busting hashing mode.
- */
-export enum OutputHashing {
-  All = 'all',
-  Bundles = 'bundles',
-  Media = 'media',
-  None = 'none',
-}
-
-/**
- * Options to pass to style preprocessors
- */
-export interface StylePreprocessorOptions {
-  /**
-   * Paths to include. Paths will be resolved to project root.
-   */
-  includePaths: string[];
-}
-
-export interface Budget {
-  /**
-   * The type of budget.
-   */
-  type: BudgetType;
-
-  /**
-   * The name of the bundle.
-   */
-  name: string;
-
-  /**
-   * The baseline size for comparison.
-   */
-  baseline: string;
-
-  /**
-   * The maximum threshold for warning relative to the baseline.
-   */
-  maximumWarning: string;
-
-  /**
-   * The maximum threshold for error relative to the baseline.
-   */
-  maximumError: string;
-
-  /**
-   * The minimum threshold for warning relative to the baseline.
-   */
-  minimumWarning: string;
-
-  /**
-   * The minimum threshold for error relative to the baseline.
-   */
-  minimumError: string;
-
-  /**
-   * The threshold for warning relative to the baseline (min & max).
-   */
-  warning: string;
-
-  /**
-   * The threshold for error relative to the baseline (min & max).
-   */
-  error: string;
-}
-
-export enum BudgetType {
-  Initial = 'initial',
-  All = 'all',
-  Any = 'any',
-  AllScript = 'allScript',
-  AnyScript = 'anyScript',
-  Bundle = 'bundle',
-}
-
-// TODO: figure out a better way to normalize assets, extra entry points, file replacements,
-// and whatever else needs to be normalized, while keeping type safety.
-// Right now this normalization has to be done in all other builders that make use of the
-// BrowserBuildSchema and BrowserBuilder.buildWebpackConfig.
-// It would really help if it happens during architect.validateBuilderOptions, or similar.
-export interface NormalizedOptimization {
-  scripts: boolean;
-  styles: boolean;
-}
-
-export interface NormalizedSourceMaps {
-  scripts: boolean;
-  styles: boolean;
-  hidden: boolean;
-  vendor: boolean;
-}
-
-export interface NormalizedBrowserBuilderSchema extends
-  Pick<
-  BrowserBuilderSchema,
-  Exclude<keyof BrowserBuilderSchema, 'sourceMap' | 'vendorSourceMap' | 'optimization'>
-  > {
-  sourceMap: NormalizedSourceMaps;
-  assets: AssetPatternObject[];
-  fileReplacements: CurrentFileReplacement[];
-  optimization: NormalizedOptimization;
-}
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index 3c870cd628d9..836eabdf95ef 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -1,6 +1,8 @@
 {
+  "$schema": "http://json-schema.org/schema",
   "title": "Webpack browser schema for Build Facade.",
   "description": "Browser target options",
+  "type": "object",
   "properties": {
     "assets": {
       "type": "array",
@@ -477,4 +479,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index 2948042a1bd9..43ee0e78cd47 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -23,41 +23,22 @@ import * as webpack from 'webpack';
 import * as WebpackDevServer from 'webpack-dev-server';
 import { checkPort } from '../angular-cli-files/utilities/check-port';
 import { BrowserBuilder, getBrowserLoggingCb } from '../browser';
-import { BrowserBuilderSchema, NormalizedBrowserBuilderSchema } from '../browser/schema';
-import { normalizeBuilderSchema } from '../utils';
+import { Schema as BrowserBuilderSchema } from '../browser/schema';
+import {
+  NormalizedBrowserBuilderSchema,
+  normalizeBrowserSchema,
+} from '../utils';
+import { Schema as DevServerBuilderSchema } from './schema';
 const opn = require('opn');
 
 
-export interface DevServerBuilderOptions extends Pick<BrowserBuilderSchema,
-  'optimization' | 'aot' | 'sourceMap' | 'vendorSourceMap'
-  | 'evalSourceMap' | 'vendorChunk' | 'commonChunk' | 'poll'
-  | 'baseHref' | 'deployUrl' | 'progress' | 'verbose'
-  > {
-  browserTarget: string;
-  port: number;
-  host: string;
-  proxyConfig?: string;
-  ssl: boolean;
-  sslKey?: string;
-  sslCert?: string;
-  open: boolean;
-  liveReload: boolean;
-  publicHost?: string;
-  servePath?: string;
-  disableHostCheck: boolean;
-  hmr: boolean;
-  watch: boolean;
-  hmrWarning: boolean;
-  servePathDefaultWarning: boolean;
-}
-
-type DevServerBuilderOptionsKeys = Extract<keyof DevServerBuilderOptions, string>;
+type DevServerBuilderSchemaKeys = Extract<keyof DevServerBuilderSchema, string>;
 
-export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
+export class DevServerBuilder implements Builder<DevServerBuilderSchema> {
 
   constructor(public context: BuilderContext) { }
 
-  run(builderConfig: BuilderConfiguration<DevServerBuilderOptions>): Observable<BuildEvent> {
+  run(builderConfig: BuilderConfiguration<DevServerBuilderSchema>): Observable<BuildEvent> {
     const options = builderConfig.options;
     const root = this.context.workspace.root;
     const projectRoot = resolve(root, builderConfig.root);
@@ -67,13 +48,15 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
     let first = true;
     let opnAddress: string;
 
-    return from(checkPort(options.port, options.host)).pipe(
+    return from(checkPort(options.port || 4200, options.host || 'localhost')).pipe(
       tap((port) => options.port = port),
       concatMap(() => this._getBrowserOptions(options)),
-      tap(opts => browserOptions = normalizeBuilderSchema(
+      tap(opts => browserOptions = normalizeBrowserSchema(
         host,
         root,
-        opts,
+        resolve(root, builderConfig.root),
+        builderConfig.sourceRoot,
+        opts.options,
       )),
       concatMap(() => {
         const webpackConfig = this.buildWebpackConfig(root, projectRoot, host, browserOptions);
@@ -105,7 +88,9 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
         const serverAddress = url.format({
           protocol: options.ssl ? 'https' : 'http',
           hostname: options.host === '0.0.0.0' ? 'localhost' : options.host,
-          port: options.port.toString(),
+          // Port cannot be undefined here since we have a step that sets it back in options above.
+          // tslint:disable-next-line:no-non-null-assertion
+          port: options.port !.toString(),
         });
 
         // Add live reload config.
@@ -150,7 +135,7 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
         webpackConfig.devServer = webpackDevServerConfig;
 
         return webpackDevServerBuilder.runWebpackDevServer(
-          webpackConfig, undefined, getBrowserLoggingCb(browserOptions.verbose),
+          webpackConfig, undefined, getBrowserLoggingCb(browserOptions.verbose || false),
         );
       }),
       map(buildEvent => {
@@ -172,15 +157,13 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
     browserOptions: NormalizedBrowserBuilderSchema,
   ) {
     const browserBuilder = new BrowserBuilder(this.context);
-    const webpackConfig = browserBuilder.buildWebpackConfig(
-      root, projectRoot, host, browserOptions);
 
-    return webpackConfig;
+    return browserBuilder.buildWebpackConfig(root, projectRoot, host, browserOptions);
   }
 
   private _buildServerConfig(
     root: Path,
-    options: DevServerBuilderOptions,
+    options: DevServerBuilderSchema,
     browserOptions: NormalizedBrowserBuilderSchema,
   ) {
     const systemRoot = getSystemPath(root);
@@ -247,7 +230,7 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
   }
 
   private _addLiveReload(
-    options: DevServerBuilderOptions,
+    options: DevServerBuilderSchema,
     browserOptions: NormalizedBrowserBuilderSchema,
     webpackConfig: any, // tslint:disable-line:no-any
     clientAddress: string,
@@ -294,7 +277,7 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
 
   private _addSslConfig(
     root: string,
-    options: DevServerBuilderOptions,
+    options: DevServerBuilderSchema,
     config: WebpackDevServer.Configuration,
   ) {
     let sslKey: string | undefined = undefined;
@@ -323,7 +306,7 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
 
   private _addProxyConfig(
     root: string,
-    options: DevServerBuilderOptions,
+    options: DevServerBuilderSchema,
     config: WebpackDevServer.Configuration,
   ) {
     let proxyConfig = {};
@@ -338,7 +321,7 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
   }
 
   private _buildServePath(
-    options: DevServerBuilderOptions,
+    options: DevServerBuilderSchema,
     browserOptions: NormalizedBrowserBuilderSchema,
   ) {
     let servePath = options.servePath;
@@ -399,11 +382,11 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
     return `${normalizedBaseHref}${deployUrl || ''}`;
   }
 
-  private _getBrowserOptions(options: DevServerBuilderOptions) {
+  private _getBrowserOptions(options: DevServerBuilderSchema) {
     const architect = this.context.architect;
     const [project, target, configuration] = options.browserTarget.split(':');
 
-    const overridesOptions: DevServerBuilderOptionsKeys[] = [
+    const overridesOptions: DevServerBuilderSchemaKeys[] = [
       'watch',
       'optimization',
       'aot',
@@ -420,7 +403,7 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
     ];
 
     // remove options that are undefined or not to be overrriden
-    const overrides = (Object.keys(options) as DevServerBuilderOptionsKeys[])
+    const overrides = (Object.keys(options) as DevServerBuilderSchemaKeys[])
       .filter(key => options[key] !== undefined && overridesOptions.includes(key))
       .reduce<Partial<BrowserBuilderSchema>>((previous, key) => (
         {
diff --git a/packages/angular_devkit/build_angular/src/dev-server/schema.json b/packages/angular_devkit/build_angular/src/dev-server/schema.json
index 7e61aa80a083..47710322d1e5 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/schema.json
+++ b/packages/angular_devkit/build_angular/src/dev-server/schema.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "http://json-schema.org/schema",
   "title": "Dev Server Target",
   "description": "Dev Server target options for Build Facade.",
   "type": "object",
@@ -186,4 +187,4 @@
   "required": [
     "browserTarget"
   ]
-}
\ No newline at end of file
+}
diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
index 29ed65b8590f..9096e412e92b 100644
--- a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
@@ -27,7 +27,8 @@ import {
 } from '../angular-cli-files/models/webpack-configs';
 import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
 import { statsErrorsToString, statsWarningsToString } from '../angular-cli-files/utilities/stats';
-import { BrowserBuilderSchema, NormalizedBrowserBuilderSchema } from '../browser/schema';
+import { Schema as BrowserBuilderSchema } from '../browser/schema';
+import { NormalizedBrowserBuilderSchema, normalizeBrowserSchema } from '../utils';
 const webpackMerge = require('webpack-merge');
 
 
diff --git a/packages/angular_devkit/build_angular/src/index.ts b/packages/angular_devkit/build_angular/src/index.ts
index ba47eb494b88..909fbed598aa 100644
--- a/packages/angular_devkit/build_angular/src/index.ts
+++ b/packages/angular_devkit/build_angular/src/index.ts
@@ -15,11 +15,9 @@
 
 export * from './app-shell';
 export * from './browser';
-export * from './browser/schema';
 export * from './dev-server';
 export * from './extract-i18n';
 export * from './karma';
-export * from './karma/schema';
 export * from './protractor';
 export * from './server';
 export * from './tslint';
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index fcb2a5881101..1453edb980a5 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -26,8 +26,8 @@ import {
 } from '../angular-cli-files/models/webpack-configs';
 import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
 import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
-import { defaultProgress, normalizeBuilderSchema } from '../utils';
-import { KarmaBuilderSchema, NormalizedKarmaBuilderSchema } from './schema';
+import { NormalizedKarmaBuilderSchema, defaultProgress, normalizeKarmaSchema } from '../utils';
+import { KarmaBuilderSchema } from './schema';
 const webpackMerge = require('webpack-merge');
 
 
@@ -39,10 +39,12 @@ export class KarmaBuilder implements Builder<KarmaBuilderSchema> {
     const projectRoot = resolve(root, builderConfig.root);
     const host = new virtualFs.AliasHost(this.context.host as virtualFs.Host<fs.Stats>);
 
-    const options = normalizeBuilderSchema(
+    const options = normalizeKarmaSchema(
       host,
       root,
-      builderConfig,
+      resolve(root, builderConfig.root),
+      builderConfig.sourceRoot,
+      builderConfig.options,
     );
 
     return of(null).pipe(
diff --git a/packages/angular_devkit/build_angular/src/karma/schema.d.ts b/packages/angular_devkit/build_angular/src/karma/schema.d.ts
index 809a735925b7..2592fcf9ebd7 100644
--- a/packages/angular_devkit/build_angular/src/karma/schema.d.ts
+++ b/packages/angular_devkit/build_angular/src/karma/schema.d.ts
@@ -10,6 +10,7 @@ import {
   BrowserBuilderSchema,
   CurrentFileReplacement,
   NormalizedSourceMaps,
+  SourceMapUnion,
 } from '../browser/schema';
 
 export interface KarmaBuilderSchema extends Pick<BrowserBuilderSchema,
@@ -24,7 +25,7 @@ export interface KarmaBuilderSchema extends Pick<BrowserBuilderSchema,
   /**
    * Output sourcemaps.
    */
-  sourceMap: KarmaSourceMapOptions;
+  sourceMap: SourceMapUnion;
 
   /**
    * Override which browsers tests are run against.
@@ -46,24 +47,3 @@ export interface KarmaBuilderSchema extends Pick<BrowserBuilderSchema,
    */
   reporters?: string[];
 }
-
-export type KarmaSourceMapOptions = boolean | KarmaSourceMapObject;
-
-export interface KarmaSourceMapObject {
-  /** Resolve vendor packages sourcemaps */
-  vendor?: boolean;
-  /** Output sourcemaps for all scripts */
-  scripts?: boolean;
-  /** Output sourcemaps for all styles. */
-  styles?: boolean;
-}
-
-
-export interface NormalizedKarmaBuilderSchema extends Pick<
-  KarmaBuilderSchema,
-  Exclude<keyof KarmaBuilderSchema, 'sourceMap' | 'vendorSourceMap'>
-  > {
-  assets: AssetPatternObject[];
-  fileReplacements: CurrentFileReplacement[];
-  sourceMap: NormalizedSourceMaps;
-}
diff --git a/packages/angular_devkit/build_angular/src/protractor/index.ts b/packages/angular_devkit/build_angular/src/protractor/index.ts
index bf28fcfbf733..40d8cdae6f80 100644
--- a/packages/angular_devkit/build_angular/src/protractor/index.ts
+++ b/packages/angular_devkit/build_angular/src/protractor/index.ts
@@ -19,7 +19,7 @@ import { Observable, from, of } from 'rxjs';
 import { concatMap, map, take, tap } from 'rxjs/operators';
 import * as url from 'url';
 import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
-import { DevServerBuilderOptions } from '../dev-server';
+import { Schema as DevServerBuilderOptions } from '../dev-server/schema';
 import { runModuleAsObservableFork } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/src/server/index.ts b/packages/angular_devkit/build_angular/src/server/index.ts
index 0443c7020c51..f39599b3a252 100644
--- a/packages/angular_devkit/build_angular/src/server/index.ts
+++ b/packages/angular_devkit/build_angular/src/server/index.ts
@@ -30,7 +30,7 @@ import {
 import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
 import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
 import { getBrowserLoggingCb } from '../browser';
-import { defaultProgress, normalizeBuilderSchema } from '../utils';
+import { defaultProgress, normalizeWebpackServerSchema } from '../utils';
 import { BuildWebpackServerSchema, NormalizedServerBuilderServerSchema } from './schema';
 const webpackMerge = require('webpack-merge');
 
@@ -45,10 +45,12 @@ export class ServerBuilder implements Builder<BuildWebpackServerSchema> {
     const host = new virtualFs.AliasHost(this.context.host as virtualFs.Host<Stats>);
     const webpackBuilder = new WebpackBuilder({ ...this.context, host });
 
-    const options = normalizeBuilderSchema(
+    const options = normalizeWebpackServerSchema(
       host,
       root,
-      builderConfig,
+      resolve(root, builderConfig.root),
+      builderConfig.sourceRoot,
+      builderConfig.options,
     );
 
     // TODO: verify using of(null) to kickstart things is a pattern.
diff --git a/packages/angular_devkit/build_angular/src/utils/index.ts b/packages/angular_devkit/build_angular/src/utils/index.ts
index 6271764c6862..466062fe8feb 100644
--- a/packages/angular_devkit/build_angular/src/utils/index.ts
+++ b/packages/angular_devkit/build_angular/src/utils/index.ts
@@ -13,3 +13,5 @@ export * from './normalize-asset-patterns';
 export * from './normalize-source-maps';
 export * from './normalize-optimization';
 export * from './normalize-builder-schema';
+export * from './normalize-karma-schema';
+export * from './normalize-webpack-server-schema';
diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-asset-patterns.ts b/packages/angular_devkit/build_angular/src/utils/normalize-asset-patterns.ts
index 0945b99b8758..528d526fab0e 100644
--- a/packages/angular_devkit/build_angular/src/utils/normalize-asset-patterns.ts
+++ b/packages/angular_devkit/build_angular/src/utils/normalize-asset-patterns.ts
@@ -16,7 +16,7 @@ import {
   resolve,
   virtualFs,
 } from '@angular-devkit/core';
-import { AssetPattern, AssetPatternObject } from '../browser/schema';
+import { AssetPattern, AssetPatternClass } from '../browser/schema';
 
 
 export class MissingAssetSourceRootException extends BaseException {
@@ -31,7 +31,7 @@ export function normalizeAssetPatterns(
   root: Path,
   projectRoot: Path,
   maybeSourceRoot: Path | undefined,
-): AssetPatternObject[] {
+): AssetPatternClass[] {
   // When sourceRoot is not available, we default to ${projectRoot}/src.
   const sourceRoot = maybeSourceRoot || join(projectRoot, 'src');
   const resolvedSourceRoot = resolve(root, sourceRoot);
diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-builder-schema.ts b/packages/angular_devkit/build_angular/src/utils/normalize-builder-schema.ts
index 63dbffd75d80..47e663088ba0 100644
--- a/packages/angular_devkit/build_angular/src/utils/normalize-builder-schema.ts
+++ b/packages/angular_devkit/build_angular/src/utils/normalize-builder-schema.ts
@@ -8,70 +8,62 @@
  */
 
 
-import { BuilderConfiguration } from '@angular-devkit/architect';
-import { Path, resolve, virtualFs } from '@angular-devkit/core';
-import { BrowserBuilderSchema, NormalizedBrowserBuilderSchema } from '../browser/schema';
-import { KarmaBuilderSchema, NormalizedKarmaBuilderSchema } from '../karma/schema';
-import { BuildWebpackServerSchema, NormalizedServerBuilderServerSchema } from '../server/schema';
+import { Path, virtualFs } from '@angular-devkit/core';
+import { BuildOptions } from '../angular-cli-files/models/build-options';
+import {
+  AssetPatternClass,
+  OptimizationClass,
+  Schema as BrowserBuilderSchema,
+  SourceMapClass,
+} from '../browser/schema';
 import { normalizeAssetPatterns } from './normalize-asset-patterns';
-import { normalizeFileReplacements } from './normalize-file-replacements';
+import {
+  NormalizedFileReplacement,
+  normalizeFileReplacements,
+} from './normalize-file-replacements';
 import { normalizeOptimization } from './normalize-optimization';
 import { normalizeSourceMaps } from './normalize-source-maps';
 
-export function normalizeBuilderSchema<BuilderConfigurationT extends
-    BuilderConfiguration<BrowserBuilderSchema | BuildWebpackServerSchema | KarmaBuilderSchema>,
-    OptionsT = BuilderConfigurationT['options']>(
-        host: virtualFs.Host<{}>,
-        root: Path,
-        builderConfig: BuilderConfigurationT,
-):
-    OptionsT extends BrowserBuilderSchema ? NormalizedBrowserBuilderSchema :
-    OptionsT extends BuildWebpackServerSchema ? NormalizedServerBuilderServerSchema :
-    // todo should be unknown
-    // tslint:disable-next-line:no-any
-    OptionsT extends KarmaBuilderSchema ? NormalizedKarmaBuilderSchema : any {
-    const { options } = builderConfig;
-    const projectRoot = resolve(root, builderConfig.root);
-    const syncHost = new virtualFs.SyncDelegateHost(host);
 
-    // todo: this should be unknown
-    // tslint:disable-next-line:no-any
-    const isKarmaBuilderSchema = (options: any): options is KarmaBuilderSchema =>
-        !options.hasOwnProperty('optimization');
-
-    // todo: this should be unknown
-    // tslint:disable-next-line:no-any
-    const isBuildWebpackServerSchema = (options: any): options is BuildWebpackServerSchema =>
-        !options.hasOwnProperty('assets');
+/**
+ * A normalized browser builder schema.
+ */
+export type NormalizedBrowserBuilderSchema = BrowserBuilderSchema & BuildOptions & {
+  sourceMap: SourceMapClass;
+  assets: AssetPatternClass[];
+  fileReplacements: NormalizedFileReplacement[];
+  optimization: OptimizationClass;
+};
 
-    const assets = isBuildWebpackServerSchema(options)
-        ? {}
-        : {
-            assets: normalizeAssetPatterns(
-                options.assets,
-                syncHost,
-                root,
-                projectRoot,
-                builderConfig.sourceRoot,
-            ),
-        };
+export function normalizeBrowserSchema(
+  host: virtualFs.Host<{}>,
+  root: Path,
+  projectRoot: Path,
+  sourceRoot: Path | undefined,
+  options: BrowserBuilderSchema,
+): NormalizedBrowserBuilderSchema {
+  const syncHost = new virtualFs.SyncDelegateHost(host);
 
-    const normalizedSourceMapOptions = normalizeSourceMaps(options.sourceMap);
-    // todo: remove when removing the deprecations
-    normalizedSourceMapOptions.vendor
-        = normalizedSourceMapOptions.vendor || !!options.vendorSourceMap;
+  const normalizedSourceMapOptions = normalizeSourceMaps(options.sourceMap || false);
+  normalizedSourceMapOptions.vendor = normalizedSourceMapOptions.vendor || options.vendorSourceMap;
 
-    const optimization = isKarmaBuilderSchema(options)
-        ? {}
-        : options.optimization || {};
+  return {
+    ...options,
+    assets: normalizeAssetPatterns(options.assets || [], syncHost, root, projectRoot, sourceRoot),
+    fileReplacements: normalizeFileReplacements(options.fileReplacements || [], syncHost, root),
+    optimization: normalizeOptimization(options.optimization),
+    sourceMap: normalizedSourceMapOptions,
 
-    return {
-        // todo remove any casing when using typescript 3.2
-        // tslint:disable-next-line:no-any
-        ...options as any,
-        ...assets,
-        fileReplacements: normalizeFileReplacements(options.fileReplacements, syncHost, root),
-        optimization: normalizeOptimization(optimization),
-        sourceMap: normalizedSourceMapOptions,
-    };
+    statsJson: options.statsJson || false,
+    forkTypeChecker: options.forkTypeChecker || false,
+    budgets: options.budgets || [],
+    scripts: options.scripts || [],
+    styles: options.styles || [],
+    stylePreprocessorOptions: {
+      includePaths: options.stylePreprocessorOptions
+        && options.stylePreprocessorOptions.includePaths
+        || [],
+    },
+    lazyModules: options.lazyModules || [],
+  };
 }
diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-file-replacements.ts b/packages/angular_devkit/build_angular/src/utils/normalize-file-replacements.ts
index 0ac5c0d7828a..d5c3425a4ac2 100644
--- a/packages/angular_devkit/build_angular/src/utils/normalize-file-replacements.ts
+++ b/packages/angular_devkit/build_angular/src/utils/normalize-file-replacements.ts
@@ -14,11 +14,7 @@ import {
   normalize,
   virtualFs,
 } from '@angular-devkit/core';
-import {
-  CurrentFileReplacement,
-  DeprecatedFileReplacment,
-  FileReplacement,
-} from '../browser/schema';
+import { FileReplacement } from '../browser/schema';
 
 
 export class MissingFileReplacementException extends BaseException {
@@ -61,17 +57,16 @@ function normalizeFileReplacement(
   fileReplacement: FileReplacement,
   root?: Path,
 ): NormalizedFileReplacement {
-  const currentFormat = fileReplacement as CurrentFileReplacement;
-  const maybeOldFormat = fileReplacement as DeprecatedFileReplacment;
-
   let replacePath: Path;
   let withPath: Path;
-  if (maybeOldFormat.src && maybeOldFormat.replaceWith) {
-    replacePath = normalize(maybeOldFormat.src);
-    withPath = normalize(maybeOldFormat.replaceWith);
+  if (fileReplacement.src && fileReplacement.replaceWith) {
+    replacePath = normalize(fileReplacement.src);
+    withPath = normalize(fileReplacement.replaceWith);
+  } else if (fileReplacement.replace && fileReplacement.with) {
+    replacePath = normalize(fileReplacement.replace);
+    withPath = normalize(fileReplacement.with);
   } else {
-    replacePath = normalize(currentFormat.replace);
-    withPath = normalize(currentFormat.with);
+    throw new Error(`Invalid file replacement: ${JSON.stringify(fileReplacement)}`);
   }
 
   // TODO: For 7.x should this only happen if not absolute?
diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-karma-schema.ts b/packages/angular_devkit/build_angular/src/utils/normalize-karma-schema.ts
new file mode 100644
index 000000000000..3fc3858daaa2
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/utils/normalize-karma-schema.ts
@@ -0,0 +1,52 @@
+
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+
+import { Path, virtualFs } from '@angular-devkit/core';
+import { AssetPatternClass, OptimizationClass, SourceMapClass } from '../browser/schema';
+import { KarmaBuilderSchema } from '../karma/schema';
+import { normalizeAssetPatterns } from './normalize-asset-patterns';
+import {
+  NormalizedFileReplacement,
+  normalizeFileReplacements,
+} from './normalize-file-replacements';
+import { normalizeOptimization } from './normalize-optimization';
+import { normalizeSourceMaps } from './normalize-source-maps';
+
+/**
+ * A normalized webpack server builder schema.
+ */
+export interface NormalizedKarmaBuilderSchema extends KarmaBuilderSchema {
+  sourceMap: SourceMapClass;
+  fileReplacements: NormalizedFileReplacement[];
+  assets: AssetPatternClass[];
+  optimization: OptimizationClass;
+}
+
+export function normalizeKarmaSchema(
+  host: virtualFs.Host<{}>,
+  root: Path,
+  projectRoot: Path,
+  sourceRoot: Path | undefined,
+  options: KarmaBuilderSchema,
+): NormalizedKarmaBuilderSchema {
+  const syncHost = new virtualFs.SyncDelegateHost(host);
+
+  const normalizedSourceMapOptions = normalizeSourceMaps(options.sourceMap);
+  normalizedSourceMapOptions.vendor =
+    normalizedSourceMapOptions.vendor || options.vendorSourceMap || false;
+
+  return {
+    ...options,
+    fileReplacements: normalizeFileReplacements(options.fileReplacements, syncHost, root),
+    assets: normalizeAssetPatterns(options.assets || [], syncHost, root, projectRoot, sourceRoot),
+    sourceMap: normalizedSourceMapOptions,
+    optimization: normalizeOptimization(undefined),
+  };
+}
diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-optimization.ts b/packages/angular_devkit/build_angular/src/utils/normalize-optimization.ts
index f7f9d58cd576..1ebec9c2a76b 100644
--- a/packages/angular_devkit/build_angular/src/utils/normalize-optimization.ts
+++ b/packages/angular_devkit/build_angular/src/utils/normalize-optimization.ts
@@ -6,18 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {
-  NormalizedOptimization,
-  OptimizationOptions,
-  SourceMapOptions,
-} from '../browser/schema';
-
-export function normalizeOptimization(optimization: OptimizationOptions): NormalizedOptimization {
-  const scripts = !!(typeof optimization === 'object' ? optimization.scripts : optimization);
-  const styles = !!(typeof optimization === 'object' ? optimization.styles : optimization);
+import { OptimizationClass, OptimizationUnion } from '../browser/schema';
 
+export function normalizeOptimization(
+  optimization: OptimizationUnion = false,
+): Required<OptimizationClass> {
   return {
-    scripts,
-    styles,
+    scripts: typeof optimization === 'object' ? !!optimization.scripts : optimization,
+    styles: typeof optimization === 'object' ? !!optimization.styles : optimization,
   };
 }
diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-source-maps.ts b/packages/angular_devkit/build_angular/src/utils/normalize-source-maps.ts
index 1689e7da9997..ca873b59fa95 100644
--- a/packages/angular_devkit/build_angular/src/utils/normalize-source-maps.ts
+++ b/packages/angular_devkit/build_angular/src/utils/normalize-source-maps.ts
@@ -6,13 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { NormalizedSourceMaps, SourceMapOptions } from '../browser/schema';
+import { SourceMapClass, SourceMapUnion } from '../browser/schema';
 
-export function normalizeSourceMaps(sourceMap: SourceMapOptions): NormalizedSourceMaps {
-  const scripts = !!(typeof sourceMap === 'object' ? sourceMap.scripts : sourceMap);
-  const styles = !!(typeof sourceMap === 'object' ? sourceMap.styles : sourceMap);
-  const hidden = typeof sourceMap === 'object' && !!sourceMap.hidden;
-  const vendor = typeof sourceMap === 'object' && !!sourceMap.vendor;
+export function normalizeSourceMaps(sourceMap: SourceMapUnion): SourceMapClass {
+  const scripts = typeof sourceMap === 'object' ? sourceMap.scripts : sourceMap;
+  const styles = typeof sourceMap === 'object' ? sourceMap.styles : sourceMap;
+  const hidden = typeof sourceMap === 'object' && sourceMap.hidden || false;
+  const vendor = typeof sourceMap === 'object' && sourceMap.vendor || false;
 
   return {
     vendor,
diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-webpack-server-schema.ts b/packages/angular_devkit/build_angular/src/utils/normalize-webpack-server-schema.ts
new file mode 100644
index 000000000000..4975f41defaf
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/utils/normalize-webpack-server-schema.ts
@@ -0,0 +1,51 @@
+
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+
+import { Path, virtualFs } from '@angular-devkit/core';
+import { OptimizationClass, SourceMapClass } from '../browser/schema';
+import { BuildWebpackServerSchema } from '../server/schema';
+import {
+  NormalizedFileReplacement,
+  normalizeFileReplacements,
+} from './normalize-file-replacements';
+import { normalizeOptimization } from './normalize-optimization';
+import { normalizeSourceMaps } from './normalize-source-maps';
+
+/**
+ * A normalized webpack server builder schema.
+ */
+export interface NormalizedWebpackServerBuilderSchema extends BuildWebpackServerSchema {
+  sourceMap: SourceMapClass;
+  fileReplacements: NormalizedFileReplacement[];
+  optimization: OptimizationClass;
+}
+
+export function normalizeWebpackServerSchema(
+  host: virtualFs.Host<{}>,
+  root: Path,
+  projectRoot: Path,
+  sourceRoot: Path | undefined,
+  options: BuildWebpackServerSchema,
+): NormalizedWebpackServerBuilderSchema {
+  const syncHost = new virtualFs.SyncDelegateHost(host);
+
+  const normalizedSourceMapOptions = normalizeSourceMaps(options.sourceMap);
+  normalizedSourceMapOptions.vendor =
+    normalizedSourceMapOptions.vendor || options.vendorSourceMap || false;
+
+  const optimization = options.hasOwnProperty('optimization') && options.optimization || {};
+
+  return {
+    ...options,
+    fileReplacements: normalizeFileReplacements(options.fileReplacements, syncHost, root),
+    optimization: normalizeOptimization(optimization),
+    sourceMap: normalizedSourceMapOptions,
+  };
+}
diff --git a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
index 121aaf43f222..7374c212d52d 100644
--- a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
@@ -9,7 +9,7 @@
 import { DefaultTimeout, TestLogger, runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, normalize } from '@angular-devkit/core';
 import { take, tap } from 'rxjs/operators';
-import { BrowserBuilderSchema } from '../../src';
+import { Schema as BrowserBuilderSchema } from '../../src/browser/schema';
 import { browserTargetSpec, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/browser/optimization-level_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/optimization-level_spec_large.ts
index 61d0cfff1ecc..f80a34355f08 100644
--- a/packages/angular_devkit/build_angular/test/browser/optimization-level_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/optimization-level_spec_large.ts
@@ -9,7 +9,7 @@
 import { DefaultTimeout, runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { tap } from 'rxjs/operators';
-import { BrowserBuilderSchema } from '../../src/browser/schema';
+import { Schema as BrowserBuilderSchema } from '../../src/browser/schema';
 import { browserTargetSpec, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/browser/source-map_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/source-map_spec_large.ts
index 64d172c6c921..8ae472f26fa0 100644
--- a/packages/angular_devkit/build_angular/test/browser/source-map_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/source-map_spec_large.ts
@@ -9,7 +9,7 @@
 import { runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { tap } from 'rxjs/operators';
-import { BrowserBuilderSchema, OutputHashing } from '../../src';
+import { OutputHashing, Schema as BrowserBuilderSchema } from '../../src/browser/schema';
 import { browserTargetSpec, host } from '../utils';
 
 // tslint:disable-next-line:no-big-function
diff --git a/packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts
index ac0e57243e40..1b67bf697da5 100644
--- a/packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts
@@ -10,7 +10,7 @@ import { runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import * as path from 'path';
 import { tap } from 'rxjs/operators';
-import { BrowserBuilderSchema } from '../../src/browser/schema';
+import { Schema as BrowserBuilderSchema } from '../../src/browser/schema';
 import { browserTargetSpec, host } from '../utils';
 
 describe('Browser Builder external source map', () => {
diff --git a/packages/angular_devkit/build_angular/test/dev-server/deploy-url_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/deploy-url_spec_large.ts
index 7079aafdacdf..e2137e8af356 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/deploy-url_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/deploy-url_spec_large.ts
@@ -9,7 +9,7 @@
 import { request, runTargetSpec } from '@angular-devkit/architect/testing';
 import { from } from 'rxjs';
 import { concatMap, take, tap } from 'rxjs/operators';
-import { DevServerBuilderOptions } from '../../src';
+import { Schema as DevServerBuilderOptions } from '../../src/dev-server/schema';
 import { devServerTargetSpec, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/dev-server/proxy_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/proxy_spec_large.ts
index 729cddc370f1..e10488be41a0 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/proxy_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/proxy_spec_large.ts
@@ -11,7 +11,7 @@ import * as express from 'express'; // tslint:disable-line:no-implicit-dependenc
 import * as http from 'http';
 import { from } from 'rxjs';
 import { concatMap, take, tap } from 'rxjs/operators';
-import { DevServerBuilderOptions } from '../../src';
+import { Schema as DevServerBuilderOptions } from '../../src/dev-server/schema';
 import { devServerTargetSpec, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/dev-server/public-host_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/public-host_spec_large.ts
index adba0f34b0fe..851258b26e53 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/public-host_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/public-host_spec_large.ts
@@ -9,7 +9,7 @@
 import { request, runTargetSpec } from '@angular-devkit/architect/testing';
 import { from } from 'rxjs';
 import { concatMap, take, tap } from 'rxjs/operators';
-import { DevServerBuilderOptions } from '../../src';
+import { Schema as DevServerBuilderOptions } from '../../src/dev-server/schema';
 import { devServerTargetSpec, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts
index 5a09230bb4fe..6bde940c3c78 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts
@@ -9,7 +9,7 @@
 import { request, runTargetSpec } from '@angular-devkit/architect/testing';
 import { from } from 'rxjs';
 import { concatMap, take, tap } from 'rxjs/operators';
-import { DevServerBuilderOptions } from '../../src';
+import { Schema as DevServerBuilderOptions } from '../../src/dev-server/schema';
 import { devServerTargetSpec, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/dev-server/ssl_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/ssl_spec_large.ts
index 1e876376f87e..26ca8657d1f2 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/ssl_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/ssl_spec_large.ts
@@ -10,7 +10,7 @@ import { request, runTargetSpec } from '@angular-devkit/architect/testing';
 import { tags } from '@angular-devkit/core';
 import { from } from 'rxjs';
 import { concatMap, take, tap } from 'rxjs/operators';
-import { DevServerBuilderOptions } from '../../src';
+import { Schema as DevServerBuilderOptions } from '../../src/dev-server/schema';
 import { devServerTargetSpec, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts
index f6984ed88b3e..9907d35cbfce 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts
@@ -9,7 +9,7 @@
 import { TestLogger, request, runTargetSpec } from '@angular-devkit/architect/testing';
 import { from } from 'rxjs';
 import { concatMap, take, tap } from 'rxjs/operators';
-import { DevServerBuilderOptions } from '../../src';
+import { Schema as DevServerBuilderOptions } from '../../src/dev-server/schema';
 import { devServerTargetSpec, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/karma/code-coverage_spec_large.ts b/packages/angular_devkit/build_angular/test/karma/code-coverage_spec_large.ts
index 8440e1143420..5e30ce28f0d7 100644
--- a/packages/angular_devkit/build_angular/test/karma/code-coverage_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/karma/code-coverage_spec_large.ts
@@ -9,7 +9,7 @@
 import { runTargetSpec } from '@angular-devkit/architect/testing';
 import { normalize, virtualFs } from '@angular-devkit/core';
 import { debounceTime, tap } from 'rxjs/operators';
-import { NormalizedKarmaBuilderSchema } from '../../src';
+import { NormalizedKarmaBuilderSchema } from '../../src/utils';
 import { host, karmaTargetSpec } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_webpack/src/webpack/index.ts b/packages/angular_devkit/build_webpack/src/webpack/index.ts
index 1074ddb4d2f4..6813da3487a4 100644
--- a/packages/angular_devkit/build_webpack/src/webpack/index.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack/index.ts
@@ -15,7 +15,7 @@ import { Path, getSystemPath, logging, normalize, resolve } from '@angular-devki
 import { Observable, from } from 'rxjs';
 import { concatMap } from 'rxjs/operators';
 import * as webpack from 'webpack';
-import { WebpackBuilderSchema } from './schema';
+import { Schema as WebpackBuilderSchema } from './schema';
 
 
 export interface LoggingCallback {
diff --git a/packages/angular_devkit/build_webpack/src/webpack/schema.d.ts b/packages/angular_devkit/build_webpack/src/webpack/schema.d.ts
deleted file mode 100644
index 46839407eea9..000000000000
--- a/packages/angular_devkit/build_webpack/src/webpack/schema.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-export interface WebpackBuilderSchema {
-  /**
-   * The path to the Webpack configuration file.
-   */
-  webpackConfig: string;
-}
diff --git a/packages/angular_devkit/build_webpack/src/webpack/schema.json b/packages/angular_devkit/build_webpack/src/webpack/schema.json
index bd29228a59c3..6c4ba8cc3783 100644
--- a/packages/angular_devkit/build_webpack/src/webpack/schema.json
+++ b/packages/angular_devkit/build_webpack/src/webpack/schema.json
@@ -1,6 +1,8 @@
 {
+  "$schema": "http://json-schema.org/schema",
   "title": "Webpack Builder.",
   "description": "Webpack Builder schema for Architect.",
+  "type": "object",
   "properties": {
     "webpackConfig": {
       "type": "string",
@@ -10,5 +12,5 @@
   "additionalProperties": false,
   "required": [
     "webpackConfig"
-  ] 
-}
\ No newline at end of file
+  ]
+}

From f03c44c841df013194ee3d00840ed6211a881673 Mon Sep 17 00:00:00 2001
From: Rares Matei <r.matei.10@aberdeen.ac.uk>
Date: Thu, 21 Feb 2019 22:45:12 +0000
Subject: [PATCH 0795/1703] fix(@angular-devkit/build-angular): add promise
 polyfill to --es5BrowserSupport provided polyfills

Since Angular uses Promises, we need to provide a polyfill for it to support ES5 only browsers.
---
 .../src/angular-cli-files/models/es2015-polyfills.js             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/es2015-polyfills.js b/packages/angular_devkit/build_angular/src/angular-cli-files/models/es2015-polyfills.js
index 08e69267c5e8..354326535a52 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/es2015-polyfills.js
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/es2015-polyfills.js
@@ -19,3 +19,4 @@ import 'core-js/es6/regexp';
 import 'core-js/es6/map';
 import 'core-js/es6/weak-map';
 import 'core-js/es6/set';
+import 'core-js/es6/promise';
\ No newline at end of file

From becd2f53d5189d401487546c57620877b0b5524c Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Fri, 8 Feb 2019 12:11:14 +0000
Subject: [PATCH 0796/1703] fix(@schematics/angular): use enableIvy as true

Blocked on https://github.com/angular/angular/pull/28616
---
 .../application/files/root/tsconfig.app.json.template       | 2 +-
 tests/legacy-cli/e2e/tests/experimental/ivy.ts              | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/angular/application/files/root/tsconfig.app.json.template b/packages/schematics/angular/application/files/root/tsconfig.app.json.template
index 9a22c6e6ad17..34720be1271d 100644
--- a/packages/schematics/angular/application/files/root/tsconfig.app.json.template
+++ b/packages/schematics/angular/application/files/root/tsconfig.app.json.template
@@ -9,6 +9,6 @@
     "**/*.spec.ts"
   ]<% if (experimentalIvy) { %>,
   "angularCompilerOptions": {
-    "enableIvy": "ngtsc"
+    "enableIvy": true
   }<% } %>
 }
diff --git a/tests/legacy-cli/e2e/tests/experimental/ivy.ts b/tests/legacy-cli/e2e/tests/experimental/ivy.ts
index 794b6c7b6569..c085986a8526 100644
--- a/tests/legacy-cli/e2e/tests/experimental/ivy.ts
+++ b/tests/legacy-cli/e2e/tests/experimental/ivy.ts
@@ -5,11 +5,17 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import { getGlobalVariable } from '../../utils/env';
 import { request } from '../../utils/http';
 import { killAllProcesses } from '../../utils/process';
 import { createProject, ngServe } from '../../utils/project';
 
 export default async function() {
+  const argv = getGlobalVariable('argv');
+  if (!argv['ng-snapshots']) {
+    // Only run this test on 8.x versions of Angular, which are currently only on snapshots.
+    return;
+  }
   try {
     await createProject('ivy-project', '--experimental-ivy');
 

From 61cca4116afd13c77b3a9eccc2ce6b46dae3d4f4 Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Fri, 22 Feb 2019 09:30:37 +0100
Subject: [PATCH 0797/1703] fix(@schematics/angular): remove extra comma in
 component schematic

This was introduced by #13690
---
 .../angular/application/other-files/app.component.ts.template   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/application/other-files/app.component.ts.template b/packages/schematics/angular/application/other-files/app.component.ts.template
index ac8740a208da..f18603ea42a5 100644
--- a/packages/schematics/angular/application/other-files/app.component.ts.template
+++ b/packages/schematics/angular/application/other-files/app.component.ts.template
@@ -28,7 +28,7 @@ import { Component<% if(!!viewEncapsulation) { %>, ViewEncapsulation<% }%> } fro
   `,<% } else { %>
   templateUrl: './app.component.html',<% } if(inlineStyle) { %>
   styles: []<% } else { %>
-  styleUrls: ['./app.component.<%= styleExt %>']<% } %>,<% if(!!viewEncapsulation) { %>,
+  styleUrls: ['./app.component.<%= styleExt %>']<% } %><% if(!!viewEncapsulation) { %>,
   encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } %>
 })
 export class AppComponent {

From 58bc5b8f2a2a285f8e09ec05ef407fe32be3ef05 Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Fri, 22 Feb 2019 17:13:48 +0100
Subject: [PATCH 0798/1703] fix(@schematics/angular): remove ViewEncapsulation
 from root component

---
 .../application/other-files/app.component.ts.template        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/schematics/angular/application/other-files/app.component.ts.template b/packages/schematics/angular/application/other-files/app.component.ts.template
index f18603ea42a5..91aad371b12d 100644
--- a/packages/schematics/angular/application/other-files/app.component.ts.template
+++ b/packages/schematics/angular/application/other-files/app.component.ts.template
@@ -1,4 +1,4 @@
-import { Component<% if(!!viewEncapsulation) { %>, ViewEncapsulation<% }%> } from '@angular/core';
+import { Component } from '@angular/core';
 
 @Component({
   selector: '<%= selector %>',<% if(inlineTemplate) { %>
@@ -28,8 +28,7 @@ import { Component<% if(!!viewEncapsulation) { %>, ViewEncapsulation<% }%> } fro
   `,<% } else { %>
   templateUrl: './app.component.html',<% } if(inlineStyle) { %>
   styles: []<% } else { %>
-  styleUrls: ['./app.component.<%= styleExt %>']<% } %><% if(!!viewEncapsulation) { %>,
-  encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } %>
+  styleUrls: ['./app.component.<%= styleExt %>']<% } %>
 })
 export class AppComponent {
   title = '<%= name %>';

From 86dbf2222549fcf21630ec01f8aa47498925ba3b Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 23 Feb 2019 06:53:45 +0000
Subject: [PATCH 0799/1703] build: update ajv to version 6.9.2

---
 package.json                                       | 2 +-
 packages/angular_devkit/build_angular/package.json | 2 +-
 packages/angular_devkit/core/package.json          | 2 +-
 yarn.lock                                          | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 1c9a03e88c25..63279d8453b9 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
     "@types/webpack-dev-server": "^3.1.0",
     "@types/webpack-sources": "^0.1.5",
     "@yarnpkg/lockfile": "1.1.0",
-    "ajv": "6.9.1",
+    "ajv": "6.9.2",
     "common-tags": "^1.8.0",
     "conventional-changelog": "^1.1.0",
     "conventional-commits-parser": "^3.0.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index e1ad778a944b..13de8bbc4211 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -11,7 +11,7 @@
     "@angular-devkit/build-webpack": "0.0.0",
     "@angular-devkit/core": "0.0.0",
     "@ngtools/webpack": "0.0.0",
-    "ajv": "6.9.1",
+    "ajv": "6.9.2",
     "autoprefixer": "9.4.8",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json
index 1f4f85901082..b28128c87f6f 100644
--- a/packages/angular_devkit/core/package.json
+++ b/packages/angular_devkit/core/package.json
@@ -8,7 +8,7 @@
     "core"
   ],
   "dependencies": {
-    "ajv": "6.9.1",
+    "ajv": "6.9.2",
     "chokidar": "2.1.2",
     "fast-json-stable-stringify": "2.0.0",
     "rxjs": "6.3.3",
diff --git a/yarn.lock b/yarn.lock
index ec1df9963371..1ddf2e752dfd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -871,10 +871,10 @@ ajv-keywords@^3.1.0:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
   integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
 
-ajv@6.9.1:
-  version "6.9.1"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1"
-  integrity sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==
+ajv@6.9.2:
+  version "6.9.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.2.tgz#4927adb83e7f48e5a32b45729744c71ec39c9c7b"
+  integrity sha512-4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"

From ae13974f1d8231c0156ab1818e8d96aa097af6c1 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 26 Feb 2019 12:17:36 +0100
Subject: [PATCH 0800/1703] build: update to rxjs 6.4

---
 package.json                                  |   2 +-
 packages/angular/pwa/package.json             |   2 +-
 .../architect/builders/all-of.ts              |   4 +-
 .../angular_devkit/architect/package.json     |   2 +-
 .../architect/test/package.json               |   2 +-
 .../angular_devkit/architect_cli/package.json |   2 +-
 .../angular_devkit/benchmark/package.json     |   2 +-
 .../angular_devkit/build_angular/package.json |   2 +-
 .../build_angular/src/app-shell/index.ts      |   2 +-
 .../build_angular/src/browser/index.ts        |   2 +-
 .../build_angular/src/karma/index.ts          |   2 +-
 .../build_angular/src/tslint/index.ts         | 117 +++++++++---------
 .../build_ng_packagr/package.json             |   2 +-
 .../angular_devkit/build_webpack/package.json |   2 +-
 packages/angular_devkit/core/node/host.ts     |   4 +-
 packages/angular_devkit/core/package.json     |   2 +-
 .../core/src/json/schema/registry.ts          |   2 +-
 .../core/src/virtual-fs/host/record.ts        |   3 +-
 .../angular_devkit/schematics/package.json    |   2 +-
 .../schematics/src/tree/host-tree.ts          |   6 +-
 .../schematics/src/workflow/base.ts           |   4 +-
 .../schematics_cli/package.json               |   2 +-
 packages/ngtools/webpack/package.json         |   2 +-
 packages/schematics/update/package.json       |   2 +-
 packages/schematics/update/update/npm.ts      |   4 +-
 yarn.lock                                     |   9 +-
 26 files changed, 91 insertions(+), 96 deletions(-)

diff --git a/package.json b/package.json
index 63279d8453b9..5d187386348c 100644
--- a/package.json
+++ b/package.json
@@ -114,7 +114,7 @@
     "pacote": "^9.2.3",
     "pidtree": "^0.3.0",
     "pidusage": "^2.0.17",
-    "rxjs": "~6.3.0",
+    "rxjs": "~6.4.0",
     "semver": "^5.3.0",
     "source-map": "^0.5.6",
     "source-map-support": "^0.5.0",
diff --git a/packages/angular/pwa/package.json b/packages/angular/pwa/package.json
index b195accf5388..4b5b67606567 100644
--- a/packages/angular/pwa/package.json
+++ b/packages/angular/pwa/package.json
@@ -13,6 +13,6 @@
     "@angular-devkit/schematics": "0.0.0",
     "@schematics/angular": "0.0.0",
     "parse5-html-rewriting-stream": "5.1.0",
-    "rxjs": "6.3.3"
+    "rxjs": "6.4.0"
   }
 }
\ No newline at end of file
diff --git a/packages/angular_devkit/architect/builders/all-of.ts b/packages/angular_devkit/architect/builders/all-of.ts
index 491bdd682322..f847e0f0fef6 100644
--- a/packages/angular_devkit/architect/builders/all-of.ts
+++ b/packages/angular_devkit/architect/builders/all-of.ts
@@ -41,8 +41,8 @@ export default createBuilder<json.JsonObject & OperatorSchema>((options, context
 
   return from(allRuns).pipe(
     mergeMap(runPromise => from(runPromise)),
-    mergeMap(([i, run]: [number, BuilderRun]) => run.output.pipe(map(output => [i, output]))),
-    mergeMap<[number, BuilderOutput], BuilderOutput>(([i, output]) => {
+    mergeMap(([i, run]) => run.output.pipe(map(output => [i, output] as [number, BuilderOutput]))),
+    mergeMap(([i, output]) => {
       allResults[i] = output;
       context.reportProgress(n++, allRuns.length);
 
diff --git a/packages/angular_devkit/architect/package.json b/packages/angular_devkit/architect/package.json
index 1a5c8b0c3c93..8e97eebde7e3 100644
--- a/packages/angular_devkit/architect/package.json
+++ b/packages/angular_devkit/architect/package.json
@@ -6,7 +6,7 @@
   "typings": "src/index.d.ts",
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "6.3.3"
+    "rxjs": "6.4.0"
   },
   "builders": "./builders/builders.json"
 }
diff --git a/packages/angular_devkit/architect/test/package.json b/packages/angular_devkit/architect/test/package.json
index 7b99dfd2c75c..b633aa748eea 100644
--- a/packages/angular_devkit/architect/test/package.json
+++ b/packages/angular_devkit/architect/test/package.json
@@ -1,6 +1,6 @@
 {
   "builders": "builders.json",
   "dependencies": {
-    "rxjs": "6.3.3"
+    "rxjs": "6.4.0"
   }
 }
diff --git a/packages/angular_devkit/architect_cli/package.json b/packages/angular_devkit/architect_cli/package.json
index c90812606347..f534db04842e 100644
--- a/packages/angular_devkit/architect_cli/package.json
+++ b/packages/angular_devkit/architect_cli/package.json
@@ -18,7 +18,7 @@
     "ascii-progress": "^1.0.5",
     "minimist": "1.2.0",
     "progress": "^2.0.3",
-    "rxjs": "6.3.3",
+    "rxjs": "6.4.0",
     "symbol-observable": "1.2.0"
   }
 }
diff --git a/packages/angular_devkit/benchmark/package.json b/packages/angular_devkit/benchmark/package.json
index 24fd4941de6b..acb7c7b87453 100644
--- a/packages/angular_devkit/benchmark/package.json
+++ b/packages/angular_devkit/benchmark/package.json
@@ -18,7 +18,7 @@
     "minimist": "1.2.0",
     "pidusage": "2.0.17",
     "pidtree": "0.3.0",
-    "rxjs": "6.3.3",
+    "rxjs": "6.4.0",
     "tree-kill": "^1.2.0"
   }
 }
\ No newline at end of file
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 13de8bbc4211..7b26913dbf02 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -32,7 +32,7 @@
     "postcss-import": "12.0.1",
     "postcss-loader": "3.0.0",
     "raw-loader": "1.0.0",
-    "rxjs": "6.3.3",
+    "rxjs": "6.4.0",
     "sass-loader": "7.1.0",
     "semver": "5.6.0",
     "source-map-support": "0.5.10",
diff --git a/packages/angular_devkit/build_angular/src/app-shell/index.ts b/packages/angular_devkit/build_angular/src/app-shell/index.ts
index 406aac361b19..0b0d9a672950 100644
--- a/packages/angular_devkit/build_angular/src/app-shell/index.ts
+++ b/packages/angular_devkit/build_angular/src/app-shell/index.ts
@@ -163,7 +163,7 @@ export class AppShellBuilder implements Builder<BuildWebpackAppShellSchema> {
         const outputIndexPath = join(root, options.outputIndexPath || browserIndexOutputPath);
 
         // Render to HTML and overwrite the client index file.
-        return from(
+        return from<Promise<BuildEvent>>(
           renderModuleFactory(AppServerModuleNgFactory, {
             document: indexHtml,
             url: options.route,
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 352b96f14d36..28f25ce74665 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -82,7 +82,7 @@ export class BrowserBuilder implements Builder<BrowserBuilderSchema> {
       }),
       concatMap(buildEvent => {
         if (buildEvent.success && !options.watch && options.serviceWorker) {
-          return new Observable(obs => {
+          return new Observable<BuildEvent>(obs => {
             augmentAppWithServiceWorker(
               this.context.host,
               root,
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index 1453edb980a5..0da16a1cc8d7 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -48,7 +48,7 @@ export class KarmaBuilder implements Builder<KarmaBuilderSchema> {
     );
 
     return of(null).pipe(
-      concatMap(() => new Observable(obs => {
+      concatMap(() => new Observable<BuildEvent>(obs => {
         const karma = requireProjectModule(getSystemPath(projectRoot), 'karma');
         const karmaConfig = getSystemPath(resolve(root, normalize(options.karmaConfig)));
 
diff --git a/packages/angular_devkit/build_angular/src/tslint/index.ts b/packages/angular_devkit/build_angular/src/tslint/index.ts
index 9abae70d5733..ed3b92db1310 100644
--- a/packages/angular_devkit/build_angular/src/tslint/index.ts
+++ b/packages/angular_devkit/build_angular/src/tslint/index.ts
@@ -75,76 +75,77 @@ export default class TslintBuilder implements Builder<TslintBuilderOptions> {
       throw new Error('A "project" must be specified to enable type checking.');
     }
 
-    return from(this.loadTslint()).pipe(concatMap(projectTslint => new Observable(obs => {
-      const tslintConfigPath = options.tslintConfig
-        ? path.resolve(systemRoot, options.tslintConfig)
-        : null;
-      const Linter = projectTslint.Linter;
-
-      let result: undefined | tslint.LintResult;
-      if (options.tsConfig) {
-        const tsConfigs = Array.isArray(options.tsConfig) ? options.tsConfig : [options.tsConfig];
-        const allPrograms =
-          tsConfigs.map(tsConfig => Linter.createProgram(path.resolve(systemRoot, tsConfig)));
-
-        for (const program of allPrograms) {
-          const partial
-            = lint(projectTslint, systemRoot, tslintConfigPath, options, program, allPrograms);
-          if (result == undefined) {
-            result = partial;
-          } else {
-            result.failures = result.failures
-              .filter(curr => !partial.failures.some(prev => curr.equals(prev)))
-              .concat(partial.failures);
-
-            // we are not doing much with 'errorCount' and 'warningCount'
-            // apart from checking if they are greater than 0 thus no need to dedupe these.
-            result.errorCount += partial.errorCount;
-            result.warningCount += partial.warningCount;
-
-            if (partial.fixes) {
-              result.fixes = result.fixes ? result.fixes.concat(partial.fixes) : partial.fixes;
+    return from(this.loadTslint())
+      .pipe(concatMap(projectTslint => new Observable<BuildEvent>(obs => {
+        const tslintConfigPath = options.tslintConfig
+          ? path.resolve(systemRoot, options.tslintConfig)
+          : null;
+        const Linter = projectTslint.Linter;
+
+        let result: undefined | tslint.LintResult;
+        if (options.tsConfig) {
+          const tsConfigs = Array.isArray(options.tsConfig) ? options.tsConfig : [options.tsConfig];
+          const allPrograms =
+            tsConfigs.map(tsConfig => Linter.createProgram(path.resolve(systemRoot, tsConfig)));
+
+          for (const program of allPrograms) {
+            const partial
+              = lint(projectTslint, systemRoot, tslintConfigPath, options, program, allPrograms);
+            if (result == undefined) {
+              result = partial;
+            } else {
+              result.failures = result.failures
+                .filter(curr => !partial.failures.some(prev => curr.equals(prev)))
+                .concat(partial.failures);
+
+              // we are not doing much with 'errorCount' and 'warningCount'
+              // apart from checking if they are greater than 0 thus no need to dedupe these.
+              result.errorCount += partial.errorCount;
+              result.warningCount += partial.warningCount;
+
+              if (partial.fixes) {
+                result.fixes = result.fixes ? result.fixes.concat(partial.fixes) : partial.fixes;
+              }
             }
           }
+        } else {
+          result = lint(projectTslint, systemRoot, tslintConfigPath, options);
         }
-      } else {
-        result = lint(projectTslint, systemRoot, tslintConfigPath, options);
-      }
-
-      if (result == undefined) {
-        throw new Error('Invalid lint configuration. Nothing to lint.');
-      }
 
-      if (!options.silent) {
-        const Formatter = projectTslint.findFormatter(options.format);
-        if (!Formatter) {
-          throw new Error(`Invalid lint format "${options.format}".`);
+        if (result == undefined) {
+          throw new Error('Invalid lint configuration. Nothing to lint.');
         }
-        const formatter = new Formatter();
 
-        const output = formatter.format(result.failures, result.fixes);
-        if (output) {
-          this.context.logger.info(output);
+        if (!options.silent) {
+          const Formatter = projectTslint.findFormatter(options.format);
+          if (!Formatter) {
+            throw new Error(`Invalid lint format "${options.format}".`);
+          }
+          const formatter = new Formatter();
+
+          const output = formatter.format(result.failures, result.fixes);
+          if (output) {
+            this.context.logger.info(output);
+          }
         }
-      }
 
-      if (result.warningCount > 0 && printInfo) {
-        this.context.logger.warn('Lint warnings found in the listed files.');
-      }
+        if (result.warningCount > 0 && printInfo) {
+          this.context.logger.warn('Lint warnings found in the listed files.');
+        }
 
-      if (result.errorCount > 0 && printInfo) {
-        this.context.logger.error('Lint errors found in the listed files.');
-      }
+        if (result.errorCount > 0 && printInfo) {
+          this.context.logger.error('Lint errors found in the listed files.');
+        }
 
-      if (result.warningCount === 0 && result.errorCount === 0 && printInfo) {
-        this.context.logger.info('All files pass linting.');
-      }
+        if (result.warningCount === 0 && result.errorCount === 0 && printInfo) {
+          this.context.logger.info('All files pass linting.');
+        }
 
-      const success = options.force || result.errorCount === 0;
-      obs.next({ success });
+        const success = options.force || result.errorCount === 0;
+        obs.next({ success });
 
-      return obs.complete();
-    })));
+        return obs.complete();
+      })));
   }
 }
 
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index d90646b61c9e..c0d31f5b6b39 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@angular-devkit/architect": "0.0.0",
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "6.3.3",
+    "rxjs": "6.4.0",
     "semver": "5.6.0"
   },
   "peerDependencies": {
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index 7b329239a889..f61d3dd5b501 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@angular-devkit/architect": "0.0.0",
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "6.3.3"
+    "rxjs": "6.4.0"
   },
   "peerDependencies": {
     "webpack": "^4.6.0",
diff --git a/packages/angular_devkit/core/node/host.ts b/packages/angular_devkit/core/node/host.ts
index aeec54bffffe..56f355083a6b 100644
--- a/packages/angular_devkit/core/node/host.ts
+++ b/packages/angular_devkit/core/node/host.ts
@@ -128,13 +128,13 @@ export class NodeJsAsyncHost implements virtualFs.Host<fs.Stats> {
             ),
             observableFrom(allDirs).pipe(
               concatMap(p => _callFs(fs.rmdir, getSystemPath(p))),
-              map(() => {}),
             ),
           );
         } else {
           return _callFs(fs.unlink, getSystemPath(path));
         }
       }),
+      map(() => undefined),
     );
   }
 
@@ -268,7 +268,7 @@ export class NodeJsSyncHost implements virtualFs.Host<fs.Stats> {
         // fixed.
         if (isDir) {
           const dirPaths = fs.readdirSync(getSystemPath(path));
-          const rmDirComplete = new Observable((obs) => {
+          const rmDirComplete = new Observable<void>((obs) => {
             try {
               fs.rmdirSync(getSystemPath(path));
               obs.complete();
diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json
index b28128c87f6f..fb90dccca0a0 100644
--- a/packages/angular_devkit/core/package.json
+++ b/packages/angular_devkit/core/package.json
@@ -11,7 +11,7 @@
     "ajv": "6.9.2",
     "chokidar": "2.1.2",
     "fast-json-stable-stringify": "2.0.0",
-    "rxjs": "6.3.3",
+    "rxjs": "6.4.0",
     "source-map": "0.7.3"
   },
   "devDependencies": {
diff --git a/packages/angular_devkit/core/src/json/schema/registry.ts b/packages/angular_devkit/core/src/json/schema/registry.ts
index b04bbc8c7b82..be0fd3124a9a 100644
--- a/packages/angular_devkit/core/src/json/schema/registry.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry.ts
@@ -720,7 +720,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
     // tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
     return (of(data) as any).pipe(
       ...[...smartDefaults.entries()].map(([pointer, schema]) => {
-        return concatMap<T, T>(data => {
+        return concatMap(data => {
           const fragments = JSON.parse(pointer);
           const source = this._sourceMap.get((schema as JsonObject).$source as string);
 
diff --git a/packages/angular_devkit/core/src/virtual-fs/host/record.ts b/packages/angular_devkit/core/src/virtual-fs/host/record.ts
index 9396dbda8a2d..899c445d735e 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/record.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/record.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {
+  EMPTY,
   Observable,
   concat,
   from as observableFrom,
@@ -276,7 +277,7 @@ export class CordHost extends SimpleMemoryHost {
           return throwError(new FileDoesNotExistException(from));
         }
         if (from === to) {
-          return of();
+          return EMPTY;
         }
 
         if (existTo) {
diff --git a/packages/angular_devkit/schematics/package.json b/packages/angular_devkit/schematics/package.json
index be96be5dc296..ba3351542cde 100644
--- a/packages/angular_devkit/schematics/package.json
+++ b/packages/angular_devkit/schematics/package.json
@@ -14,6 +14,6 @@
   ],
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "6.3.3"
+    "rxjs": "6.4.0"
   }
 }
diff --git a/packages/angular_devkit/schematics/src/tree/host-tree.ts b/packages/angular_devkit/schematics/src/tree/host-tree.ts
index ce5a910fca9e..78ebbe550dfd 100644
--- a/packages/angular_devkit/schematics/src/tree/host-tree.ts
+++ b/packages/angular_devkit/schematics/src/tree/host-tree.ts
@@ -16,7 +16,7 @@ import {
   normalize,
   virtualFs,
 } from '@angular-devkit/core';
-import { Observable, of } from 'rxjs';
+import { EMPTY, Observable } from 'rxjs';
 import { concatMap, map, mergeMap } from 'rxjs/operators';
 import {
   ContentHasMutatedException,
@@ -457,13 +457,13 @@ export class FilterHostTree extends HostTree {
             let isFile = false;
             originalBackend.isFile(path).subscribe(val => isFile = val);
             if (!isFile || !filter(path)) {
-              return of();
+              return EMPTY;
             }
 
             let content: ArrayBuffer | null = null;
             originalBackend.read(path).subscribe(val => content = val);
             if (!content) {
-              return of();
+              return EMPTY;
             }
 
             return newBackend.write(path, content as {} as virtualFs.FileBuffer);
diff --git a/packages/angular_devkit/schematics/src/workflow/base.ts b/packages/angular_devkit/schematics/src/workflow/base.ts
index 1101e8b40861..c1926f4a1505 100644
--- a/packages/angular_devkit/schematics/src/workflow/base.ts
+++ b/packages/angular_devkit/schematics/src/workflow/base.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { logging, schema, virtualFs } from '@angular-devkit/core';
-import { Observable, Subject, concat, from, of, throwError } from 'rxjs';
+import { EMPTY, Observable, Subject, concat, from, of, throwError } from 'rxjs';
 import { concatMap, defaultIfEmpty, ignoreElements, last, map, tap } from 'rxjs/operators';
 import { EngineHost, SchematicEngine } from '../engine';
 import { UnsuccessfulWorkflowExecution } from '../exception/exception';
@@ -172,7 +172,7 @@ export abstract class BaseWorkflow implements Workflow {
       }),
       concatMap(() => {
         if (this._dryRun) {
-          return of();
+          return EMPTY;
         }
 
         this._lifeCycle.next({ kind: 'post-tasks-start' });
diff --git a/packages/angular_devkit/schematics_cli/package.json b/packages/angular_devkit/schematics_cli/package.json
index f03f6e437612..077fe92ec409 100644
--- a/packages/angular_devkit/schematics_cli/package.json
+++ b/packages/angular_devkit/schematics_cli/package.json
@@ -19,7 +19,7 @@
     "@schematics/schematics": "0.0.0",
     "inquirer": "6.2.2",
     "minimist": "1.2.0",
-    "rxjs": "6.3.3",
+    "rxjs": "6.4.0",
     "symbol-observable": "1.2.0"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 75fde0b37756..04b8590ba516 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -23,7 +23,7 @@
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
     "enhanced-resolve": "4.1.0",
-    "rxjs": "6.3.3",
+    "rxjs": "6.4.0",
     "tree-kill": "1.2.1",
     "webpack-sources": "1.3.0"
   },
diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index c6152992d937..fe1051f0783f 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -17,6 +17,6 @@
     "pacote": "9.5.0",
     "semver": "5.6.0",
     "semver-intersect": "1.4.0",
-    "rxjs": "6.3.3"
+    "rxjs": "6.4.0"
   }
 }
\ No newline at end of file
diff --git a/packages/schematics/update/update/npm.ts b/packages/schematics/update/update/npm.ts
index 721c97e1f356..ab91f0ad8c5c 100644
--- a/packages/schematics/update/update/npm.ts
+++ b/packages/schematics/update/update/npm.ts
@@ -126,7 +126,7 @@ export function getNpmPackageJson(
     }
   }
 
-  const resultPromise = pacote.packument(
+  const resultPromise: Promise<NpmRepositoryPackageJson> = pacote.packument(
     packageName,
     {
       'full-metadata': true,
@@ -136,7 +136,7 @@ export function getNpmPackageJson(
   );
 
   // TODO: find some way to test this
-  const response = from<NpmRepositoryPackageJson>(resultPromise).pipe(
+  const response = from(resultPromise).pipe(
     shareReplay(),
     catchError(err => {
       logger.warn(err.message || err);
diff --git a/yarn.lock b/yarn.lock
index 1ddf2e752dfd..fecf789196ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8661,14 +8661,7 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs@6.3.3, rxjs@^6.0.0, rxjs@~6.3.0:
-  version "6.3.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
-  integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==
-  dependencies:
-    tslib "^1.9.0"
-
-rxjs@^6.4.0:
+rxjs@^6.0.0, rxjs@6.4.0, rxjs@^6.4.0, rxjs@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
   integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==

From f2827971976f3317086d5981c33cc6cb9247224e Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 25 Feb 2019 11:21:58 +0000
Subject: [PATCH 0801/1703] build: update webpack-dev-server to version 3.2.1

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 68 +++++++++++++++----
 2 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 7b26913dbf02..e26ace2e4501 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -46,7 +46,7 @@
     "terser-webpack-plugin": "1.2.2",
     "webpack": "4.29.5",
     "webpack-dev-middleware": "3.6.0",
-    "webpack-dev-server": "3.1.14",
+    "webpack-dev-server": "3.2.1",
     "webpack-merge": "4.2.1",
     "webpack-sources": "1.3.0",
     "webpack-subresource-integrity": "1.1.0-rc.6"
diff --git a/yarn.lock b/yarn.lock
index fecf789196ec..747b000c5b4f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2883,7 +2883,7 @@ debug@^3.2.5:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.0:
+debug@^4.1.0, debug@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -2950,6 +2950,14 @@ default-gateway@^2.6.0:
     execa "^0.10.0"
     ip-regex "^2.1.0"
 
+default-gateway@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.0.1.tgz#3a7d071ca610a2831190341bd0666382b9dbc340"
+  integrity sha512-JnSsMUgrBFy9ycs+tmOvLHN1GpILe+hNSUrIVM8mXjymfcBH9a7LJjOdoHLuUqKGuCUk6mSIPJjZ11Zszrg3oQ==
+  dependencies:
+    execa "^1.0.0"
+    ip-regex "^2.1.0"
+
 default-require-extensions@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
@@ -3543,6 +3551,19 @@ execa@^0.7.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
@@ -4647,6 +4668,16 @@ http-proxy-agent@^2.1.0:
     agent-base "4"
     debug "3.1.0"
 
+http-proxy-middleware@^0.19.1:
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
+  integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==
+  dependencies:
+    http-proxy "^1.17.0"
+    is-glob "^4.0.0"
+    lodash "^4.17.11"
+    micromatch "^3.1.10"
+
 http-proxy-middleware@~0.18.0:
   version "0.18.0"
   resolved "http://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
@@ -4657,7 +4688,7 @@ http-proxy-middleware@~0.18.0:
     lodash "^4.17.5"
     micromatch "^3.1.9"
 
-http-proxy@^1.13.0, http-proxy@^1.16.2:
+http-proxy@^1.13.0, http-proxy@^1.16.2, http-proxy@^1.17.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
   integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==
@@ -4901,6 +4932,14 @@ internal-ip@^3.0.1:
     default-gateway "^2.6.0"
     ipaddr.js "^1.5.2"
 
+internal-ip@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.2.0.tgz#46e81b638d84c338e5c67e42b1a17db67d0814fa"
+  integrity sha512-ZY8Rk+hlvFeuMmG5uH1MXhhdeMntmIaxaInvAmzMq/SHV8rv4Kh+6GiQNNDQd0wZFrcO+FiTBo8lui/osKOyJw==
+  dependencies:
+    default-gateway "^4.0.1"
+    ipaddr.js "^1.9.0"
+
 interpret@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
@@ -4943,6 +4982,11 @@ ipaddr.js@^1.5.2:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.1.tgz#fa4b79fa47fd3def5e3b159825161c0a519c9427"
   integrity sha1-+kt5+kf9Pe9eOxWYJRYcClGclCc=
 
+ipaddr.js@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
+  integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
+
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
@@ -10484,7 +10528,7 @@ webpack-dev-middleware@3.4.0:
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
-webpack-dev-middleware@3.6.0:
+webpack-dev-middleware@3.6.0, webpack-dev-middleware@^3.5.1:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.0.tgz#71f1b04e52ff8d442757af2be3a658237d53a3e5"
   integrity sha512-oeXA3m+5gbYbDBGo4SvKpAHJJEGMoekUbHgo1RK7CP1sz7/WOSeu/dWJtSTk+rzDCLkPwQhGocgIq6lQqOyOwg==
@@ -10494,23 +10538,23 @@ webpack-dev-middleware@3.6.0:
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
-webpack-dev-server@3.1.14:
-  version "3.1.14"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz#60fb229b997fc5a0a1fc6237421030180959d469"
-  integrity sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==
+webpack-dev-server@3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.2.1.tgz#1b45ce3ecfc55b6ebe5e36dab2777c02bc508c4e"
+  integrity sha512-sjuE4mnmx6JOh9kvSbPYw3u/6uxCLHNWfhWaIPwcXWsvWOPN+nc5baq4i9jui3oOBRXGonK9+OI0jVkaz6/rCw==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
     chokidar "^2.0.0"
     compression "^1.5.2"
     connect-history-api-fallback "^1.3.0"
-    debug "^3.1.0"
+    debug "^4.1.1"
     del "^3.0.0"
     express "^4.16.2"
     html-entities "^1.2.0"
-    http-proxy-middleware "~0.18.0"
+    http-proxy-middleware "^0.19.1"
     import-local "^2.0.0"
-    internal-ip "^3.0.1"
+    internal-ip "^4.2.0"
     ip "^1.1.5"
     killable "^1.0.0"
     loglevel "^1.4.1"
@@ -10524,9 +10568,9 @@ webpack-dev-server@3.1.14:
     sockjs-client "1.3.0"
     spdy "^4.0.0"
     strip-ansi "^3.0.0"
-    supports-color "^5.1.0"
+    supports-color "^6.1.0"
     url "^0.11.0"
-    webpack-dev-middleware "3.4.0"
+    webpack-dev-middleware "^3.5.1"
     webpack-log "^2.0.0"
     yargs "12.0.2"
 

From 4dfa5036cbdb557fd30a193dbd69c5284deb2fb4 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 25 Feb 2019 11:21:48 +0000
Subject: [PATCH 0802/1703] build: update terser-webpack-plugin to version
 1.2.3

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index e26ace2e4501..4c092c15baef 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -43,7 +43,7 @@
     "stylus": "0.54.5",
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
-    "terser-webpack-plugin": "1.2.2",
+    "terser-webpack-plugin": "1.2.3",
     "webpack": "4.29.5",
     "webpack-dev-middleware": "3.6.0",
     "webpack-dev-server": "3.2.1",
diff --git a/yarn.lock b/yarn.lock
index 747b000c5b4f..c1ff10802061 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9842,10 +9842,10 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
-terser-webpack-plugin@1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz#9bff3a891ad614855a7dde0d707f7db5a927e3d9"
-  integrity sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==
+terser-webpack-plugin@1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz#3f98bc902fac3e5d0de730869f50668561262ec8"
+  integrity sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==
   dependencies:
     cacache "^11.0.2"
     find-cache-dir "^2.0.0"

From 15b208fa958643599b3cd020048eb49c27ba5e3a Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 23 Feb 2019 18:30:51 +0000
Subject: [PATCH 0803/1703] build: update license-webpack-plugin to version
 2.1.1

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 4c092c15baef..87da819c586f 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -22,7 +22,7 @@
     "karma-source-map-support": "1.4.0",
     "less": "3.9.0",
     "less-loader": "4.1.0",
-    "license-webpack-plugin": "2.1.0",
+    "license-webpack-plugin": "2.1.1",
     "loader-utils": "1.2.3",
     "mini-css-extract-plugin": "0.5.0",
     "minimatch": "3.0.4",
diff --git a/yarn.lock b/yarn.lock
index c1ff10802061..8b85a8919e57 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5946,10 +5946,10 @@ license-checker@^20.1.0:
     strip-ansi "^4.0.0"
     treeify "^1.1.0"
 
-license-webpack-plugin@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.1.0.tgz#83acaa6e89c3c5316effdd80cb4ec9c5cd8efc2f"
-  integrity sha512-vDiBeMWxjE9n6TabQ9J4FH8urFdsRK0Nvxn1cit9biCiR9aq1zBR0X2BlAkEiIG6qPamLeU0GzvIgLkrFc398A==
+license-webpack-plugin@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.1.1.tgz#f0ab760f7f301c76f5af52e480f320656b5721bb"
+  integrity sha512-TiarZIg5vkQ2rGdYJn2+5YxO/zqlqjpK5IVglr7OfmrN1sBCakS+PQrsP2uC5gtve1ZDb9WMSUMlmHDQ0FoW4w==
   dependencies:
     "@types/webpack-sources" "^0.1.5"
     webpack-sources "^1.2.0"

From 70b28193c9fa99a4c7e8303a8e2a1428eb55b521 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 26 Feb 2019 10:11:45 +0100
Subject: [PATCH 0804/1703] fix(@angular-devkit/build-angular): sourceMap
 option not working in tests

Fixes #13766
---
 .../models/webpack-configs/test.ts            |  2 +-
 .../e2e/tests/test/test-sourcemap.ts          | 29 +++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 tests/legacy-cli/e2e/tests/test/test-sourcemap.ts

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts
index 7e0d9b5a907f..2ea075e9c397 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts
@@ -60,8 +60,8 @@ export function getTestConfig(
     const { styles, scripts } = wco.buildOptions.sourceMap;
 
     extraPlugins.push(getSourceMapDevTool(
-      styles || false,
       scripts || false,
+      styles || false,
       false,
       true,
     ));
diff --git a/tests/legacy-cli/e2e/tests/test/test-sourcemap.ts b/tests/legacy-cli/e2e/tests/test/test-sourcemap.ts
new file mode 100644
index 000000000000..1963cfbd7bef
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/test/test-sourcemap.ts
@@ -0,0 +1,29 @@
+import { writeFile } from '../../utils/fs';
+import { execAndWaitForOutputToMatch, killAllProcesses } from '../../utils/process';
+import { updateJsonFile } from '../../utils/project';
+
+export default async function () {
+  await updateJsonFile('angular.json', configJson => {
+    const appArchitect = configJson.projects['test-project'].architect;
+    appArchitect.test.options.sourceMap = {
+      scripts: true,
+    };
+  });
+
+  await writeFile('src/app/app.component.spec.ts', `
+      it('show fail', () => {
+        expect(undefined).toBeTruthy();
+      });
+    `);
+
+  // when sourcemaps are not working the stacktrace won't point to the spec.ts file.
+  try {
+    await execAndWaitForOutputToMatch(
+      'ng',
+      ['test', '--watch', 'false'],
+      /app\.component\.spec\.ts/,
+    );
+  } finally {
+    killAllProcesses();
+  }
+}

From b96e7bf76fb95077cce7dd3de9cb0315edbaf38e Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Sun, 24 Feb 2019 20:21:09 -0500
Subject: [PATCH 0805/1703] fix(@schematics/angular): default newProjectRoot to
 current directory

---
 packages/schematics/angular/application/index.ts | 4 ++--
 packages/schematics/angular/library/index.ts     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 2a02c9af23d8..97b02484cfc8 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -151,7 +151,7 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
   // }
   let projectRoot = options.projectRoot !== undefined
     ? options.projectRoot
-    : `${workspace.newProjectRoot}/${options.name}`;
+    : `${workspace.newProjectRoot || ''}/${options.name}`;
   if (projectRoot !== '' && !projectRoot.endsWith('/')) {
     projectRoot += '/';
   }
@@ -326,7 +326,7 @@ export default function (options: ApplicationOptions): Rule {
       };
 
     const workspace = getWorkspace(host);
-    let newProjectRoot = workspace.newProjectRoot || 'projects';
+    let newProjectRoot = workspace.newProjectRoot || '';
     let appDir = `${newProjectRoot}/${options.name}`;
     let sourceRoot = `${appDir}/src`;
     let sourceDir = `${sourceRoot}/app`;
diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index 7f2573bc98a4..02fc671be66f 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -193,7 +193,7 @@ export default function (options: LibraryOptions): Rule {
     }
 
     const workspace = getWorkspace(host);
-    const newProjectRoot = workspace.newProjectRoot || 'projects';
+    const newProjectRoot = workspace.newProjectRoot || '';
 
     const scopeFolder = scopeName ? strings.dasherize(scopeName) + '/' : '';
     const folderName = `${scopeFolder}${strings.dasherize(options.name)}`;

From 3d6ae631788b600a1b80132ae407f15ad3dc65aa Mon Sep 17 00:00:00 2001
From: mrmeku <mrmeku@gmail.com>
Date: Thu, 14 Feb 2019 10:35:29 -0700
Subject: [PATCH 0806/1703] feat(@angular/cli): Add VsCode recommendation for
 Angular Console

---
 .../update-vscode-recommendations/update-8.0.0.ts | 15 +++++++++------
 .../update-8.0.0_spec.ts                          | 13 ++++++++++---
 .../files/__dot__vscode/extensions.json.template  |  1 +
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0.ts b/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0.ts
index 41101d48def4..9b4bba7225e7 100644
--- a/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0.ts
+++ b/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0.ts
@@ -15,12 +15,15 @@ export default function (): Rule {
 const addExtensionRecommendations = updateJsonInTree(
   '.vscode/extensions.json',
   (json: { recommendations?: string[] }) => {
-    ['angular.ng-template', 'ms-vscode.vscode-typescript-tslint-plugin'].forEach(extension => {
-      json.recommendations = json.recommendations || [];
-      if (!json.recommendations.includes(extension)) {
-        json.recommendations.push(extension);
-      }
-    });
+    [
+      'angular.ng-template',
+      'nrwl.angular-console',
+      'ms-vscode.vscode-typescript-tslint-plugin'].forEach(extension => {
+        json.recommendations = json.recommendations || [];
+        if (!json.recommendations.includes(extension)) {
+          json.recommendations.push(extension);
+        }
+      });
 
     return json;
   },
diff --git a/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0_spec.ts b/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0_spec.ts
index 40be71afa9a3..f45de65b9f5a 100644
--- a/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0_spec.ts
+++ b/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0_spec.ts
@@ -35,7 +35,8 @@ describe('Update 8.0.0', () => {
       .toPromise();
 
     expect(readJsonInTree(result, '.vscode/extensions.json')).toEqual({
-      recommendations: ['angular.ng-template', 'ms-vscode.vscode-typescript-tslint-plugin'],
+      recommendations: [
+        'angular.ng-template', 'nrwl.angular-console', 'ms-vscode.vscode-typescript-tslint-plugin'],
     });
   });
 
@@ -44,7 +45,10 @@ describe('Update 8.0.0', () => {
       .callRule(
         updateJsonInTree('.vscode/extensions.json', () => ({
           recommendations: [
-            'eamodio.gitlens', 'angular.ng-template', 'ms-vscode.vscode-typescript-tslint-plugin'],
+            'eamodio.gitlens',
+            'angular.ng-template',
+            'nrwl.angular-console',
+            'ms-vscode.vscode-typescript-tslint-plugin'],
         })),
         initialTree,
       )
@@ -56,7 +60,10 @@ describe('Update 8.0.0', () => {
 
     expect(readJsonInTree(result, '.vscode/extensions.json')).toEqual({
       recommendations: [
-        'eamodio.gitlens', 'angular.ng-template', 'ms-vscode.vscode-typescript-tslint-plugin'],
+        'eamodio.gitlens',
+        'angular.ng-template',
+        'nrwl.angular-console',
+        'ms-vscode.vscode-typescript-tslint-plugin'],
     });
   });
 });
diff --git a/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template b/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template
index a69da09b88fd..668282bf7a5f 100644
--- a/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template
+++ b/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template
@@ -1,6 +1,7 @@
 {
   "recommendations": [
     "angular.ng-template",
+    "nrwl.angular-console",
     "ms-vscode.vscode-typescript-tslint-plugin"
   ]
 }

From 05966646e7f20635d9120f93ddd2856cc5477064 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 26 Feb 2019 11:49:09 +0000
Subject: [PATCH 0807/1703] feat(@schematics/angular): rename experimentalIvy
 to enableIvy

Followup to https://github.com/angular/angular/pull/28569#discussion_r259558085
---
 .../angular/application/files/root/tsconfig.app.json.template | 2 +-
 packages/schematics/angular/application/index.ts              | 2 +-
 packages/schematics/angular/application/index_spec.ts         | 4 ++--
 packages/schematics/angular/application/schema.json           | 2 +-
 packages/schematics/angular/ng-new/index.ts                   | 2 +-
 packages/schematics/angular/ng-new/schema.json                | 4 ++--
 tests/legacy-cli/e2e/setup/500-create-project.ts              | 2 +-
 tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts      | 2 +-
 tests/legacy-cli/e2e/tests/experimental/ivy.ts                | 2 +-
 tests/legacy-cli/e2e/utils/project.ts                         | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/schematics/angular/application/files/root/tsconfig.app.json.template b/packages/schematics/angular/application/files/root/tsconfig.app.json.template
index 34720be1271d..e8911503de66 100644
--- a/packages/schematics/angular/application/files/root/tsconfig.app.json.template
+++ b/packages/schematics/angular/application/files/root/tsconfig.app.json.template
@@ -7,7 +7,7 @@
   "exclude": [
     "test.ts",
     "**/*.spec.ts"
-  ]<% if (experimentalIvy) { %>,
+  ]<% if (enableIvy) { %>,
   "angularCompilerOptions": {
     "enableIvy": true
   }<% } %>
diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 97b02484cfc8..6163f83c7ed1 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -430,7 +430,7 @@ export default function (options: ApplicationOptions): Rule {
           move(sourceDir),
         ]), MergeStrategy.Overwrite),
       options.minimal ? noop() : schematic('e2e', e2eOptions),
-      options.experimentalIvy ? addPostInstallScript() : noop(),
+      options.enableIvy ? addPostInstallScript() : noop(),
       options.skipPackageJson ? noop() : addDependenciesToPackageJson(options),
       options.lintFix ? applyLintFix(sourceDir) : noop(),
     ]);
diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
index 352d318548fa..5ba5a1a415f1 100644
--- a/packages/schematics/angular/application/index_spec.ts
+++ b/packages/schematics/angular/application/index_spec.ts
@@ -208,8 +208,8 @@ describe('Application Schematic', () => {
       expect(pkg.devDependencies['typescript']).toEqual(latestVersions.TypeScript);
     });
 
-    it(`should add a postinstall in package.json when 'experimentalIvy'`, () => {
-      const tree = schematicRunner.runSchematic('application', { ...defaultOptions, experimentalIvy: true }, workspaceTree);
+    it(`should add a postinstall in package.json when 'enableIvy'`, () => {
+      const tree = schematicRunner.runSchematic('application', { ...defaultOptions, enableIvy: true }, workspaceTree);
       const pkg = JSON.parse(tree.readContent('/package.json'));
       expect(pkg.scripts.postinstall).toEqual('ivy-ngcc');
     });
diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json
index 8041d438a8aa..39fde448dcf3 100644
--- a/packages/schematics/angular/application/schema.json
+++ b/packages/schematics/angular/application/schema.json
@@ -19,7 +19,7 @@
       },
       "x-prompt": "What name would you like to use for the application?"
     },
-    "experimentalIvy": {
+    "enableIvy": {
       "description": "EXPERIMENTAL: True to create a new app that uses the Ivy rendering engine.",
       "type": "boolean",
       "default": false
diff --git a/packages/schematics/angular/ng-new/index.ts b/packages/schematics/angular/ng-new/index.ts
index 9e7d926ee47e..055eb092311d 100644
--- a/packages/schematics/angular/ng-new/index.ts
+++ b/packages/schematics/angular/ng-new/index.ts
@@ -46,7 +46,7 @@ export default function (options: NgNewOptions): Rule {
   const applicationOptions: ApplicationOptions = {
     projectRoot: '',
     name: options.name,
-    experimentalIvy: options.experimentalIvy,
+    enableIvy: options.enableIvy,
     inlineStyle: options.inlineStyle,
     inlineTemplate: options.inlineTemplate,
     prefix: options.prefix,
diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
index ea4c18bd2214..4aa1ee2b9b7f 100644
--- a/packages/schematics/angular/ng-new/schema.json
+++ b/packages/schematics/angular/ng-new/schema.json
@@ -18,8 +18,8 @@
       },
       "x-prompt": "What name would you like to use for the new workspace and initial project?"
     },
-    "experimentalIvy": {
-      "description": "EXPERIMENTAL: When true, creates a new app that uses the Ivy rendering engine.",
+    "enableIvy": {
+      "description": "When true, creates a new app that uses the Ivy rendering engine.",
       "type": "boolean",
       "default": false
     },
diff --git a/tests/legacy-cli/e2e/setup/500-create-project.ts b/tests/legacy-cli/e2e/setup/500-create-project.ts
index 7a2bf8d31cd1..f995bbbd2a1e 100644
--- a/tests/legacy-cli/e2e/setup/500-create-project.ts
+++ b/tests/legacy-cli/e2e/setup/500-create-project.ts
@@ -11,7 +11,7 @@ export default async function() {
   const extraArgs = [];
 
   if (argv['ivy']) {
-    extraArgs.push('--experimentalIvy');
+    extraArgs.push('--enable-ivy');
   }
 
   if (argv.noproject) {
diff --git a/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts b/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts
index f4225a38212c..d23d1b26a56c 100644
--- a/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts
+++ b/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts
@@ -11,7 +11,7 @@ import { ng } from '../../utils/process';
 import { createProject } from '../../utils/project';
 
 export default async function() {
-  await createProject('ivy-project', '--experimental-ivy');
+  await createProject('ivy-project', '--enable-ivy');
 
   await ng('generate', 'module', 'lazy', '--routing');
   await prependToFile('src/app/app.module.ts', `import { RouterModule } from '@angular/router';`);
diff --git a/tests/legacy-cli/e2e/tests/experimental/ivy.ts b/tests/legacy-cli/e2e/tests/experimental/ivy.ts
index c085986a8526..c80a2e0bfc32 100644
--- a/tests/legacy-cli/e2e/tests/experimental/ivy.ts
+++ b/tests/legacy-cli/e2e/tests/experimental/ivy.ts
@@ -17,7 +17,7 @@ export default async function() {
     return;
   }
   try {
-    await createProject('ivy-project', '--experimental-ivy');
+    await createProject('ivy-project', '--enable-ivy');
 
     await ngServe('--prod');
 
diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts
index 073b01036264..6d63c6792f7c 100644
--- a/tests/legacy-cli/e2e/utils/project.ts
+++ b/tests/legacy-cli/e2e/utils/project.ts
@@ -38,7 +38,7 @@ export async function createProject(name: string, ...args: string[]) {
   const extraArgs = [];
 
   if (argv['ivy']) {
-    extraArgs.push('--experimentalIvy');
+    extraArgs.push('--enableIvy');
   }
 
   process.chdir(getGlobalVariable('tmp-root'));

From 8b10768110082b0b3d4c5120a637bf76be2ec7b6 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Tue, 19 Feb 2019 10:38:27 -0800
Subject: [PATCH 0808/1703] docs: Update release process for microsite

---
 docs/process/release.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/process/release.md b/docs/process/release.md
index d4d4d4c340ae..1515fd7cd95a 100644
--- a/docs/process/release.md
+++ b/docs/process/release.md
@@ -82,6 +82,24 @@ Check out the minor tag (e.g. `v6.8.0-beta.0`), then run:
 devkit-admin publish --tag next
 ```
 
+### Microsite Publishing
+
+**This can ONLY be done by a Google employee.**
+
+**You will need firebase access to our cli-angular-io firebase site. If you don't have it, escalate.**
+
+Check out if changes were made to the microsite:
+
+```sh
+git log v8.0.0-beta.0..HEAD --oneline etc/cli.angular.io | wc -l
+```
+
+If the number is 0 you can ignore the rest of this section.
+
+To publish, go to the `etc/cli.angular.io` directory and run `firebase deploy`. You might have to `firebase login` first. If you don't have the firebase CLI installed, you can install it using `npm install --global firebase-tools` (or use your package manager of choice).
+
+This is detailed in `etc/cli.angular.io/README.md`.
+
 ### Release Notes
 
 `devkit-admin changelog` takes `from` and `to` arguments which are any valid git ref.

From 3a68b8cf9696e678308da65ca59b53329981c94f Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Tue, 26 Feb 2019 18:52:12 +0000
Subject: [PATCH 0809/1703] feat(@schematics/angular): recommend plugins that
 John Papa recommends

This list comes from https://marketplace.visualstudio.com/items?itemName=johnpapa.angular-essentials
But we don't write a .prettier.json config file so we don't include the Prettier plugin yet
---
 .../update-8.0.0.ts                           |  8 +++++-
 .../update-8.0.0_spec.ts                      | 25 +++++++++++--------
 .../__dot__vscode/extensions.json.template    |  8 +++++-
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0.ts b/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0.ts
index 9b4bba7225e7..76ae07838586 100644
--- a/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0.ts
+++ b/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0.ts
@@ -18,7 +18,13 @@ const addExtensionRecommendations = updateJsonInTree(
     [
       'angular.ng-template',
       'nrwl.angular-console',
-      'ms-vscode.vscode-typescript-tslint-plugin'].forEach(extension => {
+      'ms-vscode.vscode-typescript-tslint-plugin',
+      'Mikael.Angular-BeastCode',
+      'EditorConfig.EditorConfig',
+      'msjsdiag.debugger-for-chrome',
+      'eg2.vscode-npm-script',
+      'PKief.material-icon-theme',
+      'natewallace.angular2-inline'].forEach(extension => {
         json.recommendations = json.recommendations || [];
         if (!json.recommendations.includes(extension)) {
           json.recommendations.push(extension);
diff --git a/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0_spec.ts b/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0_spec.ts
index f45de65b9f5a..d5b7ed948f2e 100644
--- a/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0_spec.ts
+++ b/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0_spec.ts
@@ -9,6 +9,18 @@ import { Tree } from '@angular-devkit/schematics';
 import { SchematicTestRunner } from '@angular-devkit/schematics/testing';
 import { readJsonInTree, serializeJson, updateJsonInTree } from './ast-utils';
 
+const recommendations = [
+  'angular.ng-template',
+  'nrwl.angular-console',
+  'ms-vscode.vscode-typescript-tslint-plugin',
+  'Mikael.Angular-BeastCode',
+  'EditorConfig.EditorConfig',
+  'msjsdiag.debugger-for-chrome',
+  'eg2.vscode-npm-script',
+  'PKief.material-icon-theme',
+  'natewallace.angular2-inline',
+];
+
 describe('Update 8.0.0', () => {
   let initialTree: Tree;
   let schematicRunner: SchematicTestRunner;
@@ -34,10 +46,7 @@ describe('Update 8.0.0', () => {
       .runSchematicAsync('migration-07', {}, initialTree)
       .toPromise();
 
-    expect(readJsonInTree(result, '.vscode/extensions.json')).toEqual({
-      recommendations: [
-        'angular.ng-template', 'nrwl.angular-console', 'ms-vscode.vscode-typescript-tslint-plugin'],
-    });
+    expect(readJsonInTree(result, '.vscode/extensions.json')).toEqual({recommendations});
   });
 
   it('should add to existing vscode extension recommendations', async () => {
@@ -46,9 +55,7 @@ describe('Update 8.0.0', () => {
         updateJsonInTree('.vscode/extensions.json', () => ({
           recommendations: [
             'eamodio.gitlens',
-            'angular.ng-template',
-            'nrwl.angular-console',
-            'ms-vscode.vscode-typescript-tslint-plugin'],
+            ...recommendations],
         })),
         initialTree,
       )
@@ -61,9 +68,7 @@ describe('Update 8.0.0', () => {
     expect(readJsonInTree(result, '.vscode/extensions.json')).toEqual({
       recommendations: [
         'eamodio.gitlens',
-        'angular.ng-template',
-        'nrwl.angular-console',
-        'ms-vscode.vscode-typescript-tslint-plugin'],
+        ...recommendations],
     });
   });
 });
diff --git a/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template b/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template
index 668282bf7a5f..9b4375bca6c0 100644
--- a/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template
+++ b/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template
@@ -2,6 +2,12 @@
   "recommendations": [
     "angular.ng-template",
     "nrwl.angular-console",
-    "ms-vscode.vscode-typescript-tslint-plugin"
+    "ms-vscode.vscode-typescript-tslint-plugin",
+    "Mikael.Angular-BeastCode",
+    "EditorConfig.EditorConfig",
+    "msjsdiag.debugger-for-chrome",
+    "eg2.vscode-npm-script",
+    "PKief.material-icon-theme",
+    "natewallace.angular2-inline"
   ]
 }

From 0be006ce00c6f72675ed77d46100b813ecfd5224 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 26 Feb 2019 21:49:52 +0000
Subject: [PATCH 0810/1703] build: update autoprefixer to version 9.4.9

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 57 +++++++++----------
 2 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 87da819c586f..a925f947e542 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -12,7 +12,7 @@
     "@angular-devkit/core": "0.0.0",
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.9.2",
-    "autoprefixer": "9.4.8",
+    "autoprefixer": "9.4.9",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.0",
diff --git a/yarn.lock b/yarn.lock
index 8b85a8919e57..e816b2a2832e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1237,13 +1237,13 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@9.4.8:
-  version "9.4.8"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.8.tgz#575dcdfd984228c7bccbc08c5fe53f0ea6915593"
-  integrity sha512-DIhd0KMi9Nql3oJkJ2HCeOVihrXFPtWXc6ckwaUNwliDOt9OGr0fk8vV8jCLWXnZc1EXvQ2uLUzGpcPxFAQHEQ==
+autoprefixer@9.4.9:
+  version "9.4.9"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.9.tgz#0d3eb86bc1d1228551abcf55220d6fd246b6cb31"
+  integrity sha512-OyUl7KvbGBoFQbGQu51hMywz1aaVeud/6uX8r1R1DNcqFvqGUUy6+BDHnAZE8s5t5JyEObaSw+O1DpAdjAmLuw==
   dependencies:
-    browserslist "^4.4.1"
-    caniuse-lite "^1.0.30000938"
+    browserslist "^4.4.2"
+    caniuse-lite "^1.0.30000939"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
     postcss "^7.0.14"
@@ -1680,14 +1680,14 @@ browserslist@^4.0.0, browserslist@^4.3.3:
     electron-to-chromium "^1.3.82"
     node-releases "^1.0.1"
 
-browserslist@^4.4.1:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.1.tgz#42e828954b6b29a7a53e352277be429478a69062"
-  integrity sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==
+browserslist@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.2.tgz#6ea8a74d6464bb0bd549105f659b41197d8f0ba2"
+  integrity sha512-ISS/AIAiHERJ3d45Fz0AVYKkgcy+F/eJHzKEvv1j0wwKGKD9T3BrwKr/5g45L+Y4XIK5PlTqefHciRFcfE1Jxg==
   dependencies:
-    caniuse-lite "^1.0.30000929"
-    electron-to-chromium "^1.3.103"
-    node-releases "^1.1.3"
+    caniuse-lite "^1.0.30000939"
+    electron-to-chromium "^1.3.113"
+    node-releases "^1.1.8"
 
 browserstack@^1.5.1:
   version "1.5.1"
@@ -1916,15 +1916,10 @@ caniuse-lite@^1.0.30000898, caniuse-lite@^1.0.30000899:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000903.tgz#86d46227759279b3db345ddbe778335dbba9e858"
   integrity sha512-T1XVJEpGCoaq7MDw7/6hCdYUukmSaS+1l/OQJkLtw7Cr2+/+d67tNGKEbyiqf7Ck8x6EhNFUxjYFXXka0N/w5g==
 
-caniuse-lite@^1.0.30000929:
-  version "1.0.30000929"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000929.tgz#7b391b781a9c3097ecc39ea053301aea8ea16317"
-  integrity sha512-n2w1gPQSsYyorSVYqPMqbSaz1w7o9ZC8VhOEGI9T5MfGDzp7sbopQxG6GaQmYsaq13Xfx/mkxJUWC1Dz3oZfzw==
-
-caniuse-lite@^1.0.30000938:
-  version "1.0.30000938"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000938.tgz#b64bf1427438df40183fce910fe24e34feda7a3f"
-  integrity sha512-ekW8NQ3/FvokviDxhdKLZZAx7PptXNwxKgXtnR5y+PR3hckwuP3yJ1Ir+4/c97dsHNqtAyfKUGdw8P4EYzBNgw==
+caniuse-lite@^1.0.30000939:
+  version "1.0.30000939"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000939.tgz#b9ab7ac9e861bf78840b80c5dfbc471a5cd7e679"
+  integrity sha512-oXB23ImDJOgQpGjRv1tCtzAvJr4/OvrHi5SO2vUgB0g0xpdZZoA/BxfImiWfdwoYdUTtQrPsXsvYU/dmCSM8gg==
 
 canonical-path@1.0.0:
   version "1.0.0"
@@ -3214,10 +3209,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.103:
-  version "1.3.103"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.103.tgz#a695777efdbc419cad6cbb0e58458251302cd52f"
-  integrity sha512-tObPqGmY9X8MUM8i3MEimYmbnLLf05/QV5gPlkR8MQ3Uj8G8B2govE1U4cQcBYtv3ymck9Y8cIOu4waoiykMZQ==
+electron-to-chromium@^1.3.113:
+  version "1.3.113"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz#b1ccf619df7295aea17bc6951dc689632629e4a9"
+  integrity sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g==
 
 electron-to-chromium@^1.3.82:
   version "1.3.82"
@@ -6826,10 +6821,10 @@ node-releases@^1.0.1:
   dependencies:
     semver "^5.3.0"
 
-node-releases@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.3.tgz#aad9ce0dcb98129c753f772c0aa01360fb90fbd2"
-  integrity sha512-6VrvH7z6jqqNFY200kdB6HdzkgM96Oaj9v3dqGfgp6mF+cHmU4wyQKZ2/WPDRVoR0Jz9KqbamaBN0ZhdUaysUQ==
+node-releases@^1.1.8:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.8.tgz#32a63fff63c5e51b7e0f540ac95947d220fc6862"
+  integrity sha512-gQm+K9mGCiT/NXHy+V/ZZS1N/LOaGGqRAAJJs3X9Ah1g+CIbRcBgNyoNYQ+SEtcyAtB9KqDruu+fF7nWjsqRaA==
   dependencies:
     semver "^5.3.0"
 
@@ -8705,7 +8700,7 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs@^6.0.0, rxjs@6.4.0, rxjs@^6.4.0, rxjs@~6.4.0:
+rxjs@6.4.0, rxjs@^6.0.0, rxjs@^6.4.0, rxjs@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
   integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==

From d84332b7b94b73ff67f018f0d8462cf6c8c2ffd0 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 21 Feb 2019 17:54:54 -0800
Subject: [PATCH 0811/1703] fix(devkit): make name required for devkit package
 schematics

---
 packages/_/devkit/package/schema.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/_/devkit/package/schema.json b/packages/_/devkit/package/schema.json
index 1689719bd985..4e8bca4c8627 100644
--- a/packages/_/devkit/package/schema.json
+++ b/packages/_/devkit/package/schema.json
@@ -24,5 +24,9 @@
       },
       "description": "The human readable name."
     }
-  }
+  },
+  "required": [
+    "name",
+    "displayName"
+  ]
 }

From a90ba8eaa5b5020408786f2b6ea1d5a6cef89639 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 20 Feb 2019 14:15:31 -0800
Subject: [PATCH 0812/1703] fix(@angular-devkit/architect-cli): remove any
 throttling of the progress bar

Sometimes it would miss the last update and it showed up at completed but the bar
would not be at 100%.
---
 packages/angular_devkit/architect_cli/src/progress.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/angular_devkit/architect_cli/src/progress.ts b/packages/angular_devkit/architect_cli/src/progress.ts
index d85763ceb56f..a78a61f9abe3 100644
--- a/packages/angular_devkit/architect_cli/src/progress.ts
+++ b/packages/angular_devkit/architect_cli/src/progress.ts
@@ -18,6 +18,7 @@ export class MultiProgressBar<Key, T> {
     const value = {
       data,
       bar: new ProgressBar(this._status, {
+        renderThrottle: 0,
         clear: true,
         total: 1,
         width: width,

From 03fc0e6bdb4b45c7e99dc1e4e4df565e07f7c357 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 20 Feb 2019 14:31:59 -0800
Subject: [PATCH 0813/1703] feat(@angular-devkit/architect-cli): wait for last
 output of build

This allows watching builds to work. They wont show logs though. Looking
into making a better UI for this tool.
---
 packages/angular_devkit/architect_cli/bin/architect.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/architect_cli/bin/architect.ts b/packages/angular_devkit/architect_cli/bin/architect.ts
index 4af723751d42..6fbed3ba97fd 100644
--- a/packages/angular_devkit/architect_cli/bin/architect.ts
+++ b/packages/angular_devkit/architect_cli/bin/architect.ts
@@ -21,6 +21,7 @@ import { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node';
 import { existsSync, readFileSync } from 'fs';
 import * as minimist from 'minimist';
 import * as path from 'path';
+import { last } from 'rxjs/operators';
 import { MultiProgressBar } from '../src/progress';
 
 
@@ -147,7 +148,7 @@ async function _executeTarget(
 
   // Wait for full completion of the builder.
   try {
-    const result = await run.result;
+    const result = await run.output.pipe(last()).toPromise();
 
     if (result.success) {
       parentLogger.info(terminal.green('SUCCESS'));

From f1edc089ed012faa3acebf44c9ee516b9c449c76 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 20 Feb 2019 14:35:28 -0800
Subject: [PATCH 0814/1703] refactor: remove build-webpack schema.d.ts and use
 quicktype

---
 .../src/webpack-dev-server/schema.d.ts              | 13 -------------
 .../build_webpack/src/webpack/index.ts              |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 packages/angular_devkit/build_webpack/src/webpack-dev-server/schema.d.ts

diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/schema.d.ts b/packages/angular_devkit/build_webpack/src/webpack-dev-server/schema.d.ts
deleted file mode 100644
index e9a8036076a1..000000000000
--- a/packages/angular_devkit/build_webpack/src/webpack-dev-server/schema.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-export interface WebpackDevServerBuilderSchema {
-  /**
-   * The path to the Webpack configuration file.
-   */
-  webpackConfig: string;
-}
diff --git a/packages/angular_devkit/build_webpack/src/webpack/index.ts b/packages/angular_devkit/build_webpack/src/webpack/index.ts
index 6813da3487a4..8cc7b2fd518f 100644
--- a/packages/angular_devkit/build_webpack/src/webpack/index.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack/index.ts
@@ -11,7 +11,7 @@ import {
   BuilderConfiguration,
   BuilderContext,
 } from '@angular-devkit/architect';
-import { Path, getSystemPath, logging, normalize, resolve } from '@angular-devkit/core';
+import { getSystemPath, logging, normalize, resolve } from '@angular-devkit/core';
 import { Observable, from } from 'rxjs';
 import { concatMap } from 'rxjs/operators';
 import * as webpack from 'webpack';

From 2ffaf0c11cab84a0e579f384e3496343ccc5e74b Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 20 Feb 2019 17:54:11 -0800
Subject: [PATCH 0815/1703] feat(@angular-devkit/architect): allow for a
 different output type

There is no schema validation of output and we are not planning any
for now, but the attributes should be retained.
---
 .../angular_devkit/architect/src/create-builder.ts    | 11 +++++++----
 .../angular_devkit/architect/src/output-schema.json   |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/angular_devkit/architect/src/create-builder.ts b/packages/angular_devkit/architect/src/create-builder.ts
index 9ff2ff6824b8..2f5e9416e51a 100644
--- a/packages/angular_devkit/architect/src/create-builder.ts
+++ b/packages/angular_devkit/architect/src/create-builder.ts
@@ -23,11 +23,14 @@ import { Builder, BuilderSymbol, BuilderVersionSymbol } from './internal';
 import { scheduleByName, scheduleByTarget } from './schedule-by-name';
 
 
-export function createBuilder<OptT extends json.JsonObject>(
+export function createBuilder<
+  OptT extends json.JsonObject,
+  OutT extends BuilderOutput = BuilderOutput,
+>(
   fn: BuilderHandlerFn<OptT>,
 ): Builder<OptT> {
   const cjh = experimental.jobs.createJobHandler;
-  const handler = cjh<json.JsonObject, BuilderInput, BuilderOutput>((options, context) => {
+  const handler = cjh<json.JsonObject, BuilderInput, OutT>((options, context) => {
     const scheduler = context.scheduler;
     const progressChannel = context.createChannel('progress');
     const logChannel = context.createChannel('log');
@@ -60,7 +63,7 @@ export function createBuilder<OptT extends json.JsonObject>(
       });
     }
 
-    return new Observable<BuilderOutput>(observer => {
+    return new Observable<OutT>(observer => {
       const subscriptions: Subscription[] = [];
 
       const inputSubscription = context.inboundBus.subscribe(
@@ -161,7 +164,7 @@ export function createBuilder<OptT extends json.JsonObject>(
             progress({ state: BuilderProgressState.Stopped }, context);
           }),
         ).subscribe(
-          message => observer.next(message),
+          message => observer.next(message as OutT),
           error => observer.error(error),
           () => observer.complete(),
         ));
diff --git a/packages/angular_devkit/architect/src/output-schema.json b/packages/angular_devkit/architect/src/output-schema.json
index 8dbcc54add57..cff279ec12aa 100644
--- a/packages/angular_devkit/architect/src/output-schema.json
+++ b/packages/angular_devkit/architect/src/output-schema.json
@@ -28,6 +28,7 @@
       "type": "object"
     }
   },
+  "additionalProperties": true,
   "required": [
     "success"
   ]

From 318a0a3b99db53e1672cce56a53e4ca89a555b88 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 20 Feb 2019 14:43:55 -0800
Subject: [PATCH 0816/1703] feat(@angular-devkit/build-webpack): add API
 builder for webpack

It takes a webpack config path from its options, add the Architect Plugin to it
which reports progress and status to Architect from webpack events.
---
 .../build_webpack/builders.json               |   1 +
 .../angular_devkit/build_webpack/package.json |   5 +-
 .../angular_devkit/build_webpack/src/index.ts |   2 +
 .../build_webpack/src/plugins/architect.ts    | 157 ++++++++++++++++++
 .../build_webpack/src/webpack/index2.ts       |  90 ++++++++++
 5 files changed, 253 insertions(+), 2 deletions(-)
 create mode 100644 packages/angular_devkit/build_webpack/src/plugins/architect.ts
 create mode 100644 packages/angular_devkit/build_webpack/src/webpack/index2.ts

diff --git a/packages/angular_devkit/build_webpack/builders.json b/packages/angular_devkit/build_webpack/builders.json
index fe3bbee0c9e8..5d60a54aa247 100644
--- a/packages/angular_devkit/build_webpack/builders.json
+++ b/packages/angular_devkit/build_webpack/builders.json
@@ -2,6 +2,7 @@
   "$schema": "../architect/src/builders-schema.json",
   "builders": {
     "webpack": {
+      "implementation": "./src/webpack/index2",
       "class": "./src/webpack",
       "schema": "./src/webpack/schema.json",
       "description": "Build a webpack app."
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index f61d3dd5b501..b5f3b9eb1f62 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -8,7 +8,8 @@
   "dependencies": {
     "@angular-devkit/architect": "0.0.0",
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "6.4.0"
+    "rxjs": "6.4.0",
+    "webpack-merge": "4.2.1"
   },
   "peerDependencies": {
     "webpack": "^4.6.0",
@@ -18,4 +19,4 @@
     "webpack": "4.29.5",
     "webpack-dev-server": "^3.1.4"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/angular_devkit/build_webpack/src/index.ts b/packages/angular_devkit/build_webpack/src/index.ts
index e73ba09edf94..83d323e5e308 100644
--- a/packages/angular_devkit/build_webpack/src/index.ts
+++ b/packages/angular_devkit/build_webpack/src/index.ts
@@ -8,3 +8,5 @@
 
 export * from './webpack';
 export * from './webpack-dev-server';
+
+export * from './plugins/architect';
diff --git a/packages/angular_devkit/build_webpack/src/plugins/architect.ts b/packages/angular_devkit/build_webpack/src/plugins/architect.ts
new file mode 100644
index 000000000000..83549ab10bc8
--- /dev/null
+++ b/packages/angular_devkit/build_webpack/src/plugins/architect.ts
@@ -0,0 +1,157 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { BuilderContext } from '@angular-devkit/architect/src/index2';
+import { strings } from '@angular-devkit/core';
+import * as path from 'path';
+import * as webpack from 'webpack';
+
+/**
+ * This list was taken from a list of events we want to listen to, from the list of hooks in
+ * webpack's typings.
+ */
+const hookSafelist: (keyof webpack.compilation.CompilationHooks)[] = [
+  'seal',
+  'optimizeDependenciesBasic',
+  'optimizeDependencies',
+  'optimizeDependenciesAdvanced',
+  'afterOptimizeDependencies',
+  'optimize',
+  'optimizeModulesBasic',
+  'optimizeModules',
+  'optimizeModulesAdvanced',
+  'afterOptimizeModules',
+  'optimizeChunksBasic',
+  'optimizeChunks',
+  'optimizeChunksAdvanced',
+  'afterOptimizeChunks',
+  'optimizeTree',
+  'afterOptimizeTree',
+  'optimizeChunkModulesBasic',
+  'optimizeChunkModules',
+  'optimizeChunkModulesAdvanced',
+  'afterOptimizeChunkModules',
+  'reviveModules',
+  'optimizeModuleOrder',
+  'advancedOptimizeModuleOrder',
+  'beforeModuleIds',
+  'moduleIds',
+  'optimizeModuleIds',
+  'afterOptimizeModuleIds',
+  'reviveChunks',
+  'optimizeChunkOrder',
+  'beforeChunkIds',
+  'optimizeChunkIds',
+  'afterOptimizeChunkIds',
+  'recordModules',
+  'recordChunks',
+  'beforeHash',
+  'afterHash',
+  'recordHash',
+  'record',
+  'beforeModuleAssets',
+  'shouldGenerateChunkAssets',
+  'beforeChunkAssets',
+  'additionalChunkAssets',
+  'additionalAssets',
+  'optimizeChunkAssets',
+  'afterOptimizeChunkAssets',
+  'optimizeAssets',
+  'afterOptimizeAssets',
+  'afterSeal',
+  'optimizeExtractedChunksBasic',
+  'optimizeExtractedChunks',
+  'optimizeExtractedChunksAdvanced',
+  'afterOptimizeExtractedChunks',
+];
+
+/**
+ * A webpack plugin that reports status and progress to Architect.
+ */
+export class ArchitectPlugin {
+  constructor(protected context: BuilderContext) {}
+
+  apply(compiler: webpack.Compiler) {
+    const context = this.context;
+    let modulesCount = 0;
+    let modulesDone = 0;
+    let hooksDone = 0;
+    let numberOfHooks = 0;
+    let reset = false;  // Will be true when a full compilation is done.
+
+    function done() {
+      modulesDone = modulesCount;
+      hooksDone = Math.max(hooksDone, numberOfHooks);
+      update('Done.');
+      reset = true;
+    }
+    function update(status: string) {
+      context.reportProgress(
+        modulesDone + hooksDone,
+        modulesCount + Math.max(hooksDone, numberOfHooks),
+        status,
+      );
+    }
+    function updateModule(module: webpack.Module) {
+      // This is safe since we still verify it.
+      const m = module as unknown as { identifier?: () => string };
+      const moduleId = '' + (typeof m.identifier == 'function' ? m.identifier() : '');
+      const id = moduleId.split('!').slice(-1)[0].trim();
+      const p = path.relative(context.workspaceRoot, id);
+
+      update(`Building ${p}`);
+    }
+
+    function buildModule(module: webpack.Module) {
+      modulesCount++;
+      updateModule(module);
+    }
+    function failedModule(module: webpack.Module) {
+      modulesDone++;
+      updateModule(module);
+    }
+    function succeedModule(module: webpack.Module) {
+      modulesDone++;
+      updateModule(module);
+    }
+
+    // On the start of a new compilation, maybe reset the counters (and update the total), then
+    // listen to all hooks we're interested in.
+    compiler.hooks.compilation.tap('ArchitectPlugin', compilation => {
+      const hooks = hookSafelist;
+      if (reset) {
+        reset = false;
+        modulesCount = modulesDone = hooksDone = numberOfHooks = 0;
+      }
+      // Need to add hooks for each compilation.
+      numberOfHooks += hooks.length;
+
+      // Pre-emptively tell the user.
+      context.reportRunning();
+      update('Preparing...');
+
+      compilation.hooks.buildModule.tap('ArchitectPlugin', buildModule);
+      compilation.hooks.failedModule.tap('ArchitectPlugin', failedModule);
+      compilation.hooks.succeedModule.tap('ArchitectPlugin', succeedModule);
+
+      for (const name of hooks) {
+        // Transforms `camelCase` into `Camel case`. decamelize() transforms it into `camel_case`
+        // and then we replace the `_` with spaces.
+        const title = strings.capitalize(strings.decamelize(name).replace(/_/g, ' '));
+
+        compilation.hooks[name].intercept({
+          call: () => {
+            hooksDone++;
+            update(title);
+          },
+        });
+      }
+    });
+
+    compiler.hooks.done.tap('ArchitectPlugin', done);
+  }
+}
diff --git a/packages/angular_devkit/build_webpack/src/webpack/index2.ts b/packages/angular_devkit/build_webpack/src/webpack/index2.ts
new file mode 100644
index 000000000000..0bdd78c930f0
--- /dev/null
+++ b/packages/angular_devkit/build_webpack/src/webpack/index2.ts
@@ -0,0 +1,90 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect/src/index2';
+import { getSystemPath, json, normalize, resolve } from '@angular-devkit/core';
+import { Observable, from, of } from 'rxjs';
+import { switchMap } from 'rxjs/operators';
+import * as webpack from 'webpack';
+import { ArchitectPlugin } from '../plugins/architect';
+import { Schema as RealWebpackBuilderSchema } from './schema';
+
+const webpackMerge = require('webpack-merge');
+
+export type WebpackBuilderSchema = json.JsonObject & RealWebpackBuilderSchema;
+
+export interface WebpackLoggingCallback {
+  (stats: webpack.Stats, config: webpack.Configuration): void;
+}
+export interface WebpackFactory {
+  (config: webpack.Configuration): Observable<webpack.Compiler>;
+}
+
+
+export function runWebpack(
+  config: webpack.Configuration,
+  context: BuilderContext,
+  options: {
+    logging?: WebpackLoggingCallback,
+    webpackFactory?: WebpackFactory,
+  } = {},
+): Observable<BuilderOutput> {
+  const createWebpack = options.webpackFactory || (config => of(webpack(config)));
+  const log: WebpackLoggingCallback = options.logging
+    || ((stats, config) => context.logger.info(stats.toString(config.stats)));
+
+  config = webpackMerge(config, {
+    plugins: [
+      new ArchitectPlugin(context),
+    ],
+  });
+
+  return createWebpack(config).pipe(
+    switchMap(webpackCompiler => new Observable<BuilderOutput>(obs => {
+      const callback: webpack.Compiler.Handler = (err, stats) => {
+        if (err) {
+          return obs.error(err);
+        }
+
+        // Log stats.
+        log(stats, config);
+
+        obs.next({ success: !stats.hasErrors() });
+
+        if (!config.watch) {
+          obs.complete();
+        }
+      };
+
+      try {
+        if (config.watch) {
+          const watchOptions = config.watchOptions || {};
+          const watching = webpackCompiler.watch(watchOptions, callback);
+
+          // Teardown logic. Close the watcher when unsubscribed from.
+          return () => watching.close(() => { });
+        } else {
+          webpackCompiler.run(callback);
+        }
+      } catch (err) {
+        if (err) {
+          context.logger.error(`\nAn error occurred during the build:\n${err && err.stack || err}`);
+        }
+        throw err;
+      }
+    }),
+  ));
+}
+
+
+export default createBuilder<WebpackBuilderSchema>((options, context) => {
+  const configPath = resolve(normalize(context.workspaceRoot), normalize(options.webpackConfig));
+
+  return from(import(getSystemPath(configPath))).pipe(
+    switchMap((config: webpack.Configuration) => runWebpack(config, context)),
+  );
+});

From 06f5624b714e9980a4d5aa5b500d984bb8de3d95 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 20 Feb 2019 17:55:17 -0800
Subject: [PATCH 0817/1703] feat(@angular-devkit/build-webpack): add API
 builder for dev server

It outputs the port and address that it is bound to.
---
 packages/_/devkit/package/schema.d.ts         |  13 ---
 .../build_webpack/builders.json               |   7 ++
 .../src/webpack-dev-server/index.ts           |   2 +-
 .../src/webpack-dev-server/index2.ts          | 101 ++++++++++++++++++
 .../src/webpack-dev-server/schema.json        |   3 +-
 5 files changed, 111 insertions(+), 15 deletions(-)
 delete mode 100644 packages/_/devkit/package/schema.d.ts
 create mode 100644 packages/angular_devkit/build_webpack/src/webpack-dev-server/index2.ts

diff --git a/packages/_/devkit/package/schema.d.ts b/packages/_/devkit/package/schema.d.ts
deleted file mode 100644
index 0f2b32ac37a9..000000000000
--- a/packages/_/devkit/package/schema.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export interface Schema {
-    name: string;
-    description: string;
-    displayName: string;
-}
diff --git a/packages/angular_devkit/build_webpack/builders.json b/packages/angular_devkit/build_webpack/builders.json
index 5d60a54aa247..2e025ba55e02 100644
--- a/packages/angular_devkit/build_webpack/builders.json
+++ b/packages/angular_devkit/build_webpack/builders.json
@@ -7,7 +7,14 @@
       "schema": "./src/webpack/schema.json",
       "description": "Build a webpack app."
     },
+    "dev-server": {
+      "implementation": "./src/webpack-dev-server/index2",
+      "class": "./src/webpack-dev-server",
+      "schema": "./src/webpack-dev-server/schema.json",
+      "description": "Serve a webpack app."
+    },
     "webpack-dev-server": {
+      "implementation": "./src/webpack-dev-server/index2",
       "class": "./src/webpack-dev-server",
       "schema": "./src/webpack-dev-server/schema.json",
       "description": "Serve a webpack app."
diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts
index d99bfeddf460..0b5c7734d073 100644
--- a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts
@@ -19,7 +19,7 @@ import { concatMap } from 'rxjs/operators';
 import * as webpack from 'webpack';
 import * as WebpackDevServer from 'webpack-dev-server';
 import { LoggingCallback, defaultLoggingCb } from '../webpack';
-import { WebpackDevServerBuilderSchema } from './schema';
+import { Schema as WebpackDevServerBuilderSchema } from './schema';
 
 export interface DevServerResult {
   port: number;
diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2.ts b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2.ts
new file mode 100644
index 000000000000..541520d7ab40
--- /dev/null
+++ b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2.ts
@@ -0,0 +1,101 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect/src/index2';
+import { getSystemPath, json, normalize, resolve } from '@angular-devkit/core';
+import * as net from 'net';
+import { Observable, from, of } from 'rxjs';
+import { switchMap } from 'rxjs/operators';
+import * as webpack from 'webpack';
+import * as WebpackDevServer from 'webpack-dev-server';
+import { ArchitectPlugin } from '../plugins/architect';
+import { WebpackFactory, WebpackLoggingCallback } from '../webpack/index2';
+import { Schema as WebpackDevServerBuilderSchema } from './schema';
+
+const webpackMerge = require('webpack-merge');
+
+
+export type DevServerBuildResult = BuilderOutput & {
+  port: number;
+  family: string;
+  address: string;
+};
+
+export function runWebpackDevServer(
+  config: webpack.Configuration,
+  context: BuilderContext,
+  options: {
+    devServerConfig?: WebpackDevServer.Configuration,
+    logging?: WebpackLoggingCallback,
+    webpackFactory?: WebpackFactory,
+  } = {},
+): Observable<BuilderOutput> {
+  const createWebpack = options.webpackFactory || (config => of(webpack(config)));
+  const log: WebpackLoggingCallback = options.logging
+    || ((stats, config) => context.logger.info(stats.toString(config.stats)));
+
+  config = webpackMerge(config, {
+    plugins: [
+      new ArchitectPlugin(context),
+    ],
+  });
+
+  const devServerConfig = options.devServerConfig || config.devServer || {};
+  if (devServerConfig.stats) {
+    config.stats = devServerConfig.stats as webpack.Stats.ToStringOptionsObject;
+  }
+  // Disable stats reporting by the devserver, we have our own logger.
+  devServerConfig.stats = false;
+
+  return createWebpack(config).pipe(
+    switchMap(webpackCompiler => new Observable<BuilderOutput>(obs => {
+      const server = new WebpackDevServer(webpackCompiler, devServerConfig);
+      let result: DevServerBuildResult;
+
+      webpackCompiler.hooks.done.tap('build-webpack', (stats) => {
+        // Log stats.
+        log(stats, config);
+
+        obs.next({
+          ...result,
+          success: !stats.hasErrors(),
+        } as DevServerBuildResult);
+      });
+
+      server.listen(
+        devServerConfig.port === undefined ? 8080 : devServerConfig.port,
+        devServerConfig.host === undefined ? 'localhost' : devServerConfig.host,
+        function (this: net.Server, err) {
+          if (err) {
+            obs.error(err);
+          } else {
+            result = {
+              success: true,
+              port: this.address().port,
+              family: this.address().family,
+              address: this.address().address,
+            };
+          }
+        },
+      );
+
+      // Teardown logic. Close the server when unsubscribed from.
+      return () => server.close();
+    })),
+  );
+}
+
+
+export default createBuilder<
+  json.JsonObject & WebpackDevServerBuilderSchema, DevServerBuildResult
+>((options, context) => {
+  const configPath = resolve(normalize(context.workspaceRoot), normalize(options.webpackConfig));
+
+  return from(import(getSystemPath(configPath))).pipe(
+    switchMap((config: webpack.Configuration) => runWebpackDevServer(config, context)),
+  );
+});
diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/schema.json b/packages/angular_devkit/build_webpack/src/webpack-dev-server/schema.json
index f61d0fa9b680..697106775979 100644
--- a/packages/angular_devkit/build_webpack/src/webpack-dev-server/schema.json
+++ b/packages/angular_devkit/build_webpack/src/webpack-dev-server/schema.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "http://json-schema.org/schema",
   "title": "Webpack Dev-Server Builder",
   "description": "Webpack Dev-Server Builder schema for Architect.",
   "type": "object",
@@ -12,4 +13,4 @@
   "required": [
     "webpackConfig"
   ]
-}
\ No newline at end of file
+}

From 44900f9d00b4781a6c7512c86ad43f7ddcaeeafa Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 20 Feb 2019 19:11:51 -0800
Subject: [PATCH 0818/1703] test: add tests for build-webpack:webpack new
 builder

---
 .../src/webpack/index2_spec_large.ts          | 76 +++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 packages/angular_devkit/build_webpack/src/webpack/index2_spec_large.ts

diff --git a/packages/angular_devkit/build_webpack/src/webpack/index2_spec_large.ts b/packages/angular_devkit/build_webpack/src/webpack/index2_spec_large.ts
new file mode 100644
index 000000000000..4b46cd3a5830
--- /dev/null
+++ b/packages/angular_devkit/build_webpack/src/webpack/index2_spec_large.ts
@@ -0,0 +1,76 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { experimental, join, normalize, schema } from '@angular-devkit/core';
+import { NodeJsSyncHost } from '@angular-devkit/core/node';
+import * as fs from 'fs';
+import * as path from 'path';
+import { WorkspaceNodeModulesArchitectHost } from '../../../architect/node';
+import { Architect } from '../../../architect/src/architect';
+import { TestingArchitectHost } from '../../../architect/testing/testing-architect-host';
+
+const devkitRoot = normalize((global as any)._DevKitRoot); // tslint:disable-line:no-any
+
+
+describe('Webpack Builder basic test', () => {
+  let testArchitectHost: TestingArchitectHost;
+  let architect: Architect;
+  let vfHost: NodeJsSyncHost;
+
+  async function createArchitect(workspaceRoot: string) {
+    vfHost = new NodeJsSyncHost();
+    const configContent = fs.readFileSync(path.join(workspaceRoot, 'angular.json'), 'utf-8');
+    const workspaceJson = JSON.parse(configContent);
+
+    const registry = new schema.CoreSchemaRegistry();
+    registry.addPostTransform(schema.transforms.addUndefinedDefaults);
+
+    const workspace = new experimental.workspace.Workspace(normalize(workspaceRoot), vfHost);
+    await workspace.loadWorkspaceFromJson(workspaceJson).toPromise();
+
+    testArchitectHost = new TestingArchitectHost(workspaceRoot, workspaceRoot,
+      new WorkspaceNodeModulesArchitectHost(workspace, workspaceRoot));
+    architect = new Architect(testArchitectHost, registry);
+  }
+
+  describe('basic app', () => {
+    const workspaceRoot = join(devkitRoot, 'tests/angular_devkit/build_webpack/basic-app/');
+    const outputPath = join(workspaceRoot, 'dist');
+
+    beforeEach(async () => {
+      await createArchitect(workspaceRoot);
+    });
+
+    it('works', async () => {
+      const run = await architect.scheduleTarget({ project: 'app', target: 'build' });
+      const output = await run.result;
+
+      expect(output.success).toBe(true);
+      expect(await vfHost.exists(join(outputPath, 'bundle.js')).toPromise()).toBe(true);
+      await run.stop();
+    });
+  });
+
+  describe('Angular app', () => {
+    const workspaceRoot = join(devkitRoot, 'tests/angular_devkit/build_webpack/angular-app/');
+    const outputPath = join(workspaceRoot, 'dist/');
+
+    beforeEach(async () => {
+      await createArchitect(workspaceRoot);
+    });
+
+    it('works', async () => {
+      const run = await architect.scheduleTarget({ project: 'app', target: 'build-webpack' });
+      const output = await run.result;
+
+      expect(output.success).toBe(true);
+      expect(await vfHost.exists(join(outputPath, 'main.js')).toPromise()).toBe(true);
+      expect(await vfHost.exists(join(outputPath, 'polyfills.js')).toPromise()).toBe(true);
+      await run.stop();
+    });
+  });
+});

From b4daa72165192fb6debdb3c3ff82aac7f1a9b404 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 20 Feb 2019 19:33:31 -0800
Subject: [PATCH 0819/1703] build: add node-fetch typings

---
 package.json | 1 +
 yarn.lock    | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/package.json b/package.json
index 5d187386348c..6823e18f4620 100644
--- a/package.json
+++ b/package.json
@@ -63,6 +63,7 @@
     ]
   },
   "dependencies": {
+    "@types/node-fetch": "^2.1.6",
     "@types/progress": "^2.0.3",
     "glob": "^7.0.3",
     "node-fetch": "^2.2.0",
diff --git a/yarn.lock b/yarn.lock
index e816b2a2832e..634f403763aa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -394,6 +394,13 @@
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.0.tgz#69a23a3ad29caf0097f06eda59b361ee2f0639f6"
   integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
 
+"@types/node-fetch@^2.1.6":
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.1.6.tgz#4326288b49f352a142f03c63526ebce0f4c50877"
+  integrity sha512-Hv1jgh3pfpUEl2F2mqUd1AfLSk1YbUCeBJFaP36t7esAO617dErqdxWb5cdG2NfJGOofkmBW36fdx0dVewxDRg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/node@*":
   version "10.9.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897"

From 862571cfd0a3b4a522893d37b7660ca981960dbf Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 20 Feb 2019 19:33:43 -0800
Subject: [PATCH 0820/1703] test: add tests for
 build-webpack:webpack-dev-server new builder

---
 .../webpack-dev-server/index2_spec_large.ts   | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 packages/angular_devkit/build_webpack/src/webpack-dev-server/index2_spec_large.ts

diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2_spec_large.ts b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2_spec_large.ts
new file mode 100644
index 000000000000..0f70235f06a4
--- /dev/null
+++ b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2_spec_large.ts
@@ -0,0 +1,58 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { TestingArchitectHost } from '@angular-devkit/architect/testing/index2';
+import { experimental, join, normalize, schema } from '@angular-devkit/core';
+import { NodeJsSyncHost } from '@angular-devkit/core/node';
+import * as fs from 'fs';
+import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
+import * as path from 'path';
+import { WorkspaceNodeModulesArchitectHost } from '../../../architect/node';
+import { DevServerBuildResult } from './index2';
+
+const devkitRoot = normalize((global as any)._DevKitRoot); // tslint:disable-line:no-any
+
+
+describe('Dev Server Builder', () => {
+  let testArchitectHost: TestingArchitectHost;
+  let architect: Architect;
+  let vfHost: NodeJsSyncHost;
+
+  const webpackTargetSpec = { project: 'app', target: 'serve' };
+
+  async function createArchitect(workspaceRoot: string) {
+    vfHost = new NodeJsSyncHost();
+    const configContent = fs.readFileSync(path.join(workspaceRoot, 'angular.json'), 'utf-8');
+    const workspaceJson = JSON.parse(configContent);
+
+    const registry = new schema.CoreSchemaRegistry();
+    registry.addPostTransform(schema.transforms.addUndefinedDefaults);
+
+    const workspace = new experimental.workspace.Workspace(normalize(workspaceRoot), vfHost);
+    await workspace.loadWorkspaceFromJson(workspaceJson).toPromise();
+
+    testArchitectHost = new TestingArchitectHost(workspaceRoot, workspaceRoot,
+      new WorkspaceNodeModulesArchitectHost(workspace, workspaceRoot));
+    architect = new Architect(testArchitectHost, registry);
+  }
+
+  beforeEach(async () => {
+    await createArchitect(join(devkitRoot, 'tests/angular_devkit/build_webpack/basic-app/'));
+  });
+
+  it('works', async () => {
+    const run = await architect.scheduleTarget(webpackTargetSpec);
+    const output = await run.result as DevServerBuildResult;
+    expect(output.success).toBe(true);
+
+    const response = await fetch(`http://${output.address}:${output.port}/bundle.js`);
+    expect(await response.text()).toContain(`console.log('hello world')`);
+
+    await run.stop();
+  }, 30000);
+});

From 79c546b47001ac41f90be91c5238037cd16d6603 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Tue, 26 Feb 2019 22:37:33 -0800
Subject: [PATCH 0821/1703] feat(@angular-devkit/build-webpack): add a "build"
 builder

Having webpack everywhere is redundant. I would like to deprecate the
"webpack" and "webpack-dev-server" in favor of simply "build" and
"dev-server".
---
 packages/angular_devkit/build_webpack/builders.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/angular_devkit/build_webpack/builders.json b/packages/angular_devkit/build_webpack/builders.json
index 2e025ba55e02..3744aea4d6eb 100644
--- a/packages/angular_devkit/build_webpack/builders.json
+++ b/packages/angular_devkit/build_webpack/builders.json
@@ -1,6 +1,12 @@
 {
   "$schema": "../architect/src/builders-schema.json",
   "builders": {
+    "build": {
+      "implementation": "./src/webpack/index2",
+      "class": "./src/webpack",
+      "schema": "./src/webpack/schema.json",
+      "description": "Build a webpack app."
+    },
     "webpack": {
       "implementation": "./src/webpack/index2",
       "class": "./src/webpack",

From 220cbdea43dd3ad9d55bb300db70fecaafad25df Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 27 Feb 2019 10:23:25 +0000
Subject: [PATCH 0822/1703] ci: use fallback cache

Port of https://github.com/angular/angular/pull/28545
---
 .circleci/config.yml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b686450d52af..a618d897e74d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,8 +12,11 @@
 ## IMPORTANT
 # If you change the `docker_image` version, also change the `cache_key` suffix and the version of
 # `com_github_bazelbuild_buildtools` in the `/WORKSPACE` file.
+# If you change the cache key prefix, also sync the restore_cache fallback to match.
+# Keep the static part of the cache key as prefix to enable correct fallbacks.
+# See https://circleci.com/docs/2.0/caching/#restoring-cache for how prefixes work in CircleCI.
 var_1: &docker_image angular/ngcontainer:0.7.0
-var_2: &cache_key angular_devkit-{{ checksum "yarn.lock" }}-0.7.0
+var_2: &cache_key angular_devkit-0.7.0-{{ checksum "yarn.lock" }}
 var_3: &node_8_docker_image angular/ngcontainer:0.3.3
 
 # Settings common to each job
@@ -27,8 +30,12 @@ anchor_1: &defaults
 # See https://discuss.circleci.com/t/1662
 anchor_2: &post_checkout
   post: git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge"
-anchor_3: &root_package_lock_key
-  key: *cache_key
+anchor_3: &restore_cache
+  restore_cache:
+    keys:
+      - *cache_key
+      # This fallback should be the cache_key without variables.
+      - angular_devkit-0.7.0-
 anchor_4: &attach_options
   at: .
 
@@ -39,14 +46,14 @@ jobs:
     <<: *defaults
     steps:
       - checkout: *post_checkout
-      - restore_cache: *root_package_lock_key
+      - *restore_cache
       - run: yarn install --frozen-lockfile
       - persist_to_workspace:
           root: .
           paths:
             - ./*
       - save_cache:
-          <<: *root_package_lock_key
+          key: *cache_key
           paths:
             - ~/.cache/yarn
 

From 50a7f4ad8dcd3fcd1889026ddc27aaabd2d41385 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 27 Feb 2019 10:25:14 +0000
Subject: [PATCH 0823/1703] ci: update circleci post checkout to v2 syntax

Port of https://github.com/angular/angular/pull/28472
---
 .circleci/config.yml | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a618d897e74d..659aa63dc4ac 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -29,7 +29,23 @@ anchor_1: &defaults
 # Similar to travis behavior, but not quite the same.
 # See https://discuss.circleci.com/t/1662
 anchor_2: &post_checkout
-  post: git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge"
+  run:
+    name: Post checkout step
+    command: >
+      if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then
+        # Fetch the head and merge commits for this PR.
+        git fetch origin +refs/pull/$CIRCLE_PR_NUMBER/head:pr/$CIRCLE_PR_NUMBER/head
+        git fetch origin +refs/pull/$CIRCLE_PR_NUMBER/merge:pr/$CIRCLE_PR_NUMBER/merge
+        # Checkout the merged PR for testing as CircleCI will just use the PR head otherwise.
+        git checkout -qf pr/$CIRCLE_PR_NUMBER/merge
+        # Reset the merge commit into its PR head.
+        git reset pr/$CIRCLE_PR_NUMBER/head
+        # Commit the merge changes into the head of the PR.
+        # This way we keep the last commit message.
+        git config user.name "angular-ci"
+        git config user.email "angular-ci"
+        git commit . --amend --no-edit
+      fi
 anchor_3: &restore_cache
   restore_cache:
     keys:
@@ -45,7 +61,8 @@ jobs:
   install:
     <<: *defaults
     steps:
-      - checkout: *post_checkout
+      - checkout
+      - *post_checkout
       - *restore_cache
       - run: yarn install --frozen-lockfile
       - persist_to_workspace:

From 3c0bb12091d696a75ac9671136acd6afb1a59806 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 27 Feb 2019 11:47:44 -0800
Subject: [PATCH 0824/1703] build: add bootstrap debug logs

---
 lib/bootstrap-local.js | 20 ++++++++++++++++++++
 package.json           |  2 ++
 yarn.lock              |  5 +++++
 3 files changed, 27 insertions(+)

diff --git a/lib/bootstrap-local.js b/lib/bootstrap-local.js
index c8194e11fb29..c6ff2e45f6d9 100644
--- a/lib/bootstrap-local.js
+++ b/lib/bootstrap-local.js
@@ -7,6 +7,11 @@
  */
 /* eslint-disable no-console */
 'use strict';
+const debug = require('debug');
+const debugLocal = debug('ng:local');
+const debugBuildEjs = debug('ng:local:build:ejs');
+const debugBuildSchema = debug('ng:local:build:schema');
+const debugBuildTs = debug('ng:local:build:ts');
 
 const child_process = require('child_process');
 const fs = require('fs');
@@ -16,12 +21,15 @@ const ts = require('typescript');
 
 const tmpRoot = temp.mkdirSync('angular-devkit-');
 
+debugLocal('starting bootstrap local');
+
 const compilerOptions = ts.readConfigFile(path.join(__dirname, '../tsconfig.json'), p => {
   return fs.readFileSync(p, 'utf-8');
 }).config;
 
 let _istanbulRequireHook = null;
 if (process.env['CODE_COVERAGE'] || process.argv.indexOf('--code-coverage') !== -1) {
+  debugLocal('setup code coverage');
   _istanbulRequireHook = require('./istanbul-local').istanbulRequireHook;
   // async keyword isn't supported by the Esprima version used by Istanbul version used by us.
   // TODO: update istanbul to istanbul-lib-* (see http://istanbul.js.org/) and remove this hack.
@@ -32,6 +40,7 @@ if (process.env['CODE_COVERAGE'] || process.argv.indexOf('--code-coverage') !==
 // Check if we need to profile this CLI run.
 let profiler = null;
 if (process.env['DEVKIT_PROFILING']) {
+  debugLocal('setup profiling');
   try {
     profiler = require('v8-profiler-node8');
   } catch (err) {
@@ -47,6 +56,7 @@ if (process.env['DEVKIT_PROFILING']) {
       const profileData = JSON.stringify(cpuProfile);
       const filePath = path.resolve(process.cwd(), process.env.DEVKIT_PROFILING) + '.cpuprofile';
 
+      debugLocal('saving profiling data');
       console.log(`Profiling data saved in "${filePath}": ${profileData.length} bytes`);
       fs.writeFileSync(filePath, profileData);
     }
@@ -62,6 +72,7 @@ if (process.env['DEVKIT_PROFILING']) {
 }
 
 if (process.env['DEVKIT_LONG_STACK_TRACE']) {
+  debugLocal('setup long stack trace');
   Error.stackTraceLimit = Infinity;
 }
 
@@ -81,6 +92,8 @@ require.extensions['.ts'] = function (m, filename) {
     return m._compile(fs.readFileSync(filename), filename);
   }
 
+  debugBuildTs(filename);
+
   // Node requires all require hooks to be sync.
   const source = fs.readFileSync(filename).toString();
 
@@ -90,6 +103,7 @@ require.extensions['.ts'] = function (m, filename) {
     if (_istanbulRequireHook) {
       result = _istanbulRequireHook(result, filename);
     }
+    debugBuildTs('done');
 
     // Send it to node to execute.
     return m._compile(result, filename);
@@ -102,10 +116,13 @@ require.extensions['.ts'] = function (m, filename) {
 
 
 require.extensions['.ejs'] = function (m, filename) {
+  debugBuildEjs(filename);
+
   const source = fs.readFileSync(filename).toString();
   const template = require('@angular-devkit/core').template;
   const result = template(source, { sourceURL: filename, sourceMap: true });
 
+  debugBuildEjs('done');
   return m._compile(result.source.replace(/return/, 'module.exports.default = '), filename);
 };
 
@@ -157,6 +174,8 @@ if (!__dirname.match(new RegExp(`\\${path.sep}node_modules\\${path.sep}`))) {
           if (fs.existsSync(maybeTsPath)) {
             return maybeTsPath;
           } else {
+            debugBuildSchema('%s', resolved);
+
             // This script has the be synchronous, so we spawnSync instead of, say, requiring the runner and calling
             // the method directly.
             const tmpJsonSchemaPath = path.join(tmpRoot, maybeTsPath.replace(/[^0-9a-zA-Z.]/g, '_'));
@@ -166,6 +185,7 @@ if (!__dirname.match(new RegExp(`\\${path.sep}node_modules\\${path.sep}`))) {
                 child_process.spawnSync('node', [quicktypeRunnerPath, resolved, tmpJsonSchemaPath]);
               }
 
+              debugBuildSchema('done');
               return tmpJsonSchemaPath;
             } catch (_) {
               // Just return resolvedPath and let Node deals with it.
diff --git a/package.json b/package.json
index 6823e18f4620..0360c86103fb 100644
--- a/package.json
+++ b/package.json
@@ -63,8 +63,10 @@
     ]
   },
   "dependencies": {
+    "@types/debug": "^4.1.2",
     "@types/node-fetch": "^2.1.6",
     "@types/progress": "^2.0.3",
+    "debug": "^4.1.1",
     "glob": "^7.0.3",
     "node-fetch": "^2.2.0",
     "puppeteer": "1.12.2",
diff --git a/yarn.lock b/yarn.lock
index 634f403763aa..3ae32cc8ccb9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -291,6 +291,11 @@
     "@types/minimatch" "*"
     "@types/webpack" "*"
 
+"@types/debug@^4.1.2":
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.2.tgz#84824e9259fc583dd9385635738359c9582f7f82"
+  integrity sha512-jkf6UiWUjcOqdQbatbvOm54/YbCdjt3JjiAzT/9KS2XtMmOkYHdKsI5u8fulhbuTUuiqNBfa6J5GSDiwjK+zLA==
+
 "@types/estree@0.0.39":
   version "0.0.39"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"

From ef11c9fbc912a8df202973068222951ff5c5d116 Mon Sep 17 00:00:00 2001
From: Minko Gechev <mgechev@google.com>
Date: Wed, 27 Feb 2019 16:40:55 -0800
Subject: [PATCH 0825/1703] release: v8.0.0-beta.3

---
 .monorepo.json                                | 72 +++++++++----------
 .../angular/utility/latest-versions.ts        |  4 +-
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index 6d3eb2415048..a254c09c5222 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,16 +42,16 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.14.0-beta.2",
-      "hash": "6d499b7cc1fecfdca1ee530d68af2743"
+      "version": "0.14.0-beta.3",
+      "hash": "4eecb4a76317039defc5c2b4bd31e4f9"
     },
     "@_/builders": {
       "version": "0.14.0-beta.1",
       "hash": "569aef8bc23693c344e71b9755e62c50"
     },
     "devkit": {
-      "version": "0.14.0-beta.2",
-      "hash": "f4155e92618ee6993c6f694116c30bea"
+      "version": "0.14.0-beta.3",
+      "hash": "fc3a99ad529bdf3fe5b3a3d0e97f258d"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -62,15 +62,15 @@
           "url": "/packages/angular/cli/README.md"
         }
       ],
-      "version": "8.0.0-beta.2",
+      "version": "8.0.0-beta.3",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "b03ed9014b1a21a430224d09a75a1529"
+      "hash": "ca11c3f7fdae11af8f89413e7d791f7c"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.14.0-beta.2",
-      "hash": "3bf43188af6a0db1f2d91181635ebc13",
+      "version": "0.14.0-beta.3",
+      "hash": "7e583aacd54726f969e1084514cee788",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -81,21 +81,21 @@
           "url": "/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.14.0-beta.2",
-      "hash": "576c3ba30f7079d25574a7ee7cf38e1e",
+      "version": "0.14.0-beta.3",
+      "hash": "68d275a47b7e9f8793c14d2c5a80a84a",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.14.0-beta.2",
-      "hash": "946fbd673b1bc1c7e3e295482f63146b",
+      "version": "0.14.0-beta.3",
+      "hash": "ae0534f638cd2f1a844eeecf975204ed",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
       "name": "Benchmark",
       "section": "Tooling",
-      "version": "1.2.0-beta.2",
-      "hash": "2e9e910a18948b91c75d89401de25d92"
+      "version": "1.2.0-beta.3",
+      "hash": "9bb1e744ce37a6db843463229e70f60e"
     },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
@@ -105,8 +105,8 @@
           "url": "/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.14.0-beta.2",
-      "hash": "ce2f3ab5e27be7cf1a2ddbf4da6ff872",
+      "version": "0.14.0-beta.3",
+      "hash": "6c0cde3d776dd6c07b393a521fccd5b5",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -117,8 +117,8 @@
           "url": "/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.14.0-beta.2",
-      "hash": "af2ce927c08dee654f48d2dc9c66eb8c",
+      "version": "0.14.0-beta.3",
+      "hash": "29188905b7a4636082cff555d52ab36f",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -129,8 +129,8 @@
           "url": "/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.14.0-beta.2",
-      "hash": "a10e2a0a49a132804b86c66e0aec7ca2",
+      "version": "0.14.0-beta.3",
+      "hash": "4092c89af739d15ea39717fca9af554f",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -141,9 +141,9 @@
           "url": "/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.14.0-beta.2",
+      "version": "0.14.0-beta.3",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "947b165cf6d3f4a83969d61995b59398"
+      "hash": "070c9669b644637755e3b8e0797db1a9"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -153,8 +153,8 @@
           "url": "/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "8.0.0-beta.2",
-      "hash": "2605c9237089b5a435e22d40e17a6446",
+      "version": "8.0.0-beta.3",
+      "hash": "b1b789a8e726e523fe275ad32f971a4f",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -165,43 +165,43 @@
           "url": "/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "8.0.0-beta.2",
-      "hash": "6d3ccb48e590f72d9938986b305f5917",
+      "version": "8.0.0-beta.3",
+      "hash": "fbd2b2533d2e705903462836d642f7ab",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.14.0-beta.2",
-      "hash": "077df71a7393d41fa7a8c682653df480",
+      "version": "0.14.0-beta.3",
+      "hash": "627ad390bcbd31b1b604f248a4ed78ae",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "8.0.0-beta.2",
+      "version": "8.0.0-beta.3",
       "section": "Misc",
-      "hash": "c043695955614e9b16a54c1898ddc814",
+      "hash": "c83720ed5c33b6ff57b36bd6e574f4e7",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "8.0.0-beta.2",
-      "hash": "d2796741df237d275312d72f83a9e15d",
+      "version": "8.0.0-beta.3",
+      "hash": "758b7a78c0ef6669e30006ec2ffd97fe",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.14.0-beta.2",
+      "version": "0.14.0-beta.3",
       "section": "Schematics",
-      "hash": "e58845b72332ba96f1ea569b44fcf96b",
+      "hash": "76b3db9bd9d1be277777b718d8cb271f",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.14.0-beta.2",
+      "version": "0.14.0-beta.3",
       "section": "Schematics",
-      "hash": "578aa7c163808ccc04c8138723d7b118",
+      "hash": "cf8c7df96f0af7de9d41f89a613d6bf3",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index f245ddfc71c7..e73750bc5416 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -14,6 +14,6 @@ export const latestVersions = {
   TypeScript: '~3.2.2',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.14.0-beta.2',
-  DevkitBuildNgPackagr: '~0.14.0-beta.2',
+  DevkitBuildAngular: '~0.14.0-beta.3',
+  DevkitBuildNgPackagr: '~0.14.0-beta.3',
 };

From 242ebd932f07742c3ded93af1549b0297becb9d4 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Thu, 28 Feb 2019 10:24:44 -0800
Subject: [PATCH 0826/1703] Revert "feat(@schematics/angular): recommend
 plugins that John Papa recommends"

This reverts commit 3a68b8cf9696e678308da65ca59b53329981c94f.
---
 .../update-8.0.0.ts                           |  8 +-----
 .../update-8.0.0_spec.ts                      | 25 ++++++++-----------
 .../__dot__vscode/extensions.json.template    |  8 +-----
 3 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0.ts b/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0.ts
index 76ae07838586..9b4bba7225e7 100644
--- a/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0.ts
+++ b/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0.ts
@@ -18,13 +18,7 @@ const addExtensionRecommendations = updateJsonInTree(
     [
       'angular.ng-template',
       'nrwl.angular-console',
-      'ms-vscode.vscode-typescript-tslint-plugin',
-      'Mikael.Angular-BeastCode',
-      'EditorConfig.EditorConfig',
-      'msjsdiag.debugger-for-chrome',
-      'eg2.vscode-npm-script',
-      'PKief.material-icon-theme',
-      'natewallace.angular2-inline'].forEach(extension => {
+      'ms-vscode.vscode-typescript-tslint-plugin'].forEach(extension => {
         json.recommendations = json.recommendations || [];
         if (!json.recommendations.includes(extension)) {
           json.recommendations.push(extension);
diff --git a/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0_spec.ts b/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0_spec.ts
index d5b7ed948f2e..f45de65b9f5a 100644
--- a/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0_spec.ts
+++ b/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0_spec.ts
@@ -9,18 +9,6 @@ import { Tree } from '@angular-devkit/schematics';
 import { SchematicTestRunner } from '@angular-devkit/schematics/testing';
 import { readJsonInTree, serializeJson, updateJsonInTree } from './ast-utils';
 
-const recommendations = [
-  'angular.ng-template',
-  'nrwl.angular-console',
-  'ms-vscode.vscode-typescript-tslint-plugin',
-  'Mikael.Angular-BeastCode',
-  'EditorConfig.EditorConfig',
-  'msjsdiag.debugger-for-chrome',
-  'eg2.vscode-npm-script',
-  'PKief.material-icon-theme',
-  'natewallace.angular2-inline',
-];
-
 describe('Update 8.0.0', () => {
   let initialTree: Tree;
   let schematicRunner: SchematicTestRunner;
@@ -46,7 +34,10 @@ describe('Update 8.0.0', () => {
       .runSchematicAsync('migration-07', {}, initialTree)
       .toPromise();
 
-    expect(readJsonInTree(result, '.vscode/extensions.json')).toEqual({recommendations});
+    expect(readJsonInTree(result, '.vscode/extensions.json')).toEqual({
+      recommendations: [
+        'angular.ng-template', 'nrwl.angular-console', 'ms-vscode.vscode-typescript-tslint-plugin'],
+    });
   });
 
   it('should add to existing vscode extension recommendations', async () => {
@@ -55,7 +46,9 @@ describe('Update 8.0.0', () => {
         updateJsonInTree('.vscode/extensions.json', () => ({
           recommendations: [
             'eamodio.gitlens',
-            ...recommendations],
+            'angular.ng-template',
+            'nrwl.angular-console',
+            'ms-vscode.vscode-typescript-tslint-plugin'],
         })),
         initialTree,
       )
@@ -68,7 +61,9 @@ describe('Update 8.0.0', () => {
     expect(readJsonInTree(result, '.vscode/extensions.json')).toEqual({
       recommendations: [
         'eamodio.gitlens',
-        ...recommendations],
+        'angular.ng-template',
+        'nrwl.angular-console',
+        'ms-vscode.vscode-typescript-tslint-plugin'],
     });
   });
 });
diff --git a/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template b/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template
index 9b4375bca6c0..668282bf7a5f 100644
--- a/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template
+++ b/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template
@@ -2,12 +2,6 @@
   "recommendations": [
     "angular.ng-template",
     "nrwl.angular-console",
-    "ms-vscode.vscode-typescript-tslint-plugin",
-    "Mikael.Angular-BeastCode",
-    "EditorConfig.EditorConfig",
-    "msjsdiag.debugger-for-chrome",
-    "eg2.vscode-npm-script",
-    "PKief.material-icon-theme",
-    "natewallace.angular2-inline"
+    "ms-vscode.vscode-typescript-tslint-plugin"
   ]
 }

From 71428bd9cba1c25c98c55d8d5f3e55951413cdbd Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Thu, 28 Feb 2019 10:24:46 -0800
Subject: [PATCH 0827/1703] Revert "feat(@angular/cli): Add VsCode
 recommendation for Angular Console"

This reverts commit 3d6ae631788b600a1b80132ae407f15ad3dc65aa.
---
 .../update-vscode-recommendations/update-8.0.0.ts | 15 ++++++---------
 .../update-8.0.0_spec.ts                          | 13 +++----------
 .../files/__dot__vscode/extensions.json.template  |  1 -
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0.ts b/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0.ts
index 9b4bba7225e7..41101d48def4 100644
--- a/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0.ts
+++ b/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0.ts
@@ -15,15 +15,12 @@ export default function (): Rule {
 const addExtensionRecommendations = updateJsonInTree(
   '.vscode/extensions.json',
   (json: { recommendations?: string[] }) => {
-    [
-      'angular.ng-template',
-      'nrwl.angular-console',
-      'ms-vscode.vscode-typescript-tslint-plugin'].forEach(extension => {
-        json.recommendations = json.recommendations || [];
-        if (!json.recommendations.includes(extension)) {
-          json.recommendations.push(extension);
-        }
-      });
+    ['angular.ng-template', 'ms-vscode.vscode-typescript-tslint-plugin'].forEach(extension => {
+      json.recommendations = json.recommendations || [];
+      if (!json.recommendations.includes(extension)) {
+        json.recommendations.push(extension);
+      }
+    });
 
     return json;
   },
diff --git a/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0_spec.ts b/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0_spec.ts
index f45de65b9f5a..40be71afa9a3 100644
--- a/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0_spec.ts
+++ b/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0_spec.ts
@@ -35,8 +35,7 @@ describe('Update 8.0.0', () => {
       .toPromise();
 
     expect(readJsonInTree(result, '.vscode/extensions.json')).toEqual({
-      recommendations: [
-        'angular.ng-template', 'nrwl.angular-console', 'ms-vscode.vscode-typescript-tslint-plugin'],
+      recommendations: ['angular.ng-template', 'ms-vscode.vscode-typescript-tslint-plugin'],
     });
   });
 
@@ -45,10 +44,7 @@ describe('Update 8.0.0', () => {
       .callRule(
         updateJsonInTree('.vscode/extensions.json', () => ({
           recommendations: [
-            'eamodio.gitlens',
-            'angular.ng-template',
-            'nrwl.angular-console',
-            'ms-vscode.vscode-typescript-tslint-plugin'],
+            'eamodio.gitlens', 'angular.ng-template', 'ms-vscode.vscode-typescript-tslint-plugin'],
         })),
         initialTree,
       )
@@ -60,10 +56,7 @@ describe('Update 8.0.0', () => {
 
     expect(readJsonInTree(result, '.vscode/extensions.json')).toEqual({
       recommendations: [
-        'eamodio.gitlens',
-        'angular.ng-template',
-        'nrwl.angular-console',
-        'ms-vscode.vscode-typescript-tslint-plugin'],
+        'eamodio.gitlens', 'angular.ng-template', 'ms-vscode.vscode-typescript-tslint-plugin'],
     });
   });
 });
diff --git a/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template b/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template
index 668282bf7a5f..a69da09b88fd 100644
--- a/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template
+++ b/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template
@@ -1,7 +1,6 @@
 {
   "recommendations": [
     "angular.ng-template",
-    "nrwl.angular-console",
     "ms-vscode.vscode-typescript-tslint-plugin"
   ]
 }

From 4a093e5e3801b5514f9d3c405baee5d6abba4120 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Thu, 28 Feb 2019 10:25:28 -0800
Subject: [PATCH 0828/1703] Revert "feat(@angular/cli): Add VsCode extension
 recommendations"

This reverts commit d9166b04fccc708bc3856a6b243a8752120f312d.
---
 .../migrations/migration-collection.json      |  5 --
 .../ast-utils.ts                              | 41 ------------
 .../update-8.0.0.ts                           | 27 --------
 .../update-8.0.0_spec.ts                      | 62 -------------------
 .../__dot__vscode/extensions.json.template    |  6 --
 5 files changed, 141 deletions(-)
 delete mode 100644 packages/schematics/angular/migrations/update-vscode-recommendations/ast-utils.ts
 delete mode 100644 packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0.ts
 delete mode 100644 packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0_spec.ts
 delete mode 100644 packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template

diff --git a/packages/schematics/angular/migrations/migration-collection.json b/packages/schematics/angular/migrations/migration-collection.json
index a14615222e3a..0e03d24ae78f 100644
--- a/packages/schematics/angular/migrations/migration-collection.json
+++ b/packages/schematics/angular/migrations/migration-collection.json
@@ -29,11 +29,6 @@
       "version": "7.0.3",
       "factory": "./update-7/index#updateDevkitBuildNgPackagr",
       "description": "Update an Angular CLI project to version 7."
-    },
-    "migration-07": {
-      "version": "8.0.0",
-      "factory": "./update-vscode-recommendations/update-8.0.0",
-      "description": "Update an Angular CLI project to version 8.0.0"
     }
   }
 }
diff --git a/packages/schematics/angular/migrations/update-vscode-recommendations/ast-utils.ts b/packages/schematics/angular/migrations/update-vscode-recommendations/ast-utils.ts
deleted file mode 100644
index 88bfc903fc08..000000000000
--- a/packages/schematics/angular/migrations/update-vscode-recommendations/ast-utils.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { Rule, Tree } from '@angular-devkit/schematics';
-
-export function readJsonInTree<T>(host: Tree, path: string): T {
-  if (!host.exists(path)) {
-    throw new Error(`Cannot find ${path}`);
-  }
-
-  const json = host.read(path);
-  if (!json) {
-    throw new Error(`Cannot read ${path}`);
-  }
-
-  return JSON.parse(json.toString('utf-8'));
-}
-
-export function serializeJson<T>(json: T): string {
-  return `${JSON.stringify(json, null, 2)}\n`;
-}
-
-export function updateJsonInTree<T, O = T>(
-  path: string,
-  callback: (json: T) => O,
-): Rule {
-  return (host: Tree): Tree => {
-    if (!host.exists(path)) {
-      host.create(path, serializeJson(callback({} as T)));
-
-      return host;
-    }
-    host.overwrite(path, serializeJson(callback(readJsonInTree(host, path))));
-
-    return host;
-  };
-}
diff --git a/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0.ts b/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0.ts
deleted file mode 100644
index 41101d48def4..000000000000
--- a/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { Rule, chain } from '@angular-devkit/schematics';
-import { updateJsonInTree } from './ast-utils';
-
-export default function (): Rule {
-  return chain([addExtensionRecommendations]);
-}
-
-const addExtensionRecommendations = updateJsonInTree(
-  '.vscode/extensions.json',
-  (json: { recommendations?: string[] }) => {
-    ['angular.ng-template', 'ms-vscode.vscode-typescript-tslint-plugin'].forEach(extension => {
-      json.recommendations = json.recommendations || [];
-      if (!json.recommendations.includes(extension)) {
-        json.recommendations.push(extension);
-      }
-    });
-
-    return json;
-  },
-);
diff --git a/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0_spec.ts b/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0_spec.ts
deleted file mode 100644
index 40be71afa9a3..000000000000
--- a/packages/schematics/angular/migrations/update-vscode-recommendations/update-8.0.0_spec.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { Tree } from '@angular-devkit/schematics';
-import { SchematicTestRunner } from '@angular-devkit/schematics/testing';
-import { readJsonInTree, serializeJson, updateJsonInTree } from './ast-utils';
-
-describe('Update 8.0.0', () => {
-  let initialTree: Tree;
-  let schematicRunner: SchematicTestRunner;
-
-  beforeEach(() => {
-    initialTree = Tree.empty();
-
-    initialTree.create(
-      'package.json',
-      serializeJson({
-        devDependencies: { '@angular/cli': '7.1.0', typescript: '~3.1.0' },
-      }),
-    );
-
-    schematicRunner = new SchematicTestRunner(
-      'migrations',
-      require.resolve('../migration-collection.json'),
-    );
-  });
-
-  it('should add vscode extension recommendations', async () => {
-    const result = await schematicRunner
-      .runSchematicAsync('migration-07', {}, initialTree)
-      .toPromise();
-
-    expect(readJsonInTree(result, '.vscode/extensions.json')).toEqual({
-      recommendations: ['angular.ng-template', 'ms-vscode.vscode-typescript-tslint-plugin'],
-    });
-  });
-
-  it('should add to existing vscode extension recommendations', async () => {
-    initialTree = await schematicRunner
-      .callRule(
-        updateJsonInTree('.vscode/extensions.json', () => ({
-          recommendations: [
-            'eamodio.gitlens', 'angular.ng-template', 'ms-vscode.vscode-typescript-tslint-plugin'],
-        })),
-        initialTree,
-      )
-      .toPromise();
-
-    const result = await schematicRunner
-      .runSchematicAsync('migration-07', {}, initialTree)
-      .toPromise();
-
-    expect(readJsonInTree(result, '.vscode/extensions.json')).toEqual({
-      recommendations: [
-        'eamodio.gitlens', 'angular.ng-template', 'ms-vscode.vscode-typescript-tslint-plugin'],
-    });
-  });
-});
diff --git a/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template b/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template
deleted file mode 100644
index a69da09b88fd..000000000000
--- a/packages/schematics/angular/workspace/files/__dot__vscode/extensions.json.template
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "recommendations": [
-    "angular.ng-template",
-    "ms-vscode.vscode-typescript-tslint-plugin"
-  ]
-}

From 214e8efaa73dab3f88b4ffce242238af3a065da3 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Thu, 28 Feb 2019 17:53:00 -0800
Subject: [PATCH 0829/1703] release: v8.0.0-beta.4

---
 .monorepo.json                                | 38 +++++++++----------
 .../angular/utility/latest-versions.ts        |  4 +-
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index a254c09c5222..a0aa4bb2fece 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,15 +42,15 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.14.0-beta.3",
+      "version": "0.14.0-beta.4",
       "hash": "4eecb4a76317039defc5c2b4bd31e4f9"
     },
     "@_/builders": {
-      "version": "0.14.0-beta.1",
+      "version": "0.14.0-beta.4",
       "hash": "569aef8bc23693c344e71b9755e62c50"
     },
     "devkit": {
-      "version": "0.14.0-beta.3",
+      "version": "0.14.0-beta.4",
       "hash": "fc3a99ad529bdf3fe5b3a3d0e97f258d"
     },
     "@angular/cli": {
@@ -62,14 +62,14 @@
           "url": "/packages/angular/cli/README.md"
         }
       ],
-      "version": "8.0.0-beta.3",
+      "version": "8.0.0-beta.4",
       "snapshotRepo": "angular/cli-builds",
       "hash": "ca11c3f7fdae11af8f89413e7d791f7c"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.14.0-beta.3",
+      "version": "0.14.0-beta.4",
       "hash": "7e583aacd54726f969e1084514cee788",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
@@ -81,20 +81,20 @@
           "url": "/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.14.0-beta.3",
+      "version": "0.14.0-beta.4",
       "hash": "68d275a47b7e9f8793c14d2c5a80a84a",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.14.0-beta.3",
+      "version": "0.14.0-beta.4",
       "hash": "ae0534f638cd2f1a844eeecf975204ed",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
       "name": "Benchmark",
       "section": "Tooling",
-      "version": "1.2.0-beta.3",
+      "version": "1.2.0-beta.4",
       "hash": "9bb1e744ce37a6db843463229e70f60e"
     },
     "@angular-devkit/build-optimizer": {
@@ -105,7 +105,7 @@
           "url": "/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.14.0-beta.3",
+      "version": "0.14.0-beta.4",
       "hash": "6c0cde3d776dd6c07b393a521fccd5b5",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
@@ -117,7 +117,7 @@
           "url": "/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.14.0-beta.3",
+      "version": "0.14.0-beta.4",
       "hash": "29188905b7a4636082cff555d52ab36f",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
@@ -129,7 +129,7 @@
           "url": "/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.14.0-beta.3",
+      "version": "0.14.0-beta.4",
       "hash": "4092c89af739d15ea39717fca9af554f",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
@@ -141,7 +141,7 @@
           "url": "/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.14.0-beta.3",
+      "version": "0.14.0-beta.4",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
       "hash": "070c9669b644637755e3b8e0797db1a9"
     },
@@ -153,7 +153,7 @@
           "url": "/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "8.0.0-beta.3",
+      "version": "8.0.0-beta.4",
       "hash": "b1b789a8e726e523fe275ad32f971a4f",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
@@ -165,20 +165,20 @@
           "url": "/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "8.0.0-beta.3",
+      "version": "8.0.0-beta.4",
       "hash": "fbd2b2533d2e705903462836d642f7ab",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.14.0-beta.3",
+      "version": "0.14.0-beta.4",
       "hash": "627ad390bcbd31b1b604f248a4ed78ae",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "8.0.0-beta.3",
+      "version": "8.0.0-beta.4",
       "section": "Misc",
       "hash": "c83720ed5c33b6ff57b36bd6e574f4e7",
       "snapshotRepo": "angular/ngtools-webpack-builds"
@@ -186,20 +186,20 @@
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "8.0.0-beta.3",
+      "version": "8.0.0-beta.4",
       "hash": "758b7a78c0ef6669e30006ec2ffd97fe",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.14.0-beta.3",
+      "version": "0.14.0-beta.4",
       "section": "Schematics",
       "hash": "76b3db9bd9d1be277777b718d8cb271f",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.14.0-beta.3",
+      "version": "0.14.0-beta.4",
       "section": "Schematics",
       "hash": "cf8c7df96f0af7de9d41f89a613d6bf3",
       "snapshotRepo": "angular/schematics-update-builds"
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index e73750bc5416..b8b3ede7f7e9 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -14,6 +14,6 @@ export const latestVersions = {
   TypeScript: '~3.2.2',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.14.0-beta.3',
-  DevkitBuildNgPackagr: '~0.14.0-beta.3',
+  DevkitBuildAngular: '~0.14.0-beta.4',
+  DevkitBuildNgPackagr: '~0.14.0-beta.4',
 };

From 920be3ab397f5f3315a960630274581256f9986b Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 20 Feb 2019 21:34:03 -0500
Subject: [PATCH 0830/1703] build: integrate prettier code formatter

---
 .lintstagedrc                  |   5 +
 .prettierrc                    |   5 +
 etc/rules/Rule.ts              |  27 --
 etc/rules/singleEofLineRule.ts |  59 ----
 package.json                   |  14 +-
 tslint.json                    |  66 +----
 yarn.lock                      | 498 +++++++++++++++++++++++++++++++--
 7 files changed, 500 insertions(+), 174 deletions(-)
 create mode 100644 .lintstagedrc
 create mode 100644 .prettierrc
 delete mode 100644 etc/rules/Rule.ts
 delete mode 100644 etc/rules/singleEofLineRule.ts

diff --git a/.lintstagedrc b/.lintstagedrc
new file mode 100644
index 000000000000..9ceca5b0ae4a
--- /dev/null
+++ b/.lintstagedrc
@@ -0,0 +1,5 @@
+{
+  "linters": {
+    "*.{js,ts}": ["precise-commits", "git add"]
+  }
+}
\ No newline at end of file
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 000000000000..0bc68a7ee272
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,5 @@
+{
+  "printWidth": 100,
+  "singleQuote": true,
+  "trailingComma": "all"
+}
\ No newline at end of file
diff --git a/etc/rules/Rule.ts b/etc/rules/Rule.ts
deleted file mode 100644
index 43a7df63b777..000000000000
--- a/etc/rules/Rule.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import * as Lint from 'tslint';
-import * as ts from 'typescript';
-
-
-// An empty rule so that tslint does not error on rules '//' (which are comments).
-export class Rule extends Lint.Rules.AbstractRule {
-  public static metadata: Lint.IRuleMetadata = {
-    ruleName: '//',
-    type: 'typescript',
-    description: ``,
-    rationale: '',
-    options: null,
-    optionsDescription: `Not configurable.`,
-    typescriptOnly: false,
-  };
-
-  public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
-    return [];
-  }
-}
diff --git a/etc/rules/singleEofLineRule.ts b/etc/rules/singleEofLineRule.ts
deleted file mode 100644
index b2882e43ffb9..000000000000
--- a/etc/rules/singleEofLineRule.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import * as Lint from 'tslint';
-import * as ts from 'typescript';
-
-
-export class Rule extends Lint.Rules.AbstractRule {
-  public static metadata: Lint.IRuleMetadata = {
-    ruleName: 'single-eof-line',
-    type: 'style',
-    description: `Ensure the file ends with a single new line.`,
-    rationale: `This is similar to eofline, but ensure an exact count instead of just any new
-                line.`,
-    options: null,
-    optionsDescription: `Two integers indicating minimum and maximum number of new lines.`,
-    typescriptOnly: false,
-  };
-
-  public static FAILURE_STRING = 'You need to have a single blank line at end of file.';
-
-  public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
-    const length = sourceFile.text.length;
-    if (length === 0) {
-      // Allow empty files.
-      return [];
-    }
-
-    const matchEof = /\r?\n((\r?\n)*)$/.exec(sourceFile.text);
-    if (!matchEof) {
-      const lines = sourceFile.getLineStarts();
-      const fix = Lint.Replacement.appendText(
-        length,
-        sourceFile.text[lines[1] - 2] === '\r' ? '\r\n' : '\n',
-      );
-
-      return [
-        new Lint.RuleFailure(sourceFile, length, length, Rule.FAILURE_STRING, this.ruleName, fix),
-      ];
-    } else if (matchEof[1]) {
-      const lines = sourceFile.getLineStarts();
-      const fix = Lint.Replacement.replaceFromTo(
-        matchEof.index,
-        length,
-        sourceFile.text[lines[1] - 2] === '\r' ? '\r\n' : '\n',
-      );
-
-      return [
-        new Lint.RuleFailure(sourceFile, length, length, Rule.FAILURE_STRING, this.ruleName, fix),
-      ];
-    }
-
-    return [];
-  }
-}
diff --git a/package.json b/package.json
index 0360c86103fb..0ad214df0a0c 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
     "build-tsc": "tsc -p tsconfig.json",
     "fix": "npm run admin -- lint --fix",
     "lint": "npm run admin -- lint",
+    "precise-commits": "precise-commits",
     "prebuildifier": "bazel build --noshow_progress @com_github_bazelbuild_buildtools//buildifier",
     "buildifier": "find . -type f \\( -name BUILD -or -name BUILD.bazel \\) ! -path \"*/node_modules/*\" | xargs $(bazel info bazel-bin)/external/com_github_bazelbuild_buildtools/buildifier/buildifier",
     "templates": "node ./bin/devkit-admin templates",
@@ -33,7 +34,6 @@
     "test:watch": "nodemon --watch packages -e ts ./bin/devkit-admin test",
     "validate": "node ./bin/devkit-admin validate",
     "validate-commits": "./bin/devkit-admin validate-commits",
-    "prepush": "node ./bin/devkit-admin hooks/pre-push",
     "preinstall": "node ./tools/yarn/check-yarn.js",
     "webdriver-update": "webdriver-manager update --standalone false --gecko false --versions.chrome 2.45"
   },
@@ -103,7 +103,7 @@
     "conventional-commits-parser": "^3.0.0",
     "gh-got": "^8.0.1",
     "git-raw-commits": "^2.0.0",
-    "husky": "^0.14.3",
+    "husky": "^1.3.1",
     "istanbul": "^0.4.5",
     "jasmine": "^2.6.0",
     "jasmine-spec-reporter": "^4.2.1",
@@ -111,12 +111,15 @@
     "karma-jasmine": "^2.0.1",
     "karma-jasmine-html-reporter": "^1.4.0",
     "license-checker": "^20.1.0",
+    "lint-staged": "^8.1.4",
     "minimatch": "^3.0.4",
     "minimist": "^1.2.0",
     "npm-registry-client": "8.6.0",
     "pacote": "^9.2.3",
     "pidtree": "^0.3.0",
     "pidusage": "^2.0.17",
+    "precise-commits": "^1.0.2",
+    "prettier": "^1.16.4",
     "rxjs": "~6.4.0",
     "semver": "^5.3.0",
     "source-map": "^0.5.6",
@@ -126,7 +129,14 @@
     "through2": "^2.0.3",
     "tree-kill": "^1.2.0",
     "ts-node": "^5.0.0",
+    "tslint-config-prettier": "^1.18.0",
     "tslint-no-circular-imports": "^0.6.0",
     "tslint-sonarts": "^1.7.0"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged",
+      "pre-push": "node ./bin/devkit-admin hooks/pre-push"
+    }
   }
 }
diff --git a/tslint.json b/tslint.json
index e617a4d2236f..c960911311ec 100644
--- a/tslint.json
+++ b/tslint.json
@@ -3,19 +3,23 @@
   // Consider using cognitive-complexity and refactor
   // Consider using no-useless-cast but it's annoying
   "extends": [
-    "tslint-no-circular-imports"
+    "tslint-no-circular-imports",
+    "tslint-config-prettier"
   ],
   "rulesDirectory": [
     "dist/etc/rules",
     "node_modules/tslint-sonarts/lib/rules"
   ],
+  "linterOptions": {
+    "exclude": ["dist-schema/**"],
+    "format": "codeFrame"
+  },
   "rules": {
     // ==================================================================================================
     // custom rules defined in etc/rules/**
     "defocus": true,
     "import-groups": true,
     "no-global-tslint-disable": true,
-    "single-eof-line": true,
     // ==================================================================================================
     // tslint-sonarts rules. See https://github.com/SonarSource/SonarTS
     // These rules are part of the bug detection section of tslint-sonarts
@@ -52,45 +56,21 @@
     "no-floating-promises": true,
     "no-implicit-dependencies": true,
     "no-import-side-effect": [true, {"ignore-module": "^(?!rxjs\/)"}],
-    "align": [
-      true,
-      "elements",
-      "members",
-      "parameters",
-      "statements"
-    ],
-    "max-line-length": [true, 100],
     "no-inferrable-types": true,
     "class-name": true,
     "comment-format": [
       true,
       "check-space"
     ],
-    "indent": [
-      true,
-      "spaces"
-    ],
-    "eofline": true,
-    "import-spacing": true,
     "match-default-export-name": true,
     "newline-before-return": true,
-    "no-consecutive-blank-lines": [true, 2],
     "no-duplicate-variable": true,
     "no-eval": true,
     "no-any": true,
     "no-arg": true,
     "no-internal-module": true,
-    "no-trailing-whitespace": true,
     "no-unused-expression": true,
     "no-var-keyword": true,
-    "one-line": [
-      true,
-      "check-catch",
-      "check-else",
-      "check-finally",
-      "check-open-brace",
-      "check-whitespace"
-    ],
     "ordered-imports": [
       true,
       {
@@ -99,29 +79,6 @@
       }
     ],
     "prefer-const": true,
-    "quotemark": [
-      true,
-      "single",
-      "avoid-escape"
-    ],
-    "semicolon": [true, "always"],
-    "trailing-comma": [
-      true,
-      {
-        "multiline": "always",
-        "singleline": "never"
-      }
-    ],
-    "typedef-whitespace": [
-      true,
-      {
-        "call-signature": "nospace",
-        "index-signature": "nospace",
-        "parameter": "nospace",
-        "property-declaration": "nospace",
-        "variable-declaration": "nospace"
-      }
-    ],
     "curly": true,
     "file-header": [
       true,
@@ -133,17 +90,6 @@
       "check-format",
       "allow-leading-underscore",
       "allow-pascal-case"
-    ],
-    "whitespace": [
-      true,
-      "check-branch",
-      "check-decl",
-      "check-module",
-      "check-preblock",
-      "check-operator",
-      "check-separator",
-      "check-type",
-      "check-typecast"
     ]
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 3ae32cc8ccb9..299e7b702bc0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -186,6 +186,13 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.3.tgz#2c92469bac2b7fbff810b67fca07bd138b48af77"
   integrity sha512-gqmspPZOMW3MIRb9HlrnbZHXI1/KHTOroBwN1NcLL6pWxzqzEKGvRTq0W/PxS45OtQGbaFikSQpkS5zbnsQm2w==
 
+"@babel/runtime@7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0.tgz#adeb78fedfc855aa05bc041640f3f6f98e85424c"
+  integrity sha512-7hGhzlcmg01CvH1EHdSPVXYX1aJ8KCEyz6I9xYIi/asDtzBPMyMhVibhM/K6g/5qnKBwjZtp10bNZIEFTRW1MA==
+  dependencies:
+    regenerator-runtime "^0.12.0"
+
 "@babel/template@^7.0.0", "@babel/template@^7.1.0":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.1.2.tgz#090484a574fef5a2d2d7726a674eceda5c5b5644"
@@ -246,11 +253,32 @@
     source-map-support "0.5.9"
     tsutils "2.27.2"
 
+"@iamstarkov/listr-update-renderer@0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@iamstarkov/listr-update-renderer/-/listr-update-renderer-0.4.1.tgz#d7c48092a2dcf90fd672b6c8b458649cb350c77e"
+  integrity sha512-IJyxQWsYDEkf8C8QthBn5N8tIUR9V9je6j3sMIpAkonaadjbvxmRC6RAhpa3RKxndhNnU2M6iNbtJwd7usQYIA==
+  dependencies:
+    chalk "^1.1.3"
+    cli-truncate "^0.2.1"
+    elegant-spinner "^1.0.1"
+    figures "^1.7.0"
+    indent-string "^3.0.0"
+    log-symbols "^1.0.2"
+    log-update "^2.3.0"
+    strip-ansi "^3.0.1"
+
 "@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"
   integrity sha1-w6DFRNYjkqzCgTpCyKDcb1j4aSI=
 
+"@samverschueren/stream-to-observable@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"
+  integrity sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==
+  dependencies:
+    any-observable "^0.3.0"
+
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
@@ -941,7 +969,7 @@ ansi-colors@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.1.tgz#9638047e4213f3428a11944a7d4b31cba0a3ff95"
   integrity sha512-Xt+zb6nqgvV9SWAVp0EG3lRsHcbq5DDgqjPPz6pwgtj6RKz65zGXMNa82oJfOSBA/to6GmRP7Dr+6o+kbApTzQ==
 
-ansi-escapes@^3.2.0:
+ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
@@ -985,6 +1013,11 @@ ansi.js@0.0.5:
   dependencies:
     on-new-line "0.0.1"
 
+any-observable@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
+  integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==
+
 anymatch@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
@@ -1886,11 +1919,30 @@ cacheable-request@^5.1.0:
     normalize-url "^3.1.0"
     responselike "^1.0.2"
 
+caller-callsite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
+  integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=
+  dependencies:
+    callsites "^2.0.0"
+
+caller-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
+  integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=
+  dependencies:
+    caller-callsite "^2.0.0"
+
 callsite@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
   integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
 
+callsites@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
+
 camelcase-keys@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
@@ -1953,7 +2005,7 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@^1.1.1, chalk@^1.1.3:
+chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
@@ -1973,7 +2025,7 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^2.4.2:
+chalk@^2.1.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2064,6 +2116,11 @@ ci-info@^1.5.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.5.1.tgz#17e8eb5de6f8b2b6038f0cbb714d410bfa9f3030"
   integrity sha512-fKFIKXaYiL1exImwJ0AhR/6jxFPSKQBk2ayV5NiNoruUs2+rxC2kNw0EG+1Z9dugZRdCrppskQ8DN2cyaUM1Hw==
 
+ci-info@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
+
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
@@ -2109,13 +2166,26 @@ cli-boxes@^1.0.0:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
   integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM=
 
-cli-cursor@^2.1.0:
+cli-cursor@^2.0.0, cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
   integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
   dependencies:
     restore-cursor "^2.0.0"
 
+cli-spinners@^1.0.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.3.1.tgz#002c1990912d0d59580c93bd36c056de99e4259a"
+  integrity sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==
+
+cli-truncate@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
+  integrity sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=
+  dependencies:
+    slice-ansi "0.0.4"
+    string-width "^1.0.1"
+
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
@@ -2273,7 +2343,7 @@ combined-stream@^1.0.5, combined-stream@^1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.12.0, commander@^2.9.0:
+commander@^2.12.0, commander@^2.14.1, commander@^2.9.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
   integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
@@ -2656,6 +2726,17 @@ cosmiconfig@^4.0.0:
     parse-json "^4.0.0"
     require-from-string "^2.0.1"
 
+cosmiconfig@^5.0.2, cosmiconfig@^5.0.7:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.1.0.tgz#6c5c35e97f37f985061cdf653f114784231185cf"
+  integrity sha512-kCNPvthka8gvLtzAxQXvWo4FxqRB+ftRZyPZNuab5ngvM9Y7yw7hbEysglptLgpkGX9nAOKTBVkHUAe8xtYR6Q==
+  dependencies:
+    import-fresh "^2.0.0"
+    is-directory "^0.3.1"
+    js-yaml "^3.9.0"
+    lodash.get "^4.4.2"
+    parse-json "^4.0.0"
+
 crc32-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-2.0.0.tgz#e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"
@@ -2840,6 +2921,11 @@ data-uri-to-buffer@1:
   resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz#77163ea9c20d8641b4707e8f18abdf9a78f34835"
   integrity sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ==
 
+date-fns@^1.27.2:
+  version "1.30.1"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
+  integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
+
 date-format@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"
@@ -2890,7 +2976,7 @@ debug@^3.2.5:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.0, debug@^4.1.1:
+debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -2934,6 +3020,11 @@ decompress-response@^3.3.0:
   dependencies:
     mimic-response "^1.0.0"
 
+dedent@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
+  integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
+
 deep-equal@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
@@ -3105,6 +3196,11 @@ diagnostics@^1.1.1:
     enabled "1.0.x"
     kuler "1.0.x"
 
+diff-match-patch@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.4.tgz#6ac4b55237463761c4daf0dc603eb869124744b1"
+  integrity sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg==
+
 diff@^3.1.0, diff@^3.2.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
@@ -3231,6 +3327,11 @@ electron-to-chromium@^1.3.82:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.82.tgz#7d13ae4437d2a783de3f4efba96b186c540b67b1"
   integrity sha512-NI4nB2IWGcU4JVT1AE8kBb/dFor4zjLHMLsOROPahppeHrR0FG5uslxMmkp/thO1MvPjM2xhlKoY29/I60s0ew==
 
+elegant-spinner@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
+  integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
+
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
@@ -3411,7 +3512,7 @@ escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.4, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
@@ -3558,6 +3659,19 @@ execa@^0.7.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+execa@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.9.0.tgz#adb7ce62cf985071f60580deb4a88b9e34712d01"
+  integrity sha512-BbUMBiX4hqiHZUA5+JujIjNb6TyAlp2D5KLheMjMluwOuzcnylDL4AxZYLLn1n2AGB49eSWwyKvvEQoRpnAtmA==
+  dependencies:
+    cross-spawn "^5.0.1"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
 execa@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
@@ -3797,6 +3911,14 @@ figgy-pudding@^3.1.0, figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
   integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
 
+figures@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
+  integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=
+  dependencies:
+    escape-string-regexp "^1.0.5"
+    object-assign "^4.1.0"
+
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
@@ -3899,7 +4021,7 @@ find-up@^1.0.0:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
-find-up@^2.0.0:
+find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
@@ -3926,6 +4048,11 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.1"
     readable-stream "^2.0.4"
 
+fn-name@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz#5214d7537a4d06a4a301c0cc262feb84188002e7"
+  integrity sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=
+
 follow-redirects@1.0.0:
   version "1.0.0"
   resolved "http://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz#8e34298cbd2e176f254effec75a1c78cc849fd37"
@@ -4113,6 +4240,15 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+g-status@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/g-status/-/g-status-2.0.2.tgz#270fd32119e8fc9496f066fe5fe88e0a6bc78b97"
+  integrity sha512-kQoE9qH+T1AHKgSSD0Hkv98bobE90ILQcXAF4wvGgsr7uFqNvwmh8j+Lq3l0RVt3E3HjSbv2B9biEGcEtpHLCA==
+  dependencies:
+    arrify "^1.0.1"
+    matcher "^1.0.0"
+    simple-git "^1.85.0"
+
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
@@ -4163,6 +4299,11 @@ get-cursor-position@1.0.3:
   resolved "https://registry.yarnpkg.com/get-cursor-position/-/get-cursor-position-1.0.3.tgz#0e41d60343b705836a528d69a5e099e2c5108d63"
   integrity sha1-DkHWA0O3BYNqUo1ppeCZ4sUQjWM=
 
+get-own-enumerable-property-symbols@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz#b877b49a5c16aefac3655f2ed2ea5b684df8d203"
+  integrity sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg==
+
 get-pkg-repo@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
@@ -4179,6 +4320,11 @@ get-stdin@^4.0.1:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
   integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
+get-stdin@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
+  integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
+
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -4755,14 +4901,21 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@^0.14.3:
-  version "0.14.3"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3"
-  integrity sha512-e21wivqHpstpoiWA/Yi8eFti8E+sQDSS53cpJsPptPs295QTOQR0ZwnHo2TXy1XOpZFD9rPOd3NpmqTK6uMLJA==
+husky@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-1.3.1.tgz#26823e399300388ca2afff11cfa8a86b0033fae0"
+  integrity sha512-86U6sVVVf4b5NYSZ0yvv88dRgBSSXXmHaiq5pP4KDj5JVzdwKgBjEtUPOm8hcoytezFwbU+7gotXNhpHdystlg==
   dependencies:
-    is-ci "^1.0.10"
-    normalize-path "^1.0.0"
-    strip-indent "^2.0.0"
+    cosmiconfig "^5.0.7"
+    execa "^1.0.0"
+    find-up "^3.0.0"
+    get-stdin "^6.0.0"
+    is-ci "^2.0.0"
+    pkg-dir "^3.0.0"
+    please-upgrade-node "^3.1.1"
+    read-pkg "^4.0.1"
+    run-node "^1.0.0"
+    slash "^2.0.0"
 
 iconv-lite@0.4.15:
   version "0.4.15"
@@ -4800,7 +4953,7 @@ ignore-walk@^3.0.1:
   dependencies:
     minimatch "^3.0.4"
 
-ignore@^3.3.5:
+ignore@^3.3.5, ignore@^3.3.7:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
   integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
@@ -4827,6 +4980,14 @@ import-cwd@^2.0.0:
   dependencies:
     import-from "^2.1.0"
 
+import-fresh@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
+  integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY=
+  dependencies:
+    caller-path "^2.0.0"
+    resolve-from "^3.0.0"
+
 import-from@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
@@ -5044,6 +5205,13 @@ is-ci@^1.0.10:
   dependencies:
     ci-info "^1.5.0"
 
+is-ci@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
+  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
+  dependencies:
+    ci-info "^2.0.0"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -5213,11 +5381,18 @@ is-number@^4.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
   integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
-is-obj@^1.0.0:
+is-obj@^1.0.0, is-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
   integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
 
+is-observable@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e"
+  integrity sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==
+  dependencies:
+    symbol-observable "^1.1.0"
+
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
@@ -5274,6 +5449,11 @@ is-redirect@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
   integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=
 
+is-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
+  integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
+
 is-retry-allowed@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
@@ -5968,6 +6148,81 @@ lie@~3.1.0:
   dependencies:
     immediate "~3.0.5"
 
+lint-staged@^8.1.4:
+  version "8.1.4"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.1.4.tgz#a726592c0e55231116af295e730643bb711c169b"
+  integrity sha512-oFbbhB/VzN8B3i/sIdb9gMfngGArI6jIfxSn+WPdQb2Ni3GJeS6T4j5VriSbQfxfMuYoQlMHOoFt+lfcWV0HfA==
+  dependencies:
+    "@iamstarkov/listr-update-renderer" "0.4.1"
+    chalk "^2.3.1"
+    commander "^2.14.1"
+    cosmiconfig "^5.0.2"
+    debug "^3.1.0"
+    dedent "^0.7.0"
+    del "^3.0.0"
+    execa "^1.0.0"
+    find-parent-dir "^0.3.0"
+    g-status "^2.0.2"
+    is-glob "^4.0.0"
+    is-windows "^1.0.2"
+    listr "^0.14.2"
+    lodash "^4.17.11"
+    log-symbols "^2.2.0"
+    micromatch "^3.1.8"
+    npm-which "^3.0.1"
+    p-map "^1.1.1"
+    path-is-inside "^1.0.2"
+    pify "^3.0.0"
+    please-upgrade-node "^3.0.2"
+    staged-git-files "1.1.2"
+    string-argv "^0.0.2"
+    stringify-object "^3.2.2"
+    yup "^0.26.10"
+
+listr-silent-renderer@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
+  integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=
+
+listr-update-renderer@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz#4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2"
+  integrity sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==
+  dependencies:
+    chalk "^1.1.3"
+    cli-truncate "^0.2.1"
+    elegant-spinner "^1.0.1"
+    figures "^1.7.0"
+    indent-string "^3.0.0"
+    log-symbols "^1.0.2"
+    log-update "^2.3.0"
+    strip-ansi "^3.0.1"
+
+listr-verbose-renderer@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz#f1132167535ea4c1261102b9f28dac7cba1e03db"
+  integrity sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==
+  dependencies:
+    chalk "^2.4.1"
+    cli-cursor "^2.1.0"
+    date-fns "^1.27.2"
+    figures "^2.0.0"
+
+listr@^0.14.2:
+  version "0.14.3"
+  resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz#2fea909604e434be464c50bddba0d496928fa586"
+  integrity sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==
+  dependencies:
+    "@samverschueren/stream-to-observable" "^0.3.0"
+    is-observable "^1.1.0"
+    is-promise "^2.1.0"
+    is-stream "^1.1.0"
+    listr-silent-renderer "^1.1.1"
+    listr-update-renderer "^0.5.0"
+    listr-verbose-renderer "^0.5.0"
+    p-map "^2.0.0"
+    rxjs "^6.3.3"
+
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -6058,6 +6313,11 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
+lodash.get@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
+  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
+
 lodash.mergewith@^4.6.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
@@ -6093,6 +6353,29 @@ lodash@^4.15.0, lodash@^4.16.6, lodash@^4.17.11, lodash@^4.17.5, lodash@^4.8.0,
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
+log-symbols@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
+  integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=
+  dependencies:
+    chalk "^1.0.0"
+
+log-symbols@^2.1.0, log-symbols@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
+  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
+  dependencies:
+    chalk "^2.0.1"
+
+log-update@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708"
+  integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg=
+  dependencies:
+    ansi-escapes "^3.0.0"
+    cli-cursor "^2.0.0"
+    wrap-ansi "^3.0.1"
+
 log4js@^2.3.9:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-2.11.0.tgz#bf3902eff65c6923d9ce9cfbd2db54160e34005a"
@@ -6296,6 +6579,13 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
+matcher@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/matcher/-/matcher-1.1.1.tgz#51d8301e138f840982b338b116bb0c09af62c1c2"
+  integrity sha512-+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg==
+  dependencies:
+    escape-string-regexp "^1.0.4"
+
 material-design-icons@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/material-design-icons/-/material-design-icons-3.0.1.tgz#9a71c48747218ebca51e51a66da682038cdcb7bf"
@@ -6627,6 +6917,11 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
+mri@^1.1.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/mri/-/mri-1.1.4.tgz#7cb1dd1b9b40905f1fac053abe25b6720f44744a"
+  integrity sha512-6y7IjGPm8AzlvoUrwAaw1tLnUBudaS3752vcd8JtrpGGQn+rXIe63LFVHm/YMwtqAuh+LJPCFdlLYPWM1nYn6w==
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -6983,11 +7278,6 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
-  integrity sha1-MtDkcvkf80VwHBWoMRAY07CpA3k=
-
 normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
@@ -7041,6 +7331,13 @@ npm-packlist@^1.1.6:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
+npm-path@^2.0.2:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64"
+  integrity sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw==
+  dependencies:
+    which "^1.2.10"
+
 npm-pick-manifest@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40"
@@ -7088,6 +7385,15 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
+npm-which@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/npm-which/-/npm-which-3.0.1.tgz#9225f26ec3a285c209cae67c3b11a6b4ab7140aa"
+  integrity sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo=
+  dependencies:
+    commander "^2.9.0"
+    npm-path "^2.0.2"
+    which "^1.2.10"
+
 "npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.0, npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
@@ -7252,6 +7558,16 @@ optjs@~3.2.2:
   resolved "https://registry.yarnpkg.com/optjs/-/optjs-3.2.2.tgz#69a6ce89c442a44403141ad2f9b370bd5bb6f4ee"
   integrity sha1-aabOicRCpEQDFBrS+bNwvVu29O4=
 
+ora@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-1.4.0.tgz#884458215b3a5d4097592285f93321bb7a79e2e5"
+  integrity sha512-iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw==
+  dependencies:
+    chalk "^2.1.0"
+    cli-cursor "^2.1.0"
+    cli-spinners "^1.0.1"
+    log-symbols "^2.1.0"
+
 original@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
@@ -7367,6 +7683,11 @@ p-map@^1.1.1:
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
   integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
 
+p-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.0.0.tgz#be18c5a5adeb8e156460651421aceca56c213a50"
+  integrity sha512-GO107XdrSUmtHxVoi60qc9tUl/KkNKm+X2CF4P9amalpGxv5YqVPJNfSb0wcA+syCopkZvYYIzW8OVTQW59x/w==
+
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
@@ -7614,7 +7935,7 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@^1.0.1:
+path-is-inside@^1.0.1, path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
   integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
@@ -7726,6 +8047,13 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
+please-upgrade-node@^3.0.2, please-upgrade-node@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac"
+  integrity sha512-KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ==
+  dependencies:
+    semver-compare "^1.0.0"
+
 pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
@@ -7812,6 +8140,19 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
     source-map "^0.6.1"
     supports-color "^5.5.0"
 
+precise-commits@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/precise-commits/-/precise-commits-1.0.2.tgz#4659be01a9c3310f50ce51ddf913fead1d7cc940"
+  integrity sha512-PYkoNTFXVvZRzJTDxdgzmPanhSNGj5Wtj2NgSo7IhwNXGcKktX+L4DJhyIrhFSLsWWAvd+cYyyU2eXlaX5QxzA==
+  dependencies:
+    diff-match-patch "^1.0.0"
+    execa "^0.9.0"
+    find-up "^2.1.0"
+    glob "^7.1.2"
+    ignore "^3.3.7"
+    mri "^1.1.0"
+    ora "^1.3.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -7832,6 +8173,11 @@ preserve@^0.2.0:
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
   integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
+prettier@^1.16.4:
+  version "1.16.4"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717"
+  integrity sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g==
+
 process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
@@ -7886,6 +8232,11 @@ promisify-call@^2.0.2:
   dependencies:
     with-callback "^1.0.2"
 
+property-expr@^1.5.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-1.5.1.tgz#22e8706894a0c8e28d58735804f6ba3a3673314f"
+  integrity sha512-CGuc0VUTGthpJXL36ydB6jnbyOf/rAHFvmVrJlH+Rg0DqqLFQGAP6hIaxD/G0OAmBJPhXDHuEJigrp0e0wFV6g==
+
 protobufjs@5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.3.tgz#e4dfe9fb67c90b2630d15868249bcc4961467a17"
@@ -8250,6 +8601,15 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
+read-pkg@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237"
+  integrity sha1-ljYlN48+HE1IyFhytabsfV0JMjc=
+  dependencies:
+    normalize-package-data "^2.3.2"
+    parse-json "^4.0.0"
+    pify "^3.0.0"
+
 "readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.3:
   version "2.3.6"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
@@ -8380,6 +8740,11 @@ regenerator-runtime@^0.11.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
+regenerator-runtime@^0.12.0:
+  version "0.12.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
+  integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
+
 regex-cache@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
@@ -8705,6 +9070,11 @@ run-async@^2.2.0:
   dependencies:
     is-promise "^2.1.0"
 
+run-node@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e"
+  integrity sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==
+
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
@@ -8712,7 +9082,7 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs@6.4.0, rxjs@^6.0.0, rxjs@^6.4.0, rxjs@~6.4.0:
+rxjs@6.4.0, rxjs@^6.0.0, rxjs@^6.3.3, rxjs@^6.4.0, rxjs@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
   integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
@@ -8837,6 +9207,11 @@ selfsigned@^1.9.1:
   dependencies:
     node-forge "0.7.5"
 
+semver-compare@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
+  integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
+
 semver-diff@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
@@ -9008,6 +9383,13 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
+simple-git@^1.85.0:
+  version "1.107.0"
+  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.107.0.tgz#12cffaf261c14d6f450f7fdb86c21ccee968b383"
+  integrity sha512-t4OK1JRlp4ayKRfcW6owrWcRVLyHRUlhGd0uN6ZZTqfDq8a5XpcUdOKiGRNobHEuMtNqzp0vcJNvhYWwh5PsQA==
+  dependencies:
+    debug "^4.0.1"
+
 simple-swizzle@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
@@ -9027,6 +9409,16 @@ slash@^1.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
   integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
+slash@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
+  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
+
+slice-ansi@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
+  integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=
+
 slide@^1.1.3, slide@~1.1.3:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
@@ -9515,6 +9907,11 @@ stack-trace@0.0.x:
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
   integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
 
+staged-git-files@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-1.1.2.tgz#4326d33886dc9ecfa29a6193bf511ba90a46454b"
+  integrity sha512-0Eyrk6uXW6tg9PYkhi/V/J4zHp33aNyi2hOCmhFLqLTIhbgqWn5jlSzI+IU0VqrZq6+DbHcabQl/WP6P3BG0QA==
+
 start-with@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/start-with/-/start-with-1.0.2.tgz#a069a5f46a95fca7f0874f85a28f653d0095c267"
@@ -9626,6 +10023,11 @@ streamroller@0.7.0:
     mkdirp "^0.5.1"
     readable-stream "^2.3.0"
 
+string-argv@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.0.2.tgz#dac30408690c21f3c3630a3ff3a05877bdcbd736"
+  integrity sha1-2sMECGkMIfPDYwo/86BYd73L1zY=
+
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -9662,6 +10064,15 @@ string_decoder@~0.10.x:
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
   integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
 
+stringify-object@^3.2.2:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629"
+  integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==
+  dependencies:
+    get-own-enumerable-property-symbols "^3.0.0"
+    is-obj "^1.0.1"
+    is-regexp "^1.0.0"
+
 stringstream@~0.0.4, stringstream@~0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
@@ -9777,11 +10188,16 @@ supports-color@^6.1.0:
   dependencies:
     has-flag "^3.0.0"
 
-symbol-observable@1.2.0:
+symbol-observable@1.2.0, symbol-observable@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
   integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
+synchronous-promise@^2.0.5:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.6.tgz#de76e0ea2b3558c1e673942e47e714a930fa64aa"
+  integrity sha512-TyOuWLwkmtPL49LHCX1caIwHjRzcVd62+GF6h8W/jHOeZUFHpnd2XJDVuUlaTaLPH1nuu2M69mfHr5XbQJnf/g==
+
 tapable@^1.0.0, tapable@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c"
@@ -10019,6 +10435,11 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
+toposort@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
+  integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=
+
 tough-cookie@~2.3.0, tough-cookie@~2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
@@ -10109,6 +10530,11 @@ tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
   integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
+tslint-config-prettier@^1.18.0:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz#75f140bde947d35d8f0d238e0ebf809d64592c37"
+  integrity sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg==
+
 tslint-no-circular-imports@^0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/tslint-no-circular-imports/-/tslint-no-circular-imports-0.6.1.tgz#a91358395a81c067bf104a641f269655057715cd"
@@ -10708,7 +11134,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@1, which@^1.1.1, which@^1.2.1, which@^1.2.9, which@^1.3.1:
+which@1, which@^1.1.1, which@^1.2.1, which@^1.2.10, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -10787,6 +11213,14 @@ wrap-ansi@^2.0.0:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
 
+wrap-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba"
+  integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=
+  dependencies:
+    string-width "^2.1.1"
+    strip-ansi "^4.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -10994,6 +11428,18 @@ yn@^2.0.0:
   resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
   integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=
 
+yup@^0.26.10:
+  version "0.26.10"
+  resolved "https://registry.yarnpkg.com/yup/-/yup-0.26.10.tgz#3545839663289038faf25facfc07e11fd67c0cb1"
+  integrity sha512-keuNEbNSnsOTOuGCt3UJW69jDE3O4P+UHAakO7vSeFMnjaitcmlbij/a3oNb9g1Y1KvSKH/7O1R2PQ4m4TRylw==
+  dependencies:
+    "@babel/runtime" "7.0.0"
+    fn-name "~2.0.1"
+    lodash "^4.17.10"
+    property-expr "^1.5.0"
+    synchronous-promise "^2.0.5"
+    toposort "^2.0.2"
+
 zip-stream@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-1.2.0.tgz#a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"

From f2049109a920a13a1da1faadf20889024f8890b0 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 27 Feb 2019 20:35:55 -0500
Subject: [PATCH 0831/1703] ci: add precise commits code formatting check

---
 .circleci/config.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 659aa63dc4ac..09fd5c045297 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -85,6 +85,12 @@ jobs:
     steps:
       - attach_workspace: *attach_options
       - run: npm run validate -- --ci
+      - run:
+          name: Validate Code Formatting
+          command: |
+            if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then
+              yarn run precise-commits --check-only --head=$CIRCLE_SHA1 --base=$(git merge-base HEAD $CIRCLE_BRANCH)
+            fi
 
   test:
     <<: *defaults

From 026ae8cefc450038ff87338066fe9929570dfb6f Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Wed, 27 Feb 2019 16:12:59 +0100
Subject: [PATCH 0832/1703] feat(@schematics/angular): change layout of e2e
 files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With this change E2E files will be relocated inside an existing application instead of creating a seperate E2E project. This will also remove a lot of extra boilerplating inside the workspace configuration file.

File layout:
```
│   browserslist
│   karma.conf.js
│   tsconfig.app.json
│   tsconfig.spec.json
│   tslint.json
│
├───e2e
│   │   protractor.conf.js
│   │   tsconfig.e2e.json
│   │
│   └───src
│           app.e2e-spec.ts
│           app.po.ts
│
└───src
    │   favicon.ico
    │   index.html
    │   main.po.ts
    │   main.ts
    │   polyfills.ts
    │   styles.css
    │   test.ts
    │
    ├───app
    │       app.component.css
    │       app.component.html
    │       app.component.spec.ts
    │       app.component.ts
    │       app.module.ts
    │
    ├───assets
    │       .gitkeep
    │
    └───environments
            environment.prod.ts
            environment.ts
```

Ref: TOOL-699
---
 .../files/root/tsconfig.app.json.template     |   3 +-
 .../schematics/angular/application/index.ts   |   2 -
 .../e2e/files/tsconfig.e2e.json.template      |   4 +-
 packages/schematics/angular/e2e/index.ts      | 133 ++++++------------
 packages/schematics/angular/e2e/index_spec.ts |  76 +++++-----
 packages/schematics/angular/e2e/schema.json   |  15 --
 .../schematics/angular/ng-new/index_spec.ts   |  10 +-
 .../generate/application/application-basic.ts |   3 +-
 8 files changed, 92 insertions(+), 154 deletions(-)

diff --git a/packages/schematics/angular/application/files/root/tsconfig.app.json.template b/packages/schematics/angular/application/files/root/tsconfig.app.json.template
index e8911503de66..d3cef1c5aa03 100644
--- a/packages/schematics/angular/application/files/root/tsconfig.app.json.template
+++ b/packages/schematics/angular/application/files/root/tsconfig.app.json.template
@@ -6,7 +6,8 @@
   },
   "exclude": [
     "test.ts",
-    "**/*.spec.ts"
+    "**/*.spec.ts",
+    "e2e/**"
   ]<% if (enableIvy) { %>,
   "angularCompilerOptions": {
     "enableIvy": true
diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 6163f83c7ed1..bce0c4530d5e 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -345,10 +345,8 @@ export default function (options: ApplicationOptions): Rule {
     const tsLintRoot = appDir;
 
     const e2eOptions: E2eOptions = {
-      name: `${options.name}-e2e`,
       relatedAppName: options.name,
       rootSelector: appRootSelector,
-      projectRoot: newProjectRoot ? `${newProjectRoot}/${options.name}-e2e` : 'e2e',
     };
 
     const styleExt = styleToFileExtention(options.style);
diff --git a/packages/schematics/angular/e2e/files/tsconfig.e2e.json.template b/packages/schematics/angular/e2e/files/tsconfig.e2e.json.template
index a5e0455e5ff4..5df5f432cbca 100644
--- a/packages/schematics/angular/e2e/files/tsconfig.e2e.json.template
+++ b/packages/schematics/angular/e2e/files/tsconfig.e2e.json.template
@@ -1,7 +1,7 @@
 {
-  "extends": "<%= appDir.split('/').map(x => '..').join('/') %>/tsconfig.json",
+  "extends": "<%= relativePathToWorkspaceRoot %>/tsconfig.json",
   "compilerOptions": {
-    "outDir": "<%= appDir.split('/').map(x => '..').join('/') %>/out-tsc/app",
+    "outDir": "<%= relativePathToWorkspaceRoot %>/out-tsc/e2e",
     "module": "commonjs",
     "target": "es5",
     "types": [
diff --git a/packages/schematics/angular/e2e/index.ts b/packages/schematics/angular/e2e/index.ts
index e168a9e91507..640417bf2aa7 100644
--- a/packages/schematics/angular/e2e/index.ts
+++ b/packages/schematics/angular/e2e/index.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { strings, tags } from '@angular-devkit/core';
+import { strings } from '@angular-devkit/core';
 import {
   Rule,
   SchematicContext,
@@ -20,120 +20,73 @@ import {
 } from '@angular-devkit/schematics';
 import { getWorkspace, updateWorkspace } from '../utility/config';
 import { getProject } from '../utility/project';
-import {
-  Builders,
-   ProjectType,
-  WorkspaceProject,
-  WorkspaceSchema,
-} from '../utility/workspace-models';
+import { Builders, WorkspaceSchema } from '../utility/workspace-models';
 import { Schema as E2eOptions } from './schema';
 
-function addAppToWorkspaceFile(options: E2eOptions, workspace: WorkspaceSchema): Rule {
-  return (host: Tree, context: SchematicContext) => {
-    let projectRoot = options.projectRoot !== undefined
-      ? options.projectRoot
-      : `${workspace.newProjectRoot}/${options.name}`;
+function getE2eRoot(projectRoot: string): string {
+  const root = projectRoot.split('/').filter(x => x).join('/');
 
-    if (projectRoot !== '' && !projectRoot.endsWith('/')) {
-      projectRoot += '/';
-    }
+  return root ? root + '/e2e' : 'e2e';
+}
 
-    if (getProject(workspace, options.name)) {
-      throw new SchematicsException(`Project name "${options.name}" already exists.`);
-    }
+function AddBuilderToWorkspace(options: E2eOptions, workspace: WorkspaceSchema): Rule {
+  return (host: Tree, context: SchematicContext) => {
+    const appProject = options.relatedAppName;
+    const project = getProject(workspace, appProject);
+    const architect = project.architect;
 
-    const project: WorkspaceProject = {
-      root: projectRoot,
-      projectType: ProjectType.Application,
-      prefix: '',
-      architect: {
-        e2e: {
-          builder: Builders.Protractor,
-          options: {
-            protractorConfig: `${projectRoot}protractor.conf.js`,
-            devServerTarget: `${options.relatedAppName}:serve`,
-          },
-          configurations: {
-            production: {
-              devServerTarget: `${options.relatedAppName}:serve:production`,
-            },
-          },
+    const projectRoot = getE2eRoot(project.root);
+
+    if (architect) {
+      architect.e2e = {
+        builder: Builders.Protractor,
+        options: {
+          protractorConfig: `${projectRoot}/protractor.conf.js`,
+          devServerTarget: `${options.relatedAppName}:serve`,
         },
-        lint: {
-          builder: Builders.TsLint,
-          options: {
-            tsConfig: `${projectRoot}tsconfig.e2e.json`,
-            exclude: [
-              '**/node_modules/**',
-            ],
+        configurations: {
+          production: {
+            devServerTarget: `${options.relatedAppName}:serve:production`,
           },
         },
-      },
-    };
-
-    workspace.projects[options.name] = project;
-
-    return updateWorkspace(workspace);
-  };
-}
-const projectNameRegexp = /^[a-zA-Z][.0-9a-zA-Z]*(-[.0-9a-zA-Z]*)*$/;
-const unsupportedProjectNames = ['test', 'ember', 'ember-cli', 'vendor', 'app'];
+      };
 
-function getRegExpFailPosition(str: string): number | null {
-  const parts = str.indexOf('-') >= 0 ? str.split('-') : [str];
-  const matched: string[] = [];
+      const lintConfig = architect.lint;
+      if (lintConfig) {
+        lintConfig.options.tsConfig =
+          lintConfig.options.tsConfig.concat(`${projectRoot}/tsconfig.e2e.json`);
+      }
 
-  parts.forEach(part => {
-    if (part.match(projectNameRegexp)) {
-      matched.push(part);
+      workspace.projects[options.relatedAppName] = project;
     }
-  });
-
-  const compare = matched.join('-');
-
-  return (str !== compare) ? compare.length : null;
-}
-
-function validateProjectName(projectName: string) {
-  const errorIndex = getRegExpFailPosition(projectName);
-  if (errorIndex !== null) {
-    const firstMessage = tags.oneLine`
-      Project name "${projectName}" is not valid. New project names must
-      start with a letter, and must contain only alphanumeric characters or dashes.
-      When adding a dash the segment after the dash must also start with a letter.
-    `;
-    const msg = tags.stripIndent`
-      ${firstMessage}
-      ${projectName}
-      ${Array(errorIndex + 1).join(' ') + '^'}
-    `;
-    throw new SchematicsException(msg);
-  } else if (unsupportedProjectNames.indexOf(projectName) !== -1) {
-    throw new SchematicsException(`Project name "${projectName}" is not a supported name.`);
-  }
 
+    return updateWorkspace(workspace);
+  };
 }
 
 export default function (options: E2eOptions): Rule {
   return (host: Tree) => {
-    validateProjectName(options.name);
-
+    const appProject = options.relatedAppName;
     const workspace = getWorkspace(host);
-    const appDir = options.projectRoot !== undefined
-      ? options.projectRoot
-      : `${workspace.newProjectRoot}/${options.name}`;
+    const project = getProject(workspace, appProject);
+
+    if (!project) {
+      throw new SchematicsException(`Project name "${appProject}" doesn't not exist.`);
+    }
+
+    const root = getE2eRoot(project.root);
+    const relativePathToWorkspaceRoot = root.split('/').map(() => '..').join('/');
 
     return chain([
-      addAppToWorkspaceFile(options, workspace),
+      AddBuilderToWorkspace(options, workspace),
       mergeWith(
         apply(url('./files'), [
           applyTemplates({
             utils: strings,
             ...options,
-            'dot': '.',
-            appDir,
+            relativePathToWorkspaceRoot,
           }),
-          move(appDir),
+          move(root),
         ])),
     ]);
   };
diff --git a/packages/schematics/angular/e2e/index_spec.ts b/packages/schematics/angular/e2e/index_spec.ts
index 6ac8e78036aa..b70ea82bb69c 100644
--- a/packages/schematics/angular/e2e/index_spec.ts
+++ b/packages/schematics/angular/e2e/index_spec.ts
@@ -6,10 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+import { Schema as ApplicationOptions } from '../application/schema';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { Schema as E2eOptions } from './schema';
 
-// tslint:disable:max-line-length
 describe('Application Schematic', () => {
   const schematicRunner = new SchematicTestRunner(
     '@schematics/angular',
@@ -23,81 +23,81 @@ describe('Application Schematic', () => {
   };
 
   const defaultOptions: E2eOptions = {
+    relatedAppName: 'foo',
+  };
+
+  const defaultAppOptions: ApplicationOptions = {
     name: 'foo',
-    relatedAppName: 'app',
+    inlineStyle: true,
+    inlineTemplate: true,
+    routing: false,
+    skipPackageJson: false,
+    minimal: true,
   };
 
-  let workspaceTree: UnitTestTree;
+  let applicationTree: UnitTestTree;
+
   beforeEach(() => {
-    workspaceTree = schematicRunner.runSchematic('workspace', workspaceOptions);
+    const workspaceTree = schematicRunner.runSchematic('workspace', workspaceOptions);
+    applicationTree = schematicRunner.runSchematic('application', defaultAppOptions, workspaceTree);
   });
 
-  it('should create all files of an e2e application', () => {
-    const tree = schematicRunner.runSchematic('e2e', defaultOptions, workspaceTree);
+  it('should create all files of e2e in an application', () => {
+    const tree = schematicRunner.runSchematic('e2e', defaultOptions, applicationTree);
     const files = tree.files;
     expect(files).toEqual(jasmine.arrayContaining([
-      '/projects/foo/protractor.conf.js',
-      '/projects/foo/tsconfig.e2e.json',
-      '/projects/foo/src/app.e2e-spec.ts',
-      '/projects/foo/src/app.po.ts',
+      '/projects/foo/e2e/protractor.conf.js',
+      '/projects/foo/e2e/tsconfig.e2e.json',
+      '/projects/foo/e2e/src/app.e2e-spec.ts',
+      '/projects/foo/e2e/src/app.po.ts',
     ]));
   });
 
-  it('should create all files of an e2e application', () => {
-    const options = {...defaultOptions, projectRoot: 'e2e'};
-    const tree = schematicRunner.runSchematic('e2e', options, workspaceTree);
-    const files = tree.files;
-    expect(files).not.toContain('/projects/foo/protractor.conf.js');
-    expect(files).toContain('/e2e/protractor.conf.js');
-  });
-
   it('should set the rootSelector in the app.po.ts', () => {
-    const tree = schematicRunner.runSchematic('e2e', defaultOptions, workspaceTree);
-    const content = tree.readContent('/projects/foo/src/app.po.ts');
+    const tree = schematicRunner.runSchematic('e2e', defaultOptions, applicationTree);
+    const content = tree.readContent('/projects/foo/e2e/src/app.po.ts');
     expect(content).toMatch(/app\-root/);
   });
 
   it('should set the rootSelector in the app.po.ts from the option', () => {
     const options = {...defaultOptions, rootSelector: 't-a-c-o'};
-    const tree = schematicRunner.runSchematic('e2e', options, workspaceTree);
-    const content = tree.readContent('/projects/foo/src/app.po.ts');
+    const tree = schematicRunner.runSchematic('e2e', options, applicationTree);
+    const content = tree.readContent('/projects/foo/e2e/src/app.po.ts');
     expect(content).toMatch(/t\-a\-c\-o/);
   });
 
   it('should set the rootSelector in the app.po.ts from the option with emoji', () => {
     const options = {...defaultOptions, rootSelector: '🌮-🌯'};
-    const tree = schematicRunner.runSchematic('e2e', options, workspaceTree);
-    const content = tree.readContent('/projects/foo/src/app.po.ts');
+    const tree = schematicRunner.runSchematic('e2e', options, applicationTree);
+    const content = tree.readContent('/projects/foo/e2e/src/app.po.ts');
     expect(content).toMatch(/🌮-🌯/);
   });
 
   describe('workspace config', () => {
-    it('should create the e2e app', () => {
-      const tree = schematicRunner.runSchematic('e2e', defaultOptions, workspaceTree);
-      const workspace = JSON.parse(tree.readContent('/angular.json'));
-      expect(workspace.projects.foo).toBeDefined();
-    });
-
-    it('should set 2 targets for the app', () => {
-      const tree = schematicRunner.runSchematic('e2e', defaultOptions, workspaceTree);
+    it('should add e2e targets for the app', () => {
+      const tree = schematicRunner.runSchematic('e2e', defaultOptions, applicationTree);
       const workspace = JSON.parse(tree.readContent('/angular.json'));
       const targets = workspace.projects.foo.architect;
-      expect(Object.keys(targets)).toEqual(['e2e', 'lint']);
+      expect(targets.e2e).toBeDefined();
     });
 
     it('should set the e2e options', () => {
-      const tree = schematicRunner.runSchematic('e2e', defaultOptions, workspaceTree);
+      const tree = schematicRunner.runSchematic('e2e', defaultOptions, applicationTree);
       const workspace = JSON.parse(tree.readContent('/angular.json'));
       const e2eOptions = workspace.projects.foo.architect.e2e.options;
-      expect(e2eOptions.protractorConfig).toEqual('projects/foo/protractor.conf.js');
-      expect(e2eOptions.devServerTarget).toEqual('app:serve');
+      expect(e2eOptions.protractorConfig).toEqual('projects/foo/e2e/protractor.conf.js');
+      expect(e2eOptions.devServerTarget).toEqual('foo:serve');
     });
 
     it('should set the lint options', () => {
-      const tree = schematicRunner.runSchematic('e2e', defaultOptions, workspaceTree);
+      const tree = schematicRunner.runSchematic('e2e', defaultOptions, applicationTree);
       const workspace = JSON.parse(tree.readContent('/angular.json'));
       const lintOptions = workspace.projects.foo.architect.lint.options;
-      expect(lintOptions.tsConfig).toEqual('projects/foo/tsconfig.e2e.json');
+      expect(lintOptions.tsConfig).toEqual([
+        'projects/foo/tsconfig.app.json',
+        'projects/foo/tsconfig.spec.json',
+        'projects/foo/e2e/tsconfig.e2e.json',
+      ]);
     });
   });
 });
diff --git a/packages/schematics/angular/e2e/schema.json b/packages/schematics/angular/e2e/schema.json
index 89201ad387e9..a65ba1364f0f 100644
--- a/packages/schematics/angular/e2e/schema.json
+++ b/packages/schematics/angular/e2e/schema.json
@@ -6,20 +6,6 @@
   "description": "Generates a new, generic end-to-end test definition for the given or default project.",
   "long-description": "e2e-long.md",
   "properties": {
-    "projectRoot": {
-      "description": "The root folder for the new test app.",
-      "type": "string",
-      "visible": false
-    },
-    "name": {
-      "description": "The name of the new e2e app.",
-      "type": "string",
-      "format": "html-selector",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      }
-    },
     "rootSelector": {
       "description": "The HTML selector for the root component of the test app.",
       "type": "string",
@@ -31,7 +17,6 @@
     }
   },
   "required": [
-    "name",
     "relatedAppName"
   ]
 }
diff --git a/packages/schematics/angular/ng-new/index_spec.ts b/packages/schematics/angular/ng-new/index_spec.ts
index dfd5a3824066..bea75d54fa67 100644
--- a/packages/schematics/angular/ng-new/index_spec.ts
+++ b/packages/schematics/angular/ng-new/index_spec.ts
@@ -37,6 +37,10 @@ describe('Ng New Schematic', () => {
       '/bar/src/tsconfig.app.json',
       '/bar/src/main.ts',
       '/bar/src/app/app.module.ts',
+      '/bar/e2e/src/app.po.ts',
+      '/bar/e2e/src/app.e2e-spec.ts',
+      '/bar/e2e/tsconfig.e2e.json',
+      '/bar/e2e/protractor.conf.js',
     ]));
   });
 
@@ -68,13 +72,11 @@ describe('Ng New Schematic', () => {
     expect(files).not.toContain('/bar/src');
   });
 
-  it('minimal=true should not create e2e project', () => {
+  it('minimal=true should not create an e2e target', () => {
     const options = { ...defaultOptions, minimal: true };
 
     const tree = schematicRunner.runSchematic('ng-new', options);
-    const files = tree.files;
-    expect(files).not.toContain('/bar/e2e');
     const confContent = JSON.parse(tree.readContent('/bar/angular.json'));
-    expect(confContent.projects['foo-e2e']).toBeUndefined();
+    expect(confContent.projects.foo.e2e).toBeUndefined();
   });
 });
diff --git a/tests/legacy-cli/e2e/tests/generate/application/application-basic.ts b/tests/legacy-cli/e2e/tests/generate/application/application-basic.ts
index 340f4ac4807b..e5459bb9e185 100644
--- a/tests/legacy-cli/e2e/tests/generate/application/application-basic.ts
+++ b/tests/legacy-cli/e2e/tests/generate/application/application-basic.ts
@@ -1,5 +1,5 @@
-import {ng} from '../../../utils/process';
 import { expectFileToMatch } from '../../../utils/fs';
+import { ng } from '../../../utils/process';
 import { useCIChrome } from '../../../utils/project';
 
 
@@ -7,6 +7,5 @@ export default function() {
   return ng('generate', 'application', 'app2')
     .then(() => expectFileToMatch('angular.json', /\"app2\":/))
     .then(() => useCIChrome('projects/app2'))
-    .then(() => useCIChrome('projects/app2-e2e'))
     .then(() => ng('test', 'app2', '--watch=false', '--browsers=ChromeHeadlessCI'));
 }

From 7f16cc7129ba47b7972e891f314023c2cad980d4 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Wed, 27 Feb 2019 16:13:21 +0100
Subject: [PATCH 0833/1703] test: update e2e setup to cater for e2e within an
 application

---
 tests/legacy-cli/e2e/tests/basic/e2e.ts | 18 +++++++++---------
 tests/legacy-cli/e2e/utils/project.ts   |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/basic/e2e.ts b/tests/legacy-cli/e2e/tests/basic/e2e.ts
index 1051adc17996..fa3100915d46 100644
--- a/tests/legacy-cli/e2e/tests/basic/e2e.ts
+++ b/tests/legacy-cli/e2e/tests/basic/e2e.ts
@@ -19,18 +19,18 @@ export default function () {
     scripts['wd:clean'] = 'webdriver-manager clean';
   })
     .then(() => npm('run', 'wd:clean'))
-    .then(() => expectToFail(() => ng('e2e', 'test-project-e2e', '--no-webdriver-update', '--devServerTarget=')))
+    .then(() => expectToFail(() => ng('e2e', 'test-project', '--no-webdriver-update', '--devServerTarget=')))
     // Add back the pre-defined version of webdriver. This script is defined when making projects.
     .then(() => npm('run', 'webdriver-update'))
     // Should fail without serving
-    .then(() => expectToFail(() => ng('e2e', 'test-project-e2e', '--devServerTarget=')))
+    .then(() => expectToFail(() => ng('e2e', 'test-project', '--devServerTarget=')))
     // These should work.
-    .then(() => ng('e2e', 'test-project-e2e'))
-    .then(() => ng('e2e', 'test-project-e2e', '--devServerTarget=test-project:serve:production'))
+    .then(() => ng('e2e', 'test-project'))
+    .then(() => ng('e2e', 'test-project', '--devServerTarget=test-project:serve:production'))
     // Should accept different config file
     .then(() => moveFile('./e2e/protractor.conf.js',
       './e2e/renamed-protractor.conf.js'))
-    .then(() => ng('e2e', 'test-project-e2e',
+    .then(() => ng('e2e', 'test-project',
       '--protractorConfig=e2e/renamed-protractor.conf.js'))
     .then(() => moveFile('./e2e/renamed-protractor.conf.js', './e2e/protractor.conf.js'))
     // Should accept different multiple spec files
@@ -38,7 +38,7 @@ export default function () {
       './e2e/src/renamed-app.e2e-spec.ts'))
     .then(() => copyFile('./e2e/src/renamed-app.e2e-spec.ts',
       './e2e/src/another-app.e2e-spec.ts'))
-    .then(() => ng('e2e', 'test-project-e2e', '--specs', './e2e/renamed-app.e2e-spec.ts',
+    .then(() => ng('e2e', 'test-project', '--specs', './e2e/renamed-app.e2e-spec.ts',
       '--specs', './e2e/another-app.e2e-spec.ts'))
     // Rename the spec back to how it was.
     .then(() => moveFile('./e2e/src/renamed-app.e2e-spec.ts',
@@ -50,7 +50,7 @@ export default function () {
             app: './e2e/src/app.e2e-spec.ts'
           },
     `))
-    .then(() => ng('e2e', 'test-project-e2e', '--suite=app'))
+    .then(() => ng('e2e', 'test-project', '--suite=app'))
     // Remove suites block from protractor.conf.js file after testing suites
     .then(() => replaceInFile('e2e/protractor.conf.js', `allScriptsTimeout: 11000,
           suites: {
@@ -59,7 +59,7 @@ export default function () {
     `, `allScriptsTimeout: 11000,`
     ))
     // Should start up Element Explorer
-    .then(() => execAndWaitForOutputToMatch('ng', ['e2e', 'test-project-e2e', '--element-explorer'],
+    .then(() => execAndWaitForOutputToMatch('ng', ['e2e', 'test-project', '--element-explorer'],
       /Element Explorer/))
     .then(() => killAllProcesses(), (err: any) => {
       killAllProcesses();
@@ -68,7 +68,7 @@ export default function () {
     // Should run side-by-side with `ng serve`
     .then(() => execAndWaitForOutputToMatch('ng', ['serve'],
       /: Compiled successfully./))
-    .then(() => ng('e2e', 'test-project-e2e', '--devServerTarget='))
+    .then(() => ng('e2e', 'test-project', '--devServerTarget='))
     .then(() => killAllProcesses(), (err: any) => {
       killAllProcesses();
       throw err;
diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts
index 6d63c6792f7c..1a64118a99c4 100644
--- a/tests/legacy-cli/e2e/utils/project.ts
+++ b/tests/legacy-cli/e2e/utils/project.ts
@@ -48,7 +48,7 @@ export async function createProject(name: string, ...args: string[]) {
 }
 
 export async function prepareProjectForE2e(name) {
-  const argv: any = getGlobalVariable('argv');
+  const argv: string[] = getGlobalVariable('argv');
 
   await git('config', 'user.email', 'angular-core+e2e@google.com');
   await git('config', 'user.name', 'Angular CLI E2e');
@@ -209,9 +209,9 @@ export function useCIDefaults(projectName = 'test-project') {
     // Use the CI chrome setup in karma.
     appTargets.test.options.browsers = 'ChromeHeadlessCI';
     // Disable auto-updating webdriver in e2e.
-    const e2eProject = workspaceJson.projects[projectName + '-e2e'];
-    const e2eTargets = e2eProject.targets || e2eProject.architect;
-    e2eTargets.e2e.options.webdriverUpdate = false;
+    if (appTargets.e2e) {
+      appTargets.e2e.options.webdriverUpdate = false;
+    }
   })
   .then(() => updateJsonFile('package.json', json => {
     // Use matching versions of Chrome and Webdriver.

From 3cbc7631b1a599c4a67cd9fe8b803b79559a5839 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Thu, 28 Feb 2019 09:54:28 +0100
Subject: [PATCH 0834/1703] test: fix test for directive prefix

---
 .../e2e/tests/generate/directive/directive-prefix.ts         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/generate/directive/directive-prefix.ts b/tests/legacy-cli/e2e/tests/generate/directive/directive-prefix.ts
index 1f480e69cdef..127b88b18868 100644
--- a/tests/legacy-cli/e2e/tests/generate/directive/directive-prefix.ts
+++ b/tests/legacy-cli/e2e/tests/generate/directive/directive-prefix.ts
@@ -16,15 +16,16 @@ export default function() {
     .then(() => ng('generate', 'directive', 'test2-directive'))
     .then(() => expectFileToMatch(join(directiveDir, 'test2-directive.directive.ts'),
       /selector: '\[preW/))
+    .then(() => ng('generate', 'application', 'app-two', '--skip-install'))
     .then(() => updateJsonFile('angular.json', configJson => {
       configJson.projects['test-project'].schematics = {
         '@schematics/angular:directive': { prefix: 'preP' }
       };
     }))
-    .then(() => process.chdir('e2e/src'))
+    .then(() => process.chdir('projects/app-two'))
     .then(() => ng('generate', 'directive', '--skip-import', 'test3-directive'))
     .then(() => process.chdir('../..'))
-    .then(() => expectFileToMatch(join('e2e', 'src', 'test3-directive.directive.ts'),
+    .then(() => expectFileToMatch(join('projects', 'app-two', 'test3-directive.directive.ts'),
       /selector: '\[preW/))
     .then(() => process.chdir('src/app'))
     .then(() => ng('generate', 'directive', 'test-directive'))

From edfc155f358e6a648e59bb5e663adbcce108d480 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 1 Mar 2019 18:52:06 +0100
Subject: [PATCH 0835/1703] feat(@schematics/angular): rename
 `tsconfig.e2e.json` to `tsconfig.json`

This will help IDEs as they only pick up the standard name
---
 .../schematics/angular/e2e/files/protractor.conf.js.template  | 2 +-
 .../{tsconfig.e2e.json.template => tsconfig.json.template}    | 0
 packages/schematics/angular/e2e/index.ts                      | 2 +-
 packages/schematics/angular/e2e/index_spec.ts                 | 4 ++--
 packages/schematics/angular/ng-new/index_spec.ts              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename packages/schematics/angular/e2e/files/{tsconfig.e2e.json.template => tsconfig.json.template} (100%)

diff --git a/packages/schematics/angular/e2e/files/protractor.conf.js.template b/packages/schematics/angular/e2e/files/protractor.conf.js.template
index 86776a391a5b..9748e3d2930f 100644
--- a/packages/schematics/angular/e2e/files/protractor.conf.js.template
+++ b/packages/schematics/angular/e2e/files/protractor.conf.js.template
@@ -21,7 +21,7 @@ exports.config = {
   },
   onPrepare() {
     require('ts-node').register({
-      project: require('path').join(__dirname, './tsconfig.e2e.json')
+      project: require('path').join(__dirname, './tsconfig.json')
     });
     jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
   }
diff --git a/packages/schematics/angular/e2e/files/tsconfig.e2e.json.template b/packages/schematics/angular/e2e/files/tsconfig.json.template
similarity index 100%
rename from packages/schematics/angular/e2e/files/tsconfig.e2e.json.template
rename to packages/schematics/angular/e2e/files/tsconfig.json.template
diff --git a/packages/schematics/angular/e2e/index.ts b/packages/schematics/angular/e2e/index.ts
index 640417bf2aa7..9445f2288303 100644
--- a/packages/schematics/angular/e2e/index.ts
+++ b/packages/schematics/angular/e2e/index.ts
@@ -54,7 +54,7 @@ function AddBuilderToWorkspace(options: E2eOptions, workspace: WorkspaceSchema):
       const lintConfig = architect.lint;
       if (lintConfig) {
         lintConfig.options.tsConfig =
-          lintConfig.options.tsConfig.concat(`${projectRoot}/tsconfig.e2e.json`);
+          lintConfig.options.tsConfig.concat(`${projectRoot}/tsconfig.json`);
       }
 
       workspace.projects[options.relatedAppName] = project;
diff --git a/packages/schematics/angular/e2e/index_spec.ts b/packages/schematics/angular/e2e/index_spec.ts
index b70ea82bb69c..9cc765bdecb5 100644
--- a/packages/schematics/angular/e2e/index_spec.ts
+++ b/packages/schematics/angular/e2e/index_spec.ts
@@ -47,7 +47,7 @@ describe('Application Schematic', () => {
     const files = tree.files;
     expect(files).toEqual(jasmine.arrayContaining([
       '/projects/foo/e2e/protractor.conf.js',
-      '/projects/foo/e2e/tsconfig.e2e.json',
+      '/projects/foo/e2e/tsconfig.json',
       '/projects/foo/e2e/src/app.e2e-spec.ts',
       '/projects/foo/e2e/src/app.po.ts',
     ]));
@@ -96,7 +96,7 @@ describe('Application Schematic', () => {
       expect(lintOptions.tsConfig).toEqual([
         'projects/foo/tsconfig.app.json',
         'projects/foo/tsconfig.spec.json',
-        'projects/foo/e2e/tsconfig.e2e.json',
+        'projects/foo/e2e/tsconfig.json',
       ]);
     });
   });
diff --git a/packages/schematics/angular/ng-new/index_spec.ts b/packages/schematics/angular/ng-new/index_spec.ts
index bea75d54fa67..772ab5b1fd39 100644
--- a/packages/schematics/angular/ng-new/index_spec.ts
+++ b/packages/schematics/angular/ng-new/index_spec.ts
@@ -39,7 +39,7 @@ describe('Ng New Schematic', () => {
       '/bar/src/app/app.module.ts',
       '/bar/e2e/src/app.po.ts',
       '/bar/e2e/src/app.e2e-spec.ts',
-      '/bar/e2e/tsconfig.e2e.json',
+      '/bar/e2e/tsconfig.json',
       '/bar/e2e/protractor.conf.js',
     ]));
   });

From 237251f260b7b152d361a2bc677401ee29c0785f Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 1 Mar 2019 06:59:17 +0000
Subject: [PATCH 0836/1703] build: update @types/inquirer to version ^0.0.44

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 0ad214df0a0c..c19c865d47a1 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
     "@types/copy-webpack-plugin": "^4.4.1",
     "@types/express": "^4.16.0",
     "@types/glob": "^7.0.0",
-    "@types/inquirer": "^0.0.43",
+    "@types/inquirer": "^0.0.44",
     "@types/istanbul": "^0.4.30",
     "@types/jasmine": "^3.3.8",
     "@types/loader-utils": "^1.1.3",
diff --git a/yarn.lock b/yarn.lock
index 299e7b702bc0..4ba4cb4a0e2d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -386,10 +386,10 @@
     "@types/events" "*"
     "@types/node" "*"
 
-"@types/inquirer@^0.0.43":
-  version "0.0.43"
-  resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-0.0.43.tgz#1eb0bbb4648e6cc568bd396c1e989f620ad01273"
-  integrity sha512-xgyfKZVMFqE8aIKy1xfFVsX2MxyXUNgjgmbF6dRbR3sL+ZM5K4ka/9L4mmTwX8eTeVYtduyXu0gUVwVJa1HbNw==
+"@types/inquirer@^0.0.44":
+  version "0.0.44"
+  resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-0.0.44.tgz#60ce954581cfdf44ad3899ec4cdc5fbe3fef1694"
+  integrity sha512-ugbhy1yBtCz5iTWYF+AGRS/UcMcWicdyHhxl9VaeFYc3ueg0CCssthQLB3rIcIOeGtfG6WPEvHdLu/IjKYfefg==
   dependencies:
     "@types/rx" "*"
     "@types/through" "*"

From 46e898f2abb1ab142b89ba7edf9881aeff9e53a2 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Thu, 28 Feb 2019 08:29:32 +0100
Subject: [PATCH 0837/1703] fix(@angular-devkit/architect-cli): fix paths to
 support Windows

---
 packages/angular_devkit/architect_cli/bin/architect.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/architect_cli/bin/architect.ts b/packages/angular_devkit/architect_cli/bin/architect.ts
index 6fbed3ba97fd..927801ea5d56 100644
--- a/packages/angular_devkit/architect_cli/bin/architect.ts
+++ b/packages/angular_devkit/architect_cli/bin/architect.ts
@@ -208,7 +208,7 @@ async function main(args: string[]): Promise<number> {
     return 3;
   }
 
-  const root = dirname(normalize(configFilePath));
+  const root = path.dirname(configFilePath);
   const configContent = readFileSync(configFilePath, 'utf-8');
   const workspaceJson = JSON.parse(configContent);
 
@@ -216,7 +216,7 @@ async function main(args: string[]): Promise<number> {
   registry.addPostTransform(schema.transforms.addUndefinedDefaults);
 
   const host = new NodeJsSyncHost();
-  const workspace = new experimental.workspace.Workspace(root, host);
+  const workspace = new experimental.workspace.Workspace(normalize(root), host);
 
   await workspace.loadWorkspaceFromJson(workspaceJson).toPromise();
 

From ef523d0d412db86c082406944932db26e679b45b Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 1 Mar 2019 06:59:31 +0000
Subject: [PATCH 0838/1703] build: update webpack to version 4.29.6

---
 .../angular_devkit/build_angular/package.json |   2 +-
 .../angular_devkit/build_webpack/package.json |   2 +-
 packages/ngtools/webpack/package.json         |   2 +-
 yarn.lock                                     | 276 +++++++++---------
 4 files changed, 141 insertions(+), 141 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index a925f947e542..24d3a623cae3 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -44,7 +44,7 @@
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.2.3",
-    "webpack": "4.29.5",
+    "webpack": "4.29.6",
     "webpack-dev-middleware": "3.6.0",
     "webpack-dev-server": "3.2.1",
     "webpack-merge": "4.2.1",
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index b5f3b9eb1f62..2af07883e775 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -16,7 +16,7 @@
     "webpack-dev-server": "^3.1.4"
   },
   "devDependencies": {
-    "webpack": "4.29.5",
+    "webpack": "4.29.6",
     "webpack-dev-server": "^3.1.4"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 04b8590ba516..0826fdf362c7 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -36,6 +36,6 @@
     "@angular/compiler": "^7.2.0-rc.0",
     "@angular/compiler-cli": "^7.2.0-rc.0",
     "typescript": "3.2.4",
-    "webpack": "4.29.5"
+    "webpack": "4.29.6"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 4ba4cb4a0e2d..40ff3d660f25 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -662,150 +662,150 @@
     "@types/uglify-js" "*"
     source-map "^0.6.0"
 
-"@webassemblyjs/ast@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.3.tgz#63a741bd715a6b6783f2ea5c6ab707516aa215eb"
-  integrity sha512-xy3m06+Iu4D32+6soz6zLnwznigXJRuFNTovBX2M4GqVqLb0dnyWLbPnpcXvUSdEN+9DVyDeaq2jyH1eIL2LZQ==
-  dependencies:
-    "@webassemblyjs/helper-module-context" "1.8.3"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.3"
-    "@webassemblyjs/wast-parser" "1.8.3"
-
-"@webassemblyjs/floating-point-hex-parser@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.3.tgz#f198a2d203b3c50846a064f5addd6a133ef9bc0e"
-  integrity sha512-vq1TISG4sts4f0lDwMUM0f3kpe0on+G3YyV5P0IySHFeaLKRYZ++n2fCFfG4TcCMYkqFeTUYFxm75L3ddlk2xA==
-
-"@webassemblyjs/helper-api-error@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.3.tgz#3b708f6926accd64dcbaa7ba5b63db5660ff4f66"
-  integrity sha512-BmWEynI4FnZbjk8CaYZXwcv9a6gIiu+rllRRouQUo73hglanXD3AGFJE7Q4JZCoVE0p5/jeX6kf5eKa3D4JxwQ==
-
-"@webassemblyjs/helper-buffer@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.3.tgz#f3150a23ffaba68621e1f094c8a14bebfd53dd48"
-  integrity sha512-iVIMhWnNHoFB94+/2l7LpswfCsXeMRnWfExKtqsZ/E2NxZyUx9nTeKK/MEMKTQNEpyfznIUX06OchBHQ+VKi/Q==
-
-"@webassemblyjs/helper-code-frame@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.3.tgz#f43ac605789b519d95784ef350fd2968aebdd3ef"
-  integrity sha512-K1UxoJML7GKr1QXR+BG7eXqQkvu+eEeTjlSl5wUFQ6W6vaOc5OwSxTcb3oE9x/3+w4NHhrIKD4JXXCZmLdL2cg==
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.8.3"
-
-"@webassemblyjs/helper-fsm@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.3.tgz#46aaa03f41082a916850ebcb97e9fc198ef36a9c"
-  integrity sha512-387zipfrGyO77/qm7/SDUiZBjQ5KGk4qkrVIyuoubmRNIiqn3g+6ijY8BhnlGqsCCQX5bYKOnttJobT5xoyviA==
-
-"@webassemblyjs/helper-module-context@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.3.tgz#150da405d90c8ea81ae0b0e1965b7b64e585634f"
-  integrity sha512-lPLFdQfaRssfnGEJit5Sk785kbBPPPK4ZS6rR5W/8hlUO/5v3F+rN8XuUcMj/Ny9iZiyKhhuinWGTUuYL4VKeQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.3"
+"@webassemblyjs/ast@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
+  integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
+
+"@webassemblyjs/floating-point-hex-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
+  integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
+
+"@webassemblyjs/helper-api-error@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
+  integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
+
+"@webassemblyjs/helper-buffer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
+  integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
+
+"@webassemblyjs/helper-code-frame@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
+  integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.8.5"
+
+"@webassemblyjs/helper-fsm@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
+  integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
+
+"@webassemblyjs/helper-module-context@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
+  integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
     mamacro "^0.0.3"
 
-"@webassemblyjs/helper-wasm-bytecode@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.3.tgz#12f55bbafbbc7ddf9d8059a072cb7b0c17987901"
-  integrity sha512-R1nJW7bjyJLjsJQR5t3K/9LJ0QWuZezl8fGa49DZq4IVaejgvkbNlKEQxLYTC579zgT4IIIVHb5JA59uBPHXyw==
+"@webassemblyjs/helper-wasm-bytecode@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
+  integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
 
-"@webassemblyjs/helper-wasm-section@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.3.tgz#9e79456d9719e116f4f8998ee62ab54ba69a6cf3"
-  integrity sha512-P6F7D61SJY73Yz+fs49Q3+OzlYAZP86OfSpaSY448KzUy65NdfzDmo2NPVte+Rw4562MxEAacvq/mnDuvRWOcg==
+"@webassemblyjs/helper-wasm-section@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
+  integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
   dependencies:
-    "@webassemblyjs/ast" "1.8.3"
-    "@webassemblyjs/helper-buffer" "1.8.3"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.3"
-    "@webassemblyjs/wasm-gen" "1.8.3"
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
 
-"@webassemblyjs/ieee754@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.3.tgz#0a89355b1f6c9d08d0605c2acbc2a6fe3141f5b4"
-  integrity sha512-UD4HuLU99hjIvWz1pD68b52qsepWQlYCxDYVFJQfHh3BHyeAyAlBJ+QzLR1nnS5J6hAzjki3I3AoJeobNNSZlg==
+"@webassemblyjs/ieee754@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
+  integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.3.tgz#b7fd9d7c039e34e375c4473bd4dc89ce8228b920"
-  integrity sha512-XXd3s1BmkC1gpGABuCRLqCGOD6D2L+Ma2BpwpjrQEHeQATKWAQtxAyU9Z14/z8Ryx6IG+L4/NDkIGHrccEhRUg==
+"@webassemblyjs/leb128@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
+  integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.3.tgz#75712db52cfdda868731569ddfe11046f1f1e7a2"
-  integrity sha512-Wv/WH9Zo5h5ZMyfCNpUrjFsLZ3X1amdfEuwdb7MLdG3cPAjRS6yc6ElULlpjLiiBTuzvmLhr3ENsuGyJ3wyCgg==
-
-"@webassemblyjs/wasm-edit@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.3.tgz#23c3c6206b096f9f6aa49623a5310a102ef0fb87"
-  integrity sha512-nB19eUx3Yhi1Vvv3yev5r+bqQixZprMtaoCs1brg9Efyl8Hto3tGaUoZ0Yb4Umn/gQCyoEGFfUxPLp1/8+Jvnw==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.3"
-    "@webassemblyjs/helper-buffer" "1.8.3"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.3"
-    "@webassemblyjs/helper-wasm-section" "1.8.3"
-    "@webassemblyjs/wasm-gen" "1.8.3"
-    "@webassemblyjs/wasm-opt" "1.8.3"
-    "@webassemblyjs/wasm-parser" "1.8.3"
-    "@webassemblyjs/wast-printer" "1.8.3"
-
-"@webassemblyjs/wasm-gen@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.3.tgz#1a433b8ab97e074e6ac2e25fcbc8cb6125400813"
-  integrity sha512-sDNmu2nLBJZ/huSzlJvd9IK8B1EjCsOl7VeMV9VJPmxKYgTJ47lbkSP+KAXMgZWGcArxmcrznqm7FrAPQ7vVGg==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.3"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.3"
-    "@webassemblyjs/ieee754" "1.8.3"
-    "@webassemblyjs/leb128" "1.8.3"
-    "@webassemblyjs/utf8" "1.8.3"
-
-"@webassemblyjs/wasm-opt@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.3.tgz#54754bcf88f88e92b909416a91125301cc81419c"
-  integrity sha512-j8lmQVFR+FR4/645VNgV4R/Jz8i50eaPAj93GZyd3EIJondVshE/D9pivpSDIXyaZt+IkCodlzOoZUE4LnQbeA==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.3"
-    "@webassemblyjs/helper-buffer" "1.8.3"
-    "@webassemblyjs/wasm-gen" "1.8.3"
-    "@webassemblyjs/wasm-parser" "1.8.3"
-
-"@webassemblyjs/wasm-parser@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.3.tgz#d12ed19d1b8e8667a7bee040d2245aaaf215340b"
-  integrity sha512-NBI3SNNtRoy4T/KBsRZCAWUzE9lI94RH2nneLwa1KKIrt/2zzcTavWg6oY05ArCbb/PZDk3OUi63CD1RYtN65w==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.3"
-    "@webassemblyjs/helper-api-error" "1.8.3"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.3"
-    "@webassemblyjs/ieee754" "1.8.3"
-    "@webassemblyjs/leb128" "1.8.3"
-    "@webassemblyjs/utf8" "1.8.3"
-
-"@webassemblyjs/wast-parser@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.3.tgz#44aa123e145503e995045dc3e5e2770069da117b"
-  integrity sha512-gZPst4CNcmGtKC1eYQmgCx6gwQvxk4h/nPjfPBbRoD+Raw3Hs+BS3yhrfgyRKtlYP+BJ8LcY9iFODEQofl2qbg==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.3"
-    "@webassemblyjs/floating-point-hex-parser" "1.8.3"
-    "@webassemblyjs/helper-api-error" "1.8.3"
-    "@webassemblyjs/helper-code-frame" "1.8.3"
-    "@webassemblyjs/helper-fsm" "1.8.3"
+"@webassemblyjs/utf8@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
+  integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
+
+"@webassemblyjs/wasm-edit@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
+  integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/helper-wasm-section" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-opt" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+    "@webassemblyjs/wast-printer" "1.8.5"
+
+"@webassemblyjs/wasm-gen@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
+  integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
+
+"@webassemblyjs/wasm-opt@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
+  integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+
+"@webassemblyjs/wasm-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
+  integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
+
+"@webassemblyjs/wast-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
+  integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/floating-point-hex-parser" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-code-frame" "1.8.5"
+    "@webassemblyjs/helper-fsm" "1.8.5"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/wast-printer@1.8.3":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.3.tgz#b1177780b266b1305f2eeba87c4d6aa732352060"
-  integrity sha512-DTA6kpXuHK4PHu16yAD9QVuT1WZQRT7079oIFFmFSjqjLWGXS909I/7kiLTn931mcj7wGsaUNungjwNQ2lGQ3Q==
+"@webassemblyjs/wast-printer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
+  integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
   dependencies:
-    "@webassemblyjs/ast" "1.8.3"
-    "@webassemblyjs/wast-parser" "1.8.3"
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
     "@xtuc/long" "4.2.2"
 
 "@xtuc/ieee754@^1.2.0":
@@ -11071,15 +11071,15 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.29.5:
-  version "4.29.5"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.5.tgz#52b60a7b0838427c3a894cd801a11dc0836bc79f"
-  integrity sha512-DuWlYUT982c7XVHodrLO9quFbNpVq5FNxLrMUfYUTlgKW0+yPimynYf1kttSQpEneAL1FH3P3OLNgkyImx8qIQ==
+webpack@4.29.6:
+  version "4.29.6"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.6.tgz#66bf0ec8beee4d469f8b598d3988ff9d8d90e955"
+  integrity sha512-MwBwpiE1BQpMDkbnUUaW6K8RFZjljJHArC6tWQJoFm0oQtfoSebtg4Y7/QHnJ/SddtjYLHaKGX64CFjG5rehJw==
   dependencies:
-    "@webassemblyjs/ast" "1.8.3"
-    "@webassemblyjs/helper-module-context" "1.8.3"
-    "@webassemblyjs/wasm-edit" "1.8.3"
-    "@webassemblyjs/wasm-parser" "1.8.3"
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/wasm-edit" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
     acorn "^6.0.5"
     acorn-dynamic-import "^4.0.0"
     ajv "^6.1.0"

From a7c66f982e4422afc4806054bf0e049ba7b76ff8 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Thu, 28 Feb 2019 14:13:20 +0100
Subject: [PATCH 0839/1703] docs: add how to create a minimal repo in bug
 report template

---
 .github/ISSUE_TEMPLATE/1-bug-report.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.md b/.github/ISSUE_TEMPLATE/1-bug-report.md
index c25ee3a88f66..b8249e87c28b 100644
--- a/.github/ISSUE_TEMPLATE/1-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/1-bug-report.md
@@ -52,7 +52,9 @@ Simple steps to reproduce this bug.
 
 Please include: commands run (including args), packages added, related code changes.
 
-If reproduction steps are not enough for reproduction of your issue, please create a minimal GitHub repository with the reproduction of the issue. Share the link to the repo below along with step-by-step instructions to reproduce the problem, as well as expected and actual behavior.
+If reproduction steps are not enough for reproduction of your issue, please create a minimal GitHub repository with the reproduction of the issue. 
+A good way to make a minimal reproduction is to create a new app via `ng new repro-app` and add the minimum possible code to show the problem. 
+Share the link to the repo below along with step-by-step instructions to reproduce the problem, as well as expected and actual behavior.
 
 Issues that don't have enough info and can't be reproduced will be closed.
 

From 9e18cf240e4ab975e421afb2a7da63e41929ebbf Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 1 Mar 2019 11:21:27 +0100
Subject: [PATCH 0840/1703] fix(@schematics/angular): kebab case prefix causes
 lint errors in new directives

`Component` selectors are always kekabed while `Directive` selectors are always camelized. This updates the lint rules to convert the prefix to the appropiate case

Fixes #13796
---
 .../lint/__tsLintRoot__/tslint.json.template  | 30 +++++++++----------
 .../angular/application/index_spec.ts         |  9 ++++++
 .../library/files/tslint.json.template        |  4 +--
 .../schematics/angular/library/index_spec.ts  |  9 ++++++
 4 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/packages/schematics/angular/application/files/lint/__tsLintRoot__/tslint.json.template b/packages/schematics/angular/application/files/lint/__tsLintRoot__/tslint.json.template
index 20341240eecf..1ebe192c95f2 100644
--- a/packages/schematics/angular/application/files/lint/__tsLintRoot__/tslint.json.template
+++ b/packages/schematics/angular/application/files/lint/__tsLintRoot__/tslint.json.template
@@ -1,17 +1,17 @@
 {
-    "extends": "<%= relativePathToWorkspaceRoot %>/tslint.json",
-    "rules": {
-        "directive-selector": [
-            true,
-            "attribute",
-            "<%= prefix %>",
-            "camelCase"
-        ],
-        "component-selector": [
-            true,
-            "element",
-            "<%= prefix %>",
-            "kebab-case"
-        ]
-    }
+  "extends": "<%= relativePathToWorkspaceRoot %>/tslint.json",
+  "rules": {
+    "directive-selector": [
+      true,
+      "attribute",
+      "<%= utils.camelize(prefix) %>",
+      "camelCase"
+    ],
+    "component-selector": [
+      true,
+      "element",
+      "<%= utils.dasherize(prefix) %>",
+      "kebab-case"
+    ]
+  }
 }
diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
index 5ba5a1a415f1..1886385e4427 100644
--- a/packages/schematics/angular/application/index_spec.ts
+++ b/packages/schematics/angular/application/index_spec.ts
@@ -148,6 +148,15 @@ describe('Application Schematic', () => {
     expect(content.rules['component-selector'][2]).toMatch('app');
   });
 
+  it('should set the right prefix in the tslint file when provided is kebabed', () => {
+    const options: ApplicationOptions = { ...defaultOptions, prefix: 'foo-bar' };
+    const tree = schematicRunner.runSchematic('application', options, workspaceTree);
+    const path = '/projects/foo/tslint.json';
+    const content = JSON.parse(tree.readContent(path));
+    expect(content.rules['directive-selector'][2]).toMatch('fooBar');
+    expect(content.rules['component-selector'][2]).toMatch('foo-bar');
+  });
+
   it('should set the right coverage folder in the karma.json file', () => {
     const tree = schematicRunner.runSchematic('application', defaultOptions, workspaceTree);
     const karmaConf = getFileContent(tree, '/projects/foo/karma.conf.js');
diff --git a/packages/schematics/angular/library/files/tslint.json.template b/packages/schematics/angular/library/files/tslint.json.template
index ad2f4a64bf8b..33ecd2e67fbf 100644
--- a/packages/schematics/angular/library/files/tslint.json.template
+++ b/packages/schematics/angular/library/files/tslint.json.template
@@ -4,13 +4,13 @@
     "directive-selector": [
       true,
       "attribute",
-      "<%= prefix %>",
+      "<%= camelize(prefix) %>",
       "camelCase"
     ],
     "component-selector": [
       true,
       "element",
-      "<%= prefix %>",
+      "<%= dasherize(prefix) %>",
       "kebab-case"
     ]
   }
diff --git a/packages/schematics/angular/library/index_spec.ts b/packages/schematics/angular/library/index_spec.ts
index a0d6c7acec5d..234b44f411d4 100644
--- a/packages/schematics/angular/library/index_spec.ts
+++ b/packages/schematics/angular/library/index_spec.ts
@@ -123,6 +123,15 @@ describe('Library Schematic', () => {
     expect(workspace.projects.foo.prefix).toEqual('pre');
   });
 
+  it('should set the right prefix in the tslint file when provided is kebabed', () => {
+    const options: GenerateLibrarySchema = { ...defaultOptions, prefix: 'foo-bar' };
+    const tree = schematicRunner.runSchematic('library', options, workspaceTree);
+    const path = '/projects/foo/tslint.json';
+    const content = JSON.parse(tree.readContent(path));
+    expect(content.rules['directive-selector'][2]).toMatch('fooBar');
+    expect(content.rules['component-selector'][2]).toMatch('foo-bar');
+  });
+
   it('should handle a pascalCasedName', () => {
     const options = {...defaultOptions, name: 'pascalCasedName'};
     const tree = schematicRunner.runSchematic('library', options, workspaceTree);

From b80a2813422cd3891dc1c8663f3e6d44bd466c48 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sun, 3 Mar 2019 11:30:27 +0000
Subject: [PATCH 0841/1703] build: update ajv to version 6.10.0

---
 package.json                                       | 2 +-
 packages/angular_devkit/build_angular/package.json | 2 +-
 packages/angular_devkit/core/package.json          | 2 +-
 yarn.lock                                          | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index c19c865d47a1..3c18f4ca42c1 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
     "@types/webpack-dev-server": "^3.1.0",
     "@types/webpack-sources": "^0.1.5",
     "@yarnpkg/lockfile": "1.1.0",
-    "ajv": "6.9.2",
+    "ajv": "6.10.0",
     "common-tags": "^1.8.0",
     "conventional-changelog": "^1.1.0",
     "conventional-commits-parser": "^3.0.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 24d3a623cae3..64319b8cddd9 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -11,7 +11,7 @@
     "@angular-devkit/build-webpack": "0.0.0",
     "@angular-devkit/core": "0.0.0",
     "@ngtools/webpack": "0.0.0",
-    "ajv": "6.9.2",
+    "ajv": "6.10.0",
     "autoprefixer": "9.4.9",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json
index fb90dccca0a0..d2005d00819b 100644
--- a/packages/angular_devkit/core/package.json
+++ b/packages/angular_devkit/core/package.json
@@ -8,7 +8,7 @@
     "core"
   ],
   "dependencies": {
-    "ajv": "6.9.2",
+    "ajv": "6.10.0",
     "chokidar": "2.1.2",
     "fast-json-stable-stringify": "2.0.0",
     "rxjs": "6.4.0",
diff --git a/yarn.lock b/yarn.lock
index 40ff3d660f25..59dcfdb4a8d8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -911,10 +911,10 @@ ajv-keywords@^3.1.0:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
   integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
 
-ajv@6.9.2:
-  version "6.9.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.2.tgz#4927adb83e7f48e5a32b45729744c71ec39c9c7b"
-  integrity sha512-4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg==
+ajv@6.10.0:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
+  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"

From 2f4602db08abe08cc641ffdeb39d67430ad327cc Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Sun, 3 Mar 2019 14:35:04 -0500
Subject: [PATCH 0842/1703] feat(@angular-devkit/build-angular): change
 es5BrowserSupport  output filename to `polyfills.es5.js`

Closes #13808
---
 .../src/angular-cli-files/models/webpack-configs/browser.ts | 4 ++--
 .../src/angular-cli-files/models/webpack-configs/common.ts  | 6 +++---
 .../src/angular-cli-files/utilities/package-chunk-sort.ts   | 2 +-
 tests/legacy-cli/e2e/tests/basic/scripts-array.ts           | 2 +-
 tests/legacy-cli/e2e/tests/basic/styles-array.ts            | 2 +-
 tests/legacy-cli/e2e/tests/build/polyfills.ts               | 4 ++--
 tests/legacy-cli/e2e/tests/build/styles/extract-css.ts      | 4 ++--
 tests/legacy-cli/e2e/tests/misc/support-ie.ts               | 6 +++---
 tests/legacy-cli/e2e/tests/third-party/bootstrap.ts         | 4 ++--
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
index 7930a438c08f..31bdbab5b424 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
@@ -44,7 +44,7 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
       entrypoints: generateEntryPoints(buildOptions),
       deployUrl: buildOptions.deployUrl,
       sri: buildOptions.subresourceIntegrity,
-      noModuleEntrypoints: ['es2015-polyfills'],
+      noModuleEntrypoints: ['polyfills.es5'],
     }));
   }
 
@@ -113,7 +113,7 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
               const moduleName = module.nameForCondition ? module.nameForCondition() : '';
 
               return /[\\/]node_modules[\\/]/.test(moduleName)
-                && !chunks.some(({ name }) => name === 'polyfills' || name === 'es2015-polyfills'
+                && !chunks.some(({ name }) => name === 'polyfills' || name === 'polyfills.es5'
                   || globalStylesBundleNames.includes(name));
             },
           },
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 59d5c3152f60..0ce614746329 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -54,7 +54,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
   }
 
   if (buildOptions.es5BrowserSupport) {
-    entryPoints['es2015-polyfills'] = [path.join(__dirname, '..', 'es2015-polyfills.js')];
+    entryPoints['polyfills.es5'] = [path.join(__dirname, '..', 'es2015-polyfills.js')];
   }
 
   if (buildOptions.polyfills) {
@@ -68,8 +68,8 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
     ];
 
     if (buildOptions.es5BrowserSupport) {
-      entryPoints['es2015-polyfills'] = [
-        ...entryPoints['es2015-polyfills'],
+      entryPoints['polyfills.es5'] = [
+        ...entryPoints['polyfills.es5'],
         path.join(__dirname, '..', 'es2015-jit-polyfills.js'),
       ];
     }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts
index ee2a2e450e7e..6e08a5b614d1 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts
@@ -26,7 +26,7 @@ export function generateEntryPoints(
   };
 
   const entryPoints = [
-    'es2015-polyfills',
+    'polyfills.es5',
     'polyfills',
     'sw-register',
     ...extraEntryPoints(appConfig.styles, 'styles'),
diff --git a/tests/legacy-cli/e2e/tests/basic/scripts-array.ts b/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
index 54a221ad0194..9ece63173ab3 100644
--- a/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
+++ b/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
@@ -54,7 +54,7 @@ export default function () {
     // index.html lists the right bundles
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script src="runtime.js"></script>
-      <script src="es2015-polyfills.js" nomodule></script>
+      <script src="polyfills.es5.js" nomodule></script>
       <script src="polyfills.js"></script>
       <script src="scripts.js"></script>
       <script src="renamed-script.js"></script>
diff --git a/tests/legacy-cli/e2e/tests/basic/styles-array.ts b/tests/legacy-cli/e2e/tests/basic/styles-array.ts
index 114aa641e7bb..e8360c80a601 100644
--- a/tests/legacy-cli/e2e/tests/basic/styles-array.ts
+++ b/tests/legacy-cli/e2e/tests/basic/styles-array.ts
@@ -43,7 +43,7 @@ export default function () {
     `))
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script src="runtime.js"></script>
-      <script src="es2015-polyfills.js" nomodule></script>
+      <script src="polyfills.es5.js" nomodule></script>
       <script src="polyfills.js"></script>
       <script src="vendor.js"></script>
       <script src="main.js"></script>
diff --git a/tests/legacy-cli/e2e/tests/build/polyfills.ts b/tests/legacy-cli/e2e/tests/build/polyfills.ts
index fe86643c079a..c1ef73372bb7 100644
--- a/tests/legacy-cli/e2e/tests/build/polyfills.ts
+++ b/tests/legacy-cli/e2e/tests/build/polyfills.ts
@@ -15,7 +15,7 @@ export default async function () {
     await expectFileToMatch('dist/test-project/polyfills.js', 'zone.js');
     expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script src="runtime.js"></script>
-      <script src="es2015-polyfills.js" nomodule></script>
+      <script src="polyfills.es5.js" nomodule></script>
       <script src="polyfills.js"></script>
     `);
     const jitPolyfillSize = await getFileSize('dist/test-project/polyfills.js');
@@ -28,7 +28,7 @@ export default async function () {
     await expectFileToMatch('dist/test-project/polyfills.js', 'zone.js');
     expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script src="runtime.js"></script>
-      <script src="es2015-polyfills.js" nomodule></script>
+      <script src="polyfills.es5.js" nomodule></script>
       <script src="polyfills.js"></script>
     `);
 }
diff --git a/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts b/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
index 1f3b30c92c6f..e731432521c4 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
@@ -48,7 +48,7 @@ export default function () {
     `)))
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script src="runtime.js"></script>
-      <script src="es2015-polyfills.js" nomodule></script>
+      <script src="polyfills.es5.js" nomodule></script>
       <script src="polyfills.js"></script>
       <script src="vendor.js"></script>
       <script src="main.js"></script>
@@ -64,7 +64,7 @@ export default function () {
     // index.html lists the right bundles
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script src="runtime.js"></script>
-      <script src="es2015-polyfills.js" nomodule></script>
+      <script src="polyfills.es5.js" nomodule></script>
       <script src="polyfills.js"></script>
       <script src="styles.js"></script>
       <script src="renamed-style.js"></script>
diff --git a/tests/legacy-cli/e2e/tests/misc/support-ie.ts b/tests/legacy-cli/e2e/tests/misc/support-ie.ts
index 5d82fd3aba83..332f36e1daac 100644
--- a/tests/legacy-cli/e2e/tests/misc/support-ie.ts
+++ b/tests/legacy-cli/e2e/tests/misc/support-ie.ts
@@ -10,7 +10,7 @@ export default async function () {
   });
 
   await ng('build');
-  await expectFileNotToExist('dist/test-project/es2015-polyfills.js');
+  await expectFileNotToExist('dist/test-project/polyfills.es5.js');
   await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
     <script src="runtime.js"></script>
     <script src="polyfills.js"></script>
@@ -20,10 +20,10 @@ export default async function () {
   `);
 
   await ng('build', `--es5BrowserSupport`);
-  await expectFileToMatch('dist/test-project/es2015-polyfills.js', 'core-js');
+  await expectFileToMatch('dist/test-project/polyfills.es5.js', 'core-js');
   await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
     <script src="runtime.js"></script>
-    <script src="es2015-polyfills.js" nomodule></script>
+    <script src="polyfills.es5.js" nomodule></script>
     <script src="polyfills.js"></script>
     <script src="styles.js"></script>
     <script src="vendor.js"></script>
diff --git a/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts b/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts
index bfd35c545301..b84d65e340fb 100644
--- a/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts
+++ b/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts
@@ -23,7 +23,7 @@ export default function() {
     .then(() => expectFileToMatch('dist/test-project/styles.css', '* Bootstrap'))
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script src="runtime.js"></script>
-      <script src="es2015-polyfills.js" nomodule></script>
+      <script src="polyfills.es5.js" nomodule></script>
       <script src="polyfills.js"></script>
       <script src="scripts.js"></script>
       <script src="vendor.js"></script>
@@ -40,7 +40,7 @@ export default function() {
     .then(() => expectFileToMatch('dist/test-project/styles.css', '* Bootstrap'))
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script src="runtime.js"></script>
-      <script src="es2015-polyfills.js" nomodule></script>
+      <script src="polyfills.es5.js" nomodule></script>
       <script src="polyfills.js"></script>
       <script src="scripts.js"></script>
       <script src="main.js"></script>

From d1a069710280e7788e2f859f2495c7a8c248e446 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Mon, 4 Mar 2019 13:25:38 +0100
Subject: [PATCH 0843/1703] test: fix new tslint architect test large on
 windows

---
 .../test/tslint/works2_spec_large.ts          | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/tslint/works2_spec_large.ts b/packages/angular_devkit/build_angular/test/tslint/works2_spec_large.ts
index 4fcb9d15916f..21de77daa47b 100644
--- a/packages/angular_devkit/build_angular/test/tslint/works2_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/tslint/works2_spec_large.ts
@@ -9,13 +9,19 @@
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { Architect, Target } from '@angular-devkit/architect/src/index2';
 import { TestingArchitectHost } from '@angular-devkit/architect/testing/index2';
-import { experimental, join, logging, normalize, schema } from '@angular-devkit/core';
+import {
+  experimental,
+  logging,
+  normalize,
+  schema,
+} from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as fs from 'fs';
 import * as path from 'path';
 
-const devkitRoot = normalize((global as any)._DevKitRoot); // tslint:disable-line:no-any
-const workspaceRoot = join(devkitRoot, 'tests/angular_devkit/build_angular/hello-world-app/');
+const devkitRoot = (global as any)._DevKitRoot; // tslint:disable-line:no-any
+const workspaceRoot = path.join(devkitRoot, 'tests/angular_devkit/build_angular/hello-world-app/');
+
 const lintTarget: Target = { project: 'app', target: 'lint' };
 
 // tslint:disable-next-line:no-big-function
@@ -26,17 +32,19 @@ describe('Tslint Target', () => {
 
   beforeEach(async () => {
     const vfHost = new NodeJsSyncHost();
-    const configContent = fs.readFileSync(path.join(workspaceRoot, 'angular.json'), 'utf-8');
+    const configPath = path.join(workspaceRoot, 'angular.json');
+    const configContent = fs.readFileSync(configPath, 'utf-8');
     const workspaceJson = JSON.parse(configContent);
 
     const registry = new schema.CoreSchemaRegistry();
     registry.addPostTransform(schema.transforms.addUndefinedDefaults);
 
-    const workspace = new experimental.workspace.Workspace(workspaceRoot, vfHost);
+    const workspace = new experimental.workspace.Workspace(normalize(workspaceRoot), vfHost);
     await workspace.loadWorkspaceFromJson(workspaceJson).toPromise();
 
     testArchitectHost = new TestingArchitectHost(
-      workspaceRoot, workspaceRoot,
+      workspaceRoot,
+      workspaceRoot,
       new WorkspaceNodeModulesArchitectHost(workspace, workspaceRoot),
     );
     architect = new Architect(testArchitectHost, registry);

From 08c4cb748fb490da7ce3383036ef1d73555629f8 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Wed, 27 Feb 2019 08:10:30 +0100
Subject: [PATCH 0844/1703] fix(@schematics/angular): reintroduce `.sass` as a
 supported file extention

Sass Indented (.sass) is fully supported by the Sass team and we should still offer and support it.

Fixes #13739
---
 ...styleExt__.template => styles.__style__.template} |  0
 packages/schematics/angular/application/index.ts     | 11 ++---------
 .../schematics/angular/application/index_spec.ts     |  6 +++---
 .../other-files/app.component.ts.template            |  2 +-
 ... __name@dasherize__.component.__style__.template} |  0
 .../__name@dasherize__.component.ts.template         |  2 +-
 packages/schematics/angular/component/index.ts       | 12 +-----------
 packages/schematics/angular/component/index_spec.ts  |  4 ++--
 packages/schematics/angular/ng-new/schema.json       |  9 +++++----
 9 files changed, 15 insertions(+), 31 deletions(-)
 rename packages/schematics/angular/application/files/src/{styles.__styleExt__.template => styles.__style__.template} (100%)
 rename packages/schematics/angular/component/files/__name@dasherize@if-flat__/{__name@dasherize__.component.__styleExt__.template => __name@dasherize__.component.__style__.template} (100%)

diff --git a/packages/schematics/angular/application/files/src/styles.__styleExt__.template b/packages/schematics/angular/application/files/src/styles.__style__.template
similarity index 100%
rename from packages/schematics/angular/application/files/src/styles.__styleExt__.template
rename to packages/schematics/angular/application/files/src/styles.__style__.template
diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index bce0c4530d5e..8d0b1eb22fa5 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -31,7 +31,6 @@ import {
   url,
 } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
-import { styleToFileExtention } from '../component/index';
 import { Schema as ComponentOptions } from '../component/schema';
 import { Schema as E2eOptions } from '../e2e/schema';
 import {
@@ -187,8 +186,6 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
     });
   }
 
-  const styleExt = styleToFileExtention(options.style);
-
   const project: WorkspaceProject = {
     root: projectRoot,
     sourceRoot: join(normalize(projectRoot), 'src'),
@@ -209,7 +206,7 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
             join(normalize(projectRoot), 'src', 'assets'),
           ],
           styles: [
-            `${projectRoot}src/styles.${styleExt}`,
+            `${projectRoot}src/styles.${options.style}`,
           ],
           scripts: [],
           es5BrowserSupport: true,
@@ -262,7 +259,7 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
           tsConfig: `${rootFilesRoot}tsconfig.spec.json`,
           karmaConfig: `${rootFilesRoot}karma.conf.js`,
           styles: [
-            `${projectRoot}src/styles.${styleExt}`,
+            `${projectRoot}src/styles.${options.style}`,
           ],
           scripts: [],
           assets: [
@@ -349,8 +346,6 @@ export default function (options: ApplicationOptions): Rule {
       rootSelector: appRootSelector,
     };
 
-    const styleExt = styleToFileExtention(options.style);
-
     return chain([
       addAppToWorkspaceFile(options, workspace),
       mergeWith(
@@ -361,7 +356,6 @@ export default function (options: ApplicationOptions): Rule {
             ...options,
             'dot': '.',
             relativePathToWorkspaceRoot,
-            styleExt,
           }),
           move(sourceRoot),
         ])),
@@ -423,7 +417,6 @@ export default function (options: ApplicationOptions): Rule {
             ...options as any,  // tslint:disable-line:no-any
             selector: appRootSelector,
             ...componentOptions,
-            styleExt,
           }),
           move(sourceDir),
         ]), MergeStrategy.Overwrite),
diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
index 1886385e4427..efa28c282202 100644
--- a/packages/schematics/angular/application/index_spec.ts
+++ b/packages/schematics/angular/application/index_spec.ts
@@ -302,13 +302,13 @@ describe('Application Schematic', () => {
       const prj = config.projects.foo;
       const buildOpt = prj.architect.build.options;
       expect(buildOpt.styles).toEqual([
-        'src/styles.scss',
+        'src/styles.sass',
       ]);
       const testOpt = prj.architect.test.options;
       expect(testOpt.styles).toEqual([
-        'src/styles.scss',
+        'src/styles.sass',
       ]);
-      expect(tree.exists('src/styles.scss')).toBe(true);
+      expect(tree.exists('src/styles.sass')).toBe(true);
     });
 
     it('should set the relative tsconfig paths', () => {
diff --git a/packages/schematics/angular/application/other-files/app.component.ts.template b/packages/schematics/angular/application/other-files/app.component.ts.template
index 91aad371b12d..36845433365f 100644
--- a/packages/schematics/angular/application/other-files/app.component.ts.template
+++ b/packages/schematics/angular/application/other-files/app.component.ts.template
@@ -28,7 +28,7 @@ import { Component } from '@angular/core';
   `,<% } else { %>
   templateUrl: './app.component.html',<% } if(inlineStyle) { %>
   styles: []<% } else { %>
-  styleUrls: ['./app.component.<%= styleExt %>']<% } %>
+  styleUrls: ['./app.component.<%= style %>']<% } %>
 })
 export class AppComponent {
   title = '<%= name %>';
diff --git a/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.__styleExt__.template b/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.__style__.template
similarity index 100%
rename from packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.__styleExt__.template
rename to packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.__style__.template
diff --git a/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template b/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template
index b78148e8ed09..05940077a7fb 100644
--- a/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template
+++ b/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template
@@ -9,7 +9,7 @@ import { Component, OnInit<% if(!!viewEncapsulation) { %>, ViewEncapsulation<% }
   `,<% } else { %>
   templateUrl: './<%= dasherize(name) %>.component.html',<% } if(inlineStyle) { %>
   styles: []<% } else { %>
-  styleUrls: ['./<%= dasherize(name) %>.component.<%= styleExt %>']<% } %><% if(!!viewEncapsulation) { %>,
+  styleUrls: ['./<%= dasherize(name) %>.component.<%= style %>']<% } %><% if(!!viewEncapsulation) { %>,
   encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection !== 'Default') { %>,
   changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %>
 })
diff --git a/packages/schematics/angular/component/index.ts b/packages/schematics/angular/component/index.ts
index 9fd2be9d3007..48288a20f719 100644
--- a/packages/schematics/angular/component/index.ts
+++ b/packages/schematics/angular/component/index.ts
@@ -154,13 +154,12 @@ export default function (options: ComponentOptions): Rule {
 
     const templateSource = apply(url('./files'), [
       options.skipTests ? filter(path => !path.endsWith('.spec.ts.template')) : noop(),
-      options.inlineStyle ? filter(path => !path.endsWith('.__styleExt__.template')) : noop(),
+      options.inlineStyle ? filter(path => !path.endsWith('.__style__.template')) : noop(),
       options.inlineTemplate ? filter(path => !path.endsWith('.html.template')) : noop(),
       applyTemplates({
         ...strings,
         'if-flat': (s: string) => options.flat ? '' : s,
         ...options,
-        styleExt: styleToFileExtention(options.style),
       }),
       move(parsedPath.path),
     ]);
@@ -172,12 +171,3 @@ export default function (options: ComponentOptions): Rule {
     ]);
   };
 }
-
-export function styleToFileExtention(style: Style | undefined): string {
-  switch (style) {
-    case Style.Sass:
-      return 'scss';
-    default:
-      return style || 'css';
-  }
-}
diff --git a/packages/schematics/angular/component/index_spec.ts b/packages/schematics/angular/component/index_spec.ts
index 516f126c5005..7533dadb8593 100644
--- a/packages/schematics/angular/component/index_spec.ts
+++ b/packages/schematics/angular/component/index_spec.ts
@@ -262,8 +262,8 @@ describe('Component Schematic', () => {
     const options = { ...defaultOptions, style: Style.Sass };
     const tree = schematicRunner.runSchematic('component', options, appTree);
     const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
-    expect(content).toMatch(/styleUrls: \['.\/foo.component.scss/);
-    expect(tree.files).toContain('/projects/bar/src/app/foo/foo.component.scss');
+    expect(content).toMatch(/styleUrls: \['.\/foo.component.sass/);
+    expect(tree.files).toContain('/projects/bar/src/app/foo/foo.component.sass');
     expect(tree.files).not.toContain('/projects/bar/src/app/foo/foo.component.css');
   });
 
diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
index 4aa1ee2b9b7f..4a1d50478fec 100644
--- a/packages/schematics/angular/ng-new/schema.json
+++ b/packages/schematics/angular/ng-new/schema.json
@@ -125,10 +125,11 @@
         "message": "Which stylesheet format would you like to use?",
         "type": "list",
         "items": [
-          { "value": "css",  "label": "CSS    (.css )" },
-          { "value": "sass", "label": "Sass   (.scss) [ http://sass-lang.com   ]" },
-          { "value": "less", "label": "Less   (.less) [ http://lesscss.org     ]" },
-          { "value": "styl", "label": "Stylus (.styl) [ http://stylus-lang.com ]" }
+          { "value": "css",  "label": "CSS" },
+          { "value": "scss", "label": "SCSS   [ http://sass-lang.com/documentation/file.SASS_REFERENCE.html#syntax ]" },
+          { "value": "sass", "label": "Sass   [ http://sass-lang.com/documentation/file.INDENTED_SYNTAX.html       ]" },
+          { "value": "less", "label": "Less   [ http://lesscss.org                                                 ]" },
+          { "value": "styl", "label": "Stylus [ http://stylus-lang.com                                             ] " }
         ]
       }
     },

From 1fcb9a09f9e1aa4353aa79f373334f3857b2afab Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Wed, 27 Feb 2019 08:19:11 +0100
Subject: [PATCH 0845/1703] test: remove now duplicate test

---
 packages/schematics/angular/component/index_spec.ts | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/packages/schematics/angular/component/index_spec.ts b/packages/schematics/angular/component/index_spec.ts
index 7533dadb8593..e79895f49ccc 100644
--- a/packages/schematics/angular/component/index_spec.ts
+++ b/packages/schematics/angular/component/index_spec.ts
@@ -250,15 +250,6 @@ describe('Component Schematic', () => {
   });
 
   it('should respect the style option', () => {
-    const options = { ...defaultOptions, style: Style.Scss };
-    const tree = schematicRunner.runSchematic('component', options, appTree);
-    const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
-    expect(content).toMatch(/styleUrls: \['.\/foo.component.scss/);
-    expect(tree.files).toContain('/projects/bar/src/app/foo/foo.component.scss');
-    expect(tree.files).not.toContain('/projects/bar/src/app/foo/foo.component.css');
-  });
-
-  it('should respect the style preprocessor option', () => {
     const options = { ...defaultOptions, style: Style.Sass };
     const tree = schematicRunner.runSchematic('component', options, appTree);
     const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');

From dfb08b95b73f3e75d0f2cd0c61f336dc86d0769a Mon Sep 17 00:00:00 2001
From: Mathias Raacke <mathias@raacke.info>
Date: Sun, 17 Feb 2019 18:34:54 +0100
Subject: [PATCH 0846/1703] feat(@ngtools/webpack): allow .svg files as
 templates

With directTemplateLoading enabled, components
can now use .svg files as templates. For AOT builds,
the Angular compiler host now reads .svg files
directly when reading component templates.
For JIT builds, replaceResources creates a require call
that directly uses raw-loader instead of using the
loader provided by the current webpack configuration.

Closes #10567
---
 .../models/webpack-configs/common.ts          |  1 -
 .../test/browser/svg_spec_large.ts            | 59 +++++++++++++
 .../webpack/src/angular_compiler_plugin.ts    |  3 +-
 packages/ngtools/webpack/src/compiler_host.ts |  3 +-
 .../src/transformers/replace_resources.ts     | 22 +++--
 .../transformers/replace_resources_spec.ts    | 88 +++++++++++++++++--
 6 files changed, 156 insertions(+), 20 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/test/browser/svg_spec_large.ts

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 0ce614746329..749c1ed449a9 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -307,7 +307,6 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
     },
     module: {
       rules: [
-        { test: /\.html$/, loader: 'raw-loader' },
         {
           test: /\.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)$/,
           loader: 'file-loader',
diff --git a/packages/angular_devkit/build_angular/test/browser/svg_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/svg_spec_large.ts
new file mode 100644
index 000000000000..44756101654d
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/svg_spec_large.ts
@@ -0,0 +1,59 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { runTargetSpec } from '@angular-devkit/architect/testing';
+import { join, normalize, virtualFs } from '@angular-devkit/core';
+import { tap } from 'rxjs/operators';
+import { browserTargetSpec, host, outputPath } from '../utils';
+
+describe('Browser Builder allow svg', () => {
+
+  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
+  afterEach(done => host.restore().toPromise().then(done, done.fail));
+
+  it('works with aot',
+    (done) => {
+
+    const svg = `
+      <svg xmlns="http://www.w3.org/2000/svg">
+        <text x="20" y="20" font-size="20" fill="red">Hello World</text>
+      </svg>`;
+
+    host.writeMultipleFiles({
+      './src/app/app.component.svg': svg,
+      './src/app/app.component.ts': `
+        import { Component } from '@angular/core';
+
+        @Component({
+          selector: 'app-root',
+          templateUrl: './app.component.svg',
+          styleUrls: []
+        })
+        export class AppComponent {
+          title = 'app';
+        }
+      `,
+    });
+
+    const overrides = { aot: true };
+
+    runTargetSpec(host, browserTargetSpec, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => {
+        const content = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, 'main.js')),
+        );
+
+        expect(content).toContain('":svg:svg"');
+        expect(host.scopedSync().exists(normalize('dist/app.component.svg')))
+          .toBe(false, 'should not copy app.component.svg to dist');
+      }),
+    ).toPromise().then(done, done.fail);
+  });
+
+});
diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 06a751ed635f..e42eccdd6c83 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -863,7 +863,8 @@ export class AngularCompilerPlugin {
 
     if (this._JitMode) {
       // Replace resources in JIT.
-      this._transformers.push(replaceResources(isAppPath, getTypeChecker));
+      this._transformers.push(
+        replaceResources(isAppPath, getTypeChecker, this._options.directTemplateLoading));
     } else {
       // Remove unneeded angular decorators.
       this._transformers.push(removeDecorators(isAppPath, getTypeChecker));
diff --git a/packages/ngtools/webpack/src/compiler_host.ts b/packages/ngtools/webpack/src/compiler_host.ts
index 873d2fb93e4a..aac65c453ef0 100644
--- a/packages/ngtools/webpack/src/compiler_host.ts
+++ b/packages/ngtools/webpack/src/compiler_host.ts
@@ -336,7 +336,8 @@ export class WebpackCompilerHost implements ts.CompilerHost {
   }
 
   readResource(fileName: string) {
-    if (this.directTemplateLoading && fileName.endsWith('.html')) {
+    if (this.directTemplateLoading &&
+        (fileName.endsWith('.html') || fileName.endsWith('.svg'))) {
       return this.readFile(fileName);
     }
 
diff --git a/packages/ngtools/webpack/src/transformers/replace_resources.ts b/packages/ngtools/webpack/src/transformers/replace_resources.ts
index 22428e15e262..077a0532d760 100644
--- a/packages/ngtools/webpack/src/transformers/replace_resources.ts
+++ b/packages/ngtools/webpack/src/transformers/replace_resources.ts
@@ -10,6 +10,7 @@ import * as ts from 'typescript';
 export function replaceResources(
   shouldTransform: (fileName: string) => boolean,
   getTypeChecker: () => ts.TypeChecker,
+  directTemplateLoading = false,
 ): ts.TransformerFactory<ts.SourceFile> {
 
   return (context: ts.TransformationContext) => {
@@ -19,7 +20,7 @@ export function replaceResources(
       if (ts.isClassDeclaration(node)) {
         node.decorators = ts.visitNodes(
           node.decorators,
-          (node: ts.Decorator) => visitDecorator(node, typeChecker),
+          (node: ts.Decorator) => visitDecorator(node, typeChecker, directTemplateLoading),
         );
       }
 
@@ -34,7 +35,10 @@ export function replaceResources(
   };
 }
 
-function visitDecorator(node: ts.Decorator, typeChecker: ts.TypeChecker): ts.Decorator {
+function visitDecorator(
+  node: ts.Decorator,
+  typeChecker: ts.TypeChecker,
+  directTemplateLoading: boolean): ts.Decorator {
   if (!isComponentDecorator(node, typeChecker)) {
     return node;
   }
@@ -56,7 +60,8 @@ function visitDecorator(node: ts.Decorator, typeChecker: ts.TypeChecker): ts.Dec
   // visit all properties
   let properties = ts.visitNodes(
     objectExpression.properties,
-    (node: ts.ObjectLiteralElementLike) => visitComponentMetadata(node, styleReplacements),
+    (node: ts.ObjectLiteralElementLike) =>
+      visitComponentMetadata(node, styleReplacements, directTemplateLoading),
   );
 
   // replace properties with updated properties
@@ -83,6 +88,7 @@ function visitDecorator(node: ts.Decorator, typeChecker: ts.TypeChecker): ts.Dec
 function visitComponentMetadata(
   node: ts.ObjectLiteralElementLike,
   styleReplacements: ts.Expression[],
+  directTemplateLoading: boolean,
 ): ts.ObjectLiteralElementLike | undefined {
   if (!ts.isPropertyAssignment(node) || ts.isComputedPropertyName(node.name)) {
     return node;
@@ -98,7 +104,7 @@ function visitComponentMetadata(
       return ts.updatePropertyAssignment(
         node,
         ts.createIdentifier('template'),
-        createRequireExpression(node.initializer),
+        createRequireExpression(node.initializer, directTemplateLoading ? '!raw-loader!' : ''),
       );
 
     case 'styles':
@@ -133,13 +139,13 @@ function visitComponentMetadata(
   }
 }
 
-export function getResourceUrl(node: ts.Expression): string | null {
+export function getResourceUrl(node: ts.Expression, loader = ''): string | null {
   // only analyze strings
   if (!ts.isStringLiteral(node) && !ts.isNoSubstitutionTemplateLiteral(node)) {
     return null;
   }
 
-  return `${/^\.?\.\//.test(node.text) ? '' : './'}${node.text}`;
+  return `${loader}${/^\.?\.\//.test(node.text) ? '' : './'}${node.text}`;
 }
 
 function isComponentDecorator(node: ts.Node, typeChecker: ts.TypeChecker): node is ts.Decorator {
@@ -155,8 +161,8 @@ function isComponentDecorator(node: ts.Node, typeChecker: ts.TypeChecker): node
   return false;
 }
 
-function createRequireExpression(node: ts.Expression): ts.Expression {
-  const url = getResourceUrl(node);
+function createRequireExpression(node: ts.Expression, loader = ''): ts.Expression {
+  const url = getResourceUrl(node, loader);
   if (!url) {
     return node;
   }
diff --git a/packages/ngtools/webpack/src/transformers/replace_resources_spec.ts b/packages/ngtools/webpack/src/transformers/replace_resources_spec.ts
index 0ba09eecb385..d385c767e7f2 100644
--- a/packages/ngtools/webpack/src/transformers/replace_resources_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/replace_resources_spec.ts
@@ -9,10 +9,11 @@ import { tags } from '@angular-devkit/core';  // tslint:disable-line:no-implicit
 import { createTypescriptContext, transformTypescript } from './ast_helpers';
 import { replaceResources } from './replace_resources';
 
-function transform(input: string, shouldTransform = true) {
+function transform(input: string, shouldTransform = true, directTemplateLoading = true) {
   const { program } = createTypescriptContext(input);
   const getTypeChecker = () => program.getTypeChecker();
-  const transformer = replaceResources(() => shouldTransform, getTypeChecker);
+  const transformer = replaceResources(
+    () => shouldTransform, getTypeChecker, directTemplateLoading);
 
   return transformTypescript(input, [transformer]);
 }
@@ -45,7 +46,7 @@ describe('@ngtools/webpack transformers', () => {
         AppComponent = tslib_1.__decorate([
             Component({
                 selector: 'app-root',
-                template: require("./app.component.html"),
+                template: require("!raw-loader!./app.component.html"),
                 styles: [require("./app.component.css"), require("./app.component.2.css")]
             })
         ], AppComponent);
@@ -56,6 +57,75 @@ describe('@ngtools/webpack transformers', () => {
       expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
     });
 
+    it('should not replace resources when directTemplateLoading is false', () => {
+        const input = tags.stripIndent`
+          import { Component } from '@angular/core';
+
+          @Component({
+            selector: 'app-root',
+            templateUrl: './app.component.html',
+            styleUrls: ['./app.component.css', './app.component.2.css']
+          })
+          export class AppComponent {
+            title = 'app';
+          }
+        `;
+        const output = tags.stripIndent`
+          import * as tslib_1 from "tslib";
+          import { Component } from '@angular/core';
+          let AppComponent = class AppComponent {
+              constructor() {
+                  this.title = 'app';
+              }
+          };
+          AppComponent = tslib_1.__decorate([
+              Component({
+                  selector: 'app-root',
+                  template: require("./app.component.html"),
+                  styles: [require("./app.component.css"), require("./app.component.2.css")]
+              })
+          ], AppComponent);
+          export { AppComponent };
+        `;
+
+        const result = transform(input, true, false);
+        expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+      });
+
+
+    it('should should support svg as templates', () => {
+      const input = tags.stripIndent`
+        import { Component } from '@angular/core';
+
+        @Component({
+          selector: 'app-root',
+          templateUrl: './app.component.svg'
+        })
+        export class AppComponent {
+          title = 'app';
+        }
+      `;
+      const output = tags.stripIndent`
+        import * as tslib_1 from "tslib";
+        import { Component } from '@angular/core';
+        let AppComponent = class AppComponent {
+            constructor() {
+                this.title = 'app';
+            }
+        };
+        AppComponent = tslib_1.__decorate([
+            Component({
+                selector: 'app-root',
+                template: require("!raw-loader!./app.component.svg")
+            })
+        ], AppComponent);
+        export { AppComponent };
+      `;
+
+      const result = transform(input);
+      expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+    });
+
     it('should merge styleUrls with styles', () => {
       const input = tags.stripIndent`
         import { Component } from '@angular/core';
@@ -81,7 +151,7 @@ describe('@ngtools/webpack transformers', () => {
         AppComponent = tslib_1.__decorate([
             Component({
                 selector: 'app-root',
-                template: require("./app.component.html"),
+                template: require("!raw-loader!./app.component.html"),
                 styles: ["a { color: red }", require("./app.component.css")]
             })
         ], AppComponent);
@@ -116,7 +186,7 @@ describe('@ngtools/webpack transformers', () => {
         AppComponent = tslib_1.__decorate([
             Component({
                 selector: 'app-root',
-                template: require("./app.component.html"),
+                template: require("!raw-loader!./app.component.html"),
                 styles: [require("./app.component.css"), require("./app.component.2.css")]
             })
         ], AppComponent);
@@ -151,7 +221,7 @@ describe('@ngtools/webpack transformers', () => {
         AppComponent = tslib_1.__decorate([
           NgComponent({
                 selector: 'app-root',
-                template: require("./app.component.html"),
+                template: require("!raw-loader!./app.component.html"),
                 styles: [require("./app.component.css"), require("./app.component.2.css")]
             })
         ], AppComponent);
@@ -160,7 +230,7 @@ describe('@ngtools/webpack transformers', () => {
 
       const { program } = createTypescriptContext(input);
       const getTypeChecker = () => program.getTypeChecker();
-      const transformer = replaceResources(() => true, getTypeChecker);
+      const transformer = replaceResources(() => true, getTypeChecker, true);
       const result = transformTypescript(input, [transformer]);
 
       expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
@@ -190,7 +260,7 @@ describe('@ngtools/webpack transformers', () => {
         AppComponent = tslib_1.__decorate([
           ng.Component({
                 selector: 'app-root',
-                template: require("./app.component.html"),
+                template: require("!raw-loader!./app.component.html"),
                 styles: [require("./app.component.css"), require("./app.component.2.css")]
             })
         ], AppComponent);
@@ -238,7 +308,7 @@ describe('@ngtools/webpack transformers', () => {
         AppComponent = tslib_1.__decorate([
             Component({
                 selector: 'app-root',
-                template: require("./app.component.html"),
+                template: require("!raw-loader!./app.component.html"),
                 styles: [require("./app.component.css")]
             })
         ], AppComponent);

From 0cb7092a166a672775e5e9e0f671244838608ed3 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 4 Mar 2019 17:30:50 -0800
Subject: [PATCH 0847/1703] build: add golden API to prettierignore

---
 .prettierignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .prettierignore

diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 000000000000..fbcd212375a5
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1 @@
+/etc/api

From e6ba05ba644be207cde61472618d7c886c86c25e Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Fri, 22 Feb 2019 17:21:29 -0800
Subject: [PATCH 0848/1703] fix(@angular-devkit/build-webpack): also split on
 multi modules and spaces

Its not perfect but it will give a better overview of the file and it
is shorter.
---
 packages/angular_devkit/build_webpack/src/plugins/architect.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_webpack/src/plugins/architect.ts b/packages/angular_devkit/build_webpack/src/plugins/architect.ts
index 83549ab10bc8..952874042739 100644
--- a/packages/angular_devkit/build_webpack/src/plugins/architect.ts
+++ b/packages/angular_devkit/build_webpack/src/plugins/architect.ts
@@ -100,7 +100,7 @@ export class ArchitectPlugin {
       // This is safe since we still verify it.
       const m = module as unknown as { identifier?: () => string };
       const moduleId = '' + (typeof m.identifier == 'function' ? m.identifier() : '');
-      const id = moduleId.split('!').slice(-1)[0].trim();
+      const id = moduleId.split(/!|\s+|\bmulti\b/).slice(-1)[0].trim();
       const p = path.relative(context.workspaceRoot, id);
 
       update(`Building ${p}`);

From f0adbc41fd8c10439c09e68ed6ba9294b4dfe953 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 4 Mar 2019 16:51:24 -0800
Subject: [PATCH 0849/1703] fix(@angular-devkit/architect): properly report
 errors thrown by builder

When they are thrown by the builder itself.
---
 .../architect/src/create-builder.ts           | 10 +++-
 .../architect/src/index2_spec.ts              | 52 ++++++++++++++++++-
 2 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/architect/src/create-builder.ts b/packages/angular_devkit/architect/src/create-builder.ts
index 2f5e9416e51a..8e3e5e7bcfc8 100644
--- a/packages/angular_devkit/architect/src/create-builder.ts
+++ b/packages/angular_devkit/architect/src/create-builder.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { experimental, isPromise, json, logging } from '@angular-devkit/core';
-import { Observable, Subscription, from, isObservable, of } from 'rxjs';
+import { Observable, Subscription, from, isObservable, of, throwError } from 'rxjs';
 import { tap } from 'rxjs/operators';
 import {
   BuilderContext,
@@ -14,6 +14,7 @@ import {
   BuilderInfo,
   BuilderInput,
   BuilderOutput,
+  BuilderOutputLike,
   BuilderProgressState,
   Target,
   TypedBuilderProgress,
@@ -148,7 +149,12 @@ export function createBuilder<
         };
 
         context.reportRunning();
-        let result = fn(i.options as OptT, context);
+        let result: BuilderOutputLike;
+        try {
+          result = fn(i.options as OptT, context);
+        } catch (e) {
+          result = throwError(e);
+        }
 
         if (isPromise(result)) {
           result = from(result);
diff --git a/packages/angular_devkit/architect/src/index2_spec.ts b/packages/angular_devkit/architect/src/index2_spec.ts
index d8c7b876c844..1e64b06a2beb 100644
--- a/packages/angular_devkit/architect/src/index2_spec.ts
+++ b/packages/angular_devkit/architect/src/index2_spec.ts
@@ -9,7 +9,7 @@ import { schema } from '@angular-devkit/core';
 import { timer } from 'rxjs';
 import { map, take, tap, toArray } from 'rxjs/operators';
 import { TestingArchitectHost } from '../testing/testing-architect-host';
-import { BuilderOutput } from './api';
+import { BuilderOutput, BuilderRun } from './api';
 import { Architect } from './architect';
 import { createBuilder } from './create-builder';
 
@@ -135,4 +135,54 @@ describe('architect', () => {
     expect(results).toBe(10);
     expect(all.length).toBe(10);
   });
+
+  it('reports errors in the builder', async () => {
+    testArchitectHost.addBuilder('package:error', createBuilder(() => {
+      throw new Error('Error in the builder.');
+    }));
+
+    let run: BuilderRun | undefined = undefined;
+    try {
+      try {
+        // This should not throw.
+        run = await architect.scheduleBuilder('package:error', {});
+      } catch (err) {
+        expect(err).toBeUndefined();
+        throw err;
+      }
+
+      // This should throw.
+      await run.result;
+      expect('to throw').not.toEqual('to throw');
+    } catch {
+    }
+    if (run) {
+      await run.stop();
+    }
+  });
+
+  it('reports errors in the builder (async)', async () => {
+    testArchitectHost.addBuilder('package:error', createBuilder(() => {
+      return new Promise((_, reject) => reject(new Error('Error async')));
+    }));
+
+    let run: BuilderRun | undefined = undefined;
+    try {
+      try {
+        // This should not throw.
+        run = await architect.scheduleBuilder('package:error', {});
+      } catch (err) {
+        expect(err).toBeUndefined();
+        throw err;
+      }
+
+      // This should throw.
+      await run.result;
+      expect('to throw').not.toEqual('to throw');
+    } catch {
+    }
+    if (run) {
+      await run.stop();
+    }
+  });
 });

From 02943eaf4914bd13db48eba3e5a05a1a65c79cad Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 4 Mar 2019 16:53:12 -0800
Subject: [PATCH 0850/1703] fix(@angular-devkit/architect): properly subscribe
 to error handlers

If an error is reported but ANY subscription have an undefined error handler, RxJS
reports the error to the "host platform" (it setTimeout(() => throw error)). Since
we properly handle errors in some places, but should ignore them in others (e.g.
we handle errors on the outboundBus, so the output subscription should ignore it),
we still need to subscribe to error, just ignore it.
---
 .../architect/src/schedule-by-name.ts         | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/packages/angular_devkit/architect/src/schedule-by-name.ts b/packages/angular_devkit/architect/src/schedule-by-name.ts
index 0022c9b53207..f48c6be634f2 100644
--- a/packages/angular_devkit/architect/src/schedule-by-name.ts
+++ b/packages/angular_devkit/architect/src/schedule-by-name.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { experimental, json, logging } from '@angular-devkit/core';
-import { Subscription } from 'rxjs';
-import { first, ignoreElements, map, shareReplay } from 'rxjs/operators';
+import { EMPTY, Subscription } from 'rxjs';
+import { catchError, first, ignoreElements, map, share, shareReplay, tap } from 'rxjs/operators';
 import {
   BuilderInfo,
   BuilderInput,
@@ -60,38 +60,44 @@ export async function scheduleByName(
       if (event.kind === experimental.jobs.JobOutboundMessageKind.Start) {
         job.input.next(message);
       }
-    });
+    }, () => {});
   } else {
     job.input.next(message);
   }
 
   const logChannelSub = job.getChannel<logging.LogEntry>('log').subscribe(entry => {
     logger.next(entry);
-  });
+  }, () => {});
 
-  const s = job.outboundBus.subscribe(
-    undefined,
-    undefined,
-    () => {
+  const s = job.outboundBus.subscribe({
+    error() {},
+    complete() {
       s.unsubscribe();
       logChannelSub.unsubscribe();
       if (stateSubscription) {
         stateSubscription.unsubscribe();
       }
     },
-  );
+  });
   const output = job.output.pipe(
     map(output => ({
       ...output,
       ...options.target ? { target: options.target } : 0,
       info,
     } as BuilderOutput)),
+    shareReplay(),
   );
 
+  // Start the builder.
+  output.pipe(first()).subscribe({
+    error() {},
+  });
+
   return {
     id,
     info,
-    result: output.pipe(first()).toPromise(),
+    // This is a getter so that it always returns the next output, and not the same one.
+    get result() { return output.pipe(first()).toPromise(); },
     output,
     progress: job.getChannel<BuilderProgressReport>('progress', progressSchema).pipe(
       shareReplay(1),
@@ -99,7 +105,10 @@ export async function scheduleByName(
     stop() {
       job.stop();
 
-      return output.pipe(ignoreElements()).toPromise();
+      return job.outboundBus.pipe(
+        ignoreElements(),
+        catchError(() => EMPTY),
+      ).toPromise();
     },
   };
 }

From 041907d551a3d3470b1f60d77f7fa84a3e76ae06 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Fri, 22 Feb 2019 17:54:10 -0800
Subject: [PATCH 0851/1703] feat(@angular-devkit/core): add factories for
 workspace

It makes it easier instead of always copy-pasting the same findUp code
to get the workspace file.
---
 .../angular_devkit/core/src/_golden-api.d.ts  |  9 ++-
 .../core/src/workspace/workspace.ts           | 76 +++++++++++++++++--
 2 files changed, 77 insertions(+), 8 deletions(-)

diff --git a/etc/api/angular_devkit/core/src/_golden-api.d.ts b/etc/api/angular_devkit/core/src/_golden-api.d.ts
index 7dab611a0ced..7f22b941c29c 100644
--- a/etc/api/angular_devkit/core/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/core/src/_golden-api.d.ts
@@ -1004,7 +1004,7 @@ export declare class Workspace {
     readonly newProjectRoot: string | undefined;
     readonly root: Path;
     readonly version: number;
-    constructor(_root: Path, _host: virtualFs.Host<{}>);
+    constructor(_root: Path, _host: virtualFs.Host<{}>, registry?: schema.CoreSchemaRegistry);
     getCli(): WorkspaceTool;
     getDefaultProjectName(): string | null;
     getProject(projectName: string): WorkspaceProject;
@@ -1018,6 +1018,13 @@ export declare class Workspace {
     loadWorkspaceFromHost(workspacePath: Path): Observable<this>;
     loadWorkspaceFromJson(json: {}): Observable<this>;
     validateAgainstSchema<T = {}>(contentJson: {}, schemaJson: JsonObject): Observable<T>;
+    protected static _workspaceFileNames: string[];
+    static findWorkspaceFile(host: virtualFs.Host<{}>, path: Path): Promise<Path | null>;
+    static fromPath(host: virtualFs.Host<{}>, path: Path, registry: schema.CoreSchemaRegistry): Promise<Workspace>;
+}
+
+export declare class WorkspaceFileNotFoundException extends BaseException {
+    constructor(path: Path);
 }
 
 export declare class WorkspaceNotYetLoadedException extends BaseException {
diff --git a/packages/angular_devkit/core/src/workspace/workspace.ts b/packages/angular_devkit/core/src/workspace/workspace.ts
index d03bdb42c898..dad765c4c9cd 100644
--- a/packages/angular_devkit/core/src/workspace/workspace.ts
+++ b/packages/angular_devkit/core/src/workspace/workspace.ts
@@ -6,8 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import { existsSync } from 'fs';
+import * as path from 'path';
 import { Observable, of, throwError } from 'rxjs';
-import { concatMap, map, tap } from 'rxjs/operators';
+import { concatMap, first, map, tap } from 'rxjs/operators';
 import { BaseException } from '../exception';
 import {
   JsonObject,
@@ -17,16 +19,22 @@ import {
 } from '../json';
 import {
   Path,
+  basename,
+  dirname,
   isAbsolute,
   join,
   normalize,
-  relative,
-  resolve,
-  virtualFs,
+  relative, resolve, virtualFs,
 } from '../virtual-fs';
 import { WorkspaceProject, WorkspaceSchema, WorkspaceTool } from './workspace-schema';
 
 
+export class WorkspaceFileNotFoundException extends BaseException {
+  constructor(path: Path) {
+    super(`Workspace could not be found from path ${path}.`);
+  }
+}
+
 export class ProjectNotFoundException extends BaseException {
   constructor(name: string) {
     super(`Project '${name}' could not be found in workspace.`);
@@ -55,15 +63,69 @@ export class AmbiguousProjectPathException extends BaseException {
   }
 }
 
+async function _findUp(host: virtualFs.Host, names: string[], from: Path): Promise<Path | null> {
+  if (!Array.isArray(names)) {
+    names = [names];
+  }
+
+  do {
+    for (const name of names) {
+      const p = join(from, name);
+      if (await host.exists(p)) {
+        return p;
+      }
+    }
+
+    from = dirname(from);
+  } while (from && from !== dirname(from));
+
+  return null;
+}
+
 export class Workspace {
+  protected static _workspaceFileNames = [
+    'angular.json',
+    '.angular.json',
+    'workspace.json',
+    '.workspace.json',
+  ];
+
   private readonly _workspaceSchemaPath = normalize(require.resolve('./workspace-schema.json'));
   private _workspaceSchema: JsonObject;
   private _workspace: WorkspaceSchema;
   private _registry: schema.CoreSchemaRegistry;
 
-  constructor(private _root: Path, private _host: virtualFs.Host<{}>) {
-    this._registry = new schema.CoreSchemaRegistry();
-    this._registry.addPostTransform(schema.transforms.addUndefinedDefaults);
+  constructor(
+    private _root: Path,
+    private _host: virtualFs.Host<{}>,
+    registry?: schema.CoreSchemaRegistry,
+  ) {
+    if (registry) {
+      this._registry = registry;
+    } else {
+      this._registry = new schema.CoreSchemaRegistry();
+      this._registry.addPostTransform(schema.transforms.addUndefinedDefaults);
+    }
+  }
+
+  static async findWorkspaceFile(host: virtualFs.Host<{}>, path: Path): Promise<Path | null> {
+    return await _findUp(host, this._workspaceFileNames, path);
+  }
+  static async fromPath(
+    host: virtualFs.Host<{}>,
+    path: Path,
+    registry: schema.CoreSchemaRegistry,
+  ): Promise<Workspace> {
+    const maybePath = await this.findWorkspaceFile(host, path);
+
+    if (!maybePath) {
+      throw new WorkspaceFileNotFoundException(path);
+    }
+
+    return new Workspace(dirname(maybePath), host, registry)
+      .loadWorkspaceFromHost(basename(maybePath))
+      .pipe(first())
+      .toPromise();
   }
 
   loadWorkspaceFromJson(json: {}) {

From e8dab635ff589b07b0d636b46149076161f016cb Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Fri, 22 Feb 2019 21:03:17 -0800
Subject: [PATCH 0852/1703] feat(@angular-devkit/build-angular): add Browser
 Builder v2

It exposes a lot of functions that can be reused to run webpack with
different config, so third party builders can reuse those.
---
 .../build_angular/builders.json               |   1 +
 .../build_angular/src/browser/index2.ts       | 298 ++++++++++++++++++
 2 files changed, 299 insertions(+)
 create mode 100644 packages/angular_devkit/build_angular/src/browser/index2.ts

diff --git a/packages/angular_devkit/build_angular/builders.json b/packages/angular_devkit/build_angular/builders.json
index 6d299c5751b3..9ad029858017 100644
--- a/packages/angular_devkit/build_angular/builders.json
+++ b/packages/angular_devkit/build_angular/builders.json
@@ -7,6 +7,7 @@
       "description": "Build a server app and a browser app, then render the index.html and use it for the browser output."
     },
     "browser": {
+      "implementation": "./src/browser/index2",
       "class": "./src/browser",
       "schema": "./src/browser/schema.json",
       "description": "Build a browser app."
diff --git a/packages/angular_devkit/build_angular/src/browser/index2.ts b/packages/angular_devkit/build_angular/src/browser/index2.ts
new file mode 100644
index 000000000000..0523b6cc83d8
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/browser/index2.ts
@@ -0,0 +1,298 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect/src/index2';
+import {
+  WebpackLoggingCallback,
+  runWebpack,
+} from '@angular-devkit/build-webpack/src/webpack/index2';
+import {
+  Path,
+  experimental,
+  getSystemPath,
+  join,
+  json,
+  logging,
+  normalize,
+  resolve,
+  schema,
+  virtualFs,
+} from '@angular-devkit/core';
+import { NodeJsSyncHost } from '@angular-devkit/core/node';
+import * as fs from 'fs';
+import { EMPTY, Observable, from, of } from 'rxjs';
+import { concatMap, last, map, switchMap } from 'rxjs/operators';
+import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
+import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
+import {
+  getAotConfig,
+  getBrowserConfig,
+  getCommonConfig,
+  getNonAotConfig,
+  getStatsConfig,
+  getStylesConfig,
+} from '../angular-cli-files/models/webpack-configs';
+import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
+import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
+import { augmentAppWithServiceWorker } from '../angular-cli-files/utilities/service-worker';
+import {
+  statsErrorsToString,
+  statsToString,
+  statsWarningsToString,
+} from '../angular-cli-files/utilities/stats';
+import { NormalizedBrowserBuilderSchema, defaultProgress, normalizeBrowserSchema } from '../utils';
+import { Schema as BrowserBuilderSchema } from './schema';
+
+import webpack = require('webpack');
+const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');
+const webpackMerge = require('webpack-merge');
+
+
+export type BrowserBuilderOutput = json.JsonObject & BuilderOutput & {
+  outputPath: string;
+};
+
+
+function _deleteOutputDir(root: Path, outputPath: Path, host: virtualFs.Host) {
+  const resolvedOutputPath = resolve(root, outputPath);
+  if (resolvedOutputPath === root) {
+    throw new Error('Output path MUST not be project root directory!');
+  }
+
+  return host.exists(resolvedOutputPath).pipe(
+    concatMap(exists => exists ? host.delete(resolvedOutputPath) : EMPTY),
+    last(null, null),
+  );
+}
+
+
+export function createBrowserLoggingCallback(
+  verbose: boolean,
+  logger: logging.LoggerApi,
+): WebpackLoggingCallback {
+  return (stats, config) => {
+    // config.stats contains our own stats settings, added during buildWebpackConfig().
+    const json = stats.toJson(config.stats);
+    if (verbose) {
+      logger.info(stats.toString(config.stats));
+    } else {
+      logger.info(statsToString(json, config.stats));
+    }
+
+    if (stats.hasWarnings()) {
+      logger.warn(statsWarningsToString(json, config.stats));
+    }
+    if (stats.hasErrors()) {
+      logger.error(statsErrorsToString(json, config.stats));
+    }
+  };
+}
+
+export function buildWebpackConfig(
+  root: Path,
+  projectRoot: Path,
+  host: virtualFs.Host<fs.Stats>,
+  options: NormalizedBrowserBuilderSchema,
+  logger: logging.LoggerApi,
+): webpack.Configuration {
+  // Ensure Build Optimizer is only used with AOT.
+  if (options.buildOptimizer && !options.aot) {
+    throw new Error(`The 'buildOptimizer' option cannot be used without 'aot'.`);
+  }
+
+  let wco: WebpackConfigOptions<NormalizedBrowserBuilderSchema>;
+
+  const tsConfigPath = getSystemPath(normalize(resolve(root, normalize(options.tsConfig))));
+  const tsConfig = readTsconfig(tsConfigPath);
+
+  const projectTs = requireProjectModule(getSystemPath(projectRoot), 'typescript') as typeof ts;
+
+  const supportES2015 = tsConfig.options.target !== projectTs.ScriptTarget.ES3
+    && tsConfig.options.target !== projectTs.ScriptTarget.ES5;
+
+  wco = {
+    root: getSystemPath(root),
+    logger: logger.createChild('webpackConfigOptions'),
+    projectRoot: getSystemPath(projectRoot),
+    buildOptions: options,
+    tsConfig,
+    tsConfigPath,
+    supportES2015,
+  };
+
+  wco.buildOptions.progress = defaultProgress(wco.buildOptions.progress);
+
+  const webpackConfigs: {}[] = [
+    getCommonConfig(wco),
+    getBrowserConfig(wco),
+    getStylesConfig(wco),
+    getStatsConfig(wco),
+  ];
+
+  if (wco.buildOptions.main || wco.buildOptions.polyfills) {
+    const typescriptConfigPartial = wco.buildOptions.aot
+      ? getAotConfig(wco, host)
+      : getNonAotConfig(wco, host);
+    webpackConfigs.push(typescriptConfigPartial);
+  }
+
+  const webpackConfig = webpackMerge(webpackConfigs);
+
+  if (options.profile) {
+    const smp = new SpeedMeasurePlugin({
+      outputFormat: 'json',
+      outputTarget: getSystemPath(join(root, 'speed-measure-plugin.json')),
+    });
+
+    return smp.wrap(webpackConfig);
+  }
+
+  return webpackConfig;
+}
+
+
+export async function buildBrowserWebpackConfigFromWorkspace(
+  options: BrowserBuilderSchema,
+  projectName: string,
+  workspace: experimental.workspace.Workspace,
+  host: virtualFs.Host<fs.Stats>,
+  logger: logging.LoggerApi,
+): Promise<webpack.Configuration> {
+  // TODO: Use a better interface for workspace access.
+  const projectRoot = resolve(workspace.root, normalize(workspace.getProject(projectName).root));
+  const sourceRoot = workspace.getProject(projectName).sourceRoot;
+
+  const normalizedOptions = normalizeBrowserSchema(
+    host,
+    workspace.root,
+    projectRoot,
+    sourceRoot ? resolve(workspace.root, normalize(sourceRoot)) : undefined,
+    options,
+  );
+
+  return buildWebpackConfig(workspace.root, projectRoot, host, normalizedOptions, logger);
+}
+
+
+export async function buildBrowserWebpackConfigFromContext(
+  options: BrowserBuilderSchema,
+  context: BuilderContext,
+  host: virtualFs.Host<fs.Stats>,
+): Promise<{ workspace: experimental.workspace.Workspace, config: webpack.Configuration }> {
+  const registry = new schema.CoreSchemaRegistry();
+  registry.addPostTransform(schema.transforms.addUndefinedDefaults);
+
+  const workspace = await experimental.workspace.Workspace.fromPath(
+    host,
+    normalize(context.workspaceRoot),
+    registry,
+  );
+
+  const projectName = context.target ? context.target.project : workspace.getDefaultProjectName();
+
+  if (!projectName) {
+    throw new Error('Must either have a target from the context or a default project.');
+  }
+
+  const config = await buildBrowserWebpackConfigFromWorkspace(
+    options,
+    projectName,
+    workspace,
+    host,
+    context.logger,
+  );
+
+  return { workspace, config };
+}
+
+
+export type BrowserConfigTransformFn = (
+  workspace: experimental.workspace.Workspace,
+  config: webpack.Configuration,
+) => Observable<webpack.Configuration>;
+
+export function buildWebpackBrowser(
+  options: BrowserBuilderSchema,
+  context: BuilderContext,
+  transforms: {
+    config?: BrowserConfigTransformFn,
+    output?: (output: BrowserBuilderOutput) => Observable<BuilderOutput>,
+    logging?: WebpackLoggingCallback,
+  } = {},
+) {
+  const host = new NodeJsSyncHost();
+  const root = normalize(context.workspaceRoot);
+
+  const configFn = transforms.config;
+  const outputFn = transforms.output;
+  const loggingFn = transforms.logging
+      || createBrowserLoggingCallback(!!options.verbose, context.logger);
+
+  // This makes a host observable into a cold one. This is because we want to wait until
+  // subscription before calling buildBrowserWebpackConfigFromContext, which can throw.
+  return of(null).pipe(
+    switchMap(() => from(buildBrowserWebpackConfigFromContext(options, context, host))),
+    switchMap(({ workspace, config }) => {
+      if (configFn) {
+        return configFn(workspace, config).pipe(
+          map(config => ({ workspace, config })),
+        );
+      } else {
+        return of({ workspace, config });
+      }
+    }),
+    switchMap(({workspace, config}) => {
+      if (options.deleteOutputPath) {
+        return _deleteOutputDir(
+          normalize(context.workspaceRoot),
+          normalize(options.outputPath),
+          host,
+        ).pipe(map(() => ({ workspace, config })));
+      } else {
+        return of({ workspace, config });
+      }
+    }),
+    switchMap(({ workspace, config }) => {
+      const projectName = context.target
+        ? context.target.project : workspace.getDefaultProjectName();
+
+      if (!projectName) {
+        throw new Error('Must either have a target from the context or a default project.');
+      }
+
+      const projectRoot = resolve(
+        workspace.root,
+        normalize(workspace.getProject(projectName).root),
+      );
+
+      return runWebpack(config, context, { logging: loggingFn }).pipe(
+        concatMap(buildEvent => {
+          if (buildEvent.success && !options.watch && options.serviceWorker) {
+            return from(augmentAppWithServiceWorker(
+              host,
+              root,
+              projectRoot,
+              resolve(root, normalize(options.outputPath)),
+              options.baseHref || '/',
+              options.ngswConfigPath,
+            ).then(() => ({ success: true })));
+          } else {
+            return of(buildEvent);
+          }
+        }),
+        map(event => ({
+          ...event,
+          outputPath: config.output && config.output.path || '',
+        } as BrowserBuilderOutput)),
+        concatMap(output => outputFn ? outputFn(output) : of(output)),
+      );
+    }),
+  );
+}
+
+
+export default createBuilder<json.JsonObject & BrowserBuilderSchema>(buildWebpackBrowser);

From eca5dc322f11360b82309c31ed6a716a894fc051 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 4 Mar 2019 16:54:33 -0800
Subject: [PATCH 0853/1703] test(@angular-devkit/build-angular): move ALL
 Browser Builder tests

To the new Architect API.
---
 .../test/browser/allow-js2_spec_large.ts      | 121 ++++
 .../test/browser/aot2_spec_large.ts           |  41 ++
 .../test/browser/assets2_spec_large.ts        | 158 +++++
 .../test/browser/base-href2_spec_large.ts     |  44 ++
 .../browser/build-optimizer2_spec_large.ts    |  78 +++
 .../browser/bundle-budgets2_spec_large.ts     | 104 ++++
 .../circular-dependency2_spec_large.ts        |  38 ++
 .../test/browser/deploy-url2_spec_large.ts    |  53 ++
 .../test/browser/errors2_spec_large.ts        |  65 ++
 .../test/browser/i18n2_spec_large.ts          | 128 ++++
 .../test/browser/index2_spec_large.ts         | 110 ++++
 .../test/browser/lazy-module2_spec_large.ts   | 198 ++++++
 .../test/browser/lazy-module_spec_large.ts    |  60 +-
 .../browser/license-extraction2_spec_large.ts |  30 +
 .../browser/no-entry-module2_spec_large.ts    |  40 ++
 .../browser/optimization-level2_spec_large.ts |  82 +++
 .../browser/output-hashing2_spec_large.ts     | 183 ++++++
 .../test/browser/output-hashing_spec_large.ts |   3 +-
 .../test/browser/output-path2_spec_large.ts   |  51 ++
 .../test/browser/poll2_spec_large.ts          |  49 ++
 .../test/browser/profile2_spec_large.ts       |  34 ++
 .../test/browser/rebuild2_spec_large.ts       | 350 +++++++++++
 .../test/browser/rebuild_spec_large.ts        |   3 +-
 .../test/browser/replacements2_spec_large.ts  | 213 +++++++
 .../resolve-json-module2_spec_large.ts        |  66 ++
 .../resources-output-path2_spec_large.ts      |  98 +++
 .../test/browser/scripts-array2_spec_large.ts | 141 +++++
 .../test/browser/source-map2_spec_large.ts    | 153 +++++
 .../test/browser/stats-json2_spec_large.ts    |  26 +
 .../test/browser/styles2_spec_large.ts        | 578 ++++++++++++++++++
 .../subresource-integrity2_spec_large.ts      |  32 +
 .../browser/tsconfig-paths2_spec_large.ts     |  78 +++
 .../test/browser/vendor-chunk2_spec_large.ts  |  26 +
 .../browser/vendor-source-map2_spec_large.ts  |  63 ++
 .../test/browser/works2_spec_large.ts         |  38 ++
 .../build_angular/test/utils.ts               | 151 ++++-
 36 files changed, 3621 insertions(+), 65 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/test/browser/allow-js2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/aot2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/assets2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/base-href2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/build-optimizer2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/bundle-budgets2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/circular-dependency2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/deploy-url2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/errors2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/i18n2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/index2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/lazy-module2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/license-extraction2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/no-entry-module2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/optimization-level2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/output-hashing2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/output-path2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/poll2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/profile2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/rebuild2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/replacements2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/resolve-json-module2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/resources-output-path2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/scripts-array2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/source-map2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/stats-json2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/styles2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/subresource-integrity2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/tsconfig-paths2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/vendor-chunk2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/vendor-source-map2_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/works2_spec_large.ts

diff --git a/packages/angular_devkit/build_angular/test/browser/allow-js2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/allow-js2_spec_large.ts
new file mode 100644
index 000000000000..ffb7c3d8a8b2
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/allow-js2_spec_large.ts
@@ -0,0 +1,121 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { join, normalize, relative, virtualFs } from '@angular-devkit/core';
+import { take, tap } from 'rxjs/operators';
+import { BrowserBuilderOutput } from "../../src/browser/index2";
+import { createArchitect, host } from '../utils';
+
+
+describe('Browser Builder allow js', () => {
+  const targetSpec = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
+    host.writeMultipleFiles({
+      'src/my-js-file.js': `console.log(1); export const a = 2;`,
+      'src/main.ts': `import { a } from './my-js-file'; console.log(a);`,
+    });
+
+    host.replaceInFile(
+      'tsconfig.json',
+      '"target": "es5"',
+      '"target": "es5", "allowJs": true',
+    );
+
+    const run = await architect.scheduleTarget(targetSpec);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+
+    const content = virtualFs.fileBufferToString(
+      await host.read(join(normalize(output.outputPath), 'main.js')).toPromise(),
+    );
+
+    expect(content).toContain('var a = 2');
+
+    await run.stop();
+  });
+
+  it('works with aot', async () => {
+    host.writeMultipleFiles({
+      'src/my-js-file.js': `console.log(1); export const a = 2;`,
+      'src/main.ts': `import { a } from './my-js-file'; console.log(a);`,
+    });
+
+    host.replaceInFile(
+      'tsconfig.json',
+      '"target": "es5"',
+      '"target": "es5", "allowJs": true',
+    );
+
+    const overrides = { aot: true };
+
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+
+    const content = virtualFs.fileBufferToString(
+      await host.read(join(normalize(output.outputPath), 'main.js')).toPromise(),
+    );
+
+    expect(content).toContain('var a = 2');
+
+    await run.stop();
+  });
+
+  it('works with watch', async () => {
+    host.writeMultipleFiles({
+      'src/my-js-file.js': `console.log(1); export const a = 2;`,
+      'src/main.ts': `import { a } from './my-js-file'; console.log(a);`,
+    });
+
+    host.replaceInFile(
+      'tsconfig.json',
+      '"target": "es5"',
+      '"target": "es5", "allowJs": true',
+    );
+
+    const overrides = { watch: true };
+
+    let buildCount = 1;
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+
+    await run.output.pipe(
+      tap((output: BrowserBuilderOutput) => {
+        const path = relative(host.root(), join(normalize(output.outputPath), 'main.js'));
+        const content = virtualFs.fileBufferToString(
+          host.scopedSync().read(path),
+        );
+
+        switch (buildCount) {
+          case 1:
+            expect(content).toContain('var a = 2');
+            host.writeMultipleFiles({
+              'src/my-js-file.js': `console.log(1); export const a = 1;`,
+            });
+            break;
+          case 2:
+            expect(content).toContain('var a = 1');
+            break;
+        }
+
+        buildCount++;
+      }),
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      take(2),
+    ).toPromise();
+
+    await run.stop();
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/aot2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/aot2_spec_large.ts
new file mode 100644
index 000000000000..c12a09b327e8
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/aot2_spec_large.ts
@@ -0,0 +1,41 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { runTargetSpec } from '@angular-devkit/architect/testing';
+import { join, normalize, virtualFs } from '@angular-devkit/core';
+import { tap } from 'rxjs/operators';
+import { BrowserBuilderOutput } from "../../src/browser/index2";
+import { browserTargetSpec, createArchitect, host } from '../utils';
+
+
+describe('Browser Builder AOT', () => {
+  const targetSpec = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
+    const overrides = { aot: true };
+
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = await run.result as BrowserBuilderOutput;
+
+    expect(output.success).toBe(true);
+
+    const fileName = join(normalize(output.outputPath), 'main.js');
+    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content).toMatch(/platformBrowser.*bootstrapModuleFactory.*AppModuleNgFactory/);
+
+    await run.stop();
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/assets2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/assets2_spec_large.ts
new file mode 100644
index 000000000000..a20396f7eb69
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/assets2_spec_large.ts
@@ -0,0 +1,158 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { normalize, virtualFs } from '@angular-devkit/core';
+import { toArray } from 'rxjs/operators';
+import { BrowserBuilderOutput } from "../../src/browser/index2";
+import { createArchitect, host } from '../utils';
+
+
+describe('Browser Builder assets', () => {
+  const targetSpec = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
+    const assets: { [path: string]: string } = {
+      './src/folder/.gitkeep': '',
+      './src/string-file-asset.txt': 'string-file-asset.txt',
+      './src/string-folder-asset/file.txt': 'string-folder-asset.txt',
+      './src/glob-asset.txt': 'glob-asset.txt',
+      './src/folder/folder-asset.txt': 'folder-asset.txt',
+      './src/output-asset.txt': 'output-asset.txt',
+    };
+    const matches: { [path: string]: string } = {
+      './dist/string-file-asset.txt': 'string-file-asset.txt',
+      './dist/string-folder-asset/file.txt': 'string-folder-asset.txt',
+      './dist/glob-asset.txt': 'glob-asset.txt',
+      './dist/folder/folder-asset.txt': 'folder-asset.txt',
+      './dist/output-folder/output-asset.txt': 'output-asset.txt',
+    };
+    host.writeMultipleFiles(assets);
+
+    const overrides = {
+      assets: [
+        'src/string-file-asset.txt',
+        'src/string-folder-asset',
+        { glob: 'glob-asset.txt', input: 'src/', output: '/' },
+        { glob: 'glob-asset.txt', input: 'src/', output: '/' },
+        { glob: 'output-asset.txt', input: 'src/', output: '/output-folder' },
+        { glob: '**/*', input: 'src/folder', output: '/folder' },
+      ],
+    };
+
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+
+    // Assets we expect should be there.
+    Object.keys(matches).forEach(fileName => {
+      const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
+      expect(content).toMatch(matches[fileName]);
+    });
+    // .gitkeep should not be there.
+    expect(host.scopedSync().exists(normalize('./dist/folder/.gitkeep'))).toBe(false);
+
+    await run.stop();
+  });
+
+  it('works with ignored patterns', async () => {
+    const assets: { [path: string]: string } = {
+      './src/folder/.gitkeep': '',
+      './src/folder/asset-ignored.txt': '',
+      './src/folder/asset.txt': '',
+    };
+
+    host.writeMultipleFiles(assets);
+
+    const overrides = {
+      assets: [
+        {
+          glob: '**/*',
+          ignore: ['asset-ignored.txt'],
+          input: 'src/folder',
+          output: '/folder',
+        },
+      ],
+    };
+
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+
+    expect(host.scopedSync().exists(normalize('./dist/folder/asset.txt'))).toBe(true);
+    expect(host.scopedSync().exists(normalize('./dist/folder/asset-ignored.txt'))).toBe(false);
+    expect(host.scopedSync().exists(normalize('./dist/folder/.gitkeep'))).toBe(false);
+
+    await run.stop();
+  });
+
+  it('fails with non-absolute output path', async () => {
+    const assets: { [path: string]: string } = {
+      './node_modules/some-package/node_modules-asset.txt': 'node_modules-asset.txt',
+    };
+    host.writeMultipleFiles(assets);
+    const overrides = {
+      assets: [{
+        glob: '**/*', input: '../node_modules/some-package/', output: '../temp',
+      }],
+    };
+
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    try {
+      await run.result;
+      expect('THE ABOVE LINE SHOULD THROW').toBe('');
+    } catch {}
+
+    // The node_modules folder must be deleted, otherwise code that tries to find the
+    // node_modules folder will hit this one and can fail.
+    host.scopedSync().delete(normalize('./node_modules'));
+
+    await run.stop();
+  });
+
+  it('fails with non-source root input path', async () => {
+    const assets: { [path: string]: string } = {
+      './node_modules/some-package/node_modules-asset.txt': 'node_modules-asset.txt',
+    };
+    host.writeMultipleFiles(assets);
+    const overrides = {
+      assets: ['not-source-root/file.txt'],
+    };
+
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    try {
+      await run.result;
+      expect('THE ABOVE LINE SHOULD THROW').toBe('');
+    } catch {}
+
+    // The node_modules folder must be deleted, otherwise code that tries to find the
+    // node_modules folder will hit this one and can fail.
+    host.scopedSync().delete(normalize('./node_modules'));
+
+    await run.stop();
+  });
+
+  it('still builds with empty asset array', async () => {
+    const overrides = {
+      assets: [],
+    };
+
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const events = await run.output.pipe(toArray()).toPromise();
+    expect(events.length).toBe(1);
+
+    await run.stop();
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/base-href2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/base-href2_spec_large.ts
new file mode 100644
index 000000000000..9455ee55e2b4
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/base-href2_spec_large.ts
@@ -0,0 +1,44 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { runTargetSpec } from '@angular-devkit/architect/testing';
+import { join, normalize, virtualFs } from '@angular-devkit/core';
+import { tap } from 'rxjs/operators';
+import { BrowserBuilderOutput } from "../../src/browser/index2";
+import { browserTargetSpec, createArchitect, host } from '../utils';
+
+
+describe('Browser Builder base href', () => {
+  const targetSpec = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
+    host.writeMultipleFiles({
+      'src/my-js-file.js': `console.log(1); export const a = 2;`,
+      'src/main.ts': `import { a } from './my-js-file'; console.log(a);`,
+    });
+
+    const overrides = { baseHref: '/myUrl' };
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = await run.result as BrowserBuilderOutput;
+
+    expect(output.success).toBe(true);
+    const fileName = join(normalize(output.outputPath), 'index.html');
+    const content = virtualFs.fileBufferToString(await host.read(fileName).toPromise());
+    expect(content).toMatch(/<base href="\/myUrl">/);
+
+    await run.stop();
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/build-optimizer2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/build-optimizer2_spec_large.ts
new file mode 100644
index 000000000000..bc70764bfddc
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/build-optimizer2_spec_large.ts
@@ -0,0 +1,78 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { join, normalize } from '@angular-devkit/core';
+import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { browserBuild, createArchitect, host } from '../utils';
+
+
+describe('Browser Builder build optimizer', () => {
+  const targetSpec = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
+    const overrides = { aot: true, buildOptimizer: true };
+    const { files } = await browserBuild(architect, host, targetSpec, overrides);
+    expect(await files['main.js']).not.toMatch(/\.decorators =/);
+  });
+
+  it('fails if AOT is disabled', async () => {
+    const overrides = { aot: false, buildOptimizer: true };
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+
+    try {
+      await run.result;
+      expect('THE ABOVE LINE SHOULD THROW').toBe('');
+    } catch {}
+  });
+
+  it('reduces bundle size', async () => {
+    const noBoOverrides = { aot: true, optimization: true, vendorChunk: false };
+    const boOverrides = { ...noBoOverrides, buildOptimizer: true };
+
+    const run = await architect.scheduleTarget(targetSpec, noBoOverrides);
+    const output = await run.result as BrowserBuilderOutput;
+
+    expect(output.success).toBe(true);
+
+    const noBoStats = await host.stat(join(normalize(output.outputPath), 'main.js')).toPromise();
+    if (!noBoStats) {
+      throw new Error('Main file has no stats');
+    }
+    const noBoSize = noBoStats.size;
+    await run.stop();
+
+    const boRun = await architect.scheduleTarget(targetSpec, boOverrides);
+    const boOutput = await run.result as BrowserBuilderOutput;
+    expect(boOutput.success).toBe(true);
+
+    const boStats = await host.stat(join(normalize(output.outputPath), 'main.js')).toPromise();
+    if (!boStats) {
+      throw new Error('Main file has no stats');
+    }
+    const boSize = boStats.size;
+    await boRun.stop();
+
+    const sizeDiff = Math.round(((boSize - noBoSize) / noBoSize) * 10000) / 100;
+    if (sizeDiff > -1 && sizeDiff < 0) {
+      throw new Error('Total size difference is too small, '
+        + 'build optimizer does not seem to have made any optimizations.');
+    }
+
+    if (sizeDiff > 1) {
+      throw new Error('Total size difference is positive, '
+        + 'build optimizer made the bundle bigger.');
+    }
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/bundle-budgets2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/bundle-budgets2_spec_large.ts
new file mode 100644
index 000000000000..6f5c4948337a
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/bundle-budgets2_spec_large.ts
@@ -0,0 +1,104 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { logging } from '@angular-devkit/core';
+import { createArchitect, host } from '../utils';
+
+
+describe('Browser Builder bundle budgets', () => {
+  const targetSpec = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('accepts valid bundles', async () => {
+    const overrides = {
+      optimization: true,
+      budgets: [{ type: 'allScript', maximumError: '100mb' }],
+    };
+    const logger = new logging.Logger('');
+    const logs: string[] = [];
+    logger.subscribe(e => logs.push(e.message));
+
+    const run = await architect.scheduleTarget(targetSpec, overrides, { logger });
+    const output = await run.result;
+    expect(output.success).toBe(true);
+    expect(logs.join()).not.toContain('WARNING');
+    await run.stop();
+  });
+
+  it('shows errors', async () => {
+    const overrides = {
+      optimization: true,
+      budgets: [{ type: 'all', maximumError: '100b' }],
+    };
+
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = await run.result;
+    expect(output.success).toBe(false);
+    await run.stop();
+  });
+
+  it('shows warnings', async () => {
+    const overrides = {
+      optimization: true,
+      budgets: [{ type: 'all', minimumWarning: '100mb' }],
+    };
+    const logger = new logging.Logger('');
+    const logs: string[] = [];
+    logger.subscribe(e => logs.push(e.message));
+
+    const run = await architect.scheduleTarget(targetSpec, overrides, { logger });
+    const output = await run.result;
+    expect(output.success).toBe(true);
+    expect(logs.join()).toContain('WARNING');
+    await run.stop();
+  });
+
+  describe(`should ignore '.map' files`, () => {
+    it(`when 'intial' budget`, async () => {
+      const overrides = {
+        optimization: true,
+        budgets: [{ type: 'initial', maximumError: '1mb' }],
+      };
+
+      const run = await architect.scheduleTarget(targetSpec, overrides);
+      const output = await run.result;
+      expect(output.success).toBe(true);
+      await run.stop();
+    });
+
+    it(`when 'all' budget`, async () => {
+      const overrides = {
+        optimization: true,
+        budgets: [{ type: 'all', maximumError: '1mb' }],
+      };
+
+      const run = await architect.scheduleTarget(targetSpec, overrides);
+      const output = await run.result;
+      expect(output.success).toBe(true);
+      await run.stop();
+    });
+
+    it(`when 'any' budget`, async () => {
+      const overrides = {
+        optimization: true,
+        budgets: [{ type: 'any', maximumError: '1mb' }],
+      };
+
+      const run = await architect.scheduleTarget(targetSpec, overrides);
+      const output = await run.result;
+      expect(output.success).toBe(true);
+      await run.stop();
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/circular-dependency2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/circular-dependency2_spec_large.ts
new file mode 100644
index 000000000000..5f70b43fa04d
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/circular-dependency2_spec_large.ts
@@ -0,0 +1,38 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { logging } from '@angular-devkit/core';
+import { createArchitect, host } from '../utils';
+
+
+describe('Browser Builder circular dependency detection', () => {
+  const targetSpec = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
+    host.appendToFile('src/app/app.component.ts',
+      `import { AppModule } from './app.module'; console.log(AppModule);`);
+
+    const overrides = { baseHref: '/myUrl' };
+    const logger = new logging.Logger('');
+    const logs: string[] = [];
+    logger.subscribe(e => logs.push(e.message));
+
+    const run = await architect.scheduleTarget(targetSpec, overrides, { logger });
+    const output = await run.result;
+    expect(output.success).toBe(true);
+    expect(logs.join()).toContain('Circular dependency detected');
+    await run.stop();
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/deploy-url2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/deploy-url2_spec_large.ts
new file mode 100644
index 000000000000..c985e12f3f21
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/deploy-url2_spec_large.ts
@@ -0,0 +1,53 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { join, normalize, virtualFs } from '@angular-devkit/core';
+import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { createArchitect, host } from '../utils';
+
+
+describe('Browser Builder deploy url', () => {
+  const targetSpec = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('uses deploy url for bundles urls and runtime', async () => {
+    const overrides = { deployUrl: 'deployUrl/' };
+    const overrides2 = { deployUrl: 'http://example.com/some/path/' };
+
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+    expect(output.outputPath).not.toBeUndefined();
+    const outputPath = normalize(output.outputPath);
+
+    const fileName = join(outputPath, 'index.html');
+    const runtimeFileName = join(outputPath, 'runtime.js');
+    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content).toContain('deployUrl/main.js');
+    const runtimeContent = virtualFs.fileBufferToString(
+      await host.read(normalize(runtimeFileName)).toPromise(),
+    );
+    expect(runtimeContent).toContain('deployUrl/');
+
+    const run2 = await architect.scheduleTarget(targetSpec, overrides2);
+    const output2 = await run2.result as BrowserBuilderOutput;
+    expect(output2.outputPath).toEqual(outputPath);  // These should be the same.
+
+    const content2 = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content2).toContain('http://example.com/some/path/main.js');
+
+    await run.stop();
+    await run2.stop();
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/errors2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/errors2_spec_large.ts
new file mode 100644
index 000000000000..710d2e634d9e
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/errors2_spec_large.ts
@@ -0,0 +1,65 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { logging } from '@angular-devkit/core';
+import { createArchitect, host } from '../utils';
+
+
+describe('Browser Builder errors', () => {
+  const targetSpec = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('shows error when files are not part of the compilation', async () => {
+    host.replaceInFile('src/tsconfig.app.json', '"compilerOptions": {', `
+      "files": ["main.ts"],
+      "compilerOptions": {
+    `);
+    const logger = new logging.Logger('');
+    const logs: string[] = [];
+    logger.subscribe(e => logs.push(e.message));
+
+    const run = await architect.scheduleTarget(targetSpec, {}, { logger });
+    const output = await run.result;
+    expect(output.success).toBe(false);
+    expect(logs.join()).toContain('polyfills.ts is missing from the TypeScript');
+    await run.stop();
+  });
+
+  it('shows TS syntax errors', async () => {
+    host.appendToFile('src/app/app.component.ts', ']]]');
+    const logger = new logging.Logger('');
+    const logs: string[] = [];
+    logger.subscribe(e => logs.push(e.message));
+
+    const run = await architect.scheduleTarget(targetSpec, {}, { logger });
+    const output = await run.result;
+    expect(output.success).toBe(false);
+    expect(logs.join()).toContain('Declaration or statement expected');
+    await run.stop();
+  });
+
+  it('shows static analysis errors', async () => {
+    host.replaceInFile('src/app/app.component.ts', `'app-root'`, `(() => 'app-root')()`);
+    const logger = new logging.Logger('');
+    const logs: string[] = [];
+    logger.subscribe(e => logs.push(e.message));
+
+    const run = await architect.scheduleTarget(targetSpec, { aot: true }, { logger });
+    const output = await run.result;
+    expect(output.success).toBe(false);
+    expect(logs.join()).toContain('Function expressions are not supported in');
+    await run.stop();
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/i18n2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/i18n2_spec_large.ts
new file mode 100644
index 000000000000..fe1d2aeb7306
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/i18n2_spec_large.ts
@@ -0,0 +1,128 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { join, normalize, virtualFs } from '@angular-devkit/core';
+import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { createArchitect, host } from '../utils';
+
+
+describe('Browser Builder i18n', () => {
+  const emptyTranslationFile = `
+      <?xml version="1.0" encoding="UTF-8" ?>
+      <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+        <file source-language="en" datatype="plaintext" original="ng2.template">
+          <body>
+          </body>
+        </file>
+      </xliff>`;
+
+  const targetSpec = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('uses translations', async () => {
+    host.writeMultipleFiles({
+      'src/locale/messages.fr.xlf': `
+      <?xml version="1.0" encoding="UTF-8" ?>
+      <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+      <file source-language="en" datatype="plaintext" original="ng2.template">
+      <body>
+      <trans-unit id="8def8481e91291a52f9baa31cbdb313e6a6ca02b" datatype="html">
+      <source>Hello i18n!</source>
+      <target>Bonjour i18n!</target>
+      <note priority="1" from="description">An introduction header for this sample</note>
+      </trans-unit>
+      </body>
+      </file>
+      </xliff>
+      `,
+    });
+
+    host.appendToFile('src/app/app.component.html',
+      '<h1 i18n="An introduction header for this sample">Hello i18n!</h1>');
+
+    const overrides = {
+      aot: true,
+      i18nFile: 'src/locale/messages.fr.xlf',
+      i18nFormat: 'true',
+      i18nLocale: 'fr',
+    };
+
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+    const outputPath = output.outputPath;
+    const fileName = join(normalize(outputPath), 'main.js');
+    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content).toMatch(/Bonjour i18n!/);
+
+    await run.stop();
+  });
+
+  it('ignores missing translations', async () => {
+    const overrides = {
+      aot: true,
+      i18nFile: 'src/locale/messages.fr.xlf',
+      i18nFormat: 'true',
+      i18nLocale: 'fr',
+      i18nMissingTranslation: 'ignore',
+    };
+
+    host.writeMultipleFiles({ 'src/locale/messages.fr.xlf': emptyTranslationFile });
+    host.appendToFile('src/app/app.component.html', '<p i18n>Other content</p>');
+
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+    const outputPath = output.outputPath;
+    const fileName = join(normalize(outputPath), 'main.js');
+    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content).toMatch(/Other content/);
+
+    await run.stop();
+  });
+
+  it('reports errors for missing translations', async () => {
+    const overrides = {
+      aot: true,
+      i18nFile: 'src/locale/messages.fr.xlf',
+      i18nFormat: 'true',
+      i18nLocale: 'fr',
+      i18nMissingTranslation: 'error',
+    };
+
+    host.writeMultipleFiles({ 'src/locale/messages.fr.xlf': emptyTranslationFile });
+    host.appendToFile('src/app/app.component.html', '<p i18n>Other content</p>');
+
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(false);
+
+    await run.stop();
+  });
+
+  it('register locales', async () => {
+    const overrides = { aot: true, i18nLocale: 'fr_FR' };
+
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+    const outputPath = output.outputPath;
+    const fileName = join(normalize(outputPath), 'main.js');
+    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content).toMatch(/registerLocaleData/);
+    expect(content).toMatch(/angular_common_locales_fr/);
+
+    await run.stop();
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/index2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/index2_spec_large.ts
new file mode 100644
index 000000000000..cc5ddd313b90
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/index2_spec_large.ts
@@ -0,0 +1,110 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { join, normalize, tags, virtualFs } from '@angular-devkit/core';
+import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { createArchitect, host } from '../utils';
+
+
+describe('Browser Builder works with BOM index.html', () => {
+  const targetSpec = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works with UTF-8 BOM', async () => {
+    host.writeMultipleFiles({
+      'src/index.html': Buffer.from(
+        '\ufeff<html><head><base href="/"></head><body><app-root></app-root></body></html>',
+        'utf8'),
+    });
+
+    const run = await architect.scheduleTarget(targetSpec);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+    const fileName = join(normalize(output.outputPath), 'index.html');
+    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content).toBe(
+      `<html><head><base href="/"></head>`
+      + `<body><app-root></app-root><script src="runtime.js"></script>`
+      + `<script src="polyfills.js"></script><script src="styles.js"></script>`
+      + `<script src="vendor.js"></script><script src="main.js"></script></body></html>`,
+    );
+    await run.stop();
+  });
+
+  it('works with UTF16 LE BOM', async () => {
+    host.writeMultipleFiles({
+      'src/index.html': Buffer.from(
+        '\ufeff<html><head><base href="/"></head><body><app-root></app-root></body></html>',
+        'utf16le'),
+    });
+
+    const run = await architect.scheduleTarget(targetSpec);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+    const fileName = join(normalize(output.outputPath), 'index.html');
+    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content).toBe(
+      `<html><head><base href="/"></head><body><app-root></app-root>`
+      + `<script src="runtime.js"></script><script src="polyfills.js"></script>`
+      + `<script src="styles.js"></script><script src="vendor.js"></script>`
+      + `<script src="main.js"></script></body></html>`,
+    );
+    await run.stop();
+  });
+
+  it('keeps escaped charaters', async () => {
+    host.writeMultipleFiles({
+      'src/index.html': tags.oneLine`
+        <html><head><title>&iacute;</title><base href="/"></head>
+        <body><app-root></app-root></body></html>
+      `,
+    });
+
+    const run = await architect.scheduleTarget(targetSpec);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+    const fileName = join(normalize(output.outputPath), 'index.html');
+    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content).toBe(
+      `<html><head><title>&iacute;</title><base href="/"></head> `
+      + `<body><app-root></app-root><script src="runtime.js"></script>`
+      + `<script src="polyfills.js"></script><script src="styles.js"></script>`
+      + `<script src="vendor.js"></script><script src="main.js"></script></body></html>`,
+    );
+    await run.stop();
+  });
+
+  it('keeps custom template charaters', async () => {
+    host.writeMultipleFiles({
+      'src/index.html': tags.oneLine`
+        <html><head><base href="/"><%= csrf_meta_tags %></head>
+        <body><app-root></app-root></body></html>
+      `,
+    });
+
+    const run = await architect.scheduleTarget(targetSpec);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+    const fileName = join(normalize(output.outputPath), 'index.html');
+    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content).toBe(
+      `<html><head><base href="/"><%= csrf_meta_tags %></head> `
+      + `<body><app-root></app-root><script src="runtime.js"></script>`
+      + `<script src="polyfills.js"></script><script src="styles.js"></script>`
+      + `<script src="vendor.js"></script><script src="main.js"></script></body></html>`,
+    );
+    await run.stop();
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/lazy-module2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/lazy-module2_spec_large.ts
new file mode 100644
index 000000000000..81a5a4ec2bfe
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/lazy-module2_spec_large.ts
@@ -0,0 +1,198 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { TestLogger } from '@angular-devkit/architect/testing';
+import { take, tap, timeout } from 'rxjs/operators';
+import { browserBuild, createArchitect, host, lazyModuleFiles, lazyModuleImport } from '../utils';
+
+// tslint:disable-next-line:no-big-function
+describe('Browser Builder lazy modules', () => {
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('supports lazy bundle for lazy routes with JIT', async () => {
+    host.writeMultipleFiles(lazyModuleFiles);
+    host.writeMultipleFiles(lazyModuleImport);
+
+    const { files } = await browserBuild(architect, host, target);
+    expect('lazy-lazy-module.js' in files).toBe(true);
+  });
+
+  it('should show error when lazy route is invalid on watch mode AOT', async () => {
+    host.writeMultipleFiles(lazyModuleFiles);
+    host.writeMultipleFiles(lazyModuleImport);
+    host.replaceInFile(
+      'src/app/app.module.ts',
+      'lazy.module#LazyModule',
+      'invalid.module#LazyModule',
+    );
+
+    const logger = new TestLogger('rebuild-lazy-errors');
+    const overrides = { watch: true, aot: true };
+    const run = await architect.scheduleTarget(target, overrides, { logger });
+    await run.output.pipe(
+      timeout(15000),
+      tap((buildEvent) => expect(buildEvent.success).toBe(false)),
+      tap(() => {
+        expect(logger.includes('Could not resolve module')).toBe(true);
+        logger.clear();
+        host.appendToFile('src/main.ts', ' ');
+      }),
+      take(2),
+    ).toPromise();
+    await run.stop();
+  });
+
+  it('supports lazy bundle for lazy routes with AOT', async () => {
+    host.writeMultipleFiles(lazyModuleFiles);
+    host.writeMultipleFiles(lazyModuleImport);
+
+    const { files } = await browserBuild(architect, host, target, { aot: true });
+    expect(files['lazy-lazy-module-ngfactory.js']).not.toBeUndefined();
+  });
+
+  it(`supports lazy bundle for import() calls`, async () => {
+    host.writeMultipleFiles({
+      'src/lazy-module.ts': 'export const value = 42;',
+      'src/main.ts': `import('./lazy-module');`,
+    });
+    // Using `import()` in TS require targetting `esnext` modules.
+    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
+
+    const { files } = await browserBuild(architect, host, target);
+    expect(files['0.js']).not.toBeUndefined();
+  });
+
+  it(`supports lazy bundle for dynamic import() calls`, async () => {
+    host.writeMultipleFiles({
+      'src/lazy-module.ts': 'export const value = 42;',
+      'src/main.ts': `
+        const lazyFileName = 'module';
+        import(/*webpackChunkName: '[request]'*/'./lazy-' + lazyFileName);
+      `,
+    });
+    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
+
+    const { files } = await browserBuild(architect, host, target);
+    expect(files['lazy-module.js']).not.toBeUndefined();
+  });
+
+  it(`supports lazy bundle for System.import() calls`, async () => {
+    host.writeMultipleFiles({
+      'src/lazy-module.ts': 'export const value = 42;',
+      'src/main.ts': `declare var System: any; System.import('./lazy-module');`,
+    });
+
+    const { files } = await browserBuild(architect, host, target);
+    expect(files['0.js']).not.toBeUndefined();
+  });
+
+  it(`supports hiding lazy bundle module name`, async () => {
+    host.writeMultipleFiles({
+      'src/lazy-module.ts': 'export const value = 42;',
+      'src/main.ts': `const lazyFileName = 'module'; import('./lazy-' + lazyFileName);`,
+    });
+    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
+
+    const { files } = await browserBuild(architect, host, target, { namedChunks: false });
+    expect(files['0.js']).not.toBeUndefined();
+  });
+
+  it(`supports making a common bundle for shared lazy modules`, async () => {
+    host.writeMultipleFiles({
+      'src/one.ts': `import * as http from '@angular/http'; console.log(http);`,
+      'src/two.ts': `import * as http from '@angular/http'; console.log(http);`,
+      'src/main.ts': `import('./one'); import('./two');`,
+    });
+    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
+
+    const { files } = await browserBuild(architect, host, target, { namedChunks: false });
+    expect(files['0.js']).not.toBeUndefined();
+    expect(files['1.js']).not.toBeUndefined();
+    // TODO: the chunk with common modules used to be called `common`, see why that changed.
+    expect(files['2.js']).not.toBeUndefined();
+  });
+
+  it(`supports disabling the common bundle`, async () => {
+    host.writeMultipleFiles({
+      'src/one.ts': `import * as http from '@angular/http'; console.log(http);`,
+      'src/two.ts': `import * as http from '@angular/http'; console.log(http);`,
+      'src/main.ts': `import('./one'); import('./two');`,
+    });
+    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
+
+    const { files } = await browserBuild(architect, host, target, { commonChunk: false });
+    expect(files['0.js']).not.toBeUndefined();
+    expect(files['1.js']).not.toBeUndefined();
+    expect(files['2.js']).toBeUndefined();
+  });
+
+  it(`supports extra lazy modules array in JIT`, async () => {
+    host.writeMultipleFiles(lazyModuleFiles);
+    host.writeMultipleFiles({
+      'src/app/app.component.ts': `
+        import { Component, SystemJsNgModuleLoader } from '@angular/core';
+
+        @Component({
+          selector: 'app-root',
+          templateUrl: './app.component.html',
+          styleUrls: ['./app.component.css'],
+        })
+        export class AppComponent {
+          title = 'app';
+          constructor(loader: SystemJsNgModuleLoader) {
+            // Module will be split at build time and loaded when requested below
+            loader.load('src/app/lazy/lazy.module#LazyModule')
+              .then((factory) => { /* Use factory here */ });
+          }
+        }`,
+    });
+    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
+
+    const { files } = await browserBuild(architect, host, target, {
+      lazyModules: ['src/app/lazy/lazy.module'],
+    });
+    expect(files['src-app-lazy-lazy-module.js']).not.toBeUndefined();
+  });
+
+  it(`supports extra lazy modules array in AOT`, async () => {
+    host.writeMultipleFiles(lazyModuleFiles);
+    host.writeMultipleFiles({
+      'src/app/app.component.ts': `
+        import { Component, SystemJsNgModuleLoader } from '@angular/core';
+
+        @Component({
+          selector: 'app-root',
+          templateUrl: './app.component.html',
+          styleUrls: ['./app.component.css'],
+        })
+        export class AppComponent {
+          title = 'app';
+          constructor(loader: SystemJsNgModuleLoader) {
+            // Module will be split at build time and loaded when requested below
+            loader.load('src/app/lazy/lazy.module#LazyModule')
+              .then((factory) => { /* Use factory here */ });
+          }
+        }`,
+    });
+    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
+    const { files } = await browserBuild(architect, host, target, {
+      lazyModules: ['src/app/lazy/lazy.module'],
+      aot: true,
+      optimization: true,
+    });
+    expect(files['src-app-lazy-lazy-module-ngfactory.js']).not.toBeUndefined();
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
index 7374c212d52d..ef55dbbb8cb4 100644
--- a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
@@ -10,65 +10,7 @@ import { DefaultTimeout, TestLogger, runTargetSpec } from '@angular-devkit/archi
 import { join, normalize } from '@angular-devkit/core';
 import { take, tap } from 'rxjs/operators';
 import { Schema as BrowserBuilderSchema } from '../../src/browser/schema';
-import { browserTargetSpec, host } from '../utils';
-
-
-export const lazyModuleFiles: { [path: string]: string } = {
-  'src/app/lazy/lazy-routing.module.ts': `
-    import { NgModule } from '@angular/core';
-    import { Routes, RouterModule } from '@angular/router';
-
-    const routes: Routes = [];
-
-    @NgModule({
-      imports: [RouterModule.forChild(routes)],
-      exports: [RouterModule]
-    })
-    export class LazyRoutingModule { }
-  `,
-  'src/app/lazy/lazy.module.ts': `
-    import { NgModule } from '@angular/core';
-    import { CommonModule } from '@angular/common';
-
-    import { LazyRoutingModule } from './lazy-routing.module';
-
-    @NgModule({
-      imports: [
-        CommonModule,
-        LazyRoutingModule
-      ],
-      declarations: []
-    })
-    export class LazyModule { }
-  `,
-};
-
-export const lazyModuleImport: { [path: string]: string } = {
-  'src/app/app.module.ts': `
-    import { BrowserModule } from '@angular/platform-browser';
-    import { NgModule } from '@angular/core';
-    import { HttpModule } from '@angular/http';
-
-    import { AppComponent } from './app.component';
-    import { RouterModule } from '@angular/router';
-
-    @NgModule({
-      declarations: [
-        AppComponent
-      ],
-      imports: [
-        BrowserModule,
-        HttpModule,
-        RouterModule.forRoot([
-          { path: 'lazy', loadChildren: './lazy/lazy.module#LazyModule' }
-        ])
-      ],
-      providers: [],
-      bootstrap: [AppComponent]
-    })
-    export class AppModule { }
-  `,
-};
+import { browserTargetSpec, host, lazyModuleFiles, lazyModuleImport } from '../utils';
 
 // tslint:disable-next-line:no-big-function
 describe('Browser Builder lazy modules', () => {
diff --git a/packages/angular_devkit/build_angular/test/browser/license-extraction2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/license-extraction2_spec_large.ts
new file mode 100644
index 000000000000..3de262afae22
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/license-extraction2_spec_large.ts
@@ -0,0 +1,30 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { browserBuild, createArchitect, host } from '../utils';
+
+
+describe('Browser Builder license extraction', () => {
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  // Ignored because license works when trying manually on a project, but doesn't work here.
+  it('works', async () => {
+    // TODO: make license extraction independent from optimization level.
+    const overrides = { extractLicenses: true, optimization: true };
+
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['3rdpartylicenses.txt']).not.toBeUndefined();
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/no-entry-module2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/no-entry-module2_spec_large.ts
new file mode 100644
index 000000000000..6a7c64f94cc5
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/no-entry-module2_spec_large.ts
@@ -0,0 +1,40 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { TestLogger } from '@angular-devkit/architect/testing';
+import { browserBuild, createArchitect, host } from '../utils';
+
+
+describe('Browser Builder no entry module', () => {
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
+    // Remove the bootstrap but keep a reference to AppModule so the import is not elided.
+    host.replaceInFile('src/main.ts', /platformBrowserDynamic.*?bootstrapModule.*?;/, '');
+    host.appendToFile('src/main.ts', 'console.log(AppModule);');
+
+    await browserBuild(architect, host, target, { baseHref: '/myUrl' });
+  });
+
+  it('reports warning when no bootstrap code', async () => {
+    host.replaceInFile('src/main.ts', /./g, '');
+    host.appendToFile('src/main.ts', `import './app/app.module';`);
+
+    const logger = new TestLogger('no-bootstrap');
+    await browserBuild(architect, host, target, { baseHref: '/myUrl' }, { logger });
+    expect(logger.includes('Lazy routes discovery is not enabled')).toBe(true);
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/optimization-level2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/optimization-level2_spec_large.ts
new file mode 100644
index 000000000000..d8a7a4f00297
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/optimization-level2_spec_large.ts
@@ -0,0 +1,82 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { browserBuild, createArchitect, host } from '../utils';
+
+
+describe('Browser Builder optimization level', () => {
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
+    const overrides = { optimization: true };
+
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['main.js']).not.toContain('AppComponent');
+  });
+
+  it('tsconfig target changes optimizations to use ES2015', async () => {
+    host.replaceInFile('tsconfig.json', '"target": "es5"', '"target": "es2015"');
+
+    const overrides = { optimization: true };
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['vendor.js']).toMatch(/class \w{constructor\(\){/);
+  });
+
+  it('supports styles only optimizations', async () => {
+    const overrides = {
+      optimization: {
+        styles: true,
+        scripts: false,
+      },
+      aot: true,
+      extractCss: true,
+      styles: ['src/styles.css'],
+    };
+
+    host.appendToFile('src/main.ts', '/** js comment should not be dropped */');
+    host.appendToFile('src/app/app.component.css', 'div { color: white }');
+    host.writeMultipleFiles({
+      'src/styles.css': `div { color: white }`,
+    });
+
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['main.js']).toContain('js comment should not be dropped');
+    expect(await files['main.js']).toContain('color:#fff');
+    expect(await files['styles.css']).toContain('color:#fff');
+  });
+
+  it('supports scripts only optimizations', async () => {
+    const overrides = {
+      optimization: {
+        styles: false,
+        scripts: true,
+      },
+      aot: true,
+      extractCss: true,
+      styles: ['src/styles.css'],
+    };
+
+    host.appendToFile('src/main.ts', '/** js comment should be dropped */');
+    host.appendToFile('src/app/app.component.css', 'div { color: white }');
+    host.writeMultipleFiles({
+      'src/styles.css': `div { color: white }`,
+    });
+
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['main.js']).not.toContain('js comment should be dropped');
+    expect(await files['main.js']).toContain('color: white');
+    expect(await files['styles.css']).toContain('color: white');
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/output-hashing2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/output-hashing2_spec_large.ts
new file mode 100644
index 000000000000..f36a71a8df0a
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/output-hashing2_spec_large.ts
@@ -0,0 +1,183 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { normalize } from '@angular-devkit/core';
+import { browserBuild, createArchitect, host, lazyModuleFiles, lazyModuleImport } from '../utils';
+
+describe('Browser Builder output hashing', () => {
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('updates hash as content changes', async () => {
+    const OUTPUT_RE = /(main|styles|lazy\.module)\.([a-z0-9]+)\.(chunk|bundle)\.(js|css)$/;
+
+    function generateFileHashMap(): Map<string, string> {
+      const hashes = new Map<string, string>();
+
+      host.scopedSync().list(normalize('./dist')).forEach(name => {
+        const matches = name.match(OUTPUT_RE);
+        if (matches) {
+          const [, module, hash] = matches;
+          hashes.set(module, hash);
+        }
+      });
+
+      return hashes;
+    }
+
+    function validateHashes(
+      oldHashes: Map<string, string>,
+      newHashes: Map<string, string>,
+      shouldChange: Array<string>,
+    ): void {
+      newHashes.forEach((hash, module) => {
+        if (hash == oldHashes.get(module)) {
+          if (shouldChange.includes(module)) {
+            throw new Error(
+              `Module "${module}" did not change hash (${hash}), but was expected to.`);
+          }
+        } else if (!shouldChange.includes(module)) {
+          throw new Error(`Module "${module}" changed hash (${hash}), but was not expected to.`);
+        }
+      });
+    }
+
+    let oldHashes: Map<string, string>;
+    let newHashes: Map<string, string>;
+
+    host.writeMultipleFiles(lazyModuleFiles);
+    host.writeMultipleFiles(lazyModuleImport);
+
+    const overrides = { outputHashing: 'all', extractCss: true };
+
+    // We must do several builds instead of a single one in watch mode, so that the output
+    // path is deleted on each run and only contains the most recent files.
+    await browserBuild(architect, host, target, overrides);
+
+    // Save the current hashes.
+    oldHashes = generateFileHashMap();
+    host.writeMultipleFiles(lazyModuleFiles);
+    host.writeMultipleFiles(lazyModuleImport);
+
+    await browserBuild(architect, host, target, overrides);
+    newHashes = generateFileHashMap();
+    validateHashes(oldHashes, newHashes, []);
+    oldHashes = newHashes;
+    host.writeMultipleFiles({ 'src/styles.css': 'body { background: blue; }' });
+
+    // Style hash should change.
+    await browserBuild(architect, host, target, overrides);
+    newHashes = generateFileHashMap();
+    validateHashes(oldHashes, newHashes, ['styles']);
+    oldHashes = newHashes;
+    host.writeMultipleFiles({ 'src/app/app.component.css': 'h1 { margin: 10px; }' });
+
+    // Main hash should change, since inline styles go in the main bundle.
+    await browserBuild(architect, host, target, overrides);
+    newHashes = generateFileHashMap();
+    validateHashes(oldHashes, newHashes, ['main']);
+    oldHashes = newHashes;
+    host.appendToFile('src/app/lazy/lazy.module.ts', `console.log(1);`);
+
+    // Lazy loaded bundle should change, and so should inline.
+    await browserBuild(architect, host, target, overrides);
+    newHashes = generateFileHashMap();
+    validateHashes(oldHashes, newHashes, ['lazy.module']);
+    oldHashes = newHashes;
+    host.appendToFile('src/main.ts', '');
+
+    // Nothing should have changed.
+    await browserBuild(architect, host, target, overrides);
+    newHashes = generateFileHashMap();
+    validateHashes(oldHashes, newHashes, []);
+  });
+
+  it('supports options', async () => {
+    host.writeMultipleFiles({ 'src/styles.css': `h1 { background: url('./spectrum.png')}` });
+    host.writeMultipleFiles(lazyModuleFiles);
+    host.writeMultipleFiles(lazyModuleImport);
+
+    // We must do several builds instead of a single one in watch mode, so that the output
+    // path is deleted on each run and only contains the most recent files.
+    // 'all' should hash everything.
+    await browserBuild(architect, host, target, { outputHashing: 'all', extractCss: true });
+
+    expect(host.fileMatchExists('dist', /runtime\.[0-9a-f]{20}\.js/)).toBeTruthy();
+    expect(host.fileMatchExists('dist', /main\.[0-9a-f]{20}\.js/)).toBeTruthy();
+    expect(host.fileMatchExists('dist', /polyfills\.[0-9a-f]{20}\.js/)).toBeTruthy();
+    expect(host.fileMatchExists('dist', /vendor\.[0-9a-f]{20}\.js/)).toBeTruthy();
+    expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.css/)).toBeTruthy();
+    expect(host.fileMatchExists('dist', /spectrum\.[0-9a-f]{20}\.png/)).toBeTruthy();
+
+    // 'none' should hash nothing.
+    await browserBuild(architect, host, target, { outputHashing: 'none', extractCss: true });
+
+    expect(host.fileMatchExists('dist', /runtime\.[0-9a-f]{20}\.js/)).toBeFalsy();
+    expect(host.fileMatchExists('dist', /main\.[0-9a-f]{20}\.js/)).toBeFalsy();
+    expect(host.fileMatchExists('dist', /polyfills\.[0-9a-f]{20}\.js/)).toBeFalsy();
+    expect(host.fileMatchExists('dist', /vendor\.[0-9a-f]{20}\.js/)).toBeFalsy();
+    expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.css/)).toBeFalsy();
+    expect(host.fileMatchExists('dist', /spectrum\.[0-9a-f]{20}\.png/)).toBeFalsy();
+
+    // 'media' should hash css resources only.
+    await browserBuild(architect, host, target, { outputHashing: 'media', extractCss: true });
+
+    expect(host.fileMatchExists('dist', /runtime\.[0-9a-f]{20}\.js/)).toBeFalsy();
+    expect(host.fileMatchExists('dist', /main\.[0-9a-f]{20}\.js/)).toBeFalsy();
+    expect(host.fileMatchExists('dist', /polyfills\.[0-9a-f]{20}\.js/)).toBeFalsy();
+    expect(host.fileMatchExists('dist', /vendor\.[0-9a-f]{20}\.js/)).toBeFalsy();
+    expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.css/)).toBeFalsy();
+    expect(host.fileMatchExists('dist', /spectrum\.[0-9a-f]{20}\.png/)).toBeTruthy();
+
+    // 'bundles' should hash bundles only.
+    await browserBuild(architect, host, target, { outputHashing: 'bundles', extractCss: true });
+    expect(host.fileMatchExists('dist', /runtime\.[0-9a-f]{20}\.js/)).toBeTruthy();
+    expect(host.fileMatchExists('dist', /main\.[0-9a-f]{20}\.js/)).toBeTruthy();
+    expect(host.fileMatchExists('dist', /polyfills\.[0-9a-f]{20}\.js/)).toBeTruthy();
+    expect(host.fileMatchExists('dist', /vendor\.[0-9a-f]{20}\.js/)).toBeTruthy();
+    expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.css/)).toBeTruthy();
+    expect(host.fileMatchExists('dist', /spectrum\.[0-9a-f]{20}\.png/)).toBeFalsy();
+  });
+
+  it('does not hash lazy styles', async () => {
+    const overrides = {
+      outputHashing: 'all',
+      extractCss: true,
+      styles: [{ input: 'src/styles.css', lazy: true }],
+    };
+
+    await browserBuild(architect, host, target, overrides);
+
+    expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.js/)).toBeFalsy();
+    expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.js.map/)).toBeFalsy();
+    expect(host.scopedSync().exists(normalize('dist/styles.css'))).toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/styles.css.map'))).toBe(true);
+  });
+
+  it('does not hash lazy styles when optimization is enabled', async () => {
+    const overrides = {
+      outputHashing: 'all',
+      extractCss: true,
+      optimization: true,
+      styles: [{ input: 'src/styles.css', lazy: true }],
+    };
+
+    await browserBuild(architect, host, target, overrides);
+    expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.js/)).toBeFalsy();
+    expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.js.map/)).toBeFalsy();
+    expect(host.scopedSync().exists(normalize('dist/styles.css'))).toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/styles.css.map'))).toBe(true);
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts
index 99ac52e72860..ff4330255e1a 100644
--- a/packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts
@@ -9,8 +9,7 @@
 import { DefaultTimeout, runTargetSpec } from '@angular-devkit/architect/testing';
 import { normalize } from '@angular-devkit/core';
 import { concatMap, tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
-import { lazyModuleFiles, lazyModuleImport } from './lazy-module_spec_large';
+import { browserTargetSpec, host, lazyModuleFiles, lazyModuleImport } from '../utils';
 
 
 describe('Browser Builder output hashing', () => {
diff --git a/packages/angular_devkit/build_angular/test/browser/output-path2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/output-path2_spec_large.ts
new file mode 100644
index 000000000000..3738bf19d048
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/output-path2_spec_large.ts
@@ -0,0 +1,51 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { join, virtualFs } from '@angular-devkit/core';
+import { createArchitect, host } from '../utils';
+
+
+describe('Browser Builder output path', () => {
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('deletes output path', async () => {
+    // Write a file to the output path to later verify it was deleted.
+    await host.write(
+      join(host.root(), 'dist/file.txt'),
+      virtualFs.stringToFileBuffer('file'),
+    ).toPromise();
+
+    // Delete an app file to force a failed compilation.
+    // Failed compilations still delete files, but don't output any.
+    await host.delete(join(host.root(), 'src', 'app', 'app.component.ts')).toPromise();
+
+    const run = await architect.scheduleTarget(target);
+    const output = await run.result;
+    expect(output.success).toBe(false);
+    expect(await host.exists(join(host.root(), 'dist')).toPromise()).toBe(false);
+    await run.stop();
+  });
+
+  it('does not allow output path to be project root', async () => {
+    const overrides = { outputPath: './' };
+    const run = await architect.scheduleTarget(target, overrides);
+    try {
+      await run.result;
+      expect('THE ABOVE LINE SHOULD THROW').toBe('');
+    } catch {}
+    await run.stop();
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/poll2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/poll2_spec_large.ts
new file mode 100644
index 000000000000..22373d4a32ea
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/poll2_spec_large.ts
@@ -0,0 +1,49 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { debounceTime, take, tap } from 'rxjs/operators';
+import { createArchitect, host } from '../utils';
+
+
+describe('Browser Builder poll', () => {
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
+    const overrides = { watch: true, poll: 10000 };
+    const intervals: number[] = [];
+    let startTime: number | undefined;
+
+    const run = await architect.scheduleTarget(target, overrides);
+    await run.output.pipe(
+      // Debounce 1s, otherwise changes are too close together and polling doesn't work.
+      debounceTime(1000),
+      tap((buildEvent) => {
+        expect(buildEvent.success).toBe(true);
+        if (startTime != undefined) {
+          intervals.push(Date.now() - startTime - 1000);
+        }
+        startTime = Date.now();
+        host.appendToFile('src/main.ts', 'console.log(1);');
+      }),
+      take(4),
+    ).toPromise();
+
+    intervals.sort();
+    const median = intervals[Math.trunc(intervals.length / 2)];
+    expect(median).toBeGreaterThan(3000);
+    expect(median).toBeLessThan(12000);
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/profile2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/profile2_spec_large.ts
new file mode 100644
index 000000000000..54faa2876dd5
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/profile2_spec_large.ts
@@ -0,0 +1,34 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { join, normalize } from '@angular-devkit/core';
+import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { browserBuild, createArchitect, host } from '../utils';
+
+
+describe('Browser Builder profile', () => {
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
+    const run = await architect.scheduleTarget(target, { profile: true });
+    const output = await run.result as BrowserBuilderOutput;
+
+    expect(output.success).toBe(true);
+    expect(host.scopedSync().exists(normalize('chrome-profiler-events.json'))).toBe(true);
+    expect(host.scopedSync().exists(normalize('speed-measure-plugin.json'))).toBe(true);
+
+    await run.stop();
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/rebuild2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/rebuild2_spec_large.ts
new file mode 100644
index 000000000000..42d2fd6835d4
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/rebuild2_spec_large.ts
@@ -0,0 +1,350 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// tslint:disable:no-big-function
+
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { TestLogger } from '@angular-devkit/architect/testing';
+import { normalize, virtualFs } from '@angular-devkit/core';
+import { debounceTime, take, takeWhile, tap } from 'rxjs/operators';
+import { createArchitect, host, lazyModuleFiles, lazyModuleImport } from '../utils';
+
+
+describe('Browser Builder rebuilds', () => {
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('rebuilds on TS file changes', async () => {
+    const goldenValueFiles: { [path: string]: string } = {
+      'src/app/app.module.ts': `
+        import { BrowserModule } from '@angular/platform-browser';
+        import { NgModule } from '@angular/core';
+
+        import { AppComponent } from './app.component';
+
+        @NgModule({
+          declarations: [
+            AppComponent
+          ],
+          imports: [
+            BrowserModule
+          ],
+          providers: [],
+          bootstrap: [AppComponent]
+        })
+        export class AppModule { }
+
+        console.log('$$_E2E_GOLDEN_VALUE_1');
+        export let X = '$$_E2E_GOLDEN_VALUE_2';
+      `,
+      'src/main.ts': `
+        import { enableProdMode } from '@angular/core';
+        import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+        import { AppModule } from './app/app.module';
+        import { environment } from './environments/environment';
+
+        if (environment.production) {
+          enableProdMode();
+        }
+
+        platformBrowserDynamic().bootstrapModule(AppModule);
+
+        import * as m from './app/app.module';
+        console.log(m.X);
+        console.log('$$_E2E_GOLDEN_VALUE_3');
+      `,
+    };
+
+    const overrides = { watch: true };
+
+    let buildCount = 0;
+    let phase = 1;
+    const run = await architect.scheduleTarget(target, overrides);
+    await run.output.pipe(
+      tap(result => {
+        expect(result.success).toBe(true, 'build should succeed');
+        buildCount++;
+
+        const hasLazyChunk = host.scopedSync().exists(normalize('dist/lazy-lazy-module.js'));
+        switch (phase) {
+          case 1:
+            // No lazy chunk should exist.
+            if (!hasLazyChunk) {
+              phase = 2;
+              host.writeMultipleFiles({ ...lazyModuleFiles, ...lazyModuleImport });
+            }
+            break;
+
+          case 2:
+            // A lazy chunk should have been with the filename.
+            if (hasLazyChunk) {
+              phase = 3;
+              host.writeMultipleFiles(goldenValueFiles);
+            }
+            break;
+
+          case 3:
+            // The golden values should be present and in the right order.
+            const re = new RegExp(
+              /\$\$_E2E_GOLDEN_VALUE_1(.|\n|\r)*/.source
+              + /\$\$_E2E_GOLDEN_VALUE_2(.|\n|\r)*/.source
+              + /\$\$_E2E_GOLDEN_VALUE_3/.source,
+            );
+            const fileName = './dist/main.js';
+            const content = virtualFs.fileBufferToString(
+              host.scopedSync().read(normalize(fileName)),
+            );
+
+            if (re.test(content)) {
+              phase = 4;
+            }
+            break;
+        }
+      }),
+      takeWhile(() => phase < 4),
+    ).toPromise();
+    await run.stop();
+  });
+
+  it('rebuilds on CSS changes', async () => {
+    const overrides = { watch: true };
+
+    const run = await architect.scheduleTarget(target, overrides);
+    await run.output.pipe(
+      debounceTime(500),
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => host.appendToFile('src/app/app.component.css', ':host { color: blue; }')),
+      take(2),
+    ).toPromise();
+    await run.stop();
+  });
+
+  it('type checks on rebuilds', async () => {
+    host.writeMultipleFiles({
+      'src/funky2.ts': `export const funky2 = (value: string) => value + 'hello';`,
+      'src/funky.ts': `export * from './funky2';`,
+    });
+    host.appendToFile('src/main.ts', `
+      import { funky2 } from './funky';
+      console.log(funky2('town'));
+    `);
+
+    const overrides = { watch: true, forkTypeChecker: false };
+    const logger = new TestLogger('rebuild-type-errors');
+    const typeError = `is not assignable to parameter of type 'number'`;
+    let buildNumber = 0;
+
+    const run = await architect.scheduleTarget(target, overrides, { logger });
+    await run.output.pipe(
+      debounceTime(1000),
+      tap((buildEvent) => {
+        buildNumber += 1;
+        switch (buildNumber) {
+          case 1:
+            expect(buildEvent.success).toBe(true);
+            // Make an invalid version of the file.
+            // Should trigger a rebuild, this time an error is expected.
+            host.writeMultipleFiles({
+              'src/funky2.ts': `export const funky2 = (value: number) => value + 1;`,
+            });
+            break;
+
+          case 2:
+            // The second build should error out with a type error on the type of an argument.
+            expect(buildEvent.success).toBe(false);
+            expect(logger.includes(typeError)).toBe(true);
+            logger.clear();
+            // Change an UNRELATED file and the error should still happen.
+            // Should trigger a rebuild, this time an error is also expected.
+            host.appendToFile('src/app/app.module.ts', `console.log(1);`);
+            break;
+
+          case 3:
+            // The third build should have the same error as the first.
+            expect(buildEvent.success).toBe(false);
+            expect(logger.includes(typeError)).toBe(true);
+            logger.clear();
+            // Fix the error.
+            host.writeMultipleFiles({
+              'src/funky2.ts': `export const funky2 = (value: string) => value + 'hello';`,
+            });
+            break;
+
+          default:
+            expect(buildEvent.success).toBe(true);
+            break;
+        }
+      }),
+      take(4),
+    ).toPromise();
+    await run.stop();
+  });
+
+  it('rebuilds on type changes', async () => {
+    host.writeMultipleFiles({ 'src/type.ts': `export type MyType = number;` });
+    host.appendToFile('src/main.ts', `import { MyType } from './type';`);
+
+    const overrides = { watch: true };
+    const run = await architect.scheduleTarget(target, overrides);
+    await run.output.pipe(
+      debounceTime(1000),
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => host.writeMultipleFiles({ 'src/type.ts': `export type MyType = string;` })),
+      take(2),
+    ).toPromise();
+  });
+
+  it('rebuilds after errors in AOT', async () => {
+    // Save the original contents of `./src/app/app.component.ts`.
+    const origContent = virtualFs.fileBufferToString(
+      host.scopedSync().read(normalize('src/app/app.component.ts')));
+    // Add a major static analysis error on a non-main file to the initial build.
+    host.replaceInFile('./src/app/app.component.ts', `'app-root'`, `(() => 'app-root')()`);
+
+    const overrides = { watch: true, aot: true };
+    const logger = new TestLogger('rebuild-aot-errors');
+    const staticAnalysisError = 'Function expressions are not supported in decorators';
+    const syntaxError = 'Declaration or statement expected.';
+    let buildNumber = 0;
+
+    const run = await architect.scheduleTarget(target, overrides, { logger });
+    await run.output.pipe(
+      debounceTime(1000),
+      tap((buildEvent) => {
+        buildNumber += 1;
+        switch (buildNumber) {
+          case 1:
+            // The first build should error out with a static analysis error.
+            expect(buildEvent.success).toBe(false);
+            expect(logger.includes(staticAnalysisError)).toBe(true);
+            logger.clear();
+            // Fix the static analysis error.
+            host.writeMultipleFiles({ 'src/app/app.component.ts': origContent });
+            break;
+
+          case 2:
+            expect(buildEvent.success).toBe(true);
+            // Add an syntax error to a non-main file.
+            host.appendToFile('src/app/app.component.ts', `]]]`);
+            break;
+
+          case 3:
+            // The third build should have TS syntax error.
+            expect(buildEvent.success).toBe(false);
+            expect(logger.includes(syntaxError)).toBe(true);
+            logger.clear();
+            // Fix the syntax error, but add the static analysis error again.
+            host.writeMultipleFiles({
+              'src/app/app.component.ts': origContent.replace(`'app-root'`, `(() => 'app-root')()`),
+            });
+            break;
+
+          case 4:
+            expect(buildEvent.success).toBe(false);
+            // Restore the file to a error-less state.
+            host.writeMultipleFiles({ 'src/app/app.component.ts': origContent });
+            break;
+
+          case 5:
+            // The fifth build should have everything fixed..
+            expect(buildEvent.success).toBe(true);
+            expect(logger.includes(staticAnalysisError)).toBe(true);
+            break;
+        }
+      }),
+      take(5),
+    ).toPromise();
+    await run.stop();
+  });
+
+  it('rebuilds AOT factories', async () => {
+
+    host.writeMultipleFiles({
+      'src/app/app.component.css': `
+        @import './imported-styles.css';
+        body {background-color: #00f;}
+      `,
+      'src/app/imported-styles.css': 'p {color: #f00;}',
+    });
+
+    const overrides = { watch: true, aot: true };
+    let buildNumber = 0;
+
+    const run = await architect.scheduleTarget(target, overrides);
+    await run.output.pipe(
+      debounceTime(1000),
+      tap((buildEvent) => {
+        buildNumber += 1;
+        const fileName = './dist/main.js';
+        let content;
+        switch (buildNumber) {
+          case 1:
+            // Trigger a few rebuilds first.
+            // The AOT compiler is still optimizing rebuilds on the first rebuilds.
+            expect(buildEvent.success).toBe(true);
+            host.appendToFile('src/main.ts', 'console.log(1);');
+            break;
+
+          case 2:
+            expect(buildEvent.success).toBe(true);
+            host.appendToFile('src/main.ts', 'console.log(1);');
+            break;
+
+          case 3:
+            // Change the component html.
+            expect(buildEvent.success).toBe(true);
+            host.appendToFile('src/app/app.component.html', '<p>HTML_REBUILD_STRING<p>');
+            break;
+
+          case 4:
+            // Check if html changes are added to factories.
+            expect(buildEvent.success).toBe(true);
+            content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
+            expect(content).toContain('HTML_REBUILD_STRING');
+            // Change the component css.
+            host.appendToFile('src/app/app.component.css', 'CSS_REBUILD_STRING {color: #f00;}');
+            break;
+
+          case 5:
+            // Check if css changes are added to factories.
+            expect(buildEvent.success).toBe(true);
+            content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
+            expect(content).toContain('CSS_REBUILD_STRING');
+            // Change the component css import.
+            host.appendToFile('src/app/app.component.css', 'CSS_DEP_REBUILD_STRING {color: #f00;}');
+            break;
+
+          case 6:
+            // Check if css import changes are added to factories.
+            expect(buildEvent.success).toBe(true);
+            content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
+            expect(content).toContain('CSS_DEP_REBUILD_STRING');
+            // Change the component itself.
+            host.replaceInFile('src/app/app.component.ts', 'app-root',
+              'app-root-FACTORY_REBUILD_STRING');
+            break;
+
+          case 7:
+            // Check if component changes are added to factories.
+            expect(buildEvent.success).toBe(true);
+            content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
+            expect(content).toContain('FACTORY_REBUILD_STRING');
+            break;
+        }
+      }),
+      take(7),
+    ).toPromise();
+    await run.stop();
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
index acd6354a4aca..1e40dd454e09 100644
--- a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
@@ -10,8 +10,7 @@
 import { DefaultTimeout, TestLogger, runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { debounceTime, take, takeWhile, tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
-import { lazyModuleFiles, lazyModuleImport } from './lazy-module_spec_large';
+import { browserTargetSpec, host, lazyModuleFiles, lazyModuleImport } from '../utils';
 
 
 describe('Browser Builder rebuilds', () => {
diff --git a/packages/angular_devkit/build_angular/test/browser/replacements2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/replacements2_spec_large.ts
new file mode 100644
index 000000000000..1ac6e1d47efa
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/replacements2_spec_large.ts
@@ -0,0 +1,213 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { TestLogger } from '@angular-devkit/architect/testing';
+import { normalize, virtualFs } from '@angular-devkit/core';
+import { of, race } from 'rxjs';
+import { delay, filter, map, take, takeUntil, takeWhile, tap, timeout } from 'rxjs/operators';
+import { browserBuild, createArchitect, host } from '../utils';
+
+
+describe('Browser Builder file replacements', () => {
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  beforeEach(() => host.writeMultipleFiles({
+    'src/meaning-too.ts': 'export var meaning = 42;',
+    'src/meaning.ts': `export var meaning = 10;`,
+
+    'src/main.ts': `
+        import { meaning } from './meaning';
+
+        console.log(meaning);
+      `,
+  }));
+
+  it('allows file replacements', async () => {
+    const overrides = {
+      fileReplacements: [
+        {
+          replace: normalize('/src/meaning.ts'),
+          with: normalize('/src/meaning-too.ts'),
+        },
+      ],
+    };
+
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['main.js']).toMatch(/meaning\s*=\s*42/);
+    expect(await files['main.js']).not.toMatch(/meaning\s*=\s*10/);
+  });
+
+  it(`allows file replacements with deprecated format`, async () => {
+    const overrides = {
+      fileReplacements: [
+        {
+          src: normalize('/src/meaning.ts'),
+          replaceWith: normalize('/src/meaning-too.ts'),
+        },
+      ],
+    };
+
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['main.js']).toMatch(/meaning\s*=\s*42/);
+    expect(await files['main.js']).not.toMatch(/meaning\s*=\s*10/);
+  });
+
+  it(`fails compilation with missing 'replace' file`, async () => {
+    const overrides = {
+      fileReplacements: [
+        {
+          replace: normalize('/src/meaning.ts'),
+          with: normalize('/src/meaning-three.ts'),
+        },
+      ],
+    };
+
+    const run = await architect.scheduleTarget(target, overrides);
+    try {
+      await run.result;
+      expect('THE ABOVE LINE SHOULD THROW').toBe('');
+    } catch {}
+    await run.stop();
+  });
+
+  it(`fails compilation with missing 'with' file`, async () => {
+    const overrides = {
+      fileReplacements: [
+        {
+          replace: normalize('/src/meaning-three.ts'),
+          with: normalize('/src/meaning-too.ts'),
+        },
+      ],
+    };
+
+    const run = await architect.scheduleTarget(target, overrides);
+    try {
+      await run.result;
+      expect('THE ABOVE LINE SHOULD THROW').toBe('');
+    } catch {}
+    await run.stop();
+  });
+
+  it('file replacements work with watch mode', async () => {
+    const overrides = {
+      fileReplacements: [
+        {
+          replace: normalize('/src/meaning.ts'),
+          with: normalize('/src/meaning-too.ts'),
+        },
+      ],
+      watch: true,
+    };
+
+    let buildCount = 0;
+    let phase = 1;
+
+    const run = await architect.scheduleTarget(target, overrides);
+    await run.output.pipe(
+      timeout(30000),
+      tap((result) => {
+        expect(result.success).toBe(true, 'build should succeed');
+
+        const fileName = normalize('dist/main.js');
+        const content = virtualFs.fileBufferToString(host.scopedSync().read(fileName));
+        const has42 = /meaning\s*=\s*42/.test(content);
+        buildCount++;
+        switch (phase) {
+          case 1:
+            const has10 = /meaning\s*=\s*10/.test(content);
+
+            if (has42 && !has10) {
+              phase = 2;
+              host.writeMultipleFiles({
+                'src/meaning-too.ts': 'export var meaning = 84;',
+              });
+            }
+            break;
+
+          case 2:
+            const has84 = /meaning\s*=\s*84/.test(content);
+
+            if (has84 && !has42) {
+              phase = 3;
+            } else {
+              // try triggering a rebuild again
+              host.writeMultipleFiles({
+                'src/meaning-too.ts': 'export var meaning = 84;',
+              });
+            }
+            break;
+        }
+      }),
+      takeWhile(() => phase < 3),
+    ).toPromise().catch(() => {
+      throw new Error(`stuck at phase ${phase} [builds: ${buildCount}]`);
+    });
+
+    await run.stop();
+  });
+
+  it('file replacements work with forked type checker on watch mode', async () => {
+    host.writeMultipleFiles({
+      'src/file-replaced.ts': 'export var obj = { one: 1, two: 2 };',
+      'src/file.ts': `export var obj = { one: 1 };`,
+      'src/main.ts': `
+        import { obj } from './file';
+        console.log(obj.two);
+      `,
+    });
+
+    const overrides = {
+      fileReplacements: [{
+        replace: normalize('/src/file.ts'),
+        with: normalize('/src/file-replaced.ts'),
+      }],
+      watch: true,
+    };
+
+    const unexpectedError = `Property 'two' does not exist on type '{ one: number; }'`;
+    const expectedError = `Property 'prop' does not exist on type '{}'`;
+    const logger = new TestLogger('rebuild-type-errors');
+
+    // Race between a timeout and the expected log entry.
+    const stop$ = race<null | string>(
+      of(null).pipe(delay(45000 * 2 / 3)),
+      logger.pipe(
+        filter(entry => entry.message.includes(expectedError)),
+        map(entry => entry.message),
+        take(1),
+      ),
+    );
+
+    let errorAdded = false;
+    const run = await architect.scheduleTarget(target, overrides, { logger });
+    run.output.pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true, 'build should succeed')),
+      tap(() => {
+        // Introduce a known type error to detect in the logger filter.
+        if (!errorAdded) {
+          host.appendToFile('src/main.ts', 'console.log({}.prop);');
+          errorAdded = true;
+        }
+      }),
+      takeUntil(stop$),
+    ).subscribe();
+
+    const res = await stop$.toPromise();
+    expect(res).not.toBe(null, 'Test timed out.');
+    expect(res).not.toContain(unexpectedError);
+    await run.stop();
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/resolve-json-module2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/resolve-json-module2_spec_large.ts
new file mode 100644
index 000000000000..149522603897
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/resolve-json-module2_spec_large.ts
@@ -0,0 +1,66 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { join, virtualFs } from '@angular-devkit/core';
+import { take, tap } from 'rxjs/operators';
+import { createArchitect, host, outputPath } from '../utils';
+
+
+describe('Browser Builder resolve json module', () => {
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works with watch', async () => {
+    host.writeMultipleFiles({
+      'src/my-json-file.json': `{"foo": "1"}`,
+      'src/main.ts': `import * as a from './my-json-file.json'; console.log(a);`,
+    });
+
+    host.replaceInFile(
+      'tsconfig.json',
+      '"target": "es5"',
+      '"target": "es5", "resolveJsonModule": true',
+    );
+
+    const overrides = { watch: true };
+
+    let buildCount = 1;
+    const run = await architect.scheduleTarget(target, overrides);
+    await run.output.pipe(
+      tap(() => {
+        const content = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, 'main.js')),
+        );
+
+        switch (buildCount) {
+          case 1:
+            expect(content).toContain('foo":"1"');
+            host.writeMultipleFiles({
+              'src/my-json-file.json': `{"foo": "2"}`,
+            });
+            break;
+          case 2:
+            expect(content).toContain('foo":"2"');
+            break;
+        }
+
+        buildCount++;
+      }),
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      take(2),
+    ).toPromise();
+  });
+
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/resources-output-path2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/resources-output-path2_spec_large.ts
new file mode 100644
index 000000000000..b97b98e74335
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/resources-output-path2_spec_large.ts
@@ -0,0 +1,98 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// tslint:disable:no-big-function
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { normalize } from '@angular-devkit/core';
+import { browserBuild, createArchitect, host } from '../utils';
+
+
+describe('Browser Builder styles resources output path', () => {
+  const imgSvg = `
+    <svg width="100" height="100" xmlns="http://www.w3.org/2000/svg">
+      <circle cx="50" cy="50" r="40" stroke="green" stroke-width="4" fill="yellow" />
+    </svg>
+  `;
+
+  function writeFiles() {
+    // Use a large image for the relative ref so it cannot be inlined.
+    host.copyFile('src/spectrum.png', './src/assets/global-img-relative.png');
+    host.copyFile('src/spectrum.png', './src/assets/component-img-relative.png');
+    host.writeMultipleFiles({
+      'src/styles.css': `
+          h1 { background: url('/assets/global-img-absolute.svg'); }
+          h2 { background: url('./assets/global-img-relative.png'); }
+        `,
+      'src/app/app.component.css': `
+          h3 { background: url('/assets/component-img-absolute.svg'); }
+          h4 { background: url('../assets/component-img-relative.png'); }
+        `,
+      'src/assets/global-img-absolute.svg': imgSvg,
+      'src/assets/component-img-absolute.svg': imgSvg,
+    });
+  }
+
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it(`supports resourcesOutputPath in resource urls`, async () => {
+    writeFiles();
+    // Check base paths are correctly generated.
+    const overrides = {
+      aot: true,
+      extractCss: true,
+      resourcesOutputPath: 'out-assets',
+    };
+
+    const { files } = await browserBuild(architect, host, target, overrides);
+    const styles = await files['styles.css'];
+    const main = await files['main.js'];
+
+    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+    expect(styles).toContain(`url('out-assets/global-img-relative.png')`);
+    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+    expect(main).toContain(`url('out-assets/component-img-relative.png')`);
+
+    expect(host.scopedSync()
+      .exists(normalize('dist/assets/global-img-absolute.svg'))).toBe(true);
+    expect(host.scopedSync()
+      .exists(normalize('dist/out-assets/global-img-relative.png'))).toBe(true);
+    expect(host.scopedSync()
+      .exists(normalize('dist/assets/component-img-absolute.svg'))).toBe(true);
+    expect(host.scopedSync()
+      .exists(normalize('dist/out-assets/component-img-relative.png'))).toBe(true);
+  });
+
+  it(`supports blank resourcesOutputPath`, async () => {
+    writeFiles();
+
+    // Check base paths are correctly generated.
+    const overrides = { aot: true, extractCss: true };
+    const { files } = await browserBuild(architect, host, target, overrides);
+    const styles = await files['styles.css'];
+    const main = await files['main.js'];
+
+    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+    expect(styles).toContain(`url('global-img-relative.png')`);
+    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+    expect(main).toContain(`url('component-img-relative.png')`);
+    expect(host.scopedSync().exists(normalize('dist/assets/global-img-absolute.svg')))
+      .toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/global-img-relative.png')))
+      .toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/assets/component-img-absolute.svg')))
+      .toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/component-img-relative.png')))
+      .toBe(true);
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/scripts-array2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/scripts-array2_spec_large.ts
new file mode 100644
index 000000000000..9c8333518858
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/scripts-array2_spec_large.ts
@@ -0,0 +1,141 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { TestLogger } from '@angular-devkit/architect/testing';
+import { browserBuild, createArchitect, host } from '../utils';
+
+
+describe('Browser Builder scripts array', () => {
+  const scripts: { [path: string]: string } = {
+    'src/input-script.js': 'console.log(\'input-script\'); var number = 1+1;',
+    'src/zinput-script.js': 'console.log(\'zinput-script\');',
+    'src/finput-script.js': 'console.log(\'finput-script\');',
+    'src/uinput-script.js': 'console.log(\'uinput-script\');',
+    'src/binput-script.js': 'console.log(\'binput-script\');',
+    'src/ainput-script.js': 'console.log(\'ainput-script\');',
+    'src/cinput-script.js': 'console.log(\'cinput-script\');',
+    'src/lazy-script.js': 'console.log(\'lazy-script\');',
+    'src/pre-rename-script.js': 'console.log(\'pre-rename-script\');',
+    'src/pre-rename-lazy-script.js': 'console.log(\'pre-rename-lazy-script\');',
+  };
+  const getScriptsOption = () => [
+    'src/input-script.js',
+    'src/zinput-script.js',
+    'src/finput-script.js',
+    'src/uinput-script.js',
+    'src/binput-script.js',
+    'src/ainput-script.js',
+    'src/cinput-script.js',
+    { input: 'src/lazy-script.js', bundleName: 'lazy-script', lazy: true },
+    { input: 'src/pre-rename-script.js', bundleName: 'renamed-script' },
+    { input: 'src/pre-rename-lazy-script.js', bundleName: 'renamed-lazy-script', lazy: true },
+  ];
+
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
+    const matches: { [path: string]: string } = {
+      'scripts.js': 'input-script',
+      'lazy-script.js': 'lazy-script',
+      'renamed-script.js': 'pre-rename-script',
+      'renamed-lazy-script.js': 'pre-rename-lazy-script',
+      'main.js': 'input-script',
+      'index.html': '<script src="runtime.js"></script>'
+        + '<script src="polyfills.js"></script>'
+        + '<script src="scripts.js"></script>'
+        + '<script src="renamed-script.js"></script>'
+        + '<script src="vendor.js"></script>'
+        + '<script src="main.js"></script>',
+    };
+
+    host.writeMultipleFiles(scripts);
+    host.appendToFile('src/main.ts', '\nimport \'./input-script.js\';');
+
+    // Remove styles so we don't have to account for them in the index.html order check.
+    const { files } = await browserBuild(architect, host, target, {
+      styles: [],
+      scripts: getScriptsOption(),
+    } as {});
+
+    for (const fileName of Object.keys(matches)) {
+      expect(await files[fileName]).toMatch(matches[fileName]);
+    }
+  });
+
+  it('uglifies, uses sourcemaps, and adds hashes', async () => {
+    host.writeMultipleFiles(scripts);
+
+    const { files } = await browserBuild(architect, host, target, {
+      optimization: true,
+      sourceMap: true,
+      outputHashing: 'all',
+      scripts: getScriptsOption(),
+    } as {});
+
+    const fileNames = Object.keys(files);
+    const scriptsBundle = fileNames.find(n => /scripts\.[0-9a-f]{20}\.js/.test(n));
+    expect(scriptsBundle).toBeTruthy();
+    expect(await files[scriptsBundle || '']).toMatch('var number=2;');
+
+    expect(fileNames.some(n => /scripts\.[0-9a-f]{20}\.js\.map/.test(n))).toBeTruthy();
+    expect(fileNames.some(n => /renamed-script\.[0-9a-f]{20}\.js/.test(n))).toBeTruthy();
+    expect(fileNames.some(n => /renamed-script\.[0-9a-f]{20}\.js\.map/.test(n))).toBeTruthy();
+    expect(fileNames.some(n => /script\.[0-9a-f]{20}\.js/.test(n))).toBeTruthy();
+    expect(await files['lazy-script.js']).not.toBeUndefined();
+    expect(await files['lazy-script.js.map']).not.toBeUndefined();
+    expect(await files['renamed-lazy-script.js']).not.toBeUndefined();
+    expect(await files['renamed-lazy-script.js.map']).not.toBeUndefined();
+  });
+
+  it('preserves script order', async () => {
+    host.writeMultipleFiles(scripts);
+
+    const { files } = await browserBuild(architect, host, target, {
+      scripts: getScriptsOption(),
+    } as {});
+
+    expect(await files['scripts.js']).toMatch(new RegExp(
+      /.*['"]input-script['"](.|\n|\r)*/.source
+      + /['"]zinput-script['"](.|\n|\r)*/.source
+      + /['"]finput-script['"](.|\n|\r)*/.source
+      + /['"]uinput-script['"](.|\n|\r)*/.source
+      + /['"]binput-script['"](.|\n|\r)*/.source
+      + /['"]ainput-script['"](.|\n|\r)*/.source
+      + /['"]cinput-script['"]/.source,
+    ));
+  });
+
+  it('chunk in entry', async () => {
+    host.writeMultipleFiles(scripts);
+
+    const logger = new TestLogger('build-script-entry');
+    await browserBuild(
+      architect,
+      host,
+      target,
+      {
+        scripts: getScriptsOption(),
+      } as {},
+      { logger },
+    );
+
+    const validate = ` [entry] [rendered]`;
+    expect(logger.includes(`(lazy-script) 69 bytes${validate}`)).toBe(true);
+    expect(logger.includes(`(renamed-script) 78 bytes${validate}`)).toBe(true);
+    expect(logger.includes(`(renamed-lazy-script) 88 bytes${validate}`)).toBe(true);
+    logger.clear();
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/source-map2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/source-map2_spec_large.ts
new file mode 100644
index 000000000000..eba5e7b25e0b
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/source-map2_spec_large.ts
@@ -0,0 +1,153 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { OutputHashing } from '../../src/browser/schema';
+import { browserBuild, createArchitect, host } from '../utils';
+
+// tslint:disable-next-line:no-big-function
+describe('Browser Builder source map', () => {
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
+    const overrides = {
+      sourceMap: true,
+      extractCss: true,
+      styles: ['src/styles.css'],
+    };
+
+    host.writeMultipleFiles({
+      'src/styles.css': `div { flex: 1 }`,
+    });
+
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['main.js.map']).not.toBeUndefined();
+    expect(await files['styles.css.map']).not.toBeUndefined();
+  });
+
+  it('works with outputHashing', async () => {
+    const { files } = await browserBuild(architect, host, target, {
+      sourceMap: true,
+      outputHashing: OutputHashing.All,
+    });
+
+    expect(Object.keys(files).some(name => /main\.[0-9a-f]{20}\.js.map/.test(name))).toBeTruthy();
+  });
+
+  it('does not output source map when disabled', async () => {
+    const { files } = await browserBuild(architect, host, target, {
+      sourceMap: false,
+    });
+
+    expect(files['main.js.map']).toBeUndefined();
+  });
+
+  it('supports eval source map', async () => {
+    const { files } = await browserBuild(architect, host, target, {
+      sourceMap: true, evalSourceMap: true,
+    });
+
+    expect(files['main.js.map']).toBeUndefined();
+    expect(await files['main.js']).toContain('eval("function webpackEmptyAsyncContext');
+  });
+
+  it('supports hidden sourcemaps', async () => {
+    const overrides = {
+      sourceMap: {
+        hidden: true,
+        styles: true,
+        scripts: true,
+      },
+      extractCss: true,
+      styles: ['src/styles.scss'],
+    };
+
+    host.writeMultipleFiles({
+      'src/styles.scss': `div { flex: 1 }`,
+    });
+
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect('main.js.map' in files).toBe(true);
+    expect('styles.css.map' in files).toBe(true);
+    expect(await files['main.js']).not.toContain('sourceMappingURL=main.js.map');
+    expect(await files['styles.css']).not.toContain('sourceMappingURL=styles.css.map');
+  });
+
+  it('supports styles only sourcemaps', async () => {
+    const overrides = {
+      sourceMap: {
+        styles: true,
+        scripts: false,
+      },
+      extractCss: true,
+      styles: ['src/styles.scss'],
+    };
+
+    host.writeMultipleFiles({
+      'src/styles.scss': `div { flex: 1 }`,
+    });
+
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect('main.js.map' in files).toBe(false);
+    expect('styles.css.map' in files).toBe(true);
+    expect(await files['main.js']).not.toContain('sourceMappingURL=main.js.map');
+    expect(await files['styles.css']).toContain('sourceMappingURL=styles.css.map');
+  });
+
+  it('supports scripts only sourcemaps', async () => {
+    const overrides = {
+      sourceMap: {
+        styles: false,
+        scripts: true,
+      },
+      extractCss: true,
+      styles: ['src/styles.scss'],
+    };
+
+    host.writeMultipleFiles({
+      'src/styles.scss': `div { flex: 1 }`,
+    });
+
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect('main.js.map' in files).toBe(true);
+    expect('styles.css.map' in files).toBe(false);
+    expect(await files['main.js']).toContain('sourceMappingURL=main.js.map');
+    expect(await files['styles.css']).not.toContain('sourceMappingURL=styles.css.map');
+  });
+
+  it('should not inline component styles sourcemaps when hidden', async () => {
+    const overrides = {
+      sourceMap: {
+        hidden: true,
+        styles: true,
+        scripts: true,
+      },
+      extractCss: true,
+      styles: ['src/styles.scss'],
+    };
+
+    host.writeMultipleFiles({
+      'src/styles.scss': `div { flex: 1 }`,
+      'src/app/app.component.css': `p { color: red; }`,
+    });
+
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect('main.js.map' in files).toBe(true);
+    expect('styles.css.map' in files).toBe(true);
+    expect(await files['main.js']).not.toContain('sourceMappingURL=main.js.map');
+    expect(await files['main.js']).not.toContain('sourceMappingURL=data:application/json');
+    expect(await files['styles.css']).not.toContain('sourceMappingURL=styles.css.map');
+    expect(await files['styles.css']).not.toContain('sourceMappingURL=data:application/json');
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/stats-json2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/stats-json2_spec_large.ts
new file mode 100644
index 000000000000..3ada13a46d94
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/stats-json2_spec_large.ts
@@ -0,0 +1,26 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { browserBuild, createArchitect, host } from '../utils';
+
+
+describe('Browser Builder stats json', () => {
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
+    const { files } = await browserBuild(architect, host, target, { statsJson: true });
+    expect('stats.json' in files).toBe(true);
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/styles2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/styles2_spec_large.ts
new file mode 100644
index 000000000000..c3f67eaaaec4
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/styles2_spec_large.ts
@@ -0,0 +1,578 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// tslint:disable:no-big-function
+
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { normalize, tags } from '@angular-devkit/core';
+import { browserBuild, createArchitect, host } from '../utils';
+
+
+describe('Browser Builder styles', () => {
+  const extensionsWithImportSupport = ['css', 'scss', 'less', 'styl'];
+  const extensionsWithVariableSupport = ['scss', 'less', 'styl'];
+  const imgSvg = `
+    <svg width="100" height="100" xmlns="http://www.w3.org/2000/svg">
+      <circle cx="50" cy="50" r="40" stroke="green" stroke-width="4" fill="yellow" />
+    </svg>
+  `;
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('supports global styles', async () => {
+    const styles = [
+      'src/input-style.css',
+      { input: 'src/lazy-style.css', bundleName: 'lazy-style', lazy: true },
+      { input: 'src/pre-rename-style.css', bundleName: 'renamed-style' },
+      { input: 'src/pre-rename-lazy-style.css', bundleName: 'renamed-lazy-style', lazy: true },
+    ] as {};
+    const cssMatches: { [path: string]: string } = {
+      'styles.css': '.input-style',
+      'lazy-style.css': '.lazy-style',
+      'renamed-style.css': '.pre-rename-style',
+      'renamed-lazy-style.css': '.pre-rename-lazy-style',
+    };
+    const cssIndexMatches: { [path: string]: string } = {
+      'index.html': '<link rel="stylesheet" href="styles.css">'
+        + '<link rel="stylesheet" href="renamed-style.css">',
+    };
+    const jsMatches: { [path: string]: string } = {
+      'styles.js': '.input-style',
+      'lazy-style.js': '.lazy-style',
+      'renamed-style.js': '.pre-rename-style',
+      'renamed-lazy-style.js': '.pre-rename-lazy-style',
+    };
+    const jsIndexMatches: { [path: string]: string } = {
+      'index.html': '<script src="runtime.js"></script>'
+        + '<script src="polyfills.js"></script>'
+        + '<script src="styles.js"></script>'
+        + '<script src="renamed-style.js"></script>'
+        + '<script src="vendor.js"></script>'
+        + '<script src="main.js"></script>',
+    };
+
+    host.writeMultipleFiles({
+      'src/string-style.css': '.string-style { color: red }',
+      'src/input-style.css': '.input-style { color: red }',
+      'src/lazy-style.css': '.lazy-style { color: red }',
+      'src/pre-rename-style.css': '.pre-rename-style { color: red }',
+      'src/pre-rename-lazy-style.css': '.pre-rename-lazy-style { color: red }',
+    });
+
+    let { files } = await browserBuild(architect, host, target, { extractCss: true, styles });
+    // Check css files were created.
+    for (const cssFileName of Object.keys(cssMatches)) {
+      expect(await files[cssFileName]).toMatch(cssMatches[cssFileName]);
+    }
+    // Check no js files are created.
+    for (const jsFileName of Object.keys(jsMatches)) {
+      expect(jsFileName in files).toBe(false);
+    }
+
+    // Check check index has styles in the right order.
+    for (const cssIndexFileName of Object.keys(cssIndexMatches)) {
+      expect(await files[cssIndexFileName]).toMatch(cssIndexMatches[cssIndexFileName]);
+    }
+
+    // Also test with extractCss false.
+    files = (await browserBuild(architect, host, target, { extractCss: false, styles })).files;
+
+    // Check js files were created.
+    for (const jsFileName of Object.keys(jsMatches)) {
+      expect(await files[jsFileName]).toMatch(jsMatches[jsFileName]);
+    }
+
+    // Check no css files are created.
+    for (const cssFileName of Object.keys(cssMatches)) {
+      expect(cssFileName in files).toBe(false);
+    }
+
+    // Check check index has styles in the right order.
+    for (const jsIndexFileName of Object.keys(jsIndexMatches)) {
+      expect(await files[jsIndexFileName]).toMatch(jsIndexMatches[jsIndexFileName]);
+    }
+  });
+
+  it('supports empty styleUrls in components', async () => {
+    host.writeMultipleFiles({
+      './src/app/app.component.ts': `
+        import { Component } from '@angular/core';
+
+        @Component({
+          selector: 'app-root',
+          templateUrl: './app.component.html',
+          styleUrls: []
+        })
+        export class AppComponent {
+          title = 'app';
+        }
+      `,
+    });
+
+    await browserBuild(architect, host, target, { extractCss: true });
+  });
+
+  extensionsWithImportSupport.forEach(ext => {
+    it(`supports imports in ${ext} files`, async () => {
+      host.writeMultipleFiles({
+        [`src/styles.${ext}`]: `
+          @import './imported-styles.${ext}';
+          body { background-color: #00f; }
+        `,
+        [`src/imported-styles.${ext}`]: 'p { background-color: #f00; }',
+        [`src/app/app.component.${ext}`]: `
+          @import './imported-component-styles.${ext}';
+          .outer {
+            .inner {
+              background: #fff;
+            }
+          }
+        `,
+        [`src/app/imported-component-styles.${ext}`]: 'h1 { background: #000; }',
+      });
+
+      const matches: { [path: string]: RegExp } = {
+        'styles.css': new RegExp(
+          // The global style should be there
+          /p\s*{\s*background-color: #f00;\s*}(.|\n|\r)*/.source
+          // The global style via import should be there
+          + /body\s*{\s*background-color: #00f;\s*}/.source,
+        ),
+        'styles.css.map': /"mappings":".+"/,
+        'main.js': new RegExp(
+          // The component style should be there
+          /h1(.|\n|\r)*background:\s*#000(.|\n|\r)*/.source
+          // The component style via import should be there
+          + /.outer(.|\n|\r)*.inner(.|\n|\r)*background:\s*#[fF]+/.source,
+        ),
+      };
+
+      const overrides = {
+        extractCss: true,
+        sourceMap: true,
+        styles: [`src/styles.${ext}`],
+      };
+
+      host.replaceInFile(
+        'src/app/app.component.ts',
+        './app.component.css',
+        `./app.component.${ext}`,
+      );
+
+      const { files } = await browserBuild(architect, host, target, overrides);
+      for (const fileName of Object.keys(matches)) {
+        expect(await files[fileName]).toMatch(matches[fileName]);
+      }
+    });
+  });
+
+  extensionsWithImportSupport.forEach(ext => {
+    it(`supports material imports in ${ext} files`, async () => {
+      host.writeMultipleFiles({
+        [`src/styles.${ext}`]: `
+          @import "~@angular/material/prebuilt-themes/indigo-pink.css";
+          @import "@angular/material/prebuilt-themes/indigo-pink.css";
+        `,
+        [`src/app/app.component.${ext}`]: `
+          @import "~@angular/material/prebuilt-themes/indigo-pink.css";
+          @import "@angular/material/prebuilt-themes/indigo-pink.css";
+        `,
+      });
+      host.replaceInFile('src/app/app.component.ts', './app.component.css',
+        `./app.component.${ext}`);
+
+      const overrides = {
+        extractCss: true,
+        styles: [{ input: `src/styles.${ext}` }],
+      };
+      await browserBuild(architect, host, target, overrides);
+    });
+  });
+
+  it(`supports material icons`, async () => {
+    const overrides = {
+      extractCss: true,
+      optimization: true,
+      styles: [
+        { input: '../../../../node_modules/material-design-icons/iconfont/material-icons.css' },
+      ],
+    };
+
+    await browserBuild(architect, host, target, overrides);
+  });
+
+  extensionsWithVariableSupport.forEach(ext => {
+    it(`supports ${ext} includePaths`, async () => {
+
+      let variableAssignment = '';
+      let variablereference = '';
+      if (ext === 'scss') {
+        variableAssignment = '$primary-color:';
+        variablereference = '$primary-color';
+      } else if (ext === 'styl') {
+        variableAssignment = '$primary-color =';
+        variablereference = '$primary-color';
+      } else if (ext === 'less') {
+        variableAssignment = '@primary-color:';
+        variablereference = '@primary-color';
+      }
+
+      host.writeMultipleFiles({
+        [`src/style-paths/variables.${ext}`]: `${variableAssignment} #f00;`,
+        [`src/styles.${ext}`]: `
+          @import 'variables';
+          h1 { color: ${variablereference}; }
+        `,
+        [`src/app/app.component.${ext}`]: `
+          @import 'variables';
+          h2 { color: ${variablereference}; }
+        `,
+      });
+
+      const matches: { [path: string]: RegExp } = {
+        'styles.css': /h1\s*{\s*color: #f00;\s*}/,
+        'main.js': /h2.*{.*color: #f00;.*}/,
+      };
+
+      host.replaceInFile('src/app/app.component.ts', './app.component.css',
+        `./app.component.${ext}`);
+
+      const overrides = {
+        extractCss: true,
+        styles: [`src/styles.${ext}`],
+        stylePreprocessorOptions: {
+          includePaths: ['src/style-paths'],
+        },
+      };
+
+      const { files } = await browserBuild(architect, host, target, overrides);
+      for (const fileName of Object.keys(matches)) {
+        expect(await files[fileName]).toMatch(matches[fileName]);
+      }
+    });
+  });
+
+  it(`supports font-awesome imports`, async () => {
+    host.writeMultipleFiles({
+      'src/styles.scss': `
+        $fa-font-path: "~font-awesome/fonts";
+        @import "~font-awesome/scss/font-awesome";
+      `,
+    });
+
+    const overrides = { extractCss: true, styles: [`src/styles.scss`] };
+    await browserBuild(architect, host, target, overrides);
+  }, 30000);
+
+  it(`supports font-awesome imports without extractCss`, async () => {
+    host.writeMultipleFiles({
+      'src/styles.scss': `
+        @import "~font-awesome/css/font-awesome.css";
+      `,
+    });
+
+    const overrides = { extractCss: false, styles: [`src/styles.scss`] };
+    await browserBuild(architect, host, target, overrides);
+  }, 30000);
+
+  it(`uses autoprefixer`, async () => {
+    host.writeMultipleFiles({
+      'src/styles.css': tags.stripIndents`
+        /* normal-comment */
+        /*! important-comment */
+        div { flex: 1 }`,
+    });
+
+    const overrides = { extractCss: true, optimization: false };
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['styles.css']).toContain(tags.stripIndents`
+      /* normal-comment */
+      /*! important-comment */
+      div { -ms-flex: 1; flex: 1 }`,
+    );
+  });
+
+  it(`minimizes css`, async () => {
+    host.writeMultipleFiles({
+      'src/styles.css': tags.stripIndents`
+        /* normal-comment */
+        /*! important-comment */
+        div { flex: 1 }`,
+    });
+
+    const overrides = { extractCss: true, optimization: true };
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['styles.css']).toContain('/*! important-comment */div{-ms-flex:1;flex:1}');
+  });
+
+  // TODO: consider making this a unit test in the url processing plugins.
+  it(`supports baseHref/deployUrl in resource urls without rebaseRootRelativeCssUrls`, async () => {
+    // Use a large image for the relative ref so it cannot be inlined.
+    host.copyFile('src/spectrum.png', './src/assets/global-img-relative.png');
+    host.copyFile('src/spectrum.png', './src/assets/component-img-relative.png');
+    host.writeMultipleFiles({
+      'src/styles.css': `
+        h1 { background: url('/assets/global-img-absolute.svg'); }
+        h2 { background: url('./assets/global-img-relative.png'); }
+      `,
+      'src/app/app.component.css': `
+        h3 { background: url('/assets/component-img-absolute.svg'); }
+        h4 { background: url('../assets/component-img-relative.png'); }
+      `,
+      'src/assets/global-img-absolute.svg': imgSvg,
+      'src/assets/component-img-absolute.svg': imgSvg,
+    });
+
+    let { files } = await browserBuild(architect, host, target, { aot: true, extractCss: true });
+
+    // Check base paths are correctly generated.
+    let styles = await files['styles.css'];
+    let main = await files['main.js'];
+
+    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+    expect(styles).toContain(`url('global-img-relative.png')`);
+    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+    expect(main).toContain(`url('component-img-relative.png')`);
+
+    expect(host.scopedSync().exists(normalize('dist/assets/global-img-absolute.svg')))
+      .toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/global-img-relative.png')))
+      .toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/assets/component-img-absolute.svg')))
+      .toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/component-img-relative.png')))
+      .toBe(true);
+
+    // Check urls with deploy-url scheme are used as is.
+    files = (await browserBuild(architect, host, target, {
+      extractCss: true,
+      baseHref: '/base/',
+      deployUrl: 'http://deploy.url/',
+    })).files;
+
+    styles = await files['styles.css'];
+    main = await files['main.js'];
+    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+
+    // Check urls with base-href scheme are used as is (with deploy-url).
+    files = (await browserBuild(architect, host, target, {
+      extractCss: true,
+      baseHref: 'http://base.url/',
+      deployUrl: 'deploy/',
+    })).files;
+    styles = await files['styles.css'];
+    main = await files['main.js'];
+    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+
+    // Check urls with deploy-url and base-href scheme only use deploy-url.
+    files = (await browserBuild(architect, host, target, {
+      extractCss: true,
+      baseHref: 'http://base.url/',
+      deployUrl: 'http://deploy.url/',
+    })).files;
+    styles = await files['styles.css'];
+    main = await files['main.js'];
+    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+
+    // Check with schemeless base-href and deploy-url flags.
+    files = (await browserBuild(architect, host, target, {
+      extractCss: true,
+      baseHref: '/base/',
+      deployUrl: 'deploy/',
+    })).files;
+    styles = await files['styles.css'];
+    main = await files['main.js'];
+    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+
+    // Check with identical base-href and deploy-url flags.
+    files = (await browserBuild(architect, host, target, {
+      extractCss: true,
+      baseHref: '/base/',
+      deployUrl: '/base/',
+    })).files;
+
+    styles = await files['styles.css'];
+    main = await files['main.js'];
+    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+
+    // Check with only base-href flag.
+    files = (await browserBuild(architect, host, target, {
+      extractCss: true,
+      baseHref: '/base/',
+    })).files;
+
+    styles = await files['styles.css'];
+    main = await files['main.js'];
+    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+  }, 90000);
+
+  it(`supports baseHref/deployUrl in resource urls with rebaseRootRelativeCssUrls`, async () => {
+    // Use a large image for the relative ref so it cannot be inlined.
+    host.copyFile('src/spectrum.png', './src/assets/global-img-relative.png');
+    host.copyFile('src/spectrum.png', './src/assets/component-img-relative.png');
+    host.writeMultipleFiles({
+      'src/styles.css': `
+        h1 { background: url('/assets/global-img-absolute.svg'); }
+        h2 { background: url('./assets/global-img-relative.png'); }
+      `,
+      'src/app/app.component.css': `
+        h3 { background: url('/assets/component-img-absolute.svg'); }
+        h4 { background: url('../assets/component-img-relative.png'); }
+      `,
+      'src/assets/global-img-absolute.svg': imgSvg,
+      'src/assets/component-img-absolute.svg': imgSvg,
+    });
+
+    // Check base paths are correctly generated.
+    const overrides = {
+      extractCss: true,
+      rebaseRootRelativeCssUrls: true,
+    };
+    let { files } = await browserBuild(architect, host, target, {
+      ...overrides,
+      aot: true,
+    });
+
+    let styles = await files['styles.css'];
+    let main = await files['main.js'];
+    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+    expect(styles).toContain(`url('global-img-relative.png')`);
+    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+    expect(main).toContain(`url('component-img-relative.png')`);
+    expect(host.scopedSync().exists(normalize('dist/assets/global-img-absolute.svg')))
+      .toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/global-img-relative.png')))
+      .toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/assets/component-img-absolute.svg')))
+      .toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/component-img-relative.png')))
+      .toBe(true);
+
+    // Check urls with deploy-url scheme are used as is.
+    files = (await browserBuild(architect, host, target, {
+      ...overrides,
+      baseHref: '/base/',
+      deployUrl: 'http://deploy.url/',
+    })).files;
+
+    styles = await files['styles.css'];
+    main = await files['main.js'];
+    expect(styles).toContain(`url('http://deploy.url/assets/global-img-absolute.svg')`);
+    expect(main).toContain(`url('http://deploy.url/assets/component-img-absolute.svg')`);
+
+    // Check urls with base-href scheme are used as is (with deploy-url).
+    files = (await browserBuild(architect, host, target, {
+      ...overrides,
+      baseHref: 'http://base.url/',
+      deployUrl: 'deploy/'
+    })).files;
+
+    styles = await files['styles.css'];
+    main = await files['main.js'];
+    expect(styles).toContain(`url('http://base.url/deploy/assets/global-img-absolute.svg')`);
+    expect(main).toContain(`url('http://base.url/deploy/assets/component-img-absolute.svg')`);
+
+    // Check urls with deploy-url and base-href scheme only use deploy-url.
+    files = (await browserBuild(architect, host, target, {
+      ...overrides,
+      baseHref: 'http://base.url/',
+      deployUrl: 'http://deploy.url/',
+    })).files;
+
+    styles = await files['styles.css'];
+    main = await files['main.js'];
+    expect(styles).toContain(`url('http://deploy.url/assets/global-img-absolute.svg')`);
+    expect(main).toContain(`url('http://deploy.url/assets/component-img-absolute.svg')`);
+
+    // Check with schemeless base-href and deploy-url flags.
+    files = (await browserBuild(architect, host, target, {
+      ...overrides,
+      baseHref: '/base/',
+      deployUrl: 'deploy/',
+    })).files;
+
+    styles = await files['styles.css'];
+    main = await files['main.js'];
+    expect(styles).toContain(`url('/base/deploy/assets/global-img-absolute.svg')`);
+    expect(main).toContain(`url('/base/deploy/assets/component-img-absolute.svg')`);
+
+    // Check with identical base-href and deploy-url flags.
+    files = (await browserBuild(architect, host, target, {
+      ...overrides,
+      baseHref: '/base/',
+      deployUrl: '/base/',
+    })).files;
+
+    styles = await files['styles.css'];
+    main = await files['main.js'];
+    expect(styles).toContain(`url('/base/assets/global-img-absolute.svg')`);
+    expect(main).toContain(`url('/base/assets/component-img-absolute.svg')`);
+
+    // Check with only base-href flag.
+    files = (await browserBuild(architect, host, target, {
+      ...overrides,
+      baseHref: '/base/',
+    })).files;
+
+    styles = await files['styles.css'];
+    main = await files['main.js'];
+    expect(styles).toContain(`url('/base/assets/global-img-absolute.svg')`);
+    expect(main).toContain(`url('/base/assets/component-img-absolute.svg')`);
+  }, 90000);
+
+  it(`supports bootstrap@4`, async () => {
+    const overrides = {
+      extractCss: true,
+      styles: ['../../../../node_modules/bootstrap/dist/css/bootstrap.css'],
+      scripts: ['../../../../node_modules/bootstrap/dist/js/bootstrap.js'],
+    };
+
+    await browserBuild(architect, host, target, overrides);
+  });
+
+  it(`supports inline javascript in less`, async () => {
+    const overrides = { styles: [`src/styles.less`] };
+    host.writeMultipleFiles({
+      'src/styles.less': `
+        .myFunction() {
+          @functions: ~\`(function () {
+            return '';
+          })()\`;
+        }
+        .myFunction();
+      `,
+    });
+
+    await browserBuild(architect, host, target, overrides);
+  });
+
+  it('supports Protocol-relative Url', async () => {
+    host.writeMultipleFiles({
+      'src/styles.css': `
+        body {
+          background-image: url('//cdn.com/classic-bg.jpg');
+        }
+      `,
+    });
+
+    const overrides = { extractCss: true, optimization: true };
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['styles.css']).toContain('background-image:url(//cdn.com/classic-bg.jpg)');
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/subresource-integrity2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/subresource-integrity2_spec_large.ts
new file mode 100644
index 000000000000..9072570abe10
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/subresource-integrity2_spec_large.ts
@@ -0,0 +1,32 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { browserBuild, createArchitect, host } from '../utils';
+
+
+describe('Browser Builder subresource integrity', () => {
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
+    host.writeMultipleFiles({
+      'src/my-js-file.js': `console.log(1); export const a = 2;`,
+      'src/main.ts': `import { a } from './my-js-file'; console.log(a);`,
+    });
+
+    const overrides = { subresourceIntegrity: true };
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['index.html']).toMatch(/integrity="\w+-[A-Za-z0-9\/\+=]+"/);
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/tsconfig-paths2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/tsconfig-paths2_spec_large.ts
new file mode 100644
index 000000000000..3c051fce1765
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/tsconfig-paths2_spec_large.ts
@@ -0,0 +1,78 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { runTargetSpec } from '@angular-devkit/architect/testing';
+import { tap } from 'rxjs/operators';
+import { browserBuild, browserTargetSpec, createArchitect, host } from '../utils';
+
+
+describe('Browser Builder tsconfig paths', () => {
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
+    host.replaceInFile('src/app/app.module.ts', './app.component', '@root/app/app.component');
+    host.replaceInFile('tsconfig.json', /"baseUrl": ".\/",/, `
+      "baseUrl": "./",
+      "paths": {
+        "@root/*": [
+          "./src/*"
+        ]
+      },
+    `);
+
+    await browserBuild(architect, host, target);
+  });
+
+  it('works', async () => {
+    host.writeMultipleFiles({
+      'src/meaning-too.ts': 'export var meaning = 42;',
+      'src/app/shared/meaning.ts': 'export var meaning = 42;',
+      'src/app/shared/index.ts': `export * from './meaning'`,
+    });
+    host.replaceInFile('tsconfig.json', /"baseUrl": ".\/",/, `
+      "baseUrl": "./",
+      "paths": {
+        "@shared": [
+          "src/app/shared"
+        ],
+        "@shared/*": [
+          "src/app/shared/*"
+        ],
+        "*": [
+          "*",
+          "src/app/shared/*"
+        ]
+      },
+    `);
+    host.appendToFile('src/app/app.component.ts', `
+      import { meaning } from 'src/app/shared/meaning';
+      import { meaning as meaning2 } from '@shared';
+      import { meaning as meaning3 } from '@shared/meaning';
+      import { meaning as meaning4 } from 'meaning';
+      import { meaning as meaning5 } from 'src/meaning-too';
+
+      // need to use imports otherwise they are ignored and
+      // no error is outputted, even if baseUrl/paths don't work
+      console.log(meaning)
+      console.log(meaning2)
+      console.log(meaning3)
+      console.log(meaning4)
+      console.log(meaning5)
+    `);
+
+    await browserBuild(architect, host, target);
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/vendor-chunk2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/vendor-chunk2_spec_large.ts
new file mode 100644
index 000000000000..8fd9084b3b78
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/vendor-chunk2_spec_large.ts
@@ -0,0 +1,26 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { browserBuild, createArchitect, host } from '../utils';
+
+
+describe('Browser Builder vendor chunk', () => {
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
+    const { files } = await browserBuild(architect, host, target, { vendorChunk: true });
+    expect('vendor.js' in files).toBe(true);
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/vendor-source-map2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/vendor-source-map2_spec_large.ts
new file mode 100644
index 000000000000..c787631be93e
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/vendor-source-map2_spec_large.ts
@@ -0,0 +1,63 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Architect } from '@angular-devkit/architect/src/index2';
+import * as path from 'path';
+import { browserBuild, createArchitect, host } from '../utils';
+
+describe('Browser Builder external source map', () => {
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
+    const overrides = {
+      sourceMap: {
+        scripts: true,
+        styles: true,
+        vendor: true,
+      },
+    };
+
+    const { files } = await browserBuild(architect, host, target, overrides);
+    const sourcePath = JSON.parse(await files['vendor.js.map']).sources[0];
+    expect(path.extname(sourcePath)).toBe('.ts', `${sourcePath} extention should be '.ts'`);
+  });
+
+  it(`works when using deprecated 'vendorSourceMap'`, async () => {
+    const overrides = {
+      sourceMap: {
+        scripts: true,
+        styles: true,
+      },
+      vendorSourceMap: true,
+    };
+
+    const { files } = await browserBuild(architect, host, target, overrides);
+    const sourcePath = JSON.parse(await files['vendor.js.map']).sources[0];
+    expect(path.extname(sourcePath)).toBe('.ts', `${sourcePath} extention should be '.ts'`);
+  });
+
+  it('does not map sourcemaps from external library when disabled', async () => {
+    const overrides = {
+      sourceMap: {
+        scripts: true,
+        styles: true,
+        vendor: false,
+      },
+    };
+
+    const { files } = await browserBuild(architect, host, target, overrides);
+    const sourcePath = JSON.parse(await files['vendor.js.map']).sources[0];
+    expect(path.extname(sourcePath)).toBe('.js', `${sourcePath} extention should be '.ts'`);
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/works2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/works2_spec_large.ts
new file mode 100644
index 000000000000..5cc8ecbeb3d0
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/works2_spec_large.ts
@@ -0,0 +1,38 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { runTargetSpec } from '@angular-devkit/architect/testing';
+import { join, normalize } from '@angular-devkit/core';
+import { tap } from 'rxjs/operators';
+import { browserBuild, browserTargetSpec, createArchitect, host } from '../utils';
+
+
+describe('Browser Builder basic test', () => {
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
+    await browserBuild(architect, host, target);
+
+    // Default files should be in outputPath.
+    expect(await host.scopedSync().exists(normalize('dist/runtime.js'))).toBe(true);
+    expect(await host.scopedSync().exists(normalize('dist/main.js'))).toBe(true);
+    expect(await host.scopedSync().exists(normalize('dist/polyfills.js'))).toBe(true);
+    expect(await host.scopedSync().exists(normalize('dist/styles.js'))).toBe(true);
+    expect(await host.scopedSync().exists(normalize('dist/vendor.js'))).toBe(true);
+    expect(await host.scopedSync().exists(normalize('dist/favicon.ico'))).toBe(true);
+    expect(await host.scopedSync().exists(normalize('dist/index.html'))).toBe(true);
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/utils.ts b/packages/angular_devkit/build_angular/test/utils.ts
index 72a11bd0a605..eb006e2342f1 100644
--- a/packages/angular_devkit/build_angular/test/utils.ts
+++ b/packages/angular_devkit/build_angular/test/utils.ts
@@ -6,12 +6,33 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {
+  Architect,
+  BuilderOutput,
+  ScheduleOptions,
+  Target,
+} from '@angular-devkit/architect/src/index2';
 import { TestProjectHost } from '@angular-devkit/architect/testing';
-import { Path, join, normalize } from '@angular-devkit/core';
+import {
+  Path,
+  experimental,
+  join,
+  json,
+  logging,
+  normalize,
+  schema,
+  virtualFs,
+} from '@angular-devkit/core';
+import { WorkspaceNodeModulesArchitectHost } from '../../architect/node';
+import { TestingArchitectHost } from '../../architect/testing/testing-architect-host';
+import { BrowserBuilderOutput } from '../src/browser/index2';
 
 
 const devkitRoot = normalize((global as any)._DevKitRoot); // tslint:disable-line:no-any
-const workspaceRoot = join(devkitRoot, 'tests/angular_devkit/build_angular/hello-world-app/');
+export const workspaceRoot = join(
+  devkitRoot,
+  'tests/angular_devkit/build_angular/hello-world-app/',
+);
 export const host = new TestProjectHost(workspaceRoot);
 export const outputPath: Path = normalize('dist');
 
@@ -21,3 +42,129 @@ export const extractI18nTargetSpec = { project: 'app', target: 'extract-i18n' };
 export const karmaTargetSpec = { project: 'app', target: 'test' };
 export const tslintTargetSpec = { project: 'app', target: 'lint' };
 export const protractorTargetSpec = { project: 'app-e2e', target: 'e2e' };
+
+
+export async function createArchitect(workspaceRoot: string) {
+  const registry = new schema.CoreSchemaRegistry();
+  registry.addPostTransform(schema.transforms.addUndefinedDefaults);
+
+  const workspace = await experimental.workspace.Workspace.fromPath(host, host.root(), registry);
+  const architectHost = new TestingArchitectHost(
+    workspaceRoot,
+    workspaceRoot,
+    new WorkspaceNodeModulesArchitectHost(workspace, workspaceRoot),
+  );
+  const architect = new Architect(architectHost, registry);
+
+  return {
+    workspace,
+    architectHost,
+    architect,
+  };
+}
+
+export async function browserBuild(
+  architect: Architect,
+  host: virtualFs.Host,
+  target: Target,
+  overrides?: json.JsonObject,
+  scheduleOptions?: ScheduleOptions,
+): Promise<{ output: BuilderOutput; files: { [file: string]: string } }> {
+  const run = await architect.scheduleTarget(target, overrides, scheduleOptions);
+  const output = (await run.result) as BrowserBuilderOutput;
+  expect(output.success).toBe(true);
+
+  expect(output.outputPath).not.toBeUndefined();
+  const outputPath = normalize(output.outputPath);
+
+  const fileNames = await host.list(outputPath).toPromise();
+  const files = fileNames.reduce((acc: { [name: string]: Promise<string> }, path) => {
+    let cache: Promise<string> | null = null;
+    Object.defineProperty(acc, path, {
+      enumerable: true,
+      get() {
+        if (cache) {
+          return cache;
+        }
+        if (!fileNames.includes(path)) {
+          return Promise.reject('No file named ' + path);
+        }
+
+        cache = host
+          .read(join(outputPath, path))
+          .toPromise()
+          .then(content => virtualFs.fileBufferToString(content));
+
+        return cache;
+      },
+    });
+
+    return acc;
+  }, {});
+
+  await run.stop();
+
+  return {
+    output,
+    files,
+  };
+}
+
+export const lazyModuleFiles: { [path: string]: string } = {
+  'src/app/lazy/lazy-routing.module.ts': `
+    import { NgModule } from '@angular/core';
+    import { Routes, RouterModule } from '@angular/router';
+
+    const routes: Routes = [];
+
+    @NgModule({
+      imports: [RouterModule.forChild(routes)],
+      exports: [RouterModule]
+    })
+    export class LazyRoutingModule { }
+  `,
+  'src/app/lazy/lazy.module.ts': `
+    import { NgModule } from '@angular/core';
+    import { CommonModule } from '@angular/common';
+
+    import { LazyRoutingModule } from './lazy-routing.module';
+
+    @NgModule({
+      imports: [
+        CommonModule,
+        LazyRoutingModule
+      ],
+      declarations: []
+    })
+    export class LazyModule { }
+  `,
+};
+
+export const lazyModuleImport: { [path: string]: string } = {
+  'src/app/app.module.ts': `
+    import { BrowserModule } from '@angular/platform-browser';
+    import { NgModule } from '@angular/core';
+    import { HttpModule } from '@angular/http';
+
+    import { AppComponent } from './app.component';
+    import { RouterModule } from '@angular/router';
+
+    @NgModule({
+      declarations: [
+        AppComponent
+      ],
+      imports: [
+        BrowserModule,
+        HttpModule,
+        RouterModule.forRoot([
+          { path: 'lazy', loadChildren: './lazy/lazy.module#LazyModule' }
+        ])
+      ],
+      providers: [],
+      bootstrap: [AppComponent]
+    })
+    export class AppModule { }
+  `,
+};
+
+

From 79f8413ddc54c544ca8196c5ff823f507f47d87f Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 5 Mar 2019 15:50:21 -0500
Subject: [PATCH 0854/1703] revert: ci: add precise commits code formatting
 check

This reverts commit f2049109a920a13a1da1faadf20889024f8890b0.
---
 .circleci/config.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 09fd5c045297..659aa63dc4ac 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -85,12 +85,6 @@ jobs:
     steps:
       - attach_workspace: *attach_options
       - run: npm run validate -- --ci
-      - run:
-          name: Validate Code Formatting
-          command: |
-            if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then
-              yarn run precise-commits --check-only --head=$CIRCLE_SHA1 --base=$(git merge-base HEAD $CIRCLE_BRANCH)
-            fi
 
   test:
     <<: *defaults

From 3ec03e96734da05fa8c552f4bf585bc6873521d0 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 5 Mar 2019 15:57:44 -0500
Subject: [PATCH 0855/1703] revert: build: integrate prettier code formatter

This reverts commit 920be3ab397f5f3315a960630274581256f9986b.
---
 .lintstagedrc                  |   5 -
 .prettierrc                    |   5 -
 etc/rules/Rule.ts              |  27 ++
 etc/rules/singleEofLineRule.ts |  59 ++++
 package.json                   |  14 +-
 tslint.json                    |  66 ++++-
 yarn.lock                      | 498 ++-------------------------------
 7 files changed, 174 insertions(+), 500 deletions(-)
 delete mode 100644 .lintstagedrc
 delete mode 100644 .prettierrc
 create mode 100644 etc/rules/Rule.ts
 create mode 100644 etc/rules/singleEofLineRule.ts

diff --git a/.lintstagedrc b/.lintstagedrc
deleted file mode 100644
index 9ceca5b0ae4a..000000000000
--- a/.lintstagedrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "linters": {
-    "*.{js,ts}": ["precise-commits", "git add"]
-  }
-}
\ No newline at end of file
diff --git a/.prettierrc b/.prettierrc
deleted file mode 100644
index 0bc68a7ee272..000000000000
--- a/.prettierrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "printWidth": 100,
-  "singleQuote": true,
-  "trailingComma": "all"
-}
\ No newline at end of file
diff --git a/etc/rules/Rule.ts b/etc/rules/Rule.ts
new file mode 100644
index 000000000000..43a7df63b777
--- /dev/null
+++ b/etc/rules/Rule.ts
@@ -0,0 +1,27 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import * as Lint from 'tslint';
+import * as ts from 'typescript';
+
+
+// An empty rule so that tslint does not error on rules '//' (which are comments).
+export class Rule extends Lint.Rules.AbstractRule {
+  public static metadata: Lint.IRuleMetadata = {
+    ruleName: '//',
+    type: 'typescript',
+    description: ``,
+    rationale: '',
+    options: null,
+    optionsDescription: `Not configurable.`,
+    typescriptOnly: false,
+  };
+
+  public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
+    return [];
+  }
+}
diff --git a/etc/rules/singleEofLineRule.ts b/etc/rules/singleEofLineRule.ts
new file mode 100644
index 000000000000..b2882e43ffb9
--- /dev/null
+++ b/etc/rules/singleEofLineRule.ts
@@ -0,0 +1,59 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import * as Lint from 'tslint';
+import * as ts from 'typescript';
+
+
+export class Rule extends Lint.Rules.AbstractRule {
+  public static metadata: Lint.IRuleMetadata = {
+    ruleName: 'single-eof-line',
+    type: 'style',
+    description: `Ensure the file ends with a single new line.`,
+    rationale: `This is similar to eofline, but ensure an exact count instead of just any new
+                line.`,
+    options: null,
+    optionsDescription: `Two integers indicating minimum and maximum number of new lines.`,
+    typescriptOnly: false,
+  };
+
+  public static FAILURE_STRING = 'You need to have a single blank line at end of file.';
+
+  public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
+    const length = sourceFile.text.length;
+    if (length === 0) {
+      // Allow empty files.
+      return [];
+    }
+
+    const matchEof = /\r?\n((\r?\n)*)$/.exec(sourceFile.text);
+    if (!matchEof) {
+      const lines = sourceFile.getLineStarts();
+      const fix = Lint.Replacement.appendText(
+        length,
+        sourceFile.text[lines[1] - 2] === '\r' ? '\r\n' : '\n',
+      );
+
+      return [
+        new Lint.RuleFailure(sourceFile, length, length, Rule.FAILURE_STRING, this.ruleName, fix),
+      ];
+    } else if (matchEof[1]) {
+      const lines = sourceFile.getLineStarts();
+      const fix = Lint.Replacement.replaceFromTo(
+        matchEof.index,
+        length,
+        sourceFile.text[lines[1] - 2] === '\r' ? '\r\n' : '\n',
+      );
+
+      return [
+        new Lint.RuleFailure(sourceFile, length, length, Rule.FAILURE_STRING, this.ruleName, fix),
+      ];
+    }
+
+    return [];
+  }
+}
diff --git a/package.json b/package.json
index 3c18f4ca42c1..cb60bfb0f737 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,6 @@
     "build-tsc": "tsc -p tsconfig.json",
     "fix": "npm run admin -- lint --fix",
     "lint": "npm run admin -- lint",
-    "precise-commits": "precise-commits",
     "prebuildifier": "bazel build --noshow_progress @com_github_bazelbuild_buildtools//buildifier",
     "buildifier": "find . -type f \\( -name BUILD -or -name BUILD.bazel \\) ! -path \"*/node_modules/*\" | xargs $(bazel info bazel-bin)/external/com_github_bazelbuild_buildtools/buildifier/buildifier",
     "templates": "node ./bin/devkit-admin templates",
@@ -34,6 +33,7 @@
     "test:watch": "nodemon --watch packages -e ts ./bin/devkit-admin test",
     "validate": "node ./bin/devkit-admin validate",
     "validate-commits": "./bin/devkit-admin validate-commits",
+    "prepush": "node ./bin/devkit-admin hooks/pre-push",
     "preinstall": "node ./tools/yarn/check-yarn.js",
     "webdriver-update": "webdriver-manager update --standalone false --gecko false --versions.chrome 2.45"
   },
@@ -103,7 +103,7 @@
     "conventional-commits-parser": "^3.0.0",
     "gh-got": "^8.0.1",
     "git-raw-commits": "^2.0.0",
-    "husky": "^1.3.1",
+    "husky": "^0.14.3",
     "istanbul": "^0.4.5",
     "jasmine": "^2.6.0",
     "jasmine-spec-reporter": "^4.2.1",
@@ -111,15 +111,12 @@
     "karma-jasmine": "^2.0.1",
     "karma-jasmine-html-reporter": "^1.4.0",
     "license-checker": "^20.1.0",
-    "lint-staged": "^8.1.4",
     "minimatch": "^3.0.4",
     "minimist": "^1.2.0",
     "npm-registry-client": "8.6.0",
     "pacote": "^9.2.3",
     "pidtree": "^0.3.0",
     "pidusage": "^2.0.17",
-    "precise-commits": "^1.0.2",
-    "prettier": "^1.16.4",
     "rxjs": "~6.4.0",
     "semver": "^5.3.0",
     "source-map": "^0.5.6",
@@ -129,14 +126,7 @@
     "through2": "^2.0.3",
     "tree-kill": "^1.2.0",
     "ts-node": "^5.0.0",
-    "tslint-config-prettier": "^1.18.0",
     "tslint-no-circular-imports": "^0.6.0",
     "tslint-sonarts": "^1.7.0"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged",
-      "pre-push": "node ./bin/devkit-admin hooks/pre-push"
-    }
   }
 }
diff --git a/tslint.json b/tslint.json
index c960911311ec..e617a4d2236f 100644
--- a/tslint.json
+++ b/tslint.json
@@ -3,23 +3,19 @@
   // Consider using cognitive-complexity and refactor
   // Consider using no-useless-cast but it's annoying
   "extends": [
-    "tslint-no-circular-imports",
-    "tslint-config-prettier"
+    "tslint-no-circular-imports"
   ],
   "rulesDirectory": [
     "dist/etc/rules",
     "node_modules/tslint-sonarts/lib/rules"
   ],
-  "linterOptions": {
-    "exclude": ["dist-schema/**"],
-    "format": "codeFrame"
-  },
   "rules": {
     // ==================================================================================================
     // custom rules defined in etc/rules/**
     "defocus": true,
     "import-groups": true,
     "no-global-tslint-disable": true,
+    "single-eof-line": true,
     // ==================================================================================================
     // tslint-sonarts rules. See https://github.com/SonarSource/SonarTS
     // These rules are part of the bug detection section of tslint-sonarts
@@ -56,21 +52,45 @@
     "no-floating-promises": true,
     "no-implicit-dependencies": true,
     "no-import-side-effect": [true, {"ignore-module": "^(?!rxjs\/)"}],
+    "align": [
+      true,
+      "elements",
+      "members",
+      "parameters",
+      "statements"
+    ],
+    "max-line-length": [true, 100],
     "no-inferrable-types": true,
     "class-name": true,
     "comment-format": [
       true,
       "check-space"
     ],
+    "indent": [
+      true,
+      "spaces"
+    ],
+    "eofline": true,
+    "import-spacing": true,
     "match-default-export-name": true,
     "newline-before-return": true,
+    "no-consecutive-blank-lines": [true, 2],
     "no-duplicate-variable": true,
     "no-eval": true,
     "no-any": true,
     "no-arg": true,
     "no-internal-module": true,
+    "no-trailing-whitespace": true,
     "no-unused-expression": true,
     "no-var-keyword": true,
+    "one-line": [
+      true,
+      "check-catch",
+      "check-else",
+      "check-finally",
+      "check-open-brace",
+      "check-whitespace"
+    ],
     "ordered-imports": [
       true,
       {
@@ -79,6 +99,29 @@
       }
     ],
     "prefer-const": true,
+    "quotemark": [
+      true,
+      "single",
+      "avoid-escape"
+    ],
+    "semicolon": [true, "always"],
+    "trailing-comma": [
+      true,
+      {
+        "multiline": "always",
+        "singleline": "never"
+      }
+    ],
+    "typedef-whitespace": [
+      true,
+      {
+        "call-signature": "nospace",
+        "index-signature": "nospace",
+        "parameter": "nospace",
+        "property-declaration": "nospace",
+        "variable-declaration": "nospace"
+      }
+    ],
     "curly": true,
     "file-header": [
       true,
@@ -90,6 +133,17 @@
       "check-format",
       "allow-leading-underscore",
       "allow-pascal-case"
+    ],
+    "whitespace": [
+      true,
+      "check-branch",
+      "check-decl",
+      "check-module",
+      "check-preblock",
+      "check-operator",
+      "check-separator",
+      "check-type",
+      "check-typecast"
     ]
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 59dcfdb4a8d8..3960c0767b1a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -186,13 +186,6 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.3.tgz#2c92469bac2b7fbff810b67fca07bd138b48af77"
   integrity sha512-gqmspPZOMW3MIRb9HlrnbZHXI1/KHTOroBwN1NcLL6pWxzqzEKGvRTq0W/PxS45OtQGbaFikSQpkS5zbnsQm2w==
 
-"@babel/runtime@7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0.tgz#adeb78fedfc855aa05bc041640f3f6f98e85424c"
-  integrity sha512-7hGhzlcmg01CvH1EHdSPVXYX1aJ8KCEyz6I9xYIi/asDtzBPMyMhVibhM/K6g/5qnKBwjZtp10bNZIEFTRW1MA==
-  dependencies:
-    regenerator-runtime "^0.12.0"
-
 "@babel/template@^7.0.0", "@babel/template@^7.1.0":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.1.2.tgz#090484a574fef5a2d2d7726a674eceda5c5b5644"
@@ -253,32 +246,11 @@
     source-map-support "0.5.9"
     tsutils "2.27.2"
 
-"@iamstarkov/listr-update-renderer@0.4.1":
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/@iamstarkov/listr-update-renderer/-/listr-update-renderer-0.4.1.tgz#d7c48092a2dcf90fd672b6c8b458649cb350c77e"
-  integrity sha512-IJyxQWsYDEkf8C8QthBn5N8tIUR9V9je6j3sMIpAkonaadjbvxmRC6RAhpa3RKxndhNnU2M6iNbtJwd7usQYIA==
-  dependencies:
-    chalk "^1.1.3"
-    cli-truncate "^0.2.1"
-    elegant-spinner "^1.0.1"
-    figures "^1.7.0"
-    indent-string "^3.0.0"
-    log-symbols "^1.0.2"
-    log-update "^2.3.0"
-    strip-ansi "^3.0.1"
-
 "@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"
   integrity sha1-w6DFRNYjkqzCgTpCyKDcb1j4aSI=
 
-"@samverschueren/stream-to-observable@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"
-  integrity sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==
-  dependencies:
-    any-observable "^0.3.0"
-
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
@@ -969,7 +941,7 @@ ansi-colors@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.1.tgz#9638047e4213f3428a11944a7d4b31cba0a3ff95"
   integrity sha512-Xt+zb6nqgvV9SWAVp0EG3lRsHcbq5DDgqjPPz6pwgtj6RKz65zGXMNa82oJfOSBA/to6GmRP7Dr+6o+kbApTzQ==
 
-ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
+ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
@@ -1013,11 +985,6 @@ ansi.js@0.0.5:
   dependencies:
     on-new-line "0.0.1"
 
-any-observable@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
-  integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==
-
 anymatch@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
@@ -1919,30 +1886,11 @@ cacheable-request@^5.1.0:
     normalize-url "^3.1.0"
     responselike "^1.0.2"
 
-caller-callsite@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
-  integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=
-  dependencies:
-    callsites "^2.0.0"
-
-caller-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
-  integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=
-  dependencies:
-    caller-callsite "^2.0.0"
-
 callsite@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
   integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
 
-callsites@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
-  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
-
 camelcase-keys@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
@@ -2005,7 +1953,7 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
+chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
@@ -2025,7 +1973,7 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^2.1.0, chalk@^2.4.2:
+chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2116,11 +2064,6 @@ ci-info@^1.5.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.5.1.tgz#17e8eb5de6f8b2b6038f0cbb714d410bfa9f3030"
   integrity sha512-fKFIKXaYiL1exImwJ0AhR/6jxFPSKQBk2ayV5NiNoruUs2+rxC2kNw0EG+1Z9dugZRdCrppskQ8DN2cyaUM1Hw==
 
-ci-info@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
-  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
-
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
@@ -2166,26 +2109,13 @@ cli-boxes@^1.0.0:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
   integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM=
 
-cli-cursor@^2.0.0, cli-cursor@^2.1.0:
+cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
   integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
   dependencies:
     restore-cursor "^2.0.0"
 
-cli-spinners@^1.0.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.3.1.tgz#002c1990912d0d59580c93bd36c056de99e4259a"
-  integrity sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==
-
-cli-truncate@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
-  integrity sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=
-  dependencies:
-    slice-ansi "0.0.4"
-    string-width "^1.0.1"
-
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
@@ -2343,7 +2273,7 @@ combined-stream@^1.0.5, combined-stream@^1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.12.0, commander@^2.14.1, commander@^2.9.0:
+commander@^2.12.0, commander@^2.9.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
   integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
@@ -2726,17 +2656,6 @@ cosmiconfig@^4.0.0:
     parse-json "^4.0.0"
     require-from-string "^2.0.1"
 
-cosmiconfig@^5.0.2, cosmiconfig@^5.0.7:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.1.0.tgz#6c5c35e97f37f985061cdf653f114784231185cf"
-  integrity sha512-kCNPvthka8gvLtzAxQXvWo4FxqRB+ftRZyPZNuab5ngvM9Y7yw7hbEysglptLgpkGX9nAOKTBVkHUAe8xtYR6Q==
-  dependencies:
-    import-fresh "^2.0.0"
-    is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    lodash.get "^4.4.2"
-    parse-json "^4.0.0"
-
 crc32-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-2.0.0.tgz#e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"
@@ -2921,11 +2840,6 @@ data-uri-to-buffer@1:
   resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz#77163ea9c20d8641b4707e8f18abdf9a78f34835"
   integrity sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ==
 
-date-fns@^1.27.2:
-  version "1.30.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
-  integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
-
 date-format@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"
@@ -2976,7 +2890,7 @@ debug@^3.2.5:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
+debug@^4.1.0, debug@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -3020,11 +2934,6 @@ decompress-response@^3.3.0:
   dependencies:
     mimic-response "^1.0.0"
 
-dedent@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
-  integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
-
 deep-equal@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
@@ -3196,11 +3105,6 @@ diagnostics@^1.1.1:
     enabled "1.0.x"
     kuler "1.0.x"
 
-diff-match-patch@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.4.tgz#6ac4b55237463761c4daf0dc603eb869124744b1"
-  integrity sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg==
-
 diff@^3.1.0, diff@^3.2.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
@@ -3327,11 +3231,6 @@ electron-to-chromium@^1.3.82:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.82.tgz#7d13ae4437d2a783de3f4efba96b186c540b67b1"
   integrity sha512-NI4nB2IWGcU4JVT1AE8kBb/dFor4zjLHMLsOROPahppeHrR0FG5uslxMmkp/thO1MvPjM2xhlKoY29/I60s0ew==
 
-elegant-spinner@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
-  integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
-
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
@@ -3512,7 +3411,7 @@ escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.4, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
@@ -3659,19 +3558,6 @@ execa@^0.7.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-execa@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.9.0.tgz#adb7ce62cf985071f60580deb4a88b9e34712d01"
-  integrity sha512-BbUMBiX4hqiHZUA5+JujIjNb6TyAlp2D5KLheMjMluwOuzcnylDL4AxZYLLn1n2AGB49eSWwyKvvEQoRpnAtmA==
-  dependencies:
-    cross-spawn "^5.0.1"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
 execa@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
@@ -3911,14 +3797,6 @@ figgy-pudding@^3.1.0, figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
   integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
 
-figures@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
-  integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=
-  dependencies:
-    escape-string-regexp "^1.0.5"
-    object-assign "^4.1.0"
-
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
@@ -4021,7 +3899,7 @@ find-up@^1.0.0:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
-find-up@^2.0.0, find-up@^2.1.0:
+find-up@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
@@ -4048,11 +3926,6 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.1"
     readable-stream "^2.0.4"
 
-fn-name@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz#5214d7537a4d06a4a301c0cc262feb84188002e7"
-  integrity sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=
-
 follow-redirects@1.0.0:
   version "1.0.0"
   resolved "http://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz#8e34298cbd2e176f254effec75a1c78cc849fd37"
@@ -4240,15 +4113,6 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-g-status@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/g-status/-/g-status-2.0.2.tgz#270fd32119e8fc9496f066fe5fe88e0a6bc78b97"
-  integrity sha512-kQoE9qH+T1AHKgSSD0Hkv98bobE90ILQcXAF4wvGgsr7uFqNvwmh8j+Lq3l0RVt3E3HjSbv2B9biEGcEtpHLCA==
-  dependencies:
-    arrify "^1.0.1"
-    matcher "^1.0.0"
-    simple-git "^1.85.0"
-
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
@@ -4299,11 +4163,6 @@ get-cursor-position@1.0.3:
   resolved "https://registry.yarnpkg.com/get-cursor-position/-/get-cursor-position-1.0.3.tgz#0e41d60343b705836a528d69a5e099e2c5108d63"
   integrity sha1-DkHWA0O3BYNqUo1ppeCZ4sUQjWM=
 
-get-own-enumerable-property-symbols@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz#b877b49a5c16aefac3655f2ed2ea5b684df8d203"
-  integrity sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg==
-
 get-pkg-repo@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
@@ -4320,11 +4179,6 @@ get-stdin@^4.0.1:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
   integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
-get-stdin@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
-  integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
-
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -4901,21 +4755,14 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-1.3.1.tgz#26823e399300388ca2afff11cfa8a86b0033fae0"
-  integrity sha512-86U6sVVVf4b5NYSZ0yvv88dRgBSSXXmHaiq5pP4KDj5JVzdwKgBjEtUPOm8hcoytezFwbU+7gotXNhpHdystlg==
+husky@^0.14.3:
+  version "0.14.3"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3"
+  integrity sha512-e21wivqHpstpoiWA/Yi8eFti8E+sQDSS53cpJsPptPs295QTOQR0ZwnHo2TXy1XOpZFD9rPOd3NpmqTK6uMLJA==
   dependencies:
-    cosmiconfig "^5.0.7"
-    execa "^1.0.0"
-    find-up "^3.0.0"
-    get-stdin "^6.0.0"
-    is-ci "^2.0.0"
-    pkg-dir "^3.0.0"
-    please-upgrade-node "^3.1.1"
-    read-pkg "^4.0.1"
-    run-node "^1.0.0"
-    slash "^2.0.0"
+    is-ci "^1.0.10"
+    normalize-path "^1.0.0"
+    strip-indent "^2.0.0"
 
 iconv-lite@0.4.15:
   version "0.4.15"
@@ -4953,7 +4800,7 @@ ignore-walk@^3.0.1:
   dependencies:
     minimatch "^3.0.4"
 
-ignore@^3.3.5, ignore@^3.3.7:
+ignore@^3.3.5:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
   integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
@@ -4980,14 +4827,6 @@ import-cwd@^2.0.0:
   dependencies:
     import-from "^2.1.0"
 
-import-fresh@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
-  integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY=
-  dependencies:
-    caller-path "^2.0.0"
-    resolve-from "^3.0.0"
-
 import-from@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
@@ -5205,13 +5044,6 @@ is-ci@^1.0.10:
   dependencies:
     ci-info "^1.5.0"
 
-is-ci@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
-  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
-  dependencies:
-    ci-info "^2.0.0"
-
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -5381,18 +5213,11 @@ is-number@^4.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
   integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
-is-obj@^1.0.0, is-obj@^1.0.1:
+is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
   integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
 
-is-observable@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e"
-  integrity sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==
-  dependencies:
-    symbol-observable "^1.1.0"
-
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
@@ -5449,11 +5274,6 @@ is-redirect@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
   integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=
 
-is-regexp@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
-  integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
-
 is-retry-allowed@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
@@ -6148,81 +5968,6 @@ lie@~3.1.0:
   dependencies:
     immediate "~3.0.5"
 
-lint-staged@^8.1.4:
-  version "8.1.4"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.1.4.tgz#a726592c0e55231116af295e730643bb711c169b"
-  integrity sha512-oFbbhB/VzN8B3i/sIdb9gMfngGArI6jIfxSn+WPdQb2Ni3GJeS6T4j5VriSbQfxfMuYoQlMHOoFt+lfcWV0HfA==
-  dependencies:
-    "@iamstarkov/listr-update-renderer" "0.4.1"
-    chalk "^2.3.1"
-    commander "^2.14.1"
-    cosmiconfig "^5.0.2"
-    debug "^3.1.0"
-    dedent "^0.7.0"
-    del "^3.0.0"
-    execa "^1.0.0"
-    find-parent-dir "^0.3.0"
-    g-status "^2.0.2"
-    is-glob "^4.0.0"
-    is-windows "^1.0.2"
-    listr "^0.14.2"
-    lodash "^4.17.11"
-    log-symbols "^2.2.0"
-    micromatch "^3.1.8"
-    npm-which "^3.0.1"
-    p-map "^1.1.1"
-    path-is-inside "^1.0.2"
-    pify "^3.0.0"
-    please-upgrade-node "^3.0.2"
-    staged-git-files "1.1.2"
-    string-argv "^0.0.2"
-    stringify-object "^3.2.2"
-    yup "^0.26.10"
-
-listr-silent-renderer@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
-  integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=
-
-listr-update-renderer@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz#4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2"
-  integrity sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==
-  dependencies:
-    chalk "^1.1.3"
-    cli-truncate "^0.2.1"
-    elegant-spinner "^1.0.1"
-    figures "^1.7.0"
-    indent-string "^3.0.0"
-    log-symbols "^1.0.2"
-    log-update "^2.3.0"
-    strip-ansi "^3.0.1"
-
-listr-verbose-renderer@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz#f1132167535ea4c1261102b9f28dac7cba1e03db"
-  integrity sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==
-  dependencies:
-    chalk "^2.4.1"
-    cli-cursor "^2.1.0"
-    date-fns "^1.27.2"
-    figures "^2.0.0"
-
-listr@^0.14.2:
-  version "0.14.3"
-  resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz#2fea909604e434be464c50bddba0d496928fa586"
-  integrity sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==
-  dependencies:
-    "@samverschueren/stream-to-observable" "^0.3.0"
-    is-observable "^1.1.0"
-    is-promise "^2.1.0"
-    is-stream "^1.1.0"
-    listr-silent-renderer "^1.1.1"
-    listr-update-renderer "^0.5.0"
-    listr-verbose-renderer "^0.5.0"
-    p-map "^2.0.0"
-    rxjs "^6.3.3"
-
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -6313,11 +6058,6 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
-lodash.get@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
-
 lodash.mergewith@^4.6.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
@@ -6353,29 +6093,6 @@ lodash@^4.15.0, lodash@^4.16.6, lodash@^4.17.11, lodash@^4.17.5, lodash@^4.8.0,
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
-log-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
-  integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=
-  dependencies:
-    chalk "^1.0.0"
-
-log-symbols@^2.1.0, log-symbols@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
-  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
-  dependencies:
-    chalk "^2.0.1"
-
-log-update@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708"
-  integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg=
-  dependencies:
-    ansi-escapes "^3.0.0"
-    cli-cursor "^2.0.0"
-    wrap-ansi "^3.0.1"
-
 log4js@^2.3.9:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-2.11.0.tgz#bf3902eff65c6923d9ce9cfbd2db54160e34005a"
@@ -6579,13 +6296,6 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-matcher@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/matcher/-/matcher-1.1.1.tgz#51d8301e138f840982b338b116bb0c09af62c1c2"
-  integrity sha512-+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg==
-  dependencies:
-    escape-string-regexp "^1.0.4"
-
 material-design-icons@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/material-design-icons/-/material-design-icons-3.0.1.tgz#9a71c48747218ebca51e51a66da682038cdcb7bf"
@@ -6917,11 +6627,6 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
-mri@^1.1.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/mri/-/mri-1.1.4.tgz#7cb1dd1b9b40905f1fac053abe25b6720f44744a"
-  integrity sha512-6y7IjGPm8AzlvoUrwAaw1tLnUBudaS3752vcd8JtrpGGQn+rXIe63LFVHm/YMwtqAuh+LJPCFdlLYPWM1nYn6w==
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -7278,6 +6983,11 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
+normalize-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
+  integrity sha1-MtDkcvkf80VwHBWoMRAY07CpA3k=
+
 normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
@@ -7331,13 +7041,6 @@ npm-packlist@^1.1.6:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
-npm-path@^2.0.2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64"
-  integrity sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw==
-  dependencies:
-    which "^1.2.10"
-
 npm-pick-manifest@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40"
@@ -7385,15 +7088,6 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npm-which@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/npm-which/-/npm-which-3.0.1.tgz#9225f26ec3a285c209cae67c3b11a6b4ab7140aa"
-  integrity sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo=
-  dependencies:
-    commander "^2.9.0"
-    npm-path "^2.0.2"
-    which "^1.2.10"
-
 "npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.0, npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
@@ -7558,16 +7252,6 @@ optjs@~3.2.2:
   resolved "https://registry.yarnpkg.com/optjs/-/optjs-3.2.2.tgz#69a6ce89c442a44403141ad2f9b370bd5bb6f4ee"
   integrity sha1-aabOicRCpEQDFBrS+bNwvVu29O4=
 
-ora@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-1.4.0.tgz#884458215b3a5d4097592285f93321bb7a79e2e5"
-  integrity sha512-iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw==
-  dependencies:
-    chalk "^2.1.0"
-    cli-cursor "^2.1.0"
-    cli-spinners "^1.0.1"
-    log-symbols "^2.1.0"
-
 original@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
@@ -7683,11 +7367,6 @@ p-map@^1.1.1:
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
   integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
 
-p-map@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.0.0.tgz#be18c5a5adeb8e156460651421aceca56c213a50"
-  integrity sha512-GO107XdrSUmtHxVoi60qc9tUl/KkNKm+X2CF4P9amalpGxv5YqVPJNfSb0wcA+syCopkZvYYIzW8OVTQW59x/w==
-
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
@@ -7935,7 +7614,7 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@^1.0.1, path-is-inside@^1.0.2:
+path-is-inside@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
   integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
@@ -8047,13 +7726,6 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
-please-upgrade-node@^3.0.2, please-upgrade-node@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac"
-  integrity sha512-KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ==
-  dependencies:
-    semver-compare "^1.0.0"
-
 pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
@@ -8140,19 +7812,6 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
     source-map "^0.6.1"
     supports-color "^5.5.0"
 
-precise-commits@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/precise-commits/-/precise-commits-1.0.2.tgz#4659be01a9c3310f50ce51ddf913fead1d7cc940"
-  integrity sha512-PYkoNTFXVvZRzJTDxdgzmPanhSNGj5Wtj2NgSo7IhwNXGcKktX+L4DJhyIrhFSLsWWAvd+cYyyU2eXlaX5QxzA==
-  dependencies:
-    diff-match-patch "^1.0.0"
-    execa "^0.9.0"
-    find-up "^2.1.0"
-    glob "^7.1.2"
-    ignore "^3.3.7"
-    mri "^1.1.0"
-    ora "^1.3.0"
-
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -8173,11 +7832,6 @@ preserve@^0.2.0:
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
   integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
-prettier@^1.16.4:
-  version "1.16.4"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717"
-  integrity sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g==
-
 process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
@@ -8232,11 +7886,6 @@ promisify-call@^2.0.2:
   dependencies:
     with-callback "^1.0.2"
 
-property-expr@^1.5.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-1.5.1.tgz#22e8706894a0c8e28d58735804f6ba3a3673314f"
-  integrity sha512-CGuc0VUTGthpJXL36ydB6jnbyOf/rAHFvmVrJlH+Rg0DqqLFQGAP6hIaxD/G0OAmBJPhXDHuEJigrp0e0wFV6g==
-
 protobufjs@5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.3.tgz#e4dfe9fb67c90b2630d15868249bcc4961467a17"
@@ -8601,15 +8250,6 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-read-pkg@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237"
-  integrity sha1-ljYlN48+HE1IyFhytabsfV0JMjc=
-  dependencies:
-    normalize-package-data "^2.3.2"
-    parse-json "^4.0.0"
-    pify "^3.0.0"
-
 "readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.3:
   version "2.3.6"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
@@ -8740,11 +8380,6 @@ regenerator-runtime@^0.11.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
-regenerator-runtime@^0.12.0:
-  version "0.12.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
-  integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
-
 regex-cache@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
@@ -9070,11 +8705,6 @@ run-async@^2.2.0:
   dependencies:
     is-promise "^2.1.0"
 
-run-node@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e"
-  integrity sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==
-
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
@@ -9082,7 +8712,7 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs@6.4.0, rxjs@^6.0.0, rxjs@^6.3.3, rxjs@^6.4.0, rxjs@~6.4.0:
+rxjs@6.4.0, rxjs@^6.0.0, rxjs@^6.4.0, rxjs@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
   integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
@@ -9207,11 +8837,6 @@ selfsigned@^1.9.1:
   dependencies:
     node-forge "0.7.5"
 
-semver-compare@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
-  integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
-
 semver-diff@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
@@ -9383,13 +9008,6 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
-simple-git@^1.85.0:
-  version "1.107.0"
-  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.107.0.tgz#12cffaf261c14d6f450f7fdb86c21ccee968b383"
-  integrity sha512-t4OK1JRlp4ayKRfcW6owrWcRVLyHRUlhGd0uN6ZZTqfDq8a5XpcUdOKiGRNobHEuMtNqzp0vcJNvhYWwh5PsQA==
-  dependencies:
-    debug "^4.0.1"
-
 simple-swizzle@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
@@ -9409,16 +9027,6 @@ slash@^1.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
   integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
-slash@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
-  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
-
-slice-ansi@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
-  integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=
-
 slide@^1.1.3, slide@~1.1.3:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
@@ -9907,11 +9515,6 @@ stack-trace@0.0.x:
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
   integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
 
-staged-git-files@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-1.1.2.tgz#4326d33886dc9ecfa29a6193bf511ba90a46454b"
-  integrity sha512-0Eyrk6uXW6tg9PYkhi/V/J4zHp33aNyi2hOCmhFLqLTIhbgqWn5jlSzI+IU0VqrZq6+DbHcabQl/WP6P3BG0QA==
-
 start-with@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/start-with/-/start-with-1.0.2.tgz#a069a5f46a95fca7f0874f85a28f653d0095c267"
@@ -10023,11 +9626,6 @@ streamroller@0.7.0:
     mkdirp "^0.5.1"
     readable-stream "^2.3.0"
 
-string-argv@^0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.0.2.tgz#dac30408690c21f3c3630a3ff3a05877bdcbd736"
-  integrity sha1-2sMECGkMIfPDYwo/86BYd73L1zY=
-
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -10064,15 +9662,6 @@ string_decoder@~0.10.x:
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
   integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
 
-stringify-object@^3.2.2:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629"
-  integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==
-  dependencies:
-    get-own-enumerable-property-symbols "^3.0.0"
-    is-obj "^1.0.1"
-    is-regexp "^1.0.0"
-
 stringstream@~0.0.4, stringstream@~0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
@@ -10188,16 +9777,11 @@ supports-color@^6.1.0:
   dependencies:
     has-flag "^3.0.0"
 
-symbol-observable@1.2.0, symbol-observable@^1.1.0:
+symbol-observable@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
   integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
-synchronous-promise@^2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.6.tgz#de76e0ea2b3558c1e673942e47e714a930fa64aa"
-  integrity sha512-TyOuWLwkmtPL49LHCX1caIwHjRzcVd62+GF6h8W/jHOeZUFHpnd2XJDVuUlaTaLPH1nuu2M69mfHr5XbQJnf/g==
-
 tapable@^1.0.0, tapable@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c"
@@ -10435,11 +10019,6 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-toposort@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
-  integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=
-
 tough-cookie@~2.3.0, tough-cookie@~2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
@@ -10530,11 +10109,6 @@ tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
   integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
-tslint-config-prettier@^1.18.0:
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz#75f140bde947d35d8f0d238e0ebf809d64592c37"
-  integrity sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg==
-
 tslint-no-circular-imports@^0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/tslint-no-circular-imports/-/tslint-no-circular-imports-0.6.1.tgz#a91358395a81c067bf104a641f269655057715cd"
@@ -11134,7 +10708,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@1, which@^1.1.1, which@^1.2.1, which@^1.2.10, which@^1.2.9, which@^1.3.1:
+which@1, which@^1.1.1, which@^1.2.1, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -11213,14 +10787,6 @@ wrap-ansi@^2.0.0:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
 
-wrap-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba"
-  integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=
-  dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -11428,18 +10994,6 @@ yn@^2.0.0:
   resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
   integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=
 
-yup@^0.26.10:
-  version "0.26.10"
-  resolved "https://registry.yarnpkg.com/yup/-/yup-0.26.10.tgz#3545839663289038faf25facfc07e11fd67c0cb1"
-  integrity sha512-keuNEbNSnsOTOuGCt3UJW69jDE3O4P+UHAakO7vSeFMnjaitcmlbij/a3oNb9g1Y1KvSKH/7O1R2PQ4m4TRylw==
-  dependencies:
-    "@babel/runtime" "7.0.0"
-    fn-name "~2.0.1"
-    lodash "^4.17.10"
-    property-expr "^1.5.0"
-    synchronous-promise "^2.0.5"
-    toposort "^2.0.2"
-
 zip-stream@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-1.2.0.tgz#a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"

From 28b3042dc5a58ecfb3f699ea48e9f1f7fecb2abc Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 5 Mar 2019 16:10:54 -0500
Subject: [PATCH 0856/1703] style: fix lint errors

---
 .../build_angular/test/browser/allow-js2_spec_large.ts          | 2 +-
 .../build_angular/test/browser/aot2_spec_large.ts               | 2 +-
 .../build_angular/test/browser/assets2_spec_large.ts            | 2 +-
 .../build_angular/test/browser/base-href2_spec_large.ts         | 2 +-
 .../build_angular/test/browser/styles2_spec_large.ts            | 2 +-
 packages/angular_devkit/build_angular/test/utils.ts             | 2 --
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/allow-js2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/allow-js2_spec_large.ts
index ffb7c3d8a8b2..58ed2248e4c9 100644
--- a/packages/angular_devkit/build_angular/test/browser/allow-js2_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/allow-js2_spec_large.ts
@@ -8,7 +8,7 @@
 import { Architect } from '@angular-devkit/architect/src/index2';
 import { join, normalize, relative, virtualFs } from '@angular-devkit/core';
 import { take, tap } from 'rxjs/operators';
-import { BrowserBuilderOutput } from "../../src/browser/index2";
+import { BrowserBuilderOutput } from '../../src/browser/index2';
 import { createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/browser/aot2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/aot2_spec_large.ts
index c12a09b327e8..a91d72c1718f 100644
--- a/packages/angular_devkit/build_angular/test/browser/aot2_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/aot2_spec_large.ts
@@ -10,7 +10,7 @@ import { Architect } from '@angular-devkit/architect/src/index2';
 import { runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { tap } from 'rxjs/operators';
-import { BrowserBuilderOutput } from "../../src/browser/index2";
+import { BrowserBuilderOutput } from '../../src/browser/index2';
 import { browserTargetSpec, createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/browser/assets2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/assets2_spec_large.ts
index a20396f7eb69..43192335cc46 100644
--- a/packages/angular_devkit/build_angular/test/browser/assets2_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/assets2_spec_large.ts
@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect/src/index2';
 import { normalize, virtualFs } from '@angular-devkit/core';
 import { toArray } from 'rxjs/operators';
-import { BrowserBuilderOutput } from "../../src/browser/index2";
+import { BrowserBuilderOutput } from '../../src/browser/index2';
 import { createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/browser/base-href2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/base-href2_spec_large.ts
index 9455ee55e2b4..f5a525b5dcca 100644
--- a/packages/angular_devkit/build_angular/test/browser/base-href2_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/base-href2_spec_large.ts
@@ -10,7 +10,7 @@ import { Architect } from '@angular-devkit/architect/src/index2';
 import { runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { tap } from 'rxjs/operators';
-import { BrowserBuilderOutput } from "../../src/browser/index2";
+import { BrowserBuilderOutput } from '../../src/browser/index2';
 import { browserTargetSpec, createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/browser/styles2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/styles2_spec_large.ts
index c3f67eaaaec4..935c66a20b93 100644
--- a/packages/angular_devkit/build_angular/test/browser/styles2_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/styles2_spec_large.ts
@@ -480,7 +480,7 @@ describe('Browser Builder styles', () => {
     files = (await browserBuild(architect, host, target, {
       ...overrides,
       baseHref: 'http://base.url/',
-      deployUrl: 'deploy/'
+      deployUrl: 'deploy/',
     })).files;
 
     styles = await files['styles.css'];
diff --git a/packages/angular_devkit/build_angular/test/utils.ts b/packages/angular_devkit/build_angular/test/utils.ts
index eb006e2342f1..5347b13109a7 100644
--- a/packages/angular_devkit/build_angular/test/utils.ts
+++ b/packages/angular_devkit/build_angular/test/utils.ts
@@ -166,5 +166,3 @@ export const lazyModuleImport: { [path: string]: string } = {
     export class AppModule { }
   `,
 };
-
-

From 392f52580db34e0f59e2f48f5680fee47ac31b12 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 5 Mar 2019 07:32:29 +0000
Subject: [PATCH 0857/1703] build: update autoprefixer to version 9.4.10

---
 .../angular_devkit/build_angular/package.json     |  2 +-
 yarn.lock                                         | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 64319b8cddd9..b6f71cc160b5 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -12,7 +12,7 @@
     "@angular-devkit/core": "0.0.0",
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.10.0",
-    "autoprefixer": "9.4.9",
+    "autoprefixer": "9.4.10",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.0",
diff --git a/yarn.lock b/yarn.lock
index 3960c0767b1a..4d65bc2ff7a4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1249,13 +1249,13 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@9.4.9:
-  version "9.4.9"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.9.tgz#0d3eb86bc1d1228551abcf55220d6fd246b6cb31"
-  integrity sha512-OyUl7KvbGBoFQbGQu51hMywz1aaVeud/6uX8r1R1DNcqFvqGUUy6+BDHnAZE8s5t5JyEObaSw+O1DpAdjAmLuw==
+autoprefixer@9.4.10:
+  version "9.4.10"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.10.tgz#e1be61fc728bacac8f4252ed242711ec0dcc6a7b"
+  integrity sha512-XR8XZ09tUrrSzgSlys4+hy5r2/z4Jp7Ag3pHm31U4g/CTccYPOVe19AkaJ4ey/vRd1sfj+5TtuD6I0PXtutjvQ==
   dependencies:
     browserslist "^4.4.2"
-    caniuse-lite "^1.0.30000939"
+    caniuse-lite "^1.0.30000940"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
     postcss "^7.0.14"
@@ -1933,6 +1933,11 @@ caniuse-lite@^1.0.30000939:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000939.tgz#b9ab7ac9e861bf78840b80c5dfbc471a5cd7e679"
   integrity sha512-oXB23ImDJOgQpGjRv1tCtzAvJr4/OvrHi5SO2vUgB0g0xpdZZoA/BxfImiWfdwoYdUTtQrPsXsvYU/dmCSM8gg==
 
+caniuse-lite@^1.0.30000940:
+  version "1.0.30000941"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000941.tgz#f0810802b2ab8d27f4b625d4769a610e24d5a42c"
+  integrity sha512-4vzGb2MfZcO20VMPj1j6nRAixhmtlhkypM4fL4zhgzEucQIYiRzSqPcWIu1OF8i0FETD93FMIPWfUJCAcFvrqA==
+
 canonical-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"

From 5714f1853a4c84fdeebf7932ee4307c2ec5ed18f Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 5 Mar 2019 20:58:02 -0500
Subject: [PATCH 0858/1703] build: update husky to 1.3.1

---
 package.json |   8 +++-
 yarn.lock    | 117 +++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 111 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index cb60bfb0f737..4fab29c94f48 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,6 @@
     "test:watch": "nodemon --watch packages -e ts ./bin/devkit-admin test",
     "validate": "node ./bin/devkit-admin validate",
     "validate-commits": "./bin/devkit-admin validate-commits",
-    "prepush": "node ./bin/devkit-admin hooks/pre-push",
     "preinstall": "node ./tools/yarn/check-yarn.js",
     "webdriver-update": "webdriver-manager update --standalone false --gecko false --versions.chrome 2.45"
   },
@@ -103,7 +102,7 @@
     "conventional-commits-parser": "^3.0.0",
     "gh-got": "^8.0.1",
     "git-raw-commits": "^2.0.0",
-    "husky": "^0.14.3",
+    "husky": "^1.3.1",
     "istanbul": "^0.4.5",
     "jasmine": "^2.6.0",
     "jasmine-spec-reporter": "^4.2.1",
@@ -128,5 +127,10 @@
     "ts-node": "^5.0.0",
     "tslint-no-circular-imports": "^0.6.0",
     "tslint-sonarts": "^1.7.0"
+  },
+  "husky": {
+    "hooks": {
+      "pre-push": "node ./bin/devkit-admin hooks/pre-push"
+    }
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 4d65bc2ff7a4..a1256fdc67f9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1886,11 +1886,30 @@ cacheable-request@^5.1.0:
     normalize-url "^3.1.0"
     responselike "^1.0.2"
 
+caller-callsite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
+  integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=
+  dependencies:
+    callsites "^2.0.0"
+
+caller-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
+  integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=
+  dependencies:
+    caller-callsite "^2.0.0"
+
 callsite@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
   integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
 
+callsites@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
+
 camelcase-keys@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
@@ -2069,6 +2088,11 @@ ci-info@^1.5.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.5.1.tgz#17e8eb5de6f8b2b6038f0cbb714d410bfa9f3030"
   integrity sha512-fKFIKXaYiL1exImwJ0AhR/6jxFPSKQBk2ayV5NiNoruUs2+rxC2kNw0EG+1Z9dugZRdCrppskQ8DN2cyaUM1Hw==
 
+ci-info@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
+
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
@@ -2661,6 +2685,17 @@ cosmiconfig@^4.0.0:
     parse-json "^4.0.0"
     require-from-string "^2.0.1"
 
+cosmiconfig@^5.0.7:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.1.0.tgz#6c5c35e97f37f985061cdf653f114784231185cf"
+  integrity sha512-kCNPvthka8gvLtzAxQXvWo4FxqRB+ftRZyPZNuab5ngvM9Y7yw7hbEysglptLgpkGX9nAOKTBVkHUAe8xtYR6Q==
+  dependencies:
+    import-fresh "^2.0.0"
+    is-directory "^0.3.1"
+    js-yaml "^3.9.0"
+    lodash.get "^4.4.2"
+    parse-json "^4.0.0"
+
 crc32-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-2.0.0.tgz#e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"
@@ -4184,6 +4219,11 @@ get-stdin@^4.0.1:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
   integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
+get-stdin@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
+  integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
+
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -4760,14 +4800,21 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@^0.14.3:
-  version "0.14.3"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3"
-  integrity sha512-e21wivqHpstpoiWA/Yi8eFti8E+sQDSS53cpJsPptPs295QTOQR0ZwnHo2TXy1XOpZFD9rPOd3NpmqTK6uMLJA==
+husky@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-1.3.1.tgz#26823e399300388ca2afff11cfa8a86b0033fae0"
+  integrity sha512-86U6sVVVf4b5NYSZ0yvv88dRgBSSXXmHaiq5pP4KDj5JVzdwKgBjEtUPOm8hcoytezFwbU+7gotXNhpHdystlg==
   dependencies:
-    is-ci "^1.0.10"
-    normalize-path "^1.0.0"
-    strip-indent "^2.0.0"
+    cosmiconfig "^5.0.7"
+    execa "^1.0.0"
+    find-up "^3.0.0"
+    get-stdin "^6.0.0"
+    is-ci "^2.0.0"
+    pkg-dir "^3.0.0"
+    please-upgrade-node "^3.1.1"
+    read-pkg "^4.0.1"
+    run-node "^1.0.0"
+    slash "^2.0.0"
 
 iconv-lite@0.4.15:
   version "0.4.15"
@@ -4832,6 +4879,14 @@ import-cwd@^2.0.0:
   dependencies:
     import-from "^2.1.0"
 
+import-fresh@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
+  integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY=
+  dependencies:
+    caller-path "^2.0.0"
+    resolve-from "^3.0.0"
+
 import-from@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
@@ -5049,6 +5104,13 @@ is-ci@^1.0.10:
   dependencies:
     ci-info "^1.5.0"
 
+is-ci@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
+  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
+  dependencies:
+    ci-info "^2.0.0"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -6063,6 +6125,11 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
+lodash.get@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
+  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
+
 lodash.mergewith@^4.6.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
@@ -6988,11 +7055,6 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
-  integrity sha1-MtDkcvkf80VwHBWoMRAY07CpA3k=
-
 normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
@@ -7731,6 +7793,13 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
+please-upgrade-node@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac"
+  integrity sha512-KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ==
+  dependencies:
+    semver-compare "^1.0.0"
+
 pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
@@ -8255,6 +8324,15 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
+read-pkg@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237"
+  integrity sha1-ljYlN48+HE1IyFhytabsfV0JMjc=
+  dependencies:
+    normalize-package-data "^2.3.2"
+    parse-json "^4.0.0"
+    pify "^3.0.0"
+
 "readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.3:
   version "2.3.6"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
@@ -8710,6 +8788,11 @@ run-async@^2.2.0:
   dependencies:
     is-promise "^2.1.0"
 
+run-node@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e"
+  integrity sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==
+
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
@@ -8842,6 +8925,11 @@ selfsigned@^1.9.1:
   dependencies:
     node-forge "0.7.5"
 
+semver-compare@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
+  integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
+
 semver-diff@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
@@ -9032,6 +9120,11 @@ slash@^1.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
   integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
+slash@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
+  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
+
 slide@^1.1.3, slide@~1.1.3:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"

From 0003adf757be72d89101b45c44b28343ac089805 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Tue, 5 Mar 2019 14:51:06 -0800
Subject: [PATCH 0859/1703] refactor: builders can return non-observable output

---
 packages/angular_devkit/architect/builders/false.ts | 3 +--
 packages/angular_devkit/architect/builders/true.ts  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/angular_devkit/architect/builders/false.ts b/packages/angular_devkit/architect/builders/false.ts
index 4c980ae57752..b919d9d58d6d 100644
--- a/packages/angular_devkit/architect/builders/false.ts
+++ b/packages/angular_devkit/architect/builders/false.ts
@@ -5,10 +5,9 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { of } from 'rxjs';
 import { createBuilder } from '../src/index2';
 
-export default createBuilder(() => of({
+export default createBuilder(() => ({
   success: false,
   error: 'False builder always errors.',
 }));
diff --git a/packages/angular_devkit/architect/builders/true.ts b/packages/angular_devkit/architect/builders/true.ts
index cbb1e2ee55a3..0837cce4e08d 100644
--- a/packages/angular_devkit/architect/builders/true.ts
+++ b/packages/angular_devkit/architect/builders/true.ts
@@ -5,7 +5,6 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { of } from 'rxjs';
 import { createBuilder } from '../src/index2';
 
-export default createBuilder(() => of({ success: true }));
+export default createBuilder(() => ({ success: true }));

From 61adf9ae35ff8440ecfa0334356cd54986eefc9c Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Tue, 5 Mar 2019 14:52:02 -0800
Subject: [PATCH 0860/1703] refactor(@angular-devkit/build-angular): remove
 useless variable rename

---
 .../build_angular/src/tslint/index2.ts        | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/tslint/index2.ts b/packages/angular_devkit/build_angular/src/tslint/index2.ts
index c301628db64e..ae1299321b34 100644
--- a/packages/angular_devkit/build_angular/src/tslint/index2.ts
+++ b/packages/angular_devkit/build_angular/src/tslint/index2.ts
@@ -37,15 +37,17 @@ async function _loadTslint() {
 }
 
 
-async function _run(config: TslintBuilderOptions, context: BuilderContext): Promise<BuilderOutput> {
+async function _run(
+  options: TslintBuilderOptions,
+  context: BuilderContext,
+): Promise<BuilderOutput> {
   const systemRoot = context.workspaceRoot;
   process.chdir(context.currentDirectory);
-  const options = config;
-  const projectName = context.target && context.target.project || '<???>';
+  const projectName = (context.target && context.target.project) || '<???>';
 
   // Print formatter output only for non human-readable formats.
-  const printInfo = ['prose', 'verbose', 'stylish'].includes(options.format || '')
-                    && !options.silent;
+  const printInfo =
+    ['prose', 'verbose', 'stylish'].includes(options.format || '') && !options.silent;
 
   context.reportStatus(`Linting ${JSON.stringify(projectName)}...`);
   if (printInfo) {
@@ -72,8 +74,14 @@ async function _run(config: TslintBuilderOptions, context: BuilderContext): Prom
 
     let i = 0;
     for (const program of allPrograms) {
-      const partial
-        = await _lint(projectTslint, systemRoot, tslintConfigPath, options, program, allPrograms);
+      const partial = await _lint(
+        projectTslint,
+        systemRoot,
+        tslintConfigPath,
+        options,
+        program,
+        allPrograms,
+      );
       if (result === undefined) {
         result = partial;
       } else {

From f06493cb8af259ddb42df17983df7bb45fd1e726 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Tue, 5 Mar 2019 14:59:33 -0800
Subject: [PATCH 0861/1703] feat(@angular-devkit/architect): QoL changes for
 builders

Add a scheduling options to scheduleTarget and Builder on the context so
builders can schedule sub-builds and override the logger.

Add a getTargetOptions() for builders to get access to options from the
host for a specific target. This allows builders to get options, override
some, then scheduleBuilder with those new options, for example.
---
 packages/angular_devkit/architect/src/api.ts  | 24 +++++++++
 .../angular_devkit/architect/src/architect.ts | 53 +++++++++++++------
 .../architect/src/create-builder.ts           | 25 ++++++---
 .../architect/src/index2_spec.ts              | 39 ++++++++++++++
 4 files changed, 118 insertions(+), 23 deletions(-)

diff --git a/packages/angular_devkit/architect/src/api.ts b/packages/angular_devkit/architect/src/api.ts
index 6aabb6160448..fb600e07e5bc 100644
--- a/packages/angular_devkit/architect/src/api.ts
+++ b/packages/angular_devkit/architect/src/api.ts
@@ -99,6 +99,17 @@ export interface BuilderRun {
   stop(): Promise<void>;
 }
 
+/**
+ * Additional optional scheduling options.
+ */
+export interface ScheduleOptions {
+  /**
+   * Logger to pass to the builder. Note that messages will stop being forwarded, and if you want
+   * to log a builder scheduled from your builder you should forward log events yourself.
+   */
+  logger?: logging.Logger;
+}
+
 /**
  * The context received as a second argument in your builder.
  */
@@ -148,11 +159,13 @@ export interface BuilderContext {
    * Targets are considered the same if the project, the target AND the configuration are the same.
    * @param target The target to schedule.
    * @param overrides A set of options to override the workspace set of options.
+   * @param scheduleOptions Additional optional scheduling options.
    * @return A promise of a run. It will resolve when all the members of the run are available.
    */
   scheduleTarget(
     target: Target,
     overrides?: json.JsonObject,
+    scheduleOptions?: ScheduleOptions,
   ): Promise<BuilderRun>;
 
   /**
@@ -160,13 +173,24 @@ export interface BuilderContext {
    * @param builderName The name of the builder, ie. its `packageName:builderName` tuple.
    * @param options All options to use for the builder (by default empty object). There is no
    *     additional options added, e.g. from the workspace.
+   * @param scheduleOptions Additional optional scheduling options.
    * @return A promise of a run. It will resolve when all the members of the run are available.
    */
   scheduleBuilder(
     builderName: string,
     options?: json.JsonObject,
+    scheduleOptions?: ScheduleOptions,
   ): Promise<BuilderRun>;
 
+  /**
+   * Resolve and return options for a specified target. If the target isn't defined in the
+   * workspace this will reject the promise. This object will be read directly from the workspace
+   * but not validated against the builder of the target.
+   * @param target The target to resolve the options of.
+   * @return A non-validated object resolved from the workspace.
+   */
+  getTargetOptions(target: Target): Promise<json.JsonObject>;
+
   /**
    * Set the builder to running. This should be used if an external event triggered a re-run,
    * e.g. a file watched was changed.
diff --git a/packages/angular_devkit/architect/src/architect.ts b/packages/angular_devkit/architect/src/architect.ts
index 36f46a7eca1e..a76dfbff9bc2 100644
--- a/packages/angular_devkit/architect/src/architect.ts
+++ b/packages/angular_devkit/architect/src/architect.ts
@@ -108,7 +108,7 @@ export interface ScheduleOptions {
 /**
  * A JobRegistry that resolves builder targets from the host.
  */
-export class ArchitectBuilderJobRegistry implements BuilderRegistry {
+class ArchitectBuilderJobRegistry implements BuilderRegistry {
   constructor(
     protected _host: ArchitectHost,
     protected _registry: json.schema.SchemaRegistry,
@@ -172,18 +172,16 @@ export class ArchitectBuilderJobRegistry implements BuilderRegistry {
     return result;
   }
 
-  get<
-    A extends json.JsonObject,
-    I extends BuilderInput,
-    O extends BuilderOutput,
-    >(name: string): Observable<experimental.jobs.JobHandler<A, I, O> | null> {
+  get<A extends json.JsonObject, I extends BuilderInput, O extends BuilderOutput>(
+    name: string,
+  ): Observable<experimental.jobs.JobHandler<A, I, O> | null> {
     const m = name.match(/^([^:]+):([^:]+)$/i);
     if (!m) {
       return of(null);
     }
 
     return from(this._resolveBuilder(name)).pipe(
-      concatMap(builderInfo => builderInfo ? this._createBuilder(builderInfo) : of(null)),
+      concatMap(builderInfo => (builderInfo ? this._createBuilder(builderInfo) : of(null))),
       first(null, null),
     ) as Observable<experimental.jobs.JobHandler<A, I, O> | null>;
   }
@@ -192,12 +190,10 @@ export class ArchitectBuilderJobRegistry implements BuilderRegistry {
 /**
  * A JobRegistry that resolves targets from the host.
  */
-export class ArchitectTargetJobRegistry extends ArchitectBuilderJobRegistry {
-  get<
-    A extends json.JsonObject,
-    I extends BuilderInput,
-    O extends BuilderOutput,
-    >(name: string): Observable<experimental.jobs.JobHandler<A, I, O> | null> {
+class ArchitectTargetJobRegistry extends ArchitectBuilderJobRegistry {
+  get<A extends json.JsonObject, I extends BuilderInput, O extends BuilderOutput>(
+    name: string,
+  ): Observable<experimental.jobs.JobHandler<A, I, O> | null> {
     const m = name.match(/^{([^:]+):([^:]+)(?::([^:]*))?}$/i);
     if (!m) {
       return of(null);
@@ -209,10 +205,12 @@ export class ArchitectTargetJobRegistry extends ArchitectBuilderJobRegistry {
       configuration: m[3],
     };
 
-    return from(Promise.all([
-      this._host.getBuilderNameForTarget(target),
-      this._host.getOptionsForTarget(target),
-    ])).pipe(
+    return from(
+      Promise.all([
+        this._host.getBuilderNameForTarget(target),
+        this._host.getOptionsForTarget(target),
+      ]),
+    ).pipe(
       concatMap(([builderStr, options]) => {
         if (builderStr === null || options === null) {
           return of(null);
@@ -234,6 +232,22 @@ export class ArchitectTargetJobRegistry extends ArchitectBuilderJobRegistry {
 }
 
 
+function _getTargetOptionsFactory(host: ArchitectHost) {
+  return experimental.jobs.createJobHandler<Target, json.JsonValue, json.JsonObject>(
+    target => {
+      return host.getOptionsForTarget(target).then(options => {
+        return options || {};
+      });
+    },
+    {
+      name: '..getTargetOptions',
+      output: { type: 'object' },
+      argument: inputSchema.properties.target,
+    },
+  );
+}
+
+
 export class Architect {
   private readonly _scheduler: experimental.jobs.Scheduler;
   private readonly _jobCache = new Map<string, Observable<BuilderJobHandler>>();
@@ -244,9 +258,14 @@ export class Architect {
     private _registry: json.schema.SchemaRegistry = new json.schema.CoreSchemaRegistry(),
     additionalJobRegistry?: experimental.jobs.Registry,
   ) {
+    const privateArchitectJobRegistry = new experimental.jobs.SimpleJobRegistry();
+    // Create private jobs.
+    privateArchitectJobRegistry.register(_getTargetOptionsFactory(_host));
+
     const jobRegistry = new experimental.jobs.FallbackRegistry([
       new ArchitectTargetJobRegistry(_host, _registry, this._jobCache, this._infoCache),
       new ArchitectBuilderJobRegistry(_host, _registry, this._jobCache, this._infoCache),
+      privateArchitectJobRegistry,
       ...(additionalJobRegistry ? [additionalJobRegistry] : []),
     ] as experimental.jobs.Registry[]);
 
diff --git a/packages/angular_devkit/architect/src/create-builder.ts b/packages/angular_devkit/architect/src/create-builder.ts
index 8e3e5e7bcfc8..9613bd5cbcc5 100644
--- a/packages/angular_devkit/architect/src/create-builder.ts
+++ b/packages/angular_devkit/architect/src/create-builder.ts
@@ -16,6 +16,7 @@ import {
   BuilderOutput,
   BuilderOutputLike,
   BuilderProgressState,
+  ScheduleOptions,
   Target,
   TypedBuilderProgress,
   targetStringFromTarget,
@@ -96,10 +97,14 @@ export function createBuilder<
           target: i.target as Target,
           logger: logger,
           id: i.id,
-          async scheduleTarget(target: Target, overrides: json.JsonObject = {}) {
+          async scheduleTarget(
+            target: Target,
+            overrides: json.JsonObject = {},
+            scheduleOptions: ScheduleOptions = {},
+          ) {
             const run = await scheduleByTarget(target, overrides, {
               scheduler,
-              logger: logger.createChild(''),
+              logger: scheduleOptions.logger || logger.createChild(''),
               workspaceRoot: i.workspaceRoot,
               currentDirectory: i.currentDirectory,
             });
@@ -109,10 +114,14 @@ export function createBuilder<
 
             return run;
           },
-          async scheduleBuilder(builderName: string, options: json.JsonObject = {}) {
+          async scheduleBuilder(
+            builderName: string,
+            options: json.JsonObject = {},
+            scheduleOptions: ScheduleOptions = {},
+          ) {
             const run = await scheduleByName(builderName, options, {
               scheduler,
-              logger: logger.createChild(''),
+              logger: scheduleOptions.logger || logger.createChild(''),
               workspaceRoot: i.workspaceRoot,
               currentDirectory: i.currentDirectory,
             });
@@ -122,18 +131,22 @@ export function createBuilder<
 
             return run;
           },
+          async getTargetOptions(target: Target) {
+            return scheduler.schedule<Target, json.JsonValue, json.JsonObject>(
+                    '..getTargetOptions', target).output.toPromise();
+          },
           reportRunning() {
             switch (currentState) {
               case BuilderProgressState.Waiting:
               case BuilderProgressState.Stopped:
-                progress({state: BuilderProgressState.Running, current: 0, total}, context);
+                progress({ state: BuilderProgressState.Running, current: 0, total  }, context);
                 break;
             }
           },
           reportStatus(status: string) {
             switch (currentState) {
               case BuilderProgressState.Running:
-                progress({ state: currentState, status, current, total }, context);
+                progress({ state: currentState, status, current, total  }, context);
                 break;
               case BuilderProgressState.Waiting:
                 progress({ state: currentState, status }, context);
diff --git a/packages/angular_devkit/architect/src/index2_spec.ts b/packages/angular_devkit/architect/src/index2_spec.ts
index 1e64b06a2beb..e339e1b6933e 100644
--- a/packages/angular_devkit/architect/src/index2_spec.ts
+++ b/packages/angular_devkit/architect/src/index2_spec.ts
@@ -13,6 +13,7 @@ import { BuilderOutput, BuilderRun } from './api';
 import { Architect } from './architect';
 import { createBuilder } from './create-builder';
 
+// tslint:disable-next-line:no-big-function
 describe('architect', () => {
   let testArchitectHost: TestingArchitectHost;
   let architect: Architect;
@@ -185,4 +186,42 @@ describe('architect', () => {
       await run.stop();
     }
   });
+
+  it('exposes getTargetOptions() properly', async () => {
+    const goldenOptions = {
+      value: 'value',
+    };
+    let options = {} as object;
+
+    const target = {
+      project: 'project',
+      target: 'target',
+    };
+    testArchitectHost.addTarget(target, 'package:target', goldenOptions);
+
+    testArchitectHost.addBuilder('package:getTargetOptions', createBuilder(async (_, context) => {
+      options = await context.getTargetOptions(target);
+
+      return { success: true };
+    }));
+
+    const run = await architect.scheduleBuilder('package:getTargetOptions', {});
+    const output = await run.output.toPromise();
+    expect(output.success).toBe(true);
+    expect(options).toEqual(goldenOptions);
+    await run.stop();
+
+    // Use an invalid target and check for error.
+    target.target = 'invalid';
+    options = {};
+
+    // This should not error.
+    const run2 = await architect.scheduleBuilder('package:getTargetOptions', {});
+
+    // But this should.
+    try {
+      await run2.output.toPromise();
+    } catch {}
+    await run2.stop();
+  });
 });

From 64b83e2a559b5b77c32a9ee0ae50bb290d3521b6 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Wed, 6 Mar 2019 12:22:49 +0100
Subject: [PATCH 0862/1703] feat(@schematics/angular): relocate `ng g
 service-worker` files

This is a follow up on https://github.com/angular/angular-cli/pull/13811, with this now all application have the same structure and hence `ng g service-worker` should follow suit and have the same folder strucute if generated in a root app, or an app inside the projects.
---
 packages/schematics/angular/service-worker/index.ts      | 7 +++----
 packages/schematics/angular/service-worker/index_spec.ts | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/schematics/angular/service-worker/index.ts b/packages/schematics/angular/service-worker/index.ts
index 6e0c4b76816e..3a60efa4e87f 100644
--- a/packages/schematics/angular/service-worker/index.ts
+++ b/packages/schematics/angular/service-worker/index.ts
@@ -60,7 +60,7 @@ function updateConfigFile(options: ServiceWorkerOptions, root: string): Rule {
 
     const config = getProjectConfiguration(workspace, options);
     config.serviceWorker = true;
-    config.ngswConfigPath = `${root.endsWith('/') ? root : root + '/'}ngsw-config.json`;
+    config.ngswConfigPath = `${root && !root.endsWith('/') ? root + '/' : root}ngsw-config.json`;
 
     return updateWorkspace(workspace);
   };
@@ -174,17 +174,16 @@ export default function (options: ServiceWorkerOptions): Rule {
       resourcesOutputPath = '/' + resourcesOutputPath.split('/').filter(x => !!x).join('/');
     }
 
-    const root = project.root || project.sourceRoot || '';
     const templateSource = apply(url('./files'), [
       applyTemplates({ ...options, resourcesOutputPath }),
-      move(root),
+      move(project.root),
     ]);
 
     context.addTask(new NodePackageInstallTask());
 
     return chain([
       mergeWith(templateSource),
-      updateConfigFile(options, root),
+      updateConfigFile(options, project.root),
       addDependencies(),
       updateAppModule(options),
     ]);
diff --git a/packages/schematics/angular/service-worker/index_spec.ts b/packages/schematics/angular/service-worker/index_spec.ts
index 9fdea0520bfa..d31a4fb7fd21 100644
--- a/packages/schematics/angular/service-worker/index_spec.ts
+++ b/packages/schematics/angular/service-worker/index_spec.ts
@@ -120,7 +120,7 @@ describe('Service Worker Schematic', () => {
       .toContain('/outDir/*.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)');
   });
 
-  it('should generate ngsw-config.json in src when the application is at root level', () => {
+  it('should generate ngsw-config.json in root when the application is at root level', () => {
     const name = 'foo';
     const rootAppOptions: ApplicationOptions = {
       ...appOptions,
@@ -134,11 +134,11 @@ describe('Service Worker Schematic', () => {
 
     let tree = schematicRunner.runSchematic('application', rootAppOptions, appTree);
     tree = schematicRunner.runSchematic('service-worker', rootSWOptions, tree);
-    expect(tree.exists('/src/ngsw-config.json')).toBe(true);
+    expect(tree.exists('/ngsw-config.json')).toBe(true);
 
     const { projects } = JSON.parse(tree.readContent('/angular.json'));
     expect(projects.foo.architect.build.configurations.production.ngswConfigPath)
-      .toBe('src/ngsw-config.json');
+      .toBe('ngsw-config.json');
   });
 
 });

From 4e262f966f1e1456320f2ed191c49e9aea382ce1 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Sun, 3 Mar 2019 12:22:48 -0800
Subject: [PATCH 0863/1703] build: Update to latest bazel rules

---
 .circleci/config.yml                          |    4 +-
 WORKSPACE                                     |   81 +-
 package.json                                  |    4 +-
 packages/angular/cli/BUILD                    |    3 +-
 packages/angular/pwa/BUILD                    |    4 +-
 packages/angular_devkit/architect/BUILD       |   14 +-
 packages/angular_devkit/architect_cli/BUILD   |    6 +-
 packages/angular_devkit/benchmark/BUILD       |   10 +-
 packages/angular_devkit/build_optimizer/BUILD |    2 +-
 packages/angular_devkit/core/BUILD            |   22 +-
 packages/angular_devkit/schematics/BUILD      |   34 +-
 packages/angular_devkit/schematics_cli/BUILD  |    6 +-
 packages/schematics/angular/BUILD             |    9 +-
 packages/schematics/schematics/BUILD          |   10 +-
 packages/schematics/update/BUILD              |   10 +-
 tests/angular_devkit/core/node/jobs/BUILD     |    2 +-
 .../tools/file-system-engine-host/BUILD       |    6 +-
 tools/build_event_protocol/BUILD              |    6 +-
 tools/ts_json_schema.bzl                      |    2 +-
 yarn.lock                                     | 1075 ++---------------
 20 files changed, 210 insertions(+), 1100 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 659aa63dc4ac..6add7f5afc37 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,8 +15,8 @@
 # If you change the cache key prefix, also sync the restore_cache fallback to match.
 # Keep the static part of the cache key as prefix to enable correct fallbacks.
 # See https://circleci.com/docs/2.0/caching/#restoring-cache for how prefixes work in CircleCI.
-var_1: &docker_image angular/ngcontainer:0.7.0
-var_2: &cache_key angular_devkit-0.7.0-{{ checksum "yarn.lock" }}
+var_1: &docker_image angular/ngcontainer:0.10.0
+var_2: &cache_key angular_devkit-0.10.0-{{ checksum "yarn.lock" }}
 var_3: &node_8_docker_image angular/ngcontainer:0.3.3
 
 # Settings common to each job
diff --git a/WORKSPACE b/WORKSPACE
index 729055b85c58..bd05a3b28bc6 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,55 +1,32 @@
 workspace(name = "angular_cli")
 
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-# This is required by Angular Workspace
 http_archive(
-    name = "bazel_skylib",
-    url = "https://github.com/bazelbuild/bazel-skylib/archive/0.5.0.zip",
-    strip_prefix = "bazel-skylib-0.5.0",
-    sha256 = "ca4e3b8e4da9266c3a9101c8f4704fe2e20eb5625b2a6a7d2d7d45e3dd4efffd",
+    name = "build_bazel_rules_nodejs",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.26.0/rules_nodejs-0.26.0.tar.gz"],
+    sha256 = "5c86b055c57e15bf32d9009a15bcd6d8e190c41b1ff2fb18037b75e0012e4e7c",
 )
 
-# We get Buildifier from here.
-http_archive(
-    name = "com_github_bazelbuild_buildtools",
-    url = "https://github.com/bazelbuild/buildtools/archive/0.15.0.zip",
-    strip_prefix = "buildtools-0.15.0",
-    sha256 = "76d1837a86fa6ef5b4a07438f8489f00bfa1b841e5643b618e01232ba884b1fe",
-)
-
-# Load the TypeScript rules, its dependencies, and setup the workspace.
-http_archive(
-    name = "build_bazel_rules_typescript",
-    url = "https://github.com/bazelbuild/rules_typescript/archive/0.22.1.zip",
-    strip_prefix = "rules_typescript-0.22.1",
-    sha256 = "351abe89b291a3b3d6af38d9d04c6270f5d2ed8781e2fda25bc65fd12db25e66",
-)
-
-load("@build_bazel_rules_typescript//:package.bzl", "rules_typescript_dependencies")
-# build_bazel_rules_nodejs is loaded transitively through rules_typescript_dependencies.
-rules_typescript_dependencies()
-
-load("@com_github_bazelbuild_buildtools//buildifier:deps.bzl", "buildifier_dependencies")
-buildifier_dependencies()
-
-load("@io_bazel_rules_go//go:def.bzl", "go_register_toolchains", "go_rules_dependencies")
-go_rules_dependencies()
-go_register_toolchains()
-
 # TS API Guardian resides in Angular
 http_archive(
     name = "angular",
-    url = "https://github.com/angular/angular/archive/7.2.0.zip",
-    strip_prefix = "angular-7.2.0",
-    sha256 = "8a4915a524f3fed17424da4b77cd7a943fbbddba44275f06671493339713914b",
+    sha256 = "5a5a56c93e454b6fb3d470e2f49f6c47db85d25765fca0f26276c71c2263be38",
+    strip_prefix = "angular-7.2.7",
+    url = "https://github.com/angular/angular/archive/7.2.7.zip",
 )
 
-load("@angular//:index.bzl", "ng_setup_workspace")
-ng_setup_workspace()
+# We use protocol buffers for the Build Event Protocol
+git_repository(
+    name = "com_google_protobuf",
+    remote = "https://github.com/protocolbuffers/protobuf",
+    commit = "b6375e03aa80274dae89410efdf46346413b2247",
+)
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
-ts_setup_workspace()
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+
+protobuf_deps()
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
 # 0.18.0 is needed for .bazelignore
@@ -92,9 +69,23 @@ yarn_install(
     ],
 )
 
-http_archive(
-    name = "rxjs",
-    url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz",
-    strip_prefix = "package/src",
-    sha256 = "72b0b4e517f43358f554c125e40e39f67688cd2738a8998b4a266981ed32f403",
-)
+load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
+install_bazel_dependencies()
+
+load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace")		
+
+ts_setup_workspace()
+
+# Load karma dependencies
+load("@npm_bazel_karma//:package.bzl", "rules_karma_dependencies")
+
+rules_karma_dependencies()
+
+# Setup the rules_webtesting toolchain
+load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories")
+
+web_test_repositories()
+
+load("@angular//:index.bzl", "ng_setup_workspace")
+
+ng_setup_workspace()
diff --git a/package.json b/package.json
index 4fab29c94f48..9fa104fa0850 100644
--- a/package.json
+++ b/package.json
@@ -77,8 +77,8 @@
   "devDependencies": {
     "@angular/compiler": "^8.0.0-beta.0",
     "@angular/compiler-cli": "^8.0.0-beta.0",
-    "@bazel/karma": "^0.22.1",
-    "@bazel/typescript": "0.22.1",
+    "@bazel/karma": "~0.26.0",
+    "@bazel/typescript": "~0.26.0",
     "@ngtools/json-schema": "^1.1.0",
     "@types/copy-webpack-plugin": "^4.4.1",
     "@types/express": "^4.16.0",
diff --git a/packages/angular/cli/BUILD b/packages/angular/cli/BUILD
index 5512fc1e01fa..5b1a04ff0ed4 100644
--- a/packages/angular/cli/BUILD
+++ b/packages/angular/cli/BUILD
@@ -5,7 +5,7 @@
 
 licenses(["notice"])  # MIT
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
 package(default_visibility = ["//visibility:public"])
@@ -33,6 +33,7 @@ ts_library(
         "@npm//@types/node",
         "@npm//@types/inquirer",
         "@npm//@types/semver",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/angular/pwa/BUILD b/packages/angular/pwa/BUILD
index 1ff99f111fb9..1cbc93bc1477 100644
--- a/packages/angular/pwa/BUILD
+++ b/packages/angular/pwa/BUILD
@@ -5,7 +5,7 @@
 
 licenses(["notice"])  # MIT
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
 package(default_visibility = ["//visibility:public"])
@@ -29,7 +29,7 @@ ts_library(
         ":pwa_schema",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/schematics",
-        "@rxjs",
+        "@npm//rxjs",
         "@npm//@types/node",
     ],
 )
diff --git a/packages/angular_devkit/architect/BUILD b/packages/angular_devkit/architect/BUILD
index e54ab10149c2..2bb8ff8234bf 100644
--- a/packages/angular_devkit/architect/BUILD
+++ b/packages/angular_devkit/architect/BUILD
@@ -5,7 +5,7 @@
 
 licenses(["notice"])  # MIT
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
@@ -43,8 +43,8 @@ ts_library(
     deps = [
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
-        "@rxjs",
-        "@rxjs//operators",
+        "@npm//rxjs",
+        
         "@npm//@types/node",
         ":architect",
         ":builder_builders_schema",
@@ -69,8 +69,8 @@ ts_library(
     deps = [
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
-        "@rxjs",
-        "@rxjs//operators",
+        "@npm//rxjs",
+        
         "@npm//@types/node",
         ":builder_input_schema",
         ":builder_output_schema",
@@ -93,8 +93,8 @@ ts_library(
         ":architect",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
-        "@rxjs",
-        "@rxjs//operators",
+        "@npm//rxjs",
+        
         "@npm//@types/node",
     ],
 )
diff --git a/packages/angular_devkit/architect_cli/BUILD b/packages/angular_devkit/architect_cli/BUILD
index d7d12f885ea4..ad26cb545dc7 100644
--- a/packages/angular_devkit/architect_cli/BUILD
+++ b/packages/angular_devkit/architect_cli/BUILD
@@ -4,7 +4,7 @@
 # found in the LICENSE file at https://angular.io/license
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
 
 licenses(["notice"])  # MIT
 
@@ -19,8 +19,8 @@ ts_library(
         "//packages/angular_devkit/architect:node",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
-        "@rxjs",
-        "@rxjs//operators",
+        "@npm//rxjs",
+        
         "@npm//@types/node",
         "@npm//@types/minimist",
         "@npm//@types/progress",
diff --git a/packages/angular_devkit/benchmark/BUILD b/packages/angular_devkit/benchmark/BUILD
index 06b7c3028362..807343503c27 100644
--- a/packages/angular_devkit/benchmark/BUILD
+++ b/packages/angular_devkit/benchmark/BUILD
@@ -5,7 +5,7 @@
 
 licenses(["notice"])  # MIT
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test", "npm_package")
 
 package(default_visibility = ["//visibility:public"])
@@ -25,8 +25,8 @@ ts_library(
     deps = [
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
-        "@rxjs",
-        "@rxjs//operators",
+        "@npm//rxjs",
+        
         "@npm//@types/node",
         "@npm//@types/minimist",
     ],
@@ -49,8 +49,8 @@ ts_library(
         ":benchmark",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
-        "@rxjs",
-        "@rxjs//operators",
+        "@npm//rxjs",
+        
         "@npm//@types/node",
         "@npm//@types/jasmine",
     ],
diff --git a/packages/angular_devkit/build_optimizer/BUILD b/packages/angular_devkit/build_optimizer/BUILD
index 9a38a79b4376..cacfa7db0a64 100644
--- a/packages/angular_devkit/build_optimizer/BUILD
+++ b/packages/angular_devkit/build_optimizer/BUILD
@@ -5,7 +5,7 @@
 
 licenses(["notice"])  # MIT
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test", "npm_package")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/packages/angular_devkit/core/BUILD b/packages/angular_devkit/core/BUILD
index c164400b74cf..a2917df84f71 100644
--- a/packages/angular_devkit/core/BUILD
+++ b/packages/angular_devkit/core/BUILD
@@ -4,7 +4,7 @@
 # found in the LICENSE file at https://angular.io/license
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test", "npm_package")
 
 licenses(["notice"])  # MIT License
@@ -28,8 +28,8 @@ ts_library(
     module_root = "src/index.d.ts",
     # strict_checks = False,
     deps = [
-        "@rxjs",
-        "@rxjs//operators",
+        "@npm//rxjs",
+        
         "@npm//@types/node",
         "@npm//@types/source-map",
         "@npm//ajv",
@@ -51,8 +51,8 @@ ts_library(
     deps = [
         ":core",
         ":node",
-        "@rxjs",
-        "@rxjs//operators",
+        "@npm//rxjs",
+        
         "@npm//@types/node",
         "@npm//@types/jasmine",
     ],
@@ -94,8 +94,8 @@ ts_library(
     module_root = "node/index.d.ts",
     deps = [
         ":core",
-        "@rxjs",
-        "@rxjs//operators",
+        "@npm//rxjs",
+        
         "@npm//@types/node",
     ],
 )
@@ -112,8 +112,8 @@ ts_library(
         ":core",
         ":node",
         "//tests/angular_devkit/core/node/jobs:jobs_test_lib",
-        "@rxjs",
-        "@rxjs//operators",
+        "@npm//rxjs",
+        
         "@npm//@types/node",
         "@npm//@types/jasmine",
     ],
@@ -154,8 +154,8 @@ ts_library(
     deps = [
         ":core",
         ":node",
-        "@rxjs",
-        "@rxjs//operators",
+        "@npm//rxjs",
+        
         "@npm//@types/node",
         "@npm//@types/jasmine",
     ],
diff --git a/packages/angular_devkit/schematics/BUILD b/packages/angular_devkit/schematics/BUILD
index 46fd94b6ae28..d8a09927b8cd 100644
--- a/packages/angular_devkit/schematics/BUILD
+++ b/packages/angular_devkit/schematics/BUILD
@@ -4,7 +4,7 @@
 # found in the LICENSE file at https://angular.io/license
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test", "npm_package")
 
 licenses(["notice"])  # MIT License
@@ -27,8 +27,8 @@ ts_library(
     deps = [
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",  # TODO: get rid of this for 6.0
-        "@rxjs",
-        "@rxjs//operators",
+        "@npm//rxjs",
+        
         "@npm//@types/node",
     ],
 )
@@ -46,8 +46,8 @@ ts_library(
         ":testing",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
-        "@rxjs",
-        "@rxjs//operators",
+        "@npm//rxjs",
+        
         "@npm//@types/node",
         "@npm//@types/jasmine",
     ],
@@ -89,8 +89,8 @@ ts_library(
         "@npm//@types/node",
         "@npm//tslint",
         "@npm//typescript",
-        "@rxjs",
-        "@rxjs//operators",
+        "@npm//rxjs",
+        
         "//packages/angular_devkit/core:node",
         "//packages/angular_devkit/core",
     ],
@@ -115,8 +115,8 @@ ts_library(
         ":tasks",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
-        "@rxjs",
-        "@rxjs//operators",
+        "@npm//rxjs",
+        
         "@npm//@types/node",
     ],
 )
@@ -141,8 +141,8 @@ ts_library(
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
         "//packages/angular_devkit/core:node_testing",
-        "@rxjs",
-        "@rxjs//operators",
+        "@npm//rxjs",
+        
         "@npm//@types/node",
         "@npm//@types/jasmine",
     ],
@@ -185,8 +185,8 @@ ts_library(
         ":tasks_node",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
-        "@rxjs",
-        "@rxjs//operators",
+        "@npm//rxjs",
+        
         "@npm//@types/node",
     ],
 )
@@ -208,8 +208,8 @@ ts_library(
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
         "//tests/angular_devkit/schematics/tools/file-system-engine-host:file_system_engine_host_test_lib",
-        "@rxjs",
-        "@rxjs//operators",
+        "@npm//rxjs",
+        
         "@npm//@types/node",
         "@npm//@types/jasmine",
     ],
@@ -245,8 +245,8 @@ ts_library(
         ":tasks_node",
         ":tools",
         "//packages/angular_devkit/core",
-        "@rxjs",
-        "@rxjs//operators",
+        "@npm//rxjs",
+        
         "@npm//@types/node",
     ],
 )
diff --git a/packages/angular_devkit/schematics_cli/BUILD b/packages/angular_devkit/schematics_cli/BUILD
index f71a477c60e3..1c112566c6a9 100644
--- a/packages/angular_devkit/schematics_cli/BUILD
+++ b/packages/angular_devkit/schematics_cli/BUILD
@@ -4,7 +4,7 @@
 # found in the LICENSE file at https://angular.io/license
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
 
 licenses(["notice"])  # MIT License
 
@@ -29,8 +29,8 @@ ts_library(
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:tasks",
         "//packages/angular_devkit/schematics:tools",
-        "@rxjs",
-        "@rxjs//operators",
+        "@npm//rxjs",
+        
         "@npm//@types/inquirer",
         "@npm//@types/minimist",
         "@npm//@types/node",
diff --git a/packages/schematics/angular/BUILD b/packages/schematics/angular/BUILD
index fe4755caec48..5520ecd74fc5 100644
--- a/packages/schematics/angular/BUILD
+++ b/packages/schematics/angular/BUILD
@@ -5,7 +5,7 @@
 
 licenses(["notice"])  # MIT
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
@@ -49,14 +49,12 @@ ts_library(
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:tasks",
-        "@rxjs",
-        "@rxjs//operators",
         "@npm//@types/node",
+        "@npm//rxjs",
         "@npm//typescript",
     ],
 )
 
-
 ts_library(
     name = "angular_test_lib",
     srcs = glob(
@@ -78,10 +76,9 @@ ts_library(
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:testing",
-        "@rxjs",
-        "@rxjs//operators",
         "@npm//@types/node",
         "@npm//@types/jasmine",
+        "@npm//rxjs",
         "@npm//typescript",
     ],
     testonly = True,
diff --git a/packages/schematics/schematics/BUILD b/packages/schematics/schematics/BUILD
index 4119cef43f68..2247b2b3169a 100644
--- a/packages/schematics/schematics/BUILD
+++ b/packages/schematics/schematics/BUILD
@@ -5,7 +5,7 @@
 
 licenses(["notice"])  # MIT
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
 # load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
@@ -30,8 +30,8 @@ ts_library(
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:tasks",
-        "@rxjs",
-        "@rxjs//operators",
+        "@npm//rxjs",
+        
         "@npm//@types/node",
     ],
 )
@@ -74,8 +74,8 @@ ts_json_schema(
 #         "//packages/angular_devkit/core",
 #         "//packages/angular_devkit/schematics",
 #         "//packages/angular_devkit/schematics:testing",
-#         "@rxjs",
-#         "@rxjs//operators",
+#         "@npm//rxjs",
+#         
 #         "@npm//@types/node",
 #         "@npm//@types/jasmine",
 #     ],
diff --git a/packages/schematics/update/BUILD b/packages/schematics/update/BUILD
index b429933d9a6a..021366ebb0b5 100644
--- a/packages/schematics/update/BUILD
+++ b/packages/schematics/update/BUILD
@@ -5,7 +5,7 @@
 
 licenses(["notice"])  # MIT
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
@@ -27,8 +27,8 @@ ts_library(
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:tasks",
-        "@rxjs",
-        "@rxjs//operators",
+        "@npm//rxjs",
+        
         "@npm//@types/node",
         "@npm//@types/semver",
     ],
@@ -62,8 +62,8 @@ ts_library(
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:testing",
-        "@rxjs",
-        "@rxjs//operators",
+        "@npm//rxjs",
+        
         "@npm//@types/jasmine",
         "@npm//@types/node",
         "@npm//@types/semver",
diff --git a/tests/angular_devkit/core/node/jobs/BUILD b/tests/angular_devkit/core/node/jobs/BUILD
index 8a79ee1a212f..ae5ad1495ef9 100644
--- a/tests/angular_devkit/core/node/jobs/BUILD
+++ b/tests/angular_devkit/core/node/jobs/BUILD
@@ -4,7 +4,7 @@
 # found in the LICENSE file at https://angular.io/license
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
 
 licenses(["notice"])  # MIT License
 
diff --git a/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD b/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD
index b44a0bdd8118..8f5209b06536 100644
--- a/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD
+++ b/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD
@@ -4,7 +4,7 @@
 # found in the LICENSE file at https://angular.io/license
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
 
 licenses(["notice"])  # MIT License
 
@@ -23,8 +23,8 @@ ts_library(
         # ":testing",
         # "//packages/angular_devkit/core",
         # "//packages/angular_devkit/core:node",
-        # "@rxjs",
-        # "@rxjs//operators",
+        # "@npm//rxjs",
+        # 
         "@npm//@types/jasmine",
         "@npm//@types/node",
     ],
diff --git a/tools/build_event_protocol/BUILD b/tools/build_event_protocol/BUILD
index 76be45f40bf6..45ee40373780 100644
--- a/tools/build_event_protocol/BUILD
+++ b/tools/build_event_protocol/BUILD
@@ -2,7 +2,7 @@
 #
 # Use of this source code is governed by an MIT-style license that can be
 # found in the LICENSE file at https://angular.io/license
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library", "ts_proto_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library", "ts_proto_library")
 load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
 
 ts_proto_library(
@@ -16,8 +16,8 @@ ts_library(
     deps = [
       ":build_event_stream",
       "@npm//@types/node",
-      "@rxjs",
-      "@rxjs//operators",
+      "@npm//rxjs",
+      
     ],
 )
 
diff --git a/tools/ts_json_schema.bzl b/tools/ts_json_schema.bzl
index 5c60bab7b113..71f0923a401c 100644
--- a/tools/ts_json_schema.bzl
+++ b/tools/ts_json_schema.bzl
@@ -3,7 +3,7 @@
 # Use of this source code is governed by an MIT-style license that can be
 # found in the LICENSE file at https://angular.io/license
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
 
 # @external_begin
 def _ts_json_schema_interface_impl(ctx):
diff --git a/yarn.lock b/yarn.lock
index a1256fdc67f9..56e47b1f0be0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -219,28 +219,29 @@
     lodash "^4.17.10"
     to-fast-properties "^2.0.0"
 
-"@bazel/karma@^0.22.1":
-  version "0.22.1"
-  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.22.1.tgz#1bd7028b7939e19d67a94a95ea8e7afada679a16"
-  integrity sha512-QPJbvCvxpQF4Wvcrl8efQY095+5OMh/uCPB7REGD728KmFKCPz0R/RhaU5dyNOoaZlR7yTGPkvVcN0nNUKqKKQ==
+"@bazel/karma@~0.26.0":
+  version "0.26.0"
+  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.26.0.tgz#6ad796686f5775df33a96fa5ef3df76a66aed3b2"
+  integrity sha512-yZv0fgAjVrfrM0ld8e+wNaPIpYCpwBzVQi2GUErsKStUZXPUUofpBwBjlYsdY1Osn5/FmAF9e6xDkk1JWn/wSg==
   dependencies:
     jasmine-core "2.8.0"
-    karma alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a
+    karma "^4.0.0"
     karma-chrome-launcher "2.2.0"
     karma-firefox-launcher "1.1.0"
     karma-jasmine "1.1.1"
     karma-requirejs "1.1.0"
-    karma-sauce-launcher "1.2.0"
+    karma-sauce-launcher "2.0.2"
     karma-sourcemap-loader "0.3.7"
     requirejs "2.3.5"
     semver "5.6.0"
     tmp "0.0.33"
 
-"@bazel/typescript@0.22.1":
-  version "0.22.1"
-  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.22.1.tgz#b52c00e8560019e2f9d273d45c04785e0ec9d9bd"
-  integrity sha512-88DaCCnNg8rPlKP0eAQEZuoiJkEPeiItpUS3oBR1sFQNBRJb56D25ahK8+N6LJk4qaH+ZQ1/AHOPDhfEEWvDzA==
+"@bazel/typescript@~0.26.0":
+  version "0.26.0"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.26.0.tgz#c06139d76c8b9d3a3ed98a721b776fedb4b11c82"
+  integrity sha512-dh/Y/SZzmeChsLap8FVHYl0FuaeLh/6t9WBVhm5nOgyVrqfEyVpNzy4W20E4NqnmJY2/PqmD5qncf+Oo1q9h1A==
   dependencies:
+    jasmine-core "2.8.0"
     protobufjs "5.0.3"
     semver "5.6.0"
     source-map-support "0.5.9"
@@ -844,11 +845,6 @@ acorn@^6.0.5:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.5.tgz#81730c0815f3f3b34d8efa95cb7430965f4d887a"
   integrity sha512-i33Zgp3XWtmZBMNvCr4azvOFeWVw1Rk6p3hfi3LUDvIFraOMywb1kAtrbi+med14m4Xfpqm3zRZMT+c0FNE7kg==
 
-addressparser@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/addressparser/-/addressparser-1.0.1.tgz#47afbe1a2a9262191db6838e4fd1d39b40821746"
-  integrity sha1-R6++GiqSYhkdtoOOT9HTm0CCF0Y=
-
 adm-zip@^0.4.9, adm-zip@~0.4.3:
   version "0.4.11"
   resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.11.tgz#2aa54c84c4b01a9d0fb89bb11982a51f13e3d62a"
@@ -859,7 +855,7 @@ after@0.8.2:
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
   integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
 
-agent-base@4, agent-base@^4.1.0, agent-base@^4.2.0, agent-base@~4.2.0:
+agent-base@4, agent-base@^4.1.0, agent-base@~4.2.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
   integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
@@ -893,7 +889,7 @@ ajv@6.10.0:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^5.0.0, ajv@^5.1.0, ajv@^5.3.0:
+ajv@^5.0.0, ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
   integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
@@ -918,17 +914,6 @@ amdefine@>=0.0.4:
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
   integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
-amqplib@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/amqplib/-/amqplib-0.5.2.tgz#d2d7313c7ffaa4d10bcf1e6252de4591b6cc7b63"
-  integrity sha512-l9mCs6LbydtHqRniRwYkKdqxVa6XMz3Vw1fh+2gJaaVgTM6Jk3o8RccAKWKtlhT1US5sWrFh+KKxsVUALURSIA==
-  dependencies:
-    bitsyntax "~0.0.4"
-    bluebird "^3.4.6"
-    buffer-more-ints "0.0.2"
-    readable-stream "1.x >=1.1.9"
-    safe-buffer "^5.0.1"
-
 ansi-align@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f"
@@ -1018,32 +1003,6 @@ aproba@^1.0.3, aproba@^1.1.1:
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-archiver-utils@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-1.3.0.tgz#e50b4c09c70bf3d680e32ff1b7994e9f9d895174"
-  integrity sha1-5QtMCccL89aA4y/xt5lOn52JUXQ=
-  dependencies:
-    glob "^7.0.0"
-    graceful-fs "^4.1.0"
-    lazystream "^1.0.0"
-    lodash "^4.8.0"
-    normalize-path "^2.0.0"
-    readable-stream "^2.0.0"
-
-archiver@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/archiver/-/archiver-2.1.1.tgz#ff662b4a78201494a3ee544d3a33fe7496509ebc"
-  integrity sha1-/2YrSnggFJSj7lRNOjP+dJZQnrw=
-  dependencies:
-    archiver-utils "^1.3.0"
-    async "^2.0.0"
-    buffer-crc32 "^0.2.1"
-    glob "^7.0.0"
-    lodash "^4.8.0"
-    readable-stream "^2.0.0"
-    tar-stream "^1.5.0"
-    zip-stream "^1.2.0"
-
 are-we-there-yet@~1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
@@ -1183,11 +1142,6 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
   integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
-assert-plus@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
-  integrity sha1-104bh+ev/A24qttwIfP+SBAasjQ=
-
 assert@^1.1.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
@@ -1200,11 +1154,6 @@ assign-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
-ast-types@0.x.x:
-  version "0.11.6"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.6.tgz#4e2266c2658829aef3b40cc33ad599c4e9eb89ef"
-  integrity sha512-nHiuV14upVGl7MWwFUYbzJ6YlfwWS084CU9EA8HajfYQjMSli5TQi3UTRygGF58LFWVkXxS1rbgRhROEqlQkXg==
-
 async-each@^1.0.0, async-each@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
@@ -1225,14 +1174,7 @@ async@1.x, async@^1.5.2:
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
   integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
-async@2.0.1:
-  version "2.0.1"
-  resolved "http://registry.npmjs.org/async/-/async-2.0.1.tgz#b709cc0280a9c36f09f4536be823c838a9049e25"
-  integrity sha1-twnMAoCpw28J9FNr6CPIOKkEniU=
-  dependencies:
-    lodash "^4.8.0"
-
-async@^2.0.0, async@^2.1.2, async@^2.5.0, async@^2.6.0, async@^2.6.1, async@~2.6.0:
+async@^2.1.2, async@^2.5.0, async@^2.6.0, async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
   integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
@@ -1273,28 +1215,16 @@ autoprefixer@^9.0.0:
     postcss "^7.0.5"
     postcss-value-parser "^3.3.1"
 
-aws-sign2@~0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
-  integrity sha1-FDQt0428yU0OW4fXY81jYSwOeU8=
-
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
-aws4@^1.2.1, aws4@^1.6.0, aws4@^1.8.0:
+aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
   integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
-axios@^0.15.3:
-  version "0.15.3"
-  resolved "http://registry.npmjs.org/axios/-/axios-0.15.3.tgz#2c9d638b2e191a08ea1d6cc988eadd6ba5bdc053"
-  integrity sha1-LJ1jiy4ZGgjqHWzJiOrda6W9wFM=
-  dependencies:
-    follow-redirects "1.0.0"
-
 babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
@@ -1446,28 +1376,6 @@ binary-extensions@^1.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
   integrity sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=
 
-bitsyntax@~0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/bitsyntax/-/bitsyntax-0.0.4.tgz#eb10cc6f82b8c490e3e85698f07e83d46e0cba82"
-  integrity sha1-6xDMb4K4xJDj6FaY8H6D1G4MuoI=
-  dependencies:
-    buffer-more-ints "0.0.2"
-
-bl@^1.0.0:
-  version "1.2.2"
-  resolved "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
-  integrity sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==
-  dependencies:
-    readable-stream "^2.3.5"
-    safe-buffer "^5.1.1"
-
-bl@~1.1.2:
-  version "1.1.2"
-  resolved "http://registry.npmjs.org/bl/-/bl-1.1.2.tgz#fdca871a99713aa00d19e3bbba41c44787a65398"
-  integrity sha1-/cqHGplxOqANGeO7ukHER4emU5g=
-  dependencies:
-    readable-stream "~2.0.5"
-
 blob@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
@@ -1487,7 +1395,7 @@ blocking-proxy@^1.0.0:
   dependencies:
     minimist "^1.2.0"
 
-bluebird@^3.3.0, bluebird@^3.4.6, bluebird@^3.5.1, bluebird@^3.5.2:
+bluebird@^3.3.0, bluebird@^3.5.1, bluebird@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a"
   integrity sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==
@@ -1530,27 +1438,6 @@ bonjour@^3.5.0:
     multicast-dns "^6.0.1"
     multicast-dns-service-types "^1.1.0"
 
-boom@2.x.x:
-  version "2.10.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
-  integrity sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=
-  dependencies:
-    hoek "2.x.x"
-
-boom@4.x.x:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
-  integrity sha1-T4owBctKfjiJ90kDD9JbluAdLjE=
-  dependencies:
-    hoek "4.x.x"
-
-boom@5.x.x:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
-  integrity sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==
-  dependencies:
-    hoek "4.x.x"
-
 bootstrap@^4.0.0:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.3.tgz#0eb371af2c8448e8c210411d0cb824a6409a12be"
@@ -1721,11 +1608,6 @@ buffer-alloc@^1.2.0:
     buffer-alloc-unsafe "^1.1.0"
     buffer-fill "^1.0.0"
 
-buffer-crc32@^0.2.1:
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
-
 buffer-equal@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"
@@ -1746,11 +1628,6 @@ buffer-indexof@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
   integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
 
-buffer-more-ints@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/buffer-more-ints/-/buffer-more-ints-0.0.2.tgz#26b3885d10fa13db7fc01aae3aab870199e0124c"
-  integrity sha1-JrOIXRD6E9t/wBquOquHAZngEkw=
-
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
@@ -1765,27 +1642,6 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-buffer@^5.1.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.2.1.tgz#dd57fa0f109ac59c602479044dca7b8b3d0b71d6"
-  integrity sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==
-  dependencies:
-    base64-js "^1.0.2"
-    ieee754 "^1.1.4"
-
-buildmail@4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/buildmail/-/buildmail-4.0.1.tgz#877f7738b78729871c9a105e3b837d2be11a7a72"
-  integrity sha1-h393OLeHKYccmhBeO4N9K+EaenI=
-  dependencies:
-    addressparser "1.0.1"
-    libbase64 "0.1.0"
-    libmime "3.0.0"
-    libqp "1.1.0"
-    nodemailer-fetch "1.6.0"
-    nodemailer-shared "1.1.0"
-    punycode "1.4.1"
-
 builtin-modules@^1.0.0, builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
@@ -1967,11 +1823,6 @@ capture-stack-trace@^1.0.0:
   resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
   integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==
 
-caseless@~0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
-  integrity sha1-cVuW6phBWTzDMGeSP17GDr2k99c=
-
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -2030,7 +1881,7 @@ chokidar@2.1.2:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chokidar@^1.4.1, chokidar@^1.4.2:
+chokidar@^1.4.2:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
   integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=
@@ -2106,11 +1957,6 @@ circular-dependency-plugin@5.0.2:
   resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.0.2.tgz#da168c0b37e7b43563fb9f912c1c007c213389ef"
   integrity sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==
 
-circular-json@^0.5.4:
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.8.tgz#40d2ff3aadee99871ebd19b41af3c9f113490003"
-  integrity sha512-VjaKMyZuVkL40usJkknJnmqQKpn2PkKS4M3/xdTRtZ0VsWl2Wbc2xdvXFXmEdmN6CKGqkm8XGyLHuFECZYEugw==
-
 circular-json@^0.5.5:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.9.tgz#932763ae88f4f7dead7a0d09c8a51a4743a53b1d"
@@ -2288,21 +2134,14 @@ combine-lists@^1.0.0:
   dependencies:
     lodash "^4.5.0"
 
-combined-stream@1.0.6, combined-stream@~1.0.5, combined-stream@~1.0.6:
+combined-stream@1.0.6, combined-stream@~1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
   integrity sha1-cj599ugBrFYTETp+RFqbactjKBg=
   dependencies:
     delayed-stream "~1.0.0"
 
-combined-stream@^1.0.5, combined-stream@^1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
-  integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@^2.12.0, commander@^2.9.0:
+commander@^2.12.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
   integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
@@ -2355,16 +2194,6 @@ component-inherit@0.0.3:
   resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
   integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
 
-compress-commons@^1.2.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-1.2.2.tgz#524a9f10903f3a813389b0225d27c48bb751890f"
-  integrity sha1-UkqfEJA/OoEzibAiXSfEi7dRiQ8=
-  dependencies:
-    buffer-crc32 "^0.2.1"
-    crc32-stream "^2.0.0"
-    normalize-path "^2.0.0"
-    readable-stream "^2.0.0"
-
 compressible@~2.0.14:
   version "2.0.15"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.15.tgz#857a9ab0a7e5a07d8d837ed43fe2defff64fe212"
@@ -2777,20 +2606,6 @@ cross-spawn@^6.0.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cryptiles@2.x.x:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
-  integrity sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=
-  dependencies:
-    boom "2.x.x"
-
-cryptiles@3.x.x:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
-  integrity sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=
-  dependencies:
-    boom "5.x.x"
-
 crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -2875,16 +2690,16 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-data-uri-to-buffer@1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz#77163ea9c20d8641b4707e8f18abdf9a78f34835"
-  integrity sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ==
-
 date-format@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"
   integrity sha1-YV6CjiM90aubua4JUODOzPpuytg=
 
+date-format@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/date-format/-/date-format-2.0.0.tgz#7cf7b172f1ec564f0003b39ea302c5498fb98c8f"
+  integrity sha512-M6UqVvZVgFYqZL1SfHsRGIQSz3ZL+qgbsV5Lp1Vj61LZVYuEwcMXYay7DRDtYs2HQQBK5hQtQ0fD9aEJ89V0LA==
+
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
@@ -2902,7 +2717,7 @@ debug@*:
   dependencies:
     ms "^2.1.1"
 
-debug@2, debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@~2.6.4, debug@~2.6.6:
+debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -3039,15 +2854,6 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
-degenerator@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-1.0.4.tgz#fcf490a37ece266464d9cc431ab98c5819ced095"
-  integrity sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=
-  dependencies:
-    ast-types "0.x.x"
-    escodegen "1.x.x"
-    esprima "3.x.x"
-
 del@^2.2.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
@@ -3221,11 +3027,6 @@ dot-prop@^4.1.0:
   dependencies:
     is-obj "^1.0.0"
 
-double-ended-queue@^2.1.0-0:
-  version "2.1.0-0"
-  resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
-  integrity sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw=
-
 duplexer2@~0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
@@ -3320,23 +3121,6 @@ end-with@^1.0.2:
   resolved "https://registry.yarnpkg.com/end-with/-/end-with-1.0.2.tgz#a432755ab4f51e7fc74f3a719c6b81df5d668bdc"
   integrity sha1-pDJ1WrT1Hn/HTzpxnGuB311mi9w=
 
-engine.io-client@~3.1.0:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.1.6.tgz#5bdeb130f8b94a50ac5cbeb72583e7a4a063ddfd"
-  integrity sha512-hnuHsFluXnsKOndS4Hv6SvUrgdYx1pk2NqfaDMW+GWdgfU3+/V25Cj7I8a0x92idSpa5PIhJRKxPvp9mnoLsfg==
-  dependencies:
-    component-emitter "1.2.1"
-    component-inherit "0.0.3"
-    debug "~3.1.0"
-    engine.io-parser "~2.1.1"
-    has-cors "1.1.0"
-    indexof "0.0.1"
-    parseqs "0.0.5"
-    parseuri "0.0.5"
-    ws "~3.3.1"
-    xmlhttprequest-ssl "~1.5.4"
-    yeast "0.1.2"
-
 engine.io-client@~3.2.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36"
@@ -3365,20 +3149,6 @@ engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
     blob "0.0.4"
     has-binary2 "~1.0.2"
 
-engine.io@~3.1.0:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.1.5.tgz#0e7ef9d690eb0b35597f1d4ad02a26ca2dba3845"
-  integrity sha512-D06ivJkYxyRrcEe0bTpNnBQNgP9d3xog+qZlLbui8EsMr/DouQpf5o9FzJnWYHEYE0YsFHllUv2R1dkgYZXHcA==
-  dependencies:
-    accepts "~1.3.4"
-    base64id "1.0.0"
-    cookie "0.3.1"
-    debug "~3.1.0"
-    engine.io-parser "~2.1.0"
-    ws "~3.3.1"
-  optionalDependencies:
-    uws "~9.14.0"
-
 engine.io@~3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.0.tgz#54332506f42f2edc71690d2f2a42349359f3bf7d"
@@ -3468,7 +3238,7 @@ escodegen@1.8.x:
   optionalDependencies:
     source-map "~0.2.0"
 
-escodegen@1.x.x, escodegen@^1.8.1:
+escodegen@^1.8.1:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589"
   integrity sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==
@@ -3505,7 +3275,7 @@ esprima@2.7.x, esprima@^2.7.1:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
   integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=
 
-esprima@3.x.x, esprima@^3.1.3:
+esprima@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
   integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
@@ -3711,7 +3481,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@3, extend@^3.0.0, extend@~3.0.0, extend@~3.0.1, extend@~3.0.2:
+extend@^3.0.0, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -3852,11 +3622,6 @@ file-loader@3.0.1:
     loader-utils "^1.0.2"
     schema-utils "^1.0.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"
-  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
-
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
@@ -3966,13 +3731,6 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.1"
     readable-stream "^2.0.4"
 
-follow-redirects@1.0.0:
-  version "1.0.0"
-  resolved "http://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz#8e34298cbd2e176f254effec75a1c78cc849fd37"
-  integrity sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=
-  dependencies:
-    debug "^2.2.0"
-
 follow-redirects@^1.0.0:
   version "1.5.7"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.7.tgz#a39e4804dacb90202bca76a9e2ac10433ca6a69a"
@@ -4019,25 +3777,7 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
-form-data@~2.0.0:
-  version "2.0.0"
-  resolved "http://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz#6f0aebadcc5da16c13e1ecc11137d85f9b883b25"
-  integrity sha1-bwrrrcxdoWwT4ezBETfYX5uIOyU=
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.11"
-
-form-data@~2.3.0:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
-form-data@~2.3.1, form-data@~2.3.2:
+form-data@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
   integrity sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=
@@ -4078,11 +3818,6 @@ fs-access@^1.0.0:
   dependencies:
     null-check "^1.0.0"
 
-fs-constants@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
-  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
-
 fs-extra@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.0.tgz#8cc3f47ce07ef7b3593a11b9fb245f7e34c041d6"
@@ -4140,14 +3875,6 @@ fstream@^1.0.0, fstream@^1.0.2:
     mkdirp ">=0.5 0"
     rimraf "2"
 
-ftp@~0.3.10:
-  version "0.3.10"
-  resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
-  integrity sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=
-  dependencies:
-    readable-stream "1.1.x"
-    xregexp "2.0.0"
-
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -4174,20 +3901,6 @@ gaze@^1.0.0:
   dependencies:
     globule "^1.0.0"
 
-generate-function@^2.0.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f"
-  integrity sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==
-  dependencies:
-    is-property "^1.0.2"
-
-generate-object-property@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
-  integrity sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=
-  dependencies:
-    is-property "^1.0.0"
-
 genfun@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
@@ -4236,18 +3949,6 @@ get-stream@^4.0.0, get-stream@^4.1.0:
   dependencies:
     pump "^3.0.0"
 
-get-uri@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.2.tgz#5c795e71326f6ca1286f2fc82575cd2bab2af578"
-  integrity sha512-ZD325dMZOgerGqF/rF6vZXyFGTAay62svjQIT+X/oU2PtxYpFxvSkbsdi+oxIrsNxlZVd4y8wUDqkaExWTI/Cw==
-  dependencies:
-    data-uri-to-buffer "1"
-    debug "2"
-    extend "3"
-    file-uri-to-path "1"
-    ftp "~0.3.10"
-    readable-stream "2"
-
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -4465,7 +4166,7 @@ got@^9.1.0:
     to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
 
-graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
   integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
@@ -4501,24 +4202,6 @@ har-schema@^2.0.0:
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
-har-validator@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
-  integrity sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=
-  dependencies:
-    chalk "^1.1.1"
-    commander "^2.9.0"
-    is-my-json-valid "^2.12.4"
-    pinkie-promise "^2.0.0"
-
-har-validator@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
-  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
-  dependencies:
-    ajv "^5.1.0"
-    har-schema "^2.0.0"
-
 har-validator@~5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
@@ -4615,34 +4298,6 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-hawk@~3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
-  integrity sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=
-  dependencies:
-    boom "2.x.x"
-    cryptiles "2.x.x"
-    hoek "2.x.x"
-    sntp "1.x.x"
-
-hawk@~6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
-  integrity sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==
-  dependencies:
-    boom "4.x.x"
-    cryptiles "3.x.x"
-    hoek "4.x.x"
-    sntp "2.x.x"
-
-hipchat-notifier@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/hipchat-notifier/-/hipchat-notifier-1.1.0.tgz#b6d249755437c191082367799d3ba9a0f23b231e"
-  integrity sha1-ttJJdVQ3wZEII2d5nTupoPI7Ix4=
-  dependencies:
-    lodash "^4.0.0"
-    request "^2.0.0"
-
 hmac-drbg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@@ -4652,16 +4307,6 @@ hmac-drbg@^1.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-hoek@2.x.x:
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
-  integrity sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=
-
-hoek@4.x.x:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
-  integrity sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==
-
 hosted-git-info@^2.1.4, hosted-git-info@^2.6.0:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
@@ -4749,15 +4394,6 @@ http-proxy@^1.13.0, http-proxy@^1.16.2, http-proxy@^1.17.0:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
-http-signature@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
-  integrity sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=
-  dependencies:
-    assert-plus "^0.2.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -4767,19 +4403,6 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-httpntlm@1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/httpntlm/-/httpntlm-1.6.1.tgz#ad01527143a2e8773cfae6a96f58656bb52a34b2"
-  integrity sha1-rQFScUOi6Hc8+uapb1hla7UqNLI=
-  dependencies:
-    httpreq ">=0.4.22"
-    underscore "~1.7.0"
-
-httpreq@>=0.4.22:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/httpreq/-/httpreq-0.4.24.tgz#4335ffd82cd969668a39465c929ac61d6393627f"
-  integrity sha1-QzX/2CzZaWaKOUZckprGHWOTYn8=
-
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
@@ -4816,11 +4439,6 @@ husky@^1.3.1:
     run-node "^1.0.0"
     slash "^2.0.0"
 
-iconv-lite@0.4.15:
-  version "0.4.15"
-  resolved "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
-  integrity sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es=
-
 iconv-lite@0.4.23:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
@@ -4934,16 +4552,6 @@ indexof@0.0.1:
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
   integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
 
-inflection@~1.12.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416"
-  integrity sha1-ogCTVlbW9fa8TcdQLhrstwMihBY=
-
-inflection@~1.3.0:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.3.8.tgz#cbd160da9f75b14c3cc63578d4f396784bf3014e"
-  integrity sha1-y9Fg2p91sUw8xjV41POWeEvzAU4=
-
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -5034,7 +4642,7 @@ ip-regex@^2.1.0:
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
   integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
 
-ip@^1.1.0, ip@^1.1.2, ip@^1.1.5:
+ip@^1.1.0, ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
   integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
@@ -5235,22 +4843,6 @@ is-module@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
   integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
 
-is-my-ip-valid@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
-  integrity sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==
-
-is-my-json-valid@^2.12.4:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.19.0.tgz#8fd6e40363cd06b963fa877d444bfb5eddc62175"
-  integrity sha512-mG0f/unGX1HZ5ep4uhRaPOS8EkAY8/j6mDRMJrutq4CqhoJWYp7qAlonIPy3TV7p3ju4TK9fo/PbnoksWmsp5Q==
-  dependencies:
-    generate-function "^2.0.0"
-    generate-object-property "^1.1.0"
-    is-my-ip-valid "^1.0.0"
-    jsonpointer "^4.0.0"
-    xtend "^4.0.0"
-
 is-npm@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
@@ -5331,11 +4923,6 @@ is-promise@^2.1.0:
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
   integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
 
-is-property@^1.0.0, is-property@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-  integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=
-
 is-redirect@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
@@ -5663,7 +5250,7 @@ json-schema@0.2.3:
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
   integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
 
-json-stringify-safe@5.0.x, json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
+json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
@@ -5697,11 +5284,6 @@ jsonparse@^1.2.0:
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
 
-jsonpointer@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
-  integrity sha1-T9kss04OnbPInIYi7PUfm5eMbLk=
-
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -5766,15 +5348,14 @@ karma-requirejs@1.1.0:
   resolved "https://registry.yarnpkg.com/karma-requirejs/-/karma-requirejs-1.1.0.tgz#fddae2cb87d7ebc16fb0222893564d7fee578798"
   integrity sha1-/driy4fX68FvsCIok1ZNf+5Xh5g=
 
-karma-sauce-launcher@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/karma-sauce-launcher/-/karma-sauce-launcher-1.2.0.tgz#6f2558ddef3cf56879fa27540c8ae9f8bfd16bca"
-  integrity sha512-lEhtGRGS+3Yw6JSx/vJY9iQyHNtTjcojrSwNzqNUOaDceKDu9dPZqA/kr69bUO9G2T6GKbu8AZgXqy94qo31Jg==
+karma-sauce-launcher@2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/karma-sauce-launcher/-/karma-sauce-launcher-2.0.2.tgz#dbf98e70d86bf287b03a537cf637eb7aefa975c3"
+  integrity sha512-jLUFaJhHMcKpxFWUesyWYihzM5FvQiJsDwGcCtKeOy2lsWhkVw0V0Byqb1d+wU6myU1mribBtsIcub23HS4kWA==
   dependencies:
-    q "^1.5.0"
-    sauce-connect-launcher "^1.2.2"
-    saucelabs "^1.4.0"
-    wd "^1.4.0"
+    sauce-connect-launcher "^1.2.4"
+    saucelabs "^1.5.0"
+    selenium-webdriver "^4.0.0-alpha.1"
 
 karma-source-map-support@1.4.0:
   version "1.4.0"
@@ -5790,37 +5371,38 @@ karma-sourcemap-loader@0.3.7:
   dependencies:
     graceful-fs "^4.1.2"
 
-karma@alexeagle/karma#fa1a84ac881485b5657cb669e9b4e5da77b79f0a:
-  version "1.7.1"
-  resolved "https://codeload.github.com/alexeagle/karma/tar.gz/fa1a84ac881485b5657cb669e9b4e5da77b79f0a"
+karma@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-4.0.1.tgz#2581d6caa0d4cd28b65131561b47bad6d5478773"
+  integrity sha512-ind+4s03BqIXas7ZmraV3/kc5+mnqwCd+VDX1FndS6jxbt03kQKX2vXrWxNLuCjVYmhMwOZosAEKMM0a2q7w7A==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
-    chokidar "^1.4.1"
+    braces "^2.3.2"
+    chokidar "^2.0.3"
     colors "^1.1.0"
-    combine-lists "^1.0.0"
     connect "^3.6.0"
     core-js "^2.2.0"
     di "^0.0.1"
     dom-serialize "^2.2.0"
-    expand-braces "^0.1.1"
+    flatted "^2.0.0"
     glob "^7.1.1"
     graceful-fs "^4.1.2"
     http-proxy "^1.13.0"
     isbinaryfile "^3.0.0"
-    lodash "^4.17.4"
-    log4js "^2.3.9"
-    mime "^1.3.4"
+    lodash "^4.17.11"
+    log4js "^4.0.0"
+    mime "^2.3.1"
     minimatch "^3.0.2"
     optimist "^0.6.1"
     qjobs "^1.1.4"
     range-parser "^1.2.0"
     rimraf "^2.6.0"
     safe-buffer "^5.0.1"
-    socket.io "2.0.4"
+    socket.io "2.1.1"
     source-map "^0.6.1"
     tmp "0.0.33"
-    useragent "^2.1.12"
+    useragent "2.3.0"
 
 karma@~4.0.0:
   version "4.0.0"
@@ -5906,13 +5488,6 @@ latest-version@^3.0.0:
   dependencies:
     package-json "^4.0.0"
 
-lazystream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
-  integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=
-  dependencies:
-    readable-stream "^2.0.5"
-
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
@@ -5984,25 +5559,6 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-libbase64@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/libbase64/-/libbase64-0.1.0.tgz#62351a839563ac5ff5bd26f12f60e9830bb751e6"
-  integrity sha1-YjUag5VjrF/1vSbxL2Dpgwu3UeY=
-
-libmime@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/libmime/-/libmime-3.0.0.tgz#51a1a9e7448ecbd32cda54421675bb21bc093da6"
-  integrity sha1-UaGp50SOy9Ms2lRCFnW7IbwJPaY=
-  dependencies:
-    iconv-lite "0.4.15"
-    libbase64 "0.1.0"
-    libqp "1.1.0"
-
-libqp@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/libqp/-/libqp-1.1.0.tgz#f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"
-  integrity sha1-9ebgatdLeU+1tbZpiL9yjvHe2+g=
-
 license-checker@^20.1.0:
   version "20.2.0"
   resolved "https://registry.yarnpkg.com/license-checker/-/license-checker-20.2.0.tgz#edb2605fd714514ed16e7eeee5b88a41900241d2"
@@ -6155,36 +5711,16 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
-lodash@4.17.10, lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.5.0:
+lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.5.0:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
   integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==
 
-lodash@^4.15.0, lodash@^4.16.6, lodash@^4.17.11, lodash@^4.17.5, lodash@^4.8.0, lodash@~4.17.10:
+lodash@^4.16.6, lodash@^4.17.11, lodash@^4.17.5, lodash@~4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
-log4js@^2.3.9:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-2.11.0.tgz#bf3902eff65c6923d9ce9cfbd2db54160e34005a"
-  integrity sha512-z1XdwyGFg8/WGkOyF6DPJjivCWNLKrklGdViywdYnSKOvgtEBo2UyEMZS5sD2mZrQlU3TvO8wDWLc8mzE1ncBQ==
-  dependencies:
-    circular-json "^0.5.4"
-    date-format "^1.2.0"
-    debug "^3.1.0"
-    semver "^5.5.0"
-    streamroller "0.7.0"
-  optionalDependencies:
-    amqplib "^0.5.2"
-    axios "^0.15.3"
-    hipchat-notifier "^1.1.0"
-    loggly "^1.1.0"
-    mailgun-js "^0.18.0"
-    nodemailer "^2.5.0"
-    redis "^2.7.1"
-    slack-node "~0.2.0"
-
 log4js@^3.0.0:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.6.tgz#e6caced94967eeeb9ce399f9f8682a4b2b28c8ff"
@@ -6196,6 +5732,17 @@ log4js@^3.0.0:
     rfdc "^1.1.2"
     streamroller "0.7.0"
 
+log4js@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.0.2.tgz#0c73e623ca4448669653eb0e9f629beacc7fbbe3"
+  integrity sha512-KE7HjiieVDPPdveA3bJZSuu0n8chMkFl8mIoisBFxwEJ9FmXe4YzNuiqSwYUiR1K8q8/5/8Yd6AClENY1RA9ww==
+  dependencies:
+    date-format "^2.0.0"
+    debug "^3.1.0"
+    flatted "^2.0.0"
+    rfdc "^1.1.2"
+    streamroller "^1.0.1"
+
 logform@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/logform/-/logform-1.9.1.tgz#58b29d7b11c332456d7a217e17b48a13ad69d60a"
@@ -6207,15 +5754,6 @@ logform@^1.9.1:
     ms "^2.1.1"
     triple-beam "^1.2.0"
 
-loggly@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/loggly/-/loggly-1.1.1.tgz#0a0fc1d3fa3a5ec44fdc7b897beba2a4695cebee"
-  integrity sha1-Cg/B0/o6XsRP3HuJe+uipGlc6+4=
-  dependencies:
-    json-stringify-safe "5.0.x"
-    request "2.75.x"
-    timespan "2.3.x"
-
 loglevel@^1.4.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
@@ -6282,29 +5820,6 @@ magic-string@^0.25.1:
   dependencies:
     sourcemap-codec "^1.4.1"
 
-mailcomposer@4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/mailcomposer/-/mailcomposer-4.0.1.tgz#0e1c44b2a07cf740ee17dc149ba009f19cadfeb4"
-  integrity sha1-DhxEsqB890DuF9wUm6AJ8Zyt/rQ=
-  dependencies:
-    buildmail "4.0.1"
-    libmime "3.0.0"
-
-mailgun-js@^0.18.0:
-  version "0.18.1"
-  resolved "https://registry.yarnpkg.com/mailgun-js/-/mailgun-js-0.18.1.tgz#ee39aa18d7bb598a5ce9ede84afb681defc8a6b0"
-  integrity sha512-lvuMP14u24HS2uBsJEnzSyPMxzU2b99tQsIx1o6QNjqxjk8b3WvR+vq5oG1mjqz/IBYo+5gF+uSoDS0RkMVHmg==
-  dependencies:
-    async "~2.6.0"
-    debug "~3.1.0"
-    form-data "~2.3.0"
-    inflection "~1.12.0"
-    is-stream "^1.1.0"
-    path-proxy "~1.0.0"
-    promisify-call "^2.0.2"
-    proxy-agent "~3.0.0"
-    tsscmp "~1.0.0"
-
 make-dir@^1.0.0, make-dir@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -6510,7 +6025,7 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-"mime-db@>= 1.36.0 < 2", mime-db@~1.37.0:
+"mime-db@>= 1.36.0 < 2":
   version "1.37.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
   integrity sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==
@@ -6520,13 +6035,6 @@ mime-db@~1.36.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
   integrity sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==
 
-mime-types@^2.1.11, mime-types@~2.1.7:
-  version "2.1.21"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
-  integrity sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==
-  dependencies:
-    mime-db "~1.37.0"
-
 mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
   version "2.1.20"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
@@ -6539,7 +6047,7 @@ mime@1.4.1:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
   integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
-mime@^1.3.4, mime@^1.4.1:
+mime@^1.4.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
@@ -6773,11 +6281,6 @@ neo-async@^2.5.0:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
   integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
 
-netmask@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35"
-  integrity sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU=
-
 ng-packagr@^4.2.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-4.4.0.tgz#b868a829b5743870c6392491de3faf4e4cec6f4d"
@@ -6969,67 +6472,6 @@ node-sass@^4.9.3:
     stdout-stream "^1.4.0"
     "true-case-path" "^1.0.2"
 
-node-uuid@~1.4.7:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
-  integrity sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=
-
-nodemailer-direct-transport@3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/nodemailer-direct-transport/-/nodemailer-direct-transport-3.3.2.tgz#e96fafb90358560947e569017d97e60738a50a86"
-  integrity sha1-6W+vuQNYVglH5WkBfZfmBzilCoY=
-  dependencies:
-    nodemailer-shared "1.1.0"
-    smtp-connection "2.12.0"
-
-nodemailer-fetch@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz#79c4908a1c0f5f375b73fe888da9828f6dc963a4"
-  integrity sha1-ecSQihwPXzdbc/6IjamCj23JY6Q=
-
-nodemailer-shared@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz#cf5994e2fd268d00f5cf0fa767a08169edb07ec0"
-  integrity sha1-z1mU4v0mjQD1zw+nZ6CBae2wfsA=
-  dependencies:
-    nodemailer-fetch "1.6.0"
-
-nodemailer-smtp-pool@2.8.2:
-  version "2.8.2"
-  resolved "https://registry.yarnpkg.com/nodemailer-smtp-pool/-/nodemailer-smtp-pool-2.8.2.tgz#2eb94d6cf85780b1b4725ce853b9cbd5e8da8c72"
-  integrity sha1-LrlNbPhXgLG0clzoU7nL1ejajHI=
-  dependencies:
-    nodemailer-shared "1.1.0"
-    nodemailer-wellknown "0.1.10"
-    smtp-connection "2.12.0"
-
-nodemailer-smtp-transport@2.7.2:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/nodemailer-smtp-transport/-/nodemailer-smtp-transport-2.7.2.tgz#03d71c76314f14ac7dbc7bf033a6a6d16d67fb77"
-  integrity sha1-A9ccdjFPFKx9vHvwM6am0W1n+3c=
-  dependencies:
-    nodemailer-shared "1.1.0"
-    nodemailer-wellknown "0.1.10"
-    smtp-connection "2.12.0"
-
-nodemailer-wellknown@0.1.10:
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz#586db8101db30cb4438eb546737a41aad0cf13d5"
-  integrity sha1-WG24EB2zDLRDjrVGc3pBqtDPE9U=
-
-nodemailer@^2.5.0:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-2.7.2.tgz#f242e649aeeae39b6c7ed740ef7b061c404d30f9"
-  integrity sha1-8kLmSa7q45tsftdA73sGHEBNMPk=
-  dependencies:
-    libmime "3.0.0"
-    mailcomposer "4.0.1"
-    nodemailer-direct-transport "3.3.2"
-    nodemailer-shared "1.1.0"
-    nodemailer-smtp-pool "2.8.2"
-    nodemailer-smtp-transport "2.7.2"
-    socks "1.1.9"
-
 "nopt@2 || 3", nopt@3.x:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
@@ -7180,11 +6622,6 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-oauth-sign@~0.8.1, oauth-sign@~0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
-
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
@@ -7444,31 +6881,6 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
   integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
 
-pac-proxy-agent@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz#11d578b72a164ad74bf9d5bac9ff462a38282432"
-  integrity sha512-AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q==
-  dependencies:
-    agent-base "^4.2.0"
-    debug "^3.1.0"
-    get-uri "^2.0.0"
-    http-proxy-agent "^2.1.0"
-    https-proxy-agent "^2.2.1"
-    pac-resolver "^3.0.0"
-    raw-body "^2.2.0"
-    socks-proxy-agent "^4.0.1"
-
-pac-resolver@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-3.0.0.tgz#6aea30787db0a891704deb7800a722a7615a6f26"
-  integrity sha512-tcc38bsjuE3XZ5+4vP96OfhOugrX+JcnpUbhfuc4LuXBLQhoTthOstZeoQJBDnQUDYzYmdImKsbz0xSl1/9qeA==
-  dependencies:
-    co "^4.6.0"
-    degenerator "^1.0.4"
-    ip "^1.1.5"
-    netmask "^1.0.6"
-    thunkify "^2.1.2"
-
 package-json@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
@@ -7696,13 +7108,6 @@ path-parse@^1.0.5:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
-path-proxy@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/path-proxy/-/path-proxy-1.0.0.tgz#18e8a36859fc9d2f1a53b48dee138543c020de5e"
-  integrity sha1-GOijaFn8nS8aU7SN7hOFQ8Ag3l4=
-  dependencies:
-    inflection "~1.3.0"
-
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
@@ -7953,13 +7358,6 @@ promise@~7.0.1:
   dependencies:
     asap "~2.0.3"
 
-promisify-call@^2.0.2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/promisify-call/-/promisify-call-2.0.4.tgz#d48c2d45652ccccd52801ddecbd533a6d4bd5fba"
-  integrity sha1-1IwtRWUszM1SgB3ey9UzptS9X7o=
-  dependencies:
-    with-callback "^1.0.2"
-
 protobufjs@5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.3.tgz#e4dfe9fb67c90b2630d15868249bcc4961467a17"
@@ -8007,20 +7405,6 @@ proxy-addr@~2.0.4:
     forwarded "~0.1.2"
     ipaddr.js "1.8.0"
 
-proxy-agent@~3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-3.0.3.tgz#1c1a33db60ef5f2e9e35b876fd63c2bc681c611d"
-  integrity sha512-PXVVVuH9tiQuxQltFJVSnXWuDtNr+8aNBP6XVDDCDiUuDN8eRCm+ii4/mFWmXWEA0w8jjJSlePa4LXlM4jIzNA==
-  dependencies:
-    agent-base "^4.2.0"
-    debug "^3.1.0"
-    http-proxy-agent "^2.1.0"
-    https-proxy-agent "^2.2.1"
-    lru-cache "^4.1.2"
-    pac-proxy-agent "^3.0.0"
-    proxy-from-env "^1.0.0"
-    socks-proxy-agent "^4.0.1"
-
 proxy-from-env@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
@@ -8083,7 +7467,7 @@ punycode@1.3.2:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
   integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
 
-punycode@1.4.1, punycode@^1.2.4, punycode@^1.4.1:
+punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
@@ -8112,7 +7496,7 @@ q@1.4.1:
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
   integrity sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=
 
-q@^1.4.1, q@^1.5.0, q@^1.5.1:
+q@^1.4.1, q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
@@ -8122,16 +7506,11 @@ qjobs@^1.1.4:
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
   integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
 
-qs@6.5.2, qs@~6.5.1, qs@~6.5.2:
+qs@6.5.2, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-qs@~6.2.0:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"
-  integrity sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=
-
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
@@ -8204,7 +7583,7 @@ range-parser@^1.0.3, range-parser@^1.2.0, range-parser@~1.2.0:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
   integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
-raw-body@2.3.3, raw-body@^2.2.0:
+raw-body@2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
   integrity sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==
@@ -8346,16 +7725,6 @@ read-pkg@^4.0.1:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@1.1.x, "readable-stream@1.x >=1.1.9":
-  version "1.1.14"
-  resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
 readable-stream@^3.0.6:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.1.1.tgz#ed6bbc6c5ba58b090039ff18ce670515795aeb06"
@@ -8365,7 +7734,7 @@ readable-stream@^3.0.6:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@~2.0.5, readable-stream@~2.0.6:
+readable-stream@~2.0.6:
   version "2.0.6"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
   integrity sha1-j5A0HmilPMySh4jaz80Rs265t44=
@@ -8429,25 +7798,6 @@ redent@^2.0.0:
     indent-string "^3.0.0"
     strip-indent "^2.0.0"
 
-redis-commands@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.4.0.tgz#52f9cf99153efcce56a8f86af986bd04e988602f"
-  integrity sha512-cu8EF+MtkwI4DLIT0x9P8qNTLFhQD4jLfxLR0cCNkeGzs87FN6879JOJwNQR/1zD7aSYNbU0hgsV9zGY71Itvw==
-
-redis-parser@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-2.6.0.tgz#52ed09dacac108f1a631c07e9b69941e7a19504b"
-  integrity sha1-Uu0J2srBCPGmMcB+m2mUHnoZUEs=
-
-redis@^2.7.1:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/redis/-/redis-2.8.0.tgz#202288e3f58c49f6079d97af7a10e1303ae14b02"
-  integrity sha512-M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A==
-  dependencies:
-    double-ended-queue "^2.1.0-0"
-    redis-commands "^1.2.0"
-    redis-parser "^2.6.0"
-
 reflect-metadata@^0.1.2:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.12.tgz#311bf0c6b63cd782f228a81abe146a2bfa9c56f2"
@@ -8541,62 +7891,7 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
-request@2.75.x:
-  version "2.75.0"
-  resolved "http://registry.npmjs.org/request/-/request-2.75.0.tgz#d2b8268a286da13eaa5d01adf5d18cc90f657d93"
-  integrity sha1-0rgmiihtoT6qXQGt9dGMyQ9lfZM=
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    bl "~1.1.2"
-    caseless "~0.11.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.0.0"
-    har-validator "~2.0.6"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    node-uuid "~1.4.7"
-    oauth-sign "~0.8.1"
-    qs "~6.2.0"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "~0.4.1"
-
-request@2.85.0:
-  version "2.85.0"
-  resolved "http://registry.npmjs.org/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
-  integrity sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
-    forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    hawk "~6.0.2"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
-
-request@^2.0.0, request@^2.74.0, request@^2.83.0, request@^2.87.0, request@^2.88.0:
+request@^2.74.0, request@^2.83.0, request@^2.87.0, request@^2.88.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
   integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
@@ -8622,16 +7917,6 @@ request@^2.0.0, request@^2.74.0, request@^2.83.0, request@^2.87.0, request@^2.88
     tunnel-agent "^0.6.0"
     uuid "^3.3.2"
 
-requestretry@^1.2.2:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/requestretry/-/requestretry-1.13.0.tgz#213ec1006eeb750e8b8ce54176283d15a8d55d94"
-  integrity sha512-Lmh9qMvnQXADGAQxsXHP4rbgO6pffCfuR8XUBdP9aitJcLQJxhp7YZK4xAVYXnPJ5E52mwrfiKQtKonPL8xsmg==
-  dependencies:
-    extend "^3.0.0"
-    lodash "^4.15.0"
-    request "^2.74.0"
-    when "^3.7.7"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -8846,7 +8131,7 @@ sass-loader@7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
-sauce-connect-launcher@^1.2.2:
+sauce-connect-launcher@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sauce-connect-launcher/-/sauce-connect-launcher-1.2.4.tgz#8d38f85242a9fbede1b2303b559f7e20c5609a1c"
   integrity sha512-X2vfwulR6brUGiicXKxPm1GJ7dBEeP1II450Uv4bHGrcGOapZNgzJvn9aioea5IC5BPp/7qjKdE3xbbTBIVXMA==
@@ -8857,7 +8142,7 @@ sauce-connect-launcher@^1.2.2:
     lodash "^4.16.6"
     rimraf "^2.5.4"
 
-saucelabs@^1.4.0, saucelabs@^1.5.0:
+saucelabs@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-1.5.0.tgz#9405a73c360d449b232839919a86c396d379fd9d"
   integrity sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==
@@ -8918,6 +8203,16 @@ selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
     tmp "0.0.30"
     xml2js "^0.4.17"
 
+selenium-webdriver@^4.0.0-alpha.1:
+  version "4.0.0-alpha.1"
+  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.0.0-alpha.1.tgz#cc93415e21d2dc1dfd85dfc5f6b55f3ac53933b1"
+  integrity sha512-z88rdjHAv3jmTZ7KSGUkTvo4rGzcDGMq0oXWHNIDK96Gs31JKVdu9+FMtT4KBrVoibg8dUicJDok6GnqqttO5Q==
+  dependencies:
+    jszip "^3.1.3"
+    rimraf "^2.5.4"
+    tmp "0.0.30"
+    xml2js "^0.4.17"
+
 selfsigned@^1.9.1:
   version "1.10.4"
   resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
@@ -9108,13 +8403,6 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
-slack-node@~0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/slack-node/-/slack-node-0.2.0.tgz#de4b8dddaa8b793f61dbd2938104fdabf37dfa30"
-  integrity sha1-3kuN3aqLeT9h29KTgQT9q/N9+jA=
-  dependencies:
-    requestretry "^1.2.2"
-
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
@@ -9130,24 +8418,11 @@ slide@^1.1.3, slide@~1.1.3:
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
   integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=
 
-smart-buffer@^1.0.4:
-  version "1.1.15"
-  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-1.1.15.tgz#7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"
-  integrity sha1-fxFLW2X6s+KjWqd1uxLw0cZJvxY=
-
 smart-buffer@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.1.tgz#07ea1ca8d4db24eb4cac86537d7d18995221ace3"
   integrity sha512-RFqinRVJVcCAL9Uh1oVqE6FZkqsyLiVOYEZ20TqIOjuX7iFVJ+zsbs4RIghnw/pTs7mZvt8ZHhvm1ZUrR4fykg==
 
-smtp-connection@2.12.0:
-  version "2.12.0"
-  resolved "https://registry.yarnpkg.com/smtp-connection/-/smtp-connection-2.12.0.tgz#d76ef9127cb23c2259edb1e8349c2e8d5e2d74c1"
-  integrity sha1-1275EnyyPCJZ7bHoNJwujV4tdME=
-  dependencies:
-    httpntlm "1.6.1"
-    nodemailer-shared "1.1.0"
-
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -9178,44 +8453,11 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-sntp@1.x.x:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
-  integrity sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=
-  dependencies:
-    hoek "2.x.x"
-
-sntp@2.x.x:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
-  integrity sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==
-  dependencies:
-    hoek "4.x.x"
-
 socket.io-adapter@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b"
   integrity sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=
 
-socket.io-client@2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.0.4.tgz#0918a552406dc5e540b380dcd97afc4a64332f8e"
-  integrity sha1-CRilUkBtxeVAs4Dc2Xr8SmQzL44=
-  dependencies:
-    backo2 "1.0.2"
-    base64-arraybuffer "0.1.5"
-    component-bind "1.0.0"
-    component-emitter "1.2.1"
-    debug "~2.6.4"
-    engine.io-client "~3.1.0"
-    has-cors "1.1.0"
-    indexof "0.0.1"
-    object-component "0.0.3"
-    parseqs "0.0.5"
-    parseuri "0.0.5"
-    socket.io-parser "~3.1.1"
-    to-array "0.1.4"
-
 socket.io-client@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.1.tgz#dcb38103436ab4578ddb026638ae2f21b623671f"
@@ -9236,16 +8478,6 @@ socket.io-client@2.1.1:
     socket.io-parser "~3.2.0"
     to-array "0.1.4"
 
-socket.io-parser@~3.1.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.1.3.tgz#ed2da5ee79f10955036e3da413bfd7f1e4d86c8e"
-  integrity sha512-g0a2HPqLguqAczs3dMECuA1RgoGFPyvDqcbaDEdCWY9g59kdUAz3YRmaJBNKXflrHNwB7Q12Gkf/0CZXfdHR7g==
-  dependencies:
-    component-emitter "1.2.1"
-    debug "~3.1.0"
-    has-binary2 "~1.0.2"
-    isarray "2.0.1"
-
 socket.io-parser@~3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz#e7c6228b6aa1f814e6148aea325b51aa9499e077"
@@ -9255,17 +8487,6 @@ socket.io-parser@~3.2.0:
     debug "~3.1.0"
     isarray "2.0.1"
 
-socket.io@2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.0.4.tgz#c1a4590ceff87ecf13c72652f046f716b29e6014"
-  integrity sha1-waRZDO/4fs8TxyZS8Eb3FrKeYBQ=
-  dependencies:
-    debug "~2.6.6"
-    engine.io "~3.1.0"
-    socket.io-adapter "~1.1.0"
-    socket.io-client "2.0.4"
-    socket.io-parser "~3.1.1"
-
 socket.io@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz#a069c5feabee3e6b214a75b40ce0652e1cfb9980"
@@ -9298,7 +8519,7 @@ sockjs@0.3.19:
     faye-websocket "^0.10.0"
     uuid "^3.0.1"
 
-socks-proxy-agent@^4.0.0, socks-proxy-agent@^4.0.1:
+socks-proxy-agent@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz#5936bf8b707a993079c6f37db2091821bffa6473"
   integrity sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw==
@@ -9306,14 +8527,6 @@ socks-proxy-agent@^4.0.0, socks-proxy-agent@^4.0.1:
     agent-base "~4.2.0"
     socks "~2.2.0"
 
-socks@1.1.9:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-1.1.9.tgz#628d7e4d04912435445ac0b6e459376cb3e6d691"
-  integrity sha1-Yo1+TQSRJDVEWsC25Fk3bLPm1pE=
-  dependencies:
-    ip "^1.1.2"
-    smart-buffer "^1.0.4"
-
 socks@~2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/socks/-/socks-2.2.1.tgz#68ad678b3642fbc5d99c64c165bc561eab0215f9"
@@ -9724,6 +8937,17 @@ streamroller@0.7.0:
     mkdirp "^0.5.1"
     readable-stream "^2.3.0"
 
+streamroller@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.3.tgz#cb51e7e382f799a9381a5d7490ce3053b325fba3"
+  integrity sha512-P7z9NwP51EltdZ81otaGAN3ob+/F88USJE546joNq7bqRNTe6jc74fTBDyynxP4qpIfKlt/CesEYicuMzI0yJg==
+  dependencies:
+    async "^2.6.1"
+    date-format "^2.0.0"
+    debug "^3.1.0"
+    fs-extra "^7.0.0"
+    lodash "^4.17.10"
+
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -9760,11 +8984,6 @@ string_decoder@~0.10.x:
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
   integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
 
-stringstream@~0.0.4, stringstream@~0.0.5:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
-  integrity sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==
-
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -9885,19 +9104,6 @@ tapable@^1.0.0, tapable@^1.1.0:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c"
   integrity sha512-IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA==
 
-tar-stream@^1.5.0:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
-  integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
-  dependencies:
-    bl "^1.0.0"
-    buffer-alloc "^1.2.0"
-    end-of-stream "^1.0.0"
-    fs-constants "^1.0.0"
-    readable-stream "^2.3.0"
-    to-buffer "^1.1.1"
-    xtend "^4.0.0"
-
 tar@^2.0.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
@@ -10016,11 +9222,6 @@ through@2, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.6:
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
-thunkify@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/thunkify/-/thunkify-2.1.2.tgz#faa0e9d230c51acc95ca13a361ac05ca7e04553d"
-  integrity sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=
-
 thunky@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.3.tgz#f5df732453407b09191dae73e2a8cc73f381a826"
@@ -10038,11 +9239,6 @@ timers-browserify@^2.0.4:
   dependencies:
     setimmediate "^1.0.4"
 
-timespan@2.3.x:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/timespan/-/timespan-2.3.0.tgz#4902ce040bd13d845c8f59b27e9d59bad6f39929"
-  integrity sha1-SQLOBAvRPYRcj1myfp1ZutbzmSk=
-
 tiny-inflate@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.2.tgz#93d9decffc8805bd57eae4310f0b745e9b6fb3a7"
@@ -10072,11 +9268,6 @@ to-arraybuffer@^1.0.0:
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
   integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
-to-buffer@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
-  integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==
-
 to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
@@ -10117,13 +9308,6 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-tough-cookie@~2.3.0, tough-cookie@~2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
-  integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==
-  dependencies:
-    punycode "^1.4.1"
-
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
@@ -10237,11 +9421,6 @@ tslint@^5.11.0:
     tslib "^1.8.0"
     tsutils "^2.27.2"
 
-tsscmp@~1.0.0:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"
-  integrity sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==
-
 tsutils@2.27.2:
   version "2.27.2"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.27.2.tgz#60ba88a23d6f785ec4b89c6e8179cac9b431f1c7"
@@ -10268,11 +9447,6 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
-tunnel-agent@~0.4.1:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
-  integrity sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=
-
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
@@ -10316,11 +9490,6 @@ ultron@~1.1.0:
   resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
   integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
 
-underscore@~1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz#6bbaf0877500d36be34ecaa584e0db9fef035209"
-  integrity sha1-a7rwh3UA02vjTsqlhODbn+8DUgk=
-
 "unicode-properties@github:quicktype/unicode-properties#dist":
   version "1.1.0"
   resolved "https://codeload.github.com/quicktype/unicode-properties/tar.gz/d5fddfea1ef9d05c6479a979e225476063e13f52"
@@ -10463,7 +9632,7 @@ use@^3.1.0:
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
   integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
-useragent@2.3.0, useragent@^2.1.12:
+useragent@2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz#217f943ad540cb2128658ab23fc960f6a88c9972"
   integrity sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==
@@ -10500,16 +9669,11 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2:
+uuid@^3.0.1, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
-uws@~9.14.0:
-  version "9.14.0"
-  resolved "https://registry.yarnpkg.com/uws/-/uws-9.14.0.tgz#fac8386befc33a7a3705cbd58dc47b430ca4dd95"
-  integrity sha512-HNMztPP5A1sKuVFmdZ6BPVpBQd5bUjNC8EFMFiICK+oho/OQsAJy5hnIx4btMHiOk8j04f/DbIlqnEZ9d72dqg==
-
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -10525,11 +9689,6 @@ validate-npm-package-name@^3.0.0:
   dependencies:
     builtins "^1.0.3"
 
-vargs@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/vargs/-/vargs-0.1.0.tgz#6b6184da6520cc3204ce1b407cac26d92609ebff"
-  integrity sha1-a2GE2mUgzDIEzhtAfKwm2SYJ6/8=
-
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
@@ -10577,19 +9736,6 @@ wbuf@^1.1.0, wbuf@^1.7.2, wbuf@^1.7.3:
   dependencies:
     minimalistic-assert "^1.0.0"
 
-wd@^1.4.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/wd/-/wd-1.11.0.tgz#b610deea7f79f5a520a573c09e047e42d31433f9"
-  integrity sha512-h2EBfJvmsWocIjOOg5BsHh9IJKrqZDG4Az4jEZhFugEH7sOPcX6feZQ30aFuktqDI0jquarZJmNpA6V0A0Q7Mg==
-  dependencies:
-    archiver "2.1.1"
-    async "2.0.1"
-    lodash "4.17.10"
-    mkdirp "^0.5.1"
-    q "1.4.1"
-    request "2.85.0"
-    vargs "0.1.0"
-
 webdriver-js-extender@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz#57d7a93c00db4cc8d556e4d3db4b5db0a80c3bb7"
@@ -10786,11 +9932,6 @@ websocket-extensions@>=0.1.1:
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
   integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
 
-when@^3.7.7:
-  version "3.7.8"
-  resolved "https://registry.yarnpkg.com/when/-/when-3.7.8.tgz#c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"
-  integrity sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I=
-
 when@~3.6.x:
   version "3.6.4"
   resolved "https://registry.yarnpkg.com/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e"
@@ -10855,11 +9996,6 @@ winston@^3.0.0:
     triple-beam "^1.3.0"
     winston-transport "^4.2.0"
 
-with-callback@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/with-callback/-/with-callback-1.0.2.tgz#a09629b9a920028d721404fb435bdcff5c91bc21"
-  integrity sha1-oJYpuakgAo1yFAT7Q1vc/1yRvCE=
-
 wordwrap@^1.0.0, wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
@@ -10943,11 +10079,6 @@ xmlhttprequest-ssl@~1.5.4:
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
   integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
 
-xregexp@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
-  integrity sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=
-
 xregexp@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
@@ -11092,16 +10223,6 @@ yn@^2.0.0:
   resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
   integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=
 
-zip-stream@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-1.2.0.tgz#a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"
-  integrity sha1-qLxF9MG0lpnGuQGYuqyqzbzUugQ=
-  dependencies:
-    archiver-utils "^1.3.0"
-    compress-commons "^1.2.0"
-    lodash "^4.8.0"
-    readable-stream "^2.0.0"
-
 zone.js@^0.8.19:
   version "0.8.26"
   resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.26.tgz#7bdd72f7668c5a7ad6b118148b4ea39c59d08d2d"

From bf1c069f73c8e3d4f0e8d584cbfb47c408c1730b Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Tue, 5 Mar 2019 07:45:50 -0800
Subject: [PATCH 0864/1703] refactor(@schematics/angular): drop dependency on
 TypeScript package

instead, vendor in the two files we actually need.
This reduces our install footprint by 5MB
---
 packages/schematics/angular/BUILD             |     14 +-
 .../schematics/angular/app-shell/index.ts     |      2 +-
 .../schematics/angular/component/index.ts     |      2 +-
 .../schematics/angular/directive/index.ts     |      2 +-
 .../migrations/update-7/polyfill-metadata.ts  |      2 +-
 packages/schematics/angular/module/index.ts   |      2 +-
 .../angular/no_typescript_runtime_dep_spec.js |     27 +
 packages/schematics/angular/package.json      |      3 +-
 packages/schematics/angular/pipe/index.ts     |      2 +-
 .../angular/service-worker/index.ts           |      2 +-
 .../Microsoft/TypeScript/BUILD.bazel          |     14 +
 .../github.com/Microsoft/TypeScript/LICENSE   |     55 +
 .../Microsoft/TypeScript/lib/typescript.d.ts  |   5583 +
 .../Microsoft/TypeScript/lib/typescript.js    | 120948 +++++++++++++++
 .../schematics/angular/universal/index.ts     |      2 +-
 .../schematics/angular/utility/ast-utils.ts   |      2 +-
 .../angular/utility/ast-utils_spec.ts         |      2 +-
 .../angular/utility/ng-ast-utils.ts           |      2 +-
 scripts/lint.ts                               |      4 +-
 19 files changed, 126652 insertions(+), 18 deletions(-)
 create mode 100644 packages/schematics/angular/no_typescript_runtime_dep_spec.js
 create mode 100644 packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/BUILD.bazel
 create mode 100644 packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/LICENSE
 create mode 100644 packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts
 create mode 100644 packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js

diff --git a/packages/schematics/angular/BUILD b/packages/schematics/angular/BUILD
index 5520ecd74fc5..c74ca4ae7626 100644
--- a/packages/schematics/angular/BUILD
+++ b/packages/schematics/angular/BUILD
@@ -49,9 +49,18 @@ ts_library(
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:tasks",
+        "//packages/schematics/angular/third_party/github.com/Microsoft/TypeScript",
         "@npm//@types/node",
         "@npm//rxjs",
-        "@npm//typescript",
+    ],
+)
+
+jasmine_node_test(
+    name = "no_typescript_runtime_dep_test",
+    srcs = ["no_typescript_runtime_dep_spec.js"],
+    deps = [
+        ":angular",
+        "@npm//jasmine",
     ],
 )
 
@@ -76,10 +85,10 @@ ts_library(
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:testing",
+        "//packages/schematics/angular/third_party/github.com/Microsoft/TypeScript",
         "@npm//@types/node",
         "@npm//@types/jasmine",
         "@npm//rxjs",
-        "@npm//typescript",
     ],
     testonly = True,
     # @external_begin
@@ -94,5 +103,6 @@ jasmine_node_test(
         "@npm//jasmine",
         "@npm//source-map",
         "@npm//chokidar",
+        "//packages/schematics/angular/third_party/github.com/Microsoft/TypeScript",
     ],
 )
diff --git a/packages/schematics/angular/app-shell/index.ts b/packages/schematics/angular/app-shell/index.ts
index ec8b73feaa74..0431ad605c96 100644
--- a/packages/schematics/angular/app-shell/index.ts
+++ b/packages/schematics/angular/app-shell/index.ts
@@ -14,8 +14,8 @@ import {
   chain,
   schematic,
 } from '@angular-devkit/schematics';
-import * as ts from 'typescript';
 import { Schema as ComponentOptions } from '../component/schema';
+import * as ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import {
   addImportToModule,
   addSymbolToNgModuleMetadata,
diff --git a/packages/schematics/angular/component/index.ts b/packages/schematics/angular/component/index.ts
index 48288a20f719..cd46c51eb529 100644
--- a/packages/schematics/angular/component/index.ts
+++ b/packages/schematics/angular/component/index.ts
@@ -19,7 +19,7 @@ import {
   noop,
   url,
 } from '@angular-devkit/schematics';
-import * as ts from 'typescript';
+import * as ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import {
   addDeclarationToModule,
   addEntryComponentToModule,
diff --git a/packages/schematics/angular/directive/index.ts b/packages/schematics/angular/directive/index.ts
index 1630dde98c6f..cb7bbb01beb7 100644
--- a/packages/schematics/angular/directive/index.ts
+++ b/packages/schematics/angular/directive/index.ts
@@ -19,7 +19,7 @@ import {
   noop,
   url,
 } from '@angular-devkit/schematics';
-import * as ts from 'typescript';
+import * as ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { addDeclarationToModule, addExportToModule } from '../utility/ast-utils';
 import { InsertChange } from '../utility/change';
 import { buildRelativePath, findModuleFromOptions } from '../utility/find-module';
diff --git a/packages/schematics/angular/migrations/update-7/polyfill-metadata.ts b/packages/schematics/angular/migrations/update-7/polyfill-metadata.ts
index 04bfa1bc69e4..7017427d18a2 100644
--- a/packages/schematics/angular/migrations/update-7/polyfill-metadata.ts
+++ b/packages/schematics/angular/migrations/update-7/polyfill-metadata.ts
@@ -7,7 +7,7 @@
  */
 import { JsonObject, JsonParseMode, JsonValue, parseJson } from '@angular-devkit/core';
 import { Rule, Tree, chain, noop } from '@angular-devkit/schematics';
-import * as ts from 'typescript';
+import * as ts from '../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 
 function isJsonObject(value: JsonValue): value is JsonObject {
   return value != null && typeof value === 'object' && !Array.isArray(value);
diff --git a/packages/schematics/angular/module/index.ts b/packages/schematics/angular/module/index.ts
index 041eb005bcf3..b1a30f36bfa7 100644
--- a/packages/schematics/angular/module/index.ts
+++ b/packages/schematics/angular/module/index.ts
@@ -19,7 +19,7 @@ import {
   noop,
   url,
 } from '@angular-devkit/schematics';
-import * as ts from 'typescript';
+import * as ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { addImportToModule } from '../utility/ast-utils';
 import { InsertChange } from '../utility/change';
 import { buildRelativePath, findModuleFromOptions } from '../utility/find-module';
diff --git a/packages/schematics/angular/no_typescript_runtime_dep_spec.js b/packages/schematics/angular/no_typescript_runtime_dep_spec.js
new file mode 100644
index 000000000000..e414190f3aa2
--- /dev/null
+++ b/packages/schematics/angular/no_typescript_runtime_dep_spec.js
@@ -0,0 +1,27 @@
+const fs = require('fs');
+const path = require('path');
+
+const pkg = path.join('packages', 'schematics', 'angular');
+describe('@schematics/angular javascript code', () => {
+  fs.readdirSync(pkg).forEach(d => {
+    const dir = path.join(pkg, d);
+    if (!fs.statSync(dir).isDirectory()) return;
+
+    it(`${d} has no typescript dependency`, () => {
+      function check(subdir) {
+        fs.readdirSync(subdir).forEach(f => {
+          const file = path.join(subdir, f);
+          if (fs.statSync(file).isDirectory()) {
+            check(file);
+          } else if (file.endsWith('.js')) {
+            const content = fs.readFileSync(file, { encoding: 'utf-8' });
+            if (content.indexOf('require("typescript")') >= 0) {
+              fail(`${file} has a typescript require`);
+            }
+          }
+        });
+      }
+      check(dir);
+    });
+  });
+});
diff --git a/packages/schematics/angular/package.json b/packages/schematics/angular/package.json
index 4fee8391d0b7..783b2a424160 100644
--- a/packages/schematics/angular/package.json
+++ b/packages/schematics/angular/package.json
@@ -10,7 +10,6 @@
   "schematics": "./collection.json",
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
-    "@angular-devkit/schematics": "0.0.0",
-    "typescript": "3.2.4"
+    "@angular-devkit/schematics": "0.0.0"
   }
 }
diff --git a/packages/schematics/angular/pipe/index.ts b/packages/schematics/angular/pipe/index.ts
index 5954738dcfd3..24ea22e47d35 100644
--- a/packages/schematics/angular/pipe/index.ts
+++ b/packages/schematics/angular/pipe/index.ts
@@ -19,7 +19,7 @@ import {
   noop,
   url,
 } from '@angular-devkit/schematics';
-import * as ts from 'typescript';
+import * as ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { addDeclarationToModule, addExportToModule } from '../utility/ast-utils';
 import { InsertChange } from '../utility/change';
 import { buildRelativePath, findModuleFromOptions } from '../utility/find-module';
diff --git a/packages/schematics/angular/service-worker/index.ts b/packages/schematics/angular/service-worker/index.ts
index 3a60efa4e87f..962b0c881e9f 100644
--- a/packages/schematics/angular/service-worker/index.ts
+++ b/packages/schematics/angular/service-worker/index.ts
@@ -18,7 +18,7 @@ import {
   url,
 } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
-import * as ts from 'typescript';
+import * as ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { addSymbolToNgModuleMetadata, insertImport, isImported } from '../utility/ast-utils';
 import { InsertChange } from '../utility/change';
 import { getWorkspace, updateWorkspace } from '../utility/config';
diff --git a/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/BUILD.bazel b/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/BUILD.bazel
new file mode 100644
index 000000000000..3f9d7546d25f
--- /dev/null
+++ b/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/BUILD.bazel
@@ -0,0 +1,14 @@
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
+
+# files fetched on 2019-03-05 from
+# https://github.com/Microsoft/TypeScript/tree/v3.3.3333
+licenses(["notice"])  # Apache 2.0
+
+ts_library(
+    name = "TypeScript",
+    srcs = ["lib/typescript.d.ts"],
+    data = ["lib/typescript.js"],
+    module_name = "typescript",
+    module_root = "lib/typescript.d.ts",
+    visibility = ["//packages/schematics/angular:__subpackages__"],
+)
diff --git a/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/LICENSE b/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/LICENSE
new file mode 100644
index 000000000000..edc24fd6e140
--- /dev/null
+++ b/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/LICENSE
@@ -0,0 +1,55 @@
+Apache License
+
+Version 2.0, January 2004
+
+http://www.apache.org/licenses/ 
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of this License; and
+
+You must cause any modified files to carry prominent notices stating that You changed the files; and
+
+You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+
+If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
diff --git a/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts b/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts
new file mode 100644
index 000000000000..83e72bf28000
--- /dev/null
+++ b/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts
@@ -0,0 +1,5583 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0  
+ 
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
+MERCHANTABLITY OR NON-INFRINGEMENT. 
+ 
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+declare namespace ts {
+    const versionMajorMinor = "3.3";
+    /** The version of the TypeScript compiler release */
+    const version: string;
+}
+declare namespace ts {
+    /**
+     * Type of objects whose values are all of the same type.
+     * The `in` and `for-in` operators can *not* be safely used,
+     * since `Object.prototype` may be modified by outside code.
+     */
+    interface MapLike<T> {
+        [index: string]: T;
+    }
+    interface SortedReadonlyArray<T> extends ReadonlyArray<T> {
+        " __sortedArrayBrand": any;
+    }
+    interface SortedArray<T> extends Array<T> {
+        " __sortedArrayBrand": any;
+    }
+    /** ES6 Map interface, only read methods included. */
+    interface ReadonlyMap<T> {
+        get(key: string): T | undefined;
+        has(key: string): boolean;
+        forEach(action: (value: T, key: string) => void): void;
+        readonly size: number;
+        keys(): Iterator<string>;
+        values(): Iterator<T>;
+        entries(): Iterator<[string, T]>;
+    }
+    /** ES6 Map interface. */
+    interface Map<T> extends ReadonlyMap<T> {
+        set(key: string, value: T): this;
+        delete(key: string): boolean;
+        clear(): void;
+    }
+    /** ES6 Iterator type. */
+    interface Iterator<T> {
+        next(): {
+            value: T;
+            done: false;
+        } | {
+            value: never;
+            done: true;
+        };
+    }
+    /** Array that is only intended to be pushed to, never read. */
+    interface Push<T> {
+        push(...values: T[]): void;
+    }
+}
+declare namespace ts {
+    type Path = string & {
+        __pathBrand: any;
+    };
+    interface TextRange {
+        pos: number;
+        end: number;
+    }
+    type JsDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.NoSubstitutionTemplateLiteral | SyntaxKind.Unknown | KeywordSyntaxKind;
+    type KeywordSyntaxKind = SyntaxKind.AbstractKeyword | SyntaxKind.AnyKeyword | SyntaxKind.AsKeyword | SyntaxKind.BigIntKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.BreakKeyword | SyntaxKind.CaseKeyword | SyntaxKind.CatchKeyword | SyntaxKind.ClassKeyword | SyntaxKind.ContinueKeyword | SyntaxKind.ConstKeyword | SyntaxKind.ConstructorKeyword | SyntaxKind.DebuggerKeyword | SyntaxKind.DeclareKeyword | SyntaxKind.DefaultKeyword | SyntaxKind.DeleteKeyword | SyntaxKind.DoKeyword | SyntaxKind.ElseKeyword | SyntaxKind.EnumKeyword | SyntaxKind.ExportKeyword | SyntaxKind.ExtendsKeyword | SyntaxKind.FalseKeyword | SyntaxKind.FinallyKeyword | SyntaxKind.ForKeyword | SyntaxKind.FromKeyword | SyntaxKind.FunctionKeyword | SyntaxKind.GetKeyword | SyntaxKind.IfKeyword | SyntaxKind.ImplementsKeyword | SyntaxKind.ImportKeyword | SyntaxKind.InKeyword | SyntaxKind.InferKeyword | SyntaxKind.InstanceOfKeyword | SyntaxKind.InterfaceKeyword | SyntaxKind.IsKeyword | SyntaxKind.KeyOfKeyword | SyntaxKind.LetKeyword | SyntaxKind.ModuleKeyword | SyntaxKind.NamespaceKeyword | SyntaxKind.NeverKeyword | SyntaxKind.NewKeyword | SyntaxKind.NullKeyword | SyntaxKind.NumberKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.PackageKeyword | SyntaxKind.PrivateKeyword | SyntaxKind.ProtectedKeyword | SyntaxKind.PublicKeyword | SyntaxKind.ReadonlyKeyword | SyntaxKind.RequireKeyword | SyntaxKind.GlobalKeyword | SyntaxKind.ReturnKeyword | SyntaxKind.SetKeyword | SyntaxKind.StaticKeyword | SyntaxKind.StringKeyword | SyntaxKind.SuperKeyword | SyntaxKind.SwitchKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.ThisKeyword | SyntaxKind.ThrowKeyword | SyntaxKind.TrueKeyword | SyntaxKind.TryKeyword | SyntaxKind.TypeKeyword | SyntaxKind.TypeOfKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.UniqueKeyword | SyntaxKind.UnknownKeyword | SyntaxKind.VarKeyword | SyntaxKind.VoidKeyword | SyntaxKind.WhileKeyword | SyntaxKind.WithKeyword | SyntaxKind.YieldKeyword | SyntaxKind.AsyncKeyword | SyntaxKind.AwaitKeyword | SyntaxKind.OfKeyword;
+    type JsxTokenSyntaxKind = SyntaxKind.LessThanSlashToken | SyntaxKind.EndOfFileToken | SyntaxKind.ConflictMarkerTrivia | SyntaxKind.JsxText | SyntaxKind.JsxTextAllWhiteSpaces | SyntaxKind.OpenBraceToken | SyntaxKind.LessThanToken;
+    enum SyntaxKind {
+        Unknown = 0,
+        EndOfFileToken = 1,
+        SingleLineCommentTrivia = 2,
+        MultiLineCommentTrivia = 3,
+        NewLineTrivia = 4,
+        WhitespaceTrivia = 5,
+        ShebangTrivia = 6,
+        ConflictMarkerTrivia = 7,
+        NumericLiteral = 8,
+        BigIntLiteral = 9,
+        StringLiteral = 10,
+        JsxText = 11,
+        JsxTextAllWhiteSpaces = 12,
+        RegularExpressionLiteral = 13,
+        NoSubstitutionTemplateLiteral = 14,
+        TemplateHead = 15,
+        TemplateMiddle = 16,
+        TemplateTail = 17,
+        OpenBraceToken = 18,
+        CloseBraceToken = 19,
+        OpenParenToken = 20,
+        CloseParenToken = 21,
+        OpenBracketToken = 22,
+        CloseBracketToken = 23,
+        DotToken = 24,
+        DotDotDotToken = 25,
+        SemicolonToken = 26,
+        CommaToken = 27,
+        LessThanToken = 28,
+        LessThanSlashToken = 29,
+        GreaterThanToken = 30,
+        LessThanEqualsToken = 31,
+        GreaterThanEqualsToken = 32,
+        EqualsEqualsToken = 33,
+        ExclamationEqualsToken = 34,
+        EqualsEqualsEqualsToken = 35,
+        ExclamationEqualsEqualsToken = 36,
+        EqualsGreaterThanToken = 37,
+        PlusToken = 38,
+        MinusToken = 39,
+        AsteriskToken = 40,
+        AsteriskAsteriskToken = 41,
+        SlashToken = 42,
+        PercentToken = 43,
+        PlusPlusToken = 44,
+        MinusMinusToken = 45,
+        LessThanLessThanToken = 46,
+        GreaterThanGreaterThanToken = 47,
+        GreaterThanGreaterThanGreaterThanToken = 48,
+        AmpersandToken = 49,
+        BarToken = 50,
+        CaretToken = 51,
+        ExclamationToken = 52,
+        TildeToken = 53,
+        AmpersandAmpersandToken = 54,
+        BarBarToken = 55,
+        QuestionToken = 56,
+        ColonToken = 57,
+        AtToken = 58,
+        EqualsToken = 59,
+        PlusEqualsToken = 60,
+        MinusEqualsToken = 61,
+        AsteriskEqualsToken = 62,
+        AsteriskAsteriskEqualsToken = 63,
+        SlashEqualsToken = 64,
+        PercentEqualsToken = 65,
+        LessThanLessThanEqualsToken = 66,
+        GreaterThanGreaterThanEqualsToken = 67,
+        GreaterThanGreaterThanGreaterThanEqualsToken = 68,
+        AmpersandEqualsToken = 69,
+        BarEqualsToken = 70,
+        CaretEqualsToken = 71,
+        Identifier = 72,
+        BreakKeyword = 73,
+        CaseKeyword = 74,
+        CatchKeyword = 75,
+        ClassKeyword = 76,
+        ConstKeyword = 77,
+        ContinueKeyword = 78,
+        DebuggerKeyword = 79,
+        DefaultKeyword = 80,
+        DeleteKeyword = 81,
+        DoKeyword = 82,
+        ElseKeyword = 83,
+        EnumKeyword = 84,
+        ExportKeyword = 85,
+        ExtendsKeyword = 86,
+        FalseKeyword = 87,
+        FinallyKeyword = 88,
+        ForKeyword = 89,
+        FunctionKeyword = 90,
+        IfKeyword = 91,
+        ImportKeyword = 92,
+        InKeyword = 93,
+        InstanceOfKeyword = 94,
+        NewKeyword = 95,
+        NullKeyword = 96,
+        ReturnKeyword = 97,
+        SuperKeyword = 98,
+        SwitchKeyword = 99,
+        ThisKeyword = 100,
+        ThrowKeyword = 101,
+        TrueKeyword = 102,
+        TryKeyword = 103,
+        TypeOfKeyword = 104,
+        VarKeyword = 105,
+        VoidKeyword = 106,
+        WhileKeyword = 107,
+        WithKeyword = 108,
+        ImplementsKeyword = 109,
+        InterfaceKeyword = 110,
+        LetKeyword = 111,
+        PackageKeyword = 112,
+        PrivateKeyword = 113,
+        ProtectedKeyword = 114,
+        PublicKeyword = 115,
+        StaticKeyword = 116,
+        YieldKeyword = 117,
+        AbstractKeyword = 118,
+        AsKeyword = 119,
+        AnyKeyword = 120,
+        AsyncKeyword = 121,
+        AwaitKeyword = 122,
+        BooleanKeyword = 123,
+        ConstructorKeyword = 124,
+        DeclareKeyword = 125,
+        GetKeyword = 126,
+        InferKeyword = 127,
+        IsKeyword = 128,
+        KeyOfKeyword = 129,
+        ModuleKeyword = 130,
+        NamespaceKeyword = 131,
+        NeverKeyword = 132,
+        ReadonlyKeyword = 133,
+        RequireKeyword = 134,
+        NumberKeyword = 135,
+        ObjectKeyword = 136,
+        SetKeyword = 137,
+        StringKeyword = 138,
+        SymbolKeyword = 139,
+        TypeKeyword = 140,
+        UndefinedKeyword = 141,
+        UniqueKeyword = 142,
+        UnknownKeyword = 143,
+        FromKeyword = 144,
+        GlobalKeyword = 145,
+        BigIntKeyword = 146,
+        OfKeyword = 147,
+        QualifiedName = 148,
+        ComputedPropertyName = 149,
+        TypeParameter = 150,
+        Parameter = 151,
+        Decorator = 152,
+        PropertySignature = 153,
+        PropertyDeclaration = 154,
+        MethodSignature = 155,
+        MethodDeclaration = 156,
+        Constructor = 157,
+        GetAccessor = 158,
+        SetAccessor = 159,
+        CallSignature = 160,
+        ConstructSignature = 161,
+        IndexSignature = 162,
+        TypePredicate = 163,
+        TypeReference = 164,
+        FunctionType = 165,
+        ConstructorType = 166,
+        TypeQuery = 167,
+        TypeLiteral = 168,
+        ArrayType = 169,
+        TupleType = 170,
+        OptionalType = 171,
+        RestType = 172,
+        UnionType = 173,
+        IntersectionType = 174,
+        ConditionalType = 175,
+        InferType = 176,
+        ParenthesizedType = 177,
+        ThisType = 178,
+        TypeOperator = 179,
+        IndexedAccessType = 180,
+        MappedType = 181,
+        LiteralType = 182,
+        ImportType = 183,
+        ObjectBindingPattern = 184,
+        ArrayBindingPattern = 185,
+        BindingElement = 186,
+        ArrayLiteralExpression = 187,
+        ObjectLiteralExpression = 188,
+        PropertyAccessExpression = 189,
+        ElementAccessExpression = 190,
+        CallExpression = 191,
+        NewExpression = 192,
+        TaggedTemplateExpression = 193,
+        TypeAssertionExpression = 194,
+        ParenthesizedExpression = 195,
+        FunctionExpression = 196,
+        ArrowFunction = 197,
+        DeleteExpression = 198,
+        TypeOfExpression = 199,
+        VoidExpression = 200,
+        AwaitExpression = 201,
+        PrefixUnaryExpression = 202,
+        PostfixUnaryExpression = 203,
+        BinaryExpression = 204,
+        ConditionalExpression = 205,
+        TemplateExpression = 206,
+        YieldExpression = 207,
+        SpreadElement = 208,
+        ClassExpression = 209,
+        OmittedExpression = 210,
+        ExpressionWithTypeArguments = 211,
+        AsExpression = 212,
+        NonNullExpression = 213,
+        MetaProperty = 214,
+        SyntheticExpression = 215,
+        TemplateSpan = 216,
+        SemicolonClassElement = 217,
+        Block = 218,
+        VariableStatement = 219,
+        EmptyStatement = 220,
+        ExpressionStatement = 221,
+        IfStatement = 222,
+        DoStatement = 223,
+        WhileStatement = 224,
+        ForStatement = 225,
+        ForInStatement = 226,
+        ForOfStatement = 227,
+        ContinueStatement = 228,
+        BreakStatement = 229,
+        ReturnStatement = 230,
+        WithStatement = 231,
+        SwitchStatement = 232,
+        LabeledStatement = 233,
+        ThrowStatement = 234,
+        TryStatement = 235,
+        DebuggerStatement = 236,
+        VariableDeclaration = 237,
+        VariableDeclarationList = 238,
+        FunctionDeclaration = 239,
+        ClassDeclaration = 240,
+        InterfaceDeclaration = 241,
+        TypeAliasDeclaration = 242,
+        EnumDeclaration = 243,
+        ModuleDeclaration = 244,
+        ModuleBlock = 245,
+        CaseBlock = 246,
+        NamespaceExportDeclaration = 247,
+        ImportEqualsDeclaration = 248,
+        ImportDeclaration = 249,
+        ImportClause = 250,
+        NamespaceImport = 251,
+        NamedImports = 252,
+        ImportSpecifier = 253,
+        ExportAssignment = 254,
+        ExportDeclaration = 255,
+        NamedExports = 256,
+        ExportSpecifier = 257,
+        MissingDeclaration = 258,
+        ExternalModuleReference = 259,
+        JsxElement = 260,
+        JsxSelfClosingElement = 261,
+        JsxOpeningElement = 262,
+        JsxClosingElement = 263,
+        JsxFragment = 264,
+        JsxOpeningFragment = 265,
+        JsxClosingFragment = 266,
+        JsxAttribute = 267,
+        JsxAttributes = 268,
+        JsxSpreadAttribute = 269,
+        JsxExpression = 270,
+        CaseClause = 271,
+        DefaultClause = 272,
+        HeritageClause = 273,
+        CatchClause = 274,
+        PropertyAssignment = 275,
+        ShorthandPropertyAssignment = 276,
+        SpreadAssignment = 277,
+        EnumMember = 278,
+        SourceFile = 279,
+        Bundle = 280,
+        UnparsedSource = 281,
+        InputFiles = 282,
+        JSDocTypeExpression = 283,
+        JSDocAllType = 284,
+        JSDocUnknownType = 285,
+        JSDocNullableType = 286,
+        JSDocNonNullableType = 287,
+        JSDocOptionalType = 288,
+        JSDocFunctionType = 289,
+        JSDocVariadicType = 290,
+        JSDocComment = 291,
+        JSDocTypeLiteral = 292,
+        JSDocSignature = 293,
+        JSDocTag = 294,
+        JSDocAugmentsTag = 295,
+        JSDocClassTag = 296,
+        JSDocCallbackTag = 297,
+        JSDocEnumTag = 298,
+        JSDocParameterTag = 299,
+        JSDocReturnTag = 300,
+        JSDocThisTag = 301,
+        JSDocTypeTag = 302,
+        JSDocTemplateTag = 303,
+        JSDocTypedefTag = 304,
+        JSDocPropertyTag = 305,
+        SyntaxList = 306,
+        NotEmittedStatement = 307,
+        PartiallyEmittedExpression = 308,
+        CommaListExpression = 309,
+        MergeDeclarationMarker = 310,
+        EndOfDeclarationMarker = 311,
+        Count = 312,
+        FirstAssignment = 59,
+        LastAssignment = 71,
+        FirstCompoundAssignment = 60,
+        LastCompoundAssignment = 71,
+        FirstReservedWord = 73,
+        LastReservedWord = 108,
+        FirstKeyword = 73,
+        LastKeyword = 147,
+        FirstFutureReservedWord = 109,
+        LastFutureReservedWord = 117,
+        FirstTypeNode = 163,
+        LastTypeNode = 183,
+        FirstPunctuation = 18,
+        LastPunctuation = 71,
+        FirstToken = 0,
+        LastToken = 147,
+        FirstTriviaToken = 2,
+        LastTriviaToken = 7,
+        FirstLiteralToken = 8,
+        LastLiteralToken = 14,
+        FirstTemplateToken = 14,
+        LastTemplateToken = 17,
+        FirstBinaryOperator = 28,
+        LastBinaryOperator = 71,
+        FirstNode = 148,
+        FirstJSDocNode = 283,
+        LastJSDocNode = 305,
+        FirstJSDocTagNode = 294,
+        LastJSDocTagNode = 305
+    }
+    enum NodeFlags {
+        None = 0,
+        Let = 1,
+        Const = 2,
+        NestedNamespace = 4,
+        Synthesized = 8,
+        Namespace = 16,
+        ExportContext = 32,
+        ContainsThis = 64,
+        HasImplicitReturn = 128,
+        HasExplicitReturn = 256,
+        GlobalAugmentation = 512,
+        HasAsyncFunctions = 1024,
+        DisallowInContext = 2048,
+        YieldContext = 4096,
+        DecoratorContext = 8192,
+        AwaitContext = 16384,
+        ThisNodeHasError = 32768,
+        JavaScriptFile = 65536,
+        ThisNodeOrAnySubNodesHasError = 131072,
+        HasAggregatedChildData = 262144,
+        JSDoc = 2097152,
+        JsonFile = 16777216,
+        BlockScoped = 3,
+        ReachabilityCheckFlags = 384,
+        ReachabilityAndEmitFlags = 1408,
+        ContextFlags = 12679168,
+        TypeExcludesFlags = 20480
+    }
+    enum ModifierFlags {
+        None = 0,
+        Export = 1,
+        Ambient = 2,
+        Public = 4,
+        Private = 8,
+        Protected = 16,
+        Static = 32,
+        Readonly = 64,
+        Abstract = 128,
+        Async = 256,
+        Default = 512,
+        Const = 2048,
+        HasComputedFlags = 536870912,
+        AccessibilityModifier = 28,
+        ParameterPropertyModifier = 92,
+        NonPublicAccessibilityModifier = 24,
+        TypeScriptModifier = 2270,
+        ExportDefault = 513,
+        All = 3071
+    }
+    enum JsxFlags {
+        None = 0,
+        /** An element from a named property of the JSX.IntrinsicElements interface */
+        IntrinsicNamedElement = 1,
+        /** An element inferred from the string index signature of the JSX.IntrinsicElements interface */
+        IntrinsicIndexedElement = 2,
+        IntrinsicElement = 3
+    }
+    interface Node extends TextRange {
+        kind: SyntaxKind;
+        flags: NodeFlags;
+        decorators?: NodeArray<Decorator>;
+        modifiers?: ModifiersArray;
+        parent: Node;
+    }
+    interface JSDocContainer {
+    }
+    type HasJSDoc = ParameterDeclaration | CallSignatureDeclaration | ConstructSignatureDeclaration | MethodSignature | PropertySignature | ArrowFunction | ParenthesizedExpression | SpreadAssignment | ShorthandPropertyAssignment | PropertyAssignment | FunctionExpression | LabeledStatement | ExpressionStatement | VariableStatement | FunctionDeclaration | ConstructorDeclaration | MethodDeclaration | PropertyDeclaration | AccessorDeclaration | ClassLikeDeclaration | InterfaceDeclaration | TypeAliasDeclaration | EnumMember | EnumDeclaration | ModuleDeclaration | ImportEqualsDeclaration | IndexSignatureDeclaration | FunctionTypeNode | ConstructorTypeNode | JSDocFunctionType | ExportDeclaration | EndOfFileToken;
+    type HasType = SignatureDeclaration | VariableDeclaration | ParameterDeclaration | PropertySignature | PropertyDeclaration | TypePredicateNode | ParenthesizedTypeNode | TypeOperatorNode | MappedTypeNode | AssertionExpression | TypeAliasDeclaration | JSDocTypeExpression | JSDocNonNullableType | JSDocNullableType | JSDocOptionalType | JSDocVariadicType;
+    type HasInitializer = HasExpressionInitializer | ForStatement | ForInStatement | ForOfStatement | JsxAttribute;
+    type HasExpressionInitializer = VariableDeclaration | ParameterDeclaration | BindingElement | PropertySignature | PropertyDeclaration | PropertyAssignment | EnumMember;
+    interface NodeArray<T extends Node> extends ReadonlyArray<T>, TextRange {
+        hasTrailingComma?: boolean;
+    }
+    interface Token<TKind extends SyntaxKind> extends Node {
+        kind: TKind;
+    }
+    type DotDotDotToken = Token<SyntaxKind.DotDotDotToken>;
+    type QuestionToken = Token<SyntaxKind.QuestionToken>;
+    type ExclamationToken = Token<SyntaxKind.ExclamationToken>;
+    type ColonToken = Token<SyntaxKind.ColonToken>;
+    type EqualsToken = Token<SyntaxKind.EqualsToken>;
+    type AsteriskToken = Token<SyntaxKind.AsteriskToken>;
+    type EqualsGreaterThanToken = Token<SyntaxKind.EqualsGreaterThanToken>;
+    type EndOfFileToken = Token<SyntaxKind.EndOfFileToken> & JSDocContainer;
+    type ReadonlyToken = Token<SyntaxKind.ReadonlyKeyword>;
+    type AwaitKeywordToken = Token<SyntaxKind.AwaitKeyword>;
+    type PlusToken = Token<SyntaxKind.PlusToken>;
+    type MinusToken = Token<SyntaxKind.MinusToken>;
+    type Modifier = Token<SyntaxKind.AbstractKeyword> | Token<SyntaxKind.AsyncKeyword> | Token<SyntaxKind.ConstKeyword> | Token<SyntaxKind.DeclareKeyword> | Token<SyntaxKind.DefaultKeyword> | Token<SyntaxKind.ExportKeyword> | Token<SyntaxKind.PublicKeyword> | Token<SyntaxKind.PrivateKeyword> | Token<SyntaxKind.ProtectedKeyword> | Token<SyntaxKind.ReadonlyKeyword> | Token<SyntaxKind.StaticKeyword>;
+    type ModifiersArray = NodeArray<Modifier>;
+    interface Identifier extends PrimaryExpression, Declaration {
+        kind: SyntaxKind.Identifier;
+        /**
+         * Prefer to use `id.unescapedText`. (Note: This is available only in services, not internally to the TypeScript compiler.)
+         * Text of identifier, but if the identifier begins with two underscores, this will begin with three.
+         */
+        escapedText: __String;
+        originalKeywordKind?: SyntaxKind;
+        isInJSDocNamespace?: boolean;
+    }
+    interface TransientIdentifier extends Identifier {
+        resolvedSymbol: Symbol;
+    }
+    interface QualifiedName extends Node {
+        kind: SyntaxKind.QualifiedName;
+        left: EntityName;
+        right: Identifier;
+    }
+    type EntityName = Identifier | QualifiedName;
+    type PropertyName = Identifier | StringLiteral | NumericLiteral | ComputedPropertyName;
+    type DeclarationName = Identifier | StringLiteralLike | NumericLiteral | ComputedPropertyName | BindingPattern;
+    interface Declaration extends Node {
+        _declarationBrand: any;
+    }
+    interface NamedDeclaration extends Declaration {
+        name?: DeclarationName;
+    }
+    interface DeclarationStatement extends NamedDeclaration, Statement {
+        name?: Identifier | StringLiteral | NumericLiteral;
+    }
+    interface ComputedPropertyName extends Node {
+        parent: Declaration;
+        kind: SyntaxKind.ComputedPropertyName;
+        expression: Expression;
+    }
+    interface Decorator extends Node {
+        kind: SyntaxKind.Decorator;
+        parent: NamedDeclaration;
+        expression: LeftHandSideExpression;
+    }
+    interface TypeParameterDeclaration extends NamedDeclaration {
+        kind: SyntaxKind.TypeParameter;
+        parent: DeclarationWithTypeParameterChildren | InferTypeNode;
+        name: Identifier;
+        /** Note: Consider calling `getEffectiveConstraintOfTypeParameter` */
+        constraint?: TypeNode;
+        default?: TypeNode;
+        expression?: Expression;
+    }
+    interface SignatureDeclarationBase extends NamedDeclaration, JSDocContainer {
+        kind: SignatureDeclaration["kind"];
+        name?: PropertyName;
+        typeParameters?: NodeArray<TypeParameterDeclaration>;
+        parameters: NodeArray<ParameterDeclaration>;
+        type?: TypeNode;
+    }
+    type SignatureDeclaration = CallSignatureDeclaration | ConstructSignatureDeclaration | MethodSignature | IndexSignatureDeclaration | FunctionTypeNode | ConstructorTypeNode | JSDocFunctionType | FunctionDeclaration | MethodDeclaration | ConstructorDeclaration | AccessorDeclaration | FunctionExpression | ArrowFunction;
+    interface CallSignatureDeclaration extends SignatureDeclarationBase, TypeElement {
+        kind: SyntaxKind.CallSignature;
+    }
+    interface ConstructSignatureDeclaration extends SignatureDeclarationBase, TypeElement {
+        kind: SyntaxKind.ConstructSignature;
+    }
+    type BindingName = Identifier | BindingPattern;
+    interface VariableDeclaration extends NamedDeclaration {
+        kind: SyntaxKind.VariableDeclaration;
+        parent: VariableDeclarationList | CatchClause;
+        name: BindingName;
+        exclamationToken?: ExclamationToken;
+        type?: TypeNode;
+        initializer?: Expression;
+    }
+    interface VariableDeclarationList extends Node {
+        kind: SyntaxKind.VariableDeclarationList;
+        parent: VariableStatement | ForStatement | ForOfStatement | ForInStatement;
+        declarations: NodeArray<VariableDeclaration>;
+    }
+    interface ParameterDeclaration extends NamedDeclaration, JSDocContainer {
+        kind: SyntaxKind.Parameter;
+        parent: SignatureDeclaration;
+        dotDotDotToken?: DotDotDotToken;
+        name: BindingName;
+        questionToken?: QuestionToken;
+        type?: TypeNode;
+        initializer?: Expression;
+    }
+    interface BindingElement extends NamedDeclaration {
+        kind: SyntaxKind.BindingElement;
+        parent: BindingPattern;
+        propertyName?: PropertyName;
+        dotDotDotToken?: DotDotDotToken;
+        name: BindingName;
+        initializer?: Expression;
+    }
+    interface PropertySignature extends TypeElement, JSDocContainer {
+        kind: SyntaxKind.PropertySignature;
+        name: PropertyName;
+        questionToken?: QuestionToken;
+        type?: TypeNode;
+        initializer?: Expression;
+    }
+    interface PropertyDeclaration extends ClassElement, JSDocContainer {
+        kind: SyntaxKind.PropertyDeclaration;
+        parent: ClassLikeDeclaration;
+        name: PropertyName;
+        questionToken?: QuestionToken;
+        exclamationToken?: ExclamationToken;
+        type?: TypeNode;
+        initializer?: Expression;
+    }
+    interface ObjectLiteralElement extends NamedDeclaration {
+        _objectLiteralBrandBrand: any;
+        name?: PropertyName;
+    }
+    /** Unlike ObjectLiteralElement, excludes JSXAttribute and JSXSpreadAttribute. */
+    type ObjectLiteralElementLike = PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment | MethodDeclaration | AccessorDeclaration;
+    interface PropertyAssignment extends ObjectLiteralElement, JSDocContainer {
+        parent: ObjectLiteralExpression;
+        kind: SyntaxKind.PropertyAssignment;
+        name: PropertyName;
+        questionToken?: QuestionToken;
+        initializer: Expression;
+    }
+    interface ShorthandPropertyAssignment extends ObjectLiteralElement, JSDocContainer {
+        parent: ObjectLiteralExpression;
+        kind: SyntaxKind.ShorthandPropertyAssignment;
+        name: Identifier;
+        questionToken?: QuestionToken;
+        exclamationToken?: ExclamationToken;
+        equalsToken?: Token<SyntaxKind.EqualsToken>;
+        objectAssignmentInitializer?: Expression;
+    }
+    interface SpreadAssignment extends ObjectLiteralElement, JSDocContainer {
+        parent: ObjectLiteralExpression;
+        kind: SyntaxKind.SpreadAssignment;
+        expression: Expression;
+    }
+    type VariableLikeDeclaration = VariableDeclaration | ParameterDeclaration | BindingElement | PropertyDeclaration | PropertyAssignment | PropertySignature | JsxAttribute | ShorthandPropertyAssignment | EnumMember | JSDocPropertyTag | JSDocParameterTag;
+    interface PropertyLikeDeclaration extends NamedDeclaration {
+        name: PropertyName;
+    }
+    interface ObjectBindingPattern extends Node {
+        kind: SyntaxKind.ObjectBindingPattern;
+        parent: VariableDeclaration | ParameterDeclaration | BindingElement;
+        elements: NodeArray<BindingElement>;
+    }
+    interface ArrayBindingPattern extends Node {
+        kind: SyntaxKind.ArrayBindingPattern;
+        parent: VariableDeclaration | ParameterDeclaration | BindingElement;
+        elements: NodeArray<ArrayBindingElement>;
+    }
+    type BindingPattern = ObjectBindingPattern | ArrayBindingPattern;
+    type ArrayBindingElement = BindingElement | OmittedExpression;
+    /**
+     * Several node kinds share function-like features such as a signature,
+     * a name, and a body. These nodes should extend FunctionLikeDeclarationBase.
+     * Examples:
+     * - FunctionDeclaration
+     * - MethodDeclaration
+     * - AccessorDeclaration
+     */
+    interface FunctionLikeDeclarationBase extends SignatureDeclarationBase {
+        _functionLikeDeclarationBrand: any;
+        asteriskToken?: AsteriskToken;
+        questionToken?: QuestionToken;
+        exclamationToken?: ExclamationToken;
+        body?: Block | Expression;
+    }
+    type FunctionLikeDeclaration = FunctionDeclaration | MethodDeclaration | GetAccessorDeclaration | SetAccessorDeclaration | ConstructorDeclaration | FunctionExpression | ArrowFunction;
+    /** @deprecated Use SignatureDeclaration */
+    type FunctionLike = SignatureDeclaration;
+    interface FunctionDeclaration extends FunctionLikeDeclarationBase, DeclarationStatement {
+        kind: SyntaxKind.FunctionDeclaration;
+        name?: Identifier;
+        body?: FunctionBody;
+    }
+    interface MethodSignature extends SignatureDeclarationBase, TypeElement {
+        kind: SyntaxKind.MethodSignature;
+        parent: ObjectTypeDeclaration;
+        name: PropertyName;
+    }
+    interface MethodDeclaration extends FunctionLikeDeclarationBase, ClassElement, ObjectLiteralElement, JSDocContainer {
+        kind: SyntaxKind.MethodDeclaration;
+        parent: ClassLikeDeclaration | ObjectLiteralExpression;
+        name: PropertyName;
+        body?: FunctionBody;
+    }
+    interface ConstructorDeclaration extends FunctionLikeDeclarationBase, ClassElement, JSDocContainer {
+        kind: SyntaxKind.Constructor;
+        parent: ClassLikeDeclaration;
+        body?: FunctionBody;
+    }
+    /** For when we encounter a semicolon in a class declaration. ES6 allows these as class elements. */
+    interface SemicolonClassElement extends ClassElement {
+        kind: SyntaxKind.SemicolonClassElement;
+        parent: ClassLikeDeclaration;
+    }
+    interface GetAccessorDeclaration extends FunctionLikeDeclarationBase, ClassElement, ObjectLiteralElement, JSDocContainer {
+        kind: SyntaxKind.GetAccessor;
+        parent: ClassLikeDeclaration | ObjectLiteralExpression;
+        name: PropertyName;
+        body?: FunctionBody;
+    }
+    interface SetAccessorDeclaration extends FunctionLikeDeclarationBase, ClassElement, ObjectLiteralElement, JSDocContainer {
+        kind: SyntaxKind.SetAccessor;
+        parent: ClassLikeDeclaration | ObjectLiteralExpression;
+        name: PropertyName;
+        body?: FunctionBody;
+    }
+    type AccessorDeclaration = GetAccessorDeclaration | SetAccessorDeclaration;
+    interface IndexSignatureDeclaration extends SignatureDeclarationBase, ClassElement, TypeElement {
+        kind: SyntaxKind.IndexSignature;
+        parent: ObjectTypeDeclaration;
+    }
+    interface TypeNode extends Node {
+        _typeNodeBrand: any;
+    }
+    interface KeywordTypeNode extends TypeNode {
+        kind: SyntaxKind.AnyKeyword | SyntaxKind.UnknownKeyword | SyntaxKind.NumberKeyword | SyntaxKind.BigIntKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.StringKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.ThisKeyword | SyntaxKind.VoidKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.NullKeyword | SyntaxKind.NeverKeyword;
+    }
+    interface ImportTypeNode extends NodeWithTypeArguments {
+        kind: SyntaxKind.ImportType;
+        isTypeOf?: boolean;
+        argument: TypeNode;
+        qualifier?: EntityName;
+    }
+    interface ThisTypeNode extends TypeNode {
+        kind: SyntaxKind.ThisType;
+    }
+    type FunctionOrConstructorTypeNode = FunctionTypeNode | ConstructorTypeNode;
+    interface FunctionOrConstructorTypeNodeBase extends TypeNode, SignatureDeclarationBase {
+        kind: SyntaxKind.FunctionType | SyntaxKind.ConstructorType;
+        type: TypeNode;
+    }
+    interface FunctionTypeNode extends FunctionOrConstructorTypeNodeBase {
+        kind: SyntaxKind.FunctionType;
+    }
+    interface ConstructorTypeNode extends FunctionOrConstructorTypeNodeBase {
+        kind: SyntaxKind.ConstructorType;
+    }
+    interface NodeWithTypeArguments extends TypeNode {
+        typeArguments?: NodeArray<TypeNode>;
+    }
+    type TypeReferenceType = TypeReferenceNode | ExpressionWithTypeArguments;
+    interface TypeReferenceNode extends NodeWithTypeArguments {
+        kind: SyntaxKind.TypeReference;
+        typeName: EntityName;
+    }
+    interface TypePredicateNode extends TypeNode {
+        kind: SyntaxKind.TypePredicate;
+        parent: SignatureDeclaration | JSDocTypeExpression;
+        parameterName: Identifier | ThisTypeNode;
+        type: TypeNode;
+    }
+    interface TypeQueryNode extends TypeNode {
+        kind: SyntaxKind.TypeQuery;
+        exprName: EntityName;
+    }
+    interface TypeLiteralNode extends TypeNode, Declaration {
+        kind: SyntaxKind.TypeLiteral;
+        members: NodeArray<TypeElement>;
+    }
+    interface ArrayTypeNode extends TypeNode {
+        kind: SyntaxKind.ArrayType;
+        elementType: TypeNode;
+    }
+    interface TupleTypeNode extends TypeNode {
+        kind: SyntaxKind.TupleType;
+        elementTypes: NodeArray<TypeNode>;
+    }
+    interface OptionalTypeNode extends TypeNode {
+        kind: SyntaxKind.OptionalType;
+        type: TypeNode;
+    }
+    interface RestTypeNode extends TypeNode {
+        kind: SyntaxKind.RestType;
+        type: TypeNode;
+    }
+    type UnionOrIntersectionTypeNode = UnionTypeNode | IntersectionTypeNode;
+    interface UnionTypeNode extends TypeNode {
+        kind: SyntaxKind.UnionType;
+        types: NodeArray<TypeNode>;
+    }
+    interface IntersectionTypeNode extends TypeNode {
+        kind: SyntaxKind.IntersectionType;
+        types: NodeArray<TypeNode>;
+    }
+    interface ConditionalTypeNode extends TypeNode {
+        kind: SyntaxKind.ConditionalType;
+        checkType: TypeNode;
+        extendsType: TypeNode;
+        trueType: TypeNode;
+        falseType: TypeNode;
+    }
+    interface InferTypeNode extends TypeNode {
+        kind: SyntaxKind.InferType;
+        typeParameter: TypeParameterDeclaration;
+    }
+    interface ParenthesizedTypeNode extends TypeNode {
+        kind: SyntaxKind.ParenthesizedType;
+        type: TypeNode;
+    }
+    interface TypeOperatorNode extends TypeNode {
+        kind: SyntaxKind.TypeOperator;
+        operator: SyntaxKind.KeyOfKeyword | SyntaxKind.UniqueKeyword;
+        type: TypeNode;
+    }
+    interface IndexedAccessTypeNode extends TypeNode {
+        kind: SyntaxKind.IndexedAccessType;
+        objectType: TypeNode;
+        indexType: TypeNode;
+    }
+    interface MappedTypeNode extends TypeNode, Declaration {
+        kind: SyntaxKind.MappedType;
+        readonlyToken?: ReadonlyToken | PlusToken | MinusToken;
+        typeParameter: TypeParameterDeclaration;
+        questionToken?: QuestionToken | PlusToken | MinusToken;
+        type?: TypeNode;
+    }
+    interface LiteralTypeNode extends TypeNode {
+        kind: SyntaxKind.LiteralType;
+        literal: BooleanLiteral | LiteralExpression | PrefixUnaryExpression;
+    }
+    interface StringLiteral extends LiteralExpression {
+        kind: SyntaxKind.StringLiteral;
+    }
+    type StringLiteralLike = StringLiteral | NoSubstitutionTemplateLiteral;
+    interface Expression extends Node {
+        _expressionBrand: any;
+    }
+    interface OmittedExpression extends Expression {
+        kind: SyntaxKind.OmittedExpression;
+    }
+    interface PartiallyEmittedExpression extends LeftHandSideExpression {
+        kind: SyntaxKind.PartiallyEmittedExpression;
+        expression: Expression;
+    }
+    interface UnaryExpression extends Expression {
+        _unaryExpressionBrand: any;
+    }
+    /** Deprecated, please use UpdateExpression */
+    type IncrementExpression = UpdateExpression;
+    interface UpdateExpression extends UnaryExpression {
+        _updateExpressionBrand: any;
+    }
+    type PrefixUnaryOperator = SyntaxKind.PlusPlusToken | SyntaxKind.MinusMinusToken | SyntaxKind.PlusToken | SyntaxKind.MinusToken | SyntaxKind.TildeToken | SyntaxKind.ExclamationToken;
+    interface PrefixUnaryExpression extends UpdateExpression {
+        kind: SyntaxKind.PrefixUnaryExpression;
+        operator: PrefixUnaryOperator;
+        operand: UnaryExpression;
+    }
+    type PostfixUnaryOperator = SyntaxKind.PlusPlusToken | SyntaxKind.MinusMinusToken;
+    interface PostfixUnaryExpression extends UpdateExpression {
+        kind: SyntaxKind.PostfixUnaryExpression;
+        operand: LeftHandSideExpression;
+        operator: PostfixUnaryOperator;
+    }
+    interface LeftHandSideExpression extends UpdateExpression {
+        _leftHandSideExpressionBrand: any;
+    }
+    interface MemberExpression extends LeftHandSideExpression {
+        _memberExpressionBrand: any;
+    }
+    interface PrimaryExpression extends MemberExpression {
+        _primaryExpressionBrand: any;
+    }
+    interface NullLiteral extends PrimaryExpression, TypeNode {
+        kind: SyntaxKind.NullKeyword;
+    }
+    interface BooleanLiteral extends PrimaryExpression, TypeNode {
+        kind: SyntaxKind.TrueKeyword | SyntaxKind.FalseKeyword;
+    }
+    interface ThisExpression extends PrimaryExpression, KeywordTypeNode {
+        kind: SyntaxKind.ThisKeyword;
+    }
+    interface SuperExpression extends PrimaryExpression {
+        kind: SyntaxKind.SuperKeyword;
+    }
+    interface ImportExpression extends PrimaryExpression {
+        kind: SyntaxKind.ImportKeyword;
+    }
+    interface DeleteExpression extends UnaryExpression {
+        kind: SyntaxKind.DeleteExpression;
+        expression: UnaryExpression;
+    }
+    interface TypeOfExpression extends UnaryExpression {
+        kind: SyntaxKind.TypeOfExpression;
+        expression: UnaryExpression;
+    }
+    interface VoidExpression extends UnaryExpression {
+        kind: SyntaxKind.VoidExpression;
+        expression: UnaryExpression;
+    }
+    interface AwaitExpression extends UnaryExpression {
+        kind: SyntaxKind.AwaitExpression;
+        expression: UnaryExpression;
+    }
+    interface YieldExpression extends Expression {
+        kind: SyntaxKind.YieldExpression;
+        asteriskToken?: AsteriskToken;
+        expression?: Expression;
+    }
+    interface SyntheticExpression extends Expression {
+        kind: SyntaxKind.SyntheticExpression;
+        isSpread: boolean;
+        type: Type;
+    }
+    type ExponentiationOperator = SyntaxKind.AsteriskAsteriskToken;
+    type MultiplicativeOperator = SyntaxKind.AsteriskToken | SyntaxKind.SlashToken | SyntaxKind.PercentToken;
+    type MultiplicativeOperatorOrHigher = ExponentiationOperator | MultiplicativeOperator;
+    type AdditiveOperator = SyntaxKind.PlusToken | SyntaxKind.MinusToken;
+    type AdditiveOperatorOrHigher = MultiplicativeOperatorOrHigher | AdditiveOperator;
+    type ShiftOperator = SyntaxKind.LessThanLessThanToken | SyntaxKind.GreaterThanGreaterThanToken | SyntaxKind.GreaterThanGreaterThanGreaterThanToken;
+    type ShiftOperatorOrHigher = AdditiveOperatorOrHigher | ShiftOperator;
+    type RelationalOperator = SyntaxKind.LessThanToken | SyntaxKind.LessThanEqualsToken | SyntaxKind.GreaterThanToken | SyntaxKind.GreaterThanEqualsToken | SyntaxKind.InstanceOfKeyword | SyntaxKind.InKeyword;
+    type RelationalOperatorOrHigher = ShiftOperatorOrHigher | RelationalOperator;
+    type EqualityOperator = SyntaxKind.EqualsEqualsToken | SyntaxKind.EqualsEqualsEqualsToken | SyntaxKind.ExclamationEqualsEqualsToken | SyntaxKind.ExclamationEqualsToken;
+    type EqualityOperatorOrHigher = RelationalOperatorOrHigher | EqualityOperator;
+    type BitwiseOperator = SyntaxKind.AmpersandToken | SyntaxKind.BarToken | SyntaxKind.CaretToken;
+    type BitwiseOperatorOrHigher = EqualityOperatorOrHigher | BitwiseOperator;
+    type LogicalOperator = SyntaxKind.AmpersandAmpersandToken | SyntaxKind.BarBarToken;
+    type LogicalOperatorOrHigher = BitwiseOperatorOrHigher | LogicalOperator;
+    type CompoundAssignmentOperator = SyntaxKind.PlusEqualsToken | SyntaxKind.MinusEqualsToken | SyntaxKind.AsteriskAsteriskEqualsToken | SyntaxKind.AsteriskEqualsToken | SyntaxKind.SlashEqualsToken | SyntaxKind.PercentEqualsToken | SyntaxKind.AmpersandEqualsToken | SyntaxKind.BarEqualsToken | SyntaxKind.CaretEqualsToken | SyntaxKind.LessThanLessThanEqualsToken | SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken | SyntaxKind.GreaterThanGreaterThanEqualsToken;
+    type AssignmentOperator = SyntaxKind.EqualsToken | CompoundAssignmentOperator;
+    type AssignmentOperatorOrHigher = LogicalOperatorOrHigher | AssignmentOperator;
+    type BinaryOperator = AssignmentOperatorOrHigher | SyntaxKind.CommaToken;
+    type BinaryOperatorToken = Token<BinaryOperator>;
+    interface BinaryExpression extends Expression, Declaration {
+        kind: SyntaxKind.BinaryExpression;
+        left: Expression;
+        operatorToken: BinaryOperatorToken;
+        right: Expression;
+    }
+    type AssignmentOperatorToken = Token<AssignmentOperator>;
+    interface AssignmentExpression<TOperator extends AssignmentOperatorToken> extends BinaryExpression {
+        left: LeftHandSideExpression;
+        operatorToken: TOperator;
+    }
+    interface ObjectDestructuringAssignment extends AssignmentExpression<EqualsToken> {
+        left: ObjectLiteralExpression;
+    }
+    interface ArrayDestructuringAssignment extends AssignmentExpression<EqualsToken> {
+        left: ArrayLiteralExpression;
+    }
+    type DestructuringAssignment = ObjectDestructuringAssignment | ArrayDestructuringAssignment;
+    type BindingOrAssignmentElement = VariableDeclaration | ParameterDeclaration | BindingElement | PropertyAssignment | ShorthandPropertyAssignment | SpreadAssignment | OmittedExpression | SpreadElement | ArrayLiteralExpression | ObjectLiteralExpression | AssignmentExpression<EqualsToken> | Identifier | PropertyAccessExpression | ElementAccessExpression;
+    type BindingOrAssignmentElementRestIndicator = DotDotDotToken | SpreadElement | SpreadAssignment;
+    type BindingOrAssignmentElementTarget = BindingOrAssignmentPattern | Identifier | PropertyAccessExpression | ElementAccessExpression | OmittedExpression;
+    type ObjectBindingOrAssignmentPattern = ObjectBindingPattern | ObjectLiteralExpression;
+    type ArrayBindingOrAssignmentPattern = ArrayBindingPattern | ArrayLiteralExpression;
+    type AssignmentPattern = ObjectLiteralExpression | ArrayLiteralExpression;
+    type BindingOrAssignmentPattern = ObjectBindingOrAssignmentPattern | ArrayBindingOrAssignmentPattern;
+    interface ConditionalExpression extends Expression {
+        kind: SyntaxKind.ConditionalExpression;
+        condition: Expression;
+        questionToken: QuestionToken;
+        whenTrue: Expression;
+        colonToken: ColonToken;
+        whenFalse: Expression;
+    }
+    type FunctionBody = Block;
+    type ConciseBody = FunctionBody | Expression;
+    interface FunctionExpression extends PrimaryExpression, FunctionLikeDeclarationBase, JSDocContainer {
+        kind: SyntaxKind.FunctionExpression;
+        name?: Identifier;
+        body: FunctionBody;
+    }
+    interface ArrowFunction extends Expression, FunctionLikeDeclarationBase, JSDocContainer {
+        kind: SyntaxKind.ArrowFunction;
+        equalsGreaterThanToken: EqualsGreaterThanToken;
+        body: ConciseBody;
+        name: never;
+    }
+    interface LiteralLikeNode extends Node {
+        text: string;
+        isUnterminated?: boolean;
+        hasExtendedUnicodeEscape?: boolean;
+    }
+    interface LiteralExpression extends LiteralLikeNode, PrimaryExpression {
+        _literalExpressionBrand: any;
+    }
+    interface RegularExpressionLiteral extends LiteralExpression {
+        kind: SyntaxKind.RegularExpressionLiteral;
+    }
+    interface NoSubstitutionTemplateLiteral extends LiteralExpression {
+        kind: SyntaxKind.NoSubstitutionTemplateLiteral;
+    }
+    interface NumericLiteral extends LiteralExpression {
+        kind: SyntaxKind.NumericLiteral;
+    }
+    interface BigIntLiteral extends LiteralExpression {
+        kind: SyntaxKind.BigIntLiteral;
+    }
+    interface TemplateHead extends LiteralLikeNode {
+        kind: SyntaxKind.TemplateHead;
+        parent: TemplateExpression;
+    }
+    interface TemplateMiddle extends LiteralLikeNode {
+        kind: SyntaxKind.TemplateMiddle;
+        parent: TemplateSpan;
+    }
+    interface TemplateTail extends LiteralLikeNode {
+        kind: SyntaxKind.TemplateTail;
+        parent: TemplateSpan;
+    }
+    type TemplateLiteral = TemplateExpression | NoSubstitutionTemplateLiteral;
+    interface TemplateExpression extends PrimaryExpression {
+        kind: SyntaxKind.TemplateExpression;
+        head: TemplateHead;
+        templateSpans: NodeArray<TemplateSpan>;
+    }
+    interface TemplateSpan extends Node {
+        kind: SyntaxKind.TemplateSpan;
+        parent: TemplateExpression;
+        expression: Expression;
+        literal: TemplateMiddle | TemplateTail;
+    }
+    interface ParenthesizedExpression extends PrimaryExpression, JSDocContainer {
+        kind: SyntaxKind.ParenthesizedExpression;
+        expression: Expression;
+    }
+    interface ArrayLiteralExpression extends PrimaryExpression {
+        kind: SyntaxKind.ArrayLiteralExpression;
+        elements: NodeArray<Expression>;
+    }
+    interface SpreadElement extends Expression {
+        kind: SyntaxKind.SpreadElement;
+        parent: ArrayLiteralExpression | CallExpression | NewExpression;
+        expression: Expression;
+    }
+    /**
+     * This interface is a base interface for ObjectLiteralExpression and JSXAttributes to extend from. JSXAttributes is similar to
+     * ObjectLiteralExpression in that it contains array of properties; however, JSXAttributes' properties can only be
+     * JSXAttribute or JSXSpreadAttribute. ObjectLiteralExpression, on the other hand, can only have properties of type
+     * ObjectLiteralElement (e.g. PropertyAssignment, ShorthandPropertyAssignment etc.)
+     */
+    interface ObjectLiteralExpressionBase<T extends ObjectLiteralElement> extends PrimaryExpression, Declaration {
+        properties: NodeArray<T>;
+    }
+    interface ObjectLiteralExpression extends ObjectLiteralExpressionBase<ObjectLiteralElementLike> {
+        kind: SyntaxKind.ObjectLiteralExpression;
+    }
+    type EntityNameExpression = Identifier | PropertyAccessEntityNameExpression;
+    type EntityNameOrEntityNameExpression = EntityName | EntityNameExpression;
+    interface PropertyAccessExpression extends MemberExpression, NamedDeclaration {
+        kind: SyntaxKind.PropertyAccessExpression;
+        expression: LeftHandSideExpression;
+        name: Identifier;
+    }
+    interface SuperPropertyAccessExpression extends PropertyAccessExpression {
+        expression: SuperExpression;
+    }
+    /** Brand for a PropertyAccessExpression which, like a QualifiedName, consists of a sequence of identifiers separated by dots. */
+    interface PropertyAccessEntityNameExpression extends PropertyAccessExpression {
+        _propertyAccessExpressionLikeQualifiedNameBrand?: any;
+        expression: EntityNameExpression;
+    }
+    interface ElementAccessExpression extends MemberExpression {
+        kind: SyntaxKind.ElementAccessExpression;
+        expression: LeftHandSideExpression;
+        argumentExpression: Expression;
+    }
+    interface SuperElementAccessExpression extends ElementAccessExpression {
+        expression: SuperExpression;
+    }
+    type SuperProperty = SuperPropertyAccessExpression | SuperElementAccessExpression;
+    interface CallExpression extends LeftHandSideExpression, Declaration {
+        kind: SyntaxKind.CallExpression;
+        expression: LeftHandSideExpression;
+        typeArguments?: NodeArray<TypeNode>;
+        arguments: NodeArray<Expression>;
+    }
+    interface SuperCall extends CallExpression {
+        expression: SuperExpression;
+    }
+    interface ImportCall extends CallExpression {
+        expression: ImportExpression;
+    }
+    interface ExpressionWithTypeArguments extends NodeWithTypeArguments {
+        kind: SyntaxKind.ExpressionWithTypeArguments;
+        parent: HeritageClause | JSDocAugmentsTag;
+        expression: LeftHandSideExpression;
+    }
+    interface NewExpression extends PrimaryExpression, Declaration {
+        kind: SyntaxKind.NewExpression;
+        expression: LeftHandSideExpression;
+        typeArguments?: NodeArray<TypeNode>;
+        arguments?: NodeArray<Expression>;
+    }
+    interface TaggedTemplateExpression extends MemberExpression {
+        kind: SyntaxKind.TaggedTemplateExpression;
+        tag: LeftHandSideExpression;
+        typeArguments?: NodeArray<TypeNode>;
+        template: TemplateLiteral;
+    }
+    type CallLikeExpression = CallExpression | NewExpression | TaggedTemplateExpression | Decorator | JsxOpeningLikeElement;
+    interface AsExpression extends Expression {
+        kind: SyntaxKind.AsExpression;
+        expression: Expression;
+        type: TypeNode;
+    }
+    interface TypeAssertion extends UnaryExpression {
+        kind: SyntaxKind.TypeAssertionExpression;
+        type: TypeNode;
+        expression: UnaryExpression;
+    }
+    type AssertionExpression = TypeAssertion | AsExpression;
+    interface NonNullExpression extends LeftHandSideExpression {
+        kind: SyntaxKind.NonNullExpression;
+        expression: Expression;
+    }
+    interface MetaProperty extends PrimaryExpression {
+        kind: SyntaxKind.MetaProperty;
+        keywordToken: SyntaxKind.NewKeyword | SyntaxKind.ImportKeyword;
+        name: Identifier;
+    }
+    interface JsxElement extends PrimaryExpression {
+        kind: SyntaxKind.JsxElement;
+        openingElement: JsxOpeningElement;
+        children: NodeArray<JsxChild>;
+        closingElement: JsxClosingElement;
+    }
+    type JsxOpeningLikeElement = JsxSelfClosingElement | JsxOpeningElement;
+    type JsxAttributeLike = JsxAttribute | JsxSpreadAttribute;
+    type JsxTagNameExpression = Identifier | ThisExpression | JsxTagNamePropertyAccess;
+    interface JsxTagNamePropertyAccess extends PropertyAccessExpression {
+        expression: JsxTagNameExpression;
+    }
+    interface JsxAttributes extends ObjectLiteralExpressionBase<JsxAttributeLike> {
+        parent: JsxOpeningLikeElement;
+    }
+    interface JsxOpeningElement extends Expression {
+        kind: SyntaxKind.JsxOpeningElement;
+        parent: JsxElement;
+        tagName: JsxTagNameExpression;
+        typeArguments?: NodeArray<TypeNode>;
+        attributes: JsxAttributes;
+    }
+    interface JsxSelfClosingElement extends PrimaryExpression {
+        kind: SyntaxKind.JsxSelfClosingElement;
+        tagName: JsxTagNameExpression;
+        typeArguments?: NodeArray<TypeNode>;
+        attributes: JsxAttributes;
+    }
+    interface JsxFragment extends PrimaryExpression {
+        kind: SyntaxKind.JsxFragment;
+        openingFragment: JsxOpeningFragment;
+        children: NodeArray<JsxChild>;
+        closingFragment: JsxClosingFragment;
+    }
+    interface JsxOpeningFragment extends Expression {
+        kind: SyntaxKind.JsxOpeningFragment;
+        parent: JsxFragment;
+    }
+    interface JsxClosingFragment extends Expression {
+        kind: SyntaxKind.JsxClosingFragment;
+        parent: JsxFragment;
+    }
+    interface JsxAttribute extends ObjectLiteralElement {
+        kind: SyntaxKind.JsxAttribute;
+        parent: JsxAttributes;
+        name: Identifier;
+        initializer?: StringLiteral | JsxExpression;
+    }
+    interface JsxSpreadAttribute extends ObjectLiteralElement {
+        kind: SyntaxKind.JsxSpreadAttribute;
+        parent: JsxAttributes;
+        expression: Expression;
+    }
+    interface JsxClosingElement extends Node {
+        kind: SyntaxKind.JsxClosingElement;
+        parent: JsxElement;
+        tagName: JsxTagNameExpression;
+    }
+    interface JsxExpression extends Expression {
+        kind: SyntaxKind.JsxExpression;
+        parent: JsxElement | JsxAttributeLike;
+        dotDotDotToken?: Token<SyntaxKind.DotDotDotToken>;
+        expression?: Expression;
+    }
+    interface JsxText extends Node {
+        kind: SyntaxKind.JsxText;
+        containsOnlyWhiteSpaces: boolean;
+        parent: JsxElement;
+    }
+    type JsxChild = JsxText | JsxExpression | JsxElement | JsxSelfClosingElement | JsxFragment;
+    interface Statement extends Node {
+        _statementBrand: any;
+    }
+    interface NotEmittedStatement extends Statement {
+        kind: SyntaxKind.NotEmittedStatement;
+    }
+    /**
+     * A list of comma-separated expressions. This node is only created by transformations.
+     */
+    interface CommaListExpression extends Expression {
+        kind: SyntaxKind.CommaListExpression;
+        elements: NodeArray<Expression>;
+    }
+    interface EmptyStatement extends Statement {
+        kind: SyntaxKind.EmptyStatement;
+    }
+    interface DebuggerStatement extends Statement {
+        kind: SyntaxKind.DebuggerStatement;
+    }
+    interface MissingDeclaration extends DeclarationStatement {
+        kind: SyntaxKind.MissingDeclaration;
+        name?: Identifier;
+    }
+    type BlockLike = SourceFile | Block | ModuleBlock | CaseOrDefaultClause;
+    interface Block extends Statement {
+        kind: SyntaxKind.Block;
+        statements: NodeArray<Statement>;
+    }
+    interface VariableStatement extends Statement, JSDocContainer {
+        kind: SyntaxKind.VariableStatement;
+        declarationList: VariableDeclarationList;
+    }
+    interface ExpressionStatement extends Statement, JSDocContainer {
+        kind: SyntaxKind.ExpressionStatement;
+        expression: Expression;
+    }
+    interface IfStatement extends Statement {
+        kind: SyntaxKind.IfStatement;
+        expression: Expression;
+        thenStatement: Statement;
+        elseStatement?: Statement;
+    }
+    interface IterationStatement extends Statement {
+        statement: Statement;
+    }
+    interface DoStatement extends IterationStatement {
+        kind: SyntaxKind.DoStatement;
+        expression: Expression;
+    }
+    interface WhileStatement extends IterationStatement {
+        kind: SyntaxKind.WhileStatement;
+        expression: Expression;
+    }
+    type ForInitializer = VariableDeclarationList | Expression;
+    interface ForStatement extends IterationStatement {
+        kind: SyntaxKind.ForStatement;
+        initializer?: ForInitializer;
+        condition?: Expression;
+        incrementor?: Expression;
+    }
+    type ForInOrOfStatement = ForInStatement | ForOfStatement;
+    interface ForInStatement extends IterationStatement {
+        kind: SyntaxKind.ForInStatement;
+        initializer: ForInitializer;
+        expression: Expression;
+    }
+    interface ForOfStatement extends IterationStatement {
+        kind: SyntaxKind.ForOfStatement;
+        awaitModifier?: AwaitKeywordToken;
+        initializer: ForInitializer;
+        expression: Expression;
+    }
+    interface BreakStatement extends Statement {
+        kind: SyntaxKind.BreakStatement;
+        label?: Identifier;
+    }
+    interface ContinueStatement extends Statement {
+        kind: SyntaxKind.ContinueStatement;
+        label?: Identifier;
+    }
+    type BreakOrContinueStatement = BreakStatement | ContinueStatement;
+    interface ReturnStatement extends Statement {
+        kind: SyntaxKind.ReturnStatement;
+        expression?: Expression;
+    }
+    interface WithStatement extends Statement {
+        kind: SyntaxKind.WithStatement;
+        expression: Expression;
+        statement: Statement;
+    }
+    interface SwitchStatement extends Statement {
+        kind: SyntaxKind.SwitchStatement;
+        expression: Expression;
+        caseBlock: CaseBlock;
+        possiblyExhaustive?: boolean;
+    }
+    interface CaseBlock extends Node {
+        kind: SyntaxKind.CaseBlock;
+        parent: SwitchStatement;
+        clauses: NodeArray<CaseOrDefaultClause>;
+    }
+    interface CaseClause extends Node {
+        kind: SyntaxKind.CaseClause;
+        parent: CaseBlock;
+        expression: Expression;
+        statements: NodeArray<Statement>;
+    }
+    interface DefaultClause extends Node {
+        kind: SyntaxKind.DefaultClause;
+        parent: CaseBlock;
+        statements: NodeArray<Statement>;
+    }
+    type CaseOrDefaultClause = CaseClause | DefaultClause;
+    interface LabeledStatement extends Statement, JSDocContainer {
+        kind: SyntaxKind.LabeledStatement;
+        label: Identifier;
+        statement: Statement;
+    }
+    interface ThrowStatement extends Statement {
+        kind: SyntaxKind.ThrowStatement;
+        expression?: Expression;
+    }
+    interface TryStatement extends Statement {
+        kind: SyntaxKind.TryStatement;
+        tryBlock: Block;
+        catchClause?: CatchClause;
+        finallyBlock?: Block;
+    }
+    interface CatchClause extends Node {
+        kind: SyntaxKind.CatchClause;
+        parent: TryStatement;
+        variableDeclaration?: VariableDeclaration;
+        block: Block;
+    }
+    type ObjectTypeDeclaration = ClassLikeDeclaration | InterfaceDeclaration | TypeLiteralNode;
+    type DeclarationWithTypeParameters = DeclarationWithTypeParameterChildren | JSDocTypedefTag | JSDocCallbackTag | JSDocSignature;
+    type DeclarationWithTypeParameterChildren = SignatureDeclaration | ClassLikeDeclaration | InterfaceDeclaration | TypeAliasDeclaration | JSDocTemplateTag;
+    interface ClassLikeDeclarationBase extends NamedDeclaration, JSDocContainer {
+        kind: SyntaxKind.ClassDeclaration | SyntaxKind.ClassExpression;
+        name?: Identifier;
+        typeParameters?: NodeArray<TypeParameterDeclaration>;
+        heritageClauses?: NodeArray<HeritageClause>;
+        members: NodeArray<ClassElement>;
+    }
+    interface ClassDeclaration extends ClassLikeDeclarationBase, DeclarationStatement {
+        kind: SyntaxKind.ClassDeclaration;
+        /** May be undefined in `export default class { ... }`. */
+        name?: Identifier;
+    }
+    interface ClassExpression extends ClassLikeDeclarationBase, PrimaryExpression {
+        kind: SyntaxKind.ClassExpression;
+    }
+    type ClassLikeDeclaration = ClassDeclaration | ClassExpression;
+    interface ClassElement extends NamedDeclaration {
+        _classElementBrand: any;
+        name?: PropertyName;
+    }
+    interface TypeElement extends NamedDeclaration {
+        _typeElementBrand: any;
+        name?: PropertyName;
+        questionToken?: QuestionToken;
+    }
+    interface InterfaceDeclaration extends DeclarationStatement, JSDocContainer {
+        kind: SyntaxKind.InterfaceDeclaration;
+        name: Identifier;
+        typeParameters?: NodeArray<TypeParameterDeclaration>;
+        heritageClauses?: NodeArray<HeritageClause>;
+        members: NodeArray<TypeElement>;
+    }
+    interface HeritageClause extends Node {
+        kind: SyntaxKind.HeritageClause;
+        parent: InterfaceDeclaration | ClassLikeDeclaration;
+        token: SyntaxKind.ExtendsKeyword | SyntaxKind.ImplementsKeyword;
+        types: NodeArray<ExpressionWithTypeArguments>;
+    }
+    interface TypeAliasDeclaration extends DeclarationStatement, JSDocContainer {
+        kind: SyntaxKind.TypeAliasDeclaration;
+        name: Identifier;
+        typeParameters?: NodeArray<TypeParameterDeclaration>;
+        type: TypeNode;
+    }
+    interface EnumMember extends NamedDeclaration, JSDocContainer {
+        kind: SyntaxKind.EnumMember;
+        parent: EnumDeclaration;
+        name: PropertyName;
+        initializer?: Expression;
+    }
+    interface EnumDeclaration extends DeclarationStatement, JSDocContainer {
+        kind: SyntaxKind.EnumDeclaration;
+        name: Identifier;
+        members: NodeArray<EnumMember>;
+    }
+    type ModuleName = Identifier | StringLiteral;
+    type ModuleBody = NamespaceBody | JSDocNamespaceBody;
+    interface ModuleDeclaration extends DeclarationStatement, JSDocContainer {
+        kind: SyntaxKind.ModuleDeclaration;
+        parent: ModuleBody | SourceFile;
+        name: ModuleName;
+        body?: ModuleBody | JSDocNamespaceDeclaration;
+    }
+    type NamespaceBody = ModuleBlock | NamespaceDeclaration;
+    interface NamespaceDeclaration extends ModuleDeclaration {
+        name: Identifier;
+        body: NamespaceBody;
+    }
+    type JSDocNamespaceBody = Identifier | JSDocNamespaceDeclaration;
+    interface JSDocNamespaceDeclaration extends ModuleDeclaration {
+        name: Identifier;
+        body?: JSDocNamespaceBody;
+    }
+    interface ModuleBlock extends Node, Statement {
+        kind: SyntaxKind.ModuleBlock;
+        parent: ModuleDeclaration;
+        statements: NodeArray<Statement>;
+    }
+    type ModuleReference = EntityName | ExternalModuleReference;
+    /**
+     * One of:
+     * - import x = require("mod");
+     * - import x = M.x;
+     */
+    interface ImportEqualsDeclaration extends DeclarationStatement, JSDocContainer {
+        kind: SyntaxKind.ImportEqualsDeclaration;
+        parent: SourceFile | ModuleBlock;
+        name: Identifier;
+        moduleReference: ModuleReference;
+    }
+    interface ExternalModuleReference extends Node {
+        kind: SyntaxKind.ExternalModuleReference;
+        parent: ImportEqualsDeclaration;
+        expression: Expression;
+    }
+    interface ImportDeclaration extends Statement {
+        kind: SyntaxKind.ImportDeclaration;
+        parent: SourceFile | ModuleBlock;
+        importClause?: ImportClause;
+        /** If this is not a StringLiteral it will be a grammar error. */
+        moduleSpecifier: Expression;
+    }
+    type NamedImportBindings = NamespaceImport | NamedImports;
+    interface ImportClause extends NamedDeclaration {
+        kind: SyntaxKind.ImportClause;
+        parent: ImportDeclaration;
+        name?: Identifier;
+        namedBindings?: NamedImportBindings;
+    }
+    interface NamespaceImport extends NamedDeclaration {
+        kind: SyntaxKind.NamespaceImport;
+        parent: ImportClause;
+        name: Identifier;
+    }
+    interface NamespaceExportDeclaration extends DeclarationStatement {
+        kind: SyntaxKind.NamespaceExportDeclaration;
+        name: Identifier;
+    }
+    interface ExportDeclaration extends DeclarationStatement, JSDocContainer {
+        kind: SyntaxKind.ExportDeclaration;
+        parent: SourceFile | ModuleBlock;
+        /** Will not be assigned in the case of `export * from "foo";` */
+        exportClause?: NamedExports;
+        /** If this is not a StringLiteral it will be a grammar error. */
+        moduleSpecifier?: Expression;
+    }
+    interface NamedImports extends Node {
+        kind: SyntaxKind.NamedImports;
+        parent: ImportClause;
+        elements: NodeArray<ImportSpecifier>;
+    }
+    interface NamedExports extends Node {
+        kind: SyntaxKind.NamedExports;
+        parent: ExportDeclaration;
+        elements: NodeArray<ExportSpecifier>;
+    }
+    type NamedImportsOrExports = NamedImports | NamedExports;
+    interface ImportSpecifier extends NamedDeclaration {
+        kind: SyntaxKind.ImportSpecifier;
+        parent: NamedImports;
+        propertyName?: Identifier;
+        name: Identifier;
+    }
+    interface ExportSpecifier extends NamedDeclaration {
+        kind: SyntaxKind.ExportSpecifier;
+        parent: NamedExports;
+        propertyName?: Identifier;
+        name: Identifier;
+    }
+    type ImportOrExportSpecifier = ImportSpecifier | ExportSpecifier;
+    /**
+     * This is either an `export =` or an `export default` declaration.
+     * Unless `isExportEquals` is set, this node was parsed as an `export default`.
+     */
+    interface ExportAssignment extends DeclarationStatement {
+        kind: SyntaxKind.ExportAssignment;
+        parent: SourceFile;
+        isExportEquals?: boolean;
+        expression: Expression;
+    }
+    interface FileReference extends TextRange {
+        fileName: string;
+    }
+    interface CheckJsDirective extends TextRange {
+        enabled: boolean;
+    }
+    type CommentKind = SyntaxKind.SingleLineCommentTrivia | SyntaxKind.MultiLineCommentTrivia;
+    interface CommentRange extends TextRange {
+        hasTrailingNewLine?: boolean;
+        kind: CommentKind;
+    }
+    interface SynthesizedComment extends CommentRange {
+        text: string;
+        pos: -1;
+        end: -1;
+    }
+    interface JSDocTypeExpression extends TypeNode {
+        kind: SyntaxKind.JSDocTypeExpression;
+        type: TypeNode;
+    }
+    interface JSDocType extends TypeNode {
+        _jsDocTypeBrand: any;
+    }
+    interface JSDocAllType extends JSDocType {
+        kind: SyntaxKind.JSDocAllType;
+    }
+    interface JSDocUnknownType extends JSDocType {
+        kind: SyntaxKind.JSDocUnknownType;
+    }
+    interface JSDocNonNullableType extends JSDocType {
+        kind: SyntaxKind.JSDocNonNullableType;
+        type: TypeNode;
+    }
+    interface JSDocNullableType extends JSDocType {
+        kind: SyntaxKind.JSDocNullableType;
+        type: TypeNode;
+    }
+    interface JSDocOptionalType extends JSDocType {
+        kind: SyntaxKind.JSDocOptionalType;
+        type: TypeNode;
+    }
+    interface JSDocFunctionType extends JSDocType, SignatureDeclarationBase {
+        kind: SyntaxKind.JSDocFunctionType;
+    }
+    interface JSDocVariadicType extends JSDocType {
+        kind: SyntaxKind.JSDocVariadicType;
+        type: TypeNode;
+    }
+    type JSDocTypeReferencingNode = JSDocVariadicType | JSDocOptionalType | JSDocNullableType | JSDocNonNullableType;
+    interface JSDoc extends Node {
+        kind: SyntaxKind.JSDocComment;
+        parent: HasJSDoc;
+        tags?: NodeArray<JSDocTag>;
+        comment?: string;
+    }
+    interface JSDocTag extends Node {
+        parent: JSDoc | JSDocTypeLiteral;
+        tagName: Identifier;
+        comment?: string;
+    }
+    interface JSDocUnknownTag extends JSDocTag {
+        kind: SyntaxKind.JSDocTag;
+    }
+    /**
+     * Note that `@extends` is a synonym of `@augments`.
+     * Both tags are represented by this interface.
+     */
+    interface JSDocAugmentsTag extends JSDocTag {
+        kind: SyntaxKind.JSDocAugmentsTag;
+        class: ExpressionWithTypeArguments & {
+            expression: Identifier | PropertyAccessEntityNameExpression;
+        };
+    }
+    interface JSDocClassTag extends JSDocTag {
+        kind: SyntaxKind.JSDocClassTag;
+    }
+    interface JSDocEnumTag extends JSDocTag {
+        kind: SyntaxKind.JSDocEnumTag;
+        typeExpression?: JSDocTypeExpression;
+    }
+    interface JSDocThisTag extends JSDocTag {
+        kind: SyntaxKind.JSDocThisTag;
+        typeExpression?: JSDocTypeExpression;
+    }
+    interface JSDocTemplateTag extends JSDocTag {
+        kind: SyntaxKind.JSDocTemplateTag;
+        constraint: JSDocTypeExpression | undefined;
+        typeParameters: NodeArray<TypeParameterDeclaration>;
+    }
+    interface JSDocReturnTag extends JSDocTag {
+        kind: SyntaxKind.JSDocReturnTag;
+        typeExpression?: JSDocTypeExpression;
+    }
+    interface JSDocTypeTag extends JSDocTag {
+        kind: SyntaxKind.JSDocTypeTag;
+        typeExpression?: JSDocTypeExpression;
+    }
+    interface JSDocTypedefTag extends JSDocTag, NamedDeclaration {
+        parent: JSDoc;
+        kind: SyntaxKind.JSDocTypedefTag;
+        fullName?: JSDocNamespaceDeclaration | Identifier;
+        name?: Identifier;
+        typeExpression?: JSDocTypeExpression | JSDocTypeLiteral;
+    }
+    interface JSDocCallbackTag extends JSDocTag, NamedDeclaration {
+        parent: JSDoc;
+        kind: SyntaxKind.JSDocCallbackTag;
+        fullName?: JSDocNamespaceDeclaration | Identifier;
+        name?: Identifier;
+        typeExpression: JSDocSignature;
+    }
+    interface JSDocSignature extends JSDocType, Declaration {
+        kind: SyntaxKind.JSDocSignature;
+        typeParameters?: ReadonlyArray<JSDocTemplateTag>;
+        parameters: ReadonlyArray<JSDocParameterTag>;
+        type: JSDocReturnTag | undefined;
+    }
+    interface JSDocPropertyLikeTag extends JSDocTag, Declaration {
+        parent: JSDoc;
+        name: EntityName;
+        typeExpression?: JSDocTypeExpression;
+        /** Whether the property name came before the type -- non-standard for JSDoc, but Typescript-like */
+        isNameFirst: boolean;
+        isBracketed: boolean;
+    }
+    interface JSDocPropertyTag extends JSDocPropertyLikeTag {
+        kind: SyntaxKind.JSDocPropertyTag;
+    }
+    interface JSDocParameterTag extends JSDocPropertyLikeTag {
+        kind: SyntaxKind.JSDocParameterTag;
+    }
+    interface JSDocTypeLiteral extends JSDocType {
+        kind: SyntaxKind.JSDocTypeLiteral;
+        jsDocPropertyTags?: ReadonlyArray<JSDocPropertyLikeTag>;
+        /** If true, then this type literal represents an *array* of its type. */
+        isArrayType?: boolean;
+    }
+    enum FlowFlags {
+        Unreachable = 1,
+        Start = 2,
+        BranchLabel = 4,
+        LoopLabel = 8,
+        Assignment = 16,
+        TrueCondition = 32,
+        FalseCondition = 64,
+        SwitchClause = 128,
+        ArrayMutation = 256,
+        Referenced = 512,
+        Shared = 1024,
+        PreFinally = 2048,
+        AfterFinally = 4096,
+        Label = 12,
+        Condition = 96
+    }
+    interface FlowLock {
+        locked?: boolean;
+    }
+    interface AfterFinallyFlow extends FlowNodeBase, FlowLock {
+        antecedent: FlowNode;
+    }
+    interface PreFinallyFlow extends FlowNodeBase {
+        antecedent: FlowNode;
+        lock: FlowLock;
+    }
+    type FlowNode = AfterFinallyFlow | PreFinallyFlow | FlowStart | FlowLabel | FlowAssignment | FlowCondition | FlowSwitchClause | FlowArrayMutation;
+    interface FlowNodeBase {
+        flags: FlowFlags;
+        id?: number;
+    }
+    interface FlowStart extends FlowNodeBase {
+        container?: FunctionExpression | ArrowFunction | MethodDeclaration;
+    }
+    interface FlowLabel extends FlowNodeBase {
+        antecedents: FlowNode[] | undefined;
+    }
+    interface FlowAssignment extends FlowNodeBase {
+        node: Expression | VariableDeclaration | BindingElement;
+        antecedent: FlowNode;
+    }
+    interface FlowCondition extends FlowNodeBase {
+        expression: Expression;
+        antecedent: FlowNode;
+    }
+    interface FlowSwitchClause extends FlowNodeBase {
+        switchStatement: SwitchStatement;
+        clauseStart: number;
+        clauseEnd: number;
+        antecedent: FlowNode;
+    }
+    interface FlowArrayMutation extends FlowNodeBase {
+        node: CallExpression | BinaryExpression;
+        antecedent: FlowNode;
+    }
+    type FlowType = Type | IncompleteType;
+    interface IncompleteType {
+        flags: TypeFlags;
+        type: Type;
+    }
+    interface AmdDependency {
+        path: string;
+        name?: string;
+    }
+    interface SourceFile extends Declaration {
+        kind: SyntaxKind.SourceFile;
+        statements: NodeArray<Statement>;
+        endOfFileToken: Token<SyntaxKind.EndOfFileToken>;
+        fileName: string;
+        text: string;
+        amdDependencies: ReadonlyArray<AmdDependency>;
+        moduleName?: string;
+        referencedFiles: ReadonlyArray<FileReference>;
+        typeReferenceDirectives: ReadonlyArray<FileReference>;
+        libReferenceDirectives: ReadonlyArray<FileReference>;
+        languageVariant: LanguageVariant;
+        isDeclarationFile: boolean;
+        /**
+         * lib.d.ts should have a reference comment like
+         *
+         *  /// <reference no-default-lib="true"/>
+         *
+         * If any other file has this comment, it signals not to include lib.d.ts
+         * because this containing file is intended to act as a default library.
+         */
+        hasNoDefaultLib: boolean;
+        languageVersion: ScriptTarget;
+    }
+    interface Bundle extends Node {
+        kind: SyntaxKind.Bundle;
+        prepends: ReadonlyArray<InputFiles | UnparsedSource>;
+        sourceFiles: ReadonlyArray<SourceFile>;
+    }
+    interface InputFiles extends Node {
+        kind: SyntaxKind.InputFiles;
+        javascriptPath?: string;
+        javascriptText: string;
+        javascriptMapPath?: string;
+        javascriptMapText?: string;
+        declarationPath?: string;
+        declarationText: string;
+        declarationMapPath?: string;
+        declarationMapText?: string;
+    }
+    interface UnparsedSource extends Node {
+        kind: SyntaxKind.UnparsedSource;
+        fileName?: string;
+        text: string;
+        sourceMapPath?: string;
+        sourceMapText?: string;
+    }
+    interface JsonSourceFile extends SourceFile {
+        statements: NodeArray<JsonObjectExpressionStatement>;
+    }
+    interface TsConfigSourceFile extends JsonSourceFile {
+        extendedSourceFiles?: string[];
+    }
+    interface JsonMinusNumericLiteral extends PrefixUnaryExpression {
+        kind: SyntaxKind.PrefixUnaryExpression;
+        operator: SyntaxKind.MinusToken;
+        operand: NumericLiteral;
+    }
+    interface JsonObjectExpressionStatement extends ExpressionStatement {
+        expression: ObjectLiteralExpression | ArrayLiteralExpression | JsonMinusNumericLiteral | NumericLiteral | StringLiteral | BooleanLiteral | NullLiteral;
+    }
+    interface ScriptReferenceHost {
+        getCompilerOptions(): CompilerOptions;
+        getSourceFile(fileName: string): SourceFile | undefined;
+        getSourceFileByPath(path: Path): SourceFile | undefined;
+        getCurrentDirectory(): string;
+    }
+    interface ParseConfigHost {
+        useCaseSensitiveFileNames: boolean;
+        readDirectory(rootDir: string, extensions: ReadonlyArray<string>, excludes: ReadonlyArray<string> | undefined, includes: ReadonlyArray<string>, depth?: number): ReadonlyArray<string>;
+        /**
+         * Gets a value indicating whether the specified path exists and is a file.
+         * @param path The path to test.
+         */
+        fileExists(path: string): boolean;
+        readFile(path: string): string | undefined;
+        trace?(s: string): void;
+    }
+    /**
+     * Branded string for keeping track of when we've turned an ambiguous path
+     * specified like "./blah" to an absolute path to an actual
+     * tsconfig file, e.g. "/root/blah/tsconfig.json"
+     */
+    type ResolvedConfigFileName = string & {
+        _isResolvedConfigFileName: never;
+    };
+    type WriteFileCallback = (fileName: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void, sourceFiles?: ReadonlyArray<SourceFile>) => void;
+    class OperationCanceledException {
+    }
+    interface CancellationToken {
+        isCancellationRequested(): boolean;
+        /** @throws OperationCanceledException if isCancellationRequested is true */
+        throwIfCancellationRequested(): void;
+    }
+    interface Program extends ScriptReferenceHost {
+        /**
+         * Get a list of root file names that were passed to a 'createProgram'
+         */
+        getRootFileNames(): ReadonlyArray<string>;
+        /**
+         * Get a list of files in the program
+         */
+        getSourceFiles(): ReadonlyArray<SourceFile>;
+        /**
+         * Emits the JavaScript and declaration files.  If targetSourceFile is not specified, then
+         * the JavaScript and declaration files will be produced for all the files in this program.
+         * If targetSourceFile is specified, then only the JavaScript and declaration for that
+         * specific file will be generated.
+         *
+         * If writeFile is not specified then the writeFile callback from the compiler host will be
+         * used for writing the JavaScript and declaration files.  Otherwise, the writeFile parameter
+         * will be invoked when writing the JavaScript and declaration files.
+         */
+        emit(targetSourceFile?: SourceFile, writeFile?: WriteFileCallback, cancellationToken?: CancellationToken, emitOnlyDtsFiles?: boolean, customTransformers?: CustomTransformers): EmitResult;
+        getOptionsDiagnostics(cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+        getGlobalDiagnostics(cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+        getSyntacticDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): ReadonlyArray<DiagnosticWithLocation>;
+        /** The first time this is called, it will return global diagnostics (no location). */
+        getSemanticDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+        getDeclarationDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): ReadonlyArray<DiagnosticWithLocation>;
+        getConfigFileParsingDiagnostics(): ReadonlyArray<Diagnostic>;
+        /**
+         * Gets a type checker that can be used to semantically analyze source files in the program.
+         */
+        getTypeChecker(): TypeChecker;
+        isSourceFileFromExternalLibrary(file: SourceFile): boolean;
+        isSourceFileDefaultLibrary(file: SourceFile): boolean;
+        getProjectReferences(): ReadonlyArray<ProjectReference> | undefined;
+        getResolvedProjectReferences(): ReadonlyArray<ResolvedProjectReference | undefined> | undefined;
+    }
+    interface ResolvedProjectReference {
+        commandLine: ParsedCommandLine;
+        sourceFile: SourceFile;
+        references?: ReadonlyArray<ResolvedProjectReference | undefined>;
+    }
+    interface CustomTransformers {
+        /** Custom transformers to evaluate before built-in .js transformations. */
+        before?: TransformerFactory<SourceFile>[];
+        /** Custom transformers to evaluate after built-in .js transformations. */
+        after?: TransformerFactory<SourceFile>[];
+        /** Custom transformers to evaluate after built-in .d.ts transformations. */
+        afterDeclarations?: TransformerFactory<Bundle | SourceFile>[];
+    }
+    interface SourceMapSpan {
+        /** Line number in the .js file. */
+        emittedLine: number;
+        /** Column number in the .js file. */
+        emittedColumn: number;
+        /** Line number in the .ts file. */
+        sourceLine: number;
+        /** Column number in the .ts file. */
+        sourceColumn: number;
+        /** Optional name (index into names array) associated with this span. */
+        nameIndex?: number;
+        /** .ts file (index into sources array) associated with this span */
+        sourceIndex: number;
+    }
+    /** Return code used by getEmitOutput function to indicate status of the function */
+    enum ExitStatus {
+        Success = 0,
+        DiagnosticsPresent_OutputsSkipped = 1,
+        DiagnosticsPresent_OutputsGenerated = 2
+    }
+    interface EmitResult {
+        emitSkipped: boolean;
+        /** Contains declaration emit diagnostics */
+        diagnostics: ReadonlyArray<Diagnostic>;
+        emittedFiles?: string[];
+    }
+    interface TypeChecker {
+        getTypeOfSymbolAtLocation(symbol: Symbol, node: Node): Type;
+        getDeclaredTypeOfSymbol(symbol: Symbol): Type;
+        getPropertiesOfType(type: Type): Symbol[];
+        getPropertyOfType(type: Type, propertyName: string): Symbol | undefined;
+        getIndexInfoOfType(type: Type, kind: IndexKind): IndexInfo | undefined;
+        getSignaturesOfType(type: Type, kind: SignatureKind): ReadonlyArray<Signature>;
+        getIndexTypeOfType(type: Type, kind: IndexKind): Type | undefined;
+        getBaseTypes(type: InterfaceType): BaseType[];
+        getBaseTypeOfLiteralType(type: Type): Type;
+        getWidenedType(type: Type): Type;
+        getReturnTypeOfSignature(signature: Signature): Type;
+        getNullableType(type: Type, flags: TypeFlags): Type;
+        getNonNullableType(type: Type): Type;
+        /** Note that the resulting nodes cannot be checked. */
+        typeToTypeNode(type: Type, enclosingDeclaration?: Node, flags?: NodeBuilderFlags): TypeNode | undefined;
+        /** Note that the resulting nodes cannot be checked. */
+        signatureToSignatureDeclaration(signature: Signature, kind: SyntaxKind, enclosingDeclaration?: Node, flags?: NodeBuilderFlags): (SignatureDeclaration & {
+            typeArguments?: NodeArray<TypeNode>;
+        }) | undefined;
+        /** Note that the resulting nodes cannot be checked. */
+        indexInfoToIndexSignatureDeclaration(indexInfo: IndexInfo, kind: IndexKind, enclosingDeclaration?: Node, flags?: NodeBuilderFlags): IndexSignatureDeclaration | undefined;
+        /** Note that the resulting nodes cannot be checked. */
+        symbolToEntityName(symbol: Symbol, meaning: SymbolFlags, enclosingDeclaration?: Node, flags?: NodeBuilderFlags): EntityName | undefined;
+        /** Note that the resulting nodes cannot be checked. */
+        symbolToExpression(symbol: Symbol, meaning: SymbolFlags, enclosingDeclaration?: Node, flags?: NodeBuilderFlags): Expression | undefined;
+        /** Note that the resulting nodes cannot be checked. */
+        symbolToTypeParameterDeclarations(symbol: Symbol, enclosingDeclaration?: Node, flags?: NodeBuilderFlags): NodeArray<TypeParameterDeclaration> | undefined;
+        /** Note that the resulting nodes cannot be checked. */
+        symbolToParameterDeclaration(symbol: Symbol, enclosingDeclaration?: Node, flags?: NodeBuilderFlags): ParameterDeclaration | undefined;
+        /** Note that the resulting nodes cannot be checked. */
+        typeParameterToDeclaration(parameter: TypeParameter, enclosingDeclaration?: Node, flags?: NodeBuilderFlags): TypeParameterDeclaration | undefined;
+        getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];
+        getSymbolAtLocation(node: Node): Symbol | undefined;
+        getSymbolsOfParameterPropertyDeclaration(parameter: ParameterDeclaration, parameterName: string): Symbol[];
+        /**
+         * The function returns the value (local variable) symbol of an identifier in the short-hand property assignment.
+         * This is necessary as an identifier in short-hand property assignment can contains two meaning: property name and property value.
+         */
+        getShorthandAssignmentValueSymbol(location: Node): Symbol | undefined;
+        getExportSpecifierLocalTargetSymbol(location: ExportSpecifier): Symbol | undefined;
+        /**
+         * If a symbol is a local symbol with an associated exported symbol, returns the exported symbol.
+         * Otherwise returns its input.
+         * For example, at `export type T = number;`:
+         *     - `getSymbolAtLocation` at the location `T` will return the exported symbol for `T`.
+         *     - But the result of `getSymbolsInScope` will contain the *local* symbol for `T`, not the exported symbol.
+         *     - Calling `getExportSymbolOfSymbol` on that local symbol will return the exported symbol.
+         */
+        getExportSymbolOfSymbol(symbol: Symbol): Symbol;
+        getPropertySymbolOfDestructuringAssignment(location: Identifier): Symbol | undefined;
+        getTypeAtLocation(node: Node): Type;
+        getTypeFromTypeNode(node: TypeNode): Type;
+        signatureToString(signature: Signature, enclosingDeclaration?: Node, flags?: TypeFormatFlags, kind?: SignatureKind): string;
+        typeToString(type: Type, enclosingDeclaration?: Node, flags?: TypeFormatFlags): string;
+        symbolToString(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags, flags?: SymbolFormatFlags): string;
+        typePredicateToString(predicate: TypePredicate, enclosingDeclaration?: Node, flags?: TypeFormatFlags): string;
+        getFullyQualifiedName(symbol: Symbol): string;
+        getAugmentedPropertiesOfType(type: Type): Symbol[];
+        getRootSymbols(symbol: Symbol): ReadonlyArray<Symbol>;
+        getContextualType(node: Expression): Type | undefined;
+        /**
+         * returns unknownSignature in the case of an error.
+         * returns undefined if the node is not valid.
+         * @param argumentCount Apparent number of arguments, passed in case of a possibly incomplete call. This should come from an ArgumentListInfo. See `signatureHelp.ts`.
+         */
+        getResolvedSignature(node: CallLikeExpression, candidatesOutArray?: Signature[], argumentCount?: number): Signature | undefined;
+        getSignatureFromDeclaration(declaration: SignatureDeclaration): Signature | undefined;
+        isImplementationOfOverload(node: SignatureDeclaration): boolean | undefined;
+        isUndefinedSymbol(symbol: Symbol): boolean;
+        isArgumentsSymbol(symbol: Symbol): boolean;
+        isUnknownSymbol(symbol: Symbol): boolean;
+        getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): string | number | undefined;
+        isValidPropertyAccess(node: PropertyAccessExpression | QualifiedName | ImportTypeNode, propertyName: string): boolean;
+        /** Follow all aliases to get the original symbol. */
+        getAliasedSymbol(symbol: Symbol): Symbol;
+        getExportsOfModule(moduleSymbol: Symbol): Symbol[];
+        getJsxIntrinsicTagNamesAt(location: Node): Symbol[];
+        isOptionalParameter(node: ParameterDeclaration): boolean;
+        getAmbientModules(): Symbol[];
+        tryGetMemberInModuleExports(memberName: string, moduleSymbol: Symbol): Symbol | undefined;
+        getApparentType(type: Type): Type;
+        getBaseConstraintOfType(type: Type): Type | undefined;
+        getDefaultFromTypeParameter(type: Type): Type | undefined;
+        /**
+         * Depending on the operation performed, it may be appropriate to throw away the checker
+         * if the cancellation token is triggered. Typically, if it is used for error checking
+         * and the operation is cancelled, then it should be discarded, otherwise it is safe to keep.
+         */
+        runWithCancellationToken<T>(token: CancellationToken, cb: (checker: TypeChecker) => T): T;
+    }
+    enum NodeBuilderFlags {
+        None = 0,
+        NoTruncation = 1,
+        WriteArrayAsGenericType = 2,
+        GenerateNamesForShadowedTypeParams = 4,
+        UseStructuralFallback = 8,
+        ForbidIndexedAccessSymbolReferences = 16,
+        WriteTypeArgumentsOfSignature = 32,
+        UseFullyQualifiedType = 64,
+        UseOnlyExternalAliasing = 128,
+        SuppressAnyReturnType = 256,
+        WriteTypeParametersInQualifiedName = 512,
+        MultilineObjectLiterals = 1024,
+        WriteClassExpressionAsTypeLiteral = 2048,
+        UseTypeOfFunction = 4096,
+        OmitParameterModifiers = 8192,
+        UseAliasDefinedOutsideCurrentScope = 16384,
+        AllowThisInObjectLiteral = 32768,
+        AllowQualifedNameInPlaceOfIdentifier = 65536,
+        AllowAnonymousIdentifier = 131072,
+        AllowEmptyUnionOrIntersection = 262144,
+        AllowEmptyTuple = 524288,
+        AllowUniqueESSymbolType = 1048576,
+        AllowEmptyIndexInfoType = 2097152,
+        AllowNodeModulesRelativePaths = 67108864,
+        IgnoreErrors = 70221824,
+        InObjectTypeLiteral = 4194304,
+        InTypeAlias = 8388608,
+        InInitialEntityName = 16777216,
+        InReverseMappedType = 33554432
+    }
+    enum TypeFormatFlags {
+        None = 0,
+        NoTruncation = 1,
+        WriteArrayAsGenericType = 2,
+        UseStructuralFallback = 8,
+        WriteTypeArgumentsOfSignature = 32,
+        UseFullyQualifiedType = 64,
+        SuppressAnyReturnType = 256,
+        MultilineObjectLiterals = 1024,
+        WriteClassExpressionAsTypeLiteral = 2048,
+        UseTypeOfFunction = 4096,
+        OmitParameterModifiers = 8192,
+        UseAliasDefinedOutsideCurrentScope = 16384,
+        AllowUniqueESSymbolType = 1048576,
+        AddUndefined = 131072,
+        WriteArrowStyleSignature = 262144,
+        InArrayType = 524288,
+        InElementType = 2097152,
+        InFirstTypeArgument = 4194304,
+        InTypeAlias = 8388608,
+        /** @deprecated */ WriteOwnNameForAnyLike = 0,
+        NodeBuilderFlagsMask = 9469291
+    }
+    enum SymbolFormatFlags {
+        None = 0,
+        WriteTypeParametersOrArguments = 1,
+        UseOnlyExternalAliasing = 2,
+        AllowAnyNodeKind = 4,
+        UseAliasDefinedOutsideCurrentScope = 8
+    }
+    enum TypePredicateKind {
+        This = 0,
+        Identifier = 1
+    }
+    interface TypePredicateBase {
+        kind: TypePredicateKind;
+        type: Type;
+    }
+    interface ThisTypePredicate extends TypePredicateBase {
+        kind: TypePredicateKind.This;
+    }
+    interface IdentifierTypePredicate extends TypePredicateBase {
+        kind: TypePredicateKind.Identifier;
+        parameterName: string;
+        parameterIndex: number;
+    }
+    type TypePredicate = IdentifierTypePredicate | ThisTypePredicate;
+    enum SymbolFlags {
+        None = 0,
+        FunctionScopedVariable = 1,
+        BlockScopedVariable = 2,
+        Property = 4,
+        EnumMember = 8,
+        Function = 16,
+        Class = 32,
+        Interface = 64,
+        ConstEnum = 128,
+        RegularEnum = 256,
+        ValueModule = 512,
+        NamespaceModule = 1024,
+        TypeLiteral = 2048,
+        ObjectLiteral = 4096,
+        Method = 8192,
+        Constructor = 16384,
+        GetAccessor = 32768,
+        SetAccessor = 65536,
+        Signature = 131072,
+        TypeParameter = 262144,
+        TypeAlias = 524288,
+        ExportValue = 1048576,
+        Alias = 2097152,
+        Prototype = 4194304,
+        ExportStar = 8388608,
+        Optional = 16777216,
+        Transient = 33554432,
+        Assignment = 67108864,
+        ModuleExports = 134217728,
+        Enum = 384,
+        Variable = 3,
+        Value = 67220415,
+        Type = 67897832,
+        Namespace = 1920,
+        Module = 1536,
+        Accessor = 98304,
+        FunctionScopedVariableExcludes = 67220414,
+        BlockScopedVariableExcludes = 67220415,
+        ParameterExcludes = 67220415,
+        PropertyExcludes = 0,
+        EnumMemberExcludes = 68008959,
+        FunctionExcludes = 67219887,
+        ClassExcludes = 68008383,
+        InterfaceExcludes = 67897736,
+        RegularEnumExcludes = 68008191,
+        ConstEnumExcludes = 68008831,
+        ValueModuleExcludes = 110735,
+        NamespaceModuleExcludes = 0,
+        MethodExcludes = 67212223,
+        GetAccessorExcludes = 67154879,
+        SetAccessorExcludes = 67187647,
+        TypeParameterExcludes = 67635688,
+        TypeAliasExcludes = 67897832,
+        AliasExcludes = 2097152,
+        ModuleMember = 2623475,
+        ExportHasLocal = 944,
+        BlockScoped = 418,
+        PropertyOrAccessor = 98308,
+        ClassMember = 106500
+    }
+    interface Symbol {
+        flags: SymbolFlags;
+        escapedName: __String;
+        declarations: Declaration[];
+        valueDeclaration: Declaration;
+        members?: SymbolTable;
+        exports?: SymbolTable;
+        globalExports?: SymbolTable;
+    }
+    enum InternalSymbolName {
+        Call = "__call",
+        Constructor = "__constructor",
+        New = "__new",
+        Index = "__index",
+        ExportStar = "__export",
+        Global = "__global",
+        Missing = "__missing",
+        Type = "__type",
+        Object = "__object",
+        JSXAttributes = "__jsxAttributes",
+        Class = "__class",
+        Function = "__function",
+        Computed = "__computed",
+        Resolving = "__resolving__",
+        ExportEquals = "export=",
+        Default = "default",
+        This = "this"
+    }
+    /**
+     * This represents a string whose leading underscore have been escaped by adding extra leading underscores.
+     * The shape of this brand is rather unique compared to others we've used.
+     * Instead of just an intersection of a string and an object, it is that union-ed
+     * with an intersection of void and an object. This makes it wholly incompatible
+     * with a normal string (which is good, it cannot be misused on assignment or on usage),
+     * while still being comparable with a normal string via === (also good) and castable from a string.
+     */
+    type __String = (string & {
+        __escapedIdentifier: void;
+    }) | (void & {
+        __escapedIdentifier: void;
+    }) | InternalSymbolName;
+    /** ReadonlyMap where keys are `__String`s. */
+    interface ReadonlyUnderscoreEscapedMap<T> {
+        get(key: __String): T | undefined;
+        has(key: __String): boolean;
+        forEach(action: (value: T, key: __String) => void): void;
+        readonly size: number;
+        keys(): Iterator<__String>;
+        values(): Iterator<T>;
+        entries(): Iterator<[__String, T]>;
+    }
+    /** Map where keys are `__String`s. */
+    interface UnderscoreEscapedMap<T> extends ReadonlyUnderscoreEscapedMap<T> {
+        set(key: __String, value: T): this;
+        delete(key: __String): boolean;
+        clear(): void;
+    }
+    /** SymbolTable based on ES6 Map interface. */
+    type SymbolTable = UnderscoreEscapedMap<Symbol>;
+    enum TypeFlags {
+        Any = 1,
+        Unknown = 2,
+        String = 4,
+        Number = 8,
+        Boolean = 16,
+        Enum = 32,
+        BigInt = 64,
+        StringLiteral = 128,
+        NumberLiteral = 256,
+        BooleanLiteral = 512,
+        EnumLiteral = 1024,
+        BigIntLiteral = 2048,
+        ESSymbol = 4096,
+        UniqueESSymbol = 8192,
+        Void = 16384,
+        Undefined = 32768,
+        Null = 65536,
+        Never = 131072,
+        TypeParameter = 262144,
+        Object = 524288,
+        Union = 1048576,
+        Intersection = 2097152,
+        Index = 4194304,
+        IndexedAccess = 8388608,
+        Conditional = 16777216,
+        Substitution = 33554432,
+        NonPrimitive = 67108864,
+        Literal = 2944,
+        Unit = 109440,
+        StringOrNumberLiteral = 384,
+        PossiblyFalsy = 117724,
+        StringLike = 132,
+        NumberLike = 296,
+        BigIntLike = 2112,
+        BooleanLike = 528,
+        EnumLike = 1056,
+        ESSymbolLike = 12288,
+        VoidLike = 49152,
+        UnionOrIntersection = 3145728,
+        StructuredType = 3670016,
+        TypeVariable = 8650752,
+        InstantiableNonPrimitive = 58982400,
+        InstantiablePrimitive = 4194304,
+        Instantiable = 63176704,
+        StructuredOrInstantiable = 66846720,
+        Narrowable = 133970943,
+        NotUnionOrUnit = 67637251
+    }
+    type DestructuringPattern = BindingPattern | ObjectLiteralExpression | ArrayLiteralExpression;
+    interface Type {
+        flags: TypeFlags;
+        symbol: Symbol;
+        pattern?: DestructuringPattern;
+        aliasSymbol?: Symbol;
+        aliasTypeArguments?: ReadonlyArray<Type>;
+    }
+    interface LiteralType extends Type {
+        value: string | number | PseudoBigInt;
+        freshType: LiteralType;
+        regularType: LiteralType;
+    }
+    interface UniqueESSymbolType extends Type {
+        symbol: Symbol;
+        escapedName: __String;
+    }
+    interface StringLiteralType extends LiteralType {
+        value: string;
+    }
+    interface NumberLiteralType extends LiteralType {
+        value: number;
+    }
+    interface BigIntLiteralType extends LiteralType {
+        value: PseudoBigInt;
+    }
+    interface EnumType extends Type {
+    }
+    enum ObjectFlags {
+        Class = 1,
+        Interface = 2,
+        Reference = 4,
+        Tuple = 8,
+        Anonymous = 16,
+        Mapped = 32,
+        Instantiated = 64,
+        ObjectLiteral = 128,
+        EvolvingArray = 256,
+        ObjectLiteralPatternWithComputedProperties = 512,
+        ContainsSpread = 1024,
+        ReverseMapped = 2048,
+        JsxAttributes = 4096,
+        MarkerType = 8192,
+        JSLiteral = 16384,
+        FreshLiteral = 32768,
+        ClassOrInterface = 3
+    }
+    interface ObjectType extends Type {
+        objectFlags: ObjectFlags;
+    }
+    /** Class and interface types (ObjectFlags.Class and ObjectFlags.Interface). */
+    interface InterfaceType extends ObjectType {
+        typeParameters: TypeParameter[] | undefined;
+        outerTypeParameters: TypeParameter[] | undefined;
+        localTypeParameters: TypeParameter[] | undefined;
+        thisType: TypeParameter | undefined;
+    }
+    type BaseType = ObjectType | IntersectionType;
+    interface InterfaceTypeWithDeclaredMembers extends InterfaceType {
+        declaredProperties: Symbol[];
+        declaredCallSignatures: Signature[];
+        declaredConstructSignatures: Signature[];
+        declaredStringIndexInfo?: IndexInfo;
+        declaredNumberIndexInfo?: IndexInfo;
+    }
+    /**
+     * Type references (ObjectFlags.Reference). When a class or interface has type parameters or
+     * a "this" type, references to the class or interface are made using type references. The
+     * typeArguments property specifies the types to substitute for the type parameters of the
+     * class or interface and optionally includes an extra element that specifies the type to
+     * substitute for "this" in the resulting instantiation. When no extra argument is present,
+     * the type reference itself is substituted for "this". The typeArguments property is undefined
+     * if the class or interface has no type parameters and the reference isn't specifying an
+     * explicit "this" argument.
+     */
+    interface TypeReference extends ObjectType {
+        target: GenericType;
+        typeArguments?: ReadonlyArray<Type>;
+    }
+    interface GenericType extends InterfaceType, TypeReference {
+    }
+    interface TupleType extends GenericType {
+        minLength: number;
+        hasRestElement: boolean;
+        associatedNames?: __String[];
+    }
+    interface TupleTypeReference extends TypeReference {
+        target: TupleType;
+    }
+    interface UnionOrIntersectionType extends Type {
+        types: Type[];
+    }
+    interface UnionType extends UnionOrIntersectionType {
+    }
+    interface IntersectionType extends UnionOrIntersectionType {
+    }
+    type StructuredType = ObjectType | UnionType | IntersectionType;
+    interface EvolvingArrayType extends ObjectType {
+        elementType: Type;
+        finalArrayType?: Type;
+    }
+    interface InstantiableType extends Type {
+    }
+    interface TypeParameter extends InstantiableType {
+    }
+    interface IndexedAccessType extends InstantiableType {
+        objectType: Type;
+        indexType: Type;
+        constraint?: Type;
+        simplified?: Type;
+    }
+    type TypeVariable = TypeParameter | IndexedAccessType;
+    interface IndexType extends InstantiableType {
+        type: InstantiableType | UnionOrIntersectionType;
+    }
+    interface ConditionalRoot {
+        node: ConditionalTypeNode;
+        checkType: Type;
+        extendsType: Type;
+        trueType: Type;
+        falseType: Type;
+        isDistributive: boolean;
+        inferTypeParameters?: TypeParameter[];
+        outerTypeParameters?: TypeParameter[];
+        instantiations?: Map<Type>;
+        aliasSymbol?: Symbol;
+        aliasTypeArguments?: Type[];
+    }
+    interface ConditionalType extends InstantiableType {
+        root: ConditionalRoot;
+        checkType: Type;
+        extendsType: Type;
+        resolvedTrueType?: Type;
+        resolvedFalseType?: Type;
+    }
+    interface SubstitutionType extends InstantiableType {
+        typeVariable: TypeVariable;
+        substitute: Type;
+    }
+    enum SignatureKind {
+        Call = 0,
+        Construct = 1
+    }
+    interface Signature {
+        declaration?: SignatureDeclaration | JSDocSignature;
+        typeParameters?: ReadonlyArray<TypeParameter>;
+        parameters: ReadonlyArray<Symbol>;
+    }
+    enum IndexKind {
+        String = 0,
+        Number = 1
+    }
+    interface IndexInfo {
+        type: Type;
+        isReadonly: boolean;
+        declaration?: IndexSignatureDeclaration;
+    }
+    enum InferencePriority {
+        NakedTypeVariable = 1,
+        HomomorphicMappedType = 2,
+        MappedTypeConstraint = 4,
+        ReturnType = 8,
+        LiteralKeyof = 16,
+        NoConstraints = 32,
+        AlwaysStrict = 64,
+        PriorityImpliesCombination = 28
+    }
+    /** @deprecated Use FileExtensionInfo instead. */
+    type JsFileExtensionInfo = FileExtensionInfo;
+    interface FileExtensionInfo {
+        extension: string;
+        isMixedContent: boolean;
+        scriptKind?: ScriptKind;
+    }
+    interface DiagnosticMessage {
+        key: string;
+        category: DiagnosticCategory;
+        code: number;
+        message: string;
+        reportsUnnecessary?: {};
+    }
+    /**
+     * A linked list of formatted diagnostic messages to be used as part of a multiline message.
+     * It is built from the bottom up, leaving the head to be the "main" diagnostic.
+     * While it seems that DiagnosticMessageChain is structurally similar to DiagnosticMessage,
+     * the difference is that messages are all preformatted in DMC.
+     */
+    interface DiagnosticMessageChain {
+        messageText: string;
+        category: DiagnosticCategory;
+        code: number;
+        next?: DiagnosticMessageChain;
+    }
+    interface Diagnostic extends DiagnosticRelatedInformation {
+        /** May store more in future. For now, this will simply be `true` to indicate when a diagnostic is an unused-identifier diagnostic. */
+        reportsUnnecessary?: {};
+        source?: string;
+        relatedInformation?: DiagnosticRelatedInformation[];
+    }
+    interface DiagnosticRelatedInformation {
+        category: DiagnosticCategory;
+        code: number;
+        file: SourceFile | undefined;
+        start: number | undefined;
+        length: number | undefined;
+        messageText: string | DiagnosticMessageChain;
+    }
+    interface DiagnosticWithLocation extends Diagnostic {
+        file: SourceFile;
+        start: number;
+        length: number;
+    }
+    enum DiagnosticCategory {
+        Warning = 0,
+        Error = 1,
+        Suggestion = 2,
+        Message = 3
+    }
+    enum ModuleResolutionKind {
+        Classic = 1,
+        NodeJs = 2
+    }
+    interface PluginImport {
+        name: string;
+    }
+    interface ProjectReference {
+        /** A normalized path on disk */
+        path: string;
+        /** The path as the user originally wrote it */
+        originalPath?: string;
+        /** True if the output of this reference should be prepended to the output of this project. Only valid for --outFile compilations */
+        prepend?: boolean;
+        /** True if it is intended that this reference form a circularity */
+        circular?: boolean;
+    }
+    type CompilerOptionsValue = string | number | boolean | (string | number)[] | string[] | MapLike<string[]> | PluginImport[] | ProjectReference[] | null | undefined;
+    interface CompilerOptions {
+        allowJs?: boolean;
+        allowSyntheticDefaultImports?: boolean;
+        allowUnreachableCode?: boolean;
+        allowUnusedLabels?: boolean;
+        alwaysStrict?: boolean;
+        baseUrl?: string;
+        charset?: string;
+        checkJs?: boolean;
+        declaration?: boolean;
+        declarationMap?: boolean;
+        emitDeclarationOnly?: boolean;
+        declarationDir?: string;
+        disableSizeLimit?: boolean;
+        downlevelIteration?: boolean;
+        emitBOM?: boolean;
+        emitDecoratorMetadata?: boolean;
+        experimentalDecorators?: boolean;
+        forceConsistentCasingInFileNames?: boolean;
+        importHelpers?: boolean;
+        inlineSourceMap?: boolean;
+        inlineSources?: boolean;
+        isolatedModules?: boolean;
+        jsx?: JsxEmit;
+        keyofStringsOnly?: boolean;
+        lib?: string[];
+        locale?: string;
+        mapRoot?: string;
+        maxNodeModuleJsDepth?: number;
+        module?: ModuleKind;
+        moduleResolution?: ModuleResolutionKind;
+        newLine?: NewLineKind;
+        noEmit?: boolean;
+        noEmitHelpers?: boolean;
+        noEmitOnError?: boolean;
+        noErrorTruncation?: boolean;
+        noFallthroughCasesInSwitch?: boolean;
+        noImplicitAny?: boolean;
+        noImplicitReturns?: boolean;
+        noImplicitThis?: boolean;
+        noStrictGenericChecks?: boolean;
+        noUnusedLocals?: boolean;
+        noUnusedParameters?: boolean;
+        noImplicitUseStrict?: boolean;
+        noLib?: boolean;
+        noResolve?: boolean;
+        out?: string;
+        outDir?: string;
+        outFile?: string;
+        paths?: MapLike<string[]>;
+        preserveConstEnums?: boolean;
+        preserveSymlinks?: boolean;
+        project?: string;
+        reactNamespace?: string;
+        jsxFactory?: string;
+        composite?: boolean;
+        removeComments?: boolean;
+        rootDir?: string;
+        rootDirs?: string[];
+        skipLibCheck?: boolean;
+        skipDefaultLibCheck?: boolean;
+        sourceMap?: boolean;
+        sourceRoot?: string;
+        strict?: boolean;
+        strictFunctionTypes?: boolean;
+        strictBindCallApply?: boolean;
+        strictNullChecks?: boolean;
+        strictPropertyInitialization?: boolean;
+        stripInternal?: boolean;
+        suppressExcessPropertyErrors?: boolean;
+        suppressImplicitAnyIndexErrors?: boolean;
+        target?: ScriptTarget;
+        traceResolution?: boolean;
+        resolveJsonModule?: boolean;
+        types?: string[];
+        /** Paths used to compute primary types search locations */
+        typeRoots?: string[];
+        esModuleInterop?: boolean;
+        [option: string]: CompilerOptionsValue | TsConfigSourceFile | undefined;
+    }
+    interface TypeAcquisition {
+        enableAutoDiscovery?: boolean;
+        enable?: boolean;
+        include?: string[];
+        exclude?: string[];
+        [option: string]: string[] | boolean | undefined;
+    }
+    enum ModuleKind {
+        None = 0,
+        CommonJS = 1,
+        AMD = 2,
+        UMD = 3,
+        System = 4,
+        ES2015 = 5,
+        ESNext = 6
+    }
+    enum JsxEmit {
+        None = 0,
+        Preserve = 1,
+        React = 2,
+        ReactNative = 3
+    }
+    enum NewLineKind {
+        CarriageReturnLineFeed = 0,
+        LineFeed = 1
+    }
+    interface LineAndCharacter {
+        /** 0-based. */
+        line: number;
+        character: number;
+    }
+    enum ScriptKind {
+        Unknown = 0,
+        JS = 1,
+        JSX = 2,
+        TS = 3,
+        TSX = 4,
+        External = 5,
+        JSON = 6,
+        /**
+         * Used on extensions that doesn't define the ScriptKind but the content defines it.
+         * Deferred extensions are going to be included in all project contexts.
+         */
+        Deferred = 7
+    }
+    enum ScriptTarget {
+        ES3 = 0,
+        ES5 = 1,
+        ES2015 = 2,
+        ES2016 = 3,
+        ES2017 = 4,
+        ES2018 = 5,
+        ESNext = 6,
+        JSON = 100,
+        Latest = 6
+    }
+    enum LanguageVariant {
+        Standard = 0,
+        JSX = 1
+    }
+    /** Either a parsed command line or a parsed tsconfig.json */
+    interface ParsedCommandLine {
+        options: CompilerOptions;
+        typeAcquisition?: TypeAcquisition;
+        fileNames: string[];
+        projectReferences?: ReadonlyArray<ProjectReference>;
+        raw?: any;
+        errors: Diagnostic[];
+        wildcardDirectories?: MapLike<WatchDirectoryFlags>;
+        compileOnSave?: boolean;
+    }
+    enum WatchDirectoryFlags {
+        None = 0,
+        Recursive = 1
+    }
+    interface ExpandResult {
+        fileNames: string[];
+        wildcardDirectories: MapLike<WatchDirectoryFlags>;
+    }
+    interface CreateProgramOptions {
+        rootNames: ReadonlyArray<string>;
+        options: CompilerOptions;
+        projectReferences?: ReadonlyArray<ProjectReference>;
+        host?: CompilerHost;
+        oldProgram?: Program;
+        configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>;
+    }
+    interface ModuleResolutionHost {
+        fileExists(fileName: string): boolean;
+        readFile(fileName: string): string | undefined;
+        trace?(s: string): void;
+        directoryExists?(directoryName: string): boolean;
+        /**
+         * Resolve a symbolic link.
+         * @see https://nodejs.org/api/fs.html#fs_fs_realpathsync_path_options
+         */
+        realpath?(path: string): string;
+        getCurrentDirectory?(): string;
+        getDirectories?(path: string): string[];
+    }
+    /**
+     * Represents the result of module resolution.
+     * Module resolution will pick up tsx/jsx/js files even if '--jsx' and '--allowJs' are turned off.
+     * The Program will then filter results based on these flags.
+     *
+     * Prefer to return a `ResolvedModuleFull` so that the file type does not have to be inferred.
+     */
+    interface ResolvedModule {
+        /** Path of the file the module was resolved to. */
+        resolvedFileName: string;
+        /** True if `resolvedFileName` comes from `node_modules`. */
+        isExternalLibraryImport?: boolean;
+    }
+    /**
+     * ResolvedModule with an explicitly provided `extension` property.
+     * Prefer this over `ResolvedModule`.
+     * If changing this, remember to change `moduleResolutionIsEqualTo`.
+     */
+    interface ResolvedModuleFull extends ResolvedModule {
+        /**
+         * Extension of resolvedFileName. This must match what's at the end of resolvedFileName.
+         * This is optional for backwards-compatibility, but will be added if not provided.
+         */
+        extension: Extension;
+        packageId?: PackageId;
+    }
+    /**
+     * Unique identifier with a package name and version.
+     * If changing this, remember to change `packageIdIsEqual`.
+     */
+    interface PackageId {
+        /**
+         * Name of the package.
+         * Should not include `@types`.
+         * If accessing a non-index file, this should include its name e.g. "foo/bar".
+         */
+        name: string;
+        /**
+         * Name of a submodule within this package.
+         * May be "".
+         */
+        subModuleName: string;
+        /** Version of the package, e.g. "1.2.3" */
+        version: string;
+    }
+    enum Extension {
+        Ts = ".ts",
+        Tsx = ".tsx",
+        Dts = ".d.ts",
+        Js = ".js",
+        Jsx = ".jsx",
+        Json = ".json"
+    }
+    interface ResolvedModuleWithFailedLookupLocations {
+        readonly resolvedModule: ResolvedModuleFull | undefined;
+    }
+    interface ResolvedTypeReferenceDirective {
+        primary: boolean;
+        resolvedFileName: string | undefined;
+        packageId?: PackageId;
+        /** True if `resolvedFileName` comes from `node_modules`. */
+        isExternalLibraryImport?: boolean;
+    }
+    interface ResolvedTypeReferenceDirectiveWithFailedLookupLocations {
+        readonly resolvedTypeReferenceDirective: ResolvedTypeReferenceDirective | undefined;
+        readonly failedLookupLocations: ReadonlyArray<string>;
+    }
+    interface CompilerHost extends ModuleResolutionHost {
+        getSourceFile(fileName: string, languageVersion: ScriptTarget, onError?: (message: string) => void, shouldCreateNewSourceFile?: boolean): SourceFile | undefined;
+        getSourceFileByPath?(fileName: string, path: Path, languageVersion: ScriptTarget, onError?: (message: string) => void, shouldCreateNewSourceFile?: boolean): SourceFile | undefined;
+        getCancellationToken?(): CancellationToken;
+        getDefaultLibFileName(options: CompilerOptions): string;
+        getDefaultLibLocation?(): string;
+        writeFile: WriteFileCallback;
+        getCurrentDirectory(): string;
+        getCanonicalFileName(fileName: string): string;
+        useCaseSensitiveFileNames(): boolean;
+        getNewLine(): string;
+        readDirectory?(rootDir: string, extensions: ReadonlyArray<string>, excludes: ReadonlyArray<string> | undefined, includes: ReadonlyArray<string>, depth?: number): string[];
+        resolveModuleNames?(moduleNames: string[], containingFile: string, reusedNames?: string[], redirectedReference?: ResolvedProjectReference): (ResolvedModule | undefined)[];
+        /**
+         * This method is a companion for 'resolveModuleNames' and is used to resolve 'types' references to actual type declaration files
+         */
+        resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string, redirectedReference?: ResolvedProjectReference): (ResolvedTypeReferenceDirective | undefined)[];
+        getEnvironmentVariable?(name: string): string | undefined;
+        createHash?(data: string): string;
+    }
+    interface SourceMapRange extends TextRange {
+        source?: SourceMapSource;
+    }
+    interface SourceMapSource {
+        fileName: string;
+        text: string;
+        skipTrivia?: (pos: number) => number;
+    }
+    enum EmitFlags {
+        None = 0,
+        SingleLine = 1,
+        AdviseOnEmitNode = 2,
+        NoSubstitution = 4,
+        CapturesThis = 8,
+        NoLeadingSourceMap = 16,
+        NoTrailingSourceMap = 32,
+        NoSourceMap = 48,
+        NoNestedSourceMaps = 64,
+        NoTokenLeadingSourceMaps = 128,
+        NoTokenTrailingSourceMaps = 256,
+        NoTokenSourceMaps = 384,
+        NoLeadingComments = 512,
+        NoTrailingComments = 1024,
+        NoComments = 1536,
+        NoNestedComments = 2048,
+        HelperName = 4096,
+        ExportName = 8192,
+        LocalName = 16384,
+        InternalName = 32768,
+        Indented = 65536,
+        NoIndentation = 131072,
+        AsyncFunctionBody = 262144,
+        ReuseTempVariableScope = 524288,
+        CustomPrologue = 1048576,
+        NoHoisting = 2097152,
+        HasEndOfDeclarationMarker = 4194304,
+        Iterator = 8388608,
+        NoAsciiEscaping = 16777216
+    }
+    interface EmitHelper {
+        readonly name: string;
+        readonly scoped: boolean;
+        readonly text: string | ((node: EmitHelperUniqueNameCallback) => string);
+        readonly priority?: number;
+    }
+    type EmitHelperUniqueNameCallback = (name: string) => string;
+    enum EmitHint {
+        SourceFile = 0,
+        Expression = 1,
+        IdentifierName = 2,
+        MappedTypeParameter = 3,
+        Unspecified = 4,
+        EmbeddedStatement = 5
+    }
+    interface TransformationContext {
+        /** Gets the compiler options supplied to the transformer. */
+        getCompilerOptions(): CompilerOptions;
+        /** Starts a new lexical environment. */
+        startLexicalEnvironment(): void;
+        /** Suspends the current lexical environment, usually after visiting a parameter list. */
+        suspendLexicalEnvironment(): void;
+        /** Resumes a suspended lexical environment, usually before visiting a function body. */
+        resumeLexicalEnvironment(): void;
+        /** Ends a lexical environment, returning any declarations. */
+        endLexicalEnvironment(): Statement[] | undefined;
+        /** Hoists a function declaration to the containing scope. */
+        hoistFunctionDeclaration(node: FunctionDeclaration): void;
+        /** Hoists a variable declaration to the containing scope. */
+        hoistVariableDeclaration(node: Identifier): void;
+        /** Records a request for a non-scoped emit helper in the current context. */
+        requestEmitHelper(helper: EmitHelper): void;
+        /** Gets and resets the requested non-scoped emit helpers. */
+        readEmitHelpers(): EmitHelper[] | undefined;
+        /** Enables expression substitutions in the pretty printer for the provided SyntaxKind. */
+        enableSubstitution(kind: SyntaxKind): void;
+        /** Determines whether expression substitutions are enabled for the provided node. */
+        isSubstitutionEnabled(node: Node): boolean;
+        /**
+         * Hook used by transformers to substitute expressions just before they
+         * are emitted by the pretty printer.
+         *
+         * NOTE: Transformation hooks should only be modified during `Transformer` initialization,
+         * before returning the `NodeTransformer` callback.
+         */
+        onSubstituteNode: (hint: EmitHint, node: Node) => Node;
+        /**
+         * Enables before/after emit notifications in the pretty printer for the provided
+         * SyntaxKind.
+         */
+        enableEmitNotification(kind: SyntaxKind): void;
+        /**
+         * Determines whether before/after emit notifications should be raised in the pretty
+         * printer when it emits a node.
+         */
+        isEmitNotificationEnabled(node: Node): boolean;
+        /**
+         * Hook used to allow transformers to capture state before or after
+         * the printer emits a node.
+         *
+         * NOTE: Transformation hooks should only be modified during `Transformer` initialization,
+         * before returning the `NodeTransformer` callback.
+         */
+        onEmitNode: (hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void) => void;
+    }
+    interface TransformationResult<T extends Node> {
+        /** Gets the transformed source files. */
+        transformed: T[];
+        /** Gets diagnostics for the transformation. */
+        diagnostics?: DiagnosticWithLocation[];
+        /**
+         * Gets a substitute for a node, if one is available; otherwise, returns the original node.
+         *
+         * @param hint A hint as to the intended usage of the node.
+         * @param node The node to substitute.
+         */
+        substituteNode(hint: EmitHint, node: Node): Node;
+        /**
+         * Emits a node with possible notification.
+         *
+         * @param hint A hint as to the intended usage of the node.
+         * @param node The node to emit.
+         * @param emitCallback A callback used to emit the node.
+         */
+        emitNodeWithNotification(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void): void;
+        /**
+         * Clean up EmitNode entries on any parse-tree nodes.
+         */
+        dispose(): void;
+    }
+    /**
+     * A function that is used to initialize and return a `Transformer` callback, which in turn
+     * will be used to transform one or more nodes.
+     */
+    type TransformerFactory<T extends Node> = (context: TransformationContext) => Transformer<T>;
+    /**
+     * A function that transforms a node.
+     */
+    type Transformer<T extends Node> = (node: T) => T;
+    /**
+     * A function that accepts and possibly transforms a node.
+     */
+    type Visitor = (node: Node) => VisitResult<Node>;
+    type VisitResult<T extends Node> = T | T[] | undefined;
+    interface Printer {
+        /**
+         * Print a node and its subtree as-is, without any emit transformations.
+         * @param hint A value indicating the purpose of a node. This is primarily used to
+         * distinguish between an `Identifier` used in an expression position, versus an
+         * `Identifier` used as an `IdentifierName` as part of a declaration. For most nodes you
+         * should just pass `Unspecified`.
+         * @param node The node to print. The node and its subtree are printed as-is, without any
+         * emit transformations.
+         * @param sourceFile A source file that provides context for the node. The source text of
+         * the file is used to emit the original source content for literals and identifiers, while
+         * the identifiers of the source file are used when generating unique names to avoid
+         * collisions.
+         */
+        printNode(hint: EmitHint, node: Node, sourceFile: SourceFile): string;
+        /**
+         * Prints a list of nodes using the given format flags
+         */
+        printList<T extends Node>(format: ListFormat, list: NodeArray<T>, sourceFile: SourceFile): string;
+        /**
+         * Prints a source file as-is, without any emit transformations.
+         */
+        printFile(sourceFile: SourceFile): string;
+        /**
+         * Prints a bundle of source files as-is, without any emit transformations.
+         */
+        printBundle(bundle: Bundle): string;
+    }
+    interface PrintHandlers {
+        /**
+         * A hook used by the Printer when generating unique names to avoid collisions with
+         * globally defined names that exist outside of the current source file.
+         */
+        hasGlobalName?(name: string): boolean;
+        /**
+         * A hook used by the Printer to provide notifications prior to emitting a node. A
+         * compatible implementation **must** invoke `emitCallback` with the provided `hint` and
+         * `node` values.
+         * @param hint A hint indicating the intended purpose of the node.
+         * @param node The node to emit.
+         * @param emitCallback A callback that, when invoked, will emit the node.
+         * @example
+         * ```ts
+         * var printer = createPrinter(printerOptions, {
+         *   onEmitNode(hint, node, emitCallback) {
+         *     // set up or track state prior to emitting the node...
+         *     emitCallback(hint, node);
+         *     // restore state after emitting the node...
+         *   }
+         * });
+         * ```
+         */
+        onEmitNode?(hint: EmitHint, node: Node | undefined, emitCallback: (hint: EmitHint, node: Node | undefined) => void): void;
+        /**
+         * A hook used by the Printer to perform just-in-time substitution of a node. This is
+         * primarily used by node transformations that need to substitute one node for another,
+         * such as replacing `myExportedVar` with `exports.myExportedVar`.
+         * @param hint A hint indicating the intended purpose of the node.
+         * @param node The node to emit.
+         * @example
+         * ```ts
+         * var printer = createPrinter(printerOptions, {
+         *   substituteNode(hint, node) {
+         *     // perform substitution if necessary...
+         *     return node;
+         *   }
+         * });
+         * ```
+         */
+        substituteNode?(hint: EmitHint, node: Node): Node;
+    }
+    interface PrinterOptions {
+        removeComments?: boolean;
+        newLine?: NewLineKind;
+        omitTrailingSemicolon?: boolean;
+        noEmitHelpers?: boolean;
+    }
+    interface GetEffectiveTypeRootsHost {
+        directoryExists?(directoryName: string): boolean;
+        getCurrentDirectory?(): string;
+    }
+    interface TextSpan {
+        start: number;
+        length: number;
+    }
+    interface TextChangeRange {
+        span: TextSpan;
+        newLength: number;
+    }
+    interface SyntaxList extends Node {
+        _children: Node[];
+    }
+    enum ListFormat {
+        None = 0,
+        SingleLine = 0,
+        MultiLine = 1,
+        PreserveLines = 2,
+        LinesMask = 3,
+        NotDelimited = 0,
+        BarDelimited = 4,
+        AmpersandDelimited = 8,
+        CommaDelimited = 16,
+        AsteriskDelimited = 32,
+        DelimitersMask = 60,
+        AllowTrailingComma = 64,
+        Indented = 128,
+        SpaceBetweenBraces = 256,
+        SpaceBetweenSiblings = 512,
+        Braces = 1024,
+        Parenthesis = 2048,
+        AngleBrackets = 4096,
+        SquareBrackets = 8192,
+        BracketsMask = 15360,
+        OptionalIfUndefined = 16384,
+        OptionalIfEmpty = 32768,
+        Optional = 49152,
+        PreferNewLine = 65536,
+        NoTrailingNewLine = 131072,
+        NoInterveningComments = 262144,
+        NoSpaceIfEmpty = 524288,
+        SingleElement = 1048576,
+        Modifiers = 262656,
+        HeritageClauses = 512,
+        SingleLineTypeLiteralMembers = 768,
+        MultiLineTypeLiteralMembers = 32897,
+        TupleTypeElements = 528,
+        UnionTypeConstituents = 516,
+        IntersectionTypeConstituents = 520,
+        ObjectBindingPatternElements = 525136,
+        ArrayBindingPatternElements = 524880,
+        ObjectLiteralExpressionProperties = 526226,
+        ArrayLiteralExpressionElements = 8914,
+        CommaListElements = 528,
+        CallExpressionArguments = 2576,
+        NewExpressionArguments = 18960,
+        TemplateExpressionSpans = 262144,
+        SingleLineBlockStatements = 768,
+        MultiLineBlockStatements = 129,
+        VariableDeclarationList = 528,
+        SingleLineFunctionBodyStatements = 768,
+        MultiLineFunctionBodyStatements = 1,
+        ClassHeritageClauses = 0,
+        ClassMembers = 129,
+        InterfaceMembers = 129,
+        EnumMembers = 145,
+        CaseBlockClauses = 129,
+        NamedImportsOrExportsElements = 525136,
+        JsxElementOrFragmentChildren = 262144,
+        JsxElementAttributes = 262656,
+        CaseOrDefaultClauseStatements = 163969,
+        HeritageClauseTypes = 528,
+        SourceFileStatements = 131073,
+        Decorators = 49153,
+        TypeArguments = 53776,
+        TypeParameters = 53776,
+        Parameters = 2576,
+        IndexSignatureParameters = 8848,
+        JSDocComment = 33
+    }
+    interface UserPreferences {
+        readonly disableSuggestions?: boolean;
+        readonly quotePreference?: "auto" | "double" | "single";
+        readonly includeCompletionsForModuleExports?: boolean;
+        readonly includeCompletionsWithInsertText?: boolean;
+        readonly importModuleSpecifierPreference?: "relative" | "non-relative";
+        /** Determines whether we import `foo/index.ts` as "foo", "foo/index", or "foo/index.js" */
+        readonly importModuleSpecifierEnding?: "minimal" | "index" | "js";
+        readonly allowTextChangesInNewFiles?: boolean;
+        readonly providePrefixAndSuffixTextForRename?: boolean;
+    }
+    /** Represents a bigint literal value without requiring bigint support */
+    interface PseudoBigInt {
+        negative: boolean;
+        base10Value: string;
+    }
+}
+declare function setTimeout(handler: (...args: any[]) => void, timeout: number): any;
+declare function clearTimeout(handle: any): void;
+declare namespace ts {
+    enum FileWatcherEventKind {
+        Created = 0,
+        Changed = 1,
+        Deleted = 2
+    }
+    type FileWatcherCallback = (fileName: string, eventKind: FileWatcherEventKind) => void;
+    type DirectoryWatcherCallback = (fileName: string) => void;
+    interface System {
+        args: string[];
+        newLine: string;
+        useCaseSensitiveFileNames: boolean;
+        write(s: string): void;
+        writeOutputIsTTY?(): boolean;
+        readFile(path: string, encoding?: string): string | undefined;
+        getFileSize?(path: string): number;
+        writeFile(path: string, data: string, writeByteOrderMark?: boolean): void;
+        /**
+         * @pollingInterval - this parameter is used in polling-based watchers and ignored in watchers that
+         * use native OS file watching
+         */
+        watchFile?(path: string, callback: FileWatcherCallback, pollingInterval?: number): FileWatcher;
+        watchDirectory?(path: string, callback: DirectoryWatcherCallback, recursive?: boolean): FileWatcher;
+        resolvePath(path: string): string;
+        fileExists(path: string): boolean;
+        directoryExists(path: string): boolean;
+        createDirectory(path: string): void;
+        getExecutingFilePath(): string;
+        getCurrentDirectory(): string;
+        getDirectories(path: string): string[];
+        readDirectory(path: string, extensions?: ReadonlyArray<string>, exclude?: ReadonlyArray<string>, include?: ReadonlyArray<string>, depth?: number): string[];
+        getModifiedTime?(path: string): Date | undefined;
+        setModifiedTime?(path: string, time: Date): void;
+        deleteFile?(path: string): void;
+        /**
+         * A good implementation is node.js' `crypto.createHash`. (https://nodejs.org/api/crypto.html#crypto_crypto_createhash_algorithm)
+         */
+        createHash?(data: string): string;
+        /** This must be cryptographically secure. Only implement this method using `crypto.createHash("sha256")`. */
+        createSHA256Hash?(data: string): string;
+        getMemoryUsage?(): number;
+        exit(exitCode?: number): void;
+        realpath?(path: string): string;
+        setTimeout?(callback: (...args: any[]) => void, ms: number, ...args: any[]): any;
+        clearTimeout?(timeoutId: any): void;
+        clearScreen?(): void;
+        base64decode?(input: string): string;
+        base64encode?(input: string): string;
+    }
+    interface FileWatcher {
+        close(): void;
+    }
+    function getNodeMajorVersion(): number | undefined;
+    let sys: System;
+}
+declare namespace ts {
+    type ErrorCallback = (message: DiagnosticMessage, length: number) => void;
+    interface Scanner {
+        getStartPos(): number;
+        getToken(): SyntaxKind;
+        getTextPos(): number;
+        getTokenPos(): number;
+        getTokenText(): string;
+        getTokenValue(): string;
+        hasExtendedUnicodeEscape(): boolean;
+        hasPrecedingLineBreak(): boolean;
+        isIdentifier(): boolean;
+        isReservedWord(): boolean;
+        isUnterminated(): boolean;
+        reScanGreaterToken(): SyntaxKind;
+        reScanSlashToken(): SyntaxKind;
+        reScanTemplateToken(): SyntaxKind;
+        scanJsxIdentifier(): SyntaxKind;
+        scanJsxAttributeValue(): SyntaxKind;
+        reScanJsxToken(): JsxTokenSyntaxKind;
+        reScanLessThanToken(): SyntaxKind;
+        scanJsxToken(): JsxTokenSyntaxKind;
+        scanJSDocToken(): JsDocSyntaxKind;
+        scan(): SyntaxKind;
+        getText(): string;
+        setText(text: string | undefined, start?: number, length?: number): void;
+        setOnError(onError: ErrorCallback | undefined): void;
+        setScriptTarget(scriptTarget: ScriptTarget): void;
+        setLanguageVariant(variant: LanguageVariant): void;
+        setTextPos(textPos: number): void;
+        lookAhead<T>(callback: () => T): T;
+        scanRange<T>(start: number, length: number, callback: () => T): T;
+        tryScan<T>(callback: () => T): T;
+    }
+    function tokenToString(t: SyntaxKind): string | undefined;
+    function getPositionOfLineAndCharacter(sourceFile: SourceFileLike, line: number, character: number): number;
+    function getLineAndCharacterOfPosition(sourceFile: SourceFileLike, position: number): LineAndCharacter;
+    function isWhiteSpaceLike(ch: number): boolean;
+    /** Does not include line breaks. For that, see isWhiteSpaceLike. */
+    function isWhiteSpaceSingleLine(ch: number): boolean;
+    function isLineBreak(ch: number): boolean;
+    function couldStartTrivia(text: string, pos: number): boolean;
+    function forEachLeadingCommentRange<U>(text: string, pos: number, cb: (pos: number, end: number, kind: CommentKind, hasTrailingNewLine: boolean) => U): U | undefined;
+    function forEachLeadingCommentRange<T, U>(text: string, pos: number, cb: (pos: number, end: number, kind: CommentKind, hasTrailingNewLine: boolean, state: T) => U, state: T): U | undefined;
+    function forEachTrailingCommentRange<U>(text: string, pos: number, cb: (pos: number, end: number, kind: CommentKind, hasTrailingNewLine: boolean) => U): U | undefined;
+    function forEachTrailingCommentRange<T, U>(text: string, pos: number, cb: (pos: number, end: number, kind: CommentKind, hasTrailingNewLine: boolean, state: T) => U, state: T): U | undefined;
+    function reduceEachLeadingCommentRange<T, U>(text: string, pos: number, cb: (pos: number, end: number, kind: CommentKind, hasTrailingNewLine: boolean, state: T, memo: U) => U, state: T, initial: U): U | undefined;
+    function reduceEachTrailingCommentRange<T, U>(text: string, pos: number, cb: (pos: number, end: number, kind: CommentKind, hasTrailingNewLine: boolean, state: T, memo: U) => U, state: T, initial: U): U | undefined;
+    function getLeadingCommentRanges(text: string, pos: number): CommentRange[] | undefined;
+    function getTrailingCommentRanges(text: string, pos: number): CommentRange[] | undefined;
+    /** Optionally, get the shebang */
+    function getShebang(text: string): string | undefined;
+    function isIdentifierStart(ch: number, languageVersion: ScriptTarget | undefined): boolean;
+    function isIdentifierPart(ch: number, languageVersion: ScriptTarget | undefined): boolean;
+    function createScanner(languageVersion: ScriptTarget, skipTrivia: boolean, languageVariant?: LanguageVariant, textInitial?: string, onError?: ErrorCallback, start?: number, length?: number): Scanner;
+}
+declare namespace ts {
+    function isExternalModuleNameRelative(moduleName: string): boolean;
+    function sortAndDeduplicateDiagnostics<T extends Diagnostic>(diagnostics: ReadonlyArray<T>): SortedReadonlyArray<T>;
+}
+declare namespace ts {
+    function getDefaultLibFileName(options: CompilerOptions): string;
+    function textSpanEnd(span: TextSpan): number;
+    function textSpanIsEmpty(span: TextSpan): boolean;
+    function textSpanContainsPosition(span: TextSpan, position: number): boolean;
+    function textSpanContainsTextSpan(span: TextSpan, other: TextSpan): boolean;
+    function textSpanOverlapsWith(span: TextSpan, other: TextSpan): boolean;
+    function textSpanOverlap(span1: TextSpan, span2: TextSpan): TextSpan | undefined;
+    function textSpanIntersectsWithTextSpan(span: TextSpan, other: TextSpan): boolean;
+    function textSpanIntersectsWith(span: TextSpan, start: number, length: number): boolean;
+    function decodedTextSpanIntersectsWith(start1: number, length1: number, start2: number, length2: number): boolean;
+    function textSpanIntersectsWithPosition(span: TextSpan, position: number): boolean;
+    function textSpanIntersection(span1: TextSpan, span2: TextSpan): TextSpan | undefined;
+    function createTextSpan(start: number, length: number): TextSpan;
+    function createTextSpanFromBounds(start: number, end: number): TextSpan;
+    function textChangeRangeNewSpan(range: TextChangeRange): TextSpan;
+    function textChangeRangeIsUnchanged(range: TextChangeRange): boolean;
+    function createTextChangeRange(span: TextSpan, newLength: number): TextChangeRange;
+    let unchangedTextChangeRange: TextChangeRange;
+    /**
+     * Called to merge all the changes that occurred across several versions of a script snapshot
+     * into a single change.  i.e. if a user keeps making successive edits to a script we will
+     * have a text change from V1 to V2, V2 to V3, ..., Vn.
+     *
+     * This function will then merge those changes into a single change range valid between V1 and
+     * Vn.
+     */
+    function collapseTextChangeRangesAcrossMultipleVersions(changes: ReadonlyArray<TextChangeRange>): TextChangeRange;
+    function getTypeParameterOwner(d: Declaration): Declaration | undefined;
+    type ParameterPropertyDeclaration = ParameterDeclaration & {
+        parent: ConstructorDeclaration;
+        name: Identifier;
+    };
+    function isParameterPropertyDeclaration(node: Node): node is ParameterPropertyDeclaration;
+    function isEmptyBindingPattern(node: BindingName): node is BindingPattern;
+    function isEmptyBindingElement(node: BindingElement): boolean;
+    function walkUpBindingElementsAndPatterns(binding: BindingElement): VariableDeclaration | ParameterDeclaration;
+    function getCombinedModifierFlags(node: Declaration): ModifierFlags;
+    function getCombinedNodeFlags(node: Node): NodeFlags;
+    /**
+     * Checks to see if the locale is in the appropriate format,
+     * and if it is, attempts to set the appropriate language.
+     */
+    function validateLocaleAndSetLanguage(locale: string, sys: {
+        getExecutingFilePath(): string;
+        resolvePath(path: string): string;
+        fileExists(fileName: string): boolean;
+        readFile(fileName: string): string | undefined;
+    }, errors?: Push<Diagnostic>): void;
+    function getOriginalNode(node: Node): Node;
+    function getOriginalNode<T extends Node>(node: Node, nodeTest: (node: Node) => node is T): T;
+    function getOriginalNode(node: Node | undefined): Node | undefined;
+    function getOriginalNode<T extends Node>(node: Node | undefined, nodeTest: (node: Node | undefined) => node is T): T | undefined;
+    /**
+     * Gets a value indicating whether a node originated in the parse tree.
+     *
+     * @param node The node to test.
+     */
+    function isParseTreeNode(node: Node): boolean;
+    /**
+     * Gets the original parse tree node for a node.
+     *
+     * @param node The original node.
+     * @returns The original parse tree node if found; otherwise, undefined.
+     */
+    function getParseTreeNode(node: Node): Node;
+    /**
+     * Gets the original parse tree node for a node.
+     *
+     * @param node The original node.
+     * @param nodeTest A callback used to ensure the correct type of parse tree node is returned.
+     * @returns The original parse tree node if found; otherwise, undefined.
+     */
+    function getParseTreeNode<T extends Node>(node: Node | undefined, nodeTest?: (node: Node) => node is T): T | undefined;
+    /** Add an extra underscore to identifiers that start with two underscores to avoid issues with magic names like '__proto__' */
+    function escapeLeadingUnderscores(identifier: string): __String;
+    /**
+     * Remove extra underscore from escaped identifier text content.
+     *
+     * @param identifier The escaped identifier text.
+     * @returns The unescaped identifier text.
+     */
+    function unescapeLeadingUnderscores(identifier: __String): string;
+    function idText(identifier: Identifier): string;
+    function symbolName(symbol: Symbol): string;
+    function getNameOfJSDocTypedef(declaration: JSDocTypedefTag): Identifier | undefined;
+    function getNameOfDeclaration(declaration: Declaration | Expression): DeclarationName | undefined;
+    /**
+     * Gets the JSDoc parameter tags for the node if present.
+     *
+     * @remarks Returns any JSDoc param tag whose name matches the provided
+     * parameter, whether a param tag on a containing function
+     * expression, or a param tag on a variable declaration whose
+     * initializer is the containing function. The tags closest to the
+     * node are returned first, so in the previous example, the param
+     * tag on the containing function expression would be first.
+     *
+     * For binding patterns, parameter tags are matched by position.
+     */
+    function getJSDocParameterTags(param: ParameterDeclaration): ReadonlyArray<JSDocParameterTag>;
+    /**
+     * Gets the JSDoc type parameter tags for the node if present.
+     *
+     * @remarks Returns any JSDoc template tag whose names match the provided
+     * parameter, whether a template tag on a containing function
+     * expression, or a template tag on a variable declaration whose
+     * initializer is the containing function. The tags closest to the
+     * node are returned first, so in the previous example, the template
+     * tag on the containing function expression would be first.
+     */
+    function getJSDocTypeParameterTags(param: TypeParameterDeclaration): ReadonlyArray<JSDocTemplateTag>;
+    /**
+     * Return true if the node has JSDoc parameter tags.
+     *
+     * @remarks Includes parameter tags that are not directly on the node,
+     * for example on a variable declaration whose initializer is a function expression.
+     */
+    function hasJSDocParameterTags(node: FunctionLikeDeclaration | SignatureDeclaration): boolean;
+    /** Gets the JSDoc augments tag for the node if present */
+    function getJSDocAugmentsTag(node: Node): JSDocAugmentsTag | undefined;
+    /** Gets the JSDoc class tag for the node if present */
+    function getJSDocClassTag(node: Node): JSDocClassTag | undefined;
+    /** Gets the JSDoc enum tag for the node if present */
+    function getJSDocEnumTag(node: Node): JSDocEnumTag | undefined;
+    /** Gets the JSDoc this tag for the node if present */
+    function getJSDocThisTag(node: Node): JSDocThisTag | undefined;
+    /** Gets the JSDoc return tag for the node if present */
+    function getJSDocReturnTag(node: Node): JSDocReturnTag | undefined;
+    /** Gets the JSDoc template tag for the node if present */
+    function getJSDocTemplateTag(node: Node): JSDocTemplateTag | undefined;
+    /** Gets the JSDoc type tag for the node if present and valid */
+    function getJSDocTypeTag(node: Node): JSDocTypeTag | undefined;
+    /**
+     * Gets the type node for the node if provided via JSDoc.
+     *
+     * @remarks The search includes any JSDoc param tag that relates
+     * to the provided parameter, for example a type tag on the
+     * parameter itself, or a param tag on a containing function
+     * expression, or a param tag on a variable declaration whose
+     * initializer is the containing function. The tags closest to the
+     * node are examined first, so in the previous example, the type
+     * tag directly on the node would be returned.
+     */
+    function getJSDocType(node: Node): TypeNode | undefined;
+    /**
+     * Gets the return type node for the node if provided via JSDoc return tag or type tag.
+     *
+     * @remarks `getJSDocReturnTag` just gets the whole JSDoc tag. This function
+     * gets the type from inside the braces, after the fat arrow, etc.
+     */
+    function getJSDocReturnType(node: Node): TypeNode | undefined;
+    /** Get all JSDoc tags related to a node, including those on parent nodes. */
+    function getJSDocTags(node: Node): ReadonlyArray<JSDocTag>;
+    /** Gets all JSDoc tags of a specified kind, or undefined if not present. */
+    function getAllJSDocTagsOfKind(node: Node, kind: SyntaxKind): ReadonlyArray<JSDocTag>;
+    /**
+     * Gets the effective type parameters. If the node was parsed in a
+     * JavaScript file, gets the type parameters from the `@template` tag from JSDoc.
+     */
+    function getEffectiveTypeParameterDeclarations(node: DeclarationWithTypeParameters): ReadonlyArray<TypeParameterDeclaration>;
+    function getEffectiveConstraintOfTypeParameter(node: TypeParameterDeclaration): TypeNode | undefined;
+}
+declare namespace ts {
+    function isNumericLiteral(node: Node): node is NumericLiteral;
+    function isBigIntLiteral(node: Node): node is BigIntLiteral;
+    function isStringLiteral(node: Node): node is StringLiteral;
+    function isJsxText(node: Node): node is JsxText;
+    function isRegularExpressionLiteral(node: Node): node is RegularExpressionLiteral;
+    function isNoSubstitutionTemplateLiteral(node: Node): node is NoSubstitutionTemplateLiteral;
+    function isTemplateHead(node: Node): node is TemplateHead;
+    function isTemplateMiddle(node: Node): node is TemplateMiddle;
+    function isTemplateTail(node: Node): node is TemplateTail;
+    function isIdentifier(node: Node): node is Identifier;
+    function isQualifiedName(node: Node): node is QualifiedName;
+    function isComputedPropertyName(node: Node): node is ComputedPropertyName;
+    function isTypeParameterDeclaration(node: Node): node is TypeParameterDeclaration;
+    function isParameter(node: Node): node is ParameterDeclaration;
+    function isDecorator(node: Node): node is Decorator;
+    function isPropertySignature(node: Node): node is PropertySignature;
+    function isPropertyDeclaration(node: Node): node is PropertyDeclaration;
+    function isMethodSignature(node: Node): node is MethodSignature;
+    function isMethodDeclaration(node: Node): node is MethodDeclaration;
+    function isConstructorDeclaration(node: Node): node is ConstructorDeclaration;
+    function isGetAccessorDeclaration(node: Node): node is GetAccessorDeclaration;
+    function isSetAccessorDeclaration(node: Node): node is SetAccessorDeclaration;
+    function isCallSignatureDeclaration(node: Node): node is CallSignatureDeclaration;
+    function isConstructSignatureDeclaration(node: Node): node is ConstructSignatureDeclaration;
+    function isIndexSignatureDeclaration(node: Node): node is IndexSignatureDeclaration;
+    function isTypePredicateNode(node: Node): node is TypePredicateNode;
+    function isTypeReferenceNode(node: Node): node is TypeReferenceNode;
+    function isFunctionTypeNode(node: Node): node is FunctionTypeNode;
+    function isConstructorTypeNode(node: Node): node is ConstructorTypeNode;
+    function isTypeQueryNode(node: Node): node is TypeQueryNode;
+    function isTypeLiteralNode(node: Node): node is TypeLiteralNode;
+    function isArrayTypeNode(node: Node): node is ArrayTypeNode;
+    function isTupleTypeNode(node: Node): node is TupleTypeNode;
+    function isUnionTypeNode(node: Node): node is UnionTypeNode;
+    function isIntersectionTypeNode(node: Node): node is IntersectionTypeNode;
+    function isConditionalTypeNode(node: Node): node is ConditionalTypeNode;
+    function isInferTypeNode(node: Node): node is InferTypeNode;
+    function isParenthesizedTypeNode(node: Node): node is ParenthesizedTypeNode;
+    function isThisTypeNode(node: Node): node is ThisTypeNode;
+    function isTypeOperatorNode(node: Node): node is TypeOperatorNode;
+    function isIndexedAccessTypeNode(node: Node): node is IndexedAccessTypeNode;
+    function isMappedTypeNode(node: Node): node is MappedTypeNode;
+    function isLiteralTypeNode(node: Node): node is LiteralTypeNode;
+    function isImportTypeNode(node: Node): node is ImportTypeNode;
+    function isObjectBindingPattern(node: Node): node is ObjectBindingPattern;
+    function isArrayBindingPattern(node: Node): node is ArrayBindingPattern;
+    function isBindingElement(node: Node): node is BindingElement;
+    function isArrayLiteralExpression(node: Node): node is ArrayLiteralExpression;
+    function isObjectLiteralExpression(node: Node): node is ObjectLiteralExpression;
+    function isPropertyAccessExpression(node: Node): node is PropertyAccessExpression;
+    function isElementAccessExpression(node: Node): node is ElementAccessExpression;
+    function isCallExpression(node: Node): node is CallExpression;
+    function isNewExpression(node: Node): node is NewExpression;
+    function isTaggedTemplateExpression(node: Node): node is TaggedTemplateExpression;
+    function isTypeAssertion(node: Node): node is TypeAssertion;
+    function isParenthesizedExpression(node: Node): node is ParenthesizedExpression;
+    function skipPartiallyEmittedExpressions(node: Expression): Expression;
+    function skipPartiallyEmittedExpressions(node: Node): Node;
+    function isFunctionExpression(node: Node): node is FunctionExpression;
+    function isArrowFunction(node: Node): node is ArrowFunction;
+    function isDeleteExpression(node: Node): node is DeleteExpression;
+    function isTypeOfExpression(node: Node): node is TypeOfExpression;
+    function isVoidExpression(node: Node): node is VoidExpression;
+    function isAwaitExpression(node: Node): node is AwaitExpression;
+    function isPrefixUnaryExpression(node: Node): node is PrefixUnaryExpression;
+    function isPostfixUnaryExpression(node: Node): node is PostfixUnaryExpression;
+    function isBinaryExpression(node: Node): node is BinaryExpression;
+    function isConditionalExpression(node: Node): node is ConditionalExpression;
+    function isTemplateExpression(node: Node): node is TemplateExpression;
+    function isYieldExpression(node: Node): node is YieldExpression;
+    function isSpreadElement(node: Node): node is SpreadElement;
+    function isClassExpression(node: Node): node is ClassExpression;
+    function isOmittedExpression(node: Node): node is OmittedExpression;
+    function isExpressionWithTypeArguments(node: Node): node is ExpressionWithTypeArguments;
+    function isAsExpression(node: Node): node is AsExpression;
+    function isNonNullExpression(node: Node): node is NonNullExpression;
+    function isMetaProperty(node: Node): node is MetaProperty;
+    function isTemplateSpan(node: Node): node is TemplateSpan;
+    function isSemicolonClassElement(node: Node): node is SemicolonClassElement;
+    function isBlock(node: Node): node is Block;
+    function isVariableStatement(node: Node): node is VariableStatement;
+    function isEmptyStatement(node: Node): node is EmptyStatement;
+    function isExpressionStatement(node: Node): node is ExpressionStatement;
+    function isIfStatement(node: Node): node is IfStatement;
+    function isDoStatement(node: Node): node is DoStatement;
+    function isWhileStatement(node: Node): node is WhileStatement;
+    function isForStatement(node: Node): node is ForStatement;
+    function isForInStatement(node: Node): node is ForInStatement;
+    function isForOfStatement(node: Node): node is ForOfStatement;
+    function isContinueStatement(node: Node): node is ContinueStatement;
+    function isBreakStatement(node: Node): node is BreakStatement;
+    function isBreakOrContinueStatement(node: Node): node is BreakOrContinueStatement;
+    function isReturnStatement(node: Node): node is ReturnStatement;
+    function isWithStatement(node: Node): node is WithStatement;
+    function isSwitchStatement(node: Node): node is SwitchStatement;
+    function isLabeledStatement(node: Node): node is LabeledStatement;
+    function isThrowStatement(node: Node): node is ThrowStatement;
+    function isTryStatement(node: Node): node is TryStatement;
+    function isDebuggerStatement(node: Node): node is DebuggerStatement;
+    function isVariableDeclaration(node: Node): node is VariableDeclaration;
+    function isVariableDeclarationList(node: Node): node is VariableDeclarationList;
+    function isFunctionDeclaration(node: Node): node is FunctionDeclaration;
+    function isClassDeclaration(node: Node): node is ClassDeclaration;
+    function isInterfaceDeclaration(node: Node): node is InterfaceDeclaration;
+    function isTypeAliasDeclaration(node: Node): node is TypeAliasDeclaration;
+    function isEnumDeclaration(node: Node): node is EnumDeclaration;
+    function isModuleDeclaration(node: Node): node is ModuleDeclaration;
+    function isModuleBlock(node: Node): node is ModuleBlock;
+    function isCaseBlock(node: Node): node is CaseBlock;
+    function isNamespaceExportDeclaration(node: Node): node is NamespaceExportDeclaration;
+    function isImportEqualsDeclaration(node: Node): node is ImportEqualsDeclaration;
+    function isImportDeclaration(node: Node): node is ImportDeclaration;
+    function isImportClause(node: Node): node is ImportClause;
+    function isNamespaceImport(node: Node): node is NamespaceImport;
+    function isNamedImports(node: Node): node is NamedImports;
+    function isImportSpecifier(node: Node): node is ImportSpecifier;
+    function isExportAssignment(node: Node): node is ExportAssignment;
+    function isExportDeclaration(node: Node): node is ExportDeclaration;
+    function isNamedExports(node: Node): node is NamedExports;
+    function isExportSpecifier(node: Node): node is ExportSpecifier;
+    function isMissingDeclaration(node: Node): node is MissingDeclaration;
+    function isExternalModuleReference(node: Node): node is ExternalModuleReference;
+    function isJsxElement(node: Node): node is JsxElement;
+    function isJsxSelfClosingElement(node: Node): node is JsxSelfClosingElement;
+    function isJsxOpeningElement(node: Node): node is JsxOpeningElement;
+    function isJsxClosingElement(node: Node): node is JsxClosingElement;
+    function isJsxFragment(node: Node): node is JsxFragment;
+    function isJsxOpeningFragment(node: Node): node is JsxOpeningFragment;
+    function isJsxClosingFragment(node: Node): node is JsxClosingFragment;
+    function isJsxAttribute(node: Node): node is JsxAttribute;
+    function isJsxAttributes(node: Node): node is JsxAttributes;
+    function isJsxSpreadAttribute(node: Node): node is JsxSpreadAttribute;
+    function isJsxExpression(node: Node): node is JsxExpression;
+    function isCaseClause(node: Node): node is CaseClause;
+    function isDefaultClause(node: Node): node is DefaultClause;
+    function isHeritageClause(node: Node): node is HeritageClause;
+    function isCatchClause(node: Node): node is CatchClause;
+    function isPropertyAssignment(node: Node): node is PropertyAssignment;
+    function isShorthandPropertyAssignment(node: Node): node is ShorthandPropertyAssignment;
+    function isSpreadAssignment(node: Node): node is SpreadAssignment;
+    function isEnumMember(node: Node): node is EnumMember;
+    function isSourceFile(node: Node): node is SourceFile;
+    function isBundle(node: Node): node is Bundle;
+    function isUnparsedSource(node: Node): node is UnparsedSource;
+    function isJSDocTypeExpression(node: Node): node is JSDocTypeExpression;
+    function isJSDocAllType(node: JSDocAllType): node is JSDocAllType;
+    function isJSDocUnknownType(node: Node): node is JSDocUnknownType;
+    function isJSDocNullableType(node: Node): node is JSDocNullableType;
+    function isJSDocNonNullableType(node: Node): node is JSDocNonNullableType;
+    function isJSDocOptionalType(node: Node): node is JSDocOptionalType;
+    function isJSDocFunctionType(node: Node): node is JSDocFunctionType;
+    function isJSDocVariadicType(node: Node): node is JSDocVariadicType;
+    function isJSDoc(node: Node): node is JSDoc;
+    function isJSDocAugmentsTag(node: Node): node is JSDocAugmentsTag;
+    function isJSDocClassTag(node: Node): node is JSDocClassTag;
+    function isJSDocEnumTag(node: Node): node is JSDocEnumTag;
+    function isJSDocThisTag(node: Node): node is JSDocThisTag;
+    function isJSDocParameterTag(node: Node): node is JSDocParameterTag;
+    function isJSDocReturnTag(node: Node): node is JSDocReturnTag;
+    function isJSDocTypeTag(node: Node): node is JSDocTypeTag;
+    function isJSDocTemplateTag(node: Node): node is JSDocTemplateTag;
+    function isJSDocTypedefTag(node: Node): node is JSDocTypedefTag;
+    function isJSDocPropertyTag(node: Node): node is JSDocPropertyTag;
+    function isJSDocPropertyLikeTag(node: Node): node is JSDocPropertyLikeTag;
+    function isJSDocTypeLiteral(node: Node): node is JSDocTypeLiteral;
+    function isJSDocCallbackTag(node: Node): node is JSDocCallbackTag;
+    function isJSDocSignature(node: Node): node is JSDocSignature;
+}
+declare namespace ts {
+    /**
+     * True if node is of some token syntax kind.
+     * For example, this is true for an IfKeyword but not for an IfStatement.
+     * Literals are considered tokens, except TemplateLiteral, but does include TemplateHead/Middle/Tail.
+     */
+    function isToken(n: Node): boolean;
+    function isLiteralExpression(node: Node): node is LiteralExpression;
+    type TemplateLiteralToken = NoSubstitutionTemplateLiteral | TemplateHead | TemplateMiddle | TemplateTail;
+    function isTemplateLiteralToken(node: Node): node is TemplateLiteralToken;
+    function isTemplateMiddleOrTemplateTail(node: Node): node is TemplateMiddle | TemplateTail;
+    function isImportOrExportSpecifier(node: Node): node is ImportSpecifier | ExportSpecifier;
+    function isStringTextContainingNode(node: Node): node is StringLiteral | TemplateLiteralToken;
+    function isModifier(node: Node): node is Modifier;
+    function isEntityName(node: Node): node is EntityName;
+    function isPropertyName(node: Node): node is PropertyName;
+    function isBindingName(node: Node): node is BindingName;
+    function isFunctionLike(node: Node): node is SignatureDeclaration;
+    function isClassElement(node: Node): node is ClassElement;
+    function isClassLike(node: Node): node is ClassLikeDeclaration;
+    function isAccessor(node: Node): node is AccessorDeclaration;
+    function isTypeElement(node: Node): node is TypeElement;
+    function isClassOrTypeElement(node: Node): node is ClassElement | TypeElement;
+    function isObjectLiteralElementLike(node: Node): node is ObjectLiteralElementLike;
+    /**
+     * Node test that determines whether a node is a valid type node.
+     * This differs from the `isPartOfTypeNode` function which determines whether a node is *part*
+     * of a TypeNode.
+     */
+    function isTypeNode(node: Node): node is TypeNode;
+    function isFunctionOrConstructorTypeNode(node: Node): node is FunctionTypeNode | ConstructorTypeNode;
+    function isPropertyAccessOrQualifiedName(node: Node): node is PropertyAccessExpression | QualifiedName;
+    function isCallLikeExpression(node: Node): node is CallLikeExpression;
+    function isCallOrNewExpression(node: Node): node is CallExpression | NewExpression;
+    function isTemplateLiteral(node: Node): node is TemplateLiteral;
+    function isAssertionExpression(node: Node): node is AssertionExpression;
+    function isIterationStatement(node: Node, lookInLabeledStatements: false): node is IterationStatement;
+    function isIterationStatement(node: Node, lookInLabeledStatements: boolean): node is IterationStatement | LabeledStatement;
+    function isJsxOpeningLikeElement(node: Node): node is JsxOpeningLikeElement;
+    function isCaseOrDefaultClause(node: Node): node is CaseOrDefaultClause;
+    /** True if node is of a kind that may contain comment text. */
+    function isJSDocCommentContainingNode(node: Node): boolean;
+    function isSetAccessor(node: Node): node is SetAccessorDeclaration;
+    function isGetAccessor(node: Node): node is GetAccessorDeclaration;
+    function isObjectLiteralElement(node: Node): node is ObjectLiteralElement;
+    function isStringLiteralLike(node: Node): node is StringLiteralLike;
+}
+declare namespace ts {
+    function createNode(kind: SyntaxKind, pos?: number, end?: number): Node;
+    /**
+     * Invokes a callback for each child of the given node. The 'cbNode' callback is invoked for all child nodes
+     * stored in properties. If a 'cbNodes' callback is specified, it is invoked for embedded arrays; otherwise,
+     * embedded arrays are flattened and the 'cbNode' callback is invoked for each element. If a callback returns
+     * a truthy value, iteration stops and that value is returned. Otherwise, undefined is returned.
+     *
+     * @param node a given node to visit its children
+     * @param cbNode a callback to be invoked for all child nodes
+     * @param cbNodes a callback to be invoked for embedded array
+     *
+     * @remarks `forEachChild` must visit the children of a node in the order
+     * that they appear in the source code. The language service depends on this property to locate nodes by position.
+     */
+    function forEachChild<T>(node: Node, cbNode: (node: Node) => T | undefined, cbNodes?: (nodes: NodeArray<Node>) => T | undefined): T | undefined;
+    function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes?: boolean, scriptKind?: ScriptKind): SourceFile;
+    function parseIsolatedEntityName(text: string, languageVersion: ScriptTarget): EntityName | undefined;
+    /**
+     * Parse json text into SyntaxTree and return node and parse errors if any
+     * @param fileName
+     * @param sourceText
+     */
+    function parseJsonText(fileName: string, sourceText: string): JsonSourceFile;
+    function isExternalModule(file: SourceFile): boolean;
+    function updateSourceFile(sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
+}
+declare namespace ts {
+    function parseCommandLine(commandLine: ReadonlyArray<string>, readFile?: (path: string) => string | undefined): ParsedCommandLine;
+    type DiagnosticReporter = (diagnostic: Diagnostic) => void;
+    /**
+     * Reports config file diagnostics
+     */
+    interface ConfigFileDiagnosticsReporter {
+        /**
+         * Reports unrecoverable error when parsing config file
+         */
+        onUnRecoverableConfigFileDiagnostic: DiagnosticReporter;
+    }
+    /**
+     * Interface extending ParseConfigHost to support ParseConfigFile that reads config file and reports errors
+     */
+    interface ParseConfigFileHost extends ParseConfigHost, ConfigFileDiagnosticsReporter {
+        getCurrentDirectory(): string;
+    }
+    /**
+     * Reads the config file, reports errors if any and exits if the config file cannot be found
+     */
+    function getParsedCommandLineOfConfigFile(configFileName: string, optionsToExtend: CompilerOptions, host: ParseConfigFileHost): ParsedCommandLine | undefined;
+    /**
+     * Read tsconfig.json file
+     * @param fileName The path to the config file
+     */
+    function readConfigFile(fileName: string, readFile: (path: string) => string | undefined): {
+        config?: any;
+        error?: Diagnostic;
+    };
+    /**
+     * Parse the text of the tsconfig.json file
+     * @param fileName The path to the config file
+     * @param jsonText The text of the config file
+     */
+    function parseConfigFileTextToJson(fileName: string, jsonText: string): {
+        config?: any;
+        error?: Diagnostic;
+    };
+    /**
+     * Read tsconfig.json file
+     * @param fileName The path to the config file
+     */
+    function readJsonConfigFile(fileName: string, readFile: (path: string) => string | undefined): TsConfigSourceFile;
+    /**
+     * Convert the json syntax tree into the json value
+     */
+    function convertToObject(sourceFile: JsonSourceFile, errors: Push<Diagnostic>): any;
+    /**
+     * Parse the contents of a config file (tsconfig.json).
+     * @param json The contents of the config file to parse
+     * @param host Instance of ParseConfigHost used to enumerate files in folder.
+     * @param basePath A root directory to resolve relative path entries in the config
+     *    file to. e.g. outDir
+     */
+    function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>): ParsedCommandLine;
+    /**
+     * Parse the contents of a config file (tsconfig.json).
+     * @param jsonNode The contents of the config file to parse
+     * @param host Instance of ParseConfigHost used to enumerate files in folder.
+     * @param basePath A root directory to resolve relative path entries in the config
+     *    file to. e.g. outDir
+     */
+    function parseJsonSourceFileConfigFileContent(sourceFile: TsConfigSourceFile, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>): ParsedCommandLine;
+    function convertCompilerOptionsFromJson(jsonOptions: any, basePath: string, configFileName?: string): {
+        options: CompilerOptions;
+        errors: Diagnostic[];
+    };
+    function convertTypeAcquisitionFromJson(jsonOptions: any, basePath: string, configFileName?: string): {
+        options: TypeAcquisition;
+        errors: Diagnostic[];
+    };
+}
+declare namespace ts {
+    function getEffectiveTypeRoots(options: CompilerOptions, host: GetEffectiveTypeRootsHost): string[] | undefined;
+    /**
+     * @param {string | undefined} containingFile - file that contains type reference directive, can be undefined if containing file is unknown.
+     * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups
+     * is assumed to be the same as root directory of the project.
+     */
+    function resolveTypeReferenceDirective(typeReferenceDirectiveName: string, containingFile: string | undefined, options: CompilerOptions, host: ModuleResolutionHost, redirectedReference?: ResolvedProjectReference): ResolvedTypeReferenceDirectiveWithFailedLookupLocations;
+    /**
+     * Given a set of options, returns the set of type directive names
+     *   that should be included for this program automatically.
+     * This list could either come from the config file,
+     *   or from enumerating the types root + initial secondary types lookup location.
+     * More type directives might appear in the program later as a result of loading actual source files;
+     *   this list is only the set of defaults that are implicitly included.
+     */
+    function getAutomaticTypeDirectiveNames(options: CompilerOptions, host: ModuleResolutionHost): string[];
+    /**
+     * Cached module resolutions per containing directory.
+     * This assumes that any module id will have the same resolution for sibling files located in the same folder.
+     */
+    interface ModuleResolutionCache extends NonRelativeModuleNameResolutionCache {
+        getOrCreateCacheForDirectory(directoryName: string, redirectedReference?: ResolvedProjectReference): Map<ResolvedModuleWithFailedLookupLocations>;
+    }
+    /**
+     * Stored map from non-relative module name to a table: directory -> result of module lookup in this directory
+     * We support only non-relative module names because resolution of relative module names is usually more deterministic and thus less expensive.
+     */
+    interface NonRelativeModuleNameResolutionCache {
+        getOrCreateCacheForModuleName(nonRelativeModuleName: string, redirectedReference?: ResolvedProjectReference): PerModuleNameCache;
+    }
+    interface PerModuleNameCache {
+        get(directory: string): ResolvedModuleWithFailedLookupLocations | undefined;
+        set(directory: string, result: ResolvedModuleWithFailedLookupLocations): void;
+    }
+    function createModuleResolutionCache(currentDirectory: string, getCanonicalFileName: (s: string) => string): ModuleResolutionCache;
+    function resolveModuleNameFromCache(moduleName: string, containingFile: string, cache: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations | undefined;
+    function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations;
+    function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations;
+    function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: NonRelativeModuleNameResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations;
+}
+declare namespace ts {
+    function createNodeArray<T extends Node>(elements?: ReadonlyArray<T>, hasTrailingComma?: boolean): NodeArray<T>;
+    /** If a node is passed, creates a string literal whose source text is read from a source node during emit. */
+    function createLiteral(value: string | StringLiteral | NoSubstitutionTemplateLiteral | NumericLiteral | Identifier): StringLiteral;
+    function createLiteral(value: number | PseudoBigInt): NumericLiteral;
+    function createLiteral(value: boolean): BooleanLiteral;
+    function createLiteral(value: string | number | PseudoBigInt | boolean): PrimaryExpression;
+    function createNumericLiteral(value: string): NumericLiteral;
+    function createBigIntLiteral(value: string): BigIntLiteral;
+    function createStringLiteral(text: string): StringLiteral;
+    function createRegularExpressionLiteral(text: string): RegularExpressionLiteral;
+    function createIdentifier(text: string): Identifier;
+    function updateIdentifier(node: Identifier): Identifier;
+    /** Create a unique temporary variable. */
+    function createTempVariable(recordTempVariable: ((node: Identifier) => void) | undefined): Identifier;
+    /** Create a unique temporary variable for use in a loop. */
+    function createLoopVariable(): Identifier;
+    /** Create a unique name based on the supplied text. */
+    function createUniqueName(text: string): Identifier;
+    /** Create a unique name based on the supplied text. */
+    function createOptimisticUniqueName(text: string): Identifier;
+    /** Create a unique name based on the supplied text. This does not consider names injected by the transformer. */
+    function createFileLevelUniqueName(text: string): Identifier;
+    /** Create a unique name generated for a node. */
+    function getGeneratedNameForNode(node: Node | undefined): Identifier;
+    function createToken<TKind extends SyntaxKind>(token: TKind): Token<TKind>;
+    function createSuper(): SuperExpression;
+    function createThis(): ThisExpression & Token<SyntaxKind.ThisKeyword>;
+    function createNull(): NullLiteral & Token<SyntaxKind.NullKeyword>;
+    function createTrue(): BooleanLiteral & Token<SyntaxKind.TrueKeyword>;
+    function createFalse(): BooleanLiteral & Token<SyntaxKind.FalseKeyword>;
+    function createModifier<T extends Modifier["kind"]>(kind: T): Token<T>;
+    function createModifiersFromModifierFlags(flags: ModifierFlags): Modifier[];
+    function createQualifiedName(left: EntityName, right: string | Identifier): QualifiedName;
+    function updateQualifiedName(node: QualifiedName, left: EntityName, right: Identifier): QualifiedName;
+    function createComputedPropertyName(expression: Expression): ComputedPropertyName;
+    function updateComputedPropertyName(node: ComputedPropertyName, expression: Expression): ComputedPropertyName;
+    function createTypeParameterDeclaration(name: string | Identifier, constraint?: TypeNode, defaultType?: TypeNode): TypeParameterDeclaration;
+    function updateTypeParameterDeclaration(node: TypeParameterDeclaration, name: Identifier, constraint: TypeNode | undefined, defaultType: TypeNode | undefined): TypeParameterDeclaration;
+    function createParameter(decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, dotDotDotToken: DotDotDotToken | undefined, name: string | BindingName, questionToken?: QuestionToken, type?: TypeNode, initializer?: Expression): ParameterDeclaration;
+    function updateParameter(node: ParameterDeclaration, decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, dotDotDotToken: DotDotDotToken | undefined, name: string | BindingName, questionToken: QuestionToken | undefined, type: TypeNode | undefined, initializer: Expression | undefined): ParameterDeclaration;
+    function createDecorator(expression: Expression): Decorator;
+    function updateDecorator(node: Decorator, expression: Expression): Decorator;
+    function createPropertySignature(modifiers: ReadonlyArray<Modifier> | undefined, name: PropertyName | string, questionToken: QuestionToken | undefined, type: TypeNode | undefined, initializer: Expression | undefined): PropertySignature;
+    function updatePropertySignature(node: PropertySignature, modifiers: ReadonlyArray<Modifier> | undefined, name: PropertyName, questionToken: QuestionToken | undefined, type: TypeNode | undefined, initializer: Expression | undefined): PropertySignature;
+    function createProperty(decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, name: string | PropertyName, questionOrExclamationToken: QuestionToken | ExclamationToken | undefined, type: TypeNode | undefined, initializer: Expression | undefined): PropertyDeclaration;
+    function updateProperty(node: PropertyDeclaration, decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, name: string | PropertyName, questionOrExclamationToken: QuestionToken | ExclamationToken | undefined, type: TypeNode | undefined, initializer: Expression | undefined): PropertyDeclaration;
+    function createMethodSignature(typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, parameters: ReadonlyArray<ParameterDeclaration>, type: TypeNode | undefined, name: string | PropertyName, questionToken: QuestionToken | undefined): MethodSignature;
+    function updateMethodSignature(node: MethodSignature, typeParameters: NodeArray<TypeParameterDeclaration> | undefined, parameters: NodeArray<ParameterDeclaration>, type: TypeNode | undefined, name: PropertyName, questionToken: QuestionToken | undefined): MethodSignature;
+    function createMethod(decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, asteriskToken: AsteriskToken | undefined, name: string | PropertyName, questionToken: QuestionToken | undefined, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, parameters: ReadonlyArray<ParameterDeclaration>, type: TypeNode | undefined, body: Block | undefined): MethodDeclaration;
+    function updateMethod(node: MethodDeclaration, decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, asteriskToken: AsteriskToken | undefined, name: PropertyName, questionToken: QuestionToken | undefined, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, parameters: ReadonlyArray<ParameterDeclaration>, type: TypeNode | undefined, body: Block | undefined): MethodDeclaration;
+    function createConstructor(decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, parameters: ReadonlyArray<ParameterDeclaration>, body: Block | undefined): ConstructorDeclaration;
+    function updateConstructor(node: ConstructorDeclaration, decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, parameters: ReadonlyArray<ParameterDeclaration>, body: Block | undefined): ConstructorDeclaration;
+    function createGetAccessor(decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, name: string | PropertyName, parameters: ReadonlyArray<ParameterDeclaration>, type: TypeNode | undefined, body: Block | undefined): GetAccessorDeclaration;
+    function updateGetAccessor(node: GetAccessorDeclaration, decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, name: PropertyName, parameters: ReadonlyArray<ParameterDeclaration>, type: TypeNode | undefined, body: Block | undefined): GetAccessorDeclaration;
+    function createSetAccessor(decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, name: string | PropertyName, parameters: ReadonlyArray<ParameterDeclaration>, body: Block | undefined): SetAccessorDeclaration;
+    function updateSetAccessor(node: SetAccessorDeclaration, decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, name: PropertyName, parameters: ReadonlyArray<ParameterDeclaration>, body: Block | undefined): SetAccessorDeclaration;
+    function createCallSignature(typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, parameters: ReadonlyArray<ParameterDeclaration>, type: TypeNode | undefined): CallSignatureDeclaration;
+    function updateCallSignature(node: CallSignatureDeclaration, typeParameters: NodeArray<TypeParameterDeclaration> | undefined, parameters: NodeArray<ParameterDeclaration>, type: TypeNode | undefined): CallSignatureDeclaration;
+    function createConstructSignature(typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, parameters: ReadonlyArray<ParameterDeclaration>, type: TypeNode | undefined): ConstructSignatureDeclaration;
+    function updateConstructSignature(node: ConstructSignatureDeclaration, typeParameters: NodeArray<TypeParameterDeclaration> | undefined, parameters: NodeArray<ParameterDeclaration>, type: TypeNode | undefined): ConstructSignatureDeclaration;
+    function createIndexSignature(decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, parameters: ReadonlyArray<ParameterDeclaration>, type: TypeNode): IndexSignatureDeclaration;
+    function updateIndexSignature(node: IndexSignatureDeclaration, decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, parameters: ReadonlyArray<ParameterDeclaration>, type: TypeNode): IndexSignatureDeclaration;
+    function createKeywordTypeNode(kind: KeywordTypeNode["kind"]): KeywordTypeNode;
+    function createTypePredicateNode(parameterName: Identifier | ThisTypeNode | string, type: TypeNode): TypePredicateNode;
+    function updateTypePredicateNode(node: TypePredicateNode, parameterName: Identifier | ThisTypeNode, type: TypeNode): TypePredicateNode;
+    function createTypeReferenceNode(typeName: string | EntityName, typeArguments: ReadonlyArray<TypeNode> | undefined): TypeReferenceNode;
+    function updateTypeReferenceNode(node: TypeReferenceNode, typeName: EntityName, typeArguments: NodeArray<TypeNode> | undefined): TypeReferenceNode;
+    function createFunctionTypeNode(typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, parameters: ReadonlyArray<ParameterDeclaration>, type: TypeNode | undefined): FunctionTypeNode;
+    function updateFunctionTypeNode(node: FunctionTypeNode, typeParameters: NodeArray<TypeParameterDeclaration> | undefined, parameters: NodeArray<ParameterDeclaration>, type: TypeNode | undefined): FunctionTypeNode;
+    function createConstructorTypeNode(typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, parameters: ReadonlyArray<ParameterDeclaration>, type: TypeNode | undefined): ConstructorTypeNode;
+    function updateConstructorTypeNode(node: ConstructorTypeNode, typeParameters: NodeArray<TypeParameterDeclaration> | undefined, parameters: NodeArray<ParameterDeclaration>, type: TypeNode | undefined): ConstructorTypeNode;
+    function createTypeQueryNode(exprName: EntityName): TypeQueryNode;
+    function updateTypeQueryNode(node: TypeQueryNode, exprName: EntityName): TypeQueryNode;
+    function createTypeLiteralNode(members: ReadonlyArray<TypeElement> | undefined): TypeLiteralNode;
+    function updateTypeLiteralNode(node: TypeLiteralNode, members: NodeArray<TypeElement>): TypeLiteralNode;
+    function createArrayTypeNode(elementType: TypeNode): ArrayTypeNode;
+    function updateArrayTypeNode(node: ArrayTypeNode, elementType: TypeNode): ArrayTypeNode;
+    function createTupleTypeNode(elementTypes: ReadonlyArray<TypeNode>): TupleTypeNode;
+    function updateTupleTypeNode(node: TupleTypeNode, elementTypes: ReadonlyArray<TypeNode>): TupleTypeNode;
+    function createOptionalTypeNode(type: TypeNode): OptionalTypeNode;
+    function updateOptionalTypeNode(node: OptionalTypeNode, type: TypeNode): OptionalTypeNode;
+    function createRestTypeNode(type: TypeNode): RestTypeNode;
+    function updateRestTypeNode(node: RestTypeNode, type: TypeNode): RestTypeNode;
+    function createUnionTypeNode(types: ReadonlyArray<TypeNode>): UnionTypeNode;
+    function updateUnionTypeNode(node: UnionTypeNode, types: NodeArray<TypeNode>): UnionTypeNode;
+    function createIntersectionTypeNode(types: ReadonlyArray<TypeNode>): IntersectionTypeNode;
+    function updateIntersectionTypeNode(node: IntersectionTypeNode, types: NodeArray<TypeNode>): IntersectionTypeNode;
+    function createUnionOrIntersectionTypeNode(kind: SyntaxKind.UnionType | SyntaxKind.IntersectionType, types: ReadonlyArray<TypeNode>): UnionOrIntersectionTypeNode;
+    function createConditionalTypeNode(checkType: TypeNode, extendsType: TypeNode, trueType: TypeNode, falseType: TypeNode): ConditionalTypeNode;
+    function updateConditionalTypeNode(node: ConditionalTypeNode, checkType: TypeNode, extendsType: TypeNode, trueType: TypeNode, falseType: TypeNode): ConditionalTypeNode;
+    function createInferTypeNode(typeParameter: TypeParameterDeclaration): InferTypeNode;
+    function updateInferTypeNode(node: InferTypeNode, typeParameter: TypeParameterDeclaration): InferTypeNode;
+    function createImportTypeNode(argument: TypeNode, qualifier?: EntityName, typeArguments?: ReadonlyArray<TypeNode>, isTypeOf?: boolean): ImportTypeNode;
+    function updateImportTypeNode(node: ImportTypeNode, argument: TypeNode, qualifier?: EntityName, typeArguments?: ReadonlyArray<TypeNode>, isTypeOf?: boolean): ImportTypeNode;
+    function createParenthesizedType(type: TypeNode): ParenthesizedTypeNode;
+    function updateParenthesizedType(node: ParenthesizedTypeNode, type: TypeNode): ParenthesizedTypeNode;
+    function createThisTypeNode(): ThisTypeNode;
+    function createTypeOperatorNode(type: TypeNode): TypeOperatorNode;
+    function createTypeOperatorNode(operator: SyntaxKind.KeyOfKeyword | SyntaxKind.UniqueKeyword, type: TypeNode): TypeOperatorNode;
+    function updateTypeOperatorNode(node: TypeOperatorNode, type: TypeNode): TypeOperatorNode;
+    function createIndexedAccessTypeNode(objectType: TypeNode, indexType: TypeNode): IndexedAccessTypeNode;
+    function updateIndexedAccessTypeNode(node: IndexedAccessTypeNode, objectType: TypeNode, indexType: TypeNode): IndexedAccessTypeNode;
+    function createMappedTypeNode(readonlyToken: ReadonlyToken | PlusToken | MinusToken | undefined, typeParameter: TypeParameterDeclaration, questionToken: QuestionToken | PlusToken | MinusToken | undefined, type: TypeNode | undefined): MappedTypeNode;
+    function updateMappedTypeNode(node: MappedTypeNode, readonlyToken: ReadonlyToken | PlusToken | MinusToken | undefined, typeParameter: TypeParameterDeclaration, questionToken: QuestionToken | PlusToken | MinusToken | undefined, type: TypeNode | undefined): MappedTypeNode;
+    function createLiteralTypeNode(literal: LiteralTypeNode["literal"]): LiteralTypeNode;
+    function updateLiteralTypeNode(node: LiteralTypeNode, literal: LiteralTypeNode["literal"]): LiteralTypeNode;
+    function createObjectBindingPattern(elements: ReadonlyArray<BindingElement>): ObjectBindingPattern;
+    function updateObjectBindingPattern(node: ObjectBindingPattern, elements: ReadonlyArray<BindingElement>): ObjectBindingPattern;
+    function createArrayBindingPattern(elements: ReadonlyArray<ArrayBindingElement>): ArrayBindingPattern;
+    function updateArrayBindingPattern(node: ArrayBindingPattern, elements: ReadonlyArray<ArrayBindingElement>): ArrayBindingPattern;
+    function createBindingElement(dotDotDotToken: DotDotDotToken | undefined, propertyName: string | PropertyName | undefined, name: string | BindingName, initializer?: Expression): BindingElement;
+    function updateBindingElement(node: BindingElement, dotDotDotToken: DotDotDotToken | undefined, propertyName: PropertyName | undefined, name: BindingName, initializer: Expression | undefined): BindingElement;
+    function createArrayLiteral(elements?: ReadonlyArray<Expression>, multiLine?: boolean): ArrayLiteralExpression;
+    function updateArrayLiteral(node: ArrayLiteralExpression, elements: ReadonlyArray<Expression>): ArrayLiteralExpression;
+    function createObjectLiteral(properties?: ReadonlyArray<ObjectLiteralElementLike>, multiLine?: boolean): ObjectLiteralExpression;
+    function updateObjectLiteral(node: ObjectLiteralExpression, properties: ReadonlyArray<ObjectLiteralElementLike>): ObjectLiteralExpression;
+    function createPropertyAccess(expression: Expression, name: string | Identifier | undefined): PropertyAccessExpression;
+    function updatePropertyAccess(node: PropertyAccessExpression, expression: Expression, name: Identifier): PropertyAccessExpression;
+    function createElementAccess(expression: Expression, index: number | Expression): ElementAccessExpression;
+    function updateElementAccess(node: ElementAccessExpression, expression: Expression, argumentExpression: Expression): ElementAccessExpression;
+    function createCall(expression: Expression, typeArguments: ReadonlyArray<TypeNode> | undefined, argumentsArray: ReadonlyArray<Expression> | undefined): CallExpression;
+    function updateCall(node: CallExpression, expression: Expression, typeArguments: ReadonlyArray<TypeNode> | undefined, argumentsArray: ReadonlyArray<Expression>): CallExpression;
+    function createNew(expression: Expression, typeArguments: ReadonlyArray<TypeNode> | undefined, argumentsArray: ReadonlyArray<Expression> | undefined): NewExpression;
+    function updateNew(node: NewExpression, expression: Expression, typeArguments: ReadonlyArray<TypeNode> | undefined, argumentsArray: ReadonlyArray<Expression> | undefined): NewExpression;
+    /** @deprecated */ function createTaggedTemplate(tag: Expression, template: TemplateLiteral): TaggedTemplateExpression;
+    function createTaggedTemplate(tag: Expression, typeArguments: ReadonlyArray<TypeNode> | undefined, template: TemplateLiteral): TaggedTemplateExpression;
+    /** @deprecated */ function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, template: TemplateLiteral): TaggedTemplateExpression;
+    function updateTaggedTemplate(node: TaggedTemplateExpression, tag: Expression, typeArguments: ReadonlyArray<TypeNode> | undefined, template: TemplateLiteral): TaggedTemplateExpression;
+    function createTypeAssertion(type: TypeNode, expression: Expression): TypeAssertion;
+    function updateTypeAssertion(node: TypeAssertion, type: TypeNode, expression: Expression): TypeAssertion;
+    function createParen(expression: Expression): ParenthesizedExpression;
+    function updateParen(node: ParenthesizedExpression, expression: Expression): ParenthesizedExpression;
+    function createFunctionExpression(modifiers: ReadonlyArray<Modifier> | undefined, asteriskToken: AsteriskToken | undefined, name: string | Identifier | undefined, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, parameters: ReadonlyArray<ParameterDeclaration> | undefined, type: TypeNode | undefined, body: Block): FunctionExpression;
+    function updateFunctionExpression(node: FunctionExpression, modifiers: ReadonlyArray<Modifier> | undefined, asteriskToken: AsteriskToken | undefined, name: Identifier | undefined, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, parameters: ReadonlyArray<ParameterDeclaration>, type: TypeNode | undefined, body: Block): FunctionExpression;
+    function createArrowFunction(modifiers: ReadonlyArray<Modifier> | undefined, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, parameters: ReadonlyArray<ParameterDeclaration>, type: TypeNode | undefined, equalsGreaterThanToken: EqualsGreaterThanToken | undefined, body: ConciseBody): ArrowFunction;
+    function updateArrowFunction(node: ArrowFunction, modifiers: ReadonlyArray<Modifier> | undefined, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, parameters: ReadonlyArray<ParameterDeclaration>, type: TypeNode | undefined, equalsGreaterThanToken: Token<SyntaxKind.EqualsGreaterThanToken>, body: ConciseBody): ArrowFunction;
+    function createDelete(expression: Expression): DeleteExpression;
+    function updateDelete(node: DeleteExpression, expression: Expression): DeleteExpression;
+    function createTypeOf(expression: Expression): TypeOfExpression;
+    function updateTypeOf(node: TypeOfExpression, expression: Expression): TypeOfExpression;
+    function createVoid(expression: Expression): VoidExpression;
+    function updateVoid(node: VoidExpression, expression: Expression): VoidExpression;
+    function createAwait(expression: Expression): AwaitExpression;
+    function updateAwait(node: AwaitExpression, expression: Expression): AwaitExpression;
+    function createPrefix(operator: PrefixUnaryOperator, operand: Expression): PrefixUnaryExpression;
+    function updatePrefix(node: PrefixUnaryExpression, operand: Expression): PrefixUnaryExpression;
+    function createPostfix(operand: Expression, operator: PostfixUnaryOperator): PostfixUnaryExpression;
+    function updatePostfix(node: PostfixUnaryExpression, operand: Expression): PostfixUnaryExpression;
+    function createBinary(left: Expression, operator: BinaryOperator | BinaryOperatorToken, right: Expression): BinaryExpression;
+    function updateBinary(node: BinaryExpression, left: Expression, right: Expression, operator?: BinaryOperator | BinaryOperatorToken): BinaryExpression;
+    /** @deprecated */ function createConditional(condition: Expression, whenTrue: Expression, whenFalse: Expression): ConditionalExpression;
+    function createConditional(condition: Expression, questionToken: QuestionToken, whenTrue: Expression, colonToken: ColonToken, whenFalse: Expression): ConditionalExpression;
+    function updateConditional(node: ConditionalExpression, condition: Expression, questionToken: Token<SyntaxKind.QuestionToken>, whenTrue: Expression, colonToken: Token<SyntaxKind.ColonToken>, whenFalse: Expression): ConditionalExpression;
+    function createTemplateExpression(head: TemplateHead, templateSpans: ReadonlyArray<TemplateSpan>): TemplateExpression;
+    function updateTemplateExpression(node: TemplateExpression, head: TemplateHead, templateSpans: ReadonlyArray<TemplateSpan>): TemplateExpression;
+    function createTemplateHead(text: string): TemplateHead;
+    function createTemplateMiddle(text: string): TemplateMiddle;
+    function createTemplateTail(text: string): TemplateTail;
+    function createNoSubstitutionTemplateLiteral(text: string): NoSubstitutionTemplateLiteral;
+    function createYield(expression?: Expression): YieldExpression;
+    function createYield(asteriskToken: AsteriskToken | undefined, expression: Expression): YieldExpression;
+    function updateYield(node: YieldExpression, asteriskToken: AsteriskToken | undefined, expression: Expression): YieldExpression;
+    function createSpread(expression: Expression): SpreadElement;
+    function updateSpread(node: SpreadElement, expression: Expression): SpreadElement;
+    function createClassExpression(modifiers: ReadonlyArray<Modifier> | undefined, name: string | Identifier | undefined, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, heritageClauses: ReadonlyArray<HeritageClause> | undefined, members: ReadonlyArray<ClassElement>): ClassExpression;
+    function updateClassExpression(node: ClassExpression, modifiers: ReadonlyArray<Modifier> | undefined, name: Identifier | undefined, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, heritageClauses: ReadonlyArray<HeritageClause> | undefined, members: ReadonlyArray<ClassElement>): ClassExpression;
+    function createOmittedExpression(): OmittedExpression;
+    function createExpressionWithTypeArguments(typeArguments: ReadonlyArray<TypeNode> | undefined, expression: Expression): ExpressionWithTypeArguments;
+    function updateExpressionWithTypeArguments(node: ExpressionWithTypeArguments, typeArguments: ReadonlyArray<TypeNode> | undefined, expression: Expression): ExpressionWithTypeArguments;
+    function createAsExpression(expression: Expression, type: TypeNode): AsExpression;
+    function updateAsExpression(node: AsExpression, expression: Expression, type: TypeNode): AsExpression;
+    function createNonNullExpression(expression: Expression): NonNullExpression;
+    function updateNonNullExpression(node: NonNullExpression, expression: Expression): NonNullExpression;
+    function createMetaProperty(keywordToken: MetaProperty["keywordToken"], name: Identifier): MetaProperty;
+    function updateMetaProperty(node: MetaProperty, name: Identifier): MetaProperty;
+    function createTemplateSpan(expression: Expression, literal: TemplateMiddle | TemplateTail): TemplateSpan;
+    function updateTemplateSpan(node: TemplateSpan, expression: Expression, literal: TemplateMiddle | TemplateTail): TemplateSpan;
+    function createSemicolonClassElement(): SemicolonClassElement;
+    function createBlock(statements: ReadonlyArray<Statement>, multiLine?: boolean): Block;
+    function updateBlock(node: Block, statements: ReadonlyArray<Statement>): Block;
+    function createVariableStatement(modifiers: ReadonlyArray<Modifier> | undefined, declarationList: VariableDeclarationList | ReadonlyArray<VariableDeclaration>): VariableStatement;
+    function updateVariableStatement(node: VariableStatement, modifiers: ReadonlyArray<Modifier> | undefined, declarationList: VariableDeclarationList): VariableStatement;
+    function createEmptyStatement(): EmptyStatement;
+    function createExpressionStatement(expression: Expression): ExpressionStatement;
+    function updateExpressionStatement(node: ExpressionStatement, expression: Expression): ExpressionStatement;
+    /** @deprecated Use `createExpressionStatement` instead.  */
+    const createStatement: typeof createExpressionStatement;
+    /** @deprecated Use `updateExpressionStatement` instead.  */
+    const updateStatement: typeof updateExpressionStatement;
+    function createIf(expression: Expression, thenStatement: Statement, elseStatement?: Statement): IfStatement;
+    function updateIf(node: IfStatement, expression: Expression, thenStatement: Statement, elseStatement: Statement | undefined): IfStatement;
+    function createDo(statement: Statement, expression: Expression): DoStatement;
+    function updateDo(node: DoStatement, statement: Statement, expression: Expression): DoStatement;
+    function createWhile(expression: Expression, statement: Statement): WhileStatement;
+    function updateWhile(node: WhileStatement, expression: Expression, statement: Statement): WhileStatement;
+    function createFor(initializer: ForInitializer | undefined, condition: Expression | undefined, incrementor: Expression | undefined, statement: Statement): ForStatement;
+    function updateFor(node: ForStatement, initializer: ForInitializer | undefined, condition: Expression | undefined, incrementor: Expression | undefined, statement: Statement): ForStatement;
+    function createForIn(initializer: ForInitializer, expression: Expression, statement: Statement): ForInStatement;
+    function updateForIn(node: ForInStatement, initializer: ForInitializer, expression: Expression, statement: Statement): ForInStatement;
+    function createForOf(awaitModifier: AwaitKeywordToken | undefined, initializer: ForInitializer, expression: Expression, statement: Statement): ForOfStatement;
+    function updateForOf(node: ForOfStatement, awaitModifier: AwaitKeywordToken | undefined, initializer: ForInitializer, expression: Expression, statement: Statement): ForOfStatement;
+    function createContinue(label?: string | Identifier): ContinueStatement;
+    function updateContinue(node: ContinueStatement, label: Identifier | undefined): ContinueStatement;
+    function createBreak(label?: string | Identifier): BreakStatement;
+    function updateBreak(node: BreakStatement, label: Identifier | undefined): BreakStatement;
+    function createReturn(expression?: Expression): ReturnStatement;
+    function updateReturn(node: ReturnStatement, expression: Expression | undefined): ReturnStatement;
+    function createWith(expression: Expression, statement: Statement): WithStatement;
+    function updateWith(node: WithStatement, expression: Expression, statement: Statement): WithStatement;
+    function createSwitch(expression: Expression, caseBlock: CaseBlock): SwitchStatement;
+    function updateSwitch(node: SwitchStatement, expression: Expression, caseBlock: CaseBlock): SwitchStatement;
+    function createLabel(label: string | Identifier, statement: Statement): LabeledStatement;
+    function updateLabel(node: LabeledStatement, label: Identifier, statement: Statement): LabeledStatement;
+    function createThrow(expression: Expression): ThrowStatement;
+    function updateThrow(node: ThrowStatement, expression: Expression): ThrowStatement;
+    function createTry(tryBlock: Block, catchClause: CatchClause | undefined, finallyBlock: Block | undefined): TryStatement;
+    function updateTry(node: TryStatement, tryBlock: Block, catchClause: CatchClause | undefined, finallyBlock: Block | undefined): TryStatement;
+    function createDebuggerStatement(): DebuggerStatement;
+    function createVariableDeclaration(name: string | BindingName, type?: TypeNode, initializer?: Expression): VariableDeclaration;
+    function updateVariableDeclaration(node: VariableDeclaration, name: BindingName, type: TypeNode | undefined, initializer: Expression | undefined): VariableDeclaration;
+    function createVariableDeclarationList(declarations: ReadonlyArray<VariableDeclaration>, flags?: NodeFlags): VariableDeclarationList;
+    function updateVariableDeclarationList(node: VariableDeclarationList, declarations: ReadonlyArray<VariableDeclaration>): VariableDeclarationList;
+    function createFunctionDeclaration(decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, asteriskToken: AsteriskToken | undefined, name: string | Identifier | undefined, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, parameters: ReadonlyArray<ParameterDeclaration>, type: TypeNode | undefined, body: Block | undefined): FunctionDeclaration;
+    function updateFunctionDeclaration(node: FunctionDeclaration, decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, asteriskToken: AsteriskToken | undefined, name: Identifier | undefined, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, parameters: ReadonlyArray<ParameterDeclaration>, type: TypeNode | undefined, body: Block | undefined): FunctionDeclaration;
+    function createClassDeclaration(decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, name: string | Identifier | undefined, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, heritageClauses: ReadonlyArray<HeritageClause> | undefined, members: ReadonlyArray<ClassElement>): ClassDeclaration;
+    function updateClassDeclaration(node: ClassDeclaration, decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, name: Identifier | undefined, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, heritageClauses: ReadonlyArray<HeritageClause> | undefined, members: ReadonlyArray<ClassElement>): ClassDeclaration;
+    function createInterfaceDeclaration(decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, name: string | Identifier, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, heritageClauses: ReadonlyArray<HeritageClause> | undefined, members: ReadonlyArray<TypeElement>): InterfaceDeclaration;
+    function updateInterfaceDeclaration(node: InterfaceDeclaration, decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, name: Identifier, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, heritageClauses: ReadonlyArray<HeritageClause> | undefined, members: ReadonlyArray<TypeElement>): InterfaceDeclaration;
+    function createTypeAliasDeclaration(decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, name: string | Identifier, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, type: TypeNode): TypeAliasDeclaration;
+    function updateTypeAliasDeclaration(node: TypeAliasDeclaration, decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, name: Identifier, typeParameters: ReadonlyArray<TypeParameterDeclaration> | undefined, type: TypeNode): TypeAliasDeclaration;
+    function createEnumDeclaration(decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, name: string | Identifier, members: ReadonlyArray<EnumMember>): EnumDeclaration;
+    function updateEnumDeclaration(node: EnumDeclaration, decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, name: Identifier, members: ReadonlyArray<EnumMember>): EnumDeclaration;
+    function createModuleDeclaration(decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, name: ModuleName, body: ModuleBody | undefined, flags?: NodeFlags): ModuleDeclaration;
+    function updateModuleDeclaration(node: ModuleDeclaration, decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, name: ModuleName, body: ModuleBody | undefined): ModuleDeclaration;
+    function createModuleBlock(statements: ReadonlyArray<Statement>): ModuleBlock;
+    function updateModuleBlock(node: ModuleBlock, statements: ReadonlyArray<Statement>): ModuleBlock;
+    function createCaseBlock(clauses: ReadonlyArray<CaseOrDefaultClause>): CaseBlock;
+    function updateCaseBlock(node: CaseBlock, clauses: ReadonlyArray<CaseOrDefaultClause>): CaseBlock;
+    function createNamespaceExportDeclaration(name: string | Identifier): NamespaceExportDeclaration;
+    function updateNamespaceExportDeclaration(node: NamespaceExportDeclaration, name: Identifier): NamespaceExportDeclaration;
+    function createImportEqualsDeclaration(decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, name: string | Identifier, moduleReference: ModuleReference): ImportEqualsDeclaration;
+    function updateImportEqualsDeclaration(node: ImportEqualsDeclaration, decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, name: Identifier, moduleReference: ModuleReference): ImportEqualsDeclaration;
+    function createImportDeclaration(decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, importClause: ImportClause | undefined, moduleSpecifier: Expression): ImportDeclaration;
+    function updateImportDeclaration(node: ImportDeclaration, decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, importClause: ImportClause | undefined, moduleSpecifier: Expression): ImportDeclaration;
+    function createImportClause(name: Identifier | undefined, namedBindings: NamedImportBindings | undefined): ImportClause;
+    function updateImportClause(node: ImportClause, name: Identifier | undefined, namedBindings: NamedImportBindings | undefined): ImportClause;
+    function createNamespaceImport(name: Identifier): NamespaceImport;
+    function updateNamespaceImport(node: NamespaceImport, name: Identifier): NamespaceImport;
+    function createNamedImports(elements: ReadonlyArray<ImportSpecifier>): NamedImports;
+    function updateNamedImports(node: NamedImports, elements: ReadonlyArray<ImportSpecifier>): NamedImports;
+    function createImportSpecifier(propertyName: Identifier | undefined, name: Identifier): ImportSpecifier;
+    function updateImportSpecifier(node: ImportSpecifier, propertyName: Identifier | undefined, name: Identifier): ImportSpecifier;
+    function createExportAssignment(decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, isExportEquals: boolean | undefined, expression: Expression): ExportAssignment;
+    function updateExportAssignment(node: ExportAssignment, decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, expression: Expression): ExportAssignment;
+    function createExportDeclaration(decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, exportClause: NamedExports | undefined, moduleSpecifier?: Expression): ExportDeclaration;
+    function updateExportDeclaration(node: ExportDeclaration, decorators: ReadonlyArray<Decorator> | undefined, modifiers: ReadonlyArray<Modifier> | undefined, exportClause: NamedExports | undefined, moduleSpecifier: Expression | undefined): ExportDeclaration;
+    function createNamedExports(elements: ReadonlyArray<ExportSpecifier>): NamedExports;
+    function updateNamedExports(node: NamedExports, elements: ReadonlyArray<ExportSpecifier>): NamedExports;
+    function createExportSpecifier(propertyName: string | Identifier | undefined, name: string | Identifier): ExportSpecifier;
+    function updateExportSpecifier(node: ExportSpecifier, propertyName: Identifier | undefined, name: Identifier): ExportSpecifier;
+    function createExternalModuleReference(expression: Expression): ExternalModuleReference;
+    function updateExternalModuleReference(node: ExternalModuleReference, expression: Expression): ExternalModuleReference;
+    function createJsxElement(openingElement: JsxOpeningElement, children: ReadonlyArray<JsxChild>, closingElement: JsxClosingElement): JsxElement;
+    function updateJsxElement(node: JsxElement, openingElement: JsxOpeningElement, children: ReadonlyArray<JsxChild>, closingElement: JsxClosingElement): JsxElement;
+    function createJsxSelfClosingElement(tagName: JsxTagNameExpression, typeArguments: ReadonlyArray<TypeNode> | undefined, attributes: JsxAttributes): JsxSelfClosingElement;
+    function updateJsxSelfClosingElement(node: JsxSelfClosingElement, tagName: JsxTagNameExpression, typeArguments: ReadonlyArray<TypeNode> | undefined, attributes: JsxAttributes): JsxSelfClosingElement;
+    function createJsxOpeningElement(tagName: JsxTagNameExpression, typeArguments: ReadonlyArray<TypeNode> | undefined, attributes: JsxAttributes): JsxOpeningElement;
+    function updateJsxOpeningElement(node: JsxOpeningElement, tagName: JsxTagNameExpression, typeArguments: ReadonlyArray<TypeNode> | undefined, attributes: JsxAttributes): JsxOpeningElement;
+    function createJsxClosingElement(tagName: JsxTagNameExpression): JsxClosingElement;
+    function updateJsxClosingElement(node: JsxClosingElement, tagName: JsxTagNameExpression): JsxClosingElement;
+    function createJsxFragment(openingFragment: JsxOpeningFragment, children: ReadonlyArray<JsxChild>, closingFragment: JsxClosingFragment): JsxFragment;
+    function updateJsxFragment(node: JsxFragment, openingFragment: JsxOpeningFragment, children: ReadonlyArray<JsxChild>, closingFragment: JsxClosingFragment): JsxFragment;
+    function createJsxAttribute(name: Identifier, initializer: StringLiteral | JsxExpression): JsxAttribute;
+    function updateJsxAttribute(node: JsxAttribute, name: Identifier, initializer: StringLiteral | JsxExpression): JsxAttribute;
+    function createJsxAttributes(properties: ReadonlyArray<JsxAttributeLike>): JsxAttributes;
+    function updateJsxAttributes(node: JsxAttributes, properties: ReadonlyArray<JsxAttributeLike>): JsxAttributes;
+    function createJsxSpreadAttribute(expression: Expression): JsxSpreadAttribute;
+    function updateJsxSpreadAttribute(node: JsxSpreadAttribute, expression: Expression): JsxSpreadAttribute;
+    function createJsxExpression(dotDotDotToken: DotDotDotToken | undefined, expression: Expression | undefined): JsxExpression;
+    function updateJsxExpression(node: JsxExpression, expression: Expression | undefined): JsxExpression;
+    function createCaseClause(expression: Expression, statements: ReadonlyArray<Statement>): CaseClause;
+    function updateCaseClause(node: CaseClause, expression: Expression, statements: ReadonlyArray<Statement>): CaseClause;
+    function createDefaultClause(statements: ReadonlyArray<Statement>): DefaultClause;
+    function updateDefaultClause(node: DefaultClause, statements: ReadonlyArray<Statement>): DefaultClause;
+    function createHeritageClause(token: HeritageClause["token"], types: ReadonlyArray<ExpressionWithTypeArguments>): HeritageClause;
+    function updateHeritageClause(node: HeritageClause, types: ReadonlyArray<ExpressionWithTypeArguments>): HeritageClause;
+    function createCatchClause(variableDeclaration: string | VariableDeclaration | undefined, block: Block): CatchClause;
+    function updateCatchClause(node: CatchClause, variableDeclaration: VariableDeclaration | undefined, block: Block): CatchClause;
+    function createPropertyAssignment(name: string | PropertyName, initializer: Expression): PropertyAssignment;
+    function updatePropertyAssignment(node: PropertyAssignment, name: PropertyName, initializer: Expression): PropertyAssignment;
+    function createShorthandPropertyAssignment(name: string | Identifier, objectAssignmentInitializer?: Expression): ShorthandPropertyAssignment;
+    function updateShorthandPropertyAssignment(node: ShorthandPropertyAssignment, name: Identifier, objectAssignmentInitializer: Expression | undefined): ShorthandPropertyAssignment;
+    function createSpreadAssignment(expression: Expression): SpreadAssignment;
+    function updateSpreadAssignment(node: SpreadAssignment, expression: Expression): SpreadAssignment;
+    function createEnumMember(name: string | PropertyName, initializer?: Expression): EnumMember;
+    function updateEnumMember(node: EnumMember, name: PropertyName, initializer: Expression | undefined): EnumMember;
+    function updateSourceFileNode(node: SourceFile, statements: ReadonlyArray<Statement>, isDeclarationFile?: boolean, referencedFiles?: SourceFile["referencedFiles"], typeReferences?: SourceFile["typeReferenceDirectives"], hasNoDefaultLib?: boolean, libReferences?: SourceFile["libReferenceDirectives"]): SourceFile;
+    /**
+     * Creates a shallow, memberwise clone of a node for mutation.
+     */
+    function getMutableClone<T extends Node>(node: T): T;
+    /**
+     * Creates a synthetic statement to act as a placeholder for a not-emitted statement in
+     * order to preserve comments.
+     *
+     * @param original The original statement.
+     */
+    function createNotEmittedStatement(original: Node): NotEmittedStatement;
+    /**
+     * Creates a synthetic expression to act as a placeholder for a not-emitted expression in
+     * order to preserve comments or sourcemap positions.
+     *
+     * @param expression The inner expression to emit.
+     * @param original The original outer expression.
+     * @param location The location for the expression. Defaults to the positions from "original" if provided.
+     */
+    function createPartiallyEmittedExpression(expression: Expression, original?: Node): PartiallyEmittedExpression;
+    function updatePartiallyEmittedExpression(node: PartiallyEmittedExpression, expression: Expression): PartiallyEmittedExpression;
+    function createCommaList(elements: ReadonlyArray<Expression>): CommaListExpression;
+    function updateCommaList(node: CommaListExpression, elements: ReadonlyArray<Expression>): CommaListExpression;
+    function createBundle(sourceFiles: ReadonlyArray<SourceFile>, prepends?: ReadonlyArray<UnparsedSource | InputFiles>): Bundle;
+    function createUnparsedSourceFile(text: string): UnparsedSource;
+    function createUnparsedSourceFile(inputFile: InputFiles, type: "js" | "dts"): UnparsedSource;
+    function createUnparsedSourceFile(text: string, mapPath: string | undefined, map: string | undefined): UnparsedSource;
+    function createInputFiles(javascriptText: string, declarationText: string): InputFiles;
+    function createInputFiles(readFileText: (path: string) => string | undefined, javascriptPath: string, javascriptMapPath: string | undefined, declarationPath: string, declarationMapPath: string | undefined): InputFiles;
+    function createInputFiles(javascriptText: string, declarationText: string, javascriptMapPath: string | undefined, javascriptMapText: string | undefined, declarationMapPath: string | undefined, declarationMapText: string | undefined): InputFiles;
+    function updateBundle(node: Bundle, sourceFiles: ReadonlyArray<SourceFile>, prepends?: ReadonlyArray<UnparsedSource>): Bundle;
+    function createImmediatelyInvokedFunctionExpression(statements: ReadonlyArray<Statement>): CallExpression;
+    function createImmediatelyInvokedFunctionExpression(statements: ReadonlyArray<Statement>, param: ParameterDeclaration, paramValue: Expression): CallExpression;
+    function createImmediatelyInvokedArrowFunction(statements: ReadonlyArray<Statement>): CallExpression;
+    function createImmediatelyInvokedArrowFunction(statements: ReadonlyArray<Statement>, param: ParameterDeclaration, paramValue: Expression): CallExpression;
+    function createComma(left: Expression, right: Expression): Expression;
+    function createLessThan(left: Expression, right: Expression): Expression;
+    function createAssignment(left: ObjectLiteralExpression | ArrayLiteralExpression, right: Expression): DestructuringAssignment;
+    function createAssignment(left: Expression, right: Expression): BinaryExpression;
+    function createStrictEquality(left: Expression, right: Expression): BinaryExpression;
+    function createStrictInequality(left: Expression, right: Expression): BinaryExpression;
+    function createAdd(left: Expression, right: Expression): BinaryExpression;
+    function createSubtract(left: Expression, right: Expression): BinaryExpression;
+    function createPostfixIncrement(operand: Expression): PostfixUnaryExpression;
+    function createLogicalAnd(left: Expression, right: Expression): BinaryExpression;
+    function createLogicalOr(left: Expression, right: Expression): BinaryExpression;
+    function createLogicalNot(operand: Expression): PrefixUnaryExpression;
+    function createVoidZero(): VoidExpression;
+    function createExportDefault(expression: Expression): ExportAssignment;
+    function createExternalModuleExport(exportName: Identifier): ExportDeclaration;
+    /**
+     * Clears any EmitNode entries from parse-tree nodes.
+     * @param sourceFile A source file.
+     */
+    function disposeEmitNodes(sourceFile: SourceFile): void;
+    function setTextRange<T extends TextRange>(range: T, location: TextRange | undefined): T;
+    /**
+     * Sets flags that control emit behavior of a node.
+     */
+    function setEmitFlags<T extends Node>(node: T, emitFlags: EmitFlags): T;
+    /**
+     * Gets a custom text range to use when emitting source maps.
+     */
+    function getSourceMapRange(node: Node): SourceMapRange;
+    /**
+     * Sets a custom text range to use when emitting source maps.
+     */
+    function setSourceMapRange<T extends Node>(node: T, range: SourceMapRange | undefined): T;
+    /**
+     * Create an external source map source file reference
+     */
+    function createSourceMapSource(fileName: string, text: string, skipTrivia?: (pos: number) => number): SourceMapSource;
+    /**
+     * Gets the TextRange to use for source maps for a token of a node.
+     */
+    function getTokenSourceMapRange(node: Node, token: SyntaxKind): SourceMapRange | undefined;
+    /**
+     * Sets the TextRange to use for source maps for a token of a node.
+     */
+    function setTokenSourceMapRange<T extends Node>(node: T, token: SyntaxKind, range: SourceMapRange | undefined): T;
+    /**
+     * Gets a custom text range to use when emitting comments.
+     */
+    function getCommentRange(node: Node): TextRange;
+    /**
+     * Sets a custom text range to use when emitting comments.
+     */
+    function setCommentRange<T extends Node>(node: T, range: TextRange): T;
+    function getSyntheticLeadingComments(node: Node): SynthesizedComment[] | undefined;
+    function setSyntheticLeadingComments<T extends Node>(node: T, comments: SynthesizedComment[] | undefined): T;
+    function addSyntheticLeadingComment<T extends Node>(node: T, kind: SyntaxKind.SingleLineCommentTrivia | SyntaxKind.MultiLineCommentTrivia, text: string, hasTrailingNewLine?: boolean): T;
+    function getSyntheticTrailingComments(node: Node): SynthesizedComment[] | undefined;
+    function setSyntheticTrailingComments<T extends Node>(node: T, comments: SynthesizedComment[] | undefined): T;
+    function addSyntheticTrailingComment<T extends Node>(node: T, kind: SyntaxKind.SingleLineCommentTrivia | SyntaxKind.MultiLineCommentTrivia, text: string, hasTrailingNewLine?: boolean): T;
+    function moveSyntheticComments<T extends Node>(node: T, original: Node): T;
+    /**
+     * Gets the constant value to emit for an expression.
+     */
+    function getConstantValue(node: PropertyAccessExpression | ElementAccessExpression): string | number | undefined;
+    /**
+     * Sets the constant value to emit for an expression.
+     */
+    function setConstantValue(node: PropertyAccessExpression | ElementAccessExpression, value: string | number): PropertyAccessExpression | ElementAccessExpression;
+    /**
+     * Adds an EmitHelper to a node.
+     */
+    function addEmitHelper<T extends Node>(node: T, helper: EmitHelper): T;
+    /**
+     * Add EmitHelpers to a node.
+     */
+    function addEmitHelpers<T extends Node>(node: T, helpers: EmitHelper[] | undefined): T;
+    /**
+     * Removes an EmitHelper from a node.
+     */
+    function removeEmitHelper(node: Node, helper: EmitHelper): boolean;
+    /**
+     * Gets the EmitHelpers of a node.
+     */
+    function getEmitHelpers(node: Node): EmitHelper[] | undefined;
+    /**
+     * Moves matching emit helpers from a source node to a target node.
+     */
+    function moveEmitHelpers(source: Node, target: Node, predicate: (helper: EmitHelper) => boolean): void;
+    function setOriginalNode<T extends Node>(node: T, original: Node | undefined): T;
+}
+declare namespace ts {
+    /**
+     * Visits a Node using the supplied visitor, possibly returning a new Node in its place.
+     *
+     * @param node The Node to visit.
+     * @param visitor The callback used to visit the Node.
+     * @param test A callback to execute to verify the Node is valid.
+     * @param lift An optional callback to execute to lift a NodeArray into a valid Node.
+     */
+    function visitNode<T extends Node>(node: T | undefined, visitor: Visitor | undefined, test?: (node: Node) => boolean, lift?: (node: NodeArray<Node>) => T): T;
+    /**
+     * Visits a Node using the supplied visitor, possibly returning a new Node in its place.
+     *
+     * @param node The Node to visit.
+     * @param visitor The callback used to visit the Node.
+     * @param test A callback to execute to verify the Node is valid.
+     * @param lift An optional callback to execute to lift a NodeArray into a valid Node.
+     */
+    function visitNode<T extends Node>(node: T | undefined, visitor: Visitor | undefined, test?: (node: Node) => boolean, lift?: (node: NodeArray<Node>) => T): T | undefined;
+    /**
+     * Visits a NodeArray using the supplied visitor, possibly returning a new NodeArray in its place.
+     *
+     * @param nodes The NodeArray to visit.
+     * @param visitor The callback used to visit a Node.
+     * @param test A node test to execute for each node.
+     * @param start An optional value indicating the starting offset at which to start visiting.
+     * @param count An optional value indicating the maximum number of nodes to visit.
+     */
+    function visitNodes<T extends Node>(nodes: NodeArray<T> | undefined, visitor: Visitor, test?: (node: Node) => boolean, start?: number, count?: number): NodeArray<T>;
+    /**
+     * Visits a NodeArray using the supplied visitor, possibly returning a new NodeArray in its place.
+     *
+     * @param nodes The NodeArray to visit.
+     * @param visitor The callback used to visit a Node.
+     * @param test A node test to execute for each node.
+     * @param start An optional value indicating the starting offset at which to start visiting.
+     * @param count An optional value indicating the maximum number of nodes to visit.
+     */
+    function visitNodes<T extends Node>(nodes: NodeArray<T> | undefined, visitor: Visitor, test?: (node: Node) => boolean, start?: number, count?: number): NodeArray<T> | undefined;
+    /**
+     * Starts a new lexical environment and visits a statement list, ending the lexical environment
+     * and merging hoisted declarations upon completion.
+     */
+    function visitLexicalEnvironment(statements: NodeArray<Statement>, visitor: Visitor, context: TransformationContext, start?: number, ensureUseStrict?: boolean): NodeArray<Statement>;
+    /**
+     * Starts a new lexical environment and visits a parameter list, suspending the lexical
+     * environment upon completion.
+     */
+    function visitParameterList(nodes: NodeArray<ParameterDeclaration> | undefined, visitor: Visitor, context: TransformationContext, nodesVisitor?: typeof visitNodes): NodeArray<ParameterDeclaration>;
+    /**
+     * Resumes a suspended lexical environment and visits a function body, ending the lexical
+     * environment and merging hoisted declarations upon completion.
+     */
+    function visitFunctionBody(node: FunctionBody, visitor: Visitor, context: TransformationContext): FunctionBody;
+    /**
+     * Resumes a suspended lexical environment and visits a function body, ending the lexical
+     * environment and merging hoisted declarations upon completion.
+     */
+    function visitFunctionBody(node: FunctionBody | undefined, visitor: Visitor, context: TransformationContext): FunctionBody | undefined;
+    /**
+     * Resumes a suspended lexical environment and visits a concise body, ending the lexical
+     * environment and merging hoisted declarations upon completion.
+     */
+    function visitFunctionBody(node: ConciseBody, visitor: Visitor, context: TransformationContext): ConciseBody;
+    /**
+     * Visits each child of a Node using the supplied visitor, possibly returning a new Node of the same kind in its place.
+     *
+     * @param node The Node whose children will be visited.
+     * @param visitor The callback used to visit each child.
+     * @param context A lexical environment context for the visitor.
+     */
+    function visitEachChild<T extends Node>(node: T, visitor: Visitor, context: TransformationContext): T;
+    /**
+     * Visits each child of a Node using the supplied visitor, possibly returning a new Node of the same kind in its place.
+     *
+     * @param node The Node whose children will be visited.
+     * @param visitor The callback used to visit each child.
+     * @param context A lexical environment context for the visitor.
+     */
+    function visitEachChild<T extends Node>(node: T | undefined, visitor: Visitor, context: TransformationContext, nodesVisitor?: typeof visitNodes, tokenVisitor?: Visitor): T | undefined;
+}
+declare namespace ts {
+    function createPrinter(printerOptions?: PrinterOptions, handlers?: PrintHandlers): Printer;
+}
+declare namespace ts {
+    function findConfigFile(searchPath: string, fileExists: (fileName: string) => boolean, configName?: string): string | undefined;
+    function resolveTripleslashReference(moduleName: string, containingFile: string): string;
+    function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost;
+    function getPreEmitDiagnostics(program: Program, sourceFile?: SourceFile, cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+    interface FormatDiagnosticsHost {
+        getCurrentDirectory(): string;
+        getCanonicalFileName(fileName: string): string;
+        getNewLine(): string;
+    }
+    function formatDiagnostics(diagnostics: ReadonlyArray<Diagnostic>, host: FormatDiagnosticsHost): string;
+    function formatDiagnostic(diagnostic: Diagnostic, host: FormatDiagnosticsHost): string;
+    function formatDiagnosticsWithColorAndContext(diagnostics: ReadonlyArray<Diagnostic>, host: FormatDiagnosticsHost): string;
+    function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain | undefined, newLine: string): string;
+    function getConfigFileParsingDiagnostics(configFileParseResult: ParsedCommandLine): ReadonlyArray<Diagnostic>;
+    /**
+     * Create a new 'Program' instance. A Program is an immutable collection of 'SourceFile's and a 'CompilerOptions'
+     * that represent a compilation unit.
+     *
+     * Creating a program proceeds from a set of root files, expanding the set of inputs by following imports and
+     * triple-slash-reference-path directives transitively. '@types' and triple-slash-reference-types are also pulled in.
+     *
+     * @param createProgramOptions - The options for creating a program.
+     * @returns A 'Program' object.
+     */
+    function createProgram(createProgramOptions: CreateProgramOptions): Program;
+    /**
+     * Create a new 'Program' instance. A Program is an immutable collection of 'SourceFile's and a 'CompilerOptions'
+     * that represent a compilation unit.
+     *
+     * Creating a program proceeds from a set of root files, expanding the set of inputs by following imports and
+     * triple-slash-reference-path directives transitively. '@types' and triple-slash-reference-types are also pulled in.
+     *
+     * @param rootNames - A set of root files.
+     * @param options - The compiler options which should be used.
+     * @param host - The host interacts with the underlying file system.
+     * @param oldProgram - Reuses an old program structure.
+     * @param configFileParsingDiagnostics - error during config file parsing
+     * @returns A 'Program' object.
+     */
+    function createProgram(rootNames: ReadonlyArray<string>, options: CompilerOptions, host?: CompilerHost, oldProgram?: Program, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>): Program;
+    /** @deprecated */ interface ResolveProjectReferencePathHost {
+        fileExists(fileName: string): boolean;
+    }
+    /**
+     * Returns the target config filename of a project reference.
+     * Note: The file might not exist.
+     */
+    function resolveProjectReferencePath(ref: ProjectReference): ResolvedConfigFileName;
+    /** @deprecated */ function resolveProjectReferencePath(host: ResolveProjectReferencePathHost, ref: ProjectReference): ResolvedConfigFileName;
+}
+declare namespace ts {
+    interface EmitOutput {
+        outputFiles: OutputFile[];
+        emitSkipped: boolean;
+    }
+    interface OutputFile {
+        name: string;
+        writeByteOrderMark: boolean;
+        text: string;
+    }
+}
+declare namespace ts {
+    type AffectedFileResult<T> = {
+        result: T;
+        affected: SourceFile | Program;
+    } | undefined;
+    interface BuilderProgramHost {
+        /**
+         * return true if file names are treated with case sensitivity
+         */
+        useCaseSensitiveFileNames(): boolean;
+        /**
+         * If provided this would be used this hash instead of actual file shape text for detecting changes
+         */
+        createHash?: (data: string) => string;
+        /**
+         * When emit or emitNextAffectedFile are called without writeFile,
+         * this callback if present would be used to write files
+         */
+        writeFile?: WriteFileCallback;
+    }
+    /**
+     * Builder to manage the program state changes
+     */
+    interface BuilderProgram {
+        /**
+         * Returns current program
+         */
+        getProgram(): Program;
+        /**
+         * Get compiler options of the program
+         */
+        getCompilerOptions(): CompilerOptions;
+        /**
+         * Get the source file in the program with file name
+         */
+        getSourceFile(fileName: string): SourceFile | undefined;
+        /**
+         * Get a list of files in the program
+         */
+        getSourceFiles(): ReadonlyArray<SourceFile>;
+        /**
+         * Get the diagnostics for compiler options
+         */
+        getOptionsDiagnostics(cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+        /**
+         * Get the diagnostics that dont belong to any file
+         */
+        getGlobalDiagnostics(cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+        /**
+         * Get the diagnostics from config file parsing
+         */
+        getConfigFileParsingDiagnostics(): ReadonlyArray<Diagnostic>;
+        /**
+         * Get the syntax diagnostics, for all source files if source file is not supplied
+         */
+        getSyntacticDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+        /**
+         * Get the declaration diagnostics, for all source files if source file is not supplied
+         */
+        getDeclarationDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): ReadonlyArray<DiagnosticWithLocation>;
+        /**
+         * Get all the dependencies of the file
+         */
+        getAllDependencies(sourceFile: SourceFile): ReadonlyArray<string>;
+        /**
+         * Gets the semantic diagnostics from the program corresponding to this state of file (if provided) or whole program
+         * The semantic diagnostics are cached and managed here
+         * Note that it is assumed that when asked about semantic diagnostics through this API,
+         * the file has been taken out of affected files so it is safe to use cache or get from program and cache the diagnostics
+         * In case of SemanticDiagnosticsBuilderProgram if the source file is not provided,
+         * it will iterate through all the affected files, to ensure that cache stays valid and yet provide a way to get all semantic diagnostics
+         */
+        getSemanticDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): ReadonlyArray<Diagnostic>;
+        /**
+         * Emits the JavaScript and declaration files.
+         * When targetSource file is specified, emits the files corresponding to that source file,
+         * otherwise for the whole program.
+         * In case of EmitAndSemanticDiagnosticsBuilderProgram, when targetSourceFile is specified,
+         * it is assumed that that file is handled from affected file list. If targetSourceFile is not specified,
+         * it will only emit all the affected files instead of whole program
+         *
+         * The first of writeFile if provided, writeFile of BuilderProgramHost if provided, writeFile of compiler host
+         * in that order would be used to write the files
+         */
+        emit(targetSourceFile?: SourceFile, writeFile?: WriteFileCallback, cancellationToken?: CancellationToken, emitOnlyDtsFiles?: boolean, customTransformers?: CustomTransformers): EmitResult;
+        /**
+         * Get the current directory of the program
+         */
+        getCurrentDirectory(): string;
+    }
+    /**
+     * The builder that caches the semantic diagnostics for the program and handles the changed files and affected files
+     */
+    interface SemanticDiagnosticsBuilderProgram extends BuilderProgram {
+        /**
+         * Gets the semantic diagnostics from the program for the next affected file and caches it
+         * Returns undefined if the iteration is complete
+         */
+        getSemanticDiagnosticsOfNextAffectedFile(cancellationToken?: CancellationToken, ignoreSourceFile?: (sourceFile: SourceFile) => boolean): AffectedFileResult<ReadonlyArray<Diagnostic>>;
+    }
+    /**
+     * The builder that can handle the changes in program and iterate through changed file to emit the files
+     * The semantic diagnostics are cached per file and managed by clearing for the changed/affected files
+     */
+    interface EmitAndSemanticDiagnosticsBuilderProgram extends BuilderProgram {
+        /**
+         * Emits the next affected file's emit result (EmitResult and sourceFiles emitted) or returns undefined if iteration is complete
+         * The first of writeFile if provided, writeFile of BuilderProgramHost if provided, writeFile of compiler host
+         * in that order would be used to write the files
+         */
+        emitNextAffectedFile(writeFile?: WriteFileCallback, cancellationToken?: CancellationToken, emitOnlyDtsFiles?: boolean, customTransformers?: CustomTransformers): AffectedFileResult<EmitResult>;
+    }
+    /**
+     * Create the builder to manage semantic diagnostics and cache them
+     */
+    function createSemanticDiagnosticsBuilderProgram(newProgram: Program, host: BuilderProgramHost, oldProgram?: SemanticDiagnosticsBuilderProgram, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>): SemanticDiagnosticsBuilderProgram;
+    function createSemanticDiagnosticsBuilderProgram(rootNames: ReadonlyArray<string> | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: SemanticDiagnosticsBuilderProgram, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>, projectReferences?: ReadonlyArray<ProjectReference>): SemanticDiagnosticsBuilderProgram;
+    /**
+     * Create the builder that can handle the changes in program and iterate through changed files
+     * to emit the those files and manage semantic diagnostics cache as well
+     */
+    function createEmitAndSemanticDiagnosticsBuilderProgram(newProgram: Program, host: BuilderProgramHost, oldProgram?: EmitAndSemanticDiagnosticsBuilderProgram, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>): EmitAndSemanticDiagnosticsBuilderProgram;
+    function createEmitAndSemanticDiagnosticsBuilderProgram(rootNames: ReadonlyArray<string> | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: EmitAndSemanticDiagnosticsBuilderProgram, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>, projectReferences?: ReadonlyArray<ProjectReference>): EmitAndSemanticDiagnosticsBuilderProgram;
+    /**
+     * Creates a builder thats just abstraction over program and can be used with watch
+     */
+    function createAbstractBuilder(newProgram: Program, host: BuilderProgramHost, oldProgram?: BuilderProgram, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>): BuilderProgram;
+    function createAbstractBuilder(rootNames: ReadonlyArray<string> | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: BuilderProgram, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>, projectReferences?: ReadonlyArray<ProjectReference>): BuilderProgram;
+}
+declare namespace ts {
+    type WatchStatusReporter = (diagnostic: Diagnostic, newLine: string, options: CompilerOptions) => void;
+    /** Create the program with rootNames and options, if they are undefined, oldProgram and new configFile diagnostics create new program */
+    type CreateProgram<T extends BuilderProgram> = (rootNames: ReadonlyArray<string> | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: T, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>, projectReferences?: ReadonlyArray<ProjectReference> | undefined) => T;
+    /** Host that has watch functionality used in --watch mode */
+    interface WatchHost {
+        /** If provided, called with Diagnostic message that informs about change in watch status */
+        onWatchStatusChange?(diagnostic: Diagnostic, newLine: string, options: CompilerOptions): void;
+        /** Used to watch changes in source files, missing files needed to update the program or config file */
+        watchFile(path: string, callback: FileWatcherCallback, pollingInterval?: number): FileWatcher;
+        /** Used to watch resolved module's failed lookup locations, config file specs, type roots where auto type reference directives are added */
+        watchDirectory(path: string, callback: DirectoryWatcherCallback, recursive?: boolean): FileWatcher;
+        /** If provided, will be used to set delayed compilation, so that multiple changes in short span are compiled together */
+        setTimeout?(callback: (...args: any[]) => void, ms: number, ...args: any[]): any;
+        /** If provided, will be used to reset existing delayed compilation */
+        clearTimeout?(timeoutId: any): void;
+    }
+    interface ProgramHost<T extends BuilderProgram> {
+        /**
+         * Used to create the program when need for program creation or recreation detected
+         */
+        createProgram: CreateProgram<T>;
+        useCaseSensitiveFileNames(): boolean;
+        getNewLine(): string;
+        getCurrentDirectory(): string;
+        getDefaultLibFileName(options: CompilerOptions): string;
+        getDefaultLibLocation?(): string;
+        createHash?(data: string): string;
+        /**
+         * Use to check file presence for source files and
+         * if resolveModuleNames is not provided (complier is in charge of module resolution) then module files as well
+         */
+        fileExists(path: string): boolean;
+        /**
+         * Use to read file text for source files and
+         * if resolveModuleNames is not provided (complier is in charge of module resolution) then module files as well
+         */
+        readFile(path: string, encoding?: string): string | undefined;
+        /** If provided, used for module resolution as well as to handle directory structure */
+        directoryExists?(path: string): boolean;
+        /** If provided, used in resolutions as well as handling directory structure */
+        getDirectories?(path: string): string[];
+        /** If provided, used to cache and handle directory structure modifications */
+        readDirectory?(path: string, extensions?: ReadonlyArray<string>, exclude?: ReadonlyArray<string>, include?: ReadonlyArray<string>, depth?: number): string[];
+        /** Symbol links resolution */
+        realpath?(path: string): string;
+        /** If provided would be used to write log about compilation */
+        trace?(s: string): void;
+        /** If provided is used to get the environment variable */
+        getEnvironmentVariable?(name: string): string | undefined;
+        /** If provided, used to resolve the module names, otherwise typescript's default module resolution */
+        resolveModuleNames?(moduleNames: string[], containingFile: string, reusedNames?: string[], redirectedReference?: ResolvedProjectReference): (ResolvedModule | undefined)[];
+        /** If provided, used to resolve type reference directives, otherwise typescript's default resolution */
+        resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string, redirectedReference?: ResolvedProjectReference): (ResolvedTypeReferenceDirective | undefined)[];
+    }
+    interface WatchCompilerHost<T extends BuilderProgram> extends ProgramHost<T>, WatchHost {
+        /** If provided, callback to invoke after every new program creation */
+        afterProgramCreate?(program: T): void;
+    }
+    /**
+     * Host to create watch with root files and options
+     */
+    interface WatchCompilerHostOfFilesAndCompilerOptions<T extends BuilderProgram> extends WatchCompilerHost<T> {
+        /** root files to use to generate program */
+        rootFiles: string[];
+        /** Compiler options */
+        options: CompilerOptions;
+        /** Project References */
+        projectReferences?: ReadonlyArray<ProjectReference>;
+    }
+    /**
+     * Host to create watch with config file
+     */
+    interface WatchCompilerHostOfConfigFile<T extends BuilderProgram> extends WatchCompilerHost<T>, ConfigFileDiagnosticsReporter {
+        /** Name of the config file to compile */
+        configFileName: string;
+        /** Options to extend */
+        optionsToExtend?: CompilerOptions;
+        /**
+         * Used to generate source file names from the config file and its include, exclude, files rules
+         * and also to cache the directory stucture
+         */
+        readDirectory(path: string, extensions?: ReadonlyArray<string>, exclude?: ReadonlyArray<string>, include?: ReadonlyArray<string>, depth?: number): string[];
+    }
+    interface Watch<T> {
+        /** Synchronize with host and get updated program */
+        getProgram(): T;
+    }
+    /**
+     * Creates the watch what generates program using the config file
+     */
+    interface WatchOfConfigFile<T> extends Watch<T> {
+    }
+    /**
+     * Creates the watch that generates program using the root files and compiler options
+     */
+    interface WatchOfFilesAndCompilerOptions<T> extends Watch<T> {
+        /** Updates the root files in the program, only if this is not config file compilation */
+        updateRootFileNames(fileNames: string[]): void;
+    }
+    /**
+     * Create the watch compiler host for either configFile or fileNames and its options
+     */
+    function createWatchCompilerHost<T extends BuilderProgram>(configFileName: string, optionsToExtend: CompilerOptions | undefined, system: System, createProgram?: CreateProgram<T>, reportDiagnostic?: DiagnosticReporter, reportWatchStatus?: WatchStatusReporter): WatchCompilerHostOfConfigFile<T>;
+    function createWatchCompilerHost<T extends BuilderProgram>(rootFiles: string[], options: CompilerOptions, system: System, createProgram?: CreateProgram<T>, reportDiagnostic?: DiagnosticReporter, reportWatchStatus?: WatchStatusReporter, projectReferences?: ReadonlyArray<ProjectReference>): WatchCompilerHostOfFilesAndCompilerOptions<T>;
+    /**
+     * Creates the watch from the host for root files and compiler options
+     */
+    function createWatchProgram<T extends BuilderProgram>(host: WatchCompilerHostOfFilesAndCompilerOptions<T>): WatchOfFilesAndCompilerOptions<T>;
+    /**
+     * Creates the watch from the host for config file
+     */
+    function createWatchProgram<T extends BuilderProgram>(host: WatchCompilerHostOfConfigFile<T>): WatchOfConfigFile<T>;
+}
+declare namespace ts.server {
+    type ActionSet = "action::set";
+    type ActionInvalidate = "action::invalidate";
+    type ActionPackageInstalled = "action::packageInstalled";
+    type ActionValueInspected = "action::valueInspected";
+    type EventTypesRegistry = "event::typesRegistry";
+    type EventBeginInstallTypes = "event::beginInstallTypes";
+    type EventEndInstallTypes = "event::endInstallTypes";
+    type EventInitializationFailed = "event::initializationFailed";
+    interface TypingInstallerResponse {
+        readonly kind: ActionSet | ActionInvalidate | EventTypesRegistry | ActionPackageInstalled | ActionValueInspected | EventBeginInstallTypes | EventEndInstallTypes | EventInitializationFailed;
+    }
+    interface TypingInstallerRequestWithProjectName {
+        readonly projectName: string;
+    }
+    interface DiscoverTypings extends TypingInstallerRequestWithProjectName {
+        readonly fileNames: string[];
+        readonly projectRootPath: Path;
+        readonly compilerOptions: CompilerOptions;
+        readonly typeAcquisition: TypeAcquisition;
+        readonly unresolvedImports: SortedReadonlyArray<string>;
+        readonly cachePath?: string;
+        readonly kind: "discover";
+    }
+    interface CloseProject extends TypingInstallerRequestWithProjectName {
+        readonly kind: "closeProject";
+    }
+    interface TypesRegistryRequest {
+        readonly kind: "typesRegistry";
+    }
+    interface InstallPackageRequest extends TypingInstallerRequestWithProjectName {
+        readonly kind: "installPackage";
+        readonly fileName: Path;
+        readonly packageName: string;
+        readonly projectRootPath: Path;
+    }
+    interface PackageInstalledResponse extends ProjectResponse {
+        readonly kind: ActionPackageInstalled;
+        readonly success: boolean;
+        readonly message: string;
+    }
+    interface InitializationFailedResponse extends TypingInstallerResponse {
+        readonly kind: EventInitializationFailed;
+        readonly message: string;
+    }
+    interface ProjectResponse extends TypingInstallerResponse {
+        readonly projectName: string;
+    }
+    interface InvalidateCachedTypings extends ProjectResponse {
+        readonly kind: ActionInvalidate;
+    }
+    interface InstallTypes extends ProjectResponse {
+        readonly kind: EventBeginInstallTypes | EventEndInstallTypes;
+        readonly eventId: number;
+        readonly typingsInstallerVersion: string;
+        readonly packagesToInstall: ReadonlyArray<string>;
+    }
+    interface BeginInstallTypes extends InstallTypes {
+        readonly kind: EventBeginInstallTypes;
+    }
+    interface EndInstallTypes extends InstallTypes {
+        readonly kind: EventEndInstallTypes;
+        readonly installSuccess: boolean;
+    }
+    interface SetTypings extends ProjectResponse {
+        readonly typeAcquisition: TypeAcquisition;
+        readonly compilerOptions: CompilerOptions;
+        readonly typings: string[];
+        readonly unresolvedImports: SortedReadonlyArray<string>;
+        readonly kind: ActionSet;
+    }
+}
+declare namespace ts {
+    interface Node {
+        getSourceFile(): SourceFile;
+        getChildCount(sourceFile?: SourceFile): number;
+        getChildAt(index: number, sourceFile?: SourceFile): Node;
+        getChildren(sourceFile?: SourceFile): Node[];
+        getStart(sourceFile?: SourceFile, includeJsDocComment?: boolean): number;
+        getFullStart(): number;
+        getEnd(): number;
+        getWidth(sourceFile?: SourceFileLike): number;
+        getFullWidth(): number;
+        getLeadingTriviaWidth(sourceFile?: SourceFile): number;
+        getFullText(sourceFile?: SourceFile): string;
+        getText(sourceFile?: SourceFile): string;
+        getFirstToken(sourceFile?: SourceFile): Node | undefined;
+        getLastToken(sourceFile?: SourceFile): Node | undefined;
+        forEachChild<T>(cbNode: (node: Node) => T | undefined, cbNodeArray?: (nodes: NodeArray<Node>) => T | undefined): T | undefined;
+    }
+    interface Identifier {
+        readonly text: string;
+    }
+    interface Symbol {
+        readonly name: string;
+        getFlags(): SymbolFlags;
+        getEscapedName(): __String;
+        getName(): string;
+        getDeclarations(): Declaration[] | undefined;
+        getDocumentationComment(typeChecker: TypeChecker | undefined): SymbolDisplayPart[];
+        getJsDocTags(): JSDocTagInfo[];
+    }
+    interface Type {
+        getFlags(): TypeFlags;
+        getSymbol(): Symbol | undefined;
+        getProperties(): Symbol[];
+        getProperty(propertyName: string): Symbol | undefined;
+        getApparentProperties(): Symbol[];
+        getCallSignatures(): ReadonlyArray<Signature>;
+        getConstructSignatures(): ReadonlyArray<Signature>;
+        getStringIndexType(): Type | undefined;
+        getNumberIndexType(): Type | undefined;
+        getBaseTypes(): BaseType[] | undefined;
+        getNonNullableType(): Type;
+        getConstraint(): Type | undefined;
+        getDefault(): Type | undefined;
+        isUnion(): this is UnionType;
+        isIntersection(): this is IntersectionType;
+        isUnionOrIntersection(): this is UnionOrIntersectionType;
+        isLiteral(): this is LiteralType;
+        isStringLiteral(): this is StringLiteralType;
+        isNumberLiteral(): this is NumberLiteralType;
+        isTypeParameter(): this is TypeParameter;
+        isClassOrInterface(): this is InterfaceType;
+        isClass(): this is InterfaceType;
+    }
+    interface Signature {
+        getDeclaration(): SignatureDeclaration;
+        getTypeParameters(): TypeParameter[] | undefined;
+        getParameters(): Symbol[];
+        getReturnType(): Type;
+        getDocumentationComment(typeChecker: TypeChecker | undefined): SymbolDisplayPart[];
+        getJsDocTags(): JSDocTagInfo[];
+    }
+    interface SourceFile {
+        getLineAndCharacterOfPosition(pos: number): LineAndCharacter;
+        getLineEndOfPosition(pos: number): number;
+        getLineStarts(): ReadonlyArray<number>;
+        getPositionOfLineAndCharacter(line: number, character: number): number;
+        update(newText: string, textChangeRange: TextChangeRange): SourceFile;
+    }
+    interface SourceFileLike {
+        getLineAndCharacterOfPosition(pos: number): LineAndCharacter;
+    }
+    interface SourceMapSource {
+        getLineAndCharacterOfPosition(pos: number): LineAndCharacter;
+    }
+    /**
+     * Represents an immutable snapshot of a script at a specified time.Once acquired, the
+     * snapshot is observably immutable. i.e. the same calls with the same parameters will return
+     * the same values.
+     */
+    interface IScriptSnapshot {
+        /** Gets a portion of the script snapshot specified by [start, end). */
+        getText(start: number, end: number): string;
+        /** Gets the length of this script snapshot. */
+        getLength(): number;
+        /**
+         * Gets the TextChangeRange that describe how the text changed between this text and
+         * an older version.  This information is used by the incremental parser to determine
+         * what sections of the script need to be re-parsed.  'undefined' can be returned if the
+         * change range cannot be determined.  However, in that case, incremental parsing will
+         * not happen and the entire document will be re - parsed.
+         */
+        getChangeRange(oldSnapshot: IScriptSnapshot): TextChangeRange | undefined;
+        /** Releases all resources held by this script snapshot */
+        dispose?(): void;
+    }
+    namespace ScriptSnapshot {
+        function fromString(text: string): IScriptSnapshot;
+    }
+    interface PreProcessedFileInfo {
+        referencedFiles: FileReference[];
+        typeReferenceDirectives: FileReference[];
+        libReferenceDirectives: FileReference[];
+        importedFiles: FileReference[];
+        ambientExternalModules?: string[];
+        isLibFile: boolean;
+    }
+    interface HostCancellationToken {
+        isCancellationRequested(): boolean;
+    }
+    interface InstallPackageOptions {
+        fileName: Path;
+        packageName: string;
+    }
+    interface LanguageServiceHost extends GetEffectiveTypeRootsHost {
+        getCompilationSettings(): CompilerOptions;
+        getNewLine?(): string;
+        getProjectVersion?(): string;
+        getScriptFileNames(): string[];
+        getScriptKind?(fileName: string): ScriptKind;
+        getScriptVersion(fileName: string): string;
+        getScriptSnapshot(fileName: string): IScriptSnapshot | undefined;
+        getProjectReferences?(): ReadonlyArray<ProjectReference> | undefined;
+        getLocalizedDiagnosticMessages?(): any;
+        getCancellationToken?(): HostCancellationToken;
+        getCurrentDirectory(): string;
+        getDefaultLibFileName(options: CompilerOptions): string;
+        log?(s: string): void;
+        trace?(s: string): void;
+        error?(s: string): void;
+        useCaseSensitiveFileNames?(): boolean;
+        readDirectory?(path: string, extensions?: ReadonlyArray<string>, exclude?: ReadonlyArray<string>, include?: ReadonlyArray<string>, depth?: number): string[];
+        readFile?(path: string, encoding?: string): string | undefined;
+        realpath?(path: string): string;
+        fileExists?(path: string): boolean;
+        getTypeRootsVersion?(): number;
+        resolveModuleNames?(moduleNames: string[], containingFile: string, reusedNames?: string[], redirectedReference?: ResolvedProjectReference): (ResolvedModule | undefined)[];
+        getResolvedModuleWithFailedLookupLocationsFromCache?(modulename: string, containingFile: string): ResolvedModuleWithFailedLookupLocations | undefined;
+        resolveTypeReferenceDirectives?(typeDirectiveNames: string[], containingFile: string, redirectedReference?: ResolvedProjectReference): (ResolvedTypeReferenceDirective | undefined)[];
+        getDirectories?(directoryName: string): string[];
+        /**
+         * Gets a set of custom transformers to use during emit.
+         */
+        getCustomTransformers?(): CustomTransformers | undefined;
+        isKnownTypesPackageName?(name: string): boolean;
+        installPackage?(options: InstallPackageOptions): Promise<ApplyCodeActionCommandResult>;
+        writeFile?(fileName: string, content: string): void;
+    }
+    type WithMetadata<T> = T & {
+        metadata?: unknown;
+    };
+    interface LanguageService {
+        cleanupSemanticCache(): void;
+        getSyntacticDiagnostics(fileName: string): DiagnosticWithLocation[];
+        /** The first time this is called, it will return global diagnostics (no location). */
+        getSemanticDiagnostics(fileName: string): Diagnostic[];
+        getSuggestionDiagnostics(fileName: string): DiagnosticWithLocation[];
+        getCompilerOptionsDiagnostics(): Diagnostic[];
+        /**
+         * @deprecated Use getEncodedSyntacticClassifications instead.
+         */
+        getSyntacticClassifications(fileName: string, span: TextSpan): ClassifiedSpan[];
+        /**
+         * @deprecated Use getEncodedSemanticClassifications instead.
+         */
+        getSemanticClassifications(fileName: string, span: TextSpan): ClassifiedSpan[];
+        getEncodedSyntacticClassifications(fileName: string, span: TextSpan): Classifications;
+        getEncodedSemanticClassifications(fileName: string, span: TextSpan): Classifications;
+        getCompletionsAtPosition(fileName: string, position: number, options: GetCompletionsAtPositionOptions | undefined): WithMetadata<CompletionInfo> | undefined;
+        getCompletionEntryDetails(fileName: string, position: number, name: string, formatOptions: FormatCodeOptions | FormatCodeSettings | undefined, source: string | undefined, preferences: UserPreferences | undefined): CompletionEntryDetails | undefined;
+        getCompletionEntrySymbol(fileName: string, position: number, name: string, source: string | undefined): Symbol | undefined;
+        getQuickInfoAtPosition(fileName: string, position: number): QuickInfo | undefined;
+        getNameOrDottedNameSpan(fileName: string, startPos: number, endPos: number): TextSpan | undefined;
+        getBreakpointStatementAtPosition(fileName: string, position: number): TextSpan | undefined;
+        getSignatureHelpItems(fileName: string, position: number, options: SignatureHelpItemsOptions | undefined): SignatureHelpItems | undefined;
+        getRenameInfo(fileName: string, position: number, options?: RenameInfoOptions): RenameInfo;
+        findRenameLocations(fileName: string, position: number, findInStrings: boolean, findInComments: boolean, providePrefixAndSuffixTextForRename?: boolean): ReadonlyArray<RenameLocation> | undefined;
+        getDefinitionAtPosition(fileName: string, position: number): ReadonlyArray<DefinitionInfo> | undefined;
+        getDefinitionAndBoundSpan(fileName: string, position: number): DefinitionInfoAndBoundSpan | undefined;
+        getTypeDefinitionAtPosition(fileName: string, position: number): ReadonlyArray<DefinitionInfo> | undefined;
+        getImplementationAtPosition(fileName: string, position: number): ReadonlyArray<ImplementationLocation> | undefined;
+        getReferencesAtPosition(fileName: string, position: number): ReferenceEntry[] | undefined;
+        findReferences(fileName: string, position: number): ReferencedSymbol[] | undefined;
+        getDocumentHighlights(fileName: string, position: number, filesToSearch: string[]): DocumentHighlights[] | undefined;
+        /** @deprecated */
+        getOccurrencesAtPosition(fileName: string, position: number): ReadonlyArray<ReferenceEntry> | undefined;
+        getNavigateToItems(searchValue: string, maxResultCount?: number, fileName?: string, excludeDtsFiles?: boolean): NavigateToItem[];
+        getNavigationBarItems(fileName: string): NavigationBarItem[];
+        getNavigationTree(fileName: string): NavigationTree;
+        getOutliningSpans(fileName: string): OutliningSpan[];
+        getTodoComments(fileName: string, descriptors: TodoCommentDescriptor[]): TodoComment[];
+        getBraceMatchingAtPosition(fileName: string, position: number): TextSpan[];
+        getIndentationAtPosition(fileName: string, position: number, options: EditorOptions | EditorSettings): number;
+        getFormattingEditsForRange(fileName: string, start: number, end: number, options: FormatCodeOptions | FormatCodeSettings): TextChange[];
+        getFormattingEditsForDocument(fileName: string, options: FormatCodeOptions | FormatCodeSettings): TextChange[];
+        getFormattingEditsAfterKeystroke(fileName: string, position: number, key: string, options: FormatCodeOptions | FormatCodeSettings): TextChange[];
+        getDocCommentTemplateAtPosition(fileName: string, position: number): TextInsertion | undefined;
+        isValidBraceCompletionAtPosition(fileName: string, position: number, openingBrace: number): boolean;
+        /**
+         * This will return a defined result if the position is after the `>` of the opening tag, or somewhere in the text, of a JSXElement with no closing tag.
+         * Editors should call this after `>` is typed.
+         */
+        getJsxClosingTagAtPosition(fileName: string, position: number): JsxClosingTagInfo | undefined;
+        getSpanOfEnclosingComment(fileName: string, position: number, onlyMultiLine: boolean): TextSpan | undefined;
+        toLineColumnOffset?(fileName: string, position: number): LineAndCharacter;
+        getCodeFixesAtPosition(fileName: string, start: number, end: number, errorCodes: ReadonlyArray<number>, formatOptions: FormatCodeSettings, preferences: UserPreferences): ReadonlyArray<CodeFixAction>;
+        getCombinedCodeFix(scope: CombinedCodeFixScope, fixId: {}, formatOptions: FormatCodeSettings, preferences: UserPreferences): CombinedCodeActions;
+        applyCodeActionCommand(action: CodeActionCommand, formatSettings?: FormatCodeSettings): Promise<ApplyCodeActionCommandResult>;
+        applyCodeActionCommand(action: CodeActionCommand[], formatSettings?: FormatCodeSettings): Promise<ApplyCodeActionCommandResult[]>;
+        applyCodeActionCommand(action: CodeActionCommand | CodeActionCommand[], formatSettings?: FormatCodeSettings): Promise<ApplyCodeActionCommandResult | ApplyCodeActionCommandResult[]>;
+        /** @deprecated `fileName` will be ignored */
+        applyCodeActionCommand(fileName: string, action: CodeActionCommand): Promise<ApplyCodeActionCommandResult>;
+        /** @deprecated `fileName` will be ignored */
+        applyCodeActionCommand(fileName: string, action: CodeActionCommand[]): Promise<ApplyCodeActionCommandResult[]>;
+        /** @deprecated `fileName` will be ignored */
+        applyCodeActionCommand(fileName: string, action: CodeActionCommand | CodeActionCommand[]): Promise<ApplyCodeActionCommandResult | ApplyCodeActionCommandResult[]>;
+        getApplicableRefactors(fileName: string, positionOrRange: number | TextRange, preferences: UserPreferences | undefined): ApplicableRefactorInfo[];
+        getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string, preferences: UserPreferences | undefined): RefactorEditInfo | undefined;
+        organizeImports(scope: OrganizeImportsScope, formatOptions: FormatCodeSettings, preferences: UserPreferences | undefined): ReadonlyArray<FileTextChanges>;
+        getEditsForFileRename(oldFilePath: string, newFilePath: string, formatOptions: FormatCodeSettings, preferences: UserPreferences | undefined): ReadonlyArray<FileTextChanges>;
+        getEmitOutput(fileName: string, emitOnlyDtsFiles?: boolean): EmitOutput;
+        getProgram(): Program | undefined;
+        dispose(): void;
+    }
+    interface JsxClosingTagInfo {
+        readonly newText: string;
+    }
+    interface CombinedCodeFixScope {
+        type: "file";
+        fileName: string;
+    }
+    type OrganizeImportsScope = CombinedCodeFixScope;
+    type CompletionsTriggerCharacter = "." | '"' | "'" | "`" | "/" | "@" | "<";
+    interface GetCompletionsAtPositionOptions extends UserPreferences {
+        /**
+         * If the editor is asking for completions because a certain character was typed
+         * (as opposed to when the user explicitly requested them) this should be set.
+         */
+        triggerCharacter?: CompletionsTriggerCharacter;
+        /** @deprecated Use includeCompletionsForModuleExports */
+        includeExternalModuleExports?: boolean;
+        /** @deprecated Use includeCompletionsWithInsertText */
+        includeInsertTextCompletions?: boolean;
+    }
+    type SignatureHelpTriggerCharacter = "," | "(" | "<";
+    type SignatureHelpRetriggerCharacter = SignatureHelpTriggerCharacter | ")";
+    interface SignatureHelpItemsOptions {
+        triggerReason?: SignatureHelpTriggerReason;
+    }
+    type SignatureHelpTriggerReason = SignatureHelpInvokedReason | SignatureHelpCharacterTypedReason | SignatureHelpRetriggeredReason;
+    /**
+     * Signals that the user manually requested signature help.
+     * The language service will unconditionally attempt to provide a result.
+     */
+    interface SignatureHelpInvokedReason {
+        kind: "invoked";
+        triggerCharacter?: undefined;
+    }
+    /**
+     * Signals that the signature help request came from a user typing a character.
+     * Depending on the character and the syntactic context, the request may or may not be served a result.
+     */
+    interface SignatureHelpCharacterTypedReason {
+        kind: "characterTyped";
+        /**
+         * Character that was responsible for triggering signature help.
+         */
+        triggerCharacter: SignatureHelpTriggerCharacter;
+    }
+    /**
+     * Signals that this signature help request came from typing a character or moving the cursor.
+     * This should only occur if a signature help session was already active and the editor needs to see if it should adjust.
+     * The language service will unconditionally attempt to provide a result.
+     * `triggerCharacter` can be `undefined` for a retrigger caused by a cursor move.
+     */
+    interface SignatureHelpRetriggeredReason {
+        kind: "retrigger";
+        /**
+         * Character that was responsible for triggering signature help.
+         */
+        triggerCharacter?: SignatureHelpRetriggerCharacter;
+    }
+    interface ApplyCodeActionCommandResult {
+        successMessage: string;
+    }
+    interface Classifications {
+        spans: number[];
+        endOfLineState: EndOfLineState;
+    }
+    interface ClassifiedSpan {
+        textSpan: TextSpan;
+        classificationType: ClassificationTypeNames;
+    }
+    /**
+     * Navigation bar interface designed for visual studio's dual-column layout.
+     * This does not form a proper tree.
+     * The navbar is returned as a list of top-level items, each of which has a list of child items.
+     * Child items always have an empty array for their `childItems`.
+     */
+    interface NavigationBarItem {
+        text: string;
+        kind: ScriptElementKind;
+        kindModifiers: string;
+        spans: TextSpan[];
+        childItems: NavigationBarItem[];
+        indent: number;
+        bolded: boolean;
+        grayed: boolean;
+    }
+    /**
+     * Node in a tree of nested declarations in a file.
+     * The top node is always a script or module node.
+     */
+    interface NavigationTree {
+        /** Name of the declaration, or a short description, e.g. "<class>". */
+        text: string;
+        kind: ScriptElementKind;
+        /** ScriptElementKindModifier separated by commas, e.g. "public,abstract" */
+        kindModifiers: string;
+        /**
+         * Spans of the nodes that generated this declaration.
+         * There will be more than one if this is the result of merging.
+         */
+        spans: TextSpan[];
+        nameSpan: TextSpan | undefined;
+        /** Present if non-empty */
+        childItems?: NavigationTree[];
+    }
+    interface TodoCommentDescriptor {
+        text: string;
+        priority: number;
+    }
+    interface TodoComment {
+        descriptor: TodoCommentDescriptor;
+        message: string;
+        position: number;
+    }
+    interface TextChange {
+        span: TextSpan;
+        newText: string;
+    }
+    interface FileTextChanges {
+        fileName: string;
+        textChanges: TextChange[];
+        isNewFile?: boolean;
+    }
+    interface CodeAction {
+        /** Description of the code action to display in the UI of the editor */
+        description: string;
+        /** Text changes to apply to each file as part of the code action */
+        changes: FileTextChanges[];
+        /**
+         * If the user accepts the code fix, the editor should send the action back in a `applyAction` request.
+         * This allows the language service to have side effects (e.g. installing dependencies) upon a code fix.
+         */
+        commands?: CodeActionCommand[];
+    }
+    interface CodeFixAction extends CodeAction {
+        /** Short name to identify the fix, for use by telemetry. */
+        fixName: string;
+        /**
+         * If present, one may call 'getCombinedCodeFix' with this fixId.
+         * This may be omitted to indicate that the code fix can't be applied in a group.
+         */
+        fixId?: {};
+        fixAllDescription?: string;
+    }
+    interface CombinedCodeActions {
+        changes: ReadonlyArray<FileTextChanges>;
+        commands?: ReadonlyArray<CodeActionCommand>;
+    }
+    type CodeActionCommand = InstallPackageAction | GenerateTypesAction;
+    interface InstallPackageAction {
+    }
+    interface GenerateTypesAction extends GenerateTypesOptions {
+    }
+    interface GenerateTypesOptions {
+        readonly file: string;
+        readonly fileToGenerateTypesFor: string;
+        readonly outputFileName: string;
+    }
+    /**
+     * A set of one or more available refactoring actions, grouped under a parent refactoring.
+     */
+    interface ApplicableRefactorInfo {
+        /**
+         * The programmatic name of the refactoring
+         */
+        name: string;
+        /**
+         * A description of this refactoring category to show to the user.
+         * If the refactoring gets inlined (see below), this text will not be visible.
+         */
+        description: string;
+        /**
+         * Inlineable refactorings can have their actions hoisted out to the top level
+         * of a context menu. Non-inlineanable refactorings should always be shown inside
+         * their parent grouping.
+         *
+         * If not specified, this value is assumed to be 'true'
+         */
+        inlineable?: boolean;
+        actions: RefactorActionInfo[];
+    }
+    /**
+     * Represents a single refactoring action - for example, the "Extract Method..." refactor might
+     * offer several actions, each corresponding to a surround class or closure to extract into.
+     */
+    interface RefactorActionInfo {
+        /**
+         * The programmatic name of the refactoring action
+         */
+        name: string;
+        /**
+         * A description of this refactoring action to show to the user.
+         * If the parent refactoring is inlined away, this will be the only text shown,
+         * so this description should make sense by itself if the parent is inlineable=true
+         */
+        description: string;
+    }
+    /**
+     * A set of edits to make in response to a refactor action, plus an optional
+     * location where renaming should be invoked from
+     */
+    interface RefactorEditInfo {
+        edits: FileTextChanges[];
+        renameFilename?: string;
+        renameLocation?: number;
+        commands?: CodeActionCommand[];
+    }
+    interface TextInsertion {
+        newText: string;
+        /** The position in newText the caret should point to after the insertion. */
+        caretOffset: number;
+    }
+    interface DocumentSpan {
+        textSpan: TextSpan;
+        fileName: string;
+        /**
+         * If the span represents a location that was remapped (e.g. via a .d.ts.map file),
+         * then the original filename and span will be specified here
+         */
+        originalTextSpan?: TextSpan;
+        originalFileName?: string;
+    }
+    interface RenameLocation extends DocumentSpan {
+        readonly prefixText?: string;
+        readonly suffixText?: string;
+    }
+    interface ReferenceEntry extends DocumentSpan {
+        isWriteAccess: boolean;
+        isDefinition: boolean;
+        isInString?: true;
+    }
+    interface ImplementationLocation extends DocumentSpan {
+        kind: ScriptElementKind;
+        displayParts: SymbolDisplayPart[];
+    }
+    interface DocumentHighlights {
+        fileName: string;
+        highlightSpans: HighlightSpan[];
+    }
+    enum HighlightSpanKind {
+        none = "none",
+        definition = "definition",
+        reference = "reference",
+        writtenReference = "writtenReference"
+    }
+    interface HighlightSpan {
+        fileName?: string;
+        isInString?: true;
+        textSpan: TextSpan;
+        kind: HighlightSpanKind;
+    }
+    interface NavigateToItem {
+        name: string;
+        kind: ScriptElementKind;
+        kindModifiers: string;
+        matchKind: "exact" | "prefix" | "substring" | "camelCase";
+        isCaseSensitive: boolean;
+        fileName: string;
+        textSpan: TextSpan;
+        containerName: string;
+        containerKind: ScriptElementKind;
+    }
+    enum IndentStyle {
+        None = 0,
+        Block = 1,
+        Smart = 2
+    }
+    interface EditorOptions {
+        BaseIndentSize?: number;
+        IndentSize: number;
+        TabSize: number;
+        NewLineCharacter: string;
+        ConvertTabsToSpaces: boolean;
+        IndentStyle: IndentStyle;
+    }
+    interface EditorSettings {
+        baseIndentSize?: number;
+        indentSize?: number;
+        tabSize?: number;
+        newLineCharacter?: string;
+        convertTabsToSpaces?: boolean;
+        indentStyle?: IndentStyle;
+    }
+    interface FormatCodeOptions extends EditorOptions {
+        InsertSpaceAfterCommaDelimiter: boolean;
+        InsertSpaceAfterSemicolonInForStatements: boolean;
+        InsertSpaceBeforeAndAfterBinaryOperators: boolean;
+        InsertSpaceAfterConstructor?: boolean;
+        InsertSpaceAfterKeywordsInControlFlowStatements: boolean;
+        InsertSpaceAfterFunctionKeywordForAnonymousFunctions: boolean;
+        InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: boolean;
+        InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: boolean;
+        InsertSpaceAfterOpeningAndBeforeClosingNonemptyBraces?: boolean;
+        InsertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: boolean;
+        InsertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces?: boolean;
+        InsertSpaceAfterTypeAssertion?: boolean;
+        InsertSpaceBeforeFunctionParenthesis?: boolean;
+        PlaceOpenBraceOnNewLineForFunctions: boolean;
+        PlaceOpenBraceOnNewLineForControlBlocks: boolean;
+        insertSpaceBeforeTypeAnnotation?: boolean;
+    }
+    interface FormatCodeSettings extends EditorSettings {
+        readonly insertSpaceAfterCommaDelimiter?: boolean;
+        readonly insertSpaceAfterSemicolonInForStatements?: boolean;
+        readonly insertSpaceBeforeAndAfterBinaryOperators?: boolean;
+        readonly insertSpaceAfterConstructor?: boolean;
+        readonly insertSpaceAfterKeywordsInControlFlowStatements?: boolean;
+        readonly insertSpaceAfterFunctionKeywordForAnonymousFunctions?: boolean;
+        readonly insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis?: boolean;
+        readonly insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets?: boolean;
+        readonly insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces?: boolean;
+        readonly insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces?: boolean;
+        readonly insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces?: boolean;
+        readonly insertSpaceAfterTypeAssertion?: boolean;
+        readonly insertSpaceBeforeFunctionParenthesis?: boolean;
+        readonly placeOpenBraceOnNewLineForFunctions?: boolean;
+        readonly placeOpenBraceOnNewLineForControlBlocks?: boolean;
+        readonly insertSpaceBeforeTypeAnnotation?: boolean;
+        readonly indentMultiLineObjectLiteralBeginningOnBlankLine?: boolean;
+    }
+    function getDefaultFormatCodeSettings(newLineCharacter?: string): FormatCodeSettings;
+    interface DefinitionInfo extends DocumentSpan {
+        kind: ScriptElementKind;
+        name: string;
+        containerKind: ScriptElementKind;
+        containerName: string;
+    }
+    interface DefinitionInfoAndBoundSpan {
+        definitions?: ReadonlyArray<DefinitionInfo>;
+        textSpan: TextSpan;
+    }
+    interface ReferencedSymbolDefinitionInfo extends DefinitionInfo {
+        displayParts: SymbolDisplayPart[];
+    }
+    interface ReferencedSymbol {
+        definition: ReferencedSymbolDefinitionInfo;
+        references: ReferenceEntry[];
+    }
+    enum SymbolDisplayPartKind {
+        aliasName = 0,
+        className = 1,
+        enumName = 2,
+        fieldName = 3,
+        interfaceName = 4,
+        keyword = 5,
+        lineBreak = 6,
+        numericLiteral = 7,
+        stringLiteral = 8,
+        localName = 9,
+        methodName = 10,
+        moduleName = 11,
+        operator = 12,
+        parameterName = 13,
+        propertyName = 14,
+        punctuation = 15,
+        space = 16,
+        text = 17,
+        typeParameterName = 18,
+        enumMemberName = 19,
+        functionName = 20,
+        regularExpressionLiteral = 21
+    }
+    interface SymbolDisplayPart {
+        text: string;
+        kind: string;
+    }
+    interface JSDocTagInfo {
+        name: string;
+        text?: string;
+    }
+    interface QuickInfo {
+        kind: ScriptElementKind;
+        kindModifiers: string;
+        textSpan: TextSpan;
+        displayParts?: SymbolDisplayPart[];
+        documentation?: SymbolDisplayPart[];
+        tags?: JSDocTagInfo[];
+    }
+    type RenameInfo = RenameInfoSuccess | RenameInfoFailure;
+    interface RenameInfoSuccess {
+        canRename: true;
+        /**
+         * File or directory to rename.
+         * If set, `getEditsForFileRename` should be called instead of `findRenameLocations`.
+         */
+        fileToRename?: string;
+        displayName: string;
+        fullDisplayName: string;
+        kind: ScriptElementKind;
+        kindModifiers: string;
+        triggerSpan: TextSpan;
+    }
+    interface RenameInfoFailure {
+        canRename: false;
+        localizedErrorMessage: string;
+    }
+    interface RenameInfoOptions {
+        readonly allowRenameOfImportPath?: boolean;
+    }
+    interface SignatureHelpParameter {
+        name: string;
+        documentation: SymbolDisplayPart[];
+        displayParts: SymbolDisplayPart[];
+        isOptional: boolean;
+    }
+    /**
+     * Represents a single signature to show in signature help.
+     * The id is used for subsequent calls into the language service to ask questions about the
+     * signature help item in the context of any documents that have been updated.  i.e. after
+     * an edit has happened, while signature help is still active, the host can ask important
+     * questions like 'what parameter is the user currently contained within?'.
+     */
+    interface SignatureHelpItem {
+        isVariadic: boolean;
+        prefixDisplayParts: SymbolDisplayPart[];
+        suffixDisplayParts: SymbolDisplayPart[];
+        separatorDisplayParts: SymbolDisplayPart[];
+        parameters: SignatureHelpParameter[];
+        documentation: SymbolDisplayPart[];
+        tags: JSDocTagInfo[];
+    }
+    /**
+     * Represents a set of signature help items, and the preferred item that should be selected.
+     */
+    interface SignatureHelpItems {
+        items: SignatureHelpItem[];
+        applicableSpan: TextSpan;
+        selectedItemIndex: number;
+        argumentIndex: number;
+        argumentCount: number;
+    }
+    interface CompletionInfo {
+        /** Not true for all glboal completions. This will be true if the enclosing scope matches a few syntax kinds. See `isSnippetScope`. */
+        isGlobalCompletion: boolean;
+        isMemberCompletion: boolean;
+        /**
+         * true when the current location also allows for a new identifier
+         */
+        isNewIdentifierLocation: boolean;
+        entries: CompletionEntry[];
+    }
+    interface CompletionEntry {
+        name: string;
+        kind: ScriptElementKind;
+        kindModifiers?: string;
+        sortText: string;
+        insertText?: string;
+        /**
+         * An optional span that indicates the text to be replaced by this completion item.
+         * If present, this span should be used instead of the default one.
+         * It will be set if the required span differs from the one generated by the default replacement behavior.
+         */
+        replacementSpan?: TextSpan;
+        hasAction?: true;
+        source?: string;
+        isRecommended?: true;
+    }
+    interface CompletionEntryDetails {
+        name: string;
+        kind: ScriptElementKind;
+        kindModifiers: string;
+        displayParts: SymbolDisplayPart[];
+        documentation?: SymbolDisplayPart[];
+        tags?: JSDocTagInfo[];
+        codeActions?: CodeAction[];
+        source?: SymbolDisplayPart[];
+    }
+    interface OutliningSpan {
+        /** The span of the document to actually collapse. */
+        textSpan: TextSpan;
+        /** The span of the document to display when the user hovers over the collapsed span. */
+        hintSpan: TextSpan;
+        /** The text to display in the editor for the collapsed region. */
+        bannerText: string;
+        /**
+         * Whether or not this region should be automatically collapsed when
+         * the 'Collapse to Definitions' command is invoked.
+         */
+        autoCollapse: boolean;
+        /**
+         * Classification of the contents of the span
+         */
+        kind: OutliningSpanKind;
+    }
+    enum OutliningSpanKind {
+        /** Single or multi-line comments */
+        Comment = "comment",
+        /** Sections marked by '// #region' and '// #endregion' comments */
+        Region = "region",
+        /** Declarations and expressions */
+        Code = "code",
+        /** Contiguous blocks of import declarations */
+        Imports = "imports"
+    }
+    enum OutputFileType {
+        JavaScript = 0,
+        SourceMap = 1,
+        Declaration = 2
+    }
+    enum EndOfLineState {
+        None = 0,
+        InMultiLineCommentTrivia = 1,
+        InSingleQuoteStringLiteral = 2,
+        InDoubleQuoteStringLiteral = 3,
+        InTemplateHeadOrNoSubstitutionTemplate = 4,
+        InTemplateMiddleOrTail = 5,
+        InTemplateSubstitutionPosition = 6
+    }
+    enum TokenClass {
+        Punctuation = 0,
+        Keyword = 1,
+        Operator = 2,
+        Comment = 3,
+        Whitespace = 4,
+        Identifier = 5,
+        NumberLiteral = 6,
+        BigIntLiteral = 7,
+        StringLiteral = 8,
+        RegExpLiteral = 9
+    }
+    interface ClassificationResult {
+        finalLexState: EndOfLineState;
+        entries: ClassificationInfo[];
+    }
+    interface ClassificationInfo {
+        length: number;
+        classification: TokenClass;
+    }
+    interface Classifier {
+        /**
+         * Gives lexical classifications of tokens on a line without any syntactic context.
+         * For instance, a token consisting of the text 'string' can be either an identifier
+         * named 'string' or the keyword 'string', however, because this classifier is not aware,
+         * it relies on certain heuristics to give acceptable results. For classifications where
+         * speed trumps accuracy, this function is preferable; however, for true accuracy, the
+         * syntactic classifier is ideal. In fact, in certain editing scenarios, combining the
+         * lexical, syntactic, and semantic classifiers may issue the best user experience.
+         *
+         * @param text                      The text of a line to classify.
+         * @param lexState                  The state of the lexical classifier at the end of the previous line.
+         * @param syntacticClassifierAbsent Whether the client is *not* using a syntactic classifier.
+         *                                  If there is no syntactic classifier (syntacticClassifierAbsent=true),
+         *                                  certain heuristics may be used in its place; however, if there is a
+         *                                  syntactic classifier (syntacticClassifierAbsent=false), certain
+         *                                  classifications which may be incorrectly categorized will be given
+         *                                  back as Identifiers in order to allow the syntactic classifier to
+         *                                  subsume the classification.
+         * @deprecated Use getLexicalClassifications instead.
+         */
+        getClassificationsForLine(text: string, lexState: EndOfLineState, syntacticClassifierAbsent: boolean): ClassificationResult;
+        getEncodedLexicalClassifications(text: string, endOfLineState: EndOfLineState, syntacticClassifierAbsent: boolean): Classifications;
+    }
+    enum ScriptElementKind {
+        unknown = "",
+        warning = "warning",
+        /** predefined type (void) or keyword (class) */
+        keyword = "keyword",
+        /** top level script node */
+        scriptElement = "script",
+        /** module foo {} */
+        moduleElement = "module",
+        /** class X {} */
+        classElement = "class",
+        /** var x = class X {} */
+        localClassElement = "local class",
+        /** interface Y {} */
+        interfaceElement = "interface",
+        /** type T = ... */
+        typeElement = "type",
+        /** enum E */
+        enumElement = "enum",
+        enumMemberElement = "enum member",
+        /**
+         * Inside module and script only
+         * const v = ..
+         */
+        variableElement = "var",
+        /** Inside function */
+        localVariableElement = "local var",
+        /**
+         * Inside module and script only
+         * function f() { }
+         */
+        functionElement = "function",
+        /** Inside function */
+        localFunctionElement = "local function",
+        /** class X { [public|private]* foo() {} } */
+        memberFunctionElement = "method",
+        /** class X { [public|private]* [get|set] foo:number; } */
+        memberGetAccessorElement = "getter",
+        memberSetAccessorElement = "setter",
+        /**
+         * class X { [public|private]* foo:number; }
+         * interface Y { foo:number; }
+         */
+        memberVariableElement = "property",
+        /** class X { constructor() { } } */
+        constructorImplementationElement = "constructor",
+        /** interface Y { ():number; } */
+        callSignatureElement = "call",
+        /** interface Y { []:number; } */
+        indexSignatureElement = "index",
+        /** interface Y { new():Y; } */
+        constructSignatureElement = "construct",
+        /** function foo(*Y*: string) */
+        parameterElement = "parameter",
+        typeParameterElement = "type parameter",
+        primitiveType = "primitive type",
+        label = "label",
+        alias = "alias",
+        constElement = "const",
+        letElement = "let",
+        directory = "directory",
+        externalModuleName = "external module name",
+        /**
+         * <JsxTagName attribute1 attribute2={0} />
+         */
+        jsxAttribute = "JSX attribute",
+        /** String literal */
+        string = "string"
+    }
+    enum ScriptElementKindModifier {
+        none = "",
+        publicMemberModifier = "public",
+        privateMemberModifier = "private",
+        protectedMemberModifier = "protected",
+        exportedModifier = "export",
+        ambientModifier = "declare",
+        staticModifier = "static",
+        abstractModifier = "abstract",
+        optionalModifier = "optional",
+        dtsModifier = ".d.ts",
+        tsModifier = ".ts",
+        tsxModifier = ".tsx",
+        jsModifier = ".js",
+        jsxModifier = ".jsx",
+        jsonModifier = ".json"
+    }
+    enum ClassificationTypeNames {
+        comment = "comment",
+        identifier = "identifier",
+        keyword = "keyword",
+        numericLiteral = "number",
+        bigintLiteral = "bigint",
+        operator = "operator",
+        stringLiteral = "string",
+        whiteSpace = "whitespace",
+        text = "text",
+        punctuation = "punctuation",
+        className = "class name",
+        enumName = "enum name",
+        interfaceName = "interface name",
+        moduleName = "module name",
+        typeParameterName = "type parameter name",
+        typeAliasName = "type alias name",
+        parameterName = "parameter name",
+        docCommentTagName = "doc comment tag name",
+        jsxOpenTagName = "jsx open tag name",
+        jsxCloseTagName = "jsx close tag name",
+        jsxSelfClosingTagName = "jsx self closing tag name",
+        jsxAttribute = "jsx attribute",
+        jsxText = "jsx text",
+        jsxAttributeStringLiteralValue = "jsx attribute string literal value"
+    }
+    enum ClassificationType {
+        comment = 1,
+        identifier = 2,
+        keyword = 3,
+        numericLiteral = 4,
+        operator = 5,
+        stringLiteral = 6,
+        regularExpressionLiteral = 7,
+        whiteSpace = 8,
+        text = 9,
+        punctuation = 10,
+        className = 11,
+        enumName = 12,
+        interfaceName = 13,
+        moduleName = 14,
+        typeParameterName = 15,
+        typeAliasName = 16,
+        parameterName = 17,
+        docCommentTagName = 18,
+        jsxOpenTagName = 19,
+        jsxCloseTagName = 20,
+        jsxSelfClosingTagName = 21,
+        jsxAttribute = 22,
+        jsxText = 23,
+        jsxAttributeStringLiteralValue = 24,
+        bigintLiteral = 25
+    }
+}
+declare namespace ts {
+    function createClassifier(): Classifier;
+}
+declare namespace ts {
+    /**
+     * The document registry represents a store of SourceFile objects that can be shared between
+     * multiple LanguageService instances. A LanguageService instance holds on the SourceFile (AST)
+     * of files in the context.
+     * SourceFile objects account for most of the memory usage by the language service. Sharing
+     * the same DocumentRegistry instance between different instances of LanguageService allow
+     * for more efficient memory utilization since all projects will share at least the library
+     * file (lib.d.ts).
+     *
+     * A more advanced use of the document registry is to serialize sourceFile objects to disk
+     * and re-hydrate them when needed.
+     *
+     * To create a default DocumentRegistry, use createDocumentRegistry to create one, and pass it
+     * to all subsequent createLanguageService calls.
+     */
+    interface DocumentRegistry {
+        /**
+         * Request a stored SourceFile with a given fileName and compilationSettings.
+         * The first call to acquire will call createLanguageServiceSourceFile to generate
+         * the SourceFile if was not found in the registry.
+         *
+         * @param fileName The name of the file requested
+         * @param compilationSettings Some compilation settings like target affects the
+         * shape of a the resulting SourceFile. This allows the DocumentRegistry to store
+         * multiple copies of the same file for different compilation settings.
+         * @param scriptSnapshot Text of the file. Only used if the file was not found
+         * in the registry and a new one was created.
+         * @param version Current version of the file. Only used if the file was not found
+         * in the registry and a new one was created.
+         */
+        acquireDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string, scriptKind?: ScriptKind): SourceFile;
+        acquireDocumentWithKey(fileName: string, path: Path, compilationSettings: CompilerOptions, key: DocumentRegistryBucketKey, scriptSnapshot: IScriptSnapshot, version: string, scriptKind?: ScriptKind): SourceFile;
+        /**
+         * Request an updated version of an already existing SourceFile with a given fileName
+         * and compilationSettings. The update will in-turn call updateLanguageServiceSourceFile
+         * to get an updated SourceFile.
+         *
+         * @param fileName The name of the file requested
+         * @param compilationSettings Some compilation settings like target affects the
+         * shape of a the resulting SourceFile. This allows the DocumentRegistry to store
+         * multiple copies of the same file for different compilation settings.
+         * @param scriptSnapshot Text of the file.
+         * @param version Current version of the file.
+         */
+        updateDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string, scriptKind?: ScriptKind): SourceFile;
+        updateDocumentWithKey(fileName: string, path: Path, compilationSettings: CompilerOptions, key: DocumentRegistryBucketKey, scriptSnapshot: IScriptSnapshot, version: string, scriptKind?: ScriptKind): SourceFile;
+        getKeyForCompilationSettings(settings: CompilerOptions): DocumentRegistryBucketKey;
+        /**
+         * Informs the DocumentRegistry that a file is not needed any longer.
+         *
+         * Note: It is not allowed to call release on a SourceFile that was not acquired from
+         * this registry originally.
+         *
+         * @param fileName The name of the file to be released
+         * @param compilationSettings The compilation settings used to acquire the file
+         */
+        releaseDocument(fileName: string, compilationSettings: CompilerOptions): void;
+        releaseDocumentWithKey(path: Path, key: DocumentRegistryBucketKey): void;
+        reportStats(): string;
+    }
+    type DocumentRegistryBucketKey = string & {
+        __bucketKey: any;
+    };
+    function createDocumentRegistry(useCaseSensitiveFileNames?: boolean, currentDirectory?: string): DocumentRegistry;
+}
+declare namespace ts {
+    function preProcessFile(sourceText: string, readImportFiles?: boolean, detectJavaScriptImports?: boolean): PreProcessedFileInfo;
+}
+declare namespace ts {
+    interface TranspileOptions {
+        compilerOptions?: CompilerOptions;
+        fileName?: string;
+        reportDiagnostics?: boolean;
+        moduleName?: string;
+        renamedDependencies?: MapLike<string>;
+        transformers?: CustomTransformers;
+    }
+    interface TranspileOutput {
+        outputText: string;
+        diagnostics?: Diagnostic[];
+        sourceMapText?: string;
+    }
+    function transpileModule(input: string, transpileOptions: TranspileOptions): TranspileOutput;
+    function transpile(input: string, compilerOptions?: CompilerOptions, fileName?: string, diagnostics?: Diagnostic[], moduleName?: string): string;
+}
+declare namespace ts {
+    function generateTypesForModule(name: string, moduleValue: unknown, formatSettings: FormatCodeSettings): string;
+    function generateTypesForGlobal(name: string, globalValue: unknown, formatSettings: FormatCodeSettings): string;
+}
+declare namespace ts {
+    /** The version of the language service API */
+    const servicesVersion = "0.8";
+    function toEditorSettings(options: EditorOptions | EditorSettings): EditorSettings;
+    function displayPartsToString(displayParts: SymbolDisplayPart[] | undefined): string;
+    function getDefaultCompilerOptions(): CompilerOptions;
+    function getSupportedCodeFixes(): string[];
+    function createLanguageServiceSourceFile(fileName: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean, scriptKind?: ScriptKind): SourceFile;
+    let disableIncrementalParsing: boolean;
+    function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange | undefined, aggressiveChecks?: boolean): SourceFile;
+    function createLanguageService(host: LanguageServiceHost, documentRegistry?: DocumentRegistry, syntaxOnly?: boolean): LanguageService;
+    /**
+     * Get the path of the default library files (lib.d.ts) as distributed with the typescript
+     * node package.
+     * The functionality is not supported if the ts module is consumed outside of a node module.
+     */
+    function getDefaultLibFilePath(options: CompilerOptions): string;
+}
+declare namespace ts {
+    /**
+     * Transform one or more nodes using the supplied transformers.
+     * @param source A single `Node` or an array of `Node` objects.
+     * @param transformers An array of `TransformerFactory` callbacks used to process the transformation.
+     * @param compilerOptions Optional compiler options.
+     */
+    function transform<T extends Node>(source: T | T[], transformers: TransformerFactory<T>[], compilerOptions?: CompilerOptions): TransformationResult<T>;
+}
+
+export = ts;
\ No newline at end of file
diff --git a/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js b/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js
new file mode 100644
index 000000000000..d2e2e7ecb403
--- /dev/null
+++ b/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js
@@ -0,0 +1,120948 @@
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved. 
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at http://www.apache.org/licenses/LICENSE-2.0  
+ 
+THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
+MERCHANTABLITY OR NON-INFRINGEMENT. 
+ 
+See the Apache Version 2.0 License for specific language governing permissions
+and limitations under the License.
+***************************************************************************** */
+
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {
+    if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
+    return cooked;
+};
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var ts;
+(function (ts) {
+    // WARNING: The script `configureNightly.ts` uses a regexp to parse out these values.
+    // If changing the text in this section, be sure to test `configureNightly` too.
+    ts.versionMajorMinor = "3.3";
+    /** The version of the TypeScript compiler release */
+    ts.version = ts.versionMajorMinor + ".3333";
+})(ts || (ts = {}));
+(function (ts) {
+    /* @internal */
+    var Comparison;
+    (function (Comparison) {
+        Comparison[Comparison["LessThan"] = -1] = "LessThan";
+        Comparison[Comparison["EqualTo"] = 0] = "EqualTo";
+        Comparison[Comparison["GreaterThan"] = 1] = "GreaterThan";
+    })(Comparison = ts.Comparison || (ts.Comparison = {}));
+})(ts || (ts = {}));
+/* @internal */
+(function (ts) {
+    ts.emptyArray = [];
+    /** Create a MapLike with good performance. */
+    function createDictionaryObject() {
+        var map = Object.create(/*prototype*/ null); // tslint:disable-line:no-null-keyword
+        // Using 'delete' on an object causes V8 to put the object in dictionary mode.
+        // This disables creation of hidden classes, which are expensive when an object is
+        // constantly changing shape.
+        map.__ = undefined;
+        delete map.__;
+        return map;
+    }
+    /** Create a new map. If a template object is provided, the map will copy entries from it. */
+    function createMap() {
+        return new ts.MapCtr();
+    }
+    ts.createMap = createMap;
+    function createMapFromEntries(entries) {
+        var map = createMap();
+        for (var _i = 0, entries_1 = entries; _i < entries_1.length; _i++) {
+            var _a = entries_1[_i], key = _a[0], value = _a[1];
+            map.set(key, value);
+        }
+        return map;
+    }
+    ts.createMapFromEntries = createMapFromEntries;
+    function createMapFromTemplate(template) {
+        var map = new ts.MapCtr();
+        // Copies keys/values from template. Note that for..in will not throw if
+        // template is undefined, and instead will just exit the loop.
+        for (var key in template) {
+            if (hasOwnProperty.call(template, key)) {
+                map.set(key, template[key]);
+            }
+        }
+        return map;
+    }
+    ts.createMapFromTemplate = createMapFromTemplate;
+    // Internet Explorer's Map doesn't support iteration, so don't use it.
+    // tslint:disable-next-line no-in-operator variable-name
+    ts.MapCtr = typeof Map !== "undefined" && "entries" in Map.prototype ? Map : shimMap();
+    // Keep the class inside a function so it doesn't get compiled if it's not used.
+    function shimMap() {
+        var MapIterator = /** @class */ (function () {
+            function MapIterator(data, selector) {
+                this.index = 0;
+                this.data = data;
+                this.selector = selector;
+                this.keys = Object.keys(data);
+            }
+            MapIterator.prototype.next = function () {
+                var index = this.index;
+                if (index < this.keys.length) {
+                    this.index++;
+                    return { value: this.selector(this.data, this.keys[index]), done: false };
+                }
+                return { value: undefined, done: true };
+            };
+            return MapIterator;
+        }());
+        return /** @class */ (function () {
+            function class_1() {
+                this.data = createDictionaryObject();
+                this.size = 0;
+            }
+            class_1.prototype.get = function (key) {
+                return this.data[key];
+            };
+            class_1.prototype.set = function (key, value) {
+                if (!this.has(key)) {
+                    this.size++;
+                }
+                this.data[key] = value;
+                return this;
+            };
+            class_1.prototype.has = function (key) {
+                // tslint:disable-next-line:no-in-operator
+                return key in this.data;
+            };
+            class_1.prototype.delete = function (key) {
+                if (this.has(key)) {
+                    this.size--;
+                    delete this.data[key];
+                    return true;
+                }
+                return false;
+            };
+            class_1.prototype.clear = function () {
+                this.data = createDictionaryObject();
+                this.size = 0;
+            };
+            class_1.prototype.keys = function () {
+                return new MapIterator(this.data, function (_data, key) { return key; });
+            };
+            class_1.prototype.values = function () {
+                return new MapIterator(this.data, function (data, key) { return data[key]; });
+            };
+            class_1.prototype.entries = function () {
+                return new MapIterator(this.data, function (data, key) { return [key, data[key]]; });
+            };
+            class_1.prototype.forEach = function (action) {
+                for (var key in this.data) {
+                    action(this.data[key], key);
+                }
+            };
+            return class_1;
+        }());
+    }
+    function length(array) {
+        return array ? array.length : 0;
+    }
+    ts.length = length;
+    /**
+     * Iterates through 'array' by index and performs the callback on each element of array until the callback
+     * returns a truthy value, then returns that value.
+     * If no such value is found, the callback is applied to each element of array and undefined is returned.
+     */
+    function forEach(array, callback) {
+        if (array) {
+            for (var i = 0; i < array.length; i++) {
+                var result = callback(array[i], i);
+                if (result) {
+                    return result;
+                }
+            }
+        }
+        return undefined;
+    }
+    ts.forEach = forEach;
+    /** Like `forEach`, but suitable for use with numbers and strings (which may be falsy). */
+    function firstDefined(array, callback) {
+        if (array === undefined) {
+            return undefined;
+        }
+        for (var i = 0; i < array.length; i++) {
+            var result = callback(array[i], i);
+            if (result !== undefined) {
+                return result;
+            }
+        }
+        return undefined;
+    }
+    ts.firstDefined = firstDefined;
+    function firstDefinedIterator(iter, callback) {
+        while (true) {
+            var _a = iter.next(), value = _a.value, done = _a.done;
+            if (done) {
+                return undefined;
+            }
+            var result = callback(value);
+            if (result !== undefined) {
+                return result;
+            }
+        }
+    }
+    ts.firstDefinedIterator = firstDefinedIterator;
+    function zipWith(arrayA, arrayB, callback) {
+        var result = [];
+        Debug.assertEqual(arrayA.length, arrayB.length);
+        for (var i = 0; i < arrayA.length; i++) {
+            result.push(callback(arrayA[i], arrayB[i], i));
+        }
+        return result;
+    }
+    ts.zipWith = zipWith;
+    function zipToIterator(arrayA, arrayB) {
+        Debug.assertEqual(arrayA.length, arrayB.length);
+        var i = 0;
+        return {
+            next: function () {
+                if (i === arrayA.length) {
+                    return { value: undefined, done: true };
+                }
+                i++;
+                return { value: [arrayA[i - 1], arrayB[i - 1]], done: false };
+            }
+        };
+    }
+    ts.zipToIterator = zipToIterator;
+    function zipToMap(keys, values) {
+        Debug.assert(keys.length === values.length);
+        var map = createMap();
+        for (var i = 0; i < keys.length; ++i) {
+            map.set(keys[i], values[i]);
+        }
+        return map;
+    }
+    ts.zipToMap = zipToMap;
+    /**
+     * Iterates through `array` by index and performs the callback on each element of array until the callback
+     * returns a falsey value, then returns false.
+     * If no such value is found, the callback is applied to each element of array and `true` is returned.
+     */
+    function every(array, callback) {
+        if (array) {
+            for (var i = 0; i < array.length; i++) {
+                if (!callback(array[i], i)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+    ts.every = every;
+    function find(array, predicate) {
+        for (var i = 0; i < array.length; i++) {
+            var value = array[i];
+            if (predicate(value, i)) {
+                return value;
+            }
+        }
+        return undefined;
+    }
+    ts.find = find;
+    function findLast(array, predicate) {
+        for (var i = array.length - 1; i >= 0; i--) {
+            var value = array[i];
+            if (predicate(value, i)) {
+                return value;
+            }
+        }
+        return undefined;
+    }
+    ts.findLast = findLast;
+    /** Works like Array.prototype.findIndex, returning `-1` if no element satisfying the predicate is found. */
+    function findIndex(array, predicate, startIndex) {
+        for (var i = startIndex || 0; i < array.length; i++) {
+            if (predicate(array[i], i)) {
+                return i;
+            }
+        }
+        return -1;
+    }
+    ts.findIndex = findIndex;
+    function findLastIndex(array, predicate, startIndex) {
+        for (var i = startIndex === undefined ? array.length - 1 : startIndex; i >= 0; i--) {
+            if (predicate(array[i], i)) {
+                return i;
+            }
+        }
+        return -1;
+    }
+    ts.findLastIndex = findLastIndex;
+    /**
+     * Returns the first truthy result of `callback`, or else fails.
+     * This is like `forEach`, but never returns undefined.
+     */
+    function findMap(array, callback) {
+        for (var i = 0; i < array.length; i++) {
+            var result = callback(array[i], i);
+            if (result) {
+                return result;
+            }
+        }
+        return Debug.fail();
+    }
+    ts.findMap = findMap;
+    function contains(array, value, equalityComparer) {
+        if (equalityComparer === void 0) { equalityComparer = equateValues; }
+        if (array) {
+            for (var _i = 0, array_1 = array; _i < array_1.length; _i++) {
+                var v = array_1[_i];
+                if (equalityComparer(v, value)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    ts.contains = contains;
+    function arraysEqual(a, b, equalityComparer) {
+        if (equalityComparer === void 0) { equalityComparer = equateValues; }
+        return a.length === b.length && a.every(function (x, i) { return equalityComparer(x, b[i]); });
+    }
+    ts.arraysEqual = arraysEqual;
+    function indexOfAnyCharCode(text, charCodes, start) {
+        for (var i = start || 0; i < text.length; i++) {
+            if (contains(charCodes, text.charCodeAt(i))) {
+                return i;
+            }
+        }
+        return -1;
+    }
+    ts.indexOfAnyCharCode = indexOfAnyCharCode;
+    function countWhere(array, predicate) {
+        var count = 0;
+        if (array) {
+            for (var i = 0; i < array.length; i++) {
+                var v = array[i];
+                if (predicate(v, i)) {
+                    count++;
+                }
+            }
+        }
+        return count;
+    }
+    ts.countWhere = countWhere;
+    function filter(array, f) {
+        if (array) {
+            var len = array.length;
+            var i = 0;
+            while (i < len && f(array[i]))
+                i++;
+            if (i < len) {
+                var result = array.slice(0, i);
+                i++;
+                while (i < len) {
+                    var item = array[i];
+                    if (f(item)) {
+                        result.push(item);
+                    }
+                    i++;
+                }
+                return result;
+            }
+        }
+        return array;
+    }
+    ts.filter = filter;
+    function filterMutate(array, f) {
+        var outIndex = 0;
+        for (var i = 0; i < array.length; i++) {
+            if (f(array[i], i, array)) {
+                array[outIndex] = array[i];
+                outIndex++;
+            }
+        }
+        array.length = outIndex;
+    }
+    ts.filterMutate = filterMutate;
+    function clear(array) {
+        array.length = 0;
+    }
+    ts.clear = clear;
+    function map(array, f) {
+        var result;
+        if (array) {
+            result = [];
+            for (var i = 0; i < array.length; i++) {
+                result.push(f(array[i], i));
+            }
+        }
+        return result;
+    }
+    ts.map = map;
+    function mapIterator(iter, mapFn) {
+        return {
+            next: function () {
+                var iterRes = iter.next();
+                return iterRes.done ? iterRes : { value: mapFn(iterRes.value), done: false };
+            }
+        };
+    }
+    ts.mapIterator = mapIterator;
+    function sameMap(array, f) {
+        if (array) {
+            for (var i = 0; i < array.length; i++) {
+                var item = array[i];
+                var mapped = f(item, i);
+                if (item !== mapped) {
+                    var result = array.slice(0, i);
+                    result.push(mapped);
+                    for (i++; i < array.length; i++) {
+                        result.push(f(array[i], i));
+                    }
+                    return result;
+                }
+            }
+        }
+        return array;
+    }
+    ts.sameMap = sameMap;
+    function flatten(array) {
+        var result;
+        if (array) {
+            result = [];
+            for (var _i = 0, array_2 = array; _i < array_2.length; _i++) {
+                var v = array_2[_i];
+                if (v) {
+                    if (isArray(v)) {
+                        addRange(result, v);
+                    }
+                    else {
+                        result.push(v);
+                    }
+                }
+            }
+        }
+        return result;
+    }
+    ts.flatten = flatten;
+    /**
+     * Maps an array. If the mapped value is an array, it is spread into the result.
+     *
+     * @param array The array to map.
+     * @param mapfn The callback used to map the result into one or more values.
+     */
+    function flatMap(array, mapfn) {
+        var result;
+        if (array) {
+            for (var i = 0; i < array.length; i++) {
+                var v = mapfn(array[i], i);
+                if (v) {
+                    if (isArray(v)) {
+                        result = addRange(result, v);
+                    }
+                    else {
+                        result = append(result, v);
+                    }
+                }
+            }
+        }
+        return result || ts.emptyArray;
+    }
+    ts.flatMap = flatMap;
+    function flatMapToMutable(array, mapfn) {
+        var result = [];
+        if (array) {
+            for (var i = 0; i < array.length; i++) {
+                var v = mapfn(array[i], i);
+                if (v) {
+                    if (isArray(v)) {
+                        addRange(result, v);
+                    }
+                    else {
+                        result.push(v);
+                    }
+                }
+            }
+        }
+        return result;
+    }
+    ts.flatMapToMutable = flatMapToMutable;
+    function flatMapIterator(iter, mapfn) {
+        var first = iter.next();
+        if (first.done) {
+            return ts.emptyIterator;
+        }
+        var currentIter = getIterator(first.value);
+        return {
+            next: function () {
+                while (true) {
+                    var currentRes = currentIter.next();
+                    if (!currentRes.done) {
+                        return currentRes;
+                    }
+                    var iterRes = iter.next();
+                    if (iterRes.done) {
+                        return iterRes;
+                    }
+                    currentIter = getIterator(iterRes.value);
+                }
+            },
+        };
+        function getIterator(x) {
+            var res = mapfn(x);
+            return res === undefined ? ts.emptyIterator : isArray(res) ? arrayIterator(res) : res;
+        }
+    }
+    ts.flatMapIterator = flatMapIterator;
+    function sameFlatMap(array, mapfn) {
+        var result;
+        if (array) {
+            for (var i = 0; i < array.length; i++) {
+                var item = array[i];
+                var mapped = mapfn(item, i);
+                if (result || item !== mapped || isArray(mapped)) {
+                    if (!result) {
+                        result = array.slice(0, i);
+                    }
+                    if (isArray(mapped)) {
+                        addRange(result, mapped);
+                    }
+                    else {
+                        result.push(mapped);
+                    }
+                }
+            }
+        }
+        return result || array;
+    }
+    ts.sameFlatMap = sameFlatMap;
+    function mapAllOrFail(array, mapFn) {
+        var result = [];
+        for (var i = 0; i < array.length; i++) {
+            var mapped = mapFn(array[i], i);
+            if (mapped === undefined) {
+                return undefined;
+            }
+            result.push(mapped);
+        }
+        return result;
+    }
+    ts.mapAllOrFail = mapAllOrFail;
+    function mapDefined(array, mapFn) {
+        var result = [];
+        if (array) {
+            for (var i = 0; i < array.length; i++) {
+                var mapped = mapFn(array[i], i);
+                if (mapped !== undefined) {
+                    result.push(mapped);
+                }
+            }
+        }
+        return result;
+    }
+    ts.mapDefined = mapDefined;
+    function mapDefinedIterator(iter, mapFn) {
+        return {
+            next: function () {
+                while (true) {
+                    var res = iter.next();
+                    if (res.done) {
+                        return res;
+                    }
+                    var value = mapFn(res.value);
+                    if (value !== undefined) {
+                        return { value: value, done: false };
+                    }
+                }
+            }
+        };
+    }
+    ts.mapDefinedIterator = mapDefinedIterator;
+    ts.emptyIterator = { next: function () { return ({ value: undefined, done: true }); } };
+    function singleIterator(value) {
+        var done = false;
+        return {
+            next: function () {
+                var wasDone = done;
+                done = true;
+                return wasDone ? { value: undefined, done: true } : { value: value, done: false };
+            }
+        };
+    }
+    ts.singleIterator = singleIterator;
+    function spanMap(array, keyfn, mapfn) {
+        var result;
+        if (array) {
+            result = [];
+            var len = array.length;
+            var previousKey = void 0;
+            var key = void 0;
+            var start = 0;
+            var pos = 0;
+            while (start < len) {
+                while (pos < len) {
+                    var value = array[pos];
+                    key = keyfn(value, pos);
+                    if (pos === 0) {
+                        previousKey = key;
+                    }
+                    else if (key !== previousKey) {
+                        break;
+                    }
+                    pos++;
+                }
+                if (start < pos) {
+                    var v = mapfn(array.slice(start, pos), previousKey, start, pos);
+                    if (v) {
+                        result.push(v);
+                    }
+                    start = pos;
+                }
+                previousKey = key;
+                pos++;
+            }
+        }
+        return result;
+    }
+    ts.spanMap = spanMap;
+    function mapEntries(map, f) {
+        if (!map) {
+            return undefined;
+        }
+        var result = createMap();
+        map.forEach(function (value, key) {
+            var _a = f(key, value), newKey = _a[0], newValue = _a[1];
+            result.set(newKey, newValue);
+        });
+        return result;
+    }
+    ts.mapEntries = mapEntries;
+    function some(array, predicate) {
+        if (array) {
+            if (predicate) {
+                for (var _i = 0, array_3 = array; _i < array_3.length; _i++) {
+                    var v = array_3[_i];
+                    if (predicate(v)) {
+                        return true;
+                    }
+                }
+            }
+            else {
+                return array.length > 0;
+            }
+        }
+        return false;
+    }
+    ts.some = some;
+    /** Calls the callback with (start, afterEnd) index pairs for each range where 'pred' is true. */
+    function getRangesWhere(arr, pred, cb) {
+        var start;
+        for (var i = 0; i < arr.length; i++) {
+            if (pred(arr[i])) {
+                start = start === undefined ? i : start;
+            }
+            else {
+                if (start !== undefined) {
+                    cb(start, i);
+                    start = undefined;
+                }
+            }
+        }
+        if (start !== undefined)
+            cb(start, arr.length);
+    }
+    ts.getRangesWhere = getRangesWhere;
+    function concatenate(array1, array2) {
+        if (!some(array2))
+            return array1;
+        if (!some(array1))
+            return array2;
+        return array1.concat(array2);
+    }
+    ts.concatenate = concatenate;
+    function deduplicateRelational(array, equalityComparer, comparer) {
+        // Perform a stable sort of the array. This ensures the first entry in a list of
+        // duplicates remains the first entry in the result.
+        var indices = array.map(function (_, i) { return i; });
+        stableSortIndices(array, indices, comparer);
+        var last = array[indices[0]];
+        var deduplicated = [indices[0]];
+        for (var i = 1; i < indices.length; i++) {
+            var index = indices[i];
+            var item = array[index];
+            if (!equalityComparer(last, item)) {
+                deduplicated.push(index);
+                last = item;
+            }
+        }
+        // restore original order
+        deduplicated.sort();
+        return deduplicated.map(function (i) { return array[i]; });
+    }
+    function deduplicateEquality(array, equalityComparer) {
+        var result = [];
+        for (var _i = 0, array_4 = array; _i < array_4.length; _i++) {
+            var item = array_4[_i];
+            pushIfUnique(result, item, equalityComparer);
+        }
+        return result;
+    }
+    /**
+     * Deduplicates an unsorted array.
+     * @param equalityComparer An optional `EqualityComparer` used to determine if two values are duplicates.
+     * @param comparer An optional `Comparer` used to sort entries before comparison, though the
+     * result will remain in the original order in `array`.
+     */
+    function deduplicate(array, equalityComparer, comparer) {
+        return array.length === 0 ? [] :
+            array.length === 1 ? array.slice() :
+                comparer ? deduplicateRelational(array, equalityComparer, comparer) :
+                    deduplicateEquality(array, equalityComparer);
+    }
+    ts.deduplicate = deduplicate;
+    /**
+     * Deduplicates an array that has already been sorted.
+     */
+    function deduplicateSorted(array, comparer) {
+        if (array.length === 0)
+            return ts.emptyArray;
+        var last = array[0];
+        var deduplicated = [last];
+        for (var i = 1; i < array.length; i++) {
+            var next = array[i];
+            switch (comparer(next, last)) {
+                // equality comparison
+                case true:
+                // relational comparison
+                case 0 /* EqualTo */:
+                    continue;
+                case -1 /* LessThan */:
+                    // If `array` is sorted, `next` should **never** be less than `last`.
+                    return Debug.fail("Array is unsorted.");
+            }
+            deduplicated.push(last = next);
+        }
+        return deduplicated;
+    }
+    function insertSorted(array, insert, compare) {
+        if (array.length === 0) {
+            array.push(insert);
+            return;
+        }
+        var insertIndex = binarySearch(array, insert, identity, compare);
+        if (insertIndex < 0) {
+            array.splice(~insertIndex, 0, insert);
+        }
+    }
+    ts.insertSorted = insertSorted;
+    function sortAndDeduplicate(array, comparer, equalityComparer) {
+        return deduplicateSorted(sort(array, comparer), equalityComparer || comparer || compareStringsCaseSensitive);
+    }
+    ts.sortAndDeduplicate = sortAndDeduplicate;
+    function arrayIsEqualTo(array1, array2, equalityComparer) {
+        if (equalityComparer === void 0) { equalityComparer = equateValues; }
+        if (!array1 || !array2) {
+            return array1 === array2;
+        }
+        if (array1.length !== array2.length) {
+            return false;
+        }
+        for (var i = 0; i < array1.length; i++) {
+            if (!equalityComparer(array1[i], array2[i], i)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    ts.arrayIsEqualTo = arrayIsEqualTo;
+    function compact(array) {
+        var result;
+        if (array) {
+            for (var i = 0; i < array.length; i++) {
+                var v = array[i];
+                if (result || !v) {
+                    if (!result) {
+                        result = array.slice(0, i);
+                    }
+                    if (v) {
+                        result.push(v);
+                    }
+                }
+            }
+        }
+        return result || array;
+    }
+    ts.compact = compact;
+    /**
+     * Gets the relative complement of `arrayA` with respect to `arrayB`, returning the elements that
+     * are not present in `arrayA` but are present in `arrayB`. Assumes both arrays are sorted
+     * based on the provided comparer.
+     */
+    function relativeComplement(arrayA, arrayB, comparer) {
+        if (!arrayB || !arrayA || arrayB.length === 0 || arrayA.length === 0)
+            return arrayB;
+        var result = [];
+        loopB: for (var offsetA = 0, offsetB = 0; offsetB < arrayB.length; offsetB++) {
+            if (offsetB > 0) {
+                // Ensure `arrayB` is properly sorted.
+                Debug.assertGreaterThanOrEqual(comparer(arrayB[offsetB], arrayB[offsetB - 1]), 0 /* EqualTo */);
+            }
+            loopA: for (var startA = offsetA; offsetA < arrayA.length; offsetA++) {
+                if (offsetA > startA) {
+                    // Ensure `arrayA` is properly sorted. We only need to perform this check if
+                    // `offsetA` has changed since we entered the loop.
+                    Debug.assertGreaterThanOrEqual(comparer(arrayA[offsetA], arrayA[offsetA - 1]), 0 /* EqualTo */);
+                }
+                switch (comparer(arrayB[offsetB], arrayA[offsetA])) {
+                    case -1 /* LessThan */:
+                        // If B is less than A, B does not exist in arrayA. Add B to the result and
+                        // move to the next element in arrayB without changing the current position
+                        // in arrayA.
+                        result.push(arrayB[offsetB]);
+                        continue loopB;
+                    case 0 /* EqualTo */:
+                        // If B is equal to A, B exists in arrayA. Move to the next element in
+                        // arrayB without adding B to the result or changing the current position
+                        // in arrayA.
+                        continue loopB;
+                    case 1 /* GreaterThan */:
+                        // If B is greater than A, we need to keep looking for B in arrayA. Move to
+                        // the next element in arrayA and recheck.
+                        continue loopA;
+                }
+            }
+        }
+        return result;
+    }
+    ts.relativeComplement = relativeComplement;
+    function sum(array, prop) {
+        var result = 0;
+        for (var _i = 0, array_5 = array; _i < array_5.length; _i++) {
+            var v = array_5[_i];
+            result += v[prop];
+        }
+        return result;
+    }
+    ts.sum = sum;
+    function append(to, value) {
+        if (value === undefined)
+            return to;
+        if (to === undefined)
+            return [value];
+        to.push(value);
+        return to;
+    }
+    ts.append = append;
+    /**
+     * Gets the actual offset into an array for a relative offset. Negative offsets indicate a
+     * position offset from the end of the array.
+     */
+    function toOffset(array, offset) {
+        return offset < 0 ? array.length + offset : offset;
+    }
+    function addRange(to, from, start, end) {
+        if (from === undefined || from.length === 0)
+            return to;
+        if (to === undefined)
+            return from.slice(start, end);
+        start = start === undefined ? 0 : toOffset(from, start);
+        end = end === undefined ? from.length : toOffset(from, end);
+        for (var i = start; i < end && i < from.length; i++) {
+            if (from[i] !== undefined) {
+                to.push(from[i]);
+            }
+        }
+        return to;
+    }
+    ts.addRange = addRange;
+    /**
+     * @return Whether the value was added.
+     */
+    function pushIfUnique(array, toAdd, equalityComparer) {
+        if (contains(array, toAdd, equalityComparer)) {
+            return false;
+        }
+        else {
+            array.push(toAdd);
+            return true;
+        }
+    }
+    ts.pushIfUnique = pushIfUnique;
+    /**
+     * Unlike `pushIfUnique`, this can take `undefined` as an input, and returns a new array.
+     */
+    function appendIfUnique(array, toAdd, equalityComparer) {
+        if (array) {
+            pushIfUnique(array, toAdd, equalityComparer);
+            return array;
+        }
+        else {
+            return [toAdd];
+        }
+    }
+    ts.appendIfUnique = appendIfUnique;
+    function stableSortIndices(array, indices, comparer) {
+        // sort indices by value then position
+        indices.sort(function (x, y) { return comparer(array[x], array[y]) || compareValues(x, y); });
+    }
+    /**
+     * Returns a new sorted array.
+     */
+    function sort(array, comparer) {
+        return (array.length === 0 ? array : array.slice().sort(comparer));
+    }
+    ts.sort = sort;
+    function arrayIterator(array) {
+        var i = 0;
+        return { next: function () {
+                if (i === array.length) {
+                    return { value: undefined, done: true };
+                }
+                else {
+                    i++;
+                    return { value: array[i - 1], done: false };
+                }
+            } };
+    }
+    ts.arrayIterator = arrayIterator;
+    /**
+     * Stable sort of an array. Elements equal to each other maintain their relative position in the array.
+     */
+    function stableSort(array, comparer) {
+        var indices = array.map(function (_, i) { return i; });
+        stableSortIndices(array, indices, comparer);
+        return indices.map(function (i) { return array[i]; });
+    }
+    ts.stableSort = stableSort;
+    function rangeEquals(array1, array2, pos, end) {
+        while (pos < end) {
+            if (array1[pos] !== array2[pos]) {
+                return false;
+            }
+            pos++;
+        }
+        return true;
+    }
+    ts.rangeEquals = rangeEquals;
+    /**
+     * Returns the element at a specific offset in an array if non-empty, `undefined` otherwise.
+     * A negative offset indicates the element should be retrieved from the end of the array.
+     */
+    function elementAt(array, offset) {
+        if (array) {
+            offset = toOffset(array, offset);
+            if (offset < array.length) {
+                return array[offset];
+            }
+        }
+        return undefined;
+    }
+    ts.elementAt = elementAt;
+    /**
+     * Returns the first element of an array if non-empty, `undefined` otherwise.
+     */
+    function firstOrUndefined(array) {
+        return array.length === 0 ? undefined : array[0];
+    }
+    ts.firstOrUndefined = firstOrUndefined;
+    function first(array) {
+        Debug.assert(array.length !== 0);
+        return array[0];
+    }
+    ts.first = first;
+    /**
+     * Returns the last element of an array if non-empty, `undefined` otherwise.
+     */
+    function lastOrUndefined(array) {
+        return array.length === 0 ? undefined : array[array.length - 1];
+    }
+    ts.lastOrUndefined = lastOrUndefined;
+    function last(array) {
+        Debug.assert(array.length !== 0);
+        return array[array.length - 1];
+    }
+    ts.last = last;
+    /**
+     * Returns the only element of an array if it contains only one element, `undefined` otherwise.
+     */
+    function singleOrUndefined(array) {
+        return array && array.length === 1
+            ? array[0]
+            : undefined;
+    }
+    ts.singleOrUndefined = singleOrUndefined;
+    function singleOrMany(array) {
+        return array && array.length === 1
+            ? array[0]
+            : array;
+    }
+    ts.singleOrMany = singleOrMany;
+    function replaceElement(array, index, value) {
+        var result = array.slice(0);
+        result[index] = value;
+        return result;
+    }
+    ts.replaceElement = replaceElement;
+    /**
+     * Performs a binary search, finding the index at which `value` occurs in `array`.
+     * If no such index is found, returns the 2's-complement of first index at which
+     * `array[index]` exceeds `value`.
+     * @param array A sorted array whose first element must be no larger than number
+     * @param value The value to be searched for in the array.
+     * @param keySelector A callback used to select the search key from `value` and each element of
+     * `array`.
+     * @param keyComparer A callback used to compare two keys in a sorted array.
+     * @param offset An offset into `array` at which to start the search.
+     */
+    function binarySearch(array, value, keySelector, keyComparer, offset) {
+        return binarySearchKey(array, keySelector(value), keySelector, keyComparer, offset);
+    }
+    ts.binarySearch = binarySearch;
+    /**
+     * Performs a binary search, finding the index at which an object with `key` occurs in `array`.
+     * If no such index is found, returns the 2's-complement of first index at which
+     * `array[index]` exceeds `key`.
+     * @param array A sorted array whose first element must be no larger than number
+     * @param key The key to be searched for in the array.
+     * @param keySelector A callback used to select the search key from each element of `array`.
+     * @param keyComparer A callback used to compare two keys in a sorted array.
+     * @param offset An offset into `array` at which to start the search.
+     */
+    function binarySearchKey(array, key, keySelector, keyComparer, offset) {
+        if (!some(array)) {
+            return -1;
+        }
+        var low = offset || 0;
+        var high = array.length - 1;
+        while (low <= high) {
+            var middle = low + ((high - low) >> 1);
+            var midKey = keySelector(array[middle]);
+            switch (keyComparer(midKey, key)) {
+                case -1 /* LessThan */:
+                    low = middle + 1;
+                    break;
+                case 0 /* EqualTo */:
+                    return middle;
+                case 1 /* GreaterThan */:
+                    high = middle - 1;
+                    break;
+            }
+        }
+        return ~low;
+    }
+    ts.binarySearchKey = binarySearchKey;
+    function reduceLeft(array, f, initial, start, count) {
+        if (array && array.length > 0) {
+            var size = array.length;
+            if (size > 0) {
+                var pos = start === undefined || start < 0 ? 0 : start;
+                var end = count === undefined || pos + count > size - 1 ? size - 1 : pos + count;
+                var result = void 0;
+                if (arguments.length <= 2) {
+                    result = array[pos];
+                    pos++;
+                }
+                else {
+                    result = initial;
+                }
+                while (pos <= end) {
+                    result = f(result, array[pos], pos);
+                    pos++;
+                }
+                return result;
+            }
+        }
+        return initial;
+    }
+    ts.reduceLeft = reduceLeft;
+    var hasOwnProperty = Object.prototype.hasOwnProperty;
+    /**
+     * Indicates whether a map-like contains an own property with the specified key.
+     *
+     * @param map A map-like.
+     * @param key A property key.
+     */
+    function hasProperty(map, key) {
+        return hasOwnProperty.call(map, key);
+    }
+    ts.hasProperty = hasProperty;
+    /**
+     * Gets the value of an owned property in a map-like.
+     *
+     * @param map A map-like.
+     * @param key A property key.
+     */
+    function getProperty(map, key) {
+        return hasOwnProperty.call(map, key) ? map[key] : undefined;
+    }
+    ts.getProperty = getProperty;
+    /**
+     * Gets the owned, enumerable property keys of a map-like.
+     */
+    function getOwnKeys(map) {
+        var keys = [];
+        for (var key in map) {
+            if (hasOwnProperty.call(map, key)) {
+                keys.push(key);
+            }
+        }
+        return keys;
+    }
+    ts.getOwnKeys = getOwnKeys;
+    function getOwnValues(sparseArray) {
+        var values = [];
+        for (var key in sparseArray) {
+            if (hasOwnProperty.call(sparseArray, key)) {
+                values.push(sparseArray[key]);
+            }
+        }
+        return values;
+    }
+    ts.getOwnValues = getOwnValues;
+    function arrayFrom(iterator, map) {
+        var _a;
+        var result = [];
+        for (var _b = iterator.next(), value = _b.value, done = _b.done; !done; _a = iterator.next(), value = _a.value, done = _a.done, _a) {
+            result.push(map ? map(value) : value);
+        }
+        return result;
+    }
+    ts.arrayFrom = arrayFrom;
+    function assign(t) {
+        var args = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            args[_i - 1] = arguments[_i];
+        }
+        for (var _a = 0, args_1 = args; _a < args_1.length; _a++) {
+            var arg = args_1[_a];
+            for (var p in arg) {
+                if (hasProperty(arg, p)) {
+                    t[p] = arg[p]; // TODO: GH#23368
+                }
+            }
+        }
+        return t;
+    }
+    ts.assign = assign;
+    /**
+     * Performs a shallow equality comparison of the contents of two map-likes.
+     *
+     * @param left A map-like whose properties should be compared.
+     * @param right A map-like whose properties should be compared.
+     */
+    function equalOwnProperties(left, right, equalityComparer) {
+        if (equalityComparer === void 0) { equalityComparer = equateValues; }
+        if (left === right)
+            return true;
+        if (!left || !right)
+            return false;
+        for (var key in left) {
+            if (hasOwnProperty.call(left, key)) {
+                if (!hasOwnProperty.call(right, key))
+                    return false;
+                if (!equalityComparer(left[key], right[key]))
+                    return false;
+            }
+        }
+        for (var key in right) {
+            if (hasOwnProperty.call(right, key)) {
+                if (!hasOwnProperty.call(left, key))
+                    return false;
+            }
+        }
+        return true;
+    }
+    ts.equalOwnProperties = equalOwnProperties;
+    function arrayToMap(array, makeKey, makeValue) {
+        if (makeValue === void 0) { makeValue = identity; }
+        var result = createMap();
+        for (var _i = 0, array_6 = array; _i < array_6.length; _i++) {
+            var value = array_6[_i];
+            var key = makeKey(value);
+            if (key !== undefined)
+                result.set(key, makeValue(value));
+        }
+        return result;
+    }
+    ts.arrayToMap = arrayToMap;
+    function arrayToNumericMap(array, makeKey, makeValue) {
+        if (makeValue === void 0) { makeValue = identity; }
+        var result = [];
+        for (var _i = 0, array_7 = array; _i < array_7.length; _i++) {
+            var value = array_7[_i];
+            result[makeKey(value)] = makeValue(value);
+        }
+        return result;
+    }
+    ts.arrayToNumericMap = arrayToNumericMap;
+    function arrayToMultiMap(values, makeKey, makeValue) {
+        if (makeValue === void 0) { makeValue = identity; }
+        var result = createMultiMap();
+        for (var _i = 0, values_1 = values; _i < values_1.length; _i++) {
+            var value = values_1[_i];
+            result.add(makeKey(value), makeValue(value));
+        }
+        return result;
+    }
+    ts.arrayToMultiMap = arrayToMultiMap;
+    function group(values, getGroupId) {
+        return arrayFrom(arrayToMultiMap(values, getGroupId).values());
+    }
+    ts.group = group;
+    function clone(object) {
+        var result = {};
+        for (var id in object) {
+            if (hasOwnProperty.call(object, id)) {
+                result[id] = object[id];
+            }
+        }
+        return result;
+    }
+    ts.clone = clone;
+    function extend(first, second) {
+        var result = {};
+        for (var id in second) {
+            if (hasOwnProperty.call(second, id)) {
+                result[id] = second[id];
+            }
+        }
+        for (var id in first) {
+            if (hasOwnProperty.call(first, id)) {
+                result[id] = first[id];
+            }
+        }
+        return result;
+    }
+    ts.extend = extend;
+    function copyProperties(first, second) {
+        for (var id in second) {
+            if (hasOwnProperty.call(second, id)) {
+                first[id] = second[id];
+            }
+        }
+    }
+    ts.copyProperties = copyProperties;
+    function maybeBind(obj, fn) {
+        return fn ? fn.bind(obj) : undefined;
+    }
+    ts.maybeBind = maybeBind;
+    function createMultiMap() {
+        var map = createMap();
+        map.add = multiMapAdd;
+        map.remove = multiMapRemove;
+        return map;
+    }
+    ts.createMultiMap = createMultiMap;
+    function multiMapAdd(key, value) {
+        var values = this.get(key);
+        if (values) {
+            values.push(value);
+        }
+        else {
+            this.set(key, values = [value]);
+        }
+        return values;
+    }
+    function multiMapRemove(key, value) {
+        var values = this.get(key);
+        if (values) {
+            unorderedRemoveItem(values, value);
+            if (!values.length) {
+                this.delete(key);
+            }
+        }
+    }
+    /**
+     * Tests whether a value is an array.
+     */
+    function isArray(value) {
+        return Array.isArray ? Array.isArray(value) : value instanceof Array;
+    }
+    ts.isArray = isArray;
+    function toArray(value) {
+        return isArray(value) ? value : [value];
+    }
+    ts.toArray = toArray;
+    /**
+     * Tests whether a value is string
+     */
+    function isString(text) {
+        return typeof text === "string";
+    }
+    ts.isString = isString;
+    function isNumber(x) {
+        return typeof x === "number";
+    }
+    ts.isNumber = isNumber;
+    function tryCast(value, test) {
+        return value !== undefined && test(value) ? value : undefined;
+    }
+    ts.tryCast = tryCast;
+    function cast(value, test) {
+        if (value !== undefined && test(value))
+            return value;
+        return Debug.fail("Invalid cast. The supplied value " + value + " did not pass the test '" + Debug.getFunctionName(test) + "'.");
+    }
+    ts.cast = cast;
+    /** Does nothing. */
+    function noop(_) { } // tslint:disable-line no-empty
+    ts.noop = noop;
+    /** Do nothing and return false */
+    function returnFalse() { return false; }
+    ts.returnFalse = returnFalse;
+    /** Do nothing and return true */
+    function returnTrue() { return true; }
+    ts.returnTrue = returnTrue;
+    /** Returns its argument. */
+    function identity(x) { return x; }
+    ts.identity = identity;
+    /** Returns lower case string */
+    function toLowerCase(x) { return x.toLowerCase(); }
+    ts.toLowerCase = toLowerCase;
+    /** Throws an error because a function is not implemented. */
+    function notImplemented() {
+        throw new Error("Not implemented");
+    }
+    ts.notImplemented = notImplemented;
+    function memoize(callback) {
+        var value;
+        return function () {
+            if (callback) {
+                value = callback();
+                callback = undefined;
+            }
+            return value;
+        };
+    }
+    ts.memoize = memoize;
+    function chain(a, b, c, d, e) {
+        if (e) {
+            var args_2 = [];
+            for (var i = 0; i < arguments.length; i++) {
+                args_2[i] = arguments[i];
+            }
+            return function (t) { return compose.apply(void 0, map(args_2, function (f) { return f(t); })); };
+        }
+        else if (d) {
+            return function (t) { return compose(a(t), b(t), c(t), d(t)); };
+        }
+        else if (c) {
+            return function (t) { return compose(a(t), b(t), c(t)); };
+        }
+        else if (b) {
+            return function (t) { return compose(a(t), b(t)); };
+        }
+        else if (a) {
+            return function (t) { return compose(a(t)); };
+        }
+        else {
+            return function (_) { return function (u) { return u; }; };
+        }
+    }
+    ts.chain = chain;
+    function compose(a, b, c, d, e) {
+        if (e) {
+            var args_3 = [];
+            for (var i = 0; i < arguments.length; i++) {
+                args_3[i] = arguments[i];
+            }
+            return function (t) { return reduceLeft(args_3, function (u, f) { return f(u); }, t); };
+        }
+        else if (d) {
+            return function (t) { return d(c(b(a(t)))); };
+        }
+        else if (c) {
+            return function (t) { return c(b(a(t))); };
+        }
+        else if (b) {
+            return function (t) { return b(a(t)); };
+        }
+        else if (a) {
+            return function (t) { return a(t); };
+        }
+        else {
+            return function (t) { return t; };
+        }
+    }
+    ts.compose = compose;
+    var AssertionLevel;
+    (function (AssertionLevel) {
+        AssertionLevel[AssertionLevel["None"] = 0] = "None";
+        AssertionLevel[AssertionLevel["Normal"] = 1] = "Normal";
+        AssertionLevel[AssertionLevel["Aggressive"] = 2] = "Aggressive";
+        AssertionLevel[AssertionLevel["VeryAggressive"] = 3] = "VeryAggressive";
+    })(AssertionLevel = ts.AssertionLevel || (ts.AssertionLevel = {}));
+    var Debug;
+    (function (Debug) {
+        Debug.currentAssertionLevel = 0 /* None */;
+        Debug.isDebugging = false;
+        function shouldAssert(level) {
+            return Debug.currentAssertionLevel >= level;
+        }
+        Debug.shouldAssert = shouldAssert;
+        function assert(expression, message, verboseDebugInfo, stackCrawlMark) {
+            if (!expression) {
+                if (verboseDebugInfo) {
+                    message += "\r\nVerbose Debug Information: " + (typeof verboseDebugInfo === "string" ? verboseDebugInfo : verboseDebugInfo());
+                }
+                fail(message ? "False expression: " + message : "False expression.", stackCrawlMark || assert);
+            }
+        }
+        Debug.assert = assert;
+        function assertEqual(a, b, msg, msg2) {
+            if (a !== b) {
+                var message = msg ? msg2 ? msg + " " + msg2 : msg : "";
+                fail("Expected " + a + " === " + b + ". " + message);
+            }
+        }
+        Debug.assertEqual = assertEqual;
+        function assertLessThan(a, b, msg) {
+            if (a >= b) {
+                fail("Expected " + a + " < " + b + ". " + (msg || ""));
+            }
+        }
+        Debug.assertLessThan = assertLessThan;
+        function assertLessThanOrEqual(a, b) {
+            if (a > b) {
+                fail("Expected " + a + " <= " + b);
+            }
+        }
+        Debug.assertLessThanOrEqual = assertLessThanOrEqual;
+        function assertGreaterThanOrEqual(a, b) {
+            if (a < b) {
+                fail("Expected " + a + " >= " + b);
+            }
+        }
+        Debug.assertGreaterThanOrEqual = assertGreaterThanOrEqual;
+        function fail(message, stackCrawlMark) {
+            debugger;
+            var e = new Error(message ? "Debug Failure. " + message : "Debug Failure.");
+            if (Error.captureStackTrace) {
+                Error.captureStackTrace(e, stackCrawlMark || fail);
+            }
+            throw e;
+        }
+        Debug.fail = fail;
+        function assertDefined(value, message) {
+            if (value === undefined || value === null)
+                return fail(message);
+            return value;
+        }
+        Debug.assertDefined = assertDefined;
+        function assertEachDefined(value, message) {
+            for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
+                var v = value_1[_i];
+                assertDefined(v, message);
+            }
+            return value;
+        }
+        Debug.assertEachDefined = assertEachDefined;
+        function assertNever(member, message, stackCrawlMark) {
+            if (message === void 0) { message = "Illegal value:"; }
+            var detail = "kind" in member && "pos" in member ? "SyntaxKind: " + Debug.showSyntaxKind(member) : JSON.stringify(member);
+            return fail(message + " " + detail, stackCrawlMark || assertNever);
+        }
+        Debug.assertNever = assertNever;
+        function getFunctionName(func) {
+            if (typeof func !== "function") {
+                return "";
+            }
+            else if (func.hasOwnProperty("name")) {
+                return func.name;
+            }
+            else {
+                var text = Function.prototype.toString.call(func);
+                var match = /^function\s+([\w\$]+)\s*\(/.exec(text);
+                return match ? match[1] : "";
+            }
+        }
+        Debug.getFunctionName = getFunctionName;
+    })(Debug = ts.Debug || (ts.Debug = {}));
+    function equateValues(a, b) {
+        return a === b;
+    }
+    ts.equateValues = equateValues;
+    /**
+     * Compare the equality of two strings using a case-sensitive ordinal comparison.
+     *
+     * Case-sensitive comparisons compare both strings one code-point at a time using the integer
+     * value of each code-point after applying `toUpperCase` to each string. We always map both
+     * strings to their upper-case form as some unicode characters do not properly round-trip to
+     * lowercase (such as `ẞ` (German sharp capital s)).
+     */
+    function equateStringsCaseInsensitive(a, b) {
+        return a === b
+            || a !== undefined
+                && b !== undefined
+                && a.toUpperCase() === b.toUpperCase();
+    }
+    ts.equateStringsCaseInsensitive = equateStringsCaseInsensitive;
+    /**
+     * Compare the equality of two strings using a case-sensitive ordinal comparison.
+     *
+     * Case-sensitive comparisons compare both strings one code-point at a time using the
+     * integer value of each code-point.
+     */
+    function equateStringsCaseSensitive(a, b) {
+        return equateValues(a, b);
+    }
+    ts.equateStringsCaseSensitive = equateStringsCaseSensitive;
+    function compareComparableValues(a, b) {
+        return a === b ? 0 /* EqualTo */ :
+            a === undefined ? -1 /* LessThan */ :
+                b === undefined ? 1 /* GreaterThan */ :
+                    a < b ? -1 /* LessThan */ :
+                        1 /* GreaterThan */;
+    }
+    /**
+     * Compare two numeric values for their order relative to each other.
+     * To compare strings, use any of the `compareStrings` functions.
+     */
+    function compareValues(a, b) {
+        return compareComparableValues(a, b);
+    }
+    ts.compareValues = compareValues;
+    function min(a, b, compare) {
+        return compare(a, b) === -1 /* LessThan */ ? a : b;
+    }
+    ts.min = min;
+    /**
+     * Compare two strings using a case-insensitive ordinal comparison.
+     *
+     * Ordinal comparisons are based on the difference between the unicode code points of both
+     * strings. Characters with multiple unicode representations are considered unequal. Ordinal
+     * comparisons provide predictable ordering, but place "a" after "B".
+     *
+     * Case-insensitive comparisons compare both strings one code-point at a time using the integer
+     * value of each code-point after applying `toUpperCase` to each string. We always map both
+     * strings to their upper-case form as some unicode characters do not properly round-trip to
+     * lowercase (such as `ẞ` (German sharp capital s)).
+     */
+    function compareStringsCaseInsensitive(a, b) {
+        if (a === b)
+            return 0 /* EqualTo */;
+        if (a === undefined)
+            return -1 /* LessThan */;
+        if (b === undefined)
+            return 1 /* GreaterThan */;
+        a = a.toUpperCase();
+        b = b.toUpperCase();
+        return a < b ? -1 /* LessThan */ : a > b ? 1 /* GreaterThan */ : 0 /* EqualTo */;
+    }
+    ts.compareStringsCaseInsensitive = compareStringsCaseInsensitive;
+    /**
+     * Compare two strings using a case-sensitive ordinal comparison.
+     *
+     * Ordinal comparisons are based on the difference between the unicode code points of both
+     * strings. Characters with multiple unicode representations are considered unequal. Ordinal
+     * comparisons provide predictable ordering, but place "a" after "B".
+     *
+     * Case-sensitive comparisons compare both strings one code-point at a time using the integer
+     * value of each code-point.
+     */
+    function compareStringsCaseSensitive(a, b) {
+        return compareComparableValues(a, b);
+    }
+    ts.compareStringsCaseSensitive = compareStringsCaseSensitive;
+    function getStringComparer(ignoreCase) {
+        return ignoreCase ? compareStringsCaseInsensitive : compareStringsCaseSensitive;
+    }
+    ts.getStringComparer = getStringComparer;
+    /**
+     * Creates a string comparer for use with string collation in the UI.
+     */
+    var createUIStringComparer = (function () {
+        var defaultComparer;
+        var enUSComparer;
+        var stringComparerFactory = getStringComparerFactory();
+        return createStringComparer;
+        function compareWithCallback(a, b, comparer) {
+            if (a === b)
+                return 0 /* EqualTo */;
+            if (a === undefined)
+                return -1 /* LessThan */;
+            if (b === undefined)
+                return 1 /* GreaterThan */;
+            var value = comparer(a, b);
+            return value < 0 ? -1 /* LessThan */ : value > 0 ? 1 /* GreaterThan */ : 0 /* EqualTo */;
+        }
+        function createIntlCollatorStringComparer(locale) {
+            // Intl.Collator.prototype.compare is bound to the collator. See NOTE in
+            // http://www.ecma-international.org/ecma-402/2.0/#sec-Intl.Collator.prototype.compare
+            var comparer = new Intl.Collator(locale, { usage: "sort", sensitivity: "variant" }).compare;
+            return function (a, b) { return compareWithCallback(a, b, comparer); };
+        }
+        function createLocaleCompareStringComparer(locale) {
+            // if the locale is not the default locale (`undefined`), use the fallback comparer.
+            if (locale !== undefined)
+                return createFallbackStringComparer();
+            return function (a, b) { return compareWithCallback(a, b, compareStrings); };
+            function compareStrings(a, b) {
+                return a.localeCompare(b);
+            }
+        }
+        function createFallbackStringComparer() {
+            // An ordinal comparison puts "A" after "b", but for the UI we want "A" before "b".
+            // We first sort case insensitively.  So "Aaa" will come before "baa".
+            // Then we sort case sensitively, so "aaa" will come before "Aaa".
+            //
+            // For case insensitive comparisons we always map both strings to their
+            // upper-case form as some unicode characters do not properly round-trip to
+            // lowercase (such as `ẞ` (German sharp capital s)).
+            return function (a, b) { return compareWithCallback(a, b, compareDictionaryOrder); };
+            function compareDictionaryOrder(a, b) {
+                return compareStrings(a.toUpperCase(), b.toUpperCase()) || compareStrings(a, b);
+            }
+            function compareStrings(a, b) {
+                return a < b ? -1 /* LessThan */ : a > b ? 1 /* GreaterThan */ : 0 /* EqualTo */;
+            }
+        }
+        function getStringComparerFactory() {
+            // If the host supports Intl, we use it for comparisons using the default locale.
+            if (typeof Intl === "object" && typeof Intl.Collator === "function") {
+                return createIntlCollatorStringComparer;
+            }
+            // If the host does not support Intl, we fall back to localeCompare.
+            // localeCompare in Node v0.10 is just an ordinal comparison, so don't use it.
+            if (typeof String.prototype.localeCompare === "function" &&
+                typeof String.prototype.toLocaleUpperCase === "function" &&
+                "a".localeCompare("B") < 0) {
+                return createLocaleCompareStringComparer;
+            }
+            // Otherwise, fall back to ordinal comparison:
+            return createFallbackStringComparer;
+        }
+        function createStringComparer(locale) {
+            // Hold onto common string comparers. This avoids constantly reallocating comparers during
+            // tests.
+            if (locale === undefined) {
+                return defaultComparer || (defaultComparer = stringComparerFactory(locale));
+            }
+            else if (locale === "en-US") {
+                return enUSComparer || (enUSComparer = stringComparerFactory(locale));
+            }
+            else {
+                return stringComparerFactory(locale);
+            }
+        }
+    })();
+    var uiComparerCaseSensitive;
+    var uiLocale;
+    function getUILocale() {
+        return uiLocale;
+    }
+    ts.getUILocale = getUILocale;
+    function setUILocale(value) {
+        if (uiLocale !== value) {
+            uiLocale = value;
+            uiComparerCaseSensitive = undefined;
+        }
+    }
+    ts.setUILocale = setUILocale;
+    /**
+     * Compare two strings in a using the case-sensitive sort behavior of the UI locale.
+     *
+     * Ordering is not predictable between different host locales, but is best for displaying
+     * ordered data for UI presentation. Characters with multiple unicode representations may
+     * be considered equal.
+     *
+     * Case-sensitive comparisons compare strings that differ in base characters, or
+     * accents/diacritic marks, or case as unequal.
+     */
+    function compareStringsCaseSensitiveUI(a, b) {
+        var comparer = uiComparerCaseSensitive || (uiComparerCaseSensitive = createUIStringComparer(uiLocale));
+        return comparer(a, b);
+    }
+    ts.compareStringsCaseSensitiveUI = compareStringsCaseSensitiveUI;
+    function compareProperties(a, b, key, comparer) {
+        return a === b ? 0 /* EqualTo */ :
+            a === undefined ? -1 /* LessThan */ :
+                b === undefined ? 1 /* GreaterThan */ :
+                    comparer(a[key], b[key]);
+    }
+    ts.compareProperties = compareProperties;
+    /** True is greater than false. */
+    function compareBooleans(a, b) {
+        return compareValues(a ? 1 : 0, b ? 1 : 0);
+    }
+    ts.compareBooleans = compareBooleans;
+    /**
+     * Given a name and a list of names that are *not* equal to the name, return a spelling suggestion if there is one that is close enough.
+     * Names less than length 3 only check for case-insensitive equality, not Levenshtein distance.
+     *
+     * If there is a candidate that's the same except for case, return that.
+     * If there is a candidate that's within one edit of the name, return that.
+     * Otherwise, return the candidate with the smallest Levenshtein distance,
+     *    except for candidates:
+     *      * With no name
+     *      * Whose length differs from the target name by more than 0.34 of the length of the name.
+     *      * Whose levenshtein distance is more than 0.4 of the length of the name
+     *        (0.4 allows 1 substitution/transposition for every 5 characters,
+     *         and 1 insertion/deletion at 3 characters)
+     */
+    function getSpellingSuggestion(name, candidates, getName) {
+        var maximumLengthDifference = Math.min(2, Math.floor(name.length * 0.34));
+        var bestDistance = Math.floor(name.length * 0.4) + 1; // If the best result isn't better than this, don't bother.
+        var bestCandidate;
+        var justCheckExactMatches = false;
+        var nameLowerCase = name.toLowerCase();
+        for (var _i = 0, candidates_1 = candidates; _i < candidates_1.length; _i++) {
+            var candidate = candidates_1[_i];
+            var candidateName = getName(candidate);
+            if (candidateName !== undefined && Math.abs(candidateName.length - nameLowerCase.length) <= maximumLengthDifference) {
+                var candidateNameLowerCase = candidateName.toLowerCase();
+                if (candidateNameLowerCase === nameLowerCase) {
+                    if (candidateName === name) {
+                        continue;
+                    }
+                    return candidate;
+                }
+                if (justCheckExactMatches) {
+                    continue;
+                }
+                if (candidateName.length < 3) {
+                    // Don't bother, user would have noticed a 2-character name having an extra character
+                    continue;
+                }
+                // Only care about a result better than the best so far.
+                var distance = levenshteinWithMax(nameLowerCase, candidateNameLowerCase, bestDistance - 1);
+                if (distance === undefined) {
+                    continue;
+                }
+                if (distance < 3) {
+                    justCheckExactMatches = true;
+                    bestCandidate = candidate;
+                }
+                else {
+                    Debug.assert(distance < bestDistance); // Else `levenshteinWithMax` should return undefined
+                    bestDistance = distance;
+                    bestCandidate = candidate;
+                }
+            }
+        }
+        return bestCandidate;
+    }
+    ts.getSpellingSuggestion = getSpellingSuggestion;
+    function levenshteinWithMax(s1, s2, max) {
+        var previous = new Array(s2.length + 1);
+        var current = new Array(s2.length + 1);
+        /** Represents any value > max. We don't care about the particular value. */
+        var big = max + 1;
+        for (var i = 0; i <= s2.length; i++) {
+            previous[i] = i;
+        }
+        for (var i = 1; i <= s1.length; i++) {
+            var c1 = s1.charCodeAt(i - 1);
+            var minJ = i > max ? i - max : 1;
+            var maxJ = s2.length > max + i ? max + i : s2.length;
+            current[0] = i;
+            /** Smallest value of the matrix in the ith column. */
+            var colMin = i;
+            for (var j = 1; j < minJ; j++) {
+                current[j] = big;
+            }
+            for (var j = minJ; j <= maxJ; j++) {
+                var dist = c1 === s2.charCodeAt(j - 1)
+                    ? previous[j - 1]
+                    : Math.min(/*delete*/ previous[j] + 1, /*insert*/ current[j - 1] + 1, /*substitute*/ previous[j - 1] + 2);
+                current[j] = dist;
+                colMin = Math.min(colMin, dist);
+            }
+            for (var j = maxJ + 1; j <= s2.length; j++) {
+                current[j] = big;
+            }
+            if (colMin > max) {
+                // Give up -- everything in this column is > max and it can't get better in future columns.
+                return undefined;
+            }
+            var temp = previous;
+            previous = current;
+            current = temp;
+        }
+        var res = previous[s2.length];
+        return res > max ? undefined : res;
+    }
+    function endsWith(str, suffix) {
+        var expectedPos = str.length - suffix.length;
+        return expectedPos >= 0 && str.indexOf(suffix, expectedPos) === expectedPos;
+    }
+    ts.endsWith = endsWith;
+    function removeSuffix(str, suffix) {
+        return endsWith(str, suffix) ? str.slice(0, str.length - suffix.length) : str;
+    }
+    ts.removeSuffix = removeSuffix;
+    function tryRemoveSuffix(str, suffix) {
+        return endsWith(str, suffix) ? str.slice(0, str.length - suffix.length) : undefined;
+    }
+    ts.tryRemoveSuffix = tryRemoveSuffix;
+    function stringContains(str, substring) {
+        return str.indexOf(substring) !== -1;
+    }
+    ts.stringContains = stringContains;
+    function fileExtensionIs(path, extension) {
+        return path.length > extension.length && endsWith(path, extension);
+    }
+    ts.fileExtensionIs = fileExtensionIs;
+    function fileExtensionIsOneOf(path, extensions) {
+        for (var _i = 0, extensions_1 = extensions; _i < extensions_1.length; _i++) {
+            var extension = extensions_1[_i];
+            if (fileExtensionIs(path, extension)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    ts.fileExtensionIsOneOf = fileExtensionIsOneOf;
+    /**
+     * Takes a string like "jquery-min.4.2.3" and returns "jquery"
+     */
+    function removeMinAndVersionNumbers(fileName) {
+        // Match a "." or "-" followed by a version number or 'min' at the end of the name
+        var trailingMinOrVersion = /[.-]((min)|(\d+(\.\d+)*))$/;
+        // The "min" or version may both be present, in either order, so try applying the above twice.
+        return fileName.replace(trailingMinOrVersion, "").replace(trailingMinOrVersion, "");
+    }
+    ts.removeMinAndVersionNumbers = removeMinAndVersionNumbers;
+    /** Remove an item from an array, moving everything to its right one space left. */
+    function orderedRemoveItem(array, item) {
+        for (var i = 0; i < array.length; i++) {
+            if (array[i] === item) {
+                orderedRemoveItemAt(array, i);
+                return true;
+            }
+        }
+        return false;
+    }
+    ts.orderedRemoveItem = orderedRemoveItem;
+    /** Remove an item by index from an array, moving everything to its right one space left. */
+    function orderedRemoveItemAt(array, index) {
+        // This seems to be faster than either `array.splice(i, 1)` or `array.copyWithin(i, i+ 1)`.
+        for (var i = index; i < array.length - 1; i++) {
+            array[i] = array[i + 1];
+        }
+        array.pop();
+    }
+    ts.orderedRemoveItemAt = orderedRemoveItemAt;
+    function unorderedRemoveItemAt(array, index) {
+        // Fill in the "hole" left at `index`.
+        array[index] = array[array.length - 1];
+        array.pop();
+    }
+    ts.unorderedRemoveItemAt = unorderedRemoveItemAt;
+    /** Remove the *first* occurrence of `item` from the array. */
+    function unorderedRemoveItem(array, item) {
+        return unorderedRemoveFirstItemWhere(array, function (element) { return element === item; });
+    }
+    ts.unorderedRemoveItem = unorderedRemoveItem;
+    /** Remove the *first* element satisfying `predicate`. */
+    function unorderedRemoveFirstItemWhere(array, predicate) {
+        for (var i = 0; i < array.length; i++) {
+            if (predicate(array[i])) {
+                unorderedRemoveItemAt(array, i);
+                return true;
+            }
+        }
+        return false;
+    }
+    function createGetCanonicalFileName(useCaseSensitiveFileNames) {
+        return useCaseSensitiveFileNames ? identity : toLowerCase;
+    }
+    ts.createGetCanonicalFileName = createGetCanonicalFileName;
+    function patternText(_a) {
+        var prefix = _a.prefix, suffix = _a.suffix;
+        return prefix + "*" + suffix;
+    }
+    ts.patternText = patternText;
+    /**
+     * Given that candidate matches pattern, returns the text matching the '*'.
+     * E.g.: matchedText(tryParsePattern("foo*baz"), "foobarbaz") === "bar"
+     */
+    function matchedText(pattern, candidate) {
+        Debug.assert(isPatternMatch(pattern, candidate));
+        return candidate.substring(pattern.prefix.length, candidate.length - pattern.suffix.length);
+    }
+    ts.matchedText = matchedText;
+    /** Return the object corresponding to the best pattern to match `candidate`. */
+    function findBestPatternMatch(values, getPattern, candidate) {
+        var matchedValue;
+        // use length of prefix as betterness criteria
+        var longestMatchPrefixLength = -1;
+        for (var _i = 0, values_2 = values; _i < values_2.length; _i++) {
+            var v = values_2[_i];
+            var pattern = getPattern(v);
+            if (isPatternMatch(pattern, candidate) && pattern.prefix.length > longestMatchPrefixLength) {
+                longestMatchPrefixLength = pattern.prefix.length;
+                matchedValue = v;
+            }
+        }
+        return matchedValue;
+    }
+    ts.findBestPatternMatch = findBestPatternMatch;
+    function startsWith(str, prefix) {
+        return str.lastIndexOf(prefix, 0) === 0;
+    }
+    ts.startsWith = startsWith;
+    function removePrefix(str, prefix) {
+        return startsWith(str, prefix) ? str.substr(prefix.length) : str;
+    }
+    ts.removePrefix = removePrefix;
+    function tryRemovePrefix(str, prefix, getCanonicalFileName) {
+        if (getCanonicalFileName === void 0) { getCanonicalFileName = identity; }
+        return startsWith(getCanonicalFileName(str), getCanonicalFileName(prefix)) ? str.substring(prefix.length) : undefined;
+    }
+    ts.tryRemovePrefix = tryRemovePrefix;
+    function isPatternMatch(_a, candidate) {
+        var prefix = _a.prefix, suffix = _a.suffix;
+        return candidate.length >= prefix.length + suffix.length &&
+            startsWith(candidate, prefix) &&
+            endsWith(candidate, suffix);
+    }
+    function and(f, g) {
+        return function (arg) { return f(arg) && g(arg); };
+    }
+    ts.and = and;
+    function or(f, g) {
+        return function (arg) { return f(arg) || g(arg); };
+    }
+    ts.or = or;
+    function assertType(_) { } // tslint:disable-line no-empty
+    ts.assertType = assertType;
+    function singleElementArray(t) {
+        return t === undefined ? undefined : [t];
+    }
+    ts.singleElementArray = singleElementArray;
+    function enumerateInsertsAndDeletes(newItems, oldItems, comparer, inserted, deleted, unchanged) {
+        unchanged = unchanged || noop;
+        var newIndex = 0;
+        var oldIndex = 0;
+        var newLen = newItems.length;
+        var oldLen = oldItems.length;
+        while (newIndex < newLen && oldIndex < oldLen) {
+            var newItem = newItems[newIndex];
+            var oldItem = oldItems[oldIndex];
+            var compareResult = comparer(newItem, oldItem);
+            if (compareResult === -1 /* LessThan */) {
+                inserted(newItem);
+                newIndex++;
+            }
+            else if (compareResult === 1 /* GreaterThan */) {
+                deleted(oldItem);
+                oldIndex++;
+            }
+            else {
+                unchanged(oldItem, newItem);
+                newIndex++;
+                oldIndex++;
+            }
+        }
+        while (newIndex < newLen) {
+            inserted(newItems[newIndex++]);
+        }
+        while (oldIndex < oldLen) {
+            deleted(oldItems[oldIndex++]);
+        }
+    }
+    ts.enumerateInsertsAndDeletes = enumerateInsertsAndDeletes;
+    function fill(length, cb) {
+        var result = Array(length);
+        for (var i = 0; i < length; i++) {
+            result[i] = cb(i);
+        }
+        return result;
+    }
+    ts.fill = fill;
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
+(function (ts) {
+    /** Gets a timestamp with (at least) ms resolution */
+    ts.timestamp = typeof performance !== "undefined" && performance.now ? function () { return performance.now(); } : Date.now ? Date.now : function () { return +(new Date()); };
+})(ts || (ts = {}));
+/*@internal*/
+/** Performance measurements for the compiler. */
+(function (ts) {
+    var performance;
+    (function (performance) {
+        // NOTE: cannot use ts.noop as core.ts loads after this
+        var profilerEvent = typeof onProfilerEvent === "function" && onProfilerEvent.profiler === true ? onProfilerEvent : function () { };
+        var enabled = false;
+        var profilerStart = 0;
+        var counts;
+        var marks;
+        var measures;
+        function createTimerIf(condition, measureName, startMarkName, endMarkName) {
+            return condition ? createTimer(measureName, startMarkName, endMarkName) : performance.nullTimer;
+        }
+        performance.createTimerIf = createTimerIf;
+        function createTimer(measureName, startMarkName, endMarkName) {
+            var enterCount = 0;
+            return {
+                enter: enter,
+                exit: exit
+            };
+            function enter() {
+                if (++enterCount === 1) {
+                    mark(startMarkName);
+                }
+            }
+            function exit() {
+                if (--enterCount === 0) {
+                    mark(endMarkName);
+                    measure(measureName, startMarkName, endMarkName);
+                }
+                else if (enterCount < 0) {
+                    ts.Debug.fail("enter/exit count does not match.");
+                }
+            }
+        }
+        performance.createTimer = createTimer;
+        performance.nullTimer = { enter: ts.noop, exit: ts.noop };
+        /**
+         * Marks a performance event.
+         *
+         * @param markName The name of the mark.
+         */
+        function mark(markName) {
+            if (enabled) {
+                marks.set(markName, ts.timestamp());
+                counts.set(markName, (counts.get(markName) || 0) + 1);
+                profilerEvent(markName);
+            }
+        }
+        performance.mark = mark;
+        /**
+         * Adds a performance measurement with the specified name.
+         *
+         * @param measureName The name of the performance measurement.
+         * @param startMarkName The name of the starting mark. If not supplied, the point at which the
+         *      profiler was enabled is used.
+         * @param endMarkName The name of the ending mark. If not supplied, the current timestamp is
+         *      used.
+         */
+        function measure(measureName, startMarkName, endMarkName) {
+            if (enabled) {
+                var end = endMarkName && marks.get(endMarkName) || ts.timestamp();
+                var start = startMarkName && marks.get(startMarkName) || profilerStart;
+                measures.set(measureName, (measures.get(measureName) || 0) + (end - start));
+            }
+        }
+        performance.measure = measure;
+        /**
+         * Gets the number of times a marker was encountered.
+         *
+         * @param markName The name of the mark.
+         */
+        function getCount(markName) {
+            return counts && counts.get(markName) || 0;
+        }
+        performance.getCount = getCount;
+        /**
+         * Gets the total duration of all measurements with the supplied name.
+         *
+         * @param measureName The name of the measure whose durations should be accumulated.
+         */
+        function getDuration(measureName) {
+            return measures && measures.get(measureName) || 0;
+        }
+        performance.getDuration = getDuration;
+        /**
+         * Iterate over each measure, performing some action
+         *
+         * @param cb The action to perform for each measure
+         */
+        function forEachMeasure(cb) {
+            measures.forEach(function (measure, key) {
+                cb(key, measure);
+            });
+        }
+        performance.forEachMeasure = forEachMeasure;
+        /** Enables (and resets) performance measurements for the compiler. */
+        function enable() {
+            counts = ts.createMap();
+            marks = ts.createMap();
+            measures = ts.createMap();
+            enabled = true;
+            profilerStart = ts.timestamp();
+        }
+        performance.enable = enable;
+        /** Disables performance measurements for the compiler. */
+        function disable() {
+            enabled = false;
+        }
+        performance.disable = disable;
+    })(performance = ts.performance || (ts.performance = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    // https://semver.org/#spec-item-2
+    // > A normal version number MUST take the form X.Y.Z where X, Y, and Z are non-negative
+    // > integers, and MUST NOT contain leading zeroes. X is the major version, Y is the minor
+    // > version, and Z is the patch version. Each element MUST increase numerically.
+    //
+    // NOTE: We differ here in that we allow X and X.Y, with missing parts having the default
+    // value of `0`.
+    var versionRegExp = /^(0|[1-9]\d*)(?:\.(0|[1-9]\d*)(?:\.(0|[1-9]\d*)(?:\-([a-z0-9-.]+))?(?:\+([a-z0-9-.]+))?)?)?$/i;
+    // https://semver.org/#spec-item-9
+    // > A pre-release version MAY be denoted by appending a hyphen and a series of dot separated
+    // > identifiers immediately following the patch version. Identifiers MUST comprise only ASCII
+    // > alphanumerics and hyphen [0-9A-Za-z-]. Identifiers MUST NOT be empty. Numeric identifiers
+    // > MUST NOT include leading zeroes.
+    var prereleaseRegExp = /^(?:0|[1-9]\d*|[a-z-][a-z0-9-]*)(?:\.(?:0|[1-9]\d*|[a-z-][a-z0-9-]*))*$/i;
+    // https://semver.org/#spec-item-10
+    // > Build metadata MAY be denoted by appending a plus sign and a series of dot separated
+    // > identifiers immediately following the patch or pre-release version. Identifiers MUST
+    // > comprise only ASCII alphanumerics and hyphen [0-9A-Za-z-]. Identifiers MUST NOT be empty.
+    var buildRegExp = /^[a-z0-9-]+(?:\.[a-z0-9-]+)*$/i;
+    // https://semver.org/#spec-item-9
+    // > Numeric identifiers MUST NOT include leading zeroes.
+    var numericIdentifierRegExp = /^(0|[1-9]\d*)$/;
+    /**
+     * Describes a precise semantic version number, https://semver.org
+     */
+    var Version = /** @class */ (function () {
+        function Version(major, minor, patch, prerelease, build) {
+            if (minor === void 0) { minor = 0; }
+            if (patch === void 0) { patch = 0; }
+            if (prerelease === void 0) { prerelease = ""; }
+            if (build === void 0) { build = ""; }
+            if (typeof major === "string") {
+                var result = ts.Debug.assertDefined(tryParseComponents(major), "Invalid version");
+                (major = result.major, minor = result.minor, patch = result.patch, prerelease = result.prerelease, build = result.build);
+            }
+            ts.Debug.assert(major >= 0, "Invalid argument: major");
+            ts.Debug.assert(minor >= 0, "Invalid argument: minor");
+            ts.Debug.assert(patch >= 0, "Invalid argument: patch");
+            ts.Debug.assert(!prerelease || prereleaseRegExp.test(prerelease), "Invalid argument: prerelease");
+            ts.Debug.assert(!build || buildRegExp.test(build), "Invalid argument: build");
+            this.major = major;
+            this.minor = minor;
+            this.patch = patch;
+            this.prerelease = prerelease ? prerelease.split(".") : ts.emptyArray;
+            this.build = build ? build.split(".") : ts.emptyArray;
+        }
+        Version.tryParse = function (text) {
+            var result = tryParseComponents(text);
+            if (!result)
+                return undefined;
+            var major = result.major, minor = result.minor, patch = result.patch, prerelease = result.prerelease, build = result.build;
+            return new Version(major, minor, patch, prerelease, build);
+        };
+        Version.prototype.compareTo = function (other) {
+            // https://semver.org/#spec-item-11
+            // > Precedence is determined by the first difference when comparing each of these
+            // > identifiers from left to right as follows: Major, minor, and patch versions are
+            // > always compared numerically.
+            //
+            // https://semver.org/#spec-item-11
+            // > Precedence for two pre-release versions with the same major, minor, and patch version
+            // > MUST be determined by comparing each dot separated identifier from left to right until
+            // > a difference is found [...]
+            //
+            // https://semver.org/#spec-item-11
+            // > Build metadata does not figure into precedence
+            if (this === other)
+                return 0 /* EqualTo */;
+            if (other === undefined)
+                return 1 /* GreaterThan */;
+            return ts.compareValues(this.major, other.major)
+                || ts.compareValues(this.minor, other.minor)
+                || ts.compareValues(this.patch, other.patch)
+                || comparePrerelaseIdentifiers(this.prerelease, other.prerelease);
+        };
+        Version.prototype.increment = function (field) {
+            switch (field) {
+                case "major": return new Version(this.major + 1, 0, 0);
+                case "minor": return new Version(this.major, this.minor + 1, 0);
+                case "patch": return new Version(this.major, this.minor, this.patch + 1);
+                default: return ts.Debug.assertNever(field);
+            }
+        };
+        Version.prototype.toString = function () {
+            var result = this.major + "." + this.minor + "." + this.patch;
+            if (ts.some(this.prerelease))
+                result += "-" + this.prerelease.join(".");
+            if (ts.some(this.build))
+                result += "+" + this.build.join(".");
+            return result;
+        };
+        Version.zero = new Version(0, 0, 0);
+        return Version;
+    }());
+    ts.Version = Version;
+    function tryParseComponents(text) {
+        var match = versionRegExp.exec(text);
+        if (!match)
+            return undefined;
+        var major = match[1], _a = match[2], minor = _a === void 0 ? "0" : _a, _b = match[3], patch = _b === void 0 ? "0" : _b, _c = match[4], prerelease = _c === void 0 ? "" : _c, _d = match[5], build = _d === void 0 ? "" : _d;
+        if (prerelease && !prereleaseRegExp.test(prerelease))
+            return undefined;
+        if (build && !buildRegExp.test(build))
+            return undefined;
+        return {
+            major: parseInt(major, 10),
+            minor: parseInt(minor, 10),
+            patch: parseInt(patch, 10),
+            prerelease: prerelease,
+            build: build
+        };
+    }
+    function comparePrerelaseIdentifiers(left, right) {
+        // https://semver.org/#spec-item-11
+        // > When major, minor, and patch are equal, a pre-release version has lower precedence
+        // > than a normal version.
+        if (left === right)
+            return 0 /* EqualTo */;
+        if (left.length === 0)
+            return right.length === 0 ? 0 /* EqualTo */ : 1 /* GreaterThan */;
+        if (right.length === 0)
+            return -1 /* LessThan */;
+        // https://semver.org/#spec-item-11
+        // > Precedence for two pre-release versions with the same major, minor, and patch version
+        // > MUST be determined by comparing each dot separated identifier from left to right until
+        // > a difference is found [...]
+        var length = Math.min(left.length, right.length);
+        for (var i = 0; i < length; i++) {
+            var leftIdentifier = left[i];
+            var rightIdentifier = right[i];
+            if (leftIdentifier === rightIdentifier)
+                continue;
+            var leftIsNumeric = numericIdentifierRegExp.test(leftIdentifier);
+            var rightIsNumeric = numericIdentifierRegExp.test(rightIdentifier);
+            if (leftIsNumeric || rightIsNumeric) {
+                // https://semver.org/#spec-item-11
+                // > Numeric identifiers always have lower precedence than non-numeric identifiers.
+                if (leftIsNumeric !== rightIsNumeric)
+                    return leftIsNumeric ? -1 /* LessThan */ : 1 /* GreaterThan */;
+                // https://semver.org/#spec-item-11
+                // > identifiers consisting of only digits are compared numerically
+                var result = ts.compareValues(+leftIdentifier, +rightIdentifier);
+                if (result)
+                    return result;
+            }
+            else {
+                // https://semver.org/#spec-item-11
+                // > identifiers with letters or hyphens are compared lexically in ASCII sort order.
+                var result = ts.compareStringsCaseSensitive(leftIdentifier, rightIdentifier);
+                if (result)
+                    return result;
+            }
+        }
+        // https://semver.org/#spec-item-11
+        // > A larger set of pre-release fields has a higher precedence than a smaller set, if all
+        // > of the preceding identifiers are equal.
+        return ts.compareValues(left.length, right.length);
+    }
+    /**
+     * Describes a semantic version range, per https://github.com/npm/node-semver#ranges
+     */
+    var VersionRange = /** @class */ (function () {
+        function VersionRange(spec) {
+            this._alternatives = spec ? ts.Debug.assertDefined(parseRange(spec), "Invalid range spec.") : ts.emptyArray;
+        }
+        VersionRange.tryParse = function (text) {
+            var sets = parseRange(text);
+            if (sets) {
+                var range = new VersionRange("");
+                range._alternatives = sets;
+                return range;
+            }
+            return undefined;
+        };
+        VersionRange.prototype.test = function (version) {
+            if (typeof version === "string")
+                version = new Version(version);
+            return testDisjunction(version, this._alternatives);
+        };
+        VersionRange.prototype.toString = function () {
+            return formatDisjunction(this._alternatives);
+        };
+        return VersionRange;
+    }());
+    ts.VersionRange = VersionRange;
+    // https://github.com/npm/node-semver#range-grammar
+    //
+    // range-set    ::= range ( logical-or range ) *
+    // range        ::= hyphen | simple ( ' ' simple ) * | ''
+    // logical-or   ::= ( ' ' ) * '||' ( ' ' ) *
+    var logicalOrRegExp = /\s*\|\|\s*/g;
+    var whitespaceRegExp = /\s+/g;
+    // https://github.com/npm/node-semver#range-grammar
+    //
+    // partial      ::= xr ( '.' xr ( '.' xr qualifier ? )? )?
+    // xr           ::= 'x' | 'X' | '*' | nr
+    // nr           ::= '0' | ['1'-'9'] ( ['0'-'9'] ) *
+    // qualifier    ::= ( '-' pre )? ( '+' build )?
+    // pre          ::= parts
+    // build        ::= parts
+    // parts        ::= part ( '.' part ) *
+    // part         ::= nr | [-0-9A-Za-z]+
+    var partialRegExp = /^([xX*0]|[1-9]\d*)(?:\.([xX*0]|[1-9]\d*)(?:\.([xX*0]|[1-9]\d*)(?:-([a-z0-9-.]+))?(?:\+([a-z0-9-.]+))?)?)?$/i;
+    // https://github.com/npm/node-semver#range-grammar
+    //
+    // hyphen       ::= partial ' - ' partial
+    var hyphenRegExp = /^\s*([a-z0-9-+.*]+)\s+-\s+([a-z0-9-+.*]+)\s*$/i;
+    // https://github.com/npm/node-semver#range-grammar
+    //
+    // simple       ::= primitive | partial | tilde | caret
+    // primitive    ::= ( '<' | '>' | '>=' | '<=' | '=' ) partial
+    // tilde        ::= '~' partial
+    // caret        ::= '^' partial
+    var rangeRegExp = /^\s*(~|\^|<|<=|>|>=|=)?\s*([a-z0-9-+.*]+)$/i;
+    function parseRange(text) {
+        var alternatives = [];
+        for (var _i = 0, _a = text.trim().split(logicalOrRegExp); _i < _a.length; _i++) {
+            var range = _a[_i];
+            if (!range)
+                continue;
+            var comparators = [];
+            var match = hyphenRegExp.exec(range);
+            if (match) {
+                if (!parseHyphen(match[1], match[2], comparators))
+                    return undefined;
+            }
+            else {
+                for (var _b = 0, _c = range.split(whitespaceRegExp); _b < _c.length; _b++) {
+                    var simple = _c[_b];
+                    var match_1 = rangeRegExp.exec(simple);
+                    if (!match_1 || !parseComparator(match_1[1], match_1[2], comparators))
+                        return undefined;
+                }
+            }
+            alternatives.push(comparators);
+        }
+        return alternatives;
+    }
+    function parsePartial(text) {
+        var match = partialRegExp.exec(text);
+        if (!match)
+            return undefined;
+        var major = match[1], _a = match[2], minor = _a === void 0 ? "*" : _a, _b = match[3], patch = _b === void 0 ? "*" : _b, prerelease = match[4], build = match[5];
+        var version = new Version(isWildcard(major) ? 0 : parseInt(major, 10), isWildcard(major) || isWildcard(minor) ? 0 : parseInt(minor, 10), isWildcard(major) || isWildcard(minor) || isWildcard(patch) ? 0 : parseInt(patch, 10), prerelease, build);
+        return { version: version, major: major, minor: minor, patch: patch };
+    }
+    function parseHyphen(left, right, comparators) {
+        var leftResult = parsePartial(left);
+        if (!leftResult)
+            return false;
+        var rightResult = parsePartial(right);
+        if (!rightResult)
+            return false;
+        if (!isWildcard(leftResult.major)) {
+            comparators.push(createComparator(">=", leftResult.version));
+        }
+        if (!isWildcard(rightResult.major)) {
+            comparators.push(isWildcard(rightResult.minor) ? createComparator("<", rightResult.version.increment("major")) :
+                isWildcard(rightResult.patch) ? createComparator("<", rightResult.version.increment("minor")) :
+                    createComparator("<=", rightResult.version));
+        }
+        return true;
+    }
+    function parseComparator(operator, text, comparators) {
+        var result = parsePartial(text);
+        if (!result)
+            return false;
+        var version = result.version, major = result.major, minor = result.minor, patch = result.patch;
+        if (!isWildcard(major)) {
+            switch (operator) {
+                case "~":
+                    comparators.push(createComparator(">=", version));
+                    comparators.push(createComparator("<", version.increment(isWildcard(minor) ? "major" :
+                        "minor")));
+                    break;
+                case "^":
+                    comparators.push(createComparator(">=", version));
+                    comparators.push(createComparator("<", version.increment(version.major > 0 || isWildcard(minor) ? "major" :
+                        version.minor > 0 || isWildcard(patch) ? "minor" :
+                            "patch")));
+                    break;
+                case "<":
+                case ">=":
+                    comparators.push(createComparator(operator, version));
+                    break;
+                case "<=":
+                case ">":
+                    comparators.push(isWildcard(minor) ? createComparator(operator === "<=" ? "<" : ">=", version.increment("major")) :
+                        isWildcard(patch) ? createComparator(operator === "<=" ? "<" : ">=", version.increment("minor")) :
+                            createComparator(operator, version));
+                    break;
+                case "=":
+                case undefined:
+                    if (isWildcard(minor) || isWildcard(patch)) {
+                        comparators.push(createComparator(">=", version));
+                        comparators.push(createComparator("<", version.increment(isWildcard(minor) ? "major" : "minor")));
+                    }
+                    else {
+                        comparators.push(createComparator("=", version));
+                    }
+                    break;
+                default:
+                    // unrecognized
+                    return false;
+            }
+        }
+        else if (operator === "<" || operator === ">") {
+            comparators.push(createComparator("<", Version.zero));
+        }
+        return true;
+    }
+    function isWildcard(part) {
+        return part === "*" || part === "x" || part === "X";
+    }
+    function createComparator(operator, operand) {
+        return { operator: operator, operand: operand };
+    }
+    function testDisjunction(version, alternatives) {
+        // an empty disjunction is treated as "*" (all versions)
+        if (alternatives.length === 0)
+            return true;
+        for (var _i = 0, alternatives_1 = alternatives; _i < alternatives_1.length; _i++) {
+            var alternative = alternatives_1[_i];
+            if (testAlternative(version, alternative))
+                return true;
+        }
+        return false;
+    }
+    function testAlternative(version, comparators) {
+        for (var _i = 0, comparators_1 = comparators; _i < comparators_1.length; _i++) {
+            var comparator = comparators_1[_i];
+            if (!testComparator(version, comparator.operator, comparator.operand))
+                return false;
+        }
+        return true;
+    }
+    function testComparator(version, operator, operand) {
+        var cmp = version.compareTo(operand);
+        switch (operator) {
+            case "<": return cmp < 0;
+            case "<=": return cmp <= 0;
+            case ">": return cmp > 0;
+            case ">=": return cmp >= 0;
+            case "=": return cmp === 0;
+            default: return ts.Debug.assertNever(operator);
+        }
+    }
+    function formatDisjunction(alternatives) {
+        return ts.map(alternatives, formatAlternative).join(" || ") || "*";
+    }
+    function formatAlternative(comparators) {
+        return ts.map(comparators, formatComparator).join(" ");
+    }
+    function formatComparator(comparator) {
+        return "" + comparator.operator + comparator.operand;
+    }
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    // token > SyntaxKind.Identifier => token is a keyword
+    // Also, If you add a new SyntaxKind be sure to keep the `Markers` section at the bottom in sync
+    var SyntaxKind;
+    (function (SyntaxKind) {
+        SyntaxKind[SyntaxKind["Unknown"] = 0] = "Unknown";
+        SyntaxKind[SyntaxKind["EndOfFileToken"] = 1] = "EndOfFileToken";
+        SyntaxKind[SyntaxKind["SingleLineCommentTrivia"] = 2] = "SingleLineCommentTrivia";
+        SyntaxKind[SyntaxKind["MultiLineCommentTrivia"] = 3] = "MultiLineCommentTrivia";
+        SyntaxKind[SyntaxKind["NewLineTrivia"] = 4] = "NewLineTrivia";
+        SyntaxKind[SyntaxKind["WhitespaceTrivia"] = 5] = "WhitespaceTrivia";
+        // We detect and preserve #! on the first line
+        SyntaxKind[SyntaxKind["ShebangTrivia"] = 6] = "ShebangTrivia";
+        // We detect and provide better error recovery when we encounter a git merge marker.  This
+        // allows us to edit files with git-conflict markers in them in a much more pleasant manner.
+        SyntaxKind[SyntaxKind["ConflictMarkerTrivia"] = 7] = "ConflictMarkerTrivia";
+        // Literals
+        SyntaxKind[SyntaxKind["NumericLiteral"] = 8] = "NumericLiteral";
+        SyntaxKind[SyntaxKind["BigIntLiteral"] = 9] = "BigIntLiteral";
+        SyntaxKind[SyntaxKind["StringLiteral"] = 10] = "StringLiteral";
+        SyntaxKind[SyntaxKind["JsxText"] = 11] = "JsxText";
+        SyntaxKind[SyntaxKind["JsxTextAllWhiteSpaces"] = 12] = "JsxTextAllWhiteSpaces";
+        SyntaxKind[SyntaxKind["RegularExpressionLiteral"] = 13] = "RegularExpressionLiteral";
+        SyntaxKind[SyntaxKind["NoSubstitutionTemplateLiteral"] = 14] = "NoSubstitutionTemplateLiteral";
+        // Pseudo-literals
+        SyntaxKind[SyntaxKind["TemplateHead"] = 15] = "TemplateHead";
+        SyntaxKind[SyntaxKind["TemplateMiddle"] = 16] = "TemplateMiddle";
+        SyntaxKind[SyntaxKind["TemplateTail"] = 17] = "TemplateTail";
+        // Punctuation
+        SyntaxKind[SyntaxKind["OpenBraceToken"] = 18] = "OpenBraceToken";
+        SyntaxKind[SyntaxKind["CloseBraceToken"] = 19] = "CloseBraceToken";
+        SyntaxKind[SyntaxKind["OpenParenToken"] = 20] = "OpenParenToken";
+        SyntaxKind[SyntaxKind["CloseParenToken"] = 21] = "CloseParenToken";
+        SyntaxKind[SyntaxKind["OpenBracketToken"] = 22] = "OpenBracketToken";
+        SyntaxKind[SyntaxKind["CloseBracketToken"] = 23] = "CloseBracketToken";
+        SyntaxKind[SyntaxKind["DotToken"] = 24] = "DotToken";
+        SyntaxKind[SyntaxKind["DotDotDotToken"] = 25] = "DotDotDotToken";
+        SyntaxKind[SyntaxKind["SemicolonToken"] = 26] = "SemicolonToken";
+        SyntaxKind[SyntaxKind["CommaToken"] = 27] = "CommaToken";
+        SyntaxKind[SyntaxKind["LessThanToken"] = 28] = "LessThanToken";
+        SyntaxKind[SyntaxKind["LessThanSlashToken"] = 29] = "LessThanSlashToken";
+        SyntaxKind[SyntaxKind["GreaterThanToken"] = 30] = "GreaterThanToken";
+        SyntaxKind[SyntaxKind["LessThanEqualsToken"] = 31] = "LessThanEqualsToken";
+        SyntaxKind[SyntaxKind["GreaterThanEqualsToken"] = 32] = "GreaterThanEqualsToken";
+        SyntaxKind[SyntaxKind["EqualsEqualsToken"] = 33] = "EqualsEqualsToken";
+        SyntaxKind[SyntaxKind["ExclamationEqualsToken"] = 34] = "ExclamationEqualsToken";
+        SyntaxKind[SyntaxKind["EqualsEqualsEqualsToken"] = 35] = "EqualsEqualsEqualsToken";
+        SyntaxKind[SyntaxKind["ExclamationEqualsEqualsToken"] = 36] = "ExclamationEqualsEqualsToken";
+        SyntaxKind[SyntaxKind["EqualsGreaterThanToken"] = 37] = "EqualsGreaterThanToken";
+        SyntaxKind[SyntaxKind["PlusToken"] = 38] = "PlusToken";
+        SyntaxKind[SyntaxKind["MinusToken"] = 39] = "MinusToken";
+        SyntaxKind[SyntaxKind["AsteriskToken"] = 40] = "AsteriskToken";
+        SyntaxKind[SyntaxKind["AsteriskAsteriskToken"] = 41] = "AsteriskAsteriskToken";
+        SyntaxKind[SyntaxKind["SlashToken"] = 42] = "SlashToken";
+        SyntaxKind[SyntaxKind["PercentToken"] = 43] = "PercentToken";
+        SyntaxKind[SyntaxKind["PlusPlusToken"] = 44] = "PlusPlusToken";
+        SyntaxKind[SyntaxKind["MinusMinusToken"] = 45] = "MinusMinusToken";
+        SyntaxKind[SyntaxKind["LessThanLessThanToken"] = 46] = "LessThanLessThanToken";
+        SyntaxKind[SyntaxKind["GreaterThanGreaterThanToken"] = 47] = "GreaterThanGreaterThanToken";
+        SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanToken"] = 48] = "GreaterThanGreaterThanGreaterThanToken";
+        SyntaxKind[SyntaxKind["AmpersandToken"] = 49] = "AmpersandToken";
+        SyntaxKind[SyntaxKind["BarToken"] = 50] = "BarToken";
+        SyntaxKind[SyntaxKind["CaretToken"] = 51] = "CaretToken";
+        SyntaxKind[SyntaxKind["ExclamationToken"] = 52] = "ExclamationToken";
+        SyntaxKind[SyntaxKind["TildeToken"] = 53] = "TildeToken";
+        SyntaxKind[SyntaxKind["AmpersandAmpersandToken"] = 54] = "AmpersandAmpersandToken";
+        SyntaxKind[SyntaxKind["BarBarToken"] = 55] = "BarBarToken";
+        SyntaxKind[SyntaxKind["QuestionToken"] = 56] = "QuestionToken";
+        SyntaxKind[SyntaxKind["ColonToken"] = 57] = "ColonToken";
+        SyntaxKind[SyntaxKind["AtToken"] = 58] = "AtToken";
+        // Assignments
+        SyntaxKind[SyntaxKind["EqualsToken"] = 59] = "EqualsToken";
+        SyntaxKind[SyntaxKind["PlusEqualsToken"] = 60] = "PlusEqualsToken";
+        SyntaxKind[SyntaxKind["MinusEqualsToken"] = 61] = "MinusEqualsToken";
+        SyntaxKind[SyntaxKind["AsteriskEqualsToken"] = 62] = "AsteriskEqualsToken";
+        SyntaxKind[SyntaxKind["AsteriskAsteriskEqualsToken"] = 63] = "AsteriskAsteriskEqualsToken";
+        SyntaxKind[SyntaxKind["SlashEqualsToken"] = 64] = "SlashEqualsToken";
+        SyntaxKind[SyntaxKind["PercentEqualsToken"] = 65] = "PercentEqualsToken";
+        SyntaxKind[SyntaxKind["LessThanLessThanEqualsToken"] = 66] = "LessThanLessThanEqualsToken";
+        SyntaxKind[SyntaxKind["GreaterThanGreaterThanEqualsToken"] = 67] = "GreaterThanGreaterThanEqualsToken";
+        SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanEqualsToken"] = 68] = "GreaterThanGreaterThanGreaterThanEqualsToken";
+        SyntaxKind[SyntaxKind["AmpersandEqualsToken"] = 69] = "AmpersandEqualsToken";
+        SyntaxKind[SyntaxKind["BarEqualsToken"] = 70] = "BarEqualsToken";
+        SyntaxKind[SyntaxKind["CaretEqualsToken"] = 71] = "CaretEqualsToken";
+        // Identifiers
+        SyntaxKind[SyntaxKind["Identifier"] = 72] = "Identifier";
+        // Reserved words
+        SyntaxKind[SyntaxKind["BreakKeyword"] = 73] = "BreakKeyword";
+        SyntaxKind[SyntaxKind["CaseKeyword"] = 74] = "CaseKeyword";
+        SyntaxKind[SyntaxKind["CatchKeyword"] = 75] = "CatchKeyword";
+        SyntaxKind[SyntaxKind["ClassKeyword"] = 76] = "ClassKeyword";
+        SyntaxKind[SyntaxKind["ConstKeyword"] = 77] = "ConstKeyword";
+        SyntaxKind[SyntaxKind["ContinueKeyword"] = 78] = "ContinueKeyword";
+        SyntaxKind[SyntaxKind["DebuggerKeyword"] = 79] = "DebuggerKeyword";
+        SyntaxKind[SyntaxKind["DefaultKeyword"] = 80] = "DefaultKeyword";
+        SyntaxKind[SyntaxKind["DeleteKeyword"] = 81] = "DeleteKeyword";
+        SyntaxKind[SyntaxKind["DoKeyword"] = 82] = "DoKeyword";
+        SyntaxKind[SyntaxKind["ElseKeyword"] = 83] = "ElseKeyword";
+        SyntaxKind[SyntaxKind["EnumKeyword"] = 84] = "EnumKeyword";
+        SyntaxKind[SyntaxKind["ExportKeyword"] = 85] = "ExportKeyword";
+        SyntaxKind[SyntaxKind["ExtendsKeyword"] = 86] = "ExtendsKeyword";
+        SyntaxKind[SyntaxKind["FalseKeyword"] = 87] = "FalseKeyword";
+        SyntaxKind[SyntaxKind["FinallyKeyword"] = 88] = "FinallyKeyword";
+        SyntaxKind[SyntaxKind["ForKeyword"] = 89] = "ForKeyword";
+        SyntaxKind[SyntaxKind["FunctionKeyword"] = 90] = "FunctionKeyword";
+        SyntaxKind[SyntaxKind["IfKeyword"] = 91] = "IfKeyword";
+        SyntaxKind[SyntaxKind["ImportKeyword"] = 92] = "ImportKeyword";
+        SyntaxKind[SyntaxKind["InKeyword"] = 93] = "InKeyword";
+        SyntaxKind[SyntaxKind["InstanceOfKeyword"] = 94] = "InstanceOfKeyword";
+        SyntaxKind[SyntaxKind["NewKeyword"] = 95] = "NewKeyword";
+        SyntaxKind[SyntaxKind["NullKeyword"] = 96] = "NullKeyword";
+        SyntaxKind[SyntaxKind["ReturnKeyword"] = 97] = "ReturnKeyword";
+        SyntaxKind[SyntaxKind["SuperKeyword"] = 98] = "SuperKeyword";
+        SyntaxKind[SyntaxKind["SwitchKeyword"] = 99] = "SwitchKeyword";
+        SyntaxKind[SyntaxKind["ThisKeyword"] = 100] = "ThisKeyword";
+        SyntaxKind[SyntaxKind["ThrowKeyword"] = 101] = "ThrowKeyword";
+        SyntaxKind[SyntaxKind["TrueKeyword"] = 102] = "TrueKeyword";
+        SyntaxKind[SyntaxKind["TryKeyword"] = 103] = "TryKeyword";
+        SyntaxKind[SyntaxKind["TypeOfKeyword"] = 104] = "TypeOfKeyword";
+        SyntaxKind[SyntaxKind["VarKeyword"] = 105] = "VarKeyword";
+        SyntaxKind[SyntaxKind["VoidKeyword"] = 106] = "VoidKeyword";
+        SyntaxKind[SyntaxKind["WhileKeyword"] = 107] = "WhileKeyword";
+        SyntaxKind[SyntaxKind["WithKeyword"] = 108] = "WithKeyword";
+        // Strict mode reserved words
+        SyntaxKind[SyntaxKind["ImplementsKeyword"] = 109] = "ImplementsKeyword";
+        SyntaxKind[SyntaxKind["InterfaceKeyword"] = 110] = "InterfaceKeyword";
+        SyntaxKind[SyntaxKind["LetKeyword"] = 111] = "LetKeyword";
+        SyntaxKind[SyntaxKind["PackageKeyword"] = 112] = "PackageKeyword";
+        SyntaxKind[SyntaxKind["PrivateKeyword"] = 113] = "PrivateKeyword";
+        SyntaxKind[SyntaxKind["ProtectedKeyword"] = 114] = "ProtectedKeyword";
+        SyntaxKind[SyntaxKind["PublicKeyword"] = 115] = "PublicKeyword";
+        SyntaxKind[SyntaxKind["StaticKeyword"] = 116] = "StaticKeyword";
+        SyntaxKind[SyntaxKind["YieldKeyword"] = 117] = "YieldKeyword";
+        // Contextual keywords
+        SyntaxKind[SyntaxKind["AbstractKeyword"] = 118] = "AbstractKeyword";
+        SyntaxKind[SyntaxKind["AsKeyword"] = 119] = "AsKeyword";
+        SyntaxKind[SyntaxKind["AnyKeyword"] = 120] = "AnyKeyword";
+        SyntaxKind[SyntaxKind["AsyncKeyword"] = 121] = "AsyncKeyword";
+        SyntaxKind[SyntaxKind["AwaitKeyword"] = 122] = "AwaitKeyword";
+        SyntaxKind[SyntaxKind["BooleanKeyword"] = 123] = "BooleanKeyword";
+        SyntaxKind[SyntaxKind["ConstructorKeyword"] = 124] = "ConstructorKeyword";
+        SyntaxKind[SyntaxKind["DeclareKeyword"] = 125] = "DeclareKeyword";
+        SyntaxKind[SyntaxKind["GetKeyword"] = 126] = "GetKeyword";
+        SyntaxKind[SyntaxKind["InferKeyword"] = 127] = "InferKeyword";
+        SyntaxKind[SyntaxKind["IsKeyword"] = 128] = "IsKeyword";
+        SyntaxKind[SyntaxKind["KeyOfKeyword"] = 129] = "KeyOfKeyword";
+        SyntaxKind[SyntaxKind["ModuleKeyword"] = 130] = "ModuleKeyword";
+        SyntaxKind[SyntaxKind["NamespaceKeyword"] = 131] = "NamespaceKeyword";
+        SyntaxKind[SyntaxKind["NeverKeyword"] = 132] = "NeverKeyword";
+        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 133] = "ReadonlyKeyword";
+        SyntaxKind[SyntaxKind["RequireKeyword"] = 134] = "RequireKeyword";
+        SyntaxKind[SyntaxKind["NumberKeyword"] = 135] = "NumberKeyword";
+        SyntaxKind[SyntaxKind["ObjectKeyword"] = 136] = "ObjectKeyword";
+        SyntaxKind[SyntaxKind["SetKeyword"] = 137] = "SetKeyword";
+        SyntaxKind[SyntaxKind["StringKeyword"] = 138] = "StringKeyword";
+        SyntaxKind[SyntaxKind["SymbolKeyword"] = 139] = "SymbolKeyword";
+        SyntaxKind[SyntaxKind["TypeKeyword"] = 140] = "TypeKeyword";
+        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 141] = "UndefinedKeyword";
+        SyntaxKind[SyntaxKind["UniqueKeyword"] = 142] = "UniqueKeyword";
+        SyntaxKind[SyntaxKind["UnknownKeyword"] = 143] = "UnknownKeyword";
+        SyntaxKind[SyntaxKind["FromKeyword"] = 144] = "FromKeyword";
+        SyntaxKind[SyntaxKind["GlobalKeyword"] = 145] = "GlobalKeyword";
+        SyntaxKind[SyntaxKind["BigIntKeyword"] = 146] = "BigIntKeyword";
+        SyntaxKind[SyntaxKind["OfKeyword"] = 147] = "OfKeyword";
+        // Parse tree nodes
+        // Names
+        SyntaxKind[SyntaxKind["QualifiedName"] = 148] = "QualifiedName";
+        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 149] = "ComputedPropertyName";
+        // Signature elements
+        SyntaxKind[SyntaxKind["TypeParameter"] = 150] = "TypeParameter";
+        SyntaxKind[SyntaxKind["Parameter"] = 151] = "Parameter";
+        SyntaxKind[SyntaxKind["Decorator"] = 152] = "Decorator";
+        // TypeMember
+        SyntaxKind[SyntaxKind["PropertySignature"] = 153] = "PropertySignature";
+        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 154] = "PropertyDeclaration";
+        SyntaxKind[SyntaxKind["MethodSignature"] = 155] = "MethodSignature";
+        SyntaxKind[SyntaxKind["MethodDeclaration"] = 156] = "MethodDeclaration";
+        SyntaxKind[SyntaxKind["Constructor"] = 157] = "Constructor";
+        SyntaxKind[SyntaxKind["GetAccessor"] = 158] = "GetAccessor";
+        SyntaxKind[SyntaxKind["SetAccessor"] = 159] = "SetAccessor";
+        SyntaxKind[SyntaxKind["CallSignature"] = 160] = "CallSignature";
+        SyntaxKind[SyntaxKind["ConstructSignature"] = 161] = "ConstructSignature";
+        SyntaxKind[SyntaxKind["IndexSignature"] = 162] = "IndexSignature";
+        // Type
+        SyntaxKind[SyntaxKind["TypePredicate"] = 163] = "TypePredicate";
+        SyntaxKind[SyntaxKind["TypeReference"] = 164] = "TypeReference";
+        SyntaxKind[SyntaxKind["FunctionType"] = 165] = "FunctionType";
+        SyntaxKind[SyntaxKind["ConstructorType"] = 166] = "ConstructorType";
+        SyntaxKind[SyntaxKind["TypeQuery"] = 167] = "TypeQuery";
+        SyntaxKind[SyntaxKind["TypeLiteral"] = 168] = "TypeLiteral";
+        SyntaxKind[SyntaxKind["ArrayType"] = 169] = "ArrayType";
+        SyntaxKind[SyntaxKind["TupleType"] = 170] = "TupleType";
+        SyntaxKind[SyntaxKind["OptionalType"] = 171] = "OptionalType";
+        SyntaxKind[SyntaxKind["RestType"] = 172] = "RestType";
+        SyntaxKind[SyntaxKind["UnionType"] = 173] = "UnionType";
+        SyntaxKind[SyntaxKind["IntersectionType"] = 174] = "IntersectionType";
+        SyntaxKind[SyntaxKind["ConditionalType"] = 175] = "ConditionalType";
+        SyntaxKind[SyntaxKind["InferType"] = 176] = "InferType";
+        SyntaxKind[SyntaxKind["ParenthesizedType"] = 177] = "ParenthesizedType";
+        SyntaxKind[SyntaxKind["ThisType"] = 178] = "ThisType";
+        SyntaxKind[SyntaxKind["TypeOperator"] = 179] = "TypeOperator";
+        SyntaxKind[SyntaxKind["IndexedAccessType"] = 180] = "IndexedAccessType";
+        SyntaxKind[SyntaxKind["MappedType"] = 181] = "MappedType";
+        SyntaxKind[SyntaxKind["LiteralType"] = 182] = "LiteralType";
+        SyntaxKind[SyntaxKind["ImportType"] = 183] = "ImportType";
+        // Binding patterns
+        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 184] = "ObjectBindingPattern";
+        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 185] = "ArrayBindingPattern";
+        SyntaxKind[SyntaxKind["BindingElement"] = 186] = "BindingElement";
+        // Expression
+        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 187] = "ArrayLiteralExpression";
+        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 188] = "ObjectLiteralExpression";
+        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 189] = "PropertyAccessExpression";
+        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 190] = "ElementAccessExpression";
+        SyntaxKind[SyntaxKind["CallExpression"] = 191] = "CallExpression";
+        SyntaxKind[SyntaxKind["NewExpression"] = 192] = "NewExpression";
+        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 193] = "TaggedTemplateExpression";
+        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 194] = "TypeAssertionExpression";
+        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 195] = "ParenthesizedExpression";
+        SyntaxKind[SyntaxKind["FunctionExpression"] = 196] = "FunctionExpression";
+        SyntaxKind[SyntaxKind["ArrowFunction"] = 197] = "ArrowFunction";
+        SyntaxKind[SyntaxKind["DeleteExpression"] = 198] = "DeleteExpression";
+        SyntaxKind[SyntaxKind["TypeOfExpression"] = 199] = "TypeOfExpression";
+        SyntaxKind[SyntaxKind["VoidExpression"] = 200] = "VoidExpression";
+        SyntaxKind[SyntaxKind["AwaitExpression"] = 201] = "AwaitExpression";
+        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 202] = "PrefixUnaryExpression";
+        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 203] = "PostfixUnaryExpression";
+        SyntaxKind[SyntaxKind["BinaryExpression"] = 204] = "BinaryExpression";
+        SyntaxKind[SyntaxKind["ConditionalExpression"] = 205] = "ConditionalExpression";
+        SyntaxKind[SyntaxKind["TemplateExpression"] = 206] = "TemplateExpression";
+        SyntaxKind[SyntaxKind["YieldExpression"] = 207] = "YieldExpression";
+        SyntaxKind[SyntaxKind["SpreadElement"] = 208] = "SpreadElement";
+        SyntaxKind[SyntaxKind["ClassExpression"] = 209] = "ClassExpression";
+        SyntaxKind[SyntaxKind["OmittedExpression"] = 210] = "OmittedExpression";
+        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 211] = "ExpressionWithTypeArguments";
+        SyntaxKind[SyntaxKind["AsExpression"] = 212] = "AsExpression";
+        SyntaxKind[SyntaxKind["NonNullExpression"] = 213] = "NonNullExpression";
+        SyntaxKind[SyntaxKind["MetaProperty"] = 214] = "MetaProperty";
+        SyntaxKind[SyntaxKind["SyntheticExpression"] = 215] = "SyntheticExpression";
+        // Misc
+        SyntaxKind[SyntaxKind["TemplateSpan"] = 216] = "TemplateSpan";
+        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 217] = "SemicolonClassElement";
+        // Element
+        SyntaxKind[SyntaxKind["Block"] = 218] = "Block";
+        SyntaxKind[SyntaxKind["VariableStatement"] = 219] = "VariableStatement";
+        SyntaxKind[SyntaxKind["EmptyStatement"] = 220] = "EmptyStatement";
+        SyntaxKind[SyntaxKind["ExpressionStatement"] = 221] = "ExpressionStatement";
+        SyntaxKind[SyntaxKind["IfStatement"] = 222] = "IfStatement";
+        SyntaxKind[SyntaxKind["DoStatement"] = 223] = "DoStatement";
+        SyntaxKind[SyntaxKind["WhileStatement"] = 224] = "WhileStatement";
+        SyntaxKind[SyntaxKind["ForStatement"] = 225] = "ForStatement";
+        SyntaxKind[SyntaxKind["ForInStatement"] = 226] = "ForInStatement";
+        SyntaxKind[SyntaxKind["ForOfStatement"] = 227] = "ForOfStatement";
+        SyntaxKind[SyntaxKind["ContinueStatement"] = 228] = "ContinueStatement";
+        SyntaxKind[SyntaxKind["BreakStatement"] = 229] = "BreakStatement";
+        SyntaxKind[SyntaxKind["ReturnStatement"] = 230] = "ReturnStatement";
+        SyntaxKind[SyntaxKind["WithStatement"] = 231] = "WithStatement";
+        SyntaxKind[SyntaxKind["SwitchStatement"] = 232] = "SwitchStatement";
+        SyntaxKind[SyntaxKind["LabeledStatement"] = 233] = "LabeledStatement";
+        SyntaxKind[SyntaxKind["ThrowStatement"] = 234] = "ThrowStatement";
+        SyntaxKind[SyntaxKind["TryStatement"] = 235] = "TryStatement";
+        SyntaxKind[SyntaxKind["DebuggerStatement"] = 236] = "DebuggerStatement";
+        SyntaxKind[SyntaxKind["VariableDeclaration"] = 237] = "VariableDeclaration";
+        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 238] = "VariableDeclarationList";
+        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 239] = "FunctionDeclaration";
+        SyntaxKind[SyntaxKind["ClassDeclaration"] = 240] = "ClassDeclaration";
+        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 241] = "InterfaceDeclaration";
+        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 242] = "TypeAliasDeclaration";
+        SyntaxKind[SyntaxKind["EnumDeclaration"] = 243] = "EnumDeclaration";
+        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 244] = "ModuleDeclaration";
+        SyntaxKind[SyntaxKind["ModuleBlock"] = 245] = "ModuleBlock";
+        SyntaxKind[SyntaxKind["CaseBlock"] = 246] = "CaseBlock";
+        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 247] = "NamespaceExportDeclaration";
+        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 248] = "ImportEqualsDeclaration";
+        SyntaxKind[SyntaxKind["ImportDeclaration"] = 249] = "ImportDeclaration";
+        SyntaxKind[SyntaxKind["ImportClause"] = 250] = "ImportClause";
+        SyntaxKind[SyntaxKind["NamespaceImport"] = 251] = "NamespaceImport";
+        SyntaxKind[SyntaxKind["NamedImports"] = 252] = "NamedImports";
+        SyntaxKind[SyntaxKind["ImportSpecifier"] = 253] = "ImportSpecifier";
+        SyntaxKind[SyntaxKind["ExportAssignment"] = 254] = "ExportAssignment";
+        SyntaxKind[SyntaxKind["ExportDeclaration"] = 255] = "ExportDeclaration";
+        SyntaxKind[SyntaxKind["NamedExports"] = 256] = "NamedExports";
+        SyntaxKind[SyntaxKind["ExportSpecifier"] = 257] = "ExportSpecifier";
+        SyntaxKind[SyntaxKind["MissingDeclaration"] = 258] = "MissingDeclaration";
+        // Module references
+        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 259] = "ExternalModuleReference";
+        // JSX
+        SyntaxKind[SyntaxKind["JsxElement"] = 260] = "JsxElement";
+        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 261] = "JsxSelfClosingElement";
+        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 262] = "JsxOpeningElement";
+        SyntaxKind[SyntaxKind["JsxClosingElement"] = 263] = "JsxClosingElement";
+        SyntaxKind[SyntaxKind["JsxFragment"] = 264] = "JsxFragment";
+        SyntaxKind[SyntaxKind["JsxOpeningFragment"] = 265] = "JsxOpeningFragment";
+        SyntaxKind[SyntaxKind["JsxClosingFragment"] = 266] = "JsxClosingFragment";
+        SyntaxKind[SyntaxKind["JsxAttribute"] = 267] = "JsxAttribute";
+        SyntaxKind[SyntaxKind["JsxAttributes"] = 268] = "JsxAttributes";
+        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 269] = "JsxSpreadAttribute";
+        SyntaxKind[SyntaxKind["JsxExpression"] = 270] = "JsxExpression";
+        // Clauses
+        SyntaxKind[SyntaxKind["CaseClause"] = 271] = "CaseClause";
+        SyntaxKind[SyntaxKind["DefaultClause"] = 272] = "DefaultClause";
+        SyntaxKind[SyntaxKind["HeritageClause"] = 273] = "HeritageClause";
+        SyntaxKind[SyntaxKind["CatchClause"] = 274] = "CatchClause";
+        // Property assignments
+        SyntaxKind[SyntaxKind["PropertyAssignment"] = 275] = "PropertyAssignment";
+        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 276] = "ShorthandPropertyAssignment";
+        SyntaxKind[SyntaxKind["SpreadAssignment"] = 277] = "SpreadAssignment";
+        // Enum
+        SyntaxKind[SyntaxKind["EnumMember"] = 278] = "EnumMember";
+        // Top-level nodes
+        SyntaxKind[SyntaxKind["SourceFile"] = 279] = "SourceFile";
+        SyntaxKind[SyntaxKind["Bundle"] = 280] = "Bundle";
+        SyntaxKind[SyntaxKind["UnparsedSource"] = 281] = "UnparsedSource";
+        SyntaxKind[SyntaxKind["InputFiles"] = 282] = "InputFiles";
+        // JSDoc nodes
+        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 283] = "JSDocTypeExpression";
+        // The * type
+        SyntaxKind[SyntaxKind["JSDocAllType"] = 284] = "JSDocAllType";
+        // The ? type
+        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 285] = "JSDocUnknownType";
+        SyntaxKind[SyntaxKind["JSDocNullableType"] = 286] = "JSDocNullableType";
+        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 287] = "JSDocNonNullableType";
+        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 288] = "JSDocOptionalType";
+        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 289] = "JSDocFunctionType";
+        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 290] = "JSDocVariadicType";
+        SyntaxKind[SyntaxKind["JSDocComment"] = 291] = "JSDocComment";
+        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 292] = "JSDocTypeLiteral";
+        SyntaxKind[SyntaxKind["JSDocSignature"] = 293] = "JSDocSignature";
+        SyntaxKind[SyntaxKind["JSDocTag"] = 294] = "JSDocTag";
+        SyntaxKind[SyntaxKind["JSDocAugmentsTag"] = 295] = "JSDocAugmentsTag";
+        SyntaxKind[SyntaxKind["JSDocClassTag"] = 296] = "JSDocClassTag";
+        SyntaxKind[SyntaxKind["JSDocCallbackTag"] = 297] = "JSDocCallbackTag";
+        SyntaxKind[SyntaxKind["JSDocEnumTag"] = 298] = "JSDocEnumTag";
+        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 299] = "JSDocParameterTag";
+        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 300] = "JSDocReturnTag";
+        SyntaxKind[SyntaxKind["JSDocThisTag"] = 301] = "JSDocThisTag";
+        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 302] = "JSDocTypeTag";
+        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 303] = "JSDocTemplateTag";
+        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 304] = "JSDocTypedefTag";
+        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 305] = "JSDocPropertyTag";
+        // Synthesized list
+        SyntaxKind[SyntaxKind["SyntaxList"] = 306] = "SyntaxList";
+        // Transformation nodes
+        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 307] = "NotEmittedStatement";
+        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 308] = "PartiallyEmittedExpression";
+        SyntaxKind[SyntaxKind["CommaListExpression"] = 309] = "CommaListExpression";
+        SyntaxKind[SyntaxKind["MergeDeclarationMarker"] = 310] = "MergeDeclarationMarker";
+        SyntaxKind[SyntaxKind["EndOfDeclarationMarker"] = 311] = "EndOfDeclarationMarker";
+        // Enum value count
+        SyntaxKind[SyntaxKind["Count"] = 312] = "Count";
+        // Markers
+        SyntaxKind[SyntaxKind["FirstAssignment"] = 59] = "FirstAssignment";
+        SyntaxKind[SyntaxKind["LastAssignment"] = 71] = "LastAssignment";
+        SyntaxKind[SyntaxKind["FirstCompoundAssignment"] = 60] = "FirstCompoundAssignment";
+        SyntaxKind[SyntaxKind["LastCompoundAssignment"] = 71] = "LastCompoundAssignment";
+        SyntaxKind[SyntaxKind["FirstReservedWord"] = 73] = "FirstReservedWord";
+        SyntaxKind[SyntaxKind["LastReservedWord"] = 108] = "LastReservedWord";
+        SyntaxKind[SyntaxKind["FirstKeyword"] = 73] = "FirstKeyword";
+        SyntaxKind[SyntaxKind["LastKeyword"] = 147] = "LastKeyword";
+        SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 109] = "FirstFutureReservedWord";
+        SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 117] = "LastFutureReservedWord";
+        SyntaxKind[SyntaxKind["FirstTypeNode"] = 163] = "FirstTypeNode";
+        SyntaxKind[SyntaxKind["LastTypeNode"] = 183] = "LastTypeNode";
+        SyntaxKind[SyntaxKind["FirstPunctuation"] = 18] = "FirstPunctuation";
+        SyntaxKind[SyntaxKind["LastPunctuation"] = 71] = "LastPunctuation";
+        SyntaxKind[SyntaxKind["FirstToken"] = 0] = "FirstToken";
+        SyntaxKind[SyntaxKind["LastToken"] = 147] = "LastToken";
+        SyntaxKind[SyntaxKind["FirstTriviaToken"] = 2] = "FirstTriviaToken";
+        SyntaxKind[SyntaxKind["LastTriviaToken"] = 7] = "LastTriviaToken";
+        SyntaxKind[SyntaxKind["FirstLiteralToken"] = 8] = "FirstLiteralToken";
+        SyntaxKind[SyntaxKind["LastLiteralToken"] = 14] = "LastLiteralToken";
+        SyntaxKind[SyntaxKind["FirstTemplateToken"] = 14] = "FirstTemplateToken";
+        SyntaxKind[SyntaxKind["LastTemplateToken"] = 17] = "LastTemplateToken";
+        SyntaxKind[SyntaxKind["FirstBinaryOperator"] = 28] = "FirstBinaryOperator";
+        SyntaxKind[SyntaxKind["LastBinaryOperator"] = 71] = "LastBinaryOperator";
+        SyntaxKind[SyntaxKind["FirstNode"] = 148] = "FirstNode";
+        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 283] = "FirstJSDocNode";
+        SyntaxKind[SyntaxKind["LastJSDocNode"] = 305] = "LastJSDocNode";
+        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 294] = "FirstJSDocTagNode";
+        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 305] = "LastJSDocTagNode";
+        /* @internal */ SyntaxKind[SyntaxKind["FirstContextualKeyword"] = 118] = "FirstContextualKeyword";
+        /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 147] = "LastContextualKeyword";
+    })(SyntaxKind = ts.SyntaxKind || (ts.SyntaxKind = {}));
+    var NodeFlags;
+    (function (NodeFlags) {
+        NodeFlags[NodeFlags["None"] = 0] = "None";
+        NodeFlags[NodeFlags["Let"] = 1] = "Let";
+        NodeFlags[NodeFlags["Const"] = 2] = "Const";
+        NodeFlags[NodeFlags["NestedNamespace"] = 4] = "NestedNamespace";
+        NodeFlags[NodeFlags["Synthesized"] = 8] = "Synthesized";
+        NodeFlags[NodeFlags["Namespace"] = 16] = "Namespace";
+        NodeFlags[NodeFlags["ExportContext"] = 32] = "ExportContext";
+        NodeFlags[NodeFlags["ContainsThis"] = 64] = "ContainsThis";
+        NodeFlags[NodeFlags["HasImplicitReturn"] = 128] = "HasImplicitReturn";
+        NodeFlags[NodeFlags["HasExplicitReturn"] = 256] = "HasExplicitReturn";
+        NodeFlags[NodeFlags["GlobalAugmentation"] = 512] = "GlobalAugmentation";
+        NodeFlags[NodeFlags["HasAsyncFunctions"] = 1024] = "HasAsyncFunctions";
+        NodeFlags[NodeFlags["DisallowInContext"] = 2048] = "DisallowInContext";
+        NodeFlags[NodeFlags["YieldContext"] = 4096] = "YieldContext";
+        NodeFlags[NodeFlags["DecoratorContext"] = 8192] = "DecoratorContext";
+        NodeFlags[NodeFlags["AwaitContext"] = 16384] = "AwaitContext";
+        NodeFlags[NodeFlags["ThisNodeHasError"] = 32768] = "ThisNodeHasError";
+        NodeFlags[NodeFlags["JavaScriptFile"] = 65536] = "JavaScriptFile";
+        NodeFlags[NodeFlags["ThisNodeOrAnySubNodesHasError"] = 131072] = "ThisNodeOrAnySubNodesHasError";
+        NodeFlags[NodeFlags["HasAggregatedChildData"] = 262144] = "HasAggregatedChildData";
+        // These flags will be set when the parser encounters a dynamic import expression or 'import.meta' to avoid
+        // walking the tree if the flags are not set. However, these flags are just a approximation
+        // (hence why it's named "PossiblyContainsDynamicImport") because once set, the flags never get cleared.
+        // During editing, if a dynamic import is removed, incremental parsing will *NOT* clear this flag.
+        // This means that the tree will always be traversed during module resolution, or when looking for external module indicators.
+        // However, the removal operation should not occur often and in the case of the
+        // removal, it is likely that users will add the import anyway.
+        // The advantage of this approach is its simplicity. For the case of batch compilation,
+        // we guarantee that users won't have to pay the price of walking the tree if a dynamic import isn't used.
+        /* @internal */ NodeFlags[NodeFlags["PossiblyContainsDynamicImport"] = 524288] = "PossiblyContainsDynamicImport";
+        /* @internal */ NodeFlags[NodeFlags["PossiblyContainsImportMeta"] = 1048576] = "PossiblyContainsImportMeta";
+        NodeFlags[NodeFlags["JSDoc"] = 2097152] = "JSDoc";
+        /* @internal */ NodeFlags[NodeFlags["Ambient"] = 4194304] = "Ambient";
+        /* @internal */ NodeFlags[NodeFlags["InWithStatement"] = 8388608] = "InWithStatement";
+        NodeFlags[NodeFlags["JsonFile"] = 16777216] = "JsonFile";
+        NodeFlags[NodeFlags["BlockScoped"] = 3] = "BlockScoped";
+        NodeFlags[NodeFlags["ReachabilityCheckFlags"] = 384] = "ReachabilityCheckFlags";
+        NodeFlags[NodeFlags["ReachabilityAndEmitFlags"] = 1408] = "ReachabilityAndEmitFlags";
+        // Parsing context flags
+        NodeFlags[NodeFlags["ContextFlags"] = 12679168] = "ContextFlags";
+        // Exclude these flags when parsing a Type
+        NodeFlags[NodeFlags["TypeExcludesFlags"] = 20480] = "TypeExcludesFlags";
+        // Represents all flags that are potentially set once and
+        // never cleared on SourceFiles which get re-used in between incremental parses.
+        // See the comment above on `PossiblyContainsDynamicImport` and `PossiblyContainsImportMeta`.
+        /* @internal */ NodeFlags[NodeFlags["PermanentlySetIncrementalFlags"] = 1572864] = "PermanentlySetIncrementalFlags";
+    })(NodeFlags = ts.NodeFlags || (ts.NodeFlags = {}));
+    var ModifierFlags;
+    (function (ModifierFlags) {
+        ModifierFlags[ModifierFlags["None"] = 0] = "None";
+        ModifierFlags[ModifierFlags["Export"] = 1] = "Export";
+        ModifierFlags[ModifierFlags["Ambient"] = 2] = "Ambient";
+        ModifierFlags[ModifierFlags["Public"] = 4] = "Public";
+        ModifierFlags[ModifierFlags["Private"] = 8] = "Private";
+        ModifierFlags[ModifierFlags["Protected"] = 16] = "Protected";
+        ModifierFlags[ModifierFlags["Static"] = 32] = "Static";
+        ModifierFlags[ModifierFlags["Readonly"] = 64] = "Readonly";
+        ModifierFlags[ModifierFlags["Abstract"] = 128] = "Abstract";
+        ModifierFlags[ModifierFlags["Async"] = 256] = "Async";
+        ModifierFlags[ModifierFlags["Default"] = 512] = "Default";
+        ModifierFlags[ModifierFlags["Const"] = 2048] = "Const";
+        ModifierFlags[ModifierFlags["HasComputedFlags"] = 536870912] = "HasComputedFlags";
+        ModifierFlags[ModifierFlags["AccessibilityModifier"] = 28] = "AccessibilityModifier";
+        // Accessibility modifiers and 'readonly' can be attached to a parameter in a constructor to make it a property.
+        ModifierFlags[ModifierFlags["ParameterPropertyModifier"] = 92] = "ParameterPropertyModifier";
+        ModifierFlags[ModifierFlags["NonPublicAccessibilityModifier"] = 24] = "NonPublicAccessibilityModifier";
+        ModifierFlags[ModifierFlags["TypeScriptModifier"] = 2270] = "TypeScriptModifier";
+        ModifierFlags[ModifierFlags["ExportDefault"] = 513] = "ExportDefault";
+        ModifierFlags[ModifierFlags["All"] = 3071] = "All";
+    })(ModifierFlags = ts.ModifierFlags || (ts.ModifierFlags = {}));
+    var JsxFlags;
+    (function (JsxFlags) {
+        JsxFlags[JsxFlags["None"] = 0] = "None";
+        /** An element from a named property of the JSX.IntrinsicElements interface */
+        JsxFlags[JsxFlags["IntrinsicNamedElement"] = 1] = "IntrinsicNamedElement";
+        /** An element inferred from the string index signature of the JSX.IntrinsicElements interface */
+        JsxFlags[JsxFlags["IntrinsicIndexedElement"] = 2] = "IntrinsicIndexedElement";
+        JsxFlags[JsxFlags["IntrinsicElement"] = 3] = "IntrinsicElement";
+    })(JsxFlags = ts.JsxFlags || (ts.JsxFlags = {}));
+    /* @internal */
+    var RelationComparisonResult;
+    (function (RelationComparisonResult) {
+        RelationComparisonResult[RelationComparisonResult["Succeeded"] = 1] = "Succeeded";
+        RelationComparisonResult[RelationComparisonResult["Failed"] = 2] = "Failed";
+        RelationComparisonResult[RelationComparisonResult["FailedAndReported"] = 3] = "FailedAndReported";
+    })(RelationComparisonResult = ts.RelationComparisonResult || (ts.RelationComparisonResult = {}));
+    /*@internal*/
+    var GeneratedIdentifierFlags;
+    (function (GeneratedIdentifierFlags) {
+        // Kinds
+        GeneratedIdentifierFlags[GeneratedIdentifierFlags["None"] = 0] = "None";
+        GeneratedIdentifierFlags[GeneratedIdentifierFlags["Auto"] = 1] = "Auto";
+        GeneratedIdentifierFlags[GeneratedIdentifierFlags["Loop"] = 2] = "Loop";
+        GeneratedIdentifierFlags[GeneratedIdentifierFlags["Unique"] = 3] = "Unique";
+        GeneratedIdentifierFlags[GeneratedIdentifierFlags["Node"] = 4] = "Node";
+        GeneratedIdentifierFlags[GeneratedIdentifierFlags["KindMask"] = 7] = "KindMask";
+        // Flags
+        GeneratedIdentifierFlags[GeneratedIdentifierFlags["ReservedInNestedScopes"] = 8] = "ReservedInNestedScopes";
+        GeneratedIdentifierFlags[GeneratedIdentifierFlags["Optimistic"] = 16] = "Optimistic";
+        GeneratedIdentifierFlags[GeneratedIdentifierFlags["FileLevel"] = 32] = "FileLevel";
+    })(GeneratedIdentifierFlags = ts.GeneratedIdentifierFlags || (ts.GeneratedIdentifierFlags = {}));
+    /* @internal */
+    var TokenFlags;
+    (function (TokenFlags) {
+        TokenFlags[TokenFlags["None"] = 0] = "None";
+        TokenFlags[TokenFlags["PrecedingLineBreak"] = 1] = "PrecedingLineBreak";
+        TokenFlags[TokenFlags["PrecedingJSDocComment"] = 2] = "PrecedingJSDocComment";
+        TokenFlags[TokenFlags["Unterminated"] = 4] = "Unterminated";
+        TokenFlags[TokenFlags["ExtendedUnicodeEscape"] = 8] = "ExtendedUnicodeEscape";
+        TokenFlags[TokenFlags["Scientific"] = 16] = "Scientific";
+        TokenFlags[TokenFlags["Octal"] = 32] = "Octal";
+        TokenFlags[TokenFlags["HexSpecifier"] = 64] = "HexSpecifier";
+        TokenFlags[TokenFlags["BinarySpecifier"] = 128] = "BinarySpecifier";
+        TokenFlags[TokenFlags["OctalSpecifier"] = 256] = "OctalSpecifier";
+        TokenFlags[TokenFlags["ContainsSeparator"] = 512] = "ContainsSeparator";
+        TokenFlags[TokenFlags["BinaryOrOctalSpecifier"] = 384] = "BinaryOrOctalSpecifier";
+        TokenFlags[TokenFlags["NumericLiteralFlags"] = 1008] = "NumericLiteralFlags";
+    })(TokenFlags = ts.TokenFlags || (ts.TokenFlags = {}));
+    var FlowFlags;
+    (function (FlowFlags) {
+        FlowFlags[FlowFlags["Unreachable"] = 1] = "Unreachable";
+        FlowFlags[FlowFlags["Start"] = 2] = "Start";
+        FlowFlags[FlowFlags["BranchLabel"] = 4] = "BranchLabel";
+        FlowFlags[FlowFlags["LoopLabel"] = 8] = "LoopLabel";
+        FlowFlags[FlowFlags["Assignment"] = 16] = "Assignment";
+        FlowFlags[FlowFlags["TrueCondition"] = 32] = "TrueCondition";
+        FlowFlags[FlowFlags["FalseCondition"] = 64] = "FalseCondition";
+        FlowFlags[FlowFlags["SwitchClause"] = 128] = "SwitchClause";
+        FlowFlags[FlowFlags["ArrayMutation"] = 256] = "ArrayMutation";
+        FlowFlags[FlowFlags["Referenced"] = 512] = "Referenced";
+        FlowFlags[FlowFlags["Shared"] = 1024] = "Shared";
+        FlowFlags[FlowFlags["PreFinally"] = 2048] = "PreFinally";
+        FlowFlags[FlowFlags["AfterFinally"] = 4096] = "AfterFinally";
+        FlowFlags[FlowFlags["Label"] = 12] = "Label";
+        FlowFlags[FlowFlags["Condition"] = 96] = "Condition";
+    })(FlowFlags = ts.FlowFlags || (ts.FlowFlags = {}));
+    var OperationCanceledException = /** @class */ (function () {
+        function OperationCanceledException() {
+        }
+        return OperationCanceledException;
+    }());
+    ts.OperationCanceledException = OperationCanceledException;
+    /* @internal */
+    var StructureIsReused;
+    (function (StructureIsReused) {
+        StructureIsReused[StructureIsReused["Not"] = 0] = "Not";
+        StructureIsReused[StructureIsReused["SafeModules"] = 1] = "SafeModules";
+        StructureIsReused[StructureIsReused["Completely"] = 2] = "Completely";
+    })(StructureIsReused = ts.StructureIsReused || (ts.StructureIsReused = {}));
+    /** Return code used by getEmitOutput function to indicate status of the function */
+    var ExitStatus;
+    (function (ExitStatus) {
+        // Compiler ran successfully.  Either this was a simple do-nothing compilation (for example,
+        // when -version or -help was provided, or this was a normal compilation, no diagnostics
+        // were produced, and all outputs were generated successfully.
+        ExitStatus[ExitStatus["Success"] = 0] = "Success";
+        // Diagnostics were produced and because of them no code was generated.
+        ExitStatus[ExitStatus["DiagnosticsPresent_OutputsSkipped"] = 1] = "DiagnosticsPresent_OutputsSkipped";
+        // Diagnostics were produced and outputs were generated in spite of them.
+        ExitStatus[ExitStatus["DiagnosticsPresent_OutputsGenerated"] = 2] = "DiagnosticsPresent_OutputsGenerated";
+    })(ExitStatus = ts.ExitStatus || (ts.ExitStatus = {}));
+    /* @internal */
+    var UnionReduction;
+    (function (UnionReduction) {
+        UnionReduction[UnionReduction["None"] = 0] = "None";
+        UnionReduction[UnionReduction["Literal"] = 1] = "Literal";
+        UnionReduction[UnionReduction["Subtype"] = 2] = "Subtype";
+    })(UnionReduction = ts.UnionReduction || (ts.UnionReduction = {}));
+    // NOTE: If modifying this enum, must modify `TypeFormatFlags` too!
+    var NodeBuilderFlags;
+    (function (NodeBuilderFlags) {
+        NodeBuilderFlags[NodeBuilderFlags["None"] = 0] = "None";
+        // Options
+        NodeBuilderFlags[NodeBuilderFlags["NoTruncation"] = 1] = "NoTruncation";
+        NodeBuilderFlags[NodeBuilderFlags["WriteArrayAsGenericType"] = 2] = "WriteArrayAsGenericType";
+        NodeBuilderFlags[NodeBuilderFlags["GenerateNamesForShadowedTypeParams"] = 4] = "GenerateNamesForShadowedTypeParams";
+        NodeBuilderFlags[NodeBuilderFlags["UseStructuralFallback"] = 8] = "UseStructuralFallback";
+        NodeBuilderFlags[NodeBuilderFlags["ForbidIndexedAccessSymbolReferences"] = 16] = "ForbidIndexedAccessSymbolReferences";
+        NodeBuilderFlags[NodeBuilderFlags["WriteTypeArgumentsOfSignature"] = 32] = "WriteTypeArgumentsOfSignature";
+        NodeBuilderFlags[NodeBuilderFlags["UseFullyQualifiedType"] = 64] = "UseFullyQualifiedType";
+        NodeBuilderFlags[NodeBuilderFlags["UseOnlyExternalAliasing"] = 128] = "UseOnlyExternalAliasing";
+        NodeBuilderFlags[NodeBuilderFlags["SuppressAnyReturnType"] = 256] = "SuppressAnyReturnType";
+        NodeBuilderFlags[NodeBuilderFlags["WriteTypeParametersInQualifiedName"] = 512] = "WriteTypeParametersInQualifiedName";
+        NodeBuilderFlags[NodeBuilderFlags["MultilineObjectLiterals"] = 1024] = "MultilineObjectLiterals";
+        NodeBuilderFlags[NodeBuilderFlags["WriteClassExpressionAsTypeLiteral"] = 2048] = "WriteClassExpressionAsTypeLiteral";
+        NodeBuilderFlags[NodeBuilderFlags["UseTypeOfFunction"] = 4096] = "UseTypeOfFunction";
+        NodeBuilderFlags[NodeBuilderFlags["OmitParameterModifiers"] = 8192] = "OmitParameterModifiers";
+        NodeBuilderFlags[NodeBuilderFlags["UseAliasDefinedOutsideCurrentScope"] = 16384] = "UseAliasDefinedOutsideCurrentScope";
+        // Error handling
+        NodeBuilderFlags[NodeBuilderFlags["AllowThisInObjectLiteral"] = 32768] = "AllowThisInObjectLiteral";
+        NodeBuilderFlags[NodeBuilderFlags["AllowQualifedNameInPlaceOfIdentifier"] = 65536] = "AllowQualifedNameInPlaceOfIdentifier";
+        NodeBuilderFlags[NodeBuilderFlags["AllowAnonymousIdentifier"] = 131072] = "AllowAnonymousIdentifier";
+        NodeBuilderFlags[NodeBuilderFlags["AllowEmptyUnionOrIntersection"] = 262144] = "AllowEmptyUnionOrIntersection";
+        NodeBuilderFlags[NodeBuilderFlags["AllowEmptyTuple"] = 524288] = "AllowEmptyTuple";
+        NodeBuilderFlags[NodeBuilderFlags["AllowUniqueESSymbolType"] = 1048576] = "AllowUniqueESSymbolType";
+        NodeBuilderFlags[NodeBuilderFlags["AllowEmptyIndexInfoType"] = 2097152] = "AllowEmptyIndexInfoType";
+        // Errors (cont.)
+        NodeBuilderFlags[NodeBuilderFlags["AllowNodeModulesRelativePaths"] = 67108864] = "AllowNodeModulesRelativePaths";
+        /* @internal */ NodeBuilderFlags[NodeBuilderFlags["DoNotIncludeSymbolChain"] = 134217728] = "DoNotIncludeSymbolChain";
+        NodeBuilderFlags[NodeBuilderFlags["IgnoreErrors"] = 70221824] = "IgnoreErrors";
+        // State
+        NodeBuilderFlags[NodeBuilderFlags["InObjectTypeLiteral"] = 4194304] = "InObjectTypeLiteral";
+        NodeBuilderFlags[NodeBuilderFlags["InTypeAlias"] = 8388608] = "InTypeAlias";
+        NodeBuilderFlags[NodeBuilderFlags["InInitialEntityName"] = 16777216] = "InInitialEntityName";
+        NodeBuilderFlags[NodeBuilderFlags["InReverseMappedType"] = 33554432] = "InReverseMappedType";
+    })(NodeBuilderFlags = ts.NodeBuilderFlags || (ts.NodeBuilderFlags = {}));
+    // Ensure the shared flags between this and `NodeBuilderFlags` stay in alignment
+    var TypeFormatFlags;
+    (function (TypeFormatFlags) {
+        TypeFormatFlags[TypeFormatFlags["None"] = 0] = "None";
+        TypeFormatFlags[TypeFormatFlags["NoTruncation"] = 1] = "NoTruncation";
+        TypeFormatFlags[TypeFormatFlags["WriteArrayAsGenericType"] = 2] = "WriteArrayAsGenericType";
+        // hole because there's a hole in node builder flags
+        TypeFormatFlags[TypeFormatFlags["UseStructuralFallback"] = 8] = "UseStructuralFallback";
+        // hole because there's a hole in node builder flags
+        TypeFormatFlags[TypeFormatFlags["WriteTypeArgumentsOfSignature"] = 32] = "WriteTypeArgumentsOfSignature";
+        TypeFormatFlags[TypeFormatFlags["UseFullyQualifiedType"] = 64] = "UseFullyQualifiedType";
+        // hole because `UseOnlyExternalAliasing` is here in node builder flags, but functions which take old flags use `SymbolFormatFlags` instead
+        TypeFormatFlags[TypeFormatFlags["SuppressAnyReturnType"] = 256] = "SuppressAnyReturnType";
+        // hole because `WriteTypeParametersInQualifiedName` is here in node builder flags, but functions which take old flags use `SymbolFormatFlags` for this instead
+        TypeFormatFlags[TypeFormatFlags["MultilineObjectLiterals"] = 1024] = "MultilineObjectLiterals";
+        TypeFormatFlags[TypeFormatFlags["WriteClassExpressionAsTypeLiteral"] = 2048] = "WriteClassExpressionAsTypeLiteral";
+        TypeFormatFlags[TypeFormatFlags["UseTypeOfFunction"] = 4096] = "UseTypeOfFunction";
+        TypeFormatFlags[TypeFormatFlags["OmitParameterModifiers"] = 8192] = "OmitParameterModifiers";
+        TypeFormatFlags[TypeFormatFlags["UseAliasDefinedOutsideCurrentScope"] = 16384] = "UseAliasDefinedOutsideCurrentScope";
+        // even though `T` can't be accessed in the current scope.
+        // Error Handling
+        TypeFormatFlags[TypeFormatFlags["AllowUniqueESSymbolType"] = 1048576] = "AllowUniqueESSymbolType";
+        // TypeFormatFlags exclusive
+        TypeFormatFlags[TypeFormatFlags["AddUndefined"] = 131072] = "AddUndefined";
+        TypeFormatFlags[TypeFormatFlags["WriteArrowStyleSignature"] = 262144] = "WriteArrowStyleSignature";
+        // State
+        TypeFormatFlags[TypeFormatFlags["InArrayType"] = 524288] = "InArrayType";
+        TypeFormatFlags[TypeFormatFlags["InElementType"] = 2097152] = "InElementType";
+        TypeFormatFlags[TypeFormatFlags["InFirstTypeArgument"] = 4194304] = "InFirstTypeArgument";
+        TypeFormatFlags[TypeFormatFlags["InTypeAlias"] = 8388608] = "InTypeAlias";
+        /** @deprecated */ TypeFormatFlags[TypeFormatFlags["WriteOwnNameForAnyLike"] = 0] = "WriteOwnNameForAnyLike";
+        TypeFormatFlags[TypeFormatFlags["NodeBuilderFlagsMask"] = 9469291] = "NodeBuilderFlagsMask";
+    })(TypeFormatFlags = ts.TypeFormatFlags || (ts.TypeFormatFlags = {}));
+    var SymbolFormatFlags;
+    (function (SymbolFormatFlags) {
+        SymbolFormatFlags[SymbolFormatFlags["None"] = 0] = "None";
+        // Write symbols's type argument if it is instantiated symbol
+        // eg. class C<T> { p: T }   <-- Show p as C<T>.p here
+        //     var a: C<number>;
+        //     var p = a.p; <--- Here p is property of C<number> so show it as C<number>.p instead of just C.p
+        SymbolFormatFlags[SymbolFormatFlags["WriteTypeParametersOrArguments"] = 1] = "WriteTypeParametersOrArguments";
+        // Use only external alias information to get the symbol name in the given context
+        // eg.  module m { export class c { } } import x = m.c;
+        // When this flag is specified m.c will be used to refer to the class instead of alias symbol x
+        SymbolFormatFlags[SymbolFormatFlags["UseOnlyExternalAliasing"] = 2] = "UseOnlyExternalAliasing";
+        // Build symbol name using any nodes needed, instead of just components of an entity name
+        SymbolFormatFlags[SymbolFormatFlags["AllowAnyNodeKind"] = 4] = "AllowAnyNodeKind";
+        // Prefer aliases which are not directly visible
+        SymbolFormatFlags[SymbolFormatFlags["UseAliasDefinedOutsideCurrentScope"] = 8] = "UseAliasDefinedOutsideCurrentScope";
+        // Skip building an accessible symbol chain
+        /* @internal */ SymbolFormatFlags[SymbolFormatFlags["DoNotIncludeSymbolChain"] = 16] = "DoNotIncludeSymbolChain";
+    })(SymbolFormatFlags = ts.SymbolFormatFlags || (ts.SymbolFormatFlags = {}));
+    /* @internal */
+    var SymbolAccessibility;
+    (function (SymbolAccessibility) {
+        SymbolAccessibility[SymbolAccessibility["Accessible"] = 0] = "Accessible";
+        SymbolAccessibility[SymbolAccessibility["NotAccessible"] = 1] = "NotAccessible";
+        SymbolAccessibility[SymbolAccessibility["CannotBeNamed"] = 2] = "CannotBeNamed";
+    })(SymbolAccessibility = ts.SymbolAccessibility || (ts.SymbolAccessibility = {}));
+    /* @internal */
+    var SyntheticSymbolKind;
+    (function (SyntheticSymbolKind) {
+        SyntheticSymbolKind[SyntheticSymbolKind["UnionOrIntersection"] = 0] = "UnionOrIntersection";
+        SyntheticSymbolKind[SyntheticSymbolKind["Spread"] = 1] = "Spread";
+    })(SyntheticSymbolKind = ts.SyntheticSymbolKind || (ts.SyntheticSymbolKind = {}));
+    var TypePredicateKind;
+    (function (TypePredicateKind) {
+        TypePredicateKind[TypePredicateKind["This"] = 0] = "This";
+        TypePredicateKind[TypePredicateKind["Identifier"] = 1] = "Identifier";
+    })(TypePredicateKind = ts.TypePredicateKind || (ts.TypePredicateKind = {}));
+    /** Indicates how to serialize the name for a TypeReferenceNode when emitting decorator metadata */
+    /* @internal */
+    var TypeReferenceSerializationKind;
+    (function (TypeReferenceSerializationKind) {
+        TypeReferenceSerializationKind[TypeReferenceSerializationKind["Unknown"] = 0] = "Unknown";
+        // should be emitted using a safe fallback.
+        TypeReferenceSerializationKind[TypeReferenceSerializationKind["TypeWithConstructSignatureAndValue"] = 1] = "TypeWithConstructSignatureAndValue";
+        // function that can be reached at runtime (e.g. a `class`
+        // declaration or a `var` declaration for the static side
+        // of a type, such as the global `Promise` type in lib.d.ts).
+        TypeReferenceSerializationKind[TypeReferenceSerializationKind["VoidNullableOrNeverType"] = 2] = "VoidNullableOrNeverType";
+        TypeReferenceSerializationKind[TypeReferenceSerializationKind["NumberLikeType"] = 3] = "NumberLikeType";
+        TypeReferenceSerializationKind[TypeReferenceSerializationKind["BigIntLikeType"] = 4] = "BigIntLikeType";
+        TypeReferenceSerializationKind[TypeReferenceSerializationKind["StringLikeType"] = 5] = "StringLikeType";
+        TypeReferenceSerializationKind[TypeReferenceSerializationKind["BooleanType"] = 6] = "BooleanType";
+        TypeReferenceSerializationKind[TypeReferenceSerializationKind["ArrayLikeType"] = 7] = "ArrayLikeType";
+        TypeReferenceSerializationKind[TypeReferenceSerializationKind["ESSymbolType"] = 8] = "ESSymbolType";
+        TypeReferenceSerializationKind[TypeReferenceSerializationKind["Promise"] = 9] = "Promise";
+        TypeReferenceSerializationKind[TypeReferenceSerializationKind["TypeWithCallSignature"] = 10] = "TypeWithCallSignature";
+        // with call signatures.
+        TypeReferenceSerializationKind[TypeReferenceSerializationKind["ObjectType"] = 11] = "ObjectType";
+    })(TypeReferenceSerializationKind = ts.TypeReferenceSerializationKind || (ts.TypeReferenceSerializationKind = {}));
+    var SymbolFlags;
+    (function (SymbolFlags) {
+        SymbolFlags[SymbolFlags["None"] = 0] = "None";
+        SymbolFlags[SymbolFlags["FunctionScopedVariable"] = 1] = "FunctionScopedVariable";
+        SymbolFlags[SymbolFlags["BlockScopedVariable"] = 2] = "BlockScopedVariable";
+        SymbolFlags[SymbolFlags["Property"] = 4] = "Property";
+        SymbolFlags[SymbolFlags["EnumMember"] = 8] = "EnumMember";
+        SymbolFlags[SymbolFlags["Function"] = 16] = "Function";
+        SymbolFlags[SymbolFlags["Class"] = 32] = "Class";
+        SymbolFlags[SymbolFlags["Interface"] = 64] = "Interface";
+        SymbolFlags[SymbolFlags["ConstEnum"] = 128] = "ConstEnum";
+        SymbolFlags[SymbolFlags["RegularEnum"] = 256] = "RegularEnum";
+        SymbolFlags[SymbolFlags["ValueModule"] = 512] = "ValueModule";
+        SymbolFlags[SymbolFlags["NamespaceModule"] = 1024] = "NamespaceModule";
+        SymbolFlags[SymbolFlags["TypeLiteral"] = 2048] = "TypeLiteral";
+        SymbolFlags[SymbolFlags["ObjectLiteral"] = 4096] = "ObjectLiteral";
+        SymbolFlags[SymbolFlags["Method"] = 8192] = "Method";
+        SymbolFlags[SymbolFlags["Constructor"] = 16384] = "Constructor";
+        SymbolFlags[SymbolFlags["GetAccessor"] = 32768] = "GetAccessor";
+        SymbolFlags[SymbolFlags["SetAccessor"] = 65536] = "SetAccessor";
+        SymbolFlags[SymbolFlags["Signature"] = 131072] = "Signature";
+        SymbolFlags[SymbolFlags["TypeParameter"] = 262144] = "TypeParameter";
+        SymbolFlags[SymbolFlags["TypeAlias"] = 524288] = "TypeAlias";
+        SymbolFlags[SymbolFlags["ExportValue"] = 1048576] = "ExportValue";
+        SymbolFlags[SymbolFlags["Alias"] = 2097152] = "Alias";
+        SymbolFlags[SymbolFlags["Prototype"] = 4194304] = "Prototype";
+        SymbolFlags[SymbolFlags["ExportStar"] = 8388608] = "ExportStar";
+        SymbolFlags[SymbolFlags["Optional"] = 16777216] = "Optional";
+        SymbolFlags[SymbolFlags["Transient"] = 33554432] = "Transient";
+        SymbolFlags[SymbolFlags["Assignment"] = 67108864] = "Assignment";
+        SymbolFlags[SymbolFlags["ModuleExports"] = 134217728] = "ModuleExports";
+        /* @internal */
+        SymbolFlags[SymbolFlags["All"] = 67108863] = "All";
+        SymbolFlags[SymbolFlags["Enum"] = 384] = "Enum";
+        SymbolFlags[SymbolFlags["Variable"] = 3] = "Variable";
+        SymbolFlags[SymbolFlags["Value"] = 67220415] = "Value";
+        SymbolFlags[SymbolFlags["Type"] = 67897832] = "Type";
+        SymbolFlags[SymbolFlags["Namespace"] = 1920] = "Namespace";
+        SymbolFlags[SymbolFlags["Module"] = 1536] = "Module";
+        SymbolFlags[SymbolFlags["Accessor"] = 98304] = "Accessor";
+        // Variables can be redeclared, but can not redeclare a block-scoped declaration with the
+        // same name, or any other value that is not a variable, e.g. ValueModule or Class
+        SymbolFlags[SymbolFlags["FunctionScopedVariableExcludes"] = 67220414] = "FunctionScopedVariableExcludes";
+        // Block-scoped declarations are not allowed to be re-declared
+        // they can not merge with anything in the value space
+        SymbolFlags[SymbolFlags["BlockScopedVariableExcludes"] = 67220415] = "BlockScopedVariableExcludes";
+        SymbolFlags[SymbolFlags["ParameterExcludes"] = 67220415] = "ParameterExcludes";
+        SymbolFlags[SymbolFlags["PropertyExcludes"] = 0] = "PropertyExcludes";
+        SymbolFlags[SymbolFlags["EnumMemberExcludes"] = 68008959] = "EnumMemberExcludes";
+        SymbolFlags[SymbolFlags["FunctionExcludes"] = 67219887] = "FunctionExcludes";
+        SymbolFlags[SymbolFlags["ClassExcludes"] = 68008383] = "ClassExcludes";
+        SymbolFlags[SymbolFlags["InterfaceExcludes"] = 67897736] = "InterfaceExcludes";
+        SymbolFlags[SymbolFlags["RegularEnumExcludes"] = 68008191] = "RegularEnumExcludes";
+        SymbolFlags[SymbolFlags["ConstEnumExcludes"] = 68008831] = "ConstEnumExcludes";
+        SymbolFlags[SymbolFlags["ValueModuleExcludes"] = 110735] = "ValueModuleExcludes";
+        SymbolFlags[SymbolFlags["NamespaceModuleExcludes"] = 0] = "NamespaceModuleExcludes";
+        SymbolFlags[SymbolFlags["MethodExcludes"] = 67212223] = "MethodExcludes";
+        SymbolFlags[SymbolFlags["GetAccessorExcludes"] = 67154879] = "GetAccessorExcludes";
+        SymbolFlags[SymbolFlags["SetAccessorExcludes"] = 67187647] = "SetAccessorExcludes";
+        SymbolFlags[SymbolFlags["TypeParameterExcludes"] = 67635688] = "TypeParameterExcludes";
+        SymbolFlags[SymbolFlags["TypeAliasExcludes"] = 67897832] = "TypeAliasExcludes";
+        SymbolFlags[SymbolFlags["AliasExcludes"] = 2097152] = "AliasExcludes";
+        SymbolFlags[SymbolFlags["ModuleMember"] = 2623475] = "ModuleMember";
+        SymbolFlags[SymbolFlags["ExportHasLocal"] = 944] = "ExportHasLocal";
+        SymbolFlags[SymbolFlags["BlockScoped"] = 418] = "BlockScoped";
+        SymbolFlags[SymbolFlags["PropertyOrAccessor"] = 98308] = "PropertyOrAccessor";
+        SymbolFlags[SymbolFlags["ClassMember"] = 106500] = "ClassMember";
+        /* @internal */
+        // The set of things we consider semantically classifiable.  Used to speed up the LS during
+        // classification.
+        SymbolFlags[SymbolFlags["Classifiable"] = 2885600] = "Classifiable";
+        /* @internal */
+        SymbolFlags[SymbolFlags["LateBindingContainer"] = 6240] = "LateBindingContainer";
+    })(SymbolFlags = ts.SymbolFlags || (ts.SymbolFlags = {}));
+    /* @internal */
+    var EnumKind;
+    (function (EnumKind) {
+        EnumKind[EnumKind["Numeric"] = 0] = "Numeric";
+        EnumKind[EnumKind["Literal"] = 1] = "Literal"; // Literal enum (each member has a TypeFlags.EnumLiteral type)
+    })(EnumKind = ts.EnumKind || (ts.EnumKind = {}));
+    /* @internal */
+    var CheckFlags;
+    (function (CheckFlags) {
+        CheckFlags[CheckFlags["Instantiated"] = 1] = "Instantiated";
+        CheckFlags[CheckFlags["SyntheticProperty"] = 2] = "SyntheticProperty";
+        CheckFlags[CheckFlags["SyntheticMethod"] = 4] = "SyntheticMethod";
+        CheckFlags[CheckFlags["Readonly"] = 8] = "Readonly";
+        CheckFlags[CheckFlags["Partial"] = 16] = "Partial";
+        CheckFlags[CheckFlags["HasNonUniformType"] = 32] = "HasNonUniformType";
+        CheckFlags[CheckFlags["HasLiteralType"] = 64] = "HasLiteralType";
+        CheckFlags[CheckFlags["ContainsPublic"] = 128] = "ContainsPublic";
+        CheckFlags[CheckFlags["ContainsProtected"] = 256] = "ContainsProtected";
+        CheckFlags[CheckFlags["ContainsPrivate"] = 512] = "ContainsPrivate";
+        CheckFlags[CheckFlags["ContainsStatic"] = 1024] = "ContainsStatic";
+        CheckFlags[CheckFlags["Late"] = 2048] = "Late";
+        CheckFlags[CheckFlags["ReverseMapped"] = 4096] = "ReverseMapped";
+        CheckFlags[CheckFlags["OptionalParameter"] = 8192] = "OptionalParameter";
+        CheckFlags[CheckFlags["RestParameter"] = 16384] = "RestParameter";
+        CheckFlags[CheckFlags["Synthetic"] = 6] = "Synthetic";
+        CheckFlags[CheckFlags["Discriminant"] = 96] = "Discriminant";
+    })(CheckFlags = ts.CheckFlags || (ts.CheckFlags = {}));
+    var InternalSymbolName;
+    (function (InternalSymbolName) {
+        InternalSymbolName["Call"] = "__call";
+        InternalSymbolName["Constructor"] = "__constructor";
+        InternalSymbolName["New"] = "__new";
+        InternalSymbolName["Index"] = "__index";
+        InternalSymbolName["ExportStar"] = "__export";
+        InternalSymbolName["Global"] = "__global";
+        InternalSymbolName["Missing"] = "__missing";
+        InternalSymbolName["Type"] = "__type";
+        InternalSymbolName["Object"] = "__object";
+        InternalSymbolName["JSXAttributes"] = "__jsxAttributes";
+        InternalSymbolName["Class"] = "__class";
+        InternalSymbolName["Function"] = "__function";
+        InternalSymbolName["Computed"] = "__computed";
+        InternalSymbolName["Resolving"] = "__resolving__";
+        InternalSymbolName["ExportEquals"] = "export=";
+        InternalSymbolName["Default"] = "default";
+        InternalSymbolName["This"] = "this";
+    })(InternalSymbolName = ts.InternalSymbolName || (ts.InternalSymbolName = {}));
+    /* @internal */
+    var NodeCheckFlags;
+    (function (NodeCheckFlags) {
+        NodeCheckFlags[NodeCheckFlags["TypeChecked"] = 1] = "TypeChecked";
+        NodeCheckFlags[NodeCheckFlags["LexicalThis"] = 2] = "LexicalThis";
+        NodeCheckFlags[NodeCheckFlags["CaptureThis"] = 4] = "CaptureThis";
+        NodeCheckFlags[NodeCheckFlags["CaptureNewTarget"] = 8] = "CaptureNewTarget";
+        NodeCheckFlags[NodeCheckFlags["SuperInstance"] = 256] = "SuperInstance";
+        NodeCheckFlags[NodeCheckFlags["SuperStatic"] = 512] = "SuperStatic";
+        NodeCheckFlags[NodeCheckFlags["ContextChecked"] = 1024] = "ContextChecked";
+        NodeCheckFlags[NodeCheckFlags["AsyncMethodWithSuper"] = 2048] = "AsyncMethodWithSuper";
+        NodeCheckFlags[NodeCheckFlags["AsyncMethodWithSuperBinding"] = 4096] = "AsyncMethodWithSuperBinding";
+        NodeCheckFlags[NodeCheckFlags["CaptureArguments"] = 8192] = "CaptureArguments";
+        NodeCheckFlags[NodeCheckFlags["EnumValuesComputed"] = 16384] = "EnumValuesComputed";
+        NodeCheckFlags[NodeCheckFlags["LexicalModuleMergesWithClass"] = 32768] = "LexicalModuleMergesWithClass";
+        NodeCheckFlags[NodeCheckFlags["LoopWithCapturedBlockScopedBinding"] = 65536] = "LoopWithCapturedBlockScopedBinding";
+        NodeCheckFlags[NodeCheckFlags["ContainsCapturedBlockScopeBinding"] = 131072] = "ContainsCapturedBlockScopeBinding";
+        NodeCheckFlags[NodeCheckFlags["CapturedBlockScopedBinding"] = 262144] = "CapturedBlockScopedBinding";
+        NodeCheckFlags[NodeCheckFlags["BlockScopedBindingInLoop"] = 524288] = "BlockScopedBindingInLoop";
+        NodeCheckFlags[NodeCheckFlags["ClassWithBodyScopedClassBinding"] = 1048576] = "ClassWithBodyScopedClassBinding";
+        NodeCheckFlags[NodeCheckFlags["BodyScopedClassBinding"] = 2097152] = "BodyScopedClassBinding";
+        NodeCheckFlags[NodeCheckFlags["NeedsLoopOutParameter"] = 4194304] = "NeedsLoopOutParameter";
+        NodeCheckFlags[NodeCheckFlags["AssignmentsMarked"] = 8388608] = "AssignmentsMarked";
+        NodeCheckFlags[NodeCheckFlags["ClassWithConstructorReference"] = 16777216] = "ClassWithConstructorReference";
+        NodeCheckFlags[NodeCheckFlags["ConstructorReferenceInClass"] = 33554432] = "ConstructorReferenceInClass";
+    })(NodeCheckFlags = ts.NodeCheckFlags || (ts.NodeCheckFlags = {}));
+    var TypeFlags;
+    (function (TypeFlags) {
+        TypeFlags[TypeFlags["Any"] = 1] = "Any";
+        TypeFlags[TypeFlags["Unknown"] = 2] = "Unknown";
+        TypeFlags[TypeFlags["String"] = 4] = "String";
+        TypeFlags[TypeFlags["Number"] = 8] = "Number";
+        TypeFlags[TypeFlags["Boolean"] = 16] = "Boolean";
+        TypeFlags[TypeFlags["Enum"] = 32] = "Enum";
+        TypeFlags[TypeFlags["BigInt"] = 64] = "BigInt";
+        TypeFlags[TypeFlags["StringLiteral"] = 128] = "StringLiteral";
+        TypeFlags[TypeFlags["NumberLiteral"] = 256] = "NumberLiteral";
+        TypeFlags[TypeFlags["BooleanLiteral"] = 512] = "BooleanLiteral";
+        TypeFlags[TypeFlags["EnumLiteral"] = 1024] = "EnumLiteral";
+        TypeFlags[TypeFlags["BigIntLiteral"] = 2048] = "BigIntLiteral";
+        TypeFlags[TypeFlags["ESSymbol"] = 4096] = "ESSymbol";
+        TypeFlags[TypeFlags["UniqueESSymbol"] = 8192] = "UniqueESSymbol";
+        TypeFlags[TypeFlags["Void"] = 16384] = "Void";
+        TypeFlags[TypeFlags["Undefined"] = 32768] = "Undefined";
+        TypeFlags[TypeFlags["Null"] = 65536] = "Null";
+        TypeFlags[TypeFlags["Never"] = 131072] = "Never";
+        TypeFlags[TypeFlags["TypeParameter"] = 262144] = "TypeParameter";
+        TypeFlags[TypeFlags["Object"] = 524288] = "Object";
+        TypeFlags[TypeFlags["Union"] = 1048576] = "Union";
+        TypeFlags[TypeFlags["Intersection"] = 2097152] = "Intersection";
+        TypeFlags[TypeFlags["Index"] = 4194304] = "Index";
+        TypeFlags[TypeFlags["IndexedAccess"] = 8388608] = "IndexedAccess";
+        TypeFlags[TypeFlags["Conditional"] = 16777216] = "Conditional";
+        TypeFlags[TypeFlags["Substitution"] = 33554432] = "Substitution";
+        TypeFlags[TypeFlags["NonPrimitive"] = 67108864] = "NonPrimitive";
+        /* @internal */
+        TypeFlags[TypeFlags["ContainsWideningType"] = 134217728] = "ContainsWideningType";
+        /* @internal */
+        TypeFlags[TypeFlags["ContainsObjectLiteral"] = 268435456] = "ContainsObjectLiteral";
+        /* @internal */
+        TypeFlags[TypeFlags["ContainsAnyFunctionType"] = 536870912] = "ContainsAnyFunctionType";
+        /* @internal */
+        TypeFlags[TypeFlags["AnyOrUnknown"] = 3] = "AnyOrUnknown";
+        /* @internal */
+        TypeFlags[TypeFlags["Nullable"] = 98304] = "Nullable";
+        TypeFlags[TypeFlags["Literal"] = 2944] = "Literal";
+        TypeFlags[TypeFlags["Unit"] = 109440] = "Unit";
+        TypeFlags[TypeFlags["StringOrNumberLiteral"] = 384] = "StringOrNumberLiteral";
+        /* @internal */
+        TypeFlags[TypeFlags["StringOrNumberLiteralOrUnique"] = 8576] = "StringOrNumberLiteralOrUnique";
+        /* @internal */
+        TypeFlags[TypeFlags["DefinitelyFalsy"] = 117632] = "DefinitelyFalsy";
+        TypeFlags[TypeFlags["PossiblyFalsy"] = 117724] = "PossiblyFalsy";
+        /* @internal */
+        TypeFlags[TypeFlags["Intrinsic"] = 67359327] = "Intrinsic";
+        /* @internal */
+        TypeFlags[TypeFlags["Primitive"] = 131068] = "Primitive";
+        TypeFlags[TypeFlags["StringLike"] = 132] = "StringLike";
+        TypeFlags[TypeFlags["NumberLike"] = 296] = "NumberLike";
+        TypeFlags[TypeFlags["BigIntLike"] = 2112] = "BigIntLike";
+        TypeFlags[TypeFlags["BooleanLike"] = 528] = "BooleanLike";
+        TypeFlags[TypeFlags["EnumLike"] = 1056] = "EnumLike";
+        TypeFlags[TypeFlags["ESSymbolLike"] = 12288] = "ESSymbolLike";
+        TypeFlags[TypeFlags["VoidLike"] = 49152] = "VoidLike";
+        /* @internal */
+        TypeFlags[TypeFlags["DisjointDomains"] = 67238908] = "DisjointDomains";
+        TypeFlags[TypeFlags["UnionOrIntersection"] = 3145728] = "UnionOrIntersection";
+        TypeFlags[TypeFlags["StructuredType"] = 3670016] = "StructuredType";
+        TypeFlags[TypeFlags["TypeVariable"] = 8650752] = "TypeVariable";
+        TypeFlags[TypeFlags["InstantiableNonPrimitive"] = 58982400] = "InstantiableNonPrimitive";
+        TypeFlags[TypeFlags["InstantiablePrimitive"] = 4194304] = "InstantiablePrimitive";
+        TypeFlags[TypeFlags["Instantiable"] = 63176704] = "Instantiable";
+        TypeFlags[TypeFlags["StructuredOrInstantiable"] = 66846720] = "StructuredOrInstantiable";
+        // 'Narrowable' types are types where narrowing actually narrows.
+        // This *should* be every type other than null, undefined, void, and never
+        TypeFlags[TypeFlags["Narrowable"] = 133970943] = "Narrowable";
+        TypeFlags[TypeFlags["NotUnionOrUnit"] = 67637251] = "NotUnionOrUnit";
+        /* @internal */
+        TypeFlags[TypeFlags["NotPrimitiveUnion"] = 66994211] = "NotPrimitiveUnion";
+        /* @internal */
+        TypeFlags[TypeFlags["RequiresWidening"] = 402653184] = "RequiresWidening";
+        /* @internal */
+        TypeFlags[TypeFlags["PropagatingFlags"] = 939524096] = "PropagatingFlags";
+        // The following flags are used for different purposes during union and intersection type construction
+        /* @internal */
+        TypeFlags[TypeFlags["NonWideningType"] = 134217728] = "NonWideningType";
+        /* @internal */
+        TypeFlags[TypeFlags["Wildcard"] = 268435456] = "Wildcard";
+        /* @internal */
+        TypeFlags[TypeFlags["EmptyObject"] = 536870912] = "EmptyObject";
+        /* @internal */
+        TypeFlags[TypeFlags["ConstructionFlags"] = 939524096] = "ConstructionFlags";
+        // The following flag is used for different purposes by maybeTypeOfKind
+        /* @internal */
+        TypeFlags[TypeFlags["GenericMappedType"] = 134217728] = "GenericMappedType";
+    })(TypeFlags = ts.TypeFlags || (ts.TypeFlags = {}));
+    var ObjectFlags;
+    (function (ObjectFlags) {
+        ObjectFlags[ObjectFlags["Class"] = 1] = "Class";
+        ObjectFlags[ObjectFlags["Interface"] = 2] = "Interface";
+        ObjectFlags[ObjectFlags["Reference"] = 4] = "Reference";
+        ObjectFlags[ObjectFlags["Tuple"] = 8] = "Tuple";
+        ObjectFlags[ObjectFlags["Anonymous"] = 16] = "Anonymous";
+        ObjectFlags[ObjectFlags["Mapped"] = 32] = "Mapped";
+        ObjectFlags[ObjectFlags["Instantiated"] = 64] = "Instantiated";
+        ObjectFlags[ObjectFlags["ObjectLiteral"] = 128] = "ObjectLiteral";
+        ObjectFlags[ObjectFlags["EvolvingArray"] = 256] = "EvolvingArray";
+        ObjectFlags[ObjectFlags["ObjectLiteralPatternWithComputedProperties"] = 512] = "ObjectLiteralPatternWithComputedProperties";
+        ObjectFlags[ObjectFlags["ContainsSpread"] = 1024] = "ContainsSpread";
+        ObjectFlags[ObjectFlags["ReverseMapped"] = 2048] = "ReverseMapped";
+        ObjectFlags[ObjectFlags["JsxAttributes"] = 4096] = "JsxAttributes";
+        ObjectFlags[ObjectFlags["MarkerType"] = 8192] = "MarkerType";
+        ObjectFlags[ObjectFlags["JSLiteral"] = 16384] = "JSLiteral";
+        ObjectFlags[ObjectFlags["FreshLiteral"] = 32768] = "FreshLiteral";
+        ObjectFlags[ObjectFlags["ClassOrInterface"] = 3] = "ClassOrInterface";
+    })(ObjectFlags = ts.ObjectFlags || (ts.ObjectFlags = {}));
+    /* @internal */
+    var Variance;
+    (function (Variance) {
+        Variance[Variance["Invariant"] = 0] = "Invariant";
+        Variance[Variance["Covariant"] = 1] = "Covariant";
+        Variance[Variance["Contravariant"] = 2] = "Contravariant";
+        Variance[Variance["Bivariant"] = 3] = "Bivariant";
+        Variance[Variance["Independent"] = 4] = "Independent";
+    })(Variance = ts.Variance || (ts.Variance = {}));
+    /* @internal */
+    var JsxReferenceKind;
+    (function (JsxReferenceKind) {
+        JsxReferenceKind[JsxReferenceKind["Component"] = 0] = "Component";
+        JsxReferenceKind[JsxReferenceKind["Function"] = 1] = "Function";
+        JsxReferenceKind[JsxReferenceKind["Mixed"] = 2] = "Mixed";
+    })(JsxReferenceKind = ts.JsxReferenceKind || (ts.JsxReferenceKind = {}));
+    var SignatureKind;
+    (function (SignatureKind) {
+        SignatureKind[SignatureKind["Call"] = 0] = "Call";
+        SignatureKind[SignatureKind["Construct"] = 1] = "Construct";
+    })(SignatureKind = ts.SignatureKind || (ts.SignatureKind = {}));
+    var IndexKind;
+    (function (IndexKind) {
+        IndexKind[IndexKind["String"] = 0] = "String";
+        IndexKind[IndexKind["Number"] = 1] = "Number";
+    })(IndexKind = ts.IndexKind || (ts.IndexKind = {}));
+    var InferencePriority;
+    (function (InferencePriority) {
+        InferencePriority[InferencePriority["NakedTypeVariable"] = 1] = "NakedTypeVariable";
+        InferencePriority[InferencePriority["HomomorphicMappedType"] = 2] = "HomomorphicMappedType";
+        InferencePriority[InferencePriority["MappedTypeConstraint"] = 4] = "MappedTypeConstraint";
+        InferencePriority[InferencePriority["ReturnType"] = 8] = "ReturnType";
+        InferencePriority[InferencePriority["LiteralKeyof"] = 16] = "LiteralKeyof";
+        InferencePriority[InferencePriority["NoConstraints"] = 32] = "NoConstraints";
+        InferencePriority[InferencePriority["AlwaysStrict"] = 64] = "AlwaysStrict";
+        InferencePriority[InferencePriority["PriorityImpliesCombination"] = 28] = "PriorityImpliesCombination";
+    })(InferencePriority = ts.InferencePriority || (ts.InferencePriority = {}));
+    /* @internal */
+    var InferenceFlags;
+    (function (InferenceFlags) {
+        InferenceFlags[InferenceFlags["None"] = 0] = "None";
+        InferenceFlags[InferenceFlags["NoDefault"] = 1] = "NoDefault";
+        InferenceFlags[InferenceFlags["AnyDefault"] = 2] = "AnyDefault";
+    })(InferenceFlags = ts.InferenceFlags || (ts.InferenceFlags = {}));
+    /**
+     * Ternary values are defined such that
+     * x & y is False if either x or y is False.
+     * x & y is Maybe if either x or y is Maybe, but neither x or y is False.
+     * x & y is True if both x and y are True.
+     * x | y is False if both x and y are False.
+     * x | y is Maybe if either x or y is Maybe, but neither x or y is True.
+     * x | y is True if either x or y is True.
+     */
+    /* @internal */
+    var Ternary;
+    (function (Ternary) {
+        Ternary[Ternary["False"] = 0] = "False";
+        Ternary[Ternary["Maybe"] = 1] = "Maybe";
+        Ternary[Ternary["True"] = -1] = "True";
+    })(Ternary = ts.Ternary || (ts.Ternary = {}));
+    /* @internal */
+    var AssignmentDeclarationKind;
+    (function (AssignmentDeclarationKind) {
+        AssignmentDeclarationKind[AssignmentDeclarationKind["None"] = 0] = "None";
+        /// exports.name = expr
+        AssignmentDeclarationKind[AssignmentDeclarationKind["ExportsProperty"] = 1] = "ExportsProperty";
+        /// module.exports = expr
+        AssignmentDeclarationKind[AssignmentDeclarationKind["ModuleExports"] = 2] = "ModuleExports";
+        /// className.prototype.name = expr
+        AssignmentDeclarationKind[AssignmentDeclarationKind["PrototypeProperty"] = 3] = "PrototypeProperty";
+        /// this.name = expr
+        AssignmentDeclarationKind[AssignmentDeclarationKind["ThisProperty"] = 4] = "ThisProperty";
+        // F.name = expr
+        AssignmentDeclarationKind[AssignmentDeclarationKind["Property"] = 5] = "Property";
+        // F.prototype = { ... }
+        AssignmentDeclarationKind[AssignmentDeclarationKind["Prototype"] = 6] = "Prototype";
+        // Object.defineProperty(x, 'name', { value: any, writable?: boolean (false by default) });
+        // Object.defineProperty(x, 'name', { get: Function, set: Function });
+        // Object.defineProperty(x, 'name', { get: Function });
+        // Object.defineProperty(x, 'name', { set: Function });
+        AssignmentDeclarationKind[AssignmentDeclarationKind["ObjectDefinePropertyValue"] = 7] = "ObjectDefinePropertyValue";
+        // Object.defineProperty(exports || module.exports, 'name', ...);
+        AssignmentDeclarationKind[AssignmentDeclarationKind["ObjectDefinePropertyExports"] = 8] = "ObjectDefinePropertyExports";
+        // Object.defineProperty(Foo.prototype, 'name', ...);
+        AssignmentDeclarationKind[AssignmentDeclarationKind["ObjectDefinePrototypeProperty"] = 9] = "ObjectDefinePrototypeProperty";
+    })(AssignmentDeclarationKind = ts.AssignmentDeclarationKind || (ts.AssignmentDeclarationKind = {}));
+    var DiagnosticCategory;
+    (function (DiagnosticCategory) {
+        DiagnosticCategory[DiagnosticCategory["Warning"] = 0] = "Warning";
+        DiagnosticCategory[DiagnosticCategory["Error"] = 1] = "Error";
+        DiagnosticCategory[DiagnosticCategory["Suggestion"] = 2] = "Suggestion";
+        DiagnosticCategory[DiagnosticCategory["Message"] = 3] = "Message";
+    })(DiagnosticCategory = ts.DiagnosticCategory || (ts.DiagnosticCategory = {}));
+    /* @internal */
+    function diagnosticCategoryName(d, lowerCase) {
+        if (lowerCase === void 0) { lowerCase = true; }
+        var name = DiagnosticCategory[d.category];
+        return lowerCase ? name.toLowerCase() : name;
+    }
+    ts.diagnosticCategoryName = diagnosticCategoryName;
+    var ModuleResolutionKind;
+    (function (ModuleResolutionKind) {
+        ModuleResolutionKind[ModuleResolutionKind["Classic"] = 1] = "Classic";
+        ModuleResolutionKind[ModuleResolutionKind["NodeJs"] = 2] = "NodeJs";
+    })(ModuleResolutionKind = ts.ModuleResolutionKind || (ts.ModuleResolutionKind = {}));
+    var ModuleKind;
+    (function (ModuleKind) {
+        ModuleKind[ModuleKind["None"] = 0] = "None";
+        ModuleKind[ModuleKind["CommonJS"] = 1] = "CommonJS";
+        ModuleKind[ModuleKind["AMD"] = 2] = "AMD";
+        ModuleKind[ModuleKind["UMD"] = 3] = "UMD";
+        ModuleKind[ModuleKind["System"] = 4] = "System";
+        ModuleKind[ModuleKind["ES2015"] = 5] = "ES2015";
+        ModuleKind[ModuleKind["ESNext"] = 6] = "ESNext";
+    })(ModuleKind = ts.ModuleKind || (ts.ModuleKind = {}));
+    var JsxEmit;
+    (function (JsxEmit) {
+        JsxEmit[JsxEmit["None"] = 0] = "None";
+        JsxEmit[JsxEmit["Preserve"] = 1] = "Preserve";
+        JsxEmit[JsxEmit["React"] = 2] = "React";
+        JsxEmit[JsxEmit["ReactNative"] = 3] = "ReactNative";
+    })(JsxEmit = ts.JsxEmit || (ts.JsxEmit = {}));
+    var NewLineKind;
+    (function (NewLineKind) {
+        NewLineKind[NewLineKind["CarriageReturnLineFeed"] = 0] = "CarriageReturnLineFeed";
+        NewLineKind[NewLineKind["LineFeed"] = 1] = "LineFeed";
+    })(NewLineKind = ts.NewLineKind || (ts.NewLineKind = {}));
+    var ScriptKind;
+    (function (ScriptKind) {
+        ScriptKind[ScriptKind["Unknown"] = 0] = "Unknown";
+        ScriptKind[ScriptKind["JS"] = 1] = "JS";
+        ScriptKind[ScriptKind["JSX"] = 2] = "JSX";
+        ScriptKind[ScriptKind["TS"] = 3] = "TS";
+        ScriptKind[ScriptKind["TSX"] = 4] = "TSX";
+        ScriptKind[ScriptKind["External"] = 5] = "External";
+        ScriptKind[ScriptKind["JSON"] = 6] = "JSON";
+        /**
+         * Used on extensions that doesn't define the ScriptKind but the content defines it.
+         * Deferred extensions are going to be included in all project contexts.
+         */
+        ScriptKind[ScriptKind["Deferred"] = 7] = "Deferred";
+    })(ScriptKind = ts.ScriptKind || (ts.ScriptKind = {}));
+    var ScriptTarget;
+    (function (ScriptTarget) {
+        ScriptTarget[ScriptTarget["ES3"] = 0] = "ES3";
+        ScriptTarget[ScriptTarget["ES5"] = 1] = "ES5";
+        ScriptTarget[ScriptTarget["ES2015"] = 2] = "ES2015";
+        ScriptTarget[ScriptTarget["ES2016"] = 3] = "ES2016";
+        ScriptTarget[ScriptTarget["ES2017"] = 4] = "ES2017";
+        ScriptTarget[ScriptTarget["ES2018"] = 5] = "ES2018";
+        ScriptTarget[ScriptTarget["ESNext"] = 6] = "ESNext";
+        ScriptTarget[ScriptTarget["JSON"] = 100] = "JSON";
+        ScriptTarget[ScriptTarget["Latest"] = 6] = "Latest";
+    })(ScriptTarget = ts.ScriptTarget || (ts.ScriptTarget = {}));
+    var LanguageVariant;
+    (function (LanguageVariant) {
+        LanguageVariant[LanguageVariant["Standard"] = 0] = "Standard";
+        LanguageVariant[LanguageVariant["JSX"] = 1] = "JSX";
+    })(LanguageVariant = ts.LanguageVariant || (ts.LanguageVariant = {}));
+    var WatchDirectoryFlags;
+    (function (WatchDirectoryFlags) {
+        WatchDirectoryFlags[WatchDirectoryFlags["None"] = 0] = "None";
+        WatchDirectoryFlags[WatchDirectoryFlags["Recursive"] = 1] = "Recursive";
+    })(WatchDirectoryFlags = ts.WatchDirectoryFlags || (ts.WatchDirectoryFlags = {}));
+    /* @internal */
+    var CharacterCodes;
+    (function (CharacterCodes) {
+        CharacterCodes[CharacterCodes["nullCharacter"] = 0] = "nullCharacter";
+        CharacterCodes[CharacterCodes["maxAsciiCharacter"] = 127] = "maxAsciiCharacter";
+        CharacterCodes[CharacterCodes["lineFeed"] = 10] = "lineFeed";
+        CharacterCodes[CharacterCodes["carriageReturn"] = 13] = "carriageReturn";
+        CharacterCodes[CharacterCodes["lineSeparator"] = 8232] = "lineSeparator";
+        CharacterCodes[CharacterCodes["paragraphSeparator"] = 8233] = "paragraphSeparator";
+        CharacterCodes[CharacterCodes["nextLine"] = 133] = "nextLine";
+        // Unicode 3.0 space characters
+        CharacterCodes[CharacterCodes["space"] = 32] = "space";
+        CharacterCodes[CharacterCodes["nonBreakingSpace"] = 160] = "nonBreakingSpace";
+        CharacterCodes[CharacterCodes["enQuad"] = 8192] = "enQuad";
+        CharacterCodes[CharacterCodes["emQuad"] = 8193] = "emQuad";
+        CharacterCodes[CharacterCodes["enSpace"] = 8194] = "enSpace";
+        CharacterCodes[CharacterCodes["emSpace"] = 8195] = "emSpace";
+        CharacterCodes[CharacterCodes["threePerEmSpace"] = 8196] = "threePerEmSpace";
+        CharacterCodes[CharacterCodes["fourPerEmSpace"] = 8197] = "fourPerEmSpace";
+        CharacterCodes[CharacterCodes["sixPerEmSpace"] = 8198] = "sixPerEmSpace";
+        CharacterCodes[CharacterCodes["figureSpace"] = 8199] = "figureSpace";
+        CharacterCodes[CharacterCodes["punctuationSpace"] = 8200] = "punctuationSpace";
+        CharacterCodes[CharacterCodes["thinSpace"] = 8201] = "thinSpace";
+        CharacterCodes[CharacterCodes["hairSpace"] = 8202] = "hairSpace";
+        CharacterCodes[CharacterCodes["zeroWidthSpace"] = 8203] = "zeroWidthSpace";
+        CharacterCodes[CharacterCodes["narrowNoBreakSpace"] = 8239] = "narrowNoBreakSpace";
+        CharacterCodes[CharacterCodes["ideographicSpace"] = 12288] = "ideographicSpace";
+        CharacterCodes[CharacterCodes["mathematicalSpace"] = 8287] = "mathematicalSpace";
+        CharacterCodes[CharacterCodes["ogham"] = 5760] = "ogham";
+        CharacterCodes[CharacterCodes["_"] = 95] = "_";
+        CharacterCodes[CharacterCodes["$"] = 36] = "$";
+        CharacterCodes[CharacterCodes["_0"] = 48] = "_0";
+        CharacterCodes[CharacterCodes["_1"] = 49] = "_1";
+        CharacterCodes[CharacterCodes["_2"] = 50] = "_2";
+        CharacterCodes[CharacterCodes["_3"] = 51] = "_3";
+        CharacterCodes[CharacterCodes["_4"] = 52] = "_4";
+        CharacterCodes[CharacterCodes["_5"] = 53] = "_5";
+        CharacterCodes[CharacterCodes["_6"] = 54] = "_6";
+        CharacterCodes[CharacterCodes["_7"] = 55] = "_7";
+        CharacterCodes[CharacterCodes["_8"] = 56] = "_8";
+        CharacterCodes[CharacterCodes["_9"] = 57] = "_9";
+        CharacterCodes[CharacterCodes["a"] = 97] = "a";
+        CharacterCodes[CharacterCodes["b"] = 98] = "b";
+        CharacterCodes[CharacterCodes["c"] = 99] = "c";
+        CharacterCodes[CharacterCodes["d"] = 100] = "d";
+        CharacterCodes[CharacterCodes["e"] = 101] = "e";
+        CharacterCodes[CharacterCodes["f"] = 102] = "f";
+        CharacterCodes[CharacterCodes["g"] = 103] = "g";
+        CharacterCodes[CharacterCodes["h"] = 104] = "h";
+        CharacterCodes[CharacterCodes["i"] = 105] = "i";
+        CharacterCodes[CharacterCodes["j"] = 106] = "j";
+        CharacterCodes[CharacterCodes["k"] = 107] = "k";
+        CharacterCodes[CharacterCodes["l"] = 108] = "l";
+        CharacterCodes[CharacterCodes["m"] = 109] = "m";
+        CharacterCodes[CharacterCodes["n"] = 110] = "n";
+        CharacterCodes[CharacterCodes["o"] = 111] = "o";
+        CharacterCodes[CharacterCodes["p"] = 112] = "p";
+        CharacterCodes[CharacterCodes["q"] = 113] = "q";
+        CharacterCodes[CharacterCodes["r"] = 114] = "r";
+        CharacterCodes[CharacterCodes["s"] = 115] = "s";
+        CharacterCodes[CharacterCodes["t"] = 116] = "t";
+        CharacterCodes[CharacterCodes["u"] = 117] = "u";
+        CharacterCodes[CharacterCodes["v"] = 118] = "v";
+        CharacterCodes[CharacterCodes["w"] = 119] = "w";
+        CharacterCodes[CharacterCodes["x"] = 120] = "x";
+        CharacterCodes[CharacterCodes["y"] = 121] = "y";
+        CharacterCodes[CharacterCodes["z"] = 122] = "z";
+        CharacterCodes[CharacterCodes["A"] = 65] = "A";
+        CharacterCodes[CharacterCodes["B"] = 66] = "B";
+        CharacterCodes[CharacterCodes["C"] = 67] = "C";
+        CharacterCodes[CharacterCodes["D"] = 68] = "D";
+        CharacterCodes[CharacterCodes["E"] = 69] = "E";
+        CharacterCodes[CharacterCodes["F"] = 70] = "F";
+        CharacterCodes[CharacterCodes["G"] = 71] = "G";
+        CharacterCodes[CharacterCodes["H"] = 72] = "H";
+        CharacterCodes[CharacterCodes["I"] = 73] = "I";
+        CharacterCodes[CharacterCodes["J"] = 74] = "J";
+        CharacterCodes[CharacterCodes["K"] = 75] = "K";
+        CharacterCodes[CharacterCodes["L"] = 76] = "L";
+        CharacterCodes[CharacterCodes["M"] = 77] = "M";
+        CharacterCodes[CharacterCodes["N"] = 78] = "N";
+        CharacterCodes[CharacterCodes["O"] = 79] = "O";
+        CharacterCodes[CharacterCodes["P"] = 80] = "P";
+        CharacterCodes[CharacterCodes["Q"] = 81] = "Q";
+        CharacterCodes[CharacterCodes["R"] = 82] = "R";
+        CharacterCodes[CharacterCodes["S"] = 83] = "S";
+        CharacterCodes[CharacterCodes["T"] = 84] = "T";
+        CharacterCodes[CharacterCodes["U"] = 85] = "U";
+        CharacterCodes[CharacterCodes["V"] = 86] = "V";
+        CharacterCodes[CharacterCodes["W"] = 87] = "W";
+        CharacterCodes[CharacterCodes["X"] = 88] = "X";
+        CharacterCodes[CharacterCodes["Y"] = 89] = "Y";
+        CharacterCodes[CharacterCodes["Z"] = 90] = "Z";
+        CharacterCodes[CharacterCodes["ampersand"] = 38] = "ampersand";
+        CharacterCodes[CharacterCodes["asterisk"] = 42] = "asterisk";
+        CharacterCodes[CharacterCodes["at"] = 64] = "at";
+        CharacterCodes[CharacterCodes["backslash"] = 92] = "backslash";
+        CharacterCodes[CharacterCodes["backtick"] = 96] = "backtick";
+        CharacterCodes[CharacterCodes["bar"] = 124] = "bar";
+        CharacterCodes[CharacterCodes["caret"] = 94] = "caret";
+        CharacterCodes[CharacterCodes["closeBrace"] = 125] = "closeBrace";
+        CharacterCodes[CharacterCodes["closeBracket"] = 93] = "closeBracket";
+        CharacterCodes[CharacterCodes["closeParen"] = 41] = "closeParen";
+        CharacterCodes[CharacterCodes["colon"] = 58] = "colon";
+        CharacterCodes[CharacterCodes["comma"] = 44] = "comma";
+        CharacterCodes[CharacterCodes["dot"] = 46] = "dot";
+        CharacterCodes[CharacterCodes["doubleQuote"] = 34] = "doubleQuote";
+        CharacterCodes[CharacterCodes["equals"] = 61] = "equals";
+        CharacterCodes[CharacterCodes["exclamation"] = 33] = "exclamation";
+        CharacterCodes[CharacterCodes["greaterThan"] = 62] = "greaterThan";
+        CharacterCodes[CharacterCodes["hash"] = 35] = "hash";
+        CharacterCodes[CharacterCodes["lessThan"] = 60] = "lessThan";
+        CharacterCodes[CharacterCodes["minus"] = 45] = "minus";
+        CharacterCodes[CharacterCodes["openBrace"] = 123] = "openBrace";
+        CharacterCodes[CharacterCodes["openBracket"] = 91] = "openBracket";
+        CharacterCodes[CharacterCodes["openParen"] = 40] = "openParen";
+        CharacterCodes[CharacterCodes["percent"] = 37] = "percent";
+        CharacterCodes[CharacterCodes["plus"] = 43] = "plus";
+        CharacterCodes[CharacterCodes["question"] = 63] = "question";
+        CharacterCodes[CharacterCodes["semicolon"] = 59] = "semicolon";
+        CharacterCodes[CharacterCodes["singleQuote"] = 39] = "singleQuote";
+        CharacterCodes[CharacterCodes["slash"] = 47] = "slash";
+        CharacterCodes[CharacterCodes["tilde"] = 126] = "tilde";
+        CharacterCodes[CharacterCodes["backspace"] = 8] = "backspace";
+        CharacterCodes[CharacterCodes["formFeed"] = 12] = "formFeed";
+        CharacterCodes[CharacterCodes["byteOrderMark"] = 65279] = "byteOrderMark";
+        CharacterCodes[CharacterCodes["tab"] = 9] = "tab";
+        CharacterCodes[CharacterCodes["verticalTab"] = 11] = "verticalTab";
+    })(CharacterCodes = ts.CharacterCodes || (ts.CharacterCodes = {}));
+    var Extension;
+    (function (Extension) {
+        Extension["Ts"] = ".ts";
+        Extension["Tsx"] = ".tsx";
+        Extension["Dts"] = ".d.ts";
+        Extension["Js"] = ".js";
+        Extension["Jsx"] = ".jsx";
+        Extension["Json"] = ".json";
+    })(Extension = ts.Extension || (ts.Extension = {}));
+    /* @internal */
+    var TransformFlags;
+    (function (TransformFlags) {
+        TransformFlags[TransformFlags["None"] = 0] = "None";
+        // Facts
+        // - Flags used to indicate that a node or subtree contains syntax that requires transformation.
+        TransformFlags[TransformFlags["TypeScript"] = 1] = "TypeScript";
+        TransformFlags[TransformFlags["ContainsTypeScript"] = 2] = "ContainsTypeScript";
+        TransformFlags[TransformFlags["ContainsJsx"] = 4] = "ContainsJsx";
+        TransformFlags[TransformFlags["ContainsESNext"] = 8] = "ContainsESNext";
+        TransformFlags[TransformFlags["ContainsES2017"] = 16] = "ContainsES2017";
+        TransformFlags[TransformFlags["ContainsES2016"] = 32] = "ContainsES2016";
+        TransformFlags[TransformFlags["ES2015"] = 64] = "ES2015";
+        TransformFlags[TransformFlags["ContainsES2015"] = 128] = "ContainsES2015";
+        TransformFlags[TransformFlags["Generator"] = 256] = "Generator";
+        TransformFlags[TransformFlags["ContainsGenerator"] = 512] = "ContainsGenerator";
+        TransformFlags[TransformFlags["DestructuringAssignment"] = 1024] = "DestructuringAssignment";
+        TransformFlags[TransformFlags["ContainsDestructuringAssignment"] = 2048] = "ContainsDestructuringAssignment";
+        // Markers
+        // - Flags used to indicate that a subtree contains a specific transformation.
+        TransformFlags[TransformFlags["ContainsTypeScriptClassSyntax"] = 4096] = "ContainsTypeScriptClassSyntax";
+        TransformFlags[TransformFlags["ContainsLexicalThis"] = 8192] = "ContainsLexicalThis";
+        TransformFlags[TransformFlags["ContainsCapturedLexicalThis"] = 16384] = "ContainsCapturedLexicalThis";
+        TransformFlags[TransformFlags["ContainsLexicalThisInComputedPropertyName"] = 32768] = "ContainsLexicalThisInComputedPropertyName";
+        TransformFlags[TransformFlags["ContainsDefaultValueAssignments"] = 65536] = "ContainsDefaultValueAssignments";
+        TransformFlags[TransformFlags["ContainsRestOrSpread"] = 131072] = "ContainsRestOrSpread";
+        TransformFlags[TransformFlags["ContainsObjectRestOrSpread"] = 262144] = "ContainsObjectRestOrSpread";
+        TransformFlags[TransformFlags["ContainsComputedPropertyName"] = 524288] = "ContainsComputedPropertyName";
+        TransformFlags[TransformFlags["ContainsBlockScopedBinding"] = 1048576] = "ContainsBlockScopedBinding";
+        TransformFlags[TransformFlags["ContainsBindingPattern"] = 2097152] = "ContainsBindingPattern";
+        TransformFlags[TransformFlags["ContainsYield"] = 4194304] = "ContainsYield";
+        TransformFlags[TransformFlags["ContainsHoistedDeclarationOrCompletion"] = 8388608] = "ContainsHoistedDeclarationOrCompletion";
+        TransformFlags[TransformFlags["ContainsDynamicImport"] = 16777216] = "ContainsDynamicImport";
+        TransformFlags[TransformFlags["Super"] = 33554432] = "Super";
+        TransformFlags[TransformFlags["ContainsSuper"] = 67108864] = "ContainsSuper";
+        // Please leave this as 1 << 29.
+        // It is the maximum bit we can set before we outgrow the size of a v8 small integer (SMI) on an x86 system.
+        // It is a good reminder of how much room we have left
+        TransformFlags[TransformFlags["HasComputedFlags"] = 536870912] = "HasComputedFlags";
+        // Assertions
+        // - Bitmasks that are used to assert facts about the syntax of a node and its subtree.
+        TransformFlags[TransformFlags["AssertTypeScript"] = 3] = "AssertTypeScript";
+        TransformFlags[TransformFlags["AssertJsx"] = 4] = "AssertJsx";
+        TransformFlags[TransformFlags["AssertESNext"] = 8] = "AssertESNext";
+        TransformFlags[TransformFlags["AssertES2017"] = 16] = "AssertES2017";
+        TransformFlags[TransformFlags["AssertES2016"] = 32] = "AssertES2016";
+        TransformFlags[TransformFlags["AssertES2015"] = 192] = "AssertES2015";
+        TransformFlags[TransformFlags["AssertGenerator"] = 768] = "AssertGenerator";
+        TransformFlags[TransformFlags["AssertDestructuringAssignment"] = 3072] = "AssertDestructuringAssignment";
+        // Scope Exclusions
+        // - Bitmasks that exclude flags from propagating out of a specific context
+        //   into the subtree flags of their container.
+        TransformFlags[TransformFlags["OuterExpressionExcludes"] = 536872257] = "OuterExpressionExcludes";
+        TransformFlags[TransformFlags["PropertyAccessExcludes"] = 570426689] = "PropertyAccessExcludes";
+        TransformFlags[TransformFlags["NodeExcludes"] = 637535553] = "NodeExcludes";
+        TransformFlags[TransformFlags["ArrowFunctionExcludes"] = 653604161] = "ArrowFunctionExcludes";
+        TransformFlags[TransformFlags["FunctionExcludes"] = 653620545] = "FunctionExcludes";
+        TransformFlags[TransformFlags["ConstructorExcludes"] = 653616449] = "ConstructorExcludes";
+        TransformFlags[TransformFlags["MethodOrAccessorExcludes"] = 653616449] = "MethodOrAccessorExcludes";
+        TransformFlags[TransformFlags["ClassExcludes"] = 638121281] = "ClassExcludes";
+        TransformFlags[TransformFlags["ModuleExcludes"] = 647001409] = "ModuleExcludes";
+        TransformFlags[TransformFlags["TypeExcludes"] = -3] = "TypeExcludes";
+        TransformFlags[TransformFlags["ObjectLiteralExcludes"] = 638358849] = "ObjectLiteralExcludes";
+        TransformFlags[TransformFlags["ArrayLiteralOrCallOrNewExcludes"] = 637666625] = "ArrayLiteralOrCallOrNewExcludes";
+        TransformFlags[TransformFlags["VariableDeclarationListExcludes"] = 639894849] = "VariableDeclarationListExcludes";
+        TransformFlags[TransformFlags["ParameterExcludes"] = 637535553] = "ParameterExcludes";
+        TransformFlags[TransformFlags["CatchClauseExcludes"] = 637797697] = "CatchClauseExcludes";
+        TransformFlags[TransformFlags["BindingPatternExcludes"] = 637666625] = "BindingPatternExcludes";
+        // Masks
+        // - Additional bitmasks
+        TransformFlags[TransformFlags["ES2015FunctionSyntaxMask"] = 81920] = "ES2015FunctionSyntaxMask";
+    })(TransformFlags = ts.TransformFlags || (ts.TransformFlags = {}));
+    var EmitFlags;
+    (function (EmitFlags) {
+        EmitFlags[EmitFlags["None"] = 0] = "None";
+        EmitFlags[EmitFlags["SingleLine"] = 1] = "SingleLine";
+        EmitFlags[EmitFlags["AdviseOnEmitNode"] = 2] = "AdviseOnEmitNode";
+        EmitFlags[EmitFlags["NoSubstitution"] = 4] = "NoSubstitution";
+        EmitFlags[EmitFlags["CapturesThis"] = 8] = "CapturesThis";
+        EmitFlags[EmitFlags["NoLeadingSourceMap"] = 16] = "NoLeadingSourceMap";
+        EmitFlags[EmitFlags["NoTrailingSourceMap"] = 32] = "NoTrailingSourceMap";
+        EmitFlags[EmitFlags["NoSourceMap"] = 48] = "NoSourceMap";
+        EmitFlags[EmitFlags["NoNestedSourceMaps"] = 64] = "NoNestedSourceMaps";
+        EmitFlags[EmitFlags["NoTokenLeadingSourceMaps"] = 128] = "NoTokenLeadingSourceMaps";
+        EmitFlags[EmitFlags["NoTokenTrailingSourceMaps"] = 256] = "NoTokenTrailingSourceMaps";
+        EmitFlags[EmitFlags["NoTokenSourceMaps"] = 384] = "NoTokenSourceMaps";
+        EmitFlags[EmitFlags["NoLeadingComments"] = 512] = "NoLeadingComments";
+        EmitFlags[EmitFlags["NoTrailingComments"] = 1024] = "NoTrailingComments";
+        EmitFlags[EmitFlags["NoComments"] = 1536] = "NoComments";
+        EmitFlags[EmitFlags["NoNestedComments"] = 2048] = "NoNestedComments";
+        EmitFlags[EmitFlags["HelperName"] = 4096] = "HelperName";
+        EmitFlags[EmitFlags["ExportName"] = 8192] = "ExportName";
+        EmitFlags[EmitFlags["LocalName"] = 16384] = "LocalName";
+        EmitFlags[EmitFlags["InternalName"] = 32768] = "InternalName";
+        EmitFlags[EmitFlags["Indented"] = 65536] = "Indented";
+        EmitFlags[EmitFlags["NoIndentation"] = 131072] = "NoIndentation";
+        EmitFlags[EmitFlags["AsyncFunctionBody"] = 262144] = "AsyncFunctionBody";
+        EmitFlags[EmitFlags["ReuseTempVariableScope"] = 524288] = "ReuseTempVariableScope";
+        EmitFlags[EmitFlags["CustomPrologue"] = 1048576] = "CustomPrologue";
+        EmitFlags[EmitFlags["NoHoisting"] = 2097152] = "NoHoisting";
+        EmitFlags[EmitFlags["HasEndOfDeclarationMarker"] = 4194304] = "HasEndOfDeclarationMarker";
+        EmitFlags[EmitFlags["Iterator"] = 8388608] = "Iterator";
+        EmitFlags[EmitFlags["NoAsciiEscaping"] = 16777216] = "NoAsciiEscaping";
+        /*@internal*/ EmitFlags[EmitFlags["TypeScriptClassWrapper"] = 33554432] = "TypeScriptClassWrapper";
+        /*@internal*/ EmitFlags[EmitFlags["NeverApplyImportHelper"] = 67108864] = "NeverApplyImportHelper";
+    })(EmitFlags = ts.EmitFlags || (ts.EmitFlags = {}));
+    /**
+     * Used by the checker, this enum keeps track of external emit helpers that should be type
+     * checked.
+     */
+    /* @internal */
+    var ExternalEmitHelpers;
+    (function (ExternalEmitHelpers) {
+        ExternalEmitHelpers[ExternalEmitHelpers["Extends"] = 1] = "Extends";
+        ExternalEmitHelpers[ExternalEmitHelpers["Assign"] = 2] = "Assign";
+        ExternalEmitHelpers[ExternalEmitHelpers["Rest"] = 4] = "Rest";
+        ExternalEmitHelpers[ExternalEmitHelpers["Decorate"] = 8] = "Decorate";
+        ExternalEmitHelpers[ExternalEmitHelpers["Metadata"] = 16] = "Metadata";
+        ExternalEmitHelpers[ExternalEmitHelpers["Param"] = 32] = "Param";
+        ExternalEmitHelpers[ExternalEmitHelpers["Awaiter"] = 64] = "Awaiter";
+        ExternalEmitHelpers[ExternalEmitHelpers["Generator"] = 128] = "Generator";
+        ExternalEmitHelpers[ExternalEmitHelpers["Values"] = 256] = "Values";
+        ExternalEmitHelpers[ExternalEmitHelpers["Read"] = 512] = "Read";
+        ExternalEmitHelpers[ExternalEmitHelpers["Spread"] = 1024] = "Spread";
+        ExternalEmitHelpers[ExternalEmitHelpers["Await"] = 2048] = "Await";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncGenerator"] = 4096] = "AsyncGenerator";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncDelegator"] = 8192] = "AsyncDelegator";
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncValues"] = 16384] = "AsyncValues";
+        ExternalEmitHelpers[ExternalEmitHelpers["ExportStar"] = 32768] = "ExportStar";
+        ExternalEmitHelpers[ExternalEmitHelpers["MakeTemplateObject"] = 65536] = "MakeTemplateObject";
+        ExternalEmitHelpers[ExternalEmitHelpers["FirstEmitHelper"] = 1] = "FirstEmitHelper";
+        ExternalEmitHelpers[ExternalEmitHelpers["LastEmitHelper"] = 65536] = "LastEmitHelper";
+        // Helpers included by ES2015 for..of
+        ExternalEmitHelpers[ExternalEmitHelpers["ForOfIncludes"] = 256] = "ForOfIncludes";
+        // Helpers included by ES2017 for..await..of
+        ExternalEmitHelpers[ExternalEmitHelpers["ForAwaitOfIncludes"] = 16384] = "ForAwaitOfIncludes";
+        // Helpers included by ES2017 async generators
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncGeneratorIncludes"] = 6144] = "AsyncGeneratorIncludes";
+        // Helpers included by yield* in ES2017 async generators
+        ExternalEmitHelpers[ExternalEmitHelpers["AsyncDelegatorIncludes"] = 26624] = "AsyncDelegatorIncludes";
+        // Helpers included by ES2015 spread
+        ExternalEmitHelpers[ExternalEmitHelpers["SpreadIncludes"] = 1536] = "SpreadIncludes";
+    })(ExternalEmitHelpers = ts.ExternalEmitHelpers || (ts.ExternalEmitHelpers = {}));
+    var EmitHint;
+    (function (EmitHint) {
+        EmitHint[EmitHint["SourceFile"] = 0] = "SourceFile";
+        EmitHint[EmitHint["Expression"] = 1] = "Expression";
+        EmitHint[EmitHint["IdentifierName"] = 2] = "IdentifierName";
+        EmitHint[EmitHint["MappedTypeParameter"] = 3] = "MappedTypeParameter";
+        EmitHint[EmitHint["Unspecified"] = 4] = "Unspecified";
+        EmitHint[EmitHint["EmbeddedStatement"] = 5] = "EmbeddedStatement";
+    })(EmitHint = ts.EmitHint || (ts.EmitHint = {}));
+    var ListFormat;
+    (function (ListFormat) {
+        ListFormat[ListFormat["None"] = 0] = "None";
+        // Line separators
+        ListFormat[ListFormat["SingleLine"] = 0] = "SingleLine";
+        ListFormat[ListFormat["MultiLine"] = 1] = "MultiLine";
+        ListFormat[ListFormat["PreserveLines"] = 2] = "PreserveLines";
+        ListFormat[ListFormat["LinesMask"] = 3] = "LinesMask";
+        // Delimiters
+        ListFormat[ListFormat["NotDelimited"] = 0] = "NotDelimited";
+        ListFormat[ListFormat["BarDelimited"] = 4] = "BarDelimited";
+        ListFormat[ListFormat["AmpersandDelimited"] = 8] = "AmpersandDelimited";
+        ListFormat[ListFormat["CommaDelimited"] = 16] = "CommaDelimited";
+        ListFormat[ListFormat["AsteriskDelimited"] = 32] = "AsteriskDelimited";
+        ListFormat[ListFormat["DelimitersMask"] = 60] = "DelimitersMask";
+        ListFormat[ListFormat["AllowTrailingComma"] = 64] = "AllowTrailingComma";
+        // Whitespace
+        ListFormat[ListFormat["Indented"] = 128] = "Indented";
+        ListFormat[ListFormat["SpaceBetweenBraces"] = 256] = "SpaceBetweenBraces";
+        ListFormat[ListFormat["SpaceBetweenSiblings"] = 512] = "SpaceBetweenSiblings";
+        // Brackets/Braces
+        ListFormat[ListFormat["Braces"] = 1024] = "Braces";
+        ListFormat[ListFormat["Parenthesis"] = 2048] = "Parenthesis";
+        ListFormat[ListFormat["AngleBrackets"] = 4096] = "AngleBrackets";
+        ListFormat[ListFormat["SquareBrackets"] = 8192] = "SquareBrackets";
+        ListFormat[ListFormat["BracketsMask"] = 15360] = "BracketsMask";
+        ListFormat[ListFormat["OptionalIfUndefined"] = 16384] = "OptionalIfUndefined";
+        ListFormat[ListFormat["OptionalIfEmpty"] = 32768] = "OptionalIfEmpty";
+        ListFormat[ListFormat["Optional"] = 49152] = "Optional";
+        // Other
+        ListFormat[ListFormat["PreferNewLine"] = 65536] = "PreferNewLine";
+        ListFormat[ListFormat["NoTrailingNewLine"] = 131072] = "NoTrailingNewLine";
+        ListFormat[ListFormat["NoInterveningComments"] = 262144] = "NoInterveningComments";
+        ListFormat[ListFormat["NoSpaceIfEmpty"] = 524288] = "NoSpaceIfEmpty";
+        ListFormat[ListFormat["SingleElement"] = 1048576] = "SingleElement";
+        // Precomputed Formats
+        ListFormat[ListFormat["Modifiers"] = 262656] = "Modifiers";
+        ListFormat[ListFormat["HeritageClauses"] = 512] = "HeritageClauses";
+        ListFormat[ListFormat["SingleLineTypeLiteralMembers"] = 768] = "SingleLineTypeLiteralMembers";
+        ListFormat[ListFormat["MultiLineTypeLiteralMembers"] = 32897] = "MultiLineTypeLiteralMembers";
+        ListFormat[ListFormat["TupleTypeElements"] = 528] = "TupleTypeElements";
+        ListFormat[ListFormat["UnionTypeConstituents"] = 516] = "UnionTypeConstituents";
+        ListFormat[ListFormat["IntersectionTypeConstituents"] = 520] = "IntersectionTypeConstituents";
+        ListFormat[ListFormat["ObjectBindingPatternElements"] = 525136] = "ObjectBindingPatternElements";
+        ListFormat[ListFormat["ArrayBindingPatternElements"] = 524880] = "ArrayBindingPatternElements";
+        ListFormat[ListFormat["ObjectLiteralExpressionProperties"] = 526226] = "ObjectLiteralExpressionProperties";
+        ListFormat[ListFormat["ArrayLiteralExpressionElements"] = 8914] = "ArrayLiteralExpressionElements";
+        ListFormat[ListFormat["CommaListElements"] = 528] = "CommaListElements";
+        ListFormat[ListFormat["CallExpressionArguments"] = 2576] = "CallExpressionArguments";
+        ListFormat[ListFormat["NewExpressionArguments"] = 18960] = "NewExpressionArguments";
+        ListFormat[ListFormat["TemplateExpressionSpans"] = 262144] = "TemplateExpressionSpans";
+        ListFormat[ListFormat["SingleLineBlockStatements"] = 768] = "SingleLineBlockStatements";
+        ListFormat[ListFormat["MultiLineBlockStatements"] = 129] = "MultiLineBlockStatements";
+        ListFormat[ListFormat["VariableDeclarationList"] = 528] = "VariableDeclarationList";
+        ListFormat[ListFormat["SingleLineFunctionBodyStatements"] = 768] = "SingleLineFunctionBodyStatements";
+        ListFormat[ListFormat["MultiLineFunctionBodyStatements"] = 1] = "MultiLineFunctionBodyStatements";
+        ListFormat[ListFormat["ClassHeritageClauses"] = 0] = "ClassHeritageClauses";
+        ListFormat[ListFormat["ClassMembers"] = 129] = "ClassMembers";
+        ListFormat[ListFormat["InterfaceMembers"] = 129] = "InterfaceMembers";
+        ListFormat[ListFormat["EnumMembers"] = 145] = "EnumMembers";
+        ListFormat[ListFormat["CaseBlockClauses"] = 129] = "CaseBlockClauses";
+        ListFormat[ListFormat["NamedImportsOrExportsElements"] = 525136] = "NamedImportsOrExportsElements";
+        ListFormat[ListFormat["JsxElementOrFragmentChildren"] = 262144] = "JsxElementOrFragmentChildren";
+        ListFormat[ListFormat["JsxElementAttributes"] = 262656] = "JsxElementAttributes";
+        ListFormat[ListFormat["CaseOrDefaultClauseStatements"] = 163969] = "CaseOrDefaultClauseStatements";
+        ListFormat[ListFormat["HeritageClauseTypes"] = 528] = "HeritageClauseTypes";
+        ListFormat[ListFormat["SourceFileStatements"] = 131073] = "SourceFileStatements";
+        ListFormat[ListFormat["Decorators"] = 49153] = "Decorators";
+        ListFormat[ListFormat["TypeArguments"] = 53776] = "TypeArguments";
+        ListFormat[ListFormat["TypeParameters"] = 53776] = "TypeParameters";
+        ListFormat[ListFormat["Parameters"] = 2576] = "Parameters";
+        ListFormat[ListFormat["IndexSignatureParameters"] = 8848] = "IndexSignatureParameters";
+        ListFormat[ListFormat["JSDocComment"] = 33] = "JSDocComment";
+    })(ListFormat = ts.ListFormat || (ts.ListFormat = {}));
+    /* @internal */
+    var PragmaKindFlags;
+    (function (PragmaKindFlags) {
+        PragmaKindFlags[PragmaKindFlags["None"] = 0] = "None";
+        /**
+         * Triple slash comment of the form
+         * /// <pragma-name argname="value" />
+         */
+        PragmaKindFlags[PragmaKindFlags["TripleSlashXML"] = 1] = "TripleSlashXML";
+        /**
+         * Single line comment of the form
+         * // @pragma-name argval1 argval2
+         * or
+         * /// @pragma-name argval1 argval2
+         */
+        PragmaKindFlags[PragmaKindFlags["SingleLine"] = 2] = "SingleLine";
+        /**
+         * Multiline non-jsdoc pragma of the form
+         * /* @pragma-name argval1 argval2 * /
+         */
+        PragmaKindFlags[PragmaKindFlags["MultiLine"] = 4] = "MultiLine";
+        PragmaKindFlags[PragmaKindFlags["All"] = 7] = "All";
+        PragmaKindFlags[PragmaKindFlags["Default"] = 7] = "Default";
+    })(PragmaKindFlags = ts.PragmaKindFlags || (ts.PragmaKindFlags = {}));
+    /**
+     * This function only exists to cause exact types to be inferred for all the literals within `commentPragmas`
+     */
+    /* @internal */
+    function _contextuallyTypePragmas(args) {
+        return args;
+    }
+    // While not strictly a type, this is here because `PragmaMap` needs to be here to be used with `SourceFile`, and we don't
+    //  fancy effectively defining it twice, once in value-space and once in type-space
+    /* @internal */
+    ts.commentPragmas = _contextuallyTypePragmas({
+        "reference": {
+            args: [
+                { name: "types", optional: true, captureSpan: true },
+                { name: "lib", optional: true, captureSpan: true },
+                { name: "path", optional: true, captureSpan: true },
+                { name: "no-default-lib", optional: true }
+            ],
+            kind: 1 /* TripleSlashXML */
+        },
+        "amd-dependency": {
+            args: [{ name: "path" }, { name: "name", optional: true }],
+            kind: 1 /* TripleSlashXML */
+        },
+        "amd-module": {
+            args: [{ name: "name" }],
+            kind: 1 /* TripleSlashXML */
+        },
+        "ts-check": {
+            kind: 2 /* SingleLine */
+        },
+        "ts-nocheck": {
+            kind: 2 /* SingleLine */
+        },
+        "jsx": {
+            args: [{ name: "factory" }],
+            kind: 4 /* MultiLine */
+        },
+    });
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    /**
+     * djb2 hashing algorithm
+     * http://www.cse.yorku.ca/~oz/hash.html
+     */
+    /* @internal */
+    function generateDjb2Hash(data) {
+        var chars = data.split("").map(function (str) { return str.charCodeAt(0); });
+        return "" + chars.reduce(function (prev, curr) { return ((prev << 5) + prev) + curr; }, 5381);
+    }
+    ts.generateDjb2Hash = generateDjb2Hash;
+    /**
+     * Set a high stack trace limit to provide more information in case of an error.
+     * Called for command-line and server use cases.
+     * Not called if TypeScript is used as a library.
+     */
+    /* @internal */
+    function setStackTraceLimit() {
+        if (Error.stackTraceLimit < 100) { // Also tests that we won't set the property if it doesn't exist.
+            Error.stackTraceLimit = 100;
+        }
+    }
+    ts.setStackTraceLimit = setStackTraceLimit;
+    var FileWatcherEventKind;
+    (function (FileWatcherEventKind) {
+        FileWatcherEventKind[FileWatcherEventKind["Created"] = 0] = "Created";
+        FileWatcherEventKind[FileWatcherEventKind["Changed"] = 1] = "Changed";
+        FileWatcherEventKind[FileWatcherEventKind["Deleted"] = 2] = "Deleted";
+    })(FileWatcherEventKind = ts.FileWatcherEventKind || (ts.FileWatcherEventKind = {}));
+    /* @internal */
+    var PollingInterval;
+    (function (PollingInterval) {
+        PollingInterval[PollingInterval["High"] = 2000] = "High";
+        PollingInterval[PollingInterval["Medium"] = 500] = "Medium";
+        PollingInterval[PollingInterval["Low"] = 250] = "Low";
+    })(PollingInterval = ts.PollingInterval || (ts.PollingInterval = {}));
+    /* @internal */
+    ts.missingFileModifiedTime = new Date(0); // Any subsequent modification will occur after this time
+    function createPollingIntervalBasedLevels(levels) {
+        var _a;
+        return _a = {},
+            _a[PollingInterval.Low] = levels.Low,
+            _a[PollingInterval.Medium] = levels.Medium,
+            _a[PollingInterval.High] = levels.High,
+            _a;
+    }
+    var defaultChunkLevels = { Low: 32, Medium: 64, High: 256 };
+    var pollingChunkSize = createPollingIntervalBasedLevels(defaultChunkLevels);
+    /* @internal */
+    ts.unchangedPollThresholds = createPollingIntervalBasedLevels(defaultChunkLevels);
+    /* @internal */
+    function setCustomPollingValues(system) {
+        if (!system.getEnvironmentVariable) {
+            return;
+        }
+        var pollingIntervalChanged = setCustomLevels("TSC_WATCH_POLLINGINTERVAL", PollingInterval);
+        pollingChunkSize = getCustomPollingBasedLevels("TSC_WATCH_POLLINGCHUNKSIZE", defaultChunkLevels) || pollingChunkSize;
+        ts.unchangedPollThresholds = getCustomPollingBasedLevels("TSC_WATCH_UNCHANGEDPOLLTHRESHOLDS", defaultChunkLevels) || ts.unchangedPollThresholds;
+        function getLevel(envVar, level) {
+            return system.getEnvironmentVariable(envVar + "_" + level.toUpperCase());
+        }
+        function getCustomLevels(baseVariable) {
+            var customLevels;
+            setCustomLevel("Low");
+            setCustomLevel("Medium");
+            setCustomLevel("High");
+            return customLevels;
+            function setCustomLevel(level) {
+                var customLevel = getLevel(baseVariable, level);
+                if (customLevel) {
+                    (customLevels || (customLevels = {}))[level] = Number(customLevel);
+                }
+            }
+        }
+        function setCustomLevels(baseVariable, levels) {
+            var customLevels = getCustomLevels(baseVariable);
+            if (customLevels) {
+                setLevel("Low");
+                setLevel("Medium");
+                setLevel("High");
+                return true;
+            }
+            return false;
+            function setLevel(level) {
+                levels[level] = customLevels[level] || levels[level];
+            }
+        }
+        function getCustomPollingBasedLevels(baseVariable, defaultLevels) {
+            var customLevels = getCustomLevels(baseVariable);
+            return (pollingIntervalChanged || customLevels) &&
+                createPollingIntervalBasedLevels(customLevels ? __assign({}, defaultLevels, customLevels) : defaultLevels);
+        }
+    }
+    ts.setCustomPollingValues = setCustomPollingValues;
+    /* @internal */
+    function createDynamicPriorityPollingWatchFile(host) {
+        var watchedFiles = [];
+        var changedFilesInLastPoll = [];
+        var lowPollingIntervalQueue = createPollingIntervalQueue(PollingInterval.Low);
+        var mediumPollingIntervalQueue = createPollingIntervalQueue(PollingInterval.Medium);
+        var highPollingIntervalQueue = createPollingIntervalQueue(PollingInterval.High);
+        return watchFile;
+        function watchFile(fileName, callback, defaultPollingInterval) {
+            var file = {
+                fileName: fileName,
+                callback: callback,
+                unchangedPolls: 0,
+                mtime: getModifiedTime(fileName)
+            };
+            watchedFiles.push(file);
+            addToPollingIntervalQueue(file, defaultPollingInterval);
+            return {
+                close: function () {
+                    file.isClosed = true;
+                    // Remove from watchedFiles
+                    ts.unorderedRemoveItem(watchedFiles, file);
+                    // Do not update polling interval queue since that will happen as part of polling
+                }
+            };
+        }
+        function createPollingIntervalQueue(pollingInterval) {
+            var queue = [];
+            queue.pollingInterval = pollingInterval;
+            queue.pollIndex = 0;
+            queue.pollScheduled = false;
+            return queue;
+        }
+        function pollPollingIntervalQueue(queue) {
+            queue.pollIndex = pollQueue(queue, queue.pollingInterval, queue.pollIndex, pollingChunkSize[queue.pollingInterval]);
+            // Set the next polling index and timeout
+            if (queue.length) {
+                scheduleNextPoll(queue.pollingInterval);
+            }
+            else {
+                ts.Debug.assert(queue.pollIndex === 0);
+                queue.pollScheduled = false;
+            }
+        }
+        function pollLowPollingIntervalQueue(queue) {
+            // Always poll complete list of changedFilesInLastPoll
+            pollQueue(changedFilesInLastPoll, PollingInterval.Low, /*pollIndex*/ 0, changedFilesInLastPoll.length);
+            // Finally do the actual polling of the queue
+            pollPollingIntervalQueue(queue);
+            // Schedule poll if there are files in changedFilesInLastPoll but no files in the actual queue
+            // as pollPollingIntervalQueue wont schedule for next poll
+            if (!queue.pollScheduled && changedFilesInLastPoll.length) {
+                scheduleNextPoll(PollingInterval.Low);
+            }
+        }
+        function pollQueue(queue, pollingInterval, pollIndex, chunkSize) {
+            // Max visit would be all elements of the queue
+            var needsVisit = queue.length;
+            var definedValueCopyToIndex = pollIndex;
+            for (var polled = 0; polled < chunkSize && needsVisit > 0; nextPollIndex(), needsVisit--) {
+                var watchedFile = queue[pollIndex];
+                if (!watchedFile) {
+                    continue;
+                }
+                else if (watchedFile.isClosed) {
+                    queue[pollIndex] = undefined;
+                    continue;
+                }
+                polled++;
+                var fileChanged = onWatchedFileStat(watchedFile, getModifiedTime(watchedFile.fileName));
+                if (watchedFile.isClosed) {
+                    // Closed watcher as part of callback
+                    queue[pollIndex] = undefined;
+                }
+                else if (fileChanged) {
+                    watchedFile.unchangedPolls = 0;
+                    // Changed files go to changedFilesInLastPoll queue
+                    if (queue !== changedFilesInLastPoll) {
+                        queue[pollIndex] = undefined;
+                        addChangedFileToLowPollingIntervalQueue(watchedFile);
+                    }
+                }
+                else if (watchedFile.unchangedPolls !== ts.unchangedPollThresholds[pollingInterval]) {
+                    watchedFile.unchangedPolls++;
+                }
+                else if (queue === changedFilesInLastPoll) {
+                    // Restart unchangedPollCount for unchanged file and move to low polling interval queue
+                    watchedFile.unchangedPolls = 1;
+                    queue[pollIndex] = undefined;
+                    addToPollingIntervalQueue(watchedFile, PollingInterval.Low);
+                }
+                else if (pollingInterval !== PollingInterval.High) {
+                    watchedFile.unchangedPolls++;
+                    queue[pollIndex] = undefined;
+                    addToPollingIntervalQueue(watchedFile, pollingInterval === PollingInterval.Low ? PollingInterval.Medium : PollingInterval.High);
+                }
+                if (queue[pollIndex]) {
+                    // Copy this file to the non hole location
+                    if (definedValueCopyToIndex < pollIndex) {
+                        queue[definedValueCopyToIndex] = watchedFile;
+                        queue[pollIndex] = undefined;
+                    }
+                    definedValueCopyToIndex++;
+                }
+            }
+            // Return next poll index
+            return pollIndex;
+            function nextPollIndex() {
+                pollIndex++;
+                if (pollIndex === queue.length) {
+                    if (definedValueCopyToIndex < pollIndex) {
+                        // There are holes from nextDefinedValueIndex to end of queue, change queue size
+                        queue.length = definedValueCopyToIndex;
+                    }
+                    pollIndex = 0;
+                    definedValueCopyToIndex = 0;
+                }
+            }
+        }
+        function pollingIntervalQueue(pollingInterval) {
+            switch (pollingInterval) {
+                case PollingInterval.Low:
+                    return lowPollingIntervalQueue;
+                case PollingInterval.Medium:
+                    return mediumPollingIntervalQueue;
+                case PollingInterval.High:
+                    return highPollingIntervalQueue;
+            }
+        }
+        function addToPollingIntervalQueue(file, pollingInterval) {
+            pollingIntervalQueue(pollingInterval).push(file);
+            scheduleNextPollIfNotAlreadyScheduled(pollingInterval);
+        }
+        function addChangedFileToLowPollingIntervalQueue(file) {
+            changedFilesInLastPoll.push(file);
+            scheduleNextPollIfNotAlreadyScheduled(PollingInterval.Low);
+        }
+        function scheduleNextPollIfNotAlreadyScheduled(pollingInterval) {
+            if (!pollingIntervalQueue(pollingInterval).pollScheduled) {
+                scheduleNextPoll(pollingInterval);
+            }
+        }
+        function scheduleNextPoll(pollingInterval) {
+            pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === PollingInterval.Low ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingIntervalQueue(pollingInterval));
+        }
+        function getModifiedTime(fileName) {
+            return host.getModifiedTime(fileName) || ts.missingFileModifiedTime;
+        }
+    }
+    ts.createDynamicPriorityPollingWatchFile = createDynamicPriorityPollingWatchFile;
+    /**
+     * Returns true if file status changed
+     */
+    /*@internal*/
+    function onWatchedFileStat(watchedFile, modifiedTime) {
+        var oldTime = watchedFile.mtime.getTime();
+        var newTime = modifiedTime.getTime();
+        if (oldTime !== newTime) {
+            watchedFile.mtime = modifiedTime;
+            watchedFile.callback(watchedFile.fileName, getFileWatcherEventKind(oldTime, newTime));
+            return true;
+        }
+        return false;
+    }
+    ts.onWatchedFileStat = onWatchedFileStat;
+    /*@internal*/
+    function getFileWatcherEventKind(oldTime, newTime) {
+        return oldTime === 0
+            ? FileWatcherEventKind.Created
+            : newTime === 0
+                ? FileWatcherEventKind.Deleted
+                : FileWatcherEventKind.Changed;
+    }
+    ts.getFileWatcherEventKind = getFileWatcherEventKind;
+    /**
+     * Watch the directory recursively using host provided method to watch child directories
+     * that means if this is recursive watcher, watch the children directories as well
+     * (eg on OS that dont support recursive watch using fs.watch use fs.watchFile)
+     */
+    /*@internal*/
+    function createRecursiveDirectoryWatcher(host) {
+        var cache = ts.createMap();
+        var callbackCache = ts.createMultiMap();
+        var filePathComparer = ts.getStringComparer(!host.useCaseSensitiveFileNames);
+        var toCanonicalFilePath = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames);
+        return createDirectoryWatcher;
+        /**
+         * Create the directory watcher for the dirPath.
+         */
+        function createDirectoryWatcher(dirName, callback) {
+            var dirPath = toCanonicalFilePath(dirName);
+            var directoryWatcher = cache.get(dirPath);
+            if (directoryWatcher) {
+                directoryWatcher.refCount++;
+            }
+            else {
+                directoryWatcher = {
+                    watcher: host.watchDirectory(dirName, function (fileName) {
+                        // Call the actual callback
+                        callbackCache.forEach(function (callbacks, rootDirName) {
+                            if (rootDirName === dirPath || (ts.startsWith(dirPath, rootDirName) && dirPath[rootDirName.length] === ts.directorySeparator)) {
+                                callbacks.forEach(function (callback) { return callback(fileName); });
+                            }
+                        });
+                        // Iterate through existing children and update the watches if needed
+                        updateChildWatches(dirName, dirPath);
+                    }),
+                    refCount: 1,
+                    childWatches: ts.emptyArray
+                };
+                cache.set(dirPath, directoryWatcher);
+                updateChildWatches(dirName, dirPath);
+            }
+            if (callback) {
+                callbackCache.add(dirPath, callback);
+            }
+            return {
+                dirName: dirName,
+                close: function () {
+                    var directoryWatcher = ts.Debug.assertDefined(cache.get(dirPath));
+                    if (callback)
+                        callbackCache.remove(dirPath, callback);
+                    directoryWatcher.refCount--;
+                    if (directoryWatcher.refCount)
+                        return;
+                    cache.delete(dirPath);
+                    ts.closeFileWatcherOf(directoryWatcher);
+                    directoryWatcher.childWatches.forEach(ts.closeFileWatcher);
+                }
+            };
+        }
+        function updateChildWatches(dirName, dirPath) {
+            // Iterate through existing children and update the watches if needed
+            var parentWatcher = cache.get(dirPath);
+            if (parentWatcher) {
+                parentWatcher.childWatches = watchChildDirectories(dirName, parentWatcher.childWatches);
+            }
+        }
+        /**
+         * Watch the directories in the parentDir
+         */
+        function watchChildDirectories(parentDir, existingChildWatches) {
+            var newChildWatches;
+            ts.enumerateInsertsAndDeletes(host.directoryExists(parentDir) ? ts.mapDefined(host.getAccessibleSortedChildDirectories(parentDir), function (child) {
+                var childFullName = ts.getNormalizedAbsolutePath(child, parentDir);
+                // Filter our the symbolic link directories since those arent included in recursive watch
+                // which is same behaviour when recursive: true is passed to fs.watch
+                return filePathComparer(childFullName, ts.normalizePath(host.realpath(childFullName))) === 0 /* EqualTo */ ? childFullName : undefined;
+            }) : ts.emptyArray, existingChildWatches, function (child, childWatcher) { return filePathComparer(child, childWatcher.dirName); }, createAndAddChildDirectoryWatcher, ts.closeFileWatcher, addChildDirectoryWatcher);
+            return newChildWatches || ts.emptyArray;
+            /**
+             * Create new childDirectoryWatcher and add it to the new ChildDirectoryWatcher list
+             */
+            function createAndAddChildDirectoryWatcher(childName) {
+                var result = createDirectoryWatcher(childName);
+                addChildDirectoryWatcher(result);
+            }
+            /**
+             * Add child directory watcher to the new ChildDirectoryWatcher list
+             */
+            function addChildDirectoryWatcher(childWatcher) {
+                (newChildWatches || (newChildWatches = [])).push(childWatcher);
+            }
+        }
+    }
+    ts.createRecursiveDirectoryWatcher = createRecursiveDirectoryWatcher;
+    function getNodeMajorVersion() {
+        if (typeof process === "undefined") {
+            return undefined;
+        }
+        var version = process.version;
+        if (!version) {
+            return undefined;
+        }
+        var dot = version.indexOf(".");
+        if (dot === -1) {
+            return undefined;
+        }
+        return parseInt(version.substring(1, dot));
+    }
+    ts.getNodeMajorVersion = getNodeMajorVersion;
+    // TODO: GH#18217 this is used as if it's certainly defined in many places.
+    ts.sys = (function () {
+        // NodeJS detects "\uFEFF" at the start of the string and *replaces* it with the actual
+        // byte order mark from the specified encoding. Using any other byte order mark does
+        // not actually work.
+        var byteOrderMarkIndicator = "\uFEFF";
+        function getNodeSystem() {
+            var _fs = require("fs");
+            var _path = require("path");
+            var _os = require("os");
+            // crypto can be absent on reduced node installations
+            var _crypto;
+            try {
+                _crypto = require("crypto");
+            }
+            catch (_a) {
+                _crypto = undefined;
+            }
+            var Buffer = require("buffer").Buffer;
+            var nodeVersion = getNodeMajorVersion();
+            var isNode4OrLater = nodeVersion >= 4;
+            var platform = _os.platform();
+            var useCaseSensitiveFileNames = isFileSystemCaseSensitive();
+            var FileSystemEntryKind;
+            (function (FileSystemEntryKind) {
+                FileSystemEntryKind[FileSystemEntryKind["File"] = 0] = "File";
+                FileSystemEntryKind[FileSystemEntryKind["Directory"] = 1] = "Directory";
+            })(FileSystemEntryKind || (FileSystemEntryKind = {}));
+            var useNonPollingWatchers = process.env.TSC_NONPOLLING_WATCHER;
+            var tscWatchFile = process.env.TSC_WATCHFILE;
+            var tscWatchDirectory = process.env.TSC_WATCHDIRECTORY;
+            var dynamicPollingWatchFile;
+            var nodeSystem = {
+                args: process.argv.slice(2),
+                newLine: _os.EOL,
+                useCaseSensitiveFileNames: useCaseSensitiveFileNames,
+                write: function (s) {
+                    process.stdout.write(s);
+                },
+                writeOutputIsTTY: function () {
+                    return process.stdout.isTTY;
+                },
+                readFile: readFile,
+                writeFile: writeFile,
+                watchFile: getWatchFile(),
+                watchDirectory: getWatchDirectory(),
+                resolvePath: function (path) { return _path.resolve(path); },
+                fileExists: fileExists,
+                directoryExists: directoryExists,
+                createDirectory: function (directoryName) {
+                    if (!nodeSystem.directoryExists(directoryName)) {
+                        _fs.mkdirSync(directoryName);
+                    }
+                },
+                getExecutingFilePath: function () {
+                    return __filename;
+                },
+                getCurrentDirectory: function () {
+                    return process.cwd();
+                },
+                getDirectories: getDirectories,
+                getEnvironmentVariable: function (name) {
+                    return process.env[name] || "";
+                },
+                readDirectory: readDirectory,
+                getModifiedTime: getModifiedTime,
+                setModifiedTime: setModifiedTime,
+                deleteFile: deleteFile,
+                createHash: _crypto ? createMD5HashUsingNativeCrypto : generateDjb2Hash,
+                createSHA256Hash: _crypto ? createSHA256Hash : undefined,
+                getMemoryUsage: function () {
+                    if (global.gc) {
+                        global.gc();
+                    }
+                    return process.memoryUsage().heapUsed;
+                },
+                getFileSize: function (path) {
+                    try {
+                        var stat = _fs.statSync(path);
+                        if (stat.isFile()) {
+                            return stat.size;
+                        }
+                    }
+                    catch ( /*ignore*/_a) { /*ignore*/ }
+                    return 0;
+                },
+                exit: function (exitCode) {
+                    process.exit(exitCode);
+                },
+                realpath: realpath,
+                debugMode: ts.some(process.execArgv, function (arg) { return /^--(inspect|debug)(-brk)?(=\d+)?$/i.test(arg); }),
+                tryEnableSourceMapsForHost: function () {
+                    try {
+                        require("source-map-support").install();
+                    }
+                    catch (_a) {
+                        // Could not enable source maps.
+                    }
+                },
+                setTimeout: setTimeout,
+                clearTimeout: clearTimeout,
+                clearScreen: function () {
+                    process.stdout.write("\x1Bc");
+                },
+                setBlocking: function () {
+                    if (process.stdout && process.stdout._handle && process.stdout._handle.setBlocking) {
+                        process.stdout._handle.setBlocking(true);
+                    }
+                },
+                bufferFrom: bufferFrom,
+                base64decode: function (input) { return bufferFrom(input, "base64").toString("utf8"); },
+                base64encode: function (input) { return bufferFrom(input).toString("base64"); },
+            };
+            return nodeSystem;
+            function bufferFrom(input, encoding) {
+                // See https://github.com/Microsoft/TypeScript/issues/25652
+                return Buffer.from && Buffer.from !== Int8Array.from
+                    ? Buffer.from(input, encoding)
+                    : new Buffer(input, encoding);
+            }
+            function isFileSystemCaseSensitive() {
+                // win32\win64 are case insensitive platforms
+                if (platform === "win32" || platform === "win64") {
+                    return false;
+                }
+                // If this file exists under a different case, we must be case-insensitve.
+                return !fileExists(swapCase(__filename));
+            }
+            /** Convert all lowercase chars to uppercase, and vice-versa */
+            function swapCase(s) {
+                return s.replace(/\w/g, function (ch) {
+                    var up = ch.toUpperCase();
+                    return ch === up ? ch.toLowerCase() : up;
+                });
+            }
+            function getWatchFile() {
+                switch (tscWatchFile) {
+                    case "PriorityPollingInterval":
+                        // Use polling interval based on priority when create watch using host.watchFile
+                        return fsWatchFile;
+                    case "DynamicPriorityPolling":
+                        // Use polling interval but change the interval depending on file changes and their default polling interval
+                        return createDynamicPriorityPollingWatchFile({ getModifiedTime: getModifiedTime, setTimeout: setTimeout });
+                    case "UseFsEvents":
+                        // Use notifications from FS to watch with falling back to fs.watchFile
+                        return watchFileUsingFsWatch;
+                    case "UseFsEventsWithFallbackDynamicPolling":
+                        // Use notifications from FS to watch with falling back to dynamic watch file
+                        dynamicPollingWatchFile = createDynamicPriorityPollingWatchFile({ getModifiedTime: getModifiedTime, setTimeout: setTimeout });
+                        return createWatchFileUsingDynamicWatchFile(dynamicPollingWatchFile);
+                    case "UseFsEventsOnParentDirectory":
+                        // Use notifications from FS to watch with falling back to fs.watchFile
+                        return createNonPollingWatchFile();
+                }
+                return useNonPollingWatchers ?
+                    createNonPollingWatchFile() :
+                    // Default to do not use polling interval as it is before this experiment branch
+                    function (fileName, callback) { return fsWatchFile(fileName, callback); };
+            }
+            function getWatchDirectory() {
+                // Node 4.0 `fs.watch` function supports the "recursive" option on both OSX and Windows
+                // (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
+                var fsSupportsRecursive = isNode4OrLater && (process.platform === "win32" || process.platform === "darwin");
+                if (fsSupportsRecursive) {
+                    return watchDirectoryUsingFsWatch;
+                }
+                var watchDirectory = tscWatchDirectory === "RecursiveDirectoryUsingFsWatchFile" ?
+                    createWatchDirectoryUsing(fsWatchFile) :
+                    tscWatchDirectory === "RecursiveDirectoryUsingDynamicPriorityPolling" ?
+                        createWatchDirectoryUsing(dynamicPollingWatchFile || createDynamicPriorityPollingWatchFile({ getModifiedTime: getModifiedTime, setTimeout: setTimeout })) :
+                        watchDirectoryUsingFsWatch;
+                var watchDirectoryRecursively = createRecursiveDirectoryWatcher({
+                    useCaseSensitiveFileNames: useCaseSensitiveFileNames,
+                    directoryExists: directoryExists,
+                    getAccessibleSortedChildDirectories: function (path) { return getAccessibleFileSystemEntries(path).directories; },
+                    watchDirectory: watchDirectory,
+                    realpath: realpath
+                });
+                return function (directoryName, callback, recursive) {
+                    if (recursive) {
+                        return watchDirectoryRecursively(directoryName, callback);
+                    }
+                    return watchDirectory(directoryName, callback);
+                };
+            }
+            function createNonPollingWatchFile() {
+                // One file can have multiple watchers
+                var fileWatcherCallbacks = ts.createMultiMap();
+                var dirWatchers = ts.createMap();
+                var toCanonicalName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
+                return nonPollingWatchFile;
+                function nonPollingWatchFile(fileName, callback) {
+                    var filePath = toCanonicalName(fileName);
+                    fileWatcherCallbacks.add(filePath, callback);
+                    var dirPath = ts.getDirectoryPath(filePath) || ".";
+                    var watcher = dirWatchers.get(dirPath) || createDirectoryWatcher(ts.getDirectoryPath(fileName) || ".", dirPath);
+                    watcher.referenceCount++;
+                    return {
+                        close: function () {
+                            if (watcher.referenceCount === 1) {
+                                watcher.close();
+                                dirWatchers.delete(dirPath);
+                            }
+                            else {
+                                watcher.referenceCount--;
+                            }
+                            fileWatcherCallbacks.remove(filePath, callback);
+                        }
+                    };
+                }
+                function createDirectoryWatcher(dirName, dirPath) {
+                    var watcher = fsWatchDirectory(dirName, function (_eventName, relativeFileName) {
+                        // When files are deleted from disk, the triggered "rename" event would have a relativefileName of "undefined"
+                        if (!ts.isString(relativeFileName)) {
+                            return;
+                        }
+                        var fileName = ts.getNormalizedAbsolutePath(relativeFileName, dirName);
+                        // Some applications save a working file via rename operations
+                        var callbacks = fileName && fileWatcherCallbacks.get(toCanonicalName(fileName));
+                        if (callbacks) {
+                            for (var _i = 0, callbacks_1 = callbacks; _i < callbacks_1.length; _i++) {
+                                var fileCallback = callbacks_1[_i];
+                                fileCallback(fileName, FileWatcherEventKind.Changed);
+                            }
+                        }
+                    });
+                    watcher.referenceCount = 0;
+                    dirWatchers.set(dirPath, watcher);
+                    return watcher;
+                }
+            }
+            function fsWatchFile(fileName, callback, pollingInterval) {
+                _fs.watchFile(fileName, { persistent: true, interval: pollingInterval || 250 }, fileChanged);
+                var eventKind;
+                return {
+                    close: function () { return _fs.unwatchFile(fileName, fileChanged); }
+                };
+                function fileChanged(curr, prev) {
+                    // previous event kind check is to ensure we recongnize the file as previously also missing when it is restored or renamed twice (that is it disappears and reappears)
+                    // In such case, prevTime returned is same as prev time of event when file was deleted as per node documentation
+                    var isPreviouslyDeleted = +prev.mtime === 0 || eventKind === FileWatcherEventKind.Deleted;
+                    if (+curr.mtime === 0) {
+                        if (isPreviouslyDeleted) {
+                            // Already deleted file, no need to callback again
+                            return;
+                        }
+                        eventKind = FileWatcherEventKind.Deleted;
+                    }
+                    else if (isPreviouslyDeleted) {
+                        eventKind = FileWatcherEventKind.Created;
+                    }
+                    // If there is no change in modified time, ignore the event
+                    else if (+curr.mtime === +prev.mtime) {
+                        return;
+                    }
+                    else {
+                        // File changed
+                        eventKind = FileWatcherEventKind.Changed;
+                    }
+                    callback(fileName, eventKind);
+                }
+            }
+            function createFileWatcherCallback(callback) {
+                return function (_fileName, eventKind) { return callback(eventKind === FileWatcherEventKind.Changed ? "change" : "rename", ""); };
+            }
+            function createFsWatchCallbackForFileWatcherCallback(fileName, callback) {
+                return function (eventName) {
+                    if (eventName === "rename") {
+                        callback(fileName, fileExists(fileName) ? FileWatcherEventKind.Created : FileWatcherEventKind.Deleted);
+                    }
+                    else {
+                        // Change
+                        callback(fileName, FileWatcherEventKind.Changed);
+                    }
+                };
+            }
+            function createFsWatchCallbackForDirectoryWatcherCallback(directoryName, callback) {
+                return function (eventName, relativeFileName) {
+                    // In watchDirectory we only care about adding and removing files (when event name is
+                    // "rename"); changes made within files are handled by corresponding fileWatchers (when
+                    // event name is "change")
+                    if (eventName === "rename") {
+                        // When deleting a file, the passed baseFileName is null
+                        callback(!relativeFileName ? directoryName : ts.normalizePath(ts.combinePaths(directoryName, relativeFileName)));
+                    }
+                };
+            }
+            function fsWatch(fileOrDirectory, entryKind, callback, recursive, fallbackPollingWatchFile, pollingInterval) {
+                var options;
+                /** Watcher for the file system entry depending on whether it is missing or present */
+                var watcher = !fileSystemEntryExists(fileOrDirectory, entryKind) ?
+                    watchMissingFileSystemEntry() :
+                    watchPresentFileSystemEntry();
+                return {
+                    close: function () {
+                        // Close the watcher (either existing file system entry watcher or missing file system entry watcher)
+                        watcher.close();
+                        watcher = undefined;
+                    }
+                };
+                /**
+                 * Invoke the callback with rename and update the watcher if not closed
+                 * @param createWatcher
+                 */
+                function invokeCallbackAndUpdateWatcher(createWatcher) {
+                    // Call the callback for current directory
+                    callback("rename", "");
+                    // If watcher is not closed, update it
+                    if (watcher) {
+                        watcher.close();
+                        watcher = createWatcher();
+                    }
+                }
+                /**
+                 * Watch the file or directory that is currently present
+                 * and when the watched file or directory is deleted, switch to missing file system entry watcher
+                 */
+                function watchPresentFileSystemEntry() {
+                    // Node 4.0 `fs.watch` function supports the "recursive" option on both OSX and Windows
+                    // (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
+                    if (options === undefined) {
+                        if (isNode4OrLater && (process.platform === "win32" || process.platform === "darwin")) {
+                            options = { persistent: true, recursive: !!recursive };
+                        }
+                        else {
+                            options = { persistent: true };
+                        }
+                    }
+                    try {
+                        var presentWatcher = _fs.watch(fileOrDirectory, options, callback);
+                        // Watch the missing file or directory or error
+                        presentWatcher.on("error", function () { return invokeCallbackAndUpdateWatcher(watchMissingFileSystemEntry); });
+                        return presentWatcher;
+                    }
+                    catch (e) {
+                        // Catch the exception and use polling instead
+                        // Eg. on linux the number of watches are limited and one could easily exhaust watches and the exception ENOSPC is thrown when creating watcher at that point
+                        // so instead of throwing error, use fs.watchFile
+                        return watchPresentFileSystemEntryWithFsWatchFile();
+                    }
+                }
+                /**
+                 * Watch the file or directory using fs.watchFile since fs.watch threw exception
+                 * Eg. on linux the number of watches are limited and one could easily exhaust watches and the exception ENOSPC is thrown when creating watcher at that point
+                 */
+                function watchPresentFileSystemEntryWithFsWatchFile() {
+                    return fallbackPollingWatchFile(fileOrDirectory, createFileWatcherCallback(callback), pollingInterval);
+                }
+                /**
+                 * Watch the file or directory that is missing
+                 * and switch to existing file or directory when the missing filesystem entry is created
+                 */
+                function watchMissingFileSystemEntry() {
+                    return fallbackPollingWatchFile(fileOrDirectory, function (_fileName, eventKind) {
+                        if (eventKind === FileWatcherEventKind.Created && fileSystemEntryExists(fileOrDirectory, entryKind)) {
+                            // Call the callback for current file or directory
+                            // For now it could be callback for the inner directory creation,
+                            // but just return current directory, better than current no-op
+                            invokeCallbackAndUpdateWatcher(watchPresentFileSystemEntry);
+                        }
+                    }, pollingInterval);
+                }
+            }
+            function watchFileUsingFsWatch(fileName, callback, pollingInterval) {
+                return fsWatch(fileName, 0 /* File */, createFsWatchCallbackForFileWatcherCallback(fileName, callback), /*recursive*/ false, fsWatchFile, pollingInterval);
+            }
+            function createWatchFileUsingDynamicWatchFile(watchFile) {
+                return function (fileName, callback, pollingInterval) { return fsWatch(fileName, 0 /* File */, createFsWatchCallbackForFileWatcherCallback(fileName, callback), /*recursive*/ false, watchFile, pollingInterval); };
+            }
+            function fsWatchDirectory(directoryName, callback, recursive) {
+                return fsWatch(directoryName, 1 /* Directory */, callback, !!recursive, fsWatchFile);
+            }
+            function watchDirectoryUsingFsWatch(directoryName, callback, recursive) {
+                return fsWatchDirectory(directoryName, createFsWatchCallbackForDirectoryWatcherCallback(directoryName, callback), recursive);
+            }
+            function createWatchDirectoryUsing(fsWatchFile) {
+                return function (directoryName, callback) { return fsWatchFile(directoryName, function () { return callback(directoryName); }, PollingInterval.Medium); };
+            }
+            function readFile(fileName, _encoding) {
+                if (!fileExists(fileName)) {
+                    return undefined;
+                }
+                var buffer = _fs.readFileSync(fileName);
+                var len = buffer.length;
+                if (len >= 2 && buffer[0] === 0xFE && buffer[1] === 0xFF) {
+                    // Big endian UTF-16 byte order mark detected. Since big endian is not supported by node.js,
+                    // flip all byte pairs and treat as little endian.
+                    len &= ~1; // Round down to a multiple of 2
+                    for (var i = 0; i < len; i += 2) {
+                        var temp = buffer[i];
+                        buffer[i] = buffer[i + 1];
+                        buffer[i + 1] = temp;
+                    }
+                    return buffer.toString("utf16le", 2);
+                }
+                if (len >= 2 && buffer[0] === 0xFF && buffer[1] === 0xFE) {
+                    // Little endian UTF-16 byte order mark detected
+                    return buffer.toString("utf16le", 2);
+                }
+                if (len >= 3 && buffer[0] === 0xEF && buffer[1] === 0xBB && buffer[2] === 0xBF) {
+                    // UTF-8 byte order mark detected
+                    return buffer.toString("utf8", 3);
+                }
+                // Default is UTF-8 with no byte order mark
+                return buffer.toString("utf8");
+            }
+            function writeFile(fileName, data, writeByteOrderMark) {
+                // If a BOM is required, emit one
+                if (writeByteOrderMark) {
+                    data = byteOrderMarkIndicator + data;
+                }
+                var fd;
+                try {
+                    fd = _fs.openSync(fileName, "w");
+                    _fs.writeSync(fd, data, /*position*/ undefined, "utf8");
+                }
+                finally {
+                    if (fd !== undefined) {
+                        _fs.closeSync(fd);
+                    }
+                }
+            }
+            function getAccessibleFileSystemEntries(path) {
+                try {
+                    var entries = _fs.readdirSync(path || ".").sort();
+                    var files = [];
+                    var directories = [];
+                    for (var _i = 0, entries_2 = entries; _i < entries_2.length; _i++) {
+                        var entry = entries_2[_i];
+                        // This is necessary because on some file system node fails to exclude
+                        // "." and "..". See https://github.com/nodejs/node/issues/4002
+                        if (entry === "." || entry === "..") {
+                            continue;
+                        }
+                        var name = ts.combinePaths(path, entry);
+                        var stat = void 0;
+                        try {
+                            stat = _fs.statSync(name);
+                        }
+                        catch (e) {
+                            continue;
+                        }
+                        if (stat.isFile()) {
+                            files.push(entry);
+                        }
+                        else if (stat.isDirectory()) {
+                            directories.push(entry);
+                        }
+                    }
+                    return { files: files, directories: directories };
+                }
+                catch (e) {
+                    return ts.emptyFileSystemEntries;
+                }
+            }
+            function readDirectory(path, extensions, excludes, includes, depth) {
+                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries);
+            }
+            function fileSystemEntryExists(path, entryKind) {
+                try {
+                    var stat = _fs.statSync(path);
+                    switch (entryKind) {
+                        case 0 /* File */: return stat.isFile();
+                        case 1 /* Directory */: return stat.isDirectory();
+                        default: return false;
+                    }
+                }
+                catch (e) {
+                    return false;
+                }
+            }
+            function fileExists(path) {
+                return fileSystemEntryExists(path, 0 /* File */);
+            }
+            function directoryExists(path) {
+                return fileSystemEntryExists(path, 1 /* Directory */);
+            }
+            function getDirectories(path) {
+                return ts.filter(_fs.readdirSync(path), function (dir) { return fileSystemEntryExists(ts.combinePaths(path, dir), 1 /* Directory */); });
+            }
+            function realpath(path) {
+                try {
+                    return _fs.realpathSync(path);
+                }
+                catch (_a) {
+                    return path;
+                }
+            }
+            function getModifiedTime(path) {
+                try {
+                    return _fs.statSync(path).mtime;
+                }
+                catch (e) {
+                    return undefined;
+                }
+            }
+            function setModifiedTime(path, time) {
+                try {
+                    _fs.utimesSync(path, time, time);
+                }
+                catch (e) {
+                    return;
+                }
+            }
+            function deleteFile(path) {
+                try {
+                    return _fs.unlinkSync(path);
+                }
+                catch (e) {
+                    return;
+                }
+            }
+            function createMD5HashUsingNativeCrypto(data) {
+                var hash = _crypto.createHash("md5");
+                hash.update(data);
+                return hash.digest("hex");
+            }
+            function createSHA256Hash(data) {
+                var hash = _crypto.createHash("sha256");
+                hash.update(data);
+                return hash.digest("hex");
+            }
+        }
+        function getChakraSystem() {
+            var realpath = ChakraHost.realpath && (function (path) { return ChakraHost.realpath(path); });
+            return {
+                newLine: ChakraHost.newLine || "\r\n",
+                args: ChakraHost.args,
+                useCaseSensitiveFileNames: !!ChakraHost.useCaseSensitiveFileNames,
+                write: ChakraHost.echo,
+                readFile: function (path, _encoding) {
+                    // encoding is automatically handled by the implementation in ChakraHost
+                    return ChakraHost.readFile(path);
+                },
+                writeFile: function (path, data, writeByteOrderMark) {
+                    // If a BOM is required, emit one
+                    if (writeByteOrderMark) {
+                        data = byteOrderMarkIndicator + data;
+                    }
+                    ChakraHost.writeFile(path, data);
+                },
+                resolvePath: ChakraHost.resolvePath,
+                fileExists: ChakraHost.fileExists,
+                deleteFile: ChakraHost.deleteFile,
+                getModifiedTime: ChakraHost.getModifiedTime,
+                setModifiedTime: ChakraHost.setModifiedTime,
+                directoryExists: ChakraHost.directoryExists,
+                createDirectory: ChakraHost.createDirectory,
+                getExecutingFilePath: function () { return ChakraHost.executingFile; },
+                getCurrentDirectory: function () { return ChakraHost.currentDirectory; },
+                getDirectories: ChakraHost.getDirectories,
+                getEnvironmentVariable: ChakraHost.getEnvironmentVariable || (function () { return ""; }),
+                readDirectory: function (path, extensions, excludes, includes, _depth) {
+                    var pattern = ts.getFileMatcherPatterns(path, excludes, includes, !!ChakraHost.useCaseSensitiveFileNames, ChakraHost.currentDirectory);
+                    return ChakraHost.readDirectory(path, extensions, pattern.basePaths, pattern.excludePattern, pattern.includeFilePattern, pattern.includeDirectoryPattern);
+                },
+                exit: ChakraHost.quit,
+                realpath: realpath
+            };
+        }
+        function recursiveCreateDirectory(directoryPath, sys) {
+            var basePath = ts.getDirectoryPath(directoryPath);
+            var shouldCreateParent = basePath !== "" && directoryPath !== basePath && !sys.directoryExists(basePath);
+            if (shouldCreateParent) {
+                recursiveCreateDirectory(basePath, sys);
+            }
+            if (shouldCreateParent || !sys.directoryExists(directoryPath)) {
+                sys.createDirectory(directoryPath);
+            }
+        }
+        var sys;
+        if (typeof ChakraHost !== "undefined") {
+            sys = getChakraSystem();
+        }
+        else if (typeof process !== "undefined" && process.nextTick && !process.browser && typeof require !== "undefined") {
+            // process and process.nextTick checks if current environment is node-like
+            // process.browser check excludes webpack and browserify
+            sys = getNodeSystem();
+        }
+        if (sys) {
+            // patch writefile to create folder before writing the file
+            var originalWriteFile_1 = sys.writeFile;
+            sys.writeFile = function (path, data, writeBom) {
+                var directoryPath = ts.getDirectoryPath(ts.normalizeSlashes(path));
+                if (directoryPath && !sys.directoryExists(directoryPath)) {
+                    recursiveCreateDirectory(directoryPath, sys);
+                }
+                originalWriteFile_1.call(sys, path, data, writeBom);
+            };
+        }
+        return sys;
+    })();
+    if (ts.sys && ts.sys.getEnvironmentVariable) {
+        setCustomPollingValues(ts.sys);
+        ts.Debug.currentAssertionLevel = /^development$/i.test(ts.sys.getEnvironmentVariable("NODE_ENV"))
+            ? 1 /* Normal */
+            : 0 /* None */;
+    }
+    if (ts.sys && ts.sys.debugMode) {
+        ts.Debug.isDebugging = true;
+    }
+})(ts || (ts = {}));
+// <auto-generated />
+// generated from './diagnosticInformationMap.generated.ts' by 'src/compiler'
+/* @internal */
+var ts;
+(function (ts) {
+    function diag(code, category, key, message, reportsUnnecessary) {
+        return { code: code, category: category, key: key, message: message, reportsUnnecessary: reportsUnnecessary };
+    }
+    // tslint:disable-next-line variable-name
+    ts.Diagnostics = {
+        Unterminated_string_literal: diag(1002, ts.DiagnosticCategory.Error, "Unterminated_string_literal_1002", "Unterminated string literal."),
+        Identifier_expected: diag(1003, ts.DiagnosticCategory.Error, "Identifier_expected_1003", "Identifier expected."),
+        _0_expected: diag(1005, ts.DiagnosticCategory.Error, "_0_expected_1005", "'{0}' expected."),
+        A_file_cannot_have_a_reference_to_itself: diag(1006, ts.DiagnosticCategory.Error, "A_file_cannot_have_a_reference_to_itself_1006", "A file cannot have a reference to itself."),
+        Trailing_comma_not_allowed: diag(1009, ts.DiagnosticCategory.Error, "Trailing_comma_not_allowed_1009", "Trailing comma not allowed."),
+        Asterisk_Slash_expected: diag(1010, ts.DiagnosticCategory.Error, "Asterisk_Slash_expected_1010", "'*/' expected."),
+        An_element_access_expression_should_take_an_argument: diag(1011, ts.DiagnosticCategory.Error, "An_element_access_expression_should_take_an_argument_1011", "An element access expression should take an argument."),
+        Unexpected_token: diag(1012, ts.DiagnosticCategory.Error, "Unexpected_token_1012", "Unexpected token."),
+        A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma: diag(1013, ts.DiagnosticCategory.Error, "A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma_1013", "A rest parameter or binding pattern may not have a trailing comma."),
+        A_rest_parameter_must_be_last_in_a_parameter_list: diag(1014, ts.DiagnosticCategory.Error, "A_rest_parameter_must_be_last_in_a_parameter_list_1014", "A rest parameter must be last in a parameter list."),
+        Parameter_cannot_have_question_mark_and_initializer: diag(1015, ts.DiagnosticCategory.Error, "Parameter_cannot_have_question_mark_and_initializer_1015", "Parameter cannot have question mark and initializer."),
+        A_required_parameter_cannot_follow_an_optional_parameter: diag(1016, ts.DiagnosticCategory.Error, "A_required_parameter_cannot_follow_an_optional_parameter_1016", "A required parameter cannot follow an optional parameter."),
+        An_index_signature_cannot_have_a_rest_parameter: diag(1017, ts.DiagnosticCategory.Error, "An_index_signature_cannot_have_a_rest_parameter_1017", "An index signature cannot have a rest parameter."),
+        An_index_signature_parameter_cannot_have_an_accessibility_modifier: diag(1018, ts.DiagnosticCategory.Error, "An_index_signature_parameter_cannot_have_an_accessibility_modifier_1018", "An index signature parameter cannot have an accessibility modifier."),
+        An_index_signature_parameter_cannot_have_a_question_mark: diag(1019, ts.DiagnosticCategory.Error, "An_index_signature_parameter_cannot_have_a_question_mark_1019", "An index signature parameter cannot have a question mark."),
+        An_index_signature_parameter_cannot_have_an_initializer: diag(1020, ts.DiagnosticCategory.Error, "An_index_signature_parameter_cannot_have_an_initializer_1020", "An index signature parameter cannot have an initializer."),
+        An_index_signature_must_have_a_type_annotation: diag(1021, ts.DiagnosticCategory.Error, "An_index_signature_must_have_a_type_annotation_1021", "An index signature must have a type annotation."),
+        An_index_signature_parameter_must_have_a_type_annotation: diag(1022, ts.DiagnosticCategory.Error, "An_index_signature_parameter_must_have_a_type_annotation_1022", "An index signature parameter must have a type annotation."),
+        An_index_signature_parameter_type_must_be_string_or_number: diag(1023, ts.DiagnosticCategory.Error, "An_index_signature_parameter_type_must_be_string_or_number_1023", "An index signature parameter type must be 'string' or 'number'."),
+        readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature: diag(1024, ts.DiagnosticCategory.Error, "readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature_1024", "'readonly' modifier can only appear on a property declaration or index signature."),
+        Accessibility_modifier_already_seen: diag(1028, ts.DiagnosticCategory.Error, "Accessibility_modifier_already_seen_1028", "Accessibility modifier already seen."),
+        _0_modifier_must_precede_1_modifier: diag(1029, ts.DiagnosticCategory.Error, "_0_modifier_must_precede_1_modifier_1029", "'{0}' modifier must precede '{1}' modifier."),
+        _0_modifier_already_seen: diag(1030, ts.DiagnosticCategory.Error, "_0_modifier_already_seen_1030", "'{0}' modifier already seen."),
+        _0_modifier_cannot_appear_on_a_class_element: diag(1031, ts.DiagnosticCategory.Error, "_0_modifier_cannot_appear_on_a_class_element_1031", "'{0}' modifier cannot appear on a class element."),
+        super_must_be_followed_by_an_argument_list_or_member_access: diag(1034, ts.DiagnosticCategory.Error, "super_must_be_followed_by_an_argument_list_or_member_access_1034", "'super' must be followed by an argument list or member access."),
+        Only_ambient_modules_can_use_quoted_names: diag(1035, ts.DiagnosticCategory.Error, "Only_ambient_modules_can_use_quoted_names_1035", "Only ambient modules can use quoted names."),
+        Statements_are_not_allowed_in_ambient_contexts: diag(1036, ts.DiagnosticCategory.Error, "Statements_are_not_allowed_in_ambient_contexts_1036", "Statements are not allowed in ambient contexts."),
+        A_declare_modifier_cannot_be_used_in_an_already_ambient_context: diag(1038, ts.DiagnosticCategory.Error, "A_declare_modifier_cannot_be_used_in_an_already_ambient_context_1038", "A 'declare' modifier cannot be used in an already ambient context."),
+        Initializers_are_not_allowed_in_ambient_contexts: diag(1039, ts.DiagnosticCategory.Error, "Initializers_are_not_allowed_in_ambient_contexts_1039", "Initializers are not allowed in ambient contexts."),
+        _0_modifier_cannot_be_used_in_an_ambient_context: diag(1040, ts.DiagnosticCategory.Error, "_0_modifier_cannot_be_used_in_an_ambient_context_1040", "'{0}' modifier cannot be used in an ambient context."),
+        _0_modifier_cannot_be_used_with_a_class_declaration: diag(1041, ts.DiagnosticCategory.Error, "_0_modifier_cannot_be_used_with_a_class_declaration_1041", "'{0}' modifier cannot be used with a class declaration."),
+        _0_modifier_cannot_be_used_here: diag(1042, ts.DiagnosticCategory.Error, "_0_modifier_cannot_be_used_here_1042", "'{0}' modifier cannot be used here."),
+        _0_modifier_cannot_appear_on_a_data_property: diag(1043, ts.DiagnosticCategory.Error, "_0_modifier_cannot_appear_on_a_data_property_1043", "'{0}' modifier cannot appear on a data property."),
+        _0_modifier_cannot_appear_on_a_module_or_namespace_element: diag(1044, ts.DiagnosticCategory.Error, "_0_modifier_cannot_appear_on_a_module_or_namespace_element_1044", "'{0}' modifier cannot appear on a module or namespace element."),
+        A_0_modifier_cannot_be_used_with_an_interface_declaration: diag(1045, ts.DiagnosticCategory.Error, "A_0_modifier_cannot_be_used_with_an_interface_declaration_1045", "A '{0}' modifier cannot be used with an interface declaration."),
+        A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: diag(1046, ts.DiagnosticCategory.Error, "A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file_1046", "A 'declare' modifier is required for a top level declaration in a .d.ts file."),
+        A_rest_parameter_cannot_be_optional: diag(1047, ts.DiagnosticCategory.Error, "A_rest_parameter_cannot_be_optional_1047", "A rest parameter cannot be optional."),
+        A_rest_parameter_cannot_have_an_initializer: diag(1048, ts.DiagnosticCategory.Error, "A_rest_parameter_cannot_have_an_initializer_1048", "A rest parameter cannot have an initializer."),
+        A_set_accessor_must_have_exactly_one_parameter: diag(1049, ts.DiagnosticCategory.Error, "A_set_accessor_must_have_exactly_one_parameter_1049", "A 'set' accessor must have exactly one parameter."),
+        A_set_accessor_cannot_have_an_optional_parameter: diag(1051, ts.DiagnosticCategory.Error, "A_set_accessor_cannot_have_an_optional_parameter_1051", "A 'set' accessor cannot have an optional parameter."),
+        A_set_accessor_parameter_cannot_have_an_initializer: diag(1052, ts.DiagnosticCategory.Error, "A_set_accessor_parameter_cannot_have_an_initializer_1052", "A 'set' accessor parameter cannot have an initializer."),
+        A_set_accessor_cannot_have_rest_parameter: diag(1053, ts.DiagnosticCategory.Error, "A_set_accessor_cannot_have_rest_parameter_1053", "A 'set' accessor cannot have rest parameter."),
+        A_get_accessor_cannot_have_parameters: diag(1054, ts.DiagnosticCategory.Error, "A_get_accessor_cannot_have_parameters_1054", "A 'get' accessor cannot have parameters."),
+        Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value: diag(1055, ts.DiagnosticCategory.Error, "Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Prom_1055", "Type '{0}' is not a valid async function return type in ES5/ES3 because it does not refer to a Promise-compatible constructor value."),
+        Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher: diag(1056, ts.DiagnosticCategory.Error, "Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher_1056", "Accessors are only available when targeting ECMAScript 5 and higher."),
+        An_async_function_or_method_must_have_a_valid_awaitable_return_type: diag(1057, ts.DiagnosticCategory.Error, "An_async_function_or_method_must_have_a_valid_awaitable_return_type_1057", "An async function or method must have a valid awaitable return type."),
+        The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member: diag(1058, ts.DiagnosticCategory.Error, "The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_t_1058", "The return type of an async function must either be a valid promise or must not contain a callable 'then' member."),
+        A_promise_must_have_a_then_method: diag(1059, ts.DiagnosticCategory.Error, "A_promise_must_have_a_then_method_1059", "A promise must have a 'then' method."),
+        The_first_parameter_of_the_then_method_of_a_promise_must_be_a_callback: diag(1060, ts.DiagnosticCategory.Error, "The_first_parameter_of_the_then_method_of_a_promise_must_be_a_callback_1060", "The first parameter of the 'then' method of a promise must be a callback."),
+        Enum_member_must_have_initializer: diag(1061, ts.DiagnosticCategory.Error, "Enum_member_must_have_initializer_1061", "Enum member must have initializer."),
+        Type_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method: diag(1062, ts.DiagnosticCategory.Error, "Type_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method_1062", "Type is referenced directly or indirectly in the fulfillment callback of its own 'then' method."),
+        An_export_assignment_cannot_be_used_in_a_namespace: diag(1063, ts.DiagnosticCategory.Error, "An_export_assignment_cannot_be_used_in_a_namespace_1063", "An export assignment cannot be used in a namespace."),
+        The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type: diag(1064, ts.DiagnosticCategory.Error, "The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_1064", "The return type of an async function or method must be the global Promise<T> type."),
+        In_ambient_enum_declarations_member_initializer_must_be_constant_expression: diag(1066, ts.DiagnosticCategory.Error, "In_ambient_enum_declarations_member_initializer_must_be_constant_expression_1066", "In ambient enum declarations member initializer must be constant expression."),
+        Unexpected_token_A_constructor_method_accessor_or_property_was_expected: diag(1068, ts.DiagnosticCategory.Error, "Unexpected_token_A_constructor_method_accessor_or_property_was_expected_1068", "Unexpected token. A constructor, method, accessor, or property was expected."),
+        Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces: diag(1069, ts.DiagnosticCategory.Error, "Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces_1069", "Unexpected token. A type parameter name was expected without curly braces."),
+        _0_modifier_cannot_appear_on_a_type_member: diag(1070, ts.DiagnosticCategory.Error, "_0_modifier_cannot_appear_on_a_type_member_1070", "'{0}' modifier cannot appear on a type member."),
+        _0_modifier_cannot_appear_on_an_index_signature: diag(1071, ts.DiagnosticCategory.Error, "_0_modifier_cannot_appear_on_an_index_signature_1071", "'{0}' modifier cannot appear on an index signature."),
+        A_0_modifier_cannot_be_used_with_an_import_declaration: diag(1079, ts.DiagnosticCategory.Error, "A_0_modifier_cannot_be_used_with_an_import_declaration_1079", "A '{0}' modifier cannot be used with an import declaration."),
+        Invalid_reference_directive_syntax: diag(1084, ts.DiagnosticCategory.Error, "Invalid_reference_directive_syntax_1084", "Invalid 'reference' directive syntax."),
+        Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher_Use_the_syntax_0: diag(1085, ts.DiagnosticCategory.Error, "Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher_Use_the_syntax_0_1085", "Octal literals are not available when targeting ECMAScript 5 and higher. Use the syntax '{0}'."),
+        An_accessor_cannot_be_declared_in_an_ambient_context: diag(1086, ts.DiagnosticCategory.Error, "An_accessor_cannot_be_declared_in_an_ambient_context_1086", "An accessor cannot be declared in an ambient context."),
+        _0_modifier_cannot_appear_on_a_constructor_declaration: diag(1089, ts.DiagnosticCategory.Error, "_0_modifier_cannot_appear_on_a_constructor_declaration_1089", "'{0}' modifier cannot appear on a constructor declaration."),
+        _0_modifier_cannot_appear_on_a_parameter: diag(1090, ts.DiagnosticCategory.Error, "_0_modifier_cannot_appear_on_a_parameter_1090", "'{0}' modifier cannot appear on a parameter."),
+        Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement: diag(1091, ts.DiagnosticCategory.Error, "Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement_1091", "Only a single variable declaration is allowed in a 'for...in' statement."),
+        Type_parameters_cannot_appear_on_a_constructor_declaration: diag(1092, ts.DiagnosticCategory.Error, "Type_parameters_cannot_appear_on_a_constructor_declaration_1092", "Type parameters cannot appear on a constructor declaration."),
+        Type_annotation_cannot_appear_on_a_constructor_declaration: diag(1093, ts.DiagnosticCategory.Error, "Type_annotation_cannot_appear_on_a_constructor_declaration_1093", "Type annotation cannot appear on a constructor declaration."),
+        An_accessor_cannot_have_type_parameters: diag(1094, ts.DiagnosticCategory.Error, "An_accessor_cannot_have_type_parameters_1094", "An accessor cannot have type parameters."),
+        A_set_accessor_cannot_have_a_return_type_annotation: diag(1095, ts.DiagnosticCategory.Error, "A_set_accessor_cannot_have_a_return_type_annotation_1095", "A 'set' accessor cannot have a return type annotation."),
+        An_index_signature_must_have_exactly_one_parameter: diag(1096, ts.DiagnosticCategory.Error, "An_index_signature_must_have_exactly_one_parameter_1096", "An index signature must have exactly one parameter."),
+        _0_list_cannot_be_empty: diag(1097, ts.DiagnosticCategory.Error, "_0_list_cannot_be_empty_1097", "'{0}' list cannot be empty."),
+        Type_parameter_list_cannot_be_empty: diag(1098, ts.DiagnosticCategory.Error, "Type_parameter_list_cannot_be_empty_1098", "Type parameter list cannot be empty."),
+        Type_argument_list_cannot_be_empty: diag(1099, ts.DiagnosticCategory.Error, "Type_argument_list_cannot_be_empty_1099", "Type argument list cannot be empty."),
+        Invalid_use_of_0_in_strict_mode: diag(1100, ts.DiagnosticCategory.Error, "Invalid_use_of_0_in_strict_mode_1100", "Invalid use of '{0}' in strict mode."),
+        with_statements_are_not_allowed_in_strict_mode: diag(1101, ts.DiagnosticCategory.Error, "with_statements_are_not_allowed_in_strict_mode_1101", "'with' statements are not allowed in strict mode."),
+        delete_cannot_be_called_on_an_identifier_in_strict_mode: diag(1102, ts.DiagnosticCategory.Error, "delete_cannot_be_called_on_an_identifier_in_strict_mode_1102", "'delete' cannot be called on an identifier in strict mode."),
+        A_for_await_of_statement_is_only_allowed_within_an_async_function_or_async_generator: diag(1103, ts.DiagnosticCategory.Error, "A_for_await_of_statement_is_only_allowed_within_an_async_function_or_async_generator_1103", "A 'for-await-of' statement is only allowed within an async function or async generator."),
+        A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement: diag(1104, ts.DiagnosticCategory.Error, "A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement_1104", "A 'continue' statement can only be used within an enclosing iteration statement."),
+        A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement: diag(1105, ts.DiagnosticCategory.Error, "A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement_1105", "A 'break' statement can only be used within an enclosing iteration or switch statement."),
+        Jump_target_cannot_cross_function_boundary: diag(1107, ts.DiagnosticCategory.Error, "Jump_target_cannot_cross_function_boundary_1107", "Jump target cannot cross function boundary."),
+        A_return_statement_can_only_be_used_within_a_function_body: diag(1108, ts.DiagnosticCategory.Error, "A_return_statement_can_only_be_used_within_a_function_body_1108", "A 'return' statement can only be used within a function body."),
+        Expression_expected: diag(1109, ts.DiagnosticCategory.Error, "Expression_expected_1109", "Expression expected."),
+        Type_expected: diag(1110, ts.DiagnosticCategory.Error, "Type_expected_1110", "Type expected."),
+        A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: diag(1113, ts.DiagnosticCategory.Error, "A_default_clause_cannot_appear_more_than_once_in_a_switch_statement_1113", "A 'default' clause cannot appear more than once in a 'switch' statement."),
+        Duplicate_label_0: diag(1114, ts.DiagnosticCategory.Error, "Duplicate_label_0_1114", "Duplicate label '{0}'."),
+        A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement: diag(1115, ts.DiagnosticCategory.Error, "A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement_1115", "A 'continue' statement can only jump to a label of an enclosing iteration statement."),
+        A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement: diag(1116, ts.DiagnosticCategory.Error, "A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement_1116", "A 'break' statement can only jump to a label of an enclosing statement."),
+        An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode: diag(1117, ts.DiagnosticCategory.Error, "An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode_1117", "An object literal cannot have multiple properties with the same name in strict mode."),
+        An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name: diag(1118, ts.DiagnosticCategory.Error, "An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name_1118", "An object literal cannot have multiple get/set accessors with the same name."),
+        An_object_literal_cannot_have_property_and_accessor_with_the_same_name: diag(1119, ts.DiagnosticCategory.Error, "An_object_literal_cannot_have_property_and_accessor_with_the_same_name_1119", "An object literal cannot have property and accessor with the same name."),
+        An_export_assignment_cannot_have_modifiers: diag(1120, ts.DiagnosticCategory.Error, "An_export_assignment_cannot_have_modifiers_1120", "An export assignment cannot have modifiers."),
+        Octal_literals_are_not_allowed_in_strict_mode: diag(1121, ts.DiagnosticCategory.Error, "Octal_literals_are_not_allowed_in_strict_mode_1121", "Octal literals are not allowed in strict mode."),
+        Variable_declaration_list_cannot_be_empty: diag(1123, ts.DiagnosticCategory.Error, "Variable_declaration_list_cannot_be_empty_1123", "Variable declaration list cannot be empty."),
+        Digit_expected: diag(1124, ts.DiagnosticCategory.Error, "Digit_expected_1124", "Digit expected."),
+        Hexadecimal_digit_expected: diag(1125, ts.DiagnosticCategory.Error, "Hexadecimal_digit_expected_1125", "Hexadecimal digit expected."),
+        Unexpected_end_of_text: diag(1126, ts.DiagnosticCategory.Error, "Unexpected_end_of_text_1126", "Unexpected end of text."),
+        Invalid_character: diag(1127, ts.DiagnosticCategory.Error, "Invalid_character_1127", "Invalid character."),
+        Declaration_or_statement_expected: diag(1128, ts.DiagnosticCategory.Error, "Declaration_or_statement_expected_1128", "Declaration or statement expected."),
+        Statement_expected: diag(1129, ts.DiagnosticCategory.Error, "Statement_expected_1129", "Statement expected."),
+        case_or_default_expected: diag(1130, ts.DiagnosticCategory.Error, "case_or_default_expected_1130", "'case' or 'default' expected."),
+        Property_or_signature_expected: diag(1131, ts.DiagnosticCategory.Error, "Property_or_signature_expected_1131", "Property or signature expected."),
+        Enum_member_expected: diag(1132, ts.DiagnosticCategory.Error, "Enum_member_expected_1132", "Enum member expected."),
+        Variable_declaration_expected: diag(1134, ts.DiagnosticCategory.Error, "Variable_declaration_expected_1134", "Variable declaration expected."),
+        Argument_expression_expected: diag(1135, ts.DiagnosticCategory.Error, "Argument_expression_expected_1135", "Argument expression expected."),
+        Property_assignment_expected: diag(1136, ts.DiagnosticCategory.Error, "Property_assignment_expected_1136", "Property assignment expected."),
+        Expression_or_comma_expected: diag(1137, ts.DiagnosticCategory.Error, "Expression_or_comma_expected_1137", "Expression or comma expected."),
+        Parameter_declaration_expected: diag(1138, ts.DiagnosticCategory.Error, "Parameter_declaration_expected_1138", "Parameter declaration expected."),
+        Type_parameter_declaration_expected: diag(1139, ts.DiagnosticCategory.Error, "Type_parameter_declaration_expected_1139", "Type parameter declaration expected."),
+        Type_argument_expected: diag(1140, ts.DiagnosticCategory.Error, "Type_argument_expected_1140", "Type argument expected."),
+        String_literal_expected: diag(1141, ts.DiagnosticCategory.Error, "String_literal_expected_1141", "String literal expected."),
+        Line_break_not_permitted_here: diag(1142, ts.DiagnosticCategory.Error, "Line_break_not_permitted_here_1142", "Line break not permitted here."),
+        or_expected: diag(1144, ts.DiagnosticCategory.Error, "or_expected_1144", "'{' or ';' expected."),
+        Declaration_expected: diag(1146, ts.DiagnosticCategory.Error, "Declaration_expected_1146", "Declaration expected."),
+        Import_declarations_in_a_namespace_cannot_reference_a_module: diag(1147, ts.DiagnosticCategory.Error, "Import_declarations_in_a_namespace_cannot_reference_a_module_1147", "Import declarations in a namespace cannot reference a module."),
+        Cannot_use_imports_exports_or_module_augmentations_when_module_is_none: diag(1148, ts.DiagnosticCategory.Error, "Cannot_use_imports_exports_or_module_augmentations_when_module_is_none_1148", "Cannot use imports, exports, or module augmentations when '--module' is 'none'."),
+        File_name_0_differs_from_already_included_file_name_1_only_in_casing: diag(1149, ts.DiagnosticCategory.Error, "File_name_0_differs_from_already_included_file_name_1_only_in_casing_1149", "File name '{0}' differs from already included file name '{1}' only in casing."),
+        new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead: diag(1150, ts.DiagnosticCategory.Error, "new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead_1150", "'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead."),
+        const_declarations_must_be_initialized: diag(1155, ts.DiagnosticCategory.Error, "const_declarations_must_be_initialized_1155", "'const' declarations must be initialized."),
+        const_declarations_can_only_be_declared_inside_a_block: diag(1156, ts.DiagnosticCategory.Error, "const_declarations_can_only_be_declared_inside_a_block_1156", "'const' declarations can only be declared inside a block."),
+        let_declarations_can_only_be_declared_inside_a_block: diag(1157, ts.DiagnosticCategory.Error, "let_declarations_can_only_be_declared_inside_a_block_1157", "'let' declarations can only be declared inside a block."),
+        Unterminated_template_literal: diag(1160, ts.DiagnosticCategory.Error, "Unterminated_template_literal_1160", "Unterminated template literal."),
+        Unterminated_regular_expression_literal: diag(1161, ts.DiagnosticCategory.Error, "Unterminated_regular_expression_literal_1161", "Unterminated regular expression literal."),
+        An_object_member_cannot_be_declared_optional: diag(1162, ts.DiagnosticCategory.Error, "An_object_member_cannot_be_declared_optional_1162", "An object member cannot be declared optional."),
+        A_yield_expression_is_only_allowed_in_a_generator_body: diag(1163, ts.DiagnosticCategory.Error, "A_yield_expression_is_only_allowed_in_a_generator_body_1163", "A 'yield' expression is only allowed in a generator body."),
+        Computed_property_names_are_not_allowed_in_enums: diag(1164, ts.DiagnosticCategory.Error, "Computed_property_names_are_not_allowed_in_enums_1164", "Computed property names are not allowed in enums."),
+        A_computed_property_name_in_an_ambient_context_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type: diag(1165, ts.DiagnosticCategory.Error, "A_computed_property_name_in_an_ambient_context_must_refer_to_an_expression_whose_type_is_a_literal_t_1165", "A computed property name in an ambient context must refer to an expression whose type is a literal type or a 'unique symbol' type."),
+        A_computed_property_name_in_a_class_property_declaration_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type: diag(1166, ts.DiagnosticCategory.Error, "A_computed_property_name_in_a_class_property_declaration_must_refer_to_an_expression_whose_type_is_a_1166", "A computed property name in a class property declaration must refer to an expression whose type is a literal type or a 'unique symbol' type."),
+        A_computed_property_name_in_a_method_overload_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type: diag(1168, ts.DiagnosticCategory.Error, "A_computed_property_name_in_a_method_overload_must_refer_to_an_expression_whose_type_is_a_literal_ty_1168", "A computed property name in a method overload must refer to an expression whose type is a literal type or a 'unique symbol' type."),
+        A_computed_property_name_in_an_interface_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type: diag(1169, ts.DiagnosticCategory.Error, "A_computed_property_name_in_an_interface_must_refer_to_an_expression_whose_type_is_a_literal_type_or_1169", "A computed property name in an interface must refer to an expression whose type is a literal type or a 'unique symbol' type."),
+        A_computed_property_name_in_a_type_literal_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type: diag(1170, ts.DiagnosticCategory.Error, "A_computed_property_name_in_a_type_literal_must_refer_to_an_expression_whose_type_is_a_literal_type__1170", "A computed property name in a type literal must refer to an expression whose type is a literal type or a 'unique symbol' type."),
+        A_comma_expression_is_not_allowed_in_a_computed_property_name: diag(1171, ts.DiagnosticCategory.Error, "A_comma_expression_is_not_allowed_in_a_computed_property_name_1171", "A comma expression is not allowed in a computed property name."),
+        extends_clause_already_seen: diag(1172, ts.DiagnosticCategory.Error, "extends_clause_already_seen_1172", "'extends' clause already seen."),
+        extends_clause_must_precede_implements_clause: diag(1173, ts.DiagnosticCategory.Error, "extends_clause_must_precede_implements_clause_1173", "'extends' clause must precede 'implements' clause."),
+        Classes_can_only_extend_a_single_class: diag(1174, ts.DiagnosticCategory.Error, "Classes_can_only_extend_a_single_class_1174", "Classes can only extend a single class."),
+        implements_clause_already_seen: diag(1175, ts.DiagnosticCategory.Error, "implements_clause_already_seen_1175", "'implements' clause already seen."),
+        Interface_declaration_cannot_have_implements_clause: diag(1176, ts.DiagnosticCategory.Error, "Interface_declaration_cannot_have_implements_clause_1176", "Interface declaration cannot have 'implements' clause."),
+        Binary_digit_expected: diag(1177, ts.DiagnosticCategory.Error, "Binary_digit_expected_1177", "Binary digit expected."),
+        Octal_digit_expected: diag(1178, ts.DiagnosticCategory.Error, "Octal_digit_expected_1178", "Octal digit expected."),
+        Unexpected_token_expected: diag(1179, ts.DiagnosticCategory.Error, "Unexpected_token_expected_1179", "Unexpected token. '{' expected."),
+        Property_destructuring_pattern_expected: diag(1180, ts.DiagnosticCategory.Error, "Property_destructuring_pattern_expected_1180", "Property destructuring pattern expected."),
+        Array_element_destructuring_pattern_expected: diag(1181, ts.DiagnosticCategory.Error, "Array_element_destructuring_pattern_expected_1181", "Array element destructuring pattern expected."),
+        A_destructuring_declaration_must_have_an_initializer: diag(1182, ts.DiagnosticCategory.Error, "A_destructuring_declaration_must_have_an_initializer_1182", "A destructuring declaration must have an initializer."),
+        An_implementation_cannot_be_declared_in_ambient_contexts: diag(1183, ts.DiagnosticCategory.Error, "An_implementation_cannot_be_declared_in_ambient_contexts_1183", "An implementation cannot be declared in ambient contexts."),
+        Modifiers_cannot_appear_here: diag(1184, ts.DiagnosticCategory.Error, "Modifiers_cannot_appear_here_1184", "Modifiers cannot appear here."),
+        Merge_conflict_marker_encountered: diag(1185, ts.DiagnosticCategory.Error, "Merge_conflict_marker_encountered_1185", "Merge conflict marker encountered."),
+        A_rest_element_cannot_have_an_initializer: diag(1186, ts.DiagnosticCategory.Error, "A_rest_element_cannot_have_an_initializer_1186", "A rest element cannot have an initializer."),
+        A_parameter_property_may_not_be_declared_using_a_binding_pattern: diag(1187, ts.DiagnosticCategory.Error, "A_parameter_property_may_not_be_declared_using_a_binding_pattern_1187", "A parameter property may not be declared using a binding pattern."),
+        Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement: diag(1188, ts.DiagnosticCategory.Error, "Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement_1188", "Only a single variable declaration is allowed in a 'for...of' statement."),
+        The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer: diag(1189, ts.DiagnosticCategory.Error, "The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer_1189", "The variable declaration of a 'for...in' statement cannot have an initializer."),
+        The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer: diag(1190, ts.DiagnosticCategory.Error, "The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer_1190", "The variable declaration of a 'for...of' statement cannot have an initializer."),
+        An_import_declaration_cannot_have_modifiers: diag(1191, ts.DiagnosticCategory.Error, "An_import_declaration_cannot_have_modifiers_1191", "An import declaration cannot have modifiers."),
+        Module_0_has_no_default_export: diag(1192, ts.DiagnosticCategory.Error, "Module_0_has_no_default_export_1192", "Module '{0}' has no default export."),
+        An_export_declaration_cannot_have_modifiers: diag(1193, ts.DiagnosticCategory.Error, "An_export_declaration_cannot_have_modifiers_1193", "An export declaration cannot have modifiers."),
+        Export_declarations_are_not_permitted_in_a_namespace: diag(1194, ts.DiagnosticCategory.Error, "Export_declarations_are_not_permitted_in_a_namespace_1194", "Export declarations are not permitted in a namespace."),
+        Catch_clause_variable_cannot_have_a_type_annotation: diag(1196, ts.DiagnosticCategory.Error, "Catch_clause_variable_cannot_have_a_type_annotation_1196", "Catch clause variable cannot have a type annotation."),
+        Catch_clause_variable_cannot_have_an_initializer: diag(1197, ts.DiagnosticCategory.Error, "Catch_clause_variable_cannot_have_an_initializer_1197", "Catch clause variable cannot have an initializer."),
+        An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: diag(1198, ts.DiagnosticCategory.Error, "An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive_1198", "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive."),
+        Unterminated_Unicode_escape_sequence: diag(1199, ts.DiagnosticCategory.Error, "Unterminated_Unicode_escape_sequence_1199", "Unterminated Unicode escape sequence."),
+        Line_terminator_not_permitted_before_arrow: diag(1200, ts.DiagnosticCategory.Error, "Line_terminator_not_permitted_before_arrow_1200", "Line terminator not permitted before arrow."),
+        Import_assignment_cannot_be_used_when_targeting_ECMAScript_modules_Consider_using_import_Asterisk_as_ns_from_mod_import_a_from_mod_import_d_from_mod_or_another_module_format_instead: diag(1202, ts.DiagnosticCategory.Error, "Import_assignment_cannot_be_used_when_targeting_ECMAScript_modules_Consider_using_import_Asterisk_as_1202", "Import assignment cannot be used when targeting ECMAScript modules. Consider using 'import * as ns from \"mod\"', 'import {a} from \"mod\"', 'import d from \"mod\"', or another module format instead."),
+        Export_assignment_cannot_be_used_when_targeting_ECMAScript_modules_Consider_using_export_default_or_another_module_format_instead: diag(1203, ts.DiagnosticCategory.Error, "Export_assignment_cannot_be_used_when_targeting_ECMAScript_modules_Consider_using_export_default_or__1203", "Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead."),
+        Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided: diag(1205, ts.DiagnosticCategory.Error, "Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided_1205", "Cannot re-export a type when the '--isolatedModules' flag is provided."),
+        Decorators_are_not_valid_here: diag(1206, ts.DiagnosticCategory.Error, "Decorators_are_not_valid_here_1206", "Decorators are not valid here."),
+        Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name: diag(1207, ts.DiagnosticCategory.Error, "Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name_1207", "Decorators cannot be applied to multiple get/set accessors of the same name."),
+        Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided: diag(1208, ts.DiagnosticCategory.Error, "Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided_1208", "Cannot compile namespaces when the '--isolatedModules' flag is provided."),
+        Ambient_const_enums_are_not_allowed_when_the_isolatedModules_flag_is_provided: diag(1209, ts.DiagnosticCategory.Error, "Ambient_const_enums_are_not_allowed_when_the_isolatedModules_flag_is_provided_1209", "Ambient const enums are not allowed when the '--isolatedModules' flag is provided."),
+        Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode: diag(1210, ts.DiagnosticCategory.Error, "Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode_1210", "Invalid use of '{0}'. Class definitions are automatically in strict mode."),
+        A_class_declaration_without_the_default_modifier_must_have_a_name: diag(1211, ts.DiagnosticCategory.Error, "A_class_declaration_without_the_default_modifier_must_have_a_name_1211", "A class declaration without the 'default' modifier must have a name."),
+        Identifier_expected_0_is_a_reserved_word_in_strict_mode: diag(1212, ts.DiagnosticCategory.Error, "Identifier_expected_0_is_a_reserved_word_in_strict_mode_1212", "Identifier expected. '{0}' is a reserved word in strict mode."),
+        Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode: diag(1213, ts.DiagnosticCategory.Error, "Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_stric_1213", "Identifier expected. '{0}' is a reserved word in strict mode. Class definitions are automatically in strict mode."),
+        Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode: diag(1214, ts.DiagnosticCategory.Error, "Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode_1214", "Identifier expected. '{0}' is a reserved word in strict mode. Modules are automatically in strict mode."),
+        Invalid_use_of_0_Modules_are_automatically_in_strict_mode: diag(1215, ts.DiagnosticCategory.Error, "Invalid_use_of_0_Modules_are_automatically_in_strict_mode_1215", "Invalid use of '{0}'. Modules are automatically in strict mode."),
+        Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules: diag(1216, ts.DiagnosticCategory.Error, "Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules_1216", "Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules."),
+        Export_assignment_is_not_supported_when_module_flag_is_system: diag(1218, ts.DiagnosticCategory.Error, "Export_assignment_is_not_supported_when_module_flag_is_system_1218", "Export assignment is not supported when '--module' flag is 'system'."),
+        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning: diag(1219, ts.DiagnosticCategory.Error, "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_t_1219", "Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning."),
+        Generators_are_only_available_when_targeting_ECMAScript_2015_or_higher: diag(1220, ts.DiagnosticCategory.Error, "Generators_are_only_available_when_targeting_ECMAScript_2015_or_higher_1220", "Generators are only available when targeting ECMAScript 2015 or higher."),
+        Generators_are_not_allowed_in_an_ambient_context: diag(1221, ts.DiagnosticCategory.Error, "Generators_are_not_allowed_in_an_ambient_context_1221", "Generators are not allowed in an ambient context."),
+        An_overload_signature_cannot_be_declared_as_a_generator: diag(1222, ts.DiagnosticCategory.Error, "An_overload_signature_cannot_be_declared_as_a_generator_1222", "An overload signature cannot be declared as a generator."),
+        _0_tag_already_specified: diag(1223, ts.DiagnosticCategory.Error, "_0_tag_already_specified_1223", "'{0}' tag already specified."),
+        Signature_0_must_be_a_type_predicate: diag(1224, ts.DiagnosticCategory.Error, "Signature_0_must_be_a_type_predicate_1224", "Signature '{0}' must be a type predicate."),
+        Cannot_find_parameter_0: diag(1225, ts.DiagnosticCategory.Error, "Cannot_find_parameter_0_1225", "Cannot find parameter '{0}'."),
+        Type_predicate_0_is_not_assignable_to_1: diag(1226, ts.DiagnosticCategory.Error, "Type_predicate_0_is_not_assignable_to_1_1226", "Type predicate '{0}' is not assignable to '{1}'."),
+        Parameter_0_is_not_in_the_same_position_as_parameter_1: diag(1227, ts.DiagnosticCategory.Error, "Parameter_0_is_not_in_the_same_position_as_parameter_1_1227", "Parameter '{0}' is not in the same position as parameter '{1}'."),
+        A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods: diag(1228, ts.DiagnosticCategory.Error, "A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods_1228", "A type predicate is only allowed in return type position for functions and methods."),
+        A_type_predicate_cannot_reference_a_rest_parameter: diag(1229, ts.DiagnosticCategory.Error, "A_type_predicate_cannot_reference_a_rest_parameter_1229", "A type predicate cannot reference a rest parameter."),
+        A_type_predicate_cannot_reference_element_0_in_a_binding_pattern: diag(1230, ts.DiagnosticCategory.Error, "A_type_predicate_cannot_reference_element_0_in_a_binding_pattern_1230", "A type predicate cannot reference element '{0}' in a binding pattern."),
+        An_export_assignment_can_only_be_used_in_a_module: diag(1231, ts.DiagnosticCategory.Error, "An_export_assignment_can_only_be_used_in_a_module_1231", "An export assignment can only be used in a module."),
+        An_import_declaration_can_only_be_used_in_a_namespace_or_module: diag(1232, ts.DiagnosticCategory.Error, "An_import_declaration_can_only_be_used_in_a_namespace_or_module_1232", "An import declaration can only be used in a namespace or module."),
+        An_export_declaration_can_only_be_used_in_a_module: diag(1233, ts.DiagnosticCategory.Error, "An_export_declaration_can_only_be_used_in_a_module_1233", "An export declaration can only be used in a module."),
+        An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file: diag(1234, ts.DiagnosticCategory.Error, "An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file_1234", "An ambient module declaration is only allowed at the top level in a file."),
+        A_namespace_declaration_is_only_allowed_in_a_namespace_or_module: diag(1235, ts.DiagnosticCategory.Error, "A_namespace_declaration_is_only_allowed_in_a_namespace_or_module_1235", "A namespace declaration is only allowed in a namespace or module."),
+        The_return_type_of_a_property_decorator_function_must_be_either_void_or_any: diag(1236, ts.DiagnosticCategory.Error, "The_return_type_of_a_property_decorator_function_must_be_either_void_or_any_1236", "The return type of a property decorator function must be either 'void' or 'any'."),
+        The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any: diag(1237, ts.DiagnosticCategory.Error, "The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any_1237", "The return type of a parameter decorator function must be either 'void' or 'any'."),
+        Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression: diag(1238, ts.DiagnosticCategory.Error, "Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression_1238", "Unable to resolve signature of class decorator when called as an expression."),
+        Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression: diag(1239, ts.DiagnosticCategory.Error, "Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression_1239", "Unable to resolve signature of parameter decorator when called as an expression."),
+        Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression: diag(1240, ts.DiagnosticCategory.Error, "Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression_1240", "Unable to resolve signature of property decorator when called as an expression."),
+        Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression: diag(1241, ts.DiagnosticCategory.Error, "Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression_1241", "Unable to resolve signature of method decorator when called as an expression."),
+        abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration: diag(1242, ts.DiagnosticCategory.Error, "abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration_1242", "'abstract' modifier can only appear on a class, method, or property declaration."),
+        _0_modifier_cannot_be_used_with_1_modifier: diag(1243, ts.DiagnosticCategory.Error, "_0_modifier_cannot_be_used_with_1_modifier_1243", "'{0}' modifier cannot be used with '{1}' modifier."),
+        Abstract_methods_can_only_appear_within_an_abstract_class: diag(1244, ts.DiagnosticCategory.Error, "Abstract_methods_can_only_appear_within_an_abstract_class_1244", "Abstract methods can only appear within an abstract class."),
+        Method_0_cannot_have_an_implementation_because_it_is_marked_abstract: diag(1245, ts.DiagnosticCategory.Error, "Method_0_cannot_have_an_implementation_because_it_is_marked_abstract_1245", "Method '{0}' cannot have an implementation because it is marked abstract."),
+        An_interface_property_cannot_have_an_initializer: diag(1246, ts.DiagnosticCategory.Error, "An_interface_property_cannot_have_an_initializer_1246", "An interface property cannot have an initializer."),
+        A_type_literal_property_cannot_have_an_initializer: diag(1247, ts.DiagnosticCategory.Error, "A_type_literal_property_cannot_have_an_initializer_1247", "A type literal property cannot have an initializer."),
+        A_class_member_cannot_have_the_0_keyword: diag(1248, ts.DiagnosticCategory.Error, "A_class_member_cannot_have_the_0_keyword_1248", "A class member cannot have the '{0}' keyword."),
+        A_decorator_can_only_decorate_a_method_implementation_not_an_overload: diag(1249, ts.DiagnosticCategory.Error, "A_decorator_can_only_decorate_a_method_implementation_not_an_overload_1249", "A decorator can only decorate a method implementation, not an overload."),
+        Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5: diag(1250, ts.DiagnosticCategory.Error, "Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5_1250", "Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'."),
+        Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5_Class_definitions_are_automatically_in_strict_mode: diag(1251, ts.DiagnosticCategory.Error, "Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5_Class_d_1251", "Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Class definitions are automatically in strict mode."),
+        Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5_Modules_are_automatically_in_strict_mode: diag(1252, ts.DiagnosticCategory.Error, "Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5_Modules_1252", "Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Modules are automatically in strict mode."),
+        _0_tag_cannot_be_used_independently_as_a_top_level_JSDoc_tag: diag(1253, ts.DiagnosticCategory.Error, "_0_tag_cannot_be_used_independently_as_a_top_level_JSDoc_tag_1253", "'{0}' tag cannot be used independently as a top level JSDoc tag."),
+        A_const_initializer_in_an_ambient_context_must_be_a_string_or_numeric_literal_or_literal_enum_reference: diag(1254, ts.DiagnosticCategory.Error, "A_const_initializer_in_an_ambient_context_must_be_a_string_or_numeric_literal_or_literal_enum_refere_1254", "A 'const' initializer in an ambient context must be a string or numeric literal or literal enum reference."),
+        A_definite_assignment_assertion_is_not_permitted_in_this_context: diag(1255, ts.DiagnosticCategory.Error, "A_definite_assignment_assertion_is_not_permitted_in_this_context_1255", "A definite assignment assertion '!' is not permitted in this context."),
+        A_rest_element_must_be_last_in_a_tuple_type: diag(1256, ts.DiagnosticCategory.Error, "A_rest_element_must_be_last_in_a_tuple_type_1256", "A rest element must be last in a tuple type."),
+        A_required_element_cannot_follow_an_optional_element: diag(1257, ts.DiagnosticCategory.Error, "A_required_element_cannot_follow_an_optional_element_1257", "A required element cannot follow an optional element."),
+        with_statements_are_not_allowed_in_an_async_function_block: diag(1300, ts.DiagnosticCategory.Error, "with_statements_are_not_allowed_in_an_async_function_block_1300", "'with' statements are not allowed in an async function block."),
+        await_expression_is_only_allowed_within_an_async_function: diag(1308, ts.DiagnosticCategory.Error, "await_expression_is_only_allowed_within_an_async_function_1308", "'await' expression is only allowed within an async function."),
+        can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment: diag(1312, ts.DiagnosticCategory.Error, "can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment_1312", "'=' can only be used in an object literal property inside a destructuring assignment."),
+        The_body_of_an_if_statement_cannot_be_the_empty_statement: diag(1313, ts.DiagnosticCategory.Error, "The_body_of_an_if_statement_cannot_be_the_empty_statement_1313", "The body of an 'if' statement cannot be the empty statement."),
+        Global_module_exports_may_only_appear_in_module_files: diag(1314, ts.DiagnosticCategory.Error, "Global_module_exports_may_only_appear_in_module_files_1314", "Global module exports may only appear in module files."),
+        Global_module_exports_may_only_appear_in_declaration_files: diag(1315, ts.DiagnosticCategory.Error, "Global_module_exports_may_only_appear_in_declaration_files_1315", "Global module exports may only appear in declaration files."),
+        Global_module_exports_may_only_appear_at_top_level: diag(1316, ts.DiagnosticCategory.Error, "Global_module_exports_may_only_appear_at_top_level_1316", "Global module exports may only appear at top level."),
+        A_parameter_property_cannot_be_declared_using_a_rest_parameter: diag(1317, ts.DiagnosticCategory.Error, "A_parameter_property_cannot_be_declared_using_a_rest_parameter_1317", "A parameter property cannot be declared using a rest parameter."),
+        An_abstract_accessor_cannot_have_an_implementation: diag(1318, ts.DiagnosticCategory.Error, "An_abstract_accessor_cannot_have_an_implementation_1318", "An abstract accessor cannot have an implementation."),
+        A_default_export_can_only_be_used_in_an_ECMAScript_style_module: diag(1319, ts.DiagnosticCategory.Error, "A_default_export_can_only_be_used_in_an_ECMAScript_style_module_1319", "A default export can only be used in an ECMAScript-style module."),
+        Type_of_await_operand_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member: diag(1320, ts.DiagnosticCategory.Error, "Type_of_await_operand_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member_1320", "Type of 'await' operand must either be a valid promise or must not contain a callable 'then' member."),
+        Type_of_yield_operand_in_an_async_generator_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member: diag(1321, ts.DiagnosticCategory.Error, "Type_of_yield_operand_in_an_async_generator_must_either_be_a_valid_promise_or_must_not_contain_a_cal_1321", "Type of 'yield' operand in an async generator must either be a valid promise or must not contain a callable 'then' member."),
+        Type_of_iterated_elements_of_a_yield_Asterisk_operand_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member: diag(1322, ts.DiagnosticCategory.Error, "Type_of_iterated_elements_of_a_yield_Asterisk_operand_must_either_be_a_valid_promise_or_must_not_con_1322", "Type of iterated elements of a 'yield*' operand must either be a valid promise or must not contain a callable 'then' member."),
+        Dynamic_import_is_only_supported_when_module_flag_is_commonjs_or_esNext: diag(1323, ts.DiagnosticCategory.Error, "Dynamic_import_is_only_supported_when_module_flag_is_commonjs_or_esNext_1323", "Dynamic import is only supported when '--module' flag is 'commonjs' or 'esNext'."),
+        Dynamic_import_must_have_one_specifier_as_an_argument: diag(1324, ts.DiagnosticCategory.Error, "Dynamic_import_must_have_one_specifier_as_an_argument_1324", "Dynamic import must have one specifier as an argument."),
+        Specifier_of_dynamic_import_cannot_be_spread_element: diag(1325, ts.DiagnosticCategory.Error, "Specifier_of_dynamic_import_cannot_be_spread_element_1325", "Specifier of dynamic import cannot be spread element."),
+        Dynamic_import_cannot_have_type_arguments: diag(1326, ts.DiagnosticCategory.Error, "Dynamic_import_cannot_have_type_arguments_1326", "Dynamic import cannot have type arguments"),
+        String_literal_with_double_quotes_expected: diag(1327, ts.DiagnosticCategory.Error, "String_literal_with_double_quotes_expected_1327", "String literal with double quotes expected."),
+        Property_value_can_only_be_string_literal_numeric_literal_true_false_null_object_literal_or_array_literal: diag(1328, ts.DiagnosticCategory.Error, "Property_value_can_only_be_string_literal_numeric_literal_true_false_null_object_literal_or_array_li_1328", "Property value can only be string literal, numeric literal, 'true', 'false', 'null', object literal or array literal."),
+        _0_accepts_too_few_arguments_to_be_used_as_a_decorator_here_Did_you_mean_to_call_it_first_and_write_0: diag(1329, ts.DiagnosticCategory.Error, "_0_accepts_too_few_arguments_to_be_used_as_a_decorator_here_Did_you_mean_to_call_it_first_and_write__1329", "'{0}' accepts too few arguments to be used as a decorator here. Did you mean to call it first and write '@{0}()'?"),
+        A_property_of_an_interface_or_type_literal_whose_type_is_a_unique_symbol_type_must_be_readonly: diag(1330, ts.DiagnosticCategory.Error, "A_property_of_an_interface_or_type_literal_whose_type_is_a_unique_symbol_type_must_be_readonly_1330", "A property of an interface or type literal whose type is a 'unique symbol' type must be 'readonly'."),
+        A_property_of_a_class_whose_type_is_a_unique_symbol_type_must_be_both_static_and_readonly: diag(1331, ts.DiagnosticCategory.Error, "A_property_of_a_class_whose_type_is_a_unique_symbol_type_must_be_both_static_and_readonly_1331", "A property of a class whose type is a 'unique symbol' type must be both 'static' and 'readonly'."),
+        A_variable_whose_type_is_a_unique_symbol_type_must_be_const: diag(1332, ts.DiagnosticCategory.Error, "A_variable_whose_type_is_a_unique_symbol_type_must_be_const_1332", "A variable whose type is a 'unique symbol' type must be 'const'."),
+        unique_symbol_types_may_not_be_used_on_a_variable_declaration_with_a_binding_name: diag(1333, ts.DiagnosticCategory.Error, "unique_symbol_types_may_not_be_used_on_a_variable_declaration_with_a_binding_name_1333", "'unique symbol' types may not be used on a variable declaration with a binding name."),
+        unique_symbol_types_are_only_allowed_on_variables_in_a_variable_statement: diag(1334, ts.DiagnosticCategory.Error, "unique_symbol_types_are_only_allowed_on_variables_in_a_variable_statement_1334", "'unique symbol' types are only allowed on variables in a variable statement."),
+        unique_symbol_types_are_not_allowed_here: diag(1335, ts.DiagnosticCategory.Error, "unique_symbol_types_are_not_allowed_here_1335", "'unique symbol' types are not allowed here."),
+        An_index_signature_parameter_type_cannot_be_a_type_alias_Consider_writing_0_Colon_1_Colon_2_instead: diag(1336, ts.DiagnosticCategory.Error, "An_index_signature_parameter_type_cannot_be_a_type_alias_Consider_writing_0_Colon_1_Colon_2_instead_1336", "An index signature parameter type cannot be a type alias. Consider writing '[{0}: {1}]: {2}' instead."),
+        An_index_signature_parameter_type_cannot_be_a_union_type_Consider_using_a_mapped_object_type_instead: diag(1337, ts.DiagnosticCategory.Error, "An_index_signature_parameter_type_cannot_be_a_union_type_Consider_using_a_mapped_object_type_instead_1337", "An index signature parameter type cannot be a union type. Consider using a mapped object type instead."),
+        infer_declarations_are_only_permitted_in_the_extends_clause_of_a_conditional_type: diag(1338, ts.DiagnosticCategory.Error, "infer_declarations_are_only_permitted_in_the_extends_clause_of_a_conditional_type_1338", "'infer' declarations are only permitted in the 'extends' clause of a conditional type."),
+        Module_0_does_not_refer_to_a_value_but_is_used_as_a_value_here: diag(1339, ts.DiagnosticCategory.Error, "Module_0_does_not_refer_to_a_value_but_is_used_as_a_value_here_1339", "Module '{0}' does not refer to a value, but is used as a value here."),
+        Module_0_does_not_refer_to_a_type_but_is_used_as_a_type_here_Did_you_mean_typeof_import_0: diag(1340, ts.DiagnosticCategory.Error, "Module_0_does_not_refer_to_a_type_but_is_used_as_a_type_here_Did_you_mean_typeof_import_0_1340", "Module '{0}' does not refer to a type, but is used as a type here. Did you mean 'typeof import('{0}')'?"),
+        Type_arguments_cannot_be_used_here: diag(1342, ts.DiagnosticCategory.Error, "Type_arguments_cannot_be_used_here_1342", "Type arguments cannot be used here."),
+        The_import_meta_meta_property_is_only_allowed_using_ESNext_for_the_target_and_module_compiler_options: diag(1343, ts.DiagnosticCategory.Error, "The_import_meta_meta_property_is_only_allowed_using_ESNext_for_the_target_and_module_compiler_option_1343", "The 'import.meta' meta-property is only allowed using 'ESNext' for the 'target' and 'module' compiler options."),
+        A_label_is_not_allowed_here: diag(1344, ts.DiagnosticCategory.Error, "A_label_is_not_allowed_here_1344", "'A label is not allowed here."),
+        An_expression_of_type_void_cannot_be_tested_for_truthiness: diag(1345, ts.DiagnosticCategory.Error, "An_expression_of_type_void_cannot_be_tested_for_truthiness_1345", "An expression of type 'void' cannot be tested for truthiness"),
+        This_parameter_is_not_allowed_with_use_strict_directive: diag(1346, ts.DiagnosticCategory.Error, "This_parameter_is_not_allowed_with_use_strict_directive_1346", "This parameter is not allowed with 'use strict' directive."),
+        use_strict_directive_cannot_be_used_with_non_simple_parameter_list: diag(1347, ts.DiagnosticCategory.Error, "use_strict_directive_cannot_be_used_with_non_simple_parameter_list_1347", "'use strict' directive cannot be used with non-simple parameter list."),
+        Non_simple_parameter_declared_here: diag(1348, ts.DiagnosticCategory.Error, "Non_simple_parameter_declared_here_1348", "Non-simple parameter declared here."),
+        use_strict_directive_used_here: diag(1349, ts.DiagnosticCategory.Error, "use_strict_directive_used_here_1349", "'use strict' directive used here."),
+        Print_the_final_configuration_instead_of_building: diag(1350, ts.DiagnosticCategory.Message, "Print_the_final_configuration_instead_of_building_1350", "Print the final configuration instead of building."),
+        An_identifier_or_keyword_cannot_immediately_follow_a_numeric_literal: diag(1351, ts.DiagnosticCategory.Error, "An_identifier_or_keyword_cannot_immediately_follow_a_numeric_literal_1351", "An identifier or keyword cannot immediately follow a numeric literal."),
+        A_bigint_literal_cannot_use_exponential_notation: diag(1352, ts.DiagnosticCategory.Error, "A_bigint_literal_cannot_use_exponential_notation_1352", "A bigint literal cannot use exponential notation."),
+        A_bigint_literal_must_be_an_integer: diag(1353, ts.DiagnosticCategory.Error, "A_bigint_literal_must_be_an_integer_1353", "A bigint literal must be an integer."),
+        Duplicate_identifier_0: diag(2300, ts.DiagnosticCategory.Error, "Duplicate_identifier_0_2300", "Duplicate identifier '{0}'."),
+        Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: diag(2301, ts.DiagnosticCategory.Error, "Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301", "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor."),
+        Static_members_cannot_reference_class_type_parameters: diag(2302, ts.DiagnosticCategory.Error, "Static_members_cannot_reference_class_type_parameters_2302", "Static members cannot reference class type parameters."),
+        Circular_definition_of_import_alias_0: diag(2303, ts.DiagnosticCategory.Error, "Circular_definition_of_import_alias_0_2303", "Circular definition of import alias '{0}'."),
+        Cannot_find_name_0: diag(2304, ts.DiagnosticCategory.Error, "Cannot_find_name_0_2304", "Cannot find name '{0}'."),
+        Module_0_has_no_exported_member_1: diag(2305, ts.DiagnosticCategory.Error, "Module_0_has_no_exported_member_1_2305", "Module '{0}' has no exported member '{1}'."),
+        File_0_is_not_a_module: diag(2306, ts.DiagnosticCategory.Error, "File_0_is_not_a_module_2306", "File '{0}' is not a module."),
+        Cannot_find_module_0: diag(2307, ts.DiagnosticCategory.Error, "Cannot_find_module_0_2307", "Cannot find module '{0}'."),
+        Module_0_has_already_exported_a_member_named_1_Consider_explicitly_re_exporting_to_resolve_the_ambiguity: diag(2308, ts.DiagnosticCategory.Error, "Module_0_has_already_exported_a_member_named_1_Consider_explicitly_re_exporting_to_resolve_the_ambig_2308", "Module {0} has already exported a member named '{1}'. Consider explicitly re-exporting to resolve the ambiguity."),
+        An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements: diag(2309, ts.DiagnosticCategory.Error, "An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements_2309", "An export assignment cannot be used in a module with other exported elements."),
+        Type_0_recursively_references_itself_as_a_base_type: diag(2310, ts.DiagnosticCategory.Error, "Type_0_recursively_references_itself_as_a_base_type_2310", "Type '{0}' recursively references itself as a base type."),
+        A_class_may_only_extend_another_class: diag(2311, ts.DiagnosticCategory.Error, "A_class_may_only_extend_another_class_2311", "A class may only extend another class."),
+        An_interface_can_only_extend_an_object_type_or_intersection_of_object_types_with_statically_known_members: diag(2312, ts.DiagnosticCategory.Error, "An_interface_can_only_extend_an_object_type_or_intersection_of_object_types_with_statically_known_me_2312", "An interface can only extend an object type or intersection of object types with statically known members."),
+        Type_parameter_0_has_a_circular_constraint: diag(2313, ts.DiagnosticCategory.Error, "Type_parameter_0_has_a_circular_constraint_2313", "Type parameter '{0}' has a circular constraint."),
+        Generic_type_0_requires_1_type_argument_s: diag(2314, ts.DiagnosticCategory.Error, "Generic_type_0_requires_1_type_argument_s_2314", "Generic type '{0}' requires {1} type argument(s)."),
+        Type_0_is_not_generic: diag(2315, ts.DiagnosticCategory.Error, "Type_0_is_not_generic_2315", "Type '{0}' is not generic."),
+        Global_type_0_must_be_a_class_or_interface_type: diag(2316, ts.DiagnosticCategory.Error, "Global_type_0_must_be_a_class_or_interface_type_2316", "Global type '{0}' must be a class or interface type."),
+        Global_type_0_must_have_1_type_parameter_s: diag(2317, ts.DiagnosticCategory.Error, "Global_type_0_must_have_1_type_parameter_s_2317", "Global type '{0}' must have {1} type parameter(s)."),
+        Cannot_find_global_type_0: diag(2318, ts.DiagnosticCategory.Error, "Cannot_find_global_type_0_2318", "Cannot find global type '{0}'."),
+        Named_property_0_of_types_1_and_2_are_not_identical: diag(2319, ts.DiagnosticCategory.Error, "Named_property_0_of_types_1_and_2_are_not_identical_2319", "Named property '{0}' of types '{1}' and '{2}' are not identical."),
+        Interface_0_cannot_simultaneously_extend_types_1_and_2: diag(2320, ts.DiagnosticCategory.Error, "Interface_0_cannot_simultaneously_extend_types_1_and_2_2320", "Interface '{0}' cannot simultaneously extend types '{1}' and '{2}'."),
+        Excessive_stack_depth_comparing_types_0_and_1: diag(2321, ts.DiagnosticCategory.Error, "Excessive_stack_depth_comparing_types_0_and_1_2321", "Excessive stack depth comparing types '{0}' and '{1}'."),
+        Type_0_is_not_assignable_to_type_1: diag(2322, ts.DiagnosticCategory.Error, "Type_0_is_not_assignable_to_type_1_2322", "Type '{0}' is not assignable to type '{1}'."),
+        Cannot_redeclare_exported_variable_0: diag(2323, ts.DiagnosticCategory.Error, "Cannot_redeclare_exported_variable_0_2323", "Cannot redeclare exported variable '{0}'."),
+        Property_0_is_missing_in_type_1: diag(2324, ts.DiagnosticCategory.Error, "Property_0_is_missing_in_type_1_2324", "Property '{0}' is missing in type '{1}'."),
+        Property_0_is_private_in_type_1_but_not_in_type_2: diag(2325, ts.DiagnosticCategory.Error, "Property_0_is_private_in_type_1_but_not_in_type_2_2325", "Property '{0}' is private in type '{1}' but not in type '{2}'."),
+        Types_of_property_0_are_incompatible: diag(2326, ts.DiagnosticCategory.Error, "Types_of_property_0_are_incompatible_2326", "Types of property '{0}' are incompatible."),
+        Property_0_is_optional_in_type_1_but_required_in_type_2: diag(2327, ts.DiagnosticCategory.Error, "Property_0_is_optional_in_type_1_but_required_in_type_2_2327", "Property '{0}' is optional in type '{1}' but required in type '{2}'."),
+        Types_of_parameters_0_and_1_are_incompatible: diag(2328, ts.DiagnosticCategory.Error, "Types_of_parameters_0_and_1_are_incompatible_2328", "Types of parameters '{0}' and '{1}' are incompatible."),
+        Index_signature_is_missing_in_type_0: diag(2329, ts.DiagnosticCategory.Error, "Index_signature_is_missing_in_type_0_2329", "Index signature is missing in type '{0}'."),
+        Index_signatures_are_incompatible: diag(2330, ts.DiagnosticCategory.Error, "Index_signatures_are_incompatible_2330", "Index signatures are incompatible."),
+        this_cannot_be_referenced_in_a_module_or_namespace_body: diag(2331, ts.DiagnosticCategory.Error, "this_cannot_be_referenced_in_a_module_or_namespace_body_2331", "'this' cannot be referenced in a module or namespace body."),
+        this_cannot_be_referenced_in_current_location: diag(2332, ts.DiagnosticCategory.Error, "this_cannot_be_referenced_in_current_location_2332", "'this' cannot be referenced in current location."),
+        this_cannot_be_referenced_in_constructor_arguments: diag(2333, ts.DiagnosticCategory.Error, "this_cannot_be_referenced_in_constructor_arguments_2333", "'this' cannot be referenced in constructor arguments."),
+        this_cannot_be_referenced_in_a_static_property_initializer: diag(2334, ts.DiagnosticCategory.Error, "this_cannot_be_referenced_in_a_static_property_initializer_2334", "'this' cannot be referenced in a static property initializer."),
+        super_can_only_be_referenced_in_a_derived_class: diag(2335, ts.DiagnosticCategory.Error, "super_can_only_be_referenced_in_a_derived_class_2335", "'super' can only be referenced in a derived class."),
+        super_cannot_be_referenced_in_constructor_arguments: diag(2336, ts.DiagnosticCategory.Error, "super_cannot_be_referenced_in_constructor_arguments_2336", "'super' cannot be referenced in constructor arguments."),
+        Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors: diag(2337, ts.DiagnosticCategory.Error, "Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors_2337", "Super calls are not permitted outside constructors or in nested functions inside constructors."),
+        super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_derived_class: diag(2338, ts.DiagnosticCategory.Error, "super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_der_2338", "'super' property access is permitted only in a constructor, member function, or member accessor of a derived class."),
+        Property_0_does_not_exist_on_type_1: diag(2339, ts.DiagnosticCategory.Error, "Property_0_does_not_exist_on_type_1_2339", "Property '{0}' does not exist on type '{1}'."),
+        Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword: diag(2340, ts.DiagnosticCategory.Error, "Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword_2340", "Only public and protected methods of the base class are accessible via the 'super' keyword."),
+        Property_0_is_private_and_only_accessible_within_class_1: diag(2341, ts.DiagnosticCategory.Error, "Property_0_is_private_and_only_accessible_within_class_1_2341", "Property '{0}' is private and only accessible within class '{1}'."),
+        An_index_expression_argument_must_be_of_type_string_number_symbol_or_any: diag(2342, ts.DiagnosticCategory.Error, "An_index_expression_argument_must_be_of_type_string_number_symbol_or_any_2342", "An index expression argument must be of type 'string', 'number', 'symbol', or 'any'."),
+        This_syntax_requires_an_imported_helper_named_1_but_module_0_has_no_exported_member_1: diag(2343, ts.DiagnosticCategory.Error, "This_syntax_requires_an_imported_helper_named_1_but_module_0_has_no_exported_member_1_2343", "This syntax requires an imported helper named '{1}', but module '{0}' has no exported member '{1}'."),
+        Type_0_does_not_satisfy_the_constraint_1: diag(2344, ts.DiagnosticCategory.Error, "Type_0_does_not_satisfy_the_constraint_1_2344", "Type '{0}' does not satisfy the constraint '{1}'."),
+        Argument_of_type_0_is_not_assignable_to_parameter_of_type_1: diag(2345, ts.DiagnosticCategory.Error, "Argument_of_type_0_is_not_assignable_to_parameter_of_type_1_2345", "Argument of type '{0}' is not assignable to parameter of type '{1}'."),
+        Call_target_does_not_contain_any_signatures: diag(2346, ts.DiagnosticCategory.Error, "Call_target_does_not_contain_any_signatures_2346", "Call target does not contain any signatures."),
+        Untyped_function_calls_may_not_accept_type_arguments: diag(2347, ts.DiagnosticCategory.Error, "Untyped_function_calls_may_not_accept_type_arguments_2347", "Untyped function calls may not accept type arguments."),
+        Value_of_type_0_is_not_callable_Did_you_mean_to_include_new: diag(2348, ts.DiagnosticCategory.Error, "Value_of_type_0_is_not_callable_Did_you_mean_to_include_new_2348", "Value of type '{0}' is not callable. Did you mean to include 'new'?"),
+        Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures: diag(2349, ts.DiagnosticCategory.Error, "Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatur_2349", "Cannot invoke an expression whose type lacks a call signature. Type '{0}' has no compatible call signatures."),
+        Only_a_void_function_can_be_called_with_the_new_keyword: diag(2350, ts.DiagnosticCategory.Error, "Only_a_void_function_can_be_called_with_the_new_keyword_2350", "Only a void function can be called with the 'new' keyword."),
+        Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: diag(2351, ts.DiagnosticCategory.Error, "Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature_2351", "Cannot use 'new' with an expression whose type lacks a call or construct signature."),
+        Conversion_of_type_0_to_type_1_may_be_a_mistake_because_neither_type_sufficiently_overlaps_with_the_other_If_this_was_intentional_convert_the_expression_to_unknown_first: diag(2352, ts.DiagnosticCategory.Error, "Conversion_of_type_0_to_type_1_may_be_a_mistake_because_neither_type_sufficiently_overlaps_with_the__2352", "Conversion of type '{0}' to type '{1}' may be a mistake because neither type sufficiently overlaps with the other. If this was intentional, convert the expression to 'unknown' first."),
+        Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: diag(2353, ts.DiagnosticCategory.Error, "Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1_2353", "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'."),
+        This_syntax_requires_an_imported_helper_but_module_0_cannot_be_found: diag(2354, ts.DiagnosticCategory.Error, "This_syntax_requires_an_imported_helper_but_module_0_cannot_be_found_2354", "This syntax requires an imported helper but module '{0}' cannot be found."),
+        A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value: diag(2355, ts.DiagnosticCategory.Error, "A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_2355", "A function whose declared type is neither 'void' nor 'any' must return a value."),
+        An_arithmetic_operand_must_be_of_type_any_number_bigint_or_an_enum_type: diag(2356, ts.DiagnosticCategory.Error, "An_arithmetic_operand_must_be_of_type_any_number_bigint_or_an_enum_type_2356", "An arithmetic operand must be of type 'any', 'number', 'bigint' or an enum type."),
+        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access: diag(2357, ts.DiagnosticCategory.Error, "The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access_2357", "The operand of an increment or decrement operator must be a variable or a property access."),
+        The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: diag(2358, ts.DiagnosticCategory.Error, "The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_paramete_2358", "The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter."),
+        The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type: diag(2359, ts.DiagnosticCategory.Error, "The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_F_2359", "The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type."),
+        The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol: diag(2360, ts.DiagnosticCategory.Error, "The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol_2360", "The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'."),
+        The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: diag(2361, ts.DiagnosticCategory.Error, "The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter_2361", "The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter."),
+        The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type: diag(2362, ts.DiagnosticCategory.Error, "The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type_2362", "The left-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type."),
+        The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type: diag(2363, ts.DiagnosticCategory.Error, "The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type_2363", "The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type."),
+        The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access: diag(2364, ts.DiagnosticCategory.Error, "The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access_2364", "The left-hand side of an assignment expression must be a variable or a property access."),
+        Operator_0_cannot_be_applied_to_types_1_and_2: diag(2365, ts.DiagnosticCategory.Error, "Operator_0_cannot_be_applied_to_types_1_and_2_2365", "Operator '{0}' cannot be applied to types '{1}' and '{2}'."),
+        Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined: diag(2366, ts.DiagnosticCategory.Error, "Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined_2366", "Function lacks ending return statement and return type does not include 'undefined'."),
+        This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap: diag(2367, ts.DiagnosticCategory.Error, "This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap_2367", "This condition will always return '{0}' since the types '{1}' and '{2}' have no overlap."),
+        Type_parameter_name_cannot_be_0: diag(2368, ts.DiagnosticCategory.Error, "Type_parameter_name_cannot_be_0_2368", "Type parameter name cannot be '{0}'."),
+        A_parameter_property_is_only_allowed_in_a_constructor_implementation: diag(2369, ts.DiagnosticCategory.Error, "A_parameter_property_is_only_allowed_in_a_constructor_implementation_2369", "A parameter property is only allowed in a constructor implementation."),
+        A_rest_parameter_must_be_of_an_array_type: diag(2370, ts.DiagnosticCategory.Error, "A_rest_parameter_must_be_of_an_array_type_2370", "A rest parameter must be of an array type."),
+        A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation: diag(2371, ts.DiagnosticCategory.Error, "A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation_2371", "A parameter initializer is only allowed in a function or constructor implementation."),
+        Parameter_0_cannot_be_referenced_in_its_initializer: diag(2372, ts.DiagnosticCategory.Error, "Parameter_0_cannot_be_referenced_in_its_initializer_2372", "Parameter '{0}' cannot be referenced in its initializer."),
+        Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it: diag(2373, ts.DiagnosticCategory.Error, "Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it_2373", "Initializer of parameter '{0}' cannot reference identifier '{1}' declared after it."),
+        Duplicate_string_index_signature: diag(2374, ts.DiagnosticCategory.Error, "Duplicate_string_index_signature_2374", "Duplicate string index signature."),
+        Duplicate_number_index_signature: diag(2375, ts.DiagnosticCategory.Error, "Duplicate_number_index_signature_2375", "Duplicate number index signature."),
+        A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties: diag(2376, ts.DiagnosticCategory.Error, "A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_proper_2376", "A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties."),
+        Constructors_for_derived_classes_must_contain_a_super_call: diag(2377, ts.DiagnosticCategory.Error, "Constructors_for_derived_classes_must_contain_a_super_call_2377", "Constructors for derived classes must contain a 'super' call."),
+        A_get_accessor_must_return_a_value: diag(2378, ts.DiagnosticCategory.Error, "A_get_accessor_must_return_a_value_2378", "A 'get' accessor must return a value."),
+        Getter_and_setter_accessors_do_not_agree_in_visibility: diag(2379, ts.DiagnosticCategory.Error, "Getter_and_setter_accessors_do_not_agree_in_visibility_2379", "Getter and setter accessors do not agree in visibility."),
+        get_and_set_accessor_must_have_the_same_type: diag(2380, ts.DiagnosticCategory.Error, "get_and_set_accessor_must_have_the_same_type_2380", "'get' and 'set' accessor must have the same type."),
+        A_signature_with_an_implementation_cannot_use_a_string_literal_type: diag(2381, ts.DiagnosticCategory.Error, "A_signature_with_an_implementation_cannot_use_a_string_literal_type_2381", "A signature with an implementation cannot use a string literal type."),
+        Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature: diag(2382, ts.DiagnosticCategory.Error, "Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature_2382", "Specialized overload signature is not assignable to any non-specialized signature."),
+        Overload_signatures_must_all_be_exported_or_non_exported: diag(2383, ts.DiagnosticCategory.Error, "Overload_signatures_must_all_be_exported_or_non_exported_2383", "Overload signatures must all be exported or non-exported."),
+        Overload_signatures_must_all_be_ambient_or_non_ambient: diag(2384, ts.DiagnosticCategory.Error, "Overload_signatures_must_all_be_ambient_or_non_ambient_2384", "Overload signatures must all be ambient or non-ambient."),
+        Overload_signatures_must_all_be_public_private_or_protected: diag(2385, ts.DiagnosticCategory.Error, "Overload_signatures_must_all_be_public_private_or_protected_2385", "Overload signatures must all be public, private or protected."),
+        Overload_signatures_must_all_be_optional_or_required: diag(2386, ts.DiagnosticCategory.Error, "Overload_signatures_must_all_be_optional_or_required_2386", "Overload signatures must all be optional or required."),
+        Function_overload_must_be_static: diag(2387, ts.DiagnosticCategory.Error, "Function_overload_must_be_static_2387", "Function overload must be static."),
+        Function_overload_must_not_be_static: diag(2388, ts.DiagnosticCategory.Error, "Function_overload_must_not_be_static_2388", "Function overload must not be static."),
+        Function_implementation_name_must_be_0: diag(2389, ts.DiagnosticCategory.Error, "Function_implementation_name_must_be_0_2389", "Function implementation name must be '{0}'."),
+        Constructor_implementation_is_missing: diag(2390, ts.DiagnosticCategory.Error, "Constructor_implementation_is_missing_2390", "Constructor implementation is missing."),
+        Function_implementation_is_missing_or_not_immediately_following_the_declaration: diag(2391, ts.DiagnosticCategory.Error, "Function_implementation_is_missing_or_not_immediately_following_the_declaration_2391", "Function implementation is missing or not immediately following the declaration."),
+        Multiple_constructor_implementations_are_not_allowed: diag(2392, ts.DiagnosticCategory.Error, "Multiple_constructor_implementations_are_not_allowed_2392", "Multiple constructor implementations are not allowed."),
+        Duplicate_function_implementation: diag(2393, ts.DiagnosticCategory.Error, "Duplicate_function_implementation_2393", "Duplicate function implementation."),
+        Overload_signature_is_not_compatible_with_function_implementation: diag(2394, ts.DiagnosticCategory.Error, "Overload_signature_is_not_compatible_with_function_implementation_2394", "Overload signature is not compatible with function implementation."),
+        Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local: diag(2395, ts.DiagnosticCategory.Error, "Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local_2395", "Individual declarations in merged declaration '{0}' must be all exported or all local."),
+        Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters: diag(2396, ts.DiagnosticCategory.Error, "Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters_2396", "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters."),
+        Declaration_name_conflicts_with_built_in_global_identifier_0: diag(2397, ts.DiagnosticCategory.Error, "Declaration_name_conflicts_with_built_in_global_identifier_0_2397", "Declaration name conflicts with built-in global identifier '{0}'."),
+        Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference: diag(2399, ts.DiagnosticCategory.Error, "Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference_2399", "Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference."),
+        Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference: diag(2400, ts.DiagnosticCategory.Error, "Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference_2400", "Expression resolves to variable declaration '_this' that compiler uses to capture 'this' reference."),
+        Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference: diag(2401, ts.DiagnosticCategory.Error, "Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference_2401", "Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference."),
+        Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference: diag(2402, ts.DiagnosticCategory.Error, "Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference_2402", "Expression resolves to '_super' that compiler uses to capture base class reference."),
+        Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2: diag(2403, ts.DiagnosticCategory.Error, "Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_t_2403", "Subsequent variable declarations must have the same type.  Variable '{0}' must be of type '{1}', but here has type '{2}'."),
+        The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation: diag(2404, ts.DiagnosticCategory.Error, "The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation_2404", "The left-hand side of a 'for...in' statement cannot use a type annotation."),
+        The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any: diag(2405, ts.DiagnosticCategory.Error, "The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any_2405", "The left-hand side of a 'for...in' statement must be of type 'string' or 'any'."),
+        The_left_hand_side_of_a_for_in_statement_must_be_a_variable_or_a_property_access: diag(2406, ts.DiagnosticCategory.Error, "The_left_hand_side_of_a_for_in_statement_must_be_a_variable_or_a_property_access_2406", "The left-hand side of a 'for...in' statement must be a variable or a property access."),
+        The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter_but_here_has_type_0: diag(2407, ts.DiagnosticCategory.Error, "The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter_but_2407", "The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter, but here has type '{0}'."),
+        Setters_cannot_return_a_value: diag(2408, ts.DiagnosticCategory.Error, "Setters_cannot_return_a_value_2408", "Setters cannot return a value."),
+        Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class: diag(2409, ts.DiagnosticCategory.Error, "Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class_2409", "Return type of constructor signature must be assignable to the instance type of the class."),
+        The_with_statement_is_not_supported_All_symbols_in_a_with_block_will_have_type_any: diag(2410, ts.DiagnosticCategory.Error, "The_with_statement_is_not_supported_All_symbols_in_a_with_block_will_have_type_any_2410", "The 'with' statement is not supported. All symbols in a 'with' block will have type 'any'."),
+        Property_0_of_type_1_is_not_assignable_to_string_index_type_2: diag(2411, ts.DiagnosticCategory.Error, "Property_0_of_type_1_is_not_assignable_to_string_index_type_2_2411", "Property '{0}' of type '{1}' is not assignable to string index type '{2}'."),
+        Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2: diag(2412, ts.DiagnosticCategory.Error, "Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2_2412", "Property '{0}' of type '{1}' is not assignable to numeric index type '{2}'."),
+        Numeric_index_type_0_is_not_assignable_to_string_index_type_1: diag(2413, ts.DiagnosticCategory.Error, "Numeric_index_type_0_is_not_assignable_to_string_index_type_1_2413", "Numeric index type '{0}' is not assignable to string index type '{1}'."),
+        Class_name_cannot_be_0: diag(2414, ts.DiagnosticCategory.Error, "Class_name_cannot_be_0_2414", "Class name cannot be '{0}'."),
+        Class_0_incorrectly_extends_base_class_1: diag(2415, ts.DiagnosticCategory.Error, "Class_0_incorrectly_extends_base_class_1_2415", "Class '{0}' incorrectly extends base class '{1}'."),
+        Property_0_in_type_1_is_not_assignable_to_the_same_property_in_base_type_2: diag(2416, ts.DiagnosticCategory.Error, "Property_0_in_type_1_is_not_assignable_to_the_same_property_in_base_type_2_2416", "Property '{0}' in type '{1}' is not assignable to the same property in base type '{2}'."),
+        Class_static_side_0_incorrectly_extends_base_class_static_side_1: diag(2417, ts.DiagnosticCategory.Error, "Class_static_side_0_incorrectly_extends_base_class_static_side_1_2417", "Class static side '{0}' incorrectly extends base class static side '{1}'."),
+        Type_of_computed_property_s_value_is_0_which_is_not_assignable_to_type_1: diag(2418, ts.DiagnosticCategory.Error, "Type_of_computed_property_s_value_is_0_which_is_not_assignable_to_type_1_2418", "Type of computed property's value is '{0}', which is not assignable to type '{1}'."),
+        Class_0_incorrectly_implements_interface_1: diag(2420, ts.DiagnosticCategory.Error, "Class_0_incorrectly_implements_interface_1_2420", "Class '{0}' incorrectly implements interface '{1}'."),
+        A_class_can_only_implement_an_object_type_or_intersection_of_object_types_with_statically_known_members: diag(2422, ts.DiagnosticCategory.Error, "A_class_can_only_implement_an_object_type_or_intersection_of_object_types_with_statically_known_memb_2422", "A class can only implement an object type or intersection of object types with statically known members."),
+        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor: diag(2423, ts.DiagnosticCategory.Error, "Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_access_2423", "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member accessor."),
+        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_property: diag(2424, ts.DiagnosticCategory.Error, "Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_proper_2424", "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member property."),
+        Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function: diag(2425, ts.DiagnosticCategory.Error, "Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_functi_2425", "Class '{0}' defines instance member property '{1}', but extended class '{2}' defines it as instance member function."),
+        Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function: diag(2426, ts.DiagnosticCategory.Error, "Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_functi_2426", "Class '{0}' defines instance member accessor '{1}', but extended class '{2}' defines it as instance member function."),
+        Interface_name_cannot_be_0: diag(2427, ts.DiagnosticCategory.Error, "Interface_name_cannot_be_0_2427", "Interface name cannot be '{0}'."),
+        All_declarations_of_0_must_have_identical_type_parameters: diag(2428, ts.DiagnosticCategory.Error, "All_declarations_of_0_must_have_identical_type_parameters_2428", "All declarations of '{0}' must have identical type parameters."),
+        Interface_0_incorrectly_extends_interface_1: diag(2430, ts.DiagnosticCategory.Error, "Interface_0_incorrectly_extends_interface_1_2430", "Interface '{0}' incorrectly extends interface '{1}'."),
+        Enum_name_cannot_be_0: diag(2431, ts.DiagnosticCategory.Error, "Enum_name_cannot_be_0_2431", "Enum name cannot be '{0}'."),
+        In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element: diag(2432, ts.DiagnosticCategory.Error, "In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enu_2432", "In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element."),
+        A_namespace_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merged: diag(2433, ts.DiagnosticCategory.Error, "A_namespace_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merg_2433", "A namespace declaration cannot be in a different file from a class or function with which it is merged."),
+        A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged: diag(2434, ts.DiagnosticCategory.Error, "A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged_2434", "A namespace declaration cannot be located prior to a class or function with which it is merged."),
+        Ambient_modules_cannot_be_nested_in_other_modules_or_namespaces: diag(2435, ts.DiagnosticCategory.Error, "Ambient_modules_cannot_be_nested_in_other_modules_or_namespaces_2435", "Ambient modules cannot be nested in other modules or namespaces."),
+        Ambient_module_declaration_cannot_specify_relative_module_name: diag(2436, ts.DiagnosticCategory.Error, "Ambient_module_declaration_cannot_specify_relative_module_name_2436", "Ambient module declaration cannot specify relative module name."),
+        Module_0_is_hidden_by_a_local_declaration_with_the_same_name: diag(2437, ts.DiagnosticCategory.Error, "Module_0_is_hidden_by_a_local_declaration_with_the_same_name_2437", "Module '{0}' is hidden by a local declaration with the same name."),
+        Import_name_cannot_be_0: diag(2438, ts.DiagnosticCategory.Error, "Import_name_cannot_be_0_2438", "Import name cannot be '{0}'."),
+        Import_or_export_declaration_in_an_ambient_module_declaration_cannot_reference_module_through_relative_module_name: diag(2439, ts.DiagnosticCategory.Error, "Import_or_export_declaration_in_an_ambient_module_declaration_cannot_reference_module_through_relati_2439", "Import or export declaration in an ambient module declaration cannot reference module through relative module name."),
+        Import_declaration_conflicts_with_local_declaration_of_0: diag(2440, ts.DiagnosticCategory.Error, "Import_declaration_conflicts_with_local_declaration_of_0_2440", "Import declaration conflicts with local declaration of '{0}'."),
+        Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module: diag(2441, ts.DiagnosticCategory.Error, "Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_2441", "Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of a module."),
+        Types_have_separate_declarations_of_a_private_property_0: diag(2442, ts.DiagnosticCategory.Error, "Types_have_separate_declarations_of_a_private_property_0_2442", "Types have separate declarations of a private property '{0}'."),
+        Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2: diag(2443, ts.DiagnosticCategory.Error, "Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2_2443", "Property '{0}' is protected but type '{1}' is not a class derived from '{2}'."),
+        Property_0_is_protected_in_type_1_but_public_in_type_2: diag(2444, ts.DiagnosticCategory.Error, "Property_0_is_protected_in_type_1_but_public_in_type_2_2444", "Property '{0}' is protected in type '{1}' but public in type '{2}'."),
+        Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses: diag(2445, ts.DiagnosticCategory.Error, "Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses_2445", "Property '{0}' is protected and only accessible within class '{1}' and its subclasses."),
+        Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: diag(2446, ts.DiagnosticCategory.Error, "Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1_2446", "Property '{0}' is protected and only accessible through an instance of class '{1}'."),
+        The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: diag(2447, ts.DiagnosticCategory.Error, "The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead_2447", "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead."),
+        Block_scoped_variable_0_used_before_its_declaration: diag(2448, ts.DiagnosticCategory.Error, "Block_scoped_variable_0_used_before_its_declaration_2448", "Block-scoped variable '{0}' used before its declaration."),
+        Class_0_used_before_its_declaration: diag(2449, ts.DiagnosticCategory.Error, "Class_0_used_before_its_declaration_2449", "Class '{0}' used before its declaration."),
+        Enum_0_used_before_its_declaration: diag(2450, ts.DiagnosticCategory.Error, "Enum_0_used_before_its_declaration_2450", "Enum '{0}' used before its declaration."),
+        Cannot_redeclare_block_scoped_variable_0: diag(2451, ts.DiagnosticCategory.Error, "Cannot_redeclare_block_scoped_variable_0_2451", "Cannot redeclare block-scoped variable '{0}'."),
+        An_enum_member_cannot_have_a_numeric_name: diag(2452, ts.DiagnosticCategory.Error, "An_enum_member_cannot_have_a_numeric_name_2452", "An enum member cannot have a numeric name."),
+        The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: diag(2453, ts.DiagnosticCategory.Error, "The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_typ_2453", "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly."),
+        Variable_0_is_used_before_being_assigned: diag(2454, ts.DiagnosticCategory.Error, "Variable_0_is_used_before_being_assigned_2454", "Variable '{0}' is used before being assigned."),
+        Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0: diag(2455, ts.DiagnosticCategory.Error, "Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0_2455", "Type argument candidate '{1}' is not a valid type argument because it is not a supertype of candidate '{0}'."),
+        Type_alias_0_circularly_references_itself: diag(2456, ts.DiagnosticCategory.Error, "Type_alias_0_circularly_references_itself_2456", "Type alias '{0}' circularly references itself."),
+        Type_alias_name_cannot_be_0: diag(2457, ts.DiagnosticCategory.Error, "Type_alias_name_cannot_be_0_2457", "Type alias name cannot be '{0}'."),
+        An_AMD_module_cannot_have_multiple_name_assignments: diag(2458, ts.DiagnosticCategory.Error, "An_AMD_module_cannot_have_multiple_name_assignments_2458", "An AMD module cannot have multiple name assignments."),
+        Type_0_is_not_an_array_type: diag(2461, ts.DiagnosticCategory.Error, "Type_0_is_not_an_array_type_2461", "Type '{0}' is not an array type."),
+        A_rest_element_must_be_last_in_a_destructuring_pattern: diag(2462, ts.DiagnosticCategory.Error, "A_rest_element_must_be_last_in_a_destructuring_pattern_2462", "A rest element must be last in a destructuring pattern."),
+        A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature: diag(2463, ts.DiagnosticCategory.Error, "A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature_2463", "A binding pattern parameter cannot be optional in an implementation signature."),
+        A_computed_property_name_must_be_of_type_string_number_symbol_or_any: diag(2464, ts.DiagnosticCategory.Error, "A_computed_property_name_must_be_of_type_string_number_symbol_or_any_2464", "A computed property name must be of type 'string', 'number', 'symbol', or 'any'."),
+        this_cannot_be_referenced_in_a_computed_property_name: diag(2465, ts.DiagnosticCategory.Error, "this_cannot_be_referenced_in_a_computed_property_name_2465", "'this' cannot be referenced in a computed property name."),
+        super_cannot_be_referenced_in_a_computed_property_name: diag(2466, ts.DiagnosticCategory.Error, "super_cannot_be_referenced_in_a_computed_property_name_2466", "'super' cannot be referenced in a computed property name."),
+        A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type: diag(2467, ts.DiagnosticCategory.Error, "A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type_2467", "A computed property name cannot reference a type parameter from its containing type."),
+        Cannot_find_global_value_0: diag(2468, ts.DiagnosticCategory.Error, "Cannot_find_global_value_0_2468", "Cannot find global value '{0}'."),
+        The_0_operator_cannot_be_applied_to_type_symbol: diag(2469, ts.DiagnosticCategory.Error, "The_0_operator_cannot_be_applied_to_type_symbol_2469", "The '{0}' operator cannot be applied to type 'symbol'."),
+        Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object: diag(2470, ts.DiagnosticCategory.Error, "Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object_2470", "'Symbol' reference does not refer to the global Symbol constructor object."),
+        A_computed_property_name_of_the_form_0_must_be_of_type_symbol: diag(2471, ts.DiagnosticCategory.Error, "A_computed_property_name_of_the_form_0_must_be_of_type_symbol_2471", "A computed property name of the form '{0}' must be of type 'symbol'."),
+        Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher: diag(2472, ts.DiagnosticCategory.Error, "Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher_2472", "Spread operator in 'new' expressions is only available when targeting ECMAScript 5 and higher."),
+        Enum_declarations_must_all_be_const_or_non_const: diag(2473, ts.DiagnosticCategory.Error, "Enum_declarations_must_all_be_const_or_non_const_2473", "Enum declarations must all be const or non-const."),
+        const_enum_member_initializers_can_only_contain_literal_values_and_other_computed_enum_values: diag(2474, ts.DiagnosticCategory.Error, "const_enum_member_initializers_can_only_contain_literal_values_and_other_computed_enum_values_2474", "const enum member initializers can only contain literal values and other computed enum values."),
+        const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment_or_type_query: diag(2475, ts.DiagnosticCategory.Error, "const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_im_2475", "'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment or type query."),
+        A_const_enum_member_can_only_be_accessed_using_a_string_literal: diag(2476, ts.DiagnosticCategory.Error, "A_const_enum_member_can_only_be_accessed_using_a_string_literal_2476", "A const enum member can only be accessed using a string literal."),
+        const_enum_member_initializer_was_evaluated_to_a_non_finite_value: diag(2477, ts.DiagnosticCategory.Error, "const_enum_member_initializer_was_evaluated_to_a_non_finite_value_2477", "'const' enum member initializer was evaluated to a non-finite value."),
+        const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN: diag(2478, ts.DiagnosticCategory.Error, "const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN_2478", "'const' enum member initializer was evaluated to disallowed value 'NaN'."),
+        Property_0_does_not_exist_on_const_enum_1: diag(2479, ts.DiagnosticCategory.Error, "Property_0_does_not_exist_on_const_enum_1_2479", "Property '{0}' does not exist on 'const' enum '{1}'."),
+        let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations: diag(2480, ts.DiagnosticCategory.Error, "let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations_2480", "'let' is not allowed to be used as a name in 'let' or 'const' declarations."),
+        Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: diag(2481, ts.DiagnosticCategory.Error, "Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1_2481", "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'."),
+        The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: diag(2483, ts.DiagnosticCategory.Error, "The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation_2483", "The left-hand side of a 'for...of' statement cannot use a type annotation."),
+        Export_declaration_conflicts_with_exported_declaration_of_0: diag(2484, ts.DiagnosticCategory.Error, "Export_declaration_conflicts_with_exported_declaration_of_0_2484", "Export declaration conflicts with exported declaration of '{0}'."),
+        The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access: diag(2487, ts.DiagnosticCategory.Error, "The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access_2487", "The left-hand side of a 'for...of' statement must be a variable or a property access."),
+        Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator: diag(2488, ts.DiagnosticCategory.Error, "Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488", "Type '{0}' must have a '[Symbol.iterator]()' method that returns an iterator."),
+        An_iterator_must_have_a_next_method: diag(2489, ts.DiagnosticCategory.Error, "An_iterator_must_have_a_next_method_2489", "An iterator must have a 'next()' method."),
+        The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: diag(2490, ts.DiagnosticCategory.Error, "The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property_2490", "The type returned by the 'next()' method of an iterator must have a 'value' property."),
+        The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: diag(2491, ts.DiagnosticCategory.Error, "The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern_2491", "The left-hand side of a 'for...in' statement cannot be a destructuring pattern."),
+        Cannot_redeclare_identifier_0_in_catch_clause: diag(2492, ts.DiagnosticCategory.Error, "Cannot_redeclare_identifier_0_in_catch_clause_2492", "Cannot redeclare identifier '{0}' in catch clause."),
+        Tuple_type_0_of_length_1_has_no_element_at_index_2: diag(2493, ts.DiagnosticCategory.Error, "Tuple_type_0_of_length_1_has_no_element_at_index_2_2493", "Tuple type '{0}' of length '{1}' has no element at index '{2}'."),
+        Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher: diag(2494, ts.DiagnosticCategory.Error, "Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher_2494", "Using a string in a 'for...of' statement is only supported in ECMAScript 5 and higher."),
+        Type_0_is_not_an_array_type_or_a_string_type: diag(2495, ts.DiagnosticCategory.Error, "Type_0_is_not_an_array_type_or_a_string_type_2495", "Type '{0}' is not an array type or a string type."),
+        The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression: diag(2496, ts.DiagnosticCategory.Error, "The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_stand_2496", "The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression."),
+        This_module_can_only_be_referenced_with_ECMAScript_imports_Slashexports_by_turning_on_the_0_flag_and_referencing_its_default_export: diag(2497, ts.DiagnosticCategory.Error, "This_module_can_only_be_referenced_with_ECMAScript_imports_Slashexports_by_turning_on_the_0_flag_and_2497", "This module can only be referenced with ECMAScript imports/exports by turning on the '{0}' flag and referencing its default export."),
+        Module_0_uses_export_and_cannot_be_used_with_export_Asterisk: diag(2498, ts.DiagnosticCategory.Error, "Module_0_uses_export_and_cannot_be_used_with_export_Asterisk_2498", "Module '{0}' uses 'export =' and cannot be used with 'export *'."),
+        An_interface_can_only_extend_an_identifier_Slashqualified_name_with_optional_type_arguments: diag(2499, ts.DiagnosticCategory.Error, "An_interface_can_only_extend_an_identifier_Slashqualified_name_with_optional_type_arguments_2499", "An interface can only extend an identifier/qualified-name with optional type arguments."),
+        A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments: diag(2500, ts.DiagnosticCategory.Error, "A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments_2500", "A class can only implement an identifier/qualified-name with optional type arguments."),
+        A_rest_element_cannot_contain_a_binding_pattern: diag(2501, ts.DiagnosticCategory.Error, "A_rest_element_cannot_contain_a_binding_pattern_2501", "A rest element cannot contain a binding pattern."),
+        _0_is_referenced_directly_or_indirectly_in_its_own_type_annotation: diag(2502, ts.DiagnosticCategory.Error, "_0_is_referenced_directly_or_indirectly_in_its_own_type_annotation_2502", "'{0}' is referenced directly or indirectly in its own type annotation."),
+        Cannot_find_namespace_0: diag(2503, ts.DiagnosticCategory.Error, "Cannot_find_namespace_0_2503", "Cannot find namespace '{0}'."),
+        Type_0_must_have_a_Symbol_asyncIterator_method_that_returns_an_async_iterator: diag(2504, ts.DiagnosticCategory.Error, "Type_0_must_have_a_Symbol_asyncIterator_method_that_returns_an_async_iterator_2504", "Type '{0}' must have a '[Symbol.asyncIterator]()' method that returns an async iterator."),
+        A_generator_cannot_have_a_void_type_annotation: diag(2505, ts.DiagnosticCategory.Error, "A_generator_cannot_have_a_void_type_annotation_2505", "A generator cannot have a 'void' type annotation."),
+        _0_is_referenced_directly_or_indirectly_in_its_own_base_expression: diag(2506, ts.DiagnosticCategory.Error, "_0_is_referenced_directly_or_indirectly_in_its_own_base_expression_2506", "'{0}' is referenced directly or indirectly in its own base expression."),
+        Type_0_is_not_a_constructor_function_type: diag(2507, ts.DiagnosticCategory.Error, "Type_0_is_not_a_constructor_function_type_2507", "Type '{0}' is not a constructor function type."),
+        No_base_constructor_has_the_specified_number_of_type_arguments: diag(2508, ts.DiagnosticCategory.Error, "No_base_constructor_has_the_specified_number_of_type_arguments_2508", "No base constructor has the specified number of type arguments."),
+        Base_constructor_return_type_0_is_not_an_object_type_or_intersection_of_object_types_with_statically_known_members: diag(2509, ts.DiagnosticCategory.Error, "Base_constructor_return_type_0_is_not_an_object_type_or_intersection_of_object_types_with_statically_2509", "Base constructor return type '{0}' is not an object type or intersection of object types with statically known members."),
+        Base_constructors_must_all_have_the_same_return_type: diag(2510, ts.DiagnosticCategory.Error, "Base_constructors_must_all_have_the_same_return_type_2510", "Base constructors must all have the same return type."),
+        Cannot_create_an_instance_of_an_abstract_class: diag(2511, ts.DiagnosticCategory.Error, "Cannot_create_an_instance_of_an_abstract_class_2511", "Cannot create an instance of an abstract class."),
+        Overload_signatures_must_all_be_abstract_or_non_abstract: diag(2512, ts.DiagnosticCategory.Error, "Overload_signatures_must_all_be_abstract_or_non_abstract_2512", "Overload signatures must all be abstract or non-abstract."),
+        Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression: diag(2513, ts.DiagnosticCategory.Error, "Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression_2513", "Abstract method '{0}' in class '{1}' cannot be accessed via super expression."),
+        Classes_containing_abstract_methods_must_be_marked_abstract: diag(2514, ts.DiagnosticCategory.Error, "Classes_containing_abstract_methods_must_be_marked_abstract_2514", "Classes containing abstract methods must be marked abstract."),
+        Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2: diag(2515, ts.DiagnosticCategory.Error, "Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2_2515", "Non-abstract class '{0}' does not implement inherited abstract member '{1}' from class '{2}'."),
+        All_declarations_of_an_abstract_method_must_be_consecutive: diag(2516, ts.DiagnosticCategory.Error, "All_declarations_of_an_abstract_method_must_be_consecutive_2516", "All declarations of an abstract method must be consecutive."),
+        Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type: diag(2517, ts.DiagnosticCategory.Error, "Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type_2517", "Cannot assign an abstract constructor type to a non-abstract constructor type."),
+        A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard: diag(2518, ts.DiagnosticCategory.Error, "A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard_2518", "A 'this'-based type guard is not compatible with a parameter-based type guard."),
+        An_async_iterator_must_have_a_next_method: diag(2519, ts.DiagnosticCategory.Error, "An_async_iterator_must_have_a_next_method_2519", "An async iterator must have a 'next()' method."),
+        Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions: diag(2520, ts.DiagnosticCategory.Error, "Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions_2520", "Duplicate identifier '{0}'. Compiler uses declaration '{1}' to support async functions."),
+        Expression_resolves_to_variable_declaration_0_that_compiler_uses_to_support_async_functions: diag(2521, ts.DiagnosticCategory.Error, "Expression_resolves_to_variable_declaration_0_that_compiler_uses_to_support_async_functions_2521", "Expression resolves to variable declaration '{0}' that compiler uses to support async functions."),
+        The_arguments_object_cannot_be_referenced_in_an_async_function_or_method_in_ES3_and_ES5_Consider_using_a_standard_function_or_method: diag(2522, ts.DiagnosticCategory.Error, "The_arguments_object_cannot_be_referenced_in_an_async_function_or_method_in_ES3_and_ES5_Consider_usi_2522", "The 'arguments' object cannot be referenced in an async function or method in ES3 and ES5. Consider using a standard function or method."),
+        yield_expressions_cannot_be_used_in_a_parameter_initializer: diag(2523, ts.DiagnosticCategory.Error, "yield_expressions_cannot_be_used_in_a_parameter_initializer_2523", "'yield' expressions cannot be used in a parameter initializer."),
+        await_expressions_cannot_be_used_in_a_parameter_initializer: diag(2524, ts.DiagnosticCategory.Error, "await_expressions_cannot_be_used_in_a_parameter_initializer_2524", "'await' expressions cannot be used in a parameter initializer."),
+        Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value: diag(2525, ts.DiagnosticCategory.Error, "Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value_2525", "Initializer provides no value for this binding element and the binding element has no default value."),
+        A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface: diag(2526, ts.DiagnosticCategory.Error, "A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface_2526", "A 'this' type is available only in a non-static member of a class or interface."),
+        The_inferred_type_of_0_references_an_inaccessible_1_type_A_type_annotation_is_necessary: diag(2527, ts.DiagnosticCategory.Error, "The_inferred_type_of_0_references_an_inaccessible_1_type_A_type_annotation_is_necessary_2527", "The inferred type of '{0}' references an inaccessible '{1}' type. A type annotation is necessary."),
+        A_module_cannot_have_multiple_default_exports: diag(2528, ts.DiagnosticCategory.Error, "A_module_cannot_have_multiple_default_exports_2528", "A module cannot have multiple default exports."),
+        Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions: diag(2529, ts.DiagnosticCategory.Error, "Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_func_2529", "Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of a module containing async functions."),
+        Property_0_is_incompatible_with_index_signature: diag(2530, ts.DiagnosticCategory.Error, "Property_0_is_incompatible_with_index_signature_2530", "Property '{0}' is incompatible with index signature."),
+        Object_is_possibly_null: diag(2531, ts.DiagnosticCategory.Error, "Object_is_possibly_null_2531", "Object is possibly 'null'."),
+        Object_is_possibly_undefined: diag(2532, ts.DiagnosticCategory.Error, "Object_is_possibly_undefined_2532", "Object is possibly 'undefined'."),
+        Object_is_possibly_null_or_undefined: diag(2533, ts.DiagnosticCategory.Error, "Object_is_possibly_null_or_undefined_2533", "Object is possibly 'null' or 'undefined'."),
+        A_function_returning_never_cannot_have_a_reachable_end_point: diag(2534, ts.DiagnosticCategory.Error, "A_function_returning_never_cannot_have_a_reachable_end_point_2534", "A function returning 'never' cannot have a reachable end point."),
+        Enum_type_0_has_members_with_initializers_that_are_not_literals: diag(2535, ts.DiagnosticCategory.Error, "Enum_type_0_has_members_with_initializers_that_are_not_literals_2535", "Enum type '{0}' has members with initializers that are not literals."),
+        Type_0_cannot_be_used_to_index_type_1: diag(2536, ts.DiagnosticCategory.Error, "Type_0_cannot_be_used_to_index_type_1_2536", "Type '{0}' cannot be used to index type '{1}'."),
+        Type_0_has_no_matching_index_signature_for_type_1: diag(2537, ts.DiagnosticCategory.Error, "Type_0_has_no_matching_index_signature_for_type_1_2537", "Type '{0}' has no matching index signature for type '{1}'."),
+        Type_0_cannot_be_used_as_an_index_type: diag(2538, ts.DiagnosticCategory.Error, "Type_0_cannot_be_used_as_an_index_type_2538", "Type '{0}' cannot be used as an index type."),
+        Cannot_assign_to_0_because_it_is_not_a_variable: diag(2539, ts.DiagnosticCategory.Error, "Cannot_assign_to_0_because_it_is_not_a_variable_2539", "Cannot assign to '{0}' because it is not a variable."),
+        Cannot_assign_to_0_because_it_is_a_read_only_property: diag(2540, ts.DiagnosticCategory.Error, "Cannot_assign_to_0_because_it_is_a_read_only_property_2540", "Cannot assign to '{0}' because it is a read-only property."),
+        The_target_of_an_assignment_must_be_a_variable_or_a_property_access: diag(2541, ts.DiagnosticCategory.Error, "The_target_of_an_assignment_must_be_a_variable_or_a_property_access_2541", "The target of an assignment must be a variable or a property access."),
+        Index_signature_in_type_0_only_permits_reading: diag(2542, ts.DiagnosticCategory.Error, "Index_signature_in_type_0_only_permits_reading_2542", "Index signature in type '{0}' only permits reading."),
+        Duplicate_identifier_newTarget_Compiler_uses_variable_declaration_newTarget_to_capture_new_target_meta_property_reference: diag(2543, ts.DiagnosticCategory.Error, "Duplicate_identifier_newTarget_Compiler_uses_variable_declaration_newTarget_to_capture_new_target_me_2543", "Duplicate identifier '_newTarget'. Compiler uses variable declaration '_newTarget' to capture 'new.target' meta-property reference."),
+        Expression_resolves_to_variable_declaration_newTarget_that_compiler_uses_to_capture_new_target_meta_property_reference: diag(2544, ts.DiagnosticCategory.Error, "Expression_resolves_to_variable_declaration_newTarget_that_compiler_uses_to_capture_new_target_meta__2544", "Expression resolves to variable declaration '_newTarget' that compiler uses to capture 'new.target' meta-property reference."),
+        A_mixin_class_must_have_a_constructor_with_a_single_rest_parameter_of_type_any: diag(2545, ts.DiagnosticCategory.Error, "A_mixin_class_must_have_a_constructor_with_a_single_rest_parameter_of_type_any_2545", "A mixin class must have a constructor with a single rest parameter of type 'any[]'."),
+        Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1: diag(2546, ts.DiagnosticCategory.Error, "Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1_2546", "Property '{0}' has conflicting declarations and is inaccessible in type '{1}'."),
+        The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property: diag(2547, ts.DiagnosticCategory.Error, "The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value__2547", "The type returned by the 'next()' method of an async iterator must be a promise for a type with a 'value' property."),
+        Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator: diag(2548, ts.DiagnosticCategory.Error, "Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator_2548", "Type '{0}' is not an array type or does not have a '[Symbol.iterator]()' method that returns an iterator."),
+        Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator: diag(2549, ts.DiagnosticCategory.Error, "Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns__2549", "Type '{0}' is not an array type or a string type or does not have a '[Symbol.iterator]()' method that returns an iterator."),
+        Property_0_does_not_exist_on_type_1_Did_you_mean_2: diag(2551, ts.DiagnosticCategory.Error, "Property_0_does_not_exist_on_type_1_Did_you_mean_2_2551", "Property '{0}' does not exist on type '{1}'. Did you mean '{2}'?"),
+        Cannot_find_name_0_Did_you_mean_1: diag(2552, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Did_you_mean_1_2552", "Cannot find name '{0}'. Did you mean '{1}'?"),
+        Computed_values_are_not_permitted_in_an_enum_with_string_valued_members: diag(2553, ts.DiagnosticCategory.Error, "Computed_values_are_not_permitted_in_an_enum_with_string_valued_members_2553", "Computed values are not permitted in an enum with string valued members."),
+        Expected_0_arguments_but_got_1: diag(2554, ts.DiagnosticCategory.Error, "Expected_0_arguments_but_got_1_2554", "Expected {0} arguments, but got {1}."),
+        Expected_at_least_0_arguments_but_got_1: diag(2555, ts.DiagnosticCategory.Error, "Expected_at_least_0_arguments_but_got_1_2555", "Expected at least {0} arguments, but got {1}."),
+        Expected_0_arguments_but_got_1_or_more: diag(2556, ts.DiagnosticCategory.Error, "Expected_0_arguments_but_got_1_or_more_2556", "Expected {0} arguments, but got {1} or more."),
+        Expected_at_least_0_arguments_but_got_1_or_more: diag(2557, ts.DiagnosticCategory.Error, "Expected_at_least_0_arguments_but_got_1_or_more_2557", "Expected at least {0} arguments, but got {1} or more."),
+        Expected_0_type_arguments_but_got_1: diag(2558, ts.DiagnosticCategory.Error, "Expected_0_type_arguments_but_got_1_2558", "Expected {0} type arguments, but got {1}."),
+        Type_0_has_no_properties_in_common_with_type_1: diag(2559, ts.DiagnosticCategory.Error, "Type_0_has_no_properties_in_common_with_type_1_2559", "Type '{0}' has no properties in common with type '{1}'."),
+        Value_of_type_0_has_no_properties_in_common_with_type_1_Did_you_mean_to_call_it: diag(2560, ts.DiagnosticCategory.Error, "Value_of_type_0_has_no_properties_in_common_with_type_1_Did_you_mean_to_call_it_2560", "Value of type '{0}' has no properties in common with type '{1}'. Did you mean to call it?"),
+        Object_literal_may_only_specify_known_properties_but_0_does_not_exist_in_type_1_Did_you_mean_to_write_2: diag(2561, ts.DiagnosticCategory.Error, "Object_literal_may_only_specify_known_properties_but_0_does_not_exist_in_type_1_Did_you_mean_to_writ_2561", "Object literal may only specify known properties, but '{0}' does not exist in type '{1}'. Did you mean to write '{2}'?"),
+        Base_class_expressions_cannot_reference_class_type_parameters: diag(2562, ts.DiagnosticCategory.Error, "Base_class_expressions_cannot_reference_class_type_parameters_2562", "Base class expressions cannot reference class type parameters."),
+        The_containing_function_or_module_body_is_too_large_for_control_flow_analysis: diag(2563, ts.DiagnosticCategory.Error, "The_containing_function_or_module_body_is_too_large_for_control_flow_analysis_2563", "The containing function or module body is too large for control flow analysis."),
+        Property_0_has_no_initializer_and_is_not_definitely_assigned_in_the_constructor: diag(2564, ts.DiagnosticCategory.Error, "Property_0_has_no_initializer_and_is_not_definitely_assigned_in_the_constructor_2564", "Property '{0}' has no initializer and is not definitely assigned in the constructor."),
+        Property_0_is_used_before_being_assigned: diag(2565, ts.DiagnosticCategory.Error, "Property_0_is_used_before_being_assigned_2565", "Property '{0}' is used before being assigned."),
+        A_rest_element_cannot_have_a_property_name: diag(2566, ts.DiagnosticCategory.Error, "A_rest_element_cannot_have_a_property_name_2566", "A rest element cannot have a property name."),
+        Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations: diag(2567, ts.DiagnosticCategory.Error, "Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations_2567", "Enum declarations can only merge with namespace or other enum declarations."),
+        Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators: diag(2569, ts.DiagnosticCategory.Error, "Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterati_2569", "Type '{0}' is not an array type or a string type. Use compiler option '--downlevelIteration' to allow iterating of iterators."),
+        Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await: diag(2570, ts.DiagnosticCategory.Error, "Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await_2570", "Property '{0}' does not exist on type '{1}'. Did you forget to use 'await'?"),
+        Object_is_of_type_unknown: diag(2571, ts.DiagnosticCategory.Error, "Object_is_of_type_unknown_2571", "Object is of type 'unknown'."),
+        Rest_signatures_are_incompatible: diag(2572, ts.DiagnosticCategory.Error, "Rest_signatures_are_incompatible_2572", "Rest signatures are incompatible."),
+        Property_0_is_incompatible_with_rest_element_type: diag(2573, ts.DiagnosticCategory.Error, "Property_0_is_incompatible_with_rest_element_type_2573", "Property '{0}' is incompatible with rest element type."),
+        A_rest_element_type_must_be_an_array_type: diag(2574, ts.DiagnosticCategory.Error, "A_rest_element_type_must_be_an_array_type_2574", "A rest element type must be an array type."),
+        No_overload_expects_0_arguments_but_overloads_do_exist_that_expect_either_1_or_2_arguments: diag(2575, ts.DiagnosticCategory.Error, "No_overload_expects_0_arguments_but_overloads_do_exist_that_expect_either_1_or_2_arguments_2575", "No overload expects {0} arguments, but overloads do exist that expect either {1} or {2} arguments."),
+        Property_0_is_a_static_member_of_type_1: diag(2576, ts.DiagnosticCategory.Error, "Property_0_is_a_static_member_of_type_1_2576", "Property '{0}' is a static member of type '{1}'"),
+        Return_type_annotation_circularly_references_itself: diag(2577, ts.DiagnosticCategory.Error, "Return_type_annotation_circularly_references_itself_2577", "Return type annotation circularly references itself."),
+        Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_and_then_add_node_to_the_types_field_in_your_tsconfig: diag(2580, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_and_th_2580", "Cannot find name '{0}'. Do you need to install type definitions for node? Try `npm i @types/node` and then add `node` to the types field in your tsconfig."),
+        Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_and_then_add_jquery_to_the_types_field_in_your_tsconfig: diag(2581, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_an_2581", "Cannot find name '{0}'. Do you need to install type definitions for jQuery? Try `npm i @types/jquery` and then add `jquery` to the types field in your tsconfig."),
+        Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashjest_or_npm_i_types_Slashmocha_and_then_add_jest_or_mocha_to_the_types_field_in_your_tsconfig: diag(2582, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashje_2582", "Cannot find name '{0}'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha`  and then add `jest` or `mocha` to the types field in your tsconfig."),
+        Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_es2015_or_later: diag(2583, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_2583", "Cannot find name '{0}'. Do you need to change your target library? Try changing the `lib` compiler option to es2015 or later."),
+        Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_include_dom: diag(2584, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_2584", "Cannot find name '{0}'. Do you need to change your target library? Try changing the `lib` compiler option to include 'dom'."),
+        _0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_es2015_or_later: diag(2585, ts.DiagnosticCategory.Error, "_0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Do_you_need_to_change_your_target_library_2585", "'{0}' only refers to a type, but is being used as a value here. Do you need to change your target library? Try changing the `lib` compiler option to es2015 or later."),
+        Enum_type_0_circularly_references_itself: diag(2586, ts.DiagnosticCategory.Error, "Enum_type_0_circularly_references_itself_2586", "Enum type '{0}' circularly references itself."),
+        JSDoc_type_0_circularly_references_itself: diag(2587, ts.DiagnosticCategory.Error, "JSDoc_type_0_circularly_references_itself_2587", "JSDoc type '{0}' circularly references itself."),
+        Cannot_assign_to_0_because_it_is_a_constant: diag(2588, ts.DiagnosticCategory.Error, "Cannot_assign_to_0_because_it_is_a_constant_2588", "Cannot assign to '{0}' because it is a constant."),
+        JSX_element_attributes_type_0_may_not_be_a_union_type: diag(2600, ts.DiagnosticCategory.Error, "JSX_element_attributes_type_0_may_not_be_a_union_type_2600", "JSX element attributes type '{0}' may not be a union type."),
+        The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: diag(2601, ts.DiagnosticCategory.Error, "The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601", "The return type of a JSX element constructor must return an object type."),
+        JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist: diag(2602, ts.DiagnosticCategory.Error, "JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602", "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist."),
+        Property_0_in_type_1_is_not_assignable_to_type_2: diag(2603, ts.DiagnosticCategory.Error, "Property_0_in_type_1_is_not_assignable_to_type_2_2603", "Property '{0}' in type '{1}' is not assignable to type '{2}'."),
+        JSX_element_type_0_does_not_have_any_construct_or_call_signatures: diag(2604, ts.DiagnosticCategory.Error, "JSX_element_type_0_does_not_have_any_construct_or_call_signatures_2604", "JSX element type '{0}' does not have any construct or call signatures."),
+        JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements: diag(2605, ts.DiagnosticCategory.Error, "JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements_2605", "JSX element type '{0}' is not a constructor function for JSX elements."),
+        Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property: diag(2606, ts.DiagnosticCategory.Error, "Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property_2606", "Property '{0}' of JSX spread attribute is not assignable to target property."),
+        JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property: diag(2607, ts.DiagnosticCategory.Error, "JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property_2607", "JSX element class does not support attributes because it does not have a '{0}' property."),
+        The_global_type_JSX_0_may_not_have_more_than_one_property: diag(2608, ts.DiagnosticCategory.Error, "The_global_type_JSX_0_may_not_have_more_than_one_property_2608", "The global type 'JSX.{0}' may not have more than one property."),
+        JSX_spread_child_must_be_an_array_type: diag(2609, ts.DiagnosticCategory.Error, "JSX_spread_child_must_be_an_array_type_2609", "JSX spread child must be an array type."),
+        Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity: diag(2649, ts.DiagnosticCategory.Error, "Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity_2649", "Cannot augment module '{0}' with value exports because it resolves to a non-module entity."),
+        A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums: diag(2651, ts.DiagnosticCategory.Error, "A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_memb_2651", "A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums."),
+        Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_default_0_declaration_instead: diag(2652, ts.DiagnosticCategory.Error, "Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_d_2652", "Merged declaration '{0}' cannot include a default export declaration. Consider adding a separate 'export default {0}' declaration instead."),
+        Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1: diag(2653, ts.DiagnosticCategory.Error, "Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1_2653", "Non-abstract class expression does not implement inherited abstract member '{0}' from class '{1}'."),
+        Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition: diag(2654, ts.DiagnosticCategory.Error, "Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_pack_2654", "Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition."),
+        Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition: diag(2656, ts.DiagnosticCategory.Error, "Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_2656", "Exported external package typings file '{0}' is not a module. Please contact the package author to update the package definition."),
+        JSX_expressions_must_have_one_parent_element: diag(2657, ts.DiagnosticCategory.Error, "JSX_expressions_must_have_one_parent_element_2657", "JSX expressions must have one parent element."),
+        Type_0_provides_no_match_for_the_signature_1: diag(2658, ts.DiagnosticCategory.Error, "Type_0_provides_no_match_for_the_signature_1_2658", "Type '{0}' provides no match for the signature '{1}'."),
+        super_is_only_allowed_in_members_of_object_literal_expressions_when_option_target_is_ES2015_or_higher: diag(2659, ts.DiagnosticCategory.Error, "super_is_only_allowed_in_members_of_object_literal_expressions_when_option_target_is_ES2015_or_highe_2659", "'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher."),
+        super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions: diag(2660, ts.DiagnosticCategory.Error, "super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions_2660", "'super' can only be referenced in members of derived classes or object literal expressions."),
+        Cannot_export_0_Only_local_declarations_can_be_exported_from_a_module: diag(2661, ts.DiagnosticCategory.Error, "Cannot_export_0_Only_local_declarations_can_be_exported_from_a_module_2661", "Cannot export '{0}'. Only local declarations can be exported from a module."),
+        Cannot_find_name_0_Did_you_mean_the_static_member_1_0: diag(2662, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Did_you_mean_the_static_member_1_0_2662", "Cannot find name '{0}'. Did you mean the static member '{1}.{0}'?"),
+        Cannot_find_name_0_Did_you_mean_the_instance_member_this_0: diag(2663, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Did_you_mean_the_instance_member_this_0_2663", "Cannot find name '{0}'. Did you mean the instance member 'this.{0}'?"),
+        Invalid_module_name_in_augmentation_module_0_cannot_be_found: diag(2664, ts.DiagnosticCategory.Error, "Invalid_module_name_in_augmentation_module_0_cannot_be_found_2664", "Invalid module name in augmentation, module '{0}' cannot be found."),
+        Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augmented: diag(2665, ts.DiagnosticCategory.Error, "Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augm_2665", "Invalid module name in augmentation. Module '{0}' resolves to an untyped module at '{1}', which cannot be augmented."),
+        Exports_and_export_assignments_are_not_permitted_in_module_augmentations: diag(2666, ts.DiagnosticCategory.Error, "Exports_and_export_assignments_are_not_permitted_in_module_augmentations_2666", "Exports and export assignments are not permitted in module augmentations."),
+        Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module: diag(2667, ts.DiagnosticCategory.Error, "Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_mod_2667", "Imports are not permitted in module augmentations. Consider moving them to the enclosing external module."),
+        export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always_visible: diag(2668, ts.DiagnosticCategory.Error, "export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always__2668", "'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible."),
+        Augmentations_for_the_global_scope_can_only_be_directly_nested_in_external_modules_or_ambient_module_declarations: diag(2669, ts.DiagnosticCategory.Error, "Augmentations_for_the_global_scope_can_only_be_directly_nested_in_external_modules_or_ambient_module_2669", "Augmentations for the global scope can only be directly nested in external modules or ambient module declarations."),
+        Augmentations_for_the_global_scope_should_have_declare_modifier_unless_they_appear_in_already_ambient_context: diag(2670, ts.DiagnosticCategory.Error, "Augmentations_for_the_global_scope_should_have_declare_modifier_unless_they_appear_in_already_ambien_2670", "Augmentations for the global scope should have 'declare' modifier unless they appear in already ambient context."),
+        Cannot_augment_module_0_because_it_resolves_to_a_non_module_entity: diag(2671, ts.DiagnosticCategory.Error, "Cannot_augment_module_0_because_it_resolves_to_a_non_module_entity_2671", "Cannot augment module '{0}' because it resolves to a non-module entity."),
+        Cannot_assign_a_0_constructor_type_to_a_1_constructor_type: diag(2672, ts.DiagnosticCategory.Error, "Cannot_assign_a_0_constructor_type_to_a_1_constructor_type_2672", "Cannot assign a '{0}' constructor type to a '{1}' constructor type."),
+        Constructor_of_class_0_is_private_and_only_accessible_within_the_class_declaration: diag(2673, ts.DiagnosticCategory.Error, "Constructor_of_class_0_is_private_and_only_accessible_within_the_class_declaration_2673", "Constructor of class '{0}' is private and only accessible within the class declaration."),
+        Constructor_of_class_0_is_protected_and_only_accessible_within_the_class_declaration: diag(2674, ts.DiagnosticCategory.Error, "Constructor_of_class_0_is_protected_and_only_accessible_within_the_class_declaration_2674", "Constructor of class '{0}' is protected and only accessible within the class declaration."),
+        Cannot_extend_a_class_0_Class_constructor_is_marked_as_private: diag(2675, ts.DiagnosticCategory.Error, "Cannot_extend_a_class_0_Class_constructor_is_marked_as_private_2675", "Cannot extend a class '{0}'. Class constructor is marked as private."),
+        Accessors_must_both_be_abstract_or_non_abstract: diag(2676, ts.DiagnosticCategory.Error, "Accessors_must_both_be_abstract_or_non_abstract_2676", "Accessors must both be abstract or non-abstract."),
+        A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type: diag(2677, ts.DiagnosticCategory.Error, "A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type_2677", "A type predicate's type must be assignable to its parameter's type."),
+        Type_0_is_not_comparable_to_type_1: diag(2678, ts.DiagnosticCategory.Error, "Type_0_is_not_comparable_to_type_1_2678", "Type '{0}' is not comparable to type '{1}'."),
+        A_function_that_is_called_with_the_new_keyword_cannot_have_a_this_type_that_is_void: diag(2679, ts.DiagnosticCategory.Error, "A_function_that_is_called_with_the_new_keyword_cannot_have_a_this_type_that_is_void_2679", "A function that is called with the 'new' keyword cannot have a 'this' type that is 'void'."),
+        A_0_parameter_must_be_the_first_parameter: diag(2680, ts.DiagnosticCategory.Error, "A_0_parameter_must_be_the_first_parameter_2680", "A '{0}' parameter must be the first parameter."),
+        A_constructor_cannot_have_a_this_parameter: diag(2681, ts.DiagnosticCategory.Error, "A_constructor_cannot_have_a_this_parameter_2681", "A constructor cannot have a 'this' parameter."),
+        get_and_set_accessor_must_have_the_same_this_type: diag(2682, ts.DiagnosticCategory.Error, "get_and_set_accessor_must_have_the_same_this_type_2682", "'get' and 'set' accessor must have the same 'this' type."),
+        this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation: diag(2683, ts.DiagnosticCategory.Error, "this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_2683", "'this' implicitly has type 'any' because it does not have a type annotation."),
+        The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1: diag(2684, ts.DiagnosticCategory.Error, "The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1_2684", "The 'this' context of type '{0}' is not assignable to method's 'this' of type '{1}'."),
+        The_this_types_of_each_signature_are_incompatible: diag(2685, ts.DiagnosticCategory.Error, "The_this_types_of_each_signature_are_incompatible_2685", "The 'this' types of each signature are incompatible."),
+        _0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead: diag(2686, ts.DiagnosticCategory.Error, "_0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead_2686", "'{0}' refers to a UMD global, but the current file is a module. Consider adding an import instead."),
+        All_declarations_of_0_must_have_identical_modifiers: diag(2687, ts.DiagnosticCategory.Error, "All_declarations_of_0_must_have_identical_modifiers_2687", "All declarations of '{0}' must have identical modifiers."),
+        Cannot_find_type_definition_file_for_0: diag(2688, ts.DiagnosticCategory.Error, "Cannot_find_type_definition_file_for_0_2688", "Cannot find type definition file for '{0}'."),
+        Cannot_extend_an_interface_0_Did_you_mean_implements: diag(2689, ts.DiagnosticCategory.Error, "Cannot_extend_an_interface_0_Did_you_mean_implements_2689", "Cannot extend an interface '{0}'. Did you mean 'implements'?"),
+        An_import_path_cannot_end_with_a_0_extension_Consider_importing_1_instead: diag(2691, ts.DiagnosticCategory.Error, "An_import_path_cannot_end_with_a_0_extension_Consider_importing_1_instead_2691", "An import path cannot end with a '{0}' extension. Consider importing '{1}' instead."),
+        _0_is_a_primitive_but_1_is_a_wrapper_object_Prefer_using_0_when_possible: diag(2692, ts.DiagnosticCategory.Error, "_0_is_a_primitive_but_1_is_a_wrapper_object_Prefer_using_0_when_possible_2692", "'{0}' is a primitive, but '{1}' is a wrapper object. Prefer using '{0}' when possible."),
+        _0_only_refers_to_a_type_but_is_being_used_as_a_value_here: diag(2693, ts.DiagnosticCategory.Error, "_0_only_refers_to_a_type_but_is_being_used_as_a_value_here_2693", "'{0}' only refers to a type, but is being used as a value here."),
+        Namespace_0_has_no_exported_member_1: diag(2694, ts.DiagnosticCategory.Error, "Namespace_0_has_no_exported_member_1_2694", "Namespace '{0}' has no exported member '{1}'."),
+        Left_side_of_comma_operator_is_unused_and_has_no_side_effects: diag(2695, ts.DiagnosticCategory.Error, "Left_side_of_comma_operator_is_unused_and_has_no_side_effects_2695", "Left side of comma operator is unused and has no side effects.", /*reportsUnnecessary*/ true),
+        The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead: diag(2696, ts.DiagnosticCategory.Error, "The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead_2696", "The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?"),
+        An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option: diag(2697, ts.DiagnosticCategory.Error, "An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_in_2697", "An async function or method must return a 'Promise'. Make sure you have a declaration for 'Promise' or include 'ES2015' in your `--lib` option."),
+        Spread_types_may_only_be_created_from_object_types: diag(2698, ts.DiagnosticCategory.Error, "Spread_types_may_only_be_created_from_object_types_2698", "Spread types may only be created from object types."),
+        Static_property_0_conflicts_with_built_in_property_Function_0_of_constructor_function_1: diag(2699, ts.DiagnosticCategory.Error, "Static_property_0_conflicts_with_built_in_property_Function_0_of_constructor_function_1_2699", "Static property '{0}' conflicts with built-in property 'Function.{0}' of constructor function '{1}'."),
+        Rest_types_may_only_be_created_from_object_types: diag(2700, ts.DiagnosticCategory.Error, "Rest_types_may_only_be_created_from_object_types_2700", "Rest types may only be created from object types."),
+        The_target_of_an_object_rest_assignment_must_be_a_variable_or_a_property_access: diag(2701, ts.DiagnosticCategory.Error, "The_target_of_an_object_rest_assignment_must_be_a_variable_or_a_property_access_2701", "The target of an object rest assignment must be a variable or a property access."),
+        _0_only_refers_to_a_type_but_is_being_used_as_a_namespace_here: diag(2702, ts.DiagnosticCategory.Error, "_0_only_refers_to_a_type_but_is_being_used_as_a_namespace_here_2702", "'{0}' only refers to a type, but is being used as a namespace here."),
+        The_operand_of_a_delete_operator_must_be_a_property_reference: diag(2703, ts.DiagnosticCategory.Error, "The_operand_of_a_delete_operator_must_be_a_property_reference_2703", "The operand of a delete operator must be a property reference."),
+        The_operand_of_a_delete_operator_cannot_be_a_read_only_property: diag(2704, ts.DiagnosticCategory.Error, "The_operand_of_a_delete_operator_cannot_be_a_read_only_property_2704", "The operand of a delete operator cannot be a read-only property."),
+        An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option: diag(2705, ts.DiagnosticCategory.Error, "An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_de_2705", "An async function or method in ES5/ES3 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your `--lib` option."),
+        Required_type_parameters_may_not_follow_optional_type_parameters: diag(2706, ts.DiagnosticCategory.Error, "Required_type_parameters_may_not_follow_optional_type_parameters_2706", "Required type parameters may not follow optional type parameters."),
+        Generic_type_0_requires_between_1_and_2_type_arguments: diag(2707, ts.DiagnosticCategory.Error, "Generic_type_0_requires_between_1_and_2_type_arguments_2707", "Generic type '{0}' requires between {1} and {2} type arguments."),
+        Cannot_use_namespace_0_as_a_value: diag(2708, ts.DiagnosticCategory.Error, "Cannot_use_namespace_0_as_a_value_2708", "Cannot use namespace '{0}' as a value."),
+        Cannot_use_namespace_0_as_a_type: diag(2709, ts.DiagnosticCategory.Error, "Cannot_use_namespace_0_as_a_type_2709", "Cannot use namespace '{0}' as a type."),
+        _0_are_specified_twice_The_attribute_named_0_will_be_overwritten: diag(2710, ts.DiagnosticCategory.Error, "_0_are_specified_twice_The_attribute_named_0_will_be_overwritten_2710", "'{0}' are specified twice. The attribute named '{0}' will be overwritten."),
+        A_dynamic_import_call_returns_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option: diag(2711, ts.DiagnosticCategory.Error, "A_dynamic_import_call_returns_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES20_2711", "A dynamic import call returns a 'Promise'. Make sure you have a declaration for 'Promise' or include 'ES2015' in your `--lib` option."),
+        A_dynamic_import_call_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option: diag(2712, ts.DiagnosticCategory.Error, "A_dynamic_import_call_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declarat_2712", "A dynamic import call in ES5/ES3 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your `--lib` option."),
+        Cannot_access_0_1_because_0_is_a_type_but_not_a_namespace_Did_you_mean_to_retrieve_the_type_of_the_property_1_in_0_with_0_1: diag(2713, ts.DiagnosticCategory.Error, "Cannot_access_0_1_because_0_is_a_type_but_not_a_namespace_Did_you_mean_to_retrieve_the_type_of_the_p_2713", "Cannot access '{0}.{1}' because '{0}' is a type, but not a namespace. Did you mean to retrieve the type of the property '{1}' in '{0}' with '{0}[\"{1}\"]'?"),
+        The_expression_of_an_export_assignment_must_be_an_identifier_or_qualified_name_in_an_ambient_context: diag(2714, ts.DiagnosticCategory.Error, "The_expression_of_an_export_assignment_must_be_an_identifier_or_qualified_name_in_an_ambient_context_2714", "The expression of an export assignment must be an identifier or qualified name in an ambient context."),
+        Abstract_property_0_in_class_1_cannot_be_accessed_in_the_constructor: diag(2715, ts.DiagnosticCategory.Error, "Abstract_property_0_in_class_1_cannot_be_accessed_in_the_constructor_2715", "Abstract property '{0}' in class '{1}' cannot be accessed in the constructor."),
+        Type_parameter_0_has_a_circular_default: diag(2716, ts.DiagnosticCategory.Error, "Type_parameter_0_has_a_circular_default_2716", "Type parameter '{0}' has a circular default."),
+        Subsequent_property_declarations_must_have_the_same_type_Property_0_must_be_of_type_1_but_here_has_type_2: diag(2717, ts.DiagnosticCategory.Error, "Subsequent_property_declarations_must_have_the_same_type_Property_0_must_be_of_type_1_but_here_has_t_2717", "Subsequent property declarations must have the same type.  Property '{0}' must be of type '{1}', but here has type '{2}'."),
+        Duplicate_property_0: diag(2718, ts.DiagnosticCategory.Error, "Duplicate_property_0_2718", "Duplicate property '{0}'."),
+        Type_0_is_not_assignable_to_type_1_Two_different_types_with_this_name_exist_but_they_are_unrelated: diag(2719, ts.DiagnosticCategory.Error, "Type_0_is_not_assignable_to_type_1_Two_different_types_with_this_name_exist_but_they_are_unrelated_2719", "Type '{0}' is not assignable to type '{1}'. Two different types with this name exist, but they are unrelated."),
+        Class_0_incorrectly_implements_class_1_Did_you_mean_to_extend_1_and_inherit_its_members_as_a_subclass: diag(2720, ts.DiagnosticCategory.Error, "Class_0_incorrectly_implements_class_1_Did_you_mean_to_extend_1_and_inherit_its_members_as_a_subclas_2720", "Class '{0}' incorrectly implements class '{1}'. Did you mean to extend '{1}' and inherit its members as a subclass?"),
+        Cannot_invoke_an_object_which_is_possibly_null: diag(2721, ts.DiagnosticCategory.Error, "Cannot_invoke_an_object_which_is_possibly_null_2721", "Cannot invoke an object which is possibly 'null'."),
+        Cannot_invoke_an_object_which_is_possibly_undefined: diag(2722, ts.DiagnosticCategory.Error, "Cannot_invoke_an_object_which_is_possibly_undefined_2722", "Cannot invoke an object which is possibly 'undefined'."),
+        Cannot_invoke_an_object_which_is_possibly_null_or_undefined: diag(2723, ts.DiagnosticCategory.Error, "Cannot_invoke_an_object_which_is_possibly_null_or_undefined_2723", "Cannot invoke an object which is possibly 'null' or 'undefined'."),
+        Module_0_has_no_exported_member_1_Did_you_mean_2: diag(2724, ts.DiagnosticCategory.Error, "Module_0_has_no_exported_member_1_Did_you_mean_2_2724", "Module '{0}' has no exported member '{1}'. Did you mean '{2}'?"),
+        Class_name_cannot_be_Object_when_targeting_ES5_with_module_0: diag(2725, ts.DiagnosticCategory.Error, "Class_name_cannot_be_Object_when_targeting_ES5_with_module_0_2725", "Class name cannot be 'Object' when targeting ES5 with module {0}."),
+        Cannot_find_lib_definition_for_0: diag(2726, ts.DiagnosticCategory.Error, "Cannot_find_lib_definition_for_0_2726", "Cannot find lib definition for '{0}'."),
+        Cannot_find_lib_definition_for_0_Did_you_mean_1: diag(2727, ts.DiagnosticCategory.Error, "Cannot_find_lib_definition_for_0_Did_you_mean_1_2727", "Cannot find lib definition for '{0}'. Did you mean '{1}'?"),
+        _0_is_declared_here: diag(2728, ts.DiagnosticCategory.Message, "_0_is_declared_here_2728", "'{0}' is declared here."),
+        Property_0_is_used_before_its_initialization: diag(2729, ts.DiagnosticCategory.Error, "Property_0_is_used_before_its_initialization_2729", "Property '{0}' is used before its initialization."),
+        An_arrow_function_cannot_have_a_this_parameter: diag(2730, ts.DiagnosticCategory.Error, "An_arrow_function_cannot_have_a_this_parameter_2730", "An arrow function cannot have a 'this' parameter."),
+        Implicit_conversion_of_a_symbol_to_a_string_will_fail_at_runtime_Consider_wrapping_this_expression_in_String: diag(2731, ts.DiagnosticCategory.Error, "Implicit_conversion_of_a_symbol_to_a_string_will_fail_at_runtime_Consider_wrapping_this_expression_i_2731", "Implicit conversion of a 'symbol' to a 'string' will fail at runtime. Consider wrapping this expression in 'String(...)'."),
+        Cannot_find_module_0_Consider_using_resolveJsonModule_to_import_module_with_json_extension: diag(2732, ts.DiagnosticCategory.Error, "Cannot_find_module_0_Consider_using_resolveJsonModule_to_import_module_with_json_extension_2732", "Cannot find module '{0}'. Consider using '--resolveJsonModule' to import module with '.json' extension"),
+        Property_0_was_also_declared_here: diag(2733, ts.DiagnosticCategory.Error, "Property_0_was_also_declared_here_2733", "Property '{0}' was also declared here."),
+        It_is_highly_likely_that_you_are_missing_a_semicolon: diag(2734, ts.DiagnosticCategory.Error, "It_is_highly_likely_that_you_are_missing_a_semicolon_2734", "It is highly likely that you are missing a semicolon."),
+        Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1: diag(2735, ts.DiagnosticCategory.Error, "Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1_2735", "Did you mean for '{0}' to be constrained to type 'new (...args: any[]) => {1}'?"),
+        Operator_0_cannot_be_applied_to_type_1: diag(2736, ts.DiagnosticCategory.Error, "Operator_0_cannot_be_applied_to_type_1_2736", "Operator '{0}' cannot be applied to type '{1}'."),
+        BigInt_literals_are_not_available_when_targeting_lower_than_ESNext: diag(2737, ts.DiagnosticCategory.Error, "BigInt_literals_are_not_available_when_targeting_lower_than_ESNext_2737", "BigInt literals are not available when targeting lower than ESNext."),
+        An_outer_value_of_this_is_shadowed_by_this_container: diag(2738, ts.DiagnosticCategory.Message, "An_outer_value_of_this_is_shadowed_by_this_container_2738", "An outer value of 'this' is shadowed by this container."),
+        Type_0_is_missing_the_following_properties_from_type_1_Colon_2: diag(2739, ts.DiagnosticCategory.Error, "Type_0_is_missing_the_following_properties_from_type_1_Colon_2_2739", "Type '{0}' is missing the following properties from type '{1}': {2}"),
+        Type_0_is_missing_the_following_properties_from_type_1_Colon_2_and_3_more: diag(2740, ts.DiagnosticCategory.Error, "Type_0_is_missing_the_following_properties_from_type_1_Colon_2_and_3_more_2740", "Type '{0}' is missing the following properties from type '{1}': {2}, and {3} more."),
+        Property_0_is_missing_in_type_1_but_required_in_type_2: diag(2741, ts.DiagnosticCategory.Error, "Property_0_is_missing_in_type_1_but_required_in_type_2_2741", "Property '{0}' is missing in type '{1}' but required in type '{2}'."),
+        The_inferred_type_of_0_cannot_be_named_without_a_reference_to_1_This_is_likely_not_portable_A_type_annotation_is_necessary: diag(2742, ts.DiagnosticCategory.Error, "The_inferred_type_of_0_cannot_be_named_without_a_reference_to_1_This_is_likely_not_portable_A_type_a_2742", "The inferred type of '{0}' cannot be named without a reference to '{1}'. This is likely not portable. A type annotation is necessary."),
+        No_overload_expects_0_type_arguments_but_overloads_do_exist_that_expect_either_1_or_2_type_arguments: diag(2743, ts.DiagnosticCategory.Error, "No_overload_expects_0_type_arguments_but_overloads_do_exist_that_expect_either_1_or_2_type_arguments_2743", "No overload expects {0} type arguments, but overloads do exist that expect either {1} or {2} type arguments."),
+        Type_parameter_defaults_can_only_reference_previously_declared_type_parameters: diag(2744, ts.DiagnosticCategory.Error, "Type_parameter_defaults_can_only_reference_previously_declared_type_parameters_2744", "Type parameter defaults can only reference previously declared type parameters."),
+        This_JSX_tag_s_0_prop_expects_type_1_which_requires_multiple_children_but_only_a_single_child_was_provided: diag(2745, ts.DiagnosticCategory.Error, "This_JSX_tag_s_0_prop_expects_type_1_which_requires_multiple_children_but_only_a_single_child_was_pr_2745", "This JSX tag's '{0}' prop expects type '{1}' which requires multiple children, but only a single child was provided."),
+        This_JSX_tag_s_0_prop_expects_a_single_child_of_type_1_but_multiple_children_were_provided: diag(2746, ts.DiagnosticCategory.Error, "This_JSX_tag_s_0_prop_expects_a_single_child_of_type_1_but_multiple_children_were_provided_2746", "This JSX tag's '{0}' prop expects a single child of type '{1}', but multiple children were provided."),
+        _0_components_don_t_accept_text_as_child_elements_Text_in_JSX_has_the_type_string_but_the_expected_type_of_1_is_2: diag(2747, ts.DiagnosticCategory.Error, "_0_components_don_t_accept_text_as_child_elements_Text_in_JSX_has_the_type_string_but_the_expected_t_2747", "'{0}' components don't accept text as child elements. Text in JSX has the type 'string', but the expected type of '{1}' is '{2}'."),
+        Import_declaration_0_is_using_private_name_1: diag(4000, ts.DiagnosticCategory.Error, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
+        Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
+        Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),
+        Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: diag(4006, ts.DiagnosticCategory.Error, "Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1_4006", "Type parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'."),
+        Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: diag(4008, ts.DiagnosticCategory.Error, "Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1_4008", "Type parameter '{0}' of call signature from exported interface has or is using private name '{1}'."),
+        Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: diag(4010, ts.DiagnosticCategory.Error, "Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1_4010", "Type parameter '{0}' of public static method from exported class has or is using private name '{1}'."),
+        Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: diag(4012, ts.DiagnosticCategory.Error, "Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1_4012", "Type parameter '{0}' of public method from exported class has or is using private name '{1}'."),
+        Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: diag(4014, ts.DiagnosticCategory.Error, "Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1_4014", "Type parameter '{0}' of method from exported interface has or is using private name '{1}'."),
+        Type_parameter_0_of_exported_function_has_or_is_using_private_name_1: diag(4016, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_function_has_or_is_using_private_name_1_4016", "Type parameter '{0}' of exported function has or is using private name '{1}'."),
+        Implements_clause_of_exported_class_0_has_or_is_using_private_name_1: diag(4019, ts.DiagnosticCategory.Error, "Implements_clause_of_exported_class_0_has_or_is_using_private_name_1_4019", "Implements clause of exported class '{0}' has or is using private name '{1}'."),
+        extends_clause_of_exported_class_0_has_or_is_using_private_name_1: diag(4020, ts.DiagnosticCategory.Error, "extends_clause_of_exported_class_0_has_or_is_using_private_name_1_4020", "'extends' clause of exported class '{0}' has or is using private name '{1}'."),
+        extends_clause_of_exported_interface_0_has_or_is_using_private_name_1: diag(4022, ts.DiagnosticCategory.Error, "extends_clause_of_exported_interface_0_has_or_is_using_private_name_1_4022", "'extends' clause of exported interface '{0}' has or is using private name '{1}'."),
+        Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: diag(4023, ts.DiagnosticCategory.Error, "Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named_4023", "Exported variable '{0}' has or is using name '{1}' from external module {2} but cannot be named."),
+        Exported_variable_0_has_or_is_using_name_1_from_private_module_2: diag(4024, ts.DiagnosticCategory.Error, "Exported_variable_0_has_or_is_using_name_1_from_private_module_2_4024", "Exported variable '{0}' has or is using name '{1}' from private module '{2}'."),
+        Exported_variable_0_has_or_is_using_private_name_1: diag(4025, ts.DiagnosticCategory.Error, "Exported_variable_0_has_or_is_using_private_name_1_4025", "Exported variable '{0}' has or is using private name '{1}'."),
+        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: diag(4026, ts.DiagnosticCategory.Error, "Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot__4026", "Public static property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named."),
+        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: diag(4027, ts.DiagnosticCategory.Error, "Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4027", "Public static property '{0}' of exported class has or is using name '{1}' from private module '{2}'."),
+        Public_static_property_0_of_exported_class_has_or_is_using_private_name_1: diag(4028, ts.DiagnosticCategory.Error, "Public_static_property_0_of_exported_class_has_or_is_using_private_name_1_4028", "Public static property '{0}' of exported class has or is using private name '{1}'."),
+        Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: diag(4029, ts.DiagnosticCategory.Error, "Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_name_4029", "Public property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named."),
+        Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: diag(4030, ts.DiagnosticCategory.Error, "Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4030", "Public property '{0}' of exported class has or is using name '{1}' from private module '{2}'."),
+        Public_property_0_of_exported_class_has_or_is_using_private_name_1: diag(4031, ts.DiagnosticCategory.Error, "Public_property_0_of_exported_class_has_or_is_using_private_name_1_4031", "Public property '{0}' of exported class has or is using private name '{1}'."),
+        Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: diag(4032, ts.DiagnosticCategory.Error, "Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2_4032", "Property '{0}' of exported interface has or is using name '{1}' from private module '{2}'."),
+        Property_0_of_exported_interface_has_or_is_using_private_name_1: diag(4033, ts.DiagnosticCategory.Error, "Property_0_of_exported_interface_has_or_is_using_private_name_1_4033", "Property '{0}' of exported interface has or is using private name '{1}'."),
+        Parameter_type_of_public_static_setter_0_from_exported_class_has_or_is_using_name_1_from_private_module_2: diag(4034, ts.DiagnosticCategory.Error, "Parameter_type_of_public_static_setter_0_from_exported_class_has_or_is_using_name_1_from_private_mod_4034", "Parameter type of public static setter '{0}' from exported class has or is using name '{1}' from private module '{2}'."),
+        Parameter_type_of_public_static_setter_0_from_exported_class_has_or_is_using_private_name_1: diag(4035, ts.DiagnosticCategory.Error, "Parameter_type_of_public_static_setter_0_from_exported_class_has_or_is_using_private_name_1_4035", "Parameter type of public static setter '{0}' from exported class has or is using private name '{1}'."),
+        Parameter_type_of_public_setter_0_from_exported_class_has_or_is_using_name_1_from_private_module_2: diag(4036, ts.DiagnosticCategory.Error, "Parameter_type_of_public_setter_0_from_exported_class_has_or_is_using_name_1_from_private_module_2_4036", "Parameter type of public setter '{0}' from exported class has or is using name '{1}' from private module '{2}'."),
+        Parameter_type_of_public_setter_0_from_exported_class_has_or_is_using_private_name_1: diag(4037, ts.DiagnosticCategory.Error, "Parameter_type_of_public_setter_0_from_exported_class_has_or_is_using_private_name_1_4037", "Parameter type of public setter '{0}' from exported class has or is using private name '{1}'."),
+        Return_type_of_public_static_getter_0_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: diag(4038, ts.DiagnosticCategory.Error, "Return_type_of_public_static_getter_0_from_exported_class_has_or_is_using_name_1_from_external_modul_4038", "Return type of public static getter '{0}' from exported class has or is using name '{1}' from external module {2} but cannot be named."),
+        Return_type_of_public_static_getter_0_from_exported_class_has_or_is_using_name_1_from_private_module_2: diag(4039, ts.DiagnosticCategory.Error, "Return_type_of_public_static_getter_0_from_exported_class_has_or_is_using_name_1_from_private_module_4039", "Return type of public static getter '{0}' from exported class has or is using name '{1}' from private module '{2}'."),
+        Return_type_of_public_static_getter_0_from_exported_class_has_or_is_using_private_name_1: diag(4040, ts.DiagnosticCategory.Error, "Return_type_of_public_static_getter_0_from_exported_class_has_or_is_using_private_name_1_4040", "Return type of public static getter '{0}' from exported class has or is using private name '{1}'."),
+        Return_type_of_public_getter_0_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: diag(4041, ts.DiagnosticCategory.Error, "Return_type_of_public_getter_0_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_4041", "Return type of public getter '{0}' from exported class has or is using name '{1}' from external module {2} but cannot be named."),
+        Return_type_of_public_getter_0_from_exported_class_has_or_is_using_name_1_from_private_module_2: diag(4042, ts.DiagnosticCategory.Error, "Return_type_of_public_getter_0_from_exported_class_has_or_is_using_name_1_from_private_module_2_4042", "Return type of public getter '{0}' from exported class has or is using name '{1}' from private module '{2}'."),
+        Return_type_of_public_getter_0_from_exported_class_has_or_is_using_private_name_1: diag(4043, ts.DiagnosticCategory.Error, "Return_type_of_public_getter_0_from_exported_class_has_or_is_using_private_name_1_4043", "Return type of public getter '{0}' from exported class has or is using private name '{1}'."),
+        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: diag(4044, ts.DiagnosticCategory.Error, "Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_mod_4044", "Return type of constructor signature from exported interface has or is using name '{0}' from private module '{1}'."),
+        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0: diag(4045, ts.DiagnosticCategory.Error, "Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0_4045", "Return type of constructor signature from exported interface has or is using private name '{0}'."),
+        Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: diag(4046, ts.DiagnosticCategory.Error, "Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4046", "Return type of call signature from exported interface has or is using name '{0}' from private module '{1}'."),
+        Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0: diag(4047, ts.DiagnosticCategory.Error, "Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0_4047", "Return type of call signature from exported interface has or is using private name '{0}'."),
+        Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: diag(4048, ts.DiagnosticCategory.Error, "Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4048", "Return type of index signature from exported interface has or is using name '{0}' from private module '{1}'."),
+        Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0: diag(4049, ts.DiagnosticCategory.Error, "Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0_4049", "Return type of index signature from exported interface has or is using private name '{0}'."),
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: diag(4050, ts.DiagnosticCategory.Error, "Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module__4050", "Return type of public static method from exported class has or is using name '{0}' from external module {1} but cannot be named."),
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: diag(4051, ts.DiagnosticCategory.Error, "Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1_4051", "Return type of public static method from exported class has or is using name '{0}' from private module '{1}'."),
+        Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0: diag(4052, ts.DiagnosticCategory.Error, "Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0_4052", "Return type of public static method from exported class has or is using private name '{0}'."),
+        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: diag(4053, ts.DiagnosticCategory.Error, "Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_c_4053", "Return type of public method from exported class has or is using name '{0}' from external module {1} but cannot be named."),
+        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: diag(4054, ts.DiagnosticCategory.Error, "Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1_4054", "Return type of public method from exported class has or is using name '{0}' from private module '{1}'."),
+        Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0: diag(4055, ts.DiagnosticCategory.Error, "Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0_4055", "Return type of public method from exported class has or is using private name '{0}'."),
+        Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1: diag(4056, ts.DiagnosticCategory.Error, "Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4056", "Return type of method from exported interface has or is using name '{0}' from private module '{1}'."),
+        Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0: diag(4057, ts.DiagnosticCategory.Error, "Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0_4057", "Return type of method from exported interface has or is using private name '{0}'."),
+        Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: diag(4058, ts.DiagnosticCategory.Error, "Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named_4058", "Return type of exported function has or is using name '{0}' from external module {1} but cannot be named."),
+        Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1: diag(4059, ts.DiagnosticCategory.Error, "Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1_4059", "Return type of exported function has or is using name '{0}' from private module '{1}'."),
+        Return_type_of_exported_function_has_or_is_using_private_name_0: diag(4060, ts.DiagnosticCategory.Error, "Return_type_of_exported_function_has_or_is_using_private_name_0_4060", "Return type of exported function has or is using private name '{0}'."),
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: diag(4061, ts.DiagnosticCategory.Error, "Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_can_4061", "Parameter '{0}' of constructor from exported class has or is using name '{1}' from external module {2} but cannot be named."),
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2: diag(4062, ts.DiagnosticCategory.Error, "Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2_4062", "Parameter '{0}' of constructor from exported class has or is using name '{1}' from private module '{2}'."),
+        Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1: diag(4063, ts.DiagnosticCategory.Error, "Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1_4063", "Parameter '{0}' of constructor from exported class has or is using private name '{1}'."),
+        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: diag(4064, ts.DiagnosticCategory.Error, "Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_mod_4064", "Parameter '{0}' of constructor signature from exported interface has or is using name '{1}' from private module '{2}'."),
+        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: diag(4065, ts.DiagnosticCategory.Error, "Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1_4065", "Parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'."),
+        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: diag(4066, ts.DiagnosticCategory.Error, "Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4066", "Parameter '{0}' of call signature from exported interface has or is using name '{1}' from private module '{2}'."),
+        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: diag(4067, ts.DiagnosticCategory.Error, "Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1_4067", "Parameter '{0}' of call signature from exported interface has or is using private name '{1}'."),
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: diag(4068, ts.DiagnosticCategory.Error, "Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module__4068", "Parameter '{0}' of public static method from exported class has or is using name '{1}' from external module {2} but cannot be named."),
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: diag(4069, ts.DiagnosticCategory.Error, "Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2_4069", "Parameter '{0}' of public static method from exported class has or is using name '{1}' from private module '{2}'."),
+        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: diag(4070, ts.DiagnosticCategory.Error, "Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1_4070", "Parameter '{0}' of public static method from exported class has or is using private name '{1}'."),
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: diag(4071, ts.DiagnosticCategory.Error, "Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_c_4071", "Parameter '{0}' of public method from exported class has or is using name '{1}' from external module {2} but cannot be named."),
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: diag(4072, ts.DiagnosticCategory.Error, "Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2_4072", "Parameter '{0}' of public method from exported class has or is using name '{1}' from private module '{2}'."),
+        Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: diag(4073, ts.DiagnosticCategory.Error, "Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1_4073", "Parameter '{0}' of public method from exported class has or is using private name '{1}'."),
+        Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2: diag(4074, ts.DiagnosticCategory.Error, "Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4074", "Parameter '{0}' of method from exported interface has or is using name '{1}' from private module '{2}'."),
+        Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: diag(4075, ts.DiagnosticCategory.Error, "Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1_4075", "Parameter '{0}' of method from exported interface has or is using private name '{1}'."),
+        Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: diag(4076, ts.DiagnosticCategory.Error, "Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named_4076", "Parameter '{0}' of exported function has or is using name '{1}' from external module {2} but cannot be named."),
+        Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2: diag(4077, ts.DiagnosticCategory.Error, "Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2_4077", "Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'."),
+        Parameter_0_of_exported_function_has_or_is_using_private_name_1: diag(4078, ts.DiagnosticCategory.Error, "Parameter_0_of_exported_function_has_or_is_using_private_name_1_4078", "Parameter '{0}' of exported function has or is using private name '{1}'."),
+        Exported_type_alias_0_has_or_is_using_private_name_1: diag(4081, ts.DiagnosticCategory.Error, "Exported_type_alias_0_has_or_is_using_private_name_1_4081", "Exported type alias '{0}' has or is using private name '{1}'."),
+        Default_export_of_the_module_has_or_is_using_private_name_0: diag(4082, ts.DiagnosticCategory.Error, "Default_export_of_the_module_has_or_is_using_private_name_0_4082", "Default export of the module has or is using private name '{0}'."),
+        Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1: diag(4083, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1_4083", "Type parameter '{0}' of exported type alias has or is using private name '{1}'."),
+        Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict: diag(4090, ts.DiagnosticCategory.Error, "Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_librar_4090", "Conflicting definitions for '{0}' found at '{1}' and '{2}'. Consider installing a specific version of this library to resolve the conflict."),
+        Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: diag(4091, ts.DiagnosticCategory.Error, "Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4091", "Parameter '{0}' of index signature from exported interface has or is using name '{1}' from private module '{2}'."),
+        Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1: diag(4092, ts.DiagnosticCategory.Error, "Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1_4092", "Parameter '{0}' of index signature from exported interface has or is using private name '{1}'."),
+        Property_0_of_exported_class_expression_may_not_be_private_or_protected: diag(4094, ts.DiagnosticCategory.Error, "Property_0_of_exported_class_expression_may_not_be_private_or_protected_4094", "Property '{0}' of exported class expression may not be private or protected."),
+        Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: diag(4095, ts.DiagnosticCategory.Error, "Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_4095", "Public static method '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named."),
+        Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: diag(4096, ts.DiagnosticCategory.Error, "Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4096", "Public static method '{0}' of exported class has or is using name '{1}' from private module '{2}'."),
+        Public_static_method_0_of_exported_class_has_or_is_using_private_name_1: diag(4097, ts.DiagnosticCategory.Error, "Public_static_method_0_of_exported_class_has_or_is_using_private_name_1_4097", "Public static method '{0}' of exported class has or is using private name '{1}'."),
+        Public_method_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: diag(4098, ts.DiagnosticCategory.Error, "Public_method_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named_4098", "Public method '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named."),
+        Public_method_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: diag(4099, ts.DiagnosticCategory.Error, "Public_method_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4099", "Public method '{0}' of exported class has or is using name '{1}' from private module '{2}'."),
+        Public_method_0_of_exported_class_has_or_is_using_private_name_1: diag(4100, ts.DiagnosticCategory.Error, "Public_method_0_of_exported_class_has_or_is_using_private_name_1_4100", "Public method '{0}' of exported class has or is using private name '{1}'."),
+        Method_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: diag(4101, ts.DiagnosticCategory.Error, "Method_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2_4101", "Method '{0}' of exported interface has or is using name '{1}' from private module '{2}'."),
+        Method_0_of_exported_interface_has_or_is_using_private_name_1: diag(4102, ts.DiagnosticCategory.Error, "Method_0_of_exported_interface_has_or_is_using_private_name_1_4102", "Method '{0}' of exported interface has or is using private name '{1}'."),
+        The_current_host_does_not_support_the_0_option: diag(5001, ts.DiagnosticCategory.Error, "The_current_host_does_not_support_the_0_option_5001", "The current host does not support the '{0}' option."),
+        Cannot_find_the_common_subdirectory_path_for_the_input_files: diag(5009, ts.DiagnosticCategory.Error, "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", "Cannot find the common subdirectory path for the input files."),
+        File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: diag(5010, ts.DiagnosticCategory.Error, "File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0_5010", "File specification cannot end in a recursive directory wildcard ('**'): '{0}'."),
+        Cannot_read_file_0_Colon_1: diag(5012, ts.DiagnosticCategory.Error, "Cannot_read_file_0_Colon_1_5012", "Cannot read file '{0}': {1}."),
+        Failed_to_parse_file_0_Colon_1: diag(5014, ts.DiagnosticCategory.Error, "Failed_to_parse_file_0_Colon_1_5014", "Failed to parse file '{0}': {1}."),
+        Unknown_compiler_option_0: diag(5023, ts.DiagnosticCategory.Error, "Unknown_compiler_option_0_5023", "Unknown compiler option '{0}'."),
+        Compiler_option_0_requires_a_value_of_type_1: diag(5024, ts.DiagnosticCategory.Error, "Compiler_option_0_requires_a_value_of_type_1_5024", "Compiler option '{0}' requires a value of type {1}."),
+        Could_not_write_file_0_Colon_1: diag(5033, ts.DiagnosticCategory.Error, "Could_not_write_file_0_Colon_1_5033", "Could not write file '{0}': {1}."),
+        Option_project_cannot_be_mixed_with_source_files_on_a_command_line: diag(5042, ts.DiagnosticCategory.Error, "Option_project_cannot_be_mixed_with_source_files_on_a_command_line_5042", "Option 'project' cannot be mixed with source files on a command line."),
+        Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher: diag(5047, ts.DiagnosticCategory.Error, "Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES_5047", "Option 'isolatedModules' can only be used when either option '--module' is provided or option 'target' is 'ES2015' or higher."),
+        Option_0_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided: diag(5051, ts.DiagnosticCategory.Error, "Option_0_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided_5051", "Option '{0} can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided."),
+        Option_0_cannot_be_specified_without_specifying_option_1: diag(5052, ts.DiagnosticCategory.Error, "Option_0_cannot_be_specified_without_specifying_option_1_5052", "Option '{0}' cannot be specified without specifying option '{1}'."),
+        Option_0_cannot_be_specified_with_option_1: diag(5053, ts.DiagnosticCategory.Error, "Option_0_cannot_be_specified_with_option_1_5053", "Option '{0}' cannot be specified with option '{1}'."),
+        A_tsconfig_json_file_is_already_defined_at_Colon_0: diag(5054, ts.DiagnosticCategory.Error, "A_tsconfig_json_file_is_already_defined_at_Colon_0_5054", "A 'tsconfig.json' file is already defined at: '{0}'."),
+        Cannot_write_file_0_because_it_would_overwrite_input_file: diag(5055, ts.DiagnosticCategory.Error, "Cannot_write_file_0_because_it_would_overwrite_input_file_5055", "Cannot write file '{0}' because it would overwrite input file."),
+        Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files: diag(5056, ts.DiagnosticCategory.Error, "Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files_5056", "Cannot write file '{0}' because it would be overwritten by multiple input files."),
+        Cannot_find_a_tsconfig_json_file_at_the_specified_directory_Colon_0: diag(5057, ts.DiagnosticCategory.Error, "Cannot_find_a_tsconfig_json_file_at_the_specified_directory_Colon_0_5057", "Cannot find a tsconfig.json file at the specified directory: '{0}'."),
+        The_specified_path_does_not_exist_Colon_0: diag(5058, ts.DiagnosticCategory.Error, "The_specified_path_does_not_exist_Colon_0_5058", "The specified path does not exist: '{0}'."),
+        Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier: diag(5059, ts.DiagnosticCategory.Error, "Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier_5059", "Invalid value for '--reactNamespace'. '{0}' is not a valid identifier."),
+        Option_paths_cannot_be_used_without_specifying_baseUrl_option: diag(5060, ts.DiagnosticCategory.Error, "Option_paths_cannot_be_used_without_specifying_baseUrl_option_5060", "Option 'paths' cannot be used without specifying '--baseUrl' option."),
+        Pattern_0_can_have_at_most_one_Asterisk_character: diag(5061, ts.DiagnosticCategory.Error, "Pattern_0_can_have_at_most_one_Asterisk_character_5061", "Pattern '{0}' can have at most one '*' character."),
+        Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character: diag(5062, ts.DiagnosticCategory.Error, "Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character_5062", "Substitution '{0}' in pattern '{1}' in can have at most one '*' character."),
+        Substitutions_for_pattern_0_should_be_an_array: diag(5063, ts.DiagnosticCategory.Error, "Substitutions_for_pattern_0_should_be_an_array_5063", "Substitutions for pattern '{0}' should be an array."),
+        Substitution_0_for_pattern_1_has_incorrect_type_expected_string_got_2: diag(5064, ts.DiagnosticCategory.Error, "Substitution_0_for_pattern_1_has_incorrect_type_expected_string_got_2_5064", "Substitution '{0}' for pattern '{1}' has incorrect type, expected 'string', got '{2}'."),
+        File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: diag(5065, ts.DiagnosticCategory.Error, "File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildca_5065", "File specification cannot contain a parent directory ('..') that appears after a recursive directory wildcard ('**'): '{0}'."),
+        Substitutions_for_pattern_0_shouldn_t_be_an_empty_array: diag(5066, ts.DiagnosticCategory.Error, "Substitutions_for_pattern_0_shouldn_t_be_an_empty_array_5066", "Substitutions for pattern '{0}' shouldn't be an empty array."),
+        Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name: diag(5067, ts.DiagnosticCategory.Error, "Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name_5067", "Invalid value for 'jsxFactory'. '{0}' is not a valid identifier or qualified-name."),
+        Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig: diag(5068, ts.DiagnosticCategory.Error, "Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript__5068", "Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig."),
+        Option_0_cannot_be_specified_without_specifying_option_1_or_option_2: diag(5069, ts.DiagnosticCategory.Error, "Option_0_cannot_be_specified_without_specifying_option_1_or_option_2_5069", "Option '{0}' cannot be specified without specifying option '{1}' or option '{2}'."),
+        Option_resolveJsonModule_cannot_be_specified_without_node_module_resolution_strategy: diag(5070, ts.DiagnosticCategory.Error, "Option_resolveJsonModule_cannot_be_specified_without_node_module_resolution_strategy_5070", "Option '--resolveJsonModule' cannot be specified without 'node' module resolution strategy."),
+        Option_resolveJsonModule_can_only_be_specified_when_module_code_generation_is_commonjs_amd_es2015_or_esNext: diag(5071, ts.DiagnosticCategory.Error, "Option_resolveJsonModule_can_only_be_specified_when_module_code_generation_is_commonjs_amd_es2015_or_5071", "Option '--resolveJsonModule' can only be specified when module code generation is 'commonjs', 'amd', 'es2015' or 'esNext'."),
+        Unknown_build_option_0: diag(5072, ts.DiagnosticCategory.Error, "Unknown_build_option_0_5072", "Unknown build option '{0}'."),
+        Build_option_0_requires_a_value_of_type_1: diag(5073, ts.DiagnosticCategory.Error, "Build_option_0_requires_a_value_of_type_1_5073", "Build option '{0}' requires a value of type {1}."),
+        Generates_a_sourcemap_for_each_corresponding_d_ts_file: diag(6000, ts.DiagnosticCategory.Message, "Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000", "Generates a sourcemap for each corresponding '.d.ts' file."),
+        Concatenate_and_emit_output_to_single_file: diag(6001, ts.DiagnosticCategory.Message, "Concatenate_and_emit_output_to_single_file_6001", "Concatenate and emit output to single file."),
+        Generates_corresponding_d_ts_file: diag(6002, ts.DiagnosticCategory.Message, "Generates_corresponding_d_ts_file_6002", "Generates corresponding '.d.ts' file."),
+        Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: diag(6003, ts.DiagnosticCategory.Message, "Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations_6003", "Specify the location where debugger should locate map files instead of generated locations."),
+        Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: diag(6004, ts.DiagnosticCategory.Message, "Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations_6004", "Specify the location where debugger should locate TypeScript files instead of source locations."),
+        Watch_input_files: diag(6005, ts.DiagnosticCategory.Message, "Watch_input_files_6005", "Watch input files."),
+        Redirect_output_structure_to_the_directory: diag(6006, ts.DiagnosticCategory.Message, "Redirect_output_structure_to_the_directory_6006", "Redirect output structure to the directory."),
+        Do_not_erase_const_enum_declarations_in_generated_code: diag(6007, ts.DiagnosticCategory.Message, "Do_not_erase_const_enum_declarations_in_generated_code_6007", "Do not erase const enum declarations in generated code."),
+        Do_not_emit_outputs_if_any_errors_were_reported: diag(6008, ts.DiagnosticCategory.Message, "Do_not_emit_outputs_if_any_errors_were_reported_6008", "Do not emit outputs if any errors were reported."),
+        Do_not_emit_comments_to_output: diag(6009, ts.DiagnosticCategory.Message, "Do_not_emit_comments_to_output_6009", "Do not emit comments to output."),
+        Do_not_emit_outputs: diag(6010, ts.DiagnosticCategory.Message, "Do_not_emit_outputs_6010", "Do not emit outputs."),
+        Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking: diag(6011, ts.DiagnosticCategory.Message, "Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typech_6011", "Allow default imports from modules with no default export. This does not affect code emit, just typechecking."),
+        Skip_type_checking_of_declaration_files: diag(6012, ts.DiagnosticCategory.Message, "Skip_type_checking_of_declaration_files_6012", "Skip type checking of declaration files."),
+        Do_not_resolve_the_real_path_of_symlinks: diag(6013, ts.DiagnosticCategory.Message, "Do_not_resolve_the_real_path_of_symlinks_6013", "Do not resolve the real path of symlinks."),
+        Only_emit_d_ts_declaration_files: diag(6014, ts.DiagnosticCategory.Message, "Only_emit_d_ts_declaration_files_6014", "Only emit '.d.ts' declaration files."),
+        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_ES2018_or_ESNEXT: diag(6015, ts.DiagnosticCategory.Message, "Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_ES2018_or_ESNEXT_6015", "Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'."),
+        Specify_module_code_generation_Colon_none_commonjs_amd_system_umd_es2015_or_ESNext: diag(6016, ts.DiagnosticCategory.Message, "Specify_module_code_generation_Colon_none_commonjs_amd_system_umd_es2015_or_ESNext_6016", "Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'."),
+        Print_this_message: diag(6017, ts.DiagnosticCategory.Message, "Print_this_message_6017", "Print this message."),
+        Print_the_compiler_s_version: diag(6019, ts.DiagnosticCategory.Message, "Print_the_compiler_s_version_6019", "Print the compiler's version."),
+        Compile_the_project_given_the_path_to_its_configuration_file_or_to_a_folder_with_a_tsconfig_json: diag(6020, ts.DiagnosticCategory.Message, "Compile_the_project_given_the_path_to_its_configuration_file_or_to_a_folder_with_a_tsconfig_json_6020", "Compile the project given the path to its configuration file, or to a folder with a 'tsconfig.json'."),
+        Syntax_Colon_0: diag(6023, ts.DiagnosticCategory.Message, "Syntax_Colon_0_6023", "Syntax: {0}"),
+        options: diag(6024, ts.DiagnosticCategory.Message, "options_6024", "options"),
+        file: diag(6025, ts.DiagnosticCategory.Message, "file_6025", "file"),
+        Examples_Colon_0: diag(6026, ts.DiagnosticCategory.Message, "Examples_Colon_0_6026", "Examples: {0}"),
+        Options_Colon: diag(6027, ts.DiagnosticCategory.Message, "Options_Colon_6027", "Options:"),
+        Version_0: diag(6029, ts.DiagnosticCategory.Message, "Version_0_6029", "Version {0}"),
+        Insert_command_line_options_and_files_from_a_file: diag(6030, ts.DiagnosticCategory.Message, "Insert_command_line_options_and_files_from_a_file_6030", "Insert command line options and files from a file."),
+        Starting_compilation_in_watch_mode: diag(6031, ts.DiagnosticCategory.Message, "Starting_compilation_in_watch_mode_6031", "Starting compilation in watch mode..."),
+        File_change_detected_Starting_incremental_compilation: diag(6032, ts.DiagnosticCategory.Message, "File_change_detected_Starting_incremental_compilation_6032", "File change detected. Starting incremental compilation..."),
+        KIND: diag(6034, ts.DiagnosticCategory.Message, "KIND_6034", "KIND"),
+        FILE: diag(6035, ts.DiagnosticCategory.Message, "FILE_6035", "FILE"),
+        VERSION: diag(6036, ts.DiagnosticCategory.Message, "VERSION_6036", "VERSION"),
+        LOCATION: diag(6037, ts.DiagnosticCategory.Message, "LOCATION_6037", "LOCATION"),
+        DIRECTORY: diag(6038, ts.DiagnosticCategory.Message, "DIRECTORY_6038", "DIRECTORY"),
+        STRATEGY: diag(6039, ts.DiagnosticCategory.Message, "STRATEGY_6039", "STRATEGY"),
+        FILE_OR_DIRECTORY: diag(6040, ts.DiagnosticCategory.Message, "FILE_OR_DIRECTORY_6040", "FILE OR DIRECTORY"),
+        Generates_corresponding_map_file: diag(6043, ts.DiagnosticCategory.Message, "Generates_corresponding_map_file_6043", "Generates corresponding '.map' file."),
+        Compiler_option_0_expects_an_argument: diag(6044, ts.DiagnosticCategory.Error, "Compiler_option_0_expects_an_argument_6044", "Compiler option '{0}' expects an argument."),
+        Unterminated_quoted_string_in_response_file_0: diag(6045, ts.DiagnosticCategory.Error, "Unterminated_quoted_string_in_response_file_0_6045", "Unterminated quoted string in response file '{0}'."),
+        Argument_for_0_option_must_be_Colon_1: diag(6046, ts.DiagnosticCategory.Error, "Argument_for_0_option_must_be_Colon_1_6046", "Argument for '{0}' option must be: {1}."),
+        Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1: diag(6048, ts.DiagnosticCategory.Error, "Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1_6048", "Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'."),
+        Unsupported_locale_0: diag(6049, ts.DiagnosticCategory.Error, "Unsupported_locale_0_6049", "Unsupported locale '{0}'."),
+        Unable_to_open_file_0: diag(6050, ts.DiagnosticCategory.Error, "Unable_to_open_file_0_6050", "Unable to open file '{0}'."),
+        Corrupted_locale_file_0: diag(6051, ts.DiagnosticCategory.Error, "Corrupted_locale_file_0_6051", "Corrupted locale file {0}."),
+        Raise_error_on_expressions_and_declarations_with_an_implied_any_type: diag(6052, ts.DiagnosticCategory.Message, "Raise_error_on_expressions_and_declarations_with_an_implied_any_type_6052", "Raise error on expressions and declarations with an implied 'any' type."),
+        File_0_not_found: diag(6053, ts.DiagnosticCategory.Error, "File_0_not_found_6053", "File '{0}' not found."),
+        File_0_has_unsupported_extension_The_only_supported_extensions_are_1: diag(6054, ts.DiagnosticCategory.Error, "File_0_has_unsupported_extension_The_only_supported_extensions_are_1_6054", "File '{0}' has unsupported extension. The only supported extensions are {1}."),
+        Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures: diag(6055, ts.DiagnosticCategory.Message, "Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures_6055", "Suppress noImplicitAny errors for indexing objects lacking index signatures."),
+        Do_not_emit_declarations_for_code_that_has_an_internal_annotation: diag(6056, ts.DiagnosticCategory.Message, "Do_not_emit_declarations_for_code_that_has_an_internal_annotation_6056", "Do not emit declarations for code that has an '@internal' annotation."),
+        Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir: diag(6058, ts.DiagnosticCategory.Message, "Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir_6058", "Specify the root directory of input files. Use to control the output directory structure with --outDir."),
+        File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files: diag(6059, ts.DiagnosticCategory.Error, "File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files_6059", "File '{0}' is not under 'rootDir' '{1}'. 'rootDir' is expected to contain all source files."),
+        Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix: diag(6060, ts.DiagnosticCategory.Message, "Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix_6060", "Specify the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix)."),
+        NEWLINE: diag(6061, ts.DiagnosticCategory.Message, "NEWLINE_6061", "NEWLINE"),
+        Option_0_can_only_be_specified_in_tsconfig_json_file: diag(6064, ts.DiagnosticCategory.Error, "Option_0_can_only_be_specified_in_tsconfig_json_file_6064", "Option '{0}' can only be specified in 'tsconfig.json' file."),
+        Enables_experimental_support_for_ES7_decorators: diag(6065, ts.DiagnosticCategory.Message, "Enables_experimental_support_for_ES7_decorators_6065", "Enables experimental support for ES7 decorators."),
+        Enables_experimental_support_for_emitting_type_metadata_for_decorators: diag(6066, ts.DiagnosticCategory.Message, "Enables_experimental_support_for_emitting_type_metadata_for_decorators_6066", "Enables experimental support for emitting type metadata for decorators."),
+        Enables_experimental_support_for_ES7_async_functions: diag(6068, ts.DiagnosticCategory.Message, "Enables_experimental_support_for_ES7_async_functions_6068", "Enables experimental support for ES7 async functions."),
+        Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6: diag(6069, ts.DiagnosticCategory.Message, "Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6_6069", "Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6)."),
+        Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file: diag(6070, ts.DiagnosticCategory.Message, "Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file_6070", "Initializes a TypeScript project and creates a tsconfig.json file."),
+        Successfully_created_a_tsconfig_json_file: diag(6071, ts.DiagnosticCategory.Message, "Successfully_created_a_tsconfig_json_file_6071", "Successfully created a tsconfig.json file."),
+        Suppress_excess_property_checks_for_object_literals: diag(6072, ts.DiagnosticCategory.Message, "Suppress_excess_property_checks_for_object_literals_6072", "Suppress excess property checks for object literals."),
+        Stylize_errors_and_messages_using_color_and_context_experimental: diag(6073, ts.DiagnosticCategory.Message, "Stylize_errors_and_messages_using_color_and_context_experimental_6073", "Stylize errors and messages using color and context (experimental)."),
+        Do_not_report_errors_on_unused_labels: diag(6074, ts.DiagnosticCategory.Message, "Do_not_report_errors_on_unused_labels_6074", "Do not report errors on unused labels."),
+        Report_error_when_not_all_code_paths_in_function_return_a_value: diag(6075, ts.DiagnosticCategory.Message, "Report_error_when_not_all_code_paths_in_function_return_a_value_6075", "Report error when not all code paths in function return a value."),
+        Report_errors_for_fallthrough_cases_in_switch_statement: diag(6076, ts.DiagnosticCategory.Message, "Report_errors_for_fallthrough_cases_in_switch_statement_6076", "Report errors for fallthrough cases in switch statement."),
+        Do_not_report_errors_on_unreachable_code: diag(6077, ts.DiagnosticCategory.Message, "Do_not_report_errors_on_unreachable_code_6077", "Do not report errors on unreachable code."),
+        Disallow_inconsistently_cased_references_to_the_same_file: diag(6078, ts.DiagnosticCategory.Message, "Disallow_inconsistently_cased_references_to_the_same_file_6078", "Disallow inconsistently-cased references to the same file."),
+        Specify_library_files_to_be_included_in_the_compilation: diag(6079, ts.DiagnosticCategory.Message, "Specify_library_files_to_be_included_in_the_compilation_6079", "Specify library files to be included in the compilation."),
+        Specify_JSX_code_generation_Colon_preserve_react_native_or_react: diag(6080, ts.DiagnosticCategory.Message, "Specify_JSX_code_generation_Colon_preserve_react_native_or_react_6080", "Specify JSX code generation: 'preserve', 'react-native', or 'react'."),
+        File_0_has_an_unsupported_extension_so_skipping_it: diag(6081, ts.DiagnosticCategory.Message, "File_0_has_an_unsupported_extension_so_skipping_it_6081", "File '{0}' has an unsupported extension, so skipping it."),
+        Only_amd_and_system_modules_are_supported_alongside_0: diag(6082, ts.DiagnosticCategory.Error, "Only_amd_and_system_modules_are_supported_alongside_0_6082", "Only 'amd' and 'system' modules are supported alongside --{0}."),
+        Base_directory_to_resolve_non_absolute_module_names: diag(6083, ts.DiagnosticCategory.Message, "Base_directory_to_resolve_non_absolute_module_names_6083", "Base directory to resolve non-absolute module names."),
+        Deprecated_Use_jsxFactory_instead_Specify_the_object_invoked_for_createElement_when_targeting_react_JSX_emit: diag(6084, ts.DiagnosticCategory.Message, "Deprecated_Use_jsxFactory_instead_Specify_the_object_invoked_for_createElement_when_targeting_react__6084", "[Deprecated] Use '--jsxFactory' instead. Specify the object invoked for createElement when targeting 'react' JSX emit"),
+        Enable_tracing_of_the_name_resolution_process: diag(6085, ts.DiagnosticCategory.Message, "Enable_tracing_of_the_name_resolution_process_6085", "Enable tracing of the name resolution process."),
+        Resolving_module_0_from_1: diag(6086, ts.DiagnosticCategory.Message, "Resolving_module_0_from_1_6086", "======== Resolving module '{0}' from '{1}'. ========"),
+        Explicitly_specified_module_resolution_kind_Colon_0: diag(6087, ts.DiagnosticCategory.Message, "Explicitly_specified_module_resolution_kind_Colon_0_6087", "Explicitly specified module resolution kind: '{0}'."),
+        Module_resolution_kind_is_not_specified_using_0: diag(6088, ts.DiagnosticCategory.Message, "Module_resolution_kind_is_not_specified_using_0_6088", "Module resolution kind is not specified, using '{0}'."),
+        Module_name_0_was_successfully_resolved_to_1: diag(6089, ts.DiagnosticCategory.Message, "Module_name_0_was_successfully_resolved_to_1_6089", "======== Module name '{0}' was successfully resolved to '{1}'. ========"),
+        Module_name_0_was_not_resolved: diag(6090, ts.DiagnosticCategory.Message, "Module_name_0_was_not_resolved_6090", "======== Module name '{0}' was not resolved. ========"),
+        paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0: diag(6091, ts.DiagnosticCategory.Message, "paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0_6091", "'paths' option is specified, looking for a pattern to match module name '{0}'."),
+        Module_name_0_matched_pattern_1: diag(6092, ts.DiagnosticCategory.Message, "Module_name_0_matched_pattern_1_6092", "Module name '{0}', matched pattern '{1}'."),
+        Trying_substitution_0_candidate_module_location_Colon_1: diag(6093, ts.DiagnosticCategory.Message, "Trying_substitution_0_candidate_module_location_Colon_1_6093", "Trying substitution '{0}', candidate module location: '{1}'."),
+        Resolving_module_name_0_relative_to_base_url_1_2: diag(6094, ts.DiagnosticCategory.Message, "Resolving_module_name_0_relative_to_base_url_1_2_6094", "Resolving module name '{0}' relative to base url '{1}' - '{2}'."),
+        Loading_module_as_file_Slash_folder_candidate_module_location_0_target_file_type_1: diag(6095, ts.DiagnosticCategory.Message, "Loading_module_as_file_Slash_folder_candidate_module_location_0_target_file_type_1_6095", "Loading module as file / folder, candidate module location '{0}', target file type '{1}'."),
+        File_0_does_not_exist: diag(6096, ts.DiagnosticCategory.Message, "File_0_does_not_exist_6096", "File '{0}' does not exist."),
+        File_0_exist_use_it_as_a_name_resolution_result: diag(6097, ts.DiagnosticCategory.Message, "File_0_exist_use_it_as_a_name_resolution_result_6097", "File '{0}' exist - use it as a name resolution result."),
+        Loading_module_0_from_node_modules_folder_target_file_type_1: diag(6098, ts.DiagnosticCategory.Message, "Loading_module_0_from_node_modules_folder_target_file_type_1_6098", "Loading module '{0}' from 'node_modules' folder, target file type '{1}'."),
+        Found_package_json_at_0: diag(6099, ts.DiagnosticCategory.Message, "Found_package_json_at_0_6099", "Found 'package.json' at '{0}'."),
+        package_json_does_not_have_a_0_field: diag(6100, ts.DiagnosticCategory.Message, "package_json_does_not_have_a_0_field_6100", "'package.json' does not have a '{0}' field."),
+        package_json_has_0_field_1_that_references_2: diag(6101, ts.DiagnosticCategory.Message, "package_json_has_0_field_1_that_references_2_6101", "'package.json' has '{0}' field '{1}' that references '{2}'."),
+        Allow_javascript_files_to_be_compiled: diag(6102, ts.DiagnosticCategory.Message, "Allow_javascript_files_to_be_compiled_6102", "Allow javascript files to be compiled."),
+        Option_0_should_have_array_of_strings_as_a_value: diag(6103, ts.DiagnosticCategory.Error, "Option_0_should_have_array_of_strings_as_a_value_6103", "Option '{0}' should have array of strings as a value."),
+        Checking_if_0_is_the_longest_matching_prefix_for_1_2: diag(6104, ts.DiagnosticCategory.Message, "Checking_if_0_is_the_longest_matching_prefix_for_1_2_6104", "Checking if '{0}' is the longest matching prefix for '{1}' - '{2}'."),
+        Expected_type_of_0_field_in_package_json_to_be_1_got_2: diag(6105, ts.DiagnosticCategory.Message, "Expected_type_of_0_field_in_package_json_to_be_1_got_2_6105", "Expected type of '{0}' field in 'package.json' to be '{1}', got '{2}'."),
+        baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1: diag(6106, ts.DiagnosticCategory.Message, "baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1_6106", "'baseUrl' option is set to '{0}', using this value to resolve non-relative module name '{1}'."),
+        rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0: diag(6107, ts.DiagnosticCategory.Message, "rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0_6107", "'rootDirs' option is set, using it to resolve relative module name '{0}'."),
+        Longest_matching_prefix_for_0_is_1: diag(6108, ts.DiagnosticCategory.Message, "Longest_matching_prefix_for_0_is_1_6108", "Longest matching prefix for '{0}' is '{1}'."),
+        Loading_0_from_the_root_dir_1_candidate_location_2: diag(6109, ts.DiagnosticCategory.Message, "Loading_0_from_the_root_dir_1_candidate_location_2_6109", "Loading '{0}' from the root dir '{1}', candidate location '{2}'."),
+        Trying_other_entries_in_rootDirs: diag(6110, ts.DiagnosticCategory.Message, "Trying_other_entries_in_rootDirs_6110", "Trying other entries in 'rootDirs'."),
+        Module_resolution_using_rootDirs_has_failed: diag(6111, ts.DiagnosticCategory.Message, "Module_resolution_using_rootDirs_has_failed_6111", "Module resolution using 'rootDirs' has failed."),
+        Do_not_emit_use_strict_directives_in_module_output: diag(6112, ts.DiagnosticCategory.Message, "Do_not_emit_use_strict_directives_in_module_output_6112", "Do not emit 'use strict' directives in module output."),
+        Enable_strict_null_checks: diag(6113, ts.DiagnosticCategory.Message, "Enable_strict_null_checks_6113", "Enable strict null checks."),
+        Unknown_option_excludes_Did_you_mean_exclude: diag(6114, ts.DiagnosticCategory.Error, "Unknown_option_excludes_Did_you_mean_exclude_6114", "Unknown option 'excludes'. Did you mean 'exclude'?"),
+        Raise_error_on_this_expressions_with_an_implied_any_type: diag(6115, ts.DiagnosticCategory.Message, "Raise_error_on_this_expressions_with_an_implied_any_type_6115", "Raise error on 'this' expressions with an implied 'any' type."),
+        Resolving_type_reference_directive_0_containing_file_1_root_directory_2: diag(6116, ts.DiagnosticCategory.Message, "Resolving_type_reference_directive_0_containing_file_1_root_directory_2_6116", "======== Resolving type reference directive '{0}', containing file '{1}', root directory '{2}'. ========"),
+        Resolving_using_primary_search_paths: diag(6117, ts.DiagnosticCategory.Message, "Resolving_using_primary_search_paths_6117", "Resolving using primary search paths..."),
+        Resolving_from_node_modules_folder: diag(6118, ts.DiagnosticCategory.Message, "Resolving_from_node_modules_folder_6118", "Resolving from node_modules folder..."),
+        Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2: diag(6119, ts.DiagnosticCategory.Message, "Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2_6119", "======== Type reference directive '{0}' was successfully resolved to '{1}', primary: {2}. ========"),
+        Type_reference_directive_0_was_not_resolved: diag(6120, ts.DiagnosticCategory.Message, "Type_reference_directive_0_was_not_resolved_6120", "======== Type reference directive '{0}' was not resolved. ========"),
+        Resolving_with_primary_search_path_0: diag(6121, ts.DiagnosticCategory.Message, "Resolving_with_primary_search_path_0_6121", "Resolving with primary search path '{0}'."),
+        Root_directory_cannot_be_determined_skipping_primary_search_paths: diag(6122, ts.DiagnosticCategory.Message, "Root_directory_cannot_be_determined_skipping_primary_search_paths_6122", "Root directory cannot be determined, skipping primary search paths."),
+        Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set: diag(6123, ts.DiagnosticCategory.Message, "Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set_6123", "======== Resolving type reference directive '{0}', containing file '{1}', root directory not set. ========"),
+        Type_declaration_files_to_be_included_in_compilation: diag(6124, ts.DiagnosticCategory.Message, "Type_declaration_files_to_be_included_in_compilation_6124", "Type declaration files to be included in compilation."),
+        Looking_up_in_node_modules_folder_initial_location_0: diag(6125, ts.DiagnosticCategory.Message, "Looking_up_in_node_modules_folder_initial_location_0_6125", "Looking up in 'node_modules' folder, initial location '{0}'."),
+        Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder: diag(6126, ts.DiagnosticCategory.Message, "Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_mod_6126", "Containing file is not specified and root directory cannot be determined, skipping lookup in 'node_modules' folder."),
+        Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1: diag(6127, ts.DiagnosticCategory.Message, "Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1_6127", "======== Resolving type reference directive '{0}', containing file not set, root directory '{1}'. ========"),
+        Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set: diag(6128, ts.DiagnosticCategory.Message, "Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set_6128", "======== Resolving type reference directive '{0}', containing file not set, root directory not set. ========"),
+        Resolving_real_path_for_0_result_1: diag(6130, ts.DiagnosticCategory.Message, "Resolving_real_path_for_0_result_1_6130", "Resolving real path for '{0}', result '{1}'."),
+        Cannot_compile_modules_using_option_0_unless_the_module_flag_is_amd_or_system: diag(6131, ts.DiagnosticCategory.Error, "Cannot_compile_modules_using_option_0_unless_the_module_flag_is_amd_or_system_6131", "Cannot compile modules using option '{0}' unless the '--module' flag is 'amd' or 'system'."),
+        File_name_0_has_a_1_extension_stripping_it: diag(6132, ts.DiagnosticCategory.Message, "File_name_0_has_a_1_extension_stripping_it_6132", "File name '{0}' has a '{1}' extension - stripping it."),
+        _0_is_declared_but_its_value_is_never_read: diag(6133, ts.DiagnosticCategory.Error, "_0_is_declared_but_its_value_is_never_read_6133", "'{0}' is declared but its value is never read.", /*reportsUnnecessary*/ true),
+        Report_errors_on_unused_locals: diag(6134, ts.DiagnosticCategory.Message, "Report_errors_on_unused_locals_6134", "Report errors on unused locals."),
+        Report_errors_on_unused_parameters: diag(6135, ts.DiagnosticCategory.Message, "Report_errors_on_unused_parameters_6135", "Report errors on unused parameters."),
+        The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files: diag(6136, ts.DiagnosticCategory.Message, "The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files_6136", "The maximum dependency depth to search under node_modules and load JavaScript files."),
+        Cannot_import_type_declaration_files_Consider_importing_0_instead_of_1: diag(6137, ts.DiagnosticCategory.Error, "Cannot_import_type_declaration_files_Consider_importing_0_instead_of_1_6137", "Cannot import type declaration files. Consider importing '{0}' instead of '{1}'."),
+        Property_0_is_declared_but_its_value_is_never_read: diag(6138, ts.DiagnosticCategory.Error, "Property_0_is_declared_but_its_value_is_never_read_6138", "Property '{0}' is declared but its value is never read.", /*reportsUnnecessary*/ true),
+        Import_emit_helpers_from_tslib: diag(6139, ts.DiagnosticCategory.Message, "Import_emit_helpers_from_tslib_6139", "Import emit helpers from 'tslib'."),
+        Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using_cache_location_2: diag(6140, ts.DiagnosticCategory.Error, "Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using__6140", "Auto discovery for typings is enabled in project '{0}'. Running extra resolution pass for module '{1}' using cache location '{2}'."),
+        Parse_in_strict_mode_and_emit_use_strict_for_each_source_file: diag(6141, ts.DiagnosticCategory.Message, "Parse_in_strict_mode_and_emit_use_strict_for_each_source_file_6141", "Parse in strict mode and emit \"use strict\" for each source file."),
+        Module_0_was_resolved_to_1_but_jsx_is_not_set: diag(6142, ts.DiagnosticCategory.Error, "Module_0_was_resolved_to_1_but_jsx_is_not_set_6142", "Module '{0}' was resolved to '{1}', but '--jsx' is not set."),
+        Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1: diag(6144, ts.DiagnosticCategory.Message, "Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1_6144", "Module '{0}' was resolved as locally declared ambient module in file '{1}'."),
+        Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified: diag(6145, ts.DiagnosticCategory.Message, "Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified_6145", "Module '{0}' was resolved as ambient module declared in '{1}' since this file was not modified."),
+        Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h: diag(6146, ts.DiagnosticCategory.Message, "Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h_6146", "Specify the JSX factory function to use when targeting 'react' JSX emit, e.g. 'React.createElement' or 'h'."),
+        Resolution_for_module_0_was_found_in_cache_from_location_1: diag(6147, ts.DiagnosticCategory.Message, "Resolution_for_module_0_was_found_in_cache_from_location_1_6147", "Resolution for module '{0}' was found in cache from location '{1}'."),
+        Directory_0_does_not_exist_skipping_all_lookups_in_it: diag(6148, ts.DiagnosticCategory.Message, "Directory_0_does_not_exist_skipping_all_lookups_in_it_6148", "Directory '{0}' does not exist, skipping all lookups in it."),
+        Show_diagnostic_information: diag(6149, ts.DiagnosticCategory.Message, "Show_diagnostic_information_6149", "Show diagnostic information."),
+        Show_verbose_diagnostic_information: diag(6150, ts.DiagnosticCategory.Message, "Show_verbose_diagnostic_information_6150", "Show verbose diagnostic information."),
+        Emit_a_single_file_with_source_maps_instead_of_having_a_separate_file: diag(6151, ts.DiagnosticCategory.Message, "Emit_a_single_file_with_source_maps_instead_of_having_a_separate_file_6151", "Emit a single file with source maps instead of having a separate file."),
+        Emit_the_source_alongside_the_sourcemaps_within_a_single_file_requires_inlineSourceMap_or_sourceMap_to_be_set: diag(6152, ts.DiagnosticCategory.Message, "Emit_the_source_alongside_the_sourcemaps_within_a_single_file_requires_inlineSourceMap_or_sourceMap__6152", "Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set."),
+        Transpile_each_file_as_a_separate_module_similar_to_ts_transpileModule: diag(6153, ts.DiagnosticCategory.Message, "Transpile_each_file_as_a_separate_module_similar_to_ts_transpileModule_6153", "Transpile each file as a separate module (similar to 'ts.transpileModule')."),
+        Print_names_of_generated_files_part_of_the_compilation: diag(6154, ts.DiagnosticCategory.Message, "Print_names_of_generated_files_part_of_the_compilation_6154", "Print names of generated files part of the compilation."),
+        Print_names_of_files_part_of_the_compilation: diag(6155, ts.DiagnosticCategory.Message, "Print_names_of_files_part_of_the_compilation_6155", "Print names of files part of the compilation."),
+        The_locale_used_when_displaying_messages_to_the_user_e_g_en_us: diag(6156, ts.DiagnosticCategory.Message, "The_locale_used_when_displaying_messages_to_the_user_e_g_en_us_6156", "The locale used when displaying messages to the user (e.g. 'en-us')"),
+        Do_not_generate_custom_helper_functions_like_extends_in_compiled_output: diag(6157, ts.DiagnosticCategory.Message, "Do_not_generate_custom_helper_functions_like_extends_in_compiled_output_6157", "Do not generate custom helper functions like '__extends' in compiled output."),
+        Do_not_include_the_default_library_file_lib_d_ts: diag(6158, ts.DiagnosticCategory.Message, "Do_not_include_the_default_library_file_lib_d_ts_6158", "Do not include the default library file (lib.d.ts)."),
+        Do_not_add_triple_slash_references_or_imported_modules_to_the_list_of_compiled_files: diag(6159, ts.DiagnosticCategory.Message, "Do_not_add_triple_slash_references_or_imported_modules_to_the_list_of_compiled_files_6159", "Do not add triple-slash references or imported modules to the list of compiled files."),
+        Deprecated_Use_skipLibCheck_instead_Skip_type_checking_of_default_library_declaration_files: diag(6160, ts.DiagnosticCategory.Message, "Deprecated_Use_skipLibCheck_instead_Skip_type_checking_of_default_library_declaration_files_6160", "[Deprecated] Use '--skipLibCheck' instead. Skip type checking of default library declaration files."),
+        List_of_folders_to_include_type_definitions_from: diag(6161, ts.DiagnosticCategory.Message, "List_of_folders_to_include_type_definitions_from_6161", "List of folders to include type definitions from."),
+        Disable_size_limitations_on_JavaScript_projects: diag(6162, ts.DiagnosticCategory.Message, "Disable_size_limitations_on_JavaScript_projects_6162", "Disable size limitations on JavaScript projects."),
+        The_character_set_of_the_input_files: diag(6163, ts.DiagnosticCategory.Message, "The_character_set_of_the_input_files_6163", "The character set of the input files."),
+        Emit_a_UTF_8_Byte_Order_Mark_BOM_in_the_beginning_of_output_files: diag(6164, ts.DiagnosticCategory.Message, "Emit_a_UTF_8_Byte_Order_Mark_BOM_in_the_beginning_of_output_files_6164", "Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files."),
+        Do_not_truncate_error_messages: diag(6165, ts.DiagnosticCategory.Message, "Do_not_truncate_error_messages_6165", "Do not truncate error messages."),
+        Output_directory_for_generated_declaration_files: diag(6166, ts.DiagnosticCategory.Message, "Output_directory_for_generated_declaration_files_6166", "Output directory for generated declaration files."),
+        A_series_of_entries_which_re_map_imports_to_lookup_locations_relative_to_the_baseUrl: diag(6167, ts.DiagnosticCategory.Message, "A_series_of_entries_which_re_map_imports_to_lookup_locations_relative_to_the_baseUrl_6167", "A series of entries which re-map imports to lookup locations relative to the 'baseUrl'."),
+        List_of_root_folders_whose_combined_content_represents_the_structure_of_the_project_at_runtime: diag(6168, ts.DiagnosticCategory.Message, "List_of_root_folders_whose_combined_content_represents_the_structure_of_the_project_at_runtime_6168", "List of root folders whose combined content represents the structure of the project at runtime."),
+        Show_all_compiler_options: diag(6169, ts.DiagnosticCategory.Message, "Show_all_compiler_options_6169", "Show all compiler options."),
+        Deprecated_Use_outFile_instead_Concatenate_and_emit_output_to_single_file: diag(6170, ts.DiagnosticCategory.Message, "Deprecated_Use_outFile_instead_Concatenate_and_emit_output_to_single_file_6170", "[Deprecated] Use '--outFile' instead. Concatenate and emit output to single file"),
+        Command_line_Options: diag(6171, ts.DiagnosticCategory.Message, "Command_line_Options_6171", "Command-line Options"),
+        Basic_Options: diag(6172, ts.DiagnosticCategory.Message, "Basic_Options_6172", "Basic Options"),
+        Strict_Type_Checking_Options: diag(6173, ts.DiagnosticCategory.Message, "Strict_Type_Checking_Options_6173", "Strict Type-Checking Options"),
+        Module_Resolution_Options: diag(6174, ts.DiagnosticCategory.Message, "Module_Resolution_Options_6174", "Module Resolution Options"),
+        Source_Map_Options: diag(6175, ts.DiagnosticCategory.Message, "Source_Map_Options_6175", "Source Map Options"),
+        Additional_Checks: diag(6176, ts.DiagnosticCategory.Message, "Additional_Checks_6176", "Additional Checks"),
+        Experimental_Options: diag(6177, ts.DiagnosticCategory.Message, "Experimental_Options_6177", "Experimental Options"),
+        Advanced_Options: diag(6178, ts.DiagnosticCategory.Message, "Advanced_Options_6178", "Advanced Options"),
+        Provide_full_support_for_iterables_in_for_of_spread_and_destructuring_when_targeting_ES5_or_ES3: diag(6179, ts.DiagnosticCategory.Message, "Provide_full_support_for_iterables_in_for_of_spread_and_destructuring_when_targeting_ES5_or_ES3_6179", "Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'."),
+        Enable_all_strict_type_checking_options: diag(6180, ts.DiagnosticCategory.Message, "Enable_all_strict_type_checking_options_6180", "Enable all strict type-checking options."),
+        List_of_language_service_plugins: diag(6181, ts.DiagnosticCategory.Message, "List_of_language_service_plugins_6181", "List of language service plugins."),
+        Scoped_package_detected_looking_in_0: diag(6182, ts.DiagnosticCategory.Message, "Scoped_package_detected_looking_in_0_6182", "Scoped package detected, looking in '{0}'"),
+        Reusing_resolution_of_module_0_to_file_1_from_old_program: diag(6183, ts.DiagnosticCategory.Message, "Reusing_resolution_of_module_0_to_file_1_from_old_program_6183", "Reusing resolution of module '{0}' to file '{1}' from old program."),
+        Reusing_module_resolutions_originating_in_0_since_resolutions_are_unchanged_from_old_program: diag(6184, ts.DiagnosticCategory.Message, "Reusing_module_resolutions_originating_in_0_since_resolutions_are_unchanged_from_old_program_6184", "Reusing module resolutions originating in '{0}' since resolutions are unchanged from old program."),
+        Disable_strict_checking_of_generic_signatures_in_function_types: diag(6185, ts.DiagnosticCategory.Message, "Disable_strict_checking_of_generic_signatures_in_function_types_6185", "Disable strict checking of generic signatures in function types."),
+        Enable_strict_checking_of_function_types: diag(6186, ts.DiagnosticCategory.Message, "Enable_strict_checking_of_function_types_6186", "Enable strict checking of function types."),
+        Enable_strict_checking_of_property_initialization_in_classes: diag(6187, ts.DiagnosticCategory.Message, "Enable_strict_checking_of_property_initialization_in_classes_6187", "Enable strict checking of property initialization in classes."),
+        Numeric_separators_are_not_allowed_here: diag(6188, ts.DiagnosticCategory.Error, "Numeric_separators_are_not_allowed_here_6188", "Numeric separators are not allowed here."),
+        Multiple_consecutive_numeric_separators_are_not_permitted: diag(6189, ts.DiagnosticCategory.Error, "Multiple_consecutive_numeric_separators_are_not_permitted_6189", "Multiple consecutive numeric separators are not permitted."),
+        Found_package_json_at_0_Package_ID_is_1: diag(6190, ts.DiagnosticCategory.Message, "Found_package_json_at_0_Package_ID_is_1_6190", "Found 'package.json' at '{0}'. Package ID is '{1}'."),
+        Whether_to_keep_outdated_console_output_in_watch_mode_instead_of_clearing_the_screen: diag(6191, ts.DiagnosticCategory.Message, "Whether_to_keep_outdated_console_output_in_watch_mode_instead_of_clearing_the_screen_6191", "Whether to keep outdated console output in watch mode instead of clearing the screen."),
+        All_imports_in_import_declaration_are_unused: diag(6192, ts.DiagnosticCategory.Error, "All_imports_in_import_declaration_are_unused_6192", "All imports in import declaration are unused.", /*reportsUnnecessary*/ true),
+        Found_1_error_Watching_for_file_changes: diag(6193, ts.DiagnosticCategory.Message, "Found_1_error_Watching_for_file_changes_6193", "Found 1 error. Watching for file changes."),
+        Found_0_errors_Watching_for_file_changes: diag(6194, ts.DiagnosticCategory.Message, "Found_0_errors_Watching_for_file_changes_6194", "Found {0} errors. Watching for file changes."),
+        Resolve_keyof_to_string_valued_property_names_only_no_numbers_or_symbols: diag(6195, ts.DiagnosticCategory.Message, "Resolve_keyof_to_string_valued_property_names_only_no_numbers_or_symbols_6195", "Resolve 'keyof' to string valued property names only (no numbers or symbols)."),
+        _0_is_declared_but_never_used: diag(6196, ts.DiagnosticCategory.Error, "_0_is_declared_but_never_used_6196", "'{0}' is declared but never used.", /*reportsUnnecessary*/ true),
+        Include_modules_imported_with_json_extension: diag(6197, ts.DiagnosticCategory.Message, "Include_modules_imported_with_json_extension_6197", "Include modules imported with '.json' extension"),
+        All_destructured_elements_are_unused: diag(6198, ts.DiagnosticCategory.Error, "All_destructured_elements_are_unused_6198", "All destructured elements are unused.", /*reportsUnnecessary*/ true),
+        All_variables_are_unused: diag(6199, ts.DiagnosticCategory.Error, "All_variables_are_unused_6199", "All variables are unused.", /*reportsUnnecessary*/ true),
+        Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0: diag(6200, ts.DiagnosticCategory.Error, "Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0_6200", "Definitions of the following identifiers conflict with those in another file: {0}"),
+        Conflicts_are_in_this_file: diag(6201, ts.DiagnosticCategory.Message, "Conflicts_are_in_this_file_6201", "Conflicts are in this file."),
+        _0_was_also_declared_here: diag(6203, ts.DiagnosticCategory.Message, "_0_was_also_declared_here_6203", "'{0}' was also declared here."),
+        and_here: diag(6204, ts.DiagnosticCategory.Message, "and_here_6204", "and here."),
+        All_type_parameters_are_unused: diag(6205, ts.DiagnosticCategory.Error, "All_type_parameters_are_unused_6205", "All type parameters are unused"),
+        package_json_has_a_typesVersions_field_with_version_specific_path_mappings: diag(6206, ts.DiagnosticCategory.Message, "package_json_has_a_typesVersions_field_with_version_specific_path_mappings_6206", "'package.json' has a 'typesVersions' field with version-specific path mappings."),
+        package_json_does_not_have_a_typesVersions_entry_that_matches_version_0: diag(6207, ts.DiagnosticCategory.Message, "package_json_does_not_have_a_typesVersions_entry_that_matches_version_0_6207", "'package.json' does not have a 'typesVersions' entry that matches version '{0}'."),
+        package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2: diag(6208, ts.DiagnosticCategory.Message, "package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_ma_6208", "'package.json' has a 'typesVersions' entry '{0}' that matches compiler version '{1}', looking for a pattern to match module name '{2}'."),
+        package_json_has_a_typesVersions_entry_0_that_is_not_a_valid_semver_range: diag(6209, ts.DiagnosticCategory.Message, "package_json_has_a_typesVersions_entry_0_that_is_not_a_valid_semver_range_6209", "'package.json' has a 'typesVersions' entry '{0}' that is not a valid semver range."),
+        An_argument_for_0_was_not_provided: diag(6210, ts.DiagnosticCategory.Message, "An_argument_for_0_was_not_provided_6210", "An argument for '{0}' was not provided."),
+        An_argument_matching_this_binding_pattern_was_not_provided: diag(6211, ts.DiagnosticCategory.Message, "An_argument_matching_this_binding_pattern_was_not_provided_6211", "An argument matching this binding pattern was not provided."),
+        Did_you_mean_to_call_this_expression: diag(6212, ts.DiagnosticCategory.Message, "Did_you_mean_to_call_this_expression_6212", "Did you mean to call this expression?"),
+        Did_you_mean_to_use_new_with_this_expression: diag(6213, ts.DiagnosticCategory.Message, "Did_you_mean_to_use_new_with_this_expression_6213", "Did you mean to use 'new' with this expression?"),
+        Enable_strict_bind_call_and_apply_methods_on_functions: diag(6214, ts.DiagnosticCategory.Message, "Enable_strict_bind_call_and_apply_methods_on_functions_6214", "Enable strict 'bind', 'call', and 'apply' methods on functions."),
+        Using_compiler_options_of_project_reference_redirect_0: diag(6215, ts.DiagnosticCategory.Message, "Using_compiler_options_of_project_reference_redirect_0_6215", "Using compiler options of project reference redirect '{0}'."),
+        Found_1_error: diag(6216, ts.DiagnosticCategory.Message, "Found_1_error_6216", "Found 1 error."),
+        Found_0_errors: diag(6217, ts.DiagnosticCategory.Message, "Found_0_errors_6217", "Found {0} errors."),
+        Projects_to_reference: diag(6300, ts.DiagnosticCategory.Message, "Projects_to_reference_6300", "Projects to reference"),
+        Enable_project_compilation: diag(6302, ts.DiagnosticCategory.Message, "Enable_project_compilation_6302", "Enable project compilation"),
+        Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0: diag(6202, ts.DiagnosticCategory.Error, "Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0_6202", "Project references may not form a circular graph. Cycle detected: {0}"),
+        Composite_projects_may_not_disable_declaration_emit: diag(6304, ts.DiagnosticCategory.Error, "Composite_projects_may_not_disable_declaration_emit_6304", "Composite projects may not disable declaration emit."),
+        Output_file_0_has_not_been_built_from_source_file_1: diag(6305, ts.DiagnosticCategory.Error, "Output_file_0_has_not_been_built_from_source_file_1_6305", "Output file '{0}' has not been built from source file '{1}'."),
+        Referenced_project_0_must_have_setting_composite_Colon_true: diag(6306, ts.DiagnosticCategory.Error, "Referenced_project_0_must_have_setting_composite_Colon_true_6306", "Referenced project '{0}' must have setting \"composite\": true."),
+        File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern: diag(6307, ts.DiagnosticCategory.Error, "File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern_6307", "File '{0}' is not in project file list. Projects must list all files or use an 'include' pattern."),
+        Cannot_prepend_project_0_because_it_does_not_have_outFile_set: diag(6308, ts.DiagnosticCategory.Error, "Cannot_prepend_project_0_because_it_does_not_have_outFile_set_6308", "Cannot prepend project '{0}' because it does not have 'outFile' set"),
+        Output_file_0_from_project_1_does_not_exist: diag(6309, ts.DiagnosticCategory.Error, "Output_file_0_from_project_1_does_not_exist_6309", "Output file '{0}' from project '{1}' does not exist"),
+        Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2: diag(6350, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2_6350", "Project '{0}' is out of date because oldest output '{1}' is older than newest input '{2}'"),
+        Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2: diag(6351, ts.DiagnosticCategory.Message, "Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2_6351", "Project '{0}' is up to date because newest input '{1}' is older than oldest output '{2}'"),
+        Project_0_is_out_of_date_because_output_file_1_does_not_exist: diag(6352, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_output_file_1_does_not_exist_6352", "Project '{0}' is out of date because output file '{1}' does not exist"),
+        Project_0_is_out_of_date_because_its_dependency_1_is_out_of_date: diag(6353, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_its_dependency_1_is_out_of_date_6353", "Project '{0}' is out of date because its dependency '{1}' is out of date"),
+        Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies: diag(6354, ts.DiagnosticCategory.Message, "Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies_6354", "Project '{0}' is up to date with .d.ts files from its dependencies"),
+        Projects_in_this_build_Colon_0: diag(6355, ts.DiagnosticCategory.Message, "Projects_in_this_build_Colon_0_6355", "Projects in this build: {0}"),
+        A_non_dry_build_would_delete_the_following_files_Colon_0: diag(6356, ts.DiagnosticCategory.Message, "A_non_dry_build_would_delete_the_following_files_Colon_0_6356", "A non-dry build would delete the following files: {0}"),
+        A_non_dry_build_would_build_project_0: diag(6357, ts.DiagnosticCategory.Message, "A_non_dry_build_would_build_project_0_6357", "A non-dry build would build project '{0}'"),
+        Building_project_0: diag(6358, ts.DiagnosticCategory.Message, "Building_project_0_6358", "Building project '{0}'..."),
+        Updating_output_timestamps_of_project_0: diag(6359, ts.DiagnosticCategory.Message, "Updating_output_timestamps_of_project_0_6359", "Updating output timestamps of project '{0}'..."),
+        delete_this_Project_0_is_up_to_date_because_it_was_previously_built: diag(6360, ts.DiagnosticCategory.Message, "delete_this_Project_0_is_up_to_date_because_it_was_previously_built_6360", "delete this - Project '{0}' is up to date because it was previously built"),
+        Project_0_is_up_to_date: diag(6361, ts.DiagnosticCategory.Message, "Project_0_is_up_to_date_6361", "Project '{0}' is up to date"),
+        Skipping_build_of_project_0_because_its_dependency_1_has_errors: diag(6362, ts.DiagnosticCategory.Message, "Skipping_build_of_project_0_because_its_dependency_1_has_errors_6362", "Skipping build of project '{0}' because its dependency '{1}' has errors"),
+        Project_0_can_t_be_built_because_its_dependency_1_has_errors: diag(6363, ts.DiagnosticCategory.Message, "Project_0_can_t_be_built_because_its_dependency_1_has_errors_6363", "Project '{0}' can't be built because its dependency '{1}' has errors"),
+        Build_one_or_more_projects_and_their_dependencies_if_out_of_date: diag(6364, ts.DiagnosticCategory.Message, "Build_one_or_more_projects_and_their_dependencies_if_out_of_date_6364", "Build one or more projects and their dependencies, if out of date"),
+        Delete_the_outputs_of_all_projects: diag(6365, ts.DiagnosticCategory.Message, "Delete_the_outputs_of_all_projects_6365", "Delete the outputs of all projects"),
+        Enable_verbose_logging: diag(6366, ts.DiagnosticCategory.Message, "Enable_verbose_logging_6366", "Enable verbose logging"),
+        Show_what_would_be_built_or_deleted_if_specified_with_clean: diag(6367, ts.DiagnosticCategory.Message, "Show_what_would_be_built_or_deleted_if_specified_with_clean_6367", "Show what would be built (or deleted, if specified with '--clean')"),
+        Build_all_projects_including_those_that_appear_to_be_up_to_date: diag(6368, ts.DiagnosticCategory.Message, "Build_all_projects_including_those_that_appear_to_be_up_to_date_6368", "Build all projects, including those that appear to be up to date"),
+        Option_build_must_be_the_first_command_line_argument: diag(6369, ts.DiagnosticCategory.Error, "Option_build_must_be_the_first_command_line_argument_6369", "Option '--build' must be the first command line argument."),
+        Options_0_and_1_cannot_be_combined: diag(6370, ts.DiagnosticCategory.Error, "Options_0_and_1_cannot_be_combined_6370", "Options '{0}' and '{1}' cannot be combined."),
+        Updating_unchanged_output_timestamps_of_project_0: diag(6371, ts.DiagnosticCategory.Message, "Updating_unchanged_output_timestamps_of_project_0_6371", "Updating unchanged output timestamps of project '{0}'..."),
+        The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1: diag(6500, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1_6500", "The expected type comes from property '{0}' which is declared here on type '{1}'"),
+        The_expected_type_comes_from_this_index_signature: diag(6501, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_this_index_signature_6501", "The expected type comes from this index signature."),
+        The_expected_type_comes_from_the_return_type_of_this_signature: diag(6502, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_the_return_type_of_this_signature_6502", "The expected type comes from the return type of this signature."),
+        Variable_0_implicitly_has_an_1_type: diag(7005, ts.DiagnosticCategory.Error, "Variable_0_implicitly_has_an_1_type_7005", "Variable '{0}' implicitly has an '{1}' type."),
+        Parameter_0_implicitly_has_an_1_type: diag(7006, ts.DiagnosticCategory.Error, "Parameter_0_implicitly_has_an_1_type_7006", "Parameter '{0}' implicitly has an '{1}' type."),
+        Member_0_implicitly_has_an_1_type: diag(7008, ts.DiagnosticCategory.Error, "Member_0_implicitly_has_an_1_type_7008", "Member '{0}' implicitly has an '{1}' type."),
+        new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type: diag(7009, ts.DiagnosticCategory.Error, "new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type_7009", "'new' expression, whose target lacks a construct signature, implicitly has an 'any' type."),
+        _0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type: diag(7010, ts.DiagnosticCategory.Error, "_0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type_7010", "'{0}', which lacks return-type annotation, implicitly has an '{1}' return type."),
+        Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type: diag(7011, ts.DiagnosticCategory.Error, "Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type_7011", "Function expression, which lacks return-type annotation, implicitly has an '{0}' return type."),
+        Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: diag(7013, ts.DiagnosticCategory.Error, "Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7013", "Construct signature, which lacks return-type annotation, implicitly has an 'any' return type."),
+        Function_type_which_lacks_return_type_annotation_implicitly_has_an_0_return_type: diag(7014, ts.DiagnosticCategory.Error, "Function_type_which_lacks_return_type_annotation_implicitly_has_an_0_return_type_7014", "Function type, which lacks return-type annotation, implicitly has an '{0}' return type."),
+        Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number: diag(7015, ts.DiagnosticCategory.Error, "Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number_7015", "Element implicitly has an 'any' type because index expression is not of type 'number'."),
+        Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type: diag(7016, ts.DiagnosticCategory.Error, "Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type_7016", "Could not find a declaration file for module '{0}'. '{1}' implicitly has an 'any' type."),
+        Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature: diag(7017, ts.DiagnosticCategory.Error, "Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_7017", "Element implicitly has an 'any' type because type '{0}' has no index signature."),
+        Object_literal_s_property_0_implicitly_has_an_1_type: diag(7018, ts.DiagnosticCategory.Error, "Object_literal_s_property_0_implicitly_has_an_1_type_7018", "Object literal's property '{0}' implicitly has an '{1}' type."),
+        Rest_parameter_0_implicitly_has_an_any_type: diag(7019, ts.DiagnosticCategory.Error, "Rest_parameter_0_implicitly_has_an_any_type_7019", "Rest parameter '{0}' implicitly has an 'any[]' type."),
+        Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: diag(7020, ts.DiagnosticCategory.Error, "Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7020", "Call signature, which lacks return-type annotation, implicitly has an 'any' return type."),
+        _0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer: diag(7022, ts.DiagnosticCategory.Error, "_0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or__7022", "'{0}' implicitly has type 'any' because it does not have a type annotation and is referenced directly or indirectly in its own initializer."),
+        _0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: diag(7023, ts.DiagnosticCategory.Error, "_0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_reference_7023", "'{0}' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions."),
+        Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: diag(7024, ts.DiagnosticCategory.Error, "Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_ref_7024", "Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions."),
+        Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type: diag(7025, ts.DiagnosticCategory.Error, "Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_typ_7025", "Generator implicitly has type '{0}' because it does not yield any values. Consider supplying a return type."),
+        JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists: diag(7026, ts.DiagnosticCategory.Error, "JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists_7026", "JSX element implicitly has type 'any' because no interface 'JSX.{0}' exists."),
+        Unreachable_code_detected: diag(7027, ts.DiagnosticCategory.Error, "Unreachable_code_detected_7027", "Unreachable code detected.", /*reportsUnnecessary*/ true),
+        Unused_label: diag(7028, ts.DiagnosticCategory.Error, "Unused_label_7028", "Unused label.", /*reportsUnnecessary*/ true),
+        Fallthrough_case_in_switch: diag(7029, ts.DiagnosticCategory.Error, "Fallthrough_case_in_switch_7029", "Fallthrough case in switch."),
+        Not_all_code_paths_return_a_value: diag(7030, ts.DiagnosticCategory.Error, "Not_all_code_paths_return_a_value_7030", "Not all code paths return a value."),
+        Binding_element_0_implicitly_has_an_1_type: diag(7031, ts.DiagnosticCategory.Error, "Binding_element_0_implicitly_has_an_1_type_7031", "Binding element '{0}' implicitly has an '{1}' type."),
+        Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation: diag(7032, ts.DiagnosticCategory.Error, "Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation_7032", "Property '{0}' implicitly has type 'any', because its set accessor lacks a parameter type annotation."),
+        Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation: diag(7033, ts.DiagnosticCategory.Error, "Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation_7033", "Property '{0}' implicitly has type 'any', because its get accessor lacks a return type annotation."),
+        Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined: diag(7034, ts.DiagnosticCategory.Error, "Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined_7034", "Variable '{0}' implicitly has type '{1}' in some locations where its type cannot be determined."),
+        Try_npm_install_types_Slash_1_if_it_exists_or_add_a_new_declaration_d_ts_file_containing_declare_module_0: diag(7035, ts.DiagnosticCategory.Error, "Try_npm_install_types_Slash_1_if_it_exists_or_add_a_new_declaration_d_ts_file_containing_declare_mod_7035", "Try `npm install @types/{1}` if it exists or add a new declaration (.d.ts) file containing `declare module '{0}';`"),
+        Dynamic_import_s_specifier_must_be_of_type_string_but_here_has_type_0: diag(7036, ts.DiagnosticCategory.Error, "Dynamic_import_s_specifier_must_be_of_type_string_but_here_has_type_0_7036", "Dynamic import's specifier must be of type 'string', but here has type '{0}'."),
+        Enables_emit_interoperability_between_CommonJS_and_ES_Modules_via_creation_of_namespace_objects_for_all_imports_Implies_allowSyntheticDefaultImports: diag(7037, ts.DiagnosticCategory.Message, "Enables_emit_interoperability_between_CommonJS_and_ES_Modules_via_creation_of_namespace_objects_for__7037", "Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'."),
+        Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_Consider_using_a_default_import_or_import_require_here_instead: diag(7038, ts.DiagnosticCategory.Message, "Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cau_7038", "Type originates at this import. A namespace-style import cannot be called or constructed, and will cause a failure at runtime. Consider using a default import or import require here instead."),
+        Mapped_object_type_implicitly_has_an_any_template_type: diag(7039, ts.DiagnosticCategory.Error, "Mapped_object_type_implicitly_has_an_any_template_type_7039", "Mapped object type implicitly has an 'any' template type."),
+        If_the_0_package_actually_exposes_this_module_consider_sending_a_pull_request_to_amend_https_Colon_Slash_Slashgithub.amrom.workers.dev_SlashDefinitelyTyped_SlashDefinitelyTyped_Slashtree_Slashmaster_Slashtypes_Slash_1: diag(7040, ts.DiagnosticCategory.Error, "If_the_0_package_actually_exposes_this_module_consider_sending_a_pull_request_to_amend_https_Colon_S_7040", "If the '{0}' package actually exposes this module, consider sending a pull request to amend 'https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/{1}`"),
+        The_containing_arrow_function_captures_the_global_value_of_this_which_implicitly_has_type_any: diag(7041, ts.DiagnosticCategory.Error, "The_containing_arrow_function_captures_the_global_value_of_this_which_implicitly_has_type_any_7041", "The containing arrow function captures the global value of 'this' which implicitly has type 'any'."),
+        Module_0_was_resolved_to_1_but_resolveJsonModule_is_not_used: diag(7042, ts.DiagnosticCategory.Error, "Module_0_was_resolved_to_1_but_resolveJsonModule_is_not_used_7042", "Module '{0}' was resolved to '{1}', but '--resolveJsonModule' is not used."),
+        Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage: diag(7043, ts.DiagnosticCategory.Suggestion, "Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage_7043", "Variable '{0}' implicitly has an '{1}' type, but a better type may be inferred from usage."),
+        Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage: diag(7044, ts.DiagnosticCategory.Suggestion, "Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage_7044", "Parameter '{0}' implicitly has an '{1}' type, but a better type may be inferred from usage."),
+        Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage: diag(7045, ts.DiagnosticCategory.Suggestion, "Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage_7045", "Member '{0}' implicitly has an '{1}' type, but a better type may be inferred from usage."),
+        Variable_0_implicitly_has_type_1_in_some_locations_but_a_better_type_may_be_inferred_from_usage: diag(7046, ts.DiagnosticCategory.Suggestion, "Variable_0_implicitly_has_type_1_in_some_locations_but_a_better_type_may_be_inferred_from_usage_7046", "Variable '{0}' implicitly has type '{1}' in some locations, but a better type may be inferred from usage."),
+        Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage: diag(7047, ts.DiagnosticCategory.Suggestion, "Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage_7047", "Rest parameter '{0}' implicitly has an 'any[]' type, but a better type may be inferred from usage."),
+        Property_0_implicitly_has_type_any_but_a_better_type_for_its_get_accessor_may_be_inferred_from_usage: diag(7048, ts.DiagnosticCategory.Suggestion, "Property_0_implicitly_has_type_any_but_a_better_type_for_its_get_accessor_may_be_inferred_from_usage_7048", "Property '{0}' implicitly has type 'any', but a better type for its get accessor may be inferred from usage."),
+        Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage: diag(7049, ts.DiagnosticCategory.Suggestion, "Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage_7049", "Property '{0}' implicitly has type 'any', but a better type for its set accessor may be inferred from usage."),
+        _0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage: diag(7050, ts.DiagnosticCategory.Suggestion, "_0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage_7050", "'{0}' implicitly has an '{1}' return type, but a better type may be inferred from usage."),
+        Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1: diag(7051, ts.DiagnosticCategory.Error, "Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1_7051", "Parameter has a name but no type. Did you mean '{0}: {1}'?"),
+        You_cannot_rename_this_element: diag(8000, ts.DiagnosticCategory.Error, "You_cannot_rename_this_element_8000", "You cannot rename this element."),
+        You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: diag(8001, ts.DiagnosticCategory.Error, "You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library_8001", "You cannot rename elements that are defined in the standard TypeScript library."),
+        import_can_only_be_used_in_a_ts_file: diag(8002, ts.DiagnosticCategory.Error, "import_can_only_be_used_in_a_ts_file_8002", "'import ... =' can only be used in a .ts file."),
+        export_can_only_be_used_in_a_ts_file: diag(8003, ts.DiagnosticCategory.Error, "export_can_only_be_used_in_a_ts_file_8003", "'export=' can only be used in a .ts file."),
+        type_parameter_declarations_can_only_be_used_in_a_ts_file: diag(8004, ts.DiagnosticCategory.Error, "type_parameter_declarations_can_only_be_used_in_a_ts_file_8004", "'type parameter declarations' can only be used in a .ts file."),
+        implements_clauses_can_only_be_used_in_a_ts_file: diag(8005, ts.DiagnosticCategory.Error, "implements_clauses_can_only_be_used_in_a_ts_file_8005", "'implements clauses' can only be used in a .ts file."),
+        interface_declarations_can_only_be_used_in_a_ts_file: diag(8006, ts.DiagnosticCategory.Error, "interface_declarations_can_only_be_used_in_a_ts_file_8006", "'interface declarations' can only be used in a .ts file."),
+        module_declarations_can_only_be_used_in_a_ts_file: diag(8007, ts.DiagnosticCategory.Error, "module_declarations_can_only_be_used_in_a_ts_file_8007", "'module declarations' can only be used in a .ts file."),
+        type_aliases_can_only_be_used_in_a_ts_file: diag(8008, ts.DiagnosticCategory.Error, "type_aliases_can_only_be_used_in_a_ts_file_8008", "'type aliases' can only be used in a .ts file."),
+        _0_can_only_be_used_in_a_ts_file: diag(8009, ts.DiagnosticCategory.Error, "_0_can_only_be_used_in_a_ts_file_8009", "'{0}' can only be used in a .ts file."),
+        types_can_only_be_used_in_a_ts_file: diag(8010, ts.DiagnosticCategory.Error, "types_can_only_be_used_in_a_ts_file_8010", "'types' can only be used in a .ts file."),
+        type_arguments_can_only_be_used_in_a_ts_file: diag(8011, ts.DiagnosticCategory.Error, "type_arguments_can_only_be_used_in_a_ts_file_8011", "'type arguments' can only be used in a .ts file."),
+        parameter_modifiers_can_only_be_used_in_a_ts_file: diag(8012, ts.DiagnosticCategory.Error, "parameter_modifiers_can_only_be_used_in_a_ts_file_8012", "'parameter modifiers' can only be used in a .ts file."),
+        non_null_assertions_can_only_be_used_in_a_ts_file: diag(8013, ts.DiagnosticCategory.Error, "non_null_assertions_can_only_be_used_in_a_ts_file_8013", "'non-null assertions' can only be used in a .ts file."),
+        enum_declarations_can_only_be_used_in_a_ts_file: diag(8015, ts.DiagnosticCategory.Error, "enum_declarations_can_only_be_used_in_a_ts_file_8015", "'enum declarations' can only be used in a .ts file."),
+        type_assertion_expressions_can_only_be_used_in_a_ts_file: diag(8016, ts.DiagnosticCategory.Error, "type_assertion_expressions_can_only_be_used_in_a_ts_file_8016", "'type assertion expressions' can only be used in a .ts file."),
+        Octal_literal_types_must_use_ES2015_syntax_Use_the_syntax_0: diag(8017, ts.DiagnosticCategory.Error, "Octal_literal_types_must_use_ES2015_syntax_Use_the_syntax_0_8017", "Octal literal types must use ES2015 syntax. Use the syntax '{0}'."),
+        Octal_literals_are_not_allowed_in_enums_members_initializer_Use_the_syntax_0: diag(8018, ts.DiagnosticCategory.Error, "Octal_literals_are_not_allowed_in_enums_members_initializer_Use_the_syntax_0_8018", "Octal literals are not allowed in enums members initializer. Use the syntax '{0}'."),
+        Report_errors_in_js_files: diag(8019, ts.DiagnosticCategory.Message, "Report_errors_in_js_files_8019", "Report errors in .js files."),
+        JSDoc_types_can_only_be_used_inside_documentation_comments: diag(8020, ts.DiagnosticCategory.Error, "JSDoc_types_can_only_be_used_inside_documentation_comments_8020", "JSDoc types can only be used inside documentation comments."),
+        JSDoc_typedef_tag_should_either_have_a_type_annotation_or_be_followed_by_property_or_member_tags: diag(8021, ts.DiagnosticCategory.Error, "JSDoc_typedef_tag_should_either_have_a_type_annotation_or_be_followed_by_property_or_member_tags_8021", "JSDoc '@typedef' tag should either have a type annotation or be followed by '@property' or '@member' tags."),
+        JSDoc_0_is_not_attached_to_a_class: diag(8022, ts.DiagnosticCategory.Error, "JSDoc_0_is_not_attached_to_a_class_8022", "JSDoc '@{0}' is not attached to a class."),
+        JSDoc_0_1_does_not_match_the_extends_2_clause: diag(8023, ts.DiagnosticCategory.Error, "JSDoc_0_1_does_not_match_the_extends_2_clause_8023", "JSDoc '@{0} {1}' does not match the 'extends {2}' clause."),
+        JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name: diag(8024, ts.DiagnosticCategory.Error, "JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_8024", "JSDoc '@param' tag has name '{0}', but there is no parameter with that name."),
+        Class_declarations_cannot_have_more_than_one_augments_or_extends_tag: diag(8025, ts.DiagnosticCategory.Error, "Class_declarations_cannot_have_more_than_one_augments_or_extends_tag_8025", "Class declarations cannot have more than one `@augments` or `@extends` tag."),
+        Expected_0_type_arguments_provide_these_with_an_extends_tag: diag(8026, ts.DiagnosticCategory.Error, "Expected_0_type_arguments_provide_these_with_an_extends_tag_8026", "Expected {0} type arguments; provide these with an '@extends' tag."),
+        Expected_0_1_type_arguments_provide_these_with_an_extends_tag: diag(8027, ts.DiagnosticCategory.Error, "Expected_0_1_type_arguments_provide_these_with_an_extends_tag_8027", "Expected {0}-{1} type arguments; provide these with an '@extends' tag."),
+        JSDoc_may_only_appear_in_the_last_parameter_of_a_signature: diag(8028, ts.DiagnosticCategory.Error, "JSDoc_may_only_appear_in_the_last_parameter_of_a_signature_8028", "JSDoc '...' may only appear in the last parameter of a signature."),
+        JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_It_would_match_arguments_if_it_had_an_array_type: diag(8029, ts.DiagnosticCategory.Error, "JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_It_would_match_arguments_if_it_h_8029", "JSDoc '@param' tag has name '{0}', but there is no parameter with that name. It would match 'arguments' if it had an array type."),
+        The_type_of_a_function_declaration_must_match_the_function_s_signature: diag(8030, ts.DiagnosticCategory.Error, "The_type_of_a_function_declaration_must_match_the_function_s_signature_8030", "The type of a function declaration must match the function's signature."),
+        You_cannot_rename_a_module_via_a_global_import: diag(8031, ts.DiagnosticCategory.Error, "You_cannot_rename_a_module_via_a_global_import_8031", "You cannot rename a module via a global import."),
+        Qualified_name_0_is_not_allowed_without_a_leading_param_object_1: diag(8032, ts.DiagnosticCategory.Error, "Qualified_name_0_is_not_allowed_without_a_leading_param_object_1_8032", "Qualified name '{0}' is not allowed without a leading '@param {object} {1}'."),
+        Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_class_extends_clause: diag(9002, ts.DiagnosticCategory.Error, "Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_clas_9002", "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clause."),
+        class_expressions_are_not_currently_supported: diag(9003, ts.DiagnosticCategory.Error, "class_expressions_are_not_currently_supported_9003", "'class' expressions are not currently supported."),
+        Language_service_is_disabled: diag(9004, ts.DiagnosticCategory.Error, "Language_service_is_disabled_9004", "Language service is disabled."),
+        JSX_attributes_must_only_be_assigned_a_non_empty_expression: diag(17000, ts.DiagnosticCategory.Error, "JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000", "JSX attributes must only be assigned a non-empty 'expression'."),
+        JSX_elements_cannot_have_multiple_attributes_with_the_same_name: diag(17001, ts.DiagnosticCategory.Error, "JSX_elements_cannot_have_multiple_attributes_with_the_same_name_17001", "JSX elements cannot have multiple attributes with the same name."),
+        Expected_corresponding_JSX_closing_tag_for_0: diag(17002, ts.DiagnosticCategory.Error, "Expected_corresponding_JSX_closing_tag_for_0_17002", "Expected corresponding JSX closing tag for '{0}'."),
+        JSX_attribute_expected: diag(17003, ts.DiagnosticCategory.Error, "JSX_attribute_expected_17003", "JSX attribute expected."),
+        Cannot_use_JSX_unless_the_jsx_flag_is_provided: diag(17004, ts.DiagnosticCategory.Error, "Cannot_use_JSX_unless_the_jsx_flag_is_provided_17004", "Cannot use JSX unless the '--jsx' flag is provided."),
+        A_constructor_cannot_contain_a_super_call_when_its_class_extends_null: diag(17005, ts.DiagnosticCategory.Error, "A_constructor_cannot_contain_a_super_call_when_its_class_extends_null_17005", "A constructor cannot contain a 'super' call when its class extends 'null'."),
+        An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: diag(17006, ts.DiagnosticCategory.Error, "An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_ex_17006", "An unary expression with the '{0}' operator is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses."),
+        A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: diag(17007, ts.DiagnosticCategory.Error, "A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Con_17007", "A type assertion expression is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses."),
+        JSX_element_0_has_no_corresponding_closing_tag: diag(17008, ts.DiagnosticCategory.Error, "JSX_element_0_has_no_corresponding_closing_tag_17008", "JSX element '{0}' has no corresponding closing tag."),
+        super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class: diag(17009, ts.DiagnosticCategory.Error, "super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class_17009", "'super' must be called before accessing 'this' in the constructor of a derived class."),
+        Unknown_type_acquisition_option_0: diag(17010, ts.DiagnosticCategory.Error, "Unknown_type_acquisition_option_0_17010", "Unknown type acquisition option '{0}'."),
+        super_must_be_called_before_accessing_a_property_of_super_in_the_constructor_of_a_derived_class: diag(17011, ts.DiagnosticCategory.Error, "super_must_be_called_before_accessing_a_property_of_super_in_the_constructor_of_a_derived_class_17011", "'super' must be called before accessing a property of 'super' in the constructor of a derived class."),
+        _0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_2: diag(17012, ts.DiagnosticCategory.Error, "_0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_2_17012", "'{0}' is not a valid meta-property for keyword '{1}'. Did you mean '{2}'?"),
+        Meta_property_0_is_only_allowed_in_the_body_of_a_function_declaration_function_expression_or_constructor: diag(17013, ts.DiagnosticCategory.Error, "Meta_property_0_is_only_allowed_in_the_body_of_a_function_declaration_function_expression_or_constru_17013", "Meta-property '{0}' is only allowed in the body of a function declaration, function expression, or constructor."),
+        JSX_fragment_has_no_corresponding_closing_tag: diag(17014, ts.DiagnosticCategory.Error, "JSX_fragment_has_no_corresponding_closing_tag_17014", "JSX fragment has no corresponding closing tag."),
+        Expected_corresponding_closing_tag_for_JSX_fragment: diag(17015, ts.DiagnosticCategory.Error, "Expected_corresponding_closing_tag_for_JSX_fragment_17015", "Expected corresponding closing tag for JSX fragment."),
+        JSX_fragment_is_not_supported_when_using_jsxFactory: diag(17016, ts.DiagnosticCategory.Error, "JSX_fragment_is_not_supported_when_using_jsxFactory_17016", "JSX fragment is not supported when using --jsxFactory"),
+        JSX_fragment_is_not_supported_when_using_an_inline_JSX_factory_pragma: diag(17017, ts.DiagnosticCategory.Error, "JSX_fragment_is_not_supported_when_using_an_inline_JSX_factory_pragma_17017", "JSX fragment is not supported when using an inline JSX factory pragma"),
+        Circularity_detected_while_resolving_configuration_Colon_0: diag(18000, ts.DiagnosticCategory.Error, "Circularity_detected_while_resolving_configuration_Colon_0_18000", "Circularity detected while resolving configuration: {0}"),
+        A_path_in_an_extends_option_must_be_relative_or_rooted_but_0_is_not: diag(18001, ts.DiagnosticCategory.Error, "A_path_in_an_extends_option_must_be_relative_or_rooted_but_0_is_not_18001", "A path in an 'extends' option must be relative or rooted, but '{0}' is not."),
+        The_files_list_in_config_file_0_is_empty: diag(18002, ts.DiagnosticCategory.Error, "The_files_list_in_config_file_0_is_empty_18002", "The 'files' list in config file '{0}' is empty."),
+        No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2: diag(18003, ts.DiagnosticCategory.Error, "No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2_18003", "No inputs were found in config file '{0}'. Specified 'include' paths were '{1}' and 'exclude' paths were '{2}'."),
+        File_is_a_CommonJS_module_it_may_be_converted_to_an_ES6_module: diag(80001, ts.DiagnosticCategory.Suggestion, "File_is_a_CommonJS_module_it_may_be_converted_to_an_ES6_module_80001", "File is a CommonJS module; it may be converted to an ES6 module."),
+        This_constructor_function_may_be_converted_to_a_class_declaration: diag(80002, ts.DiagnosticCategory.Suggestion, "This_constructor_function_may_be_converted_to_a_class_declaration_80002", "This constructor function may be converted to a class declaration."),
+        Import_may_be_converted_to_a_default_import: diag(80003, ts.DiagnosticCategory.Suggestion, "Import_may_be_converted_to_a_default_import_80003", "Import may be converted to a default import."),
+        JSDoc_types_may_be_moved_to_TypeScript_types: diag(80004, ts.DiagnosticCategory.Suggestion, "JSDoc_types_may_be_moved_to_TypeScript_types_80004", "JSDoc types may be moved to TypeScript types."),
+        require_call_may_be_converted_to_an_import: diag(80005, ts.DiagnosticCategory.Suggestion, "require_call_may_be_converted_to_an_import_80005", "'require' call may be converted to an import."),
+        This_may_be_converted_to_an_async_function: diag(80006, ts.DiagnosticCategory.Suggestion, "This_may_be_converted_to_an_async_function_80006", "This may be converted to an async function."),
+        Add_missing_super_call: diag(90001, ts.DiagnosticCategory.Message, "Add_missing_super_call_90001", "Add missing 'super()' call"),
+        Make_super_call_the_first_statement_in_the_constructor: diag(90002, ts.DiagnosticCategory.Message, "Make_super_call_the_first_statement_in_the_constructor_90002", "Make 'super()' call the first statement in the constructor"),
+        Change_extends_to_implements: diag(90003, ts.DiagnosticCategory.Message, "Change_extends_to_implements_90003", "Change 'extends' to 'implements'"),
+        Remove_declaration_for_Colon_0: diag(90004, ts.DiagnosticCategory.Message, "Remove_declaration_for_Colon_0_90004", "Remove declaration for: '{0}'"),
+        Remove_import_from_0: diag(90005, ts.DiagnosticCategory.Message, "Remove_import_from_0_90005", "Remove import from '{0}'"),
+        Implement_interface_0: diag(90006, ts.DiagnosticCategory.Message, "Implement_interface_0_90006", "Implement interface '{0}'"),
+        Implement_inherited_abstract_class: diag(90007, ts.DiagnosticCategory.Message, "Implement_inherited_abstract_class_90007", "Implement inherited abstract class"),
+        Add_0_to_unresolved_variable: diag(90008, ts.DiagnosticCategory.Message, "Add_0_to_unresolved_variable_90008", "Add '{0}.' to unresolved variable"),
+        Remove_destructuring: diag(90009, ts.DiagnosticCategory.Message, "Remove_destructuring_90009", "Remove destructuring"),
+        Remove_variable_statement: diag(90010, ts.DiagnosticCategory.Message, "Remove_variable_statement_90010", "Remove variable statement"),
+        Remove_template_tag: diag(90011, ts.DiagnosticCategory.Message, "Remove_template_tag_90011", "Remove template tag"),
+        Remove_type_parameters: diag(90012, ts.DiagnosticCategory.Message, "Remove_type_parameters_90012", "Remove type parameters"),
+        Import_0_from_module_1: diag(90013, ts.DiagnosticCategory.Message, "Import_0_from_module_1_90013", "Import '{0}' from module \"{1}\""),
+        Change_0_to_1: diag(90014, ts.DiagnosticCategory.Message, "Change_0_to_1_90014", "Change '{0}' to '{1}'"),
+        Add_0_to_existing_import_declaration_from_1: diag(90015, ts.DiagnosticCategory.Message, "Add_0_to_existing_import_declaration_from_1_90015", "Add '{0}' to existing import declaration from \"{1}\""),
+        Declare_property_0: diag(90016, ts.DiagnosticCategory.Message, "Declare_property_0_90016", "Declare property '{0}'"),
+        Add_index_signature_for_property_0: diag(90017, ts.DiagnosticCategory.Message, "Add_index_signature_for_property_0_90017", "Add index signature for property '{0}'"),
+        Disable_checking_for_this_file: diag(90018, ts.DiagnosticCategory.Message, "Disable_checking_for_this_file_90018", "Disable checking for this file"),
+        Ignore_this_error_message: diag(90019, ts.DiagnosticCategory.Message, "Ignore_this_error_message_90019", "Ignore this error message"),
+        Initialize_property_0_in_the_constructor: diag(90020, ts.DiagnosticCategory.Message, "Initialize_property_0_in_the_constructor_90020", "Initialize property '{0}' in the constructor"),
+        Initialize_static_property_0: diag(90021, ts.DiagnosticCategory.Message, "Initialize_static_property_0_90021", "Initialize static property '{0}'"),
+        Change_spelling_to_0: diag(90022, ts.DiagnosticCategory.Message, "Change_spelling_to_0_90022", "Change spelling to '{0}'"),
+        Declare_method_0: diag(90023, ts.DiagnosticCategory.Message, "Declare_method_0_90023", "Declare method '{0}'"),
+        Declare_static_method_0: diag(90024, ts.DiagnosticCategory.Message, "Declare_static_method_0_90024", "Declare static method '{0}'"),
+        Prefix_0_with_an_underscore: diag(90025, ts.DiagnosticCategory.Message, "Prefix_0_with_an_underscore_90025", "Prefix '{0}' with an underscore"),
+        Rewrite_as_the_indexed_access_type_0: diag(90026, ts.DiagnosticCategory.Message, "Rewrite_as_the_indexed_access_type_0_90026", "Rewrite as the indexed access type '{0}'"),
+        Declare_static_property_0: diag(90027, ts.DiagnosticCategory.Message, "Declare_static_property_0_90027", "Declare static property '{0}'"),
+        Call_decorator_expression: diag(90028, ts.DiagnosticCategory.Message, "Call_decorator_expression_90028", "Call decorator expression"),
+        Add_async_modifier_to_containing_function: diag(90029, ts.DiagnosticCategory.Message, "Add_async_modifier_to_containing_function_90029", "Add async modifier to containing function"),
+        Replace_infer_0_with_unknown: diag(90030, ts.DiagnosticCategory.Message, "Replace_infer_0_with_unknown_90030", "Replace 'infer {0}' with 'unknown'"),
+        Replace_all_unused_infer_with_unknown: diag(90031, ts.DiagnosticCategory.Message, "Replace_all_unused_infer_with_unknown_90031", "Replace all unused 'infer' with 'unknown'"),
+        Import_default_0_from_module_1: diag(90032, ts.DiagnosticCategory.Message, "Import_default_0_from_module_1_90032", "Import default '{0}' from module \"{1}\""),
+        Add_default_import_0_to_existing_import_declaration_from_1: diag(90033, ts.DiagnosticCategory.Message, "Add_default_import_0_to_existing_import_declaration_from_1_90033", "Add default import '{0}' to existing import declaration from \"{1}\""),
+        Add_parameter_name: diag(90034, ts.DiagnosticCategory.Message, "Add_parameter_name_90034", "Add parameter name"),
+        Convert_function_to_an_ES2015_class: diag(95001, ts.DiagnosticCategory.Message, "Convert_function_to_an_ES2015_class_95001", "Convert function to an ES2015 class"),
+        Convert_function_0_to_class: diag(95002, ts.DiagnosticCategory.Message, "Convert_function_0_to_class_95002", "Convert function '{0}' to class"),
+        Extract_to_0_in_1: diag(95004, ts.DiagnosticCategory.Message, "Extract_to_0_in_1_95004", "Extract to {0} in {1}"),
+        Extract_function: diag(95005, ts.DiagnosticCategory.Message, "Extract_function_95005", "Extract function"),
+        Extract_constant: diag(95006, ts.DiagnosticCategory.Message, "Extract_constant_95006", "Extract constant"),
+        Extract_to_0_in_enclosing_scope: diag(95007, ts.DiagnosticCategory.Message, "Extract_to_0_in_enclosing_scope_95007", "Extract to {0} in enclosing scope"),
+        Extract_to_0_in_1_scope: diag(95008, ts.DiagnosticCategory.Message, "Extract_to_0_in_1_scope_95008", "Extract to {0} in {1} scope"),
+        Annotate_with_type_from_JSDoc: diag(95009, ts.DiagnosticCategory.Message, "Annotate_with_type_from_JSDoc_95009", "Annotate with type from JSDoc"),
+        Annotate_with_types_from_JSDoc: diag(95010, ts.DiagnosticCategory.Message, "Annotate_with_types_from_JSDoc_95010", "Annotate with types from JSDoc"),
+        Infer_type_of_0_from_usage: diag(95011, ts.DiagnosticCategory.Message, "Infer_type_of_0_from_usage_95011", "Infer type of '{0}' from usage"),
+        Infer_parameter_types_from_usage: diag(95012, ts.DiagnosticCategory.Message, "Infer_parameter_types_from_usage_95012", "Infer parameter types from usage"),
+        Convert_to_default_import: diag(95013, ts.DiagnosticCategory.Message, "Convert_to_default_import_95013", "Convert to default import"),
+        Install_0: diag(95014, ts.DiagnosticCategory.Message, "Install_0_95014", "Install '{0}'"),
+        Replace_import_with_0: diag(95015, ts.DiagnosticCategory.Message, "Replace_import_with_0_95015", "Replace import with '{0}'."),
+        Use_synthetic_default_member: diag(95016, ts.DiagnosticCategory.Message, "Use_synthetic_default_member_95016", "Use synthetic 'default' member."),
+        Convert_to_ES6_module: diag(95017, ts.DiagnosticCategory.Message, "Convert_to_ES6_module_95017", "Convert to ES6 module"),
+        Add_undefined_type_to_property_0: diag(95018, ts.DiagnosticCategory.Message, "Add_undefined_type_to_property_0_95018", "Add 'undefined' type to property '{0}'"),
+        Add_initializer_to_property_0: diag(95019, ts.DiagnosticCategory.Message, "Add_initializer_to_property_0_95019", "Add initializer to property '{0}'"),
+        Add_definite_assignment_assertion_to_property_0: diag(95020, ts.DiagnosticCategory.Message, "Add_definite_assignment_assertion_to_property_0_95020", "Add definite assignment assertion to property '{0}'"),
+        Add_all_missing_members: diag(95022, ts.DiagnosticCategory.Message, "Add_all_missing_members_95022", "Add all missing members"),
+        Infer_all_types_from_usage: diag(95023, ts.DiagnosticCategory.Message, "Infer_all_types_from_usage_95023", "Infer all types from usage"),
+        Delete_all_unused_declarations: diag(95024, ts.DiagnosticCategory.Message, "Delete_all_unused_declarations_95024", "Delete all unused declarations"),
+        Prefix_all_unused_declarations_with_where_possible: diag(95025, ts.DiagnosticCategory.Message, "Prefix_all_unused_declarations_with_where_possible_95025", "Prefix all unused declarations with '_' where possible"),
+        Fix_all_detected_spelling_errors: diag(95026, ts.DiagnosticCategory.Message, "Fix_all_detected_spelling_errors_95026", "Fix all detected spelling errors"),
+        Add_initializers_to_all_uninitialized_properties: diag(95027, ts.DiagnosticCategory.Message, "Add_initializers_to_all_uninitialized_properties_95027", "Add initializers to all uninitialized properties"),
+        Add_definite_assignment_assertions_to_all_uninitialized_properties: diag(95028, ts.DiagnosticCategory.Message, "Add_definite_assignment_assertions_to_all_uninitialized_properties_95028", "Add definite assignment assertions to all uninitialized properties"),
+        Add_undefined_type_to_all_uninitialized_properties: diag(95029, ts.DiagnosticCategory.Message, "Add_undefined_type_to_all_uninitialized_properties_95029", "Add undefined type to all uninitialized properties"),
+        Change_all_jsdoc_style_types_to_TypeScript: diag(95030, ts.DiagnosticCategory.Message, "Change_all_jsdoc_style_types_to_TypeScript_95030", "Change all jsdoc-style types to TypeScript"),
+        Change_all_jsdoc_style_types_to_TypeScript_and_add_undefined_to_nullable_types: diag(95031, ts.DiagnosticCategory.Message, "Change_all_jsdoc_style_types_to_TypeScript_and_add_undefined_to_nullable_types_95031", "Change all jsdoc-style types to TypeScript (and add '| undefined' to nullable types)"),
+        Implement_all_unimplemented_interfaces: diag(95032, ts.DiagnosticCategory.Message, "Implement_all_unimplemented_interfaces_95032", "Implement all unimplemented interfaces"),
+        Install_all_missing_types_packages: diag(95033, ts.DiagnosticCategory.Message, "Install_all_missing_types_packages_95033", "Install all missing types packages"),
+        Rewrite_all_as_indexed_access_types: diag(95034, ts.DiagnosticCategory.Message, "Rewrite_all_as_indexed_access_types_95034", "Rewrite all as indexed access types"),
+        Convert_all_to_default_imports: diag(95035, ts.DiagnosticCategory.Message, "Convert_all_to_default_imports_95035", "Convert all to default imports"),
+        Make_all_super_calls_the_first_statement_in_their_constructor: diag(95036, ts.DiagnosticCategory.Message, "Make_all_super_calls_the_first_statement_in_their_constructor_95036", "Make all 'super()' calls the first statement in their constructor"),
+        Add_qualifier_to_all_unresolved_variables_matching_a_member_name: diag(95037, ts.DiagnosticCategory.Message, "Add_qualifier_to_all_unresolved_variables_matching_a_member_name_95037", "Add qualifier to all unresolved variables matching a member name"),
+        Change_all_extended_interfaces_to_implements: diag(95038, ts.DiagnosticCategory.Message, "Change_all_extended_interfaces_to_implements_95038", "Change all extended interfaces to 'implements'"),
+        Add_all_missing_super_calls: diag(95039, ts.DiagnosticCategory.Message, "Add_all_missing_super_calls_95039", "Add all missing super calls"),
+        Implement_all_inherited_abstract_classes: diag(95040, ts.DiagnosticCategory.Message, "Implement_all_inherited_abstract_classes_95040", "Implement all inherited abstract classes"),
+        Add_all_missing_async_modifiers: diag(95041, ts.DiagnosticCategory.Message, "Add_all_missing_async_modifiers_95041", "Add all missing 'async' modifiers"),
+        Add_ts_ignore_to_all_error_messages: diag(95042, ts.DiagnosticCategory.Message, "Add_ts_ignore_to_all_error_messages_95042", "Add '@ts-ignore' to all error messages"),
+        Annotate_everything_with_types_from_JSDoc: diag(95043, ts.DiagnosticCategory.Message, "Annotate_everything_with_types_from_JSDoc_95043", "Annotate everything with types from JSDoc"),
+        Add_to_all_uncalled_decorators: diag(95044, ts.DiagnosticCategory.Message, "Add_to_all_uncalled_decorators_95044", "Add '()' to all uncalled decorators"),
+        Convert_all_constructor_functions_to_classes: diag(95045, ts.DiagnosticCategory.Message, "Convert_all_constructor_functions_to_classes_95045", "Convert all constructor functions to classes"),
+        Generate_get_and_set_accessors: diag(95046, ts.DiagnosticCategory.Message, "Generate_get_and_set_accessors_95046", "Generate 'get' and 'set' accessors"),
+        Convert_require_to_import: diag(95047, ts.DiagnosticCategory.Message, "Convert_require_to_import_95047", "Convert 'require' to 'import'"),
+        Convert_all_require_to_import: diag(95048, ts.DiagnosticCategory.Message, "Convert_all_require_to_import_95048", "Convert all 'require' to 'import'"),
+        Move_to_a_new_file: diag(95049, ts.DiagnosticCategory.Message, "Move_to_a_new_file_95049", "Move to a new file"),
+        Remove_unreachable_code: diag(95050, ts.DiagnosticCategory.Message, "Remove_unreachable_code_95050", "Remove unreachable code"),
+        Remove_all_unreachable_code: diag(95051, ts.DiagnosticCategory.Message, "Remove_all_unreachable_code_95051", "Remove all unreachable code"),
+        Add_missing_typeof: diag(95052, ts.DiagnosticCategory.Message, "Add_missing_typeof_95052", "Add missing 'typeof'"),
+        Remove_unused_label: diag(95053, ts.DiagnosticCategory.Message, "Remove_unused_label_95053", "Remove unused label"),
+        Remove_all_unused_labels: diag(95054, ts.DiagnosticCategory.Message, "Remove_all_unused_labels_95054", "Remove all unused labels"),
+        Convert_0_to_mapped_object_type: diag(95055, ts.DiagnosticCategory.Message, "Convert_0_to_mapped_object_type_95055", "Convert '{0}' to mapped object type"),
+        Convert_namespace_import_to_named_imports: diag(95056, ts.DiagnosticCategory.Message, "Convert_namespace_import_to_named_imports_95056", "Convert namespace import to named imports"),
+        Convert_named_imports_to_namespace_import: diag(95057, ts.DiagnosticCategory.Message, "Convert_named_imports_to_namespace_import_95057", "Convert named imports to namespace import"),
+        Add_or_remove_braces_in_an_arrow_function: diag(95058, ts.DiagnosticCategory.Message, "Add_or_remove_braces_in_an_arrow_function_95058", "Add or remove braces in an arrow function"),
+        Add_braces_to_arrow_function: diag(95059, ts.DiagnosticCategory.Message, "Add_braces_to_arrow_function_95059", "Add braces to arrow function"),
+        Remove_braces_from_arrow_function: diag(95060, ts.DiagnosticCategory.Message, "Remove_braces_from_arrow_function_95060", "Remove braces from arrow function"),
+        Convert_default_export_to_named_export: diag(95061, ts.DiagnosticCategory.Message, "Convert_default_export_to_named_export_95061", "Convert default export to named export"),
+        Convert_named_export_to_default_export: diag(95062, ts.DiagnosticCategory.Message, "Convert_named_export_to_default_export_95062", "Convert named export to default export"),
+        Add_missing_enum_member_0: diag(95063, ts.DiagnosticCategory.Message, "Add_missing_enum_member_0_95063", "Add missing enum member '{0}'"),
+        Add_all_missing_imports: diag(95064, ts.DiagnosticCategory.Message, "Add_all_missing_imports_95064", "Add all missing imports"),
+        Convert_to_async_function: diag(95065, ts.DiagnosticCategory.Message, "Convert_to_async_function_95065", "Convert to async function"),
+        Convert_all_to_async_functions: diag(95066, ts.DiagnosticCategory.Message, "Convert_all_to_async_functions_95066", "Convert all to async functions"),
+        Generate_types_for_0: diag(95067, ts.DiagnosticCategory.Message, "Generate_types_for_0_95067", "Generate types for '{0}'"),
+        Generate_types_for_all_packages_without_types: diag(95068, ts.DiagnosticCategory.Message, "Generate_types_for_all_packages_without_types_95068", "Generate types for all packages without types"),
+        Add_unknown_conversion_for_non_overlapping_types: diag(95069, ts.DiagnosticCategory.Message, "Add_unknown_conversion_for_non_overlapping_types_95069", "Add 'unknown' conversion for non-overlapping types"),
+        Add_unknown_to_all_conversions_of_non_overlapping_types: diag(95070, ts.DiagnosticCategory.Message, "Add_unknown_to_all_conversions_of_non_overlapping_types_95070", "Add 'unknown' to all conversions of non-overlapping types"),
+        Add_missing_new_operator_to_call: diag(95071, ts.DiagnosticCategory.Message, "Add_missing_new_operator_to_call_95071", "Add missing 'new' operator to call"),
+        Add_missing_new_operator_to_all_calls: diag(95072, ts.DiagnosticCategory.Message, "Add_missing_new_operator_to_all_calls_95072", "Add missing 'new' operator to all calls"),
+        Add_names_to_all_parameters_without_names: diag(95073, ts.DiagnosticCategory.Message, "Add_names_to_all_parameters_without_names_95073", "Add names to all parameters without names"),
+        Enable_the_experimentalDecorators_option_in_your_configuration_file: diag(95074, ts.DiagnosticCategory.Message, "Enable_the_experimentalDecorators_option_in_your_configuration_file_95074", "Enable the 'experimentalDecorators' option in your configuration file"),
+    };
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    var _a;
+    /* @internal */
+    function tokenIsIdentifierOrKeyword(token) {
+        return token >= 72 /* Identifier */;
+    }
+    ts.tokenIsIdentifierOrKeyword = tokenIsIdentifierOrKeyword;
+    /* @internal */
+    function tokenIsIdentifierOrKeywordOrGreaterThan(token) {
+        return token === 30 /* GreaterThanToken */ || tokenIsIdentifierOrKeyword(token);
+    }
+    ts.tokenIsIdentifierOrKeywordOrGreaterThan = tokenIsIdentifierOrKeywordOrGreaterThan;
+    var textToKeywordObj = (_a = {
+            abstract: 118 /* AbstractKeyword */,
+            any: 120 /* AnyKeyword */,
+            as: 119 /* AsKeyword */,
+            bigint: 146 /* BigIntKeyword */,
+            boolean: 123 /* BooleanKeyword */,
+            break: 73 /* BreakKeyword */,
+            case: 74 /* CaseKeyword */,
+            catch: 75 /* CatchKeyword */,
+            class: 76 /* ClassKeyword */,
+            continue: 78 /* ContinueKeyword */,
+            const: 77 /* ConstKeyword */
+        },
+        _a["" + "constructor"] = 124 /* ConstructorKeyword */,
+        _a.debugger = 79 /* DebuggerKeyword */,
+        _a.declare = 125 /* DeclareKeyword */,
+        _a.default = 80 /* DefaultKeyword */,
+        _a.delete = 81 /* DeleteKeyword */,
+        _a.do = 82 /* DoKeyword */,
+        _a.else = 83 /* ElseKeyword */,
+        _a.enum = 84 /* EnumKeyword */,
+        _a.export = 85 /* ExportKeyword */,
+        _a.extends = 86 /* ExtendsKeyword */,
+        _a.false = 87 /* FalseKeyword */,
+        _a.finally = 88 /* FinallyKeyword */,
+        _a.for = 89 /* ForKeyword */,
+        _a.from = 144 /* FromKeyword */,
+        _a.function = 90 /* FunctionKeyword */,
+        _a.get = 126 /* GetKeyword */,
+        _a.if = 91 /* IfKeyword */,
+        _a.implements = 109 /* ImplementsKeyword */,
+        _a.import = 92 /* ImportKeyword */,
+        _a.in = 93 /* InKeyword */,
+        _a.infer = 127 /* InferKeyword */,
+        _a.instanceof = 94 /* InstanceOfKeyword */,
+        _a.interface = 110 /* InterfaceKeyword */,
+        _a.is = 128 /* IsKeyword */,
+        _a.keyof = 129 /* KeyOfKeyword */,
+        _a.let = 111 /* LetKeyword */,
+        _a.module = 130 /* ModuleKeyword */,
+        _a.namespace = 131 /* NamespaceKeyword */,
+        _a.never = 132 /* NeverKeyword */,
+        _a.new = 95 /* NewKeyword */,
+        _a.null = 96 /* NullKeyword */,
+        _a.number = 135 /* NumberKeyword */,
+        _a.object = 136 /* ObjectKeyword */,
+        _a.package = 112 /* PackageKeyword */,
+        _a.private = 113 /* PrivateKeyword */,
+        _a.protected = 114 /* ProtectedKeyword */,
+        _a.public = 115 /* PublicKeyword */,
+        _a.readonly = 133 /* ReadonlyKeyword */,
+        _a.require = 134 /* RequireKeyword */,
+        _a.global = 145 /* GlobalKeyword */,
+        _a.return = 97 /* ReturnKeyword */,
+        _a.set = 137 /* SetKeyword */,
+        _a.static = 116 /* StaticKeyword */,
+        _a.string = 138 /* StringKeyword */,
+        _a.super = 98 /* SuperKeyword */,
+        _a.switch = 99 /* SwitchKeyword */,
+        _a.symbol = 139 /* SymbolKeyword */,
+        _a.this = 100 /* ThisKeyword */,
+        _a.throw = 101 /* ThrowKeyword */,
+        _a.true = 102 /* TrueKeyword */,
+        _a.try = 103 /* TryKeyword */,
+        _a.type = 140 /* TypeKeyword */,
+        _a.typeof = 104 /* TypeOfKeyword */,
+        _a.undefined = 141 /* UndefinedKeyword */,
+        _a.unique = 142 /* UniqueKeyword */,
+        _a.unknown = 143 /* UnknownKeyword */,
+        _a.var = 105 /* VarKeyword */,
+        _a.void = 106 /* VoidKeyword */,
+        _a.while = 107 /* WhileKeyword */,
+        _a.with = 108 /* WithKeyword */,
+        _a.yield = 117 /* YieldKeyword */,
+        _a.async = 121 /* AsyncKeyword */,
+        _a.await = 122 /* AwaitKeyword */,
+        _a.of = 147 /* OfKeyword */,
+        _a);
+    var textToKeyword = ts.createMapFromTemplate(textToKeywordObj);
+    var textToToken = ts.createMapFromTemplate(__assign({}, textToKeywordObj, { "{": 18 /* OpenBraceToken */, "}": 19 /* CloseBraceToken */, "(": 20 /* OpenParenToken */, ")": 21 /* CloseParenToken */, "[": 22 /* OpenBracketToken */, "]": 23 /* CloseBracketToken */, ".": 24 /* DotToken */, "...": 25 /* DotDotDotToken */, ";": 26 /* SemicolonToken */, ",": 27 /* CommaToken */, "<": 28 /* LessThanToken */, ">": 30 /* GreaterThanToken */, "<=": 31 /* LessThanEqualsToken */, ">=": 32 /* GreaterThanEqualsToken */, "==": 33 /* EqualsEqualsToken */, "!=": 34 /* ExclamationEqualsToken */, "===": 35 /* EqualsEqualsEqualsToken */, "!==": 36 /* ExclamationEqualsEqualsToken */, "=>": 37 /* EqualsGreaterThanToken */, "+": 38 /* PlusToken */, "-": 39 /* MinusToken */, "**": 41 /* AsteriskAsteriskToken */, "*": 40 /* AsteriskToken */, "/": 42 /* SlashToken */, "%": 43 /* PercentToken */, "++": 44 /* PlusPlusToken */, "--": 45 /* MinusMinusToken */, "<<": 46 /* LessThanLessThanToken */, "</": 29 /* LessThanSlashToken */, ">>": 47 /* GreaterThanGreaterThanToken */, ">>>": 48 /* GreaterThanGreaterThanGreaterThanToken */, "&": 49 /* AmpersandToken */, "|": 50 /* BarToken */, "^": 51 /* CaretToken */, "!": 52 /* ExclamationToken */, "~": 53 /* TildeToken */, "&&": 54 /* AmpersandAmpersandToken */, "||": 55 /* BarBarToken */, "?": 56 /* QuestionToken */, ":": 57 /* ColonToken */, "=": 59 /* EqualsToken */, "+=": 60 /* PlusEqualsToken */, "-=": 61 /* MinusEqualsToken */, "*=": 62 /* AsteriskEqualsToken */, "**=": 63 /* AsteriskAsteriskEqualsToken */, "/=": 64 /* SlashEqualsToken */, "%=": 65 /* PercentEqualsToken */, "<<=": 66 /* LessThanLessThanEqualsToken */, ">>=": 67 /* GreaterThanGreaterThanEqualsToken */, ">>>=": 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */, "&=": 69 /* AmpersandEqualsToken */, "|=": 70 /* BarEqualsToken */, "^=": 71 /* CaretEqualsToken */, "@": 58 /* AtToken */ }));
+    /*
+        As per ECMAScript Language Specification 3th Edition, Section 7.6: Identifiers
+        IdentifierStart ::
+            Can contain Unicode 3.0.0 categories:
+            Uppercase letter (Lu),
+            Lowercase letter (Ll),
+            Titlecase letter (Lt),
+            Modifier letter (Lm),
+            Other letter (Lo), or
+            Letter number (Nl).
+        IdentifierPart :: =
+            Can contain IdentifierStart + Unicode 3.0.0 categories:
+            Non-spacing mark (Mn),
+            Combining spacing mark (Mc),
+            Decimal number (Nd), or
+            Connector punctuation (Pc).
+
+        Codepoint ranges for ES3 Identifiers are extracted from the Unicode 3.0.0 specification at:
+        http://www.unicode.org/Public/3.0-Update/UnicodeData-3.0.0.txt
+    */
+    var unicodeES3IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 543, 546, 563, 592, 685, 688, 696, 699, 705, 720, 721, 736, 740, 750, 750, 890, 890, 902, 902, 904, 906, 908, 908, 910, 929, 931, 974, 976, 983, 986, 1011, 1024, 1153, 1164, 1220, 1223, 1224, 1227, 1228, 1232, 1269, 1272, 1273, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1569, 1594, 1600, 1610, 1649, 1747, 1749, 1749, 1765, 1766, 1786, 1788, 1808, 1808, 1810, 1836, 1920, 1957, 2309, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2699, 2701, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2784, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2870, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 2997, 2999, 3001, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3294, 3294, 3296, 3297, 3333, 3340, 3342, 3344, 3346, 3368, 3370, 3385, 3424, 3425, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3805, 3840, 3840, 3904, 3911, 3913, 3946, 3976, 3979, 4096, 4129, 4131, 4135, 4137, 4138, 4176, 4181, 4256, 4293, 4304, 4342, 4352, 4441, 4447, 4514, 4520, 4601, 4608, 4614, 4616, 4678, 4680, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4742, 4744, 4744, 4746, 4749, 4752, 4782, 4784, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4814, 4816, 4822, 4824, 4846, 4848, 4878, 4880, 4880, 4882, 4885, 4888, 4894, 4896, 4934, 4936, 4954, 5024, 5108, 5121, 5740, 5743, 5750, 5761, 5786, 5792, 5866, 6016, 6067, 6176, 6263, 6272, 6312, 7680, 7835, 7840, 7929, 7936, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8319, 8319, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8497, 8499, 8505, 8544, 8579, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12346, 12353, 12436, 12445, 12446, 12449, 12538, 12540, 12542, 12549, 12588, 12593, 12686, 12704, 12727, 13312, 19893, 19968, 40869, 40960, 42124, 44032, 55203, 63744, 64045, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65138, 65140, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
+    var unicodeES3IdentifierPart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 543, 546, 563, 592, 685, 688, 696, 699, 705, 720, 721, 736, 740, 750, 750, 768, 846, 864, 866, 890, 890, 902, 902, 904, 906, 908, 908, 910, 929, 931, 974, 976, 983, 986, 1011, 1024, 1153, 1155, 1158, 1164, 1220, 1223, 1224, 1227, 1228, 1232, 1269, 1272, 1273, 1329, 1366, 1369, 1369, 1377, 1415, 1425, 1441, 1443, 1465, 1467, 1469, 1471, 1471, 1473, 1474, 1476, 1476, 1488, 1514, 1520, 1522, 1569, 1594, 1600, 1621, 1632, 1641, 1648, 1747, 1749, 1756, 1759, 1768, 1770, 1773, 1776, 1788, 1808, 1836, 1840, 1866, 1920, 1968, 2305, 2307, 2309, 2361, 2364, 2381, 2384, 2388, 2392, 2403, 2406, 2415, 2433, 2435, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2492, 2492, 2494, 2500, 2503, 2504, 2507, 2509, 2519, 2519, 2524, 2525, 2527, 2531, 2534, 2545, 2562, 2562, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2620, 2620, 2622, 2626, 2631, 2632, 2635, 2637, 2649, 2652, 2654, 2654, 2662, 2676, 2689, 2691, 2693, 2699, 2701, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2748, 2757, 2759, 2761, 2763, 2765, 2768, 2768, 2784, 2784, 2790, 2799, 2817, 2819, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2870, 2873, 2876, 2883, 2887, 2888, 2891, 2893, 2902, 2903, 2908, 2909, 2911, 2913, 2918, 2927, 2946, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 2997, 2999, 3001, 3006, 3010, 3014, 3016, 3018, 3021, 3031, 3031, 3047, 3055, 3073, 3075, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3134, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3168, 3169, 3174, 3183, 3202, 3203, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3262, 3268, 3270, 3272, 3274, 3277, 3285, 3286, 3294, 3294, 3296, 3297, 3302, 3311, 3330, 3331, 3333, 3340, 3342, 3344, 3346, 3368, 3370, 3385, 3390, 3395, 3398, 3400, 3402, 3405, 3415, 3415, 3424, 3425, 3430, 3439, 3458, 3459, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3530, 3530, 3535, 3540, 3542, 3542, 3544, 3551, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3769, 3771, 3773, 3776, 3780, 3782, 3782, 3784, 3789, 3792, 3801, 3804, 3805, 3840, 3840, 3864, 3865, 3872, 3881, 3893, 3893, 3895, 3895, 3897, 3897, 3902, 3911, 3913, 3946, 3953, 3972, 3974, 3979, 3984, 3991, 3993, 4028, 4038, 4038, 4096, 4129, 4131, 4135, 4137, 4138, 4140, 4146, 4150, 4153, 4160, 4169, 4176, 4185, 4256, 4293, 4304, 4342, 4352, 4441, 4447, 4514, 4520, 4601, 4608, 4614, 4616, 4678, 4680, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4742, 4744, 4744, 4746, 4749, 4752, 4782, 4784, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4814, 4816, 4822, 4824, 4846, 4848, 4878, 4880, 4880, 4882, 4885, 4888, 4894, 4896, 4934, 4936, 4954, 4969, 4977, 5024, 5108, 5121, 5740, 5743, 5750, 5761, 5786, 5792, 5866, 6016, 6099, 6112, 6121, 6160, 6169, 6176, 6263, 6272, 6313, 7680, 7835, 7840, 7929, 7936, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8255, 8256, 8319, 8319, 8400, 8412, 8417, 8417, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8497, 8499, 8505, 8544, 8579, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12346, 12353, 12436, 12441, 12442, 12445, 12446, 12449, 12542, 12549, 12588, 12593, 12686, 12704, 12727, 13312, 19893, 19968, 40869, 40960, 42124, 44032, 55203, 63744, 64045, 64256, 64262, 64275, 64279, 64285, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65056, 65059, 65075, 65076, 65101, 65103, 65136, 65138, 65140, 65140, 65142, 65276, 65296, 65305, 65313, 65338, 65343, 65343, 65345, 65370, 65381, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
+    /*
+        As per ECMAScript Language Specification 5th Edition, Section 7.6: ISyntaxToken Names and Identifiers
+        IdentifierStart ::
+            Can contain Unicode 6.2 categories:
+            Uppercase letter (Lu),
+            Lowercase letter (Ll),
+            Titlecase letter (Lt),
+            Modifier letter (Lm),
+            Other letter (Lo), or
+            Letter number (Nl).
+        IdentifierPart ::
+            Can contain IdentifierStart + Unicode 6.2 categories:
+            Non-spacing mark (Mn),
+            Combining spacing mark (Mc),
+            Decimal number (Nd),
+            Connector punctuation (Pc),
+            <ZWNJ>, or
+            <ZWJ>.
+
+        Codepoint ranges for ES5 Identifiers are extracted from the Unicode 6.2 specification at:
+        http://www.unicode.org/Public/6.2.0/ucd/UnicodeData.txt
+    */
+    var unicodeES5IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 880, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1568, 1610, 1646, 1647, 1649, 1747, 1749, 1749, 1765, 1766, 1774, 1775, 1786, 1788, 1791, 1791, 1808, 1808, 1810, 1839, 1869, 1957, 1969, 1969, 1994, 2026, 2036, 2037, 2042, 2042, 2048, 2069, 2074, 2074, 2084, 2084, 2088, 2088, 2112, 2136, 2208, 2208, 2210, 2220, 2308, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2417, 2423, 2425, 2431, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2493, 2493, 2510, 2510, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2785, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2929, 2929, 2947, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3024, 3024, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3133, 3160, 3161, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3261, 3261, 3294, 3294, 3296, 3297, 3313, 3314, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3389, 3406, 3406, 3424, 3425, 3450, 3455, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3807, 3840, 3840, 3904, 3911, 3913, 3948, 3976, 3980, 4096, 4138, 4159, 4159, 4176, 4181, 4186, 4189, 4193, 4193, 4197, 4198, 4206, 4208, 4213, 4225, 4238, 4238, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 5888, 5900, 5902, 5905, 5920, 5937, 5952, 5969, 5984, 5996, 5998, 6000, 6016, 6067, 6103, 6103, 6108, 6108, 6176, 6263, 6272, 6312, 6314, 6314, 6320, 6389, 6400, 6428, 6480, 6509, 6512, 6516, 6528, 6571, 6593, 6599, 6656, 6678, 6688, 6740, 6823, 6823, 6917, 6963, 6981, 6987, 7043, 7072, 7086, 7087, 7098, 7141, 7168, 7203, 7245, 7247, 7258, 7293, 7401, 7404, 7406, 7409, 7413, 7414, 7424, 7615, 7680, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8305, 8305, 8319, 8319, 8336, 8348, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11502, 11506, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11648, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11823, 11823, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12348, 12353, 12438, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42527, 42538, 42539, 42560, 42606, 42623, 42647, 42656, 42735, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43000, 43009, 43011, 43013, 43015, 43018, 43020, 43042, 43072, 43123, 43138, 43187, 43250, 43255, 43259, 43259, 43274, 43301, 43312, 43334, 43360, 43388, 43396, 43442, 43471, 43471, 43520, 43560, 43584, 43586, 43588, 43595, 43616, 43638, 43642, 43642, 43648, 43695, 43697, 43697, 43701, 43702, 43705, 43709, 43712, 43712, 43714, 43714, 43739, 43741, 43744, 43754, 43762, 43764, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 44002, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
+    var unicodeES5IdentifierPart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 768, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1155, 1159, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1425, 1469, 1471, 1471, 1473, 1474, 1476, 1477, 1479, 1479, 1488, 1514, 1520, 1522, 1552, 1562, 1568, 1641, 1646, 1747, 1749, 1756, 1759, 1768, 1770, 1788, 1791, 1791, 1808, 1866, 1869, 1969, 1984, 2037, 2042, 2042, 2048, 2093, 2112, 2139, 2208, 2208, 2210, 2220, 2276, 2302, 2304, 2403, 2406, 2415, 2417, 2423, 2425, 2431, 2433, 2435, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2492, 2500, 2503, 2504, 2507, 2510, 2519, 2519, 2524, 2525, 2527, 2531, 2534, 2545, 2561, 2563, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2620, 2620, 2622, 2626, 2631, 2632, 2635, 2637, 2641, 2641, 2649, 2652, 2654, 2654, 2662, 2677, 2689, 2691, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2748, 2757, 2759, 2761, 2763, 2765, 2768, 2768, 2784, 2787, 2790, 2799, 2817, 2819, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2876, 2884, 2887, 2888, 2891, 2893, 2902, 2903, 2908, 2909, 2911, 2915, 2918, 2927, 2929, 2929, 2946, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3006, 3010, 3014, 3016, 3018, 3021, 3024, 3024, 3031, 3031, 3046, 3055, 3073, 3075, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3160, 3161, 3168, 3171, 3174, 3183, 3202, 3203, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3260, 3268, 3270, 3272, 3274, 3277, 3285, 3286, 3294, 3294, 3296, 3299, 3302, 3311, 3313, 3314, 3330, 3331, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3396, 3398, 3400, 3402, 3406, 3415, 3415, 3424, 3427, 3430, 3439, 3450, 3455, 3458, 3459, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3530, 3530, 3535, 3540, 3542, 3542, 3544, 3551, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3769, 3771, 3773, 3776, 3780, 3782, 3782, 3784, 3789, 3792, 3801, 3804, 3807, 3840, 3840, 3864, 3865, 3872, 3881, 3893, 3893, 3895, 3895, 3897, 3897, 3902, 3911, 3913, 3948, 3953, 3972, 3974, 3991, 3993, 4028, 4038, 4038, 4096, 4169, 4176, 4253, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4957, 4959, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 5888, 5900, 5902, 5908, 5920, 5940, 5952, 5971, 5984, 5996, 5998, 6000, 6002, 6003, 6016, 6099, 6103, 6103, 6108, 6109, 6112, 6121, 6155, 6157, 6160, 6169, 6176, 6263, 6272, 6314, 6320, 6389, 6400, 6428, 6432, 6443, 6448, 6459, 6470, 6509, 6512, 6516, 6528, 6571, 6576, 6601, 6608, 6617, 6656, 6683, 6688, 6750, 6752, 6780, 6783, 6793, 6800, 6809, 6823, 6823, 6912, 6987, 6992, 7001, 7019, 7027, 7040, 7155, 7168, 7223, 7232, 7241, 7245, 7293, 7376, 7378, 7380, 7414, 7424, 7654, 7676, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8204, 8205, 8255, 8256, 8276, 8276, 8305, 8305, 8319, 8319, 8336, 8348, 8400, 8412, 8417, 8417, 8421, 8432, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11647, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11744, 11775, 11823, 11823, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12348, 12353, 12438, 12441, 12442, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42539, 42560, 42607, 42612, 42621, 42623, 42647, 42655, 42737, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43000, 43047, 43072, 43123, 43136, 43204, 43216, 43225, 43232, 43255, 43259, 43259, 43264, 43309, 43312, 43347, 43360, 43388, 43392, 43456, 43471, 43481, 43520, 43574, 43584, 43597, 43600, 43609, 43616, 43638, 43642, 43643, 43648, 43714, 43739, 43741, 43744, 43759, 43762, 43766, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 44010, 44012, 44013, 44016, 44025, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65024, 65039, 65056, 65062, 65075, 65076, 65101, 65103, 65136, 65140, 65142, 65276, 65296, 65305, 65313, 65338, 65343, 65343, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
+    function lookupInUnicodeMap(code, map) {
+        // Bail out quickly if it couldn't possibly be in the map.
+        if (code < map[0]) {
+            return false;
+        }
+        // Perform binary search in one of the Unicode range maps
+        var lo = 0;
+        var hi = map.length;
+        var mid;
+        while (lo + 1 < hi) {
+            mid = lo + (hi - lo) / 2;
+            // mid has to be even to catch a range's beginning
+            mid -= mid % 2;
+            if (map[mid] <= code && code <= map[mid + 1]) {
+                return true;
+            }
+            if (code < map[mid]) {
+                hi = mid;
+            }
+            else {
+                lo = mid + 2;
+            }
+        }
+        return false;
+    }
+    /* @internal */ function isUnicodeIdentifierStart(code, languageVersion) {
+        return languageVersion >= 1 /* ES5 */ ?
+            lookupInUnicodeMap(code, unicodeES5IdentifierStart) :
+            lookupInUnicodeMap(code, unicodeES3IdentifierStart);
+    }
+    ts.isUnicodeIdentifierStart = isUnicodeIdentifierStart;
+    function isUnicodeIdentifierPart(code, languageVersion) {
+        return languageVersion >= 1 /* ES5 */ ?
+            lookupInUnicodeMap(code, unicodeES5IdentifierPart) :
+            lookupInUnicodeMap(code, unicodeES3IdentifierPart);
+    }
+    function makeReverseMap(source) {
+        var result = [];
+        source.forEach(function (value, name) {
+            result[value] = name;
+        });
+        return result;
+    }
+    var tokenStrings = makeReverseMap(textToToken);
+    function tokenToString(t) {
+        return tokenStrings[t];
+    }
+    ts.tokenToString = tokenToString;
+    /* @internal */
+    function stringToToken(s) {
+        return textToToken.get(s);
+    }
+    ts.stringToToken = stringToToken;
+    /* @internal */
+    function computeLineStarts(text) {
+        var result = new Array();
+        var pos = 0;
+        var lineStart = 0;
+        while (pos < text.length) {
+            var ch = text.charCodeAt(pos);
+            pos++;
+            switch (ch) {
+                case 13 /* carriageReturn */:
+                    if (text.charCodeAt(pos) === 10 /* lineFeed */) {
+                        pos++;
+                    }
+                // falls through
+                case 10 /* lineFeed */:
+                    result.push(lineStart);
+                    lineStart = pos;
+                    break;
+                default:
+                    if (ch > 127 /* maxAsciiCharacter */ && isLineBreak(ch)) {
+                        result.push(lineStart);
+                        lineStart = pos;
+                    }
+                    break;
+            }
+        }
+        result.push(lineStart);
+        return result;
+    }
+    ts.computeLineStarts = computeLineStarts;
+    function getPositionOfLineAndCharacter(sourceFile, line, character, allowEdits) {
+        return sourceFile.getPositionOfLineAndCharacter ?
+            sourceFile.getPositionOfLineAndCharacter(line, character, allowEdits) :
+            computePositionOfLineAndCharacter(getLineStarts(sourceFile), line, character, sourceFile.text, allowEdits);
+    }
+    ts.getPositionOfLineAndCharacter = getPositionOfLineAndCharacter;
+    /* @internal */
+    function computePositionOfLineAndCharacter(lineStarts, line, character, debugText, allowEdits) {
+        if (line < 0 || line >= lineStarts.length) {
+            if (allowEdits) {
+                // Clamp line to nearest allowable value
+                line = line < 0 ? 0 : line >= lineStarts.length ? lineStarts.length - 1 : line;
+            }
+            else {
+                ts.Debug.fail("Bad line number. Line: " + line + ", lineStarts.length: " + lineStarts.length + " , line map is correct? " + (debugText !== undefined ? ts.arraysEqual(lineStarts, computeLineStarts(debugText)) : "unknown"));
+            }
+        }
+        var res = lineStarts[line] + character;
+        if (allowEdits) {
+            // Clamp to nearest allowable values to allow the underlying to be edited without crashing (accuracy is lost, instead)
+            // TODO: Somehow track edits between file as it was during the creation of sourcemap we have and the current file and
+            // apply them to the computed position to improve accuracy
+            return res > lineStarts[line + 1] ? lineStarts[line + 1] : typeof debugText === "string" && res > debugText.length ? debugText.length : res;
+        }
+        if (line < lineStarts.length - 1) {
+            ts.Debug.assert(res < lineStarts[line + 1]);
+        }
+        else if (debugText !== undefined) {
+            ts.Debug.assert(res <= debugText.length); // Allow single character overflow for trailing newline
+        }
+        return res;
+    }
+    ts.computePositionOfLineAndCharacter = computePositionOfLineAndCharacter;
+    /* @internal */
+    function getLineStarts(sourceFile) {
+        return sourceFile.lineMap || (sourceFile.lineMap = computeLineStarts(sourceFile.text));
+    }
+    ts.getLineStarts = getLineStarts;
+    /* @internal */
+    /**
+     * We assume the first line starts at position 0 and 'position' is non-negative.
+     */
+    function computeLineAndCharacterOfPosition(lineStarts, position) {
+        var lineNumber = ts.binarySearch(lineStarts, position, ts.identity, ts.compareValues);
+        if (lineNumber < 0) {
+            // If the actual position was not found,
+            // the binary search returns the 2's-complement of the next line start
+            // e.g. if the line starts at [5, 10, 23, 80] and the position requested was 20
+            // then the search will return -2.
+            //
+            // We want the index of the previous line start, so we subtract 1.
+            // Review 2's-complement if this is confusing.
+            lineNumber = ~lineNumber - 1;
+            ts.Debug.assert(lineNumber !== -1, "position cannot precede the beginning of the file");
+        }
+        return {
+            line: lineNumber,
+            character: position - lineStarts[lineNumber]
+        };
+    }
+    ts.computeLineAndCharacterOfPosition = computeLineAndCharacterOfPosition;
+    function getLineAndCharacterOfPosition(sourceFile, position) {
+        return computeLineAndCharacterOfPosition(getLineStarts(sourceFile), position);
+    }
+    ts.getLineAndCharacterOfPosition = getLineAndCharacterOfPosition;
+    function isWhiteSpaceLike(ch) {
+        return isWhiteSpaceSingleLine(ch) || isLineBreak(ch);
+    }
+    ts.isWhiteSpaceLike = isWhiteSpaceLike;
+    /** Does not include line breaks. For that, see isWhiteSpaceLike. */
+    function isWhiteSpaceSingleLine(ch) {
+        // Note: nextLine is in the Zs space, and should be considered to be a whitespace.
+        // It is explicitly not a line-break as it isn't in the exact set specified by EcmaScript.
+        return ch === 32 /* space */ ||
+            ch === 9 /* tab */ ||
+            ch === 11 /* verticalTab */ ||
+            ch === 12 /* formFeed */ ||
+            ch === 160 /* nonBreakingSpace */ ||
+            ch === 133 /* nextLine */ ||
+            ch === 5760 /* ogham */ ||
+            ch >= 8192 /* enQuad */ && ch <= 8203 /* zeroWidthSpace */ ||
+            ch === 8239 /* narrowNoBreakSpace */ ||
+            ch === 8287 /* mathematicalSpace */ ||
+            ch === 12288 /* ideographicSpace */ ||
+            ch === 65279 /* byteOrderMark */;
+    }
+    ts.isWhiteSpaceSingleLine = isWhiteSpaceSingleLine;
+    function isLineBreak(ch) {
+        // ES5 7.3:
+        // The ECMAScript line terminator characters are listed in Table 3.
+        //     Table 3: Line Terminator Characters
+        //     Code Unit Value     Name                    Formal Name
+        //     \u000A              Line Feed               <LF>
+        //     \u000D              Carriage Return         <CR>
+        //     \u2028              Line separator          <LS>
+        //     \u2029              Paragraph separator     <PS>
+        // Only the characters in Table 3 are treated as line terminators. Other new line or line
+        // breaking characters are treated as white space but not as line terminators.
+        return ch === 10 /* lineFeed */ ||
+            ch === 13 /* carriageReturn */ ||
+            ch === 8232 /* lineSeparator */ ||
+            ch === 8233 /* paragraphSeparator */;
+    }
+    ts.isLineBreak = isLineBreak;
+    function isDigit(ch) {
+        return ch >= 48 /* _0 */ && ch <= 57 /* _9 */;
+    }
+    /* @internal */
+    function isOctalDigit(ch) {
+        return ch >= 48 /* _0 */ && ch <= 55 /* _7 */;
+    }
+    ts.isOctalDigit = isOctalDigit;
+    function couldStartTrivia(text, pos) {
+        // Keep in sync with skipTrivia
+        var ch = text.charCodeAt(pos);
+        switch (ch) {
+            case 13 /* carriageReturn */:
+            case 10 /* lineFeed */:
+            case 9 /* tab */:
+            case 11 /* verticalTab */:
+            case 12 /* formFeed */:
+            case 32 /* space */:
+            case 47 /* slash */:
+            // starts of normal trivia
+            case 60 /* lessThan */:
+            case 124 /* bar */:
+            case 61 /* equals */:
+            case 62 /* greaterThan */:
+                // Starts of conflict marker trivia
+                return true;
+            case 35 /* hash */:
+                // Only if its the beginning can we have #! trivia
+                return pos === 0;
+            default:
+                return ch > 127 /* maxAsciiCharacter */;
+        }
+    }
+    ts.couldStartTrivia = couldStartTrivia;
+    /* @internal */
+    function skipTrivia(text, pos, stopAfterLineBreak, stopAtComments) {
+        if (stopAtComments === void 0) { stopAtComments = false; }
+        if (ts.positionIsSynthesized(pos)) {
+            return pos;
+        }
+        // Keep in sync with couldStartTrivia
+        while (true) {
+            var ch = text.charCodeAt(pos);
+            switch (ch) {
+                case 13 /* carriageReturn */:
+                    if (text.charCodeAt(pos + 1) === 10 /* lineFeed */) {
+                        pos++;
+                    }
+                // falls through
+                case 10 /* lineFeed */:
+                    pos++;
+                    if (stopAfterLineBreak) {
+                        return pos;
+                    }
+                    continue;
+                case 9 /* tab */:
+                case 11 /* verticalTab */:
+                case 12 /* formFeed */:
+                case 32 /* space */:
+                    pos++;
+                    continue;
+                case 47 /* slash */:
+                    if (stopAtComments) {
+                        break;
+                    }
+                    if (text.charCodeAt(pos + 1) === 47 /* slash */) {
+                        pos += 2;
+                        while (pos < text.length) {
+                            if (isLineBreak(text.charCodeAt(pos))) {
+                                break;
+                            }
+                            pos++;
+                        }
+                        continue;
+                    }
+                    if (text.charCodeAt(pos + 1) === 42 /* asterisk */) {
+                        pos += 2;
+                        while (pos < text.length) {
+                            if (text.charCodeAt(pos) === 42 /* asterisk */ && text.charCodeAt(pos + 1) === 47 /* slash */) {
+                                pos += 2;
+                                break;
+                            }
+                            pos++;
+                        }
+                        continue;
+                    }
+                    break;
+                case 60 /* lessThan */:
+                case 124 /* bar */:
+                case 61 /* equals */:
+                case 62 /* greaterThan */:
+                    if (isConflictMarkerTrivia(text, pos)) {
+                        pos = scanConflictMarkerTrivia(text, pos);
+                        continue;
+                    }
+                    break;
+                case 35 /* hash */:
+                    if (pos === 0 && isShebangTrivia(text, pos)) {
+                        pos = scanShebangTrivia(text, pos);
+                        continue;
+                    }
+                    break;
+                default:
+                    if (ch > 127 /* maxAsciiCharacter */ && (isWhiteSpaceLike(ch))) {
+                        pos++;
+                        continue;
+                    }
+                    break;
+            }
+            return pos;
+        }
+    }
+    ts.skipTrivia = skipTrivia;
+    // All conflict markers consist of the same character repeated seven times.  If it is
+    // a <<<<<<< or >>>>>>> marker then it is also followed by a space.
+    var mergeConflictMarkerLength = "<<<<<<<".length;
+    function isConflictMarkerTrivia(text, pos) {
+        ts.Debug.assert(pos >= 0);
+        // Conflict markers must be at the start of a line.
+        if (pos === 0 || isLineBreak(text.charCodeAt(pos - 1))) {
+            var ch = text.charCodeAt(pos);
+            if ((pos + mergeConflictMarkerLength) < text.length) {
+                for (var i = 0; i < mergeConflictMarkerLength; i++) {
+                    if (text.charCodeAt(pos + i) !== ch) {
+                        return false;
+                    }
+                }
+                return ch === 61 /* equals */ ||
+                    text.charCodeAt(pos + mergeConflictMarkerLength) === 32 /* space */;
+            }
+        }
+        return false;
+    }
+    function scanConflictMarkerTrivia(text, pos, error) {
+        if (error) {
+            error(ts.Diagnostics.Merge_conflict_marker_encountered, pos, mergeConflictMarkerLength);
+        }
+        var ch = text.charCodeAt(pos);
+        var len = text.length;
+        if (ch === 60 /* lessThan */ || ch === 62 /* greaterThan */) {
+            while (pos < len && !isLineBreak(text.charCodeAt(pos))) {
+                pos++;
+            }
+        }
+        else {
+            ts.Debug.assert(ch === 124 /* bar */ || ch === 61 /* equals */);
+            // Consume everything from the start of a ||||||| or ======= marker to the start
+            // of the next ======= or >>>>>>> marker.
+            while (pos < len) {
+                var currentChar = text.charCodeAt(pos);
+                if ((currentChar === 61 /* equals */ || currentChar === 62 /* greaterThan */) && currentChar !== ch && isConflictMarkerTrivia(text, pos)) {
+                    break;
+                }
+                pos++;
+            }
+        }
+        return pos;
+    }
+    var shebangTriviaRegex = /^#!.*/;
+    function isShebangTrivia(text, pos) {
+        // Shebangs check must only be done at the start of the file
+        ts.Debug.assert(pos === 0);
+        return shebangTriviaRegex.test(text);
+    }
+    function scanShebangTrivia(text, pos) {
+        var shebang = shebangTriviaRegex.exec(text)[0];
+        pos = pos + shebang.length;
+        return pos;
+    }
+    /**
+     * Invokes a callback for each comment range following the provided position.
+     *
+     * Single-line comment ranges include the leading double-slash characters but not the ending
+     * line break. Multi-line comment ranges include the leading slash-asterisk and trailing
+     * asterisk-slash characters.
+     *
+     * @param reduce If true, accumulates the result of calling the callback in a fashion similar
+     *      to reduceLeft. If false, iteration stops when the callback returns a truthy value.
+     * @param text The source text to scan.
+     * @param pos The position at which to start scanning.
+     * @param trailing If false, whitespace is skipped until the first line break and comments
+     *      between that location and the next token are returned. If true, comments occurring
+     *      between the given position and the next line break are returned.
+     * @param cb The callback to execute as each comment range is encountered.
+     * @param state A state value to pass to each iteration of the callback.
+     * @param initial An initial value to pass when accumulating results (when "reduce" is true).
+     * @returns If "reduce" is true, the accumulated value. If "reduce" is false, the first truthy
+     *      return value of the callback.
+     */
+    function iterateCommentRanges(reduce, text, pos, trailing, cb, state, initial) {
+        var pendingPos;
+        var pendingEnd;
+        var pendingKind;
+        var pendingHasTrailingNewLine;
+        var hasPendingCommentRange = false;
+        var collecting = trailing || pos === 0;
+        var accumulator = initial;
+        scan: while (pos >= 0 && pos < text.length) {
+            var ch = text.charCodeAt(pos);
+            switch (ch) {
+                case 13 /* carriageReturn */:
+                    if (text.charCodeAt(pos + 1) === 10 /* lineFeed */) {
+                        pos++;
+                    }
+                // falls through
+                case 10 /* lineFeed */:
+                    pos++;
+                    if (trailing) {
+                        break scan;
+                    }
+                    collecting = true;
+                    if (hasPendingCommentRange) {
+                        pendingHasTrailingNewLine = true;
+                    }
+                    continue;
+                case 9 /* tab */:
+                case 11 /* verticalTab */:
+                case 12 /* formFeed */:
+                case 32 /* space */:
+                    pos++;
+                    continue;
+                case 47 /* slash */:
+                    var nextChar = text.charCodeAt(pos + 1);
+                    var hasTrailingNewLine = false;
+                    if (nextChar === 47 /* slash */ || nextChar === 42 /* asterisk */) {
+                        var kind = nextChar === 47 /* slash */ ? 2 /* SingleLineCommentTrivia */ : 3 /* MultiLineCommentTrivia */;
+                        var startPos = pos;
+                        pos += 2;
+                        if (nextChar === 47 /* slash */) {
+                            while (pos < text.length) {
+                                if (isLineBreak(text.charCodeAt(pos))) {
+                                    hasTrailingNewLine = true;
+                                    break;
+                                }
+                                pos++;
+                            }
+                        }
+                        else {
+                            while (pos < text.length) {
+                                if (text.charCodeAt(pos) === 42 /* asterisk */ && text.charCodeAt(pos + 1) === 47 /* slash */) {
+                                    pos += 2;
+                                    break;
+                                }
+                                pos++;
+                            }
+                        }
+                        if (collecting) {
+                            if (hasPendingCommentRange) {
+                                accumulator = cb(pendingPos, pendingEnd, pendingKind, pendingHasTrailingNewLine, state, accumulator);
+                                if (!reduce && accumulator) {
+                                    // If we are not reducing and we have a truthy result, return it.
+                                    return accumulator;
+                                }
+                            }
+                            pendingPos = startPos;
+                            pendingEnd = pos;
+                            pendingKind = kind;
+                            pendingHasTrailingNewLine = hasTrailingNewLine;
+                            hasPendingCommentRange = true;
+                        }
+                        continue;
+                    }
+                    break scan;
+                default:
+                    if (ch > 127 /* maxAsciiCharacter */ && (isWhiteSpaceLike(ch))) {
+                        if (hasPendingCommentRange && isLineBreak(ch)) {
+                            pendingHasTrailingNewLine = true;
+                        }
+                        pos++;
+                        continue;
+                    }
+                    break scan;
+            }
+        }
+        if (hasPendingCommentRange) {
+            accumulator = cb(pendingPos, pendingEnd, pendingKind, pendingHasTrailingNewLine, state, accumulator);
+        }
+        return accumulator;
+    }
+    function forEachLeadingCommentRange(text, pos, cb, state) {
+        return iterateCommentRanges(/*reduce*/ false, text, pos, /*trailing*/ false, cb, state);
+    }
+    ts.forEachLeadingCommentRange = forEachLeadingCommentRange;
+    function forEachTrailingCommentRange(text, pos, cb, state) {
+        return iterateCommentRanges(/*reduce*/ false, text, pos, /*trailing*/ true, cb, state);
+    }
+    ts.forEachTrailingCommentRange = forEachTrailingCommentRange;
+    function reduceEachLeadingCommentRange(text, pos, cb, state, initial) {
+        return iterateCommentRanges(/*reduce*/ true, text, pos, /*trailing*/ false, cb, state, initial);
+    }
+    ts.reduceEachLeadingCommentRange = reduceEachLeadingCommentRange;
+    function reduceEachTrailingCommentRange(text, pos, cb, state, initial) {
+        return iterateCommentRanges(/*reduce*/ true, text, pos, /*trailing*/ true, cb, state, initial);
+    }
+    ts.reduceEachTrailingCommentRange = reduceEachTrailingCommentRange;
+    function appendCommentRange(pos, end, kind, hasTrailingNewLine, _state, comments) {
+        if (!comments) {
+            comments = [];
+        }
+        comments.push({ kind: kind, pos: pos, end: end, hasTrailingNewLine: hasTrailingNewLine });
+        return comments;
+    }
+    function getLeadingCommentRanges(text, pos) {
+        return reduceEachLeadingCommentRange(text, pos, appendCommentRange, /*state*/ undefined, /*initial*/ undefined);
+    }
+    ts.getLeadingCommentRanges = getLeadingCommentRanges;
+    function getTrailingCommentRanges(text, pos) {
+        return reduceEachTrailingCommentRange(text, pos, appendCommentRange, /*state*/ undefined, /*initial*/ undefined);
+    }
+    ts.getTrailingCommentRanges = getTrailingCommentRanges;
+    /** Optionally, get the shebang */
+    function getShebang(text) {
+        var match = shebangTriviaRegex.exec(text);
+        if (match) {
+            return match[0];
+        }
+    }
+    ts.getShebang = getShebang;
+    function isIdentifierStart(ch, languageVersion) {
+        return ch >= 65 /* A */ && ch <= 90 /* Z */ || ch >= 97 /* a */ && ch <= 122 /* z */ ||
+            ch === 36 /* $ */ || ch === 95 /* _ */ ||
+            ch > 127 /* maxAsciiCharacter */ && isUnicodeIdentifierStart(ch, languageVersion);
+    }
+    ts.isIdentifierStart = isIdentifierStart;
+    function isIdentifierPart(ch, languageVersion) {
+        return ch >= 65 /* A */ && ch <= 90 /* Z */ || ch >= 97 /* a */ && ch <= 122 /* z */ ||
+            ch >= 48 /* _0 */ && ch <= 57 /* _9 */ || ch === 36 /* $ */ || ch === 95 /* _ */ ||
+            ch > 127 /* maxAsciiCharacter */ && isUnicodeIdentifierPart(ch, languageVersion);
+    }
+    ts.isIdentifierPart = isIdentifierPart;
+    /* @internal */
+    function isIdentifierText(name, languageVersion) {
+        if (!isIdentifierStart(name.charCodeAt(0), languageVersion)) {
+            return false;
+        }
+        for (var i = 1; i < name.length; i++) {
+            if (!isIdentifierPart(name.charCodeAt(i), languageVersion)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    ts.isIdentifierText = isIdentifierText;
+    // Creates a scanner over a (possibly unspecified) range of a piece of text.
+    function createScanner(languageVersion, skipTrivia, languageVariant, textInitial, onError, start, length) {
+        if (languageVariant === void 0) { languageVariant = 0 /* Standard */; }
+        var text = textInitial;
+        // Current position (end position of text of current token)
+        var pos;
+        // end of text
+        var end;
+        // Start position of whitespace before current token
+        var startPos;
+        // Start position of text of current token
+        var tokenPos;
+        var token;
+        var tokenValue;
+        var tokenFlags;
+        var inJSDocType = 0;
+        setText(text, start, length);
+        return {
+            getStartPos: function () { return startPos; },
+            getTextPos: function () { return pos; },
+            getToken: function () { return token; },
+            getTokenPos: function () { return tokenPos; },
+            getTokenText: function () { return text.substring(tokenPos, pos); },
+            getTokenValue: function () { return tokenValue; },
+            hasExtendedUnicodeEscape: function () { return (tokenFlags & 8 /* ExtendedUnicodeEscape */) !== 0; },
+            hasPrecedingLineBreak: function () { return (tokenFlags & 1 /* PrecedingLineBreak */) !== 0; },
+            isIdentifier: function () { return token === 72 /* Identifier */ || token > 108 /* LastReservedWord */; },
+            isReservedWord: function () { return token >= 73 /* FirstReservedWord */ && token <= 108 /* LastReservedWord */; },
+            isUnterminated: function () { return (tokenFlags & 4 /* Unterminated */) !== 0; },
+            getTokenFlags: function () { return tokenFlags; },
+            reScanGreaterToken: reScanGreaterToken,
+            reScanSlashToken: reScanSlashToken,
+            reScanTemplateToken: reScanTemplateToken,
+            scanJsxIdentifier: scanJsxIdentifier,
+            scanJsxAttributeValue: scanJsxAttributeValue,
+            reScanJsxToken: reScanJsxToken,
+            reScanLessThanToken: reScanLessThanToken,
+            scanJsxToken: scanJsxToken,
+            scanJSDocToken: scanJSDocToken,
+            scan: scan,
+            getText: getText,
+            setText: setText,
+            setScriptTarget: setScriptTarget,
+            setLanguageVariant: setLanguageVariant,
+            setOnError: setOnError,
+            setTextPos: setTextPos,
+            setInJSDocType: setInJSDocType,
+            tryScan: tryScan,
+            lookAhead: lookAhead,
+            scanRange: scanRange,
+        };
+        function error(message, errPos, length) {
+            if (errPos === void 0) { errPos = pos; }
+            if (onError) {
+                var oldPos = pos;
+                pos = errPos;
+                onError(message, length || 0);
+                pos = oldPos;
+            }
+        }
+        function scanNumberFragment() {
+            var start = pos;
+            var allowSeparator = false;
+            var isPreviousTokenSeparator = false;
+            var result = "";
+            while (true) {
+                var ch = text.charCodeAt(pos);
+                if (ch === 95 /* _ */) {
+                    tokenFlags |= 512 /* ContainsSeparator */;
+                    if (allowSeparator) {
+                        allowSeparator = false;
+                        isPreviousTokenSeparator = true;
+                        result += text.substring(start, pos);
+                    }
+                    else if (isPreviousTokenSeparator) {
+                        error(ts.Diagnostics.Multiple_consecutive_numeric_separators_are_not_permitted, pos, 1);
+                    }
+                    else {
+                        error(ts.Diagnostics.Numeric_separators_are_not_allowed_here, pos, 1);
+                    }
+                    pos++;
+                    start = pos;
+                    continue;
+                }
+                if (isDigit(ch)) {
+                    allowSeparator = true;
+                    isPreviousTokenSeparator = false;
+                    pos++;
+                    continue;
+                }
+                break;
+            }
+            if (text.charCodeAt(pos - 1) === 95 /* _ */) {
+                error(ts.Diagnostics.Numeric_separators_are_not_allowed_here, pos - 1, 1);
+            }
+            return result + text.substring(start, pos);
+        }
+        function scanNumber() {
+            var start = pos;
+            var mainFragment = scanNumberFragment();
+            var decimalFragment;
+            var scientificFragment;
+            if (text.charCodeAt(pos) === 46 /* dot */) {
+                pos++;
+                decimalFragment = scanNumberFragment();
+            }
+            var end = pos;
+            if (text.charCodeAt(pos) === 69 /* E */ || text.charCodeAt(pos) === 101 /* e */) {
+                pos++;
+                tokenFlags |= 16 /* Scientific */;
+                if (text.charCodeAt(pos) === 43 /* plus */ || text.charCodeAt(pos) === 45 /* minus */)
+                    pos++;
+                var preNumericPart = pos;
+                var finalFragment = scanNumberFragment();
+                if (!finalFragment) {
+                    error(ts.Diagnostics.Digit_expected);
+                }
+                else {
+                    scientificFragment = text.substring(end, preNumericPart) + finalFragment;
+                    end = pos;
+                }
+            }
+            var result;
+            if (tokenFlags & 512 /* ContainsSeparator */) {
+                result = mainFragment;
+                if (decimalFragment) {
+                    result += "." + decimalFragment;
+                }
+                if (scientificFragment) {
+                    result += scientificFragment;
+                }
+            }
+            else {
+                result = text.substring(start, end); // No need to use all the fragments; no _ removal needed
+            }
+            if (decimalFragment !== undefined || tokenFlags & 16 /* Scientific */) {
+                checkForIdentifierStartAfterNumericLiteral(start, decimalFragment === undefined && !!(tokenFlags & 16 /* Scientific */));
+                return {
+                    type: 8 /* NumericLiteral */,
+                    value: "" + +result // if value is not an integer, it can be safely coerced to a number
+                };
+            }
+            else {
+                tokenValue = result;
+                var type = checkBigIntSuffix(); // if value is an integer, check whether it is a bigint
+                checkForIdentifierStartAfterNumericLiteral(start);
+                return { type: type, value: tokenValue };
+            }
+        }
+        function checkForIdentifierStartAfterNumericLiteral(numericStart, isScientific) {
+            if (!isIdentifierStart(text.charCodeAt(pos), languageVersion)) {
+                return;
+            }
+            var identifierStart = pos;
+            var length = scanIdentifierParts().length;
+            if (length === 1 && text[identifierStart] === "n") {
+                if (isScientific) {
+                    error(ts.Diagnostics.A_bigint_literal_cannot_use_exponential_notation, numericStart, identifierStart - numericStart + 1);
+                }
+                else {
+                    error(ts.Diagnostics.A_bigint_literal_must_be_an_integer, numericStart, identifierStart - numericStart + 1);
+                }
+            }
+            else {
+                error(ts.Diagnostics.An_identifier_or_keyword_cannot_immediately_follow_a_numeric_literal, identifierStart, length);
+                pos = identifierStart;
+            }
+        }
+        function scanOctalDigits() {
+            var start = pos;
+            while (isOctalDigit(text.charCodeAt(pos))) {
+                pos++;
+            }
+            return +(text.substring(start, pos));
+        }
+        /**
+         * Scans the given number of hexadecimal digits in the text,
+         * returning -1 if the given number is unavailable.
+         */
+        function scanExactNumberOfHexDigits(count, canHaveSeparators) {
+            var valueString = scanHexDigits(/*minCount*/ count, /*scanAsManyAsPossible*/ false, canHaveSeparators);
+            return valueString ? parseInt(valueString, 16) : -1;
+        }
+        /**
+         * Scans as many hexadecimal digits as are available in the text,
+         * returning "" if the given number of digits was unavailable.
+         */
+        function scanMinimumNumberOfHexDigits(count, canHaveSeparators) {
+            return scanHexDigits(/*minCount*/ count, /*scanAsManyAsPossible*/ true, canHaveSeparators);
+        }
+        function scanHexDigits(minCount, scanAsManyAsPossible, canHaveSeparators) {
+            var valueChars = [];
+            var allowSeparator = false;
+            var isPreviousTokenSeparator = false;
+            while (valueChars.length < minCount || scanAsManyAsPossible) {
+                var ch = text.charCodeAt(pos);
+                if (canHaveSeparators && ch === 95 /* _ */) {
+                    tokenFlags |= 512 /* ContainsSeparator */;
+                    if (allowSeparator) {
+                        allowSeparator = false;
+                        isPreviousTokenSeparator = true;
+                    }
+                    else if (isPreviousTokenSeparator) {
+                        error(ts.Diagnostics.Multiple_consecutive_numeric_separators_are_not_permitted, pos, 1);
+                    }
+                    else {
+                        error(ts.Diagnostics.Numeric_separators_are_not_allowed_here, pos, 1);
+                    }
+                    pos++;
+                    continue;
+                }
+                allowSeparator = canHaveSeparators;
+                if (ch >= 65 /* A */ && ch <= 70 /* F */) {
+                    ch += 97 /* a */ - 65 /* A */; // standardize hex literals to lowercase
+                }
+                else if (!((ch >= 48 /* _0 */ && ch <= 57 /* _9 */) ||
+                    (ch >= 97 /* a */ && ch <= 102 /* f */))) {
+                    break;
+                }
+                valueChars.push(ch);
+                pos++;
+                isPreviousTokenSeparator = false;
+            }
+            if (valueChars.length < minCount) {
+                valueChars = [];
+            }
+            if (text.charCodeAt(pos - 1) === 95 /* _ */) {
+                error(ts.Diagnostics.Numeric_separators_are_not_allowed_here, pos - 1, 1);
+            }
+            return String.fromCharCode.apply(String, valueChars);
+        }
+        function scanString(jsxAttributeString) {
+            if (jsxAttributeString === void 0) { jsxAttributeString = false; }
+            var quote = text.charCodeAt(pos);
+            pos++;
+            var result = "";
+            var start = pos;
+            while (true) {
+                if (pos >= end) {
+                    result += text.substring(start, pos);
+                    tokenFlags |= 4 /* Unterminated */;
+                    error(ts.Diagnostics.Unterminated_string_literal);
+                    break;
+                }
+                var ch = text.charCodeAt(pos);
+                if (ch === quote) {
+                    result += text.substring(start, pos);
+                    pos++;
+                    break;
+                }
+                if (ch === 92 /* backslash */ && !jsxAttributeString) {
+                    result += text.substring(start, pos);
+                    result += scanEscapeSequence();
+                    start = pos;
+                    continue;
+                }
+                if (isLineBreak(ch) && !jsxAttributeString) {
+                    result += text.substring(start, pos);
+                    tokenFlags |= 4 /* Unterminated */;
+                    error(ts.Diagnostics.Unterminated_string_literal);
+                    break;
+                }
+                pos++;
+            }
+            return result;
+        }
+        /**
+         * Sets the current 'tokenValue' and returns a NoSubstitutionTemplateLiteral or
+         * a literal component of a TemplateExpression.
+         */
+        function scanTemplateAndSetTokenValue() {
+            var startedWithBacktick = text.charCodeAt(pos) === 96 /* backtick */;
+            pos++;
+            var start = pos;
+            var contents = "";
+            var resultingToken;
+            while (true) {
+                if (pos >= end) {
+                    contents += text.substring(start, pos);
+                    tokenFlags |= 4 /* Unterminated */;
+                    error(ts.Diagnostics.Unterminated_template_literal);
+                    resultingToken = startedWithBacktick ? 14 /* NoSubstitutionTemplateLiteral */ : 17 /* TemplateTail */;
+                    break;
+                }
+                var currChar = text.charCodeAt(pos);
+                // '`'
+                if (currChar === 96 /* backtick */) {
+                    contents += text.substring(start, pos);
+                    pos++;
+                    resultingToken = startedWithBacktick ? 14 /* NoSubstitutionTemplateLiteral */ : 17 /* TemplateTail */;
+                    break;
+                }
+                // '${'
+                if (currChar === 36 /* $ */ && pos + 1 < end && text.charCodeAt(pos + 1) === 123 /* openBrace */) {
+                    contents += text.substring(start, pos);
+                    pos += 2;
+                    resultingToken = startedWithBacktick ? 15 /* TemplateHead */ : 16 /* TemplateMiddle */;
+                    break;
+                }
+                // Escape character
+                if (currChar === 92 /* backslash */) {
+                    contents += text.substring(start, pos);
+                    contents += scanEscapeSequence();
+                    start = pos;
+                    continue;
+                }
+                // Speculated ECMAScript 6 Spec 11.8.6.1:
+                // <CR><LF> and <CR> LineTerminatorSequences are normalized to <LF> for Template Values
+                if (currChar === 13 /* carriageReturn */) {
+                    contents += text.substring(start, pos);
+                    pos++;
+                    if (pos < end && text.charCodeAt(pos) === 10 /* lineFeed */) {
+                        pos++;
+                    }
+                    contents += "\n";
+                    start = pos;
+                    continue;
+                }
+                pos++;
+            }
+            ts.Debug.assert(resultingToken !== undefined);
+            tokenValue = contents;
+            return resultingToken;
+        }
+        function scanEscapeSequence() {
+            pos++;
+            if (pos >= end) {
+                error(ts.Diagnostics.Unexpected_end_of_text);
+                return "";
+            }
+            var ch = text.charCodeAt(pos);
+            pos++;
+            switch (ch) {
+                case 48 /* _0 */:
+                    return "\0";
+                case 98 /* b */:
+                    return "\b";
+                case 116 /* t */:
+                    return "\t";
+                case 110 /* n */:
+                    return "\n";
+                case 118 /* v */:
+                    return "\v";
+                case 102 /* f */:
+                    return "\f";
+                case 114 /* r */:
+                    return "\r";
+                case 39 /* singleQuote */:
+                    return "\'";
+                case 34 /* doubleQuote */:
+                    return "\"";
+                case 117 /* u */:
+                    // '\u{DDDDDDDD}'
+                    if (pos < end && text.charCodeAt(pos) === 123 /* openBrace */) {
+                        tokenFlags |= 8 /* ExtendedUnicodeEscape */;
+                        pos++;
+                        return scanExtendedUnicodeEscape();
+                    }
+                    // '\uDDDD'
+                    return scanHexadecimalEscape(/*numDigits*/ 4);
+                case 120 /* x */:
+                    // '\xDD'
+                    return scanHexadecimalEscape(/*numDigits*/ 2);
+                // when encountering a LineContinuation (i.e. a backslash and a line terminator sequence),
+                // the line terminator is interpreted to be "the empty code unit sequence".
+                case 13 /* carriageReturn */:
+                    if (pos < end && text.charCodeAt(pos) === 10 /* lineFeed */) {
+                        pos++;
+                    }
+                // falls through
+                case 10 /* lineFeed */:
+                case 8232 /* lineSeparator */:
+                case 8233 /* paragraphSeparator */:
+                    return "";
+                default:
+                    return String.fromCharCode(ch);
+            }
+        }
+        function scanHexadecimalEscape(numDigits) {
+            var escapedValue = scanExactNumberOfHexDigits(numDigits, /*canHaveSeparators*/ false);
+            if (escapedValue >= 0) {
+                return String.fromCharCode(escapedValue);
+            }
+            else {
+                error(ts.Diagnostics.Hexadecimal_digit_expected);
+                return "";
+            }
+        }
+        function scanExtendedUnicodeEscape() {
+            var escapedValueString = scanMinimumNumberOfHexDigits(1, /*canHaveSeparators*/ false);
+            var escapedValue = escapedValueString ? parseInt(escapedValueString, 16) : -1;
+            var isInvalidExtendedEscape = false;
+            // Validate the value of the digit
+            if (escapedValue < 0) {
+                error(ts.Diagnostics.Hexadecimal_digit_expected);
+                isInvalidExtendedEscape = true;
+            }
+            else if (escapedValue > 0x10FFFF) {
+                error(ts.Diagnostics.An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive);
+                isInvalidExtendedEscape = true;
+            }
+            if (pos >= end) {
+                error(ts.Diagnostics.Unexpected_end_of_text);
+                isInvalidExtendedEscape = true;
+            }
+            else if (text.charCodeAt(pos) === 125 /* closeBrace */) {
+                // Only swallow the following character up if it's a '}'.
+                pos++;
+            }
+            else {
+                error(ts.Diagnostics.Unterminated_Unicode_escape_sequence);
+                isInvalidExtendedEscape = true;
+            }
+            if (isInvalidExtendedEscape) {
+                return "";
+            }
+            return utf16EncodeAsString(escapedValue);
+        }
+        // Derived from the 10.1.1 UTF16Encoding of the ES6 Spec.
+        function utf16EncodeAsString(codePoint) {
+            ts.Debug.assert(0x0 <= codePoint && codePoint <= 0x10FFFF);
+            if (codePoint <= 65535) {
+                return String.fromCharCode(codePoint);
+            }
+            var codeUnit1 = Math.floor((codePoint - 65536) / 1024) + 0xD800;
+            var codeUnit2 = ((codePoint - 65536) % 1024) + 0xDC00;
+            return String.fromCharCode(codeUnit1, codeUnit2);
+        }
+        // Current character is known to be a backslash. Check for Unicode escape of the form '\uXXXX'
+        // and return code point value if valid Unicode escape is found. Otherwise return -1.
+        function peekUnicodeEscape() {
+            if (pos + 5 < end && text.charCodeAt(pos + 1) === 117 /* u */) {
+                var start_1 = pos;
+                pos += 2;
+                var value = scanExactNumberOfHexDigits(4, /*canHaveSeparators*/ false);
+                pos = start_1;
+                return value;
+            }
+            return -1;
+        }
+        function scanIdentifierParts() {
+            var result = "";
+            var start = pos;
+            while (pos < end) {
+                var ch = text.charCodeAt(pos);
+                if (isIdentifierPart(ch, languageVersion)) {
+                    pos++;
+                }
+                else if (ch === 92 /* backslash */) {
+                    ch = peekUnicodeEscape();
+                    if (!(ch >= 0 && isIdentifierPart(ch, languageVersion))) {
+                        break;
+                    }
+                    result += text.substring(start, pos);
+                    result += String.fromCharCode(ch);
+                    // Valid Unicode escape is always six characters
+                    pos += 6;
+                    start = pos;
+                }
+                else {
+                    break;
+                }
+            }
+            result += text.substring(start, pos);
+            return result;
+        }
+        function getIdentifierToken() {
+            // Reserved words are between 2 and 11 characters long and start with a lowercase letter
+            var len = tokenValue.length;
+            if (len >= 2 && len <= 11) {
+                var ch = tokenValue.charCodeAt(0);
+                if (ch >= 97 /* a */ && ch <= 122 /* z */) {
+                    var keyword = textToKeyword.get(tokenValue);
+                    if (keyword !== undefined) {
+                        return token = keyword;
+                    }
+                }
+            }
+            return token = 72 /* Identifier */;
+        }
+        function scanBinaryOrOctalDigits(base) {
+            var value = "";
+            // For counting number of digits; Valid binaryIntegerLiteral must have at least one binary digit following B or b.
+            // Similarly valid octalIntegerLiteral must have at least one octal digit following o or O.
+            var separatorAllowed = false;
+            var isPreviousTokenSeparator = false;
+            while (true) {
+                var ch = text.charCodeAt(pos);
+                // Numeric separators are allowed anywhere within a numeric literal, except not at the beginning, or following another separator
+                if (ch === 95 /* _ */) {
+                    tokenFlags |= 512 /* ContainsSeparator */;
+                    if (separatorAllowed) {
+                        separatorAllowed = false;
+                        isPreviousTokenSeparator = true;
+                    }
+                    else if (isPreviousTokenSeparator) {
+                        error(ts.Diagnostics.Multiple_consecutive_numeric_separators_are_not_permitted, pos, 1);
+                    }
+                    else {
+                        error(ts.Diagnostics.Numeric_separators_are_not_allowed_here, pos, 1);
+                    }
+                    pos++;
+                    continue;
+                }
+                separatorAllowed = true;
+                if (!isDigit(ch) || ch - 48 /* _0 */ >= base) {
+                    break;
+                }
+                value += text[pos];
+                pos++;
+                isPreviousTokenSeparator = false;
+            }
+            if (text.charCodeAt(pos - 1) === 95 /* _ */) {
+                // Literal ends with underscore - not allowed
+                error(ts.Diagnostics.Numeric_separators_are_not_allowed_here, pos - 1, 1);
+            }
+            return value;
+        }
+        function checkBigIntSuffix() {
+            if (text.charCodeAt(pos) === 110 /* n */) {
+                tokenValue += "n";
+                // Use base 10 instead of base 2 or base 8 for shorter literals
+                if (tokenFlags & 384 /* BinaryOrOctalSpecifier */) {
+                    tokenValue = ts.parsePseudoBigInt(tokenValue) + "n";
+                }
+                pos++;
+                return 9 /* BigIntLiteral */;
+            }
+            else { // not a bigint, so can convert to number in simplified form
+                // Number() may not support 0b or 0o, so use parseInt() instead
+                var numericValue = tokenFlags & 128 /* BinarySpecifier */
+                    ? parseInt(tokenValue.slice(2), 2) // skip "0b"
+                    : tokenFlags & 256 /* OctalSpecifier */
+                        ? parseInt(tokenValue.slice(2), 8) // skip "0o"
+                        : +tokenValue;
+                tokenValue = "" + numericValue;
+                return 8 /* NumericLiteral */;
+            }
+        }
+        function scan() {
+            var _a;
+            startPos = pos;
+            tokenFlags = 0;
+            var asteriskSeen = false;
+            while (true) {
+                tokenPos = pos;
+                if (pos >= end) {
+                    return token = 1 /* EndOfFileToken */;
+                }
+                var ch = text.charCodeAt(pos);
+                // Special handling for shebang
+                if (ch === 35 /* hash */ && pos === 0 && isShebangTrivia(text, pos)) {
+                    pos = scanShebangTrivia(text, pos);
+                    if (skipTrivia) {
+                        continue;
+                    }
+                    else {
+                        return token = 6 /* ShebangTrivia */;
+                    }
+                }
+                switch (ch) {
+                    case 10 /* lineFeed */:
+                    case 13 /* carriageReturn */:
+                        tokenFlags |= 1 /* PrecedingLineBreak */;
+                        if (skipTrivia) {
+                            pos++;
+                            continue;
+                        }
+                        else {
+                            if (ch === 13 /* carriageReturn */ && pos + 1 < end && text.charCodeAt(pos + 1) === 10 /* lineFeed */) {
+                                // consume both CR and LF
+                                pos += 2;
+                            }
+                            else {
+                                pos++;
+                            }
+                            return token = 4 /* NewLineTrivia */;
+                        }
+                    case 9 /* tab */:
+                    case 11 /* verticalTab */:
+                    case 12 /* formFeed */:
+                    case 32 /* space */:
+                    case 160 /* nonBreakingSpace */:
+                    case 5760 /* ogham */:
+                    case 8192 /* enQuad */:
+                    case 8193 /* emQuad */:
+                    case 8194 /* enSpace */:
+                    case 8195 /* emSpace */:
+                    case 8196 /* threePerEmSpace */:
+                    case 8197 /* fourPerEmSpace */:
+                    case 8198 /* sixPerEmSpace */:
+                    case 8199 /* figureSpace */:
+                    case 8200 /* punctuationSpace */:
+                    case 8201 /* thinSpace */:
+                    case 8202 /* hairSpace */:
+                    case 8203 /* zeroWidthSpace */:
+                    case 8239 /* narrowNoBreakSpace */:
+                    case 8287 /* mathematicalSpace */:
+                    case 12288 /* ideographicSpace */:
+                    case 65279 /* byteOrderMark */:
+                        if (skipTrivia) {
+                            pos++;
+                            continue;
+                        }
+                        else {
+                            while (pos < end && isWhiteSpaceSingleLine(text.charCodeAt(pos))) {
+                                pos++;
+                            }
+                            return token = 5 /* WhitespaceTrivia */;
+                        }
+                    case 33 /* exclamation */:
+                        if (text.charCodeAt(pos + 1) === 61 /* equals */) {
+                            if (text.charCodeAt(pos + 2) === 61 /* equals */) {
+                                return pos += 3, token = 36 /* ExclamationEqualsEqualsToken */;
+                            }
+                            return pos += 2, token = 34 /* ExclamationEqualsToken */;
+                        }
+                        pos++;
+                        return token = 52 /* ExclamationToken */;
+                    case 34 /* doubleQuote */:
+                    case 39 /* singleQuote */:
+                        tokenValue = scanString();
+                        return token = 10 /* StringLiteral */;
+                    case 96 /* backtick */:
+                        return token = scanTemplateAndSetTokenValue();
+                    case 37 /* percent */:
+                        if (text.charCodeAt(pos + 1) === 61 /* equals */) {
+                            return pos += 2, token = 65 /* PercentEqualsToken */;
+                        }
+                        pos++;
+                        return token = 43 /* PercentToken */;
+                    case 38 /* ampersand */:
+                        if (text.charCodeAt(pos + 1) === 38 /* ampersand */) {
+                            return pos += 2, token = 54 /* AmpersandAmpersandToken */;
+                        }
+                        if (text.charCodeAt(pos + 1) === 61 /* equals */) {
+                            return pos += 2, token = 69 /* AmpersandEqualsToken */;
+                        }
+                        pos++;
+                        return token = 49 /* AmpersandToken */;
+                    case 40 /* openParen */:
+                        pos++;
+                        return token = 20 /* OpenParenToken */;
+                    case 41 /* closeParen */:
+                        pos++;
+                        return token = 21 /* CloseParenToken */;
+                    case 42 /* asterisk */:
+                        if (text.charCodeAt(pos + 1) === 61 /* equals */) {
+                            return pos += 2, token = 62 /* AsteriskEqualsToken */;
+                        }
+                        if (text.charCodeAt(pos + 1) === 42 /* asterisk */) {
+                            if (text.charCodeAt(pos + 2) === 61 /* equals */) {
+                                return pos += 3, token = 63 /* AsteriskAsteriskEqualsToken */;
+                            }
+                            return pos += 2, token = 41 /* AsteriskAsteriskToken */;
+                        }
+                        pos++;
+                        if (inJSDocType && !asteriskSeen && (tokenFlags & 1 /* PrecedingLineBreak */)) {
+                            // decoration at the start of a JSDoc comment line
+                            asteriskSeen = true;
+                            continue;
+                        }
+                        return token = 40 /* AsteriskToken */;
+                    case 43 /* plus */:
+                        if (text.charCodeAt(pos + 1) === 43 /* plus */) {
+                            return pos += 2, token = 44 /* PlusPlusToken */;
+                        }
+                        if (text.charCodeAt(pos + 1) === 61 /* equals */) {
+                            return pos += 2, token = 60 /* PlusEqualsToken */;
+                        }
+                        pos++;
+                        return token = 38 /* PlusToken */;
+                    case 44 /* comma */:
+                        pos++;
+                        return token = 27 /* CommaToken */;
+                    case 45 /* minus */:
+                        if (text.charCodeAt(pos + 1) === 45 /* minus */) {
+                            return pos += 2, token = 45 /* MinusMinusToken */;
+                        }
+                        if (text.charCodeAt(pos + 1) === 61 /* equals */) {
+                            return pos += 2, token = 61 /* MinusEqualsToken */;
+                        }
+                        pos++;
+                        return token = 39 /* MinusToken */;
+                    case 46 /* dot */:
+                        if (isDigit(text.charCodeAt(pos + 1))) {
+                            tokenValue = scanNumber().value;
+                            return token = 8 /* NumericLiteral */;
+                        }
+                        if (text.charCodeAt(pos + 1) === 46 /* dot */ && text.charCodeAt(pos + 2) === 46 /* dot */) {
+                            return pos += 3, token = 25 /* DotDotDotToken */;
+                        }
+                        pos++;
+                        return token = 24 /* DotToken */;
+                    case 47 /* slash */:
+                        // Single-line comment
+                        if (text.charCodeAt(pos + 1) === 47 /* slash */) {
+                            pos += 2;
+                            while (pos < end) {
+                                if (isLineBreak(text.charCodeAt(pos))) {
+                                    break;
+                                }
+                                pos++;
+                            }
+                            if (skipTrivia) {
+                                continue;
+                            }
+                            else {
+                                return token = 2 /* SingleLineCommentTrivia */;
+                            }
+                        }
+                        // Multi-line comment
+                        if (text.charCodeAt(pos + 1) === 42 /* asterisk */) {
+                            pos += 2;
+                            if (text.charCodeAt(pos) === 42 /* asterisk */ && text.charCodeAt(pos + 1) !== 47 /* slash */) {
+                                tokenFlags |= 2 /* PrecedingJSDocComment */;
+                            }
+                            var commentClosed = false;
+                            while (pos < end) {
+                                var ch_1 = text.charCodeAt(pos);
+                                if (ch_1 === 42 /* asterisk */ && text.charCodeAt(pos + 1) === 47 /* slash */) {
+                                    pos += 2;
+                                    commentClosed = true;
+                                    break;
+                                }
+                                if (isLineBreak(ch_1)) {
+                                    tokenFlags |= 1 /* PrecedingLineBreak */;
+                                }
+                                pos++;
+                            }
+                            if (!commentClosed) {
+                                error(ts.Diagnostics.Asterisk_Slash_expected);
+                            }
+                            if (skipTrivia) {
+                                continue;
+                            }
+                            else {
+                                if (!commentClosed) {
+                                    tokenFlags |= 4 /* Unterminated */;
+                                }
+                                return token = 3 /* MultiLineCommentTrivia */;
+                            }
+                        }
+                        if (text.charCodeAt(pos + 1) === 61 /* equals */) {
+                            return pos += 2, token = 64 /* SlashEqualsToken */;
+                        }
+                        pos++;
+                        return token = 42 /* SlashToken */;
+                    case 48 /* _0 */:
+                        if (pos + 2 < end && (text.charCodeAt(pos + 1) === 88 /* X */ || text.charCodeAt(pos + 1) === 120 /* x */)) {
+                            pos += 2;
+                            tokenValue = scanMinimumNumberOfHexDigits(1, /*canHaveSeparators*/ true);
+                            if (!tokenValue) {
+                                error(ts.Diagnostics.Hexadecimal_digit_expected);
+                                tokenValue = "0";
+                            }
+                            tokenValue = "0x" + tokenValue;
+                            tokenFlags |= 64 /* HexSpecifier */;
+                            return token = checkBigIntSuffix();
+                        }
+                        else if (pos + 2 < end && (text.charCodeAt(pos + 1) === 66 /* B */ || text.charCodeAt(pos + 1) === 98 /* b */)) {
+                            pos += 2;
+                            tokenValue = scanBinaryOrOctalDigits(/* base */ 2);
+                            if (!tokenValue) {
+                                error(ts.Diagnostics.Binary_digit_expected);
+                                tokenValue = "0";
+                            }
+                            tokenValue = "0b" + tokenValue;
+                            tokenFlags |= 128 /* BinarySpecifier */;
+                            return token = checkBigIntSuffix();
+                        }
+                        else if (pos + 2 < end && (text.charCodeAt(pos + 1) === 79 /* O */ || text.charCodeAt(pos + 1) === 111 /* o */)) {
+                            pos += 2;
+                            tokenValue = scanBinaryOrOctalDigits(/* base */ 8);
+                            if (!tokenValue) {
+                                error(ts.Diagnostics.Octal_digit_expected);
+                                tokenValue = "0";
+                            }
+                            tokenValue = "0o" + tokenValue;
+                            tokenFlags |= 256 /* OctalSpecifier */;
+                            return token = checkBigIntSuffix();
+                        }
+                        // Try to parse as an octal
+                        if (pos + 1 < end && isOctalDigit(text.charCodeAt(pos + 1))) {
+                            tokenValue = "" + scanOctalDigits();
+                            tokenFlags |= 32 /* Octal */;
+                            return token = 8 /* NumericLiteral */;
+                        }
+                    // This fall-through is a deviation from the EcmaScript grammar. The grammar says that a leading zero
+                    // can only be followed by an octal digit, a dot, or the end of the number literal. However, we are being
+                    // permissive and allowing decimal digits of the form 08* and 09* (which many browsers also do).
+                    // falls through
+                    case 49 /* _1 */:
+                    case 50 /* _2 */:
+                    case 51 /* _3 */:
+                    case 52 /* _4 */:
+                    case 53 /* _5 */:
+                    case 54 /* _6 */:
+                    case 55 /* _7 */:
+                    case 56 /* _8 */:
+                    case 57 /* _9 */:
+                        (_a = scanNumber(), token = _a.type, tokenValue = _a.value);
+                        return token;
+                    case 58 /* colon */:
+                        pos++;
+                        return token = 57 /* ColonToken */;
+                    case 59 /* semicolon */:
+                        pos++;
+                        return token = 26 /* SemicolonToken */;
+                    case 60 /* lessThan */:
+                        if (isConflictMarkerTrivia(text, pos)) {
+                            pos = scanConflictMarkerTrivia(text, pos, error);
+                            if (skipTrivia) {
+                                continue;
+                            }
+                            else {
+                                return token = 7 /* ConflictMarkerTrivia */;
+                            }
+                        }
+                        if (text.charCodeAt(pos + 1) === 60 /* lessThan */) {
+                            if (text.charCodeAt(pos + 2) === 61 /* equals */) {
+                                return pos += 3, token = 66 /* LessThanLessThanEqualsToken */;
+                            }
+                            return pos += 2, token = 46 /* LessThanLessThanToken */;
+                        }
+                        if (text.charCodeAt(pos + 1) === 61 /* equals */) {
+                            return pos += 2, token = 31 /* LessThanEqualsToken */;
+                        }
+                        if (languageVariant === 1 /* JSX */ &&
+                            text.charCodeAt(pos + 1) === 47 /* slash */ &&
+                            text.charCodeAt(pos + 2) !== 42 /* asterisk */) {
+                            return pos += 2, token = 29 /* LessThanSlashToken */;
+                        }
+                        pos++;
+                        return token = 28 /* LessThanToken */;
+                    case 61 /* equals */:
+                        if (isConflictMarkerTrivia(text, pos)) {
+                            pos = scanConflictMarkerTrivia(text, pos, error);
+                            if (skipTrivia) {
+                                continue;
+                            }
+                            else {
+                                return token = 7 /* ConflictMarkerTrivia */;
+                            }
+                        }
+                        if (text.charCodeAt(pos + 1) === 61 /* equals */) {
+                            if (text.charCodeAt(pos + 2) === 61 /* equals */) {
+                                return pos += 3, token = 35 /* EqualsEqualsEqualsToken */;
+                            }
+                            return pos += 2, token = 33 /* EqualsEqualsToken */;
+                        }
+                        if (text.charCodeAt(pos + 1) === 62 /* greaterThan */) {
+                            return pos += 2, token = 37 /* EqualsGreaterThanToken */;
+                        }
+                        pos++;
+                        return token = 59 /* EqualsToken */;
+                    case 62 /* greaterThan */:
+                        if (isConflictMarkerTrivia(text, pos)) {
+                            pos = scanConflictMarkerTrivia(text, pos, error);
+                            if (skipTrivia) {
+                                continue;
+                            }
+                            else {
+                                return token = 7 /* ConflictMarkerTrivia */;
+                            }
+                        }
+                        pos++;
+                        return token = 30 /* GreaterThanToken */;
+                    case 63 /* question */:
+                        pos++;
+                        return token = 56 /* QuestionToken */;
+                    case 91 /* openBracket */:
+                        pos++;
+                        return token = 22 /* OpenBracketToken */;
+                    case 93 /* closeBracket */:
+                        pos++;
+                        return token = 23 /* CloseBracketToken */;
+                    case 94 /* caret */:
+                        if (text.charCodeAt(pos + 1) === 61 /* equals */) {
+                            return pos += 2, token = 71 /* CaretEqualsToken */;
+                        }
+                        pos++;
+                        return token = 51 /* CaretToken */;
+                    case 123 /* openBrace */:
+                        pos++;
+                        return token = 18 /* OpenBraceToken */;
+                    case 124 /* bar */:
+                        if (isConflictMarkerTrivia(text, pos)) {
+                            pos = scanConflictMarkerTrivia(text, pos, error);
+                            if (skipTrivia) {
+                                continue;
+                            }
+                            else {
+                                return token = 7 /* ConflictMarkerTrivia */;
+                            }
+                        }
+                        if (text.charCodeAt(pos + 1) === 124 /* bar */) {
+                            return pos += 2, token = 55 /* BarBarToken */;
+                        }
+                        if (text.charCodeAt(pos + 1) === 61 /* equals */) {
+                            return pos += 2, token = 70 /* BarEqualsToken */;
+                        }
+                        pos++;
+                        return token = 50 /* BarToken */;
+                    case 125 /* closeBrace */:
+                        pos++;
+                        return token = 19 /* CloseBraceToken */;
+                    case 126 /* tilde */:
+                        pos++;
+                        return token = 53 /* TildeToken */;
+                    case 64 /* at */:
+                        pos++;
+                        return token = 58 /* AtToken */;
+                    case 92 /* backslash */:
+                        var cookedChar = peekUnicodeEscape();
+                        if (cookedChar >= 0 && isIdentifierStart(cookedChar, languageVersion)) {
+                            pos += 6;
+                            tokenValue = String.fromCharCode(cookedChar) + scanIdentifierParts();
+                            return token = getIdentifierToken();
+                        }
+                        error(ts.Diagnostics.Invalid_character);
+                        pos++;
+                        return token = 0 /* Unknown */;
+                    default:
+                        if (isIdentifierStart(ch, languageVersion)) {
+                            pos++;
+                            while (pos < end && isIdentifierPart(ch = text.charCodeAt(pos), languageVersion))
+                                pos++;
+                            tokenValue = text.substring(tokenPos, pos);
+                            if (ch === 92 /* backslash */) {
+                                tokenValue += scanIdentifierParts();
+                            }
+                            return token = getIdentifierToken();
+                        }
+                        else if (isWhiteSpaceSingleLine(ch)) {
+                            pos++;
+                            continue;
+                        }
+                        else if (isLineBreak(ch)) {
+                            tokenFlags |= 1 /* PrecedingLineBreak */;
+                            pos++;
+                            continue;
+                        }
+                        error(ts.Diagnostics.Invalid_character);
+                        pos++;
+                        return token = 0 /* Unknown */;
+                }
+            }
+        }
+        function reScanGreaterToken() {
+            if (token === 30 /* GreaterThanToken */) {
+                if (text.charCodeAt(pos) === 62 /* greaterThan */) {
+                    if (text.charCodeAt(pos + 1) === 62 /* greaterThan */) {
+                        if (text.charCodeAt(pos + 2) === 61 /* equals */) {
+                            return pos += 3, token = 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */;
+                        }
+                        return pos += 2, token = 48 /* GreaterThanGreaterThanGreaterThanToken */;
+                    }
+                    if (text.charCodeAt(pos + 1) === 61 /* equals */) {
+                        return pos += 2, token = 67 /* GreaterThanGreaterThanEqualsToken */;
+                    }
+                    pos++;
+                    return token = 47 /* GreaterThanGreaterThanToken */;
+                }
+                if (text.charCodeAt(pos) === 61 /* equals */) {
+                    pos++;
+                    return token = 32 /* GreaterThanEqualsToken */;
+                }
+            }
+            return token;
+        }
+        function reScanSlashToken() {
+            if (token === 42 /* SlashToken */ || token === 64 /* SlashEqualsToken */) {
+                var p = tokenPos + 1;
+                var inEscape = false;
+                var inCharacterClass = false;
+                while (true) {
+                    // If we reach the end of a file, or hit a newline, then this is an unterminated
+                    // regex.  Report error and return what we have so far.
+                    if (p >= end) {
+                        tokenFlags |= 4 /* Unterminated */;
+                        error(ts.Diagnostics.Unterminated_regular_expression_literal);
+                        break;
+                    }
+                    var ch = text.charCodeAt(p);
+                    if (isLineBreak(ch)) {
+                        tokenFlags |= 4 /* Unterminated */;
+                        error(ts.Diagnostics.Unterminated_regular_expression_literal);
+                        break;
+                    }
+                    if (inEscape) {
+                        // Parsing an escape character;
+                        // reset the flag and just advance to the next char.
+                        inEscape = false;
+                    }
+                    else if (ch === 47 /* slash */ && !inCharacterClass) {
+                        // A slash within a character class is permissible,
+                        // but in general it signals the end of the regexp literal.
+                        p++;
+                        break;
+                    }
+                    else if (ch === 91 /* openBracket */) {
+                        inCharacterClass = true;
+                    }
+                    else if (ch === 92 /* backslash */) {
+                        inEscape = true;
+                    }
+                    else if (ch === 93 /* closeBracket */) {
+                        inCharacterClass = false;
+                    }
+                    p++;
+                }
+                while (p < end && isIdentifierPart(text.charCodeAt(p), languageVersion)) {
+                    p++;
+                }
+                pos = p;
+                tokenValue = text.substring(tokenPos, pos);
+                token = 13 /* RegularExpressionLiteral */;
+            }
+            return token;
+        }
+        /**
+         * Unconditionally back up and scan a template expression portion.
+         */
+        function reScanTemplateToken() {
+            ts.Debug.assert(token === 19 /* CloseBraceToken */, "'reScanTemplateToken' should only be called on a '}'");
+            pos = tokenPos;
+            return token = scanTemplateAndSetTokenValue();
+        }
+        function reScanJsxToken() {
+            pos = tokenPos = startPos;
+            return token = scanJsxToken();
+        }
+        function reScanLessThanToken() {
+            if (token === 46 /* LessThanLessThanToken */) {
+                pos = tokenPos + 1;
+                return token = 28 /* LessThanToken */;
+            }
+            return token;
+        }
+        function scanJsxToken() {
+            startPos = tokenPos = pos;
+            if (pos >= end) {
+                return token = 1 /* EndOfFileToken */;
+            }
+            var char = text.charCodeAt(pos);
+            if (char === 60 /* lessThan */) {
+                if (text.charCodeAt(pos + 1) === 47 /* slash */) {
+                    pos += 2;
+                    return token = 29 /* LessThanSlashToken */;
+                }
+                pos++;
+                return token = 28 /* LessThanToken */;
+            }
+            if (char === 123 /* openBrace */) {
+                pos++;
+                return token = 18 /* OpenBraceToken */;
+            }
+            // First non-whitespace character on this line.
+            var firstNonWhitespace = 0;
+            // These initial values are special because the first line is:
+            // firstNonWhitespace = 0 to indicate that we want leading whitspace,
+            while (pos < end) {
+                char = text.charCodeAt(pos);
+                if (char === 123 /* openBrace */) {
+                    break;
+                }
+                if (char === 60 /* lessThan */) {
+                    if (isConflictMarkerTrivia(text, pos)) {
+                        pos = scanConflictMarkerTrivia(text, pos, error);
+                        return token = 7 /* ConflictMarkerTrivia */;
+                    }
+                    break;
+                }
+                // FirstNonWhitespace is 0, then we only see whitespaces so far. If we see a linebreak, we want to ignore that whitespaces.
+                // i.e (- : whitespace)
+                //      <div>----
+                //      </div> becomes <div></div>
+                //
+                //      <div>----</div> becomes <div>----</div>
+                if (isLineBreak(char) && firstNonWhitespace === 0) {
+                    firstNonWhitespace = -1;
+                }
+                else if (!isWhiteSpaceLike(char)) {
+                    firstNonWhitespace = pos;
+                }
+                pos++;
+            }
+            return firstNonWhitespace === -1 ? 12 /* JsxTextAllWhiteSpaces */ : 11 /* JsxText */;
+        }
+        // Scans a JSX identifier; these differ from normal identifiers in that
+        // they allow dashes
+        function scanJsxIdentifier() {
+            if (tokenIsIdentifierOrKeyword(token)) {
+                var firstCharPosition = pos;
+                while (pos < end) {
+                    var ch = text.charCodeAt(pos);
+                    if (ch === 45 /* minus */ || ((firstCharPosition === pos) ? isIdentifierStart(ch, languageVersion) : isIdentifierPart(ch, languageVersion))) {
+                        pos++;
+                    }
+                    else {
+                        break;
+                    }
+                }
+                tokenValue += text.substring(firstCharPosition, pos);
+            }
+            return token;
+        }
+        function scanJsxAttributeValue() {
+            startPos = pos;
+            switch (text.charCodeAt(pos)) {
+                case 34 /* doubleQuote */:
+                case 39 /* singleQuote */:
+                    tokenValue = scanString(/*jsxAttributeString*/ true);
+                    return token = 10 /* StringLiteral */;
+                default:
+                    // If this scans anything other than `{`, it's a parse error.
+                    return scan();
+            }
+        }
+        function scanJSDocToken() {
+            startPos = tokenPos = pos;
+            tokenFlags = 0;
+            if (pos >= end) {
+                return token = 1 /* EndOfFileToken */;
+            }
+            var ch = text.charCodeAt(pos);
+            pos++;
+            switch (ch) {
+                case 9 /* tab */:
+                case 11 /* verticalTab */:
+                case 12 /* formFeed */:
+                case 32 /* space */:
+                    while (pos < end && isWhiteSpaceSingleLine(text.charCodeAt(pos))) {
+                        pos++;
+                    }
+                    return token = 5 /* WhitespaceTrivia */;
+                case 64 /* at */:
+                    return token = 58 /* AtToken */;
+                case 10 /* lineFeed */:
+                case 13 /* carriageReturn */:
+                    tokenFlags |= 1 /* PrecedingLineBreak */;
+                    return token = 4 /* NewLineTrivia */;
+                case 42 /* asterisk */:
+                    return token = 40 /* AsteriskToken */;
+                case 123 /* openBrace */:
+                    return token = 18 /* OpenBraceToken */;
+                case 125 /* closeBrace */:
+                    return token = 19 /* CloseBraceToken */;
+                case 91 /* openBracket */:
+                    return token = 22 /* OpenBracketToken */;
+                case 93 /* closeBracket */:
+                    return token = 23 /* CloseBracketToken */;
+                case 60 /* lessThan */:
+                    return token = 28 /* LessThanToken */;
+                case 61 /* equals */:
+                    return token = 59 /* EqualsToken */;
+                case 44 /* comma */:
+                    return token = 27 /* CommaToken */;
+                case 46 /* dot */:
+                    return token = 24 /* DotToken */;
+                case 96 /* backtick */:
+                    while (pos < end && text.charCodeAt(pos) !== 96 /* backtick */) {
+                        pos++;
+                    }
+                    tokenValue = text.substring(tokenPos + 1, pos);
+                    pos++;
+                    return token = 14 /* NoSubstitutionTemplateLiteral */;
+            }
+            if (isIdentifierStart(ch, 6 /* Latest */)) {
+                while (isIdentifierPart(text.charCodeAt(pos), 6 /* Latest */) && pos < end) {
+                    pos++;
+                }
+                tokenValue = text.substring(tokenPos, pos);
+                return token = getIdentifierToken();
+            }
+            else {
+                return token = 0 /* Unknown */;
+            }
+        }
+        function speculationHelper(callback, isLookahead) {
+            var savePos = pos;
+            var saveStartPos = startPos;
+            var saveTokenPos = tokenPos;
+            var saveToken = token;
+            var saveTokenValue = tokenValue;
+            var saveTokenFlags = tokenFlags;
+            var result = callback();
+            // If our callback returned something 'falsy' or we're just looking ahead,
+            // then unconditionally restore us to where we were.
+            if (!result || isLookahead) {
+                pos = savePos;
+                startPos = saveStartPos;
+                tokenPos = saveTokenPos;
+                token = saveToken;
+                tokenValue = saveTokenValue;
+                tokenFlags = saveTokenFlags;
+            }
+            return result;
+        }
+        function scanRange(start, length, callback) {
+            var saveEnd = end;
+            var savePos = pos;
+            var saveStartPos = startPos;
+            var saveTokenPos = tokenPos;
+            var saveToken = token;
+            var saveTokenValue = tokenValue;
+            var saveTokenFlags = tokenFlags;
+            setText(text, start, length);
+            var result = callback();
+            end = saveEnd;
+            pos = savePos;
+            startPos = saveStartPos;
+            tokenPos = saveTokenPos;
+            token = saveToken;
+            tokenValue = saveTokenValue;
+            tokenFlags = saveTokenFlags;
+            return result;
+        }
+        function lookAhead(callback) {
+            return speculationHelper(callback, /*isLookahead*/ true);
+        }
+        function tryScan(callback) {
+            return speculationHelper(callback, /*isLookahead*/ false);
+        }
+        function getText() {
+            return text;
+        }
+        function setText(newText, start, length) {
+            text = newText || "";
+            end = length === undefined ? text.length : start + length;
+            setTextPos(start || 0);
+        }
+        function setOnError(errorCallback) {
+            onError = errorCallback;
+        }
+        function setScriptTarget(scriptTarget) {
+            languageVersion = scriptTarget;
+        }
+        function setLanguageVariant(variant) {
+            languageVariant = variant;
+        }
+        function setTextPos(textPos) {
+            ts.Debug.assert(textPos >= 0);
+            pos = textPos;
+            startPos = textPos;
+            tokenPos = textPos;
+            token = 0 /* Unknown */;
+            tokenValue = undefined;
+            tokenFlags = 0;
+        }
+        function setInJSDocType(inType) {
+            inJSDocType += inType ? 1 : -1;
+        }
+    }
+    ts.createScanner = createScanner;
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    function isExternalModuleNameRelative(moduleName) {
+        // TypeScript 1.0 spec (April 2014): 11.2.1
+        // An external module name is "relative" if the first term is "." or "..".
+        // Update: We also consider a path like `C:\foo.ts` "relative" because we do not search for it in `node_modules` or treat it as an ambient module.
+        return ts.pathIsRelative(moduleName) || ts.isRootedDiskPath(moduleName);
+    }
+    ts.isExternalModuleNameRelative = isExternalModuleNameRelative;
+    function sortAndDeduplicateDiagnostics(diagnostics) {
+        return ts.sortAndDeduplicate(diagnostics, ts.compareDiagnostics);
+    }
+    ts.sortAndDeduplicateDiagnostics = sortAndDeduplicateDiagnostics;
+})(ts || (ts = {}));
+/* @internal */
+(function (ts) {
+    ts.resolvingEmptyArray = [];
+    ts.emptyMap = ts.createMap();
+    ts.emptyUnderscoreEscapedMap = ts.emptyMap;
+    ts.externalHelpersModuleNameText = "tslib";
+    ts.defaultMaximumTruncationLength = 160;
+    function getDeclarationOfKind(symbol, kind) {
+        var declarations = symbol.declarations;
+        if (declarations) {
+            for (var _i = 0, declarations_1 = declarations; _i < declarations_1.length; _i++) {
+                var declaration = declarations_1[_i];
+                if (declaration.kind === kind) {
+                    return declaration;
+                }
+            }
+        }
+        return undefined;
+    }
+    ts.getDeclarationOfKind = getDeclarationOfKind;
+    /** Create a new escaped identifier map. */
+    function createUnderscoreEscapedMap() {
+        return new ts.MapCtr();
+    }
+    ts.createUnderscoreEscapedMap = createUnderscoreEscapedMap;
+    function hasEntries(map) {
+        return !!map && !!map.size;
+    }
+    ts.hasEntries = hasEntries;
+    function createSymbolTable(symbols) {
+        var result = ts.createMap();
+        if (symbols) {
+            for (var _i = 0, symbols_1 = symbols; _i < symbols_1.length; _i++) {
+                var symbol = symbols_1[_i];
+                result.set(symbol.escapedName, symbol);
+            }
+        }
+        return result;
+    }
+    ts.createSymbolTable = createSymbolTable;
+    var stringWriter = createSingleLineStringWriter();
+    function createSingleLineStringWriter() {
+        var str = "";
+        var writeText = function (text) { return str += text; };
+        return {
+            getText: function () { return str; },
+            write: writeText,
+            rawWrite: writeText,
+            writeKeyword: writeText,
+            writeOperator: writeText,
+            writePunctuation: writeText,
+            writeSpace: writeText,
+            writeStringLiteral: writeText,
+            writeLiteral: writeText,
+            writeParameter: writeText,
+            writeProperty: writeText,
+            writeSymbol: function (s, _) { return writeText(s); },
+            writeTrailingSemicolon: writeText,
+            writeComment: writeText,
+            getTextPos: function () { return str.length; },
+            getLine: function () { return 0; },
+            getColumn: function () { return 0; },
+            getIndent: function () { return 0; },
+            isAtStartOfLine: function () { return false; },
+            // Completely ignore indentation for string writers.  And map newlines to
+            // a single space.
+            writeLine: function () { return str += " "; },
+            increaseIndent: ts.noop,
+            decreaseIndent: ts.noop,
+            clear: function () { return str = ""; },
+            trackSymbol: ts.noop,
+            reportInaccessibleThisError: ts.noop,
+            reportInaccessibleUniqueSymbolError: ts.noop,
+            reportPrivateInBaseOfClassExpression: ts.noop,
+        };
+    }
+    function toPath(fileName, basePath, getCanonicalFileName) {
+        var nonCanonicalizedPath = ts.isRootedDiskPath(fileName)
+            ? ts.normalizePath(fileName)
+            : ts.getNormalizedAbsolutePath(fileName, basePath);
+        return getCanonicalFileName(nonCanonicalizedPath);
+    }
+    ts.toPath = toPath;
+    function changesAffectModuleResolution(oldOptions, newOptions) {
+        return oldOptions.configFilePath !== newOptions.configFilePath || ts.moduleResolutionOptionDeclarations.some(function (o) {
+            return !ts.isJsonEqual(ts.getCompilerOptionValue(oldOptions, o), ts.getCompilerOptionValue(newOptions, o));
+        });
+    }
+    ts.changesAffectModuleResolution = changesAffectModuleResolution;
+    function findAncestor(node, callback) {
+        while (node) {
+            var result = callback(node);
+            if (result === "quit") {
+                return undefined;
+            }
+            else if (result) {
+                return node;
+            }
+            node = node.parent;
+        }
+        return undefined;
+    }
+    ts.findAncestor = findAncestor;
+    function forEachAncestor(node, callback) {
+        while (true) {
+            var res = callback(node);
+            if (res === "quit")
+                return undefined;
+            if (res !== undefined)
+                return res;
+            if (ts.isSourceFile(node))
+                return undefined;
+            node = node.parent;
+        }
+    }
+    ts.forEachAncestor = forEachAncestor;
+    function forEachEntry(map, callback) {
+        var _a;
+        var iterator = map.entries();
+        for (var _b = iterator.next(), pair = _b.value, done = _b.done; !done; _a = iterator.next(), pair = _a.value, done = _a.done, _a) {
+            var key = pair[0], value = pair[1];
+            var result = callback(value, key);
+            if (result) {
+                return result;
+            }
+        }
+        return undefined;
+    }
+    ts.forEachEntry = forEachEntry;
+    function forEachKey(map, callback) {
+        var _a;
+        var iterator = map.keys();
+        for (var _b = iterator.next(), key = _b.value, done = _b.done; !done; _a = iterator.next(), key = _a.value, done = _a.done, _a) {
+            var result = callback(key);
+            if (result) {
+                return result;
+            }
+        }
+        return undefined;
+    }
+    ts.forEachKey = forEachKey;
+    function copyEntries(source, target) {
+        source.forEach(function (value, key) {
+            target.set(key, value);
+        });
+    }
+    ts.copyEntries = copyEntries;
+    function arrayToSet(array, makeKey) {
+        return ts.arrayToMap(array, makeKey || (function (s) { return s; }), function () { return true; });
+    }
+    ts.arrayToSet = arrayToSet;
+    function cloneMap(map) {
+        var clone = ts.createMap();
+        copyEntries(map, clone);
+        return clone;
+    }
+    ts.cloneMap = cloneMap;
+    function usingSingleLineStringWriter(action) {
+        var oldString = stringWriter.getText();
+        try {
+            action(stringWriter);
+            return stringWriter.getText();
+        }
+        finally {
+            stringWriter.clear();
+            stringWriter.writeKeyword(oldString);
+        }
+    }
+    ts.usingSingleLineStringWriter = usingSingleLineStringWriter;
+    function getFullWidth(node) {
+        return node.end - node.pos;
+    }
+    ts.getFullWidth = getFullWidth;
+    function getResolvedModule(sourceFile, moduleNameText) {
+        return sourceFile && sourceFile.resolvedModules && sourceFile.resolvedModules.get(moduleNameText);
+    }
+    ts.getResolvedModule = getResolvedModule;
+    function setResolvedModule(sourceFile, moduleNameText, resolvedModule) {
+        if (!sourceFile.resolvedModules) {
+            sourceFile.resolvedModules = ts.createMap();
+        }
+        sourceFile.resolvedModules.set(moduleNameText, resolvedModule);
+    }
+    ts.setResolvedModule = setResolvedModule;
+    function setResolvedTypeReferenceDirective(sourceFile, typeReferenceDirectiveName, resolvedTypeReferenceDirective) {
+        if (!sourceFile.resolvedTypeReferenceDirectiveNames) {
+            sourceFile.resolvedTypeReferenceDirectiveNames = ts.createMap();
+        }
+        sourceFile.resolvedTypeReferenceDirectiveNames.set(typeReferenceDirectiveName, resolvedTypeReferenceDirective);
+    }
+    ts.setResolvedTypeReferenceDirective = setResolvedTypeReferenceDirective;
+    function projectReferenceIsEqualTo(oldRef, newRef) {
+        return oldRef.path === newRef.path &&
+            !oldRef.prepend === !newRef.prepend &&
+            !oldRef.circular === !newRef.circular;
+    }
+    ts.projectReferenceIsEqualTo = projectReferenceIsEqualTo;
+    function moduleResolutionIsEqualTo(oldResolution, newResolution) {
+        return oldResolution.isExternalLibraryImport === newResolution.isExternalLibraryImport &&
+            oldResolution.extension === newResolution.extension &&
+            oldResolution.resolvedFileName === newResolution.resolvedFileName &&
+            oldResolution.originalPath === newResolution.originalPath &&
+            packageIdIsEqual(oldResolution.packageId, newResolution.packageId);
+    }
+    ts.moduleResolutionIsEqualTo = moduleResolutionIsEqualTo;
+    function packageIdIsEqual(a, b) {
+        return a === b || !!a && !!b && a.name === b.name && a.subModuleName === b.subModuleName && a.version === b.version;
+    }
+    function packageIdToString(_a) {
+        var name = _a.name, subModuleName = _a.subModuleName, version = _a.version;
+        var fullName = subModuleName ? name + "/" + subModuleName : name;
+        return fullName + "@" + version;
+    }
+    ts.packageIdToString = packageIdToString;
+    function typeDirectiveIsEqualTo(oldResolution, newResolution) {
+        return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.primary === newResolution.primary;
+    }
+    ts.typeDirectiveIsEqualTo = typeDirectiveIsEqualTo;
+    function hasChangesInResolutions(names, newResolutions, oldResolutions, comparer) {
+        ts.Debug.assert(names.length === newResolutions.length);
+        for (var i = 0; i < names.length; i++) {
+            var newResolution = newResolutions[i];
+            var oldResolution = oldResolutions && oldResolutions.get(names[i]);
+            var changed = oldResolution
+                ? !newResolution || !comparer(oldResolution, newResolution)
+                : newResolution;
+            if (changed) {
+                return true;
+            }
+        }
+        return false;
+    }
+    ts.hasChangesInResolutions = hasChangesInResolutions;
+    // Returns true if this node contains a parse error anywhere underneath it.
+    function containsParseError(node) {
+        aggregateChildData(node);
+        return (node.flags & 131072 /* ThisNodeOrAnySubNodesHasError */) !== 0;
+    }
+    ts.containsParseError = containsParseError;
+    function aggregateChildData(node) {
+        if (!(node.flags & 262144 /* HasAggregatedChildData */)) {
+            // A node is considered to contain a parse error if:
+            //  a) the parser explicitly marked that it had an error
+            //  b) any of it's children reported that it had an error.
+            var thisNodeOrAnySubNodesHasError = ((node.flags & 32768 /* ThisNodeHasError */) !== 0) ||
+                ts.forEachChild(node, containsParseError);
+            // If so, mark ourselves accordingly.
+            if (thisNodeOrAnySubNodesHasError) {
+                node.flags |= 131072 /* ThisNodeOrAnySubNodesHasError */;
+            }
+            // Also mark that we've propagated the child information to this node.  This way we can
+            // always consult the bit directly on this node without needing to check its children
+            // again.
+            node.flags |= 262144 /* HasAggregatedChildData */;
+        }
+    }
+    function getSourceFileOfNode(node) {
+        while (node && node.kind !== 279 /* SourceFile */) {
+            node = node.parent;
+        }
+        return node;
+    }
+    ts.getSourceFileOfNode = getSourceFileOfNode;
+    function isStatementWithLocals(node) {
+        switch (node.kind) {
+            case 218 /* Block */:
+            case 246 /* CaseBlock */:
+            case 225 /* ForStatement */:
+            case 226 /* ForInStatement */:
+            case 227 /* ForOfStatement */:
+                return true;
+        }
+        return false;
+    }
+    ts.isStatementWithLocals = isStatementWithLocals;
+    function getStartPositionOfLine(line, sourceFile) {
+        ts.Debug.assert(line >= 0);
+        return ts.getLineStarts(sourceFile)[line];
+    }
+    ts.getStartPositionOfLine = getStartPositionOfLine;
+    // This is a useful function for debugging purposes.
+    function nodePosToString(node) {
+        var file = getSourceFileOfNode(node);
+        var loc = ts.getLineAndCharacterOfPosition(file, node.pos);
+        return file.fileName + "(" + (loc.line + 1) + "," + (loc.character + 1) + ")";
+    }
+    ts.nodePosToString = nodePosToString;
+    function getEndLinePosition(line, sourceFile) {
+        ts.Debug.assert(line >= 0);
+        var lineStarts = ts.getLineStarts(sourceFile);
+        var lineIndex = line;
+        var sourceText = sourceFile.text;
+        if (lineIndex + 1 === lineStarts.length) {
+            // last line - return EOF
+            return sourceText.length - 1;
+        }
+        else {
+            // current line start
+            var start = lineStarts[lineIndex];
+            // take the start position of the next line - 1 = it should be some line break
+            var pos = lineStarts[lineIndex + 1] - 1;
+            ts.Debug.assert(ts.isLineBreak(sourceText.charCodeAt(pos)));
+            // walk backwards skipping line breaks, stop the the beginning of current line.
+            // i.e:
+            // <some text>
+            // $ <- end of line for this position should match the start position
+            while (start <= pos && ts.isLineBreak(sourceText.charCodeAt(pos))) {
+                pos--;
+            }
+            return pos;
+        }
+    }
+    ts.getEndLinePosition = getEndLinePosition;
+    /**
+     * Returns a value indicating whether a name is unique globally or within the current file.
+     * Note: This does not consider whether a name appears as a free identifier or not, so at the expression `x.y` this includes both `x` and `y`.
+     */
+    function isFileLevelUniqueName(sourceFile, name, hasGlobalName) {
+        return !(hasGlobalName && hasGlobalName(name)) && !sourceFile.identifiers.has(name);
+    }
+    ts.isFileLevelUniqueName = isFileLevelUniqueName;
+    // Returns true if this node is missing from the actual source code. A 'missing' node is different
+    // from 'undefined/defined'. When a node is undefined (which can happen for optional nodes
+    // in the tree), it is definitely missing. However, a node may be defined, but still be
+    // missing.  This happens whenever the parser knows it needs to parse something, but can't
+    // get anything in the source code that it expects at that location. For example:
+    //
+    //          let a: ;
+    //
+    // Here, the Type in the Type-Annotation is not-optional (as there is a colon in the source
+    // code). So the parser will attempt to parse out a type, and will create an actual node.
+    // However, this node will be 'missing' in the sense that no actual source-code/tokens are
+    // contained within it.
+    function nodeIsMissing(node) {
+        if (node === undefined) {
+            return true;
+        }
+        return node.pos === node.end && node.pos >= 0 && node.kind !== 1 /* EndOfFileToken */;
+    }
+    ts.nodeIsMissing = nodeIsMissing;
+    function nodeIsPresent(node) {
+        return !nodeIsMissing(node);
+    }
+    ts.nodeIsPresent = nodeIsPresent;
+    /**
+     * Prepends statements to an array while taking care of prologue directives.
+     */
+    function addStatementsAfterPrologue(to, from) {
+        if (from === undefined || from.length === 0)
+            return to;
+        var statementIndex = 0;
+        // skip all prologue directives to insert at the correct position
+        for (; statementIndex < to.length; ++statementIndex) {
+            if (!isPrologueDirective(to[statementIndex])) {
+                break;
+            }
+        }
+        to.splice.apply(to, [statementIndex, 0].concat(from));
+        return to;
+    }
+    ts.addStatementsAfterPrologue = addStatementsAfterPrologue;
+    /**
+     * Determine if the given comment is a triple-slash
+     *
+     * @return true if the comment is a triple-slash comment else false
+     */
+    function isRecognizedTripleSlashComment(text, commentPos, commentEnd) {
+        // Verify this is /// comment, but do the regexp match only when we first can find /// in the comment text
+        // so that we don't end up computing comment string and doing match for all // comments
+        if (text.charCodeAt(commentPos + 1) === 47 /* slash */ &&
+            commentPos + 2 < commentEnd &&
+            text.charCodeAt(commentPos + 2) === 47 /* slash */) {
+            var textSubStr = text.substring(commentPos, commentEnd);
+            return textSubStr.match(ts.fullTripleSlashReferencePathRegEx) ||
+                textSubStr.match(ts.fullTripleSlashAMDReferencePathRegEx) ||
+                textSubStr.match(fullTripleSlashReferenceTypeReferenceDirectiveRegEx) ||
+                textSubStr.match(defaultLibReferenceRegEx) ?
+                true : false;
+        }
+        return false;
+    }
+    ts.isRecognizedTripleSlashComment = isRecognizedTripleSlashComment;
+    function isPinnedComment(text, start) {
+        return text.charCodeAt(start + 1) === 42 /* asterisk */ &&
+            text.charCodeAt(start + 2) === 33 /* exclamation */;
+    }
+    ts.isPinnedComment = isPinnedComment;
+    function getTokenPosOfNode(node, sourceFile, includeJsDoc) {
+        // With nodes that have no width (i.e. 'Missing' nodes), we actually *don't*
+        // want to skip trivia because this will launch us forward to the next token.
+        if (nodeIsMissing(node)) {
+            return node.pos;
+        }
+        if (ts.isJSDocNode(node)) {
+            return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos, /*stopAfterLineBreak*/ false, /*stopAtComments*/ true);
+        }
+        if (includeJsDoc && ts.hasJSDocNodes(node)) {
+            return getTokenPosOfNode(node.jsDoc[0]);
+        }
+        // For a syntax list, it is possible that one of its children has JSDocComment nodes, while
+        // the syntax list itself considers them as normal trivia. Therefore if we simply skip
+        // trivia for the list, we may have skipped the JSDocComment as well. So we should process its
+        // first child to determine the actual position of its first token.
+        if (node.kind === 306 /* SyntaxList */ && node._children.length > 0) {
+            return getTokenPosOfNode(node._children[0], sourceFile, includeJsDoc);
+        }
+        return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos);
+    }
+    ts.getTokenPosOfNode = getTokenPosOfNode;
+    function getNonDecoratorTokenPosOfNode(node, sourceFile) {
+        if (nodeIsMissing(node) || !node.decorators) {
+            return getTokenPosOfNode(node, sourceFile);
+        }
+        return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.decorators.end);
+    }
+    ts.getNonDecoratorTokenPosOfNode = getNonDecoratorTokenPosOfNode;
+    function getSourceTextOfNodeFromSourceFile(sourceFile, node, includeTrivia) {
+        if (includeTrivia === void 0) { includeTrivia = false; }
+        return getTextOfNodeFromSourceText(sourceFile.text, node, includeTrivia);
+    }
+    ts.getSourceTextOfNodeFromSourceFile = getSourceTextOfNodeFromSourceFile;
+    function isJSDocTypeExpressionOrChild(node) {
+        return node.kind === 283 /* JSDocTypeExpression */ || (node.parent && isJSDocTypeExpressionOrChild(node.parent));
+    }
+    function getTextOfNodeFromSourceText(sourceText, node, includeTrivia) {
+        if (includeTrivia === void 0) { includeTrivia = false; }
+        if (nodeIsMissing(node)) {
+            return "";
+        }
+        var text = sourceText.substring(includeTrivia ? node.pos : ts.skipTrivia(sourceText, node.pos), node.end);
+        if (isJSDocTypeExpressionOrChild(node)) {
+            // strip space + asterisk at line start
+            text = text.replace(/(^|\r?\n|\r)\s*\*\s*/g, "$1");
+        }
+        return text;
+    }
+    ts.getTextOfNodeFromSourceText = getTextOfNodeFromSourceText;
+    function getTextOfNode(node, includeTrivia) {
+        if (includeTrivia === void 0) { includeTrivia = false; }
+        return getSourceTextOfNodeFromSourceFile(getSourceFileOfNode(node), node, includeTrivia);
+    }
+    ts.getTextOfNode = getTextOfNode;
+    function getPos(range) {
+        return range.pos;
+    }
+    /**
+     * Note: it is expected that the `nodeArray` and the `node` are within the same file.
+     * For example, searching for a `SourceFile` in a `SourceFile[]` wouldn't work.
+     */
+    function indexOfNode(nodeArray, node) {
+        return ts.binarySearch(nodeArray, node, getPos, ts.compareValues);
+    }
+    ts.indexOfNode = indexOfNode;
+    /**
+     * Gets flags that control emit behavior of a node.
+     */
+    function getEmitFlags(node) {
+        var emitNode = node.emitNode;
+        return emitNode && emitNode.flags || 0;
+    }
+    ts.getEmitFlags = getEmitFlags;
+    function getLiteralText(node, sourceFile, neverAsciiEscape) {
+        // If we don't need to downlevel and we can reach the original source text using
+        // the node's parent reference, then simply get the text as it was originally written.
+        if (!nodeIsSynthesized(node) && node.parent && !((ts.isNumericLiteral(node) && node.numericLiteralFlags & 512 /* ContainsSeparator */) ||
+            ts.isBigIntLiteral(node))) {
+            return getSourceTextOfNodeFromSourceFile(sourceFile, node);
+        }
+        var escapeText = neverAsciiEscape || (getEmitFlags(node) & 16777216 /* NoAsciiEscaping */) ? escapeString : escapeNonAsciiString;
+        // If we can't reach the original source text, use the canonical form if it's a number,
+        // or a (possibly escaped) quoted form of the original text if it's string-like.
+        switch (node.kind) {
+            case 10 /* StringLiteral */:
+                if (node.singleQuote) {
+                    return "'" + escapeText(node.text, 39 /* singleQuote */) + "'";
+                }
+                else {
+                    return '"' + escapeText(node.text, 34 /* doubleQuote */) + '"';
+                }
+            case 14 /* NoSubstitutionTemplateLiteral */:
+                return "`" + escapeText(node.text, 96 /* backtick */) + "`";
+            case 15 /* TemplateHead */:
+                // tslint:disable-next-line no-invalid-template-strings
+                return "`" + escapeText(node.text, 96 /* backtick */) + "${";
+            case 16 /* TemplateMiddle */:
+                // tslint:disable-next-line no-invalid-template-strings
+                return "}" + escapeText(node.text, 96 /* backtick */) + "${";
+            case 17 /* TemplateTail */:
+                return "}" + escapeText(node.text, 96 /* backtick */) + "`";
+            case 8 /* NumericLiteral */:
+            case 9 /* BigIntLiteral */:
+            case 13 /* RegularExpressionLiteral */:
+                return node.text;
+        }
+        return ts.Debug.fail("Literal kind '" + node.kind + "' not accounted for.");
+    }
+    ts.getLiteralText = getLiteralText;
+    function getTextOfConstantValue(value) {
+        return ts.isString(value) ? '"' + escapeNonAsciiString(value) + '"' : "" + value;
+    }
+    ts.getTextOfConstantValue = getTextOfConstantValue;
+    // Make an identifier from an external module name by extracting the string after the last "/" and replacing
+    // all non-alphanumeric characters with underscores
+    function makeIdentifierFromModuleName(moduleName) {
+        return ts.getBaseFileName(moduleName).replace(/^(\d)/, "_$1").replace(/\W/g, "_");
+    }
+    ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName;
+    function isBlockOrCatchScoped(declaration) {
+        return (ts.getCombinedNodeFlags(declaration) & 3 /* BlockScoped */) !== 0 ||
+            isCatchClauseVariableDeclarationOrBindingElement(declaration);
+    }
+    ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
+    function isCatchClauseVariableDeclarationOrBindingElement(declaration) {
+        var node = getRootDeclaration(declaration);
+        return node.kind === 237 /* VariableDeclaration */ && node.parent.kind === 274 /* CatchClause */;
+    }
+    ts.isCatchClauseVariableDeclarationOrBindingElement = isCatchClauseVariableDeclarationOrBindingElement;
+    function isAmbientModule(node) {
+        return ts.isModuleDeclaration(node) && (node.name.kind === 10 /* StringLiteral */ || isGlobalScopeAugmentation(node));
+    }
+    ts.isAmbientModule = isAmbientModule;
+    function isModuleWithStringLiteralName(node) {
+        return ts.isModuleDeclaration(node) && node.name.kind === 10 /* StringLiteral */;
+    }
+    ts.isModuleWithStringLiteralName = isModuleWithStringLiteralName;
+    function isNonGlobalAmbientModule(node) {
+        return ts.isModuleDeclaration(node) && ts.isStringLiteral(node.name);
+    }
+    ts.isNonGlobalAmbientModule = isNonGlobalAmbientModule;
+    /**
+     * An effective module (namespace) declaration is either
+     * 1. An actual declaration: namespace X { ... }
+     * 2. A Javascript declaration, which is:
+     *    An identifier in a nested property access expression: Y in `X.Y.Z = { ... }`
+     */
+    function isEffectiveModuleDeclaration(node) {
+        return ts.isModuleDeclaration(node) || ts.isIdentifier(node);
+    }
+    ts.isEffectiveModuleDeclaration = isEffectiveModuleDeclaration;
+    /** Given a symbol for a module, checks that it is a shorthand ambient module. */
+    function isShorthandAmbientModuleSymbol(moduleSymbol) {
+        return isShorthandAmbientModule(moduleSymbol.valueDeclaration);
+    }
+    ts.isShorthandAmbientModuleSymbol = isShorthandAmbientModuleSymbol;
+    function isShorthandAmbientModule(node) {
+        // The only kind of module that can be missing a body is a shorthand ambient module.
+        return node && node.kind === 244 /* ModuleDeclaration */ && (!node.body);
+    }
+    function isBlockScopedContainerTopLevel(node) {
+        return node.kind === 279 /* SourceFile */ ||
+            node.kind === 244 /* ModuleDeclaration */ ||
+            ts.isFunctionLike(node);
+    }
+    ts.isBlockScopedContainerTopLevel = isBlockScopedContainerTopLevel;
+    function isGlobalScopeAugmentation(module) {
+        return !!(module.flags & 512 /* GlobalAugmentation */);
+    }
+    ts.isGlobalScopeAugmentation = isGlobalScopeAugmentation;
+    function isExternalModuleAugmentation(node) {
+        return isAmbientModule(node) && isModuleAugmentationExternal(node);
+    }
+    ts.isExternalModuleAugmentation = isExternalModuleAugmentation;
+    function isModuleAugmentationExternal(node) {
+        // external module augmentation is a ambient module declaration that is either:
+        // - defined in the top level scope and source file is an external module
+        // - defined inside ambient module declaration located in the top level scope and source file not an external module
+        switch (node.parent.kind) {
+            case 279 /* SourceFile */:
+                return ts.isExternalModule(node.parent);
+            case 245 /* ModuleBlock */:
+                return isAmbientModule(node.parent.parent) && ts.isSourceFile(node.parent.parent.parent) && !ts.isExternalModule(node.parent.parent.parent);
+        }
+        return false;
+    }
+    ts.isModuleAugmentationExternal = isModuleAugmentationExternal;
+    function getNonAugmentationDeclaration(symbol) {
+        return ts.find(symbol.declarations, function (d) { return !isExternalModuleAugmentation(d) && !(ts.isModuleDeclaration(d) && isGlobalScopeAugmentation(d)); });
+    }
+    ts.getNonAugmentationDeclaration = getNonAugmentationDeclaration;
+    function isEffectiveExternalModule(node, compilerOptions) {
+        return ts.isExternalModule(node) || compilerOptions.isolatedModules || ((ts.getEmitModuleKind(compilerOptions) === ts.ModuleKind.CommonJS) && !!node.commonJsModuleIndicator);
+    }
+    ts.isEffectiveExternalModule = isEffectiveExternalModule;
+    function isBlockScope(node, parentNode) {
+        switch (node.kind) {
+            case 279 /* SourceFile */:
+            case 246 /* CaseBlock */:
+            case 274 /* CatchClause */:
+            case 244 /* ModuleDeclaration */:
+            case 225 /* ForStatement */:
+            case 226 /* ForInStatement */:
+            case 227 /* ForOfStatement */:
+            case 157 /* Constructor */:
+            case 156 /* MethodDeclaration */:
+            case 158 /* GetAccessor */:
+            case 159 /* SetAccessor */:
+            case 239 /* FunctionDeclaration */:
+            case 196 /* FunctionExpression */:
+            case 197 /* ArrowFunction */:
+                return true;
+            case 218 /* Block */:
+                // function block is not considered block-scope container
+                // see comment in binder.ts: bind(...), case for SyntaxKind.Block
+                return !ts.isFunctionLike(parentNode);
+        }
+        return false;
+    }
+    ts.isBlockScope = isBlockScope;
+    function isDeclarationWithTypeParameters(node) {
+        switch (node.kind) {
+            case 297 /* JSDocCallbackTag */:
+            case 304 /* JSDocTypedefTag */:
+            case 293 /* JSDocSignature */:
+                return true;
+            default:
+                ts.assertType(node);
+                return isDeclarationWithTypeParameterChildren(node);
+        }
+    }
+    ts.isDeclarationWithTypeParameters = isDeclarationWithTypeParameters;
+    function isDeclarationWithTypeParameterChildren(node) {
+        switch (node.kind) {
+            case 160 /* CallSignature */:
+            case 161 /* ConstructSignature */:
+            case 155 /* MethodSignature */:
+            case 162 /* IndexSignature */:
+            case 165 /* FunctionType */:
+            case 166 /* ConstructorType */:
+            case 289 /* JSDocFunctionType */:
+            case 240 /* ClassDeclaration */:
+            case 209 /* ClassExpression */:
+            case 241 /* InterfaceDeclaration */:
+            case 242 /* TypeAliasDeclaration */:
+            case 303 /* JSDocTemplateTag */:
+            case 239 /* FunctionDeclaration */:
+            case 156 /* MethodDeclaration */:
+            case 157 /* Constructor */:
+            case 158 /* GetAccessor */:
+            case 159 /* SetAccessor */:
+            case 196 /* FunctionExpression */:
+            case 197 /* ArrowFunction */:
+                return true;
+            default:
+                ts.assertType(node);
+                return false;
+        }
+    }
+    ts.isDeclarationWithTypeParameterChildren = isDeclarationWithTypeParameterChildren;
+    function isAnyImportSyntax(node) {
+        switch (node.kind) {
+            case 249 /* ImportDeclaration */:
+            case 248 /* ImportEqualsDeclaration */:
+                return true;
+            default:
+                return false;
+        }
+    }
+    ts.isAnyImportSyntax = isAnyImportSyntax;
+    function isLateVisibilityPaintedStatement(node) {
+        switch (node.kind) {
+            case 249 /* ImportDeclaration */:
+            case 248 /* ImportEqualsDeclaration */:
+            case 219 /* VariableStatement */:
+            case 240 /* ClassDeclaration */:
+            case 239 /* FunctionDeclaration */:
+            case 244 /* ModuleDeclaration */:
+            case 242 /* TypeAliasDeclaration */:
+            case 241 /* InterfaceDeclaration */:
+            case 243 /* EnumDeclaration */:
+                return true;
+            default:
+                return false;
+        }
+    }
+    ts.isLateVisibilityPaintedStatement = isLateVisibilityPaintedStatement;
+    function isAnyImportOrReExport(node) {
+        return isAnyImportSyntax(node) || ts.isExportDeclaration(node);
+    }
+    ts.isAnyImportOrReExport = isAnyImportOrReExport;
+    // Gets the nearest enclosing block scope container that has the provided node
+    // as a descendant, that is not the provided node.
+    function getEnclosingBlockScopeContainer(node) {
+        return findAncestor(node.parent, function (current) { return isBlockScope(current, current.parent); });
+    }
+    ts.getEnclosingBlockScopeContainer = getEnclosingBlockScopeContainer;
+    // Return display name of an identifier
+    // Computed property names will just be emitted as "[<expr>]", where <expr> is the source
+    // text of the expression in the computed property.
+    function declarationNameToString(name) {
+        return !name || getFullWidth(name) === 0 ? "(Missing)" : getTextOfNode(name);
+    }
+    ts.declarationNameToString = declarationNameToString;
+    function getNameFromIndexInfo(info) {
+        return info.declaration ? declarationNameToString(info.declaration.parameters[0].name) : undefined;
+    }
+    ts.getNameFromIndexInfo = getNameFromIndexInfo;
+    function getTextOfPropertyName(name) {
+        switch (name.kind) {
+            case 72 /* Identifier */:
+                return name.escapedText;
+            case 10 /* StringLiteral */:
+            case 8 /* NumericLiteral */:
+            case 14 /* NoSubstitutionTemplateLiteral */:
+                return ts.escapeLeadingUnderscores(name.text);
+            case 149 /* ComputedPropertyName */:
+                if (isStringOrNumericLiteralLike(name.expression))
+                    return ts.escapeLeadingUnderscores(name.expression.text);
+                return ts.Debug.fail("Text of property name cannot be read from non-literal-valued ComputedPropertyNames");
+            default:
+                return ts.Debug.assertNever(name);
+        }
+    }
+    ts.getTextOfPropertyName = getTextOfPropertyName;
+    function entityNameToString(name) {
+        switch (name.kind) {
+            case 72 /* Identifier */:
+                return getFullWidth(name) === 0 ? ts.idText(name) : getTextOfNode(name);
+            case 148 /* QualifiedName */:
+                return entityNameToString(name.left) + "." + entityNameToString(name.right);
+            case 189 /* PropertyAccessExpression */:
+                return entityNameToString(name.expression) + "." + entityNameToString(name.name);
+            default:
+                throw ts.Debug.assertNever(name);
+        }
+    }
+    ts.entityNameToString = entityNameToString;
+    function createDiagnosticForNode(node, message, arg0, arg1, arg2, arg3) {
+        var sourceFile = getSourceFileOfNode(node);
+        return createDiagnosticForNodeInSourceFile(sourceFile, node, message, arg0, arg1, arg2, arg3);
+    }
+    ts.createDiagnosticForNode = createDiagnosticForNode;
+    function createDiagnosticForNodeArray(sourceFile, nodes, message, arg0, arg1, arg2, arg3) {
+        var start = ts.skipTrivia(sourceFile.text, nodes.pos);
+        return ts.createFileDiagnostic(sourceFile, start, nodes.end - start, message, arg0, arg1, arg2, arg3);
+    }
+    ts.createDiagnosticForNodeArray = createDiagnosticForNodeArray;
+    function createDiagnosticForNodeInSourceFile(sourceFile, node, message, arg0, arg1, arg2, arg3) {
+        var span = getErrorSpanForNode(sourceFile, node);
+        return ts.createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2, arg3);
+    }
+    ts.createDiagnosticForNodeInSourceFile = createDiagnosticForNodeInSourceFile;
+    function createDiagnosticForNodeFromMessageChain(node, messageChain, relatedInformation) {
+        var sourceFile = getSourceFileOfNode(node);
+        var span = getErrorSpanForNode(sourceFile, node);
+        return {
+            file: sourceFile,
+            start: span.start,
+            length: span.length,
+            code: messageChain.code,
+            category: messageChain.category,
+            messageText: messageChain.next ? messageChain : messageChain.messageText,
+            relatedInformation: relatedInformation
+        };
+    }
+    ts.createDiagnosticForNodeFromMessageChain = createDiagnosticForNodeFromMessageChain;
+    function getSpanOfTokenAtPosition(sourceFile, pos) {
+        var scanner = ts.createScanner(sourceFile.languageVersion, /*skipTrivia*/ true, sourceFile.languageVariant, sourceFile.text, /*onError:*/ undefined, pos);
+        scanner.scan();
+        var start = scanner.getTokenPos();
+        return ts.createTextSpanFromBounds(start, scanner.getTextPos());
+    }
+    ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition;
+    function getErrorSpanForArrowFunction(sourceFile, node) {
+        var pos = ts.skipTrivia(sourceFile.text, node.pos);
+        if (node.body && node.body.kind === 218 /* Block */) {
+            var startLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.pos).line;
+            var endLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.end).line;
+            if (startLine < endLine) {
+                // The arrow function spans multiple lines,
+                // make the error span be the first line, inclusive.
+                return ts.createTextSpan(pos, getEndLinePosition(startLine, sourceFile) - pos + 1);
+            }
+        }
+        return ts.createTextSpanFromBounds(pos, node.end);
+    }
+    function getErrorSpanForNode(sourceFile, node) {
+        var errorNode = node;
+        switch (node.kind) {
+            case 279 /* SourceFile */:
+                var pos_1 = ts.skipTrivia(sourceFile.text, 0, /*stopAfterLineBreak*/ false);
+                if (pos_1 === sourceFile.text.length) {
+                    // file is empty - return span for the beginning of the file
+                    return ts.createTextSpan(0, 0);
+                }
+                return getSpanOfTokenAtPosition(sourceFile, pos_1);
+            // This list is a work in progress. Add missing node kinds to improve their error
+            // spans.
+            case 237 /* VariableDeclaration */:
+            case 186 /* BindingElement */:
+            case 240 /* ClassDeclaration */:
+            case 209 /* ClassExpression */:
+            case 241 /* InterfaceDeclaration */:
+            case 244 /* ModuleDeclaration */:
+            case 243 /* EnumDeclaration */:
+            case 278 /* EnumMember */:
+            case 239 /* FunctionDeclaration */:
+            case 196 /* FunctionExpression */:
+            case 156 /* MethodDeclaration */:
+            case 158 /* GetAccessor */:
+            case 159 /* SetAccessor */:
+            case 242 /* TypeAliasDeclaration */:
+            case 154 /* PropertyDeclaration */:
+            case 153 /* PropertySignature */:
+                errorNode = node.name;
+                break;
+            case 197 /* ArrowFunction */:
+                return getErrorSpanForArrowFunction(sourceFile, node);
+        }
+        if (errorNode === undefined) {
+            // If we don't have a better node, then just set the error on the first token of
+            // construct.
+            return getSpanOfTokenAtPosition(sourceFile, node.pos);
+        }
+        var isMissing = nodeIsMissing(errorNode);
+        var pos = isMissing || ts.isJsxText(node)
+            ? errorNode.pos
+            : ts.skipTrivia(sourceFile.text, errorNode.pos);
+        // These asserts should all be satisfied for a properly constructed `errorNode`.
+        if (isMissing) {
+            ts.Debug.assert(pos === errorNode.pos, "This failure could trigger https://github.com/Microsoft/TypeScript/issues/20809");
+            ts.Debug.assert(pos === errorNode.end, "This failure could trigger https://github.com/Microsoft/TypeScript/issues/20809");
+        }
+        else {
+            ts.Debug.assert(pos >= errorNode.pos, "This failure could trigger https://github.com/Microsoft/TypeScript/issues/20809");
+            ts.Debug.assert(pos <= errorNode.end, "This failure could trigger https://github.com/Microsoft/TypeScript/issues/20809");
+        }
+        return ts.createTextSpanFromBounds(pos, errorNode.end);
+    }
+    ts.getErrorSpanForNode = getErrorSpanForNode;
+    function isExternalOrCommonJsModule(file) {
+        return (file.externalModuleIndicator || file.commonJsModuleIndicator) !== undefined;
+    }
+    ts.isExternalOrCommonJsModule = isExternalOrCommonJsModule;
+    function isJsonSourceFile(file) {
+        return file.scriptKind === 6 /* JSON */;
+    }
+    ts.isJsonSourceFile = isJsonSourceFile;
+    function isEnumConst(node) {
+        return !!(ts.getCombinedModifierFlags(node) & 2048 /* Const */);
+    }
+    ts.isEnumConst = isEnumConst;
+    function isDeclarationReadonly(declaration) {
+        return !!(ts.getCombinedModifierFlags(declaration) & 64 /* Readonly */ && !ts.isParameterPropertyDeclaration(declaration));
+    }
+    ts.isDeclarationReadonly = isDeclarationReadonly;
+    function isVarConst(node) {
+        return !!(ts.getCombinedNodeFlags(node) & 2 /* Const */);
+    }
+    ts.isVarConst = isVarConst;
+    function isLet(node) {
+        return !!(ts.getCombinedNodeFlags(node) & 1 /* Let */);
+    }
+    ts.isLet = isLet;
+    function isSuperCall(n) {
+        return n.kind === 191 /* CallExpression */ && n.expression.kind === 98 /* SuperKeyword */;
+    }
+    ts.isSuperCall = isSuperCall;
+    function isImportCall(n) {
+        return n.kind === 191 /* CallExpression */ && n.expression.kind === 92 /* ImportKeyword */;
+    }
+    ts.isImportCall = isImportCall;
+    function isLiteralImportTypeNode(n) {
+        return ts.isImportTypeNode(n) && ts.isLiteralTypeNode(n.argument) && ts.isStringLiteral(n.argument.literal);
+    }
+    ts.isLiteralImportTypeNode = isLiteralImportTypeNode;
+    function isPrologueDirective(node) {
+        return node.kind === 221 /* ExpressionStatement */
+            && node.expression.kind === 10 /* StringLiteral */;
+    }
+    ts.isPrologueDirective = isPrologueDirective;
+    function getLeadingCommentRangesOfNode(node, sourceFileOfNode) {
+        return node.kind !== 11 /* JsxText */ ? ts.getLeadingCommentRanges(sourceFileOfNode.text, node.pos) : undefined;
+    }
+    ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode;
+    function getJSDocCommentRanges(node, text) {
+        var commentRanges = (node.kind === 151 /* Parameter */ ||
+            node.kind === 150 /* TypeParameter */ ||
+            node.kind === 196 /* FunctionExpression */ ||
+            node.kind === 197 /* ArrowFunction */ ||
+            node.kind === 195 /* ParenthesizedExpression */) ?
+            ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
+            ts.getLeadingCommentRanges(text, node.pos);
+        // True if the comment starts with '/**' but not if it is '/**/'
+        return ts.filter(commentRanges, function (comment) {
+            return text.charCodeAt(comment.pos + 1) === 42 /* asterisk */ &&
+                text.charCodeAt(comment.pos + 2) === 42 /* asterisk */ &&
+                text.charCodeAt(comment.pos + 3) !== 47 /* slash */;
+        });
+    }
+    ts.getJSDocCommentRanges = getJSDocCommentRanges;
+    ts.fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*<reference\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
+    var fullTripleSlashReferenceTypeReferenceDirectiveRegEx = /^(\/\/\/\s*<reference\s+types\s*=\s*)('|")(.+?)\2.*?\/>/;
+    ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
+    var defaultLibReferenceRegEx = /^(\/\/\/\s*<reference\s+no-default-lib\s*=\s*)('|")(.+?)\2\s*\/>/;
+    function isPartOfTypeNode(node) {
+        if (163 /* FirstTypeNode */ <= node.kind && node.kind <= 183 /* LastTypeNode */) {
+            return true;
+        }
+        switch (node.kind) {
+            case 120 /* AnyKeyword */:
+            case 143 /* UnknownKeyword */:
+            case 135 /* NumberKeyword */:
+            case 146 /* BigIntKeyword */:
+            case 138 /* StringKeyword */:
+            case 123 /* BooleanKeyword */:
+            case 139 /* SymbolKeyword */:
+            case 136 /* ObjectKeyword */:
+            case 141 /* UndefinedKeyword */:
+            case 132 /* NeverKeyword */:
+                return true;
+            case 106 /* VoidKeyword */:
+                return node.parent.kind !== 200 /* VoidExpression */;
+            case 211 /* ExpressionWithTypeArguments */:
+                return !isExpressionWithTypeArgumentsInClassExtendsClause(node);
+            case 150 /* TypeParameter */:
+                return node.parent.kind === 181 /* MappedType */ || node.parent.kind === 176 /* InferType */;
+            // Identifiers and qualified names may be type nodes, depending on their context. Climb
+            // above them to find the lowest container
+            case 72 /* Identifier */:
+                // If the identifier is the RHS of a qualified name, then it's a type iff its parent is.
+                if (node.parent.kind === 148 /* QualifiedName */ && node.parent.right === node) {
+                    node = node.parent;
+                }
+                else if (node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node) {
+                    node = node.parent;
+                }
+                // At this point, node is either a qualified name or an identifier
+                ts.Debug.assert(node.kind === 72 /* Identifier */ || node.kind === 148 /* QualifiedName */ || node.kind === 189 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
+            // falls through
+            case 148 /* QualifiedName */:
+            case 189 /* PropertyAccessExpression */:
+            case 100 /* ThisKeyword */: {
+                var parent = node.parent;
+                if (parent.kind === 167 /* TypeQuery */) {
+                    return false;
+                }
+                if (parent.kind === 183 /* ImportType */) {
+                    return !parent.isTypeOf;
+                }
+                // Do not recursively call isPartOfTypeNode on the parent. In the example:
+                //
+                //     let a: A.B.C;
+                //
+                // Calling isPartOfTypeNode would consider the qualified name A.B a type node.
+                // Only C and A.B.C are type nodes.
+                if (163 /* FirstTypeNode */ <= parent.kind && parent.kind <= 183 /* LastTypeNode */) {
+                    return true;
+                }
+                switch (parent.kind) {
+                    case 211 /* ExpressionWithTypeArguments */:
+                        return !isExpressionWithTypeArgumentsInClassExtendsClause(parent);
+                    case 150 /* TypeParameter */:
+                        return node === parent.constraint;
+                    case 303 /* JSDocTemplateTag */:
+                        return node === parent.constraint;
+                    case 154 /* PropertyDeclaration */:
+                    case 153 /* PropertySignature */:
+                    case 151 /* Parameter */:
+                    case 237 /* VariableDeclaration */:
+                        return node === parent.type;
+                    case 239 /* FunctionDeclaration */:
+                    case 196 /* FunctionExpression */:
+                    case 197 /* ArrowFunction */:
+                    case 157 /* Constructor */:
+                    case 156 /* MethodDeclaration */:
+                    case 155 /* MethodSignature */:
+                    case 158 /* GetAccessor */:
+                    case 159 /* SetAccessor */:
+                        return node === parent.type;
+                    case 160 /* CallSignature */:
+                    case 161 /* ConstructSignature */:
+                    case 162 /* IndexSignature */:
+                        return node === parent.type;
+                    case 194 /* TypeAssertionExpression */:
+                        return node === parent.type;
+                    case 191 /* CallExpression */:
+                    case 192 /* NewExpression */:
+                        return ts.contains(parent.typeArguments, node);
+                    case 193 /* TaggedTemplateExpression */:
+                        // TODO (drosen): TaggedTemplateExpressions may eventually support type arguments.
+                        return false;
+                }
+            }
+        }
+        return false;
+    }
+    ts.isPartOfTypeNode = isPartOfTypeNode;
+    function isChildOfNodeWithKind(node, kind) {
+        while (node) {
+            if (node.kind === kind) {
+                return true;
+            }
+            node = node.parent;
+        }
+        return false;
+    }
+    ts.isChildOfNodeWithKind = isChildOfNodeWithKind;
+    // Warning: This has the same semantics as the forEach family of functions,
+    //          in that traversal terminates in the event that 'visitor' supplies a truthy value.
+    function forEachReturnStatement(body, visitor) {
+        return traverse(body);
+        function traverse(node) {
+            switch (node.kind) {
+                case 230 /* ReturnStatement */:
+                    return visitor(node);
+                case 246 /* CaseBlock */:
+                case 218 /* Block */:
+                case 222 /* IfStatement */:
+                case 223 /* DoStatement */:
+                case 224 /* WhileStatement */:
+                case 225 /* ForStatement */:
+                case 226 /* ForInStatement */:
+                case 227 /* ForOfStatement */:
+                case 231 /* WithStatement */:
+                case 232 /* SwitchStatement */:
+                case 271 /* CaseClause */:
+                case 272 /* DefaultClause */:
+                case 233 /* LabeledStatement */:
+                case 235 /* TryStatement */:
+                case 274 /* CatchClause */:
+                    return ts.forEachChild(node, traverse);
+            }
+        }
+    }
+    ts.forEachReturnStatement = forEachReturnStatement;
+    function forEachYieldExpression(body, visitor) {
+        return traverse(body);
+        function traverse(node) {
+            switch (node.kind) {
+                case 207 /* YieldExpression */:
+                    visitor(node);
+                    var operand = node.expression;
+                    if (operand) {
+                        traverse(operand);
+                    }
+                    return;
+                case 243 /* EnumDeclaration */:
+                case 241 /* InterfaceDeclaration */:
+                case 244 /* ModuleDeclaration */:
+                case 242 /* TypeAliasDeclaration */:
+                case 240 /* ClassDeclaration */:
+                case 209 /* ClassExpression */:
+                    // These are not allowed inside a generator now, but eventually they may be allowed
+                    // as local types. Regardless, any yield statements contained within them should be
+                    // skipped in this traversal.
+                    return;
+                default:
+                    if (ts.isFunctionLike(node)) {
+                        if (node.name && node.name.kind === 149 /* ComputedPropertyName */) {
+                            // Note that we will not include methods/accessors of a class because they would require
+                            // first descending into the class. This is by design.
+                            traverse(node.name.expression);
+                            return;
+                        }
+                    }
+                    else if (!isPartOfTypeNode(node)) {
+                        // This is the general case, which should include mostly expressions and statements.
+                        // Also includes NodeArrays.
+                        ts.forEachChild(node, traverse);
+                    }
+            }
+        }
+    }
+    ts.forEachYieldExpression = forEachYieldExpression;
+    /**
+     * Gets the most likely element type for a TypeNode. This is not an exhaustive test
+     * as it assumes a rest argument can only be an array type (either T[], or Array<T>).
+     *
+     * @param node The type node.
+     */
+    function getRestParameterElementType(node) {
+        if (node && node.kind === 169 /* ArrayType */) {
+            return node.elementType;
+        }
+        else if (node && node.kind === 164 /* TypeReference */) {
+            return ts.singleOrUndefined(node.typeArguments);
+        }
+        else {
+            return undefined;
+        }
+    }
+    ts.getRestParameterElementType = getRestParameterElementType;
+    function getMembersOfDeclaration(node) {
+        switch (node.kind) {
+            case 241 /* InterfaceDeclaration */:
+            case 240 /* ClassDeclaration */:
+            case 209 /* ClassExpression */:
+            case 168 /* TypeLiteral */:
+                return node.members;
+            case 188 /* ObjectLiteralExpression */:
+                return node.properties;
+        }
+    }
+    ts.getMembersOfDeclaration = getMembersOfDeclaration;
+    function isVariableLike(node) {
+        if (node) {
+            switch (node.kind) {
+                case 186 /* BindingElement */:
+                case 278 /* EnumMember */:
+                case 151 /* Parameter */:
+                case 275 /* PropertyAssignment */:
+                case 154 /* PropertyDeclaration */:
+                case 153 /* PropertySignature */:
+                case 276 /* ShorthandPropertyAssignment */:
+                case 237 /* VariableDeclaration */:
+                    return true;
+            }
+        }
+        return false;
+    }
+    ts.isVariableLike = isVariableLike;
+    function isVariableLikeOrAccessor(node) {
+        return isVariableLike(node) || ts.isAccessor(node);
+    }
+    ts.isVariableLikeOrAccessor = isVariableLikeOrAccessor;
+    function isVariableDeclarationInVariableStatement(node) {
+        return node.parent.kind === 238 /* VariableDeclarationList */
+            && node.parent.parent.kind === 219 /* VariableStatement */;
+    }
+    ts.isVariableDeclarationInVariableStatement = isVariableDeclarationInVariableStatement;
+    function isValidESSymbolDeclaration(node) {
+        return ts.isVariableDeclaration(node) ? isVarConst(node) && ts.isIdentifier(node.name) && isVariableDeclarationInVariableStatement(node) :
+            ts.isPropertyDeclaration(node) ? hasReadonlyModifier(node) && hasStaticModifier(node) :
+                ts.isPropertySignature(node) && hasReadonlyModifier(node);
+    }
+    ts.isValidESSymbolDeclaration = isValidESSymbolDeclaration;
+    function introducesArgumentsExoticObject(node) {
+        switch (node.kind) {
+            case 156 /* MethodDeclaration */:
+            case 155 /* MethodSignature */:
+            case 157 /* Constructor */:
+            case 158 /* GetAccessor */:
+            case 159 /* SetAccessor */:
+            case 239 /* FunctionDeclaration */:
+            case 196 /* FunctionExpression */:
+                return true;
+        }
+        return false;
+    }
+    ts.introducesArgumentsExoticObject = introducesArgumentsExoticObject;
+    function unwrapInnermostStatementOfLabel(node, beforeUnwrapLabelCallback) {
+        while (true) {
+            if (beforeUnwrapLabelCallback) {
+                beforeUnwrapLabelCallback(node);
+            }
+            if (node.statement.kind !== 233 /* LabeledStatement */) {
+                return node.statement;
+            }
+            node = node.statement;
+        }
+    }
+    ts.unwrapInnermostStatementOfLabel = unwrapInnermostStatementOfLabel;
+    function isFunctionBlock(node) {
+        return node && node.kind === 218 /* Block */ && ts.isFunctionLike(node.parent);
+    }
+    ts.isFunctionBlock = isFunctionBlock;
+    function isObjectLiteralMethod(node) {
+        return node && node.kind === 156 /* MethodDeclaration */ && node.parent.kind === 188 /* ObjectLiteralExpression */;
+    }
+    ts.isObjectLiteralMethod = isObjectLiteralMethod;
+    function isObjectLiteralOrClassExpressionMethod(node) {
+        return node.kind === 156 /* MethodDeclaration */ &&
+            (node.parent.kind === 188 /* ObjectLiteralExpression */ ||
+                node.parent.kind === 209 /* ClassExpression */);
+    }
+    ts.isObjectLiteralOrClassExpressionMethod = isObjectLiteralOrClassExpressionMethod;
+    function isIdentifierTypePredicate(predicate) {
+        return predicate && predicate.kind === 1 /* Identifier */;
+    }
+    ts.isIdentifierTypePredicate = isIdentifierTypePredicate;
+    function isThisTypePredicate(predicate) {
+        return predicate && predicate.kind === 0 /* This */;
+    }
+    ts.isThisTypePredicate = isThisTypePredicate;
+    function getPropertyAssignment(objectLiteral, key, key2) {
+        return objectLiteral.properties.filter(function (property) {
+            if (property.kind === 275 /* PropertyAssignment */) {
+                var propName = getTextOfPropertyName(property.name);
+                return key === propName || (!!key2 && key2 === propName);
+            }
+            return false;
+        });
+    }
+    ts.getPropertyAssignment = getPropertyAssignment;
+    function getTsConfigObjectLiteralExpression(tsConfigSourceFile) {
+        if (tsConfigSourceFile && tsConfigSourceFile.statements.length) {
+            var expression = tsConfigSourceFile.statements[0].expression;
+            return ts.tryCast(expression, ts.isObjectLiteralExpression);
+        }
+    }
+    ts.getTsConfigObjectLiteralExpression = getTsConfigObjectLiteralExpression;
+    function getTsConfigPropArrayElementValue(tsConfigSourceFile, propKey, elementValue) {
+        return ts.firstDefined(getTsConfigPropArray(tsConfigSourceFile, propKey), function (property) {
+            return ts.isArrayLiteralExpression(property.initializer) ?
+                ts.find(property.initializer.elements, function (element) { return ts.isStringLiteral(element) && element.text === elementValue; }) :
+                undefined;
+        });
+    }
+    ts.getTsConfigPropArrayElementValue = getTsConfigPropArrayElementValue;
+    function getTsConfigPropArray(tsConfigSourceFile, propKey) {
+        var jsonObjectLiteral = getTsConfigObjectLiteralExpression(tsConfigSourceFile);
+        return jsonObjectLiteral ? getPropertyAssignment(jsonObjectLiteral, propKey) : ts.emptyArray;
+    }
+    ts.getTsConfigPropArray = getTsConfigPropArray;
+    function getContainingFunction(node) {
+        return findAncestor(node.parent, ts.isFunctionLike);
+    }
+    ts.getContainingFunction = getContainingFunction;
+    function getContainingClass(node) {
+        return findAncestor(node.parent, ts.isClassLike);
+    }
+    ts.getContainingClass = getContainingClass;
+    function getThisContainer(node, includeArrowFunctions) {
+        ts.Debug.assert(node.kind !== 279 /* SourceFile */);
+        while (true) {
+            node = node.parent;
+            if (!node) {
+                return ts.Debug.fail(); // If we never pass in a SourceFile, this should be unreachable, since we'll stop when we reach that.
+            }
+            switch (node.kind) {
+                case 149 /* ComputedPropertyName */:
+                    // If the grandparent node is an object literal (as opposed to a class),
+                    // then the computed property is not a 'this' container.
+                    // A computed property name in a class needs to be a this container
+                    // so that we can error on it.
+                    if (ts.isClassLike(node.parent.parent)) {
+                        return node;
+                    }
+                    // If this is a computed property, then the parent should not
+                    // make it a this container. The parent might be a property
+                    // in an object literal, like a method or accessor. But in order for
+                    // such a parent to be a this container, the reference must be in
+                    // the *body* of the container.
+                    node = node.parent;
+                    break;
+                case 152 /* Decorator */:
+                    // Decorators are always applied outside of the body of a class or method.
+                    if (node.parent.kind === 151 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
+                        // If the decorator's parent is a Parameter, we resolve the this container from
+                        // the grandparent class declaration.
+                        node = node.parent.parent;
+                    }
+                    else if (ts.isClassElement(node.parent)) {
+                        // If the decorator's parent is a class element, we resolve the 'this' container
+                        // from the parent class declaration.
+                        node = node.parent;
+                    }
+                    break;
+                case 197 /* ArrowFunction */:
+                    if (!includeArrowFunctions) {
+                        continue;
+                    }
+                // falls through
+                case 239 /* FunctionDeclaration */:
+                case 196 /* FunctionExpression */:
+                case 244 /* ModuleDeclaration */:
+                case 154 /* PropertyDeclaration */:
+                case 153 /* PropertySignature */:
+                case 156 /* MethodDeclaration */:
+                case 155 /* MethodSignature */:
+                case 157 /* Constructor */:
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                case 160 /* CallSignature */:
+                case 161 /* ConstructSignature */:
+                case 162 /* IndexSignature */:
+                case 243 /* EnumDeclaration */:
+                case 279 /* SourceFile */:
+                    return node;
+            }
+        }
+    }
+    ts.getThisContainer = getThisContainer;
+    function getNewTargetContainer(node) {
+        var container = getThisContainer(node, /*includeArrowFunctions*/ false);
+        if (container) {
+            switch (container.kind) {
+                case 157 /* Constructor */:
+                case 239 /* FunctionDeclaration */:
+                case 196 /* FunctionExpression */:
+                    return container;
+            }
+        }
+        return undefined;
+    }
+    ts.getNewTargetContainer = getNewTargetContainer;
+    /**
+     * Given an super call/property node, returns the closest node where
+     * - a super call/property access is legal in the node and not legal in the parent node the node.
+     *   i.e. super call is legal in constructor but not legal in the class body.
+     * - the container is an arrow function (so caller might need to call getSuperContainer again in case it needs to climb higher)
+     * - a super call/property is definitely illegal in the container (but might be legal in some subnode)
+     *   i.e. super property access is illegal in function declaration but can be legal in the statement list
+     */
+    function getSuperContainer(node, stopOnFunctions) {
+        while (true) {
+            node = node.parent;
+            if (!node) {
+                return node;
+            }
+            switch (node.kind) {
+                case 149 /* ComputedPropertyName */:
+                    node = node.parent;
+                    break;
+                case 239 /* FunctionDeclaration */:
+                case 196 /* FunctionExpression */:
+                case 197 /* ArrowFunction */:
+                    if (!stopOnFunctions) {
+                        continue;
+                    }
+                // falls through
+                case 154 /* PropertyDeclaration */:
+                case 153 /* PropertySignature */:
+                case 156 /* MethodDeclaration */:
+                case 155 /* MethodSignature */:
+                case 157 /* Constructor */:
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                    return node;
+                case 152 /* Decorator */:
+                    // Decorators are always applied outside of the body of a class or method.
+                    if (node.parent.kind === 151 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
+                        // If the decorator's parent is a Parameter, we resolve the this container from
+                        // the grandparent class declaration.
+                        node = node.parent.parent;
+                    }
+                    else if (ts.isClassElement(node.parent)) {
+                        // If the decorator's parent is a class element, we resolve the 'this' container
+                        // from the parent class declaration.
+                        node = node.parent;
+                    }
+                    break;
+            }
+        }
+    }
+    ts.getSuperContainer = getSuperContainer;
+    function getImmediatelyInvokedFunctionExpression(func) {
+        if (func.kind === 196 /* FunctionExpression */ || func.kind === 197 /* ArrowFunction */) {
+            var prev = func;
+            var parent = func.parent;
+            while (parent.kind === 195 /* ParenthesizedExpression */) {
+                prev = parent;
+                parent = parent.parent;
+            }
+            if (parent.kind === 191 /* CallExpression */ && parent.expression === prev) {
+                return parent;
+            }
+        }
+    }
+    ts.getImmediatelyInvokedFunctionExpression = getImmediatelyInvokedFunctionExpression;
+    /**
+     * Determines whether a node is a property or element access expression for `super`.
+     */
+    function isSuperProperty(node) {
+        var kind = node.kind;
+        return (kind === 189 /* PropertyAccessExpression */ || kind === 190 /* ElementAccessExpression */)
+            && node.expression.kind === 98 /* SuperKeyword */;
+    }
+    ts.isSuperProperty = isSuperProperty;
+    /**
+     * Determines whether a node is a property or element access expression for `this`.
+     */
+    function isThisProperty(node) {
+        var kind = node.kind;
+        return (kind === 189 /* PropertyAccessExpression */ || kind === 190 /* ElementAccessExpression */)
+            && node.expression.kind === 100 /* ThisKeyword */;
+    }
+    ts.isThisProperty = isThisProperty;
+    function getEntityNameFromTypeNode(node) {
+        switch (node.kind) {
+            case 164 /* TypeReference */:
+                return node.typeName;
+            case 211 /* ExpressionWithTypeArguments */:
+                return isEntityNameExpression(node.expression)
+                    ? node.expression
+                    : undefined;
+            case 72 /* Identifier */:
+            case 148 /* QualifiedName */:
+                return node;
+        }
+        return undefined;
+    }
+    ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode;
+    function getInvokedExpression(node) {
+        switch (node.kind) {
+            case 193 /* TaggedTemplateExpression */:
+                return node.tag;
+            case 262 /* JsxOpeningElement */:
+            case 261 /* JsxSelfClosingElement */:
+                return node.tagName;
+            default:
+                return node.expression;
+        }
+    }
+    ts.getInvokedExpression = getInvokedExpression;
+    function nodeCanBeDecorated(node, parent, grandparent) {
+        switch (node.kind) {
+            case 240 /* ClassDeclaration */:
+                // classes are valid targets
+                return true;
+            case 154 /* PropertyDeclaration */:
+                // property declarations are valid if their parent is a class declaration.
+                return parent.kind === 240 /* ClassDeclaration */;
+            case 158 /* GetAccessor */:
+            case 159 /* SetAccessor */:
+            case 156 /* MethodDeclaration */:
+                // if this method has a body and its parent is a class declaration, this is a valid target.
+                return node.body !== undefined
+                    && parent.kind === 240 /* ClassDeclaration */;
+            case 151 /* Parameter */:
+                // if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target;
+                return parent.body !== undefined
+                    && (parent.kind === 157 /* Constructor */
+                        || parent.kind === 156 /* MethodDeclaration */
+                        || parent.kind === 159 /* SetAccessor */)
+                    && grandparent.kind === 240 /* ClassDeclaration */;
+        }
+        return false;
+    }
+    ts.nodeCanBeDecorated = nodeCanBeDecorated;
+    function nodeIsDecorated(node, parent, grandparent) {
+        return node.decorators !== undefined
+            && nodeCanBeDecorated(node, parent, grandparent); // TODO: GH#18217
+    }
+    ts.nodeIsDecorated = nodeIsDecorated;
+    function nodeOrChildIsDecorated(node, parent, grandparent) {
+        return nodeIsDecorated(node, parent, grandparent) || childIsDecorated(node, parent); // TODO: GH#18217
+    }
+    ts.nodeOrChildIsDecorated = nodeOrChildIsDecorated;
+    function childIsDecorated(node, parent) {
+        switch (node.kind) {
+            case 240 /* ClassDeclaration */:
+                return ts.some(node.members, function (m) { return nodeOrChildIsDecorated(m, node, parent); }); // TODO: GH#18217
+            case 156 /* MethodDeclaration */:
+            case 159 /* SetAccessor */:
+                return ts.some(node.parameters, function (p) { return nodeIsDecorated(p, node, parent); }); // TODO: GH#18217
+            default:
+                return false;
+        }
+    }
+    ts.childIsDecorated = childIsDecorated;
+    function isJSXTagName(node) {
+        var parent = node.parent;
+        if (parent.kind === 262 /* JsxOpeningElement */ ||
+            parent.kind === 261 /* JsxSelfClosingElement */ ||
+            parent.kind === 263 /* JsxClosingElement */) {
+            return parent.tagName === node;
+        }
+        return false;
+    }
+    ts.isJSXTagName = isJSXTagName;
+    function isExpressionNode(node) {
+        switch (node.kind) {
+            case 98 /* SuperKeyword */:
+            case 96 /* NullKeyword */:
+            case 102 /* TrueKeyword */:
+            case 87 /* FalseKeyword */:
+            case 13 /* RegularExpressionLiteral */:
+            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ObjectLiteralExpression */:
+            case 189 /* PropertyAccessExpression */:
+            case 190 /* ElementAccessExpression */:
+            case 191 /* CallExpression */:
+            case 192 /* NewExpression */:
+            case 193 /* TaggedTemplateExpression */:
+            case 212 /* AsExpression */:
+            case 194 /* TypeAssertionExpression */:
+            case 213 /* NonNullExpression */:
+            case 195 /* ParenthesizedExpression */:
+            case 196 /* FunctionExpression */:
+            case 209 /* ClassExpression */:
+            case 197 /* ArrowFunction */:
+            case 200 /* VoidExpression */:
+            case 198 /* DeleteExpression */:
+            case 199 /* TypeOfExpression */:
+            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PostfixUnaryExpression */:
+            case 204 /* BinaryExpression */:
+            case 205 /* ConditionalExpression */:
+            case 208 /* SpreadElement */:
+            case 206 /* TemplateExpression */:
+            case 14 /* NoSubstitutionTemplateLiteral */:
+            case 210 /* OmittedExpression */:
+            case 260 /* JsxElement */:
+            case 261 /* JsxSelfClosingElement */:
+            case 264 /* JsxFragment */:
+            case 207 /* YieldExpression */:
+            case 201 /* AwaitExpression */:
+            case 214 /* MetaProperty */:
+                return true;
+            case 148 /* QualifiedName */:
+                while (node.parent.kind === 148 /* QualifiedName */) {
+                    node = node.parent;
+                }
+                return node.parent.kind === 167 /* TypeQuery */ || isJSXTagName(node);
+            case 72 /* Identifier */:
+                if (node.parent.kind === 167 /* TypeQuery */ || isJSXTagName(node)) {
+                    return true;
+                }
+            // falls through
+            case 8 /* NumericLiteral */:
+            case 9 /* BigIntLiteral */:
+            case 10 /* StringLiteral */:
+            case 100 /* ThisKeyword */:
+                return isInExpressionContext(node);
+            default:
+                return false;
+        }
+    }
+    ts.isExpressionNode = isExpressionNode;
+    function isInExpressionContext(node) {
+        var parent = node.parent;
+        switch (parent.kind) {
+            case 237 /* VariableDeclaration */:
+            case 151 /* Parameter */:
+            case 154 /* PropertyDeclaration */:
+            case 153 /* PropertySignature */:
+            case 278 /* EnumMember */:
+            case 275 /* PropertyAssignment */:
+            case 186 /* BindingElement */:
+                return parent.initializer === node;
+            case 221 /* ExpressionStatement */:
+            case 222 /* IfStatement */:
+            case 223 /* DoStatement */:
+            case 224 /* WhileStatement */:
+            case 230 /* ReturnStatement */:
+            case 231 /* WithStatement */:
+            case 232 /* SwitchStatement */:
+            case 271 /* CaseClause */:
+            case 234 /* ThrowStatement */:
+                return parent.expression === node;
+            case 225 /* ForStatement */:
+                var forStatement = parent;
+                return (forStatement.initializer === node && forStatement.initializer.kind !== 238 /* VariableDeclarationList */) ||
+                    forStatement.condition === node ||
+                    forStatement.incrementor === node;
+            case 226 /* ForInStatement */:
+            case 227 /* ForOfStatement */:
+                var forInStatement = parent;
+                return (forInStatement.initializer === node && forInStatement.initializer.kind !== 238 /* VariableDeclarationList */) ||
+                    forInStatement.expression === node;
+            case 194 /* TypeAssertionExpression */:
+            case 212 /* AsExpression */:
+                return node === parent.expression;
+            case 216 /* TemplateSpan */:
+                return node === parent.expression;
+            case 149 /* ComputedPropertyName */:
+                return node === parent.expression;
+            case 152 /* Decorator */:
+            case 270 /* JsxExpression */:
+            case 269 /* JsxSpreadAttribute */:
+            case 277 /* SpreadAssignment */:
+                return true;
+            case 211 /* ExpressionWithTypeArguments */:
+                return parent.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent);
+            case 276 /* ShorthandPropertyAssignment */:
+                return parent.objectAssignmentInitializer === node;
+            default:
+                return isExpressionNode(parent);
+        }
+    }
+    ts.isInExpressionContext = isInExpressionContext;
+    function isExternalModuleImportEqualsDeclaration(node) {
+        return node.kind === 248 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 259 /* ExternalModuleReference */;
+    }
+    ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
+    function getExternalModuleImportEqualsDeclarationExpression(node) {
+        ts.Debug.assert(isExternalModuleImportEqualsDeclaration(node));
+        return node.moduleReference.expression;
+    }
+    ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
+    function isInternalModuleImportEqualsDeclaration(node) {
+        return node.kind === 248 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 259 /* ExternalModuleReference */;
+    }
+    ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
+    function isSourceFileJS(file) {
+        return isInJSFile(file);
+    }
+    ts.isSourceFileJS = isSourceFileJS;
+    function isSourceFileNotJS(file) {
+        return !isInJSFile(file);
+    }
+    ts.isSourceFileNotJS = isSourceFileNotJS;
+    function isInJSFile(node) {
+        return !!node && !!(node.flags & 65536 /* JavaScriptFile */);
+    }
+    ts.isInJSFile = isInJSFile;
+    function isInJsonFile(node) {
+        return !!node && !!(node.flags & 16777216 /* JsonFile */);
+    }
+    ts.isInJsonFile = isInJsonFile;
+    function isInJSDoc(node) {
+        return !!node && !!(node.flags & 2097152 /* JSDoc */);
+    }
+    ts.isInJSDoc = isInJSDoc;
+    function isJSDocIndexSignature(node) {
+        return ts.isTypeReferenceNode(node) &&
+            ts.isIdentifier(node.typeName) &&
+            node.typeName.escapedText === "Object" &&
+            node.typeArguments && node.typeArguments.length === 2 &&
+            (node.typeArguments[0].kind === 138 /* StringKeyword */ || node.typeArguments[0].kind === 135 /* NumberKeyword */);
+    }
+    ts.isJSDocIndexSignature = isJSDocIndexSignature;
+    function isRequireCall(callExpression, checkArgumentIsStringLiteralLike) {
+        if (callExpression.kind !== 191 /* CallExpression */) {
+            return false;
+        }
+        var _a = callExpression, expression = _a.expression, args = _a.arguments;
+        if (expression.kind !== 72 /* Identifier */ || expression.escapedText !== "require") {
+            return false;
+        }
+        if (args.length !== 1) {
+            return false;
+        }
+        var arg = args[0];
+        return !checkArgumentIsStringLiteralLike || ts.isStringLiteralLike(arg);
+    }
+    ts.isRequireCall = isRequireCall;
+    function isSingleOrDoubleQuote(charCode) {
+        return charCode === 39 /* singleQuote */ || charCode === 34 /* doubleQuote */;
+    }
+    ts.isSingleOrDoubleQuote = isSingleOrDoubleQuote;
+    function isStringDoubleQuoted(str, sourceFile) {
+        return getSourceTextOfNodeFromSourceFile(sourceFile, str).charCodeAt(0) === 34 /* doubleQuote */;
+    }
+    ts.isStringDoubleQuoted = isStringDoubleQuoted;
+    function getDeclarationOfExpando(node) {
+        if (!node.parent) {
+            return undefined;
+        }
+        var name;
+        var decl;
+        if (ts.isVariableDeclaration(node.parent) && node.parent.initializer === node) {
+            if (!isInJSFile(node) && !isVarConst(node.parent)) {
+                return undefined;
+            }
+            name = node.parent.name;
+            decl = node.parent;
+        }
+        else if (ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 59 /* EqualsToken */ && node.parent.right === node) {
+            name = node.parent.left;
+            decl = name;
+        }
+        else if (ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 55 /* BarBarToken */) {
+            if (ts.isVariableDeclaration(node.parent.parent) && node.parent.parent.initializer === node.parent) {
+                name = node.parent.parent.name;
+                decl = node.parent.parent;
+            }
+            else if (ts.isBinaryExpression(node.parent.parent) && node.parent.parent.operatorToken.kind === 59 /* EqualsToken */ && node.parent.parent.right === node.parent) {
+                name = node.parent.parent.left;
+                decl = name;
+            }
+            if (!name || !isEntityNameExpression(name) || !isSameEntityName(name, node.parent.left)) {
+                return undefined;
+            }
+        }
+        if (!name || !getExpandoInitializer(node, isPrototypeAccess(name))) {
+            return undefined;
+        }
+        return decl;
+    }
+    ts.getDeclarationOfExpando = getDeclarationOfExpando;
+    function isAssignmentDeclaration(decl) {
+        return ts.isBinaryExpression(decl) || ts.isPropertyAccessExpression(decl) || ts.isIdentifier(decl) || ts.isCallExpression(decl);
+    }
+    ts.isAssignmentDeclaration = isAssignmentDeclaration;
+    /** Get the initializer, taking into account defaulted Javascript initializers */
+    function getEffectiveInitializer(node) {
+        if (isInJSFile(node) && node.initializer &&
+            ts.isBinaryExpression(node.initializer) && node.initializer.operatorToken.kind === 55 /* BarBarToken */ &&
+            node.name && isEntityNameExpression(node.name) && isSameEntityName(node.name, node.initializer.left)) {
+            return node.initializer.right;
+        }
+        return node.initializer;
+    }
+    ts.getEffectiveInitializer = getEffectiveInitializer;
+    /** Get the declaration initializer when it is container-like (See getExpandoInitializer). */
+    function getDeclaredExpandoInitializer(node) {
+        var init = getEffectiveInitializer(node);
+        return init && getExpandoInitializer(init, isPrototypeAccess(node.name));
+    }
+    ts.getDeclaredExpandoInitializer = getDeclaredExpandoInitializer;
+    function hasExpandoValueProperty(node, isPrototypeAssignment) {
+        return ts.forEach(node.properties, function (p) { return ts.isPropertyAssignment(p) && ts.isIdentifier(p.name) && p.name.escapedText === "value" && p.initializer && getExpandoInitializer(p.initializer, isPrototypeAssignment); });
+    }
+    /**
+     * Get the assignment 'initializer' -- the righthand side-- when the initializer is container-like (See getExpandoInitializer).
+     * We treat the right hand side of assignments with container-like initalizers as declarations.
+     */
+    function getAssignedExpandoInitializer(node) {
+        if (node && node.parent && ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 59 /* EqualsToken */) {
+            var isPrototypeAssignment = isPrototypeAccess(node.parent.left);
+            return getExpandoInitializer(node.parent.right, isPrototypeAssignment) ||
+                getDefaultedExpandoInitializer(node.parent.left, node.parent.right, isPrototypeAssignment);
+        }
+        if (node && ts.isCallExpression(node) && isBindableObjectDefinePropertyCall(node)) {
+            var result = hasExpandoValueProperty(node.arguments[2], node.arguments[1].text === "prototype");
+            if (result) {
+                return result;
+            }
+        }
+    }
+    ts.getAssignedExpandoInitializer = getAssignedExpandoInitializer;
+    /**
+     * Recognized expando initializers are:
+     * 1. (function() {})() -- IIFEs
+     * 2. function() { } -- Function expressions
+     * 3. class { } -- Class expressions
+     * 4. {} -- Empty object literals
+     * 5. { ... } -- Non-empty object literals, when used to initialize a prototype, like `C.prototype = { m() { } }`
+     *
+     * This function returns the provided initializer, or undefined if it is not valid.
+     */
+    function getExpandoInitializer(initializer, isPrototypeAssignment) {
+        if (ts.isCallExpression(initializer)) {
+            var e = skipParentheses(initializer.expression);
+            return e.kind === 196 /* FunctionExpression */ || e.kind === 197 /* ArrowFunction */ ? initializer : undefined;
+        }
+        if (initializer.kind === 196 /* FunctionExpression */ ||
+            initializer.kind === 209 /* ClassExpression */ ||
+            initializer.kind === 197 /* ArrowFunction */) {
+            return initializer;
+        }
+        if (ts.isObjectLiteralExpression(initializer) && (initializer.properties.length === 0 || isPrototypeAssignment)) {
+            return initializer;
+        }
+    }
+    ts.getExpandoInitializer = getExpandoInitializer;
+    /**
+     * A defaulted expando initializer matches the pattern
+     * `Lhs = Lhs || ExpandoInitializer`
+     * or `var Lhs = Lhs || ExpandoInitializer`
+     *
+     * The second Lhs is required to be the same as the first except that it may be prefixed with
+     * 'window.', 'global.' or 'self.' The second Lhs is otherwise ignored by the binder and checker.
+     */
+    function getDefaultedExpandoInitializer(name, initializer, isPrototypeAssignment) {
+        var e = ts.isBinaryExpression(initializer) && initializer.operatorToken.kind === 55 /* BarBarToken */ && getExpandoInitializer(initializer.right, isPrototypeAssignment);
+        if (e && isSameEntityName(name, initializer.left)) {
+            return e;
+        }
+    }
+    function isDefaultedExpandoInitializer(node) {
+        var name = ts.isVariableDeclaration(node.parent) ? node.parent.name :
+            ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 59 /* EqualsToken */ ? node.parent.left :
+                undefined;
+        return name && getExpandoInitializer(node.right, isPrototypeAccess(name)) && isEntityNameExpression(name) && isSameEntityName(name, node.left);
+    }
+    ts.isDefaultedExpandoInitializer = isDefaultedExpandoInitializer;
+    /** Given an expando initializer, return its declaration name, or the left-hand side of the assignment if it's part of an assignment declaration. */
+    function getNameOfExpando(node) {
+        if (ts.isBinaryExpression(node.parent)) {
+            var parent = (node.parent.operatorToken.kind === 55 /* BarBarToken */ && ts.isBinaryExpression(node.parent.parent)) ? node.parent.parent : node.parent;
+            if (parent.operatorToken.kind === 59 /* EqualsToken */ && ts.isIdentifier(parent.left)) {
+                return parent.left;
+            }
+        }
+        else if (ts.isVariableDeclaration(node.parent)) {
+            return node.parent.name;
+        }
+    }
+    ts.getNameOfExpando = getNameOfExpando;
+    /**
+     * Is the 'declared' name the same as the one in the initializer?
+     * @return true for identical entity names, as well as ones where the initializer is prefixed with
+     * 'window', 'self' or 'global'. For example:
+     *
+     * var my = my || {}
+     * var min = window.min || {}
+     * my.app = self.my.app || class { }
+     */
+    function isSameEntityName(name, initializer) {
+        if (ts.isIdentifier(name) && ts.isIdentifier(initializer)) {
+            return name.escapedText === initializer.escapedText;
+        }
+        if (ts.isIdentifier(name) && ts.isPropertyAccessExpression(initializer)) {
+            return (initializer.expression.kind === 100 /* ThisKeyword */ ||
+                ts.isIdentifier(initializer.expression) &&
+                    (initializer.expression.escapedText === "window" ||
+                        initializer.expression.escapedText === "self" ||
+                        initializer.expression.escapedText === "global")) &&
+                isSameEntityName(name, initializer.name);
+        }
+        if (ts.isPropertyAccessExpression(name) && ts.isPropertyAccessExpression(initializer)) {
+            return name.name.escapedText === initializer.name.escapedText && isSameEntityName(name.expression, initializer.expression);
+        }
+        return false;
+    }
+    function getRightMostAssignedExpression(node) {
+        while (isAssignmentExpression(node, /*excludeCompoundAssignments*/ true)) {
+            node = node.right;
+        }
+        return node;
+    }
+    ts.getRightMostAssignedExpression = getRightMostAssignedExpression;
+    function isExportsIdentifier(node) {
+        return ts.isIdentifier(node) && node.escapedText === "exports";
+    }
+    ts.isExportsIdentifier = isExportsIdentifier;
+    function isModuleExportsPropertyAccessExpression(node) {
+        return ts.isPropertyAccessExpression(node) && ts.isIdentifier(node.expression) && node.expression.escapedText === "module" && node.name.escapedText === "exports";
+    }
+    ts.isModuleExportsPropertyAccessExpression = isModuleExportsPropertyAccessExpression;
+    /// Given a BinaryExpression, returns SpecialPropertyAssignmentKind for the various kinds of property
+    /// assignments we treat as special in the binder
+    function getAssignmentDeclarationKind(expr) {
+        var special = getAssignmentDeclarationKindWorker(expr);
+        return special === 5 /* Property */ || isInJSFile(expr) ? special : 0 /* None */;
+    }
+    ts.getAssignmentDeclarationKind = getAssignmentDeclarationKind;
+    function isBindableObjectDefinePropertyCall(expr) {
+        return ts.length(expr.arguments) === 3 &&
+            ts.isPropertyAccessExpression(expr.expression) &&
+            ts.isIdentifier(expr.expression.expression) &&
+            ts.idText(expr.expression.expression) === "Object" &&
+            ts.idText(expr.expression.name) === "defineProperty" &&
+            isStringOrNumericLiteralLike(expr.arguments[1]) &&
+            isEntityNameExpression(expr.arguments[0]);
+    }
+    ts.isBindableObjectDefinePropertyCall = isBindableObjectDefinePropertyCall;
+    function getAssignmentDeclarationKindWorker(expr) {
+        if (ts.isCallExpression(expr)) {
+            if (!isBindableObjectDefinePropertyCall(expr)) {
+                return 0 /* None */;
+            }
+            var entityName = expr.arguments[0];
+            if (isExportsIdentifier(entityName) || isModuleExportsPropertyAccessExpression(entityName)) {
+                return 8 /* ObjectDefinePropertyExports */;
+            }
+            if (ts.isPropertyAccessExpression(entityName) && entityName.name.escapedText === "prototype" && isEntityNameExpression(entityName.expression)) {
+                return 9 /* ObjectDefinePrototypeProperty */;
+            }
+            return 7 /* ObjectDefinePropertyValue */;
+        }
+        if (expr.operatorToken.kind !== 59 /* EqualsToken */ ||
+            !ts.isPropertyAccessExpression(expr.left)) {
+            return 0 /* None */;
+        }
+        var lhs = expr.left;
+        if (isEntityNameExpression(lhs.expression) && lhs.name.escapedText === "prototype" && ts.isObjectLiteralExpression(getInitializerOfBinaryExpression(expr))) {
+            // F.prototype = { ... }
+            return 6 /* Prototype */;
+        }
+        return getAssignmentDeclarationPropertyAccessKind(lhs);
+    }
+    function getAssignmentDeclarationPropertyAccessKind(lhs) {
+        if (lhs.expression.kind === 100 /* ThisKeyword */) {
+            return 4 /* ThisProperty */;
+        }
+        else if (isModuleExportsPropertyAccessExpression(lhs)) {
+            // module.exports = expr
+            return 2 /* ModuleExports */;
+        }
+        else if (isEntityNameExpression(lhs.expression)) {
+            if (isPrototypeAccess(lhs.expression)) {
+                // F.G....prototype.x = expr
+                return 3 /* PrototypeProperty */;
+            }
+            var nextToLast = lhs;
+            while (ts.isPropertyAccessExpression(nextToLast.expression)) {
+                nextToLast = nextToLast.expression;
+            }
+            ts.Debug.assert(ts.isIdentifier(nextToLast.expression));
+            var id = nextToLast.expression;
+            if (id.escapedText === "exports" ||
+                id.escapedText === "module" && nextToLast.name.escapedText === "exports") {
+                // exports.name = expr OR module.exports.name = expr
+                return 1 /* ExportsProperty */;
+            }
+            // F.G...x = expr
+            return 5 /* Property */;
+        }
+        return 0 /* None */;
+    }
+    ts.getAssignmentDeclarationPropertyAccessKind = getAssignmentDeclarationPropertyAccessKind;
+    function getInitializerOfBinaryExpression(expr) {
+        while (ts.isBinaryExpression(expr.right)) {
+            expr = expr.right;
+        }
+        return expr.right;
+    }
+    ts.getInitializerOfBinaryExpression = getInitializerOfBinaryExpression;
+    function isPrototypePropertyAssignment(node) {
+        return ts.isBinaryExpression(node) && getAssignmentDeclarationKind(node) === 3 /* PrototypeProperty */;
+    }
+    ts.isPrototypePropertyAssignment = isPrototypePropertyAssignment;
+    function isSpecialPropertyDeclaration(expr) {
+        return isInJSFile(expr) &&
+            expr.parent && expr.parent.kind === 221 /* ExpressionStatement */ &&
+            !!ts.getJSDocTypeTag(expr.parent);
+    }
+    ts.isSpecialPropertyDeclaration = isSpecialPropertyDeclaration;
+    function isFunctionSymbol(symbol) {
+        if (!symbol || !symbol.valueDeclaration) {
+            return false;
+        }
+        var decl = symbol.valueDeclaration;
+        return decl.kind === 239 /* FunctionDeclaration */ || ts.isVariableDeclaration(decl) && decl.initializer && ts.isFunctionLike(decl.initializer);
+    }
+    ts.isFunctionSymbol = isFunctionSymbol;
+    function importFromModuleSpecifier(node) {
+        return tryGetImportFromModuleSpecifier(node) || ts.Debug.fail(ts.Debug.showSyntaxKind(node.parent));
+    }
+    ts.importFromModuleSpecifier = importFromModuleSpecifier;
+    function tryGetImportFromModuleSpecifier(node) {
+        switch (node.parent.kind) {
+            case 249 /* ImportDeclaration */:
+            case 255 /* ExportDeclaration */:
+                return node.parent;
+            case 259 /* ExternalModuleReference */:
+                return node.parent.parent;
+            case 191 /* CallExpression */:
+                return isImportCall(node.parent) || isRequireCall(node.parent, /*checkArg*/ false) ? node.parent : undefined;
+            case 182 /* LiteralType */:
+                ts.Debug.assert(ts.isStringLiteral(node));
+                return ts.tryCast(node.parent.parent, ts.isImportTypeNode);
+            default:
+                return undefined;
+        }
+    }
+    ts.tryGetImportFromModuleSpecifier = tryGetImportFromModuleSpecifier;
+    function getExternalModuleName(node) {
+        switch (node.kind) {
+            case 249 /* ImportDeclaration */:
+            case 255 /* ExportDeclaration */:
+                return node.moduleSpecifier;
+            case 248 /* ImportEqualsDeclaration */:
+                return node.moduleReference.kind === 259 /* ExternalModuleReference */ ? node.moduleReference.expression : undefined;
+            case 183 /* ImportType */:
+                return isLiteralImportTypeNode(node) ? node.argument.literal : undefined;
+            default:
+                return ts.Debug.assertNever(node);
+        }
+    }
+    ts.getExternalModuleName = getExternalModuleName;
+    function getNamespaceDeclarationNode(node) {
+        switch (node.kind) {
+            case 249 /* ImportDeclaration */:
+                return node.importClause && ts.tryCast(node.importClause.namedBindings, ts.isNamespaceImport);
+            case 248 /* ImportEqualsDeclaration */:
+                return node;
+            case 255 /* ExportDeclaration */:
+                return undefined;
+            default:
+                return ts.Debug.assertNever(node);
+        }
+    }
+    ts.getNamespaceDeclarationNode = getNamespaceDeclarationNode;
+    function isDefaultImport(node) {
+        return node.kind === 249 /* ImportDeclaration */ && !!node.importClause && !!node.importClause.name;
+    }
+    ts.isDefaultImport = isDefaultImport;
+    function hasQuestionToken(node) {
+        if (node) {
+            switch (node.kind) {
+                case 151 /* Parameter */:
+                case 156 /* MethodDeclaration */:
+                case 155 /* MethodSignature */:
+                case 276 /* ShorthandPropertyAssignment */:
+                case 275 /* PropertyAssignment */:
+                case 154 /* PropertyDeclaration */:
+                case 153 /* PropertySignature */:
+                    return node.questionToken !== undefined;
+            }
+        }
+        return false;
+    }
+    ts.hasQuestionToken = hasQuestionToken;
+    function isJSDocConstructSignature(node) {
+        var param = ts.isJSDocFunctionType(node) ? ts.firstOrUndefined(node.parameters) : undefined;
+        var name = ts.tryCast(param && param.name, ts.isIdentifier);
+        return !!name && name.escapedText === "new";
+    }
+    ts.isJSDocConstructSignature = isJSDocConstructSignature;
+    function isJSDocTypeAlias(node) {
+        return node.kind === 304 /* JSDocTypedefTag */ || node.kind === 297 /* JSDocCallbackTag */;
+    }
+    ts.isJSDocTypeAlias = isJSDocTypeAlias;
+    function isTypeAlias(node) {
+        return isJSDocTypeAlias(node) || ts.isTypeAliasDeclaration(node);
+    }
+    ts.isTypeAlias = isTypeAlias;
+    function getSourceOfAssignment(node) {
+        return ts.isExpressionStatement(node) &&
+            node.expression && ts.isBinaryExpression(node.expression) &&
+            node.expression.operatorToken.kind === 59 /* EqualsToken */
+            ? node.expression.right
+            : undefined;
+    }
+    function getSourceOfDefaultedAssignment(node) {
+        return ts.isExpressionStatement(node) &&
+            ts.isBinaryExpression(node.expression) &&
+            getAssignmentDeclarationKind(node.expression) !== 0 /* None */ &&
+            ts.isBinaryExpression(node.expression.right) &&
+            node.expression.right.operatorToken.kind === 55 /* BarBarToken */
+            ? node.expression.right.right
+            : undefined;
+    }
+    function getSingleInitializerOfVariableStatementOrPropertyDeclaration(node) {
+        switch (node.kind) {
+            case 219 /* VariableStatement */:
+                var v = getSingleVariableOfVariableStatement(node);
+                return v && v.initializer;
+            case 154 /* PropertyDeclaration */:
+                return node.initializer;
+            case 275 /* PropertyAssignment */:
+                return node.initializer;
+        }
+    }
+    ts.getSingleInitializerOfVariableStatementOrPropertyDeclaration = getSingleInitializerOfVariableStatementOrPropertyDeclaration;
+    function getSingleVariableOfVariableStatement(node) {
+        return ts.isVariableStatement(node) ? ts.firstOrUndefined(node.declarationList.declarations) : undefined;
+    }
+    function getNestedModuleDeclaration(node) {
+        return ts.isModuleDeclaration(node) &&
+            node.body &&
+            node.body.kind === 244 /* ModuleDeclaration */
+            ? node.body
+            : undefined;
+    }
+    function getJSDocCommentsAndTags(hostNode) {
+        var result;
+        // Pull parameter comments from declaring function as well
+        if (isVariableLike(hostNode) && ts.hasInitializer(hostNode) && ts.hasJSDocNodes(hostNode.initializer)) {
+            result = ts.addRange(result, hostNode.initializer.jsDoc);
+        }
+        var node = hostNode;
+        while (node && node.parent) {
+            if (ts.hasJSDocNodes(node)) {
+                result = ts.addRange(result, node.jsDoc);
+            }
+            if (node.kind === 151 /* Parameter */) {
+                result = ts.addRange(result, ts.getJSDocParameterTags(node));
+                break;
+            }
+            if (node.kind === 150 /* TypeParameter */) {
+                result = ts.addRange(result, ts.getJSDocTypeParameterTags(node));
+                break;
+            }
+            node = getNextJSDocCommentLocation(node);
+        }
+        return result || ts.emptyArray;
+    }
+    ts.getJSDocCommentsAndTags = getJSDocCommentsAndTags;
+    function getNextJSDocCommentLocation(node) {
+        var parent = node.parent;
+        if (parent.kind === 275 /* PropertyAssignment */ ||
+            parent.kind === 154 /* PropertyDeclaration */ ||
+            parent.kind === 221 /* ExpressionStatement */ && node.kind === 189 /* PropertyAccessExpression */ ||
+            getNestedModuleDeclaration(parent) ||
+            ts.isBinaryExpression(node) && node.operatorToken.kind === 59 /* EqualsToken */) {
+            return parent;
+        }
+        // Try to recognize this pattern when node is initializer of variable declaration and JSDoc comments are on containing variable statement.
+        // /**
+        //   * @param {number} name
+        //   * @returns {number}
+        //   */
+        // var x = function(name) { return name.length; }
+        else if (parent.parent &&
+            (getSingleVariableOfVariableStatement(parent.parent) === node ||
+                ts.isBinaryExpression(parent) && parent.operatorToken.kind === 59 /* EqualsToken */)) {
+            return parent.parent;
+        }
+        else if (parent.parent && parent.parent.parent &&
+            (getSingleVariableOfVariableStatement(parent.parent.parent) ||
+                getSingleInitializerOfVariableStatementOrPropertyDeclaration(parent.parent.parent) === node ||
+                getSourceOfDefaultedAssignment(parent.parent.parent))) {
+            return parent.parent.parent;
+        }
+    }
+    /** Does the opposite of `getJSDocParameterTags`: given a JSDoc parameter, finds the parameter corresponding to it. */
+    function getParameterSymbolFromJSDoc(node) {
+        if (node.symbol) {
+            return node.symbol;
+        }
+        if (!ts.isIdentifier(node.name)) {
+            return undefined;
+        }
+        var name = node.name.escapedText;
+        var decl = getHostSignatureFromJSDoc(node);
+        if (!decl) {
+            return undefined;
+        }
+        var parameter = ts.find(decl.parameters, function (p) { return p.name.kind === 72 /* Identifier */ && p.name.escapedText === name; });
+        return parameter && parameter.symbol;
+    }
+    ts.getParameterSymbolFromJSDoc = getParameterSymbolFromJSDoc;
+    function getHostSignatureFromJSDoc(node) {
+        return getHostSignatureFromJSDocHost(getJSDocHost(node));
+    }
+    ts.getHostSignatureFromJSDoc = getHostSignatureFromJSDoc;
+    function getHostSignatureFromJSDocHost(host) {
+        var decl = getSourceOfDefaultedAssignment(host) ||
+            getSourceOfAssignment(host) ||
+            getSingleInitializerOfVariableStatementOrPropertyDeclaration(host) ||
+            getSingleVariableOfVariableStatement(host) ||
+            getNestedModuleDeclaration(host) ||
+            host;
+        return decl && ts.isFunctionLike(decl) ? decl : undefined;
+    }
+    ts.getHostSignatureFromJSDocHost = getHostSignatureFromJSDocHost;
+    function getJSDocHost(node) {
+        return ts.Debug.assertDefined(findAncestor(node.parent, ts.isJSDoc)).parent;
+    }
+    ts.getJSDocHost = getJSDocHost;
+    function getTypeParameterFromJsDoc(node) {
+        var name = node.name.escapedText;
+        var typeParameters = node.parent.parent.parent.typeParameters;
+        return ts.find(typeParameters, function (p) { return p.name.escapedText === name; });
+    }
+    ts.getTypeParameterFromJsDoc = getTypeParameterFromJsDoc;
+    function hasRestParameter(s) {
+        var last = ts.lastOrUndefined(s.parameters);
+        return !!last && isRestParameter(last);
+    }
+    ts.hasRestParameter = hasRestParameter;
+    function isRestParameter(node) {
+        var type = ts.isJSDocParameterTag(node) ? (node.typeExpression && node.typeExpression.type) : node.type;
+        return node.dotDotDotToken !== undefined || !!type && type.kind === 290 /* JSDocVariadicType */;
+    }
+    ts.isRestParameter = isRestParameter;
+    var AssignmentKind;
+    (function (AssignmentKind) {
+        AssignmentKind[AssignmentKind["None"] = 0] = "None";
+        AssignmentKind[AssignmentKind["Definite"] = 1] = "Definite";
+        AssignmentKind[AssignmentKind["Compound"] = 2] = "Compound";
+    })(AssignmentKind = ts.AssignmentKind || (ts.AssignmentKind = {}));
+    function getAssignmentTargetKind(node) {
+        var parent = node.parent;
+        while (true) {
+            switch (parent.kind) {
+                case 204 /* BinaryExpression */:
+                    var binaryOperator = parent.operatorToken.kind;
+                    return isAssignmentOperator(binaryOperator) && parent.left === node ?
+                        binaryOperator === 59 /* EqualsToken */ ? 1 /* Definite */ : 2 /* Compound */ :
+                        0 /* None */;
+                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PostfixUnaryExpression */:
+                    var unaryOperator = parent.operator;
+                    return unaryOperator === 44 /* PlusPlusToken */ || unaryOperator === 45 /* MinusMinusToken */ ? 2 /* Compound */ : 0 /* None */;
+                case 226 /* ForInStatement */:
+                case 227 /* ForOfStatement */:
+                    return parent.initializer === node ? 1 /* Definite */ : 0 /* None */;
+                case 195 /* ParenthesizedExpression */:
+                case 187 /* ArrayLiteralExpression */:
+                case 208 /* SpreadElement */:
+                case 213 /* NonNullExpression */:
+                    node = parent;
+                    break;
+                case 276 /* ShorthandPropertyAssignment */:
+                    if (parent.name !== node) {
+                        return 0 /* None */;
+                    }
+                    node = parent.parent;
+                    break;
+                case 275 /* PropertyAssignment */:
+                    if (parent.name === node) {
+                        return 0 /* None */;
+                    }
+                    node = parent.parent;
+                    break;
+                default:
+                    return 0 /* None */;
+            }
+            parent = node.parent;
+        }
+    }
+    ts.getAssignmentTargetKind = getAssignmentTargetKind;
+    // A node is an assignment target if it is on the left hand side of an '=' token, if it is parented by a property
+    // assignment in an object literal that is an assignment target, or if it is parented by an array literal that is
+    // an assignment target. Examples include 'a = xxx', '{ p: a } = xxx', '[{ a }] = xxx'.
+    // (Note that `p` is not a target in the above examples, only `a`.)
+    function isAssignmentTarget(node) {
+        return getAssignmentTargetKind(node) !== 0 /* None */;
+    }
+    ts.isAssignmentTarget = isAssignmentTarget;
+    /**
+     * Indicates whether a node could contain a `var` VariableDeclarationList that contributes to
+     * the same `var` declaration scope as the node's parent.
+     */
+    function isNodeWithPossibleHoistedDeclaration(node) {
+        switch (node.kind) {
+            case 218 /* Block */:
+            case 219 /* VariableStatement */:
+            case 231 /* WithStatement */:
+            case 222 /* IfStatement */:
+            case 232 /* SwitchStatement */:
+            case 246 /* CaseBlock */:
+            case 271 /* CaseClause */:
+            case 272 /* DefaultClause */:
+            case 233 /* LabeledStatement */:
+            case 225 /* ForStatement */:
+            case 226 /* ForInStatement */:
+            case 227 /* ForOfStatement */:
+            case 223 /* DoStatement */:
+            case 224 /* WhileStatement */:
+            case 235 /* TryStatement */:
+            case 274 /* CatchClause */:
+                return true;
+        }
+        return false;
+    }
+    ts.isNodeWithPossibleHoistedDeclaration = isNodeWithPossibleHoistedDeclaration;
+    function isValueSignatureDeclaration(node) {
+        return ts.isFunctionExpression(node) || ts.isArrowFunction(node) || ts.isMethodOrAccessor(node) || ts.isFunctionDeclaration(node) || ts.isConstructorDeclaration(node);
+    }
+    ts.isValueSignatureDeclaration = isValueSignatureDeclaration;
+    function walkUp(node, kind) {
+        while (node && node.kind === kind) {
+            node = node.parent;
+        }
+        return node;
+    }
+    function walkUpParenthesizedTypes(node) {
+        return walkUp(node, 177 /* ParenthesizedType */);
+    }
+    ts.walkUpParenthesizedTypes = walkUpParenthesizedTypes;
+    function walkUpParenthesizedExpressions(node) {
+        return walkUp(node, 195 /* ParenthesizedExpression */);
+    }
+    ts.walkUpParenthesizedExpressions = walkUpParenthesizedExpressions;
+    function skipParentheses(node) {
+        while (node.kind === 195 /* ParenthesizedExpression */) {
+            node = node.expression;
+        }
+        return node;
+    }
+    ts.skipParentheses = skipParentheses;
+    function skipParenthesesUp(node) {
+        while (node.kind === 195 /* ParenthesizedExpression */) {
+            node = node.parent;
+        }
+        return node;
+    }
+    // a node is delete target iff. it is PropertyAccessExpression/ElementAccessExpression with parentheses skipped
+    function isDeleteTarget(node) {
+        if (node.kind !== 189 /* PropertyAccessExpression */ && node.kind !== 190 /* ElementAccessExpression */) {
+            return false;
+        }
+        node = walkUpParenthesizedExpressions(node.parent);
+        return node && node.kind === 198 /* DeleteExpression */;
+    }
+    ts.isDeleteTarget = isDeleteTarget;
+    function isNodeDescendantOf(node, ancestor) {
+        while (node) {
+            if (node === ancestor)
+                return true;
+            node = node.parent;
+        }
+        return false;
+    }
+    ts.isNodeDescendantOf = isNodeDescendantOf;
+    // True if `name` is the name of a declaration node
+    function isDeclarationName(name) {
+        return !ts.isSourceFile(name) && !ts.isBindingPattern(name) && ts.isDeclaration(name.parent) && name.parent.name === name;
+    }
+    ts.isDeclarationName = isDeclarationName;
+    // See GH#16030
+    function getDeclarationFromName(name) {
+        var parent = name.parent;
+        switch (name.kind) {
+            case 10 /* StringLiteral */:
+            case 8 /* NumericLiteral */:
+                if (ts.isComputedPropertyName(parent))
+                    return parent.parent;
+            // falls through
+            case 72 /* Identifier */:
+                if (ts.isDeclaration(parent)) {
+                    return parent.name === name ? parent : undefined;
+                }
+                else if (ts.isQualifiedName(parent)) {
+                    var tag = parent.parent;
+                    return ts.isJSDocParameterTag(tag) && tag.name === parent ? tag : undefined;
+                }
+                else {
+                    var binExp = parent.parent;
+                    return ts.isBinaryExpression(binExp) &&
+                        getAssignmentDeclarationKind(binExp) !== 0 /* None */ &&
+                        (binExp.left.symbol || binExp.symbol) &&
+                        ts.getNameOfDeclaration(binExp) === name
+                        ? binExp
+                        : undefined;
+                }
+            default:
+                return undefined;
+        }
+    }
+    ts.getDeclarationFromName = getDeclarationFromName;
+    function isLiteralComputedPropertyDeclarationName(node) {
+        return (node.kind === 10 /* StringLiteral */ || node.kind === 8 /* NumericLiteral */) &&
+            node.parent.kind === 149 /* ComputedPropertyName */ &&
+            ts.isDeclaration(node.parent.parent);
+    }
+    ts.isLiteralComputedPropertyDeclarationName = isLiteralComputedPropertyDeclarationName;
+    // Return true if the given identifier is classified as an IdentifierName
+    function isIdentifierName(node) {
+        var parent = node.parent;
+        switch (parent.kind) {
+            case 154 /* PropertyDeclaration */:
+            case 153 /* PropertySignature */:
+            case 156 /* MethodDeclaration */:
+            case 155 /* MethodSignature */:
+            case 158 /* GetAccessor */:
+            case 159 /* SetAccessor */:
+            case 278 /* EnumMember */:
+            case 275 /* PropertyAssignment */:
+            case 189 /* PropertyAccessExpression */:
+                // Name in member declaration or property name in property access
+                return parent.name === node;
+            case 148 /* QualifiedName */:
+                // Name on right hand side of dot in a type query or type reference
+                if (parent.right === node) {
+                    while (parent.kind === 148 /* QualifiedName */) {
+                        parent = parent.parent;
+                    }
+                    return parent.kind === 167 /* TypeQuery */ || parent.kind === 164 /* TypeReference */;
+                }
+                return false;
+            case 186 /* BindingElement */:
+            case 253 /* ImportSpecifier */:
+                // Property name in binding element or import specifier
+                return parent.propertyName === node;
+            case 257 /* ExportSpecifier */:
+            case 267 /* JsxAttribute */:
+                // Any name in an export specifier or JSX Attribute
+                return true;
+        }
+        return false;
+    }
+    ts.isIdentifierName = isIdentifierName;
+    // An alias symbol is created by one of the following declarations:
+    // import <symbol> = ...
+    // import <symbol> from ...
+    // import * as <symbol> from ...
+    // import { x as <symbol> } from ...
+    // export { x as <symbol> } from ...
+    // export = <EntityNameExpression>
+    // export default <EntityNameExpression>
+    // module.exports = <EntityNameExpression>
+    function isAliasSymbolDeclaration(node) {
+        return node.kind === 248 /* ImportEqualsDeclaration */ ||
+            node.kind === 247 /* NamespaceExportDeclaration */ ||
+            node.kind === 250 /* ImportClause */ && !!node.name ||
+            node.kind === 251 /* NamespaceImport */ ||
+            node.kind === 253 /* ImportSpecifier */ ||
+            node.kind === 257 /* ExportSpecifier */ ||
+            node.kind === 254 /* ExportAssignment */ && exportAssignmentIsAlias(node) ||
+            ts.isBinaryExpression(node) && getAssignmentDeclarationKind(node) === 2 /* ModuleExports */ && exportAssignmentIsAlias(node);
+    }
+    ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
+    function exportAssignmentIsAlias(node) {
+        var e = ts.isExportAssignment(node) ? node.expression : node.right;
+        return isEntityNameExpression(e) || ts.isClassExpression(e);
+    }
+    ts.exportAssignmentIsAlias = exportAssignmentIsAlias;
+    function getEffectiveBaseTypeNode(node) {
+        if (isInJSFile(node)) {
+            // Prefer an @augments tag because it may have type parameters.
+            var tag = ts.getJSDocAugmentsTag(node);
+            if (tag) {
+                return tag.class;
+            }
+        }
+        return getClassExtendsHeritageElement(node);
+    }
+    ts.getEffectiveBaseTypeNode = getEffectiveBaseTypeNode;
+    function getClassExtendsHeritageElement(node) {
+        var heritageClause = getHeritageClause(node.heritageClauses, 86 /* ExtendsKeyword */);
+        return heritageClause && heritageClause.types.length > 0 ? heritageClause.types[0] : undefined;
+    }
+    ts.getClassExtendsHeritageElement = getClassExtendsHeritageElement;
+    function getClassImplementsHeritageClauseElements(node) {
+        var heritageClause = getHeritageClause(node.heritageClauses, 109 /* ImplementsKeyword */);
+        return heritageClause ? heritageClause.types : undefined;
+    }
+    ts.getClassImplementsHeritageClauseElements = getClassImplementsHeritageClauseElements;
+    /** Returns the node in an `extends` or `implements` clause of a class or interface. */
+    function getAllSuperTypeNodes(node) {
+        return ts.isInterfaceDeclaration(node) ? getInterfaceBaseTypeNodes(node) || ts.emptyArray
+            : ts.isClassLike(node) ? ts.concatenate(ts.singleElementArray(getEffectiveBaseTypeNode(node)), getClassImplementsHeritageClauseElements(node)) || ts.emptyArray
+                : ts.emptyArray;
+    }
+    ts.getAllSuperTypeNodes = getAllSuperTypeNodes;
+    function getInterfaceBaseTypeNodes(node) {
+        var heritageClause = getHeritageClause(node.heritageClauses, 86 /* ExtendsKeyword */);
+        return heritageClause ? heritageClause.types : undefined;
+    }
+    ts.getInterfaceBaseTypeNodes = getInterfaceBaseTypeNodes;
+    function getHeritageClause(clauses, kind) {
+        if (clauses) {
+            for (var _i = 0, clauses_1 = clauses; _i < clauses_1.length; _i++) {
+                var clause = clauses_1[_i];
+                if (clause.token === kind) {
+                    return clause;
+                }
+            }
+        }
+        return undefined;
+    }
+    ts.getHeritageClause = getHeritageClause;
+    function tryResolveScriptReference(host, sourceFile, reference) {
+        if (!host.getCompilerOptions().noResolve) {
+            var referenceFileName = ts.isRootedDiskPath(reference.fileName) ? reference.fileName : ts.combinePaths(ts.getDirectoryPath(sourceFile.fileName), reference.fileName);
+            return host.getSourceFile(referenceFileName);
+        }
+    }
+    ts.tryResolveScriptReference = tryResolveScriptReference;
+    function getAncestor(node, kind) {
+        while (node) {
+            if (node.kind === kind) {
+                return node;
+            }
+            node = node.parent;
+        }
+        return undefined;
+    }
+    ts.getAncestor = getAncestor;
+    function isKeyword(token) {
+        return 73 /* FirstKeyword */ <= token && token <= 147 /* LastKeyword */;
+    }
+    ts.isKeyword = isKeyword;
+    function isContextualKeyword(token) {
+        return 118 /* FirstContextualKeyword */ <= token && token <= 147 /* LastContextualKeyword */;
+    }
+    ts.isContextualKeyword = isContextualKeyword;
+    function isNonContextualKeyword(token) {
+        return isKeyword(token) && !isContextualKeyword(token);
+    }
+    ts.isNonContextualKeyword = isNonContextualKeyword;
+    function isStringANonContextualKeyword(name) {
+        var token = ts.stringToToken(name);
+        return token !== undefined && isNonContextualKeyword(token);
+    }
+    ts.isStringANonContextualKeyword = isStringANonContextualKeyword;
+    function isIdentifierANonContextualKeyword(_a) {
+        var originalKeywordKind = _a.originalKeywordKind;
+        return !!originalKeywordKind && !isContextualKeyword(originalKeywordKind);
+    }
+    ts.isIdentifierANonContextualKeyword = isIdentifierANonContextualKeyword;
+    function isTrivia(token) {
+        return 2 /* FirstTriviaToken */ <= token && token <= 7 /* LastTriviaToken */;
+    }
+    ts.isTrivia = isTrivia;
+    var FunctionFlags;
+    (function (FunctionFlags) {
+        FunctionFlags[FunctionFlags["Normal"] = 0] = "Normal";
+        FunctionFlags[FunctionFlags["Generator"] = 1] = "Generator";
+        FunctionFlags[FunctionFlags["Async"] = 2] = "Async";
+        FunctionFlags[FunctionFlags["Invalid"] = 4] = "Invalid";
+        FunctionFlags[FunctionFlags["AsyncGenerator"] = 3] = "AsyncGenerator";
+    })(FunctionFlags = ts.FunctionFlags || (ts.FunctionFlags = {}));
+    function getFunctionFlags(node) {
+        if (!node) {
+            return 4 /* Invalid */;
+        }
+        var flags = 0 /* Normal */;
+        switch (node.kind) {
+            case 239 /* FunctionDeclaration */:
+            case 196 /* FunctionExpression */:
+            case 156 /* MethodDeclaration */:
+                if (node.asteriskToken) {
+                    flags |= 1 /* Generator */;
+                }
+            // falls through
+            case 197 /* ArrowFunction */:
+                if (hasModifier(node, 256 /* Async */)) {
+                    flags |= 2 /* Async */;
+                }
+                break;
+        }
+        if (!node.body) {
+            flags |= 4 /* Invalid */;
+        }
+        return flags;
+    }
+    ts.getFunctionFlags = getFunctionFlags;
+    function isAsyncFunction(node) {
+        switch (node.kind) {
+            case 239 /* FunctionDeclaration */:
+            case 196 /* FunctionExpression */:
+            case 197 /* ArrowFunction */:
+            case 156 /* MethodDeclaration */:
+                return node.body !== undefined
+                    && node.asteriskToken === undefined
+                    && hasModifier(node, 256 /* Async */);
+        }
+        return false;
+    }
+    ts.isAsyncFunction = isAsyncFunction;
+    function isStringOrNumericLiteralLike(node) {
+        return ts.isStringLiteralLike(node) || ts.isNumericLiteral(node);
+    }
+    ts.isStringOrNumericLiteralLike = isStringOrNumericLiteralLike;
+    /**
+     * A declaration has a dynamic name if both of the following are true:
+     *   1. The declaration has a computed property name
+     *   2. The computed name is *not* expressed as Symbol.<name>, where name
+     *      is a property of the Symbol constructor that denotes a built in
+     *      Symbol.
+     */
+    function hasDynamicName(declaration) {
+        var name = ts.getNameOfDeclaration(declaration);
+        return !!name && isDynamicName(name);
+    }
+    ts.hasDynamicName = hasDynamicName;
+    function isDynamicName(name) {
+        return name.kind === 149 /* ComputedPropertyName */ &&
+            !isStringOrNumericLiteralLike(name.expression) &&
+            !isWellKnownSymbolSyntactically(name.expression);
+    }
+    ts.isDynamicName = isDynamicName;
+    /**
+     * Checks if the expression is of the form:
+     *    Symbol.name
+     * where Symbol is literally the word "Symbol", and name is any identifierName
+     */
+    function isWellKnownSymbolSyntactically(node) {
+        return ts.isPropertyAccessExpression(node) && isESSymbolIdentifier(node.expression);
+    }
+    ts.isWellKnownSymbolSyntactically = isWellKnownSymbolSyntactically;
+    function getPropertyNameForPropertyNameNode(name) {
+        switch (name.kind) {
+            case 72 /* Identifier */:
+                return name.escapedText;
+            case 10 /* StringLiteral */:
+            case 8 /* NumericLiteral */:
+                return ts.escapeLeadingUnderscores(name.text);
+            case 149 /* ComputedPropertyName */:
+                var nameExpression = name.expression;
+                if (isWellKnownSymbolSyntactically(nameExpression)) {
+                    return getPropertyNameForKnownSymbolName(ts.idText(nameExpression.name));
+                }
+                else if (isStringOrNumericLiteralLike(nameExpression)) {
+                    return ts.escapeLeadingUnderscores(nameExpression.text);
+                }
+                return undefined;
+            default:
+                return ts.Debug.assertNever(name);
+        }
+    }
+    ts.getPropertyNameForPropertyNameNode = getPropertyNameForPropertyNameNode;
+    function isPropertyNameLiteral(node) {
+        switch (node.kind) {
+            case 72 /* Identifier */:
+            case 10 /* StringLiteral */:
+            case 14 /* NoSubstitutionTemplateLiteral */:
+            case 8 /* NumericLiteral */:
+                return true;
+            default:
+                return false;
+        }
+    }
+    ts.isPropertyNameLiteral = isPropertyNameLiteral;
+    function getTextOfIdentifierOrLiteral(node) {
+        return node.kind === 72 /* Identifier */ ? ts.idText(node) : node.text;
+    }
+    ts.getTextOfIdentifierOrLiteral = getTextOfIdentifierOrLiteral;
+    function getEscapedTextOfIdentifierOrLiteral(node) {
+        return node.kind === 72 /* Identifier */ ? node.escapedText : ts.escapeLeadingUnderscores(node.text);
+    }
+    ts.getEscapedTextOfIdentifierOrLiteral = getEscapedTextOfIdentifierOrLiteral;
+    function getPropertyNameForKnownSymbolName(symbolName) {
+        return "__@" + symbolName;
+    }
+    ts.getPropertyNameForKnownSymbolName = getPropertyNameForKnownSymbolName;
+    function isKnownSymbol(symbol) {
+        return ts.startsWith(symbol.escapedName, "__@");
+    }
+    ts.isKnownSymbol = isKnownSymbol;
+    /**
+     * Includes the word "Symbol" with unicode escapes
+     */
+    function isESSymbolIdentifier(node) {
+        return node.kind === 72 /* Identifier */ && node.escapedText === "Symbol";
+    }
+    ts.isESSymbolIdentifier = isESSymbolIdentifier;
+    function isPushOrUnshiftIdentifier(node) {
+        return node.escapedText === "push" || node.escapedText === "unshift";
+    }
+    ts.isPushOrUnshiftIdentifier = isPushOrUnshiftIdentifier;
+    function isParameterDeclaration(node) {
+        var root = getRootDeclaration(node);
+        return root.kind === 151 /* Parameter */;
+    }
+    ts.isParameterDeclaration = isParameterDeclaration;
+    function getRootDeclaration(node) {
+        while (node.kind === 186 /* BindingElement */) {
+            node = node.parent.parent;
+        }
+        return node;
+    }
+    ts.getRootDeclaration = getRootDeclaration;
+    function nodeStartsNewLexicalEnvironment(node) {
+        var kind = node.kind;
+        return kind === 157 /* Constructor */
+            || kind === 196 /* FunctionExpression */
+            || kind === 239 /* FunctionDeclaration */
+            || kind === 197 /* ArrowFunction */
+            || kind === 156 /* MethodDeclaration */
+            || kind === 158 /* GetAccessor */
+            || kind === 159 /* SetAccessor */
+            || kind === 244 /* ModuleDeclaration */
+            || kind === 279 /* SourceFile */;
+    }
+    ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
+    function nodeIsSynthesized(range) {
+        return ts.positionIsSynthesized(range.pos)
+            || ts.positionIsSynthesized(range.end);
+    }
+    ts.nodeIsSynthesized = nodeIsSynthesized;
+    function getOriginalSourceFile(sourceFile) {
+        return ts.getParseTreeNode(sourceFile, ts.isSourceFile) || sourceFile;
+    }
+    ts.getOriginalSourceFile = getOriginalSourceFile;
+    var Associativity;
+    (function (Associativity) {
+        Associativity[Associativity["Left"] = 0] = "Left";
+        Associativity[Associativity["Right"] = 1] = "Right";
+    })(Associativity = ts.Associativity || (ts.Associativity = {}));
+    function getExpressionAssociativity(expression) {
+        var operator = getOperator(expression);
+        var hasArguments = expression.kind === 192 /* NewExpression */ && expression.arguments !== undefined;
+        return getOperatorAssociativity(expression.kind, operator, hasArguments);
+    }
+    ts.getExpressionAssociativity = getExpressionAssociativity;
+    function getOperatorAssociativity(kind, operator, hasArguments) {
+        switch (kind) {
+            case 192 /* NewExpression */:
+                return hasArguments ? 0 /* Left */ : 1 /* Right */;
+            case 202 /* PrefixUnaryExpression */:
+            case 199 /* TypeOfExpression */:
+            case 200 /* VoidExpression */:
+            case 198 /* DeleteExpression */:
+            case 201 /* AwaitExpression */:
+            case 205 /* ConditionalExpression */:
+            case 207 /* YieldExpression */:
+                return 1 /* Right */;
+            case 204 /* BinaryExpression */:
+                switch (operator) {
+                    case 41 /* AsteriskAsteriskToken */:
+                    case 59 /* EqualsToken */:
+                    case 60 /* PlusEqualsToken */:
+                    case 61 /* MinusEqualsToken */:
+                    case 63 /* AsteriskAsteriskEqualsToken */:
+                    case 62 /* AsteriskEqualsToken */:
+                    case 64 /* SlashEqualsToken */:
+                    case 65 /* PercentEqualsToken */:
+                    case 66 /* LessThanLessThanEqualsToken */:
+                    case 67 /* GreaterThanGreaterThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 69 /* AmpersandEqualsToken */:
+                    case 71 /* CaretEqualsToken */:
+                    case 70 /* BarEqualsToken */:
+                        return 1 /* Right */;
+                }
+        }
+        return 0 /* Left */;
+    }
+    ts.getOperatorAssociativity = getOperatorAssociativity;
+    function getExpressionPrecedence(expression) {
+        var operator = getOperator(expression);
+        var hasArguments = expression.kind === 192 /* NewExpression */ && expression.arguments !== undefined;
+        return getOperatorPrecedence(expression.kind, operator, hasArguments);
+    }
+    ts.getExpressionPrecedence = getExpressionPrecedence;
+    function getOperator(expression) {
+        if (expression.kind === 204 /* BinaryExpression */) {
+            return expression.operatorToken.kind;
+        }
+        else if (expression.kind === 202 /* PrefixUnaryExpression */ || expression.kind === 203 /* PostfixUnaryExpression */) {
+            return expression.operator;
+        }
+        else {
+            return expression.kind;
+        }
+    }
+    ts.getOperator = getOperator;
+    function getOperatorPrecedence(nodeKind, operatorKind, hasArguments) {
+        switch (nodeKind) {
+            case 309 /* CommaListExpression */:
+                return 0;
+            case 208 /* SpreadElement */:
+                return 1;
+            case 207 /* YieldExpression */:
+                return 2;
+            case 205 /* ConditionalExpression */:
+                return 4;
+            case 204 /* BinaryExpression */:
+                switch (operatorKind) {
+                    case 27 /* CommaToken */:
+                        return 0;
+                    case 59 /* EqualsToken */:
+                    case 60 /* PlusEqualsToken */:
+                    case 61 /* MinusEqualsToken */:
+                    case 63 /* AsteriskAsteriskEqualsToken */:
+                    case 62 /* AsteriskEqualsToken */:
+                    case 64 /* SlashEqualsToken */:
+                    case 65 /* PercentEqualsToken */:
+                    case 66 /* LessThanLessThanEqualsToken */:
+                    case 67 /* GreaterThanGreaterThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 69 /* AmpersandEqualsToken */:
+                    case 71 /* CaretEqualsToken */:
+                    case 70 /* BarEqualsToken */:
+                        return 3;
+                    default:
+                        return getBinaryOperatorPrecedence(operatorKind);
+                }
+            case 202 /* PrefixUnaryExpression */:
+            case 199 /* TypeOfExpression */:
+            case 200 /* VoidExpression */:
+            case 198 /* DeleteExpression */:
+            case 201 /* AwaitExpression */:
+                return 16;
+            case 203 /* PostfixUnaryExpression */:
+                return 17;
+            case 191 /* CallExpression */:
+                return 18;
+            case 192 /* NewExpression */:
+                return hasArguments ? 19 : 18;
+            case 193 /* TaggedTemplateExpression */:
+            case 189 /* PropertyAccessExpression */:
+            case 190 /* ElementAccessExpression */:
+                return 19;
+            case 100 /* ThisKeyword */:
+            case 98 /* SuperKeyword */:
+            case 72 /* Identifier */:
+            case 96 /* NullKeyword */:
+            case 102 /* TrueKeyword */:
+            case 87 /* FalseKeyword */:
+            case 8 /* NumericLiteral */:
+            case 9 /* BigIntLiteral */:
+            case 10 /* StringLiteral */:
+            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ObjectLiteralExpression */:
+            case 196 /* FunctionExpression */:
+            case 197 /* ArrowFunction */:
+            case 209 /* ClassExpression */:
+            case 260 /* JsxElement */:
+            case 261 /* JsxSelfClosingElement */:
+            case 264 /* JsxFragment */:
+            case 13 /* RegularExpressionLiteral */:
+            case 14 /* NoSubstitutionTemplateLiteral */:
+            case 206 /* TemplateExpression */:
+            case 195 /* ParenthesizedExpression */:
+            case 210 /* OmittedExpression */:
+                return 20;
+            default:
+                return -1;
+        }
+    }
+    ts.getOperatorPrecedence = getOperatorPrecedence;
+    function getBinaryOperatorPrecedence(kind) {
+        switch (kind) {
+            case 55 /* BarBarToken */:
+                return 5;
+            case 54 /* AmpersandAmpersandToken */:
+                return 6;
+            case 50 /* BarToken */:
+                return 7;
+            case 51 /* CaretToken */:
+                return 8;
+            case 49 /* AmpersandToken */:
+                return 9;
+            case 33 /* EqualsEqualsToken */:
+            case 34 /* ExclamationEqualsToken */:
+            case 35 /* EqualsEqualsEqualsToken */:
+            case 36 /* ExclamationEqualsEqualsToken */:
+                return 10;
+            case 28 /* LessThanToken */:
+            case 30 /* GreaterThanToken */:
+            case 31 /* LessThanEqualsToken */:
+            case 32 /* GreaterThanEqualsToken */:
+            case 94 /* InstanceOfKeyword */:
+            case 93 /* InKeyword */:
+            case 119 /* AsKeyword */:
+                return 11;
+            case 46 /* LessThanLessThanToken */:
+            case 47 /* GreaterThanGreaterThanToken */:
+            case 48 /* GreaterThanGreaterThanGreaterThanToken */:
+                return 12;
+            case 38 /* PlusToken */:
+            case 39 /* MinusToken */:
+                return 13;
+            case 40 /* AsteriskToken */:
+            case 42 /* SlashToken */:
+            case 43 /* PercentToken */:
+                return 14;
+            case 41 /* AsteriskAsteriskToken */:
+                return 15;
+        }
+        // -1 is lower than all other precedences.  Returning it will cause binary expression
+        // parsing to stop.
+        return -1;
+    }
+    ts.getBinaryOperatorPrecedence = getBinaryOperatorPrecedence;
+    function createDiagnosticCollection() {
+        var nonFileDiagnostics = []; // See GH#19873
+        var filesWithDiagnostics = [];
+        var fileDiagnostics = ts.createMap();
+        var hasReadNonFileDiagnostics = false;
+        return {
+            add: add,
+            lookup: lookup,
+            getGlobalDiagnostics: getGlobalDiagnostics,
+            getDiagnostics: getDiagnostics,
+            reattachFileDiagnostics: reattachFileDiagnostics
+        };
+        function reattachFileDiagnostics(newFile) {
+            ts.forEach(fileDiagnostics.get(newFile.fileName), function (diagnostic) { return diagnostic.file = newFile; });
+        }
+        function lookup(diagnostic) {
+            var diagnostics;
+            if (diagnostic.file) {
+                diagnostics = fileDiagnostics.get(diagnostic.file.fileName);
+            }
+            else {
+                diagnostics = nonFileDiagnostics;
+            }
+            if (!diagnostics) {
+                return undefined;
+            }
+            var result = ts.binarySearch(diagnostics, diagnostic, ts.identity, ts.compareDiagnosticsSkipRelatedInformation);
+            if (result >= 0) {
+                return diagnostics[result];
+            }
+            return undefined;
+        }
+        function add(diagnostic) {
+            var diagnostics;
+            if (diagnostic.file) {
+                diagnostics = fileDiagnostics.get(diagnostic.file.fileName);
+                if (!diagnostics) {
+                    diagnostics = []; // See GH#19873
+                    fileDiagnostics.set(diagnostic.file.fileName, diagnostics);
+                    ts.insertSorted(filesWithDiagnostics, diagnostic.file.fileName, ts.compareStringsCaseSensitive);
+                }
+            }
+            else {
+                // If we've already read the non-file diagnostics, do not modify the existing array.
+                if (hasReadNonFileDiagnostics) {
+                    hasReadNonFileDiagnostics = false;
+                    nonFileDiagnostics = nonFileDiagnostics.slice();
+                }
+                diagnostics = nonFileDiagnostics;
+            }
+            ts.insertSorted(diagnostics, diagnostic, ts.compareDiagnostics);
+        }
+        function getGlobalDiagnostics() {
+            hasReadNonFileDiagnostics = true;
+            return nonFileDiagnostics;
+        }
+        function getDiagnostics(fileName) {
+            if (fileName) {
+                return fileDiagnostics.get(fileName) || [];
+            }
+            var fileDiags = ts.flatMapToMutable(filesWithDiagnostics, function (f) { return fileDiagnostics.get(f); });
+            if (!nonFileDiagnostics.length) {
+                return fileDiags;
+            }
+            fileDiags.unshift.apply(fileDiags, nonFileDiagnostics);
+            return fileDiags;
+        }
+    }
+    ts.createDiagnosticCollection = createDiagnosticCollection;
+    // This consists of the first 19 unprintable ASCII characters, canonical escapes, lineSeparator,
+    // paragraphSeparator, and nextLine. The latter three are just desirable to suppress new lines in
+    // the language service. These characters should be escaped when printing, and if any characters are added,
+    // the map below must be updated. Note that this regexp *does not* include the 'delete' character.
+    // There is no reason for this other than that JSON.stringify does not handle it either.
+    var doubleQuoteEscapedCharsRegExp = /[\\\"\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g;
+    var singleQuoteEscapedCharsRegExp = /[\\\'\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g;
+    var backtickQuoteEscapedCharsRegExp = /[\\\`\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g;
+    var escapedCharsMap = ts.createMapFromTemplate({
+        "\t": "\\t",
+        "\v": "\\v",
+        "\f": "\\f",
+        "\b": "\\b",
+        "\r": "\\r",
+        "\n": "\\n",
+        "\\": "\\\\",
+        "\"": "\\\"",
+        "\'": "\\\'",
+        "\`": "\\\`",
+        "\u2028": "\\u2028",
+        "\u2029": "\\u2029",
+        "\u0085": "\\u0085" // nextLine
+    });
+    /**
+     * Based heavily on the abstract 'Quote'/'QuoteJSONString' operation from ECMA-262 (24.3.2.2),
+     * but augmented for a few select characters (e.g. lineSeparator, paragraphSeparator, nextLine)
+     * Note that this doesn't actually wrap the input in double quotes.
+     */
+    function escapeString(s, quoteChar) {
+        var escapedCharsRegExp = quoteChar === 96 /* backtick */ ? backtickQuoteEscapedCharsRegExp :
+            quoteChar === 39 /* singleQuote */ ? singleQuoteEscapedCharsRegExp :
+                doubleQuoteEscapedCharsRegExp;
+        return s.replace(escapedCharsRegExp, getReplacement);
+    }
+    ts.escapeString = escapeString;
+    function getReplacement(c, offset, input) {
+        if (c.charCodeAt(0) === 0 /* nullCharacter */) {
+            var lookAhead = input.charCodeAt(offset + c.length);
+            if (lookAhead >= 48 /* _0 */ && lookAhead <= 57 /* _9 */) {
+                // If the null character is followed by digits, print as a hex escape to prevent the result from parsing as an octal (which is forbidden in strict mode)
+                return "\\x00";
+            }
+            // Otherwise, keep printing a literal \0 for the null character
+            return "\\0";
+        }
+        return escapedCharsMap.get(c) || get16BitUnicodeEscapeSequence(c.charCodeAt(0));
+    }
+    function isIntrinsicJsxName(name) {
+        var ch = name.charCodeAt(0);
+        return (ch >= 97 /* a */ && ch <= 122 /* z */) || ts.stringContains(name, "-");
+    }
+    ts.isIntrinsicJsxName = isIntrinsicJsxName;
+    function get16BitUnicodeEscapeSequence(charCode) {
+        var hexCharCode = charCode.toString(16).toUpperCase();
+        var paddedHexCode = ("0000" + hexCharCode).slice(-4);
+        return "\\u" + paddedHexCode;
+    }
+    var nonAsciiCharacters = /[^\u0000-\u007F]/g;
+    function escapeNonAsciiString(s, quoteChar) {
+        s = escapeString(s, quoteChar);
+        // Replace non-ASCII characters with '\uNNNN' escapes if any exist.
+        // Otherwise just return the original string.
+        return nonAsciiCharacters.test(s) ?
+            s.replace(nonAsciiCharacters, function (c) { return get16BitUnicodeEscapeSequence(c.charCodeAt(0)); }) :
+            s;
+    }
+    ts.escapeNonAsciiString = escapeNonAsciiString;
+    var indentStrings = ["", "    "];
+    function getIndentString(level) {
+        if (indentStrings[level] === undefined) {
+            indentStrings[level] = getIndentString(level - 1) + indentStrings[1];
+        }
+        return indentStrings[level];
+    }
+    ts.getIndentString = getIndentString;
+    function getIndentSize() {
+        return indentStrings[1].length;
+    }
+    ts.getIndentSize = getIndentSize;
+    function createTextWriter(newLine) {
+        var output;
+        var indent;
+        var lineStart;
+        var lineCount;
+        var linePos;
+        function updateLineCountAndPosFor(s) {
+            var lineStartsOfS = ts.computeLineStarts(s);
+            if (lineStartsOfS.length > 1) {
+                lineCount = lineCount + lineStartsOfS.length - 1;
+                linePos = output.length - s.length + ts.last(lineStartsOfS);
+                lineStart = (linePos - output.length) === 0;
+            }
+            else {
+                lineStart = false;
+            }
+        }
+        function write(s) {
+            if (s && s.length) {
+                if (lineStart) {
+                    s = getIndentString(indent) + s;
+                    lineStart = false;
+                }
+                output += s;
+                updateLineCountAndPosFor(s);
+            }
+        }
+        function reset() {
+            output = "";
+            indent = 0;
+            lineStart = true;
+            lineCount = 0;
+            linePos = 0;
+        }
+        function rawWrite(s) {
+            if (s !== undefined) {
+                output += s;
+                updateLineCountAndPosFor(s);
+            }
+        }
+        function writeLiteral(s) {
+            if (s && s.length) {
+                write(s);
+            }
+        }
+        function writeLine() {
+            if (!lineStart) {
+                output += newLine;
+                lineCount++;
+                linePos = output.length;
+                lineStart = true;
+            }
+        }
+        reset();
+        return {
+            write: write,
+            rawWrite: rawWrite,
+            writeLiteral: writeLiteral,
+            writeLine: writeLine,
+            increaseIndent: function () { indent++; },
+            decreaseIndent: function () { indent--; },
+            getIndent: function () { return indent; },
+            getTextPos: function () { return output.length; },
+            getLine: function () { return lineCount; },
+            getColumn: function () { return lineStart ? indent * getIndentSize() : output.length - linePos; },
+            getText: function () { return output; },
+            isAtStartOfLine: function () { return lineStart; },
+            clear: reset,
+            reportInaccessibleThisError: ts.noop,
+            reportPrivateInBaseOfClassExpression: ts.noop,
+            reportInaccessibleUniqueSymbolError: ts.noop,
+            trackSymbol: ts.noop,
+            writeKeyword: write,
+            writeOperator: write,
+            writeParameter: write,
+            writeProperty: write,
+            writePunctuation: write,
+            writeSpace: write,
+            writeStringLiteral: write,
+            writeSymbol: function (s, _) { return write(s); },
+            writeTrailingSemicolon: write,
+            writeComment: write
+        };
+    }
+    ts.createTextWriter = createTextWriter;
+    function getTrailingSemicolonOmittingWriter(writer) {
+        var pendingTrailingSemicolon = false;
+        function commitPendingTrailingSemicolon() {
+            if (pendingTrailingSemicolon) {
+                writer.writeTrailingSemicolon(";");
+                pendingTrailingSemicolon = false;
+            }
+        }
+        return __assign({}, writer, { writeTrailingSemicolon: function () {
+                pendingTrailingSemicolon = true;
+            },
+            writeLiteral: function (s) {
+                commitPendingTrailingSemicolon();
+                writer.writeLiteral(s);
+            },
+            writeStringLiteral: function (s) {
+                commitPendingTrailingSemicolon();
+                writer.writeStringLiteral(s);
+            },
+            writeSymbol: function (s, sym) {
+                commitPendingTrailingSemicolon();
+                writer.writeSymbol(s, sym);
+            },
+            writePunctuation: function (s) {
+                commitPendingTrailingSemicolon();
+                writer.writePunctuation(s);
+            },
+            writeKeyword: function (s) {
+                commitPendingTrailingSemicolon();
+                writer.writeKeyword(s);
+            },
+            writeOperator: function (s) {
+                commitPendingTrailingSemicolon();
+                writer.writeOperator(s);
+            },
+            writeParameter: function (s) {
+                commitPendingTrailingSemicolon();
+                writer.writeParameter(s);
+            },
+            writeSpace: function (s) {
+                commitPendingTrailingSemicolon();
+                writer.writeSpace(s);
+            },
+            writeProperty: function (s) {
+                commitPendingTrailingSemicolon();
+                writer.writeProperty(s);
+            },
+            writeComment: function (s) {
+                commitPendingTrailingSemicolon();
+                writer.writeComment(s);
+            },
+            writeLine: function () {
+                commitPendingTrailingSemicolon();
+                writer.writeLine();
+            },
+            increaseIndent: function () {
+                commitPendingTrailingSemicolon();
+                writer.increaseIndent();
+            },
+            decreaseIndent: function () {
+                commitPendingTrailingSemicolon();
+                writer.decreaseIndent();
+            } });
+    }
+    ts.getTrailingSemicolonOmittingWriter = getTrailingSemicolonOmittingWriter;
+    function getResolvedExternalModuleName(host, file, referenceFile) {
+        return file.moduleName || getExternalModuleNameFromPath(host, file.fileName, referenceFile && referenceFile.fileName);
+    }
+    ts.getResolvedExternalModuleName = getResolvedExternalModuleName;
+    function getExternalModuleNameFromDeclaration(host, resolver, declaration) {
+        var file = resolver.getExternalModuleFileFromDeclaration(declaration);
+        if (!file || file.isDeclarationFile) {
+            return undefined;
+        }
+        return getResolvedExternalModuleName(host, file);
+    }
+    ts.getExternalModuleNameFromDeclaration = getExternalModuleNameFromDeclaration;
+    /**
+     * Resolves a local path to a path which is absolute to the base of the emit
+     */
+    function getExternalModuleNameFromPath(host, fileName, referencePath) {
+        var getCanonicalFileName = function (f) { return host.getCanonicalFileName(f); };
+        var dir = toPath(referencePath ? ts.getDirectoryPath(referencePath) : host.getCommonSourceDirectory(), host.getCurrentDirectory(), getCanonicalFileName);
+        var filePath = ts.getNormalizedAbsolutePath(fileName, host.getCurrentDirectory());
+        var relativePath = ts.getRelativePathToDirectoryOrUrl(dir, filePath, dir, getCanonicalFileName, /*isAbsolutePathAnUrl*/ false);
+        var extensionless = ts.removeFileExtension(relativePath);
+        return referencePath ? ts.ensurePathIsNonModuleName(extensionless) : extensionless;
+    }
+    ts.getExternalModuleNameFromPath = getExternalModuleNameFromPath;
+    function getOwnEmitOutputFilePath(fileName, host, extension) {
+        var compilerOptions = host.getCompilerOptions();
+        var emitOutputFilePathWithoutExtension;
+        if (compilerOptions.outDir) {
+            emitOutputFilePathWithoutExtension = ts.removeFileExtension(getSourceFilePathInNewDir(fileName, host, compilerOptions.outDir));
+        }
+        else {
+            emitOutputFilePathWithoutExtension = ts.removeFileExtension(fileName);
+        }
+        return emitOutputFilePathWithoutExtension + extension;
+    }
+    ts.getOwnEmitOutputFilePath = getOwnEmitOutputFilePath;
+    function getDeclarationEmitOutputFilePath(fileName, host) {
+        return getDeclarationEmitOutputFilePathWorker(fileName, host.getCompilerOptions(), host.getCurrentDirectory(), host.getCommonSourceDirectory(), function (f) { return host.getCanonicalFileName(f); });
+    }
+    ts.getDeclarationEmitOutputFilePath = getDeclarationEmitOutputFilePath;
+    function getDeclarationEmitOutputFilePathWorker(fileName, options, currentDirectory, commonSourceDirectory, getCanonicalFileName) {
+        var outputDir = options.declarationDir || options.outDir; // Prefer declaration folder if specified
+        var path = outputDir
+            ? getSourceFilePathInNewDirWorker(fileName, outputDir, currentDirectory, commonSourceDirectory, getCanonicalFileName)
+            : fileName;
+        return ts.removeFileExtension(path) + ".d.ts" /* Dts */;
+    }
+    ts.getDeclarationEmitOutputFilePathWorker = getDeclarationEmitOutputFilePathWorker;
+    /**
+     * Gets the source files that are expected to have an emit output.
+     *
+     * Originally part of `forEachExpectedEmitFile`, this functionality was extracted to support
+     * transformations.
+     *
+     * @param host An EmitHost.
+     * @param targetSourceFile An optional target source file to emit.
+     */
+    function getSourceFilesToEmit(host, targetSourceFile) {
+        var options = host.getCompilerOptions();
+        var isSourceFileFromExternalLibrary = function (file) { return host.isSourceFileFromExternalLibrary(file); };
+        if (options.outFile || options.out) {
+            var moduleKind = ts.getEmitModuleKind(options);
+            var moduleEmitEnabled_1 = options.emitDeclarationOnly || moduleKind === ts.ModuleKind.AMD || moduleKind === ts.ModuleKind.System;
+            // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
+            return ts.filter(host.getSourceFiles(), function (sourceFile) {
+                return (moduleEmitEnabled_1 || !ts.isExternalModule(sourceFile)) && sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary);
+            });
+        }
+        else {
+            var sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
+            return ts.filter(sourceFiles, function (sourceFile) { return sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary); });
+        }
+    }
+    ts.getSourceFilesToEmit = getSourceFilesToEmit;
+    /** Don't call this for `--outFile`, just for `--outDir` or plain emit. `--outFile` needs additional checks. */
+    function sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary) {
+        return !(options.noEmitForJsFiles && isSourceFileJS(sourceFile)) && !sourceFile.isDeclarationFile && !isSourceFileFromExternalLibrary(sourceFile);
+    }
+    ts.sourceFileMayBeEmitted = sourceFileMayBeEmitted;
+    function getSourceFilePathInNewDir(fileName, host, newDirPath) {
+        return getSourceFilePathInNewDirWorker(fileName, newDirPath, host.getCurrentDirectory(), host.getCommonSourceDirectory(), function (f) { return host.getCanonicalFileName(f); });
+    }
+    ts.getSourceFilePathInNewDir = getSourceFilePathInNewDir;
+    function getSourceFilePathInNewDirWorker(fileName, newDirPath, currentDirectory, commonSourceDirectory, getCanonicalFileName) {
+        var sourceFilePath = ts.getNormalizedAbsolutePath(fileName, currentDirectory);
+        var isSourceFileInCommonSourceDirectory = getCanonicalFileName(sourceFilePath).indexOf(getCanonicalFileName(commonSourceDirectory)) === 0;
+        sourceFilePath = isSourceFileInCommonSourceDirectory ? sourceFilePath.substring(commonSourceDirectory.length) : sourceFilePath;
+        return ts.combinePaths(newDirPath, sourceFilePath);
+    }
+    ts.getSourceFilePathInNewDirWorker = getSourceFilePathInNewDirWorker;
+    function writeFile(host, diagnostics, fileName, data, writeByteOrderMark, sourceFiles) {
+        host.writeFile(fileName, data, writeByteOrderMark, function (hostErrorMessage) {
+            diagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Could_not_write_file_0_Colon_1, fileName, hostErrorMessage));
+        }, sourceFiles);
+    }
+    ts.writeFile = writeFile;
+    function getLineOfLocalPosition(currentSourceFile, pos) {
+        return ts.getLineAndCharacterOfPosition(currentSourceFile, pos).line;
+    }
+    ts.getLineOfLocalPosition = getLineOfLocalPosition;
+    function getLineOfLocalPositionFromLineMap(lineMap, pos) {
+        return ts.computeLineAndCharacterOfPosition(lineMap, pos).line;
+    }
+    ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap;
+    function getFirstConstructorWithBody(node) {
+        return ts.find(node.members, function (member) { return ts.isConstructorDeclaration(member) && nodeIsPresent(member.body); });
+    }
+    ts.getFirstConstructorWithBody = getFirstConstructorWithBody;
+    function getSetAccessorValueParameter(accessor) {
+        if (accessor && accessor.parameters.length > 0) {
+            var hasThis = accessor.parameters.length === 2 && parameterIsThisKeyword(accessor.parameters[0]);
+            return accessor.parameters[hasThis ? 1 : 0];
+        }
+    }
+    /** Get the type annotation for the value parameter. */
+    function getSetAccessorTypeAnnotationNode(accessor) {
+        var parameter = getSetAccessorValueParameter(accessor);
+        return parameter && parameter.type;
+    }
+    ts.getSetAccessorTypeAnnotationNode = getSetAccessorTypeAnnotationNode;
+    function getThisParameter(signature) {
+        // callback tags do not currently support this parameters
+        if (signature.parameters.length && !ts.isJSDocSignature(signature)) {
+            var thisParameter = signature.parameters[0];
+            if (parameterIsThisKeyword(thisParameter)) {
+                return thisParameter;
+            }
+        }
+    }
+    ts.getThisParameter = getThisParameter;
+    function parameterIsThisKeyword(parameter) {
+        return isThisIdentifier(parameter.name);
+    }
+    ts.parameterIsThisKeyword = parameterIsThisKeyword;
+    function isThisIdentifier(node) {
+        return !!node && node.kind === 72 /* Identifier */ && identifierIsThisKeyword(node);
+    }
+    ts.isThisIdentifier = isThisIdentifier;
+    function identifierIsThisKeyword(id) {
+        return id.originalKeywordKind === 100 /* ThisKeyword */;
+    }
+    ts.identifierIsThisKeyword = identifierIsThisKeyword;
+    function getAllAccessorDeclarations(declarations, accessor) {
+        // TODO: GH#18217
+        var firstAccessor;
+        var secondAccessor;
+        var getAccessor;
+        var setAccessor;
+        if (hasDynamicName(accessor)) {
+            firstAccessor = accessor;
+            if (accessor.kind === 158 /* GetAccessor */) {
+                getAccessor = accessor;
+            }
+            else if (accessor.kind === 159 /* SetAccessor */) {
+                setAccessor = accessor;
+            }
+            else {
+                ts.Debug.fail("Accessor has wrong kind");
+            }
+        }
+        else {
+            ts.forEach(declarations, function (member) {
+                if (ts.isAccessor(member)
+                    && hasModifier(member, 32 /* Static */) === hasModifier(accessor, 32 /* Static */)) {
+                    var memberName = getPropertyNameForPropertyNameNode(member.name);
+                    var accessorName = getPropertyNameForPropertyNameNode(accessor.name);
+                    if (memberName === accessorName) {
+                        if (!firstAccessor) {
+                            firstAccessor = member;
+                        }
+                        else if (!secondAccessor) {
+                            secondAccessor = member;
+                        }
+                        if (member.kind === 158 /* GetAccessor */ && !getAccessor) {
+                            getAccessor = member;
+                        }
+                        if (member.kind === 159 /* SetAccessor */ && !setAccessor) {
+                            setAccessor = member;
+                        }
+                    }
+                }
+            });
+        }
+        return {
+            firstAccessor: firstAccessor,
+            secondAccessor: secondAccessor,
+            getAccessor: getAccessor,
+            setAccessor: setAccessor
+        };
+    }
+    ts.getAllAccessorDeclarations = getAllAccessorDeclarations;
+    /**
+     * Gets the effective type annotation of a variable, parameter, or property. If the node was
+     * parsed in a JavaScript file, gets the type annotation from JSDoc.
+     */
+    function getEffectiveTypeAnnotationNode(node) {
+        var type = node.type;
+        if (type || !isInJSFile(node))
+            return type;
+        return ts.isJSDocPropertyLikeTag(node) ? node.typeExpression && node.typeExpression.type : ts.getJSDocType(node);
+    }
+    ts.getEffectiveTypeAnnotationNode = getEffectiveTypeAnnotationNode;
+    function getTypeAnnotationNode(node) {
+        return node.type;
+    }
+    ts.getTypeAnnotationNode = getTypeAnnotationNode;
+    /**
+     * Gets the effective return type annotation of a signature. If the node was parsed in a
+     * JavaScript file, gets the return type annotation from JSDoc.
+     */
+    function getEffectiveReturnTypeNode(node) {
+        return ts.isJSDocSignature(node) ?
+            node.type && node.type.typeExpression && node.type.typeExpression.type :
+            node.type || (isInJSFile(node) ? ts.getJSDocReturnType(node) : undefined);
+    }
+    ts.getEffectiveReturnTypeNode = getEffectiveReturnTypeNode;
+    function getJSDocTypeParameterDeclarations(node) {
+        return ts.flatMap(ts.getJSDocTags(node), function (tag) { return isNonTypeAliasTemplate(tag) ? tag.typeParameters : undefined; });
+    }
+    ts.getJSDocTypeParameterDeclarations = getJSDocTypeParameterDeclarations;
+    /** template tags are only available when a typedef isn't already using them */
+    function isNonTypeAliasTemplate(tag) {
+        return ts.isJSDocTemplateTag(tag) && !(tag.parent.kind === 291 /* JSDocComment */ && tag.parent.tags.some(isJSDocTypeAlias));
+    }
+    /**
+     * Gets the effective type annotation of the value parameter of a set accessor. If the node
+     * was parsed in a JavaScript file, gets the type annotation from JSDoc.
+     */
+    function getEffectiveSetAccessorTypeAnnotationNode(node) {
+        var parameter = getSetAccessorValueParameter(node);
+        return parameter && getEffectiveTypeAnnotationNode(parameter);
+    }
+    ts.getEffectiveSetAccessorTypeAnnotationNode = getEffectiveSetAccessorTypeAnnotationNode;
+    function emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments) {
+        emitNewLineBeforeLeadingCommentsOfPosition(lineMap, writer, node.pos, leadingComments);
+    }
+    ts.emitNewLineBeforeLeadingComments = emitNewLineBeforeLeadingComments;
+    function emitNewLineBeforeLeadingCommentsOfPosition(lineMap, writer, pos, leadingComments) {
+        // If the leading comments start on different line than the start of node, write new line
+        if (leadingComments && leadingComments.length && pos !== leadingComments[0].pos &&
+            getLineOfLocalPositionFromLineMap(lineMap, pos) !== getLineOfLocalPositionFromLineMap(lineMap, leadingComments[0].pos)) {
+            writer.writeLine();
+        }
+    }
+    ts.emitNewLineBeforeLeadingCommentsOfPosition = emitNewLineBeforeLeadingCommentsOfPosition;
+    function emitNewLineBeforeLeadingCommentOfPosition(lineMap, writer, pos, commentPos) {
+        // If the leading comments start on different line than the start of node, write new line
+        if (pos !== commentPos &&
+            getLineOfLocalPositionFromLineMap(lineMap, pos) !== getLineOfLocalPositionFromLineMap(lineMap, commentPos)) {
+            writer.writeLine();
+        }
+    }
+    ts.emitNewLineBeforeLeadingCommentOfPosition = emitNewLineBeforeLeadingCommentOfPosition;
+    function emitComments(text, lineMap, writer, comments, leadingSeparator, trailingSeparator, newLine, writeComment) {
+        if (comments && comments.length > 0) {
+            if (leadingSeparator) {
+                writer.writeSpace(" ");
+            }
+            var emitInterveningSeparator = false;
+            for (var _i = 0, comments_1 = comments; _i < comments_1.length; _i++) {
+                var comment = comments_1[_i];
+                if (emitInterveningSeparator) {
+                    writer.writeSpace(" ");
+                    emitInterveningSeparator = false;
+                }
+                writeComment(text, lineMap, writer, comment.pos, comment.end, newLine);
+                if (comment.hasTrailingNewLine) {
+                    writer.writeLine();
+                }
+                else {
+                    emitInterveningSeparator = true;
+                }
+            }
+            if (emitInterveningSeparator && trailingSeparator) {
+                writer.writeSpace(" ");
+            }
+        }
+    }
+    ts.emitComments = emitComments;
+    /**
+     * Detached comment is a comment at the top of file or function body that is separated from
+     * the next statement by space.
+     */
+    function emitDetachedComments(text, lineMap, writer, writeComment, node, newLine, removeComments) {
+        var leadingComments;
+        var currentDetachedCommentInfo;
+        if (removeComments) {
+            // removeComments is true, only reserve pinned comment at the top of file
+            // For example:
+            //      /*! Pinned Comment */
+            //
+            //      var x = 10;
+            if (node.pos === 0) {
+                leadingComments = ts.filter(ts.getLeadingCommentRanges(text, node.pos), isPinnedCommentLocal);
+            }
+        }
+        else {
+            // removeComments is false, just get detached as normal and bypass the process to filter comment
+            leadingComments = ts.getLeadingCommentRanges(text, node.pos);
+        }
+        if (leadingComments) {
+            var detachedComments = [];
+            var lastComment = void 0;
+            for (var _i = 0, leadingComments_1 = leadingComments; _i < leadingComments_1.length; _i++) {
+                var comment = leadingComments_1[_i];
+                if (lastComment) {
+                    var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, lastComment.end);
+                    var commentLine = getLineOfLocalPositionFromLineMap(lineMap, comment.pos);
+                    if (commentLine >= lastCommentLine + 2) {
+                        // There was a blank line between the last comment and this comment.  This
+                        // comment is not part of the copyright comments.  Return what we have so
+                        // far.
+                        break;
+                    }
+                }
+                detachedComments.push(comment);
+                lastComment = comment;
+            }
+            if (detachedComments.length) {
+                // All comments look like they could have been part of the copyright header.  Make
+                // sure there is at least one blank line between it and the node.  If not, it's not
+                // a copyright header.
+                var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, ts.last(detachedComments).end);
+                var nodeLine = getLineOfLocalPositionFromLineMap(lineMap, ts.skipTrivia(text, node.pos));
+                if (nodeLine >= lastCommentLine + 2) {
+                    // Valid detachedComments
+                    emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments);
+                    emitComments(text, lineMap, writer, detachedComments, /*leadingSeparator*/ false, /*trailingSeparator*/ true, newLine, writeComment);
+                    currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: ts.last(detachedComments).end };
+                }
+            }
+        }
+        return currentDetachedCommentInfo;
+        function isPinnedCommentLocal(comment) {
+            return isPinnedComment(text, comment.pos);
+        }
+    }
+    ts.emitDetachedComments = emitDetachedComments;
+    function writeCommentRange(text, lineMap, writer, commentPos, commentEnd, newLine) {
+        if (text.charCodeAt(commentPos + 1) === 42 /* asterisk */) {
+            var firstCommentLineAndCharacter = ts.computeLineAndCharacterOfPosition(lineMap, commentPos);
+            var lineCount = lineMap.length;
+            var firstCommentLineIndent = void 0;
+            for (var pos = commentPos, currentLine = firstCommentLineAndCharacter.line; pos < commentEnd; currentLine++) {
+                var nextLineStart = (currentLine + 1) === lineCount
+                    ? text.length + 1
+                    : lineMap[currentLine + 1];
+                if (pos !== commentPos) {
+                    // If we are not emitting first line, we need to write the spaces to adjust the alignment
+                    if (firstCommentLineIndent === undefined) {
+                        firstCommentLineIndent = calculateIndent(text, lineMap[firstCommentLineAndCharacter.line], commentPos);
+                    }
+                    // These are number of spaces writer is going to write at current indent
+                    var currentWriterIndentSpacing = writer.getIndent() * getIndentSize();
+                    // Number of spaces we want to be writing
+                    // eg: Assume writer indent
+                    // module m {
+                    //         /* starts at character 9 this is line 1
+                    //    * starts at character pos 4 line                        --1  = 8 - 8 + 3
+                    //   More left indented comment */                            --2  = 8 - 8 + 2
+                    //     class c { }
+                    // }
+                    // module m {
+                    //     /* this is line 1 -- Assume current writer indent 8
+                    //      * line                                                --3 = 8 - 4 + 5
+                    //            More right indented comment */                  --4 = 8 - 4 + 11
+                    //     class c { }
+                    // }
+                    var spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(text, pos, nextLineStart);
+                    if (spacesToEmit > 0) {
+                        var numberOfSingleSpacesToEmit = spacesToEmit % getIndentSize();
+                        var indentSizeSpaceString = getIndentString((spacesToEmit - numberOfSingleSpacesToEmit) / getIndentSize());
+                        // Write indent size string ( in eg 1: = "", 2: "" , 3: string with 8 spaces 4: string with 12 spaces
+                        writer.rawWrite(indentSizeSpaceString);
+                        // Emit the single spaces (in eg: 1: 3 spaces, 2: 2 spaces, 3: 1 space, 4: 3 spaces)
+                        while (numberOfSingleSpacesToEmit) {
+                            writer.rawWrite(" ");
+                            numberOfSingleSpacesToEmit--;
+                        }
+                    }
+                    else {
+                        // No spaces to emit write empty string
+                        writer.rawWrite("");
+                    }
+                }
+                // Write the comment line text
+                writeTrimmedCurrentLine(text, commentEnd, writer, newLine, pos, nextLineStart);
+                pos = nextLineStart;
+            }
+        }
+        else {
+            // Single line comment of style //....
+            writer.writeComment(text.substring(commentPos, commentEnd));
+        }
+    }
+    ts.writeCommentRange = writeCommentRange;
+    function writeTrimmedCurrentLine(text, commentEnd, writer, newLine, pos, nextLineStart) {
+        var end = Math.min(commentEnd, nextLineStart - 1);
+        var currentLineText = text.substring(pos, end).replace(/^\s+|\s+$/g, "");
+        if (currentLineText) {
+            // trimmed forward and ending spaces text
+            writer.writeComment(currentLineText);
+            if (end !== commentEnd) {
+                writer.writeLine();
+            }
+        }
+        else {
+            // Empty string - make sure we write empty line
+            writer.rawWrite(newLine);
+        }
+    }
+    function calculateIndent(text, pos, end) {
+        var currentLineIndent = 0;
+        for (; pos < end && ts.isWhiteSpaceSingleLine(text.charCodeAt(pos)); pos++) {
+            if (text.charCodeAt(pos) === 9 /* tab */) {
+                // Tabs = TabSize = indent size and go to next tabStop
+                currentLineIndent += getIndentSize() - (currentLineIndent % getIndentSize());
+            }
+            else {
+                // Single space
+                currentLineIndent++;
+            }
+        }
+        return currentLineIndent;
+    }
+    function hasModifiers(node) {
+        return getModifierFlags(node) !== 0 /* None */;
+    }
+    ts.hasModifiers = hasModifiers;
+    function hasModifier(node, flags) {
+        return !!getSelectedModifierFlags(node, flags);
+    }
+    ts.hasModifier = hasModifier;
+    function hasStaticModifier(node) {
+        return hasModifier(node, 32 /* Static */);
+    }
+    ts.hasStaticModifier = hasStaticModifier;
+    function hasReadonlyModifier(node) {
+        return hasModifier(node, 64 /* Readonly */);
+    }
+    ts.hasReadonlyModifier = hasReadonlyModifier;
+    function getSelectedModifierFlags(node, flags) {
+        return getModifierFlags(node) & flags;
+    }
+    ts.getSelectedModifierFlags = getSelectedModifierFlags;
+    function getModifierFlags(node) {
+        if (node.modifierFlagsCache & 536870912 /* HasComputedFlags */) {
+            return node.modifierFlagsCache & ~536870912 /* HasComputedFlags */;
+        }
+        var flags = getModifierFlagsNoCache(node);
+        node.modifierFlagsCache = flags | 536870912 /* HasComputedFlags */;
+        return flags;
+    }
+    ts.getModifierFlags = getModifierFlags;
+    function getModifierFlagsNoCache(node) {
+        var flags = 0 /* None */;
+        if (node.modifiers) {
+            for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
+                var modifier = _a[_i];
+                flags |= modifierToFlag(modifier.kind);
+            }
+        }
+        if (node.flags & 4 /* NestedNamespace */ || (node.kind === 72 /* Identifier */ && node.isInJSDocNamespace)) {
+            flags |= 1 /* Export */;
+        }
+        return flags;
+    }
+    ts.getModifierFlagsNoCache = getModifierFlagsNoCache;
+    function modifierToFlag(token) {
+        switch (token) {
+            case 116 /* StaticKeyword */: return 32 /* Static */;
+            case 115 /* PublicKeyword */: return 4 /* Public */;
+            case 114 /* ProtectedKeyword */: return 16 /* Protected */;
+            case 113 /* PrivateKeyword */: return 8 /* Private */;
+            case 118 /* AbstractKeyword */: return 128 /* Abstract */;
+            case 85 /* ExportKeyword */: return 1 /* Export */;
+            case 125 /* DeclareKeyword */: return 2 /* Ambient */;
+            case 77 /* ConstKeyword */: return 2048 /* Const */;
+            case 80 /* DefaultKeyword */: return 512 /* Default */;
+            case 121 /* AsyncKeyword */: return 256 /* Async */;
+            case 133 /* ReadonlyKeyword */: return 64 /* Readonly */;
+        }
+        return 0 /* None */;
+    }
+    ts.modifierToFlag = modifierToFlag;
+    function isLogicalOperator(token) {
+        return token === 55 /* BarBarToken */
+            || token === 54 /* AmpersandAmpersandToken */
+            || token === 52 /* ExclamationToken */;
+    }
+    ts.isLogicalOperator = isLogicalOperator;
+    function isAssignmentOperator(token) {
+        return token >= 59 /* FirstAssignment */ && token <= 71 /* LastAssignment */;
+    }
+    ts.isAssignmentOperator = isAssignmentOperator;
+    /** Get `C` given `N` if `N` is in the position `class C extends N` where `N` is an ExpressionWithTypeArguments. */
+    function tryGetClassExtendingExpressionWithTypeArguments(node) {
+        var cls = tryGetClassImplementingOrExtendingExpressionWithTypeArguments(node);
+        return cls && !cls.isImplements ? cls.class : undefined;
+    }
+    ts.tryGetClassExtendingExpressionWithTypeArguments = tryGetClassExtendingExpressionWithTypeArguments;
+    function tryGetClassImplementingOrExtendingExpressionWithTypeArguments(node) {
+        return ts.isExpressionWithTypeArguments(node)
+            && ts.isHeritageClause(node.parent)
+            && ts.isClassLike(node.parent.parent)
+            ? { class: node.parent.parent, isImplements: node.parent.token === 109 /* ImplementsKeyword */ }
+            : undefined;
+    }
+    ts.tryGetClassImplementingOrExtendingExpressionWithTypeArguments = tryGetClassImplementingOrExtendingExpressionWithTypeArguments;
+    function isAssignmentExpression(node, excludeCompoundAssignment) {
+        return ts.isBinaryExpression(node)
+            && (excludeCompoundAssignment
+                ? node.operatorToken.kind === 59 /* EqualsToken */
+                : isAssignmentOperator(node.operatorToken.kind))
+            && ts.isLeftHandSideExpression(node.left);
+    }
+    ts.isAssignmentExpression = isAssignmentExpression;
+    function isDestructuringAssignment(node) {
+        if (isAssignmentExpression(node, /*excludeCompoundAssignment*/ true)) {
+            var kind = node.left.kind;
+            return kind === 188 /* ObjectLiteralExpression */
+                || kind === 187 /* ArrayLiteralExpression */;
+        }
+        return false;
+    }
+    ts.isDestructuringAssignment = isDestructuringAssignment;
+    function isExpressionWithTypeArgumentsInClassExtendsClause(node) {
+        return tryGetClassExtendingExpressionWithTypeArguments(node) !== undefined;
+    }
+    ts.isExpressionWithTypeArgumentsInClassExtendsClause = isExpressionWithTypeArgumentsInClassExtendsClause;
+    function isEntityNameExpression(node) {
+        return node.kind === 72 /* Identifier */ || isPropertyAccessEntityNameExpression(node);
+    }
+    ts.isEntityNameExpression = isEntityNameExpression;
+    function isPropertyAccessEntityNameExpression(node) {
+        return ts.isPropertyAccessExpression(node) && isEntityNameExpression(node.expression);
+    }
+    ts.isPropertyAccessEntityNameExpression = isPropertyAccessEntityNameExpression;
+    function isPrototypeAccess(node) {
+        return ts.isPropertyAccessExpression(node) && node.name.escapedText === "prototype";
+    }
+    ts.isPrototypeAccess = isPrototypeAccess;
+    function isRightSideOfQualifiedNameOrPropertyAccess(node) {
+        return (node.parent.kind === 148 /* QualifiedName */ && node.parent.right === node) ||
+            (node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node);
+    }
+    ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess;
+    function isEmptyObjectLiteral(expression) {
+        return expression.kind === 188 /* ObjectLiteralExpression */ &&
+            expression.properties.length === 0;
+    }
+    ts.isEmptyObjectLiteral = isEmptyObjectLiteral;
+    function isEmptyArrayLiteral(expression) {
+        return expression.kind === 187 /* ArrayLiteralExpression */ &&
+            expression.elements.length === 0;
+    }
+    ts.isEmptyArrayLiteral = isEmptyArrayLiteral;
+    function getLocalSymbolForExportDefault(symbol) {
+        return isExportDefaultSymbol(symbol) ? symbol.declarations[0].localSymbol : undefined;
+    }
+    ts.getLocalSymbolForExportDefault = getLocalSymbolForExportDefault;
+    function isExportDefaultSymbol(symbol) {
+        return symbol && ts.length(symbol.declarations) > 0 && hasModifier(symbol.declarations[0], 512 /* Default */);
+    }
+    /** Return ".ts", ".d.ts", or ".tsx", if that is the extension. */
+    function tryExtractTSExtension(fileName) {
+        return ts.find(ts.supportedTSExtensionsForExtractExtension, function (extension) { return ts.fileExtensionIs(fileName, extension); });
+    }
+    ts.tryExtractTSExtension = tryExtractTSExtension;
+    /**
+     * Replace each instance of non-ascii characters by one, two, three, or four escape sequences
+     * representing the UTF-8 encoding of the character, and return the expanded char code list.
+     */
+    function getExpandedCharCodes(input) {
+        var output = [];
+        var length = input.length;
+        for (var i = 0; i < length; i++) {
+            var charCode = input.charCodeAt(i);
+            // handle utf8
+            if (charCode < 0x80) {
+                output.push(charCode);
+            }
+            else if (charCode < 0x800) {
+                output.push((charCode >> 6) | 192);
+                output.push((charCode & 63) | 128);
+            }
+            else if (charCode < 0x10000) {
+                output.push((charCode >> 12) | 224);
+                output.push(((charCode >> 6) & 63) | 128);
+                output.push((charCode & 63) | 128);
+            }
+            else if (charCode < 0x20000) {
+                output.push((charCode >> 18) | 240);
+                output.push(((charCode >> 12) & 63) | 128);
+                output.push(((charCode >> 6) & 63) | 128);
+                output.push((charCode & 63) | 128);
+            }
+            else {
+                ts.Debug.assert(false, "Unexpected code point");
+            }
+        }
+        return output;
+    }
+    var base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+    /**
+     * Converts a string to a base-64 encoded ASCII string.
+     */
+    function convertToBase64(input) {
+        var result = "";
+        var charCodes = getExpandedCharCodes(input);
+        var i = 0;
+        var length = charCodes.length;
+        var byte1, byte2, byte3, byte4;
+        while (i < length) {
+            // Convert every 6-bits in the input 3 character points
+            // into a base64 digit
+            byte1 = charCodes[i] >> 2;
+            byte2 = (charCodes[i] & 3) << 4 | charCodes[i + 1] >> 4;
+            byte3 = (charCodes[i + 1] & 15) << 2 | charCodes[i + 2] >> 6;
+            byte4 = charCodes[i + 2] & 63;
+            // We are out of characters in the input, set the extra
+            // digits to 64 (padding character).
+            if (i + 1 >= length) {
+                byte3 = byte4 = 64;
+            }
+            else if (i + 2 >= length) {
+                byte4 = 64;
+            }
+            // Write to the output
+            result += base64Digits.charAt(byte1) + base64Digits.charAt(byte2) + base64Digits.charAt(byte3) + base64Digits.charAt(byte4);
+            i += 3;
+        }
+        return result;
+    }
+    ts.convertToBase64 = convertToBase64;
+    function getStringFromExpandedCharCodes(codes) {
+        var output = "";
+        var i = 0;
+        var length = codes.length;
+        while (i < length) {
+            var charCode = codes[i];
+            if (charCode < 0x80) {
+                output += String.fromCharCode(charCode);
+                i++;
+            }
+            else if ((charCode & 192) === 192) {
+                var value = charCode & 63;
+                i++;
+                var nextCode = codes[i];
+                while ((nextCode & 192) === 128) {
+                    value = (value << 6) | (nextCode & 63);
+                    i++;
+                    nextCode = codes[i];
+                }
+                // `value` may be greater than 10FFFF (the maximum unicode codepoint) - JS will just make this into an invalid character for us
+                output += String.fromCharCode(value);
+            }
+            else {
+                // We don't want to kill the process when decoding fails (due to a following char byte not
+                // following a leading char), so we just print the (bad) value
+                output += String.fromCharCode(charCode);
+                i++;
+            }
+        }
+        return output;
+    }
+    function base64encode(host, input) {
+        if (host && host.base64encode) {
+            return host.base64encode(input);
+        }
+        return convertToBase64(input);
+    }
+    ts.base64encode = base64encode;
+    function base64decode(host, input) {
+        if (host && host.base64decode) {
+            return host.base64decode(input);
+        }
+        var length = input.length;
+        var expandedCharCodes = [];
+        var i = 0;
+        while (i < length) {
+            // Stop decoding once padding characters are present
+            if (input.charCodeAt(i) === base64Digits.charCodeAt(64)) {
+                break;
+            }
+            // convert 4 input digits into three characters, ignoring padding characters at the end
+            var ch1 = base64Digits.indexOf(input[i]);
+            var ch2 = base64Digits.indexOf(input[i + 1]);
+            var ch3 = base64Digits.indexOf(input[i + 2]);
+            var ch4 = base64Digits.indexOf(input[i + 3]);
+            var code1 = ((ch1 & 63) << 2) | ((ch2 >> 4) & 3);
+            var code2 = ((ch2 & 15) << 4) | ((ch3 >> 2) & 15);
+            var code3 = ((ch3 & 3) << 6) | (ch4 & 63);
+            if (code2 === 0 && ch3 !== 0) { // code2 decoded to zero, but ch3 was padding - elide code2 and code3
+                expandedCharCodes.push(code1);
+            }
+            else if (code3 === 0 && ch4 !== 0) { // code3 decoded to zero, but ch4 was padding, elide code3
+                expandedCharCodes.push(code1, code2);
+            }
+            else {
+                expandedCharCodes.push(code1, code2, code3);
+            }
+            i += 4;
+        }
+        return getStringFromExpandedCharCodes(expandedCharCodes);
+    }
+    ts.base64decode = base64decode;
+    function readJson(path, host) {
+        try {
+            var jsonText = host.readFile(path);
+            if (!jsonText)
+                return {};
+            var result = ts.parseConfigFileTextToJson(path, jsonText);
+            if (result.error) {
+                return {};
+            }
+            return result.config;
+        }
+        catch (e) {
+            // gracefully handle if readFile fails or returns not JSON
+            return {};
+        }
+    }
+    ts.readJson = readJson;
+    function directoryProbablyExists(directoryName, host) {
+        // if host does not support 'directoryExists' assume that directory will exist
+        return !host.directoryExists || host.directoryExists(directoryName);
+    }
+    ts.directoryProbablyExists = directoryProbablyExists;
+    var carriageReturnLineFeed = "\r\n";
+    var lineFeed = "\n";
+    function getNewLineCharacter(options, getNewLine) {
+        switch (options.newLine) {
+            case 0 /* CarriageReturnLineFeed */:
+                return carriageReturnLineFeed;
+            case 1 /* LineFeed */:
+                return lineFeed;
+        }
+        return getNewLine ? getNewLine() : ts.sys ? ts.sys.newLine : carriageReturnLineFeed;
+    }
+    ts.getNewLineCharacter = getNewLineCharacter;
+    /**
+     * Formats an enum value as a string for debugging and debug assertions.
+     */
+    function formatEnum(value, enumObject, isFlags) {
+        if (value === void 0) { value = 0; }
+        var members = getEnumMembers(enumObject);
+        if (value === 0) {
+            return members.length > 0 && members[0][0] === 0 ? members[0][1] : "0";
+        }
+        if (isFlags) {
+            var result = "";
+            var remainingFlags = value;
+            for (var i = members.length - 1; i >= 0 && remainingFlags !== 0; i--) {
+                var _a = members[i], enumValue = _a[0], enumName = _a[1];
+                if (enumValue !== 0 && (remainingFlags & enumValue) === enumValue) {
+                    remainingFlags &= ~enumValue;
+                    result = "" + enumName + (result ? ", " : "") + result;
+                }
+            }
+            if (remainingFlags === 0) {
+                return result;
+            }
+        }
+        else {
+            for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
+                var _b = members_1[_i], enumValue = _b[0], enumName = _b[1];
+                if (enumValue === value) {
+                    return enumName;
+                }
+            }
+        }
+        return value.toString();
+    }
+    function getEnumMembers(enumObject) {
+        var result = [];
+        for (var name in enumObject) {
+            var value = enumObject[name];
+            if (typeof value === "number") {
+                result.push([value, name]);
+            }
+        }
+        return ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
+    }
+    function formatSyntaxKind(kind) {
+        return formatEnum(kind, ts.SyntaxKind, /*isFlags*/ false);
+    }
+    ts.formatSyntaxKind = formatSyntaxKind;
+    function formatModifierFlags(flags) {
+        return formatEnum(flags, ts.ModifierFlags, /*isFlags*/ true);
+    }
+    ts.formatModifierFlags = formatModifierFlags;
+    function formatTransformFlags(flags) {
+        return formatEnum(flags, ts.TransformFlags, /*isFlags*/ true);
+    }
+    ts.formatTransformFlags = formatTransformFlags;
+    function formatEmitFlags(flags) {
+        return formatEnum(flags, ts.EmitFlags, /*isFlags*/ true);
+    }
+    ts.formatEmitFlags = formatEmitFlags;
+    function formatSymbolFlags(flags) {
+        return formatEnum(flags, ts.SymbolFlags, /*isFlags*/ true);
+    }
+    ts.formatSymbolFlags = formatSymbolFlags;
+    function formatTypeFlags(flags) {
+        return formatEnum(flags, ts.TypeFlags, /*isFlags*/ true);
+    }
+    ts.formatTypeFlags = formatTypeFlags;
+    function formatObjectFlags(flags) {
+        return formatEnum(flags, ts.ObjectFlags, /*isFlags*/ true);
+    }
+    ts.formatObjectFlags = formatObjectFlags;
+    /**
+     * Creates a new TextRange from the provided pos and end.
+     *
+     * @param pos The start position.
+     * @param end The end position.
+     */
+    function createRange(pos, end) {
+        if (end === void 0) { end = pos; }
+        ts.Debug.assert(end >= pos || end === -1);
+        return { pos: pos, end: end };
+    }
+    ts.createRange = createRange;
+    /**
+     * Creates a new TextRange from a provided range with a new end position.
+     *
+     * @param range A TextRange.
+     * @param end The new end position.
+     */
+    function moveRangeEnd(range, end) {
+        return createRange(range.pos, end);
+    }
+    ts.moveRangeEnd = moveRangeEnd;
+    /**
+     * Creates a new TextRange from a provided range with a new start position.
+     *
+     * @param range A TextRange.
+     * @param pos The new Start position.
+     */
+    function moveRangePos(range, pos) {
+        return createRange(pos, range.end);
+    }
+    ts.moveRangePos = moveRangePos;
+    /**
+     * Moves the start position of a range past any decorators.
+     */
+    function moveRangePastDecorators(node) {
+        return node.decorators && node.decorators.length > 0
+            ? moveRangePos(node, node.decorators.end)
+            : node;
+    }
+    ts.moveRangePastDecorators = moveRangePastDecorators;
+    /**
+     * Moves the start position of a range past any decorators or modifiers.
+     */
+    function moveRangePastModifiers(node) {
+        return node.modifiers && node.modifiers.length > 0
+            ? moveRangePos(node, node.modifiers.end)
+            : moveRangePastDecorators(node);
+    }
+    ts.moveRangePastModifiers = moveRangePastModifiers;
+    /**
+     * Determines whether a TextRange has the same start and end positions.
+     *
+     * @param range A TextRange.
+     */
+    function isCollapsedRange(range) {
+        return range.pos === range.end;
+    }
+    ts.isCollapsedRange = isCollapsedRange;
+    /**
+     * Creates a new TextRange for a token at the provides start position.
+     *
+     * @param pos The start position.
+     * @param token The token.
+     */
+    function createTokenRange(pos, token) {
+        return createRange(pos, pos + ts.tokenToString(token).length);
+    }
+    ts.createTokenRange = createTokenRange;
+    function rangeIsOnSingleLine(range, sourceFile) {
+        return rangeStartIsOnSameLineAsRangeEnd(range, range, sourceFile);
+    }
+    ts.rangeIsOnSingleLine = rangeIsOnSingleLine;
+    function rangeStartPositionsAreOnSameLine(range1, range2, sourceFile) {
+        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile), getStartPositionOfRange(range2, sourceFile), sourceFile);
+    }
+    ts.rangeStartPositionsAreOnSameLine = rangeStartPositionsAreOnSameLine;
+    function rangeEndPositionsAreOnSameLine(range1, range2, sourceFile) {
+        return positionsAreOnSameLine(range1.end, range2.end, sourceFile);
+    }
+    ts.rangeEndPositionsAreOnSameLine = rangeEndPositionsAreOnSameLine;
+    function rangeStartIsOnSameLineAsRangeEnd(range1, range2, sourceFile) {
+        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile), range2.end, sourceFile);
+    }
+    ts.rangeStartIsOnSameLineAsRangeEnd = rangeStartIsOnSameLineAsRangeEnd;
+    function rangeEndIsOnSameLineAsRangeStart(range1, range2, sourceFile) {
+        return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile), sourceFile);
+    }
+    ts.rangeEndIsOnSameLineAsRangeStart = rangeEndIsOnSameLineAsRangeStart;
+    function positionsAreOnSameLine(pos1, pos2, sourceFile) {
+        return pos1 === pos2 ||
+            getLineOfLocalPosition(sourceFile, pos1) === getLineOfLocalPosition(sourceFile, pos2);
+    }
+    ts.positionsAreOnSameLine = positionsAreOnSameLine;
+    function getStartPositionOfRange(range, sourceFile) {
+        return ts.positionIsSynthesized(range.pos) ? -1 : ts.skipTrivia(sourceFile.text, range.pos);
+    }
+    ts.getStartPositionOfRange = getStartPositionOfRange;
+    /**
+     * Determines whether a name was originally the declaration name of an enum or namespace
+     * declaration.
+     */
+    function isDeclarationNameOfEnumOrNamespace(node) {
+        var parseNode = ts.getParseTreeNode(node);
+        if (parseNode) {
+            switch (parseNode.parent.kind) {
+                case 243 /* EnumDeclaration */:
+                case 244 /* ModuleDeclaration */:
+                    return parseNode === parseNode.parent.name;
+            }
+        }
+        return false;
+    }
+    ts.isDeclarationNameOfEnumOrNamespace = isDeclarationNameOfEnumOrNamespace;
+    function getInitializedVariables(node) {
+        return ts.filter(node.declarations, isInitializedVariable);
+    }
+    ts.getInitializedVariables = getInitializedVariables;
+    function isInitializedVariable(node) {
+        return node.initializer !== undefined;
+    }
+    function isWatchSet(options) {
+        // Firefox has Object.prototype.watch
+        return options.watch && options.hasOwnProperty("watch");
+    }
+    ts.isWatchSet = isWatchSet;
+    function closeFileWatcher(watcher) {
+        watcher.close();
+    }
+    ts.closeFileWatcher = closeFileWatcher;
+    function getCheckFlags(symbol) {
+        return symbol.flags & 33554432 /* Transient */ ? symbol.checkFlags : 0;
+    }
+    ts.getCheckFlags = getCheckFlags;
+    function getDeclarationModifierFlagsFromSymbol(s) {
+        if (s.valueDeclaration) {
+            var flags = ts.getCombinedModifierFlags(s.valueDeclaration);
+            return s.parent && s.parent.flags & 32 /* Class */ ? flags : flags & ~28 /* AccessibilityModifier */;
+        }
+        if (getCheckFlags(s) & 6 /* Synthetic */) {
+            var checkFlags = s.checkFlags;
+            var accessModifier = checkFlags & 512 /* ContainsPrivate */ ? 8 /* Private */ :
+                checkFlags & 128 /* ContainsPublic */ ? 4 /* Public */ :
+                    16 /* Protected */;
+            var staticModifier = checkFlags & 1024 /* ContainsStatic */ ? 32 /* Static */ : 0;
+            return accessModifier | staticModifier;
+        }
+        if (s.flags & 4194304 /* Prototype */) {
+            return 4 /* Public */ | 32 /* Static */;
+        }
+        return 0;
+    }
+    ts.getDeclarationModifierFlagsFromSymbol = getDeclarationModifierFlagsFromSymbol;
+    function skipAlias(symbol, checker) {
+        return symbol.flags & 2097152 /* Alias */ ? checker.getAliasedSymbol(symbol) : symbol;
+    }
+    ts.skipAlias = skipAlias;
+    /** See comment on `declareModuleMember` in `binder.ts`. */
+    function getCombinedLocalAndExportSymbolFlags(symbol) {
+        return symbol.exportSymbol ? symbol.exportSymbol.flags | symbol.flags : symbol.flags;
+    }
+    ts.getCombinedLocalAndExportSymbolFlags = getCombinedLocalAndExportSymbolFlags;
+    function isWriteOnlyAccess(node) {
+        return accessKind(node) === 1 /* Write */;
+    }
+    ts.isWriteOnlyAccess = isWriteOnlyAccess;
+    function isWriteAccess(node) {
+        return accessKind(node) !== 0 /* Read */;
+    }
+    ts.isWriteAccess = isWriteAccess;
+    var AccessKind;
+    (function (AccessKind) {
+        /** Only reads from a variable. */
+        AccessKind[AccessKind["Read"] = 0] = "Read";
+        /** Only writes to a variable without using the result. E.g.: `x++;`. */
+        AccessKind[AccessKind["Write"] = 1] = "Write";
+        /** Writes to a variable and uses the result as an expression. E.g.: `f(x++);`. */
+        AccessKind[AccessKind["ReadWrite"] = 2] = "ReadWrite";
+    })(AccessKind || (AccessKind = {}));
+    function accessKind(node) {
+        var parent = node.parent;
+        if (!parent)
+            return 0 /* Read */;
+        switch (parent.kind) {
+            case 195 /* ParenthesizedExpression */:
+                return accessKind(parent);
+            case 203 /* PostfixUnaryExpression */:
+            case 202 /* PrefixUnaryExpression */:
+                var operator = parent.operator;
+                return operator === 44 /* PlusPlusToken */ || operator === 45 /* MinusMinusToken */ ? writeOrReadWrite() : 0 /* Read */;
+            case 204 /* BinaryExpression */:
+                var _a = parent, left = _a.left, operatorToken = _a.operatorToken;
+                return left === node && isAssignmentOperator(operatorToken.kind) ?
+                    operatorToken.kind === 59 /* EqualsToken */ ? 1 /* Write */ : writeOrReadWrite()
+                    : 0 /* Read */;
+            case 189 /* PropertyAccessExpression */:
+                return parent.name !== node ? 0 /* Read */ : accessKind(parent);
+            case 275 /* PropertyAssignment */: {
+                var parentAccess = accessKind(parent.parent);
+                // In `({ x: varname }) = { x: 1 }`, the left `x` is a read, the right `x` is a write.
+                return node === parent.name ? reverseAccessKind(parentAccess) : parentAccess;
+            }
+            case 276 /* ShorthandPropertyAssignment */:
+                // Assume it's the local variable being accessed, since we don't check public properties for --noUnusedLocals.
+                return node === parent.objectAssignmentInitializer ? 0 /* Read */ : accessKind(parent.parent);
+            case 187 /* ArrayLiteralExpression */:
+                return accessKind(parent);
+            default:
+                return 0 /* Read */;
+        }
+        function writeOrReadWrite() {
+            // If grandparent is not an ExpressionStatement, this is used as an expression in addition to having a side effect.
+            return parent.parent && skipParenthesesUp(parent.parent).kind === 221 /* ExpressionStatement */ ? 1 /* Write */ : 2 /* ReadWrite */;
+        }
+    }
+    function reverseAccessKind(a) {
+        switch (a) {
+            case 0 /* Read */:
+                return 1 /* Write */;
+            case 1 /* Write */:
+                return 0 /* Read */;
+            case 2 /* ReadWrite */:
+                return 2 /* ReadWrite */;
+            default:
+                return ts.Debug.assertNever(a);
+        }
+    }
+    function compareDataObjects(dst, src) {
+        if (!dst || !src || Object.keys(dst).length !== Object.keys(src).length) {
+            return false;
+        }
+        for (var e in dst) {
+            if (typeof dst[e] === "object") {
+                if (!compareDataObjects(dst[e], src[e])) {
+                    return false;
+                }
+            }
+            else if (typeof dst[e] !== "function") {
+                if (dst[e] !== src[e]) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+    ts.compareDataObjects = compareDataObjects;
+    /**
+     * clears already present map by calling onDeleteExistingValue callback before deleting that key/value
+     */
+    function clearMap(map, onDeleteValue) {
+        // Remove all
+        map.forEach(onDeleteValue);
+        map.clear();
+    }
+    ts.clearMap = clearMap;
+    /**
+     * Mutates the map with newMap such that keys in map will be same as newMap.
+     */
+    function mutateMap(map, newMap, options) {
+        var createNewValue = options.createNewValue, onDeleteValue = options.onDeleteValue, onExistingValue = options.onExistingValue;
+        // Needs update
+        map.forEach(function (existingValue, key) {
+            var valueInNewMap = newMap.get(key);
+            // Not present any more in new map, remove it
+            if (valueInNewMap === undefined) {
+                map.delete(key);
+                onDeleteValue(existingValue, key);
+            }
+            // If present notify about existing values
+            else if (onExistingValue) {
+                onExistingValue(existingValue, valueInNewMap, key);
+            }
+        });
+        // Add new values that are not already present
+        newMap.forEach(function (valueInNewMap, key) {
+            if (!map.has(key)) {
+                // New values
+                map.set(key, createNewValue(key, valueInNewMap));
+            }
+        });
+    }
+    ts.mutateMap = mutateMap;
+    /** Calls `callback` on `directory` and every ancestor directory it has, returning the first defined result. */
+    function forEachAncestorDirectory(directory, callback) {
+        while (true) {
+            var result = callback(directory);
+            if (result !== undefined) {
+                return result;
+            }
+            var parentPath = ts.getDirectoryPath(directory);
+            if (parentPath === directory) {
+                return undefined;
+            }
+            directory = parentPath;
+        }
+    }
+    ts.forEachAncestorDirectory = forEachAncestorDirectory;
+    // Return true if the given type is the constructor type for an abstract class
+    function isAbstractConstructorType(type) {
+        return !!(getObjectFlags(type) & 16 /* Anonymous */) && !!type.symbol && isAbstractConstructorSymbol(type.symbol);
+    }
+    ts.isAbstractConstructorType = isAbstractConstructorType;
+    function isAbstractConstructorSymbol(symbol) {
+        if (symbol.flags & 32 /* Class */) {
+            var declaration = getClassLikeDeclarationOfSymbol(symbol);
+            return !!declaration && hasModifier(declaration, 128 /* Abstract */);
+        }
+        return false;
+    }
+    ts.isAbstractConstructorSymbol = isAbstractConstructorSymbol;
+    function getClassLikeDeclarationOfSymbol(symbol) {
+        return ts.find(symbol.declarations, ts.isClassLike);
+    }
+    ts.getClassLikeDeclarationOfSymbol = getClassLikeDeclarationOfSymbol;
+    function getObjectFlags(type) {
+        return type.flags & 524288 /* Object */ ? type.objectFlags : 0;
+    }
+    ts.getObjectFlags = getObjectFlags;
+    function typeHasCallOrConstructSignatures(type, checker) {
+        return checker.getSignaturesOfType(type, 0 /* Call */).length !== 0 || checker.getSignaturesOfType(type, 1 /* Construct */).length !== 0;
+    }
+    ts.typeHasCallOrConstructSignatures = typeHasCallOrConstructSignatures;
+    function forSomeAncestorDirectory(directory, callback) {
+        return !!forEachAncestorDirectory(directory, function (d) { return callback(d) ? true : undefined; });
+    }
+    ts.forSomeAncestorDirectory = forSomeAncestorDirectory;
+    function isUMDExportSymbol(symbol) {
+        return !!symbol && !!symbol.declarations && !!symbol.declarations[0] && ts.isNamespaceExportDeclaration(symbol.declarations[0]);
+    }
+    ts.isUMDExportSymbol = isUMDExportSymbol;
+    function showModuleSpecifier(_a) {
+        var moduleSpecifier = _a.moduleSpecifier;
+        return ts.isStringLiteral(moduleSpecifier) ? moduleSpecifier.text : getTextOfNode(moduleSpecifier);
+    }
+    ts.showModuleSpecifier = showModuleSpecifier;
+    function getLastChild(node) {
+        var lastChild;
+        ts.forEachChild(node, function (child) {
+            if (nodeIsPresent(child))
+                lastChild = child;
+        }, function (children) {
+            // As an optimization, jump straight to the end of the list.
+            for (var i = children.length - 1; i >= 0; i--) {
+                if (nodeIsPresent(children[i])) {
+                    lastChild = children[i];
+                    break;
+                }
+            }
+        });
+        return lastChild;
+    }
+    ts.getLastChild = getLastChild;
+    function addToSeen(seen, key, value) {
+        if (value === void 0) { value = true; }
+        key = String(key);
+        if (seen.has(key)) {
+            return false;
+        }
+        seen.set(key, value);
+        return true;
+    }
+    ts.addToSeen = addToSeen;
+    function isObjectTypeDeclaration(node) {
+        return ts.isClassLike(node) || ts.isInterfaceDeclaration(node) || ts.isTypeLiteralNode(node);
+    }
+    ts.isObjectTypeDeclaration = isObjectTypeDeclaration;
+    function isTypeNodeKind(kind) {
+        return (kind >= 163 /* FirstTypeNode */ && kind <= 183 /* LastTypeNode */)
+            || kind === 120 /* AnyKeyword */
+            || kind === 143 /* UnknownKeyword */
+            || kind === 135 /* NumberKeyword */
+            || kind === 146 /* BigIntKeyword */
+            || kind === 136 /* ObjectKeyword */
+            || kind === 123 /* BooleanKeyword */
+            || kind === 138 /* StringKeyword */
+            || kind === 139 /* SymbolKeyword */
+            || kind === 100 /* ThisKeyword */
+            || kind === 106 /* VoidKeyword */
+            || kind === 141 /* UndefinedKeyword */
+            || kind === 96 /* NullKeyword */
+            || kind === 132 /* NeverKeyword */
+            || kind === 211 /* ExpressionWithTypeArguments */
+            || kind === 284 /* JSDocAllType */
+            || kind === 285 /* JSDocUnknownType */
+            || kind === 286 /* JSDocNullableType */
+            || kind === 287 /* JSDocNonNullableType */
+            || kind === 288 /* JSDocOptionalType */
+            || kind === 289 /* JSDocFunctionType */
+            || kind === 290 /* JSDocVariadicType */;
+    }
+    ts.isTypeNodeKind = isTypeNodeKind;
+    function isAccessExpression(node) {
+        return node.kind === 189 /* PropertyAccessExpression */ || node.kind === 190 /* ElementAccessExpression */;
+    }
+    ts.isAccessExpression = isAccessExpression;
+})(ts || (ts = {}));
+(function (ts) {
+    function getDefaultLibFileName(options) {
+        switch (options.target) {
+            case 6 /* ESNext */:
+                return "lib.esnext.full.d.ts";
+            case 5 /* ES2018 */:
+                return "lib.es2018.full.d.ts";
+            case 4 /* ES2017 */:
+                return "lib.es2017.full.d.ts";
+            case 3 /* ES2016 */:
+                return "lib.es2016.full.d.ts";
+            case 2 /* ES2015 */:
+                return "lib.es6.d.ts"; // We don't use lib.es2015.full.d.ts due to breaking change.
+            default:
+                return "lib.d.ts";
+        }
+    }
+    ts.getDefaultLibFileName = getDefaultLibFileName;
+    function textSpanEnd(span) {
+        return span.start + span.length;
+    }
+    ts.textSpanEnd = textSpanEnd;
+    function textSpanIsEmpty(span) {
+        return span.length === 0;
+    }
+    ts.textSpanIsEmpty = textSpanIsEmpty;
+    function textSpanContainsPosition(span, position) {
+        return position >= span.start && position < textSpanEnd(span);
+    }
+    ts.textSpanContainsPosition = textSpanContainsPosition;
+    /* @internal */
+    function textRangeContainsPositionInclusive(span, position) {
+        return position >= span.pos && position <= span.end;
+    }
+    ts.textRangeContainsPositionInclusive = textRangeContainsPositionInclusive;
+    // Returns true if 'span' contains 'other'.
+    function textSpanContainsTextSpan(span, other) {
+        return other.start >= span.start && textSpanEnd(other) <= textSpanEnd(span);
+    }
+    ts.textSpanContainsTextSpan = textSpanContainsTextSpan;
+    function textSpanOverlapsWith(span, other) {
+        return textSpanOverlap(span, other) !== undefined;
+    }
+    ts.textSpanOverlapsWith = textSpanOverlapsWith;
+    function textSpanOverlap(span1, span2) {
+        var overlap = textSpanIntersection(span1, span2);
+        return overlap && overlap.length === 0 ? undefined : overlap;
+    }
+    ts.textSpanOverlap = textSpanOverlap;
+    function textSpanIntersectsWithTextSpan(span, other) {
+        return decodedTextSpanIntersectsWith(span.start, span.length, other.start, other.length);
+    }
+    ts.textSpanIntersectsWithTextSpan = textSpanIntersectsWithTextSpan;
+    function textSpanIntersectsWith(span, start, length) {
+        return decodedTextSpanIntersectsWith(span.start, span.length, start, length);
+    }
+    ts.textSpanIntersectsWith = textSpanIntersectsWith;
+    function decodedTextSpanIntersectsWith(start1, length1, start2, length2) {
+        var end1 = start1 + length1;
+        var end2 = start2 + length2;
+        return start2 <= end1 && end2 >= start1;
+    }
+    ts.decodedTextSpanIntersectsWith = decodedTextSpanIntersectsWith;
+    function textSpanIntersectsWithPosition(span, position) {
+        return position <= textSpanEnd(span) && position >= span.start;
+    }
+    ts.textSpanIntersectsWithPosition = textSpanIntersectsWithPosition;
+    function textSpanIntersection(span1, span2) {
+        var start = Math.max(span1.start, span2.start);
+        var end = Math.min(textSpanEnd(span1), textSpanEnd(span2));
+        return start <= end ? createTextSpanFromBounds(start, end) : undefined;
+    }
+    ts.textSpanIntersection = textSpanIntersection;
+    function createTextSpan(start, length) {
+        if (start < 0) {
+            throw new Error("start < 0");
+        }
+        if (length < 0) {
+            throw new Error("length < 0");
+        }
+        return { start: start, length: length };
+    }
+    ts.createTextSpan = createTextSpan;
+    function createTextSpanFromBounds(start, end) {
+        return createTextSpan(start, end - start);
+    }
+    ts.createTextSpanFromBounds = createTextSpanFromBounds;
+    function textChangeRangeNewSpan(range) {
+        return createTextSpan(range.span.start, range.newLength);
+    }
+    ts.textChangeRangeNewSpan = textChangeRangeNewSpan;
+    function textChangeRangeIsUnchanged(range) {
+        return textSpanIsEmpty(range.span) && range.newLength === 0;
+    }
+    ts.textChangeRangeIsUnchanged = textChangeRangeIsUnchanged;
+    function createTextChangeRange(span, newLength) {
+        if (newLength < 0) {
+            throw new Error("newLength < 0");
+        }
+        return { span: span, newLength: newLength };
+    }
+    ts.createTextChangeRange = createTextChangeRange;
+    ts.unchangedTextChangeRange = createTextChangeRange(createTextSpan(0, 0), 0);
+    /**
+     * Called to merge all the changes that occurred across several versions of a script snapshot
+     * into a single change.  i.e. if a user keeps making successive edits to a script we will
+     * have a text change from V1 to V2, V2 to V3, ..., Vn.
+     *
+     * This function will then merge those changes into a single change range valid between V1 and
+     * Vn.
+     */
+    function collapseTextChangeRangesAcrossMultipleVersions(changes) {
+        if (changes.length === 0) {
+            return ts.unchangedTextChangeRange;
+        }
+        if (changes.length === 1) {
+            return changes[0];
+        }
+        // We change from talking about { { oldStart, oldLength }, newLength } to { oldStart, oldEnd, newEnd }
+        // as it makes things much easier to reason about.
+        var change0 = changes[0];
+        var oldStartN = change0.span.start;
+        var oldEndN = textSpanEnd(change0.span);
+        var newEndN = oldStartN + change0.newLength;
+        for (var i = 1; i < changes.length; i++) {
+            var nextChange = changes[i];
+            // Consider the following case:
+            // i.e. two edits.  The first represents the text change range { { 10, 50 }, 30 }.  i.e. The span starting
+            // at 10, with length 50 is reduced to length 30.  The second represents the text change range { { 30, 30 }, 40 }.
+            // i.e. the span starting at 30 with length 30 is increased to length 40.
+            //
+            //      0         10        20        30        40        50        60        70        80        90        100
+            //      -------------------------------------------------------------------------------------------------------
+            //                |                                                 /
+            //                |                                            /----
+            //  T1            |                                       /----
+            //                |                                  /----
+            //                |                             /----
+            //      -------------------------------------------------------------------------------------------------------
+            //                                     |                            \
+            //                                     |                               \
+            //   T2                                |                                 \
+            //                                     |                                   \
+            //                                     |                                      \
+            //      -------------------------------------------------------------------------------------------------------
+            //
+            // Merging these turns out to not be too difficult.  First, determining the new start of the change is trivial
+            // it's just the min of the old and new starts.  i.e.:
+            //
+            //      0         10        20        30        40        50        60        70        80        90        100
+            //      ------------------------------------------------------------*------------------------------------------
+            //                |                                                 /
+            //                |                                            /----
+            //  T1            |                                       /----
+            //                |                                  /----
+            //                |                             /----
+            //      ----------------------------------------$-------------------$------------------------------------------
+            //                .                    |                            \
+            //                .                    |                               \
+            //   T2           .                    |                                 \
+            //                .                    |                                   \
+            //                .                    |                                      \
+            //      ----------------------------------------------------------------------*--------------------------------
+            //
+            // (Note the dots represent the newly inferred start.
+            // Determining the new and old end is also pretty simple.  Basically it boils down to paying attention to the
+            // absolute positions at the asterisks, and the relative change between the dollar signs. Basically, we see
+            // which if the two $'s precedes the other, and we move that one forward until they line up.  in this case that
+            // means:
+            //
+            //      0         10        20        30        40        50        60        70        80        90        100
+            //      --------------------------------------------------------------------------------*----------------------
+            //                |                                                                     /
+            //                |                                                                /----
+            //  T1            |                                                           /----
+            //                |                                                      /----
+            //                |                                                 /----
+            //      ------------------------------------------------------------$------------------------------------------
+            //                .                    |                            \
+            //                .                    |                               \
+            //   T2           .                    |                                 \
+            //                .                    |                                   \
+            //                .                    |                                      \
+            //      ----------------------------------------------------------------------*--------------------------------
+            //
+            // In other words (in this case), we're recognizing that the second edit happened after where the first edit
+            // ended with a delta of 20 characters (60 - 40).  Thus, if we go back in time to where the first edit started
+            // that's the same as if we started at char 80 instead of 60.
+            //
+            // As it so happens, the same logic applies if the second edit precedes the first edit.  In that case rather
+            // than pushing the first edit forward to match the second, we'll push the second edit forward to match the
+            // first.
+            //
+            // In this case that means we have { oldStart: 10, oldEnd: 80, newEnd: 70 } or, in TextChangeRange
+            // semantics: { { start: 10, length: 70 }, newLength: 60 }
+            //
+            // The math then works out as follows.
+            // If we have { oldStart1, oldEnd1, newEnd1 } and { oldStart2, oldEnd2, newEnd2 } then we can compute the
+            // final result like so:
+            //
+            // {
+            //      oldStart3: Min(oldStart1, oldStart2),
+            //      oldEnd3: Max(oldEnd1, oldEnd1 + (oldEnd2 - newEnd1)),
+            //      newEnd3: Max(newEnd2, newEnd2 + (newEnd1 - oldEnd2))
+            // }
+            var oldStart1 = oldStartN;
+            var oldEnd1 = oldEndN;
+            var newEnd1 = newEndN;
+            var oldStart2 = nextChange.span.start;
+            var oldEnd2 = textSpanEnd(nextChange.span);
+            var newEnd2 = oldStart2 + nextChange.newLength;
+            oldStartN = Math.min(oldStart1, oldStart2);
+            oldEndN = Math.max(oldEnd1, oldEnd1 + (oldEnd2 - newEnd1));
+            newEndN = Math.max(newEnd2, newEnd2 + (newEnd1 - oldEnd2));
+        }
+        return createTextChangeRange(createTextSpanFromBounds(oldStartN, oldEndN), /*newLength*/ newEndN - oldStartN);
+    }
+    ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
+    function getTypeParameterOwner(d) {
+        if (d && d.kind === 150 /* TypeParameter */) {
+            for (var current = d; current; current = current.parent) {
+                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 241 /* InterfaceDeclaration */) {
+                    return current;
+                }
+            }
+        }
+    }
+    ts.getTypeParameterOwner = getTypeParameterOwner;
+    function isParameterPropertyDeclaration(node) {
+        return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) && node.parent.kind === 157 /* Constructor */;
+    }
+    ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration;
+    function isEmptyBindingPattern(node) {
+        if (ts.isBindingPattern(node)) {
+            return ts.every(node.elements, isEmptyBindingElement);
+        }
+        return false;
+    }
+    ts.isEmptyBindingPattern = isEmptyBindingPattern;
+    function isEmptyBindingElement(node) {
+        if (ts.isOmittedExpression(node)) {
+            return true;
+        }
+        return isEmptyBindingPattern(node.name);
+    }
+    ts.isEmptyBindingElement = isEmptyBindingElement;
+    function walkUpBindingElementsAndPatterns(binding) {
+        var node = binding.parent;
+        while (ts.isBindingElement(node.parent)) {
+            node = node.parent.parent;
+        }
+        return node.parent;
+    }
+    ts.walkUpBindingElementsAndPatterns = walkUpBindingElementsAndPatterns;
+    function getCombinedFlags(node, getFlags) {
+        if (ts.isBindingElement(node)) {
+            node = walkUpBindingElementsAndPatterns(node);
+        }
+        var flags = getFlags(node);
+        if (node.kind === 237 /* VariableDeclaration */) {
+            node = node.parent;
+        }
+        if (node && node.kind === 238 /* VariableDeclarationList */) {
+            flags |= getFlags(node);
+            node = node.parent;
+        }
+        if (node && node.kind === 219 /* VariableStatement */) {
+            flags |= getFlags(node);
+        }
+        return flags;
+    }
+    function getCombinedModifierFlags(node) {
+        return getCombinedFlags(node, ts.getModifierFlags);
+    }
+    ts.getCombinedModifierFlags = getCombinedModifierFlags;
+    // Returns the node flags for this node and all relevant parent nodes.  This is done so that
+    // nodes like variable declarations and binding elements can returned a view of their flags
+    // that includes the modifiers from their container.  i.e. flags like export/declare aren't
+    // stored on the variable declaration directly, but on the containing variable statement
+    // (if it has one).  Similarly, flags for let/const are store on the variable declaration
+    // list.  By calling this function, all those flags are combined so that the client can treat
+    // the node as if it actually had those flags.
+    function getCombinedNodeFlags(node) {
+        return getCombinedFlags(node, function (n) { return n.flags; });
+    }
+    ts.getCombinedNodeFlags = getCombinedNodeFlags;
+    /**
+     * Checks to see if the locale is in the appropriate format,
+     * and if it is, attempts to set the appropriate language.
+     */
+    function validateLocaleAndSetLanguage(locale, sys, errors) {
+        var matchResult = /^([a-z]+)([_\-]([a-z]+))?$/.exec(locale.toLowerCase());
+        if (!matchResult) {
+            if (errors) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1, "en", "ja-jp"));
+            }
+            return;
+        }
+        var language = matchResult[1];
+        var territory = matchResult[3];
+        // First try the entire locale, then fall back to just language if that's all we have.
+        // Either ways do not fail, and fallback to the English diagnostic strings.
+        if (!trySetLanguageAndTerritory(language, territory, errors)) {
+            trySetLanguageAndTerritory(language, /*territory*/ undefined, errors);
+        }
+        // Set the UI locale for string collation
+        ts.setUILocale(locale);
+        function trySetLanguageAndTerritory(language, territory, errors) {
+            var compilerFilePath = ts.normalizePath(sys.getExecutingFilePath());
+            var containingDirectoryPath = ts.getDirectoryPath(compilerFilePath);
+            var filePath = ts.combinePaths(containingDirectoryPath, language);
+            if (territory) {
+                filePath = filePath + "-" + territory;
+            }
+            filePath = sys.resolvePath(ts.combinePaths(filePath, "diagnosticMessages.generated.json"));
+            if (!sys.fileExists(filePath)) {
+                return false;
+            }
+            // TODO: Add codePage support for readFile?
+            var fileContents = "";
+            try {
+                fileContents = sys.readFile(filePath);
+            }
+            catch (e) {
+                if (errors) {
+                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unable_to_open_file_0, filePath));
+                }
+                return false;
+            }
+            try {
+                // tslint:disable-next-line no-unnecessary-qualifier (making clear this is a global mutation!)
+                ts.localizedDiagnosticMessages = JSON.parse(fileContents);
+            }
+            catch (_a) {
+                if (errors) {
+                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Corrupted_locale_file_0, filePath));
+                }
+                return false;
+            }
+            return true;
+        }
+    }
+    ts.validateLocaleAndSetLanguage = validateLocaleAndSetLanguage;
+    function getOriginalNode(node, nodeTest) {
+        if (node) {
+            while (node.original !== undefined) {
+                node = node.original;
+            }
+        }
+        return !nodeTest || nodeTest(node) ? node : undefined;
+    }
+    ts.getOriginalNode = getOriginalNode;
+    /**
+     * Gets a value indicating whether a node originated in the parse tree.
+     *
+     * @param node The node to test.
+     */
+    function isParseTreeNode(node) {
+        return (node.flags & 8 /* Synthesized */) === 0;
+    }
+    ts.isParseTreeNode = isParseTreeNode;
+    function getParseTreeNode(node, nodeTest) {
+        if (node === undefined || isParseTreeNode(node)) {
+            return node;
+        }
+        node = getOriginalNode(node);
+        if (isParseTreeNode(node) && (!nodeTest || nodeTest(node))) {
+            return node;
+        }
+        return undefined;
+    }
+    ts.getParseTreeNode = getParseTreeNode;
+    /** Add an extra underscore to identifiers that start with two underscores to avoid issues with magic names like '__proto__' */
+    function escapeLeadingUnderscores(identifier) {
+        return (identifier.length >= 2 && identifier.charCodeAt(0) === 95 /* _ */ && identifier.charCodeAt(1) === 95 /* _ */ ? "_" + identifier : identifier);
+    }
+    ts.escapeLeadingUnderscores = escapeLeadingUnderscores;
+    /**
+     * Remove extra underscore from escaped identifier text content.
+     *
+     * @param identifier The escaped identifier text.
+     * @returns The unescaped identifier text.
+     */
+    function unescapeLeadingUnderscores(identifier) {
+        var id = identifier;
+        return id.length >= 3 && id.charCodeAt(0) === 95 /* _ */ && id.charCodeAt(1) === 95 /* _ */ && id.charCodeAt(2) === 95 /* _ */ ? id.substr(1) : id;
+    }
+    ts.unescapeLeadingUnderscores = unescapeLeadingUnderscores;
+    function idText(identifier) {
+        return unescapeLeadingUnderscores(identifier.escapedText);
+    }
+    ts.idText = idText;
+    function symbolName(symbol) {
+        return unescapeLeadingUnderscores(symbol.escapedName);
+    }
+    ts.symbolName = symbolName;
+    /**
+     * A JSDocTypedef tag has an _optional_ name field - if a name is not directly present, we should
+     * attempt to draw the name from the node the declaration is on (as that declaration is what its' symbol
+     * will be merged with)
+     */
+    function nameForNamelessJSDocTypedef(declaration) {
+        var hostNode = declaration.parent.parent;
+        if (!hostNode) {
+            return undefined;
+        }
+        // Covers classes, functions - any named declaration host node
+        if (ts.isDeclaration(hostNode)) {
+            return getDeclarationIdentifier(hostNode);
+        }
+        // Covers remaining cases (returning undefined if none match).
+        switch (hostNode.kind) {
+            case 219 /* VariableStatement */:
+                if (hostNode.declarationList && hostNode.declarationList.declarations[0]) {
+                    return getDeclarationIdentifier(hostNode.declarationList.declarations[0]);
+                }
+                break;
+            case 221 /* ExpressionStatement */:
+                var expr = hostNode.expression;
+                switch (expr.kind) {
+                    case 189 /* PropertyAccessExpression */:
+                        return expr.name;
+                    case 190 /* ElementAccessExpression */:
+                        var arg = expr.argumentExpression;
+                        if (ts.isIdentifier(arg)) {
+                            return arg;
+                        }
+                }
+                break;
+            case 195 /* ParenthesizedExpression */: {
+                return getDeclarationIdentifier(hostNode.expression);
+            }
+            case 233 /* LabeledStatement */: {
+                if (ts.isDeclaration(hostNode.statement) || ts.isExpression(hostNode.statement)) {
+                    return getDeclarationIdentifier(hostNode.statement);
+                }
+                break;
+            }
+        }
+    }
+    function getDeclarationIdentifier(node) {
+        var name = getNameOfDeclaration(node);
+        return name && ts.isIdentifier(name) ? name : undefined;
+    }
+    function getNameOfJSDocTypedef(declaration) {
+        return declaration.name || nameForNamelessJSDocTypedef(declaration);
+    }
+    ts.getNameOfJSDocTypedef = getNameOfJSDocTypedef;
+    /** @internal */
+    function isNamedDeclaration(node) {
+        return !!node.name; // A 'name' property should always be a DeclarationName.
+    }
+    ts.isNamedDeclaration = isNamedDeclaration;
+    /** @internal */
+    function getNonAssignedNameOfDeclaration(declaration) {
+        switch (declaration.kind) {
+            case 72 /* Identifier */:
+                return declaration;
+            case 305 /* JSDocPropertyTag */:
+            case 299 /* JSDocParameterTag */: {
+                var name = declaration.name;
+                if (name.kind === 148 /* QualifiedName */) {
+                    return name.right;
+                }
+                break;
+            }
+            case 191 /* CallExpression */:
+            case 204 /* BinaryExpression */: {
+                var expr = declaration;
+                switch (ts.getAssignmentDeclarationKind(expr)) {
+                    case 1 /* ExportsProperty */:
+                    case 4 /* ThisProperty */:
+                    case 5 /* Property */:
+                    case 3 /* PrototypeProperty */:
+                        return expr.left.name;
+                    case 7 /* ObjectDefinePropertyValue */:
+                    case 8 /* ObjectDefinePropertyExports */:
+                    case 9 /* ObjectDefinePrototypeProperty */:
+                        return expr.arguments[1];
+                    default:
+                        return undefined;
+                }
+            }
+            case 304 /* JSDocTypedefTag */:
+                return getNameOfJSDocTypedef(declaration);
+            case 254 /* ExportAssignment */: {
+                var expression = declaration.expression;
+                return ts.isIdentifier(expression) ? expression : undefined;
+            }
+        }
+        return declaration.name;
+    }
+    ts.getNonAssignedNameOfDeclaration = getNonAssignedNameOfDeclaration;
+    function getNameOfDeclaration(declaration) {
+        if (declaration === undefined)
+            return undefined;
+        return getNonAssignedNameOfDeclaration(declaration) ||
+            (ts.isFunctionExpression(declaration) || ts.isClassExpression(declaration) ? getAssignedName(declaration) : undefined);
+    }
+    ts.getNameOfDeclaration = getNameOfDeclaration;
+    function getAssignedName(node) {
+        if (!node.parent) {
+            return undefined;
+        }
+        else if (ts.isPropertyAssignment(node.parent) || ts.isBindingElement(node.parent)) {
+            return node.parent.name;
+        }
+        else if (ts.isBinaryExpression(node.parent) && node === node.parent.right) {
+            if (ts.isIdentifier(node.parent.left)) {
+                return node.parent.left;
+            }
+            else if (ts.isPropertyAccessExpression(node.parent.left)) {
+                return node.parent.left.name;
+            }
+        }
+    }
+    /**
+     * Gets the JSDoc parameter tags for the node if present.
+     *
+     * @remarks Returns any JSDoc param tag whose name matches the provided
+     * parameter, whether a param tag on a containing function
+     * expression, or a param tag on a variable declaration whose
+     * initializer is the containing function. The tags closest to the
+     * node are returned first, so in the previous example, the param
+     * tag on the containing function expression would be first.
+     *
+     * For binding patterns, parameter tags are matched by position.
+     */
+    function getJSDocParameterTags(param) {
+        if (param.name) {
+            if (ts.isIdentifier(param.name)) {
+                var name_1 = param.name.escapedText;
+                return getJSDocTags(param.parent).filter(function (tag) { return ts.isJSDocParameterTag(tag) && ts.isIdentifier(tag.name) && tag.name.escapedText === name_1; });
+            }
+            else {
+                var i = param.parent.parameters.indexOf(param);
+                ts.Debug.assert(i > -1, "Parameters should always be in their parents' parameter list");
+                var paramTags = getJSDocTags(param.parent).filter(ts.isJSDocParameterTag);
+                if (i < paramTags.length) {
+                    return [paramTags[i]];
+                }
+            }
+        }
+        // return empty array for: out-of-order binding patterns and JSDoc function syntax, which has un-named parameters
+        return ts.emptyArray;
+    }
+    ts.getJSDocParameterTags = getJSDocParameterTags;
+    /**
+     * Gets the JSDoc type parameter tags for the node if present.
+     *
+     * @remarks Returns any JSDoc template tag whose names match the provided
+     * parameter, whether a template tag on a containing function
+     * expression, or a template tag on a variable declaration whose
+     * initializer is the containing function. The tags closest to the
+     * node are returned first, so in the previous example, the template
+     * tag on the containing function expression would be first.
+     */
+    function getJSDocTypeParameterTags(param) {
+        var name = param.name.escapedText;
+        return getJSDocTags(param.parent).filter(function (tag) {
+            return ts.isJSDocTemplateTag(tag) && tag.typeParameters.some(function (tp) { return tp.name.escapedText === name; });
+        });
+    }
+    ts.getJSDocTypeParameterTags = getJSDocTypeParameterTags;
+    /**
+     * Return true if the node has JSDoc parameter tags.
+     *
+     * @remarks Includes parameter tags that are not directly on the node,
+     * for example on a variable declaration whose initializer is a function expression.
+     */
+    function hasJSDocParameterTags(node) {
+        return !!getFirstJSDocTag(node, ts.isJSDocParameterTag);
+    }
+    ts.hasJSDocParameterTags = hasJSDocParameterTags;
+    /** Gets the JSDoc augments tag for the node if present */
+    function getJSDocAugmentsTag(node) {
+        return getFirstJSDocTag(node, ts.isJSDocAugmentsTag);
+    }
+    ts.getJSDocAugmentsTag = getJSDocAugmentsTag;
+    /** Gets the JSDoc class tag for the node if present */
+    function getJSDocClassTag(node) {
+        return getFirstJSDocTag(node, ts.isJSDocClassTag);
+    }
+    ts.getJSDocClassTag = getJSDocClassTag;
+    /** Gets the JSDoc enum tag for the node if present */
+    function getJSDocEnumTag(node) {
+        return getFirstJSDocTag(node, ts.isJSDocEnumTag);
+    }
+    ts.getJSDocEnumTag = getJSDocEnumTag;
+    /** Gets the JSDoc this tag for the node if present */
+    function getJSDocThisTag(node) {
+        return getFirstJSDocTag(node, ts.isJSDocThisTag);
+    }
+    ts.getJSDocThisTag = getJSDocThisTag;
+    /** Gets the JSDoc return tag for the node if present */
+    function getJSDocReturnTag(node) {
+        return getFirstJSDocTag(node, ts.isJSDocReturnTag);
+    }
+    ts.getJSDocReturnTag = getJSDocReturnTag;
+    /** Gets the JSDoc template tag for the node if present */
+    function getJSDocTemplateTag(node) {
+        return getFirstJSDocTag(node, ts.isJSDocTemplateTag);
+    }
+    ts.getJSDocTemplateTag = getJSDocTemplateTag;
+    /** Gets the JSDoc type tag for the node if present and valid */
+    function getJSDocTypeTag(node) {
+        // We should have already issued an error if there were multiple type jsdocs, so just use the first one.
+        var tag = getFirstJSDocTag(node, ts.isJSDocTypeTag);
+        if (tag && tag.typeExpression && tag.typeExpression.type) {
+            return tag;
+        }
+        return undefined;
+    }
+    ts.getJSDocTypeTag = getJSDocTypeTag;
+    /**
+     * Gets the type node for the node if provided via JSDoc.
+     *
+     * @remarks The search includes any JSDoc param tag that relates
+     * to the provided parameter, for example a type tag on the
+     * parameter itself, or a param tag on a containing function
+     * expression, or a param tag on a variable declaration whose
+     * initializer is the containing function. The tags closest to the
+     * node are examined first, so in the previous example, the type
+     * tag directly on the node would be returned.
+     */
+    function getJSDocType(node) {
+        var tag = getFirstJSDocTag(node, ts.isJSDocTypeTag);
+        if (!tag && ts.isParameter(node)) {
+            tag = ts.find(getJSDocParameterTags(node), function (tag) { return !!tag.typeExpression; });
+        }
+        return tag && tag.typeExpression && tag.typeExpression.type;
+    }
+    ts.getJSDocType = getJSDocType;
+    /**
+     * Gets the return type node for the node if provided via JSDoc return tag or type tag.
+     *
+     * @remarks `getJSDocReturnTag` just gets the whole JSDoc tag. This function
+     * gets the type from inside the braces, after the fat arrow, etc.
+     */
+    function getJSDocReturnType(node) {
+        var returnTag = getJSDocReturnTag(node);
+        if (returnTag && returnTag.typeExpression) {
+            return returnTag.typeExpression.type;
+        }
+        var typeTag = getJSDocTypeTag(node);
+        if (typeTag && typeTag.typeExpression) {
+            var type = typeTag.typeExpression.type;
+            if (ts.isTypeLiteralNode(type)) {
+                var sig = ts.find(type.members, ts.isCallSignatureDeclaration);
+                return sig && sig.type;
+            }
+            if (ts.isFunctionTypeNode(type)) {
+                return type.type;
+            }
+        }
+    }
+    ts.getJSDocReturnType = getJSDocReturnType;
+    /** Get all JSDoc tags related to a node, including those on parent nodes. */
+    function getJSDocTags(node) {
+        var tags = node.jsDocCache;
+        // If cache is 'null', that means we did the work of searching for JSDoc tags and came up with nothing.
+        if (tags === undefined) {
+            var comments = ts.getJSDocCommentsAndTags(node);
+            ts.Debug.assert(comments.length < 2 || comments[0] !== comments[1]);
+            node.jsDocCache = tags = ts.flatMap(comments, function (j) { return ts.isJSDoc(j) ? j.tags : j; });
+        }
+        return tags;
+    }
+    ts.getJSDocTags = getJSDocTags;
+    /** Get the first JSDoc tag of a specified kind, or undefined if not present. */
+    function getFirstJSDocTag(node, predicate) {
+        return ts.find(getJSDocTags(node), predicate);
+    }
+    /** Gets all JSDoc tags of a specified kind, or undefined if not present. */
+    function getAllJSDocTagsOfKind(node, kind) {
+        return getJSDocTags(node).filter(function (doc) { return doc.kind === kind; });
+    }
+    ts.getAllJSDocTagsOfKind = getAllJSDocTagsOfKind;
+    /**
+     * Gets the effective type parameters. If the node was parsed in a
+     * JavaScript file, gets the type parameters from the `@template` tag from JSDoc.
+     */
+    function getEffectiveTypeParameterDeclarations(node) {
+        if (ts.isJSDocSignature(node)) {
+            return ts.emptyArray;
+        }
+        if (ts.isJSDocTypeAlias(node)) {
+            ts.Debug.assert(node.parent.kind === 291 /* JSDocComment */);
+            return ts.flatMap(node.parent.tags, function (tag) { return ts.isJSDocTemplateTag(tag) ? tag.typeParameters : undefined; });
+        }
+        if (node.typeParameters) {
+            return node.typeParameters;
+        }
+        if (ts.isInJSFile(node)) {
+            var decls = ts.getJSDocTypeParameterDeclarations(node);
+            if (decls.length) {
+                return decls;
+            }
+            var typeTag = getJSDocType(node);
+            if (typeTag && ts.isFunctionTypeNode(typeTag) && typeTag.typeParameters) {
+                return typeTag.typeParameters;
+            }
+        }
+        return ts.emptyArray;
+    }
+    ts.getEffectiveTypeParameterDeclarations = getEffectiveTypeParameterDeclarations;
+    function getEffectiveConstraintOfTypeParameter(node) {
+        return node.constraint ? node.constraint
+            : ts.isJSDocTemplateTag(node.parent) && node === node.parent.typeParameters[0]
+                ? node.parent.constraint
+                : undefined;
+    }
+    ts.getEffectiveConstraintOfTypeParameter = getEffectiveConstraintOfTypeParameter;
+})(ts || (ts = {}));
+// Simple node tests of the form `node.kind === SyntaxKind.Foo`.
+(function (ts) {
+    // Literals
+    function isNumericLiteral(node) {
+        return node.kind === 8 /* NumericLiteral */;
+    }
+    ts.isNumericLiteral = isNumericLiteral;
+    function isBigIntLiteral(node) {
+        return node.kind === 9 /* BigIntLiteral */;
+    }
+    ts.isBigIntLiteral = isBigIntLiteral;
+    function isStringLiteral(node) {
+        return node.kind === 10 /* StringLiteral */;
+    }
+    ts.isStringLiteral = isStringLiteral;
+    function isJsxText(node) {
+        return node.kind === 11 /* JsxText */;
+    }
+    ts.isJsxText = isJsxText;
+    function isRegularExpressionLiteral(node) {
+        return node.kind === 13 /* RegularExpressionLiteral */;
+    }
+    ts.isRegularExpressionLiteral = isRegularExpressionLiteral;
+    function isNoSubstitutionTemplateLiteral(node) {
+        return node.kind === 14 /* NoSubstitutionTemplateLiteral */;
+    }
+    ts.isNoSubstitutionTemplateLiteral = isNoSubstitutionTemplateLiteral;
+    // Pseudo-literals
+    function isTemplateHead(node) {
+        return node.kind === 15 /* TemplateHead */;
+    }
+    ts.isTemplateHead = isTemplateHead;
+    function isTemplateMiddle(node) {
+        return node.kind === 16 /* TemplateMiddle */;
+    }
+    ts.isTemplateMiddle = isTemplateMiddle;
+    function isTemplateTail(node) {
+        return node.kind === 17 /* TemplateTail */;
+    }
+    ts.isTemplateTail = isTemplateTail;
+    function isIdentifier(node) {
+        return node.kind === 72 /* Identifier */;
+    }
+    ts.isIdentifier = isIdentifier;
+    // Names
+    function isQualifiedName(node) {
+        return node.kind === 148 /* QualifiedName */;
+    }
+    ts.isQualifiedName = isQualifiedName;
+    function isComputedPropertyName(node) {
+        return node.kind === 149 /* ComputedPropertyName */;
+    }
+    ts.isComputedPropertyName = isComputedPropertyName;
+    // Signature elements
+    function isTypeParameterDeclaration(node) {
+        return node.kind === 150 /* TypeParameter */;
+    }
+    ts.isTypeParameterDeclaration = isTypeParameterDeclaration;
+    function isParameter(node) {
+        return node.kind === 151 /* Parameter */;
+    }
+    ts.isParameter = isParameter;
+    function isDecorator(node) {
+        return node.kind === 152 /* Decorator */;
+    }
+    ts.isDecorator = isDecorator;
+    // TypeMember
+    function isPropertySignature(node) {
+        return node.kind === 153 /* PropertySignature */;
+    }
+    ts.isPropertySignature = isPropertySignature;
+    function isPropertyDeclaration(node) {
+        return node.kind === 154 /* PropertyDeclaration */;
+    }
+    ts.isPropertyDeclaration = isPropertyDeclaration;
+    function isMethodSignature(node) {
+        return node.kind === 155 /* MethodSignature */;
+    }
+    ts.isMethodSignature = isMethodSignature;
+    function isMethodDeclaration(node) {
+        return node.kind === 156 /* MethodDeclaration */;
+    }
+    ts.isMethodDeclaration = isMethodDeclaration;
+    function isConstructorDeclaration(node) {
+        return node.kind === 157 /* Constructor */;
+    }
+    ts.isConstructorDeclaration = isConstructorDeclaration;
+    function isGetAccessorDeclaration(node) {
+        return node.kind === 158 /* GetAccessor */;
+    }
+    ts.isGetAccessorDeclaration = isGetAccessorDeclaration;
+    function isSetAccessorDeclaration(node) {
+        return node.kind === 159 /* SetAccessor */;
+    }
+    ts.isSetAccessorDeclaration = isSetAccessorDeclaration;
+    function isCallSignatureDeclaration(node) {
+        return node.kind === 160 /* CallSignature */;
+    }
+    ts.isCallSignatureDeclaration = isCallSignatureDeclaration;
+    function isConstructSignatureDeclaration(node) {
+        return node.kind === 161 /* ConstructSignature */;
+    }
+    ts.isConstructSignatureDeclaration = isConstructSignatureDeclaration;
+    function isIndexSignatureDeclaration(node) {
+        return node.kind === 162 /* IndexSignature */;
+    }
+    ts.isIndexSignatureDeclaration = isIndexSignatureDeclaration;
+    /* @internal */
+    function isGetOrSetAccessorDeclaration(node) {
+        return node.kind === 159 /* SetAccessor */ || node.kind === 158 /* GetAccessor */;
+    }
+    ts.isGetOrSetAccessorDeclaration = isGetOrSetAccessorDeclaration;
+    // Type
+    function isTypePredicateNode(node) {
+        return node.kind === 163 /* TypePredicate */;
+    }
+    ts.isTypePredicateNode = isTypePredicateNode;
+    function isTypeReferenceNode(node) {
+        return node.kind === 164 /* TypeReference */;
+    }
+    ts.isTypeReferenceNode = isTypeReferenceNode;
+    function isFunctionTypeNode(node) {
+        return node.kind === 165 /* FunctionType */;
+    }
+    ts.isFunctionTypeNode = isFunctionTypeNode;
+    function isConstructorTypeNode(node) {
+        return node.kind === 166 /* ConstructorType */;
+    }
+    ts.isConstructorTypeNode = isConstructorTypeNode;
+    function isTypeQueryNode(node) {
+        return node.kind === 167 /* TypeQuery */;
+    }
+    ts.isTypeQueryNode = isTypeQueryNode;
+    function isTypeLiteralNode(node) {
+        return node.kind === 168 /* TypeLiteral */;
+    }
+    ts.isTypeLiteralNode = isTypeLiteralNode;
+    function isArrayTypeNode(node) {
+        return node.kind === 169 /* ArrayType */;
+    }
+    ts.isArrayTypeNode = isArrayTypeNode;
+    function isTupleTypeNode(node) {
+        return node.kind === 170 /* TupleType */;
+    }
+    ts.isTupleTypeNode = isTupleTypeNode;
+    function isUnionTypeNode(node) {
+        return node.kind === 173 /* UnionType */;
+    }
+    ts.isUnionTypeNode = isUnionTypeNode;
+    function isIntersectionTypeNode(node) {
+        return node.kind === 174 /* IntersectionType */;
+    }
+    ts.isIntersectionTypeNode = isIntersectionTypeNode;
+    function isConditionalTypeNode(node) {
+        return node.kind === 175 /* ConditionalType */;
+    }
+    ts.isConditionalTypeNode = isConditionalTypeNode;
+    function isInferTypeNode(node) {
+        return node.kind === 176 /* InferType */;
+    }
+    ts.isInferTypeNode = isInferTypeNode;
+    function isParenthesizedTypeNode(node) {
+        return node.kind === 177 /* ParenthesizedType */;
+    }
+    ts.isParenthesizedTypeNode = isParenthesizedTypeNode;
+    function isThisTypeNode(node) {
+        return node.kind === 178 /* ThisType */;
+    }
+    ts.isThisTypeNode = isThisTypeNode;
+    function isTypeOperatorNode(node) {
+        return node.kind === 179 /* TypeOperator */;
+    }
+    ts.isTypeOperatorNode = isTypeOperatorNode;
+    function isIndexedAccessTypeNode(node) {
+        return node.kind === 180 /* IndexedAccessType */;
+    }
+    ts.isIndexedAccessTypeNode = isIndexedAccessTypeNode;
+    function isMappedTypeNode(node) {
+        return node.kind === 181 /* MappedType */;
+    }
+    ts.isMappedTypeNode = isMappedTypeNode;
+    function isLiteralTypeNode(node) {
+        return node.kind === 182 /* LiteralType */;
+    }
+    ts.isLiteralTypeNode = isLiteralTypeNode;
+    function isImportTypeNode(node) {
+        return node.kind === 183 /* ImportType */;
+    }
+    ts.isImportTypeNode = isImportTypeNode;
+    // Binding patterns
+    function isObjectBindingPattern(node) {
+        return node.kind === 184 /* ObjectBindingPattern */;
+    }
+    ts.isObjectBindingPattern = isObjectBindingPattern;
+    function isArrayBindingPattern(node) {
+        return node.kind === 185 /* ArrayBindingPattern */;
+    }
+    ts.isArrayBindingPattern = isArrayBindingPattern;
+    function isBindingElement(node) {
+        return node.kind === 186 /* BindingElement */;
+    }
+    ts.isBindingElement = isBindingElement;
+    // Expression
+    function isArrayLiteralExpression(node) {
+        return node.kind === 187 /* ArrayLiteralExpression */;
+    }
+    ts.isArrayLiteralExpression = isArrayLiteralExpression;
+    function isObjectLiteralExpression(node) {
+        return node.kind === 188 /* ObjectLiteralExpression */;
+    }
+    ts.isObjectLiteralExpression = isObjectLiteralExpression;
+    function isPropertyAccessExpression(node) {
+        return node.kind === 189 /* PropertyAccessExpression */;
+    }
+    ts.isPropertyAccessExpression = isPropertyAccessExpression;
+    function isElementAccessExpression(node) {
+        return node.kind === 190 /* ElementAccessExpression */;
+    }
+    ts.isElementAccessExpression = isElementAccessExpression;
+    function isCallExpression(node) {
+        return node.kind === 191 /* CallExpression */;
+    }
+    ts.isCallExpression = isCallExpression;
+    function isNewExpression(node) {
+        return node.kind === 192 /* NewExpression */;
+    }
+    ts.isNewExpression = isNewExpression;
+    function isTaggedTemplateExpression(node) {
+        return node.kind === 193 /* TaggedTemplateExpression */;
+    }
+    ts.isTaggedTemplateExpression = isTaggedTemplateExpression;
+    function isTypeAssertion(node) {
+        return node.kind === 194 /* TypeAssertionExpression */;
+    }
+    ts.isTypeAssertion = isTypeAssertion;
+    function isParenthesizedExpression(node) {
+        return node.kind === 195 /* ParenthesizedExpression */;
+    }
+    ts.isParenthesizedExpression = isParenthesizedExpression;
+    function skipPartiallyEmittedExpressions(node) {
+        while (node.kind === 308 /* PartiallyEmittedExpression */) {
+            node = node.expression;
+        }
+        return node;
+    }
+    ts.skipPartiallyEmittedExpressions = skipPartiallyEmittedExpressions;
+    function isFunctionExpression(node) {
+        return node.kind === 196 /* FunctionExpression */;
+    }
+    ts.isFunctionExpression = isFunctionExpression;
+    function isArrowFunction(node) {
+        return node.kind === 197 /* ArrowFunction */;
+    }
+    ts.isArrowFunction = isArrowFunction;
+    function isDeleteExpression(node) {
+        return node.kind === 198 /* DeleteExpression */;
+    }
+    ts.isDeleteExpression = isDeleteExpression;
+    function isTypeOfExpression(node) {
+        return node.kind === 199 /* TypeOfExpression */;
+    }
+    ts.isTypeOfExpression = isTypeOfExpression;
+    function isVoidExpression(node) {
+        return node.kind === 200 /* VoidExpression */;
+    }
+    ts.isVoidExpression = isVoidExpression;
+    function isAwaitExpression(node) {
+        return node.kind === 201 /* AwaitExpression */;
+    }
+    ts.isAwaitExpression = isAwaitExpression;
+    function isPrefixUnaryExpression(node) {
+        return node.kind === 202 /* PrefixUnaryExpression */;
+    }
+    ts.isPrefixUnaryExpression = isPrefixUnaryExpression;
+    function isPostfixUnaryExpression(node) {
+        return node.kind === 203 /* PostfixUnaryExpression */;
+    }
+    ts.isPostfixUnaryExpression = isPostfixUnaryExpression;
+    function isBinaryExpression(node) {
+        return node.kind === 204 /* BinaryExpression */;
+    }
+    ts.isBinaryExpression = isBinaryExpression;
+    function isConditionalExpression(node) {
+        return node.kind === 205 /* ConditionalExpression */;
+    }
+    ts.isConditionalExpression = isConditionalExpression;
+    function isTemplateExpression(node) {
+        return node.kind === 206 /* TemplateExpression */;
+    }
+    ts.isTemplateExpression = isTemplateExpression;
+    function isYieldExpression(node) {
+        return node.kind === 207 /* YieldExpression */;
+    }
+    ts.isYieldExpression = isYieldExpression;
+    function isSpreadElement(node) {
+        return node.kind === 208 /* SpreadElement */;
+    }
+    ts.isSpreadElement = isSpreadElement;
+    function isClassExpression(node) {
+        return node.kind === 209 /* ClassExpression */;
+    }
+    ts.isClassExpression = isClassExpression;
+    function isOmittedExpression(node) {
+        return node.kind === 210 /* OmittedExpression */;
+    }
+    ts.isOmittedExpression = isOmittedExpression;
+    function isExpressionWithTypeArguments(node) {
+        return node.kind === 211 /* ExpressionWithTypeArguments */;
+    }
+    ts.isExpressionWithTypeArguments = isExpressionWithTypeArguments;
+    function isAsExpression(node) {
+        return node.kind === 212 /* AsExpression */;
+    }
+    ts.isAsExpression = isAsExpression;
+    function isNonNullExpression(node) {
+        return node.kind === 213 /* NonNullExpression */;
+    }
+    ts.isNonNullExpression = isNonNullExpression;
+    function isMetaProperty(node) {
+        return node.kind === 214 /* MetaProperty */;
+    }
+    ts.isMetaProperty = isMetaProperty;
+    // Misc
+    function isTemplateSpan(node) {
+        return node.kind === 216 /* TemplateSpan */;
+    }
+    ts.isTemplateSpan = isTemplateSpan;
+    function isSemicolonClassElement(node) {
+        return node.kind === 217 /* SemicolonClassElement */;
+    }
+    ts.isSemicolonClassElement = isSemicolonClassElement;
+    // Block
+    function isBlock(node) {
+        return node.kind === 218 /* Block */;
+    }
+    ts.isBlock = isBlock;
+    function isVariableStatement(node) {
+        return node.kind === 219 /* VariableStatement */;
+    }
+    ts.isVariableStatement = isVariableStatement;
+    function isEmptyStatement(node) {
+        return node.kind === 220 /* EmptyStatement */;
+    }
+    ts.isEmptyStatement = isEmptyStatement;
+    function isExpressionStatement(node) {
+        return node.kind === 221 /* ExpressionStatement */;
+    }
+    ts.isExpressionStatement = isExpressionStatement;
+    function isIfStatement(node) {
+        return node.kind === 222 /* IfStatement */;
+    }
+    ts.isIfStatement = isIfStatement;
+    function isDoStatement(node) {
+        return node.kind === 223 /* DoStatement */;
+    }
+    ts.isDoStatement = isDoStatement;
+    function isWhileStatement(node) {
+        return node.kind === 224 /* WhileStatement */;
+    }
+    ts.isWhileStatement = isWhileStatement;
+    function isForStatement(node) {
+        return node.kind === 225 /* ForStatement */;
+    }
+    ts.isForStatement = isForStatement;
+    function isForInStatement(node) {
+        return node.kind === 226 /* ForInStatement */;
+    }
+    ts.isForInStatement = isForInStatement;
+    function isForOfStatement(node) {
+        return node.kind === 227 /* ForOfStatement */;
+    }
+    ts.isForOfStatement = isForOfStatement;
+    function isContinueStatement(node) {
+        return node.kind === 228 /* ContinueStatement */;
+    }
+    ts.isContinueStatement = isContinueStatement;
+    function isBreakStatement(node) {
+        return node.kind === 229 /* BreakStatement */;
+    }
+    ts.isBreakStatement = isBreakStatement;
+    function isBreakOrContinueStatement(node) {
+        return node.kind === 229 /* BreakStatement */ || node.kind === 228 /* ContinueStatement */;
+    }
+    ts.isBreakOrContinueStatement = isBreakOrContinueStatement;
+    function isReturnStatement(node) {
+        return node.kind === 230 /* ReturnStatement */;
+    }
+    ts.isReturnStatement = isReturnStatement;
+    function isWithStatement(node) {
+        return node.kind === 231 /* WithStatement */;
+    }
+    ts.isWithStatement = isWithStatement;
+    function isSwitchStatement(node) {
+        return node.kind === 232 /* SwitchStatement */;
+    }
+    ts.isSwitchStatement = isSwitchStatement;
+    function isLabeledStatement(node) {
+        return node.kind === 233 /* LabeledStatement */;
+    }
+    ts.isLabeledStatement = isLabeledStatement;
+    function isThrowStatement(node) {
+        return node.kind === 234 /* ThrowStatement */;
+    }
+    ts.isThrowStatement = isThrowStatement;
+    function isTryStatement(node) {
+        return node.kind === 235 /* TryStatement */;
+    }
+    ts.isTryStatement = isTryStatement;
+    function isDebuggerStatement(node) {
+        return node.kind === 236 /* DebuggerStatement */;
+    }
+    ts.isDebuggerStatement = isDebuggerStatement;
+    function isVariableDeclaration(node) {
+        return node.kind === 237 /* VariableDeclaration */;
+    }
+    ts.isVariableDeclaration = isVariableDeclaration;
+    function isVariableDeclarationList(node) {
+        return node.kind === 238 /* VariableDeclarationList */;
+    }
+    ts.isVariableDeclarationList = isVariableDeclarationList;
+    function isFunctionDeclaration(node) {
+        return node.kind === 239 /* FunctionDeclaration */;
+    }
+    ts.isFunctionDeclaration = isFunctionDeclaration;
+    function isClassDeclaration(node) {
+        return node.kind === 240 /* ClassDeclaration */;
+    }
+    ts.isClassDeclaration = isClassDeclaration;
+    function isInterfaceDeclaration(node) {
+        return node.kind === 241 /* InterfaceDeclaration */;
+    }
+    ts.isInterfaceDeclaration = isInterfaceDeclaration;
+    function isTypeAliasDeclaration(node) {
+        return node.kind === 242 /* TypeAliasDeclaration */;
+    }
+    ts.isTypeAliasDeclaration = isTypeAliasDeclaration;
+    function isEnumDeclaration(node) {
+        return node.kind === 243 /* EnumDeclaration */;
+    }
+    ts.isEnumDeclaration = isEnumDeclaration;
+    function isModuleDeclaration(node) {
+        return node.kind === 244 /* ModuleDeclaration */;
+    }
+    ts.isModuleDeclaration = isModuleDeclaration;
+    function isModuleBlock(node) {
+        return node.kind === 245 /* ModuleBlock */;
+    }
+    ts.isModuleBlock = isModuleBlock;
+    function isCaseBlock(node) {
+        return node.kind === 246 /* CaseBlock */;
+    }
+    ts.isCaseBlock = isCaseBlock;
+    function isNamespaceExportDeclaration(node) {
+        return node.kind === 247 /* NamespaceExportDeclaration */;
+    }
+    ts.isNamespaceExportDeclaration = isNamespaceExportDeclaration;
+    function isImportEqualsDeclaration(node) {
+        return node.kind === 248 /* ImportEqualsDeclaration */;
+    }
+    ts.isImportEqualsDeclaration = isImportEqualsDeclaration;
+    function isImportDeclaration(node) {
+        return node.kind === 249 /* ImportDeclaration */;
+    }
+    ts.isImportDeclaration = isImportDeclaration;
+    function isImportClause(node) {
+        return node.kind === 250 /* ImportClause */;
+    }
+    ts.isImportClause = isImportClause;
+    function isNamespaceImport(node) {
+        return node.kind === 251 /* NamespaceImport */;
+    }
+    ts.isNamespaceImport = isNamespaceImport;
+    function isNamedImports(node) {
+        return node.kind === 252 /* NamedImports */;
+    }
+    ts.isNamedImports = isNamedImports;
+    function isImportSpecifier(node) {
+        return node.kind === 253 /* ImportSpecifier */;
+    }
+    ts.isImportSpecifier = isImportSpecifier;
+    function isExportAssignment(node) {
+        return node.kind === 254 /* ExportAssignment */;
+    }
+    ts.isExportAssignment = isExportAssignment;
+    function isExportDeclaration(node) {
+        return node.kind === 255 /* ExportDeclaration */;
+    }
+    ts.isExportDeclaration = isExportDeclaration;
+    function isNamedExports(node) {
+        return node.kind === 256 /* NamedExports */;
+    }
+    ts.isNamedExports = isNamedExports;
+    function isExportSpecifier(node) {
+        return node.kind === 257 /* ExportSpecifier */;
+    }
+    ts.isExportSpecifier = isExportSpecifier;
+    function isMissingDeclaration(node) {
+        return node.kind === 258 /* MissingDeclaration */;
+    }
+    ts.isMissingDeclaration = isMissingDeclaration;
+    // Module References
+    function isExternalModuleReference(node) {
+        return node.kind === 259 /* ExternalModuleReference */;
+    }
+    ts.isExternalModuleReference = isExternalModuleReference;
+    // JSX
+    function isJsxElement(node) {
+        return node.kind === 260 /* JsxElement */;
+    }
+    ts.isJsxElement = isJsxElement;
+    function isJsxSelfClosingElement(node) {
+        return node.kind === 261 /* JsxSelfClosingElement */;
+    }
+    ts.isJsxSelfClosingElement = isJsxSelfClosingElement;
+    function isJsxOpeningElement(node) {
+        return node.kind === 262 /* JsxOpeningElement */;
+    }
+    ts.isJsxOpeningElement = isJsxOpeningElement;
+    function isJsxClosingElement(node) {
+        return node.kind === 263 /* JsxClosingElement */;
+    }
+    ts.isJsxClosingElement = isJsxClosingElement;
+    function isJsxFragment(node) {
+        return node.kind === 264 /* JsxFragment */;
+    }
+    ts.isJsxFragment = isJsxFragment;
+    function isJsxOpeningFragment(node) {
+        return node.kind === 265 /* JsxOpeningFragment */;
+    }
+    ts.isJsxOpeningFragment = isJsxOpeningFragment;
+    function isJsxClosingFragment(node) {
+        return node.kind === 266 /* JsxClosingFragment */;
+    }
+    ts.isJsxClosingFragment = isJsxClosingFragment;
+    function isJsxAttribute(node) {
+        return node.kind === 267 /* JsxAttribute */;
+    }
+    ts.isJsxAttribute = isJsxAttribute;
+    function isJsxAttributes(node) {
+        return node.kind === 268 /* JsxAttributes */;
+    }
+    ts.isJsxAttributes = isJsxAttributes;
+    function isJsxSpreadAttribute(node) {
+        return node.kind === 269 /* JsxSpreadAttribute */;
+    }
+    ts.isJsxSpreadAttribute = isJsxSpreadAttribute;
+    function isJsxExpression(node) {
+        return node.kind === 270 /* JsxExpression */;
+    }
+    ts.isJsxExpression = isJsxExpression;
+    // Clauses
+    function isCaseClause(node) {
+        return node.kind === 271 /* CaseClause */;
+    }
+    ts.isCaseClause = isCaseClause;
+    function isDefaultClause(node) {
+        return node.kind === 272 /* DefaultClause */;
+    }
+    ts.isDefaultClause = isDefaultClause;
+    function isHeritageClause(node) {
+        return node.kind === 273 /* HeritageClause */;
+    }
+    ts.isHeritageClause = isHeritageClause;
+    function isCatchClause(node) {
+        return node.kind === 274 /* CatchClause */;
+    }
+    ts.isCatchClause = isCatchClause;
+    // Property assignments
+    function isPropertyAssignment(node) {
+        return node.kind === 275 /* PropertyAssignment */;
+    }
+    ts.isPropertyAssignment = isPropertyAssignment;
+    function isShorthandPropertyAssignment(node) {
+        return node.kind === 276 /* ShorthandPropertyAssignment */;
+    }
+    ts.isShorthandPropertyAssignment = isShorthandPropertyAssignment;
+    function isSpreadAssignment(node) {
+        return node.kind === 277 /* SpreadAssignment */;
+    }
+    ts.isSpreadAssignment = isSpreadAssignment;
+    // Enum
+    function isEnumMember(node) {
+        return node.kind === 278 /* EnumMember */;
+    }
+    ts.isEnumMember = isEnumMember;
+    // Top-level nodes
+    function isSourceFile(node) {
+        return node.kind === 279 /* SourceFile */;
+    }
+    ts.isSourceFile = isSourceFile;
+    function isBundle(node) {
+        return node.kind === 280 /* Bundle */;
+    }
+    ts.isBundle = isBundle;
+    function isUnparsedSource(node) {
+        return node.kind === 281 /* UnparsedSource */;
+    }
+    ts.isUnparsedSource = isUnparsedSource;
+    // JSDoc
+    function isJSDocTypeExpression(node) {
+        return node.kind === 283 /* JSDocTypeExpression */;
+    }
+    ts.isJSDocTypeExpression = isJSDocTypeExpression;
+    function isJSDocAllType(node) {
+        return node.kind === 284 /* JSDocAllType */;
+    }
+    ts.isJSDocAllType = isJSDocAllType;
+    function isJSDocUnknownType(node) {
+        return node.kind === 285 /* JSDocUnknownType */;
+    }
+    ts.isJSDocUnknownType = isJSDocUnknownType;
+    function isJSDocNullableType(node) {
+        return node.kind === 286 /* JSDocNullableType */;
+    }
+    ts.isJSDocNullableType = isJSDocNullableType;
+    function isJSDocNonNullableType(node) {
+        return node.kind === 287 /* JSDocNonNullableType */;
+    }
+    ts.isJSDocNonNullableType = isJSDocNonNullableType;
+    function isJSDocOptionalType(node) {
+        return node.kind === 288 /* JSDocOptionalType */;
+    }
+    ts.isJSDocOptionalType = isJSDocOptionalType;
+    function isJSDocFunctionType(node) {
+        return node.kind === 289 /* JSDocFunctionType */;
+    }
+    ts.isJSDocFunctionType = isJSDocFunctionType;
+    function isJSDocVariadicType(node) {
+        return node.kind === 290 /* JSDocVariadicType */;
+    }
+    ts.isJSDocVariadicType = isJSDocVariadicType;
+    function isJSDoc(node) {
+        return node.kind === 291 /* JSDocComment */;
+    }
+    ts.isJSDoc = isJSDoc;
+    function isJSDocAugmentsTag(node) {
+        return node.kind === 295 /* JSDocAugmentsTag */;
+    }
+    ts.isJSDocAugmentsTag = isJSDocAugmentsTag;
+    function isJSDocClassTag(node) {
+        return node.kind === 296 /* JSDocClassTag */;
+    }
+    ts.isJSDocClassTag = isJSDocClassTag;
+    function isJSDocEnumTag(node) {
+        return node.kind === 298 /* JSDocEnumTag */;
+    }
+    ts.isJSDocEnumTag = isJSDocEnumTag;
+    function isJSDocThisTag(node) {
+        return node.kind === 301 /* JSDocThisTag */;
+    }
+    ts.isJSDocThisTag = isJSDocThisTag;
+    function isJSDocParameterTag(node) {
+        return node.kind === 299 /* JSDocParameterTag */;
+    }
+    ts.isJSDocParameterTag = isJSDocParameterTag;
+    function isJSDocReturnTag(node) {
+        return node.kind === 300 /* JSDocReturnTag */;
+    }
+    ts.isJSDocReturnTag = isJSDocReturnTag;
+    function isJSDocTypeTag(node) {
+        return node.kind === 302 /* JSDocTypeTag */;
+    }
+    ts.isJSDocTypeTag = isJSDocTypeTag;
+    function isJSDocTemplateTag(node) {
+        return node.kind === 303 /* JSDocTemplateTag */;
+    }
+    ts.isJSDocTemplateTag = isJSDocTemplateTag;
+    function isJSDocTypedefTag(node) {
+        return node.kind === 304 /* JSDocTypedefTag */;
+    }
+    ts.isJSDocTypedefTag = isJSDocTypedefTag;
+    function isJSDocPropertyTag(node) {
+        return node.kind === 305 /* JSDocPropertyTag */;
+    }
+    ts.isJSDocPropertyTag = isJSDocPropertyTag;
+    function isJSDocPropertyLikeTag(node) {
+        return node.kind === 305 /* JSDocPropertyTag */ || node.kind === 299 /* JSDocParameterTag */;
+    }
+    ts.isJSDocPropertyLikeTag = isJSDocPropertyLikeTag;
+    function isJSDocTypeLiteral(node) {
+        return node.kind === 292 /* JSDocTypeLiteral */;
+    }
+    ts.isJSDocTypeLiteral = isJSDocTypeLiteral;
+    function isJSDocCallbackTag(node) {
+        return node.kind === 297 /* JSDocCallbackTag */;
+    }
+    ts.isJSDocCallbackTag = isJSDocCallbackTag;
+    function isJSDocSignature(node) {
+        return node.kind === 293 /* JSDocSignature */;
+    }
+    ts.isJSDocSignature = isJSDocSignature;
+})(ts || (ts = {}));
+// Node tests
+//
+// All node tests in the following list should *not* reference parent pointers so that
+// they may be used with transformations.
+(function (ts) {
+    /* @internal */
+    function isSyntaxList(n) {
+        return n.kind === 306 /* SyntaxList */;
+    }
+    ts.isSyntaxList = isSyntaxList;
+    /* @internal */
+    function isNode(node) {
+        return isNodeKind(node.kind);
+    }
+    ts.isNode = isNode;
+    /* @internal */
+    function isNodeKind(kind) {
+        return kind >= 148 /* FirstNode */;
+    }
+    ts.isNodeKind = isNodeKind;
+    /**
+     * True if node is of some token syntax kind.
+     * For example, this is true for an IfKeyword but not for an IfStatement.
+     * Literals are considered tokens, except TemplateLiteral, but does include TemplateHead/Middle/Tail.
+     */
+    function isToken(n) {
+        return n.kind >= 0 /* FirstToken */ && n.kind <= 147 /* LastToken */;
+    }
+    ts.isToken = isToken;
+    // Node Arrays
+    /* @internal */
+    function isNodeArray(array) {
+        return array.hasOwnProperty("pos") && array.hasOwnProperty("end");
+    }
+    ts.isNodeArray = isNodeArray;
+    // Literals
+    /* @internal */
+    function isLiteralKind(kind) {
+        return 8 /* FirstLiteralToken */ <= kind && kind <= 14 /* LastLiteralToken */;
+    }
+    ts.isLiteralKind = isLiteralKind;
+    function isLiteralExpression(node) {
+        return isLiteralKind(node.kind);
+    }
+    ts.isLiteralExpression = isLiteralExpression;
+    // Pseudo-literals
+    /* @internal */
+    function isTemplateLiteralKind(kind) {
+        return 14 /* FirstTemplateToken */ <= kind && kind <= 17 /* LastTemplateToken */;
+    }
+    ts.isTemplateLiteralKind = isTemplateLiteralKind;
+    function isTemplateLiteralToken(node) {
+        return isTemplateLiteralKind(node.kind);
+    }
+    ts.isTemplateLiteralToken = isTemplateLiteralToken;
+    function isTemplateMiddleOrTemplateTail(node) {
+        var kind = node.kind;
+        return kind === 16 /* TemplateMiddle */
+            || kind === 17 /* TemplateTail */;
+    }
+    ts.isTemplateMiddleOrTemplateTail = isTemplateMiddleOrTemplateTail;
+    function isImportOrExportSpecifier(node) {
+        return ts.isImportSpecifier(node) || ts.isExportSpecifier(node);
+    }
+    ts.isImportOrExportSpecifier = isImportOrExportSpecifier;
+    function isStringTextContainingNode(node) {
+        return node.kind === 10 /* StringLiteral */ || isTemplateLiteralKind(node.kind);
+    }
+    ts.isStringTextContainingNode = isStringTextContainingNode;
+    // Identifiers
+    /* @internal */
+    function isGeneratedIdentifier(node) {
+        return ts.isIdentifier(node) && (node.autoGenerateFlags & 7 /* KindMask */) > 0 /* None */;
+    }
+    ts.isGeneratedIdentifier = isGeneratedIdentifier;
+    // Keywords
+    /* @internal */
+    function isModifierKind(token) {
+        switch (token) {
+            case 118 /* AbstractKeyword */:
+            case 121 /* AsyncKeyword */:
+            case 77 /* ConstKeyword */:
+            case 125 /* DeclareKeyword */:
+            case 80 /* DefaultKeyword */:
+            case 85 /* ExportKeyword */:
+            case 115 /* PublicKeyword */:
+            case 113 /* PrivateKeyword */:
+            case 114 /* ProtectedKeyword */:
+            case 133 /* ReadonlyKeyword */:
+            case 116 /* StaticKeyword */:
+                return true;
+        }
+        return false;
+    }
+    ts.isModifierKind = isModifierKind;
+    /* @internal */
+    function isParameterPropertyModifier(kind) {
+        return !!(ts.modifierToFlag(kind) & 92 /* ParameterPropertyModifier */);
+    }
+    ts.isParameterPropertyModifier = isParameterPropertyModifier;
+    /* @internal */
+    function isClassMemberModifier(idToken) {
+        return isParameterPropertyModifier(idToken) || idToken === 116 /* StaticKeyword */;
+    }
+    ts.isClassMemberModifier = isClassMemberModifier;
+    function isModifier(node) {
+        return isModifierKind(node.kind);
+    }
+    ts.isModifier = isModifier;
+    function isEntityName(node) {
+        var kind = node.kind;
+        return kind === 148 /* QualifiedName */
+            || kind === 72 /* Identifier */;
+    }
+    ts.isEntityName = isEntityName;
+    function isPropertyName(node) {
+        var kind = node.kind;
+        return kind === 72 /* Identifier */
+            || kind === 10 /* StringLiteral */
+            || kind === 8 /* NumericLiteral */
+            || kind === 149 /* ComputedPropertyName */;
+    }
+    ts.isPropertyName = isPropertyName;
+    function isBindingName(node) {
+        var kind = node.kind;
+        return kind === 72 /* Identifier */
+            || kind === 184 /* ObjectBindingPattern */
+            || kind === 185 /* ArrayBindingPattern */;
+    }
+    ts.isBindingName = isBindingName;
+    // Functions
+    function isFunctionLike(node) {
+        return node && isFunctionLikeKind(node.kind);
+    }
+    ts.isFunctionLike = isFunctionLike;
+    /* @internal */
+    function isFunctionLikeDeclaration(node) {
+        return node && isFunctionLikeDeclarationKind(node.kind);
+    }
+    ts.isFunctionLikeDeclaration = isFunctionLikeDeclaration;
+    function isFunctionLikeDeclarationKind(kind) {
+        switch (kind) {
+            case 239 /* FunctionDeclaration */:
+            case 156 /* MethodDeclaration */:
+            case 157 /* Constructor */:
+            case 158 /* GetAccessor */:
+            case 159 /* SetAccessor */:
+            case 196 /* FunctionExpression */:
+            case 197 /* ArrowFunction */:
+                return true;
+            default:
+                return false;
+        }
+    }
+    /* @internal */
+    function isFunctionLikeKind(kind) {
+        switch (kind) {
+            case 155 /* MethodSignature */:
+            case 160 /* CallSignature */:
+            case 293 /* JSDocSignature */:
+            case 161 /* ConstructSignature */:
+            case 162 /* IndexSignature */:
+            case 165 /* FunctionType */:
+            case 289 /* JSDocFunctionType */:
+            case 166 /* ConstructorType */:
+                return true;
+            default:
+                return isFunctionLikeDeclarationKind(kind);
+        }
+    }
+    ts.isFunctionLikeKind = isFunctionLikeKind;
+    /* @internal */
+    function isFunctionOrModuleBlock(node) {
+        return ts.isSourceFile(node) || ts.isModuleBlock(node) || ts.isBlock(node) && isFunctionLike(node.parent);
+    }
+    ts.isFunctionOrModuleBlock = isFunctionOrModuleBlock;
+    // Classes
+    function isClassElement(node) {
+        var kind = node.kind;
+        return kind === 157 /* Constructor */
+            || kind === 154 /* PropertyDeclaration */
+            || kind === 156 /* MethodDeclaration */
+            || kind === 158 /* GetAccessor */
+            || kind === 159 /* SetAccessor */
+            || kind === 162 /* IndexSignature */
+            || kind === 217 /* SemicolonClassElement */;
+    }
+    ts.isClassElement = isClassElement;
+    function isClassLike(node) {
+        return node && (node.kind === 240 /* ClassDeclaration */ || node.kind === 209 /* ClassExpression */);
+    }
+    ts.isClassLike = isClassLike;
+    function isAccessor(node) {
+        return node && (node.kind === 158 /* GetAccessor */ || node.kind === 159 /* SetAccessor */);
+    }
+    ts.isAccessor = isAccessor;
+    /* @internal */
+    function isMethodOrAccessor(node) {
+        switch (node.kind) {
+            case 156 /* MethodDeclaration */:
+            case 158 /* GetAccessor */:
+            case 159 /* SetAccessor */:
+                return true;
+            default:
+                return false;
+        }
+    }
+    ts.isMethodOrAccessor = isMethodOrAccessor;
+    // Type members
+    function isTypeElement(node) {
+        var kind = node.kind;
+        return kind === 161 /* ConstructSignature */
+            || kind === 160 /* CallSignature */
+            || kind === 153 /* PropertySignature */
+            || kind === 155 /* MethodSignature */
+            || kind === 162 /* IndexSignature */;
+    }
+    ts.isTypeElement = isTypeElement;
+    function isClassOrTypeElement(node) {
+        return isTypeElement(node) || isClassElement(node);
+    }
+    ts.isClassOrTypeElement = isClassOrTypeElement;
+    function isObjectLiteralElementLike(node) {
+        var kind = node.kind;
+        return kind === 275 /* PropertyAssignment */
+            || kind === 276 /* ShorthandPropertyAssignment */
+            || kind === 277 /* SpreadAssignment */
+            || kind === 156 /* MethodDeclaration */
+            || kind === 158 /* GetAccessor */
+            || kind === 159 /* SetAccessor */;
+    }
+    ts.isObjectLiteralElementLike = isObjectLiteralElementLike;
+    // Type
+    /**
+     * Node test that determines whether a node is a valid type node.
+     * This differs from the `isPartOfTypeNode` function which determines whether a node is *part*
+     * of a TypeNode.
+     */
+    function isTypeNode(node) {
+        return ts.isTypeNodeKind(node.kind);
+    }
+    ts.isTypeNode = isTypeNode;
+    function isFunctionOrConstructorTypeNode(node) {
+        switch (node.kind) {
+            case 165 /* FunctionType */:
+            case 166 /* ConstructorType */:
+                return true;
+        }
+        return false;
+    }
+    ts.isFunctionOrConstructorTypeNode = isFunctionOrConstructorTypeNode;
+    // Binding patterns
+    /* @internal */
+    function isBindingPattern(node) {
+        if (node) {
+            var kind = node.kind;
+            return kind === 185 /* ArrayBindingPattern */
+                || kind === 184 /* ObjectBindingPattern */;
+        }
+        return false;
+    }
+    ts.isBindingPattern = isBindingPattern;
+    /* @internal */
+    function isAssignmentPattern(node) {
+        var kind = node.kind;
+        return kind === 187 /* ArrayLiteralExpression */
+            || kind === 188 /* ObjectLiteralExpression */;
+    }
+    ts.isAssignmentPattern = isAssignmentPattern;
+    /* @internal */
+    function isArrayBindingElement(node) {
+        var kind = node.kind;
+        return kind === 186 /* BindingElement */
+            || kind === 210 /* OmittedExpression */;
+    }
+    ts.isArrayBindingElement = isArrayBindingElement;
+    /**
+     * Determines whether the BindingOrAssignmentElement is a BindingElement-like declaration
+     */
+    /* @internal */
+    function isDeclarationBindingElement(bindingElement) {
+        switch (bindingElement.kind) {
+            case 237 /* VariableDeclaration */:
+            case 151 /* Parameter */:
+            case 186 /* BindingElement */:
+                return true;
+        }
+        return false;
+    }
+    ts.isDeclarationBindingElement = isDeclarationBindingElement;
+    /**
+     * Determines whether a node is a BindingOrAssignmentPattern
+     */
+    /* @internal */
+    function isBindingOrAssignmentPattern(node) {
+        return isObjectBindingOrAssignmentPattern(node)
+            || isArrayBindingOrAssignmentPattern(node);
+    }
+    ts.isBindingOrAssignmentPattern = isBindingOrAssignmentPattern;
+    /**
+     * Determines whether a node is an ObjectBindingOrAssignmentPattern
+     */
+    /* @internal */
+    function isObjectBindingOrAssignmentPattern(node) {
+        switch (node.kind) {
+            case 184 /* ObjectBindingPattern */:
+            case 188 /* ObjectLiteralExpression */:
+                return true;
+        }
+        return false;
+    }
+    ts.isObjectBindingOrAssignmentPattern = isObjectBindingOrAssignmentPattern;
+    /**
+     * Determines whether a node is an ArrayBindingOrAssignmentPattern
+     */
+    /* @internal */
+    function isArrayBindingOrAssignmentPattern(node) {
+        switch (node.kind) {
+            case 185 /* ArrayBindingPattern */:
+            case 187 /* ArrayLiteralExpression */:
+                return true;
+        }
+        return false;
+    }
+    ts.isArrayBindingOrAssignmentPattern = isArrayBindingOrAssignmentPattern;
+    /* @internal */
+    function isPropertyAccessOrQualifiedNameOrImportTypeNode(node) {
+        var kind = node.kind;
+        return kind === 189 /* PropertyAccessExpression */
+            || kind === 148 /* QualifiedName */
+            || kind === 183 /* ImportType */;
+    }
+    ts.isPropertyAccessOrQualifiedNameOrImportTypeNode = isPropertyAccessOrQualifiedNameOrImportTypeNode;
+    // Expression
+    function isPropertyAccessOrQualifiedName(node) {
+        var kind = node.kind;
+        return kind === 189 /* PropertyAccessExpression */
+            || kind === 148 /* QualifiedName */;
+    }
+    ts.isPropertyAccessOrQualifiedName = isPropertyAccessOrQualifiedName;
+    function isCallLikeExpression(node) {
+        switch (node.kind) {
+            case 262 /* JsxOpeningElement */:
+            case 261 /* JsxSelfClosingElement */:
+            case 191 /* CallExpression */:
+            case 192 /* NewExpression */:
+            case 193 /* TaggedTemplateExpression */:
+            case 152 /* Decorator */:
+                return true;
+            default:
+                return false;
+        }
+    }
+    ts.isCallLikeExpression = isCallLikeExpression;
+    function isCallOrNewExpression(node) {
+        return node.kind === 191 /* CallExpression */ || node.kind === 192 /* NewExpression */;
+    }
+    ts.isCallOrNewExpression = isCallOrNewExpression;
+    function isTemplateLiteral(node) {
+        var kind = node.kind;
+        return kind === 206 /* TemplateExpression */
+            || kind === 14 /* NoSubstitutionTemplateLiteral */;
+    }
+    ts.isTemplateLiteral = isTemplateLiteral;
+    /* @internal */
+    function isLeftHandSideExpression(node) {
+        return isLeftHandSideExpressionKind(ts.skipPartiallyEmittedExpressions(node).kind);
+    }
+    ts.isLeftHandSideExpression = isLeftHandSideExpression;
+    function isLeftHandSideExpressionKind(kind) {
+        switch (kind) {
+            case 189 /* PropertyAccessExpression */:
+            case 190 /* ElementAccessExpression */:
+            case 192 /* NewExpression */:
+            case 191 /* CallExpression */:
+            case 260 /* JsxElement */:
+            case 261 /* JsxSelfClosingElement */:
+            case 264 /* JsxFragment */:
+            case 193 /* TaggedTemplateExpression */:
+            case 187 /* ArrayLiteralExpression */:
+            case 195 /* ParenthesizedExpression */:
+            case 188 /* ObjectLiteralExpression */:
+            case 209 /* ClassExpression */:
+            case 196 /* FunctionExpression */:
+            case 72 /* Identifier */:
+            case 13 /* RegularExpressionLiteral */:
+            case 8 /* NumericLiteral */:
+            case 9 /* BigIntLiteral */:
+            case 10 /* StringLiteral */:
+            case 14 /* NoSubstitutionTemplateLiteral */:
+            case 206 /* TemplateExpression */:
+            case 87 /* FalseKeyword */:
+            case 96 /* NullKeyword */:
+            case 100 /* ThisKeyword */:
+            case 102 /* TrueKeyword */:
+            case 98 /* SuperKeyword */:
+            case 213 /* NonNullExpression */:
+            case 214 /* MetaProperty */:
+            case 92 /* ImportKeyword */: // technically this is only an Expression if it's in a CallExpression
+                return true;
+            default:
+                return false;
+        }
+    }
+    /* @internal */
+    function isUnaryExpression(node) {
+        return isUnaryExpressionKind(ts.skipPartiallyEmittedExpressions(node).kind);
+    }
+    ts.isUnaryExpression = isUnaryExpression;
+    function isUnaryExpressionKind(kind) {
+        switch (kind) {
+            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PostfixUnaryExpression */:
+            case 198 /* DeleteExpression */:
+            case 199 /* TypeOfExpression */:
+            case 200 /* VoidExpression */:
+            case 201 /* AwaitExpression */:
+            case 194 /* TypeAssertionExpression */:
+                return true;
+            default:
+                return isLeftHandSideExpressionKind(kind);
+        }
+    }
+    /* @internal */
+    function isUnaryExpressionWithWrite(expr) {
+        switch (expr.kind) {
+            case 203 /* PostfixUnaryExpression */:
+                return true;
+            case 202 /* PrefixUnaryExpression */:
+                return expr.operator === 44 /* PlusPlusToken */ ||
+                    expr.operator === 45 /* MinusMinusToken */;
+            default:
+                return false;
+        }
+    }
+    ts.isUnaryExpressionWithWrite = isUnaryExpressionWithWrite;
+    /* @internal */
+    /**
+     * Determines whether a node is an expression based only on its kind.
+     * Use `isExpressionNode` if not in transforms.
+     */
+    function isExpression(node) {
+        return isExpressionKind(ts.skipPartiallyEmittedExpressions(node).kind);
+    }
+    ts.isExpression = isExpression;
+    function isExpressionKind(kind) {
+        switch (kind) {
+            case 205 /* ConditionalExpression */:
+            case 207 /* YieldExpression */:
+            case 197 /* ArrowFunction */:
+            case 204 /* BinaryExpression */:
+            case 208 /* SpreadElement */:
+            case 212 /* AsExpression */:
+            case 210 /* OmittedExpression */:
+            case 309 /* CommaListExpression */:
+            case 308 /* PartiallyEmittedExpression */:
+                return true;
+            default:
+                return isUnaryExpressionKind(kind);
+        }
+    }
+    function isAssertionExpression(node) {
+        var kind = node.kind;
+        return kind === 194 /* TypeAssertionExpression */
+            || kind === 212 /* AsExpression */;
+    }
+    ts.isAssertionExpression = isAssertionExpression;
+    /* @internal */
+    function isPartiallyEmittedExpression(node) {
+        return node.kind === 308 /* PartiallyEmittedExpression */;
+    }
+    ts.isPartiallyEmittedExpression = isPartiallyEmittedExpression;
+    /* @internal */
+    function isNotEmittedStatement(node) {
+        return node.kind === 307 /* NotEmittedStatement */;
+    }
+    ts.isNotEmittedStatement = isNotEmittedStatement;
+    /* @internal */
+    function isNotEmittedOrPartiallyEmittedNode(node) {
+        return isNotEmittedStatement(node)
+            || isPartiallyEmittedExpression(node);
+    }
+    ts.isNotEmittedOrPartiallyEmittedNode = isNotEmittedOrPartiallyEmittedNode;
+    function isIterationStatement(node, lookInLabeledStatements) {
+        switch (node.kind) {
+            case 225 /* ForStatement */:
+            case 226 /* ForInStatement */:
+            case 227 /* ForOfStatement */:
+            case 223 /* DoStatement */:
+            case 224 /* WhileStatement */:
+                return true;
+            case 233 /* LabeledStatement */:
+                return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
+        }
+        return false;
+    }
+    ts.isIterationStatement = isIterationStatement;
+    /* @internal */
+    function isForInOrOfStatement(node) {
+        return node.kind === 226 /* ForInStatement */ || node.kind === 227 /* ForOfStatement */;
+    }
+    ts.isForInOrOfStatement = isForInOrOfStatement;
+    // Element
+    /* @internal */
+    function isConciseBody(node) {
+        return ts.isBlock(node)
+            || isExpression(node);
+    }
+    ts.isConciseBody = isConciseBody;
+    /* @internal */
+    function isFunctionBody(node) {
+        return ts.isBlock(node);
+    }
+    ts.isFunctionBody = isFunctionBody;
+    /* @internal */
+    function isForInitializer(node) {
+        return ts.isVariableDeclarationList(node)
+            || isExpression(node);
+    }
+    ts.isForInitializer = isForInitializer;
+    /* @internal */
+    function isModuleBody(node) {
+        var kind = node.kind;
+        return kind === 245 /* ModuleBlock */
+            || kind === 244 /* ModuleDeclaration */
+            || kind === 72 /* Identifier */;
+    }
+    ts.isModuleBody = isModuleBody;
+    /* @internal */
+    function isNamespaceBody(node) {
+        var kind = node.kind;
+        return kind === 245 /* ModuleBlock */
+            || kind === 244 /* ModuleDeclaration */;
+    }
+    ts.isNamespaceBody = isNamespaceBody;
+    /* @internal */
+    function isJSDocNamespaceBody(node) {
+        var kind = node.kind;
+        return kind === 72 /* Identifier */
+            || kind === 244 /* ModuleDeclaration */;
+    }
+    ts.isJSDocNamespaceBody = isJSDocNamespaceBody;
+    /* @internal */
+    function isNamedImportBindings(node) {
+        var kind = node.kind;
+        return kind === 252 /* NamedImports */
+            || kind === 251 /* NamespaceImport */;
+    }
+    ts.isNamedImportBindings = isNamedImportBindings;
+    /* @internal */
+    function isModuleOrEnumDeclaration(node) {
+        return node.kind === 244 /* ModuleDeclaration */ || node.kind === 243 /* EnumDeclaration */;
+    }
+    ts.isModuleOrEnumDeclaration = isModuleOrEnumDeclaration;
+    function isDeclarationKind(kind) {
+        return kind === 197 /* ArrowFunction */
+            || kind === 186 /* BindingElement */
+            || kind === 240 /* ClassDeclaration */
+            || kind === 209 /* ClassExpression */
+            || kind === 157 /* Constructor */
+            || kind === 243 /* EnumDeclaration */
+            || kind === 278 /* EnumMember */
+            || kind === 257 /* ExportSpecifier */
+            || kind === 239 /* FunctionDeclaration */
+            || kind === 196 /* FunctionExpression */
+            || kind === 158 /* GetAccessor */
+            || kind === 250 /* ImportClause */
+            || kind === 248 /* ImportEqualsDeclaration */
+            || kind === 253 /* ImportSpecifier */
+            || kind === 241 /* InterfaceDeclaration */
+            || kind === 267 /* JsxAttribute */
+            || kind === 156 /* MethodDeclaration */
+            || kind === 155 /* MethodSignature */
+            || kind === 244 /* ModuleDeclaration */
+            || kind === 247 /* NamespaceExportDeclaration */
+            || kind === 251 /* NamespaceImport */
+            || kind === 151 /* Parameter */
+            || kind === 275 /* PropertyAssignment */
+            || kind === 154 /* PropertyDeclaration */
+            || kind === 153 /* PropertySignature */
+            || kind === 159 /* SetAccessor */
+            || kind === 276 /* ShorthandPropertyAssignment */
+            || kind === 242 /* TypeAliasDeclaration */
+            || kind === 150 /* TypeParameter */
+            || kind === 237 /* VariableDeclaration */
+            || kind === 304 /* JSDocTypedefTag */
+            || kind === 297 /* JSDocCallbackTag */
+            || kind === 305 /* JSDocPropertyTag */;
+    }
+    function isDeclarationStatementKind(kind) {
+        return kind === 239 /* FunctionDeclaration */
+            || kind === 258 /* MissingDeclaration */
+            || kind === 240 /* ClassDeclaration */
+            || kind === 241 /* InterfaceDeclaration */
+            || kind === 242 /* TypeAliasDeclaration */
+            || kind === 243 /* EnumDeclaration */
+            || kind === 244 /* ModuleDeclaration */
+            || kind === 249 /* ImportDeclaration */
+            || kind === 248 /* ImportEqualsDeclaration */
+            || kind === 255 /* ExportDeclaration */
+            || kind === 254 /* ExportAssignment */
+            || kind === 247 /* NamespaceExportDeclaration */;
+    }
+    function isStatementKindButNotDeclarationKind(kind) {
+        return kind === 229 /* BreakStatement */
+            || kind === 228 /* ContinueStatement */
+            || kind === 236 /* DebuggerStatement */
+            || kind === 223 /* DoStatement */
+            || kind === 221 /* ExpressionStatement */
+            || kind === 220 /* EmptyStatement */
+            || kind === 226 /* ForInStatement */
+            || kind === 227 /* ForOfStatement */
+            || kind === 225 /* ForStatement */
+            || kind === 222 /* IfStatement */
+            || kind === 233 /* LabeledStatement */
+            || kind === 230 /* ReturnStatement */
+            || kind === 232 /* SwitchStatement */
+            || kind === 234 /* ThrowStatement */
+            || kind === 235 /* TryStatement */
+            || kind === 219 /* VariableStatement */
+            || kind === 224 /* WhileStatement */
+            || kind === 231 /* WithStatement */
+            || kind === 307 /* NotEmittedStatement */
+            || kind === 311 /* EndOfDeclarationMarker */
+            || kind === 310 /* MergeDeclarationMarker */;
+    }
+    /* @internal */
+    function isDeclaration(node) {
+        if (node.kind === 150 /* TypeParameter */) {
+            return node.parent.kind !== 303 /* JSDocTemplateTag */ || ts.isInJSFile(node);
+        }
+        return isDeclarationKind(node.kind);
+    }
+    ts.isDeclaration = isDeclaration;
+    /* @internal */
+    function isDeclarationStatement(node) {
+        return isDeclarationStatementKind(node.kind);
+    }
+    ts.isDeclarationStatement = isDeclarationStatement;
+    /**
+     * Determines whether the node is a statement that is not also a declaration
+     */
+    /* @internal */
+    function isStatementButNotDeclaration(node) {
+        return isStatementKindButNotDeclarationKind(node.kind);
+    }
+    ts.isStatementButNotDeclaration = isStatementButNotDeclaration;
+    /* @internal */
+    function isStatement(node) {
+        var kind = node.kind;
+        return isStatementKindButNotDeclarationKind(kind)
+            || isDeclarationStatementKind(kind)
+            || isBlockStatement(node);
+    }
+    ts.isStatement = isStatement;
+    function isBlockStatement(node) {
+        if (node.kind !== 218 /* Block */)
+            return false;
+        if (node.parent !== undefined) {
+            if (node.parent.kind === 235 /* TryStatement */ || node.parent.kind === 274 /* CatchClause */) {
+                return false;
+            }
+        }
+        return !ts.isFunctionBlock(node);
+    }
+    // Module references
+    /* @internal */
+    function isModuleReference(node) {
+        var kind = node.kind;
+        return kind === 259 /* ExternalModuleReference */
+            || kind === 148 /* QualifiedName */
+            || kind === 72 /* Identifier */;
+    }
+    ts.isModuleReference = isModuleReference;
+    // JSX
+    /* @internal */
+    function isJsxTagNameExpression(node) {
+        var kind = node.kind;
+        return kind === 100 /* ThisKeyword */
+            || kind === 72 /* Identifier */
+            || kind === 189 /* PropertyAccessExpression */;
+    }
+    ts.isJsxTagNameExpression = isJsxTagNameExpression;
+    /* @internal */
+    function isJsxChild(node) {
+        var kind = node.kind;
+        return kind === 260 /* JsxElement */
+            || kind === 270 /* JsxExpression */
+            || kind === 261 /* JsxSelfClosingElement */
+            || kind === 11 /* JsxText */
+            || kind === 264 /* JsxFragment */;
+    }
+    ts.isJsxChild = isJsxChild;
+    /* @internal */
+    function isJsxAttributeLike(node) {
+        var kind = node.kind;
+        return kind === 267 /* JsxAttribute */
+            || kind === 269 /* JsxSpreadAttribute */;
+    }
+    ts.isJsxAttributeLike = isJsxAttributeLike;
+    /* @internal */
+    function isStringLiteralOrJsxExpression(node) {
+        var kind = node.kind;
+        return kind === 10 /* StringLiteral */
+            || kind === 270 /* JsxExpression */;
+    }
+    ts.isStringLiteralOrJsxExpression = isStringLiteralOrJsxExpression;
+    function isJsxOpeningLikeElement(node) {
+        var kind = node.kind;
+        return kind === 262 /* JsxOpeningElement */
+            || kind === 261 /* JsxSelfClosingElement */;
+    }
+    ts.isJsxOpeningLikeElement = isJsxOpeningLikeElement;
+    // Clauses
+    function isCaseOrDefaultClause(node) {
+        var kind = node.kind;
+        return kind === 271 /* CaseClause */
+            || kind === 272 /* DefaultClause */;
+    }
+    ts.isCaseOrDefaultClause = isCaseOrDefaultClause;
+    // JSDoc
+    /** True if node is of some JSDoc syntax kind. */
+    /* @internal */
+    function isJSDocNode(node) {
+        return node.kind >= 283 /* FirstJSDocNode */ && node.kind <= 305 /* LastJSDocNode */;
+    }
+    ts.isJSDocNode = isJSDocNode;
+    /** True if node is of a kind that may contain comment text. */
+    function isJSDocCommentContainingNode(node) {
+        return node.kind === 291 /* JSDocComment */ || isJSDocTag(node) || ts.isJSDocTypeLiteral(node) || ts.isJSDocSignature(node);
+    }
+    ts.isJSDocCommentContainingNode = isJSDocCommentContainingNode;
+    // TODO: determine what this does before making it public.
+    /* @internal */
+    function isJSDocTag(node) {
+        return node.kind >= 294 /* FirstJSDocTagNode */ && node.kind <= 305 /* LastJSDocTagNode */;
+    }
+    ts.isJSDocTag = isJSDocTag;
+    function isSetAccessor(node) {
+        return node.kind === 159 /* SetAccessor */;
+    }
+    ts.isSetAccessor = isSetAccessor;
+    function isGetAccessor(node) {
+        return node.kind === 158 /* GetAccessor */;
+    }
+    ts.isGetAccessor = isGetAccessor;
+    /** True if has jsdoc nodes attached to it. */
+    /* @internal */
+    // TODO: GH#19856 Would like to return `node is Node & { jsDoc: JSDoc[] }` but it causes long compile times
+    function hasJSDocNodes(node) {
+        var jsDoc = node.jsDoc;
+        return !!jsDoc && jsDoc.length > 0;
+    }
+    ts.hasJSDocNodes = hasJSDocNodes;
+    /** True if has type node attached to it. */
+    /* @internal */
+    function hasType(node) {
+        return !!node.type;
+    }
+    ts.hasType = hasType;
+    /** True if has initializer node attached to it. */
+    /* @internal */
+    function hasInitializer(node) {
+        return !!node.initializer;
+    }
+    ts.hasInitializer = hasInitializer;
+    /** True if has initializer node attached to it. */
+    /* @internal */
+    function hasOnlyExpressionInitializer(node) {
+        return hasInitializer(node) && !ts.isForStatement(node) && !ts.isForInStatement(node) && !ts.isForOfStatement(node) && !ts.isJsxAttribute(node);
+    }
+    ts.hasOnlyExpressionInitializer = hasOnlyExpressionInitializer;
+    function isObjectLiteralElement(node) {
+        return node.kind === 267 /* JsxAttribute */ || node.kind === 269 /* JsxSpreadAttribute */ || isObjectLiteralElementLike(node);
+    }
+    ts.isObjectLiteralElement = isObjectLiteralElement;
+    /* @internal */
+    function isTypeReferenceType(node) {
+        return node.kind === 164 /* TypeReference */ || node.kind === 211 /* ExpressionWithTypeArguments */;
+    }
+    ts.isTypeReferenceType = isTypeReferenceType;
+    var MAX_SMI_X86 = 1073741823;
+    /* @internal */
+    function guessIndentation(lines) {
+        var indentation = MAX_SMI_X86;
+        for (var _i = 0, lines_1 = lines; _i < lines_1.length; _i++) {
+            var line = lines_1[_i];
+            if (!line.length) {
+                continue;
+            }
+            var i = 0;
+            for (; i < line.length && i < indentation; i++) {
+                if (!ts.isWhiteSpaceLike(line.charCodeAt(i))) {
+                    break;
+                }
+            }
+            if (i < indentation) {
+                indentation = i;
+            }
+            if (indentation === 0) {
+                return 0;
+            }
+        }
+        return indentation === MAX_SMI_X86 ? undefined : indentation;
+    }
+    ts.guessIndentation = guessIndentation;
+    function isStringLiteralLike(node) {
+        return node.kind === 10 /* StringLiteral */ || node.kind === 14 /* NoSubstitutionTemplateLiteral */;
+    }
+    ts.isStringLiteralLike = isStringLiteralLike;
+})(ts || (ts = {}));
+/* @internal */
+(function (ts) {
+    function isNamedImportsOrExports(node) {
+        return node.kind === 252 /* NamedImports */ || node.kind === 256 /* NamedExports */;
+    }
+    ts.isNamedImportsOrExports = isNamedImportsOrExports;
+    function Symbol(flags, name) {
+        this.flags = flags;
+        this.escapedName = name;
+        this.declarations = undefined;
+        this.valueDeclaration = undefined;
+        this.id = undefined;
+        this.mergeId = undefined;
+        this.parent = undefined;
+    }
+    function Type(checker, flags) {
+        this.flags = flags;
+        if (ts.Debug.isDebugging) {
+            this.checker = checker;
+        }
+    }
+    function Signature() { } // tslint:disable-line no-empty
+    function Node(kind, pos, end) {
+        this.pos = pos;
+        this.end = end;
+        this.kind = kind;
+        this.id = 0;
+        this.flags = 0 /* None */;
+        this.modifierFlagsCache = 0 /* None */;
+        this.transformFlags = 0 /* None */;
+        this.parent = undefined;
+        this.original = undefined;
+    }
+    function SourceMapSource(fileName, text, skipTrivia) {
+        this.fileName = fileName;
+        this.text = text;
+        this.skipTrivia = skipTrivia || (function (pos) { return pos; });
+    }
+    ts.objectAllocator = {
+        getNodeConstructor: function () { return Node; },
+        getTokenConstructor: function () { return Node; },
+        getIdentifierConstructor: function () { return Node; },
+        getSourceFileConstructor: function () { return Node; },
+        getSymbolConstructor: function () { return Symbol; },
+        getTypeConstructor: function () { return Type; },
+        getSignatureConstructor: function () { return Signature; },
+        getSourceMapSourceConstructor: function () { return SourceMapSource; },
+    };
+    function formatStringFromArgs(text, args, baseIndex) {
+        if (baseIndex === void 0) { baseIndex = 0; }
+        return text.replace(/{(\d+)}/g, function (_match, index) { return "" + ts.Debug.assertDefined(args[+index + baseIndex]); });
+    }
+    ts.formatStringFromArgs = formatStringFromArgs;
+    function getLocaleSpecificMessage(message) {
+        return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message.key] || message.message;
+    }
+    ts.getLocaleSpecificMessage = getLocaleSpecificMessage;
+    function createFileDiagnostic(file, start, length, message) {
+        ts.Debug.assertGreaterThanOrEqual(start, 0);
+        ts.Debug.assertGreaterThanOrEqual(length, 0);
+        if (file) {
+            ts.Debug.assertLessThanOrEqual(start, file.text.length);
+            ts.Debug.assertLessThanOrEqual(start + length, file.text.length);
+        }
+        var text = getLocaleSpecificMessage(message);
+        if (arguments.length > 4) {
+            text = formatStringFromArgs(text, arguments, 4);
+        }
+        return {
+            file: file,
+            start: start,
+            length: length,
+            messageText: text,
+            category: message.category,
+            code: message.code,
+            reportsUnnecessary: message.reportsUnnecessary,
+        };
+    }
+    ts.createFileDiagnostic = createFileDiagnostic;
+    function formatMessage(_dummy, message) {
+        var text = getLocaleSpecificMessage(message);
+        if (arguments.length > 2) {
+            text = formatStringFromArgs(text, arguments, 2);
+        }
+        return text;
+    }
+    ts.formatMessage = formatMessage;
+    function createCompilerDiagnostic(message) {
+        var text = getLocaleSpecificMessage(message);
+        if (arguments.length > 1) {
+            text = formatStringFromArgs(text, arguments, 1);
+        }
+        return {
+            file: undefined,
+            start: undefined,
+            length: undefined,
+            messageText: text,
+            category: message.category,
+            code: message.code,
+            reportsUnnecessary: message.reportsUnnecessary,
+        };
+    }
+    ts.createCompilerDiagnostic = createCompilerDiagnostic;
+    function createCompilerDiagnosticFromMessageChain(chain) {
+        return {
+            file: undefined,
+            start: undefined,
+            length: undefined,
+            code: chain.code,
+            category: chain.category,
+            messageText: chain.next ? chain : chain.messageText,
+        };
+    }
+    ts.createCompilerDiagnosticFromMessageChain = createCompilerDiagnosticFromMessageChain;
+    function chainDiagnosticMessages(details, message) {
+        var text = getLocaleSpecificMessage(message);
+        if (arguments.length > 2) {
+            text = formatStringFromArgs(text, arguments, 2);
+        }
+        return {
+            messageText: text,
+            category: message.category,
+            code: message.code,
+            next: details
+        };
+    }
+    ts.chainDiagnosticMessages = chainDiagnosticMessages;
+    function concatenateDiagnosticMessageChains(headChain, tailChain) {
+        var lastChain = headChain;
+        while (lastChain.next) {
+            lastChain = lastChain.next;
+        }
+        lastChain.next = tailChain;
+        return headChain;
+    }
+    ts.concatenateDiagnosticMessageChains = concatenateDiagnosticMessageChains;
+    function getDiagnosticFilePath(diagnostic) {
+        return diagnostic.file ? diagnostic.file.path : undefined;
+    }
+    function compareDiagnostics(d1, d2) {
+        return compareDiagnosticsSkipRelatedInformation(d1, d2) ||
+            compareRelatedInformation(d1, d2) ||
+            0 /* EqualTo */;
+    }
+    ts.compareDiagnostics = compareDiagnostics;
+    function compareDiagnosticsSkipRelatedInformation(d1, d2) {
+        return ts.compareStringsCaseSensitive(getDiagnosticFilePath(d1), getDiagnosticFilePath(d2)) ||
+            ts.compareValues(d1.start, d2.start) ||
+            ts.compareValues(d1.length, d2.length) ||
+            ts.compareValues(d1.code, d2.code) ||
+            compareMessageText(d1.messageText, d2.messageText) ||
+            0 /* EqualTo */;
+    }
+    ts.compareDiagnosticsSkipRelatedInformation = compareDiagnosticsSkipRelatedInformation;
+    function compareRelatedInformation(d1, d2) {
+        if (!d1.relatedInformation && !d2.relatedInformation) {
+            return 0 /* EqualTo */;
+        }
+        if (d1.relatedInformation && d2.relatedInformation) {
+            return ts.compareValues(d1.relatedInformation.length, d2.relatedInformation.length) || ts.forEach(d1.relatedInformation, function (d1i, index) {
+                var d2i = d2.relatedInformation[index];
+                return compareDiagnostics(d1i, d2i); // EqualTo is 0, so falsy, and will cause the next item to be compared
+            }) || 0 /* EqualTo */;
+        }
+        return d1.relatedInformation ? -1 /* LessThan */ : 1 /* GreaterThan */;
+    }
+    function compareMessageText(t1, t2) {
+        var text1 = t1;
+        var text2 = t2;
+        while (text1 && text2) {
+            // We still have both chains.
+            var string1 = ts.isString(text1) ? text1 : text1.messageText;
+            var string2 = ts.isString(text2) ? text2 : text2.messageText;
+            var res = ts.compareStringsCaseSensitive(string1, string2);
+            if (res) {
+                return res;
+            }
+            text1 = ts.isString(text1) ? undefined : text1.next;
+            text2 = ts.isString(text2) ? undefined : text2.next;
+        }
+        if (!text1 && !text2) {
+            // if the chains are done, then these messages are the same.
+            return 0 /* EqualTo */;
+        }
+        // We still have one chain remaining.  The shorter chain should come first.
+        return text1 ? 1 /* GreaterThan */ : -1 /* LessThan */;
+    }
+    function getEmitScriptTarget(compilerOptions) {
+        return compilerOptions.target || 0 /* ES3 */;
+    }
+    ts.getEmitScriptTarget = getEmitScriptTarget;
+    function getEmitModuleKind(compilerOptions) {
+        return typeof compilerOptions.module === "number" ?
+            compilerOptions.module :
+            getEmitScriptTarget(compilerOptions) >= 2 /* ES2015 */ ? ts.ModuleKind.ES2015 : ts.ModuleKind.CommonJS;
+    }
+    ts.getEmitModuleKind = getEmitModuleKind;
+    function getEmitModuleResolutionKind(compilerOptions) {
+        var moduleResolution = compilerOptions.moduleResolution;
+        if (moduleResolution === undefined) {
+            moduleResolution = getEmitModuleKind(compilerOptions) === ts.ModuleKind.CommonJS ? ts.ModuleResolutionKind.NodeJs : ts.ModuleResolutionKind.Classic;
+        }
+        return moduleResolution;
+    }
+    ts.getEmitModuleResolutionKind = getEmitModuleResolutionKind;
+    function hasJsonModuleEmitEnabled(options) {
+        switch (getEmitModuleKind(options)) {
+            case ts.ModuleKind.CommonJS:
+            case ts.ModuleKind.AMD:
+            case ts.ModuleKind.ES2015:
+            case ts.ModuleKind.ESNext:
+                return true;
+            default:
+                return false;
+        }
+    }
+    ts.hasJsonModuleEmitEnabled = hasJsonModuleEmitEnabled;
+    function unreachableCodeIsError(options) {
+        return options.allowUnreachableCode === false;
+    }
+    ts.unreachableCodeIsError = unreachableCodeIsError;
+    function unusedLabelIsError(options) {
+        return options.allowUnusedLabels === false;
+    }
+    ts.unusedLabelIsError = unusedLabelIsError;
+    function getAreDeclarationMapsEnabled(options) {
+        return !!(getEmitDeclarations(options) && options.declarationMap);
+    }
+    ts.getAreDeclarationMapsEnabled = getAreDeclarationMapsEnabled;
+    function getAllowSyntheticDefaultImports(compilerOptions) {
+        var moduleKind = getEmitModuleKind(compilerOptions);
+        return compilerOptions.allowSyntheticDefaultImports !== undefined
+            ? compilerOptions.allowSyntheticDefaultImports
+            : compilerOptions.esModuleInterop ||
+                moduleKind === ts.ModuleKind.System;
+    }
+    ts.getAllowSyntheticDefaultImports = getAllowSyntheticDefaultImports;
+    function getEmitDeclarations(compilerOptions) {
+        return !!(compilerOptions.declaration || compilerOptions.composite);
+    }
+    ts.getEmitDeclarations = getEmitDeclarations;
+    function getStrictOptionValue(compilerOptions, flag) {
+        return compilerOptions[flag] === undefined ? !!compilerOptions.strict : !!compilerOptions[flag];
+    }
+    ts.getStrictOptionValue = getStrictOptionValue;
+    function compilerOptionsAffectSemanticDiagnostics(newOptions, oldOptions) {
+        return oldOptions !== newOptions &&
+            ts.semanticDiagnosticsOptionDeclarations.some(function (option) { return !ts.isJsonEqual(getCompilerOptionValue(oldOptions, option), getCompilerOptionValue(newOptions, option)); });
+    }
+    ts.compilerOptionsAffectSemanticDiagnostics = compilerOptionsAffectSemanticDiagnostics;
+    function getCompilerOptionValue(options, option) {
+        return option.strictFlag ? getStrictOptionValue(options, option.name) : options[option.name];
+    }
+    ts.getCompilerOptionValue = getCompilerOptionValue;
+    function hasZeroOrOneAsteriskCharacter(str) {
+        var seenAsterisk = false;
+        for (var i = 0; i < str.length; i++) {
+            if (str.charCodeAt(i) === 42 /* asterisk */) {
+                if (!seenAsterisk) {
+                    seenAsterisk = true;
+                }
+                else {
+                    // have already seen asterisk
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+    ts.hasZeroOrOneAsteriskCharacter = hasZeroOrOneAsteriskCharacter;
+    /**
+     * Internally, we represent paths as strings with '/' as the directory separator.
+     * When we make system calls (eg: LanguageServiceHost.getDirectory()),
+     * we expect the host to correctly handle paths in our specified format.
+     */
+    ts.directorySeparator = "/";
+    var altDirectorySeparator = "\\";
+    var urlSchemeSeparator = "://";
+    var backslashRegExp = /\\/g;
+    /**
+     * Normalize path separators.
+     */
+    function normalizeSlashes(path) {
+        return path.replace(backslashRegExp, ts.directorySeparator);
+    }
+    ts.normalizeSlashes = normalizeSlashes;
+    function isVolumeCharacter(charCode) {
+        return (charCode >= 97 /* a */ && charCode <= 122 /* z */) ||
+            (charCode >= 65 /* A */ && charCode <= 90 /* Z */);
+    }
+    function getFileUrlVolumeSeparatorEnd(url, start) {
+        var ch0 = url.charCodeAt(start);
+        if (ch0 === 58 /* colon */)
+            return start + 1;
+        if (ch0 === 37 /* percent */ && url.charCodeAt(start + 1) === 51 /* _3 */) {
+            var ch2 = url.charCodeAt(start + 2);
+            if (ch2 === 97 /* a */ || ch2 === 65 /* A */)
+                return start + 3;
+        }
+        return -1;
+    }
+    /**
+     * Returns length of the root part of a path or URL (i.e. length of "/", "x:/", "//server/share/, file:///user/files").
+     * If the root is part of a URL, the twos-complement of the root length is returned.
+     */
+    function getEncodedRootLength(path) {
+        if (!path)
+            return 0;
+        var ch0 = path.charCodeAt(0);
+        // POSIX or UNC
+        if (ch0 === 47 /* slash */ || ch0 === 92 /* backslash */) {
+            if (path.charCodeAt(1) !== ch0)
+                return 1; // POSIX: "/" (or non-normalized "\")
+            var p1 = path.indexOf(ch0 === 47 /* slash */ ? ts.directorySeparator : altDirectorySeparator, 2);
+            if (p1 < 0)
+                return path.length; // UNC: "//server" or "\\server"
+            return p1 + 1; // UNC: "//server/" or "\\server\"
+        }
+        // DOS
+        if (isVolumeCharacter(ch0) && path.charCodeAt(1) === 58 /* colon */) {
+            var ch2 = path.charCodeAt(2);
+            if (ch2 === 47 /* slash */ || ch2 === 92 /* backslash */)
+                return 3; // DOS: "c:/" or "c:\"
+            if (path.length === 2)
+                return 2; // DOS: "c:" (but not "c:d")
+        }
+        // URL
+        var schemeEnd = path.indexOf(urlSchemeSeparator);
+        if (schemeEnd !== -1) {
+            var authorityStart = schemeEnd + urlSchemeSeparator.length;
+            var authorityEnd = path.indexOf(ts.directorySeparator, authorityStart);
+            if (authorityEnd !== -1) { // URL: "file:///", "file://server/", "file://server/path"
+                // For local "file" URLs, include the leading DOS volume (if present).
+                // Per https://www.ietf.org/rfc/rfc1738.txt, a host of "" or "localhost" is a
+                // special case interpreted as "the machine from which the URL is being interpreted".
+                var scheme = path.slice(0, schemeEnd);
+                var authority = path.slice(authorityStart, authorityEnd);
+                if (scheme === "file" && (authority === "" || authority === "localhost") &&
+                    isVolumeCharacter(path.charCodeAt(authorityEnd + 1))) {
+                    var volumeSeparatorEnd = getFileUrlVolumeSeparatorEnd(path, authorityEnd + 2);
+                    if (volumeSeparatorEnd !== -1) {
+                        if (path.charCodeAt(volumeSeparatorEnd) === 47 /* slash */) {
+                            // URL: "file:///c:/", "file://localhost/c:/", "file:///c%3a/", "file://localhost/c%3a/"
+                            return ~(volumeSeparatorEnd + 1);
+                        }
+                        if (volumeSeparatorEnd === path.length) {
+                            // URL: "file:///c:", "file://localhost/c:", "file:///c$3a", "file://localhost/c%3a"
+                            // but not "file:///c:d" or "file:///c%3ad"
+                            return ~volumeSeparatorEnd;
+                        }
+                    }
+                }
+                return ~(authorityEnd + 1); // URL: "file://server/", "http://server/"
+            }
+            return ~path.length; // URL: "file://server", "http://server"
+        }
+        // relative
+        return 0;
+    }
+    /**
+     * Returns length of the root part of a path or URL (i.e. length of "/", "x:/", "//server/share/, file:///user/files").
+     *
+     * For example:
+     * ```ts
+     * getRootLength("a") === 0                   // ""
+     * getRootLength("/") === 1                   // "/"
+     * getRootLength("c:") === 2                  // "c:"
+     * getRootLength("c:d") === 0                 // ""
+     * getRootLength("c:/") === 3                 // "c:/"
+     * getRootLength("c:\\") === 3                // "c:\\"
+     * getRootLength("//server") === 7            // "//server"
+     * getRootLength("//server/share") === 8      // "//server/"
+     * getRootLength("\\\\server") === 7          // "\\\\server"
+     * getRootLength("\\\\server\\share") === 8   // "\\\\server\\"
+     * getRootLength("file:///path") === 8        // "file:///"
+     * getRootLength("file:///c:") === 10         // "file:///c:"
+     * getRootLength("file:///c:d") === 8         // "file:///"
+     * getRootLength("file:///c:/path") === 11    // "file:///c:/"
+     * getRootLength("file://server") === 13      // "file://server"
+     * getRootLength("file://server/path") === 14 // "file://server/"
+     * getRootLength("http://server") === 13      // "http://server"
+     * getRootLength("http://server/path") === 14 // "http://server/"
+     * ```
+     */
+    function getRootLength(path) {
+        var rootLength = getEncodedRootLength(path);
+        return rootLength < 0 ? ~rootLength : rootLength;
+    }
+    ts.getRootLength = getRootLength;
+    // TODO(rbuckton): replace references with `resolvePath`
+    function normalizePath(path) {
+        return ts.resolvePath(path);
+    }
+    ts.normalizePath = normalizePath;
+    function normalizePathAndParts(path) {
+        path = normalizeSlashes(path);
+        var _a = reducePathComponents(getPathComponents(path)), root = _a[0], parts = _a.slice(1);
+        if (parts.length) {
+            var joinedParts = root + parts.join(ts.directorySeparator);
+            return { path: ts.hasTrailingDirectorySeparator(path) ? ts.ensureTrailingDirectorySeparator(joinedParts) : joinedParts, parts: parts };
+        }
+        else {
+            return { path: root, parts: parts };
+        }
+    }
+    ts.normalizePathAndParts = normalizePathAndParts;
+    function getDirectoryPath(path) {
+        path = normalizeSlashes(path);
+        // If the path provided is itself the root, then return it.
+        var rootLength = getRootLength(path);
+        if (rootLength === path.length)
+            return path;
+        // return the leading portion of the path up to the last (non-terminal) directory separator
+        // but not including any trailing directory separator.
+        path = ts.removeTrailingDirectorySeparator(path);
+        return path.slice(0, Math.max(rootLength, path.lastIndexOf(ts.directorySeparator)));
+    }
+    ts.getDirectoryPath = getDirectoryPath;
+    function startsWithDirectory(fileName, directoryName, getCanonicalFileName) {
+        var canonicalFileName = getCanonicalFileName(fileName);
+        var canonicalDirectoryName = getCanonicalFileName(directoryName);
+        return ts.startsWith(canonicalFileName, canonicalDirectoryName + "/") || ts.startsWith(canonicalFileName, canonicalDirectoryName + "\\");
+    }
+    ts.startsWithDirectory = startsWithDirectory;
+    function isUrl(path) {
+        return getEncodedRootLength(path) < 0;
+    }
+    ts.isUrl = isUrl;
+    function pathIsRelative(path) {
+        return /^\.\.?($|[\\/])/.test(path);
+    }
+    ts.pathIsRelative = pathIsRelative;
+    /**
+     * Determines whether a path is an absolute path (e.g. starts with `/`, or a dos path
+     * like `c:`, `c:\` or `c:/`).
+     */
+    function isRootedDiskPath(path) {
+        return getEncodedRootLength(path) > 0;
+    }
+    ts.isRootedDiskPath = isRootedDiskPath;
+    /**
+     * Determines whether a path consists only of a path root.
+     */
+    function isDiskPathRoot(path) {
+        var rootLength = getEncodedRootLength(path);
+        return rootLength > 0 && rootLength === path.length;
+    }
+    ts.isDiskPathRoot = isDiskPathRoot;
+    function convertToRelativePath(absoluteOrRelativePath, basePath, getCanonicalFileName) {
+        return !isRootedDiskPath(absoluteOrRelativePath)
+            ? absoluteOrRelativePath
+            : ts.getRelativePathToDirectoryOrUrl(basePath, absoluteOrRelativePath, basePath, getCanonicalFileName, /*isAbsolutePathAnUrl*/ false);
+    }
+    ts.convertToRelativePath = convertToRelativePath;
+    function pathComponents(path, rootLength) {
+        var root = path.substring(0, rootLength);
+        var rest = path.substring(rootLength).split(ts.directorySeparator);
+        if (rest.length && !ts.lastOrUndefined(rest))
+            rest.pop();
+        return [root].concat(rest);
+    }
+    /**
+     * Parse a path into an array containing a root component (at index 0) and zero or more path
+     * components (at indices > 0). The result is not normalized.
+     * If the path is relative, the root component is `""`.
+     * If the path is absolute, the root component includes the first path separator (`/`).
+     */
+    function getPathComponents(path, currentDirectory) {
+        if (currentDirectory === void 0) { currentDirectory = ""; }
+        path = ts.combinePaths(currentDirectory, path);
+        var rootLength = getRootLength(path);
+        return pathComponents(path, rootLength);
+    }
+    ts.getPathComponents = getPathComponents;
+    /**
+     * Reduce an array of path components to a more simplified path by navigating any
+     * `"."` or `".."` entries in the path.
+     */
+    function reducePathComponents(components) {
+        if (!ts.some(components))
+            return [];
+        var reduced = [components[0]];
+        for (var i = 1; i < components.length; i++) {
+            var component = components[i];
+            if (!component)
+                continue;
+            if (component === ".")
+                continue;
+            if (component === "..") {
+                if (reduced.length > 1) {
+                    if (reduced[reduced.length - 1] !== "..") {
+                        reduced.pop();
+                        continue;
+                    }
+                }
+                else if (reduced[0])
+                    continue;
+            }
+            reduced.push(component);
+        }
+        return reduced;
+    }
+    ts.reducePathComponents = reducePathComponents;
+    /**
+     * Parse a path into an array containing a root component (at index 0) and zero or more path
+     * components (at indices > 0). The result is normalized.
+     * If the path is relative, the root component is `""`.
+     * If the path is absolute, the root component includes the first path separator (`/`).
+     */
+    function getNormalizedPathComponents(path, currentDirectory) {
+        return reducePathComponents(getPathComponents(path, currentDirectory));
+    }
+    ts.getNormalizedPathComponents = getNormalizedPathComponents;
+    function getNormalizedAbsolutePath(fileName, currentDirectory) {
+        return getPathFromPathComponents(getNormalizedPathComponents(fileName, currentDirectory));
+    }
+    ts.getNormalizedAbsolutePath = getNormalizedAbsolutePath;
+    /**
+     * Formats a parsed path consisting of a root component (at index 0) and zero or more path
+     * segments (at indices > 0).
+     */
+    function getPathFromPathComponents(pathComponents) {
+        if (pathComponents.length === 0)
+            return "";
+        var root = pathComponents[0] && ts.ensureTrailingDirectorySeparator(pathComponents[0]);
+        return root + pathComponents.slice(1).join(ts.directorySeparator);
+    }
+    ts.getPathFromPathComponents = getPathFromPathComponents;
+})(ts || (ts = {}));
+/* @internal */
+(function (ts) {
+    function getPathComponentsRelativeTo(from, to, stringEqualityComparer, getCanonicalFileName) {
+        var fromComponents = ts.reducePathComponents(ts.getPathComponents(from));
+        var toComponents = ts.reducePathComponents(ts.getPathComponents(to));
+        var start;
+        for (start = 0; start < fromComponents.length && start < toComponents.length; start++) {
+            var fromComponent = getCanonicalFileName(fromComponents[start]);
+            var toComponent = getCanonicalFileName(toComponents[start]);
+            var comparer = start === 0 ? ts.equateStringsCaseInsensitive : stringEqualityComparer;
+            if (!comparer(fromComponent, toComponent))
+                break;
+        }
+        if (start === 0) {
+            return toComponents;
+        }
+        var components = toComponents.slice(start);
+        var relative = [];
+        for (; start < fromComponents.length; start++) {
+            relative.push("..");
+        }
+        return [""].concat(relative, components);
+    }
+    ts.getPathComponentsRelativeTo = getPathComponentsRelativeTo;
+    function getRelativePathFromFile(from, to, getCanonicalFileName) {
+        return ensurePathIsNonModuleName(getRelativePathFromDirectory(ts.getDirectoryPath(from), to, getCanonicalFileName));
+    }
+    ts.getRelativePathFromFile = getRelativePathFromFile;
+    function getRelativePathFromDirectory(fromDirectory, to, getCanonicalFileNameOrIgnoreCase) {
+        Debug.assert((ts.getRootLength(fromDirectory) > 0) === (ts.getRootLength(to) > 0), "Paths must either both be absolute or both be relative");
+        var getCanonicalFileName = typeof getCanonicalFileNameOrIgnoreCase === "function" ? getCanonicalFileNameOrIgnoreCase : ts.identity;
+        var ignoreCase = typeof getCanonicalFileNameOrIgnoreCase === "boolean" ? getCanonicalFileNameOrIgnoreCase : false;
+        var pathComponents = getPathComponentsRelativeTo(fromDirectory, to, ignoreCase ? ts.equateStringsCaseInsensitive : ts.equateStringsCaseSensitive, getCanonicalFileName);
+        return ts.getPathFromPathComponents(pathComponents);
+    }
+    ts.getRelativePathFromDirectory = getRelativePathFromDirectory;
+    function getRelativePathToDirectoryOrUrl(directoryPathOrUrl, relativeOrAbsolutePath, currentDirectory, getCanonicalFileName, isAbsolutePathAnUrl) {
+        var pathComponents = getPathComponentsRelativeTo(resolvePath(currentDirectory, directoryPathOrUrl), resolvePath(currentDirectory, relativeOrAbsolutePath), ts.equateStringsCaseSensitive, getCanonicalFileName);
+        var firstComponent = pathComponents[0];
+        if (isAbsolutePathAnUrl && ts.isRootedDiskPath(firstComponent)) {
+            var prefix = firstComponent.charAt(0) === ts.directorySeparator ? "file://" : "file:///";
+            pathComponents[0] = prefix + firstComponent;
+        }
+        return ts.getPathFromPathComponents(pathComponents);
+    }
+    ts.getRelativePathToDirectoryOrUrl = getRelativePathToDirectoryOrUrl;
+    /**
+     * Ensures a path is either absolute (prefixed with `/` or `c:`) or dot-relative (prefixed
+     * with `./` or `../`) so as not to be confused with an unprefixed module name.
+     */
+    function ensurePathIsNonModuleName(path) {
+        return ts.getRootLength(path) === 0 && !ts.pathIsRelative(path) ? "./" + path : path;
+    }
+    ts.ensurePathIsNonModuleName = ensurePathIsNonModuleName;
+    function getBaseFileName(path, extensions, ignoreCase) {
+        path = ts.normalizeSlashes(path);
+        // if the path provided is itself the root, then it has not file name.
+        var rootLength = ts.getRootLength(path);
+        if (rootLength === path.length)
+            return "";
+        // return the trailing portion of the path starting after the last (non-terminal) directory
+        // separator but not including any trailing directory separator.
+        path = removeTrailingDirectorySeparator(path);
+        var name = path.slice(Math.max(ts.getRootLength(path), path.lastIndexOf(ts.directorySeparator) + 1));
+        var extension = extensions !== undefined && ignoreCase !== undefined ? getAnyExtensionFromPath(name, extensions, ignoreCase) : undefined;
+        return extension ? name.slice(0, name.length - extension.length) : name;
+    }
+    ts.getBaseFileName = getBaseFileName;
+    /**
+     * Combines paths. If a path is absolute, it replaces any previous path.
+     */
+    function combinePaths(path) {
+        var paths = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            paths[_i - 1] = arguments[_i];
+        }
+        if (path)
+            path = ts.normalizeSlashes(path);
+        for (var _a = 0, paths_1 = paths; _a < paths_1.length; _a++) {
+            var relativePath = paths_1[_a];
+            if (!relativePath)
+                continue;
+            relativePath = ts.normalizeSlashes(relativePath);
+            if (!path || ts.getRootLength(relativePath) !== 0) {
+                path = relativePath;
+            }
+            else {
+                path = ensureTrailingDirectorySeparator(path) + relativePath;
+            }
+        }
+        return path;
+    }
+    ts.combinePaths = combinePaths;
+    /**
+     * Combines and resolves paths. If a path is absolute, it replaces any previous path. Any
+     * `.` and `..` path components are resolved.
+     */
+    function resolvePath(path) {
+        var paths = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            paths[_i - 1] = arguments[_i];
+        }
+        var combined = ts.some(paths) ? combinePaths.apply(void 0, [path].concat(paths)) : ts.normalizeSlashes(path);
+        var normalized = ts.getPathFromPathComponents(ts.reducePathComponents(ts.getPathComponents(combined)));
+        return normalized && hasTrailingDirectorySeparator(combined) ? ensureTrailingDirectorySeparator(normalized) : normalized;
+    }
+    ts.resolvePath = resolvePath;
+    /**
+     * Determines whether a path has a trailing separator (`/` or `\\`).
+     */
+    function hasTrailingDirectorySeparator(path) {
+        if (path.length === 0)
+            return false;
+        var ch = path.charCodeAt(path.length - 1);
+        return ch === 47 /* slash */ || ch === 92 /* backslash */;
+    }
+    ts.hasTrailingDirectorySeparator = hasTrailingDirectorySeparator;
+    function removeTrailingDirectorySeparator(path) {
+        if (hasTrailingDirectorySeparator(path)) {
+            return path.substr(0, path.length - 1);
+        }
+        return path;
+    }
+    ts.removeTrailingDirectorySeparator = removeTrailingDirectorySeparator;
+    function ensureTrailingDirectorySeparator(path) {
+        if (!hasTrailingDirectorySeparator(path)) {
+            return path + ts.directorySeparator;
+        }
+        return path;
+    }
+    ts.ensureTrailingDirectorySeparator = ensureTrailingDirectorySeparator;
+    // check path for these segments: '', '.'. '..'
+    var relativePathSegmentRegExp = /(^|\/)\.{0,2}($|\/)/;
+    function comparePathsWorker(a, b, componentComparer) {
+        if (a === b)
+            return 0 /* EqualTo */;
+        if (a === undefined)
+            return -1 /* LessThan */;
+        if (b === undefined)
+            return 1 /* GreaterThan */;
+        // NOTE: Performance optimization - shortcut if the root segments differ as there would be no
+        //       need to perform path reduction.
+        var aRoot = a.substring(0, ts.getRootLength(a));
+        var bRoot = b.substring(0, ts.getRootLength(b));
+        var result = ts.compareStringsCaseInsensitive(aRoot, bRoot);
+        if (result !== 0 /* EqualTo */) {
+            return result;
+        }
+        // NOTE: Performance optimization - shortcut if there are no relative path segments in
+        //       the non-root portion of the path
+        var aRest = a.substring(aRoot.length);
+        var bRest = b.substring(bRoot.length);
+        if (!relativePathSegmentRegExp.test(aRest) && !relativePathSegmentRegExp.test(bRest)) {
+            return componentComparer(aRest, bRest);
+        }
+        // The path contains a relative path segment. Normalize the paths and perform a slower component
+        // by component comparison.
+        var aComponents = ts.reducePathComponents(ts.getPathComponents(a));
+        var bComponents = ts.reducePathComponents(ts.getPathComponents(b));
+        var sharedLength = Math.min(aComponents.length, bComponents.length);
+        for (var i = 1; i < sharedLength; i++) {
+            var result_1 = componentComparer(aComponents[i], bComponents[i]);
+            if (result_1 !== 0 /* EqualTo */) {
+                return result_1;
+            }
+        }
+        return ts.compareValues(aComponents.length, bComponents.length);
+    }
+    /**
+     * Performs a case-sensitive comparison of two paths.
+     */
+    function comparePathsCaseSensitive(a, b) {
+        return comparePathsWorker(a, b, ts.compareStringsCaseSensitive);
+    }
+    ts.comparePathsCaseSensitive = comparePathsCaseSensitive;
+    /**
+     * Performs a case-insensitive comparison of two paths.
+     */
+    function comparePathsCaseInsensitive(a, b) {
+        return comparePathsWorker(a, b, ts.compareStringsCaseInsensitive);
+    }
+    ts.comparePathsCaseInsensitive = comparePathsCaseInsensitive;
+    function comparePaths(a, b, currentDirectory, ignoreCase) {
+        if (typeof currentDirectory === "string") {
+            a = combinePaths(currentDirectory, a);
+            b = combinePaths(currentDirectory, b);
+        }
+        else if (typeof currentDirectory === "boolean") {
+            ignoreCase = currentDirectory;
+        }
+        return comparePathsWorker(a, b, ts.getStringComparer(ignoreCase));
+    }
+    ts.comparePaths = comparePaths;
+    function containsPath(parent, child, currentDirectory, ignoreCase) {
+        if (typeof currentDirectory === "string") {
+            parent = combinePaths(currentDirectory, parent);
+            child = combinePaths(currentDirectory, child);
+        }
+        else if (typeof currentDirectory === "boolean") {
+            ignoreCase = currentDirectory;
+        }
+        if (parent === undefined || child === undefined)
+            return false;
+        if (parent === child)
+            return true;
+        var parentComponents = ts.reducePathComponents(ts.getPathComponents(parent));
+        var childComponents = ts.reducePathComponents(ts.getPathComponents(child));
+        if (childComponents.length < parentComponents.length) {
+            return false;
+        }
+        var componentEqualityComparer = ignoreCase ? ts.equateStringsCaseInsensitive : ts.equateStringsCaseSensitive;
+        for (var i = 0; i < parentComponents.length; i++) {
+            var equalityComparer = i === 0 ? ts.equateStringsCaseInsensitive : componentEqualityComparer;
+            if (!equalityComparer(parentComponents[i], childComponents[i])) {
+                return false;
+            }
+        }
+        return true;
+    }
+    ts.containsPath = containsPath;
+    function isDirectorySeparator(charCode) {
+        return charCode === 47 /* slash */ || charCode === 92 /* backslash */;
+    }
+    function stripLeadingDirectorySeparator(s) {
+        return isDirectorySeparator(s.charCodeAt(0)) ? s.slice(1) : undefined;
+    }
+    function tryRemoveDirectoryPrefix(path, dirPath, getCanonicalFileName) {
+        var withoutPrefix = ts.tryRemovePrefix(path, dirPath, getCanonicalFileName);
+        return withoutPrefix === undefined ? undefined : stripLeadingDirectorySeparator(withoutPrefix);
+    }
+    ts.tryRemoveDirectoryPrefix = tryRemoveDirectoryPrefix;
+    // Reserved characters, forces escaping of any non-word (or digit), non-whitespace character.
+    // It may be inefficient (we could just match (/[-[\]{}()*+?.,\\^$|#\s]/g), but this is future
+    // proof.
+    var reservedCharacterPattern = /[^\w\s\/]/g;
+    function regExpEscape(text) {
+        return text.replace(reservedCharacterPattern, escapeRegExpCharacter);
+    }
+    ts.regExpEscape = regExpEscape;
+    function escapeRegExpCharacter(match) {
+        return "\\" + match;
+    }
+    var wildcardCharCodes = [42 /* asterisk */, 63 /* question */];
+    function hasExtension(fileName) {
+        return ts.stringContains(getBaseFileName(fileName), ".");
+    }
+    ts.hasExtension = hasExtension;
+    ts.commonPackageFolders = ["node_modules", "bower_components", "jspm_packages"];
+    var implicitExcludePathRegexPattern = "(?!(" + ts.commonPackageFolders.join("|") + ")(/|$))";
+    var filesMatcher = {
+        /**
+         * Matches any single directory segment unless it is the last segment and a .min.js file
+         * Breakdown:
+         *  [^./]                   # matches everything up to the first . character (excluding directory separators)
+         *  (\\.(?!min\\.js$))?     # matches . characters but not if they are part of the .min.js file extension
+         */
+        singleAsteriskRegexFragment: "([^./]|(\\.(?!min\\.js$))?)*",
+        /**
+         * Regex for the ** wildcard. Matches any number of subdirectories. When used for including
+         * files or directories, does not match subdirectories that start with a . character
+         */
+        doubleAsteriskRegexFragment: "(/" + implicitExcludePathRegexPattern + "[^/.][^/]*)*?",
+        replaceWildcardCharacter: function (match) { return replaceWildcardCharacter(match, filesMatcher.singleAsteriskRegexFragment); }
+    };
+    var directoriesMatcher = {
+        singleAsteriskRegexFragment: "[^/]*",
+        /**
+         * Regex for the ** wildcard. Matches any number of subdirectories. When used for including
+         * files or directories, does not match subdirectories that start with a . character
+         */
+        doubleAsteriskRegexFragment: "(/" + implicitExcludePathRegexPattern + "[^/.][^/]*)*?",
+        replaceWildcardCharacter: function (match) { return replaceWildcardCharacter(match, directoriesMatcher.singleAsteriskRegexFragment); }
+    };
+    var excludeMatcher = {
+        singleAsteriskRegexFragment: "[^/]*",
+        doubleAsteriskRegexFragment: "(/.+?)?",
+        replaceWildcardCharacter: function (match) { return replaceWildcardCharacter(match, excludeMatcher.singleAsteriskRegexFragment); }
+    };
+    var wildcardMatchers = {
+        files: filesMatcher,
+        directories: directoriesMatcher,
+        exclude: excludeMatcher
+    };
+    function getRegularExpressionForWildcard(specs, basePath, usage) {
+        var patterns = getRegularExpressionsForWildcards(specs, basePath, usage);
+        if (!patterns || !patterns.length) {
+            return undefined;
+        }
+        var pattern = patterns.map(function (pattern) { return "(" + pattern + ")"; }).join("|");
+        // If excluding, match "foo/bar/baz...", but if including, only allow "foo".
+        var terminator = usage === "exclude" ? "($|/)" : "$";
+        return "^(" + pattern + ")" + terminator;
+    }
+    ts.getRegularExpressionForWildcard = getRegularExpressionForWildcard;
+    function getRegularExpressionsForWildcards(specs, basePath, usage) {
+        if (specs === undefined || specs.length === 0) {
+            return undefined;
+        }
+        return ts.flatMap(specs, function (spec) {
+            return spec && getSubPatternFromSpec(spec, basePath, usage, wildcardMatchers[usage]);
+        });
+    }
+    ts.getRegularExpressionsForWildcards = getRegularExpressionsForWildcards;
+    /**
+     * An "includes" path "foo" is implicitly a glob "foo/** /*" (without the space) if its last component has no extension,
+     * and does not contain any glob characters itself.
+     */
+    function isImplicitGlob(lastPathComponent) {
+        return !/[.*?]/.test(lastPathComponent);
+    }
+    ts.isImplicitGlob = isImplicitGlob;
+    function getSubPatternFromSpec(spec, basePath, usage, _a) {
+        var singleAsteriskRegexFragment = _a.singleAsteriskRegexFragment, doubleAsteriskRegexFragment = _a.doubleAsteriskRegexFragment, replaceWildcardCharacter = _a.replaceWildcardCharacter;
+        var subpattern = "";
+        var hasWrittenComponent = false;
+        var components = ts.getNormalizedPathComponents(spec, basePath);
+        var lastComponent = ts.last(components);
+        if (usage !== "exclude" && lastComponent === "**") {
+            return undefined;
+        }
+        // getNormalizedPathComponents includes the separator for the root component.
+        // We need to remove to create our regex correctly.
+        components[0] = removeTrailingDirectorySeparator(components[0]);
+        if (isImplicitGlob(lastComponent)) {
+            components.push("**", "*");
+        }
+        var optionalCount = 0;
+        for (var _i = 0, components_1 = components; _i < components_1.length; _i++) {
+            var component = components_1[_i];
+            if (component === "**") {
+                subpattern += doubleAsteriskRegexFragment;
+            }
+            else {
+                if (usage === "directories") {
+                    subpattern += "(";
+                    optionalCount++;
+                }
+                if (hasWrittenComponent) {
+                    subpattern += ts.directorySeparator;
+                }
+                if (usage !== "exclude") {
+                    var componentPattern = "";
+                    // The * and ? wildcards should not match directories or files that start with . if they
+                    // appear first in a component. Dotted directories and files can be included explicitly
+                    // like so: **/.*/.*
+                    if (component.charCodeAt(0) === 42 /* asterisk */) {
+                        componentPattern += "([^./]" + singleAsteriskRegexFragment + ")?";
+                        component = component.substr(1);
+                    }
+                    else if (component.charCodeAt(0) === 63 /* question */) {
+                        componentPattern += "[^./]";
+                        component = component.substr(1);
+                    }
+                    componentPattern += component.replace(reservedCharacterPattern, replaceWildcardCharacter);
+                    // Patterns should not include subfolders like node_modules unless they are
+                    // explicitly included as part of the path.
+                    //
+                    // As an optimization, if the component pattern is the same as the component,
+                    // then there definitely were no wildcard characters and we do not need to
+                    // add the exclusion pattern.
+                    if (componentPattern !== component) {
+                        subpattern += implicitExcludePathRegexPattern;
+                    }
+                    subpattern += componentPattern;
+                }
+                else {
+                    subpattern += component.replace(reservedCharacterPattern, replaceWildcardCharacter);
+                }
+            }
+            hasWrittenComponent = true;
+        }
+        while (optionalCount > 0) {
+            subpattern += ")?";
+            optionalCount--;
+        }
+        return subpattern;
+    }
+    function replaceWildcardCharacter(match, singleAsteriskRegexFragment) {
+        return match === "*" ? singleAsteriskRegexFragment : match === "?" ? "[^/]" : "\\" + match;
+    }
+    /** @param path directory of the tsconfig.json */
+    function getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames, currentDirectory) {
+        path = ts.normalizePath(path);
+        currentDirectory = ts.normalizePath(currentDirectory);
+        var absolutePath = combinePaths(currentDirectory, path);
+        return {
+            includeFilePatterns: ts.map(getRegularExpressionsForWildcards(includes, absolutePath, "files"), function (pattern) { return "^" + pattern + "$"; }),
+            includeFilePattern: getRegularExpressionForWildcard(includes, absolutePath, "files"),
+            includeDirectoryPattern: getRegularExpressionForWildcard(includes, absolutePath, "directories"),
+            excludePattern: getRegularExpressionForWildcard(excludes, absolutePath, "exclude"),
+            basePaths: getBasePaths(path, includes, useCaseSensitiveFileNames)
+        };
+    }
+    ts.getFileMatcherPatterns = getFileMatcherPatterns;
+    function getRegexFromPattern(pattern, useCaseSensitiveFileNames) {
+        return new RegExp(pattern, useCaseSensitiveFileNames ? "" : "i");
+    }
+    ts.getRegexFromPattern = getRegexFromPattern;
+    /** @param path directory of the tsconfig.json */
+    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries) {
+        path = ts.normalizePath(path);
+        currentDirectory = ts.normalizePath(currentDirectory);
+        var patterns = getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames, currentDirectory);
+        var includeFileRegexes = patterns.includeFilePatterns && patterns.includeFilePatterns.map(function (pattern) { return getRegexFromPattern(pattern, useCaseSensitiveFileNames); });
+        var includeDirectoryRegex = patterns.includeDirectoryPattern && getRegexFromPattern(patterns.includeDirectoryPattern, useCaseSensitiveFileNames);
+        var excludeRegex = patterns.excludePattern && getRegexFromPattern(patterns.excludePattern, useCaseSensitiveFileNames);
+        // Associate an array of results with each include regex. This keeps results in order of the "include" order.
+        // If there are no "includes", then just put everything in results[0].
+        var results = includeFileRegexes ? includeFileRegexes.map(function () { return []; }) : [[]];
+        for (var _i = 0, _a = patterns.basePaths; _i < _a.length; _i++) {
+            var basePath = _a[_i];
+            visitDirectory(basePath, combinePaths(currentDirectory, basePath), depth);
+        }
+        return ts.flatten(results);
+        function visitDirectory(path, absolutePath, depth) {
+            var _a = getFileSystemEntries(path), files = _a.files, directories = _a.directories;
+            var _loop_1 = function (current) {
+                var name = combinePaths(path, current);
+                var absoluteName = combinePaths(absolutePath, current);
+                if (extensions && !ts.fileExtensionIsOneOf(name, extensions))
+                    return "continue";
+                if (excludeRegex && excludeRegex.test(absoluteName))
+                    return "continue";
+                if (!includeFileRegexes) {
+                    results[0].push(name);
+                }
+                else {
+                    var includeIndex = ts.findIndex(includeFileRegexes, function (re) { return re.test(absoluteName); });
+                    if (includeIndex !== -1) {
+                        results[includeIndex].push(name);
+                    }
+                }
+            };
+            for (var _i = 0, _b = ts.sort(files, ts.compareStringsCaseSensitive); _i < _b.length; _i++) {
+                var current = _b[_i];
+                _loop_1(current);
+            }
+            if (depth !== undefined) {
+                depth--;
+                if (depth === 0) {
+                    return;
+                }
+            }
+            for (var _c = 0, _d = ts.sort(directories, ts.compareStringsCaseSensitive); _c < _d.length; _c++) {
+                var current = _d[_c];
+                var name = combinePaths(path, current);
+                var absoluteName = combinePaths(absolutePath, current);
+                if ((!includeDirectoryRegex || includeDirectoryRegex.test(absoluteName)) &&
+                    (!excludeRegex || !excludeRegex.test(absoluteName))) {
+                    visitDirectory(name, absoluteName, depth);
+                }
+            }
+        }
+    }
+    ts.matchFiles = matchFiles;
+    /**
+     * Computes the unique non-wildcard base paths amongst the provided include patterns.
+     */
+    function getBasePaths(path, includes, useCaseSensitiveFileNames) {
+        // Storage for our results in the form of literal paths (e.g. the paths as written by the user).
+        var basePaths = [path];
+        if (includes) {
+            // Storage for literal base paths amongst the include patterns.
+            var includeBasePaths = [];
+            for (var _i = 0, includes_1 = includes; _i < includes_1.length; _i++) {
+                var include = includes_1[_i];
+                // We also need to check the relative paths by converting them to absolute and normalizing
+                // in case they escape the base path (e.g "..\somedirectory")
+                var absolute = ts.isRootedDiskPath(include) ? include : ts.normalizePath(combinePaths(path, include));
+                // Append the literal and canonical candidate base paths.
+                includeBasePaths.push(getIncludeBasePath(absolute));
+            }
+            // Sort the offsets array using either the literal or canonical path representations.
+            includeBasePaths.sort(ts.getStringComparer(!useCaseSensitiveFileNames));
+            var _loop_2 = function (includeBasePath) {
+                if (ts.every(basePaths, function (basePath) { return !containsPath(basePath, includeBasePath, path, !useCaseSensitiveFileNames); })) {
+                    basePaths.push(includeBasePath);
+                }
+            };
+            // Iterate over each include base path and include unique base paths that are not a
+            // subpath of an existing base path
+            for (var _a = 0, includeBasePaths_1 = includeBasePaths; _a < includeBasePaths_1.length; _a++) {
+                var includeBasePath = includeBasePaths_1[_a];
+                _loop_2(includeBasePath);
+            }
+        }
+        return basePaths;
+    }
+    function getIncludeBasePath(absolute) {
+        var wildcardOffset = ts.indexOfAnyCharCode(absolute, wildcardCharCodes);
+        if (wildcardOffset < 0) {
+            // No "*" or "?" in the path
+            return !hasExtension(absolute)
+                ? absolute
+                : removeTrailingDirectorySeparator(ts.getDirectoryPath(absolute));
+        }
+        return absolute.substring(0, absolute.lastIndexOf(ts.directorySeparator, wildcardOffset));
+    }
+    function ensureScriptKind(fileName, scriptKind) {
+        // Using scriptKind as a condition handles both:
+        // - 'scriptKind' is unspecified and thus it is `undefined`
+        // - 'scriptKind' is set and it is `Unknown` (0)
+        // If the 'scriptKind' is 'undefined' or 'Unknown' then we attempt
+        // to get the ScriptKind from the file name. If it cannot be resolved
+        // from the file name then the default 'TS' script kind is returned.
+        return scriptKind || getScriptKindFromFileName(fileName) || 3 /* TS */;
+    }
+    ts.ensureScriptKind = ensureScriptKind;
+    function getScriptKindFromFileName(fileName) {
+        var ext = fileName.substr(fileName.lastIndexOf("."));
+        switch (ext.toLowerCase()) {
+            case ".js" /* Js */:
+                return 1 /* JS */;
+            case ".jsx" /* Jsx */:
+                return 2 /* JSX */;
+            case ".ts" /* Ts */:
+                return 3 /* TS */;
+            case ".tsx" /* Tsx */:
+                return 4 /* TSX */;
+            case ".json" /* Json */:
+                return 6 /* JSON */;
+            default:
+                return 0 /* Unknown */;
+        }
+    }
+    ts.getScriptKindFromFileName = getScriptKindFromFileName;
+    /**
+     *  List of supported extensions in order of file resolution precedence.
+     */
+    ts.supportedTSExtensions = [".ts" /* Ts */, ".tsx" /* Tsx */, ".d.ts" /* Dts */];
+    ts.supportedTSExtensionsWithJson = [".ts" /* Ts */, ".tsx" /* Tsx */, ".d.ts" /* Dts */, ".json" /* Json */];
+    /** Must have ".d.ts" first because if ".ts" goes first, that will be detected as the extension instead of ".d.ts". */
+    ts.supportedTSExtensionsForExtractExtension = [".d.ts" /* Dts */, ".ts" /* Ts */, ".tsx" /* Tsx */];
+    ts.supportedJSExtensions = [".js" /* Js */, ".jsx" /* Jsx */];
+    ts.supportedJSAndJsonExtensions = [".js" /* Js */, ".jsx" /* Jsx */, ".json" /* Json */];
+    var allSupportedExtensions = ts.supportedTSExtensions.concat(ts.supportedJSExtensions);
+    var allSupportedExtensionsWithJson = ts.supportedTSExtensions.concat(ts.supportedJSExtensions, [".json" /* Json */]);
+    function getSupportedExtensions(options, extraFileExtensions) {
+        var needJsExtensions = options && options.allowJs;
+        if (!extraFileExtensions || extraFileExtensions.length === 0) {
+            return needJsExtensions ? allSupportedExtensions : ts.supportedTSExtensions;
+        }
+        var extensions = (needJsExtensions ? allSupportedExtensions : ts.supportedTSExtensions).concat(ts.mapDefined(extraFileExtensions, function (x) { return x.scriptKind === 7 /* Deferred */ || needJsExtensions && isJSLike(x.scriptKind) ? x.extension : undefined; }));
+        return ts.deduplicate(extensions, ts.equateStringsCaseSensitive, ts.compareStringsCaseSensitive);
+    }
+    ts.getSupportedExtensions = getSupportedExtensions;
+    function getSuppoertedExtensionsWithJsonIfResolveJsonModule(options, supportedExtensions) {
+        if (!options || !options.resolveJsonModule) {
+            return supportedExtensions;
+        }
+        if (supportedExtensions === allSupportedExtensions) {
+            return allSupportedExtensionsWithJson;
+        }
+        if (supportedExtensions === ts.supportedTSExtensions) {
+            return ts.supportedTSExtensionsWithJson;
+        }
+        return supportedExtensions.concat([".json" /* Json */]);
+    }
+    ts.getSuppoertedExtensionsWithJsonIfResolveJsonModule = getSuppoertedExtensionsWithJsonIfResolveJsonModule;
+    function isJSLike(scriptKind) {
+        return scriptKind === 1 /* JS */ || scriptKind === 2 /* JSX */;
+    }
+    function hasJSFileExtension(fileName) {
+        return ts.some(ts.supportedJSExtensions, function (extension) { return ts.fileExtensionIs(fileName, extension); });
+    }
+    ts.hasJSFileExtension = hasJSFileExtension;
+    function hasJSOrJsonFileExtension(fileName) {
+        return ts.supportedJSAndJsonExtensions.some(function (ext) { return ts.fileExtensionIs(fileName, ext); });
+    }
+    ts.hasJSOrJsonFileExtension = hasJSOrJsonFileExtension;
+    function hasTSFileExtension(fileName) {
+        return ts.some(ts.supportedTSExtensions, function (extension) { return ts.fileExtensionIs(fileName, extension); });
+    }
+    ts.hasTSFileExtension = hasTSFileExtension;
+    function isSupportedSourceFileName(fileName, compilerOptions, extraFileExtensions) {
+        if (!fileName) {
+            return false;
+        }
+        var supportedExtensions = getSupportedExtensions(compilerOptions, extraFileExtensions);
+        for (var _i = 0, _a = getSuppoertedExtensionsWithJsonIfResolveJsonModule(compilerOptions, supportedExtensions); _i < _a.length; _i++) {
+            var extension = _a[_i];
+            if (ts.fileExtensionIs(fileName, extension)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    ts.isSupportedSourceFileName = isSupportedSourceFileName;
+    /**
+     * Extension boundaries by priority. Lower numbers indicate higher priorities, and are
+     * aligned to the offset of the highest priority extension in the
+     * allSupportedExtensions array.
+     */
+    var ExtensionPriority;
+    (function (ExtensionPriority) {
+        ExtensionPriority[ExtensionPriority["TypeScriptFiles"] = 0] = "TypeScriptFiles";
+        ExtensionPriority[ExtensionPriority["DeclarationAndJavaScriptFiles"] = 2] = "DeclarationAndJavaScriptFiles";
+        ExtensionPriority[ExtensionPriority["Highest"] = 0] = "Highest";
+        ExtensionPriority[ExtensionPriority["Lowest"] = 2] = "Lowest";
+    })(ExtensionPriority = ts.ExtensionPriority || (ts.ExtensionPriority = {}));
+    function getExtensionPriority(path, supportedExtensions) {
+        for (var i = supportedExtensions.length - 1; i >= 0; i--) {
+            if (ts.fileExtensionIs(path, supportedExtensions[i])) {
+                return adjustExtensionPriority(i, supportedExtensions);
+            }
+        }
+        // If its not in the list of supported extensions, this is likely a
+        // TypeScript file with a non-ts extension
+        return 0 /* Highest */;
+    }
+    ts.getExtensionPriority = getExtensionPriority;
+    /**
+     * Adjusts an extension priority to be the highest priority within the same range.
+     */
+    function adjustExtensionPriority(extensionPriority, supportedExtensions) {
+        if (extensionPriority < 2 /* DeclarationAndJavaScriptFiles */) {
+            return 0 /* TypeScriptFiles */;
+        }
+        else if (extensionPriority < supportedExtensions.length) {
+            return 2 /* DeclarationAndJavaScriptFiles */;
+        }
+        else {
+            return supportedExtensions.length;
+        }
+    }
+    ts.adjustExtensionPriority = adjustExtensionPriority;
+    /**
+     * Gets the next lowest extension priority for a given priority.
+     */
+    function getNextLowestExtensionPriority(extensionPriority, supportedExtensions) {
+        if (extensionPriority < 2 /* DeclarationAndJavaScriptFiles */) {
+            return 2 /* DeclarationAndJavaScriptFiles */;
+        }
+        else {
+            return supportedExtensions.length;
+        }
+    }
+    ts.getNextLowestExtensionPriority = getNextLowestExtensionPriority;
+    var extensionsToRemove = [".d.ts" /* Dts */, ".ts" /* Ts */, ".js" /* Js */, ".tsx" /* Tsx */, ".jsx" /* Jsx */, ".json" /* Json */];
+    function removeFileExtension(path) {
+        for (var _i = 0, extensionsToRemove_1 = extensionsToRemove; _i < extensionsToRemove_1.length; _i++) {
+            var ext = extensionsToRemove_1[_i];
+            var extensionless = tryRemoveExtension(path, ext);
+            if (extensionless !== undefined) {
+                return extensionless;
+            }
+        }
+        return path;
+    }
+    ts.removeFileExtension = removeFileExtension;
+    function tryRemoveExtension(path, extension) {
+        return ts.fileExtensionIs(path, extension) ? removeExtension(path, extension) : undefined;
+    }
+    ts.tryRemoveExtension = tryRemoveExtension;
+    function removeExtension(path, extension) {
+        return path.substring(0, path.length - extension.length);
+    }
+    ts.removeExtension = removeExtension;
+    function changeExtension(path, newExtension) {
+        return changeAnyExtension(path, newExtension, extensionsToRemove, /*ignoreCase*/ false);
+    }
+    ts.changeExtension = changeExtension;
+    function changeAnyExtension(path, ext, extensions, ignoreCase) {
+        var pathext = extensions !== undefined && ignoreCase !== undefined ? getAnyExtensionFromPath(path, extensions, ignoreCase) : getAnyExtensionFromPath(path);
+        return pathext ? path.slice(0, path.length - pathext.length) + (ts.startsWith(ext, ".") ? ext : "." + ext) : path;
+    }
+    ts.changeAnyExtension = changeAnyExtension;
+    var Debug;
+    (function (Debug) {
+        function showSymbol(symbol) {
+            var symbolFlags = ts.SymbolFlags;
+            return "{ flags: " + (symbolFlags ? showFlags(symbol.flags, symbolFlags) : symbol.flags) + "; declarations: " + ts.map(symbol.declarations, showSyntaxKind) + " }";
+        }
+        Debug.showSymbol = showSymbol;
+        function showFlags(flags, flagsEnum) {
+            var out = [];
+            for (var pow = 0; pow <= 30; pow++) {
+                var n = 1 << pow;
+                if (flags & n) {
+                    out.push(flagsEnum[n]);
+                }
+            }
+            return out.join("|");
+        }
+        function showSyntaxKind(node) {
+            var syntaxKind = ts.SyntaxKind;
+            return syntaxKind ? syntaxKind[node.kind] : node.kind.toString();
+        }
+        Debug.showSyntaxKind = showSyntaxKind;
+    })(Debug = ts.Debug || (ts.Debug = {}));
+    function tryParsePattern(pattern) {
+        // This should be verified outside of here and a proper error thrown.
+        Debug.assert(ts.hasZeroOrOneAsteriskCharacter(pattern));
+        var indexOfStar = pattern.indexOf("*");
+        return indexOfStar === -1 ? undefined : {
+            prefix: pattern.substr(0, indexOfStar),
+            suffix: pattern.substr(indexOfStar + 1)
+        };
+    }
+    ts.tryParsePattern = tryParsePattern;
+    function positionIsSynthesized(pos) {
+        // This is a fast way of testing the following conditions:
+        //  pos === undefined || pos === null || isNaN(pos) || pos < 0;
+        return !(pos >= 0);
+    }
+    ts.positionIsSynthesized = positionIsSynthesized;
+    /** True if an extension is one of the supported TypeScript extensions. */
+    function extensionIsTS(ext) {
+        return ext === ".ts" /* Ts */ || ext === ".tsx" /* Tsx */ || ext === ".d.ts" /* Dts */;
+    }
+    ts.extensionIsTS = extensionIsTS;
+    function resolutionExtensionIsTSOrJson(ext) {
+        return extensionIsTS(ext) || ext === ".json" /* Json */;
+    }
+    ts.resolutionExtensionIsTSOrJson = resolutionExtensionIsTSOrJson;
+    /**
+     * Gets the extension from a path.
+     * Path must have a valid extension.
+     */
+    function extensionFromPath(path) {
+        var ext = tryGetExtensionFromPath(path);
+        return ext !== undefined ? ext : Debug.fail("File " + path + " has unknown extension.");
+    }
+    ts.extensionFromPath = extensionFromPath;
+    function isAnySupportedFileExtension(path) {
+        return tryGetExtensionFromPath(path) !== undefined;
+    }
+    ts.isAnySupportedFileExtension = isAnySupportedFileExtension;
+    function tryGetExtensionFromPath(path) {
+        return ts.find(extensionsToRemove, function (e) { return ts.fileExtensionIs(path, e); });
+    }
+    ts.tryGetExtensionFromPath = tryGetExtensionFromPath;
+    function getAnyExtensionFromPathWorker(path, extensions, stringEqualityComparer) {
+        if (typeof extensions === "string")
+            extensions = [extensions];
+        for (var _i = 0, extensions_2 = extensions; _i < extensions_2.length; _i++) {
+            var extension = extensions_2[_i];
+            if (!ts.startsWith(extension, "."))
+                extension = "." + extension;
+            if (path.length >= extension.length && path.charAt(path.length - extension.length) === ".") {
+                var pathExtension = path.slice(path.length - extension.length);
+                if (stringEqualityComparer(pathExtension, extension)) {
+                    return pathExtension;
+                }
+            }
+        }
+        return "";
+    }
+    function getAnyExtensionFromPath(path, extensions, ignoreCase) {
+        // Retrieves any string from the final "." onwards from a base file name.
+        // Unlike extensionFromPath, which throws an exception on unrecognized extensions.
+        if (extensions) {
+            return getAnyExtensionFromPathWorker(path, extensions, ignoreCase ? ts.equateStringsCaseInsensitive : ts.equateStringsCaseSensitive);
+        }
+        var baseFileName = getBaseFileName(path);
+        var extensionIndex = baseFileName.lastIndexOf(".");
+        if (extensionIndex >= 0) {
+            return baseFileName.substring(extensionIndex);
+        }
+        return "";
+    }
+    ts.getAnyExtensionFromPath = getAnyExtensionFromPath;
+    function isCheckJsEnabledForFile(sourceFile, compilerOptions) {
+        return sourceFile.checkJsDirective ? sourceFile.checkJsDirective.enabled : compilerOptions.checkJs;
+    }
+    ts.isCheckJsEnabledForFile = isCheckJsEnabledForFile;
+    ts.emptyFileSystemEntries = {
+        files: ts.emptyArray,
+        directories: ts.emptyArray
+    };
+    /**
+     * patternStrings contains both pattern strings (containing "*") and regular strings.
+     * Return an exact match if possible, or a pattern match, or undefined.
+     * (These are verified by verifyCompilerOptions to have 0 or 1 "*" characters.)
+     */
+    function matchPatternOrExact(patternStrings, candidate) {
+        var patterns = [];
+        for (var _i = 0, patternStrings_1 = patternStrings; _i < patternStrings_1.length; _i++) {
+            var patternString = patternStrings_1[_i];
+            var pattern = tryParsePattern(patternString);
+            if (pattern) {
+                patterns.push(pattern);
+            }
+            else if (patternString === candidate) {
+                // pattern was matched as is - no need to search further
+                return patternString;
+            }
+        }
+        return ts.findBestPatternMatch(patterns, function (_) { return _; }, candidate);
+    }
+    ts.matchPatternOrExact = matchPatternOrExact;
+    function sliceAfter(arr, value) {
+        var index = arr.indexOf(value);
+        Debug.assert(index !== -1);
+        return arr.slice(index);
+    }
+    ts.sliceAfter = sliceAfter;
+    function minAndMax(arr, getValue) {
+        Debug.assert(arr.length !== 0);
+        var min = getValue(arr[0]);
+        var max = min;
+        for (var i = 1; i < arr.length; i++) {
+            var value = getValue(arr[i]);
+            if (value < min) {
+                min = value;
+            }
+            else if (value > max) {
+                max = value;
+            }
+        }
+        return { min: min, max: max };
+    }
+    ts.minAndMax = minAndMax;
+    var NodeSet = /** @class */ (function () {
+        function NodeSet() {
+            this.map = ts.createMap();
+        }
+        NodeSet.prototype.add = function (node) {
+            this.map.set(String(ts.getNodeId(node)), node);
+        };
+        NodeSet.prototype.tryAdd = function (node) {
+            if (this.has(node))
+                return false;
+            this.add(node);
+            return true;
+        };
+        NodeSet.prototype.has = function (node) {
+            return this.map.has(String(ts.getNodeId(node)));
+        };
+        NodeSet.prototype.forEach = function (cb) {
+            this.map.forEach(cb);
+        };
+        NodeSet.prototype.some = function (pred) {
+            return ts.forEachEntry(this.map, pred) || false;
+        };
+        return NodeSet;
+    }());
+    ts.NodeSet = NodeSet;
+    var NodeMap = /** @class */ (function () {
+        function NodeMap() {
+            this.map = ts.createMap();
+        }
+        NodeMap.prototype.get = function (node) {
+            var res = this.map.get(String(ts.getNodeId(node)));
+            return res && res.value;
+        };
+        NodeMap.prototype.getOrUpdate = function (node, setValue) {
+            var res = this.get(node);
+            if (res)
+                return res;
+            var value = setValue();
+            this.set(node, value);
+            return value;
+        };
+        NodeMap.prototype.set = function (node, value) {
+            this.map.set(String(ts.getNodeId(node)), { node: node, value: value });
+        };
+        NodeMap.prototype.has = function (node) {
+            return this.map.has(String(ts.getNodeId(node)));
+        };
+        NodeMap.prototype.forEach = function (cb) {
+            this.map.forEach(function (_a) {
+                var node = _a.node, value = _a.value;
+                return cb(value, node);
+            });
+        };
+        return NodeMap;
+    }());
+    ts.NodeMap = NodeMap;
+    function rangeOfNode(node) {
+        return { pos: ts.getTokenPosOfNode(node), end: node.end };
+    }
+    ts.rangeOfNode = rangeOfNode;
+    function rangeOfTypeParameters(typeParameters) {
+        // Include the `<>`
+        return { pos: typeParameters.pos - 1, end: typeParameters.end + 1 };
+    }
+    ts.rangeOfTypeParameters = rangeOfTypeParameters;
+    function skipTypeChecking(sourceFile, options) {
+        // If skipLibCheck is enabled, skip reporting errors if file is a declaration file.
+        // If skipDefaultLibCheck is enabled, skip reporting errors if file contains a
+        // '/// <reference no-default-lib="true"/>' directive.
+        return options.skipLibCheck && sourceFile.isDeclarationFile || options.skipDefaultLibCheck && sourceFile.hasNoDefaultLib;
+    }
+    ts.skipTypeChecking = skipTypeChecking;
+    function isJsonEqual(a, b) {
+        return a === b || typeof a === "object" && a !== null && typeof b === "object" && b !== null && ts.equalOwnProperties(a, b, isJsonEqual);
+    }
+    ts.isJsonEqual = isJsonEqual;
+    function getOrUpdate(map, key, getDefault) {
+        var got = map.get(key);
+        if (got === undefined) {
+            var value = getDefault();
+            map.set(key, value);
+            return value;
+        }
+        else {
+            return got;
+        }
+    }
+    ts.getOrUpdate = getOrUpdate;
+    /**
+     * Converts a bigint literal string, e.g. `0x1234n`,
+     * to its decimal string representation, e.g. `4660`.
+     */
+    function parsePseudoBigInt(stringValue) {
+        var log2Base;
+        switch (stringValue.charCodeAt(1)) { // "x" in "0x123"
+            case 98 /* b */:
+            case 66 /* B */: // 0b or 0B
+                log2Base = 1;
+                break;
+            case 111 /* o */:
+            case 79 /* O */: // 0o or 0O
+                log2Base = 3;
+                break;
+            case 120 /* x */:
+            case 88 /* X */: // 0x or 0X
+                log2Base = 4;
+                break;
+            default: // already in decimal; omit trailing "n"
+                var nIndex = stringValue.length - 1;
+                // Skip leading 0s
+                var nonZeroStart = 0;
+                while (stringValue.charCodeAt(nonZeroStart) === 48 /* _0 */) {
+                    nonZeroStart++;
+                }
+                return stringValue.slice(nonZeroStart, nIndex) || "0";
+        }
+        // Omit leading "0b", "0o", or "0x", and trailing "n"
+        var startIndex = 2, endIndex = stringValue.length - 1;
+        var bitsNeeded = (endIndex - startIndex) * log2Base;
+        // Stores the value specified by the string as a LE array of 16-bit integers
+        // using Uint16 instead of Uint32 so combining steps can use bitwise operators
+        var segments = new Uint16Array((bitsNeeded >>> 4) + (bitsNeeded & 15 ? 1 : 0));
+        // Add the digits, one at a time
+        for (var i = endIndex - 1, bitOffset = 0; i >= startIndex; i--, bitOffset += log2Base) {
+            var segment = bitOffset >>> 4;
+            var digitChar = stringValue.charCodeAt(i);
+            // Find character range: 0-9 < A-F < a-f
+            var digit = digitChar <= 57 /* _9 */
+                ? digitChar - 48 /* _0 */
+                : 10 + digitChar -
+                    (digitChar <= 70 /* F */ ? 65 /* A */ : 97 /* a */);
+            var shiftedDigit = digit << (bitOffset & 15);
+            segments[segment] |= shiftedDigit;
+            var residual = shiftedDigit >>> 16;
+            if (residual)
+                segments[segment + 1] |= residual; // overflows segment
+        }
+        // Repeatedly divide segments by 10 and add remainder to base10Value
+        var base10Value = "";
+        var firstNonzeroSegment = segments.length - 1;
+        var segmentsRemaining = true;
+        while (segmentsRemaining) {
+            var mod10 = 0;
+            segmentsRemaining = false;
+            for (var segment = firstNonzeroSegment; segment >= 0; segment--) {
+                var newSegment = mod10 << 16 | segments[segment];
+                var segmentValue = (newSegment / 10) | 0;
+                segments[segment] = segmentValue;
+                mod10 = newSegment - segmentValue * 10;
+                if (segmentValue && !segmentsRemaining) {
+                    firstNonzeroSegment = segment;
+                    segmentsRemaining = true;
+                }
+            }
+            base10Value = mod10 + base10Value;
+        }
+        return base10Value;
+    }
+    ts.parsePseudoBigInt = parsePseudoBigInt;
+    function pseudoBigIntToString(_a) {
+        var negative = _a.negative, base10Value = _a.base10Value;
+        return (negative && base10Value !== "0" ? "-" : "") + base10Value;
+    }
+    ts.pseudoBigIntToString = pseudoBigIntToString;
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    var SignatureFlags;
+    (function (SignatureFlags) {
+        SignatureFlags[SignatureFlags["None"] = 0] = "None";
+        SignatureFlags[SignatureFlags["Yield"] = 1] = "Yield";
+        SignatureFlags[SignatureFlags["Await"] = 2] = "Await";
+        SignatureFlags[SignatureFlags["Type"] = 4] = "Type";
+        SignatureFlags[SignatureFlags["IgnoreMissingOpenBrace"] = 16] = "IgnoreMissingOpenBrace";
+        SignatureFlags[SignatureFlags["JSDoc"] = 32] = "JSDoc";
+    })(SignatureFlags || (SignatureFlags = {}));
+    // tslint:disable variable-name
+    var NodeConstructor;
+    var TokenConstructor;
+    var IdentifierConstructor;
+    var SourceFileConstructor;
+    // tslint:enable variable-name
+    function createNode(kind, pos, end) {
+        if (kind === 279 /* SourceFile */) {
+            return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
+        }
+        else if (kind === 72 /* Identifier */) {
+            return new (IdentifierConstructor || (IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor()))(kind, pos, end);
+        }
+        else if (!ts.isNodeKind(kind)) {
+            return new (TokenConstructor || (TokenConstructor = ts.objectAllocator.getTokenConstructor()))(kind, pos, end);
+        }
+        else {
+            return new (NodeConstructor || (NodeConstructor = ts.objectAllocator.getNodeConstructor()))(kind, pos, end);
+        }
+    }
+    ts.createNode = createNode;
+    function visitNode(cbNode, node) {
+        return node && cbNode(node);
+    }
+    function visitNodes(cbNode, cbNodes, nodes) {
+        if (nodes) {
+            if (cbNodes) {
+                return cbNodes(nodes);
+            }
+            for (var _i = 0, nodes_1 = nodes; _i < nodes_1.length; _i++) {
+                var node = nodes_1[_i];
+                var result = cbNode(node);
+                if (result) {
+                    return result;
+                }
+            }
+        }
+    }
+    /*@internal*/
+    function isJSDocLikeText(text, start) {
+        return text.charCodeAt(start + 1) === 42 /* asterisk */ &&
+            text.charCodeAt(start + 2) === 42 /* asterisk */ &&
+            text.charCodeAt(start + 3) !== 47 /* slash */;
+    }
+    ts.isJSDocLikeText = isJSDocLikeText;
+    /**
+     * Invokes a callback for each child of the given node. The 'cbNode' callback is invoked for all child nodes
+     * stored in properties. If a 'cbNodes' callback is specified, it is invoked for embedded arrays; otherwise,
+     * embedded arrays are flattened and the 'cbNode' callback is invoked for each element. If a callback returns
+     * a truthy value, iteration stops and that value is returned. Otherwise, undefined is returned.
+     *
+     * @param node a given node to visit its children
+     * @param cbNode a callback to be invoked for all child nodes
+     * @param cbNodes a callback to be invoked for embedded array
+     *
+     * @remarks `forEachChild` must visit the children of a node in the order
+     * that they appear in the source code. The language service depends on this property to locate nodes by position.
+     */
+    function forEachChild(node, cbNode, cbNodes) {
+        if (!node || node.kind <= 147 /* LastToken */) {
+            return;
+        }
+        switch (node.kind) {
+            case 148 /* QualifiedName */:
+                return visitNode(cbNode, node.left) ||
+                    visitNode(cbNode, node.right);
+            case 150 /* TypeParameter */:
+                return visitNode(cbNode, node.name) ||
+                    visitNode(cbNode, node.constraint) ||
+                    visitNode(cbNode, node.default) ||
+                    visitNode(cbNode, node.expression);
+            case 276 /* ShorthandPropertyAssignment */:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNode(cbNode, node.questionToken) ||
+                    visitNode(cbNode, node.exclamationToken) ||
+                    visitNode(cbNode, node.equalsToken) ||
+                    visitNode(cbNode, node.objectAssignmentInitializer);
+            case 277 /* SpreadAssignment */:
+                return visitNode(cbNode, node.expression);
+            case 151 /* Parameter */:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.dotDotDotToken) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNode(cbNode, node.questionToken) ||
+                    visitNode(cbNode, node.type) ||
+                    visitNode(cbNode, node.initializer);
+            case 154 /* PropertyDeclaration */:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNode(cbNode, node.questionToken) ||
+                    visitNode(cbNode, node.exclamationToken) ||
+                    visitNode(cbNode, node.type) ||
+                    visitNode(cbNode, node.initializer);
+            case 153 /* PropertySignature */:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNode(cbNode, node.questionToken) ||
+                    visitNode(cbNode, node.type) ||
+                    visitNode(cbNode, node.initializer);
+            case 275 /* PropertyAssignment */:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNode(cbNode, node.questionToken) ||
+                    visitNode(cbNode, node.initializer);
+            case 237 /* VariableDeclaration */:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNode(cbNode, node.exclamationToken) ||
+                    visitNode(cbNode, node.type) ||
+                    visitNode(cbNode, node.initializer);
+            case 186 /* BindingElement */:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.dotDotDotToken) ||
+                    visitNode(cbNode, node.propertyName) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNode(cbNode, node.initializer);
+            case 165 /* FunctionType */:
+            case 166 /* ConstructorType */:
+            case 160 /* CallSignature */:
+            case 161 /* ConstructSignature */:
+            case 162 /* IndexSignature */:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNodes(cbNode, cbNodes, node.typeParameters) ||
+                    visitNodes(cbNode, cbNodes, node.parameters) ||
+                    visitNode(cbNode, node.type);
+            case 156 /* MethodDeclaration */:
+            case 155 /* MethodSignature */:
+            case 157 /* Constructor */:
+            case 158 /* GetAccessor */:
+            case 159 /* SetAccessor */:
+            case 196 /* FunctionExpression */:
+            case 239 /* FunctionDeclaration */:
+            case 197 /* ArrowFunction */:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.asteriskToken) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNode(cbNode, node.questionToken) ||
+                    visitNode(cbNode, node.exclamationToken) ||
+                    visitNodes(cbNode, cbNodes, node.typeParameters) ||
+                    visitNodes(cbNode, cbNodes, node.parameters) ||
+                    visitNode(cbNode, node.type) ||
+                    visitNode(cbNode, node.equalsGreaterThanToken) ||
+                    visitNode(cbNode, node.body);
+            case 164 /* TypeReference */:
+                return visitNode(cbNode, node.typeName) ||
+                    visitNodes(cbNode, cbNodes, node.typeArguments);
+            case 163 /* TypePredicate */:
+                return visitNode(cbNode, node.parameterName) ||
+                    visitNode(cbNode, node.type);
+            case 167 /* TypeQuery */:
+                return visitNode(cbNode, node.exprName);
+            case 168 /* TypeLiteral */:
+                return visitNodes(cbNode, cbNodes, node.members);
+            case 169 /* ArrayType */:
+                return visitNode(cbNode, node.elementType);
+            case 170 /* TupleType */:
+                return visitNodes(cbNode, cbNodes, node.elementTypes);
+            case 173 /* UnionType */:
+            case 174 /* IntersectionType */:
+                return visitNodes(cbNode, cbNodes, node.types);
+            case 175 /* ConditionalType */:
+                return visitNode(cbNode, node.checkType) ||
+                    visitNode(cbNode, node.extendsType) ||
+                    visitNode(cbNode, node.trueType) ||
+                    visitNode(cbNode, node.falseType);
+            case 176 /* InferType */:
+                return visitNode(cbNode, node.typeParameter);
+            case 183 /* ImportType */:
+                return visitNode(cbNode, node.argument) ||
+                    visitNode(cbNode, node.qualifier) ||
+                    visitNodes(cbNode, cbNodes, node.typeArguments);
+            case 177 /* ParenthesizedType */:
+            case 179 /* TypeOperator */:
+                return visitNode(cbNode, node.type);
+            case 180 /* IndexedAccessType */:
+                return visitNode(cbNode, node.objectType) ||
+                    visitNode(cbNode, node.indexType);
+            case 181 /* MappedType */:
+                return visitNode(cbNode, node.readonlyToken) ||
+                    visitNode(cbNode, node.typeParameter) ||
+                    visitNode(cbNode, node.questionToken) ||
+                    visitNode(cbNode, node.type);
+            case 182 /* LiteralType */:
+                return visitNode(cbNode, node.literal);
+            case 184 /* ObjectBindingPattern */:
+            case 185 /* ArrayBindingPattern */:
+                return visitNodes(cbNode, cbNodes, node.elements);
+            case 187 /* ArrayLiteralExpression */:
+                return visitNodes(cbNode, cbNodes, node.elements);
+            case 188 /* ObjectLiteralExpression */:
+                return visitNodes(cbNode, cbNodes, node.properties);
+            case 189 /* PropertyAccessExpression */:
+                return visitNode(cbNode, node.expression) ||
+                    visitNode(cbNode, node.name);
+            case 190 /* ElementAccessExpression */:
+                return visitNode(cbNode, node.expression) ||
+                    visitNode(cbNode, node.argumentExpression);
+            case 191 /* CallExpression */:
+            case 192 /* NewExpression */:
+                return visitNode(cbNode, node.expression) ||
+                    visitNodes(cbNode, cbNodes, node.typeArguments) ||
+                    visitNodes(cbNode, cbNodes, node.arguments);
+            case 193 /* TaggedTemplateExpression */:
+                return visitNode(cbNode, node.tag) ||
+                    visitNodes(cbNode, cbNodes, node.typeArguments) ||
+                    visitNode(cbNode, node.template);
+            case 194 /* TypeAssertionExpression */:
+                return visitNode(cbNode, node.type) ||
+                    visitNode(cbNode, node.expression);
+            case 195 /* ParenthesizedExpression */:
+                return visitNode(cbNode, node.expression);
+            case 198 /* DeleteExpression */:
+                return visitNode(cbNode, node.expression);
+            case 199 /* TypeOfExpression */:
+                return visitNode(cbNode, node.expression);
+            case 200 /* VoidExpression */:
+                return visitNode(cbNode, node.expression);
+            case 202 /* PrefixUnaryExpression */:
+                return visitNode(cbNode, node.operand);
+            case 207 /* YieldExpression */:
+                return visitNode(cbNode, node.asteriskToken) ||
+                    visitNode(cbNode, node.expression);
+            case 201 /* AwaitExpression */:
+                return visitNode(cbNode, node.expression);
+            case 203 /* PostfixUnaryExpression */:
+                return visitNode(cbNode, node.operand);
+            case 204 /* BinaryExpression */:
+                return visitNode(cbNode, node.left) ||
+                    visitNode(cbNode, node.operatorToken) ||
+                    visitNode(cbNode, node.right);
+            case 212 /* AsExpression */:
+                return visitNode(cbNode, node.expression) ||
+                    visitNode(cbNode, node.type);
+            case 213 /* NonNullExpression */:
+                return visitNode(cbNode, node.expression);
+            case 214 /* MetaProperty */:
+                return visitNode(cbNode, node.name);
+            case 205 /* ConditionalExpression */:
+                return visitNode(cbNode, node.condition) ||
+                    visitNode(cbNode, node.questionToken) ||
+                    visitNode(cbNode, node.whenTrue) ||
+                    visitNode(cbNode, node.colonToken) ||
+                    visitNode(cbNode, node.whenFalse);
+            case 208 /* SpreadElement */:
+                return visitNode(cbNode, node.expression);
+            case 218 /* Block */:
+            case 245 /* ModuleBlock */:
+                return visitNodes(cbNode, cbNodes, node.statements);
+            case 279 /* SourceFile */:
+                return visitNodes(cbNode, cbNodes, node.statements) ||
+                    visitNode(cbNode, node.endOfFileToken);
+            case 219 /* VariableStatement */:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.declarationList);
+            case 238 /* VariableDeclarationList */:
+                return visitNodes(cbNode, cbNodes, node.declarations);
+            case 221 /* ExpressionStatement */:
+                return visitNode(cbNode, node.expression);
+            case 222 /* IfStatement */:
+                return visitNode(cbNode, node.expression) ||
+                    visitNode(cbNode, node.thenStatement) ||
+                    visitNode(cbNode, node.elseStatement);
+            case 223 /* DoStatement */:
+                return visitNode(cbNode, node.statement) ||
+                    visitNode(cbNode, node.expression);
+            case 224 /* WhileStatement */:
+                return visitNode(cbNode, node.expression) ||
+                    visitNode(cbNode, node.statement);
+            case 225 /* ForStatement */:
+                return visitNode(cbNode, node.initializer) ||
+                    visitNode(cbNode, node.condition) ||
+                    visitNode(cbNode, node.incrementor) ||
+                    visitNode(cbNode, node.statement);
+            case 226 /* ForInStatement */:
+                return visitNode(cbNode, node.initializer) ||
+                    visitNode(cbNode, node.expression) ||
+                    visitNode(cbNode, node.statement);
+            case 227 /* ForOfStatement */:
+                return visitNode(cbNode, node.awaitModifier) ||
+                    visitNode(cbNode, node.initializer) ||
+                    visitNode(cbNode, node.expression) ||
+                    visitNode(cbNode, node.statement);
+            case 228 /* ContinueStatement */:
+            case 229 /* BreakStatement */:
+                return visitNode(cbNode, node.label);
+            case 230 /* ReturnStatement */:
+                return visitNode(cbNode, node.expression);
+            case 231 /* WithStatement */:
+                return visitNode(cbNode, node.expression) ||
+                    visitNode(cbNode, node.statement);
+            case 232 /* SwitchStatement */:
+                return visitNode(cbNode, node.expression) ||
+                    visitNode(cbNode, node.caseBlock);
+            case 246 /* CaseBlock */:
+                return visitNodes(cbNode, cbNodes, node.clauses);
+            case 271 /* CaseClause */:
+                return visitNode(cbNode, node.expression) ||
+                    visitNodes(cbNode, cbNodes, node.statements);
+            case 272 /* DefaultClause */:
+                return visitNodes(cbNode, cbNodes, node.statements);
+            case 233 /* LabeledStatement */:
+                return visitNode(cbNode, node.label) ||
+                    visitNode(cbNode, node.statement);
+            case 234 /* ThrowStatement */:
+                return visitNode(cbNode, node.expression);
+            case 235 /* TryStatement */:
+                return visitNode(cbNode, node.tryBlock) ||
+                    visitNode(cbNode, node.catchClause) ||
+                    visitNode(cbNode, node.finallyBlock);
+            case 274 /* CatchClause */:
+                return visitNode(cbNode, node.variableDeclaration) ||
+                    visitNode(cbNode, node.block);
+            case 152 /* Decorator */:
+                return visitNode(cbNode, node.expression);
+            case 240 /* ClassDeclaration */:
+            case 209 /* ClassExpression */:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNodes(cbNode, cbNodes, node.typeParameters) ||
+                    visitNodes(cbNode, cbNodes, node.heritageClauses) ||
+                    visitNodes(cbNode, cbNodes, node.members);
+            case 241 /* InterfaceDeclaration */:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNodes(cbNode, cbNodes, node.typeParameters) ||
+                    visitNodes(cbNode, cbNodes, node.heritageClauses) ||
+                    visitNodes(cbNode, cbNodes, node.members);
+            case 242 /* TypeAliasDeclaration */:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNodes(cbNode, cbNodes, node.typeParameters) ||
+                    visitNode(cbNode, node.type);
+            case 243 /* EnumDeclaration */:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNodes(cbNode, cbNodes, node.members);
+            case 278 /* EnumMember */:
+                return visitNode(cbNode, node.name) ||
+                    visitNode(cbNode, node.initializer);
+            case 244 /* ModuleDeclaration */:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNode(cbNode, node.body);
+            case 248 /* ImportEqualsDeclaration */:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.name) ||
+                    visitNode(cbNode, node.moduleReference);
+            case 249 /* ImportDeclaration */:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.importClause) ||
+                    visitNode(cbNode, node.moduleSpecifier);
+            case 250 /* ImportClause */:
+                return visitNode(cbNode, node.name) ||
+                    visitNode(cbNode, node.namedBindings);
+            case 247 /* NamespaceExportDeclaration */:
+                return visitNode(cbNode, node.name);
+            case 251 /* NamespaceImport */:
+                return visitNode(cbNode, node.name);
+            case 252 /* NamedImports */:
+            case 256 /* NamedExports */:
+                return visitNodes(cbNode, cbNodes, node.elements);
+            case 255 /* ExportDeclaration */:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.exportClause) ||
+                    visitNode(cbNode, node.moduleSpecifier);
+            case 253 /* ImportSpecifier */:
+            case 257 /* ExportSpecifier */:
+                return visitNode(cbNode, node.propertyName) ||
+                    visitNode(cbNode, node.name);
+            case 254 /* ExportAssignment */:
+                return visitNodes(cbNode, cbNodes, node.decorators) ||
+                    visitNodes(cbNode, cbNodes, node.modifiers) ||
+                    visitNode(cbNode, node.expression);
+            case 206 /* TemplateExpression */:
+                return visitNode(cbNode, node.head) || visitNodes(cbNode, cbNodes, node.templateSpans);
+            case 216 /* TemplateSpan */:
+                return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal);
+            case 149 /* ComputedPropertyName */:
+                return visitNode(cbNode, node.expression);
+            case 273 /* HeritageClause */:
+                return visitNodes(cbNode, cbNodes, node.types);
+            case 211 /* ExpressionWithTypeArguments */:
+                return visitNode(cbNode, node.expression) ||
+                    visitNodes(cbNode, cbNodes, node.typeArguments);
+            case 259 /* ExternalModuleReference */:
+                return visitNode(cbNode, node.expression);
+            case 258 /* MissingDeclaration */:
+                return visitNodes(cbNode, cbNodes, node.decorators);
+            case 309 /* CommaListExpression */:
+                return visitNodes(cbNode, cbNodes, node.elements);
+            case 260 /* JsxElement */:
+                return visitNode(cbNode, node.openingElement) ||
+                    visitNodes(cbNode, cbNodes, node.children) ||
+                    visitNode(cbNode, node.closingElement);
+            case 264 /* JsxFragment */:
+                return visitNode(cbNode, node.openingFragment) ||
+                    visitNodes(cbNode, cbNodes, node.children) ||
+                    visitNode(cbNode, node.closingFragment);
+            case 261 /* JsxSelfClosingElement */:
+            case 262 /* JsxOpeningElement */:
+                return visitNode(cbNode, node.tagName) ||
+                    visitNodes(cbNode, cbNodes, node.typeArguments) ||
+                    visitNode(cbNode, node.attributes);
+            case 268 /* JsxAttributes */:
+                return visitNodes(cbNode, cbNodes, node.properties);
+            case 267 /* JsxAttribute */:
+                return visitNode(cbNode, node.name) ||
+                    visitNode(cbNode, node.initializer);
+            case 269 /* JsxSpreadAttribute */:
+                return visitNode(cbNode, node.expression);
+            case 270 /* JsxExpression */:
+                return visitNode(cbNode, node.dotDotDotToken) ||
+                    visitNode(cbNode, node.expression);
+            case 263 /* JsxClosingElement */:
+                return visitNode(cbNode, node.tagName);
+            case 171 /* OptionalType */:
+            case 172 /* RestType */:
+            case 283 /* JSDocTypeExpression */:
+            case 287 /* JSDocNonNullableType */:
+            case 286 /* JSDocNullableType */:
+            case 288 /* JSDocOptionalType */:
+            case 290 /* JSDocVariadicType */:
+                return visitNode(cbNode, node.type);
+            case 289 /* JSDocFunctionType */:
+                return visitNodes(cbNode, cbNodes, node.parameters) ||
+                    visitNode(cbNode, node.type);
+            case 291 /* JSDocComment */:
+                return visitNodes(cbNode, cbNodes, node.tags);
+            case 299 /* JSDocParameterTag */:
+            case 305 /* JSDocPropertyTag */:
+                return visitNode(cbNode, node.tagName) ||
+                    (node.isNameFirst
+                        ? visitNode(cbNode, node.name) ||
+                            visitNode(cbNode, node.typeExpression)
+                        : visitNode(cbNode, node.typeExpression) ||
+                            visitNode(cbNode, node.name));
+            case 295 /* JSDocAugmentsTag */:
+                return visitNode(cbNode, node.tagName) ||
+                    visitNode(cbNode, node.class);
+            case 303 /* JSDocTemplateTag */:
+                return visitNode(cbNode, node.tagName) ||
+                    visitNode(cbNode, node.constraint) ||
+                    visitNodes(cbNode, cbNodes, node.typeParameters);
+            case 304 /* JSDocTypedefTag */:
+                return visitNode(cbNode, node.tagName) ||
+                    (node.typeExpression &&
+                        node.typeExpression.kind === 283 /* JSDocTypeExpression */
+                        ? visitNode(cbNode, node.typeExpression) ||
+                            visitNode(cbNode, node.fullName)
+                        : visitNode(cbNode, node.fullName) ||
+                            visitNode(cbNode, node.typeExpression));
+            case 297 /* JSDocCallbackTag */:
+                return visitNode(cbNode, node.tagName) ||
+                    visitNode(cbNode, node.fullName) ||
+                    visitNode(cbNode, node.typeExpression);
+            case 300 /* JSDocReturnTag */:
+            case 302 /* JSDocTypeTag */:
+            case 301 /* JSDocThisTag */:
+            case 298 /* JSDocEnumTag */:
+                return visitNode(cbNode, node.tagName) ||
+                    visitNode(cbNode, node.typeExpression);
+            case 293 /* JSDocSignature */:
+                return ts.forEach(node.typeParameters, cbNode) ||
+                    ts.forEach(node.parameters, cbNode) ||
+                    visitNode(cbNode, node.type);
+            case 292 /* JSDocTypeLiteral */:
+                return ts.forEach(node.jsDocPropertyTags, cbNode);
+            case 294 /* JSDocTag */:
+            case 296 /* JSDocClassTag */:
+                return visitNode(cbNode, node.tagName);
+            case 308 /* PartiallyEmittedExpression */:
+                return visitNode(cbNode, node.expression);
+        }
+    }
+    ts.forEachChild = forEachChild;
+    function createSourceFile(fileName, sourceText, languageVersion, setParentNodes, scriptKind) {
+        if (setParentNodes === void 0) { setParentNodes = false; }
+        ts.performance.mark("beforeParse");
+        var result;
+        if (languageVersion === 100 /* JSON */) {
+            result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, 6 /* JSON */);
+        }
+        else {
+            result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, scriptKind);
+        }
+        ts.performance.mark("afterParse");
+        ts.performance.measure("Parse", "beforeParse", "afterParse");
+        return result;
+    }
+    ts.createSourceFile = createSourceFile;
+    function parseIsolatedEntityName(text, languageVersion) {
+        return Parser.parseIsolatedEntityName(text, languageVersion);
+    }
+    ts.parseIsolatedEntityName = parseIsolatedEntityName;
+    /**
+     * Parse json text into SyntaxTree and return node and parse errors if any
+     * @param fileName
+     * @param sourceText
+     */
+    function parseJsonText(fileName, sourceText) {
+        return Parser.parseJsonText(fileName, sourceText);
+    }
+    ts.parseJsonText = parseJsonText;
+    // See also `isExternalOrCommonJsModule` in utilities.ts
+    function isExternalModule(file) {
+        return file.externalModuleIndicator !== undefined;
+    }
+    ts.isExternalModule = isExternalModule;
+    // Produces a new SourceFile for the 'newText' provided. The 'textChangeRange' parameter
+    // indicates what changed between the 'text' that this SourceFile has and the 'newText'.
+    // The SourceFile will be created with the compiler attempting to reuse as many nodes from
+    // this file as possible.
+    //
+    // Note: this function mutates nodes from this SourceFile. That means any existing nodes
+    // from this SourceFile that are being held onto may change as a result (including
+    // becoming detached from any SourceFile).  It is recommended that this SourceFile not
+    // be used once 'update' is called on it.
+    function updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks) {
+        if (aggressiveChecks === void 0) { aggressiveChecks = false; }
+        var newSourceFile = IncrementalParser.updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks);
+        // Because new source file node is created, it may not have the flag PossiblyContainDynamicImport. This is the case if there is no new edit to add dynamic import.
+        // We will manually port the flag to the new source file.
+        newSourceFile.flags |= (sourceFile.flags & 1572864 /* PermanentlySetIncrementalFlags */);
+        return newSourceFile;
+    }
+    ts.updateSourceFile = updateSourceFile;
+    /* @internal */
+    function parseIsolatedJSDocComment(content, start, length) {
+        var result = Parser.JSDocParser.parseIsolatedJSDocComment(content, start, length);
+        if (result && result.jsDoc) {
+            // because the jsDocComment was parsed out of the source file, it might
+            // not be covered by the fixupParentReferences.
+            Parser.fixupParentReferences(result.jsDoc);
+        }
+        return result;
+    }
+    ts.parseIsolatedJSDocComment = parseIsolatedJSDocComment;
+    /* @internal */
+    // Exposed only for testing.
+    function parseJSDocTypeExpressionForTests(content, start, length) {
+        return Parser.JSDocParser.parseJSDocTypeExpressionForTests(content, start, length);
+    }
+    ts.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
+    // Implement the parser as a singleton module.  We do this for perf reasons because creating
+    // parser instances can actually be expensive enough to impact us on projects with many source
+    // files.
+    var Parser;
+    (function (Parser) {
+        // Share a single scanner across all calls to parse a source file.  This helps speed things
+        // up by avoiding the cost of creating/compiling scanners over and over again.
+        var scanner = ts.createScanner(6 /* Latest */, /*skipTrivia*/ true);
+        var disallowInAndDecoratorContext = 2048 /* DisallowInContext */ | 8192 /* DecoratorContext */;
+        // capture constructors in 'initializeState' to avoid null checks
+        // tslint:disable variable-name
+        var NodeConstructor;
+        var TokenConstructor;
+        var IdentifierConstructor;
+        var SourceFileConstructor;
+        // tslint:enable variable-name
+        var sourceFile;
+        var parseDiagnostics;
+        var syntaxCursor;
+        var currentToken;
+        var sourceText;
+        var nodeCount;
+        var identifiers;
+        var identifierCount;
+        var parsingContext;
+        // Flags that dictate what parsing context we're in.  For example:
+        // Whether or not we are in strict parsing mode.  All that changes in strict parsing mode is
+        // that some tokens that would be considered identifiers may be considered keywords.
+        //
+        // When adding more parser context flags, consider which is the more common case that the
+        // flag will be in.  This should be the 'false' state for that flag.  The reason for this is
+        // that we don't store data in our nodes unless the value is in the *non-default* state.  So,
+        // for example, more often than code 'allows-in' (or doesn't 'disallow-in').  We opt for
+        // 'disallow-in' set to 'false'.  Otherwise, if we had 'allowsIn' set to 'true', then almost
+        // all nodes would need extra state on them to store this info.
+        //
+        // Note: 'allowIn' and 'allowYield' track 1:1 with the [in] and [yield] concepts in the ES6
+        // grammar specification.
+        //
+        // An important thing about these context concepts.  By default they are effectively inherited
+        // while parsing through every grammar production.  i.e. if you don't change them, then when
+        // you parse a sub-production, it will have the same context values as the parent production.
+        // This is great most of the time.  After all, consider all the 'expression' grammar productions
+        // and how nearly all of them pass along the 'in' and 'yield' context values:
+        //
+        // EqualityExpression[In, Yield] :
+        //      RelationalExpression[?In, ?Yield]
+        //      EqualityExpression[?In, ?Yield] == RelationalExpression[?In, ?Yield]
+        //      EqualityExpression[?In, ?Yield] != RelationalExpression[?In, ?Yield]
+        //      EqualityExpression[?In, ?Yield] === RelationalExpression[?In, ?Yield]
+        //      EqualityExpression[?In, ?Yield] !== RelationalExpression[?In, ?Yield]
+        //
+        // Where you have to be careful is then understanding what the points are in the grammar
+        // where the values are *not* passed along.  For example:
+        //
+        // SingleNameBinding[Yield,GeneratorParameter]
+        //      [+GeneratorParameter]BindingIdentifier[Yield] Initializer[In]opt
+        //      [~GeneratorParameter]BindingIdentifier[?Yield]Initializer[In, ?Yield]opt
+        //
+        // Here this is saying that if the GeneratorParameter context flag is set, that we should
+        // explicitly set the 'yield' context flag to false before calling into the BindingIdentifier
+        // and we should explicitly unset the 'yield' context flag before calling into the Initializer.
+        // production.  Conversely, if the GeneratorParameter context flag is not set, then we
+        // should leave the 'yield' context flag alone.
+        //
+        // Getting this all correct is tricky and requires careful reading of the grammar to
+        // understand when these values should be changed versus when they should be inherited.
+        //
+        // Note: it should not be necessary to save/restore these flags during speculative/lookahead
+        // parsing.  These context flags are naturally stored and restored through normal recursive
+        // descent parsing and unwinding.
+        var contextFlags;
+        // Whether or not we've had a parse error since creating the last AST node.  If we have
+        // encountered an error, it will be stored on the next AST node we create.  Parse errors
+        // can be broken down into three categories:
+        //
+        // 1) An error that occurred during scanning.  For example, an unterminated literal, or a
+        //    character that was completely not understood.
+        //
+        // 2) A token was expected, but was not present.  This type of error is commonly produced
+        //    by the 'parseExpected' function.
+        //
+        // 3) A token was present that no parsing function was able to consume.  This type of error
+        //    only occurs in the 'abortParsingListOrMoveToNextToken' function when the parser
+        //    decides to skip the token.
+        //
+        // In all of these cases, we want to mark the next node as having had an error before it.
+        // With this mark, we can know in incremental settings if this node can be reused, or if
+        // we have to reparse it.  If we don't keep this information around, we may just reuse the
+        // node.  in that event we would then not produce the same errors as we did before, causing
+        // significant confusion problems.
+        //
+        // Note: it is necessary that this value be saved/restored during speculative/lookahead
+        // parsing.  During lookahead parsing, we will often create a node.  That node will have
+        // this value attached, and then this value will be set back to 'false'.  If we decide to
+        // rewind, we must get back to the same value we had prior to the lookahead.
+        //
+        // Note: any errors at the end of the file that do not precede a regular node, should get
+        // attached to the EOF token.
+        var parseErrorBeforeNextFinishedNode = false;
+        function parseSourceFile(fileName, sourceText, languageVersion, syntaxCursor, setParentNodes, scriptKind) {
+            if (setParentNodes === void 0) { setParentNodes = false; }
+            scriptKind = ts.ensureScriptKind(fileName, scriptKind);
+            if (scriptKind === 6 /* JSON */) {
+                var result_2 = parseJsonText(fileName, sourceText, languageVersion, syntaxCursor, setParentNodes);
+                ts.convertToObjectWorker(result_2, result_2.parseDiagnostics, /*returnValue*/ false, /*knownRootOptions*/ undefined, /*jsonConversionNotifier*/ undefined);
+                result_2.referencedFiles = ts.emptyArray;
+                result_2.typeReferenceDirectives = ts.emptyArray;
+                result_2.libReferenceDirectives = ts.emptyArray;
+                result_2.amdDependencies = ts.emptyArray;
+                result_2.hasNoDefaultLib = false;
+                result_2.pragmas = ts.emptyMap;
+                return result_2;
+            }
+            initializeState(sourceText, languageVersion, syntaxCursor, scriptKind);
+            var result = parseSourceFileWorker(fileName, languageVersion, setParentNodes, scriptKind);
+            clearState();
+            return result;
+        }
+        Parser.parseSourceFile = parseSourceFile;
+        function parseIsolatedEntityName(content, languageVersion) {
+            // Choice of `isDeclarationFile` should be arbitrary
+            initializeState(content, languageVersion, /*syntaxCursor*/ undefined, 1 /* JS */);
+            // Prime the scanner.
+            nextToken();
+            var entityName = parseEntityName(/*allowReservedWords*/ true);
+            var isInvalid = token() === 1 /* EndOfFileToken */ && !parseDiagnostics.length;
+            clearState();
+            return isInvalid ? entityName : undefined;
+        }
+        Parser.parseIsolatedEntityName = parseIsolatedEntityName;
+        function parseJsonText(fileName, sourceText, languageVersion, syntaxCursor, setParentNodes) {
+            if (languageVersion === void 0) { languageVersion = 2 /* ES2015 */; }
+            initializeState(sourceText, languageVersion, syntaxCursor, 6 /* JSON */);
+            // Set source file so that errors will be reported with this file name
+            sourceFile = createSourceFile(fileName, 2 /* ES2015 */, 6 /* JSON */, /*isDeclaration*/ false);
+            sourceFile.flags = contextFlags;
+            // Prime the scanner.
+            nextToken();
+            var pos = getNodePos();
+            if (token() === 1 /* EndOfFileToken */) {
+                sourceFile.statements = createNodeArray([], pos, pos);
+                sourceFile.endOfFileToken = parseTokenNode();
+            }
+            else {
+                var statement = createNode(221 /* ExpressionStatement */);
+                switch (token()) {
+                    case 22 /* OpenBracketToken */:
+                        statement.expression = parseArrayLiteralExpression();
+                        break;
+                    case 102 /* TrueKeyword */:
+                    case 87 /* FalseKeyword */:
+                    case 96 /* NullKeyword */:
+                        statement.expression = parseTokenNode();
+                        break;
+                    case 39 /* MinusToken */:
+                        if (lookAhead(function () { return nextToken() === 8 /* NumericLiteral */ && nextToken() !== 57 /* ColonToken */; })) {
+                            statement.expression = parsePrefixUnaryExpression();
+                        }
+                        else {
+                            statement.expression = parseObjectLiteralExpression();
+                        }
+                        break;
+                    case 8 /* NumericLiteral */:
+                    case 10 /* StringLiteral */:
+                        if (lookAhead(function () { return nextToken() !== 57 /* ColonToken */; })) {
+                            statement.expression = parseLiteralNode();
+                            break;
+                        }
+                    // falls through
+                    default:
+                        statement.expression = parseObjectLiteralExpression();
+                        break;
+                }
+                finishNode(statement);
+                sourceFile.statements = createNodeArray([statement], pos);
+                sourceFile.endOfFileToken = parseExpectedToken(1 /* EndOfFileToken */, ts.Diagnostics.Unexpected_token);
+            }
+            if (setParentNodes) {
+                fixupParentReferences(sourceFile);
+            }
+            sourceFile.parseDiagnostics = parseDiagnostics;
+            var result = sourceFile;
+            clearState();
+            return result;
+        }
+        Parser.parseJsonText = parseJsonText;
+        function getLanguageVariant(scriptKind) {
+            // .tsx and .jsx files are treated as jsx language variant.
+            return scriptKind === 4 /* TSX */ || scriptKind === 2 /* JSX */ || scriptKind === 1 /* JS */ || scriptKind === 6 /* JSON */ ? 1 /* JSX */ : 0 /* Standard */;
+        }
+        function initializeState(_sourceText, languageVersion, _syntaxCursor, scriptKind) {
+            NodeConstructor = ts.objectAllocator.getNodeConstructor();
+            TokenConstructor = ts.objectAllocator.getTokenConstructor();
+            IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor();
+            SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor();
+            sourceText = _sourceText;
+            syntaxCursor = _syntaxCursor;
+            parseDiagnostics = [];
+            parsingContext = 0;
+            identifiers = ts.createMap();
+            identifierCount = 0;
+            nodeCount = 0;
+            switch (scriptKind) {
+                case 1 /* JS */:
+                case 2 /* JSX */:
+                    contextFlags = 65536 /* JavaScriptFile */;
+                    break;
+                case 6 /* JSON */:
+                    contextFlags = 65536 /* JavaScriptFile */ | 16777216 /* JsonFile */;
+                    break;
+                default:
+                    contextFlags = 0 /* None */;
+                    break;
+            }
+            parseErrorBeforeNextFinishedNode = false;
+            // Initialize and prime the scanner before parsing the source elements.
+            scanner.setText(sourceText);
+            scanner.setOnError(scanError);
+            scanner.setScriptTarget(languageVersion);
+            scanner.setLanguageVariant(getLanguageVariant(scriptKind));
+        }
+        function clearState() {
+            // Clear out the text the scanner is pointing at, so it doesn't keep anything alive unnecessarily.
+            scanner.setText("");
+            scanner.setOnError(undefined);
+            // Clear any data.  We don't want to accidentally hold onto it for too long.
+            parseDiagnostics = undefined;
+            sourceFile = undefined;
+            identifiers = undefined;
+            syntaxCursor = undefined;
+            sourceText = undefined;
+        }
+        function parseSourceFileWorker(fileName, languageVersion, setParentNodes, scriptKind) {
+            var isDeclarationFile = isDeclarationFileName(fileName);
+            if (isDeclarationFile) {
+                contextFlags |= 4194304 /* Ambient */;
+            }
+            sourceFile = createSourceFile(fileName, languageVersion, scriptKind, isDeclarationFile);
+            sourceFile.flags = contextFlags;
+            // Prime the scanner.
+            nextToken();
+            // A member of ReadonlyArray<T> isn't assignable to a member of T[] (and prevents a direct cast) - but this is where we set up those members so they can be readonly in the future
+            processCommentPragmas(sourceFile, sourceText);
+            processPragmasIntoFields(sourceFile, reportPragmaDiagnostic);
+            sourceFile.statements = parseList(0 /* SourceElements */, parseStatement);
+            ts.Debug.assert(token() === 1 /* EndOfFileToken */);
+            sourceFile.endOfFileToken = addJSDocComment(parseTokenNode());
+            setExternalModuleIndicator(sourceFile);
+            sourceFile.nodeCount = nodeCount;
+            sourceFile.identifierCount = identifierCount;
+            sourceFile.identifiers = identifiers;
+            sourceFile.parseDiagnostics = parseDiagnostics;
+            if (setParentNodes) {
+                fixupParentReferences(sourceFile);
+            }
+            return sourceFile;
+            function reportPragmaDiagnostic(pos, end, diagnostic) {
+                parseDiagnostics.push(ts.createFileDiagnostic(sourceFile, pos, end, diagnostic));
+            }
+        }
+        function addJSDocComment(node) {
+            ts.Debug.assert(!node.jsDoc); // Should only be called once per node
+            var jsDoc = ts.mapDefined(ts.getJSDocCommentRanges(node, sourceFile.text), function (comment) { return JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos); });
+            if (jsDoc.length)
+                node.jsDoc = jsDoc;
+            return node;
+        }
+        function fixupParentReferences(rootNode) {
+            // normally parent references are set during binding. However, for clients that only need
+            // a syntax tree, and no semantic features, then the binding process is an unnecessary
+            // overhead.  This functions allows us to set all the parents, without all the expense of
+            // binding.
+            var parent = rootNode;
+            forEachChild(rootNode, visitNode);
+            return;
+            function visitNode(n) {
+                // walk down setting parents that differ from the parent we think it should be.  This
+                // allows us to quickly bail out of setting parents for subtrees during incremental
+                // parsing
+                if (n.parent !== parent) {
+                    n.parent = parent;
+                    var saveParent = parent;
+                    parent = n;
+                    forEachChild(n, visitNode);
+                    if (ts.hasJSDocNodes(n)) {
+                        for (var _i = 0, _a = n.jsDoc; _i < _a.length; _i++) {
+                            var jsDoc = _a[_i];
+                            jsDoc.parent = n;
+                            parent = jsDoc;
+                            forEachChild(jsDoc, visitNode);
+                        }
+                    }
+                    parent = saveParent;
+                }
+            }
+        }
+        Parser.fixupParentReferences = fixupParentReferences;
+        function createSourceFile(fileName, languageVersion, scriptKind, isDeclarationFile) {
+            // code from createNode is inlined here so createNode won't have to deal with special case of creating source files
+            // this is quite rare comparing to other nodes and createNode should be as fast as possible
+            var sourceFile = new SourceFileConstructor(279 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
+            nodeCount++;
+            sourceFile.text = sourceText;
+            sourceFile.bindDiagnostics = [];
+            sourceFile.bindSuggestionDiagnostics = undefined;
+            sourceFile.languageVersion = languageVersion;
+            sourceFile.fileName = ts.normalizePath(fileName);
+            sourceFile.languageVariant = getLanguageVariant(scriptKind);
+            sourceFile.isDeclarationFile = isDeclarationFile;
+            sourceFile.scriptKind = scriptKind;
+            return sourceFile;
+        }
+        function setContextFlag(val, flag) {
+            if (val) {
+                contextFlags |= flag;
+            }
+            else {
+                contextFlags &= ~flag;
+            }
+        }
+        function setDisallowInContext(val) {
+            setContextFlag(val, 2048 /* DisallowInContext */);
+        }
+        function setYieldContext(val) {
+            setContextFlag(val, 4096 /* YieldContext */);
+        }
+        function setDecoratorContext(val) {
+            setContextFlag(val, 8192 /* DecoratorContext */);
+        }
+        function setAwaitContext(val) {
+            setContextFlag(val, 16384 /* AwaitContext */);
+        }
+        function doOutsideOfContext(context, func) {
+            // contextFlagsToClear will contain only the context flags that are
+            // currently set that we need to temporarily clear
+            // We don't just blindly reset to the previous flags to ensure
+            // that we do not mutate cached flags for the incremental
+            // parser (ThisNodeHasError, ThisNodeOrAnySubNodesHasError, and
+            // HasAggregatedChildData).
+            var contextFlagsToClear = context & contextFlags;
+            if (contextFlagsToClear) {
+                // clear the requested context flags
+                setContextFlag(/*val*/ false, contextFlagsToClear);
+                var result = func();
+                // restore the context flags we just cleared
+                setContextFlag(/*val*/ true, contextFlagsToClear);
+                return result;
+            }
+            // no need to do anything special as we are not in any of the requested contexts
+            return func();
+        }
+        function doInsideOfContext(context, func) {
+            // contextFlagsToSet will contain only the context flags that
+            // are not currently set that we need to temporarily enable.
+            // We don't just blindly reset to the previous flags to ensure
+            // that we do not mutate cached flags for the incremental
+            // parser (ThisNodeHasError, ThisNodeOrAnySubNodesHasError, and
+            // HasAggregatedChildData).
+            var contextFlagsToSet = context & ~contextFlags;
+            if (contextFlagsToSet) {
+                // set the requested context flags
+                setContextFlag(/*val*/ true, contextFlagsToSet);
+                var result = func();
+                // reset the context flags we just set
+                setContextFlag(/*val*/ false, contextFlagsToSet);
+                return result;
+            }
+            // no need to do anything special as we are already in all of the requested contexts
+            return func();
+        }
+        function allowInAnd(func) {
+            return doOutsideOfContext(2048 /* DisallowInContext */, func);
+        }
+        function disallowInAnd(func) {
+            return doInsideOfContext(2048 /* DisallowInContext */, func);
+        }
+        function doInYieldContext(func) {
+            return doInsideOfContext(4096 /* YieldContext */, func);
+        }
+        function doInDecoratorContext(func) {
+            return doInsideOfContext(8192 /* DecoratorContext */, func);
+        }
+        function doInAwaitContext(func) {
+            return doInsideOfContext(16384 /* AwaitContext */, func);
+        }
+        function doOutsideOfAwaitContext(func) {
+            return doOutsideOfContext(16384 /* AwaitContext */, func);
+        }
+        function doInYieldAndAwaitContext(func) {
+            return doInsideOfContext(4096 /* YieldContext */ | 16384 /* AwaitContext */, func);
+        }
+        function inContext(flags) {
+            return (contextFlags & flags) !== 0;
+        }
+        function inYieldContext() {
+            return inContext(4096 /* YieldContext */);
+        }
+        function inDisallowInContext() {
+            return inContext(2048 /* DisallowInContext */);
+        }
+        function inDecoratorContext() {
+            return inContext(8192 /* DecoratorContext */);
+        }
+        function inAwaitContext() {
+            return inContext(16384 /* AwaitContext */);
+        }
+        function parseErrorAtCurrentToken(message, arg0) {
+            parseErrorAt(scanner.getTokenPos(), scanner.getTextPos(), message, arg0);
+        }
+        function parseErrorAtPosition(start, length, message, arg0) {
+            // Don't report another error if it would just be at the same position as the last error.
+            var lastError = ts.lastOrUndefined(parseDiagnostics);
+            if (!lastError || start !== lastError.start) {
+                parseDiagnostics.push(ts.createFileDiagnostic(sourceFile, start, length, message, arg0));
+            }
+            // Mark that we've encountered an error.  We'll set an appropriate bit on the next
+            // node we finish so that it can't be reused incrementally.
+            parseErrorBeforeNextFinishedNode = true;
+        }
+        function parseErrorAt(start, end, message, arg0) {
+            parseErrorAtPosition(start, end - start, message, arg0);
+        }
+        function parseErrorAtRange(range, message, arg0) {
+            parseErrorAt(range.pos, range.end, message, arg0);
+        }
+        function scanError(message, length) {
+            parseErrorAtPosition(scanner.getTextPos(), length, message);
+        }
+        function getNodePos() {
+            return scanner.getStartPos();
+        }
+        // Use this function to access the current token instead of reading the currentToken
+        // variable. Since function results aren't narrowed in control flow analysis, this ensures
+        // that the type checker doesn't make wrong assumptions about the type of the current
+        // token (e.g. a call to nextToken() changes the current token but the checker doesn't
+        // reason about this side effect).  Mainstream VMs inline simple functions like this, so
+        // there is no performance penalty.
+        function token() {
+            return currentToken;
+        }
+        function nextToken() {
+            return currentToken = scanner.scan();
+        }
+        function reScanGreaterToken() {
+            return currentToken = scanner.reScanGreaterToken();
+        }
+        function reScanSlashToken() {
+            return currentToken = scanner.reScanSlashToken();
+        }
+        function reScanTemplateToken() {
+            return currentToken = scanner.reScanTemplateToken();
+        }
+        function reScanLessThanToken() {
+            return currentToken = scanner.reScanLessThanToken();
+        }
+        function scanJsxIdentifier() {
+            return currentToken = scanner.scanJsxIdentifier();
+        }
+        function scanJsxText() {
+            return currentToken = scanner.scanJsxToken();
+        }
+        function scanJsxAttributeValue() {
+            return currentToken = scanner.scanJsxAttributeValue();
+        }
+        function speculationHelper(callback, isLookAhead) {
+            // Keep track of the state we'll need to rollback to if lookahead fails (or if the
+            // caller asked us to always reset our state).
+            var saveToken = currentToken;
+            var saveParseDiagnosticsLength = parseDiagnostics.length;
+            var saveParseErrorBeforeNextFinishedNode = parseErrorBeforeNextFinishedNode;
+            // Note: it is not actually necessary to save/restore the context flags here.  That's
+            // because the saving/restoring of these flags happens naturally through the recursive
+            // descent nature of our parser.  However, we still store this here just so we can
+            // assert that invariant holds.
+            var saveContextFlags = contextFlags;
+            // If we're only looking ahead, then tell the scanner to only lookahead as well.
+            // Otherwise, if we're actually speculatively parsing, then tell the scanner to do the
+            // same.
+            var result = isLookAhead
+                ? scanner.lookAhead(callback)
+                : scanner.tryScan(callback);
+            ts.Debug.assert(saveContextFlags === contextFlags);
+            // If our callback returned something 'falsy' or we're just looking ahead,
+            // then unconditionally restore us to where we were.
+            if (!result || isLookAhead) {
+                currentToken = saveToken;
+                parseDiagnostics.length = saveParseDiagnosticsLength;
+                parseErrorBeforeNextFinishedNode = saveParseErrorBeforeNextFinishedNode;
+            }
+            return result;
+        }
+        /** Invokes the provided callback then unconditionally restores the parser to the state it
+         * was in immediately prior to invoking the callback.  The result of invoking the callback
+         * is returned from this function.
+         */
+        function lookAhead(callback) {
+            return speculationHelper(callback, /*isLookAhead*/ true);
+        }
+        /** Invokes the provided callback.  If the callback returns something falsy, then it restores
+         * the parser to the state it was in immediately prior to invoking the callback.  If the
+         * callback returns something truthy, then the parser state is not rolled back.  The result
+         * of invoking the callback is returned from this function.
+         */
+        function tryParse(callback) {
+            return speculationHelper(callback, /*isLookAhead*/ false);
+        }
+        // Ignore strict mode flag because we will report an error in type checker instead.
+        function isIdentifier() {
+            if (token() === 72 /* Identifier */) {
+                return true;
+            }
+            // If we have a 'yield' keyword, and we're in the [yield] context, then 'yield' is
+            // considered a keyword and is not an identifier.
+            if (token() === 117 /* YieldKeyword */ && inYieldContext()) {
+                return false;
+            }
+            // If we have a 'await' keyword, and we're in the [Await] context, then 'await' is
+            // considered a keyword and is not an identifier.
+            if (token() === 122 /* AwaitKeyword */ && inAwaitContext()) {
+                return false;
+            }
+            return token() > 108 /* LastReservedWord */;
+        }
+        function parseExpected(kind, diagnosticMessage, shouldAdvance) {
+            if (shouldAdvance === void 0) { shouldAdvance = true; }
+            if (token() === kind) {
+                if (shouldAdvance) {
+                    nextToken();
+                }
+                return true;
+            }
+            // Report specific message if provided with one.  Otherwise, report generic fallback message.
+            if (diagnosticMessage) {
+                parseErrorAtCurrentToken(diagnosticMessage);
+            }
+            else {
+                parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(kind));
+            }
+            return false;
+        }
+        function parseOptional(t) {
+            if (token() === t) {
+                nextToken();
+                return true;
+            }
+            return false;
+        }
+        function parseOptionalToken(t) {
+            if (token() === t) {
+                return parseTokenNode();
+            }
+            return undefined;
+        }
+        function parseExpectedToken(t, diagnosticMessage, arg0) {
+            return parseOptionalToken(t) ||
+                createMissingNode(t, /*reportAtCurrentPosition*/ false, diagnosticMessage || ts.Diagnostics._0_expected, arg0 || ts.tokenToString(t));
+        }
+        function parseTokenNode() {
+            var node = createNode(token());
+            nextToken();
+            return finishNode(node);
+        }
+        function canParseSemicolon() {
+            // If there's a real semicolon, then we can always parse it out.
+            if (token() === 26 /* SemicolonToken */) {
+                return true;
+            }
+            // We can parse out an optional semicolon in ASI cases in the following cases.
+            return token() === 19 /* CloseBraceToken */ || token() === 1 /* EndOfFileToken */ || scanner.hasPrecedingLineBreak();
+        }
+        function parseSemicolon() {
+            if (canParseSemicolon()) {
+                if (token() === 26 /* SemicolonToken */) {
+                    // consume the semicolon if it was explicitly provided.
+                    nextToken();
+                }
+                return true;
+            }
+            else {
+                return parseExpected(26 /* SemicolonToken */);
+            }
+        }
+        function createNode(kind, pos) {
+            nodeCount++;
+            var p = pos >= 0 ? pos : scanner.getStartPos();
+            return ts.isNodeKind(kind) || kind === 0 /* Unknown */ ? new NodeConstructor(kind, p, p) :
+                kind === 72 /* Identifier */ ? new IdentifierConstructor(kind, p, p) :
+                    new TokenConstructor(kind, p, p);
+        }
+        function createNodeWithJSDoc(kind, pos) {
+            var node = createNode(kind, pos);
+            if (scanner.getTokenFlags() & 2 /* PrecedingJSDocComment */) {
+                addJSDocComment(node);
+            }
+            return node;
+        }
+        function createNodeArray(elements, pos, end) {
+            // Since the element list of a node array is typically created by starting with an empty array and
+            // repeatedly calling push(), the list may not have the optimal memory layout. We invoke slice() for
+            // small arrays (1 to 4 elements) to give the VM a chance to allocate an optimal representation.
+            var length = elements.length;
+            var array = (length >= 1 && length <= 4 ? elements.slice() : elements);
+            array.pos = pos;
+            array.end = end === undefined ? scanner.getStartPos() : end;
+            return array;
+        }
+        function finishNode(node, end) {
+            node.end = end === undefined ? scanner.getStartPos() : end;
+            if (contextFlags) {
+                node.flags |= contextFlags;
+            }
+            // Keep track on the node if we encountered an error while parsing it.  If we did, then
+            // we cannot reuse the node incrementally.  Once we've marked this node, clear out the
+            // flag so that we don't mark any subsequent nodes.
+            if (parseErrorBeforeNextFinishedNode) {
+                parseErrorBeforeNextFinishedNode = false;
+                node.flags |= 32768 /* ThisNodeHasError */;
+            }
+            return node;
+        }
+        function createMissingNode(kind, reportAtCurrentPosition, diagnosticMessage, arg0) {
+            if (reportAtCurrentPosition) {
+                parseErrorAtPosition(scanner.getStartPos(), 0, diagnosticMessage, arg0);
+            }
+            else if (diagnosticMessage) {
+                parseErrorAtCurrentToken(diagnosticMessage, arg0);
+            }
+            var result = createNode(kind);
+            if (kind === 72 /* Identifier */) {
+                result.escapedText = "";
+            }
+            else if (ts.isLiteralKind(kind) || ts.isTemplateLiteralKind(kind)) {
+                result.text = "";
+            }
+            return finishNode(result);
+        }
+        function internIdentifier(text) {
+            var identifier = identifiers.get(text);
+            if (identifier === undefined) {
+                identifiers.set(text, identifier = text);
+            }
+            return identifier;
+        }
+        // An identifier that starts with two underscores has an extra underscore character prepended to it to avoid issues
+        // with magic property names like '__proto__'. The 'identifiers' object is used to share a single string instance for
+        // each identifier in order to reduce memory consumption.
+        function createIdentifier(isIdentifier, diagnosticMessage) {
+            identifierCount++;
+            if (isIdentifier) {
+                var node = createNode(72 /* Identifier */);
+                // Store original token kind if it is not just an Identifier so we can report appropriate error later in type checker
+                if (token() !== 72 /* Identifier */) {
+                    node.originalKeywordKind = token();
+                }
+                node.escapedText = ts.escapeLeadingUnderscores(internIdentifier(scanner.getTokenValue()));
+                nextToken();
+                return finishNode(node);
+            }
+            // Only for end of file because the error gets reported incorrectly on embedded script tags.
+            var reportAtCurrentPosition = token() === 1 /* EndOfFileToken */;
+            return createMissingNode(72 /* Identifier */, reportAtCurrentPosition, diagnosticMessage || ts.Diagnostics.Identifier_expected);
+        }
+        function parseIdentifier(diagnosticMessage) {
+            return createIdentifier(isIdentifier(), diagnosticMessage);
+        }
+        function parseIdentifierName(diagnosticMessage) {
+            return createIdentifier(ts.tokenIsIdentifierOrKeyword(token()), diagnosticMessage);
+        }
+        function isLiteralPropertyName() {
+            return ts.tokenIsIdentifierOrKeyword(token()) ||
+                token() === 10 /* StringLiteral */ ||
+                token() === 8 /* NumericLiteral */;
+        }
+        function parsePropertyNameWorker(allowComputedPropertyNames) {
+            if (token() === 10 /* StringLiteral */ || token() === 8 /* NumericLiteral */) {
+                var node = parseLiteralNode();
+                node.text = internIdentifier(node.text);
+                return node;
+            }
+            if (allowComputedPropertyNames && token() === 22 /* OpenBracketToken */) {
+                return parseComputedPropertyName();
+            }
+            return parseIdentifierName();
+        }
+        function parsePropertyName() {
+            return parsePropertyNameWorker(/*allowComputedPropertyNames*/ true);
+        }
+        function parseComputedPropertyName() {
+            // PropertyName [Yield]:
+            //      LiteralPropertyName
+            //      ComputedPropertyName[?Yield]
+            var node = createNode(149 /* ComputedPropertyName */);
+            parseExpected(22 /* OpenBracketToken */);
+            // We parse any expression (including a comma expression). But the grammar
+            // says that only an assignment expression is allowed, so the grammar checker
+            // will error if it sees a comma expression.
+            node.expression = allowInAnd(parseExpression);
+            parseExpected(23 /* CloseBracketToken */);
+            return finishNode(node);
+        }
+        function parseContextualModifier(t) {
+            return token() === t && tryParse(nextTokenCanFollowModifier);
+        }
+        function nextTokenIsOnSameLineAndCanFollowModifier() {
+            nextToken();
+            if (scanner.hasPrecedingLineBreak()) {
+                return false;
+            }
+            return canFollowModifier();
+        }
+        function nextTokenCanFollowModifier() {
+            switch (token()) {
+                case 77 /* ConstKeyword */:
+                    // 'const' is only a modifier if followed by 'enum'.
+                    return nextToken() === 84 /* EnumKeyword */;
+                case 85 /* ExportKeyword */:
+                    nextToken();
+                    if (token() === 80 /* DefaultKeyword */) {
+                        return lookAhead(nextTokenCanFollowDefaultKeyword);
+                    }
+                    return token() !== 40 /* AsteriskToken */ && token() !== 119 /* AsKeyword */ && token() !== 18 /* OpenBraceToken */ && canFollowModifier();
+                case 80 /* DefaultKeyword */:
+                    return nextTokenCanFollowDefaultKeyword();
+                case 116 /* StaticKeyword */:
+                case 126 /* GetKeyword */:
+                case 137 /* SetKeyword */:
+                    nextToken();
+                    return canFollowModifier();
+                default:
+                    return nextTokenIsOnSameLineAndCanFollowModifier();
+            }
+        }
+        function parseAnyContextualModifier() {
+            return ts.isModifierKind(token()) && tryParse(nextTokenCanFollowModifier);
+        }
+        function canFollowModifier() {
+            return token() === 22 /* OpenBracketToken */
+                || token() === 18 /* OpenBraceToken */
+                || token() === 40 /* AsteriskToken */
+                || token() === 25 /* DotDotDotToken */
+                || isLiteralPropertyName();
+        }
+        function nextTokenCanFollowDefaultKeyword() {
+            nextToken();
+            return token() === 76 /* ClassKeyword */ || token() === 90 /* FunctionKeyword */ ||
+                token() === 110 /* InterfaceKeyword */ ||
+                (token() === 118 /* AbstractKeyword */ && lookAhead(nextTokenIsClassKeywordOnSameLine)) ||
+                (token() === 121 /* AsyncKeyword */ && lookAhead(nextTokenIsFunctionKeywordOnSameLine));
+        }
+        // True if positioned at the start of a list element
+        function isListElement(parsingContext, inErrorRecovery) {
+            var node = currentNode(parsingContext);
+            if (node) {
+                return true;
+            }
+            switch (parsingContext) {
+                case 0 /* SourceElements */:
+                case 1 /* BlockStatements */:
+                case 3 /* SwitchClauseStatements */:
+                    // If we're in error recovery, then we don't want to treat ';' as an empty statement.
+                    // The problem is that ';' can show up in far too many contexts, and if we see one
+                    // and assume it's a statement, then we may bail out inappropriately from whatever
+                    // we're parsing.  For example, if we have a semicolon in the middle of a class, then
+                    // we really don't want to assume the class is over and we're on a statement in the
+                    // outer module.  We just want to consume and move on.
+                    return !(token() === 26 /* SemicolonToken */ && inErrorRecovery) && isStartOfStatement();
+                case 2 /* SwitchClauses */:
+                    return token() === 74 /* CaseKeyword */ || token() === 80 /* DefaultKeyword */;
+                case 4 /* TypeMembers */:
+                    return lookAhead(isTypeMemberStart);
+                case 5 /* ClassMembers */:
+                    // We allow semicolons as class elements (as specified by ES6) as long as we're
+                    // not in error recovery.  If we're in error recovery, we don't want an errant
+                    // semicolon to be treated as a class member (since they're almost always used
+                    // for statements.
+                    return lookAhead(isClassMemberStart) || (token() === 26 /* SemicolonToken */ && !inErrorRecovery);
+                case 6 /* EnumMembers */:
+                    // Include open bracket computed properties. This technically also lets in indexers,
+                    // which would be a candidate for improved error reporting.
+                    return token() === 22 /* OpenBracketToken */ || isLiteralPropertyName();
+                case 12 /* ObjectLiteralMembers */:
+                    switch (token()) {
+                        case 22 /* OpenBracketToken */:
+                        case 40 /* AsteriskToken */:
+                        case 25 /* DotDotDotToken */:
+                        case 24 /* DotToken */: // Not an object literal member, but don't want to close the object (see `tests/cases/fourslash/completionsDotInObjectLiteral.ts`)
+                            return true;
+                        default:
+                            return isLiteralPropertyName();
+                    }
+                case 18 /* RestProperties */:
+                    return isLiteralPropertyName();
+                case 9 /* ObjectBindingElements */:
+                    return token() === 22 /* OpenBracketToken */ || token() === 25 /* DotDotDotToken */ || isLiteralPropertyName();
+                case 7 /* HeritageClauseElement */:
+                    // If we see `{ ... }` then only consume it as an expression if it is followed by `,` or `{`
+                    // That way we won't consume the body of a class in its heritage clause.
+                    if (token() === 18 /* OpenBraceToken */) {
+                        return lookAhead(isValidHeritageClauseObjectLiteral);
+                    }
+                    if (!inErrorRecovery) {
+                        return isStartOfLeftHandSideExpression() && !isHeritageClauseExtendsOrImplementsKeyword();
+                    }
+                    else {
+                        // If we're in error recovery we tighten up what we're willing to match.
+                        // That way we don't treat something like "this" as a valid heritage clause
+                        // element during recovery.
+                        return isIdentifier() && !isHeritageClauseExtendsOrImplementsKeyword();
+                    }
+                case 8 /* VariableDeclarations */:
+                    return isIdentifierOrPattern();
+                case 10 /* ArrayBindingElements */:
+                    return token() === 27 /* CommaToken */ || token() === 25 /* DotDotDotToken */ || isIdentifierOrPattern();
+                case 19 /* TypeParameters */:
+                    return isIdentifier();
+                case 15 /* ArrayLiteralMembers */:
+                    switch (token()) {
+                        case 27 /* CommaToken */:
+                        case 24 /* DotToken */: // Not an array literal member, but don't want to close the array (see `tests/cases/fourslash/completionsDotInArrayLiteralInObjectLiteral.ts`)
+                            return true;
+                    }
+                // falls through
+                case 11 /* ArgumentExpressions */:
+                    return token() === 25 /* DotDotDotToken */ || isStartOfExpression();
+                case 16 /* Parameters */:
+                    return isStartOfParameter(/*isJSDocParameter*/ false);
+                case 17 /* JSDocParameters */:
+                    return isStartOfParameter(/*isJSDocParameter*/ true);
+                case 20 /* TypeArguments */:
+                case 21 /* TupleElementTypes */:
+                    return token() === 27 /* CommaToken */ || isStartOfType();
+                case 22 /* HeritageClauses */:
+                    return isHeritageClause();
+                case 23 /* ImportOrExportSpecifiers */:
+                    return ts.tokenIsIdentifierOrKeyword(token());
+                case 13 /* JsxAttributes */:
+                    return ts.tokenIsIdentifierOrKeyword(token()) || token() === 18 /* OpenBraceToken */;
+                case 14 /* JsxChildren */:
+                    return true;
+            }
+            return ts.Debug.fail("Non-exhaustive case in 'isListElement'.");
+        }
+        function isValidHeritageClauseObjectLiteral() {
+            ts.Debug.assert(token() === 18 /* OpenBraceToken */);
+            if (nextToken() === 19 /* CloseBraceToken */) {
+                // if we see "extends {}" then only treat the {} as what we're extending (and not
+                // the class body) if we have:
+                //
+                //      extends {} {
+                //      extends {},
+                //      extends {} extends
+                //      extends {} implements
+                var next = nextToken();
+                return next === 27 /* CommaToken */ || next === 18 /* OpenBraceToken */ || next === 86 /* ExtendsKeyword */ || next === 109 /* ImplementsKeyword */;
+            }
+            return true;
+        }
+        function nextTokenIsIdentifier() {
+            nextToken();
+            return isIdentifier();
+        }
+        function nextTokenIsIdentifierOrKeyword() {
+            nextToken();
+            return ts.tokenIsIdentifierOrKeyword(token());
+        }
+        function nextTokenIsIdentifierOrKeywordOrGreaterThan() {
+            nextToken();
+            return ts.tokenIsIdentifierOrKeywordOrGreaterThan(token());
+        }
+        function isHeritageClauseExtendsOrImplementsKeyword() {
+            if (token() === 109 /* ImplementsKeyword */ ||
+                token() === 86 /* ExtendsKeyword */) {
+                return lookAhead(nextTokenIsStartOfExpression);
+            }
+            return false;
+        }
+        function nextTokenIsStartOfExpression() {
+            nextToken();
+            return isStartOfExpression();
+        }
+        function nextTokenIsStartOfType() {
+            nextToken();
+            return isStartOfType();
+        }
+        // True if positioned at a list terminator
+        function isListTerminator(kind) {
+            if (token() === 1 /* EndOfFileToken */) {
+                // Being at the end of the file ends all lists.
+                return true;
+            }
+            switch (kind) {
+                case 1 /* BlockStatements */:
+                case 2 /* SwitchClauses */:
+                case 4 /* TypeMembers */:
+                case 5 /* ClassMembers */:
+                case 6 /* EnumMembers */:
+                case 12 /* ObjectLiteralMembers */:
+                case 9 /* ObjectBindingElements */:
+                case 23 /* ImportOrExportSpecifiers */:
+                    return token() === 19 /* CloseBraceToken */;
+                case 3 /* SwitchClauseStatements */:
+                    return token() === 19 /* CloseBraceToken */ || token() === 74 /* CaseKeyword */ || token() === 80 /* DefaultKeyword */;
+                case 7 /* HeritageClauseElement */:
+                    return token() === 18 /* OpenBraceToken */ || token() === 86 /* ExtendsKeyword */ || token() === 109 /* ImplementsKeyword */;
+                case 8 /* VariableDeclarations */:
+                    return isVariableDeclaratorListTerminator();
+                case 19 /* TypeParameters */:
+                    // Tokens other than '>' are here for better error recovery
+                    return token() === 30 /* GreaterThanToken */ || token() === 20 /* OpenParenToken */ || token() === 18 /* OpenBraceToken */ || token() === 86 /* ExtendsKeyword */ || token() === 109 /* ImplementsKeyword */;
+                case 11 /* ArgumentExpressions */:
+                    // Tokens other than ')' are here for better error recovery
+                    return token() === 21 /* CloseParenToken */ || token() === 26 /* SemicolonToken */;
+                case 15 /* ArrayLiteralMembers */:
+                case 21 /* TupleElementTypes */:
+                case 10 /* ArrayBindingElements */:
+                    return token() === 23 /* CloseBracketToken */;
+                case 17 /* JSDocParameters */:
+                case 16 /* Parameters */:
+                case 18 /* RestProperties */:
+                    // Tokens other than ')' and ']' (the latter for index signatures) are here for better error recovery
+                    return token() === 21 /* CloseParenToken */ || token() === 23 /* CloseBracketToken */ /*|| token === SyntaxKind.OpenBraceToken*/;
+                case 20 /* TypeArguments */:
+                    // All other tokens should cause the type-argument to terminate except comma token
+                    return token() !== 27 /* CommaToken */;
+                case 22 /* HeritageClauses */:
+                    return token() === 18 /* OpenBraceToken */ || token() === 19 /* CloseBraceToken */;
+                case 13 /* JsxAttributes */:
+                    return token() === 30 /* GreaterThanToken */ || token() === 42 /* SlashToken */;
+                case 14 /* JsxChildren */:
+                    return token() === 28 /* LessThanToken */ && lookAhead(nextTokenIsSlash);
+                default:
+                    return false;
+            }
+        }
+        function isVariableDeclaratorListTerminator() {
+            // If we can consume a semicolon (either explicitly, or with ASI), then consider us done
+            // with parsing the list of variable declarators.
+            if (canParseSemicolon()) {
+                return true;
+            }
+            // in the case where we're parsing the variable declarator of a 'for-in' statement, we
+            // are done if we see an 'in' keyword in front of us. Same with for-of
+            if (isInOrOfKeyword(token())) {
+                return true;
+            }
+            // ERROR RECOVERY TWEAK:
+            // For better error recovery, if we see an '=>' then we just stop immediately.  We've got an
+            // arrow function here and it's going to be very unlikely that we'll resynchronize and get
+            // another variable declaration.
+            if (token() === 37 /* EqualsGreaterThanToken */) {
+                return true;
+            }
+            // Keep trying to parse out variable declarators.
+            return false;
+        }
+        // True if positioned at element or terminator of the current list or any enclosing list
+        function isInSomeParsingContext() {
+            for (var kind = 0; kind < 24 /* Count */; kind++) {
+                if (parsingContext & (1 << kind)) {
+                    if (isListElement(kind, /*inErrorRecovery*/ true) || isListTerminator(kind)) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        // Parses a list of elements
+        function parseList(kind, parseElement) {
+            var saveParsingContext = parsingContext;
+            parsingContext |= 1 << kind;
+            var list = [];
+            var listPos = getNodePos();
+            while (!isListTerminator(kind)) {
+                if (isListElement(kind, /*inErrorRecovery*/ false)) {
+                    var element = parseListElement(kind, parseElement);
+                    list.push(element);
+                    continue;
+                }
+                if (abortParsingListOrMoveToNextToken(kind)) {
+                    break;
+                }
+            }
+            parsingContext = saveParsingContext;
+            return createNodeArray(list, listPos);
+        }
+        function parseListElement(parsingContext, parseElement) {
+            var node = currentNode(parsingContext);
+            if (node) {
+                return consumeNode(node);
+            }
+            return parseElement();
+        }
+        function currentNode(parsingContext) {
+            // If we don't have a cursor or the parsing context isn't reusable, there's nothing to reuse.
+            //
+            // If there is an outstanding parse error that we've encountered, but not attached to
+            // some node, then we cannot get a node from the old source tree.  This is because we
+            // want to mark the next node we encounter as being unusable.
+            //
+            // Note: This may be too conservative.  Perhaps we could reuse the node and set the bit
+            // on it (or its leftmost child) as having the error.  For now though, being conservative
+            // is nice and likely won't ever affect perf.
+            if (!syntaxCursor || !isReusableParsingContext(parsingContext) || parseErrorBeforeNextFinishedNode) {
+                return undefined;
+            }
+            var node = syntaxCursor.currentNode(scanner.getStartPos());
+            // Can't reuse a missing node.
+            // Can't reuse a node that intersected the change range.
+            // Can't reuse a node that contains a parse error.  This is necessary so that we
+            // produce the same set of errors again.
+            if (ts.nodeIsMissing(node) || node.intersectsChange || ts.containsParseError(node)) {
+                return undefined;
+            }
+            // We can only reuse a node if it was parsed under the same strict mode that we're
+            // currently in.  i.e. if we originally parsed a node in non-strict mode, but then
+            // the user added 'using strict' at the top of the file, then we can't use that node
+            // again as the presence of strict mode may cause us to parse the tokens in the file
+            // differently.
+            //
+            // Note: we *can* reuse tokens when the strict mode changes.  That's because tokens
+            // are unaffected by strict mode.  It's just the parser will decide what to do with it
+            // differently depending on what mode it is in.
+            //
+            // This also applies to all our other context flags as well.
+            var nodeContextFlags = node.flags & 12679168 /* ContextFlags */;
+            if (nodeContextFlags !== contextFlags) {
+                return undefined;
+            }
+            // Ok, we have a node that looks like it could be reused.  Now verify that it is valid
+            // in the current list parsing context that we're currently at.
+            if (!canReuseNode(node, parsingContext)) {
+                return undefined;
+            }
+            if (node.jsDocCache) {
+                // jsDocCache may include tags from parent nodes, which might have been modified.
+                node.jsDocCache = undefined;
+            }
+            return node;
+        }
+        function consumeNode(node) {
+            // Move the scanner so it is after the node we just consumed.
+            scanner.setTextPos(node.end);
+            nextToken();
+            return node;
+        }
+        function isReusableParsingContext(parsingContext) {
+            switch (parsingContext) {
+                case 5 /* ClassMembers */:
+                case 2 /* SwitchClauses */:
+                case 0 /* SourceElements */:
+                case 1 /* BlockStatements */:
+                case 3 /* SwitchClauseStatements */:
+                case 6 /* EnumMembers */:
+                case 4 /* TypeMembers */:
+                case 8 /* VariableDeclarations */:
+                case 17 /* JSDocParameters */:
+                case 16 /* Parameters */:
+                    return true;
+            }
+            return false;
+        }
+        function canReuseNode(node, parsingContext) {
+            switch (parsingContext) {
+                case 5 /* ClassMembers */:
+                    return isReusableClassMember(node);
+                case 2 /* SwitchClauses */:
+                    return isReusableSwitchClause(node);
+                case 0 /* SourceElements */:
+                case 1 /* BlockStatements */:
+                case 3 /* SwitchClauseStatements */:
+                    return isReusableStatement(node);
+                case 6 /* EnumMembers */:
+                    return isReusableEnumMember(node);
+                case 4 /* TypeMembers */:
+                    return isReusableTypeMember(node);
+                case 8 /* VariableDeclarations */:
+                    return isReusableVariableDeclaration(node);
+                case 17 /* JSDocParameters */:
+                case 16 /* Parameters */:
+                    return isReusableParameter(node);
+                // Any other lists we do not care about reusing nodes in.  But feel free to add if
+                // you can do so safely.  Danger areas involve nodes that may involve speculative
+                // parsing.  If speculative parsing is involved with the node, then the range the
+                // parser reached while looking ahead might be in the edited range (see the example
+                // in canReuseVariableDeclaratorNode for a good case of this).
+                // case ParsingContext.HeritageClauses:
+                // This would probably be safe to reuse.  There is no speculative parsing with
+                // heritage clauses.
+                // case ParsingContext.TypeParameters:
+                // This would probably be safe to reuse.  There is no speculative parsing with
+                // type parameters.  Note that that's because type *parameters* only occur in
+                // unambiguous *type* contexts.  While type *arguments* occur in very ambiguous
+                // *expression* contexts.
+                // case ParsingContext.TupleElementTypes:
+                // This would probably be safe to reuse.  There is no speculative parsing with
+                // tuple types.
+                // Technically, type argument list types are probably safe to reuse.  While
+                // speculative parsing is involved with them (since type argument lists are only
+                // produced from speculative parsing a < as a type argument list), we only have
+                // the types because speculative parsing succeeded.  Thus, the lookahead never
+                // went past the end of the list and rewound.
+                // case ParsingContext.TypeArguments:
+                // Note: these are almost certainly not safe to ever reuse.  Expressions commonly
+                // need a large amount of lookahead, and we should not reuse them as they may
+                // have actually intersected the edit.
+                // case ParsingContext.ArgumentExpressions:
+                // This is not safe to reuse for the same reason as the 'AssignmentExpression'
+                // cases.  i.e. a property assignment may end with an expression, and thus might
+                // have lookahead far beyond it's old node.
+                // case ParsingContext.ObjectLiteralMembers:
+                // This is probably not safe to reuse.  There can be speculative parsing with
+                // type names in a heritage clause.  There can be generic names in the type
+                // name list, and there can be left hand side expressions (which can have type
+                // arguments.)
+                // case ParsingContext.HeritageClauseElement:
+                // Perhaps safe to reuse, but it's unlikely we'd see more than a dozen attributes
+                // on any given element. Same for children.
+                // case ParsingContext.JsxAttributes:
+                // case ParsingContext.JsxChildren:
+            }
+            return false;
+        }
+        function isReusableClassMember(node) {
+            if (node) {
+                switch (node.kind) {
+                    case 157 /* Constructor */:
+                    case 162 /* IndexSignature */:
+                    case 158 /* GetAccessor */:
+                    case 159 /* SetAccessor */:
+                    case 154 /* PropertyDeclaration */:
+                    case 217 /* SemicolonClassElement */:
+                        return true;
+                    case 156 /* MethodDeclaration */:
+                        // Method declarations are not necessarily reusable.  An object-literal
+                        // may have a method calls "constructor(...)" and we must reparse that
+                        // into an actual .ConstructorDeclaration.
+                        var methodDeclaration = node;
+                        var nameIsConstructor = methodDeclaration.name.kind === 72 /* Identifier */ &&
+                            methodDeclaration.name.originalKeywordKind === 124 /* ConstructorKeyword */;
+                        return !nameIsConstructor;
+                }
+            }
+            return false;
+        }
+        function isReusableSwitchClause(node) {
+            if (node) {
+                switch (node.kind) {
+                    case 271 /* CaseClause */:
+                    case 272 /* DefaultClause */:
+                        return true;
+                }
+            }
+            return false;
+        }
+        function isReusableStatement(node) {
+            if (node) {
+                switch (node.kind) {
+                    case 239 /* FunctionDeclaration */:
+                    case 219 /* VariableStatement */:
+                    case 218 /* Block */:
+                    case 222 /* IfStatement */:
+                    case 221 /* ExpressionStatement */:
+                    case 234 /* ThrowStatement */:
+                    case 230 /* ReturnStatement */:
+                    case 232 /* SwitchStatement */:
+                    case 229 /* BreakStatement */:
+                    case 228 /* ContinueStatement */:
+                    case 226 /* ForInStatement */:
+                    case 227 /* ForOfStatement */:
+                    case 225 /* ForStatement */:
+                    case 224 /* WhileStatement */:
+                    case 231 /* WithStatement */:
+                    case 220 /* EmptyStatement */:
+                    case 235 /* TryStatement */:
+                    case 233 /* LabeledStatement */:
+                    case 223 /* DoStatement */:
+                    case 236 /* DebuggerStatement */:
+                    case 249 /* ImportDeclaration */:
+                    case 248 /* ImportEqualsDeclaration */:
+                    case 255 /* ExportDeclaration */:
+                    case 254 /* ExportAssignment */:
+                    case 244 /* ModuleDeclaration */:
+                    case 240 /* ClassDeclaration */:
+                    case 241 /* InterfaceDeclaration */:
+                    case 243 /* EnumDeclaration */:
+                    case 242 /* TypeAliasDeclaration */:
+                        return true;
+                }
+            }
+            return false;
+        }
+        function isReusableEnumMember(node) {
+            return node.kind === 278 /* EnumMember */;
+        }
+        function isReusableTypeMember(node) {
+            if (node) {
+                switch (node.kind) {
+                    case 161 /* ConstructSignature */:
+                    case 155 /* MethodSignature */:
+                    case 162 /* IndexSignature */:
+                    case 153 /* PropertySignature */:
+                    case 160 /* CallSignature */:
+                        return true;
+                }
+            }
+            return false;
+        }
+        function isReusableVariableDeclaration(node) {
+            if (node.kind !== 237 /* VariableDeclaration */) {
+                return false;
+            }
+            // Very subtle incremental parsing bug.  Consider the following code:
+            //
+            //      let v = new List < A, B
+            //
+            // This is actually legal code.  It's a list of variable declarators "v = new List<A"
+            // on one side and "B" on the other. If you then change that to:
+            //
+            //      let v = new List < A, B >()
+            //
+            // then we have a problem.  "v = new List<A" doesn't intersect the change range, so we
+            // start reparsing at "B" and we completely fail to handle this properly.
+            //
+            // In order to prevent this, we do not allow a variable declarator to be reused if it
+            // has an initializer.
+            var variableDeclarator = node;
+            return variableDeclarator.initializer === undefined;
+        }
+        function isReusableParameter(node) {
+            if (node.kind !== 151 /* Parameter */) {
+                return false;
+            }
+            // See the comment in isReusableVariableDeclaration for why we do this.
+            var parameter = node;
+            return parameter.initializer === undefined;
+        }
+        // Returns true if we should abort parsing.
+        function abortParsingListOrMoveToNextToken(kind) {
+            parseErrorAtCurrentToken(parsingContextErrors(kind));
+            if (isInSomeParsingContext()) {
+                return true;
+            }
+            nextToken();
+            return false;
+        }
+        function parsingContextErrors(context) {
+            switch (context) {
+                case 0 /* SourceElements */: return ts.Diagnostics.Declaration_or_statement_expected;
+                case 1 /* BlockStatements */: return ts.Diagnostics.Declaration_or_statement_expected;
+                case 2 /* SwitchClauses */: return ts.Diagnostics.case_or_default_expected;
+                case 3 /* SwitchClauseStatements */: return ts.Diagnostics.Statement_expected;
+                case 18 /* RestProperties */: // fallthrough
+                case 4 /* TypeMembers */: return ts.Diagnostics.Property_or_signature_expected;
+                case 5 /* ClassMembers */: return ts.Diagnostics.Unexpected_token_A_constructor_method_accessor_or_property_was_expected;
+                case 6 /* EnumMembers */: return ts.Diagnostics.Enum_member_expected;
+                case 7 /* HeritageClauseElement */: return ts.Diagnostics.Expression_expected;
+                case 8 /* VariableDeclarations */: return ts.Diagnostics.Variable_declaration_expected;
+                case 9 /* ObjectBindingElements */: return ts.Diagnostics.Property_destructuring_pattern_expected;
+                case 10 /* ArrayBindingElements */: return ts.Diagnostics.Array_element_destructuring_pattern_expected;
+                case 11 /* ArgumentExpressions */: return ts.Diagnostics.Argument_expression_expected;
+                case 12 /* ObjectLiteralMembers */: return ts.Diagnostics.Property_assignment_expected;
+                case 15 /* ArrayLiteralMembers */: return ts.Diagnostics.Expression_or_comma_expected;
+                case 17 /* JSDocParameters */: return ts.Diagnostics.Parameter_declaration_expected;
+                case 16 /* Parameters */: return ts.Diagnostics.Parameter_declaration_expected;
+                case 19 /* TypeParameters */: return ts.Diagnostics.Type_parameter_declaration_expected;
+                case 20 /* TypeArguments */: return ts.Diagnostics.Type_argument_expected;
+                case 21 /* TupleElementTypes */: return ts.Diagnostics.Type_expected;
+                case 22 /* HeritageClauses */: return ts.Diagnostics.Unexpected_token_expected;
+                case 23 /* ImportOrExportSpecifiers */: return ts.Diagnostics.Identifier_expected;
+                case 13 /* JsxAttributes */: return ts.Diagnostics.Identifier_expected;
+                case 14 /* JsxChildren */: return ts.Diagnostics.Identifier_expected;
+                default: return undefined; // TODO: GH#18217 `default: Debug.assertNever(context);`
+            }
+        }
+        // Parses a comma-delimited list of elements
+        function parseDelimitedList(kind, parseElement, considerSemicolonAsDelimiter) {
+            var saveParsingContext = parsingContext;
+            parsingContext |= 1 << kind;
+            var list = [];
+            var listPos = getNodePos();
+            var commaStart = -1; // Meaning the previous token was not a comma
+            while (true) {
+                if (isListElement(kind, /*inErrorRecovery*/ false)) {
+                    var startPos = scanner.getStartPos();
+                    list.push(parseListElement(kind, parseElement));
+                    commaStart = scanner.getTokenPos();
+                    if (parseOptional(27 /* CommaToken */)) {
+                        // No need to check for a zero length node since we know we parsed a comma
+                        continue;
+                    }
+                    commaStart = -1; // Back to the state where the last token was not a comma
+                    if (isListTerminator(kind)) {
+                        break;
+                    }
+                    // We didn't get a comma, and the list wasn't terminated, explicitly parse
+                    // out a comma so we give a good error message.
+                    parseExpected(27 /* CommaToken */);
+                    // If the token was a semicolon, and the caller allows that, then skip it and
+                    // continue.  This ensures we get back on track and don't result in tons of
+                    // parse errors.  For example, this can happen when people do things like use
+                    // a semicolon to delimit object literal members.   Note: we'll have already
+                    // reported an error when we called parseExpected above.
+                    if (considerSemicolonAsDelimiter && token() === 26 /* SemicolonToken */ && !scanner.hasPrecedingLineBreak()) {
+                        nextToken();
+                    }
+                    if (startPos === scanner.getStartPos()) {
+                        // What we're parsing isn't actually remotely recognizable as a element and we've consumed no tokens whatsoever
+                        // Consume a token to advance the parser in some way and avoid an infinite loop
+                        // This can happen when we're speculatively parsing parenthesized expressions which we think may be arrow functions,
+                        // or when a modifier keyword which is disallowed as a parameter name (ie, `static` in strict mode) is supplied
+                        nextToken();
+                    }
+                    continue;
+                }
+                if (isListTerminator(kind)) {
+                    break;
+                }
+                if (abortParsingListOrMoveToNextToken(kind)) {
+                    break;
+                }
+            }
+            parsingContext = saveParsingContext;
+            var result = createNodeArray(list, listPos);
+            // Recording the trailing comma is deliberately done after the previous
+            // loop, and not just if we see a list terminator. This is because the list
+            // may have ended incorrectly, but it is still important to know if there
+            // was a trailing comma.
+            // Check if the last token was a comma.
+            if (commaStart >= 0) {
+                // Always preserve a trailing comma by marking it on the NodeArray
+                result.hasTrailingComma = true;
+            }
+            return result;
+        }
+        function createMissingList() {
+            var list = createNodeArray([], getNodePos());
+            list.isMissingList = true;
+            return list;
+        }
+        function isMissingList(arr) {
+            return !!arr.isMissingList;
+        }
+        function parseBracketedList(kind, parseElement, open, close) {
+            if (parseExpected(open)) {
+                var result = parseDelimitedList(kind, parseElement);
+                parseExpected(close);
+                return result;
+            }
+            return createMissingList();
+        }
+        function parseEntityName(allowReservedWords, diagnosticMessage) {
+            var entity = allowReservedWords ? parseIdentifierName(diagnosticMessage) : parseIdentifier(diagnosticMessage);
+            var dotPos = scanner.getStartPos();
+            while (parseOptional(24 /* DotToken */)) {
+                if (token() === 28 /* LessThanToken */) {
+                    // the entity is part of a JSDoc-style generic, so record the trailing dot for later error reporting
+                    entity.jsdocDotPos = dotPos;
+                    break;
+                }
+                dotPos = scanner.getStartPos();
+                entity = createQualifiedName(entity, parseRightSideOfDot(allowReservedWords));
+            }
+            return entity;
+        }
+        function createQualifiedName(entity, name) {
+            var node = createNode(148 /* QualifiedName */, entity.pos);
+            node.left = entity;
+            node.right = name;
+            return finishNode(node);
+        }
+        function parseRightSideOfDot(allowIdentifierNames) {
+            // Technically a keyword is valid here as all identifiers and keywords are identifier names.
+            // However, often we'll encounter this in error situations when the identifier or keyword
+            // is actually starting another valid construct.
+            //
+            // So, we check for the following specific case:
+            //
+            //      name.
+            //      identifierOrKeyword identifierNameOrKeyword
+            //
+            // Note: the newlines are important here.  For example, if that above code
+            // were rewritten into:
+            //
+            //      name.identifierOrKeyword
+            //      identifierNameOrKeyword
+            //
+            // Then we would consider it valid.  That's because ASI would take effect and
+            // the code would be implicitly: "name.identifierOrKeyword; identifierNameOrKeyword".
+            // In the first case though, ASI will not take effect because there is not a
+            // line terminator after the identifier or keyword.
+            if (scanner.hasPrecedingLineBreak() && ts.tokenIsIdentifierOrKeyword(token())) {
+                var matchesPattern = lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine);
+                if (matchesPattern) {
+                    // Report that we need an identifier.  However, report it right after the dot,
+                    // and not on the next token.  This is because the next token might actually
+                    // be an identifier and the error would be quite confusing.
+                    return createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Identifier_expected);
+                }
+            }
+            return allowIdentifierNames ? parseIdentifierName() : parseIdentifier();
+        }
+        function parseTemplateExpression() {
+            var template = createNode(206 /* TemplateExpression */);
+            template.head = parseTemplateHead();
+            ts.Debug.assert(template.head.kind === 15 /* TemplateHead */, "Template head has wrong token kind");
+            var list = [];
+            var listPos = getNodePos();
+            do {
+                list.push(parseTemplateSpan());
+            } while (ts.last(list).literal.kind === 16 /* TemplateMiddle */);
+            template.templateSpans = createNodeArray(list, listPos);
+            return finishNode(template);
+        }
+        function parseTemplateSpan() {
+            var span = createNode(216 /* TemplateSpan */);
+            span.expression = allowInAnd(parseExpression);
+            var literal;
+            if (token() === 19 /* CloseBraceToken */) {
+                reScanTemplateToken();
+                literal = parseTemplateMiddleOrTemplateTail();
+            }
+            else {
+                literal = parseExpectedToken(17 /* TemplateTail */, ts.Diagnostics._0_expected, ts.tokenToString(19 /* CloseBraceToken */));
+            }
+            span.literal = literal;
+            return finishNode(span);
+        }
+        function parseLiteralNode() {
+            return parseLiteralLikeNode(token());
+        }
+        function parseTemplateHead() {
+            var fragment = parseLiteralLikeNode(token());
+            ts.Debug.assert(fragment.kind === 15 /* TemplateHead */, "Template head has wrong token kind");
+            return fragment;
+        }
+        function parseTemplateMiddleOrTemplateTail() {
+            var fragment = parseLiteralLikeNode(token());
+            ts.Debug.assert(fragment.kind === 16 /* TemplateMiddle */ || fragment.kind === 17 /* TemplateTail */, "Template fragment has wrong token kind");
+            return fragment;
+        }
+        function parseLiteralLikeNode(kind) {
+            var node = createNode(kind);
+            node.text = scanner.getTokenValue();
+            if (scanner.hasExtendedUnicodeEscape()) {
+                node.hasExtendedUnicodeEscape = true;
+            }
+            if (scanner.isUnterminated()) {
+                node.isUnterminated = true;
+            }
+            // Octal literals are not allowed in strict mode or ES5
+            // Note that theoretically the following condition would hold true literals like 009,
+            // which is not octal.But because of how the scanner separates the tokens, we would
+            // never get a token like this. Instead, we would get 00 and 9 as two separate tokens.
+            // We also do not need to check for negatives because any prefix operator would be part of a
+            // parent unary expression.
+            if (node.kind === 8 /* NumericLiteral */) {
+                node.numericLiteralFlags = scanner.getTokenFlags() & 1008 /* NumericLiteralFlags */;
+            }
+            nextToken();
+            finishNode(node);
+            return node;
+        }
+        // TYPES
+        function parseTypeReference() {
+            var node = createNode(164 /* TypeReference */);
+            node.typeName = parseEntityName(/*allowReservedWords*/ true, ts.Diagnostics.Type_expected);
+            if (!scanner.hasPrecedingLineBreak() && reScanLessThanToken() === 28 /* LessThanToken */) {
+                node.typeArguments = parseBracketedList(20 /* TypeArguments */, parseType, 28 /* LessThanToken */, 30 /* GreaterThanToken */);
+            }
+            return finishNode(node);
+        }
+        // If true, we should abort parsing an error function.
+        function typeHasArrowFunctionBlockingParseError(node) {
+            switch (node.kind) {
+                case 164 /* TypeReference */:
+                    return ts.nodeIsMissing(node.typeName);
+                case 165 /* FunctionType */:
+                case 166 /* ConstructorType */: {
+                    var _a = node, parameters = _a.parameters, type = _a.type;
+                    return isMissingList(parameters) || typeHasArrowFunctionBlockingParseError(type);
+                }
+                case 177 /* ParenthesizedType */:
+                    return typeHasArrowFunctionBlockingParseError(node.type);
+                default:
+                    return false;
+            }
+        }
+        function parseThisTypePredicate(lhs) {
+            nextToken();
+            var node = createNode(163 /* TypePredicate */, lhs.pos);
+            node.parameterName = lhs;
+            node.type = parseType();
+            return finishNode(node);
+        }
+        function parseThisTypeNode() {
+            var node = createNode(178 /* ThisType */);
+            nextToken();
+            return finishNode(node);
+        }
+        function parseJSDocAllType(postFixEquals) {
+            var result = createNode(284 /* JSDocAllType */);
+            if (postFixEquals) {
+                return createPostfixType(288 /* JSDocOptionalType */, result);
+            }
+            else {
+                nextToken();
+            }
+            return finishNode(result);
+        }
+        function parseJSDocNonNullableType() {
+            var result = createNode(287 /* JSDocNonNullableType */);
+            nextToken();
+            result.type = parseNonArrayType();
+            return finishNode(result);
+        }
+        function parseJSDocUnknownOrNullableType() {
+            var pos = scanner.getStartPos();
+            // skip the ?
+            nextToken();
+            // Need to lookahead to decide if this is a nullable or unknown type.
+            // Here are cases where we'll pick the unknown type:
+            //
+            //      Foo(?,
+            //      { a: ? }
+            //      Foo(?)
+            //      Foo<?>
+            //      Foo(?=
+            //      (?|
+            if (token() === 27 /* CommaToken */ ||
+                token() === 19 /* CloseBraceToken */ ||
+                token() === 21 /* CloseParenToken */ ||
+                token() === 30 /* GreaterThanToken */ ||
+                token() === 59 /* EqualsToken */ ||
+                token() === 50 /* BarToken */) {
+                var result = createNode(285 /* JSDocUnknownType */, pos);
+                return finishNode(result);
+            }
+            else {
+                var result = createNode(286 /* JSDocNullableType */, pos);
+                result.type = parseType();
+                return finishNode(result);
+            }
+        }
+        function parseJSDocFunctionType() {
+            if (lookAhead(nextTokenIsOpenParen)) {
+                var result = createNodeWithJSDoc(289 /* JSDocFunctionType */);
+                nextToken();
+                fillSignature(57 /* ColonToken */, 4 /* Type */ | 32 /* JSDoc */, result);
+                return finishNode(result);
+            }
+            var node = createNode(164 /* TypeReference */);
+            node.typeName = parseIdentifierName();
+            return finishNode(node);
+        }
+        function parseJSDocParameter() {
+            var parameter = createNode(151 /* Parameter */);
+            if (token() === 100 /* ThisKeyword */ || token() === 95 /* NewKeyword */) {
+                parameter.name = parseIdentifierName();
+                parseExpected(57 /* ColonToken */);
+            }
+            parameter.type = parseJSDocType();
+            return finishNode(parameter);
+        }
+        function parseJSDocType() {
+            scanner.setInJSDocType(true);
+            var dotdotdot = parseOptionalToken(25 /* DotDotDotToken */);
+            var type = parseTypeOrTypePredicate();
+            scanner.setInJSDocType(false);
+            if (dotdotdot) {
+                var variadic = createNode(290 /* JSDocVariadicType */, dotdotdot.pos);
+                variadic.type = type;
+                type = finishNode(variadic);
+            }
+            if (token() === 59 /* EqualsToken */) {
+                return createPostfixType(288 /* JSDocOptionalType */, type);
+            }
+            return type;
+        }
+        function parseTypeQuery() {
+            var node = createNode(167 /* TypeQuery */);
+            parseExpected(104 /* TypeOfKeyword */);
+            node.exprName = parseEntityName(/*allowReservedWords*/ true);
+            return finishNode(node);
+        }
+        function parseTypeParameter() {
+            var node = createNode(150 /* TypeParameter */);
+            node.name = parseIdentifier();
+            if (parseOptional(86 /* ExtendsKeyword */)) {
+                // It's not uncommon for people to write improper constraints to a generic.  If the
+                // user writes a constraint that is an expression and not an actual type, then parse
+                // it out as an expression (so we can recover well), but report that a type is needed
+                // instead.
+                if (isStartOfType() || !isStartOfExpression()) {
+                    node.constraint = parseType();
+                }
+                else {
+                    // It was not a type, and it looked like an expression.  Parse out an expression
+                    // here so we recover well.  Note: it is important that we call parseUnaryExpression
+                    // and not parseExpression here.  If the user has:
+                    //
+                    //      <T extends "">
+                    //
+                    // We do *not* want to consume the `>` as we're consuming the expression for "".
+                    node.expression = parseUnaryExpressionOrHigher();
+                }
+            }
+            if (parseOptional(59 /* EqualsToken */)) {
+                node.default = parseType();
+            }
+            return finishNode(node);
+        }
+        function parseTypeParameters() {
+            if (token() === 28 /* LessThanToken */) {
+                return parseBracketedList(19 /* TypeParameters */, parseTypeParameter, 28 /* LessThanToken */, 30 /* GreaterThanToken */);
+            }
+        }
+        function parseParameterType() {
+            if (parseOptional(57 /* ColonToken */)) {
+                return parseType();
+            }
+            return undefined;
+        }
+        function isStartOfParameter(isJSDocParameter) {
+            return token() === 25 /* DotDotDotToken */ ||
+                isIdentifierOrPattern() ||
+                ts.isModifierKind(token()) ||
+                token() === 58 /* AtToken */ ||
+                isStartOfType(/*inStartOfParameter*/ !isJSDocParameter);
+        }
+        function parseParameter() {
+            var node = createNodeWithJSDoc(151 /* Parameter */);
+            if (token() === 100 /* ThisKeyword */) {
+                node.name = createIdentifier(/*isIdentifier*/ true);
+                node.type = parseParameterType();
+                return finishNode(node);
+            }
+            node.decorators = parseDecorators();
+            node.modifiers = parseModifiers();
+            node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */);
+            // FormalParameter [Yield,Await]:
+            //      BindingElement[?Yield,?Await]
+            node.name = parseIdentifierOrPattern();
+            if (ts.getFullWidth(node.name) === 0 && !ts.hasModifiers(node) && ts.isModifierKind(token())) {
+                // in cases like
+                // 'use strict'
+                // function foo(static)
+                // isParameter('static') === true, because of isModifier('static')
+                // however 'static' is not a legal identifier in a strict mode.
+                // so result of this function will be ParameterDeclaration (flags = 0, name = missing, type = undefined, initializer = undefined)
+                // and current token will not change => parsing of the enclosing parameter list will last till the end of time (or OOM)
+                // to avoid this we'll advance cursor to the next token.
+                nextToken();
+            }
+            node.questionToken = parseOptionalToken(56 /* QuestionToken */);
+            node.type = parseParameterType();
+            node.initializer = parseInitializer();
+            return finishNode(node);
+        }
+        /**
+         * Note: If returnToken is EqualsGreaterThanToken, `signature.type` will always be defined.
+         * @returns If return type parsing succeeds
+         */
+        function fillSignature(returnToken, flags, signature) {
+            if (!(flags & 32 /* JSDoc */)) {
+                signature.typeParameters = parseTypeParameters();
+            }
+            var parametersParsedSuccessfully = parseParameterList(signature, flags);
+            if (shouldParseReturnType(returnToken, !!(flags & 4 /* Type */))) {
+                signature.type = parseTypeOrTypePredicate();
+                if (typeHasArrowFunctionBlockingParseError(signature.type))
+                    return false;
+            }
+            return parametersParsedSuccessfully;
+        }
+        function shouldParseReturnType(returnToken, isType) {
+            if (returnToken === 37 /* EqualsGreaterThanToken */) {
+                parseExpected(returnToken);
+                return true;
+            }
+            else if (parseOptional(57 /* ColonToken */)) {
+                return true;
+            }
+            else if (isType && token() === 37 /* EqualsGreaterThanToken */) {
+                // This is easy to get backward, especially in type contexts, so parse the type anyway
+                parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(57 /* ColonToken */));
+                nextToken();
+                return true;
+            }
+            return false;
+        }
+        // Returns true on success.
+        function parseParameterList(signature, flags) {
+            // FormalParameters [Yield,Await]: (modified)
+            //      [empty]
+            //      FormalParameterList[?Yield,Await]
+            //
+            // FormalParameter[Yield,Await]: (modified)
+            //      BindingElement[?Yield,Await]
+            //
+            // BindingElement [Yield,Await]: (modified)
+            //      SingleNameBinding[?Yield,?Await]
+            //      BindingPattern[?Yield,?Await]Initializer [In, ?Yield,?Await] opt
+            //
+            // SingleNameBinding [Yield,Await]:
+            //      BindingIdentifier[?Yield,?Await]Initializer [In, ?Yield,?Await] opt
+            if (!parseExpected(20 /* OpenParenToken */)) {
+                signature.parameters = createMissingList();
+                return false;
+            }
+            var savedYieldContext = inYieldContext();
+            var savedAwaitContext = inAwaitContext();
+            setYieldContext(!!(flags & 1 /* Yield */));
+            setAwaitContext(!!(flags & 2 /* Await */));
+            signature.parameters = flags & 32 /* JSDoc */ ?
+                parseDelimitedList(17 /* JSDocParameters */, parseJSDocParameter) :
+                parseDelimitedList(16 /* Parameters */, parseParameter);
+            setYieldContext(savedYieldContext);
+            setAwaitContext(savedAwaitContext);
+            return parseExpected(21 /* CloseParenToken */);
+        }
+        function parseTypeMemberSemicolon() {
+            // We allow type members to be separated by commas or (possibly ASI) semicolons.
+            // First check if it was a comma.  If so, we're done with the member.
+            if (parseOptional(27 /* CommaToken */)) {
+                return;
+            }
+            // Didn't have a comma.  We must have a (possible ASI) semicolon.
+            parseSemicolon();
+        }
+        function parseSignatureMember(kind) {
+            var node = createNodeWithJSDoc(kind);
+            if (kind === 161 /* ConstructSignature */) {
+                parseExpected(95 /* NewKeyword */);
+            }
+            fillSignature(57 /* ColonToken */, 4 /* Type */, node);
+            parseTypeMemberSemicolon();
+            return finishNode(node);
+        }
+        function isIndexSignature() {
+            return token() === 22 /* OpenBracketToken */ && lookAhead(isUnambiguouslyIndexSignature);
+        }
+        function isUnambiguouslyIndexSignature() {
+            // The only allowed sequence is:
+            //
+            //   [id:
+            //
+            // However, for error recovery, we also check the following cases:
+            //
+            //   [...
+            //   [id,
+            //   [id?,
+            //   [id?:
+            //   [id?]
+            //   [public id
+            //   [private id
+            //   [protected id
+            //   []
+            //
+            nextToken();
+            if (token() === 25 /* DotDotDotToken */ || token() === 23 /* CloseBracketToken */) {
+                return true;
+            }
+            if (ts.isModifierKind(token())) {
+                nextToken();
+                if (isIdentifier()) {
+                    return true;
+                }
+            }
+            else if (!isIdentifier()) {
+                return false;
+            }
+            else {
+                // Skip the identifier
+                nextToken();
+            }
+            // A colon signifies a well formed indexer
+            // A comma should be a badly formed indexer because comma expressions are not allowed
+            // in computed properties.
+            if (token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */) {
+                return true;
+            }
+            // Question mark could be an indexer with an optional property,
+            // or it could be a conditional expression in a computed property.
+            if (token() !== 56 /* QuestionToken */) {
+                return false;
+            }
+            // If any of the following tokens are after the question mark, it cannot
+            // be a conditional expression, so treat it as an indexer.
+            nextToken();
+            return token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 23 /* CloseBracketToken */;
+        }
+        function parseIndexSignatureDeclaration(node) {
+            node.kind = 162 /* IndexSignature */;
+            node.parameters = parseBracketedList(16 /* Parameters */, parseParameter, 22 /* OpenBracketToken */, 23 /* CloseBracketToken */);
+            node.type = parseTypeAnnotation();
+            parseTypeMemberSemicolon();
+            return finishNode(node);
+        }
+        function parsePropertyOrMethodSignature(node) {
+            node.name = parsePropertyName();
+            node.questionToken = parseOptionalToken(56 /* QuestionToken */);
+            if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */) {
+                node.kind = 155 /* MethodSignature */;
+                // Method signatures don't exist in expression contexts.  So they have neither
+                // [Yield] nor [Await]
+                fillSignature(57 /* ColonToken */, 4 /* Type */, node);
+            }
+            else {
+                node.kind = 153 /* PropertySignature */;
+                node.type = parseTypeAnnotation();
+                if (token() === 59 /* EqualsToken */) {
+                    // Although type literal properties cannot not have initializers, we attempt
+                    // to parse an initializer so we can report in the checker that an interface
+                    // property or type literal property cannot have an initializer.
+                    node.initializer = parseInitializer();
+                }
+            }
+            parseTypeMemberSemicolon();
+            return finishNode(node);
+        }
+        function isTypeMemberStart() {
+            // Return true if we have the start of a signature member
+            if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */) {
+                return true;
+            }
+            var idToken = false;
+            // Eat up all modifiers, but hold on to the last one in case it is actually an identifier
+            while (ts.isModifierKind(token())) {
+                idToken = true;
+                nextToken();
+            }
+            // Index signatures and computed property names are type members
+            if (token() === 22 /* OpenBracketToken */) {
+                return true;
+            }
+            // Try to get the first property-like token following all modifiers
+            if (isLiteralPropertyName()) {
+                idToken = true;
+                nextToken();
+            }
+            // If we were able to get any potential identifier, check that it is
+            // the start of a member declaration
+            if (idToken) {
+                return token() === 20 /* OpenParenToken */ ||
+                    token() === 28 /* LessThanToken */ ||
+                    token() === 56 /* QuestionToken */ ||
+                    token() === 57 /* ColonToken */ ||
+                    token() === 27 /* CommaToken */ ||
+                    canParseSemicolon();
+            }
+            return false;
+        }
+        function parseTypeMember() {
+            if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */) {
+                return parseSignatureMember(160 /* CallSignature */);
+            }
+            if (token() === 95 /* NewKeyword */ && lookAhead(nextTokenIsOpenParenOrLessThan)) {
+                return parseSignatureMember(161 /* ConstructSignature */);
+            }
+            var node = createNodeWithJSDoc(0 /* Unknown */);
+            node.modifiers = parseModifiers();
+            if (isIndexSignature()) {
+                return parseIndexSignatureDeclaration(node);
+            }
+            return parsePropertyOrMethodSignature(node);
+        }
+        function nextTokenIsOpenParenOrLessThan() {
+            nextToken();
+            return token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */;
+        }
+        function nextTokenIsDot() {
+            return nextToken() === 24 /* DotToken */;
+        }
+        function nextTokenIsOpenParenOrLessThanOrDot() {
+            switch (nextToken()) {
+                case 20 /* OpenParenToken */:
+                case 28 /* LessThanToken */:
+                case 24 /* DotToken */:
+                    return true;
+            }
+            return false;
+        }
+        function parseTypeLiteral() {
+            var node = createNode(168 /* TypeLiteral */);
+            node.members = parseObjectTypeMembers();
+            return finishNode(node);
+        }
+        function parseObjectTypeMembers() {
+            var members;
+            if (parseExpected(18 /* OpenBraceToken */)) {
+                members = parseList(4 /* TypeMembers */, parseTypeMember);
+                parseExpected(19 /* CloseBraceToken */);
+            }
+            else {
+                members = createMissingList();
+            }
+            return members;
+        }
+        function isStartOfMappedType() {
+            nextToken();
+            if (token() === 38 /* PlusToken */ || token() === 39 /* MinusToken */) {
+                return nextToken() === 133 /* ReadonlyKeyword */;
+            }
+            if (token() === 133 /* ReadonlyKeyword */) {
+                nextToken();
+            }
+            return token() === 22 /* OpenBracketToken */ && nextTokenIsIdentifier() && nextToken() === 93 /* InKeyword */;
+        }
+        function parseMappedTypeParameter() {
+            var node = createNode(150 /* TypeParameter */);
+            node.name = parseIdentifier();
+            parseExpected(93 /* InKeyword */);
+            node.constraint = parseType();
+            return finishNode(node);
+        }
+        function parseMappedType() {
+            var node = createNode(181 /* MappedType */);
+            parseExpected(18 /* OpenBraceToken */);
+            if (token() === 133 /* ReadonlyKeyword */ || token() === 38 /* PlusToken */ || token() === 39 /* MinusToken */) {
+                node.readonlyToken = parseTokenNode();
+                if (node.readonlyToken.kind !== 133 /* ReadonlyKeyword */) {
+                    parseExpectedToken(133 /* ReadonlyKeyword */);
+                }
+            }
+            parseExpected(22 /* OpenBracketToken */);
+            node.typeParameter = parseMappedTypeParameter();
+            parseExpected(23 /* CloseBracketToken */);
+            if (token() === 56 /* QuestionToken */ || token() === 38 /* PlusToken */ || token() === 39 /* MinusToken */) {
+                node.questionToken = parseTokenNode();
+                if (node.questionToken.kind !== 56 /* QuestionToken */) {
+                    parseExpectedToken(56 /* QuestionToken */);
+                }
+            }
+            node.type = parseTypeAnnotation();
+            parseSemicolon();
+            parseExpected(19 /* CloseBraceToken */);
+            return finishNode(node);
+        }
+        function parseTupleElementType() {
+            var pos = getNodePos();
+            if (parseOptional(25 /* DotDotDotToken */)) {
+                var node = createNode(172 /* RestType */, pos);
+                node.type = parseType();
+                return finishNode(node);
+            }
+            var type = parseType();
+            if (!(contextFlags & 2097152 /* JSDoc */) && type.kind === 286 /* JSDocNullableType */ && type.pos === type.type.pos) {
+                type.kind = 171 /* OptionalType */;
+            }
+            return type;
+        }
+        function parseTupleType() {
+            var node = createNode(170 /* TupleType */);
+            node.elementTypes = parseBracketedList(21 /* TupleElementTypes */, parseTupleElementType, 22 /* OpenBracketToken */, 23 /* CloseBracketToken */);
+            return finishNode(node);
+        }
+        function parseParenthesizedType() {
+            var node = createNode(177 /* ParenthesizedType */);
+            parseExpected(20 /* OpenParenToken */);
+            node.type = parseType();
+            parseExpected(21 /* CloseParenToken */);
+            return finishNode(node);
+        }
+        function parseFunctionOrConstructorType() {
+            var pos = getNodePos();
+            var kind = parseOptional(95 /* NewKeyword */) ? 166 /* ConstructorType */ : 165 /* FunctionType */;
+            var node = createNodeWithJSDoc(kind, pos);
+            fillSignature(37 /* EqualsGreaterThanToken */, 4 /* Type */, node);
+            return finishNode(node);
+        }
+        function parseKeywordAndNoDot() {
+            var node = parseTokenNode();
+            return token() === 24 /* DotToken */ ? undefined : node;
+        }
+        function parseLiteralTypeNode(negative) {
+            var node = createNode(182 /* LiteralType */);
+            var unaryMinusExpression;
+            if (negative) {
+                unaryMinusExpression = createNode(202 /* PrefixUnaryExpression */);
+                unaryMinusExpression.operator = 39 /* MinusToken */;
+                nextToken();
+            }
+            var expression = token() === 102 /* TrueKeyword */ || token() === 87 /* FalseKeyword */
+                ? parseTokenNode()
+                : parseLiteralLikeNode(token());
+            if (negative) {
+                unaryMinusExpression.operand = expression;
+                finishNode(unaryMinusExpression);
+                expression = unaryMinusExpression;
+            }
+            node.literal = expression;
+            return finishNode(node);
+        }
+        function isStartOfTypeOfImportType() {
+            nextToken();
+            return token() === 92 /* ImportKeyword */;
+        }
+        function parseImportType() {
+            sourceFile.flags |= 524288 /* PossiblyContainsDynamicImport */;
+            var node = createNode(183 /* ImportType */);
+            if (parseOptional(104 /* TypeOfKeyword */)) {
+                node.isTypeOf = true;
+            }
+            parseExpected(92 /* ImportKeyword */);
+            parseExpected(20 /* OpenParenToken */);
+            node.argument = parseType();
+            parseExpected(21 /* CloseParenToken */);
+            if (parseOptional(24 /* DotToken */)) {
+                node.qualifier = parseEntityName(/*allowReservedWords*/ true, ts.Diagnostics.Type_expected);
+            }
+            node.typeArguments = tryParseTypeArguments();
+            return finishNode(node);
+        }
+        function nextTokenIsNumericOrBigIntLiteral() {
+            nextToken();
+            return token() === 8 /* NumericLiteral */ || token() === 9 /* BigIntLiteral */;
+        }
+        function parseNonArrayType() {
+            switch (token()) {
+                case 120 /* AnyKeyword */:
+                case 143 /* UnknownKeyword */:
+                case 138 /* StringKeyword */:
+                case 135 /* NumberKeyword */:
+                case 146 /* BigIntKeyword */:
+                case 139 /* SymbolKeyword */:
+                case 123 /* BooleanKeyword */:
+                case 141 /* UndefinedKeyword */:
+                case 132 /* NeverKeyword */:
+                case 136 /* ObjectKeyword */:
+                    // If these are followed by a dot, then parse these out as a dotted type reference instead.
+                    return tryParse(parseKeywordAndNoDot) || parseTypeReference();
+                case 40 /* AsteriskToken */:
+                    return parseJSDocAllType(/*postfixEquals*/ false);
+                case 62 /* AsteriskEqualsToken */:
+                    return parseJSDocAllType(/*postfixEquals*/ true);
+                case 56 /* QuestionToken */:
+                    return parseJSDocUnknownOrNullableType();
+                case 90 /* FunctionKeyword */:
+                    return parseJSDocFunctionType();
+                case 52 /* ExclamationToken */:
+                    return parseJSDocNonNullableType();
+                case 14 /* NoSubstitutionTemplateLiteral */:
+                case 10 /* StringLiteral */:
+                case 8 /* NumericLiteral */:
+                case 9 /* BigIntLiteral */:
+                case 102 /* TrueKeyword */:
+                case 87 /* FalseKeyword */:
+                    return parseLiteralTypeNode();
+                case 39 /* MinusToken */:
+                    return lookAhead(nextTokenIsNumericOrBigIntLiteral) ? parseLiteralTypeNode(/*negative*/ true) : parseTypeReference();
+                case 106 /* VoidKeyword */:
+                case 96 /* NullKeyword */:
+                    return parseTokenNode();
+                case 100 /* ThisKeyword */: {
+                    var thisKeyword = parseThisTypeNode();
+                    if (token() === 128 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
+                        return parseThisTypePredicate(thisKeyword);
+                    }
+                    else {
+                        return thisKeyword;
+                    }
+                }
+                case 104 /* TypeOfKeyword */:
+                    return lookAhead(isStartOfTypeOfImportType) ? parseImportType() : parseTypeQuery();
+                case 18 /* OpenBraceToken */:
+                    return lookAhead(isStartOfMappedType) ? parseMappedType() : parseTypeLiteral();
+                case 22 /* OpenBracketToken */:
+                    return parseTupleType();
+                case 20 /* OpenParenToken */:
+                    return parseParenthesizedType();
+                case 92 /* ImportKeyword */:
+                    return parseImportType();
+                default:
+                    return parseTypeReference();
+            }
+        }
+        function isStartOfType(inStartOfParameter) {
+            switch (token()) {
+                case 120 /* AnyKeyword */:
+                case 143 /* UnknownKeyword */:
+                case 138 /* StringKeyword */:
+                case 135 /* NumberKeyword */:
+                case 146 /* BigIntKeyword */:
+                case 123 /* BooleanKeyword */:
+                case 139 /* SymbolKeyword */:
+                case 142 /* UniqueKeyword */:
+                case 106 /* VoidKeyword */:
+                case 141 /* UndefinedKeyword */:
+                case 96 /* NullKeyword */:
+                case 100 /* ThisKeyword */:
+                case 104 /* TypeOfKeyword */:
+                case 132 /* NeverKeyword */:
+                case 18 /* OpenBraceToken */:
+                case 22 /* OpenBracketToken */:
+                case 28 /* LessThanToken */:
+                case 50 /* BarToken */:
+                case 49 /* AmpersandToken */:
+                case 95 /* NewKeyword */:
+                case 10 /* StringLiteral */:
+                case 8 /* NumericLiteral */:
+                case 9 /* BigIntLiteral */:
+                case 102 /* TrueKeyword */:
+                case 87 /* FalseKeyword */:
+                case 136 /* ObjectKeyword */:
+                case 40 /* AsteriskToken */:
+                case 56 /* QuestionToken */:
+                case 52 /* ExclamationToken */:
+                case 25 /* DotDotDotToken */:
+                case 127 /* InferKeyword */:
+                case 92 /* ImportKeyword */:
+                    return true;
+                case 90 /* FunctionKeyword */:
+                    return !inStartOfParameter;
+                case 39 /* MinusToken */:
+                    return !inStartOfParameter && lookAhead(nextTokenIsNumericOrBigIntLiteral);
+                case 20 /* OpenParenToken */:
+                    // Only consider '(' the start of a type if followed by ')', '...', an identifier, a modifier,
+                    // or something that starts a type. We don't want to consider things like '(1)' a type.
+                    return !inStartOfParameter && lookAhead(isStartOfParenthesizedOrFunctionType);
+                default:
+                    return isIdentifier();
+            }
+        }
+        function isStartOfParenthesizedOrFunctionType() {
+            nextToken();
+            return token() === 21 /* CloseParenToken */ || isStartOfParameter(/*isJSDocParameter*/ false) || isStartOfType();
+        }
+        function parsePostfixTypeOrHigher() {
+            var type = parseNonArrayType();
+            while (!scanner.hasPrecedingLineBreak()) {
+                switch (token()) {
+                    case 52 /* ExclamationToken */:
+                        type = createPostfixType(287 /* JSDocNonNullableType */, type);
+                        break;
+                    case 56 /* QuestionToken */:
+                        // If not in JSDoc and next token is start of a type we have a conditional type
+                        if (!(contextFlags & 2097152 /* JSDoc */) && lookAhead(nextTokenIsStartOfType)) {
+                            return type;
+                        }
+                        type = createPostfixType(286 /* JSDocNullableType */, type);
+                        break;
+                    case 22 /* OpenBracketToken */:
+                        parseExpected(22 /* OpenBracketToken */);
+                        if (isStartOfType()) {
+                            var node = createNode(180 /* IndexedAccessType */, type.pos);
+                            node.objectType = type;
+                            node.indexType = parseType();
+                            parseExpected(23 /* CloseBracketToken */);
+                            type = finishNode(node);
+                        }
+                        else {
+                            var node = createNode(169 /* ArrayType */, type.pos);
+                            node.elementType = type;
+                            parseExpected(23 /* CloseBracketToken */);
+                            type = finishNode(node);
+                        }
+                        break;
+                    default:
+                        return type;
+                }
+            }
+            return type;
+        }
+        function createPostfixType(kind, type) {
+            nextToken();
+            var postfix = createNode(kind, type.pos);
+            postfix.type = type;
+            return finishNode(postfix);
+        }
+        function parseTypeOperator(operator) {
+            var node = createNode(179 /* TypeOperator */);
+            parseExpected(operator);
+            node.operator = operator;
+            node.type = parseTypeOperatorOrHigher();
+            return finishNode(node);
+        }
+        function parseInferType() {
+            var node = createNode(176 /* InferType */);
+            parseExpected(127 /* InferKeyword */);
+            var typeParameter = createNode(150 /* TypeParameter */);
+            typeParameter.name = parseIdentifier();
+            node.typeParameter = finishNode(typeParameter);
+            return finishNode(node);
+        }
+        function parseTypeOperatorOrHigher() {
+            var operator = token();
+            switch (operator) {
+                case 129 /* KeyOfKeyword */:
+                case 142 /* UniqueKeyword */:
+                    return parseTypeOperator(operator);
+                case 127 /* InferKeyword */:
+                    return parseInferType();
+            }
+            return parsePostfixTypeOrHigher();
+        }
+        function parseUnionOrIntersectionType(kind, parseConstituentType, operator) {
+            parseOptional(operator);
+            var type = parseConstituentType();
+            if (token() === operator) {
+                var types = [type];
+                while (parseOptional(operator)) {
+                    types.push(parseConstituentType());
+                }
+                var node = createNode(kind, type.pos);
+                node.types = createNodeArray(types, type.pos);
+                type = finishNode(node);
+            }
+            return type;
+        }
+        function parseIntersectionTypeOrHigher() {
+            return parseUnionOrIntersectionType(174 /* IntersectionType */, parseTypeOperatorOrHigher, 49 /* AmpersandToken */);
+        }
+        function parseUnionTypeOrHigher() {
+            return parseUnionOrIntersectionType(173 /* UnionType */, parseIntersectionTypeOrHigher, 50 /* BarToken */);
+        }
+        function isStartOfFunctionType() {
+            if (token() === 28 /* LessThanToken */) {
+                return true;
+            }
+            return token() === 20 /* OpenParenToken */ && lookAhead(isUnambiguouslyStartOfFunctionType);
+        }
+        function skipParameterStart() {
+            if (ts.isModifierKind(token())) {
+                // Skip modifiers
+                parseModifiers();
+            }
+            if (isIdentifier() || token() === 100 /* ThisKeyword */) {
+                nextToken();
+                return true;
+            }
+            if (token() === 22 /* OpenBracketToken */ || token() === 18 /* OpenBraceToken */) {
+                // Return true if we can parse an array or object binding pattern with no errors
+                var previousErrorCount = parseDiagnostics.length;
+                parseIdentifierOrPattern();
+                return previousErrorCount === parseDiagnostics.length;
+            }
+            return false;
+        }
+        function isUnambiguouslyStartOfFunctionType() {
+            nextToken();
+            if (token() === 21 /* CloseParenToken */ || token() === 25 /* DotDotDotToken */) {
+                // ( )
+                // ( ...
+                return true;
+            }
+            if (skipParameterStart()) {
+                // We successfully skipped modifiers (if any) and an identifier or binding pattern,
+                // now see if we have something that indicates a parameter declaration
+                if (token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ ||
+                    token() === 56 /* QuestionToken */ || token() === 59 /* EqualsToken */) {
+                    // ( xxx :
+                    // ( xxx ,
+                    // ( xxx ?
+                    // ( xxx =
+                    return true;
+                }
+                if (token() === 21 /* CloseParenToken */) {
+                    nextToken();
+                    if (token() === 37 /* EqualsGreaterThanToken */) {
+                        // ( xxx ) =>
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        function parseTypeOrTypePredicate() {
+            var typePredicateVariable = isIdentifier() && tryParse(parseTypePredicatePrefix);
+            var type = parseType();
+            if (typePredicateVariable) {
+                var node = createNode(163 /* TypePredicate */, typePredicateVariable.pos);
+                node.parameterName = typePredicateVariable;
+                node.type = type;
+                return finishNode(node);
+            }
+            else {
+                return type;
+            }
+        }
+        function parseTypePredicatePrefix() {
+            var id = parseIdentifier();
+            if (token() === 128 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
+                nextToken();
+                return id;
+            }
+        }
+        function parseType() {
+            // The rules about 'yield' only apply to actual code/expression contexts.  They don't
+            // apply to 'type' contexts.  So we disable these parameters here before moving on.
+            return doOutsideOfContext(20480 /* TypeExcludesFlags */, parseTypeWorker);
+        }
+        function parseTypeWorker(noConditionalTypes) {
+            if (isStartOfFunctionType() || token() === 95 /* NewKeyword */) {
+                return parseFunctionOrConstructorType();
+            }
+            var type = parseUnionTypeOrHigher();
+            if (!noConditionalTypes && !scanner.hasPrecedingLineBreak() && parseOptional(86 /* ExtendsKeyword */)) {
+                var node = createNode(175 /* ConditionalType */, type.pos);
+                node.checkType = type;
+                // The type following 'extends' is not permitted to be another conditional type
+                node.extendsType = parseTypeWorker(/*noConditionalTypes*/ true);
+                parseExpected(56 /* QuestionToken */);
+                node.trueType = parseTypeWorker();
+                parseExpected(57 /* ColonToken */);
+                node.falseType = parseTypeWorker();
+                return finishNode(node);
+            }
+            return type;
+        }
+        function parseTypeAnnotation() {
+            return parseOptional(57 /* ColonToken */) ? parseType() : undefined;
+        }
+        // EXPRESSIONS
+        function isStartOfLeftHandSideExpression() {
+            switch (token()) {
+                case 100 /* ThisKeyword */:
+                case 98 /* SuperKeyword */:
+                case 96 /* NullKeyword */:
+                case 102 /* TrueKeyword */:
+                case 87 /* FalseKeyword */:
+                case 8 /* NumericLiteral */:
+                case 9 /* BigIntLiteral */:
+                case 10 /* StringLiteral */:
+                case 14 /* NoSubstitutionTemplateLiteral */:
+                case 15 /* TemplateHead */:
+                case 20 /* OpenParenToken */:
+                case 22 /* OpenBracketToken */:
+                case 18 /* OpenBraceToken */:
+                case 90 /* FunctionKeyword */:
+                case 76 /* ClassKeyword */:
+                case 95 /* NewKeyword */:
+                case 42 /* SlashToken */:
+                case 64 /* SlashEqualsToken */:
+                case 72 /* Identifier */:
+                    return true;
+                case 92 /* ImportKeyword */:
+                    return lookAhead(nextTokenIsOpenParenOrLessThanOrDot);
+                default:
+                    return isIdentifier();
+            }
+        }
+        function isStartOfExpression() {
+            if (isStartOfLeftHandSideExpression()) {
+                return true;
+            }
+            switch (token()) {
+                case 38 /* PlusToken */:
+                case 39 /* MinusToken */:
+                case 53 /* TildeToken */:
+                case 52 /* ExclamationToken */:
+                case 81 /* DeleteKeyword */:
+                case 104 /* TypeOfKeyword */:
+                case 106 /* VoidKeyword */:
+                case 44 /* PlusPlusToken */:
+                case 45 /* MinusMinusToken */:
+                case 28 /* LessThanToken */:
+                case 122 /* AwaitKeyword */:
+                case 117 /* YieldKeyword */:
+                    // Yield/await always starts an expression.  Either it is an identifier (in which case
+                    // it is definitely an expression).  Or it's a keyword (either because we're in
+                    // a generator or async function, or in strict mode (or both)) and it started a yield or await expression.
+                    return true;
+                default:
+                    // Error tolerance.  If we see the start of some binary operator, we consider
+                    // that the start of an expression.  That way we'll parse out a missing identifier,
+                    // give a good message about an identifier being missing, and then consume the
+                    // rest of the binary expression.
+                    if (isBinaryOperator()) {
+                        return true;
+                    }
+                    return isIdentifier();
+            }
+        }
+        function isStartOfExpressionStatement() {
+            // As per the grammar, none of '{' or 'function' or 'class' can start an expression statement.
+            return token() !== 18 /* OpenBraceToken */ &&
+                token() !== 90 /* FunctionKeyword */ &&
+                token() !== 76 /* ClassKeyword */ &&
+                token() !== 58 /* AtToken */ &&
+                isStartOfExpression();
+        }
+        function parseExpression() {
+            // Expression[in]:
+            //      AssignmentExpression[in]
+            //      Expression[in] , AssignmentExpression[in]
+            // clear the decorator context when parsing Expression, as it should be unambiguous when parsing a decorator
+            var saveDecoratorContext = inDecoratorContext();
+            if (saveDecoratorContext) {
+                setDecoratorContext(/*val*/ false);
+            }
+            var expr = parseAssignmentExpressionOrHigher();
+            var operatorToken;
+            while ((operatorToken = parseOptionalToken(27 /* CommaToken */))) {
+                expr = makeBinaryExpression(expr, operatorToken, parseAssignmentExpressionOrHigher());
+            }
+            if (saveDecoratorContext) {
+                setDecoratorContext(/*val*/ true);
+            }
+            return expr;
+        }
+        function parseInitializer() {
+            return parseOptional(59 /* EqualsToken */) ? parseAssignmentExpressionOrHigher() : undefined;
+        }
+        function parseAssignmentExpressionOrHigher() {
+            //  AssignmentExpression[in,yield]:
+            //      1) ConditionalExpression[?in,?yield]
+            //      2) LeftHandSideExpression = AssignmentExpression[?in,?yield]
+            //      3) LeftHandSideExpression AssignmentOperator AssignmentExpression[?in,?yield]
+            //      4) ArrowFunctionExpression[?in,?yield]
+            //      5) AsyncArrowFunctionExpression[in,yield,await]
+            //      6) [+Yield] YieldExpression[?In]
+            //
+            // Note: for ease of implementation we treat productions '2' and '3' as the same thing.
+            // (i.e. they're both BinaryExpressions with an assignment operator in it).
+            // First, do the simple check if we have a YieldExpression (production '6').
+            if (isYieldExpression()) {
+                return parseYieldExpression();
+            }
+            // Then, check if we have an arrow function (production '4' and '5') that starts with a parenthesized
+            // parameter list or is an async arrow function.
+            // AsyncArrowFunctionExpression:
+            //      1) async[no LineTerminator here]AsyncArrowBindingIdentifier[?Yield][no LineTerminator here]=>AsyncConciseBody[?In]
+            //      2) CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await][no LineTerminator here]=>AsyncConciseBody[?In]
+            // Production (1) of AsyncArrowFunctionExpression is parsed in "tryParseAsyncSimpleArrowFunctionExpression".
+            // And production (2) is parsed in "tryParseParenthesizedArrowFunctionExpression".
+            //
+            // If we do successfully parse arrow-function, we must *not* recurse for productions 1, 2 or 3. An ArrowFunction is
+            // not a LeftHandSideExpression, nor does it start a ConditionalExpression.  So we are done
+            // with AssignmentExpression if we see one.
+            var arrowExpression = tryParseParenthesizedArrowFunctionExpression() || tryParseAsyncSimpleArrowFunctionExpression();
+            if (arrowExpression) {
+                return arrowExpression;
+            }
+            // Now try to see if we're in production '1', '2' or '3'.  A conditional expression can
+            // start with a LogicalOrExpression, while the assignment productions can only start with
+            // LeftHandSideExpressions.
+            //
+            // So, first, we try to just parse out a BinaryExpression.  If we get something that is a
+            // LeftHandSide or higher, then we can try to parse out the assignment expression part.
+            // Otherwise, we try to parse out the conditional expression bit.  We want to allow any
+            // binary expression here, so we pass in the 'lowest' precedence here so that it matches
+            // and consumes anything.
+            var expr = parseBinaryExpressionOrHigher(/*precedence*/ 0);
+            // To avoid a look-ahead, we did not handle the case of an arrow function with a single un-parenthesized
+            // parameter ('x => ...') above. We handle it here by checking if the parsed expression was a single
+            // identifier and the current token is an arrow.
+            if (expr.kind === 72 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
+                return parseSimpleArrowFunctionExpression(expr);
+            }
+            // Now see if we might be in cases '2' or '3'.
+            // If the expression was a LHS expression, and we have an assignment operator, then
+            // we're in '2' or '3'. Consume the assignment and return.
+            //
+            // Note: we call reScanGreaterToken so that we get an appropriately merged token
+            // for cases like `> > =` becoming `>>=`
+            if (ts.isLeftHandSideExpression(expr) && ts.isAssignmentOperator(reScanGreaterToken())) {
+                return makeBinaryExpression(expr, parseTokenNode(), parseAssignmentExpressionOrHigher());
+            }
+            // It wasn't an assignment or a lambda.  This is a conditional expression:
+            return parseConditionalExpressionRest(expr);
+        }
+        function isYieldExpression() {
+            if (token() === 117 /* YieldKeyword */) {
+                // If we have a 'yield' keyword, and this is a context where yield expressions are
+                // allowed, then definitely parse out a yield expression.
+                if (inYieldContext()) {
+                    return true;
+                }
+                // We're in a context where 'yield expr' is not allowed.  However, if we can
+                // definitely tell that the user was trying to parse a 'yield expr' and not
+                // just a normal expr that start with a 'yield' identifier, then parse out
+                // a 'yield expr'.  We can then report an error later that they are only
+                // allowed in generator expressions.
+                //
+                // for example, if we see 'yield(foo)', then we'll have to treat that as an
+                // invocation expression of something called 'yield'.  However, if we have
+                // 'yield foo' then that is not legal as a normal expression, so we can
+                // definitely recognize this as a yield expression.
+                //
+                // for now we just check if the next token is an identifier.  More heuristics
+                // can be added here later as necessary.  We just need to make sure that we
+                // don't accidentally consume something legal.
+                return lookAhead(nextTokenIsIdentifierOrKeywordOrLiteralOnSameLine);
+            }
+            return false;
+        }
+        function nextTokenIsIdentifierOnSameLine() {
+            nextToken();
+            return !scanner.hasPrecedingLineBreak() && isIdentifier();
+        }
+        function parseYieldExpression() {
+            var node = createNode(207 /* YieldExpression */);
+            // YieldExpression[In] :
+            //      yield
+            //      yield [no LineTerminator here] [Lexical goal InputElementRegExp]AssignmentExpression[?In, Yield]
+            //      yield [no LineTerminator here] * [Lexical goal InputElementRegExp]AssignmentExpression[?In, Yield]
+            nextToken();
+            if (!scanner.hasPrecedingLineBreak() &&
+                (token() === 40 /* AsteriskToken */ || isStartOfExpression())) {
+                node.asteriskToken = parseOptionalToken(40 /* AsteriskToken */);
+                node.expression = parseAssignmentExpressionOrHigher();
+                return finishNode(node);
+            }
+            else {
+                // if the next token is not on the same line as yield.  or we don't have an '*' or
+                // the start of an expression, then this is just a simple "yield" expression.
+                return finishNode(node);
+            }
+        }
+        function parseSimpleArrowFunctionExpression(identifier, asyncModifier) {
+            ts.Debug.assert(token() === 37 /* EqualsGreaterThanToken */, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
+            var node;
+            if (asyncModifier) {
+                node = createNode(197 /* ArrowFunction */, asyncModifier.pos);
+                node.modifiers = asyncModifier;
+            }
+            else {
+                node = createNode(197 /* ArrowFunction */, identifier.pos);
+            }
+            var parameter = createNode(151 /* Parameter */, identifier.pos);
+            parameter.name = identifier;
+            finishNode(parameter);
+            node.parameters = createNodeArray([parameter], parameter.pos, parameter.end);
+            node.equalsGreaterThanToken = parseExpectedToken(37 /* EqualsGreaterThanToken */);
+            node.body = parseArrowFunctionExpressionBody(/*isAsync*/ !!asyncModifier);
+            return addJSDocComment(finishNode(node));
+        }
+        function tryParseParenthesizedArrowFunctionExpression() {
+            var triState = isParenthesizedArrowFunctionExpression();
+            if (triState === 0 /* False */) {
+                // It's definitely not a parenthesized arrow function expression.
+                return undefined;
+            }
+            // If we definitely have an arrow function, then we can just parse one, not requiring a
+            // following => or { token. Otherwise, we *might* have an arrow function.  Try to parse
+            // it out, but don't allow any ambiguity, and return 'undefined' if this could be an
+            // expression instead.
+            var arrowFunction = triState === 1 /* True */
+                ? parseParenthesizedArrowFunctionExpressionHead(/*allowAmbiguity*/ true)
+                : tryParse(parsePossibleParenthesizedArrowFunctionExpressionHead);
+            if (!arrowFunction) {
+                // Didn't appear to actually be a parenthesized arrow function.  Just bail out.
+                return undefined;
+            }
+            var isAsync = ts.hasModifier(arrowFunction, 256 /* Async */);
+            // If we have an arrow, then try to parse the body. Even if not, try to parse if we
+            // have an opening brace, just in case we're in an error state.
+            var lastToken = token();
+            arrowFunction.equalsGreaterThanToken = parseExpectedToken(37 /* EqualsGreaterThanToken */);
+            arrowFunction.body = (lastToken === 37 /* EqualsGreaterThanToken */ || lastToken === 18 /* OpenBraceToken */)
+                ? parseArrowFunctionExpressionBody(isAsync)
+                : parseIdentifier();
+            return finishNode(arrowFunction);
+        }
+        //  True        -> We definitely expect a parenthesized arrow function here.
+        //  False       -> There *cannot* be a parenthesized arrow function here.
+        //  Unknown     -> There *might* be a parenthesized arrow function here.
+        //                 Speculatively look ahead to be sure, and rollback if not.
+        function isParenthesizedArrowFunctionExpression() {
+            if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */ || token() === 121 /* AsyncKeyword */) {
+                return lookAhead(isParenthesizedArrowFunctionExpressionWorker);
+            }
+            if (token() === 37 /* EqualsGreaterThanToken */) {
+                // ERROR RECOVERY TWEAK:
+                // If we see a standalone => try to parse it as an arrow function expression as that's
+                // likely what the user intended to write.
+                return 1 /* True */;
+            }
+            // Definitely not a parenthesized arrow function.
+            return 0 /* False */;
+        }
+        function isParenthesizedArrowFunctionExpressionWorker() {
+            if (token() === 121 /* AsyncKeyword */) {
+                nextToken();
+                if (scanner.hasPrecedingLineBreak()) {
+                    return 0 /* False */;
+                }
+                if (token() !== 20 /* OpenParenToken */ && token() !== 28 /* LessThanToken */) {
+                    return 0 /* False */;
+                }
+            }
+            var first = token();
+            var second = nextToken();
+            if (first === 20 /* OpenParenToken */) {
+                if (second === 21 /* CloseParenToken */) {
+                    // Simple cases: "() =>", "(): ", and "() {".
+                    // This is an arrow function with no parameters.
+                    // The last one is not actually an arrow function,
+                    // but this is probably what the user intended.
+                    var third = nextToken();
+                    switch (third) {
+                        case 37 /* EqualsGreaterThanToken */:
+                        case 57 /* ColonToken */:
+                        case 18 /* OpenBraceToken */:
+                            return 1 /* True */;
+                        default:
+                            return 0 /* False */;
+                    }
+                }
+                // If encounter "([" or "({", this could be the start of a binding pattern.
+                // Examples:
+                //      ([ x ]) => { }
+                //      ({ x }) => { }
+                //      ([ x ])
+                //      ({ x })
+                if (second === 22 /* OpenBracketToken */ || second === 18 /* OpenBraceToken */) {
+                    return 2 /* Unknown */;
+                }
+                // Simple case: "(..."
+                // This is an arrow function with a rest parameter.
+                if (second === 25 /* DotDotDotToken */) {
+                    return 1 /* True */;
+                }
+                // Check for "(xxx yyy", where xxx is a modifier and yyy is an identifier. This
+                // isn't actually allowed, but we want to treat it as a lambda so we can provide
+                // a good error message.
+                if (ts.isModifierKind(second) && second !== 121 /* AsyncKeyword */ && lookAhead(nextTokenIsIdentifier)) {
+                    return 1 /* True */;
+                }
+                // If we had "(" followed by something that's not an identifier,
+                // then this definitely doesn't look like a lambda.  "this" is not
+                // valid, but we want to parse it and then give a semantic error.
+                if (!isIdentifier() && second !== 100 /* ThisKeyword */) {
+                    return 0 /* False */;
+                }
+                switch (nextToken()) {
+                    case 57 /* ColonToken */:
+                        // If we have something like "(a:", then we must have a
+                        // type-annotated parameter in an arrow function expression.
+                        return 1 /* True */;
+                    case 56 /* QuestionToken */:
+                        nextToken();
+                        // If we have "(a?:" or "(a?," or "(a?=" or "(a?)" then it is definitely a lambda.
+                        if (token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 59 /* EqualsToken */ || token() === 21 /* CloseParenToken */) {
+                            return 1 /* True */;
+                        }
+                        // Otherwise it is definitely not a lambda.
+                        return 0 /* False */;
+                    case 27 /* CommaToken */:
+                    case 59 /* EqualsToken */:
+                    case 21 /* CloseParenToken */:
+                        // If we have "(a," or "(a=" or "(a)" this *could* be an arrow function
+                        return 2 /* Unknown */;
+                }
+                // It is definitely not an arrow function
+                return 0 /* False */;
+            }
+            else {
+                ts.Debug.assert(first === 28 /* LessThanToken */);
+                // If we have "<" not followed by an identifier,
+                // then this definitely is not an arrow function.
+                if (!isIdentifier()) {
+                    return 0 /* False */;
+                }
+                // JSX overrides
+                if (sourceFile.languageVariant === 1 /* JSX */) {
+                    var isArrowFunctionInJsx = lookAhead(function () {
+                        var third = nextToken();
+                        if (third === 86 /* ExtendsKeyword */) {
+                            var fourth = nextToken();
+                            switch (fourth) {
+                                case 59 /* EqualsToken */:
+                                case 30 /* GreaterThanToken */:
+                                    return false;
+                                default:
+                                    return true;
+                            }
+                        }
+                        else if (third === 27 /* CommaToken */) {
+                            return true;
+                        }
+                        return false;
+                    });
+                    if (isArrowFunctionInJsx) {
+                        return 1 /* True */;
+                    }
+                    return 0 /* False */;
+                }
+                // This *could* be a parenthesized arrow function.
+                return 2 /* Unknown */;
+            }
+        }
+        function parsePossibleParenthesizedArrowFunctionExpressionHead() {
+            return parseParenthesizedArrowFunctionExpressionHead(/*allowAmbiguity*/ false);
+        }
+        function tryParseAsyncSimpleArrowFunctionExpression() {
+            // We do a check here so that we won't be doing unnecessarily call to "lookAhead"
+            if (token() === 121 /* AsyncKeyword */) {
+                if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1 /* True */) {
+                    var asyncModifier = parseModifiersForArrowFunction();
+                    var expr = parseBinaryExpressionOrHigher(/*precedence*/ 0);
+                    return parseSimpleArrowFunctionExpression(expr, asyncModifier);
+                }
+            }
+            return undefined;
+        }
+        function isUnParenthesizedAsyncArrowFunctionWorker() {
+            // AsyncArrowFunctionExpression:
+            //      1) async[no LineTerminator here]AsyncArrowBindingIdentifier[?Yield][no LineTerminator here]=>AsyncConciseBody[?In]
+            //      2) CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await][no LineTerminator here]=>AsyncConciseBody[?In]
+            if (token() === 121 /* AsyncKeyword */) {
+                nextToken();
+                // If the "async" is followed by "=>" token then it is not a beginning of an async arrow-function
+                // but instead a simple arrow-function which will be parsed inside "parseAssignmentExpressionOrHigher"
+                if (scanner.hasPrecedingLineBreak() || token() === 37 /* EqualsGreaterThanToken */) {
+                    return 0 /* False */;
+                }
+                // Check for un-parenthesized AsyncArrowFunction
+                var expr = parseBinaryExpressionOrHigher(/*precedence*/ 0);
+                if (!scanner.hasPrecedingLineBreak() && expr.kind === 72 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
+                    return 1 /* True */;
+                }
+            }
+            return 0 /* False */;
+        }
+        function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) {
+            var node = createNodeWithJSDoc(197 /* ArrowFunction */);
+            node.modifiers = parseModifiersForArrowFunction();
+            var isAsync = ts.hasModifier(node, 256 /* Async */) ? 2 /* Await */ : 0 /* None */;
+            // Arrow functions are never generators.
+            //
+            // If we're speculatively parsing a signature for a parenthesized arrow function, then
+            // we have to have a complete parameter list.  Otherwise we might see something like
+            // a => (b => c)
+            // And think that "(b =>" was actually a parenthesized arrow function with a missing
+            // close paren.
+            if (!fillSignature(57 /* ColonToken */, isAsync, node) && !allowAmbiguity) {
+                return undefined;
+            }
+            // Parsing a signature isn't enough.
+            // Parenthesized arrow signatures often look like other valid expressions.
+            // For instance:
+            //  - "(x = 10)" is an assignment expression parsed as a signature with a default parameter value.
+            //  - "(x,y)" is a comma expression parsed as a signature with two parameters.
+            //  - "a ? (b): c" will have "(b):" parsed as a signature with a return type annotation.
+            //
+            // So we need just a bit of lookahead to ensure that it can only be a signature.
+            if (!allowAmbiguity && token() !== 37 /* EqualsGreaterThanToken */ && token() !== 18 /* OpenBraceToken */) {
+                // Returning undefined here will cause our caller to rewind to where we started from.
+                return undefined;
+            }
+            return node;
+        }
+        function parseArrowFunctionExpressionBody(isAsync) {
+            if (token() === 18 /* OpenBraceToken */) {
+                return parseFunctionBlock(isAsync ? 2 /* Await */ : 0 /* None */);
+            }
+            if (token() !== 26 /* SemicolonToken */ &&
+                token() !== 90 /* FunctionKeyword */ &&
+                token() !== 76 /* ClassKeyword */ &&
+                isStartOfStatement() &&
+                !isStartOfExpressionStatement()) {
+                // Check if we got a plain statement (i.e. no expression-statements, no function/class expressions/declarations)
+                //
+                // Here we try to recover from a potential error situation in the case where the
+                // user meant to supply a block. For example, if the user wrote:
+                //
+                //  a =>
+                //      let v = 0;
+                //  }
+                //
+                // they may be missing an open brace.  Check to see if that's the case so we can
+                // try to recover better.  If we don't do this, then the next close curly we see may end
+                // up preemptively closing the containing construct.
+                //
+                // Note: even when 'IgnoreMissingOpenBrace' is passed, parseBody will still error.
+                return parseFunctionBlock(16 /* IgnoreMissingOpenBrace */ | (isAsync ? 2 /* Await */ : 0 /* None */));
+            }
+            return isAsync
+                ? doInAwaitContext(parseAssignmentExpressionOrHigher)
+                : doOutsideOfAwaitContext(parseAssignmentExpressionOrHigher);
+        }
+        function parseConditionalExpressionRest(leftOperand) {
+            // Note: we are passed in an expression which was produced from parseBinaryExpressionOrHigher.
+            var questionToken = parseOptionalToken(56 /* QuestionToken */);
+            if (!questionToken) {
+                return leftOperand;
+            }
+            // Note: we explicitly 'allowIn' in the whenTrue part of the condition expression, and
+            // we do not that for the 'whenFalse' part.
+            var node = createNode(205 /* ConditionalExpression */, leftOperand.pos);
+            node.condition = leftOperand;
+            node.questionToken = questionToken;
+            node.whenTrue = doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher);
+            node.colonToken = parseExpectedToken(57 /* ColonToken */);
+            node.whenFalse = ts.nodeIsPresent(node.colonToken)
+                ? parseAssignmentExpressionOrHigher()
+                : createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(57 /* ColonToken */));
+            return finishNode(node);
+        }
+        function parseBinaryExpressionOrHigher(precedence) {
+            var leftOperand = parseUnaryExpressionOrHigher();
+            return parseBinaryExpressionRest(precedence, leftOperand);
+        }
+        function isInOrOfKeyword(t) {
+            return t === 93 /* InKeyword */ || t === 147 /* OfKeyword */;
+        }
+        function parseBinaryExpressionRest(precedence, leftOperand) {
+            while (true) {
+                // We either have a binary operator here, or we're finished.  We call
+                // reScanGreaterToken so that we merge token sequences like > and = into >=
+                reScanGreaterToken();
+                var newPrecedence = ts.getBinaryOperatorPrecedence(token());
+                // Check the precedence to see if we should "take" this operator
+                // - For left associative operator (all operator but **), consume the operator,
+                //   recursively call the function below, and parse binaryExpression as a rightOperand
+                //   of the caller if the new precedence of the operator is greater then or equal to the current precedence.
+                //   For example:
+                //      a - b - c;
+                //            ^token; leftOperand = b. Return b to the caller as a rightOperand
+                //      a * b - c
+                //            ^token; leftOperand = b. Return b to the caller as a rightOperand
+                //      a - b * c;
+                //            ^token; leftOperand = b. Return b * c to the caller as a rightOperand
+                // - For right associative operator (**), consume the operator, recursively call the function
+                //   and parse binaryExpression as a rightOperand of the caller if the new precedence of
+                //   the operator is strictly grater than the current precedence
+                //   For example:
+                //      a ** b ** c;
+                //             ^^token; leftOperand = b. Return b ** c to the caller as a rightOperand
+                //      a - b ** c;
+                //            ^^token; leftOperand = b. Return b ** c to the caller as a rightOperand
+                //      a ** b - c
+                //             ^token; leftOperand = b. Return b to the caller as a rightOperand
+                var consumeCurrentOperator = token() === 41 /* AsteriskAsteriskToken */ ?
+                    newPrecedence >= precedence :
+                    newPrecedence > precedence;
+                if (!consumeCurrentOperator) {
+                    break;
+                }
+                if (token() === 93 /* InKeyword */ && inDisallowInContext()) {
+                    break;
+                }
+                if (token() === 119 /* AsKeyword */) {
+                    // Make sure we *do* perform ASI for constructs like this:
+                    //    var x = foo
+                    //    as (Bar)
+                    // This should be parsed as an initialized variable, followed
+                    // by a function call to 'as' with the argument 'Bar'
+                    if (scanner.hasPrecedingLineBreak()) {
+                        break;
+                    }
+                    else {
+                        nextToken();
+                        leftOperand = makeAsExpression(leftOperand, parseType());
+                    }
+                }
+                else {
+                    leftOperand = makeBinaryExpression(leftOperand, parseTokenNode(), parseBinaryExpressionOrHigher(newPrecedence));
+                }
+            }
+            return leftOperand;
+        }
+        function isBinaryOperator() {
+            if (inDisallowInContext() && token() === 93 /* InKeyword */) {
+                return false;
+            }
+            return ts.getBinaryOperatorPrecedence(token()) > 0;
+        }
+        function makeBinaryExpression(left, operatorToken, right) {
+            var node = createNode(204 /* BinaryExpression */, left.pos);
+            node.left = left;
+            node.operatorToken = operatorToken;
+            node.right = right;
+            return finishNode(node);
+        }
+        function makeAsExpression(left, right) {
+            var node = createNode(212 /* AsExpression */, left.pos);
+            node.expression = left;
+            node.type = right;
+            return finishNode(node);
+        }
+        function parsePrefixUnaryExpression() {
+            var node = createNode(202 /* PrefixUnaryExpression */);
+            node.operator = token();
+            nextToken();
+            node.operand = parseSimpleUnaryExpression();
+            return finishNode(node);
+        }
+        function parseDeleteExpression() {
+            var node = createNode(198 /* DeleteExpression */);
+            nextToken();
+            node.expression = parseSimpleUnaryExpression();
+            return finishNode(node);
+        }
+        function parseTypeOfExpression() {
+            var node = createNode(199 /* TypeOfExpression */);
+            nextToken();
+            node.expression = parseSimpleUnaryExpression();
+            return finishNode(node);
+        }
+        function parseVoidExpression() {
+            var node = createNode(200 /* VoidExpression */);
+            nextToken();
+            node.expression = parseSimpleUnaryExpression();
+            return finishNode(node);
+        }
+        function isAwaitExpression() {
+            if (token() === 122 /* AwaitKeyword */) {
+                if (inAwaitContext()) {
+                    return true;
+                }
+                // here we are using similar heuristics as 'isYieldExpression'
+                return lookAhead(nextTokenIsIdentifierOrKeywordOrLiteralOnSameLine);
+            }
+            return false;
+        }
+        function parseAwaitExpression() {
+            var node = createNode(201 /* AwaitExpression */);
+            nextToken();
+            node.expression = parseSimpleUnaryExpression();
+            return finishNode(node);
+        }
+        /**
+         * Parse ES7 exponential expression and await expression
+         *
+         * ES7 ExponentiationExpression:
+         *      1) UnaryExpression[?Yield]
+         *      2) UpdateExpression[?Yield] ** ExponentiationExpression[?Yield]
+         *
+         */
+        function parseUnaryExpressionOrHigher() {
+            /**
+             * ES7 UpdateExpression:
+             *      1) LeftHandSideExpression[?Yield]
+             *      2) LeftHandSideExpression[?Yield][no LineTerminator here]++
+             *      3) LeftHandSideExpression[?Yield][no LineTerminator here]--
+             *      4) ++UnaryExpression[?Yield]
+             *      5) --UnaryExpression[?Yield]
+             */
+            if (isUpdateExpression()) {
+                var updateExpression = parseUpdateExpression();
+                return token() === 41 /* AsteriskAsteriskToken */ ?
+                    parseBinaryExpressionRest(ts.getBinaryOperatorPrecedence(token()), updateExpression) :
+                    updateExpression;
+            }
+            /**
+             * ES7 UnaryExpression:
+             *      1) UpdateExpression[?yield]
+             *      2) delete UpdateExpression[?yield]
+             *      3) void UpdateExpression[?yield]
+             *      4) typeof UpdateExpression[?yield]
+             *      5) + UpdateExpression[?yield]
+             *      6) - UpdateExpression[?yield]
+             *      7) ~ UpdateExpression[?yield]
+             *      8) ! UpdateExpression[?yield]
+             */
+            var unaryOperator = token();
+            var simpleUnaryExpression = parseSimpleUnaryExpression();
+            if (token() === 41 /* AsteriskAsteriskToken */) {
+                var pos = ts.skipTrivia(sourceText, simpleUnaryExpression.pos);
+                var end = simpleUnaryExpression.end;
+                if (simpleUnaryExpression.kind === 194 /* TypeAssertionExpression */) {
+                    parseErrorAt(pos, end, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses);
+                }
+                else {
+                    parseErrorAt(pos, end, ts.Diagnostics.An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses, ts.tokenToString(unaryOperator));
+                }
+            }
+            return simpleUnaryExpression;
+        }
+        /**
+         * Parse ES7 simple-unary expression or higher:
+         *
+         * ES7 UnaryExpression:
+         *      1) UpdateExpression[?yield]
+         *      2) delete UnaryExpression[?yield]
+         *      3) void UnaryExpression[?yield]
+         *      4) typeof UnaryExpression[?yield]
+         *      5) + UnaryExpression[?yield]
+         *      6) - UnaryExpression[?yield]
+         *      7) ~ UnaryExpression[?yield]
+         *      8) ! UnaryExpression[?yield]
+         *      9) [+Await] await UnaryExpression[?yield]
+         */
+        function parseSimpleUnaryExpression() {
+            switch (token()) {
+                case 38 /* PlusToken */:
+                case 39 /* MinusToken */:
+                case 53 /* TildeToken */:
+                case 52 /* ExclamationToken */:
+                    return parsePrefixUnaryExpression();
+                case 81 /* DeleteKeyword */:
+                    return parseDeleteExpression();
+                case 104 /* TypeOfKeyword */:
+                    return parseTypeOfExpression();
+                case 106 /* VoidKeyword */:
+                    return parseVoidExpression();
+                case 28 /* LessThanToken */:
+                    // This is modified UnaryExpression grammar in TypeScript
+                    //  UnaryExpression (modified):
+                    //      < type > UnaryExpression
+                    return parseTypeAssertion();
+                case 122 /* AwaitKeyword */:
+                    if (isAwaitExpression()) {
+                        return parseAwaitExpression();
+                    }
+                // falls through
+                default:
+                    return parseUpdateExpression();
+            }
+        }
+        /**
+         * Check if the current token can possibly be an ES7 increment expression.
+         *
+         * ES7 UpdateExpression:
+         *      LeftHandSideExpression[?Yield]
+         *      LeftHandSideExpression[?Yield][no LineTerminator here]++
+         *      LeftHandSideExpression[?Yield][no LineTerminator here]--
+         *      ++LeftHandSideExpression[?Yield]
+         *      --LeftHandSideExpression[?Yield]
+         */
+        function isUpdateExpression() {
+            // This function is called inside parseUnaryExpression to decide
+            // whether to call parseSimpleUnaryExpression or call parseUpdateExpression directly
+            switch (token()) {
+                case 38 /* PlusToken */:
+                case 39 /* MinusToken */:
+                case 53 /* TildeToken */:
+                case 52 /* ExclamationToken */:
+                case 81 /* DeleteKeyword */:
+                case 104 /* TypeOfKeyword */:
+                case 106 /* VoidKeyword */:
+                case 122 /* AwaitKeyword */:
+                    return false;
+                case 28 /* LessThanToken */:
+                    // If we are not in JSX context, we are parsing TypeAssertion which is an UnaryExpression
+                    if (sourceFile.languageVariant !== 1 /* JSX */) {
+                        return false;
+                    }
+                // We are in JSX context and the token is part of JSXElement.
+                // falls through
+                default:
+                    return true;
+            }
+        }
+        /**
+         * Parse ES7 UpdateExpression. UpdateExpression is used instead of ES6's PostFixExpression.
+         *
+         * ES7 UpdateExpression[yield]:
+         *      1) LeftHandSideExpression[?yield]
+         *      2) LeftHandSideExpression[?yield] [[no LineTerminator here]]++
+         *      3) LeftHandSideExpression[?yield] [[no LineTerminator here]]--
+         *      4) ++LeftHandSideExpression[?yield]
+         *      5) --LeftHandSideExpression[?yield]
+         * In TypeScript (2), (3) are parsed as PostfixUnaryExpression. (4), (5) are parsed as PrefixUnaryExpression
+         */
+        function parseUpdateExpression() {
+            if (token() === 44 /* PlusPlusToken */ || token() === 45 /* MinusMinusToken */) {
+                var node = createNode(202 /* PrefixUnaryExpression */);
+                node.operator = token();
+                nextToken();
+                node.operand = parseLeftHandSideExpressionOrHigher();
+                return finishNode(node);
+            }
+            else if (sourceFile.languageVariant === 1 /* JSX */ && token() === 28 /* LessThanToken */ && lookAhead(nextTokenIsIdentifierOrKeywordOrGreaterThan)) {
+                // JSXElement is part of primaryExpression
+                return parseJsxElementOrSelfClosingElementOrFragment(/*inExpressionContext*/ true);
+            }
+            var expression = parseLeftHandSideExpressionOrHigher();
+            ts.Debug.assert(ts.isLeftHandSideExpression(expression));
+            if ((token() === 44 /* PlusPlusToken */ || token() === 45 /* MinusMinusToken */) && !scanner.hasPrecedingLineBreak()) {
+                var node = createNode(203 /* PostfixUnaryExpression */, expression.pos);
+                node.operand = expression;
+                node.operator = token();
+                nextToken();
+                return finishNode(node);
+            }
+            return expression;
+        }
+        function parseLeftHandSideExpressionOrHigher() {
+            // Original Ecma:
+            // LeftHandSideExpression: See 11.2
+            //      NewExpression
+            //      CallExpression
+            //
+            // Our simplification:
+            //
+            // LeftHandSideExpression: See 11.2
+            //      MemberExpression
+            //      CallExpression
+            //
+            // See comment in parseMemberExpressionOrHigher on how we replaced NewExpression with
+            // MemberExpression to make our lives easier.
+            //
+            // to best understand the below code, it's important to see how CallExpression expands
+            // out into its own productions:
+            //
+            // CallExpression:
+            //      MemberExpression Arguments
+            //      CallExpression Arguments
+            //      CallExpression[Expression]
+            //      CallExpression.IdentifierName
+            //      import (AssignmentExpression)
+            //      super Arguments
+            //      super.IdentifierName
+            //
+            // Because of the recursion in these calls, we need to bottom out first. There are three
+            // bottom out states we can run into: 1) We see 'super' which must start either of
+            // the last two CallExpression productions. 2) We see 'import' which must start import call.
+            // 3)we have a MemberExpression which either completes the LeftHandSideExpression,
+            // or starts the beginning of the first four CallExpression productions.
+            var expression;
+            if (token() === 92 /* ImportKeyword */) {
+                if (lookAhead(nextTokenIsOpenParenOrLessThan)) {
+                    // We don't want to eagerly consume all import keyword as import call expression so we look ahead to find "("
+                    // For example:
+                    //      var foo3 = require("subfolder
+                    //      import * as foo1 from "module-from-node
+                    // We want this import to be a statement rather than import call expression
+                    sourceFile.flags |= 524288 /* PossiblyContainsDynamicImport */;
+                    expression = parseTokenNode();
+                }
+                else if (lookAhead(nextTokenIsDot)) {
+                    // This is an 'import.*' metaproperty (i.e. 'import.meta')
+                    var fullStart = scanner.getStartPos();
+                    nextToken(); // advance past the 'import'
+                    nextToken(); // advance past the dot
+                    var node = createNode(214 /* MetaProperty */, fullStart);
+                    node.keywordToken = 92 /* ImportKeyword */;
+                    node.name = parseIdentifierName();
+                    expression = finishNode(node);
+                    sourceFile.flags |= 1048576 /* PossiblyContainsImportMeta */;
+                }
+                else {
+                    expression = parseMemberExpressionOrHigher();
+                }
+            }
+            else {
+                expression = token() === 98 /* SuperKeyword */ ? parseSuperExpression() : parseMemberExpressionOrHigher();
+            }
+            // Now, we *may* be complete.  However, we might have consumed the start of a
+            // CallExpression.  As such, we need to consume the rest of it here to be complete.
+            return parseCallExpressionRest(expression);
+        }
+        function parseMemberExpressionOrHigher() {
+            // Note: to make our lives simpler, we decompose the NewExpression productions and
+            // place ObjectCreationExpression and FunctionExpression into PrimaryExpression.
+            // like so:
+            //
+            //   PrimaryExpression : See 11.1
+            //      this
+            //      Identifier
+            //      Literal
+            //      ArrayLiteral
+            //      ObjectLiteral
+            //      (Expression)
+            //      FunctionExpression
+            //      new MemberExpression Arguments?
+            //
+            //   MemberExpression : See 11.2
+            //      PrimaryExpression
+            //      MemberExpression[Expression]
+            //      MemberExpression.IdentifierName
+            //
+            //   CallExpression : See 11.2
+            //      MemberExpression
+            //      CallExpression Arguments
+            //      CallExpression[Expression]
+            //      CallExpression.IdentifierName
+            //
+            // Technically this is ambiguous.  i.e. CallExpression defines:
+            //
+            //   CallExpression:
+            //      CallExpression Arguments
+            //
+            // If you see: "new Foo()"
+            //
+            // Then that could be treated as a single ObjectCreationExpression, or it could be
+            // treated as the invocation of "new Foo".  We disambiguate that in code (to match
+            // the original grammar) by making sure that if we see an ObjectCreationExpression
+            // we always consume arguments if they are there. So we treat "new Foo()" as an
+            // object creation only, and not at all as an invocation.  Another way to think
+            // about this is that for every "new" that we see, we will consume an argument list if
+            // it is there as part of the *associated* object creation node.  Any additional
+            // argument lists we see, will become invocation expressions.
+            //
+            // Because there are no other places in the grammar now that refer to FunctionExpression
+            // or ObjectCreationExpression, it is safe to push down into the PrimaryExpression
+            // production.
+            //
+            // Because CallExpression and MemberExpression are left recursive, we need to bottom out
+            // of the recursion immediately.  So we parse out a primary expression to start with.
+            var expression = parsePrimaryExpression();
+            return parseMemberExpressionRest(expression);
+        }
+        function parseSuperExpression() {
+            var expression = parseTokenNode();
+            if (token() === 20 /* OpenParenToken */ || token() === 24 /* DotToken */ || token() === 22 /* OpenBracketToken */) {
+                return expression;
+            }
+            // If we have seen "super" it must be followed by '(' or '.'.
+            // If it wasn't then just try to parse out a '.' and report an error.
+            var node = createNode(189 /* PropertyAccessExpression */, expression.pos);
+            node.expression = expression;
+            parseExpectedToken(24 /* DotToken */, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access);
+            node.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
+            return finishNode(node);
+        }
+        function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext) {
+            var opening = parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext);
+            var result;
+            if (opening.kind === 262 /* JsxOpeningElement */) {
+                var node = createNode(260 /* JsxElement */, opening.pos);
+                node.openingElement = opening;
+                node.children = parseJsxChildren(node.openingElement);
+                node.closingElement = parseJsxClosingElement(inExpressionContext);
+                if (!tagNamesAreEquivalent(node.openingElement.tagName, node.closingElement.tagName)) {
+                    parseErrorAtRange(node.closingElement, ts.Diagnostics.Expected_corresponding_JSX_closing_tag_for_0, ts.getTextOfNodeFromSourceText(sourceText, node.openingElement.tagName));
+                }
+                result = finishNode(node);
+            }
+            else if (opening.kind === 265 /* JsxOpeningFragment */) {
+                var node = createNode(264 /* JsxFragment */, opening.pos);
+                node.openingFragment = opening;
+                node.children = parseJsxChildren(node.openingFragment);
+                node.closingFragment = parseJsxClosingFragment(inExpressionContext);
+                result = finishNode(node);
+            }
+            else {
+                ts.Debug.assert(opening.kind === 261 /* JsxSelfClosingElement */);
+                // Nothing else to do for self-closing elements
+                result = opening;
+            }
+            // If the user writes the invalid code '<div></div><div></div>' in an expression context (i.e. not wrapped in
+            // an enclosing tag), we'll naively try to parse   ^ this as a 'less than' operator and the remainder of the tag
+            // as garbage, which will cause the formatter to badly mangle the JSX. Perform a speculative parse of a JSX
+            // element if we see a < token so that we can wrap it in a synthetic binary expression so the formatter
+            // does less damage and we can report a better error.
+            // Since JSX elements are invalid < operands anyway, this lookahead parse will only occur in error scenarios
+            // of one sort or another.
+            if (inExpressionContext && token() === 28 /* LessThanToken */) {
+                var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElementOrFragment(/*inExpressionContext*/ true); });
+                if (invalidElement) {
+                    parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element);
+                    var badNode = createNode(204 /* BinaryExpression */, result.pos);
+                    badNode.end = invalidElement.end;
+                    badNode.left = result;
+                    badNode.right = invalidElement;
+                    badNode.operatorToken = createMissingNode(27 /* CommaToken */, /*reportAtCurrentPosition*/ false, /*diagnosticMessage*/ undefined); // TODO: GH#18217
+                    badNode.operatorToken.pos = badNode.operatorToken.end = badNode.right.pos;
+                    return badNode;
+                }
+            }
+            return result;
+        }
+        function parseJsxText() {
+            var node = createNode(11 /* JsxText */);
+            node.containsOnlyWhiteSpaces = currentToken === 12 /* JsxTextAllWhiteSpaces */;
+            currentToken = scanner.scanJsxToken();
+            return finishNode(node);
+        }
+        function parseJsxChild(openingTag, token) {
+            switch (token) {
+                case 1 /* EndOfFileToken */:
+                    // If we hit EOF, issue the error at the tag that lacks the closing element
+                    // rather than at the end of the file (which is useless)
+                    if (ts.isJsxOpeningFragment(openingTag)) {
+                        parseErrorAtRange(openingTag, ts.Diagnostics.JSX_fragment_has_no_corresponding_closing_tag);
+                    }
+                    else {
+                        parseErrorAtRange(openingTag.tagName, ts.Diagnostics.JSX_element_0_has_no_corresponding_closing_tag, ts.getTextOfNodeFromSourceText(sourceText, openingTag.tagName));
+                    }
+                    return undefined;
+                case 29 /* LessThanSlashToken */:
+                case 7 /* ConflictMarkerTrivia */:
+                    return undefined;
+                case 11 /* JsxText */:
+                case 12 /* JsxTextAllWhiteSpaces */:
+                    return parseJsxText();
+                case 18 /* OpenBraceToken */:
+                    return parseJsxExpression(/*inExpressionContext*/ false);
+                case 28 /* LessThanToken */:
+                    return parseJsxElementOrSelfClosingElementOrFragment(/*inExpressionContext*/ false);
+                default:
+                    return ts.Debug.assertNever(token);
+            }
+        }
+        function parseJsxChildren(openingTag) {
+            var list = [];
+            var listPos = getNodePos();
+            var saveParsingContext = parsingContext;
+            parsingContext |= 1 << 14 /* JsxChildren */;
+            while (true) {
+                var child = parseJsxChild(openingTag, currentToken = scanner.reScanJsxToken());
+                if (!child)
+                    break;
+                list.push(child);
+            }
+            parsingContext = saveParsingContext;
+            return createNodeArray(list, listPos);
+        }
+        function parseJsxAttributes() {
+            var jsxAttributes = createNode(268 /* JsxAttributes */);
+            jsxAttributes.properties = parseList(13 /* JsxAttributes */, parseJsxAttribute);
+            return finishNode(jsxAttributes);
+        }
+        function parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext) {
+            var fullStart = scanner.getStartPos();
+            parseExpected(28 /* LessThanToken */);
+            if (token() === 30 /* GreaterThanToken */) {
+                // See below for explanation of scanJsxText
+                var node_1 = createNode(265 /* JsxOpeningFragment */, fullStart);
+                scanJsxText();
+                return finishNode(node_1);
+            }
+            var tagName = parseJsxElementName();
+            var typeArguments = tryParseTypeArguments();
+            var attributes = parseJsxAttributes();
+            var node;
+            if (token() === 30 /* GreaterThanToken */) {
+                // Closing tag, so scan the immediately-following text with the JSX scanning instead
+                // of regular scanning to avoid treating illegal characters (e.g. '#') as immediate
+                // scanning errors
+                node = createNode(262 /* JsxOpeningElement */, fullStart);
+                scanJsxText();
+            }
+            else {
+                parseExpected(42 /* SlashToken */);
+                if (inExpressionContext) {
+                    parseExpected(30 /* GreaterThanToken */);
+                }
+                else {
+                    parseExpected(30 /* GreaterThanToken */, /*diagnostic*/ undefined, /*shouldAdvance*/ false);
+                    scanJsxText();
+                }
+                node = createNode(261 /* JsxSelfClosingElement */, fullStart);
+            }
+            node.tagName = tagName;
+            node.typeArguments = typeArguments;
+            node.attributes = attributes;
+            return finishNode(node);
+        }
+        function parseJsxElementName() {
+            scanJsxIdentifier();
+            // JsxElement can have name in the form of
+            //      propertyAccessExpression
+            //      primaryExpression in the form of an identifier and "this" keyword
+            // We can't just simply use parseLeftHandSideExpressionOrHigher because then we will start consider class,function etc as a keyword
+            // We only want to consider "this" as a primaryExpression
+            var expression = token() === 100 /* ThisKeyword */ ?
+                parseTokenNode() : parseIdentifierName();
+            while (parseOptional(24 /* DotToken */)) {
+                var propertyAccess = createNode(189 /* PropertyAccessExpression */, expression.pos);
+                propertyAccess.expression = expression;
+                propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
+                expression = finishNode(propertyAccess);
+            }
+            return expression;
+        }
+        function parseJsxExpression(inExpressionContext) {
+            var node = createNode(270 /* JsxExpression */);
+            if (!parseExpected(18 /* OpenBraceToken */)) {
+                return undefined;
+            }
+            if (token() !== 19 /* CloseBraceToken */) {
+                node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */);
+                node.expression = parseAssignmentExpressionOrHigher();
+            }
+            if (inExpressionContext) {
+                parseExpected(19 /* CloseBraceToken */);
+            }
+            else {
+                parseExpected(19 /* CloseBraceToken */, /*message*/ undefined, /*shouldAdvance*/ false);
+                scanJsxText();
+            }
+            return finishNode(node);
+        }
+        function parseJsxAttribute() {
+            if (token() === 18 /* OpenBraceToken */) {
+                return parseJsxSpreadAttribute();
+            }
+            scanJsxIdentifier();
+            var node = createNode(267 /* JsxAttribute */);
+            node.name = parseIdentifierName();
+            if (token() === 59 /* EqualsToken */) {
+                switch (scanJsxAttributeValue()) {
+                    case 10 /* StringLiteral */:
+                        node.initializer = parseLiteralNode();
+                        break;
+                    default:
+                        node.initializer = parseJsxExpression(/*inExpressionContext*/ true);
+                        break;
+                }
+            }
+            return finishNode(node);
+        }
+        function parseJsxSpreadAttribute() {
+            var node = createNode(269 /* JsxSpreadAttribute */);
+            parseExpected(18 /* OpenBraceToken */);
+            parseExpected(25 /* DotDotDotToken */);
+            node.expression = parseExpression();
+            parseExpected(19 /* CloseBraceToken */);
+            return finishNode(node);
+        }
+        function parseJsxClosingElement(inExpressionContext) {
+            var node = createNode(263 /* JsxClosingElement */);
+            parseExpected(29 /* LessThanSlashToken */);
+            node.tagName = parseJsxElementName();
+            if (inExpressionContext) {
+                parseExpected(30 /* GreaterThanToken */);
+            }
+            else {
+                parseExpected(30 /* GreaterThanToken */, /*diagnostic*/ undefined, /*shouldAdvance*/ false);
+                scanJsxText();
+            }
+            return finishNode(node);
+        }
+        function parseJsxClosingFragment(inExpressionContext) {
+            var node = createNode(266 /* JsxClosingFragment */);
+            parseExpected(29 /* LessThanSlashToken */);
+            if (ts.tokenIsIdentifierOrKeyword(token())) {
+                parseErrorAtRange(parseJsxElementName(), ts.Diagnostics.Expected_corresponding_closing_tag_for_JSX_fragment);
+            }
+            if (inExpressionContext) {
+                parseExpected(30 /* GreaterThanToken */);
+            }
+            else {
+                parseExpected(30 /* GreaterThanToken */, /*diagnostic*/ undefined, /*shouldAdvance*/ false);
+                scanJsxText();
+            }
+            return finishNode(node);
+        }
+        function parseTypeAssertion() {
+            var node = createNode(194 /* TypeAssertionExpression */);
+            parseExpected(28 /* LessThanToken */);
+            node.type = parseType();
+            parseExpected(30 /* GreaterThanToken */);
+            node.expression = parseSimpleUnaryExpression();
+            return finishNode(node);
+        }
+        function parseMemberExpressionRest(expression) {
+            while (true) {
+                var dotToken = parseOptionalToken(24 /* DotToken */);
+                if (dotToken) {
+                    var propertyAccess = createNode(189 /* PropertyAccessExpression */, expression.pos);
+                    propertyAccess.expression = expression;
+                    propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
+                    expression = finishNode(propertyAccess);
+                    continue;
+                }
+                if (token() === 52 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
+                    nextToken();
+                    var nonNullExpression = createNode(213 /* NonNullExpression */, expression.pos);
+                    nonNullExpression.expression = expression;
+                    expression = finishNode(nonNullExpression);
+                    continue;
+                }
+                // when in the [Decorator] context, we do not parse ElementAccess as it could be part of a ComputedPropertyName
+                if (!inDecoratorContext() && parseOptional(22 /* OpenBracketToken */)) {
+                    var indexedAccess = createNode(190 /* ElementAccessExpression */, expression.pos);
+                    indexedAccess.expression = expression;
+                    if (token() === 23 /* CloseBracketToken */) {
+                        indexedAccess.argumentExpression = createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.An_element_access_expression_should_take_an_argument);
+                    }
+                    else {
+                        var argument = allowInAnd(parseExpression);
+                        if (ts.isStringOrNumericLiteralLike(argument)) {
+                            argument.text = internIdentifier(argument.text);
+                        }
+                        indexedAccess.argumentExpression = argument;
+                    }
+                    parseExpected(23 /* CloseBracketToken */);
+                    expression = finishNode(indexedAccess);
+                    continue;
+                }
+                if (isTemplateStartOfTaggedTemplate()) {
+                    expression = parseTaggedTemplateRest(expression, /*typeArguments*/ undefined);
+                    continue;
+                }
+                return expression;
+            }
+        }
+        function isTemplateStartOfTaggedTemplate() {
+            return token() === 14 /* NoSubstitutionTemplateLiteral */ || token() === 15 /* TemplateHead */;
+        }
+        function parseTaggedTemplateRest(tag, typeArguments) {
+            var tagExpression = createNode(193 /* TaggedTemplateExpression */, tag.pos);
+            tagExpression.tag = tag;
+            tagExpression.typeArguments = typeArguments;
+            tagExpression.template = token() === 14 /* NoSubstitutionTemplateLiteral */
+                ? parseLiteralNode()
+                : parseTemplateExpression();
+            return finishNode(tagExpression);
+        }
+        function parseCallExpressionRest(expression) {
+            while (true) {
+                expression = parseMemberExpressionRest(expression);
+                // handle 'foo<<T>()'
+                if (token() === 28 /* LessThanToken */ || token() === 46 /* LessThanLessThanToken */) {
+                    // See if this is the start of a generic invocation.  If so, consume it and
+                    // keep checking for postfix expressions.  Otherwise, it's just a '<' that's
+                    // part of an arithmetic expression.  Break out so we consume it higher in the
+                    // stack.
+                    var typeArguments = tryParse(parseTypeArgumentsInExpression);
+                    if (!typeArguments) {
+                        return expression;
+                    }
+                    if (isTemplateStartOfTaggedTemplate()) {
+                        expression = parseTaggedTemplateRest(expression, typeArguments);
+                        continue;
+                    }
+                    var callExpr = createNode(191 /* CallExpression */, expression.pos);
+                    callExpr.expression = expression;
+                    callExpr.typeArguments = typeArguments;
+                    callExpr.arguments = parseArgumentList();
+                    expression = finishNode(callExpr);
+                    continue;
+                }
+                else if (token() === 20 /* OpenParenToken */) {
+                    var callExpr = createNode(191 /* CallExpression */, expression.pos);
+                    callExpr.expression = expression;
+                    callExpr.arguments = parseArgumentList();
+                    expression = finishNode(callExpr);
+                    continue;
+                }
+                return expression;
+            }
+        }
+        function parseArgumentList() {
+            parseExpected(20 /* OpenParenToken */);
+            var result = parseDelimitedList(11 /* ArgumentExpressions */, parseArgumentExpression);
+            parseExpected(21 /* CloseParenToken */);
+            return result;
+        }
+        function parseTypeArgumentsInExpression() {
+            if (reScanLessThanToken() !== 28 /* LessThanToken */) {
+                return undefined;
+            }
+            nextToken();
+            var typeArguments = parseDelimitedList(20 /* TypeArguments */, parseType);
+            if (!parseExpected(30 /* GreaterThanToken */)) {
+                // If it doesn't have the closing `>` then it's definitely not an type argument list.
+                return undefined;
+            }
+            // If we have a '<', then only parse this as a argument list if the type arguments
+            // are complete and we have an open paren.  if we don't, rewind and return nothing.
+            return typeArguments && canFollowTypeArgumentsInExpression()
+                ? typeArguments
+                : undefined;
+        }
+        function canFollowTypeArgumentsInExpression() {
+            switch (token()) {
+                case 20 /* OpenParenToken */: // foo<x>(
+                case 14 /* NoSubstitutionTemplateLiteral */: // foo<T> `...`
+                case 15 /* TemplateHead */: // foo<T> `...${100}...`
+                // these are the only tokens can legally follow a type argument
+                // list. So we definitely want to treat them as type arg lists.
+                case 24 /* DotToken */: // foo<x>.
+                case 21 /* CloseParenToken */: // foo<x>)
+                case 23 /* CloseBracketToken */: // foo<x>]
+                case 57 /* ColonToken */: // foo<x>:
+                case 26 /* SemicolonToken */: // foo<x>;
+                case 56 /* QuestionToken */: // foo<x>?
+                case 33 /* EqualsEqualsToken */: // foo<x> ==
+                case 35 /* EqualsEqualsEqualsToken */: // foo<x> ===
+                case 34 /* ExclamationEqualsToken */: // foo<x> !=
+                case 36 /* ExclamationEqualsEqualsToken */: // foo<x> !==
+                case 54 /* AmpersandAmpersandToken */: // foo<x> &&
+                case 55 /* BarBarToken */: // foo<x> ||
+                case 51 /* CaretToken */: // foo<x> ^
+                case 49 /* AmpersandToken */: // foo<x> &
+                case 50 /* BarToken */: // foo<x> |
+                case 19 /* CloseBraceToken */: // foo<x> }
+                case 1 /* EndOfFileToken */: // foo<x>
+                    // these cases can't legally follow a type arg list.  However, they're not legal
+                    // expressions either.  The user is probably in the middle of a generic type. So
+                    // treat it as such.
+                    return true;
+                case 27 /* CommaToken */: // foo<x>,
+                case 18 /* OpenBraceToken */: // foo<x> {
+                // We don't want to treat these as type arguments.  Otherwise we'll parse this
+                // as an invocation expression.  Instead, we want to parse out the expression
+                // in isolation from the type arguments.
+                default:
+                    // Anything else treat as an expression.
+                    return false;
+            }
+        }
+        function parsePrimaryExpression() {
+            switch (token()) {
+                case 8 /* NumericLiteral */:
+                case 9 /* BigIntLiteral */:
+                case 10 /* StringLiteral */:
+                case 14 /* NoSubstitutionTemplateLiteral */:
+                    return parseLiteralNode();
+                case 100 /* ThisKeyword */:
+                case 98 /* SuperKeyword */:
+                case 96 /* NullKeyword */:
+                case 102 /* TrueKeyword */:
+                case 87 /* FalseKeyword */:
+                    return parseTokenNode();
+                case 20 /* OpenParenToken */:
+                    return parseParenthesizedExpression();
+                case 22 /* OpenBracketToken */:
+                    return parseArrayLiteralExpression();
+                case 18 /* OpenBraceToken */:
+                    return parseObjectLiteralExpression();
+                case 121 /* AsyncKeyword */:
+                    // Async arrow functions are parsed earlier in parseAssignmentExpressionOrHigher.
+                    // If we encounter `async [no LineTerminator here] function` then this is an async
+                    // function; otherwise, its an identifier.
+                    if (!lookAhead(nextTokenIsFunctionKeywordOnSameLine)) {
+                        break;
+                    }
+                    return parseFunctionExpression();
+                case 76 /* ClassKeyword */:
+                    return parseClassExpression();
+                case 90 /* FunctionKeyword */:
+                    return parseFunctionExpression();
+                case 95 /* NewKeyword */:
+                    return parseNewExpressionOrNewDotTarget();
+                case 42 /* SlashToken */:
+                case 64 /* SlashEqualsToken */:
+                    if (reScanSlashToken() === 13 /* RegularExpressionLiteral */) {
+                        return parseLiteralNode();
+                    }
+                    break;
+                case 15 /* TemplateHead */:
+                    return parseTemplateExpression();
+            }
+            return parseIdentifier(ts.Diagnostics.Expression_expected);
+        }
+        function parseParenthesizedExpression() {
+            var node = createNodeWithJSDoc(195 /* ParenthesizedExpression */);
+            parseExpected(20 /* OpenParenToken */);
+            node.expression = allowInAnd(parseExpression);
+            parseExpected(21 /* CloseParenToken */);
+            return finishNode(node);
+        }
+        function parseSpreadElement() {
+            var node = createNode(208 /* SpreadElement */);
+            parseExpected(25 /* DotDotDotToken */);
+            node.expression = parseAssignmentExpressionOrHigher();
+            return finishNode(node);
+        }
+        function parseArgumentOrArrayLiteralElement() {
+            return token() === 25 /* DotDotDotToken */ ? parseSpreadElement() :
+                token() === 27 /* CommaToken */ ? createNode(210 /* OmittedExpression */) :
+                    parseAssignmentExpressionOrHigher();
+        }
+        function parseArgumentExpression() {
+            return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement);
+        }
+        function parseArrayLiteralExpression() {
+            var node = createNode(187 /* ArrayLiteralExpression */);
+            parseExpected(22 /* OpenBracketToken */);
+            if (scanner.hasPrecedingLineBreak()) {
+                node.multiLine = true;
+            }
+            node.elements = parseDelimitedList(15 /* ArrayLiteralMembers */, parseArgumentOrArrayLiteralElement);
+            parseExpected(23 /* CloseBracketToken */);
+            return finishNode(node);
+        }
+        function parseObjectLiteralElement() {
+            var node = createNodeWithJSDoc(0 /* Unknown */);
+            if (parseOptionalToken(25 /* DotDotDotToken */)) {
+                node.kind = 277 /* SpreadAssignment */;
+                node.expression = parseAssignmentExpressionOrHigher();
+                return finishNode(node);
+            }
+            node.decorators = parseDecorators();
+            node.modifiers = parseModifiers();
+            if (parseContextualModifier(126 /* GetKeyword */)) {
+                return parseAccessorDeclaration(node, 158 /* GetAccessor */);
+            }
+            if (parseContextualModifier(137 /* SetKeyword */)) {
+                return parseAccessorDeclaration(node, 159 /* SetAccessor */);
+            }
+            var asteriskToken = parseOptionalToken(40 /* AsteriskToken */);
+            var tokenIsIdentifier = isIdentifier();
+            node.name = parsePropertyName();
+            // Disallowing of optional property assignments and definite assignment assertion happens in the grammar checker.
+            node.questionToken = parseOptionalToken(56 /* QuestionToken */);
+            node.exclamationToken = parseOptionalToken(52 /* ExclamationToken */);
+            if (asteriskToken || token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */) {
+                return parseMethodDeclaration(node, asteriskToken);
+            }
+            // check if it is short-hand property assignment or normal property assignment
+            // NOTE: if token is EqualsToken it is interpreted as CoverInitializedName production
+            // CoverInitializedName[Yield] :
+            //     IdentifierReference[?Yield] Initializer[In, ?Yield]
+            // this is necessary because ObjectLiteral productions are also used to cover grammar for ObjectAssignmentPattern
+            var isShorthandPropertyAssignment = tokenIsIdentifier && (token() !== 57 /* ColonToken */);
+            if (isShorthandPropertyAssignment) {
+                node.kind = 276 /* ShorthandPropertyAssignment */;
+                var equalsToken = parseOptionalToken(59 /* EqualsToken */);
+                if (equalsToken) {
+                    node.equalsToken = equalsToken;
+                    node.objectAssignmentInitializer = allowInAnd(parseAssignmentExpressionOrHigher);
+                }
+            }
+            else {
+                node.kind = 275 /* PropertyAssignment */;
+                parseExpected(57 /* ColonToken */);
+                node.initializer = allowInAnd(parseAssignmentExpressionOrHigher);
+            }
+            return finishNode(node);
+        }
+        function parseObjectLiteralExpression() {
+            var node = createNode(188 /* ObjectLiteralExpression */);
+            parseExpected(18 /* OpenBraceToken */);
+            if (scanner.hasPrecedingLineBreak()) {
+                node.multiLine = true;
+            }
+            node.properties = parseDelimitedList(12 /* ObjectLiteralMembers */, parseObjectLiteralElement, /*considerSemicolonAsDelimiter*/ true);
+            parseExpected(19 /* CloseBraceToken */);
+            return finishNode(node);
+        }
+        function parseFunctionExpression() {
+            // GeneratorExpression:
+            //      function* BindingIdentifier [Yield][opt](FormalParameters[Yield]){ GeneratorBody }
+            //
+            // FunctionExpression:
+            //      function BindingIdentifier[opt](FormalParameters){ FunctionBody }
+            var saveDecoratorContext = inDecoratorContext();
+            if (saveDecoratorContext) {
+                setDecoratorContext(/*val*/ false);
+            }
+            var node = createNodeWithJSDoc(196 /* FunctionExpression */);
+            node.modifiers = parseModifiers();
+            parseExpected(90 /* FunctionKeyword */);
+            node.asteriskToken = parseOptionalToken(40 /* AsteriskToken */);
+            var isGenerator = node.asteriskToken ? 1 /* Yield */ : 0 /* None */;
+            var isAsync = ts.hasModifier(node, 256 /* Async */) ? 2 /* Await */ : 0 /* None */;
+            node.name =
+                isGenerator && isAsync ? doInYieldAndAwaitContext(parseOptionalIdentifier) :
+                    isGenerator ? doInYieldContext(parseOptionalIdentifier) :
+                        isAsync ? doInAwaitContext(parseOptionalIdentifier) :
+                            parseOptionalIdentifier();
+            fillSignature(57 /* ColonToken */, isGenerator | isAsync, node);
+            node.body = parseFunctionBlock(isGenerator | isAsync);
+            if (saveDecoratorContext) {
+                setDecoratorContext(/*val*/ true);
+            }
+            return finishNode(node);
+        }
+        function parseOptionalIdentifier() {
+            return isIdentifier() ? parseIdentifier() : undefined;
+        }
+        function parseNewExpressionOrNewDotTarget() {
+            var fullStart = scanner.getStartPos();
+            parseExpected(95 /* NewKeyword */);
+            if (parseOptional(24 /* DotToken */)) {
+                var node_2 = createNode(214 /* MetaProperty */, fullStart);
+                node_2.keywordToken = 95 /* NewKeyword */;
+                node_2.name = parseIdentifierName();
+                return finishNode(node_2);
+            }
+            var expression = parsePrimaryExpression();
+            var typeArguments;
+            while (true) {
+                expression = parseMemberExpressionRest(expression);
+                typeArguments = tryParse(parseTypeArgumentsInExpression);
+                if (isTemplateStartOfTaggedTemplate()) {
+                    ts.Debug.assert(!!typeArguments, "Expected a type argument list; all plain tagged template starts should be consumed in 'parseMemberExpressionRest'");
+                    expression = parseTaggedTemplateRest(expression, typeArguments);
+                    typeArguments = undefined;
+                }
+                break;
+            }
+            var node = createNode(192 /* NewExpression */, fullStart);
+            node.expression = expression;
+            node.typeArguments = typeArguments;
+            if (node.typeArguments || token() === 20 /* OpenParenToken */) {
+                node.arguments = parseArgumentList();
+            }
+            return finishNode(node);
+        }
+        // STATEMENTS
+        function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) {
+            var node = createNode(218 /* Block */);
+            if (parseExpected(18 /* OpenBraceToken */, diagnosticMessage) || ignoreMissingOpenBrace) {
+                if (scanner.hasPrecedingLineBreak()) {
+                    node.multiLine = true;
+                }
+                node.statements = parseList(1 /* BlockStatements */, parseStatement);
+                parseExpected(19 /* CloseBraceToken */);
+            }
+            else {
+                node.statements = createMissingList();
+            }
+            return finishNode(node);
+        }
+        function parseFunctionBlock(flags, diagnosticMessage) {
+            var savedYieldContext = inYieldContext();
+            setYieldContext(!!(flags & 1 /* Yield */));
+            var savedAwaitContext = inAwaitContext();
+            setAwaitContext(!!(flags & 2 /* Await */));
+            // We may be in a [Decorator] context when parsing a function expression or
+            // arrow function. The body of the function is not in [Decorator] context.
+            var saveDecoratorContext = inDecoratorContext();
+            if (saveDecoratorContext) {
+                setDecoratorContext(/*val*/ false);
+            }
+            var block = parseBlock(!!(flags & 16 /* IgnoreMissingOpenBrace */), diagnosticMessage);
+            if (saveDecoratorContext) {
+                setDecoratorContext(/*val*/ true);
+            }
+            setYieldContext(savedYieldContext);
+            setAwaitContext(savedAwaitContext);
+            return block;
+        }
+        function parseEmptyStatement() {
+            var node = createNode(220 /* EmptyStatement */);
+            parseExpected(26 /* SemicolonToken */);
+            return finishNode(node);
+        }
+        function parseIfStatement() {
+            var node = createNode(222 /* IfStatement */);
+            parseExpected(91 /* IfKeyword */);
+            parseExpected(20 /* OpenParenToken */);
+            node.expression = allowInAnd(parseExpression);
+            parseExpected(21 /* CloseParenToken */);
+            node.thenStatement = parseStatement();
+            node.elseStatement = parseOptional(83 /* ElseKeyword */) ? parseStatement() : undefined;
+            return finishNode(node);
+        }
+        function parseDoStatement() {
+            var node = createNode(223 /* DoStatement */);
+            parseExpected(82 /* DoKeyword */);
+            node.statement = parseStatement();
+            parseExpected(107 /* WhileKeyword */);
+            parseExpected(20 /* OpenParenToken */);
+            node.expression = allowInAnd(parseExpression);
+            parseExpected(21 /* CloseParenToken */);
+            // From: https://mail.mozilla.org/pipermail/es-discuss/2011-August/016188.html
+            // 157 min --- All allen at wirfs-brock.com CONF --- "do{;}while(false)false" prohibited in
+            // spec but allowed in consensus reality. Approved -- this is the de-facto standard whereby
+            //  do;while(0)x will have a semicolon inserted before x.
+            parseOptional(26 /* SemicolonToken */);
+            return finishNode(node);
+        }
+        function parseWhileStatement() {
+            var node = createNode(224 /* WhileStatement */);
+            parseExpected(107 /* WhileKeyword */);
+            parseExpected(20 /* OpenParenToken */);
+            node.expression = allowInAnd(parseExpression);
+            parseExpected(21 /* CloseParenToken */);
+            node.statement = parseStatement();
+            return finishNode(node);
+        }
+        function parseForOrForInOrForOfStatement() {
+            var pos = getNodePos();
+            parseExpected(89 /* ForKeyword */);
+            var awaitToken = parseOptionalToken(122 /* AwaitKeyword */);
+            parseExpected(20 /* OpenParenToken */);
+            var initializer;
+            if (token() !== 26 /* SemicolonToken */) {
+                if (token() === 105 /* VarKeyword */ || token() === 111 /* LetKeyword */ || token() === 77 /* ConstKeyword */) {
+                    initializer = parseVariableDeclarationList(/*inForStatementInitializer*/ true);
+                }
+                else {
+                    initializer = disallowInAnd(parseExpression);
+                }
+            }
+            var forOrForInOrForOfStatement;
+            if (awaitToken ? parseExpected(147 /* OfKeyword */) : parseOptional(147 /* OfKeyword */)) {
+                var forOfStatement = createNode(227 /* ForOfStatement */, pos);
+                forOfStatement.awaitModifier = awaitToken;
+                forOfStatement.initializer = initializer;
+                forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher);
+                parseExpected(21 /* CloseParenToken */);
+                forOrForInOrForOfStatement = forOfStatement;
+            }
+            else if (parseOptional(93 /* InKeyword */)) {
+                var forInStatement = createNode(226 /* ForInStatement */, pos);
+                forInStatement.initializer = initializer;
+                forInStatement.expression = allowInAnd(parseExpression);
+                parseExpected(21 /* CloseParenToken */);
+                forOrForInOrForOfStatement = forInStatement;
+            }
+            else {
+                var forStatement = createNode(225 /* ForStatement */, pos);
+                forStatement.initializer = initializer;
+                parseExpected(26 /* SemicolonToken */);
+                if (token() !== 26 /* SemicolonToken */ && token() !== 21 /* CloseParenToken */) {
+                    forStatement.condition = allowInAnd(parseExpression);
+                }
+                parseExpected(26 /* SemicolonToken */);
+                if (token() !== 21 /* CloseParenToken */) {
+                    forStatement.incrementor = allowInAnd(parseExpression);
+                }
+                parseExpected(21 /* CloseParenToken */);
+                forOrForInOrForOfStatement = forStatement;
+            }
+            forOrForInOrForOfStatement.statement = parseStatement();
+            return finishNode(forOrForInOrForOfStatement);
+        }
+        function parseBreakOrContinueStatement(kind) {
+            var node = createNode(kind);
+            parseExpected(kind === 229 /* BreakStatement */ ? 73 /* BreakKeyword */ : 78 /* ContinueKeyword */);
+            if (!canParseSemicolon()) {
+                node.label = parseIdentifier();
+            }
+            parseSemicolon();
+            return finishNode(node);
+        }
+        function parseReturnStatement() {
+            var node = createNode(230 /* ReturnStatement */);
+            parseExpected(97 /* ReturnKeyword */);
+            if (!canParseSemicolon()) {
+                node.expression = allowInAnd(parseExpression);
+            }
+            parseSemicolon();
+            return finishNode(node);
+        }
+        function parseWithStatement() {
+            var node = createNode(231 /* WithStatement */);
+            parseExpected(108 /* WithKeyword */);
+            parseExpected(20 /* OpenParenToken */);
+            node.expression = allowInAnd(parseExpression);
+            parseExpected(21 /* CloseParenToken */);
+            node.statement = doInsideOfContext(8388608 /* InWithStatement */, parseStatement);
+            return finishNode(node);
+        }
+        function parseCaseClause() {
+            var node = createNode(271 /* CaseClause */);
+            parseExpected(74 /* CaseKeyword */);
+            node.expression = allowInAnd(parseExpression);
+            parseExpected(57 /* ColonToken */);
+            node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement);
+            return finishNode(node);
+        }
+        function parseDefaultClause() {
+            var node = createNode(272 /* DefaultClause */);
+            parseExpected(80 /* DefaultKeyword */);
+            parseExpected(57 /* ColonToken */);
+            node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement);
+            return finishNode(node);
+        }
+        function parseCaseOrDefaultClause() {
+            return token() === 74 /* CaseKeyword */ ? parseCaseClause() : parseDefaultClause();
+        }
+        function parseSwitchStatement() {
+            var node = createNode(232 /* SwitchStatement */);
+            parseExpected(99 /* SwitchKeyword */);
+            parseExpected(20 /* OpenParenToken */);
+            node.expression = allowInAnd(parseExpression);
+            parseExpected(21 /* CloseParenToken */);
+            var caseBlock = createNode(246 /* CaseBlock */);
+            parseExpected(18 /* OpenBraceToken */);
+            caseBlock.clauses = parseList(2 /* SwitchClauses */, parseCaseOrDefaultClause);
+            parseExpected(19 /* CloseBraceToken */);
+            node.caseBlock = finishNode(caseBlock);
+            return finishNode(node);
+        }
+        function parseThrowStatement() {
+            // ThrowStatement[Yield] :
+            //      throw [no LineTerminator here]Expression[In, ?Yield];
+            // Because of automatic semicolon insertion, we need to report error if this
+            // throw could be terminated with a semicolon.  Note: we can't call 'parseExpression'
+            // directly as that might consume an expression on the following line.
+            // We just return 'undefined' in that case.  The actual error will be reported in the
+            // grammar walker.
+            var node = createNode(234 /* ThrowStatement */);
+            parseExpected(101 /* ThrowKeyword */);
+            node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression);
+            parseSemicolon();
+            return finishNode(node);
+        }
+        // TODO: Review for error recovery
+        function parseTryStatement() {
+            var node = createNode(235 /* TryStatement */);
+            parseExpected(103 /* TryKeyword */);
+            node.tryBlock = parseBlock(/*ignoreMissingOpenBrace*/ false);
+            node.catchClause = token() === 75 /* CatchKeyword */ ? parseCatchClause() : undefined;
+            // If we don't have a catch clause, then we must have a finally clause.  Try to parse
+            // one out no matter what.
+            if (!node.catchClause || token() === 88 /* FinallyKeyword */) {
+                parseExpected(88 /* FinallyKeyword */);
+                node.finallyBlock = parseBlock(/*ignoreMissingOpenBrace*/ false);
+            }
+            return finishNode(node);
+        }
+        function parseCatchClause() {
+            var result = createNode(274 /* CatchClause */);
+            parseExpected(75 /* CatchKeyword */);
+            if (parseOptional(20 /* OpenParenToken */)) {
+                result.variableDeclaration = parseVariableDeclaration();
+                parseExpected(21 /* CloseParenToken */);
+            }
+            else {
+                // Keep shape of node to avoid degrading performance.
+                result.variableDeclaration = undefined;
+            }
+            result.block = parseBlock(/*ignoreMissingOpenBrace*/ false);
+            return finishNode(result);
+        }
+        function parseDebuggerStatement() {
+            var node = createNode(236 /* DebuggerStatement */);
+            parseExpected(79 /* DebuggerKeyword */);
+            parseSemicolon();
+            return finishNode(node);
+        }
+        function parseExpressionOrLabeledStatement() {
+            // Avoiding having to do the lookahead for a labeled statement by just trying to parse
+            // out an expression, seeing if it is identifier and then seeing if it is followed by
+            // a colon.
+            var node = createNodeWithJSDoc(0 /* Unknown */);
+            var expression = allowInAnd(parseExpression);
+            if (expression.kind === 72 /* Identifier */ && parseOptional(57 /* ColonToken */)) {
+                node.kind = 233 /* LabeledStatement */;
+                node.label = expression;
+                node.statement = parseStatement();
+            }
+            else {
+                node.kind = 221 /* ExpressionStatement */;
+                node.expression = expression;
+                parseSemicolon();
+            }
+            return finishNode(node);
+        }
+        function nextTokenIsIdentifierOrKeywordOnSameLine() {
+            nextToken();
+            return ts.tokenIsIdentifierOrKeyword(token()) && !scanner.hasPrecedingLineBreak();
+        }
+        function nextTokenIsClassKeywordOnSameLine() {
+            nextToken();
+            return token() === 76 /* ClassKeyword */ && !scanner.hasPrecedingLineBreak();
+        }
+        function nextTokenIsFunctionKeywordOnSameLine() {
+            nextToken();
+            return token() === 90 /* FunctionKeyword */ && !scanner.hasPrecedingLineBreak();
+        }
+        function nextTokenIsIdentifierOrKeywordOrLiteralOnSameLine() {
+            nextToken();
+            return (ts.tokenIsIdentifierOrKeyword(token()) || token() === 8 /* NumericLiteral */ || token() === 9 /* BigIntLiteral */ || token() === 10 /* StringLiteral */) && !scanner.hasPrecedingLineBreak();
+        }
+        function isDeclaration() {
+            while (true) {
+                switch (token()) {
+                    case 105 /* VarKeyword */:
+                    case 111 /* LetKeyword */:
+                    case 77 /* ConstKeyword */:
+                    case 90 /* FunctionKeyword */:
+                    case 76 /* ClassKeyword */:
+                    case 84 /* EnumKeyword */:
+                        return true;
+                    // 'declare', 'module', 'namespace', 'interface'* and 'type' are all legal JavaScript identifiers;
+                    // however, an identifier cannot be followed by another identifier on the same line. This is what we
+                    // count on to parse out the respective declarations. For instance, we exploit this to say that
+                    //
+                    //    namespace n
+                    //
+                    // can be none other than the beginning of a namespace declaration, but need to respect that JavaScript sees
+                    //
+                    //    namespace
+                    //    n
+                    //
+                    // as the identifier 'namespace' on one line followed by the identifier 'n' on another.
+                    // We need to look one token ahead to see if it permissible to try parsing a declaration.
+                    //
+                    // *Note*: 'interface' is actually a strict mode reserved word. So while
+                    //
+                    //   "use strict"
+                    //   interface
+                    //   I {}
+                    //
+                    // could be legal, it would add complexity for very little gain.
+                    case 110 /* InterfaceKeyword */:
+                    case 140 /* TypeKeyword */:
+                        return nextTokenIsIdentifierOnSameLine();
+                    case 130 /* ModuleKeyword */:
+                    case 131 /* NamespaceKeyword */:
+                        return nextTokenIsIdentifierOrStringLiteralOnSameLine();
+                    case 118 /* AbstractKeyword */:
+                    case 121 /* AsyncKeyword */:
+                    case 125 /* DeclareKeyword */:
+                    case 113 /* PrivateKeyword */:
+                    case 114 /* ProtectedKeyword */:
+                    case 115 /* PublicKeyword */:
+                    case 133 /* ReadonlyKeyword */:
+                        nextToken();
+                        // ASI takes effect for this modifier.
+                        if (scanner.hasPrecedingLineBreak()) {
+                            return false;
+                        }
+                        continue;
+                    case 145 /* GlobalKeyword */:
+                        nextToken();
+                        return token() === 18 /* OpenBraceToken */ || token() === 72 /* Identifier */ || token() === 85 /* ExportKeyword */;
+                    case 92 /* ImportKeyword */:
+                        nextToken();
+                        return token() === 10 /* StringLiteral */ || token() === 40 /* AsteriskToken */ ||
+                            token() === 18 /* OpenBraceToken */ || ts.tokenIsIdentifierOrKeyword(token());
+                    case 85 /* ExportKeyword */:
+                        nextToken();
+                        if (token() === 59 /* EqualsToken */ || token() === 40 /* AsteriskToken */ ||
+                            token() === 18 /* OpenBraceToken */ || token() === 80 /* DefaultKeyword */ ||
+                            token() === 119 /* AsKeyword */) {
+                            return true;
+                        }
+                        continue;
+                    case 116 /* StaticKeyword */:
+                        nextToken();
+                        continue;
+                    default:
+                        return false;
+                }
+            }
+        }
+        function isStartOfDeclaration() {
+            return lookAhead(isDeclaration);
+        }
+        function isStartOfStatement() {
+            switch (token()) {
+                case 58 /* AtToken */:
+                case 26 /* SemicolonToken */:
+                case 18 /* OpenBraceToken */:
+                case 105 /* VarKeyword */:
+                case 111 /* LetKeyword */:
+                case 90 /* FunctionKeyword */:
+                case 76 /* ClassKeyword */:
+                case 84 /* EnumKeyword */:
+                case 91 /* IfKeyword */:
+                case 82 /* DoKeyword */:
+                case 107 /* WhileKeyword */:
+                case 89 /* ForKeyword */:
+                case 78 /* ContinueKeyword */:
+                case 73 /* BreakKeyword */:
+                case 97 /* ReturnKeyword */:
+                case 108 /* WithKeyword */:
+                case 99 /* SwitchKeyword */:
+                case 101 /* ThrowKeyword */:
+                case 103 /* TryKeyword */:
+                case 79 /* DebuggerKeyword */:
+                // 'catch' and 'finally' do not actually indicate that the code is part of a statement,
+                // however, we say they are here so that we may gracefully parse them and error later.
+                case 75 /* CatchKeyword */:
+                case 88 /* FinallyKeyword */:
+                    return true;
+                case 92 /* ImportKeyword */:
+                    return isStartOfDeclaration() || lookAhead(nextTokenIsOpenParenOrLessThanOrDot);
+                case 77 /* ConstKeyword */:
+                case 85 /* ExportKeyword */:
+                    return isStartOfDeclaration();
+                case 121 /* AsyncKeyword */:
+                case 125 /* DeclareKeyword */:
+                case 110 /* InterfaceKeyword */:
+                case 130 /* ModuleKeyword */:
+                case 131 /* NamespaceKeyword */:
+                case 140 /* TypeKeyword */:
+                case 145 /* GlobalKeyword */:
+                    // When these don't start a declaration, they're an identifier in an expression statement
+                    return true;
+                case 115 /* PublicKeyword */:
+                case 113 /* PrivateKeyword */:
+                case 114 /* ProtectedKeyword */:
+                case 116 /* StaticKeyword */:
+                case 133 /* ReadonlyKeyword */:
+                    // When these don't start a declaration, they may be the start of a class member if an identifier
+                    // immediately follows. Otherwise they're an identifier in an expression statement.
+                    return isStartOfDeclaration() || !lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine);
+                default:
+                    return isStartOfExpression();
+            }
+        }
+        function nextTokenIsIdentifierOrStartOfDestructuring() {
+            nextToken();
+            return isIdentifier() || token() === 18 /* OpenBraceToken */ || token() === 22 /* OpenBracketToken */;
+        }
+        function isLetDeclaration() {
+            // In ES6 'let' always starts a lexical declaration if followed by an identifier or {
+            // or [.
+            return lookAhead(nextTokenIsIdentifierOrStartOfDestructuring);
+        }
+        function parseStatement() {
+            switch (token()) {
+                case 26 /* SemicolonToken */:
+                    return parseEmptyStatement();
+                case 18 /* OpenBraceToken */:
+                    return parseBlock(/*ignoreMissingOpenBrace*/ false);
+                case 105 /* VarKeyword */:
+                    return parseVariableStatement(createNodeWithJSDoc(237 /* VariableDeclaration */));
+                case 111 /* LetKeyword */:
+                    if (isLetDeclaration()) {
+                        return parseVariableStatement(createNodeWithJSDoc(237 /* VariableDeclaration */));
+                    }
+                    break;
+                case 90 /* FunctionKeyword */:
+                    return parseFunctionDeclaration(createNodeWithJSDoc(239 /* FunctionDeclaration */));
+                case 76 /* ClassKeyword */:
+                    return parseClassDeclaration(createNodeWithJSDoc(240 /* ClassDeclaration */));
+                case 91 /* IfKeyword */:
+                    return parseIfStatement();
+                case 82 /* DoKeyword */:
+                    return parseDoStatement();
+                case 107 /* WhileKeyword */:
+                    return parseWhileStatement();
+                case 89 /* ForKeyword */:
+                    return parseForOrForInOrForOfStatement();
+                case 78 /* ContinueKeyword */:
+                    return parseBreakOrContinueStatement(228 /* ContinueStatement */);
+                case 73 /* BreakKeyword */:
+                    return parseBreakOrContinueStatement(229 /* BreakStatement */);
+                case 97 /* ReturnKeyword */:
+                    return parseReturnStatement();
+                case 108 /* WithKeyword */:
+                    return parseWithStatement();
+                case 99 /* SwitchKeyword */:
+                    return parseSwitchStatement();
+                case 101 /* ThrowKeyword */:
+                    return parseThrowStatement();
+                case 103 /* TryKeyword */:
+                // Include 'catch' and 'finally' for error recovery.
+                case 75 /* CatchKeyword */:
+                case 88 /* FinallyKeyword */:
+                    return parseTryStatement();
+                case 79 /* DebuggerKeyword */:
+                    return parseDebuggerStatement();
+                case 58 /* AtToken */:
+                    return parseDeclaration();
+                case 121 /* AsyncKeyword */:
+                case 110 /* InterfaceKeyword */:
+                case 140 /* TypeKeyword */:
+                case 130 /* ModuleKeyword */:
+                case 131 /* NamespaceKeyword */:
+                case 125 /* DeclareKeyword */:
+                case 77 /* ConstKeyword */:
+                case 84 /* EnumKeyword */:
+                case 85 /* ExportKeyword */:
+                case 92 /* ImportKeyword */:
+                case 113 /* PrivateKeyword */:
+                case 114 /* ProtectedKeyword */:
+                case 115 /* PublicKeyword */:
+                case 118 /* AbstractKeyword */:
+                case 116 /* StaticKeyword */:
+                case 133 /* ReadonlyKeyword */:
+                case 145 /* GlobalKeyword */:
+                    if (isStartOfDeclaration()) {
+                        return parseDeclaration();
+                    }
+                    break;
+            }
+            return parseExpressionOrLabeledStatement();
+        }
+        function isDeclareModifier(modifier) {
+            return modifier.kind === 125 /* DeclareKeyword */;
+        }
+        function parseDeclaration() {
+            var node = createNodeWithJSDoc(0 /* Unknown */);
+            node.decorators = parseDecorators();
+            node.modifiers = parseModifiers();
+            if (ts.some(node.modifiers, isDeclareModifier)) {
+                for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
+                    var m = _a[_i];
+                    m.flags |= 4194304 /* Ambient */;
+                }
+                return doInsideOfContext(4194304 /* Ambient */, function () { return parseDeclarationWorker(node); });
+            }
+            else {
+                return parseDeclarationWorker(node);
+            }
+        }
+        function parseDeclarationWorker(node) {
+            switch (token()) {
+                case 105 /* VarKeyword */:
+                case 111 /* LetKeyword */:
+                case 77 /* ConstKeyword */:
+                    return parseVariableStatement(node);
+                case 90 /* FunctionKeyword */:
+                    return parseFunctionDeclaration(node);
+                case 76 /* ClassKeyword */:
+                    return parseClassDeclaration(node);
+                case 110 /* InterfaceKeyword */:
+                    return parseInterfaceDeclaration(node);
+                case 140 /* TypeKeyword */:
+                    return parseTypeAliasDeclaration(node);
+                case 84 /* EnumKeyword */:
+                    return parseEnumDeclaration(node);
+                case 145 /* GlobalKeyword */:
+                case 130 /* ModuleKeyword */:
+                case 131 /* NamespaceKeyword */:
+                    return parseModuleDeclaration(node);
+                case 92 /* ImportKeyword */:
+                    return parseImportDeclarationOrImportEqualsDeclaration(node);
+                case 85 /* ExportKeyword */:
+                    nextToken();
+                    switch (token()) {
+                        case 80 /* DefaultKeyword */:
+                        case 59 /* EqualsToken */:
+                            return parseExportAssignment(node);
+                        case 119 /* AsKeyword */:
+                            return parseNamespaceExportDeclaration(node);
+                        default:
+                            return parseExportDeclaration(node);
+                    }
+                default:
+                    if (node.decorators || node.modifiers) {
+                        // We reached this point because we encountered decorators and/or modifiers and assumed a declaration
+                        // would follow. For recovery and error reporting purposes, return an incomplete declaration.
+                        var missing = createMissingNode(258 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
+                        missing.pos = node.pos;
+                        missing.decorators = node.decorators;
+                        missing.modifiers = node.modifiers;
+                        return finishNode(missing);
+                    }
+                    return undefined; // TODO: GH#18217
+            }
+        }
+        function nextTokenIsIdentifierOrStringLiteralOnSameLine() {
+            nextToken();
+            return !scanner.hasPrecedingLineBreak() && (isIdentifier() || token() === 10 /* StringLiteral */);
+        }
+        function parseFunctionBlockOrSemicolon(flags, diagnosticMessage) {
+            if (token() !== 18 /* OpenBraceToken */ && canParseSemicolon()) {
+                parseSemicolon();
+                return;
+            }
+            return parseFunctionBlock(flags, diagnosticMessage);
+        }
+        // DECLARATIONS
+        function parseArrayBindingElement() {
+            if (token() === 27 /* CommaToken */) {
+                return createNode(210 /* OmittedExpression */);
+            }
+            var node = createNode(186 /* BindingElement */);
+            node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */);
+            node.name = parseIdentifierOrPattern();
+            node.initializer = parseInitializer();
+            return finishNode(node);
+        }
+        function parseObjectBindingElement() {
+            var node = createNode(186 /* BindingElement */);
+            node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */);
+            var tokenIsIdentifier = isIdentifier();
+            var propertyName = parsePropertyName();
+            if (tokenIsIdentifier && token() !== 57 /* ColonToken */) {
+                node.name = propertyName;
+            }
+            else {
+                parseExpected(57 /* ColonToken */);
+                node.propertyName = propertyName;
+                node.name = parseIdentifierOrPattern();
+            }
+            node.initializer = parseInitializer();
+            return finishNode(node);
+        }
+        function parseObjectBindingPattern() {
+            var node = createNode(184 /* ObjectBindingPattern */);
+            parseExpected(18 /* OpenBraceToken */);
+            node.elements = parseDelimitedList(9 /* ObjectBindingElements */, parseObjectBindingElement);
+            parseExpected(19 /* CloseBraceToken */);
+            return finishNode(node);
+        }
+        function parseArrayBindingPattern() {
+            var node = createNode(185 /* ArrayBindingPattern */);
+            parseExpected(22 /* OpenBracketToken */);
+            node.elements = parseDelimitedList(10 /* ArrayBindingElements */, parseArrayBindingElement);
+            parseExpected(23 /* CloseBracketToken */);
+            return finishNode(node);
+        }
+        function isIdentifierOrPattern() {
+            return token() === 18 /* OpenBraceToken */ || token() === 22 /* OpenBracketToken */ || isIdentifier();
+        }
+        function parseIdentifierOrPattern() {
+            if (token() === 22 /* OpenBracketToken */) {
+                return parseArrayBindingPattern();
+            }
+            if (token() === 18 /* OpenBraceToken */) {
+                return parseObjectBindingPattern();
+            }
+            return parseIdentifier();
+        }
+        function parseVariableDeclarationAllowExclamation() {
+            return parseVariableDeclaration(/*allowExclamation*/ true);
+        }
+        function parseVariableDeclaration(allowExclamation) {
+            var node = createNode(237 /* VariableDeclaration */);
+            node.name = parseIdentifierOrPattern();
+            if (allowExclamation && node.name.kind === 72 /* Identifier */ &&
+                token() === 52 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
+                node.exclamationToken = parseTokenNode();
+            }
+            node.type = parseTypeAnnotation();
+            if (!isInOrOfKeyword(token())) {
+                node.initializer = parseInitializer();
+            }
+            return finishNode(node);
+        }
+        function parseVariableDeclarationList(inForStatementInitializer) {
+            var node = createNode(238 /* VariableDeclarationList */);
+            switch (token()) {
+                case 105 /* VarKeyword */:
+                    break;
+                case 111 /* LetKeyword */:
+                    node.flags |= 1 /* Let */;
+                    break;
+                case 77 /* ConstKeyword */:
+                    node.flags |= 2 /* Const */;
+                    break;
+                default:
+                    ts.Debug.fail();
+            }
+            nextToken();
+            // The user may have written the following:
+            //
+            //    for (let of X) { }
+            //
+            // In this case, we want to parse an empty declaration list, and then parse 'of'
+            // as a keyword. The reason this is not automatic is that 'of' is a valid identifier.
+            // So we need to look ahead to determine if 'of' should be treated as a keyword in
+            // this context.
+            // The checker will then give an error that there is an empty declaration list.
+            if (token() === 147 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
+                node.declarations = createMissingList();
+            }
+            else {
+                var savedDisallowIn = inDisallowInContext();
+                setDisallowInContext(inForStatementInitializer);
+                node.declarations = parseDelimitedList(8 /* VariableDeclarations */, inForStatementInitializer ? parseVariableDeclaration : parseVariableDeclarationAllowExclamation);
+                setDisallowInContext(savedDisallowIn);
+            }
+            return finishNode(node);
+        }
+        function canFollowContextualOfKeyword() {
+            return nextTokenIsIdentifier() && nextToken() === 21 /* CloseParenToken */;
+        }
+        function parseVariableStatement(node) {
+            node.kind = 219 /* VariableStatement */;
+            node.declarationList = parseVariableDeclarationList(/*inForStatementInitializer*/ false);
+            parseSemicolon();
+            return finishNode(node);
+        }
+        function parseFunctionDeclaration(node) {
+            node.kind = 239 /* FunctionDeclaration */;
+            parseExpected(90 /* FunctionKeyword */);
+            node.asteriskToken = parseOptionalToken(40 /* AsteriskToken */);
+            node.name = ts.hasModifier(node, 512 /* Default */) ? parseOptionalIdentifier() : parseIdentifier();
+            var isGenerator = node.asteriskToken ? 1 /* Yield */ : 0 /* None */;
+            var isAsync = ts.hasModifier(node, 256 /* Async */) ? 2 /* Await */ : 0 /* None */;
+            fillSignature(57 /* ColonToken */, isGenerator | isAsync, node);
+            node.body = parseFunctionBlockOrSemicolon(isGenerator | isAsync, ts.Diagnostics.or_expected);
+            return finishNode(node);
+        }
+        function parseConstructorDeclaration(node) {
+            node.kind = 157 /* Constructor */;
+            parseExpected(124 /* ConstructorKeyword */);
+            fillSignature(57 /* ColonToken */, 0 /* None */, node);
+            node.body = parseFunctionBlockOrSemicolon(0 /* None */, ts.Diagnostics.or_expected);
+            return finishNode(node);
+        }
+        function parseMethodDeclaration(node, asteriskToken, diagnosticMessage) {
+            node.kind = 156 /* MethodDeclaration */;
+            node.asteriskToken = asteriskToken;
+            var isGenerator = asteriskToken ? 1 /* Yield */ : 0 /* None */;
+            var isAsync = ts.hasModifier(node, 256 /* Async */) ? 2 /* Await */ : 0 /* None */;
+            fillSignature(57 /* ColonToken */, isGenerator | isAsync, node);
+            node.body = parseFunctionBlockOrSemicolon(isGenerator | isAsync, diagnosticMessage);
+            return finishNode(node);
+        }
+        function parsePropertyDeclaration(node) {
+            node.kind = 154 /* PropertyDeclaration */;
+            if (!node.questionToken && token() === 52 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
+                node.exclamationToken = parseTokenNode();
+            }
+            node.type = parseTypeAnnotation();
+            // For instance properties specifically, since they are evaluated inside the constructor,
+            // we do *not * want to parse yield expressions, so we specifically turn the yield context
+            // off. The grammar would look something like this:
+            //
+            //    MemberVariableDeclaration[Yield]:
+            //        AccessibilityModifier_opt PropertyName TypeAnnotation_opt Initializer_opt[In];
+            //        AccessibilityModifier_opt static_opt PropertyName TypeAnnotation_opt Initializer_opt[In, ?Yield];
+            //
+            // The checker may still error in the static case to explicitly disallow the yield expression.
+            node.initializer = ts.hasModifier(node, 32 /* Static */)
+                ? allowInAnd(parseInitializer)
+                : doOutsideOfContext(4096 /* YieldContext */ | 2048 /* DisallowInContext */, parseInitializer);
+            parseSemicolon();
+            return finishNode(node);
+        }
+        function parsePropertyOrMethodDeclaration(node) {
+            var asteriskToken = parseOptionalToken(40 /* AsteriskToken */);
+            node.name = parsePropertyName();
+            // Note: this is not legal as per the grammar.  But we allow it in the parser and
+            // report an error in the grammar checker.
+            node.questionToken = parseOptionalToken(56 /* QuestionToken */);
+            if (asteriskToken || token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */) {
+                return parseMethodDeclaration(node, asteriskToken, ts.Diagnostics.or_expected);
+            }
+            return parsePropertyDeclaration(node);
+        }
+        function parseAccessorDeclaration(node, kind) {
+            node.kind = kind;
+            node.name = parsePropertyName();
+            fillSignature(57 /* ColonToken */, 0 /* None */, node);
+            node.body = parseFunctionBlockOrSemicolon(0 /* None */);
+            return finishNode(node);
+        }
+        function isClassMemberStart() {
+            var idToken;
+            if (token() === 58 /* AtToken */) {
+                return true;
+            }
+            // Eat up all modifiers, but hold on to the last one in case it is actually an identifier.
+            while (ts.isModifierKind(token())) {
+                idToken = token();
+                // If the idToken is a class modifier (protected, private, public, and static), it is
+                // certain that we are starting to parse class member. This allows better error recovery
+                // Example:
+                //      public foo() ...     // true
+                //      public @dec blah ... // true; we will then report an error later
+                //      export public ...    // true; we will then report an error later
+                if (ts.isClassMemberModifier(idToken)) {
+                    return true;
+                }
+                nextToken();
+            }
+            if (token() === 40 /* AsteriskToken */) {
+                return true;
+            }
+            // Try to get the first property-like token following all modifiers.
+            // This can either be an identifier or the 'get' or 'set' keywords.
+            if (isLiteralPropertyName()) {
+                idToken = token();
+                nextToken();
+            }
+            // Index signatures and computed properties are class members; we can parse.
+            if (token() === 22 /* OpenBracketToken */) {
+                return true;
+            }
+            // If we were able to get any potential identifier...
+            if (idToken !== undefined) {
+                // If we have a non-keyword identifier, or if we have an accessor, then it's safe to parse.
+                if (!ts.isKeyword(idToken) || idToken === 137 /* SetKeyword */ || idToken === 126 /* GetKeyword */) {
+                    return true;
+                }
+                // If it *is* a keyword, but not an accessor, check a little farther along
+                // to see if it should actually be parsed as a class member.
+                switch (token()) {
+                    case 20 /* OpenParenToken */: // Method declaration
+                    case 28 /* LessThanToken */: // Generic Method declaration
+                    case 52 /* ExclamationToken */: // Non-null assertion on property name
+                    case 57 /* ColonToken */: // Type Annotation for declaration
+                    case 59 /* EqualsToken */: // Initializer for declaration
+                    case 56 /* QuestionToken */: // Not valid, but permitted so that it gets caught later on.
+                        return true;
+                    default:
+                        // Covers
+                        //  - Semicolons     (declaration termination)
+                        //  - Closing braces (end-of-class, must be declaration)
+                        //  - End-of-files   (not valid, but permitted so that it gets caught later on)
+                        //  - Line-breaks    (enabling *automatic semicolon insertion*)
+                        return canParseSemicolon();
+                }
+            }
+            return false;
+        }
+        function parseDecorators() {
+            var list;
+            var listPos = getNodePos();
+            while (true) {
+                var decoratorStart = getNodePos();
+                if (!parseOptional(58 /* AtToken */)) {
+                    break;
+                }
+                var decorator = createNode(152 /* Decorator */, decoratorStart);
+                decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher);
+                finishNode(decorator);
+                (list || (list = [])).push(decorator);
+            }
+            return list && createNodeArray(list, listPos);
+        }
+        /*
+         * There are situations in which a modifier like 'const' will appear unexpectedly, such as on a class member.
+         * In those situations, if we are entirely sure that 'const' is not valid on its own (such as when ASI takes effect
+         * and turns it into a standalone declaration), then it is better to parse it and report an error later.
+         *
+         * In such situations, 'permitInvalidConstAsModifier' should be set to true.
+         */
+        function parseModifiers(permitInvalidConstAsModifier) {
+            var list;
+            var listPos = getNodePos();
+            while (true) {
+                var modifierStart = scanner.getStartPos();
+                var modifierKind = token();
+                if (token() === 77 /* ConstKeyword */ && permitInvalidConstAsModifier) {
+                    // We need to ensure that any subsequent modifiers appear on the same line
+                    // so that when 'const' is a standalone declaration, we don't issue an error.
+                    if (!tryParse(nextTokenIsOnSameLineAndCanFollowModifier)) {
+                        break;
+                    }
+                }
+                else {
+                    if (!parseAnyContextualModifier()) {
+                        break;
+                    }
+                }
+                var modifier = finishNode(createNode(modifierKind, modifierStart));
+                (list || (list = [])).push(modifier);
+            }
+            return list && createNodeArray(list, listPos);
+        }
+        function parseModifiersForArrowFunction() {
+            var modifiers;
+            if (token() === 121 /* AsyncKeyword */) {
+                var modifierStart = scanner.getStartPos();
+                var modifierKind = token();
+                nextToken();
+                var modifier = finishNode(createNode(modifierKind, modifierStart));
+                modifiers = createNodeArray([modifier], modifierStart);
+            }
+            return modifiers;
+        }
+        function parseClassElement() {
+            if (token() === 26 /* SemicolonToken */) {
+                var result = createNode(217 /* SemicolonClassElement */);
+                nextToken();
+                return finishNode(result);
+            }
+            var node = createNodeWithJSDoc(0 /* Unknown */);
+            node.decorators = parseDecorators();
+            node.modifiers = parseModifiers(/*permitInvalidConstAsModifier*/ true);
+            if (parseContextualModifier(126 /* GetKeyword */)) {
+                return parseAccessorDeclaration(node, 158 /* GetAccessor */);
+            }
+            if (parseContextualModifier(137 /* SetKeyword */)) {
+                return parseAccessorDeclaration(node, 159 /* SetAccessor */);
+            }
+            if (token() === 124 /* ConstructorKeyword */) {
+                return parseConstructorDeclaration(node);
+            }
+            if (isIndexSignature()) {
+                return parseIndexSignatureDeclaration(node);
+            }
+            // It is very important that we check this *after* checking indexers because
+            // the [ token can start an index signature or a computed property name
+            if (ts.tokenIsIdentifierOrKeyword(token()) ||
+                token() === 10 /* StringLiteral */ ||
+                token() === 8 /* NumericLiteral */ ||
+                token() === 40 /* AsteriskToken */ ||
+                token() === 22 /* OpenBracketToken */) {
+                return parsePropertyOrMethodDeclaration(node);
+            }
+            if (node.decorators || node.modifiers) {
+                // treat this as a property declaration with a missing name.
+                node.name = createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
+                return parsePropertyDeclaration(node);
+            }
+            // 'isClassMemberStart' should have hinted not to attempt parsing.
+            return ts.Debug.fail("Should not have attempted to parse class member declaration.");
+        }
+        function parseClassExpression() {
+            return parseClassDeclarationOrExpression(createNodeWithJSDoc(0 /* Unknown */), 209 /* ClassExpression */);
+        }
+        function parseClassDeclaration(node) {
+            return parseClassDeclarationOrExpression(node, 240 /* ClassDeclaration */);
+        }
+        function parseClassDeclarationOrExpression(node, kind) {
+            node.kind = kind;
+            parseExpected(76 /* ClassKeyword */);
+            node.name = parseNameOfClassDeclarationOrExpression();
+            node.typeParameters = parseTypeParameters();
+            node.heritageClauses = parseHeritageClauses();
+            if (parseExpected(18 /* OpenBraceToken */)) {
+                // ClassTail[Yield,Await] : (Modified) See 14.5
+                //      ClassHeritage[?Yield,?Await]opt { ClassBody[?Yield,?Await]opt }
+                node.members = parseClassMembers();
+                parseExpected(19 /* CloseBraceToken */);
+            }
+            else {
+                node.members = createMissingList();
+            }
+            return finishNode(node);
+        }
+        function parseNameOfClassDeclarationOrExpression() {
+            // implements is a future reserved word so
+            // 'class implements' might mean either
+            // - class expression with omitted name, 'implements' starts heritage clause
+            // - class with name 'implements'
+            // 'isImplementsClause' helps to disambiguate between these two cases
+            return isIdentifier() && !isImplementsClause()
+                ? parseIdentifier()
+                : undefined;
+        }
+        function isImplementsClause() {
+            return token() === 109 /* ImplementsKeyword */ && lookAhead(nextTokenIsIdentifierOrKeyword);
+        }
+        function parseHeritageClauses() {
+            // ClassTail[Yield,Await] : (Modified) See 14.5
+            //      ClassHeritage[?Yield,?Await]opt { ClassBody[?Yield,?Await]opt }
+            if (isHeritageClause()) {
+                return parseList(22 /* HeritageClauses */, parseHeritageClause);
+            }
+            return undefined;
+        }
+        function parseHeritageClause() {
+            var tok = token();
+            ts.Debug.assert(tok === 86 /* ExtendsKeyword */ || tok === 109 /* ImplementsKeyword */); // isListElement() should ensure this.
+            var node = createNode(273 /* HeritageClause */);
+            node.token = tok;
+            nextToken();
+            node.types = parseDelimitedList(7 /* HeritageClauseElement */, parseExpressionWithTypeArguments);
+            return finishNode(node);
+        }
+        function parseExpressionWithTypeArguments() {
+            var node = createNode(211 /* ExpressionWithTypeArguments */);
+            node.expression = parseLeftHandSideExpressionOrHigher();
+            node.typeArguments = tryParseTypeArguments();
+            return finishNode(node);
+        }
+        function tryParseTypeArguments() {
+            return token() === 28 /* LessThanToken */
+                ? parseBracketedList(20 /* TypeArguments */, parseType, 28 /* LessThanToken */, 30 /* GreaterThanToken */)
+                : undefined;
+        }
+        function isHeritageClause() {
+            return token() === 86 /* ExtendsKeyword */ || token() === 109 /* ImplementsKeyword */;
+        }
+        function parseClassMembers() {
+            return parseList(5 /* ClassMembers */, parseClassElement);
+        }
+        function parseInterfaceDeclaration(node) {
+            node.kind = 241 /* InterfaceDeclaration */;
+            parseExpected(110 /* InterfaceKeyword */);
+            node.name = parseIdentifier();
+            node.typeParameters = parseTypeParameters();
+            node.heritageClauses = parseHeritageClauses();
+            node.members = parseObjectTypeMembers();
+            return finishNode(node);
+        }
+        function parseTypeAliasDeclaration(node) {
+            node.kind = 242 /* TypeAliasDeclaration */;
+            parseExpected(140 /* TypeKeyword */);
+            node.name = parseIdentifier();
+            node.typeParameters = parseTypeParameters();
+            parseExpected(59 /* EqualsToken */);
+            node.type = parseType();
+            parseSemicolon();
+            return finishNode(node);
+        }
+        // In an ambient declaration, the grammar only allows integer literals as initializers.
+        // In a non-ambient declaration, the grammar allows uninitialized members only in a
+        // ConstantEnumMemberSection, which starts at the beginning of an enum declaration
+        // or any time an integer literal initializer is encountered.
+        function parseEnumMember() {
+            var node = createNodeWithJSDoc(278 /* EnumMember */);
+            node.name = parsePropertyName();
+            node.initializer = allowInAnd(parseInitializer);
+            return finishNode(node);
+        }
+        function parseEnumDeclaration(node) {
+            node.kind = 243 /* EnumDeclaration */;
+            parseExpected(84 /* EnumKeyword */);
+            node.name = parseIdentifier();
+            if (parseExpected(18 /* OpenBraceToken */)) {
+                node.members = parseDelimitedList(6 /* EnumMembers */, parseEnumMember);
+                parseExpected(19 /* CloseBraceToken */);
+            }
+            else {
+                node.members = createMissingList();
+            }
+            return finishNode(node);
+        }
+        function parseModuleBlock() {
+            var node = createNode(245 /* ModuleBlock */);
+            if (parseExpected(18 /* OpenBraceToken */)) {
+                node.statements = parseList(1 /* BlockStatements */, parseStatement);
+                parseExpected(19 /* CloseBraceToken */);
+            }
+            else {
+                node.statements = createMissingList();
+            }
+            return finishNode(node);
+        }
+        function parseModuleOrNamespaceDeclaration(node, flags) {
+            node.kind = 244 /* ModuleDeclaration */;
+            // If we are parsing a dotted namespace name, we want to
+            // propagate the 'Namespace' flag across the names if set.
+            var namespaceFlag = flags & 16 /* Namespace */;
+            node.flags |= flags;
+            node.name = parseIdentifier();
+            node.body = parseOptional(24 /* DotToken */)
+                ? parseModuleOrNamespaceDeclaration(createNode(0 /* Unknown */), 4 /* NestedNamespace */ | namespaceFlag)
+                : parseModuleBlock();
+            return finishNode(node);
+        }
+        function parseAmbientExternalModuleDeclaration(node) {
+            node.kind = 244 /* ModuleDeclaration */;
+            if (token() === 145 /* GlobalKeyword */) {
+                // parse 'global' as name of global scope augmentation
+                node.name = parseIdentifier();
+                node.flags |= 512 /* GlobalAugmentation */;
+            }
+            else {
+                node.name = parseLiteralNode();
+                node.name.text = internIdentifier(node.name.text);
+            }
+            if (token() === 18 /* OpenBraceToken */) {
+                node.body = parseModuleBlock();
+            }
+            else {
+                parseSemicolon();
+            }
+            return finishNode(node);
+        }
+        function parseModuleDeclaration(node) {
+            var flags = 0;
+            if (token() === 145 /* GlobalKeyword */) {
+                // global augmentation
+                return parseAmbientExternalModuleDeclaration(node);
+            }
+            else if (parseOptional(131 /* NamespaceKeyword */)) {
+                flags |= 16 /* Namespace */;
+            }
+            else {
+                parseExpected(130 /* ModuleKeyword */);
+                if (token() === 10 /* StringLiteral */) {
+                    return parseAmbientExternalModuleDeclaration(node);
+                }
+            }
+            return parseModuleOrNamespaceDeclaration(node, flags);
+        }
+        function isExternalModuleReference() {
+            return token() === 134 /* RequireKeyword */ &&
+                lookAhead(nextTokenIsOpenParen);
+        }
+        function nextTokenIsOpenParen() {
+            return nextToken() === 20 /* OpenParenToken */;
+        }
+        function nextTokenIsSlash() {
+            return nextToken() === 42 /* SlashToken */;
+        }
+        function parseNamespaceExportDeclaration(node) {
+            node.kind = 247 /* NamespaceExportDeclaration */;
+            parseExpected(119 /* AsKeyword */);
+            parseExpected(131 /* NamespaceKeyword */);
+            node.name = parseIdentifier();
+            parseSemicolon();
+            return finishNode(node);
+        }
+        function parseImportDeclarationOrImportEqualsDeclaration(node) {
+            parseExpected(92 /* ImportKeyword */);
+            var afterImportPos = scanner.getStartPos();
+            var identifier;
+            if (isIdentifier()) {
+                identifier = parseIdentifier();
+                if (token() !== 27 /* CommaToken */ && token() !== 144 /* FromKeyword */) {
+                    return parseImportEqualsDeclaration(node, identifier);
+                }
+            }
+            // Import statement
+            node.kind = 249 /* ImportDeclaration */;
+            // ImportDeclaration:
+            //  import ImportClause from ModuleSpecifier ;
+            //  import ModuleSpecifier;
+            if (identifier || // import id
+                token() === 40 /* AsteriskToken */ || // import *
+                token() === 18 /* OpenBraceToken */) { // import {
+                node.importClause = parseImportClause(identifier, afterImportPos);
+                parseExpected(144 /* FromKeyword */);
+            }
+            node.moduleSpecifier = parseModuleSpecifier();
+            parseSemicolon();
+            return finishNode(node);
+        }
+        function parseImportEqualsDeclaration(node, identifier) {
+            node.kind = 248 /* ImportEqualsDeclaration */;
+            node.name = identifier;
+            parseExpected(59 /* EqualsToken */);
+            node.moduleReference = parseModuleReference();
+            parseSemicolon();
+            return finishNode(node);
+        }
+        function parseImportClause(identifier, fullStart) {
+            // ImportClause:
+            //  ImportedDefaultBinding
+            //  NameSpaceImport
+            //  NamedImports
+            //  ImportedDefaultBinding, NameSpaceImport
+            //  ImportedDefaultBinding, NamedImports
+            var importClause = createNode(250 /* ImportClause */, fullStart);
+            if (identifier) {
+                // ImportedDefaultBinding:
+                //  ImportedBinding
+                importClause.name = identifier;
+            }
+            // If there was no default import or if there is comma token after default import
+            // parse namespace or named imports
+            if (!importClause.name ||
+                parseOptional(27 /* CommaToken */)) {
+                importClause.namedBindings = token() === 40 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(252 /* NamedImports */);
+            }
+            return finishNode(importClause);
+        }
+        function parseModuleReference() {
+            return isExternalModuleReference()
+                ? parseExternalModuleReference()
+                : parseEntityName(/*allowReservedWords*/ false);
+        }
+        function parseExternalModuleReference() {
+            var node = createNode(259 /* ExternalModuleReference */);
+            parseExpected(134 /* RequireKeyword */);
+            parseExpected(20 /* OpenParenToken */);
+            node.expression = parseModuleSpecifier();
+            parseExpected(21 /* CloseParenToken */);
+            return finishNode(node);
+        }
+        function parseModuleSpecifier() {
+            if (token() === 10 /* StringLiteral */) {
+                var result = parseLiteralNode();
+                result.text = internIdentifier(result.text);
+                return result;
+            }
+            else {
+                // We allow arbitrary expressions here, even though the grammar only allows string
+                // literals.  We check to ensure that it is only a string literal later in the grammar
+                // check pass.
+                return parseExpression();
+            }
+        }
+        function parseNamespaceImport() {
+            // NameSpaceImport:
+            //  * as ImportedBinding
+            var namespaceImport = createNode(251 /* NamespaceImport */);
+            parseExpected(40 /* AsteriskToken */);
+            parseExpected(119 /* AsKeyword */);
+            namespaceImport.name = parseIdentifier();
+            return finishNode(namespaceImport);
+        }
+        function parseNamedImportsOrExports(kind) {
+            var node = createNode(kind);
+            // NamedImports:
+            //  { }
+            //  { ImportsList }
+            //  { ImportsList, }
+            // ImportsList:
+            //  ImportSpecifier
+            //  ImportsList, ImportSpecifier
+            node.elements = parseBracketedList(23 /* ImportOrExportSpecifiers */, kind === 252 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 18 /* OpenBraceToken */, 19 /* CloseBraceToken */);
+            return finishNode(node);
+        }
+        function parseExportSpecifier() {
+            return parseImportOrExportSpecifier(257 /* ExportSpecifier */);
+        }
+        function parseImportSpecifier() {
+            return parseImportOrExportSpecifier(253 /* ImportSpecifier */);
+        }
+        function parseImportOrExportSpecifier(kind) {
+            var node = createNode(kind);
+            // ImportSpecifier:
+            //   BindingIdentifier
+            //   IdentifierName as BindingIdentifier
+            // ExportSpecifier:
+            //   IdentifierName
+            //   IdentifierName as IdentifierName
+            var checkIdentifierIsKeyword = ts.isKeyword(token()) && !isIdentifier();
+            var checkIdentifierStart = scanner.getTokenPos();
+            var checkIdentifierEnd = scanner.getTextPos();
+            var identifierName = parseIdentifierName();
+            if (token() === 119 /* AsKeyword */) {
+                node.propertyName = identifierName;
+                parseExpected(119 /* AsKeyword */);
+                checkIdentifierIsKeyword = ts.isKeyword(token()) && !isIdentifier();
+                checkIdentifierStart = scanner.getTokenPos();
+                checkIdentifierEnd = scanner.getTextPos();
+                node.name = parseIdentifierName();
+            }
+            else {
+                node.name = identifierName;
+            }
+            if (kind === 253 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
+                parseErrorAt(checkIdentifierStart, checkIdentifierEnd, ts.Diagnostics.Identifier_expected);
+            }
+            return finishNode(node);
+        }
+        function parseExportDeclaration(node) {
+            node.kind = 255 /* ExportDeclaration */;
+            if (parseOptional(40 /* AsteriskToken */)) {
+                parseExpected(144 /* FromKeyword */);
+                node.moduleSpecifier = parseModuleSpecifier();
+            }
+            else {
+                node.exportClause = parseNamedImportsOrExports(256 /* NamedExports */);
+                // It is not uncommon to accidentally omit the 'from' keyword. Additionally, in editing scenarios,
+                // the 'from' keyword can be parsed as a named export when the export clause is unterminated (i.e. `export { from "moduleName";`)
+                // If we don't have a 'from' keyword, see if we have a string literal such that ASI won't take effect.
+                if (token() === 144 /* FromKeyword */ || (token() === 10 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) {
+                    parseExpected(144 /* FromKeyword */);
+                    node.moduleSpecifier = parseModuleSpecifier();
+                }
+            }
+            parseSemicolon();
+            return finishNode(node);
+        }
+        function parseExportAssignment(node) {
+            node.kind = 254 /* ExportAssignment */;
+            if (parseOptional(59 /* EqualsToken */)) {
+                node.isExportEquals = true;
+            }
+            else {
+                parseExpected(80 /* DefaultKeyword */);
+            }
+            node.expression = parseAssignmentExpressionOrHigher();
+            parseSemicolon();
+            return finishNode(node);
+        }
+        function setExternalModuleIndicator(sourceFile) {
+            // Try to use the first top-level import/export when available, then
+            // fall back to looking for an 'import.meta' somewhere in the tree if necessary.
+            sourceFile.externalModuleIndicator =
+                ts.forEach(sourceFile.statements, isAnExternalModuleIndicatorNode) ||
+                    getImportMetaIfNecessary(sourceFile);
+        }
+        function isAnExternalModuleIndicatorNode(node) {
+            return ts.hasModifier(node, 1 /* Export */)
+                || node.kind === 248 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 259 /* ExternalModuleReference */
+                || node.kind === 249 /* ImportDeclaration */
+                || node.kind === 254 /* ExportAssignment */
+                || node.kind === 255 /* ExportDeclaration */
+                ? node
+                : undefined;
+        }
+        function getImportMetaIfNecessary(sourceFile) {
+            return sourceFile.flags & 1048576 /* PossiblyContainsImportMeta */ ?
+                walkTreeForExternalModuleIndicators(sourceFile) :
+                undefined;
+        }
+        function walkTreeForExternalModuleIndicators(node) {
+            return isImportMeta(node) ? node : forEachChild(node, walkTreeForExternalModuleIndicators);
+        }
+        function isImportMeta(node) {
+            return ts.isMetaProperty(node) && node.keywordToken === 92 /* ImportKeyword */ && node.name.escapedText === "meta";
+        }
+        var ParsingContext;
+        (function (ParsingContext) {
+            ParsingContext[ParsingContext["SourceElements"] = 0] = "SourceElements";
+            ParsingContext[ParsingContext["BlockStatements"] = 1] = "BlockStatements";
+            ParsingContext[ParsingContext["SwitchClauses"] = 2] = "SwitchClauses";
+            ParsingContext[ParsingContext["SwitchClauseStatements"] = 3] = "SwitchClauseStatements";
+            ParsingContext[ParsingContext["TypeMembers"] = 4] = "TypeMembers";
+            ParsingContext[ParsingContext["ClassMembers"] = 5] = "ClassMembers";
+            ParsingContext[ParsingContext["EnumMembers"] = 6] = "EnumMembers";
+            ParsingContext[ParsingContext["HeritageClauseElement"] = 7] = "HeritageClauseElement";
+            ParsingContext[ParsingContext["VariableDeclarations"] = 8] = "VariableDeclarations";
+            ParsingContext[ParsingContext["ObjectBindingElements"] = 9] = "ObjectBindingElements";
+            ParsingContext[ParsingContext["ArrayBindingElements"] = 10] = "ArrayBindingElements";
+            ParsingContext[ParsingContext["ArgumentExpressions"] = 11] = "ArgumentExpressions";
+            ParsingContext[ParsingContext["ObjectLiteralMembers"] = 12] = "ObjectLiteralMembers";
+            ParsingContext[ParsingContext["JsxAttributes"] = 13] = "JsxAttributes";
+            ParsingContext[ParsingContext["JsxChildren"] = 14] = "JsxChildren";
+            ParsingContext[ParsingContext["ArrayLiteralMembers"] = 15] = "ArrayLiteralMembers";
+            ParsingContext[ParsingContext["Parameters"] = 16] = "Parameters";
+            ParsingContext[ParsingContext["JSDocParameters"] = 17] = "JSDocParameters";
+            ParsingContext[ParsingContext["RestProperties"] = 18] = "RestProperties";
+            ParsingContext[ParsingContext["TypeParameters"] = 19] = "TypeParameters";
+            ParsingContext[ParsingContext["TypeArguments"] = 20] = "TypeArguments";
+            ParsingContext[ParsingContext["TupleElementTypes"] = 21] = "TupleElementTypes";
+            ParsingContext[ParsingContext["HeritageClauses"] = 22] = "HeritageClauses";
+            ParsingContext[ParsingContext["ImportOrExportSpecifiers"] = 23] = "ImportOrExportSpecifiers";
+            ParsingContext[ParsingContext["Count"] = 24] = "Count"; // Number of parsing contexts
+        })(ParsingContext || (ParsingContext = {}));
+        var Tristate;
+        (function (Tristate) {
+            Tristate[Tristate["False"] = 0] = "False";
+            Tristate[Tristate["True"] = 1] = "True";
+            Tristate[Tristate["Unknown"] = 2] = "Unknown";
+        })(Tristate || (Tristate = {}));
+        var JSDocParser;
+        (function (JSDocParser) {
+            function parseJSDocTypeExpressionForTests(content, start, length) {
+                initializeState(content, 6 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
+                sourceFile = createSourceFile("file.js", 6 /* Latest */, 1 /* JS */, /*isDeclarationFile*/ false);
+                scanner.setText(content, start, length);
+                currentToken = scanner.scan();
+                var jsDocTypeExpression = parseJSDocTypeExpression();
+                var diagnostics = parseDiagnostics;
+                clearState();
+                return jsDocTypeExpression ? { jsDocTypeExpression: jsDocTypeExpression, diagnostics: diagnostics } : undefined;
+            }
+            JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
+            // Parses out a JSDoc type expression.
+            function parseJSDocTypeExpression(mayOmitBraces) {
+                var result = createNode(283 /* JSDocTypeExpression */);
+                var hasBrace = (mayOmitBraces ? parseOptional : parseExpected)(18 /* OpenBraceToken */);
+                result.type = doInsideOfContext(2097152 /* JSDoc */, parseJSDocType);
+                if (!mayOmitBraces || hasBrace) {
+                    parseExpected(19 /* CloseBraceToken */);
+                }
+                fixupParentReferences(result);
+                return finishNode(result);
+            }
+            JSDocParser.parseJSDocTypeExpression = parseJSDocTypeExpression;
+            function parseIsolatedJSDocComment(content, start, length) {
+                initializeState(content, 6 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
+                sourceFile = { languageVariant: 0 /* Standard */, text: content }; // tslint:disable-line no-object-literal-type-assertion
+                var jsDoc = parseJSDocCommentWorker(start, length);
+                var diagnostics = parseDiagnostics;
+                clearState();
+                return jsDoc ? { jsDoc: jsDoc, diagnostics: diagnostics } : undefined;
+            }
+            JSDocParser.parseIsolatedJSDocComment = parseIsolatedJSDocComment;
+            function parseJSDocComment(parent, start, length) {
+                var _a;
+                var saveToken = currentToken;
+                var saveParseDiagnosticsLength = parseDiagnostics.length;
+                var saveParseErrorBeforeNextFinishedNode = parseErrorBeforeNextFinishedNode;
+                var comment = parseJSDocCommentWorker(start, length);
+                if (comment) {
+                    comment.parent = parent;
+                }
+                if (contextFlags & 65536 /* JavaScriptFile */) {
+                    if (!sourceFile.jsDocDiagnostics) {
+                        sourceFile.jsDocDiagnostics = [];
+                    }
+                    (_a = sourceFile.jsDocDiagnostics).push.apply(_a, parseDiagnostics);
+                }
+                currentToken = saveToken;
+                parseDiagnostics.length = saveParseDiagnosticsLength;
+                parseErrorBeforeNextFinishedNode = saveParseErrorBeforeNextFinishedNode;
+                return comment;
+            }
+            JSDocParser.parseJSDocComment = parseJSDocComment;
+            var JSDocState;
+            (function (JSDocState) {
+                JSDocState[JSDocState["BeginningOfLine"] = 0] = "BeginningOfLine";
+                JSDocState[JSDocState["SawAsterisk"] = 1] = "SawAsterisk";
+                JSDocState[JSDocState["SavingComments"] = 2] = "SavingComments";
+            })(JSDocState || (JSDocState = {}));
+            var PropertyLikeParse;
+            (function (PropertyLikeParse) {
+                PropertyLikeParse[PropertyLikeParse["Property"] = 1] = "Property";
+                PropertyLikeParse[PropertyLikeParse["Parameter"] = 2] = "Parameter";
+                PropertyLikeParse[PropertyLikeParse["CallbackParameter"] = 4] = "CallbackParameter";
+            })(PropertyLikeParse || (PropertyLikeParse = {}));
+            function parseJSDocCommentWorker(start, length) {
+                if (start === void 0) { start = 0; }
+                var content = sourceText;
+                var end = length === undefined ? content.length : start + length;
+                length = end - start;
+                ts.Debug.assert(start >= 0);
+                ts.Debug.assert(start <= end);
+                ts.Debug.assert(end <= content.length);
+                // Check for /** (JSDoc opening part)
+                if (!isJSDocLikeText(content, start)) {
+                    return undefined;
+                }
+                var tags;
+                var tagsPos;
+                var tagsEnd;
+                var comments = [];
+                // + 3 for leading /**, - 5 in total for /** */
+                return scanner.scanRange(start + 3, length - 5, function () {
+                    // Initially we can parse out a tag.  We also have seen a starting asterisk.
+                    // This is so that /** * @type */ doesn't parse.
+                    var state = 1 /* SawAsterisk */;
+                    var margin;
+                    // + 4 for leading '/** '
+                    var indent = start - Math.max(content.lastIndexOf("\n", start), 0) + 4;
+                    function pushComment(text) {
+                        if (!margin) {
+                            margin = indent;
+                        }
+                        comments.push(text);
+                        indent += text.length;
+                    }
+                    nextJSDocToken();
+                    while (parseOptionalJsdoc(5 /* WhitespaceTrivia */))
+                        ;
+                    if (parseOptionalJsdoc(4 /* NewLineTrivia */)) {
+                        state = 0 /* BeginningOfLine */;
+                        indent = 0;
+                    }
+                    loop: while (true) {
+                        switch (token()) {
+                            case 58 /* AtToken */:
+                                if (state === 0 /* BeginningOfLine */ || state === 1 /* SawAsterisk */) {
+                                    removeTrailingWhitespace(comments);
+                                    addTag(parseTag(indent));
+                                    // NOTE: According to usejsdoc.org, a tag goes to end of line, except the last tag.
+                                    // Real-world comments may break this rule, so "BeginningOfLine" will not be a real line beginning
+                                    // for malformed examples like `/** @param {string} x @returns {number} the length */`
+                                    state = 0 /* BeginningOfLine */;
+                                    margin = undefined;
+                                    indent++;
+                                }
+                                else {
+                                    pushComment(scanner.getTokenText());
+                                }
+                                break;
+                            case 4 /* NewLineTrivia */:
+                                comments.push(scanner.getTokenText());
+                                state = 0 /* BeginningOfLine */;
+                                indent = 0;
+                                break;
+                            case 40 /* AsteriskToken */:
+                                var asterisk = scanner.getTokenText();
+                                if (state === 1 /* SawAsterisk */ || state === 2 /* SavingComments */) {
+                                    // If we've already seen an asterisk, then we can no longer parse a tag on this line
+                                    state = 2 /* SavingComments */;
+                                    pushComment(asterisk);
+                                }
+                                else {
+                                    // Ignore the first asterisk on a line
+                                    state = 1 /* SawAsterisk */;
+                                    indent += asterisk.length;
+                                }
+                                break;
+                            case 5 /* WhitespaceTrivia */:
+                                // only collect whitespace if we're already saving comments or have just crossed the comment indent margin
+                                var whitespace = scanner.getTokenText();
+                                if (state === 2 /* SavingComments */) {
+                                    comments.push(whitespace);
+                                }
+                                else if (margin !== undefined && indent + whitespace.length > margin) {
+                                    comments.push(whitespace.slice(margin - indent - 1));
+                                }
+                                indent += whitespace.length;
+                                break;
+                            case 1 /* EndOfFileToken */:
+                                break loop;
+                            default:
+                                // Anything else is doc comment text. We just save it. Because it
+                                // wasn't a tag, we can no longer parse a tag on this line until we hit the next
+                                // line break.
+                                state = 2 /* SavingComments */;
+                                pushComment(scanner.getTokenText());
+                                break;
+                        }
+                        nextJSDocToken();
+                    }
+                    removeLeadingNewlines(comments);
+                    removeTrailingWhitespace(comments);
+                    return createJSDocComment();
+                });
+                function removeLeadingNewlines(comments) {
+                    while (comments.length && (comments[0] === "\n" || comments[0] === "\r")) {
+                        comments.shift();
+                    }
+                }
+                function removeTrailingWhitespace(comments) {
+                    while (comments.length && comments[comments.length - 1].trim() === "") {
+                        comments.pop();
+                    }
+                }
+                function createJSDocComment() {
+                    var result = createNode(291 /* JSDocComment */, start);
+                    result.tags = tags && createNodeArray(tags, tagsPos, tagsEnd);
+                    result.comment = comments.length ? comments.join("") : undefined;
+                    return finishNode(result, end);
+                }
+                function isNextNonwhitespaceTokenEndOfFile() {
+                    // We must use infinite lookahead, as there could be any number of newlines :(
+                    while (true) {
+                        nextJSDocToken();
+                        if (token() === 1 /* EndOfFileToken */) {
+                            return true;
+                        }
+                        if (!(token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */)) {
+                            return false;
+                        }
+                    }
+                }
+                function skipWhitespace() {
+                    if (token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
+                        if (lookAhead(isNextNonwhitespaceTokenEndOfFile)) {
+                            return; // Don't skip whitespace prior to EoF (or end of comment) - that shouldn't be included in any node's range
+                        }
+                    }
+                    while (token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
+                        nextJSDocToken();
+                    }
+                }
+                function skipWhitespaceOrAsterisk() {
+                    if (token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
+                        if (lookAhead(isNextNonwhitespaceTokenEndOfFile)) {
+                            return; // Don't skip whitespace prior to EoF (or end of comment) - that shouldn't be included in any node's range
+                        }
+                    }
+                    var precedingLineBreak = scanner.hasPrecedingLineBreak();
+                    while ((precedingLineBreak && token() === 40 /* AsteriskToken */) || token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
+                        if (token() === 4 /* NewLineTrivia */) {
+                            precedingLineBreak = true;
+                        }
+                        else if (token() === 40 /* AsteriskToken */) {
+                            precedingLineBreak = false;
+                        }
+                        nextJSDocToken();
+                    }
+                }
+                function parseTag(indent) {
+                    ts.Debug.assert(token() === 58 /* AtToken */);
+                    var start = scanner.getTokenPos();
+                    nextJSDocToken();
+                    var tagName = parseJSDocIdentifierName(/*message*/ undefined);
+                    skipWhitespaceOrAsterisk();
+                    var tag;
+                    switch (tagName.escapedText) {
+                        case "augments":
+                        case "extends":
+                            tag = parseAugmentsTag(start, tagName);
+                            break;
+                        case "class":
+                        case "constructor":
+                            tag = parseClassTag(start, tagName);
+                            break;
+                        case "this":
+                            tag = parseThisTag(start, tagName);
+                            break;
+                        case "enum":
+                            tag = parseEnumTag(start, tagName);
+                            break;
+                        case "arg":
+                        case "argument":
+                        case "param":
+                            return parseParameterOrPropertyTag(start, tagName, 2 /* Parameter */, indent);
+                        case "return":
+                        case "returns":
+                            tag = parseReturnTag(start, tagName);
+                            break;
+                        case "template":
+                            tag = parseTemplateTag(start, tagName);
+                            break;
+                        case "type":
+                            tag = parseTypeTag(start, tagName);
+                            break;
+                        case "typedef":
+                            tag = parseTypedefTag(start, tagName, indent);
+                            break;
+                        case "callback":
+                            tag = parseCallbackTag(start, tagName, indent);
+                            break;
+                        default:
+                            tag = parseUnknownTag(start, tagName);
+                            break;
+                    }
+                    if (!tag.comment) {
+                        // some tags, like typedef and callback, have already parsed their comments earlier
+                        tag.comment = parseTagComments(indent + tag.end - tag.pos);
+                    }
+                    return tag;
+                }
+                function parseTagComments(indent) {
+                    var comments = [];
+                    var state = 0 /* BeginningOfLine */;
+                    var margin;
+                    function pushComment(text) {
+                        if (!margin) {
+                            margin = indent;
+                        }
+                        comments.push(text);
+                        indent += text.length;
+                    }
+                    var tok = token();
+                    loop: while (true) {
+                        switch (tok) {
+                            case 4 /* NewLineTrivia */:
+                                if (state >= 1 /* SawAsterisk */) {
+                                    state = 0 /* BeginningOfLine */;
+                                    comments.push(scanner.getTokenText());
+                                }
+                                indent = 0;
+                                break;
+                            case 58 /* AtToken */:
+                                scanner.setTextPos(scanner.getTextPos() - 1);
+                            // falls through
+                            case 1 /* EndOfFileToken */:
+                                // Done
+                                break loop;
+                            case 5 /* WhitespaceTrivia */:
+                                if (state === 2 /* SavingComments */) {
+                                    pushComment(scanner.getTokenText());
+                                }
+                                else {
+                                    var whitespace = scanner.getTokenText();
+                                    // if the whitespace crosses the margin, take only the whitespace that passes the margin
+                                    if (margin !== undefined && indent + whitespace.length > margin) {
+                                        comments.push(whitespace.slice(margin - indent - 1));
+                                    }
+                                    indent += whitespace.length;
+                                }
+                                break;
+                            case 18 /* OpenBraceToken */:
+                                state = 2 /* SavingComments */;
+                                if (lookAhead(function () { return nextJSDocToken() === 58 /* AtToken */ && ts.tokenIsIdentifierOrKeyword(nextJSDocToken()) && scanner.getTokenText() === "link"; })) {
+                                    pushComment(scanner.getTokenText());
+                                    nextJSDocToken();
+                                    pushComment(scanner.getTokenText());
+                                    nextJSDocToken();
+                                }
+                                pushComment(scanner.getTokenText());
+                                break;
+                            case 40 /* AsteriskToken */:
+                                if (state === 0 /* BeginningOfLine */) {
+                                    // leading asterisks start recording on the *next* (non-whitespace) token
+                                    state = 1 /* SawAsterisk */;
+                                    indent += 1;
+                                    break;
+                                }
+                            // record the * as a comment
+                            // falls through
+                            default:
+                                state = 2 /* SavingComments */; // leading identifiers start recording as well
+                                pushComment(scanner.getTokenText());
+                                break;
+                        }
+                        tok = nextJSDocToken();
+                    }
+                    removeLeadingNewlines(comments);
+                    removeTrailingWhitespace(comments);
+                    return comments.length === 0 ? undefined : comments.join("");
+                }
+                function parseUnknownTag(start, tagName) {
+                    var result = createNode(294 /* JSDocTag */, start);
+                    result.tagName = tagName;
+                    return finishNode(result);
+                }
+                function addTag(tag) {
+                    if (!tag) {
+                        return;
+                    }
+                    if (!tags) {
+                        tags = [tag];
+                        tagsPos = tag.pos;
+                    }
+                    else {
+                        tags.push(tag);
+                    }
+                    tagsEnd = tag.end;
+                }
+                function tryParseTypeExpression() {
+                    skipWhitespaceOrAsterisk();
+                    return token() === 18 /* OpenBraceToken */ ? parseJSDocTypeExpression() : undefined;
+                }
+                function parseBracketNameInPropertyAndParamTag() {
+                    if (token() === 14 /* NoSubstitutionTemplateLiteral */) {
+                        // a markdown-quoted name: `arg` is not legal jsdoc, but occurs in the wild
+                        return { name: createIdentifier(/*isIdentifier*/ true), isBracketed: false };
+                    }
+                    // Looking for something like '[foo]', 'foo', '[foo.bar]' or 'foo.bar'
+                    var isBracketed = parseOptional(22 /* OpenBracketToken */);
+                    var name = parseJSDocEntityName();
+                    if (isBracketed) {
+                        skipWhitespace();
+                        // May have an optional default, e.g. '[foo = 42]'
+                        if (parseOptionalToken(59 /* EqualsToken */)) {
+                            parseExpression();
+                        }
+                        parseExpected(23 /* CloseBracketToken */);
+                    }
+                    return { name: name, isBracketed: isBracketed };
+                }
+                function isObjectOrObjectArrayTypeReference(node) {
+                    switch (node.kind) {
+                        case 136 /* ObjectKeyword */:
+                            return true;
+                        case 169 /* ArrayType */:
+                            return isObjectOrObjectArrayTypeReference(node.elementType);
+                        default:
+                            return ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName) && node.typeName.escapedText === "Object";
+                    }
+                }
+                function parseParameterOrPropertyTag(start, tagName, target, indent) {
+                    var typeExpression = tryParseTypeExpression();
+                    var isNameFirst = !typeExpression;
+                    skipWhitespaceOrAsterisk();
+                    var _a = parseBracketNameInPropertyAndParamTag(), name = _a.name, isBracketed = _a.isBracketed;
+                    skipWhitespace();
+                    if (isNameFirst) {
+                        typeExpression = tryParseTypeExpression();
+                    }
+                    var result = target === 1 /* Property */ ?
+                        createNode(305 /* JSDocPropertyTag */, start) :
+                        createNode(299 /* JSDocParameterTag */, start);
+                    var comment = parseTagComments(indent + scanner.getStartPos() - start);
+                    var nestedTypeLiteral = target !== 4 /* CallbackParameter */ && parseNestedTypeLiteral(typeExpression, name, target, indent);
+                    if (nestedTypeLiteral) {
+                        typeExpression = nestedTypeLiteral;
+                        isNameFirst = true;
+                    }
+                    result.tagName = tagName;
+                    result.typeExpression = typeExpression;
+                    result.name = name;
+                    result.isNameFirst = isNameFirst;
+                    result.isBracketed = isBracketed;
+                    result.comment = comment;
+                    return finishNode(result);
+                }
+                function parseNestedTypeLiteral(typeExpression, name, target, indent) {
+                    if (typeExpression && isObjectOrObjectArrayTypeReference(typeExpression.type)) {
+                        var typeLiteralExpression = createNode(283 /* JSDocTypeExpression */, scanner.getTokenPos());
+                        var child = void 0;
+                        var jsdocTypeLiteral = void 0;
+                        var start_2 = scanner.getStartPos();
+                        var children = void 0;
+                        while (child = tryParse(function () { return parseChildParameterOrPropertyTag(target, indent, name); })) {
+                            if (child.kind === 299 /* JSDocParameterTag */ || child.kind === 305 /* JSDocPropertyTag */) {
+                                children = ts.append(children, child);
+                            }
+                        }
+                        if (children) {
+                            jsdocTypeLiteral = createNode(292 /* JSDocTypeLiteral */, start_2);
+                            jsdocTypeLiteral.jsDocPropertyTags = children;
+                            if (typeExpression.type.kind === 169 /* ArrayType */) {
+                                jsdocTypeLiteral.isArrayType = true;
+                            }
+                            typeLiteralExpression.type = finishNode(jsdocTypeLiteral);
+                            return finishNode(typeLiteralExpression);
+                        }
+                    }
+                }
+                function parseReturnTag(start, tagName) {
+                    if (ts.forEach(tags, function (t) { return t.kind === 300 /* JSDocReturnTag */; })) {
+                        parseErrorAt(tagName.pos, scanner.getTokenPos(), ts.Diagnostics._0_tag_already_specified, tagName.escapedText);
+                    }
+                    var result = createNode(300 /* JSDocReturnTag */, start);
+                    result.tagName = tagName;
+                    result.typeExpression = tryParseTypeExpression();
+                    return finishNode(result);
+                }
+                function parseTypeTag(start, tagName) {
+                    if (ts.forEach(tags, function (t) { return t.kind === 302 /* JSDocTypeTag */; })) {
+                        parseErrorAt(tagName.pos, scanner.getTokenPos(), ts.Diagnostics._0_tag_already_specified, tagName.escapedText);
+                    }
+                    var result = createNode(302 /* JSDocTypeTag */, start);
+                    result.tagName = tagName;
+                    result.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
+                    return finishNode(result);
+                }
+                function parseAugmentsTag(start, tagName) {
+                    var result = createNode(295 /* JSDocAugmentsTag */, start);
+                    result.tagName = tagName;
+                    result.class = parseExpressionWithTypeArgumentsForAugments();
+                    return finishNode(result);
+                }
+                function parseExpressionWithTypeArgumentsForAugments() {
+                    var usedBrace = parseOptional(18 /* OpenBraceToken */);
+                    var node = createNode(211 /* ExpressionWithTypeArguments */);
+                    node.expression = parsePropertyAccessEntityNameExpression();
+                    node.typeArguments = tryParseTypeArguments();
+                    var res = finishNode(node);
+                    if (usedBrace) {
+                        parseExpected(19 /* CloseBraceToken */);
+                    }
+                    return res;
+                }
+                function parsePropertyAccessEntityNameExpression() {
+                    var node = parseJSDocIdentifierName();
+                    while (parseOptional(24 /* DotToken */)) {
+                        var prop = createNode(189 /* PropertyAccessExpression */, node.pos);
+                        prop.expression = node;
+                        prop.name = parseJSDocIdentifierName();
+                        node = finishNode(prop);
+                    }
+                    return node;
+                }
+                function parseClassTag(start, tagName) {
+                    var tag = createNode(296 /* JSDocClassTag */, start);
+                    tag.tagName = tagName;
+                    return finishNode(tag);
+                }
+                function parseThisTag(start, tagName) {
+                    var tag = createNode(301 /* JSDocThisTag */, start);
+                    tag.tagName = tagName;
+                    tag.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
+                    skipWhitespace();
+                    return finishNode(tag);
+                }
+                function parseEnumTag(start, tagName) {
+                    var tag = createNode(298 /* JSDocEnumTag */, start);
+                    tag.tagName = tagName;
+                    tag.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
+                    skipWhitespace();
+                    return finishNode(tag);
+                }
+                function parseTypedefTag(start, tagName, indent) {
+                    var typeExpression = tryParseTypeExpression();
+                    skipWhitespaceOrAsterisk();
+                    var typedefTag = createNode(304 /* JSDocTypedefTag */, start);
+                    typedefTag.tagName = tagName;
+                    typedefTag.fullName = parseJSDocTypeNameWithNamespace();
+                    typedefTag.name = getJSDocTypeAliasName(typedefTag.fullName);
+                    skipWhitespace();
+                    typedefTag.comment = parseTagComments(indent);
+                    typedefTag.typeExpression = typeExpression;
+                    var end;
+                    if (!typeExpression || isObjectOrObjectArrayTypeReference(typeExpression.type)) {
+                        var child = void 0;
+                        var jsdocTypeLiteral = void 0;
+                        var childTypeTag = void 0;
+                        while (child = tryParse(function () { return parseChildPropertyTag(indent); })) {
+                            if (!jsdocTypeLiteral) {
+                                jsdocTypeLiteral = createNode(292 /* JSDocTypeLiteral */, start);
+                            }
+                            if (child.kind === 302 /* JSDocTypeTag */) {
+                                if (childTypeTag) {
+                                    break;
+                                }
+                                else {
+                                    childTypeTag = child;
+                                }
+                            }
+                            else {
+                                jsdocTypeLiteral.jsDocPropertyTags = ts.append(jsdocTypeLiteral.jsDocPropertyTags, child);
+                            }
+                        }
+                        if (jsdocTypeLiteral) {
+                            if (typeExpression && typeExpression.type.kind === 169 /* ArrayType */) {
+                                jsdocTypeLiteral.isArrayType = true;
+                            }
+                            typedefTag.typeExpression = childTypeTag && childTypeTag.typeExpression && !isObjectOrObjectArrayTypeReference(childTypeTag.typeExpression.type) ?
+                                childTypeTag.typeExpression :
+                                finishNode(jsdocTypeLiteral);
+                            end = typedefTag.typeExpression.end;
+                        }
+                    }
+                    // Only include the characters between the name end and the next token if a comment was actually parsed out - otherwise it's just whitespace
+                    return finishNode(typedefTag, end || typedefTag.comment !== undefined ? scanner.getStartPos() : (typedefTag.fullName || typedefTag.typeExpression || typedefTag.tagName).end);
+                }
+                function parseJSDocTypeNameWithNamespace(nested) {
+                    var pos = scanner.getTokenPos();
+                    if (!ts.tokenIsIdentifierOrKeyword(token())) {
+                        return undefined;
+                    }
+                    var typeNameOrNamespaceName = parseJSDocIdentifierName();
+                    if (parseOptional(24 /* DotToken */)) {
+                        var jsDocNamespaceNode = createNode(244 /* ModuleDeclaration */, pos);
+                        if (nested) {
+                            jsDocNamespaceNode.flags |= 4 /* NestedNamespace */;
+                        }
+                        jsDocNamespaceNode.name = typeNameOrNamespaceName;
+                        jsDocNamespaceNode.body = parseJSDocTypeNameWithNamespace(/*nested*/ true);
+                        return finishNode(jsDocNamespaceNode);
+                    }
+                    if (nested) {
+                        typeNameOrNamespaceName.isInJSDocNamespace = true;
+                    }
+                    return typeNameOrNamespaceName;
+                }
+                function parseCallbackTag(start, tagName, indent) {
+                    var callbackTag = createNode(297 /* JSDocCallbackTag */, start);
+                    callbackTag.tagName = tagName;
+                    callbackTag.fullName = parseJSDocTypeNameWithNamespace();
+                    callbackTag.name = getJSDocTypeAliasName(callbackTag.fullName);
+                    skipWhitespace();
+                    callbackTag.comment = parseTagComments(indent);
+                    var child;
+                    var jsdocSignature = createNode(293 /* JSDocSignature */, start);
+                    jsdocSignature.parameters = [];
+                    while (child = tryParse(function () { return parseChildParameterOrPropertyTag(4 /* CallbackParameter */, indent); })) {
+                        jsdocSignature.parameters = ts.append(jsdocSignature.parameters, child);
+                    }
+                    var returnTag = tryParse(function () {
+                        if (parseOptionalJsdoc(58 /* AtToken */)) {
+                            var tag = parseTag(indent);
+                            if (tag && tag.kind === 300 /* JSDocReturnTag */) {
+                                return tag;
+                            }
+                        }
+                    });
+                    if (returnTag) {
+                        jsdocSignature.type = returnTag;
+                    }
+                    callbackTag.typeExpression = finishNode(jsdocSignature);
+                    return finishNode(callbackTag);
+                }
+                function getJSDocTypeAliasName(fullName) {
+                    if (fullName) {
+                        var rightNode = fullName;
+                        while (true) {
+                            if (ts.isIdentifier(rightNode) || !rightNode.body) {
+                                return ts.isIdentifier(rightNode) ? rightNode : rightNode.name;
+                            }
+                            rightNode = rightNode.body;
+                        }
+                    }
+                }
+                function escapedTextsEqual(a, b) {
+                    while (!ts.isIdentifier(a) || !ts.isIdentifier(b)) {
+                        if (!ts.isIdentifier(a) && !ts.isIdentifier(b) && a.right.escapedText === b.right.escapedText) {
+                            a = a.left;
+                            b = b.left;
+                        }
+                        else {
+                            return false;
+                        }
+                    }
+                    return a.escapedText === b.escapedText;
+                }
+                function parseChildPropertyTag(indent) {
+                    return parseChildParameterOrPropertyTag(1 /* Property */, indent);
+                }
+                function parseChildParameterOrPropertyTag(target, indent, name) {
+                    var canParseTag = true;
+                    var seenAsterisk = false;
+                    while (true) {
+                        switch (nextJSDocToken()) {
+                            case 58 /* AtToken */:
+                                if (canParseTag) {
+                                    var child = tryParseChildTag(target, indent);
+                                    if (child && (child.kind === 299 /* JSDocParameterTag */ || child.kind === 305 /* JSDocPropertyTag */) &&
+                                        target !== 4 /* CallbackParameter */ &&
+                                        name && (ts.isIdentifier(child.name) || !escapedTextsEqual(name, child.name.left))) {
+                                        return false;
+                                    }
+                                    return child;
+                                }
+                                seenAsterisk = false;
+                                break;
+                            case 4 /* NewLineTrivia */:
+                                canParseTag = true;
+                                seenAsterisk = false;
+                                break;
+                            case 40 /* AsteriskToken */:
+                                if (seenAsterisk) {
+                                    canParseTag = false;
+                                }
+                                seenAsterisk = true;
+                                break;
+                            case 72 /* Identifier */:
+                                canParseTag = false;
+                                break;
+                            case 1 /* EndOfFileToken */:
+                                return false;
+                        }
+                    }
+                }
+                function tryParseChildTag(target, indent) {
+                    ts.Debug.assert(token() === 58 /* AtToken */);
+                    var start = scanner.getStartPos();
+                    nextJSDocToken();
+                    var tagName = parseJSDocIdentifierName();
+                    skipWhitespace();
+                    var t;
+                    switch (tagName.escapedText) {
+                        case "type":
+                            return target === 1 /* Property */ && parseTypeTag(start, tagName);
+                        case "prop":
+                        case "property":
+                            t = 1 /* Property */;
+                            break;
+                        case "arg":
+                        case "argument":
+                        case "param":
+                            t = 2 /* Parameter */ | 4 /* CallbackParameter */;
+                            break;
+                        default:
+                            return false;
+                    }
+                    if (!(target & t)) {
+                        return false;
+                    }
+                    return parseParameterOrPropertyTag(start, tagName, target, indent);
+                }
+                function parseTemplateTag(start, tagName) {
+                    // the template tag looks like '@template {Constraint} T,U,V'
+                    var constraint;
+                    if (token() === 18 /* OpenBraceToken */) {
+                        constraint = parseJSDocTypeExpression();
+                    }
+                    var typeParameters = [];
+                    var typeParametersPos = getNodePos();
+                    do {
+                        skipWhitespace();
+                        var typeParameter = createNode(150 /* TypeParameter */);
+                        typeParameter.name = parseJSDocIdentifierName(ts.Diagnostics.Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces);
+                        finishNode(typeParameter);
+                        skipWhitespace();
+                        typeParameters.push(typeParameter);
+                    } while (parseOptionalJsdoc(27 /* CommaToken */));
+                    var result = createNode(303 /* JSDocTemplateTag */, start);
+                    result.tagName = tagName;
+                    result.constraint = constraint;
+                    result.typeParameters = createNodeArray(typeParameters, typeParametersPos);
+                    finishNode(result);
+                    return result;
+                }
+                function nextJSDocToken() {
+                    return currentToken = scanner.scanJSDocToken();
+                }
+                function parseOptionalJsdoc(t) {
+                    if (token() === t) {
+                        nextJSDocToken();
+                        return true;
+                    }
+                    return false;
+                }
+                function parseJSDocEntityName() {
+                    var entity = parseJSDocIdentifierName();
+                    if (parseOptional(22 /* OpenBracketToken */)) {
+                        parseExpected(23 /* CloseBracketToken */);
+                        // Note that y[] is accepted as an entity name, but the postfix brackets are not saved for checking.
+                        // Technically usejsdoc.org requires them for specifying a property of a type equivalent to Array<{ x: ...}>
+                        // but it's not worth it to enforce that restriction.
+                    }
+                    while (parseOptional(24 /* DotToken */)) {
+                        var name = parseJSDocIdentifierName();
+                        if (parseOptional(22 /* OpenBracketToken */)) {
+                            parseExpected(23 /* CloseBracketToken */);
+                        }
+                        entity = createQualifiedName(entity, name);
+                    }
+                    return entity;
+                }
+                function parseJSDocIdentifierName(message) {
+                    if (!ts.tokenIsIdentifierOrKeyword(token())) {
+                        return createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ !message, message || ts.Diagnostics.Identifier_expected);
+                    }
+                    var pos = scanner.getTokenPos();
+                    var end = scanner.getTextPos();
+                    var result = createNode(72 /* Identifier */, pos);
+                    result.escapedText = ts.escapeLeadingUnderscores(scanner.getTokenText());
+                    finishNode(result, end);
+                    nextJSDocToken();
+                    return result;
+                }
+            }
+            JSDocParser.parseJSDocCommentWorker = parseJSDocCommentWorker;
+        })(JSDocParser = Parser.JSDocParser || (Parser.JSDocParser = {}));
+    })(Parser || (Parser = {}));
+    var IncrementalParser;
+    (function (IncrementalParser) {
+        function updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks) {
+            aggressiveChecks = aggressiveChecks || ts.Debug.shouldAssert(2 /* Aggressive */);
+            checkChangeRange(sourceFile, newText, textChangeRange, aggressiveChecks);
+            if (ts.textChangeRangeIsUnchanged(textChangeRange)) {
+                // if the text didn't change, then we can just return our current source file as-is.
+                return sourceFile;
+            }
+            if (sourceFile.statements.length === 0) {
+                // If we don't have any statements in the current source file, then there's no real
+                // way to incrementally parse.  So just do a full parse instead.
+                return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, /*syntaxCursor*/ undefined, /*setParentNodes*/ true, sourceFile.scriptKind);
+            }
+            // Make sure we're not trying to incrementally update a source file more than once.  Once
+            // we do an update the original source file is considered unusable from that point onwards.
+            //
+            // This is because we do incremental parsing in-place.  i.e. we take nodes from the old
+            // tree and give them new positions and parents.  From that point on, trusting the old
+            // tree at all is not possible as far too much of it may violate invariants.
+            var incrementalSourceFile = sourceFile;
+            ts.Debug.assert(!incrementalSourceFile.hasBeenIncrementallyParsed);
+            incrementalSourceFile.hasBeenIncrementallyParsed = true;
+            var oldText = sourceFile.text;
+            var syntaxCursor = createSyntaxCursor(sourceFile);
+            // Make the actual change larger so that we know to reparse anything whose lookahead
+            // might have intersected the change.
+            var changeRange = extendToAffectedRange(sourceFile, textChangeRange);
+            checkChangeRange(sourceFile, newText, changeRange, aggressiveChecks);
+            // Ensure that extending the affected range only moved the start of the change range
+            // earlier in the file.
+            ts.Debug.assert(changeRange.span.start <= textChangeRange.span.start);
+            ts.Debug.assert(ts.textSpanEnd(changeRange.span) === ts.textSpanEnd(textChangeRange.span));
+            ts.Debug.assert(ts.textSpanEnd(ts.textChangeRangeNewSpan(changeRange)) === ts.textSpanEnd(ts.textChangeRangeNewSpan(textChangeRange)));
+            // The is the amount the nodes after the edit range need to be adjusted.  It can be
+            // positive (if the edit added characters), negative (if the edit deleted characters)
+            // or zero (if this was a pure overwrite with nothing added/removed).
+            var delta = ts.textChangeRangeNewSpan(changeRange).length - changeRange.span.length;
+            // If we added or removed characters during the edit, then we need to go and adjust all
+            // the nodes after the edit.  Those nodes may move forward (if we inserted chars) or they
+            // may move backward (if we deleted chars).
+            //
+            // Doing this helps us out in two ways.  First, it means that any nodes/tokens we want
+            // to reuse are already at the appropriate position in the new text.  That way when we
+            // reuse them, we don't have to figure out if they need to be adjusted.  Second, it makes
+            // it very easy to determine if we can reuse a node.  If the node's position is at where
+            // we are in the text, then we can reuse it.  Otherwise we can't.  If the node's position
+            // is ahead of us, then we'll need to rescan tokens.  If the node's position is behind
+            // us, then we'll need to skip it or crumble it as appropriate
+            //
+            // We will also adjust the positions of nodes that intersect the change range as well.
+            // By doing this, we ensure that all the positions in the old tree are consistent, not
+            // just the positions of nodes entirely before/after the change range.  By being
+            // consistent, we can then easily map from positions to nodes in the old tree easily.
+            //
+            // Also, mark any syntax elements that intersect the changed span.  We know, up front,
+            // that we cannot reuse these elements.
+            updateTokenPositionsAndMarkElements(incrementalSourceFile, changeRange.span.start, ts.textSpanEnd(changeRange.span), ts.textSpanEnd(ts.textChangeRangeNewSpan(changeRange)), delta, oldText, newText, aggressiveChecks);
+            // Now that we've set up our internal incremental state just proceed and parse the
+            // source file in the normal fashion.  When possible the parser will retrieve and
+            // reuse nodes from the old tree.
+            //
+            // Note: passing in 'true' for setNodeParents is very important.  When incrementally
+            // parsing, we will be reusing nodes from the old tree, and placing it into new
+            // parents.  If we don't set the parents now, we'll end up with an observably
+            // inconsistent tree.  Setting the parents on the new tree should be very fast.  We
+            // will immediately bail out of walking any subtrees when we can see that their parents
+            // are already correct.
+            var result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, /*setParentNodes*/ true, sourceFile.scriptKind);
+            return result;
+        }
+        IncrementalParser.updateSourceFile = updateSourceFile;
+        function moveElementEntirelyPastChangeRange(element, isArray, delta, oldText, newText, aggressiveChecks) {
+            if (isArray) {
+                visitArray(element);
+            }
+            else {
+                visitNode(element);
+            }
+            return;
+            function visitNode(node) {
+                var text = "";
+                if (aggressiveChecks && shouldCheckNode(node)) {
+                    text = oldText.substring(node.pos, node.end);
+                }
+                // Ditch any existing LS children we may have created.  This way we can avoid
+                // moving them forward.
+                if (node._children) {
+                    node._children = undefined;
+                }
+                node.pos += delta;
+                node.end += delta;
+                if (aggressiveChecks && shouldCheckNode(node)) {
+                    ts.Debug.assert(text === newText.substring(node.pos, node.end));
+                }
+                forEachChild(node, visitNode, visitArray);
+                if (ts.hasJSDocNodes(node)) {
+                    for (var _i = 0, _a = node.jsDoc; _i < _a.length; _i++) {
+                        var jsDocComment = _a[_i];
+                        visitNode(jsDocComment);
+                    }
+                }
+                checkNodePositions(node, aggressiveChecks);
+            }
+            function visitArray(array) {
+                array._children = undefined;
+                array.pos += delta;
+                array.end += delta;
+                for (var _i = 0, array_8 = array; _i < array_8.length; _i++) {
+                    var node = array_8[_i];
+                    visitNode(node);
+                }
+            }
+        }
+        function shouldCheckNode(node) {
+            switch (node.kind) {
+                case 10 /* StringLiteral */:
+                case 8 /* NumericLiteral */:
+                case 72 /* Identifier */:
+                    return true;
+            }
+            return false;
+        }
+        function adjustIntersectingElement(element, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta) {
+            ts.Debug.assert(element.end >= changeStart, "Adjusting an element that was entirely before the change range");
+            ts.Debug.assert(element.pos <= changeRangeOldEnd, "Adjusting an element that was entirely after the change range");
+            ts.Debug.assert(element.pos <= element.end);
+            // We have an element that intersects the change range in some way.  It may have its
+            // start, or its end (or both) in the changed range.  We want to adjust any part
+            // that intersects such that the final tree is in a consistent state.  i.e. all
+            // children have spans within the span of their parent, and all siblings are ordered
+            // properly.
+            // We may need to update both the 'pos' and the 'end' of the element.
+            // If the 'pos' is before the start of the change, then we don't need to touch it.
+            // If it isn't, then the 'pos' must be inside the change.  How we update it will
+            // depend if delta is positive or negative. If delta is positive then we have
+            // something like:
+            //
+            //  -------------------AAA-----------------
+            //  -------------------BBBCCCCCCC-----------------
+            //
+            // In this case, we consider any node that started in the change range to still be
+            // starting at the same position.
+            //
+            // however, if the delta is negative, then we instead have something like this:
+            //
+            //  -------------------XXXYYYYYYY-----------------
+            //  -------------------ZZZ-----------------
+            //
+            // In this case, any element that started in the 'X' range will keep its position.
+            // However any element that started after that will have their pos adjusted to be
+            // at the end of the new range.  i.e. any node that started in the 'Y' range will
+            // be adjusted to have their start at the end of the 'Z' range.
+            //
+            // The element will keep its position if possible.  Or Move backward to the new-end
+            // if it's in the 'Y' range.
+            element.pos = Math.min(element.pos, changeRangeNewEnd);
+            // If the 'end' is after the change range, then we always adjust it by the delta
+            // amount.  However, if the end is in the change range, then how we adjust it
+            // will depend on if delta is positive or negative.  If delta is positive then we
+            // have something like:
+            //
+            //  -------------------AAA-----------------
+            //  -------------------BBBCCCCCCC-----------------
+            //
+            // In this case, we consider any node that ended inside the change range to keep its
+            // end position.
+            //
+            // however, if the delta is negative, then we instead have something like this:
+            //
+            //  -------------------XXXYYYYYYY-----------------
+            //  -------------------ZZZ-----------------
+            //
+            // In this case, any element that ended in the 'X' range will keep its position.
+            // However any element that ended after that will have their pos adjusted to be
+            // at the end of the new range.  i.e. any node that ended in the 'Y' range will
+            // be adjusted to have their end at the end of the 'Z' range.
+            if (element.end >= changeRangeOldEnd) {
+                // Element ends after the change range.  Always adjust the end pos.
+                element.end += delta;
+            }
+            else {
+                // Element ends in the change range.  The element will keep its position if
+                // possible. Or Move backward to the new-end if it's in the 'Y' range.
+                element.end = Math.min(element.end, changeRangeNewEnd);
+            }
+            ts.Debug.assert(element.pos <= element.end);
+            if (element.parent) {
+                ts.Debug.assert(element.pos >= element.parent.pos);
+                ts.Debug.assert(element.end <= element.parent.end);
+            }
+        }
+        function checkNodePositions(node, aggressiveChecks) {
+            if (aggressiveChecks) {
+                var pos_2 = node.pos;
+                var visitNode_1 = function (child) {
+                    ts.Debug.assert(child.pos >= pos_2);
+                    pos_2 = child.end;
+                };
+                if (ts.hasJSDocNodes(node)) {
+                    for (var _i = 0, _a = node.jsDoc; _i < _a.length; _i++) {
+                        var jsDocComment = _a[_i];
+                        visitNode_1(jsDocComment);
+                    }
+                }
+                forEachChild(node, visitNode_1);
+                ts.Debug.assert(pos_2 <= node.end);
+            }
+        }
+        function updateTokenPositionsAndMarkElements(sourceFile, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta, oldText, newText, aggressiveChecks) {
+            visitNode(sourceFile);
+            return;
+            function visitNode(child) {
+                ts.Debug.assert(child.pos <= child.end);
+                if (child.pos > changeRangeOldEnd) {
+                    // Node is entirely past the change range.  We need to move both its pos and
+                    // end, forward or backward appropriately.
+                    moveElementEntirelyPastChangeRange(child, /*isArray*/ false, delta, oldText, newText, aggressiveChecks);
+                    return;
+                }
+                // Check if the element intersects the change range.  If it does, then it is not
+                // reusable.  Also, we'll need to recurse to see what constituent portions we may
+                // be able to use.
+                var fullEnd = child.end;
+                if (fullEnd >= changeStart) {
+                    child.intersectsChange = true;
+                    child._children = undefined;
+                    // Adjust the pos or end (or both) of the intersecting element accordingly.
+                    adjustIntersectingElement(child, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta);
+                    forEachChild(child, visitNode, visitArray);
+                    if (ts.hasJSDocNodes(child)) {
+                        for (var _i = 0, _a = child.jsDoc; _i < _a.length; _i++) {
+                            var jsDocComment = _a[_i];
+                            visitNode(jsDocComment);
+                        }
+                    }
+                    checkNodePositions(child, aggressiveChecks);
+                    return;
+                }
+                // Otherwise, the node is entirely before the change range.  No need to do anything with it.
+                ts.Debug.assert(fullEnd < changeStart);
+            }
+            function visitArray(array) {
+                ts.Debug.assert(array.pos <= array.end);
+                if (array.pos > changeRangeOldEnd) {
+                    // Array is entirely after the change range.  We need to move it, and move any of
+                    // its children.
+                    moveElementEntirelyPastChangeRange(array, /*isArray*/ true, delta, oldText, newText, aggressiveChecks);
+                    return;
+                }
+                // Check if the element intersects the change range.  If it does, then it is not
+                // reusable.  Also, we'll need to recurse to see what constituent portions we may
+                // be able to use.
+                var fullEnd = array.end;
+                if (fullEnd >= changeStart) {
+                    array.intersectsChange = true;
+                    array._children = undefined;
+                    // Adjust the pos or end (or both) of the intersecting array accordingly.
+                    adjustIntersectingElement(array, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta);
+                    for (var _i = 0, array_9 = array; _i < array_9.length; _i++) {
+                        var node = array_9[_i];
+                        visitNode(node);
+                    }
+                    return;
+                }
+                // Otherwise, the array is entirely before the change range.  No need to do anything with it.
+                ts.Debug.assert(fullEnd < changeStart);
+            }
+        }
+        function extendToAffectedRange(sourceFile, changeRange) {
+            // Consider the following code:
+            //      void foo() { /; }
+            //
+            // If the text changes with an insertion of / just before the semicolon then we end up with:
+            //      void foo() { //; }
+            //
+            // If we were to just use the changeRange a is, then we would not rescan the { token
+            // (as it does not intersect the actual original change range).  Because an edit may
+            // change the token touching it, we actually need to look back *at least* one token so
+            // that the prior token sees that change.
+            var maxLookahead = 1;
+            var start = changeRange.span.start;
+            // the first iteration aligns us with the change start. subsequent iteration move us to
+            // the left by maxLookahead tokens.  We only need to do this as long as we're not at the
+            // start of the tree.
+            for (var i = 0; start > 0 && i <= maxLookahead; i++) {
+                var nearestNode = findNearestNodeStartingBeforeOrAtPosition(sourceFile, start);
+                ts.Debug.assert(nearestNode.pos <= start);
+                var position = nearestNode.pos;
+                start = Math.max(0, position - 1);
+            }
+            var finalSpan = ts.createTextSpanFromBounds(start, ts.textSpanEnd(changeRange.span));
+            var finalLength = changeRange.newLength + (changeRange.span.start - start);
+            return ts.createTextChangeRange(finalSpan, finalLength);
+        }
+        function findNearestNodeStartingBeforeOrAtPosition(sourceFile, position) {
+            var bestResult = sourceFile;
+            var lastNodeEntirelyBeforePosition;
+            forEachChild(sourceFile, visit);
+            if (lastNodeEntirelyBeforePosition) {
+                var lastChildOfLastEntireNodeBeforePosition = getLastDescendant(lastNodeEntirelyBeforePosition);
+                if (lastChildOfLastEntireNodeBeforePosition.pos > bestResult.pos) {
+                    bestResult = lastChildOfLastEntireNodeBeforePosition;
+                }
+            }
+            return bestResult;
+            function getLastDescendant(node) {
+                while (true) {
+                    var lastChild = ts.getLastChild(node);
+                    if (lastChild) {
+                        node = lastChild;
+                    }
+                    else {
+                        return node;
+                    }
+                }
+            }
+            function visit(child) {
+                if (ts.nodeIsMissing(child)) {
+                    // Missing nodes are effectively invisible to us.  We never even consider them
+                    // When trying to find the nearest node before us.
+                    return;
+                }
+                // If the child intersects this position, then this node is currently the nearest
+                // node that starts before the position.
+                if (child.pos <= position) {
+                    if (child.pos >= bestResult.pos) {
+                        // This node starts before the position, and is closer to the position than
+                        // the previous best node we found.  It is now the new best node.
+                        bestResult = child;
+                    }
+                    // Now, the node may overlap the position, or it may end entirely before the
+                    // position.  If it overlaps with the position, then either it, or one of its
+                    // children must be the nearest node before the position.  So we can just
+                    // recurse into this child to see if we can find something better.
+                    if (position < child.end) {
+                        // The nearest node is either this child, or one of the children inside
+                        // of it.  We've already marked this child as the best so far.  Recurse
+                        // in case one of the children is better.
+                        forEachChild(child, visit);
+                        // Once we look at the children of this node, then there's no need to
+                        // continue any further.
+                        return true;
+                    }
+                    else {
+                        ts.Debug.assert(child.end <= position);
+                        // The child ends entirely before this position.  Say you have the following
+                        // (where $ is the position)
+                        //
+                        //      <complex expr 1> ? <complex expr 2> $ : <...> <...>
+                        //
+                        // We would want to find the nearest preceding node in "complex expr 2".
+                        // To support that, we keep track of this node, and once we're done searching
+                        // for a best node, we recurse down this node to see if we can find a good
+                        // result in it.
+                        //
+                        // This approach allows us to quickly skip over nodes that are entirely
+                        // before the position, while still allowing us to find any nodes in the
+                        // last one that might be what we want.
+                        lastNodeEntirelyBeforePosition = child;
+                    }
+                }
+                else {
+                    ts.Debug.assert(child.pos > position);
+                    // We're now at a node that is entirely past the position we're searching for.
+                    // This node (and all following nodes) could never contribute to the result,
+                    // so just skip them by returning 'true' here.
+                    return true;
+                }
+            }
+        }
+        function checkChangeRange(sourceFile, newText, textChangeRange, aggressiveChecks) {
+            var oldText = sourceFile.text;
+            if (textChangeRange) {
+                ts.Debug.assert((oldText.length - textChangeRange.span.length + textChangeRange.newLength) === newText.length);
+                if (aggressiveChecks || ts.Debug.shouldAssert(3 /* VeryAggressive */)) {
+                    var oldTextPrefix = oldText.substr(0, textChangeRange.span.start);
+                    var newTextPrefix = newText.substr(0, textChangeRange.span.start);
+                    ts.Debug.assert(oldTextPrefix === newTextPrefix);
+                    var oldTextSuffix = oldText.substring(ts.textSpanEnd(textChangeRange.span), oldText.length);
+                    var newTextSuffix = newText.substring(ts.textSpanEnd(ts.textChangeRangeNewSpan(textChangeRange)), newText.length);
+                    ts.Debug.assert(oldTextSuffix === newTextSuffix);
+                }
+            }
+        }
+        function createSyntaxCursor(sourceFile) {
+            var currentArray = sourceFile.statements;
+            var currentArrayIndex = 0;
+            ts.Debug.assert(currentArrayIndex < currentArray.length);
+            var current = currentArray[currentArrayIndex];
+            var lastQueriedPosition = -1 /* Value */;
+            return {
+                currentNode: function (position) {
+                    // Only compute the current node if the position is different than the last time
+                    // we were asked.  The parser commonly asks for the node at the same position
+                    // twice.  Once to know if can read an appropriate list element at a certain point,
+                    // and then to actually read and consume the node.
+                    if (position !== lastQueriedPosition) {
+                        // Much of the time the parser will need the very next node in the array that
+                        // we just returned a node from.So just simply check for that case and move
+                        // forward in the array instead of searching for the node again.
+                        if (current && current.end === position && currentArrayIndex < (currentArray.length - 1)) {
+                            currentArrayIndex++;
+                            current = currentArray[currentArrayIndex];
+                        }
+                        // If we don't have a node, or the node we have isn't in the right position,
+                        // then try to find a viable node at the position requested.
+                        if (!current || current.pos !== position) {
+                            findHighestListElementThatStartsAtPosition(position);
+                        }
+                    }
+                    // Cache this query so that we don't do any extra work if the parser calls back
+                    // into us.  Note: this is very common as the parser will make pairs of calls like
+                    // 'isListElement -> parseListElement'.  If we were unable to find a node when
+                    // called with 'isListElement', we don't want to redo the work when parseListElement
+                    // is called immediately after.
+                    lastQueriedPosition = position;
+                    // Either we don'd have a node, or we have a node at the position being asked for.
+                    ts.Debug.assert(!current || current.pos === position);
+                    return current;
+                }
+            };
+            // Finds the highest element in the tree we can find that starts at the provided position.
+            // The element must be a direct child of some node list in the tree.  This way after we
+            // return it, we can easily return its next sibling in the list.
+            function findHighestListElementThatStartsAtPosition(position) {
+                // Clear out any cached state about the last node we found.
+                currentArray = undefined;
+                currentArrayIndex = -1 /* Value */;
+                current = undefined;
+                // Recurse into the source file to find the highest node at this position.
+                forEachChild(sourceFile, visitNode, visitArray);
+                return;
+                function visitNode(node) {
+                    if (position >= node.pos && position < node.end) {
+                        // Position was within this node.  Keep searching deeper to find the node.
+                        forEachChild(node, visitNode, visitArray);
+                        // don't proceed any further in the search.
+                        return true;
+                    }
+                    // position wasn't in this node, have to keep searching.
+                    return false;
+                }
+                function visitArray(array) {
+                    if (position >= array.pos && position < array.end) {
+                        // position was in this array.  Search through this array to see if we find a
+                        // viable element.
+                        for (var i = 0; i < array.length; i++) {
+                            var child = array[i];
+                            if (child) {
+                                if (child.pos === position) {
+                                    // Found the right node.  We're done.
+                                    currentArray = array;
+                                    currentArrayIndex = i;
+                                    current = child;
+                                    return true;
+                                }
+                                else {
+                                    if (child.pos < position && position < child.end) {
+                                        // Position in somewhere within this child.  Search in it and
+                                        // stop searching in this array.
+                                        forEachChild(child, visitNode, visitArray);
+                                        return true;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    // position wasn't in this array, have to keep searching.
+                    return false;
+                }
+            }
+        }
+        var InvalidPosition;
+        (function (InvalidPosition) {
+            InvalidPosition[InvalidPosition["Value"] = -1] = "Value";
+        })(InvalidPosition || (InvalidPosition = {}));
+    })(IncrementalParser || (IncrementalParser = {}));
+    /** @internal */
+    function isDeclarationFileName(fileName) {
+        return ts.fileExtensionIs(fileName, ".d.ts" /* Dts */);
+    }
+    ts.isDeclarationFileName = isDeclarationFileName;
+    /*@internal*/
+    function processCommentPragmas(context, sourceText) {
+        var triviaScanner = ts.createScanner(context.languageVersion, /*skipTrivia*/ false, 0 /* Standard */, sourceText);
+        var pragmas = [];
+        // Keep scanning all the leading trivia in the file until we get to something that
+        // isn't trivia.  Any single line comment will be analyzed to see if it is a
+        // reference comment.
+        while (true) {
+            var kind = triviaScanner.scan();
+            if (!ts.isTrivia(kind)) {
+                break;
+            }
+            var range = {
+                kind: triviaScanner.getToken(),
+                pos: triviaScanner.getTokenPos(),
+                end: triviaScanner.getTextPos(),
+            };
+            var comment = sourceText.substring(range.pos, range.end);
+            extractPragmas(pragmas, range, comment);
+        }
+        context.pragmas = ts.createMap();
+        for (var _i = 0, pragmas_1 = pragmas; _i < pragmas_1.length; _i++) {
+            var pragma = pragmas_1[_i];
+            if (context.pragmas.has(pragma.name)) { // TODO: GH#18217
+                var currentValue = context.pragmas.get(pragma.name);
+                if (currentValue instanceof Array) {
+                    currentValue.push(pragma.args);
+                }
+                else {
+                    context.pragmas.set(pragma.name, [currentValue, pragma.args]);
+                }
+                continue;
+            }
+            context.pragmas.set(pragma.name, pragma.args);
+        }
+    }
+    ts.processCommentPragmas = processCommentPragmas;
+    /*@internal*/
+    function processPragmasIntoFields(context, reportDiagnostic) {
+        context.checkJsDirective = undefined;
+        context.referencedFiles = [];
+        context.typeReferenceDirectives = [];
+        context.libReferenceDirectives = [];
+        context.amdDependencies = [];
+        context.hasNoDefaultLib = false;
+        context.pragmas.forEach(function (entryOrList, key) {
+            // TODO: The below should be strongly type-guarded and not need casts/explicit annotations, since entryOrList is related to
+            // key and key is constrained to a union; but it's not (see GH#21483 for at least partial fix) :(
+            switch (key) {
+                case "reference": {
+                    var referencedFiles_1 = context.referencedFiles;
+                    var typeReferenceDirectives_1 = context.typeReferenceDirectives;
+                    var libReferenceDirectives_1 = context.libReferenceDirectives;
+                    ts.forEach(ts.toArray(entryOrList), function (arg) {
+                        // TODO: GH#18217
+                        var _a = arg.arguments, types = _a.types, lib = _a.lib, path = _a.path;
+                        if (arg.arguments["no-default-lib"]) {
+                            context.hasNoDefaultLib = true;
+                        }
+                        else if (types) {
+                            typeReferenceDirectives_1.push({ pos: types.pos, end: types.end, fileName: types.value });
+                        }
+                        else if (lib) {
+                            libReferenceDirectives_1.push({ pos: lib.pos, end: lib.end, fileName: lib.value });
+                        }
+                        else if (path) {
+                            referencedFiles_1.push({ pos: path.pos, end: path.end, fileName: path.value });
+                        }
+                        else {
+                            reportDiagnostic(arg.range.pos, arg.range.end - arg.range.pos, ts.Diagnostics.Invalid_reference_directive_syntax);
+                        }
+                    });
+                    break;
+                }
+                case "amd-dependency": {
+                    context.amdDependencies = ts.map(ts.toArray(entryOrList), function (x) { return ({ name: x.arguments.name, path: x.arguments.path }); }); // TODO: GH#18217
+                    break;
+                }
+                case "amd-module": {
+                    if (entryOrList instanceof Array) {
+                        for (var _i = 0, entryOrList_1 = entryOrList; _i < entryOrList_1.length; _i++) {
+                            var entry = entryOrList_1[_i];
+                            if (context.moduleName) {
+                                // TODO: It's probably fine to issue this diagnostic on all instances of the pragma
+                                reportDiagnostic(entry.range.pos, entry.range.end - entry.range.pos, ts.Diagnostics.An_AMD_module_cannot_have_multiple_name_assignments);
+                            }
+                            context.moduleName = entry.arguments.name;
+                        }
+                    }
+                    else {
+                        context.moduleName = entryOrList.arguments.name;
+                    }
+                    break;
+                }
+                case "ts-nocheck":
+                case "ts-check": {
+                    // _last_ of either nocheck or check in a file is the "winner"
+                    ts.forEach(ts.toArray(entryOrList), function (entry) {
+                        if (!context.checkJsDirective || entry.range.pos > context.checkJsDirective.pos) { // TODO: GH#18217
+                            context.checkJsDirective = {
+                                enabled: key === "ts-check",
+                                end: entry.range.end,
+                                pos: entry.range.pos
+                            };
+                        }
+                    });
+                    break;
+                }
+                case "jsx": return; // Accessed directly
+                default: ts.Debug.fail("Unhandled pragma kind"); // Can this be made into an assertNever in the future?
+            }
+        });
+    }
+    ts.processPragmasIntoFields = processPragmasIntoFields;
+    var namedArgRegExCache = ts.createMap();
+    function getNamedArgRegEx(name) {
+        if (namedArgRegExCache.has(name)) {
+            return namedArgRegExCache.get(name);
+        }
+        var result = new RegExp("(\\s" + name + "\\s*=\\s*)('|\")(.+?)\\2", "im");
+        namedArgRegExCache.set(name, result);
+        return result;
+    }
+    var tripleSlashXMLCommentStartRegEx = /^\/\/\/\s*<(\S+)\s.*?\/>/im;
+    var singleLinePragmaRegEx = /^\/\/\/?\s*@(\S+)\s*(.*)\s*$/im;
+    function extractPragmas(pragmas, range, text) {
+        var tripleSlash = range.kind === 2 /* SingleLineCommentTrivia */ && tripleSlashXMLCommentStartRegEx.exec(text);
+        if (tripleSlash) {
+            var name = tripleSlash[1].toLowerCase(); // Technically unsafe cast, but we do it so the below check to make it safe typechecks
+            var pragma = ts.commentPragmas[name];
+            if (!pragma || !(pragma.kind & 1 /* TripleSlashXML */)) {
+                return;
+            }
+            if (pragma.args) {
+                var argument = {};
+                for (var _i = 0, _a = pragma.args; _i < _a.length; _i++) {
+                    var arg = _a[_i];
+                    var matcher = getNamedArgRegEx(arg.name);
+                    var matchResult = matcher.exec(text);
+                    if (!matchResult && !arg.optional) {
+                        return; // Missing required argument, don't parse
+                    }
+                    else if (matchResult) {
+                        if (arg.captureSpan) {
+                            var startPos = range.pos + matchResult.index + matchResult[1].length + matchResult[2].length;
+                            argument[arg.name] = {
+                                value: matchResult[3],
+                                pos: startPos,
+                                end: startPos + matchResult[3].length
+                            };
+                        }
+                        else {
+                            argument[arg.name] = matchResult[3];
+                        }
+                    }
+                }
+                pragmas.push({ name: name, args: { arguments: argument, range: range } });
+            }
+            else {
+                pragmas.push({ name: name, args: { arguments: {}, range: range } });
+            }
+            return;
+        }
+        var singleLine = range.kind === 2 /* SingleLineCommentTrivia */ && singleLinePragmaRegEx.exec(text);
+        if (singleLine) {
+            return addPragmaForMatch(pragmas, range, 2 /* SingleLine */, singleLine);
+        }
+        if (range.kind === 3 /* MultiLineCommentTrivia */) {
+            var multiLinePragmaRegEx = /\s*@(\S+)\s*(.*)\s*$/gim; // Defined inline since it uses the "g" flag, which keeps a persistent index (for iterating)
+            var multiLineMatch = void 0;
+            while (multiLineMatch = multiLinePragmaRegEx.exec(text)) {
+                addPragmaForMatch(pragmas, range, 4 /* MultiLine */, multiLineMatch);
+            }
+        }
+    }
+    function addPragmaForMatch(pragmas, range, kind, match) {
+        if (!match)
+            return;
+        var name = match[1].toLowerCase(); // Technically unsafe cast, but we do it so they below check to make it safe typechecks
+        var pragma = ts.commentPragmas[name];
+        if (!pragma || !(pragma.kind & kind)) {
+            return;
+        }
+        var args = match[2]; // Split on spaces and match up positionally with definition
+        var argument = getNamedPragmaArguments(pragma, args);
+        if (argument === "fail")
+            return; // Missing required argument, fail to parse it
+        pragmas.push({ name: name, args: { arguments: argument, range: range } });
+        return;
+    }
+    function getNamedPragmaArguments(pragma, text) {
+        if (!text)
+            return {};
+        if (!pragma.args)
+            return {};
+        var args = text.split(/\s+/);
+        var argMap = {};
+        for (var i = 0; i < pragma.args.length; i++) {
+            var argument = pragma.args[i];
+            if (!args[i] && !argument.optional) {
+                return "fail";
+            }
+            if (argument.captureSpan) {
+                return ts.Debug.fail("Capture spans not yet implemented for non-xml pragmas");
+            }
+            argMap[argument.name] = args[i];
+        }
+        return argMap;
+    }
+    /** @internal */
+    function tagNamesAreEquivalent(lhs, rhs) {
+        if (lhs.kind !== rhs.kind) {
+            return false;
+        }
+        if (lhs.kind === 72 /* Identifier */) {
+            return lhs.escapedText === rhs.escapedText;
+        }
+        if (lhs.kind === 100 /* ThisKeyword */) {
+            return true;
+        }
+        // If we are at this statement then we must have PropertyAccessExpression and because tag name in Jsx element can only
+        // take forms of JsxTagNameExpression which includes an identifier, "this" expression, or another propertyAccessExpression
+        // it is safe to case the expression property as such. See parseJsxElementName for how we parse tag name in Jsx element
+        return lhs.name.escapedText === rhs.name.escapedText &&
+            tagNamesAreEquivalent(lhs.expression, rhs.expression);
+    }
+    ts.tagNamesAreEquivalent = tagNamesAreEquivalent;
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    /* @internal */
+    ts.compileOnSaveCommandLineOption = { name: "compileOnSave", type: "boolean" };
+    // NOTE: The order here is important to default lib ordering as entries will have the same
+    //       order in the generated program (see `getDefaultLibPriority` in program.ts). This
+    //       order also affects overload resolution when a type declared in one lib is
+    //       augmented in another lib.
+    var libEntries = [
+        // JavaScript only
+        ["es5", "lib.es5.d.ts"],
+        ["es6", "lib.es2015.d.ts"],
+        ["es2015", "lib.es2015.d.ts"],
+        ["es7", "lib.es2016.d.ts"],
+        ["es2016", "lib.es2016.d.ts"],
+        ["es2017", "lib.es2017.d.ts"],
+        ["es2018", "lib.es2018.d.ts"],
+        ["esnext", "lib.esnext.d.ts"],
+        // Host only
+        ["dom", "lib.dom.d.ts"],
+        ["dom.iterable", "lib.dom.iterable.d.ts"],
+        ["webworker", "lib.webworker.d.ts"],
+        ["webworker.importscripts", "lib.webworker.importscripts.d.ts"],
+        ["scripthost", "lib.scripthost.d.ts"],
+        // ES2015 Or ESNext By-feature options
+        ["es2015.core", "lib.es2015.core.d.ts"],
+        ["es2015.collection", "lib.es2015.collection.d.ts"],
+        ["es2015.generator", "lib.es2015.generator.d.ts"],
+        ["es2015.iterable", "lib.es2015.iterable.d.ts"],
+        ["es2015.promise", "lib.es2015.promise.d.ts"],
+        ["es2015.proxy", "lib.es2015.proxy.d.ts"],
+        ["es2015.reflect", "lib.es2015.reflect.d.ts"],
+        ["es2015.symbol", "lib.es2015.symbol.d.ts"],
+        ["es2015.symbol.wellknown", "lib.es2015.symbol.wellknown.d.ts"],
+        ["es2016.array.include", "lib.es2016.array.include.d.ts"],
+        ["es2017.object", "lib.es2017.object.d.ts"],
+        ["es2017.sharedmemory", "lib.es2017.sharedmemory.d.ts"],
+        ["es2017.string", "lib.es2017.string.d.ts"],
+        ["es2017.intl", "lib.es2017.intl.d.ts"],
+        ["es2017.typedarrays", "lib.es2017.typedarrays.d.ts"],
+        ["es2018.intl", "lib.es2018.intl.d.ts"],
+        ["es2018.promise", "lib.es2018.promise.d.ts"],
+        ["es2018.regexp", "lib.es2018.regexp.d.ts"],
+        ["esnext.array", "lib.esnext.array.d.ts"],
+        ["esnext.symbol", "lib.esnext.symbol.d.ts"],
+        ["esnext.asynciterable", "lib.esnext.asynciterable.d.ts"],
+        ["esnext.intl", "lib.esnext.intl.d.ts"],
+        ["esnext.bigint", "lib.esnext.bigint.d.ts"]
+    ];
+    /**
+     * An array of supported "lib" reference file names used to determine the order for inclusion
+     * when referenced, as well as for spelling suggestions. This ensures the correct ordering for
+     * overload resolution when a type declared in one lib is extended by another.
+     */
+    /* @internal */
+    ts.libs = libEntries.map(function (entry) { return entry[0]; });
+    /**
+     * A map of lib names to lib files. This map is used both for parsing the "lib" command line
+     * option as well as for resolving lib reference directives.
+     */
+    /* @internal */
+    ts.libMap = ts.createMapFromEntries(libEntries);
+    /* @internal */
+    ts.commonOptionsWithBuild = [
+        {
+            name: "help",
+            shortName: "h",
+            type: "boolean",
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Command_line_Options,
+            description: ts.Diagnostics.Print_this_message,
+        },
+        {
+            name: "help",
+            shortName: "?",
+            type: "boolean"
+        },
+        {
+            name: "watch",
+            shortName: "w",
+            type: "boolean",
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Command_line_Options,
+            description: ts.Diagnostics.Watch_input_files,
+        },
+        {
+            name: "preserveWatchOutput",
+            type: "boolean",
+            showInSimplifiedHelpView: false,
+            category: ts.Diagnostics.Command_line_Options,
+            description: ts.Diagnostics.Whether_to_keep_outdated_console_output_in_watch_mode_instead_of_clearing_the_screen,
+        },
+        {
+            name: "listFiles",
+            type: "boolean",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Print_names_of_files_part_of_the_compilation
+        },
+        {
+            name: "listEmittedFiles",
+            type: "boolean",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Print_names_of_generated_files_part_of_the_compilation
+        },
+        {
+            name: "pretty",
+            type: "boolean",
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Command_line_Options,
+            description: ts.Diagnostics.Stylize_errors_and_messages_using_color_and_context_experimental
+        },
+        {
+            name: "traceResolution",
+            type: "boolean",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Enable_tracing_of_the_name_resolution_process
+        },
+        {
+            name: "diagnostics",
+            type: "boolean",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Show_diagnostic_information
+        },
+        {
+            name: "extendedDiagnostics",
+            type: "boolean",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Show_verbose_diagnostic_information
+        },
+    ];
+    /* @internal */
+    ts.optionDeclarations = ts.commonOptionsWithBuild.concat([
+        {
+            name: "all",
+            type: "boolean",
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Command_line_Options,
+            description: ts.Diagnostics.Show_all_compiler_options,
+        },
+        {
+            name: "version",
+            shortName: "v",
+            type: "boolean",
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Command_line_Options,
+            description: ts.Diagnostics.Print_the_compiler_s_version,
+        },
+        {
+            name: "init",
+            type: "boolean",
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Command_line_Options,
+            description: ts.Diagnostics.Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file,
+        },
+        {
+            name: "project",
+            shortName: "p",
+            type: "string",
+            isFilePath: true,
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Command_line_Options,
+            paramType: ts.Diagnostics.FILE_OR_DIRECTORY,
+            description: ts.Diagnostics.Compile_the_project_given_the_path_to_its_configuration_file_or_to_a_folder_with_a_tsconfig_json,
+        },
+        {
+            name: "build",
+            type: "boolean",
+            shortName: "b",
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Command_line_Options,
+            description: ts.Diagnostics.Build_one_or_more_projects_and_their_dependencies_if_out_of_date
+        },
+        {
+            name: "showConfig",
+            type: "boolean",
+            category: ts.Diagnostics.Command_line_Options,
+            isCommandLineOnly: true,
+            description: ts.Diagnostics.Print_the_final_configuration_instead_of_building
+        },
+        // Basic
+        {
+            name: "target",
+            shortName: "t",
+            type: ts.createMapFromTemplate({
+                es3: 0 /* ES3 */,
+                es5: 1 /* ES5 */,
+                es6: 2 /* ES2015 */,
+                es2015: 2 /* ES2015 */,
+                es2016: 3 /* ES2016 */,
+                es2017: 4 /* ES2017 */,
+                es2018: 5 /* ES2018 */,
+                esnext: 6 /* ESNext */,
+            }),
+            affectsSourceFile: true,
+            affectsModuleResolution: true,
+            paramType: ts.Diagnostics.VERSION,
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_ES2018_or_ESNEXT,
+        },
+        {
+            name: "module",
+            shortName: "m",
+            type: ts.createMapFromTemplate({
+                none: ts.ModuleKind.None,
+                commonjs: ts.ModuleKind.CommonJS,
+                amd: ts.ModuleKind.AMD,
+                system: ts.ModuleKind.System,
+                umd: ts.ModuleKind.UMD,
+                es6: ts.ModuleKind.ES2015,
+                es2015: ts.ModuleKind.ES2015,
+                esnext: ts.ModuleKind.ESNext
+            }),
+            affectsModuleResolution: true,
+            paramType: ts.Diagnostics.KIND,
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Specify_module_code_generation_Colon_none_commonjs_amd_system_umd_es2015_or_ESNext,
+        },
+        {
+            name: "lib",
+            type: "list",
+            element: {
+                name: "lib",
+                type: ts.libMap
+            },
+            affectsModuleResolution: true,
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Specify_library_files_to_be_included_in_the_compilation
+        },
+        {
+            name: "allowJs",
+            type: "boolean",
+            affectsModuleResolution: true,
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Allow_javascript_files_to_be_compiled
+        },
+        {
+            name: "checkJs",
+            type: "boolean",
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Report_errors_in_js_files
+        },
+        {
+            name: "jsx",
+            type: ts.createMapFromTemplate({
+                "preserve": 1 /* Preserve */,
+                "react-native": 3 /* ReactNative */,
+                "react": 2 /* React */
+            }),
+            affectsSourceFile: true,
+            paramType: ts.Diagnostics.KIND,
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Specify_JSX_code_generation_Colon_preserve_react_native_or_react,
+        },
+        {
+            name: "declaration",
+            shortName: "d",
+            type: "boolean",
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Generates_corresponding_d_ts_file,
+        },
+        {
+            name: "declarationMap",
+            type: "boolean",
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Generates_a_sourcemap_for_each_corresponding_d_ts_file,
+        },
+        {
+            name: "emitDeclarationOnly",
+            type: "boolean",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Only_emit_d_ts_declaration_files,
+        },
+        {
+            name: "sourceMap",
+            type: "boolean",
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Generates_corresponding_map_file,
+        },
+        {
+            name: "outFile",
+            type: "string",
+            isFilePath: true,
+            paramType: ts.Diagnostics.FILE,
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Concatenate_and_emit_output_to_single_file,
+        },
+        {
+            name: "outDir",
+            type: "string",
+            isFilePath: true,
+            paramType: ts.Diagnostics.DIRECTORY,
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Redirect_output_structure_to_the_directory,
+        },
+        {
+            name: "rootDir",
+            type: "string",
+            isFilePath: true,
+            paramType: ts.Diagnostics.LOCATION,
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir,
+        },
+        {
+            name: "composite",
+            type: "boolean",
+            isTSConfigOnly: true,
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Enable_project_compilation,
+        },
+        {
+            name: "removeComments",
+            type: "boolean",
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Do_not_emit_comments_to_output,
+        },
+        {
+            name: "noEmit",
+            type: "boolean",
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Do_not_emit_outputs,
+        },
+        {
+            name: "importHelpers",
+            type: "boolean",
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Import_emit_helpers_from_tslib
+        },
+        {
+            name: "downlevelIteration",
+            type: "boolean",
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Provide_full_support_for_iterables_in_for_of_spread_and_destructuring_when_targeting_ES5_or_ES3
+        },
+        {
+            name: "isolatedModules",
+            type: "boolean",
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Transpile_each_file_as_a_separate_module_similar_to_ts_transpileModule
+        },
+        // Strict Type Checks
+        {
+            name: "strict",
+            type: "boolean",
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Strict_Type_Checking_Options,
+            description: ts.Diagnostics.Enable_all_strict_type_checking_options
+        },
+        {
+            name: "noImplicitAny",
+            type: "boolean",
+            affectsSemanticDiagnostics: true,
+            strictFlag: true,
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Strict_Type_Checking_Options,
+            description: ts.Diagnostics.Raise_error_on_expressions_and_declarations_with_an_implied_any_type
+        },
+        {
+            name: "strictNullChecks",
+            type: "boolean",
+            affectsSemanticDiagnostics: true,
+            strictFlag: true,
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Strict_Type_Checking_Options,
+            description: ts.Diagnostics.Enable_strict_null_checks
+        },
+        {
+            name: "strictFunctionTypes",
+            type: "boolean",
+            affectsSemanticDiagnostics: true,
+            strictFlag: true,
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Strict_Type_Checking_Options,
+            description: ts.Diagnostics.Enable_strict_checking_of_function_types
+        },
+        {
+            name: "strictBindCallApply",
+            type: "boolean",
+            strictFlag: true,
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Strict_Type_Checking_Options,
+            description: ts.Diagnostics.Enable_strict_bind_call_and_apply_methods_on_functions
+        },
+        {
+            name: "strictPropertyInitialization",
+            type: "boolean",
+            affectsSemanticDiagnostics: true,
+            strictFlag: true,
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Strict_Type_Checking_Options,
+            description: ts.Diagnostics.Enable_strict_checking_of_property_initialization_in_classes
+        },
+        {
+            name: "noImplicitThis",
+            type: "boolean",
+            affectsSemanticDiagnostics: true,
+            strictFlag: true,
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Strict_Type_Checking_Options,
+            description: ts.Diagnostics.Raise_error_on_this_expressions_with_an_implied_any_type,
+        },
+        {
+            name: "alwaysStrict",
+            type: "boolean",
+            affectsSourceFile: true,
+            strictFlag: true,
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Strict_Type_Checking_Options,
+            description: ts.Diagnostics.Parse_in_strict_mode_and_emit_use_strict_for_each_source_file
+        },
+        // Additional Checks
+        {
+            name: "noUnusedLocals",
+            type: "boolean",
+            affectsSemanticDiagnostics: true,
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Additional_Checks,
+            description: ts.Diagnostics.Report_errors_on_unused_locals,
+        },
+        {
+            name: "noUnusedParameters",
+            type: "boolean",
+            affectsSemanticDiagnostics: true,
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Additional_Checks,
+            description: ts.Diagnostics.Report_errors_on_unused_parameters,
+        },
+        {
+            name: "noImplicitReturns",
+            type: "boolean",
+            affectsSemanticDiagnostics: true,
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Additional_Checks,
+            description: ts.Diagnostics.Report_error_when_not_all_code_paths_in_function_return_a_value
+        },
+        {
+            name: "noFallthroughCasesInSwitch",
+            type: "boolean",
+            affectsBindDiagnostics: true,
+            affectsSemanticDiagnostics: true,
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Additional_Checks,
+            description: ts.Diagnostics.Report_errors_for_fallthrough_cases_in_switch_statement
+        },
+        // Module Resolution
+        {
+            name: "moduleResolution",
+            type: ts.createMapFromTemplate({
+                node: ts.ModuleResolutionKind.NodeJs,
+                classic: ts.ModuleResolutionKind.Classic,
+            }),
+            affectsModuleResolution: true,
+            paramType: ts.Diagnostics.STRATEGY,
+            category: ts.Diagnostics.Module_Resolution_Options,
+            description: ts.Diagnostics.Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6,
+        },
+        {
+            name: "baseUrl",
+            type: "string",
+            affectsModuleResolution: true,
+            isFilePath: true,
+            category: ts.Diagnostics.Module_Resolution_Options,
+            description: ts.Diagnostics.Base_directory_to_resolve_non_absolute_module_names
+        },
+        {
+            // this option can only be specified in tsconfig.json
+            // use type = object to copy the value as-is
+            name: "paths",
+            type: "object",
+            affectsModuleResolution: true,
+            isTSConfigOnly: true,
+            category: ts.Diagnostics.Module_Resolution_Options,
+            description: ts.Diagnostics.A_series_of_entries_which_re_map_imports_to_lookup_locations_relative_to_the_baseUrl
+        },
+        {
+            // this option can only be specified in tsconfig.json
+            // use type = object to copy the value as-is
+            name: "rootDirs",
+            type: "list",
+            isTSConfigOnly: true,
+            element: {
+                name: "rootDirs",
+                type: "string",
+                isFilePath: true
+            },
+            affectsModuleResolution: true,
+            category: ts.Diagnostics.Module_Resolution_Options,
+            description: ts.Diagnostics.List_of_root_folders_whose_combined_content_represents_the_structure_of_the_project_at_runtime
+        },
+        {
+            name: "typeRoots",
+            type: "list",
+            element: {
+                name: "typeRoots",
+                type: "string",
+                isFilePath: true
+            },
+            affectsModuleResolution: true,
+            category: ts.Diagnostics.Module_Resolution_Options,
+            description: ts.Diagnostics.List_of_folders_to_include_type_definitions_from
+        },
+        {
+            name: "types",
+            type: "list",
+            element: {
+                name: "types",
+                type: "string"
+            },
+            affectsModuleResolution: true,
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Module_Resolution_Options,
+            description: ts.Diagnostics.Type_declaration_files_to_be_included_in_compilation
+        },
+        {
+            name: "allowSyntheticDefaultImports",
+            type: "boolean",
+            affectsSemanticDiagnostics: true,
+            category: ts.Diagnostics.Module_Resolution_Options,
+            description: ts.Diagnostics.Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking
+        },
+        {
+            name: "esModuleInterop",
+            type: "boolean",
+            affectsSemanticDiagnostics: true,
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Module_Resolution_Options,
+            description: ts.Diagnostics.Enables_emit_interoperability_between_CommonJS_and_ES_Modules_via_creation_of_namespace_objects_for_all_imports_Implies_allowSyntheticDefaultImports
+        },
+        {
+            name: "preserveSymlinks",
+            type: "boolean",
+            category: ts.Diagnostics.Module_Resolution_Options,
+            description: ts.Diagnostics.Do_not_resolve_the_real_path_of_symlinks,
+        },
+        // Source Maps
+        {
+            name: "sourceRoot",
+            type: "string",
+            paramType: ts.Diagnostics.LOCATION,
+            category: ts.Diagnostics.Source_Map_Options,
+            description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations,
+        },
+        {
+            name: "mapRoot",
+            type: "string",
+            paramType: ts.Diagnostics.LOCATION,
+            category: ts.Diagnostics.Source_Map_Options,
+            description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations,
+        },
+        {
+            name: "inlineSourceMap",
+            type: "boolean",
+            category: ts.Diagnostics.Source_Map_Options,
+            description: ts.Diagnostics.Emit_a_single_file_with_source_maps_instead_of_having_a_separate_file
+        },
+        {
+            name: "inlineSources",
+            type: "boolean",
+            category: ts.Diagnostics.Source_Map_Options,
+            description: ts.Diagnostics.Emit_the_source_alongside_the_sourcemaps_within_a_single_file_requires_inlineSourceMap_or_sourceMap_to_be_set
+        },
+        // Experimental
+        {
+            name: "experimentalDecorators",
+            type: "boolean",
+            category: ts.Diagnostics.Experimental_Options,
+            description: ts.Diagnostics.Enables_experimental_support_for_ES7_decorators
+        },
+        {
+            name: "emitDecoratorMetadata",
+            type: "boolean",
+            category: ts.Diagnostics.Experimental_Options,
+            description: ts.Diagnostics.Enables_experimental_support_for_emitting_type_metadata_for_decorators
+        },
+        // Advanced
+        {
+            name: "jsxFactory",
+            type: "string",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Specify_the_JSX_factory_function_to_use_when_targeting_react_JSX_emit_e_g_React_createElement_or_h
+        },
+        {
+            name: "resolveJsonModule",
+            type: "boolean",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Include_modules_imported_with_json_extension
+        },
+        {
+            name: "out",
+            type: "string",
+            isFilePath: false,
+            // for correct behaviour, please use outFile
+            category: ts.Diagnostics.Advanced_Options,
+            paramType: ts.Diagnostics.FILE,
+            description: ts.Diagnostics.Deprecated_Use_outFile_instead_Concatenate_and_emit_output_to_single_file,
+        },
+        {
+            name: "reactNamespace",
+            type: "string",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Deprecated_Use_jsxFactory_instead_Specify_the_object_invoked_for_createElement_when_targeting_react_JSX_emit
+        },
+        {
+            name: "skipDefaultLibCheck",
+            type: "boolean",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Deprecated_Use_skipLibCheck_instead_Skip_type_checking_of_default_library_declaration_files
+        },
+        {
+            name: "charset",
+            type: "string",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.The_character_set_of_the_input_files
+        },
+        {
+            name: "emitBOM",
+            type: "boolean",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Emit_a_UTF_8_Byte_Order_Mark_BOM_in_the_beginning_of_output_files
+        },
+        {
+            name: "locale",
+            type: "string",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.The_locale_used_when_displaying_messages_to_the_user_e_g_en_us
+        },
+        {
+            name: "newLine",
+            type: ts.createMapFromTemplate({
+                crlf: 0 /* CarriageReturnLineFeed */,
+                lf: 1 /* LineFeed */
+            }),
+            paramType: ts.Diagnostics.NEWLINE,
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix,
+        },
+        {
+            name: "noErrorTruncation",
+            type: "boolean",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Do_not_truncate_error_messages
+        },
+        {
+            name: "noLib",
+            type: "boolean",
+            affectsModuleResolution: true,
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Do_not_include_the_default_library_file_lib_d_ts
+        },
+        {
+            name: "noResolve",
+            type: "boolean",
+            affectsModuleResolution: true,
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Do_not_add_triple_slash_references_or_imported_modules_to_the_list_of_compiled_files
+        },
+        {
+            name: "stripInternal",
+            type: "boolean",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Do_not_emit_declarations_for_code_that_has_an_internal_annotation,
+        },
+        {
+            name: "disableSizeLimit",
+            type: "boolean",
+            affectsSourceFile: true,
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Disable_size_limitations_on_JavaScript_projects
+        },
+        {
+            name: "noImplicitUseStrict",
+            type: "boolean",
+            affectsSemanticDiagnostics: true,
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Do_not_emit_use_strict_directives_in_module_output
+        },
+        {
+            name: "noEmitHelpers",
+            type: "boolean",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Do_not_generate_custom_helper_functions_like_extends_in_compiled_output
+        },
+        {
+            name: "noEmitOnError",
+            type: "boolean",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Do_not_emit_outputs_if_any_errors_were_reported,
+        },
+        {
+            name: "preserveConstEnums",
+            type: "boolean",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Do_not_erase_const_enum_declarations_in_generated_code
+        },
+        {
+            name: "declarationDir",
+            type: "string",
+            isFilePath: true,
+            paramType: ts.Diagnostics.DIRECTORY,
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Output_directory_for_generated_declaration_files
+        },
+        {
+            name: "skipLibCheck",
+            type: "boolean",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Skip_type_checking_of_declaration_files,
+        },
+        {
+            name: "allowUnusedLabels",
+            type: "boolean",
+            affectsBindDiagnostics: true,
+            affectsSemanticDiagnostics: true,
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Do_not_report_errors_on_unused_labels
+        },
+        {
+            name: "allowUnreachableCode",
+            type: "boolean",
+            affectsBindDiagnostics: true,
+            affectsSemanticDiagnostics: true,
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Do_not_report_errors_on_unreachable_code
+        },
+        {
+            name: "suppressExcessPropertyErrors",
+            type: "boolean",
+            affectsSemanticDiagnostics: true,
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Suppress_excess_property_checks_for_object_literals,
+        },
+        {
+            name: "suppressImplicitAnyIndexErrors",
+            type: "boolean",
+            affectsSemanticDiagnostics: true,
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures,
+        },
+        {
+            name: "forceConsistentCasingInFileNames",
+            type: "boolean",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Disallow_inconsistently_cased_references_to_the_same_file
+        },
+        {
+            name: "maxNodeModuleJsDepth",
+            type: "number",
+            affectsModuleResolution: true,
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files
+        },
+        {
+            name: "noStrictGenericChecks",
+            type: "boolean",
+            affectsSemanticDiagnostics: true,
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Disable_strict_checking_of_generic_signatures_in_function_types,
+        },
+        {
+            name: "keyofStringsOnly",
+            type: "boolean",
+            category: ts.Diagnostics.Advanced_Options,
+            description: ts.Diagnostics.Resolve_keyof_to_string_valued_property_names_only_no_numbers_or_symbols,
+        },
+        {
+            // A list of plugins to load in the language service
+            name: "plugins",
+            type: "list",
+            isTSConfigOnly: true,
+            element: {
+                name: "plugin",
+                type: "object"
+            },
+            description: ts.Diagnostics.List_of_language_service_plugins
+        }
+    ]);
+    /* @internal */
+    ts.semanticDiagnosticsOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsSemanticDiagnostics; });
+    /* @internal */
+    ts.moduleResolutionOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsModuleResolution; });
+    /* @internal */
+    ts.sourceFileAffectingCompilerOptions = ts.optionDeclarations.filter(function (option) {
+        return !!option.affectsSourceFile || !!option.affectsModuleResolution || !!option.affectsBindDiagnostics;
+    });
+    /* @internal */
+    ts.buildOpts = ts.commonOptionsWithBuild.concat([
+        {
+            name: "verbose",
+            shortName: "v",
+            category: ts.Diagnostics.Command_line_Options,
+            description: ts.Diagnostics.Enable_verbose_logging,
+            type: "boolean"
+        },
+        {
+            name: "dry",
+            shortName: "d",
+            category: ts.Diagnostics.Command_line_Options,
+            description: ts.Diagnostics.Show_what_would_be_built_or_deleted_if_specified_with_clean,
+            type: "boolean"
+        },
+        {
+            name: "force",
+            shortName: "f",
+            category: ts.Diagnostics.Command_line_Options,
+            description: ts.Diagnostics.Build_all_projects_including_those_that_appear_to_be_up_to_date,
+            type: "boolean"
+        },
+        {
+            name: "clean",
+            category: ts.Diagnostics.Command_line_Options,
+            description: ts.Diagnostics.Delete_the_outputs_of_all_projects,
+            type: "boolean"
+        }
+    ]);
+    /* @internal */
+    ts.typeAcquisitionDeclarations = [
+        {
+            /* @deprecated typingOptions.enableAutoDiscovery
+             * Use typeAcquisition.enable instead.
+             */
+            name: "enableAutoDiscovery",
+            type: "boolean",
+        },
+        {
+            name: "enable",
+            type: "boolean",
+        },
+        {
+            name: "include",
+            type: "list",
+            element: {
+                name: "include",
+                type: "string"
+            }
+        },
+        {
+            name: "exclude",
+            type: "list",
+            element: {
+                name: "exclude",
+                type: "string"
+            }
+        }
+    ];
+    /* @internal */
+    ts.defaultInitCompilerOptions = {
+        module: ts.ModuleKind.CommonJS,
+        target: 1 /* ES5 */,
+        strict: true,
+        esModuleInterop: true
+    };
+    var optionNameMapCache;
+    /* @internal */
+    function convertEnableAutoDiscoveryToEnable(typeAcquisition) {
+        // Convert deprecated typingOptions.enableAutoDiscovery to typeAcquisition.enable
+        if (typeAcquisition && typeAcquisition.enableAutoDiscovery !== undefined && typeAcquisition.enable === undefined) {
+            return {
+                enable: typeAcquisition.enableAutoDiscovery,
+                include: typeAcquisition.include || [],
+                exclude: typeAcquisition.exclude || []
+            };
+        }
+        return typeAcquisition;
+    }
+    ts.convertEnableAutoDiscoveryToEnable = convertEnableAutoDiscoveryToEnable;
+    function getOptionNameMap() {
+        return optionNameMapCache || (optionNameMapCache = createOptionNameMap(ts.optionDeclarations));
+    }
+    /*@internal*/
+    function createOptionNameMap(optionDeclarations) {
+        var optionNameMap = ts.createMap();
+        var shortOptionNames = ts.createMap();
+        ts.forEach(optionDeclarations, function (option) {
+            optionNameMap.set(option.name.toLowerCase(), option);
+            if (option.shortName) {
+                shortOptionNames.set(option.shortName, option.name);
+            }
+        });
+        return { optionNameMap: optionNameMap, shortOptionNames: shortOptionNames };
+    }
+    ts.createOptionNameMap = createOptionNameMap;
+    /* @internal */
+    function createCompilerDiagnosticForInvalidCustomType(opt) {
+        return createDiagnosticForInvalidCustomType(opt, ts.createCompilerDiagnostic);
+    }
+    ts.createCompilerDiagnosticForInvalidCustomType = createCompilerDiagnosticForInvalidCustomType;
+    function createDiagnosticForInvalidCustomType(opt, createDiagnostic) {
+        var namesOfType = ts.arrayFrom(opt.type.keys()).map(function (key) { return "'" + key + "'"; }).join(", ");
+        return createDiagnostic(ts.Diagnostics.Argument_for_0_option_must_be_Colon_1, "--" + opt.name, namesOfType);
+    }
+    /* @internal */
+    function parseCustomTypeOption(opt, value, errors) {
+        return convertJsonOptionOfCustomType(opt, trimString(value || ""), errors);
+    }
+    ts.parseCustomTypeOption = parseCustomTypeOption;
+    /* @internal */
+    function parseListTypeOption(opt, value, errors) {
+        if (value === void 0) { value = ""; }
+        value = trimString(value);
+        if (ts.startsWith(value, "-")) {
+            return undefined;
+        }
+        if (value === "") {
+            return [];
+        }
+        var values = value.split(",");
+        switch (opt.element.type) {
+            case "number":
+                return ts.map(values, parseInt);
+            case "string":
+                return ts.map(values, function (v) { return v || ""; });
+            default:
+                return ts.mapDefined(values, function (v) { return parseCustomTypeOption(opt.element, v, errors); });
+        }
+    }
+    ts.parseListTypeOption = parseListTypeOption;
+    function parseCommandLineWorker(getOptionNameMap, _a, commandLine, readFile) {
+        var unknownOptionDiagnostic = _a[0], optionTypeMismatchDiagnostic = _a[1];
+        var options = {};
+        var fileNames = [];
+        var errors = [];
+        parseStrings(commandLine);
+        return {
+            options: options,
+            fileNames: fileNames,
+            errors: errors
+        };
+        function parseStrings(args) {
+            var i = 0;
+            while (i < args.length) {
+                var s = args[i];
+                i++;
+                if (s.charCodeAt(0) === 64 /* at */) {
+                    parseResponseFile(s.slice(1));
+                }
+                else if (s.charCodeAt(0) === 45 /* minus */) {
+                    var opt = getOptionDeclarationFromName(getOptionNameMap, s.slice(s.charCodeAt(1) === 45 /* minus */ ? 2 : 1), /*allowShort*/ true);
+                    if (opt) {
+                        if (opt.isTSConfigOnly) {
+                            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_can_only_be_specified_in_tsconfig_json_file, opt.name));
+                        }
+                        else {
+                            // Check to see if no argument was provided (e.g. "--locale" is the last command-line argument).
+                            if (!args[i] && opt.type !== "boolean") {
+                                errors.push(ts.createCompilerDiagnostic(optionTypeMismatchDiagnostic, opt.name));
+                            }
+                            switch (opt.type) {
+                                case "number":
+                                    options[opt.name] = parseInt(args[i]);
+                                    i++;
+                                    break;
+                                case "boolean":
+                                    // boolean flag has optional value true, false, others
+                                    var optValue = args[i];
+                                    options[opt.name] = optValue !== "false";
+                                    // consume next argument as boolean flag value
+                                    if (optValue === "false" || optValue === "true") {
+                                        i++;
+                                    }
+                                    break;
+                                case "string":
+                                    options[opt.name] = args[i] || "";
+                                    i++;
+                                    break;
+                                case "list":
+                                    var result = parseListTypeOption(opt, args[i], errors);
+                                    options[opt.name] = result || [];
+                                    if (result) {
+                                        i++;
+                                    }
+                                    break;
+                                // If not a primitive, the possible types are specified in what is effectively a map of options.
+                                default:
+                                    options[opt.name] = parseCustomTypeOption(opt, args[i], errors);
+                                    i++;
+                                    break;
+                            }
+                        }
+                    }
+                    else {
+                        errors.push(ts.createCompilerDiagnostic(unknownOptionDiagnostic, s));
+                    }
+                }
+                else {
+                    fileNames.push(s);
+                }
+            }
+        }
+        function parseResponseFile(fileName) {
+            var text = readFile ? readFile(fileName) : ts.sys.readFile(fileName);
+            if (!text) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_not_found, fileName));
+                return;
+            }
+            var args = [];
+            var pos = 0;
+            while (true) {
+                while (pos < text.length && text.charCodeAt(pos) <= 32 /* space */)
+                    pos++;
+                if (pos >= text.length)
+                    break;
+                var start = pos;
+                if (text.charCodeAt(start) === 34 /* doubleQuote */) {
+                    pos++;
+                    while (pos < text.length && text.charCodeAt(pos) !== 34 /* doubleQuote */)
+                        pos++;
+                    if (pos < text.length) {
+                        args.push(text.substring(start + 1, pos));
+                        pos++;
+                    }
+                    else {
+                        errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unterminated_quoted_string_in_response_file_0, fileName));
+                    }
+                }
+                else {
+                    while (text.charCodeAt(pos) > 32 /* space */)
+                        pos++;
+                    args.push(text.substring(start, pos));
+                }
+            }
+            parseStrings(args);
+        }
+    }
+    function parseCommandLine(commandLine, readFile) {
+        return parseCommandLineWorker(getOptionNameMap, [
+            ts.Diagnostics.Unknown_compiler_option_0,
+            ts.Diagnostics.Compiler_option_0_expects_an_argument
+        ], commandLine, readFile);
+    }
+    ts.parseCommandLine = parseCommandLine;
+    /** @internal */
+    function getOptionFromName(optionName, allowShort) {
+        return getOptionDeclarationFromName(getOptionNameMap, optionName, allowShort);
+    }
+    ts.getOptionFromName = getOptionFromName;
+    function getOptionDeclarationFromName(getOptionNameMap, optionName, allowShort) {
+        if (allowShort === void 0) { allowShort = false; }
+        optionName = optionName.toLowerCase();
+        var _a = getOptionNameMap(), optionNameMap = _a.optionNameMap, shortOptionNames = _a.shortOptionNames;
+        // Try to translate short option names to their full equivalents.
+        if (allowShort) {
+            var short = shortOptionNames.get(optionName);
+            if (short !== undefined) {
+                optionName = short;
+            }
+        }
+        return optionNameMap.get(optionName);
+    }
+    /*@internal*/
+    function parseBuildCommand(args) {
+        var buildOptionNameMap;
+        var returnBuildOptionNameMap = function () { return (buildOptionNameMap || (buildOptionNameMap = createOptionNameMap(ts.buildOpts))); };
+        var _a = parseCommandLineWorker(returnBuildOptionNameMap, [
+            ts.Diagnostics.Unknown_build_option_0,
+            ts.Diagnostics.Build_option_0_requires_a_value_of_type_1
+        ], args), options = _a.options, projects = _a.fileNames, errors = _a.errors;
+        var buildOptions = options;
+        if (projects.length === 0) {
+            // tsc -b invoked with no extra arguments; act as if invoked with "tsc -b ."
+            projects.push(".");
+        }
+        // Nonsensical combinations
+        if (buildOptions.clean && buildOptions.force) {
+            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Options_0_and_1_cannot_be_combined, "clean", "force"));
+        }
+        if (buildOptions.clean && buildOptions.verbose) {
+            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Options_0_and_1_cannot_be_combined, "clean", "verbose"));
+        }
+        if (buildOptions.clean && buildOptions.watch) {
+            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Options_0_and_1_cannot_be_combined, "clean", "watch"));
+        }
+        if (buildOptions.watch && buildOptions.dry) {
+            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Options_0_and_1_cannot_be_combined, "watch", "dry"));
+        }
+        return { buildOptions: buildOptions, projects: projects, errors: errors };
+    }
+    ts.parseBuildCommand = parseBuildCommand;
+    function getDiagnosticText(_message) {
+        var _args = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            _args[_i - 1] = arguments[_i];
+        }
+        var diagnostic = ts.createCompilerDiagnostic.apply(undefined, arguments);
+        return diagnostic.messageText;
+    }
+    /* @internal */
+    function printVersion() {
+        ts.sys.write(getDiagnosticText(ts.Diagnostics.Version_0, ts.version) + ts.sys.newLine);
+    }
+    ts.printVersion = printVersion;
+    /* @internal */
+    function printHelp(optionsList, syntaxPrefix) {
+        if (syntaxPrefix === void 0) { syntaxPrefix = ""; }
+        var output = [];
+        // We want to align our "syntax" and "examples" commands to a certain margin.
+        var syntaxLength = getDiagnosticText(ts.Diagnostics.Syntax_Colon_0, "").length;
+        var examplesLength = getDiagnosticText(ts.Diagnostics.Examples_Colon_0, "").length;
+        var marginLength = Math.max(syntaxLength, examplesLength);
+        // Build up the syntactic skeleton.
+        var syntax = makePadding(marginLength - syntaxLength);
+        syntax += "tsc " + syntaxPrefix + "[" + getDiagnosticText(ts.Diagnostics.options) + "] [" + getDiagnosticText(ts.Diagnostics.file) + "...]";
+        output.push(getDiagnosticText(ts.Diagnostics.Syntax_Colon_0, syntax));
+        output.push(ts.sys.newLine + ts.sys.newLine);
+        // Build up the list of examples.
+        var padding = makePadding(marginLength);
+        output.push(getDiagnosticText(ts.Diagnostics.Examples_Colon_0, makePadding(marginLength - examplesLength) + "tsc hello.ts") + ts.sys.newLine);
+        output.push(padding + "tsc --outFile file.js file.ts" + ts.sys.newLine);
+        output.push(padding + "tsc @args.txt" + ts.sys.newLine);
+        output.push(padding + "tsc --build tsconfig.json" + ts.sys.newLine);
+        output.push(ts.sys.newLine);
+        output.push(getDiagnosticText(ts.Diagnostics.Options_Colon) + ts.sys.newLine);
+        // We want our descriptions to align at the same column in our output,
+        // so we keep track of the longest option usage string.
+        marginLength = 0;
+        var usageColumn = []; // Things like "-d, --declaration" go in here.
+        var descriptionColumn = [];
+        var optionsDescriptionMap = ts.createMap(); // Map between option.description and list of option.type if it is a kind
+        for (var _i = 0, optionsList_1 = optionsList; _i < optionsList_1.length; _i++) {
+            var option = optionsList_1[_i];
+            // If an option lacks a description,
+            // it is not officially supported.
+            if (!option.description) {
+                continue;
+            }
+            var usageText_1 = " ";
+            if (option.shortName) {
+                usageText_1 += "-" + option.shortName;
+                usageText_1 += getParamType(option);
+                usageText_1 += ", ";
+            }
+            usageText_1 += "--" + option.name;
+            usageText_1 += getParamType(option);
+            usageColumn.push(usageText_1);
+            var description = void 0;
+            if (option.name === "lib") {
+                description = getDiagnosticText(option.description);
+                var element = option.element;
+                var typeMap = element.type;
+                optionsDescriptionMap.set(description, ts.arrayFrom(typeMap.keys()).map(function (key) { return "'" + key + "'"; }));
+            }
+            else {
+                description = getDiagnosticText(option.description);
+            }
+            descriptionColumn.push(description);
+            // Set the new margin for the description column if necessary.
+            marginLength = Math.max(usageText_1.length, marginLength);
+        }
+        // Special case that can't fit in the loop.
+        var usageText = " @<" + getDiagnosticText(ts.Diagnostics.file) + ">";
+        usageColumn.push(usageText);
+        descriptionColumn.push(getDiagnosticText(ts.Diagnostics.Insert_command_line_options_and_files_from_a_file));
+        marginLength = Math.max(usageText.length, marginLength);
+        // Print out each row, aligning all the descriptions on the same column.
+        for (var i = 0; i < usageColumn.length; i++) {
+            var usage = usageColumn[i];
+            var description = descriptionColumn[i];
+            var kindsList = optionsDescriptionMap.get(description);
+            output.push(usage + makePadding(marginLength - usage.length + 2) + description + ts.sys.newLine);
+            if (kindsList) {
+                output.push(makePadding(marginLength + 4));
+                for (var _a = 0, kindsList_1 = kindsList; _a < kindsList_1.length; _a++) {
+                    var kind = kindsList_1[_a];
+                    output.push(kind + " ");
+                }
+                output.push(ts.sys.newLine);
+            }
+        }
+        for (var _b = 0, output_1 = output; _b < output_1.length; _b++) {
+            var line = output_1[_b];
+            ts.sys.write(line);
+        }
+        return;
+        function getParamType(option) {
+            if (option.paramType !== undefined) {
+                return " " + getDiagnosticText(option.paramType);
+            }
+            return "";
+        }
+        function makePadding(paddingLength) {
+            return Array(paddingLength + 1).join(" ");
+        }
+    }
+    ts.printHelp = printHelp;
+    /**
+     * Reads the config file, reports errors if any and exits if the config file cannot be found
+     */
+    function getParsedCommandLineOfConfigFile(configFileName, optionsToExtend, host) {
+        var configFileText;
+        try {
+            configFileText = host.readFile(configFileName);
+        }
+        catch (e) {
+            var error = ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_read_file_0_Colon_1, configFileName, e.message);
+            host.onUnRecoverableConfigFileDiagnostic(error);
+            return undefined;
+        }
+        if (!configFileText) {
+            var error = ts.createCompilerDiagnostic(ts.Diagnostics.File_0_not_found, configFileName);
+            host.onUnRecoverableConfigFileDiagnostic(error);
+            return undefined;
+        }
+        var result = ts.parseJsonText(configFileName, configFileText);
+        var cwd = host.getCurrentDirectory();
+        result.path = ts.toPath(configFileName, cwd, ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames));
+        result.resolvedPath = result.path;
+        result.originalFileName = result.fileName;
+        return parseJsonSourceFileConfigFileContent(result, host, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), cwd), optionsToExtend, ts.getNormalizedAbsolutePath(configFileName, cwd));
+    }
+    ts.getParsedCommandLineOfConfigFile = getParsedCommandLineOfConfigFile;
+    /**
+     * Read tsconfig.json file
+     * @param fileName The path to the config file
+     */
+    function readConfigFile(fileName, readFile) {
+        var textOrDiagnostic = tryReadFile(fileName, readFile);
+        return ts.isString(textOrDiagnostic) ? parseConfigFileTextToJson(fileName, textOrDiagnostic) : { config: {}, error: textOrDiagnostic };
+    }
+    ts.readConfigFile = readConfigFile;
+    /**
+     * Parse the text of the tsconfig.json file
+     * @param fileName The path to the config file
+     * @param jsonText The text of the config file
+     */
+    function parseConfigFileTextToJson(fileName, jsonText) {
+        var jsonSourceFile = ts.parseJsonText(fileName, jsonText);
+        return {
+            config: convertToObject(jsonSourceFile, jsonSourceFile.parseDiagnostics),
+            error: jsonSourceFile.parseDiagnostics.length ? jsonSourceFile.parseDiagnostics[0] : undefined
+        };
+    }
+    ts.parseConfigFileTextToJson = parseConfigFileTextToJson;
+    /**
+     * Read tsconfig.json file
+     * @param fileName The path to the config file
+     */
+    function readJsonConfigFile(fileName, readFile) {
+        var textOrDiagnostic = tryReadFile(fileName, readFile);
+        return ts.isString(textOrDiagnostic) ? ts.parseJsonText(fileName, textOrDiagnostic) : { parseDiagnostics: [textOrDiagnostic] };
+    }
+    ts.readJsonConfigFile = readJsonConfigFile;
+    function tryReadFile(fileName, readFile) {
+        var text;
+        try {
+            text = readFile(fileName);
+        }
+        catch (e) {
+            return ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_read_file_0_Colon_1, fileName, e.message);
+        }
+        return text === undefined ? ts.createCompilerDiagnostic(ts.Diagnostics.The_specified_path_does_not_exist_Colon_0, fileName) : text;
+    }
+    function commandLineOptionsToMap(options) {
+        return ts.arrayToMap(options, function (option) { return option.name; });
+    }
+    var _tsconfigRootOptions;
+    function getTsconfigRootOptionsMap() {
+        if (_tsconfigRootOptions === undefined) {
+            _tsconfigRootOptions = {
+                name: undefined,
+                type: "object",
+                elementOptions: commandLineOptionsToMap([
+                    {
+                        name: "compilerOptions",
+                        type: "object",
+                        elementOptions: commandLineOptionsToMap(ts.optionDeclarations),
+                        extraKeyDiagnosticMessage: ts.Diagnostics.Unknown_compiler_option_0
+                    },
+                    {
+                        name: "typingOptions",
+                        type: "object",
+                        elementOptions: commandLineOptionsToMap(ts.typeAcquisitionDeclarations),
+                        extraKeyDiagnosticMessage: ts.Diagnostics.Unknown_type_acquisition_option_0
+                    },
+                    {
+                        name: "typeAcquisition",
+                        type: "object",
+                        elementOptions: commandLineOptionsToMap(ts.typeAcquisitionDeclarations),
+                        extraKeyDiagnosticMessage: ts.Diagnostics.Unknown_type_acquisition_option_0
+                    },
+                    {
+                        name: "extends",
+                        type: "string"
+                    },
+                    {
+                        name: "references",
+                        type: "list",
+                        element: {
+                            name: "references",
+                            type: "object"
+                        }
+                    },
+                    {
+                        name: "files",
+                        type: "list",
+                        element: {
+                            name: "files",
+                            type: "string"
+                        }
+                    },
+                    {
+                        name: "include",
+                        type: "list",
+                        element: {
+                            name: "include",
+                            type: "string"
+                        }
+                    },
+                    {
+                        name: "exclude",
+                        type: "list",
+                        element: {
+                            name: "exclude",
+                            type: "string"
+                        }
+                    },
+                    ts.compileOnSaveCommandLineOption
+                ])
+            };
+        }
+        return _tsconfigRootOptions;
+    }
+    /**
+     * Convert the json syntax tree into the json value
+     */
+    function convertToObject(sourceFile, errors) {
+        return convertToObjectWorker(sourceFile, errors, /*returnValue*/ true, /*knownRootOptions*/ undefined, /*jsonConversionNotifier*/ undefined);
+    }
+    ts.convertToObject = convertToObject;
+    /**
+     * Convert the json syntax tree into the json value and report errors
+     * This returns the json value (apart from checking errors) only if returnValue provided is true.
+     * Otherwise it just checks the errors and returns undefined
+     */
+    /*@internal*/
+    function convertToObjectWorker(sourceFile, errors, returnValue, knownRootOptions, jsonConversionNotifier) {
+        if (!sourceFile.statements.length) {
+            return returnValue ? {} : undefined;
+        }
+        return convertPropertyValueToJson(sourceFile.statements[0].expression, knownRootOptions);
+        function isRootOptionMap(knownOptions) {
+            return knownRootOptions && knownRootOptions.elementOptions === knownOptions;
+        }
+        function convertObjectLiteralExpressionToJson(node, knownOptions, extraKeyDiagnosticMessage, parentOption) {
+            var result = returnValue ? {} : undefined;
+            for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
+                var element = _a[_i];
+                if (element.kind !== 275 /* PropertyAssignment */) {
+                    errors.push(ts.createDiagnosticForNodeInSourceFile(sourceFile, element, ts.Diagnostics.Property_assignment_expected));
+                    continue;
+                }
+                if (element.questionToken) {
+                    errors.push(ts.createDiagnosticForNodeInSourceFile(sourceFile, element.questionToken, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, "?"));
+                }
+                if (!isDoubleQuotedString(element.name)) {
+                    errors.push(ts.createDiagnosticForNodeInSourceFile(sourceFile, element.name, ts.Diagnostics.String_literal_with_double_quotes_expected));
+                }
+                var textOfKey = ts.getTextOfPropertyName(element.name);
+                var keyText = textOfKey && ts.unescapeLeadingUnderscores(textOfKey);
+                var option = keyText && knownOptions ? knownOptions.get(keyText) : undefined;
+                if (keyText && extraKeyDiagnosticMessage && !option) {
+                    errors.push(ts.createDiagnosticForNodeInSourceFile(sourceFile, element.name, extraKeyDiagnosticMessage, keyText));
+                }
+                var value = convertPropertyValueToJson(element.initializer, option);
+                if (typeof keyText !== "undefined") {
+                    if (returnValue) {
+                        result[keyText] = value;
+                    }
+                    // Notify key value set, if user asked for it
+                    if (jsonConversionNotifier &&
+                        // Current callbacks are only on known parent option or if we are setting values in the root
+                        (parentOption || isRootOptionMap(knownOptions))) {
+                        var isValidOptionValue = isCompilerOptionsValue(option, value);
+                        if (parentOption) {
+                            if (isValidOptionValue) {
+                                // Notify option set in the parent if its a valid option value
+                                jsonConversionNotifier.onSetValidOptionKeyValueInParent(parentOption, option, value);
+                            }
+                        }
+                        else if (isRootOptionMap(knownOptions)) {
+                            if (isValidOptionValue) {
+                                // Notify about the valid root key value being set
+                                jsonConversionNotifier.onSetValidOptionKeyValueInRoot(keyText, element.name, value, element.initializer);
+                            }
+                            else if (!option) {
+                                // Notify about the unknown root key value being set
+                                jsonConversionNotifier.onSetUnknownOptionKeyValueInRoot(keyText, element.name, value, element.initializer);
+                            }
+                        }
+                    }
+                }
+            }
+            return result;
+        }
+        function convertArrayLiteralExpressionToJson(elements, elementOption) {
+            if (!returnValue) {
+                return elements.forEach(function (element) { return convertPropertyValueToJson(element, elementOption); });
+            }
+            // Filter out invalid values
+            return ts.filter(elements.map(function (element) { return convertPropertyValueToJson(element, elementOption); }), function (v) { return v !== undefined; });
+        }
+        function convertPropertyValueToJson(valueExpression, option) {
+            switch (valueExpression.kind) {
+                case 102 /* TrueKeyword */:
+                    reportInvalidOptionValue(option && option.type !== "boolean");
+                    return true;
+                case 87 /* FalseKeyword */:
+                    reportInvalidOptionValue(option && option.type !== "boolean");
+                    return false;
+                case 96 /* NullKeyword */:
+                    reportInvalidOptionValue(option && option.name === "extends"); // "extends" is the only option we don't allow null/undefined for
+                    return null; // tslint:disable-line:no-null-keyword
+                case 10 /* StringLiteral */:
+                    if (!isDoubleQuotedString(valueExpression)) {
+                        errors.push(ts.createDiagnosticForNodeInSourceFile(sourceFile, valueExpression, ts.Diagnostics.String_literal_with_double_quotes_expected));
+                    }
+                    reportInvalidOptionValue(option && (ts.isString(option.type) && option.type !== "string"));
+                    var text = valueExpression.text;
+                    if (option && !ts.isString(option.type)) {
+                        var customOption = option;
+                        // Validate custom option type
+                        if (!customOption.type.has(text.toLowerCase())) {
+                            errors.push(createDiagnosticForInvalidCustomType(customOption, function (message, arg0, arg1) { return ts.createDiagnosticForNodeInSourceFile(sourceFile, valueExpression, message, arg0, arg1); }));
+                        }
+                    }
+                    return text;
+                case 8 /* NumericLiteral */:
+                    reportInvalidOptionValue(option && option.type !== "number");
+                    return Number(valueExpression.text);
+                case 202 /* PrefixUnaryExpression */:
+                    if (valueExpression.operator !== 39 /* MinusToken */ || valueExpression.operand.kind !== 8 /* NumericLiteral */) {
+                        break; // not valid JSON syntax
+                    }
+                    reportInvalidOptionValue(option && option.type !== "number");
+                    return -Number(valueExpression.operand.text);
+                case 188 /* ObjectLiteralExpression */:
+                    reportInvalidOptionValue(option && option.type !== "object");
+                    var objectLiteralExpression = valueExpression;
+                    // Currently having element option declaration in the tsconfig with type "object"
+                    // determines if it needs onSetValidOptionKeyValueInParent callback or not
+                    // At moment there are only "compilerOptions", "typeAcquisition" and "typingOptions"
+                    // that satifies it and need it to modify options set in them (for normalizing file paths)
+                    // vs what we set in the json
+                    // If need arises, we can modify this interface and callbacks as needed
+                    if (option) {
+                        var _a = option, elementOptions = _a.elementOptions, extraKeyDiagnosticMessage = _a.extraKeyDiagnosticMessage, optionName = _a.name;
+                        return convertObjectLiteralExpressionToJson(objectLiteralExpression, elementOptions, extraKeyDiagnosticMessage, optionName);
+                    }
+                    else {
+                        return convertObjectLiteralExpressionToJson(objectLiteralExpression, /* knownOptions*/ undefined, 
+                        /*extraKeyDiagnosticMessage */ undefined, /*parentOption*/ undefined);
+                    }
+                case 187 /* ArrayLiteralExpression */:
+                    reportInvalidOptionValue(option && option.type !== "list");
+                    return convertArrayLiteralExpressionToJson(valueExpression.elements, option && option.element);
+            }
+            // Not in expected format
+            if (option) {
+                reportInvalidOptionValue(/*isError*/ true);
+            }
+            else {
+                errors.push(ts.createDiagnosticForNodeInSourceFile(sourceFile, valueExpression, ts.Diagnostics.Property_value_can_only_be_string_literal_numeric_literal_true_false_null_object_literal_or_array_literal));
+            }
+            return undefined;
+            function reportInvalidOptionValue(isError) {
+                if (isError) {
+                    errors.push(ts.createDiagnosticForNodeInSourceFile(sourceFile, valueExpression, ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, option.name, getCompilerOptionValueTypeString(option)));
+                }
+            }
+        }
+        function isDoubleQuotedString(node) {
+            return ts.isStringLiteral(node) && ts.isStringDoubleQuoted(node, sourceFile);
+        }
+    }
+    ts.convertToObjectWorker = convertToObjectWorker;
+    function getCompilerOptionValueTypeString(option) {
+        return option.type === "list" ?
+            "Array" :
+            ts.isString(option.type) ? option.type : "string";
+    }
+    function isCompilerOptionsValue(option, value) {
+        if (option) {
+            if (isNullOrUndefined(value))
+                return true; // All options are undefinable/nullable
+            if (option.type === "list") {
+                return ts.isArray(value);
+            }
+            var expectedType = ts.isString(option.type) ? option.type : "string";
+            return typeof value === expectedType;
+        }
+        return false;
+    }
+    /**
+     * Generate an uncommented, complete tsconfig for use with "--showConfig"
+     * @param configParseResult options to be generated into tsconfig.json
+     * @param configFileName name of the parsed config file - output paths will be generated relative to this
+     * @param host provides current directory and case sensitivity services
+     */
+    /** @internal */
+    function convertToTSConfig(configParseResult, configFileName, host) {
+        var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames);
+        var files = ts.map(ts.filter(configParseResult.fileNames, (!configParseResult.configFileSpecs || !configParseResult.configFileSpecs.validatedIncludeSpecs) ? function (_) { return true; } : matchesSpecs(configFileName, configParseResult.configFileSpecs.validatedIncludeSpecs, configParseResult.configFileSpecs.validatedExcludeSpecs)), function (f) { return ts.getRelativePathFromFile(ts.getNormalizedAbsolutePath(configFileName, host.getCurrentDirectory()), ts.getNormalizedAbsolutePath(f, host.getCurrentDirectory()), getCanonicalFileName); });
+        var optionMap = serializeCompilerOptions(configParseResult.options, { configFilePath: ts.getNormalizedAbsolutePath(configFileName, host.getCurrentDirectory()), useCaseSensitiveFileNames: host.useCaseSensitiveFileNames });
+        var config = __assign({ compilerOptions: __assign({}, ts.arrayFrom(optionMap.entries()).reduce(function (prev, cur) {
+                var _a;
+                return (__assign({}, prev, (_a = {}, _a[cur[0]] = cur[1], _a)));
+            }, {}), { showConfig: undefined, configFile: undefined, configFilePath: undefined, help: undefined, init: undefined, listFiles: undefined, listEmittedFiles: undefined, project: undefined, build: undefined, version: undefined }), references: ts.map(configParseResult.projectReferences, function (r) { return (__assign({}, r, { path: r.originalPath, originalPath: undefined })); }), files: ts.length(files) ? files : undefined }, (configParseResult.configFileSpecs ? {
+            include: filterSameAsDefaultInclude(configParseResult.configFileSpecs.validatedIncludeSpecs),
+            exclude: configParseResult.configFileSpecs.validatedExcludeSpecs
+        } : {}), { compilerOnSave: !!configParseResult.compileOnSave ? true : undefined });
+        return config;
+    }
+    ts.convertToTSConfig = convertToTSConfig;
+    function filterSameAsDefaultInclude(specs) {
+        if (!ts.length(specs))
+            return undefined;
+        if (ts.length(specs) !== 1)
+            return specs;
+        if (specs[0] === "**/*")
+            return undefined;
+        return specs;
+    }
+    function matchesSpecs(path, includeSpecs, excludeSpecs) {
+        if (!includeSpecs)
+            return function (_) { return true; };
+        var patterns = ts.getFileMatcherPatterns(path, excludeSpecs, includeSpecs, ts.sys.useCaseSensitiveFileNames, ts.sys.getCurrentDirectory());
+        var excludeRe = patterns.excludePattern && ts.getRegexFromPattern(patterns.excludePattern, ts.sys.useCaseSensitiveFileNames);
+        var includeRe = patterns.includeFilePattern && ts.getRegexFromPattern(patterns.includeFilePattern, ts.sys.useCaseSensitiveFileNames);
+        if (includeRe) {
+            if (excludeRe) {
+                return function (path) { return !(includeRe.test(path) && !excludeRe.test(path)); };
+            }
+            return function (path) { return !includeRe.test(path); };
+        }
+        if (excludeRe) {
+            return function (path) { return excludeRe.test(path); };
+        }
+        return function (_) { return true; };
+    }
+    function getCustomTypeMapOfCommandLineOption(optionDefinition) {
+        if (optionDefinition.type === "string" || optionDefinition.type === "number" || optionDefinition.type === "boolean" || optionDefinition.type === "object") {
+            // this is of a type CommandLineOptionOfPrimitiveType
+            return undefined;
+        }
+        else if (optionDefinition.type === "list") {
+            return getCustomTypeMapOfCommandLineOption(optionDefinition.element);
+        }
+        else {
+            return optionDefinition.type;
+        }
+    }
+    function getNameOfCompilerOptionValue(value, customTypeMap) {
+        // There is a typeMap associated with this command-line option so use it to map value back to its name
+        return ts.forEachEntry(customTypeMap, function (mapValue, key) {
+            if (mapValue === value) {
+                return key;
+            }
+        });
+    }
+    function serializeCompilerOptions(options, pathOptions) {
+        var result = ts.createMap();
+        var optionsNameMap = getOptionNameMap().optionNameMap;
+        var getCanonicalFileName = pathOptions && ts.createGetCanonicalFileName(pathOptions.useCaseSensitiveFileNames);
+        var _loop_3 = function (name) {
+            if (ts.hasProperty(options, name)) {
+                // tsconfig only options cannot be specified via command line,
+                // so we can assume that only types that can appear here string | number | boolean
+                if (optionsNameMap.has(name) && optionsNameMap.get(name).category === ts.Diagnostics.Command_line_Options) {
+                    return "continue";
+                }
+                var value = options[name];
+                var optionDefinition = optionsNameMap.get(name.toLowerCase());
+                if (optionDefinition) {
+                    var customTypeMap_1 = getCustomTypeMapOfCommandLineOption(optionDefinition);
+                    if (!customTypeMap_1) {
+                        // There is no map associated with this compiler option then use the value as-is
+                        // This is the case if the value is expect to be string, number, boolean or list of string
+                        if (pathOptions && optionDefinition.isFilePath) {
+                            result.set(name, ts.getRelativePathFromFile(pathOptions.configFilePath, ts.getNormalizedAbsolutePath(value, ts.getDirectoryPath(pathOptions.configFilePath)), getCanonicalFileName));
+                        }
+                        else {
+                            result.set(name, value);
+                        }
+                    }
+                    else {
+                        if (optionDefinition.type === "list") {
+                            result.set(name, value.map(function (element) { return getNameOfCompilerOptionValue(element, customTypeMap_1); })); // TODO: GH#18217
+                        }
+                        else {
+                            // There is a typeMap associated with this command-line option so use it to map value back to its name
+                            result.set(name, getNameOfCompilerOptionValue(value, customTypeMap_1));
+                        }
+                    }
+                }
+            }
+        };
+        for (var name in options) {
+            _loop_3(name);
+        }
+        return result;
+    }
+    /**
+     * Generate tsconfig configuration when running command line "--init"
+     * @param options commandlineOptions to be generated into tsconfig.json
+     * @param fileNames array of filenames to be generated into tsconfig.json
+     */
+    /* @internal */
+    function generateTSConfig(options, fileNames, newLine) {
+        var compilerOptions = ts.extend(options, ts.defaultInitCompilerOptions);
+        var compilerOptionsMap = serializeCompilerOptions(compilerOptions);
+        return writeConfigurations();
+        function getDefaultValueForOption(option) {
+            switch (option.type) {
+                case "number":
+                    return 1;
+                case "boolean":
+                    return true;
+                case "string":
+                    return option.isFilePath ? "./" : "";
+                case "list":
+                    return [];
+                case "object":
+                    return {};
+                default:
+                    return option.type.keys().next().value;
+            }
+        }
+        function makePadding(paddingLength) {
+            return Array(paddingLength + 1).join(" ");
+        }
+        function isAllowedOption(_a) {
+            var category = _a.category, name = _a.name;
+            // Skip options which do not have a category or have category `Command_line_Options`
+            // Exclude all possible `Advanced_Options` in tsconfig.json which were NOT defined in command line
+            return category !== undefined
+                && category !== ts.Diagnostics.Command_line_Options
+                && (category !== ts.Diagnostics.Advanced_Options || compilerOptionsMap.has(name));
+        }
+        function writeConfigurations() {
+            // Filter applicable options to place in the file
+            var categorizedOptions = ts.createMultiMap();
+            for (var _i = 0, optionDeclarations_1 = ts.optionDeclarations; _i < optionDeclarations_1.length; _i++) {
+                var option = optionDeclarations_1[_i];
+                var category = option.category;
+                if (isAllowedOption(option)) {
+                    categorizedOptions.add(ts.getLocaleSpecificMessage(category), option);
+                }
+            }
+            // Serialize all options and their descriptions
+            var marginLength = 0;
+            var seenKnownKeys = 0;
+            var nameColumn = [];
+            var descriptionColumn = [];
+            categorizedOptions.forEach(function (options, category) {
+                if (nameColumn.length !== 0) {
+                    nameColumn.push("");
+                    descriptionColumn.push("");
+                }
+                nameColumn.push("/* " + category + " */");
+                descriptionColumn.push("");
+                for (var _i = 0, options_1 = options; _i < options_1.length; _i++) {
+                    var option = options_1[_i];
+                    var optionName = void 0;
+                    if (compilerOptionsMap.has(option.name)) {
+                        optionName = "\"" + option.name + "\": " + JSON.stringify(compilerOptionsMap.get(option.name)) + ((seenKnownKeys += 1) === compilerOptionsMap.size ? "" : ",");
+                    }
+                    else {
+                        optionName = "// \"" + option.name + "\": " + JSON.stringify(getDefaultValueForOption(option)) + ",";
+                    }
+                    nameColumn.push(optionName);
+                    descriptionColumn.push("/* " + (option.description && ts.getLocaleSpecificMessage(option.description) || option.name) + " */");
+                    marginLength = Math.max(optionName.length, marginLength);
+                }
+            });
+            // Write the output
+            var tab = makePadding(2);
+            var result = [];
+            result.push("{");
+            result.push(tab + "\"compilerOptions\": {");
+            // Print out each row, aligning all the descriptions on the same column.
+            for (var i = 0; i < nameColumn.length; i++) {
+                var optionName = nameColumn[i];
+                var description = descriptionColumn[i];
+                result.push(optionName && "" + tab + tab + optionName + (description && (makePadding(marginLength - optionName.length + 2) + description)));
+            }
+            if (fileNames.length) {
+                result.push(tab + "},");
+                result.push(tab + "\"files\": [");
+                for (var i = 0; i < fileNames.length; i++) {
+                    result.push("" + tab + tab + JSON.stringify(fileNames[i]) + (i === fileNames.length - 1 ? "" : ","));
+                }
+                result.push(tab + "]");
+            }
+            else {
+                result.push(tab + "}");
+            }
+            result.push("}");
+            return result.join(newLine) + newLine;
+        }
+    }
+    ts.generateTSConfig = generateTSConfig;
+    /**
+     * Parse the contents of a config file (tsconfig.json).
+     * @param json The contents of the config file to parse
+     * @param host Instance of ParseConfigHost used to enumerate files in folder.
+     * @param basePath A root directory to resolve relative path entries in the config
+     *    file to. e.g. outDir
+     */
+    function parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
+        return parseJsonConfigFileContentWorker(json, /*sourceFile*/ undefined, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions);
+    }
+    ts.parseJsonConfigFileContent = parseJsonConfigFileContent;
+    /**
+     * Parse the contents of a config file (tsconfig.json).
+     * @param jsonNode The contents of the config file to parse
+     * @param host Instance of ParseConfigHost used to enumerate files in folder.
+     * @param basePath A root directory to resolve relative path entries in the config
+     *    file to. e.g. outDir
+     */
+    function parseJsonSourceFileConfigFileContent(sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
+        return parseJsonConfigFileContentWorker(/*json*/ undefined, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions);
+    }
+    ts.parseJsonSourceFileConfigFileContent = parseJsonSourceFileConfigFileContent;
+    /*@internal*/
+    function setConfigFileInOptions(options, configFile) {
+        if (configFile) {
+            Object.defineProperty(options, "configFile", { enumerable: false, writable: false, value: configFile });
+        }
+    }
+    ts.setConfigFileInOptions = setConfigFileInOptions;
+    function isNullOrUndefined(x) {
+        // tslint:disable-next-line:no-null-keyword
+        return x === undefined || x === null;
+    }
+    function directoryOfCombinedPath(fileName, basePath) {
+        // Use the `getNormalizedAbsolutePath` function to avoid canonicalizing the path, as it must remain noncanonical
+        // until consistient casing errors are reported
+        return ts.getDirectoryPath(ts.getNormalizedAbsolutePath(fileName, basePath));
+    }
+    /**
+     * Parse the contents of a config file from json or json source file (tsconfig.json).
+     * @param json The contents of the config file to parse
+     * @param sourceFile sourceFile corresponding to the Json
+     * @param host Instance of ParseConfigHost used to enumerate files in folder.
+     * @param basePath A root directory to resolve relative path entries in the config
+     *    file to. e.g. outDir
+     * @param resolutionStack Only present for backwards-compatibility. Should be empty.
+     */
+    function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
+        if (existingOptions === void 0) { existingOptions = {}; }
+        if (resolutionStack === void 0) { resolutionStack = []; }
+        if (extraFileExtensions === void 0) { extraFileExtensions = []; }
+        ts.Debug.assert((json === undefined && sourceFile !== undefined) || (json !== undefined && sourceFile === undefined));
+        var errors = [];
+        var parsedConfig = parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors);
+        var raw = parsedConfig.raw;
+        var options = ts.extend(existingOptions, parsedConfig.options || {});
+        options.configFilePath = configFileName && ts.normalizeSlashes(configFileName);
+        setConfigFileInOptions(options, sourceFile);
+        var projectReferences;
+        var _a = getFileNames(), fileNames = _a.fileNames, wildcardDirectories = _a.wildcardDirectories, spec = _a.spec;
+        return {
+            options: options,
+            fileNames: fileNames,
+            projectReferences: projectReferences,
+            typeAcquisition: parsedConfig.typeAcquisition || getDefaultTypeAcquisition(),
+            raw: raw,
+            errors: errors,
+            wildcardDirectories: wildcardDirectories,
+            compileOnSave: !!raw.compileOnSave,
+            configFileSpecs: spec
+        };
+        function getFileNames() {
+            var filesSpecs;
+            if (ts.hasProperty(raw, "files") && !isNullOrUndefined(raw.files)) {
+                if (ts.isArray(raw.files)) {
+                    filesSpecs = raw.files;
+                    var hasReferences = ts.hasProperty(raw, "references") && !isNullOrUndefined(raw.references);
+                    var hasZeroOrNoReferences = !hasReferences || raw.references.length === 0;
+                    var hasExtends = ts.hasProperty(raw, "extends");
+                    if (filesSpecs.length === 0 && hasZeroOrNoReferences && !hasExtends) {
+                        if (sourceFile) {
+                            var fileName = configFileName || "tsconfig.json";
+                            var diagnosticMessage = ts.Diagnostics.The_files_list_in_config_file_0_is_empty;
+                            var nodeValue = ts.firstDefined(ts.getTsConfigPropArray(sourceFile, "files"), function (property) { return property.initializer; });
+                            var error = nodeValue
+                                ? ts.createDiagnosticForNodeInSourceFile(sourceFile, nodeValue, diagnosticMessage, fileName)
+                                : ts.createCompilerDiagnostic(diagnosticMessage, fileName);
+                            errors.push(error);
+                        }
+                        else {
+                            createCompilerDiagnosticOnlyIfJson(ts.Diagnostics.The_files_list_in_config_file_0_is_empty, configFileName || "tsconfig.json");
+                        }
+                    }
+                }
+                else {
+                    createCompilerDiagnosticOnlyIfJson(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "files", "Array");
+                }
+            }
+            var includeSpecs;
+            if (ts.hasProperty(raw, "include") && !isNullOrUndefined(raw.include)) {
+                if (ts.isArray(raw.include)) {
+                    includeSpecs = raw.include;
+                }
+                else {
+                    createCompilerDiagnosticOnlyIfJson(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "include", "Array");
+                }
+            }
+            var excludeSpecs;
+            if (ts.hasProperty(raw, "exclude") && !isNullOrUndefined(raw.exclude)) {
+                if (ts.isArray(raw.exclude)) {
+                    excludeSpecs = raw.exclude;
+                }
+                else {
+                    createCompilerDiagnosticOnlyIfJson(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "exclude", "Array");
+                }
+            }
+            else if (raw.compilerOptions) {
+                var outDir = raw.compilerOptions.outDir;
+                var declarationDir = raw.compilerOptions.declarationDir;
+                if (outDir || declarationDir) {
+                    excludeSpecs = [outDir, declarationDir].filter(function (d) { return !!d; });
+                }
+            }
+            if (filesSpecs === undefined && includeSpecs === undefined) {
+                includeSpecs = ["**/*"];
+            }
+            var result = matchFileNames(filesSpecs, includeSpecs, excludeSpecs, configFileName ? directoryOfCombinedPath(configFileName, basePath) : basePath, options, host, errors, extraFileExtensions, sourceFile);
+            if (shouldReportNoInputFiles(result, canJsonReportNoInutFiles(raw), resolutionStack)) {
+                errors.push(getErrorForNoInputFiles(result.spec, configFileName));
+            }
+            if (ts.hasProperty(raw, "references") && !isNullOrUndefined(raw.references)) {
+                if (ts.isArray(raw.references)) {
+                    for (var _i = 0, _a = raw.references; _i < _a.length; _i++) {
+                        var ref = _a[_i];
+                        if (typeof ref.path !== "string") {
+                            createCompilerDiagnosticOnlyIfJson(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "reference.path", "string");
+                        }
+                        else {
+                            (projectReferences || (projectReferences = [])).push({
+                                path: ts.getNormalizedAbsolutePath(ref.path, basePath),
+                                originalPath: ref.path,
+                                prepend: ref.prepend,
+                                circular: ref.circular
+                            });
+                        }
+                    }
+                }
+                else {
+                    createCompilerDiagnosticOnlyIfJson(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "references", "Array");
+                }
+            }
+            return result;
+        }
+        function createCompilerDiagnosticOnlyIfJson(message, arg0, arg1) {
+            if (!sourceFile) {
+                errors.push(ts.createCompilerDiagnostic(message, arg0, arg1));
+            }
+        }
+    }
+    function isErrorNoInputFiles(error) {
+        return error.code === ts.Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2.code;
+    }
+    function getErrorForNoInputFiles(_a, configFileName) {
+        var includeSpecs = _a.includeSpecs, excludeSpecs = _a.excludeSpecs;
+        return ts.createCompilerDiagnostic(ts.Diagnostics.No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2, configFileName || "tsconfig.json", JSON.stringify(includeSpecs || []), JSON.stringify(excludeSpecs || []));
+    }
+    function shouldReportNoInputFiles(result, canJsonReportNoInutFiles, resolutionStack) {
+        return result.fileNames.length === 0 && canJsonReportNoInutFiles && (!resolutionStack || resolutionStack.length === 0);
+    }
+    /*@internal*/
+    function canJsonReportNoInutFiles(raw) {
+        return !ts.hasProperty(raw, "files") && !ts.hasProperty(raw, "references");
+    }
+    ts.canJsonReportNoInutFiles = canJsonReportNoInutFiles;
+    /*@internal*/
+    function updateErrorForNoInputFiles(result, configFileName, configFileSpecs, configParseDiagnostics, canJsonReportNoInutFiles) {
+        var existingErrors = configParseDiagnostics.length;
+        if (shouldReportNoInputFiles(result, canJsonReportNoInutFiles)) {
+            configParseDiagnostics.push(getErrorForNoInputFiles(configFileSpecs, configFileName));
+        }
+        else {
+            ts.filterMutate(configParseDiagnostics, function (error) { return !isErrorNoInputFiles(error); });
+        }
+        return existingErrors !== configParseDiagnostics.length;
+    }
+    ts.updateErrorForNoInputFiles = updateErrorForNoInputFiles;
+    function isSuccessfulParsedTsconfig(value) {
+        return !!value.options;
+    }
+    /**
+     * This *just* extracts options/include/exclude/files out of a config file.
+     * It does *not* resolve the included files.
+     */
+    function parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors) {
+        basePath = ts.normalizeSlashes(basePath);
+        var resolvedPath = ts.getNormalizedAbsolutePath(configFileName || "", basePath);
+        if (resolutionStack.indexOf(resolvedPath) >= 0) {
+            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Circularity_detected_while_resolving_configuration_Colon_0, resolutionStack.concat([resolvedPath]).join(" -> ")));
+            return { raw: json || convertToObject(sourceFile, errors) };
+        }
+        var ownConfig = json ?
+            parseOwnConfigOfJson(json, host, basePath, configFileName, errors) :
+            parseOwnConfigOfJsonSourceFile(sourceFile, host, basePath, configFileName, errors);
+        if (ownConfig.extendedConfigPath) {
+            // copy the resolution stack so it is never reused between branches in potential diamond-problem scenarios.
+            resolutionStack = resolutionStack.concat([resolvedPath]);
+            var extendedConfig = getExtendedConfig(sourceFile, ownConfig.extendedConfigPath, host, basePath, resolutionStack, errors);
+            if (extendedConfig && isSuccessfulParsedTsconfig(extendedConfig)) {
+                var baseRaw_1 = extendedConfig.raw;
+                var raw_1 = ownConfig.raw;
+                var setPropertyInRawIfNotUndefined = function (propertyName) {
+                    var value = raw_1[propertyName] || baseRaw_1[propertyName];
+                    if (value) {
+                        raw_1[propertyName] = value;
+                    }
+                };
+                setPropertyInRawIfNotUndefined("include");
+                setPropertyInRawIfNotUndefined("exclude");
+                setPropertyInRawIfNotUndefined("files");
+                if (raw_1.compileOnSave === undefined) {
+                    raw_1.compileOnSave = baseRaw_1.compileOnSave;
+                }
+                ownConfig.options = ts.assign({}, extendedConfig.options, ownConfig.options);
+                // TODO extend type typeAcquisition
+            }
+        }
+        return ownConfig;
+    }
+    function parseOwnConfigOfJson(json, host, basePath, configFileName, errors) {
+        if (ts.hasProperty(json, "excludes")) {
+            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_option_excludes_Did_you_mean_exclude));
+        }
+        var options = convertCompilerOptionsFromJsonWorker(json.compilerOptions, basePath, errors, configFileName);
+        // typingOptions has been deprecated and is only supported for backward compatibility purposes.
+        // It should be removed in future releases - use typeAcquisition instead.
+        var typeAcquisition = convertTypeAcquisitionFromJsonWorker(json.typeAcquisition || json.typingOptions, basePath, errors, configFileName);
+        json.compileOnSave = convertCompileOnSaveOptionFromJson(json, basePath, errors);
+        var extendedConfigPath;
+        if (json.extends) {
+            if (!ts.isString(json.extends)) {
+                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "extends", "string"));
+            }
+            else {
+                var newBase = configFileName ? directoryOfCombinedPath(configFileName, basePath) : basePath;
+                extendedConfigPath = getExtendsConfigPath(json.extends, host, newBase, errors, ts.createCompilerDiagnostic);
+            }
+        }
+        return { raw: json, options: options, typeAcquisition: typeAcquisition, extendedConfigPath: extendedConfigPath };
+    }
+    function parseOwnConfigOfJsonSourceFile(sourceFile, host, basePath, configFileName, errors) {
+        var options = getDefaultCompilerOptions(configFileName);
+        var typeAcquisition, typingOptionstypeAcquisition;
+        var extendedConfigPath;
+        var optionsIterator = {
+            onSetValidOptionKeyValueInParent: function (parentOption, option, value) {
+                ts.Debug.assert(parentOption === "compilerOptions" || parentOption === "typeAcquisition" || parentOption === "typingOptions");
+                var currentOption = parentOption === "compilerOptions" ?
+                    options :
+                    parentOption === "typeAcquisition" ?
+                        (typeAcquisition || (typeAcquisition = getDefaultTypeAcquisition(configFileName))) :
+                        (typingOptionstypeAcquisition || (typingOptionstypeAcquisition = getDefaultTypeAcquisition(configFileName)));
+                currentOption[option.name] = normalizeOptionValue(option, basePath, value);
+            },
+            onSetValidOptionKeyValueInRoot: function (key, _keyNode, value, valueNode) {
+                switch (key) {
+                    case "extends":
+                        var newBase = configFileName ? directoryOfCombinedPath(configFileName, basePath) : basePath;
+                        extendedConfigPath = getExtendsConfigPath(value, host, newBase, errors, function (message, arg0) {
+                            return ts.createDiagnosticForNodeInSourceFile(sourceFile, valueNode, message, arg0);
+                        });
+                        return;
+                }
+            },
+            onSetUnknownOptionKeyValueInRoot: function (key, keyNode, _value, _valueNode) {
+                if (key === "excludes") {
+                    errors.push(ts.createDiagnosticForNodeInSourceFile(sourceFile, keyNode, ts.Diagnostics.Unknown_option_excludes_Did_you_mean_exclude));
+                }
+            }
+        };
+        var json = convertToObjectWorker(sourceFile, errors, /*returnValue*/ true, getTsconfigRootOptionsMap(), optionsIterator);
+        if (!typeAcquisition) {
+            if (typingOptionstypeAcquisition) {
+                typeAcquisition = (typingOptionstypeAcquisition.enableAutoDiscovery !== undefined) ?
+                    {
+                        enable: typingOptionstypeAcquisition.enableAutoDiscovery,
+                        include: typingOptionstypeAcquisition.include,
+                        exclude: typingOptionstypeAcquisition.exclude
+                    } :
+                    typingOptionstypeAcquisition;
+            }
+            else {
+                typeAcquisition = getDefaultTypeAcquisition(configFileName);
+            }
+        }
+        return { raw: json, options: options, typeAcquisition: typeAcquisition, extendedConfigPath: extendedConfigPath };
+    }
+    function getExtendsConfigPath(extendedConfig, host, basePath, errors, createDiagnostic) {
+        extendedConfig = ts.normalizeSlashes(extendedConfig);
+        if (ts.isRootedDiskPath(extendedConfig) || ts.startsWith(extendedConfig, "./") || ts.startsWith(extendedConfig, "../")) {
+            var extendedConfigPath = ts.getNormalizedAbsolutePath(extendedConfig, basePath);
+            if (!host.fileExists(extendedConfigPath) && !ts.endsWith(extendedConfigPath, ".json" /* Json */)) {
+                extendedConfigPath = extendedConfigPath + ".json";
+                if (!host.fileExists(extendedConfigPath)) {
+                    errors.push(createDiagnostic(ts.Diagnostics.File_0_does_not_exist, extendedConfig));
+                    return undefined;
+                }
+            }
+            return extendedConfigPath;
+        }
+        // If the path isn't a rooted or relative path, resolve like a module
+        var resolved = ts.nodeModuleNameResolver(extendedConfig, ts.combinePaths(basePath, "tsconfig.json"), { moduleResolution: ts.ModuleResolutionKind.NodeJs }, host, /*cache*/ undefined, /*projectRefs*/ undefined, /*lookupConfig*/ true);
+        if (resolved.resolvedModule) {
+            return resolved.resolvedModule.resolvedFileName;
+        }
+        errors.push(createDiagnostic(ts.Diagnostics.File_0_does_not_exist, extendedConfig));
+        return undefined;
+    }
+    function getExtendedConfig(sourceFile, extendedConfigPath, host, basePath, resolutionStack, errors) {
+        var _a;
+        var extendedResult = readJsonConfigFile(extendedConfigPath, function (path) { return host.readFile(path); });
+        if (sourceFile) {
+            sourceFile.extendedSourceFiles = [extendedResult.fileName];
+        }
+        if (extendedResult.parseDiagnostics.length) {
+            errors.push.apply(errors, extendedResult.parseDiagnostics);
+            return undefined;
+        }
+        var extendedDirname = ts.getDirectoryPath(extendedConfigPath);
+        var extendedConfig = parseConfig(/*json*/ undefined, extendedResult, host, extendedDirname, ts.getBaseFileName(extendedConfigPath), resolutionStack, errors);
+        if (sourceFile && extendedResult.extendedSourceFiles) {
+            (_a = sourceFile.extendedSourceFiles).push.apply(_a, extendedResult.extendedSourceFiles);
+        }
+        if (isSuccessfulParsedTsconfig(extendedConfig)) {
+            // Update the paths to reflect base path
+            var relativeDifference_1 = ts.convertToRelativePath(extendedDirname, basePath, ts.identity);
+            var updatePath_1 = function (path) { return ts.isRootedDiskPath(path) ? path : ts.combinePaths(relativeDifference_1, path); };
+            var mapPropertiesInRawIfNotUndefined = function (propertyName) {
+                if (raw_2[propertyName]) {
+                    raw_2[propertyName] = ts.map(raw_2[propertyName], updatePath_1);
+                }
+            };
+            var raw_2 = extendedConfig.raw;
+            mapPropertiesInRawIfNotUndefined("include");
+            mapPropertiesInRawIfNotUndefined("exclude");
+            mapPropertiesInRawIfNotUndefined("files");
+        }
+        return extendedConfig;
+    }
+    function convertCompileOnSaveOptionFromJson(jsonOption, basePath, errors) {
+        if (!ts.hasProperty(jsonOption, ts.compileOnSaveCommandLineOption.name)) {
+            return false;
+        }
+        var result = convertJsonOption(ts.compileOnSaveCommandLineOption, jsonOption.compileOnSave, basePath, errors);
+        return typeof result === "boolean" && result;
+    }
+    function convertCompilerOptionsFromJson(jsonOptions, basePath, configFileName) {
+        var errors = [];
+        var options = convertCompilerOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName);
+        return { options: options, errors: errors };
+    }
+    ts.convertCompilerOptionsFromJson = convertCompilerOptionsFromJson;
+    function convertTypeAcquisitionFromJson(jsonOptions, basePath, configFileName) {
+        var errors = [];
+        var options = convertTypeAcquisitionFromJsonWorker(jsonOptions, basePath, errors, configFileName);
+        return { options: options, errors: errors };
+    }
+    ts.convertTypeAcquisitionFromJson = convertTypeAcquisitionFromJson;
+    function getDefaultCompilerOptions(configFileName) {
+        var options = configFileName && ts.getBaseFileName(configFileName) === "jsconfig.json"
+            ? { allowJs: true, maxNodeModuleJsDepth: 2, allowSyntheticDefaultImports: true, skipLibCheck: true, noEmit: true }
+            : {};
+        return options;
+    }
+    function convertCompilerOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName) {
+        var options = getDefaultCompilerOptions(configFileName);
+        convertOptionsFromJson(ts.optionDeclarations, jsonOptions, basePath, options, ts.Diagnostics.Unknown_compiler_option_0, errors);
+        if (configFileName) {
+            options.configFilePath = ts.normalizeSlashes(configFileName);
+        }
+        return options;
+    }
+    function getDefaultTypeAcquisition(configFileName) {
+        return { enable: !!configFileName && ts.getBaseFileName(configFileName) === "jsconfig.json", include: [], exclude: [] };
+    }
+    function convertTypeAcquisitionFromJsonWorker(jsonOptions, basePath, errors, configFileName) {
+        var options = getDefaultTypeAcquisition(configFileName);
+        var typeAcquisition = convertEnableAutoDiscoveryToEnable(jsonOptions);
+        convertOptionsFromJson(ts.typeAcquisitionDeclarations, typeAcquisition, basePath, options, ts.Diagnostics.Unknown_type_acquisition_option_0, errors);
+        return options;
+    }
+    function convertOptionsFromJson(optionDeclarations, jsonOptions, basePath, defaultOptions, diagnosticMessage, errors) {
+        if (!jsonOptions) {
+            return;
+        }
+        var optionNameMap = commandLineOptionsToMap(optionDeclarations);
+        for (var id in jsonOptions) {
+            var opt = optionNameMap.get(id);
+            if (opt) {
+                defaultOptions[opt.name] = convertJsonOption(opt, jsonOptions[id], basePath, errors);
+            }
+            else {
+                errors.push(ts.createCompilerDiagnostic(diagnosticMessage, id));
+            }
+        }
+    }
+    function convertJsonOption(opt, value, basePath, errors) {
+        if (isCompilerOptionsValue(opt, value)) {
+            var optType = opt.type;
+            if (optType === "list" && ts.isArray(value)) {
+                return convertJsonOptionOfListType(opt, value, basePath, errors);
+            }
+            else if (!ts.isString(optType)) {
+                return convertJsonOptionOfCustomType(opt, value, errors);
+            }
+            return normalizeNonListOptionValue(opt, basePath, value);
+        }
+        else {
+            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, opt.name, getCompilerOptionValueTypeString(opt)));
+        }
+    }
+    function normalizeOptionValue(option, basePath, value) {
+        if (isNullOrUndefined(value))
+            return undefined;
+        if (option.type === "list") {
+            var listOption_1 = option;
+            if (listOption_1.element.isFilePath || !ts.isString(listOption_1.element.type)) {
+                return ts.filter(ts.map(value, function (v) { return normalizeOptionValue(listOption_1.element, basePath, v); }), function (v) { return !!v; });
+            }
+            return value;
+        }
+        else if (!ts.isString(option.type)) {
+            return option.type.get(ts.isString(value) ? value.toLowerCase() : value);
+        }
+        return normalizeNonListOptionValue(option, basePath, value);
+    }
+    function normalizeNonListOptionValue(option, basePath, value) {
+        if (option.isFilePath) {
+            value = ts.normalizePath(ts.combinePaths(basePath, value));
+            if (value === "") {
+                value = ".";
+            }
+        }
+        return value;
+    }
+    function convertJsonOptionOfCustomType(opt, value, errors) {
+        if (isNullOrUndefined(value))
+            return undefined;
+        var key = value.toLowerCase();
+        var val = opt.type.get(key);
+        if (val !== undefined) {
+            return val;
+        }
+        else {
+            errors.push(createCompilerDiagnosticForInvalidCustomType(opt));
+        }
+    }
+    function convertJsonOptionOfListType(option, values, basePath, errors) {
+        return ts.filter(ts.map(values, function (v) { return convertJsonOption(option.element, v, basePath, errors); }), function (v) { return !!v; });
+    }
+    function trimString(s) {
+        return typeof s.trim === "function" ? s.trim() : s.replace(/^[\s]+|[\s]+$/g, "");
+    }
+    /**
+     * Tests for a path that ends in a recursive directory wildcard.
+     * Matches **, \**, **\, and \**\, but not a**b.
+     *
+     * NOTE: used \ in place of / above to avoid issues with multiline comments.
+     *
+     * Breakdown:
+     *  (^|\/)      # matches either the beginning of the string or a directory separator.
+     *  \*\*        # matches the recursive directory wildcard "**".
+     *  \/?$        # matches an optional trailing directory separator at the end of the string.
+     */
+    var invalidTrailingRecursionPattern = /(^|\/)\*\*\/?$/;
+    /**
+     * Tests for a path where .. appears after a recursive directory wildcard.
+     * Matches **\..\*, **\a\..\*, and **\.., but not ..\**\*
+     *
+     * NOTE: used \ in place of / above to avoid issues with multiline comments.
+     *
+     * Breakdown:
+     *  (^|\/)      # matches either the beginning of the string or a directory separator.
+     *  \*\*\/      # matches a recursive directory wildcard "**" followed by a directory separator.
+     *  (.*\/)?     # optionally matches any number of characters followed by a directory separator.
+     *  \.\.        # matches a parent directory path component ".."
+     *  ($|\/)      # matches either the end of the string or a directory separator.
+     */
+    var invalidDotDotAfterRecursiveWildcardPattern = /(^|\/)\*\*\/(.*\/)?\.\.($|\/)/;
+    /**
+     * Tests for a path containing a wildcard character in a directory component of the path.
+     * Matches \*\, \?\, and \a*b\, but not \a\ or \a\*.
+     *
+     * NOTE: used \ in place of / above to avoid issues with multiline comments.
+     *
+     * Breakdown:
+     *  \/          # matches a directory separator.
+     *  [^/]*?      # matches any number of characters excluding directory separators (non-greedy).
+     *  [*?]        # matches either a wildcard character (* or ?)
+     *  [^/]*       # matches any number of characters excluding directory separators (greedy).
+     *  \/          # matches a directory separator.
+     */
+    var watchRecursivePattern = /\/[^/]*?[*?][^/]*\//;
+    /**
+     * Matches the portion of a wildcard path that does not contain wildcards.
+     * Matches \a of \a\*, or \a\b\c of \a\b\c\?\d.
+     *
+     * NOTE: used \ in place of / above to avoid issues with multiline comments.
+     *
+     * Breakdown:
+     *  ^                   # matches the beginning of the string
+     *  [^*?]*              # matches any number of non-wildcard characters
+     *  (?=\/[^/]*[*?])     # lookahead that matches a directory separator followed by
+     *                      # a path component that contains at least one wildcard character (* or ?).
+     */
+    var wildcardDirectoryPattern = /^[^*?]*(?=\/[^/]*[*?])/;
+    /**
+     * Expands an array of file specifications.
+     *
+     * @param filesSpecs The literal file names to include.
+     * @param includeSpecs The wildcard file specifications to include.
+     * @param excludeSpecs The wildcard file specifications to exclude.
+     * @param basePath The base path for any relative file specifications.
+     * @param options Compiler options.
+     * @param host The host used to resolve files and directories.
+     * @param errors An array for diagnostic reporting.
+     */
+    function matchFileNames(filesSpecs, includeSpecs, excludeSpecs, basePath, options, host, errors, extraFileExtensions, jsonSourceFile) {
+        basePath = ts.normalizePath(basePath);
+        var validatedIncludeSpecs, validatedExcludeSpecs;
+        // The exclude spec list is converted into a regular expression, which allows us to quickly
+        // test whether a file or directory should be excluded before recursively traversing the
+        // file system.
+        if (includeSpecs) {
+            validatedIncludeSpecs = validateSpecs(includeSpecs, errors, /*allowTrailingRecursion*/ false, jsonSourceFile, "include");
+        }
+        if (excludeSpecs) {
+            validatedExcludeSpecs = validateSpecs(excludeSpecs, errors, /*allowTrailingRecursion*/ true, jsonSourceFile, "exclude");
+        }
+        // Wildcard directories (provided as part of a wildcard path) are stored in a
+        // file map that marks whether it was a regular wildcard match (with a `*` or `?` token),
+        // or a recursive directory. This information is used by filesystem watchers to monitor for
+        // new entries in these paths.
+        var wildcardDirectories = getWildcardDirectories(validatedIncludeSpecs, validatedExcludeSpecs, basePath, host.useCaseSensitiveFileNames);
+        var spec = { filesSpecs: filesSpecs, includeSpecs: includeSpecs, excludeSpecs: excludeSpecs, validatedIncludeSpecs: validatedIncludeSpecs, validatedExcludeSpecs: validatedExcludeSpecs, wildcardDirectories: wildcardDirectories };
+        return getFileNamesFromConfigSpecs(spec, basePath, options, host, extraFileExtensions);
+    }
+    /**
+     * Gets the file names from the provided config file specs that contain, files, include, exclude and
+     * other properties needed to resolve the file names
+     * @param spec The config file specs extracted with file names to include, wildcards to include/exclude and other details
+     * @param basePath The base path for any relative file specifications.
+     * @param options Compiler options.
+     * @param host The host used to resolve files and directories.
+     * @param extraFileExtensions optionaly file extra file extension information from host
+     */
+    /* @internal */
+    function getFileNamesFromConfigSpecs(spec, basePath, options, host, extraFileExtensions) {
+        if (extraFileExtensions === void 0) { extraFileExtensions = []; }
+        basePath = ts.normalizePath(basePath);
+        var keyMapper = host.useCaseSensitiveFileNames ? ts.identity : ts.toLowerCase;
+        // Literal file names (provided via the "files" array in tsconfig.json) are stored in a
+        // file map with a possibly case insensitive key. We use this map later when when including
+        // wildcard paths.
+        var literalFileMap = ts.createMap();
+        // Wildcard paths (provided via the "includes" array in tsconfig.json) are stored in a
+        // file map with a possibly case insensitive key. We use this map to store paths matched
+        // via wildcard, and to handle extension priority.
+        var wildcardFileMap = ts.createMap();
+        // Wildcard paths of json files (provided via the "includes" array in tsconfig.json) are stored in a
+        // file map with a possibly case insensitive key. We use this map to store paths matched
+        // via wildcard of *.json kind
+        var wildCardJsonFileMap = ts.createMap();
+        var filesSpecs = spec.filesSpecs, validatedIncludeSpecs = spec.validatedIncludeSpecs, validatedExcludeSpecs = spec.validatedExcludeSpecs, wildcardDirectories = spec.wildcardDirectories;
+        // Rather than requery this for each file and filespec, we query the supported extensions
+        // once and store it on the expansion context.
+        var supportedExtensions = ts.getSupportedExtensions(options, extraFileExtensions);
+        var supportedExtensionsWithJsonIfResolveJsonModule = ts.getSuppoertedExtensionsWithJsonIfResolveJsonModule(options, supportedExtensions);
+        // Literal files are always included verbatim. An "include" or "exclude" specification cannot
+        // remove a literal file.
+        if (filesSpecs) {
+            for (var _i = 0, filesSpecs_1 = filesSpecs; _i < filesSpecs_1.length; _i++) {
+                var fileName = filesSpecs_1[_i];
+                var file = ts.getNormalizedAbsolutePath(fileName, basePath);
+                literalFileMap.set(keyMapper(file), file);
+            }
+        }
+        var jsonOnlyIncludeRegexes;
+        if (validatedIncludeSpecs && validatedIncludeSpecs.length > 0) {
+            var _loop_4 = function (file) {
+                if (ts.fileExtensionIs(file, ".json" /* Json */)) {
+                    // Valid only if *.json specified
+                    if (!jsonOnlyIncludeRegexes) {
+                        var includes = validatedIncludeSpecs.filter(function (s) { return ts.endsWith(s, ".json" /* Json */); });
+                        var includeFilePatterns = ts.map(ts.getRegularExpressionsForWildcards(includes, basePath, "files"), function (pattern) { return "^" + pattern + "$"; });
+                        jsonOnlyIncludeRegexes = includeFilePatterns ? includeFilePatterns.map(function (pattern) { return ts.getRegexFromPattern(pattern, host.useCaseSensitiveFileNames); }) : ts.emptyArray;
+                    }
+                    var includeIndex = ts.findIndex(jsonOnlyIncludeRegexes, function (re) { return re.test(file); });
+                    if (includeIndex !== -1) {
+                        var key_1 = keyMapper(file);
+                        if (!literalFileMap.has(key_1) && !wildCardJsonFileMap.has(key_1)) {
+                            wildCardJsonFileMap.set(key_1, file);
+                        }
+                    }
+                    return "continue";
+                }
+                // If we have already included a literal or wildcard path with a
+                // higher priority extension, we should skip this file.
+                //
+                // This handles cases where we may encounter both <file>.ts and
+                // <file>.d.ts (or <file>.js if "allowJs" is enabled) in the same
+                // directory when they are compilation outputs.
+                if (hasFileWithHigherPriorityExtension(file, literalFileMap, wildcardFileMap, supportedExtensions, keyMapper)) {
+                    return "continue";
+                }
+                // We may have included a wildcard path with a lower priority
+                // extension due to the user-defined order of entries in the
+                // "include" array. If there is a lower priority extension in the
+                // same directory, we should remove it.
+                removeWildcardFilesWithLowerPriorityExtension(file, wildcardFileMap, supportedExtensions, keyMapper);
+                var key = keyMapper(file);
+                if (!literalFileMap.has(key) && !wildcardFileMap.has(key)) {
+                    wildcardFileMap.set(key, file);
+                }
+            };
+            for (var _a = 0, _b = host.readDirectory(basePath, supportedExtensionsWithJsonIfResolveJsonModule, validatedExcludeSpecs, validatedIncludeSpecs, /*depth*/ undefined); _a < _b.length; _a++) {
+                var file = _b[_a];
+                _loop_4(file);
+            }
+        }
+        var literalFiles = ts.arrayFrom(literalFileMap.values());
+        var wildcardFiles = ts.arrayFrom(wildcardFileMap.values());
+        return {
+            fileNames: literalFiles.concat(wildcardFiles, ts.arrayFrom(wildCardJsonFileMap.values())),
+            wildcardDirectories: wildcardDirectories,
+            spec: spec
+        };
+    }
+    ts.getFileNamesFromConfigSpecs = getFileNamesFromConfigSpecs;
+    function validateSpecs(specs, errors, allowTrailingRecursion, jsonSourceFile, specKey) {
+        return specs.filter(function (spec) {
+            var diag = specToDiagnostic(spec, allowTrailingRecursion);
+            if (diag !== undefined) {
+                errors.push(createDiagnostic(diag, spec));
+            }
+            return diag === undefined;
+        });
+        function createDiagnostic(message, spec) {
+            var element = ts.getTsConfigPropArrayElementValue(jsonSourceFile, specKey, spec);
+            return element ?
+                ts.createDiagnosticForNodeInSourceFile(jsonSourceFile, element, message, spec) :
+                ts.createCompilerDiagnostic(message, spec);
+        }
+    }
+    function specToDiagnostic(spec, allowTrailingRecursion) {
+        if (!allowTrailingRecursion && invalidTrailingRecursionPattern.test(spec)) {
+            return ts.Diagnostics.File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0;
+        }
+        else if (invalidDotDotAfterRecursiveWildcardPattern.test(spec)) {
+            return ts.Diagnostics.File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0;
+        }
+    }
+    /**
+     * Gets directories in a set of include patterns that should be watched for changes.
+     */
+    function getWildcardDirectories(include, exclude, path, useCaseSensitiveFileNames) {
+        // We watch a directory recursively if it contains a wildcard anywhere in a directory segment
+        // of the pattern:
+        //
+        //  /a/b/**/d   - Watch /a/b recursively to catch changes to any d in any subfolder recursively
+        //  /a/b/*/d    - Watch /a/b recursively to catch any d in any immediate subfolder, even if a new subfolder is added
+        //  /a/b        - Watch /a/b recursively to catch changes to anything in any recursive subfoler
+        //
+        // We watch a directory without recursion if it contains a wildcard in the file segment of
+        // the pattern:
+        //
+        //  /a/b/*      - Watch /a/b directly to catch any new file
+        //  /a/b/a?z    - Watch /a/b directly to catch any new file matching a?z
+        var rawExcludeRegex = ts.getRegularExpressionForWildcard(exclude, path, "exclude");
+        var excludeRegex = rawExcludeRegex && new RegExp(rawExcludeRegex, useCaseSensitiveFileNames ? "" : "i");
+        var wildcardDirectories = {};
+        if (include !== undefined) {
+            var recursiveKeys = [];
+            for (var _i = 0, include_1 = include; _i < include_1.length; _i++) {
+                var file = include_1[_i];
+                var spec = ts.normalizePath(ts.combinePaths(path, file));
+                if (excludeRegex && excludeRegex.test(spec)) {
+                    continue;
+                }
+                var match = getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames);
+                if (match) {
+                    var key = match.key, flags = match.flags;
+                    var existingFlags = wildcardDirectories[key];
+                    if (existingFlags === undefined || existingFlags < flags) {
+                        wildcardDirectories[key] = flags;
+                        if (flags === 1 /* Recursive */) {
+                            recursiveKeys.push(key);
+                        }
+                    }
+                }
+            }
+            // Remove any subpaths under an existing recursively watched directory.
+            for (var key in wildcardDirectories) {
+                if (ts.hasProperty(wildcardDirectories, key)) {
+                    for (var _a = 0, recursiveKeys_1 = recursiveKeys; _a < recursiveKeys_1.length; _a++) {
+                        var recursiveKey = recursiveKeys_1[_a];
+                        if (key !== recursiveKey && ts.containsPath(recursiveKey, key, path, !useCaseSensitiveFileNames)) {
+                            delete wildcardDirectories[key];
+                        }
+                    }
+                }
+            }
+        }
+        return wildcardDirectories;
+    }
+    function getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames) {
+        var match = wildcardDirectoryPattern.exec(spec);
+        if (match) {
+            return {
+                key: useCaseSensitiveFileNames ? match[0] : match[0].toLowerCase(),
+                flags: watchRecursivePattern.test(spec) ? 1 /* Recursive */ : 0 /* None */
+            };
+        }
+        if (ts.isImplicitGlob(spec)) {
+            return { key: spec, flags: 1 /* Recursive */ };
+        }
+        return undefined;
+    }
+    /**
+     * Determines whether a literal or wildcard file has already been included that has a higher
+     * extension priority.
+     *
+     * @param file The path to the file.
+     * @param extensionPriority The priority of the extension.
+     * @param context The expansion context.
+     */
+    function hasFileWithHigherPriorityExtension(file, literalFiles, wildcardFiles, extensions, keyMapper) {
+        var extensionPriority = ts.getExtensionPriority(file, extensions);
+        var adjustedExtensionPriority = ts.adjustExtensionPriority(extensionPriority, extensions);
+        for (var i = 0 /* Highest */; i < adjustedExtensionPriority; i++) {
+            var higherPriorityExtension = extensions[i];
+            var higherPriorityPath = keyMapper(ts.changeExtension(file, higherPriorityExtension));
+            if (literalFiles.has(higherPriorityPath) || wildcardFiles.has(higherPriorityPath)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    /**
+     * Removes files included via wildcard expansion with a lower extension priority that have
+     * already been included.
+     *
+     * @param file The path to the file.
+     * @param extensionPriority The priority of the extension.
+     * @param context The expansion context.
+     */
+    function removeWildcardFilesWithLowerPriorityExtension(file, wildcardFiles, extensions, keyMapper) {
+        var extensionPriority = ts.getExtensionPriority(file, extensions);
+        var nextExtensionPriority = ts.getNextLowestExtensionPriority(extensionPriority, extensions);
+        for (var i = nextExtensionPriority; i < extensions.length; i++) {
+            var lowerPriorityExtension = extensions[i];
+            var lowerPriorityPath = keyMapper(ts.changeExtension(file, lowerPriorityExtension));
+            wildcardFiles.delete(lowerPriorityPath);
+        }
+    }
+    /**
+     * Produces a cleaned version of compiler options with personally identifying info (aka, paths) removed.
+     * Also converts enum values back to strings.
+     */
+    /* @internal */
+    function convertCompilerOptionsForTelemetry(opts) {
+        var out = {};
+        for (var key in opts) {
+            if (opts.hasOwnProperty(key)) {
+                var type = getOptionFromName(key);
+                if (type !== undefined) { // Ignore unknown options
+                    out[key] = getOptionValueWithEmptyStrings(opts[key], type);
+                }
+            }
+        }
+        return out;
+    }
+    ts.convertCompilerOptionsForTelemetry = convertCompilerOptionsForTelemetry;
+    function getOptionValueWithEmptyStrings(value, option) {
+        switch (option.type) {
+            case "object": // "paths". Can't get any useful information from the value since we blank out strings, so just return "".
+                return "";
+            case "string": // Could be any arbitrary string -- use empty string instead.
+                return "";
+            case "number": // Allow numbers, but be sure to check it's actually a number.
+                return typeof value === "number" ? value : "";
+            case "boolean":
+                return typeof value === "boolean" ? value : "";
+            case "list":
+                var elementType_1 = option.element;
+                return ts.isArray(value) ? value.map(function (v) { return getOptionValueWithEmptyStrings(v, elementType_1); }) : "";
+            default:
+                return ts.forEachEntry(option.type, function (optionEnumValue, optionStringValue) {
+                    if (optionEnumValue === value) {
+                        return optionStringValue;
+                    }
+                }); // TODO: GH#18217
+        }
+    }
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    function trace(host) {
+        host.trace(ts.formatMessage.apply(undefined, arguments));
+    }
+    ts.trace = trace;
+    /* @internal */
+    function isTraceEnabled(compilerOptions, host) {
+        return !!compilerOptions.traceResolution && host.trace !== undefined;
+    }
+    ts.isTraceEnabled = isTraceEnabled;
+    function withPackageId(packageId, r) {
+        return r && { path: r.path, extension: r.ext, packageId: packageId };
+    }
+    function noPackageId(r) {
+        return withPackageId(/*packageId*/ undefined, r);
+    }
+    function removeIgnoredPackageId(r) {
+        if (r) {
+            ts.Debug.assert(r.packageId === undefined);
+            return { path: r.path, ext: r.extension };
+        }
+    }
+    /**
+     * Kinds of file that we are currently looking for.
+     * Typically there is one pass with Extensions.TypeScript, then a second pass with Extensions.JavaScript.
+     */
+    var Extensions;
+    (function (Extensions) {
+        Extensions[Extensions["TypeScript"] = 0] = "TypeScript";
+        Extensions[Extensions["JavaScript"] = 1] = "JavaScript";
+        Extensions[Extensions["Json"] = 2] = "Json";
+        Extensions[Extensions["TSConfig"] = 3] = "TSConfig";
+        Extensions[Extensions["DtsOnly"] = 4] = "DtsOnly"; /** Only '.d.ts' */
+    })(Extensions || (Extensions = {}));
+    /** Used with `Extensions.DtsOnly` to extract the path from TypeScript results. */
+    function resolvedTypeScriptOnly(resolved) {
+        if (!resolved) {
+            return undefined;
+        }
+        ts.Debug.assert(ts.extensionIsTS(resolved.extension));
+        return { fileName: resolved.path, packageId: resolved.packageId };
+    }
+    function createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations) {
+        return {
+            resolvedModule: resolved && { resolvedFileName: resolved.path, originalPath: resolved.originalPath === true ? undefined : resolved.originalPath, extension: resolved.extension, isExternalLibraryImport: isExternalLibraryImport, packageId: resolved.packageId },
+            failedLookupLocations: failedLookupLocations
+        };
+    }
+    function readPackageJsonField(jsonContent, fieldName, typeOfTag, state) {
+        if (!ts.hasProperty(jsonContent, fieldName)) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.package_json_does_not_have_a_0_field, fieldName);
+            }
+            return;
+        }
+        var value = jsonContent[fieldName];
+        if (typeof value !== typeOfTag || value === null) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_1_got_2, fieldName, typeOfTag, value === null ? "null" : typeof value);
+            }
+            return;
+        }
+        return value;
+    }
+    function readPackageJsonPathField(jsonContent, fieldName, baseDirectory, state) {
+        var fileName = readPackageJsonField(jsonContent, fieldName, "string", state);
+        if (fileName === undefined)
+            return;
+        var path = ts.normalizePath(ts.combinePaths(baseDirectory, fileName));
+        if (state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, fileName, path);
+        }
+        return path;
+    }
+    function readPackageJsonTypesFields(jsonContent, baseDirectory, state) {
+        return readPackageJsonPathField(jsonContent, "typings", baseDirectory, state)
+            || readPackageJsonPathField(jsonContent, "types", baseDirectory, state);
+    }
+    function readPackageJsonTSConfigField(jsonContent, baseDirectory, state) {
+        return readPackageJsonPathField(jsonContent, "tsconfig", baseDirectory, state);
+    }
+    function readPackageJsonMainField(jsonContent, baseDirectory, state) {
+        return readPackageJsonPathField(jsonContent, "main", baseDirectory, state);
+    }
+    function readPackageJsonTypesVersionsField(jsonContent, state) {
+        var typesVersions = readPackageJsonField(jsonContent, "typesVersions", "object", state);
+        if (typesVersions === undefined)
+            return;
+        if (state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_field_with_version_specific_path_mappings);
+        }
+        return typesVersions;
+    }
+    function readPackageJsonTypesVersionPaths(jsonContent, state) {
+        var typesVersions = readPackageJsonTypesVersionsField(jsonContent, state);
+        if (typesVersions === undefined)
+            return;
+        if (state.traceEnabled) {
+            for (var key in typesVersions) {
+                if (ts.hasProperty(typesVersions, key) && !ts.VersionRange.tryParse(key)) {
+                    trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_is_not_a_valid_semver_range, key);
+                }
+            }
+        }
+        var result = getPackageJsonTypesVersionsPaths(typesVersions);
+        if (!result) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.package_json_does_not_have_a_typesVersions_entry_that_matches_version_0, ts.versionMajorMinor);
+            }
+            return;
+        }
+        var bestVersionKey = result.version, bestVersionPaths = result.paths;
+        if (typeof bestVersionPaths !== "object") {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_1_got_2, "typesVersions['" + bestVersionKey + "']", "object", typeof bestVersionPaths);
+            }
+            return;
+        }
+        return result;
+    }
+    var typeScriptVersion;
+    /* @internal */
+    function getPackageJsonTypesVersionsPaths(typesVersions) {
+        if (!typeScriptVersion)
+            typeScriptVersion = new ts.Version(ts.version);
+        for (var key in typesVersions) {
+            if (!ts.hasProperty(typesVersions, key))
+                continue;
+            var keyRange = ts.VersionRange.tryParse(key);
+            if (keyRange === undefined) {
+                continue;
+            }
+            // return the first entry whose range matches the current compiler version.
+            if (keyRange.test(typeScriptVersion)) {
+                return { version: key, paths: typesVersions[key] };
+            }
+        }
+    }
+    ts.getPackageJsonTypesVersionsPaths = getPackageJsonTypesVersionsPaths;
+    function getEffectiveTypeRoots(options, host) {
+        if (options.typeRoots) {
+            return options.typeRoots;
+        }
+        var currentDirectory;
+        if (options.configFilePath) {
+            currentDirectory = ts.getDirectoryPath(options.configFilePath);
+        }
+        else if (host.getCurrentDirectory) {
+            currentDirectory = host.getCurrentDirectory();
+        }
+        if (currentDirectory !== undefined) {
+            return getDefaultTypeRoots(currentDirectory, host);
+        }
+    }
+    ts.getEffectiveTypeRoots = getEffectiveTypeRoots;
+    /**
+     * Returns the path to every node_modules/@types directory from some ancestor directory.
+     * Returns undefined if there are none.
+     */
+    function getDefaultTypeRoots(currentDirectory, host) {
+        if (!host.directoryExists) {
+            return [ts.combinePaths(currentDirectory, nodeModulesAtTypes)];
+            // And if it doesn't exist, tough.
+        }
+        var typeRoots;
+        ts.forEachAncestorDirectory(ts.normalizePath(currentDirectory), function (directory) {
+            var atTypes = ts.combinePaths(directory, nodeModulesAtTypes);
+            if (host.directoryExists(atTypes)) {
+                (typeRoots || (typeRoots = [])).push(atTypes);
+            }
+            return undefined;
+        });
+        return typeRoots;
+    }
+    var nodeModulesAtTypes = ts.combinePaths("node_modules", "@types");
+    /**
+     * @param {string | undefined} containingFile - file that contains type reference directive, can be undefined if containing file is unknown.
+     * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups
+     * is assumed to be the same as root directory of the project.
+     */
+    function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host, redirectedReference) {
+        var traceEnabled = isTraceEnabled(options, host);
+        if (redirectedReference) {
+            options = redirectedReference.commandLine.options;
+        }
+        var failedLookupLocations = [];
+        var moduleResolutionState = { compilerOptions: options, host: host, traceEnabled: traceEnabled, failedLookupLocations: failedLookupLocations };
+        var typeRoots = getEffectiveTypeRoots(options, host);
+        if (traceEnabled) {
+            if (containingFile === undefined) {
+                if (typeRoots === undefined) {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set, typeReferenceDirectiveName);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1, typeReferenceDirectiveName, typeRoots);
+                }
+            }
+            else {
+                if (typeRoots === undefined) {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set, typeReferenceDirectiveName, containingFile);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_1_root_directory_2, typeReferenceDirectiveName, containingFile, typeRoots);
+                }
+            }
+            if (redirectedReference) {
+                trace(host, ts.Diagnostics.Using_compiler_options_of_project_reference_redirect_0, redirectedReference.sourceFile.fileName);
+            }
+        }
+        var resolved = primaryLookup();
+        var primary = true;
+        if (!resolved) {
+            resolved = secondaryLookup();
+            primary = false;
+        }
+        var resolvedTypeReferenceDirective;
+        if (resolved) {
+            var fileName = resolved.fileName, packageId = resolved.packageId;
+            var resolvedFileName = options.preserveSymlinks ? fileName : realPath(fileName, host, traceEnabled);
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFileName, primary);
+            }
+            resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolvedFileName, packageId: packageId, isExternalLibraryImport: pathContainsNodeModules(fileName) };
+        }
+        return { resolvedTypeReferenceDirective: resolvedTypeReferenceDirective, failedLookupLocations: failedLookupLocations };
+        function primaryLookup() {
+            // Check primary library paths
+            if (typeRoots && typeRoots.length) {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Resolving_with_primary_search_path_0, typeRoots.join(", "));
+                }
+                return ts.firstDefined(typeRoots, function (typeRoot) {
+                    var candidate = ts.combinePaths(typeRoot, typeReferenceDirectiveName);
+                    var candidateDirectory = ts.getDirectoryPath(candidate);
+                    var directoryExists = ts.directoryProbablyExists(candidateDirectory, host);
+                    if (!directoryExists && traceEnabled) {
+                        trace(host, ts.Diagnostics.Directory_0_does_not_exist_skipping_all_lookups_in_it, candidateDirectory);
+                    }
+                    return resolvedTypeScriptOnly(loadNodeModuleFromDirectory(Extensions.DtsOnly, candidate, !directoryExists, moduleResolutionState));
+                });
+            }
+            else {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Root_directory_cannot_be_determined_skipping_primary_search_paths);
+                }
+            }
+        }
+        function secondaryLookup() {
+            var initialLocationForSecondaryLookup = containingFile && ts.getDirectoryPath(containingFile);
+            if (initialLocationForSecondaryLookup !== undefined) {
+                // check secondary locations
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
+                }
+                var result = void 0;
+                if (!ts.isExternalModuleNameRelative(typeReferenceDirectiveName)) {
+                    var searchResult = loadModuleFromNearestNodeModulesDirectory(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, moduleResolutionState, /*cache*/ undefined, /*redirectedReference*/ undefined);
+                    result = searchResult && searchResult.value;
+                }
+                else {
+                    var candidate = ts.normalizePathAndParts(ts.combinePaths(initialLocationForSecondaryLookup, typeReferenceDirectiveName)).path;
+                    result = nodeLoadModuleByRelativeName(Extensions.DtsOnly, candidate, /*onlyRecordFailures*/ false, moduleResolutionState, /*considerPackageJson*/ true);
+                }
+                var resolvedFile = resolvedTypeScriptOnly(result);
+                if (!resolvedFile && traceEnabled) {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_not_resolved, typeReferenceDirectiveName);
+                }
+                return resolvedFile;
+            }
+            else {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder);
+                }
+            }
+        }
+    }
+    ts.resolveTypeReferenceDirective = resolveTypeReferenceDirective;
+    /**
+     * Given a set of options, returns the set of type directive names
+     *   that should be included for this program automatically.
+     * This list could either come from the config file,
+     *   or from enumerating the types root + initial secondary types lookup location.
+     * More type directives might appear in the program later as a result of loading actual source files;
+     *   this list is only the set of defaults that are implicitly included.
+     */
+    function getAutomaticTypeDirectiveNames(options, host) {
+        // Use explicit type list from tsconfig.json
+        if (options.types) {
+            return options.types;
+        }
+        // Walk the primary type lookup locations
+        var result = [];
+        if (host.directoryExists && host.getDirectories) {
+            var typeRoots = getEffectiveTypeRoots(options, host);
+            if (typeRoots) {
+                for (var _i = 0, typeRoots_1 = typeRoots; _i < typeRoots_1.length; _i++) {
+                    var root = typeRoots_1[_i];
+                    if (host.directoryExists(root)) {
+                        for (var _a = 0, _b = host.getDirectories(root); _a < _b.length; _a++) {
+                            var typeDirectivePath = _b[_a];
+                            var normalized = ts.normalizePath(typeDirectivePath);
+                            var packageJsonPath = ts.combinePaths(root, normalized, "package.json");
+                            // `types-publisher` sometimes creates packages with `"typings": null` for packages that don't provide their own types.
+                            // See `createNotNeededPackageJSON` in the types-publisher` repo.
+                            // tslint:disable-next-line:no-null-keyword
+                            var isNotNeededPackage = host.fileExists(packageJsonPath) && ts.readJson(packageJsonPath, host).typings === null;
+                            if (!isNotNeededPackage) {
+                                var baseFileName = ts.getBaseFileName(normalized);
+                                // At this stage, skip results with leading dot.
+                                if (baseFileName.charCodeAt(0) !== 46 /* dot */) {
+                                    // Return just the type directive names
+                                    result.push(baseFileName);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return result;
+    }
+    ts.getAutomaticTypeDirectiveNames = getAutomaticTypeDirectiveNames;
+    function createModuleResolutionCache(currentDirectory, getCanonicalFileName) {
+        return createModuleResolutionCacheWithMaps(createCacheWithRedirects(), createCacheWithRedirects(), currentDirectory, getCanonicalFileName);
+    }
+    ts.createModuleResolutionCache = createModuleResolutionCache;
+    /*@internal*/
+    function createCacheWithRedirects() {
+        var ownMap = ts.createMap();
+        var redirectsMap = ts.createMap();
+        return {
+            ownMap: ownMap,
+            redirectsMap: redirectsMap,
+            getOrCreateMapOfCacheRedirects: getOrCreateMapOfCacheRedirects,
+            clear: clear
+        };
+        function getOrCreateMapOfCacheRedirects(redirectedReference) {
+            if (!redirectedReference) {
+                return ownMap;
+            }
+            var path = redirectedReference.sourceFile.path;
+            var redirects = redirectsMap.get(path);
+            if (!redirects) {
+                redirects = ts.createMap();
+                redirectsMap.set(path, redirects);
+            }
+            return redirects;
+        }
+        function clear() {
+            ownMap.clear();
+            redirectsMap.clear();
+        }
+    }
+    ts.createCacheWithRedirects = createCacheWithRedirects;
+    /*@internal*/
+    function createModuleResolutionCacheWithMaps(directoryToModuleNameMap, moduleNameToDirectoryMap, currentDirectory, getCanonicalFileName) {
+        return { getOrCreateCacheForDirectory: getOrCreateCacheForDirectory, getOrCreateCacheForModuleName: getOrCreateCacheForModuleName };
+        function getOrCreateCacheForDirectory(directoryName, redirectedReference) {
+            var path = ts.toPath(directoryName, currentDirectory, getCanonicalFileName);
+            return getOrCreateCache(directoryToModuleNameMap, redirectedReference, path, ts.createMap);
+        }
+        function getOrCreateCacheForModuleName(nonRelativeModuleName, redirectedReference) {
+            ts.Debug.assert(!ts.isExternalModuleNameRelative(nonRelativeModuleName));
+            return getOrCreateCache(moduleNameToDirectoryMap, redirectedReference, nonRelativeModuleName, createPerModuleNameCache);
+        }
+        function getOrCreateCache(cacheWithRedirects, redirectedReference, key, create) {
+            var cache = cacheWithRedirects.getOrCreateMapOfCacheRedirects(redirectedReference);
+            var result = cache.get(key);
+            if (!result) {
+                result = create();
+                cache.set(key, result);
+            }
+            return result;
+        }
+        function createPerModuleNameCache() {
+            var directoryPathMap = ts.createMap();
+            return { get: get, set: set };
+            function get(directory) {
+                return directoryPathMap.get(ts.toPath(directory, currentDirectory, getCanonicalFileName));
+            }
+            /**
+             * At first this function add entry directory -> module resolution result to the table.
+             * Then it computes the set of parent folders for 'directory' that should have the same module resolution result
+             * and for every parent folder in set it adds entry: parent -> module resolution. .
+             * Lets say we first directory name: /a/b/c/d/e and resolution result is: /a/b/bar.ts.
+             * Set of parent folders that should have the same result will be:
+             * [
+             *     /a/b/c/d, /a/b/c, /a/b
+             * ]
+             * this means that request for module resolution from file in any of these folder will be immediately found in cache.
+             */
+            function set(directory, result) {
+                var path = ts.toPath(directory, currentDirectory, getCanonicalFileName);
+                // if entry is already in cache do nothing
+                if (directoryPathMap.has(path)) {
+                    return;
+                }
+                directoryPathMap.set(path, result);
+                var resolvedFileName = result.resolvedModule &&
+                    (result.resolvedModule.originalPath || result.resolvedModule.resolvedFileName);
+                // find common prefix between directory and resolved file name
+                // this common prefix should be the shortest path that has the same resolution
+                // directory: /a/b/c/d/e
+                // resolvedFileName: /a/b/foo.d.ts
+                // commonPrefix: /a/b
+                // for failed lookups cache the result for every directory up to root
+                var commonPrefix = resolvedFileName && getCommonPrefix(path, resolvedFileName);
+                var current = path;
+                while (current !== commonPrefix) {
+                    var parent = ts.getDirectoryPath(current);
+                    if (parent === current || directoryPathMap.has(parent)) {
+                        break;
+                    }
+                    directoryPathMap.set(parent, result);
+                    current = parent;
+                }
+            }
+            function getCommonPrefix(directory, resolution) {
+                var resolutionDirectory = ts.toPath(ts.getDirectoryPath(resolution), currentDirectory, getCanonicalFileName);
+                // find first position where directory and resolution differs
+                var i = 0;
+                var limit = Math.min(directory.length, resolutionDirectory.length);
+                while (i < limit && directory.charCodeAt(i) === resolutionDirectory.charCodeAt(i)) {
+                    i++;
+                }
+                if (i === directory.length && (resolutionDirectory.length === i || resolutionDirectory[i] === ts.directorySeparator)) {
+                    return directory;
+                }
+                var rootLength = ts.getRootLength(directory);
+                if (i < rootLength) {
+                    return undefined;
+                }
+                var sep = directory.lastIndexOf(ts.directorySeparator, i - 1);
+                if (sep === -1) {
+                    return undefined;
+                }
+                return directory.substr(0, Math.max(sep, rootLength));
+            }
+        }
+    }
+    ts.createModuleResolutionCacheWithMaps = createModuleResolutionCacheWithMaps;
+    function resolveModuleNameFromCache(moduleName, containingFile, cache) {
+        var containingDirectory = ts.getDirectoryPath(containingFile);
+        var perFolderCache = cache && cache.getOrCreateCacheForDirectory(containingDirectory);
+        return perFolderCache && perFolderCache.get(moduleName);
+    }
+    ts.resolveModuleNameFromCache = resolveModuleNameFromCache;
+    function resolveModuleName(moduleName, containingFile, compilerOptions, host, cache, redirectedReference) {
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        if (redirectedReference) {
+            compilerOptions = redirectedReference.commandLine.options;
+        }
+        if (traceEnabled) {
+            trace(host, ts.Diagnostics.Resolving_module_0_from_1, moduleName, containingFile);
+            if (redirectedReference) {
+                trace(host, ts.Diagnostics.Using_compiler_options_of_project_reference_redirect_0, redirectedReference.sourceFile.fileName);
+            }
+        }
+        var containingDirectory = ts.getDirectoryPath(containingFile);
+        var perFolderCache = cache && cache.getOrCreateCacheForDirectory(containingDirectory, redirectedReference);
+        var result = perFolderCache && perFolderCache.get(moduleName);
+        if (result) {
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Resolution_for_module_0_was_found_in_cache_from_location_1, moduleName, containingDirectory);
+            }
+        }
+        else {
+            var moduleResolution = compilerOptions.moduleResolution;
+            if (moduleResolution === undefined) {
+                moduleResolution = ts.getEmitModuleKind(compilerOptions) === ts.ModuleKind.CommonJS ? ts.ModuleResolutionKind.NodeJs : ts.ModuleResolutionKind.Classic;
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Module_resolution_kind_is_not_specified_using_0, ts.ModuleResolutionKind[moduleResolution]);
+                }
+            }
+            else {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Explicitly_specified_module_resolution_kind_Colon_0, ts.ModuleResolutionKind[moduleResolution]);
+                }
+            }
+            switch (moduleResolution) {
+                case ts.ModuleResolutionKind.NodeJs:
+                    result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference);
+                    break;
+                case ts.ModuleResolutionKind.Classic:
+                    result = classicNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference);
+                    break;
+                default:
+                    return ts.Debug.fail("Unexpected moduleResolution: " + moduleResolution);
+            }
+            if (perFolderCache) {
+                perFolderCache.set(moduleName, result);
+                if (!ts.isExternalModuleNameRelative(moduleName)) {
+                    // put result in per-module name cache
+                    cache.getOrCreateCacheForModuleName(moduleName, redirectedReference).set(containingDirectory, result);
+                }
+            }
+        }
+        if (traceEnabled) {
+            if (result.resolvedModule) {
+                trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName);
+            }
+            else {
+                trace(host, ts.Diagnostics.Module_name_0_was_not_resolved, moduleName);
+            }
+        }
+        return result;
+    }
+    ts.resolveModuleName = resolveModuleName;
+    /**
+     * Any module resolution kind can be augmented with optional settings: 'baseUrl', 'paths' and 'rootDirs' - they are used to
+     * mitigate differences between design time structure of the project and its runtime counterpart so the same import name
+     * can be resolved successfully by TypeScript compiler and runtime module loader.
+     * If these settings are set then loading procedure will try to use them to resolve module name and it can of failure it will
+     * fallback to standard resolution routine.
+     *
+     * - baseUrl - this setting controls how non-relative module names are resolved. If this setting is specified then non-relative
+     * names will be resolved relative to baseUrl: i.e. if baseUrl is '/a/b' then candidate location to resolve module name 'c/d' will
+     * be '/a/b/c/d'
+     * - paths - this setting can only be used when baseUrl is specified. allows to tune how non-relative module names
+     * will be resolved based on the content of the module name.
+     * Structure of 'paths' compiler options
+     * 'paths': {
+     *    pattern-1: [...substitutions],
+     *    pattern-2: [...substitutions],
+     *    ...
+     *    pattern-n: [...substitutions]
+     * }
+     * Pattern here is a string that can contain zero or one '*' character. During module resolution module name will be matched against
+     * all patterns in the list. Matching for patterns that don't contain '*' means that module name must be equal to pattern respecting the case.
+     * If pattern contains '*' then to match pattern "<prefix>*<suffix>" module name must start with the <prefix> and end with <suffix>.
+     * <MatchedStar> denotes part of the module name between <prefix> and <suffix>.
+     * If module name can be matches with multiple patterns then pattern with the longest prefix will be picked.
+     * After selecting pattern we'll use list of substitutions to get candidate locations of the module and the try to load module
+     * from the candidate location.
+     * Substitution is a string that can contain zero or one '*'. To get candidate location from substitution we'll pick every
+     * substitution in the list and replace '*' with <MatchedStar> string. If candidate location is not rooted it
+     * will be converted to absolute using baseUrl.
+     * For example:
+     * baseUrl: /a/b/c
+     * "paths": {
+     *     // match all module names
+     *     "*": [
+     *         "*",        // use matched name as is,
+     *                     // <matched name> will be looked as /a/b/c/<matched name>
+     *
+     *         "folder1/*" // substitution will convert matched name to 'folder1/<matched name>',
+     *                     // since it is not rooted then final candidate location will be /a/b/c/folder1/<matched name>
+     *     ],
+     *     // match module names that start with 'components/'
+     *     "components/*": [ "/root/components/*" ] // substitution will convert /components/folder1/<matched name> to '/root/components/folder1/<matched name>',
+     *                                              // it is rooted so it will be final candidate location
+     * }
+     *
+     * 'rootDirs' allows the project to be spreaded across multiple locations and resolve modules with relative names as if
+     * they were in the same location. For example lets say there are two files
+     * '/local/src/content/file1.ts'
+     * '/shared/components/contracts/src/content/protocols/file2.ts'
+     * After bundling content of '/shared/components/contracts/src' will be merged with '/local/src' so
+     * if file1 has the following import 'import {x} from "./protocols/file2"' it will be resolved successfully in runtime.
+     * 'rootDirs' provides the way to tell compiler that in order to get the whole project it should behave as if content of all
+     * root dirs were merged together.
+     * I.e. for the example above 'rootDirs' will have two entries: [ '/local/src', '/shared/components/contracts/src' ].
+     * Compiler will first convert './protocols/file2' into absolute path relative to the location of containing file:
+     * '/local/src/content/protocols/file2' and try to load it - failure.
+     * Then it will search 'rootDirs' looking for a longest matching prefix of this absolute path and if such prefix is found - absolute path will
+     * be converted to a path relative to found rootDir entry './content/protocols/file2' (*). As a last step compiler will check all remaining
+     * entries in 'rootDirs', use them to build absolute path out of (*) and try to resolve module from this location.
+     */
+    function tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loader, state) {
+        var resolved = tryLoadModuleUsingPathsIfEligible(extensions, moduleName, loader, state);
+        if (resolved)
+            return resolved.value;
+        if (!ts.isExternalModuleNameRelative(moduleName)) {
+            return tryLoadModuleUsingBaseUrl(extensions, moduleName, loader, state);
+        }
+        else {
+            return tryLoadModuleUsingRootDirs(extensions, moduleName, containingDirectory, loader, state);
+        }
+    }
+    function tryLoadModuleUsingPathsIfEligible(extensions, moduleName, loader, state) {
+        var _a = state.compilerOptions, baseUrl = _a.baseUrl, paths = _a.paths;
+        if (baseUrl && paths && !ts.pathIsRelative(moduleName)) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1, baseUrl, moduleName);
+                trace(state.host, ts.Diagnostics.paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0, moduleName);
+            }
+            return tryLoadModuleUsingPaths(extensions, moduleName, baseUrl, paths, loader, /*onlyRecordFailures*/ false, state);
+        }
+    }
+    function tryLoadModuleUsingRootDirs(extensions, moduleName, containingDirectory, loader, state) {
+        if (!state.compilerOptions.rootDirs) {
+            return undefined;
+        }
+        if (state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0, moduleName);
+        }
+        var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+        var matchedRootDir;
+        var matchedNormalizedPrefix;
+        for (var _i = 0, _a = state.compilerOptions.rootDirs; _i < _a.length; _i++) {
+            var rootDir = _a[_i];
+            // rootDirs are expected to be absolute
+            // in case of tsconfig.json this will happen automatically - compiler will expand relative names
+            // using location of tsconfig.json as base location
+            var normalizedRoot = ts.normalizePath(rootDir);
+            if (!ts.endsWith(normalizedRoot, ts.directorySeparator)) {
+                normalizedRoot += ts.directorySeparator;
+            }
+            var isLongestMatchingPrefix = ts.startsWith(candidate, normalizedRoot) &&
+                (matchedNormalizedPrefix === undefined || matchedNormalizedPrefix.length < normalizedRoot.length);
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Checking_if_0_is_the_longest_matching_prefix_for_1_2, normalizedRoot, candidate, isLongestMatchingPrefix);
+            }
+            if (isLongestMatchingPrefix) {
+                matchedNormalizedPrefix = normalizedRoot;
+                matchedRootDir = rootDir;
+            }
+        }
+        if (matchedNormalizedPrefix) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Longest_matching_prefix_for_0_is_1, candidate, matchedNormalizedPrefix);
+            }
+            var suffix = candidate.substr(matchedNormalizedPrefix.length);
+            // first - try to load from a initial location
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, matchedNormalizedPrefix, candidate);
+            }
+            var resolvedFileName = loader(extensions, candidate, !ts.directoryProbablyExists(containingDirectory, state.host), state);
+            if (resolvedFileName) {
+                return resolvedFileName;
+            }
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Trying_other_entries_in_rootDirs);
+            }
+            // then try to resolve using remaining entries in rootDirs
+            for (var _b = 0, _c = state.compilerOptions.rootDirs; _b < _c.length; _b++) {
+                var rootDir = _c[_b];
+                if (rootDir === matchedRootDir) {
+                    // skip the initially matched entry
+                    continue;
+                }
+                var candidate_1 = ts.combinePaths(ts.normalizePath(rootDir), suffix);
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, rootDir, candidate_1);
+                }
+                var baseDirectory = ts.getDirectoryPath(candidate_1);
+                var resolvedFileName_1 = loader(extensions, candidate_1, !ts.directoryProbablyExists(baseDirectory, state.host), state);
+                if (resolvedFileName_1) {
+                    return resolvedFileName_1;
+                }
+            }
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Module_resolution_using_rootDirs_has_failed);
+            }
+        }
+        return undefined;
+    }
+    function tryLoadModuleUsingBaseUrl(extensions, moduleName, loader, state) {
+        var baseUrl = state.compilerOptions.baseUrl;
+        if (!baseUrl) {
+            return undefined;
+        }
+        if (state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1, baseUrl, moduleName);
+        }
+        var candidate = ts.normalizePath(ts.combinePaths(baseUrl, moduleName));
+        if (state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.Resolving_module_name_0_relative_to_base_url_1_2, moduleName, baseUrl, candidate);
+        }
+        return loader(extensions, candidate, !ts.directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
+    }
+    /**
+     * Expose resolution logic to allow us to use Node module resolution logic from arbitrary locations.
+     * No way to do this with `require()`: https://github.com/nodejs/node/issues/5963
+     * Throws an error if the module can't be resolved.
+     */
+    /* @internal */
+    function resolveJSModule(moduleName, initialDir, host) {
+        var _a = tryResolveJSModuleWorker(moduleName, initialDir, host), resolvedModule = _a.resolvedModule, failedLookupLocations = _a.failedLookupLocations;
+        if (!resolvedModule) {
+            throw new Error("Could not resolve JS module '" + moduleName + "' starting at '" + initialDir + "'. Looked in: " + failedLookupLocations.join(", "));
+        }
+        return resolvedModule.resolvedFileName;
+    }
+    ts.resolveJSModule = resolveJSModule;
+    /* @internal */
+    function tryResolveJSModule(moduleName, initialDir, host) {
+        var resolvedModule = tryResolveJSModuleWorker(moduleName, initialDir, host).resolvedModule;
+        return resolvedModule && resolvedModule.resolvedFileName;
+    }
+    ts.tryResolveJSModule = tryResolveJSModule;
+    var jsOnlyExtensions = [Extensions.JavaScript];
+    var tsExtensions = [Extensions.TypeScript, Extensions.JavaScript];
+    var tsPlusJsonExtensions = tsExtensions.concat([Extensions.Json]);
+    var tsconfigExtensions = [Extensions.TSConfig];
+    function tryResolveJSModuleWorker(moduleName, initialDir, host) {
+        return nodeModuleNameResolverWorker(moduleName, initialDir, { moduleResolution: ts.ModuleResolutionKind.NodeJs, allowJs: true }, host, /*cache*/ undefined, jsOnlyExtensions, /*redirectedReferences*/ undefined);
+    }
+    function nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, lookupConfig) {
+        return nodeModuleNameResolverWorker(moduleName, ts.getDirectoryPath(containingFile), compilerOptions, host, cache, lookupConfig ? tsconfigExtensions : (compilerOptions.resolveJsonModule ? tsPlusJsonExtensions : tsExtensions), redirectedReference);
+    }
+    ts.nodeModuleNameResolver = nodeModuleNameResolver;
+    function nodeModuleNameResolverWorker(moduleName, containingDirectory, compilerOptions, host, cache, extensions, redirectedReference) {
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        var failedLookupLocations = [];
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, failedLookupLocations: failedLookupLocations };
+        var result = ts.forEach(extensions, function (ext) { return tryResolve(ext); });
+        if (result && result.value) {
+            var _a = result.value, resolved = _a.resolved, isExternalLibraryImport = _a.isExternalLibraryImport;
+            return createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations);
+        }
+        return { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
+        function tryResolve(extensions) {
+            var loader = function (extensions, candidate, onlyRecordFailures, state) { return nodeLoadModuleByRelativeName(extensions, candidate, onlyRecordFailures, state, /*considerPackageJson*/ true); };
+            var resolved = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loader, state);
+            if (resolved) {
+                return toSearchResult({ resolved: resolved, isExternalLibraryImport: pathContainsNodeModules(resolved.path) });
+            }
+            if (!ts.isExternalModuleNameRelative(moduleName)) {
+                if (traceEnabled) {
+                    trace(host, ts.Diagnostics.Loading_module_0_from_node_modules_folder_target_file_type_1, moduleName, Extensions[extensions]);
+                }
+                var resolved_1 = loadModuleFromNearestNodeModulesDirectory(extensions, moduleName, containingDirectory, state, cache, redirectedReference);
+                if (!resolved_1)
+                    return undefined;
+                var resolvedValue = resolved_1.value;
+                if (!compilerOptions.preserveSymlinks && resolvedValue && !resolvedValue.originalPath) {
+                    var path = realPath(resolvedValue.path, host, traceEnabled);
+                    var originalPath = path === resolvedValue.path ? undefined : resolvedValue.path;
+                    resolvedValue = __assign({}, resolvedValue, { path: path, originalPath: originalPath });
+                }
+                // For node_modules lookups, get the real path so that multiple accesses to an `npm link`-ed module do not create duplicate files.
+                return { value: resolvedValue && { resolved: resolvedValue, isExternalLibraryImport: true } };
+            }
+            else {
+                var _a = ts.normalizePathAndParts(ts.combinePaths(containingDirectory, moduleName)), candidate = _a.path, parts = _a.parts;
+                var resolved_2 = nodeLoadModuleByRelativeName(extensions, candidate, /*onlyRecordFailures*/ false, state, /*considerPackageJson*/ true);
+                // Treat explicit "node_modules" import as an external library import.
+                return resolved_2 && toSearchResult({ resolved: resolved_2, isExternalLibraryImport: ts.contains(parts, "node_modules") });
+            }
+        }
+    }
+    function realPath(path, host, traceEnabled) {
+        if (!host.realpath) {
+            return path;
+        }
+        var real = ts.normalizePath(host.realpath(path));
+        if (traceEnabled) {
+            trace(host, ts.Diagnostics.Resolving_real_path_for_0_result_1, path, real);
+        }
+        ts.Debug.assert(host.fileExists(real), path + " linked to nonexistent file " + real); // tslint:disable-line
+        return real;
+    }
+    function nodeLoadModuleByRelativeName(extensions, candidate, onlyRecordFailures, state, considerPackageJson) {
+        if (state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.Loading_module_as_file_Slash_folder_candidate_module_location_0_target_file_type_1, candidate, Extensions[extensions]);
+        }
+        if (!ts.hasTrailingDirectorySeparator(candidate)) {
+            if (!onlyRecordFailures) {
+                var parentOfCandidate = ts.getDirectoryPath(candidate);
+                if (!ts.directoryProbablyExists(parentOfCandidate, state.host)) {
+                    if (state.traceEnabled) {
+                        trace(state.host, ts.Diagnostics.Directory_0_does_not_exist_skipping_all_lookups_in_it, parentOfCandidate);
+                    }
+                    onlyRecordFailures = true;
+                }
+            }
+            var resolvedFromFile = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state);
+            if (resolvedFromFile) {
+                var nm = considerPackageJson ? parseNodeModuleFromPath(resolvedFromFile) : undefined;
+                var packageInfo = nm && getPackageJsonInfo(nm.packageDirectory, nm.subModuleName, /*onlyRecordFailures*/ false, state);
+                var packageId = packageInfo && packageInfo.packageId;
+                return withPackageId(packageId, resolvedFromFile);
+            }
+        }
+        if (!onlyRecordFailures) {
+            var candidateExists = ts.directoryProbablyExists(candidate, state.host);
+            if (!candidateExists) {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Directory_0_does_not_exist_skipping_all_lookups_in_it, candidate);
+                }
+                onlyRecordFailures = true;
+            }
+        }
+        return loadNodeModuleFromDirectory(extensions, candidate, onlyRecordFailures, state, considerPackageJson);
+    }
+    /*@internal*/
+    ts.nodeModulesPathPart = "/node_modules/";
+    /*@internal*/
+    function pathContainsNodeModules(path) {
+        return ts.stringContains(path, ts.nodeModulesPathPart);
+    }
+    ts.pathContainsNodeModules = pathContainsNodeModules;
+    /**
+     * This will be called on the successfully resolved path from `loadModuleFromFile`.
+     * (Not neeeded for `loadModuleFromNodeModules` as that looks up the `package.json` as part of resolution.)
+     *
+     * packageDirectory is the directory of the package itself.
+     * subModuleName is the path within the package.
+     *   For `blah/node_modules/foo/index.d.ts` this is { packageDirectory: "foo", subModuleName: "index.d.ts" }. (Part before "/node_modules/" is ignored.)
+     *   For `/node_modules/foo/bar.d.ts` this is { packageDirectory: "foo", subModuleName": "bar/index.d.ts" }.
+     *   For `/node_modules/@types/foo/bar/index.d.ts` this is { packageDirectory: "@types/foo", subModuleName: "bar/index.d.ts" }.
+     *   For `/node_modules/foo/bar/index.d.ts` this is { packageDirectory: "foo", subModuleName": "bar/index.d.ts" }.
+     */
+    function parseNodeModuleFromPath(resolved) {
+        var path = ts.normalizePath(resolved.path);
+        var idx = path.lastIndexOf(ts.nodeModulesPathPart);
+        if (idx === -1) {
+            return undefined;
+        }
+        var indexAfterNodeModules = idx + ts.nodeModulesPathPart.length;
+        var indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterNodeModules);
+        if (path.charCodeAt(indexAfterNodeModules) === 64 /* at */) {
+            indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterPackageName);
+        }
+        var packageDirectory = path.slice(0, indexAfterPackageName);
+        var subModuleName = ts.removeExtension(path.slice(indexAfterPackageName + 1), resolved.ext) + ".d.ts" /* Dts */;
+        return { packageDirectory: packageDirectory, subModuleName: subModuleName };
+    }
+    function moveToNextDirectorySeparatorIfAvailable(path, prevSeparatorIndex) {
+        var nextSeparatorIndex = path.indexOf(ts.directorySeparator, prevSeparatorIndex + 1);
+        return nextSeparatorIndex === -1 ? prevSeparatorIndex : nextSeparatorIndex;
+    }
+    function addExtensionAndIndex(path) {
+        if (path === "") {
+            return "index.d.ts";
+        }
+        if (ts.endsWith(path, ".d.ts")) {
+            return path;
+        }
+        if (path === "index" || ts.endsWith(path, "/index")) {
+            return path + ".d.ts";
+        }
+        return path + "/index.d.ts";
+    }
+    function loadModuleFromFileNoPackageId(extensions, candidate, onlyRecordFailures, state) {
+        return noPackageId(loadModuleFromFile(extensions, candidate, onlyRecordFailures, state));
+    }
+    /**
+     * @param {boolean} onlyRecordFailures - if true then function won't try to actually load files but instead record all attempts as failures. This flag is necessary
+     * in cases when we know upfront that all load attempts will fail (because containing folder does not exists) however we still need to record all failed lookup locations.
+     */
+    function loadModuleFromFile(extensions, candidate, onlyRecordFailures, state) {
+        if (extensions === Extensions.Json || extensions === Extensions.TSConfig) {
+            var extensionLess = ts.tryRemoveExtension(candidate, ".json" /* Json */);
+            return (extensionLess === undefined && extensions === Extensions.Json) ? undefined : tryAddingExtensions(extensionLess || candidate, extensions, onlyRecordFailures, state);
+        }
+        // First, try adding an extension. An import of "foo" could be matched by a file "foo.ts", or "foo.js" by "foo.js.ts"
+        var resolvedByAddingExtension = tryAddingExtensions(candidate, extensions, onlyRecordFailures, state);
+        if (resolvedByAddingExtension) {
+            return resolvedByAddingExtension;
+        }
+        // If that didn't work, try stripping a ".js" or ".jsx" extension and replacing it with a TypeScript one;
+        // e.g. "./foo.js" can be matched by "./foo.ts" or "./foo.d.ts"
+        if (ts.hasJSFileExtension(candidate)) {
+            var extensionless = ts.removeFileExtension(candidate);
+            if (state.traceEnabled) {
+                var extension = candidate.substring(extensionless.length);
+                trace(state.host, ts.Diagnostics.File_name_0_has_a_1_extension_stripping_it, candidate, extension);
+            }
+            return tryAddingExtensions(extensionless, extensions, onlyRecordFailures, state);
+        }
+    }
+    /** Try to return an existing file that adds one of the `extensions` to `candidate`. */
+    function tryAddingExtensions(candidate, extensions, onlyRecordFailures, state) {
+        if (!onlyRecordFailures) {
+            // check if containing folder exists - if it doesn't then just record failures for all supported extensions without disk probing
+            var directory = ts.getDirectoryPath(candidate);
+            if (directory) {
+                onlyRecordFailures = !ts.directoryProbablyExists(directory, state.host);
+            }
+        }
+        switch (extensions) {
+            case Extensions.DtsOnly:
+                return tryExtension(".d.ts" /* Dts */);
+            case Extensions.TypeScript:
+                return tryExtension(".ts" /* Ts */) || tryExtension(".tsx" /* Tsx */) || tryExtension(".d.ts" /* Dts */);
+            case Extensions.JavaScript:
+                return tryExtension(".js" /* Js */) || tryExtension(".jsx" /* Jsx */);
+            case Extensions.TSConfig:
+            case Extensions.Json:
+                return tryExtension(".json" /* Json */);
+        }
+        function tryExtension(ext) {
+            var path = tryFile(candidate + ext, onlyRecordFailures, state);
+            return path === undefined ? undefined : { path: path, ext: ext };
+        }
+    }
+    /** Return the file if it exists. */
+    function tryFile(fileName, onlyRecordFailures, state) {
+        if (!onlyRecordFailures) {
+            if (state.host.fileExists(fileName)) {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.File_0_exist_use_it_as_a_name_resolution_result, fileName);
+                }
+                return fileName;
+            }
+            else {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.File_0_does_not_exist, fileName);
+                }
+            }
+        }
+        state.failedLookupLocations.push(fileName);
+        return undefined;
+    }
+    function loadNodeModuleFromDirectory(extensions, candidate, onlyRecordFailures, state, considerPackageJson) {
+        if (considerPackageJson === void 0) { considerPackageJson = true; }
+        var packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, "", onlyRecordFailures, state) : undefined;
+        var packageId = packageInfo && packageInfo.packageId;
+        var packageJsonContent = packageInfo && packageInfo.packageJsonContent;
+        var versionPaths = packageJsonContent && readPackageJsonTypesVersionPaths(packageJsonContent, state);
+        return withPackageId(packageId, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
+    }
+    function getPackageJsonInfo(packageDirectory, subModuleName, onlyRecordFailures, state) {
+        var host = state.host, traceEnabled = state.traceEnabled;
+        var directoryExists = !onlyRecordFailures && ts.directoryProbablyExists(packageDirectory, host);
+        var packageJsonPath = ts.combinePaths(packageDirectory, "package.json");
+        if (directoryExists && host.fileExists(packageJsonPath)) {
+            var packageJsonContent = ts.readJson(packageJsonPath, host);
+            if (subModuleName === "") { // looking up the root - need to handle types/typings/main redirects for subModuleName
+                var path = readPackageJsonTypesFields(packageJsonContent, packageDirectory, state);
+                if (typeof path === "string") {
+                    subModuleName = addExtensionAndIndex(path.substring(packageDirectory.length + 1));
+                }
+                else {
+                    var jsPath = readPackageJsonMainField(packageJsonContent, packageDirectory, state);
+                    if (typeof jsPath === "string" && jsPath.length > packageDirectory.length) {
+                        var potentialSubModule_1 = jsPath.substring(packageDirectory.length + 1);
+                        subModuleName = (ts.forEach(ts.supportedJSExtensions, function (extension) {
+                            return ts.tryRemoveExtension(potentialSubModule_1, extension);
+                        }) || potentialSubModule_1) + ".d.ts" /* Dts */;
+                    }
+                    else {
+                        subModuleName = "index.d.ts";
+                    }
+                }
+            }
+            if (!ts.endsWith(subModuleName, ".d.ts" /* Dts */)) {
+                subModuleName = addExtensionAndIndex(subModuleName);
+            }
+            var versionPaths = readPackageJsonTypesVersionPaths(packageJsonContent, state);
+            var packageId = typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string"
+                ? { name: packageJsonContent.name, subModuleName: subModuleName, version: packageJsonContent.version }
+                : undefined;
+            if (traceEnabled) {
+                if (packageId) {
+                    trace(host, ts.Diagnostics.Found_package_json_at_0_Package_ID_is_1, packageJsonPath, ts.packageIdToString(packageId));
+                }
+                else {
+                    trace(host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
+                }
+            }
+            return { packageJsonContent: packageJsonContent, packageId: packageId, versionPaths: versionPaths };
+        }
+        else {
+            if (directoryExists && traceEnabled) {
+                trace(host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath);
+            }
+            // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results
+            state.failedLookupLocations.push(packageJsonPath);
+        }
+    }
+    function loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, jsonContent, versionPaths) {
+        var packageFile;
+        if (jsonContent) {
+            switch (extensions) {
+                case Extensions.JavaScript:
+                case Extensions.Json:
+                    packageFile = readPackageJsonMainField(jsonContent, candidate, state);
+                    break;
+                case Extensions.TypeScript:
+                    // When resolving typescript modules, try resolving using main field as well
+                    packageFile = readPackageJsonTypesFields(jsonContent, candidate, state) || readPackageJsonMainField(jsonContent, candidate, state);
+                    break;
+                case Extensions.DtsOnly:
+                    packageFile = readPackageJsonTypesFields(jsonContent, candidate, state);
+                    break;
+                case Extensions.TSConfig:
+                    packageFile = readPackageJsonTSConfigField(jsonContent, candidate, state);
+                    break;
+                default:
+                    return ts.Debug.assertNever(extensions);
+            }
+        }
+        var loader = function (extensions, candidate, onlyRecordFailures, state) {
+            var fromFile = tryFile(candidate, onlyRecordFailures, state);
+            if (fromFile) {
+                var resolved = resolvedIfExtensionMatches(extensions, fromFile);
+                if (resolved) {
+                    return noPackageId(resolved);
+                }
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.File_0_has_an_unsupported_extension_so_skipping_it, fromFile);
+                }
+            }
+            // Even if extensions is DtsOnly, we can still look up a .ts file as a result of package.json "types"
+            var nextExtensions = extensions === Extensions.DtsOnly ? Extensions.TypeScript : extensions;
+            // Don't do package.json lookup recursively, because Node.js' package lookup doesn't.
+            return nodeLoadModuleByRelativeName(nextExtensions, candidate, onlyRecordFailures, state, /*considerPackageJson*/ false);
+        };
+        var onlyRecordFailuresForPackageFile = packageFile ? !ts.directoryProbablyExists(ts.getDirectoryPath(packageFile), state.host) : undefined;
+        var onlyRecordFailuresForIndex = onlyRecordFailures || !ts.directoryProbablyExists(candidate, state.host);
+        var indexPath = ts.combinePaths(candidate, extensions === Extensions.TSConfig ? "tsconfig" : "index");
+        if (versionPaths && (!packageFile || ts.containsPath(candidate, packageFile))) {
+            var moduleName = ts.getRelativePathFromDirectory(candidate, packageFile || indexPath, /*ignoreCase*/ false);
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, versionPaths.version, ts.version, moduleName);
+            }
+            var result = tryLoadModuleUsingPaths(extensions, moduleName, candidate, versionPaths.paths, loader, onlyRecordFailuresForPackageFile || onlyRecordFailuresForIndex, state);
+            if (result) {
+                return removeIgnoredPackageId(result.value);
+            }
+        }
+        // It won't have a `packageId` set, because we disabled `considerPackageJson`.
+        var packageFileResult = packageFile && removeIgnoredPackageId(loader(extensions, packageFile, onlyRecordFailuresForPackageFile, state));
+        if (packageFileResult)
+            return packageFileResult;
+        return loadModuleFromFile(extensions, indexPath, onlyRecordFailuresForIndex, state);
+    }
+    /** Resolve from an arbitrarily specified file. Return `undefined` if it has an unsupported extension. */
+    function resolvedIfExtensionMatches(extensions, path) {
+        var ext = ts.tryGetExtensionFromPath(path);
+        return ext !== undefined && extensionIsOk(extensions, ext) ? { path: path, ext: ext } : undefined;
+    }
+    /** True if `extension` is one of the supported `extensions`. */
+    function extensionIsOk(extensions, extension) {
+        switch (extensions) {
+            case Extensions.JavaScript:
+                return extension === ".js" /* Js */ || extension === ".jsx" /* Jsx */;
+            case Extensions.TSConfig:
+            case Extensions.Json:
+                return extension === ".json" /* Json */;
+            case Extensions.TypeScript:
+                return extension === ".ts" /* Ts */ || extension === ".tsx" /* Tsx */ || extension === ".d.ts" /* Dts */;
+            case Extensions.DtsOnly:
+                return extension === ".d.ts" /* Dts */;
+        }
+    }
+    /* @internal */
+    function parsePackageName(moduleName) {
+        var idx = moduleName.indexOf(ts.directorySeparator);
+        if (moduleName[0] === "@") {
+            idx = moduleName.indexOf(ts.directorySeparator, idx + 1);
+        }
+        return idx === -1 ? { packageName: moduleName, rest: "" } : { packageName: moduleName.slice(0, idx), rest: moduleName.slice(idx + 1) };
+    }
+    ts.parsePackageName = parsePackageName;
+    function loadModuleFromNearestNodeModulesDirectory(extensions, moduleName, directory, state, cache, redirectedReference) {
+        return loadModuleFromNearestNodeModulesDirectoryWorker(extensions, moduleName, directory, state, /*typesScopeOnly*/ false, cache, redirectedReference);
+    }
+    function loadModuleFromNearestNodeModulesDirectoryTypesScope(moduleName, directory, state) {
+        // Extensions parameter here doesn't actually matter, because typesOnly ensures we're just doing @types lookup, which is always DtsOnly.
+        return loadModuleFromNearestNodeModulesDirectoryWorker(Extensions.DtsOnly, moduleName, directory, state, /*typesScopeOnly*/ true, /*cache*/ undefined, /*redirectedReference*/ undefined);
+    }
+    function loadModuleFromNearestNodeModulesDirectoryWorker(extensions, moduleName, directory, state, typesScopeOnly, cache, redirectedReference) {
+        var perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName, redirectedReference);
+        return ts.forEachAncestorDirectory(ts.normalizeSlashes(directory), function (ancestorDirectory) {
+            if (ts.getBaseFileName(ancestorDirectory) !== "node_modules") {
+                var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, ancestorDirectory, state);
+                if (resolutionFromCache) {
+                    return resolutionFromCache;
+                }
+                return toSearchResult(loadModuleFromImmediateNodeModulesDirectory(extensions, moduleName, ancestorDirectory, state, typesScopeOnly));
+            }
+        });
+    }
+    function loadModuleFromImmediateNodeModulesDirectory(extensions, moduleName, directory, state, typesScopeOnly) {
+        var nodeModulesFolder = ts.combinePaths(directory, "node_modules");
+        var nodeModulesFolderExists = ts.directoryProbablyExists(nodeModulesFolder, state.host);
+        if (!nodeModulesFolderExists && state.traceEnabled) {
+            trace(state.host, ts.Diagnostics.Directory_0_does_not_exist_skipping_all_lookups_in_it, nodeModulesFolder);
+        }
+        var packageResult = typesScopeOnly ? undefined : loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, nodeModulesFolder, nodeModulesFolderExists, state);
+        if (packageResult) {
+            return packageResult;
+        }
+        if (extensions === Extensions.TypeScript || extensions === Extensions.DtsOnly) {
+            var nodeModulesAtTypes_1 = ts.combinePaths(nodeModulesFolder, "@types");
+            var nodeModulesAtTypesExists = nodeModulesFolderExists;
+            if (nodeModulesFolderExists && !ts.directoryProbablyExists(nodeModulesAtTypes_1, state.host)) {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Directory_0_does_not_exist_skipping_all_lookups_in_it, nodeModulesAtTypes_1);
+                }
+                nodeModulesAtTypesExists = false;
+            }
+            return loadModuleFromSpecificNodeModulesDirectory(Extensions.DtsOnly, mangleScopedPackageNameWithTrace(moduleName, state), nodeModulesAtTypes_1, nodeModulesAtTypesExists, state);
+        }
+    }
+    function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, nodeModulesDirectory, nodeModulesDirectoryExists, state) {
+        var candidate = ts.normalizePath(ts.combinePaths(nodeModulesDirectory, moduleName));
+        // First look for a nested package.json, as in `node_modules/foo/bar/package.json`.
+        var packageJsonContent;
+        var packageId;
+        var versionPaths;
+        var packageInfo = getPackageJsonInfo(candidate, "", !nodeModulesDirectoryExists, state);
+        if (packageInfo) {
+            (packageJsonContent = packageInfo.packageJsonContent, packageId = packageInfo.packageId, versionPaths = packageInfo.versionPaths);
+            var fromFile = loadModuleFromFile(extensions, candidate, !nodeModulesDirectoryExists, state);
+            if (fromFile) {
+                return noPackageId(fromFile);
+            }
+            var fromDirectory = loadNodeModuleFromDirectoryWorker(extensions, candidate, !nodeModulesDirectoryExists, state, packageJsonContent, versionPaths);
+            return withPackageId(packageId, fromDirectory);
+        }
+        var loader = function (extensions, candidate, onlyRecordFailures, state) {
+            var pathAndExtension = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state) ||
+                loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths);
+            return withPackageId(packageId, pathAndExtension);
+        };
+        var _a = parsePackageName(moduleName), packageName = _a.packageName, rest = _a.rest;
+        if (rest !== "") { // If "rest" is empty, we just did this search above.
+            var packageDirectory = ts.combinePaths(nodeModulesDirectory, packageName);
+            // Don't use a "types" or "main" from here because we're not loading the root, but a subdirectory -- just here for the packageId and path mappings.
+            var packageInfo_1 = getPackageJsonInfo(packageDirectory, rest, !nodeModulesDirectoryExists, state);
+            if (packageInfo_1)
+                (packageId = packageInfo_1.packageId, versionPaths = packageInfo_1.versionPaths);
+            if (versionPaths) {
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, versionPaths.version, ts.version, rest);
+                }
+                var packageDirectoryExists = nodeModulesDirectoryExists && ts.directoryProbablyExists(packageDirectory, state.host);
+                var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, versionPaths.paths, loader, !packageDirectoryExists, state);
+                if (fromPaths) {
+                    return fromPaths.value;
+                }
+            }
+        }
+        return loader(extensions, candidate, !nodeModulesDirectoryExists, state);
+    }
+    function tryLoadModuleUsingPaths(extensions, moduleName, baseDirectory, paths, loader, onlyRecordFailures, state) {
+        var matchedPattern = ts.matchPatternOrExact(ts.getOwnKeys(paths), moduleName);
+        if (matchedPattern) {
+            var matchedStar_1 = ts.isString(matchedPattern) ? undefined : ts.matchedText(matchedPattern, moduleName);
+            var matchedPatternText = ts.isString(matchedPattern) ? matchedPattern : ts.patternText(matchedPattern);
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Module_name_0_matched_pattern_1, moduleName, matchedPatternText);
+            }
+            var resolved = ts.forEach(paths[matchedPatternText], function (subst) {
+                var path = matchedStar_1 ? subst.replace("*", matchedStar_1) : subst;
+                var candidate = ts.normalizePath(ts.combinePaths(baseDirectory, path));
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Trying_substitution_0_candidate_module_location_Colon_1, subst, path);
+                }
+                // A path mapping may have an extension, in contrast to an import, which should omit it.
+                var extension = ts.tryGetExtensionFromPath(candidate);
+                if (extension !== undefined) {
+                    var path_1 = tryFile(candidate, onlyRecordFailures, state);
+                    if (path_1 !== undefined) {
+                        return noPackageId({ path: path_1, ext: extension });
+                    }
+                }
+                return loader(extensions, candidate, onlyRecordFailures || !ts.directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
+            });
+            return { value: resolved };
+        }
+    }
+    /** Double underscores are used in DefinitelyTyped to delimit scoped packages. */
+    var mangledScopedPackageSeparator = "__";
+    /** For a scoped package, we must look in `@types/foo__bar` instead of `@types/@foo/bar`. */
+    function mangleScopedPackageNameWithTrace(packageName, state) {
+        var mangled = mangleScopedPackageName(packageName);
+        if (state.traceEnabled && mangled !== packageName) {
+            trace(state.host, ts.Diagnostics.Scoped_package_detected_looking_in_0, mangled);
+        }
+        return mangled;
+    }
+    /* @internal */
+    function getTypesPackageName(packageName) {
+        return "@types/" + mangleScopedPackageName(packageName);
+    }
+    ts.getTypesPackageName = getTypesPackageName;
+    /* @internal */
+    function mangleScopedPackageName(packageName) {
+        if (ts.startsWith(packageName, "@")) {
+            var replaceSlash = packageName.replace(ts.directorySeparator, mangledScopedPackageSeparator);
+            if (replaceSlash !== packageName) {
+                return replaceSlash.slice(1); // Take off the "@"
+            }
+        }
+        return packageName;
+    }
+    ts.mangleScopedPackageName = mangleScopedPackageName;
+    /* @internal */
+    function getPackageNameFromTypesPackageName(mangledName) {
+        var withoutAtTypePrefix = ts.removePrefix(mangledName, "@types/");
+        if (withoutAtTypePrefix !== mangledName) {
+            return unmangleScopedPackageName(withoutAtTypePrefix);
+        }
+        return mangledName;
+    }
+    ts.getPackageNameFromTypesPackageName = getPackageNameFromTypesPackageName;
+    /* @internal */
+    function unmangleScopedPackageName(typesPackageName) {
+        return ts.stringContains(typesPackageName, mangledScopedPackageSeparator) ?
+            "@" + typesPackageName.replace(mangledScopedPackageSeparator, ts.directorySeparator) :
+            typesPackageName;
+    }
+    ts.unmangleScopedPackageName = unmangleScopedPackageName;
+    function tryFindNonRelativeModuleNameInCache(cache, moduleName, containingDirectory, state) {
+        var _a;
+        var result = cache && cache.get(containingDirectory);
+        if (result) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.Resolution_for_module_0_was_found_in_cache_from_location_1, moduleName, containingDirectory);
+            }
+            (_a = state.failedLookupLocations).push.apply(_a, result.failedLookupLocations);
+            return { value: result.resolvedModule && { path: result.resolvedModule.resolvedFileName, originalPath: result.resolvedModule.originalPath || true, extension: result.resolvedModule.extension, packageId: result.resolvedModule.packageId } };
+        }
+    }
+    function classicNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference) {
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        var failedLookupLocations = [];
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, failedLookupLocations: failedLookupLocations };
+        var containingDirectory = ts.getDirectoryPath(containingFile);
+        var resolved = tryResolve(Extensions.TypeScript) || tryResolve(Extensions.JavaScript);
+        // No originalPath because classic resolution doesn't resolve realPath
+        return createResolvedModuleWithFailedLookupLocations(resolved && resolved.value, /*isExternalLibraryImport*/ false, failedLookupLocations);
+        function tryResolve(extensions) {
+            var resolvedUsingSettings = tryLoadModuleUsingOptionalResolutionSettings(extensions, moduleName, containingDirectory, loadModuleFromFileNoPackageId, state);
+            if (resolvedUsingSettings) {
+                return { value: resolvedUsingSettings };
+            }
+            if (!ts.isExternalModuleNameRelative(moduleName)) {
+                var perModuleNameCache_1 = cache && cache.getOrCreateCacheForModuleName(moduleName, redirectedReference);
+                // Climb up parent directories looking for a module.
+                var resolved_3 = ts.forEachAncestorDirectory(containingDirectory, function (directory) {
+                    var resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache_1, moduleName, directory, state);
+                    if (resolutionFromCache) {
+                        return resolutionFromCache;
+                    }
+                    var searchName = ts.normalizePath(ts.combinePaths(directory, moduleName));
+                    return toSearchResult(loadModuleFromFileNoPackageId(extensions, searchName, /*onlyRecordFailures*/ false, state));
+                });
+                if (resolved_3) {
+                    return resolved_3;
+                }
+                if (extensions === Extensions.TypeScript) {
+                    // If we didn't find the file normally, look it up in @types.
+                    return loadModuleFromNearestNodeModulesDirectoryTypesScope(moduleName, containingDirectory, state);
+                }
+            }
+            else {
+                var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
+                return toSearchResult(loadModuleFromFileNoPackageId(extensions, candidate, /*onlyRecordFailures*/ false, state));
+            }
+        }
+    }
+    ts.classicNameResolver = classicNameResolver;
+    /**
+     * LSHost may load a module from a global cache of typings.
+     * This is the minumum code needed to expose that functionality; the rest is in LSHost.
+     */
+    /* @internal */
+    function loadModuleFromGlobalCache(moduleName, projectName, compilerOptions, host, globalCache) {
+        var traceEnabled = isTraceEnabled(compilerOptions, host);
+        if (traceEnabled) {
+            trace(host, ts.Diagnostics.Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using_cache_location_2, projectName, moduleName, globalCache);
+        }
+        var failedLookupLocations = [];
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, failedLookupLocations: failedLookupLocations };
+        var resolved = loadModuleFromImmediateNodeModulesDirectory(Extensions.DtsOnly, moduleName, globalCache, state, /*typesScopeOnly*/ false);
+        return createResolvedModuleWithFailedLookupLocations(resolved, /*isExternalLibraryImport*/ true, failedLookupLocations);
+    }
+    ts.loadModuleFromGlobalCache = loadModuleFromGlobalCache;
+    /**
+     * Wraps value to SearchResult.
+     * @returns undefined if value is undefined or { value } otherwise
+     */
+    function toSearchResult(value) {
+        return value !== undefined ? { value: value } : undefined;
+    }
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var ModuleInstanceState;
+    (function (ModuleInstanceState) {
+        ModuleInstanceState[ModuleInstanceState["NonInstantiated"] = 0] = "NonInstantiated";
+        ModuleInstanceState[ModuleInstanceState["Instantiated"] = 1] = "Instantiated";
+        ModuleInstanceState[ModuleInstanceState["ConstEnumOnly"] = 2] = "ConstEnumOnly";
+    })(ModuleInstanceState = ts.ModuleInstanceState || (ts.ModuleInstanceState = {}));
+    function getModuleInstanceState(node) {
+        return node.body ? getModuleInstanceStateWorker(node.body) : 1 /* Instantiated */;
+    }
+    ts.getModuleInstanceState = getModuleInstanceState;
+    function getModuleInstanceStateWorker(node) {
+        // A module is uninstantiated if it contains only
+        switch (node.kind) {
+            // 1. interface declarations, type alias declarations
+            case 241 /* InterfaceDeclaration */:
+            case 242 /* TypeAliasDeclaration */:
+                return 0 /* NonInstantiated */;
+            // 2. const enum declarations
+            case 243 /* EnumDeclaration */:
+                if (ts.isEnumConst(node)) {
+                    return 2 /* ConstEnumOnly */;
+                }
+                break;
+            // 3. non-exported import declarations
+            case 249 /* ImportDeclaration */:
+            case 248 /* ImportEqualsDeclaration */:
+                if (!(ts.hasModifier(node, 1 /* Export */))) {
+                    return 0 /* NonInstantiated */;
+                }
+                break;
+            // 4. other uninstantiated module declarations.
+            case 245 /* ModuleBlock */: {
+                var state_1 = 0 /* NonInstantiated */;
+                ts.forEachChild(node, function (n) {
+                    var childState = getModuleInstanceStateWorker(n);
+                    switch (childState) {
+                        case 0 /* NonInstantiated */:
+                            // child is non-instantiated - continue searching
+                            return;
+                        case 2 /* ConstEnumOnly */:
+                            // child is const enum only - record state and continue searching
+                            state_1 = 2 /* ConstEnumOnly */;
+                            return;
+                        case 1 /* Instantiated */:
+                            // child is instantiated - record state and stop
+                            state_1 = 1 /* Instantiated */;
+                            return true;
+                        default:
+                            ts.Debug.assertNever(childState);
+                    }
+                });
+                return state_1;
+            }
+            case 244 /* ModuleDeclaration */:
+                return getModuleInstanceState(node);
+            case 72 /* Identifier */:
+                // Only jsdoc typedef definition can exist in jsdoc namespace, and it should
+                // be considered the same as type alias
+                if (node.isInJSDocNamespace) {
+                    return 0 /* NonInstantiated */;
+                }
+        }
+        return 1 /* Instantiated */;
+    }
+    var ContainerFlags;
+    (function (ContainerFlags) {
+        // The current node is not a container, and no container manipulation should happen before
+        // recursing into it.
+        ContainerFlags[ContainerFlags["None"] = 0] = "None";
+        // The current node is a container.  It should be set as the current container (and block-
+        // container) before recursing into it.  The current node does not have locals.  Examples:
+        //
+        //      Classes, ObjectLiterals, TypeLiterals, Interfaces...
+        ContainerFlags[ContainerFlags["IsContainer"] = 1] = "IsContainer";
+        // The current node is a block-scoped-container.  It should be set as the current block-
+        // container before recursing into it.  Examples:
+        //
+        //      Blocks (when not parented by functions), Catch clauses, For/For-in/For-of statements...
+        ContainerFlags[ContainerFlags["IsBlockScopedContainer"] = 2] = "IsBlockScopedContainer";
+        // The current node is the container of a control flow path. The current control flow should
+        // be saved and restored, and a new control flow initialized within the container.
+        ContainerFlags[ContainerFlags["IsControlFlowContainer"] = 4] = "IsControlFlowContainer";
+        ContainerFlags[ContainerFlags["IsFunctionLike"] = 8] = "IsFunctionLike";
+        ContainerFlags[ContainerFlags["IsFunctionExpression"] = 16] = "IsFunctionExpression";
+        ContainerFlags[ContainerFlags["HasLocals"] = 32] = "HasLocals";
+        ContainerFlags[ContainerFlags["IsInterface"] = 64] = "IsInterface";
+        ContainerFlags[ContainerFlags["IsObjectLiteralOrClassExpressionMethod"] = 128] = "IsObjectLiteralOrClassExpressionMethod";
+    })(ContainerFlags || (ContainerFlags = {}));
+    var flowNodeCreated = ts.identity;
+    var binder = createBinder();
+    function bindSourceFile(file, options) {
+        ts.performance.mark("beforeBind");
+        binder(file, options);
+        ts.performance.mark("afterBind");
+        ts.performance.measure("Bind", "beforeBind", "afterBind");
+    }
+    ts.bindSourceFile = bindSourceFile;
+    function createBinder() {
+        var file;
+        var options;
+        var languageVersion;
+        var parent;
+        var container;
+        var thisParentContainer; // Container one level up
+        var blockScopeContainer;
+        var lastContainer;
+        var delayedTypeAliases;
+        var seenThisKeyword;
+        // state used by control flow analysis
+        var currentFlow;
+        var currentBreakTarget;
+        var currentContinueTarget;
+        var currentReturnTarget;
+        var currentTrueTarget;
+        var currentFalseTarget;
+        var preSwitchCaseFlow;
+        var activeLabels;
+        var hasExplicitReturn;
+        // state used for emit helpers
+        var emitFlags;
+        // If this file is an external module, then it is automatically in strict-mode according to
+        // ES6.  If it is not an external module, then we'll determine if it is in strict mode or
+        // not depending on if we see "use strict" in certain places or if we hit a class/namespace
+        // or if compiler options contain alwaysStrict.
+        var inStrictMode;
+        var symbolCount = 0;
+        var Symbol; // tslint:disable-line variable-name
+        var classifiableNames;
+        var unreachableFlow = { flags: 1 /* Unreachable */ };
+        var reportedUnreachableFlow = { flags: 1 /* Unreachable */ };
+        // state used to aggregate transform flags during bind.
+        var subtreeTransformFlags = 0 /* None */;
+        var skipTransformFlagAggregation;
+        /**
+         * Inside the binder, we may create a diagnostic for an as-yet unbound node (with potentially no parent pointers, implying no accessible source file)
+         * If so, the node _must_ be in the current file (as that's the only way anything could have traversed to it to yield it as the error node)
+         * This version of `createDiagnosticForNode` uses the binder's context to account for this, and always yields correct diagnostics even in these situations.
+         */
+        function createDiagnosticForNode(node, message, arg0, arg1, arg2) {
+            return ts.createDiagnosticForNodeInSourceFile(ts.getSourceFileOfNode(node) || file, node, message, arg0, arg1, arg2);
+        }
+        function bindSourceFile(f, opts) {
+            file = f;
+            options = opts;
+            languageVersion = ts.getEmitScriptTarget(options);
+            inStrictMode = bindInStrictMode(file, opts);
+            classifiableNames = ts.createUnderscoreEscapedMap();
+            symbolCount = 0;
+            skipTransformFlagAggregation = file.isDeclarationFile;
+            Symbol = ts.objectAllocator.getSymbolConstructor();
+            if (!file.locals) {
+                bind(file);
+                file.symbolCount = symbolCount;
+                file.classifiableNames = classifiableNames;
+                delayedBindJSDocTypedefTag();
+            }
+            file = undefined;
+            options = undefined;
+            languageVersion = undefined;
+            parent = undefined;
+            container = undefined;
+            thisParentContainer = undefined;
+            blockScopeContainer = undefined;
+            lastContainer = undefined;
+            delayedTypeAliases = undefined;
+            seenThisKeyword = false;
+            currentFlow = undefined;
+            currentBreakTarget = undefined;
+            currentContinueTarget = undefined;
+            currentReturnTarget = undefined;
+            currentTrueTarget = undefined;
+            currentFalseTarget = undefined;
+            activeLabels = undefined;
+            hasExplicitReturn = false;
+            emitFlags = 0 /* None */;
+            subtreeTransformFlags = 0 /* None */;
+        }
+        return bindSourceFile;
+        function bindInStrictMode(file, opts) {
+            if (ts.getStrictOptionValue(opts, "alwaysStrict") && !file.isDeclarationFile) {
+                // bind in strict mode source files with alwaysStrict option
+                return true;
+            }
+            else {
+                return !!file.externalModuleIndicator;
+            }
+        }
+        function createSymbol(flags, name) {
+            symbolCount++;
+            return new Symbol(flags, name);
+        }
+        function addDeclarationToSymbol(symbol, node, symbolFlags) {
+            symbol.flags |= symbolFlags;
+            node.symbol = symbol;
+            symbol.declarations = ts.append(symbol.declarations, node);
+            if (symbolFlags & (32 /* Class */ | 384 /* Enum */ | 1536 /* Module */ | 3 /* Variable */) && !symbol.exports) {
+                symbol.exports = ts.createSymbolTable();
+            }
+            if (symbolFlags & (32 /* Class */ | 64 /* Interface */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && !symbol.members) {
+                symbol.members = ts.createSymbolTable();
+            }
+            // On merge of const enum module with class or function, reset const enum only flag (namespaces will already recalculate)
+            if (symbol.constEnumOnlyModule && (symbol.flags & (16 /* Function */ | 32 /* Class */ | 256 /* RegularEnum */))) {
+                symbol.constEnumOnlyModule = false;
+            }
+            if (symbolFlags & 67220415 /* Value */) {
+                setValueDeclaration(symbol, node);
+            }
+        }
+        function setValueDeclaration(symbol, node) {
+            var valueDeclaration = symbol.valueDeclaration;
+            if (!valueDeclaration ||
+                (ts.isAssignmentDeclaration(valueDeclaration) && !ts.isAssignmentDeclaration(node)) ||
+                (valueDeclaration.kind !== node.kind && ts.isEffectiveModuleDeclaration(valueDeclaration))) {
+                // other kinds of value declarations take precedence over modules and assignment declarations
+                symbol.valueDeclaration = node;
+            }
+        }
+        // Should not be called on a declaration with a computed property name,
+        // unless it is a well known Symbol.
+        function getDeclarationName(node) {
+            if (node.kind === 254 /* ExportAssignment */) {
+                return node.isExportEquals ? "export=" /* ExportEquals */ : "default" /* Default */;
+            }
+            var name = ts.getNameOfDeclaration(node);
+            if (name) {
+                if (ts.isAmbientModule(node)) {
+                    var moduleName = ts.getTextOfIdentifierOrLiteral(name);
+                    return (ts.isGlobalScopeAugmentation(node) ? "__global" : "\"" + moduleName + "\"");
+                }
+                if (name.kind === 149 /* ComputedPropertyName */) {
+                    var nameExpression = name.expression;
+                    // treat computed property names where expression is string/numeric literal as just string/numeric literal
+                    if (ts.isStringOrNumericLiteralLike(nameExpression)) {
+                        return ts.escapeLeadingUnderscores(nameExpression.text);
+                    }
+                    ts.Debug.assert(ts.isWellKnownSymbolSyntactically(nameExpression));
+                    return ts.getPropertyNameForKnownSymbolName(ts.idText(nameExpression.name));
+                }
+                return ts.isPropertyNameLiteral(name) ? ts.getEscapedTextOfIdentifierOrLiteral(name) : undefined;
+            }
+            switch (node.kind) {
+                case 157 /* Constructor */:
+                    return "__constructor" /* Constructor */;
+                case 165 /* FunctionType */:
+                case 160 /* CallSignature */:
+                case 293 /* JSDocSignature */:
+                    return "__call" /* Call */;
+                case 166 /* ConstructorType */:
+                case 161 /* ConstructSignature */:
+                    return "__new" /* New */;
+                case 162 /* IndexSignature */:
+                    return "__index" /* Index */;
+                case 255 /* ExportDeclaration */:
+                    return "__export" /* ExportStar */;
+                case 279 /* SourceFile */:
+                    // json file should behave as
+                    // module.exports = ...
+                    return "export=" /* ExportEquals */;
+                case 204 /* BinaryExpression */:
+                    if (ts.getAssignmentDeclarationKind(node) === 2 /* ModuleExports */) {
+                        // module.exports = ...
+                        return "export=" /* ExportEquals */;
+                    }
+                    ts.Debug.fail("Unknown binary declaration kind");
+                    break;
+                case 289 /* JSDocFunctionType */:
+                    return (ts.isJSDocConstructSignature(node) ? "__new" /* New */ : "__call" /* Call */);
+                case 151 /* Parameter */:
+                    // Parameters with names are handled at the top of this function.  Parameters
+                    // without names can only come from JSDocFunctionTypes.
+                    ts.Debug.assert(node.parent.kind === 289 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
+                    var functionType = node.parent;
+                    var index = functionType.parameters.indexOf(node);
+                    return "arg" + index;
+            }
+        }
+        function getDisplayName(node) {
+            return ts.isNamedDeclaration(node) ? ts.declarationNameToString(node.name) : ts.unescapeLeadingUnderscores(ts.Debug.assertDefined(getDeclarationName(node)));
+        }
+        /**
+         * Declares a Symbol for the node and adds it to symbols. Reports errors for conflicting identifier names.
+         * @param symbolTable - The symbol table which node will be added to.
+         * @param parent - node's parent declaration.
+         * @param node - The declaration to be added to the symbol table
+         * @param includes - The SymbolFlags that node has in addition to its declaration type (eg: export, ambient, etc.)
+         * @param excludes - The flags which node cannot be declared alongside in a symbol table. Used to report forbidden declarations.
+         */
+        function declareSymbol(symbolTable, parent, node, includes, excludes, isReplaceableByMethod) {
+            ts.Debug.assert(!ts.hasDynamicName(node));
+            var isDefaultExport = ts.hasModifier(node, 512 /* Default */);
+            // The exported symbol for an export default function/class node is always named "default"
+            var name = isDefaultExport && parent ? "default" /* Default */ : getDeclarationName(node);
+            var symbol;
+            if (name === undefined) {
+                symbol = createSymbol(0 /* None */, "__missing" /* Missing */);
+            }
+            else {
+                // Check and see if the symbol table already has a symbol with this name.  If not,
+                // create a new symbol with this name and add it to the table.  Note that we don't
+                // give the new symbol any flags *yet*.  This ensures that it will not conflict
+                // with the 'excludes' flags we pass in.
+                //
+                // If we do get an existing symbol, see if it conflicts with the new symbol we're
+                // creating.  For example, a 'var' symbol and a 'class' symbol will conflict within
+                // the same symbol table.  If we have a conflict, report the issue on each
+                // declaration we have for this symbol, and then create a new symbol for this
+                // declaration.
+                //
+                // Note that when properties declared in Javascript constructors
+                // (marked by isReplaceableByMethod) conflict with another symbol, the property loses.
+                // Always. This allows the common Javascript pattern of overwriting a prototype method
+                // with an bound instance method of the same type: `this.method = this.method.bind(this)`
+                //
+                // If we created a new symbol, either because we didn't have a symbol with this name
+                // in the symbol table, or we conflicted with an existing symbol, then just add this
+                // node as the sole declaration of the new symbol.
+                //
+                // Otherwise, we'll be merging into a compatible existing symbol (for example when
+                // you have multiple 'vars' with the same name in the same container).  In this case
+                // just add this node into the declarations list of the symbol.
+                symbol = symbolTable.get(name);
+                if (includes & 2885600 /* Classifiable */) {
+                    classifiableNames.set(name, true);
+                }
+                if (!symbol) {
+                    symbolTable.set(name, symbol = createSymbol(0 /* None */, name));
+                    if (isReplaceableByMethod)
+                        symbol.isReplaceableByMethod = true;
+                }
+                else if (isReplaceableByMethod && !symbol.isReplaceableByMethod) {
+                    // A symbol already exists, so don't add this as a declaration.
+                    return symbol;
+                }
+                else if (symbol.flags & excludes) {
+                    if (symbol.isReplaceableByMethod) {
+                        // Javascript constructor-declared symbols can be discarded in favor of
+                        // prototype symbols like methods.
+                        symbolTable.set(name, symbol = createSymbol(0 /* None */, name));
+                    }
+                    else if (!(includes & 3 /* Variable */ && symbol.flags & 67108864 /* Assignment */)) {
+                        // Assignment declarations are allowed to merge with variables, no matter what other flags they have.
+                        if (ts.isNamedDeclaration(node)) {
+                            node.name.parent = node;
+                        }
+                        // Report errors every position with duplicate declaration
+                        // Report errors on previous encountered declarations
+                        var message_1 = symbol.flags & 2 /* BlockScopedVariable */
+                            ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0
+                            : ts.Diagnostics.Duplicate_identifier_0;
+                        var messageNeedsName_1 = true;
+                        if (symbol.flags & 384 /* Enum */ || includes & 384 /* Enum */) {
+                            message_1 = ts.Diagnostics.Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations;
+                            messageNeedsName_1 = false;
+                        }
+                        if (symbol.declarations && symbol.declarations.length) {
+                            // If the current node is a default export of some sort, then check if
+                            // there are any other default exports that we need to error on.
+                            // We'll know whether we have other default exports depending on if `symbol` already has a declaration list set.
+                            if (isDefaultExport) {
+                                message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
+                                messageNeedsName_1 = false;
+                            }
+                            else {
+                                // This is to properly report an error in the case "export default { }" is after export default of class declaration or function declaration.
+                                // Error on multiple export default in the following case:
+                                // 1. multiple export default of class declaration or function declaration by checking NodeFlags.Default
+                                // 2. multiple export default of export assignment. This one doesn't have NodeFlags.Default on (as export default doesn't considered as modifiers)
+                                if (symbol.declarations && symbol.declarations.length &&
+                                    (node.kind === 254 /* ExportAssignment */ && !node.isExportEquals)) {
+                                    message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
+                                    messageNeedsName_1 = false;
+                                }
+                            }
+                        }
+                        var addError = function (decl) {
+                            file.bindDiagnostics.push(createDiagnosticForNode(ts.getNameOfDeclaration(decl) || decl, message_1, messageNeedsName_1 ? getDisplayName(decl) : undefined));
+                        };
+                        ts.forEach(symbol.declarations, addError);
+                        addError(node);
+                        symbol = createSymbol(0 /* None */, name);
+                    }
+                }
+            }
+            addDeclarationToSymbol(symbol, node, includes);
+            if (symbol.parent) {
+                ts.Debug.assert(symbol.parent === parent, "Existing symbol parent should match new one");
+            }
+            else {
+                symbol.parent = parent;
+            }
+            return symbol;
+        }
+        function declareModuleMember(node, symbolFlags, symbolExcludes) {
+            var hasExportModifier = ts.getCombinedModifierFlags(node) & 1 /* Export */;
+            if (symbolFlags & 2097152 /* Alias */) {
+                if (node.kind === 257 /* ExportSpecifier */ || (node.kind === 248 /* ImportEqualsDeclaration */ && hasExportModifier)) {
+                    return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
+                }
+                else {
+                    return declareSymbol(container.locals, /*parent*/ undefined, node, symbolFlags, symbolExcludes);
+                }
+            }
+            else {
+                // Exported module members are given 2 symbols: A local symbol that is classified with an ExportValue flag,
+                // and an associated export symbol with all the correct flags set on it. There are 2 main reasons:
+                //
+                //   1. We treat locals and exports of the same name as mutually exclusive within a container.
+                //      That means the binder will issue a Duplicate Identifier error if you mix locals and exports
+                //      with the same name in the same container.
+                //      TODO: Make this a more specific error and decouple it from the exclusion logic.
+                //   2. When we checkIdentifier in the checker, we set its resolved symbol to the local symbol,
+                //      but return the export symbol (by calling getExportSymbolOfValueSymbolIfExported). That way
+                //      when the emitter comes back to it, it knows not to qualify the name if it was found in a containing scope.
+                // NOTE: Nested ambient modules always should go to to 'locals' table to prevent their automatic merge
+                //       during global merging in the checker. Why? The only case when ambient module is permitted inside another module is module augmentation
+                //       and this case is specially handled. Module augmentations should only be merged with original module definition
+                //       and should never be merged directly with other augmentation, and the latter case would be possible if automatic merge is allowed.
+                if (ts.isJSDocTypeAlias(node))
+                    ts.Debug.assert(ts.isInJSFile(node)); // We shouldn't add symbols for JSDoc nodes if not in a JS file.
+                if ((!ts.isAmbientModule(node) && (hasExportModifier || container.flags & 32 /* ExportContext */)) || ts.isJSDocTypeAlias(node)) {
+                    if (ts.hasModifier(node, 512 /* Default */) && !getDeclarationName(node)) {
+                        return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes); // No local symbol for an unnamed default!
+                    }
+                    var exportKind = symbolFlags & 67220415 /* Value */ ? 1048576 /* ExportValue */ : 0;
+                    var local = declareSymbol(container.locals, /*parent*/ undefined, node, exportKind, symbolExcludes);
+                    local.exportSymbol = declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
+                    node.localSymbol = local;
+                    return local;
+                }
+                else {
+                    return declareSymbol(container.locals, /*parent*/ undefined, node, symbolFlags, symbolExcludes);
+                }
+            }
+        }
+        // All container nodes are kept on a linked list in declaration order. This list is used by
+        // the getLocalNameOfContainer function in the type checker to validate that the local name
+        // used for a container is unique.
+        function bindContainer(node, containerFlags) {
+            // Before we recurse into a node's children, we first save the existing parent, container
+            // and block-container.  Then after we pop out of processing the children, we restore
+            // these saved values.
+            var saveContainer = container;
+            var saveThisParentContainer = thisParentContainer;
+            var savedBlockScopeContainer = blockScopeContainer;
+            // Depending on what kind of node this is, we may have to adjust the current container
+            // and block-container.   If the current node is a container, then it is automatically
+            // considered the current block-container as well.  Also, for containers that we know
+            // may contain locals, we eagerly initialize the .locals field. We do this because
+            // it's highly likely that the .locals will be needed to place some child in (for example,
+            // a parameter, or variable declaration).
+            //
+            // However, we do not proactively create the .locals for block-containers because it's
+            // totally normal and common for block-containers to never actually have a block-scoped
+            // variable in them.  We don't want to end up allocating an object for every 'block' we
+            // run into when most of them won't be necessary.
+            //
+            // Finally, if this is a block-container, then we clear out any existing .locals object
+            // it may contain within it.  This happens in incremental scenarios.  Because we can be
+            // reusing a node from a previous compilation, that node may have had 'locals' created
+            // for it.  We must clear this so we don't accidentally move any stale data forward from
+            // a previous compilation.
+            if (containerFlags & 1 /* IsContainer */) {
+                if (node.kind !== 197 /* ArrowFunction */) {
+                    thisParentContainer = container;
+                }
+                container = blockScopeContainer = node;
+                if (containerFlags & 32 /* HasLocals */) {
+                    container.locals = ts.createSymbolTable();
+                }
+                addToContainerChain(container);
+            }
+            else if (containerFlags & 2 /* IsBlockScopedContainer */) {
+                blockScopeContainer = node;
+                blockScopeContainer.locals = undefined;
+            }
+            if (containerFlags & 4 /* IsControlFlowContainer */) {
+                var saveFlowNodeCreated = flowNodeCreated;
+                var saveCurrentFlow = currentFlow;
+                var saveBreakTarget = currentBreakTarget;
+                var saveContinueTarget = currentContinueTarget;
+                var saveReturnTarget = currentReturnTarget;
+                var saveActiveLabels = activeLabels;
+                var saveHasExplicitReturn = hasExplicitReturn;
+                var isIIFE = containerFlags & 16 /* IsFunctionExpression */ && !ts.hasModifier(node, 256 /* Async */) &&
+                    !node.asteriskToken && !!ts.getImmediatelyInvokedFunctionExpression(node);
+                // A non-async, non-generator IIFE is considered part of the containing control flow. Return statements behave
+                // similarly to break statements that exit to a label just past the statement body.
+                if (!isIIFE) {
+                    currentFlow = { flags: 2 /* Start */ };
+                    if (containerFlags & (16 /* IsFunctionExpression */ | 128 /* IsObjectLiteralOrClassExpressionMethod */)) {
+                        currentFlow.container = node;
+                    }
+                }
+                // We create a return control flow graph for IIFEs and constructors. For constructors
+                // we use the return control flow graph in strict property intialization checks.
+                currentReturnTarget = isIIFE || node.kind === 157 /* Constructor */ ? createBranchLabel() : undefined;
+                currentBreakTarget = undefined;
+                currentContinueTarget = undefined;
+                activeLabels = undefined;
+                hasExplicitReturn = false;
+                flowNodeCreated = ts.identity;
+                bindChildren(node);
+                // Reset all reachability check related flags on node (for incremental scenarios)
+                node.flags &= ~1408 /* ReachabilityAndEmitFlags */;
+                if (!(currentFlow.flags & 1 /* Unreachable */) && containerFlags & 8 /* IsFunctionLike */ && ts.nodeIsPresent(node.body)) {
+                    node.flags |= 128 /* HasImplicitReturn */;
+                    if (hasExplicitReturn)
+                        node.flags |= 256 /* HasExplicitReturn */;
+                }
+                if (node.kind === 279 /* SourceFile */) {
+                    node.flags |= emitFlags;
+                }
+                if (currentReturnTarget) {
+                    addAntecedent(currentReturnTarget, currentFlow);
+                    currentFlow = finishFlowLabel(currentReturnTarget);
+                    if (node.kind === 157 /* Constructor */) {
+                        node.returnFlowNode = currentFlow;
+                    }
+                }
+                if (!isIIFE) {
+                    currentFlow = saveCurrentFlow;
+                }
+                currentBreakTarget = saveBreakTarget;
+                currentContinueTarget = saveContinueTarget;
+                currentReturnTarget = saveReturnTarget;
+                activeLabels = saveActiveLabels;
+                hasExplicitReturn = saveHasExplicitReturn;
+                flowNodeCreated = saveFlowNodeCreated;
+            }
+            else if (containerFlags & 64 /* IsInterface */) {
+                seenThisKeyword = false;
+                bindChildren(node);
+                node.flags = seenThisKeyword ? node.flags | 64 /* ContainsThis */ : node.flags & ~64 /* ContainsThis */;
+            }
+            else {
+                bindChildren(node);
+            }
+            container = saveContainer;
+            thisParentContainer = saveThisParentContainer;
+            blockScopeContainer = savedBlockScopeContainer;
+        }
+        function bindChildren(node) {
+            if (skipTransformFlagAggregation) {
+                bindChildrenWorker(node);
+            }
+            else if (node.transformFlags & 536870912 /* HasComputedFlags */) {
+                skipTransformFlagAggregation = true;
+                bindChildrenWorker(node);
+                skipTransformFlagAggregation = false;
+                subtreeTransformFlags |= node.transformFlags & ~getTransformFlagsSubtreeExclusions(node.kind);
+            }
+            else {
+                var savedSubtreeTransformFlags = subtreeTransformFlags;
+                subtreeTransformFlags = 0;
+                bindChildrenWorker(node);
+                subtreeTransformFlags = savedSubtreeTransformFlags | computeTransformFlagsForNode(node, subtreeTransformFlags);
+            }
+        }
+        function bindEachFunctionsFirst(nodes) {
+            bindEach(nodes, function (n) { return n.kind === 239 /* FunctionDeclaration */ ? bind(n) : undefined; });
+            bindEach(nodes, function (n) { return n.kind !== 239 /* FunctionDeclaration */ ? bind(n) : undefined; });
+        }
+        function bindEach(nodes, bindFunction) {
+            if (bindFunction === void 0) { bindFunction = bind; }
+            if (nodes === undefined) {
+                return;
+            }
+            if (skipTransformFlagAggregation) {
+                ts.forEach(nodes, bindFunction);
+            }
+            else {
+                var savedSubtreeTransformFlags = subtreeTransformFlags;
+                subtreeTransformFlags = 0 /* None */;
+                var nodeArrayFlags = 0 /* None */;
+                for (var _i = 0, nodes_2 = nodes; _i < nodes_2.length; _i++) {
+                    var node = nodes_2[_i];
+                    bindFunction(node);
+                    nodeArrayFlags |= node.transformFlags & ~536870912 /* HasComputedFlags */;
+                }
+                nodes.transformFlags = nodeArrayFlags | 536870912 /* HasComputedFlags */;
+                subtreeTransformFlags |= savedSubtreeTransformFlags;
+            }
+        }
+        function bindEachChild(node) {
+            ts.forEachChild(node, bind, bindEach);
+        }
+        function bindChildrenWorker(node) {
+            if (checkUnreachable(node)) {
+                bindEachChild(node);
+                bindJSDoc(node);
+                return;
+            }
+            switch (node.kind) {
+                case 224 /* WhileStatement */:
+                    bindWhileStatement(node);
+                    break;
+                case 223 /* DoStatement */:
+                    bindDoStatement(node);
+                    break;
+                case 225 /* ForStatement */:
+                    bindForStatement(node);
+                    break;
+                case 226 /* ForInStatement */:
+                case 227 /* ForOfStatement */:
+                    bindForInOrForOfStatement(node);
+                    break;
+                case 222 /* IfStatement */:
+                    bindIfStatement(node);
+                    break;
+                case 230 /* ReturnStatement */:
+                case 234 /* ThrowStatement */:
+                    bindReturnOrThrow(node);
+                    break;
+                case 229 /* BreakStatement */:
+                case 228 /* ContinueStatement */:
+                    bindBreakOrContinueStatement(node);
+                    break;
+                case 235 /* TryStatement */:
+                    bindTryStatement(node);
+                    break;
+                case 232 /* SwitchStatement */:
+                    bindSwitchStatement(node);
+                    break;
+                case 246 /* CaseBlock */:
+                    bindCaseBlock(node);
+                    break;
+                case 271 /* CaseClause */:
+                    bindCaseClause(node);
+                    break;
+                case 233 /* LabeledStatement */:
+                    bindLabeledStatement(node);
+                    break;
+                case 202 /* PrefixUnaryExpression */:
+                    bindPrefixUnaryExpressionFlow(node);
+                    break;
+                case 203 /* PostfixUnaryExpression */:
+                    bindPostfixUnaryExpressionFlow(node);
+                    break;
+                case 204 /* BinaryExpression */:
+                    bindBinaryExpressionFlow(node);
+                    break;
+                case 198 /* DeleteExpression */:
+                    bindDeleteExpressionFlow(node);
+                    break;
+                case 205 /* ConditionalExpression */:
+                    bindConditionalExpressionFlow(node);
+                    break;
+                case 237 /* VariableDeclaration */:
+                    bindVariableDeclarationFlow(node);
+                    break;
+                case 191 /* CallExpression */:
+                    bindCallExpressionFlow(node);
+                    break;
+                case 304 /* JSDocTypedefTag */:
+                case 297 /* JSDocCallbackTag */:
+                    bindJSDocTypeAlias(node);
+                    break;
+                // In source files and blocks, bind functions first to match hoisting that occurs at runtime
+                case 279 /* SourceFile */: {
+                    bindEachFunctionsFirst(node.statements);
+                    bind(node.endOfFileToken);
+                    break;
+                }
+                case 218 /* Block */:
+                case 245 /* ModuleBlock */:
+                    bindEachFunctionsFirst(node.statements);
+                    break;
+                default:
+                    bindEachChild(node);
+                    break;
+            }
+            bindJSDoc(node);
+        }
+        function isNarrowingExpression(expr) {
+            switch (expr.kind) {
+                case 72 /* Identifier */:
+                case 100 /* ThisKeyword */:
+                case 189 /* PropertyAccessExpression */:
+                case 190 /* ElementAccessExpression */:
+                    return isNarrowableReference(expr);
+                case 191 /* CallExpression */:
+                    return hasNarrowableArgument(expr);
+                case 195 /* ParenthesizedExpression */:
+                    return isNarrowingExpression(expr.expression);
+                case 204 /* BinaryExpression */:
+                    return isNarrowingBinaryExpression(expr);
+                case 202 /* PrefixUnaryExpression */:
+                    return expr.operator === 52 /* ExclamationToken */ && isNarrowingExpression(expr.operand);
+                case 199 /* TypeOfExpression */:
+                    return isNarrowingExpression(expr.expression);
+            }
+            return false;
+        }
+        function isNarrowableReference(expr) {
+            return expr.kind === 72 /* Identifier */ || expr.kind === 100 /* ThisKeyword */ || expr.kind === 98 /* SuperKeyword */ ||
+                (ts.isPropertyAccessExpression(expr) || ts.isNonNullExpression(expr) || ts.isParenthesizedExpression(expr)) && isNarrowableReference(expr.expression) ||
+                ts.isElementAccessExpression(expr) && expr.argumentExpression &&
+                    (ts.isStringLiteral(expr.argumentExpression) || ts.isNumericLiteral(expr.argumentExpression)) &&
+                    isNarrowableReference(expr.expression);
+        }
+        function hasNarrowableArgument(expr) {
+            if (expr.arguments) {
+                for (var _i = 0, _a = expr.arguments; _i < _a.length; _i++) {
+                    var argument = _a[_i];
+                    if (isNarrowableReference(argument)) {
+                        return true;
+                    }
+                }
+            }
+            if (expr.expression.kind === 189 /* PropertyAccessExpression */ &&
+                isNarrowableReference(expr.expression.expression)) {
+                return true;
+            }
+            return false;
+        }
+        function isNarrowingTypeofOperands(expr1, expr2) {
+            return ts.isTypeOfExpression(expr1) && isNarrowableOperand(expr1.expression) && ts.isStringLiteralLike(expr2);
+        }
+        function isNarrowableInOperands(left, right) {
+            return ts.isStringLiteralLike(left) && isNarrowingExpression(right);
+        }
+        function isNarrowingBinaryExpression(expr) {
+            switch (expr.operatorToken.kind) {
+                case 59 /* EqualsToken */:
+                    return isNarrowableReference(expr.left);
+                case 33 /* EqualsEqualsToken */:
+                case 34 /* ExclamationEqualsToken */:
+                case 35 /* EqualsEqualsEqualsToken */:
+                case 36 /* ExclamationEqualsEqualsToken */:
+                    return isNarrowableOperand(expr.left) || isNarrowableOperand(expr.right) ||
+                        isNarrowingTypeofOperands(expr.right, expr.left) || isNarrowingTypeofOperands(expr.left, expr.right);
+                case 94 /* InstanceOfKeyword */:
+                    return isNarrowableOperand(expr.left);
+                case 93 /* InKeyword */:
+                    return isNarrowableInOperands(expr.left, expr.right);
+                case 27 /* CommaToken */:
+                    return isNarrowingExpression(expr.right);
+            }
+            return false;
+        }
+        function isNarrowableOperand(expr) {
+            switch (expr.kind) {
+                case 195 /* ParenthesizedExpression */:
+                    return isNarrowableOperand(expr.expression);
+                case 204 /* BinaryExpression */:
+                    switch (expr.operatorToken.kind) {
+                        case 59 /* EqualsToken */:
+                            return isNarrowableOperand(expr.left);
+                        case 27 /* CommaToken */:
+                            return isNarrowableOperand(expr.right);
+                    }
+            }
+            return isNarrowableReference(expr);
+        }
+        function createBranchLabel() {
+            return {
+                flags: 4 /* BranchLabel */,
+                antecedents: undefined
+            };
+        }
+        function createLoopLabel() {
+            return {
+                flags: 8 /* LoopLabel */,
+                antecedents: undefined
+            };
+        }
+        function setFlowNodeReferenced(flow) {
+            // On first reference we set the Referenced flag, thereafter we set the Shared flag
+            flow.flags |= flow.flags & 512 /* Referenced */ ? 1024 /* Shared */ : 512 /* Referenced */;
+        }
+        function addAntecedent(label, antecedent) {
+            if (!(antecedent.flags & 1 /* Unreachable */) && !ts.contains(label.antecedents, antecedent)) {
+                (label.antecedents || (label.antecedents = [])).push(antecedent);
+                setFlowNodeReferenced(antecedent);
+            }
+        }
+        function createFlowCondition(flags, antecedent, expression) {
+            if (antecedent.flags & 1 /* Unreachable */) {
+                return antecedent;
+            }
+            if (!expression) {
+                return flags & 32 /* TrueCondition */ ? antecedent : unreachableFlow;
+            }
+            if (expression.kind === 102 /* TrueKeyword */ && flags & 64 /* FalseCondition */ ||
+                expression.kind === 87 /* FalseKeyword */ && flags & 32 /* TrueCondition */) {
+                return unreachableFlow;
+            }
+            if (!isNarrowingExpression(expression)) {
+                return antecedent;
+            }
+            setFlowNodeReferenced(antecedent);
+            return flowNodeCreated({ flags: flags, expression: expression, antecedent: antecedent });
+        }
+        function createFlowSwitchClause(antecedent, switchStatement, clauseStart, clauseEnd) {
+            if (!isNarrowingExpression(switchStatement.expression)) {
+                return antecedent;
+            }
+            setFlowNodeReferenced(antecedent);
+            return flowNodeCreated({ flags: 128 /* SwitchClause */, switchStatement: switchStatement, clauseStart: clauseStart, clauseEnd: clauseEnd, antecedent: antecedent });
+        }
+        function createFlowAssignment(antecedent, node) {
+            setFlowNodeReferenced(antecedent);
+            return flowNodeCreated({ flags: 16 /* Assignment */, antecedent: antecedent, node: node });
+        }
+        function createFlowArrayMutation(antecedent, node) {
+            setFlowNodeReferenced(antecedent);
+            var res = flowNodeCreated({ flags: 256 /* ArrayMutation */, antecedent: antecedent, node: node });
+            return res;
+        }
+        function finishFlowLabel(flow) {
+            var antecedents = flow.antecedents;
+            if (!antecedents) {
+                return unreachableFlow;
+            }
+            if (antecedents.length === 1) {
+                return antecedents[0];
+            }
+            return flow;
+        }
+        function isStatementCondition(node) {
+            var parent = node.parent;
+            switch (parent.kind) {
+                case 222 /* IfStatement */:
+                case 224 /* WhileStatement */:
+                case 223 /* DoStatement */:
+                    return parent.expression === node;
+                case 225 /* ForStatement */:
+                case 205 /* ConditionalExpression */:
+                    return parent.condition === node;
+            }
+            return false;
+        }
+        function isLogicalExpression(node) {
+            while (true) {
+                if (node.kind === 195 /* ParenthesizedExpression */) {
+                    node = node.expression;
+                }
+                else if (node.kind === 202 /* PrefixUnaryExpression */ && node.operator === 52 /* ExclamationToken */) {
+                    node = node.operand;
+                }
+                else {
+                    return node.kind === 204 /* BinaryExpression */ && (node.operatorToken.kind === 54 /* AmpersandAmpersandToken */ ||
+                        node.operatorToken.kind === 55 /* BarBarToken */);
+                }
+            }
+        }
+        function isTopLevelLogicalExpression(node) {
+            while (node.parent.kind === 195 /* ParenthesizedExpression */ ||
+                node.parent.kind === 202 /* PrefixUnaryExpression */ &&
+                    node.parent.operator === 52 /* ExclamationToken */) {
+                node = node.parent;
+            }
+            return !isStatementCondition(node) && !isLogicalExpression(node.parent);
+        }
+        function bindCondition(node, trueTarget, falseTarget) {
+            var saveTrueTarget = currentTrueTarget;
+            var saveFalseTarget = currentFalseTarget;
+            currentTrueTarget = trueTarget;
+            currentFalseTarget = falseTarget;
+            bind(node);
+            currentTrueTarget = saveTrueTarget;
+            currentFalseTarget = saveFalseTarget;
+            if (!node || !isLogicalExpression(node)) {
+                addAntecedent(trueTarget, createFlowCondition(32 /* TrueCondition */, currentFlow, node));
+                addAntecedent(falseTarget, createFlowCondition(64 /* FalseCondition */, currentFlow, node));
+            }
+        }
+        function bindIterativeStatement(node, breakTarget, continueTarget) {
+            var saveBreakTarget = currentBreakTarget;
+            var saveContinueTarget = currentContinueTarget;
+            currentBreakTarget = breakTarget;
+            currentContinueTarget = continueTarget;
+            bind(node);
+            currentBreakTarget = saveBreakTarget;
+            currentContinueTarget = saveContinueTarget;
+        }
+        function bindWhileStatement(node) {
+            var preWhileLabel = createLoopLabel();
+            var preBodyLabel = createBranchLabel();
+            var postWhileLabel = createBranchLabel();
+            addAntecedent(preWhileLabel, currentFlow);
+            currentFlow = preWhileLabel;
+            bindCondition(node.expression, preBodyLabel, postWhileLabel);
+            currentFlow = finishFlowLabel(preBodyLabel);
+            bindIterativeStatement(node.statement, postWhileLabel, preWhileLabel);
+            addAntecedent(preWhileLabel, currentFlow);
+            currentFlow = finishFlowLabel(postWhileLabel);
+        }
+        function bindDoStatement(node) {
+            var preDoLabel = createLoopLabel();
+            var enclosingLabeledStatement = node.parent.kind === 233 /* LabeledStatement */
+                ? ts.lastOrUndefined(activeLabels)
+                : undefined;
+            // if do statement is wrapped in labeled statement then target labels for break/continue with or without
+            // label should be the same
+            var preConditionLabel = enclosingLabeledStatement ? enclosingLabeledStatement.continueTarget : createBranchLabel();
+            var postDoLabel = enclosingLabeledStatement ? enclosingLabeledStatement.breakTarget : createBranchLabel();
+            addAntecedent(preDoLabel, currentFlow);
+            currentFlow = preDoLabel;
+            bindIterativeStatement(node.statement, postDoLabel, preConditionLabel);
+            addAntecedent(preConditionLabel, currentFlow);
+            currentFlow = finishFlowLabel(preConditionLabel);
+            bindCondition(node.expression, preDoLabel, postDoLabel);
+            currentFlow = finishFlowLabel(postDoLabel);
+        }
+        function bindForStatement(node) {
+            var preLoopLabel = createLoopLabel();
+            var preBodyLabel = createBranchLabel();
+            var postLoopLabel = createBranchLabel();
+            bind(node.initializer);
+            addAntecedent(preLoopLabel, currentFlow);
+            currentFlow = preLoopLabel;
+            bindCondition(node.condition, preBodyLabel, postLoopLabel);
+            currentFlow = finishFlowLabel(preBodyLabel);
+            bindIterativeStatement(node.statement, postLoopLabel, preLoopLabel);
+            bind(node.incrementor);
+            addAntecedent(preLoopLabel, currentFlow);
+            currentFlow = finishFlowLabel(postLoopLabel);
+        }
+        function bindForInOrForOfStatement(node) {
+            var preLoopLabel = createLoopLabel();
+            var postLoopLabel = createBranchLabel();
+            addAntecedent(preLoopLabel, currentFlow);
+            currentFlow = preLoopLabel;
+            if (node.kind === 227 /* ForOfStatement */) {
+                bind(node.awaitModifier);
+            }
+            bind(node.expression);
+            addAntecedent(postLoopLabel, currentFlow);
+            bind(node.initializer);
+            if (node.initializer.kind !== 238 /* VariableDeclarationList */) {
+                bindAssignmentTargetFlow(node.initializer);
+            }
+            bindIterativeStatement(node.statement, postLoopLabel, preLoopLabel);
+            addAntecedent(preLoopLabel, currentFlow);
+            currentFlow = finishFlowLabel(postLoopLabel);
+        }
+        function bindIfStatement(node) {
+            var thenLabel = createBranchLabel();
+            var elseLabel = createBranchLabel();
+            var postIfLabel = createBranchLabel();
+            bindCondition(node.expression, thenLabel, elseLabel);
+            currentFlow = finishFlowLabel(thenLabel);
+            bind(node.thenStatement);
+            addAntecedent(postIfLabel, currentFlow);
+            currentFlow = finishFlowLabel(elseLabel);
+            bind(node.elseStatement);
+            addAntecedent(postIfLabel, currentFlow);
+            currentFlow = finishFlowLabel(postIfLabel);
+        }
+        function bindReturnOrThrow(node) {
+            bind(node.expression);
+            if (node.kind === 230 /* ReturnStatement */) {
+                hasExplicitReturn = true;
+                if (currentReturnTarget) {
+                    addAntecedent(currentReturnTarget, currentFlow);
+                }
+            }
+            currentFlow = unreachableFlow;
+        }
+        function findActiveLabel(name) {
+            if (activeLabels) {
+                for (var _i = 0, activeLabels_1 = activeLabels; _i < activeLabels_1.length; _i++) {
+                    var label = activeLabels_1[_i];
+                    if (label.name === name) {
+                        return label;
+                    }
+                }
+            }
+            return undefined;
+        }
+        function bindBreakOrContinueFlow(node, breakTarget, continueTarget) {
+            var flowLabel = node.kind === 229 /* BreakStatement */ ? breakTarget : continueTarget;
+            if (flowLabel) {
+                addAntecedent(flowLabel, currentFlow);
+                currentFlow = unreachableFlow;
+            }
+        }
+        function bindBreakOrContinueStatement(node) {
+            bind(node.label);
+            if (node.label) {
+                var activeLabel = findActiveLabel(node.label.escapedText);
+                if (activeLabel) {
+                    activeLabel.referenced = true;
+                    bindBreakOrContinueFlow(node, activeLabel.breakTarget, activeLabel.continueTarget);
+                }
+            }
+            else {
+                bindBreakOrContinueFlow(node, currentBreakTarget, currentContinueTarget);
+            }
+        }
+        function bindTryStatement(node) {
+            var preFinallyLabel = createBranchLabel();
+            var preTryFlow = currentFlow;
+            var tryPriors = [];
+            var oldFlowNodeCreated = flowNodeCreated;
+            // We hook the creation of all flow nodes within the `try` scope and store them so we can add _all_ of them
+            // as possible antecedents of the start of the `catch` or `finally` blocks.
+            // Don't bother intercepting the call if there's no finally or catch block that needs the information
+            if (node.catchClause || node.finallyBlock) {
+                flowNodeCreated = function (node) { return (tryPriors.push(node), node); };
+            }
+            bind(node.tryBlock);
+            flowNodeCreated = oldFlowNodeCreated;
+            addAntecedent(preFinallyLabel, currentFlow);
+            var flowAfterTry = currentFlow;
+            var flowAfterCatch = unreachableFlow;
+            if (node.catchClause) {
+                currentFlow = preTryFlow;
+                if (tryPriors.length) {
+                    var preCatchFlow = createBranchLabel();
+                    addAntecedent(preCatchFlow, currentFlow);
+                    for (var _i = 0, tryPriors_1 = tryPriors; _i < tryPriors_1.length; _i++) {
+                        var p = tryPriors_1[_i];
+                        addAntecedent(preCatchFlow, p);
+                    }
+                    currentFlow = finishFlowLabel(preCatchFlow);
+                }
+                bind(node.catchClause);
+                addAntecedent(preFinallyLabel, currentFlow);
+                flowAfterCatch = currentFlow;
+            }
+            if (node.finallyBlock) {
+                // We add the nodes within the `try` block to the `finally`'s antecedents if there's no catch block
+                // (If there is a `catch` block, it will have all these antecedents instead, and the `finally` will
+                // have the end of the `try` block and the end of the `catch` block)
+                var preFinallyPrior = preTryFlow;
+                if (!node.catchClause) {
+                    if (tryPriors.length) {
+                        var preFinallyFlow_1 = createBranchLabel();
+                        addAntecedent(preFinallyFlow_1, preTryFlow);
+                        for (var _a = 0, tryPriors_2 = tryPriors; _a < tryPriors_2.length; _a++) {
+                            var p = tryPriors_2[_a];
+                            addAntecedent(preFinallyFlow_1, p);
+                        }
+                        preFinallyPrior = finishFlowLabel(preFinallyFlow_1);
+                    }
+                }
+                // in finally flow is combined from pre-try/flow from try/flow from catch
+                // pre-flow is necessary to make sure that finally is reachable even if finally flows in both try and finally blocks are unreachable
+                // also for finally blocks we inject two extra edges into the flow graph.
+                // first -> edge that connects pre-try flow with the label at the beginning of the finally block, it has lock associated with it
+                // second -> edge that represents post-finally flow.
+                // these edges are used in following scenario:
+                // let a; (1)
+                // try { a = someOperation(); (2)}
+                // finally { (3) console.log(a) } (4)
+                // (5) a
+                // flow graph for this case looks roughly like this (arrows show ):
+                // (1-pre-try-flow) <--.. <-- (2-post-try-flow)
+                //  ^                                ^
+                //  |*****(3-pre-finally-label) -----|
+                //                ^
+                //                |-- ... <-- (4-post-finally-label) <--- (5)
+                // In case when we walk the flow starting from inside the finally block we want to take edge '*****' into account
+                // since it ensures that finally is always reachable. However when we start outside the finally block and go through label (5)
+                // then edge '*****' should be discarded because label 4 is only reachable if post-finally label-4 is reachable
+                // Simply speaking code inside finally block is treated as reachable as pre-try-flow
+                // since we conservatively assume that any line in try block can throw or return in which case we'll enter finally.
+                // However code after finally is reachable only if control flow was not abrupted in try/catch or finally blocks - it should be composed from
+                // final flows of these blocks without taking pre-try flow into account.
+                //
+                // extra edges that we inject allows to control this behavior
+                // if when walking the flow we step on post-finally edge - we can mark matching pre-finally edge as locked so it will be skipped.
+                var preFinallyFlow = { flags: 2048 /* PreFinally */, antecedent: preFinallyPrior, lock: {} };
+                addAntecedent(preFinallyLabel, preFinallyFlow);
+                currentFlow = finishFlowLabel(preFinallyLabel);
+                bind(node.finallyBlock);
+                // if flow after finally is unreachable - keep it
+                // otherwise check if flows after try and after catch are unreachable
+                // if yes - convert current flow to unreachable
+                // i.e.
+                // try { return "1" } finally { console.log(1); }
+                // console.log(2); // this line should be unreachable even if flow falls out of finally block
+                if (!(currentFlow.flags & 1 /* Unreachable */)) {
+                    if ((flowAfterTry.flags & 1 /* Unreachable */) && (flowAfterCatch.flags & 1 /* Unreachable */)) {
+                        currentFlow = flowAfterTry === reportedUnreachableFlow || flowAfterCatch === reportedUnreachableFlow
+                            ? reportedUnreachableFlow
+                            : unreachableFlow;
+                    }
+                }
+                if (!(currentFlow.flags & 1 /* Unreachable */)) {
+                    var afterFinallyFlow = flowNodeCreated({ flags: 4096 /* AfterFinally */, antecedent: currentFlow });
+                    preFinallyFlow.lock = afterFinallyFlow;
+                    currentFlow = afterFinallyFlow;
+                }
+            }
+            else {
+                currentFlow = finishFlowLabel(preFinallyLabel);
+            }
+        }
+        function bindSwitchStatement(node) {
+            var postSwitchLabel = createBranchLabel();
+            bind(node.expression);
+            var saveBreakTarget = currentBreakTarget;
+            var savePreSwitchCaseFlow = preSwitchCaseFlow;
+            currentBreakTarget = postSwitchLabel;
+            preSwitchCaseFlow = currentFlow;
+            bind(node.caseBlock);
+            addAntecedent(postSwitchLabel, currentFlow);
+            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 272 /* DefaultClause */; });
+            // We mark a switch statement as possibly exhaustive if it has no default clause and if all
+            // case clauses have unreachable end points (e.g. they all return).
+            node.possiblyExhaustive = !hasDefault && !postSwitchLabel.antecedents;
+            if (!hasDefault) {
+                addAntecedent(postSwitchLabel, createFlowSwitchClause(preSwitchCaseFlow, node, 0, 0));
+            }
+            currentBreakTarget = saveBreakTarget;
+            preSwitchCaseFlow = savePreSwitchCaseFlow;
+            currentFlow = finishFlowLabel(postSwitchLabel);
+        }
+        function bindCaseBlock(node) {
+            var savedSubtreeTransformFlags = subtreeTransformFlags;
+            subtreeTransformFlags = 0;
+            var clauses = node.clauses;
+            var fallthroughFlow = unreachableFlow;
+            for (var i = 0; i < clauses.length; i++) {
+                var clauseStart = i;
+                while (!clauses[i].statements.length && i + 1 < clauses.length) {
+                    bind(clauses[i]);
+                    i++;
+                }
+                var preCaseLabel = createBranchLabel();
+                addAntecedent(preCaseLabel, createFlowSwitchClause(preSwitchCaseFlow, node.parent, clauseStart, i + 1));
+                addAntecedent(preCaseLabel, fallthroughFlow);
+                currentFlow = finishFlowLabel(preCaseLabel);
+                var clause = clauses[i];
+                bind(clause);
+                fallthroughFlow = currentFlow;
+                if (!(currentFlow.flags & 1 /* Unreachable */) && i !== clauses.length - 1 && options.noFallthroughCasesInSwitch) {
+                    errorOnFirstToken(clause, ts.Diagnostics.Fallthrough_case_in_switch);
+                }
+            }
+            clauses.transformFlags = subtreeTransformFlags | 536870912 /* HasComputedFlags */;
+            subtreeTransformFlags |= savedSubtreeTransformFlags;
+        }
+        function bindCaseClause(node) {
+            var saveCurrentFlow = currentFlow;
+            currentFlow = preSwitchCaseFlow;
+            bind(node.expression);
+            currentFlow = saveCurrentFlow;
+            bindEach(node.statements);
+        }
+        function pushActiveLabel(name, breakTarget, continueTarget) {
+            var activeLabel = {
+                name: name,
+                breakTarget: breakTarget,
+                continueTarget: continueTarget,
+                referenced: false
+            };
+            (activeLabels || (activeLabels = [])).push(activeLabel);
+            return activeLabel;
+        }
+        function popActiveLabel() {
+            activeLabels.pop();
+        }
+        function bindLabeledStatement(node) {
+            var preStatementLabel = createLoopLabel();
+            var postStatementLabel = createBranchLabel();
+            bind(node.label);
+            addAntecedent(preStatementLabel, currentFlow);
+            var activeLabel = pushActiveLabel(node.label.escapedText, postStatementLabel, preStatementLabel);
+            bind(node.statement);
+            popActiveLabel();
+            if (!activeLabel.referenced && !options.allowUnusedLabels) {
+                errorOrSuggestionOnNode(ts.unusedLabelIsError(options), node.label, ts.Diagnostics.Unused_label);
+            }
+            if (!node.statement || node.statement.kind !== 223 /* DoStatement */) {
+                // do statement sets current flow inside bindDoStatement
+                addAntecedent(postStatementLabel, currentFlow);
+                currentFlow = finishFlowLabel(postStatementLabel);
+            }
+        }
+        function bindDestructuringTargetFlow(node) {
+            if (node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 59 /* EqualsToken */) {
+                bindAssignmentTargetFlow(node.left);
+            }
+            else {
+                bindAssignmentTargetFlow(node);
+            }
+        }
+        function bindAssignmentTargetFlow(node) {
+            if (isNarrowableReference(node)) {
+                currentFlow = createFlowAssignment(currentFlow, node);
+            }
+            else if (node.kind === 187 /* ArrayLiteralExpression */) {
+                for (var _i = 0, _a = node.elements; _i < _a.length; _i++) {
+                    var e = _a[_i];
+                    if (e.kind === 208 /* SpreadElement */) {
+                        bindAssignmentTargetFlow(e.expression);
+                    }
+                    else {
+                        bindDestructuringTargetFlow(e);
+                    }
+                }
+            }
+            else if (node.kind === 188 /* ObjectLiteralExpression */) {
+                for (var _b = 0, _c = node.properties; _b < _c.length; _b++) {
+                    var p = _c[_b];
+                    if (p.kind === 275 /* PropertyAssignment */) {
+                        bindDestructuringTargetFlow(p.initializer);
+                    }
+                    else if (p.kind === 276 /* ShorthandPropertyAssignment */) {
+                        bindAssignmentTargetFlow(p.name);
+                    }
+                    else if (p.kind === 277 /* SpreadAssignment */) {
+                        bindAssignmentTargetFlow(p.expression);
+                    }
+                }
+            }
+        }
+        function bindLogicalExpression(node, trueTarget, falseTarget) {
+            var preRightLabel = createBranchLabel();
+            if (node.operatorToken.kind === 54 /* AmpersandAmpersandToken */) {
+                bindCondition(node.left, preRightLabel, falseTarget);
+            }
+            else {
+                bindCondition(node.left, trueTarget, preRightLabel);
+            }
+            currentFlow = finishFlowLabel(preRightLabel);
+            bind(node.operatorToken);
+            bindCondition(node.right, trueTarget, falseTarget);
+        }
+        function bindPrefixUnaryExpressionFlow(node) {
+            if (node.operator === 52 /* ExclamationToken */) {
+                var saveTrueTarget = currentTrueTarget;
+                currentTrueTarget = currentFalseTarget;
+                currentFalseTarget = saveTrueTarget;
+                bindEachChild(node);
+                currentFalseTarget = currentTrueTarget;
+                currentTrueTarget = saveTrueTarget;
+            }
+            else {
+                bindEachChild(node);
+                if (node.operator === 44 /* PlusPlusToken */ || node.operator === 45 /* MinusMinusToken */) {
+                    bindAssignmentTargetFlow(node.operand);
+                }
+            }
+        }
+        function bindPostfixUnaryExpressionFlow(node) {
+            bindEachChild(node);
+            if (node.operator === 44 /* PlusPlusToken */ || node.operator === 45 /* MinusMinusToken */) {
+                bindAssignmentTargetFlow(node.operand);
+            }
+        }
+        function bindBinaryExpressionFlow(node) {
+            var operator = node.operatorToken.kind;
+            if (operator === 54 /* AmpersandAmpersandToken */ || operator === 55 /* BarBarToken */) {
+                if (isTopLevelLogicalExpression(node)) {
+                    var postExpressionLabel = createBranchLabel();
+                    bindLogicalExpression(node, postExpressionLabel, postExpressionLabel);
+                    currentFlow = finishFlowLabel(postExpressionLabel);
+                }
+                else {
+                    bindLogicalExpression(node, currentTrueTarget, currentFalseTarget);
+                }
+            }
+            else {
+                bindEachChild(node);
+                if (ts.isAssignmentOperator(operator) && !ts.isAssignmentTarget(node)) {
+                    bindAssignmentTargetFlow(node.left);
+                    if (operator === 59 /* EqualsToken */ && node.left.kind === 190 /* ElementAccessExpression */) {
+                        var elementAccess = node.left;
+                        if (isNarrowableOperand(elementAccess.expression)) {
+                            currentFlow = createFlowArrayMutation(currentFlow, node);
+                        }
+                    }
+                }
+            }
+        }
+        function bindDeleteExpressionFlow(node) {
+            bindEachChild(node);
+            if (node.expression.kind === 189 /* PropertyAccessExpression */) {
+                bindAssignmentTargetFlow(node.expression);
+            }
+        }
+        function bindConditionalExpressionFlow(node) {
+            var trueLabel = createBranchLabel();
+            var falseLabel = createBranchLabel();
+            var postExpressionLabel = createBranchLabel();
+            bindCondition(node.condition, trueLabel, falseLabel);
+            currentFlow = finishFlowLabel(trueLabel);
+            bind(node.questionToken);
+            bind(node.whenTrue);
+            addAntecedent(postExpressionLabel, currentFlow);
+            currentFlow = finishFlowLabel(falseLabel);
+            bind(node.colonToken);
+            bind(node.whenFalse);
+            addAntecedent(postExpressionLabel, currentFlow);
+            currentFlow = finishFlowLabel(postExpressionLabel);
+        }
+        function bindInitializedVariableFlow(node) {
+            var name = !ts.isOmittedExpression(node) ? node.name : undefined;
+            if (ts.isBindingPattern(name)) {
+                for (var _i = 0, _a = name.elements; _i < _a.length; _i++) {
+                    var child = _a[_i];
+                    bindInitializedVariableFlow(child);
+                }
+            }
+            else {
+                currentFlow = createFlowAssignment(currentFlow, node);
+            }
+        }
+        function bindVariableDeclarationFlow(node) {
+            bindEachChild(node);
+            if (node.initializer || ts.isForInOrOfStatement(node.parent.parent)) {
+                bindInitializedVariableFlow(node);
+            }
+        }
+        function bindJSDocTypeAlias(node) {
+            node.tagName.parent = node;
+            if (node.fullName) {
+                setParentPointers(node, node.fullName);
+            }
+        }
+        function bindCallExpressionFlow(node) {
+            // If the target of the call expression is a function expression or arrow function we have
+            // an immediately invoked function expression (IIFE). Initialize the flowNode property to
+            // the current control flow (which includes evaluation of the IIFE arguments).
+            var expr = node.expression;
+            while (expr.kind === 195 /* ParenthesizedExpression */) {
+                expr = expr.expression;
+            }
+            if (expr.kind === 196 /* FunctionExpression */ || expr.kind === 197 /* ArrowFunction */) {
+                bindEach(node.typeArguments);
+                bindEach(node.arguments);
+                bind(node.expression);
+            }
+            else {
+                bindEachChild(node);
+            }
+            if (node.expression.kind === 189 /* PropertyAccessExpression */) {
+                var propertyAccess = node.expression;
+                if (isNarrowableOperand(propertyAccess.expression) && ts.isPushOrUnshiftIdentifier(propertyAccess.name)) {
+                    currentFlow = createFlowArrayMutation(currentFlow, node);
+                }
+            }
+        }
+        function getContainerFlags(node) {
+            switch (node.kind) {
+                case 209 /* ClassExpression */:
+                case 240 /* ClassDeclaration */:
+                case 243 /* EnumDeclaration */:
+                case 188 /* ObjectLiteralExpression */:
+                case 168 /* TypeLiteral */:
+                case 292 /* JSDocTypeLiteral */:
+                case 268 /* JsxAttributes */:
+                    return 1 /* IsContainer */;
+                case 241 /* InterfaceDeclaration */:
+                    return 1 /* IsContainer */ | 64 /* IsInterface */;
+                case 244 /* ModuleDeclaration */:
+                case 242 /* TypeAliasDeclaration */:
+                case 181 /* MappedType */:
+                    return 1 /* IsContainer */ | 32 /* HasLocals */;
+                case 279 /* SourceFile */:
+                    return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */;
+                case 156 /* MethodDeclaration */:
+                    if (ts.isObjectLiteralOrClassExpressionMethod(node)) {
+                        return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 128 /* IsObjectLiteralOrClassExpressionMethod */;
+                    }
+                // falls through
+                case 157 /* Constructor */:
+                case 239 /* FunctionDeclaration */:
+                case 155 /* MethodSignature */:
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                case 160 /* CallSignature */:
+                case 293 /* JSDocSignature */:
+                case 289 /* JSDocFunctionType */:
+                case 165 /* FunctionType */:
+                case 161 /* ConstructSignature */:
+                case 162 /* IndexSignature */:
+                case 166 /* ConstructorType */:
+                    return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */;
+                case 196 /* FunctionExpression */:
+                case 197 /* ArrowFunction */:
+                    return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 16 /* IsFunctionExpression */;
+                case 245 /* ModuleBlock */:
+                    return 4 /* IsControlFlowContainer */;
+                case 154 /* PropertyDeclaration */:
+                    return node.initializer ? 4 /* IsControlFlowContainer */ : 0;
+                case 274 /* CatchClause */:
+                case 225 /* ForStatement */:
+                case 226 /* ForInStatement */:
+                case 227 /* ForOfStatement */:
+                case 246 /* CaseBlock */:
+                    return 2 /* IsBlockScopedContainer */;
+                case 218 /* Block */:
+                    // do not treat blocks directly inside a function as a block-scoped-container.
+                    // Locals that reside in this block should go to the function locals. Otherwise 'x'
+                    // would not appear to be a redeclaration of a block scoped local in the following
+                    // example:
+                    //
+                    //      function foo() {
+                    //          var x;
+                    //          let x;
+                    //      }
+                    //
+                    // If we placed 'var x' into the function locals and 'let x' into the locals of
+                    // the block, then there would be no collision.
+                    //
+                    // By not creating a new block-scoped-container here, we ensure that both 'var x'
+                    // and 'let x' go into the Function-container's locals, and we do get a collision
+                    // conflict.
+                    return ts.isFunctionLike(node.parent) ? 0 /* None */ : 2 /* IsBlockScopedContainer */;
+            }
+            return 0 /* None */;
+        }
+        function addToContainerChain(next) {
+            if (lastContainer) {
+                lastContainer.nextContainer = next;
+            }
+            lastContainer = next;
+        }
+        function declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes) {
+            switch (container.kind) {
+                // Modules, source files, and classes need specialized handling for how their
+                // members are declared (for example, a member of a class will go into a specific
+                // symbol table depending on if it is static or not). We defer to specialized
+                // handlers to take care of declaring these child members.
+                case 244 /* ModuleDeclaration */:
+                    return declareModuleMember(node, symbolFlags, symbolExcludes);
+                case 279 /* SourceFile */:
+                    return declareSourceFileMember(node, symbolFlags, symbolExcludes);
+                case 209 /* ClassExpression */:
+                case 240 /* ClassDeclaration */:
+                    return declareClassMember(node, symbolFlags, symbolExcludes);
+                case 243 /* EnumDeclaration */:
+                    return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
+                case 168 /* TypeLiteral */:
+                case 292 /* JSDocTypeLiteral */:
+                case 188 /* ObjectLiteralExpression */:
+                case 241 /* InterfaceDeclaration */:
+                case 268 /* JsxAttributes */:
+                    // Interface/Object-types always have their children added to the 'members' of
+                    // their container. They are only accessible through an instance of their
+                    // container, and are never in scope otherwise (even inside the body of the
+                    // object / type / interface declaring them). An exception is type parameters,
+                    // which are in scope without qualification (similar to 'locals').
+                    return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
+                case 165 /* FunctionType */:
+                case 166 /* ConstructorType */:
+                case 160 /* CallSignature */:
+                case 161 /* ConstructSignature */:
+                case 293 /* JSDocSignature */:
+                case 162 /* IndexSignature */:
+                case 156 /* MethodDeclaration */:
+                case 155 /* MethodSignature */:
+                case 157 /* Constructor */:
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                case 239 /* FunctionDeclaration */:
+                case 196 /* FunctionExpression */:
+                case 197 /* ArrowFunction */:
+                case 289 /* JSDocFunctionType */:
+                case 304 /* JSDocTypedefTag */:
+                case 297 /* JSDocCallbackTag */:
+                case 242 /* TypeAliasDeclaration */:
+                case 181 /* MappedType */:
+                    // All the children of these container types are never visible through another
+                    // symbol (i.e. through another symbol's 'exports' or 'members').  Instead,
+                    // they're only accessed 'lexically' (i.e. from code that exists underneath
+                    // their container in the tree). To accomplish this, we simply add their declared
+                    // symbol to the 'locals' of the container.  These symbols can then be found as
+                    // the type checker walks up the containers, checking them for matching names.
+                    return declareSymbol(container.locals, /*parent*/ undefined, node, symbolFlags, symbolExcludes);
+            }
+        }
+        function declareClassMember(node, symbolFlags, symbolExcludes) {
+            return ts.hasModifier(node, 32 /* Static */)
+                ? declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes)
+                : declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
+        }
+        function declareSourceFileMember(node, symbolFlags, symbolExcludes) {
+            return ts.isExternalModule(file)
+                ? declareModuleMember(node, symbolFlags, symbolExcludes)
+                : declareSymbol(file.locals, /*parent*/ undefined, node, symbolFlags, symbolExcludes);
+        }
+        function hasExportDeclarations(node) {
+            var body = node.kind === 279 /* SourceFile */ ? node : node.body;
+            if (body && (body.kind === 279 /* SourceFile */ || body.kind === 245 /* ModuleBlock */)) {
+                for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
+                    var stat = _a[_i];
+                    if (stat.kind === 255 /* ExportDeclaration */ || stat.kind === 254 /* ExportAssignment */) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        function setExportContextFlag(node) {
+            // A declaration source file or ambient module declaration that contains no export declarations (but possibly regular
+            // declarations with export modifiers) is an export context in which declarations are implicitly exported.
+            if (node.flags & 4194304 /* Ambient */ && !hasExportDeclarations(node)) {
+                node.flags |= 32 /* ExportContext */;
+            }
+            else {
+                node.flags &= ~32 /* ExportContext */;
+            }
+        }
+        function bindModuleDeclaration(node) {
+            setExportContextFlag(node);
+            if (ts.isAmbientModule(node)) {
+                if (ts.hasModifier(node, 1 /* Export */)) {
+                    errorOnFirstToken(node, ts.Diagnostics.export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always_visible);
+                }
+                if (ts.isModuleAugmentationExternal(node)) {
+                    declareModuleSymbol(node);
+                }
+                else {
+                    var pattern = void 0;
+                    if (node.name.kind === 10 /* StringLiteral */) {
+                        var text = node.name.text;
+                        if (ts.hasZeroOrOneAsteriskCharacter(text)) {
+                            pattern = ts.tryParsePattern(text);
+                        }
+                        else {
+                            errorOnFirstToken(node.name, ts.Diagnostics.Pattern_0_can_have_at_most_one_Asterisk_character, text);
+                        }
+                    }
+                    var symbol = declareSymbolAndAddToSymbolTable(node, 512 /* ValueModule */, 110735 /* ValueModuleExcludes */);
+                    file.patternAmbientModules = ts.append(file.patternAmbientModules, pattern && { pattern: pattern, symbol: symbol });
+                }
+            }
+            else {
+                var state = declareModuleSymbol(node);
+                if (state !== 0 /* NonInstantiated */) {
+                    var symbol = node.symbol;
+                    // if module was already merged with some function, class or non-const enum, treat it as non-const-enum-only
+                    symbol.constEnumOnlyModule = (!(symbol.flags & (16 /* Function */ | 32 /* Class */ | 256 /* RegularEnum */)))
+                        // Current must be `const enum` only
+                        && state === 2 /* ConstEnumOnly */
+                        // Can't have been set to 'false' in a previous merged symbol. ('undefined' OK)
+                        && symbol.constEnumOnlyModule !== false;
+                }
+            }
+        }
+        function declareModuleSymbol(node) {
+            var state = getModuleInstanceState(node);
+            var instantiated = state !== 0 /* NonInstantiated */;
+            declareSymbolAndAddToSymbolTable(node, instantiated ? 512 /* ValueModule */ : 1024 /* NamespaceModule */, instantiated ? 110735 /* ValueModuleExcludes */ : 0 /* NamespaceModuleExcludes */);
+            return state;
+        }
+        function bindFunctionOrConstructorType(node) {
+            // For a given function symbol "<...>(...) => T" we want to generate a symbol identical
+            // to the one we would get for: { <...>(...): T }
+            //
+            // We do that by making an anonymous type literal symbol, and then setting the function
+            // symbol as its sole member. To the rest of the system, this symbol will be indistinguishable
+            // from an actual type literal symbol you would have gotten had you used the long form.
+            var symbol = createSymbol(131072 /* Signature */, getDeclarationName(node)); // TODO: GH#18217
+            addDeclarationToSymbol(symbol, node, 131072 /* Signature */);
+            var typeLiteralSymbol = createSymbol(2048 /* TypeLiteral */, "__type" /* Type */);
+            addDeclarationToSymbol(typeLiteralSymbol, node, 2048 /* TypeLiteral */);
+            typeLiteralSymbol.members = ts.createSymbolTable();
+            typeLiteralSymbol.members.set(symbol.escapedName, symbol);
+        }
+        function bindObjectLiteralExpression(node) {
+            var ElementKind;
+            (function (ElementKind) {
+                ElementKind[ElementKind["Property"] = 1] = "Property";
+                ElementKind[ElementKind["Accessor"] = 2] = "Accessor";
+            })(ElementKind || (ElementKind = {}));
+            if (inStrictMode) {
+                var seen = ts.createUnderscoreEscapedMap();
+                for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
+                    var prop = _a[_i];
+                    if (prop.kind === 277 /* SpreadAssignment */ || prop.name.kind !== 72 /* Identifier */) {
+                        continue;
+                    }
+                    var identifier = prop.name;
+                    // ECMA-262 11.1.5 Object Initializer
+                    // If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true
+                    // a.This production is contained in strict code and IsDataDescriptor(previous) is true and
+                    // IsDataDescriptor(propId.descriptor) is true.
+                    //    b.IsDataDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true.
+                    //    c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true.
+                    //    d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true
+                    // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
+                    var currentKind = prop.kind === 275 /* PropertyAssignment */ || prop.kind === 276 /* ShorthandPropertyAssignment */ || prop.kind === 156 /* MethodDeclaration */
+                        ? 1 /* Property */
+                        : 2 /* Accessor */;
+                    var existingKind = seen.get(identifier.escapedText);
+                    if (!existingKind) {
+                        seen.set(identifier.escapedText, currentKind);
+                        continue;
+                    }
+                    if (currentKind === 1 /* Property */ && existingKind === 1 /* Property */) {
+                        var span = ts.getErrorSpanForNode(file, identifier);
+                        file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode));
+                    }
+                }
+            }
+            return bindAnonymousDeclaration(node, 4096 /* ObjectLiteral */, "__object" /* Object */);
+        }
+        function bindJsxAttributes(node) {
+            return bindAnonymousDeclaration(node, 4096 /* ObjectLiteral */, "__jsxAttributes" /* JSXAttributes */);
+        }
+        function bindJsxAttribute(node, symbolFlags, symbolExcludes) {
+            return declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes);
+        }
+        function bindAnonymousDeclaration(node, symbolFlags, name) {
+            var symbol = createSymbol(symbolFlags, name);
+            if (symbolFlags & (8 /* EnumMember */ | 106500 /* ClassMember */)) {
+                symbol.parent = container.symbol;
+            }
+            addDeclarationToSymbol(symbol, node, symbolFlags);
+            return symbol;
+        }
+        function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
+            switch (blockScopeContainer.kind) {
+                case 244 /* ModuleDeclaration */:
+                    declareModuleMember(node, symbolFlags, symbolExcludes);
+                    break;
+                case 279 /* SourceFile */:
+                    if (ts.isExternalOrCommonJsModule(container)) {
+                        declareModuleMember(node, symbolFlags, symbolExcludes);
+                        break;
+                    }
+                // falls through
+                default:
+                    if (!blockScopeContainer.locals) {
+                        blockScopeContainer.locals = ts.createSymbolTable();
+                        addToContainerChain(blockScopeContainer);
+                    }
+                    declareSymbol(blockScopeContainer.locals, /*parent*/ undefined, node, symbolFlags, symbolExcludes);
+            }
+        }
+        function delayedBindJSDocTypedefTag() {
+            if (!delayedTypeAliases) {
+                return;
+            }
+            var saveContainer = container;
+            var saveLastContainer = lastContainer;
+            var saveBlockScopeContainer = blockScopeContainer;
+            var saveParent = parent;
+            var saveCurrentFlow = currentFlow;
+            for (var _i = 0, delayedTypeAliases_1 = delayedTypeAliases; _i < delayedTypeAliases_1.length; _i++) {
+                var typeAlias = delayedTypeAliases_1[_i];
+                var host = ts.getJSDocHost(typeAlias);
+                container = ts.findAncestor(host.parent, function (n) { return !!(getContainerFlags(n) & 1 /* IsContainer */); }) || file;
+                blockScopeContainer = ts.getEnclosingBlockScopeContainer(host) || file;
+                currentFlow = { flags: 2 /* Start */ };
+                parent = typeAlias;
+                bind(typeAlias.typeExpression);
+                if (!typeAlias.fullName || typeAlias.fullName.kind === 72 /* Identifier */) {
+                    parent = typeAlias.parent;
+                    bindBlockScopedDeclaration(typeAlias, 524288 /* TypeAlias */, 67897832 /* TypeAliasExcludes */);
+                }
+                else {
+                    bind(typeAlias.fullName);
+                }
+            }
+            container = saveContainer;
+            lastContainer = saveLastContainer;
+            blockScopeContainer = saveBlockScopeContainer;
+            parent = saveParent;
+            currentFlow = saveCurrentFlow;
+        }
+        // The binder visits every node in the syntax tree so it is a convenient place to perform a single localized
+        // check for reserved words used as identifiers in strict mode code.
+        function checkStrictModeIdentifier(node) {
+            if (inStrictMode &&
+                node.originalKeywordKind >= 109 /* FirstFutureReservedWord */ &&
+                node.originalKeywordKind <= 117 /* LastFutureReservedWord */ &&
+                !ts.isIdentifierName(node) &&
+                !(node.flags & 4194304 /* Ambient */)) {
+                // Report error only if there are no parse errors in file
+                if (!file.parseDiagnostics.length) {
+                    file.bindDiagnostics.push(createDiagnosticForNode(node, getStrictModeIdentifierMessage(node), ts.declarationNameToString(node)));
+                }
+            }
+        }
+        function getStrictModeIdentifierMessage(node) {
+            // Provide specialized messages to help the user understand why we think they're in
+            // strict mode.
+            if (ts.getContainingClass(node)) {
+                return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode;
+            }
+            if (file.externalModuleIndicator) {
+                return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode;
+            }
+            return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode;
+        }
+        function checkStrictModeBinaryExpression(node) {
+            if (inStrictMode && ts.isLeftHandSideExpression(node.left) && ts.isAssignmentOperator(node.operatorToken.kind)) {
+                // ECMA 262 (Annex C) The identifier eval or arguments may not appear as the LeftHandSideExpression of an
+                // Assignment operator(11.13) or of a PostfixExpression(11.3)
+                checkStrictModeEvalOrArguments(node, node.left);
+            }
+        }
+        function checkStrictModeCatchClause(node) {
+            // It is a SyntaxError if a TryStatement with a Catch occurs within strict code and the Identifier of the
+            // Catch production is eval or arguments
+            if (inStrictMode && node.variableDeclaration) {
+                checkStrictModeEvalOrArguments(node, node.variableDeclaration.name);
+            }
+        }
+        function checkStrictModeDeleteExpression(node) {
+            // Grammar checking
+            if (inStrictMode && node.expression.kind === 72 /* Identifier */) {
+                // When a delete operator occurs within strict mode code, a SyntaxError is thrown if its
+                // UnaryExpression is a direct reference to a variable, function argument, or function name
+                var span = ts.getErrorSpanForNode(file, node.expression);
+                file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.delete_cannot_be_called_on_an_identifier_in_strict_mode));
+            }
+        }
+        function isEvalOrArgumentsIdentifier(node) {
+            return ts.isIdentifier(node) && (node.escapedText === "eval" || node.escapedText === "arguments");
+        }
+        function checkStrictModeEvalOrArguments(contextNode, name) {
+            if (name && name.kind === 72 /* Identifier */) {
+                var identifier = name;
+                if (isEvalOrArgumentsIdentifier(identifier)) {
+                    // We check first if the name is inside class declaration or class expression; if so give explicit message
+                    // otherwise report generic error message.
+                    var span = ts.getErrorSpanForNode(file, name);
+                    file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, getStrictModeEvalOrArgumentsMessage(contextNode), ts.idText(identifier)));
+                }
+            }
+        }
+        function getStrictModeEvalOrArgumentsMessage(node) {
+            // Provide specialized messages to help the user understand why we think they're in
+            // strict mode.
+            if (ts.getContainingClass(node)) {
+                return ts.Diagnostics.Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode;
+            }
+            if (file.externalModuleIndicator) {
+                return ts.Diagnostics.Invalid_use_of_0_Modules_are_automatically_in_strict_mode;
+            }
+            return ts.Diagnostics.Invalid_use_of_0_in_strict_mode;
+        }
+        function checkStrictModeFunctionName(node) {
+            if (inStrictMode) {
+                // It is a SyntaxError if the identifier eval or arguments appears within a FormalParameterList of a strict mode FunctionDeclaration or FunctionExpression (13.1))
+                checkStrictModeEvalOrArguments(node, node.name);
+            }
+        }
+        function getStrictModeBlockScopeFunctionDeclarationMessage(node) {
+            // Provide specialized messages to help the user understand why we think they're in
+            // strict mode.
+            if (ts.getContainingClass(node)) {
+                return ts.Diagnostics.Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5_Class_definitions_are_automatically_in_strict_mode;
+            }
+            if (file.externalModuleIndicator) {
+                return ts.Diagnostics.Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5_Modules_are_automatically_in_strict_mode;
+            }
+            return ts.Diagnostics.Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5;
+        }
+        function checkStrictModeFunctionDeclaration(node) {
+            if (languageVersion < 2 /* ES2015 */) {
+                // Report error if function is not top level function declaration
+                if (blockScopeContainer.kind !== 279 /* SourceFile */ &&
+                    blockScopeContainer.kind !== 244 /* ModuleDeclaration */ &&
+                    !ts.isFunctionLike(blockScopeContainer)) {
+                    // We check first if the name is inside class declaration or class expression; if so give explicit message
+                    // otherwise report generic error message.
+                    var errorSpan = ts.getErrorSpanForNode(file, node);
+                    file.bindDiagnostics.push(ts.createFileDiagnostic(file, errorSpan.start, errorSpan.length, getStrictModeBlockScopeFunctionDeclarationMessage(node)));
+                }
+            }
+        }
+        function checkStrictModeNumericLiteral(node) {
+            if (inStrictMode && node.numericLiteralFlags & 32 /* Octal */) {
+                file.bindDiagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode));
+            }
+        }
+        function checkStrictModePostfixUnaryExpression(node) {
+            // Grammar checking
+            // The identifier eval or arguments may not appear as the LeftHandSideExpression of an
+            // Assignment operator(11.13) or of a PostfixExpression(11.3) or as the UnaryExpression
+            // operated upon by a Prefix Increment(11.4.4) or a Prefix Decrement(11.4.5) operator.
+            if (inStrictMode) {
+                checkStrictModeEvalOrArguments(node, node.operand);
+            }
+        }
+        function checkStrictModePrefixUnaryExpression(node) {
+            // Grammar checking
+            if (inStrictMode) {
+                if (node.operator === 44 /* PlusPlusToken */ || node.operator === 45 /* MinusMinusToken */) {
+                    checkStrictModeEvalOrArguments(node, node.operand);
+                }
+            }
+        }
+        function checkStrictModeWithStatement(node) {
+            // Grammar checking for withStatement
+            if (inStrictMode) {
+                errorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_strict_mode);
+            }
+        }
+        function checkStrictModeLabeledStatement(node) {
+            // Grammar checking for labeledStatement
+            if (inStrictMode && options.target >= 2 /* ES2015 */) {
+                if (ts.isDeclarationStatement(node.statement) || ts.isVariableStatement(node.statement)) {
+                    errorOnFirstToken(node.label, ts.Diagnostics.A_label_is_not_allowed_here);
+                }
+            }
+        }
+        function errorOnFirstToken(node, message, arg0, arg1, arg2) {
+            var span = ts.getSpanOfTokenAtPosition(file, node.pos);
+            file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, message, arg0, arg1, arg2));
+        }
+        function errorOrSuggestionOnNode(isError, node, message) {
+            errorOrSuggestionOnRange(isError, node, node, message);
+        }
+        function errorOrSuggestionOnRange(isError, startNode, endNode, message) {
+            addErrorOrSuggestionDiagnostic(isError, { pos: ts.getTokenPosOfNode(startNode, file), end: endNode.end }, message);
+        }
+        function addErrorOrSuggestionDiagnostic(isError, range, message) {
+            var diag = ts.createFileDiagnostic(file, range.pos, range.end - range.pos, message);
+            if (isError) {
+                file.bindDiagnostics.push(diag);
+            }
+            else {
+                file.bindSuggestionDiagnostics = ts.append(file.bindSuggestionDiagnostics, __assign({}, diag, { category: ts.DiagnosticCategory.Suggestion }));
+            }
+        }
+        function bind(node) {
+            if (!node) {
+                return;
+            }
+            node.parent = parent;
+            var saveInStrictMode = inStrictMode;
+            // Even though in the AST the jsdoc @typedef node belongs to the current node,
+            // its symbol might be in the same scope with the current node's symbol. Consider:
+            //
+            //     /** @typedef {string | number} MyType */
+            //     function foo();
+            //
+            // Here the current node is "foo", which is a container, but the scope of "MyType" should
+            // not be inside "foo". Therefore we always bind @typedef before bind the parent node,
+            // and skip binding this tag later when binding all the other jsdoc tags.
+            // First we bind declaration nodes to a symbol if possible. We'll both create a symbol
+            // and then potentially add the symbol to an appropriate symbol table. Possible
+            // destination symbol tables are:
+            //
+            //  1) The 'exports' table of the current container's symbol.
+            //  2) The 'members' table of the current container's symbol.
+            //  3) The 'locals' table of the current container.
+            //
+            // However, not all symbols will end up in any of these tables. 'Anonymous' symbols
+            // (like TypeLiterals for example) will not be put in any table.
+            bindWorker(node);
+            // Then we recurse into the children of the node to bind them as well. For certain
+            // symbols we do specialized work when we recurse. For example, we'll keep track of
+            // the current 'container' node when it changes. This helps us know which symbol table
+            // a local should go into for example. Since terminal nodes are known not to have
+            // children, as an optimization we don't process those.
+            if (node.kind > 147 /* LastToken */) {
+                var saveParent = parent;
+                parent = node;
+                var containerFlags = getContainerFlags(node);
+                if (containerFlags === 0 /* None */) {
+                    bindChildren(node);
+                }
+                else {
+                    bindContainer(node, containerFlags);
+                }
+                parent = saveParent;
+            }
+            else if (!skipTransformFlagAggregation && (node.transformFlags & 536870912 /* HasComputedFlags */) === 0) {
+                subtreeTransformFlags |= computeTransformFlagsForNode(node, 0);
+                var saveParent = parent;
+                if (node.kind === 1 /* EndOfFileToken */)
+                    parent = node;
+                bindJSDoc(node);
+                parent = saveParent;
+            }
+            inStrictMode = saveInStrictMode;
+        }
+        function bindJSDoc(node) {
+            if (ts.hasJSDocNodes(node)) {
+                if (ts.isInJSFile(node)) {
+                    for (var _i = 0, _a = node.jsDoc; _i < _a.length; _i++) {
+                        var j = _a[_i];
+                        bind(j);
+                    }
+                }
+                else {
+                    for (var _b = 0, _c = node.jsDoc; _b < _c.length; _b++) {
+                        var j = _c[_b];
+                        setParentPointers(node, j);
+                    }
+                }
+            }
+        }
+        function updateStrictModeStatementList(statements) {
+            if (!inStrictMode) {
+                for (var _i = 0, statements_1 = statements; _i < statements_1.length; _i++) {
+                    var statement = statements_1[_i];
+                    if (!ts.isPrologueDirective(statement)) {
+                        return;
+                    }
+                    if (isUseStrictPrologueDirective(statement)) {
+                        inStrictMode = true;
+                        return;
+                    }
+                }
+            }
+        }
+        /// Should be called only on prologue directives (isPrologueDirective(node) should be true)
+        function isUseStrictPrologueDirective(node) {
+            var nodeText = ts.getSourceTextOfNodeFromSourceFile(file, node.expression);
+            // Note: the node text must be exactly "use strict" or 'use strict'.  It is not ok for the
+            // string to contain unicode escapes (as per ES5).
+            return nodeText === '"use strict"' || nodeText === "'use strict'";
+        }
+        function bindWorker(node) {
+            switch (node.kind) {
+                /* Strict mode checks */
+                case 72 /* Identifier */:
+                    // for typedef type names with namespaces, bind the new jsdoc type symbol here
+                    // because it requires all containing namespaces to be in effect, namely the
+                    // current "blockScopeContainer" needs to be set to its immediate namespace parent.
+                    if (node.isInJSDocNamespace) {
+                        var parentNode = node.parent;
+                        while (parentNode && !ts.isJSDocTypeAlias(parentNode)) {
+                            parentNode = parentNode.parent;
+                        }
+                        bindBlockScopedDeclaration(parentNode, 524288 /* TypeAlias */, 67897832 /* TypeAliasExcludes */);
+                        break;
+                    }
+                // falls through
+                case 100 /* ThisKeyword */:
+                    if (currentFlow && (ts.isExpression(node) || parent.kind === 276 /* ShorthandPropertyAssignment */)) {
+                        node.flowNode = currentFlow;
+                    }
+                    return checkStrictModeIdentifier(node);
+                case 189 /* PropertyAccessExpression */:
+                case 190 /* ElementAccessExpression */:
+                    if (currentFlow && isNarrowableReference(node)) {
+                        node.flowNode = currentFlow;
+                    }
+                    if (ts.isSpecialPropertyDeclaration(node)) {
+                        bindSpecialPropertyDeclaration(node);
+                    }
+                    if (ts.isInJSFile(node) &&
+                        file.commonJsModuleIndicator &&
+                        ts.isModuleExportsPropertyAccessExpression(node) &&
+                        !lookupSymbolForNameWorker(blockScopeContainer, "module")) {
+                        declareSymbol(file.locals, /*parent*/ undefined, node.expression, 1 /* FunctionScopedVariable */ | 134217728 /* ModuleExports */, 67220414 /* FunctionScopedVariableExcludes */);
+                    }
+                    break;
+                case 204 /* BinaryExpression */:
+                    var specialKind = ts.getAssignmentDeclarationKind(node);
+                    switch (specialKind) {
+                        case 1 /* ExportsProperty */:
+                            bindExportsPropertyAssignment(node);
+                            break;
+                        case 2 /* ModuleExports */:
+                            bindModuleExportsAssignment(node);
+                            break;
+                        case 3 /* PrototypeProperty */:
+                            bindPrototypePropertyAssignment(node.left, node);
+                            break;
+                        case 6 /* Prototype */:
+                            bindPrototypeAssignment(node);
+                            break;
+                        case 4 /* ThisProperty */:
+                            bindThisPropertyAssignment(node);
+                            break;
+                        case 5 /* Property */:
+                            bindSpecialPropertyAssignment(node);
+                            break;
+                        case 0 /* None */:
+                            // Nothing to do
+                            break;
+                        default:
+                            ts.Debug.fail("Unknown binary expression special property assignment kind");
+                    }
+                    return checkStrictModeBinaryExpression(node);
+                case 274 /* CatchClause */:
+                    return checkStrictModeCatchClause(node);
+                case 198 /* DeleteExpression */:
+                    return checkStrictModeDeleteExpression(node);
+                case 8 /* NumericLiteral */:
+                    return checkStrictModeNumericLiteral(node);
+                case 203 /* PostfixUnaryExpression */:
+                    return checkStrictModePostfixUnaryExpression(node);
+                case 202 /* PrefixUnaryExpression */:
+                    return checkStrictModePrefixUnaryExpression(node);
+                case 231 /* WithStatement */:
+                    return checkStrictModeWithStatement(node);
+                case 233 /* LabeledStatement */:
+                    return checkStrictModeLabeledStatement(node);
+                case 178 /* ThisType */:
+                    seenThisKeyword = true;
+                    return;
+                case 163 /* TypePredicate */:
+                    break; // Binding the children will handle everything
+                case 150 /* TypeParameter */:
+                    return bindTypeParameter(node);
+                case 151 /* Parameter */:
+                    return bindParameter(node);
+                case 237 /* VariableDeclaration */:
+                    return bindVariableDeclarationOrBindingElement(node);
+                case 186 /* BindingElement */:
+                    node.flowNode = currentFlow;
+                    return bindVariableDeclarationOrBindingElement(node);
+                case 154 /* PropertyDeclaration */:
+                case 153 /* PropertySignature */:
+                    return bindPropertyWorker(node);
+                case 275 /* PropertyAssignment */:
+                case 276 /* ShorthandPropertyAssignment */:
+                    return bindPropertyOrMethodOrAccessor(node, 4 /* Property */, 0 /* PropertyExcludes */);
+                case 278 /* EnumMember */:
+                    return bindPropertyOrMethodOrAccessor(node, 8 /* EnumMember */, 68008959 /* EnumMemberExcludes */);
+                case 160 /* CallSignature */:
+                case 161 /* ConstructSignature */:
+                case 162 /* IndexSignature */:
+                    return declareSymbolAndAddToSymbolTable(node, 131072 /* Signature */, 0 /* None */);
+                case 156 /* MethodDeclaration */:
+                case 155 /* MethodSignature */:
+                    // If this is an ObjectLiteralExpression method, then it sits in the same space
+                    // as other properties in the object literal.  So we use SymbolFlags.PropertyExcludes
+                    // so that it will conflict with any other object literal members with the same
+                    // name.
+                    return bindPropertyOrMethodOrAccessor(node, 8192 /* Method */ | (node.questionToken ? 16777216 /* Optional */ : 0 /* None */), ts.isObjectLiteralMethod(node) ? 0 /* PropertyExcludes */ : 67212223 /* MethodExcludes */);
+                case 239 /* FunctionDeclaration */:
+                    return bindFunctionDeclaration(node);
+                case 157 /* Constructor */:
+                    return declareSymbolAndAddToSymbolTable(node, 16384 /* Constructor */, /*symbolExcludes:*/ 0 /* None */);
+                case 158 /* GetAccessor */:
+                    return bindPropertyOrMethodOrAccessor(node, 32768 /* GetAccessor */, 67154879 /* GetAccessorExcludes */);
+                case 159 /* SetAccessor */:
+                    return bindPropertyOrMethodOrAccessor(node, 65536 /* SetAccessor */, 67187647 /* SetAccessorExcludes */);
+                case 165 /* FunctionType */:
+                case 289 /* JSDocFunctionType */:
+                case 293 /* JSDocSignature */:
+                case 166 /* ConstructorType */:
+                    return bindFunctionOrConstructorType(node);
+                case 168 /* TypeLiteral */:
+                case 292 /* JSDocTypeLiteral */:
+                case 181 /* MappedType */:
+                    return bindAnonymousTypeWorker(node);
+                case 188 /* ObjectLiteralExpression */:
+                    return bindObjectLiteralExpression(node);
+                case 196 /* FunctionExpression */:
+                case 197 /* ArrowFunction */:
+                    return bindFunctionExpression(node);
+                case 191 /* CallExpression */:
+                    var assignmentKind = ts.getAssignmentDeclarationKind(node);
+                    switch (assignmentKind) {
+                        case 7 /* ObjectDefinePropertyValue */:
+                            return bindObjectDefinePropertyAssignment(node);
+                        case 8 /* ObjectDefinePropertyExports */:
+                            return bindObjectDefinePropertyExport(node);
+                        case 9 /* ObjectDefinePrototypeProperty */:
+                            return bindObjectDefinePrototypeProperty(node);
+                        case 0 /* None */:
+                            break; // Nothing to do
+                        default:
+                            return ts.Debug.fail("Unknown call expression assignment declaration kind");
+                    }
+                    if (ts.isInJSFile(node)) {
+                        bindCallExpression(node);
+                    }
+                    break;
+                // Members of classes, interfaces, and modules
+                case 209 /* ClassExpression */:
+                case 240 /* ClassDeclaration */:
+                    // All classes are automatically in strict mode in ES6.
+                    inStrictMode = true;
+                    return bindClassLikeDeclaration(node);
+                case 241 /* InterfaceDeclaration */:
+                    return bindBlockScopedDeclaration(node, 64 /* Interface */, 67897736 /* InterfaceExcludes */);
+                case 242 /* TypeAliasDeclaration */:
+                    return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 67897832 /* TypeAliasExcludes */);
+                case 243 /* EnumDeclaration */:
+                    return bindEnumDeclaration(node);
+                case 244 /* ModuleDeclaration */:
+                    return bindModuleDeclaration(node);
+                // Jsx-attributes
+                case 268 /* JsxAttributes */:
+                    return bindJsxAttributes(node);
+                case 267 /* JsxAttribute */:
+                    return bindJsxAttribute(node, 4 /* Property */, 0 /* PropertyExcludes */);
+                // Imports and exports
+                case 248 /* ImportEqualsDeclaration */:
+                case 251 /* NamespaceImport */:
+                case 253 /* ImportSpecifier */:
+                case 257 /* ExportSpecifier */:
+                    return declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
+                case 247 /* NamespaceExportDeclaration */:
+                    return bindNamespaceExportDeclaration(node);
+                case 250 /* ImportClause */:
+                    return bindImportClause(node);
+                case 255 /* ExportDeclaration */:
+                    return bindExportDeclaration(node);
+                case 254 /* ExportAssignment */:
+                    return bindExportAssignment(node);
+                case 279 /* SourceFile */:
+                    updateStrictModeStatementList(node.statements);
+                    return bindSourceFileIfExternalModule();
+                case 218 /* Block */:
+                    if (!ts.isFunctionLike(node.parent)) {
+                        return;
+                    }
+                // falls through
+                case 245 /* ModuleBlock */:
+                    return updateStrictModeStatementList(node.statements);
+                case 299 /* JSDocParameterTag */:
+                    if (node.parent.kind === 293 /* JSDocSignature */) {
+                        return bindParameter(node);
+                    }
+                    if (node.parent.kind !== 292 /* JSDocTypeLiteral */) {
+                        break;
+                    }
+                // falls through
+                case 305 /* JSDocPropertyTag */:
+                    var propTag = node;
+                    var flags = propTag.isBracketed || propTag.typeExpression && propTag.typeExpression.type.kind === 288 /* JSDocOptionalType */ ?
+                        4 /* Property */ | 16777216 /* Optional */ :
+                        4 /* Property */;
+                    return declareSymbolAndAddToSymbolTable(propTag, flags, 0 /* PropertyExcludes */);
+                case 304 /* JSDocTypedefTag */:
+                case 297 /* JSDocCallbackTag */:
+                    return (delayedTypeAliases || (delayedTypeAliases = [])).push(node);
+            }
+        }
+        function bindPropertyWorker(node) {
+            return bindPropertyOrMethodOrAccessor(node, 4 /* Property */ | (node.questionToken ? 16777216 /* Optional */ : 0 /* None */), 0 /* PropertyExcludes */);
+        }
+        function bindAnonymousTypeWorker(node) {
+            return bindAnonymousDeclaration(node, 2048 /* TypeLiteral */, "__type" /* Type */);
+        }
+        function bindSourceFileIfExternalModule() {
+            setExportContextFlag(file);
+            if (ts.isExternalModule(file)) {
+                bindSourceFileAsExternalModule();
+            }
+            else if (ts.isJsonSourceFile(file)) {
+                bindSourceFileAsExternalModule();
+                // Create symbol equivalent for the module.exports = {}
+                var originalSymbol = file.symbol;
+                declareSymbol(file.symbol.exports, file.symbol, file, 4 /* Property */, 67108863 /* All */);
+                file.symbol = originalSymbol;
+            }
+        }
+        function bindSourceFileAsExternalModule() {
+            bindAnonymousDeclaration(file, 512 /* ValueModule */, "\"" + ts.removeFileExtension(file.fileName) + "\"");
+        }
+        function bindExportAssignment(node) {
+            if (!container.symbol || !container.symbol.exports) {
+                // Export assignment in some sort of block construct
+                bindAnonymousDeclaration(node, 2097152 /* Alias */, getDeclarationName(node));
+            }
+            else {
+                var flags = ts.exportAssignmentIsAlias(node)
+                    // An export default clause with an EntityNameExpression or a class expression exports all meanings of that identifier or expression;
+                    ? 2097152 /* Alias */
+                    // An export default clause with any other expression exports a value
+                    : 4 /* Property */;
+                // If there is an `export default x;` alias declaration, can't `export default` anything else.
+                // (In contrast, you can still have `export default function f() {}` and `export default interface I {}`.)
+                var symbol = declareSymbol(container.symbol.exports, container.symbol, node, flags, 67108863 /* All */);
+                if (node.isExportEquals) {
+                    // Will be an error later, since the module already has other exports. Just make sure this has a valueDeclaration set.
+                    setValueDeclaration(symbol, node);
+                }
+            }
+        }
+        function bindNamespaceExportDeclaration(node) {
+            if (node.modifiers && node.modifiers.length) {
+                file.bindDiagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.Modifiers_cannot_appear_here));
+            }
+            var diag = !ts.isSourceFile(node.parent) ? ts.Diagnostics.Global_module_exports_may_only_appear_at_top_level
+                : !ts.isExternalModule(node.parent) ? ts.Diagnostics.Global_module_exports_may_only_appear_in_module_files
+                    : !node.parent.isDeclarationFile ? ts.Diagnostics.Global_module_exports_may_only_appear_in_declaration_files
+                        : undefined;
+            if (diag) {
+                file.bindDiagnostics.push(createDiagnosticForNode(node, diag));
+            }
+            else {
+                file.symbol.globalExports = file.symbol.globalExports || ts.createSymbolTable();
+                declareSymbol(file.symbol.globalExports, file.symbol, node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
+            }
+        }
+        function bindExportDeclaration(node) {
+            if (!container.symbol || !container.symbol.exports) {
+                // Export * in some sort of block construct
+                bindAnonymousDeclaration(node, 8388608 /* ExportStar */, getDeclarationName(node));
+            }
+            else if (!node.exportClause) {
+                // All export * declarations are collected in an __export symbol
+                declareSymbol(container.symbol.exports, container.symbol, node, 8388608 /* ExportStar */, 0 /* None */);
+            }
+        }
+        function bindImportClause(node) {
+            if (node.name) {
+                declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
+            }
+        }
+        function setCommonJsModuleIndicator(node) {
+            if (file.externalModuleIndicator) {
+                return false;
+            }
+            if (!file.commonJsModuleIndicator) {
+                file.commonJsModuleIndicator = node;
+                bindSourceFileAsExternalModule();
+            }
+            return true;
+        }
+        function bindObjectDefinePropertyExport(node) {
+            if (!setCommonJsModuleIndicator(node)) {
+                return;
+            }
+            var symbol = forEachIdentifierInEntityName(node.arguments[0], /*parent*/ undefined, function (id, symbol) {
+                if (symbol) {
+                    addDeclarationToSymbol(symbol, id, 1536 /* Module */ | 67108864 /* Assignment */);
+                }
+                return symbol;
+            });
+            if (symbol) {
+                var flags = 4 /* Property */ | 1048576 /* ExportValue */;
+                declareSymbol(symbol.exports, symbol, node, flags, 0 /* None */);
+            }
+        }
+        function bindExportsPropertyAssignment(node) {
+            // When we create a property via 'exports.foo = bar', the 'exports.foo' property access
+            // expression is the declaration
+            if (!setCommonJsModuleIndicator(node)) {
+                return;
+            }
+            var lhs = node.left;
+            var symbol = forEachIdentifierInEntityName(lhs.expression, /*parent*/ undefined, function (id, symbol) {
+                if (symbol) {
+                    addDeclarationToSymbol(symbol, id, 1536 /* Module */ | 67108864 /* Assignment */);
+                }
+                return symbol;
+            });
+            if (symbol) {
+                var flags = ts.isClassExpression(node.right) ?
+                    4 /* Property */ | 1048576 /* ExportValue */ | 32 /* Class */ :
+                    4 /* Property */ | 1048576 /* ExportValue */;
+                declareSymbol(symbol.exports, symbol, lhs, flags, 0 /* None */);
+            }
+        }
+        function bindModuleExportsAssignment(node) {
+            // A common practice in node modules is to set 'export = module.exports = {}', this ensures that 'exports'
+            // is still pointing to 'module.exports'.
+            // We do not want to consider this as 'export=' since a module can have only one of these.
+            // Similarly we do not want to treat 'module.exports = exports' as an 'export='.
+            if (!setCommonJsModuleIndicator(node)) {
+                return;
+            }
+            var assignedExpression = ts.getRightMostAssignedExpression(node.right);
+            if (ts.isEmptyObjectLiteral(assignedExpression) || container === file && isExportsOrModuleExportsOrAlias(file, assignedExpression)) {
+                return;
+            }
+            // 'module.exports = expr' assignment
+            var flags = ts.exportAssignmentIsAlias(node)
+                ? 2097152 /* Alias */
+                : 4 /* Property */ | 1048576 /* ExportValue */ | 512 /* ValueModule */;
+            declareSymbol(file.symbol.exports, file.symbol, node, flags | 67108864 /* Assignment */, 0 /* None */);
+        }
+        function bindThisPropertyAssignment(node) {
+            ts.Debug.assert(ts.isInJSFile(node));
+            var thisContainer = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
+            switch (thisContainer.kind) {
+                case 239 /* FunctionDeclaration */:
+                case 196 /* FunctionExpression */:
+                    var constructorSymbol = thisContainer.symbol;
+                    // For `f.prototype.m = function() { this.x = 0; }`, `this.x = 0` should modify `f`'s members, not the function expression.
+                    if (ts.isBinaryExpression(thisContainer.parent) && thisContainer.parent.operatorToken.kind === 59 /* EqualsToken */) {
+                        var l = thisContainer.parent.left;
+                        if (ts.isPropertyAccessEntityNameExpression(l) && ts.isPrototypeAccess(l.expression)) {
+                            constructorSymbol = lookupSymbolForPropertyAccess(l.expression.expression, thisParentContainer);
+                        }
+                    }
+                    if (constructorSymbol) {
+                        // Declare a 'member' if the container is an ES5 class or ES6 constructor
+                        constructorSymbol.members = constructorSymbol.members || ts.createSymbolTable();
+                        // It's acceptable for multiple 'this' assignments of the same identifier to occur
+                        declareSymbol(constructorSymbol.members, constructorSymbol, node, 4 /* Property */, 0 /* PropertyExcludes */ & ~4 /* Property */);
+                    }
+                    break;
+                case 157 /* Constructor */:
+                case 154 /* PropertyDeclaration */:
+                case 156 /* MethodDeclaration */:
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                    // this.foo assignment in a JavaScript class
+                    // Bind this property to the containing class
+                    var containingClass = thisContainer.parent;
+                    var symbolTable = ts.hasModifier(thisContainer, 32 /* Static */) ? containingClass.symbol.exports : containingClass.symbol.members;
+                    declareSymbol(symbolTable, containingClass.symbol, node, 4 /* Property */, 0 /* None */, /*isReplaceableByMethod*/ true);
+                    break;
+                case 279 /* SourceFile */:
+                    // this.foo assignment in a source file
+                    // Do not bind. It would be nice to support this someday though.
+                    break;
+                default:
+                    ts.Debug.fail(ts.Debug.showSyntaxKind(thisContainer));
+            }
+        }
+        function bindSpecialPropertyDeclaration(node) {
+            if (node.expression.kind === 100 /* ThisKeyword */) {
+                bindThisPropertyAssignment(node);
+            }
+            else if (ts.isPropertyAccessEntityNameExpression(node) && node.parent.parent.kind === 279 /* SourceFile */) {
+                if (ts.isPrototypeAccess(node.expression)) {
+                    bindPrototypePropertyAssignment(node, node.parent);
+                }
+                else {
+                    bindStaticPropertyAssignment(node);
+                }
+            }
+        }
+        /** For `x.prototype = { p, ... }`, declare members p,... if `x` is function/class/{}, or not declared. */
+        function bindPrototypeAssignment(node) {
+            node.left.parent = node;
+            node.right.parent = node;
+            var lhs = node.left;
+            bindPropertyAssignment(lhs.expression, lhs, /*isPrototypeProperty*/ false);
+        }
+        function bindObjectDefinePrototypeProperty(node) {
+            var namespaceSymbol = lookupSymbolForPropertyAccess(node.arguments[0].expression);
+            bindPotentiallyNewExpandoMemberToNamespace(node, namespaceSymbol, /*isPrototypeProperty*/ true);
+        }
+        /**
+         * For `x.prototype.y = z`, declare a member `y` on `x` if `x` is a function or class, or not declared.
+         * Note that jsdoc preceding an ExpressionStatement like `x.prototype.y;` is also treated as a declaration.
+         */
+        function bindPrototypePropertyAssignment(lhs, parent) {
+            // Look up the function in the local scope, since prototype assignments should
+            // follow the function declaration
+            var classPrototype = lhs.expression;
+            var constructorFunction = classPrototype.expression;
+            // Fix up parent pointers since we're going to use these nodes before we bind into them
+            lhs.parent = parent;
+            constructorFunction.parent = classPrototype;
+            classPrototype.parent = lhs;
+            bindPropertyAssignment(constructorFunction, lhs, /*isPrototypeProperty*/ true);
+        }
+        function bindObjectDefinePropertyAssignment(node) {
+            var namespaceSymbol = lookupSymbolForPropertyAccess(node.arguments[0]);
+            var isToplevel = node.parent.parent.kind === 279 /* SourceFile */;
+            namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, node.arguments[0], isToplevel, /*isPrototypeProperty*/ false);
+            bindPotentiallyNewExpandoMemberToNamespace(node, namespaceSymbol, /*isPrototypeProperty*/ false);
+        }
+        function bindSpecialPropertyAssignment(node) {
+            var lhs = node.left;
+            // Class declarations in Typescript do not allow property declarations
+            var parentSymbol = lookupSymbolForPropertyAccess(lhs.expression);
+            if (!ts.isInJSFile(node) && !ts.isFunctionSymbol(parentSymbol)) {
+                return;
+            }
+            // Fix up parent pointers since we're going to use these nodes before we bind into them
+            node.left.parent = node;
+            node.right.parent = node;
+            if (ts.isIdentifier(lhs.expression) && container === file && isNameOfExportsOrModuleExportsAliasDeclaration(file, lhs.expression)) {
+                // This can be an alias for the 'exports' or 'module.exports' names, e.g.
+                //    var util = module.exports;
+                //    util.property = function ...
+                bindExportsPropertyAssignment(node);
+            }
+            else {
+                bindStaticPropertyAssignment(lhs);
+            }
+        }
+        /**
+         * For nodes like `x.y = z`, declare a member 'y' on 'x' if x is a function (or IIFE) or class or {}, or not declared.
+         * Also works for expression statements preceded by JSDoc, like / ** @type number * / x.y;
+         */
+        function bindStaticPropertyAssignment(node) {
+            node.expression.parent = node;
+            bindPropertyAssignment(node.expression, node, /*isPrototypeProperty*/ false);
+        }
+        function bindPotentiallyMissingNamespaces(namespaceSymbol, entityName, isToplevel, isPrototypeProperty) {
+            if (isToplevel && !isPrototypeProperty && (!namespaceSymbol || !(namespaceSymbol.flags & 1920 /* Namespace */))) {
+                // make symbols or add declarations for intermediate containers
+                var flags_1 = 1536 /* Module */ | 67108864 /* Assignment */;
+                var excludeFlags_1 = 110735 /* ValueModuleExcludes */ & ~67108864 /* Assignment */;
+                namespaceSymbol = forEachIdentifierInEntityName(entityName, namespaceSymbol, function (id, symbol, parent) {
+                    if (symbol) {
+                        addDeclarationToSymbol(symbol, id, flags_1);
+                        return symbol;
+                    }
+                    else {
+                        var table = parent ? parent.exports :
+                            file.jsGlobalAugmentations || (file.jsGlobalAugmentations = ts.createSymbolTable());
+                        return declareSymbol(table, parent, id, flags_1, excludeFlags_1);
+                    }
+                });
+            }
+            return namespaceSymbol;
+        }
+        function bindPotentiallyNewExpandoMemberToNamespace(declaration, namespaceSymbol, isPrototypeProperty) {
+            if (!namespaceSymbol || !isExpandoSymbol(namespaceSymbol)) {
+                return;
+            }
+            // Set up the members collection if it doesn't exist already
+            var symbolTable = isPrototypeProperty ?
+                (namespaceSymbol.members || (namespaceSymbol.members = ts.createSymbolTable())) :
+                (namespaceSymbol.exports || (namespaceSymbol.exports = ts.createSymbolTable()));
+            var isMethod = ts.isFunctionLikeDeclaration(ts.getAssignedExpandoInitializer(declaration));
+            var includes = isMethod ? 8192 /* Method */ : 4 /* Property */;
+            var excludes = isMethod ? 67212223 /* MethodExcludes */ : 0 /* PropertyExcludes */;
+            declareSymbol(symbolTable, namespaceSymbol, declaration, includes | 67108864 /* Assignment */, excludes & ~67108864 /* Assignment */);
+        }
+        function bindPropertyAssignment(name, propertyAccess, isPrototypeProperty) {
+            var namespaceSymbol = lookupSymbolForPropertyAccess(name);
+            var isToplevel = ts.isBinaryExpression(propertyAccess.parent)
+                ? getParentOfBinaryExpression(propertyAccess.parent).parent.kind === 279 /* SourceFile */
+                : propertyAccess.parent.parent.kind === 279 /* SourceFile */;
+            namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, propertyAccess.expression, isToplevel, isPrototypeProperty);
+            bindPotentiallyNewExpandoMemberToNamespace(propertyAccess, namespaceSymbol, isPrototypeProperty);
+        }
+        /**
+         * Javascript expando values are:
+         * - Functions
+         * - classes
+         * - namespaces
+         * - variables initialized with function expressions
+         * -                       with class expressions
+         * -                       with empty object literals
+         * -                       with non-empty object literals if assigned to the prototype property
+         */
+        function isExpandoSymbol(symbol) {
+            if (symbol.flags & (16 /* Function */ | 32 /* Class */ | 1024 /* NamespaceModule */)) {
+                return true;
+            }
+            var node = symbol.valueDeclaration;
+            if (node && ts.isCallExpression(node)) {
+                return !!ts.getAssignedExpandoInitializer(node);
+            }
+            var init = !node ? undefined :
+                ts.isVariableDeclaration(node) ? node.initializer :
+                    ts.isBinaryExpression(node) ? node.right :
+                        ts.isPropertyAccessExpression(node) && ts.isBinaryExpression(node.parent) ? node.parent.right :
+                            undefined;
+            init = init && ts.getRightMostAssignedExpression(init);
+            if (init) {
+                var isPrototypeAssignment = ts.isPrototypeAccess(ts.isVariableDeclaration(node) ? node.name : ts.isBinaryExpression(node) ? node.left : node);
+                return !!ts.getExpandoInitializer(ts.isBinaryExpression(init) && init.operatorToken.kind === 55 /* BarBarToken */ ? init.right : init, isPrototypeAssignment);
+            }
+            return false;
+        }
+        function getParentOfBinaryExpression(expr) {
+            while (ts.isBinaryExpression(expr.parent)) {
+                expr = expr.parent;
+            }
+            return expr.parent;
+        }
+        function lookupSymbolForPropertyAccess(node, lookupContainer) {
+            if (lookupContainer === void 0) { lookupContainer = container; }
+            if (ts.isIdentifier(node)) {
+                return lookupSymbolForNameWorker(lookupContainer, node.escapedText);
+            }
+            else {
+                var symbol = lookupSymbolForPropertyAccess(node.expression);
+                return symbol && symbol.exports && symbol.exports.get(node.name.escapedText);
+            }
+        }
+        function forEachIdentifierInEntityName(e, parent, action) {
+            if (isExportsOrModuleExportsOrAlias(file, e)) {
+                return file.symbol;
+            }
+            else if (ts.isIdentifier(e)) {
+                return action(e, lookupSymbolForPropertyAccess(e), parent);
+            }
+            else {
+                var s = forEachIdentifierInEntityName(e.expression, parent, action);
+                if (!s || !s.exports)
+                    return ts.Debug.fail();
+                return action(e.name, s.exports.get(e.name.escapedText), s);
+            }
+        }
+        function bindCallExpression(node) {
+            // We're only inspecting call expressions to detect CommonJS modules, so we can skip
+            // this check if we've already seen the module indicator
+            if (!file.commonJsModuleIndicator && ts.isRequireCall(node, /*checkArgumentIsStringLiteralLike*/ false)) {
+                setCommonJsModuleIndicator(node);
+            }
+        }
+        function bindClassLikeDeclaration(node) {
+            if (node.kind === 240 /* ClassDeclaration */) {
+                bindBlockScopedDeclaration(node, 32 /* Class */, 68008383 /* ClassExcludes */);
+            }
+            else {
+                var bindingName = node.name ? node.name.escapedText : "__class" /* Class */;
+                bindAnonymousDeclaration(node, 32 /* Class */, bindingName);
+                // Add name of class expression into the map for semantic classifier
+                if (node.name) {
+                    classifiableNames.set(node.name.escapedText, true);
+                }
+            }
+            var symbol = node.symbol;
+            // TypeScript 1.0 spec (April 2014): 8.4
+            // Every class automatically contains a static property member named 'prototype', the
+            // type of which is an instantiation of the class type with type Any supplied as a type
+            // argument for each type parameter. It is an error to explicitly declare a static
+            // property member with the name 'prototype'.
+            //
+            // Note: we check for this here because this class may be merging into a module.  The
+            // module might have an exported variable called 'prototype'.  We can't allow that as
+            // that would clash with the built-in 'prototype' for the class.
+            var prototypeSymbol = createSymbol(4 /* Property */ | 4194304 /* Prototype */, "prototype");
+            var symbolExport = symbol.exports.get(prototypeSymbol.escapedName);
+            if (symbolExport) {
+                if (node.name) {
+                    node.name.parent = node;
+                }
+                file.bindDiagnostics.push(createDiagnosticForNode(symbolExport.declarations[0], ts.Diagnostics.Duplicate_identifier_0, ts.symbolName(prototypeSymbol)));
+            }
+            symbol.exports.set(prototypeSymbol.escapedName, prototypeSymbol);
+            prototypeSymbol.parent = symbol;
+        }
+        function bindEnumDeclaration(node) {
+            return ts.isEnumConst(node)
+                ? bindBlockScopedDeclaration(node, 128 /* ConstEnum */, 68008831 /* ConstEnumExcludes */)
+                : bindBlockScopedDeclaration(node, 256 /* RegularEnum */, 68008191 /* RegularEnumExcludes */);
+        }
+        function bindVariableDeclarationOrBindingElement(node) {
+            if (inStrictMode) {
+                checkStrictModeEvalOrArguments(node, node.name);
+            }
+            if (!ts.isBindingPattern(node.name)) {
+                var isEnum = ts.isInJSFile(node) && !!ts.getJSDocEnumTag(node);
+                var enumFlags = (isEnum ? 256 /* RegularEnum */ : 0 /* None */);
+                var enumExcludes = (isEnum ? 68008191 /* RegularEnumExcludes */ : 0 /* None */);
+                if (ts.isBlockOrCatchScoped(node)) {
+                    bindBlockScopedDeclaration(node, 2 /* BlockScopedVariable */ | enumFlags, 67220415 /* BlockScopedVariableExcludes */ | enumExcludes);
+                }
+                else if (ts.isParameterDeclaration(node)) {
+                    // It is safe to walk up parent chain to find whether the node is a destructuring parameter declaration
+                    // because its parent chain has already been set up, since parents are set before descending into children.
+                    //
+                    // If node is a binding element in parameter declaration, we need to use ParameterExcludes.
+                    // Using ParameterExcludes flag allows the compiler to report an error on duplicate identifiers in Parameter Declaration
+                    // For example:
+                    //      function foo([a,a]) {} // Duplicate Identifier error
+                    //      function bar(a,a) {}   // Duplicate Identifier error, parameter declaration in this case is handled in bindParameter
+                    //                             // which correctly set excluded symbols
+                    declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 67220415 /* ParameterExcludes */);
+                }
+                else {
+                    declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */ | enumFlags, 67220414 /* FunctionScopedVariableExcludes */ | enumExcludes);
+                }
+            }
+        }
+        function bindParameter(node) {
+            if (node.kind === 299 /* JSDocParameterTag */ && container.kind !== 293 /* JSDocSignature */) {
+                return;
+            }
+            if (inStrictMode && !(node.flags & 4194304 /* Ambient */)) {
+                // It is a SyntaxError if the identifier eval or arguments appears within a FormalParameterList of a
+                // strict mode FunctionLikeDeclaration or FunctionExpression(13.1)
+                checkStrictModeEvalOrArguments(node, node.name);
+            }
+            if (ts.isBindingPattern(node.name)) {
+                bindAnonymousDeclaration(node, 1 /* FunctionScopedVariable */, "__" + node.parent.parameters.indexOf(node));
+            }
+            else {
+                declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 67220415 /* ParameterExcludes */);
+            }
+            // If this is a property-parameter, then also declare the property symbol into the
+            // containing class.
+            if (ts.isParameterPropertyDeclaration(node)) {
+                var classDeclaration = node.parent.parent;
+                declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, 4 /* Property */ | (node.questionToken ? 16777216 /* Optional */ : 0 /* None */), 0 /* PropertyExcludes */);
+            }
+        }
+        function bindFunctionDeclaration(node) {
+            if (!file.isDeclarationFile && !(node.flags & 4194304 /* Ambient */)) {
+                if (ts.isAsyncFunction(node)) {
+                    emitFlags |= 1024 /* HasAsyncFunctions */;
+                }
+            }
+            checkStrictModeFunctionName(node);
+            if (inStrictMode) {
+                checkStrictModeFunctionDeclaration(node);
+                bindBlockScopedDeclaration(node, 16 /* Function */, 67219887 /* FunctionExcludes */);
+            }
+            else {
+                declareSymbolAndAddToSymbolTable(node, 16 /* Function */, 67219887 /* FunctionExcludes */);
+            }
+        }
+        function bindFunctionExpression(node) {
+            if (!file.isDeclarationFile && !(node.flags & 4194304 /* Ambient */)) {
+                if (ts.isAsyncFunction(node)) {
+                    emitFlags |= 1024 /* HasAsyncFunctions */;
+                }
+            }
+            if (currentFlow) {
+                node.flowNode = currentFlow;
+            }
+            checkStrictModeFunctionName(node);
+            var bindingName = node.name ? node.name.escapedText : "__function" /* Function */;
+            return bindAnonymousDeclaration(node, 16 /* Function */, bindingName);
+        }
+        function bindPropertyOrMethodOrAccessor(node, symbolFlags, symbolExcludes) {
+            if (!file.isDeclarationFile && !(node.flags & 4194304 /* Ambient */) && ts.isAsyncFunction(node)) {
+                emitFlags |= 1024 /* HasAsyncFunctions */;
+            }
+            if (currentFlow && ts.isObjectLiteralOrClassExpressionMethod(node)) {
+                node.flowNode = currentFlow;
+            }
+            return ts.hasDynamicName(node)
+                ? bindAnonymousDeclaration(node, symbolFlags, "__computed" /* Computed */)
+                : declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes);
+        }
+        function getInferTypeContainer(node) {
+            var extendsType = ts.findAncestor(node, function (n) { return n.parent && ts.isConditionalTypeNode(n.parent) && n.parent.extendsType === n; });
+            return extendsType && extendsType.parent;
+        }
+        function bindTypeParameter(node) {
+            if (ts.isJSDocTemplateTag(node.parent)) {
+                var container_1 = ts.find(node.parent.parent.tags, ts.isJSDocTypeAlias) || ts.getHostSignatureFromJSDoc(node.parent); // TODO: GH#18217
+                if (container_1) {
+                    if (!container_1.locals) {
+                        container_1.locals = ts.createSymbolTable();
+                    }
+                    declareSymbol(container_1.locals, /*parent*/ undefined, node, 262144 /* TypeParameter */, 67635688 /* TypeParameterExcludes */);
+                }
+                else {
+                    declareSymbolAndAddToSymbolTable(node, 262144 /* TypeParameter */, 67635688 /* TypeParameterExcludes */);
+                }
+            }
+            else if (node.parent.kind === 176 /* InferType */) {
+                var container_2 = getInferTypeContainer(node.parent);
+                if (container_2) {
+                    if (!container_2.locals) {
+                        container_2.locals = ts.createSymbolTable();
+                    }
+                    declareSymbol(container_2.locals, /*parent*/ undefined, node, 262144 /* TypeParameter */, 67635688 /* TypeParameterExcludes */);
+                }
+                else {
+                    bindAnonymousDeclaration(node, 262144 /* TypeParameter */, getDeclarationName(node)); // TODO: GH#18217
+                }
+            }
+            else {
+                declareSymbolAndAddToSymbolTable(node, 262144 /* TypeParameter */, 67635688 /* TypeParameterExcludes */);
+            }
+        }
+        // reachability checks
+        function shouldReportErrorOnModuleDeclaration(node) {
+            var instanceState = getModuleInstanceState(node);
+            return instanceState === 1 /* Instantiated */ || (instanceState === 2 /* ConstEnumOnly */ && !!options.preserveConstEnums);
+        }
+        function checkUnreachable(node) {
+            if (!(currentFlow.flags & 1 /* Unreachable */)) {
+                return false;
+            }
+            if (currentFlow === unreachableFlow) {
+                var reportError = 
+                // report error on all statements except empty ones
+                (ts.isStatementButNotDeclaration(node) && node.kind !== 220 /* EmptyStatement */) ||
+                    // report error on class declarations
+                    node.kind === 240 /* ClassDeclaration */ ||
+                    // report error on instantiated modules or const-enums only modules if preserveConstEnums is set
+                    (node.kind === 244 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node));
+                if (reportError) {
+                    currentFlow = reportedUnreachableFlow;
+                    if (!options.allowUnreachableCode) {
+                        // unreachable code is reported if
+                        // - user has explicitly asked about it AND
+                        // - statement is in not ambient context (statements in ambient context is already an error
+                        //   so we should not report extras) AND
+                        //   - node is not variable statement OR
+                        //   - node is block scoped variable statement OR
+                        //   - node is not block scoped variable statement and at least one variable declaration has initializer
+                        //   Rationale: we don't want to report errors on non-initialized var's since they are hoisted
+                        //   On the other side we do want to report errors on non-initialized 'lets' because of TDZ
+                        var isError_1 = ts.unreachableCodeIsError(options) &&
+                            !(node.flags & 4194304 /* Ambient */) &&
+                            (!ts.isVariableStatement(node) ||
+                                !!(ts.getCombinedNodeFlags(node.declarationList) & 3 /* BlockScoped */) ||
+                                node.declarationList.declarations.some(function (d) { return !!d.initializer; }));
+                        eachUnreachableRange(node, function (start, end) { return errorOrSuggestionOnRange(isError_1, start, end, ts.Diagnostics.Unreachable_code_detected); });
+                    }
+                }
+            }
+            return true;
+        }
+    }
+    function eachUnreachableRange(node, cb) {
+        if (ts.isStatement(node) && isExecutableStatement(node) && ts.isBlock(node.parent)) {
+            var statements = node.parent.statements;
+            var slice_1 = ts.sliceAfter(statements, node);
+            ts.getRangesWhere(slice_1, isExecutableStatement, function (start, afterEnd) { return cb(slice_1[start], slice_1[afterEnd - 1]); });
+        }
+        else {
+            cb(node, node);
+        }
+    }
+    // As opposed to a pure declaration like an `interface`
+    function isExecutableStatement(s) {
+        // Don't remove statements that can validly be used before they appear.
+        return !ts.isFunctionDeclaration(s) && !isPurelyTypeDeclaration(s) && !ts.isEnumDeclaration(s) &&
+            // `var x;` may declare a variable used above
+            !(ts.isVariableStatement(s) && !(ts.getCombinedNodeFlags(s) & (1 /* Let */ | 2 /* Const */)) && s.declarationList.declarations.some(function (d) { return !d.initializer; }));
+    }
+    function isPurelyTypeDeclaration(s) {
+        switch (s.kind) {
+            case 241 /* InterfaceDeclaration */:
+            case 242 /* TypeAliasDeclaration */:
+                return true;
+            case 244 /* ModuleDeclaration */:
+                return getModuleInstanceState(s) !== 1 /* Instantiated */;
+            case 243 /* EnumDeclaration */:
+                return ts.hasModifier(s, 2048 /* Const */);
+            default:
+                return false;
+        }
+    }
+    function isExportsOrModuleExportsOrAlias(sourceFile, node) {
+        return ts.isExportsIdentifier(node) ||
+            ts.isModuleExportsPropertyAccessExpression(node) ||
+            ts.isIdentifier(node) && isNameOfExportsOrModuleExportsAliasDeclaration(sourceFile, node);
+    }
+    ts.isExportsOrModuleExportsOrAlias = isExportsOrModuleExportsOrAlias;
+    function isNameOfExportsOrModuleExportsAliasDeclaration(sourceFile, node) {
+        var symbol = lookupSymbolForNameWorker(sourceFile, node.escapedText);
+        return !!symbol && !!symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) &&
+            !!symbol.valueDeclaration.initializer && isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, symbol.valueDeclaration.initializer);
+    }
+    function isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, node) {
+        return isExportsOrModuleExportsOrAlias(sourceFile, node) ||
+            (ts.isAssignmentExpression(node, /*excludeCompoundAssignment*/ true) && (isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, node.left) || isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, node.right)));
+    }
+    function lookupSymbolForNameWorker(container, name) {
+        var local = container.locals && container.locals.get(name);
+        if (local) {
+            return local.exportSymbol || local;
+        }
+        if (ts.isSourceFile(container) && container.jsGlobalAugmentations && container.jsGlobalAugmentations.has(name)) {
+            return container.jsGlobalAugmentations.get(name);
+        }
+        return container.symbol && container.symbol.exports && container.symbol.exports.get(name);
+    }
+    /**
+     * Computes the transform flags for a node, given the transform flags of its subtree
+     *
+     * @param node The node to analyze
+     * @param subtreeFlags Transform flags computed for this node's subtree
+     */
+    function computeTransformFlagsForNode(node, subtreeFlags) {
+        var kind = node.kind;
+        switch (kind) {
+            case 191 /* CallExpression */:
+                return computeCallExpression(node, subtreeFlags);
+            case 192 /* NewExpression */:
+                return computeNewExpression(node, subtreeFlags);
+            case 244 /* ModuleDeclaration */:
+                return computeModuleDeclaration(node, subtreeFlags);
+            case 195 /* ParenthesizedExpression */:
+                return computeParenthesizedExpression(node, subtreeFlags);
+            case 204 /* BinaryExpression */:
+                return computeBinaryExpression(node, subtreeFlags);
+            case 221 /* ExpressionStatement */:
+                return computeExpressionStatement(node, subtreeFlags);
+            case 151 /* Parameter */:
+                return computeParameter(node, subtreeFlags);
+            case 197 /* ArrowFunction */:
+                return computeArrowFunction(node, subtreeFlags);
+            case 196 /* FunctionExpression */:
+                return computeFunctionExpression(node, subtreeFlags);
+            case 239 /* FunctionDeclaration */:
+                return computeFunctionDeclaration(node, subtreeFlags);
+            case 237 /* VariableDeclaration */:
+                return computeVariableDeclaration(node, subtreeFlags);
+            case 238 /* VariableDeclarationList */:
+                return computeVariableDeclarationList(node, subtreeFlags);
+            case 219 /* VariableStatement */:
+                return computeVariableStatement(node, subtreeFlags);
+            case 233 /* LabeledStatement */:
+                return computeLabeledStatement(node, subtreeFlags);
+            case 240 /* ClassDeclaration */:
+                return computeClassDeclaration(node, subtreeFlags);
+            case 209 /* ClassExpression */:
+                return computeClassExpression(node, subtreeFlags);
+            case 273 /* HeritageClause */:
+                return computeHeritageClause(node, subtreeFlags);
+            case 274 /* CatchClause */:
+                return computeCatchClause(node, subtreeFlags);
+            case 211 /* ExpressionWithTypeArguments */:
+                return computeExpressionWithTypeArguments(node, subtreeFlags);
+            case 157 /* Constructor */:
+                return computeConstructor(node, subtreeFlags);
+            case 154 /* PropertyDeclaration */:
+                return computePropertyDeclaration(node, subtreeFlags);
+            case 156 /* MethodDeclaration */:
+                return computeMethod(node, subtreeFlags);
+            case 158 /* GetAccessor */:
+            case 159 /* SetAccessor */:
+                return computeAccessor(node, subtreeFlags);
+            case 248 /* ImportEqualsDeclaration */:
+                return computeImportEquals(node, subtreeFlags);
+            case 189 /* PropertyAccessExpression */:
+                return computePropertyAccess(node, subtreeFlags);
+            case 190 /* ElementAccessExpression */:
+                return computeElementAccess(node, subtreeFlags);
+            default:
+                return computeOther(node, kind, subtreeFlags);
+        }
+    }
+    ts.computeTransformFlagsForNode = computeTransformFlagsForNode;
+    function computeCallExpression(node, subtreeFlags) {
+        var transformFlags = subtreeFlags;
+        var expression = node.expression;
+        if (node.typeArguments) {
+            transformFlags |= 3 /* AssertTypeScript */;
+        }
+        if (subtreeFlags & 131072 /* ContainsRestOrSpread */
+            || (expression.transformFlags & (33554432 /* Super */ | 67108864 /* ContainsSuper */))) {
+            // If the this node contains a SpreadExpression, or is a super call, then it is an ES6
+            // node.
+            transformFlags |= 192 /* AssertES2015 */;
+            // super property or element accesses could be inside lambdas, etc, and need a captured `this`,
+            // while super keyword for super calls (indicated by TransformFlags.Super) does not (since it can only be top-level in a constructor)
+            if (expression.transformFlags & 67108864 /* ContainsSuper */) {
+                transformFlags |= 8192 /* ContainsLexicalThis */;
+            }
+        }
+        if (expression.kind === 92 /* ImportKeyword */) {
+            transformFlags |= 16777216 /* ContainsDynamicImport */;
+            // A dynamic 'import()' call that contains a lexical 'this' will
+            // require a captured 'this' when emitting down-level.
+            if (subtreeFlags & 8192 /* ContainsLexicalThis */) {
+                transformFlags |= 16384 /* ContainsCapturedLexicalThis */;
+            }
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~637666625 /* ArrayLiteralOrCallOrNewExcludes */;
+    }
+    function computeNewExpression(node, subtreeFlags) {
+        var transformFlags = subtreeFlags;
+        if (node.typeArguments) {
+            transformFlags |= 3 /* AssertTypeScript */;
+        }
+        if (subtreeFlags & 131072 /* ContainsRestOrSpread */) {
+            // If the this node contains a SpreadElementExpression then it is an ES6
+            // node.
+            transformFlags |= 192 /* AssertES2015 */;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~637666625 /* ArrayLiteralOrCallOrNewExcludes */;
+    }
+    function computeBinaryExpression(node, subtreeFlags) {
+        var transformFlags = subtreeFlags;
+        var operatorTokenKind = node.operatorToken.kind;
+        var leftKind = node.left.kind;
+        if (operatorTokenKind === 59 /* EqualsToken */ && leftKind === 188 /* ObjectLiteralExpression */) {
+            // Destructuring object assignments with are ES2015 syntax
+            // and possibly ESNext if they contain rest
+            transformFlags |= 8 /* AssertESNext */ | 192 /* AssertES2015 */ | 3072 /* AssertDestructuringAssignment */;
+        }
+        else if (operatorTokenKind === 59 /* EqualsToken */ && leftKind === 187 /* ArrayLiteralExpression */) {
+            // Destructuring assignments are ES2015 syntax.
+            transformFlags |= 192 /* AssertES2015 */ | 3072 /* AssertDestructuringAssignment */;
+        }
+        else if (operatorTokenKind === 41 /* AsteriskAsteriskToken */
+            || operatorTokenKind === 63 /* AsteriskAsteriskEqualsToken */) {
+            // Exponentiation is ES2016 syntax.
+            transformFlags |= 32 /* AssertES2016 */;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~637535553 /* NodeExcludes */;
+    }
+    function computeParameter(node, subtreeFlags) {
+        var transformFlags = subtreeFlags;
+        var name = node.name;
+        var initializer = node.initializer;
+        var dotDotDotToken = node.dotDotDotToken;
+        // The '?' token, type annotations, decorators, and 'this' parameters are TypeSCript
+        // syntax.
+        if (node.questionToken
+            || node.type
+            || (subtreeFlags & 4096 /* ContainsTypeScriptClassSyntax */ && ts.some(node.decorators))
+            || ts.isThisIdentifier(name)) {
+            transformFlags |= 3 /* AssertTypeScript */;
+        }
+        // If a parameter has an accessibility modifier, then it is TypeScript syntax.
+        if (ts.hasModifier(node, 92 /* ParameterPropertyModifier */)) {
+            transformFlags |= 3 /* AssertTypeScript */ | 4096 /* ContainsTypeScriptClassSyntax */;
+        }
+        // parameters with object rest destructuring are ES Next syntax
+        if (subtreeFlags & 262144 /* ContainsObjectRestOrSpread */) {
+            transformFlags |= 8 /* AssertESNext */;
+        }
+        // If a parameter has an initializer, a binding pattern or a dotDotDot token, then
+        // it is ES6 syntax and its container must emit default value assignments or parameter destructuring downlevel.
+        if (subtreeFlags & 2097152 /* ContainsBindingPattern */ || initializer || dotDotDotToken) {
+            transformFlags |= 192 /* AssertES2015 */ | 65536 /* ContainsDefaultValueAssignments */;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~637535553 /* ParameterExcludes */;
+    }
+    function computeParenthesizedExpression(node, subtreeFlags) {
+        var transformFlags = subtreeFlags;
+        var expression = node.expression;
+        var expressionKind = expression.kind;
+        var expressionTransformFlags = expression.transformFlags;
+        // If the node is synthesized, it means the emitter put the parentheses there,
+        // not the user. If we didn't want them, the emitter would not have put them
+        // there.
+        if (expressionKind === 212 /* AsExpression */
+            || expressionKind === 194 /* TypeAssertionExpression */) {
+            transformFlags |= 3 /* AssertTypeScript */;
+        }
+        // If the expression of a ParenthesizedExpression is a destructuring assignment,
+        // then the ParenthesizedExpression is a destructuring assignment.
+        if (expressionTransformFlags & 1024 /* DestructuringAssignment */) {
+            transformFlags |= 1024 /* DestructuringAssignment */;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~536872257 /* OuterExpressionExcludes */;
+    }
+    function computeClassDeclaration(node, subtreeFlags) {
+        var transformFlags;
+        if (ts.hasModifier(node, 2 /* Ambient */)) {
+            // An ambient declaration is TypeScript syntax.
+            transformFlags = 3 /* AssertTypeScript */;
+        }
+        else {
+            // A ClassDeclaration is ES6 syntax.
+            transformFlags = subtreeFlags | 192 /* AssertES2015 */;
+            // A class with a parameter property assignment, property initializer, computed property name, or decorator is
+            // TypeScript syntax.
+            // An exported declaration may be TypeScript syntax, but is handled by the visitor
+            // for a namespace declaration.
+            if ((subtreeFlags & 4096 /* ContainsTypeScriptClassSyntax */)
+                || node.typeParameters) {
+                transformFlags |= 3 /* AssertTypeScript */;
+            }
+            if (subtreeFlags & 32768 /* ContainsLexicalThisInComputedPropertyName */) {
+                // A computed property name containing `this` might need to be rewritten,
+                // so propagate the ContainsLexicalThis flag upward.
+                transformFlags |= 8192 /* ContainsLexicalThis */;
+            }
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~638121281 /* ClassExcludes */;
+    }
+    function computeClassExpression(node, subtreeFlags) {
+        // A ClassExpression is ES6 syntax.
+        var transformFlags = subtreeFlags | 192 /* AssertES2015 */;
+        // A class with a parameter property assignment, property initializer, or decorator is
+        // TypeScript syntax.
+        if (subtreeFlags & 4096 /* ContainsTypeScriptClassSyntax */
+            || node.typeParameters) {
+            transformFlags |= 3 /* AssertTypeScript */;
+        }
+        if (subtreeFlags & 32768 /* ContainsLexicalThisInComputedPropertyName */) {
+            // A computed property name containing `this` might need to be rewritten,
+            // so propagate the ContainsLexicalThis flag upward.
+            transformFlags |= 8192 /* ContainsLexicalThis */;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~638121281 /* ClassExcludes */;
+    }
+    function computeHeritageClause(node, subtreeFlags) {
+        var transformFlags = subtreeFlags;
+        switch (node.token) {
+            case 86 /* ExtendsKeyword */:
+                // An `extends` HeritageClause is ES6 syntax.
+                transformFlags |= 192 /* AssertES2015 */;
+                break;
+            case 109 /* ImplementsKeyword */:
+                // An `implements` HeritageClause is TypeScript syntax.
+                transformFlags |= 3 /* AssertTypeScript */;
+                break;
+            default:
+                ts.Debug.fail("Unexpected token for heritage clause");
+                break;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~637535553 /* NodeExcludes */;
+    }
+    function computeCatchClause(node, subtreeFlags) {
+        var transformFlags = subtreeFlags;
+        if (!node.variableDeclaration) {
+            transformFlags |= 8 /* AssertESNext */;
+        }
+        else if (ts.isBindingPattern(node.variableDeclaration.name)) {
+            transformFlags |= 192 /* AssertES2015 */;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~637797697 /* CatchClauseExcludes */;
+    }
+    function computeExpressionWithTypeArguments(node, subtreeFlags) {
+        // An ExpressionWithTypeArguments is ES6 syntax, as it is used in the
+        // extends clause of a class.
+        var transformFlags = subtreeFlags | 192 /* AssertES2015 */;
+        // If an ExpressionWithTypeArguments contains type arguments, then it
+        // is TypeScript syntax.
+        if (node.typeArguments) {
+            transformFlags |= 3 /* AssertTypeScript */;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~637535553 /* NodeExcludes */;
+    }
+    function computeConstructor(node, subtreeFlags) {
+        var transformFlags = subtreeFlags;
+        // TypeScript-specific modifiers and overloads are TypeScript syntax
+        if (ts.hasModifier(node, 2270 /* TypeScriptModifier */)
+            || !node.body) {
+            transformFlags |= 3 /* AssertTypeScript */;
+        }
+        // function declarations with object rest destructuring are ES Next syntax
+        if (subtreeFlags & 262144 /* ContainsObjectRestOrSpread */) {
+            transformFlags |= 8 /* AssertESNext */;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~653616449 /* ConstructorExcludes */;
+    }
+    function computeMethod(node, subtreeFlags) {
+        // A MethodDeclaration is ES6 syntax.
+        var transformFlags = subtreeFlags | 192 /* AssertES2015 */;
+        // Decorators, TypeScript-specific modifiers, type parameters, type annotations, and
+        // overloads are TypeScript syntax.
+        if (node.decorators
+            || ts.hasModifier(node, 2270 /* TypeScriptModifier */)
+            || node.typeParameters
+            || node.type
+            || (node.name && ts.isComputedPropertyName(node.name)) // While computed method names aren't typescript, the TS transform must visit them to emit property declarations correctly
+            || !node.body) {
+            transformFlags |= 3 /* AssertTypeScript */;
+        }
+        // function declarations with object rest destructuring are ES Next syntax
+        if (subtreeFlags & 262144 /* ContainsObjectRestOrSpread */) {
+            transformFlags |= 8 /* AssertESNext */;
+        }
+        // An async method declaration is ES2017 syntax.
+        if (ts.hasModifier(node, 256 /* Async */)) {
+            transformFlags |= node.asteriskToken ? 8 /* AssertESNext */ : 16 /* AssertES2017 */;
+        }
+        if (node.asteriskToken) {
+            transformFlags |= 768 /* AssertGenerator */;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~653616449 /* MethodOrAccessorExcludes */;
+    }
+    function computeAccessor(node, subtreeFlags) {
+        var transformFlags = subtreeFlags;
+        // Decorators, TypeScript-specific modifiers, type annotations, and overloads are
+        // TypeScript syntax.
+        if (node.decorators
+            || ts.hasModifier(node, 2270 /* TypeScriptModifier */)
+            || node.type
+            || (node.name && ts.isComputedPropertyName(node.name)) // While computed accessor names aren't typescript, the TS transform must visit them to emit property declarations correctly
+            || !node.body) {
+            transformFlags |= 3 /* AssertTypeScript */;
+        }
+        // function declarations with object rest destructuring are ES Next syntax
+        if (subtreeFlags & 262144 /* ContainsObjectRestOrSpread */) {
+            transformFlags |= 8 /* AssertESNext */;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~653616449 /* MethodOrAccessorExcludes */;
+    }
+    function computePropertyDeclaration(node, subtreeFlags) {
+        // A PropertyDeclaration is TypeScript syntax.
+        var transformFlags = subtreeFlags | 3 /* AssertTypeScript */;
+        // If the PropertyDeclaration has an initializer or a computed name, we need to inform its ancestor
+        // so that it handle the transformation.
+        if (node.initializer || ts.isComputedPropertyName(node.name)) {
+            transformFlags |= 4096 /* ContainsTypeScriptClassSyntax */;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~637535553 /* NodeExcludes */;
+    }
+    function computeFunctionDeclaration(node, subtreeFlags) {
+        var transformFlags;
+        var modifierFlags = ts.getModifierFlags(node);
+        var body = node.body;
+        if (!body || (modifierFlags & 2 /* Ambient */)) {
+            // An ambient declaration is TypeScript syntax.
+            // A FunctionDeclaration without a body is an overload and is TypeScript syntax.
+            transformFlags = 3 /* AssertTypeScript */;
+        }
+        else {
+            transformFlags = subtreeFlags | 8388608 /* ContainsHoistedDeclarationOrCompletion */;
+            // TypeScript-specific modifiers, type parameters, and type annotations are TypeScript
+            // syntax.
+            if (modifierFlags & 2270 /* TypeScriptModifier */
+                || node.typeParameters
+                || node.type) {
+                transformFlags |= 3 /* AssertTypeScript */;
+            }
+            // An async function declaration is ES2017 syntax.
+            if (modifierFlags & 256 /* Async */) {
+                transformFlags |= node.asteriskToken ? 8 /* AssertESNext */ : 16 /* AssertES2017 */;
+            }
+            // function declarations with object rest destructuring are ES Next syntax
+            if (subtreeFlags & 262144 /* ContainsObjectRestOrSpread */) {
+                transformFlags |= 8 /* AssertESNext */;
+            }
+            // If a FunctionDeclaration's subtree has marked the container as needing to capture the
+            // lexical this, or the function contains parameters with initializers, then this node is
+            // ES6 syntax.
+            if (subtreeFlags & 81920 /* ES2015FunctionSyntaxMask */) {
+                transformFlags |= 192 /* AssertES2015 */;
+            }
+            // If a FunctionDeclaration is generator function and is the body of a
+            // transformed async function, then this node can be transformed to a
+            // down-level generator.
+            // Currently we do not support transforming any other generator fucntions
+            // down level.
+            if (node.asteriskToken) {
+                transformFlags |= 768 /* AssertGenerator */;
+            }
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~653620545 /* FunctionExcludes */;
+    }
+    function computeFunctionExpression(node, subtreeFlags) {
+        var transformFlags = subtreeFlags;
+        // TypeScript-specific modifiers, type parameters, and type annotations are TypeScript
+        // syntax.
+        if (ts.hasModifier(node, 2270 /* TypeScriptModifier */)
+            || node.typeParameters
+            || node.type) {
+            transformFlags |= 3 /* AssertTypeScript */;
+        }
+        // An async function expression is ES2017 syntax.
+        if (ts.hasModifier(node, 256 /* Async */)) {
+            transformFlags |= node.asteriskToken ? 8 /* AssertESNext */ : 16 /* AssertES2017 */;
+        }
+        // function expressions with object rest destructuring are ES Next syntax
+        if (subtreeFlags & 262144 /* ContainsObjectRestOrSpread */) {
+            transformFlags |= 8 /* AssertESNext */;
+        }
+        // If a FunctionExpression's subtree has marked the container as needing to capture the
+        // lexical this, or the function contains parameters with initializers, then this node is
+        // ES6 syntax.
+        if (subtreeFlags & 81920 /* ES2015FunctionSyntaxMask */) {
+            transformFlags |= 192 /* AssertES2015 */;
+        }
+        // If a FunctionExpression is generator function and is the body of a
+        // transformed async function, then this node can be transformed to a
+        // down-level generator.
+        if (node.asteriskToken) {
+            transformFlags |= 768 /* AssertGenerator */;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~653620545 /* FunctionExcludes */;
+    }
+    function computeArrowFunction(node, subtreeFlags) {
+        // An ArrowFunction is ES6 syntax, and excludes markers that should not escape the scope of an ArrowFunction.
+        var transformFlags = subtreeFlags | 192 /* AssertES2015 */;
+        // TypeScript-specific modifiers, type parameters, and type annotations are TypeScript
+        // syntax.
+        if (ts.hasModifier(node, 2270 /* TypeScriptModifier */)
+            || node.typeParameters
+            || node.type) {
+            transformFlags |= 3 /* AssertTypeScript */;
+        }
+        // An async arrow function is ES2017 syntax.
+        if (ts.hasModifier(node, 256 /* Async */)) {
+            transformFlags |= 16 /* AssertES2017 */;
+        }
+        // arrow functions with object rest destructuring are ES Next syntax
+        if (subtreeFlags & 262144 /* ContainsObjectRestOrSpread */) {
+            transformFlags |= 8 /* AssertESNext */;
+        }
+        // If an ArrowFunction contains a lexical this, its container must capture the lexical this.
+        if (subtreeFlags & 8192 /* ContainsLexicalThis */) {
+            transformFlags |= 16384 /* ContainsCapturedLexicalThis */;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~653604161 /* ArrowFunctionExcludes */;
+    }
+    function computePropertyAccess(node, subtreeFlags) {
+        var transformFlags = subtreeFlags;
+        // If a PropertyAccessExpression starts with a super keyword, then it is
+        // ES6 syntax, and requires a lexical `this` binding.
+        if (transformFlags & 33554432 /* Super */) {
+            transformFlags ^= 33554432 /* Super */;
+            // super inside of an async function requires hoisting the super access (ES2017).
+            // same for super inside of an async generator, which is ESNext.
+            transformFlags |= 67108864 /* ContainsSuper */ | 16 /* ContainsES2017 */ | 8 /* ContainsESNext */;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~570426689 /* PropertyAccessExcludes */;
+    }
+    function computeElementAccess(node, subtreeFlags) {
+        var transformFlags = subtreeFlags;
+        var expression = node.expression;
+        var expressionFlags = expression.transformFlags; // We do not want to aggregate flags from the argument expression for super/this capturing
+        // If an ElementAccessExpression starts with a super keyword, then it is
+        // ES6 syntax, and requires a lexical `this` binding.
+        if (expressionFlags & 33554432 /* Super */) {
+            transformFlags &= ~33554432 /* Super */;
+            // super inside of an async function requires hoisting the super access (ES2017).
+            // same for super inside of an async generator, which is ESNext.
+            transformFlags |= 67108864 /* ContainsSuper */ | 16 /* ContainsES2017 */ | 8 /* ContainsESNext */;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~570426689 /* PropertyAccessExcludes */;
+    }
+    function computeVariableDeclaration(node, subtreeFlags) {
+        var transformFlags = subtreeFlags;
+        transformFlags |= 192 /* AssertES2015 */ | 2097152 /* ContainsBindingPattern */;
+        // A VariableDeclaration containing ObjectRest is ESNext syntax
+        if (subtreeFlags & 262144 /* ContainsObjectRestOrSpread */) {
+            transformFlags |= 8 /* AssertESNext */;
+        }
+        // Type annotations are TypeScript syntax.
+        if (node.type) {
+            transformFlags |= 3 /* AssertTypeScript */;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~637535553 /* NodeExcludes */;
+    }
+    function computeVariableStatement(node, subtreeFlags) {
+        var transformFlags;
+        var declarationListTransformFlags = node.declarationList.transformFlags;
+        // An ambient declaration is TypeScript syntax.
+        if (ts.hasModifier(node, 2 /* Ambient */)) {
+            transformFlags = 3 /* AssertTypeScript */;
+        }
+        else {
+            transformFlags = subtreeFlags;
+            if (declarationListTransformFlags & 2097152 /* ContainsBindingPattern */) {
+                transformFlags |= 192 /* AssertES2015 */;
+            }
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~637535553 /* NodeExcludes */;
+    }
+    function computeLabeledStatement(node, subtreeFlags) {
+        var transformFlags = subtreeFlags;
+        // A labeled statement containing a block scoped binding *may* need to be transformed from ES6.
+        if (subtreeFlags & 1048576 /* ContainsBlockScopedBinding */
+            && ts.isIterationStatement(node, /*lookInLabeledStatements*/ true)) {
+            transformFlags |= 192 /* AssertES2015 */;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~637535553 /* NodeExcludes */;
+    }
+    function computeImportEquals(node, subtreeFlags) {
+        var transformFlags = subtreeFlags;
+        // An ImportEqualsDeclaration with a namespace reference is TypeScript.
+        if (!ts.isExternalModuleImportEqualsDeclaration(node)) {
+            transformFlags |= 3 /* AssertTypeScript */;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~637535553 /* NodeExcludes */;
+    }
+    function computeExpressionStatement(node, subtreeFlags) {
+        var transformFlags = subtreeFlags;
+        // If the expression of an expression statement is a destructuring assignment,
+        // then we treat the statement as ES6 so that we can indicate that we do not
+        // need to hold on to the right-hand side.
+        if (node.expression.transformFlags & 1024 /* DestructuringAssignment */) {
+            transformFlags |= 192 /* AssertES2015 */;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~637535553 /* NodeExcludes */;
+    }
+    function computeModuleDeclaration(node, subtreeFlags) {
+        var transformFlags = 3 /* AssertTypeScript */;
+        var modifierFlags = ts.getModifierFlags(node);
+        if ((modifierFlags & 2 /* Ambient */) === 0) {
+            transformFlags |= subtreeFlags;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~647001409 /* ModuleExcludes */;
+    }
+    function computeVariableDeclarationList(node, subtreeFlags) {
+        var transformFlags = subtreeFlags | 8388608 /* ContainsHoistedDeclarationOrCompletion */;
+        if (subtreeFlags & 2097152 /* ContainsBindingPattern */) {
+            transformFlags |= 192 /* AssertES2015 */;
+        }
+        // If a VariableDeclarationList is `let` or `const`, then it is ES6 syntax.
+        if (node.flags & 3 /* BlockScoped */) {
+            transformFlags |= 192 /* AssertES2015 */ | 1048576 /* ContainsBlockScopedBinding */;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~639894849 /* VariableDeclarationListExcludes */;
+    }
+    function computeOther(node, kind, subtreeFlags) {
+        // Mark transformations needed for each node
+        var transformFlags = subtreeFlags;
+        var excludeFlags = 637535553 /* NodeExcludes */;
+        switch (kind) {
+            case 121 /* AsyncKeyword */:
+            case 201 /* AwaitExpression */:
+                // async/await is ES2017 syntax, but may be ESNext syntax (for async generators)
+                transformFlags |= 8 /* AssertESNext */ | 16 /* AssertES2017 */;
+                break;
+            case 194 /* TypeAssertionExpression */:
+            case 212 /* AsExpression */:
+            case 308 /* PartiallyEmittedExpression */:
+                // These nodes are TypeScript syntax.
+                transformFlags |= 3 /* AssertTypeScript */;
+                excludeFlags = 536872257 /* OuterExpressionExcludes */;
+                break;
+            case 115 /* PublicKeyword */:
+            case 113 /* PrivateKeyword */:
+            case 114 /* ProtectedKeyword */:
+            case 118 /* AbstractKeyword */:
+            case 125 /* DeclareKeyword */:
+            case 77 /* ConstKeyword */:
+            case 243 /* EnumDeclaration */:
+            case 278 /* EnumMember */:
+            case 213 /* NonNullExpression */:
+            case 133 /* ReadonlyKeyword */:
+                // These nodes are TypeScript syntax.
+                transformFlags |= 3 /* AssertTypeScript */;
+                break;
+            case 260 /* JsxElement */:
+            case 261 /* JsxSelfClosingElement */:
+            case 262 /* JsxOpeningElement */:
+            case 11 /* JsxText */:
+            case 263 /* JsxClosingElement */:
+            case 264 /* JsxFragment */:
+            case 265 /* JsxOpeningFragment */:
+            case 266 /* JsxClosingFragment */:
+            case 267 /* JsxAttribute */:
+            case 268 /* JsxAttributes */:
+            case 269 /* JsxSpreadAttribute */:
+            case 270 /* JsxExpression */:
+                // These nodes are Jsx syntax.
+                transformFlags |= 4 /* AssertJsx */;
+                break;
+            case 14 /* NoSubstitutionTemplateLiteral */:
+            case 15 /* TemplateHead */:
+            case 16 /* TemplateMiddle */:
+            case 17 /* TemplateTail */:
+            case 206 /* TemplateExpression */:
+            case 193 /* TaggedTemplateExpression */:
+            case 276 /* ShorthandPropertyAssignment */:
+            case 116 /* StaticKeyword */:
+            case 214 /* MetaProperty */:
+                // These nodes are ES6 syntax.
+                transformFlags |= 192 /* AssertES2015 */;
+                break;
+            case 10 /* StringLiteral */:
+                if (node.hasExtendedUnicodeEscape) {
+                    transformFlags |= 192 /* AssertES2015 */;
+                }
+                break;
+            case 8 /* NumericLiteral */:
+                if (node.numericLiteralFlags & 384 /* BinaryOrOctalSpecifier */) {
+                    transformFlags |= 192 /* AssertES2015 */;
+                }
+                break;
+            case 9 /* BigIntLiteral */:
+                transformFlags |= 8 /* AssertESNext */;
+                break;
+            case 227 /* ForOfStatement */:
+                // This node is either ES2015 syntax or ES2017 syntax (if it is a for-await-of).
+                if (node.awaitModifier) {
+                    transformFlags |= 8 /* AssertESNext */;
+                }
+                transformFlags |= 192 /* AssertES2015 */;
+                break;
+            case 207 /* YieldExpression */:
+                // This node is either ES2015 syntax (in a generator) or ES2017 syntax (in an async
+                // generator).
+                transformFlags |= 8 /* AssertESNext */ | 192 /* AssertES2015 */ | 4194304 /* ContainsYield */;
+                break;
+            case 120 /* AnyKeyword */:
+            case 135 /* NumberKeyword */:
+            case 146 /* BigIntKeyword */:
+            case 132 /* NeverKeyword */:
+            case 136 /* ObjectKeyword */:
+            case 138 /* StringKeyword */:
+            case 123 /* BooleanKeyword */:
+            case 139 /* SymbolKeyword */:
+            case 106 /* VoidKeyword */:
+            case 150 /* TypeParameter */:
+            case 153 /* PropertySignature */:
+            case 155 /* MethodSignature */:
+            case 160 /* CallSignature */:
+            case 161 /* ConstructSignature */:
+            case 162 /* IndexSignature */:
+            case 163 /* TypePredicate */:
+            case 164 /* TypeReference */:
+            case 165 /* FunctionType */:
+            case 166 /* ConstructorType */:
+            case 167 /* TypeQuery */:
+            case 168 /* TypeLiteral */:
+            case 169 /* ArrayType */:
+            case 170 /* TupleType */:
+            case 171 /* OptionalType */:
+            case 172 /* RestType */:
+            case 173 /* UnionType */:
+            case 174 /* IntersectionType */:
+            case 175 /* ConditionalType */:
+            case 176 /* InferType */:
+            case 177 /* ParenthesizedType */:
+            case 241 /* InterfaceDeclaration */:
+            case 242 /* TypeAliasDeclaration */:
+            case 178 /* ThisType */:
+            case 179 /* TypeOperator */:
+            case 180 /* IndexedAccessType */:
+            case 181 /* MappedType */:
+            case 182 /* LiteralType */:
+            case 247 /* NamespaceExportDeclaration */:
+                // Types and signatures are TypeScript syntax, and exclude all other facts.
+                transformFlags = 3 /* AssertTypeScript */;
+                excludeFlags = -3 /* TypeExcludes */;
+                break;
+            case 149 /* ComputedPropertyName */:
+                // Even though computed property names are ES6, we don't treat them as such.
+                // This is so that they can flow through PropertyName transforms unaffected.
+                // Instead, we mark the container as ES6, so that it can properly handle the transform.
+                transformFlags |= 524288 /* ContainsComputedPropertyName */;
+                if (subtreeFlags & 8192 /* ContainsLexicalThis */) {
+                    // A computed method name like `[this.getName()](x: string) { ... }` needs to
+                    // distinguish itself from the normal case of a method body containing `this`:
+                    // `this` inside a method doesn't need to be rewritten (the method provides `this`),
+                    // whereas `this` inside a computed name *might* need to be rewritten if the class/object
+                    // is inside an arrow function:
+                    // `_this = this; () => class K { [_this.getName()]() { ... } }`
+                    // To make this distinction, use ContainsLexicalThisInComputedPropertyName
+                    // instead of ContainsLexicalThis for computed property names
+                    transformFlags |= 32768 /* ContainsLexicalThisInComputedPropertyName */;
+                }
+                break;
+            case 208 /* SpreadElement */:
+                transformFlags |= 192 /* AssertES2015 */ | 131072 /* ContainsRestOrSpread */;
+                break;
+            case 277 /* SpreadAssignment */:
+                transformFlags |= 8 /* AssertESNext */ | 262144 /* ContainsObjectRestOrSpread */;
+                break;
+            case 98 /* SuperKeyword */:
+                // This node is ES6 syntax.
+                transformFlags |= 192 /* AssertES2015 */ | 33554432 /* Super */;
+                excludeFlags = 536872257 /* OuterExpressionExcludes */; // must be set to persist `Super`
+                break;
+            case 100 /* ThisKeyword */:
+                // Mark this node and its ancestors as containing a lexical `this` keyword.
+                transformFlags |= 8192 /* ContainsLexicalThis */;
+                break;
+            case 184 /* ObjectBindingPattern */:
+                transformFlags |= 192 /* AssertES2015 */ | 2097152 /* ContainsBindingPattern */;
+                if (subtreeFlags & 131072 /* ContainsRestOrSpread */) {
+                    transformFlags |= 8 /* AssertESNext */ | 262144 /* ContainsObjectRestOrSpread */;
+                }
+                excludeFlags = 637666625 /* BindingPatternExcludes */;
+                break;
+            case 185 /* ArrayBindingPattern */:
+                transformFlags |= 192 /* AssertES2015 */ | 2097152 /* ContainsBindingPattern */;
+                excludeFlags = 637666625 /* BindingPatternExcludes */;
+                break;
+            case 186 /* BindingElement */:
+                transformFlags |= 192 /* AssertES2015 */;
+                if (node.dotDotDotToken) {
+                    transformFlags |= 131072 /* ContainsRestOrSpread */;
+                }
+                break;
+            case 152 /* Decorator */:
+                // This node is TypeScript syntax, and marks its container as also being TypeScript syntax.
+                transformFlags |= 3 /* AssertTypeScript */ | 4096 /* ContainsTypeScriptClassSyntax */;
+                break;
+            case 188 /* ObjectLiteralExpression */:
+                excludeFlags = 638358849 /* ObjectLiteralExcludes */;
+                if (subtreeFlags & 524288 /* ContainsComputedPropertyName */) {
+                    // If an ObjectLiteralExpression contains a ComputedPropertyName, then it
+                    // is an ES6 node.
+                    transformFlags |= 192 /* AssertES2015 */;
+                }
+                if (subtreeFlags & 32768 /* ContainsLexicalThisInComputedPropertyName */) {
+                    // A computed property name containing `this` might need to be rewritten,
+                    // so propagate the ContainsLexicalThis flag upward.
+                    transformFlags |= 8192 /* ContainsLexicalThis */;
+                }
+                if (subtreeFlags & 262144 /* ContainsObjectRestOrSpread */) {
+                    // If an ObjectLiteralExpression contains a spread element, then it
+                    // is an ES next node.
+                    transformFlags |= 8 /* AssertESNext */;
+                }
+                break;
+            case 187 /* ArrayLiteralExpression */:
+            case 192 /* NewExpression */:
+                excludeFlags = 637666625 /* ArrayLiteralOrCallOrNewExcludes */;
+                if (subtreeFlags & 131072 /* ContainsRestOrSpread */) {
+                    // If the this node contains a SpreadExpression, then it is an ES6
+                    // node.
+                    transformFlags |= 192 /* AssertES2015 */;
+                }
+                break;
+            case 223 /* DoStatement */:
+            case 224 /* WhileStatement */:
+            case 225 /* ForStatement */:
+            case 226 /* ForInStatement */:
+                // A loop containing a block scoped binding *may* need to be transformed from ES6.
+                if (subtreeFlags & 1048576 /* ContainsBlockScopedBinding */) {
+                    transformFlags |= 192 /* AssertES2015 */;
+                }
+                break;
+            case 279 /* SourceFile */:
+                if (subtreeFlags & 16384 /* ContainsCapturedLexicalThis */) {
+                    transformFlags |= 192 /* AssertES2015 */;
+                }
+                break;
+            case 230 /* ReturnStatement */:
+                // Return statements may require an `await` in ESNext.
+                transformFlags |= 8388608 /* ContainsHoistedDeclarationOrCompletion */ | 8 /* AssertESNext */;
+                break;
+            case 228 /* ContinueStatement */:
+            case 229 /* BreakStatement */:
+                transformFlags |= 8388608 /* ContainsHoistedDeclarationOrCompletion */;
+                break;
+        }
+        node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
+        return transformFlags & ~excludeFlags;
+    }
+    /**
+     * Gets the transform flags to exclude when unioning the transform flags of a subtree.
+     *
+     * NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`.
+     *       For performance reasons, `computeTransformFlagsForNode` uses local constant values rather
+     *       than calling this function.
+     */
+    function getTransformFlagsSubtreeExclusions(kind) {
+        if (kind >= 163 /* FirstTypeNode */ && kind <= 183 /* LastTypeNode */) {
+            return -3 /* TypeExcludes */;
+        }
+        switch (kind) {
+            case 191 /* CallExpression */:
+            case 192 /* NewExpression */:
+            case 187 /* ArrayLiteralExpression */:
+                return 637666625 /* ArrayLiteralOrCallOrNewExcludes */;
+            case 244 /* ModuleDeclaration */:
+                return 647001409 /* ModuleExcludes */;
+            case 151 /* Parameter */:
+                return 637535553 /* ParameterExcludes */;
+            case 197 /* ArrowFunction */:
+                return 653604161 /* ArrowFunctionExcludes */;
+            case 196 /* FunctionExpression */:
+            case 239 /* FunctionDeclaration */:
+                return 653620545 /* FunctionExcludes */;
+            case 238 /* VariableDeclarationList */:
+                return 639894849 /* VariableDeclarationListExcludes */;
+            case 240 /* ClassDeclaration */:
+            case 209 /* ClassExpression */:
+                return 638121281 /* ClassExcludes */;
+            case 157 /* Constructor */:
+                return 653616449 /* ConstructorExcludes */;
+            case 156 /* MethodDeclaration */:
+            case 158 /* GetAccessor */:
+            case 159 /* SetAccessor */:
+                return 653616449 /* MethodOrAccessorExcludes */;
+            case 120 /* AnyKeyword */:
+            case 135 /* NumberKeyword */:
+            case 146 /* BigIntKeyword */:
+            case 132 /* NeverKeyword */:
+            case 138 /* StringKeyword */:
+            case 136 /* ObjectKeyword */:
+            case 123 /* BooleanKeyword */:
+            case 139 /* SymbolKeyword */:
+            case 106 /* VoidKeyword */:
+            case 150 /* TypeParameter */:
+            case 153 /* PropertySignature */:
+            case 155 /* MethodSignature */:
+            case 160 /* CallSignature */:
+            case 161 /* ConstructSignature */:
+            case 162 /* IndexSignature */:
+            case 241 /* InterfaceDeclaration */:
+            case 242 /* TypeAliasDeclaration */:
+                return -3 /* TypeExcludes */;
+            case 188 /* ObjectLiteralExpression */:
+                return 638358849 /* ObjectLiteralExcludes */;
+            case 274 /* CatchClause */:
+                return 637797697 /* CatchClauseExcludes */;
+            case 184 /* ObjectBindingPattern */:
+            case 185 /* ArrayBindingPattern */:
+                return 637666625 /* BindingPatternExcludes */;
+            case 194 /* TypeAssertionExpression */:
+            case 212 /* AsExpression */:
+            case 308 /* PartiallyEmittedExpression */:
+            case 195 /* ParenthesizedExpression */:
+            case 98 /* SuperKeyword */:
+                return 536872257 /* OuterExpressionExcludes */;
+            case 189 /* PropertyAccessExpression */:
+            case 190 /* ElementAccessExpression */:
+                return 570426689 /* PropertyAccessExcludes */;
+            default:
+                return 637535553 /* NodeExcludes */;
+        }
+    }
+    ts.getTransformFlagsSubtreeExclusions = getTransformFlagsSubtreeExclusions;
+    /**
+     * "Binds" JSDoc nodes in TypeScript code.
+     * Since we will never create symbols for JSDoc, we just set parent pointers instead.
+     */
+    function setParentPointers(parent, child) {
+        child.parent = parent;
+        ts.forEachChild(child, function (grandchild) { return setParentPointers(child, grandchild); });
+    }
+})(ts || (ts = {}));
+/** @internal */
+var ts;
+(function (ts) {
+    function createGetSymbolWalker(getRestTypeOfSignature, getTypePredicateOfSignature, getReturnTypeOfSignature, getBaseTypes, resolveStructuredTypeMembers, getTypeOfSymbol, getResolvedSymbol, getIndexTypeOfStructuredType, getConstraintOfTypeParameter, getFirstIdentifier) {
+        return getSymbolWalker;
+        function getSymbolWalker(accept) {
+            if (accept === void 0) { accept = function () { return true; }; }
+            var visitedTypes = []; // Sparse array from id to type
+            var visitedSymbols = []; // Sparse array from id to symbol
+            return {
+                walkType: function (type) {
+                    try {
+                        visitType(type);
+                        return { visitedTypes: ts.getOwnValues(visitedTypes), visitedSymbols: ts.getOwnValues(visitedSymbols) };
+                    }
+                    finally {
+                        ts.clear(visitedTypes);
+                        ts.clear(visitedSymbols);
+                    }
+                },
+                walkSymbol: function (symbol) {
+                    try {
+                        visitSymbol(symbol);
+                        return { visitedTypes: ts.getOwnValues(visitedTypes), visitedSymbols: ts.getOwnValues(visitedSymbols) };
+                    }
+                    finally {
+                        ts.clear(visitedTypes);
+                        ts.clear(visitedSymbols);
+                    }
+                },
+            };
+            function visitType(type) {
+                if (!type) {
+                    return;
+                }
+                if (visitedTypes[type.id]) {
+                    return;
+                }
+                visitedTypes[type.id] = type;
+                // Reuse visitSymbol to visit the type's symbol,
+                //  but be sure to bail on recuring into the type if accept declines the symbol.
+                var shouldBail = visitSymbol(type.symbol);
+                if (shouldBail)
+                    return;
+                // Visit the type's related types, if any
+                if (type.flags & 524288 /* Object */) {
+                    var objectType = type;
+                    var objectFlags = objectType.objectFlags;
+                    if (objectFlags & 4 /* Reference */) {
+                        visitTypeReference(type);
+                    }
+                    if (objectFlags & 32 /* Mapped */) {
+                        visitMappedType(type);
+                    }
+                    if (objectFlags & (1 /* Class */ | 2 /* Interface */)) {
+                        visitInterfaceType(type);
+                    }
+                    if (objectFlags & (8 /* Tuple */ | 16 /* Anonymous */)) {
+                        visitObjectType(objectType);
+                    }
+                }
+                if (type.flags & 262144 /* TypeParameter */) {
+                    visitTypeParameter(type);
+                }
+                if (type.flags & 3145728 /* UnionOrIntersection */) {
+                    visitUnionOrIntersectionType(type);
+                }
+                if (type.flags & 4194304 /* Index */) {
+                    visitIndexType(type);
+                }
+                if (type.flags & 8388608 /* IndexedAccess */) {
+                    visitIndexedAccessType(type);
+                }
+            }
+            function visitTypeReference(type) {
+                visitType(type.target);
+                ts.forEach(type.typeArguments, visitType);
+            }
+            function visitTypeParameter(type) {
+                visitType(getConstraintOfTypeParameter(type));
+            }
+            function visitUnionOrIntersectionType(type) {
+                ts.forEach(type.types, visitType);
+            }
+            function visitIndexType(type) {
+                visitType(type.type);
+            }
+            function visitIndexedAccessType(type) {
+                visitType(type.objectType);
+                visitType(type.indexType);
+                visitType(type.constraint);
+            }
+            function visitMappedType(type) {
+                visitType(type.typeParameter);
+                visitType(type.constraintType);
+                visitType(type.templateType);
+                visitType(type.modifiersType);
+            }
+            function visitSignature(signature) {
+                var typePredicate = getTypePredicateOfSignature(signature);
+                if (typePredicate) {
+                    visitType(typePredicate.type);
+                }
+                ts.forEach(signature.typeParameters, visitType);
+                for (var _i = 0, _a = signature.parameters; _i < _a.length; _i++) {
+                    var parameter = _a[_i];
+                    visitSymbol(parameter);
+                }
+                visitType(getRestTypeOfSignature(signature));
+                visitType(getReturnTypeOfSignature(signature));
+            }
+            function visitInterfaceType(interfaceT) {
+                visitObjectType(interfaceT);
+                ts.forEach(interfaceT.typeParameters, visitType);
+                ts.forEach(getBaseTypes(interfaceT), visitType);
+                visitType(interfaceT.thisType);
+            }
+            function visitObjectType(type) {
+                var stringIndexType = getIndexTypeOfStructuredType(type, 0 /* String */);
+                visitType(stringIndexType);
+                var numberIndexType = getIndexTypeOfStructuredType(type, 1 /* Number */);
+                visitType(numberIndexType);
+                // The two checks above *should* have already resolved the type (if needed), so this should be cached
+                var resolved = resolveStructuredTypeMembers(type);
+                for (var _i = 0, _a = resolved.callSignatures; _i < _a.length; _i++) {
+                    var signature = _a[_i];
+                    visitSignature(signature);
+                }
+                for (var _b = 0, _c = resolved.constructSignatures; _b < _c.length; _b++) {
+                    var signature = _c[_b];
+                    visitSignature(signature);
+                }
+                for (var _d = 0, _e = resolved.properties; _d < _e.length; _d++) {
+                    var p = _e[_d];
+                    visitSymbol(p);
+                }
+            }
+            function visitSymbol(symbol) {
+                if (!symbol) {
+                    return false;
+                }
+                var symbolId = ts.getSymbolId(symbol);
+                if (visitedSymbols[symbolId]) {
+                    return false;
+                }
+                visitedSymbols[symbolId] = symbol;
+                if (!accept(symbol)) {
+                    return true;
+                }
+                var t = getTypeOfSymbol(symbol);
+                visitType(t); // Should handle members on classes and such
+                if (symbol.exports) {
+                    symbol.exports.forEach(visitSymbol);
+                }
+                ts.forEach(symbol.declarations, function (d) {
+                    // Type queries are too far resolved when we just visit the symbol's type
+                    //  (their type resolved directly to the member deeply referenced)
+                    // So to get the intervening symbols, we need to check if there's a type
+                    // query node on any of the symbol's declarations and get symbols there
+                    if (d.type && d.type.kind === 167 /* TypeQuery */) {
+                        var query = d.type;
+                        var entity = getResolvedSymbol(getFirstIdentifier(query.exprName));
+                        visitSymbol(entity);
+                    }
+                });
+                return false;
+            }
+        }
+    }
+    ts.createGetSymbolWalker = createGetSymbolWalker;
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var ambientModuleSymbolRegex = /^".+"$/;
+    var nextSymbolId = 1;
+    var nextNodeId = 1;
+    var nextMergeId = 1;
+    var nextFlowId = 1;
+    function getNodeId(node) {
+        if (!node.id) {
+            node.id = nextNodeId;
+            nextNodeId++;
+        }
+        return node.id;
+    }
+    ts.getNodeId = getNodeId;
+    function getSymbolId(symbol) {
+        if (!symbol.id) {
+            symbol.id = nextSymbolId;
+            nextSymbolId++;
+        }
+        return symbol.id;
+    }
+    ts.getSymbolId = getSymbolId;
+    function isInstantiatedModule(node, preserveConstEnums) {
+        var moduleState = ts.getModuleInstanceState(node);
+        return moduleState === 1 /* Instantiated */ ||
+            (preserveConstEnums && moduleState === 2 /* ConstEnumOnly */);
+    }
+    ts.isInstantiatedModule = isInstantiatedModule;
+    function createTypeChecker(host, produceDiagnostics) {
+        var getPackagesSet = ts.memoize(function () {
+            var set = ts.createMap();
+            host.getSourceFiles().forEach(function (sf) {
+                if (!sf.resolvedModules)
+                    return;
+                ts.forEachEntry(sf.resolvedModules, function (r) {
+                    if (r && r.packageId)
+                        set.set(r.packageId.name, true);
+                });
+            });
+            return set;
+        });
+        // Cancellation that controls whether or not we can cancel in the middle of type checking.
+        // In general cancelling is *not* safe for the type checker.  We might be in the middle of
+        // computing something, and we will leave our internals in an inconsistent state.  Callers
+        // who set the cancellation token should catch if a cancellation exception occurs, and
+        // should throw away and create a new TypeChecker.
+        //
+        // Currently we only support setting the cancellation token when getting diagnostics.  This
+        // is because diagnostics can be quite expensive, and we want to allow hosts to bail out if
+        // they no longer need the information (for example, if the user started editing again).
+        var cancellationToken;
+        var requestedExternalEmitHelpers;
+        var externalHelpersModule;
+        // tslint:disable variable-name
+        var Symbol = ts.objectAllocator.getSymbolConstructor();
+        var Type = ts.objectAllocator.getTypeConstructor();
+        var Signature = ts.objectAllocator.getSignatureConstructor();
+        // tslint:enable variable-name
+        var typeCount = 0;
+        var symbolCount = 0;
+        var enumCount = 0;
+        var instantiationDepth = 0;
+        var constraintDepth = 0;
+        var emptySymbols = ts.createSymbolTable();
+        var identityMapper = ts.identity;
+        var compilerOptions = host.getCompilerOptions();
+        var languageVersion = ts.getEmitScriptTarget(compilerOptions);
+        var moduleKind = ts.getEmitModuleKind(compilerOptions);
+        var allowSyntheticDefaultImports = ts.getAllowSyntheticDefaultImports(compilerOptions);
+        var strictNullChecks = ts.getStrictOptionValue(compilerOptions, "strictNullChecks");
+        var strictFunctionTypes = ts.getStrictOptionValue(compilerOptions, "strictFunctionTypes");
+        var strictBindCallApply = ts.getStrictOptionValue(compilerOptions, "strictBindCallApply");
+        var strictPropertyInitialization = ts.getStrictOptionValue(compilerOptions, "strictPropertyInitialization");
+        var noImplicitAny = ts.getStrictOptionValue(compilerOptions, "noImplicitAny");
+        var noImplicitThis = ts.getStrictOptionValue(compilerOptions, "noImplicitThis");
+        var keyofStringsOnly = !!compilerOptions.keyofStringsOnly;
+        var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 32768 /* FreshLiteral */;
+        var emitResolver = createResolver();
+        var nodeBuilder = createNodeBuilder();
+        var undefinedSymbol = createSymbol(4 /* Property */, "undefined");
+        undefinedSymbol.declarations = [];
+        var argumentsSymbol = createSymbol(4 /* Property */, "arguments");
+        var requireSymbol = createSymbol(4 /* Property */, "require");
+        /** This will be set during calls to `getResolvedSignature` where services determines an apparent number of arguments greater than what is actually provided. */
+        var apparentArgumentCount;
+        // for public members that accept a Node or one of its subtypes, we must guard against
+        // synthetic nodes created during transformations by calling `getParseTreeNode`.
+        // for most of these, we perform the guard only on `checker` to avoid any possible
+        // extra cost of calling `getParseTreeNode` when calling these functions from inside the
+        // checker.
+        var checker = {
+            getNodeCount: function () { return ts.sum(host.getSourceFiles(), "nodeCount"); },
+            getIdentifierCount: function () { return ts.sum(host.getSourceFiles(), "identifierCount"); },
+            getSymbolCount: function () { return ts.sum(host.getSourceFiles(), "symbolCount") + symbolCount; },
+            getTypeCount: function () { return typeCount; },
+            isUndefinedSymbol: function (symbol) { return symbol === undefinedSymbol; },
+            isArgumentsSymbol: function (symbol) { return symbol === argumentsSymbol; },
+            isUnknownSymbol: function (symbol) { return symbol === unknownSymbol; },
+            getMergedSymbol: getMergedSymbol,
+            getDiagnostics: getDiagnostics,
+            getGlobalDiagnostics: getGlobalDiagnostics,
+            getTypeOfSymbolAtLocation: function (symbol, location) {
+                location = ts.getParseTreeNode(location);
+                return location ? getTypeOfSymbolAtLocation(symbol, location) : errorType;
+            },
+            getSymbolsOfParameterPropertyDeclaration: function (parameterIn, parameterName) {
+                var parameter = ts.getParseTreeNode(parameterIn, ts.isParameter);
+                if (parameter === undefined)
+                    return ts.Debug.fail("Cannot get symbols of a synthetic parameter that cannot be resolved to a parse-tree node.");
+                return getSymbolsOfParameterPropertyDeclaration(parameter, ts.escapeLeadingUnderscores(parameterName));
+            },
+            getDeclaredTypeOfSymbol: getDeclaredTypeOfSymbol,
+            getPropertiesOfType: getPropertiesOfType,
+            getPropertyOfType: function (type, name) { return getPropertyOfType(type, ts.escapeLeadingUnderscores(name)); },
+            getTypeOfPropertyOfType: function (type, name) { return getTypeOfPropertyOfType(type, ts.escapeLeadingUnderscores(name)); },
+            getIndexInfoOfType: getIndexInfoOfType,
+            getSignaturesOfType: getSignaturesOfType,
+            getIndexTypeOfType: getIndexTypeOfType,
+            getBaseTypes: getBaseTypes,
+            getBaseTypeOfLiteralType: getBaseTypeOfLiteralType,
+            getWidenedType: getWidenedType,
+            getTypeFromTypeNode: function (nodeIn) {
+                var node = ts.getParseTreeNode(nodeIn, ts.isTypeNode);
+                return node ? getTypeFromTypeNode(node) : errorType;
+            },
+            getParameterType: getTypeAtPosition,
+            getPromisedTypeOfPromise: getPromisedTypeOfPromise,
+            getReturnTypeOfSignature: getReturnTypeOfSignature,
+            getNullableType: getNullableType,
+            getNonNullableType: getNonNullableType,
+            typeToTypeNode: nodeBuilder.typeToTypeNode,
+            indexInfoToIndexSignatureDeclaration: nodeBuilder.indexInfoToIndexSignatureDeclaration,
+            signatureToSignatureDeclaration: nodeBuilder.signatureToSignatureDeclaration,
+            symbolToEntityName: nodeBuilder.symbolToEntityName,
+            symbolToExpression: nodeBuilder.symbolToExpression,
+            symbolToTypeParameterDeclarations: nodeBuilder.symbolToTypeParameterDeclarations,
+            symbolToParameterDeclaration: nodeBuilder.symbolToParameterDeclaration,
+            typeParameterToDeclaration: nodeBuilder.typeParameterToDeclaration,
+            getSymbolsInScope: function (location, meaning) {
+                location = ts.getParseTreeNode(location);
+                return location ? getSymbolsInScope(location, meaning) : [];
+            },
+            getSymbolAtLocation: function (node) {
+                node = ts.getParseTreeNode(node);
+                return node ? getSymbolAtLocation(node) : undefined;
+            },
+            getShorthandAssignmentValueSymbol: function (node) {
+                node = ts.getParseTreeNode(node);
+                return node ? getShorthandAssignmentValueSymbol(node) : undefined;
+            },
+            getExportSpecifierLocalTargetSymbol: function (nodeIn) {
+                var node = ts.getParseTreeNode(nodeIn, ts.isExportSpecifier);
+                return node ? getExportSpecifierLocalTargetSymbol(node) : undefined;
+            },
+            getExportSymbolOfSymbol: function (symbol) {
+                return getMergedSymbol(symbol.exportSymbol || symbol);
+            },
+            getTypeAtLocation: function (node) {
+                node = ts.getParseTreeNode(node);
+                return node ? getTypeOfNode(node) : errorType;
+            },
+            getPropertySymbolOfDestructuringAssignment: function (locationIn) {
+                var location = ts.getParseTreeNode(locationIn, ts.isIdentifier);
+                return location ? getPropertySymbolOfDestructuringAssignment(location) : undefined;
+            },
+            signatureToString: function (signature, enclosingDeclaration, flags, kind) {
+                return signatureToString(signature, ts.getParseTreeNode(enclosingDeclaration), flags, kind);
+            },
+            typeToString: function (type, enclosingDeclaration, flags) {
+                return typeToString(type, ts.getParseTreeNode(enclosingDeclaration), flags);
+            },
+            symbolToString: function (symbol, enclosingDeclaration, meaning, flags) {
+                return symbolToString(symbol, ts.getParseTreeNode(enclosingDeclaration), meaning, flags);
+            },
+            typePredicateToString: function (predicate, enclosingDeclaration, flags) {
+                return typePredicateToString(predicate, ts.getParseTreeNode(enclosingDeclaration), flags);
+            },
+            writeSignature: function (signature, enclosingDeclaration, flags, kind, writer) {
+                return signatureToString(signature, ts.getParseTreeNode(enclosingDeclaration), flags, kind, writer);
+            },
+            writeType: function (type, enclosingDeclaration, flags, writer) {
+                return typeToString(type, ts.getParseTreeNode(enclosingDeclaration), flags, writer);
+            },
+            writeSymbol: function (symbol, enclosingDeclaration, meaning, flags, writer) {
+                return symbolToString(symbol, ts.getParseTreeNode(enclosingDeclaration), meaning, flags, writer);
+            },
+            writeTypePredicate: function (predicate, enclosingDeclaration, flags, writer) {
+                return typePredicateToString(predicate, ts.getParseTreeNode(enclosingDeclaration), flags, writer);
+            },
+            getAugmentedPropertiesOfType: getAugmentedPropertiesOfType,
+            getRootSymbols: getRootSymbols,
+            getContextualType: function (nodeIn) {
+                var node = ts.getParseTreeNode(nodeIn, ts.isExpression);
+                return node ? getContextualType(node) : undefined;
+            },
+            getContextualTypeForObjectLiteralElement: function (nodeIn) {
+                var node = ts.getParseTreeNode(nodeIn, ts.isObjectLiteralElementLike);
+                return node ? getContextualTypeForObjectLiteralElement(node) : undefined;
+            },
+            getContextualTypeForArgumentAtIndex: function (nodeIn, argIndex) {
+                var node = ts.getParseTreeNode(nodeIn, ts.isCallLikeExpression);
+                return node && getContextualTypeForArgumentAtIndex(node, argIndex);
+            },
+            getContextualTypeForJsxAttribute: function (nodeIn) {
+                var node = ts.getParseTreeNode(nodeIn, ts.isJsxAttributeLike);
+                return node && getContextualTypeForJsxAttribute(node);
+            },
+            isContextSensitive: isContextSensitive,
+            getFullyQualifiedName: getFullyQualifiedName,
+            getResolvedSignature: function (node, candidatesOutArray, agumentCount) {
+                return getResolvedSignatureWorker(node, candidatesOutArray, agumentCount, /*isForSignatureHelp*/ false);
+            },
+            getResolvedSignatureForSignatureHelp: function (node, candidatesOutArray, agumentCount) {
+                return getResolvedSignatureWorker(node, candidatesOutArray, agumentCount, /*isForSignatureHelp*/ true);
+            },
+            getConstantValue: function (nodeIn) {
+                var node = ts.getParseTreeNode(nodeIn, canHaveConstantValue);
+                return node ? getConstantValue(node) : undefined;
+            },
+            isValidPropertyAccess: function (nodeIn, propertyName) {
+                var node = ts.getParseTreeNode(nodeIn, ts.isPropertyAccessOrQualifiedNameOrImportTypeNode);
+                return !!node && isValidPropertyAccess(node, ts.escapeLeadingUnderscores(propertyName));
+            },
+            isValidPropertyAccessForCompletions: function (nodeIn, type, property) {
+                var node = ts.getParseTreeNode(nodeIn, ts.isPropertyAccessExpression);
+                return !!node && isValidPropertyAccessForCompletions(node, type, property);
+            },
+            getSignatureFromDeclaration: function (declarationIn) {
+                var declaration = ts.getParseTreeNode(declarationIn, ts.isFunctionLike);
+                return declaration ? getSignatureFromDeclaration(declaration) : undefined;
+            },
+            isImplementationOfOverload: function (node) {
+                var parsed = ts.getParseTreeNode(node, ts.isFunctionLike);
+                return parsed ? isImplementationOfOverload(parsed) : undefined;
+            },
+            getImmediateAliasedSymbol: getImmediateAliasedSymbol,
+            getAliasedSymbol: resolveAlias,
+            getEmitResolver: getEmitResolver,
+            getExportsOfModule: getExportsOfModuleAsArray,
+            getExportsAndPropertiesOfModule: getExportsAndPropertiesOfModule,
+            getSymbolWalker: ts.createGetSymbolWalker(getRestTypeOfSignature, getTypePredicateOfSignature, getReturnTypeOfSignature, getBaseTypes, resolveStructuredTypeMembers, getTypeOfSymbol, getResolvedSymbol, getIndexTypeOfStructuredType, getConstraintOfTypeParameter, getFirstIdentifier),
+            getAmbientModules: getAmbientModules,
+            getJsxIntrinsicTagNamesAt: getJsxIntrinsicTagNamesAt,
+            isOptionalParameter: function (nodeIn) {
+                var node = ts.getParseTreeNode(nodeIn, ts.isParameter);
+                return node ? isOptionalParameter(node) : false;
+            },
+            tryGetMemberInModuleExports: function (name, symbol) { return tryGetMemberInModuleExports(ts.escapeLeadingUnderscores(name), symbol); },
+            tryGetMemberInModuleExportsAndProperties: function (name, symbol) { return tryGetMemberInModuleExportsAndProperties(ts.escapeLeadingUnderscores(name), symbol); },
+            tryFindAmbientModuleWithoutAugmentations: function (moduleName) {
+                // we deliberately exclude augmentations
+                // since we are only interested in declarations of the module itself
+                return tryFindAmbientModule(moduleName, /*withAugmentations*/ false);
+            },
+            getApparentType: getApparentType,
+            getUnionType: getUnionType,
+            createAnonymousType: createAnonymousType,
+            createSignature: createSignature,
+            createSymbol: createSymbol,
+            createIndexInfo: createIndexInfo,
+            getAnyType: function () { return anyType; },
+            getStringType: function () { return stringType; },
+            getNumberType: function () { return numberType; },
+            createPromiseType: createPromiseType,
+            createArrayType: createArrayType,
+            getElementTypeOfArrayType: getElementTypeOfArrayType,
+            getBooleanType: function () { return booleanType; },
+            getFalseType: function (fresh) { return fresh ? falseType : regularFalseType; },
+            getTrueType: function (fresh) { return fresh ? trueType : regularTrueType; },
+            getVoidType: function () { return voidType; },
+            getUndefinedType: function () { return undefinedType; },
+            getNullType: function () { return nullType; },
+            getESSymbolType: function () { return esSymbolType; },
+            getNeverType: function () { return neverType; },
+            isSymbolAccessible: isSymbolAccessible,
+            getObjectFlags: ts.getObjectFlags,
+            isArrayLikeType: isArrayLikeType,
+            isTypeInvalidDueToUnionDiscriminant: isTypeInvalidDueToUnionDiscriminant,
+            getAllPossiblePropertiesOfTypes: getAllPossiblePropertiesOfTypes,
+            getSuggestionForNonexistentProperty: function (node, type) { return getSuggestionForNonexistentProperty(node, type); },
+            getSuggestionForNonexistentSymbol: function (location, name, meaning) { return getSuggestionForNonexistentSymbol(location, ts.escapeLeadingUnderscores(name), meaning); },
+            getSuggestionForNonexistentExport: function (node, target) { return getSuggestionForNonexistentExport(node, target); },
+            getBaseConstraintOfType: getBaseConstraintOfType,
+            getDefaultFromTypeParameter: function (type) { return type && type.flags & 262144 /* TypeParameter */ ? getDefaultFromTypeParameter(type) : undefined; },
+            resolveName: function (name, location, meaning, excludeGlobals) {
+                return resolveName(location, ts.escapeLeadingUnderscores(name), meaning, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false, excludeGlobals);
+            },
+            getJsxNamespace: function (n) { return ts.unescapeLeadingUnderscores(getJsxNamespace(n)); },
+            getAccessibleSymbolChain: getAccessibleSymbolChain,
+            getTypePredicateOfSignature: getTypePredicateOfSignature,
+            resolveExternalModuleSymbol: resolveExternalModuleSymbol,
+            tryGetThisTypeAt: function (node) {
+                node = ts.getParseTreeNode(node);
+                return node && tryGetThisTypeAt(node);
+            },
+            getTypeArgumentConstraint: function (nodeIn) {
+                var node = ts.getParseTreeNode(nodeIn, ts.isTypeNode);
+                return node && getTypeArgumentConstraint(node);
+            },
+            getSuggestionDiagnostics: function (file, ct) {
+                if (ts.skipTypeChecking(file, compilerOptions)) {
+                    return ts.emptyArray;
+                }
+                var diagnostics;
+                try {
+                    // Record the cancellation token so it can be checked later on during checkSourceElement.
+                    // Do this in a finally block so we can ensure that it gets reset back to nothing after
+                    // this call is done.
+                    cancellationToken = ct;
+                    // Ensure file is type checked
+                    checkSourceFile(file);
+                    ts.Debug.assert(!!(getNodeLinks(file).flags & 1 /* TypeChecked */));
+                    diagnostics = ts.addRange(diagnostics, suggestionDiagnostics.get(file.fileName));
+                    if (!file.isDeclarationFile && (!unusedIsError(0 /* Local */) || !unusedIsError(1 /* Parameter */))) {
+                        addUnusedDiagnostics();
+                    }
+                    return diagnostics || ts.emptyArray;
+                }
+                finally {
+                    cancellationToken = undefined;
+                }
+                function addUnusedDiagnostics() {
+                    checkUnusedIdentifiers(getPotentiallyUnusedIdentifiers(file), function (containingNode, kind, diag) {
+                        if (!ts.containsParseError(containingNode) && !unusedIsError(kind)) {
+                            (diagnostics || (diagnostics = [])).push(__assign({}, diag, { category: ts.DiagnosticCategory.Suggestion }));
+                        }
+                    });
+                }
+            },
+            runWithCancellationToken: function (token, callback) {
+                try {
+                    cancellationToken = token;
+                    return callback(checker);
+                }
+                finally {
+                    cancellationToken = undefined;
+                }
+            },
+            getLocalTypeParametersOfClassOrInterfaceOrTypeAlias: getLocalTypeParametersOfClassOrInterfaceOrTypeAlias,
+        };
+        function getResolvedSignatureWorker(nodeIn, candidatesOutArray, argumentCount, isForSignatureHelp) {
+            var node = ts.getParseTreeNode(nodeIn, ts.isCallLikeExpression);
+            apparentArgumentCount = argumentCount;
+            var res = node ? getResolvedSignature(node, candidatesOutArray, isForSignatureHelp) : undefined;
+            apparentArgumentCount = undefined;
+            return res;
+        }
+        var tupleTypes = ts.createMap();
+        var unionTypes = ts.createMap();
+        var intersectionTypes = ts.createMap();
+        var literalTypes = ts.createMap();
+        var indexedAccessTypes = ts.createMap();
+        var evolvingArrayTypes = [];
+        var undefinedProperties = ts.createMap();
+        var unknownSymbol = createSymbol(4 /* Property */, "unknown");
+        var resolvingSymbol = createSymbol(0, "__resolving__" /* Resolving */);
+        var anyType = createIntrinsicType(1 /* Any */, "any");
+        var autoType = createIntrinsicType(1 /* Any */, "any");
+        var wildcardType = createIntrinsicType(1 /* Any */, "any");
+        var errorType = createIntrinsicType(1 /* Any */, "error");
+        var unknownType = createIntrinsicType(2 /* Unknown */, "unknown");
+        var undefinedType = createIntrinsicType(32768 /* Undefined */, "undefined");
+        var undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(32768 /* Undefined */ | 134217728 /* ContainsWideningType */, "undefined");
+        var nullType = createIntrinsicType(65536 /* Null */, "null");
+        var nullWideningType = strictNullChecks ? nullType : createIntrinsicType(65536 /* Null */ | 134217728 /* ContainsWideningType */, "null");
+        var stringType = createIntrinsicType(4 /* String */, "string");
+        var numberType = createIntrinsicType(8 /* Number */, "number");
+        var bigintType = createIntrinsicType(64 /* BigInt */, "bigint");
+        var falseType = createIntrinsicType(512 /* BooleanLiteral */, "false");
+        var regularFalseType = createIntrinsicType(512 /* BooleanLiteral */, "false");
+        var trueType = createIntrinsicType(512 /* BooleanLiteral */, "true");
+        var regularTrueType = createIntrinsicType(512 /* BooleanLiteral */, "true");
+        trueType.regularType = regularTrueType;
+        trueType.freshType = trueType;
+        regularTrueType.regularType = regularTrueType;
+        regularTrueType.freshType = trueType;
+        falseType.regularType = regularFalseType;
+        falseType.freshType = falseType;
+        regularFalseType.regularType = regularFalseType;
+        regularFalseType.freshType = falseType;
+        var booleanType = createBooleanType([regularFalseType, regularTrueType]);
+        // Also mark all combinations of fresh/regular booleans as "Boolean" so they print as `boolean` instead of `true | false`
+        // (The union is cached, so simply doing the marking here is sufficient)
+        createBooleanType([regularFalseType, trueType]);
+        createBooleanType([falseType, regularTrueType]);
+        createBooleanType([falseType, trueType]);
+        var esSymbolType = createIntrinsicType(4096 /* ESSymbol */, "symbol");
+        var voidType = createIntrinsicType(16384 /* Void */, "void");
+        var neverType = createIntrinsicType(131072 /* Never */, "never");
+        var silentNeverType = createIntrinsicType(131072 /* Never */, "never");
+        var implicitNeverType = createIntrinsicType(131072 /* Never */, "never");
+        var nonPrimitiveType = createIntrinsicType(67108864 /* NonPrimitive */, "object");
+        var stringNumberSymbolType = getUnionType([stringType, numberType, esSymbolType]);
+        var keyofConstraintType = keyofStringsOnly ? stringType : stringNumberSymbolType;
+        var numberOrBigIntType = getUnionType([numberType, bigintType]);
+        var emptyObjectType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
+        var emptyJsxObjectType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
+        emptyJsxObjectType.objectFlags |= 4096 /* JsxAttributes */;
+        var emptyTypeLiteralSymbol = createSymbol(2048 /* TypeLiteral */, "__type" /* Type */);
+        emptyTypeLiteralSymbol.members = ts.createSymbolTable();
+        var emptyTypeLiteralType = createAnonymousType(emptyTypeLiteralSymbol, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
+        var emptyGenericType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
+        emptyGenericType.instantiations = ts.createMap();
+        var anyFunctionType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
+        // The anyFunctionType contains the anyFunctionType by definition. The flag is further propagated
+        // in getPropagatingFlagsOfTypes, and it is checked in inferFromTypes.
+        anyFunctionType.flags |= 536870912 /* ContainsAnyFunctionType */;
+        var noConstraintType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
+        var circularConstraintType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
+        var resolvingDefaultType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
+        var markerSuperType = createTypeParameter();
+        var markerSubType = createTypeParameter();
+        markerSubType.constraint = markerSuperType;
+        var markerOtherType = createTypeParameter();
+        var noTypePredicate = createIdentifierTypePredicate("<<unresolved>>", 0, anyType);
+        var anySignature = createSignature(undefined, undefined, undefined, ts.emptyArray, anyType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
+        var unknownSignature = createSignature(undefined, undefined, undefined, ts.emptyArray, errorType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
+        var resolvingSignature = createSignature(undefined, undefined, undefined, ts.emptyArray, anyType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
+        var silentNeverSignature = createSignature(undefined, undefined, undefined, ts.emptyArray, silentNeverType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
+        var enumNumberIndexInfo = createIndexInfo(stringType, /*isReadonly*/ true);
+        var globals = ts.createSymbolTable();
+        /** Key is "/path/to/a.ts|/path/to/b.ts". */
+        var amalgamatedDuplicates;
+        var reverseMappedCache = ts.createMap();
+        var ambientModulesCache;
+        /**
+         * List of every ambient module with a "*" wildcard.
+         * Unlike other ambient modules, these can't be stored in `globals` because symbol tables only deal with exact matches.
+         * This is only used if there is no exact match.
+         */
+        var patternAmbientModules;
+        var globalObjectType;
+        var globalFunctionType;
+        var globalCallableFunctionType;
+        var globalNewableFunctionType;
+        var globalArrayType;
+        var globalReadonlyArrayType;
+        var globalStringType;
+        var globalNumberType;
+        var globalBooleanType;
+        var globalRegExpType;
+        var globalThisType;
+        var anyArrayType;
+        var autoArrayType;
+        var anyReadonlyArrayType;
+        var deferredGlobalNonNullableTypeAlias;
+        // The library files are only loaded when the feature is used.
+        // This allows users to just specify library files they want to used through --lib
+        // and they will not get an error from not having unrelated library files
+        var deferredGlobalESSymbolConstructorSymbol;
+        var deferredGlobalESSymbolType;
+        var deferredGlobalTypedPropertyDescriptorType;
+        var deferredGlobalPromiseType;
+        var deferredGlobalPromiseLikeType;
+        var deferredGlobalPromiseConstructorSymbol;
+        var deferredGlobalPromiseConstructorLikeType;
+        var deferredGlobalIterableType;
+        var deferredGlobalIteratorType;
+        var deferredGlobalIterableIteratorType;
+        var deferredGlobalAsyncIterableType;
+        var deferredGlobalAsyncIteratorType;
+        var deferredGlobalAsyncIterableIteratorType;
+        var deferredGlobalTemplateStringsArrayType;
+        var deferredGlobalImportMetaType;
+        var deferredGlobalExtractSymbol;
+        var deferredGlobalExcludeSymbol;
+        var deferredGlobalPickSymbol;
+        var deferredGlobalBigIntType;
+        var allPotentiallyUnusedIdentifiers = ts.createMap(); // key is file name
+        var flowLoopStart = 0;
+        var flowLoopCount = 0;
+        var sharedFlowCount = 0;
+        var flowAnalysisDisabled = false;
+        var emptyStringType = getLiteralType("");
+        var zeroType = getLiteralType(0);
+        var zeroBigIntType = getLiteralType({ negative: false, base10Value: "0" });
+        var resolutionTargets = [];
+        var resolutionResults = [];
+        var resolutionPropertyNames = [];
+        var suggestionCount = 0;
+        var maximumSuggestionCount = 10;
+        var mergedSymbols = [];
+        var symbolLinks = [];
+        var nodeLinks = [];
+        var flowLoopCaches = [];
+        var flowLoopNodes = [];
+        var flowLoopKeys = [];
+        var flowLoopTypes = [];
+        var sharedFlowNodes = [];
+        var sharedFlowTypes = [];
+        var potentialThisCollisions = [];
+        var potentialNewTargetCollisions = [];
+        var awaitedTypeStack = [];
+        var diagnostics = ts.createDiagnosticCollection();
+        // Suggestion diagnostics must have a file. Keyed by source file name.
+        var suggestionDiagnostics = ts.createMultiMap();
+        var TypeFacts;
+        (function (TypeFacts) {
+            TypeFacts[TypeFacts["None"] = 0] = "None";
+            TypeFacts[TypeFacts["TypeofEQString"] = 1] = "TypeofEQString";
+            TypeFacts[TypeFacts["TypeofEQNumber"] = 2] = "TypeofEQNumber";
+            TypeFacts[TypeFacts["TypeofEQBigInt"] = 4] = "TypeofEQBigInt";
+            TypeFacts[TypeFacts["TypeofEQBoolean"] = 8] = "TypeofEQBoolean";
+            TypeFacts[TypeFacts["TypeofEQSymbol"] = 16] = "TypeofEQSymbol";
+            TypeFacts[TypeFacts["TypeofEQObject"] = 32] = "TypeofEQObject";
+            TypeFacts[TypeFacts["TypeofEQFunction"] = 64] = "TypeofEQFunction";
+            TypeFacts[TypeFacts["TypeofEQHostObject"] = 128] = "TypeofEQHostObject";
+            TypeFacts[TypeFacts["TypeofNEString"] = 256] = "TypeofNEString";
+            TypeFacts[TypeFacts["TypeofNENumber"] = 512] = "TypeofNENumber";
+            TypeFacts[TypeFacts["TypeofNEBigInt"] = 1024] = "TypeofNEBigInt";
+            TypeFacts[TypeFacts["TypeofNEBoolean"] = 2048] = "TypeofNEBoolean";
+            TypeFacts[TypeFacts["TypeofNESymbol"] = 4096] = "TypeofNESymbol";
+            TypeFacts[TypeFacts["TypeofNEObject"] = 8192] = "TypeofNEObject";
+            TypeFacts[TypeFacts["TypeofNEFunction"] = 16384] = "TypeofNEFunction";
+            TypeFacts[TypeFacts["TypeofNEHostObject"] = 32768] = "TypeofNEHostObject";
+            TypeFacts[TypeFacts["EQUndefined"] = 65536] = "EQUndefined";
+            TypeFacts[TypeFacts["EQNull"] = 131072] = "EQNull";
+            TypeFacts[TypeFacts["EQUndefinedOrNull"] = 262144] = "EQUndefinedOrNull";
+            TypeFacts[TypeFacts["NEUndefined"] = 524288] = "NEUndefined";
+            TypeFacts[TypeFacts["NENull"] = 1048576] = "NENull";
+            TypeFacts[TypeFacts["NEUndefinedOrNull"] = 2097152] = "NEUndefinedOrNull";
+            TypeFacts[TypeFacts["Truthy"] = 4194304] = "Truthy";
+            TypeFacts[TypeFacts["Falsy"] = 8388608] = "Falsy";
+            TypeFacts[TypeFacts["All"] = 16777215] = "All";
+            // The following members encode facts about particular kinds of types for use in the getTypeFacts function.
+            // The presence of a particular fact means that the given test is true for some (and possibly all) values
+            // of that kind of type.
+            TypeFacts[TypeFacts["BaseStringStrictFacts"] = 3735041] = "BaseStringStrictFacts";
+            TypeFacts[TypeFacts["BaseStringFacts"] = 12582401] = "BaseStringFacts";
+            TypeFacts[TypeFacts["StringStrictFacts"] = 16317953] = "StringStrictFacts";
+            TypeFacts[TypeFacts["StringFacts"] = 16776705] = "StringFacts";
+            TypeFacts[TypeFacts["EmptyStringStrictFacts"] = 12123649] = "EmptyStringStrictFacts";
+            TypeFacts[TypeFacts["EmptyStringFacts"] = 12582401] = "EmptyStringFacts";
+            TypeFacts[TypeFacts["NonEmptyStringStrictFacts"] = 7929345] = "NonEmptyStringStrictFacts";
+            TypeFacts[TypeFacts["NonEmptyStringFacts"] = 16776705] = "NonEmptyStringFacts";
+            TypeFacts[TypeFacts["BaseNumberStrictFacts"] = 3734786] = "BaseNumberStrictFacts";
+            TypeFacts[TypeFacts["BaseNumberFacts"] = 12582146] = "BaseNumberFacts";
+            TypeFacts[TypeFacts["NumberStrictFacts"] = 16317698] = "NumberStrictFacts";
+            TypeFacts[TypeFacts["NumberFacts"] = 16776450] = "NumberFacts";
+            TypeFacts[TypeFacts["ZeroNumberStrictFacts"] = 12123394] = "ZeroNumberStrictFacts";
+            TypeFacts[TypeFacts["ZeroNumberFacts"] = 12582146] = "ZeroNumberFacts";
+            TypeFacts[TypeFacts["NonZeroNumberStrictFacts"] = 7929090] = "NonZeroNumberStrictFacts";
+            TypeFacts[TypeFacts["NonZeroNumberFacts"] = 16776450] = "NonZeroNumberFacts";
+            TypeFacts[TypeFacts["BaseBigIntStrictFacts"] = 3734276] = "BaseBigIntStrictFacts";
+            TypeFacts[TypeFacts["BaseBigIntFacts"] = 12581636] = "BaseBigIntFacts";
+            TypeFacts[TypeFacts["BigIntStrictFacts"] = 16317188] = "BigIntStrictFacts";
+            TypeFacts[TypeFacts["BigIntFacts"] = 16775940] = "BigIntFacts";
+            TypeFacts[TypeFacts["ZeroBigIntStrictFacts"] = 12122884] = "ZeroBigIntStrictFacts";
+            TypeFacts[TypeFacts["ZeroBigIntFacts"] = 12581636] = "ZeroBigIntFacts";
+            TypeFacts[TypeFacts["NonZeroBigIntStrictFacts"] = 7928580] = "NonZeroBigIntStrictFacts";
+            TypeFacts[TypeFacts["NonZeroBigIntFacts"] = 16775940] = "NonZeroBigIntFacts";
+            TypeFacts[TypeFacts["BaseBooleanStrictFacts"] = 3733256] = "BaseBooleanStrictFacts";
+            TypeFacts[TypeFacts["BaseBooleanFacts"] = 12580616] = "BaseBooleanFacts";
+            TypeFacts[TypeFacts["BooleanStrictFacts"] = 16316168] = "BooleanStrictFacts";
+            TypeFacts[TypeFacts["BooleanFacts"] = 16774920] = "BooleanFacts";
+            TypeFacts[TypeFacts["FalseStrictFacts"] = 12121864] = "FalseStrictFacts";
+            TypeFacts[TypeFacts["FalseFacts"] = 12580616] = "FalseFacts";
+            TypeFacts[TypeFacts["TrueStrictFacts"] = 7927560] = "TrueStrictFacts";
+            TypeFacts[TypeFacts["TrueFacts"] = 16774920] = "TrueFacts";
+            TypeFacts[TypeFacts["SymbolStrictFacts"] = 7925520] = "SymbolStrictFacts";
+            TypeFacts[TypeFacts["SymbolFacts"] = 16772880] = "SymbolFacts";
+            TypeFacts[TypeFacts["ObjectStrictFacts"] = 7888800] = "ObjectStrictFacts";
+            TypeFacts[TypeFacts["ObjectFacts"] = 16736160] = "ObjectFacts";
+            TypeFacts[TypeFacts["FunctionStrictFacts"] = 7880640] = "FunctionStrictFacts";
+            TypeFacts[TypeFacts["FunctionFacts"] = 16728000] = "FunctionFacts";
+            TypeFacts[TypeFacts["UndefinedFacts"] = 9830144] = "UndefinedFacts";
+            TypeFacts[TypeFacts["NullFacts"] = 9363232] = "NullFacts";
+            TypeFacts[TypeFacts["EmptyObjectStrictFacts"] = 16318463] = "EmptyObjectStrictFacts";
+            TypeFacts[TypeFacts["EmptyObjectFacts"] = 16777215] = "EmptyObjectFacts";
+        })(TypeFacts || (TypeFacts = {}));
+        var typeofEQFacts = ts.createMapFromTemplate({
+            string: 1 /* TypeofEQString */,
+            number: 2 /* TypeofEQNumber */,
+            bigint: 4 /* TypeofEQBigInt */,
+            boolean: 8 /* TypeofEQBoolean */,
+            symbol: 16 /* TypeofEQSymbol */,
+            undefined: 65536 /* EQUndefined */,
+            object: 32 /* TypeofEQObject */,
+            function: 64 /* TypeofEQFunction */
+        });
+        var typeofNEFacts = ts.createMapFromTemplate({
+            string: 256 /* TypeofNEString */,
+            number: 512 /* TypeofNENumber */,
+            bigint: 1024 /* TypeofNEBigInt */,
+            boolean: 2048 /* TypeofNEBoolean */,
+            symbol: 4096 /* TypeofNESymbol */,
+            undefined: 524288 /* NEUndefined */,
+            object: 8192 /* TypeofNEObject */,
+            function: 16384 /* TypeofNEFunction */
+        });
+        var typeofTypesByName = ts.createMapFromTemplate({
+            string: stringType,
+            number: numberType,
+            bigint: bigintType,
+            boolean: booleanType,
+            symbol: esSymbolType,
+            undefined: undefinedType
+        });
+        var typeofType = createTypeofType();
+        var _jsxNamespace;
+        var _jsxFactoryEntity;
+        var subtypeRelation = ts.createMap();
+        var assignableRelation = ts.createMap();
+        var comparableRelation = ts.createMap();
+        var identityRelation = ts.createMap();
+        var enumRelation = ts.createMap();
+        var TypeSystemPropertyName;
+        (function (TypeSystemPropertyName) {
+            TypeSystemPropertyName[TypeSystemPropertyName["Type"] = 0] = "Type";
+            TypeSystemPropertyName[TypeSystemPropertyName["ResolvedBaseConstructorType"] = 1] = "ResolvedBaseConstructorType";
+            TypeSystemPropertyName[TypeSystemPropertyName["DeclaredType"] = 2] = "DeclaredType";
+            TypeSystemPropertyName[TypeSystemPropertyName["ResolvedReturnType"] = 3] = "ResolvedReturnType";
+            TypeSystemPropertyName[TypeSystemPropertyName["ImmediateBaseConstraint"] = 4] = "ImmediateBaseConstraint";
+            TypeSystemPropertyName[TypeSystemPropertyName["EnumTagType"] = 5] = "EnumTagType";
+            TypeSystemPropertyName[TypeSystemPropertyName["JSDocTypeReference"] = 6] = "JSDocTypeReference";
+        })(TypeSystemPropertyName || (TypeSystemPropertyName = {}));
+        var CheckMode;
+        (function (CheckMode) {
+            CheckMode[CheckMode["Normal"] = 0] = "Normal";
+            CheckMode[CheckMode["SkipContextSensitive"] = 1] = "SkipContextSensitive";
+            CheckMode[CheckMode["Inferential"] = 2] = "Inferential";
+            CheckMode[CheckMode["Contextual"] = 3] = "Contextual";
+        })(CheckMode || (CheckMode = {}));
+        var CallbackCheck;
+        (function (CallbackCheck) {
+            CallbackCheck[CallbackCheck["None"] = 0] = "None";
+            CallbackCheck[CallbackCheck["Bivariant"] = 1] = "Bivariant";
+            CallbackCheck[CallbackCheck["Strict"] = 2] = "Strict";
+        })(CallbackCheck || (CallbackCheck = {}));
+        var MappedTypeModifiers;
+        (function (MappedTypeModifiers) {
+            MappedTypeModifiers[MappedTypeModifiers["IncludeReadonly"] = 1] = "IncludeReadonly";
+            MappedTypeModifiers[MappedTypeModifiers["ExcludeReadonly"] = 2] = "ExcludeReadonly";
+            MappedTypeModifiers[MappedTypeModifiers["IncludeOptional"] = 4] = "IncludeOptional";
+            MappedTypeModifiers[MappedTypeModifiers["ExcludeOptional"] = 8] = "ExcludeOptional";
+        })(MappedTypeModifiers || (MappedTypeModifiers = {}));
+        var ExpandingFlags;
+        (function (ExpandingFlags) {
+            ExpandingFlags[ExpandingFlags["None"] = 0] = "None";
+            ExpandingFlags[ExpandingFlags["Source"] = 1] = "Source";
+            ExpandingFlags[ExpandingFlags["Target"] = 2] = "Target";
+            ExpandingFlags[ExpandingFlags["Both"] = 3] = "Both";
+        })(ExpandingFlags || (ExpandingFlags = {}));
+        var MembersOrExportsResolutionKind;
+        (function (MembersOrExportsResolutionKind) {
+            MembersOrExportsResolutionKind["resolvedExports"] = "resolvedExports";
+            MembersOrExportsResolutionKind["resolvedMembers"] = "resolvedMembers";
+        })(MembersOrExportsResolutionKind || (MembersOrExportsResolutionKind = {}));
+        var UnusedKind;
+        (function (UnusedKind) {
+            UnusedKind[UnusedKind["Local"] = 0] = "Local";
+            UnusedKind[UnusedKind["Parameter"] = 1] = "Parameter";
+        })(UnusedKind || (UnusedKind = {}));
+        var builtinGlobals = ts.createSymbolTable();
+        builtinGlobals.set(undefinedSymbol.escapedName, undefinedSymbol);
+        var isNotOverloadAndNotAccessor = ts.and(isNotOverload, isNotAccessor);
+        initializeTypeChecker();
+        return checker;
+        function getJsxNamespace(location) {
+            if (location) {
+                var file = ts.getSourceFileOfNode(location);
+                if (file) {
+                    if (file.localJsxNamespace) {
+                        return file.localJsxNamespace;
+                    }
+                    var jsxPragma = file.pragmas.get("jsx");
+                    if (jsxPragma) {
+                        var chosenpragma = ts.isArray(jsxPragma) ? jsxPragma[0] : jsxPragma; // TODO: GH#18217
+                        file.localJsxFactory = ts.parseIsolatedEntityName(chosenpragma.arguments.factory, languageVersion);
+                        if (file.localJsxFactory) {
+                            return file.localJsxNamespace = getFirstIdentifier(file.localJsxFactory).escapedText;
+                        }
+                    }
+                }
+            }
+            if (!_jsxNamespace) {
+                _jsxNamespace = "React";
+                if (compilerOptions.jsxFactory) {
+                    _jsxFactoryEntity = ts.parseIsolatedEntityName(compilerOptions.jsxFactory, languageVersion);
+                    if (_jsxFactoryEntity) {
+                        _jsxNamespace = getFirstIdentifier(_jsxFactoryEntity).escapedText;
+                    }
+                }
+                else if (compilerOptions.reactNamespace) {
+                    _jsxNamespace = ts.escapeLeadingUnderscores(compilerOptions.reactNamespace);
+                }
+            }
+            return _jsxNamespace;
+        }
+        function getEmitResolver(sourceFile, cancellationToken) {
+            // Ensure we have all the type information in place for this file so that all the
+            // emitter questions of this resolver will return the right information.
+            getDiagnostics(sourceFile, cancellationToken);
+            return emitResolver;
+        }
+        function lookupOrIssueError(location, message, arg0, arg1, arg2, arg3) {
+            var diagnostic = location
+                ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2, arg3)
+                : ts.createCompilerDiagnostic(message, arg0, arg1, arg2, arg3);
+            var existing = diagnostics.lookup(diagnostic);
+            if (existing) {
+                return existing;
+            }
+            else {
+                diagnostics.add(diagnostic);
+                return diagnostic;
+            }
+        }
+        function addRelatedInfo(diagnostic) {
+            var relatedInformation = [];
+            for (var _i = 1; _i < arguments.length; _i++) {
+                relatedInformation[_i - 1] = arguments[_i];
+            }
+            var _a;
+            if (!diagnostic.relatedInformation) {
+                diagnostic.relatedInformation = [];
+            }
+            (_a = diagnostic.relatedInformation).push.apply(_a, relatedInformation);
+            return diagnostic;
+        }
+        function error(location, message, arg0, arg1, arg2, arg3) {
+            var diagnostic = location
+                ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2, arg3)
+                : ts.createCompilerDiagnostic(message, arg0, arg1, arg2, arg3);
+            diagnostics.add(diagnostic);
+            return diagnostic;
+        }
+        function addErrorOrSuggestion(isError, diagnostic) {
+            if (isError) {
+                diagnostics.add(diagnostic);
+            }
+            else {
+                suggestionDiagnostics.add(diagnostic.file.fileName, __assign({}, diagnostic, { category: ts.DiagnosticCategory.Suggestion }));
+            }
+        }
+        function errorOrSuggestion(isError, location, message, arg0, arg1, arg2, arg3) {
+            addErrorOrSuggestion(isError, "message" in message ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2, arg3) : ts.createDiagnosticForNodeFromMessageChain(location, message));
+        }
+        function createSymbol(flags, name, checkFlags) {
+            symbolCount++;
+            var symbol = (new Symbol(flags | 33554432 /* Transient */, name));
+            symbol.checkFlags = checkFlags || 0;
+            return symbol;
+        }
+        function isTransientSymbol(symbol) {
+            return (symbol.flags & 33554432 /* Transient */) !== 0;
+        }
+        function getExcludedSymbolFlags(flags) {
+            var result = 0;
+            if (flags & 2 /* BlockScopedVariable */)
+                result |= 67220415 /* BlockScopedVariableExcludes */;
+            if (flags & 1 /* FunctionScopedVariable */)
+                result |= 67220414 /* FunctionScopedVariableExcludes */;
+            if (flags & 4 /* Property */)
+                result |= 0 /* PropertyExcludes */;
+            if (flags & 8 /* EnumMember */)
+                result |= 68008959 /* EnumMemberExcludes */;
+            if (flags & 16 /* Function */)
+                result |= 67219887 /* FunctionExcludes */;
+            if (flags & 32 /* Class */)
+                result |= 68008383 /* ClassExcludes */;
+            if (flags & 64 /* Interface */)
+                result |= 67897736 /* InterfaceExcludes */;
+            if (flags & 256 /* RegularEnum */)
+                result |= 68008191 /* RegularEnumExcludes */;
+            if (flags & 128 /* ConstEnum */)
+                result |= 68008831 /* ConstEnumExcludes */;
+            if (flags & 512 /* ValueModule */)
+                result |= 110735 /* ValueModuleExcludes */;
+            if (flags & 8192 /* Method */)
+                result |= 67212223 /* MethodExcludes */;
+            if (flags & 32768 /* GetAccessor */)
+                result |= 67154879 /* GetAccessorExcludes */;
+            if (flags & 65536 /* SetAccessor */)
+                result |= 67187647 /* SetAccessorExcludes */;
+            if (flags & 262144 /* TypeParameter */)
+                result |= 67635688 /* TypeParameterExcludes */;
+            if (flags & 524288 /* TypeAlias */)
+                result |= 67897832 /* TypeAliasExcludes */;
+            if (flags & 2097152 /* Alias */)
+                result |= 2097152 /* AliasExcludes */;
+            return result;
+        }
+        function recordMergedSymbol(target, source) {
+            if (!source.mergeId) {
+                source.mergeId = nextMergeId;
+                nextMergeId++;
+            }
+            mergedSymbols[source.mergeId] = target;
+        }
+        function cloneSymbol(symbol) {
+            var result = createSymbol(symbol.flags, symbol.escapedName);
+            result.declarations = symbol.declarations ? symbol.declarations.slice() : [];
+            result.parent = symbol.parent;
+            if (symbol.valueDeclaration)
+                result.valueDeclaration = symbol.valueDeclaration;
+            if (symbol.constEnumOnlyModule)
+                result.constEnumOnlyModule = true;
+            if (symbol.members)
+                result.members = ts.cloneMap(symbol.members);
+            if (symbol.exports)
+                result.exports = ts.cloneMap(symbol.exports);
+            recordMergedSymbol(result, symbol);
+            return result;
+        }
+        /**
+         * Note: if target is transient, then it is mutable, and mergeSymbol with both mutate and return it.
+         * If target is not transient, mergeSymbol will produce a transient clone, mutate that and return it.
+         */
+        function mergeSymbol(target, source) {
+            if (!(target.flags & getExcludedSymbolFlags(source.flags)) ||
+                (source.flags | target.flags) & 67108864 /* Assignment */) {
+                ts.Debug.assert(source !== target);
+                if (!(target.flags & 33554432 /* Transient */)) {
+                    var resolvedTarget = resolveSymbol(target);
+                    if (resolvedTarget === unknownSymbol) {
+                        return source;
+                    }
+                    target = cloneSymbol(resolvedTarget);
+                }
+                // Javascript static-property-assignment declarations always merge, even though they are also values
+                if (source.flags & 512 /* ValueModule */ && target.flags & 512 /* ValueModule */ && target.constEnumOnlyModule && !source.constEnumOnlyModule) {
+                    // reset flag when merging instantiated module into value module that has only const enums
+                    target.constEnumOnlyModule = false;
+                }
+                target.flags |= source.flags;
+                if (source.valueDeclaration &&
+                    (!target.valueDeclaration ||
+                        ts.isAssignmentDeclaration(target.valueDeclaration) && !ts.isAssignmentDeclaration(source.valueDeclaration) ||
+                        ts.isEffectiveModuleDeclaration(target.valueDeclaration) && !ts.isEffectiveModuleDeclaration(source.valueDeclaration))) {
+                    // other kinds of value declarations take precedence over modules and assignment declarations
+                    target.valueDeclaration = source.valueDeclaration;
+                }
+                ts.addRange(target.declarations, source.declarations);
+                if (source.members) {
+                    if (!target.members)
+                        target.members = ts.createSymbolTable();
+                    mergeSymbolTable(target.members, source.members);
+                }
+                if (source.exports) {
+                    if (!target.exports)
+                        target.exports = ts.createSymbolTable();
+                    mergeSymbolTable(target.exports, source.exports);
+                }
+                recordMergedSymbol(target, source);
+            }
+            else if (target.flags & 1024 /* NamespaceModule */) {
+                error(ts.getNameOfDeclaration(source.declarations[0]), ts.Diagnostics.Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity, symbolToString(target));
+            }
+            else { // error
+                var isEitherEnum = !!(target.flags & 384 /* Enum */ || source.flags & 384 /* Enum */);
+                var isEitherBlockScoped_1 = !!(target.flags & 2 /* BlockScopedVariable */ || source.flags & 2 /* BlockScopedVariable */);
+                var message = isEitherEnum
+                    ? ts.Diagnostics.Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations
+                    : isEitherBlockScoped_1
+                        ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0
+                        : ts.Diagnostics.Duplicate_identifier_0;
+                var sourceSymbolFile = source.declarations && ts.getSourceFileOfNode(source.declarations[0]);
+                var targetSymbolFile = target.declarations && ts.getSourceFileOfNode(target.declarations[0]);
+                var symbolName_1 = symbolToString(source);
+                // Collect top-level duplicate identifier errors into one mapping, so we can then merge their diagnostics if there are a bunch
+                if (sourceSymbolFile && targetSymbolFile && amalgamatedDuplicates && !isEitherEnum && sourceSymbolFile !== targetSymbolFile) {
+                    var firstFile_1 = ts.comparePaths(sourceSymbolFile.path, targetSymbolFile.path) === -1 /* LessThan */ ? sourceSymbolFile : targetSymbolFile;
+                    var secondFile_1 = firstFile_1 === sourceSymbolFile ? targetSymbolFile : sourceSymbolFile;
+                    var filesDuplicates = ts.getOrUpdate(amalgamatedDuplicates, firstFile_1.path + "|" + secondFile_1.path, function () {
+                        return ({ firstFile: firstFile_1, secondFile: secondFile_1, conflictingSymbols: ts.createMap() });
+                    });
+                    var conflictingSymbolInfo = ts.getOrUpdate(filesDuplicates.conflictingSymbols, symbolName_1, function () {
+                        return ({ isBlockScoped: isEitherBlockScoped_1, firstFileLocations: [], secondFileLocations: [] });
+                    });
+                    addDuplicateLocations(conflictingSymbolInfo.firstFileLocations, source);
+                    addDuplicateLocations(conflictingSymbolInfo.secondFileLocations, target);
+                }
+                else {
+                    addDuplicateDeclarationErrorsForSymbols(source, message, symbolName_1, target);
+                    addDuplicateDeclarationErrorsForSymbols(target, message, symbolName_1, source);
+                }
+            }
+            return target;
+            function addDuplicateLocations(locs, symbol) {
+                for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                    var decl = _a[_i];
+                    ts.pushIfUnique(locs, (ts.getExpandoInitializer(decl, /*isPrototypeAssignment*/ false) ? ts.getNameOfExpando(decl) : ts.getNameOfDeclaration(decl)) || decl);
+                }
+            }
+        }
+        function addDuplicateDeclarationErrorsForSymbols(target, message, symbolName, source) {
+            ts.forEach(target.declarations, function (node) {
+                var errorNode = (ts.getExpandoInitializer(node, /*isPrototypeAssignment*/ false) ? ts.getNameOfExpando(node) : ts.getNameOfDeclaration(node)) || node;
+                addDuplicateDeclarationError(errorNode, message, symbolName, source.declarations);
+            });
+        }
+        function addDuplicateDeclarationError(errorNode, message, symbolName, relatedNodes) {
+            var err = lookupOrIssueError(errorNode, message, symbolName);
+            for (var _i = 0, _a = relatedNodes || ts.emptyArray; _i < _a.length; _i++) {
+                var relatedNode = _a[_i];
+                err.relatedInformation = err.relatedInformation || [];
+                if (ts.length(err.relatedInformation) >= 5)
+                    continue;
+                addRelatedInfo(err, !ts.length(err.relatedInformation) ? ts.createDiagnosticForNode(relatedNode, ts.Diagnostics._0_was_also_declared_here, symbolName) : ts.createDiagnosticForNode(relatedNode, ts.Diagnostics.and_here));
+            }
+        }
+        function combineSymbolTables(first, second) {
+            if (!ts.hasEntries(first))
+                return second;
+            if (!ts.hasEntries(second))
+                return first;
+            var combined = ts.createSymbolTable();
+            mergeSymbolTable(combined, first);
+            mergeSymbolTable(combined, second);
+            return combined;
+        }
+        function mergeSymbolTable(target, source) {
+            source.forEach(function (sourceSymbol, id) {
+                var targetSymbol = target.get(id);
+                target.set(id, targetSymbol ? mergeSymbol(targetSymbol, sourceSymbol) : sourceSymbol);
+            });
+        }
+        function mergeModuleAugmentation(moduleName) {
+            var moduleAugmentation = moduleName.parent;
+            if (moduleAugmentation.symbol.declarations[0] !== moduleAugmentation) {
+                // this is a combined symbol for multiple augmentations within the same file.
+                // its symbol already has accumulated information for all declarations
+                // so we need to add it just once - do the work only for first declaration
+                ts.Debug.assert(moduleAugmentation.symbol.declarations.length > 1);
+                return;
+            }
+            if (ts.isGlobalScopeAugmentation(moduleAugmentation)) {
+                mergeSymbolTable(globals, moduleAugmentation.symbol.exports);
+            }
+            else {
+                // find a module that about to be augmented
+                // do not validate names of augmentations that are defined in ambient context
+                var moduleNotFoundError = !(moduleName.parent.parent.flags & 4194304 /* Ambient */)
+                    ? ts.Diagnostics.Invalid_module_name_in_augmentation_module_0_cannot_be_found
+                    : undefined;
+                var mainModule = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError, /*isForAugmentation*/ true);
+                if (!mainModule) {
+                    return;
+                }
+                // obtain item referenced by 'export='
+                mainModule = resolveExternalModuleSymbol(mainModule);
+                if (mainModule.flags & 1920 /* Namespace */) {
+                    mainModule = mergeSymbol(mainModule, moduleAugmentation.symbol);
+                }
+                else {
+                    // moduleName will be a StringLiteral since this is not `declare global`.
+                    error(moduleName, ts.Diagnostics.Cannot_augment_module_0_because_it_resolves_to_a_non_module_entity, moduleName.text);
+                }
+            }
+        }
+        function addToSymbolTable(target, source, message) {
+            source.forEach(function (sourceSymbol, id) {
+                var targetSymbol = target.get(id);
+                if (targetSymbol) {
+                    // Error on redeclarations
+                    ts.forEach(targetSymbol.declarations, addDeclarationDiagnostic(ts.unescapeLeadingUnderscores(id), message));
+                }
+                else {
+                    target.set(id, sourceSymbol);
+                }
+            });
+            function addDeclarationDiagnostic(id, message) {
+                return function (declaration) { return diagnostics.add(ts.createDiagnosticForNode(declaration, message, id)); };
+            }
+        }
+        function getSymbolLinks(symbol) {
+            if (symbol.flags & 33554432 /* Transient */)
+                return symbol;
+            var id = getSymbolId(symbol);
+            return symbolLinks[id] || (symbolLinks[id] = {});
+        }
+        function getNodeLinks(node) {
+            var nodeId = getNodeId(node);
+            return nodeLinks[nodeId] || (nodeLinks[nodeId] = { flags: 0 });
+        }
+        function isGlobalSourceFile(node) {
+            return node.kind === 279 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
+        }
+        function getSymbol(symbols, name, meaning) {
+            if (meaning) {
+                var symbol = symbols.get(name);
+                if (symbol) {
+                    ts.Debug.assert((ts.getCheckFlags(symbol) & 1 /* Instantiated */) === 0, "Should never get an instantiated symbol here.");
+                    if (symbol.flags & meaning) {
+                        return symbol;
+                    }
+                    if (symbol.flags & 2097152 /* Alias */) {
+                        var target = resolveAlias(symbol);
+                        // Unknown symbol means an error occurred in alias resolution, treat it as positive answer to avoid cascading errors
+                        if (target === unknownSymbol || target.flags & meaning) {
+                            return symbol;
+                        }
+                    }
+                }
+            }
+            // return undefined if we can't find a symbol.
+        }
+        /**
+         * Get symbols that represent parameter-property-declaration as parameter and as property declaration
+         * @param parameter a parameterDeclaration node
+         * @param parameterName a name of the parameter to get the symbols for.
+         * @return a tuple of two symbols
+         */
+        function getSymbolsOfParameterPropertyDeclaration(parameter, parameterName) {
+            var constructorDeclaration = parameter.parent;
+            var classDeclaration = parameter.parent.parent;
+            var parameterSymbol = getSymbol(constructorDeclaration.locals, parameterName, 67220415 /* Value */);
+            var propertySymbol = getSymbol(getMembersOfSymbol(classDeclaration.symbol), parameterName, 67220415 /* Value */);
+            if (parameterSymbol && propertySymbol) {
+                return [parameterSymbol, propertySymbol];
+            }
+            return ts.Debug.fail("There should exist two symbols, one as property declaration and one as parameter declaration");
+        }
+        function isBlockScopedNameDeclaredBeforeUse(declaration, usage) {
+            var declarationFile = ts.getSourceFileOfNode(declaration);
+            var useFile = ts.getSourceFileOfNode(usage);
+            if (declarationFile !== useFile) {
+                if ((moduleKind && (declarationFile.externalModuleIndicator || useFile.externalModuleIndicator)) ||
+                    (!compilerOptions.outFile && !compilerOptions.out) ||
+                    isInTypeQuery(usage) ||
+                    declaration.flags & 4194304 /* Ambient */) {
+                    // nodes are in different files and order cannot be determined
+                    return true;
+                }
+                // declaration is after usage
+                // can be legal if usage is deferred (i.e. inside function or in initializer of instance property)
+                if (isUsedInFunctionOrInstanceProperty(usage, declaration)) {
+                    return true;
+                }
+                var sourceFiles = host.getSourceFiles();
+                return sourceFiles.indexOf(declarationFile) <= sourceFiles.indexOf(useFile);
+            }
+            if (declaration.pos <= usage.pos) {
+                // declaration is before usage
+                if (declaration.kind === 186 /* BindingElement */) {
+                    // still might be illegal if declaration and usage are both binding elements (eg var [a = b, b = b] = [1, 2])
+                    var errorBindingElement = ts.getAncestor(usage, 186 /* BindingElement */);
+                    if (errorBindingElement) {
+                        return ts.findAncestor(errorBindingElement, ts.isBindingElement) !== ts.findAncestor(declaration, ts.isBindingElement) ||
+                            declaration.pos < errorBindingElement.pos;
+                    }
+                    // or it might be illegal if usage happens before parent variable is declared (eg var [a] = a)
+                    return isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 237 /* VariableDeclaration */), usage);
+                }
+                else if (declaration.kind === 237 /* VariableDeclaration */) {
+                    // still might be illegal if usage is in the initializer of the variable declaration (eg var a = a)
+                    return !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
+                }
+                else if (ts.isClassDeclaration(declaration)) {
+                    // still might be illegal if the usage is within a computed property name in the class (eg class A { static p = "a"; [A.p]() {} })
+                    return !ts.findAncestor(usage, function (n) { return ts.isComputedPropertyName(n) && n.parent.parent === declaration; });
+                }
+                return true;
+            }
+            // declaration is after usage, but it can still be legal if usage is deferred:
+            // 1. inside an export specifier
+            // 2. inside a function
+            // 3. inside an instance property initializer, a reference to a non-instance property
+            // 4. inside a static property initializer, a reference to a static method in the same class
+            // 5. inside a TS export= declaration (since we will move the export statement during emit to avoid TDZ)
+            // or if usage is in a type context:
+            // 1. inside a type query (typeof in type position)
+            // 2. inside a jsdoc comment
+            if (usage.parent.kind === 257 /* ExportSpecifier */ || (usage.parent.kind === 254 /* ExportAssignment */ && usage.parent.isExportEquals)) {
+                // export specifiers do not use the variable, they only make it available for use
+                return true;
+            }
+            // When resolving symbols for exports, the `usage` location passed in can be the export site directly
+            if (usage.kind === 254 /* ExportAssignment */ && usage.isExportEquals) {
+                return true;
+            }
+            var container = ts.getEnclosingBlockScopeContainer(declaration);
+            return !!(usage.flags & 2097152 /* JSDoc */) || isInTypeQuery(usage) || isUsedInFunctionOrInstanceProperty(usage, declaration, container);
+            function isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage) {
+                var container = ts.getEnclosingBlockScopeContainer(declaration);
+                switch (declaration.parent.parent.kind) {
+                    case 219 /* VariableStatement */:
+                    case 225 /* ForStatement */:
+                    case 227 /* ForOfStatement */:
+                        // variable statement/for/for-of statement case,
+                        // use site should not be inside variable declaration (initializer of declaration or binding element)
+                        if (isSameScopeDescendentOf(usage, declaration, container)) {
+                            return true;
+                        }
+                        break;
+                }
+                // ForIn/ForOf case - use site should not be used in expression part
+                var grandparent = declaration.parent.parent;
+                return ts.isForInOrOfStatement(grandparent) && isSameScopeDescendentOf(usage, grandparent.expression, container);
+            }
+            function isUsedInFunctionOrInstanceProperty(usage, declaration, container) {
+                return !!ts.findAncestor(usage, function (current) {
+                    if (current === container) {
+                        return "quit";
+                    }
+                    if (ts.isFunctionLike(current)) {
+                        return true;
+                    }
+                    var initializerOfProperty = current.parent &&
+                        current.parent.kind === 154 /* PropertyDeclaration */ &&
+                        current.parent.initializer === current;
+                    if (initializerOfProperty) {
+                        if (ts.hasModifier(current.parent, 32 /* Static */)) {
+                            if (declaration.kind === 156 /* MethodDeclaration */) {
+                                return true;
+                            }
+                        }
+                        else {
+                            var isDeclarationInstanceProperty = declaration.kind === 154 /* PropertyDeclaration */ && !ts.hasModifier(declaration, 32 /* Static */);
+                            if (!isDeclarationInstanceProperty || ts.getContainingClass(usage) !== ts.getContainingClass(declaration)) {
+                                return true;
+                            }
+                        }
+                    }
+                    return false;
+                });
+            }
+        }
+        /**
+         * Resolve a given name for a given meaning at a given location. An error is reported if the name was not found and
+         * the nameNotFoundMessage argument is not undefined. Returns the resolved symbol, or undefined if no symbol with
+         * the given name can be found.
+         *
+         * @param isUse If true, this will count towards --noUnusedLocals / --noUnusedParameters.
+         */
+        function resolveName(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals, suggestedNameNotFoundMessage) {
+            if (excludeGlobals === void 0) { excludeGlobals = false; }
+            return resolveNameHelper(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals, getSymbol, suggestedNameNotFoundMessage);
+        }
+        function resolveNameHelper(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals, lookup, suggestedNameNotFoundMessage) {
+            var originalLocation = location; // needed for did-you-mean error reporting, which gathers candidates starting from the original location
+            var result;
+            var lastLocation;
+            var lastSelfReferenceLocation;
+            var propertyWithInvalidInitializer;
+            var errorLocation = location;
+            var grandparent;
+            var isInExternalModule = false;
+            loop: while (location) {
+                // Locals of a source file are not in scope (because they get merged into the global symbol table)
+                if (location.locals && !isGlobalSourceFile(location)) {
+                    if (result = lookup(location.locals, name, meaning)) {
+                        var useResult = true;
+                        if (ts.isFunctionLike(location) && lastLocation && lastLocation !== location.body) {
+                            // symbol lookup restrictions for function-like declarations
+                            // - Type parameters of a function are in scope in the entire function declaration, including the parameter
+                            //   list and return type. However, local types are only in scope in the function body.
+                            // - parameters are only in the scope of function body
+                            // This restriction does not apply to JSDoc comment types because they are parented
+                            // at a higher level than type parameters would normally be
+                            if (meaning & result.flags & 67897832 /* Type */ && lastLocation.kind !== 291 /* JSDocComment */) {
+                                useResult = result.flags & 262144 /* TypeParameter */
+                                    // type parameters are visible in parameter list, return type and type parameter list
+                                    ? lastLocation === location.type ||
+                                        lastLocation.kind === 151 /* Parameter */ ||
+                                        lastLocation.kind === 150 /* TypeParameter */
+                                    // local types not visible outside the function body
+                                    : false;
+                            }
+                            if (meaning & result.flags & 3 /* Variable */) {
+                                // expression inside parameter will lookup as normal variable scope when targeting es2015+
+                                var functionLocation = location;
+                                if (compilerOptions.target && compilerOptions.target >= 2 /* ES2015 */ && ts.isParameter(lastLocation) &&
+                                    functionLocation.body && result.valueDeclaration.pos >= functionLocation.body.pos && result.valueDeclaration.end <= functionLocation.body.end) {
+                                    useResult = false;
+                                }
+                                else if (result.flags & 1 /* FunctionScopedVariable */) {
+                                    // parameters are visible only inside function body, parameter list and return type
+                                    // technically for parameter list case here we might mix parameters and variables declared in function,
+                                    // however it is detected separately when checking initializers of parameters
+                                    // to make sure that they reference no variables declared after them.
+                                    useResult =
+                                        lastLocation.kind === 151 /* Parameter */ ||
+                                            (lastLocation === location.type &&
+                                                !!ts.findAncestor(result.valueDeclaration, ts.isParameter));
+                                }
+                            }
+                        }
+                        else if (location.kind === 175 /* ConditionalType */) {
+                            // A type parameter declared using 'infer T' in a conditional type is visible only in
+                            // the true branch of the conditional type.
+                            useResult = lastLocation === location.trueType;
+                        }
+                        if (useResult) {
+                            break loop;
+                        }
+                        else {
+                            result = undefined;
+                        }
+                    }
+                }
+                switch (location.kind) {
+                    case 279 /* SourceFile */:
+                        if (!ts.isExternalOrCommonJsModule(location))
+                            break;
+                        isInExternalModule = true;
+                    // falls through
+                    case 244 /* ModuleDeclaration */:
+                        var moduleExports = getSymbolOfNode(location).exports;
+                        if (location.kind === 279 /* SourceFile */ || ts.isAmbientModule(location)) {
+                            // It's an external module. First see if the module has an export default and if the local
+                            // name of that export default matches.
+                            if (result = moduleExports.get("default" /* Default */)) {
+                                var localSymbol = ts.getLocalSymbolForExportDefault(result);
+                                if (localSymbol && (result.flags & meaning) && localSymbol.escapedName === name) {
+                                    break loop;
+                                }
+                                result = undefined;
+                            }
+                            // Because of module/namespace merging, a module's exports are in scope,
+                            // yet we never want to treat an export specifier as putting a member in scope.
+                            // Therefore, if the name we find is purely an export specifier, it is not actually considered in scope.
+                            // Two things to note about this:
+                            //     1. We have to check this without calling getSymbol. The problem with calling getSymbol
+                            //        on an export specifier is that it might find the export specifier itself, and try to
+                            //        resolve it as an alias. This will cause the checker to consider the export specifier
+                            //        a circular alias reference when it might not be.
+                            //     2. We check === SymbolFlags.Alias in order to check that the symbol is *purely*
+                            //        an alias. If we used &, we'd be throwing out symbols that have non alias aspects,
+                            //        which is not the desired behavior.
+                            var moduleExport = moduleExports.get(name);
+                            if (moduleExport &&
+                                moduleExport.flags === 2097152 /* Alias */ &&
+                                ts.getDeclarationOfKind(moduleExport, 257 /* ExportSpecifier */)) {
+                                break;
+                            }
+                        }
+                        // ES6 exports are also visible locally (except for 'default'), but commonjs exports are not (except typedefs)
+                        if (name !== "default" /* Default */ && (result = lookup(moduleExports, name, meaning & 2623475 /* ModuleMember */))) {
+                            if (ts.isSourceFile(location) && location.commonJsModuleIndicator && !result.declarations.some(ts.isJSDocTypeAlias)) {
+                                result = undefined;
+                            }
+                            else {
+                                break loop;
+                            }
+                        }
+                        break;
+                    case 243 /* EnumDeclaration */:
+                        if (result = lookup(getSymbolOfNode(location).exports, name, meaning & 8 /* EnumMember */)) {
+                            break loop;
+                        }
+                        break;
+                    case 154 /* PropertyDeclaration */:
+                    case 153 /* PropertySignature */:
+                        // TypeScript 1.0 spec (April 2014): 8.4.1
+                        // Initializer expressions for instance member variables are evaluated in the scope
+                        // of the class constructor body but are not permitted to reference parameters or
+                        // local variables of the constructor. This effectively means that entities from outer scopes
+                        // by the same name as a constructor parameter or local variable are inaccessible
+                        // in initializer expressions for instance member variables.
+                        if (ts.isClassLike(location.parent) && !ts.hasModifier(location, 32 /* Static */)) {
+                            var ctor = findConstructorDeclaration(location.parent);
+                            if (ctor && ctor.locals) {
+                                if (lookup(ctor.locals, name, meaning & 67220415 /* Value */)) {
+                                    // Remember the property node, it will be used later to report appropriate error
+                                    propertyWithInvalidInitializer = location;
+                                }
+                            }
+                        }
+                        break;
+                    case 240 /* ClassDeclaration */:
+                    case 209 /* ClassExpression */:
+                    case 241 /* InterfaceDeclaration */:
+                        // The below is used to lookup type parameters within a class or interface, as they are added to the class/interface locals
+                        // These can never be latebound, so the symbol's raw members are sufficient. `getMembersOfNode` cannot be used, as it would
+                        // trigger resolving late-bound names, which we may already be in the process of doing while we're here!
+                        if (result = lookup(getSymbolOfNode(location).members || emptySymbols, name, meaning & 67897832 /* Type */)) {
+                            if (!isTypeParameterSymbolDeclaredInContainer(result, location)) {
+                                // ignore type parameters not declared in this container
+                                result = undefined;
+                                break;
+                            }
+                            if (lastLocation && ts.hasModifier(lastLocation, 32 /* Static */)) {
+                                // TypeScript 1.0 spec (April 2014): 3.4.1
+                                // The scope of a type parameter extends over the entire declaration with which the type
+                                // parameter list is associated, with the exception of static member declarations in classes.
+                                error(errorLocation, ts.Diagnostics.Static_members_cannot_reference_class_type_parameters);
+                                return undefined;
+                            }
+                            break loop;
+                        }
+                        if (location.kind === 209 /* ClassExpression */ && meaning & 32 /* Class */) {
+                            var className = location.name;
+                            if (className && name === className.escapedText) {
+                                result = location.symbol;
+                                break loop;
+                            }
+                        }
+                        break;
+                    case 211 /* ExpressionWithTypeArguments */:
+                        // The type parameters of a class are not in scope in the base class expression.
+                        if (lastLocation === location.expression && location.parent.token === 86 /* ExtendsKeyword */) {
+                            var container = location.parent.parent;
+                            if (ts.isClassLike(container) && (result = lookup(getSymbolOfNode(container).members, name, meaning & 67897832 /* Type */))) {
+                                if (nameNotFoundMessage) {
+                                    error(errorLocation, ts.Diagnostics.Base_class_expressions_cannot_reference_class_type_parameters);
+                                }
+                                return undefined;
+                            }
+                        }
+                        break;
+                    // It is not legal to reference a class's own type parameters from a computed property name that
+                    // belongs to the class. For example:
+                    //
+                    //   function foo<T>() { return '' }
+                    //   class C<T> { // <-- Class's own type parameter T
+                    //       [foo<T>()]() { } // <-- Reference to T from class's own computed property
+                    //   }
+                    //
+                    case 149 /* ComputedPropertyName */:
+                        grandparent = location.parent.parent;
+                        if (ts.isClassLike(grandparent) || grandparent.kind === 241 /* InterfaceDeclaration */) {
+                            // A reference to this grandparent's type parameters would be an error
+                            if (result = lookup(getSymbolOfNode(grandparent).members, name, meaning & 67897832 /* Type */)) {
+                                error(errorLocation, ts.Diagnostics.A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type);
+                                return undefined;
+                            }
+                        }
+                        break;
+                    case 197 /* ArrowFunction */:
+                        // when targeting ES6 or higher there is no 'arguments' in an arrow function
+                        // for lower compile targets the resolved symbol is used to emit an error
+                        if (compilerOptions.target >= 2 /* ES2015 */) {
+                            break;
+                        }
+                    // falls through
+                    case 156 /* MethodDeclaration */:
+                    case 157 /* Constructor */:
+                    case 158 /* GetAccessor */:
+                    case 159 /* SetAccessor */:
+                    case 239 /* FunctionDeclaration */:
+                        if (meaning & 3 /* Variable */ && name === "arguments") {
+                            result = argumentsSymbol;
+                            break loop;
+                        }
+                        break;
+                    case 196 /* FunctionExpression */:
+                        if (meaning & 3 /* Variable */ && name === "arguments") {
+                            result = argumentsSymbol;
+                            break loop;
+                        }
+                        if (meaning & 16 /* Function */) {
+                            var functionName = location.name;
+                            if (functionName && name === functionName.escapedText) {
+                                result = location.symbol;
+                                break loop;
+                            }
+                        }
+                        break;
+                    case 152 /* Decorator */:
+                        // Decorators are resolved at the class declaration. Resolving at the parameter
+                        // or member would result in looking up locals in the method.
+                        //
+                        //   function y() {}
+                        //   class C {
+                        //       method(@y x, y) {} // <-- decorator y should be resolved at the class declaration, not the parameter.
+                        //   }
+                        //
+                        if (location.parent && location.parent.kind === 151 /* Parameter */) {
+                            location = location.parent;
+                        }
+                        //
+                        //   function y() {}
+                        //   class C {
+                        //       @y method(x, y) {} // <-- decorator y should be resolved at the class declaration, not the method.
+                        //   }
+                        //
+                        if (location.parent && ts.isClassElement(location.parent)) {
+                            location = location.parent;
+                        }
+                        break;
+                    case 304 /* JSDocTypedefTag */:
+                    case 297 /* JSDocCallbackTag */:
+                        // js type aliases do not resolve names from their host, so skip past it
+                        location = ts.getJSDocHost(location);
+                        break;
+                }
+                if (isSelfReferenceLocation(location)) {
+                    lastSelfReferenceLocation = location;
+                }
+                lastLocation = location;
+                location = location.parent;
+            }
+            // We just climbed up parents looking for the name, meaning that we started in a descendant node of `lastLocation`.
+            // If `result === lastSelfReferenceLocation.symbol`, that means that we are somewhere inside `lastSelfReferenceLocation` looking up a name, and resolving to `lastLocation` itself.
+            // That means that this is a self-reference of `lastLocation`, and shouldn't count this when considering whether `lastLocation` is used.
+            if (isUse && result && (!lastSelfReferenceLocation || result !== lastSelfReferenceLocation.symbol)) {
+                result.isReferenced |= meaning;
+            }
+            if (!result) {
+                if (lastLocation) {
+                    ts.Debug.assert(lastLocation.kind === 279 /* SourceFile */);
+                    if (lastLocation.commonJsModuleIndicator && name === "exports" && meaning & lastLocation.symbol.flags) {
+                        return lastLocation.symbol;
+                    }
+                }
+                if (!excludeGlobals) {
+                    result = lookup(globals, name, meaning);
+                }
+            }
+            if (!result) {
+                if (originalLocation && ts.isInJSFile(originalLocation) && originalLocation.parent) {
+                    if (ts.isRequireCall(originalLocation.parent, /*checkArgumentIsStringLiteralLike*/ false)) {
+                        return requireSymbol;
+                    }
+                }
+            }
+            if (!result) {
+                if (nameNotFoundMessage) {
+                    if (!errorLocation ||
+                        !checkAndReportErrorForMissingPrefix(errorLocation, name, nameArg) && // TODO: GH#18217
+                            !checkAndReportErrorForExtendingInterface(errorLocation) &&
+                            !checkAndReportErrorForUsingTypeAsNamespace(errorLocation, name, meaning) &&
+                            !checkAndReportErrorForUsingTypeAsValue(errorLocation, name, meaning) &&
+                            !checkAndReportErrorForUsingNamespaceModuleAsValue(errorLocation, name, meaning)) {
+                        var suggestion = void 0;
+                        if (suggestedNameNotFoundMessage && suggestionCount < maximumSuggestionCount) {
+                            suggestion = getSuggestedSymbolForNonexistentSymbol(originalLocation, name, meaning);
+                            if (suggestion) {
+                                var suggestionName = symbolToString(suggestion);
+                                var diagnostic = error(errorLocation, suggestedNameNotFoundMessage, diagnosticName(nameArg), suggestionName);
+                                if (suggestion.valueDeclaration) {
+                                    addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
+                                }
+                            }
+                        }
+                        if (!suggestion) {
+                            error(errorLocation, nameNotFoundMessage, diagnosticName(nameArg));
+                        }
+                        suggestionCount++;
+                    }
+                }
+                return undefined;
+            }
+            // Perform extra checks only if error reporting was requested
+            if (nameNotFoundMessage) {
+                if (propertyWithInvalidInitializer) {
+                    // We have a match, but the reference occurred within a property initializer and the identifier also binds
+                    // to a local variable in the constructor where the code will be emitted.
+                    var propertyName = propertyWithInvalidInitializer.name;
+                    error(errorLocation, ts.Diagnostics.Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor, ts.declarationNameToString(propertyName), diagnosticName(nameArg));
+                    return undefined;
+                }
+                // Only check for block-scoped variable if we have an error location and are looking for the
+                // name with variable meaning
+                //      For example,
+                //          declare module foo {
+                //              interface bar {}
+                //          }
+                //      const foo/*1*/: foo/*2*/.bar;
+                // The foo at /*1*/ and /*2*/ will share same symbol with two meanings:
+                // block-scoped variable and namespace module. However, only when we
+                // try to resolve name in /*1*/ which is used in variable position,
+                // we want to check for block-scoped
+                if (errorLocation &&
+                    (meaning & 2 /* BlockScopedVariable */ ||
+                        ((meaning & 32 /* Class */ || meaning & 384 /* Enum */) && (meaning & 67220415 /* Value */) === 67220415 /* Value */))) {
+                    var exportOrLocalSymbol = getExportSymbolOfValueSymbolIfExported(result);
+                    if (exportOrLocalSymbol.flags & 2 /* BlockScopedVariable */ || exportOrLocalSymbol.flags & 32 /* Class */ || exportOrLocalSymbol.flags & 384 /* Enum */) {
+                        checkResolvedBlockScopedVariable(exportOrLocalSymbol, errorLocation);
+                    }
+                }
+                // If we're in an external module, we can't reference value symbols created from UMD export declarations
+                if (result && isInExternalModule && (meaning & 67220415 /* Value */) === 67220415 /* Value */ && !(originalLocation.flags & 2097152 /* JSDoc */)) {
+                    var merged = getMergedSymbol(result);
+                    if (ts.length(merged.declarations) && ts.every(merged.declarations, function (d) { return ts.isNamespaceExportDeclaration(d) || ts.isSourceFile(d) && !!d.symbol.globalExports; })) {
+                        error(errorLocation, ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead, ts.unescapeLeadingUnderscores(name)); // TODO: GH#18217
+                    }
+                }
+            }
+            return result;
+        }
+        function isSelfReferenceLocation(node) {
+            switch (node.kind) {
+                case 239 /* FunctionDeclaration */:
+                case 240 /* ClassDeclaration */:
+                case 241 /* InterfaceDeclaration */:
+                case 243 /* EnumDeclaration */:
+                case 242 /* TypeAliasDeclaration */:
+                case 244 /* ModuleDeclaration */: // For `namespace N { N; }`
+                    return true;
+                default:
+                    return false;
+            }
+        }
+        function diagnosticName(nameArg) {
+            return ts.isString(nameArg) ? ts.unescapeLeadingUnderscores(nameArg) : ts.declarationNameToString(nameArg);
+        }
+        function isTypeParameterSymbolDeclaredInContainer(symbol, container) {
+            for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                var decl = _a[_i];
+                if (decl.kind === 150 /* TypeParameter */) {
+                    var parent = ts.isJSDocTemplateTag(decl.parent) ? ts.getJSDocHost(decl.parent) : decl.parent;
+                    if (parent === container) {
+                        return !(ts.isJSDocTemplateTag(decl.parent) && ts.find(decl.parent.parent.tags, ts.isJSDocTypeAlias)); // TODO: GH#18217
+                    }
+                }
+            }
+            return false;
+        }
+        function checkAndReportErrorForMissingPrefix(errorLocation, name, nameArg) {
+            if (!ts.isIdentifier(errorLocation) || errorLocation.escapedText !== name || isTypeReferenceIdentifier(errorLocation) || isInTypeQuery(errorLocation)) {
+                return false;
+            }
+            var container = ts.getThisContainer(errorLocation, /*includeArrowFunctions*/ false);
+            var location = container;
+            while (location) {
+                if (ts.isClassLike(location.parent)) {
+                    var classSymbol = getSymbolOfNode(location.parent);
+                    if (!classSymbol) {
+                        break;
+                    }
+                    // Check to see if a static member exists.
+                    var constructorType = getTypeOfSymbol(classSymbol);
+                    if (getPropertyOfType(constructorType, name)) {
+                        error(errorLocation, ts.Diagnostics.Cannot_find_name_0_Did_you_mean_the_static_member_1_0, diagnosticName(nameArg), symbolToString(classSymbol));
+                        return true;
+                    }
+                    // No static member is present.
+                    // Check if we're in an instance method and look for a relevant instance member.
+                    if (location === container && !ts.hasModifier(location, 32 /* Static */)) {
+                        var instanceType = getDeclaredTypeOfSymbol(classSymbol).thisType; // TODO: GH#18217
+                        if (getPropertyOfType(instanceType, name)) {
+                            error(errorLocation, ts.Diagnostics.Cannot_find_name_0_Did_you_mean_the_instance_member_this_0, diagnosticName(nameArg));
+                            return true;
+                        }
+                    }
+                }
+                location = location.parent;
+            }
+            return false;
+        }
+        function checkAndReportErrorForExtendingInterface(errorLocation) {
+            var expression = getEntityNameForExtendingInterface(errorLocation);
+            if (expression && resolveEntityName(expression, 64 /* Interface */, /*ignoreErrors*/ true)) {
+                error(errorLocation, ts.Diagnostics.Cannot_extend_an_interface_0_Did_you_mean_implements, ts.getTextOfNode(expression));
+                return true;
+            }
+            return false;
+        }
+        /**
+         * Climbs up parents to an ExpressionWithTypeArguments, and returns its expression,
+         * but returns undefined if that expression is not an EntityNameExpression.
+         */
+        function getEntityNameForExtendingInterface(node) {
+            switch (node.kind) {
+                case 72 /* Identifier */:
+                case 189 /* PropertyAccessExpression */:
+                    return node.parent ? getEntityNameForExtendingInterface(node.parent) : undefined;
+                case 211 /* ExpressionWithTypeArguments */:
+                    if (ts.isEntityNameExpression(node.expression)) {
+                        return node.expression;
+                    }
+                // falls through
+                default:
+                    return undefined;
+            }
+        }
+        function checkAndReportErrorForUsingTypeAsNamespace(errorLocation, name, meaning) {
+            var namespaceMeaning = 1920 /* Namespace */ | (ts.isInJSFile(errorLocation) ? 67220415 /* Value */ : 0);
+            if (meaning === namespaceMeaning) {
+                var symbol = resolveSymbol(resolveName(errorLocation, name, 67897832 /* Type */ & ~namespaceMeaning, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false));
+                var parent = errorLocation.parent;
+                if (symbol) {
+                    if (ts.isQualifiedName(parent)) {
+                        ts.Debug.assert(parent.left === errorLocation, "Should only be resolving left side of qualified name as a namespace");
+                        var propName = parent.right.escapedText;
+                        var propType = getPropertyOfType(getDeclaredTypeOfSymbol(symbol), propName);
+                        if (propType) {
+                            error(parent, ts.Diagnostics.Cannot_access_0_1_because_0_is_a_type_but_not_a_namespace_Did_you_mean_to_retrieve_the_type_of_the_property_1_in_0_with_0_1, ts.unescapeLeadingUnderscores(name), ts.unescapeLeadingUnderscores(propName));
+                            return true;
+                        }
+                    }
+                    error(errorLocation, ts.Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_namespace_here, ts.unescapeLeadingUnderscores(name));
+                    return true;
+                }
+            }
+            return false;
+        }
+        function checkAndReportErrorForUsingTypeAsValue(errorLocation, name, meaning) {
+            if (meaning & (67220415 /* Value */ & ~1024 /* NamespaceModule */)) {
+                if (name === "any" || name === "string" || name === "number" || name === "boolean" || name === "never") {
+                    error(errorLocation, ts.Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here, ts.unescapeLeadingUnderscores(name));
+                    return true;
+                }
+                var symbol = resolveSymbol(resolveName(errorLocation, name, 67897832 /* Type */ & ~67220415 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false));
+                if (symbol && !(symbol.flags & 1024 /* NamespaceModule */)) {
+                    var message = (name === "Promise" || name === "Symbol")
+                        ? ts.Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_es2015_or_later
+                        : ts.Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here;
+                    error(errorLocation, message, ts.unescapeLeadingUnderscores(name));
+                    return true;
+                }
+            }
+            return false;
+        }
+        function checkAndReportErrorForUsingNamespaceModuleAsValue(errorLocation, name, meaning) {
+            if (meaning & (67220415 /* Value */ & ~1024 /* NamespaceModule */ & ~67897832 /* Type */)) {
+                var symbol = resolveSymbol(resolveName(errorLocation, name, 1024 /* NamespaceModule */ & ~67220415 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false));
+                if (symbol) {
+                    error(errorLocation, ts.Diagnostics.Cannot_use_namespace_0_as_a_value, ts.unescapeLeadingUnderscores(name));
+                    return true;
+                }
+            }
+            else if (meaning & (67897832 /* Type */ & ~1024 /* NamespaceModule */ & ~67220415 /* Value */)) {
+                var symbol = resolveSymbol(resolveName(errorLocation, name, (512 /* ValueModule */ | 1024 /* NamespaceModule */) & ~67897832 /* Type */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false));
+                if (symbol) {
+                    error(errorLocation, ts.Diagnostics.Cannot_use_namespace_0_as_a_type, ts.unescapeLeadingUnderscores(name));
+                    return true;
+                }
+            }
+            return false;
+        }
+        function checkResolvedBlockScopedVariable(result, errorLocation) {
+            ts.Debug.assert(!!(result.flags & 2 /* BlockScopedVariable */ || result.flags & 32 /* Class */ || result.flags & 384 /* Enum */));
+            // Block-scoped variables cannot be used before their definition
+            var declaration = ts.find(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 243 /* EnumDeclaration */) || ts.isInJSFile(d) && !!ts.getJSDocEnumTag(d); });
+            if (declaration === undefined)
+                return ts.Debug.fail("Declaration to checkResolvedBlockScopedVariable is undefined");
+            if (!(declaration.flags & 4194304 /* Ambient */) && !isBlockScopedNameDeclaredBeforeUse(declaration, errorLocation)) {
+                var diagnosticMessage = void 0;
+                var declarationName = ts.declarationNameToString(ts.getNameOfDeclaration(declaration));
+                if (result.flags & 2 /* BlockScopedVariable */) {
+                    diagnosticMessage = error(errorLocation, ts.Diagnostics.Block_scoped_variable_0_used_before_its_declaration, declarationName);
+                }
+                else if (result.flags & 32 /* Class */) {
+                    diagnosticMessage = error(errorLocation, ts.Diagnostics.Class_0_used_before_its_declaration, declarationName);
+                }
+                else if (result.flags & 256 /* RegularEnum */) {
+                    diagnosticMessage = error(errorLocation, ts.Diagnostics.Enum_0_used_before_its_declaration, declarationName);
+                }
+                else {
+                    ts.Debug.assert(!!(result.flags & 128 /* ConstEnum */));
+                    if (compilerOptions.preserveConstEnums) {
+                        diagnosticMessage = error(errorLocation, ts.Diagnostics.Class_0_used_before_its_declaration, declarationName);
+                    }
+                }
+                if (diagnosticMessage) {
+                    addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(declaration, ts.Diagnostics._0_is_declared_here, declarationName));
+                }
+            }
+        }
+        /* Starting from 'initial' node walk up the parent chain until 'stopAt' node is reached.
+         * If at any point current node is equal to 'parent' node - return true.
+         * Return false if 'stopAt' node is reached or isFunctionLike(current) === true.
+         */
+        function isSameScopeDescendentOf(initial, parent, stopAt) {
+            return !!parent && !!ts.findAncestor(initial, function (n) { return n === stopAt || ts.isFunctionLike(n) ? "quit" : n === parent; });
+        }
+        function getAnyImportSyntax(node) {
+            switch (node.kind) {
+                case 248 /* ImportEqualsDeclaration */:
+                    return node;
+                case 250 /* ImportClause */:
+                    return node.parent;
+                case 251 /* NamespaceImport */:
+                    return node.parent.parent;
+                case 253 /* ImportSpecifier */:
+                    return node.parent.parent.parent;
+                default:
+                    return undefined;
+            }
+        }
+        function getDeclarationOfAliasSymbol(symbol) {
+            return ts.find(symbol.declarations, ts.isAliasSymbolDeclaration);
+        }
+        function getTargetOfImportEqualsDeclaration(node, dontResolveAlias) {
+            if (node.moduleReference.kind === 259 /* ExternalModuleReference */) {
+                return resolveExternalModuleSymbol(resolveExternalModuleName(node, ts.getExternalModuleImportEqualsDeclarationExpression(node)));
+            }
+            return getSymbolOfPartOfRightHandSideOfImportEquals(node.moduleReference, dontResolveAlias);
+        }
+        function resolveExportByName(moduleSymbol, name, dontResolveAlias) {
+            var exportValue = moduleSymbol.exports.get("export=" /* ExportEquals */);
+            return exportValue
+                ? getPropertyOfType(getTypeOfSymbol(exportValue), name)
+                : resolveSymbol(moduleSymbol.exports.get(name), dontResolveAlias);
+        }
+        function isSyntacticDefault(node) {
+            return ((ts.isExportAssignment(node) && !node.isExportEquals) || ts.hasModifier(node, 512 /* Default */) || ts.isExportSpecifier(node));
+        }
+        function canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias) {
+            if (!allowSyntheticDefaultImports) {
+                return false;
+            }
+            // Declaration files (and ambient modules)
+            if (!file || file.isDeclarationFile) {
+                // Definitely cannot have a synthetic default if they have a syntactic default member specified
+                var defaultExportSymbol = resolveExportByName(moduleSymbol, "default" /* Default */, /*dontResolveAlias*/ true); // Dont resolve alias because we want the immediately exported symbol's declaration
+                if (defaultExportSymbol && ts.some(defaultExportSymbol.declarations, isSyntacticDefault)) {
+                    return false;
+                }
+                // It _might_ still be incorrect to assume there is no __esModule marker on the import at runtime, even if there is no `default` member
+                // So we check a bit more,
+                if (resolveExportByName(moduleSymbol, ts.escapeLeadingUnderscores("__esModule"), dontResolveAlias)) {
+                    // If there is an `__esModule` specified in the declaration (meaning someone explicitly added it or wrote it in their code),
+                    // it definitely is a module and does not have a synthetic default
+                    return false;
+                }
+                // There are _many_ declaration files not written with esmodules in mind that still get compiled into a format with __esModule set
+                // Meaning there may be no default at runtime - however to be on the permissive side, we allow access to a synthetic default member
+                // as there is no marker to indicate if the accompanying JS has `__esModule` or not, or is even native esm
+                return true;
+            }
+            // TypeScript files never have a synthetic default (as they are always emitted with an __esModule marker) _unless_ they contain an export= statement
+            if (!ts.isSourceFileJS(file)) {
+                return hasExportAssignmentSymbol(moduleSymbol);
+            }
+            // JS files have a synthetic default if they do not contain ES2015+ module syntax (export = is not valid in js) _and_ do not have an __esModule marker
+            return !file.externalModuleIndicator && !resolveExportByName(moduleSymbol, ts.escapeLeadingUnderscores("__esModule"), dontResolveAlias);
+        }
+        function getTargetOfImportClause(node, dontResolveAlias) {
+            var moduleSymbol = resolveExternalModuleName(node, node.parent.moduleSpecifier);
+            if (moduleSymbol) {
+                var exportDefaultSymbol = void 0;
+                if (ts.isShorthandAmbientModuleSymbol(moduleSymbol)) {
+                    exportDefaultSymbol = moduleSymbol;
+                }
+                else {
+                    exportDefaultSymbol = resolveExportByName(moduleSymbol, "default" /* Default */, dontResolveAlias);
+                }
+                var file = ts.find(moduleSymbol.declarations, ts.isSourceFile);
+                var hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias);
+                if (!exportDefaultSymbol && !hasSyntheticDefault) {
+                    error(node.name, ts.Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol));
+                }
+                else if (hasSyntheticDefault) {
+                    // per emit behavior, a synthetic default overrides a "real" .default member if `__esModule` is not present
+                    return resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias) || resolveSymbol(moduleSymbol, dontResolveAlias);
+                }
+                return exportDefaultSymbol;
+            }
+        }
+        function getTargetOfNamespaceImport(node, dontResolveAlias) {
+            var moduleSpecifier = node.parent.parent.moduleSpecifier;
+            return resolveESModuleSymbol(resolveExternalModuleName(node, moduleSpecifier), moduleSpecifier, dontResolveAlias);
+        }
+        // This function creates a synthetic symbol that combines the value side of one symbol with the
+        // type/namespace side of another symbol. Consider this example:
+        //
+        //   declare module graphics {
+        //       interface Point {
+        //           x: number;
+        //           y: number;
+        //       }
+        //   }
+        //   declare var graphics: {
+        //       Point: new (x: number, y: number) => graphics.Point;
+        //   }
+        //   declare module "graphics" {
+        //       export = graphics;
+        //   }
+        //
+        // An 'import { Point } from "graphics"' needs to create a symbol that combines the value side 'Point'
+        // property with the type/namespace side interface 'Point'.
+        function combineValueAndTypeSymbols(valueSymbol, typeSymbol) {
+            if (valueSymbol === unknownSymbol && typeSymbol === unknownSymbol) {
+                return unknownSymbol;
+            }
+            if (valueSymbol.flags & (67897832 /* Type */ | 1920 /* Namespace */)) {
+                return valueSymbol;
+            }
+            var result = createSymbol(valueSymbol.flags | typeSymbol.flags, valueSymbol.escapedName);
+            result.declarations = ts.deduplicate(ts.concatenate(valueSymbol.declarations, typeSymbol.declarations), ts.equateValues);
+            result.parent = valueSymbol.parent || typeSymbol.parent;
+            if (valueSymbol.valueDeclaration)
+                result.valueDeclaration = valueSymbol.valueDeclaration;
+            if (typeSymbol.members)
+                result.members = typeSymbol.members;
+            if (valueSymbol.exports)
+                result.exports = valueSymbol.exports;
+            return result;
+        }
+        function getExportOfModule(symbol, name, dontResolveAlias) {
+            if (symbol.flags & 1536 /* Module */) {
+                return resolveSymbol(getExportsOfSymbol(symbol).get(name), dontResolveAlias);
+            }
+        }
+        function getPropertyOfVariable(symbol, name) {
+            if (symbol.flags & 3 /* Variable */) {
+                var typeAnnotation = symbol.valueDeclaration.type;
+                if (typeAnnotation) {
+                    return resolveSymbol(getPropertyOfType(getTypeFromTypeNode(typeAnnotation), name));
+                }
+            }
+        }
+        function getExternalModuleMember(node, specifier, dontResolveAlias) {
+            if (dontResolveAlias === void 0) { dontResolveAlias = false; }
+            var moduleSymbol = resolveExternalModuleName(node, node.moduleSpecifier); // TODO: GH#18217
+            var targetSymbol = resolveESModuleSymbol(moduleSymbol, node.moduleSpecifier, dontResolveAlias);
+            if (targetSymbol) {
+                var name = specifier.propertyName || specifier.name;
+                if (name.escapedText) {
+                    if (ts.isShorthandAmbientModuleSymbol(moduleSymbol)) {
+                        return moduleSymbol;
+                    }
+                    var symbolFromVariable = void 0;
+                    // First check if module was specified with "export=". If so, get the member from the resolved type
+                    if (moduleSymbol && moduleSymbol.exports && moduleSymbol.exports.get("export=" /* ExportEquals */)) {
+                        symbolFromVariable = getPropertyOfType(getTypeOfSymbol(targetSymbol), name.escapedText);
+                    }
+                    else {
+                        symbolFromVariable = getPropertyOfVariable(targetSymbol, name.escapedText);
+                    }
+                    // if symbolFromVariable is export - get its final target
+                    symbolFromVariable = resolveSymbol(symbolFromVariable, dontResolveAlias);
+                    var symbolFromModule = getExportOfModule(targetSymbol, name.escapedText, dontResolveAlias);
+                    // If the export member we're looking for is default, and there is no real default but allowSyntheticDefaultImports is on, return the entire module as the default
+                    if (!symbolFromModule && allowSyntheticDefaultImports && name.escapedText === "default" /* Default */) {
+                        symbolFromModule = resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias) || resolveSymbol(moduleSymbol, dontResolveAlias);
+                    }
+                    var symbol = symbolFromModule && symbolFromVariable && symbolFromModule !== symbolFromVariable ?
+                        combineValueAndTypeSymbols(symbolFromVariable, symbolFromModule) :
+                        symbolFromModule || symbolFromVariable;
+                    if (!symbol) {
+                        var moduleName = getFullyQualifiedName(moduleSymbol, node);
+                        var declarationName = ts.declarationNameToString(name);
+                        var suggestion = getSuggestedSymbolForNonexistentModule(name, targetSymbol);
+                        if (suggestion !== undefined) {
+                            var suggestionName = symbolToString(suggestion);
+                            var diagnostic = error(name, ts.Diagnostics.Module_0_has_no_exported_member_1_Did_you_mean_2, moduleName, declarationName, suggestionName);
+                            if (suggestion.valueDeclaration) {
+                                addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
+                            }
+                        }
+                        else {
+                            error(name, ts.Diagnostics.Module_0_has_no_exported_member_1, moduleName, declarationName);
+                        }
+                    }
+                    return symbol;
+                }
+            }
+        }
+        function getTargetOfImportSpecifier(node, dontResolveAlias) {
+            return getExternalModuleMember(node.parent.parent.parent, node, dontResolveAlias);
+        }
+        function getTargetOfNamespaceExportDeclaration(node, dontResolveAlias) {
+            return resolveExternalModuleSymbol(node.parent.symbol, dontResolveAlias);
+        }
+        function getTargetOfExportSpecifier(node, meaning, dontResolveAlias) {
+            return node.parent.parent.moduleSpecifier ?
+                getExternalModuleMember(node.parent.parent, node, dontResolveAlias) :
+                resolveEntityName(node.propertyName || node.name, meaning, /*ignoreErrors*/ false, dontResolveAlias);
+        }
+        function getTargetOfExportAssignment(node, dontResolveAlias) {
+            var expression = (ts.isExportAssignment(node) ? node.expression : node.right);
+            if (ts.isClassExpression(expression)) {
+                return checkExpression(expression).symbol;
+            }
+            var aliasLike = resolveEntityName(expression, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */, /*ignoreErrors*/ true, dontResolveAlias);
+            if (aliasLike) {
+                return aliasLike;
+            }
+            checkExpression(expression);
+            return getNodeLinks(expression).resolvedSymbol;
+        }
+        function getTargetOfAliasDeclaration(node, dontRecursivelyResolve) {
+            if (dontRecursivelyResolve === void 0) { dontRecursivelyResolve = false; }
+            switch (node.kind) {
+                case 248 /* ImportEqualsDeclaration */:
+                    return getTargetOfImportEqualsDeclaration(node, dontRecursivelyResolve);
+                case 250 /* ImportClause */:
+                    return getTargetOfImportClause(node, dontRecursivelyResolve);
+                case 251 /* NamespaceImport */:
+                    return getTargetOfNamespaceImport(node, dontRecursivelyResolve);
+                case 253 /* ImportSpecifier */:
+                    return getTargetOfImportSpecifier(node, dontRecursivelyResolve);
+                case 257 /* ExportSpecifier */:
+                    return getTargetOfExportSpecifier(node, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */, dontRecursivelyResolve);
+                case 254 /* ExportAssignment */:
+                case 204 /* BinaryExpression */:
+                    return getTargetOfExportAssignment(node, dontRecursivelyResolve);
+                case 247 /* NamespaceExportDeclaration */:
+                    return getTargetOfNamespaceExportDeclaration(node, dontRecursivelyResolve);
+                default:
+                    return ts.Debug.fail();
+            }
+        }
+        /**
+         * Indicates that a symbol is an alias that does not merge with a local declaration.
+         * OR Is a JSContainer which may merge an alias with a local declaration
+         */
+        function isNonLocalAlias(symbol, excludes) {
+            if (excludes === void 0) { excludes = 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */; }
+            if (!symbol)
+                return false;
+            return (symbol.flags & (2097152 /* Alias */ | excludes)) === 2097152 /* Alias */ || !!(symbol.flags & 2097152 /* Alias */ && symbol.flags & 67108864 /* Assignment */);
+        }
+        function resolveSymbol(symbol, dontResolveAlias) {
+            return !dontResolveAlias && isNonLocalAlias(symbol) ? resolveAlias(symbol) : symbol;
+        }
+        function resolveAlias(symbol) {
+            ts.Debug.assert((symbol.flags & 2097152 /* Alias */) !== 0, "Should only get Alias here.");
+            var links = getSymbolLinks(symbol);
+            if (!links.target) {
+                links.target = resolvingSymbol;
+                var node = getDeclarationOfAliasSymbol(symbol);
+                if (!node)
+                    return ts.Debug.fail();
+                var target = getTargetOfAliasDeclaration(node);
+                if (links.target === resolvingSymbol) {
+                    links.target = target || unknownSymbol;
+                }
+                else {
+                    error(node, ts.Diagnostics.Circular_definition_of_import_alias_0, symbolToString(symbol));
+                }
+            }
+            else if (links.target === resolvingSymbol) {
+                links.target = unknownSymbol;
+            }
+            return links.target;
+        }
+        function markExportAsReferenced(node) {
+            var symbol = getSymbolOfNode(node);
+            var target = resolveAlias(symbol);
+            if (target) {
+                var markAlias = target === unknownSymbol ||
+                    ((target.flags & 67220415 /* Value */) && !isConstEnumOrConstEnumOnlyModule(target));
+                if (markAlias) {
+                    markAliasSymbolAsReferenced(symbol);
+                }
+            }
+        }
+        // When an alias symbol is referenced, we need to mark the entity it references as referenced and in turn repeat that until
+        // we reach a non-alias or an exported entity (which is always considered referenced). We do this by checking the target of
+        // the alias as an expression (which recursively takes us back here if the target references another alias).
+        function markAliasSymbolAsReferenced(symbol) {
+            var links = getSymbolLinks(symbol);
+            if (!links.referenced) {
+                links.referenced = true;
+                var node = getDeclarationOfAliasSymbol(symbol);
+                if (!node)
+                    return ts.Debug.fail();
+                if (node.kind === 254 /* ExportAssignment */) {
+                    // export default <symbol>
+                    checkExpressionCached(node.expression);
+                }
+                else if (node.kind === 257 /* ExportSpecifier */) {
+                    // export { <symbol> } or export { <symbol> as foo }
+                    checkExpressionCached(node.propertyName || node.name);
+                }
+                else if (ts.isInternalModuleImportEqualsDeclaration(node)) {
+                    // import foo = <symbol>
+                    checkExpressionCached(node.moduleReference);
+                }
+            }
+        }
+        // This function is only for imports with entity names
+        function getSymbolOfPartOfRightHandSideOfImportEquals(entityName, dontResolveAlias) {
+            // There are three things we might try to look for. In the following examples,
+            // the search term is enclosed in |...|:
+            //
+            //     import a = |b|; // Namespace
+            //     import a = |b.c|; // Value, type, namespace
+            //     import a = |b.c|.d; // Namespace
+            if (entityName.kind === 72 /* Identifier */ && ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
+                entityName = entityName.parent;
+            }
+            // Check for case 1 and 3 in the above example
+            if (entityName.kind === 72 /* Identifier */ || entityName.parent.kind === 148 /* QualifiedName */) {
+                return resolveEntityName(entityName, 1920 /* Namespace */, /*ignoreErrors*/ false, dontResolveAlias);
+            }
+            else {
+                // Case 2 in above example
+                // entityName.kind could be a QualifiedName or a Missing identifier
+                ts.Debug.assert(entityName.parent.kind === 248 /* ImportEqualsDeclaration */);
+                return resolveEntityName(entityName, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */, /*ignoreErrors*/ false, dontResolveAlias);
+            }
+        }
+        function getFullyQualifiedName(symbol, containingLocation) {
+            return symbol.parent ? getFullyQualifiedName(symbol.parent, containingLocation) + "." + symbolToString(symbol) : symbolToString(symbol, containingLocation, /*meaning*/ undefined, 16 /* DoNotIncludeSymbolChain */ | 4 /* AllowAnyNodeKind */);
+        }
+        /**
+         * Resolves a qualified name and any involved aliases.
+         */
+        function resolveEntityName(name, meaning, ignoreErrors, dontResolveAlias, location) {
+            if (ts.nodeIsMissing(name)) {
+                return undefined;
+            }
+            var namespaceMeaning = 1920 /* Namespace */ | (ts.isInJSFile(name) ? meaning & 67220415 /* Value */ : 0);
+            var symbol;
+            if (name.kind === 72 /* Identifier */) {
+                var message = meaning === namespaceMeaning ? ts.Diagnostics.Cannot_find_namespace_0 : getCannotFindNameDiagnosticForName(getFirstIdentifier(name).escapedText);
+                var symbolFromJSPrototype = ts.isInJSFile(name) ? resolveEntityNameFromAssignmentDeclaration(name, meaning) : undefined;
+                symbol = resolveName(location || name, name.escapedText, meaning, ignoreErrors || symbolFromJSPrototype ? undefined : message, name, /*isUse*/ true);
+                if (!symbol) {
+                    return symbolFromJSPrototype;
+                }
+            }
+            else if (name.kind === 148 /* QualifiedName */ || name.kind === 189 /* PropertyAccessExpression */) {
+                var left = name.kind === 148 /* QualifiedName */ ? name.left : name.expression;
+                var right = name.kind === 148 /* QualifiedName */ ? name.right : name.name;
+                var namespace = resolveEntityName(left, namespaceMeaning, ignoreErrors, /*dontResolveAlias*/ false, location);
+                if (!namespace || ts.nodeIsMissing(right)) {
+                    return undefined;
+                }
+                else if (namespace === unknownSymbol) {
+                    return namespace;
+                }
+                if (ts.isInJSFile(name)) {
+                    if (namespace.valueDeclaration &&
+                        ts.isVariableDeclaration(namespace.valueDeclaration) &&
+                        namespace.valueDeclaration.initializer &&
+                        isCommonJsRequire(namespace.valueDeclaration.initializer)) {
+                        var moduleName = namespace.valueDeclaration.initializer.arguments[0];
+                        var moduleSym = resolveExternalModuleName(moduleName, moduleName);
+                        if (moduleSym) {
+                            var resolvedModuleSymbol = resolveExternalModuleSymbol(moduleSym);
+                            if (resolvedModuleSymbol) {
+                                namespace = resolvedModuleSymbol;
+                            }
+                        }
+                    }
+                }
+                symbol = getSymbol(getExportsOfSymbol(namespace), right.escapedText, meaning);
+                if (!symbol) {
+                    if (!ignoreErrors) {
+                        error(right, ts.Diagnostics.Namespace_0_has_no_exported_member_1, getFullyQualifiedName(namespace), ts.declarationNameToString(right));
+                    }
+                    return undefined;
+                }
+            }
+            else {
+                throw ts.Debug.assertNever(name, "Unknown entity name kind.");
+            }
+            ts.Debug.assert((ts.getCheckFlags(symbol) & 1 /* Instantiated */) === 0, "Should never get an instantiated symbol here.");
+            return (symbol.flags & meaning) || dontResolveAlias ? symbol : resolveAlias(symbol);
+        }
+        /**
+         * 1. For prototype-property methods like `A.prototype.m = function () ...`, try to resolve names in the scope of `A` too.
+         * Note that prototype-property assignment to locations outside the current file (eg globals) doesn't work, so
+         * name resolution won't work either.
+         * 2. For property assignments like `{ x: function f () { } }`, try to resolve names in the scope of `f` too.
+         */
+        function resolveEntityNameFromAssignmentDeclaration(name, meaning) {
+            if (isJSDocTypeReference(name.parent)) {
+                var secondaryLocation = getAssignmentDeclarationLocation(name.parent);
+                if (secondaryLocation) {
+                    return resolveName(secondaryLocation, name.escapedText, meaning, /*nameNotFoundMessage*/ undefined, name, /*isUse*/ true);
+                }
+            }
+        }
+        function getAssignmentDeclarationLocation(node) {
+            var typeAlias = ts.findAncestor(node, function (node) { return !(ts.isJSDocNode(node) || node.flags & 2097152 /* JSDoc */) ? "quit" : ts.isJSDocTypeAlias(node); });
+            if (typeAlias) {
+                return;
+            }
+            var host = ts.getJSDocHost(node);
+            if (ts.isExpressionStatement(host) &&
+                ts.isBinaryExpression(host.expression) &&
+                ts.getAssignmentDeclarationKind(host.expression) === 3 /* PrototypeProperty */) {
+                // X.prototype.m = /** @param {K} p */ function () { } <-- look for K on X's declaration
+                var symbol = getSymbolOfNode(host.expression.left);
+                if (symbol) {
+                    return getDeclarationOfJSPrototypeContainer(symbol);
+                }
+            }
+            if ((ts.isObjectLiteralMethod(host) || ts.isPropertyAssignment(host)) &&
+                ts.isBinaryExpression(host.parent.parent) &&
+                ts.getAssignmentDeclarationKind(host.parent.parent) === 6 /* Prototype */) {
+                // X.prototype = { /** @param {K} p */m() { } } <-- look for K on X's declaration
+                var symbol = getSymbolOfNode(host.parent.parent.left);
+                if (symbol) {
+                    return getDeclarationOfJSPrototypeContainer(symbol);
+                }
+            }
+            var sig = ts.getHostSignatureFromJSDocHost(host);
+            if (sig) {
+                var symbol = getSymbolOfNode(sig);
+                return symbol && symbol.valueDeclaration;
+            }
+        }
+        function getDeclarationOfJSPrototypeContainer(symbol) {
+            var decl = symbol.parent.valueDeclaration;
+            if (!decl) {
+                return undefined;
+            }
+            var initializer = ts.isAssignmentDeclaration(decl) ? ts.getAssignedExpandoInitializer(decl) :
+                ts.hasOnlyExpressionInitializer(decl) ? ts.getDeclaredExpandoInitializer(decl) :
+                    undefined;
+            return initializer || decl;
+        }
+        function resolveExternalModuleName(location, moduleReferenceExpression, ignoreErrors) {
+            return resolveExternalModuleNameWorker(location, moduleReferenceExpression, ignoreErrors ? undefined : ts.Diagnostics.Cannot_find_module_0);
+        }
+        function resolveExternalModuleNameWorker(location, moduleReferenceExpression, moduleNotFoundError, isForAugmentation) {
+            if (isForAugmentation === void 0) { isForAugmentation = false; }
+            return ts.isStringLiteralLike(moduleReferenceExpression)
+                ? resolveExternalModule(location, moduleReferenceExpression.text, moduleNotFoundError, moduleReferenceExpression, isForAugmentation)
+                : undefined;
+        }
+        function resolveExternalModule(location, moduleReference, moduleNotFoundError, errorNode, isForAugmentation) {
+            if (isForAugmentation === void 0) { isForAugmentation = false; }
+            if (moduleReference === undefined) {
+                return;
+            }
+            if (ts.startsWith(moduleReference, "@types/")) {
+                var diag = ts.Diagnostics.Cannot_import_type_declaration_files_Consider_importing_0_instead_of_1;
+                var withoutAtTypePrefix = ts.removePrefix(moduleReference, "@types/");
+                error(errorNode, diag, withoutAtTypePrefix, moduleReference);
+            }
+            var ambientModule = tryFindAmbientModule(moduleReference, /*withAugmentations*/ true);
+            if (ambientModule) {
+                return ambientModule;
+            }
+            var currentSourceFile = ts.getSourceFileOfNode(location);
+            var resolvedModule = ts.getResolvedModule(currentSourceFile, moduleReference); // TODO: GH#18217
+            var resolutionDiagnostic = resolvedModule && ts.getResolutionDiagnostic(compilerOptions, resolvedModule);
+            var sourceFile = resolvedModule && !resolutionDiagnostic && host.getSourceFile(resolvedModule.resolvedFileName);
+            if (sourceFile) {
+                if (sourceFile.symbol) {
+                    if (resolvedModule.isExternalLibraryImport && !ts.resolutionExtensionIsTSOrJson(resolvedModule.extension)) {
+                        errorOnImplicitAnyModule(/*isError*/ false, errorNode, resolvedModule, moduleReference);
+                    }
+                    // merged symbol is module declaration symbol combined with all augmentations
+                    return getMergedSymbol(sourceFile.symbol);
+                }
+                if (moduleNotFoundError) {
+                    // report errors only if it was requested
+                    error(errorNode, ts.Diagnostics.File_0_is_not_a_module, sourceFile.fileName);
+                }
+                return undefined;
+            }
+            if (patternAmbientModules) {
+                var pattern = ts.findBestPatternMatch(patternAmbientModules, function (_) { return _.pattern; }, moduleReference);
+                if (pattern) {
+                    return getMergedSymbol(pattern.symbol);
+                }
+            }
+            // May be an untyped module. If so, ignore resolutionDiagnostic.
+            if (resolvedModule && !ts.resolutionExtensionIsTSOrJson(resolvedModule.extension) && resolutionDiagnostic === undefined || resolutionDiagnostic === ts.Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type) {
+                if (isForAugmentation) {
+                    var diag = ts.Diagnostics.Invalid_module_name_in_augmentation_Module_0_resolves_to_an_untyped_module_at_1_which_cannot_be_augmented;
+                    error(errorNode, diag, moduleReference, resolvedModule.resolvedFileName);
+                }
+                else {
+                    errorOnImplicitAnyModule(/*isError*/ noImplicitAny && !!moduleNotFoundError, errorNode, resolvedModule, moduleReference);
+                }
+                // Failed imports and untyped modules are both treated in an untyped manner; only difference is whether we give a diagnostic first.
+                return undefined;
+            }
+            if (moduleNotFoundError) {
+                // For relative paths, see if this was possibly a projectReference redirect
+                if (ts.pathIsRelative(moduleReference)) {
+                    var sourceFile_1 = ts.getSourceFileOfNode(location);
+                    var redirects = sourceFile_1.redirectedReferences;
+                    if (redirects) {
+                        var normalizedTargetPath = ts.getNormalizedAbsolutePath(moduleReference, ts.getDirectoryPath(sourceFile_1.fileName));
+                        for (var _i = 0, _a = [".ts" /* Ts */, ".tsx" /* Tsx */]; _i < _a.length; _i++) {
+                            var ext = _a[_i];
+                            var probePath = normalizedTargetPath + ext;
+                            if (redirects.indexOf(probePath) >= 0) {
+                                error(errorNode, ts.Diagnostics.Output_file_0_has_not_been_built_from_source_file_1, moduleReference, probePath);
+                                return undefined;
+                            }
+                        }
+                    }
+                }
+                if (resolutionDiagnostic) {
+                    error(errorNode, resolutionDiagnostic, moduleReference, resolvedModule.resolvedFileName);
+                }
+                else {
+                    var tsExtension = ts.tryExtractTSExtension(moduleReference);
+                    if (tsExtension) {
+                        var diag = ts.Diagnostics.An_import_path_cannot_end_with_a_0_extension_Consider_importing_1_instead;
+                        error(errorNode, diag, tsExtension, ts.removeExtension(moduleReference, tsExtension));
+                    }
+                    else if (!compilerOptions.resolveJsonModule &&
+                        ts.fileExtensionIs(moduleReference, ".json" /* Json */) &&
+                        ts.getEmitModuleResolutionKind(compilerOptions) === ts.ModuleResolutionKind.NodeJs &&
+                        ts.hasJsonModuleEmitEnabled(compilerOptions)) {
+                        error(errorNode, ts.Diagnostics.Cannot_find_module_0_Consider_using_resolveJsonModule_to_import_module_with_json_extension, moduleReference);
+                    }
+                    else {
+                        error(errorNode, moduleNotFoundError, moduleReference);
+                    }
+                }
+            }
+            return undefined;
+        }
+        function errorOnImplicitAnyModule(isError, errorNode, _a, moduleReference) {
+            var packageId = _a.packageId, resolvedFileName = _a.resolvedFileName;
+            var errorInfo = !ts.isExternalModuleNameRelative(moduleReference) && packageId
+                ? typesPackageExists(packageId.name)
+                    ? ts.chainDiagnosticMessages(
+                    /*details*/ undefined, ts.Diagnostics.If_the_0_package_actually_exposes_this_module_consider_sending_a_pull_request_to_amend_https_Colon_Slash_Slashgithub.amrom.workers.dev_SlashDefinitelyTyped_SlashDefinitelyTyped_Slashtree_Slashmaster_Slashtypes_Slash_1, packageId.name, ts.mangleScopedPackageName(packageId.name))
+                    : ts.chainDiagnosticMessages(
+                    /*details*/ undefined, ts.Diagnostics.Try_npm_install_types_Slash_1_if_it_exists_or_add_a_new_declaration_d_ts_file_containing_declare_module_0, moduleReference, ts.mangleScopedPackageName(packageId.name))
+                : undefined;
+            errorOrSuggestion(isError, errorNode, ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type, moduleReference, resolvedFileName));
+        }
+        function typesPackageExists(packageName) {
+            return getPackagesSet().has(ts.getTypesPackageName(packageName));
+        }
+        function resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias) {
+            if (moduleSymbol) {
+                var exportEquals = resolveSymbol(moduleSymbol.exports.get("export=" /* ExportEquals */), dontResolveAlias);
+                var exported = getCommonJsExportEquals(exportEquals, moduleSymbol);
+                return getMergedSymbol(exported) || moduleSymbol;
+            }
+            return undefined;
+        }
+        function getCommonJsExportEquals(exported, moduleSymbol) {
+            if (!exported || exported === unknownSymbol || exported === moduleSymbol || moduleSymbol.exports.size === 1 || exported.flags & 2097152 /* Alias */) {
+                return exported;
+            }
+            var merged = cloneSymbol(exported);
+            if (merged.exports === undefined) {
+                merged.flags = merged.flags | 512 /* ValueModule */;
+                merged.exports = ts.createSymbolTable();
+            }
+            moduleSymbol.exports.forEach(function (s, name) {
+                if (name === "export=" /* ExportEquals */)
+                    return;
+                merged.exports.set(name, merged.exports.has(name) ? mergeSymbol(merged.exports.get(name), s) : s);
+            });
+            return merged;
+        }
+        // An external module with an 'export =' declaration may be referenced as an ES6 module provided the 'export ='
+        // references a symbol that is at least declared as a module or a variable. The target of the 'export =' may
+        // combine other declarations with the module or variable (e.g. a class/module, function/module, interface/variable).
+        function resolveESModuleSymbol(moduleSymbol, referencingLocation, dontResolveAlias) {
+            var symbol = resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias);
+            if (!dontResolveAlias && symbol) {
+                if (!(symbol.flags & (1536 /* Module */ | 3 /* Variable */)) && !ts.getDeclarationOfKind(symbol, 279 /* SourceFile */)) {
+                    var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015
+                        ? "allowSyntheticDefaultImports"
+                        : "esModuleInterop";
+                    error(referencingLocation, ts.Diagnostics.This_module_can_only_be_referenced_with_ECMAScript_imports_Slashexports_by_turning_on_the_0_flag_and_referencing_its_default_export, compilerOptionName);
+                    return symbol;
+                }
+                if (compilerOptions.esModuleInterop) {
+                    var referenceParent = referencingLocation.parent;
+                    if ((ts.isImportDeclaration(referenceParent) && ts.getNamespaceDeclarationNode(referenceParent)) ||
+                        ts.isImportCall(referenceParent)) {
+                        var type = getTypeOfSymbol(symbol);
+                        var sigs = getSignaturesOfStructuredType(type, 0 /* Call */);
+                        if (!sigs || !sigs.length) {
+                            sigs = getSignaturesOfStructuredType(type, 1 /* Construct */);
+                        }
+                        if (sigs && sigs.length) {
+                            var moduleType = getTypeWithSyntheticDefaultImportType(type, symbol, moduleSymbol);
+                            // Create a new symbol which has the module's type less the call and construct signatures
+                            var result = createSymbol(symbol.flags, symbol.escapedName);
+                            result.declarations = symbol.declarations ? symbol.declarations.slice() : [];
+                            result.parent = symbol.parent;
+                            result.target = symbol;
+                            result.originatingImport = referenceParent;
+                            if (symbol.valueDeclaration)
+                                result.valueDeclaration = symbol.valueDeclaration;
+                            if (symbol.constEnumOnlyModule)
+                                result.constEnumOnlyModule = true;
+                            if (symbol.members)
+                                result.members = ts.cloneMap(symbol.members);
+                            if (symbol.exports)
+                                result.exports = ts.cloneMap(symbol.exports);
+                            var resolvedModuleType = resolveStructuredTypeMembers(moduleType); // Should already be resolved from the signature checks above
+                            result.type = createAnonymousType(result, resolvedModuleType.members, ts.emptyArray, ts.emptyArray, resolvedModuleType.stringIndexInfo, resolvedModuleType.numberIndexInfo);
+                            return result;
+                        }
+                    }
+                }
+            }
+            return symbol;
+        }
+        function hasExportAssignmentSymbol(moduleSymbol) {
+            return moduleSymbol.exports.get("export=" /* ExportEquals */) !== undefined;
+        }
+        function getExportsOfModuleAsArray(moduleSymbol) {
+            return symbolsToArray(getExportsOfModule(moduleSymbol));
+        }
+        function getExportsAndPropertiesOfModule(moduleSymbol) {
+            var exports = getExportsOfModuleAsArray(moduleSymbol);
+            var exportEquals = resolveExternalModuleSymbol(moduleSymbol);
+            if (exportEquals !== moduleSymbol) {
+                ts.addRange(exports, getPropertiesOfType(getTypeOfSymbol(exportEquals)));
+            }
+            return exports;
+        }
+        function tryGetMemberInModuleExports(memberName, moduleSymbol) {
+            var symbolTable = getExportsOfModule(moduleSymbol);
+            if (symbolTable) {
+                return symbolTable.get(memberName);
+            }
+        }
+        function tryGetMemberInModuleExportsAndProperties(memberName, moduleSymbol) {
+            var symbol = tryGetMemberInModuleExports(memberName, moduleSymbol);
+            if (symbol) {
+                return symbol;
+            }
+            var exportEquals = resolveExternalModuleSymbol(moduleSymbol);
+            if (exportEquals === moduleSymbol) {
+                return undefined;
+            }
+            var type = getTypeOfSymbol(exportEquals);
+            return type.flags & 131068 /* Primitive */ ? undefined : getPropertyOfType(type, memberName);
+        }
+        function getExportsOfSymbol(symbol) {
+            return symbol.flags & 32 /* Class */ ? getResolvedMembersOrExportsOfSymbol(symbol, "resolvedExports" /* resolvedExports */) :
+                symbol.flags & 1536 /* Module */ ? getExportsOfModule(symbol) :
+                    symbol.exports || emptySymbols;
+        }
+        function getExportsOfModule(moduleSymbol) {
+            var links = getSymbolLinks(moduleSymbol);
+            return links.resolvedExports || (links.resolvedExports = getExportsOfModuleWorker(moduleSymbol));
+        }
+        /**
+         * Extends one symbol table with another while collecting information on name collisions for error message generation into the `lookupTable` argument
+         * Not passing `lookupTable` and `exportNode` disables this collection, and just extends the tables
+         */
+        function extendExportSymbols(target, source, lookupTable, exportNode) {
+            if (!source)
+                return;
+            source.forEach(function (sourceSymbol, id) {
+                if (id === "default" /* Default */)
+                    return;
+                var targetSymbol = target.get(id);
+                if (!targetSymbol) {
+                    target.set(id, sourceSymbol);
+                    if (lookupTable && exportNode) {
+                        lookupTable.set(id, {
+                            specifierText: ts.getTextOfNode(exportNode.moduleSpecifier)
+                        });
+                    }
+                }
+                else if (lookupTable && exportNode && targetSymbol && resolveSymbol(targetSymbol) !== resolveSymbol(sourceSymbol)) {
+                    var collisionTracker = lookupTable.get(id);
+                    if (!collisionTracker.exportsWithDuplicate) {
+                        collisionTracker.exportsWithDuplicate = [exportNode];
+                    }
+                    else {
+                        collisionTracker.exportsWithDuplicate.push(exportNode);
+                    }
+                }
+            });
+        }
+        function getExportsOfModuleWorker(moduleSymbol) {
+            var visitedSymbols = [];
+            // A module defined by an 'export=' consists of one export that needs to be resolved
+            moduleSymbol = resolveExternalModuleSymbol(moduleSymbol);
+            return visit(moduleSymbol) || emptySymbols;
+            // The ES6 spec permits export * declarations in a module to circularly reference the module itself. For example,
+            // module 'a' can 'export * from "b"' and 'b' can 'export * from "a"' without error.
+            function visit(symbol) {
+                if (!(symbol && symbol.exports && ts.pushIfUnique(visitedSymbols, symbol))) {
+                    return;
+                }
+                var symbols = ts.cloneMap(symbol.exports);
+                // All export * declarations are collected in an __export symbol by the binder
+                var exportStars = symbol.exports.get("__export" /* ExportStar */);
+                if (exportStars) {
+                    var nestedSymbols = ts.createSymbolTable();
+                    var lookupTable_1 = ts.createMap();
+                    for (var _i = 0, _a = exportStars.declarations; _i < _a.length; _i++) {
+                        var node = _a[_i];
+                        var resolvedModule = resolveExternalModuleName(node, node.moduleSpecifier);
+                        var exportedSymbols = visit(resolvedModule);
+                        extendExportSymbols(nestedSymbols, exportedSymbols, lookupTable_1, node);
+                    }
+                    lookupTable_1.forEach(function (_a, id) {
+                        var exportsWithDuplicate = _a.exportsWithDuplicate;
+                        // It's not an error if the file with multiple `export *`s with duplicate names exports a member with that name itself
+                        if (id === "export=" || !(exportsWithDuplicate && exportsWithDuplicate.length) || symbols.has(id)) {
+                            return;
+                        }
+                        for (var _i = 0, exportsWithDuplicate_1 = exportsWithDuplicate; _i < exportsWithDuplicate_1.length; _i++) {
+                            var node = exportsWithDuplicate_1[_i];
+                            diagnostics.add(ts.createDiagnosticForNode(node, ts.Diagnostics.Module_0_has_already_exported_a_member_named_1_Consider_explicitly_re_exporting_to_resolve_the_ambiguity, lookupTable_1.get(id).specifierText, ts.unescapeLeadingUnderscores(id)));
+                        }
+                    });
+                    extendExportSymbols(symbols, nestedSymbols);
+                }
+                return symbols;
+            }
+        }
+        function getMergedSymbol(symbol) {
+            var merged;
+            return symbol && symbol.mergeId && (merged = mergedSymbols[symbol.mergeId]) ? merged : symbol;
+        }
+        function getSymbolOfNode(node) {
+            return getMergedSymbol(node.symbol && getLateBoundSymbol(node.symbol));
+        }
+        function getParentOfSymbol(symbol) {
+            return getMergedSymbol(symbol.parent && getLateBoundSymbol(symbol.parent));
+        }
+        function getAlternativeContainingModules(symbol, enclosingDeclaration) {
+            var containingFile = ts.getSourceFileOfNode(enclosingDeclaration);
+            var id = "" + getNodeId(containingFile);
+            var links = getSymbolLinks(symbol);
+            var results;
+            if (links.extendedContainersByFile && (results = links.extendedContainersByFile.get(id))) {
+                return results;
+            }
+            if (containingFile && containingFile.imports) {
+                // Try to make an import using an import already in the enclosing file, if possible
+                for (var _i = 0, _a = containingFile.imports; _i < _a.length; _i++) {
+                    var importRef = _a[_i];
+                    if (ts.nodeIsSynthesized(importRef))
+                        continue; // Synthetic names can't be resolved by `resolveExternalModuleName` - they'll cause a debug assert if they error
+                    var resolvedModule = resolveExternalModuleName(enclosingDeclaration, importRef, /*ignoreErrors*/ true);
+                    if (!resolvedModule)
+                        continue;
+                    var ref = getAliasForSymbolInContainer(resolvedModule, symbol);
+                    if (!ref)
+                        continue;
+                    results = ts.append(results, resolvedModule);
+                }
+                if (ts.length(results)) {
+                    (links.extendedContainersByFile || (links.extendedContainersByFile = ts.createMap())).set(id, results);
+                    return results;
+                }
+            }
+            if (links.extendedContainers) {
+                return links.extendedContainers;
+            }
+            // No results from files already being imported by this file - expand search (expensive, but not location-specific, so cached)
+            var otherFiles = host.getSourceFiles();
+            for (var _b = 0, otherFiles_1 = otherFiles; _b < otherFiles_1.length; _b++) {
+                var file = otherFiles_1[_b];
+                if (!ts.isExternalModule(file))
+                    continue;
+                var sym = getSymbolOfNode(file);
+                var ref = getAliasForSymbolInContainer(sym, symbol);
+                if (!ref)
+                    continue;
+                results = ts.append(results, sym);
+            }
+            return links.extendedContainers = results || ts.emptyArray;
+        }
+        /**
+         * Attempts to find the symbol corresponding to the container a symbol is in - usually this
+         * is just its' `.parent`, but for locals, this value is `undefined`
+         */
+        function getContainersOfSymbol(symbol, enclosingDeclaration) {
+            var container = getParentOfSymbol(symbol);
+            if (container) {
+                var additionalContainers = ts.mapDefined(container.declarations, fileSymbolIfFileSymbolExportEqualsContainer);
+                var reexportContainers = enclosingDeclaration && getAlternativeContainingModules(symbol, enclosingDeclaration);
+                if (enclosingDeclaration && getAccessibleSymbolChain(container, enclosingDeclaration, 1920 /* Namespace */, /*externalOnly*/ false)) {
+                    return ts.concatenate(ts.concatenate([container], additionalContainers), reexportContainers); // This order expresses a preference for the real container if it is in scope
+                }
+                var res = ts.append(additionalContainers, container);
+                return ts.concatenate(res, reexportContainers);
+            }
+            var candidates = ts.mapDefined(symbol.declarations, function (d) { return !ts.isAmbientModule(d) && d.parent && hasNonGlobalAugmentationExternalModuleSymbol(d.parent) ? getSymbolOfNode(d.parent) : undefined; });
+            if (!ts.length(candidates)) {
+                return undefined;
+            }
+            return ts.mapDefined(candidates, function (candidate) { return getAliasForSymbolInContainer(candidate, symbol) ? candidate : undefined; });
+            function fileSymbolIfFileSymbolExportEqualsContainer(d) {
+                var fileSymbol = getExternalModuleContainer(d);
+                var exported = fileSymbol && fileSymbol.exports && fileSymbol.exports.get("export=" /* ExportEquals */);
+                return resolveSymbol(exported) === resolveSymbol(container) ? fileSymbol : undefined;
+            }
+        }
+        function getAliasForSymbolInContainer(container, symbol) {
+            if (container === getParentOfSymbol(symbol)) {
+                // fast path, `symbol` is either already the alias or isn't aliased
+                return symbol;
+            }
+            var exports = getExportsOfSymbol(container);
+            var quick = exports.get(symbol.escapedName);
+            if (quick && symbolRefersToTarget(quick)) {
+                return quick;
+            }
+            return ts.forEachEntry(exports, function (exported) {
+                if (symbolRefersToTarget(exported)) {
+                    return exported;
+                }
+            });
+            function symbolRefersToTarget(s) {
+                if (s === symbol || resolveSymbol(s) === symbol || resolveSymbol(s) === resolveSymbol(symbol)) {
+                    return s;
+                }
+            }
+        }
+        function getExportSymbolOfValueSymbolIfExported(symbol) {
+            return getMergedSymbol(symbol && (symbol.flags & 1048576 /* ExportValue */) !== 0 ? symbol.exportSymbol : symbol);
+        }
+        function symbolIsValue(symbol) {
+            return !!(symbol.flags & 67220415 /* Value */ || symbol.flags & 2097152 /* Alias */ && resolveAlias(symbol).flags & 67220415 /* Value */);
+        }
+        function findConstructorDeclaration(node) {
+            var members = node.members;
+            for (var _i = 0, members_2 = members; _i < members_2.length; _i++) {
+                var member = members_2[_i];
+                if (member.kind === 157 /* Constructor */ && ts.nodeIsPresent(member.body)) {
+                    return member;
+                }
+            }
+        }
+        function createType(flags) {
+            var result = new Type(checker, flags);
+            typeCount++;
+            result.id = typeCount;
+            return result;
+        }
+        function createIntrinsicType(kind, intrinsicName) {
+            var type = createType(kind);
+            type.intrinsicName = intrinsicName;
+            return type;
+        }
+        function createBooleanType(trueFalseTypes) {
+            var type = getUnionType(trueFalseTypes);
+            type.flags |= 16 /* Boolean */;
+            type.intrinsicName = "boolean";
+            return type;
+        }
+        function createObjectType(objectFlags, symbol) {
+            var type = createType(524288 /* Object */);
+            type.objectFlags = objectFlags;
+            type.symbol = symbol;
+            type.members = undefined;
+            type.properties = undefined;
+            type.callSignatures = undefined;
+            type.constructSignatures = undefined;
+            type.stringIndexInfo = undefined;
+            type.numberIndexInfo = undefined;
+            return type;
+        }
+        function createTypeofType() {
+            return getUnionType(ts.arrayFrom(typeofEQFacts.keys(), getLiteralType));
+        }
+        function createTypeParameter(symbol) {
+            var type = createType(262144 /* TypeParameter */);
+            if (symbol)
+                type.symbol = symbol;
+            return type;
+        }
+        // A reserved member name starts with two underscores, but the third character cannot be an underscore
+        // or the @ symbol. A third underscore indicates an escaped form of an identifer that started
+        // with at least two underscores. The @ character indicates that the name is denoted by a well known ES
+        // Symbol instance.
+        function isReservedMemberName(name) {
+            return name.charCodeAt(0) === 95 /* _ */ &&
+                name.charCodeAt(1) === 95 /* _ */ &&
+                name.charCodeAt(2) !== 95 /* _ */ &&
+                name.charCodeAt(2) !== 64 /* at */;
+        }
+        function getNamedMembers(members) {
+            var result;
+            members.forEach(function (symbol, id) {
+                if (!isReservedMemberName(id) && symbolIsValue(symbol)) {
+                    (result || (result = [])).push(symbol);
+                }
+            });
+            return result || ts.emptyArray;
+        }
+        function setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
+            type.members = members;
+            type.properties = members === emptySymbols ? ts.emptyArray : getNamedMembers(members);
+            type.callSignatures = callSignatures;
+            type.constructSignatures = constructSignatures;
+            type.stringIndexInfo = stringIndexInfo;
+            type.numberIndexInfo = numberIndexInfo;
+            return type;
+        }
+        function createAnonymousType(symbol, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
+            return setStructuredTypeMembers(createObjectType(16 /* Anonymous */, symbol), members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+        }
+        function forEachSymbolTableInScope(enclosingDeclaration, callback) {
+            var result;
+            for (var location = enclosingDeclaration; location; location = location.parent) {
+                // Locals of a source file are not in scope (because they get merged into the global symbol table)
+                if (location.locals && !isGlobalSourceFile(location)) {
+                    if (result = callback(location.locals)) {
+                        return result;
+                    }
+                }
+                switch (location.kind) {
+                    case 279 /* SourceFile */:
+                        if (!ts.isExternalOrCommonJsModule(location)) {
+                            break;
+                        }
+                    // falls through
+                    case 244 /* ModuleDeclaration */:
+                        if (result = callback(getSymbolOfNode(location).exports)) {
+                            return result;
+                        }
+                        break;
+                }
+            }
+            return callback(globals);
+        }
+        function getQualifiedLeftMeaning(rightMeaning) {
+            // If we are looking in value space, the parent meaning is value, other wise it is namespace
+            return rightMeaning === 67220415 /* Value */ ? 67220415 /* Value */ : 1920 /* Namespace */;
+        }
+        function getAccessibleSymbolChain(symbol, enclosingDeclaration, meaning, useOnlyExternalAliasing, visitedSymbolTablesMap) {
+            if (visitedSymbolTablesMap === void 0) { visitedSymbolTablesMap = ts.createMap(); }
+            if (!(symbol && !isPropertyOrMethodDeclarationSymbol(symbol))) {
+                return undefined;
+            }
+            var id = "" + getSymbolId(symbol);
+            var visitedSymbolTables = visitedSymbolTablesMap.get(id);
+            if (!visitedSymbolTables) {
+                visitedSymbolTablesMap.set(id, visitedSymbolTables = []);
+            }
+            return forEachSymbolTableInScope(enclosingDeclaration, getAccessibleSymbolChainFromSymbolTable);
+            /**
+             * @param {ignoreQualification} boolean Set when a symbol is being looked for through the exports of another symbol (meaning we have a route to qualify it already)
+             */
+            function getAccessibleSymbolChainFromSymbolTable(symbols, ignoreQualification) {
+                if (!ts.pushIfUnique(visitedSymbolTables, symbols)) {
+                    return undefined;
+                }
+                var result = trySymbolTable(symbols, ignoreQualification);
+                visitedSymbolTables.pop();
+                return result;
+            }
+            function canQualifySymbol(symbolFromSymbolTable, meaning) {
+                // If the symbol is equivalent and doesn't need further qualification, this symbol is accessible
+                return !needsQualification(symbolFromSymbolTable, enclosingDeclaration, meaning) ||
+                    // If symbol needs qualification, make sure that parent is accessible, if it is then this symbol is accessible too
+                    !!getAccessibleSymbolChain(symbolFromSymbolTable.parent, enclosingDeclaration, getQualifiedLeftMeaning(meaning), useOnlyExternalAliasing, visitedSymbolTablesMap);
+            }
+            function isAccessible(symbolFromSymbolTable, resolvedAliasSymbol, ignoreQualification) {
+                return symbol === (resolvedAliasSymbol || symbolFromSymbolTable) &&
+                    // if the symbolFromSymbolTable is not external module (it could be if it was determined as ambient external module and would be in globals table)
+                    // and if symbolFromSymbolTable or alias resolution matches the symbol,
+                    // check the symbol can be qualified, it is only then this symbol is accessible
+                    !ts.some(symbolFromSymbolTable.declarations, hasNonGlobalAugmentationExternalModuleSymbol) &&
+                    (ignoreQualification || canQualifySymbol(symbolFromSymbolTable, meaning));
+            }
+            function trySymbolTable(symbols, ignoreQualification) {
+                // If symbol is directly available by its name in the symbol table
+                if (isAccessible(symbols.get(symbol.escapedName), /*resolvedAliasSymbol*/ undefined, ignoreQualification)) {
+                    return [symbol];
+                }
+                // Check if symbol is any of the alias
+                return ts.forEachEntry(symbols, function (symbolFromSymbolTable) {
+                    if (symbolFromSymbolTable.flags & 2097152 /* Alias */
+                        && symbolFromSymbolTable.escapedName !== "export=" /* ExportEquals */
+                        && symbolFromSymbolTable.escapedName !== "default" /* Default */
+                        && !(ts.isUMDExportSymbol(symbolFromSymbolTable) && enclosingDeclaration && ts.isExternalModule(ts.getSourceFileOfNode(enclosingDeclaration)))
+                        // If `!useOnlyExternalAliasing`, we can use any type of alias to get the name
+                        && (!useOnlyExternalAliasing || ts.some(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration))
+                        // While exports are generally considered to be in scope, export-specifier declared symbols are _not_
+                        // See similar comment in `resolveName` for details
+                        && (ignoreQualification || !ts.getDeclarationOfKind(symbolFromSymbolTable, 257 /* ExportSpecifier */))) {
+                        var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
+                        if (isAccessible(symbolFromSymbolTable, resolvedImportedSymbol, ignoreQualification)) {
+                            return [symbolFromSymbolTable];
+                        }
+                        // Look in the exported members, if we can find accessibleSymbolChain, symbol is accessible using this chain
+                        // but only if the symbolFromSymbolTable can be qualified
+                        var candidateTable = getExportsOfSymbol(resolvedImportedSymbol);
+                        var accessibleSymbolsFromExports = candidateTable && getAccessibleSymbolChainFromSymbolTable(candidateTable, /*ignoreQualification*/ true);
+                        if (accessibleSymbolsFromExports && canQualifySymbol(symbolFromSymbolTable, getQualifiedLeftMeaning(meaning))) {
+                            return [symbolFromSymbolTable].concat(accessibleSymbolsFromExports);
+                        }
+                    }
+                    if (symbolFromSymbolTable.escapedName === symbol.escapedName && symbolFromSymbolTable.exportSymbol) {
+                        if (isAccessible(getMergedSymbol(symbolFromSymbolTable.exportSymbol), /*aliasSymbol*/ undefined, ignoreQualification)) {
+                            return [symbol];
+                        }
+                    }
+                });
+            }
+        }
+        function needsQualification(symbol, enclosingDeclaration, meaning) {
+            var qualify = false;
+            forEachSymbolTableInScope(enclosingDeclaration, function (symbolTable) {
+                // If symbol of this name is not available in the symbol table we are ok
+                var symbolFromSymbolTable = getMergedSymbol(symbolTable.get(symbol.escapedName));
+                if (!symbolFromSymbolTable) {
+                    // Continue to the next symbol table
+                    return false;
+                }
+                // If the symbol with this name is present it should refer to the symbol
+                if (symbolFromSymbolTable === symbol) {
+                    // No need to qualify
+                    return true;
+                }
+                // Qualify if the symbol from symbol table has same meaning as expected
+                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 2097152 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 257 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
+                if (symbolFromSymbolTable.flags & meaning) {
+                    qualify = true;
+                    return true;
+                }
+                // Continue to the next symbol table
+                return false;
+            });
+            return qualify;
+        }
+        function isPropertyOrMethodDeclarationSymbol(symbol) {
+            if (symbol.declarations && symbol.declarations.length) {
+                for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                    var declaration = _a[_i];
+                    switch (declaration.kind) {
+                        case 154 /* PropertyDeclaration */:
+                        case 156 /* MethodDeclaration */:
+                        case 158 /* GetAccessor */:
+                        case 159 /* SetAccessor */:
+                            continue;
+                        default:
+                            return false;
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
+        function isTypeSymbolAccessible(typeSymbol, enclosingDeclaration) {
+            var access = isSymbolAccessible(typeSymbol, enclosingDeclaration, 67897832 /* Type */, /*shouldComputeAliasesToMakeVisible*/ false);
+            return access.accessibility === 0 /* Accessible */;
+        }
+        function isValueSymbolAccessible(typeSymbol, enclosingDeclaration) {
+            var access = isSymbolAccessible(typeSymbol, enclosingDeclaration, 67220415 /* Value */, /*shouldComputeAliasesToMakeVisible*/ false);
+            return access.accessibility === 0 /* Accessible */;
+        }
+        function isAnySymbolAccessible(symbols, enclosingDeclaration, initialSymbol, meaning, shouldComputeAliasesToMakeVisible) {
+            if (!ts.length(symbols))
+                return;
+            var hadAccessibleChain;
+            for (var _i = 0, _a = symbols; _i < _a.length; _i++) {
+                var symbol = _a[_i];
+                // Symbol is accessible if it by itself is accessible
+                var accessibleSymbolChain = getAccessibleSymbolChain(symbol, enclosingDeclaration, meaning, /*useOnlyExternalAliasing*/ false);
+                if (accessibleSymbolChain) {
+                    hadAccessibleChain = symbol;
+                    var hasAccessibleDeclarations = hasVisibleDeclarations(accessibleSymbolChain[0], shouldComputeAliasesToMakeVisible);
+                    if (hasAccessibleDeclarations) {
+                        return hasAccessibleDeclarations;
+                    }
+                }
+                else {
+                    if (ts.some(symbol.declarations, hasNonGlobalAugmentationExternalModuleSymbol)) {
+                        // Any meaning of a module symbol is always accessible via an `import` type
+                        return {
+                            accessibility: 0 /* Accessible */
+                        };
+                    }
+                }
+                // If we haven't got the accessible symbol, it doesn't mean the symbol is actually inaccessible.
+                // It could be a qualified symbol and hence verify the path
+                // e.g.:
+                // module m {
+                //     export class c {
+                //     }
+                // }
+                // const x: typeof m.c
+                // In the above example when we start with checking if typeof m.c symbol is accessible,
+                // we are going to see if c can be accessed in scope directly.
+                // But it can't, hence the accessible is going to be undefined, but that doesn't mean m.c is inaccessible
+                // It is accessible if the parent m is accessible because then m.c can be accessed through qualification
+                var containers = getContainersOfSymbol(symbol, enclosingDeclaration);
+                // If we're trying to reference some object literal in, eg `var a = { x: 1 }`, the symbol for the literal, `__object`, is distinct
+                // from the symbol of the declaration it is being assigned to. Since we can use the declaration to refer to the literal, however,
+                // we'd like to make that connection here - potentially causing us to paint the declararation's visibiility, and therefore the literal.
+                var firstDecl = ts.first(symbol.declarations);
+                if (!ts.length(containers) && meaning & 67220415 /* Value */ && firstDecl && ts.isObjectLiteralExpression(firstDecl)) {
+                    if (firstDecl.parent && ts.isVariableDeclaration(firstDecl.parent) && firstDecl === firstDecl.parent.initializer) {
+                        containers = [getSymbolOfNode(firstDecl.parent)];
+                    }
+                }
+                var parentResult = isAnySymbolAccessible(containers, enclosingDeclaration, initialSymbol, initialSymbol === symbol ? getQualifiedLeftMeaning(meaning) : meaning, shouldComputeAliasesToMakeVisible);
+                if (parentResult) {
+                    return parentResult;
+                }
+            }
+            if (hadAccessibleChain) {
+                return {
+                    accessibility: 1 /* NotAccessible */,
+                    errorSymbolName: symbolToString(initialSymbol, enclosingDeclaration, meaning),
+                    errorModuleName: hadAccessibleChain !== initialSymbol ? symbolToString(hadAccessibleChain, enclosingDeclaration, 1920 /* Namespace */) : undefined,
+                };
+            }
+        }
+        /**
+         * Check if the given symbol in given enclosing declaration is accessible and mark all associated alias to be visible if requested
+         *
+         * @param symbol a Symbol to check if accessible
+         * @param enclosingDeclaration a Node containing reference to the symbol
+         * @param meaning a SymbolFlags to check if such meaning of the symbol is accessible
+         * @param shouldComputeAliasToMakeVisible a boolean value to indicate whether to return aliases to be mark visible in case the symbol is accessible
+         */
+        function isSymbolAccessible(symbol, enclosingDeclaration, meaning, shouldComputeAliasesToMakeVisible) {
+            if (symbol && enclosingDeclaration) {
+                var result = isAnySymbolAccessible([symbol], enclosingDeclaration, symbol, meaning, shouldComputeAliasesToMakeVisible);
+                if (result) {
+                    return result;
+                }
+                // This could be a symbol that is not exported in the external module
+                // or it could be a symbol from different external module that is not aliased and hence cannot be named
+                var symbolExternalModule = ts.forEach(symbol.declarations, getExternalModuleContainer);
+                if (symbolExternalModule) {
+                    var enclosingExternalModule = getExternalModuleContainer(enclosingDeclaration);
+                    if (symbolExternalModule !== enclosingExternalModule) {
+                        // name from different external module that is not visible
+                        return {
+                            accessibility: 2 /* CannotBeNamed */,
+                            errorSymbolName: symbolToString(symbol, enclosingDeclaration, meaning),
+                            errorModuleName: symbolToString(symbolExternalModule)
+                        };
+                    }
+                }
+                // Just a local name that is not accessible
+                return {
+                    accessibility: 1 /* NotAccessible */,
+                    errorSymbolName: symbolToString(symbol, enclosingDeclaration, meaning),
+                };
+            }
+            return { accessibility: 0 /* Accessible */ };
+        }
+        function getExternalModuleContainer(declaration) {
+            var node = ts.findAncestor(declaration, hasExternalModuleSymbol);
+            return node && getSymbolOfNode(node);
+        }
+        function hasExternalModuleSymbol(declaration) {
+            return ts.isAmbientModule(declaration) || (declaration.kind === 279 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
+        }
+        function hasNonGlobalAugmentationExternalModuleSymbol(declaration) {
+            return ts.isModuleWithStringLiteralName(declaration) || (declaration.kind === 279 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
+        }
+        function hasVisibleDeclarations(symbol, shouldComputeAliasToMakeVisible) {
+            var aliasesToMakeVisible;
+            if (!ts.every(symbol.declarations, getIsDeclarationVisible)) {
+                return undefined;
+            }
+            return { accessibility: 0 /* Accessible */, aliasesToMakeVisible: aliasesToMakeVisible };
+            function getIsDeclarationVisible(declaration) {
+                if (!isDeclarationVisible(declaration)) {
+                    // Mark the unexported alias as visible if its parent is visible
+                    // because these kind of aliases can be used to name types in declaration file
+                    var anyImportSyntax = getAnyImportSyntax(declaration);
+                    if (anyImportSyntax &&
+                        !ts.hasModifier(anyImportSyntax, 1 /* Export */) && // import clause without export
+                        isDeclarationVisible(anyImportSyntax.parent)) {
+                        return addVisibleAlias(declaration, anyImportSyntax);
+                    }
+                    else if (ts.isVariableDeclaration(declaration) && ts.isVariableStatement(declaration.parent.parent) &&
+                        !ts.hasModifier(declaration.parent.parent, 1 /* Export */) && // unexported variable statement
+                        isDeclarationVisible(declaration.parent.parent.parent)) {
+                        return addVisibleAlias(declaration, declaration.parent.parent);
+                    }
+                    else if (ts.isLateVisibilityPaintedStatement(declaration) // unexported top-level statement
+                        && !ts.hasModifier(declaration, 1 /* Export */)
+                        && isDeclarationVisible(declaration.parent)) {
+                        return addVisibleAlias(declaration, declaration);
+                    }
+                    // Declaration is not visible
+                    return false;
+                }
+                return true;
+            }
+            function addVisibleAlias(declaration, aliasingStatement) {
+                // In function "buildTypeDisplay" where we decide whether to write type-alias or serialize types,
+                // we want to just check if type- alias is accessible or not but we don't care about emitting those alias at that time
+                // since we will do the emitting later in trackSymbol.
+                if (shouldComputeAliasToMakeVisible) {
+                    getNodeLinks(declaration).isVisible = true;
+                    aliasesToMakeVisible = ts.appendIfUnique(aliasesToMakeVisible, aliasingStatement);
+                }
+                return true;
+            }
+        }
+        function isEntityNameVisible(entityName, enclosingDeclaration) {
+            // get symbol of the first identifier of the entityName
+            var meaning;
+            if (entityName.parent.kind === 167 /* TypeQuery */ ||
+                ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent) ||
+                entityName.parent.kind === 149 /* ComputedPropertyName */) {
+                // Typeof value
+                meaning = 67220415 /* Value */ | 1048576 /* ExportValue */;
+            }
+            else if (entityName.kind === 148 /* QualifiedName */ || entityName.kind === 189 /* PropertyAccessExpression */ ||
+                entityName.parent.kind === 248 /* ImportEqualsDeclaration */) {
+                // Left identifier from type reference or TypeAlias
+                // Entity name of the import declaration
+                meaning = 1920 /* Namespace */;
+            }
+            else {
+                // Type Reference or TypeAlias entity = Identifier
+                meaning = 67897832 /* Type */;
+            }
+            var firstIdentifier = getFirstIdentifier(entityName);
+            var symbol = resolveName(enclosingDeclaration, firstIdentifier.escapedText, meaning, /*nodeNotFoundErrorMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false);
+            // Verify if the symbol is accessible
+            return (symbol && hasVisibleDeclarations(symbol, /*shouldComputeAliasToMakeVisible*/ true)) || {
+                accessibility: 1 /* NotAccessible */,
+                errorSymbolName: ts.getTextOfNode(firstIdentifier),
+                errorNode: firstIdentifier
+            };
+        }
+        function symbolToString(symbol, enclosingDeclaration, meaning, flags, writer) {
+            if (flags === void 0) { flags = 4 /* AllowAnyNodeKind */; }
+            var nodeFlags = 70221824 /* IgnoreErrors */;
+            if (flags & 2 /* UseOnlyExternalAliasing */) {
+                nodeFlags |= 128 /* UseOnlyExternalAliasing */;
+            }
+            if (flags & 1 /* WriteTypeParametersOrArguments */) {
+                nodeFlags |= 512 /* WriteTypeParametersInQualifiedName */;
+            }
+            if (flags & 8 /* UseAliasDefinedOutsideCurrentScope */) {
+                nodeFlags |= 16384 /* UseAliasDefinedOutsideCurrentScope */;
+            }
+            if (flags & 16 /* DoNotIncludeSymbolChain */) {
+                nodeFlags |= 134217728 /* DoNotIncludeSymbolChain */;
+            }
+            var builder = flags & 4 /* AllowAnyNodeKind */ ? nodeBuilder.symbolToExpression : nodeBuilder.symbolToEntityName;
+            return writer ? symbolToStringWorker(writer).getText() : ts.usingSingleLineStringWriter(symbolToStringWorker);
+            function symbolToStringWorker(writer) {
+                var entity = builder(symbol, meaning, enclosingDeclaration, nodeFlags); // TODO: GH#18217
+                var printer = ts.createPrinter({ removeComments: true });
+                var sourceFile = enclosingDeclaration && ts.getSourceFileOfNode(enclosingDeclaration);
+                printer.writeNode(4 /* Unspecified */, entity, /*sourceFile*/ sourceFile, writer);
+                return writer;
+            }
+        }
+        function signatureToString(signature, enclosingDeclaration, flags, kind, writer) {
+            if (flags === void 0) { flags = 0 /* None */; }
+            return writer ? signatureToStringWorker(writer).getText() : ts.usingSingleLineStringWriter(signatureToStringWorker);
+            function signatureToStringWorker(writer) {
+                var sigOutput;
+                if (flags & 262144 /* WriteArrowStyleSignature */) {
+                    sigOutput = kind === 1 /* Construct */ ? 166 /* ConstructorType */ : 165 /* FunctionType */;
+                }
+                else {
+                    sigOutput = kind === 1 /* Construct */ ? 161 /* ConstructSignature */ : 160 /* CallSignature */;
+                }
+                var sig = nodeBuilder.signatureToSignatureDeclaration(signature, sigOutput, enclosingDeclaration, toNodeBuilderFlags(flags) | 70221824 /* IgnoreErrors */ | 512 /* WriteTypeParametersInQualifiedName */);
+                var printer = ts.createPrinter({ removeComments: true, omitTrailingSemicolon: true });
+                var sourceFile = enclosingDeclaration && ts.getSourceFileOfNode(enclosingDeclaration);
+                printer.writeNode(4 /* Unspecified */, sig, /*sourceFile*/ sourceFile, ts.getTrailingSemicolonOmittingWriter(writer)); // TODO: GH#18217
+                return writer;
+            }
+        }
+        function typeToString(type, enclosingDeclaration, flags, writer) {
+            if (flags === void 0) { flags = 1048576 /* AllowUniqueESSymbolType */ | 16384 /* UseAliasDefinedOutsideCurrentScope */; }
+            if (writer === void 0) { writer = ts.createTextWriter(""); }
+            var noTruncation = compilerOptions.noErrorTruncation || flags & 1 /* NoTruncation */;
+            var typeNode = nodeBuilder.typeToTypeNode(type, enclosingDeclaration, toNodeBuilderFlags(flags) | 70221824 /* IgnoreErrors */ | (noTruncation ? 1 /* NoTruncation */ : 0), writer);
+            if (typeNode === undefined)
+                return ts.Debug.fail("should always get typenode");
+            var options = { removeComments: true };
+            var printer = ts.createPrinter(options);
+            var sourceFile = enclosingDeclaration && ts.getSourceFileOfNode(enclosingDeclaration);
+            printer.writeNode(4 /* Unspecified */, typeNode, /*sourceFile*/ sourceFile, writer);
+            var result = writer.getText();
+            var maxLength = noTruncation ? undefined : ts.defaultMaximumTruncationLength * 2;
+            if (maxLength && result && result.length >= maxLength) {
+                return result.substr(0, maxLength - "...".length) + "...";
+            }
+            return result;
+        }
+        function toNodeBuilderFlags(flags) {
+            if (flags === void 0) { flags = 0 /* None */; }
+            return flags & 9469291 /* NodeBuilderFlagsMask */;
+        }
+        function createNodeBuilder() {
+            return {
+                typeToTypeNode: function (type, enclosingDeclaration, flags, tracker) {
+                    return withContext(enclosingDeclaration, flags, tracker, function (context) { return typeToTypeNodeHelper(type, context); });
+                },
+                indexInfoToIndexSignatureDeclaration: function (indexInfo, kind, enclosingDeclaration, flags, tracker) {
+                    return withContext(enclosingDeclaration, flags, tracker, function (context) { return indexInfoToIndexSignatureDeclarationHelper(indexInfo, kind, context); });
+                },
+                signatureToSignatureDeclaration: function (signature, kind, enclosingDeclaration, flags, tracker) {
+                    return withContext(enclosingDeclaration, flags, tracker, function (context) { return signatureToSignatureDeclarationHelper(signature, kind, context); });
+                },
+                symbolToEntityName: function (symbol, meaning, enclosingDeclaration, flags, tracker) {
+                    return withContext(enclosingDeclaration, flags, tracker, function (context) { return symbolToName(symbol, context, meaning, /*expectsIdentifier*/ false); });
+                },
+                symbolToExpression: function (symbol, meaning, enclosingDeclaration, flags, tracker) {
+                    return withContext(enclosingDeclaration, flags, tracker, function (context) { return symbolToExpression(symbol, context, meaning); });
+                },
+                symbolToTypeParameterDeclarations: function (symbol, enclosingDeclaration, flags, tracker) {
+                    return withContext(enclosingDeclaration, flags, tracker, function (context) { return typeParametersToTypeParameterDeclarations(symbol, context); });
+                },
+                symbolToParameterDeclaration: function (symbol, enclosingDeclaration, flags, tracker) {
+                    return withContext(enclosingDeclaration, flags, tracker, function (context) { return symbolToParameterDeclaration(symbol, context); });
+                },
+                typeParameterToDeclaration: function (parameter, enclosingDeclaration, flags, tracker) {
+                    return withContext(enclosingDeclaration, flags, tracker, function (context) { return typeParameterToDeclaration(parameter, context); });
+                },
+            };
+            function withContext(enclosingDeclaration, flags, tracker, cb) {
+                ts.Debug.assert(enclosingDeclaration === undefined || (enclosingDeclaration.flags & 8 /* Synthesized */) === 0);
+                var context = {
+                    enclosingDeclaration: enclosingDeclaration,
+                    flags: flags || 0 /* None */,
+                    // If no full tracker is provided, fake up a dummy one with a basic limited-functionality moduleResolverHost
+                    tracker: tracker && tracker.trackSymbol ? tracker : { trackSymbol: ts.noop, moduleResolverHost: flags & 134217728 /* DoNotIncludeSymbolChain */ ? {
+                            getCommonSourceDirectory: host.getCommonSourceDirectory ? function () { return host.getCommonSourceDirectory(); } : function () { return ""; },
+                            getSourceFiles: function () { return host.getSourceFiles(); },
+                            getCurrentDirectory: host.getCurrentDirectory && (function () { return host.getCurrentDirectory(); })
+                        } : undefined },
+                    encounteredError: false,
+                    visitedTypes: undefined,
+                    symbolDepth: undefined,
+                    inferTypeParameters: undefined,
+                    approximateLength: 0
+                };
+                var resultingNode = cb(context);
+                return context.encounteredError ? undefined : resultingNode;
+            }
+            function checkTruncationLength(context) {
+                if (context.truncating)
+                    return context.truncating;
+                return context.truncating = !(context.flags & 1 /* NoTruncation */) && context.approximateLength > ts.defaultMaximumTruncationLength;
+            }
+            function typeToTypeNodeHelper(type, context) {
+                if (cancellationToken && cancellationToken.throwIfCancellationRequested) {
+                    cancellationToken.throwIfCancellationRequested();
+                }
+                var inTypeAlias = context.flags & 8388608 /* InTypeAlias */;
+                context.flags &= ~8388608 /* InTypeAlias */;
+                if (!type) {
+                    context.encounteredError = true;
+                    return undefined; // TODO: GH#18217
+                }
+                if (type.flags & 1 /* Any */) {
+                    context.approximateLength += 3;
+                    return ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                }
+                if (type.flags & 2 /* Unknown */) {
+                    return ts.createKeywordTypeNode(143 /* UnknownKeyword */);
+                }
+                if (type.flags & 4 /* String */) {
+                    context.approximateLength += 6;
+                    return ts.createKeywordTypeNode(138 /* StringKeyword */);
+                }
+                if (type.flags & 8 /* Number */) {
+                    context.approximateLength += 6;
+                    return ts.createKeywordTypeNode(135 /* NumberKeyword */);
+                }
+                if (type.flags & 64 /* BigInt */) {
+                    context.approximateLength += 6;
+                    return ts.createKeywordTypeNode(146 /* BigIntKeyword */);
+                }
+                if (type.flags & 16 /* Boolean */) {
+                    context.approximateLength += 7;
+                    return ts.createKeywordTypeNode(123 /* BooleanKeyword */);
+                }
+                if (type.flags & 1024 /* EnumLiteral */ && !(type.flags & 1048576 /* Union */)) {
+                    var parentSymbol = getParentOfSymbol(type.symbol);
+                    var parentName = symbolToTypeNode(parentSymbol, context, 67897832 /* Type */);
+                    var enumLiteralName = getDeclaredTypeOfSymbol(parentSymbol) === type
+                        ? parentName
+                        : appendReferenceToType(parentName, ts.createTypeReferenceNode(ts.symbolName(type.symbol), /*typeArguments*/ undefined));
+                    return enumLiteralName;
+                }
+                if (type.flags & 1056 /* EnumLike */) {
+                    return symbolToTypeNode(type.symbol, context, 67897832 /* Type */);
+                }
+                if (type.flags & 128 /* StringLiteral */) {
+                    context.approximateLength += (type.value.length + 2);
+                    return ts.createLiteralTypeNode(ts.setEmitFlags(ts.createLiteral(type.value), 16777216 /* NoAsciiEscaping */));
+                }
+                if (type.flags & 256 /* NumberLiteral */) {
+                    context.approximateLength += (("" + type.value).length);
+                    return ts.createLiteralTypeNode((ts.createLiteral(type.value)));
+                }
+                if (type.flags & 2048 /* BigIntLiteral */) {
+                    context.approximateLength += (ts.pseudoBigIntToString(type.value).length) + 1;
+                    return ts.createLiteralTypeNode((ts.createLiteral(type.value)));
+                }
+                if (type.flags & 512 /* BooleanLiteral */) {
+                    context.approximateLength += type.intrinsicName.length;
+                    return type.intrinsicName === "true" ? ts.createTrue() : ts.createFalse();
+                }
+                if (type.flags & 8192 /* UniqueESSymbol */) {
+                    if (!(context.flags & 1048576 /* AllowUniqueESSymbolType */)) {
+                        if (isValueSymbolAccessible(type.symbol, context.enclosingDeclaration)) {
+                            context.approximateLength += 6;
+                            return symbolToTypeNode(type.symbol, context, 67220415 /* Value */);
+                        }
+                        if (context.tracker.reportInaccessibleUniqueSymbolError) {
+                            context.tracker.reportInaccessibleUniqueSymbolError();
+                        }
+                    }
+                    context.approximateLength += 13;
+                    return ts.createTypeOperatorNode(142 /* UniqueKeyword */, ts.createKeywordTypeNode(139 /* SymbolKeyword */));
+                }
+                if (type.flags & 16384 /* Void */) {
+                    context.approximateLength += 4;
+                    return ts.createKeywordTypeNode(106 /* VoidKeyword */);
+                }
+                if (type.flags & 32768 /* Undefined */) {
+                    context.approximateLength += 9;
+                    return ts.createKeywordTypeNode(141 /* UndefinedKeyword */);
+                }
+                if (type.flags & 65536 /* Null */) {
+                    context.approximateLength += 4;
+                    return ts.createKeywordTypeNode(96 /* NullKeyword */);
+                }
+                if (type.flags & 131072 /* Never */) {
+                    context.approximateLength += 5;
+                    return ts.createKeywordTypeNode(132 /* NeverKeyword */);
+                }
+                if (type.flags & 4096 /* ESSymbol */) {
+                    context.approximateLength += 6;
+                    return ts.createKeywordTypeNode(139 /* SymbolKeyword */);
+                }
+                if (type.flags & 67108864 /* NonPrimitive */) {
+                    context.approximateLength += 6;
+                    return ts.createKeywordTypeNode(136 /* ObjectKeyword */);
+                }
+                if (type.flags & 262144 /* TypeParameter */ && type.isThisType) {
+                    if (context.flags & 4194304 /* InObjectTypeLiteral */) {
+                        if (!context.encounteredError && !(context.flags & 32768 /* AllowThisInObjectLiteral */)) {
+                            context.encounteredError = true;
+                        }
+                        if (context.tracker.reportInaccessibleThisError) {
+                            context.tracker.reportInaccessibleThisError();
+                        }
+                    }
+                    context.approximateLength += 4;
+                    return ts.createThis();
+                }
+                var objectFlags = ts.getObjectFlags(type);
+                if (objectFlags & 4 /* Reference */) {
+                    ts.Debug.assert(!!(type.flags & 524288 /* Object */));
+                    return typeReferenceToTypeNode(type);
+                }
+                if (type.flags & 262144 /* TypeParameter */ || objectFlags & 3 /* ClassOrInterface */) {
+                    if (type.flags & 262144 /* TypeParameter */ && ts.contains(context.inferTypeParameters, type)) {
+                        context.approximateLength += (ts.symbolName(type.symbol).length + 6);
+                        return ts.createInferTypeNode(typeParameterToDeclarationWithConstraint(type, context, /*constraintNode*/ undefined));
+                    }
+                    if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */ &&
+                        type.flags & 262144 /* TypeParameter */ &&
+                        ts.length(type.symbol.declarations) &&
+                        ts.isTypeParameterDeclaration(type.symbol.declarations[0]) &&
+                        typeParameterShadowsNameInScope(type, context) &&
+                        !isTypeSymbolAccessible(type.symbol, context.enclosingDeclaration)) {
+                        var name = type.symbol.declarations[0].name;
+                        context.approximateLength += ts.idText(name).length;
+                        return ts.createTypeReferenceNode(ts.getGeneratedNameForNode(name, 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */), /*typeArguments*/ undefined);
+                    }
+                    // Ignore constraint/default when creating a usage (as opposed to declaration) of a type parameter.
+                    return type.symbol
+                        ? symbolToTypeNode(type.symbol, context, 67897832 /* Type */)
+                        : ts.createTypeReferenceNode(ts.createIdentifier("?"), /*typeArguments*/ undefined);
+                }
+                if (!inTypeAlias && type.aliasSymbol && (context.flags & 16384 /* UseAliasDefinedOutsideCurrentScope */ || isTypeSymbolAccessible(type.aliasSymbol, context.enclosingDeclaration))) {
+                    var typeArgumentNodes = mapToTypeNodes(type.aliasTypeArguments, context);
+                    if (isReservedMemberName(type.aliasSymbol.escapedName) && !(type.aliasSymbol.flags & 32 /* Class */))
+                        return ts.createTypeReferenceNode(ts.createIdentifier(""), typeArgumentNodes);
+                    return symbolToTypeNode(type.aliasSymbol, context, 67897832 /* Type */, typeArgumentNodes);
+                }
+                if (type.flags & (1048576 /* Union */ | 2097152 /* Intersection */)) {
+                    var types = type.flags & 1048576 /* Union */ ? formatUnionTypes(type.types) : type.types;
+                    if (ts.length(types) === 1) {
+                        return typeToTypeNodeHelper(types[0], context);
+                    }
+                    var typeNodes = mapToTypeNodes(types, context, /*isBareList*/ true);
+                    if (typeNodes && typeNodes.length > 0) {
+                        var unionOrIntersectionTypeNode = ts.createUnionOrIntersectionTypeNode(type.flags & 1048576 /* Union */ ? 173 /* UnionType */ : 174 /* IntersectionType */, typeNodes);
+                        return unionOrIntersectionTypeNode;
+                    }
+                    else {
+                        if (!context.encounteredError && !(context.flags & 262144 /* AllowEmptyUnionOrIntersection */)) {
+                            context.encounteredError = true;
+                        }
+                        return undefined; // TODO: GH#18217
+                    }
+                }
+                if (objectFlags & (16 /* Anonymous */ | 32 /* Mapped */)) {
+                    ts.Debug.assert(!!(type.flags & 524288 /* Object */));
+                    // The type is an object literal type.
+                    return createAnonymousTypeNode(type);
+                }
+                if (type.flags & 4194304 /* Index */) {
+                    var indexedType = type.type;
+                    context.approximateLength += 6;
+                    var indexTypeNode = typeToTypeNodeHelper(indexedType, context);
+                    return ts.createTypeOperatorNode(indexTypeNode);
+                }
+                if (type.flags & 8388608 /* IndexedAccess */) {
+                    var objectTypeNode = typeToTypeNodeHelper(type.objectType, context);
+                    var indexTypeNode = typeToTypeNodeHelper(type.indexType, context);
+                    context.approximateLength += 2;
+                    return ts.createIndexedAccessTypeNode(objectTypeNode, indexTypeNode);
+                }
+                if (type.flags & 16777216 /* Conditional */) {
+                    var checkTypeNode = typeToTypeNodeHelper(type.checkType, context);
+                    var saveInferTypeParameters = context.inferTypeParameters;
+                    context.inferTypeParameters = type.root.inferTypeParameters;
+                    var extendsTypeNode = typeToTypeNodeHelper(type.extendsType, context);
+                    context.inferTypeParameters = saveInferTypeParameters;
+                    var trueTypeNode = typeToTypeNodeHelper(getTrueTypeFromConditionalType(type), context);
+                    var falseTypeNode = typeToTypeNodeHelper(getFalseTypeFromConditionalType(type), context);
+                    context.approximateLength += 15;
+                    return ts.createConditionalTypeNode(checkTypeNode, extendsTypeNode, trueTypeNode, falseTypeNode);
+                }
+                if (type.flags & 33554432 /* Substitution */) {
+                    return typeToTypeNodeHelper(type.typeVariable, context);
+                }
+                return ts.Debug.fail("Should be unreachable.");
+                function createMappedTypeNodeFromType(type) {
+                    ts.Debug.assert(!!(type.flags & 524288 /* Object */));
+                    var readonlyToken = type.declaration.readonlyToken ? ts.createToken(type.declaration.readonlyToken.kind) : undefined;
+                    var questionToken = type.declaration.questionToken ? ts.createToken(type.declaration.questionToken.kind) : undefined;
+                    var appropriateConstraintTypeNode;
+                    if (isMappedTypeWithKeyofConstraintDeclaration(type)) {
+                        // We have a { [P in keyof T]: X }
+                        // We do this to ensure we retain the toplevel keyof-ness of the type which may be lost due to keyof distribution during `getConstraintTypeFromMappedType`
+                        appropriateConstraintTypeNode = ts.createTypeOperatorNode(typeToTypeNodeHelper(getModifiersTypeFromMappedType(type), context));
+                    }
+                    else {
+                        appropriateConstraintTypeNode = typeToTypeNodeHelper(getConstraintTypeFromMappedType(type), context);
+                    }
+                    var typeParameterNode = typeParameterToDeclarationWithConstraint(getTypeParameterFromMappedType(type), context, appropriateConstraintTypeNode);
+                    var templateTypeNode = typeToTypeNodeHelper(getTemplateTypeFromMappedType(type), context);
+                    var mappedTypeNode = ts.createMappedTypeNode(readonlyToken, typeParameterNode, questionToken, templateTypeNode);
+                    context.approximateLength += 10;
+                    return ts.setEmitFlags(mappedTypeNode, 1 /* SingleLine */);
+                }
+                function createAnonymousTypeNode(type) {
+                    var typeId = "" + type.id;
+                    var symbol = type.symbol;
+                    var id;
+                    if (symbol) {
+                        var isConstructorObject = ts.getObjectFlags(type) & 16 /* Anonymous */ && type.symbol && type.symbol.flags & 32 /* Class */;
+                        id = (isConstructorObject ? "+" : "") + getSymbolId(symbol);
+                        if (isJSConstructor(symbol.valueDeclaration)) {
+                            // Instance and static types share the same symbol; only add 'typeof' for the static side.
+                            var isInstanceType = type === getInferredClassType(symbol) ? 67897832 /* Type */ : 67220415 /* Value */;
+                            return symbolToTypeNode(symbol, context, isInstanceType);
+                        }
+                        // Always use 'typeof T' for type of class, enum, and module objects
+                        else if (symbol.flags & 32 /* Class */ && !getBaseTypeVariableOfClass(symbol) && !(symbol.valueDeclaration.kind === 209 /* ClassExpression */ && context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */) ||
+                            symbol.flags & (384 /* Enum */ | 512 /* ValueModule */) ||
+                            shouldWriteTypeOfFunctionSymbol()) {
+                            return symbolToTypeNode(symbol, context, 67220415 /* Value */);
+                        }
+                        else if (context.visitedTypes && context.visitedTypes.has(typeId)) {
+                            // If type is an anonymous type literal in a type alias declaration, use type alias name
+                            var typeAlias = getTypeAliasForTypeLiteral(type);
+                            if (typeAlias) {
+                                // The specified symbol flags need to be reinterpreted as type flags
+                                return symbolToTypeNode(typeAlias, context, 67897832 /* Type */);
+                            }
+                            else {
+                                return createElidedInformationPlaceholder(context);
+                            }
+                        }
+                        else {
+                            // Since instantiations of the same anonymous type have the same symbol, tracking symbols instead
+                            // of types allows us to catch circular references to instantiations of the same anonymous type
+                            if (!context.visitedTypes) {
+                                context.visitedTypes = ts.createMap();
+                            }
+                            if (!context.symbolDepth) {
+                                context.symbolDepth = ts.createMap();
+                            }
+                            var depth = context.symbolDepth.get(id) || 0;
+                            if (depth > 10) {
+                                return createElidedInformationPlaceholder(context);
+                            }
+                            context.symbolDepth.set(id, depth + 1);
+                            context.visitedTypes.set(typeId, true);
+                            var result = createTypeNodeFromObjectType(type);
+                            context.visitedTypes.delete(typeId);
+                            context.symbolDepth.set(id, depth);
+                            return result;
+                        }
+                    }
+                    else {
+                        // Anonymous types without a symbol are never circular.
+                        return createTypeNodeFromObjectType(type);
+                    }
+                    function shouldWriteTypeOfFunctionSymbol() {
+                        var isStaticMethodSymbol = !!(symbol.flags & 8192 /* Method */) && // typeof static method
+                            ts.some(symbol.declarations, function (declaration) { return ts.hasModifier(declaration, 32 /* Static */); });
+                        var isNonLocalFunctionSymbol = !!(symbol.flags & 16 /* Function */) &&
+                            (symbol.parent || // is exported function symbol
+                                ts.forEach(symbol.declarations, function (declaration) {
+                                    return declaration.parent.kind === 279 /* SourceFile */ || declaration.parent.kind === 245 /* ModuleBlock */;
+                                }));
+                        if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
+                            // typeof is allowed only for static/non local functions
+                            return (!!(context.flags & 4096 /* UseTypeOfFunction */) || (context.visitedTypes && context.visitedTypes.has(typeId))) && // it is type of the symbol uses itself recursively
+                                (!(context.flags & 8 /* UseStructuralFallback */) || isValueSymbolAccessible(symbol, context.enclosingDeclaration)); // TODO: GH#18217 // And the build is going to succeed without visibility error or there is no structural fallback allowed
+                        }
+                    }
+                }
+                function createTypeNodeFromObjectType(type) {
+                    if (isGenericMappedType(type)) {
+                        return createMappedTypeNodeFromType(type);
+                    }
+                    var resolved = resolveStructuredTypeMembers(type);
+                    if (!resolved.properties.length && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
+                        if (!resolved.callSignatures.length && !resolved.constructSignatures.length) {
+                            context.approximateLength += 2;
+                            return ts.setEmitFlags(ts.createTypeLiteralNode(/*members*/ undefined), 1 /* SingleLine */);
+                        }
+                        if (resolved.callSignatures.length === 1 && !resolved.constructSignatures.length) {
+                            var signature = resolved.callSignatures[0];
+                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 165 /* FunctionType */, context);
+                            return signatureNode;
+                        }
+                        if (resolved.constructSignatures.length === 1 && !resolved.callSignatures.length) {
+                            var signature = resolved.constructSignatures[0];
+                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 166 /* ConstructorType */, context);
+                            return signatureNode;
+                        }
+                    }
+                    var savedFlags = context.flags;
+                    context.flags |= 4194304 /* InObjectTypeLiteral */;
+                    var members = createTypeNodesFromResolvedType(resolved);
+                    context.flags = savedFlags;
+                    var typeLiteralNode = ts.createTypeLiteralNode(members);
+                    context.approximateLength += 2;
+                    return ts.setEmitFlags(typeLiteralNode, (context.flags & 1024 /* MultilineObjectLiterals */) ? 0 : 1 /* SingleLine */);
+                }
+                function typeReferenceToTypeNode(type) {
+                    var typeArguments = type.typeArguments || ts.emptyArray;
+                    if (type.target === globalArrayType) {
+                        if (context.flags & 2 /* WriteArrayAsGenericType */) {
+                            var typeArgumentNode = typeToTypeNodeHelper(typeArguments[0], context);
+                            return ts.createTypeReferenceNode("Array", [typeArgumentNode]);
+                        }
+                        var elementType = typeToTypeNodeHelper(typeArguments[0], context);
+                        return ts.createArrayTypeNode(elementType);
+                    }
+                    else if (type.target.objectFlags & 8 /* Tuple */) {
+                        if (typeArguments.length > 0) {
+                            var arity = getTypeReferenceArity(type);
+                            var tupleConstituentNodes = mapToTypeNodes(typeArguments.slice(0, arity), context);
+                            var hasRestElement = type.target.hasRestElement;
+                            if (tupleConstituentNodes) {
+                                for (var i = type.target.minLength; i < Math.min(arity, tupleConstituentNodes.length); i++) {
+                                    tupleConstituentNodes[i] = hasRestElement && i === arity - 1 ?
+                                        ts.createRestTypeNode(ts.createArrayTypeNode(tupleConstituentNodes[i])) :
+                                        ts.createOptionalTypeNode(tupleConstituentNodes[i]);
+                                }
+                                return ts.createTupleTypeNode(tupleConstituentNodes);
+                            }
+                        }
+                        if (context.encounteredError || (context.flags & 524288 /* AllowEmptyTuple */)) {
+                            return ts.createTupleTypeNode([]);
+                        }
+                        context.encounteredError = true;
+                        return undefined; // TODO: GH#18217
+                    }
+                    else if (context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */ &&
+                        type.symbol.valueDeclaration &&
+                        ts.isClassLike(type.symbol.valueDeclaration) &&
+                        !isValueSymbolAccessible(type.symbol, context.enclosingDeclaration)) {
+                        return createAnonymousTypeNode(type);
+                    }
+                    else {
+                        var outerTypeParameters = type.target.outerTypeParameters;
+                        var i = 0;
+                        var resultType = void 0;
+                        if (outerTypeParameters) {
+                            var length_1 = outerTypeParameters.length;
+                            while (i < length_1) {
+                                // Find group of type arguments for type parameters with the same declaring container.
+                                var start = i;
+                                var parent = getParentSymbolOfTypeParameter(outerTypeParameters[i]);
+                                do {
+                                    i++;
+                                } while (i < length_1 && getParentSymbolOfTypeParameter(outerTypeParameters[i]) === parent);
+                                // When type parameters are their own type arguments for the whole group (i.e. we have
+                                // the default outer type arguments), we don't show the group.
+                                if (!ts.rangeEquals(outerTypeParameters, typeArguments, start, i)) {
+                                    var typeArgumentSlice = mapToTypeNodes(typeArguments.slice(start, i), context);
+                                    var flags_2 = context.flags;
+                                    context.flags |= 16 /* ForbidIndexedAccessSymbolReferences */;
+                                    var ref = symbolToTypeNode(parent, context, 67897832 /* Type */, typeArgumentSlice);
+                                    context.flags = flags_2;
+                                    resultType = !resultType ? ref : appendReferenceToType(resultType, ref);
+                                }
+                            }
+                        }
+                        var typeArgumentNodes = void 0;
+                        if (typeArguments.length > 0) {
+                            var typeParameterCount = (type.target.typeParameters || ts.emptyArray).length;
+                            typeArgumentNodes = mapToTypeNodes(typeArguments.slice(i, typeParameterCount), context);
+                        }
+                        var flags = context.flags;
+                        context.flags |= 16 /* ForbidIndexedAccessSymbolReferences */;
+                        var finalRef = symbolToTypeNode(type.symbol, context, 67897832 /* Type */, typeArgumentNodes);
+                        context.flags = flags;
+                        return !resultType ? finalRef : appendReferenceToType(resultType, finalRef);
+                    }
+                }
+                function appendReferenceToType(root, ref) {
+                    if (ts.isImportTypeNode(root)) {
+                        // first shift type arguments
+                        var innerParams = root.typeArguments;
+                        if (root.qualifier) {
+                            (ts.isIdentifier(root.qualifier) ? root.qualifier : root.qualifier.right).typeArguments = innerParams;
+                        }
+                        root.typeArguments = ref.typeArguments;
+                        // then move qualifiers
+                        var ids = getAccessStack(ref);
+                        for (var _i = 0, ids_1 = ids; _i < ids_1.length; _i++) {
+                            var id = ids_1[_i];
+                            root.qualifier = root.qualifier ? ts.createQualifiedName(root.qualifier, id) : id;
+                        }
+                        return root;
+                    }
+                    else {
+                        // first shift type arguments
+                        var innerParams = root.typeArguments;
+                        (ts.isIdentifier(root.typeName) ? root.typeName : root.typeName.right).typeArguments = innerParams;
+                        root.typeArguments = ref.typeArguments;
+                        // then move qualifiers
+                        var ids = getAccessStack(ref);
+                        for (var _a = 0, ids_2 = ids; _a < ids_2.length; _a++) {
+                            var id = ids_2[_a];
+                            root.typeName = ts.createQualifiedName(root.typeName, id);
+                        }
+                        return root;
+                    }
+                }
+                function getAccessStack(ref) {
+                    var state = ref.typeName;
+                    var ids = [];
+                    while (!ts.isIdentifier(state)) {
+                        ids.unshift(state.right);
+                        state = state.left;
+                    }
+                    ids.unshift(state);
+                    return ids;
+                }
+                function createTypeNodesFromResolvedType(resolvedType) {
+                    if (checkTruncationLength(context)) {
+                        return [ts.createPropertySignature(/*modifiers*/ undefined, "...", /*questionToken*/ undefined, /*type*/ undefined, /*initializer*/ undefined)];
+                    }
+                    var typeElements = [];
+                    for (var _i = 0, _a = resolvedType.callSignatures; _i < _a.length; _i++) {
+                        var signature = _a[_i];
+                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 160 /* CallSignature */, context));
+                    }
+                    for (var _b = 0, _c = resolvedType.constructSignatures; _b < _c.length; _b++) {
+                        var signature = _c[_b];
+                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 161 /* ConstructSignature */, context));
+                    }
+                    if (resolvedType.stringIndexInfo) {
+                        var indexSignature = void 0;
+                        if (resolvedType.objectFlags & 2048 /* ReverseMapped */) {
+                            indexSignature = indexInfoToIndexSignatureDeclarationHelper(createIndexInfo(anyType, resolvedType.stringIndexInfo.isReadonly, resolvedType.stringIndexInfo.declaration), 0 /* String */, context);
+                            indexSignature.type = createElidedInformationPlaceholder(context);
+                        }
+                        else {
+                            indexSignature = indexInfoToIndexSignatureDeclarationHelper(resolvedType.stringIndexInfo, 0 /* String */, context);
+                        }
+                        typeElements.push(indexSignature);
+                    }
+                    if (resolvedType.numberIndexInfo) {
+                        typeElements.push(indexInfoToIndexSignatureDeclarationHelper(resolvedType.numberIndexInfo, 1 /* Number */, context));
+                    }
+                    var properties = resolvedType.properties;
+                    if (!properties) {
+                        return typeElements;
+                    }
+                    var i = 0;
+                    for (var _d = 0, properties_1 = properties; _d < properties_1.length; _d++) {
+                        var propertySymbol = properties_1[_d];
+                        i++;
+                        if (context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */) {
+                            if (propertySymbol.flags & 4194304 /* Prototype */) {
+                                continue;
+                            }
+                            if (ts.getDeclarationModifierFlagsFromSymbol(propertySymbol) & (8 /* Private */ | 16 /* Protected */) && context.tracker.reportPrivateInBaseOfClassExpression) {
+                                context.tracker.reportPrivateInBaseOfClassExpression(ts.unescapeLeadingUnderscores(propertySymbol.escapedName));
+                            }
+                        }
+                        if (checkTruncationLength(context) && (i + 2 < properties.length - 1)) {
+                            typeElements.push(ts.createPropertySignature(/*modifiers*/ undefined, "... " + (properties.length - i) + " more ...", /*questionToken*/ undefined, /*type*/ undefined, /*initializer*/ undefined));
+                            addPropertyToElementList(properties[properties.length - 1], context, typeElements);
+                            break;
+                        }
+                        addPropertyToElementList(propertySymbol, context, typeElements);
+                    }
+                    return typeElements.length ? typeElements : undefined;
+                }
+            }
+            function createElidedInformationPlaceholder(context) {
+                context.approximateLength += 3;
+                if (!(context.flags & 1 /* NoTruncation */)) {
+                    return ts.createTypeReferenceNode(ts.createIdentifier("..."), /*typeArguments*/ undefined);
+                }
+                return ts.createKeywordTypeNode(120 /* AnyKeyword */);
+            }
+            function addPropertyToElementList(propertySymbol, context, typeElements) {
+                var propertyIsReverseMapped = !!(ts.getCheckFlags(propertySymbol) & 4096 /* ReverseMapped */);
+                var propertyType = propertyIsReverseMapped && context.flags & 33554432 /* InReverseMappedType */ ?
+                    anyType : getTypeOfSymbol(propertySymbol);
+                var saveEnclosingDeclaration = context.enclosingDeclaration;
+                context.enclosingDeclaration = undefined;
+                if (context.tracker.trackSymbol && ts.getCheckFlags(propertySymbol) & 2048 /* Late */) {
+                    var decl = ts.first(propertySymbol.declarations);
+                    if (hasLateBindableName(decl)) {
+                        trackComputedName(decl.name, saveEnclosingDeclaration, context);
+                    }
+                }
+                var propertyName = symbolToName(propertySymbol, context, 67220415 /* Value */, /*expectsIdentifier*/ true);
+                context.approximateLength += (ts.symbolName(propertySymbol).length + 1);
+                context.enclosingDeclaration = saveEnclosingDeclaration;
+                var optionalToken = propertySymbol.flags & 16777216 /* Optional */ ? ts.createToken(56 /* QuestionToken */) : undefined;
+                if (propertySymbol.flags & (16 /* Function */ | 8192 /* Method */) && !getPropertiesOfObjectType(propertyType).length) {
+                    var signatures = getSignaturesOfType(propertyType, 0 /* Call */);
+                    for (var _i = 0, signatures_1 = signatures; _i < signatures_1.length; _i++) {
+                        var signature = signatures_1[_i];
+                        var methodDeclaration = signatureToSignatureDeclarationHelper(signature, 155 /* MethodSignature */, context);
+                        methodDeclaration.name = propertyName;
+                        methodDeclaration.questionToken = optionalToken;
+                        if (propertySymbol.valueDeclaration) {
+                            // Copy comments to node for declaration emit
+                            ts.setCommentRange(methodDeclaration, propertySymbol.valueDeclaration);
+                        }
+                        typeElements.push(methodDeclaration);
+                    }
+                }
+                else {
+                    var savedFlags = context.flags;
+                    context.flags |= propertyIsReverseMapped ? 33554432 /* InReverseMappedType */ : 0;
+                    var propertyTypeNode = void 0;
+                    if (propertyIsReverseMapped && !!(savedFlags & 33554432 /* InReverseMappedType */)) {
+                        propertyTypeNode = createElidedInformationPlaceholder(context);
+                    }
+                    else {
+                        propertyTypeNode = propertyType ? typeToTypeNodeHelper(propertyType, context) : ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                    }
+                    context.flags = savedFlags;
+                    var modifiers = isReadonlySymbol(propertySymbol) ? [ts.createToken(133 /* ReadonlyKeyword */)] : undefined;
+                    if (modifiers) {
+                        context.approximateLength += 9;
+                    }
+                    var propertySignature = ts.createPropertySignature(modifiers, propertyName, optionalToken, propertyTypeNode, 
+                    /*initializer*/ undefined);
+                    if (propertySymbol.valueDeclaration) {
+                        // Copy comments to node for declaration emit
+                        ts.setCommentRange(propertySignature, propertySymbol.valueDeclaration);
+                    }
+                    typeElements.push(propertySignature);
+                }
+            }
+            function mapToTypeNodes(types, context, isBareList) {
+                if (ts.some(types)) {
+                    if (checkTruncationLength(context)) {
+                        if (!isBareList) {
+                            return [ts.createTypeReferenceNode("...", /*typeArguments*/ undefined)];
+                        }
+                        else if (types.length > 2) {
+                            return [
+                                typeToTypeNodeHelper(types[0], context),
+                                ts.createTypeReferenceNode("... " + (types.length - 2) + " more ...", /*typeArguments*/ undefined),
+                                typeToTypeNodeHelper(types[types.length - 1], context)
+                            ];
+                        }
+                    }
+                    var result = [];
+                    var i = 0;
+                    for (var _i = 0, types_1 = types; _i < types_1.length; _i++) {
+                        var type = types_1[_i];
+                        i++;
+                        if (checkTruncationLength(context) && (i + 2 < types.length - 1)) {
+                            result.push(ts.createTypeReferenceNode("... " + (types.length - i) + " more ...", /*typeArguments*/ undefined));
+                            var typeNode_1 = typeToTypeNodeHelper(types[types.length - 1], context);
+                            if (typeNode_1) {
+                                result.push(typeNode_1);
+                            }
+                            break;
+                        }
+                        context.approximateLength += 2; // Account for whitespace + separator
+                        var typeNode = typeToTypeNodeHelper(type, context);
+                        if (typeNode) {
+                            result.push(typeNode);
+                        }
+                    }
+                    return result;
+                }
+            }
+            function indexInfoToIndexSignatureDeclarationHelper(indexInfo, kind, context) {
+                var name = ts.getNameFromIndexInfo(indexInfo) || "x";
+                var indexerTypeNode = ts.createKeywordTypeNode(kind === 0 /* String */ ? 138 /* StringKeyword */ : 135 /* NumberKeyword */);
+                var indexingParameter = ts.createParameter(
+                /*decorators*/ undefined, 
+                /*modifiers*/ undefined, 
+                /*dotDotDotToken*/ undefined, name, 
+                /*questionToken*/ undefined, indexerTypeNode, 
+                /*initializer*/ undefined);
+                var typeNode = typeToTypeNodeHelper(indexInfo.type || anyType, context);
+                if (!indexInfo.type && !(context.flags & 2097152 /* AllowEmptyIndexInfoType */)) {
+                    context.encounteredError = true;
+                }
+                context.approximateLength += (name.length + 4);
+                return ts.createIndexSignature(
+                /*decorators*/ undefined, indexInfo.isReadonly ? [ts.createToken(133 /* ReadonlyKeyword */)] : undefined, [indexingParameter], typeNode);
+            }
+            function signatureToSignatureDeclarationHelper(signature, kind, context) {
+                var typeParameters;
+                var typeArguments;
+                if (context.flags & 32 /* WriteTypeArgumentsOfSignature */ && signature.target && signature.mapper && signature.target.typeParameters) {
+                    typeArguments = signature.target.typeParameters.map(function (parameter) { return typeToTypeNodeHelper(instantiateType(parameter, signature.mapper), context); });
+                }
+                else {
+                    typeParameters = signature.typeParameters && signature.typeParameters.map(function (parameter) { return typeParameterToDeclaration(parameter, context); });
+                }
+                var parameters = getExpandedParameters(signature).map(function (parameter) { return symbolToParameterDeclaration(parameter, context, kind === 157 /* Constructor */); });
+                if (signature.thisParameter) {
+                    var thisParameter = symbolToParameterDeclaration(signature.thisParameter, context);
+                    parameters.unshift(thisParameter);
+                }
+                var returnTypeNode;
+                var typePredicate = getTypePredicateOfSignature(signature);
+                if (typePredicate) {
+                    var parameterName = typePredicate.kind === 1 /* Identifier */ ?
+                        ts.setEmitFlags(ts.createIdentifier(typePredicate.parameterName), 16777216 /* NoAsciiEscaping */) :
+                        ts.createThisTypeNode();
+                    var typeNode = typeToTypeNodeHelper(typePredicate.type, context);
+                    returnTypeNode = ts.createTypePredicateNode(parameterName, typeNode);
+                }
+                else {
+                    var returnType = getReturnTypeOfSignature(signature);
+                    returnTypeNode = returnType && typeToTypeNodeHelper(returnType, context);
+                }
+                if (context.flags & 256 /* SuppressAnyReturnType */) {
+                    if (returnTypeNode && returnTypeNode.kind === 120 /* AnyKeyword */) {
+                        returnTypeNode = undefined;
+                    }
+                }
+                else if (!returnTypeNode) {
+                    returnTypeNode = ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                }
+                context.approximateLength += 3; // Usually a signature contributes a few more characters than this, but 3 is the minimum
+                return ts.createSignatureDeclaration(kind, typeParameters, parameters, returnTypeNode, typeArguments);
+            }
+            function typeParameterShadowsNameInScope(type, context) {
+                return !!resolveName(context.enclosingDeclaration, type.symbol.escapedName, 67897832 /* Type */, /*nameNotFoundArg*/ undefined, type.symbol.escapedName, /*isUse*/ false);
+            }
+            function typeParameterToDeclarationWithConstraint(type, context, constraintNode) {
+                var savedContextFlags = context.flags;
+                context.flags &= ~512 /* WriteTypeParametersInQualifiedName */; // Avoids potential infinite loop when building for a claimspace with a generic
+                var shouldUseGeneratedName = context.flags & 4 /* GenerateNamesForShadowedTypeParams */ &&
+                    type.symbol.declarations[0] &&
+                    ts.isTypeParameterDeclaration(type.symbol.declarations[0]) &&
+                    typeParameterShadowsNameInScope(type, context);
+                var name = shouldUseGeneratedName
+                    ? ts.getGeneratedNameForNode(type.symbol.declarations[0].name, 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */)
+                    : symbolToName(type.symbol, context, 67897832 /* Type */, /*expectsIdentifier*/ true);
+                var defaultParameter = getDefaultFromTypeParameter(type);
+                var defaultParameterNode = defaultParameter && typeToTypeNodeHelper(defaultParameter, context);
+                context.flags = savedContextFlags;
+                return ts.createTypeParameterDeclaration(name, constraintNode, defaultParameterNode);
+            }
+            function typeParameterToDeclaration(type, context, constraint) {
+                if (constraint === void 0) { constraint = getConstraintOfTypeParameter(type); }
+                var constraintNode = constraint && typeToTypeNodeHelper(constraint, context);
+                return typeParameterToDeclarationWithConstraint(type, context, constraintNode);
+            }
+            function symbolToParameterDeclaration(parameterSymbol, context, preserveModifierFlags) {
+                var parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 151 /* Parameter */);
+                if (!parameterDeclaration && !isTransientSymbol(parameterSymbol)) {
+                    parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 299 /* JSDocParameterTag */);
+                }
+                var parameterType = getTypeOfSymbol(parameterSymbol);
+                if (parameterDeclaration && isRequiredInitializedParameter(parameterDeclaration)) {
+                    parameterType = getOptionalType(parameterType);
+                }
+                var parameterTypeNode = typeToTypeNodeHelper(parameterType, context);
+                var modifiers = !(context.flags & 8192 /* OmitParameterModifiers */) && preserveModifierFlags && parameterDeclaration && parameterDeclaration.modifiers ? parameterDeclaration.modifiers.map(ts.getSynthesizedClone) : undefined;
+                var isRest = parameterDeclaration && ts.isRestParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 16384 /* RestParameter */;
+                var dotDotDotToken = isRest ? ts.createToken(25 /* DotDotDotToken */) : undefined;
+                var name = parameterDeclaration
+                    ? parameterDeclaration.name ?
+                        parameterDeclaration.name.kind === 72 /* Identifier */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name), 16777216 /* NoAsciiEscaping */) :
+                            parameterDeclaration.name.kind === 148 /* QualifiedName */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name.right), 16777216 /* NoAsciiEscaping */) :
+                                cloneBindingName(parameterDeclaration.name) :
+                        ts.symbolName(parameterSymbol)
+                    : ts.symbolName(parameterSymbol);
+                var isOptional = parameterDeclaration && isOptionalParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 8192 /* OptionalParameter */;
+                var questionToken = isOptional ? ts.createToken(56 /* QuestionToken */) : undefined;
+                var parameterNode = ts.createParameter(
+                /*decorators*/ undefined, modifiers, dotDotDotToken, name, questionToken, parameterTypeNode, 
+                /*initializer*/ undefined);
+                context.approximateLength += ts.symbolName(parameterSymbol).length + 3;
+                return parameterNode;
+                function cloneBindingName(node) {
+                    return elideInitializerAndSetEmitFlags(node);
+                    function elideInitializerAndSetEmitFlags(node) {
+                        if (context.tracker.trackSymbol && ts.isComputedPropertyName(node) && isLateBindableName(node)) {
+                            trackComputedName(node, context.enclosingDeclaration, context);
+                        }
+                        var visited = ts.visitEachChild(node, elideInitializerAndSetEmitFlags, ts.nullTransformationContext, /*nodesVisitor*/ undefined, elideInitializerAndSetEmitFlags);
+                        var clone = ts.nodeIsSynthesized(visited) ? visited : ts.getSynthesizedClone(visited);
+                        if (clone.kind === 186 /* BindingElement */) {
+                            clone.initializer = undefined;
+                        }
+                        return ts.setEmitFlags(clone, 1 /* SingleLine */ | 16777216 /* NoAsciiEscaping */);
+                    }
+                }
+            }
+            function trackComputedName(node, enclosingDeclaration, context) {
+                if (!context.tracker.trackSymbol)
+                    return;
+                // get symbol of the first identifier of the entityName
+                var firstIdentifier = getFirstIdentifier(node.expression);
+                var name = resolveName(firstIdentifier, firstIdentifier.escapedText, 67220415 /* Value */ | 1048576 /* ExportValue */, /*nodeNotFoundErrorMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ true);
+                if (name) {
+                    context.tracker.trackSymbol(name, enclosingDeclaration, 67220415 /* Value */);
+                }
+            }
+            function lookupSymbolChain(symbol, context, meaning, yieldModuleSymbol) {
+                context.tracker.trackSymbol(symbol, context.enclosingDeclaration, meaning); // TODO: GH#18217
+                // Try to get qualified name if the symbol is not a type parameter and there is an enclosing declaration.
+                var chain;
+                var isTypeParameter = symbol.flags & 262144 /* TypeParameter */;
+                if (!isTypeParameter && (context.enclosingDeclaration || context.flags & 64 /* UseFullyQualifiedType */) && !(context.flags & 134217728 /* DoNotIncludeSymbolChain */)) {
+                    chain = ts.Debug.assertDefined(getSymbolChain(symbol, meaning, /*endOfChain*/ true));
+                    ts.Debug.assert(chain && chain.length > 0);
+                }
+                else {
+                    chain = [symbol];
+                }
+                return chain;
+                /** @param endOfChain Set to false for recursive calls; non-recursive calls should always output something. */
+                function getSymbolChain(symbol, meaning, endOfChain) {
+                    var accessibleSymbolChain = getAccessibleSymbolChain(symbol, context.enclosingDeclaration, meaning, !!(context.flags & 128 /* UseOnlyExternalAliasing */));
+                    var parentSpecifiers;
+                    if (!accessibleSymbolChain ||
+                        needsQualification(accessibleSymbolChain[0], context.enclosingDeclaration, accessibleSymbolChain.length === 1 ? meaning : getQualifiedLeftMeaning(meaning))) {
+                        // Go up and add our parent.
+                        var parents_1 = getContainersOfSymbol(accessibleSymbolChain ? accessibleSymbolChain[0] : symbol, context.enclosingDeclaration);
+                        if (ts.length(parents_1)) {
+                            parentSpecifiers = parents_1.map(function (symbol) {
+                                return ts.some(symbol.declarations, hasNonGlobalAugmentationExternalModuleSymbol)
+                                    ? getSpecifierForModuleSymbol(symbol, context)
+                                    : undefined;
+                            });
+                            var indices = parents_1.map(function (_, i) { return i; });
+                            indices.sort(sortByBestName);
+                            var sortedParents = indices.map(function (i) { return parents_1[i]; });
+                            for (var _i = 0, sortedParents_1 = sortedParents; _i < sortedParents_1.length; _i++) {
+                                var parent = sortedParents_1[_i];
+                                var parentChain = getSymbolChain(parent, getQualifiedLeftMeaning(meaning), /*endOfChain*/ false);
+                                if (parentChain) {
+                                    accessibleSymbolChain = parentChain.concat(accessibleSymbolChain || [getAliasForSymbolInContainer(parent, symbol) || symbol]);
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    if (accessibleSymbolChain) {
+                        return accessibleSymbolChain;
+                    }
+                    if (
+                    // If this is the last part of outputting the symbol, always output. The cases apply only to parent symbols.
+                    endOfChain ||
+                        // If a parent symbol is an anonymous type, don't write it.
+                        !(symbol.flags & (2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */))) {
+                        // If a parent symbol is an external module, don't write it. (We prefer just `x` vs `"foo/bar".x`.)
+                        if (!endOfChain && !yieldModuleSymbol && !!ts.forEach(symbol.declarations, hasNonGlobalAugmentationExternalModuleSymbol)) {
+                            return;
+                        }
+                        return [symbol];
+                    }
+                    function sortByBestName(a, b) {
+                        var specifierA = parentSpecifiers[a];
+                        var specifierB = parentSpecifiers[b];
+                        if (specifierA && specifierB) {
+                            var isBRelative = ts.pathIsRelative(specifierB);
+                            if (ts.pathIsRelative(specifierA) === isBRelative) {
+                                // Both relative or both non-relative, sort by number of parts
+                                return ts.moduleSpecifiers.countPathComponents(specifierA) - ts.moduleSpecifiers.countPathComponents(specifierB);
+                            }
+                            if (isBRelative) {
+                                // A is non-relative, B is relative: prefer A
+                                return -1;
+                            }
+                            // A is relative, B is non-relative: prefer B
+                            return 1;
+                        }
+                        return 0;
+                    }
+                }
+            }
+            function typeParametersToTypeParameterDeclarations(symbol, context) {
+                var typeParameterNodes;
+                var targetSymbol = getTargetSymbol(symbol);
+                if (targetSymbol.flags & (32 /* Class */ | 64 /* Interface */ | 524288 /* TypeAlias */)) {
+                    typeParameterNodes = ts.createNodeArray(ts.map(getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol), function (tp) { return typeParameterToDeclaration(tp, context); }));
+                }
+                return typeParameterNodes;
+            }
+            function lookupTypeParameterNodes(chain, index, context) {
+                ts.Debug.assert(chain && 0 <= index && index < chain.length);
+                var symbol = chain[index];
+                var typeParameterNodes;
+                if (context.flags & 512 /* WriteTypeParametersInQualifiedName */ && index < (chain.length - 1)) {
+                    var parentSymbol = symbol;
+                    var nextSymbol = chain[index + 1];
+                    if (ts.getCheckFlags(nextSymbol) & 1 /* Instantiated */) {
+                        var params = getTypeParametersOfClassOrInterface(parentSymbol.flags & 2097152 /* Alias */ ? resolveAlias(parentSymbol) : parentSymbol);
+                        typeParameterNodes = mapToTypeNodes(ts.map(params, nextSymbol.mapper), context);
+                    }
+                    else {
+                        typeParameterNodes = typeParametersToTypeParameterDeclarations(symbol, context);
+                    }
+                }
+                return typeParameterNodes;
+            }
+            /**
+             * Given A[B][C][D], finds A[B]
+             */
+            function getTopmostIndexedAccessType(top) {
+                if (ts.isIndexedAccessTypeNode(top.objectType)) {
+                    return getTopmostIndexedAccessType(top.objectType);
+                }
+                return top;
+            }
+            function getSpecifierForModuleSymbol(symbol, context) {
+                var file = ts.getDeclarationOfKind(symbol, 279 /* SourceFile */);
+                if (file && file.moduleName !== undefined) {
+                    // Use the amd name if it is available
+                    return file.moduleName;
+                }
+                if (!file) {
+                    if (context.tracker.trackReferencedAmbientModule) {
+                        var ambientDecls = ts.filter(symbol.declarations, ts.isAmbientModule);
+                        if (ts.length(ambientDecls)) {
+                            for (var _i = 0, ambientDecls_1 = ambientDecls; _i < ambientDecls_1.length; _i++) {
+                                var decl = ambientDecls_1[_i];
+                                context.tracker.trackReferencedAmbientModule(decl, symbol);
+                            }
+                        }
+                    }
+                    if (ambientModuleSymbolRegex.test(symbol.escapedName)) {
+                        return symbol.escapedName.substring(1, symbol.escapedName.length - 1);
+                    }
+                }
+                if (!context.enclosingDeclaration || !context.tracker.moduleResolverHost) {
+                    // If there's no context declaration, we can't lookup a non-ambient specifier, so we just use the symbol name
+                    if (ambientModuleSymbolRegex.test(symbol.escapedName)) {
+                        return symbol.escapedName.substring(1, symbol.escapedName.length - 1);
+                    }
+                    return ts.getSourceFileOfNode(ts.getNonAugmentationDeclaration(symbol)).fileName; // A resolver may not be provided for baselines and errors - in those cases we use the fileName in full
+                }
+                var contextFile = ts.getSourceFileOfNode(ts.getOriginalNode(context.enclosingDeclaration));
+                var links = getSymbolLinks(symbol);
+                var specifier = links.specifierCache && links.specifierCache.get(contextFile.path);
+                if (!specifier) {
+                    var isBundle_1 = (compilerOptions.out || compilerOptions.outFile);
+                    // For declaration bundles, we need to generate absolute paths relative to the common source dir for imports,
+                    // just like how the declaration emitter does for the ambient module declarations - we can easily accomplish this
+                    // using the `baseUrl` compiler option (which we would otherwise never use in declaration emit) and a non-relative
+                    // specifier preference
+                    var moduleResolverHost = context.tracker.moduleResolverHost;
+                    var specifierCompilerOptions = isBundle_1 ? __assign({}, compilerOptions, { baseUrl: moduleResolverHost.getCommonSourceDirectory() }) : compilerOptions;
+                    specifier = ts.first(ts.moduleSpecifiers.getModuleSpecifiers(symbol, specifierCompilerOptions, contextFile, moduleResolverHost, host.getSourceFiles(), { importModuleSpecifierPreference: isBundle_1 ? "non-relative" : "relative" }, host.redirectTargetsMap));
+                    links.specifierCache = links.specifierCache || ts.createMap();
+                    links.specifierCache.set(contextFile.path, specifier);
+                }
+                return specifier;
+            }
+            function symbolToTypeNode(symbol, context, meaning, overrideTypeArguments) {
+                var chain = lookupSymbolChain(symbol, context, meaning, !(context.flags & 16384 /* UseAliasDefinedOutsideCurrentScope */)); // If we're using aliases outside the current scope, dont bother with the module
+                var isTypeOf = meaning === 67220415 /* Value */;
+                if (ts.some(chain[0].declarations, hasNonGlobalAugmentationExternalModuleSymbol)) {
+                    // module is root, must use `ImportTypeNode`
+                    var nonRootParts = chain.length > 1 ? createAccessFromSymbolChain(chain, chain.length - 1, 1) : undefined;
+                    var typeParameterNodes = overrideTypeArguments || lookupTypeParameterNodes(chain, 0, context);
+                    var specifier = getSpecifierForModuleSymbol(chain[0], context);
+                    if (!(context.flags & 67108864 /* AllowNodeModulesRelativePaths */) && ts.getEmitModuleResolutionKind(compilerOptions) === ts.ModuleResolutionKind.NodeJs && specifier.indexOf("/node_modules/") >= 0) {
+                        // If ultimately we can only name the symbol with a reference that dives into a `node_modules` folder, we should error
+                        // since declaration files with these kinds of references are liable to fail when published :(
+                        context.encounteredError = true;
+                        if (context.tracker.reportLikelyUnsafeImportRequiredError) {
+                            context.tracker.reportLikelyUnsafeImportRequiredError(specifier);
+                        }
+                    }
+                    var lit = ts.createLiteralTypeNode(ts.createLiteral(specifier));
+                    if (context.tracker.trackExternalModuleSymbolOfImportTypeNode)
+                        context.tracker.trackExternalModuleSymbolOfImportTypeNode(chain[0]);
+                    context.approximateLength += specifier.length + 10; // specifier + import("")
+                    if (!nonRootParts || ts.isEntityName(nonRootParts)) {
+                        if (nonRootParts) {
+                            var lastId = ts.isIdentifier(nonRootParts) ? nonRootParts : nonRootParts.right;
+                            lastId.typeArguments = undefined;
+                        }
+                        return ts.createImportTypeNode(lit, nonRootParts, typeParameterNodes, isTypeOf);
+                    }
+                    else {
+                        var splitNode = getTopmostIndexedAccessType(nonRootParts);
+                        var qualifier = splitNode.objectType.typeName;
+                        return ts.createIndexedAccessTypeNode(ts.createImportTypeNode(lit, qualifier, typeParameterNodes, isTypeOf), splitNode.indexType);
+                    }
+                }
+                var entityName = createAccessFromSymbolChain(chain, chain.length - 1, 0);
+                if (ts.isIndexedAccessTypeNode(entityName)) {
+                    return entityName; // Indexed accesses can never be `typeof`
+                }
+                if (isTypeOf) {
+                    return ts.createTypeQueryNode(entityName);
+                }
+                else {
+                    var lastId = ts.isIdentifier(entityName) ? entityName : entityName.right;
+                    var lastTypeArgs = lastId.typeArguments;
+                    lastId.typeArguments = undefined;
+                    return ts.createTypeReferenceNode(entityName, lastTypeArgs);
+                }
+                function createAccessFromSymbolChain(chain, index, stopper) {
+                    var typeParameterNodes = index === (chain.length - 1) ? overrideTypeArguments : lookupTypeParameterNodes(chain, index, context);
+                    var symbol = chain[index];
+                    if (index === 0) {
+                        context.flags |= 16777216 /* InInitialEntityName */;
+                    }
+                    var symbolName = getNameOfSymbolAsWritten(symbol, context);
+                    context.approximateLength += symbolName.length + 1;
+                    if (index === 0) {
+                        context.flags ^= 16777216 /* InInitialEntityName */;
+                    }
+                    var parent = chain[index - 1];
+                    if (!(context.flags & 16 /* ForbidIndexedAccessSymbolReferences */) && parent && getMembersOfSymbol(parent) && getMembersOfSymbol(parent).get(symbol.escapedName) === symbol) {
+                        // Should use an indexed access
+                        var LHS = createAccessFromSymbolChain(chain, index - 1, stopper);
+                        if (ts.isIndexedAccessTypeNode(LHS)) {
+                            return ts.createIndexedAccessTypeNode(LHS, ts.createLiteralTypeNode(ts.createLiteral(symbolName)));
+                        }
+                        else {
+                            return ts.createIndexedAccessTypeNode(ts.createTypeReferenceNode(LHS, typeParameterNodes), ts.createLiteralTypeNode(ts.createLiteral(symbolName)));
+                        }
+                    }
+                    var identifier = ts.setEmitFlags(ts.createIdentifier(symbolName, typeParameterNodes), 16777216 /* NoAsciiEscaping */);
+                    identifier.symbol = symbol;
+                    if (index > stopper) {
+                        var LHS = createAccessFromSymbolChain(chain, index - 1, stopper);
+                        if (!ts.isEntityName(LHS)) {
+                            return ts.Debug.fail("Impossible construct - an export of an indexed access cannot be reachable");
+                        }
+                        return ts.createQualifiedName(LHS, identifier);
+                    }
+                    return identifier;
+                }
+            }
+            function symbolToName(symbol, context, meaning, expectsIdentifier) {
+                var chain = lookupSymbolChain(symbol, context, meaning);
+                if (expectsIdentifier && chain.length !== 1
+                    && !context.encounteredError
+                    && !(context.flags & 65536 /* AllowQualifedNameInPlaceOfIdentifier */)) {
+                    context.encounteredError = true;
+                }
+                return createEntityNameFromSymbolChain(chain, chain.length - 1);
+                function createEntityNameFromSymbolChain(chain, index) {
+                    var typeParameterNodes = lookupTypeParameterNodes(chain, index, context);
+                    var symbol = chain[index];
+                    if (index === 0) {
+                        context.flags |= 16777216 /* InInitialEntityName */;
+                    }
+                    var symbolName = getNameOfSymbolAsWritten(symbol, context);
+                    if (index === 0) {
+                        context.flags ^= 16777216 /* InInitialEntityName */;
+                    }
+                    var identifier = ts.setEmitFlags(ts.createIdentifier(symbolName, typeParameterNodes), 16777216 /* NoAsciiEscaping */);
+                    identifier.symbol = symbol;
+                    return index > 0 ? ts.createQualifiedName(createEntityNameFromSymbolChain(chain, index - 1), identifier) : identifier;
+                }
+            }
+            function symbolToExpression(symbol, context, meaning) {
+                var chain = lookupSymbolChain(symbol, context, meaning);
+                return createExpressionFromSymbolChain(chain, chain.length - 1);
+                function createExpressionFromSymbolChain(chain, index) {
+                    var typeParameterNodes = lookupTypeParameterNodes(chain, index, context);
+                    var symbol = chain[index];
+                    if (ts.some(symbol.declarations, hasNonGlobalAugmentationExternalModuleSymbol)) {
+                        return ts.createLiteral(getSpecifierForModuleSymbol(symbol, context));
+                    }
+                    if (index === 0) {
+                        context.flags |= 16777216 /* InInitialEntityName */;
+                    }
+                    var symbolName = getNameOfSymbolAsWritten(symbol, context);
+                    if (index === 0) {
+                        context.flags ^= 16777216 /* InInitialEntityName */;
+                    }
+                    var firstChar = symbolName.charCodeAt(0);
+                    var canUsePropertyAccess = ts.isIdentifierStart(firstChar, languageVersion);
+                    if (index === 0 || canUsePropertyAccess) {
+                        var identifier = ts.setEmitFlags(ts.createIdentifier(symbolName, typeParameterNodes), 16777216 /* NoAsciiEscaping */);
+                        identifier.symbol = symbol;
+                        return index > 0 ? ts.createPropertyAccess(createExpressionFromSymbolChain(chain, index - 1), identifier) : identifier;
+                    }
+                    else {
+                        if (firstChar === 91 /* openBracket */) {
+                            symbolName = symbolName.substring(1, symbolName.length - 1);
+                            firstChar = symbolName.charCodeAt(0);
+                        }
+                        var expression = void 0;
+                        if (ts.isSingleOrDoubleQuote(firstChar)) {
+                            expression = ts.createLiteral(symbolName.substring(1, symbolName.length - 1).replace(/\\./g, function (s) { return s.substring(1); }));
+                            expression.singleQuote = firstChar === 39 /* singleQuote */;
+                        }
+                        else if (("" + +symbolName) === symbolName) {
+                            expression = ts.createLiteral(+symbolName);
+                        }
+                        if (!expression) {
+                            expression = ts.setEmitFlags(ts.createIdentifier(symbolName, typeParameterNodes), 16777216 /* NoAsciiEscaping */);
+                            expression.symbol = symbol;
+                        }
+                        return ts.createElementAccess(createExpressionFromSymbolChain(chain, index - 1), expression);
+                    }
+                }
+            }
+        }
+        function typePredicateToString(typePredicate, enclosingDeclaration, flags, writer) {
+            if (flags === void 0) { flags = 16384 /* UseAliasDefinedOutsideCurrentScope */; }
+            return writer ? typePredicateToStringWorker(writer).getText() : ts.usingSingleLineStringWriter(typePredicateToStringWorker);
+            function typePredicateToStringWorker(writer) {
+                var predicate = ts.createTypePredicateNode(typePredicate.kind === 1 /* Identifier */ ? ts.createIdentifier(typePredicate.parameterName) : ts.createThisTypeNode(), nodeBuilder.typeToTypeNode(typePredicate.type, enclosingDeclaration, toNodeBuilderFlags(flags) | 70221824 /* IgnoreErrors */ | 512 /* WriteTypeParametersInQualifiedName */));
+                var printer = ts.createPrinter({ removeComments: true });
+                var sourceFile = enclosingDeclaration && ts.getSourceFileOfNode(enclosingDeclaration);
+                printer.writeNode(4 /* Unspecified */, predicate, /*sourceFile*/ sourceFile, writer);
+                return writer;
+            }
+        }
+        function formatUnionTypes(types) {
+            var result = [];
+            var flags = 0;
+            for (var i = 0; i < types.length; i++) {
+                var t = types[i];
+                flags |= t.flags;
+                if (!(t.flags & 98304 /* Nullable */)) {
+                    if (t.flags & (512 /* BooleanLiteral */ | 1024 /* EnumLiteral */)) {
+                        var baseType = t.flags & 512 /* BooleanLiteral */ ? booleanType : getBaseTypeOfEnumLiteralType(t);
+                        if (baseType.flags & 1048576 /* Union */) {
+                            var count = baseType.types.length;
+                            if (i + count <= types.length && getRegularTypeOfLiteralType(types[i + count - 1]) === getRegularTypeOfLiteralType(baseType.types[count - 1])) {
+                                result.push(baseType);
+                                i += count - 1;
+                                continue;
+                            }
+                        }
+                    }
+                    result.push(t);
+                }
+            }
+            if (flags & 65536 /* Null */)
+                result.push(nullType);
+            if (flags & 32768 /* Undefined */)
+                result.push(undefinedType);
+            return result || types;
+        }
+        function visibilityToString(flags) {
+            if (flags === 8 /* Private */) {
+                return "private";
+            }
+            if (flags === 16 /* Protected */) {
+                return "protected";
+            }
+            return "public";
+        }
+        function getTypeAliasForTypeLiteral(type) {
+            if (type.symbol && type.symbol.flags & 2048 /* TypeLiteral */) {
+                var node = ts.findAncestor(type.symbol.declarations[0].parent, function (n) { return n.kind !== 177 /* ParenthesizedType */; });
+                if (node.kind === 242 /* TypeAliasDeclaration */) {
+                    return getSymbolOfNode(node);
+                }
+            }
+            return undefined;
+        }
+        function isTopLevelInExternalModuleAugmentation(node) {
+            return node && node.parent &&
+                node.parent.kind === 245 /* ModuleBlock */ &&
+                ts.isExternalModuleAugmentation(node.parent.parent);
+        }
+        function isDefaultBindingContext(location) {
+            return location.kind === 279 /* SourceFile */ || ts.isAmbientModule(location);
+        }
+        function getNameOfSymbolFromNameType(symbol, context) {
+            var nameType = symbol.nameType;
+            if (nameType) {
+                if (nameType.flags & 384 /* StringOrNumberLiteral */) {
+                    var name = "" + nameType.value;
+                    if (!ts.isIdentifierText(name, compilerOptions.target) && !isNumericLiteralName(name)) {
+                        return "\"" + ts.escapeString(name, 34 /* doubleQuote */) + "\"";
+                    }
+                    return name;
+                }
+                if (nameType.flags & 8192 /* UniqueESSymbol */) {
+                    return "[" + getNameOfSymbolAsWritten(nameType.symbol, context) + "]";
+                }
+            }
+        }
+        /**
+         * Gets a human-readable name for a symbol.
+         * Should *not* be used for the right-hand side of a `.` -- use `symbolName(symbol)` for that instead.
+         *
+         * Unlike `symbolName(symbol)`, this will include quotes if the name is from a string literal.
+         * It will also use a representation of a number as written instead of a decimal form, e.g. `0o11` instead of `9`.
+         */
+        function getNameOfSymbolAsWritten(symbol, context) {
+            if (context && symbol.escapedName === "default" /* Default */ && !(context.flags & 16384 /* UseAliasDefinedOutsideCurrentScope */) &&
+                // If it's not the first part of an entity name, it must print as `default`
+                (!(context.flags & 16777216 /* InInitialEntityName */) ||
+                    // if the symbol is synthesized, it will only be referenced externally it must print as `default`
+                    !symbol.declarations ||
+                    // if not in the same binding context (source file, module declaration), it must print as `default`
+                    (context.enclosingDeclaration && ts.findAncestor(symbol.declarations[0], isDefaultBindingContext) !== ts.findAncestor(context.enclosingDeclaration, isDefaultBindingContext)))) {
+                return "default";
+            }
+            if (symbol.declarations && symbol.declarations.length) {
+                var declaration = symbol.declarations[0];
+                var name_2 = ts.getNameOfDeclaration(declaration);
+                if (name_2) {
+                    if (ts.isCallExpression(declaration) && ts.isBindableObjectDefinePropertyCall(declaration)) {
+                        return ts.symbolName(symbol);
+                    }
+                    if (ts.isComputedPropertyName(name_2) && !(ts.getCheckFlags(symbol) & 2048 /* Late */) && symbol.nameType && symbol.nameType.flags & 384 /* StringOrNumberLiteral */) {
+                        // Computed property name isn't late bound, but has a well-known name type - use name type to generate a symbol name
+                        var result = getNameOfSymbolFromNameType(symbol, context);
+                        if (result !== undefined) {
+                            return result;
+                        }
+                    }
+                    return ts.declarationNameToString(name_2);
+                }
+                if (declaration.parent && declaration.parent.kind === 237 /* VariableDeclaration */) {
+                    return ts.declarationNameToString(declaration.parent.name);
+                }
+                switch (declaration.kind) {
+                    case 209 /* ClassExpression */:
+                    case 196 /* FunctionExpression */:
+                    case 197 /* ArrowFunction */:
+                        if (context && !context.encounteredError && !(context.flags & 131072 /* AllowAnonymousIdentifier */)) {
+                            context.encounteredError = true;
+                        }
+                        return declaration.kind === 209 /* ClassExpression */ ? "(Anonymous class)" : "(Anonymous function)";
+                }
+            }
+            var name = getNameOfSymbolFromNameType(symbol, context);
+            return name !== undefined ? name : ts.symbolName(symbol);
+        }
+        function isDeclarationVisible(node) {
+            if (node) {
+                var links = getNodeLinks(node);
+                if (links.isVisible === undefined) {
+                    links.isVisible = !!determineIfDeclarationIsVisible();
+                }
+                return links.isVisible;
+            }
+            return false;
+            function determineIfDeclarationIsVisible() {
+                switch (node.kind) {
+                    case 297 /* JSDocCallbackTag */:
+                    case 304 /* JSDocTypedefTag */:
+                        // Top-level jsdoc type aliases are considered exported
+                        // First parent is comment node, second is hosting declaration or token; we only care about those tokens or declarations whose parent is a source file
+                        return !!(node.parent && node.parent.parent && node.parent.parent.parent && ts.isSourceFile(node.parent.parent.parent));
+                    case 186 /* BindingElement */:
+                        return isDeclarationVisible(node.parent.parent);
+                    case 237 /* VariableDeclaration */:
+                        if (ts.isBindingPattern(node.name) &&
+                            !node.name.elements.length) {
+                            // If the binding pattern is empty, this variable declaration is not visible
+                            return false;
+                        }
+                    // falls through
+                    case 244 /* ModuleDeclaration */:
+                    case 240 /* ClassDeclaration */:
+                    case 241 /* InterfaceDeclaration */:
+                    case 242 /* TypeAliasDeclaration */:
+                    case 239 /* FunctionDeclaration */:
+                    case 243 /* EnumDeclaration */:
+                    case 248 /* ImportEqualsDeclaration */:
+                        // external module augmentation is always visible
+                        if (ts.isExternalModuleAugmentation(node)) {
+                            return true;
+                        }
+                        var parent = getDeclarationContainer(node);
+                        // If the node is not exported or it is not ambient module element (except import declaration)
+                        if (!(ts.getCombinedModifierFlags(node) & 1 /* Export */) &&
+                            !(node.kind !== 248 /* ImportEqualsDeclaration */ && parent.kind !== 279 /* SourceFile */ && parent.flags & 4194304 /* Ambient */)) {
+                            return isGlobalSourceFile(parent);
+                        }
+                        // Exported members/ambient module elements (exception import declaration) are visible if parent is visible
+                        return isDeclarationVisible(parent);
+                    case 154 /* PropertyDeclaration */:
+                    case 153 /* PropertySignature */:
+                    case 158 /* GetAccessor */:
+                    case 159 /* SetAccessor */:
+                    case 156 /* MethodDeclaration */:
+                    case 155 /* MethodSignature */:
+                        if (ts.hasModifier(node, 8 /* Private */ | 16 /* Protected */)) {
+                            // Private/protected properties/methods are not visible
+                            return false;
+                        }
+                    // Public properties/methods are visible if its parents are visible, so:
+                    // falls through
+                    case 157 /* Constructor */:
+                    case 161 /* ConstructSignature */:
+                    case 160 /* CallSignature */:
+                    case 162 /* IndexSignature */:
+                    case 151 /* Parameter */:
+                    case 245 /* ModuleBlock */:
+                    case 165 /* FunctionType */:
+                    case 166 /* ConstructorType */:
+                    case 168 /* TypeLiteral */:
+                    case 164 /* TypeReference */:
+                    case 169 /* ArrayType */:
+                    case 170 /* TupleType */:
+                    case 173 /* UnionType */:
+                    case 174 /* IntersectionType */:
+                    case 177 /* ParenthesizedType */:
+                        return isDeclarationVisible(node.parent);
+                    // Default binding, import specifier and namespace import is visible
+                    // only on demand so by default it is not visible
+                    case 250 /* ImportClause */:
+                    case 251 /* NamespaceImport */:
+                    case 253 /* ImportSpecifier */:
+                        return false;
+                    // Type parameters are always visible
+                    case 150 /* TypeParameter */:
+                    // Source file and namespace export are always visible
+                    case 279 /* SourceFile */:
+                    case 247 /* NamespaceExportDeclaration */:
+                        return true;
+                    // Export assignments do not create name bindings outside the module
+                    case 254 /* ExportAssignment */:
+                        return false;
+                    default:
+                        return false;
+                }
+            }
+        }
+        function collectLinkedAliases(node, setVisibility) {
+            var exportSymbol;
+            if (node.parent && node.parent.kind === 254 /* ExportAssignment */) {
+                exportSymbol = resolveName(node, node.escapedText, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */, /*nameNotFoundMessage*/ undefined, node, /*isUse*/ false);
+            }
+            else if (node.parent.kind === 257 /* ExportSpecifier */) {
+                exportSymbol = getTargetOfExportSpecifier(node.parent, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */);
+            }
+            var result;
+            if (exportSymbol) {
+                buildVisibleNodeList(exportSymbol.declarations);
+            }
+            return result;
+            function buildVisibleNodeList(declarations) {
+                ts.forEach(declarations, function (declaration) {
+                    var resultNode = getAnyImportSyntax(declaration) || declaration;
+                    if (setVisibility) {
+                        getNodeLinks(declaration).isVisible = true;
+                    }
+                    else {
+                        result = result || [];
+                        ts.pushIfUnique(result, resultNode);
+                    }
+                    if (ts.isInternalModuleImportEqualsDeclaration(declaration)) {
+                        // Add the referenced top container visible
+                        var internalModuleReference = declaration.moduleReference;
+                        var firstIdentifier = getFirstIdentifier(internalModuleReference);
+                        var importSymbol = resolveName(declaration, firstIdentifier.escapedText, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */, undefined, undefined, /*isUse*/ false);
+                        if (importSymbol) {
+                            buildVisibleNodeList(importSymbol.declarations);
+                        }
+                    }
+                });
+            }
+        }
+        /**
+         * Push an entry on the type resolution stack. If an entry with the given target and the given property name
+         * is already on the stack, and no entries in between already have a type, then a circularity has occurred.
+         * In this case, the result values of the existing entry and all entries pushed after it are changed to false,
+         * and the value false is returned. Otherwise, the new entry is just pushed onto the stack, and true is returned.
+         * In order to see if the same query has already been done before, the target object and the propertyName both
+         * must match the one passed in.
+         *
+         * @param target The symbol, type, or signature whose type is being queried
+         * @param propertyName The property name that should be used to query the target for its type
+         */
+        function pushTypeResolution(target, propertyName) {
+            var resolutionCycleStartIndex = findResolutionCycleStartIndex(target, propertyName);
+            if (resolutionCycleStartIndex >= 0) {
+                // A cycle was found
+                var length_2 = resolutionTargets.length;
+                for (var i = resolutionCycleStartIndex; i < length_2; i++) {
+                    resolutionResults[i] = false;
+                }
+                return false;
+            }
+            resolutionTargets.push(target);
+            resolutionResults.push(/*items*/ true);
+            resolutionPropertyNames.push(propertyName);
+            return true;
+        }
+        function findResolutionCycleStartIndex(target, propertyName) {
+            for (var i = resolutionTargets.length - 1; i >= 0; i--) {
+                if (hasType(resolutionTargets[i], resolutionPropertyNames[i])) {
+                    return -1;
+                }
+                if (resolutionTargets[i] === target && resolutionPropertyNames[i] === propertyName) {
+                    return i;
+                }
+            }
+            return -1;
+        }
+        function hasType(target, propertyName) {
+            switch (propertyName) {
+                case 0 /* Type */:
+                    return !!getSymbolLinks(target).type;
+                case 5 /* EnumTagType */:
+                    return !!(getNodeLinks(target).resolvedEnumType);
+                case 2 /* DeclaredType */:
+                    return !!getSymbolLinks(target).declaredType;
+                case 1 /* ResolvedBaseConstructorType */:
+                    return !!target.resolvedBaseConstructorType;
+                case 3 /* ResolvedReturnType */:
+                    return !!target.resolvedReturnType;
+                case 4 /* ImmediateBaseConstraint */:
+                    return !!target.immediateBaseConstraint;
+                case 6 /* JSDocTypeReference */:
+                    return !!getSymbolLinks(target).resolvedJSDocType;
+            }
+            return ts.Debug.assertNever(propertyName);
+        }
+        // Pop an entry from the type resolution stack and return its associated result value. The result value will
+        // be true if no circularities were detected, or false if a circularity was found.
+        function popTypeResolution() {
+            resolutionTargets.pop();
+            resolutionPropertyNames.pop();
+            return resolutionResults.pop();
+        }
+        function getDeclarationContainer(node) {
+            return ts.findAncestor(ts.getRootDeclaration(node), function (node) {
+                switch (node.kind) {
+                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclarationList */:
+                    case 253 /* ImportSpecifier */:
+                    case 252 /* NamedImports */:
+                    case 251 /* NamespaceImport */:
+                    case 250 /* ImportClause */:
+                        return false;
+                    default:
+                        return true;
+                }
+            }).parent;
+        }
+        function getTypeOfPrototypeProperty(prototype) {
+            // TypeScript 1.0 spec (April 2014): 8.4
+            // Every class automatically contains a static property member named 'prototype',
+            // the type of which is an instantiation of the class type with type Any supplied as a type argument for each type parameter.
+            // It is an error to explicitly declare a static property member with the name 'prototype'.
+            var classType = getDeclaredTypeOfSymbol(getParentOfSymbol(prototype));
+            return classType.typeParameters ? createTypeReference(classType, ts.map(classType.typeParameters, function (_) { return anyType; })) : classType;
+        }
+        // Return the type of the given property in the given type, or undefined if no such property exists
+        function getTypeOfPropertyOfType(type, name) {
+            var prop = getPropertyOfType(type, name);
+            return prop ? getTypeOfSymbol(prop) : undefined;
+        }
+        function getTypeOfPropertyOrIndexSignature(type, name) {
+            return getTypeOfPropertyOfType(type, name) || isNumericLiteralName(name) && getIndexTypeOfType(type, 1 /* Number */) || getIndexTypeOfType(type, 0 /* String */) || unknownType;
+        }
+        function isTypeAny(type) {
+            return type && (type.flags & 1 /* Any */) !== 0;
+        }
+        // Return the type of a binding element parent. We check SymbolLinks first to see if a type has been
+        // assigned by contextual typing.
+        function getTypeForBindingElementParent(node) {
+            var symbol = getSymbolOfNode(node);
+            return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node, /*includeOptionality*/ false);
+        }
+        function isComputedNonLiteralName(name) {
+            return name.kind === 149 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteralLike(name.expression);
+        }
+        function getRestType(source, properties, symbol) {
+            source = filterType(source, function (t) { return !(t.flags & 98304 /* Nullable */); });
+            if (source.flags & 131072 /* Never */) {
+                return emptyObjectType;
+            }
+            if (source.flags & 1048576 /* Union */) {
+                return mapType(source, function (t) { return getRestType(t, properties, symbol); });
+            }
+            var omitKeyType = getUnionType(ts.map(properties, getLiteralTypeFromPropertyName));
+            if (isGenericObjectType(source) || isGenericIndexType(omitKeyType)) {
+                if (omitKeyType.flags & 131072 /* Never */) {
+                    return source;
+                }
+                var pickTypeAlias = getGlobalPickSymbol();
+                var excludeTypeAlias = getGlobalExcludeSymbol();
+                if (!pickTypeAlias || !excludeTypeAlias) {
+                    return errorType;
+                }
+                var pickKeys = getTypeAliasInstantiation(excludeTypeAlias, [getIndexType(source), omitKeyType]);
+                return getTypeAliasInstantiation(pickTypeAlias, [source, pickKeys]);
+            }
+            var members = ts.createSymbolTable();
+            for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
+                var prop = _a[_i];
+                if (!isTypeAssignableTo(getLiteralTypeFromProperty(prop, 8576 /* StringOrNumberLiteralOrUnique */), omitKeyType)
+                    && !(ts.getDeclarationModifierFlagsFromSymbol(prop) & (8 /* Private */ | 16 /* Protected */))
+                    && isSpreadableProperty(prop)) {
+                    members.set(prop.escapedName, getSpreadSymbol(prop));
+                }
+            }
+            var stringIndexInfo = getIndexInfoOfType(source, 0 /* String */);
+            var numberIndexInfo = getIndexInfoOfType(source, 1 /* Number */);
+            return createAnonymousType(symbol, members, ts.emptyArray, ts.emptyArray, stringIndexInfo, numberIndexInfo);
+        }
+        // Determine the control flow type associated with a destructuring declaration or assignment. The following
+        // forms of destructuring are possible:
+        //   let { x } = obj;  // BindingElement
+        //   let [ x ] = obj;  // BindingElement
+        //   { x } = obj;      // ShorthandPropertyAssignment
+        //   { x: v } = obj;   // PropertyAssignment
+        //   [ x ] = obj;      // Expression
+        // We construct a synthetic element access expression corresponding to 'obj.x' such that the control
+        // flow analyzer doesn't have to handle all the different syntactic forms.
+        function getFlowTypeOfDestructuring(node, declaredType) {
+            var reference = getSyntheticElementAccess(node);
+            return reference ? getFlowTypeOfReference(reference, declaredType) : declaredType;
+        }
+        function getSyntheticElementAccess(node) {
+            var parentAccess = getParentElementAccess(node);
+            if (parentAccess && parentAccess.flowNode) {
+                var propName = getDestructuringPropertyName(node);
+                if (propName) {
+                    var result = ts.createNode(190 /* ElementAccessExpression */, node.pos, node.end);
+                    result.parent = node;
+                    result.expression = parentAccess;
+                    var literal = ts.createNode(10 /* StringLiteral */, node.pos, node.end);
+                    literal.parent = result;
+                    literal.text = propName;
+                    result.argumentExpression = literal;
+                    result.flowNode = parentAccess.flowNode;
+                    return result;
+                }
+            }
+        }
+        function getParentElementAccess(node) {
+            var ancestor = node.parent.parent;
+            switch (ancestor.kind) {
+                case 186 /* BindingElement */:
+                case 275 /* PropertyAssignment */:
+                    return getSyntheticElementAccess(ancestor);
+                case 187 /* ArrayLiteralExpression */:
+                    return getSyntheticElementAccess(node.parent);
+                case 237 /* VariableDeclaration */:
+                    return ancestor.initializer;
+                case 204 /* BinaryExpression */:
+                    return ancestor.right;
+            }
+        }
+        function getDestructuringPropertyName(node) {
+            var parent = node.parent;
+            if (node.kind === 186 /* BindingElement */ && parent.kind === 184 /* ObjectBindingPattern */) {
+                return getLiteralPropertyNameText(node.propertyName || node.name);
+            }
+            if (node.kind === 275 /* PropertyAssignment */ || node.kind === 276 /* ShorthandPropertyAssignment */) {
+                return getLiteralPropertyNameText(node.name);
+            }
+            return "" + parent.elements.indexOf(node);
+        }
+        function getLiteralPropertyNameText(name) {
+            var type = getLiteralTypeFromPropertyName(name);
+            return type.flags & (128 /* StringLiteral */ | 256 /* NumberLiteral */) ? "" + type.value : undefined;
+        }
+        /** Return the inferred type for a binding element */
+        function getTypeForBindingElement(declaration) {
+            var pattern = declaration.parent;
+            var parentType = getTypeForBindingElementParent(pattern.parent);
+            // If parent has the unknown (error) type, then so does this binding element
+            if (parentType === errorType) {
+                return errorType;
+            }
+            // If no type was specified or inferred for parent,
+            // infer from the initializer of the binding element if one is present.
+            // Otherwise, go with the undefined type of the parent.
+            if (!parentType) {
+                return declaration.initializer ? checkDeclarationInitializer(declaration) : parentType;
+            }
+            if (isTypeAny(parentType)) {
+                return parentType;
+            }
+            // Relax null check on ambient destructuring parameters, since the parameters have no implementation and are just documentation
+            if (strictNullChecks && declaration.flags & 4194304 /* Ambient */ && ts.isParameterDeclaration(declaration)) {
+                parentType = getNonNullableType(parentType);
+            }
+            var type;
+            if (pattern.kind === 184 /* ObjectBindingPattern */) {
+                if (declaration.dotDotDotToken) {
+                    if (parentType.flags & 2 /* Unknown */ || !isValidSpreadType(parentType)) {
+                        error(declaration, ts.Diagnostics.Rest_types_may_only_be_created_from_object_types);
+                        return errorType;
+                    }
+                    var literalMembers = [];
+                    for (var _i = 0, _a = pattern.elements; _i < _a.length; _i++) {
+                        var element = _a[_i];
+                        if (!element.dotDotDotToken) {
+                            literalMembers.push(element.propertyName || element.name);
+                        }
+                    }
+                    type = getRestType(parentType, literalMembers, declaration.symbol);
+                }
+                else {
+                    // Use explicitly specified property name ({ p: xxx } form), or otherwise the implied name ({ p } form)
+                    var name = declaration.propertyName || declaration.name;
+                    var indexType = getLiteralTypeFromPropertyName(name);
+                    var declaredType = getConstraintForLocation(getIndexedAccessType(parentType, indexType, name), declaration.name);
+                    type = getFlowTypeOfDestructuring(declaration, declaredType);
+                }
+            }
+            else {
+                // This elementType will be used if the specific property corresponding to this index is not
+                // present (aka the tuple element property). This call also checks that the parentType is in
+                // fact an iterable or array (depending on target language).
+                var elementType = checkIteratedTypeOrElementType(parentType, pattern, /*allowStringInput*/ false, /*allowAsyncIterables*/ false);
+                var index_1 = pattern.elements.indexOf(declaration);
+                if (declaration.dotDotDotToken) {
+                    // If the parent is a tuple type, the rest element has a tuple type of the
+                    // remaining tuple element types. Otherwise, the rest element has an array type with same
+                    // element type as the parent type.
+                    type = everyType(parentType, isTupleType) ?
+                        mapType(parentType, function (t) { return sliceTupleType(t, index_1); }) :
+                        createArrayType(elementType);
+                }
+                else if (isArrayLikeType(parentType)) {
+                    var indexType = getLiteralType(index_1);
+                    var declaredType = getConstraintForLocation(getIndexedAccessType(parentType, indexType, declaration.name), declaration.name);
+                    type = getFlowTypeOfDestructuring(declaration, declaredType);
+                }
+                else {
+                    type = elementType;
+                }
+            }
+            // In strict null checking mode, if a default value of a non-undefined type is specified, remove
+            // undefined from the final type.
+            if (strictNullChecks && declaration.initializer && !(getFalsyFlags(checkDeclarationInitializer(declaration)) & 32768 /* Undefined */)) {
+                type = getTypeWithFacts(type, 524288 /* NEUndefined */);
+            }
+            return declaration.initializer && !ts.getEffectiveTypeAnnotationNode(ts.walkUpBindingElementsAndPatterns(declaration)) ?
+                getUnionType([type, checkDeclarationInitializer(declaration)], 2 /* Subtype */) :
+                type;
+        }
+        function getTypeForDeclarationFromJSDocComment(declaration) {
+            var jsdocType = ts.getJSDocType(declaration);
+            if (jsdocType) {
+                return getTypeFromTypeNode(jsdocType);
+            }
+            return undefined;
+        }
+        function isNullOrUndefined(node) {
+            var expr = ts.skipParentheses(node);
+            return expr.kind === 96 /* NullKeyword */ || expr.kind === 72 /* Identifier */ && getResolvedSymbol(expr) === undefinedSymbol;
+        }
+        function isEmptyArrayLiteral(node) {
+            var expr = ts.skipParentheses(node);
+            return expr.kind === 187 /* ArrayLiteralExpression */ && expr.elements.length === 0;
+        }
+        function addOptionality(type, optional) {
+            if (optional === void 0) { optional = true; }
+            return strictNullChecks && optional ? getOptionalType(type) : type;
+        }
+        // Return the inferred type for a variable, parameter, or property declaration
+        function getTypeForVariableLikeDeclaration(declaration, includeOptionality) {
+            // A variable declared in a for..in statement is of type string, or of type keyof T when the
+            // right hand expression is of a type parameter type.
+            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 226 /* ForInStatement */) {
+                var indexType = getIndexType(getNonNullableTypeIfNeeded(checkExpression(declaration.parent.parent.expression)));
+                return indexType.flags & (262144 /* TypeParameter */ | 4194304 /* Index */) ? getExtractStringType(indexType) : stringType;
+            }
+            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 227 /* ForOfStatement */) {
+                // checkRightHandSideOfForOf will return undefined if the for-of expression type was
+                // missing properties/signatures required to get its iteratedType (like
+                // [Symbol.iterator] or next). This may be because we accessed properties from anyType,
+                // or it may have led to an error inside getElementTypeOfIterable.
+                var forOfStatement = declaration.parent.parent;
+                return checkRightHandSideOfForOf(forOfStatement.expression, forOfStatement.awaitModifier) || anyType;
+            }
+            if (ts.isBindingPattern(declaration.parent)) {
+                return getTypeForBindingElement(declaration);
+            }
+            var isOptional = includeOptionality && (ts.isParameter(declaration) && isJSDocOptionalParameter(declaration)
+                || !ts.isBindingElement(declaration) && !ts.isVariableDeclaration(declaration) && !!declaration.questionToken);
+            // Use type from type annotation if one is present
+            var declaredType = tryGetTypeFromEffectiveTypeNode(declaration);
+            if (declaredType) {
+                return addOptionality(declaredType, isOptional);
+            }
+            if ((noImplicitAny || ts.isInJSFile(declaration)) &&
+                declaration.kind === 237 /* VariableDeclaration */ && !ts.isBindingPattern(declaration.name) &&
+                !(ts.getCombinedModifierFlags(declaration) & 1 /* Export */) && !(declaration.flags & 4194304 /* Ambient */)) {
+                // If --noImplicitAny is on or the declaration is in a Javascript file,
+                // use control flow tracked 'any' type for non-ambient, non-exported var or let variables with no
+                // initializer or a 'null' or 'undefined' initializer.
+                if (!(ts.getCombinedNodeFlags(declaration) & 2 /* Const */) && (!declaration.initializer || isNullOrUndefined(declaration.initializer))) {
+                    return autoType;
+                }
+                // Use control flow tracked 'any[]' type for non-ambient, non-exported variables with an empty array
+                // literal initializer.
+                if (declaration.initializer && isEmptyArrayLiteral(declaration.initializer)) {
+                    return autoArrayType;
+                }
+            }
+            if (declaration.kind === 151 /* Parameter */) {
+                var func = declaration.parent;
+                // For a parameter of a set accessor, use the type of the get accessor if one is present
+                if (func.kind === 159 /* SetAccessor */ && !hasNonBindableDynamicName(func)) {
+                    var getter = ts.getDeclarationOfKind(getSymbolOfNode(declaration.parent), 158 /* GetAccessor */);
+                    if (getter) {
+                        var getterSignature = getSignatureFromDeclaration(getter);
+                        var thisParameter = getAccessorThisParameter(func);
+                        if (thisParameter && declaration === thisParameter) {
+                            // Use the type from the *getter*
+                            ts.Debug.assert(!thisParameter.type);
+                            return getTypeOfSymbol(getterSignature.thisParameter);
+                        }
+                        return getReturnTypeOfSignature(getterSignature);
+                    }
+                }
+                if (ts.isInJSFile(declaration)) {
+                    var typeTag = ts.getJSDocType(func);
+                    if (typeTag && ts.isFunctionTypeNode(typeTag)) {
+                        return getTypeAtPosition(getSignatureFromDeclaration(typeTag), func.parameters.indexOf(declaration));
+                    }
+                }
+                // Use contextual parameter type if one is available
+                var type = declaration.symbol.escapedName === "this" /* This */ ? getContextualThisParameterType(func) : getContextuallyTypedParameterType(declaration);
+                if (type) {
+                    return addOptionality(type, isOptional);
+                }
+            }
+            else if (ts.isInJSFile(declaration)) {
+                var containerObjectType = getJSContainerObjectType(declaration, getSymbolOfNode(declaration), ts.getDeclaredExpandoInitializer(declaration));
+                if (containerObjectType) {
+                    return containerObjectType;
+                }
+            }
+            // Use the type of the initializer expression if one is present
+            if (declaration.initializer) {
+                var type = checkDeclarationInitializer(declaration);
+                return addOptionality(type, isOptional);
+            }
+            if (ts.isJsxAttribute(declaration)) {
+                // if JSX attribute doesn't have initializer, by default the attribute will have boolean value of true.
+                // I.e <Elem attr /> is sugar for <Elem attr={true} />
+                return trueType;
+            }
+            // If the declaration specifies a binding pattern, use the type implied by the binding pattern
+            if (ts.isBindingPattern(declaration.name)) {
+                return getTypeFromBindingPattern(declaration.name, /*includePatternInType*/ false, /*reportErrors*/ true);
+            }
+            // No type specified and nothing can be inferred
+            return undefined;
+        }
+        function getWidenedTypeFromAssignmentDeclaration(symbol, resolvedSymbol) {
+            // function/class/{} initializers are themselves containers, so they won't merge in the same way as other initializers
+            var container = ts.getAssignedExpandoInitializer(symbol.valueDeclaration);
+            if (container) {
+                var tag = ts.getJSDocTypeTag(container);
+                if (tag && tag.typeExpression) {
+                    return getTypeFromTypeNode(tag.typeExpression);
+                }
+                var containerObjectType = getJSContainerObjectType(symbol.valueDeclaration, symbol, container);
+                return containerObjectType || getWidenedLiteralType(checkExpressionCached(container));
+            }
+            var definedInConstructor = false;
+            var definedInMethod = false;
+            var jsdocType;
+            var types;
+            for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                var declaration = _a[_i];
+                var expression = (ts.isBinaryExpression(declaration) || ts.isCallExpression(declaration)) ? declaration :
+                    ts.isPropertyAccessExpression(declaration) ? ts.isBinaryExpression(declaration.parent) ? declaration.parent : declaration :
+                        undefined;
+                if (!expression) {
+                    return errorType;
+                }
+                var kind = ts.isPropertyAccessExpression(expression) ? ts.getAssignmentDeclarationPropertyAccessKind(expression) : ts.getAssignmentDeclarationKind(expression);
+                if (kind === 4 /* ThisProperty */) {
+                    if (isDeclarationInConstructor(expression)) {
+                        definedInConstructor = true;
+                    }
+                    else {
+                        definedInMethod = true;
+                    }
+                }
+                if (!ts.isCallExpression(expression)) {
+                    jsdocType = getJSDocTypeFromAssignmentDeclaration(jsdocType, expression, symbol, declaration);
+                }
+                if (!jsdocType) {
+                    (types || (types = [])).push((ts.isBinaryExpression(expression) || ts.isCallExpression(expression)) ? getInitializerTypeFromAssignmentDeclaration(symbol, resolvedSymbol, expression, kind) : neverType);
+                }
+            }
+            var type = jsdocType;
+            if (!type) {
+                var constructorTypes = definedInConstructor ? getConstructorDefinedThisAssignmentTypes(types, symbol.declarations) : undefined;
+                // use only the constructor types unless they were only assigned null | undefined (including widening variants)
+                if (definedInMethod) {
+                    var propType = getTypeOfAssignmentDeclarationPropertyOfBaseType(symbol);
+                    if (propType) {
+                        (constructorTypes || (constructorTypes = [])).push(propType);
+                        definedInConstructor = true;
+                    }
+                }
+                var sourceTypes = ts.some(constructorTypes, function (t) { return !!(t.flags & ~(98304 /* Nullable */ | 134217728 /* ContainsWideningType */)); }) ? constructorTypes : types; // TODO: GH#18217
+                type = getUnionType(sourceTypes, 2 /* Subtype */);
+            }
+            var widened = getWidenedType(addOptionality(type, definedInMethod && !definedInConstructor));
+            if (filterType(widened, function (t) { return !!(t.flags & ~98304 /* Nullable */); }) === neverType) {
+                reportImplicitAny(symbol.valueDeclaration, anyType);
+                return anyType;
+            }
+            return widened;
+        }
+        function getJSContainerObjectType(decl, symbol, init) {
+            if (!ts.isInJSFile(decl) || !init || !ts.isObjectLiteralExpression(init) || init.properties.length) {
+                return undefined;
+            }
+            var exports = ts.createSymbolTable();
+            while (ts.isBinaryExpression(decl) || ts.isPropertyAccessExpression(decl)) {
+                var s_1 = getSymbolOfNode(decl);
+                if (s_1 && ts.hasEntries(s_1.exports)) {
+                    mergeSymbolTable(exports, s_1.exports);
+                }
+                decl = ts.isBinaryExpression(decl) ? decl.parent : decl.parent.parent;
+            }
+            var s = getSymbolOfNode(decl);
+            if (s && ts.hasEntries(s.exports)) {
+                mergeSymbolTable(exports, s.exports);
+            }
+            var type = createAnonymousType(symbol, exports, ts.emptyArray, ts.emptyArray, undefined, undefined);
+            type.objectFlags |= 16384 /* JSLiteral */;
+            return type;
+        }
+        function getJSDocTypeFromAssignmentDeclaration(declaredType, expression, _symbol, declaration) {
+            var typeNode = ts.getJSDocType(expression.parent);
+            if (typeNode) {
+                var type = getWidenedType(getTypeFromTypeNode(typeNode));
+                if (!declaredType) {
+                    return type;
+                }
+                else if (declaredType !== errorType && type !== errorType && !isTypeIdenticalTo(declaredType, type)) {
+                    errorNextVariableOrPropertyDeclarationMustHaveSameType(declaredType, declaration, type);
+                }
+            }
+            return declaredType;
+        }
+        /** If we don't have an explicit JSDoc type, get the type from the initializer. */
+        function getInitializerTypeFromAssignmentDeclaration(symbol, resolvedSymbol, expression, kind) {
+            if (ts.isCallExpression(expression)) {
+                if (resolvedSymbol) {
+                    return getTypeOfSymbol(resolvedSymbol); // This shouldn't happen except under some hopefully forbidden merges of export assignments and object define assignments
+                }
+                var objectLitType = checkExpressionCached(expression.arguments[2]);
+                var valueType = getTypeOfPropertyOfType(objectLitType, "value");
+                if (valueType) {
+                    return valueType;
+                }
+                var getFunc = getTypeOfPropertyOfType(objectLitType, "get");
+                if (getFunc) {
+                    var getSig = getSingleCallSignature(getFunc);
+                    if (getSig) {
+                        return getReturnTypeOfSignature(getSig);
+                    }
+                }
+                var setFunc = getTypeOfPropertyOfType(objectLitType, "set");
+                if (setFunc) {
+                    var setSig = getSingleCallSignature(setFunc);
+                    if (setSig) {
+                        return getTypeOfFirstParameterOfSignature(setSig);
+                    }
+                }
+                return anyType;
+            }
+            var type = resolvedSymbol ? getTypeOfSymbol(resolvedSymbol) : getWidenedLiteralType(checkExpressionCached(expression.right));
+            if (type.flags & 524288 /* Object */ &&
+                kind === 2 /* ModuleExports */ &&
+                symbol.escapedName === "export=" /* ExportEquals */) {
+                var exportedType_1 = resolveStructuredTypeMembers(type);
+                var members_3 = ts.createSymbolTable();
+                ts.copyEntries(exportedType_1.members, members_3);
+                if (resolvedSymbol && !resolvedSymbol.exports) {
+                    resolvedSymbol.exports = ts.createSymbolTable();
+                }
+                (resolvedSymbol || symbol).exports.forEach(function (s, name) {
+                    if (members_3.has(name)) {
+                        var exportedMember = exportedType_1.members.get(name);
+                        var union = createSymbol(s.flags | exportedMember.flags, name);
+                        union.type = getUnionType([getTypeOfSymbol(s), getTypeOfSymbol(exportedMember)]);
+                        members_3.set(name, union);
+                    }
+                    else {
+                        members_3.set(name, s);
+                    }
+                });
+                var result = createAnonymousType(exportedType_1.symbol, members_3, exportedType_1.callSignatures, exportedType_1.constructSignatures, exportedType_1.stringIndexInfo, exportedType_1.numberIndexInfo);
+                result.objectFlags |= (ts.getObjectFlags(type) & 16384 /* JSLiteral */); // Propagate JSLiteral flag
+                return result;
+            }
+            if (isEmptyArrayLiteralType(type)) {
+                reportImplicitAny(expression, anyArrayType);
+                return anyArrayType;
+            }
+            return type;
+        }
+        function isDeclarationInConstructor(expression) {
+            var thisContainer = ts.getThisContainer(expression, /*includeArrowFunctions*/ false);
+            // Properties defined in a constructor (or base constructor, or javascript constructor function) don't get undefined added.
+            // Function expressions that are assigned to the prototype count as methods.
+            return thisContainer.kind === 157 /* Constructor */ ||
+                thisContainer.kind === 239 /* FunctionDeclaration */ ||
+                (thisContainer.kind === 196 /* FunctionExpression */ && !ts.isPrototypePropertyAssignment(thisContainer.parent));
+        }
+        function getConstructorDefinedThisAssignmentTypes(types, declarations) {
+            ts.Debug.assert(types.length === declarations.length);
+            return types.filter(function (_, i) {
+                var declaration = declarations[i];
+                var expression = ts.isBinaryExpression(declaration) ? declaration :
+                    ts.isBinaryExpression(declaration.parent) ? declaration.parent : undefined;
+                return expression && isDeclarationInConstructor(expression);
+            });
+        }
+        /** check for definition in base class if any declaration is in a class */
+        function getTypeOfAssignmentDeclarationPropertyOfBaseType(property) {
+            var parentDeclaration = ts.forEach(property.declarations, function (d) {
+                var parent = ts.getThisContainer(d, /*includeArrowFunctions*/ false).parent;
+                return ts.isClassLike(parent) && parent;
+            });
+            if (parentDeclaration) {
+                var classType = getDeclaredTypeOfSymbol(getSymbolOfNode(parentDeclaration));
+                var baseClassType = classType && getBaseTypes(classType)[0];
+                if (baseClassType) {
+                    return getTypeOfPropertyOfType(baseClassType, property.escapedName);
+                }
+            }
+        }
+        // Return the type implied by a binding pattern element. This is the type of the initializer of the element if
+        // one is present. Otherwise, if the element is itself a binding pattern, it is the type implied by the binding
+        // pattern. Otherwise, it is the type any.
+        function getTypeFromBindingElement(element, includePatternInType, reportErrors) {
+            if (element.initializer) {
+                return addOptionality(checkDeclarationInitializer(element));
+            }
+            if (ts.isBindingPattern(element.name)) {
+                return getTypeFromBindingPattern(element.name, includePatternInType, reportErrors);
+            }
+            if (reportErrors && !declarationBelongsToPrivateAmbientMember(element)) {
+                reportImplicitAny(element, anyType);
+            }
+            return anyType;
+        }
+        // Return the type implied by an object binding pattern
+        function getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors) {
+            var members = ts.createSymbolTable();
+            var stringIndexInfo;
+            var objectFlags = 128 /* ObjectLiteral */;
+            ts.forEach(pattern.elements, function (e) {
+                var name = e.propertyName || e.name;
+                if (e.dotDotDotToken) {
+                    stringIndexInfo = createIndexInfo(anyType, /*isReadonly*/ false);
+                    return;
+                }
+                var exprType = getLiteralTypeFromPropertyName(name);
+                if (!isTypeUsableAsPropertyName(exprType)) {
+                    // do not include computed properties in the implied type
+                    objectFlags |= 512 /* ObjectLiteralPatternWithComputedProperties */;
+                    return;
+                }
+                var text = getPropertyNameFromType(exprType);
+                var flags = 4 /* Property */ | (e.initializer ? 16777216 /* Optional */ : 0);
+                var symbol = createSymbol(flags, text);
+                symbol.type = getTypeFromBindingElement(e, includePatternInType, reportErrors);
+                symbol.bindingElement = e;
+                members.set(symbol.escapedName, symbol);
+            });
+            var result = createAnonymousType(undefined, members, ts.emptyArray, ts.emptyArray, stringIndexInfo, undefined);
+            result.flags |= 268435456 /* ContainsObjectLiteral */;
+            result.objectFlags |= objectFlags;
+            if (includePatternInType) {
+                result.pattern = pattern;
+            }
+            return result;
+        }
+        // Return the type implied by an array binding pattern
+        function getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors) {
+            var elements = pattern.elements;
+            var lastElement = ts.lastOrUndefined(elements);
+            var hasRestElement = !!(lastElement && lastElement.kind === 186 /* BindingElement */ && lastElement.dotDotDotToken);
+            if (elements.length === 0 || elements.length === 1 && hasRestElement) {
+                return languageVersion >= 2 /* ES2015 */ ? createIterableType(anyType) : anyArrayType;
+            }
+            var elementTypes = ts.map(elements, function (e) { return ts.isOmittedExpression(e) ? anyType : getTypeFromBindingElement(e, includePatternInType, reportErrors); });
+            var minLength = ts.findLastIndex(elements, function (e) { return !ts.isOmittedExpression(e) && !hasDefaultValue(e); }, elements.length - (hasRestElement ? 2 : 1)) + 1;
+            var result = createTupleType(elementTypes, minLength, hasRestElement);
+            if (includePatternInType) {
+                result = cloneTypeReference(result);
+                result.pattern = pattern;
+            }
+            return result;
+        }
+        // Return the type implied by a binding pattern. This is the type implied purely by the binding pattern itself
+        // and without regard to its context (i.e. without regard any type annotation or initializer associated with the
+        // declaration in which the binding pattern is contained). For example, the implied type of [x, y] is [any, any]
+        // and the implied type of { x, y: z = 1 } is { x: any; y: number; }. The type implied by a binding pattern is
+        // used as the contextual type of an initializer associated with the binding pattern. Also, for a destructuring
+        // parameter with no type annotation or initializer, the type implied by the binding pattern becomes the type of
+        // the parameter.
+        function getTypeFromBindingPattern(pattern, includePatternInType, reportErrors) {
+            if (includePatternInType === void 0) { includePatternInType = false; }
+            if (reportErrors === void 0) { reportErrors = false; }
+            return pattern.kind === 184 /* ObjectBindingPattern */
+                ? getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors)
+                : getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors);
+        }
+        // Return the type associated with a variable, parameter, or property declaration. In the simple case this is the type
+        // specified in a type annotation or inferred from an initializer. However, in the case of a destructuring declaration it
+        // is a bit more involved. For example:
+        //
+        //   var [x, s = ""] = [1, "one"];
+        //
+        // Here, the array literal [1, "one"] is contextually typed by the type [any, string], which is the implied type of the
+        // binding pattern [x, s = ""]. Because the contextual type is a tuple type, the resulting type of [1, "one"] is the
+        // tuple type [number, string]. Thus, the type inferred for 'x' is number and the type inferred for 's' is string.
+        function getWidenedTypeForVariableLikeDeclaration(declaration, reportErrors) {
+            return widenTypeForVariableLikeDeclaration(getTypeForVariableLikeDeclaration(declaration, /*includeOptionality*/ true), declaration, reportErrors);
+        }
+        function widenTypeForVariableLikeDeclaration(type, declaration, reportErrors) {
+            if (type) {
+                if (reportErrors) {
+                    reportErrorsFromWidening(declaration, type);
+                }
+                // always widen a 'unique symbol' type if the type was created for a different declaration.
+                if (type.flags & 8192 /* UniqueESSymbol */ && (ts.isBindingElement(declaration) || !declaration.type) && type.symbol !== getSymbolOfNode(declaration)) {
+                    type = esSymbolType;
+                }
+                return getWidenedType(type);
+            }
+            // Rest parameters default to type any[], other parameters default to type any
+            type = ts.isParameter(declaration) && declaration.dotDotDotToken ? anyArrayType : anyType;
+            // Report implicit any errors unless this is a private property within an ambient declaration
+            if (reportErrors) {
+                if (!declarationBelongsToPrivateAmbientMember(declaration)) {
+                    reportImplicitAny(declaration, type);
+                }
+            }
+            return type;
+        }
+        function declarationBelongsToPrivateAmbientMember(declaration) {
+            var root = ts.getRootDeclaration(declaration);
+            var memberDeclaration = root.kind === 151 /* Parameter */ ? root.parent : root;
+            return isPrivateWithinAmbient(memberDeclaration);
+        }
+        function tryGetTypeFromEffectiveTypeNode(declaration) {
+            var typeNode = ts.getEffectiveTypeAnnotationNode(declaration);
+            if (typeNode) {
+                return getTypeFromTypeNode(typeNode);
+            }
+        }
+        function getTypeOfVariableOrParameterOrProperty(symbol) {
+            var links = getSymbolLinks(symbol);
+            return links.type || (links.type = getTypeOfVariableOrParameterOrPropertyWorker(symbol));
+        }
+        function getTypeOfVariableOrParameterOrPropertyWorker(symbol) {
+            // Handle prototype property
+            if (symbol.flags & 4194304 /* Prototype */) {
+                return getTypeOfPrototypeProperty(symbol);
+            }
+            // CommonsJS require and module both have type any.
+            if (symbol === requireSymbol) {
+                return anyType;
+            }
+            if (symbol.flags & 134217728 /* ModuleExports */) {
+                var fileSymbol = getSymbolOfNode(ts.getSourceFileOfNode(symbol.valueDeclaration));
+                var members = ts.createSymbolTable();
+                members.set("exports", fileSymbol);
+                return createAnonymousType(symbol, members, ts.emptyArray, ts.emptyArray, undefined, undefined);
+            }
+            // Handle catch clause variables
+            var declaration = symbol.valueDeclaration;
+            if (ts.isCatchClauseVariableDeclarationOrBindingElement(declaration)) {
+                return anyType;
+            }
+            // Handle export default expressions
+            if (ts.isSourceFile(declaration) && ts.isJsonSourceFile(declaration)) {
+                if (!declaration.statements.length) {
+                    return emptyObjectType;
+                }
+                var type_1 = getWidenedLiteralType(checkExpression(declaration.statements[0].expression));
+                if (type_1.flags & 524288 /* Object */) {
+                    return getRegularTypeOfObjectLiteral(type_1);
+                }
+                return type_1;
+            }
+            if (declaration.kind === 254 /* ExportAssignment */) {
+                return widenTypeForVariableLikeDeclaration(checkExpressionCached(declaration.expression), declaration);
+            }
+            // Handle variable, parameter or property
+            if (!pushTypeResolution(symbol, 0 /* Type */)) {
+                // Symbol is property of some kind that is merged with something - should use `getTypeOfFuncClassEnumModule` and not `getTypeOfVariableOrParameterOrProperty`
+                if (symbol.flags & 512 /* ValueModule */) {
+                    return getTypeOfFuncClassEnumModule(symbol);
+                }
+                return errorType;
+            }
+            var type;
+            if (ts.isInJSFile(declaration) &&
+                (ts.isCallExpression(declaration) || ts.isBinaryExpression(declaration) || ts.isPropertyAccessExpression(declaration) && ts.isBinaryExpression(declaration.parent))) {
+                type = getWidenedTypeFromAssignmentDeclaration(symbol);
+            }
+            else if (ts.isJSDocPropertyLikeTag(declaration)
+                || ts.isPropertyAccessExpression(declaration)
+                || ts.isIdentifier(declaration)
+                || ts.isClassDeclaration(declaration)
+                || ts.isFunctionDeclaration(declaration)
+                || (ts.isMethodDeclaration(declaration) && !ts.isObjectLiteralMethod(declaration))
+                || ts.isMethodSignature(declaration)
+                || ts.isSourceFile(declaration)) {
+                // Symbol is property of some kind that is merged with something - should use `getTypeOfFuncClassEnumModule` and not `getTypeOfVariableOrParameterOrProperty`
+                if (symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 384 /* Enum */ | 512 /* ValueModule */)) {
+                    return getTypeOfFuncClassEnumModule(symbol);
+                }
+                type = ts.isBinaryExpression(declaration.parent) ?
+                    getWidenedTypeFromAssignmentDeclaration(symbol) :
+                    tryGetTypeFromEffectiveTypeNode(declaration) || anyType;
+            }
+            else if (ts.isPropertyAssignment(declaration)) {
+                type = tryGetTypeFromEffectiveTypeNode(declaration) || checkPropertyAssignment(declaration);
+            }
+            else if (ts.isJsxAttribute(declaration)) {
+                type = tryGetTypeFromEffectiveTypeNode(declaration) || checkJsxAttribute(declaration);
+            }
+            else if (ts.isShorthandPropertyAssignment(declaration)) {
+                type = tryGetTypeFromEffectiveTypeNode(declaration) || checkExpressionForMutableLocation(declaration.name, 0 /* Normal */);
+            }
+            else if (ts.isObjectLiteralMethod(declaration)) {
+                type = tryGetTypeFromEffectiveTypeNode(declaration) || checkObjectLiteralMethod(declaration, 0 /* Normal */);
+            }
+            else if (ts.isParameter(declaration)
+                || ts.isPropertyDeclaration(declaration)
+                || ts.isPropertySignature(declaration)
+                || ts.isVariableDeclaration(declaration)
+                || ts.isBindingElement(declaration)) {
+                type = getWidenedTypeForVariableLikeDeclaration(declaration, /*includeOptionality*/ true);
+            }
+            // getTypeOfSymbol dispatches some JS merges incorrectly because their symbol flags are not mutually exclusive.
+            // Re-dispatch based on valueDeclaration.kind instead.
+            else if (ts.isEnumDeclaration(declaration)) {
+                type = getTypeOfFuncClassEnumModule(symbol);
+            }
+            else if (ts.isEnumMember(declaration)) {
+                type = getTypeOfEnumMember(symbol);
+            }
+            else {
+                return ts.Debug.fail("Unhandled declaration kind! " + ts.Debug.showSyntaxKind(declaration) + " for " + ts.Debug.showSymbol(symbol));
+            }
+            if (!popTypeResolution()) {
+                // Symbol is property of some kind that is merged with something - should use `getTypeOfFuncClassEnumModule` and not `getTypeOfVariableOrParameterOrProperty`
+                if (symbol.flags & 512 /* ValueModule */) {
+                    return getTypeOfFuncClassEnumModule(symbol);
+                }
+                type = reportCircularityError(symbol);
+            }
+            return type;
+        }
+        function getAnnotatedAccessorTypeNode(accessor) {
+            if (accessor) {
+                if (accessor.kind === 158 /* GetAccessor */) {
+                    var getterTypeAnnotation = ts.getEffectiveReturnTypeNode(accessor);
+                    return getterTypeAnnotation;
+                }
+                else {
+                    var setterTypeAnnotation = ts.getEffectiveSetAccessorTypeAnnotationNode(accessor);
+                    return setterTypeAnnotation;
+                }
+            }
+            return undefined;
+        }
+        function getAnnotatedAccessorType(accessor) {
+            var node = getAnnotatedAccessorTypeNode(accessor);
+            return node && getTypeFromTypeNode(node);
+        }
+        function getAnnotatedAccessorThisParameter(accessor) {
+            var parameter = getAccessorThisParameter(accessor);
+            return parameter && parameter.symbol;
+        }
+        function getThisTypeOfDeclaration(declaration) {
+            return getThisTypeOfSignature(getSignatureFromDeclaration(declaration));
+        }
+        function getTypeOfAccessors(symbol) {
+            var links = getSymbolLinks(symbol);
+            return links.type || (links.type = getTypeOfAccessorsWorker(symbol));
+        }
+        function getTypeOfAccessorsWorker(symbol) {
+            var getter = ts.getDeclarationOfKind(symbol, 158 /* GetAccessor */);
+            var setter = ts.getDeclarationOfKind(symbol, 159 /* SetAccessor */);
+            if (getter && ts.isInJSFile(getter)) {
+                var jsDocType = getTypeForDeclarationFromJSDocComment(getter);
+                if (jsDocType) {
+                    return jsDocType;
+                }
+            }
+            if (!pushTypeResolution(symbol, 0 /* Type */)) {
+                return errorType;
+            }
+            var type;
+            // First try to see if the user specified a return type on the get-accessor.
+            var getterReturnType = getAnnotatedAccessorType(getter);
+            if (getterReturnType) {
+                type = getterReturnType;
+            }
+            else {
+                // If the user didn't specify a return type, try to use the set-accessor's parameter type.
+                var setterParameterType = getAnnotatedAccessorType(setter);
+                if (setterParameterType) {
+                    type = setterParameterType;
+                }
+                else {
+                    // If there are no specified types, try to infer it from the body of the get accessor if it exists.
+                    if (getter && getter.body) {
+                        type = getReturnTypeFromBody(getter);
+                    }
+                    // Otherwise, fall back to 'any'.
+                    else {
+                        if (setter) {
+                            errorOrSuggestion(noImplicitAny, setter, ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation, symbolToString(symbol));
+                        }
+                        else {
+                            ts.Debug.assert(!!getter, "there must existed getter as we are current checking either setter or getter in this function");
+                            errorOrSuggestion(noImplicitAny, getter, ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation, symbolToString(symbol));
+                        }
+                        type = anyType;
+                    }
+                }
+            }
+            if (!popTypeResolution()) {
+                type = anyType;
+                if (noImplicitAny) {
+                    var getter_1 = ts.getDeclarationOfKind(symbol, 158 /* GetAccessor */);
+                    error(getter_1, ts.Diagnostics._0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions, symbolToString(symbol));
+                }
+            }
+            return type;
+        }
+        function getBaseTypeVariableOfClass(symbol) {
+            var baseConstructorType = getBaseConstructorTypeOfClass(getDeclaredTypeOfClassOrInterface(symbol));
+            return baseConstructorType.flags & 8650752 /* TypeVariable */ ? baseConstructorType : undefined;
+        }
+        function getTypeOfFuncClassEnumModule(symbol) {
+            var links = getSymbolLinks(symbol);
+            var originalLinks = links;
+            if (!links.type) {
+                var jsDeclaration = ts.getDeclarationOfExpando(symbol.valueDeclaration);
+                if (jsDeclaration) {
+                    var jsSymbol = getSymbolOfNode(jsDeclaration);
+                    if (jsSymbol && (ts.hasEntries(jsSymbol.exports) || ts.hasEntries(jsSymbol.members))) {
+                        symbol = cloneSymbol(symbol);
+                        // note:we overwrite links because we just cloned the symbol
+                        links = symbol;
+                        if (ts.hasEntries(jsSymbol.exports)) {
+                            symbol.exports = symbol.exports || ts.createSymbolTable();
+                            mergeSymbolTable(symbol.exports, jsSymbol.exports);
+                        }
+                        if (ts.hasEntries(jsSymbol.members)) {
+                            symbol.members = symbol.members || ts.createSymbolTable();
+                            mergeSymbolTable(symbol.members, jsSymbol.members);
+                        }
+                    }
+                }
+                originalLinks.type = links.type = getTypeOfFuncClassEnumModuleWorker(symbol);
+            }
+            return links.type;
+        }
+        function getTypeOfFuncClassEnumModuleWorker(symbol) {
+            var declaration = symbol.valueDeclaration;
+            if (symbol.flags & 1536 /* Module */ && ts.isShorthandAmbientModuleSymbol(symbol)) {
+                return anyType;
+            }
+            else if (declaration.kind === 204 /* BinaryExpression */ ||
+                declaration.kind === 189 /* PropertyAccessExpression */ && declaration.parent.kind === 204 /* BinaryExpression */) {
+                return getWidenedTypeFromAssignmentDeclaration(symbol);
+            }
+            else if (symbol.flags & 512 /* ValueModule */ && declaration && ts.isSourceFile(declaration) && declaration.commonJsModuleIndicator) {
+                var resolvedModule = resolveExternalModuleSymbol(symbol);
+                if (resolvedModule !== symbol) {
+                    if (!pushTypeResolution(symbol, 0 /* Type */)) {
+                        return errorType;
+                    }
+                    var exportEquals = getMergedSymbol(symbol.exports.get("export=" /* ExportEquals */));
+                    var type_2 = getWidenedTypeFromAssignmentDeclaration(exportEquals, exportEquals === resolvedModule ? undefined : resolvedModule);
+                    if (!popTypeResolution()) {
+                        return reportCircularityError(symbol);
+                    }
+                    return type_2;
+                }
+            }
+            var type = createObjectType(16 /* Anonymous */, symbol);
+            if (symbol.flags & 32 /* Class */) {
+                var baseTypeVariable = getBaseTypeVariableOfClass(symbol);
+                return baseTypeVariable ? getIntersectionType([type, baseTypeVariable]) : type;
+            }
+            else {
+                return strictNullChecks && symbol.flags & 16777216 /* Optional */ ? getOptionalType(type) : type;
+            }
+        }
+        function getTypeOfEnumMember(symbol) {
+            var links = getSymbolLinks(symbol);
+            return links.type || (links.type = getDeclaredTypeOfEnumMember(symbol));
+        }
+        function getTypeOfAlias(symbol) {
+            var links = getSymbolLinks(symbol);
+            if (!links.type) {
+                var targetSymbol = resolveAlias(symbol);
+                // It only makes sense to get the type of a value symbol. If the result of resolving
+                // the alias is not a value, then it has no type. To get the type associated with a
+                // type symbol, call getDeclaredTypeOfSymbol.
+                // This check is important because without it, a call to getTypeOfSymbol could end
+                // up recursively calling getTypeOfAlias, causing a stack overflow.
+                links.type = targetSymbol.flags & 67220415 /* Value */
+                    ? getTypeOfSymbol(targetSymbol)
+                    : errorType;
+            }
+            return links.type;
+        }
+        function getTypeOfInstantiatedSymbol(symbol) {
+            var links = getSymbolLinks(symbol);
+            if (!links.type) {
+                if (!pushTypeResolution(symbol, 0 /* Type */)) {
+                    return links.type = errorType;
+                }
+                var type = instantiateType(getTypeOfSymbol(links.target), links.mapper);
+                if (!popTypeResolution()) {
+                    type = reportCircularityError(symbol);
+                }
+                links.type = type;
+            }
+            return links.type;
+        }
+        function reportCircularityError(symbol) {
+            // Check if variable has type annotation that circularly references the variable itself
+            if (ts.getEffectiveTypeAnnotationNode(symbol.valueDeclaration)) {
+                error(symbol.valueDeclaration, ts.Diagnostics._0_is_referenced_directly_or_indirectly_in_its_own_type_annotation, symbolToString(symbol));
+                return errorType;
+            }
+            // Otherwise variable has initializer that circularly references the variable itself
+            if (noImplicitAny) {
+                error(symbol.valueDeclaration, ts.Diagnostics._0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer, symbolToString(symbol));
+            }
+            return anyType;
+        }
+        function getTypeOfSymbol(symbol) {
+            if (ts.getCheckFlags(symbol) & 1 /* Instantiated */) {
+                return getTypeOfInstantiatedSymbol(symbol);
+            }
+            if (ts.getCheckFlags(symbol) & 4096 /* ReverseMapped */) {
+                return getTypeOfReverseMappedSymbol(symbol);
+            }
+            if (symbol.flags & (3 /* Variable */ | 4 /* Property */)) {
+                return getTypeOfVariableOrParameterOrProperty(symbol);
+            }
+            if (symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 384 /* Enum */ | 512 /* ValueModule */)) {
+                return getTypeOfFuncClassEnumModule(symbol);
+            }
+            if (symbol.flags & 8 /* EnumMember */) {
+                return getTypeOfEnumMember(symbol);
+            }
+            if (symbol.flags & 98304 /* Accessor */) {
+                return getTypeOfAccessors(symbol);
+            }
+            if (symbol.flags & 2097152 /* Alias */) {
+                return getTypeOfAlias(symbol);
+            }
+            return errorType;
+        }
+        function isReferenceToType(type, target) {
+            return type !== undefined
+                && target !== undefined
+                && (ts.getObjectFlags(type) & 4 /* Reference */) !== 0
+                && type.target === target;
+        }
+        function getTargetType(type) {
+            return ts.getObjectFlags(type) & 4 /* Reference */ ? type.target : type;
+        }
+        // TODO: GH#18217 If `checkBase` is undefined, we should not call this because this will always return false.
+        function hasBaseType(type, checkBase) {
+            return check(type);
+            function check(type) {
+                if (ts.getObjectFlags(type) & (3 /* ClassOrInterface */ | 4 /* Reference */)) {
+                    var target = getTargetType(type);
+                    return target === checkBase || ts.some(getBaseTypes(target), check);
+                }
+                else if (type.flags & 2097152 /* Intersection */) {
+                    return ts.some(type.types, check);
+                }
+                return false;
+            }
+        }
+        // Appends the type parameters given by a list of declarations to a set of type parameters and returns the resulting set.
+        // The function allocates a new array if the input type parameter set is undefined, but otherwise it modifies the set
+        // in-place and returns the same array.
+        function appendTypeParameters(typeParameters, declarations) {
+            for (var _i = 0, declarations_2 = declarations; _i < declarations_2.length; _i++) {
+                var declaration = declarations_2[_i];
+                typeParameters = ts.appendIfUnique(typeParameters, getDeclaredTypeOfTypeParameter(getSymbolOfNode(declaration)));
+            }
+            return typeParameters;
+        }
+        // Return the outer type parameters of a node or undefined if the node has no outer type parameters.
+        function getOuterTypeParameters(node, includeThisTypes) {
+            while (true) {
+                node = node.parent; // TODO: GH#18217 Use SourceFile kind check instead
+                if (!node) {
+                    return undefined;
+                }
+                switch (node.kind) {
+                    case 240 /* ClassDeclaration */:
+                    case 209 /* ClassExpression */:
+                    case 241 /* InterfaceDeclaration */:
+                    case 160 /* CallSignature */:
+                    case 161 /* ConstructSignature */:
+                    case 155 /* MethodSignature */:
+                    case 165 /* FunctionType */:
+                    case 166 /* ConstructorType */:
+                    case 289 /* JSDocFunctionType */:
+                    case 239 /* FunctionDeclaration */:
+                    case 156 /* MethodDeclaration */:
+                    case 196 /* FunctionExpression */:
+                    case 197 /* ArrowFunction */:
+                    case 242 /* TypeAliasDeclaration */:
+                    case 303 /* JSDocTemplateTag */:
+                    case 304 /* JSDocTypedefTag */:
+                    case 297 /* JSDocCallbackTag */:
+                    case 181 /* MappedType */:
+                    case 175 /* ConditionalType */:
+                        var outerTypeParameters = getOuterTypeParameters(node, includeThisTypes);
+                        if (node.kind === 181 /* MappedType */) {
+                            return ts.append(outerTypeParameters, getDeclaredTypeOfTypeParameter(getSymbolOfNode(node.typeParameter)));
+                        }
+                        else if (node.kind === 175 /* ConditionalType */) {
+                            return ts.concatenate(outerTypeParameters, getInferTypeParameters(node));
+                        }
+                        var outerAndOwnTypeParameters = appendTypeParameters(outerTypeParameters, ts.getEffectiveTypeParameterDeclarations(node));
+                        var thisType = includeThisTypes &&
+                            (node.kind === 240 /* ClassDeclaration */ || node.kind === 209 /* ClassExpression */ || node.kind === 241 /* InterfaceDeclaration */) &&
+                            getDeclaredTypeOfClassOrInterface(getSymbolOfNode(node)).thisType;
+                        return thisType ? ts.append(outerAndOwnTypeParameters, thisType) : outerAndOwnTypeParameters;
+                }
+            }
+        }
+        // The outer type parameters are those defined by enclosing generic classes, methods, or functions.
+        function getOuterTypeParametersOfClassOrInterface(symbol) {
+            var declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 241 /* InterfaceDeclaration */);
+            return getOuterTypeParameters(declaration);
+        }
+        // The local type parameters are the combined set of type parameters from all declarations of the class,
+        // interface, or type alias.
+        function getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol) {
+            var result;
+            for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                var node = _a[_i];
+                if (node.kind === 241 /* InterfaceDeclaration */ ||
+                    node.kind === 240 /* ClassDeclaration */ ||
+                    node.kind === 209 /* ClassExpression */ ||
+                    ts.isTypeAlias(node)) {
+                    var declaration = node;
+                    result = appendTypeParameters(result, ts.getEffectiveTypeParameterDeclarations(declaration));
+                }
+            }
+            return result;
+        }
+        // The full set of type parameters for a generic class or interface type consists of its outer type parameters plus
+        // its locally declared type parameters.
+        function getTypeParametersOfClassOrInterface(symbol) {
+            return ts.concatenate(getOuterTypeParametersOfClassOrInterface(symbol), getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol));
+        }
+        // A type is a mixin constructor if it has a single construct signature taking no type parameters and a single
+        // rest parameter of type any[].
+        function isMixinConstructorType(type) {
+            var signatures = getSignaturesOfType(type, 1 /* Construct */);
+            if (signatures.length === 1) {
+                var s = signatures[0];
+                return !s.typeParameters && s.parameters.length === 1 && s.hasRestParameter && getTypeOfParameter(s.parameters[0]) === anyArrayType;
+            }
+            return false;
+        }
+        function isConstructorType(type) {
+            if (isValidBaseType(type) && getSignaturesOfType(type, 1 /* Construct */).length > 0) {
+                return true;
+            }
+            if (type.flags & 8650752 /* TypeVariable */) {
+                var constraint = getBaseConstraintOfType(type);
+                return !!constraint && isValidBaseType(constraint) && isMixinConstructorType(constraint);
+            }
+            return isJSConstructorType(type);
+        }
+        function getBaseTypeNodeOfClass(type) {
+            return ts.getEffectiveBaseTypeNode(type.symbol.valueDeclaration);
+        }
+        function getConstructorsForTypeArguments(type, typeArgumentNodes, location) {
+            var typeArgCount = ts.length(typeArgumentNodes);
+            var isJavascript = ts.isInJSFile(location);
+            return ts.filter(getSignaturesOfType(type, 1 /* Construct */), function (sig) { return (isJavascript || typeArgCount >= getMinTypeArgumentCount(sig.typeParameters)) && typeArgCount <= ts.length(sig.typeParameters); });
+        }
+        function getInstantiatedConstructorsForTypeArguments(type, typeArgumentNodes, location) {
+            var signatures = getConstructorsForTypeArguments(type, typeArgumentNodes, location);
+            var typeArguments = ts.map(typeArgumentNodes, getTypeFromTypeNode);
+            return ts.sameMap(signatures, function (sig) { return ts.some(sig.typeParameters) ? getSignatureInstantiation(sig, typeArguments, ts.isInJSFile(location)) : sig; });
+        }
+        /**
+         * The base constructor of a class can resolve to
+         * * undefinedType if the class has no extends clause,
+         * * unknownType if an error occurred during resolution of the extends expression,
+         * * nullType if the extends expression is the null value,
+         * * anyType if the extends expression has type any, or
+         * * an object type with at least one construct signature.
+         */
+        function getBaseConstructorTypeOfClass(type) {
+            if (!type.resolvedBaseConstructorType) {
+                var decl = type.symbol.valueDeclaration;
+                var extended = ts.getEffectiveBaseTypeNode(decl);
+                var baseTypeNode = getBaseTypeNodeOfClass(type);
+                if (!baseTypeNode) {
+                    return type.resolvedBaseConstructorType = undefinedType;
+                }
+                if (!pushTypeResolution(type, 1 /* ResolvedBaseConstructorType */)) {
+                    return errorType;
+                }
+                var baseConstructorType = checkExpression(baseTypeNode.expression);
+                if (extended && baseTypeNode !== extended) {
+                    ts.Debug.assert(!extended.typeArguments); // Because this is in a JS file, and baseTypeNode is in an @extends tag
+                    checkExpression(extended.expression);
+                }
+                if (baseConstructorType.flags & (524288 /* Object */ | 2097152 /* Intersection */)) {
+                    // Resolving the members of a class requires us to resolve the base class of that class.
+                    // We force resolution here such that we catch circularities now.
+                    resolveStructuredTypeMembers(baseConstructorType);
+                }
+                if (!popTypeResolution()) {
+                    error(type.symbol.valueDeclaration, ts.Diagnostics._0_is_referenced_directly_or_indirectly_in_its_own_base_expression, symbolToString(type.symbol));
+                    return type.resolvedBaseConstructorType = errorType;
+                }
+                if (!(baseConstructorType.flags & 1 /* Any */) && baseConstructorType !== nullWideningType && !isConstructorType(baseConstructorType)) {
+                    var err = error(baseTypeNode.expression, ts.Diagnostics.Type_0_is_not_a_constructor_function_type, typeToString(baseConstructorType));
+                    if (baseConstructorType.flags & 262144 /* TypeParameter */) {
+                        var constraint = getConstraintFromTypeParameter(baseConstructorType);
+                        var ctorReturn = unknownType;
+                        if (constraint) {
+                            var ctorSig = getSignaturesOfType(constraint, 1 /* Construct */);
+                            if (ctorSig[0]) {
+                                ctorReturn = getReturnTypeOfSignature(ctorSig[0]);
+                            }
+                        }
+                        addRelatedInfo(err, ts.createDiagnosticForNode(baseConstructorType.symbol.declarations[0], ts.Diagnostics.Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1, symbolToString(baseConstructorType.symbol), typeToString(ctorReturn)));
+                    }
+                    return type.resolvedBaseConstructorType = errorType;
+                }
+                type.resolvedBaseConstructorType = baseConstructorType;
+            }
+            return type.resolvedBaseConstructorType;
+        }
+        function getBaseTypes(type) {
+            if (!type.resolvedBaseTypes) {
+                if (type.objectFlags & 8 /* Tuple */) {
+                    type.resolvedBaseTypes = [createArrayType(getUnionType(type.typeParameters || ts.emptyArray))];
+                }
+                else if (type.symbol.flags & (32 /* Class */ | 64 /* Interface */)) {
+                    if (type.symbol.flags & 32 /* Class */) {
+                        resolveBaseTypesOfClass(type);
+                    }
+                    if (type.symbol.flags & 64 /* Interface */) {
+                        resolveBaseTypesOfInterface(type);
+                    }
+                }
+                else {
+                    ts.Debug.fail("type must be class or interface");
+                }
+            }
+            return type.resolvedBaseTypes;
+        }
+        function resolveBaseTypesOfClass(type) {
+            type.resolvedBaseTypes = ts.resolvingEmptyArray;
+            var baseConstructorType = getApparentType(getBaseConstructorTypeOfClass(type));
+            if (!(baseConstructorType.flags & (524288 /* Object */ | 2097152 /* Intersection */ | 1 /* Any */))) {
+                return type.resolvedBaseTypes = ts.emptyArray;
+            }
+            var baseTypeNode = getBaseTypeNodeOfClass(type);
+            var typeArgs = typeArgumentsFromTypeReferenceNode(baseTypeNode);
+            var baseType;
+            var originalBaseType = isJSConstructorType(baseConstructorType) ? baseConstructorType :
+                baseConstructorType.symbol ? getDeclaredTypeOfSymbol(baseConstructorType.symbol) :
+                    undefined;
+            if (baseConstructorType.symbol && baseConstructorType.symbol.flags & 32 /* Class */ &&
+                areAllOuterTypeParametersApplied(originalBaseType)) {
+                // When base constructor type is a class with no captured type arguments we know that the constructors all have the same type parameters as the
+                // class and all return the instance type of the class. There is no need for further checks and we can apply the
+                // type arguments in the same manner as a type reference to get the same error reporting experience.
+                baseType = getTypeFromClassOrInterfaceReference(baseTypeNode, baseConstructorType.symbol, typeArgs);
+            }
+            else if (baseConstructorType.flags & 1 /* Any */) {
+                baseType = baseConstructorType;
+            }
+            else if (isJSConstructorType(baseConstructorType)) {
+                baseType = !baseTypeNode.typeArguments && getJSClassType(baseConstructorType.symbol) || anyType;
+            }
+            else {
+                // The class derives from a "class-like" constructor function, check that we have at least one construct signature
+                // with a matching number of type parameters and use the return type of the first instantiated signature. Elsewhere
+                // we check that all instantiated signatures return the same type.
+                var constructors = getInstantiatedConstructorsForTypeArguments(baseConstructorType, baseTypeNode.typeArguments, baseTypeNode);
+                if (!constructors.length) {
+                    error(baseTypeNode.expression, ts.Diagnostics.No_base_constructor_has_the_specified_number_of_type_arguments);
+                    return type.resolvedBaseTypes = ts.emptyArray;
+                }
+                baseType = getReturnTypeOfSignature(constructors[0]);
+            }
+            if (baseType === errorType) {
+                return type.resolvedBaseTypes = ts.emptyArray;
+            }
+            if (!isValidBaseType(baseType)) {
+                error(baseTypeNode.expression, ts.Diagnostics.Base_constructor_return_type_0_is_not_an_object_type_or_intersection_of_object_types_with_statically_known_members, typeToString(baseType));
+                return type.resolvedBaseTypes = ts.emptyArray;
+            }
+            if (type === baseType || hasBaseType(baseType, type)) {
+                error(type.symbol.valueDeclaration, ts.Diagnostics.Type_0_recursively_references_itself_as_a_base_type, typeToString(type, /*enclosingDeclaration*/ undefined, 2 /* WriteArrayAsGenericType */));
+                return type.resolvedBaseTypes = ts.emptyArray;
+            }
+            if (type.resolvedBaseTypes === ts.resolvingEmptyArray) {
+                // Circular reference, likely through instantiation of default parameters
+                // (otherwise there'd be an error from hasBaseType) - this is fine, but `.members` should be reset
+                // as `getIndexedAccessType` via `instantiateType` via `getTypeFromClassOrInterfaceReference` forces a
+                // partial instantiation of the members without the base types fully resolved
+                type.members = undefined;
+            }
+            return type.resolvedBaseTypes = [baseType];
+        }
+        function areAllOuterTypeParametersApplied(type) {
+            // An unapplied type parameter has its symbol still the same as the matching argument symbol.
+            // Since parameters are applied outer-to-inner, only the last outer parameter needs to be checked.
+            var outerTypeParameters = type.outerTypeParameters;
+            if (outerTypeParameters) {
+                var last_1 = outerTypeParameters.length - 1;
+                var typeArguments = type.typeArguments;
+                return outerTypeParameters[last_1].symbol !== typeArguments[last_1].symbol;
+            }
+            return true;
+        }
+        // A valid base type is `any`, any non-generic object type or intersection of non-generic
+        // object types.
+        function isValidBaseType(type) {
+            return !!(type.flags & (524288 /* Object */ | 67108864 /* NonPrimitive */ | 1 /* Any */)) && !isGenericMappedType(type) ||
+                !!(type.flags & 2097152 /* Intersection */) && ts.every(type.types, isValidBaseType);
+        }
+        function resolveBaseTypesOfInterface(type) {
+            type.resolvedBaseTypes = type.resolvedBaseTypes || ts.emptyArray;
+            for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
+                var declaration = _a[_i];
+                if (declaration.kind === 241 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
+                    for (var _b = 0, _c = ts.getInterfaceBaseTypeNodes(declaration); _b < _c.length; _b++) {
+                        var node = _c[_b];
+                        var baseType = getTypeFromTypeNode(node);
+                        if (baseType !== errorType) {
+                            if (isValidBaseType(baseType)) {
+                                if (type !== baseType && !hasBaseType(baseType, type)) {
+                                    if (type.resolvedBaseTypes === ts.emptyArray) {
+                                        type.resolvedBaseTypes = [baseType];
+                                    }
+                                    else {
+                                        type.resolvedBaseTypes.push(baseType);
+                                    }
+                                }
+                                else {
+                                    error(declaration, ts.Diagnostics.Type_0_recursively_references_itself_as_a_base_type, typeToString(type, /*enclosingDeclaration*/ undefined, 2 /* WriteArrayAsGenericType */));
+                                }
+                            }
+                            else {
+                                error(node, ts.Diagnostics.An_interface_can_only_extend_an_object_type_or_intersection_of_object_types_with_statically_known_members);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        /**
+         * Returns true if the interface given by the symbol is free of "this" references.
+         *
+         * Specifically, the result is true if the interface itself contains no references
+         * to "this" in its body, if all base types are interfaces,
+         * and if none of the base interfaces have a "this" type.
+         */
+        function isThislessInterface(symbol) {
+            for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                var declaration = _a[_i];
+                if (declaration.kind === 241 /* InterfaceDeclaration */) {
+                    if (declaration.flags & 64 /* ContainsThis */) {
+                        return false;
+                    }
+                    var baseTypeNodes = ts.getInterfaceBaseTypeNodes(declaration);
+                    if (baseTypeNodes) {
+                        for (var _b = 0, baseTypeNodes_1 = baseTypeNodes; _b < baseTypeNodes_1.length; _b++) {
+                            var node = baseTypeNodes_1[_b];
+                            if (ts.isEntityNameExpression(node.expression)) {
+                                var baseSymbol = resolveEntityName(node.expression, 67897832 /* Type */, /*ignoreErrors*/ true);
+                                if (!baseSymbol || !(baseSymbol.flags & 64 /* Interface */) || getDeclaredTypeOfClassOrInterface(baseSymbol).thisType) {
+                                    return false;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            return true;
+        }
+        function getDeclaredTypeOfClassOrInterface(symbol) {
+            var links = getSymbolLinks(symbol);
+            if (!links.declaredType) {
+                var kind = symbol.flags & 32 /* Class */ ? 1 /* Class */ : 2 /* Interface */;
+                var type = links.declaredType = createObjectType(kind, symbol);
+                var outerTypeParameters = getOuterTypeParametersOfClassOrInterface(symbol);
+                var localTypeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
+                // A class or interface is generic if it has type parameters or a "this" type. We always give classes a "this" type
+                // because it is not feasible to analyze all members to determine if the "this" type escapes the class (in particular,
+                // property types inferred from initializers and method return types inferred from return statements are very hard
+                // to exhaustively analyze). We give interfaces a "this" type if we can't definitely determine that they are free of
+                // "this" references.
+                if (outerTypeParameters || localTypeParameters || kind === 1 /* Class */ || !isThislessInterface(symbol)) {
+                    type.objectFlags |= 4 /* Reference */;
+                    type.typeParameters = ts.concatenate(outerTypeParameters, localTypeParameters);
+                    type.outerTypeParameters = outerTypeParameters;
+                    type.localTypeParameters = localTypeParameters;
+                    type.instantiations = ts.createMap();
+                    type.instantiations.set(getTypeListId(type.typeParameters), type);
+                    type.target = type;
+                    type.typeArguments = type.typeParameters;
+                    type.thisType = createTypeParameter(symbol);
+                    type.thisType.isThisType = true;
+                    type.thisType.constraint = type;
+                }
+            }
+            return links.declaredType;
+        }
+        function getDeclaredTypeOfTypeAlias(symbol) {
+            var links = getSymbolLinks(symbol);
+            if (!links.declaredType) {
+                // Note that we use the links object as the target here because the symbol object is used as the unique
+                // identity for resolution of the 'type' property in SymbolLinks.
+                if (!pushTypeResolution(symbol, 2 /* DeclaredType */)) {
+                    return errorType;
+                }
+                var declaration = ts.find(symbol.declarations, function (d) {
+                    return ts.isJSDocTypeAlias(d) || d.kind === 242 /* TypeAliasDeclaration */;
+                });
+                var typeNode = ts.isJSDocTypeAlias(declaration) ? declaration.typeExpression : declaration.type;
+                // If typeNode is missing, we will error in checkJSDocTypedefTag.
+                var type = typeNode ? getTypeFromTypeNode(typeNode) : errorType;
+                if (popTypeResolution()) {
+                    var typeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
+                    if (typeParameters) {
+                        // Initialize the instantiation cache for generic type aliases. The declared type corresponds to
+                        // an instantiation of the type alias with the type parameters supplied as type arguments.
+                        links.typeParameters = typeParameters;
+                        links.instantiations = ts.createMap();
+                        links.instantiations.set(getTypeListId(typeParameters), type);
+                    }
+                }
+                else {
+                    type = errorType;
+                    error(declaration.name, ts.Diagnostics.Type_alias_0_circularly_references_itself, symbolToString(symbol));
+                }
+                links.declaredType = type;
+            }
+            return links.declaredType;
+        }
+        function isStringConcatExpression(expr) {
+            if (expr.kind === 10 /* StringLiteral */) {
+                return true;
+            }
+            else if (expr.kind === 204 /* BinaryExpression */) {
+                return isStringConcatExpression(expr.left) && isStringConcatExpression(expr.right);
+            }
+            return false;
+        }
+        function isLiteralEnumMember(member) {
+            var expr = member.initializer;
+            if (!expr) {
+                return !(member.flags & 4194304 /* Ambient */);
+            }
+            switch (expr.kind) {
+                case 10 /* StringLiteral */:
+                case 8 /* NumericLiteral */:
+                    return true;
+                case 202 /* PrefixUnaryExpression */:
+                    return expr.operator === 39 /* MinusToken */ &&
+                        expr.operand.kind === 8 /* NumericLiteral */;
+                case 72 /* Identifier */:
+                    return ts.nodeIsMissing(expr) || !!getSymbolOfNode(member.parent).exports.get(expr.escapedText);
+                case 204 /* BinaryExpression */:
+                    return isStringConcatExpression(expr);
+                default:
+                    return false;
+            }
+        }
+        function getEnumKind(symbol) {
+            var links = getSymbolLinks(symbol);
+            if (links.enumKind !== undefined) {
+                return links.enumKind;
+            }
+            var hasNonLiteralMember = false;
+            for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                var declaration = _a[_i];
+                if (declaration.kind === 243 /* EnumDeclaration */) {
+                    for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
+                        var member = _c[_b];
+                        if (member.initializer && member.initializer.kind === 10 /* StringLiteral */) {
+                            return links.enumKind = 1 /* Literal */;
+                        }
+                        if (!isLiteralEnumMember(member)) {
+                            hasNonLiteralMember = true;
+                        }
+                    }
+                }
+            }
+            return links.enumKind = hasNonLiteralMember ? 0 /* Numeric */ : 1 /* Literal */;
+        }
+        function getBaseTypeOfEnumLiteralType(type) {
+            return type.flags & 1024 /* EnumLiteral */ && !(type.flags & 1048576 /* Union */) ? getDeclaredTypeOfSymbol(getParentOfSymbol(type.symbol)) : type;
+        }
+        function getDeclaredTypeOfEnum(symbol) {
+            var links = getSymbolLinks(symbol);
+            if (links.declaredType) {
+                return links.declaredType;
+            }
+            if (getEnumKind(symbol) === 1 /* Literal */) {
+                enumCount++;
+                var memberTypeList = [];
+                for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                    var declaration = _a[_i];
+                    if (declaration.kind === 243 /* EnumDeclaration */) {
+                        for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
+                            var member = _c[_b];
+                            var memberType = getFreshTypeOfLiteralType(getLiteralType(getEnumMemberValue(member), enumCount, getSymbolOfNode(member))); // TODO: GH#18217
+                            getSymbolLinks(getSymbolOfNode(member)).declaredType = memberType;
+                            memberTypeList.push(getRegularTypeOfLiteralType(memberType));
+                        }
+                    }
+                }
+                if (memberTypeList.length) {
+                    var enumType_1 = getUnionType(memberTypeList, 1 /* Literal */, symbol, /*aliasTypeArguments*/ undefined);
+                    if (enumType_1.flags & 1048576 /* Union */) {
+                        enumType_1.flags |= 1024 /* EnumLiteral */;
+                        enumType_1.symbol = symbol;
+                    }
+                    return links.declaredType = enumType_1;
+                }
+            }
+            var enumType = createType(32 /* Enum */);
+            enumType.symbol = symbol;
+            return links.declaredType = enumType;
+        }
+        function getDeclaredTypeOfEnumMember(symbol) {
+            var links = getSymbolLinks(symbol);
+            if (!links.declaredType) {
+                var enumType = getDeclaredTypeOfEnum(getParentOfSymbol(symbol));
+                if (!links.declaredType) {
+                    links.declaredType = enumType;
+                }
+            }
+            return links.declaredType;
+        }
+        function getDeclaredTypeOfTypeParameter(symbol) {
+            var links = getSymbolLinks(symbol);
+            return links.declaredType || (links.declaredType = createTypeParameter(symbol));
+        }
+        function getDeclaredTypeOfAlias(symbol) {
+            var links = getSymbolLinks(symbol);
+            return links.declaredType || (links.declaredType = getDeclaredTypeOfSymbol(resolveAlias(symbol)));
+        }
+        function getDeclaredTypeOfSymbol(symbol) {
+            return tryGetDeclaredTypeOfSymbol(symbol) || errorType;
+        }
+        function tryGetDeclaredTypeOfSymbol(symbol) {
+            if (symbol.flags & (32 /* Class */ | 64 /* Interface */)) {
+                return getDeclaredTypeOfClassOrInterface(symbol);
+            }
+            if (symbol.flags & 524288 /* TypeAlias */) {
+                return getDeclaredTypeOfTypeAlias(symbol);
+            }
+            if (symbol.flags & 262144 /* TypeParameter */) {
+                return getDeclaredTypeOfTypeParameter(symbol);
+            }
+            if (symbol.flags & 384 /* Enum */) {
+                return getDeclaredTypeOfEnum(symbol);
+            }
+            if (symbol.flags & 8 /* EnumMember */) {
+                return getDeclaredTypeOfEnumMember(symbol);
+            }
+            if (symbol.flags & 2097152 /* Alias */) {
+                return getDeclaredTypeOfAlias(symbol);
+            }
+            return undefined;
+        }
+        /**
+         * A type is free of this references if it's the any, string, number, boolean, symbol, or void keyword, a string
+         * literal type, an array with an element type that is free of this references, or a type reference that is
+         * free of this references.
+         */
+        function isThislessType(node) {
+            switch (node.kind) {
+                case 120 /* AnyKeyword */:
+                case 143 /* UnknownKeyword */:
+                case 138 /* StringKeyword */:
+                case 135 /* NumberKeyword */:
+                case 146 /* BigIntKeyword */:
+                case 123 /* BooleanKeyword */:
+                case 139 /* SymbolKeyword */:
+                case 136 /* ObjectKeyword */:
+                case 106 /* VoidKeyword */:
+                case 141 /* UndefinedKeyword */:
+                case 96 /* NullKeyword */:
+                case 132 /* NeverKeyword */:
+                case 182 /* LiteralType */:
+                    return true;
+                case 169 /* ArrayType */:
+                    return isThislessType(node.elementType);
+                case 164 /* TypeReference */:
+                    return !node.typeArguments || node.typeArguments.every(isThislessType);
+            }
+            return false;
+        }
+        /** A type parameter is thisless if its contraint is thisless, or if it has no constraint. */
+        function isThislessTypeParameter(node) {
+            var constraint = ts.getEffectiveConstraintOfTypeParameter(node);
+            return !constraint || isThislessType(constraint);
+        }
+        /**
+         * A variable-like declaration is free of this references if it has a type annotation
+         * that is thisless, or if it has no type annotation and no initializer (and is thus of type any).
+         */
+        function isThislessVariableLikeDeclaration(node) {
+            var typeNode = ts.getEffectiveTypeAnnotationNode(node);
+            return typeNode ? isThislessType(typeNode) : !ts.hasInitializer(node);
+        }
+        /**
+         * A function-like declaration is considered free of `this` references if it has a return type
+         * annotation that is free of this references and if each parameter is thisless and if
+         * each type parameter (if present) is thisless.
+         */
+        function isThislessFunctionLikeDeclaration(node) {
+            var returnType = ts.getEffectiveReturnTypeNode(node);
+            var typeParameters = ts.getEffectiveTypeParameterDeclarations(node);
+            return (node.kind === 157 /* Constructor */ || (!!returnType && isThislessType(returnType))) &&
+                node.parameters.every(isThislessVariableLikeDeclaration) &&
+                typeParameters.every(isThislessTypeParameter);
+        }
+        /**
+         * Returns true if the class or interface member given by the symbol is free of "this" references. The
+         * function may return false for symbols that are actually free of "this" references because it is not
+         * feasible to perform a complete analysis in all cases. In particular, property members with types
+         * inferred from their initializers and function members with inferred return types are conservatively
+         * assumed not to be free of "this" references.
+         */
+        function isThisless(symbol) {
+            if (symbol.declarations && symbol.declarations.length === 1) {
+                var declaration = symbol.declarations[0];
+                if (declaration) {
+                    switch (declaration.kind) {
+                        case 154 /* PropertyDeclaration */:
+                        case 153 /* PropertySignature */:
+                            return isThislessVariableLikeDeclaration(declaration);
+                        case 156 /* MethodDeclaration */:
+                        case 155 /* MethodSignature */:
+                        case 157 /* Constructor */:
+                            return isThislessFunctionLikeDeclaration(declaration);
+                    }
+                }
+            }
+            return false;
+        }
+        // The mappingThisOnly flag indicates that the only type parameter being mapped is "this". When the flag is true,
+        // we check symbols to see if we can quickly conclude they are free of "this" references, thus needing no instantiation.
+        function createInstantiatedSymbolTable(symbols, mapper, mappingThisOnly) {
+            var result = ts.createSymbolTable();
+            for (var _i = 0, symbols_2 = symbols; _i < symbols_2.length; _i++) {
+                var symbol = symbols_2[_i];
+                result.set(symbol.escapedName, mappingThisOnly && isThisless(symbol) ? symbol : instantiateSymbol(symbol, mapper));
+            }
+            return result;
+        }
+        function addInheritedMembers(symbols, baseSymbols) {
+            for (var _i = 0, baseSymbols_1 = baseSymbols; _i < baseSymbols_1.length; _i++) {
+                var s = baseSymbols_1[_i];
+                if (!symbols.has(s.escapedName)) {
+                    symbols.set(s.escapedName, s);
+                }
+            }
+        }
+        function resolveDeclaredMembers(type) {
+            if (!type.declaredProperties) {
+                var symbol = type.symbol;
+                var members = getMembersOfSymbol(symbol);
+                type.declaredProperties = getNamedMembers(members);
+                // Start with signatures at empty array in case of recursive types
+                type.declaredCallSignatures = ts.emptyArray;
+                type.declaredConstructSignatures = ts.emptyArray;
+                type.declaredCallSignatures = getSignaturesOfSymbol(members.get("__call" /* Call */));
+                type.declaredConstructSignatures = getSignaturesOfSymbol(members.get("__new" /* New */));
+                type.declaredStringIndexInfo = getIndexInfoOfSymbol(symbol, 0 /* String */);
+                type.declaredNumberIndexInfo = getIndexInfoOfSymbol(symbol, 1 /* Number */);
+            }
+            return type;
+        }
+        /**
+         * Indicates whether a type can be used as a property name.
+         */
+        function isTypeUsableAsPropertyName(type) {
+            return !!(type.flags & 8576 /* StringOrNumberLiteralOrUnique */);
+        }
+        /**
+         * Indicates whether a declaration name is definitely late-bindable.
+         * A declaration name is only late-bindable if:
+         * - It is a `ComputedPropertyName`.
+         * - Its expression is an `Identifier` or either a `PropertyAccessExpression` an
+         * `ElementAccessExpression` consisting only of these same three types of nodes.
+         * - The type of its expression is a string or numeric literal type, or is a `unique symbol` type.
+         */
+        function isLateBindableName(node) {
+            return ts.isComputedPropertyName(node)
+                && ts.isEntityNameExpression(node.expression)
+                && isTypeUsableAsPropertyName(checkComputedPropertyName(node));
+        }
+        function isLateBoundName(name) {
+            return name.charCodeAt(0) === 95 /* _ */ &&
+                name.charCodeAt(1) === 95 /* _ */ &&
+                name.charCodeAt(2) === 64 /* at */;
+        }
+        /**
+         * Indicates whether a declaration has a late-bindable dynamic name.
+         */
+        function hasLateBindableName(node) {
+            var name = ts.getNameOfDeclaration(node);
+            return !!name && isLateBindableName(name);
+        }
+        /**
+         * Indicates whether a declaration has a dynamic name that cannot be late-bound.
+         */
+        function hasNonBindableDynamicName(node) {
+            return ts.hasDynamicName(node) && !hasLateBindableName(node);
+        }
+        /**
+         * Indicates whether a declaration name is a dynamic name that cannot be late-bound.
+         */
+        function isNonBindableDynamicName(node) {
+            return ts.isDynamicName(node) && !isLateBindableName(node);
+        }
+        /**
+         * Gets the symbolic name for a member from its type.
+         */
+        function getPropertyNameFromType(type) {
+            if (type.flags & 8192 /* UniqueESSymbol */) {
+                return type.escapedName;
+            }
+            if (type.flags & (128 /* StringLiteral */ | 256 /* NumberLiteral */)) {
+                return ts.escapeLeadingUnderscores("" + type.value);
+            }
+            return ts.Debug.fail();
+        }
+        /**
+         * Adds a declaration to a late-bound dynamic member. This performs the same function for
+         * late-bound members that `addDeclarationToSymbol` in binder.ts performs for early-bound
+         * members.
+         */
+        function addDeclarationToLateBoundSymbol(symbol, member, symbolFlags) {
+            ts.Debug.assert(!!(ts.getCheckFlags(symbol) & 2048 /* Late */), "Expected a late-bound symbol.");
+            symbol.flags |= symbolFlags;
+            getSymbolLinks(member.symbol).lateSymbol = symbol;
+            if (!symbol.declarations) {
+                symbol.declarations = [member];
+            }
+            else {
+                symbol.declarations.push(member);
+            }
+            if (symbolFlags & 67220415 /* Value */) {
+                if (!symbol.valueDeclaration || symbol.valueDeclaration.kind !== member.kind) {
+                    symbol.valueDeclaration = member;
+                }
+            }
+        }
+        /**
+         * Performs late-binding of a dynamic member. This performs the same function for
+         * late-bound members that `declareSymbol` in binder.ts performs for early-bound
+         * members.
+         *
+         * If a symbol is a dynamic name from a computed property, we perform an additional "late"
+         * binding phase to attempt to resolve the name for the symbol from the type of the computed
+         * property's expression. If the type of the expression is a string-literal, numeric-literal,
+         * or unique symbol type, we can use that type as the name of the symbol.
+         *
+         * For example, given:
+         *
+         *   const x = Symbol();
+         *
+         *   interface I {
+         *     [x]: number;
+         *   }
+         *
+         * The binder gives the property `[x]: number` a special symbol with the name "__computed".
+         * In the late-binding phase we can type-check the expression `x` and see that it has a
+         * unique symbol type which we can then use as the name of the member. This allows users
+         * to define custom symbols that can be used in the members of an object type.
+         *
+         * @param parent The containing symbol for the member.
+         * @param earlySymbols The early-bound symbols of the parent.
+         * @param lateSymbols The late-bound symbols of the parent.
+         * @param decl The member to bind.
+         */
+        function lateBindMember(parent, earlySymbols, lateSymbols, decl) {
+            ts.Debug.assert(!!decl.symbol, "The member is expected to have a symbol.");
+            var links = getNodeLinks(decl);
+            if (!links.resolvedSymbol) {
+                // In the event we attempt to resolve the late-bound name of this member recursively,
+                // fall back to the early-bound name of this member.
+                links.resolvedSymbol = decl.symbol;
+                var type = checkComputedPropertyName(decl.name);
+                if (isTypeUsableAsPropertyName(type)) {
+                    var memberName = getPropertyNameFromType(type);
+                    var symbolFlags = decl.symbol.flags;
+                    // Get or add a late-bound symbol for the member. This allows us to merge late-bound accessor declarations.
+                    var lateSymbol = lateSymbols.get(memberName);
+                    if (!lateSymbol)
+                        lateSymbols.set(memberName, lateSymbol = createSymbol(0 /* None */, memberName, 2048 /* Late */));
+                    // Report an error if a late-bound member has the same name as an early-bound member,
+                    // or if we have another early-bound symbol declaration with the same name and
+                    // conflicting flags.
+                    var earlySymbol = earlySymbols && earlySymbols.get(memberName);
+                    if (lateSymbol.flags & getExcludedSymbolFlags(symbolFlags) || earlySymbol) {
+                        // If we have an existing early-bound member, combine its declarations so that we can
+                        // report an error at each declaration.
+                        var declarations = earlySymbol ? ts.concatenate(earlySymbol.declarations, lateSymbol.declarations) : lateSymbol.declarations;
+                        var name_3 = !(type.flags & 8192 /* UniqueESSymbol */) && ts.unescapeLeadingUnderscores(memberName) || ts.declarationNameToString(decl.name);
+                        ts.forEach(declarations, function (declaration) { return error(ts.getNameOfDeclaration(declaration) || declaration, ts.Diagnostics.Property_0_was_also_declared_here, name_3); });
+                        error(decl.name || decl, ts.Diagnostics.Duplicate_property_0, name_3);
+                        lateSymbol = createSymbol(0 /* None */, memberName, 2048 /* Late */);
+                    }
+                    lateSymbol.nameType = type;
+                    addDeclarationToLateBoundSymbol(lateSymbol, decl, symbolFlags);
+                    if (lateSymbol.parent) {
+                        ts.Debug.assert(lateSymbol.parent === parent, "Existing symbol parent should match new one");
+                    }
+                    else {
+                        lateSymbol.parent = parent;
+                    }
+                    return links.resolvedSymbol = lateSymbol;
+                }
+            }
+            return links.resolvedSymbol;
+        }
+        function getResolvedMembersOrExportsOfSymbol(symbol, resolutionKind) {
+            var links = getSymbolLinks(symbol);
+            if (!links[resolutionKind]) {
+                var isStatic = resolutionKind === "resolvedExports" /* resolvedExports */;
+                var earlySymbols = !isStatic ? symbol.members :
+                    symbol.flags & 1536 /* Module */ ? getExportsOfModuleWorker(symbol) :
+                        symbol.exports;
+                // In the event we recursively resolve the members/exports of the symbol, we
+                // set the initial value of resolvedMembers/resolvedExports to the early-bound
+                // members/exports of the symbol.
+                links[resolutionKind] = earlySymbols || emptySymbols;
+                // fill in any as-yet-unresolved late-bound members.
+                var lateSymbols = ts.createSymbolTable();
+                for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                    var decl = _a[_i];
+                    var members = ts.getMembersOfDeclaration(decl);
+                    if (members) {
+                        for (var _b = 0, members_4 = members; _b < members_4.length; _b++) {
+                            var member = members_4[_b];
+                            if (isStatic === ts.hasStaticModifier(member) && hasLateBindableName(member)) {
+                                lateBindMember(symbol, earlySymbols, lateSymbols, member);
+                            }
+                        }
+                    }
+                }
+                links[resolutionKind] = combineSymbolTables(earlySymbols, lateSymbols) || emptySymbols;
+            }
+            return links[resolutionKind];
+        }
+        /**
+         * Gets a SymbolTable containing both the early- and late-bound members of a symbol.
+         *
+         * For a description of late-binding, see `lateBindMember`.
+         */
+        function getMembersOfSymbol(symbol) {
+            return symbol.flags & 6240 /* LateBindingContainer */
+                ? getResolvedMembersOrExportsOfSymbol(symbol, "resolvedMembers" /* resolvedMembers */)
+                : symbol.members || emptySymbols;
+        }
+        /**
+         * If a symbol is the dynamic name of the member of an object type, get the late-bound
+         * symbol of the member.
+         *
+         * For a description of late-binding, see `lateBindMember`.
+         */
+        function getLateBoundSymbol(symbol) {
+            if (symbol.flags & 106500 /* ClassMember */ && symbol.escapedName === "__computed" /* Computed */) {
+                var links = getSymbolLinks(symbol);
+                if (!links.lateSymbol && ts.some(symbol.declarations, hasLateBindableName)) {
+                    // force late binding of members/exports. This will set the late-bound symbol
+                    if (ts.some(symbol.declarations, ts.hasStaticModifier)) {
+                        getExportsOfSymbol(symbol.parent);
+                    }
+                    else {
+                        getMembersOfSymbol(symbol.parent);
+                    }
+                }
+                return links.lateSymbol || (links.lateSymbol = symbol);
+            }
+            return symbol;
+        }
+        function getTypeWithThisArgument(type, thisArgument, needApparentType) {
+            if (ts.getObjectFlags(type) & 4 /* Reference */) {
+                var target = type.target;
+                var typeArguments = type.typeArguments;
+                if (ts.length(target.typeParameters) === ts.length(typeArguments)) {
+                    var ref = createTypeReference(target, ts.concatenate(typeArguments, [thisArgument || target.thisType]));
+                    return needApparentType ? getApparentType(ref) : ref;
+                }
+            }
+            else if (type.flags & 2097152 /* Intersection */) {
+                return getIntersectionType(ts.map(type.types, function (t) { return getTypeWithThisArgument(t, thisArgument, needApparentType); }));
+            }
+            return needApparentType ? getApparentType(type) : type;
+        }
+        function resolveObjectTypeMembers(type, source, typeParameters, typeArguments) {
+            var mapper;
+            var members;
+            var callSignatures;
+            var constructSignatures;
+            var stringIndexInfo;
+            var numberIndexInfo;
+            if (ts.rangeEquals(typeParameters, typeArguments, 0, typeParameters.length)) {
+                mapper = identityMapper;
+                members = source.symbol ? getMembersOfSymbol(source.symbol) : ts.createSymbolTable(source.declaredProperties);
+                callSignatures = source.declaredCallSignatures;
+                constructSignatures = source.declaredConstructSignatures;
+                stringIndexInfo = source.declaredStringIndexInfo;
+                numberIndexInfo = source.declaredNumberIndexInfo;
+            }
+            else {
+                mapper = createTypeMapper(typeParameters, typeArguments);
+                members = createInstantiatedSymbolTable(source.declaredProperties, mapper, /*mappingThisOnly*/ typeParameters.length === 1);
+                callSignatures = instantiateSignatures(source.declaredCallSignatures, mapper);
+                constructSignatures = instantiateSignatures(source.declaredConstructSignatures, mapper);
+                stringIndexInfo = instantiateIndexInfo(source.declaredStringIndexInfo, mapper);
+                numberIndexInfo = instantiateIndexInfo(source.declaredNumberIndexInfo, mapper);
+            }
+            var baseTypes = getBaseTypes(source);
+            if (baseTypes.length) {
+                if (source.symbol && members === getMembersOfSymbol(source.symbol)) {
+                    members = ts.createSymbolTable(source.declaredProperties);
+                }
+                setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+                var thisArgument = ts.lastOrUndefined(typeArguments);
+                for (var _i = 0, baseTypes_1 = baseTypes; _i < baseTypes_1.length; _i++) {
+                    var baseType = baseTypes_1[_i];
+                    var instantiatedBaseType = thisArgument ? getTypeWithThisArgument(instantiateType(baseType, mapper), thisArgument) : baseType;
+                    addInheritedMembers(members, getPropertiesOfType(instantiatedBaseType));
+                    callSignatures = ts.concatenate(callSignatures, getSignaturesOfType(instantiatedBaseType, 0 /* Call */));
+                    constructSignatures = ts.concatenate(constructSignatures, getSignaturesOfType(instantiatedBaseType, 1 /* Construct */));
+                    if (!stringIndexInfo) {
+                        stringIndexInfo = instantiatedBaseType === anyType ?
+                            createIndexInfo(anyType, /*isReadonly*/ false) :
+                            getIndexInfoOfType(instantiatedBaseType, 0 /* String */);
+                    }
+                    numberIndexInfo = numberIndexInfo || getIndexInfoOfType(instantiatedBaseType, 1 /* Number */);
+                }
+            }
+            setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+        }
+        function resolveClassOrInterfaceMembers(type) {
+            resolveObjectTypeMembers(type, resolveDeclaredMembers(type), ts.emptyArray, ts.emptyArray);
+        }
+        function resolveTypeReferenceMembers(type) {
+            var source = resolveDeclaredMembers(type.target);
+            var typeParameters = ts.concatenate(source.typeParameters, [source.thisType]);
+            var typeArguments = type.typeArguments && type.typeArguments.length === typeParameters.length ?
+                type.typeArguments : ts.concatenate(type.typeArguments, [type]);
+            resolveObjectTypeMembers(type, source, typeParameters, typeArguments);
+        }
+        function createSignature(declaration, typeParameters, thisParameter, parameters, resolvedReturnType, resolvedTypePredicate, minArgumentCount, hasRestParameter, hasLiteralTypes) {
+            var sig = new Signature(checker);
+            sig.declaration = declaration;
+            sig.typeParameters = typeParameters;
+            sig.parameters = parameters;
+            sig.thisParameter = thisParameter;
+            sig.resolvedReturnType = resolvedReturnType;
+            sig.resolvedTypePredicate = resolvedTypePredicate;
+            sig.minArgumentCount = minArgumentCount;
+            sig.hasRestParameter = hasRestParameter;
+            sig.hasLiteralTypes = hasLiteralTypes;
+            sig.target = undefined;
+            sig.mapper = undefined;
+            return sig;
+        }
+        function cloneSignature(sig) {
+            return createSignature(sig.declaration, sig.typeParameters, sig.thisParameter, sig.parameters, /*resolvedReturnType*/ undefined, 
+            /*resolvedTypePredicate*/ undefined, sig.minArgumentCount, sig.hasRestParameter, sig.hasLiteralTypes);
+        }
+        function getExpandedParameters(sig) {
+            if (sig.hasRestParameter) {
+                var restIndex_1 = sig.parameters.length - 1;
+                var restParameter = sig.parameters[restIndex_1];
+                var restType = getTypeOfSymbol(restParameter);
+                if (isTupleType(restType)) {
+                    var elementTypes = restType.typeArguments || ts.emptyArray;
+                    var minLength_1 = restType.target.minLength;
+                    var tupleRestIndex_1 = restType.target.hasRestElement ? elementTypes.length - 1 : -1;
+                    var restParams = ts.map(elementTypes, function (t, i) {
+                        var name = getParameterNameAtPosition(sig, restIndex_1 + i);
+                        var checkFlags = i === tupleRestIndex_1 ? 16384 /* RestParameter */ :
+                            i >= minLength_1 ? 8192 /* OptionalParameter */ : 0;
+                        var symbol = createSymbol(1 /* FunctionScopedVariable */, name, checkFlags);
+                        symbol.type = i === tupleRestIndex_1 ? createArrayType(t) : t;
+                        return symbol;
+                    });
+                    return ts.concatenate(sig.parameters.slice(0, restIndex_1), restParams);
+                }
+            }
+            return sig.parameters;
+        }
+        function getDefaultConstructSignatures(classType) {
+            var baseConstructorType = getBaseConstructorTypeOfClass(classType);
+            var baseSignatures = getSignaturesOfType(baseConstructorType, 1 /* Construct */);
+            if (baseSignatures.length === 0) {
+                return [createSignature(undefined, classType.localTypeParameters, undefined, ts.emptyArray, classType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false)]; // TODO: GH#18217
+            }
+            var baseTypeNode = getBaseTypeNodeOfClass(classType);
+            var isJavaScript = ts.isInJSFile(baseTypeNode);
+            var typeArguments = typeArgumentsFromTypeReferenceNode(baseTypeNode);
+            var typeArgCount = ts.length(typeArguments);
+            var result = [];
+            for (var _i = 0, baseSignatures_1 = baseSignatures; _i < baseSignatures_1.length; _i++) {
+                var baseSig = baseSignatures_1[_i];
+                var minTypeArgumentCount = getMinTypeArgumentCount(baseSig.typeParameters);
+                var typeParamCount = ts.length(baseSig.typeParameters);
+                if (isJavaScript || typeArgCount >= minTypeArgumentCount && typeArgCount <= typeParamCount) {
+                    var sig = typeParamCount ? createSignatureInstantiation(baseSig, fillMissingTypeArguments(typeArguments, baseSig.typeParameters, minTypeArgumentCount, isJavaScript)) : cloneSignature(baseSig);
+                    sig.typeParameters = classType.localTypeParameters;
+                    sig.resolvedReturnType = classType;
+                    result.push(sig);
+                }
+            }
+            return result;
+        }
+        function findMatchingSignature(signatureList, signature, partialMatch, ignoreThisTypes, ignoreReturnTypes) {
+            for (var _i = 0, signatureList_1 = signatureList; _i < signatureList_1.length; _i++) {
+                var s = signatureList_1[_i];
+                if (compareSignaturesIdentical(s, signature, partialMatch, ignoreThisTypes, ignoreReturnTypes, partialMatch ? compareTypesSubtypeOf : compareTypesIdentical)) {
+                    return s;
+                }
+            }
+        }
+        function findMatchingSignatures(signatureLists, signature, listIndex) {
+            if (signature.typeParameters) {
+                // We require an exact match for generic signatures, so we only return signatures from the first
+                // signature list and only if they have exact matches in the other signature lists.
+                if (listIndex > 0) {
+                    return undefined;
+                }
+                for (var i = 1; i < signatureLists.length; i++) {
+                    if (!findMatchingSignature(signatureLists[i], signature, /*partialMatch*/ false, /*ignoreThisTypes*/ false, /*ignoreReturnTypes*/ false)) {
+                        return undefined;
+                    }
+                }
+                return [signature];
+            }
+            var result;
+            for (var i = 0; i < signatureLists.length; i++) {
+                // Allow matching non-generic signatures to have excess parameters and different return types
+                var match = i === listIndex ? signature : findMatchingSignature(signatureLists[i], signature, /*partialMatch*/ true, /*ignoreThisTypes*/ true, /*ignoreReturnTypes*/ true);
+                if (!match) {
+                    return undefined;
+                }
+                result = ts.appendIfUnique(result, match);
+            }
+            return result;
+        }
+        // The signatures of a union type are those signatures that are present in each of the constituent types.
+        // Generic signatures must match exactly, but non-generic signatures are allowed to have extra optional
+        // parameters and may differ in return types. When signatures differ in return types, the resulting return
+        // type is the union of the constituent return types.
+        function getUnionSignatures(signatureLists) {
+            var result;
+            var indexWithLengthOverOne;
+            for (var i = 0; i < signatureLists.length; i++) {
+                if (signatureLists[i].length === 0)
+                    return ts.emptyArray;
+                if (signatureLists[i].length > 1) {
+                    indexWithLengthOverOne = indexWithLengthOverOne === undefined ? i : -1; // -1 is a signal there are multiple overload sets
+                }
+                for (var _i = 0, _a = signatureLists[i]; _i < _a.length; _i++) {
+                    var signature = _a[_i];
+                    // Only process signatures with parameter lists that aren't already in the result list
+                    if (!result || !findMatchingSignature(result, signature, /*partialMatch*/ false, /*ignoreThisTypes*/ true, /*ignoreReturnTypes*/ true)) {
+                        var unionSignatures = findMatchingSignatures(signatureLists, signature, i);
+                        if (unionSignatures) {
+                            var s = signature;
+                            // Union the result types when more than one signature matches
+                            if (unionSignatures.length > 1) {
+                                var thisParameter = signature.thisParameter;
+                                if (ts.forEach(unionSignatures, function (sig) { return sig.thisParameter; })) {
+                                    // TODO: GH#18217 We tested that *some* has thisParameter and now act as if *all* do
+                                    var thisType = getUnionType(ts.map(unionSignatures, function (sig) { return sig.thisParameter ? getTypeOfSymbol(sig.thisParameter) : anyType; }), 2 /* Subtype */);
+                                    thisParameter = createSymbolWithType(signature.thisParameter, thisType);
+                                }
+                                s = cloneSignature(signature);
+                                s.thisParameter = thisParameter;
+                                s.unionSignatures = unionSignatures;
+                            }
+                            (result || (result = [])).push(s);
+                        }
+                    }
+                }
+            }
+            if (!ts.length(result) && indexWithLengthOverOne !== -1) {
+                // No sufficiently similar signature existed to subsume all the other signatures in the union - time to see if we can make a single
+                // signature that handles all over them. We only do this when there are overloads in only one constituent.
+                // (Overloads are conditional in nature and having overloads in multiple constituents would necessitate making a power set of
+                // signatures from the type, whose ordering would be non-obvious)
+                var masterList = signatureLists[indexWithLengthOverOne !== undefined ? indexWithLengthOverOne : 0];
+                var results = masterList.slice();
+                var _loop_5 = function (signatures) {
+                    if (signatures !== masterList) {
+                        var signature_1 = signatures[0];
+                        ts.Debug.assert(!!signature_1, "getUnionSignatures bails early on empty signature lists and should not have empty lists on second pass");
+                        results = signature_1.typeParameters && ts.some(results, function (s) { return !!s.typeParameters; }) ? undefined : ts.map(results, function (sig) { return combineSignaturesOfUnionMembers(sig, signature_1); });
+                        if (!results) {
+                            return "break";
+                        }
+                    }
+                };
+                for (var _b = 0, signatureLists_1 = signatureLists; _b < signatureLists_1.length; _b++) {
+                    var signatures = signatureLists_1[_b];
+                    var state_2 = _loop_5(signatures);
+                    if (state_2 === "break")
+                        break;
+                }
+                result = results;
+            }
+            return result || ts.emptyArray;
+        }
+        function combineUnionThisParam(left, right) {
+            if (!left || !right) {
+                return left || right;
+            }
+            // A signature `this` type might be a read or a write position... It's very possible that it should be invariant
+            // and we should refuse to merge signatures if there are `this` types and they do not match. However, so as to be
+            // permissive when calling, for now, we'll union the `this` types just like the overlapping-union-signature check does
+            var thisType = getUnionType([getTypeOfSymbol(left), getTypeOfSymbol(right)], 2 /* Subtype */);
+            return createSymbolWithType(left, thisType);
+        }
+        function combineUnionParameters(left, right) {
+            var longest = getParameterCount(left) >= getParameterCount(right) ? left : right;
+            var shorter = longest === left ? right : left;
+            var longestCount = getParameterCount(longest);
+            var eitherHasEffectiveRest = (hasEffectiveRestParameter(left) || hasEffectiveRestParameter(right));
+            var needsExtraRestElement = eitherHasEffectiveRest && !hasEffectiveRestParameter(longest);
+            var params = new Array(longestCount + (needsExtraRestElement ? 1 : 0));
+            for (var i = 0; i < longestCount; i++) {
+                var longestParamType = tryGetTypeAtPosition(longest, i);
+                var shorterParamType = tryGetTypeAtPosition(shorter, i) || unknownType;
+                var unionParamType = getIntersectionType([longestParamType, shorterParamType]);
+                var isRestParam = eitherHasEffectiveRest && !needsExtraRestElement && i === (longestCount - 1);
+                var isOptional = i >= getMinArgumentCount(longest) && i >= getMinArgumentCount(shorter);
+                var leftName = getParameterNameAtPosition(left, i);
+                var rightName = getParameterNameAtPosition(right, i);
+                var paramSymbol = createSymbol(1 /* FunctionScopedVariable */ | (isOptional && !isRestParam ? 16777216 /* Optional */ : 0), leftName === rightName ? leftName : "arg" + i);
+                paramSymbol.type = isRestParam ? createArrayType(unionParamType) : unionParamType;
+                params[i] = paramSymbol;
+            }
+            if (needsExtraRestElement) {
+                var restParamSymbol = createSymbol(1 /* FunctionScopedVariable */, "args");
+                restParamSymbol.type = createArrayType(getTypeAtPosition(shorter, longestCount));
+                params[longestCount] = restParamSymbol;
+            }
+            return params;
+        }
+        function combineSignaturesOfUnionMembers(left, right) {
+            var declaration = left.declaration;
+            var params = combineUnionParameters(left, right);
+            var thisParam = combineUnionThisParam(left.thisParameter, right.thisParameter);
+            var minArgCount = Math.max(left.minArgumentCount, right.minArgumentCount);
+            var hasRestParam = left.hasRestParameter || right.hasRestParameter;
+            var hasLiteralTypes = left.hasLiteralTypes || right.hasLiteralTypes;
+            var result = createSignature(declaration, left.typeParameters || right.typeParameters, thisParam, params, 
+            /*resolvedReturnType*/ undefined, 
+            /*resolvedTypePredicate*/ undefined, minArgCount, hasRestParam, hasLiteralTypes);
+            result.unionSignatures = ts.concatenate(left.unionSignatures || [left], [right]);
+            return result;
+        }
+        function getUnionIndexInfo(types, kind) {
+            var indexTypes = [];
+            var isAnyReadonly = false;
+            for (var _i = 0, types_2 = types; _i < types_2.length; _i++) {
+                var type = types_2[_i];
+                var indexInfo = getIndexInfoOfType(type, kind);
+                if (!indexInfo) {
+                    return undefined;
+                }
+                indexTypes.push(indexInfo.type);
+                isAnyReadonly = isAnyReadonly || indexInfo.isReadonly;
+            }
+            return createIndexInfo(getUnionType(indexTypes, 2 /* Subtype */), isAnyReadonly);
+        }
+        function resolveUnionTypeMembers(type) {
+            // The members and properties collections are empty for union types. To get all properties of a union
+            // type use getPropertiesOfType (only the language service uses this).
+            var callSignatures = getUnionSignatures(ts.map(type.types, function (t) { return t === globalFunctionType ? [unknownSignature] : getSignaturesOfType(t, 0 /* Call */); }));
+            var constructSignatures = getUnionSignatures(ts.map(type.types, function (t) { return getSignaturesOfType(t, 1 /* Construct */); }));
+            var stringIndexInfo = getUnionIndexInfo(type.types, 0 /* String */);
+            var numberIndexInfo = getUnionIndexInfo(type.types, 1 /* Number */);
+            setStructuredTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+        }
+        function intersectTypes(type1, type2) {
+            return !type1 ? type2 : !type2 ? type1 : getIntersectionType([type1, type2]);
+        }
+        function intersectIndexInfos(info1, info2) {
+            return !info1 ? info2 : !info2 ? info1 : createIndexInfo(getIntersectionType([info1.type, info2.type]), info1.isReadonly && info2.isReadonly);
+        }
+        function unionSpreadIndexInfos(info1, info2) {
+            return info1 && info2 && createIndexInfo(getUnionType([info1.type, info2.type]), info1.isReadonly || info2.isReadonly);
+        }
+        function includeMixinType(type, types, index) {
+            var mixedTypes = [];
+            for (var i = 0; i < types.length; i++) {
+                if (i === index) {
+                    mixedTypes.push(type);
+                }
+                else if (isMixinConstructorType(types[i])) {
+                    mixedTypes.push(getReturnTypeOfSignature(getSignaturesOfType(types[i], 1 /* Construct */)[0]));
+                }
+            }
+            return getIntersectionType(mixedTypes);
+        }
+        function resolveIntersectionTypeMembers(type) {
+            // The members and properties collections are empty for intersection types. To get all properties of an
+            // intersection type use getPropertiesOfType (only the language service uses this).
+            var callSignatures = ts.emptyArray;
+            var constructSignatures = ts.emptyArray;
+            var stringIndexInfo;
+            var numberIndexInfo;
+            var types = type.types;
+            var mixinCount = ts.countWhere(types, isMixinConstructorType);
+            var _loop_6 = function (i) {
+                var t = type.types[i];
+                // When an intersection type contains mixin constructor types, the construct signatures from
+                // those types are discarded and their return types are mixed into the return types of all
+                // other construct signatures in the intersection type. For example, the intersection type
+                // '{ new(...args: any[]) => A } & { new(s: string) => B }' has a single construct signature
+                // 'new(s: string) => A & B'.
+                if (mixinCount === 0 || mixinCount === types.length && i === 0 || !isMixinConstructorType(t)) {
+                    var signatures = getSignaturesOfType(t, 1 /* Construct */);
+                    if (signatures.length && mixinCount > 0) {
+                        signatures = ts.map(signatures, function (s) {
+                            var clone = cloneSignature(s);
+                            clone.resolvedReturnType = includeMixinType(getReturnTypeOfSignature(s), types, i);
+                            return clone;
+                        });
+                    }
+                    constructSignatures = ts.concatenate(constructSignatures, signatures);
+                }
+                callSignatures = ts.concatenate(callSignatures, getSignaturesOfType(t, 0 /* Call */));
+                stringIndexInfo = intersectIndexInfos(stringIndexInfo, getIndexInfoOfType(t, 0 /* String */));
+                numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, 1 /* Number */));
+            };
+            for (var i = 0; i < types.length; i++) {
+                _loop_6(i);
+            }
+            setStructuredTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+        }
+        /**
+         * Converts an AnonymousType to a ResolvedType.
+         */
+        function resolveAnonymousTypeMembers(type) {
+            var symbol = type.symbol;
+            if (type.target) {
+                setStructuredTypeMembers(type, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
+                var members = createInstantiatedSymbolTable(getPropertiesOfObjectType(type.target), type.mapper, /*mappingThisOnly*/ false);
+                var callSignatures = instantiateSignatures(getSignaturesOfType(type.target, 0 /* Call */), type.mapper);
+                var constructSignatures = instantiateSignatures(getSignaturesOfType(type.target, 1 /* Construct */), type.mapper);
+                var stringIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, 0 /* String */), type.mapper);
+                var numberIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, 1 /* Number */), type.mapper);
+                setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            }
+            else if (symbol.flags & 2048 /* TypeLiteral */) {
+                setStructuredTypeMembers(type, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
+                var members = getMembersOfSymbol(symbol);
+                var callSignatures = getSignaturesOfSymbol(members.get("__call" /* Call */));
+                var constructSignatures = getSignaturesOfSymbol(members.get("__new" /* New */));
+                var stringIndexInfo = getIndexInfoOfSymbol(symbol, 0 /* String */);
+                var numberIndexInfo = getIndexInfoOfSymbol(symbol, 1 /* Number */);
+                setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
+            }
+            else {
+                // Combinations of function, class, enum and module
+                var members = emptySymbols;
+                var stringIndexInfo = void 0;
+                if (symbol.exports) {
+                    members = getExportsOfSymbol(symbol);
+                }
+                setStructuredTypeMembers(type, members, ts.emptyArray, ts.emptyArray, undefined, undefined);
+                if (symbol.flags & 32 /* Class */) {
+                    var classType = getDeclaredTypeOfClassOrInterface(symbol);
+                    var baseConstructorType = getBaseConstructorTypeOfClass(classType);
+                    if (baseConstructorType.flags & (524288 /* Object */ | 2097152 /* Intersection */ | 8650752 /* TypeVariable */)) {
+                        members = ts.createSymbolTable(getNamedMembers(members));
+                        addInheritedMembers(members, getPropertiesOfType(baseConstructorType));
+                    }
+                    else if (baseConstructorType === anyType) {
+                        stringIndexInfo = createIndexInfo(anyType, /*isReadonly*/ false);
+                    }
+                }
+                var numberIndexInfo = symbol.flags & 384 /* Enum */ ? enumNumberIndexInfo : undefined;
+                setStructuredTypeMembers(type, members, ts.emptyArray, ts.emptyArray, stringIndexInfo, numberIndexInfo);
+                // We resolve the members before computing the signatures because a signature may use
+                // typeof with a qualified name expression that circularly references the type we are
+                // in the process of resolving (see issue #6072). The temporarily empty signature list
+                // will never be observed because a qualified name can't reference signatures.
+                if (symbol.flags & (16 /* Function */ | 8192 /* Method */)) {
+                    type.callSignatures = getSignaturesOfSymbol(symbol);
+                    type.constructSignatures = ts.filter(type.callSignatures, function (sig) { return isJSConstructor(sig.declaration); });
+                }
+                // And likewise for construct signatures for classes
+                if (symbol.flags & 32 /* Class */) {
+                    var classType = getDeclaredTypeOfClassOrInterface(symbol);
+                    var constructSignatures = getSignaturesOfSymbol(symbol.members.get("__constructor" /* Constructor */));
+                    if (!constructSignatures.length) {
+                        constructSignatures = getDefaultConstructSignatures(classType);
+                    }
+                    type.constructSignatures = constructSignatures;
+                }
+            }
+        }
+        function resolveReverseMappedTypeMembers(type) {
+            var indexInfo = getIndexInfoOfType(type.source, 0 /* String */);
+            var modifiers = getMappedTypeModifiers(type.mappedType);
+            var readonlyMask = modifiers & 1 /* IncludeReadonly */ ? false : true;
+            var optionalMask = modifiers & 4 /* IncludeOptional */ ? 0 : 16777216 /* Optional */;
+            var stringIndexInfo = indexInfo && createIndexInfo(inferReverseMappedType(indexInfo.type, type.mappedType, type.constraintType), readonlyMask && indexInfo.isReadonly);
+            var members = ts.createSymbolTable();
+            for (var _i = 0, _a = getPropertiesOfType(type.source); _i < _a.length; _i++) {
+                var prop = _a[_i];
+                var checkFlags = 4096 /* ReverseMapped */ | (readonlyMask && isReadonlySymbol(prop) ? 8 /* Readonly */ : 0);
+                var inferredProp = createSymbol(4 /* Property */ | prop.flags & optionalMask, prop.escapedName, checkFlags);
+                inferredProp.declarations = prop.declarations;
+                inferredProp.nameType = prop.nameType;
+                inferredProp.propertyType = getTypeOfSymbol(prop);
+                inferredProp.mappedType = type.mappedType;
+                inferredProp.constraintType = type.constraintType;
+                members.set(prop.escapedName, inferredProp);
+            }
+            setStructuredTypeMembers(type, members, ts.emptyArray, ts.emptyArray, stringIndexInfo, undefined);
+        }
+        // Return the lower bound of the key type in a mapped type. Intuitively, the lower
+        // bound includes those keys that are known to always be present, for example because
+        // because of constraints on type parameters (e.g. 'keyof T' for a constrained T).
+        function getLowerBoundOfKeyType(type) {
+            if (type.flags & (1 /* Any */ | 131068 /* Primitive */)) {
+                return type;
+            }
+            if (type.flags & 4194304 /* Index */) {
+                return getIndexType(getApparentType(type.type));
+            }
+            if (type.flags & 16777216 /* Conditional */) {
+                return getLowerBoundOfConditionalType(type);
+            }
+            if (type.flags & 1048576 /* Union */) {
+                return getUnionType(ts.sameMap(type.types, getLowerBoundOfKeyType));
+            }
+            if (type.flags & 2097152 /* Intersection */) {
+                return getIntersectionType(ts.sameMap(type.types, getLowerBoundOfKeyType));
+            }
+            return neverType;
+        }
+        function getLowerBoundOfConditionalType(type) {
+            if (type.root.isDistributive) {
+                var constraint = getLowerBoundOfKeyType(type.checkType);
+                if (constraint !== type.checkType) {
+                    var mapper = makeUnaryTypeMapper(type.root.checkType, constraint);
+                    return getConditionalTypeInstantiation(type, combineTypeMappers(mapper, type.mapper));
+                }
+            }
+            return type;
+        }
+        /** Resolve the members of a mapped type { [P in K]: T } */
+        function resolveMappedTypeMembers(type) {
+            var members = ts.createSymbolTable();
+            var stringIndexInfo;
+            var numberIndexInfo;
+            // Resolve upfront such that recursive references see an empty object type.
+            setStructuredTypeMembers(type, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
+            // In { [P in K]: T }, we refer to P as the type parameter type, K as the constraint type,
+            // and T as the template type.
+            var typeParameter = getTypeParameterFromMappedType(type);
+            var constraintType = getConstraintTypeFromMappedType(type);
+            var templateType = getTemplateTypeFromMappedType(type.target || type);
+            var modifiersType = getApparentType(getModifiersTypeFromMappedType(type)); // The 'T' in 'keyof T'
+            var templateModifiers = getMappedTypeModifiers(type);
+            var include = keyofStringsOnly ? 128 /* StringLiteral */ : 8576 /* StringOrNumberLiteralOrUnique */;
+            if (isMappedTypeWithKeyofConstraintDeclaration(type)) {
+                // We have a { [P in keyof T]: X }
+                for (var _i = 0, _a = getPropertiesOfType(modifiersType); _i < _a.length; _i++) {
+                    var prop = _a[_i];
+                    addMemberForKeyType(getLiteralTypeFromProperty(prop, include));
+                }
+                if (modifiersType.flags & 1 /* Any */ || getIndexInfoOfType(modifiersType, 0 /* String */)) {
+                    addMemberForKeyType(stringType);
+                }
+                if (!keyofStringsOnly && getIndexInfoOfType(modifiersType, 1 /* Number */)) {
+                    addMemberForKeyType(numberType);
+                }
+            }
+            else {
+                forEachType(getLowerBoundOfKeyType(constraintType), addMemberForKeyType);
+            }
+            setStructuredTypeMembers(type, members, ts.emptyArray, ts.emptyArray, stringIndexInfo, numberIndexInfo);
+            function addMemberForKeyType(t) {
+                // Create a mapper from T to the current iteration type constituent. Then, if the
+                // mapped type is itself an instantiated type, combine the iteration mapper with the
+                // instantiation mapper.
+                var templateMapper = combineTypeMappers(type.mapper, createTypeMapper([typeParameter], [t]));
+                var propType = instantiateType(templateType, templateMapper);
+                // If the current iteration type constituent is a string literal type, create a property.
+                // Otherwise, for type string create a string index signature.
+                if (isTypeUsableAsPropertyName(t)) {
+                    var propName = getPropertyNameFromType(t);
+                    var modifiersProp = getPropertyOfType(modifiersType, propName);
+                    var isOptional = !!(templateModifiers & 4 /* IncludeOptional */ ||
+                        !(templateModifiers & 8 /* ExcludeOptional */) && modifiersProp && modifiersProp.flags & 16777216 /* Optional */);
+                    var isReadonly = !!(templateModifiers & 1 /* IncludeReadonly */ ||
+                        !(templateModifiers & 2 /* ExcludeReadonly */) && modifiersProp && isReadonlySymbol(modifiersProp));
+                    var prop = createSymbol(4 /* Property */ | (isOptional ? 16777216 /* Optional */ : 0), propName, isReadonly ? 8 /* Readonly */ : 0);
+                    // When creating an optional property in strictNullChecks mode, if 'undefined' isn't assignable to the
+                    // type, we include 'undefined' in the type. Similarly, when creating a non-optional property in strictNullChecks
+                    // mode, if the underlying property is optional we remove 'undefined' from the type.
+                    prop.type = strictNullChecks && isOptional && !isTypeAssignableTo(undefinedType, propType) ? getOptionalType(propType) :
+                        strictNullChecks && !isOptional && modifiersProp && modifiersProp.flags & 16777216 /* Optional */ ? getTypeWithFacts(propType, 524288 /* NEUndefined */) :
+                            propType;
+                    if (modifiersProp) {
+                        prop.syntheticOrigin = modifiersProp;
+                        prop.declarations = modifiersProp.declarations;
+                    }
+                    prop.nameType = t;
+                    members.set(propName, prop);
+                }
+                else if (t.flags & (1 /* Any */ | 4 /* String */)) {
+                    stringIndexInfo = createIndexInfo(propType, !!(templateModifiers & 1 /* IncludeReadonly */));
+                }
+                else if (t.flags & 8 /* Number */) {
+                    numberIndexInfo = createIndexInfo(propType, !!(templateModifiers & 1 /* IncludeReadonly */));
+                }
+            }
+        }
+        function getTypeParameterFromMappedType(type) {
+            return type.typeParameter ||
+                (type.typeParameter = getDeclaredTypeOfTypeParameter(getSymbolOfNode(type.declaration.typeParameter)));
+        }
+        function getConstraintTypeFromMappedType(type) {
+            return type.constraintType ||
+                (type.constraintType = getConstraintOfTypeParameter(getTypeParameterFromMappedType(type)) || errorType);
+        }
+        function getTemplateTypeFromMappedType(type) {
+            return type.templateType ||
+                (type.templateType = type.declaration.type ?
+                    instantiateType(addOptionality(getTypeFromTypeNode(type.declaration.type), !!(getMappedTypeModifiers(type) & 4 /* IncludeOptional */)), type.mapper || identityMapper) :
+                    errorType);
+        }
+        function getConstraintDeclarationForMappedType(type) {
+            return ts.getEffectiveConstraintOfTypeParameter(type.declaration.typeParameter);
+        }
+        function isMappedTypeWithKeyofConstraintDeclaration(type) {
+            var constraintDeclaration = getConstraintDeclarationForMappedType(type); // TODO: GH#18217
+            return constraintDeclaration.kind === 179 /* TypeOperator */ &&
+                constraintDeclaration.operator === 129 /* KeyOfKeyword */;
+        }
+        function getModifiersTypeFromMappedType(type) {
+            if (!type.modifiersType) {
+                if (isMappedTypeWithKeyofConstraintDeclaration(type)) {
+                    // If the constraint declaration is a 'keyof T' node, the modifiers type is T. We check
+                    // AST nodes here because, when T is a non-generic type, the logic below eagerly resolves
+                    // 'keyof T' to a literal union type and we can't recover T from that type.
+                    type.modifiersType = instantiateType(getTypeFromTypeNode(getConstraintDeclarationForMappedType(type).type), type.mapper || identityMapper);
+                }
+                else {
+                    // Otherwise, get the declared constraint type, and if the constraint type is a type parameter,
+                    // get the constraint of that type parameter. If the resulting type is an indexed type 'keyof T',
+                    // the modifiers type is T. Otherwise, the modifiers type is {}.
+                    var declaredType = getTypeFromMappedTypeNode(type.declaration);
+                    var constraint = getConstraintTypeFromMappedType(declaredType);
+                    var extendedConstraint = constraint && constraint.flags & 262144 /* TypeParameter */ ? getConstraintOfTypeParameter(constraint) : constraint;
+                    type.modifiersType = extendedConstraint && extendedConstraint.flags & 4194304 /* Index */ ? instantiateType(extendedConstraint.type, type.mapper || identityMapper) : emptyObjectType;
+                }
+            }
+            return type.modifiersType;
+        }
+        function getMappedTypeModifiers(type) {
+            var declaration = type.declaration;
+            return (declaration.readonlyToken ? declaration.readonlyToken.kind === 39 /* MinusToken */ ? 2 /* ExcludeReadonly */ : 1 /* IncludeReadonly */ : 0) |
+                (declaration.questionToken ? declaration.questionToken.kind === 39 /* MinusToken */ ? 8 /* ExcludeOptional */ : 4 /* IncludeOptional */ : 0);
+        }
+        function getMappedTypeOptionality(type) {
+            var modifiers = getMappedTypeModifiers(type);
+            return modifiers & 8 /* ExcludeOptional */ ? -1 : modifiers & 4 /* IncludeOptional */ ? 1 : 0;
+        }
+        function getCombinedMappedTypeOptionality(type) {
+            var optionality = getMappedTypeOptionality(type);
+            var modifiersType = getModifiersTypeFromMappedType(type);
+            return optionality || (isGenericMappedType(modifiersType) ? getMappedTypeOptionality(modifiersType) : 0);
+        }
+        function isPartialMappedType(type) {
+            return !!(ts.getObjectFlags(type) & 32 /* Mapped */ && getMappedTypeModifiers(type) & 4 /* IncludeOptional */);
+        }
+        function isGenericMappedType(type) {
+            return !!(ts.getObjectFlags(type) & 32 /* Mapped */) && isGenericIndexType(getConstraintTypeFromMappedType(type));
+        }
+        function resolveStructuredTypeMembers(type) {
+            if (!type.members) {
+                if (type.flags & 524288 /* Object */) {
+                    if (type.objectFlags & 4 /* Reference */) {
+                        resolveTypeReferenceMembers(type);
+                    }
+                    else if (type.objectFlags & 3 /* ClassOrInterface */) {
+                        resolveClassOrInterfaceMembers(type);
+                    }
+                    else if (type.objectFlags & 2048 /* ReverseMapped */) {
+                        resolveReverseMappedTypeMembers(type);
+                    }
+                    else if (type.objectFlags & 16 /* Anonymous */) {
+                        resolveAnonymousTypeMembers(type);
+                    }
+                    else if (type.objectFlags & 32 /* Mapped */) {
+                        resolveMappedTypeMembers(type);
+                    }
+                }
+                else if (type.flags & 1048576 /* Union */) {
+                    resolveUnionTypeMembers(type);
+                }
+                else if (type.flags & 2097152 /* Intersection */) {
+                    resolveIntersectionTypeMembers(type);
+                }
+            }
+            return type;
+        }
+        /** Return properties of an object type or an empty array for other types */
+        function getPropertiesOfObjectType(type) {
+            if (type.flags & 524288 /* Object */) {
+                return resolveStructuredTypeMembers(type).properties;
+            }
+            return ts.emptyArray;
+        }
+        /** If the given type is an object type and that type has a property by the given name,
+         * return the symbol for that property. Otherwise return undefined.
+         */
+        function getPropertyOfObjectType(type, name) {
+            if (type.flags & 524288 /* Object */) {
+                var resolved = resolveStructuredTypeMembers(type);
+                var symbol = resolved.members.get(name);
+                if (symbol && symbolIsValue(symbol)) {
+                    return symbol;
+                }
+            }
+        }
+        function getPropertiesOfUnionOrIntersectionType(type) {
+            if (!type.resolvedProperties) {
+                var members = ts.createSymbolTable();
+                for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                    var current = _a[_i];
+                    for (var _b = 0, _c = getPropertiesOfType(current); _b < _c.length; _b++) {
+                        var prop = _c[_b];
+                        if (!members.has(prop.escapedName)) {
+                            var combinedProp = getPropertyOfUnionOrIntersectionType(type, prop.escapedName);
+                            if (combinedProp) {
+                                members.set(prop.escapedName, combinedProp);
+                            }
+                        }
+                    }
+                    // The properties of a union type are those that are present in all constituent types, so
+                    // we only need to check the properties of the first type
+                    if (type.flags & 1048576 /* Union */) {
+                        break;
+                    }
+                }
+                type.resolvedProperties = getNamedMembers(members);
+            }
+            return type.resolvedProperties;
+        }
+        function getPropertiesOfType(type) {
+            type = getApparentType(type);
+            return type.flags & 3145728 /* UnionOrIntersection */ ?
+                getPropertiesOfUnionOrIntersectionType(type) :
+                getPropertiesOfObjectType(type);
+        }
+        function isTypeInvalidDueToUnionDiscriminant(contextualType, obj) {
+            var list = obj.properties;
+            return list.some(function (property) {
+                var nameType = property.name && getLiteralTypeFromPropertyName(property.name);
+                var name = nameType && isTypeUsableAsPropertyName(nameType) ? getPropertyNameFromType(nameType) : undefined;
+                var expected = name === undefined ? undefined : getTypeOfPropertyOfType(contextualType, name);
+                return !!expected && isLiteralType(expected) && !isTypeIdenticalTo(getTypeOfNode(property), expected);
+            });
+        }
+        function getAllPossiblePropertiesOfTypes(types) {
+            var unionType = getUnionType(types);
+            if (!(unionType.flags & 1048576 /* Union */)) {
+                return getAugmentedPropertiesOfType(unionType);
+            }
+            var props = ts.createSymbolTable();
+            for (var _i = 0, types_3 = types; _i < types_3.length; _i++) {
+                var memberType = types_3[_i];
+                for (var _a = 0, _b = getAugmentedPropertiesOfType(memberType); _a < _b.length; _a++) {
+                    var escapedName = _b[_a].escapedName;
+                    if (!props.has(escapedName)) {
+                        var prop = createUnionOrIntersectionProperty(unionType, escapedName);
+                        // May be undefined if the property is private
+                        if (prop)
+                            props.set(escapedName, prop);
+                    }
+                }
+            }
+            return ts.arrayFrom(props.values());
+        }
+        function getConstraintOfType(type) {
+            return type.flags & 262144 /* TypeParameter */ ? getConstraintOfTypeParameter(type) :
+                type.flags & 8388608 /* IndexedAccess */ ? getConstraintOfIndexedAccess(type) :
+                    type.flags & 16777216 /* Conditional */ ? getConstraintOfConditionalType(type) :
+                        getBaseConstraintOfType(type);
+        }
+        function getConstraintOfTypeParameter(typeParameter) {
+            return hasNonCircularBaseConstraint(typeParameter) ? getConstraintFromTypeParameter(typeParameter) : undefined;
+        }
+        function getConstraintOfIndexedAccess(type) {
+            var objectType = getConstraintOfType(type.objectType) || type.objectType;
+            if (objectType !== type.objectType) {
+                var constraint = getIndexedAccessType(objectType, type.indexType, /*accessNode*/ undefined, errorType);
+                if (constraint && constraint !== errorType) {
+                    return constraint;
+                }
+            }
+            var baseConstraint = getBaseConstraintOfType(type);
+            return baseConstraint && baseConstraint !== type ? baseConstraint : undefined;
+        }
+        function getDefaultConstraintOfConditionalType(type) {
+            if (!type.resolvedDefaultConstraint) {
+                var rootTrueType = type.root.trueType;
+                var rootTrueConstraint = !(rootTrueType.flags & 33554432 /* Substitution */)
+                    ? rootTrueType
+                    : (rootTrueType.substitute).flags & 3 /* AnyOrUnknown */
+                        ? rootTrueType.typeVariable
+                        : getIntersectionType([rootTrueType.substitute, rootTrueType.typeVariable]);
+                type.resolvedDefaultConstraint = getUnionType([instantiateType(rootTrueConstraint, type.combinedMapper || type.mapper), getFalseTypeFromConditionalType(type)]);
+            }
+            return type.resolvedDefaultConstraint;
+        }
+        function getConstraintOfDistributiveConditionalType(type) {
+            // Check if we have a conditional type of the form 'T extends U ? X : Y', where T is a constrained
+            // type parameter. If so, create an instantiation of the conditional type where T is replaced
+            // with its constraint. We do this because if the constraint is a union type it will be distributed
+            // over the conditional type and possibly reduced. For example, 'T extends undefined ? never : T'
+            // removes 'undefined' from T.
+            if (type.root.isDistributive) {
+                var simplified = getSimplifiedType(type.checkType);
+                var constraint = simplified === type.checkType ? getConstraintOfType(simplified) : simplified;
+                if (constraint && constraint !== type.checkType) {
+                    var mapper = makeUnaryTypeMapper(type.root.checkType, constraint);
+                    var instantiated = getConditionalTypeInstantiation(type, combineTypeMappers(mapper, type.mapper));
+                    if (!(instantiated.flags & 131072 /* Never */)) {
+                        return instantiated;
+                    }
+                }
+            }
+            return undefined;
+        }
+        function getConstraintOfConditionalType(type) {
+            return getConstraintOfDistributiveConditionalType(type) || getDefaultConstraintOfConditionalType(type);
+        }
+        function getUnionConstraintOfIntersection(type, targetIsUnion) {
+            var constraints;
+            var hasDisjointDomainType = false;
+            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                var t = _a[_i];
+                if (t.flags & 63176704 /* Instantiable */) {
+                    // We keep following constraints as long as we have an instantiable type that is known
+                    // not to be circular or infinite (hence we stop on index access types).
+                    var constraint = getConstraintOfType(t);
+                    while (constraint && constraint.flags & (262144 /* TypeParameter */ | 4194304 /* Index */ | 16777216 /* Conditional */)) {
+                        constraint = getConstraintOfType(constraint);
+                    }
+                    if (constraint) {
+                        // A constraint that isn't a union type implies that the final type would be a non-union
+                        // type as well. Since non-union constraints are of no interest, we can exit here.
+                        if (!(constraint.flags & 1048576 /* Union */)) {
+                            return undefined;
+                        }
+                        constraints = ts.append(constraints, constraint);
+                    }
+                }
+                else if (t.flags & 67238908 /* DisjointDomains */) {
+                    hasDisjointDomainType = true;
+                }
+            }
+            // If the target is a union type or if we are intersecting with types belonging to one of the
+            // disjoint domans, we may end up producing a constraint that hasn't been examined before.
+            if (constraints && (targetIsUnion || hasDisjointDomainType)) {
+                if (hasDisjointDomainType) {
+                    // We add any types belong to one of the disjoint domans because they might cause the final
+                    // intersection operation to reduce the union constraints.
+                    for (var _b = 0, _c = type.types; _b < _c.length; _b++) {
+                        var t = _c[_b];
+                        if (t.flags & 67238908 /* DisjointDomains */) {
+                            constraints = ts.append(constraints, t);
+                        }
+                    }
+                }
+                return getIntersectionType(constraints);
+            }
+            return undefined;
+        }
+        function getBaseConstraintOfType(type) {
+            if (type.flags & (58982400 /* InstantiableNonPrimitive */ | 3145728 /* UnionOrIntersection */)) {
+                var constraint = getResolvedBaseConstraint(type);
+                return constraint !== noConstraintType && constraint !== circularConstraintType ? constraint : undefined;
+            }
+            return type.flags & 4194304 /* Index */ ? keyofConstraintType : undefined;
+        }
+        /**
+         * This is similar to `getBaseConstraintOfType` except it returns the input type if there's no base constraint, instead of `undefined`
+         * It also doesn't map indexes to `string`, as where this is used this would be unneeded (and likely undesirable)
+         */
+        function getBaseConstraintOrType(type) {
+            return getBaseConstraintOfType(type) || type;
+        }
+        function hasNonCircularBaseConstraint(type) {
+            return getResolvedBaseConstraint(type) !== circularConstraintType;
+        }
+        /**
+         * Return the resolved base constraint of a type variable. The noConstraintType singleton is returned if the
+         * type variable has no constraint, and the circularConstraintType singleton is returned if the constraint
+         * circularly references the type variable.
+         */
+        function getResolvedBaseConstraint(type) {
+            var nonTerminating = false;
+            return type.resolvedBaseConstraint ||
+                (type.resolvedBaseConstraint = getTypeWithThisArgument(getImmediateBaseConstraint(type), type));
+            function getImmediateBaseConstraint(t) {
+                if (!t.immediateBaseConstraint) {
+                    if (!pushTypeResolution(t, 4 /* ImmediateBaseConstraint */)) {
+                        return circularConstraintType;
+                    }
+                    if (constraintDepth === 50) {
+                        // We have reached 50 recursive invocations of getImmediateBaseConstraint and there is a
+                        // very high likelyhood we're dealing with an infinite generic type that perpetually generates
+                        // new type identities as we descend into it. We stop the recursion here and mark this type
+                        // and the outer types as having circular constraints.
+                        nonTerminating = true;
+                        return t.immediateBaseConstraint = noConstraintType;
+                    }
+                    constraintDepth++;
+                    var result = computeBaseConstraint(getSimplifiedType(t));
+                    constraintDepth--;
+                    if (!popTypeResolution() || nonTerminating) {
+                        result = circularConstraintType;
+                    }
+                    t.immediateBaseConstraint = result || noConstraintType;
+                }
+                return t.immediateBaseConstraint;
+            }
+            function getBaseConstraint(t) {
+                var c = getImmediateBaseConstraint(t);
+                return c !== noConstraintType && c !== circularConstraintType ? c : undefined;
+            }
+            function computeBaseConstraint(t) {
+                if (t.flags & 262144 /* TypeParameter */) {
+                    var constraint = getConstraintFromTypeParameter(t);
+                    return t.isThisType || !constraint ?
+                        constraint :
+                        getBaseConstraint(constraint);
+                }
+                if (t.flags & 3145728 /* UnionOrIntersection */) {
+                    var types = t.types;
+                    var baseTypes = [];
+                    for (var _i = 0, types_4 = types; _i < types_4.length; _i++) {
+                        var type_3 = types_4[_i];
+                        var baseType = getBaseConstraint(type_3);
+                        if (baseType) {
+                            baseTypes.push(baseType);
+                        }
+                    }
+                    return t.flags & 1048576 /* Union */ && baseTypes.length === types.length ? getUnionType(baseTypes) :
+                        t.flags & 2097152 /* Intersection */ && baseTypes.length ? getIntersectionType(baseTypes) :
+                            undefined;
+                }
+                if (t.flags & 4194304 /* Index */) {
+                    return keyofConstraintType;
+                }
+                if (t.flags & 8388608 /* IndexedAccess */) {
+                    var baseObjectType = getBaseConstraint(t.objectType);
+                    var baseIndexType = getBaseConstraint(t.indexType);
+                    var baseIndexedAccess = baseObjectType && baseIndexType ? getIndexedAccessType(baseObjectType, baseIndexType, /*accessNode*/ undefined, errorType) : undefined;
+                    return baseIndexedAccess && baseIndexedAccess !== errorType ? getBaseConstraint(baseIndexedAccess) : undefined;
+                }
+                if (t.flags & 16777216 /* Conditional */) {
+                    var constraint = getConstraintOfConditionalType(t);
+                    return constraint && getBaseConstraint(constraint);
+                }
+                if (t.flags & 33554432 /* Substitution */) {
+                    return getBaseConstraint(t.substitute);
+                }
+                return t;
+            }
+        }
+        function getApparentTypeOfIntersectionType(type) {
+            return type.resolvedApparentType || (type.resolvedApparentType = getTypeWithThisArgument(type, type, /*apparentType*/ true));
+        }
+        function getResolvedTypeParameterDefault(typeParameter) {
+            if (!typeParameter.default) {
+                if (typeParameter.target) {
+                    var targetDefault = getResolvedTypeParameterDefault(typeParameter.target);
+                    typeParameter.default = targetDefault ? instantiateType(targetDefault, typeParameter.mapper) : noConstraintType;
+                }
+                else {
+                    // To block recursion, set the initial value to the resolvingDefaultType.
+                    typeParameter.default = resolvingDefaultType;
+                    var defaultDeclaration = typeParameter.symbol && ts.forEach(typeParameter.symbol.declarations, function (decl) { return ts.isTypeParameterDeclaration(decl) && decl.default; });
+                    var defaultType = defaultDeclaration ? getTypeFromTypeNode(defaultDeclaration) : noConstraintType;
+                    if (typeParameter.default === resolvingDefaultType) {
+                        // If we have not been called recursively, set the correct default type.
+                        typeParameter.default = defaultType;
+                    }
+                }
+            }
+            else if (typeParameter.default === resolvingDefaultType) {
+                // If we are called recursively for this type parameter, mark the default as circular.
+                typeParameter.default = circularConstraintType;
+            }
+            return typeParameter.default;
+        }
+        /**
+         * Gets the default type for a type parameter.
+         *
+         * If the type parameter is the result of an instantiation, this gets the instantiated
+         * default type of its target. If the type parameter has no default type or the default is
+         * circular, `undefined` is returned.
+         */
+        function getDefaultFromTypeParameter(typeParameter) {
+            var defaultType = getResolvedTypeParameterDefault(typeParameter);
+            return defaultType !== noConstraintType && defaultType !== circularConstraintType ? defaultType : undefined;
+        }
+        function hasNonCircularTypeParameterDefault(typeParameter) {
+            return getResolvedTypeParameterDefault(typeParameter) !== circularConstraintType;
+        }
+        /**
+         * Indicates whether the declaration of a typeParameter has a default type.
+         */
+        function hasTypeParameterDefault(typeParameter) {
+            return !!(typeParameter.symbol && ts.forEach(typeParameter.symbol.declarations, function (decl) { return ts.isTypeParameterDeclaration(decl) && decl.default; }));
+        }
+        function getApparentTypeOfMappedType(type) {
+            return type.resolvedApparentType || (type.resolvedApparentType = getResolvedApparentTypeOfMappedType(type));
+        }
+        function getResolvedApparentTypeOfMappedType(type) {
+            var typeVariable = getHomomorphicTypeVariable(type);
+            if (typeVariable) {
+                var constraint = getConstraintOfTypeParameter(typeVariable);
+                if (constraint && (isArrayType(constraint) || isReadonlyArrayType(constraint) || isTupleType(constraint))) {
+                    var mapper = makeUnaryTypeMapper(typeVariable, constraint);
+                    return instantiateType(type, combineTypeMappers(mapper, type.mapper));
+                }
+            }
+            return type;
+        }
+        /**
+         * For a type parameter, return the base constraint of the type parameter. For the string, number,
+         * boolean, and symbol primitive types, return the corresponding object types. Otherwise return the
+         * type itself. Note that the apparent type of a union type is the union type itself.
+         */
+        function getApparentType(type) {
+            var t = type.flags & 63176704 /* Instantiable */ ? getBaseConstraintOfType(type) || emptyObjectType : type;
+            return ts.getObjectFlags(t) & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) :
+                t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t) :
+                    t.flags & 132 /* StringLike */ ? globalStringType :
+                        t.flags & 296 /* NumberLike */ ? globalNumberType :
+                            t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType(/*reportErrors*/ languageVersion >= 6 /* ESNext */) :
+                                t.flags & 528 /* BooleanLike */ ? globalBooleanType :
+                                    t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType(/*reportErrors*/ languageVersion >= 2 /* ES2015 */) :
+                                        t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType :
+                                            t.flags & 4194304 /* Index */ ? keyofConstraintType :
+                                                t;
+        }
+        function createUnionOrIntersectionProperty(containingType, name) {
+            var props;
+            var indexTypes;
+            var isUnion = containingType.flags & 1048576 /* Union */;
+            var excludeModifiers = isUnion ? 24 /* NonPublicAccessibilityModifier */ : 0;
+            // Flags we want to propagate to the result if they exist in all source symbols
+            var commonFlags = isUnion ? 0 /* None */ : 16777216 /* Optional */;
+            var syntheticFlag = 4 /* SyntheticMethod */;
+            var checkFlags = 0;
+            for (var _i = 0, _a = containingType.types; _i < _a.length; _i++) {
+                var current = _a[_i];
+                var type = getApparentType(current);
+                if (type !== errorType) {
+                    var prop = getPropertyOfType(type, name);
+                    var modifiers = prop ? ts.getDeclarationModifierFlagsFromSymbol(prop) : 0;
+                    if (prop && !(modifiers & excludeModifiers)) {
+                        commonFlags &= prop.flags;
+                        props = ts.appendIfUnique(props, prop);
+                        checkFlags |= (isReadonlySymbol(prop) ? 8 /* Readonly */ : 0) |
+                            (!(modifiers & 24 /* NonPublicAccessibilityModifier */) ? 128 /* ContainsPublic */ : 0) |
+                            (modifiers & 16 /* Protected */ ? 256 /* ContainsProtected */ : 0) |
+                            (modifiers & 8 /* Private */ ? 512 /* ContainsPrivate */ : 0) |
+                            (modifiers & 32 /* Static */ ? 1024 /* ContainsStatic */ : 0);
+                        if (!isPrototypeProperty(prop)) {
+                            syntheticFlag = 2 /* SyntheticProperty */;
+                        }
+                    }
+                    else if (isUnion) {
+                        var indexInfo = !isLateBoundName(name) && (isNumericLiteralName(name) && getIndexInfoOfType(type, 1 /* Number */) || getIndexInfoOfType(type, 0 /* String */));
+                        if (indexInfo) {
+                            checkFlags |= indexInfo.isReadonly ? 8 /* Readonly */ : 0;
+                            indexTypes = ts.append(indexTypes, isTupleType(type) ? getRestTypeOfTupleType(type) || undefinedType : indexInfo.type);
+                        }
+                        else {
+                            checkFlags |= 16 /* Partial */;
+                        }
+                    }
+                }
+            }
+            if (!props) {
+                return undefined;
+            }
+            if (props.length === 1 && !(checkFlags & 16 /* Partial */) && !indexTypes) {
+                return props[0];
+            }
+            var declarations;
+            var firstType;
+            var nameType;
+            var propTypes = [];
+            var firstValueDeclaration;
+            var hasNonUniformValueDeclaration = false;
+            for (var _b = 0, props_1 = props; _b < props_1.length; _b++) {
+                var prop = props_1[_b];
+                if (!firstValueDeclaration) {
+                    firstValueDeclaration = prop.valueDeclaration;
+                }
+                else if (prop.valueDeclaration !== firstValueDeclaration) {
+                    hasNonUniformValueDeclaration = true;
+                }
+                declarations = ts.addRange(declarations, prop.declarations);
+                var type = getTypeOfSymbol(prop);
+                if (!firstType) {
+                    firstType = type;
+                    nameType = prop.nameType;
+                }
+                else if (type !== firstType) {
+                    checkFlags |= 32 /* HasNonUniformType */;
+                }
+                if (isLiteralType(type)) {
+                    checkFlags |= 64 /* HasLiteralType */;
+                }
+                propTypes.push(type);
+            }
+            ts.addRange(propTypes, indexTypes);
+            var result = createSymbol(4 /* Property */ | commonFlags, name, syntheticFlag | checkFlags);
+            result.containingType = containingType;
+            if (!hasNonUniformValueDeclaration && firstValueDeclaration) {
+                result.valueDeclaration = firstValueDeclaration;
+                // Inherit information about parent type.
+                if (firstValueDeclaration.symbol.parent) {
+                    result.parent = firstValueDeclaration.symbol.parent;
+                }
+            }
+            result.declarations = declarations;
+            result.nameType = nameType;
+            result.type = isUnion ? getUnionType(propTypes) : getIntersectionType(propTypes);
+            return result;
+        }
+        // Return the symbol for a given property in a union or intersection type, or undefined if the property
+        // does not exist in any constituent type. Note that the returned property may only be present in some
+        // constituents, in which case the isPartial flag is set when the containing type is union type. We need
+        // these partial properties when identifying discriminant properties, but otherwise they are filtered out
+        // and do not appear to be present in the union type.
+        function getUnionOrIntersectionProperty(type, name) {
+            var properties = type.propertyCache || (type.propertyCache = ts.createSymbolTable());
+            var property = properties.get(name);
+            if (!property) {
+                property = createUnionOrIntersectionProperty(type, name);
+                if (property) {
+                    properties.set(name, property);
+                }
+            }
+            return property;
+        }
+        function getPropertyOfUnionOrIntersectionType(type, name) {
+            var property = getUnionOrIntersectionProperty(type, name);
+            // We need to filter out partial properties in union types
+            return property && !(ts.getCheckFlags(property) & 16 /* Partial */) ? property : undefined;
+        }
+        /**
+         * Return the symbol for the property with the given name in the given type. Creates synthetic union properties when
+         * necessary, maps primitive types and type parameters are to their apparent types, and augments with properties from
+         * Object and Function as appropriate.
+         *
+         * @param type a type to look up property from
+         * @param name a name of property to look up in a given type
+         */
+        function getPropertyOfType(type, name) {
+            type = getApparentType(type);
+            if (type.flags & 524288 /* Object */) {
+                var resolved = resolveStructuredTypeMembers(type);
+                var symbol = resolved.members.get(name);
+                if (symbol && symbolIsValue(symbol)) {
+                    return symbol;
+                }
+                var functionType = resolved === anyFunctionType ? globalFunctionType :
+                    resolved.callSignatures.length ? globalCallableFunctionType :
+                        resolved.constructSignatures.length ? globalNewableFunctionType :
+                            undefined;
+                if (functionType) {
+                    var symbol_1 = getPropertyOfObjectType(functionType, name);
+                    if (symbol_1) {
+                        return symbol_1;
+                    }
+                }
+                return getPropertyOfObjectType(globalObjectType, name);
+            }
+            if (type.flags & 3145728 /* UnionOrIntersection */) {
+                return getPropertyOfUnionOrIntersectionType(type, name);
+            }
+            return undefined;
+        }
+        function getSignaturesOfStructuredType(type, kind) {
+            if (type.flags & 3670016 /* StructuredType */) {
+                var resolved = resolveStructuredTypeMembers(type);
+                return kind === 0 /* Call */ ? resolved.callSignatures : resolved.constructSignatures;
+            }
+            return ts.emptyArray;
+        }
+        /**
+         * Return the signatures of the given kind in the given type. Creates synthetic union signatures when necessary and
+         * maps primitive types and type parameters are to their apparent types.
+         */
+        function getSignaturesOfType(type, kind) {
+            return getSignaturesOfStructuredType(getApparentType(type), kind);
+        }
+        function getIndexInfoOfStructuredType(type, kind) {
+            if (type.flags & 3670016 /* StructuredType */) {
+                var resolved = resolveStructuredTypeMembers(type);
+                return kind === 0 /* String */ ? resolved.stringIndexInfo : resolved.numberIndexInfo;
+            }
+        }
+        function getIndexTypeOfStructuredType(type, kind) {
+            var info = getIndexInfoOfStructuredType(type, kind);
+            return info && info.type;
+        }
+        // Return the indexing info of the given kind in the given type. Creates synthetic union index types when necessary and
+        // maps primitive types and type parameters are to their apparent types.
+        function getIndexInfoOfType(type, kind) {
+            return getIndexInfoOfStructuredType(getApparentType(type), kind);
+        }
+        // Return the index type of the given kind in the given type. Creates synthetic union index types when necessary and
+        // maps primitive types and type parameters are to their apparent types.
+        function getIndexTypeOfType(type, kind) {
+            return getIndexTypeOfStructuredType(getApparentType(type), kind);
+        }
+        function getImplicitIndexTypeOfType(type, kind) {
+            if (isObjectTypeWithInferableIndex(type)) {
+                var propTypes = [];
+                for (var _i = 0, _a = getPropertiesOfType(type); _i < _a.length; _i++) {
+                    var prop = _a[_i];
+                    if (kind === 0 /* String */ || isNumericLiteralName(prop.escapedName)) {
+                        propTypes.push(getTypeOfSymbol(prop));
+                    }
+                }
+                if (propTypes.length) {
+                    return getUnionType(propTypes, 2 /* Subtype */);
+                }
+            }
+            return undefined;
+        }
+        // Return list of type parameters with duplicates removed (duplicate identifier errors are generated in the actual
+        // type checking functions).
+        function getTypeParametersFromDeclaration(declaration) {
+            var result;
+            for (var _i = 0, _a = ts.getEffectiveTypeParameterDeclarations(declaration); _i < _a.length; _i++) {
+                var node = _a[_i];
+                result = ts.appendIfUnique(result, getDeclaredTypeOfTypeParameter(node.symbol));
+            }
+            return result;
+        }
+        function symbolsToArray(symbols) {
+            var result = [];
+            symbols.forEach(function (symbol, id) {
+                if (!isReservedMemberName(id)) {
+                    result.push(symbol);
+                }
+            });
+            return result;
+        }
+        function isJSDocOptionalParameter(node) {
+            return ts.isInJSFile(node) && (
+            // node.type should only be a JSDocOptionalType when node is a parameter of a JSDocFunctionType
+            node.type && node.type.kind === 288 /* JSDocOptionalType */
+                || ts.getJSDocParameterTags(node).some(function (_a) {
+                    var isBracketed = _a.isBracketed, typeExpression = _a.typeExpression;
+                    return isBracketed || !!typeExpression && typeExpression.type.kind === 288 /* JSDocOptionalType */;
+                }));
+        }
+        function tryFindAmbientModule(moduleName, withAugmentations) {
+            if (ts.isExternalModuleNameRelative(moduleName)) {
+                return undefined;
+            }
+            var symbol = getSymbol(globals, '"' + moduleName + '"', 512 /* ValueModule */);
+            // merged symbol is module declaration symbol combined with all augmentations
+            return symbol && withAugmentations ? getMergedSymbol(symbol) : symbol;
+        }
+        function isOptionalParameter(node) {
+            if (ts.hasQuestionToken(node) || isOptionalJSDocParameterTag(node) || isJSDocOptionalParameter(node)) {
+                return true;
+            }
+            if (node.initializer) {
+                var signature = getSignatureFromDeclaration(node.parent);
+                var parameterIndex = node.parent.parameters.indexOf(node);
+                ts.Debug.assert(parameterIndex >= 0);
+                return parameterIndex >= getMinArgumentCount(signature);
+            }
+            var iife = ts.getImmediatelyInvokedFunctionExpression(node.parent);
+            if (iife) {
+                return !node.type &&
+                    !node.dotDotDotToken &&
+                    node.parent.parameters.indexOf(node) >= iife.arguments.length;
+            }
+            return false;
+        }
+        function isOptionalJSDocParameterTag(node) {
+            if (!ts.isJSDocParameterTag(node)) {
+                return false;
+            }
+            var isBracketed = node.isBracketed, typeExpression = node.typeExpression;
+            return isBracketed || !!typeExpression && typeExpression.type.kind === 288 /* JSDocOptionalType */;
+        }
+        function createIdentifierTypePredicate(parameterName, parameterIndex, type) {
+            return { kind: 1 /* Identifier */, parameterName: parameterName, parameterIndex: parameterIndex, type: type };
+        }
+        function createThisTypePredicate(type) {
+            return { kind: 0 /* This */, type: type };
+        }
+        /**
+         * Gets the minimum number of type arguments needed to satisfy all non-optional type
+         * parameters.
+         */
+        function getMinTypeArgumentCount(typeParameters) {
+            var minTypeArgumentCount = 0;
+            if (typeParameters) {
+                for (var i = 0; i < typeParameters.length; i++) {
+                    if (!hasTypeParameterDefault(typeParameters[i])) {
+                        minTypeArgumentCount = i + 1;
+                    }
+                }
+            }
+            return minTypeArgumentCount;
+        }
+        function fillMissingTypeArguments(typeArguments, typeParameters, minTypeArgumentCount, isJavaScriptImplicitAny) {
+            var numTypeParameters = ts.length(typeParameters);
+            if (!numTypeParameters) {
+                return [];
+            }
+            var numTypeArguments = ts.length(typeArguments);
+            if (isJavaScriptImplicitAny || (numTypeArguments >= minTypeArgumentCount && numTypeArguments <= numTypeParameters)) {
+                var result = typeArguments ? typeArguments.slice() : [];
+                // Map invalid forward references in default types to the error type
+                for (var i = numTypeArguments; i < numTypeParameters; i++) {
+                    result[i] = errorType;
+                }
+                var baseDefaultType = getDefaultTypeArgumentType(isJavaScriptImplicitAny);
+                for (var i = numTypeArguments; i < numTypeParameters; i++) {
+                    var defaultType = getDefaultFromTypeParameter(typeParameters[i]);
+                    if (isJavaScriptImplicitAny && defaultType && isTypeIdenticalTo(defaultType, emptyObjectType)) {
+                        defaultType = anyType;
+                    }
+                    result[i] = defaultType ? instantiateType(defaultType, createTypeMapper(typeParameters, result)) : baseDefaultType;
+                }
+                result.length = typeParameters.length;
+                return result;
+            }
+            return typeArguments && typeArguments.slice();
+        }
+        function getSignatureFromDeclaration(declaration) {
+            var links = getNodeLinks(declaration);
+            if (!links.resolvedSignature) {
+                var parameters = [];
+                var hasLiteralTypes = false;
+                var minArgumentCount = 0;
+                var thisParameter = void 0;
+                var hasThisParameter = false;
+                var iife = ts.getImmediatelyInvokedFunctionExpression(declaration);
+                var isJSConstructSignature = ts.isJSDocConstructSignature(declaration);
+                var isUntypedSignatureInJSFile = !iife &&
+                    ts.isInJSFile(declaration) &&
+                    ts.isValueSignatureDeclaration(declaration) &&
+                    !ts.hasJSDocParameterTags(declaration) &&
+                    !ts.getJSDocType(declaration);
+                // If this is a JSDoc construct signature, then skip the first parameter in the
+                // parameter list.  The first parameter represents the return type of the construct
+                // signature.
+                for (var i = isJSConstructSignature ? 1 : 0; i < declaration.parameters.length; i++) {
+                    var param = declaration.parameters[i];
+                    var paramSymbol = param.symbol;
+                    var type = ts.isJSDocParameterTag(param) ? (param.typeExpression && param.typeExpression.type) : param.type;
+                    // Include parameter symbol instead of property symbol in the signature
+                    if (paramSymbol && !!(paramSymbol.flags & 4 /* Property */) && !ts.isBindingPattern(param.name)) {
+                        var resolvedSymbol = resolveName(param, paramSymbol.escapedName, 67220415 /* Value */, undefined, undefined, /*isUse*/ false);
+                        paramSymbol = resolvedSymbol;
+                    }
+                    if (i === 0 && paramSymbol.escapedName === "this" /* This */) {
+                        hasThisParameter = true;
+                        thisParameter = param.symbol;
+                    }
+                    else {
+                        parameters.push(paramSymbol);
+                    }
+                    if (type && type.kind === 182 /* LiteralType */) {
+                        hasLiteralTypes = true;
+                    }
+                    // Record a new minimum argument count if this is not an optional parameter
+                    var isOptionalParameter_1 = isOptionalJSDocParameterTag(param) ||
+                        param.initializer || param.questionToken || param.dotDotDotToken ||
+                        iife && parameters.length > iife.arguments.length && !type ||
+                        isUntypedSignatureInJSFile ||
+                        isJSDocOptionalParameter(param);
+                    if (!isOptionalParameter_1) {
+                        minArgumentCount = parameters.length;
+                    }
+                }
+                // If only one accessor includes a this-type annotation, the other behaves as if it had the same type annotation
+                if ((declaration.kind === 158 /* GetAccessor */ || declaration.kind === 159 /* SetAccessor */) &&
+                    !hasNonBindableDynamicName(declaration) &&
+                    (!hasThisParameter || !thisParameter)) {
+                    var otherKind = declaration.kind === 158 /* GetAccessor */ ? 159 /* SetAccessor */ : 158 /* GetAccessor */;
+                    var other = ts.getDeclarationOfKind(getSymbolOfNode(declaration), otherKind);
+                    if (other) {
+                        thisParameter = getAnnotatedAccessorThisParameter(other);
+                    }
+                }
+                var classType = declaration.kind === 157 /* Constructor */ ?
+                    getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol))
+                    : undefined;
+                var typeParameters = classType ? classType.localTypeParameters : getTypeParametersFromDeclaration(declaration);
+                var hasRestLikeParameter = ts.hasRestParameter(declaration) || ts.isInJSFile(declaration) && maybeAddJsSyntheticRestParameter(declaration, parameters);
+                links.resolvedSignature = createSignature(declaration, typeParameters, thisParameter, parameters, 
+                /*resolvedReturnType*/ undefined, /*resolvedTypePredicate*/ undefined, minArgumentCount, hasRestLikeParameter, hasLiteralTypes);
+            }
+            return links.resolvedSignature;
+        }
+        /**
+         * A JS function gets a synthetic rest parameter if it references `arguments` AND:
+         * 1. It has no parameters but at least one `@param` with a type that starts with `...`
+         * OR
+         * 2. It has at least one parameter, and the last parameter has a matching `@param` with a type that starts with `...`
+         */
+        function maybeAddJsSyntheticRestParameter(declaration, parameters) {
+            if (ts.isJSDocSignature(declaration) || !containsArgumentsReference(declaration)) {
+                return false;
+            }
+            var lastParam = ts.lastOrUndefined(declaration.parameters);
+            var lastParamTags = lastParam ? ts.getJSDocParameterTags(lastParam) : ts.getJSDocTags(declaration).filter(ts.isJSDocParameterTag);
+            var lastParamVariadicType = ts.firstDefined(lastParamTags, function (p) {
+                return p.typeExpression && ts.isJSDocVariadicType(p.typeExpression.type) ? p.typeExpression.type : undefined;
+            });
+            var syntheticArgsSymbol = createSymbol(3 /* Variable */, "args", 16384 /* RestParameter */);
+            syntheticArgsSymbol.type = lastParamVariadicType ? createArrayType(getTypeFromTypeNode(lastParamVariadicType.type)) : anyArrayType;
+            if (lastParamVariadicType) {
+                // Replace the last parameter with a rest parameter.
+                parameters.pop();
+            }
+            parameters.push(syntheticArgsSymbol);
+            return true;
+        }
+        function getSignatureOfTypeTag(node) {
+            var typeTag = ts.isInJSFile(node) ? ts.getJSDocTypeTag(node) : undefined;
+            var signature = typeTag && typeTag.typeExpression && getSingleCallSignature(getTypeFromTypeNode(typeTag.typeExpression));
+            return signature && getErasedSignature(signature);
+        }
+        function getReturnTypeOfTypeTag(node) {
+            var signature = getSignatureOfTypeTag(node);
+            return signature && getReturnTypeOfSignature(signature);
+        }
+        function containsArgumentsReference(declaration) {
+            var links = getNodeLinks(declaration);
+            if (links.containsArgumentsReference === undefined) {
+                if (links.flags & 8192 /* CaptureArguments */) {
+                    links.containsArgumentsReference = true;
+                }
+                else {
+                    links.containsArgumentsReference = traverse(declaration.body);
+                }
+            }
+            return links.containsArgumentsReference;
+            function traverse(node) {
+                if (!node)
+                    return false;
+                switch (node.kind) {
+                    case 72 /* Identifier */:
+                        return node.escapedText === "arguments" && ts.isExpressionNode(node);
+                    case 154 /* PropertyDeclaration */:
+                    case 156 /* MethodDeclaration */:
+                    case 158 /* GetAccessor */:
+                    case 159 /* SetAccessor */:
+                        return node.name.kind === 149 /* ComputedPropertyName */
+                            && traverse(node.name);
+                    default:
+                        return !ts.nodeStartsNewLexicalEnvironment(node) && !ts.isPartOfTypeNode(node) && !!ts.forEachChild(node, traverse);
+                }
+            }
+        }
+        function getSignaturesOfSymbol(symbol) {
+            if (!symbol)
+                return ts.emptyArray;
+            var result = [];
+            for (var i = 0; i < symbol.declarations.length; i++) {
+                var decl = symbol.declarations[i];
+                if (!ts.isFunctionLike(decl))
+                    continue;
+                // Don't include signature if node is the implementation of an overloaded function. A node is considered
+                // an implementation node if it has a body and the previous node is of the same kind and immediately
+                // precedes the implementation node (i.e. has the same parent and ends where the implementation starts).
+                if (i > 0 && decl.body) {
+                    var previous = symbol.declarations[i - 1];
+                    if (decl.parent === previous.parent && decl.kind === previous.kind && decl.pos === previous.end) {
+                        continue;
+                    }
+                }
+                result.push(getSignatureFromDeclaration(decl));
+            }
+            return result;
+        }
+        function resolveExternalModuleTypeByLiteral(name) {
+            var moduleSym = resolveExternalModuleName(name, name);
+            if (moduleSym) {
+                var resolvedModuleSymbol = resolveExternalModuleSymbol(moduleSym);
+                if (resolvedModuleSymbol) {
+                    return getTypeOfSymbol(resolvedModuleSymbol);
+                }
+            }
+            return anyType;
+        }
+        function getThisTypeOfSignature(signature) {
+            if (signature.thisParameter) {
+                return getTypeOfSymbol(signature.thisParameter);
+            }
+        }
+        function signatureHasTypePredicate(signature) {
+            return getTypePredicateOfSignature(signature) !== undefined;
+        }
+        function getTypePredicateOfSignature(signature) {
+            if (!signature.resolvedTypePredicate) {
+                if (signature.target) {
+                    var targetTypePredicate = getTypePredicateOfSignature(signature.target);
+                    signature.resolvedTypePredicate = targetTypePredicate ? instantiateTypePredicate(targetTypePredicate, signature.mapper) : noTypePredicate;
+                }
+                else if (signature.unionSignatures) {
+                    signature.resolvedTypePredicate = getUnionTypePredicate(signature.unionSignatures) || noTypePredicate;
+                }
+                else {
+                    var type = signature.declaration && ts.getEffectiveReturnTypeNode(signature.declaration);
+                    var jsdocPredicate = void 0;
+                    if (!type && ts.isInJSFile(signature.declaration)) {
+                        var jsdocSignature = getSignatureOfTypeTag(signature.declaration);
+                        if (jsdocSignature && signature !== jsdocSignature) {
+                            jsdocPredicate = getTypePredicateOfSignature(jsdocSignature);
+                        }
+                    }
+                    signature.resolvedTypePredicate = type && ts.isTypePredicateNode(type) ?
+                        createTypePredicateFromTypePredicateNode(type, signature.declaration) :
+                        jsdocPredicate || noTypePredicate;
+                }
+                ts.Debug.assert(!!signature.resolvedTypePredicate);
+            }
+            return signature.resolvedTypePredicate === noTypePredicate ? undefined : signature.resolvedTypePredicate;
+        }
+        function createTypePredicateFromTypePredicateNode(node, func) {
+            var parameterName = node.parameterName;
+            var type = getTypeFromTypeNode(node.type);
+            if (parameterName.kind === 72 /* Identifier */) {
+                return createIdentifierTypePredicate(parameterName.escapedText, getTypePredicateParameterIndex(func.parameters, parameterName), type);
+            }
+            else {
+                return createThisTypePredicate(type);
+            }
+        }
+        function getTypePredicateParameterIndex(parameterList, parameter) {
+            for (var i = 0; i < parameterList.length; i++) {
+                var param = parameterList[i];
+                if (param.name.kind === 72 /* Identifier */ && param.name.escapedText === parameter.escapedText) {
+                    return i;
+                }
+            }
+            return -1;
+        }
+        function getReturnTypeOfSignature(signature) {
+            if (!signature.resolvedReturnType) {
+                if (!pushTypeResolution(signature, 3 /* ResolvedReturnType */)) {
+                    return errorType;
+                }
+                var type = signature.target ? instantiateType(getReturnTypeOfSignature(signature.target), signature.mapper) :
+                    signature.unionSignatures ? getUnionType(ts.map(signature.unionSignatures, getReturnTypeOfSignature), 2 /* Subtype */) :
+                        getReturnTypeFromAnnotation(signature.declaration) ||
+                            isJSConstructor(signature.declaration) && getJSClassType(getSymbolOfNode(signature.declaration)) ||
+                            (ts.nodeIsMissing(signature.declaration.body) ? anyType : getReturnTypeFromBody(signature.declaration));
+                if (!popTypeResolution()) {
+                    if (signature.declaration) {
+                        var typeNode = ts.getEffectiveReturnTypeNode(signature.declaration);
+                        if (typeNode) {
+                            error(typeNode, ts.Diagnostics.Return_type_annotation_circularly_references_itself);
+                        }
+                        else if (noImplicitAny) {
+                            var declaration = signature.declaration;
+                            var name = ts.getNameOfDeclaration(declaration);
+                            if (name) {
+                                error(name, ts.Diagnostics._0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions, ts.declarationNameToString(name));
+                            }
+                            else {
+                                error(declaration, ts.Diagnostics.Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions);
+                            }
+                        }
+                    }
+                    type = anyType;
+                }
+                signature.resolvedReturnType = type;
+            }
+            return signature.resolvedReturnType;
+        }
+        function getReturnTypeFromAnnotation(declaration) {
+            if (declaration.kind === 157 /* Constructor */) {
+                return getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol));
+            }
+            if (ts.isJSDocConstructSignature(declaration)) {
+                return getTypeFromTypeNode(declaration.parameters[0].type); // TODO: GH#18217
+            }
+            var typeNode = ts.getEffectiveReturnTypeNode(declaration);
+            if (typeNode) {
+                return getTypeFromTypeNode(typeNode);
+            }
+            if (declaration.kind === 158 /* GetAccessor */ && !hasNonBindableDynamicName(declaration)) {
+                var jsDocType = ts.isInJSFile(declaration) && getTypeForDeclarationFromJSDocComment(declaration);
+                if (jsDocType) {
+                    return jsDocType;
+                }
+                var setter = ts.getDeclarationOfKind(getSymbolOfNode(declaration), 159 /* SetAccessor */);
+                var setterType = getAnnotatedAccessorType(setter);
+                if (setterType) {
+                    return setterType;
+                }
+            }
+            return getReturnTypeOfTypeTag(declaration);
+        }
+        function isResolvingReturnTypeOfSignature(signature) {
+            return !signature.resolvedReturnType && findResolutionCycleStartIndex(signature, 3 /* ResolvedReturnType */) >= 0;
+        }
+        function getRestTypeOfSignature(signature) {
+            return tryGetRestTypeOfSignature(signature) || anyType;
+        }
+        function tryGetRestTypeOfSignature(signature) {
+            if (signature.hasRestParameter) {
+                var sigRestType = getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]);
+                var restType = isTupleType(sigRestType) ? getRestTypeOfTupleType(sigRestType) : sigRestType;
+                return restType && getIndexTypeOfType(restType, 1 /* Number */);
+            }
+            return undefined;
+        }
+        function getSignatureInstantiation(signature, typeArguments, isJavascript) {
+            return getSignatureInstantiationWithoutFillingInTypeArguments(signature, fillMissingTypeArguments(typeArguments, signature.typeParameters, getMinTypeArgumentCount(signature.typeParameters), isJavascript));
+        }
+        function getSignatureInstantiationWithoutFillingInTypeArguments(signature, typeArguments) {
+            var instantiations = signature.instantiations || (signature.instantiations = ts.createMap());
+            var id = getTypeListId(typeArguments);
+            var instantiation = instantiations.get(id);
+            if (!instantiation) {
+                instantiations.set(id, instantiation = createSignatureInstantiation(signature, typeArguments));
+            }
+            return instantiation;
+        }
+        function createSignatureInstantiation(signature, typeArguments) {
+            return instantiateSignature(signature, createSignatureTypeMapper(signature, typeArguments), /*eraseTypeParameters*/ true);
+        }
+        function createSignatureTypeMapper(signature, typeArguments) {
+            return createTypeMapper(signature.typeParameters, typeArguments);
+        }
+        function getErasedSignature(signature) {
+            return signature.typeParameters ?
+                signature.erasedSignatureCache || (signature.erasedSignatureCache = createErasedSignature(signature)) :
+                signature;
+        }
+        function createErasedSignature(signature) {
+            // Create an instantiation of the signature where all type arguments are the any type.
+            return instantiateSignature(signature, createTypeEraser(signature.typeParameters), /*eraseTypeParameters*/ true);
+        }
+        function getCanonicalSignature(signature) {
+            return signature.typeParameters ?
+                signature.canonicalSignatureCache || (signature.canonicalSignatureCache = createCanonicalSignature(signature)) :
+                signature;
+        }
+        function createCanonicalSignature(signature) {
+            // Create an instantiation of the signature where each unconstrained type parameter is replaced with
+            // its original. When a generic class or interface is instantiated, each generic method in the class or
+            // interface is instantiated with a fresh set of cloned type parameters (which we need to handle scenarios
+            // where different generations of the same type parameter are in scope). This leads to a lot of new type
+            // identities, and potentially a lot of work comparing those identities, so here we create an instantiation
+            // that uses the original type identities for all unconstrained type parameters.
+            return getSignatureInstantiation(signature, ts.map(signature.typeParameters, function (tp) { return tp.target && !getConstraintOfTypeParameter(tp.target) ? tp.target : tp; }), ts.isInJSFile(signature.declaration));
+        }
+        function getBaseSignature(signature) {
+            var typeParameters = signature.typeParameters;
+            if (typeParameters) {
+                var typeEraser_1 = createTypeEraser(typeParameters);
+                var baseConstraints = ts.map(typeParameters, function (tp) { return instantiateType(getBaseConstraintOfType(tp), typeEraser_1) || emptyObjectType; });
+                return instantiateSignature(signature, createTypeMapper(typeParameters, baseConstraints), /*eraseTypeParameters*/ true);
+            }
+            return signature;
+        }
+        function getOrCreateTypeFromSignature(signature) {
+            // There are two ways to declare a construct signature, one is by declaring a class constructor
+            // using the constructor keyword, and the other is declaring a bare construct signature in an
+            // object type literal or interface (using the new keyword). Each way of declaring a constructor
+            // will result in a different declaration kind.
+            if (!signature.isolatedSignatureType) {
+                var isConstructor = signature.declaration.kind === 157 /* Constructor */ || signature.declaration.kind === 161 /* ConstructSignature */; // TODO: GH#18217
+                var type = createObjectType(16 /* Anonymous */);
+                type.members = emptySymbols;
+                type.properties = ts.emptyArray;
+                type.callSignatures = !isConstructor ? [signature] : ts.emptyArray;
+                type.constructSignatures = isConstructor ? [signature] : ts.emptyArray;
+                signature.isolatedSignatureType = type;
+            }
+            return signature.isolatedSignatureType;
+        }
+        function getIndexSymbol(symbol) {
+            return symbol.members.get("__index" /* Index */);
+        }
+        function getIndexDeclarationOfSymbol(symbol, kind) {
+            var syntaxKind = kind === 1 /* Number */ ? 135 /* NumberKeyword */ : 138 /* StringKeyword */;
+            var indexSymbol = getIndexSymbol(symbol);
+            if (indexSymbol) {
+                for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
+                    var decl = _a[_i];
+                    var node = ts.cast(decl, ts.isIndexSignatureDeclaration);
+                    if (node.parameters.length === 1) {
+                        var parameter = node.parameters[0];
+                        if (parameter.type && parameter.type.kind === syntaxKind) {
+                            return node;
+                        }
+                    }
+                }
+            }
+            return undefined;
+        }
+        function createIndexInfo(type, isReadonly, declaration) {
+            return { type: type, isReadonly: isReadonly, declaration: declaration };
+        }
+        function getIndexInfoOfSymbol(symbol, kind) {
+            var declaration = getIndexDeclarationOfSymbol(symbol, kind);
+            if (declaration) {
+                return createIndexInfo(declaration.type ? getTypeFromTypeNode(declaration.type) : anyType, ts.hasModifier(declaration, 64 /* Readonly */), declaration);
+            }
+            return undefined;
+        }
+        function getConstraintDeclaration(type) {
+            var decl = type.symbol && ts.getDeclarationOfKind(type.symbol, 150 /* TypeParameter */);
+            return decl && ts.getEffectiveConstraintOfTypeParameter(decl);
+        }
+        function getInferredTypeParameterConstraint(typeParameter) {
+            var inferences;
+            if (typeParameter.symbol) {
+                for (var _i = 0, _a = typeParameter.symbol.declarations; _i < _a.length; _i++) {
+                    var declaration = _a[_i];
+                    if (declaration.parent.kind === 176 /* InferType */) {
+                        // When an 'infer T' declaration is immediately contained in a type reference node
+                        // (such as 'Foo<infer T>'), T's constraint is inferred from the constraint of the
+                        // corresponding type parameter in 'Foo'. When multiple 'infer T' declarations are
+                        // present, we form an intersection of the inferred constraint types.
+                        var grandParent = declaration.parent.parent;
+                        if (grandParent.kind === 164 /* TypeReference */) {
+                            var typeReference = grandParent;
+                            var typeParameters = getTypeParametersForTypeReference(typeReference);
+                            if (typeParameters) {
+                                var index = typeReference.typeArguments.indexOf(declaration.parent);
+                                if (index < typeParameters.length) {
+                                    var declaredConstraint = getConstraintOfTypeParameter(typeParameters[index]);
+                                    if (declaredConstraint) {
+                                        // Type parameter constraints can reference other type parameters so
+                                        // constraints need to be instantiated. If instantiation produces the
+                                        // type parameter itself, we discard that inference. For example, in
+                                        //   type Foo<T extends string, U extends T> = [T, U];
+                                        //   type Bar<T> = T extends Foo<infer X, infer X> ? Foo<X, X> : T;
+                                        // the instantiated constraint for U is X, so we discard that inference.
+                                        var mapper = createTypeMapper(typeParameters, getEffectiveTypeArguments(typeReference, typeParameters));
+                                        var constraint = instantiateType(declaredConstraint, mapper);
+                                        if (constraint !== typeParameter) {
+                                            inferences = ts.append(inferences, constraint);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        // When an 'infer T' declaration is immediately contained in a rest parameter
+                        // declaration, we infer an 'unknown[]' constraint.
+                        else if (grandParent.kind === 151 /* Parameter */ && grandParent.dotDotDotToken) {
+                            inferences = ts.append(inferences, createArrayType(unknownType));
+                        }
+                    }
+                }
+            }
+            return inferences && getIntersectionType(inferences);
+        }
+        /** This is a worker function. Use getConstraintOfTypeParameter which guards against circular constraints. */
+        function getConstraintFromTypeParameter(typeParameter) {
+            if (!typeParameter.constraint) {
+                if (typeParameter.target) {
+                    var targetConstraint = getConstraintOfTypeParameter(typeParameter.target);
+                    typeParameter.constraint = targetConstraint ? instantiateType(targetConstraint, typeParameter.mapper) : noConstraintType;
+                }
+                else {
+                    var constraintDeclaration = getConstraintDeclaration(typeParameter);
+                    typeParameter.constraint = constraintDeclaration ? getTypeFromTypeNode(constraintDeclaration) :
+                        getInferredTypeParameterConstraint(typeParameter) || noConstraintType;
+                }
+            }
+            return typeParameter.constraint === noConstraintType ? undefined : typeParameter.constraint;
+        }
+        function getParentSymbolOfTypeParameter(typeParameter) {
+            var tp = ts.getDeclarationOfKind(typeParameter.symbol, 150 /* TypeParameter */);
+            var host = ts.isJSDocTemplateTag(tp.parent) ? ts.getHostSignatureFromJSDoc(tp.parent) : tp.parent;
+            return host && getSymbolOfNode(host);
+        }
+        function getTypeListId(types) {
+            var result = "";
+            if (types) {
+                var length_3 = types.length;
+                var i = 0;
+                while (i < length_3) {
+                    var startId = types[i].id;
+                    var count = 1;
+                    while (i + count < length_3 && types[i + count].id === startId + count) {
+                        count++;
+                    }
+                    if (result.length) {
+                        result += ",";
+                    }
+                    result += startId;
+                    if (count > 1) {
+                        result += ":" + count;
+                    }
+                    i += count;
+                }
+            }
+            return result;
+        }
+        // This function is used to propagate certain flags when creating new object type references and union types.
+        // It is only necessary to do so if a constituent type might be the undefined type, the null type, the type
+        // of an object literal or the anyFunctionType. This is because there are operations in the type checker
+        // that care about the presence of such types at arbitrary depth in a containing type.
+        function getPropagatingFlagsOfTypes(types, excludeKinds) {
+            var result = 0;
+            for (var _i = 0, types_5 = types; _i < types_5.length; _i++) {
+                var type = types_5[_i];
+                if (!(type.flags & excludeKinds)) {
+                    result |= type.flags;
+                }
+            }
+            return result & 939524096 /* PropagatingFlags */;
+        }
+        function createTypeReference(target, typeArguments) {
+            var id = getTypeListId(typeArguments);
+            var type = target.instantiations.get(id);
+            if (!type) {
+                type = createObjectType(4 /* Reference */, target.symbol);
+                target.instantiations.set(id, type);
+                type.flags |= typeArguments ? getPropagatingFlagsOfTypes(typeArguments, /*excludeKinds*/ 0) : 0;
+                type.target = target;
+                type.typeArguments = typeArguments;
+            }
+            return type;
+        }
+        function cloneTypeReference(source) {
+            var type = createType(source.flags);
+            type.symbol = source.symbol;
+            type.objectFlags = source.objectFlags;
+            type.target = source.target;
+            type.typeArguments = source.typeArguments;
+            return type;
+        }
+        function getTypeReferenceArity(type) {
+            return ts.length(type.target.typeParameters);
+        }
+        /**
+         * Get type from type-reference that reference to class or interface
+         */
+        function getTypeFromClassOrInterfaceReference(node, symbol, typeArgs) {
+            var type = getDeclaredTypeOfSymbol(getMergedSymbol(symbol));
+            var typeParameters = type.localTypeParameters;
+            if (typeParameters) {
+                var numTypeArguments = ts.length(node.typeArguments);
+                var minTypeArgumentCount = getMinTypeArgumentCount(typeParameters);
+                var isJs = ts.isInJSFile(node);
+                var isJsImplicitAny = !noImplicitAny && isJs;
+                if (!isJsImplicitAny && (numTypeArguments < minTypeArgumentCount || numTypeArguments > typeParameters.length)) {
+                    var missingAugmentsTag = isJs && ts.isExpressionWithTypeArguments(node) && !ts.isJSDocAugmentsTag(node.parent);
+                    var diag = minTypeArgumentCount === typeParameters.length
+                        ? missingAugmentsTag
+                            ? ts.Diagnostics.Expected_0_type_arguments_provide_these_with_an_extends_tag
+                            : ts.Diagnostics.Generic_type_0_requires_1_type_argument_s
+                        : missingAugmentsTag
+                            ? ts.Diagnostics.Expected_0_1_type_arguments_provide_these_with_an_extends_tag
+                            : ts.Diagnostics.Generic_type_0_requires_between_1_and_2_type_arguments;
+                    var typeStr = typeToString(type, /*enclosingDeclaration*/ undefined, 2 /* WriteArrayAsGenericType */);
+                    error(node, diag, typeStr, minTypeArgumentCount, typeParameters.length);
+                    if (!isJs) {
+                        // TODO: Adopt same permissive behavior in TS as in JS to reduce follow-on editing experience failures (requires editing fillMissingTypeArguments)
+                        return errorType;
+                    }
+                }
+                // In a type reference, the outer type parameters of the referenced class or interface are automatically
+                // supplied as type arguments and the type reference only specifies arguments for the local type parameters
+                // of the class or interface.
+                var typeArguments = ts.concatenate(type.outerTypeParameters, fillMissingTypeArguments(typeArgs, typeParameters, minTypeArgumentCount, isJs));
+                return createTypeReference(type, typeArguments);
+            }
+            return checkNoTypeArguments(node, symbol) ? type : errorType;
+        }
+        function getTypeAliasInstantiation(symbol, typeArguments) {
+            var type = getDeclaredTypeOfSymbol(symbol);
+            var links = getSymbolLinks(symbol);
+            var typeParameters = links.typeParameters;
+            var id = getTypeListId(typeArguments);
+            var instantiation = links.instantiations.get(id);
+            if (!instantiation) {
+                links.instantiations.set(id, instantiation = instantiateType(type, createTypeMapper(typeParameters, fillMissingTypeArguments(typeArguments, typeParameters, getMinTypeArgumentCount(typeParameters), ts.isInJSFile(symbol.valueDeclaration)))));
+            }
+            return instantiation;
+        }
+        /**
+         * Get type from reference to type alias. When a type alias is generic, the declared type of the type alias may include
+         * references to the type parameters of the alias. We replace those with the actual type arguments by instantiating the
+         * declared type. Instantiations are cached using the type identities of the type arguments as the key.
+         */
+        function getTypeFromTypeAliasReference(node, symbol, typeArguments) {
+            var type = getDeclaredTypeOfSymbol(symbol);
+            var typeParameters = getSymbolLinks(symbol).typeParameters;
+            if (typeParameters) {
+                var numTypeArguments = ts.length(node.typeArguments);
+                var minTypeArgumentCount = getMinTypeArgumentCount(typeParameters);
+                if (numTypeArguments < minTypeArgumentCount || numTypeArguments > typeParameters.length) {
+                    error(node, minTypeArgumentCount === typeParameters.length
+                        ? ts.Diagnostics.Generic_type_0_requires_1_type_argument_s
+                        : ts.Diagnostics.Generic_type_0_requires_between_1_and_2_type_arguments, symbolToString(symbol), minTypeArgumentCount, typeParameters.length);
+                    return errorType;
+                }
+                return getTypeAliasInstantiation(symbol, typeArguments);
+            }
+            return checkNoTypeArguments(node, symbol) ? type : errorType;
+        }
+        function getTypeReferenceName(node) {
+            switch (node.kind) {
+                case 164 /* TypeReference */:
+                    return node.typeName;
+                case 211 /* ExpressionWithTypeArguments */:
+                    // We only support expressions that are simple qualified names. For other
+                    // expressions this produces undefined.
+                    var expr = node.expression;
+                    if (ts.isEntityNameExpression(expr)) {
+                        return expr;
+                    }
+                // fall through;
+            }
+            return undefined;
+        }
+        function resolveTypeReferenceName(typeReferenceName, meaning) {
+            if (!typeReferenceName) {
+                return unknownSymbol;
+            }
+            return resolveEntityName(typeReferenceName, meaning) || unknownSymbol;
+        }
+        function getTypeReferenceType(node, symbol) {
+            var typeArguments = typeArgumentsFromTypeReferenceNode(node); // Do unconditionally so we mark type arguments as referenced.
+            if (symbol === unknownSymbol) {
+                return errorType;
+            }
+            var type = getTypeReferenceTypeWorker(node, symbol, typeArguments);
+            if (type) {
+                return type;
+            }
+            // JS enums are 'string' or 'number', not an enum type.
+            var enumTag = ts.isInJSFile(node) && symbol.valueDeclaration && ts.getJSDocEnumTag(symbol.valueDeclaration);
+            if (enumTag) {
+                var links = getNodeLinks(enumTag);
+                if (!pushTypeResolution(enumTag, 5 /* EnumTagType */)) {
+                    return errorType;
+                }
+                var type_4 = enumTag.typeExpression ? getTypeFromTypeNode(enumTag.typeExpression) : errorType;
+                if (!popTypeResolution()) {
+                    type_4 = errorType;
+                    error(node, ts.Diagnostics.Enum_type_0_circularly_references_itself, symbolToString(symbol));
+                }
+                return (links.resolvedEnumType = type_4);
+            }
+            // Get type from reference to named type that cannot be generic (enum or type parameter)
+            var res = tryGetDeclaredTypeOfSymbol(symbol);
+            if (res) {
+                return checkNoTypeArguments(node, symbol) ?
+                    res.flags & 262144 /* TypeParameter */ ? getConstrainedTypeVariable(res, node) : getRegularTypeOfLiteralType(res) :
+                    errorType;
+            }
+            if (!(symbol.flags & 67220415 /* Value */ && isJSDocTypeReference(node))) {
+                return errorType;
+            }
+            var jsdocType = getJSDocTypeReference(node, symbol, typeArguments);
+            if (jsdocType) {
+                return jsdocType;
+            }
+            // Resolve the type reference as a Type for the purpose of reporting errors.
+            resolveTypeReferenceName(getTypeReferenceName(node), 67897832 /* Type */);
+            return getTypeOfSymbol(symbol);
+        }
+        /**
+         * A jsdoc TypeReference may have resolved to a value (as opposed to a type). If
+         * the symbol is a constructor function, return the inferred class type; otherwise,
+         * the type of this reference is just the type of the value we resolved to.
+         */
+        function getJSDocTypeReference(node, symbol, typeArguments) {
+            // In the case of an assignment of a function expression (binary expressions, variable declarations, etc.), we will get the
+            // correct instance type for the symbol on the LHS by finding the type for RHS. For example if we want to get the type of the symbol `foo`:
+            //   var foo = function() {}
+            // We will find the static type of the assigned anonymous function.
+            var staticType = getTypeOfSymbol(symbol);
+            var instanceType = staticType.symbol &&
+                staticType.symbol !== symbol && // Make sure this is an assignment like expression by checking that symbol -> type -> symbol doesn't roundtrips.
+                getTypeReferenceTypeWorker(node, staticType.symbol, typeArguments); // Get the instance type of the RHS symbol.
+            if (instanceType) {
+                return getSymbolLinks(symbol).resolvedJSDocType = instanceType;
+            }
+        }
+        function getTypeReferenceTypeWorker(node, symbol, typeArguments) {
+            if (symbol.flags & (32 /* Class */ | 64 /* Interface */)) {
+                if (symbol.valueDeclaration && ts.isBinaryExpression(symbol.valueDeclaration.parent)) {
+                    var jsdocType = getJSDocTypeReference(node, symbol, typeArguments);
+                    if (jsdocType) {
+                        return jsdocType;
+                    }
+                }
+                return getTypeFromClassOrInterfaceReference(node, symbol, typeArguments);
+            }
+            if (symbol.flags & 524288 /* TypeAlias */) {
+                return getTypeFromTypeAliasReference(node, symbol, typeArguments);
+            }
+            if (symbol.flags & 16 /* Function */ &&
+                isJSDocTypeReference(node) &&
+                isJSConstructor(symbol.valueDeclaration)) {
+                var resolved = resolveStructuredTypeMembers(getTypeOfSymbol(symbol));
+                if (resolved.callSignatures.length === 1) {
+                    return getReturnTypeOfSignature(resolved.callSignatures[0]);
+                }
+            }
+        }
+        function getSubstitutionType(typeVariable, substitute) {
+            var result = createType(33554432 /* Substitution */);
+            result.typeVariable = typeVariable;
+            result.substitute = substitute;
+            return result;
+        }
+        function isUnaryTupleTypeNode(node) {
+            return node.kind === 170 /* TupleType */ && node.elementTypes.length === 1;
+        }
+        function getImpliedConstraint(typeVariable, checkNode, extendsNode) {
+            return isUnaryTupleTypeNode(checkNode) && isUnaryTupleTypeNode(extendsNode) ? getImpliedConstraint(typeVariable, checkNode.elementTypes[0], extendsNode.elementTypes[0]) :
+                getActualTypeVariable(getTypeFromTypeNode(checkNode)) === typeVariable ? getTypeFromTypeNode(extendsNode) :
+                    undefined;
+        }
+        function getConstrainedTypeVariable(typeVariable, node) {
+            var constraints;
+            while (node && !ts.isStatement(node) && node.kind !== 291 /* JSDocComment */) {
+                var parent = node.parent;
+                if (parent.kind === 175 /* ConditionalType */ && node === parent.trueType) {
+                    var constraint = getImpliedConstraint(typeVariable, parent.checkType, parent.extendsType);
+                    if (constraint) {
+                        constraints = ts.append(constraints, constraint);
+                    }
+                }
+                node = parent;
+            }
+            return constraints ? getSubstitutionType(typeVariable, getIntersectionType(ts.append(constraints, typeVariable))) : typeVariable;
+        }
+        function isJSDocTypeReference(node) {
+            return !!(node.flags & 2097152 /* JSDoc */) && (node.kind === 164 /* TypeReference */ || node.kind === 183 /* ImportType */);
+        }
+        function checkNoTypeArguments(node, symbol) {
+            if (node.typeArguments) {
+                error(node, ts.Diagnostics.Type_0_is_not_generic, symbol ? symbolToString(symbol) : node.typeName ? ts.declarationNameToString(node.typeName) : "(anonymous)");
+                return false;
+            }
+            return true;
+        }
+        function getIntendedTypeFromJSDocTypeReference(node) {
+            if (ts.isIdentifier(node.typeName)) {
+                var typeArgs = node.typeArguments;
+                switch (node.typeName.escapedText) {
+                    case "String":
+                        checkNoTypeArguments(node);
+                        return stringType;
+                    case "Number":
+                        checkNoTypeArguments(node);
+                        return numberType;
+                    case "Boolean":
+                        checkNoTypeArguments(node);
+                        return booleanType;
+                    case "Void":
+                        checkNoTypeArguments(node);
+                        return voidType;
+                    case "Undefined":
+                        checkNoTypeArguments(node);
+                        return undefinedType;
+                    case "Null":
+                        checkNoTypeArguments(node);
+                        return nullType;
+                    case "Function":
+                    case "function":
+                        checkNoTypeArguments(node);
+                        return globalFunctionType;
+                    case "Array":
+                    case "array":
+                        return !typeArgs || !typeArgs.length ? anyArrayType : undefined;
+                    case "Promise":
+                    case "promise":
+                        return !typeArgs || !typeArgs.length ? createPromiseType(anyType) : undefined;
+                    case "Object":
+                        if (typeArgs && typeArgs.length === 2) {
+                            if (ts.isJSDocIndexSignature(node)) {
+                                var indexed = getTypeFromTypeNode(typeArgs[0]);
+                                var target = getTypeFromTypeNode(typeArgs[1]);
+                                var index = createIndexInfo(target, /*isReadonly*/ false);
+                                return createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, indexed === stringType ? index : undefined, indexed === numberType ? index : undefined);
+                            }
+                            return anyType;
+                        }
+                        checkNoTypeArguments(node);
+                        return anyType;
+                }
+            }
+        }
+        function getTypeFromJSDocNullableTypeNode(node) {
+            var type = getTypeFromTypeNode(node.type);
+            return strictNullChecks ? getNullableType(type, 65536 /* Null */) : type;
+        }
+        function getTypeFromTypeReference(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                var symbol = void 0;
+                var type = void 0;
+                var meaning = 67897832 /* Type */;
+                if (isJSDocTypeReference(node)) {
+                    type = getIntendedTypeFromJSDocTypeReference(node);
+                    meaning |= 67220415 /* Value */;
+                }
+                if (!type) {
+                    symbol = resolveTypeReferenceName(getTypeReferenceName(node), meaning);
+                    type = getTypeReferenceType(node, symbol);
+                }
+                // Cache both the resolved symbol and the resolved type. The resolved symbol is needed when we check the
+                // type reference in checkTypeReferenceNode.
+                links.resolvedSymbol = symbol;
+                links.resolvedType = type;
+            }
+            return links.resolvedType;
+        }
+        function typeArgumentsFromTypeReferenceNode(node) {
+            return ts.map(node.typeArguments, getTypeFromTypeNode);
+        }
+        function getTypeFromTypeQueryNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                // TypeScript 1.0 spec (April 2014): 3.6.3
+                // The expression is processed as an identifier expression (section 4.3)
+                // or property access expression(section 4.10),
+                // the widened type(section 3.9) of which becomes the result.
+                links.resolvedType = getRegularTypeOfLiteralType(getWidenedType(checkExpression(node.exprName)));
+            }
+            return links.resolvedType;
+        }
+        function getTypeOfGlobalSymbol(symbol, arity) {
+            function getTypeDeclaration(symbol) {
+                var declarations = symbol.declarations;
+                for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
+                    var declaration = declarations_3[_i];
+                    switch (declaration.kind) {
+                        case 240 /* ClassDeclaration */:
+                        case 241 /* InterfaceDeclaration */:
+                        case 243 /* EnumDeclaration */:
+                            return declaration;
+                    }
+                }
+            }
+            if (!symbol) {
+                return arity ? emptyGenericType : emptyObjectType;
+            }
+            var type = getDeclaredTypeOfSymbol(symbol);
+            if (!(type.flags & 524288 /* Object */)) {
+                error(getTypeDeclaration(symbol), ts.Diagnostics.Global_type_0_must_be_a_class_or_interface_type, ts.symbolName(symbol));
+                return arity ? emptyGenericType : emptyObjectType;
+            }
+            if (ts.length(type.typeParameters) !== arity) {
+                error(getTypeDeclaration(symbol), ts.Diagnostics.Global_type_0_must_have_1_type_parameter_s, ts.symbolName(symbol), arity);
+                return arity ? emptyGenericType : emptyObjectType;
+            }
+            return type;
+        }
+        function getGlobalValueSymbol(name, reportErrors) {
+            return getGlobalSymbol(name, 67220415 /* Value */, reportErrors ? ts.Diagnostics.Cannot_find_global_value_0 : undefined);
+        }
+        function getGlobalTypeSymbol(name, reportErrors) {
+            return getGlobalSymbol(name, 67897832 /* Type */, reportErrors ? ts.Diagnostics.Cannot_find_global_type_0 : undefined);
+        }
+        function getGlobalSymbol(name, meaning, diagnostic) {
+            // Don't track references for global symbols anyway, so value if `isReference` is arbitrary
+            return resolveName(undefined, name, meaning, diagnostic, name, /*isUse*/ false);
+        }
+        function getGlobalType(name, arity, reportErrors) {
+            var symbol = getGlobalTypeSymbol(name, reportErrors);
+            return symbol || reportErrors ? getTypeOfGlobalSymbol(symbol, arity) : undefined;
+        }
+        function getGlobalTypedPropertyDescriptorType() {
+            return deferredGlobalTypedPropertyDescriptorType || (deferredGlobalTypedPropertyDescriptorType = getGlobalType("TypedPropertyDescriptor", /*arity*/ 1, /*reportErrors*/ true)) || emptyGenericType;
+        }
+        function getGlobalTemplateStringsArrayType() {
+            return deferredGlobalTemplateStringsArrayType || (deferredGlobalTemplateStringsArrayType = getGlobalType("TemplateStringsArray", /*arity*/ 0, /*reportErrors*/ true)) || emptyObjectType;
+        }
+        function getGlobalImportMetaType() {
+            return deferredGlobalImportMetaType || (deferredGlobalImportMetaType = getGlobalType("ImportMeta", /*arity*/ 0, /*reportErrors*/ true)) || emptyObjectType;
+        }
+        function getGlobalESSymbolConstructorSymbol(reportErrors) {
+            return deferredGlobalESSymbolConstructorSymbol || (deferredGlobalESSymbolConstructorSymbol = getGlobalValueSymbol("Symbol", reportErrors));
+        }
+        function getGlobalESSymbolType(reportErrors) {
+            return deferredGlobalESSymbolType || (deferredGlobalESSymbolType = getGlobalType("Symbol", /*arity*/ 0, reportErrors)) || emptyObjectType;
+        }
+        function getGlobalPromiseType(reportErrors) {
+            return deferredGlobalPromiseType || (deferredGlobalPromiseType = getGlobalType("Promise", /*arity*/ 1, reportErrors)) || emptyGenericType;
+        }
+        function getGlobalPromiseLikeType(reportErrors) {
+            return deferredGlobalPromiseLikeType || (deferredGlobalPromiseLikeType = getGlobalType("PromiseLike", /*arity*/ 1, reportErrors)) || emptyGenericType;
+        }
+        function getGlobalPromiseConstructorSymbol(reportErrors) {
+            return deferredGlobalPromiseConstructorSymbol || (deferredGlobalPromiseConstructorSymbol = getGlobalValueSymbol("Promise", reportErrors));
+        }
+        function getGlobalPromiseConstructorLikeType(reportErrors) {
+            return deferredGlobalPromiseConstructorLikeType || (deferredGlobalPromiseConstructorLikeType = getGlobalType("PromiseConstructorLike", /*arity*/ 0, reportErrors)) || emptyObjectType;
+        }
+        function getGlobalAsyncIterableType(reportErrors) {
+            return deferredGlobalAsyncIterableType || (deferredGlobalAsyncIterableType = getGlobalType("AsyncIterable", /*arity*/ 1, reportErrors)) || emptyGenericType;
+        }
+        function getGlobalAsyncIteratorType(reportErrors) {
+            return deferredGlobalAsyncIteratorType || (deferredGlobalAsyncIteratorType = getGlobalType("AsyncIterator", /*arity*/ 1, reportErrors)) || emptyGenericType;
+        }
+        function getGlobalAsyncIterableIteratorType(reportErrors) {
+            return deferredGlobalAsyncIterableIteratorType || (deferredGlobalAsyncIterableIteratorType = getGlobalType("AsyncIterableIterator", /*arity*/ 1, reportErrors)) || emptyGenericType;
+        }
+        function getGlobalIterableType(reportErrors) {
+            return deferredGlobalIterableType || (deferredGlobalIterableType = getGlobalType("Iterable", /*arity*/ 1, reportErrors)) || emptyGenericType;
+        }
+        function getGlobalIteratorType(reportErrors) {
+            return deferredGlobalIteratorType || (deferredGlobalIteratorType = getGlobalType("Iterator", /*arity*/ 1, reportErrors)) || emptyGenericType;
+        }
+        function getGlobalIterableIteratorType(reportErrors) {
+            return deferredGlobalIterableIteratorType || (deferredGlobalIterableIteratorType = getGlobalType("IterableIterator", /*arity*/ 1, reportErrors)) || emptyGenericType;
+        }
+        function getGlobalTypeOrUndefined(name, arity) {
+            if (arity === void 0) { arity = 0; }
+            var symbol = getGlobalSymbol(name, 67897832 /* Type */, /*diagnostic*/ undefined);
+            return symbol && getTypeOfGlobalSymbol(symbol, arity);
+        }
+        function getGlobalExtractSymbol() {
+            return deferredGlobalExtractSymbol || (deferredGlobalExtractSymbol = getGlobalSymbol("Extract", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
+        }
+        function getGlobalExcludeSymbol() {
+            return deferredGlobalExcludeSymbol || (deferredGlobalExcludeSymbol = getGlobalSymbol("Exclude", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
+        }
+        function getGlobalPickSymbol() {
+            return deferredGlobalPickSymbol || (deferredGlobalPickSymbol = getGlobalSymbol("Pick", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
+        }
+        function getGlobalBigIntType(reportErrors) {
+            return deferredGlobalBigIntType || (deferredGlobalBigIntType = getGlobalType("BigInt", /*arity*/ 0, reportErrors)) || emptyObjectType;
+        }
+        /**
+         * Instantiates a global type that is generic with some element type, and returns that instantiation.
+         */
+        function createTypeFromGenericGlobalType(genericGlobalType, typeArguments) {
+            return genericGlobalType !== emptyGenericType ? createTypeReference(genericGlobalType, typeArguments) : emptyObjectType;
+        }
+        function createTypedPropertyDescriptorType(propertyType) {
+            return createTypeFromGenericGlobalType(getGlobalTypedPropertyDescriptorType(), [propertyType]);
+        }
+        function createAsyncIterableType(iteratedType) {
+            return createTypeFromGenericGlobalType(getGlobalAsyncIterableType(/*reportErrors*/ true), [iteratedType]);
+        }
+        function createAsyncIterableIteratorType(iteratedType) {
+            return createTypeFromGenericGlobalType(getGlobalAsyncIterableIteratorType(/*reportErrors*/ true), [iteratedType]);
+        }
+        function createIterableType(iteratedType) {
+            return createTypeFromGenericGlobalType(getGlobalIterableType(/*reportErrors*/ true), [iteratedType]);
+        }
+        function createIterableIteratorType(iteratedType) {
+            return createTypeFromGenericGlobalType(getGlobalIterableIteratorType(/*reportErrors*/ true), [iteratedType]);
+        }
+        function createArrayType(elementType) {
+            return createTypeFromGenericGlobalType(globalArrayType, [elementType]);
+        }
+        function createReadonlyArrayType(elementType) {
+            return createTypeFromGenericGlobalType(globalReadonlyArrayType, [elementType]);
+        }
+        function getTypeFromArrayTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                links.resolvedType = createArrayType(getTypeFromTypeNode(node.elementType));
+            }
+            return links.resolvedType;
+        }
+        // We represent tuple types as type references to synthesized generic interface types created by
+        // this function. The types are of the form:
+        //
+        //   interface Tuple<T0, T1, T2, ...> extends Array<T0 | T1 | T2 | ...> { 0: T0, 1: T1, 2: T2, ... }
+        //
+        // Note that the generic type created by this function has no symbol associated with it. The same
+        // is true for each of the synthesized type parameters.
+        function createTupleTypeOfArity(arity, minLength, hasRestElement, associatedNames) {
+            var typeParameters;
+            var properties = [];
+            var maxLength = hasRestElement ? arity - 1 : arity;
+            if (arity) {
+                typeParameters = new Array(arity);
+                for (var i = 0; i < arity; i++) {
+                    var typeParameter = typeParameters[i] = createTypeParameter();
+                    if (i < maxLength) {
+                        var property = createSymbol(4 /* Property */ | (i >= minLength ? 16777216 /* Optional */ : 0), "" + i);
+                        property.type = typeParameter;
+                        properties.push(property);
+                    }
+                }
+            }
+            var literalTypes = [];
+            for (var i = minLength; i <= maxLength; i++)
+                literalTypes.push(getLiteralType(i));
+            var lengthSymbol = createSymbol(4 /* Property */, "length");
+            lengthSymbol.type = hasRestElement ? numberType : getUnionType(literalTypes);
+            properties.push(lengthSymbol);
+            var type = createObjectType(8 /* Tuple */ | 4 /* Reference */);
+            type.typeParameters = typeParameters;
+            type.outerTypeParameters = undefined;
+            type.localTypeParameters = typeParameters;
+            type.instantiations = ts.createMap();
+            type.instantiations.set(getTypeListId(type.typeParameters), type);
+            type.target = type;
+            type.typeArguments = type.typeParameters;
+            type.thisType = createTypeParameter();
+            type.thisType.isThisType = true;
+            type.thisType.constraint = type;
+            type.declaredProperties = properties;
+            type.declaredCallSignatures = ts.emptyArray;
+            type.declaredConstructSignatures = ts.emptyArray;
+            type.declaredStringIndexInfo = undefined;
+            type.declaredNumberIndexInfo = undefined;
+            type.minLength = minLength;
+            type.hasRestElement = hasRestElement;
+            type.associatedNames = associatedNames;
+            return type;
+        }
+        function getTupleTypeOfArity(arity, minLength, hasRestElement, associatedNames) {
+            var key = arity + (hasRestElement ? "+" : ",") + minLength + (associatedNames && associatedNames.length ? "," + associatedNames.join(",") : "");
+            var type = tupleTypes.get(key);
+            if (!type) {
+                tupleTypes.set(key, type = createTupleTypeOfArity(arity, minLength, hasRestElement, associatedNames));
+            }
+            return type;
+        }
+        function createTupleType(elementTypes, minLength, hasRestElement, associatedNames) {
+            if (minLength === void 0) { minLength = elementTypes.length; }
+            if (hasRestElement === void 0) { hasRestElement = false; }
+            var arity = elementTypes.length;
+            if (arity === 1 && hasRestElement) {
+                return createArrayType(elementTypes[0]);
+            }
+            var tupleType = getTupleTypeOfArity(arity, minLength, arity > 0 && hasRestElement, associatedNames);
+            return elementTypes.length ? createTypeReference(tupleType, elementTypes) : tupleType;
+        }
+        function getTypeFromTupleTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                var lastElement = ts.lastOrUndefined(node.elementTypes);
+                var restElement_1 = lastElement && lastElement.kind === 172 /* RestType */ ? lastElement : undefined;
+                var minLength = ts.findLastIndex(node.elementTypes, function (n) { return n.kind !== 171 /* OptionalType */ && n !== restElement_1; }) + 1;
+                var elementTypes = ts.map(node.elementTypes, function (n) {
+                    var type = getTypeFromTypeNode(n);
+                    return n === restElement_1 && getIndexTypeOfType(type, 1 /* Number */) || type;
+                });
+                links.resolvedType = createTupleType(elementTypes, minLength, !!restElement_1);
+            }
+            return links.resolvedType;
+        }
+        function sliceTupleType(type, index) {
+            var tuple = type.target;
+            if (tuple.hasRestElement) {
+                // don't slice off rest element
+                index = Math.min(index, getTypeReferenceArity(type) - 1);
+            }
+            return createTupleType((type.typeArguments || ts.emptyArray).slice(index), Math.max(0, tuple.minLength - index), tuple.hasRestElement, tuple.associatedNames && tuple.associatedNames.slice(index));
+        }
+        function getTypeFromOptionalTypeNode(node) {
+            var type = getTypeFromTypeNode(node.type);
+            return strictNullChecks ? getOptionalType(type) : type;
+        }
+        function getTypeId(type) {
+            return type.id;
+        }
+        function containsType(types, type) {
+            return ts.binarySearch(types, type, getTypeId, ts.compareValues) >= 0;
+        }
+        function insertType(types, type) {
+            var index = ts.binarySearch(types, type, getTypeId, ts.compareValues);
+            if (index < 0) {
+                types.splice(~index, 0, type);
+                return true;
+            }
+            return false;
+        }
+        // Return true if the given intersection type contains
+        // more than one unit type or,
+        // an object type and a nullable type (null or undefined), or
+        // a string-like type and a type known to be non-string-like, or
+        // a number-like type and a type known to be non-number-like, or
+        // a symbol-like type and a type known to be non-symbol-like, or
+        // a void-like type and a type known to be non-void-like, or
+        // a non-primitive type and a type known to be primitive.
+        function isEmptyIntersectionType(type) {
+            var combined = 0;
+            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                var t = _a[_i];
+                if (t.flags & 109440 /* Unit */ && combined & 109440 /* Unit */) {
+                    return true;
+                }
+                combined |= t.flags;
+                if (combined & 98304 /* Nullable */ && combined & (524288 /* Object */ | 67108864 /* NonPrimitive */) ||
+                    combined & 67108864 /* NonPrimitive */ && combined & (67238908 /* DisjointDomains */ & ~67108864 /* NonPrimitive */) ||
+                    combined & 132 /* StringLike */ && combined & (67238908 /* DisjointDomains */ & ~132 /* StringLike */) ||
+                    combined & 296 /* NumberLike */ && combined & (67238908 /* DisjointDomains */ & ~296 /* NumberLike */) ||
+                    combined & 2112 /* BigIntLike */ && combined & (67238908 /* DisjointDomains */ & ~2112 /* BigIntLike */) ||
+                    combined & 12288 /* ESSymbolLike */ && combined & (67238908 /* DisjointDomains */ & ~12288 /* ESSymbolLike */) ||
+                    combined & 49152 /* VoidLike */ && combined & (67238908 /* DisjointDomains */ & ~49152 /* VoidLike */)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        function addTypeToUnion(typeSet, includes, type) {
+            var flags = type.flags;
+            if (flags & 1048576 /* Union */) {
+                return addTypesToUnion(typeSet, includes, type.types);
+            }
+            // We ignore 'never' types in unions. Likewise, we ignore intersections of unit types as they are
+            // another form of 'never' (in that they have an empty value domain). We could in theory turn
+            // intersections of unit types into 'never' upon construction, but deferring the reduction makes it
+            // easier to reason about their origin.
+            if (!(flags & 131072 /* Never */ || flags & 2097152 /* Intersection */ && isEmptyIntersectionType(type))) {
+                includes |= flags & ~939524096 /* ConstructionFlags */;
+                if (type === wildcardType)
+                    includes |= 268435456 /* Wildcard */;
+                if (!strictNullChecks && flags & 98304 /* Nullable */) {
+                    if (!(flags & 134217728 /* ContainsWideningType */))
+                        includes |= 134217728 /* NonWideningType */;
+                }
+                else {
+                    var len = typeSet.length;
+                    var index = len && type.id > typeSet[len - 1].id ? ~len : ts.binarySearch(typeSet, type, getTypeId, ts.compareValues);
+                    if (index < 0) {
+                        typeSet.splice(~index, 0, type);
+                    }
+                }
+            }
+            return includes;
+        }
+        // Add the given types to the given type set. Order is preserved, duplicates are removed,
+        // and nested types of the given kind are flattened into the set.
+        function addTypesToUnion(typeSet, includes, types) {
+            for (var _i = 0, types_6 = types; _i < types_6.length; _i++) {
+                var type = types_6[_i];
+                includes = addTypeToUnion(typeSet, includes, type);
+            }
+            return includes;
+        }
+        function isSubtypeOfAny(source, targets) {
+            for (var _i = 0, targets_1 = targets; _i < targets_1.length; _i++) {
+                var target = targets_1[_i];
+                if (source !== target && isTypeSubtypeOf(source, target) && (!(ts.getObjectFlags(getTargetType(source)) & 1 /* Class */) ||
+                    !(ts.getObjectFlags(getTargetType(target)) & 1 /* Class */) ||
+                    isTypeDerivedFrom(source, target))) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        function isSetOfLiteralsFromSameEnum(types) {
+            var first = types[0];
+            if (first.flags & 1024 /* EnumLiteral */) {
+                var firstEnum = getParentOfSymbol(first.symbol);
+                for (var i = 1; i < types.length; i++) {
+                    var other = types[i];
+                    if (!(other.flags & 1024 /* EnumLiteral */) || (firstEnum !== getParentOfSymbol(other.symbol))) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
+        function removeSubtypes(types) {
+            if (types.length === 0 || isSetOfLiteralsFromSameEnum(types)) {
+                return;
+            }
+            var i = types.length;
+            while (i > 0) {
+                i--;
+                if (isSubtypeOfAny(types[i], types)) {
+                    ts.orderedRemoveItemAt(types, i);
+                }
+            }
+        }
+        function removeRedundantLiteralTypes(types, includes) {
+            var i = types.length;
+            while (i > 0) {
+                i--;
+                var t = types[i];
+                var remove = t.flags & 128 /* StringLiteral */ && includes & 4 /* String */ ||
+                    t.flags & 256 /* NumberLiteral */ && includes & 8 /* Number */ ||
+                    t.flags & 2048 /* BigIntLiteral */ && includes & 64 /* BigInt */ ||
+                    t.flags & 8192 /* UniqueESSymbol */ && includes & 4096 /* ESSymbol */ ||
+                    isFreshLiteralType(t) && containsType(types, t.regularType);
+                if (remove) {
+                    ts.orderedRemoveItemAt(types, i);
+                }
+            }
+        }
+        // We sort and deduplicate the constituent types based on object identity. If the subtypeReduction
+        // flag is specified we also reduce the constituent type set to only include types that aren't subtypes
+        // of other types. Subtype reduction is expensive for large union types and is possible only when union
+        // types are known not to circularly reference themselves (as is the case with union types created by
+        // expression constructs such as array literals and the || and ?: operators). Named types can
+        // circularly reference themselves and therefore cannot be subtype reduced during their declaration.
+        // For example, "type Item = string | (() => Item" is a named type that circularly references itself.
+        function getUnionType(types, unionReduction, aliasSymbol, aliasTypeArguments) {
+            if (unionReduction === void 0) { unionReduction = 1 /* Literal */; }
+            if (types.length === 0) {
+                return neverType;
+            }
+            if (types.length === 1) {
+                return types[0];
+            }
+            var typeSet = [];
+            var includes = addTypesToUnion(typeSet, 0, types);
+            if (unionReduction !== 0 /* None */) {
+                if (includes & 3 /* AnyOrUnknown */) {
+                    return includes & 1 /* Any */ ? includes & 268435456 /* Wildcard */ ? wildcardType : anyType : unknownType;
+                }
+                switch (unionReduction) {
+                    case 1 /* Literal */:
+                        if (includes & 8576 /* StringOrNumberLiteralOrUnique */ | 512 /* BooleanLiteral */) {
+                            removeRedundantLiteralTypes(typeSet, includes);
+                        }
+                        break;
+                    case 2 /* Subtype */:
+                        removeSubtypes(typeSet);
+                        break;
+                }
+                if (typeSet.length === 0) {
+                    return includes & 65536 /* Null */ ? includes & 134217728 /* NonWideningType */ ? nullType : nullWideningType :
+                        includes & 32768 /* Undefined */ ? includes & 134217728 /* NonWideningType */ ? undefinedType : undefinedWideningType :
+                            neverType;
+                }
+            }
+            return getUnionTypeFromSortedList(typeSet, !(includes & 66994211 /* NotPrimitiveUnion */), aliasSymbol, aliasTypeArguments);
+        }
+        function getUnionTypePredicate(signatures) {
+            var first;
+            var types = [];
+            for (var _i = 0, signatures_2 = signatures; _i < signatures_2.length; _i++) {
+                var sig = signatures_2[_i];
+                var pred = getTypePredicateOfSignature(sig);
+                if (!pred) {
+                    continue;
+                }
+                if (first) {
+                    if (!typePredicateKindsMatch(first, pred)) {
+                        // No common type predicate.
+                        return undefined;
+                    }
+                }
+                else {
+                    first = pred;
+                }
+                types.push(pred.type);
+            }
+            if (!first) {
+                // No union signatures had a type predicate.
+                return undefined;
+            }
+            var unionType = getUnionType(types);
+            return ts.isIdentifierTypePredicate(first)
+                ? createIdentifierTypePredicate(first.parameterName, first.parameterIndex, unionType)
+                : createThisTypePredicate(unionType);
+        }
+        function typePredicateKindsMatch(a, b) {
+            return ts.isIdentifierTypePredicate(a)
+                ? ts.isIdentifierTypePredicate(b) && a.parameterIndex === b.parameterIndex
+                : !ts.isIdentifierTypePredicate(b);
+        }
+        // This function assumes the constituent type list is sorted and deduplicated.
+        function getUnionTypeFromSortedList(types, primitiveTypesOnly, aliasSymbol, aliasTypeArguments) {
+            if (types.length === 0) {
+                return neverType;
+            }
+            if (types.length === 1) {
+                return types[0];
+            }
+            var id = getTypeListId(types);
+            var type = unionTypes.get(id);
+            if (!type) {
+                var propagatedFlags = getPropagatingFlagsOfTypes(types, /*excludeKinds*/ 98304 /* Nullable */);
+                type = createType(1048576 /* Union */ | propagatedFlags);
+                unionTypes.set(id, type);
+                type.types = types;
+                type.primitiveTypesOnly = primitiveTypesOnly;
+                /*
+                Note: This is the alias symbol (or lack thereof) that we see when we first encounter this union type.
+                For aliases of identical unions, eg `type T = A | B; type U = A | B`, the symbol of the first alias encountered is the aliasSymbol.
+                (In the language service, the order may depend on the order in which a user takes actions, such as hovering over symbols.)
+                It's important that we create equivalent union types only once, so that's an unfortunate side effect.
+                */
+                type.aliasSymbol = aliasSymbol;
+                type.aliasTypeArguments = aliasTypeArguments;
+            }
+            return type;
+        }
+        function getTypeFromUnionTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                var aliasSymbol = getAliasSymbolForTypeNode(node);
+                links.resolvedType = getUnionType(ts.map(node.types, getTypeFromTypeNode), 1 /* Literal */, aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol));
+            }
+            return links.resolvedType;
+        }
+        function addTypeToIntersection(typeSet, includes, type) {
+            var flags = type.flags;
+            if (flags & 2097152 /* Intersection */) {
+                return addTypesToIntersection(typeSet, includes, type.types);
+            }
+            if (isEmptyAnonymousObjectType(type)) {
+                if (!(includes & 536870912 /* EmptyObject */)) {
+                    includes |= 536870912 /* EmptyObject */;
+                    typeSet.push(type);
+                }
+            }
+            else {
+                includes |= flags & ~939524096 /* ConstructionFlags */;
+                if (flags & 3 /* AnyOrUnknown */) {
+                    if (type === wildcardType)
+                        includes |= 268435456 /* Wildcard */;
+                }
+                else if ((strictNullChecks || !(flags & 98304 /* Nullable */)) && !ts.contains(typeSet, type)) {
+                    typeSet.push(type);
+                }
+            }
+            return includes;
+        }
+        // Add the given types to the given type set. Order is preserved, freshness is removed from literal
+        // types, duplicates are removed, and nested types of the given kind are flattened into the set.
+        function addTypesToIntersection(typeSet, includes, types) {
+            for (var _i = 0, types_7 = types; _i < types_7.length; _i++) {
+                var type = types_7[_i];
+                includes = addTypeToIntersection(typeSet, includes, getRegularTypeOfLiteralType(type));
+            }
+            return includes;
+        }
+        function removeRedundantPrimitiveTypes(types, includes) {
+            var i = types.length;
+            while (i > 0) {
+                i--;
+                var t = types[i];
+                var remove = t.flags & 4 /* String */ && includes & 128 /* StringLiteral */ ||
+                    t.flags & 8 /* Number */ && includes & 256 /* NumberLiteral */ ||
+                    t.flags & 64 /* BigInt */ && includes & 2048 /* BigIntLiteral */ ||
+                    t.flags & 4096 /* ESSymbol */ && includes & 8192 /* UniqueESSymbol */;
+                if (remove) {
+                    ts.orderedRemoveItemAt(types, i);
+                }
+            }
+        }
+        // Check that the given type has a match in every union. A given type is matched by
+        // an identical type, and a literal type is additionally matched by its corresponding
+        // primitive type.
+        function eachUnionContains(unionTypes, type) {
+            for (var _i = 0, unionTypes_1 = unionTypes; _i < unionTypes_1.length; _i++) {
+                var u = unionTypes_1[_i];
+                if (!containsType(u.types, type)) {
+                    var primitive = type.flags & 128 /* StringLiteral */ ? stringType :
+                        type.flags & 256 /* NumberLiteral */ ? numberType :
+                            type.flags & 2048 /* BigIntLiteral */ ? bigintType :
+                                type.flags & 8192 /* UniqueESSymbol */ ? esSymbolType :
+                                    undefined;
+                    if (!primitive || !containsType(u.types, primitive)) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+        // If the given list of types contains more than one union of primitive types, replace the
+        // first with a union containing an intersection of those primitive types, then remove the
+        // other unions and return true. Otherwise, do nothing and return false.
+        function intersectUnionsOfPrimitiveTypes(types) {
+            var unionTypes;
+            var index = ts.findIndex(types, function (t) { return !!(t.flags & 1048576 /* Union */) && t.primitiveTypesOnly; });
+            if (index < 0) {
+                return false;
+            }
+            var i = index + 1;
+            // Remove all but the first union of primitive types and collect them in
+            // the unionTypes array.
+            while (i < types.length) {
+                var t = types[i];
+                if (t.flags & 1048576 /* Union */ && t.primitiveTypesOnly) {
+                    (unionTypes || (unionTypes = [types[index]])).push(t);
+                    ts.orderedRemoveItemAt(types, i);
+                }
+                else {
+                    i++;
+                }
+            }
+            // Return false if there was only one union of primitive types
+            if (!unionTypes) {
+                return false;
+            }
+            // We have more than one union of primitive types, now intersect them. For each
+            // type in each union we check if the type is matched in every union and if so
+            // we include it in the result.
+            var checked = [];
+            var result = [];
+            for (var _i = 0, unionTypes_2 = unionTypes; _i < unionTypes_2.length; _i++) {
+                var u = unionTypes_2[_i];
+                for (var _a = 0, _b = u.types; _a < _b.length; _a++) {
+                    var t = _b[_a];
+                    if (insertType(checked, t)) {
+                        if (eachUnionContains(unionTypes, t)) {
+                            insertType(result, t);
+                        }
+                    }
+                }
+            }
+            // Finally replace the first union with the result
+            types[index] = getUnionTypeFromSortedList(result, /*primitiveTypesOnly*/ true);
+            return true;
+        }
+        // We normalize combinations of intersection and union types based on the distributive property of the '&'
+        // operator. Specifically, because X & (A | B) is equivalent to X & A | X & B, we can transform intersection
+        // types with union type constituents into equivalent union types with intersection type constituents and
+        // effectively ensure that union types are always at the top level in type representations.
+        //
+        // We do not perform structural deduplication on intersection types. Intersection types are created only by the &
+        // type operator and we can't reduce those because we want to support recursive intersection types. For example,
+        // a type alias of the form "type List<T> = T & { next: List<T> }" cannot be reduced during its declaration.
+        // Also, unlike union types, the order of the constituent types is preserved in order that overload resolution
+        // for intersections of types with signatures can be deterministic.
+        function getIntersectionType(types, aliasSymbol, aliasTypeArguments) {
+            var typeSet = [];
+            var includes = addTypesToIntersection(typeSet, 0, types);
+            if (includes & 131072 /* Never */) {
+                return neverType;
+            }
+            if (includes & 1 /* Any */) {
+                return includes & 268435456 /* Wildcard */ ? wildcardType : anyType;
+            }
+            if (!strictNullChecks && includes & 98304 /* Nullable */) {
+                return includes & 32768 /* Undefined */ ? undefinedType : nullType;
+            }
+            if (includes & 4 /* String */ && includes & 128 /* StringLiteral */ ||
+                includes & 8 /* Number */ && includes & 256 /* NumberLiteral */ ||
+                includes & 64 /* BigInt */ && includes & 2048 /* BigIntLiteral */ ||
+                includes & 4096 /* ESSymbol */ && includes & 8192 /* UniqueESSymbol */) {
+                removeRedundantPrimitiveTypes(typeSet, includes);
+            }
+            if (includes & 536870912 /* EmptyObject */ && includes & 524288 /* Object */) {
+                ts.orderedRemoveItemAt(typeSet, ts.findIndex(typeSet, isEmptyAnonymousObjectType));
+            }
+            if (typeSet.length === 0) {
+                return unknownType;
+            }
+            if (typeSet.length === 1) {
+                return typeSet[0];
+            }
+            if (includes & 1048576 /* Union */) {
+                if (intersectUnionsOfPrimitiveTypes(typeSet)) {
+                    // When the intersection creates a reduced set (which might mean that *all* union types have
+                    // disappeared), we restart the operation to get a new set of combined flags. Once we have
+                    // reduced we'll never reduce again, so this occurs at most once.
+                    return getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
+                }
+                // We are attempting to construct a type of the form X & (A | B) & Y. Transform this into a type of
+                // the form X & A & Y | X & B & Y and recursively reduce until no union type constituents remain.
+                var unionIndex_1 = ts.findIndex(typeSet, function (t) { return (t.flags & 1048576 /* Union */) !== 0; });
+                var unionType = typeSet[unionIndex_1];
+                return getUnionType(ts.map(unionType.types, function (t) { return getIntersectionType(ts.replaceElement(typeSet, unionIndex_1, t)); }), 1 /* Literal */, aliasSymbol, aliasTypeArguments);
+            }
+            var id = getTypeListId(typeSet);
+            var type = intersectionTypes.get(id);
+            if (!type) {
+                var propagatedFlags = getPropagatingFlagsOfTypes(typeSet, /*excludeKinds*/ 98304 /* Nullable */);
+                type = createType(2097152 /* Intersection */ | propagatedFlags);
+                intersectionTypes.set(id, type);
+                type.types = typeSet;
+                type.aliasSymbol = aliasSymbol; // See comment in `getUnionTypeFromSortedList`.
+                type.aliasTypeArguments = aliasTypeArguments;
+            }
+            return type;
+        }
+        function getTypeFromIntersectionTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                var aliasSymbol = getAliasSymbolForTypeNode(node);
+                links.resolvedType = getIntersectionType(ts.map(node.types, getTypeFromTypeNode), aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol));
+            }
+            return links.resolvedType;
+        }
+        function createIndexType(type, stringsOnly) {
+            var result = createType(4194304 /* Index */);
+            result.type = type;
+            result.stringsOnly = stringsOnly;
+            return result;
+        }
+        function getIndexTypeForGenericType(type, stringsOnly) {
+            return stringsOnly ?
+                type.resolvedStringIndexType || (type.resolvedStringIndexType = createIndexType(type, /*stringsOnly*/ true)) :
+                type.resolvedIndexType || (type.resolvedIndexType = createIndexType(type, /*stringsOnly*/ false));
+        }
+        function getLiteralTypeFromPropertyName(name) {
+            return ts.isIdentifier(name) ? getLiteralType(ts.unescapeLeadingUnderscores(name.escapedText)) :
+                getRegularTypeOfLiteralType(ts.isComputedPropertyName(name) ? checkComputedPropertyName(name) : checkExpression(name));
+        }
+        function getBigIntLiteralType(node) {
+            return getLiteralType({
+                negative: false,
+                base10Value: ts.parsePseudoBigInt(node.text)
+            });
+        }
+        function getLiteralTypeFromProperty(prop, include) {
+            if (!(ts.getDeclarationModifierFlagsFromSymbol(prop) & 24 /* NonPublicAccessibilityModifier */)) {
+                var type = getLateBoundSymbol(prop).nameType;
+                if (!type && !ts.isKnownSymbol(prop)) {
+                    if (prop.escapedName === "default" /* Default */) {
+                        type = getLiteralType("default");
+                    }
+                    else {
+                        var name = prop.valueDeclaration && ts.getNameOfDeclaration(prop.valueDeclaration);
+                        type = name && getLiteralTypeFromPropertyName(name) || getLiteralType(ts.symbolName(prop));
+                    }
+                }
+                if (type && type.flags & include) {
+                    return type;
+                }
+            }
+            return neverType;
+        }
+        function getLiteralTypeFromProperties(type, include) {
+            return getUnionType(ts.map(getPropertiesOfType(type), function (t) { return getLiteralTypeFromProperty(t, include); }));
+        }
+        function getNonEnumNumberIndexInfo(type) {
+            var numberIndexInfo = getIndexInfoOfType(type, 1 /* Number */);
+            return numberIndexInfo !== enumNumberIndexInfo ? numberIndexInfo : undefined;
+        }
+        function getIndexType(type, stringsOnly) {
+            if (stringsOnly === void 0) { stringsOnly = keyofStringsOnly; }
+            return type.flags & 1048576 /* Union */ ? getIntersectionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly); })) :
+                type.flags & 2097152 /* Intersection */ ? getUnionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly); })) :
+                    maybeTypeOfKind(type, 58982400 /* InstantiableNonPrimitive */) ? getIndexTypeForGenericType(type, stringsOnly) :
+                        ts.getObjectFlags(type) & 32 /* Mapped */ ? getConstraintTypeFromMappedType(type) :
+                            type === wildcardType ? wildcardType :
+                                type.flags & 1 /* Any */ ? keyofConstraintType :
+                                    stringsOnly ? getIndexInfoOfType(type, 0 /* String */) ? stringType : getLiteralTypeFromProperties(type, 128 /* StringLiteral */) :
+                                        getIndexInfoOfType(type, 0 /* String */) ? getUnionType([stringType, numberType, getLiteralTypeFromProperties(type, 8192 /* UniqueESSymbol */)]) :
+                                            getNonEnumNumberIndexInfo(type) ? getUnionType([numberType, getLiteralTypeFromProperties(type, 128 /* StringLiteral */ | 8192 /* UniqueESSymbol */)]) :
+                                                getLiteralTypeFromProperties(type, 8576 /* StringOrNumberLiteralOrUnique */);
+        }
+        function getExtractStringType(type) {
+            if (keyofStringsOnly) {
+                return type;
+            }
+            var extractTypeAlias = getGlobalExtractSymbol();
+            return extractTypeAlias ? getTypeAliasInstantiation(extractTypeAlias, [type, stringType]) : stringType;
+        }
+        function getIndexTypeOrString(type) {
+            var indexType = getExtractStringType(getIndexType(type));
+            return indexType.flags & 131072 /* Never */ ? stringType : indexType;
+        }
+        function getTypeFromTypeOperatorNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                switch (node.operator) {
+                    case 129 /* KeyOfKeyword */:
+                        links.resolvedType = getIndexType(getTypeFromTypeNode(node.type));
+                        break;
+                    case 142 /* UniqueKeyword */:
+                        links.resolvedType = node.type.kind === 139 /* SymbolKeyword */
+                            ? getESSymbolLikeTypeForNode(ts.walkUpParenthesizedTypes(node.parent))
+                            : errorType;
+                        break;
+                }
+            }
+            return links.resolvedType; // TODO: GH#18217
+        }
+        function createIndexedAccessType(objectType, indexType) {
+            var type = createType(8388608 /* IndexedAccess */);
+            type.objectType = objectType;
+            type.indexType = indexType;
+            return type;
+        }
+        /**
+         * Returns if a type is or consists of a JSLiteral object type
+         * In addition to objects which are directly literals,
+         * * unions where every element is a jsliteral
+         * * intersections where at least one element is a jsliteral
+         * * and instantiable types constrained to a jsliteral
+         * Should all count as literals and not print errors on access or assignment of possibly existing properties.
+         * This mirrors the behavior of the index signature propagation, to which this behaves similarly (but doesn't affect assignability or inference).
+         */
+        function isJSLiteralType(type) {
+            if (noImplicitAny) {
+                return false; // Flag is meaningless under `noImplicitAny` mode
+            }
+            if (ts.getObjectFlags(type) & 16384 /* JSLiteral */) {
+                return true;
+            }
+            if (type.flags & 1048576 /* Union */) {
+                return ts.every(type.types, isJSLiteralType);
+            }
+            if (type.flags & 2097152 /* Intersection */) {
+                return ts.some(type.types, isJSLiteralType);
+            }
+            if (type.flags & 63176704 /* Instantiable */) {
+                return isJSLiteralType(getResolvedBaseConstraint(type));
+            }
+            return false;
+        }
+        function getPropertyTypeForIndexType(objectType, indexType, accessNode, cacheSymbol, missingType) {
+            var accessExpression = accessNode && accessNode.kind === 190 /* ElementAccessExpression */ ? accessNode : undefined;
+            var propName = isTypeUsableAsPropertyName(indexType) ?
+                getPropertyNameFromType(indexType) :
+                accessExpression && checkThatExpressionIsProperSymbolReference(accessExpression.argumentExpression, indexType, /*reportError*/ false) ?
+                    ts.getPropertyNameForKnownSymbolName(ts.idText(accessExpression.argumentExpression.name)) :
+                    accessNode && ts.isPropertyName(accessNode) ?
+                        // late bound names are handled in the first branch, so here we only need to handle normal names
+                        ts.getPropertyNameForPropertyNameNode(accessNode) :
+                        undefined;
+            if (propName !== undefined) {
+                var prop = getPropertyOfType(objectType, propName);
+                if (prop) {
+                    if (accessExpression) {
+                        markPropertyAsReferenced(prop, accessExpression, /*isThisAccess*/ accessExpression.expression.kind === 100 /* ThisKeyword */);
+                        if (ts.isAssignmentTarget(accessExpression) && (isReferenceToReadonlyEntity(accessExpression, prop) || isReferenceThroughNamespaceImport(accessExpression))) {
+                            error(accessExpression.argumentExpression, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_read_only_property, symbolToString(prop));
+                            return missingType;
+                        }
+                        if (cacheSymbol) {
+                            getNodeLinks(accessNode).resolvedSymbol = prop;
+                        }
+                    }
+                    var propType = getTypeOfSymbol(prop);
+                    return accessExpression && ts.getAssignmentTargetKind(accessExpression) !== 1 /* Definite */ ?
+                        getFlowTypeOfReference(accessExpression, propType) :
+                        propType;
+                }
+                if (everyType(objectType, isTupleType) && isNumericLiteralName(propName) && +propName >= 0) {
+                    if (accessNode && everyType(objectType, function (t) { return !t.target.hasRestElement; })) {
+                        var indexNode = getIndexNodeForAccessExpression(accessNode);
+                        if (isTupleType(objectType)) {
+                            error(indexNode, ts.Diagnostics.Tuple_type_0_of_length_1_has_no_element_at_index_2, typeToString(objectType), getTypeReferenceArity(objectType), ts.unescapeLeadingUnderscores(propName));
+                        }
+                        else {
+                            error(indexNode, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(propName), typeToString(objectType));
+                        }
+                    }
+                    return mapType(objectType, function (t) { return getRestTypeOfTupleType(t) || undefinedType; });
+                }
+            }
+            if (!(indexType.flags & 98304 /* Nullable */) && isTypeAssignableToKind(indexType, 132 /* StringLike */ | 296 /* NumberLike */ | 12288 /* ESSymbolLike */)) {
+                if (objectType.flags & (1 /* Any */ | 131072 /* Never */)) {
+                    return objectType;
+                }
+                var indexInfo = isTypeAssignableToKind(indexType, 296 /* NumberLike */) && getIndexInfoOfType(objectType, 1 /* Number */) ||
+                    getIndexInfoOfType(objectType, 0 /* String */) ||
+                    undefined;
+                if (indexInfo) {
+                    if (accessNode && !isTypeAssignableToKind(indexType, 4 /* String */ | 8 /* Number */)) {
+                        var indexNode = getIndexNodeForAccessExpression(accessNode);
+                        error(indexNode, ts.Diagnostics.Type_0_cannot_be_used_as_an_index_type, typeToString(indexType));
+                    }
+                    else if (accessExpression && indexInfo.isReadonly && (ts.isAssignmentTarget(accessExpression) || ts.isDeleteTarget(accessExpression))) {
+                        error(accessExpression, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
+                    }
+                    return indexInfo.type;
+                }
+                if (indexType.flags & 131072 /* Never */) {
+                    return neverType;
+                }
+                if (isJSLiteralType(objectType)) {
+                    return anyType;
+                }
+                if (accessExpression && !isConstEnumObjectType(objectType)) {
+                    if (noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors) {
+                        if (propName !== undefined && typeHasStaticProperty(propName, objectType)) {
+                            error(accessExpression, ts.Diagnostics.Property_0_is_a_static_member_of_type_1, propName, typeToString(objectType));
+                        }
+                        else if (getIndexTypeOfType(objectType, 1 /* Number */)) {
+                            error(accessExpression.argumentExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number);
+                        }
+                        else {
+                            var suggestion = void 0;
+                            if (propName !== undefined && (suggestion = getSuggestionForNonexistentProperty(propName, objectType))) {
+                                if (suggestion !== undefined) {
+                                    error(accessExpression.argumentExpression, ts.Diagnostics.Property_0_does_not_exist_on_type_1_Did_you_mean_2, propName, typeToString(objectType), suggestion);
+                                }
+                            }
+                            else {
+                                error(accessExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature, typeToString(objectType));
+                            }
+                        }
+                    }
+                    return missingType;
+                }
+            }
+            if (isJSLiteralType(objectType)) {
+                return anyType;
+            }
+            if (accessNode) {
+                var indexNode = getIndexNodeForAccessExpression(accessNode);
+                if (indexType.flags & (128 /* StringLiteral */ | 256 /* NumberLiteral */)) {
+                    error(indexNode, ts.Diagnostics.Property_0_does_not_exist_on_type_1, "" + indexType.value, typeToString(objectType));
+                }
+                else if (indexType.flags & (4 /* String */ | 8 /* Number */)) {
+                    error(indexNode, ts.Diagnostics.Type_0_has_no_matching_index_signature_for_type_1, typeToString(objectType), typeToString(indexType));
+                }
+                else {
+                    error(indexNode, ts.Diagnostics.Type_0_cannot_be_used_as_an_index_type, typeToString(indexType));
+                }
+            }
+            if (isTypeAny(indexType)) {
+                return indexType;
+            }
+            return missingType;
+        }
+        function getIndexNodeForAccessExpression(accessNode) {
+            return accessNode.kind === 190 /* ElementAccessExpression */
+                ? accessNode.argumentExpression
+                : accessNode.kind === 180 /* IndexedAccessType */
+                    ? accessNode.indexType
+                    : accessNode.kind === 149 /* ComputedPropertyName */
+                        ? accessNode.expression
+                        : accessNode;
+        }
+        function isGenericObjectType(type) {
+            return maybeTypeOfKind(type, 58982400 /* InstantiableNonPrimitive */ | 134217728 /* GenericMappedType */);
+        }
+        function isGenericIndexType(type) {
+            return maybeTypeOfKind(type, 58982400 /* InstantiableNonPrimitive */ | 4194304 /* Index */);
+        }
+        function getSimplifiedType(type) {
+            return type.flags & 8388608 /* IndexedAccess */ ? getSimplifiedIndexedAccessType(type) : type;
+        }
+        function distributeIndexOverObjectType(objectType, indexType) {
+            // (T | U)[K] -> T[K] | U[K]
+            if (objectType.flags & 1048576 /* Union */) {
+                return mapType(objectType, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType)); });
+            }
+            // (T & U)[K] -> T[K] & U[K]
+            if (objectType.flags & 2097152 /* Intersection */) {
+                return getIntersectionType(ts.map(objectType.types, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType)); }));
+            }
+        }
+        // Transform an indexed access to a simpler form, if possible. Return the simpler form, or return
+        // the type itself if no transformation is possible.
+        function getSimplifiedIndexedAccessType(type) {
+            if (type.simplified) {
+                return type.simplified === circularConstraintType ? type : type.simplified;
+            }
+            type.simplified = circularConstraintType;
+            // We recursively simplify the object type as it may in turn be an indexed access type. For example, with
+            // '{ [P in T]: { [Q in U]: number } }[T][U]' we want to first simplify the inner indexed access type.
+            var objectType = getSimplifiedType(type.objectType);
+            var indexType = getSimplifiedType(type.indexType);
+            // T[A | B] -> T[A] | T[B]
+            if (indexType.flags & 1048576 /* Union */) {
+                return type.simplified = mapType(indexType, function (t) { return getSimplifiedType(getIndexedAccessType(objectType, t)); });
+            }
+            // Only do the inner distributions if the index can no longer be instantiated to cause index distribution again
+            if (!(indexType.flags & 63176704 /* Instantiable */)) {
+                var simplified = distributeIndexOverObjectType(objectType, indexType);
+                if (simplified) {
+                    return type.simplified = simplified;
+                }
+            }
+            // So ultimately:
+            // ((A & B) | C)[K1 | K2] -> ((A & B) | C)[K1] | ((A & B) | C)[K2] -> (A & B)[K1] | C[K1] | (A & B)[K2] | C[K2] -> (A[K1] & B[K1]) | C[K1] | (A[K2] & B[K2]) | C[K2]
+            // If the object type is a mapped type { [P in K]: E }, where K is generic, instantiate E using a mapper
+            // that substitutes the index type for P. For example, for an index access { [P in K]: Box<T[P]> }[X], we
+            // construct the type Box<T[X]>.
+            if (isGenericMappedType(objectType)) {
+                var mapper = createTypeMapper([getTypeParameterFromMappedType(objectType)], [type.indexType]);
+                var templateMapper = combineTypeMappers(objectType.mapper, mapper);
+                return type.simplified = mapType(instantiateType(getTemplateTypeFromMappedType(objectType), templateMapper), getSimplifiedType);
+            }
+            return type.simplified = type;
+        }
+        function getIndexedAccessType(objectType, indexType, accessNode, missingType) {
+            if (missingType === void 0) { missingType = accessNode ? errorType : unknownType; }
+            if (objectType === wildcardType || indexType === wildcardType) {
+                return wildcardType;
+            }
+            // If the index type is generic, or if the object type is generic and doesn't originate in an expression,
+            // we are performing a higher-order index access where we cannot meaningfully access the properties of the
+            // object type. Note that for a generic T and a non-generic K, we eagerly resolve T[K] if it originates in
+            // an expression. This is to preserve backwards compatibility. For example, an element access 'this["foo"]'
+            // has always been resolved eagerly using the constraint type of 'this' at the given location.
+            if (isGenericIndexType(indexType) || !(accessNode && accessNode.kind !== 180 /* IndexedAccessType */) && isGenericObjectType(objectType)) {
+                if (objectType.flags & 3 /* AnyOrUnknown */) {
+                    return objectType;
+                }
+                // Defer the operation by creating an indexed access type.
+                var id = objectType.id + "," + indexType.id;
+                var type = indexedAccessTypes.get(id);
+                if (!type) {
+                    indexedAccessTypes.set(id, type = createIndexedAccessType(objectType, indexType));
+                }
+                return type;
+            }
+            // In the following we resolve T[K] to the type of the property in T selected by K.
+            // We treat boolean as different from other unions to improve errors;
+            // skipping straight to getPropertyTypeForIndexType gives errors with 'boolean' instead of 'true'.
+            var apparentObjectType = getApparentType(objectType);
+            if (indexType.flags & 1048576 /* Union */ && !(indexType.flags & 16 /* Boolean */)) {
+                var propTypes = [];
+                var wasMissingProp = false;
+                for (var _i = 0, _a = indexType.types; _i < _a.length; _i++) {
+                    var t = _a[_i];
+                    var propType = getPropertyTypeForIndexType(apparentObjectType, t, accessNode, /*cacheSymbol*/ false, missingType);
+                    if (propType === missingType) {
+                        if (!accessNode) {
+                            // If there's no error node, we can immeditely stop, since error reporting is off
+                            return missingType;
+                        }
+                        else {
+                            // Otherwise we set a flag and return at the end of the loop so we still mark all errors
+                            wasMissingProp = true;
+                        }
+                    }
+                    propTypes.push(propType);
+                }
+                if (wasMissingProp) {
+                    return missingType;
+                }
+                return getUnionType(propTypes);
+            }
+            return getPropertyTypeForIndexType(apparentObjectType, indexType, accessNode, /*cacheSymbol*/ true, missingType);
+        }
+        function getTypeFromIndexedAccessTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                var objectType = getTypeFromTypeNode(node.objectType);
+                var indexType = getTypeFromTypeNode(node.indexType);
+                var resolved = getIndexedAccessType(objectType, indexType, node);
+                links.resolvedType = resolved.flags & 8388608 /* IndexedAccess */ &&
+                    resolved.objectType === objectType &&
+                    resolved.indexType === indexType ?
+                    getConstrainedTypeVariable(resolved, node) : resolved;
+            }
+            return links.resolvedType;
+        }
+        function getTypeFromMappedTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                var type = createObjectType(32 /* Mapped */, node.symbol);
+                type.declaration = node;
+                type.aliasSymbol = getAliasSymbolForTypeNode(node);
+                type.aliasTypeArguments = getTypeArgumentsForAliasSymbol(type.aliasSymbol);
+                links.resolvedType = type;
+                // Eagerly resolve the constraint type which forces an error if the constraint type circularly
+                // references itself through one or more type aliases.
+                getConstraintTypeFromMappedType(type);
+            }
+            return links.resolvedType;
+        }
+        function getActualTypeVariable(type) {
+            return type.flags & 33554432 /* Substitution */ ? type.typeVariable : type;
+        }
+        function getConditionalType(root, mapper) {
+            var checkType = instantiateType(root.checkType, mapper);
+            var extendsType = instantiateType(root.extendsType, mapper);
+            if (checkType === wildcardType || extendsType === wildcardType) {
+                return wildcardType;
+            }
+            var checkTypeInstantiable = maybeTypeOfKind(checkType, 63176704 /* Instantiable */ | 134217728 /* GenericMappedType */);
+            var combinedMapper;
+            if (root.inferTypeParameters) {
+                var context = createInferenceContext(root.inferTypeParameters, /*signature*/ undefined, 0 /* None */);
+                if (!checkTypeInstantiable) {
+                    // We don't want inferences from constraints as they may cause us to eagerly resolve the
+                    // conditional type instead of deferring resolution. Also, we always want strict function
+                    // types rules (i.e. proper contravariance) for inferences.
+                    inferTypes(context.inferences, checkType, extendsType, 32 /* NoConstraints */ | 64 /* AlwaysStrict */);
+                }
+                combinedMapper = combineTypeMappers(mapper, context);
+            }
+            // Instantiate the extends type including inferences for 'infer T' type parameters
+            var inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
+            // We attempt to resolve the conditional type only when the check and extends types are non-generic
+            if (!checkTypeInstantiable && !maybeTypeOfKind(inferredExtendsType, 63176704 /* Instantiable */ | 134217728 /* GenericMappedType */)) {
+                if (inferredExtendsType.flags & 3 /* AnyOrUnknown */) {
+                    return instantiateType(root.trueType, mapper);
+                }
+                // Return union of trueType and falseType for 'any' since it matches anything
+                if (checkType.flags & 1 /* Any */) {
+                    return getUnionType([instantiateType(root.trueType, combinedMapper || mapper), instantiateType(root.falseType, mapper)]);
+                }
+                // Return falseType for a definitely false extends check. We check an instantations of the two
+                // types with type parameters mapped to the wildcard type, the most permissive instantiations
+                // possible (the wildcard type is assignable to and from all types). If those are not related,
+                // then no instatiations will be and we can just return the false branch type.
+                if (!isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType))) {
+                    return instantiateType(root.falseType, mapper);
+                }
+                // Return trueType for a definitely true extends check. We check instantiations of the two
+                // types with type parameters mapped to their restrictive form, i.e. a form of the type parameter
+                // that has no constraint. This ensures that, for example, the type
+                //   type Foo<T extends { x: any }> = T extends { x: string } ? string : number
+                // doesn't immediately resolve to 'string' instead of being deferred.
+                if (isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(inferredExtendsType))) {
+                    return instantiateType(root.trueType, combinedMapper || mapper);
+                }
+            }
+            // Return a deferred type for a check that is neither definitely true nor definitely false
+            var erasedCheckType = getActualTypeVariable(checkType);
+            var result = createType(16777216 /* Conditional */);
+            result.root = root;
+            result.checkType = erasedCheckType;
+            result.extendsType = extendsType;
+            result.mapper = mapper;
+            result.combinedMapper = combinedMapper;
+            result.aliasSymbol = root.aliasSymbol;
+            result.aliasTypeArguments = instantiateTypes(root.aliasTypeArguments, mapper); // TODO: GH#18217
+            return result;
+        }
+        function getTrueTypeFromConditionalType(type) {
+            return type.resolvedTrueType || (type.resolvedTrueType = instantiateType(type.root.trueType, type.mapper));
+        }
+        function getFalseTypeFromConditionalType(type) {
+            return type.resolvedFalseType || (type.resolvedFalseType = instantiateType(type.root.falseType, type.mapper));
+        }
+        function getInferTypeParameters(node) {
+            var result;
+            if (node.locals) {
+                node.locals.forEach(function (symbol) {
+                    if (symbol.flags & 262144 /* TypeParameter */) {
+                        result = ts.append(result, getDeclaredTypeOfSymbol(symbol));
+                    }
+                });
+            }
+            return result;
+        }
+        function isPossiblyReferencedInConditionalType(tp, node) {
+            if (isTypeParameterPossiblyReferenced(tp, node)) {
+                return true;
+            }
+            while (node) {
+                if (node.kind === 175 /* ConditionalType */) {
+                    if (isTypeParameterPossiblyReferenced(tp, node.extendsType)) {
+                        return true;
+                    }
+                }
+                node = node.parent;
+            }
+            return false;
+        }
+        function getTypeFromConditionalTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                var checkType = getTypeFromTypeNode(node.checkType);
+                var aliasSymbol = getAliasSymbolForTypeNode(node);
+                var aliasTypeArguments = getTypeArgumentsForAliasSymbol(aliasSymbol);
+                var allOuterTypeParameters = getOuterTypeParameters(node, /*includeThisTypes*/ true);
+                var outerTypeParameters = aliasTypeArguments ? allOuterTypeParameters : ts.filter(allOuterTypeParameters, function (tp) { return isPossiblyReferencedInConditionalType(tp, node); });
+                var root = {
+                    node: node,
+                    checkType: checkType,
+                    extendsType: getTypeFromTypeNode(node.extendsType),
+                    trueType: getTypeFromTypeNode(node.trueType),
+                    falseType: getTypeFromTypeNode(node.falseType),
+                    isDistributive: !!(checkType.flags & 262144 /* TypeParameter */),
+                    inferTypeParameters: getInferTypeParameters(node),
+                    outerTypeParameters: outerTypeParameters,
+                    instantiations: undefined,
+                    aliasSymbol: aliasSymbol,
+                    aliasTypeArguments: aliasTypeArguments
+                };
+                links.resolvedType = getConditionalType(root, /*mapper*/ undefined);
+                if (outerTypeParameters) {
+                    root.instantiations = ts.createMap();
+                    root.instantiations.set(getTypeListId(outerTypeParameters), links.resolvedType);
+                }
+            }
+            return links.resolvedType;
+        }
+        function getTypeFromInferTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                links.resolvedType = getDeclaredTypeOfTypeParameter(getSymbolOfNode(node.typeParameter));
+            }
+            return links.resolvedType;
+        }
+        function getIdentifierChain(node) {
+            if (ts.isIdentifier(node)) {
+                return [node];
+            }
+            else {
+                return ts.append(getIdentifierChain(node.left), node.right);
+            }
+        }
+        function getTypeFromImportTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                if (node.isTypeOf && node.typeArguments) { // Only the non-typeof form can make use of type arguments
+                    error(node, ts.Diagnostics.Type_arguments_cannot_be_used_here);
+                    links.resolvedSymbol = unknownSymbol;
+                    return links.resolvedType = errorType;
+                }
+                if (!ts.isLiteralImportTypeNode(node)) {
+                    error(node.argument, ts.Diagnostics.String_literal_expected);
+                    links.resolvedSymbol = unknownSymbol;
+                    return links.resolvedType = errorType;
+                }
+                var targetMeaning = node.isTypeOf ? 67220415 /* Value */ : node.flags & 2097152 /* JSDoc */ ? 67220415 /* Value */ | 67897832 /* Type */ : 67897832 /* Type */;
+                // TODO: Future work: support unions/generics/whatever via a deferred import-type
+                var innerModuleSymbol = resolveExternalModuleName(node, node.argument.literal);
+                if (!innerModuleSymbol) {
+                    links.resolvedSymbol = unknownSymbol;
+                    return links.resolvedType = errorType;
+                }
+                var moduleSymbol = resolveExternalModuleSymbol(innerModuleSymbol, /*dontResolveAlias*/ false);
+                if (!ts.nodeIsMissing(node.qualifier)) {
+                    var nameStack = getIdentifierChain(node.qualifier);
+                    var currentNamespace = moduleSymbol;
+                    var current = void 0;
+                    while (current = nameStack.shift()) {
+                        var meaning = nameStack.length ? 1920 /* Namespace */ : targetMeaning;
+                        var next = getSymbol(getExportsOfSymbol(getMergedSymbol(resolveSymbol(currentNamespace))), current.escapedText, meaning);
+                        if (!next) {
+                            error(current, ts.Diagnostics.Namespace_0_has_no_exported_member_1, getFullyQualifiedName(currentNamespace), ts.declarationNameToString(current));
+                            return links.resolvedType = errorType;
+                        }
+                        getNodeLinks(current).resolvedSymbol = next;
+                        getNodeLinks(current.parent).resolvedSymbol = next;
+                        currentNamespace = next;
+                    }
+                    resolveImportSymbolType(node, links, currentNamespace, targetMeaning);
+                }
+                else {
+                    if (moduleSymbol.flags & targetMeaning) {
+                        resolveImportSymbolType(node, links, moduleSymbol, targetMeaning);
+                    }
+                    else {
+                        var errorMessage = targetMeaning === 67220415 /* Value */
+                            ? ts.Diagnostics.Module_0_does_not_refer_to_a_value_but_is_used_as_a_value_here
+                            : ts.Diagnostics.Module_0_does_not_refer_to_a_type_but_is_used_as_a_type_here_Did_you_mean_typeof_import_0;
+                        error(node, errorMessage, node.argument.literal.text);
+                        links.resolvedSymbol = unknownSymbol;
+                        links.resolvedType = errorType;
+                    }
+                }
+            }
+            return links.resolvedType; // TODO: GH#18217
+        }
+        function resolveImportSymbolType(node, links, symbol, meaning) {
+            var resolvedSymbol = resolveSymbol(symbol);
+            links.resolvedSymbol = resolvedSymbol;
+            if (meaning === 67220415 /* Value */) {
+                return links.resolvedType = getTypeOfSymbol(symbol); // intentionally doesn't use resolved symbol so type is cached as expected on the alias
+            }
+            else {
+                return links.resolvedType = getTypeReferenceType(node, resolvedSymbol); // getTypeReferenceType doesn't handle aliases - it must get the resolved symbol
+            }
+        }
+        function getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                // Deferred resolution of members is handled by resolveObjectTypeMembers
+                var aliasSymbol = getAliasSymbolForTypeNode(node);
+                if (getMembersOfSymbol(node.symbol).size === 0 && !aliasSymbol) {
+                    links.resolvedType = emptyTypeLiteralType;
+                }
+                else {
+                    var type = createObjectType(16 /* Anonymous */, node.symbol);
+                    type.aliasSymbol = aliasSymbol;
+                    type.aliasTypeArguments = getTypeArgumentsForAliasSymbol(aliasSymbol);
+                    if (ts.isJSDocTypeLiteral(node) && node.isArrayType) {
+                        type = createArrayType(type);
+                    }
+                    links.resolvedType = type;
+                }
+            }
+            return links.resolvedType;
+        }
+        function getAliasSymbolForTypeNode(node) {
+            return ts.isTypeAlias(node.parent) ? getSymbolOfNode(node.parent) : undefined;
+        }
+        function getTypeArgumentsForAliasSymbol(symbol) {
+            return symbol ? getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol) : undefined;
+        }
+        function isNonGenericObjectType(type) {
+            return !!(type.flags & 524288 /* Object */) && !isGenericMappedType(type);
+        }
+        /**
+         * Since the source of spread types are object literals, which are not binary,
+         * this function should be called in a left folding style, with left = previous result of getSpreadType
+         * and right = the new element to be spread.
+         */
+        function getSpreadType(left, right, symbol, typeFlags, objectFlags) {
+            if (left.flags & 1 /* Any */ || right.flags & 1 /* Any */) {
+                return anyType;
+            }
+            if (left.flags & 2 /* Unknown */ || right.flags & 2 /* Unknown */) {
+                return unknownType;
+            }
+            if (left.flags & 131072 /* Never */) {
+                return right;
+            }
+            if (right.flags & 131072 /* Never */) {
+                return left;
+            }
+            if (left.flags & 1048576 /* Union */) {
+                return mapType(left, function (t) { return getSpreadType(t, right, symbol, typeFlags, objectFlags); });
+            }
+            if (right.flags & 1048576 /* Union */) {
+                return mapType(right, function (t) { return getSpreadType(left, t, symbol, typeFlags, objectFlags); });
+            }
+            if (right.flags & (528 /* BooleanLike */ | 296 /* NumberLike */ | 2112 /* BigIntLike */ | 132 /* StringLike */ | 1056 /* EnumLike */ | 67108864 /* NonPrimitive */ | 4194304 /* Index */)) {
+                return left;
+            }
+            if (isGenericObjectType(left) || isGenericObjectType(right)) {
+                if (isEmptyObjectType(left)) {
+                    return right;
+                }
+                // When the left type is an intersection, we may need to merge the last constituent of the
+                // intersection with the right type. For example when the left type is 'T & { a: string }'
+                // and the right type is '{ b: string }' we produce 'T & { a: string, b: string }'.
+                if (left.flags & 2097152 /* Intersection */) {
+                    var types = left.types;
+                    var lastLeft = types[types.length - 1];
+                    if (isNonGenericObjectType(lastLeft) && isNonGenericObjectType(right)) {
+                        return getIntersectionType(ts.concatenate(types.slice(0, types.length - 1), [getSpreadType(lastLeft, right, symbol, typeFlags, objectFlags)]));
+                    }
+                }
+                return getIntersectionType([left, right]);
+            }
+            var members = ts.createSymbolTable();
+            var skippedPrivateMembers = ts.createUnderscoreEscapedMap();
+            var stringIndexInfo;
+            var numberIndexInfo;
+            if (left === emptyObjectType) {
+                // for the first spread element, left === emptyObjectType, so take the right's string indexer
+                stringIndexInfo = getIndexInfoOfType(right, 0 /* String */);
+                numberIndexInfo = getIndexInfoOfType(right, 1 /* Number */);
+            }
+            else {
+                stringIndexInfo = unionSpreadIndexInfos(getIndexInfoOfType(left, 0 /* String */), getIndexInfoOfType(right, 0 /* String */));
+                numberIndexInfo = unionSpreadIndexInfos(getIndexInfoOfType(left, 1 /* Number */), getIndexInfoOfType(right, 1 /* Number */));
+            }
+            for (var _i = 0, _a = getPropertiesOfType(right); _i < _a.length; _i++) {
+                var rightProp = _a[_i];
+                if (ts.getDeclarationModifierFlagsFromSymbol(rightProp) & (8 /* Private */ | 16 /* Protected */)) {
+                    skippedPrivateMembers.set(rightProp.escapedName, true);
+                }
+                else if (isSpreadableProperty(rightProp)) {
+                    members.set(rightProp.escapedName, getSpreadSymbol(rightProp));
+                }
+            }
+            for (var _b = 0, _c = getPropertiesOfType(left); _b < _c.length; _b++) {
+                var leftProp = _c[_b];
+                if (skippedPrivateMembers.has(leftProp.escapedName) || !isSpreadableProperty(leftProp)) {
+                    continue;
+                }
+                if (members.has(leftProp.escapedName)) {
+                    var rightProp = members.get(leftProp.escapedName);
+                    var rightType = getTypeOfSymbol(rightProp);
+                    if (rightProp.flags & 16777216 /* Optional */) {
+                        var declarations = ts.concatenate(leftProp.declarations, rightProp.declarations);
+                        var flags = 4 /* Property */ | (leftProp.flags & 16777216 /* Optional */);
+                        var result = createSymbol(flags, leftProp.escapedName);
+                        result.type = getUnionType([getTypeOfSymbol(leftProp), getTypeWithFacts(rightType, 524288 /* NEUndefined */)]);
+                        result.leftSpread = leftProp;
+                        result.rightSpread = rightProp;
+                        result.declarations = declarations;
+                        result.nameType = leftProp.nameType;
+                        members.set(leftProp.escapedName, result);
+                    }
+                }
+                else {
+                    members.set(leftProp.escapedName, getSpreadSymbol(leftProp));
+                }
+            }
+            var spread = createAnonymousType(symbol, members, ts.emptyArray, ts.emptyArray, getNonReadonlyIndexSignature(stringIndexInfo), getNonReadonlyIndexSignature(numberIndexInfo));
+            spread.flags |= 268435456 /* ContainsObjectLiteral */ | typeFlags;
+            spread.objectFlags |= 128 /* ObjectLiteral */ | 1024 /* ContainsSpread */ | objectFlags;
+            return spread;
+        }
+        /** We approximate own properties as non-methods plus methods that are inside the object literal */
+        function isSpreadableProperty(prop) {
+            return !(prop.flags & (8192 /* Method */ | 32768 /* GetAccessor */ | 65536 /* SetAccessor */)) ||
+                !prop.declarations.some(function (decl) { return ts.isClassLike(decl.parent); });
+        }
+        function getSpreadSymbol(prop) {
+            var isReadonly = isReadonlySymbol(prop);
+            var isSetonlyAccessor = prop.flags & 65536 /* SetAccessor */ && !(prop.flags & 32768 /* GetAccessor */);
+            if (!isReadonly && !isSetonlyAccessor) {
+                return prop;
+            }
+            var flags = 4 /* Property */ | (prop.flags & 16777216 /* Optional */);
+            var result = createSymbol(flags, prop.escapedName);
+            result.type = isSetonlyAccessor ? undefinedType : getTypeOfSymbol(prop);
+            result.declarations = prop.declarations;
+            result.nameType = prop.nameType;
+            result.syntheticOrigin = prop;
+            return result;
+        }
+        function getNonReadonlyIndexSignature(index) {
+            if (index && index.isReadonly) {
+                return createIndexInfo(index.type, /*isReadonly*/ false, index.declaration);
+            }
+            return index;
+        }
+        function createLiteralType(flags, value, symbol) {
+            var type = createType(flags);
+            type.symbol = symbol;
+            type.value = value;
+            return type;
+        }
+        function getFreshTypeOfLiteralType(type) {
+            if (type.flags & 2944 /* Literal */) {
+                if (!type.freshType) {
+                    var freshType = createLiteralType(type.flags, type.value, type.symbol);
+                    freshType.regularType = type;
+                    freshType.freshType = freshType;
+                    type.freshType = freshType;
+                }
+                return type.freshType;
+            }
+            return type;
+        }
+        function getRegularTypeOfLiteralType(type) {
+            return type.flags & 2944 /* Literal */ ? type.regularType :
+                type.flags & 1048576 /* Union */ ? getUnionType(ts.sameMap(type.types, getRegularTypeOfLiteralType)) :
+                    type;
+        }
+        function isFreshLiteralType(type) {
+            return !!(type.flags & 2944 /* Literal */) && type.freshType === type;
+        }
+        function getLiteralType(value, enumId, symbol) {
+            // We store all literal types in a single map with keys of the form '#NNN' and '@SSS',
+            // where NNN is the text representation of a numeric literal and SSS are the characters
+            // of a string literal. For literal enum members we use 'EEE#NNN' and 'EEE@SSS', where
+            // EEE is a unique id for the containing enum type.
+            var qualifier = typeof value === "number" ? "#" : typeof value === "string" ? "@" : "n";
+            var key = (enumId ? enumId : "") + qualifier + (typeof value === "object" ? ts.pseudoBigIntToString(value) : value);
+            var type = literalTypes.get(key);
+            if (!type) {
+                var flags = (typeof value === "number" ? 256 /* NumberLiteral */ :
+                    typeof value === "string" ? 128 /* StringLiteral */ : 2048 /* BigIntLiteral */) |
+                    (enumId ? 1024 /* EnumLiteral */ : 0);
+                literalTypes.set(key, type = createLiteralType(flags, value, symbol));
+                type.regularType = type;
+            }
+            return type;
+        }
+        function getTypeFromLiteralTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                links.resolvedType = getRegularTypeOfLiteralType(checkExpression(node.literal));
+            }
+            return links.resolvedType;
+        }
+        function createUniqueESSymbolType(symbol) {
+            var type = createType(8192 /* UniqueESSymbol */);
+            type.symbol = symbol;
+            type.escapedName = "__@" + type.symbol.escapedName + "@" + getSymbolId(type.symbol);
+            return type;
+        }
+        function getESSymbolLikeTypeForNode(node) {
+            if (ts.isValidESSymbolDeclaration(node)) {
+                var symbol = getSymbolOfNode(node);
+                var links = getSymbolLinks(symbol);
+                return links.uniqueESSymbolType || (links.uniqueESSymbolType = createUniqueESSymbolType(symbol));
+            }
+            return esSymbolType;
+        }
+        function getThisType(node) {
+            var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
+            var parent = container && container.parent;
+            if (parent && (ts.isClassLike(parent) || parent.kind === 241 /* InterfaceDeclaration */)) {
+                if (!ts.hasModifier(container, 32 /* Static */) &&
+                    (container.kind !== 157 /* Constructor */ || ts.isNodeDescendantOf(node, container.body))) {
+                    return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
+                }
+            }
+            error(node, ts.Diagnostics.A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface);
+            return errorType;
+        }
+        function getTypeFromThisTypeNode(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                links.resolvedType = getThisType(node);
+            }
+            return links.resolvedType;
+        }
+        function getTypeFromTypeNode(node) {
+            switch (node.kind) {
+                case 120 /* AnyKeyword */:
+                case 284 /* JSDocAllType */:
+                case 285 /* JSDocUnknownType */:
+                    return anyType;
+                case 143 /* UnknownKeyword */:
+                    return unknownType;
+                case 138 /* StringKeyword */:
+                    return stringType;
+                case 135 /* NumberKeyword */:
+                    return numberType;
+                case 146 /* BigIntKeyword */:
+                    return bigintType;
+                case 123 /* BooleanKeyword */:
+                    return booleanType;
+                case 139 /* SymbolKeyword */:
+                    return esSymbolType;
+                case 106 /* VoidKeyword */:
+                    return voidType;
+                case 141 /* UndefinedKeyword */:
+                    return undefinedType;
+                case 96 /* NullKeyword */:
+                    return nullType;
+                case 132 /* NeverKeyword */:
+                    return neverType;
+                case 136 /* ObjectKeyword */:
+                    return node.flags & 65536 /* JavaScriptFile */ ? anyType : nonPrimitiveType;
+                case 178 /* ThisType */:
+                case 100 /* ThisKeyword */:
+                    return getTypeFromThisTypeNode(node);
+                case 182 /* LiteralType */:
+                    return getTypeFromLiteralTypeNode(node);
+                case 164 /* TypeReference */:
+                    return getTypeFromTypeReference(node);
+                case 163 /* TypePredicate */:
+                    return booleanType;
+                case 211 /* ExpressionWithTypeArguments */:
+                    return getTypeFromTypeReference(node);
+                case 167 /* TypeQuery */:
+                    return getTypeFromTypeQueryNode(node);
+                case 169 /* ArrayType */:
+                    return getTypeFromArrayTypeNode(node);
+                case 170 /* TupleType */:
+                    return getTypeFromTupleTypeNode(node);
+                case 171 /* OptionalType */:
+                    return getTypeFromOptionalTypeNode(node);
+                case 173 /* UnionType */:
+                    return getTypeFromUnionTypeNode(node);
+                case 174 /* IntersectionType */:
+                    return getTypeFromIntersectionTypeNode(node);
+                case 286 /* JSDocNullableType */:
+                    return getTypeFromJSDocNullableTypeNode(node);
+                case 288 /* JSDocOptionalType */:
+                    return addOptionality(getTypeFromTypeNode(node.type));
+                case 177 /* ParenthesizedType */:
+                case 172 /* RestType */:
+                case 287 /* JSDocNonNullableType */:
+                case 283 /* JSDocTypeExpression */:
+                    return getTypeFromTypeNode(node.type);
+                case 290 /* JSDocVariadicType */:
+                    return getTypeFromJSDocVariadicType(node);
+                case 165 /* FunctionType */:
+                case 166 /* ConstructorType */:
+                case 168 /* TypeLiteral */:
+                case 292 /* JSDocTypeLiteral */:
+                case 289 /* JSDocFunctionType */:
+                case 293 /* JSDocSignature */:
+                    return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
+                case 179 /* TypeOperator */:
+                    return getTypeFromTypeOperatorNode(node);
+                case 180 /* IndexedAccessType */:
+                    return getTypeFromIndexedAccessTypeNode(node);
+                case 181 /* MappedType */:
+                    return getTypeFromMappedTypeNode(node);
+                case 175 /* ConditionalType */:
+                    return getTypeFromConditionalTypeNode(node);
+                case 176 /* InferType */:
+                    return getTypeFromInferTypeNode(node);
+                case 183 /* ImportType */:
+                    return getTypeFromImportTypeNode(node);
+                // This function assumes that an identifier or qualified name is a type expression
+                // Callers should first ensure this by calling isTypeNode
+                case 72 /* Identifier */:
+                case 148 /* QualifiedName */:
+                    var symbol = getSymbolAtLocation(node);
+                    return symbol ? getDeclaredTypeOfSymbol(symbol) : errorType;
+                default:
+                    return errorType;
+            }
+        }
+        function instantiateList(items, mapper, instantiator) {
+            if (items && items.length) {
+                for (var i = 0; i < items.length; i++) {
+                    var item = items[i];
+                    var mapped = instantiator(item, mapper);
+                    if (item !== mapped) {
+                        var result = i === 0 ? [] : items.slice(0, i);
+                        result.push(mapped);
+                        for (i++; i < items.length; i++) {
+                            result.push(instantiator(items[i], mapper));
+                        }
+                        return result;
+                    }
+                }
+            }
+            return items;
+        }
+        function instantiateTypes(types, mapper) {
+            return instantiateList(types, mapper, instantiateType);
+        }
+        function instantiateSignatures(signatures, mapper) {
+            return instantiateList(signatures, mapper, instantiateSignature);
+        }
+        function makeUnaryTypeMapper(source, target) {
+            return function (t) { return t === source ? target : t; };
+        }
+        function makeBinaryTypeMapper(source1, target1, source2, target2) {
+            return function (t) { return t === source1 ? target1 : t === source2 ? target2 : t; };
+        }
+        function makeArrayTypeMapper(sources, targets) {
+            return function (t) {
+                for (var i = 0; i < sources.length; i++) {
+                    if (t === sources[i]) {
+                        return targets ? targets[i] : anyType;
+                    }
+                }
+                return t;
+            };
+        }
+        function createTypeMapper(sources, targets) {
+            ts.Debug.assert(targets === undefined || sources.length === targets.length);
+            return sources.length === 1 ? makeUnaryTypeMapper(sources[0], targets ? targets[0] : anyType) :
+                sources.length === 2 ? makeBinaryTypeMapper(sources[0], targets ? targets[0] : anyType, sources[1], targets ? targets[1] : anyType) :
+                    makeArrayTypeMapper(sources, targets);
+        }
+        function createTypeEraser(sources) {
+            return createTypeMapper(sources, /*targets*/ undefined);
+        }
+        /**
+         * Maps forward-references to later types parameters to the empty object type.
+         * This is used during inference when instantiating type parameter defaults.
+         */
+        function createBackreferenceMapper(typeParameters, index) {
+            return function (t) { return typeParameters.indexOf(t) >= index ? emptyObjectType : t; };
+        }
+        function isInferenceContext(mapper) {
+            return !!mapper.typeParameters;
+        }
+        function cloneTypeMapper(mapper) {
+            return mapper && isInferenceContext(mapper) ?
+                createInferenceContext(mapper.typeParameters, mapper.signature, mapper.flags | 1 /* NoDefault */, mapper.compareTypes, mapper.inferences) :
+                mapper;
+        }
+        function combineTypeMappers(mapper1, mapper2) {
+            if (!mapper1)
+                return mapper2;
+            if (!mapper2)
+                return mapper1;
+            return function (t) { return instantiateType(mapper1(t), mapper2); };
+        }
+        function createReplacementMapper(source, target, baseMapper) {
+            return function (t) { return t === source ? target : baseMapper(t); };
+        }
+        function permissiveMapper(type) {
+            return type.flags & 262144 /* TypeParameter */ ? wildcardType : type;
+        }
+        function getRestrictiveTypeParameter(tp) {
+            return tp.constraint === unknownType ? tp : tp.restrictiveInstantiation || (tp.restrictiveInstantiation = createTypeParameter(tp.symbol),
+                tp.restrictiveInstantiation.constraint = unknownType,
+                tp.restrictiveInstantiation);
+        }
+        function restrictiveMapper(type) {
+            return type.flags & 262144 /* TypeParameter */ ? getRestrictiveTypeParameter(type) : type;
+        }
+        function cloneTypeParameter(typeParameter) {
+            var result = createTypeParameter(typeParameter.symbol);
+            result.target = typeParameter;
+            return result;
+        }
+        function instantiateTypePredicate(predicate, mapper) {
+            if (ts.isIdentifierTypePredicate(predicate)) {
+                return {
+                    kind: 1 /* Identifier */,
+                    parameterName: predicate.parameterName,
+                    parameterIndex: predicate.parameterIndex,
+                    type: instantiateType(predicate.type, mapper)
+                };
+            }
+            else {
+                return {
+                    kind: 0 /* This */,
+                    type: instantiateType(predicate.type, mapper)
+                };
+            }
+        }
+        function instantiateSignature(signature, mapper, eraseTypeParameters) {
+            var freshTypeParameters;
+            if (signature.typeParameters && !eraseTypeParameters) {
+                // First create a fresh set of type parameters, then include a mapping from the old to the
+                // new type parameters in the mapper function. Finally store this mapper in the new type
+                // parameters such that we can use it when instantiating constraints.
+                freshTypeParameters = ts.map(signature.typeParameters, cloneTypeParameter);
+                mapper = combineTypeMappers(createTypeMapper(signature.typeParameters, freshTypeParameters), mapper);
+                for (var _i = 0, freshTypeParameters_1 = freshTypeParameters; _i < freshTypeParameters_1.length; _i++) {
+                    var tp = freshTypeParameters_1[_i];
+                    tp.mapper = mapper;
+                }
+            }
+            // Don't compute resolvedReturnType and resolvedTypePredicate now,
+            // because using `mapper` now could trigger inferences to become fixed. (See `createInferenceContext`.)
+            // See GH#17600.
+            var result = createSignature(signature.declaration, freshTypeParameters, signature.thisParameter && instantiateSymbol(signature.thisParameter, mapper), instantiateList(signature.parameters, mapper, instantiateSymbol), 
+            /*resolvedReturnType*/ undefined, 
+            /*resolvedTypePredicate*/ undefined, signature.minArgumentCount, signature.hasRestParameter, signature.hasLiteralTypes);
+            result.target = signature;
+            result.mapper = mapper;
+            return result;
+        }
+        function instantiateSymbol(symbol, mapper) {
+            var links = getSymbolLinks(symbol);
+            if (links.type && !maybeTypeOfKind(links.type, 524288 /* Object */ | 63176704 /* Instantiable */)) {
+                // If the type of the symbol is already resolved, and if that type could not possibly
+                // be affected by instantiation, simply return the symbol itself.
+                return symbol;
+            }
+            if (ts.getCheckFlags(symbol) & 1 /* Instantiated */) {
+                // If symbol being instantiated is itself a instantiation, fetch the original target and combine the
+                // type mappers. This ensures that original type identities are properly preserved and that aliases
+                // always reference a non-aliases.
+                symbol = links.target;
+                mapper = combineTypeMappers(links.mapper, mapper);
+            }
+            // Keep the flags from the symbol we're instantiating.  Mark that is instantiated, and
+            // also transient so that we can just store data on it directly.
+            var result = createSymbol(symbol.flags, symbol.escapedName, 1 /* Instantiated */ | ts.getCheckFlags(symbol) & (2048 /* Late */ | 8192 /* OptionalParameter */ | 16384 /* RestParameter */));
+            result.declarations = symbol.declarations;
+            result.parent = symbol.parent;
+            result.target = symbol;
+            result.mapper = mapper;
+            if (symbol.valueDeclaration) {
+                result.valueDeclaration = symbol.valueDeclaration;
+            }
+            if (symbol.nameType) {
+                result.nameType = symbol.nameType;
+            }
+            return result;
+        }
+        function getAnonymousTypeInstantiation(type, mapper) {
+            var target = type.objectFlags & 64 /* Instantiated */ ? type.target : type;
+            var symbol = target.symbol;
+            var links = getSymbolLinks(symbol);
+            var typeParameters = links.outerTypeParameters;
+            if (!typeParameters) {
+                // The first time an anonymous type is instantiated we compute and store a list of the type
+                // parameters that are in scope (and therefore potentially referenced). For type literals that
+                // aren't the right hand side of a generic type alias declaration we optimize by reducing the
+                // set of type parameters to those that are possibly referenced in the literal.
+                var declaration_1 = symbol.declarations[0];
+                if (ts.isInJSFile(declaration_1)) {
+                    var paramTag = ts.findAncestor(declaration_1, ts.isJSDocParameterTag);
+                    if (paramTag) {
+                        var paramSymbol = ts.getParameterSymbolFromJSDoc(paramTag);
+                        if (paramSymbol) {
+                            declaration_1 = paramSymbol.valueDeclaration;
+                        }
+                    }
+                }
+                var outerTypeParameters = getOuterTypeParameters(declaration_1, /*includeThisTypes*/ true);
+                if (isJSConstructor(declaration_1)) {
+                    var templateTagParameters = getTypeParametersFromDeclaration(declaration_1);
+                    outerTypeParameters = ts.addRange(outerTypeParameters, templateTagParameters);
+                }
+                typeParameters = outerTypeParameters || ts.emptyArray;
+                typeParameters = symbol.flags & 2048 /* TypeLiteral */ && !target.aliasTypeArguments ?
+                    ts.filter(typeParameters, function (tp) { return isTypeParameterPossiblyReferenced(tp, declaration_1); }) :
+                    typeParameters;
+                links.outerTypeParameters = typeParameters;
+                if (typeParameters.length) {
+                    links.instantiations = ts.createMap();
+                    links.instantiations.set(getTypeListId(typeParameters), target);
+                }
+            }
+            if (typeParameters.length) {
+                // We are instantiating an anonymous type that has one or more type parameters in scope. Apply the
+                // mapper to the type parameters to produce the effective list of type arguments, and compute the
+                // instantiation cache key from the type IDs of the type arguments.
+                var combinedMapper = type.objectFlags & 64 /* Instantiated */ ? combineTypeMappers(type.mapper, mapper) : mapper;
+                var typeArguments = ts.map(typeParameters, combinedMapper);
+                var id = getTypeListId(typeArguments);
+                var result = links.instantiations.get(id);
+                if (!result) {
+                    var newMapper = createTypeMapper(typeParameters, typeArguments);
+                    result = target.objectFlags & 32 /* Mapped */ ? instantiateMappedType(target, newMapper) : instantiateAnonymousType(target, newMapper);
+                    links.instantiations.set(id, result);
+                }
+                return result;
+            }
+            return type;
+        }
+        function maybeTypeParameterReference(node) {
+            return !(node.kind === 148 /* QualifiedName */ ||
+                node.parent.kind === 164 /* TypeReference */ && node.parent.typeArguments && node === node.parent.typeName);
+        }
+        function isTypeParameterPossiblyReferenced(tp, node) {
+            // If the type parameter doesn't have exactly one declaration, if there are invening statement blocks
+            // between the node and the type parameter declaration, if the node contains actual references to the
+            // type parameter, or if the node contains type queries, we consider the type parameter possibly referenced.
+            if (tp.symbol && tp.symbol.declarations && tp.symbol.declarations.length === 1) {
+                var container_3 = tp.symbol.declarations[0].parent;
+                if (ts.findAncestor(node, function (n) { return n.kind === 218 /* Block */ ? "quit" : n === container_3; })) {
+                    return !!ts.forEachChild(node, containsReference);
+                }
+            }
+            return true;
+            function containsReference(node) {
+                switch (node.kind) {
+                    case 178 /* ThisType */:
+                        return !!tp.isThisType;
+                    case 72 /* Identifier */:
+                        return !tp.isThisType && ts.isPartOfTypeNode(node) && maybeTypeParameterReference(node) &&
+                            getTypeFromTypeNode(node) === tp;
+                    case 167 /* TypeQuery */:
+                        return true;
+                }
+                return !!ts.forEachChild(node, containsReference);
+            }
+        }
+        function getHomomorphicTypeVariable(type) {
+            var constraintType = getConstraintTypeFromMappedType(type);
+            if (constraintType.flags & 4194304 /* Index */) {
+                var typeVariable = constraintType.type;
+                if (typeVariable.flags & 262144 /* TypeParameter */) {
+                    return typeVariable;
+                }
+            }
+            return undefined;
+        }
+        function instantiateMappedType(type, mapper) {
+            // For a homomorphic mapped type { [P in keyof T]: X }, where T is some type variable, the mapping
+            // operation depends on T as follows:
+            // * If T is a primitive type no mapping is performed and the result is simply T.
+            // * If T is a union type we distribute the mapped type over the union.
+            // * If T is an array we map to an array where the element type has been transformed.
+            // * If T is a tuple we map to a tuple where the element types have been transformed.
+            // * Otherwise we map to an object type where the type of each property has been transformed.
+            // For example, when T is instantiated to a union type A | B, we produce { [P in keyof A]: X } |
+            // { [P in keyof B]: X }, and when when T is instantiated to a union type A | undefined, we produce
+            // { [P in keyof A]: X } | undefined.
+            var typeVariable = getHomomorphicTypeVariable(type);
+            if (typeVariable) {
+                var mappedTypeVariable = instantiateType(typeVariable, mapper);
+                if (typeVariable !== mappedTypeVariable) {
+                    // If we are already in the process of creating an instantiation of this mapped type,
+                    // return the error type. This situation only arises if we are instantiating the mapped
+                    // type for an array or tuple type, as we then need to eagerly resolve the (possibly
+                    // circular) element type(s).
+                    if (type.instantiating) {
+                        return errorType;
+                    }
+                    type.instantiating = true;
+                    var result = mapType(mappedTypeVariable, function (t) {
+                        if (t.flags & (3 /* AnyOrUnknown */ | 58982400 /* InstantiableNonPrimitive */ | 524288 /* Object */ | 2097152 /* Intersection */) && t !== wildcardType) {
+                            var replacementMapper = createReplacementMapper(typeVariable, t, mapper);
+                            return isArrayType(t) ? createArrayType(instantiateMappedTypeTemplate(type, numberType, /*isOptional*/ true, replacementMapper)) :
+                                isReadonlyArrayType(t) ? createReadonlyArrayType(instantiateMappedTypeTemplate(type, numberType, /*isOptional*/ true, replacementMapper)) :
+                                    isTupleType(t) ? instantiateMappedTupleType(t, type, replacementMapper) :
+                                        instantiateAnonymousType(type, replacementMapper);
+                        }
+                        return t;
+                    });
+                    type.instantiating = false;
+                    return result;
+                }
+            }
+            return instantiateAnonymousType(type, mapper);
+        }
+        function instantiateMappedTupleType(tupleType, mappedType, mapper) {
+            var minLength = tupleType.target.minLength;
+            var elementTypes = ts.map(tupleType.typeArguments || ts.emptyArray, function (_, i) {
+                return instantiateMappedTypeTemplate(mappedType, getLiteralType("" + i), i >= minLength, mapper);
+            });
+            var modifiers = getMappedTypeModifiers(mappedType);
+            var newMinLength = modifiers & 4 /* IncludeOptional */ ? 0 :
+                modifiers & 8 /* ExcludeOptional */ ? getTypeReferenceArity(tupleType) - (tupleType.target.hasRestElement ? 1 : 0) :
+                    minLength;
+            return createTupleType(elementTypes, newMinLength, tupleType.target.hasRestElement, tupleType.target.associatedNames);
+        }
+        function instantiateMappedTypeTemplate(type, key, isOptional, mapper) {
+            var templateMapper = combineTypeMappers(mapper, createTypeMapper([getTypeParameterFromMappedType(type)], [key]));
+            var propType = instantiateType(getTemplateTypeFromMappedType(type.target || type), templateMapper);
+            var modifiers = getMappedTypeModifiers(type);
+            return strictNullChecks && modifiers & 4 /* IncludeOptional */ && !isTypeAssignableTo(undefinedType, propType) ? getOptionalType(propType) :
+                strictNullChecks && modifiers & 8 /* ExcludeOptional */ && isOptional ? getTypeWithFacts(propType, 524288 /* NEUndefined */) :
+                    propType;
+        }
+        function instantiateAnonymousType(type, mapper) {
+            var result = createObjectType(type.objectFlags | 64 /* Instantiated */, type.symbol);
+            if (type.objectFlags & 32 /* Mapped */) {
+                result.declaration = type.declaration;
+                // C.f. instantiateSignature
+                var origTypeParameter = getTypeParameterFromMappedType(type);
+                var freshTypeParameter = cloneTypeParameter(origTypeParameter);
+                result.typeParameter = freshTypeParameter;
+                mapper = combineTypeMappers(makeUnaryTypeMapper(origTypeParameter, freshTypeParameter), mapper);
+                freshTypeParameter.mapper = mapper;
+            }
+            result.target = type;
+            result.mapper = mapper;
+            result.aliasSymbol = type.aliasSymbol;
+            result.aliasTypeArguments = instantiateTypes(type.aliasTypeArguments, mapper);
+            return result;
+        }
+        function getConditionalTypeInstantiation(type, mapper) {
+            var root = type.root;
+            if (root.outerTypeParameters) {
+                // We are instantiating a conditional type that has one or more type parameters in scope. Apply the
+                // mapper to the type parameters to produce the effective list of type arguments, and compute the
+                // instantiation cache key from the type IDs of the type arguments.
+                var typeArguments = ts.map(root.outerTypeParameters, mapper);
+                var id = getTypeListId(typeArguments);
+                var result = root.instantiations.get(id);
+                if (!result) {
+                    var newMapper = createTypeMapper(root.outerTypeParameters, typeArguments);
+                    result = instantiateConditionalType(root, newMapper);
+                    root.instantiations.set(id, result);
+                }
+                return result;
+            }
+            return type;
+        }
+        function instantiateConditionalType(root, mapper) {
+            // Check if we have a conditional type where the check type is a naked type parameter. If so,
+            // the conditional type is distributive over union types and when T is instantiated to a union
+            // type A | B, we produce (A extends U ? X : Y) | (B extends U ? X : Y).
+            if (root.isDistributive) {
+                var checkType_1 = root.checkType;
+                var instantiatedType = mapper(checkType_1);
+                if (checkType_1 !== instantiatedType && instantiatedType.flags & (1048576 /* Union */ | 131072 /* Never */)) {
+                    return mapType(instantiatedType, function (t) { return getConditionalType(root, createReplacementMapper(checkType_1, t, mapper)); });
+                }
+            }
+            return getConditionalType(root, mapper);
+        }
+        function instantiateType(type, mapper) {
+            if (!type || !mapper || mapper === identityMapper) {
+                return type;
+            }
+            if (instantiationDepth === 50) {
+                // We have reached 50 recursive type instantiations and there is a very high likelyhood we're dealing
+                // with a combination of infinite generic types that perpetually generate new type identities. We stop
+                // the recursion here by yielding the error type.
+                return errorType;
+            }
+            instantiationDepth++;
+            var result = instantiateTypeWorker(type, mapper);
+            instantiationDepth--;
+            return result;
+        }
+        function instantiateTypeWorker(type, mapper) {
+            var flags = type.flags;
+            if (flags & 262144 /* TypeParameter */) {
+                return mapper(type);
+            }
+            if (flags & 524288 /* Object */) {
+                var objectFlags = type.objectFlags;
+                if (objectFlags & 16 /* Anonymous */) {
+                    // If the anonymous type originates in a declaration of a function, method, class, or
+                    // interface, in an object type literal, or in an object literal expression, we may need
+                    // to instantiate the type because it might reference a type parameter.
+                    return type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations ?
+                        getAnonymousTypeInstantiation(type, mapper) : type;
+                }
+                if (objectFlags & 32 /* Mapped */) {
+                    return getAnonymousTypeInstantiation(type, mapper);
+                }
+                if (objectFlags & 4 /* Reference */) {
+                    var typeArguments = type.typeArguments;
+                    var newTypeArguments = instantiateTypes(typeArguments, mapper);
+                    return newTypeArguments !== typeArguments ? createTypeReference(type.target, newTypeArguments) : type;
+                }
+                return type;
+            }
+            if (flags & 1048576 /* Union */ && !(flags & 131068 /* Primitive */)) {
+                var types = type.types;
+                var newTypes = instantiateTypes(types, mapper);
+                return newTypes !== types ? getUnionType(newTypes, 1 /* Literal */, type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper)) : type;
+            }
+            if (flags & 2097152 /* Intersection */) {
+                var types = type.types;
+                var newTypes = instantiateTypes(types, mapper);
+                return newTypes !== types ? getIntersectionType(newTypes, type.aliasSymbol, instantiateTypes(type.aliasTypeArguments, mapper)) : type;
+            }
+            if (flags & 4194304 /* Index */) {
+                return getIndexType(instantiateType(type.type, mapper));
+            }
+            if (flags & 8388608 /* IndexedAccess */) {
+                return getIndexedAccessType(instantiateType(type.objectType, mapper), instantiateType(type.indexType, mapper));
+            }
+            if (flags & 16777216 /* Conditional */) {
+                return getConditionalTypeInstantiation(type, combineTypeMappers(type.mapper, mapper));
+            }
+            if (flags & 33554432 /* Substitution */) {
+                return instantiateType(type.typeVariable, mapper);
+            }
+            return type;
+        }
+        function getPermissiveInstantiation(type) {
+            return type.flags & (131068 /* Primitive */ | 3 /* AnyOrUnknown */ | 131072 /* Never */) ? type :
+                type.permissiveInstantiation || (type.permissiveInstantiation = instantiateType(type, permissiveMapper));
+        }
+        function getRestrictiveInstantiation(type) {
+            return type.flags & (131068 /* Primitive */ | 3 /* AnyOrUnknown */ | 131072 /* Never */) ? type :
+                type.restrictiveInstantiation || (type.restrictiveInstantiation = instantiateType(type, restrictiveMapper));
+        }
+        function instantiateIndexInfo(info, mapper) {
+            return info && createIndexInfo(instantiateType(info.type, mapper), info.isReadonly, info.declaration);
+        }
+        // Returns true if the given expression contains (at any level of nesting) a function or arrow expression
+        // that is subject to contextual typing.
+        function isContextSensitive(node) {
+            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            switch (node.kind) {
+                case 196 /* FunctionExpression */:
+                case 197 /* ArrowFunction */:
+                case 156 /* MethodDeclaration */:
+                    return isContextSensitiveFunctionLikeDeclaration(node);
+                case 188 /* ObjectLiteralExpression */:
+                    return ts.some(node.properties, isContextSensitive);
+                case 187 /* ArrayLiteralExpression */:
+                    return ts.some(node.elements, isContextSensitive);
+                case 205 /* ConditionalExpression */:
+                    return isContextSensitive(node.whenTrue) ||
+                        isContextSensitive(node.whenFalse);
+                case 204 /* BinaryExpression */:
+                    return node.operatorToken.kind === 55 /* BarBarToken */ &&
+                        (isContextSensitive(node.left) || isContextSensitive(node.right));
+                case 275 /* PropertyAssignment */:
+                    return isContextSensitive(node.initializer);
+                case 195 /* ParenthesizedExpression */:
+                    return isContextSensitive(node.expression);
+                case 268 /* JsxAttributes */:
+                    return ts.some(node.properties, isContextSensitive) || ts.isJsxOpeningElement(node.parent) && ts.some(node.parent.parent.children, isContextSensitive);
+                case 267 /* JsxAttribute */: {
+                    // If there is no initializer, JSX attribute has a boolean value of true which is not context sensitive.
+                    var initializer = node.initializer;
+                    return !!initializer && isContextSensitive(initializer);
+                }
+                case 270 /* JsxExpression */: {
+                    // It is possible to that node.expression is undefined (e.g <div x={} />)
+                    var expression = node.expression;
+                    return !!expression && isContextSensitive(expression);
+                }
+            }
+            return false;
+        }
+        function isContextSensitiveFunctionLikeDeclaration(node) {
+            // Functions with type parameters are not context sensitive.
+            if (node.typeParameters) {
+                return false;
+            }
+            // Functions with any parameters that lack type annotations are context sensitive.
+            if (ts.some(node.parameters, function (p) { return !ts.getEffectiveTypeAnnotationNode(p); })) {
+                return true;
+            }
+            if (node.kind !== 197 /* ArrowFunction */) {
+                // If the first parameter is not an explicit 'this' parameter, then the function has
+                // an implicit 'this' parameter which is subject to contextual typing.
+                var parameter = ts.firstOrUndefined(node.parameters);
+                if (!(parameter && ts.parameterIsThisKeyword(parameter))) {
+                    return true;
+                }
+            }
+            return hasContextSensitiveReturnExpression(node);
+        }
+        function hasContextSensitiveReturnExpression(node) {
+            // TODO(anhans): A block should be context-sensitive if it has a context-sensitive return value.
+            return !!node.body && node.body.kind !== 218 /* Block */ && isContextSensitive(node.body);
+        }
+        function isContextSensitiveFunctionOrObjectLiteralMethod(func) {
+            return (ts.isInJSFile(func) && ts.isFunctionDeclaration(func) || isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) &&
+                isContextSensitiveFunctionLikeDeclaration(func);
+        }
+        function getTypeWithoutSignatures(type) {
+            if (type.flags & 524288 /* Object */) {
+                var resolved = resolveStructuredTypeMembers(type);
+                if (resolved.constructSignatures.length || resolved.callSignatures.length) {
+                    var result = createObjectType(16 /* Anonymous */, type.symbol);
+                    result.members = resolved.members;
+                    result.properties = resolved.properties;
+                    result.callSignatures = ts.emptyArray;
+                    result.constructSignatures = ts.emptyArray;
+                    return result;
+                }
+            }
+            else if (type.flags & 2097152 /* Intersection */) {
+                return getIntersectionType(ts.map(type.types, getTypeWithoutSignatures));
+            }
+            return type;
+        }
+        // TYPE CHECKING
+        function isTypeIdenticalTo(source, target) {
+            return isTypeRelatedTo(source, target, identityRelation);
+        }
+        function compareTypesIdentical(source, target) {
+            return isTypeRelatedTo(source, target, identityRelation) ? -1 /* True */ : 0 /* False */;
+        }
+        function compareTypesAssignable(source, target) {
+            return isTypeRelatedTo(source, target, assignableRelation) ? -1 /* True */ : 0 /* False */;
+        }
+        function compareTypesSubtypeOf(source, target) {
+            return isTypeRelatedTo(source, target, subtypeRelation) ? -1 /* True */ : 0 /* False */;
+        }
+        function isTypeSubtypeOf(source, target) {
+            return isTypeRelatedTo(source, target, subtypeRelation);
+        }
+        function isTypeAssignableTo(source, target) {
+            return isTypeRelatedTo(source, target, assignableRelation);
+        }
+        // An object type S is considered to be derived from an object type T if
+        // S is a union type and every constituent of S is derived from T,
+        // T is a union type and S is derived from at least one constituent of T, or
+        // S is a type variable with a base constraint that is derived from T,
+        // T is one of the global types Object and Function and S is a subtype of T, or
+        // T occurs directly or indirectly in an 'extends' clause of S.
+        // Note that this check ignores type parameters and only considers the
+        // inheritance hierarchy.
+        function isTypeDerivedFrom(source, target) {
+            return source.flags & 1048576 /* Union */ ? ts.every(source.types, function (t) { return isTypeDerivedFrom(t, target); }) :
+                target.flags & 1048576 /* Union */ ? ts.some(target.types, function (t) { return isTypeDerivedFrom(source, t); }) :
+                    source.flags & 58982400 /* InstantiableNonPrimitive */ ? isTypeDerivedFrom(getBaseConstraintOfType(source) || emptyObjectType, target) :
+                        target === globalObjectType ? !!(source.flags & (524288 /* Object */ | 67108864 /* NonPrimitive */)) :
+                            target === globalFunctionType ? !!(source.flags & 524288 /* Object */) && isFunctionObjectType(source) :
+                                hasBaseType(source, getTargetType(target));
+        }
+        /**
+         * This is *not* a bi-directional relationship.
+         * If one needs to check both directions for comparability, use a second call to this function or 'checkTypeComparableTo'.
+         *
+         * A type S is comparable to a type T if some (but not necessarily all) of the possible values of S are also possible values of T.
+         * It is used to check following cases:
+         *   - the types of the left and right sides of equality/inequality operators (`===`, `!==`, `==`, `!=`).
+         *   - the types of `case` clause expressions and their respective `switch` expressions.
+         *   - the type of an expression in a type assertion with the type being asserted.
+         */
+        function isTypeComparableTo(source, target) {
+            return isTypeRelatedTo(source, target, comparableRelation);
+        }
+        function areTypesComparable(type1, type2) {
+            return isTypeComparableTo(type1, type2) || isTypeComparableTo(type2, type1);
+        }
+        function checkTypeAssignableTo(source, target, errorNode, headMessage, containingMessageChain, errorOutputObject) {
+            return checkTypeRelatedTo(source, target, assignableRelation, errorNode, headMessage, containingMessageChain, errorOutputObject);
+        }
+        /**
+         * Like `checkTypeAssignableTo`, but if it would issue an error, instead performs structural comparisons of the types using the given expression node to
+         * attempt to issue more specific errors on, for example, specific object literal properties or tuple members.
+         */
+        function checkTypeAssignableToAndOptionallyElaborate(source, target, errorNode, expr, headMessage, containingMessageChain) {
+            return checkTypeRelatedToAndOptionallyElaborate(source, target, assignableRelation, errorNode, expr, headMessage, containingMessageChain);
+        }
+        function checkTypeRelatedToAndOptionallyElaborate(source, target, relation, errorNode, expr, headMessage, containingMessageChain) {
+            if (isTypeRelatedTo(source, target, relation))
+                return true;
+            if (!errorNode || !elaborateError(expr, source, target, relation, headMessage)) {
+                return checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain);
+            }
+            return false;
+        }
+        function isOrHasGenericConditional(type) {
+            return !!(type.flags & 16777216 /* Conditional */ || (type.flags & 2097152 /* Intersection */ && ts.some(type.types, isOrHasGenericConditional)));
+        }
+        function elaborateError(node, source, target, relation, headMessage) {
+            if (!node || isOrHasGenericConditional(target))
+                return false;
+            if (!checkTypeRelatedTo(source, target, relation, /*errorNode*/ undefined) && elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage)) {
+                return true;
+            }
+            switch (node.kind) {
+                case 270 /* JsxExpression */:
+                case 195 /* ParenthesizedExpression */:
+                    return elaborateError(node.expression, source, target, relation, headMessage);
+                case 204 /* BinaryExpression */:
+                    switch (node.operatorToken.kind) {
+                        case 59 /* EqualsToken */:
+                        case 27 /* CommaToken */:
+                            return elaborateError(node.right, source, target, relation, headMessage);
+                    }
+                    break;
+                case 188 /* ObjectLiteralExpression */:
+                    return elaborateObjectLiteral(node, source, target, relation);
+                case 187 /* ArrayLiteralExpression */:
+                    return elaborateArrayLiteral(node, source, target, relation);
+                case 268 /* JsxAttributes */:
+                    return elaborateJsxComponents(node, source, target, relation);
+                case 197 /* ArrowFunction */:
+                    return elaborateArrowFunction(node, source, target, relation);
+            }
+            return false;
+        }
+        function elaborateDidYouMeanToCallOrConstruct(node, source, target, relation, headMessage) {
+            var callSignatures = getSignaturesOfType(source, 0 /* Call */);
+            var constructSignatures = getSignaturesOfType(source, 1 /* Construct */);
+            for (var _i = 0, _a = [constructSignatures, callSignatures]; _i < _a.length; _i++) {
+                var signatures = _a[_i];
+                if (ts.some(signatures, function (s) {
+                    var returnType = getReturnTypeOfSignature(s);
+                    return !(returnType.flags & (1 /* Any */ | 131072 /* Never */)) && checkTypeRelatedTo(returnType, target, relation, /*errorNode*/ undefined);
+                })) {
+                    var resultObj = {};
+                    checkTypeAssignableTo(source, target, node, headMessage, /*containingChain*/ undefined, resultObj);
+                    var diagnostic = resultObj.error;
+                    addRelatedInfo(diagnostic, ts.createDiagnosticForNode(node, signatures === constructSignatures ? ts.Diagnostics.Did_you_mean_to_use_new_with_this_expression : ts.Diagnostics.Did_you_mean_to_call_this_expression));
+                    return true;
+                }
+            }
+            return false;
+        }
+        function elaborateArrowFunction(node, source, target, relation) {
+            // Don't elaborate blocks
+            if (ts.isBlock(node.body)) {
+                return false;
+            }
+            // Or functions with annotated parameter types
+            if (ts.some(node.parameters, ts.hasType)) {
+                return false;
+            }
+            var sourceSig = getSingleCallSignature(source);
+            if (!sourceSig) {
+                return false;
+            }
+            var targetSignatures = getSignaturesOfType(target, 0 /* Call */);
+            if (!ts.length(targetSignatures)) {
+                return false;
+            }
+            var returnExpression = node.body;
+            var sourceReturn = getReturnTypeOfSignature(sourceSig);
+            var targetReturn = getUnionType(ts.map(targetSignatures, getReturnTypeOfSignature));
+            if (!checkTypeRelatedTo(sourceReturn, targetReturn, relation, /*errorNode*/ undefined)) {
+                var elaborated = returnExpression && elaborateError(returnExpression, sourceReturn, targetReturn, relation, /*headMessage*/ undefined);
+                if (elaborated) {
+                    return elaborated;
+                }
+                var resultObj = {};
+                checkTypeRelatedTo(sourceReturn, targetReturn, relation, returnExpression, /*message*/ undefined, /*chain*/ undefined, resultObj);
+                if (resultObj.error) {
+                    if (target.symbol && ts.length(target.symbol.declarations)) {
+                        addRelatedInfo(resultObj.error, ts.createDiagnosticForNode(target.symbol.declarations[0], ts.Diagnostics.The_expected_type_comes_from_the_return_type_of_this_signature));
+                    }
+                    return true;
+                }
+            }
+            return false;
+        }
+        /**
+         * For every element returned from the iterator, checks that element to issue an error on a property of that element's type
+         * If that element would issue an error, we first attempt to dive into that element's inner expression and issue a more specific error by recuring into `elaborateError`
+         * Otherwise, we issue an error on _every_ element which fail the assignability check
+         */
+        function elaborateElementwise(iterator, source, target, relation) {
+            // Assignability failure - check each prop individually, and if that fails, fall back on the bad error span
+            var reportedError = false;
+            for (var status = iterator.next(); !status.done; status = iterator.next()) {
+                var _a = status.value, prop = _a.errorNode, next = _a.innerExpression, nameType = _a.nameType, errorMessage = _a.errorMessage;
+                var targetPropType = getIndexedAccessType(target, nameType, /*accessNode*/ undefined, errorType);
+                if (targetPropType === errorType || targetPropType.flags & 8388608 /* IndexedAccess */)
+                    continue; // Don't elaborate on indexes on generic variables
+                var sourcePropType = getIndexedAccessType(source, nameType, /*accessNode*/ undefined, errorType);
+                if (sourcePropType !== errorType && targetPropType !== errorType && !checkTypeRelatedTo(sourcePropType, targetPropType, relation, /*errorNode*/ undefined)) {
+                    var elaborated = next && elaborateError(next, sourcePropType, targetPropType, relation, /*headMessage*/ undefined);
+                    if (elaborated) {
+                        reportedError = true;
+                    }
+                    else {
+                        // Issue error on the prop itself, since the prop couldn't elaborate the error
+                        var resultObj = {};
+                        // Use the expression type, if available
+                        var specificSource = next ? checkExpressionForMutableLocation(next, 0 /* Normal */, sourcePropType) : sourcePropType;
+                        var result = checkTypeRelatedTo(specificSource, targetPropType, relation, prop, errorMessage, /*containingChain*/ undefined, resultObj);
+                        if (result && specificSource !== sourcePropType) {
+                            // If for whatever reason the expression type doesn't yield an error, make sure we still issue an error on the sourcePropType
+                            checkTypeRelatedTo(sourcePropType, targetPropType, relation, prop, errorMessage, /*containingChain*/ undefined, resultObj);
+                        }
+                        if (resultObj.error) {
+                            var reportedDiag = resultObj.error;
+                            var propertyName = isTypeUsableAsPropertyName(nameType) ? getPropertyNameFromType(nameType) : undefined;
+                            var targetProp = propertyName !== undefined ? getPropertyOfType(target, propertyName) : undefined;
+                            var issuedElaboration = false;
+                            if (!targetProp) {
+                                var indexInfo = isTypeAssignableToKind(nameType, 296 /* NumberLike */) && getIndexInfoOfType(target, 1 /* Number */) ||
+                                    getIndexInfoOfType(target, 0 /* String */) ||
+                                    undefined;
+                                if (indexInfo && indexInfo.declaration && !ts.getSourceFileOfNode(indexInfo.declaration).hasNoDefaultLib) {
+                                    issuedElaboration = true;
+                                    addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(indexInfo.declaration, ts.Diagnostics.The_expected_type_comes_from_this_index_signature));
+                                }
+                            }
+                            if (!issuedElaboration && (targetProp && ts.length(targetProp.declarations) || target.symbol && ts.length(target.symbol.declarations))) {
+                                var targetNode = targetProp && ts.length(targetProp.declarations) ? targetProp.declarations[0] : target.symbol.declarations[0];
+                                if (!ts.getSourceFileOfNode(targetNode).hasNoDefaultLib) {
+                                    addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(targetNode, ts.Diagnostics.The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1, propertyName && !(nameType.flags & 8192 /* UniqueESSymbol */) ? ts.unescapeLeadingUnderscores(propertyName) : typeToString(nameType), typeToString(target)));
+                                }
+                            }
+                        }
+                        reportedError = true;
+                    }
+                }
+            }
+            return reportedError;
+        }
+        function generateJsxAttributes(node) {
+            var _i, _a, prop;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (!ts.length(node.properties))
+                            return [2 /*return*/];
+                        _i = 0, _a = node.properties;
+                        _b.label = 1;
+                    case 1:
+                        if (!(_i < _a.length)) return [3 /*break*/, 4];
+                        prop = _a[_i];
+                        if (ts.isJsxSpreadAttribute(prop))
+                            return [3 /*break*/, 3];
+                        return [4 /*yield*/, { errorNode: prop.name, innerExpression: prop.initializer, nameType: getLiteralType(ts.idText(prop.name)) }];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3:
+                        _i++;
+                        return [3 /*break*/, 1];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        }
+        function generateJsxChildren(node, getInvalidTextDiagnostic) {
+            var memberOffset, i, child, nameType, elem;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!ts.length(node.children))
+                            return [2 /*return*/];
+                        memberOffset = 0;
+                        i = 0;
+                        _a.label = 1;
+                    case 1:
+                        if (!(i < node.children.length)) return [3 /*break*/, 5];
+                        child = node.children[i];
+                        nameType = getLiteralType(i - memberOffset);
+                        elem = getElaborationElementForJsxChild(child, nameType, getInvalidTextDiagnostic);
+                        if (!elem) return [3 /*break*/, 3];
+                        return [4 /*yield*/, elem];
+                    case 2:
+                        _a.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        memberOffset++;
+                        _a.label = 4;
+                    case 4:
+                        i++;
+                        return [3 /*break*/, 1];
+                    case 5: return [2 /*return*/];
+                }
+            });
+        }
+        function getElaborationElementForJsxChild(child, nameType, getInvalidTextDiagnostic) {
+            switch (child.kind) {
+                case 270 /* JsxExpression */:
+                    // child is of the type of the expression
+                    return { errorNode: child, innerExpression: child.expression, nameType: nameType };
+                case 11 /* JsxText */:
+                    if (child.containsOnlyWhiteSpaces) {
+                        break; // Whitespace only jsx text isn't real jsx text
+                    }
+                    // child is a string
+                    return { errorNode: child, innerExpression: undefined, nameType: nameType, errorMessage: getInvalidTextDiagnostic() };
+                case 260 /* JsxElement */:
+                case 261 /* JsxSelfClosingElement */:
+                case 264 /* JsxFragment */:
+                    // child is of type JSX.Element
+                    return { errorNode: child, innerExpression: child, nameType: nameType };
+                default:
+                    return ts.Debug.assertNever(child, "Found invalid jsx child");
+            }
+        }
+        function elaborateJsxComponents(node, source, target, relation) {
+            var result = elaborateElementwise(generateJsxAttributes(node), source, target, relation);
+            var invalidTextDiagnostic;
+            if (ts.isJsxOpeningElement(node.parent) && ts.isJsxElement(node.parent.parent)) {
+                var containingElement = node.parent.parent;
+                var childPropName = getJsxElementChildrenPropertyName(getJsxNamespaceAt(node));
+                var childrenPropName = childPropName === undefined ? "children" : ts.unescapeLeadingUnderscores(childPropName);
+                var childrenNameType = getLiteralType(childrenPropName);
+                var childrenTargetType = getIndexedAccessType(target, childrenNameType);
+                var validChildren = ts.filter(containingElement.children, function (i) { return !ts.isJsxText(i) || !i.containsOnlyWhiteSpaces; });
+                if (!ts.length(validChildren)) {
+                    return result;
+                }
+                var moreThanOneRealChildren = ts.length(validChildren) > 1;
+                var arrayLikeTargetParts = filterType(childrenTargetType, isArrayOrTupleLikeType);
+                var nonArrayLikeTargetParts = filterType(childrenTargetType, function (t) { return !isArrayOrTupleLikeType(t); });
+                if (moreThanOneRealChildren) {
+                    if (arrayLikeTargetParts !== neverType) {
+                        var realSource = createTupleType(checkJsxChildren(containingElement, 0 /* Normal */));
+                        result = elaborateElementwise(generateJsxChildren(containingElement, getInvalidTextualChildDiagnostic), realSource, arrayLikeTargetParts, relation) || result;
+                    }
+                    else if (!isTypeRelatedTo(getIndexedAccessType(source, childrenNameType), childrenTargetType, relation)) {
+                        // arity mismatch
+                        result = true;
+                        error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_a_single_child_of_type_1_but_multiple_children_were_provided, childrenPropName, typeToString(childrenTargetType));
+                    }
+                }
+                else {
+                    if (nonArrayLikeTargetParts !== neverType) {
+                        var child = validChildren[0];
+                        var elem_1 = getElaborationElementForJsxChild(child, childrenNameType, getInvalidTextualChildDiagnostic);
+                        if (elem_1) {
+                            result = elaborateElementwise((function () { return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, elem_1];
+                                    case 1:
+                                        _a.sent();
+                                        return [2 /*return*/];
+                                }
+                            }); })(), source, target, relation) || result;
+                        }
+                    }
+                    else if (!isTypeRelatedTo(getIndexedAccessType(source, childrenNameType), childrenTargetType, relation)) {
+                        // arity mismatch
+                        result = true;
+                        error(containingElement.openingElement.tagName, ts.Diagnostics.This_JSX_tag_s_0_prop_expects_type_1_which_requires_multiple_children_but_only_a_single_child_was_provided, childrenPropName, typeToString(childrenTargetType));
+                    }
+                }
+            }
+            return result;
+            function getInvalidTextualChildDiagnostic() {
+                if (!invalidTextDiagnostic) {
+                    var tagNameText = ts.getTextOfNode(node.parent.tagName);
+                    var childPropName = getJsxElementChildrenPropertyName(getJsxNamespaceAt(node));
+                    var childrenPropName = childPropName === undefined ? "children" : ts.unescapeLeadingUnderscores(childPropName);
+                    var childrenTargetType = getIndexedAccessType(target, getLiteralType(childrenPropName));
+                    var diagnostic = ts.Diagnostics._0_components_don_t_accept_text_as_child_elements_Text_in_JSX_has_the_type_string_but_the_expected_type_of_1_is_2;
+                    invalidTextDiagnostic = __assign({}, diagnostic, { key: "!!ALREADY FORMATTED!!", message: ts.formatMessage(/*_dummy*/ undefined, diagnostic, tagNameText, childrenPropName, typeToString(childrenTargetType)) });
+                }
+                return invalidTextDiagnostic;
+            }
+        }
+        function generateLimitedTupleElements(node, target) {
+            var len, i, elem, nameType;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        len = ts.length(node.elements);
+                        if (!len)
+                            return [2 /*return*/];
+                        i = 0;
+                        _a.label = 1;
+                    case 1:
+                        if (!(i < len)) return [3 /*break*/, 4];
+                        // Skip elements which do not exist in the target - a length error on the tuple overall is likely better than an error on a mismatched index signature
+                        if (isTupleLikeType(target) && !getPropertyOfType(target, ("" + i)))
+                            return [3 /*break*/, 3];
+                        elem = node.elements[i];
+                        if (ts.isOmittedExpression(elem))
+                            return [3 /*break*/, 3];
+                        nameType = getLiteralType(i);
+                        return [4 /*yield*/, { errorNode: elem, innerExpression: elem, nameType: nameType }];
+                    case 2:
+                        _a.sent();
+                        _a.label = 3;
+                    case 3:
+                        i++;
+                        return [3 /*break*/, 1];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        }
+        function elaborateArrayLiteral(node, source, target, relation) {
+            if (isTupleLikeType(source)) {
+                return elaborateElementwise(generateLimitedTupleElements(node, target), source, target, relation);
+            }
+            // recreate a tuple from the elements, if possible
+            var tupleizedType = checkArrayLiteral(node, 3 /* Contextual */, /*forceTuple*/ true);
+            if (isTupleLikeType(tupleizedType)) {
+                return elaborateElementwise(generateLimitedTupleElements(node, target), tupleizedType, target, relation);
+            }
+            return false;
+        }
+        function generateObjectLiteralElements(node) {
+            var _i, _a, prop, type, _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        if (!ts.length(node.properties))
+                            return [2 /*return*/];
+                        _i = 0, _a = node.properties;
+                        _c.label = 1;
+                    case 1:
+                        if (!(_i < _a.length)) return [3 /*break*/, 8];
+                        prop = _a[_i];
+                        if (ts.isSpreadAssignment(prop))
+                            return [3 /*break*/, 7];
+                        type = getLiteralTypeFromProperty(getSymbolOfNode(prop), 8576 /* StringOrNumberLiteralOrUnique */);
+                        if (!type || (type.flags & 131072 /* Never */)) {
+                            return [3 /*break*/, 7];
+                        }
+                        _b = prop.kind;
+                        switch (_b) {
+                            case 159 /* SetAccessor */: return [3 /*break*/, 2];
+                            case 158 /* GetAccessor */: return [3 /*break*/, 2];
+                            case 156 /* MethodDeclaration */: return [3 /*break*/, 2];
+                            case 276 /* ShorthandPropertyAssignment */: return [3 /*break*/, 2];
+                            case 275 /* PropertyAssignment */: return [3 /*break*/, 4];
+                        }
+                        return [3 /*break*/, 6];
+                    case 2: return [4 /*yield*/, { errorNode: prop.name, innerExpression: undefined, nameType: type }];
+                    case 3:
+                        _c.sent();
+                        return [3 /*break*/, 7];
+                    case 4: return [4 /*yield*/, { errorNode: prop.name, innerExpression: prop.initializer, nameType: type, errorMessage: isComputedNonLiteralName(prop.name) ? ts.Diagnostics.Type_of_computed_property_s_value_is_0_which_is_not_assignable_to_type_1 : undefined }];
+                    case 5:
+                        _c.sent();
+                        return [3 /*break*/, 7];
+                    case 6:
+                        ts.Debug.assertNever(prop);
+                        _c.label = 7;
+                    case 7:
+                        _i++;
+                        return [3 /*break*/, 1];
+                    case 8: return [2 /*return*/];
+                }
+            });
+        }
+        function elaborateObjectLiteral(node, source, target, relation) {
+            return elaborateElementwise(generateObjectLiteralElements(node), source, target, relation);
+        }
+        /**
+         * This is *not* a bi-directional relationship.
+         * If one needs to check both directions for comparability, use a second call to this function or 'isTypeComparableTo'.
+         */
+        function checkTypeComparableTo(source, target, errorNode, headMessage, containingMessageChain) {
+            return checkTypeRelatedTo(source, target, comparableRelation, errorNode, headMessage, containingMessageChain);
+        }
+        function isSignatureAssignableTo(source, target, ignoreReturnTypes) {
+            return compareSignaturesRelated(source, target, 0 /* None */, ignoreReturnTypes, /*reportErrors*/ false, 
+            /*errorReporter*/ undefined, compareTypesAssignable) !== 0 /* False */;
+        }
+        /**
+         * See signatureRelatedTo, compareSignaturesIdentical
+         */
+        function compareSignaturesRelated(source, target, callbackCheck, ignoreReturnTypes, reportErrors, errorReporter, compareTypes) {
+            // TODO (drosen): De-duplicate code between related functions.
+            if (source === target) {
+                return -1 /* True */;
+            }
+            var targetCount = getParameterCount(target);
+            if (!hasEffectiveRestParameter(target) && getMinArgumentCount(source) > targetCount) {
+                return 0 /* False */;
+            }
+            if (source.typeParameters && source.typeParameters !== target.typeParameters) {
+                target = getCanonicalSignature(target);
+                source = instantiateSignatureInContextOf(source, target, /*contextualMapper*/ undefined, compareTypes);
+            }
+            var sourceCount = getParameterCount(source);
+            var sourceRestType = getNonArrayRestType(source);
+            var targetRestType = getNonArrayRestType(target);
+            if (sourceRestType && targetRestType && sourceCount !== targetCount) {
+                // We're not able to relate misaligned complex rest parameters
+                return 0 /* False */;
+            }
+            var kind = target.declaration ? target.declaration.kind : 0 /* Unknown */;
+            var strictVariance = !callbackCheck && strictFunctionTypes && kind !== 156 /* MethodDeclaration */ &&
+                kind !== 155 /* MethodSignature */ && kind !== 157 /* Constructor */;
+            var result = -1 /* True */;
+            var sourceThisType = getThisTypeOfSignature(source);
+            if (sourceThisType && sourceThisType !== voidType) {
+                var targetThisType = getThisTypeOfSignature(target);
+                if (targetThisType) {
+                    // void sources are assignable to anything.
+                    var related = !strictVariance && compareTypes(sourceThisType, targetThisType, /*reportErrors*/ false)
+                        || compareTypes(targetThisType, sourceThisType, reportErrors);
+                    if (!related) {
+                        if (reportErrors) {
+                            errorReporter(ts.Diagnostics.The_this_types_of_each_signature_are_incompatible);
+                        }
+                        return 0 /* False */;
+                    }
+                    result &= related;
+                }
+            }
+            var paramCount = sourceRestType || targetRestType ? Math.min(sourceCount, targetCount) : Math.max(sourceCount, targetCount);
+            var restIndex = sourceRestType || targetRestType ? paramCount - 1 : -1;
+            for (var i = 0; i < paramCount; i++) {
+                var sourceType = i === restIndex ? getRestTypeAtPosition(source, i) : getTypeAtPosition(source, i);
+                var targetType = i === restIndex ? getRestTypeAtPosition(target, i) : getTypeAtPosition(target, i);
+                // In order to ensure that any generic type Foo<T> is at least co-variant with respect to T no matter
+                // how Foo uses T, we need to relate parameters bi-variantly (given that parameters are input positions,
+                // they naturally relate only contra-variantly). However, if the source and target parameters both have
+                // function types with a single call signature, we know we are relating two callback parameters. In
+                // that case it is sufficient to only relate the parameters of the signatures co-variantly because,
+                // similar to return values, callback parameters are output positions. This means that a Promise<T>,
+                // where T is used only in callback parameter positions, will be co-variant (as opposed to bi-variant)
+                // with respect to T.
+                var sourceSig = callbackCheck ? undefined : getSingleCallSignature(getNonNullableType(sourceType));
+                var targetSig = callbackCheck ? undefined : getSingleCallSignature(getNonNullableType(targetType));
+                var callbacks = sourceSig && targetSig && !signatureHasTypePredicate(sourceSig) && !signatureHasTypePredicate(targetSig) &&
+                    (getFalsyFlags(sourceType) & 98304 /* Nullable */) === (getFalsyFlags(targetType) & 98304 /* Nullable */);
+                var related = callbacks ?
+                    // TODO: GH#18217 It will work if they're both `undefined`, but not if only one is
+                    compareSignaturesRelated(targetSig, sourceSig, strictVariance ? 2 /* Strict */ : 1 /* Bivariant */, /*ignoreReturnTypes*/ false, reportErrors, errorReporter, compareTypes) :
+                    !callbackCheck && !strictVariance && compareTypes(sourceType, targetType, /*reportErrors*/ false) || compareTypes(targetType, sourceType, reportErrors);
+                if (!related) {
+                    if (reportErrors) {
+                        errorReporter(ts.Diagnostics.Types_of_parameters_0_and_1_are_incompatible, ts.unescapeLeadingUnderscores(getParameterNameAtPosition(source, i)), ts.unescapeLeadingUnderscores(getParameterNameAtPosition(target, i)));
+                    }
+                    return 0 /* False */;
+                }
+                result &= related;
+            }
+            if (!ignoreReturnTypes) {
+                var targetReturnType = (target.declaration && isJSConstructor(target.declaration)) ?
+                    getJSClassType(target.declaration.symbol) : getReturnTypeOfSignature(target);
+                if (targetReturnType === voidType) {
+                    return result;
+                }
+                var sourceReturnType = (source.declaration && isJSConstructor(source.declaration)) ?
+                    getJSClassType(source.declaration.symbol) : getReturnTypeOfSignature(source);
+                // The following block preserves behavior forbidding boolean returning functions from being assignable to type guard returning functions
+                var targetTypePredicate = getTypePredicateOfSignature(target);
+                if (targetTypePredicate) {
+                    var sourceTypePredicate = getTypePredicateOfSignature(source);
+                    if (sourceTypePredicate) {
+                        result &= compareTypePredicateRelatedTo(sourceTypePredicate, targetTypePredicate, source.declaration, target.declaration, reportErrors, errorReporter, compareTypes); // TODO: GH#18217
+                    }
+                    else if (ts.isIdentifierTypePredicate(targetTypePredicate)) {
+                        if (reportErrors) {
+                            errorReporter(ts.Diagnostics.Signature_0_must_be_a_type_predicate, signatureToString(source));
+                        }
+                        return 0 /* False */;
+                    }
+                }
+                else {
+                    // When relating callback signatures, we still need to relate return types bi-variantly as otherwise
+                    // the containing type wouldn't be co-variant. For example, interface Foo<T> { add(cb: () => T): void }
+                    // wouldn't be co-variant for T without this rule.
+                    result &= callbackCheck === 1 /* Bivariant */ && compareTypes(targetReturnType, sourceReturnType, /*reportErrors*/ false) ||
+                        compareTypes(sourceReturnType, targetReturnType, reportErrors);
+                }
+            }
+            return result;
+        }
+        function compareTypePredicateRelatedTo(source, target, sourceDeclaration, targetDeclaration, reportErrors, errorReporter, compareTypes) {
+            if (source.kind !== target.kind) {
+                if (reportErrors) {
+                    errorReporter(ts.Diagnostics.A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard);
+                    errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
+                }
+                return 0 /* False */;
+            }
+            if (source.kind === 1 /* Identifier */) {
+                var targetPredicate = target;
+                var sourceIndex = source.parameterIndex - (ts.getThisParameter(sourceDeclaration) ? 1 : 0);
+                var targetIndex = targetPredicate.parameterIndex - (ts.getThisParameter(targetDeclaration) ? 1 : 0);
+                if (sourceIndex !== targetIndex) {
+                    if (reportErrors) {
+                        errorReporter(ts.Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, source.parameterName, targetPredicate.parameterName);
+                        errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
+                    }
+                    return 0 /* False */;
+                }
+            }
+            var related = compareTypes(source.type, target.type, reportErrors);
+            if (related === 0 /* False */ && reportErrors) {
+                errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
+            }
+            return related;
+        }
+        function isImplementationCompatibleWithOverload(implementation, overload) {
+            var erasedSource = getErasedSignature(implementation);
+            var erasedTarget = getErasedSignature(overload);
+            // First see if the return types are compatible in either direction.
+            var sourceReturnType = getReturnTypeOfSignature(erasedSource);
+            var targetReturnType = getReturnTypeOfSignature(erasedTarget);
+            if (targetReturnType === voidType
+                || isTypeRelatedTo(targetReturnType, sourceReturnType, assignableRelation)
+                || isTypeRelatedTo(sourceReturnType, targetReturnType, assignableRelation)) {
+                return isSignatureAssignableTo(erasedSource, erasedTarget, /*ignoreReturnTypes*/ true);
+            }
+            return false;
+        }
+        function isEmptyResolvedType(t) {
+            return t.properties.length === 0 &&
+                t.callSignatures.length === 0 &&
+                t.constructSignatures.length === 0 &&
+                !t.stringIndexInfo &&
+                !t.numberIndexInfo;
+        }
+        function isEmptyObjectType(type) {
+            return type.flags & 524288 /* Object */ ? !isGenericMappedType(type) && isEmptyResolvedType(resolveStructuredTypeMembers(type)) :
+                type.flags & 67108864 /* NonPrimitive */ ? true :
+                    type.flags & 1048576 /* Union */ ? ts.some(type.types, isEmptyObjectType) :
+                        type.flags & 2097152 /* Intersection */ ? ts.every(type.types, isEmptyObjectType) :
+                            false;
+        }
+        function isEmptyAnonymousObjectType(type) {
+            return !!(ts.getObjectFlags(type) & 16 /* Anonymous */) && isEmptyObjectType(type);
+        }
+        function isEnumTypeRelatedTo(sourceSymbol, targetSymbol, errorReporter) {
+            if (sourceSymbol === targetSymbol) {
+                return true;
+            }
+            var id = getSymbolId(sourceSymbol) + "," + getSymbolId(targetSymbol);
+            var relation = enumRelation.get(id);
+            if (relation !== undefined && !(relation === 2 /* Failed */ && errorReporter)) {
+                return relation === 1 /* Succeeded */;
+            }
+            if (sourceSymbol.escapedName !== targetSymbol.escapedName || !(sourceSymbol.flags & 256 /* RegularEnum */) || !(targetSymbol.flags & 256 /* RegularEnum */)) {
+                enumRelation.set(id, 3 /* FailedAndReported */);
+                return false;
+            }
+            var targetEnumType = getTypeOfSymbol(targetSymbol);
+            for (var _i = 0, _a = getPropertiesOfType(getTypeOfSymbol(sourceSymbol)); _i < _a.length; _i++) {
+                var property = _a[_i];
+                if (property.flags & 8 /* EnumMember */) {
+                    var targetProperty = getPropertyOfType(targetEnumType, property.escapedName);
+                    if (!targetProperty || !(targetProperty.flags & 8 /* EnumMember */)) {
+                        if (errorReporter) {
+                            errorReporter(ts.Diagnostics.Property_0_is_missing_in_type_1, ts.symbolName(property), typeToString(getDeclaredTypeOfSymbol(targetSymbol), /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */));
+                            enumRelation.set(id, 3 /* FailedAndReported */);
+                        }
+                        else {
+                            enumRelation.set(id, 2 /* Failed */);
+                        }
+                        return false;
+                    }
+                }
+            }
+            enumRelation.set(id, 1 /* Succeeded */);
+            return true;
+        }
+        function isSimpleTypeRelatedTo(source, target, relation, errorReporter) {
+            var s = source.flags;
+            var t = target.flags;
+            if (t & 3 /* AnyOrUnknown */ || s & 131072 /* Never */ || source === wildcardType)
+                return true;
+            if (t & 131072 /* Never */)
+                return false;
+            if (s & 132 /* StringLike */ && t & 4 /* String */)
+                return true;
+            if (s & 128 /* StringLiteral */ && s & 1024 /* EnumLiteral */ &&
+                t & 128 /* StringLiteral */ && !(t & 1024 /* EnumLiteral */) &&
+                source.value === target.value)
+                return true;
+            if (s & 296 /* NumberLike */ && t & 8 /* Number */)
+                return true;
+            if (s & 256 /* NumberLiteral */ && s & 1024 /* EnumLiteral */ &&
+                t & 256 /* NumberLiteral */ && !(t & 1024 /* EnumLiteral */) &&
+                source.value === target.value)
+                return true;
+            if (s & 2112 /* BigIntLike */ && t & 64 /* BigInt */)
+                return true;
+            if (s & 528 /* BooleanLike */ && t & 16 /* Boolean */)
+                return true;
+            if (s & 12288 /* ESSymbolLike */ && t & 4096 /* ESSymbol */)
+                return true;
+            if (s & 32 /* Enum */ && t & 32 /* Enum */ && isEnumTypeRelatedTo(source.symbol, target.symbol, errorReporter))
+                return true;
+            if (s & 1024 /* EnumLiteral */ && t & 1024 /* EnumLiteral */) {
+                if (s & 1048576 /* Union */ && t & 1048576 /* Union */ && isEnumTypeRelatedTo(source.symbol, target.symbol, errorReporter))
+                    return true;
+                if (s & 2944 /* Literal */ && t & 2944 /* Literal */ &&
+                    source.value === target.value &&
+                    isEnumTypeRelatedTo(getParentOfSymbol(source.symbol), getParentOfSymbol(target.symbol), errorReporter))
+                    return true;
+            }
+            if (s & 32768 /* Undefined */ && (!strictNullChecks || t & (32768 /* Undefined */ | 16384 /* Void */)))
+                return true;
+            if (s & 65536 /* Null */ && (!strictNullChecks || t & 65536 /* Null */))
+                return true;
+            if (s & 524288 /* Object */ && t & 67108864 /* NonPrimitive */)
+                return true;
+            if (relation === assignableRelation || relation === comparableRelation) {
+                if (s & 1 /* Any */)
+                    return true;
+                // Type number or any numeric literal type is assignable to any numeric enum type or any
+                // numeric enum literal type. This rule exists for backwards compatibility reasons because
+                // bit-flag enum types sometimes look like literal enum types with numeric literal values.
+                if (s & (8 /* Number */ | 256 /* NumberLiteral */) && !(s & 1024 /* EnumLiteral */) && (t & 32 /* Enum */ || t & 256 /* NumberLiteral */ && t & 1024 /* EnumLiteral */))
+                    return true;
+            }
+            return false;
+        }
+        function isTypeRelatedTo(source, target, relation) {
+            if (isFreshLiteralType(source)) {
+                source = source.regularType;
+            }
+            if (isFreshLiteralType(target)) {
+                target = target.regularType;
+            }
+            if (source === target ||
+                relation === comparableRelation && !(target.flags & 131072 /* Never */) && isSimpleTypeRelatedTo(target, source, relation) ||
+                relation !== identityRelation && isSimpleTypeRelatedTo(source, target, relation)) {
+                return true;
+            }
+            if (source.flags & 524288 /* Object */ && target.flags & 524288 /* Object */) {
+                var related = relation.get(getRelationKey(source, target, relation));
+                if (related !== undefined) {
+                    return related === 1 /* Succeeded */;
+                }
+            }
+            if (source.flags & 66846720 /* StructuredOrInstantiable */ || target.flags & 66846720 /* StructuredOrInstantiable */) {
+                return checkTypeRelatedTo(source, target, relation, /*errorNode*/ undefined);
+            }
+            return false;
+        }
+        function isIgnoredJsxProperty(source, sourceProp, targetMemberType) {
+            return ts.getObjectFlags(source) & 4096 /* JsxAttributes */ && !(isUnhyphenatedJsxName(sourceProp.escapedName) || targetMemberType);
+        }
+        /**
+         * Checks if 'source' is related to 'target' (e.g.: is a assignable to).
+         * @param source The left-hand-side of the relation.
+         * @param target The right-hand-side of the relation.
+         * @param relation The relation considered. One of 'identityRelation', 'subtypeRelation', 'assignableRelation', or 'comparableRelation'.
+         * Used as both to determine which checks are performed and as a cache of previously computed results.
+         * @param errorNode The suggested node upon which all errors will be reported, if defined. This may or may not be the actual node used.
+         * @param headMessage If the error chain should be prepended by a head message, then headMessage will be used.
+         * @param containingMessageChain A chain of errors to prepend any new errors found.
+         */
+        function checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain, errorOutputContainer) {
+            var errorInfo;
+            var relatedInfo;
+            var maybeKeys;
+            var sourceStack;
+            var targetStack;
+            var maybeCount = 0;
+            var depth = 0;
+            var expandingFlags = 0 /* None */;
+            var overflow = false;
+            var suppressNextError = false;
+            ts.Debug.assert(relation !== identityRelation || !errorNode, "no error reporting in identity checking");
+            var result = isRelatedTo(source, target, /*reportErrors*/ !!errorNode, headMessage);
+            if (overflow) {
+                error(errorNode, ts.Diagnostics.Excessive_stack_depth_comparing_types_0_and_1, typeToString(source), typeToString(target));
+            }
+            else if (errorInfo) {
+                if (containingMessageChain) {
+                    var chain_1 = containingMessageChain();
+                    if (chain_1) {
+                        errorInfo = ts.concatenateDiagnosticMessageChains(chain_1, errorInfo);
+                    }
+                }
+                var relatedInformation = void 0;
+                // Check if we should issue an extra diagnostic to produce a quickfix for a slightly incorrect import statement
+                if (headMessage && errorNode && !result && source.symbol) {
+                    var links = getSymbolLinks(source.symbol);
+                    if (links.originatingImport && !ts.isImportCall(links.originatingImport)) {
+                        var helpfulRetry = checkTypeRelatedTo(getTypeOfSymbol(links.target), target, relation, /*errorNode*/ undefined);
+                        if (helpfulRetry) {
+                            // Likely an incorrect import. Issue a helpful diagnostic to produce a quickfix to change the import
+                            var diag_1 = ts.createDiagnosticForNode(links.originatingImport, ts.Diagnostics.Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_Consider_using_a_default_import_or_import_require_here_instead);
+                            relatedInformation = ts.append(relatedInformation, diag_1); // Cause the error to appear with the error that triggered it
+                        }
+                    }
+                }
+                var diag = ts.createDiagnosticForNodeFromMessageChain(errorNode, errorInfo, relatedInformation);
+                if (relatedInfo) {
+                    addRelatedInfo.apply(void 0, [diag].concat(relatedInfo));
+                }
+                if (errorOutputContainer) {
+                    errorOutputContainer.error = diag;
+                }
+                diagnostics.add(diag); // TODO: GH#18217
+            }
+            return result !== 0 /* False */;
+            function reportError(message, arg0, arg1, arg2, arg3) {
+                ts.Debug.assert(!!errorNode);
+                errorInfo = ts.chainDiagnosticMessages(errorInfo, message, arg0, arg1, arg2, arg3);
+            }
+            function associateRelatedInfo(info) {
+                ts.Debug.assert(!!errorInfo);
+                if (!relatedInfo) {
+                    relatedInfo = [info];
+                }
+                else {
+                    relatedInfo.push(info);
+                }
+            }
+            function reportRelationError(message, source, target) {
+                var sourceType = typeToString(source);
+                var targetType = typeToString(target);
+                if (sourceType === targetType) {
+                    sourceType = typeToString(source, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
+                    targetType = typeToString(target, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
+                }
+                if (!message) {
+                    if (relation === comparableRelation) {
+                        message = ts.Diagnostics.Type_0_is_not_comparable_to_type_1;
+                    }
+                    else if (sourceType === targetType) {
+                        message = ts.Diagnostics.Type_0_is_not_assignable_to_type_1_Two_different_types_with_this_name_exist_but_they_are_unrelated;
+                    }
+                    else {
+                        message = ts.Diagnostics.Type_0_is_not_assignable_to_type_1;
+                    }
+                }
+                reportError(message, sourceType, targetType);
+            }
+            function tryElaborateErrorsForPrimitivesAndObjects(source, target) {
+                var sourceType = typeToString(source);
+                var targetType = typeToString(target);
+                if ((globalStringType === source && stringType === target) ||
+                    (globalNumberType === source && numberType === target) ||
+                    (globalBooleanType === source && booleanType === target) ||
+                    (getGlobalESSymbolType(/*reportErrors*/ false) === source && esSymbolType === target)) {
+                    reportError(ts.Diagnostics._0_is_a_primitive_but_1_is_a_wrapper_object_Prefer_using_0_when_possible, targetType, sourceType);
+                }
+            }
+            function isUnionOrIntersectionTypeWithoutNullableConstituents(type) {
+                if (!(type.flags & 3145728 /* UnionOrIntersection */)) {
+                    return false;
+                }
+                // at this point we know that this is union or intersection type possibly with nullable constituents.
+                // check if we still will have compound type if we ignore nullable components.
+                var seenNonNullable = false;
+                for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                    var t = _a[_i];
+                    if (t.flags & 98304 /* Nullable */) {
+                        continue;
+                    }
+                    if (seenNonNullable) {
+                        return true;
+                    }
+                    seenNonNullable = true;
+                }
+                return false;
+            }
+            /**
+             * Compare two types and return
+             * * Ternary.True if they are related with no assumptions,
+             * * Ternary.Maybe if they are related with assumptions of other relationships, or
+             * * Ternary.False if they are not related.
+             */
+            function isRelatedTo(source, target, reportErrors, headMessage, isApparentIntersectionConstituent) {
+                if (reportErrors === void 0) { reportErrors = false; }
+                if (isFreshLiteralType(source)) {
+                    source = source.regularType;
+                }
+                if (isFreshLiteralType(target)) {
+                    target = target.regularType;
+                }
+                if (source.flags & 33554432 /* Substitution */) {
+                    source = source.substitute;
+                }
+                if (target.flags & 33554432 /* Substitution */) {
+                    target = target.typeVariable;
+                }
+                if (source.flags & 8388608 /* IndexedAccess */) {
+                    source = getSimplifiedType(source);
+                }
+                if (target.flags & 8388608 /* IndexedAccess */) {
+                    target = getSimplifiedType(target);
+                }
+                // Try to see if we're relating something like `Foo` -> `Bar | null | undefined`.
+                // If so, reporting the `null` and `undefined` in the type is hardly useful.
+                // First, see if we're even relating an object type to a union.
+                // Then see if the target is stripped down to a single non-union type.
+                // Note
+                //  * We actually want to remove null and undefined naively here (rather than using getNonNullableType),
+                //    since we don't want to end up with a worse error like "`Foo` is not assignable to `NonNullable<T>`"
+                //    when dealing with generics.
+                //  * We also don't deal with primitive source types, since we already halt elaboration below.
+                if (target.flags & 1048576 /* Union */ && source.flags & 524288 /* Object */ &&
+                    target.types.length <= 3 && maybeTypeOfKind(target, 98304 /* Nullable */)) {
+                    var nullStrippedTarget = extractTypesOfKind(target, ~98304 /* Nullable */);
+                    if (!(nullStrippedTarget.flags & (1048576 /* Union */ | 131072 /* Never */))) {
+                        target = nullStrippedTarget;
+                    }
+                }
+                // both types are the same - covers 'they are the same primitive type or both are Any' or the same type parameter cases
+                if (source === target)
+                    return -1 /* True */;
+                if (relation === identityRelation) {
+                    return isIdenticalTo(source, target);
+                }
+                if (relation === comparableRelation && !(target.flags & 131072 /* Never */) && isSimpleTypeRelatedTo(target, source, relation) ||
+                    isSimpleTypeRelatedTo(source, target, relation, reportErrors ? reportError : undefined))
+                    return -1 /* True */;
+                var isComparingJsxAttributes = !!(ts.getObjectFlags(source) & 4096 /* JsxAttributes */);
+                if (isObjectLiteralType(source) && ts.getObjectFlags(source) & 32768 /* FreshLiteral */) {
+                    var discriminantType = target.flags & 1048576 /* Union */ ? findMatchingDiscriminantType(source, target) : undefined;
+                    if (hasExcessProperties(source, target, discriminantType, reportErrors)) {
+                        if (reportErrors) {
+                            reportRelationError(headMessage, source, target);
+                        }
+                        return 0 /* False */;
+                    }
+                    // Above we check for excess properties with respect to the entire target type. When union
+                    // and intersection types are further deconstructed on the target side, we don't want to
+                    // make the check again (as it might fail for a partial target type). Therefore we obtain
+                    // the regular source type and proceed with that.
+                    if (isUnionOrIntersectionTypeWithoutNullableConstituents(target) && !discriminantType) {
+                        source = getRegularTypeOfObjectLiteral(source);
+                    }
+                }
+                if (relation !== comparableRelation && !isApparentIntersectionConstituent &&
+                    source.flags & (131068 /* Primitive */ | 524288 /* Object */ | 2097152 /* Intersection */) && source !== globalObjectType &&
+                    target.flags & (524288 /* Object */ | 2097152 /* Intersection */) && isWeakType(target) &&
+                    (getPropertiesOfType(source).length > 0 || typeHasCallOrConstructSignatures(source)) &&
+                    !hasCommonProperties(source, target, isComparingJsxAttributes)) {
+                    if (reportErrors) {
+                        var calls = getSignaturesOfType(source, 0 /* Call */);
+                        var constructs = getSignaturesOfType(source, 1 /* Construct */);
+                        if (calls.length > 0 && isRelatedTo(getReturnTypeOfSignature(calls[0]), target, /*reportErrors*/ false) ||
+                            constructs.length > 0 && isRelatedTo(getReturnTypeOfSignature(constructs[0]), target, /*reportErrors*/ false)) {
+                            reportError(ts.Diagnostics.Value_of_type_0_has_no_properties_in_common_with_type_1_Did_you_mean_to_call_it, typeToString(source), typeToString(target));
+                        }
+                        else {
+                            reportError(ts.Diagnostics.Type_0_has_no_properties_in_common_with_type_1, typeToString(source), typeToString(target));
+                        }
+                    }
+                    return 0 /* False */;
+                }
+                var result = 0 /* False */;
+                var saveErrorInfo = errorInfo;
+                var isIntersectionConstituent = !!isApparentIntersectionConstituent;
+                // Note that these checks are specifically ordered to produce correct results. In particular,
+                // we need to deconstruct unions before intersections (because unions are always at the top),
+                // and we need to handle "each" relations before "some" relations for the same kind of type.
+                if (source.flags & 1048576 /* Union */) {
+                    result = relation === comparableRelation ?
+                        someTypeRelatedToType(source, target, reportErrors && !(source.flags & 131068 /* Primitive */)) :
+                        eachTypeRelatedToType(source, target, reportErrors && !(source.flags & 131068 /* Primitive */));
+                }
+                else {
+                    if (target.flags & 1048576 /* Union */) {
+                        result = typeRelatedToSomeType(source, target, reportErrors && !(source.flags & 131068 /* Primitive */) && !(target.flags & 131068 /* Primitive */));
+                    }
+                    else if (target.flags & 2097152 /* Intersection */) {
+                        isIntersectionConstituent = true; // set here to affect the following trio of checks
+                        result = typeRelatedToEachType(source, target, reportErrors);
+                    }
+                    else if (source.flags & 2097152 /* Intersection */) {
+                        // Check to see if any constituents of the intersection are immediately related to the target.
+                        //
+                        // Don't report errors though. Checking whether a constituent is related to the source is not actually
+                        // useful and leads to some confusing error messages. Instead it is better to let the below checks
+                        // take care of this, or to not elaborate at all. For instance,
+                        //
+                        //    - For an object type (such as 'C = A & B'), users are usually more interested in structural errors.
+                        //
+                        //    - For a union type (such as '(A | B) = (C & D)'), it's better to hold onto the whole intersection
+                        //          than to report that 'D' is not assignable to 'A' or 'B'.
+                        //
+                        //    - For a primitive type or type parameter (such as 'number = A & B') there is no point in
+                        //          breaking the intersection apart.
+                        result = someTypeRelatedToType(source, target, /*reportErrors*/ false);
+                    }
+                    if (!result && (source.flags & 66846720 /* StructuredOrInstantiable */ || target.flags & 66846720 /* StructuredOrInstantiable */)) {
+                        if (result = recursiveTypeRelatedTo(source, target, reportErrors, isIntersectionConstituent)) {
+                            errorInfo = saveErrorInfo;
+                        }
+                    }
+                }
+                if (!result && source.flags & 2097152 /* Intersection */) {
+                    // The combined constraint of an intersection type is the intersection of the constraints of
+                    // the constituents. When an intersection type contains instantiable types with union type
+                    // constraints, there are situations where we need to examine the combined constraint. One is
+                    // when the target is a union type. Another is when the intersection contains types belonging
+                    // to one of the disjoint domains. For example, given type variables T and U, each with the
+                    // constraint 'string | number', the combined constraint of 'T & U' is 'string | number' and
+                    // we need to check this constraint against a union on the target side. Also, given a type
+                    // variable V constrained to 'string | number', 'V & number' has a combined constraint of
+                    // 'string & number | number & number' which reduces to just 'number'.
+                    var constraint = getUnionConstraintOfIntersection(source, !!(target.flags & 1048576 /* Union */));
+                    if (constraint) {
+                        if (result = isRelatedTo(constraint, target, reportErrors, /*headMessage*/ undefined, isIntersectionConstituent)) {
+                            errorInfo = saveErrorInfo;
+                        }
+                    }
+                }
+                if (!result && reportErrors) {
+                    var maybeSuppress = suppressNextError;
+                    suppressNextError = false;
+                    if (source.flags & 524288 /* Object */ && target.flags & 131068 /* Primitive */) {
+                        tryElaborateErrorsForPrimitivesAndObjects(source, target);
+                    }
+                    else if (source.symbol && source.flags & 524288 /* Object */ && globalObjectType === source) {
+                        reportError(ts.Diagnostics.The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead);
+                    }
+                    else if (isComparingJsxAttributes && target.flags & 2097152 /* Intersection */) {
+                        var targetTypes = target.types;
+                        var intrinsicAttributes = getJsxType(JsxNames.IntrinsicAttributes, errorNode);
+                        var intrinsicClassAttributes = getJsxType(JsxNames.IntrinsicClassAttributes, errorNode);
+                        if (intrinsicAttributes !== errorType && intrinsicClassAttributes !== errorType &&
+                            (ts.contains(targetTypes, intrinsicAttributes) || ts.contains(targetTypes, intrinsicClassAttributes))) {
+                            // do not report top error
+                            return result;
+                        }
+                    }
+                    if (!headMessage && maybeSuppress) {
+                        // Used by, eg, missing property checking to replace the top-level message with a more informative one
+                        return result;
+                    }
+                    reportRelationError(headMessage, source, target);
+                }
+                return result;
+            }
+            function isIdenticalTo(source, target) {
+                var result;
+                var flags = source.flags & target.flags;
+                if (flags & 524288 /* Object */ || flags & 8388608 /* IndexedAccess */ || flags & 16777216 /* Conditional */ || flags & 4194304 /* Index */ || flags & 33554432 /* Substitution */) {
+                    return recursiveTypeRelatedTo(source, target, /*reportErrors*/ false, /*isIntersectionConstituent*/ false);
+                }
+                if (flags & (1048576 /* Union */ | 2097152 /* Intersection */)) {
+                    if (result = eachTypeRelatedToSomeType(source, target)) {
+                        if (result &= eachTypeRelatedToSomeType(target, source)) {
+                            return result;
+                        }
+                    }
+                }
+                return 0 /* False */;
+            }
+            function hasExcessProperties(source, target, discriminant, reportErrors) {
+                if (!noImplicitAny && ts.getObjectFlags(target) & 16384 /* JSLiteral */) {
+                    return false; // Disable excess property checks on JS literals to simulate having an implicit "index signature" - but only outside of noImplicitAny
+                }
+                if (isExcessPropertyCheckTarget(target)) {
+                    var isComparingJsxAttributes = !!(ts.getObjectFlags(source) & 4096 /* JsxAttributes */);
+                    if ((relation === assignableRelation || relation === comparableRelation) &&
+                        (isTypeSubsetOf(globalObjectType, target) || (!isComparingJsxAttributes && isEmptyObjectType(target)))) {
+                        return false;
+                    }
+                    if (discriminant) {
+                        // check excess properties against discriminant type only, not the entire union
+                        return hasExcessProperties(source, discriminant, /*discriminant*/ undefined, reportErrors);
+                    }
+                    var _loop_7 = function (prop) {
+                        if (shouldCheckAsExcessProperty(prop, source.symbol) && !isKnownProperty(target, prop.escapedName, isComparingJsxAttributes)) {
+                            if (reportErrors) {
+                                // Report error in terms of object types in the target as those are the only ones
+                                // we check in isKnownProperty.
+                                var errorTarget = filterType(target, isExcessPropertyCheckTarget);
+                                // We know *exactly* where things went wrong when comparing the types.
+                                // Use this property as the error node as this will be more helpful in
+                                // reasoning about what went wrong.
+                                if (!errorNode)
+                                    return { value: ts.Debug.fail() };
+                                if (ts.isJsxAttributes(errorNode) || ts.isJsxOpeningLikeElement(errorNode) || ts.isJsxOpeningLikeElement(errorNode.parent)) {
+                                    // JsxAttributes has an object-literal flag and undergo same type-assignablity check as normal object-literal.
+                                    // However, using an object-literal error message will be very confusing to the users so we give different a message.
+                                    // TODO: Spelling suggestions for excess jsx attributes (needs new diagnostic messages)
+                                    reportError(ts.Diagnostics.Property_0_does_not_exist_on_type_1, symbolToString(prop), typeToString(errorTarget));
+                                }
+                                else {
+                                    // use the property's value declaration if the property is assigned inside the literal itself
+                                    var objectLiteralDeclaration_1 = source.symbol && ts.firstOrUndefined(source.symbol.declarations);
+                                    var suggestion = void 0;
+                                    if (prop.valueDeclaration && ts.findAncestor(prop.valueDeclaration, function (d) { return d === objectLiteralDeclaration_1; })) {
+                                        var propDeclaration = prop.valueDeclaration;
+                                        ts.Debug.assertNode(propDeclaration, ts.isObjectLiteralElementLike);
+                                        errorNode = propDeclaration;
+                                        var name = propDeclaration.name;
+                                        if (ts.isIdentifier(name)) {
+                                            suggestion = getSuggestionForNonexistentProperty(name, errorTarget);
+                                        }
+                                    }
+                                    if (suggestion !== undefined) {
+                                        reportError(ts.Diagnostics.Object_literal_may_only_specify_known_properties_but_0_does_not_exist_in_type_1_Did_you_mean_to_write_2, symbolToString(prop), typeToString(errorTarget), suggestion);
+                                    }
+                                    else {
+                                        reportError(ts.Diagnostics.Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1, symbolToString(prop), typeToString(errorTarget));
+                                    }
+                                }
+                            }
+                            return { value: true };
+                        }
+                    };
+                    for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
+                        var prop = _a[_i];
+                        var state_3 = _loop_7(prop);
+                        if (typeof state_3 === "object")
+                            return state_3.value;
+                    }
+                }
+                return false;
+            }
+            function shouldCheckAsExcessProperty(prop, container) {
+                return prop.valueDeclaration && container.valueDeclaration && prop.valueDeclaration.parent === container.valueDeclaration;
+            }
+            function eachTypeRelatedToSomeType(source, target) {
+                var result = -1 /* True */;
+                var sourceTypes = source.types;
+                for (var _i = 0, sourceTypes_1 = sourceTypes; _i < sourceTypes_1.length; _i++) {
+                    var sourceType = sourceTypes_1[_i];
+                    var related = typeRelatedToSomeType(sourceType, target, /*reportErrors*/ false);
+                    if (!related) {
+                        return 0 /* False */;
+                    }
+                    result &= related;
+                }
+                return result;
+            }
+            function typeRelatedToSomeType(source, target, reportErrors) {
+                var targetTypes = target.types;
+                if (target.flags & 1048576 /* Union */ && containsType(targetTypes, source)) {
+                    return -1 /* True */;
+                }
+                for (var _i = 0, targetTypes_1 = targetTypes; _i < targetTypes_1.length; _i++) {
+                    var type = targetTypes_1[_i];
+                    var related = isRelatedTo(source, type, /*reportErrors*/ false);
+                    if (related) {
+                        return related;
+                    }
+                }
+                if (reportErrors) {
+                    var bestMatchingType = findMatchingDiscriminantType(source, target) ||
+                        findMatchingTypeReferenceOrTypeAliasReference(source, target) ||
+                        findBestTypeForObjectLiteral(source, target) ||
+                        findBestTypeForInvokable(source, target) ||
+                        findMostOverlappyType(source, target);
+                    isRelatedTo(source, bestMatchingType || targetTypes[targetTypes.length - 1], /*reportErrors*/ true);
+                }
+                return 0 /* False */;
+            }
+            function findMatchingTypeReferenceOrTypeAliasReference(source, unionTarget) {
+                var sourceObjectFlags = ts.getObjectFlags(source);
+                if (sourceObjectFlags & (4 /* Reference */ | 16 /* Anonymous */) && unionTarget.flags & 1048576 /* Union */) {
+                    return ts.find(unionTarget.types, function (target) {
+                        if (target.flags & 524288 /* Object */) {
+                            var overlapObjFlags = sourceObjectFlags & ts.getObjectFlags(target);
+                            if (overlapObjFlags & 4 /* Reference */) {
+                                return source.target === target.target;
+                            }
+                            if (overlapObjFlags & 16 /* Anonymous */) {
+                                return !!source.aliasSymbol && source.aliasSymbol === target.aliasSymbol;
+                            }
+                        }
+                        return false;
+                    });
+                }
+            }
+            function findBestTypeForObjectLiteral(source, unionTarget) {
+                if (ts.getObjectFlags(source) & 128 /* ObjectLiteral */ && forEachType(unionTarget, isArrayLikeType)) {
+                    return ts.find(unionTarget.types, function (t) { return !isArrayLikeType(t); });
+                }
+            }
+            function findBestTypeForInvokable(source, unionTarget) {
+                var signatureKind = 0 /* Call */;
+                var hasSignatures = getSignaturesOfType(source, signatureKind).length > 0 ||
+                    (signatureKind = 1 /* Construct */, getSignaturesOfType(source, signatureKind).length > 0);
+                if (hasSignatures) {
+                    return ts.find(unionTarget.types, function (t) { return getSignaturesOfType(t, signatureKind).length > 0; });
+                }
+            }
+            function findMostOverlappyType(source, unionTarget) {
+                var bestMatch;
+                var matchingCount = 0;
+                for (var _i = 0, _a = unionTarget.types; _i < _a.length; _i++) {
+                    var target_1 = _a[_i];
+                    var overlap = getIntersectionType([getIndexType(source), getIndexType(target_1)]);
+                    if (overlap.flags & 4194304 /* Index */) {
+                        // perfect overlap of keys
+                        bestMatch = target_1;
+                        matchingCount = Infinity;
+                    }
+                    else if (overlap.flags & 1048576 /* Union */) {
+                        // We only want to account for literal types otherwise.
+                        // If we have a union of index types, it seems likely that we
+                        // needed to elaborate between two generic mapped types anyway.
+                        var len = ts.length(ts.filter(overlap.types, isUnitType));
+                        if (len >= matchingCount) {
+                            bestMatch = target_1;
+                            matchingCount = len;
+                        }
+                    }
+                    else if (isUnitType(overlap) && 1 >= matchingCount) {
+                        bestMatch = target_1;
+                        matchingCount = 1;
+                    }
+                }
+                return bestMatch;
+            }
+            // Keep this up-to-date with the same logic within `getApparentTypeOfContextualType`, since they should behave similarly
+            function findMatchingDiscriminantType(source, target) {
+                if (target.flags & 1048576 /* Union */) {
+                    var sourceProperties = getPropertiesOfObjectType(source);
+                    if (sourceProperties) {
+                        var sourcePropertiesFiltered = findDiscriminantProperties(sourceProperties, target);
+                        if (sourcePropertiesFiltered) {
+                            return discriminateTypeByDiscriminableItems(target, ts.map(sourcePropertiesFiltered, function (p) { return [function () { return getTypeOfSymbol(p); }, p.escapedName]; }), isRelatedTo);
+                        }
+                    }
+                }
+                return undefined;
+            }
+            function typeRelatedToEachType(source, target, reportErrors) {
+                var result = -1 /* True */;
+                var targetTypes = target.types;
+                for (var _i = 0, targetTypes_2 = targetTypes; _i < targetTypes_2.length; _i++) {
+                    var targetType = targetTypes_2[_i];
+                    var related = isRelatedTo(source, targetType, reportErrors, /*headMessage*/ undefined, /*isIntersectionConstituent*/ true);
+                    if (!related) {
+                        return 0 /* False */;
+                    }
+                    result &= related;
+                }
+                return result;
+            }
+            function someTypeRelatedToType(source, target, reportErrors) {
+                var sourceTypes = source.types;
+                if (source.flags & 1048576 /* Union */ && containsType(sourceTypes, target)) {
+                    return -1 /* True */;
+                }
+                var len = sourceTypes.length;
+                for (var i = 0; i < len; i++) {
+                    var related = isRelatedTo(sourceTypes[i], target, reportErrors && i === len - 1);
+                    if (related) {
+                        return related;
+                    }
+                }
+                return 0 /* False */;
+            }
+            function eachTypeRelatedToType(source, target, reportErrors) {
+                var result = -1 /* True */;
+                var sourceTypes = source.types;
+                for (var _i = 0, sourceTypes_2 = sourceTypes; _i < sourceTypes_2.length; _i++) {
+                    var sourceType = sourceTypes_2[_i];
+                    var related = isRelatedTo(sourceType, target, reportErrors);
+                    if (!related) {
+                        return 0 /* False */;
+                    }
+                    result &= related;
+                }
+                return result;
+            }
+            function typeArgumentsRelatedTo(sources, targets, variances, reportErrors) {
+                if (sources === void 0) { sources = ts.emptyArray; }
+                if (targets === void 0) { targets = ts.emptyArray; }
+                if (variances === void 0) { variances = ts.emptyArray; }
+                if (sources.length !== targets.length && relation === identityRelation) {
+                    return 0 /* False */;
+                }
+                var length = sources.length <= targets.length ? sources.length : targets.length;
+                var result = -1 /* True */;
+                for (var i = 0; i < length; i++) {
+                    // When variance information isn't available we default to covariance. This happens
+                    // in the process of computing variance information for recursive types and when
+                    // comparing 'this' type arguments.
+                    var variance = i < variances.length ? variances[i] : 1 /* Covariant */;
+                    // We ignore arguments for independent type parameters (because they're never witnessed).
+                    if (variance !== 4 /* Independent */) {
+                        var s = sources[i];
+                        var t = targets[i];
+                        var related = -1 /* True */;
+                        if (variance === 1 /* Covariant */) {
+                            related = isRelatedTo(s, t, reportErrors);
+                        }
+                        else if (variance === 2 /* Contravariant */) {
+                            related = isRelatedTo(t, s, reportErrors);
+                        }
+                        else if (variance === 3 /* Bivariant */) {
+                            // In the bivariant case we first compare contravariantly without reporting
+                            // errors. Then, if that doesn't succeed, we compare covariantly with error
+                            // reporting. Thus, error elaboration will be based on the the covariant check,
+                            // which is generally easier to reason about.
+                            related = isRelatedTo(t, s, /*reportErrors*/ false);
+                            if (!related) {
+                                related = isRelatedTo(s, t, reportErrors);
+                            }
+                        }
+                        else {
+                            // In the invariant case we first compare covariantly, and only when that
+                            // succeeds do we proceed to compare contravariantly. Thus, error elaboration
+                            // will typically be based on the covariant check.
+                            related = isRelatedTo(s, t, reportErrors);
+                            if (related) {
+                                related &= isRelatedTo(t, s, reportErrors);
+                            }
+                        }
+                        if (!related) {
+                            return 0 /* False */;
+                        }
+                        result &= related;
+                    }
+                }
+                return result;
+            }
+            // Determine if possibly recursive types are related. First, check if the result is already available in the global cache.
+            // Second, check if we have already started a comparison of the given two types in which case we assume the result to be true.
+            // Third, check if both types are part of deeply nested chains of generic type instantiations and if so assume the types are
+            // equal and infinitely expanding. Fourth, if we have reached a depth of 100 nested comparisons, assume we have runaway recursion
+            // and issue an error. Otherwise, actually compare the structure of the two types.
+            function recursiveTypeRelatedTo(source, target, reportErrors, isIntersectionConstituent) {
+                if (overflow) {
+                    return 0 /* False */;
+                }
+                var id = getRelationKey(source, target, relation);
+                var related = relation.get(id);
+                if (related !== undefined) {
+                    if (reportErrors && related === 2 /* Failed */) {
+                        // We are elaborating errors and the cached result is an unreported failure. The result will be reported
+                        // as a failure, and should be updated as a reported failure by the bottom of this function.
+                    }
+                    else {
+                        return related === 1 /* Succeeded */ ? -1 /* True */ : 0 /* False */;
+                    }
+                }
+                if (!maybeKeys) {
+                    maybeKeys = [];
+                    sourceStack = [];
+                    targetStack = [];
+                }
+                else {
+                    for (var i = 0; i < maybeCount; i++) {
+                        // If source and target are already being compared, consider them related with assumptions
+                        if (id === maybeKeys[i]) {
+                            return 1 /* Maybe */;
+                        }
+                    }
+                    if (depth === 100) {
+                        overflow = true;
+                        return 0 /* False */;
+                    }
+                }
+                var maybeStart = maybeCount;
+                maybeKeys[maybeCount] = id;
+                maybeCount++;
+                sourceStack[depth] = source;
+                targetStack[depth] = target;
+                depth++;
+                var saveExpandingFlags = expandingFlags;
+                if (!(expandingFlags & 1 /* Source */) && isDeeplyNestedType(source, sourceStack, depth))
+                    expandingFlags |= 1 /* Source */;
+                if (!(expandingFlags & 2 /* Target */) && isDeeplyNestedType(target, targetStack, depth))
+                    expandingFlags |= 2 /* Target */;
+                var result = expandingFlags !== 3 /* Both */ ? structuredTypeRelatedTo(source, target, reportErrors, isIntersectionConstituent) : 1 /* Maybe */;
+                expandingFlags = saveExpandingFlags;
+                depth--;
+                if (result) {
+                    if (result === -1 /* True */ || depth === 0) {
+                        // If result is definitely true, record all maybe keys as having succeeded
+                        for (var i = maybeStart; i < maybeCount; i++) {
+                            relation.set(maybeKeys[i], 1 /* Succeeded */);
+                        }
+                        maybeCount = maybeStart;
+                    }
+                }
+                else {
+                    // A false result goes straight into global cache (when something is false under
+                    // assumptions it will also be false without assumptions)
+                    relation.set(id, reportErrors ? 3 /* FailedAndReported */ : 2 /* Failed */);
+                    maybeCount = maybeStart;
+                }
+                return result;
+            }
+            function structuredTypeRelatedTo(source, target, reportErrors, isIntersectionConstituent) {
+                var flags = source.flags & target.flags;
+                if (relation === identityRelation && !(flags & 524288 /* Object */)) {
+                    if (flags & 4194304 /* Index */) {
+                        return isRelatedTo(source.type, target.type, /*reportErrors*/ false);
+                    }
+                    var result_3 = 0 /* False */;
+                    if (flags & 8388608 /* IndexedAccess */) {
+                        if (result_3 = isRelatedTo(source.objectType, target.objectType, /*reportErrors*/ false)) {
+                            if (result_3 &= isRelatedTo(source.indexType, target.indexType, /*reportErrors*/ false)) {
+                                return result_3;
+                            }
+                        }
+                    }
+                    if (flags & 16777216 /* Conditional */) {
+                        if (source.root.isDistributive === target.root.isDistributive) {
+                            if (result_3 = isRelatedTo(source.checkType, target.checkType, /*reportErrors*/ false)) {
+                                if (result_3 &= isRelatedTo(source.extendsType, target.extendsType, /*reportErrors*/ false)) {
+                                    if (result_3 &= isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), /*reportErrors*/ false)) {
+                                        if (result_3 &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), /*reportErrors*/ false)) {
+                                            return result_3;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    if (flags & 33554432 /* Substitution */) {
+                        return isRelatedTo(source.substitute, target.substitute, /*reportErrors*/ false);
+                    }
+                    return 0 /* False */;
+                }
+                var result;
+                var originalErrorInfo;
+                var saveErrorInfo = errorInfo;
+                // We limit alias variance probing to only object and conditional types since their alias behavior
+                // is more predictable than other, interned types, which may or may not have an alias depending on
+                // the order in which things were checked.
+                if (source.flags & (524288 /* Object */ | 16777216 /* Conditional */) && source.aliasSymbol &&
+                    source.aliasTypeArguments && source.aliasSymbol === target.aliasSymbol &&
+                    !(source.aliasTypeArgumentsContainsMarker || target.aliasTypeArgumentsContainsMarker)) {
+                    var variances = getAliasVariances(source.aliasSymbol);
+                    if (result = typeArgumentsRelatedTo(source.aliasTypeArguments, target.aliasTypeArguments, variances, reportErrors)) {
+                        return result;
+                    }
+                    originalErrorInfo = errorInfo;
+                    errorInfo = saveErrorInfo;
+                }
+                if (target.flags & 262144 /* TypeParameter */) {
+                    // A source type { [P in Q]: X } is related to a target type T if keyof T is related to Q and X is related to T[Q].
+                    if (ts.getObjectFlags(source) & 32 /* Mapped */ && isRelatedTo(getIndexType(target), getConstraintTypeFromMappedType(source))) {
+                        if (!(getMappedTypeModifiers(source) & 4 /* IncludeOptional */)) {
+                            var templateType = getTemplateTypeFromMappedType(source);
+                            var indexedAccessType = getIndexedAccessType(target, getTypeParameterFromMappedType(source));
+                            if (result = isRelatedTo(templateType, indexedAccessType, reportErrors)) {
+                                return result;
+                            }
+                        }
+                    }
+                }
+                else if (target.flags & 4194304 /* Index */) {
+                    // A keyof S is related to a keyof T if T is related to S.
+                    if (source.flags & 4194304 /* Index */) {
+                        if (result = isRelatedTo(target.type, source.type, /*reportErrors*/ false)) {
+                            return result;
+                        }
+                    }
+                    // A type S is assignable to keyof T if S is assignable to keyof C, where C is the
+                    // simplified form of T or, if T doesn't simplify, the constraint of T.
+                    var simplified = getSimplifiedType(target.type);
+                    var constraint = simplified !== target.type ? simplified : getConstraintOfType(target.type);
+                    if (constraint) {
+                        // We require Ternary.True here such that circular constraints don't cause
+                        // false positives. For example, given 'T extends { [K in keyof T]: string }',
+                        // 'keyof T' has itself as its constraint and produces a Ternary.Maybe when
+                        // related to other types.
+                        if (isRelatedTo(source, getIndexType(constraint, target.stringsOnly), reportErrors) === -1 /* True */) {
+                            return -1 /* True */;
+                        }
+                    }
+                }
+                else if (target.flags & 8388608 /* IndexedAccess */) {
+                    // A type S is related to a type T[K], where T and K aren't both type variables, if S is related to C,
+                    // where C is the base constraint of T[K]
+                    if (relation !== identityRelation &&
+                        !(isGenericObjectType(target.objectType) && isGenericIndexType(target.indexType))) {
+                        var constraint = getBaseConstraintOfType(target);
+                        if (constraint && constraint !== target) {
+                            if (result = isRelatedTo(source, constraint, reportErrors)) {
+                                return result;
+                            }
+                        }
+                    }
+                }
+                else if (isGenericMappedType(target)) {
+                    // A source type T is related to a target type { [P in X]: T[P] }
+                    var template = getTemplateTypeFromMappedType(target);
+                    var modifiers = getMappedTypeModifiers(target);
+                    if (!(modifiers & 8 /* ExcludeOptional */)) {
+                        if (template.flags & 8388608 /* IndexedAccess */ && template.objectType === source &&
+                            template.indexType === getTypeParameterFromMappedType(target)) {
+                            return -1 /* True */;
+                        }
+                        // A source type T is related to a target type { [P in Q]: X } if Q is related to keyof T and T[Q] is related to X.
+                        if (!isGenericMappedType(source) && isRelatedTo(getConstraintTypeFromMappedType(target), getIndexType(source))) {
+                            var indexedAccessType = getIndexedAccessType(source, getTypeParameterFromMappedType(target));
+                            var templateType = getTemplateTypeFromMappedType(target);
+                            if (result = isRelatedTo(indexedAccessType, templateType, reportErrors)) {
+                                return result;
+                            }
+                        }
+                        originalErrorInfo = errorInfo;
+                        errorInfo = saveErrorInfo;
+                    }
+                }
+                if (source.flags & 8650752 /* TypeVariable */) {
+                    if (source.flags & 8388608 /* IndexedAccess */ && target.flags & 8388608 /* IndexedAccess */) {
+                        // A type S[K] is related to a type T[J] if S is related to T and K is related to J.
+                        if (result = isRelatedTo(source.objectType, target.objectType, reportErrors)) {
+                            result &= isRelatedTo(source.indexType, target.indexType, reportErrors);
+                        }
+                        if (result) {
+                            errorInfo = saveErrorInfo;
+                            return result;
+                        }
+                    }
+                    var constraint = getConstraintOfType(source);
+                    if (!constraint || (source.flags & 262144 /* TypeParameter */ && constraint.flags & 1 /* Any */)) {
+                        // A type variable with no constraint is not related to the non-primitive object type.
+                        if (result = isRelatedTo(emptyObjectType, extractTypesOfKind(target, ~67108864 /* NonPrimitive */))) {
+                            errorInfo = saveErrorInfo;
+                            return result;
+                        }
+                    }
+                    // hi-speed no-this-instantiation check (less accurate, but avoids costly `this`-instantiation when the constraint will suffice), see #28231 for report on why this is needed
+                    else if (result = isRelatedTo(constraint, target, /*reportErrors*/ false, /*headMessage*/ undefined, isIntersectionConstituent)) {
+                        errorInfo = saveErrorInfo;
+                        return result;
+                    }
+                    // slower, fuller, this-instantiated check (necessary when comparing raw `this` types from base classes), see `subclassWithPolymorphicThisIsAssignable.ts` test for example
+                    else if (result = isRelatedTo(getTypeWithThisArgument(constraint, source), target, reportErrors, /*headMessage*/ undefined, isIntersectionConstituent)) {
+                        errorInfo = saveErrorInfo;
+                        return result;
+                    }
+                }
+                else if (source.flags & 4194304 /* Index */) {
+                    if (result = isRelatedTo(keyofConstraintType, target, reportErrors)) {
+                        errorInfo = saveErrorInfo;
+                        return result;
+                    }
+                }
+                else if (source.flags & 16777216 /* Conditional */) {
+                    if (target.flags & 16777216 /* Conditional */) {
+                        // Two conditional types 'T1 extends U1 ? X1 : Y1' and 'T2 extends U2 ? X2 : Y2' are related if
+                        // one of T1 and T2 is related to the other, U1 and U2 are identical types, X1 is related to X2,
+                        // and Y1 is related to Y2.
+                        if (isTypeIdenticalTo(source.extendsType, target.extendsType) &&
+                            (isRelatedTo(source.checkType, target.checkType) || isRelatedTo(target.checkType, source.checkType))) {
+                            if (result = isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), reportErrors)) {
+                                result &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), reportErrors);
+                            }
+                            if (result) {
+                                errorInfo = saveErrorInfo;
+                                return result;
+                            }
+                        }
+                    }
+                    else {
+                        var distributiveConstraint = getConstraintOfDistributiveConditionalType(source);
+                        if (distributiveConstraint) {
+                            if (result = isRelatedTo(distributiveConstraint, target, reportErrors)) {
+                                errorInfo = saveErrorInfo;
+                                return result;
+                            }
+                        }
+                        var defaultConstraint = getDefaultConstraintOfConditionalType(source);
+                        if (defaultConstraint) {
+                            if (result = isRelatedTo(defaultConstraint, target, reportErrors)) {
+                                errorInfo = saveErrorInfo;
+                                return result;
+                            }
+                        }
+                    }
+                }
+                else {
+                    // An empty object type is related to any mapped type that includes a '?' modifier.
+                    if (relation !== subtypeRelation && isPartialMappedType(target) && isEmptyObjectType(source)) {
+                        return -1 /* True */;
+                    }
+                    if (isGenericMappedType(target)) {
+                        if (isGenericMappedType(source)) {
+                            if (result = mappedTypeRelatedTo(source, target, reportErrors)) {
+                                errorInfo = saveErrorInfo;
+                                return result;
+                            }
+                        }
+                        return 0 /* False */;
+                    }
+                    var sourceIsPrimitive = !!(source.flags & 131068 /* Primitive */);
+                    if (relation !== identityRelation) {
+                        source = getApparentType(source);
+                    }
+                    if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && source.target === target.target &&
+                        !(ts.getObjectFlags(source) & 8192 /* MarkerType */ || ts.getObjectFlags(target) & 8192 /* MarkerType */)) {
+                        // We have type references to the same generic type, and the type references are not marker
+                        // type references (which are intended by be compared structurally). Obtain the variance
+                        // information for the type parameters and relate the type arguments accordingly.
+                        var variances = getVariances(source.target);
+                        if (result = typeArgumentsRelatedTo(source.typeArguments, target.typeArguments, variances, reportErrors)) {
+                            return result;
+                        }
+                        // The type arguments did not relate appropriately, but it may be because we have no variance
+                        // information (in which case typeArgumentsRelatedTo defaulted to covariance for all type
+                        // arguments). It might also be the case that the target type has a 'void' type argument for
+                        // a covariant type parameter that is only used in return positions within the generic type
+                        // (in which case any type argument is permitted on the source side). In those cases we proceed
+                        // with a structural comparison. Otherwise, we know for certain the instantiations aren't
+                        // related and we can return here.
+                        if (variances !== ts.emptyArray && !hasCovariantVoidArgument(target, variances)) {
+                            // In some cases generic types that are covariant in regular type checking mode become
+                            // invariant in --strictFunctionTypes mode because one or more type parameters are used in
+                            // both co- and contravariant positions. In order to make it easier to diagnose *why* such
+                            // types are invariant, if any of the type parameters are invariant we reset the reported
+                            // errors and instead force a structural comparison (which will include elaborations that
+                            // reveal the reason).
+                            if (!(reportErrors && ts.some(variances, function (v) { return v === 0 /* Invariant */; }))) {
+                                return 0 /* False */;
+                            }
+                            // We remember the original error information so we can restore it in case the structural
+                            // comparison unexpectedly succeeds. This can happen when the structural comparison result
+                            // is a Ternary.Maybe for example caused by the recursion depth limiter.
+                            originalErrorInfo = errorInfo;
+                            errorInfo = saveErrorInfo;
+                        }
+                    }
+                    else if (isTupleType(source) && (isArrayType(target) || isReadonlyArrayType(target)) || isArrayType(source) && isReadonlyArrayType(target)) {
+                        return isRelatedTo(getIndexTypeOfType(source, 1 /* Number */) || anyType, getIndexTypeOfType(target, 1 /* Number */) || anyType, reportErrors);
+                    }
+                    // Even if relationship doesn't hold for unions, intersections, or generic type references,
+                    // it may hold in a structural comparison.
+                    // In a check of the form X = A & B, we will have previously checked if A relates to X or B relates
+                    // to X. Failing both of those we want to check if the aggregation of A and B's members structurally
+                    // relates to X. Thus, we include intersection types on the source side here.
+                    if (source.flags & (524288 /* Object */ | 2097152 /* Intersection */) && target.flags & 524288 /* Object */) {
+                        // Report structural errors only if we haven't reported any errors yet
+                        var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo && !sourceIsPrimitive;
+                        result = propertiesRelatedTo(source, target, reportStructuralErrors);
+                        if (result) {
+                            result &= signaturesRelatedTo(source, target, 0 /* Call */, reportStructuralErrors);
+                            if (result) {
+                                result &= signaturesRelatedTo(source, target, 1 /* Construct */, reportStructuralErrors);
+                                if (result) {
+                                    result &= indexTypesRelatedTo(source, target, 0 /* String */, sourceIsPrimitive, reportStructuralErrors);
+                                    if (result) {
+                                        result &= indexTypesRelatedTo(source, target, 1 /* Number */, sourceIsPrimitive, reportStructuralErrors);
+                                    }
+                                }
+                            }
+                        }
+                        if (result) {
+                            if (!originalErrorInfo) {
+                                errorInfo = saveErrorInfo;
+                                return result;
+                            }
+                            errorInfo = originalErrorInfo;
+                        }
+                    }
+                }
+                return 0 /* False */;
+            }
+            // A type [P in S]: X is related to a type [Q in T]: Y if T is related to S and X' is
+            // related to Y, where X' is an instantiation of X in which P is replaced with Q. Notice
+            // that S and T are contra-variant whereas X and Y are co-variant.
+            function mappedTypeRelatedTo(source, target, reportErrors) {
+                var modifiersRelated = relation === comparableRelation || (relation === identityRelation ? getMappedTypeModifiers(source) === getMappedTypeModifiers(target) :
+                    getCombinedMappedTypeOptionality(source) <= getCombinedMappedTypeOptionality(target));
+                if (modifiersRelated) {
+                    var result_4;
+                    if (result_4 = isRelatedTo(getConstraintTypeFromMappedType(target), getConstraintTypeFromMappedType(source), reportErrors)) {
+                        var mapper = createTypeMapper([getTypeParameterFromMappedType(source)], [getTypeParameterFromMappedType(target)]);
+                        return result_4 & isRelatedTo(instantiateType(getTemplateTypeFromMappedType(source), mapper), getTemplateTypeFromMappedType(target), reportErrors);
+                    }
+                }
+                return 0 /* False */;
+            }
+            function propertiesRelatedTo(source, target, reportErrors) {
+                if (relation === identityRelation) {
+                    return propertiesIdenticalTo(source, target);
+                }
+                var requireOptionalProperties = relation === subtypeRelation && !isObjectLiteralType(source) && !isEmptyArrayLiteralType(source) && !isTupleType(source);
+                var unmatchedProperty = getUnmatchedProperty(source, target, requireOptionalProperties, /*matchDiscriminantProperties*/ false);
+                if (unmatchedProperty) {
+                    if (reportErrors) {
+                        var props = ts.arrayFrom(getUnmatchedProperties(source, target, requireOptionalProperties, /*matchDiscriminantProperties*/ false));
+                        if (!headMessage || (headMessage.code !== ts.Diagnostics.Class_0_incorrectly_implements_interface_1.code &&
+                            headMessage.code !== ts.Diagnostics.Class_0_incorrectly_implements_class_1_Did_you_mean_to_extend_1_and_inherit_its_members_as_a_subclass.code)) {
+                            suppressNextError = true; // Retain top-level error for interface implementing issues, otherwise omit it
+                        }
+                        if (props.length === 1) {
+                            var propName = symbolToString(unmatchedProperty);
+                            reportError(ts.Diagnostics.Property_0_is_missing_in_type_1_but_required_in_type_2, propName, typeToString(source), typeToString(target));
+                            if (ts.length(unmatchedProperty.declarations)) {
+                                associateRelatedInfo(ts.createDiagnosticForNode(unmatchedProperty.declarations[0], ts.Diagnostics._0_is_declared_here, propName));
+                            }
+                        }
+                        else if (props.length > 5) { // arbitrary cutoff for too-long list form
+                            reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2_and_3_more, typeToString(source), typeToString(target), ts.map(props.slice(0, 4), function (p) { return symbolToString(p); }).join(", "), props.length - 4);
+                        }
+                        else {
+                            reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2, typeToString(source), typeToString(target), ts.map(props, function (p) { return symbolToString(p); }).join(", "));
+                        }
+                    }
+                    return 0 /* False */;
+                }
+                if (isObjectLiteralType(target)) {
+                    for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
+                        var sourceProp = _a[_i];
+                        if (!getPropertyOfObjectType(target, sourceProp.escapedName)) {
+                            var sourceType = getTypeOfSymbol(sourceProp);
+                            if (!(sourceType === undefinedType || sourceType === undefinedWideningType)) {
+                                if (reportErrors) {
+                                    reportError(ts.Diagnostics.Property_0_does_not_exist_on_type_1, symbolToString(sourceProp), typeToString(target));
+                                }
+                                return 0 /* False */;
+                            }
+                        }
+                    }
+                }
+                var result = -1 /* True */;
+                if (isTupleType(target)) {
+                    var targetRestType = getRestTypeOfTupleType(target);
+                    if (targetRestType) {
+                        if (!isTupleType(source)) {
+                            return 0 /* False */;
+                        }
+                        var sourceRestType = getRestTypeOfTupleType(source);
+                        if (sourceRestType && !isRelatedTo(sourceRestType, targetRestType, reportErrors)) {
+                            if (reportErrors) {
+                                reportError(ts.Diagnostics.Rest_signatures_are_incompatible);
+                            }
+                            return 0 /* False */;
+                        }
+                        var targetCount = getTypeReferenceArity(target) - 1;
+                        var sourceCount = getTypeReferenceArity(source) - (sourceRestType ? 1 : 0);
+                        for (var i = targetCount; i < sourceCount; i++) {
+                            var related = isRelatedTo(source.typeArguments[i], targetRestType, reportErrors);
+                            if (!related) {
+                                if (reportErrors) {
+                                    reportError(ts.Diagnostics.Property_0_is_incompatible_with_rest_element_type, "" + i);
+                                }
+                                return 0 /* False */;
+                            }
+                            result &= related;
+                        }
+                    }
+                }
+                var properties = getPropertiesOfObjectType(target);
+                for (var _b = 0, properties_2 = properties; _b < properties_2.length; _b++) {
+                    var targetProp = properties_2[_b];
+                    if (!(targetProp.flags & 4194304 /* Prototype */)) {
+                        var sourceProp = getPropertyOfType(source, targetProp.escapedName);
+                        if (sourceProp && sourceProp !== targetProp) {
+                            if (isIgnoredJsxProperty(source, sourceProp, getTypeOfSymbol(targetProp))) {
+                                continue;
+                            }
+                            var sourcePropFlags = ts.getDeclarationModifierFlagsFromSymbol(sourceProp);
+                            var targetPropFlags = ts.getDeclarationModifierFlagsFromSymbol(targetProp);
+                            if (sourcePropFlags & 8 /* Private */ || targetPropFlags & 8 /* Private */) {
+                                var hasDifferingDeclarations = sourceProp.valueDeclaration !== targetProp.valueDeclaration;
+                                if (ts.getCheckFlags(sourceProp) & 512 /* ContainsPrivate */ && hasDifferingDeclarations) {
+                                    if (reportErrors) {
+                                        reportError(ts.Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(sourceProp), typeToString(source));
+                                    }
+                                    return 0 /* False */;
+                                }
+                                if (hasDifferingDeclarations) {
+                                    if (reportErrors) {
+                                        if (sourcePropFlags & 8 /* Private */ && targetPropFlags & 8 /* Private */) {
+                                            reportError(ts.Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
+                                        }
+                                        else {
+                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 8 /* Private */ ? source : target), typeToString(sourcePropFlags & 8 /* Private */ ? target : source));
+                                        }
+                                    }
+                                    return 0 /* False */;
+                                }
+                            }
+                            else if (targetPropFlags & 16 /* Protected */) {
+                                if (!isValidOverrideOf(sourceProp, targetProp)) {
+                                    if (reportErrors) {
+                                        reportError(ts.Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, symbolToString(targetProp), typeToString(getDeclaringClass(sourceProp) || source), typeToString(getDeclaringClass(targetProp) || target));
+                                    }
+                                    return 0 /* False */;
+                                }
+                            }
+                            else if (sourcePropFlags & 16 /* Protected */) {
+                                if (reportErrors) {
+                                    reportError(ts.Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
+                                }
+                                return 0 /* False */;
+                            }
+                            var related = isRelatedTo(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp), reportErrors);
+                            if (!related) {
+                                if (reportErrors) {
+                                    reportError(ts.Diagnostics.Types_of_property_0_are_incompatible, symbolToString(targetProp));
+                                }
+                                return 0 /* False */;
+                            }
+                            result &= related;
+                            // When checking for comparability, be more lenient with optional properties.
+                            if (relation !== comparableRelation && sourceProp.flags & 16777216 /* Optional */ && !(targetProp.flags & 16777216 /* Optional */)) {
+                                // TypeScript 1.0 spec (April 2014): 3.8.3
+                                // S is a subtype of a type T, and T is a supertype of S if ...
+                                // S' and T are object types and, for each member M in T..
+                                // M is a property and S' contains a property N where
+                                // if M is a required property, N is also a required property
+                                // (M - property in T)
+                                // (N - property in S)
+                                if (reportErrors) {
+                                    reportError(ts.Diagnostics.Property_0_is_optional_in_type_1_but_required_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
+                                }
+                                return 0 /* False */;
+                            }
+                        }
+                    }
+                }
+                return result;
+            }
+            function propertiesIdenticalTo(source, target) {
+                if (!(source.flags & 524288 /* Object */ && target.flags & 524288 /* Object */)) {
+                    return 0 /* False */;
+                }
+                var sourceProperties = getPropertiesOfObjectType(source);
+                var targetProperties = getPropertiesOfObjectType(target);
+                if (sourceProperties.length !== targetProperties.length) {
+                    return 0 /* False */;
+                }
+                var result = -1 /* True */;
+                for (var _i = 0, sourceProperties_1 = sourceProperties; _i < sourceProperties_1.length; _i++) {
+                    var sourceProp = sourceProperties_1[_i];
+                    var targetProp = getPropertyOfObjectType(target, sourceProp.escapedName);
+                    if (!targetProp) {
+                        return 0 /* False */;
+                    }
+                    var related = compareProperties(sourceProp, targetProp, isRelatedTo);
+                    if (!related) {
+                        return 0 /* False */;
+                    }
+                    result &= related;
+                }
+                return result;
+            }
+            function signaturesRelatedTo(source, target, kind, reportErrors) {
+                if (relation === identityRelation) {
+                    return signaturesIdenticalTo(source, target, kind);
+                }
+                if (target === anyFunctionType || source === anyFunctionType) {
+                    return -1 /* True */;
+                }
+                var sourceIsJSConstructor = source.symbol && isJSConstructor(source.symbol.valueDeclaration);
+                var targetIsJSConstructor = target.symbol && isJSConstructor(target.symbol.valueDeclaration);
+                var sourceSignatures = getSignaturesOfType(source, (sourceIsJSConstructor && kind === 1 /* Construct */) ?
+                    0 /* Call */ : kind);
+                var targetSignatures = getSignaturesOfType(target, (targetIsJSConstructor && kind === 1 /* Construct */) ?
+                    0 /* Call */ : kind);
+                if (kind === 1 /* Construct */ && sourceSignatures.length && targetSignatures.length) {
+                    if (ts.isAbstractConstructorType(source) && !ts.isAbstractConstructorType(target)) {
+                        // An abstract constructor type is not assignable to a non-abstract constructor type
+                        // as it would otherwise be possible to new an abstract class. Note that the assignability
+                        // check we perform for an extends clause excludes construct signatures from the target,
+                        // so this check never proceeds.
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type);
+                        }
+                        return 0 /* False */;
+                    }
+                    if (!constructorVisibilitiesAreCompatible(sourceSignatures[0], targetSignatures[0], reportErrors)) {
+                        return 0 /* False */;
+                    }
+                }
+                var result = -1 /* True */;
+                var saveErrorInfo = errorInfo;
+                if (ts.getObjectFlags(source) & 64 /* Instantiated */ && ts.getObjectFlags(target) & 64 /* Instantiated */ && source.symbol === target.symbol) {
+                    // We have instantiations of the same anonymous type (which typically will be the type of a
+                    // method). Simply do a pairwise comparison of the signatures in the two signature lists instead
+                    // of the much more expensive N * M comparison matrix we explore below. We erase type parameters
+                    // as they are known to always be the same.
+                    for (var i = 0; i < targetSignatures.length; i++) {
+                        var related = signatureRelatedTo(sourceSignatures[i], targetSignatures[i], /*erase*/ true, reportErrors);
+                        if (!related) {
+                            return 0 /* False */;
+                        }
+                        result &= related;
+                    }
+                }
+                else if (sourceSignatures.length === 1 && targetSignatures.length === 1) {
+                    // For simple functions (functions with a single signature) we only erase type parameters for
+                    // the comparable relation. Otherwise, if the source signature is generic, we instantiate it
+                    // in the context of the target signature before checking the relationship. Ideally we'd do
+                    // this regardless of the number of signatures, but the potential costs are prohibitive due
+                    // to the quadratic nature of the logic below.
+                    var eraseGenerics = relation === comparableRelation || !!compilerOptions.noStrictGenericChecks;
+                    result = signatureRelatedTo(sourceSignatures[0], targetSignatures[0], eraseGenerics, reportErrors);
+                }
+                else {
+                    outer: for (var _i = 0, targetSignatures_1 = targetSignatures; _i < targetSignatures_1.length; _i++) {
+                        var t = targetSignatures_1[_i];
+                        // Only elaborate errors from the first failure
+                        var shouldElaborateErrors = reportErrors;
+                        for (var _a = 0, sourceSignatures_1 = sourceSignatures; _a < sourceSignatures_1.length; _a++) {
+                            var s = sourceSignatures_1[_a];
+                            var related = signatureRelatedTo(s, t, /*erase*/ true, shouldElaborateErrors);
+                            if (related) {
+                                result &= related;
+                                errorInfo = saveErrorInfo;
+                                continue outer;
+                            }
+                            shouldElaborateErrors = false;
+                        }
+                        if (shouldElaborateErrors) {
+                            reportError(ts.Diagnostics.Type_0_provides_no_match_for_the_signature_1, typeToString(source), signatureToString(t, /*enclosingDeclaration*/ undefined, /*flags*/ undefined, kind));
+                        }
+                        return 0 /* False */;
+                    }
+                }
+                return result;
+            }
+            /**
+             * See signatureAssignableTo, compareSignaturesIdentical
+             */
+            function signatureRelatedTo(source, target, erase, reportErrors) {
+                return compareSignaturesRelated(erase ? getErasedSignature(source) : source, erase ? getErasedSignature(target) : target, 0 /* None */, /*ignoreReturnTypes*/ false, reportErrors, reportError, isRelatedTo);
+            }
+            function signaturesIdenticalTo(source, target, kind) {
+                var sourceSignatures = getSignaturesOfType(source, kind);
+                var targetSignatures = getSignaturesOfType(target, kind);
+                if (sourceSignatures.length !== targetSignatures.length) {
+                    return 0 /* False */;
+                }
+                var result = -1 /* True */;
+                for (var i = 0; i < sourceSignatures.length; i++) {
+                    var related = compareSignaturesIdentical(sourceSignatures[i], targetSignatures[i], /*partialMatch*/ false, /*ignoreThisTypes*/ false, /*ignoreReturnTypes*/ false, isRelatedTo);
+                    if (!related) {
+                        return 0 /* False */;
+                    }
+                    result &= related;
+                }
+                return result;
+            }
+            function eachPropertyRelatedTo(source, target, kind, reportErrors) {
+                var result = -1 /* True */;
+                for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
+                    var prop = _a[_i];
+                    if (isIgnoredJsxProperty(source, prop, /*targetMemberType*/ undefined)) {
+                        continue;
+                    }
+                    // Skip over symbol-named members
+                    if (prop.nameType && prop.nameType.flags & 8192 /* UniqueESSymbol */) {
+                        continue;
+                    }
+                    if (kind === 0 /* String */ || isNumericLiteralName(prop.escapedName)) {
+                        var related = isRelatedTo(getTypeOfSymbol(prop), target, reportErrors);
+                        if (!related) {
+                            if (reportErrors) {
+                                reportError(ts.Diagnostics.Property_0_is_incompatible_with_index_signature, symbolToString(prop));
+                            }
+                            return 0 /* False */;
+                        }
+                        result &= related;
+                    }
+                }
+                return result;
+            }
+            function indexInfoRelatedTo(sourceInfo, targetInfo, reportErrors) {
+                var related = isRelatedTo(sourceInfo.type, targetInfo.type, reportErrors);
+                if (!related && reportErrors) {
+                    reportError(ts.Diagnostics.Index_signatures_are_incompatible);
+                }
+                return related;
+            }
+            function indexTypesRelatedTo(source, target, kind, sourceIsPrimitive, reportErrors) {
+                if (relation === identityRelation) {
+                    return indexTypesIdenticalTo(source, target, kind);
+                }
+                var targetInfo = getIndexInfoOfType(target, kind);
+                if (!targetInfo || targetInfo.type.flags & 3 /* AnyOrUnknown */ && !sourceIsPrimitive) {
+                    // Index signature of type any permits assignment from everything but primitives
+                    return -1 /* True */;
+                }
+                var sourceInfo = getIndexInfoOfType(source, kind) ||
+                    kind === 1 /* Number */ && getIndexInfoOfType(source, 0 /* String */);
+                if (sourceInfo) {
+                    return indexInfoRelatedTo(sourceInfo, targetInfo, reportErrors);
+                }
+                if (isGenericMappedType(source)) {
+                    // A generic mapped type { [P in K]: T } is related to an index signature { [x: string]: U }
+                    // if T is related to U.
+                    return (kind === 0 /* String */ && isRelatedTo(getTemplateTypeFromMappedType(source), targetInfo.type, reportErrors)); // TODO: GH#18217
+                }
+                if (isObjectTypeWithInferableIndex(source)) {
+                    var related = -1 /* True */;
+                    if (kind === 0 /* String */) {
+                        var sourceNumberInfo = getIndexInfoOfType(source, 1 /* Number */);
+                        if (sourceNumberInfo) {
+                            related = indexInfoRelatedTo(sourceNumberInfo, targetInfo, reportErrors);
+                        }
+                    }
+                    if (related) {
+                        related &= eachPropertyRelatedTo(source, targetInfo.type, kind, reportErrors);
+                    }
+                    return related;
+                }
+                if (reportErrors) {
+                    reportError(ts.Diagnostics.Index_signature_is_missing_in_type_0, typeToString(source));
+                }
+                return 0 /* False */;
+            }
+            function indexTypesIdenticalTo(source, target, indexKind) {
+                var targetInfo = getIndexInfoOfType(target, indexKind);
+                var sourceInfo = getIndexInfoOfType(source, indexKind);
+                if (!sourceInfo && !targetInfo) {
+                    return -1 /* True */;
+                }
+                if (sourceInfo && targetInfo && sourceInfo.isReadonly === targetInfo.isReadonly) {
+                    return isRelatedTo(sourceInfo.type, targetInfo.type);
+                }
+                return 0 /* False */;
+            }
+            function constructorVisibilitiesAreCompatible(sourceSignature, targetSignature, reportErrors) {
+                if (!sourceSignature.declaration || !targetSignature.declaration) {
+                    return true;
+                }
+                var sourceAccessibility = ts.getSelectedModifierFlags(sourceSignature.declaration, 24 /* NonPublicAccessibilityModifier */);
+                var targetAccessibility = ts.getSelectedModifierFlags(targetSignature.declaration, 24 /* NonPublicAccessibilityModifier */);
+                // A public, protected and private signature is assignable to a private signature.
+                if (targetAccessibility === 8 /* Private */) {
+                    return true;
+                }
+                // A public and protected signature is assignable to a protected signature.
+                if (targetAccessibility === 16 /* Protected */ && sourceAccessibility !== 8 /* Private */) {
+                    return true;
+                }
+                // Only a public signature is assignable to public signature.
+                if (targetAccessibility !== 16 /* Protected */ && !sourceAccessibility) {
+                    return true;
+                }
+                if (reportErrors) {
+                    reportError(ts.Diagnostics.Cannot_assign_a_0_constructor_type_to_a_1_constructor_type, visibilityToString(sourceAccessibility), visibilityToString(targetAccessibility));
+                }
+                return false;
+            }
+        }
+        function discriminateTypeByDiscriminableItems(target, discriminators, related, defaultValue) {
+            var match;
+            for (var _i = 0, discriminators_1 = discriminators; _i < discriminators_1.length; _i++) {
+                var _a = discriminators_1[_i], getDiscriminatingType = _a[0], propertyName = _a[1];
+                for (var _b = 0, _c = target.types; _b < _c.length; _b++) {
+                    var type = _c[_b];
+                    var targetType = getTypeOfPropertyOfType(type, propertyName);
+                    if (targetType && related(getDiscriminatingType(), targetType)) {
+                        if (match) {
+                            if (type === match)
+                                continue; // Finding multiple fields which discriminate to the same type is fine
+                            return defaultValue;
+                        }
+                        match = type;
+                    }
+                }
+            }
+            return match || defaultValue;
+        }
+        /**
+         * A type is 'weak' if it is an object type with at least one optional property
+         * and no required properties, call/construct signatures or index signatures
+         */
+        function isWeakType(type) {
+            if (type.flags & 524288 /* Object */) {
+                var resolved = resolveStructuredTypeMembers(type);
+                return resolved.callSignatures.length === 0 && resolved.constructSignatures.length === 0 &&
+                    !resolved.stringIndexInfo && !resolved.numberIndexInfo &&
+                    resolved.properties.length > 0 &&
+                    ts.every(resolved.properties, function (p) { return !!(p.flags & 16777216 /* Optional */); });
+            }
+            if (type.flags & 2097152 /* Intersection */) {
+                return ts.every(type.types, isWeakType);
+            }
+            return false;
+        }
+        function hasCommonProperties(source, target, isComparingJsxAttributes) {
+            for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
+                var prop = _a[_i];
+                if (isKnownProperty(target, prop.escapedName, isComparingJsxAttributes)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        // Return a type reference where the source type parameter is replaced with the target marker
+        // type, and flag the result as a marker type reference.
+        function getMarkerTypeReference(type, source, target) {
+            var result = createTypeReference(type, ts.map(type.typeParameters, function (t) { return t === source ? target : t; }));
+            result.objectFlags |= 8192 /* MarkerType */;
+            return result;
+        }
+        function getAliasVariances(symbol) {
+            var links = getSymbolLinks(symbol);
+            return getVariancesWorker(links.typeParameters, links, function (_links, param, marker) {
+                var type = getTypeAliasInstantiation(symbol, instantiateTypes(links.typeParameters, makeUnaryTypeMapper(param, marker)));
+                type.aliasTypeArgumentsContainsMarker = true;
+                return type;
+            });
+        }
+        // Return an array containing the variance of each type parameter. The variance is effectively
+        // a digest of the type comparisons that occur for each type argument when instantiations of the
+        // generic type are structurally compared. We infer the variance information by comparing
+        // instantiations of the generic type for type arguments with known relations. The function
+        // returns the emptyArray singleton if we're not in strictFunctionTypes mode or if the function
+        // has been invoked recursively for the given generic type.
+        function getVariancesWorker(typeParameters, cache, createMarkerType) {
+            if (typeParameters === void 0) { typeParameters = ts.emptyArray; }
+            var variances = cache.variances;
+            if (!variances) {
+                // The emptyArray singleton is used to signal a recursive invocation.
+                cache.variances = ts.emptyArray;
+                variances = [];
+                for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
+                    var tp = typeParameters_1[_i];
+                    // We first compare instantiations where the type parameter is replaced with
+                    // marker types that have a known subtype relationship. From this we can infer
+                    // invariance, covariance, contravariance or bivariance.
+                    var typeWithSuper = createMarkerType(cache, tp, markerSuperType);
+                    var typeWithSub = createMarkerType(cache, tp, markerSubType);
+                    var variance = (isTypeAssignableTo(typeWithSub, typeWithSuper) ? 1 /* Covariant */ : 0) |
+                        (isTypeAssignableTo(typeWithSuper, typeWithSub) ? 2 /* Contravariant */ : 0);
+                    // If the instantiations appear to be related bivariantly it may be because the
+                    // type parameter is independent (i.e. it isn't witnessed anywhere in the generic
+                    // type). To determine this we compare instantiations where the type parameter is
+                    // replaced with marker types that are known to be unrelated.
+                    if (variance === 3 /* Bivariant */ && isTypeAssignableTo(createMarkerType(cache, tp, markerOtherType), typeWithSuper)) {
+                        variance = 4 /* Independent */;
+                    }
+                    variances.push(variance);
+                }
+                cache.variances = variances;
+            }
+            return variances;
+        }
+        function getVariances(type) {
+            if (!strictFunctionTypes) {
+                return ts.emptyArray;
+            }
+            if (type === globalArrayType || type === globalReadonlyArrayType) {
+                // Arrays are known to be covariant, no need to spend time computing this (emptyArray implies covariance for all parameters)
+                return ts.emptyArray;
+            }
+            return getVariancesWorker(type.typeParameters, type, getMarkerTypeReference);
+        }
+        // Return true if the given type reference has a 'void' type argument for a covariant type parameter.
+        // See comment at call in recursiveTypeRelatedTo for when this case matters.
+        function hasCovariantVoidArgument(type, variances) {
+            for (var i = 0; i < variances.length; i++) {
+                if (variances[i] === 1 /* Covariant */ && type.typeArguments[i].flags & 16384 /* Void */) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        function isUnconstrainedTypeParameter(type) {
+            return type.flags & 262144 /* TypeParameter */ && !getConstraintOfTypeParameter(type);
+        }
+        function isTypeReferenceWithGenericArguments(type) {
+            return !!(ts.getObjectFlags(type) & 4 /* Reference */) && ts.some(type.typeArguments, function (t) { return isUnconstrainedTypeParameter(t) || isTypeReferenceWithGenericArguments(t); });
+        }
+        /**
+         * getTypeReferenceId(A<T, number, U>) returns "111=0-12=1"
+         *   where A.id=111 and number.id=12
+         */
+        function getTypeReferenceId(type, typeParameters, depth) {
+            if (depth === void 0) { depth = 0; }
+            var result = "" + type.target.id;
+            for (var _i = 0, _a = type.typeArguments; _i < _a.length; _i++) {
+                var t = _a[_i];
+                if (isUnconstrainedTypeParameter(t)) {
+                    var index = typeParameters.indexOf(t);
+                    if (index < 0) {
+                        index = typeParameters.length;
+                        typeParameters.push(t);
+                    }
+                    result += "=" + index;
+                }
+                else if (depth < 4 && isTypeReferenceWithGenericArguments(t)) {
+                    result += "<" + getTypeReferenceId(t, typeParameters, depth + 1) + ">";
+                }
+                else {
+                    result += "-" + t.id;
+                }
+            }
+            return result;
+        }
+        /**
+         * To improve caching, the relation key for two generic types uses the target's id plus ids of the type parameters.
+         * For other cases, the types ids are used.
+         */
+        function getRelationKey(source, target, relation) {
+            if (relation === identityRelation && source.id > target.id) {
+                var temp = source;
+                source = target;
+                target = temp;
+            }
+            if (isTypeReferenceWithGenericArguments(source) && isTypeReferenceWithGenericArguments(target)) {
+                var typeParameters = [];
+                return getTypeReferenceId(source, typeParameters) + "," + getTypeReferenceId(target, typeParameters);
+            }
+            return source.id + "," + target.id;
+        }
+        // Invoke the callback for each underlying property symbol of the given symbol and return the first
+        // value that isn't undefined.
+        function forEachProperty(prop, callback) {
+            if (ts.getCheckFlags(prop) & 6 /* Synthetic */) {
+                for (var _i = 0, _a = prop.containingType.types; _i < _a.length; _i++) {
+                    var t = _a[_i];
+                    var p = getPropertyOfType(t, prop.escapedName);
+                    var result = p && forEachProperty(p, callback);
+                    if (result) {
+                        return result;
+                    }
+                }
+                return undefined;
+            }
+            return callback(prop);
+        }
+        // Return the declaring class type of a property or undefined if property not declared in class
+        function getDeclaringClass(prop) {
+            return prop.parent && prop.parent.flags & 32 /* Class */ ? getDeclaredTypeOfSymbol(getParentOfSymbol(prop)) : undefined;
+        }
+        // Return true if some underlying source property is declared in a class that derives
+        // from the given base class.
+        function isPropertyInClassDerivedFrom(prop, baseClass) {
+            return forEachProperty(prop, function (sp) {
+                var sourceClass = getDeclaringClass(sp);
+                return sourceClass ? hasBaseType(sourceClass, baseClass) : false;
+            });
+        }
+        // Return true if source property is a valid override of protected parts of target property.
+        function isValidOverrideOf(sourceProp, targetProp) {
+            return !forEachProperty(targetProp, function (tp) { return ts.getDeclarationModifierFlagsFromSymbol(tp) & 16 /* Protected */ ?
+                !isPropertyInClassDerivedFrom(sourceProp, getDeclaringClass(tp)) : false; });
+        }
+        // Return true if the given class derives from each of the declaring classes of the protected
+        // constituents of the given property.
+        function isClassDerivedFromDeclaringClasses(checkClass, prop) {
+            return forEachProperty(prop, function (p) { return ts.getDeclarationModifierFlagsFromSymbol(p) & 16 /* Protected */ ?
+                !hasBaseType(checkClass, getDeclaringClass(p)) : false; }) ? undefined : checkClass;
+        }
+        // Return true if the given type is deeply nested. We consider this to be the case when structural type comparisons
+        // for 5 or more occurrences or instantiations of the type have been recorded on the given stack. It is possible,
+        // though highly unlikely, for this test to be true in a situation where a chain of instantiations is not infinitely
+        // expanding. Effectively, we will generate a false positive when two types are structurally equal to at least 5
+        // levels, but unequal at some level beyond that.
+        function isDeeplyNestedType(type, stack, depth) {
+            // We track all object types that have an associated symbol (representing the origin of the type)
+            if (depth >= 5 && type.flags & 524288 /* Object */) {
+                var symbol = type.symbol;
+                if (symbol) {
+                    var count = 0;
+                    for (var i = 0; i < depth; i++) {
+                        var t = stack[i];
+                        if (t.flags & 524288 /* Object */ && t.symbol === symbol) {
+                            count++;
+                            if (count >= 5)
+                                return true;
+                        }
+                    }
+                }
+            }
+            return false;
+        }
+        function isPropertyIdenticalTo(sourceProp, targetProp) {
+            return compareProperties(sourceProp, targetProp, compareTypesIdentical) !== 0 /* False */;
+        }
+        function compareProperties(sourceProp, targetProp, compareTypes) {
+            // Two members are considered identical when
+            // - they are public properties with identical names, optionality, and types,
+            // - they are private or protected properties originating in the same declaration and having identical types
+            if (sourceProp === targetProp) {
+                return -1 /* True */;
+            }
+            var sourcePropAccessibility = ts.getDeclarationModifierFlagsFromSymbol(sourceProp) & 24 /* NonPublicAccessibilityModifier */;
+            var targetPropAccessibility = ts.getDeclarationModifierFlagsFromSymbol(targetProp) & 24 /* NonPublicAccessibilityModifier */;
+            if (sourcePropAccessibility !== targetPropAccessibility) {
+                return 0 /* False */;
+            }
+            if (sourcePropAccessibility) {
+                if (getTargetSymbol(sourceProp) !== getTargetSymbol(targetProp)) {
+                    return 0 /* False */;
+                }
+            }
+            else {
+                if ((sourceProp.flags & 16777216 /* Optional */) !== (targetProp.flags & 16777216 /* Optional */)) {
+                    return 0 /* False */;
+                }
+            }
+            if (isReadonlySymbol(sourceProp) !== isReadonlySymbol(targetProp)) {
+                return 0 /* False */;
+            }
+            return compareTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
+        }
+        function isMatchingSignature(source, target, partialMatch) {
+            var sourceParameterCount = getParameterCount(source);
+            var targetParameterCount = getParameterCount(target);
+            var sourceMinArgumentCount = getMinArgumentCount(source);
+            var targetMinArgumentCount = getMinArgumentCount(target);
+            var sourceHasRestParameter = hasEffectiveRestParameter(source);
+            var targetHasRestParameter = hasEffectiveRestParameter(target);
+            // A source signature matches a target signature if the two signatures have the same number of required,
+            // optional, and rest parameters.
+            if (sourceParameterCount === targetParameterCount &&
+                sourceMinArgumentCount === targetMinArgumentCount &&
+                sourceHasRestParameter === targetHasRestParameter) {
+                return true;
+            }
+            // A source signature partially matches a target signature if the target signature has no fewer required
+            // parameters
+            if (partialMatch && sourceMinArgumentCount <= targetMinArgumentCount) {
+                return true;
+            }
+            return false;
+        }
+        /**
+         * See signatureRelatedTo, compareSignaturesIdentical
+         */
+        function compareSignaturesIdentical(source, target, partialMatch, ignoreThisTypes, ignoreReturnTypes, compareTypes) {
+            // TODO (drosen): De-duplicate code between related functions.
+            if (source === target) {
+                return -1 /* True */;
+            }
+            if (!(isMatchingSignature(source, target, partialMatch))) {
+                return 0 /* False */;
+            }
+            // Check that the two signatures have the same number of type parameters. We might consider
+            // also checking that any type parameter constraints match, but that would require instantiating
+            // the constraints with a common set of type arguments to get relatable entities in places where
+            // type parameters occur in the constraints. The complexity of doing that doesn't seem worthwhile,
+            // particularly as we're comparing erased versions of the signatures below.
+            if (ts.length(source.typeParameters) !== ts.length(target.typeParameters)) {
+                return 0 /* False */;
+            }
+            // Spec 1.0 Section 3.8.3 & 3.8.4:
+            // M and N (the signatures) are instantiated using type Any as the type argument for all type parameters declared by M and N
+            source = getErasedSignature(source);
+            target = getErasedSignature(target);
+            var result = -1 /* True */;
+            if (!ignoreThisTypes) {
+                var sourceThisType = getThisTypeOfSignature(source);
+                if (sourceThisType) {
+                    var targetThisType = getThisTypeOfSignature(target);
+                    if (targetThisType) {
+                        var related = compareTypes(sourceThisType, targetThisType);
+                        if (!related) {
+                            return 0 /* False */;
+                        }
+                        result &= related;
+                    }
+                }
+            }
+            var targetLen = getParameterCount(target);
+            for (var i = 0; i < targetLen; i++) {
+                var s = getTypeAtPosition(source, i);
+                var t = getTypeAtPosition(target, i);
+                var related = compareTypes(t, s);
+                if (!related) {
+                    return 0 /* False */;
+                }
+                result &= related;
+            }
+            if (!ignoreReturnTypes) {
+                var sourceTypePredicate = getTypePredicateOfSignature(source);
+                var targetTypePredicate = getTypePredicateOfSignature(target);
+                result &= sourceTypePredicate !== undefined || targetTypePredicate !== undefined
+                    ? compareTypePredicatesIdentical(sourceTypePredicate, targetTypePredicate, compareTypes)
+                    // If they're both type predicates their return types will both be `boolean`, so no need to compare those.
+                    : compareTypes(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
+            }
+            return result;
+        }
+        function compareTypePredicatesIdentical(source, target, compareTypes) {
+            return source === undefined || target === undefined || !typePredicateKindsMatch(source, target) ? 0 /* False */ : compareTypes(source.type, target.type);
+        }
+        function literalTypesWithSameBaseType(types) {
+            var commonBaseType;
+            for (var _i = 0, types_8 = types; _i < types_8.length; _i++) {
+                var t = types_8[_i];
+                var baseType = getBaseTypeOfLiteralType(t);
+                if (!commonBaseType) {
+                    commonBaseType = baseType;
+                }
+                if (baseType === t || baseType !== commonBaseType) {
+                    return false;
+                }
+            }
+            return true;
+        }
+        // When the candidate types are all literal types with the same base type, return a union
+        // of those literal types. Otherwise, return the leftmost type for which no type to the
+        // right is a supertype.
+        function getSupertypeOrUnion(types) {
+            return literalTypesWithSameBaseType(types) ?
+                getUnionType(types) :
+                ts.reduceLeft(types, function (s, t) { return isTypeSubtypeOf(s, t) ? t : s; });
+        }
+        function getCommonSupertype(types) {
+            if (!strictNullChecks) {
+                return getSupertypeOrUnion(types);
+            }
+            var primaryTypes = ts.filter(types, function (t) { return !(t.flags & 98304 /* Nullable */); });
+            return primaryTypes.length ?
+                getNullableType(getSupertypeOrUnion(primaryTypes), getFalsyFlagsOfTypes(types) & 98304 /* Nullable */) :
+                getUnionType(types, 2 /* Subtype */);
+        }
+        // Return the leftmost type for which no type to the right is a subtype.
+        function getCommonSubtype(types) {
+            return ts.reduceLeft(types, function (s, t) { return isTypeSubtypeOf(t, s) ? t : s; });
+        }
+        function isArrayType(type) {
+            return !!(ts.getObjectFlags(type) & 4 /* Reference */) && type.target === globalArrayType;
+        }
+        function isReadonlyArrayType(type) {
+            return !!(ts.getObjectFlags(type) & 4 /* Reference */) && type.target === globalReadonlyArrayType;
+        }
+        function getElementTypeOfArrayType(type) {
+            return isArrayType(type) && type.typeArguments ? type.typeArguments[0] : undefined;
+        }
+        function isArrayLikeType(type) {
+            // A type is array-like if it is a reference to the global Array or global ReadonlyArray type,
+            // or if it is not the undefined or null type and if it is assignable to ReadonlyArray<any>
+            return ts.getObjectFlags(type) & 4 /* Reference */ && (type.target === globalArrayType || type.target === globalReadonlyArrayType) ||
+                !(type.flags & 98304 /* Nullable */) && isTypeAssignableTo(type, anyReadonlyArrayType);
+        }
+        function isEmptyArrayLiteralType(type) {
+            var elementType = isArrayType(type) ? type.typeArguments[0] : undefined;
+            return elementType === undefinedWideningType || elementType === implicitNeverType;
+        }
+        function isTupleLikeType(type) {
+            return isTupleType(type) || !!getPropertyOfType(type, "0");
+        }
+        function isArrayOrTupleLikeType(type) {
+            return isArrayLikeType(type) || isTupleLikeType(type);
+        }
+        function getTupleElementType(type, index) {
+            var propType = getTypeOfPropertyOfType(type, "" + index);
+            if (propType) {
+                return propType;
+            }
+            if (everyType(type, isTupleType) && !everyType(type, function (t) { return !t.target.hasRestElement; })) {
+                return mapType(type, function (t) { return getRestTypeOfTupleType(t) || undefinedType; });
+            }
+            return undefined;
+        }
+        function isNeitherUnitTypeNorNever(type) {
+            return !(type.flags & (109440 /* Unit */ | 131072 /* Never */));
+        }
+        function isUnitType(type) {
+            return !!(type.flags & 109440 /* Unit */);
+        }
+        function isLiteralType(type) {
+            return type.flags & 16 /* Boolean */ ? true :
+                type.flags & 1048576 /* Union */ ? type.flags & 1024 /* EnumLiteral */ ? true : ts.every(type.types, isUnitType) :
+                    isUnitType(type);
+        }
+        function getBaseTypeOfLiteralType(type) {
+            return type.flags & 1024 /* EnumLiteral */ ? getBaseTypeOfEnumLiteralType(type) :
+                type.flags & 128 /* StringLiteral */ ? stringType :
+                    type.flags & 256 /* NumberLiteral */ ? numberType :
+                        type.flags & 2048 /* BigIntLiteral */ ? bigintType :
+                            type.flags & 512 /* BooleanLiteral */ ? booleanType :
+                                type.flags & 1048576 /* Union */ ? getUnionType(ts.sameMap(type.types, getBaseTypeOfLiteralType)) :
+                                    type;
+        }
+        function getWidenedLiteralType(type) {
+            return type.flags & 1024 /* EnumLiteral */ && isFreshLiteralType(type) ? getBaseTypeOfEnumLiteralType(type) :
+                type.flags & 128 /* StringLiteral */ && isFreshLiteralType(type) ? stringType :
+                    type.flags & 256 /* NumberLiteral */ && isFreshLiteralType(type) ? numberType :
+                        type.flags & 2048 /* BigIntLiteral */ && isFreshLiteralType(type) ? bigintType :
+                            type.flags & 512 /* BooleanLiteral */ && isFreshLiteralType(type) ? booleanType :
+                                type.flags & 1048576 /* Union */ ? getUnionType(ts.sameMap(type.types, getWidenedLiteralType)) :
+                                    type;
+        }
+        function getWidenedUniqueESSymbolType(type) {
+            return type.flags & 8192 /* UniqueESSymbol */ ? esSymbolType :
+                type.flags & 1048576 /* Union */ ? getUnionType(ts.sameMap(type.types, getWidenedUniqueESSymbolType)) :
+                    type;
+        }
+        function getWidenedLiteralLikeTypeForContextualType(type, contextualType) {
+            if (!isLiteralOfContextualType(type, contextualType)) {
+                type = getWidenedUniqueESSymbolType(getWidenedLiteralType(type));
+            }
+            return type;
+        }
+        /**
+         * Check if a Type was written as a tuple type literal.
+         * Prefer using isTupleLikeType() unless the use of `elementTypes` is required.
+         */
+        function isTupleType(type) {
+            return !!(ts.getObjectFlags(type) & 4 /* Reference */ && type.target.objectFlags & 8 /* Tuple */);
+        }
+        function getRestTypeOfTupleType(type) {
+            return type.target.hasRestElement ? type.typeArguments[type.target.typeParameters.length - 1] : undefined;
+        }
+        function getRestArrayTypeOfTupleType(type) {
+            var restType = getRestTypeOfTupleType(type);
+            return restType && createArrayType(restType);
+        }
+        function getLengthOfTupleType(type) {
+            return getTypeReferenceArity(type) - (type.target.hasRestElement ? 1 : 0);
+        }
+        function isZeroBigInt(_a) {
+            var value = _a.value;
+            return value.base10Value === "0";
+        }
+        function getFalsyFlagsOfTypes(types) {
+            var result = 0;
+            for (var _i = 0, types_9 = types; _i < types_9.length; _i++) {
+                var t = types_9[_i];
+                result |= getFalsyFlags(t);
+            }
+            return result;
+        }
+        // Returns the String, Number, Boolean, StringLiteral, NumberLiteral, BooleanLiteral, Void, Undefined, or Null
+        // flags for the string, number, boolean, "", 0, false, void, undefined, or null types respectively. Returns
+        // no flags for all other types (including non-falsy literal types).
+        function getFalsyFlags(type) {
+            return type.flags & 1048576 /* Union */ ? getFalsyFlagsOfTypes(type.types) :
+                type.flags & 128 /* StringLiteral */ ? type.value === "" ? 128 /* StringLiteral */ : 0 :
+                    type.flags & 256 /* NumberLiteral */ ? type.value === 0 ? 256 /* NumberLiteral */ : 0 :
+                        type.flags & 2048 /* BigIntLiteral */ ? isZeroBigInt(type) ? 2048 /* BigIntLiteral */ : 0 :
+                            type.flags & 512 /* BooleanLiteral */ ? (type === falseType || type === regularFalseType) ? 512 /* BooleanLiteral */ : 0 :
+                                type.flags & 117724 /* PossiblyFalsy */;
+        }
+        function removeDefinitelyFalsyTypes(type) {
+            return getFalsyFlags(type) & 117632 /* DefinitelyFalsy */ ?
+                filterType(type, function (t) { return !(getFalsyFlags(t) & 117632 /* DefinitelyFalsy */); }) :
+                type;
+        }
+        function extractDefinitelyFalsyTypes(type) {
+            return mapType(type, getDefinitelyFalsyPartOfType);
+        }
+        function getDefinitelyFalsyPartOfType(type) {
+            return type.flags & 4 /* String */ ? emptyStringType :
+                type.flags & 8 /* Number */ ? zeroType :
+                    type.flags & 64 /* BigInt */ ? zeroBigIntType :
+                        type === regularFalseType ||
+                            type === falseType ||
+                            type.flags & (16384 /* Void */ | 32768 /* Undefined */ | 65536 /* Null */) ||
+                            type.flags & 128 /* StringLiteral */ && type.value === "" ||
+                            type.flags & 256 /* NumberLiteral */ && type.value === 0 ||
+                            type.flags & 2048 /* BigIntLiteral */ && isZeroBigInt(type) ? type :
+                            neverType;
+        }
+        /**
+         * Add undefined or null or both to a type if they are missing.
+         * @param type - type to add undefined and/or null to if not present
+         * @param flags - Either TypeFlags.Undefined or TypeFlags.Null, or both
+         */
+        function getNullableType(type, flags) {
+            var missing = (flags & ~type.flags) & (32768 /* Undefined */ | 65536 /* Null */);
+            return missing === 0 ? type :
+                missing === 32768 /* Undefined */ ? getUnionType([type, undefinedType]) :
+                    missing === 65536 /* Null */ ? getUnionType([type, nullType]) :
+                        getUnionType([type, undefinedType, nullType]);
+        }
+        function getOptionalType(type) {
+            ts.Debug.assert(strictNullChecks);
+            return type.flags & 32768 /* Undefined */ ? type : getUnionType([type, undefinedType]);
+        }
+        function getGlobalNonNullableTypeInstantiation(type) {
+            if (!deferredGlobalNonNullableTypeAlias) {
+                deferredGlobalNonNullableTypeAlias = getGlobalSymbol("NonNullable", 524288 /* TypeAlias */, /*diagnostic*/ undefined) || unknownSymbol;
+            }
+            // Use NonNullable global type alias if available to improve quick info/declaration emit
+            if (deferredGlobalNonNullableTypeAlias !== unknownSymbol) {
+                return getTypeAliasInstantiation(deferredGlobalNonNullableTypeAlias, [type]);
+            }
+            return getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */); // Type alias unavailable, fall back to non-higher-order behavior
+        }
+        function getNonNullableType(type) {
+            return strictNullChecks ? getGlobalNonNullableTypeInstantiation(type) : type;
+        }
+        /**
+         * Return true if type was inferred from an object literal, written as an object type literal, or is the shape of a module
+         * with no call or construct signatures.
+         */
+        function isObjectTypeWithInferableIndex(type) {
+            return type.symbol && (type.symbol.flags & (4096 /* ObjectLiteral */ | 2048 /* TypeLiteral */ | 512 /* ValueModule */)) !== 0 &&
+                !typeHasCallOrConstructSignatures(type);
+        }
+        function createSymbolWithType(source, type) {
+            var symbol = createSymbol(source.flags, source.escapedName);
+            symbol.declarations = source.declarations;
+            symbol.parent = source.parent;
+            symbol.type = type;
+            symbol.target = source;
+            if (source.valueDeclaration) {
+                symbol.valueDeclaration = source.valueDeclaration;
+            }
+            if (source.nameType) {
+                symbol.nameType = source.nameType;
+            }
+            return symbol;
+        }
+        function transformTypeOfMembers(type, f) {
+            var members = ts.createSymbolTable();
+            for (var _i = 0, _a = getPropertiesOfObjectType(type); _i < _a.length; _i++) {
+                var property = _a[_i];
+                var original = getTypeOfSymbol(property);
+                var updated = f(original);
+                members.set(property.escapedName, updated === original ? property : createSymbolWithType(property, updated));
+            }
+            return members;
+        }
+        /**
+         * If the the provided object literal is subject to the excess properties check,
+         * create a new that is exempt. Recursively mark object literal members as exempt.
+         * Leave signatures alone since they are not subject to the check.
+         */
+        function getRegularTypeOfObjectLiteral(type) {
+            if (!(isObjectLiteralType(type) && ts.getObjectFlags(type) & 32768 /* FreshLiteral */)) {
+                return type;
+            }
+            var regularType = type.regularType;
+            if (regularType) {
+                return regularType;
+            }
+            var resolved = type;
+            var members = transformTypeOfMembers(type, getRegularTypeOfObjectLiteral);
+            var regularNew = createAnonymousType(resolved.symbol, members, resolved.callSignatures, resolved.constructSignatures, resolved.stringIndexInfo, resolved.numberIndexInfo);
+            regularNew.flags = resolved.flags;
+            regularNew.objectFlags |= 128 /* ObjectLiteral */ | (ts.getObjectFlags(resolved) & 16384 /* JSLiteral */);
+            type.regularType = regularNew;
+            return regularNew;
+        }
+        function createWideningContext(parent, propertyName, siblings) {
+            return { parent: parent, propertyName: propertyName, siblings: siblings, resolvedProperties: undefined };
+        }
+        function getSiblingsOfContext(context) {
+            if (!context.siblings) {
+                var siblings_1 = [];
+                for (var _i = 0, _a = getSiblingsOfContext(context.parent); _i < _a.length; _i++) {
+                    var type = _a[_i];
+                    if (isObjectLiteralType(type)) {
+                        var prop = getPropertyOfObjectType(type, context.propertyName);
+                        if (prop) {
+                            forEachType(getTypeOfSymbol(prop), function (t) {
+                                siblings_1.push(t);
+                            });
+                        }
+                    }
+                }
+                context.siblings = siblings_1;
+            }
+            return context.siblings;
+        }
+        function getPropertiesOfContext(context) {
+            if (!context.resolvedProperties) {
+                var names = ts.createMap();
+                for (var _i = 0, _a = getSiblingsOfContext(context); _i < _a.length; _i++) {
+                    var t = _a[_i];
+                    if (isObjectLiteralType(t) && !(ts.getObjectFlags(t) & 1024 /* ContainsSpread */)) {
+                        for (var _b = 0, _c = getPropertiesOfType(t); _b < _c.length; _b++) {
+                            var prop = _c[_b];
+                            names.set(prop.escapedName, prop);
+                        }
+                    }
+                }
+                context.resolvedProperties = ts.arrayFrom(names.values());
+            }
+            return context.resolvedProperties;
+        }
+        function getWidenedProperty(prop, context) {
+            if (!(prop.flags & 4 /* Property */)) {
+                // Since get accessors already widen their return value there is no need to
+                // widen accessor based properties here.
+                return prop;
+            }
+            var original = getTypeOfSymbol(prop);
+            var propContext = context && createWideningContext(context, prop.escapedName, /*siblings*/ undefined);
+            var widened = getWidenedTypeWithContext(original, propContext);
+            return widened === original ? prop : createSymbolWithType(prop, widened);
+        }
+        function getUndefinedProperty(prop) {
+            var cached = undefinedProperties.get(prop.escapedName);
+            if (cached) {
+                return cached;
+            }
+            var result = createSymbolWithType(prop, undefinedType);
+            result.flags |= 16777216 /* Optional */;
+            undefinedProperties.set(prop.escapedName, result);
+            return result;
+        }
+        function getWidenedTypeOfObjectLiteral(type, context) {
+            var members = ts.createSymbolTable();
+            for (var _i = 0, _a = getPropertiesOfObjectType(type); _i < _a.length; _i++) {
+                var prop = _a[_i];
+                members.set(prop.escapedName, getWidenedProperty(prop, context));
+            }
+            if (context) {
+                for (var _b = 0, _c = getPropertiesOfContext(context); _b < _c.length; _b++) {
+                    var prop = _c[_b];
+                    if (!members.has(prop.escapedName)) {
+                        members.set(prop.escapedName, getUndefinedProperty(prop));
+                    }
+                }
+            }
+            var stringIndexInfo = getIndexInfoOfType(type, 0 /* String */);
+            var numberIndexInfo = getIndexInfoOfType(type, 1 /* Number */);
+            var result = createAnonymousType(type.symbol, members, ts.emptyArray, ts.emptyArray, stringIndexInfo && createIndexInfo(getWidenedType(stringIndexInfo.type), stringIndexInfo.isReadonly), numberIndexInfo && createIndexInfo(getWidenedType(numberIndexInfo.type), numberIndexInfo.isReadonly));
+            result.objectFlags |= (ts.getObjectFlags(type) & 16384 /* JSLiteral */); // Retain js literal flag through widening
+            return result;
+        }
+        function getWidenedType(type) {
+            return getWidenedTypeWithContext(type, /*context*/ undefined);
+        }
+        function getWidenedTypeWithContext(type, context) {
+            if (type.flags & 402653184 /* RequiresWidening */) {
+                if (type.flags & 98304 /* Nullable */) {
+                    return anyType;
+                }
+                if (isObjectLiteralType(type)) {
+                    return getWidenedTypeOfObjectLiteral(type, context);
+                }
+                if (type.flags & 1048576 /* Union */) {
+                    var unionContext_1 = context || createWideningContext(/*parent*/ undefined, /*propertyName*/ undefined, type.types);
+                    var widenedTypes = ts.sameMap(type.types, function (t) { return t.flags & 98304 /* Nullable */ ? t : getWidenedTypeWithContext(t, unionContext_1); });
+                    // Widening an empty object literal transitions from a highly restrictive type to
+                    // a highly inclusive one. For that reason we perform subtype reduction here if the
+                    // union includes empty object types (e.g. reducing {} | string to just {}).
+                    return getUnionType(widenedTypes, ts.some(widenedTypes, isEmptyObjectType) ? 2 /* Subtype */ : 1 /* Literal */);
+                }
+                if (type.flags & 2097152 /* Intersection */) {
+                    return getIntersectionType(ts.sameMap(type.types, getWidenedType));
+                }
+                if (isArrayType(type) || isTupleType(type)) {
+                    return createTypeReference(type.target, ts.sameMap(type.typeArguments, getWidenedType));
+                }
+            }
+            return type;
+        }
+        /**
+         * Reports implicit any errors that occur as a result of widening 'null' and 'undefined'
+         * to 'any'. A call to reportWideningErrorsInType is normally accompanied by a call to
+         * getWidenedType. But in some cases getWidenedType is called without reporting errors
+         * (type argument inference is an example).
+         *
+         * The return value indicates whether an error was in fact reported. The particular circumstances
+         * are on a best effort basis. Currently, if the null or undefined that causes widening is inside
+         * an object literal property (arbitrarily deeply), this function reports an error. If no error is
+         * reported, reportImplicitAnyError is a suitable fallback to report a general error.
+         */
+        function reportWideningErrorsInType(type) {
+            var errorReported = false;
+            if (type.flags & 134217728 /* ContainsWideningType */) {
+                if (type.flags & 1048576 /* Union */) {
+                    if (ts.some(type.types, isEmptyObjectType)) {
+                        errorReported = true;
+                    }
+                    else {
+                        for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                            var t = _a[_i];
+                            if (reportWideningErrorsInType(t)) {
+                                errorReported = true;
+                            }
+                        }
+                    }
+                }
+                if (isArrayType(type) || isTupleType(type)) {
+                    for (var _b = 0, _c = type.typeArguments; _b < _c.length; _b++) {
+                        var t = _c[_b];
+                        if (reportWideningErrorsInType(t)) {
+                            errorReported = true;
+                        }
+                    }
+                }
+                if (isObjectLiteralType(type)) {
+                    for (var _d = 0, _e = getPropertiesOfObjectType(type); _d < _e.length; _d++) {
+                        var p = _e[_d];
+                        var t = getTypeOfSymbol(p);
+                        if (t.flags & 134217728 /* ContainsWideningType */) {
+                            if (!reportWideningErrorsInType(t)) {
+                                error(p.valueDeclaration, ts.Diagnostics.Object_literal_s_property_0_implicitly_has_an_1_type, symbolToString(p), typeToString(getWidenedType(t)));
+                            }
+                            errorReported = true;
+                        }
+                    }
+                }
+            }
+            return errorReported;
+        }
+        function reportImplicitAny(declaration, type) {
+            var typeAsString = typeToString(getWidenedType(type));
+            if (ts.isInJSFile(declaration) && !ts.isCheckJsEnabledForFile(ts.getSourceFileOfNode(declaration), compilerOptions)) {
+                // Only report implicit any errors/suggestions in TS and ts-check JS files
+                return;
+            }
+            var diagnostic;
+            switch (declaration.kind) {
+                case 204 /* BinaryExpression */:
+                case 154 /* PropertyDeclaration */:
+                case 153 /* PropertySignature */:
+                    diagnostic = noImplicitAny ? ts.Diagnostics.Member_0_implicitly_has_an_1_type : ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage;
+                    break;
+                case 151 /* Parameter */:
+                    var param = declaration;
+                    if (ts.isIdentifier(param.name) &&
+                        (ts.isCallSignatureDeclaration(param.parent) || ts.isMethodSignature(param.parent) || ts.isFunctionTypeNode(param.parent)) &&
+                        param.parent.parameters.indexOf(param) > -1 &&
+                        (resolveName(param, param.name.escapedText, 67897832 /* Type */, undefined, param.name.escapedText, /*isUse*/ true) ||
+                            param.name.originalKeywordKind && ts.isTypeNodeKind(param.name.originalKeywordKind))) {
+                        var newName = "arg" + param.parent.parameters.indexOf(param);
+                        errorOrSuggestion(noImplicitAny, declaration, ts.Diagnostics.Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1, newName, ts.declarationNameToString(param.name));
+                        return;
+                    }
+                    diagnostic = declaration.dotDotDotToken ?
+                        noImplicitAny ? ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type : ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage :
+                        noImplicitAny ? ts.Diagnostics.Parameter_0_implicitly_has_an_1_type : ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage;
+                    break;
+                case 186 /* BindingElement */:
+                    diagnostic = ts.Diagnostics.Binding_element_0_implicitly_has_an_1_type;
+                    if (!noImplicitAny) {
+                        // Don't issue a suggestion for binding elements since the codefix doesn't yet support them.
+                        return;
+                    }
+                    break;
+                case 289 /* JSDocFunctionType */:
+                    error(declaration, ts.Diagnostics.Function_type_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
+                    return;
+                case 239 /* FunctionDeclaration */:
+                case 156 /* MethodDeclaration */:
+                case 155 /* MethodSignature */:
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                case 196 /* FunctionExpression */:
+                case 197 /* ArrowFunction */:
+                    if (noImplicitAny && !declaration.name) {
+                        error(declaration, ts.Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
+                        return;
+                    }
+                    diagnostic = noImplicitAny ? ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type : ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage;
+                    break;
+                case 181 /* MappedType */:
+                    if (noImplicitAny) {
+                        error(declaration, ts.Diagnostics.Mapped_object_type_implicitly_has_an_any_template_type);
+                    }
+                    return;
+                default:
+                    diagnostic = noImplicitAny ? ts.Diagnostics.Variable_0_implicitly_has_an_1_type : ts.Diagnostics.Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage;
+            }
+            errorOrSuggestion(noImplicitAny, declaration, diagnostic, ts.declarationNameToString(ts.getNameOfDeclaration(declaration)), typeAsString);
+        }
+        function reportErrorsFromWidening(declaration, type) {
+            if (produceDiagnostics && noImplicitAny && type.flags & 134217728 /* ContainsWideningType */) {
+                // Report implicit any error within type if possible, otherwise report error on declaration
+                if (!reportWideningErrorsInType(type)) {
+                    reportImplicitAny(declaration, type);
+                }
+            }
+        }
+        function forEachMatchingParameterType(source, target, callback) {
+            var sourceCount = getParameterCount(source);
+            var targetCount = getParameterCount(target);
+            var sourceRestType = getEffectiveRestType(source);
+            var targetRestType = getEffectiveRestType(target);
+            var targetNonRestCount = targetRestType ? targetCount - 1 : targetCount;
+            var paramCount = sourceRestType ? targetNonRestCount : Math.min(sourceCount, targetNonRestCount);
+            var sourceThisType = getThisTypeOfSignature(source);
+            if (sourceThisType) {
+                var targetThisType = getThisTypeOfSignature(target);
+                if (targetThisType) {
+                    callback(sourceThisType, targetThisType);
+                }
+            }
+            for (var i = 0; i < paramCount; i++) {
+                callback(getTypeAtPosition(source, i), getTypeAtPosition(target, i));
+            }
+            if (targetRestType) {
+                callback(getRestTypeAtPosition(source, paramCount), targetRestType);
+            }
+        }
+        function createInferenceContext(typeParameters, signature, flags, compareTypes, baseInferences) {
+            var inferences = baseInferences ? baseInferences.map(cloneInferenceInfo) : typeParameters.map(createInferenceInfo);
+            var context = mapper;
+            context.typeParameters = typeParameters;
+            context.signature = signature;
+            context.inferences = inferences;
+            context.flags = flags;
+            context.compareTypes = compareTypes || compareTypesAssignable;
+            return context;
+            function mapper(t) {
+                for (var i = 0; i < inferences.length; i++) {
+                    if (t === inferences[i].typeParameter) {
+                        inferences[i].isFixed = true;
+                        return getInferredType(context, i);
+                    }
+                }
+                return t;
+            }
+        }
+        function createInferenceInfo(typeParameter) {
+            return {
+                typeParameter: typeParameter,
+                candidates: undefined,
+                contraCandidates: undefined,
+                inferredType: undefined,
+                priority: undefined,
+                topLevel: true,
+                isFixed: false
+            };
+        }
+        function cloneInferenceInfo(inference) {
+            return {
+                typeParameter: inference.typeParameter,
+                candidates: inference.candidates && inference.candidates.slice(),
+                contraCandidates: inference.contraCandidates && inference.contraCandidates.slice(),
+                inferredType: inference.inferredType,
+                priority: inference.priority,
+                topLevel: inference.topLevel,
+                isFixed: inference.isFixed
+            };
+        }
+        // Return true if the given type could possibly reference a type parameter for which
+        // we perform type inference (i.e. a type parameter of a generic function). We cache
+        // results for union and intersection types for performance reasons.
+        function couldContainTypeVariables(type) {
+            var objectFlags = ts.getObjectFlags(type);
+            return !!(type.flags & 63176704 /* Instantiable */ ||
+                objectFlags & 4 /* Reference */ && ts.forEach(type.typeArguments, couldContainTypeVariables) ||
+                objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 2048 /* TypeLiteral */ | 32 /* Class */) ||
+                objectFlags & 32 /* Mapped */ ||
+                type.flags & 3145728 /* UnionOrIntersection */ && couldUnionOrIntersectionContainTypeVariables(type));
+        }
+        function couldUnionOrIntersectionContainTypeVariables(type) {
+            if (type.couldContainTypeVariables === undefined) {
+                type.couldContainTypeVariables = ts.some(type.types, couldContainTypeVariables);
+            }
+            return type.couldContainTypeVariables;
+        }
+        function isTypeParameterAtTopLevel(type, typeParameter) {
+            return type === typeParameter || !!(type.flags & 3145728 /* UnionOrIntersection */) && ts.some(type.types, function (t) { return isTypeParameterAtTopLevel(t, typeParameter); });
+        }
+        /** Create an object with properties named in the string literal type. Every property has type `any` */
+        function createEmptyObjectTypeFromStringLiteral(type) {
+            var members = ts.createSymbolTable();
+            forEachType(type, function (t) {
+                if (!(t.flags & 128 /* StringLiteral */)) {
+                    return;
+                }
+                var name = ts.escapeLeadingUnderscores(t.value);
+                var literalProp = createSymbol(4 /* Property */, name);
+                literalProp.type = anyType;
+                if (t.symbol) {
+                    literalProp.declarations = t.symbol.declarations;
+                    literalProp.valueDeclaration = t.symbol.valueDeclaration;
+                }
+                members.set(name, literalProp);
+            });
+            var indexInfo = type.flags & 4 /* String */ ? createIndexInfo(emptyObjectType, /*isReadonly*/ false) : undefined;
+            return createAnonymousType(undefined, members, ts.emptyArray, ts.emptyArray, indexInfo, undefined);
+        }
+        /**
+         * Infer a suitable input type for a homomorphic mapped type { [P in keyof T]: X }. We construct
+         * an object type with the same set of properties as the source type, where the type of each
+         * property is computed by inferring from the source property type to X for the type
+         * variable T[P] (i.e. we treat the type T[P] as the type variable we're inferring for).
+         */
+        function inferTypeForHomomorphicMappedType(source, target, constraint) {
+            var key = source.id + "," + target.id + "," + constraint.id;
+            if (reverseMappedCache.has(key)) {
+                return reverseMappedCache.get(key);
+            }
+            reverseMappedCache.set(key, undefined);
+            var type = createReverseMappedType(source, target, constraint);
+            reverseMappedCache.set(key, type);
+            return type;
+        }
+        function createReverseMappedType(source, target, constraint) {
+            var properties = getPropertiesOfType(source);
+            if (properties.length === 0 && !getIndexInfoOfType(source, 0 /* String */)) {
+                return undefined;
+            }
+            // If any property contains context sensitive functions that have been skipped, the source type
+            // is incomplete and we can't infer a meaningful input type.
+            for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
+                var prop = properties_3[_i];
+                if (getTypeOfSymbol(prop).flags & 536870912 /* ContainsAnyFunctionType */) {
+                    return undefined;
+                }
+            }
+            // For arrays and tuples we infer new arrays and tuples where the reverse mapping has been
+            // applied to the element type(s).
+            if (isArrayType(source)) {
+                return createArrayType(inferReverseMappedType(source.typeArguments[0], target, constraint));
+            }
+            if (isReadonlyArrayType(source)) {
+                return createReadonlyArrayType(inferReverseMappedType(source.typeArguments[0], target, constraint));
+            }
+            if (isTupleType(source)) {
+                var elementTypes = ts.map(source.typeArguments || ts.emptyArray, function (t) { return inferReverseMappedType(t, target, constraint); });
+                var minLength = getMappedTypeModifiers(target) & 4 /* IncludeOptional */ ?
+                    getTypeReferenceArity(source) - (source.target.hasRestElement ? 1 : 0) : source.target.minLength;
+                return createTupleType(elementTypes, minLength, source.target.hasRestElement, source.target.associatedNames);
+            }
+            // For all other object types we infer a new object type where the reverse mapping has been
+            // applied to the type of each property.
+            var reversed = createObjectType(2048 /* ReverseMapped */ | 16 /* Anonymous */, /*symbol*/ undefined);
+            reversed.source = source;
+            reversed.mappedType = target;
+            reversed.constraintType = constraint;
+            return reversed;
+        }
+        function getTypeOfReverseMappedSymbol(symbol) {
+            return inferReverseMappedType(symbol.propertyType, symbol.mappedType, symbol.constraintType);
+        }
+        function inferReverseMappedType(sourceType, target, constraint) {
+            var typeParameter = getIndexedAccessType(constraint.type, getTypeParameterFromMappedType(target));
+            var templateType = getTemplateTypeFromMappedType(target);
+            var inference = createInferenceInfo(typeParameter);
+            inferTypes([inference], sourceType, templateType);
+            return getTypeFromInference(inference);
+        }
+        function getUnmatchedProperties(source, target, requireOptionalProperties, matchDiscriminantProperties) {
+            var properties, _i, properties_4, targetProp, sourceProp, targetType, sourceType;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        properties = target.flags & 2097152 /* Intersection */ ? getPropertiesOfUnionOrIntersectionType(target) : getPropertiesOfObjectType(target);
+                        _i = 0, properties_4 = properties;
+                        _a.label = 1;
+                    case 1:
+                        if (!(_i < properties_4.length)) return [3 /*break*/, 6];
+                        targetProp = properties_4[_i];
+                        if (!(requireOptionalProperties || !(targetProp.flags & 16777216 /* Optional */))) return [3 /*break*/, 5];
+                        sourceProp = getPropertyOfType(source, targetProp.escapedName);
+                        if (!!sourceProp) return [3 /*break*/, 3];
+                        return [4 /*yield*/, targetProp];
+                    case 2:
+                        _a.sent();
+                        return [3 /*break*/, 5];
+                    case 3:
+                        if (!matchDiscriminantProperties) return [3 /*break*/, 5];
+                        targetType = getTypeOfSymbol(targetProp);
+                        if (!(targetType.flags & 109440 /* Unit */)) return [3 /*break*/, 5];
+                        sourceType = getTypeOfSymbol(sourceProp);
+                        if (!!(sourceType.flags & 1 /* Any */ || getRegularTypeOfLiteralType(sourceType) === getRegularTypeOfLiteralType(targetType))) return [3 /*break*/, 5];
+                        return [4 /*yield*/, targetProp];
+                    case 4:
+                        _a.sent();
+                        _a.label = 5;
+                    case 5:
+                        _i++;
+                        return [3 /*break*/, 1];
+                    case 6: return [2 /*return*/];
+                }
+            });
+        }
+        function getUnmatchedProperty(source, target, requireOptionalProperties, matchDiscriminantProperties) {
+            return getUnmatchedProperties(source, target, requireOptionalProperties, matchDiscriminantProperties).next().value;
+        }
+        function tupleTypesDefinitelyUnrelated(source, target) {
+            return target.target.minLength > source.target.minLength ||
+                !getRestTypeOfTupleType(target) && (!!getRestTypeOfTupleType(source) || getLengthOfTupleType(target) < getLengthOfTupleType(source));
+        }
+        function typesDefinitelyUnrelated(source, target) {
+            // Two tuple types with incompatible arities are definitely unrelated.
+            // Two object types that each have a property that is unmatched in the other are definitely unrelated.
+            return isTupleType(source) && isTupleType(target) && tupleTypesDefinitelyUnrelated(source, target) ||
+                !!getUnmatchedProperty(source, target, /*requireOptionalProperties*/ false, /*matchDiscriminantProperties*/ true) &&
+                    !!getUnmatchedProperty(target, source, /*requireOptionalProperties*/ false, /*matchDiscriminantProperties*/ true);
+        }
+        function getTypeFromInference(inference) {
+            return inference.candidates ? getUnionType(inference.candidates, 2 /* Subtype */) :
+                inference.contraCandidates ? getIntersectionType(inference.contraCandidates) :
+                    emptyObjectType;
+        }
+        function inferTypes(inferences, originalSource, originalTarget, priority) {
+            if (priority === void 0) { priority = 0; }
+            var symbolStack;
+            var visited;
+            var contravariant = false;
+            var bivariant = false;
+            var propagationType;
+            var allowComplexConstraintInference = true;
+            inferFromTypes(originalSource, originalTarget);
+            function inferFromTypes(source, target) {
+                if (!couldContainTypeVariables(target)) {
+                    return;
+                }
+                if (source === wildcardType) {
+                    // We are inferring from an 'any' type. We want to infer this type for every type parameter
+                    // referenced in the target type, so we record it as the propagation type and infer from the
+                    // target to itself. Then, as we find candidates we substitute the propagation type.
+                    var savePropagationType = propagationType;
+                    propagationType = source;
+                    inferFromTypes(target, target);
+                    propagationType = savePropagationType;
+                    return;
+                }
+                if (source.aliasSymbol && source.aliasTypeArguments && source.aliasSymbol === target.aliasSymbol) {
+                    // Source and target are types originating in the same generic type alias declaration.
+                    // Simply infer from source type arguments to target type arguments.
+                    var sourceTypes = source.aliasTypeArguments;
+                    var targetTypes = target.aliasTypeArguments;
+                    for (var i = 0; i < sourceTypes.length; i++) {
+                        inferFromTypes(sourceTypes[i], targetTypes[i]);
+                    }
+                    return;
+                }
+                if (source.flags & 1048576 /* Union */ && target.flags & 1048576 /* Union */ && !(source.flags & 1024 /* EnumLiteral */ && target.flags & 1024 /* EnumLiteral */) ||
+                    source.flags & 2097152 /* Intersection */ && target.flags & 2097152 /* Intersection */) {
+                    // Source and target are both unions or both intersections. If source and target
+                    // are the same type, just relate each constituent type to itself.
+                    if (source === target) {
+                        for (var _i = 0, _a = source.types; _i < _a.length; _i++) {
+                            var t = _a[_i];
+                            inferFromTypes(t, t);
+                        }
+                        return;
+                    }
+                    // Find each source constituent type that has an identically matching target constituent
+                    // type, and for each such type infer from the type to itself. When inferring from a
+                    // type to itself we effectively find all type parameter occurrences within that type
+                    // and infer themselves as their type arguments. We have special handling for numeric
+                    // and string literals because the number and string types are not represented as unions
+                    // of all their possible values.
+                    var matchingTypes = void 0;
+                    for (var _b = 0, _c = source.types; _b < _c.length; _b++) {
+                        var t = _c[_b];
+                        if (typeIdenticalToSomeType(t, target.types)) {
+                            (matchingTypes || (matchingTypes = [])).push(t);
+                            inferFromTypes(t, t);
+                        }
+                        else if (t.flags & (256 /* NumberLiteral */ | 128 /* StringLiteral */)) {
+                            var b = getBaseTypeOfLiteralType(t);
+                            if (typeIdenticalToSomeType(b, target.types)) {
+                                (matchingTypes || (matchingTypes = [])).push(t, b);
+                            }
+                        }
+                    }
+                    // Next, to improve the quality of inferences, reduce the source and target types by
+                    // removing the identically matched constituents. For example, when inferring from
+                    // 'string | string[]' to 'string | T' we reduce the types to 'string[]' and 'T'.
+                    if (matchingTypes) {
+                        source = removeTypesFromUnionOrIntersection(source, matchingTypes);
+                        target = removeTypesFromUnionOrIntersection(target, matchingTypes);
+                    }
+                }
+                if (target.flags & 8650752 /* TypeVariable */) {
+                    // If target is a type parameter, make an inference, unless the source type contains
+                    // the anyFunctionType (the wildcard type that's used to avoid contextually typing functions).
+                    // Because the anyFunctionType is internal, it should not be exposed to the user by adding
+                    // it as an inference candidate. Hopefully, a better candidate will come along that does
+                    // not contain anyFunctionType when we come back to this argument for its second round
+                    // of inference. Also, we exclude inferences for silentNeverType (which is used as a wildcard
+                    // when constructing types from type parameters that had no inference candidates).
+                    if (source.flags & 536870912 /* ContainsAnyFunctionType */ || source === silentNeverType || (priority & 8 /* ReturnType */ && (source === autoType || source === autoArrayType))) {
+                        return;
+                    }
+                    var inference = getInferenceInfoForType(target);
+                    if (inference) {
+                        if (!inference.isFixed) {
+                            if (inference.priority === undefined || priority < inference.priority) {
+                                inference.candidates = undefined;
+                                inference.contraCandidates = undefined;
+                                inference.priority = priority;
+                            }
+                            if (priority === inference.priority) {
+                                var candidate = propagationType || source;
+                                // We make contravariant inferences only if we are in a pure contravariant position,
+                                // i.e. only if we have not descended into a bivariant position.
+                                if (contravariant && !bivariant) {
+                                    inference.contraCandidates = ts.appendIfUnique(inference.contraCandidates, candidate);
+                                }
+                                else {
+                                    inference.candidates = ts.appendIfUnique(inference.candidates, candidate);
+                                }
+                            }
+                            if (!(priority & 8 /* ReturnType */) && target.flags & 262144 /* TypeParameter */ && !isTypeParameterAtTopLevel(originalTarget, target)) {
+                                inference.topLevel = false;
+                            }
+                        }
+                        return;
+                    }
+                    else {
+                        // Infer to the simplified version of an indexed access, if possible, to (hopefully) expose more bare type parameters to the inference engine
+                        var simplified = getSimplifiedType(target);
+                        if (simplified !== target) {
+                            inferFromTypesOnce(source, simplified);
+                        }
+                        else if (target.flags & 8388608 /* IndexedAccess */) {
+                            var indexType = getSimplifiedType(target.indexType);
+                            // Generally simplifications of instantiable indexes are avoided to keep relationship checking correct, however if our target is an access, we can consider
+                            // that key of that access to be "instantiated", since we're looking to find the infernce goal in any way we can.
+                            if (indexType.flags & 63176704 /* Instantiable */) {
+                                var simplified_1 = distributeIndexOverObjectType(getSimplifiedType(target.objectType), indexType);
+                                if (simplified_1 && simplified_1 !== target) {
+                                    inferFromTypesOnce(source, simplified_1);
+                                }
+                            }
+                        }
+                    }
+                }
+                if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && source.target === target.target) {
+                    // If source and target are references to the same generic type, infer from type arguments
+                    var sourceTypes = source.typeArguments || ts.emptyArray;
+                    var targetTypes = target.typeArguments || ts.emptyArray;
+                    var count = sourceTypes.length < targetTypes.length ? sourceTypes.length : targetTypes.length;
+                    var variances = getVariances(source.target);
+                    for (var i = 0; i < count; i++) {
+                        if (i < variances.length && variances[i] === 2 /* Contravariant */) {
+                            inferFromContravariantTypes(sourceTypes[i], targetTypes[i]);
+                        }
+                        else {
+                            inferFromTypes(sourceTypes[i], targetTypes[i]);
+                        }
+                    }
+                }
+                else if (source.flags & 4194304 /* Index */ && target.flags & 4194304 /* Index */) {
+                    contravariant = !contravariant;
+                    inferFromTypes(source.type, target.type);
+                    contravariant = !contravariant;
+                }
+                else if ((isLiteralType(source) || source.flags & 4 /* String */) && target.flags & 4194304 /* Index */) {
+                    var empty = createEmptyObjectTypeFromStringLiteral(source);
+                    contravariant = !contravariant;
+                    var savePriority = priority;
+                    priority |= 16 /* LiteralKeyof */;
+                    inferFromTypes(empty, target.type);
+                    priority = savePriority;
+                    contravariant = !contravariant;
+                }
+                else if (source.flags & 8388608 /* IndexedAccess */ && target.flags & 8388608 /* IndexedAccess */) {
+                    inferFromTypes(source.objectType, target.objectType);
+                    inferFromTypes(source.indexType, target.indexType);
+                }
+                else if (source.flags & 16777216 /* Conditional */ && target.flags & 16777216 /* Conditional */) {
+                    inferFromTypes(source.checkType, target.checkType);
+                    inferFromTypes(source.extendsType, target.extendsType);
+                    inferFromTypes(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target));
+                    inferFromTypes(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target));
+                }
+                else if (target.flags & 16777216 /* Conditional */) {
+                    inferFromTypes(source, getUnionType([getTrueTypeFromConditionalType(target), getFalseTypeFromConditionalType(target)]));
+                }
+                else if (target.flags & 3145728 /* UnionOrIntersection */) {
+                    var targetTypes = target.types;
+                    var typeVariableCount = 0;
+                    var typeVariable = void 0;
+                    // First infer to each type in union or intersection that isn't a type variable
+                    for (var _d = 0, targetTypes_3 = targetTypes; _d < targetTypes_3.length; _d++) {
+                        var t = targetTypes_3[_d];
+                        if (getInferenceInfoForType(t)) {
+                            typeVariable = t;
+                            typeVariableCount++;
+                        }
+                        else {
+                            inferFromTypes(source, t);
+                        }
+                    }
+                    // Next, if target containings a single naked type variable, make a secondary inference to that type
+                    // variable. This gives meaningful results for union types in co-variant positions and intersection
+                    // types in contra-variant positions (such as callback parameters).
+                    if (typeVariableCount === 1) {
+                        var savePriority = priority;
+                        priority |= 1 /* NakedTypeVariable */;
+                        inferFromTypes(source, typeVariable);
+                        priority = savePriority;
+                    }
+                }
+                else if (source.flags & 1048576 /* Union */) {
+                    // Source is a union or intersection type, infer from each constituent type
+                    var sourceTypes = source.types;
+                    for (var _e = 0, sourceTypes_3 = sourceTypes; _e < sourceTypes_3.length; _e++) {
+                        var sourceType = sourceTypes_3[_e];
+                        inferFromTypes(sourceType, target);
+                    }
+                }
+                else {
+                    if (!(priority & 32 /* NoConstraints */ && source.flags & (2097152 /* Intersection */ | 63176704 /* Instantiable */))) {
+                        var apparentSource = getApparentType(source);
+                        // getApparentType can return _any_ type, since an indexed access or conditional may simplify to any other type.
+                        // If that occurs and it doesn't simplify to an object or intersection, we'll need to restart `inferFromTypes`
+                        // with the simplified source.
+                        if (apparentSource !== source && allowComplexConstraintInference && !(apparentSource.flags & (524288 /* Object */ | 2097152 /* Intersection */))) {
+                            // TODO: The `allowComplexConstraintInference` flag is a hack! This forbids inference from complex constraints within constraints!
+                            // This isn't required algorithmically, but rather is used to lower the memory burden caused by performing inference
+                            // that is _too good_ in projects with complicated constraints (eg, fp-ts). In such cases, if we did not limit ourselves
+                            // here, we might produce more valid inferences for types, causing us to do more checks and perform more instantiations
+                            // (in addition to the extra stack depth here) which, in turn, can push the already close process over its limit.
+                            // TL;DR: If we ever become generally more memory efficienct (or our resource budget ever increases), we should just
+                            // remove this `allowComplexConstraintInference` flag.
+                            allowComplexConstraintInference = false;
+                            return inferFromTypes(apparentSource, target);
+                        }
+                        source = apparentSource;
+                    }
+                    if (source.flags & (524288 /* Object */ | 2097152 /* Intersection */)) {
+                        var key = source.id + "," + target.id;
+                        if (visited && visited.get(key)) {
+                            return;
+                        }
+                        (visited || (visited = ts.createMap())).set(key, true);
+                        // If we are already processing another target type with the same associated symbol (such as
+                        // an instantiation of the same generic type), we do not explore this target as it would yield
+                        // no further inferences. We exclude the static side of classes from this check since it shares
+                        // its symbol with the instance side which would lead to false positives.
+                        var isNonConstructorObject = target.flags & 524288 /* Object */ &&
+                            !(ts.getObjectFlags(target) & 16 /* Anonymous */ && target.symbol && target.symbol.flags & 32 /* Class */);
+                        var symbol = isNonConstructorObject ? target.symbol : undefined;
+                        if (symbol) {
+                            if (ts.contains(symbolStack, symbol)) {
+                                return;
+                            }
+                            (symbolStack || (symbolStack = [])).push(symbol);
+                            inferFromObjectTypes(source, target);
+                            symbolStack.pop();
+                        }
+                        else {
+                            inferFromObjectTypes(source, target);
+                        }
+                    }
+                }
+                function inferFromTypesOnce(source, target) {
+                    var key = source.id + "," + target.id;
+                    if (!visited || !visited.get(key)) {
+                        (visited || (visited = ts.createMap())).set(key, true);
+                        inferFromTypes(source, target);
+                    }
+                }
+            }
+            function inferFromContravariantTypes(source, target) {
+                if (strictFunctionTypes || priority & 64 /* AlwaysStrict */) {
+                    contravariant = !contravariant;
+                    inferFromTypes(source, target);
+                    contravariant = !contravariant;
+                }
+                else {
+                    inferFromTypes(source, target);
+                }
+            }
+            function getInferenceInfoForType(type) {
+                if (type.flags & 8650752 /* TypeVariable */) {
+                    for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
+                        var inference = inferences_1[_i];
+                        if (type === inference.typeParameter) {
+                            return inference;
+                        }
+                    }
+                }
+                return undefined;
+            }
+            function inferFromMappedTypeConstraint(source, target, constraintType) {
+                if (constraintType.flags & 1048576 /* Union */) {
+                    var result = false;
+                    for (var _i = 0, _a = constraintType.types; _i < _a.length; _i++) {
+                        var type = _a[_i];
+                        result = inferFromMappedTypeConstraint(source, target, type) || result;
+                    }
+                    return result;
+                }
+                if (constraintType.flags & 4194304 /* Index */) {
+                    // We're inferring from some source type S to a homomorphic mapped type { [P in keyof T]: X },
+                    // where T is a type variable. Use inferTypeForHomomorphicMappedType to infer a suitable source
+                    // type and then make a secondary inference from that type to T. We make a secondary inference
+                    // such that direct inferences to T get priority over inferences to Partial<T>, for example.
+                    var inference = getInferenceInfoForType(constraintType.type);
+                    if (inference && !inference.isFixed) {
+                        var inferredType = inferTypeForHomomorphicMappedType(source, target, constraintType);
+                        if (inferredType) {
+                            var savePriority = priority;
+                            priority |= 2 /* HomomorphicMappedType */;
+                            inferFromTypes(inferredType, inference.typeParameter);
+                            priority = savePriority;
+                        }
+                    }
+                    return true;
+                }
+                if (constraintType.flags & 262144 /* TypeParameter */) {
+                    // We're inferring from some source type S to a mapped type { [P in T]: X }, where T is a type
+                    // parameter. Infer from 'keyof S' to T and infer from a union of each property type in S to X.
+                    var savePriority = priority;
+                    priority |= 4 /* MappedTypeConstraint */;
+                    inferFromTypes(getIndexType(source), constraintType);
+                    priority = savePriority;
+                    var valueTypes = ts.compact([
+                        getIndexTypeOfType(source, 0 /* String */),
+                        getIndexTypeOfType(source, 1 /* Number */)
+                    ].concat(ts.map(getPropertiesOfType(source), getTypeOfSymbol)));
+                    inferFromTypes(getUnionType(valueTypes), getTemplateTypeFromMappedType(target));
+                    return true;
+                }
+                return false;
+            }
+            function inferFromObjectTypes(source, target) {
+                if (isGenericMappedType(source) && isGenericMappedType(target)) {
+                    // The source and target types are generic types { [P in S]: X } and { [P in T]: Y }, so we infer
+                    // from S to T and from X to Y.
+                    inferFromTypes(getConstraintTypeFromMappedType(source), getConstraintTypeFromMappedType(target));
+                    inferFromTypes(getTemplateTypeFromMappedType(source), getTemplateTypeFromMappedType(target));
+                }
+                if (ts.getObjectFlags(target) & 32 /* Mapped */) {
+                    var constraintType = getConstraintTypeFromMappedType(target);
+                    if (inferFromMappedTypeConstraint(source, target, constraintType)) {
+                        return;
+                    }
+                }
+                // Infer from the members of source and target only if the two types are possibly related
+                if (!typesDefinitelyUnrelated(source, target)) {
+                    inferFromProperties(source, target);
+                    inferFromSignatures(source, target, 0 /* Call */);
+                    inferFromSignatures(source, target, 1 /* Construct */);
+                    inferFromIndexTypes(source, target);
+                }
+            }
+            function inferFromProperties(source, target) {
+                if (isTupleType(source)) {
+                    if (isTupleType(target)) {
+                        var sourceLength = getLengthOfTupleType(source);
+                        var targetLength = getLengthOfTupleType(target);
+                        var sourceRestType = getRestTypeOfTupleType(source);
+                        var targetRestType = getRestTypeOfTupleType(target);
+                        var fixedLength = targetLength < sourceLength || sourceRestType ? targetLength : sourceLength;
+                        for (var i = 0; i < fixedLength; i++) {
+                            inferFromTypes(i < sourceLength ? source.typeArguments[i] : sourceRestType, target.typeArguments[i]);
+                        }
+                        if (targetRestType) {
+                            var types = fixedLength < sourceLength ? source.typeArguments.slice(fixedLength, sourceLength) : [];
+                            if (sourceRestType) {
+                                types.push(sourceRestType);
+                            }
+                            if (types.length) {
+                                inferFromTypes(getUnionType(types), targetRestType);
+                            }
+                        }
+                        return;
+                    }
+                    if (isArrayType(target)) {
+                        inferFromIndexTypes(source, target);
+                        return;
+                    }
+                }
+                var properties = getPropertiesOfObjectType(target);
+                for (var _i = 0, properties_5 = properties; _i < properties_5.length; _i++) {
+                    var targetProp = properties_5[_i];
+                    var sourceProp = getPropertyOfType(source, targetProp.escapedName);
+                    if (sourceProp) {
+                        inferFromTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
+                    }
+                }
+            }
+            function inferFromSignatures(source, target, kind) {
+                var sourceSignatures = getSignaturesOfType(source, kind);
+                var targetSignatures = getSignaturesOfType(target, kind);
+                var sourceLen = sourceSignatures.length;
+                var targetLen = targetSignatures.length;
+                var len = sourceLen < targetLen ? sourceLen : targetLen;
+                var skipParameters = !!(source.flags & 536870912 /* ContainsAnyFunctionType */);
+                for (var i = 0; i < len; i++) {
+                    inferFromSignature(getBaseSignature(sourceSignatures[sourceLen - len + i]), getBaseSignature(targetSignatures[targetLen - len + i]), skipParameters);
+                }
+            }
+            function inferFromSignature(source, target, skipParameters) {
+                if (!skipParameters) {
+                    var saveBivariant = bivariant;
+                    var kind = target.declaration ? target.declaration.kind : 0 /* Unknown */;
+                    // Once we descend into a bivariant signature we remain bivariant for all nested inferences
+                    bivariant = bivariant || kind === 156 /* MethodDeclaration */ || kind === 155 /* MethodSignature */ || kind === 157 /* Constructor */;
+                    forEachMatchingParameterType(source, target, inferFromContravariantTypes);
+                    bivariant = saveBivariant;
+                }
+                var sourceTypePredicate = getTypePredicateOfSignature(source);
+                var targetTypePredicate = getTypePredicateOfSignature(target);
+                if (sourceTypePredicate && targetTypePredicate && sourceTypePredicate.kind === targetTypePredicate.kind) {
+                    inferFromTypes(sourceTypePredicate.type, targetTypePredicate.type);
+                }
+                else {
+                    inferFromTypes(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
+                }
+            }
+            function inferFromIndexTypes(source, target) {
+                var targetStringIndexType = getIndexTypeOfType(target, 0 /* String */);
+                if (targetStringIndexType) {
+                    var sourceIndexType = getIndexTypeOfType(source, 0 /* String */) ||
+                        getImplicitIndexTypeOfType(source, 0 /* String */);
+                    if (sourceIndexType) {
+                        inferFromTypes(sourceIndexType, targetStringIndexType);
+                    }
+                }
+                var targetNumberIndexType = getIndexTypeOfType(target, 1 /* Number */);
+                if (targetNumberIndexType) {
+                    var sourceIndexType = getIndexTypeOfType(source, 1 /* Number */) ||
+                        getIndexTypeOfType(source, 0 /* String */) ||
+                        getImplicitIndexTypeOfType(source, 1 /* Number */);
+                    if (sourceIndexType) {
+                        inferFromTypes(sourceIndexType, targetNumberIndexType);
+                    }
+                }
+            }
+        }
+        function typeIdenticalToSomeType(type, types) {
+            for (var _i = 0, types_10 = types; _i < types_10.length; _i++) {
+                var t = types_10[_i];
+                if (isTypeIdenticalTo(t, type)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        /**
+         * Return a new union or intersection type computed by removing a given set of types
+         * from a given union or intersection type.
+         */
+        function removeTypesFromUnionOrIntersection(type, typesToRemove) {
+            var reducedTypes = [];
+            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                var t = _a[_i];
+                if (!typeIdenticalToSomeType(t, typesToRemove)) {
+                    reducedTypes.push(t);
+                }
+            }
+            return type.flags & 1048576 /* Union */ ? getUnionType(reducedTypes) : getIntersectionType(reducedTypes);
+        }
+        function hasPrimitiveConstraint(type) {
+            var constraint = getConstraintOfTypeParameter(type);
+            return !!constraint && maybeTypeOfKind(constraint.flags & 16777216 /* Conditional */ ? getDefaultConstraintOfConditionalType(constraint) : constraint, 131068 /* Primitive */ | 4194304 /* Index */);
+        }
+        function isObjectLiteralType(type) {
+            return !!(ts.getObjectFlags(type) & 128 /* ObjectLiteral */);
+        }
+        function widenObjectLiteralCandidates(candidates) {
+            if (candidates.length > 1) {
+                var objectLiterals = ts.filter(candidates, isObjectLiteralType);
+                if (objectLiterals.length) {
+                    var objectLiteralsType = getWidenedType(getUnionType(objectLiterals, 2 /* Subtype */));
+                    return ts.concatenate(ts.filter(candidates, function (t) { return !isObjectLiteralType(t); }), [objectLiteralsType]);
+                }
+            }
+            return candidates;
+        }
+        function getContravariantInference(inference) {
+            return inference.priority & 28 /* PriorityImpliesCombination */ ? getIntersectionType(inference.contraCandidates) : getCommonSubtype(inference.contraCandidates);
+        }
+        function getCovariantInference(inference, signature) {
+            // Extract all object literal types and replace them with a single widened and normalized type.
+            var candidates = widenObjectLiteralCandidates(inference.candidates);
+            // We widen inferred literal types if
+            // all inferences were made to top-level occurrences of the type parameter, and
+            // the type parameter has no constraint or its constraint includes no primitive or literal types, and
+            // the type parameter was fixed during inference or does not occur at top-level in the return type.
+            var primitiveConstraint = hasPrimitiveConstraint(inference.typeParameter);
+            var widenLiteralTypes = !primitiveConstraint && inference.topLevel &&
+                (inference.isFixed || !isTypeParameterAtTopLevel(getReturnTypeOfSignature(signature), inference.typeParameter));
+            var baseCandidates = primitiveConstraint ? ts.sameMap(candidates, getRegularTypeOfLiteralType) :
+                widenLiteralTypes ? ts.sameMap(candidates, getWidenedLiteralType) :
+                    candidates;
+            // If all inferences were made from a position that implies a combined result, infer a union type.
+            // Otherwise, infer a common supertype.
+            var unwidenedType = inference.priority & 28 /* PriorityImpliesCombination */ ?
+                getUnionType(baseCandidates, 2 /* Subtype */) :
+                getCommonSupertype(baseCandidates);
+            return getWidenedType(unwidenedType);
+        }
+        function getInferredType(context, index) {
+            var inference = context.inferences[index];
+            var inferredType = inference.inferredType;
+            if (!inferredType) {
+                var signature = context.signature;
+                if (signature) {
+                    var inferredCovariantType = inference.candidates ? getCovariantInference(inference, signature) : undefined;
+                    if (inference.contraCandidates) {
+                        var inferredContravariantType = getContravariantInference(inference);
+                        // If we have both co- and contra-variant inferences, we prefer the contra-variant inference
+                        // unless the co-variant inference is a subtype and not 'never'.
+                        inferredType = inferredCovariantType && !(inferredCovariantType.flags & 131072 /* Never */) &&
+                            isTypeSubtypeOf(inferredCovariantType, inferredContravariantType) ?
+                            inferredCovariantType : inferredContravariantType;
+                    }
+                    else if (inferredCovariantType) {
+                        inferredType = inferredCovariantType;
+                    }
+                    else if (context.flags & 1 /* NoDefault */) {
+                        // We use silentNeverType as the wildcard that signals no inferences.
+                        inferredType = silentNeverType;
+                    }
+                    else {
+                        // Infer either the default or the empty object type when no inferences were
+                        // made. It is important to remember that in this case, inference still
+                        // succeeds, meaning there is no error for not having inference candidates. An
+                        // inference error only occurs when there are *conflicting* candidates, i.e.
+                        // candidates with no common supertype.
+                        var defaultType = getDefaultFromTypeParameter(inference.typeParameter);
+                        if (defaultType) {
+                            // Instantiate the default type. Any forward reference to a type
+                            // parameter should be instantiated to the empty object type.
+                            inferredType = instantiateType(defaultType, combineTypeMappers(createBackreferenceMapper(context.signature.typeParameters, index), context));
+                        }
+                        else {
+                            inferredType = getDefaultTypeArgumentType(!!(context.flags & 2 /* AnyDefault */));
+                        }
+                    }
+                }
+                else {
+                    inferredType = getTypeFromInference(inference);
+                }
+                inference.inferredType = inferredType;
+                var constraint = getConstraintOfTypeParameter(inference.typeParameter);
+                if (constraint) {
+                    var instantiatedConstraint = instantiateType(constraint, context);
+                    if (!context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
+                        inference.inferredType = inferredType = instantiatedConstraint;
+                    }
+                }
+            }
+            return inferredType;
+        }
+        function getDefaultTypeArgumentType(isInJavaScriptFile) {
+            return isInJavaScriptFile ? anyType : emptyObjectType;
+        }
+        function getInferredTypes(context) {
+            var result = [];
+            for (var i = 0; i < context.inferences.length; i++) {
+                result.push(getInferredType(context, i));
+            }
+            return result;
+        }
+        // EXPRESSION TYPE CHECKING
+        function getCannotFindNameDiagnosticForName(name) {
+            switch (name) {
+                case "document":
+                case "console":
+                    return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_include_dom;
+                case "$":
+                    return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_and_then_add_jquery_to_the_types_field_in_your_tsconfig;
+                case "describe":
+                case "suite":
+                case "it":
+                case "test":
+                    return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashjest_or_npm_i_types_Slashmocha_and_then_add_jest_or_mocha_to_the_types_field_in_your_tsconfig;
+                case "process":
+                case "require":
+                case "Buffer":
+                case "module":
+                    return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_and_then_add_node_to_the_types_field_in_your_tsconfig;
+                case "Map":
+                case "Set":
+                case "Promise":
+                case "Symbol":
+                case "WeakMap":
+                case "WeakSet":
+                case "Iterator":
+                case "AsyncIterator":
+                    return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_es2015_or_later;
+                default: return ts.Diagnostics.Cannot_find_name_0;
+            }
+        }
+        function getResolvedSymbol(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedSymbol) {
+                links.resolvedSymbol = !ts.nodeIsMissing(node) &&
+                    resolveName(node, node.escapedText, 67220415 /* Value */ | 1048576 /* ExportValue */, getCannotFindNameDiagnosticForName(node.escapedText), node, !ts.isWriteOnlyAccess(node), 
+                    /*excludeGlobals*/ false, ts.Diagnostics.Cannot_find_name_0_Did_you_mean_1) || unknownSymbol;
+            }
+            return links.resolvedSymbol;
+        }
+        function isInTypeQuery(node) {
+            // TypeScript 1.0 spec (April 2014): 3.6.3
+            // A type query consists of the keyword typeof followed by an expression.
+            // The expression is restricted to a single identifier or a sequence of identifiers separated by periods
+            return !!ts.findAncestor(node, function (n) { return n.kind === 167 /* TypeQuery */ ? true : n.kind === 72 /* Identifier */ || n.kind === 148 /* QualifiedName */ ? false : "quit"; });
+        }
+        // Return the flow cache key for a "dotted name" (i.e. a sequence of identifiers
+        // separated by dots). The key consists of the id of the symbol referenced by the
+        // leftmost identifier followed by zero or more property names separated by dots.
+        // The result is undefined if the reference isn't a dotted name. We prefix nodes
+        // occurring in an apparent type position with '@' because the control flow type
+        // of such nodes may be based on the apparent type instead of the declared type.
+        function getFlowCacheKey(node) {
+            switch (node.kind) {
+                case 72 /* Identifier */:
+                    var symbol = getResolvedSymbol(node);
+                    return symbol !== unknownSymbol ? (isConstraintPosition(node) ? "@" : "") + getSymbolId(symbol) : undefined;
+                case 100 /* ThisKeyword */:
+                    return "0";
+                case 213 /* NonNullExpression */:
+                case 195 /* ParenthesizedExpression */:
+                    return getFlowCacheKey(node.expression);
+                case 189 /* PropertyAccessExpression */:
+                case 190 /* ElementAccessExpression */:
+                    var propName = getAccessedPropertyName(node);
+                    if (propName !== undefined) {
+                        var key = getFlowCacheKey(node.expression);
+                        return key && key + "." + propName;
+                    }
+            }
+            return undefined;
+        }
+        function isMatchingReference(source, target) {
+            switch (target.kind) {
+                case 195 /* ParenthesizedExpression */:
+                case 213 /* NonNullExpression */:
+                    return isMatchingReference(source, target.expression);
+            }
+            switch (source.kind) {
+                case 72 /* Identifier */:
+                    return target.kind === 72 /* Identifier */ && getResolvedSymbol(source) === getResolvedSymbol(target) ||
+                        (target.kind === 237 /* VariableDeclaration */ || target.kind === 186 /* BindingElement */) &&
+                            getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(source)) === getSymbolOfNode(target);
+                case 100 /* ThisKeyword */:
+                    return target.kind === 100 /* ThisKeyword */;
+                case 98 /* SuperKeyword */:
+                    return target.kind === 98 /* SuperKeyword */;
+                case 213 /* NonNullExpression */:
+                case 195 /* ParenthesizedExpression */:
+                    return isMatchingReference(source.expression, target);
+                case 189 /* PropertyAccessExpression */:
+                case 190 /* ElementAccessExpression */:
+                    return ts.isAccessExpression(target) &&
+                        getAccessedPropertyName(source) === getAccessedPropertyName(target) &&
+                        isMatchingReference(source.expression, target.expression);
+            }
+            return false;
+        }
+        function getAccessedPropertyName(access) {
+            return access.kind === 189 /* PropertyAccessExpression */ ? access.name.escapedText :
+                ts.isStringLiteral(access.argumentExpression) || ts.isNumericLiteral(access.argumentExpression) ? ts.escapeLeadingUnderscores(access.argumentExpression.text) :
+                    undefined;
+        }
+        function containsMatchingReference(source, target) {
+            while (ts.isAccessExpression(source)) {
+                source = source.expression;
+                if (isMatchingReference(source, target)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        // Return true if target is a property access xxx.yyy, source is a property access xxx.zzz, the declared
+        // type of xxx is a union type, and yyy is a property that is possibly a discriminant. We consider a property
+        // a possible discriminant if its type differs in the constituents of containing union type, and if every
+        // choice is a unit type or a union of unit types.
+        function containsMatchingReferenceDiscriminant(source, target) {
+            var name;
+            return ts.isAccessExpression(target) &&
+                containsMatchingReference(source, target.expression) &&
+                (name = getAccessedPropertyName(target)) !== undefined &&
+                isDiscriminantProperty(getDeclaredTypeOfReference(target.expression), name);
+        }
+        function getDeclaredTypeOfReference(expr) {
+            if (expr.kind === 72 /* Identifier */) {
+                return getTypeOfSymbol(getResolvedSymbol(expr));
+            }
+            if (ts.isAccessExpression(expr)) {
+                var type = getDeclaredTypeOfReference(expr.expression);
+                if (type) {
+                    var propName = getAccessedPropertyName(expr);
+                    return propName !== undefined ? getTypeOfPropertyOfType(type, propName) : undefined;
+                }
+            }
+            return undefined;
+        }
+        function isDiscriminantType(type) {
+            return !!(type.flags & 1048576 /* Union */ &&
+                (type.flags & (16 /* Boolean */ | 1024 /* EnumLiteral */) || !isGenericIndexType(type)));
+        }
+        function isDiscriminantProperty(type, name) {
+            if (type && type.flags & 1048576 /* Union */) {
+                var prop = getUnionOrIntersectionProperty(type, name);
+                if (prop && ts.getCheckFlags(prop) & 2 /* SyntheticProperty */) {
+                    if (prop.isDiscriminantProperty === undefined) {
+                        prop.isDiscriminantProperty =
+                            (prop.checkFlags & 96 /* Discriminant */) === 96 /* Discriminant */ &&
+                                isDiscriminantType(getTypeOfSymbol(prop));
+                    }
+                    return !!prop.isDiscriminantProperty;
+                }
+            }
+            return false;
+        }
+        function hasNarrowableDeclaredType(expr) {
+            var type = getDeclaredTypeOfReference(expr);
+            return !!(type && type.flags & 1048576 /* Union */);
+        }
+        function findDiscriminantProperties(sourceProperties, target) {
+            var result;
+            for (var _i = 0, sourceProperties_2 = sourceProperties; _i < sourceProperties_2.length; _i++) {
+                var sourceProperty = sourceProperties_2[_i];
+                if (isDiscriminantProperty(target, sourceProperty.escapedName)) {
+                    if (result) {
+                        result.push(sourceProperty);
+                        continue;
+                    }
+                    result = [sourceProperty];
+                }
+            }
+            return result;
+        }
+        function isOrContainsMatchingReference(source, target) {
+            return isMatchingReference(source, target) || containsMatchingReference(source, target);
+        }
+        function hasMatchingArgument(callExpression, reference) {
+            if (callExpression.arguments) {
+                for (var _i = 0, _a = callExpression.arguments; _i < _a.length; _i++) {
+                    var argument = _a[_i];
+                    if (isOrContainsMatchingReference(reference, argument)) {
+                        return true;
+                    }
+                }
+            }
+            if (callExpression.expression.kind === 189 /* PropertyAccessExpression */ &&
+                isOrContainsMatchingReference(reference, callExpression.expression.expression)) {
+                return true;
+            }
+            return false;
+        }
+        function getFlowNodeId(flow) {
+            if (!flow.id) {
+                flow.id = nextFlowId;
+                nextFlowId++;
+            }
+            return flow.id;
+        }
+        function typeMaybeAssignableTo(source, target) {
+            if (!(source.flags & 1048576 /* Union */)) {
+                return isTypeAssignableTo(source, target);
+            }
+            for (var _i = 0, _a = source.types; _i < _a.length; _i++) {
+                var t = _a[_i];
+                if (isTypeAssignableTo(t, target)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        // Remove those constituent types of declaredType to which no constituent type of assignedType is assignable.
+        // For example, when a variable of type number | string | boolean is assigned a value of type number | boolean,
+        // we remove type string.
+        function getAssignmentReducedType(declaredType, assignedType) {
+            if (declaredType !== assignedType) {
+                if (assignedType.flags & 131072 /* Never */) {
+                    return assignedType;
+                }
+                var reducedType = filterType(declaredType, function (t) { return typeMaybeAssignableTo(assignedType, t); });
+                if (assignedType.flags & 512 /* BooleanLiteral */ && isFreshLiteralType(assignedType)) {
+                    reducedType = mapType(reducedType, getFreshTypeOfLiteralType); // Ensure that if the assignment is a fresh type, that we narrow to fresh types
+                }
+                // Our crude heuristic produces an invalid result in some cases: see GH#26130.
+                // For now, when that happens, we give up and don't narrow at all.  (This also
+                // means we'll never narrow for erroneous assignments where the assigned type
+                // is not assignable to the declared type.)
+                if (isTypeAssignableTo(assignedType, reducedType)) {
+                    return reducedType;
+                }
+            }
+            return declaredType;
+        }
+        function getTypeFactsOfTypes(types) {
+            var result = 0 /* None */;
+            for (var _i = 0, types_11 = types; _i < types_11.length; _i++) {
+                var t = types_11[_i];
+                result |= getTypeFacts(t);
+            }
+            return result;
+        }
+        function isFunctionObjectType(type) {
+            // We do a quick check for a "bind" property before performing the more expensive subtype
+            // check. This gives us a quicker out in the common case where an object type is not a function.
+            var resolved = resolveStructuredTypeMembers(type);
+            return !!(resolved.callSignatures.length || resolved.constructSignatures.length ||
+                resolved.members.get("bind") && isTypeSubtypeOf(type, globalFunctionType));
+        }
+        function getTypeFacts(type) {
+            var flags = type.flags;
+            if (flags & 4 /* String */) {
+                return strictNullChecks ? 16317953 /* StringStrictFacts */ : 16776705 /* StringFacts */;
+            }
+            if (flags & 128 /* StringLiteral */) {
+                var isEmpty = type.value === "";
+                return strictNullChecks ?
+                    isEmpty ? 12123649 /* EmptyStringStrictFacts */ : 7929345 /* NonEmptyStringStrictFacts */ :
+                    isEmpty ? 12582401 /* EmptyStringFacts */ : 16776705 /* NonEmptyStringFacts */;
+            }
+            if (flags & (8 /* Number */ | 32 /* Enum */)) {
+                return strictNullChecks ? 16317698 /* NumberStrictFacts */ : 16776450 /* NumberFacts */;
+            }
+            if (flags & 256 /* NumberLiteral */) {
+                var isZero = type.value === 0;
+                return strictNullChecks ?
+                    isZero ? 12123394 /* ZeroNumberStrictFacts */ : 7929090 /* NonZeroNumberStrictFacts */ :
+                    isZero ? 12582146 /* ZeroNumberFacts */ : 16776450 /* NonZeroNumberFacts */;
+            }
+            if (flags & 64 /* BigInt */) {
+                return strictNullChecks ? 16317188 /* BigIntStrictFacts */ : 16775940 /* BigIntFacts */;
+            }
+            if (flags & 2048 /* BigIntLiteral */) {
+                var isZero = isZeroBigInt(type);
+                return strictNullChecks ?
+                    isZero ? 12122884 /* ZeroBigIntStrictFacts */ : 7928580 /* NonZeroBigIntStrictFacts */ :
+                    isZero ? 12581636 /* ZeroBigIntFacts */ : 16775940 /* NonZeroBigIntFacts */;
+            }
+            if (flags & 16 /* Boolean */) {
+                return strictNullChecks ? 16316168 /* BooleanStrictFacts */ : 16774920 /* BooleanFacts */;
+            }
+            if (flags & 528 /* BooleanLike */) {
+                return strictNullChecks ?
+                    (type === falseType || type === regularFalseType) ? 12121864 /* FalseStrictFacts */ : 7927560 /* TrueStrictFacts */ :
+                    (type === falseType || type === regularFalseType) ? 12580616 /* FalseFacts */ : 16774920 /* TrueFacts */;
+            }
+            if (flags & 524288 /* Object */) {
+                return ts.getObjectFlags(type) & 16 /* Anonymous */ && isEmptyObjectType(type) ?
+                    strictNullChecks ? 16318463 /* EmptyObjectStrictFacts */ : 16777215 /* EmptyObjectFacts */ :
+                    isFunctionObjectType(type) ?
+                        strictNullChecks ? 7880640 /* FunctionStrictFacts */ : 16728000 /* FunctionFacts */ :
+                        strictNullChecks ? 7888800 /* ObjectStrictFacts */ : 16736160 /* ObjectFacts */;
+            }
+            if (flags & (16384 /* Void */ | 32768 /* Undefined */)) {
+                return 9830144 /* UndefinedFacts */;
+            }
+            if (flags & 65536 /* Null */) {
+                return 9363232 /* NullFacts */;
+            }
+            if (flags & 12288 /* ESSymbolLike */) {
+                return strictNullChecks ? 7925520 /* SymbolStrictFacts */ : 16772880 /* SymbolFacts */;
+            }
+            if (flags & 67108864 /* NonPrimitive */) {
+                return strictNullChecks ? 7888800 /* ObjectStrictFacts */ : 16736160 /* ObjectFacts */;
+            }
+            if (flags & 63176704 /* Instantiable */) {
+                return getTypeFacts(getBaseConstraintOfType(type) || emptyObjectType);
+            }
+            if (flags & 3145728 /* UnionOrIntersection */) {
+                return getTypeFactsOfTypes(type.types);
+            }
+            return 16777215 /* All */;
+        }
+        function getTypeWithFacts(type, include) {
+            return filterType(type, function (t) { return (getTypeFacts(t) & include) !== 0; });
+        }
+        function getTypeWithDefault(type, defaultExpression) {
+            if (defaultExpression) {
+                var defaultType = getTypeOfExpression(defaultExpression);
+                return getUnionType([getTypeWithFacts(type, 524288 /* NEUndefined */), defaultType]);
+            }
+            return type;
+        }
+        function getTypeOfDestructuredProperty(type, name) {
+            var nameType = getLiteralTypeFromPropertyName(name);
+            if (!isTypeUsableAsPropertyName(nameType))
+                return errorType;
+            var text = getPropertyNameFromType(nameType);
+            return getConstraintForLocation(getTypeOfPropertyOfType(type, text), name) ||
+                isNumericLiteralName(text) && getIndexTypeOfType(type, 1 /* Number */) ||
+                getIndexTypeOfType(type, 0 /* String */) ||
+                errorType;
+        }
+        function getTypeOfDestructuredArrayElement(type, index) {
+            return everyType(type, isTupleLikeType) && getTupleElementType(type, index) ||
+                checkIteratedTypeOrElementType(type, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) ||
+                errorType;
+        }
+        function getTypeOfDestructuredSpreadExpression(type) {
+            return createArrayType(checkIteratedTypeOrElementType(type, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) || errorType);
+        }
+        function getAssignedTypeOfBinaryExpression(node) {
+            var isDestructuringDefaultAssignment = node.parent.kind === 187 /* ArrayLiteralExpression */ && isDestructuringAssignmentTarget(node.parent) ||
+                node.parent.kind === 275 /* PropertyAssignment */ && isDestructuringAssignmentTarget(node.parent.parent);
+            return isDestructuringDefaultAssignment ?
+                getTypeWithDefault(getAssignedType(node), node.right) :
+                getTypeOfExpression(node.right);
+        }
+        function isDestructuringAssignmentTarget(parent) {
+            return parent.parent.kind === 204 /* BinaryExpression */ && parent.parent.left === parent ||
+                parent.parent.kind === 227 /* ForOfStatement */ && parent.parent.initializer === parent;
+        }
+        function getAssignedTypeOfArrayLiteralElement(node, element) {
+            return getTypeOfDestructuredArrayElement(getAssignedType(node), node.elements.indexOf(element));
+        }
+        function getAssignedTypeOfSpreadExpression(node) {
+            return getTypeOfDestructuredSpreadExpression(getAssignedType(node.parent));
+        }
+        function getAssignedTypeOfPropertyAssignment(node) {
+            return getTypeOfDestructuredProperty(getAssignedType(node.parent), node.name);
+        }
+        function getAssignedTypeOfShorthandPropertyAssignment(node) {
+            return getTypeWithDefault(getAssignedTypeOfPropertyAssignment(node), node.objectAssignmentInitializer);
+        }
+        function getAssignedType(node) {
+            var parent = node.parent;
+            switch (parent.kind) {
+                case 226 /* ForInStatement */:
+                    return stringType;
+                case 227 /* ForOfStatement */:
+                    return checkRightHandSideOfForOf(parent.expression, parent.awaitModifier) || errorType;
+                case 204 /* BinaryExpression */:
+                    return getAssignedTypeOfBinaryExpression(parent);
+                case 198 /* DeleteExpression */:
+                    return undefinedType;
+                case 187 /* ArrayLiteralExpression */:
+                    return getAssignedTypeOfArrayLiteralElement(parent, node);
+                case 208 /* SpreadElement */:
+                    return getAssignedTypeOfSpreadExpression(parent);
+                case 275 /* PropertyAssignment */:
+                    return getAssignedTypeOfPropertyAssignment(parent);
+                case 276 /* ShorthandPropertyAssignment */:
+                    return getAssignedTypeOfShorthandPropertyAssignment(parent);
+            }
+            return errorType;
+        }
+        function getInitialTypeOfBindingElement(node) {
+            var pattern = node.parent;
+            var parentType = getInitialType(pattern.parent);
+            var type = pattern.kind === 184 /* ObjectBindingPattern */ ?
+                getTypeOfDestructuredProperty(parentType, node.propertyName || node.name) :
+                !node.dotDotDotToken ?
+                    getTypeOfDestructuredArrayElement(parentType, pattern.elements.indexOf(node)) :
+                    getTypeOfDestructuredSpreadExpression(parentType);
+            return getTypeWithDefault(type, node.initializer);
+        }
+        function getTypeOfInitializer(node) {
+            // Return the cached type if one is available. If the type of the variable was inferred
+            // from its initializer, we'll already have cached the type. Otherwise we compute it now
+            // without caching such that transient types are reflected.
+            var links = getNodeLinks(node);
+            return links.resolvedType || getTypeOfExpression(node);
+        }
+        function getInitialTypeOfVariableDeclaration(node) {
+            if (node.initializer) {
+                return getTypeOfInitializer(node.initializer);
+            }
+            if (node.parent.parent.kind === 226 /* ForInStatement */) {
+                return stringType;
+            }
+            if (node.parent.parent.kind === 227 /* ForOfStatement */) {
+                return checkRightHandSideOfForOf(node.parent.parent.expression, node.parent.parent.awaitModifier) || errorType;
+            }
+            return errorType;
+        }
+        function getInitialType(node) {
+            return node.kind === 237 /* VariableDeclaration */ ?
+                getInitialTypeOfVariableDeclaration(node) :
+                getInitialTypeOfBindingElement(node);
+        }
+        function getInitialOrAssignedType(node, reference) {
+            return getConstraintForLocation(node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */ ?
+                getInitialType(node) :
+                getAssignedType(node), reference);
+        }
+        function isEmptyArrayAssignment(node) {
+            return node.kind === 237 /* VariableDeclaration */ && node.initializer &&
+                isEmptyArrayLiteral(node.initializer) ||
+                node.kind !== 186 /* BindingElement */ && node.parent.kind === 204 /* BinaryExpression */ &&
+                    isEmptyArrayLiteral(node.parent.right);
+        }
+        function getReferenceCandidate(node) {
+            switch (node.kind) {
+                case 195 /* ParenthesizedExpression */:
+                    return getReferenceCandidate(node.expression);
+                case 204 /* BinaryExpression */:
+                    switch (node.operatorToken.kind) {
+                        case 59 /* EqualsToken */:
+                            return getReferenceCandidate(node.left);
+                        case 27 /* CommaToken */:
+                            return getReferenceCandidate(node.right);
+                    }
+            }
+            return node;
+        }
+        function getReferenceRoot(node) {
+            var parent = node.parent;
+            return parent.kind === 195 /* ParenthesizedExpression */ ||
+                parent.kind === 204 /* BinaryExpression */ && parent.operatorToken.kind === 59 /* EqualsToken */ && parent.left === node ||
+                parent.kind === 204 /* BinaryExpression */ && parent.operatorToken.kind === 27 /* CommaToken */ && parent.right === node ?
+                getReferenceRoot(parent) : node;
+        }
+        function getTypeOfSwitchClause(clause) {
+            if (clause.kind === 271 /* CaseClause */) {
+                return getRegularTypeOfLiteralType(getTypeOfExpression(clause.expression));
+            }
+            return neverType;
+        }
+        function getSwitchClauseTypes(switchStatement) {
+            var links = getNodeLinks(switchStatement);
+            if (!links.switchTypes) {
+                links.switchTypes = [];
+                for (var _i = 0, _a = switchStatement.caseBlock.clauses; _i < _a.length; _i++) {
+                    var clause = _a[_i];
+                    links.switchTypes.push(getTypeOfSwitchClause(clause));
+                }
+            }
+            return links.switchTypes;
+        }
+        // Get the types from all cases in a switch on `typeof`. An
+        // `undefined` element denotes an explicit `default` clause.
+        function getSwitchClauseTypeOfWitnesses(switchStatement) {
+            var witnesses = [];
+            for (var _i = 0, _a = switchStatement.caseBlock.clauses; _i < _a.length; _i++) {
+                var clause = _a[_i];
+                if (clause.kind === 271 /* CaseClause */) {
+                    if (clause.expression.kind === 10 /* StringLiteral */) {
+                        witnesses.push(clause.expression.text);
+                        continue;
+                    }
+                    return ts.emptyArray;
+                }
+                witnesses.push(/*explicitDefaultStatement*/ undefined);
+            }
+            return witnesses;
+        }
+        function eachTypeContainedIn(source, types) {
+            return source.flags & 1048576 /* Union */ ? !ts.forEach(source.types, function (t) { return !ts.contains(types, t); }) : ts.contains(types, source);
+        }
+        function isTypeSubsetOf(source, target) {
+            return source === target || target.flags & 1048576 /* Union */ && isTypeSubsetOfUnion(source, target);
+        }
+        function isTypeSubsetOfUnion(source, target) {
+            if (source.flags & 1048576 /* Union */) {
+                for (var _i = 0, _a = source.types; _i < _a.length; _i++) {
+                    var t = _a[_i];
+                    if (!containsType(target.types, t)) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+            if (source.flags & 1024 /* EnumLiteral */ && getBaseTypeOfEnumLiteralType(source) === target) {
+                return true;
+            }
+            return containsType(target.types, source);
+        }
+        function forEachType(type, f) {
+            return type.flags & 1048576 /* Union */ ? ts.forEach(type.types, f) : f(type);
+        }
+        function everyType(type, f) {
+            return type.flags & 1048576 /* Union */ ? ts.every(type.types, f) : f(type);
+        }
+        function filterType(type, f) {
+            if (type.flags & 1048576 /* Union */) {
+                var types = type.types;
+                var filtered = ts.filter(types, f);
+                return filtered === types ? type : getUnionTypeFromSortedList(filtered, type.primitiveTypesOnly);
+            }
+            return f(type) ? type : neverType;
+        }
+        function mapType(type, mapper, noReductions) {
+            if (type.flags & 131072 /* Never */) {
+                return type;
+            }
+            if (!(type.flags & 1048576 /* Union */)) {
+                return mapper(type);
+            }
+            var types = type.types;
+            var mappedType;
+            var mappedTypes;
+            for (var _i = 0, types_12 = types; _i < types_12.length; _i++) {
+                var current = types_12[_i];
+                var t = mapper(current);
+                if (t) {
+                    if (!mappedType) {
+                        mappedType = t;
+                    }
+                    else if (!mappedTypes) {
+                        mappedTypes = [mappedType, t];
+                    }
+                    else {
+                        mappedTypes.push(t);
+                    }
+                }
+            }
+            return mappedTypes ? getUnionType(mappedTypes, noReductions ? 0 /* None */ : 1 /* Literal */) : mappedType;
+        }
+        function extractTypesOfKind(type, kind) {
+            return filterType(type, function (t) { return (t.flags & kind) !== 0; });
+        }
+        // Return a new type in which occurrences of the string and number primitive types in
+        // typeWithPrimitives have been replaced with occurrences of string literals and numeric
+        // literals in typeWithLiterals, respectively.
+        function replacePrimitivesWithLiterals(typeWithPrimitives, typeWithLiterals) {
+            if (isTypeSubsetOf(stringType, typeWithPrimitives) && maybeTypeOfKind(typeWithLiterals, 128 /* StringLiteral */) ||
+                isTypeSubsetOf(numberType, typeWithPrimitives) && maybeTypeOfKind(typeWithLiterals, 256 /* NumberLiteral */) ||
+                isTypeSubsetOf(bigintType, typeWithPrimitives) && maybeTypeOfKind(typeWithLiterals, 2048 /* BigIntLiteral */)) {
+                return mapType(typeWithPrimitives, function (t) {
+                    return t.flags & 4 /* String */ ? extractTypesOfKind(typeWithLiterals, 4 /* String */ | 128 /* StringLiteral */) :
+                        t.flags & 8 /* Number */ ? extractTypesOfKind(typeWithLiterals, 8 /* Number */ | 256 /* NumberLiteral */) :
+                            t.flags & 64 /* BigInt */ ? extractTypesOfKind(typeWithLiterals, 64 /* BigInt */ | 2048 /* BigIntLiteral */) :
+                                t;
+                });
+            }
+            return typeWithPrimitives;
+        }
+        function isIncomplete(flowType) {
+            return flowType.flags === 0;
+        }
+        function getTypeFromFlowType(flowType) {
+            return flowType.flags === 0 ? flowType.type : flowType;
+        }
+        function createFlowType(type, incomplete) {
+            return incomplete ? { flags: 0, type: type } : type;
+        }
+        // An evolving array type tracks the element types that have so far been seen in an
+        // 'x.push(value)' or 'x[n] = value' operation along the control flow graph. Evolving
+        // array types are ultimately converted into manifest array types (using getFinalArrayType)
+        // and never escape the getFlowTypeOfReference function.
+        function createEvolvingArrayType(elementType) {
+            var result = createObjectType(256 /* EvolvingArray */);
+            result.elementType = elementType;
+            return result;
+        }
+        function getEvolvingArrayType(elementType) {
+            return evolvingArrayTypes[elementType.id] || (evolvingArrayTypes[elementType.id] = createEvolvingArrayType(elementType));
+        }
+        // When adding evolving array element types we do not perform subtype reduction. Instead,
+        // we defer subtype reduction until the evolving array type is finalized into a manifest
+        // array type.
+        function addEvolvingArrayElementType(evolvingArrayType, node) {
+            var elementType = getBaseTypeOfLiteralType(getContextFreeTypeOfExpression(node));
+            return isTypeSubsetOf(elementType, evolvingArrayType.elementType) ? evolvingArrayType : getEvolvingArrayType(getUnionType([evolvingArrayType.elementType, elementType]));
+        }
+        function createFinalArrayType(elementType) {
+            return elementType.flags & 131072 /* Never */ ?
+                autoArrayType :
+                createArrayType(elementType.flags & 1048576 /* Union */ ?
+                    getUnionType(elementType.types, 2 /* Subtype */) :
+                    elementType);
+        }
+        // We perform subtype reduction upon obtaining the final array type from an evolving array type.
+        function getFinalArrayType(evolvingArrayType) {
+            return evolvingArrayType.finalArrayType || (evolvingArrayType.finalArrayType = createFinalArrayType(evolvingArrayType.elementType));
+        }
+        function finalizeEvolvingArrayType(type) {
+            return ts.getObjectFlags(type) & 256 /* EvolvingArray */ ? getFinalArrayType(type) : type;
+        }
+        function getElementTypeOfEvolvingArrayType(type) {
+            return ts.getObjectFlags(type) & 256 /* EvolvingArray */ ? type.elementType : neverType;
+        }
+        function isEvolvingArrayTypeList(types) {
+            var hasEvolvingArrayType = false;
+            for (var _i = 0, types_13 = types; _i < types_13.length; _i++) {
+                var t = types_13[_i];
+                if (!(t.flags & 131072 /* Never */)) {
+                    if (!(ts.getObjectFlags(t) & 256 /* EvolvingArray */)) {
+                        return false;
+                    }
+                    hasEvolvingArrayType = true;
+                }
+            }
+            return hasEvolvingArrayType;
+        }
+        // At flow control branch or loop junctions, if the type along every antecedent code path
+        // is an evolving array type, we construct a combined evolving array type. Otherwise we
+        // finalize all evolving array types.
+        function getUnionOrEvolvingArrayType(types, subtypeReduction) {
+            return isEvolvingArrayTypeList(types) ?
+                getEvolvingArrayType(getUnionType(ts.map(types, getElementTypeOfEvolvingArrayType))) :
+                getUnionType(ts.sameMap(types, finalizeEvolvingArrayType), subtypeReduction);
+        }
+        // Return true if the given node is 'x' in an 'x.length', x.push(value)', 'x.unshift(value)' or
+        // 'x[n] = value' operation, where 'n' is an expression of type any, undefined, or a number-like type.
+        function isEvolvingArrayOperationTarget(node) {
+            var root = getReferenceRoot(node);
+            var parent = root.parent;
+            var isLengthPushOrUnshift = parent.kind === 189 /* PropertyAccessExpression */ && (parent.name.escapedText === "length" ||
+                parent.parent.kind === 191 /* CallExpression */ && ts.isPushOrUnshiftIdentifier(parent.name));
+            var isElementAssignment = parent.kind === 190 /* ElementAccessExpression */ &&
+                parent.expression === root &&
+                parent.parent.kind === 204 /* BinaryExpression */ &&
+                parent.parent.operatorToken.kind === 59 /* EqualsToken */ &&
+                parent.parent.left === parent &&
+                !ts.isAssignmentTarget(parent.parent) &&
+                isTypeAssignableToKind(getTypeOfExpression(parent.argumentExpression), 296 /* NumberLike */);
+            return isLengthPushOrUnshift || isElementAssignment;
+        }
+        function maybeTypePredicateCall(node) {
+            var links = getNodeLinks(node);
+            if (links.maybeTypePredicate === undefined) {
+                links.maybeTypePredicate = getMaybeTypePredicate(node);
+            }
+            return links.maybeTypePredicate;
+        }
+        function getMaybeTypePredicate(node) {
+            if (node.expression.kind !== 98 /* SuperKeyword */) {
+                var funcType = checkNonNullExpression(node.expression);
+                if (funcType !== silentNeverType) {
+                    var apparentType = getApparentType(funcType);
+                    return apparentType !== errorType && ts.some(getSignaturesOfType(apparentType, 0 /* Call */), signatureHasTypePredicate);
+                }
+            }
+            return false;
+        }
+        function reportFlowControlError(node) {
+            var block = ts.findAncestor(node, ts.isFunctionOrModuleBlock);
+            var sourceFile = ts.getSourceFileOfNode(node);
+            var span = ts.getSpanOfTokenAtPosition(sourceFile, block.statements.pos);
+            diagnostics.add(ts.createFileDiagnostic(sourceFile, span.start, span.length, ts.Diagnostics.The_containing_function_or_module_body_is_too_large_for_control_flow_analysis));
+        }
+        function getFlowTypeOfReference(reference, declaredType, initialType, flowContainer, couldBeUninitialized) {
+            if (initialType === void 0) { initialType = declaredType; }
+            var key;
+            var flowDepth = 0;
+            if (flowAnalysisDisabled) {
+                return errorType;
+            }
+            if (!reference.flowNode || !couldBeUninitialized && !(declaredType.flags & 133970943 /* Narrowable */)) {
+                return declaredType;
+            }
+            var sharedFlowStart = sharedFlowCount;
+            var evolvedType = getTypeFromFlowType(getTypeAtFlowNode(reference.flowNode));
+            sharedFlowCount = sharedFlowStart;
+            // When the reference is 'x' in an 'x.length', 'x.push(value)', 'x.unshift(value)' or x[n] = value' operation,
+            // we give type 'any[]' to 'x' instead of using the type determined by control flow analysis such that operations
+            // on empty arrays are possible without implicit any errors and new element types can be inferred without
+            // type mismatch errors.
+            var resultType = ts.getObjectFlags(evolvedType) & 256 /* EvolvingArray */ && isEvolvingArrayOperationTarget(reference) ? autoArrayType : finalizeEvolvingArrayType(evolvedType);
+            if (reference.parent && reference.parent.kind === 213 /* NonNullExpression */ && getTypeWithFacts(resultType, 2097152 /* NEUndefinedOrNull */).flags & 131072 /* Never */) {
+                return declaredType;
+            }
+            return resultType;
+            function getTypeAtFlowNode(flow) {
+                if (flowDepth === 2000) {
+                    // We have made 2000 recursive invocations. To avoid overflowing the call stack we report an error
+                    // and disable further control flow analysis in the containing function or module body.
+                    flowAnalysisDisabled = true;
+                    reportFlowControlError(reference);
+                    return errorType;
+                }
+                flowDepth++;
+                while (true) {
+                    var flags = flow.flags;
+                    if (flags & 1024 /* Shared */) {
+                        // We cache results of flow type resolution for shared nodes that were previously visited in
+                        // the same getFlowTypeOfReference invocation. A node is considered shared when it is the
+                        // antecedent of more than one node.
+                        for (var i = sharedFlowStart; i < sharedFlowCount; i++) {
+                            if (sharedFlowNodes[i] === flow) {
+                                flowDepth--;
+                                return sharedFlowTypes[i];
+                            }
+                        }
+                    }
+                    var type = void 0;
+                    if (flags & 4096 /* AfterFinally */) {
+                        // block flow edge: finally -> pre-try (for larger explanation check comment in binder.ts - bindTryStatement
+                        flow.locked = true;
+                        type = getTypeAtFlowNode(flow.antecedent);
+                        flow.locked = false;
+                    }
+                    else if (flags & 2048 /* PreFinally */) {
+                        // locked pre-finally flows are filtered out in getTypeAtFlowBranchLabel
+                        // so here just redirect to antecedent
+                        flow = flow.antecedent;
+                        continue;
+                    }
+                    else if (flags & 16 /* Assignment */) {
+                        type = getTypeAtFlowAssignment(flow);
+                        if (!type) {
+                            flow = flow.antecedent;
+                            continue;
+                        }
+                    }
+                    else if (flags & 96 /* Condition */) {
+                        type = getTypeAtFlowCondition(flow);
+                    }
+                    else if (flags & 128 /* SwitchClause */) {
+                        type = getTypeAtSwitchClause(flow);
+                    }
+                    else if (flags & 12 /* Label */) {
+                        if (flow.antecedents.length === 1) {
+                            flow = flow.antecedents[0];
+                            continue;
+                        }
+                        type = flags & 4 /* BranchLabel */ ?
+                            getTypeAtFlowBranchLabel(flow) :
+                            getTypeAtFlowLoopLabel(flow);
+                    }
+                    else if (flags & 256 /* ArrayMutation */) {
+                        type = getTypeAtFlowArrayMutation(flow);
+                        if (!type) {
+                            flow = flow.antecedent;
+                            continue;
+                        }
+                    }
+                    else if (flags & 2 /* Start */) {
+                        // Check if we should continue with the control flow of the containing function.
+                        var container = flow.container;
+                        if (container && container !== flowContainer &&
+                            reference.kind !== 189 /* PropertyAccessExpression */ &&
+                            reference.kind !== 190 /* ElementAccessExpression */ &&
+                            reference.kind !== 100 /* ThisKeyword */) {
+                            flow = container.flowNode;
+                            continue;
+                        }
+                        // At the top of the flow we have the initial type.
+                        type = initialType;
+                    }
+                    else {
+                        // Unreachable code errors are reported in the binding phase. Here we
+                        // simply return the non-auto declared type to reduce follow-on errors.
+                        type = convertAutoToAny(declaredType);
+                    }
+                    if (flags & 1024 /* Shared */) {
+                        // Record visited node and the associated type in the cache.
+                        sharedFlowNodes[sharedFlowCount] = flow;
+                        sharedFlowTypes[sharedFlowCount] = type;
+                        sharedFlowCount++;
+                    }
+                    flowDepth--;
+                    return type;
+                }
+            }
+            function getTypeAtFlowAssignment(flow) {
+                var node = flow.node;
+                // Assignments only narrow the computed type if the declared type is a union type. Thus, we
+                // only need to evaluate the assigned type if the declared type is a union type.
+                if (isMatchingReference(reference, node)) {
+                    if (ts.getAssignmentTargetKind(node) === 2 /* Compound */) {
+                        var flowType = getTypeAtFlowNode(flow.antecedent);
+                        return createFlowType(getBaseTypeOfLiteralType(getTypeFromFlowType(flowType)), isIncomplete(flowType));
+                    }
+                    if (declaredType === autoType || declaredType === autoArrayType) {
+                        if (isEmptyArrayAssignment(node)) {
+                            return getEvolvingArrayType(neverType);
+                        }
+                        var assignedType = getBaseTypeOfLiteralType(getInitialOrAssignedType(node, reference));
+                        return isTypeAssignableTo(assignedType, declaredType) ? assignedType : anyArrayType;
+                    }
+                    if (declaredType.flags & 1048576 /* Union */) {
+                        return getAssignmentReducedType(declaredType, getInitialOrAssignedType(node, reference));
+                    }
+                    return declaredType;
+                }
+                // We didn't have a direct match. However, if the reference is a dotted name, this
+                // may be an assignment to a left hand part of the reference. For example, for a
+                // reference 'x.y.z', we may be at an assignment to 'x.y' or 'x'. In that case,
+                // return the declared type.
+                if (containsMatchingReference(reference, node)) {
+                    // A matching dotted name might also be an expando property on a function *expression*,
+                    // in which case we continue control flow analysis back to the function's declaration
+                    if (ts.isVariableDeclaration(node) && (ts.isInJSFile(node) || ts.isVarConst(node))) {
+                        var init = ts.getDeclaredExpandoInitializer(node);
+                        if (init && (init.kind === 196 /* FunctionExpression */ || init.kind === 197 /* ArrowFunction */)) {
+                            return getTypeAtFlowNode(flow.antecedent);
+                        }
+                    }
+                    return declaredType;
+                }
+                // for (const _ in ref) acts as a nonnull on ref
+                if (ts.isVariableDeclaration(node) && node.parent.parent.kind === 226 /* ForInStatement */ && isMatchingReference(reference, node.parent.parent.expression)) {
+                    return getNonNullableTypeIfNeeded(getTypeFromFlowType(getTypeAtFlowNode(flow.antecedent)));
+                }
+                // Assignment doesn't affect reference
+                return undefined;
+            }
+            function getTypeAtFlowArrayMutation(flow) {
+                if (declaredType === autoType || declaredType === autoArrayType) {
+                    var node = flow.node;
+                    var expr = node.kind === 191 /* CallExpression */ ?
+                        node.expression.expression :
+                        node.left.expression;
+                    if (isMatchingReference(reference, getReferenceCandidate(expr))) {
+                        var flowType = getTypeAtFlowNode(flow.antecedent);
+                        var type = getTypeFromFlowType(flowType);
+                        if (ts.getObjectFlags(type) & 256 /* EvolvingArray */) {
+                            var evolvedType_1 = type;
+                            if (node.kind === 191 /* CallExpression */) {
+                                for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
+                                    var arg = _a[_i];
+                                    evolvedType_1 = addEvolvingArrayElementType(evolvedType_1, arg);
+                                }
+                            }
+                            else {
+                                // We must get the context free expression type so as to not recur in an uncached fashion on the LHS (which causes exponential blowup in compile time)
+                                var indexType = getContextFreeTypeOfExpression(node.left.argumentExpression);
+                                if (isTypeAssignableToKind(indexType, 296 /* NumberLike */)) {
+                                    evolvedType_1 = addEvolvingArrayElementType(evolvedType_1, node.right);
+                                }
+                            }
+                            return evolvedType_1 === type ? flowType : createFlowType(evolvedType_1, isIncomplete(flowType));
+                        }
+                        return flowType;
+                    }
+                }
+                return undefined;
+            }
+            function getTypeAtFlowCondition(flow) {
+                var flowType = getTypeAtFlowNode(flow.antecedent);
+                var type = getTypeFromFlowType(flowType);
+                if (type.flags & 131072 /* Never */) {
+                    return flowType;
+                }
+                // If we have an antecedent type (meaning we're reachable in some way), we first
+                // attempt to narrow the antecedent type. If that produces the never type, and if
+                // the antecedent type is incomplete (i.e. a transient type in a loop), then we
+                // take the type guard as an indication that control *could* reach here once we
+                // have the complete type. We proceed by switching to the silent never type which
+                // doesn't report errors when operators are applied to it. Note that this is the
+                // *only* place a silent never type is ever generated.
+                var assumeTrue = (flow.flags & 32 /* TrueCondition */) !== 0;
+                var nonEvolvingType = finalizeEvolvingArrayType(type);
+                var narrowedType = narrowType(nonEvolvingType, flow.expression, assumeTrue);
+                if (narrowedType === nonEvolvingType) {
+                    return flowType;
+                }
+                var incomplete = isIncomplete(flowType);
+                var resultType = incomplete && narrowedType.flags & 131072 /* Never */ ? silentNeverType : narrowedType;
+                return createFlowType(resultType, incomplete);
+            }
+            function getTypeAtSwitchClause(flow) {
+                var expr = flow.switchStatement.expression;
+                var flowType = getTypeAtFlowNode(flow.antecedent);
+                var type = getTypeFromFlowType(flowType);
+                if (isMatchingReference(reference, expr)) {
+                    type = narrowTypeBySwitchOnDiscriminant(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
+                }
+                else if (isMatchingReferenceDiscriminant(expr, type)) {
+                    type = narrowTypeByDiscriminant(type, expr, function (t) { return narrowTypeBySwitchOnDiscriminant(t, flow.switchStatement, flow.clauseStart, flow.clauseEnd); });
+                }
+                else if (expr.kind === 199 /* TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
+                    type = narrowBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
+                }
+                else if (containsMatchingReferenceDiscriminant(reference, expr)) {
+                    type = declaredType;
+                }
+                return createFlowType(type, isIncomplete(flowType));
+            }
+            function getTypeAtFlowBranchLabel(flow) {
+                var antecedentTypes = [];
+                var subtypeReduction = false;
+                var seenIncomplete = false;
+                for (var _i = 0, _a = flow.antecedents; _i < _a.length; _i++) {
+                    var antecedent = _a[_i];
+                    if (antecedent.flags & 2048 /* PreFinally */ && antecedent.lock.locked) {
+                        // if flow correspond to branch from pre-try to finally and this branch is locked - this means that
+                        // we initially have started following the flow outside the finally block.
+                        // in this case we should ignore this branch.
+                        continue;
+                    }
+                    var flowType = getTypeAtFlowNode(antecedent);
+                    var type = getTypeFromFlowType(flowType);
+                    // If the type at a particular antecedent path is the declared type and the
+                    // reference is known to always be assigned (i.e. when declared and initial types
+                    // are the same), there is no reason to process more antecedents since the only
+                    // possible outcome is subtypes that will be removed in the final union type anyway.
+                    if (type === declaredType && declaredType === initialType) {
+                        return type;
+                    }
+                    ts.pushIfUnique(antecedentTypes, type);
+                    // If an antecedent type is not a subset of the declared type, we need to perform
+                    // subtype reduction. This happens when a "foreign" type is injected into the control
+                    // flow using the instanceof operator or a user defined type predicate.
+                    if (!isTypeSubsetOf(type, declaredType)) {
+                        subtypeReduction = true;
+                    }
+                    if (isIncomplete(flowType)) {
+                        seenIncomplete = true;
+                    }
+                }
+                return createFlowType(getUnionOrEvolvingArrayType(antecedentTypes, subtypeReduction ? 2 /* Subtype */ : 1 /* Literal */), seenIncomplete);
+            }
+            function getTypeAtFlowLoopLabel(flow) {
+                // If we have previously computed the control flow type for the reference at
+                // this flow loop junction, return the cached type.
+                var id = getFlowNodeId(flow);
+                var cache = flowLoopCaches[id] || (flowLoopCaches[id] = ts.createMap());
+                if (!key) {
+                    key = getFlowCacheKey(reference);
+                    // No cache key is generated when binding patterns are in unnarrowable situations
+                    if (!key) {
+                        return declaredType;
+                    }
+                }
+                var cached = cache.get(key);
+                if (cached) {
+                    return cached;
+                }
+                // If this flow loop junction and reference are already being processed, return
+                // the union of the types computed for each branch so far, marked as incomplete.
+                // It is possible to see an empty array in cases where loops are nested and the
+                // back edge of the outer loop reaches an inner loop that is already being analyzed.
+                // In such cases we restart the analysis of the inner loop, which will then see
+                // a non-empty in-process array for the outer loop and eventually terminate because
+                // the first antecedent of a loop junction is always the non-looping control flow
+                // path that leads to the top.
+                for (var i = flowLoopStart; i < flowLoopCount; i++) {
+                    if (flowLoopNodes[i] === flow && flowLoopKeys[i] === key && flowLoopTypes[i].length) {
+                        return createFlowType(getUnionOrEvolvingArrayType(flowLoopTypes[i], 1 /* Literal */), /*incomplete*/ true);
+                    }
+                }
+                // Add the flow loop junction and reference to the in-process stack and analyze
+                // each antecedent code path.
+                var antecedentTypes = [];
+                var subtypeReduction = false;
+                var firstAntecedentType;
+                flowLoopNodes[flowLoopCount] = flow;
+                flowLoopKeys[flowLoopCount] = key;
+                flowLoopTypes[flowLoopCount] = antecedentTypes;
+                for (var _i = 0, _a = flow.antecedents; _i < _a.length; _i++) {
+                    var antecedent = _a[_i];
+                    flowLoopCount++;
+                    var flowType = getTypeAtFlowNode(antecedent);
+                    flowLoopCount--;
+                    if (!firstAntecedentType) {
+                        firstAntecedentType = flowType;
+                    }
+                    var type = getTypeFromFlowType(flowType);
+                    // If we see a value appear in the cache it is a sign that control flow analysis
+                    // was restarted and completed by checkExpressionCached. We can simply pick up
+                    // the resulting type and bail out.
+                    var cached_1 = cache.get(key);
+                    if (cached_1) {
+                        return cached_1;
+                    }
+                    ts.pushIfUnique(antecedentTypes, type);
+                    // If an antecedent type is not a subset of the declared type, we need to perform
+                    // subtype reduction. This happens when a "foreign" type is injected into the control
+                    // flow using the instanceof operator or a user defined type predicate.
+                    if (!isTypeSubsetOf(type, declaredType)) {
+                        subtypeReduction = true;
+                    }
+                    // If the type at a particular antecedent path is the declared type there is no
+                    // reason to process more antecedents since the only possible outcome is subtypes
+                    // that will be removed in the final union type anyway.
+                    if (type === declaredType) {
+                        break;
+                    }
+                }
+                // The result is incomplete if the first antecedent (the non-looping control flow path)
+                // is incomplete.
+                var result = getUnionOrEvolvingArrayType(antecedentTypes, subtypeReduction ? 2 /* Subtype */ : 1 /* Literal */);
+                if (isIncomplete(firstAntecedentType)) {
+                    return createFlowType(result, /*incomplete*/ true);
+                }
+                cache.set(key, result);
+                return result;
+            }
+            function isMatchingReferenceDiscriminant(expr, computedType) {
+                if (!(computedType.flags & 1048576 /* Union */) || !ts.isAccessExpression(expr)) {
+                    return false;
+                }
+                var name = getAccessedPropertyName(expr);
+                if (name === undefined) {
+                    return false;
+                }
+                return isMatchingReference(reference, expr.expression) && isDiscriminantProperty(computedType, name);
+            }
+            function narrowTypeByDiscriminant(type, access, narrowType) {
+                var propName = getAccessedPropertyName(access);
+                if (propName === undefined) {
+                    return type;
+                }
+                var propType = getTypeOfPropertyOfType(type, propName);
+                var narrowedPropType = propType && narrowType(propType);
+                return propType === narrowedPropType ? type : filterType(type, function (t) { return isTypeComparableTo(getTypeOfPropertyOrIndexSignature(t, propName), narrowedPropType); });
+            }
+            function narrowTypeByTruthiness(type, expr, assumeTrue) {
+                if (isMatchingReference(reference, expr)) {
+                    return getTypeWithFacts(type, assumeTrue ? 4194304 /* Truthy */ : 8388608 /* Falsy */);
+                }
+                if (isMatchingReferenceDiscriminant(expr, declaredType)) {
+                    return narrowTypeByDiscriminant(type, expr, function (t) { return getTypeWithFacts(t, assumeTrue ? 4194304 /* Truthy */ : 8388608 /* Falsy */); });
+                }
+                if (containsMatchingReferenceDiscriminant(reference, expr)) {
+                    return declaredType;
+                }
+                return type;
+            }
+            function isTypePresencePossible(type, propName, assumeTrue) {
+                if (getIndexInfoOfType(type, 0 /* String */)) {
+                    return true;
+                }
+                var prop = getPropertyOfType(type, propName);
+                if (prop) {
+                    return prop.flags & 16777216 /* Optional */ ? true : assumeTrue;
+                }
+                return !assumeTrue;
+            }
+            function narrowByInKeyword(type, literal, assumeTrue) {
+                if ((type.flags & (1048576 /* Union */ | 524288 /* Object */)) || (type.flags & 262144 /* TypeParameter */ && type.isThisType)) {
+                    var propName_1 = ts.escapeLeadingUnderscores(literal.text);
+                    return filterType(type, function (t) { return isTypePresencePossible(t, propName_1, assumeTrue); });
+                }
+                return type;
+            }
+            function narrowTypeByBinaryExpression(type, expr, assumeTrue) {
+                switch (expr.operatorToken.kind) {
+                    case 59 /* EqualsToken */:
+                        return narrowTypeByTruthiness(type, expr.left, assumeTrue);
+                    case 33 /* EqualsEqualsToken */:
+                    case 34 /* ExclamationEqualsToken */:
+                    case 35 /* EqualsEqualsEqualsToken */:
+                    case 36 /* ExclamationEqualsEqualsToken */:
+                        var operator_1 = expr.operatorToken.kind;
+                        var left_1 = getReferenceCandidate(expr.left);
+                        var right_1 = getReferenceCandidate(expr.right);
+                        if (left_1.kind === 199 /* TypeOfExpression */ && ts.isStringLiteralLike(right_1)) {
+                            return narrowTypeByTypeof(type, left_1, operator_1, right_1, assumeTrue);
+                        }
+                        if (right_1.kind === 199 /* TypeOfExpression */ && ts.isStringLiteralLike(left_1)) {
+                            return narrowTypeByTypeof(type, right_1, operator_1, left_1, assumeTrue);
+                        }
+                        if (isMatchingReference(reference, left_1)) {
+                            return narrowTypeByEquality(type, operator_1, right_1, assumeTrue);
+                        }
+                        if (isMatchingReference(reference, right_1)) {
+                            return narrowTypeByEquality(type, operator_1, left_1, assumeTrue);
+                        }
+                        if (isMatchingReferenceDiscriminant(left_1, declaredType)) {
+                            return narrowTypeByDiscriminant(type, left_1, function (t) { return narrowTypeByEquality(t, operator_1, right_1, assumeTrue); });
+                        }
+                        if (isMatchingReferenceDiscriminant(right_1, declaredType)) {
+                            return narrowTypeByDiscriminant(type, right_1, function (t) { return narrowTypeByEquality(t, operator_1, left_1, assumeTrue); });
+                        }
+                        if (containsMatchingReferenceDiscriminant(reference, left_1) || containsMatchingReferenceDiscriminant(reference, right_1)) {
+                            return declaredType;
+                        }
+                        break;
+                    case 94 /* InstanceOfKeyword */:
+                        return narrowTypeByInstanceof(type, expr, assumeTrue);
+                    case 93 /* InKeyword */:
+                        var target = getReferenceCandidate(expr.right);
+                        if (ts.isStringLiteralLike(expr.left) && isMatchingReference(reference, target)) {
+                            return narrowByInKeyword(type, expr.left, assumeTrue);
+                        }
+                        break;
+                    case 27 /* CommaToken */:
+                        return narrowType(type, expr.right, assumeTrue);
+                }
+                return type;
+            }
+            function narrowTypeByEquality(type, operator, value, assumeTrue) {
+                if (type.flags & 1 /* Any */) {
+                    return type;
+                }
+                if (operator === 34 /* ExclamationEqualsToken */ || operator === 36 /* ExclamationEqualsEqualsToken */) {
+                    assumeTrue = !assumeTrue;
+                }
+                var valueType = getTypeOfExpression(value);
+                if (valueType.flags & 98304 /* Nullable */) {
+                    if (!strictNullChecks) {
+                        return type;
+                    }
+                    var doubleEquals = operator === 33 /* EqualsEqualsToken */ || operator === 34 /* ExclamationEqualsToken */;
+                    var facts = doubleEquals ?
+                        assumeTrue ? 262144 /* EQUndefinedOrNull */ : 2097152 /* NEUndefinedOrNull */ :
+                        valueType.flags & 65536 /* Null */ ?
+                            assumeTrue ? 131072 /* EQNull */ : 1048576 /* NENull */ :
+                            assumeTrue ? 65536 /* EQUndefined */ : 524288 /* NEUndefined */;
+                    return getTypeWithFacts(type, facts);
+                }
+                if (type.flags & 67637251 /* NotUnionOrUnit */) {
+                    return type;
+                }
+                if (assumeTrue) {
+                    var narrowedType = filterType(type, function (t) { return areTypesComparable(t, valueType); });
+                    return narrowedType.flags & 131072 /* Never */ ? type : replacePrimitivesWithLiterals(narrowedType, valueType);
+                }
+                if (isUnitType(valueType)) {
+                    var regularType_1 = getRegularTypeOfLiteralType(valueType);
+                    return filterType(type, function (t) { return getRegularTypeOfLiteralType(t) !== regularType_1; });
+                }
+                return type;
+            }
+            function narrowTypeByTypeof(type, typeOfExpr, operator, literal, assumeTrue) {
+                // We have '==', '!=', '====', or !==' operator with 'typeof xxx' and string literal operands
+                var target = getReferenceCandidate(typeOfExpr.expression);
+                if (!isMatchingReference(reference, target)) {
+                    // For a reference of the form 'x.y', where 'x' has a narrowable declared type, a
+                    // 'typeof x === ...' type guard resets the narrowed type of 'y' to its declared type.
+                    if (containsMatchingReference(reference, target) && hasNarrowableDeclaredType(target)) {
+                        return declaredType;
+                    }
+                    return type;
+                }
+                if (operator === 34 /* ExclamationEqualsToken */ || operator === 36 /* ExclamationEqualsEqualsToken */) {
+                    assumeTrue = !assumeTrue;
+                }
+                if (type.flags & 1 /* Any */ && literal.text === "function") {
+                    return type;
+                }
+                var facts = assumeTrue ?
+                    typeofEQFacts.get(literal.text) || 128 /* TypeofEQHostObject */ :
+                    typeofNEFacts.get(literal.text) || 32768 /* TypeofNEHostObject */;
+                return getTypeWithFacts(assumeTrue ? mapType(type, narrowTypeForTypeof) : type, facts);
+                function narrowTypeForTypeof(type) {
+                    if (type.flags & 2 /* Unknown */ && literal.text === "object") {
+                        return getUnionType([nonPrimitiveType, nullType]);
+                    }
+                    // We narrow a non-union type to an exact primitive type if the non-union type
+                    // is a supertype of that primitive type. For example, type 'any' can be narrowed
+                    // to one of the primitive types.
+                    var targetType = literal.text === "function" ? globalFunctionType : typeofTypesByName.get(literal.text);
+                    if (targetType) {
+                        if (isTypeSubtypeOf(type, targetType)) {
+                            return type;
+                        }
+                        if (isTypeSubtypeOf(targetType, type)) {
+                            return targetType;
+                        }
+                        if (type.flags & 63176704 /* Instantiable */) {
+                            var constraint = getBaseConstraintOfType(type) || anyType;
+                            if (isTypeSubtypeOf(targetType, constraint)) {
+                                return getIntersectionType([type, targetType]);
+                            }
+                        }
+                    }
+                    return type;
+                }
+            }
+            function narrowTypeBySwitchOnDiscriminant(type, switchStatement, clauseStart, clauseEnd) {
+                // We only narrow if all case expressions specify values with unit types
+                var switchTypes = getSwitchClauseTypes(switchStatement);
+                if (!switchTypes.length) {
+                    return type;
+                }
+                var clauseTypes = switchTypes.slice(clauseStart, clauseEnd);
+                var hasDefaultClause = clauseStart === clauseEnd || ts.contains(clauseTypes, neverType);
+                var discriminantType = getUnionType(clauseTypes);
+                var caseType = discriminantType.flags & 131072 /* Never */ ? neverType :
+                    replacePrimitivesWithLiterals(filterType(type, function (t) { return areTypesComparable(discriminantType, t); }), discriminantType);
+                if (!hasDefaultClause) {
+                    return caseType;
+                }
+                var defaultType = filterType(type, function (t) { return !(isUnitType(t) && ts.contains(switchTypes, getRegularTypeOfLiteralType(t))); });
+                return caseType.flags & 131072 /* Never */ ? defaultType : getUnionType([caseType, defaultType]);
+            }
+            function getImpliedTypeFromTypeofCase(type, text) {
+                switch (text) {
+                    case "function":
+                        return type.flags & 1 /* Any */ ? type : globalFunctionType;
+                    case "object":
+                        return type.flags & 2 /* Unknown */ ? getUnionType([nonPrimitiveType, nullType]) : type;
+                    default:
+                        return typeofTypesByName.get(text) || type;
+                }
+            }
+            function narrowTypeForTypeofSwitch(candidate) {
+                return function (type) {
+                    if (isTypeSubtypeOf(candidate, type)) {
+                        return candidate;
+                    }
+                    if (type.flags & 63176704 /* Instantiable */) {
+                        var constraint = getBaseConstraintOfType(type) || anyType;
+                        if (isTypeSubtypeOf(candidate, constraint)) {
+                            return getIntersectionType([type, candidate]);
+                        }
+                    }
+                    return type;
+                };
+            }
+            function narrowBySwitchOnTypeOf(type, switchStatement, clauseStart, clauseEnd) {
+                var switchWitnesses = getSwitchClauseTypeOfWitnesses(switchStatement);
+                if (!switchWitnesses.length) {
+                    return type;
+                }
+                //  Equal start and end denotes implicit fallthrough; undefined marks explicit default clause
+                var defaultCaseLocation = ts.findIndex(switchWitnesses, function (elem) { return elem === undefined; });
+                var hasDefaultClause = clauseStart === clauseEnd || (defaultCaseLocation >= clauseStart && defaultCaseLocation < clauseEnd);
+                var clauseWitnesses;
+                var switchFacts;
+                if (defaultCaseLocation > -1) {
+                    // We no longer need the undefined denoting an
+                    // explicit default case. Remove the undefined and
+                    // fix-up clauseStart and clauseEnd.  This means
+                    // that we don't have to worry about undefined
+                    // in the witness array.
+                    var witnesses = switchWitnesses.filter(function (witness) { return witness !== undefined; });
+                    // The adjusted clause start and end after removing the `default` statement.
+                    var fixedClauseStart = defaultCaseLocation < clauseStart ? clauseStart - 1 : clauseStart;
+                    var fixedClauseEnd = defaultCaseLocation < clauseEnd ? clauseEnd - 1 : clauseEnd;
+                    clauseWitnesses = witnesses.slice(fixedClauseStart, fixedClauseEnd);
+                    switchFacts = getFactsFromTypeofSwitch(fixedClauseStart, fixedClauseEnd, witnesses, hasDefaultClause);
+                }
+                else {
+                    clauseWitnesses = switchWitnesses.slice(clauseStart, clauseEnd);
+                    switchFacts = getFactsFromTypeofSwitch(clauseStart, clauseEnd, switchWitnesses, hasDefaultClause);
+                }
+                if (hasDefaultClause) {
+                    return filterType(type, function (t) { return (getTypeFacts(t) & switchFacts) === switchFacts; });
+                }
+                /*
+                  The implied type is the raw type suggested by a
+                  value being caught in this clause.
+
+                  When the clause contains a default case we ignore
+                  the implied type and try to narrow using any facts
+                  we can learn: see `switchFacts`.
+
+                  Example:
+                  switch (typeof x) {
+                      case 'number':
+                      case 'string': break;
+                      default: break;
+                      case 'number':
+                      case 'boolean': break
+                  }
+
+                  In the first clause (case `number` and `string`) the
+                  implied type is number | string.
+
+                  In the default clause we de not compute an implied type.
+
+                  In the third clause (case `number` and `boolean`)
+                  the naive implied type is number | boolean, however
+                  we use the type facts to narrow the implied type to
+                  boolean. We know that number cannot be selected
+                  because it is caught in the first clause.
+                */
+                var impliedType = getTypeWithFacts(getUnionType(clauseWitnesses.map(function (text) { return getImpliedTypeFromTypeofCase(type, text); })), switchFacts);
+                if (impliedType.flags & 1048576 /* Union */) {
+                    impliedType = getAssignmentReducedType(impliedType, getBaseConstraintOrType(type));
+                }
+                return getTypeWithFacts(mapType(type, narrowTypeForTypeofSwitch(impliedType)), switchFacts);
+            }
+            function narrowTypeByInstanceof(type, expr, assumeTrue) {
+                var left = getReferenceCandidate(expr.left);
+                if (!isMatchingReference(reference, left)) {
+                    // For a reference of the form 'x.y', where 'x' has a narrowable declared type, an
+                    // 'x instanceof T' type guard resets the narrowed type of 'y' to its declared type.
+                    if (containsMatchingReference(reference, left) && hasNarrowableDeclaredType(left)) {
+                        return declaredType;
+                    }
+                    return type;
+                }
+                // Check that right operand is a function type with a prototype property
+                var rightType = getTypeOfExpression(expr.right);
+                if (!isTypeDerivedFrom(rightType, globalFunctionType)) {
+                    return type;
+                }
+                var targetType;
+                var prototypeProperty = getPropertyOfType(rightType, "prototype");
+                if (prototypeProperty) {
+                    // Target type is type of the prototype property
+                    var prototypePropertyType = getTypeOfSymbol(prototypeProperty);
+                    if (!isTypeAny(prototypePropertyType)) {
+                        targetType = prototypePropertyType;
+                    }
+                }
+                // Don't narrow from 'any' if the target type is exactly 'Object' or 'Function'
+                if (isTypeAny(type) && (targetType === globalObjectType || targetType === globalFunctionType)) {
+                    return type;
+                }
+                if (!targetType) {
+                    var constructSignatures = getSignaturesOfType(rightType, 1 /* Construct */);
+                    targetType = constructSignatures.length ?
+                        getUnionType(ts.map(constructSignatures, function (signature) { return getReturnTypeOfSignature(getErasedSignature(signature)); })) :
+                        emptyObjectType;
+                }
+                return getNarrowedType(type, targetType, assumeTrue, isTypeDerivedFrom);
+            }
+            function getNarrowedType(type, candidate, assumeTrue, isRelated) {
+                if (!assumeTrue) {
+                    return filterType(type, function (t) { return !isRelated(t, candidate); });
+                }
+                // If the current type is a union type, remove all constituents that couldn't be instances of
+                // the candidate type. If one or more constituents remain, return a union of those.
+                if (type.flags & 1048576 /* Union */) {
+                    var assignableType = filterType(type, function (t) { return isRelated(t, candidate); });
+                    if (!(assignableType.flags & 131072 /* Never */)) {
+                        return assignableType;
+                    }
+                }
+                // If the candidate type is a subtype of the target type, narrow to the candidate type.
+                // Otherwise, if the target type is assignable to the candidate type, keep the target type.
+                // Otherwise, if the candidate type is assignable to the target type, narrow to the candidate
+                // type. Otherwise, the types are completely unrelated, so narrow to an intersection of the
+                // two types.
+                return isTypeSubtypeOf(candidate, type) ? candidate :
+                    isTypeAssignableTo(type, candidate) ? type :
+                        isTypeAssignableTo(candidate, type) ? candidate :
+                            getIntersectionType([type, candidate]);
+            }
+            function narrowTypeByTypePredicate(type, callExpression, assumeTrue) {
+                if (!hasMatchingArgument(callExpression, reference) || !maybeTypePredicateCall(callExpression)) {
+                    return type;
+                }
+                var signature = getResolvedSignature(callExpression);
+                var predicate = getTypePredicateOfSignature(signature);
+                if (!predicate) {
+                    return type;
+                }
+                // Don't narrow from 'any' if the predicate type is exactly 'Object' or 'Function'
+                if (isTypeAny(type) && (predicate.type === globalObjectType || predicate.type === globalFunctionType)) {
+                    return type;
+                }
+                if (ts.isIdentifierTypePredicate(predicate)) {
+                    var predicateArgument = callExpression.arguments[predicate.parameterIndex - (signature.thisParameter ? 1 : 0)];
+                    if (predicateArgument) {
+                        if (isMatchingReference(reference, predicateArgument)) {
+                            return getNarrowedType(type, predicate.type, assumeTrue, isTypeSubtypeOf);
+                        }
+                        if (containsMatchingReference(reference, predicateArgument)) {
+                            return declaredType;
+                        }
+                    }
+                }
+                else {
+                    var invokedExpression = ts.skipParentheses(callExpression.expression);
+                    if (ts.isAccessExpression(invokedExpression)) {
+                        var possibleReference = ts.skipParentheses(invokedExpression.expression);
+                        if (isMatchingReference(reference, possibleReference)) {
+                            return getNarrowedType(type, predicate.type, assumeTrue, isTypeSubtypeOf);
+                        }
+                        if (containsMatchingReference(reference, possibleReference)) {
+                            return declaredType;
+                        }
+                    }
+                }
+                return type;
+            }
+            // Narrow the given type based on the given expression having the assumed boolean value. The returned type
+            // will be a subtype or the same type as the argument.
+            function narrowType(type, expr, assumeTrue) {
+                switch (expr.kind) {
+                    case 72 /* Identifier */:
+                    case 100 /* ThisKeyword */:
+                    case 98 /* SuperKeyword */:
+                    case 189 /* PropertyAccessExpression */:
+                    case 190 /* ElementAccessExpression */:
+                        return narrowTypeByTruthiness(type, expr, assumeTrue);
+                    case 191 /* CallExpression */:
+                        return narrowTypeByTypePredicate(type, expr, assumeTrue);
+                    case 195 /* ParenthesizedExpression */:
+                        return narrowType(type, expr.expression, assumeTrue);
+                    case 204 /* BinaryExpression */:
+                        return narrowTypeByBinaryExpression(type, expr, assumeTrue);
+                    case 202 /* PrefixUnaryExpression */:
+                        if (expr.operator === 52 /* ExclamationToken */) {
+                            return narrowType(type, expr.operand, !assumeTrue);
+                        }
+                        break;
+                }
+                return type;
+            }
+        }
+        function getTypeOfSymbolAtLocation(symbol, location) {
+            symbol = symbol.exportSymbol || symbol;
+            // If we have an identifier or a property access at the given location, if the location is
+            // an dotted name expression, and if the location is not an assignment target, obtain the type
+            // of the expression (which will reflect control flow analysis). If the expression indeed
+            // resolved to the given symbol, return the narrowed type.
+            if (location.kind === 72 /* Identifier */) {
+                if (ts.isRightSideOfQualifiedNameOrPropertyAccess(location)) {
+                    location = location.parent;
+                }
+                if (ts.isExpressionNode(location) && !ts.isAssignmentTarget(location)) {
+                    var type = getTypeOfExpression(location);
+                    if (getExportSymbolOfValueSymbolIfExported(getNodeLinks(location).resolvedSymbol) === symbol) {
+                        return type;
+                    }
+                }
+            }
+            // The location isn't a reference to the given symbol, meaning we're being asked
+            // a hypothetical question of what type the symbol would have if there was a reference
+            // to it at the given location. Since we have no control flow information for the
+            // hypothetical reference (control flow information is created and attached by the
+            // binder), we simply return the declared type of the symbol.
+            return getTypeOfSymbol(symbol);
+        }
+        function getControlFlowContainer(node) {
+            return ts.findAncestor(node.parent, function (node) {
+                return ts.isFunctionLike(node) && !ts.getImmediatelyInvokedFunctionExpression(node) ||
+                    node.kind === 245 /* ModuleBlock */ ||
+                    node.kind === 279 /* SourceFile */ ||
+                    node.kind === 154 /* PropertyDeclaration */;
+            });
+        }
+        // Check if a parameter is assigned anywhere within its declaring function.
+        function isParameterAssigned(symbol) {
+            var func = ts.getRootDeclaration(symbol.valueDeclaration).parent;
+            var links = getNodeLinks(func);
+            if (!(links.flags & 8388608 /* AssignmentsMarked */)) {
+                links.flags |= 8388608 /* AssignmentsMarked */;
+                if (!hasParentWithAssignmentsMarked(func)) {
+                    markParameterAssignments(func);
+                }
+            }
+            return symbol.isAssigned || false;
+        }
+        function hasParentWithAssignmentsMarked(node) {
+            return !!ts.findAncestor(node.parent, function (node) { return ts.isFunctionLike(node) && !!(getNodeLinks(node).flags & 8388608 /* AssignmentsMarked */); });
+        }
+        function markParameterAssignments(node) {
+            if (node.kind === 72 /* Identifier */) {
+                if (ts.isAssignmentTarget(node)) {
+                    var symbol = getResolvedSymbol(node);
+                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 151 /* Parameter */) {
+                        symbol.isAssigned = true;
+                    }
+                }
+            }
+            else {
+                ts.forEachChild(node, markParameterAssignments);
+            }
+        }
+        function isConstVariable(symbol) {
+            return symbol.flags & 3 /* Variable */ && (getDeclarationNodeFlagsFromSymbol(symbol) & 2 /* Const */) !== 0 && getTypeOfSymbol(symbol) !== autoArrayType;
+        }
+        /** remove undefined from the annotated type of a parameter when there is an initializer (that doesn't include undefined) */
+        function removeOptionalityFromDeclaredType(declaredType, declaration) {
+            var annotationIncludesUndefined = strictNullChecks &&
+                declaration.kind === 151 /* Parameter */ &&
+                declaration.initializer &&
+                getFalsyFlags(declaredType) & 32768 /* Undefined */ &&
+                !(getFalsyFlags(checkExpression(declaration.initializer)) & 32768 /* Undefined */);
+            return annotationIncludesUndefined ? getTypeWithFacts(declaredType, 524288 /* NEUndefined */) : declaredType;
+        }
+        function isConstraintPosition(node) {
+            var parent = node.parent;
+            return parent.kind === 189 /* PropertyAccessExpression */ ||
+                parent.kind === 191 /* CallExpression */ && parent.expression === node ||
+                parent.kind === 190 /* ElementAccessExpression */ && parent.expression === node ||
+                parent.kind === 186 /* BindingElement */ && parent.name === node && !!parent.initializer;
+        }
+        function typeHasNullableConstraint(type) {
+            return type.flags & 58982400 /* InstantiableNonPrimitive */ && maybeTypeOfKind(getBaseConstraintOfType(type) || emptyObjectType, 98304 /* Nullable */);
+        }
+        function getConstraintForLocation(type, node) {
+            // When a node is the left hand expression of a property access, element access, or call expression,
+            // and the type of the node includes type variables with constraints that are nullable, we fetch the
+            // apparent type of the node *before* performing control flow analysis such that narrowings apply to
+            // the constraint type.
+            if (type && isConstraintPosition(node) && forEachType(type, typeHasNullableConstraint)) {
+                return mapType(getWidenedType(type), getBaseConstraintOrType);
+            }
+            return type;
+        }
+        function markAliasReferenced(symbol, location) {
+            if (isNonLocalAlias(symbol, /*excludes*/ 67220415 /* Value */) && !isInTypeQuery(location) && !isConstEnumOrConstEnumOnlyModule(resolveAlias(symbol))) {
+                markAliasSymbolAsReferenced(symbol);
+            }
+        }
+        function checkIdentifier(node) {
+            var symbol = getResolvedSymbol(node);
+            if (symbol === unknownSymbol) {
+                return errorType;
+            }
+            // As noted in ECMAScript 6 language spec, arrow functions never have an arguments objects.
+            // Although in down-level emit of arrow function, we emit it using function expression which means that
+            // arguments objects will be bound to the inner object; emitting arrow function natively in ES6, arguments objects
+            // will be bound to non-arrow function that contain this arrow function. This results in inconsistent behavior.
+            // To avoid that we will give an error to users if they use arguments objects in arrow function so that they
+            // can explicitly bound arguments objects
+            if (symbol === argumentsSymbol) {
+                var container = ts.getContainingFunction(node);
+                if (languageVersion < 2 /* ES2015 */) {
+                    if (container.kind === 197 /* ArrowFunction */) {
+                        error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression);
+                    }
+                    else if (ts.hasModifier(container, 256 /* Async */)) {
+                        error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_async_function_or_method_in_ES3_and_ES5_Consider_using_a_standard_function_or_method);
+                    }
+                }
+                getNodeLinks(container).flags |= 8192 /* CaptureArguments */;
+                return getTypeOfSymbol(symbol);
+            }
+            // We should only mark aliases as referenced if there isn't a local value declaration
+            // for the symbol. Also, don't mark any property access expression LHS - checkPropertyAccessExpression will handle that
+            if (!(node.parent && ts.isPropertyAccessExpression(node.parent) && node.parent.expression === node)) {
+                markAliasReferenced(symbol, node);
+            }
+            var localOrExportSymbol = getExportSymbolOfValueSymbolIfExported(symbol);
+            var declaration = localOrExportSymbol.valueDeclaration;
+            if (localOrExportSymbol.flags & 32 /* Class */) {
+                // Due to the emit for class decorators, any reference to the class from inside of the class body
+                // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
+                // behavior of class names in ES6.
+                if (declaration.kind === 240 /* ClassDeclaration */
+                    && ts.nodeIsDecorated(declaration)) {
+                    var container = ts.getContainingClass(node);
+                    while (container !== undefined) {
+                        if (container === declaration && container.name !== node) {
+                            getNodeLinks(declaration).flags |= 16777216 /* ClassWithConstructorReference */;
+                            getNodeLinks(node).flags |= 33554432 /* ConstructorReferenceInClass */;
+                            break;
+                        }
+                        container = ts.getContainingClass(container);
+                    }
+                }
+                else if (declaration.kind === 209 /* ClassExpression */) {
+                    // When we emit a class expression with static members that contain a reference
+                    // to the constructor in the initializer, we will need to substitute that
+                    // binding with an alias as the class name is not in scope.
+                    var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
+                    while (container.kind !== 279 /* SourceFile */) {
+                        if (container.parent === declaration) {
+                            if (container.kind === 154 /* PropertyDeclaration */ && ts.hasModifier(container, 32 /* Static */)) {
+                                getNodeLinks(declaration).flags |= 16777216 /* ClassWithConstructorReference */;
+                                getNodeLinks(node).flags |= 33554432 /* ConstructorReferenceInClass */;
+                            }
+                            break;
+                        }
+                        container = ts.getThisContainer(container, /*includeArrowFunctions*/ false);
+                    }
+                }
+            }
+            checkNestedBlockScopedBinding(node, symbol);
+            var type = getConstraintForLocation(getTypeOfSymbol(localOrExportSymbol), node);
+            var assignmentKind = ts.getAssignmentTargetKind(node);
+            if (assignmentKind) {
+                if (!(localOrExportSymbol.flags & 3 /* Variable */) &&
+                    !(ts.isInJSFile(node) && localOrExportSymbol.flags & 512 /* ValueModule */)) {
+                    error(node, ts.Diagnostics.Cannot_assign_to_0_because_it_is_not_a_variable, symbolToString(symbol));
+                    return errorType;
+                }
+                if (isReadonlySymbol(localOrExportSymbol)) {
+                    if (localOrExportSymbol.flags & 3 /* Variable */) {
+                        error(node, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_constant, symbolToString(symbol));
+                    }
+                    else {
+                        error(node, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_read_only_property, symbolToString(symbol));
+                    }
+                    return errorType;
+                }
+            }
+            var isAlias = localOrExportSymbol.flags & 2097152 /* Alias */;
+            // We only narrow variables and parameters occurring in a non-assignment position. For all other
+            // entities we simply return the declared type.
+            if (localOrExportSymbol.flags & 3 /* Variable */) {
+                if (assignmentKind === 1 /* Definite */) {
+                    return type;
+                }
+            }
+            else if (isAlias) {
+                declaration = ts.find(symbol.declarations, isSomeImportDeclaration);
+            }
+            else {
+                return type;
+            }
+            if (!declaration) {
+                return type;
+            }
+            // The declaration container is the innermost function that encloses the declaration of the variable
+            // or parameter. The flow container is the innermost function starting with which we analyze the control
+            // flow graph to determine the control flow based type.
+            var isParameter = ts.getRootDeclaration(declaration).kind === 151 /* Parameter */;
+            var declarationContainer = getControlFlowContainer(declaration);
+            var flowContainer = getControlFlowContainer(node);
+            var isOuterVariable = flowContainer !== declarationContainer;
+            var isSpreadDestructuringAssignmentTarget = node.parent && node.parent.parent && ts.isSpreadAssignment(node.parent) && isDestructuringAssignmentTarget(node.parent.parent);
+            var isModuleExports = symbol.flags & 134217728 /* ModuleExports */;
+            // When the control flow originates in a function expression or arrow function and we are referencing
+            // a const variable or parameter from an outer function, we extend the origin of the control flow
+            // analysis to include the immediately enclosing function.
+            while (flowContainer !== declarationContainer && (flowContainer.kind === 196 /* FunctionExpression */ ||
+                flowContainer.kind === 197 /* ArrowFunction */ || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
+                (isConstVariable(localOrExportSymbol) || isParameter && !isParameterAssigned(localOrExportSymbol))) {
+                flowContainer = getControlFlowContainer(flowContainer);
+            }
+            // We only look for uninitialized variables in strict null checking mode, and only when we can analyze
+            // the entire control flow graph from the variable's declaration (i.e. when the flow container and
+            // declaration container are the same).
+            var assumeInitialized = isParameter || isAlias || isOuterVariable || isSpreadDestructuringAssignmentTarget || isModuleExports ||
+                type !== autoType && type !== autoArrayType && (!strictNullChecks || (type.flags & 3 /* AnyOrUnknown */) !== 0 ||
+                    isInTypeQuery(node) || node.parent.kind === 257 /* ExportSpecifier */) ||
+                node.parent.kind === 213 /* NonNullExpression */ ||
+                declaration.kind === 237 /* VariableDeclaration */ && declaration.exclamationToken ||
+                declaration.flags & 4194304 /* Ambient */;
+            var initialType = assumeInitialized ? (isParameter ? removeOptionalityFromDeclaredType(type, declaration) : type) :
+                type === autoType || type === autoArrayType ? undefinedType :
+                    getOptionalType(type);
+            var flowType = getFlowTypeOfReference(node, type, initialType, flowContainer, !assumeInitialized);
+            // A variable is considered uninitialized when it is possible to analyze the entire control flow graph
+            // from declaration to use, and when the variable's declared type doesn't include undefined but the
+            // control flow based type does include undefined.
+            if (!isEvolvingArrayOperationTarget(node) && (type === autoType || type === autoArrayType)) {
+                if (flowType === autoType || flowType === autoArrayType) {
+                    if (noImplicitAny) {
+                        error(ts.getNameOfDeclaration(declaration), ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined, symbolToString(symbol), typeToString(flowType));
+                        error(node, ts.Diagnostics.Variable_0_implicitly_has_an_1_type, symbolToString(symbol), typeToString(flowType));
+                    }
+                    return convertAutoToAny(flowType);
+                }
+            }
+            else if (!assumeInitialized && !(getFalsyFlags(type) & 32768 /* Undefined */) && getFalsyFlags(flowType) & 32768 /* Undefined */) {
+                error(node, ts.Diagnostics.Variable_0_is_used_before_being_assigned, symbolToString(symbol));
+                // Return the declared type to reduce follow-on errors
+                return type;
+            }
+            return assignmentKind ? getBaseTypeOfLiteralType(flowType) : flowType;
+        }
+        function isInsideFunction(node, threshold) {
+            return !!ts.findAncestor(node, function (n) { return n === threshold ? "quit" : ts.isFunctionLike(n); });
+        }
+        function getPartOfForStatementContainingNode(node, container) {
+            return ts.findAncestor(node, function (n) { return n === container ? "quit" : n === container.initializer || n === container.condition || n === container.incrementor || n === container.statement; });
+        }
+        function checkNestedBlockScopedBinding(node, symbol) {
+            if (languageVersion >= 2 /* ES2015 */ ||
+                (symbol.flags & (2 /* BlockScopedVariable */ | 32 /* Class */)) === 0 ||
+                symbol.valueDeclaration.parent.kind === 274 /* CatchClause */) {
+                return;
+            }
+            // 1. walk from the use site up to the declaration and check
+            // if there is anything function like between declaration and use-site (is binding/class is captured in function).
+            // 2. walk from the declaration up to the boundary of lexical environment and check
+            // if there is an iteration statement in between declaration and boundary (is binding/class declared inside iteration statement)
+            var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
+            var usedInFunction = isInsideFunction(node.parent, container);
+            var current = container;
+            var containedInIterationStatement = false;
+            while (current && !ts.nodeStartsNewLexicalEnvironment(current)) {
+                if (ts.isIterationStatement(current, /*lookInLabeledStatements*/ false)) {
+                    containedInIterationStatement = true;
+                    break;
+                }
+                current = current.parent;
+            }
+            if (containedInIterationStatement) {
+                if (usedInFunction) {
+                    // mark iteration statement as containing block-scoped binding captured in some function
+                    var capturesBlockScopeBindingInLoopBody = true;
+                    if (ts.isForStatement(container) &&
+                        ts.getAncestor(symbol.valueDeclaration, 238 /* VariableDeclarationList */).parent === container) {
+                        var part = getPartOfForStatementContainingNode(node.parent, container);
+                        if (part) {
+                            var links = getNodeLinks(part);
+                            links.flags |= 131072 /* ContainsCapturedBlockScopeBinding */;
+                            var capturedBindings = links.capturedBlockScopeBindings || (links.capturedBlockScopeBindings = []);
+                            ts.pushIfUnique(capturedBindings, symbol);
+                            if (part === container.initializer) {
+                                capturesBlockScopeBindingInLoopBody = false; // Initializer is outside of loop body
+                            }
+                        }
+                    }
+                    if (capturesBlockScopeBindingInLoopBody) {
+                        getNodeLinks(current).flags |= 65536 /* LoopWithCapturedBlockScopedBinding */;
+                    }
+                }
+                // mark variables that are declared in loop initializer and reassigned inside the body of ForStatement.
+                // if body of ForStatement will be converted to function then we'll need a extra machinery to propagate reassigned values back.
+                if (container.kind === 225 /* ForStatement */ &&
+                    ts.getAncestor(symbol.valueDeclaration, 238 /* VariableDeclarationList */).parent === container &&
+                    isAssignedInBodyOfForStatement(node, container)) {
+                    getNodeLinks(symbol.valueDeclaration).flags |= 4194304 /* NeedsLoopOutParameter */;
+                }
+                // set 'declared inside loop' bit on the block-scoped binding
+                getNodeLinks(symbol.valueDeclaration).flags |= 524288 /* BlockScopedBindingInLoop */;
+            }
+            if (usedInFunction) {
+                getNodeLinks(symbol.valueDeclaration).flags |= 262144 /* CapturedBlockScopedBinding */;
+            }
+        }
+        function isBindingCapturedByNode(node, decl) {
+            var links = getNodeLinks(node);
+            return !!links && ts.contains(links.capturedBlockScopeBindings, getSymbolOfNode(decl));
+        }
+        function isAssignedInBodyOfForStatement(node, container) {
+            // skip parenthesized nodes
+            var current = node;
+            while (current.parent.kind === 195 /* ParenthesizedExpression */) {
+                current = current.parent;
+            }
+            // check if node is used as LHS in some assignment expression
+            var isAssigned = false;
+            if (ts.isAssignmentTarget(current)) {
+                isAssigned = true;
+            }
+            else if ((current.parent.kind === 202 /* PrefixUnaryExpression */ || current.parent.kind === 203 /* PostfixUnaryExpression */)) {
+                var expr = current.parent;
+                isAssigned = expr.operator === 44 /* PlusPlusToken */ || expr.operator === 45 /* MinusMinusToken */;
+            }
+            if (!isAssigned) {
+                return false;
+            }
+            // at this point we know that node is the target of assignment
+            // now check that modification happens inside the statement part of the ForStatement
+            return !!ts.findAncestor(current, function (n) { return n === container ? "quit" : n === container.statement; });
+        }
+        function captureLexicalThis(node, container) {
+            getNodeLinks(node).flags |= 2 /* LexicalThis */;
+            if (container.kind === 154 /* PropertyDeclaration */ || container.kind === 157 /* Constructor */) {
+                var classNode = container.parent;
+                getNodeLinks(classNode).flags |= 4 /* CaptureThis */;
+            }
+            else {
+                getNodeLinks(container).flags |= 4 /* CaptureThis */;
+            }
+        }
+        function findFirstSuperCall(n) {
+            if (ts.isSuperCall(n)) {
+                return n;
+            }
+            else if (ts.isFunctionLike(n)) {
+                return undefined;
+            }
+            return ts.forEachChild(n, findFirstSuperCall);
+        }
+        /**
+         * Return a cached result if super-statement is already found.
+         * Otherwise, find a super statement in a given constructor function and cache the result in the node-links of the constructor
+         *
+         * @param constructor constructor-function to look for super statement
+         */
+        function getSuperCallInConstructor(constructor) {
+            var links = getNodeLinks(constructor);
+            // Only trying to find super-call if we haven't yet tried to find one.  Once we try, we will record the result
+            if (links.hasSuperCall === undefined) {
+                links.superCall = findFirstSuperCall(constructor.body);
+                links.hasSuperCall = links.superCall ? true : false;
+            }
+            return links.superCall;
+        }
+        /**
+         * Check if the given class-declaration extends null then return true.
+         * Otherwise, return false
+         * @param classDecl a class declaration to check if it extends null
+         */
+        function classDeclarationExtendsNull(classDecl) {
+            var classSymbol = getSymbolOfNode(classDecl);
+            var classInstanceType = getDeclaredTypeOfSymbol(classSymbol);
+            var baseConstructorType = getBaseConstructorTypeOfClass(classInstanceType);
+            return baseConstructorType === nullWideningType;
+        }
+        function checkThisBeforeSuper(node, container, diagnosticMessage) {
+            var containingClassDecl = container.parent;
+            var baseTypeNode = ts.getClassExtendsHeritageElement(containingClassDecl);
+            // If a containing class does not have extends clause or the class extends null
+            // skip checking whether super statement is called before "this" accessing.
+            if (baseTypeNode && !classDeclarationExtendsNull(containingClassDecl)) {
+                var superCall = getSuperCallInConstructor(container);
+                // We should give an error in the following cases:
+                //      - No super-call
+                //      - "this" is accessing before super-call.
+                //          i.e super(this)
+                //              this.x; super();
+                // We want to make sure that super-call is done before accessing "this" so that
+                // "this" is not accessed as a parameter of the super-call.
+                if (!superCall || superCall.end > node.pos) {
+                    // In ES6, super inside constructor of class-declaration has to precede "this" accessing
+                    error(node, diagnosticMessage);
+                }
+            }
+        }
+        function checkThisExpression(node) {
+            // Stop at the first arrow function so that we can
+            // tell whether 'this' needs to be captured.
+            var container = ts.getThisContainer(node, /* includeArrowFunctions */ true);
+            var capturedByArrowFunction = false;
+            if (container.kind === 157 /* Constructor */) {
+                checkThisBeforeSuper(node, container, ts.Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class);
+            }
+            // Now skip arrow functions to get the "real" owner of 'this'.
+            if (container.kind === 197 /* ArrowFunction */) {
+                container = ts.getThisContainer(container, /* includeArrowFunctions */ false);
+                capturedByArrowFunction = true;
+            }
+            switch (container.kind) {
+                case 244 /* ModuleDeclaration */:
+                    error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_module_or_namespace_body);
+                    // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
+                    break;
+                case 243 /* EnumDeclaration */:
+                    error(node, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
+                    // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
+                    break;
+                case 157 /* Constructor */:
+                    if (isInConstructorArgumentInitializer(node, container)) {
+                        error(node, ts.Diagnostics.this_cannot_be_referenced_in_constructor_arguments);
+                        // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
+                    }
+                    break;
+                case 154 /* PropertyDeclaration */:
+                case 153 /* PropertySignature */:
+                    if (ts.hasModifier(container, 32 /* Static */)) {
+                        error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_static_property_initializer);
+                        // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
+                    }
+                    break;
+                case 149 /* ComputedPropertyName */:
+                    error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_computed_property_name);
+                    break;
+            }
+            // When targeting es6, mark that we'll need to capture `this` in its lexically bound scope.
+            if (capturedByArrowFunction && languageVersion < 2 /* ES2015 */) {
+                captureLexicalThis(node, container);
+            }
+            var type = tryGetThisTypeAt(node, container);
+            if (!type && noImplicitThis) {
+                // With noImplicitThis, functions may not reference 'this' if it has type 'any'
+                var diag = error(node, capturedByArrowFunction && container.kind === 279 /* SourceFile */ ?
+                    ts.Diagnostics.The_containing_arrow_function_captures_the_global_value_of_this_which_implicitly_has_type_any :
+                    ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation);
+                if (!ts.isSourceFile(container)) {
+                    var outsideThis = tryGetThisTypeAt(container);
+                    if (outsideThis) {
+                        addRelatedInfo(diag, ts.createDiagnosticForNode(container, ts.Diagnostics.An_outer_value_of_this_is_shadowed_by_this_container));
+                    }
+                }
+            }
+            return type || anyType;
+        }
+        function tryGetThisTypeAt(node, container) {
+            if (container === void 0) { container = ts.getThisContainer(node, /*includeArrowFunctions*/ false); }
+            var isInJS = ts.isInJSFile(node);
+            if (ts.isFunctionLike(container) &&
+                (!isInParameterInitializerBeforeContainingFunction(node) || ts.getThisParameter(container))) {
+                // Note: a parameter initializer should refer to class-this unless function-this is explicitly annotated.
+                // If this is a function in a JS file, it might be a class method.
+                var className = getClassNameFromPrototypeMethod(container);
+                if (isInJS && className) {
+                    var classSymbol = checkExpression(className).symbol;
+                    if (classSymbol && classSymbol.members && (classSymbol.flags & 16 /* Function */)) {
+                        var classType = getJSClassType(classSymbol);
+                        if (classType) {
+                            return getFlowTypeOfReference(node, classType);
+                        }
+                    }
+                }
+                // Check if it's a constructor definition, can be either a variable decl or function decl
+                // i.e.
+                //   * /** @constructor */ function [name]() { ... }
+                //   * /** @constructor */ var x = function() { ... }
+                else if (isInJS &&
+                    (container.kind === 196 /* FunctionExpression */ || container.kind === 239 /* FunctionDeclaration */) &&
+                    ts.getJSDocClassTag(container)) {
+                    var classType = getJSClassType(getMergedSymbol(container.symbol));
+                    if (classType) {
+                        return getFlowTypeOfReference(node, classType);
+                    }
+                }
+                var thisType = getThisTypeOfDeclaration(container) || getContextualThisParameterType(container);
+                if (thisType) {
+                    return getFlowTypeOfReference(node, thisType);
+                }
+            }
+            if (ts.isClassLike(container.parent)) {
+                var symbol = getSymbolOfNode(container.parent);
+                var type = ts.hasModifier(container, 32 /* Static */) ? getTypeOfSymbol(symbol) : getDeclaredTypeOfSymbol(symbol).thisType;
+                return getFlowTypeOfReference(node, type);
+            }
+            if (isInJS) {
+                var type = getTypeForThisExpressionFromJSDoc(container);
+                if (type && type !== errorType) {
+                    return getFlowTypeOfReference(node, type);
+                }
+            }
+        }
+        function getClassNameFromPrototypeMethod(container) {
+            // Check if it's the RHS of a x.prototype.y = function [name]() { .... }
+            if (container.kind === 196 /* FunctionExpression */ &&
+                ts.isBinaryExpression(container.parent) &&
+                ts.getAssignmentDeclarationKind(container.parent) === 3 /* PrototypeProperty */) {
+                // Get the 'x' of 'x.prototype.y = container'
+                return container.parent // x.prototype.y = container
+                    .left // x.prototype.y
+                    .expression // x.prototype
+                    .expression; // x
+            }
+            // x.prototype = { method() { } }
+            else if (container.kind === 156 /* MethodDeclaration */ &&
+                container.parent.kind === 188 /* ObjectLiteralExpression */ &&
+                ts.isBinaryExpression(container.parent.parent) &&
+                ts.getAssignmentDeclarationKind(container.parent.parent) === 6 /* Prototype */) {
+                return container.parent.parent.left.expression;
+            }
+            // x.prototype = { method: function() { } }
+            else if (container.kind === 196 /* FunctionExpression */ &&
+                container.parent.kind === 275 /* PropertyAssignment */ &&
+                container.parent.parent.kind === 188 /* ObjectLiteralExpression */ &&
+                ts.isBinaryExpression(container.parent.parent.parent) &&
+                ts.getAssignmentDeclarationKind(container.parent.parent.parent) === 6 /* Prototype */) {
+                return container.parent.parent.parent.left.expression;
+            }
+            // Object.defineProperty(x, "method", { value: function() { } });
+            // Object.defineProperty(x, "method", { set: (x: () => void) => void });
+            // Object.defineProperty(x, "method", { get: () => function() { }) });
+            else if (container.kind === 196 /* FunctionExpression */ &&
+                ts.isPropertyAssignment(container.parent) &&
+                ts.isIdentifier(container.parent.name) &&
+                (container.parent.name.escapedText === "value" || container.parent.name.escapedText === "get" || container.parent.name.escapedText === "set") &&
+                ts.isObjectLiteralExpression(container.parent.parent) &&
+                ts.isCallExpression(container.parent.parent.parent) &&
+                container.parent.parent.parent.arguments[2] === container.parent.parent &&
+                ts.getAssignmentDeclarationKind(container.parent.parent.parent) === 9 /* ObjectDefinePrototypeProperty */) {
+                return container.parent.parent.parent.arguments[0].expression;
+            }
+            // Object.defineProperty(x, "method", { value() { } });
+            // Object.defineProperty(x, "method", { set(x: () => void) {} });
+            // Object.defineProperty(x, "method", { get() { return () => {} } });
+            else if (ts.isMethodDeclaration(container) &&
+                ts.isIdentifier(container.name) &&
+                (container.name.escapedText === "value" || container.name.escapedText === "get" || container.name.escapedText === "set") &&
+                ts.isObjectLiteralExpression(container.parent) &&
+                ts.isCallExpression(container.parent.parent) &&
+                container.parent.parent.arguments[2] === container.parent &&
+                ts.getAssignmentDeclarationKind(container.parent.parent) === 9 /* ObjectDefinePrototypeProperty */) {
+                return container.parent.parent.arguments[0].expression;
+            }
+        }
+        function getTypeForThisExpressionFromJSDoc(node) {
+            var jsdocType = ts.getJSDocType(node);
+            if (jsdocType && jsdocType.kind === 289 /* JSDocFunctionType */) {
+                var jsDocFunctionType = jsdocType;
+                if (jsDocFunctionType.parameters.length > 0 &&
+                    jsDocFunctionType.parameters[0].name &&
+                    jsDocFunctionType.parameters[0].name.escapedText === "this" /* This */) {
+                    return getTypeFromTypeNode(jsDocFunctionType.parameters[0].type);
+                }
+            }
+            var thisTag = ts.getJSDocThisTag(node);
+            if (thisTag && thisTag.typeExpression) {
+                return getTypeFromTypeNode(thisTag.typeExpression);
+            }
+        }
+        function isInConstructorArgumentInitializer(node, constructorDecl) {
+            return !!ts.findAncestor(node, function (n) { return n === constructorDecl ? "quit" : n.kind === 151 /* Parameter */; });
+        }
+        function checkSuperExpression(node) {
+            var isCallExpression = node.parent.kind === 191 /* CallExpression */ && node.parent.expression === node;
+            var container = ts.getSuperContainer(node, /*stopOnFunctions*/ true);
+            var needToCaptureLexicalThis = false;
+            // adjust the container reference in case if super is used inside arrow functions with arbitrarily deep nesting
+            if (!isCallExpression) {
+                while (container && container.kind === 197 /* ArrowFunction */) {
+                    container = ts.getSuperContainer(container, /*stopOnFunctions*/ true);
+                    needToCaptureLexicalThis = languageVersion < 2 /* ES2015 */;
+                }
+            }
+            var canUseSuperExpression = isLegalUsageOfSuperExpression(container);
+            var nodeCheckFlag = 0;
+            if (!canUseSuperExpression) {
+                // issue more specific error if super is used in computed property name
+                // class A { foo() { return "1" }}
+                // class B {
+                //     [super.foo()]() {}
+                // }
+                var current = ts.findAncestor(node, function (n) { return n === container ? "quit" : n.kind === 149 /* ComputedPropertyName */; });
+                if (current && current.kind === 149 /* ComputedPropertyName */) {
+                    error(node, ts.Diagnostics.super_cannot_be_referenced_in_a_computed_property_name);
+                }
+                else if (isCallExpression) {
+                    error(node, ts.Diagnostics.Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors);
+                }
+                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 188 /* ObjectLiteralExpression */)) {
+                    error(node, ts.Diagnostics.super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions);
+                }
+                else {
+                    error(node, ts.Diagnostics.super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_derived_class);
+                }
+                return errorType;
+            }
+            if (!isCallExpression && container.kind === 157 /* Constructor */) {
+                checkThisBeforeSuper(node, container, ts.Diagnostics.super_must_be_called_before_accessing_a_property_of_super_in_the_constructor_of_a_derived_class);
+            }
+            if (ts.hasModifier(container, 32 /* Static */) || isCallExpression) {
+                nodeCheckFlag = 512 /* SuperStatic */;
+            }
+            else {
+                nodeCheckFlag = 256 /* SuperInstance */;
+            }
+            getNodeLinks(node).flags |= nodeCheckFlag;
+            // Due to how we emit async functions, we need to specialize the emit for an async method that contains a `super` reference.
+            // This is due to the fact that we emit the body of an async function inside of a generator function. As generator
+            // functions cannot reference `super`, we emit a helper inside of the method body, but outside of the generator. This helper
+            // uses an arrow function, which is permitted to reference `super`.
+            //
+            // There are two primary ways we can access `super` from within an async method. The first is getting the value of a property
+            // or indexed access on super, either as part of a right-hand-side expression or call expression. The second is when setting the value
+            // of a property or indexed access, either as part of an assignment expression or destructuring assignment.
+            //
+            // The simplest case is reading a value, in which case we will emit something like the following:
+            //
+            //  // ts
+            //  ...
+            //  async asyncMethod() {
+            //    let x = await super.asyncMethod();
+            //    return x;
+            //  }
+            //  ...
+            //
+            //  // js
+            //  ...
+            //  asyncMethod() {
+            //      const _super = Object.create(null, {
+            //        asyncMethod: { get: () => super.asyncMethod },
+            //      });
+            //      return __awaiter(this, arguments, Promise, function *() {
+            //          let x = yield _super.asyncMethod.call(this);
+            //          return x;
+            //      });
+            //  }
+            //  ...
+            //
+            // The more complex case is when we wish to assign a value, especially as part of a destructuring assignment. As both cases
+            // are legal in ES6, but also likely less frequent, we only emit setters if there is an assignment:
+            //
+            //  // ts
+            //  ...
+            //  async asyncMethod(ar: Promise<any[]>) {
+            //      [super.a, super.b] = await ar;
+            //  }
+            //  ...
+            //
+            //  // js
+            //  ...
+            //  asyncMethod(ar) {
+            //      const _super = Object.create(null, {
+            //        a: { get: () => super.a, set: (v) => super.a = v },
+            //        b: { get: () => super.b, set: (v) => super.b = v }
+            //      };
+            //      return __awaiter(this, arguments, Promise, function *() {
+            //          [_super.a, _super.b] = yield ar;
+            //      });
+            //  }
+            //  ...
+            //
+            // Creating an object that has getter and setters instead of just an accessor function is required for destructuring assignments
+            // as a call expression cannot be used as the target of a destructuring assignment while a property access can.
+            //
+            // For element access expressions (`super[x]`), we emit a generic helper that forwards the element access in both situations.
+            if (container.kind === 156 /* MethodDeclaration */ && ts.hasModifier(container, 256 /* Async */)) {
+                if (ts.isSuperProperty(node.parent) && ts.isAssignmentTarget(node.parent)) {
+                    getNodeLinks(container).flags |= 4096 /* AsyncMethodWithSuperBinding */;
+                }
+                else {
+                    getNodeLinks(container).flags |= 2048 /* AsyncMethodWithSuper */;
+                }
+            }
+            if (needToCaptureLexicalThis) {
+                // call expressions are allowed only in constructors so they should always capture correct 'this'
+                // super property access expressions can also appear in arrow functions -
+                // in this case they should also use correct lexical this
+                captureLexicalThis(node.parent, container);
+            }
+            if (container.parent.kind === 188 /* ObjectLiteralExpression */) {
+                if (languageVersion < 2 /* ES2015 */) {
+                    error(node, ts.Diagnostics.super_is_only_allowed_in_members_of_object_literal_expressions_when_option_target_is_ES2015_or_higher);
+                    return errorType;
+                }
+                else {
+                    // for object literal assume that type of 'super' is 'any'
+                    return anyType;
+                }
+            }
+            // at this point the only legal case for parent is ClassLikeDeclaration
+            var classLikeDeclaration = container.parent;
+            if (!ts.getClassExtendsHeritageElement(classLikeDeclaration)) {
+                error(node, ts.Diagnostics.super_can_only_be_referenced_in_a_derived_class);
+                return errorType;
+            }
+            var classType = getDeclaredTypeOfSymbol(getSymbolOfNode(classLikeDeclaration));
+            var baseClassType = classType && getBaseTypes(classType)[0];
+            if (!baseClassType) {
+                return errorType;
+            }
+            if (container.kind === 157 /* Constructor */ && isInConstructorArgumentInitializer(node, container)) {
+                // issue custom error message for super property access in constructor arguments (to be aligned with old compiler)
+                error(node, ts.Diagnostics.super_cannot_be_referenced_in_constructor_arguments);
+                return errorType;
+            }
+            return nodeCheckFlag === 512 /* SuperStatic */
+                ? getBaseConstructorTypeOfClass(classType)
+                : getTypeWithThisArgument(baseClassType, classType.thisType);
+            function isLegalUsageOfSuperExpression(container) {
+                if (!container) {
+                    return false;
+                }
+                if (isCallExpression) {
+                    // TS 1.0 SPEC (April 2014): 4.8.1
+                    // Super calls are only permitted in constructors of derived classes
+                    return container.kind === 157 /* Constructor */;
+                }
+                else {
+                    // TS 1.0 SPEC (April 2014)
+                    // 'super' property access is allowed
+                    // - In a constructor, instance member function, instance member accessor, or instance member variable initializer where this references a derived class instance
+                    // - In a static member function or static member accessor
+                    // topmost container must be something that is directly nested in the class declaration\object literal expression
+                    if (ts.isClassLike(container.parent) || container.parent.kind === 188 /* ObjectLiteralExpression */) {
+                        if (ts.hasModifier(container, 32 /* Static */)) {
+                            return container.kind === 156 /* MethodDeclaration */ ||
+                                container.kind === 155 /* MethodSignature */ ||
+                                container.kind === 158 /* GetAccessor */ ||
+                                container.kind === 159 /* SetAccessor */;
+                        }
+                        else {
+                            return container.kind === 156 /* MethodDeclaration */ ||
+                                container.kind === 155 /* MethodSignature */ ||
+                                container.kind === 158 /* GetAccessor */ ||
+                                container.kind === 159 /* SetAccessor */ ||
+                                container.kind === 154 /* PropertyDeclaration */ ||
+                                container.kind === 153 /* PropertySignature */ ||
+                                container.kind === 157 /* Constructor */;
+                        }
+                    }
+                }
+                return false;
+            }
+        }
+        function getContainingObjectLiteral(func) {
+            return (func.kind === 156 /* MethodDeclaration */ ||
+                func.kind === 158 /* GetAccessor */ ||
+                func.kind === 159 /* SetAccessor */) && func.parent.kind === 188 /* ObjectLiteralExpression */ ? func.parent :
+                func.kind === 196 /* FunctionExpression */ && func.parent.kind === 275 /* PropertyAssignment */ ? func.parent.parent :
+                    undefined;
+        }
+        function getThisTypeArgument(type) {
+            return ts.getObjectFlags(type) & 4 /* Reference */ && type.target === globalThisType ? type.typeArguments[0] : undefined;
+        }
+        function getThisTypeFromContextualType(type) {
+            return mapType(type, function (t) {
+                return t.flags & 2097152 /* Intersection */ ? ts.forEach(t.types, getThisTypeArgument) : getThisTypeArgument(t);
+            });
+        }
+        function getContextualThisParameterType(func) {
+            if (func.kind === 197 /* ArrowFunction */) {
+                return undefined;
+            }
+            if (isContextSensitiveFunctionOrObjectLiteralMethod(func)) {
+                var contextualSignature = getContextualSignature(func);
+                if (contextualSignature) {
+                    var thisParameter = contextualSignature.thisParameter;
+                    if (thisParameter) {
+                        return getTypeOfSymbol(thisParameter);
+                    }
+                }
+            }
+            var inJs = ts.isInJSFile(func);
+            if (noImplicitThis || inJs) {
+                var containingLiteral = getContainingObjectLiteral(func);
+                if (containingLiteral) {
+                    // We have an object literal method. Check if the containing object literal has a contextual type
+                    // that includes a ThisType<T>. If so, T is the contextual type for 'this'. We continue looking in
+                    // any directly enclosing object literals.
+                    var contextualType = getApparentTypeOfContextualType(containingLiteral);
+                    var literal = containingLiteral;
+                    var type = contextualType;
+                    while (type) {
+                        var thisType = getThisTypeFromContextualType(type);
+                        if (thisType) {
+                            return instantiateType(thisType, getContextualMapper(containingLiteral));
+                        }
+                        if (literal.parent.kind !== 275 /* PropertyAssignment */) {
+                            break;
+                        }
+                        literal = literal.parent.parent;
+                        type = getApparentTypeOfContextualType(literal);
+                    }
+                    // There was no contextual ThisType<T> for the containing object literal, so the contextual type
+                    // for 'this' is the non-null form of the contextual type for the containing object literal or
+                    // the type of the object literal itself.
+                    return contextualType ? getNonNullableType(contextualType) : checkExpressionCached(containingLiteral);
+                }
+                // In an assignment of the form 'obj.xxx = function(...)' or 'obj[xxx] = function(...)', the
+                // contextual type for 'this' is 'obj'.
+                var parent = func.parent;
+                if (parent.kind === 204 /* BinaryExpression */ && parent.operatorToken.kind === 59 /* EqualsToken */) {
+                    var target = parent.left;
+                    if (target.kind === 189 /* PropertyAccessExpression */ || target.kind === 190 /* ElementAccessExpression */) {
+                        var expression = target.expression;
+                        // Don't contextually type `this` as `exports` in `exports.Point = function(x, y) { this.x = x; this.y = y; }`
+                        if (inJs && ts.isIdentifier(expression)) {
+                            var sourceFile = ts.getSourceFileOfNode(parent);
+                            if (sourceFile.commonJsModuleIndicator && getResolvedSymbol(expression) === sourceFile.symbol) {
+                                return undefined;
+                            }
+                        }
+                        return checkExpressionCached(expression);
+                    }
+                }
+            }
+            return undefined;
+        }
+        // Return contextual type of parameter or undefined if no contextual type is available
+        function getContextuallyTypedParameterType(parameter) {
+            var func = parameter.parent;
+            if (!isContextSensitiveFunctionOrObjectLiteralMethod(func)) {
+                return undefined;
+            }
+            var iife = ts.getImmediatelyInvokedFunctionExpression(func);
+            if (iife && iife.arguments) {
+                var args = getEffectiveCallArguments(iife);
+                var indexOfParameter = func.parameters.indexOf(parameter);
+                if (parameter.dotDotDotToken) {
+                    return getSpreadArgumentType(args, indexOfParameter, args.length, anyType, /*context*/ undefined);
+                }
+                var links = getNodeLinks(iife);
+                var cached = links.resolvedSignature;
+                links.resolvedSignature = anySignature;
+                var type = indexOfParameter < args.length ?
+                    getWidenedLiteralType(checkExpression(args[indexOfParameter])) :
+                    parameter.initializer ? undefined : undefinedWideningType;
+                links.resolvedSignature = cached;
+                return type;
+            }
+            var contextualSignature = getContextualSignature(func);
+            if (contextualSignature) {
+                var index = func.parameters.indexOf(parameter) - (ts.getThisParameter(func) ? 1 : 0);
+                return parameter.dotDotDotToken && ts.lastOrUndefined(func.parameters) === parameter ?
+                    getRestTypeAtPosition(contextualSignature, index) :
+                    tryGetTypeAtPosition(contextualSignature, index);
+            }
+        }
+        function getContextualTypeForVariableLikeDeclaration(declaration) {
+            var typeNode = ts.getEffectiveTypeAnnotationNode(declaration);
+            if (typeNode) {
+                return getTypeFromTypeNode(typeNode);
+            }
+            switch (declaration.kind) {
+                case 151 /* Parameter */:
+                    return getContextuallyTypedParameterType(declaration);
+                case 186 /* BindingElement */:
+                    return getContextualTypeForBindingElement(declaration);
+                // By default, do nothing and return undefined - only parameters and binding elements have context implied by a parent
+            }
+        }
+        function getContextualTypeForBindingElement(declaration) {
+            var parentDeclaration = declaration.parent.parent;
+            var name = declaration.propertyName || declaration.name;
+            var parentType = getContextualTypeForVariableLikeDeclaration(parentDeclaration);
+            if (parentType && !ts.isBindingPattern(name) && !isComputedNonLiteralName(name)) {
+                var nameType = getLiteralTypeFromPropertyName(name);
+                if (isTypeUsableAsPropertyName(nameType)) {
+                    var text = getPropertyNameFromType(nameType);
+                    return getTypeOfPropertyOfType(parentType, text);
+                }
+            }
+        }
+        // In a variable, parameter or property declaration with a type annotation,
+        //   the contextual type of an initializer expression is the type of the variable, parameter or property.
+        // Otherwise, in a parameter declaration of a contextually typed function expression,
+        //   the contextual type of an initializer expression is the contextual type of the parameter.
+        // Otherwise, in a variable or parameter declaration with a binding pattern name,
+        //   the contextual type of an initializer expression is the type implied by the binding pattern.
+        // Otherwise, in a binding pattern inside a variable or parameter declaration,
+        //   the contextual type of an initializer expression is the type annotation of the containing declaration, if present.
+        function getContextualTypeForInitializerExpression(node) {
+            var declaration = node.parent;
+            if (ts.hasInitializer(declaration) && node === declaration.initializer) {
+                var result = getContextualTypeForVariableLikeDeclaration(declaration);
+                if (result) {
+                    return result;
+                }
+                if (ts.isBindingPattern(declaration.name)) { // This is less a contextual type and more an implied shape - in some cases, this may be undesirable
+                    return getTypeFromBindingPattern(declaration.name, /*includePatternInType*/ true, /*reportErrors*/ false);
+                }
+            }
+            return undefined;
+        }
+        function getContextualTypeForReturnExpression(node) {
+            var func = ts.getContainingFunction(node);
+            if (func) {
+                var functionFlags = ts.getFunctionFlags(func);
+                if (functionFlags & 1 /* Generator */) { // AsyncGenerator function or Generator function
+                    return undefined;
+                }
+                var contextualReturnType = getContextualReturnType(func);
+                if (contextualReturnType) {
+                    if (functionFlags & 2 /* Async */) { // Async function
+                        var contextualAwaitedType = getAwaitedTypeOfPromise(contextualReturnType);
+                        return contextualAwaitedType && getUnionType([contextualAwaitedType, createPromiseLikeType(contextualAwaitedType)]);
+                    }
+                    return contextualReturnType; // Regular function
+                }
+            }
+            return undefined;
+        }
+        function getContextualTypeForAwaitOperand(node) {
+            var contextualType = getContextualType(node);
+            if (contextualType) {
+                var contextualAwaitedType = getAwaitedType(contextualType);
+                return contextualAwaitedType && getUnionType([contextualAwaitedType, createPromiseLikeType(contextualAwaitedType)]);
+            }
+            return undefined;
+        }
+        function getContextualTypeForYieldOperand(node) {
+            var func = ts.getContainingFunction(node);
+            if (func) {
+                var functionFlags = ts.getFunctionFlags(func);
+                var contextualReturnType = getContextualReturnType(func);
+                if (contextualReturnType) {
+                    return node.asteriskToken
+                        ? contextualReturnType
+                        : getIteratedTypeOfGenerator(contextualReturnType, (functionFlags & 2 /* Async */) !== 0);
+                }
+            }
+            return undefined;
+        }
+        function isInParameterInitializerBeforeContainingFunction(node) {
+            var inBindingInitializer = false;
+            while (node.parent && !ts.isFunctionLike(node.parent)) {
+                if (ts.isParameter(node.parent) && (inBindingInitializer || node.parent.initializer === node)) {
+                    return true;
+                }
+                if (ts.isBindingElement(node.parent) && node.parent.initializer === node) {
+                    inBindingInitializer = true;
+                }
+                node = node.parent;
+            }
+            return false;
+        }
+        function getContextualReturnType(functionDecl) {
+            // If the containing function has a return type annotation, is a constructor, or is a get accessor whose
+            // corresponding set accessor has a type annotation, return statements in the function are contextually typed
+            var returnType = getReturnTypeFromAnnotation(functionDecl);
+            if (returnType) {
+                return returnType;
+            }
+            // Otherwise, if the containing function is contextually typed by a function type with exactly one call signature
+            // and that call signature is non-generic, return statements are contextually typed by the return type of the signature
+            var signature = getContextualSignatureForFunctionLikeDeclaration(functionDecl);
+            if (signature && !isResolvingReturnTypeOfSignature(signature)) {
+                return getReturnTypeOfSignature(signature);
+            }
+            return undefined;
+        }
+        // In a typed function call, an argument or substitution expression is contextually typed by the type of the corresponding parameter.
+        function getContextualTypeForArgument(callTarget, arg) {
+            var args = getEffectiveCallArguments(callTarget);
+            var argIndex = args.indexOf(arg); // -1 for e.g. the expression of a CallExpression, or the tag of a TaggedTemplateExpression
+            return argIndex === -1 ? undefined : getContextualTypeForArgumentAtIndex(callTarget, argIndex);
+        }
+        function getContextualTypeForArgumentAtIndex(callTarget, argIndex) {
+            // If we're already in the process of resolving the given signature, don't resolve again as
+            // that could cause infinite recursion. Instead, return anySignature.
+            var signature = getNodeLinks(callTarget).resolvedSignature === resolvingSignature ? resolvingSignature : getResolvedSignature(callTarget);
+            if (ts.isJsxOpeningLikeElement(callTarget) && argIndex === 0) {
+                return getEffectiveFirstArgumentForJsxSignature(signature, callTarget);
+            }
+            return getTypeAtPosition(signature, argIndex);
+        }
+        function getContextualTypeForSubstitutionExpression(template, substitutionExpression) {
+            if (template.parent.kind === 193 /* TaggedTemplateExpression */) {
+                return getContextualTypeForArgument(template.parent, substitutionExpression);
+            }
+            return undefined;
+        }
+        function getContextualTypeForBinaryOperand(node) {
+            var binaryExpression = node.parent;
+            var left = binaryExpression.left, operatorToken = binaryExpression.operatorToken, right = binaryExpression.right;
+            switch (operatorToken.kind) {
+                case 59 /* EqualsToken */:
+                    if (node !== right) {
+                        return undefined;
+                    }
+                    var contextSensitive = getIsContextSensitiveAssignmentOrContextType(binaryExpression);
+                    if (!contextSensitive) {
+                        return undefined;
+                    }
+                    return contextSensitive === true ? getTypeOfExpression(left) : contextSensitive;
+                case 55 /* BarBarToken */:
+                    // When an || expression has a contextual type, the operands are contextually typed by that type. When an ||
+                    // expression has no contextual type, the right operand is contextually typed by the type of the left operand,
+                    // except for the special case of Javascript declarations of the form `namespace.prop = namespace.prop || {}`
+                    var type = getContextualType(binaryExpression);
+                    return !type && node === right && !ts.isDefaultedExpandoInitializer(binaryExpression) ?
+                        getTypeOfExpression(left) : type;
+                case 54 /* AmpersandAmpersandToken */:
+                case 27 /* CommaToken */:
+                    return node === right ? getContextualType(binaryExpression) : undefined;
+                default:
+                    return undefined;
+            }
+        }
+        // In an assignment expression, the right operand is contextually typed by the type of the left operand.
+        // Don't do this for assignment declarations unless there is a type tag on the assignment, to avoid circularity from checking the right operand.
+        function getIsContextSensitiveAssignmentOrContextType(binaryExpression) {
+            var kind = ts.getAssignmentDeclarationKind(binaryExpression);
+            switch (kind) {
+                case 0 /* None */:
+                    return true;
+                case 5 /* Property */:
+                case 1 /* ExportsProperty */:
+                case 6 /* Prototype */:
+                case 3 /* PrototypeProperty */:
+                    // If `binaryExpression.left` was assigned a symbol, then this is a new declaration; otherwise it is an assignment to an existing declaration.
+                    // See `bindStaticPropertyAssignment` in `binder.ts`.
+                    if (!binaryExpression.left.symbol) {
+                        return true;
+                    }
+                    else {
+                        var decl = binaryExpression.left.symbol.valueDeclaration;
+                        if (!decl) {
+                            return false;
+                        }
+                        var lhs = binaryExpression.left;
+                        var overallAnnotation = ts.getEffectiveTypeAnnotationNode(decl);
+                        if (overallAnnotation) {
+                            return getTypeFromTypeNode(overallAnnotation);
+                        }
+                        else if (ts.isIdentifier(lhs.expression)) {
+                            var id = lhs.expression;
+                            var parentSymbol = resolveName(id, id.escapedText, 67220415 /* Value */, undefined, id.escapedText, /*isUse*/ true);
+                            if (parentSymbol) {
+                                var annotated = ts.getEffectiveTypeAnnotationNode(parentSymbol.valueDeclaration);
+                                if (annotated) {
+                                    var type = getTypeOfPropertyOfContextualType(getTypeFromTypeNode(annotated), lhs.name.escapedText);
+                                    return type || false;
+                                }
+                                return false;
+                            }
+                        }
+                        return !ts.isInJSFile(decl);
+                    }
+                case 2 /* ModuleExports */:
+                case 4 /* ThisProperty */:
+                    if (!binaryExpression.symbol)
+                        return true;
+                    if (binaryExpression.symbol.valueDeclaration) {
+                        var annotated = ts.getEffectiveTypeAnnotationNode(binaryExpression.symbol.valueDeclaration);
+                        if (annotated) {
+                            var type = getTypeFromTypeNode(annotated);
+                            if (type) {
+                                return type;
+                            }
+                        }
+                    }
+                    if (kind === 2 /* ModuleExports */)
+                        return false;
+                    var thisAccess = binaryExpression.left;
+                    if (!ts.isObjectLiteralMethod(ts.getThisContainer(thisAccess.expression, /*includeArrowFunctions*/ false))) {
+                        return false;
+                    }
+                    var thisType = checkThisExpression(thisAccess.expression);
+                    return thisType && getTypeOfPropertyOfContextualType(thisType, thisAccess.name.escapedText) || false;
+                case 7 /* ObjectDefinePropertyValue */:
+                case 8 /* ObjectDefinePropertyExports */:
+                case 9 /* ObjectDefinePrototypeProperty */:
+                    return ts.Debug.fail("Does not apply");
+                default:
+                    return ts.Debug.assertNever(kind);
+            }
+        }
+        function getTypeOfPropertyOfContextualType(type, name) {
+            return mapType(type, function (t) {
+                if (t.flags & 3670016 /* StructuredType */) {
+                    var prop = getPropertyOfType(t, name);
+                    if (prop) {
+                        return getTypeOfSymbol(prop);
+                    }
+                    if (isTupleType(t)) {
+                        var restType = getRestTypeOfTupleType(t);
+                        if (restType && isNumericLiteralName(name) && +name >= 0) {
+                            return restType;
+                        }
+                    }
+                    return isNumericLiteralName(name) && getIndexTypeOfContextualType(t, 1 /* Number */) ||
+                        getIndexTypeOfContextualType(t, 0 /* String */);
+                }
+                return undefined;
+            }, /*noReductions*/ true);
+        }
+        function getIndexTypeOfContextualType(type, kind) {
+            return mapType(type, function (t) { return getIndexTypeOfStructuredType(t, kind); }, /*noReductions*/ true);
+        }
+        // In an object literal contextually typed by a type T, the contextual type of a property assignment is the type of
+        // the matching property in T, if one exists. Otherwise, it is the type of the numeric index signature in T, if one
+        // exists. Otherwise, it is the type of the string index signature in T, if one exists.
+        function getContextualTypeForObjectLiteralMethod(node) {
+            ts.Debug.assert(ts.isObjectLiteralMethod(node));
+            if (node.flags & 8388608 /* InWithStatement */) {
+                // We cannot answer semantic questions within a with block, do not proceed any further
+                return undefined;
+            }
+            return getContextualTypeForObjectLiteralElement(node);
+        }
+        function getContextualTypeForObjectLiteralElement(element) {
+            var objectLiteral = element.parent;
+            var type = getApparentTypeOfContextualType(objectLiteral);
+            if (type) {
+                if (!hasNonBindableDynamicName(element)) {
+                    // For a (non-symbol) computed property, there is no reason to look up the name
+                    // in the type. It will just be "__computed", which does not appear in any
+                    // SymbolTable.
+                    var symbolName_2 = getSymbolOfNode(element).escapedName;
+                    var propertyType = getTypeOfPropertyOfContextualType(type, symbolName_2);
+                    if (propertyType) {
+                        return propertyType;
+                    }
+                }
+                return isNumericName(element.name) && getIndexTypeOfContextualType(type, 1 /* Number */) ||
+                    getIndexTypeOfContextualType(type, 0 /* String */);
+            }
+            return undefined;
+        }
+        // In an array literal contextually typed by a type T, the contextual type of an element expression at index N is
+        // the type of the property with the numeric name N in T, if one exists. Otherwise, if T has a numeric index signature,
+        // it is the type of the numeric index signature in T. Otherwise, in ES6 and higher, the contextual type is the iterated
+        // type of T.
+        function getContextualTypeForElementExpression(arrayContextualType, index) {
+            return arrayContextualType && (getTypeOfPropertyOfContextualType(arrayContextualType, "" + index)
+                || getIteratedTypeOrElementType(arrayContextualType, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false, /*checkAssignability*/ false));
+        }
+        // In a contextually typed conditional expression, the true/false expressions are contextually typed by the same type.
+        function getContextualTypeForConditionalOperand(node) {
+            var conditional = node.parent;
+            return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType(conditional) : undefined;
+        }
+        function getContextualTypeForChildJsxExpression(node, child) {
+            var attributesType = getApparentTypeOfContextualType(node.openingElement.tagName);
+            // JSX expression is in children of JSX Element, we will look for an "children" atttribute (we get the name from JSX.ElementAttributesProperty)
+            var jsxChildrenPropertyName = getJsxElementChildrenPropertyName(getJsxNamespaceAt(node));
+            if (!(attributesType && !isTypeAny(attributesType) && jsxChildrenPropertyName && jsxChildrenPropertyName !== "")) {
+                return undefined;
+            }
+            var childIndex = node.children.indexOf(child);
+            var childFieldType = getTypeOfPropertyOfContextualType(attributesType, jsxChildrenPropertyName);
+            return childFieldType && mapType(childFieldType, function (t) {
+                if (isArrayLikeType(t)) {
+                    return getIndexedAccessType(t, getLiteralType(childIndex));
+                }
+                else {
+                    return t;
+                }
+            }, /*noReductions*/ true);
+        }
+        function getContextualTypeForJsxExpression(node) {
+            var exprParent = node.parent;
+            return ts.isJsxAttributeLike(exprParent)
+                ? getContextualType(node)
+                : ts.isJsxElement(exprParent)
+                    ? getContextualTypeForChildJsxExpression(exprParent, node)
+                    : undefined;
+        }
+        function getContextualTypeForJsxAttribute(attribute) {
+            // When we trying to resolve JsxOpeningLikeElement as a stateless function element, we will already give its attributes a contextual type
+            // which is a type of the parameter of the signature we are trying out.
+            // If there is no contextual type (e.g. we are trying to resolve stateful component), get attributes type from resolving element's tagName
+            if (ts.isJsxAttribute(attribute)) {
+                var attributesType = getApparentTypeOfContextualType(attribute.parent);
+                if (!attributesType || isTypeAny(attributesType)) {
+                    return undefined;
+                }
+                return getTypeOfPropertyOfContextualType(attributesType, attribute.name.escapedText);
+            }
+            else {
+                return getContextualType(attribute.parent);
+            }
+        }
+        // Return true if the given expression is possibly a discriminant value. We limit the kinds of
+        // expressions we check to those that don't depend on their contextual type in order not to cause
+        // recursive (and possibly infinite) invocations of getContextualType.
+        function isPossiblyDiscriminantValue(node) {
+            switch (node.kind) {
+                case 10 /* StringLiteral */:
+                case 8 /* NumericLiteral */:
+                case 9 /* BigIntLiteral */:
+                case 14 /* NoSubstitutionTemplateLiteral */:
+                case 102 /* TrueKeyword */:
+                case 87 /* FalseKeyword */:
+                case 96 /* NullKeyword */:
+                case 72 /* Identifier */:
+                case 141 /* UndefinedKeyword */:
+                    return true;
+                case 189 /* PropertyAccessExpression */:
+                case 195 /* ParenthesizedExpression */:
+                    return isPossiblyDiscriminantValue(node.expression);
+                case 270 /* JsxExpression */:
+                    return !node.expression || isPossiblyDiscriminantValue(node.expression);
+            }
+            return false;
+        }
+        function discriminateContextualTypeByObjectMembers(node, contextualType) {
+            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 275 /* PropertyAssignment */ && isPossiblyDiscriminantValue(p.initializer) && isDiscriminantProperty(contextualType, p.symbol.escapedName); }), function (prop) { return [function () { return checkExpression(prop.initializer); }, prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
+        }
+        function discriminateContextualTypeByJSXAttributes(node, contextualType) {
+            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 267 /* JsxAttribute */ && isDiscriminantProperty(contextualType, p.symbol.escapedName) && (!p.initializer || isPossiblyDiscriminantValue(p.initializer)); }), function (prop) { return [!prop.initializer ? (function () { return trueType; }) : (function () { return checkExpression(prop.initializer); }), prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
+        }
+        // Return the contextual type for a given expression node. During overload resolution, a contextual type may temporarily
+        // be "pushed" onto a node using the contextualType property.
+        function getApparentTypeOfContextualType(node) {
+            var contextualType = getContextualType(node);
+            contextualType = contextualType && mapType(contextualType, getApparentType);
+            if (contextualType && contextualType.flags & 1048576 /* Union */) {
+                if (ts.isObjectLiteralExpression(node)) {
+                    return discriminateContextualTypeByObjectMembers(node, contextualType);
+                }
+                else if (ts.isJsxAttributes(node)) {
+                    return discriminateContextualTypeByJSXAttributes(node, contextualType);
+                }
+            }
+            return contextualType;
+        }
+        /**
+         * Woah! Do you really want to use this function?
+         *
+         * Unless you're trying to get the *non-apparent* type for a
+         * value-literal type or you're authoring relevant portions of this algorithm,
+         * you probably meant to use 'getApparentTypeOfContextualType'.
+         * Otherwise this may not be very useful.
+         *
+         * In cases where you *are* working on this function, you should understand
+         * when it is appropriate to use 'getContextualType' and 'getApparentTypeOfContextualType'.
+         *
+         *   - Use 'getContextualType' when you are simply going to propagate the result to the expression.
+         *   - Use 'getApparentTypeOfContextualType' when you're going to need the members of the type.
+         *
+         * @param node the expression whose contextual type will be returned.
+         * @returns the contextual type of an expression.
+         */
+        function getContextualType(node) {
+            if (node.flags & 8388608 /* InWithStatement */) {
+                // We cannot answer semantic questions within a with block, do not proceed any further
+                return undefined;
+            }
+            if (node.contextualType) {
+                return node.contextualType;
+            }
+            var parent = node.parent;
+            switch (parent.kind) {
+                case 237 /* VariableDeclaration */:
+                case 151 /* Parameter */:
+                case 154 /* PropertyDeclaration */:
+                case 153 /* PropertySignature */:
+                case 186 /* BindingElement */:
+                    return getContextualTypeForInitializerExpression(node);
+                case 197 /* ArrowFunction */:
+                case 230 /* ReturnStatement */:
+                    return getContextualTypeForReturnExpression(node);
+                case 207 /* YieldExpression */:
+                    return getContextualTypeForYieldOperand(parent);
+                case 201 /* AwaitExpression */:
+                    return getContextualTypeForAwaitOperand(parent);
+                case 191 /* CallExpression */:
+                case 192 /* NewExpression */:
+                    return getContextualTypeForArgument(parent, node);
+                case 194 /* TypeAssertionExpression */:
+                case 212 /* AsExpression */:
+                    return getTypeFromTypeNode(parent.type);
+                case 204 /* BinaryExpression */:
+                    return getContextualTypeForBinaryOperand(node);
+                case 275 /* PropertyAssignment */:
+                case 276 /* ShorthandPropertyAssignment */:
+                    return getContextualTypeForObjectLiteralElement(parent);
+                case 277 /* SpreadAssignment */:
+                    return getApparentTypeOfContextualType(parent.parent);
+                case 187 /* ArrayLiteralExpression */: {
+                    var arrayLiteral = parent;
+                    var type = getApparentTypeOfContextualType(arrayLiteral);
+                    return getContextualTypeForElementExpression(type, ts.indexOfNode(arrayLiteral.elements, node));
+                }
+                case 205 /* ConditionalExpression */:
+                    return getContextualTypeForConditionalOperand(node);
+                case 216 /* TemplateSpan */:
+                    ts.Debug.assert(parent.parent.kind === 206 /* TemplateExpression */);
+                    return getContextualTypeForSubstitutionExpression(parent.parent, node);
+                case 195 /* ParenthesizedExpression */: {
+                    // Like in `checkParenthesizedExpression`, an `/** @type {xyz} */` comment before a parenthesized expression acts as a type cast.
+                    var tag = ts.isInJSFile(parent) ? ts.getJSDocTypeTag(parent) : undefined;
+                    return tag ? getTypeFromTypeNode(tag.typeExpression.type) : getContextualType(parent);
+                }
+                case 270 /* JsxExpression */:
+                    return getContextualTypeForJsxExpression(parent);
+                case 267 /* JsxAttribute */:
+                case 269 /* JsxSpreadAttribute */:
+                    return getContextualTypeForJsxAttribute(parent);
+                case 262 /* JsxOpeningElement */:
+                case 261 /* JsxSelfClosingElement */:
+                    return getContextualJsxElementAttributesType(parent);
+            }
+            return undefined;
+        }
+        function getContextualMapper(node) {
+            var ancestor = ts.findAncestor(node, function (n) { return !!n.contextualMapper; });
+            return ancestor ? ancestor.contextualMapper : identityMapper;
+        }
+        function getContextualJsxElementAttributesType(node) {
+            if (ts.isJsxOpeningElement(node) && node.parent.contextualType) {
+                // Contextually applied type is moved from attributes up to the outer jsx attributes so when walking up from the children they get hit
+                // _However_ to hit them from the _attributes_ we must look for them here; otherwise we'll used the declared type
+                // (as below) instead!
+                return node.parent.contextualType;
+            }
+            return getContextualTypeForArgumentAtIndex(node, 0);
+        }
+        function getEffectiveFirstArgumentForJsxSignature(signature, node) {
+            return getJsxReferenceKind(node) !== 0 /* Component */ ? getJsxPropsTypeFromCallSignature(signature, node) : getJsxPropsTypeFromClassType(signature, node);
+        }
+        function getJsxPropsTypeFromCallSignature(sig, context) {
+            var propsType = getTypeOfFirstParameterOfSignatureWithFallback(sig, emptyObjectType);
+            propsType = getJsxManagedAttributesFromLocatedAttributes(context, getJsxNamespaceAt(context), propsType);
+            var intrinsicAttribs = getJsxType(JsxNames.IntrinsicAttributes, context);
+            if (intrinsicAttribs !== errorType) {
+                propsType = intersectTypes(intrinsicAttribs, propsType);
+            }
+            return propsType;
+        }
+        function getJsxPropsTypeForSignatureFromMember(sig, forcedLookupLocation) {
+            if (sig.unionSignatures) {
+                // JSX Elements using the legacy `props`-field based lookup (eg, react class components) need to treat the `props` member as an input
+                // instead of an output position when resolving the signature. We need to go back to the input signatures of the composite signature,
+                // get the type of `props` on each return type individually, and then _intersect them_, rather than union them (as would normally occur
+                // for a union signature). It's an unfortunate quirk of looking in the output of the signature for the type we want to use for the input.
+                // The default behavior of `getTypeOfFirstParameterOfSignatureWithFallback` when no `props` member name is defined is much more sane.
+                var results = [];
+                for (var _i = 0, _a = sig.unionSignatures; _i < _a.length; _i++) {
+                    var signature = _a[_i];
+                    var instance = getReturnTypeOfSignature(signature);
+                    if (isTypeAny(instance)) {
+                        return instance;
+                    }
+                    var propType = getTypeOfPropertyOfType(instance, forcedLookupLocation);
+                    if (!propType) {
+                        return;
+                    }
+                    results.push(propType);
+                }
+                return getIntersectionType(results);
+            }
+            var instanceType = getReturnTypeOfSignature(sig);
+            return isTypeAny(instanceType) ? instanceType : getTypeOfPropertyOfType(instanceType, forcedLookupLocation);
+        }
+        function getStaticTypeOfReferencedJsxConstructor(context) {
+            if (isJsxIntrinsicIdentifier(context.tagName)) {
+                var result = getIntrinsicAttributesTypeFromJsxOpeningLikeElement(context);
+                var fakeSignature = createSignatureForJSXIntrinsic(context, result);
+                return getOrCreateTypeFromSignature(fakeSignature);
+            }
+            var tagType = checkExpressionCached(context.tagName);
+            if (tagType.flags & 128 /* StringLiteral */) {
+                var result = getIntrinsicAttributesTypeFromStringLiteralType(tagType, context);
+                if (!result) {
+                    return errorType;
+                }
+                var fakeSignature = createSignatureForJSXIntrinsic(context, result);
+                return getOrCreateTypeFromSignature(fakeSignature);
+            }
+            return tagType;
+        }
+        function getJsxManagedAttributesFromLocatedAttributes(context, ns, attributesType) {
+            var managedSym = getJsxLibraryManagedAttributes(ns);
+            if (managedSym) {
+                var declaredManagedType = getDeclaredTypeOfSymbol(managedSym);
+                var ctorType = getStaticTypeOfReferencedJsxConstructor(context);
+                if (ts.length(declaredManagedType.typeParameters) >= 2) {
+                    var args = fillMissingTypeArguments([ctorType, attributesType], declaredManagedType.typeParameters, 2, ts.isInJSFile(context));
+                    return createTypeReference(declaredManagedType, args);
+                }
+                else if (ts.length(declaredManagedType.aliasTypeArguments) >= 2) {
+                    var args = fillMissingTypeArguments([ctorType, attributesType], declaredManagedType.aliasTypeArguments, 2, ts.isInJSFile(context));
+                    return getTypeAliasInstantiation(declaredManagedType.aliasSymbol, args);
+                }
+            }
+            return attributesType;
+        }
+        function getJsxPropsTypeFromClassType(sig, context) {
+            var ns = getJsxNamespaceAt(context);
+            var forcedLookupLocation = getJsxElementPropertiesName(ns);
+            var attributesType = forcedLookupLocation === undefined
+                // If there is no type ElementAttributesProperty, return the type of the first parameter of the signature, which should be the props type
+                ? getTypeOfFirstParameterOfSignatureWithFallback(sig, emptyObjectType)
+                : forcedLookupLocation === ""
+                    // If there is no e.g. 'props' member in ElementAttributesProperty, use the element class type instead
+                    ? getReturnTypeOfSignature(sig)
+                    // Otherwise get the type of the property on the signature return type
+                    : getJsxPropsTypeForSignatureFromMember(sig, forcedLookupLocation);
+            if (!attributesType) {
+                // There is no property named 'props' on this instance type
+                if (!!forcedLookupLocation && !!ts.length(context.attributes.properties)) {
+                    error(context, ts.Diagnostics.JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property, ts.unescapeLeadingUnderscores(forcedLookupLocation));
+                }
+                return emptyObjectType;
+            }
+            attributesType = getJsxManagedAttributesFromLocatedAttributes(context, ns, attributesType);
+            if (isTypeAny(attributesType)) {
+                // Props is of type 'any' or unknown
+                return attributesType;
+            }
+            else {
+                // Normal case -- add in IntrinsicClassElements<T> and IntrinsicElements
+                var apparentAttributesType = attributesType;
+                var intrinsicClassAttribs = getJsxType(JsxNames.IntrinsicClassAttributes, context);
+                if (intrinsicClassAttribs !== errorType) {
+                    var typeParams = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(intrinsicClassAttribs.symbol);
+                    var hostClassType = getReturnTypeOfSignature(sig);
+                    apparentAttributesType = intersectTypes(typeParams
+                        ? createTypeReference(intrinsicClassAttribs, fillMissingTypeArguments([hostClassType], typeParams, getMinTypeArgumentCount(typeParams), ts.isInJSFile(context)))
+                        : intrinsicClassAttribs, apparentAttributesType);
+                }
+                var intrinsicAttribs = getJsxType(JsxNames.IntrinsicAttributes, context);
+                if (intrinsicAttribs !== errorType) {
+                    apparentAttributesType = intersectTypes(intrinsicAttribs, apparentAttributesType);
+                }
+                return apparentAttributesType;
+            }
+        }
+        // If the given type is an object or union type with a single signature, and if that signature has at
+        // least as many parameters as the given function, return the signature. Otherwise return undefined.
+        function getContextualCallSignature(type, node) {
+            var signatures = getSignaturesOfType(type, 0 /* Call */);
+            if (signatures.length === 1) {
+                var signature = signatures[0];
+                if (!isAritySmaller(signature, node)) {
+                    return signature;
+                }
+            }
+        }
+        /** If the contextual signature has fewer parameters than the function expression, do not use it */
+        function isAritySmaller(signature, target) {
+            var targetParameterCount = 0;
+            for (; targetParameterCount < target.parameters.length; targetParameterCount++) {
+                var param = target.parameters[targetParameterCount];
+                if (param.initializer || param.questionToken || param.dotDotDotToken || isJSDocOptionalParameter(param)) {
+                    break;
+                }
+            }
+            if (target.parameters.length && ts.parameterIsThisKeyword(target.parameters[0])) {
+                targetParameterCount--;
+            }
+            return !hasEffectiveRestParameter(signature) && getParameterCount(signature) < targetParameterCount;
+        }
+        function isFunctionExpressionOrArrowFunction(node) {
+            return node.kind === 196 /* FunctionExpression */ || node.kind === 197 /* ArrowFunction */;
+        }
+        function getContextualSignatureForFunctionLikeDeclaration(node) {
+            // Only function expressions, arrow functions, and object literal methods are contextually typed.
+            return isFunctionExpressionOrArrowFunction(node) || ts.isObjectLiteralMethod(node)
+                ? getContextualSignature(node)
+                : undefined;
+        }
+        function getContextualTypeForFunctionLikeDeclaration(node) {
+            return ts.isObjectLiteralMethod(node) ?
+                getContextualTypeForObjectLiteralMethod(node) :
+                getApparentTypeOfContextualType(node);
+        }
+        // Return the contextual signature for a given expression node. A contextual type provides a
+        // contextual signature if it has a single call signature and if that call signature is non-generic.
+        // If the contextual type is a union type, get the signature from each type possible and if they are
+        // all identical ignoring their return type, the result is same signature but with return type as
+        // union type of return types from these signatures
+        function getContextualSignature(node) {
+            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            var typeTagSignature = getSignatureOfTypeTag(node);
+            if (typeTagSignature) {
+                return typeTagSignature;
+            }
+            var type = getContextualTypeForFunctionLikeDeclaration(node);
+            if (!type) {
+                return undefined;
+            }
+            if (!(type.flags & 1048576 /* Union */)) {
+                return getContextualCallSignature(type, node);
+            }
+            var signatureList;
+            var types = type.types;
+            for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
+                var current = types_14[_i];
+                var signature = getContextualCallSignature(current, node);
+                if (signature) {
+                    if (!signatureList) {
+                        // This signature will contribute to contextual union signature
+                        signatureList = [signature];
+                    }
+                    else if (!compareSignaturesIdentical(signatureList[0], signature, /*partialMatch*/ false, /*ignoreThisTypes*/ true, /*ignoreReturnTypes*/ true, compareTypesIdentical)) {
+                        // Signatures aren't identical, do not use
+                        return undefined;
+                    }
+                    else {
+                        // Use this signature for contextual union signature
+                        signatureList.push(signature);
+                    }
+                }
+            }
+            // Result is union of signatures collected (return type is union of return types of this signature set)
+            var result;
+            if (signatureList) {
+                result = cloneSignature(signatureList[0]);
+                result.unionSignatures = signatureList;
+            }
+            return result;
+        }
+        function checkSpreadExpression(node, checkMode) {
+            if (languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
+                checkExternalEmitHelpers(node, 1536 /* SpreadIncludes */);
+            }
+            var arrayOrIterableType = checkExpression(node.expression, checkMode);
+            return checkIteratedTypeOrElementType(arrayOrIterableType, node.expression, /*allowStringInput*/ false, /*allowAsyncIterables*/ false);
+        }
+        function hasDefaultValue(node) {
+            return (node.kind === 186 /* BindingElement */ && !!node.initializer) ||
+                (node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 59 /* EqualsToken */);
+        }
+        function checkArrayLiteral(node, checkMode, forceTuple) {
+            var elements = node.elements;
+            var elementCount = elements.length;
+            var hasNonEndingSpreadElement = false;
+            var elementTypes = [];
+            var inDestructuringPattern = ts.isAssignmentTarget(node);
+            var contextualType = getApparentTypeOfContextualType(node);
+            for (var index = 0; index < elementCount; index++) {
+                var e = elements[index];
+                if (inDestructuringPattern && e.kind === 208 /* SpreadElement */) {
+                    // Given the following situation:
+                    //    var c: {};
+                    //    [...c] = ["", 0];
+                    //
+                    // c is represented in the tree as a spread element in an array literal.
+                    // But c really functions as a rest element, and its purpose is to provide
+                    // a contextual type for the right hand side of the assignment. Therefore,
+                    // instead of calling checkExpression on "...c", which will give an error
+                    // if c is not iterable/array-like, we need to act as if we are trying to
+                    // get the contextual element type from it. So we do something similar to
+                    // getContextualTypeForElementExpression, which will crucially not error
+                    // if there is no index type / iterated type.
+                    var restArrayType = checkExpression(e.expression, checkMode, forceTuple);
+                    var restElementType = getIndexTypeOfType(restArrayType, 1 /* Number */) ||
+                        getIteratedTypeOrElementType(restArrayType, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false, /*checkAssignability*/ false);
+                    if (restElementType) {
+                        elementTypes.push(restElementType);
+                    }
+                }
+                else {
+                    var elementContextualType = getContextualTypeForElementExpression(contextualType, index);
+                    var type = checkExpressionForMutableLocation(e, checkMode, elementContextualType, forceTuple);
+                    elementTypes.push(type);
+                }
+                if (index < elementCount - 1 && e.kind === 208 /* SpreadElement */) {
+                    hasNonEndingSpreadElement = true;
+                }
+            }
+            if (!hasNonEndingSpreadElement) {
+                var hasRestElement = elementCount > 0 && elements[elementCount - 1].kind === 208 /* SpreadElement */;
+                var minLength = elementCount - (hasRestElement ? 1 : 0);
+                // If array literal is actually a destructuring pattern, mark it as an implied type. We do this such
+                // that we get the same behavior for "var [x, y] = []" and "[x, y] = []".
+                var tupleResult = void 0;
+                if (inDestructuringPattern && minLength > 0) {
+                    var type = cloneTypeReference(createTupleType(elementTypes, minLength, hasRestElement));
+                    type.pattern = node;
+                    return type;
+                }
+                else if (tupleResult = getArrayLiteralTupleTypeIfApplicable(elementTypes, contextualType, hasRestElement, elementCount)) {
+                    return tupleResult;
+                }
+                else if (forceTuple) {
+                    return createTupleType(elementTypes, minLength, hasRestElement);
+                }
+            }
+            return getArrayLiteralType(elementTypes, 2 /* Subtype */);
+        }
+        function getArrayLiteralTupleTypeIfApplicable(elementTypes, contextualType, hasRestElement, elementCount) {
+            if (elementCount === void 0) { elementCount = elementTypes.length; }
+            // Infer a tuple type when the contextual type is or contains a tuple-like type
+            if (contextualType && forEachType(contextualType, isTupleLikeType)) {
+                var minLength = elementCount - (hasRestElement ? 1 : 0);
+                var pattern = contextualType.pattern;
+                // If array literal is contextually typed by a binding pattern or an assignment pattern, pad the resulting
+                // tuple type with the corresponding binding or assignment element types to make the lengths equal.
+                if (!hasRestElement && pattern && (pattern.kind === 185 /* ArrayBindingPattern */ || pattern.kind === 187 /* ArrayLiteralExpression */)) {
+                    var patternElements = pattern.elements;
+                    for (var i = elementCount; i < patternElements.length; i++) {
+                        var e = patternElements[i];
+                        if (hasDefaultValue(e)) {
+                            elementTypes.push(contextualType.typeArguments[i]);
+                        }
+                        else if (i < patternElements.length - 1 || !(e.kind === 186 /* BindingElement */ && e.dotDotDotToken || e.kind === 208 /* SpreadElement */)) {
+                            if (e.kind !== 210 /* OmittedExpression */) {
+                                error(e, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
+                            }
+                            elementTypes.push(strictNullChecks ? implicitNeverType : undefinedWideningType);
+                        }
+                    }
+                }
+                return createTupleType(elementTypes, minLength, hasRestElement);
+            }
+        }
+        function getArrayLiteralType(elementTypes, unionReduction) {
+            if (unionReduction === void 0) { unionReduction = 1 /* Literal */; }
+            return createArrayType(elementTypes.length ?
+                getUnionType(elementTypes, unionReduction) :
+                strictNullChecks ? implicitNeverType : undefinedWideningType);
+        }
+        function isNumericName(name) {
+            switch (name.kind) {
+                case 149 /* ComputedPropertyName */:
+                    return isNumericComputedName(name);
+                case 72 /* Identifier */:
+                    return isNumericLiteralName(name.escapedText);
+                case 8 /* NumericLiteral */:
+                case 10 /* StringLiteral */:
+                    return isNumericLiteralName(name.text);
+                default:
+                    return false;
+            }
+        }
+        function isNumericComputedName(name) {
+            // It seems odd to consider an expression of type Any to result in a numeric name,
+            // but this behavior is consistent with checkIndexedAccess
+            return isTypeAssignableToKind(checkComputedPropertyName(name), 296 /* NumberLike */);
+        }
+        function isInfinityOrNaNString(name) {
+            return name === "Infinity" || name === "-Infinity" || name === "NaN";
+        }
+        function isNumericLiteralName(name) {
+            // The intent of numeric names is that
+            //     - they are names with text in a numeric form, and that
+            //     - setting properties/indexing with them is always equivalent to doing so with the numeric literal 'numLit',
+            //         acquired by applying the abstract 'ToNumber' operation on the name's text.
+            //
+            // The subtlety is in the latter portion, as we cannot reliably say that anything that looks like a numeric literal is a numeric name.
+            // In fact, it is the case that the text of the name must be equal to 'ToString(numLit)' for this to hold.
+            //
+            // Consider the property name '"0xF00D"'. When one indexes with '0xF00D', they are actually indexing with the value of 'ToString(0xF00D)'
+            // according to the ECMAScript specification, so it is actually as if the user indexed with the string '"61453"'.
+            // Thus, the text of all numeric literals equivalent to '61543' such as '0xF00D', '0xf00D', '0170015', etc. are not valid numeric names
+            // because their 'ToString' representation is not equal to their original text.
+            // This is motivated by ECMA-262 sections 9.3.1, 9.8.1, 11.1.5, and 11.2.1.
+            //
+            // Here, we test whether 'ToString(ToNumber(name))' is exactly equal to 'name'.
+            // The '+' prefix operator is equivalent here to applying the abstract ToNumber operation.
+            // Applying the 'toString()' method on a number gives us the abstract ToString operation on a number.
+            //
+            // Note that this accepts the values 'Infinity', '-Infinity', and 'NaN', and that this is intentional.
+            // This is desired behavior, because when indexing with them as numeric entities, you are indexing
+            // with the strings '"Infinity"', '"-Infinity"', and '"NaN"' respectively.
+            return (+name).toString() === name;
+        }
+        function checkComputedPropertyName(node) {
+            var links = getNodeLinks(node.expression);
+            if (!links.resolvedType) {
+                links.resolvedType = checkExpression(node.expression);
+                // This will allow types number, string, symbol or any. It will also allow enums, the unknown
+                // type, and any union of these types (like string | number).
+                if (links.resolvedType.flags & 98304 /* Nullable */ ||
+                    !isTypeAssignableToKind(links.resolvedType, 132 /* StringLike */ | 296 /* NumberLike */ | 12288 /* ESSymbolLike */) &&
+                        !isTypeAssignableTo(links.resolvedType, stringNumberSymbolType)) {
+                    error(node, ts.Diagnostics.A_computed_property_name_must_be_of_type_string_number_symbol_or_any);
+                }
+                else {
+                    checkThatExpressionIsProperSymbolReference(node.expression, links.resolvedType, /*reportError*/ true);
+                }
+            }
+            return links.resolvedType;
+        }
+        function getObjectLiteralIndexInfo(propertyNodes, offset, properties, kind) {
+            var propTypes = [];
+            for (var i = 0; i < properties.length; i++) {
+                if (kind === 0 /* String */ || isNumericName(propertyNodes[i + offset].name)) {
+                    propTypes.push(getTypeOfSymbol(properties[i]));
+                }
+            }
+            var unionType = propTypes.length ? getUnionType(propTypes, 2 /* Subtype */) : undefinedType;
+            return createIndexInfo(unionType, /*isReadonly*/ false);
+        }
+        function getImmediateAliasedSymbol(symbol) {
+            ts.Debug.assert((symbol.flags & 2097152 /* Alias */) !== 0, "Should only get Alias here.");
+            var links = getSymbolLinks(symbol);
+            if (!links.immediateTarget) {
+                var node = getDeclarationOfAliasSymbol(symbol);
+                if (!node)
+                    return ts.Debug.fail();
+                links.immediateTarget = getTargetOfAliasDeclaration(node, /*dontRecursivelyResolve*/ true);
+            }
+            return links.immediateTarget;
+        }
+        function checkObjectLiteral(node, checkMode) {
+            var inDestructuringPattern = ts.isAssignmentTarget(node);
+            // Grammar checking
+            checkGrammarObjectLiteralExpression(node, inDestructuringPattern);
+            var propertiesTable;
+            var propertiesArray = [];
+            var spread = emptyObjectType;
+            var propagatedFlags = 0;
+            var contextualType = getApparentTypeOfContextualType(node);
+            var contextualTypeHasPattern = contextualType && contextualType.pattern &&
+                (contextualType.pattern.kind === 184 /* ObjectBindingPattern */ || contextualType.pattern.kind === 188 /* ObjectLiteralExpression */);
+            var isInJavascript = ts.isInJSFile(node) && !ts.isInJsonFile(node);
+            var enumTag = ts.getJSDocEnumTag(node);
+            var isJSObjectLiteral = !contextualType && isInJavascript && !enumTag;
+            var typeFlags = 0;
+            var patternWithComputedProperties = false;
+            var hasComputedStringProperty = false;
+            var hasComputedNumberProperty = false;
+            propertiesTable = ts.createSymbolTable();
+            var offset = 0;
+            for (var i = 0; i < node.properties.length; i++) {
+                var memberDecl = node.properties[i];
+                var member = getSymbolOfNode(memberDecl);
+                var computedNameType = memberDecl.name && memberDecl.name.kind === 149 /* ComputedPropertyName */ && !ts.isWellKnownSymbolSyntactically(memberDecl.name.expression) ?
+                    checkComputedPropertyName(memberDecl.name) : undefined;
+                if (memberDecl.kind === 275 /* PropertyAssignment */ ||
+                    memberDecl.kind === 276 /* ShorthandPropertyAssignment */ ||
+                    ts.isObjectLiteralMethod(memberDecl)) {
+                    var type = memberDecl.kind === 275 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) :
+                        memberDecl.kind === 276 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(memberDecl.name, checkMode) :
+                            checkObjectLiteralMethod(memberDecl, checkMode);
+                    if (isInJavascript) {
+                        var jsDocType = getTypeForDeclarationFromJSDocComment(memberDecl);
+                        if (jsDocType) {
+                            checkTypeAssignableTo(type, jsDocType, memberDecl);
+                            type = jsDocType;
+                        }
+                        else if (enumTag && enumTag.typeExpression) {
+                            checkTypeAssignableTo(type, getTypeFromTypeNode(enumTag.typeExpression), memberDecl);
+                        }
+                    }
+                    typeFlags |= type.flags;
+                    var nameType = computedNameType && isTypeUsableAsPropertyName(computedNameType) ? computedNameType : undefined;
+                    var prop = nameType ?
+                        createSymbol(4 /* Property */ | member.flags, getPropertyNameFromType(nameType), 2048 /* Late */) :
+                        createSymbol(4 /* Property */ | member.flags, member.escapedName);
+                    if (nameType) {
+                        prop.nameType = nameType;
+                    }
+                    if (inDestructuringPattern) {
+                        // If object literal is an assignment pattern and if the assignment pattern specifies a default value
+                        // for the property, make the property optional.
+                        var isOptional = (memberDecl.kind === 275 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
+                            (memberDecl.kind === 276 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
+                        if (isOptional) {
+                            prop.flags |= 16777216 /* Optional */;
+                        }
+                    }
+                    else if (contextualTypeHasPattern && !(ts.getObjectFlags(contextualType) & 512 /* ObjectLiteralPatternWithComputedProperties */)) {
+                        // If object literal is contextually typed by the implied type of a binding pattern, and if the
+                        // binding pattern specifies a default value for the property, make the property optional.
+                        var impliedProp = getPropertyOfType(contextualType, member.escapedName);
+                        if (impliedProp) {
+                            prop.flags |= impliedProp.flags & 16777216 /* Optional */;
+                        }
+                        else if (!compilerOptions.suppressExcessPropertyErrors && !getIndexInfoOfType(contextualType, 0 /* String */)) {
+                            error(memberDecl.name, ts.Diagnostics.Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1, symbolToString(member), typeToString(contextualType));
+                        }
+                    }
+                    prop.declarations = member.declarations;
+                    prop.parent = member.parent;
+                    if (member.valueDeclaration) {
+                        prop.valueDeclaration = member.valueDeclaration;
+                    }
+                    prop.type = type;
+                    prop.target = member;
+                    member = prop;
+                }
+                else if (memberDecl.kind === 277 /* SpreadAssignment */) {
+                    if (languageVersion < 2 /* ES2015 */) {
+                        checkExternalEmitHelpers(memberDecl, 2 /* Assign */);
+                    }
+                    if (propertiesArray.length > 0) {
+                        spread = getSpreadType(spread, createObjectLiteralType(), node.symbol, propagatedFlags, 32768 /* FreshLiteral */);
+                        propertiesArray = [];
+                        propertiesTable = ts.createSymbolTable();
+                        hasComputedStringProperty = false;
+                        hasComputedNumberProperty = false;
+                        typeFlags = 0;
+                    }
+                    var type = checkExpression(memberDecl.expression);
+                    if (!isValidSpreadType(type)) {
+                        error(memberDecl, ts.Diagnostics.Spread_types_may_only_be_created_from_object_types);
+                        return errorType;
+                    }
+                    spread = getSpreadType(spread, type, node.symbol, propagatedFlags, 32768 /* FreshLiteral */);
+                    offset = i + 1;
+                    continue;
+                }
+                else {
+                    // TypeScript 1.0 spec (April 2014)
+                    // A get accessor declaration is processed in the same manner as
+                    // an ordinary function declaration(section 6.1) with no parameters.
+                    // A set accessor declaration is processed in the same manner
+                    // as an ordinary function declaration with a single parameter and a Void return type.
+                    ts.Debug.assert(memberDecl.kind === 158 /* GetAccessor */ || memberDecl.kind === 159 /* SetAccessor */);
+                    checkNodeDeferred(memberDecl);
+                }
+                if (computedNameType && !(computedNameType.flags & 8576 /* StringOrNumberLiteralOrUnique */)) {
+                    if (isTypeAssignableTo(computedNameType, stringNumberSymbolType)) {
+                        if (isTypeAssignableTo(computedNameType, numberType)) {
+                            hasComputedNumberProperty = true;
+                        }
+                        else {
+                            hasComputedStringProperty = true;
+                        }
+                        if (inDestructuringPattern) {
+                            patternWithComputedProperties = true;
+                        }
+                    }
+                }
+                else {
+                    propertiesTable.set(member.escapedName, member);
+                }
+                propertiesArray.push(member);
+            }
+            // If object literal is contextually typed by the implied type of a binding pattern, augment the result
+            // type with those properties for which the binding pattern specifies a default value.
+            if (contextualTypeHasPattern) {
+                for (var _i = 0, _a = getPropertiesOfType(contextualType); _i < _a.length; _i++) {
+                    var prop = _a[_i];
+                    if (!propertiesTable.get(prop.escapedName) && !(spread && getPropertyOfType(spread, prop.escapedName))) {
+                        if (!(prop.flags & 16777216 /* Optional */)) {
+                            error(prop.valueDeclaration || prop.bindingElement, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
+                        }
+                        propertiesTable.set(prop.escapedName, prop);
+                        propertiesArray.push(prop);
+                    }
+                }
+            }
+            if (spread !== emptyObjectType) {
+                if (propertiesArray.length > 0) {
+                    spread = getSpreadType(spread, createObjectLiteralType(), node.symbol, propagatedFlags, 32768 /* FreshLiteral */);
+                }
+                return spread;
+            }
+            return createObjectLiteralType();
+            function createObjectLiteralType() {
+                var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node.properties, offset, propertiesArray, 0 /* String */) : undefined;
+                var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node.properties, offset, propertiesArray, 1 /* Number */) : undefined;
+                var result = createAnonymousType(node.symbol, propertiesTable, ts.emptyArray, ts.emptyArray, stringIndexInfo, numberIndexInfo);
+                result.flags |= 268435456 /* ContainsObjectLiteral */ | typeFlags & 939524096 /* PropagatingFlags */;
+                result.objectFlags |= 128 /* ObjectLiteral */ | freshObjectLiteralFlag;
+                if (isJSObjectLiteral) {
+                    result.objectFlags |= 16384 /* JSLiteral */;
+                }
+                if (patternWithComputedProperties) {
+                    result.objectFlags |= 512 /* ObjectLiteralPatternWithComputedProperties */;
+                }
+                if (inDestructuringPattern) {
+                    result.pattern = node;
+                }
+                propagatedFlags |= result.flags & 939524096 /* PropagatingFlags */;
+                return result;
+            }
+        }
+        function isValidSpreadType(type) {
+            return !!(type.flags & (3 /* AnyOrUnknown */ | 67108864 /* NonPrimitive */ | 524288 /* Object */ | 58982400 /* InstantiableNonPrimitive */) ||
+                getFalsyFlags(type) & 117632 /* DefinitelyFalsy */ && isValidSpreadType(removeDefinitelyFalsyTypes(type)) ||
+                type.flags & 3145728 /* UnionOrIntersection */ && ts.every(type.types, isValidSpreadType));
+        }
+        function checkJsxSelfClosingElementDeferred(node) {
+            checkJsxOpeningLikeElementOrOpeningFragment(node);
+        }
+        function checkJsxSelfClosingElement(node, _checkMode) {
+            checkNodeDeferred(node);
+            return getJsxElementTypeAt(node) || anyType;
+        }
+        function checkJsxElementDeferred(node) {
+            // Check attributes
+            checkJsxOpeningLikeElementOrOpeningFragment(node.openingElement);
+            // Perform resolution on the closing tag so that rename/go to definition/etc work
+            if (isJsxIntrinsicIdentifier(node.closingElement.tagName)) {
+                getIntrinsicTagSymbol(node.closingElement);
+            }
+            else {
+                checkExpression(node.closingElement.tagName);
+            }
+            checkJsxChildren(node);
+        }
+        function checkJsxElement(node, _checkMode) {
+            checkNodeDeferred(node);
+            return getJsxElementTypeAt(node) || anyType;
+        }
+        function checkJsxFragment(node) {
+            checkJsxOpeningLikeElementOrOpeningFragment(node.openingFragment);
+            if (compilerOptions.jsx === 2 /* React */ && (compilerOptions.jsxFactory || ts.getSourceFileOfNode(node).pragmas.has("jsx"))) {
+                error(node, compilerOptions.jsxFactory
+                    ? ts.Diagnostics.JSX_fragment_is_not_supported_when_using_jsxFactory
+                    : ts.Diagnostics.JSX_fragment_is_not_supported_when_using_an_inline_JSX_factory_pragma);
+            }
+            checkJsxChildren(node);
+            return getJsxElementTypeAt(node) || anyType;
+        }
+        /**
+         * Returns true iff the JSX element name would be a valid JS identifier, ignoring restrictions about keywords not being identifiers
+         */
+        function isUnhyphenatedJsxName(name) {
+            // - is the only character supported in JSX attribute names that isn't valid in JavaScript identifiers
+            return !ts.stringContains(name, "-");
+        }
+        /**
+         * Returns true iff React would emit this tag name as a string rather than an identifier or qualified name
+         */
+        function isJsxIntrinsicIdentifier(tagName) {
+            return tagName.kind === 72 /* Identifier */ && ts.isIntrinsicJsxName(tagName.escapedText);
+        }
+        function checkJsxAttribute(node, checkMode) {
+            return node.initializer
+                ? checkExpressionForMutableLocation(node.initializer, checkMode)
+                : trueType; // <Elem attr /> is sugar for <Elem attr={true} />
+        }
+        /**
+         * Get attributes type of the JSX opening-like element. The result is from resolving "attributes" property of the opening-like element.
+         *
+         * @param openingLikeElement a JSX opening-like element
+         * @param filter a function to remove attributes that will not participate in checking whether attributes are assignable
+         * @return an anonymous type (similar to the one returned by checkObjectLiteral) in which its properties are attributes property.
+         * @remarks Because this function calls getSpreadType, it needs to use the same checks as checkObjectLiteral,
+         * which also calls getSpreadType.
+         */
+        function createJsxAttributesTypeFromAttributesProperty(openingLikeElement, checkMode) {
+            var attributes = openingLikeElement.attributes;
+            var attributesTable = ts.createSymbolTable();
+            var spread = emptyJsxObjectType;
+            var hasSpreadAnyType = false;
+            var typeToIntersect;
+            var explicitlySpecifyChildrenAttribute = false;
+            var typeFlags = 0;
+            var objectFlags = 4096 /* JsxAttributes */;
+            var jsxChildrenPropertyName = getJsxElementChildrenPropertyName(getJsxNamespaceAt(openingLikeElement));
+            for (var _i = 0, _a = attributes.properties; _i < _a.length; _i++) {
+                var attributeDecl = _a[_i];
+                var member = attributeDecl.symbol;
+                if (ts.isJsxAttribute(attributeDecl)) {
+                    var exprType = checkJsxAttribute(attributeDecl, checkMode);
+                    typeFlags |= exprType.flags & 939524096 /* PropagatingFlags */;
+                    var attributeSymbol = createSymbol(4 /* Property */ | 33554432 /* Transient */ | member.flags, member.escapedName);
+                    attributeSymbol.declarations = member.declarations;
+                    attributeSymbol.parent = member.parent;
+                    if (member.valueDeclaration) {
+                        attributeSymbol.valueDeclaration = member.valueDeclaration;
+                    }
+                    attributeSymbol.type = exprType;
+                    attributeSymbol.target = member;
+                    attributesTable.set(attributeSymbol.escapedName, attributeSymbol);
+                    if (attributeDecl.name.escapedText === jsxChildrenPropertyName) {
+                        explicitlySpecifyChildrenAttribute = true;
+                    }
+                }
+                else {
+                    ts.Debug.assert(attributeDecl.kind === 269 /* JsxSpreadAttribute */);
+                    if (attributesTable.size > 0) {
+                        spread = getSpreadType(spread, createJsxAttributesType(), attributes.symbol, typeFlags, objectFlags);
+                        attributesTable = ts.createSymbolTable();
+                    }
+                    var exprType = checkExpressionCached(attributeDecl.expression, checkMode);
+                    if (isTypeAny(exprType)) {
+                        hasSpreadAnyType = true;
+                    }
+                    if (isValidSpreadType(exprType)) {
+                        spread = getSpreadType(spread, exprType, attributes.symbol, typeFlags, objectFlags);
+                    }
+                    else {
+                        typeToIntersect = typeToIntersect ? getIntersectionType([typeToIntersect, exprType]) : exprType;
+                    }
+                }
+            }
+            if (!hasSpreadAnyType) {
+                if (attributesTable.size > 0) {
+                    spread = getSpreadType(spread, createJsxAttributesType(), attributes.symbol, typeFlags, objectFlags);
+                }
+            }
+            // Handle children attribute
+            var parent = openingLikeElement.parent.kind === 260 /* JsxElement */ ? openingLikeElement.parent : undefined;
+            // We have to check that openingElement of the parent is the one we are visiting as this may not be true for selfClosingElement
+            if (parent && parent.openingElement === openingLikeElement && parent.children.length > 0) {
+                var childrenTypes = checkJsxChildren(parent, checkMode);
+                if (!hasSpreadAnyType && jsxChildrenPropertyName && jsxChildrenPropertyName !== "") {
+                    // Error if there is a attribute named "children" explicitly specified and children element.
+                    // This is because children element will overwrite the value from attributes.
+                    // Note: we will not warn "children" attribute overwritten if "children" attribute is specified in object spread.
+                    if (explicitlySpecifyChildrenAttribute) {
+                        error(attributes, ts.Diagnostics._0_are_specified_twice_The_attribute_named_0_will_be_overwritten, ts.unescapeLeadingUnderscores(jsxChildrenPropertyName));
+                    }
+                    var contextualType = getApparentTypeOfContextualType(openingLikeElement.attributes);
+                    var childrenContextualType = contextualType && getTypeOfPropertyOfContextualType(contextualType, jsxChildrenPropertyName);
+                    // If there are children in the body of JSX element, create dummy attribute "children" with the union of children types so that it will pass the attribute checking process
+                    var childrenPropSymbol = createSymbol(4 /* Property */ | 33554432 /* Transient */, jsxChildrenPropertyName);
+                    childrenPropSymbol.type = childrenTypes.length === 1 ?
+                        childrenTypes[0] :
+                        (getArrayLiteralTupleTypeIfApplicable(childrenTypes, childrenContextualType, /*hasRestElement*/ false) || createArrayType(getUnionType(childrenTypes)));
+                    // Fake up a property declaration for the children
+                    childrenPropSymbol.valueDeclaration = ts.createPropertySignature(/*modifiers*/ undefined, ts.unescapeLeadingUnderscores(jsxChildrenPropertyName), /*questionToken*/ undefined, /*type*/ undefined, /*initializer*/ undefined);
+                    childrenPropSymbol.valueDeclaration.parent = attributes;
+                    childrenPropSymbol.valueDeclaration.symbol = childrenPropSymbol;
+                    var childPropMap = ts.createSymbolTable();
+                    childPropMap.set(jsxChildrenPropertyName, childrenPropSymbol);
+                    spread = getSpreadType(spread, createAnonymousType(attributes.symbol, childPropMap, ts.emptyArray, ts.emptyArray, /*stringIndexInfo*/ undefined, /*numberIndexInfo*/ undefined), attributes.symbol, typeFlags, objectFlags);
+                }
+            }
+            if (hasSpreadAnyType) {
+                return anyType;
+            }
+            if (typeToIntersect && spread !== emptyJsxObjectType) {
+                return getIntersectionType([typeToIntersect, spread]);
+            }
+            return typeToIntersect || (spread === emptyJsxObjectType ? createJsxAttributesType() : spread);
+            /**
+             * Create anonymous type from given attributes symbol table.
+             * @param symbol a symbol of JsxAttributes containing attributes corresponding to attributesTable
+             * @param attributesTable a symbol table of attributes property
+             */
+            function createJsxAttributesType() {
+                objectFlags |= freshObjectLiteralFlag;
+                var result = createAnonymousType(attributes.symbol, attributesTable, ts.emptyArray, ts.emptyArray, /*stringIndexInfo*/ undefined, /*numberIndexInfo*/ undefined);
+                result.flags |= 268435456 /* ContainsObjectLiteral */ | typeFlags;
+                result.objectFlags |= 128 /* ObjectLiteral */ | objectFlags;
+                return result;
+            }
+        }
+        function checkJsxChildren(node, checkMode) {
+            var childrenTypes = [];
+            for (var _i = 0, _a = node.children; _i < _a.length; _i++) {
+                var child = _a[_i];
+                // In React, JSX text that contains only whitespaces will be ignored so we don't want to type-check that
+                // because then type of children property will have constituent of string type.
+                if (child.kind === 11 /* JsxText */) {
+                    if (!child.containsOnlyWhiteSpaces) {
+                        childrenTypes.push(stringType);
+                    }
+                }
+                else {
+                    childrenTypes.push(checkExpressionForMutableLocation(child, checkMode));
+                }
+            }
+            return childrenTypes;
+        }
+        /**
+         * Check attributes property of opening-like element. This function is called during chooseOverload to get call signature of a JSX opening-like element.
+         * (See "checkApplicableSignatureForJsxOpeningLikeElement" for how the function is used)
+         * @param node a JSXAttributes to be resolved of its type
+         */
+        function checkJsxAttributes(node, checkMode) {
+            return createJsxAttributesTypeFromAttributesProperty(node.parent, checkMode);
+        }
+        function getJsxType(name, location) {
+            var namespace = getJsxNamespaceAt(location);
+            var exports = namespace && getExportsOfSymbol(namespace);
+            var typeSymbol = exports && getSymbol(exports, name, 67897832 /* Type */);
+            return typeSymbol ? getDeclaredTypeOfSymbol(typeSymbol) : errorType;
+        }
+        /**
+         * Looks up an intrinsic tag name and returns a symbol that either points to an intrinsic
+         * property (in which case nodeLinks.jsxFlags will be IntrinsicNamedElement) or an intrinsic
+         * string index signature (in which case nodeLinks.jsxFlags will be IntrinsicIndexedElement).
+         * May also return unknownSymbol if both of these lookups fail.
+         */
+        function getIntrinsicTagSymbol(node) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedSymbol) {
+                var intrinsicElementsType = getJsxType(JsxNames.IntrinsicElements, node);
+                if (intrinsicElementsType !== errorType) {
+                    // Property case
+                    if (!ts.isIdentifier(node.tagName))
+                        return ts.Debug.fail();
+                    var intrinsicProp = getPropertyOfType(intrinsicElementsType, node.tagName.escapedText);
+                    if (intrinsicProp) {
+                        links.jsxFlags |= 1 /* IntrinsicNamedElement */;
+                        return links.resolvedSymbol = intrinsicProp;
+                    }
+                    // Intrinsic string indexer case
+                    var indexSignatureType = getIndexTypeOfType(intrinsicElementsType, 0 /* String */);
+                    if (indexSignatureType) {
+                        links.jsxFlags |= 2 /* IntrinsicIndexedElement */;
+                        return links.resolvedSymbol = intrinsicElementsType.symbol;
+                    }
+                    // Wasn't found
+                    error(node, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.idText(node.tagName), "JSX." + JsxNames.IntrinsicElements);
+                    return links.resolvedSymbol = unknownSymbol;
+                }
+                else {
+                    if (noImplicitAny) {
+                        error(node, ts.Diagnostics.JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists, ts.unescapeLeadingUnderscores(JsxNames.IntrinsicElements));
+                    }
+                    return links.resolvedSymbol = unknownSymbol;
+                }
+            }
+            return links.resolvedSymbol;
+        }
+        function getJsxNamespaceAt(location) {
+            var links = location && getNodeLinks(location);
+            if (links && links.jsxNamespace) {
+                return links.jsxNamespace;
+            }
+            if (!links || links.jsxNamespace !== false) {
+                var namespaceName = getJsxNamespace(location);
+                var resolvedNamespace = resolveName(location, namespaceName, 1920 /* Namespace */, /*diagnosticMessage*/ undefined, namespaceName, /*isUse*/ false);
+                if (resolvedNamespace) {
+                    var candidate = getSymbol(getExportsOfSymbol(resolveSymbol(resolvedNamespace)), JsxNames.JSX, 1920 /* Namespace */);
+                    if (candidate) {
+                        if (links) {
+                            links.jsxNamespace = candidate;
+                        }
+                        return candidate;
+                    }
+                    if (links) {
+                        links.jsxNamespace = false;
+                    }
+                }
+            }
+            // JSX global fallback
+            return getGlobalSymbol(JsxNames.JSX, 1920 /* Namespace */, /*diagnosticMessage*/ undefined); // TODO: GH#18217
+        }
+        /**
+         * Look into JSX namespace and then look for container with matching name as nameOfAttribPropContainer.
+         * Get a single property from that container if existed. Report an error if there are more than one property.
+         *
+         * @param nameOfAttribPropContainer a string of value JsxNames.ElementAttributesPropertyNameContainer or JsxNames.ElementChildrenAttributeNameContainer
+         *          if other string is given or the container doesn't exist, return undefined.
+         */
+        function getNameFromJsxElementAttributesContainer(nameOfAttribPropContainer, jsxNamespace) {
+            // JSX.ElementAttributesProperty | JSX.ElementChildrenAttribute [symbol]
+            var jsxElementAttribPropInterfaceSym = jsxNamespace && getSymbol(jsxNamespace.exports, nameOfAttribPropContainer, 67897832 /* Type */);
+            // JSX.ElementAttributesProperty | JSX.ElementChildrenAttribute [type]
+            var jsxElementAttribPropInterfaceType = jsxElementAttribPropInterfaceSym && getDeclaredTypeOfSymbol(jsxElementAttribPropInterfaceSym);
+            // The properties of JSX.ElementAttributesProperty | JSX.ElementChildrenAttribute
+            var propertiesOfJsxElementAttribPropInterface = jsxElementAttribPropInterfaceType && getPropertiesOfType(jsxElementAttribPropInterfaceType);
+            if (propertiesOfJsxElementAttribPropInterface) {
+                // Element Attributes has zero properties, so the element attributes type will be the class instance type
+                if (propertiesOfJsxElementAttribPropInterface.length === 0) {
+                    return "";
+                }
+                // Element Attributes has one property, so the element attributes type will be the type of the corresponding
+                // property of the class instance type
+                else if (propertiesOfJsxElementAttribPropInterface.length === 1) {
+                    return propertiesOfJsxElementAttribPropInterface[0].escapedName;
+                }
+                else if (propertiesOfJsxElementAttribPropInterface.length > 1) {
+                    // More than one property on ElementAttributesProperty is an error
+                    error(jsxElementAttribPropInterfaceSym.declarations[0], ts.Diagnostics.The_global_type_JSX_0_may_not_have_more_than_one_property, ts.unescapeLeadingUnderscores(nameOfAttribPropContainer));
+                }
+            }
+            return undefined;
+        }
+        function getJsxLibraryManagedAttributes(jsxNamespace) {
+            // JSX.LibraryManagedAttributes [symbol]
+            return jsxNamespace && getSymbol(jsxNamespace.exports, JsxNames.LibraryManagedAttributes, 67897832 /* Type */);
+        }
+        /// e.g. "props" for React.d.ts,
+        /// or 'undefined' if ElementAttributesProperty doesn't exist (which means all
+        ///     non-intrinsic elements' attributes type is 'any'),
+        /// or '' if it has 0 properties (which means every
+        ///     non-intrinsic elements' attributes type is the element instance type)
+        function getJsxElementPropertiesName(jsxNamespace) {
+            return getNameFromJsxElementAttributesContainer(JsxNames.ElementAttributesPropertyNameContainer, jsxNamespace);
+        }
+        function getJsxElementChildrenPropertyName(jsxNamespace) {
+            return getNameFromJsxElementAttributesContainer(JsxNames.ElementChildrenAttributeNameContainer, jsxNamespace);
+        }
+        function getUninstantiatedJsxSignaturesOfType(elementType, caller) {
+            if (elementType.flags & 4 /* String */) {
+                return [anySignature];
+            }
+            else if (elementType.flags & 128 /* StringLiteral */) {
+                var intrinsicType = getIntrinsicAttributesTypeFromStringLiteralType(elementType, caller);
+                if (!intrinsicType) {
+                    error(caller, ts.Diagnostics.Property_0_does_not_exist_on_type_1, elementType.value, "JSX." + JsxNames.IntrinsicElements);
+                    return ts.emptyArray;
+                }
+                else {
+                    var fakeSignature = createSignatureForJSXIntrinsic(caller, intrinsicType);
+                    return [fakeSignature];
+                }
+            }
+            var apparentElemType = getApparentType(elementType);
+            // Resolve the signatures, preferring constructor
+            var signatures = getSignaturesOfType(apparentElemType, 1 /* Construct */);
+            if (signatures.length === 0) {
+                // No construct signatures, try call signatures
+                signatures = getSignaturesOfType(apparentElemType, 0 /* Call */);
+            }
+            if (signatures.length === 0 && apparentElemType.flags & 1048576 /* Union */) {
+                // If each member has some combination of new/call signatures; make a union signature list for those
+                signatures = getUnionSignatures(ts.map(apparentElemType.types, function (t) { return getUninstantiatedJsxSignaturesOfType(t, caller); }));
+            }
+            return signatures;
+        }
+        function getIntrinsicAttributesTypeFromStringLiteralType(type, location) {
+            // If the elemType is a stringLiteral type, we can then provide a check to make sure that the string literal type is one of the Jsx intrinsic element type
+            // For example:
+            //      var CustomTag: "h1" = "h1";
+            //      <CustomTag> Hello World </CustomTag>
+            var intrinsicElementsType = getJsxType(JsxNames.IntrinsicElements, location);
+            if (intrinsicElementsType !== errorType) {
+                var stringLiteralTypeName = type.value;
+                var intrinsicProp = getPropertyOfType(intrinsicElementsType, ts.escapeLeadingUnderscores(stringLiteralTypeName));
+                if (intrinsicProp) {
+                    return getTypeOfSymbol(intrinsicProp);
+                }
+                var indexSignatureType = getIndexTypeOfType(intrinsicElementsType, 0 /* String */);
+                if (indexSignatureType) {
+                    return indexSignatureType;
+                }
+                return undefined;
+            }
+            // If we need to report an error, we already done so here. So just return any to prevent any more error downstream
+            return anyType;
+        }
+        function checkJsxReturnAssignableToAppropriateBound(refKind, elemInstanceType, openingLikeElement) {
+            if (refKind === 1 /* Function */) {
+                var sfcReturnConstraint = getJsxStatelessElementTypeAt(openingLikeElement);
+                if (sfcReturnConstraint) {
+                    checkTypeRelatedTo(elemInstanceType, sfcReturnConstraint, assignableRelation, openingLikeElement, ts.Diagnostics.JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements);
+                }
+            }
+            else if (refKind === 0 /* Component */) {
+                var classConstraint = getJsxElementClassTypeAt(openingLikeElement);
+                if (classConstraint) {
+                    // Issue an error if this return type isn't assignable to JSX.ElementClass or JSX.Element, failing that
+                    checkTypeRelatedTo(elemInstanceType, classConstraint, assignableRelation, openingLikeElement, ts.Diagnostics.JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements);
+                }
+            }
+            else { // Mixed
+                var sfcReturnConstraint = getJsxStatelessElementTypeAt(openingLikeElement);
+                var classConstraint = getJsxElementClassTypeAt(openingLikeElement);
+                if (!sfcReturnConstraint || !classConstraint) {
+                    return;
+                }
+                var combined = getUnionType([sfcReturnConstraint, classConstraint]);
+                checkTypeRelatedTo(elemInstanceType, combined, assignableRelation, openingLikeElement, ts.Diagnostics.JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements);
+            }
+        }
+        /**
+         * Get attributes type of the given intrinsic opening-like Jsx element by resolving the tag name.
+         * The function is intended to be called from a function which has checked that the opening element is an intrinsic element.
+         * @param node an intrinsic JSX opening-like element
+         */
+        function getIntrinsicAttributesTypeFromJsxOpeningLikeElement(node) {
+            ts.Debug.assert(isJsxIntrinsicIdentifier(node.tagName));
+            var links = getNodeLinks(node);
+            if (!links.resolvedJsxElementAttributesType) {
+                var symbol = getIntrinsicTagSymbol(node);
+                if (links.jsxFlags & 1 /* IntrinsicNamedElement */) {
+                    return links.resolvedJsxElementAttributesType = getTypeOfSymbol(symbol);
+                }
+                else if (links.jsxFlags & 2 /* IntrinsicIndexedElement */) {
+                    return links.resolvedJsxElementAttributesType = getIndexInfoOfSymbol(symbol, 0 /* String */).type;
+                }
+                else {
+                    return links.resolvedJsxElementAttributesType = errorType;
+                }
+            }
+            return links.resolvedJsxElementAttributesType;
+        }
+        function getJsxElementClassTypeAt(location) {
+            var type = getJsxType(JsxNames.ElementClass, location);
+            if (type === errorType)
+                return undefined;
+            return type;
+        }
+        function getJsxElementTypeAt(location) {
+            return getJsxType(JsxNames.Element, location);
+        }
+        function getJsxStatelessElementTypeAt(location) {
+            var jsxElementType = getJsxElementTypeAt(location);
+            if (jsxElementType) {
+                return getUnionType([jsxElementType, nullType]);
+            }
+        }
+        /**
+         * Returns all the properties of the Jsx.IntrinsicElements interface
+         */
+        function getJsxIntrinsicTagNamesAt(location) {
+            var intrinsics = getJsxType(JsxNames.IntrinsicElements, location);
+            return intrinsics ? getPropertiesOfType(intrinsics) : ts.emptyArray;
+        }
+        function checkJsxPreconditions(errorNode) {
+            // Preconditions for using JSX
+            if ((compilerOptions.jsx || 0 /* None */) === 0 /* None */) {
+                error(errorNode, ts.Diagnostics.Cannot_use_JSX_unless_the_jsx_flag_is_provided);
+            }
+            if (getJsxElementTypeAt(errorNode) === undefined) {
+                if (noImplicitAny) {
+                    error(errorNode, ts.Diagnostics.JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist);
+                }
+            }
+        }
+        function checkJsxOpeningLikeElementOrOpeningFragment(node) {
+            var isNodeOpeningLikeElement = ts.isJsxOpeningLikeElement(node);
+            if (isNodeOpeningLikeElement) {
+                checkGrammarJsxElement(node);
+            }
+            checkJsxPreconditions(node);
+            // The reactNamespace/jsxFactory's root symbol should be marked as 'used' so we don't incorrectly elide its import.
+            // And if there is no reactNamespace/jsxFactory's symbol in scope when targeting React emit, we should issue an error.
+            var reactRefErr = diagnostics && compilerOptions.jsx === 2 /* React */ ? ts.Diagnostics.Cannot_find_name_0 : undefined;
+            var reactNamespace = getJsxNamespace(node);
+            var reactLocation = isNodeOpeningLikeElement ? node.tagName : node;
+            var reactSym = resolveName(reactLocation, reactNamespace, 67220415 /* Value */, reactRefErr, reactNamespace, /*isUse*/ true);
+            if (reactSym) {
+                // Mark local symbol as referenced here because it might not have been marked
+                // if jsx emit was not react as there wont be error being emitted
+                reactSym.isReferenced = 67108863 /* All */;
+                // If react symbol is alias, mark it as refereced
+                if (reactSym.flags & 2097152 /* Alias */ && !isConstEnumOrConstEnumOnlyModule(resolveAlias(reactSym))) {
+                    markAliasSymbolAsReferenced(reactSym);
+                }
+            }
+            if (isNodeOpeningLikeElement) {
+                var sig = getResolvedSignature(node);
+                checkJsxReturnAssignableToAppropriateBound(getJsxReferenceKind(node), getReturnTypeOfSignature(sig), node);
+            }
+        }
+        /**
+         * Check if a property with the given name is known anywhere in the given type. In an object type, a property
+         * is considered known if
+         * 1. the object type is empty and the check is for assignability, or
+         * 2. if the object type has index signatures, or
+         * 3. if the property is actually declared in the object type
+         *    (this means that 'toString', for example, is not usually a known property).
+         * 4. In a union or intersection type,
+         *    a property is considered known if it is known in any constituent type.
+         * @param targetType a type to search a given name in
+         * @param name a property name to search
+         * @param isComparingJsxAttributes a boolean flag indicating whether we are searching in JsxAttributesType
+         */
+        function isKnownProperty(targetType, name, isComparingJsxAttributes) {
+            if (targetType.flags & 524288 /* Object */) {
+                var resolved = resolveStructuredTypeMembers(targetType);
+                if (resolved.stringIndexInfo ||
+                    resolved.numberIndexInfo && isNumericLiteralName(name) ||
+                    getPropertyOfObjectType(targetType, name) ||
+                    isComparingJsxAttributes && !isUnhyphenatedJsxName(name)) {
+                    // For JSXAttributes, if the attribute has a hyphenated name, consider that the attribute to be known.
+                    return true;
+                }
+            }
+            else if (targetType.flags & 3145728 /* UnionOrIntersection */ && isExcessPropertyCheckTarget(targetType)) {
+                for (var _i = 0, _a = targetType.types; _i < _a.length; _i++) {
+                    var t = _a[_i];
+                    if (isKnownProperty(t, name, isComparingJsxAttributes)) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        function isExcessPropertyCheckTarget(type) {
+            return !!(type.flags & 524288 /* Object */ && !(ts.getObjectFlags(type) & 512 /* ObjectLiteralPatternWithComputedProperties */) ||
+                type.flags & 67108864 /* NonPrimitive */ ||
+                type.flags & 1048576 /* Union */ && ts.some(type.types, isExcessPropertyCheckTarget) ||
+                type.flags & 2097152 /* Intersection */ && ts.every(type.types, isExcessPropertyCheckTarget));
+        }
+        function checkJsxExpression(node, checkMode) {
+            if (node.expression) {
+                var type = checkExpression(node.expression, checkMode);
+                if (node.dotDotDotToken && type !== anyType && !isArrayType(type)) {
+                    error(node, ts.Diagnostics.JSX_spread_child_must_be_an_array_type);
+                }
+                return type;
+            }
+            else {
+                return errorType;
+            }
+        }
+        function getDeclarationNodeFlagsFromSymbol(s) {
+            return s.valueDeclaration ? ts.getCombinedNodeFlags(s.valueDeclaration) : 0;
+        }
+        /**
+         * Return whether this symbol is a member of a prototype somewhere
+         * Note that this is not tracked well within the compiler, so the answer may be incorrect.
+         */
+        function isPrototypeProperty(symbol) {
+            if (symbol.flags & 8192 /* Method */ || ts.getCheckFlags(symbol) & 4 /* SyntheticMethod */) {
+                return true;
+            }
+            if (ts.isInJSFile(symbol.valueDeclaration)) {
+                var parent = symbol.valueDeclaration.parent;
+                return parent && ts.isBinaryExpression(parent) &&
+                    ts.getAssignmentDeclarationKind(parent) === 3 /* PrototypeProperty */;
+            }
+        }
+        /**
+         * Check whether the requested property access is valid.
+         * Returns true if node is a valid property access, and false otherwise.
+         * @param node The node to be checked.
+         * @param isSuper True if the access is from `super.`.
+         * @param type The type of the object whose property is being accessed. (Not the type of the property.)
+         * @param prop The symbol for the property being accessed.
+         */
+        function checkPropertyAccessibility(node, isSuper, type, prop) {
+            var flags = ts.getDeclarationModifierFlagsFromSymbol(prop);
+            var errorNode = node.kind === 148 /* QualifiedName */ ? node.right : node.kind === 183 /* ImportType */ ? node : node.name;
+            if (ts.getCheckFlags(prop) & 512 /* ContainsPrivate */) {
+                // Synthetic property with private constituent property
+                error(errorNode, ts.Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(prop), typeToString(type));
+                return false;
+            }
+            if (isSuper) {
+                // TS 1.0 spec (April 2014): 4.8.2
+                // - In a constructor, instance member function, instance member accessor, or
+                //   instance member variable initializer where this references a derived class instance,
+                //   a super property access is permitted and must specify a public instance member function of the base class.
+                // - In a static member function or static member accessor
+                //   where this references the constructor function object of a derived class,
+                //   a super property access is permitted and must specify a public static member function of the base class.
+                if (languageVersion < 2 /* ES2015 */) {
+                    if (symbolHasNonMethodDeclaration(prop)) {
+                        error(errorNode, ts.Diagnostics.Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword);
+                        return false;
+                    }
+                }
+                if (flags & 128 /* Abstract */) {
+                    // A method cannot be accessed in a super property access if the method is abstract.
+                    // This error could mask a private property access error. But, a member
+                    // cannot simultaneously be private and abstract, so this will trigger an
+                    // additional error elsewhere.
+                    error(errorNode, ts.Diagnostics.Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression, symbolToString(prop), typeToString(getDeclaringClass(prop)));
+                    return false;
+                }
+            }
+            // Referencing abstract properties within their own constructors is not allowed
+            if ((flags & 128 /* Abstract */) && ts.isThisProperty(node) && symbolHasNonMethodDeclaration(prop)) {
+                var declaringClassDeclaration = ts.getClassLikeDeclarationOfSymbol(getParentOfSymbol(prop));
+                if (declaringClassDeclaration && isNodeUsedDuringClassInitialization(node)) {
+                    error(errorNode, ts.Diagnostics.Abstract_property_0_in_class_1_cannot_be_accessed_in_the_constructor, symbolToString(prop), ts.getTextOfIdentifierOrLiteral(declaringClassDeclaration.name)); // TODO: GH#18217
+                    return false;
+                }
+            }
+            // Public properties are otherwise accessible.
+            if (!(flags & 24 /* NonPublicAccessibilityModifier */)) {
+                return true;
+            }
+            // Property is known to be private or protected at this point
+            // Private property is accessible if the property is within the declaring class
+            if (flags & 8 /* Private */) {
+                var declaringClassDeclaration = ts.getClassLikeDeclarationOfSymbol(getParentOfSymbol(prop));
+                if (!isNodeWithinClass(node, declaringClassDeclaration)) {
+                    error(errorNode, ts.Diagnostics.Property_0_is_private_and_only_accessible_within_class_1, symbolToString(prop), typeToString(getDeclaringClass(prop)));
+                    return false;
+                }
+                return true;
+            }
+            // Property is known to be protected at this point
+            // All protected properties of a supertype are accessible in a super access
+            if (isSuper) {
+                return true;
+            }
+            // Find the first enclosing class that has the declaring classes of the protected constituents
+            // of the property as base classes
+            var enclosingClass = forEachEnclosingClass(node, function (enclosingDeclaration) {
+                var enclosingClass = getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingDeclaration));
+                return isClassDerivedFromDeclaringClasses(enclosingClass, prop) ? enclosingClass : undefined;
+            });
+            // A protected property is accessible if the property is within the declaring class or classes derived from it
+            if (!enclosingClass) {
+                // allow PropertyAccessibility if context is in function with this parameter
+                // static member access is disallow
+                var thisParameter = void 0;
+                if (flags & 32 /* Static */ || !(thisParameter = getThisParameterFromNodeContext(node)) || !thisParameter.type) {
+                    error(errorNode, ts.Diagnostics.Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses, symbolToString(prop), typeToString(getDeclaringClass(prop) || type));
+                    return false;
+                }
+                var thisType = getTypeFromTypeNode(thisParameter.type);
+                enclosingClass = ((thisType.flags & 262144 /* TypeParameter */) ? getConstraintOfTypeParameter(thisType) : thisType);
+            }
+            // No further restrictions for static properties
+            if (flags & 32 /* Static */) {
+                return true;
+            }
+            if (type.flags & 262144 /* TypeParameter */) {
+                // get the original type -- represented as the type constraint of the 'this' type
+                type = type.isThisType ? getConstraintOfTypeParameter(type) : getBaseConstraintOfType(type); // TODO: GH#18217 Use a different variable that's allowed to be undefined
+            }
+            if (!type || !hasBaseType(type, enclosingClass)) {
+                error(errorNode, ts.Diagnostics.Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1, symbolToString(prop), typeToString(enclosingClass));
+                return false;
+            }
+            return true;
+        }
+        function getThisParameterFromNodeContext(node) {
+            var thisContainer = ts.getThisContainer(node, /* includeArrowFunctions */ false);
+            return thisContainer && ts.isFunctionLike(thisContainer) ? ts.getThisParameter(thisContainer) : undefined;
+        }
+        function symbolHasNonMethodDeclaration(symbol) {
+            return !!forEachProperty(symbol, function (prop) { return !(prop.flags & 8192 /* Method */); });
+        }
+        function checkNonNullExpression(node, nullDiagnostic, undefinedDiagnostic, nullOrUndefinedDiagnostic) {
+            return checkNonNullType(checkExpression(node), node, nullDiagnostic, undefinedDiagnostic, nullOrUndefinedDiagnostic);
+        }
+        function getNonNullableTypeIfNeeded(type) {
+            var kind = (strictNullChecks ? getFalsyFlags(type) : type.flags) & 98304 /* Nullable */;
+            if (kind) {
+                return getNonNullableType(type);
+            }
+            return type;
+        }
+        function checkNonNullType(type, node, nullDiagnostic, undefinedDiagnostic, nullOrUndefinedDiagnostic) {
+            if (type.flags & 2 /* Unknown */) {
+                error(node, ts.Diagnostics.Object_is_of_type_unknown);
+                return errorType;
+            }
+            var kind = (strictNullChecks ? getFalsyFlags(type) : type.flags) & 98304 /* Nullable */;
+            if (kind) {
+                error(node, kind & 32768 /* Undefined */ ? kind & 65536 /* Null */ ?
+                    (nullOrUndefinedDiagnostic || ts.Diagnostics.Object_is_possibly_null_or_undefined) :
+                    (undefinedDiagnostic || ts.Diagnostics.Object_is_possibly_undefined) :
+                    (nullDiagnostic || ts.Diagnostics.Object_is_possibly_null));
+                var t = getNonNullableType(type);
+                return t.flags & (98304 /* Nullable */ | 131072 /* Never */) ? errorType : t;
+            }
+            return type;
+        }
+        function checkPropertyAccessExpression(node) {
+            return checkPropertyAccessExpressionOrQualifiedName(node, node.expression, node.name);
+        }
+        function checkQualifiedName(node) {
+            return checkPropertyAccessExpressionOrQualifiedName(node, node.left, node.right);
+        }
+        function checkPropertyAccessExpressionOrQualifiedName(node, left, right) {
+            var propType;
+            var leftType = checkNonNullExpression(left);
+            var parentSymbol = getNodeLinks(left).resolvedSymbol;
+            var apparentType = getApparentType(getWidenedType(leftType));
+            if (isTypeAny(apparentType) || apparentType === silentNeverType) {
+                if (ts.isIdentifier(left) && parentSymbol) {
+                    markAliasReferenced(parentSymbol, node);
+                }
+                return apparentType;
+            }
+            var assignmentKind = ts.getAssignmentTargetKind(node);
+            var prop = getPropertyOfType(apparentType, right.escapedText);
+            if (ts.isIdentifier(left) && parentSymbol && !(prop && isConstEnumOrConstEnumOnlyModule(prop))) {
+                markAliasReferenced(parentSymbol, node);
+            }
+            if (!prop) {
+                var indexInfo = getIndexInfoOfType(apparentType, 0 /* String */);
+                if (!(indexInfo && indexInfo.type)) {
+                    if (isJSLiteralType(leftType)) {
+                        return anyType;
+                    }
+                    if (right.escapedText && !checkAndReportErrorForExtendingInterface(node)) {
+                        reportNonexistentProperty(right, leftType.flags & 262144 /* TypeParameter */ && leftType.isThisType ? apparentType : leftType);
+                    }
+                    return errorType;
+                }
+                if (indexInfo.isReadonly && (ts.isAssignmentTarget(node) || ts.isDeleteTarget(node))) {
+                    error(node, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(apparentType));
+                }
+                propType = indexInfo.type;
+            }
+            else {
+                checkPropertyNotUsedBeforeDeclaration(prop, node, right);
+                markPropertyAsReferenced(prop, node, left.kind === 100 /* ThisKeyword */);
+                getNodeLinks(node).resolvedSymbol = prop;
+                checkPropertyAccessibility(node, left.kind === 98 /* SuperKeyword */, apparentType, prop);
+                if (assignmentKind) {
+                    if (isReferenceToReadonlyEntity(node, prop) || isReferenceThroughNamespaceImport(node)) {
+                        error(right, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_read_only_property, ts.idText(right));
+                        return errorType;
+                    }
+                }
+                propType = getConstraintForLocation(getTypeOfSymbol(prop), node);
+            }
+            // Only compute control flow type if this is a property access expression that isn't an
+            // assignment target, and the referenced property was declared as a variable, property,
+            // accessor, or optional method.
+            if (node.kind !== 189 /* PropertyAccessExpression */ ||
+                assignmentKind === 1 /* Definite */ ||
+                prop && !(prop.flags & (3 /* Variable */ | 4 /* Property */ | 98304 /* Accessor */)) && !(prop.flags & 8192 /* Method */ && propType.flags & 1048576 /* Union */)) {
+                return propType;
+            }
+            // If strict null checks and strict property initialization checks are enabled, if we have
+            // a this.xxx property access, if the property is an instance property without an initializer,
+            // and if we are in a constructor of the same class as the property declaration, assume that
+            // the property is uninitialized at the top of the control flow.
+            var assumeUninitialized = false;
+            if (strictNullChecks && strictPropertyInitialization && left.kind === 100 /* ThisKeyword */) {
+                var declaration = prop && prop.valueDeclaration;
+                if (declaration && isInstancePropertyWithoutInitializer(declaration)) {
+                    var flowContainer = getControlFlowContainer(node);
+                    if (flowContainer.kind === 157 /* Constructor */ && flowContainer.parent === declaration.parent) {
+                        assumeUninitialized = true;
+                    }
+                }
+            }
+            else if (strictNullChecks && prop && prop.valueDeclaration &&
+                ts.isPropertyAccessExpression(prop.valueDeclaration) &&
+                ts.getAssignmentDeclarationPropertyAccessKind(prop.valueDeclaration) &&
+                getControlFlowContainer(node) === getControlFlowContainer(prop.valueDeclaration)) {
+                assumeUninitialized = true;
+            }
+            var flowType = getFlowTypeOfReference(node, propType, assumeUninitialized ? getOptionalType(propType) : propType);
+            if (assumeUninitialized && !(getFalsyFlags(propType) & 32768 /* Undefined */) && getFalsyFlags(flowType) & 32768 /* Undefined */) {
+                error(right, ts.Diagnostics.Property_0_is_used_before_being_assigned, symbolToString(prop)); // TODO: GH#18217
+                // Return the declared type to reduce follow-on errors
+                return propType;
+            }
+            return assignmentKind ? getBaseTypeOfLiteralType(flowType) : flowType;
+        }
+        function checkPropertyNotUsedBeforeDeclaration(prop, node, right) {
+            var valueDeclaration = prop.valueDeclaration;
+            if (!valueDeclaration) {
+                return;
+            }
+            var diagnosticMessage;
+            var declarationName = ts.idText(right);
+            if (isInPropertyInitializer(node) &&
+                !isBlockScopedNameDeclaredBeforeUse(valueDeclaration, right)
+                && !isPropertyDeclaredInAncestorClass(prop)) {
+                diagnosticMessage = error(right, ts.Diagnostics.Property_0_is_used_before_its_initialization, declarationName);
+            }
+            else if (valueDeclaration.kind === 240 /* ClassDeclaration */ &&
+                node.parent.kind !== 164 /* TypeReference */ &&
+                !(valueDeclaration.flags & 4194304 /* Ambient */) &&
+                !isBlockScopedNameDeclaredBeforeUse(valueDeclaration, right)) {
+                diagnosticMessage = error(right, ts.Diagnostics.Class_0_used_before_its_declaration, declarationName);
+            }
+            if (diagnosticMessage) {
+                addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(valueDeclaration, ts.Diagnostics._0_is_declared_here, declarationName));
+            }
+        }
+        function isInPropertyInitializer(node) {
+            return !!ts.findAncestor(node, function (node) {
+                switch (node.kind) {
+                    case 154 /* PropertyDeclaration */:
+                        return true;
+                    case 275 /* PropertyAssignment */:
+                        // We might be in `a = { b: this.b }`, so keep looking. See `tests/cases/compiler/useBeforeDeclaration_propertyAssignment.ts`.
+                        return false;
+                    default:
+                        return ts.isExpressionNode(node) ? false : "quit";
+                }
+            });
+        }
+        /**
+         * It's possible that "prop.valueDeclaration" is a local declaration, but the property was also declared in a superclass.
+         * In that case we won't consider it used before its declaration, because it gets its value from the superclass' declaration.
+         */
+        function isPropertyDeclaredInAncestorClass(prop) {
+            if (!(prop.parent.flags & 32 /* Class */)) {
+                return false;
+            }
+            var classType = getTypeOfSymbol(prop.parent);
+            while (true) {
+                classType = classType.symbol && getSuperClass(classType);
+                if (!classType) {
+                    return false;
+                }
+                var superProperty = getPropertyOfType(classType, prop.escapedName);
+                if (superProperty && superProperty.valueDeclaration) {
+                    return true;
+                }
+            }
+        }
+        function getSuperClass(classType) {
+            var x = getBaseTypes(classType);
+            if (x.length === 0) {
+                return undefined;
+            }
+            return getIntersectionType(x);
+        }
+        function reportNonexistentProperty(propNode, containingType) {
+            var errorInfo;
+            var relatedInfo;
+            if (containingType.flags & 1048576 /* Union */ && !(containingType.flags & 131068 /* Primitive */)) {
+                for (var _i = 0, _a = containingType.types; _i < _a.length; _i++) {
+                    var subtype = _a[_i];
+                    if (!getPropertyOfType(subtype, propNode.escapedText)) {
+                        errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(subtype));
+                        break;
+                    }
+                }
+            }
+            if (typeHasStaticProperty(propNode.escapedText, containingType)) {
+                errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_is_a_static_member_of_type_1, ts.declarationNameToString(propNode), typeToString(containingType));
+            }
+            else {
+                var promisedType = getPromisedTypeOfPromise(containingType);
+                if (promisedType && getPropertyOfType(promisedType, propNode.escapedText)) {
+                    errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1_Did_you_forget_to_use_await, ts.declarationNameToString(propNode), typeToString(containingType));
+                }
+                else {
+                    var suggestion = getSuggestedSymbolForNonexistentProperty(propNode, containingType);
+                    if (suggestion !== undefined) {
+                        var suggestedName = ts.symbolName(suggestion);
+                        errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1_Did_you_mean_2, ts.declarationNameToString(propNode), typeToString(containingType), suggestedName);
+                        relatedInfo = suggestion.valueDeclaration && ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestedName);
+                    }
+                    else {
+                        errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(propNode), typeToString(containingType));
+                    }
+                }
+            }
+            var resultDiagnostic = ts.createDiagnosticForNodeFromMessageChain(propNode, errorInfo);
+            if (relatedInfo) {
+                addRelatedInfo(resultDiagnostic, relatedInfo);
+            }
+            diagnostics.add(resultDiagnostic);
+        }
+        function typeHasStaticProperty(propName, containingType) {
+            var prop = containingType.symbol && getPropertyOfType(getTypeOfSymbol(containingType.symbol), propName);
+            return prop !== undefined && prop.valueDeclaration && ts.hasModifier(prop.valueDeclaration, 32 /* Static */);
+        }
+        function getSuggestedSymbolForNonexistentProperty(name, containingType) {
+            return getSpellingSuggestionForName(ts.isString(name) ? name : ts.idText(name), getPropertiesOfType(containingType), 67220415 /* Value */);
+        }
+        function getSuggestionForNonexistentProperty(name, containingType) {
+            var suggestion = getSuggestedSymbolForNonexistentProperty(name, containingType);
+            return suggestion && ts.symbolName(suggestion);
+        }
+        function getSuggestedSymbolForNonexistentSymbol(location, outerName, meaning) {
+            ts.Debug.assert(outerName !== undefined, "outername should always be defined");
+            var result = resolveNameHelper(location, outerName, meaning, /*nameNotFoundMessage*/ undefined, outerName, /*isUse*/ false, /*excludeGlobals*/ false, function (symbols, name, meaning) {
+                ts.Debug.assertEqual(outerName, name, "name should equal outerName");
+                var symbol = getSymbol(symbols, name, meaning);
+                // Sometimes the symbol is found when location is a return type of a function: `typeof x` and `x` is declared in the body of the function
+                // So the table *contains* `x` but `x` isn't actually in scope.
+                // However, resolveNameHelper will continue and call this callback again, so we'll eventually get a correct suggestion.
+                return symbol || getSpellingSuggestionForName(ts.unescapeLeadingUnderscores(name), ts.arrayFrom(symbols.values()), meaning);
+            });
+            return result;
+        }
+        function getSuggestionForNonexistentSymbol(location, outerName, meaning) {
+            var symbolResult = getSuggestedSymbolForNonexistentSymbol(location, outerName, meaning);
+            return symbolResult && ts.symbolName(symbolResult);
+        }
+        function getSuggestedSymbolForNonexistentModule(name, targetModule) {
+            return targetModule.exports && getSpellingSuggestionForName(ts.idText(name), getExportsOfModuleAsArray(targetModule), 2623475 /* ModuleMember */);
+        }
+        function getSuggestionForNonexistentExport(name, targetModule) {
+            var suggestion = getSuggestedSymbolForNonexistentModule(name, targetModule);
+            return suggestion && ts.symbolName(suggestion);
+        }
+        /**
+         * Given a name and a list of symbols whose names are *not* equal to the name, return a spelling suggestion if there is one that is close enough.
+         * Names less than length 3 only check for case-insensitive equality, not levenshtein distance.
+         *
+         * If there is a candidate that's the same except for case, return that.
+         * If there is a candidate that's within one edit of the name, return that.
+         * Otherwise, return the candidate with the smallest Levenshtein distance,
+         *    except for candidates:
+         *      * With no name
+         *      * Whose meaning doesn't match the `meaning` parameter.
+         *      * Whose length differs from the target name by more than 0.34 of the length of the name.
+         *      * Whose levenshtein distance is more than 0.4 of the length of the name
+         *        (0.4 allows 1 substitution/transposition for every 5 characters,
+         *         and 1 insertion/deletion at 3 characters)
+         */
+        function getSpellingSuggestionForName(name, symbols, meaning) {
+            return ts.getSpellingSuggestion(name, symbols, getCandidateName);
+            function getCandidateName(candidate) {
+                var candidateName = ts.symbolName(candidate);
+                return !ts.startsWith(candidateName, "\"") && candidate.flags & meaning ? candidateName : undefined;
+            }
+        }
+        function markPropertyAsReferenced(prop, nodeForCheckWriteOnly, isThisAccess) {
+            if (!prop || !(prop.flags & 106500 /* ClassMember */) || !prop.valueDeclaration || !ts.hasModifier(prop.valueDeclaration, 8 /* Private */)) {
+                return;
+            }
+            if (nodeForCheckWriteOnly && ts.isWriteOnlyAccess(nodeForCheckWriteOnly) && !(prop.flags & 65536 /* SetAccessor */ && !(prop.flags & 32768 /* GetAccessor */))) {
+                return;
+            }
+            if (isThisAccess) {
+                // Find any FunctionLikeDeclaration because those create a new 'this' binding. But this should only matter for methods (or getters/setters).
+                var containingMethod = ts.findAncestor(nodeForCheckWriteOnly, ts.isFunctionLikeDeclaration);
+                if (containingMethod && containingMethod.symbol === prop) {
+                    return;
+                }
+            }
+            (ts.getCheckFlags(prop) & 1 /* Instantiated */ ? getSymbolLinks(prop).target : prop).isReferenced = 67108863 /* All */;
+        }
+        function isValidPropertyAccess(node, propertyName) {
+            switch (node.kind) {
+                case 189 /* PropertyAccessExpression */:
+                    return isValidPropertyAccessWithType(node, node.expression.kind === 98 /* SuperKeyword */, propertyName, getWidenedType(checkExpression(node.expression)));
+                case 148 /* QualifiedName */:
+                    return isValidPropertyAccessWithType(node, /*isSuper*/ false, propertyName, getWidenedType(checkExpression(node.left)));
+                case 183 /* ImportType */:
+                    return isValidPropertyAccessWithType(node, /*isSuper*/ false, propertyName, getTypeFromTypeNode(node));
+            }
+        }
+        function isValidPropertyAccessForCompletions(node, type, property) {
+            return isValidPropertyAccessWithType(node, node.kind === 189 /* PropertyAccessExpression */ && node.expression.kind === 98 /* SuperKeyword */, property.escapedName, type)
+                && (!(property.flags & 8192 /* Method */) || isValidMethodAccess(property, type));
+        }
+        function isValidMethodAccess(method, actualThisType) {
+            var propType = getTypeOfPropertyOfType(actualThisType, method.escapedName);
+            var signatures = getSignaturesOfType(getNonNullableType(propType), 0 /* Call */);
+            ts.Debug.assert(signatures.length !== 0);
+            return signatures.some(function (sig) {
+                var signatureThisType = getThisTypeOfSignature(sig);
+                return !signatureThisType || isTypeAssignableTo(actualThisType, getInstantiatedSignatureThisType(sig, signatureThisType, actualThisType));
+            });
+        }
+        function getInstantiatedSignatureThisType(sig, signatureThisType, actualThisType) {
+            if (!sig.typeParameters) {
+                return signatureThisType;
+            }
+            var context = createInferenceContext(sig.typeParameters, sig, 0 /* None */);
+            inferTypes(context.inferences, actualThisType, signatureThisType);
+            return instantiateType(signatureThisType, createSignatureTypeMapper(sig, getInferredTypes(context)));
+        }
+        function isValidPropertyAccessWithType(node, isSuper, propertyName, type) {
+            if (type === errorType || isTypeAny(type)) {
+                return true;
+            }
+            var prop = getPropertyOfType(type, propertyName);
+            return prop ? checkPropertyAccessibility(node, isSuper, type, prop)
+                // In js files properties of unions are allowed in completion
+                : ts.isInJSFile(node) && (type.flags & 1048576 /* Union */) !== 0 && type.types.some(function (elementType) { return isValidPropertyAccessWithType(node, isSuper, propertyName, elementType); });
+        }
+        /**
+         * Return the symbol of the for-in variable declared or referenced by the given for-in statement.
+         */
+        function getForInVariableSymbol(node) {
+            var initializer = node.initializer;
+            if (initializer.kind === 238 /* VariableDeclarationList */) {
+                var variable = initializer.declarations[0];
+                if (variable && !ts.isBindingPattern(variable.name)) {
+                    return getSymbolOfNode(variable);
+                }
+            }
+            else if (initializer.kind === 72 /* Identifier */) {
+                return getResolvedSymbol(initializer);
+            }
+            return undefined;
+        }
+        /**
+         * Return true if the given type is considered to have numeric property names.
+         */
+        function hasNumericPropertyNames(type) {
+            return getIndexTypeOfType(type, 1 /* Number */) && !getIndexTypeOfType(type, 0 /* String */);
+        }
+        /**
+         * Return true if given node is an expression consisting of an identifier (possibly parenthesized)
+         * that references a for-in variable for an object with numeric property names.
+         */
+        function isForInVariableForNumericPropertyNames(expr) {
+            var e = ts.skipParentheses(expr);
+            if (e.kind === 72 /* Identifier */) {
+                var symbol = getResolvedSymbol(e);
+                if (symbol.flags & 3 /* Variable */) {
+                    var child = expr;
+                    var node = expr.parent;
+                    while (node) {
+                        if (node.kind === 226 /* ForInStatement */ &&
+                            child === node.statement &&
+                            getForInVariableSymbol(node) === symbol &&
+                            hasNumericPropertyNames(getTypeOfExpression(node.expression))) {
+                            return true;
+                        }
+                        child = node;
+                        node = node.parent;
+                    }
+                }
+            }
+            return false;
+        }
+        function checkIndexedAccess(node) {
+            var objectType = checkNonNullExpression(node.expression);
+            var indexExpression = node.argumentExpression;
+            if (!indexExpression) {
+                var sourceFile = ts.getSourceFileOfNode(node);
+                if (node.parent.kind === 192 /* NewExpression */ && node.parent.expression === node) {
+                    var start = ts.skipTrivia(sourceFile.text, node.expression.end);
+                    var end = node.end;
+                    grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead);
+                }
+                else {
+                    var start = node.end - "]".length;
+                    var end = node.end;
+                    grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.Expression_expected);
+                }
+                return errorType;
+            }
+            var indexType = checkExpression(indexExpression);
+            if (objectType === errorType || objectType === silentNeverType) {
+                return objectType;
+            }
+            if (isConstEnumObjectType(objectType) && indexExpression.kind !== 10 /* StringLiteral */) {
+                error(indexExpression, ts.Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
+                return errorType;
+            }
+            return checkIndexedAccessIndexType(getIndexedAccessType(objectType, isForInVariableForNumericPropertyNames(indexExpression) ? numberType : indexType, node), node);
+        }
+        function checkThatExpressionIsProperSymbolReference(expression, expressionType, reportError) {
+            if (expressionType === errorType) {
+                // There is already an error, so no need to report one.
+                return false;
+            }
+            if (!ts.isWellKnownSymbolSyntactically(expression)) {
+                return false;
+            }
+            // Make sure the property type is the primitive symbol type
+            if ((expressionType.flags & 12288 /* ESSymbolLike */) === 0) {
+                if (reportError) {
+                    error(expression, ts.Diagnostics.A_computed_property_name_of_the_form_0_must_be_of_type_symbol, ts.getTextOfNode(expression));
+                }
+                return false;
+            }
+            // The name is Symbol.<someName>, so make sure Symbol actually resolves to the
+            // global Symbol object
+            var leftHandSide = expression.expression;
+            var leftHandSideSymbol = getResolvedSymbol(leftHandSide);
+            if (!leftHandSideSymbol) {
+                return false;
+            }
+            var globalESSymbol = getGlobalESSymbolConstructorSymbol(/*reportErrors*/ true);
+            if (!globalESSymbol) {
+                // Already errored when we tried to look up the symbol
+                return false;
+            }
+            if (leftHandSideSymbol !== globalESSymbol) {
+                if (reportError) {
+                    error(leftHandSide, ts.Diagnostics.Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object);
+                }
+                return false;
+            }
+            return true;
+        }
+        function callLikeExpressionMayHaveTypeArguments(node) {
+            return ts.isCallOrNewExpression(node) || ts.isTaggedTemplateExpression(node) || ts.isJsxOpeningLikeElement(node);
+        }
+        function resolveUntypedCall(node) {
+            if (callLikeExpressionMayHaveTypeArguments(node)) {
+                // Check type arguments even though we will give an error that untyped calls may not accept type arguments.
+                // This gets us diagnostics for the type arguments and marks them as referenced.
+                ts.forEach(node.typeArguments, checkSourceElement);
+            }
+            if (node.kind === 193 /* TaggedTemplateExpression */) {
+                checkExpression(node.template);
+            }
+            else if (ts.isJsxOpeningLikeElement(node)) {
+                checkExpression(node.attributes);
+            }
+            else if (node.kind !== 152 /* Decorator */) {
+                ts.forEach(node.arguments, function (argument) {
+                    checkExpression(argument);
+                });
+            }
+            return anySignature;
+        }
+        function resolveErrorCall(node) {
+            resolveUntypedCall(node);
+            return unknownSignature;
+        }
+        // Re-order candidate signatures into the result array. Assumes the result array to be empty.
+        // The candidate list orders groups in reverse, but within a group signatures are kept in declaration order
+        // A nit here is that we reorder only signatures that belong to the same symbol,
+        // so order how inherited signatures are processed is still preserved.
+        // interface A { (x: string): void }
+        // interface B extends A { (x: 'foo'): string }
+        // const b: B;
+        // b('foo') // <- here overloads should be processed as [(x:'foo'): string, (x: string): void]
+        function reorderCandidates(signatures, result) {
+            var lastParent;
+            var lastSymbol;
+            var cutoffIndex = 0;
+            var index;
+            var specializedIndex = -1;
+            var spliceIndex;
+            ts.Debug.assert(!result.length);
+            for (var _i = 0, signatures_3 = signatures; _i < signatures_3.length; _i++) {
+                var signature = signatures_3[_i];
+                var symbol = signature.declaration && getSymbolOfNode(signature.declaration);
+                var parent = signature.declaration && signature.declaration.parent;
+                if (!lastSymbol || symbol === lastSymbol) {
+                    if (lastParent && parent === lastParent) {
+                        index = index + 1;
+                    }
+                    else {
+                        lastParent = parent;
+                        index = cutoffIndex;
+                    }
+                }
+                else {
+                    // current declaration belongs to a different symbol
+                    // set cutoffIndex so re-orderings in the future won't change result set from 0 to cutoffIndex
+                    index = cutoffIndex = result.length;
+                    lastParent = parent;
+                }
+                lastSymbol = symbol;
+                // specialized signatures always need to be placed before non-specialized signatures regardless
+                // of the cutoff position; see GH#1133
+                if (signature.hasLiteralTypes) {
+                    specializedIndex++;
+                    spliceIndex = specializedIndex;
+                    // The cutoff index always needs to be greater than or equal to the specialized signature index
+                    // in order to prevent non-specialized signatures from being added before a specialized
+                    // signature.
+                    cutoffIndex++;
+                }
+                else {
+                    spliceIndex = index;
+                }
+                result.splice(spliceIndex, 0, signature);
+            }
+        }
+        function isSpreadArgument(arg) {
+            return !!arg && (arg.kind === 208 /* SpreadElement */ || arg.kind === 215 /* SyntheticExpression */ && arg.isSpread);
+        }
+        function getSpreadArgumentIndex(args) {
+            return ts.findIndex(args, isSpreadArgument);
+        }
+        function acceptsVoid(t) {
+            return !!(t.flags & 16384 /* Void */);
+        }
+        function hasCorrectArity(node, args, signature, signatureHelpTrailingComma) {
+            if (signatureHelpTrailingComma === void 0) { signatureHelpTrailingComma = false; }
+            var argCount;
+            var callIsIncomplete = false; // In incomplete call we want to be lenient when we have too few arguments
+            var effectiveParameterCount = getParameterCount(signature);
+            var effectiveMinimumArguments = getMinArgumentCount(signature);
+            if (node.kind === 193 /* TaggedTemplateExpression */) {
+                argCount = args.length;
+                if (node.template.kind === 206 /* TemplateExpression */) {
+                    // If a tagged template expression lacks a tail literal, the call is incomplete.
+                    // Specifically, a template only can end in a TemplateTail or a Missing literal.
+                    var lastSpan = ts.last(node.template.templateSpans); // we should always have at least one span.
+                    callIsIncomplete = ts.nodeIsMissing(lastSpan.literal) || !!lastSpan.literal.isUnterminated;
+                }
+                else {
+                    // If the template didn't end in a backtick, or its beginning occurred right prior to EOF,
+                    // then this might actually turn out to be a TemplateHead in the future;
+                    // so we consider the call to be incomplete.
+                    var templateLiteral = node.template;
+                    ts.Debug.assert(templateLiteral.kind === 14 /* NoSubstitutionTemplateLiteral */);
+                    callIsIncomplete = !!templateLiteral.isUnterminated;
+                }
+            }
+            else if (node.kind === 152 /* Decorator */) {
+                argCount = getDecoratorArgumentCount(node, signature);
+            }
+            else if (ts.isJsxOpeningLikeElement(node)) {
+                callIsIncomplete = node.attributes.end === node.end;
+                if (callIsIncomplete) {
+                    return true;
+                }
+                argCount = effectiveMinimumArguments === 0 ? args.length : 1;
+                effectiveParameterCount = args.length === 0 ? effectiveParameterCount : 1; // class may have argumentless ctor functions - still resolve ctor and compare vs props member type
+                effectiveMinimumArguments = Math.min(effectiveMinimumArguments, 1); // sfc may specify context argument - handled by framework and not typechecked
+            }
+            else {
+                if (!node.arguments) {
+                    // This only happens when we have something of the form: 'new C'
+                    ts.Debug.assert(node.kind === 192 /* NewExpression */);
+                    return getMinArgumentCount(signature) === 0;
+                }
+                argCount = signatureHelpTrailingComma ? args.length + 1 : args.length;
+                // If we are missing the close parenthesis, the call is incomplete.
+                callIsIncomplete = node.arguments.end === node.end;
+                // If a spread argument is present, check that it corresponds to a rest parameter or at least that it's in the valid range.
+                var spreadArgIndex = getSpreadArgumentIndex(args);
+                if (spreadArgIndex >= 0) {
+                    return spreadArgIndex >= getMinArgumentCount(signature) && (hasEffectiveRestParameter(signature) || spreadArgIndex < getParameterCount(signature));
+                }
+            }
+            // Too many arguments implies incorrect arity.
+            if (!hasEffectiveRestParameter(signature) && argCount > effectiveParameterCount) {
+                return false;
+            }
+            // If the call is incomplete, we should skip the lower bound check.
+            // JSX signatures can have extra parameters provided by the library which we don't check
+            if (callIsIncomplete || argCount >= effectiveMinimumArguments) {
+                return true;
+            }
+            for (var i = argCount; i < effectiveMinimumArguments; i++) {
+                var type = getTypeAtPosition(signature, i);
+                if (filterType(type, acceptsVoid).flags & 131072 /* Never */) {
+                    return false;
+                }
+            }
+            return true;
+        }
+        function hasCorrectTypeArgumentArity(signature, typeArguments) {
+            // If the user supplied type arguments, but the number of type arguments does not match
+            // the declared number of type parameters, the call has an incorrect arity.
+            var numTypeParameters = ts.length(signature.typeParameters);
+            var minTypeArgumentCount = getMinTypeArgumentCount(signature.typeParameters);
+            return !typeArguments ||
+                (typeArguments.length >= minTypeArgumentCount && typeArguments.length <= numTypeParameters);
+        }
+        // If type has a single call signature and no other members, return that signature. Otherwise, return undefined.
+        function getSingleCallSignature(type) {
+            if (type.flags & 524288 /* Object */) {
+                var resolved = resolveStructuredTypeMembers(type);
+                if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 &&
+                    resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
+                    return resolved.callSignatures[0];
+                }
+            }
+            return undefined;
+        }
+        // Instantiate a generic signature in the context of a non-generic signature (section 3.8.5 in TypeScript spec)
+        function instantiateSignatureInContextOf(signature, contextualSignature, contextualMapper, compareTypes) {
+            var context = createInferenceContext(signature.typeParameters, signature, 0 /* None */, compareTypes);
+            var sourceSignature = contextualMapper ? instantiateSignature(contextualSignature, contextualMapper) : contextualSignature;
+            forEachMatchingParameterType(sourceSignature, signature, function (source, target) {
+                // Type parameters from outer context referenced by source type are fixed by instantiation of the source type
+                inferTypes(context.inferences, source, target);
+            });
+            if (!contextualMapper) {
+                inferTypes(context.inferences, getReturnTypeOfSignature(contextualSignature), getReturnTypeOfSignature(signature), 8 /* ReturnType */);
+            }
+            return getSignatureInstantiation(signature, getInferredTypes(context), ts.isInJSFile(contextualSignature.declaration));
+        }
+        function inferJsxTypeArguments(node, signature, excludeArgument, context) {
+            var paramType = getEffectiveFirstArgumentForJsxSignature(signature, node);
+            var checkAttrType = checkExpressionWithContextualType(node.attributes, paramType, excludeArgument && excludeArgument[0] !== undefined ? identityMapper : context);
+            inferTypes(context.inferences, checkAttrType, paramType);
+            return getInferredTypes(context);
+        }
+        function inferTypeArguments(node, signature, args, excludeArgument, context) {
+            // Clear out all the inference results from the last time inferTypeArguments was called on this context
+            for (var _i = 0, _a = context.inferences; _i < _a.length; _i++) {
+                var inference = _a[_i];
+                // As an optimization, we don't have to clear (and later recompute) inferred types
+                // for type parameters that have already been fixed on the previous call to inferTypeArguments.
+                // It would be just as correct to reset all of them. But then we'd be repeating the same work
+                // for the type parameters that were fixed, namely the work done by getInferredType.
+                if (!inference.isFixed) {
+                    inference.inferredType = undefined;
+                }
+            }
+            if (ts.isJsxOpeningLikeElement(node)) {
+                return inferJsxTypeArguments(node, signature, excludeArgument, context);
+            }
+            // If a contextual type is available, infer from that type to the return type of the call expression. For
+            // example, given a 'function wrap<T, U>(cb: (x: T) => U): (x: T) => U' and a call expression
+            // 'let f: (x: string) => number = wrap(s => s.length)', we infer from the declared type of 'f' to the
+            // return type of 'wrap'.
+            if (node.kind !== 152 /* Decorator */) {
+                var contextualType = getContextualType(node);
+                if (contextualType) {
+                    // We clone the contextual mapper to avoid disturbing a resolution in progress for an
+                    // outer call expression. Effectively we just want a snapshot of whatever has been
+                    // inferred for any outer call expression so far.
+                    var instantiatedType = instantiateType(contextualType, cloneTypeMapper(getContextualMapper(node)));
+                    // If the contextual type is a generic function type with a single call signature, we
+                    // instantiate the type with its own type parameters and type arguments. This ensures that
+                    // the type parameters are not erased to type any during type inference such that they can
+                    // be inferred as actual types from the contextual type. For example:
+                    //   declare function arrayMap<T, U>(f: (x: T) => U): (a: T[]) => U[];
+                    //   const boxElements: <A>(a: A[]) => { value: A }[] = arrayMap(value => ({ value }));
+                    // Above, the type of the 'value' parameter is inferred to be 'A'.
+                    var contextualSignature = getSingleCallSignature(instantiatedType);
+                    var inferenceSourceType = contextualSignature && contextualSignature.typeParameters ?
+                        getOrCreateTypeFromSignature(getSignatureInstantiationWithoutFillingInTypeArguments(contextualSignature, contextualSignature.typeParameters)) :
+                        instantiatedType;
+                    var inferenceTargetType = getReturnTypeOfSignature(signature);
+                    // Inferences made from return types have lower priority than all other inferences.
+                    inferTypes(context.inferences, inferenceSourceType, inferenceTargetType, 8 /* ReturnType */);
+                }
+            }
+            var thisType = getThisTypeOfSignature(signature);
+            if (thisType) {
+                var thisArgumentNode = getThisArgumentOfCall(node);
+                var thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
+                inferTypes(context.inferences, thisArgumentType, thisType);
+            }
+            var restType = getNonArrayRestType(signature);
+            var argCount = restType ? Math.min(getParameterCount(signature) - 1, args.length) : args.length;
+            for (var i = 0; i < argCount; i++) {
+                var arg = args[i];
+                if (arg.kind !== 210 /* OmittedExpression */) {
+                    var paramType = getTypeAtPosition(signature, i);
+                    // For context sensitive arguments we pass the identityMapper, which is a signal to treat all
+                    // context sensitive function expressions as wildcards
+                    var mapper = excludeArgument && excludeArgument[i] !== undefined ? identityMapper : context;
+                    var argType = checkExpressionWithContextualType(arg, paramType, mapper);
+                    inferTypes(context.inferences, argType, paramType);
+                }
+            }
+            if (restType) {
+                var spreadType = getSpreadArgumentType(args, argCount, args.length, restType, context);
+                inferTypes(context.inferences, spreadType, restType);
+            }
+            return getInferredTypes(context);
+        }
+        function getArrayifiedType(type) {
+            if (forEachType(type, function (t) { return !(t.flags & (1 /* Any */ | 63176704 /* Instantiable */) || isArrayType(t) || isTupleType(t)); })) {
+                return createArrayType(getIndexTypeOfType(type, 1 /* Number */) || errorType);
+            }
+            return type;
+        }
+        function getSpreadArgumentType(args, index, argCount, restType, context) {
+            if (index >= argCount - 1) {
+                var arg = args[argCount - 1];
+                if (isSpreadArgument(arg)) {
+                    // We are inferring from a spread expression in the last argument position, i.e. both the parameter
+                    // and the argument are ...x forms.
+                    return arg.kind === 215 /* SyntheticExpression */ ?
+                        createArrayType(arg.type) :
+                        getArrayifiedType(checkExpressionWithContextualType(arg.expression, restType, context));
+                }
+            }
+            var contextualType = getIndexTypeOfType(restType, 1 /* Number */) || anyType;
+            var hasPrimitiveContextualType = maybeTypeOfKind(contextualType, 131068 /* Primitive */ | 4194304 /* Index */);
+            var types = [];
+            var spreadIndex = -1;
+            for (var i = index; i < argCount; i++) {
+                var argType = checkExpressionWithContextualType(args[i], contextualType, context);
+                if (spreadIndex < 0 && isSpreadArgument(args[i])) {
+                    spreadIndex = i - index;
+                }
+                types.push(hasPrimitiveContextualType ? getRegularTypeOfLiteralType(argType) : getWidenedLiteralType(argType));
+            }
+            return spreadIndex < 0 ?
+                createTupleType(types) :
+                createTupleType(ts.append(types.slice(0, spreadIndex), getUnionType(types.slice(spreadIndex))), spreadIndex, /*hasRestElement*/ true);
+        }
+        function checkTypeArguments(signature, typeArgumentNodes, reportErrors, headMessage) {
+            var isJavascript = ts.isInJSFile(signature.declaration);
+            var typeParameters = signature.typeParameters;
+            var typeArgumentTypes = fillMissingTypeArguments(ts.map(typeArgumentNodes, getTypeFromTypeNode), typeParameters, getMinTypeArgumentCount(typeParameters), isJavascript);
+            var mapper;
+            for (var i = 0; i < typeArgumentNodes.length; i++) {
+                ts.Debug.assert(typeParameters[i] !== undefined, "Should not call checkTypeArguments with too many type arguments");
+                var constraint = getConstraintOfTypeParameter(typeParameters[i]);
+                if (constraint) {
+                    var errorInfo = reportErrors && headMessage ? (function () { return ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Type_0_does_not_satisfy_the_constraint_1); }) : undefined;
+                    var typeArgumentHeadMessage = headMessage || ts.Diagnostics.Type_0_does_not_satisfy_the_constraint_1;
+                    if (!mapper) {
+                        mapper = createTypeMapper(typeParameters, typeArgumentTypes);
+                    }
+                    var typeArgument = typeArgumentTypes[i];
+                    if (!checkTypeAssignableTo(typeArgument, getTypeWithThisArgument(instantiateType(constraint, mapper), typeArgument), reportErrors ? typeArgumentNodes[i] : undefined, typeArgumentHeadMessage, errorInfo)) {
+                        return undefined;
+                    }
+                }
+            }
+            return typeArgumentTypes;
+        }
+        function getJsxReferenceKind(node) {
+            if (isJsxIntrinsicIdentifier(node.tagName)) {
+                return 2 /* Mixed */;
+            }
+            var tagType = getApparentType(checkExpression(node.tagName));
+            if (ts.length(getSignaturesOfType(tagType, 1 /* Construct */))) {
+                return 0 /* Component */;
+            }
+            if (ts.length(getSignaturesOfType(tagType, 0 /* Call */))) {
+                return 1 /* Function */;
+            }
+            return 2 /* Mixed */;
+        }
+        /**
+         * Check if the given signature can possibly be a signature called by the JSX opening-like element.
+         * @param node a JSX opening-like element we are trying to figure its call signature
+         * @param signature a candidate signature we are trying whether it is a call signature
+         * @param relation a relationship to check parameter and argument type
+         * @param excludeArgument
+         */
+        function checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, excludeArgument, reportErrors) {
+            // Stateless function components can have maximum of three arguments: "props", "context", and "updater".
+            // However "context" and "updater" are implicit and can't be specify by users. Only the first parameter, props,
+            // can be specified by users through attributes property.
+            var paramType = getEffectiveFirstArgumentForJsxSignature(signature, node);
+            var attributesType = checkExpressionWithContextualType(node.attributes, paramType, excludeArgument && excludeArgument[0] ? identityMapper : undefined);
+            return checkTypeRelatedToAndOptionallyElaborate(attributesType, paramType, relation, reportErrors ? node.tagName : undefined, node.attributes);
+        }
+        function checkApplicableSignature(node, args, signature, relation, excludeArgument, reportErrors) {
+            if (ts.isJsxOpeningLikeElement(node)) {
+                return checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, excludeArgument, reportErrors);
+            }
+            var thisType = getThisTypeOfSignature(signature);
+            if (thisType && thisType !== voidType && node.kind !== 192 /* NewExpression */) {
+                // If the called expression is not of the form `x.f` or `x["f"]`, then sourceType = voidType
+                // If the signature's 'this' type is voidType, then the check is skipped -- anything is compatible.
+                // If the expression is a new expression, then the check is skipped.
+                var thisArgumentNode = getThisArgumentOfCall(node);
+                var thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
+                var errorNode = reportErrors ? (thisArgumentNode || node) : undefined;
+                var headMessage_1 = ts.Diagnostics.The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1;
+                if (!checkTypeRelatedTo(thisArgumentType, thisType, relation, errorNode, headMessage_1)) {
+                    return false;
+                }
+            }
+            var headMessage = ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1;
+            var restType = getNonArrayRestType(signature);
+            var argCount = restType ? Math.min(getParameterCount(signature) - 1, args.length) : args.length;
+            for (var i = 0; i < argCount; i++) {
+                var arg = args[i];
+                if (arg.kind !== 210 /* OmittedExpression */) {
+                    var paramType = getTypeAtPosition(signature, i);
+                    var argType = checkExpressionWithContextualType(arg, paramType, excludeArgument && excludeArgument[i] ? identityMapper : undefined);
+                    // If one or more arguments are still excluded (as indicated by a non-null excludeArgument parameter),
+                    // we obtain the regular type of any object literal arguments because we may not have inferred complete
+                    // parameter types yet and therefore excess property checks may yield false positives (see #17041).
+                    var checkArgType = excludeArgument ? getRegularTypeOfObjectLiteral(argType) : argType;
+                    if (!checkTypeRelatedToAndOptionallyElaborate(checkArgType, paramType, relation, reportErrors ? arg : undefined, arg, headMessage)) {
+                        return false;
+                    }
+                }
+            }
+            if (restType) {
+                var spreadType = getSpreadArgumentType(args, argCount, args.length, restType, /*context*/ undefined);
+                var errorNode = reportErrors ? argCount < args.length ? args[argCount] : node : undefined;
+                return checkTypeRelatedTo(spreadType, restType, relation, errorNode, headMessage);
+            }
+            return true;
+        }
+        /**
+         * Returns the this argument in calls like x.f(...) and x[f](...). Undefined otherwise.
+         */
+        function getThisArgumentOfCall(node) {
+            if (node.kind === 191 /* CallExpression */) {
+                var callee = ts.skipOuterExpressions(node.expression);
+                if (callee.kind === 189 /* PropertyAccessExpression */ || callee.kind === 190 /* ElementAccessExpression */) {
+                    return callee.expression;
+                }
+            }
+        }
+        function createSyntheticExpression(parent, type, isSpread) {
+            var result = ts.createNode(215 /* SyntheticExpression */, parent.pos, parent.end);
+            result.parent = parent;
+            result.type = type;
+            result.isSpread = isSpread || false;
+            return result;
+        }
+        /**
+         * Returns the effective arguments for an expression that works like a function invocation.
+         */
+        function getEffectiveCallArguments(node) {
+            if (node.kind === 193 /* TaggedTemplateExpression */) {
+                var template = node.template;
+                var args_4 = [createSyntheticExpression(template, getGlobalTemplateStringsArrayType())];
+                if (template.kind === 206 /* TemplateExpression */) {
+                    ts.forEach(template.templateSpans, function (span) {
+                        args_4.push(span.expression);
+                    });
+                }
+                return args_4;
+            }
+            if (node.kind === 152 /* Decorator */) {
+                return getEffectiveDecoratorArguments(node);
+            }
+            if (ts.isJsxOpeningLikeElement(node)) {
+                return node.attributes.properties.length > 0 || (ts.isJsxOpeningElement(node) && node.parent.children.length > 0) ? [node.attributes] : ts.emptyArray;
+            }
+            var args = node.arguments || ts.emptyArray;
+            var length = args.length;
+            if (length && isSpreadArgument(args[length - 1]) && getSpreadArgumentIndex(args) === length - 1) {
+                // We have a spread argument in the last position and no other spread arguments. If the type
+                // of the argument is a tuple type, spread the tuple elements into the argument list. We can
+                // call checkExpressionCached because spread expressions never have a contextual type.
+                var spreadArgument_1 = args[length - 1];
+                var type = checkExpressionCached(spreadArgument_1.expression);
+                if (isTupleType(type)) {
+                    var typeArguments = type.typeArguments || ts.emptyArray;
+                    var restIndex_2 = type.target.hasRestElement ? typeArguments.length - 1 : -1;
+                    var syntheticArgs = ts.map(typeArguments, function (t, i) { return createSyntheticExpression(spreadArgument_1, t, /*isSpread*/ i === restIndex_2); });
+                    return ts.concatenate(args.slice(0, length - 1), syntheticArgs);
+                }
+            }
+            return args;
+        }
+        /**
+         * Returns the synthetic argument list for a decorator invocation.
+         */
+        function getEffectiveDecoratorArguments(node) {
+            var parent = node.parent;
+            var expr = node.expression;
+            switch (parent.kind) {
+                case 240 /* ClassDeclaration */:
+                case 209 /* ClassExpression */:
+                    // For a class decorator, the `target` is the type of the class (e.g. the
+                    // "static" or "constructor" side of the class).
+                    return [
+                        createSyntheticExpression(expr, getTypeOfSymbol(getSymbolOfNode(parent)))
+                    ];
+                case 151 /* Parameter */:
+                    // A parameter declaration decorator will have three arguments (see
+                    // `ParameterDecorator` in core.d.ts).
+                    var func = parent.parent;
+                    return [
+                        createSyntheticExpression(expr, parent.parent.kind === 157 /* Constructor */ ? getTypeOfSymbol(getSymbolOfNode(func)) : errorType),
+                        createSyntheticExpression(expr, anyType),
+                        createSyntheticExpression(expr, numberType)
+                    ];
+                case 154 /* PropertyDeclaration */:
+                case 156 /* MethodDeclaration */:
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                    // A method or accessor declaration decorator will have two or three arguments (see
+                    // `PropertyDecorator` and `MethodDecorator` in core.d.ts). If we are emitting decorators
+                    // for ES3, we will only pass two arguments.
+                    var hasPropDesc = parent.kind !== 154 /* PropertyDeclaration */ && languageVersion !== 0 /* ES3 */;
+                    return [
+                        createSyntheticExpression(expr, getParentTypeOfClassElement(parent)),
+                        createSyntheticExpression(expr, getClassElementPropertyKeyType(parent)),
+                        createSyntheticExpression(expr, hasPropDesc ? createTypedPropertyDescriptorType(getTypeOfNode(parent)) : anyType)
+                    ];
+            }
+            return ts.Debug.fail();
+        }
+        /**
+         * Returns the argument count for a decorator node that works like a function invocation.
+         */
+        function getDecoratorArgumentCount(node, signature) {
+            switch (node.parent.kind) {
+                case 240 /* ClassDeclaration */:
+                case 209 /* ClassExpression */:
+                    return 1;
+                case 154 /* PropertyDeclaration */:
+                    return 2;
+                case 156 /* MethodDeclaration */:
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                    // For ES3 or decorators with only two parameters we supply only two arguments
+                    return languageVersion === 0 /* ES3 */ || signature.parameters.length <= 2 ? 2 : 3;
+                case 151 /* Parameter */:
+                    return 3;
+                default:
+                    return ts.Debug.fail();
+            }
+        }
+        function getArgumentArityError(node, signatures, args) {
+            var min = Number.POSITIVE_INFINITY;
+            var max = Number.NEGATIVE_INFINITY;
+            var belowArgCount = Number.NEGATIVE_INFINITY;
+            var aboveArgCount = Number.POSITIVE_INFINITY;
+            var argCount = args.length;
+            var closestSignature;
+            for (var _i = 0, signatures_4 = signatures; _i < signatures_4.length; _i++) {
+                var sig = signatures_4[_i];
+                var minCount = getMinArgumentCount(sig);
+                var maxCount = getParameterCount(sig);
+                if (minCount < argCount && minCount > belowArgCount)
+                    belowArgCount = minCount;
+                if (argCount < maxCount && maxCount < aboveArgCount)
+                    aboveArgCount = maxCount;
+                if (minCount < min) {
+                    min = minCount;
+                    closestSignature = sig;
+                }
+                max = Math.max(max, maxCount);
+            }
+            var hasRestParameter = ts.some(signatures, hasEffectiveRestParameter);
+            var paramRange = hasRestParameter ? min :
+                min < max ? min + "-" + max :
+                    min;
+            var hasSpreadArgument = getSpreadArgumentIndex(args) > -1;
+            if (argCount <= max && hasSpreadArgument) {
+                argCount--;
+            }
+            var related;
+            if (closestSignature && getMinArgumentCount(closestSignature) > argCount && closestSignature.declaration) {
+                var paramDecl = closestSignature.declaration.parameters[closestSignature.thisParameter ? argCount + 1 : argCount];
+                if (paramDecl) {
+                    related = ts.createDiagnosticForNode(paramDecl, ts.isBindingPattern(paramDecl.name) ? ts.Diagnostics.An_argument_matching_this_binding_pattern_was_not_provided : ts.Diagnostics.An_argument_for_0_was_not_provided, !paramDecl.name ? argCount : !ts.isBindingPattern(paramDecl.name) ? ts.idText(getFirstIdentifier(paramDecl.name)) : undefined);
+                }
+            }
+            if (hasRestParameter || hasSpreadArgument) {
+                var error_1 = hasRestParameter && hasSpreadArgument ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1_or_more :
+                    hasRestParameter ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1 :
+                        ts.Diagnostics.Expected_0_arguments_but_got_1_or_more;
+                var diagnostic_1 = ts.createDiagnosticForNode(node, error_1, paramRange, argCount);
+                return related ? addRelatedInfo(diagnostic_1, related) : diagnostic_1;
+            }
+            if (min < argCount && argCount < max) {
+                return ts.createDiagnosticForNode(node, ts.Diagnostics.No_overload_expects_0_arguments_but_overloads_do_exist_that_expect_either_1_or_2_arguments, argCount, belowArgCount, aboveArgCount);
+            }
+            var diagnostic = ts.createDiagnosticForNode(node, ts.Diagnostics.Expected_0_arguments_but_got_1, paramRange, argCount);
+            return related ? addRelatedInfo(diagnostic, related) : diagnostic;
+        }
+        function getTypeArgumentArityError(node, signatures, typeArguments) {
+            var argCount = typeArguments.length;
+            // No overloads exist
+            if (signatures.length === 1) {
+                var sig = signatures[0];
+                var min_1 = getMinTypeArgumentCount(sig.typeParameters);
+                var max = ts.length(sig.typeParameters);
+                return ts.createDiagnosticForNodeArray(ts.getSourceFileOfNode(node), typeArguments, ts.Diagnostics.Expected_0_type_arguments_but_got_1, min_1 < max ? min_1 + "-" + max : min_1, argCount);
+            }
+            // Overloads exist
+            var belowArgCount = -Infinity;
+            var aboveArgCount = Infinity;
+            for (var _i = 0, signatures_5 = signatures; _i < signatures_5.length; _i++) {
+                var sig = signatures_5[_i];
+                var min_2 = getMinTypeArgumentCount(sig.typeParameters);
+                var max = ts.length(sig.typeParameters);
+                if (min_2 > argCount) {
+                    aboveArgCount = Math.min(aboveArgCount, min_2);
+                }
+                else if (max < argCount) {
+                    belowArgCount = Math.max(belowArgCount, max);
+                }
+            }
+            if (belowArgCount !== -Infinity && aboveArgCount !== Infinity) {
+                return ts.createDiagnosticForNodeArray(ts.getSourceFileOfNode(node), typeArguments, ts.Diagnostics.No_overload_expects_0_type_arguments_but_overloads_do_exist_that_expect_either_1_or_2_type_arguments, argCount, belowArgCount, aboveArgCount);
+            }
+            return ts.createDiagnosticForNodeArray(ts.getSourceFileOfNode(node), typeArguments, ts.Diagnostics.Expected_0_type_arguments_but_got_1, belowArgCount === -Infinity ? aboveArgCount : belowArgCount, argCount);
+        }
+        function resolveCall(node, signatures, candidatesOutArray, isForSignatureHelp, fallbackError) {
+            var isTaggedTemplate = node.kind === 193 /* TaggedTemplateExpression */;
+            var isDecorator = node.kind === 152 /* Decorator */;
+            var isJsxOpeningOrSelfClosingElement = ts.isJsxOpeningLikeElement(node);
+            var reportErrors = !candidatesOutArray;
+            var typeArguments;
+            if (!isDecorator) {
+                typeArguments = node.typeArguments;
+                // We already perform checking on the type arguments on the class declaration itself.
+                if (isTaggedTemplate || isJsxOpeningOrSelfClosingElement || node.expression.kind !== 98 /* SuperKeyword */) {
+                    ts.forEach(typeArguments, checkSourceElement);
+                }
+            }
+            var candidates = candidatesOutArray || [];
+            // reorderCandidates fills up the candidates array directly
+            reorderCandidates(signatures, candidates);
+            if (!candidates.length) {
+                if (reportErrors) {
+                    diagnostics.add(ts.createDiagnosticForNode(node, ts.Diagnostics.Call_target_does_not_contain_any_signatures));
+                }
+                return resolveErrorCall(node);
+            }
+            var args = getEffectiveCallArguments(node);
+            // The excludeArgument array contains true for each context sensitive argument (an argument
+            // is context sensitive it is susceptible to a one-time permanent contextual typing).
+            //
+            // The idea is that we will perform type argument inference & assignability checking once
+            // without using the susceptible parameters that are functions, and once more for those
+            // parameters, contextually typing each as we go along.
+            //
+            // For a tagged template, then the first argument be 'undefined' if necessary because it
+            // represents a TemplateStringsArray.
+            //
+            // For a decorator, no arguments are susceptible to contextual typing due to the fact
+            // decorators are applied to a declaration by the emitter, and not to an expression.
+            var isSingleNonGenericCandidate = candidates.length === 1 && !candidates[0].typeParameters;
+            var excludeArgument = !isDecorator && !isSingleNonGenericCandidate ? getExcludeArgument(args) : undefined;
+            // The following variables are captured and modified by calls to chooseOverload.
+            // If overload resolution or type argument inference fails, we want to report the
+            // best error possible. The best error is one which says that an argument was not
+            // assignable to a parameter. This implies that everything else about the overload
+            // was fine. So if there is any overload that is only incorrect because of an
+            // argument, we will report an error on that one.
+            //
+            //     function foo(s: string): void;
+            //     function foo(n: number): void; // Report argument error on this overload
+            //     function foo(): void;
+            //     foo(true);
+            //
+            // If none of the overloads even made it that far, there are two possibilities.
+            // There was a problem with type arguments for some overload, in which case
+            // report an error on that. Or none of the overloads even had correct arity,
+            // in which case give an arity error.
+            //
+            //     function foo<T extends string>(x: T): void; // Report type argument error
+            //     function foo(): void;
+            //     foo<number>(0);
+            //
+            var candidateForArgumentError;
+            var candidateForArgumentArityError;
+            var candidateForTypeArgumentError;
+            var result;
+            // If we are in signature help, a trailing comma indicates that we intend to provide another argument,
+            // so we will only accept overloads with arity at least 1 higher than the current number of provided arguments.
+            var signatureHelpTrailingComma = isForSignatureHelp && node.kind === 191 /* CallExpression */ && node.arguments.hasTrailingComma;
+            // Section 4.12.1:
+            // if the candidate list contains one or more signatures for which the type of each argument
+            // expression is a subtype of each corresponding parameter type, the return type of the first
+            // of those signatures becomes the return type of the function call.
+            // Otherwise, the return type of the first signature in the candidate list becomes the return
+            // type of the function call.
+            //
+            // Whether the call is an error is determined by assignability of the arguments. The subtype pass
+            // is just important for choosing the best signature. So in the case where there is only one
+            // signature, the subtype pass is useless. So skipping it is an optimization.
+            if (candidates.length > 1) {
+                result = chooseOverload(candidates, subtypeRelation, signatureHelpTrailingComma);
+            }
+            if (!result) {
+                result = chooseOverload(candidates, assignableRelation, signatureHelpTrailingComma);
+            }
+            if (result) {
+                return result;
+            }
+            // No signatures were applicable. Now report errors based on the last applicable signature with
+            // no arguments excluded from assignability checks.
+            // If candidate is undefined, it means that no candidates had a suitable arity. In that case,
+            // skip the checkApplicableSignature check.
+            if (reportErrors) {
+                if (candidateForArgumentError) {
+                    // excludeArgument is undefined, in this case also equivalent to [undefined, undefined, ...]
+                    // The importance of excludeArgument is to prevent us from typing function expression parameters
+                    // in arguments too early. If possible, we'd like to only type them once we know the correct
+                    // overload. However, this matters for the case where the call is correct. When the call is
+                    // an error, we don't need to exclude any arguments, although it would cause no harm to do so.
+                    checkApplicableSignature(node, args, candidateForArgumentError, assignableRelation, /*excludeArgument*/ undefined, /*reportErrors*/ true);
+                }
+                else if (candidateForArgumentArityError) {
+                    diagnostics.add(getArgumentArityError(node, [candidateForArgumentArityError], args));
+                }
+                else if (candidateForTypeArgumentError) {
+                    checkTypeArguments(candidateForTypeArgumentError, node.typeArguments, /*reportErrors*/ true, fallbackError);
+                }
+                else {
+                    var signaturesWithCorrectTypeArgumentArity = ts.filter(signatures, function (s) { return hasCorrectTypeArgumentArity(s, typeArguments); });
+                    if (signaturesWithCorrectTypeArgumentArity.length === 0) {
+                        diagnostics.add(getTypeArgumentArityError(node, signatures, typeArguments));
+                    }
+                    else if (!isDecorator) {
+                        diagnostics.add(getArgumentArityError(node, signaturesWithCorrectTypeArgumentArity, args));
+                    }
+                    else if (fallbackError) {
+                        diagnostics.add(ts.createDiagnosticForNode(node, fallbackError));
+                    }
+                }
+            }
+            return produceDiagnostics || !args ? resolveErrorCall(node) : getCandidateForOverloadFailure(node, candidates, args, !!candidatesOutArray);
+            function chooseOverload(candidates, relation, signatureHelpTrailingComma) {
+                if (signatureHelpTrailingComma === void 0) { signatureHelpTrailingComma = false; }
+                candidateForArgumentError = undefined;
+                candidateForArgumentArityError = undefined;
+                candidateForTypeArgumentError = undefined;
+                if (isSingleNonGenericCandidate) {
+                    var candidate = candidates[0];
+                    if (typeArguments || !hasCorrectArity(node, args, candidate, signatureHelpTrailingComma)) {
+                        return undefined;
+                    }
+                    if (!checkApplicableSignature(node, args, candidate, relation, excludeArgument, /*reportErrors*/ false)) {
+                        candidateForArgumentError = candidate;
+                        return undefined;
+                    }
+                    return candidate;
+                }
+                for (var candidateIndex = 0; candidateIndex < candidates.length; candidateIndex++) {
+                    var candidate = candidates[candidateIndex];
+                    if (!hasCorrectTypeArgumentArity(candidate, typeArguments) || !hasCorrectArity(node, args, candidate, signatureHelpTrailingComma)) {
+                        continue;
+                    }
+                    var checkCandidate = void 0;
+                    var inferenceContext = void 0;
+                    if (candidate.typeParameters) {
+                        var typeArgumentTypes = void 0;
+                        if (typeArguments) {
+                            typeArgumentTypes = checkTypeArguments(candidate, typeArguments, /*reportErrors*/ false);
+                            if (!typeArgumentTypes) {
+                                candidateForTypeArgumentError = candidate;
+                                continue;
+                            }
+                        }
+                        else {
+                            inferenceContext = createInferenceContext(candidate.typeParameters, candidate, /*flags*/ ts.isInJSFile(node) ? 2 /* AnyDefault */ : 0 /* None */);
+                            typeArgumentTypes = inferTypeArguments(node, candidate, args, excludeArgument, inferenceContext);
+                        }
+                        checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, ts.isInJSFile(candidate.declaration));
+                        // If the original signature has a generic rest type, instantiation may produce a
+                        // signature with different arity and we need to perform another arity check.
+                        if (getNonArrayRestType(candidate) && !hasCorrectArity(node, args, checkCandidate, signatureHelpTrailingComma)) {
+                            candidateForArgumentArityError = checkCandidate;
+                            continue;
+                        }
+                    }
+                    else {
+                        checkCandidate = candidate;
+                    }
+                    if (!checkApplicableSignature(node, args, checkCandidate, relation, excludeArgument, /*reportErrors*/ false)) {
+                        // Give preference to error candidates that have no rest parameters (as they are more specific)
+                        if (!candidateForArgumentError || getEffectiveRestType(candidateForArgumentError) || !getEffectiveRestType(checkCandidate)) {
+                            candidateForArgumentError = checkCandidate;
+                        }
+                        continue;
+                    }
+                    if (excludeArgument) {
+                        // If one or more context sensitive arguments were excluded, we start including
+                        // them now (and keeping do so for any subsequent candidates) and perform a second
+                        // round of type inference and applicability checking for this particular candidate.
+                        excludeArgument = undefined;
+                        if (inferenceContext) {
+                            var typeArgumentTypes = inferTypeArguments(node, candidate, args, excludeArgument, inferenceContext);
+                            checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, ts.isInJSFile(candidate.declaration));
+                            // If the original signature has a generic rest type, instantiation may produce a
+                            // signature with different arity and we need to perform another arity check.
+                            if (getNonArrayRestType(candidate) && !hasCorrectArity(node, args, checkCandidate, signatureHelpTrailingComma)) {
+                                candidateForArgumentArityError = checkCandidate;
+                                continue;
+                            }
+                        }
+                        if (!checkApplicableSignature(node, args, checkCandidate, relation, excludeArgument, /*reportErrors*/ false)) {
+                            // Give preference to error candidates that have no rest parameters (as they are more specific)
+                            if (!candidateForArgumentError || getEffectiveRestType(candidateForArgumentError) || !getEffectiveRestType(checkCandidate)) {
+                                candidateForArgumentError = checkCandidate;
+                            }
+                            continue;
+                        }
+                    }
+                    candidates[candidateIndex] = checkCandidate;
+                    return checkCandidate;
+                }
+                return undefined;
+            }
+        }
+        function getExcludeArgument(args) {
+            var excludeArgument;
+            // We do not need to call `getEffectiveArgumentCount` here as it only
+            // applies when calculating the number of arguments for a decorator.
+            for (var i = 0; i < args.length; i++) {
+                if (isContextSensitive(args[i])) {
+                    if (!excludeArgument) {
+                        excludeArgument = new Array(args.length);
+                    }
+                    excludeArgument[i] = true;
+                }
+            }
+            return excludeArgument;
+        }
+        // No signature was applicable. We have already reported the errors for the invalid signature.
+        // If this is a type resolution session, e.g. Language Service, try to get better information than anySignature.
+        function getCandidateForOverloadFailure(node, candidates, args, hasCandidatesOutArray) {
+            ts.Debug.assert(candidates.length > 0); // Else should not have called this.
+            // Normally we will combine overloads. Skip this if they have type parameters since that's hard to combine.
+            // Don't do this if there is a `candidatesOutArray`,
+            // because then we want the chosen best candidate to be one of the overloads, not a combination.
+            return hasCandidatesOutArray || candidates.length === 1 || candidates.some(function (c) { return !!c.typeParameters; })
+                ? pickLongestCandidateSignature(node, candidates, args)
+                : createUnionOfSignaturesForOverloadFailure(candidates);
+        }
+        function createUnionOfSignaturesForOverloadFailure(candidates) {
+            var thisParameters = ts.mapDefined(candidates, function (c) { return c.thisParameter; });
+            var thisParameter;
+            if (thisParameters.length) {
+                thisParameter = createCombinedSymbolFromTypes(thisParameters, thisParameters.map(getTypeOfParameter));
+            }
+            var _a = ts.minAndMax(candidates, getNumNonRestParameters), minArgumentCount = _a.min, maxNonRestParam = _a.max;
+            var parameters = [];
+            var _loop_8 = function (i) {
+                var symbols = ts.mapDefined(candidates, function (_a) {
+                    var parameters = _a.parameters, hasRestParameter = _a.hasRestParameter;
+                    return hasRestParameter ?
+                        i < parameters.length - 1 ? parameters[i] : ts.last(parameters) :
+                        i < parameters.length ? parameters[i] : undefined;
+                });
+                ts.Debug.assert(symbols.length !== 0);
+                parameters.push(createCombinedSymbolFromTypes(symbols, ts.mapDefined(candidates, function (candidate) { return tryGetTypeAtPosition(candidate, i); })));
+            };
+            for (var i = 0; i < maxNonRestParam; i++) {
+                _loop_8(i);
+            }
+            var restParameterSymbols = ts.mapDefined(candidates, function (c) { return c.hasRestParameter ? ts.last(c.parameters) : undefined; });
+            var hasRestParameter = restParameterSymbols.length !== 0;
+            if (hasRestParameter) {
+                var type = createArrayType(getUnionType(ts.mapDefined(candidates, tryGetRestTypeOfSignature), 2 /* Subtype */));
+                parameters.push(createCombinedSymbolForOverloadFailure(restParameterSymbols, type));
+            }
+            return createSignature(candidates[0].declaration, 
+            /*typeParameters*/ undefined, // Before calling this we tested for `!candidates.some(c => !!c.typeParameters)`.
+            thisParameter, parameters, 
+            /*resolvedReturnType*/ getIntersectionType(candidates.map(getReturnTypeOfSignature)), 
+            /*typePredicate*/ undefined, minArgumentCount, hasRestParameter, 
+            /*hasLiteralTypes*/ candidates.some(function (c) { return c.hasLiteralTypes; }));
+        }
+        function getNumNonRestParameters(signature) {
+            var numParams = signature.parameters.length;
+            return signature.hasRestParameter ? numParams - 1 : numParams;
+        }
+        function createCombinedSymbolFromTypes(sources, types) {
+            return createCombinedSymbolForOverloadFailure(sources, getUnionType(types, 2 /* Subtype */));
+        }
+        function createCombinedSymbolForOverloadFailure(sources, type) {
+            // This function is currently only used for erroneous overloads, so it's good enough to just use the first source.
+            return createSymbolWithType(ts.first(sources), type);
+        }
+        function pickLongestCandidateSignature(node, candidates, args) {
+            // Pick the longest signature. This way we can get a contextual type for cases like:
+            //     declare function f(a: { xa: number; xb: number; }, b: number);
+            //     f({ |
+            // Also, use explicitly-supplied type arguments if they are provided, so we can get a contextual signature in cases like:
+            //     declare function f<T>(k: keyof T);
+            //     f<Foo>("
+            var bestIndex = getLongestCandidateIndex(candidates, apparentArgumentCount === undefined ? args.length : apparentArgumentCount);
+            var candidate = candidates[bestIndex];
+            var typeParameters = candidate.typeParameters;
+            if (!typeParameters) {
+                return candidate;
+            }
+            var typeArgumentNodes = callLikeExpressionMayHaveTypeArguments(node) ? node.typeArguments : undefined;
+            var instantiated = typeArgumentNodes
+                ? createSignatureInstantiation(candidate, getTypeArgumentsFromNodes(typeArgumentNodes, typeParameters, ts.isInJSFile(node)))
+                : inferSignatureInstantiationForOverloadFailure(node, typeParameters, candidate, args);
+            candidates[bestIndex] = instantiated;
+            return instantiated;
+        }
+        function getTypeArgumentsFromNodes(typeArgumentNodes, typeParameters, isJs) {
+            var typeArguments = typeArgumentNodes.map(getTypeOfNode);
+            while (typeArguments.length > typeParameters.length) {
+                typeArguments.pop();
+            }
+            while (typeArguments.length < typeParameters.length) {
+                typeArguments.push(getConstraintOfTypeParameter(typeParameters[typeArguments.length]) || getDefaultTypeArgumentType(isJs));
+            }
+            return typeArguments;
+        }
+        function inferSignatureInstantiationForOverloadFailure(node, typeParameters, candidate, args) {
+            var inferenceContext = createInferenceContext(typeParameters, candidate, /*flags*/ ts.isInJSFile(node) ? 2 /* AnyDefault */ : 0 /* None */);
+            var typeArgumentTypes = inferTypeArguments(node, candidate, args, getExcludeArgument(args), inferenceContext);
+            return createSignatureInstantiation(candidate, typeArgumentTypes);
+        }
+        function getLongestCandidateIndex(candidates, argsCount) {
+            var maxParamsIndex = -1;
+            var maxParams = -1;
+            for (var i = 0; i < candidates.length; i++) {
+                var candidate = candidates[i];
+                var paramCount = getParameterCount(candidate);
+                if (hasEffectiveRestParameter(candidate) || paramCount >= argsCount) {
+                    return i;
+                }
+                if (paramCount > maxParams) {
+                    maxParams = paramCount;
+                    maxParamsIndex = i;
+                }
+            }
+            return maxParamsIndex;
+        }
+        function resolveCallExpression(node, candidatesOutArray, isForSignatureHelp) {
+            if (node.expression.kind === 98 /* SuperKeyword */) {
+                var superType = checkSuperExpression(node.expression);
+                if (isTypeAny(superType)) {
+                    for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
+                        var arg = _a[_i];
+                        checkExpression(arg); // Still visit arguments so they get marked for visibility, etc
+                    }
+                    return anySignature;
+                }
+                if (superType !== errorType) {
+                    // In super call, the candidate signatures are the matching arity signatures of the base constructor function instantiated
+                    // with the type arguments specified in the extends clause.
+                    var baseTypeNode = ts.getEffectiveBaseTypeNode(ts.getContainingClass(node));
+                    if (baseTypeNode) {
+                        var baseConstructors = getInstantiatedConstructorsForTypeArguments(superType, baseTypeNode.typeArguments, baseTypeNode);
+                        return resolveCall(node, baseConstructors, candidatesOutArray, isForSignatureHelp);
+                    }
+                }
+                return resolveUntypedCall(node);
+            }
+            var funcType = checkNonNullExpression(node.expression, ts.Diagnostics.Cannot_invoke_an_object_which_is_possibly_null, ts.Diagnostics.Cannot_invoke_an_object_which_is_possibly_undefined, ts.Diagnostics.Cannot_invoke_an_object_which_is_possibly_null_or_undefined);
+            if (funcType === silentNeverType) {
+                return silentNeverSignature;
+            }
+            var apparentType = getApparentType(funcType);
+            if (apparentType === errorType) {
+                // Another error has already been reported
+                return resolveErrorCall(node);
+            }
+            // Technically, this signatures list may be incomplete. We are taking the apparent type,
+            // but we are not including call signatures that may have been added to the Object or
+            // Function interface, since they have none by default. This is a bit of a leap of faith
+            // that the user will not add any.
+            var callSignatures = getSignaturesOfType(apparentType, 0 /* Call */);
+            var numConstructSignatures = getSignaturesOfType(apparentType, 1 /* Construct */).length;
+            // TS 1.0 Spec: 4.12
+            // In an untyped function call no TypeArgs are permitted, Args can be any argument list, no contextual
+            // types are provided for the argument expressions, and the result is always of type Any.
+            if (isUntypedFunctionCall(funcType, apparentType, callSignatures.length, numConstructSignatures)) {
+                // The unknownType indicates that an error already occurred (and was reported).  No
+                // need to report another error in this case.
+                if (funcType !== errorType && node.typeArguments) {
+                    error(node, ts.Diagnostics.Untyped_function_calls_may_not_accept_type_arguments);
+                }
+                return resolveUntypedCall(node);
+            }
+            // If FuncExpr's apparent type(section 3.8.1) is a function type, the call is a typed function call.
+            // TypeScript employs overload resolution in typed function calls in order to support functions
+            // with multiple call signatures.
+            if (!callSignatures.length) {
+                if (numConstructSignatures) {
+                    error(node, ts.Diagnostics.Value_of_type_0_is_not_callable_Did_you_mean_to_include_new, typeToString(funcType));
+                }
+                else {
+                    var relatedInformation = void 0;
+                    if (node.arguments.length === 1) {
+                        var text = ts.getSourceFileOfNode(node).text;
+                        if (ts.isLineBreak(text.charCodeAt(ts.skipTrivia(text, node.expression.end, /* stopAfterLineBreak */ true) - 1))) {
+                            relatedInformation = ts.createDiagnosticForNode(node.expression, ts.Diagnostics.It_is_highly_likely_that_you_are_missing_a_semicolon);
+                        }
+                    }
+                    invocationError(node, apparentType, 0 /* Call */, relatedInformation);
+                }
+                return resolveErrorCall(node);
+            }
+            // If the function is explicitly marked with `@class`, then it must be constructed.
+            if (callSignatures.some(function (sig) { return ts.isInJSFile(sig.declaration) && !!ts.getJSDocClassTag(sig.declaration); })) {
+                error(node, ts.Diagnostics.Value_of_type_0_is_not_callable_Did_you_mean_to_include_new, typeToString(funcType));
+                return resolveErrorCall(node);
+            }
+            return resolveCall(node, callSignatures, candidatesOutArray, isForSignatureHelp);
+        }
+        /**
+         * TS 1.0 spec: 4.12
+         * If FuncExpr is of type Any, or of an object type that has no call or construct signatures
+         * but is a subtype of the Function interface, the call is an untyped function call.
+         */
+        function isUntypedFunctionCall(funcType, apparentFuncType, numCallSignatures, numConstructSignatures) {
+            // We exclude union types because we may have a union of function types that happen to have no common signatures.
+            return isTypeAny(funcType) || isTypeAny(apparentFuncType) && !!(funcType.flags & 262144 /* TypeParameter */) ||
+                !numCallSignatures && !numConstructSignatures && !(apparentFuncType.flags & (1048576 /* Union */ | 131072 /* Never */)) && isTypeAssignableTo(funcType, globalFunctionType);
+        }
+        function resolveNewExpression(node, candidatesOutArray, isForSignatureHelp) {
+            if (node.arguments && languageVersion < 1 /* ES5 */) {
+                var spreadIndex = getSpreadArgumentIndex(node.arguments);
+                if (spreadIndex >= 0) {
+                    error(node.arguments[spreadIndex], ts.Diagnostics.Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher);
+                }
+            }
+            var expressionType = checkNonNullExpression(node.expression);
+            if (expressionType === silentNeverType) {
+                return silentNeverSignature;
+            }
+            // If expressionType's apparent type(section 3.8.1) is an object type with one or
+            // more construct signatures, the expression is processed in the same manner as a
+            // function call, but using the construct signatures as the initial set of candidate
+            // signatures for overload resolution. The result type of the function call becomes
+            // the result type of the operation.
+            expressionType = getApparentType(expressionType);
+            if (expressionType === errorType) {
+                // Another error has already been reported
+                return resolveErrorCall(node);
+            }
+            // TS 1.0 spec: 4.11
+            // If expressionType is of type Any, Args can be any argument
+            // list and the result of the operation is of type Any.
+            if (isTypeAny(expressionType)) {
+                if (node.typeArguments) {
+                    error(node, ts.Diagnostics.Untyped_function_calls_may_not_accept_type_arguments);
+                }
+                return resolveUntypedCall(node);
+            }
+            // Technically, this signatures list may be incomplete. We are taking the apparent type,
+            // but we are not including construct signatures that may have been added to the Object or
+            // Function interface, since they have none by default. This is a bit of a leap of faith
+            // that the user will not add any.
+            var constructSignatures = getSignaturesOfType(expressionType, 1 /* Construct */);
+            if (constructSignatures.length) {
+                if (!isConstructorAccessible(node, constructSignatures[0])) {
+                    return resolveErrorCall(node);
+                }
+                // If the expression is a class of abstract type, then it cannot be instantiated.
+                // Note, only class declarations can be declared abstract.
+                // In the case of a merged class-module or class-interface declaration,
+                // only the class declaration node will have the Abstract flag set.
+                var valueDecl = expressionType.symbol && ts.getClassLikeDeclarationOfSymbol(expressionType.symbol);
+                if (valueDecl && ts.hasModifier(valueDecl, 128 /* Abstract */)) {
+                    error(node, ts.Diagnostics.Cannot_create_an_instance_of_an_abstract_class);
+                    return resolveErrorCall(node);
+                }
+                return resolveCall(node, constructSignatures, candidatesOutArray, isForSignatureHelp);
+            }
+            // If expressionType's apparent type is an object type with no construct signatures but
+            // one or more call signatures, the expression is processed as a function call. A compile-time
+            // error occurs if the result of the function call is not Void. The type of the result of the
+            // operation is Any. It is an error to have a Void this type.
+            var callSignatures = getSignaturesOfType(expressionType, 0 /* Call */);
+            if (callSignatures.length) {
+                var signature = resolveCall(node, callSignatures, candidatesOutArray, isForSignatureHelp);
+                if (!noImplicitAny) {
+                    if (signature.declaration && !isJSConstructor(signature.declaration) && getReturnTypeOfSignature(signature) !== voidType) {
+                        error(node, ts.Diagnostics.Only_a_void_function_can_be_called_with_the_new_keyword);
+                    }
+                    if (getThisTypeOfSignature(signature) === voidType) {
+                        error(node, ts.Diagnostics.A_function_that_is_called_with_the_new_keyword_cannot_have_a_this_type_that_is_void);
+                    }
+                }
+                return signature;
+            }
+            invocationError(node, expressionType, 1 /* Construct */);
+            return resolveErrorCall(node);
+        }
+        function typeHasProtectedAccessibleBase(target, type) {
+            var baseTypes = getBaseTypes(type);
+            if (!ts.length(baseTypes)) {
+                return false;
+            }
+            var firstBase = baseTypes[0];
+            if (firstBase.flags & 2097152 /* Intersection */) {
+                var types = firstBase.types;
+                var mixinCount = ts.countWhere(types, isMixinConstructorType);
+                var i = 0;
+                for (var _i = 0, _a = firstBase.types; _i < _a.length; _i++) {
+                    var intersectionMember = _a[_i];
+                    i++;
+                    // We want to ignore mixin ctors
+                    if (mixinCount === 0 || mixinCount === types.length && i === 0 || !isMixinConstructorType(intersectionMember)) {
+                        if (ts.getObjectFlags(intersectionMember) & (1 /* Class */ | 2 /* Interface */)) {
+                            if (intersectionMember.symbol === target) {
+                                return true;
+                            }
+                            if (typeHasProtectedAccessibleBase(target, intersectionMember)) {
+                                return true;
+                            }
+                        }
+                    }
+                }
+                return false;
+            }
+            if (firstBase.symbol === target) {
+                return true;
+            }
+            return typeHasProtectedAccessibleBase(target, firstBase);
+        }
+        function isConstructorAccessible(node, signature) {
+            if (!signature || !signature.declaration) {
+                return true;
+            }
+            var declaration = signature.declaration;
+            var modifiers = ts.getSelectedModifierFlags(declaration, 24 /* NonPublicAccessibilityModifier */);
+            // Public constructor is accessible.
+            if (!modifiers) {
+                return true;
+            }
+            var declaringClassDeclaration = ts.getClassLikeDeclarationOfSymbol(declaration.parent.symbol);
+            var declaringClass = getDeclaredTypeOfSymbol(declaration.parent.symbol);
+            // A private or protected constructor can only be instantiated within its own class (or a subclass, for protected)
+            if (!isNodeWithinClass(node, declaringClassDeclaration)) {
+                var containingClass = ts.getContainingClass(node);
+                if (containingClass && modifiers & 16 /* Protected */) {
+                    var containingType = getTypeOfNode(containingClass);
+                    if (typeHasProtectedAccessibleBase(declaration.parent.symbol, containingType)) {
+                        return true;
+                    }
+                }
+                if (modifiers & 8 /* Private */) {
+                    error(node, ts.Diagnostics.Constructor_of_class_0_is_private_and_only_accessible_within_the_class_declaration, typeToString(declaringClass));
+                }
+                if (modifiers & 16 /* Protected */) {
+                    error(node, ts.Diagnostics.Constructor_of_class_0_is_protected_and_only_accessible_within_the_class_declaration, typeToString(declaringClass));
+                }
+                return false;
+            }
+            return true;
+        }
+        function invocationError(node, apparentType, kind, relatedInformation) {
+            var diagnostic = error(node, (kind === 0 /* Call */ ?
+                ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures :
+                ts.Diagnostics.Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature), typeToString(apparentType));
+            invocationErrorRecovery(apparentType, kind, relatedInformation ? addRelatedInfo(diagnostic, relatedInformation) : diagnostic);
+        }
+        function invocationErrorRecovery(apparentType, kind, diagnostic) {
+            if (!apparentType.symbol) {
+                return;
+            }
+            var importNode = getSymbolLinks(apparentType.symbol).originatingImport;
+            // Create a diagnostic on the originating import if possible onto which we can attach a quickfix
+            //  An import call expression cannot be rewritten into another form to correct the error - the only solution is to use `.default` at the use-site
+            if (importNode && !ts.isImportCall(importNode)) {
+                var sigs = getSignaturesOfType(getTypeOfSymbol(getSymbolLinks(apparentType.symbol).target), kind);
+                if (!sigs || !sigs.length)
+                    return;
+                addRelatedInfo(diagnostic, ts.createDiagnosticForNode(importNode, ts.Diagnostics.Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_Consider_using_a_default_import_or_import_require_here_instead));
+            }
+        }
+        function resolveTaggedTemplateExpression(node, candidatesOutArray, isForSignatureHelp) {
+            var tagType = checkExpression(node.tag);
+            var apparentType = getApparentType(tagType);
+            if (apparentType === errorType) {
+                // Another error has already been reported
+                return resolveErrorCall(node);
+            }
+            var callSignatures = getSignaturesOfType(apparentType, 0 /* Call */);
+            var numConstructSignatures = getSignaturesOfType(apparentType, 1 /* Construct */).length;
+            if (isUntypedFunctionCall(tagType, apparentType, callSignatures.length, numConstructSignatures)) {
+                return resolveUntypedCall(node);
+            }
+            if (!callSignatures.length) {
+                invocationError(node, apparentType, 0 /* Call */);
+                return resolveErrorCall(node);
+            }
+            return resolveCall(node, callSignatures, candidatesOutArray, isForSignatureHelp);
+        }
+        /**
+         * Gets the localized diagnostic head message to use for errors when resolving a decorator as a call expression.
+         */
+        function getDiagnosticHeadMessageForDecoratorResolution(node) {
+            switch (node.parent.kind) {
+                case 240 /* ClassDeclaration */:
+                case 209 /* ClassExpression */:
+                    return ts.Diagnostics.Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression;
+                case 151 /* Parameter */:
+                    return ts.Diagnostics.Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression;
+                case 154 /* PropertyDeclaration */:
+                    return ts.Diagnostics.Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression;
+                case 156 /* MethodDeclaration */:
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                    return ts.Diagnostics.Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression;
+                default:
+                    return ts.Debug.fail();
+            }
+        }
+        /**
+         * Resolves a decorator as if it were a call expression.
+         */
+        function resolveDecorator(node, candidatesOutArray, isForSignatureHelp) {
+            var funcType = checkExpression(node.expression);
+            var apparentType = getApparentType(funcType);
+            if (apparentType === errorType) {
+                return resolveErrorCall(node);
+            }
+            var callSignatures = getSignaturesOfType(apparentType, 0 /* Call */);
+            var numConstructSignatures = getSignaturesOfType(apparentType, 1 /* Construct */).length;
+            if (isUntypedFunctionCall(funcType, apparentType, callSignatures.length, numConstructSignatures)) {
+                return resolveUntypedCall(node);
+            }
+            if (isPotentiallyUncalledDecorator(node, callSignatures)) {
+                var nodeStr = ts.getTextOfNode(node.expression, /*includeTrivia*/ false);
+                error(node, ts.Diagnostics._0_accepts_too_few_arguments_to_be_used_as_a_decorator_here_Did_you_mean_to_call_it_first_and_write_0, nodeStr);
+                return resolveErrorCall(node);
+            }
+            var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
+            if (!callSignatures.length) {
+                var errorInfo = ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures, typeToString(apparentType));
+                errorInfo = ts.chainDiagnosticMessages(errorInfo, headMessage);
+                var diag = ts.createDiagnosticForNodeFromMessageChain(node, errorInfo);
+                diagnostics.add(diag);
+                invocationErrorRecovery(apparentType, 0 /* Call */, diag);
+                return resolveErrorCall(node);
+            }
+            return resolveCall(node, callSignatures, candidatesOutArray, isForSignatureHelp, headMessage);
+        }
+        function createSignatureForJSXIntrinsic(node, result) {
+            var namespace = getJsxNamespaceAt(node);
+            var exports = namespace && getExportsOfSymbol(namespace);
+            // We fake up a SFC signature for each intrinsic, however a more specific per-element signature drawn from the JSX declaration
+            // file would probably be preferable.
+            var typeSymbol = exports && getSymbol(exports, JsxNames.Element, 67897832 /* Type */);
+            var returnNode = typeSymbol && nodeBuilder.symbolToEntityName(typeSymbol, 67897832 /* Type */, node);
+            var declaration = ts.createFunctionTypeNode(/*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotdotdot*/ undefined, "props", /*questionMark*/ undefined, nodeBuilder.typeToTypeNode(result, node))], returnNode ? ts.createTypeReferenceNode(returnNode, /*typeArguments*/ undefined) : ts.createKeywordTypeNode(120 /* AnyKeyword */));
+            var parameterSymbol = createSymbol(1 /* FunctionScopedVariable */, "props");
+            parameterSymbol.type = result;
+            return createSignature(declaration, 
+            /*typeParameters*/ undefined, 
+            /*thisParameter*/ undefined, [parameterSymbol], typeSymbol ? getDeclaredTypeOfSymbol(typeSymbol) : errorType, 
+            /*returnTypePredicate*/ undefined, 1, 
+            /*hasRestparameter*/ false, 
+            /*hasLiteralTypes*/ false);
+        }
+        function resolveJsxOpeningLikeElement(node, candidatesOutArray, isForSignatureHelp) {
+            if (isJsxIntrinsicIdentifier(node.tagName)) {
+                var result = getIntrinsicAttributesTypeFromJsxOpeningLikeElement(node);
+                var fakeSignature = createSignatureForJSXIntrinsic(node, result);
+                checkTypeAssignableToAndOptionallyElaborate(checkExpressionWithContextualType(node.attributes, getEffectiveFirstArgumentForJsxSignature(fakeSignature, node), /*mapper*/ undefined), result, node.tagName, node.attributes);
+                return fakeSignature;
+            }
+            var exprTypes = checkExpression(node.tagName);
+            var apparentType = getApparentType(exprTypes);
+            if (apparentType === errorType) {
+                return resolveErrorCall(node);
+            }
+            var signatures = getUninstantiatedJsxSignaturesOfType(exprTypes, node);
+            if (isUntypedFunctionCall(exprTypes, apparentType, signatures.length, /*constructSignatures*/ 0)) {
+                return resolveUntypedCall(node);
+            }
+            if (signatures.length === 0) {
+                // We found no signatures at all, which is an error
+                error(node.tagName, ts.Diagnostics.JSX_element_type_0_does_not_have_any_construct_or_call_signatures, ts.getTextOfNode(node.tagName));
+                return resolveErrorCall(node);
+            }
+            return resolveCall(node, signatures, candidatesOutArray, isForSignatureHelp);
+        }
+        /**
+         * Sometimes, we have a decorator that could accept zero arguments,
+         * but is receiving too many arguments as part of the decorator invocation.
+         * In those cases, a user may have meant to *call* the expression before using it as a decorator.
+         */
+        function isPotentiallyUncalledDecorator(decorator, signatures) {
+            return signatures.length && ts.every(signatures, function (signature) {
+                return signature.minArgumentCount === 0 &&
+                    !signature.hasRestParameter &&
+                    signature.parameters.length < getDecoratorArgumentCount(decorator, signature);
+            });
+        }
+        function resolveSignature(node, candidatesOutArray, isForSignatureHelp) {
+            switch (node.kind) {
+                case 191 /* CallExpression */:
+                    return resolveCallExpression(node, candidatesOutArray, isForSignatureHelp);
+                case 192 /* NewExpression */:
+                    return resolveNewExpression(node, candidatesOutArray, isForSignatureHelp);
+                case 193 /* TaggedTemplateExpression */:
+                    return resolveTaggedTemplateExpression(node, candidatesOutArray, isForSignatureHelp);
+                case 152 /* Decorator */:
+                    return resolveDecorator(node, candidatesOutArray, isForSignatureHelp);
+                case 262 /* JsxOpeningElement */:
+                case 261 /* JsxSelfClosingElement */:
+                    return resolveJsxOpeningLikeElement(node, candidatesOutArray, isForSignatureHelp);
+            }
+            throw ts.Debug.assertNever(node, "Branch in 'resolveSignature' should be unreachable.");
+        }
+        /**
+         * Resolve a signature of a given call-like expression.
+         * @param node a call-like expression to try resolve a signature for
+         * @param candidatesOutArray an array of signature to be filled in by the function. It is passed by signature help in the language service;
+         *                           the function will fill it up with appropriate candidate signatures
+         * @return a signature of the call-like expression or undefined if one can't be found
+         */
+        function getResolvedSignature(node, candidatesOutArray, isForSignatureHelp) {
+            if (isForSignatureHelp === void 0) { isForSignatureHelp = false; }
+            var links = getNodeLinks(node);
+            // If getResolvedSignature has already been called, we will have cached the resolvedSignature.
+            // However, it is possible that either candidatesOutArray was not passed in the first time,
+            // or that a different candidatesOutArray was passed in. Therefore, we need to redo the work
+            // to correctly fill the candidatesOutArray.
+            var cached = links.resolvedSignature;
+            if (cached && cached !== resolvingSignature && !candidatesOutArray) {
+                return cached;
+            }
+            links.resolvedSignature = resolvingSignature;
+            var result = resolveSignature(node, candidatesOutArray, isForSignatureHelp);
+            // If signature resolution originated in control flow type analysis (for example to compute the
+            // assigned type in a flow assignment) we don't cache the result as it may be based on temporary
+            // types from the control flow analysis.
+            links.resolvedSignature = flowLoopStart === flowLoopCount ? result : cached;
+            return result;
+        }
+        /**
+         * Indicates whether a declaration can be treated as a constructor in a JavaScript
+         * file.
+         */
+        function isJSConstructor(node) {
+            if (!node || !ts.isInJSFile(node)) {
+                return false;
+            }
+            var func = ts.isFunctionDeclaration(node) || ts.isFunctionExpression(node) ? node :
+                ts.isVariableDeclaration(node) && node.initializer && ts.isFunctionExpression(node.initializer) ? node.initializer :
+                    undefined;
+            if (func) {
+                // If the node has a @class tag, treat it like a constructor.
+                if (ts.getJSDocClassTag(node))
+                    return true;
+                // If the symbol of the node has members, treat it like a constructor.
+                var symbol = getSymbolOfNode(func);
+                return !!symbol && (symbol.members !== undefined || symbol.exports !== undefined && symbol.exports.get("prototype") !== undefined);
+            }
+            return false;
+        }
+        function isJSConstructorType(type) {
+            if (type.flags & 524288 /* Object */) {
+                var resolved = resolveStructuredTypeMembers(type);
+                return resolved.callSignatures.length === 1 && isJSConstructor(resolved.callSignatures[0].declaration);
+            }
+            return false;
+        }
+        function getJSClassType(symbol) {
+            var inferred;
+            if (isJSConstructor(symbol.valueDeclaration)) {
+                inferred = getInferredClassType(symbol);
+            }
+            var assigned = getAssignedClassType(symbol);
+            return assigned && inferred ?
+                getIntersectionType([inferred, assigned]) :
+                assigned || inferred;
+        }
+        function getAssignedClassType(symbol) {
+            var decl = symbol.valueDeclaration;
+            var assignmentSymbol = decl && decl.parent &&
+                (ts.isFunctionDeclaration(decl) && getSymbolOfNode(decl) ||
+                    ts.isBinaryExpression(decl.parent) && getSymbolOfNode(decl.parent.left) ||
+                    ts.isVariableDeclaration(decl.parent) && getSymbolOfNode(decl.parent));
+            var prototype = assignmentSymbol && assignmentSymbol.exports && assignmentSymbol.exports.get("prototype");
+            var init = prototype && prototype.valueDeclaration && getAssignedJSPrototype(prototype.valueDeclaration);
+            return init ? checkExpression(init) : undefined;
+        }
+        function getAssignedJSPrototype(node) {
+            if (!node.parent) {
+                return false;
+            }
+            var parent = node.parent;
+            while (parent && parent.kind === 189 /* PropertyAccessExpression */) {
+                parent = parent.parent;
+            }
+            if (parent && ts.isBinaryExpression(parent) && ts.isPrototypeAccess(parent.left) && parent.operatorToken.kind === 59 /* EqualsToken */) {
+                var right = ts.getInitializerOfBinaryExpression(parent);
+                return ts.isObjectLiteralExpression(right) && right;
+            }
+        }
+        function getInferredClassType(symbol) {
+            var links = getSymbolLinks(symbol);
+            if (!links.inferredClassType) {
+                links.inferredClassType = createAnonymousType(symbol, getMembersOfSymbol(symbol) || emptySymbols, ts.emptyArray, ts.emptyArray, /*stringIndexType*/ undefined, /*numberIndexType*/ undefined);
+            }
+            return links.inferredClassType;
+        }
+        /**
+         * Syntactically and semantically checks a call or new expression.
+         * @param node The call/new expression to be checked.
+         * @returns On success, the expression's signature's return type. On failure, anyType.
+         */
+        function checkCallExpression(node) {
+            if (!checkGrammarTypeArguments(node, node.typeArguments))
+                checkGrammarArguments(node.arguments);
+            var signature = getResolvedSignature(node);
+            if (node.expression.kind === 98 /* SuperKeyword */) {
+                return voidType;
+            }
+            if (node.kind === 192 /* NewExpression */) {
+                var declaration = signature.declaration;
+                if (declaration &&
+                    declaration.kind !== 157 /* Constructor */ &&
+                    declaration.kind !== 161 /* ConstructSignature */ &&
+                    declaration.kind !== 166 /* ConstructorType */ &&
+                    !ts.isJSDocConstructSignature(declaration) &&
+                    !isJSConstructor(declaration)) {
+                    // When resolved signature is a call signature (and not a construct signature) the result type is any
+                    if (noImplicitAny) {
+                        error(node, ts.Diagnostics.new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type);
+                    }
+                    return anyType;
+                }
+            }
+            // In JavaScript files, calls to any identifier 'require' are treated as external module imports
+            if (ts.isInJSFile(node) && isCommonJsRequire(node)) {
+                return resolveExternalModuleTypeByLiteral(node.arguments[0]);
+            }
+            var returnType = getReturnTypeOfSignature(signature);
+            // Treat any call to the global 'Symbol' function that is part of a const variable or readonly property
+            // as a fresh unique symbol literal type.
+            if (returnType.flags & 12288 /* ESSymbolLike */ && isSymbolOrSymbolForCall(node)) {
+                return getESSymbolLikeTypeForNode(ts.walkUpParenthesizedExpressions(node.parent));
+            }
+            var jsAssignmentType;
+            if (ts.isInJSFile(node)) {
+                var decl = ts.getDeclarationOfExpando(node);
+                if (decl) {
+                    var jsSymbol = getSymbolOfNode(decl);
+                    if (jsSymbol && ts.hasEntries(jsSymbol.exports)) {
+                        jsAssignmentType = createAnonymousType(jsSymbol, jsSymbol.exports, ts.emptyArray, ts.emptyArray, undefined, undefined);
+                        jsAssignmentType.objectFlags |= 16384 /* JSLiteral */;
+                    }
+                }
+            }
+            return jsAssignmentType ? getIntersectionType([returnType, jsAssignmentType]) : returnType;
+        }
+        function isSymbolOrSymbolForCall(node) {
+            if (!ts.isCallExpression(node))
+                return false;
+            var left = node.expression;
+            if (ts.isPropertyAccessExpression(left) && left.name.escapedText === "for") {
+                left = left.expression;
+            }
+            if (!ts.isIdentifier(left) || left.escapedText !== "Symbol") {
+                return false;
+            }
+            // make sure `Symbol` is the global symbol
+            var globalESSymbol = getGlobalESSymbolConstructorSymbol(/*reportErrors*/ false);
+            if (!globalESSymbol) {
+                return false;
+            }
+            return globalESSymbol === resolveName(left, "Symbol", 67220415 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false);
+        }
+        function checkImportCallExpression(node) {
+            // Check grammar of dynamic import
+            if (!checkGrammarArguments(node.arguments))
+                checkGrammarImportCallExpression(node);
+            if (node.arguments.length === 0) {
+                return createPromiseReturnType(node, anyType);
+            }
+            var specifier = node.arguments[0];
+            var specifierType = checkExpressionCached(specifier);
+            // Even though multiple arguments is grammatically incorrect, type-check extra arguments for completion
+            for (var i = 1; i < node.arguments.length; ++i) {
+                checkExpressionCached(node.arguments[i]);
+            }
+            if (specifierType.flags & 32768 /* Undefined */ || specifierType.flags & 65536 /* Null */ || !isTypeAssignableTo(specifierType, stringType)) {
+                error(specifier, ts.Diagnostics.Dynamic_import_s_specifier_must_be_of_type_string_but_here_has_type_0, typeToString(specifierType));
+            }
+            // resolveExternalModuleName will return undefined if the moduleReferenceExpression is not a string literal
+            var moduleSymbol = resolveExternalModuleName(node, specifier);
+            if (moduleSymbol) {
+                var esModuleSymbol = resolveESModuleSymbol(moduleSymbol, specifier, /*dontRecursivelyResolve*/ true);
+                if (esModuleSymbol) {
+                    return createPromiseReturnType(node, getTypeWithSyntheticDefaultImportType(getTypeOfSymbol(esModuleSymbol), esModuleSymbol, moduleSymbol));
+                }
+            }
+            return createPromiseReturnType(node, anyType);
+        }
+        function getTypeWithSyntheticDefaultImportType(type, symbol, originalSymbol) {
+            if (allowSyntheticDefaultImports && type && type !== errorType) {
+                var synthType = type;
+                if (!synthType.syntheticType) {
+                    var file = ts.find(originalSymbol.declarations, ts.isSourceFile);
+                    var hasSyntheticDefault = canHaveSyntheticDefault(file, originalSymbol, /*dontResolveAlias*/ false);
+                    if (hasSyntheticDefault) {
+                        var memberTable = ts.createSymbolTable();
+                        var newSymbol = createSymbol(2097152 /* Alias */, "default" /* Default */);
+                        newSymbol.nameType = getLiteralType("default");
+                        newSymbol.target = resolveSymbol(symbol);
+                        memberTable.set("default" /* Default */, newSymbol);
+                        var anonymousSymbol = createSymbol(2048 /* TypeLiteral */, "__type" /* Type */);
+                        var defaultContainingObject = createAnonymousType(anonymousSymbol, memberTable, ts.emptyArray, ts.emptyArray, /*stringIndexInfo*/ undefined, /*numberIndexInfo*/ undefined);
+                        anonymousSymbol.type = defaultContainingObject;
+                        synthType.syntheticType = isValidSpreadType(type) ? getSpreadType(type, defaultContainingObject, anonymousSymbol, /*typeFLags*/ 0, /*objectFlags*/ 0) : defaultContainingObject;
+                    }
+                    else {
+                        synthType.syntheticType = type;
+                    }
+                }
+                return synthType.syntheticType;
+            }
+            return type;
+        }
+        function isCommonJsRequire(node) {
+            if (!ts.isRequireCall(node, /*checkArgumentIsStringLiteralLike*/ true)) {
+                return false;
+            }
+            // Make sure require is not a local function
+            if (!ts.isIdentifier(node.expression))
+                return ts.Debug.fail();
+            var resolvedRequire = resolveName(node.expression, node.expression.escapedText, 67220415 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ true); // TODO: GH#18217
+            if (resolvedRequire === requireSymbol) {
+                return true;
+            }
+            // project includes symbol named 'require' - make sure that it is ambient and local non-alias
+            if (resolvedRequire.flags & 2097152 /* Alias */) {
+                return false;
+            }
+            var targetDeclarationKind = resolvedRequire.flags & 16 /* Function */
+                ? 239 /* FunctionDeclaration */
+                : resolvedRequire.flags & 3 /* Variable */
+                    ? 237 /* VariableDeclaration */
+                    : 0 /* Unknown */;
+            if (targetDeclarationKind !== 0 /* Unknown */) {
+                var decl = ts.getDeclarationOfKind(resolvedRequire, targetDeclarationKind);
+                // function/variable declaration should be ambient
+                return !!decl && !!(decl.flags & 4194304 /* Ambient */);
+            }
+            return false;
+        }
+        function checkTaggedTemplateExpression(node) {
+            checkGrammarTypeArguments(node, node.typeArguments);
+            if (languageVersion < 2 /* ES2015 */) {
+                checkExternalEmitHelpers(node, 65536 /* MakeTemplateObject */);
+            }
+            return getReturnTypeOfSignature(getResolvedSignature(node));
+        }
+        function checkAssertion(node) {
+            return checkAssertionWorker(node, node.type, node.expression);
+        }
+        function checkAssertionWorker(errNode, type, expression, checkMode) {
+            var exprType = getRegularTypeOfObjectLiteral(getBaseTypeOfLiteralType(checkExpression(expression, checkMode)));
+            checkSourceElement(type);
+            var targetType = getTypeFromTypeNode(type);
+            if (produceDiagnostics && targetType !== errorType) {
+                var widenedType = getWidenedType(exprType);
+                if (!isTypeComparableTo(targetType, widenedType)) {
+                    checkTypeComparableTo(exprType, targetType, errNode, ts.Diagnostics.Conversion_of_type_0_to_type_1_may_be_a_mistake_because_neither_type_sufficiently_overlaps_with_the_other_If_this_was_intentional_convert_the_expression_to_unknown_first);
+                }
+            }
+            return targetType;
+        }
+        function checkNonNullAssertion(node) {
+            return getNonNullableType(checkExpression(node.expression));
+        }
+        function checkMetaProperty(node) {
+            checkGrammarMetaProperty(node);
+            if (node.keywordToken === 95 /* NewKeyword */) {
+                return checkNewTargetMetaProperty(node);
+            }
+            if (node.keywordToken === 92 /* ImportKeyword */) {
+                return checkImportMetaProperty(node);
+            }
+            return ts.Debug.assertNever(node.keywordToken);
+        }
+        function checkNewTargetMetaProperty(node) {
+            var container = ts.getNewTargetContainer(node);
+            if (!container) {
+                error(node, ts.Diagnostics.Meta_property_0_is_only_allowed_in_the_body_of_a_function_declaration_function_expression_or_constructor, "new.target");
+                return errorType;
+            }
+            else if (container.kind === 157 /* Constructor */) {
+                var symbol = getSymbolOfNode(container.parent);
+                return getTypeOfSymbol(symbol);
+            }
+            else {
+                var symbol = getSymbolOfNode(container);
+                return getTypeOfSymbol(symbol);
+            }
+        }
+        function checkImportMetaProperty(node) {
+            if (languageVersion < 6 /* ESNext */ || moduleKind < ts.ModuleKind.ESNext) {
+                error(node, ts.Diagnostics.The_import_meta_meta_property_is_only_allowed_using_ESNext_for_the_target_and_module_compiler_options);
+            }
+            var file = ts.getSourceFileOfNode(node);
+            ts.Debug.assert(!!(file.flags & 1048576 /* PossiblyContainsImportMeta */), "Containing file is missing import meta node flag.");
+            ts.Debug.assert(!!file.externalModuleIndicator, "Containing file should be a module.");
+            return node.name.escapedText === "meta" ? getGlobalImportMetaType() : errorType;
+        }
+        function getTypeOfParameter(symbol) {
+            var type = getTypeOfSymbol(symbol);
+            if (strictNullChecks) {
+                var declaration = symbol.valueDeclaration;
+                if (declaration && ts.hasInitializer(declaration)) {
+                    return getOptionalType(type);
+                }
+            }
+            return type;
+        }
+        function getParameterNameAtPosition(signature, pos) {
+            var paramCount = signature.parameters.length - (signature.hasRestParameter ? 1 : 0);
+            if (pos < paramCount) {
+                return signature.parameters[pos].escapedName;
+            }
+            var restParameter = signature.parameters[paramCount] || unknownSymbol;
+            var restType = getTypeOfSymbol(restParameter);
+            if (isTupleType(restType)) {
+                var associatedNames = restType.target.associatedNames;
+                var index = pos - paramCount;
+                return associatedNames ? associatedNames[index] : restParameter.escapedName + "_" + index;
+            }
+            return restParameter.escapedName;
+        }
+        function getTypeAtPosition(signature, pos) {
+            return tryGetTypeAtPosition(signature, pos) || anyType;
+        }
+        function tryGetTypeAtPosition(signature, pos) {
+            var paramCount = signature.parameters.length - (signature.hasRestParameter ? 1 : 0);
+            if (pos < paramCount) {
+                return getTypeOfParameter(signature.parameters[pos]);
+            }
+            if (signature.hasRestParameter) {
+                var restType = getTypeOfSymbol(signature.parameters[paramCount]);
+                if (isTupleType(restType)) {
+                    if (pos - paramCount < getLengthOfTupleType(restType)) {
+                        return restType.typeArguments[pos - paramCount];
+                    }
+                    return getRestTypeOfTupleType(restType);
+                }
+                return getIndexTypeOfType(restType, 1 /* Number */);
+            }
+            return undefined;
+        }
+        function getRestTypeAtPosition(source, pos) {
+            var paramCount = getParameterCount(source);
+            var restType = getEffectiveRestType(source);
+            if (restType && pos === paramCount - 1) {
+                return restType;
+            }
+            var start = restType ? Math.min(pos, paramCount - 1) : pos;
+            var types = [];
+            var names = [];
+            for (var i = start; i < paramCount; i++) {
+                types.push(getTypeAtPosition(source, i));
+                names.push(getParameterNameAtPosition(source, i));
+            }
+            var minArgumentCount = getMinArgumentCount(source);
+            var minLength = minArgumentCount < start ? 0 : minArgumentCount - start;
+            return createTupleType(types, minLength, !!restType, names);
+        }
+        function getParameterCount(signature) {
+            var length = signature.parameters.length;
+            if (signature.hasRestParameter) {
+                var restType = getTypeOfSymbol(signature.parameters[length - 1]);
+                if (isTupleType(restType)) {
+                    return length + (restType.typeArguments || ts.emptyArray).length - 1;
+                }
+            }
+            return length;
+        }
+        function getMinArgumentCount(signature) {
+            if (signature.hasRestParameter) {
+                var restType = getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]);
+                if (isTupleType(restType)) {
+                    var minLength = restType.target.minLength;
+                    if (minLength > 0) {
+                        return signature.parameters.length - 1 + minLength;
+                    }
+                }
+            }
+            return signature.minArgumentCount;
+        }
+        function hasEffectiveRestParameter(signature) {
+            if (signature.hasRestParameter) {
+                var restType = getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]);
+                return !isTupleType(restType) || restType.target.hasRestElement;
+            }
+            return false;
+        }
+        function getEffectiveRestType(signature) {
+            if (signature.hasRestParameter) {
+                var restType = getTypeOfSymbol(signature.parameters[signature.parameters.length - 1]);
+                return isTupleType(restType) ? getRestArrayTypeOfTupleType(restType) : restType;
+            }
+            return undefined;
+        }
+        function getNonArrayRestType(signature) {
+            var restType = getEffectiveRestType(signature);
+            return restType && !isArrayType(restType) && !isTypeAny(restType) ? restType : undefined;
+        }
+        function getTypeOfFirstParameterOfSignature(signature) {
+            return getTypeOfFirstParameterOfSignatureWithFallback(signature, neverType);
+        }
+        function getTypeOfFirstParameterOfSignatureWithFallback(signature, fallbackType) {
+            return signature.parameters.length > 0 ? getTypeAtPosition(signature, 0) : fallbackType;
+        }
+        function inferFromAnnotatedParameters(signature, context, mapper) {
+            var len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0);
+            for (var i = 0; i < len; i++) {
+                var declaration = signature.parameters[i].valueDeclaration;
+                if (declaration.type) {
+                    var typeNode = ts.getEffectiveTypeAnnotationNode(declaration);
+                    if (typeNode) {
+                        inferTypes(mapper.inferences, getTypeFromTypeNode(typeNode), getTypeAtPosition(context, i));
+                    }
+                }
+            }
+        }
+        function assignContextualParameterTypes(signature, context) {
+            signature.typeParameters = context.typeParameters;
+            if (context.thisParameter) {
+                var parameter = signature.thisParameter;
+                if (!parameter || parameter.valueDeclaration && !parameter.valueDeclaration.type) {
+                    if (!parameter) {
+                        signature.thisParameter = createSymbolWithType(context.thisParameter, /*type*/ undefined);
+                    }
+                    assignTypeToParameterAndFixTypeParameters(signature.thisParameter, getTypeOfSymbol(context.thisParameter));
+                }
+            }
+            var len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0);
+            for (var i = 0; i < len; i++) {
+                var parameter = signature.parameters[i];
+                if (!ts.getEffectiveTypeAnnotationNode(parameter.valueDeclaration)) {
+                    var contextualParameterType = getTypeAtPosition(context, i);
+                    assignTypeToParameterAndFixTypeParameters(parameter, contextualParameterType);
+                }
+            }
+            if (signature.hasRestParameter) {
+                // parameter might be a transient symbol generated by use of `arguments` in the function body.
+                var parameter = ts.last(signature.parameters);
+                if (isTransientSymbol(parameter) || !ts.getEffectiveTypeAnnotationNode(parameter.valueDeclaration)) {
+                    var contextualParameterType = getRestTypeAtPosition(context, len);
+                    assignTypeToParameterAndFixTypeParameters(parameter, contextualParameterType);
+                }
+            }
+        }
+        // When contextual typing assigns a type to a parameter that contains a binding pattern, we also need to push
+        // the destructured type into the contained binding elements.
+        function assignBindingElementTypes(pattern) {
+            for (var _i = 0, _a = pattern.elements; _i < _a.length; _i++) {
+                var element = _a[_i];
+                if (!ts.isOmittedExpression(element)) {
+                    if (element.name.kind === 72 /* Identifier */) {
+                        getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
+                    }
+                    else {
+                        assignBindingElementTypes(element.name);
+                    }
+                }
+            }
+        }
+        function assignTypeToParameterAndFixTypeParameters(parameter, contextualType) {
+            var links = getSymbolLinks(parameter);
+            if (!links.type) {
+                links.type = contextualType;
+                var decl = parameter.valueDeclaration;
+                if (decl.name.kind !== 72 /* Identifier */) {
+                    // if inference didn't come up with anything but {}, fall back to the binding pattern if present.
+                    if (links.type === emptyObjectType) {
+                        links.type = getTypeFromBindingPattern(decl.name);
+                    }
+                    assignBindingElementTypes(decl.name);
+                }
+            }
+        }
+        function createPromiseType(promisedType) {
+            // creates a `Promise<T>` type where `T` is the promisedType argument
+            var globalPromiseType = getGlobalPromiseType(/*reportErrors*/ true);
+            if (globalPromiseType !== emptyGenericType) {
+                // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
+                promisedType = getAwaitedType(promisedType) || emptyObjectType;
+                return createTypeReference(globalPromiseType, [promisedType]);
+            }
+            return emptyObjectType;
+        }
+        function createPromiseLikeType(promisedType) {
+            // creates a `PromiseLike<T>` type where `T` is the promisedType argument
+            var globalPromiseLikeType = getGlobalPromiseLikeType(/*reportErrors*/ true);
+            if (globalPromiseLikeType !== emptyGenericType) {
+                // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
+                promisedType = getAwaitedType(promisedType) || emptyObjectType;
+                return createTypeReference(globalPromiseLikeType, [promisedType]);
+            }
+            return emptyObjectType;
+        }
+        function createPromiseReturnType(func, promisedType) {
+            var promiseType = createPromiseType(promisedType);
+            if (promiseType === emptyObjectType) {
+                error(func, ts.isImportCall(func) ?
+                    ts.Diagnostics.A_dynamic_import_call_returns_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option :
+                    ts.Diagnostics.An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option);
+                return errorType;
+            }
+            else if (!getGlobalPromiseConstructorSymbol(/*reportErrors*/ true)) {
+                error(func, ts.isImportCall(func) ?
+                    ts.Diagnostics.A_dynamic_import_call_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option :
+                    ts.Diagnostics.An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option);
+            }
+            return promiseType;
+        }
+        function getReturnTypeFromBody(func, checkMode) {
+            if (!func.body) {
+                return errorType;
+            }
+            var functionFlags = ts.getFunctionFlags(func);
+            var type;
+            if (func.body.kind !== 218 /* Block */) {
+                type = checkExpressionCached(func.body, checkMode);
+                if (functionFlags & 2 /* Async */) {
+                    // From within an async function you can return either a non-promise value or a promise. Any
+                    // Promise/A+ compatible implementation will always assimilate any foreign promise, so the
+                    // return type of the body should be unwrapped to its awaited type, which we will wrap in
+                    // the native Promise<T> type later in this function.
+                    type = checkAwaitedType(type, /*errorNode*/ func, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
+                }
+            }
+            else {
+                var types = checkAndAggregateReturnExpressionTypes(func, checkMode);
+                if (functionFlags & 1 /* Generator */) { // Generator or AsyncGenerator function
+                    types = ts.concatenate(checkAndAggregateYieldOperandTypes(func, checkMode), types);
+                    if (!types || types.length === 0) {
+                        var iterableIteratorAny = functionFlags & 2 /* Async */
+                            ? createAsyncIterableIteratorType(anyType) // AsyncGenerator function
+                            : createIterableIteratorType(anyType); // Generator function
+                        if (noImplicitAny) {
+                            error(func.asteriskToken, ts.Diagnostics.Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type, typeToString(iterableIteratorAny));
+                        }
+                        return iterableIteratorAny;
+                    }
+                }
+                else {
+                    if (!types) {
+                        // For an async function, the return type will not be never, but rather a Promise for never.
+                        return functionFlags & 2 /* Async */
+                            ? createPromiseReturnType(func, neverType) // Async function
+                            : neverType; // Normal function
+                    }
+                    if (types.length === 0) {
+                        // For an async function, the return type will not be void, but rather a Promise for void.
+                        return functionFlags & 2 /* Async */
+                            ? createPromiseReturnType(func, voidType) // Async function
+                            : voidType; // Normal function
+                    }
+                }
+                // Return a union of the return expression types.
+                type = getUnionType(types, 2 /* Subtype */);
+            }
+            var contextualSignature = getContextualSignatureForFunctionLikeDeclaration(func);
+            if (!contextualSignature) {
+                reportErrorsFromWidening(func, type);
+            }
+            if (isUnitType(type)) {
+                var contextualType = !contextualSignature ? undefined :
+                    contextualSignature === getSignatureFromDeclaration(func) ? type :
+                        getReturnTypeOfSignature(contextualSignature);
+                if (contextualType) {
+                    switch (functionFlags & 3 /* AsyncGenerator */) {
+                        case 3 /* AsyncGenerator */:
+                            contextualType = getIteratedTypeOfGenerator(contextualType, /*isAsyncGenerator*/ true);
+                            break;
+                        case 1 /* Generator */:
+                            contextualType = getIteratedTypeOfGenerator(contextualType, /*isAsyncGenerator*/ false);
+                            break;
+                        case 2 /* Async */:
+                            contextualType = getPromisedTypeOfPromise(contextualType);
+                            break;
+                    }
+                }
+                type = getWidenedLiteralLikeTypeForContextualType(type, contextualType);
+            }
+            var widenedType = getWidenedType(type);
+            switch (functionFlags & 3 /* AsyncGenerator */) {
+                case 3 /* AsyncGenerator */:
+                    return createAsyncIterableIteratorType(widenedType);
+                case 1 /* Generator */:
+                    return createIterableIteratorType(widenedType);
+                case 2 /* Async */:
+                    // From within an async function you can return either a non-promise value or a promise. Any
+                    // Promise/A+ compatible implementation will always assimilate any foreign promise, so the
+                    // return type of the body is awaited type of the body, wrapped in a native Promise<T> type.
+                    return createPromiseType(widenedType);
+                default:
+                    return widenedType;
+            }
+        }
+        function checkAndAggregateYieldOperandTypes(func, checkMode) {
+            var aggregatedTypes = [];
+            var isAsync = (ts.getFunctionFlags(func) & 2 /* Async */) !== 0;
+            ts.forEachYieldExpression(func.body, function (yieldExpression) {
+                ts.pushIfUnique(aggregatedTypes, getYieldedTypeOfYieldExpression(yieldExpression, isAsync, checkMode));
+            });
+            return aggregatedTypes;
+        }
+        function getYieldedTypeOfYieldExpression(node, isAsync, checkMode) {
+            var errorNode = node.expression || node;
+            var expressionType = node.expression ? checkExpression(node.expression, checkMode) : undefinedWideningType;
+            // A `yield*` expression effectively yields everything that its operand yields
+            var yieldedType = node.asteriskToken ? checkIteratedTypeOrElementType(expressionType, errorNode, /*allowStringInput*/ false, isAsync) : expressionType;
+            return !isAsync ? yieldedType : getAwaitedType(yieldedType, errorNode, node.asteriskToken
+                ? ts.Diagnostics.Type_of_iterated_elements_of_a_yield_Asterisk_operand_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member
+                : ts.Diagnostics.Type_of_yield_operand_in_an_async_generator_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
+        }
+        /**
+         * Collect the TypeFacts learned from a typeof switch with
+         * total clauses `witnesses`, and the active clause ranging
+         * from `start` to `end`. Parameter `hasDefault` denotes
+         * whether the active clause contains a default clause.
+         */
+        function getFactsFromTypeofSwitch(start, end, witnesses, hasDefault) {
+            var facts = 0 /* None */;
+            // When in the default we only collect inequality facts
+            // because default is 'in theory' a set of infinite
+            // equalities.
+            if (hasDefault) {
+                // Value is not equal to any types after the active clause.
+                for (var i = end; i < witnesses.length; i++) {
+                    facts |= typeofNEFacts.get(witnesses[i]) || 32768 /* TypeofNEHostObject */;
+                }
+                // Remove inequalities for types that appear in the
+                // active clause because they appear before other
+                // types collected so far.
+                for (var i = start; i < end; i++) {
+                    facts &= ~(typeofNEFacts.get(witnesses[i]) || 0);
+                }
+                // Add inequalities for types before the active clause unconditionally.
+                for (var i = 0; i < start; i++) {
+                    facts |= typeofNEFacts.get(witnesses[i]) || 32768 /* TypeofNEHostObject */;
+                }
+            }
+            // When in an active clause without default the set of
+            // equalities is finite.
+            else {
+                // Add equalities for all types in the active clause.
+                for (var i = start; i < end; i++) {
+                    facts |= typeofEQFacts.get(witnesses[i]) || 128 /* TypeofEQHostObject */;
+                }
+                // Remove equalities for types that appear before the
+                // active clause.
+                for (var i = 0; i < start; i++) {
+                    facts &= ~(typeofEQFacts.get(witnesses[i]) || 0);
+                }
+            }
+            return facts;
+        }
+        function isExhaustiveSwitchStatement(node) {
+            if (!node.possiblyExhaustive) {
+                return false;
+            }
+            if (node.expression.kind === 199 /* TypeOfExpression */) {
+                var operandType = getTypeOfExpression(node.expression.expression);
+                // This cast is safe because the switch is possibly exhaustive and does not contain a default case, so there can be no undefined.
+                var witnesses = getSwitchClauseTypeOfWitnesses(node);
+                // notEqualFacts states that the type of the switched value is not equal to every type in the switch.
+                var notEqualFacts_1 = getFactsFromTypeofSwitch(0, 0, witnesses, /*hasDefault*/ true);
+                var type_5 = getBaseConstraintOfType(operandType) || operandType;
+                return !!(filterType(type_5, function (t) { return (getTypeFacts(t) & notEqualFacts_1) === notEqualFacts_1; }).flags & 131072 /* Never */);
+            }
+            var type = getTypeOfExpression(node.expression);
+            if (!isLiteralType(type)) {
+                return false;
+            }
+            var switchTypes = getSwitchClauseTypes(node);
+            if (!switchTypes.length || ts.some(switchTypes, isNeitherUnitTypeNorNever)) {
+                return false;
+            }
+            return eachTypeContainedIn(mapType(type, getRegularTypeOfLiteralType), switchTypes);
+        }
+        function functionHasImplicitReturn(func) {
+            if (!(func.flags & 128 /* HasImplicitReturn */)) {
+                return false;
+            }
+            if (ts.some(func.body.statements, function (statement) { return statement.kind === 232 /* SwitchStatement */ && isExhaustiveSwitchStatement(statement); })) {
+                return false;
+            }
+            return true;
+        }
+        /** NOTE: Return value of `[]` means a different thing than `undefined`. `[]` means func returns `void`, `undefined` means it returns `never`. */
+        function checkAndAggregateReturnExpressionTypes(func, checkMode) {
+            var functionFlags = ts.getFunctionFlags(func);
+            var aggregatedTypes = [];
+            var hasReturnWithNoExpression = functionHasImplicitReturn(func);
+            var hasReturnOfTypeNever = false;
+            ts.forEachReturnStatement(func.body, function (returnStatement) {
+                var expr = returnStatement.expression;
+                if (expr) {
+                    var type = checkExpressionCached(expr, checkMode);
+                    if (functionFlags & 2 /* Async */) {
+                        // From within an async function you can return either a non-promise value or a promise. Any
+                        // Promise/A+ compatible implementation will always assimilate any foreign promise, so the
+                        // return type of the body should be unwrapped to its awaited type, which should be wrapped in
+                        // the native Promise<T> type by the caller.
+                        type = checkAwaitedType(type, func, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
+                    }
+                    if (type.flags & 131072 /* Never */) {
+                        hasReturnOfTypeNever = true;
+                    }
+                    ts.pushIfUnique(aggregatedTypes, type);
+                }
+                else {
+                    hasReturnWithNoExpression = true;
+                }
+            });
+            if (aggregatedTypes.length === 0 && !hasReturnWithNoExpression && (hasReturnOfTypeNever || mayReturnNever(func))) {
+                return undefined;
+            }
+            if (strictNullChecks && aggregatedTypes.length && hasReturnWithNoExpression &&
+                !(isJSConstructor(func) && aggregatedTypes.some(function (t) { return t.symbol === func.symbol; }))) {
+                // Javascript "callable constructors", containing eg `if (!(this instanceof A)) return new A()` should not add undefined
+                ts.pushIfUnique(aggregatedTypes, undefinedType);
+            }
+            return aggregatedTypes;
+        }
+        function mayReturnNever(func) {
+            switch (func.kind) {
+                case 196 /* FunctionExpression */:
+                case 197 /* ArrowFunction */:
+                    return true;
+                case 156 /* MethodDeclaration */:
+                    return func.parent.kind === 188 /* ObjectLiteralExpression */;
+                default:
+                    return false;
+            }
+        }
+        /**
+         * TypeScript Specification 1.0 (6.3) - July 2014
+         *   An explicitly typed function whose return type isn't the Void type,
+         *   the Any type, or a union type containing the Void or Any type as a constituent
+         *   must have at least one return statement somewhere in its body.
+         *   An exception to this rule is if the function implementation consists of a single 'throw' statement.
+         *
+         * @param returnType - return type of the function, can be undefined if return type is not explicitly specified
+         */
+        function checkAllCodePathsInNonVoidFunctionReturnOrThrow(func, returnType) {
+            if (!produceDiagnostics) {
+                return;
+            }
+            // Functions with with an explicitly specified 'void' or 'any' return type don't need any return expressions.
+            if (returnType && maybeTypeOfKind(returnType, 1 /* Any */ | 16384 /* Void */)) {
+                return;
+            }
+            // If all we have is a function signature, or an arrow function with an expression body, then there is nothing to check.
+            // also if HasImplicitReturn flag is not set this means that all codepaths in function body end with return or throw
+            if (func.kind === 155 /* MethodSignature */ || ts.nodeIsMissing(func.body) || func.body.kind !== 218 /* Block */ || !functionHasImplicitReturn(func)) {
+                return;
+            }
+            var hasExplicitReturn = func.flags & 256 /* HasExplicitReturn */;
+            if (returnType && returnType.flags & 131072 /* Never */) {
+                error(ts.getEffectiveReturnTypeNode(func), ts.Diagnostics.A_function_returning_never_cannot_have_a_reachable_end_point);
+            }
+            else if (returnType && !hasExplicitReturn) {
+                // minimal check: function has syntactic return type annotation and no explicit return statements in the body
+                // this function does not conform to the specification.
+                // NOTE: having returnType !== undefined is a precondition for entering this branch so func.type will always be present
+                error(ts.getEffectiveReturnTypeNode(func), ts.Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value);
+            }
+            else if (returnType && strictNullChecks && !isTypeAssignableTo(undefinedType, returnType)) {
+                error(ts.getEffectiveReturnTypeNode(func), ts.Diagnostics.Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined);
+            }
+            else if (compilerOptions.noImplicitReturns) {
+                if (!returnType) {
+                    // If return type annotation is omitted check if function has any explicit return statements.
+                    // If it does not have any - its inferred return type is void - don't do any checks.
+                    // Otherwise get inferred return type from function body and report error only if it is not void / anytype
+                    if (!hasExplicitReturn) {
+                        return;
+                    }
+                    var inferredReturnType = getReturnTypeOfSignature(getSignatureFromDeclaration(func));
+                    if (isUnwrappedReturnTypeVoidOrAny(func, inferredReturnType)) {
+                        return;
+                    }
+                }
+                error(ts.getEffectiveReturnTypeNode(func) || func, ts.Diagnostics.Not_all_code_paths_return_a_value);
+            }
+        }
+        function checkFunctionExpressionOrObjectLiteralMethod(node, checkMode) {
+            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            checkNodeDeferred(node);
+            // The identityMapper object is used to indicate that function expressions are wildcards
+            if (checkMode === 1 /* SkipContextSensitive */ && isContextSensitive(node)) {
+                // Skip parameters, return signature with return type that retains noncontextual parts so inferences can still be drawn in an early stage
+                if (!ts.getEffectiveReturnTypeNode(node) && hasContextSensitiveReturnExpression(node)) {
+                    var links_1 = getNodeLinks(node);
+                    if (links_1.contextFreeType) {
+                        return links_1.contextFreeType;
+                    }
+                    var returnType = getReturnTypeFromBody(node, checkMode);
+                    var returnOnlySignature = createSignature(undefined, undefined, undefined, ts.emptyArray, returnType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
+                    var returnOnlyType = createAnonymousType(node.symbol, emptySymbols, [returnOnlySignature], ts.emptyArray, undefined, undefined);
+                    returnOnlyType.flags |= 536870912 /* ContainsAnyFunctionType */;
+                    return links_1.contextFreeType = returnOnlyType;
+                }
+                return anyFunctionType;
+            }
+            // Grammar checking
+            var hasGrammarError = checkGrammarFunctionLikeDeclaration(node);
+            if (!hasGrammarError && node.kind === 196 /* FunctionExpression */) {
+                checkGrammarForGenerator(node);
+            }
+            var links = getNodeLinks(node);
+            var type = getTypeOfSymbol(getMergedSymbol(node.symbol));
+            if (isTypeAny(type)) {
+                return type;
+            }
+            // Check if function expression is contextually typed and assign parameter types if so.
+            if (!(links.flags & 1024 /* ContextChecked */)) {
+                var contextualSignature = getContextualSignature(node);
+                // If a type check is started at a function expression that is an argument of a function call, obtaining the
+                // contextual type may recursively get back to here during overload resolution of the call. If so, we will have
+                // already assigned contextual types.
+                if (!(links.flags & 1024 /* ContextChecked */)) {
+                    links.flags |= 1024 /* ContextChecked */;
+                    if (contextualSignature) {
+                        var signature = getSignaturesOfType(type, 0 /* Call */)[0];
+                        if (isContextSensitive(node)) {
+                            var contextualMapper = getContextualMapper(node);
+                            if (checkMode === 2 /* Inferential */) {
+                                inferFromAnnotatedParameters(signature, contextualSignature, contextualMapper);
+                            }
+                            var instantiatedContextualSignature = contextualMapper === identityMapper ?
+                                contextualSignature : instantiateSignature(contextualSignature, contextualMapper);
+                            assignContextualParameterTypes(signature, instantiatedContextualSignature);
+                        }
+                        if (!getReturnTypeFromAnnotation(node) && !signature.resolvedReturnType) {
+                            var returnType = getReturnTypeFromBody(node, checkMode);
+                            if (!signature.resolvedReturnType) {
+                                signature.resolvedReturnType = returnType;
+                            }
+                        }
+                    }
+                    checkSignatureDeclaration(node);
+                }
+            }
+            return type;
+        }
+        function getReturnOrPromisedType(node, functionFlags) {
+            var type = getReturnTypeFromAnnotation(node);
+            return type && ((functionFlags & 3 /* AsyncGenerator */) === 2 /* Async */) ?
+                getAwaitedType(type) || errorType : type;
+        }
+        function checkFunctionExpressionOrObjectLiteralMethodDeferred(node) {
+            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            var functionFlags = ts.getFunctionFlags(node);
+            var returnOrPromisedType = getReturnOrPromisedType(node, functionFlags);
+            if ((functionFlags & 1 /* Generator */) === 0) { // Async function or normal function
+                // return is not necessary in the body of generators
+                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnOrPromisedType);
+            }
+            if (node.body) {
+                if (!ts.getEffectiveReturnTypeNode(node)) {
+                    // There are some checks that are only performed in getReturnTypeFromBody, that may produce errors
+                    // we need. An example is the noImplicitAny errors resulting from widening the return expression
+                    // of a function. Because checking of function expression bodies is deferred, there was never an
+                    // appropriate time to do this during the main walk of the file (see the comment at the top of
+                    // checkFunctionExpressionBodies). So it must be done now.
+                    getReturnTypeOfSignature(getSignatureFromDeclaration(node));
+                }
+                if (node.body.kind === 218 /* Block */) {
+                    checkSourceElement(node.body);
+                }
+                else {
+                    // From within an async function you can return either a non-promise value or a promise. Any
+                    // Promise/A+ compatible implementation will always assimilate any foreign promise, so we
+                    // should not be checking assignability of a promise to the return type. Instead, we need to
+                    // check assignability of the awaited type of the expression body against the promised type of
+                    // its return type annotation.
+                    var exprType = checkExpression(node.body);
+                    if (returnOrPromisedType) {
+                        if ((functionFlags & 3 /* AsyncGenerator */) === 2 /* Async */) { // Async function
+                            var awaitedType = checkAwaitedType(exprType, node.body, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
+                            checkTypeAssignableToAndOptionallyElaborate(awaitedType, returnOrPromisedType, node.body, node.body);
+                        }
+                        else { // Normal function
+                            checkTypeAssignableToAndOptionallyElaborate(exprType, returnOrPromisedType, node.body, node.body);
+                        }
+                    }
+                }
+            }
+        }
+        function checkArithmeticOperandType(operand, type, diagnostic) {
+            if (!isTypeAssignableTo(type, numberOrBigIntType)) {
+                error(operand, diagnostic);
+                return false;
+            }
+            return true;
+        }
+        function isReadonlyAssignmentDeclaration(d) {
+            if (!ts.isCallExpression(d)) {
+                return false;
+            }
+            if (!ts.isBindableObjectDefinePropertyCall(d)) {
+                return false;
+            }
+            var objectLitType = checkExpressionCached(d.arguments[2]);
+            var valueType = getTypeOfPropertyOfType(objectLitType, "value");
+            if (valueType) {
+                var writableProp = getPropertyOfType(objectLitType, "writable");
+                var writableType = writableProp && getTypeOfSymbol(writableProp);
+                if (!writableType || writableType === falseType || writableType === regularFalseType) {
+                    return true;
+                }
+                // We include this definition whereupon we walk back and check the type at the declaration because
+                // The usual definition of `Object.defineProperty` will _not_ cause literal types to be preserved in the
+                // argument types, should the type be contextualized by the call itself.
+                if (writableProp && writableProp.valueDeclaration && ts.isPropertyAssignment(writableProp.valueDeclaration)) {
+                    var initializer = writableProp.valueDeclaration.initializer;
+                    var rawOriginalType = checkExpression(initializer);
+                    if (rawOriginalType === falseType || rawOriginalType === regularFalseType) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+            var setProp = getPropertyOfType(objectLitType, "set");
+            return !setProp;
+        }
+        function isReadonlySymbol(symbol) {
+            // The following symbols are considered read-only:
+            // Properties with a 'readonly' modifier
+            // Variables declared with 'const'
+            // Get accessors without matching set accessors
+            // Enum members
+            // Object.defineProperty assignments with writable false or no setter
+            // Unions and intersections of the above (unions and intersections eagerly set isReadonly on creation)
+            return !!(ts.getCheckFlags(symbol) & 8 /* Readonly */ ||
+                symbol.flags & 4 /* Property */ && ts.getDeclarationModifierFlagsFromSymbol(symbol) & 64 /* Readonly */ ||
+                symbol.flags & 3 /* Variable */ && getDeclarationNodeFlagsFromSymbol(symbol) & 2 /* Const */ ||
+                symbol.flags & 98304 /* Accessor */ && !(symbol.flags & 65536 /* SetAccessor */) ||
+                symbol.flags & 8 /* EnumMember */ ||
+                ts.some(symbol.declarations, isReadonlyAssignmentDeclaration));
+        }
+        function isReferenceToReadonlyEntity(expr, symbol) {
+            if (isReadonlySymbol(symbol)) {
+                // Allow assignments to readonly properties within constructors of the same class declaration.
+                if (symbol.flags & 4 /* Property */ &&
+                    (expr.kind === 189 /* PropertyAccessExpression */ || expr.kind === 190 /* ElementAccessExpression */) &&
+                    expr.expression.kind === 100 /* ThisKeyword */) {
+                    // Look for if this is the constructor for the class that `symbol` is a property of.
+                    var func = ts.getContainingFunction(expr);
+                    if (!(func && func.kind === 157 /* Constructor */)) {
+                        return true;
+                    }
+                    // If func.parent is a class and symbol is a (readonly) property of that class, or
+                    // if func is a constructor and symbol is a (readonly) parameter property declared in it,
+                    // then symbol is writeable here.
+                    return !symbol.valueDeclaration || !(func.parent === symbol.valueDeclaration.parent || func === symbol.valueDeclaration.parent);
+                }
+                return true;
+            }
+            return false;
+        }
+        function isReferenceThroughNamespaceImport(expr) {
+            if (expr.kind === 189 /* PropertyAccessExpression */ || expr.kind === 190 /* ElementAccessExpression */) {
+                var node = ts.skipParentheses(expr.expression);
+                if (node.kind === 72 /* Identifier */) {
+                    var symbol = getNodeLinks(node).resolvedSymbol;
+                    if (symbol.flags & 2097152 /* Alias */) {
+                        var declaration = getDeclarationOfAliasSymbol(symbol);
+                        return !!declaration && declaration.kind === 251 /* NamespaceImport */;
+                    }
+                }
+            }
+            return false;
+        }
+        function checkReferenceExpression(expr, invalidReferenceMessage) {
+            // References are combinations of identifiers, parentheses, and property accesses.
+            var node = ts.skipOuterExpressions(expr, 2 /* Assertions */ | 1 /* Parentheses */);
+            if (node.kind !== 72 /* Identifier */ && node.kind !== 189 /* PropertyAccessExpression */ && node.kind !== 190 /* ElementAccessExpression */) {
+                error(expr, invalidReferenceMessage);
+                return false;
+            }
+            return true;
+        }
+        function checkDeleteExpression(node) {
+            checkExpression(node.expression);
+            var expr = ts.skipParentheses(node.expression);
+            if (expr.kind !== 189 /* PropertyAccessExpression */ && expr.kind !== 190 /* ElementAccessExpression */) {
+                error(expr, ts.Diagnostics.The_operand_of_a_delete_operator_must_be_a_property_reference);
+                return booleanType;
+            }
+            var links = getNodeLinks(expr);
+            var symbol = getExportSymbolOfValueSymbolIfExported(links.resolvedSymbol);
+            if (symbol && isReadonlySymbol(symbol)) {
+                error(expr, ts.Diagnostics.The_operand_of_a_delete_operator_cannot_be_a_read_only_property);
+            }
+            return booleanType;
+        }
+        function checkTypeOfExpression(node) {
+            checkExpression(node.expression);
+            return typeofType;
+        }
+        function checkVoidExpression(node) {
+            checkExpression(node.expression);
+            return undefinedWideningType;
+        }
+        function checkAwaitExpression(node) {
+            // Grammar checking
+            if (produceDiagnostics) {
+                if (!(node.flags & 16384 /* AwaitContext */)) {
+                    grammarErrorOnFirstToken(node, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
+                }
+                if (isInParameterInitializerBeforeContainingFunction(node)) {
+                    error(node, ts.Diagnostics.await_expressions_cannot_be_used_in_a_parameter_initializer);
+                }
+            }
+            var operandType = checkExpression(node.expression);
+            return checkAwaitedType(operandType, node, ts.Diagnostics.Type_of_await_operand_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
+        }
+        function checkPrefixUnaryExpression(node) {
+            var operandType = checkExpression(node.operand);
+            if (operandType === silentNeverType) {
+                return silentNeverType;
+            }
+            switch (node.operand.kind) {
+                case 8 /* NumericLiteral */:
+                    switch (node.operator) {
+                        case 39 /* MinusToken */:
+                            return getFreshTypeOfLiteralType(getLiteralType(-node.operand.text));
+                        case 38 /* PlusToken */:
+                            return getFreshTypeOfLiteralType(getLiteralType(+node.operand.text));
+                    }
+                    break;
+                case 9 /* BigIntLiteral */:
+                    if (node.operator === 39 /* MinusToken */) {
+                        return getFreshTypeOfLiteralType(getLiteralType({
+                            negative: true,
+                            base10Value: ts.parsePseudoBigInt(node.operand.text)
+                        }));
+                    }
+            }
+            switch (node.operator) {
+                case 38 /* PlusToken */:
+                case 39 /* MinusToken */:
+                case 53 /* TildeToken */:
+                    checkNonNullType(operandType, node.operand);
+                    if (maybeTypeOfKind(operandType, 12288 /* ESSymbolLike */)) {
+                        error(node.operand, ts.Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, ts.tokenToString(node.operator));
+                    }
+                    if (node.operator === 38 /* PlusToken */) {
+                        if (maybeTypeOfKind(operandType, 2112 /* BigIntLike */)) {
+                            error(node.operand, ts.Diagnostics.Operator_0_cannot_be_applied_to_type_1, ts.tokenToString(node.operator), typeToString(operandType));
+                        }
+                        return numberType;
+                    }
+                    return getUnaryResultType(operandType);
+                case 52 /* ExclamationToken */:
+                    checkTruthinessExpression(node.operand);
+                    var facts = getTypeFacts(operandType) & (4194304 /* Truthy */ | 8388608 /* Falsy */);
+                    return facts === 4194304 /* Truthy */ ? falseType :
+                        facts === 8388608 /* Falsy */ ? trueType :
+                            booleanType;
+                case 44 /* PlusPlusToken */:
+                case 45 /* MinusMinusToken */:
+                    var ok = checkArithmeticOperandType(node.operand, checkNonNullType(operandType, node.operand), ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_bigint_or_an_enum_type);
+                    if (ok) {
+                        // run check only if former checks succeeded to avoid reporting cascading errors
+                        checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access);
+                    }
+                    return getUnaryResultType(operandType);
+            }
+            return errorType;
+        }
+        function checkPostfixUnaryExpression(node) {
+            var operandType = checkExpression(node.operand);
+            if (operandType === silentNeverType) {
+                return silentNeverType;
+            }
+            var ok = checkArithmeticOperandType(node.operand, checkNonNullType(operandType, node.operand), ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_bigint_or_an_enum_type);
+            if (ok) {
+                // run check only if former checks succeeded to avoid reporting cascading errors
+                checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_or_a_property_access);
+            }
+            return getUnaryResultType(operandType);
+        }
+        function getUnaryResultType(operandType) {
+            if (maybeTypeOfKind(operandType, 2112 /* BigIntLike */)) {
+                return isTypeAssignableToKind(operandType, 3 /* AnyOrUnknown */) || maybeTypeOfKind(operandType, 296 /* NumberLike */)
+                    ? numberOrBigIntType
+                    : bigintType;
+            }
+            // If it's not a bigint type, implicit coercion will result in a number
+            return numberType;
+        }
+        // Return true if type might be of the given kind. A union or intersection type might be of a given
+        // kind if at least one constituent type is of the given kind.
+        function maybeTypeOfKind(type, kind) {
+            if (type.flags & kind & ~134217728 /* GenericMappedType */ || kind & 134217728 /* GenericMappedType */ && isGenericMappedType(type)) {
+                return true;
+            }
+            if (type.flags & 3145728 /* UnionOrIntersection */) {
+                var types = type.types;
+                for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
+                    var t = types_15[_i];
+                    if (maybeTypeOfKind(t, kind)) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        function isTypeAssignableToKind(source, kind, strict) {
+            if (source.flags & kind) {
+                return true;
+            }
+            if (strict && source.flags & (3 /* AnyOrUnknown */ | 16384 /* Void */ | 32768 /* Undefined */ | 65536 /* Null */)) {
+                return false;
+            }
+            return !!(kind & 296 /* NumberLike */) && isTypeAssignableTo(source, numberType) ||
+                !!(kind & 2112 /* BigIntLike */) && isTypeAssignableTo(source, bigintType) ||
+                !!(kind & 132 /* StringLike */) && isTypeAssignableTo(source, stringType) ||
+                !!(kind & 528 /* BooleanLike */) && isTypeAssignableTo(source, booleanType) ||
+                !!(kind & 16384 /* Void */) && isTypeAssignableTo(source, voidType) ||
+                !!(kind & 131072 /* Never */) && isTypeAssignableTo(source, neverType) ||
+                !!(kind & 65536 /* Null */) && isTypeAssignableTo(source, nullType) ||
+                !!(kind & 32768 /* Undefined */) && isTypeAssignableTo(source, undefinedType) ||
+                !!(kind & 4096 /* ESSymbol */) && isTypeAssignableTo(source, esSymbolType) ||
+                !!(kind & 67108864 /* NonPrimitive */) && isTypeAssignableTo(source, nonPrimitiveType);
+        }
+        function allTypesAssignableToKind(source, kind, strict) {
+            return source.flags & 1048576 /* Union */ ?
+                ts.every(source.types, function (subType) { return allTypesAssignableToKind(subType, kind, strict); }) :
+                isTypeAssignableToKind(source, kind, strict);
+        }
+        function isConstEnumObjectType(type) {
+            return !!(ts.getObjectFlags(type) & 16 /* Anonymous */) && !!type.symbol && isConstEnumSymbol(type.symbol);
+        }
+        function isConstEnumSymbol(symbol) {
+            return (symbol.flags & 128 /* ConstEnum */) !== 0;
+        }
+        function checkInstanceOfExpression(left, right, leftType, rightType) {
+            if (leftType === silentNeverType || rightType === silentNeverType) {
+                return silentNeverType;
+            }
+            // TypeScript 1.0 spec (April 2014): 4.15.4
+            // The instanceof operator requires the left operand to be of type Any, an object type, or a type parameter type,
+            // and the right operand to be of type Any, a subtype of the 'Function' interface type, or have a call or construct signature.
+            // The result is always of the Boolean primitive type.
+            // NOTE: do not raise error if leftType is unknown as related error was already reported
+            if (!isTypeAny(leftType) &&
+                allTypesAssignableToKind(leftType, 131068 /* Primitive */)) {
+                error(left, ts.Diagnostics.The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter);
+            }
+            // NOTE: do not raise error if right is unknown as related error was already reported
+            if (!(isTypeAny(rightType) || typeHasCallOrConstructSignatures(rightType) || isTypeSubtypeOf(rightType, globalFunctionType))) {
+                error(right, ts.Diagnostics.The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type);
+            }
+            return booleanType;
+        }
+        function checkInExpression(left, right, leftType, rightType) {
+            if (leftType === silentNeverType || rightType === silentNeverType) {
+                return silentNeverType;
+            }
+            leftType = checkNonNullType(leftType, left);
+            rightType = checkNonNullType(rightType, right);
+            // TypeScript 1.0 spec (April 2014): 4.15.5
+            // The in operator requires the left operand to be of type Any, the String primitive type, or the Number primitive type,
+            // and the right operand to be of type Any, an object type, or a type parameter type.
+            // The result is always of the Boolean primitive type.
+            if (!(isTypeComparableTo(leftType, stringType) || isTypeAssignableToKind(leftType, 296 /* NumberLike */ | 12288 /* ESSymbolLike */))) {
+                error(left, ts.Diagnostics.The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol);
+            }
+            if (!allTypesAssignableToKind(rightType, 67108864 /* NonPrimitive */ | 58982400 /* InstantiableNonPrimitive */)) {
+                error(right, ts.Diagnostics.The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter);
+            }
+            return booleanType;
+        }
+        function checkObjectLiteralAssignment(node, sourceType, rightIsThis) {
+            var properties = node.properties;
+            if (strictNullChecks && properties.length === 0) {
+                return checkNonNullType(sourceType, node);
+            }
+            for (var _i = 0, properties_6 = properties; _i < properties_6.length; _i++) {
+                var p = properties_6[_i];
+                checkObjectLiteralDestructuringPropertyAssignment(sourceType, p, properties, rightIsThis);
+            }
+            return sourceType;
+        }
+        /** Note: If property cannot be a SpreadAssignment, then allProperties does not need to be provided */
+        function checkObjectLiteralDestructuringPropertyAssignment(objectLiteralType, property, allProperties, rightIsThis) {
+            if (rightIsThis === void 0) { rightIsThis = false; }
+            if (property.kind === 275 /* PropertyAssignment */ || property.kind === 276 /* ShorthandPropertyAssignment */) {
+                var name = property.name;
+                var exprType = getLiteralTypeFromPropertyName(name);
+                if (isTypeUsableAsPropertyName(exprType)) {
+                    var text = getPropertyNameFromType(exprType);
+                    var prop = getPropertyOfType(objectLiteralType, text);
+                    if (prop) {
+                        markPropertyAsReferenced(prop, property, rightIsThis);
+                        checkPropertyAccessibility(property, /*isSuper*/ false, objectLiteralType, prop);
+                    }
+                }
+                var elementType = getIndexedAccessType(objectLiteralType, exprType, name);
+                var type = getFlowTypeOfDestructuring(property, elementType);
+                return checkDestructuringAssignment(property.kind === 276 /* ShorthandPropertyAssignment */ ? property : property.initializer, type);
+            }
+            else if (property.kind === 277 /* SpreadAssignment */) {
+                if (languageVersion < 6 /* ESNext */) {
+                    checkExternalEmitHelpers(property, 4 /* Rest */);
+                }
+                var nonRestNames = [];
+                if (allProperties) {
+                    for (var i = 0; i < allProperties.length - 1; i++) {
+                        nonRestNames.push(allProperties[i].name);
+                    }
+                }
+                var type = getRestType(objectLiteralType, nonRestNames, objectLiteralType.symbol);
+                checkGrammarForDisallowedTrailingComma(allProperties, ts.Diagnostics.A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma);
+                return checkDestructuringAssignment(property.expression, type);
+            }
+            else {
+                error(property, ts.Diagnostics.Property_assignment_expected);
+            }
+        }
+        function checkArrayLiteralAssignment(node, sourceType, checkMode) {
+            var elements = node.elements;
+            if (languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
+                checkExternalEmitHelpers(node, 512 /* Read */);
+            }
+            // This elementType will be used if the specific property corresponding to this index is not
+            // present (aka the tuple element property). This call also checks that the parentType is in
+            // fact an iterable or array (depending on target language).
+            var elementType = checkIteratedTypeOrElementType(sourceType, node, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) || errorType;
+            for (var i = 0; i < elements.length; i++) {
+                checkArrayLiteralDestructuringElementAssignment(node, sourceType, i, elementType, checkMode);
+            }
+            return sourceType;
+        }
+        function checkArrayLiteralDestructuringElementAssignment(node, sourceType, elementIndex, elementType, checkMode) {
+            var elements = node.elements;
+            var element = elements[elementIndex];
+            if (element.kind !== 210 /* OmittedExpression */) {
+                if (element.kind !== 208 /* SpreadElement */) {
+                    var indexType = getLiteralType(elementIndex);
+                    if (isArrayLikeType(sourceType)) {
+                        // We create a synthetic expression so that getIndexedAccessType doesn't get confused
+                        // when the element is a SyntaxKind.ElementAccessExpression.
+                        var elementType_2 = getIndexedAccessType(sourceType, indexType, createSyntheticExpression(element, indexType));
+                        var type = getFlowTypeOfDestructuring(element, elementType_2);
+                        return checkDestructuringAssignment(element, type, checkMode);
+                    }
+                    return checkDestructuringAssignment(element, elementType, checkMode);
+                }
+                if (elementIndex < elements.length - 1) {
+                    error(element, ts.Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern);
+                }
+                else {
+                    var restExpression = element.expression;
+                    if (restExpression.kind === 204 /* BinaryExpression */ && restExpression.operatorToken.kind === 59 /* EqualsToken */) {
+                        error(restExpression.operatorToken, ts.Diagnostics.A_rest_element_cannot_have_an_initializer);
+                    }
+                    else {
+                        checkGrammarForDisallowedTrailingComma(node.elements, ts.Diagnostics.A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma);
+                        var type = everyType(sourceType, isTupleType) ?
+                            mapType(sourceType, function (t) { return sliceTupleType(t, elementIndex); }) :
+                            createArrayType(elementType);
+                        return checkDestructuringAssignment(restExpression, type, checkMode);
+                    }
+                }
+            }
+            return undefined;
+        }
+        function checkDestructuringAssignment(exprOrAssignment, sourceType, checkMode, rightIsThis) {
+            var target;
+            if (exprOrAssignment.kind === 276 /* ShorthandPropertyAssignment */) {
+                var prop = exprOrAssignment;
+                if (prop.objectAssignmentInitializer) {
+                    // In strict null checking mode, if a default value of a non-undefined type is specified, remove
+                    // undefined from the final type.
+                    if (strictNullChecks &&
+                        !(getFalsyFlags(checkExpression(prop.objectAssignmentInitializer)) & 32768 /* Undefined */)) {
+                        sourceType = getTypeWithFacts(sourceType, 524288 /* NEUndefined */);
+                    }
+                    checkBinaryLikeExpression(prop.name, prop.equalsToken, prop.objectAssignmentInitializer, checkMode);
+                }
+                target = exprOrAssignment.name;
+            }
+            else {
+                target = exprOrAssignment;
+            }
+            if (target.kind === 204 /* BinaryExpression */ && target.operatorToken.kind === 59 /* EqualsToken */) {
+                checkBinaryExpression(target, checkMode);
+                target = target.left;
+            }
+            if (target.kind === 188 /* ObjectLiteralExpression */) {
+                return checkObjectLiteralAssignment(target, sourceType, rightIsThis);
+            }
+            if (target.kind === 187 /* ArrayLiteralExpression */) {
+                return checkArrayLiteralAssignment(target, sourceType, checkMode);
+            }
+            return checkReferenceAssignment(target, sourceType, checkMode);
+        }
+        function checkReferenceAssignment(target, sourceType, checkMode) {
+            var targetType = checkExpression(target, checkMode);
+            var error = target.parent.kind === 277 /* SpreadAssignment */ ?
+                ts.Diagnostics.The_target_of_an_object_rest_assignment_must_be_a_variable_or_a_property_access :
+                ts.Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access;
+            if (checkReferenceExpression(target, error)) {
+                checkTypeAssignableToAndOptionallyElaborate(sourceType, targetType, target, target);
+            }
+            return sourceType;
+        }
+        /**
+         * This is a *shallow* check: An expression is side-effect-free if the
+         * evaluation of the expression *itself* cannot produce side effects.
+         * For example, x++ / 3 is side-effect free because the / operator
+         * does not have side effects.
+         * The intent is to "smell test" an expression for correctness in positions where
+         * its value is discarded (e.g. the left side of the comma operator).
+         */
+        function isSideEffectFree(node) {
+            node = ts.skipParentheses(node);
+            switch (node.kind) {
+                case 72 /* Identifier */:
+                case 10 /* StringLiteral */:
+                case 13 /* RegularExpressionLiteral */:
+                case 193 /* TaggedTemplateExpression */:
+                case 206 /* TemplateExpression */:
+                case 14 /* NoSubstitutionTemplateLiteral */:
+                case 8 /* NumericLiteral */:
+                case 9 /* BigIntLiteral */:
+                case 102 /* TrueKeyword */:
+                case 87 /* FalseKeyword */:
+                case 96 /* NullKeyword */:
+                case 141 /* UndefinedKeyword */:
+                case 196 /* FunctionExpression */:
+                case 209 /* ClassExpression */:
+                case 197 /* ArrowFunction */:
+                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ObjectLiteralExpression */:
+                case 199 /* TypeOfExpression */:
+                case 213 /* NonNullExpression */:
+                case 261 /* JsxSelfClosingElement */:
+                case 260 /* JsxElement */:
+                    return true;
+                case 205 /* ConditionalExpression */:
+                    return isSideEffectFree(node.whenTrue) &&
+                        isSideEffectFree(node.whenFalse);
+                case 204 /* BinaryExpression */:
+                    if (ts.isAssignmentOperator(node.operatorToken.kind)) {
+                        return false;
+                    }
+                    return isSideEffectFree(node.left) &&
+                        isSideEffectFree(node.right);
+                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PostfixUnaryExpression */:
+                    // Unary operators ~, !, +, and - have no side effects.
+                    // The rest do.
+                    switch (node.operator) {
+                        case 52 /* ExclamationToken */:
+                        case 38 /* PlusToken */:
+                        case 39 /* MinusToken */:
+                        case 53 /* TildeToken */:
+                            return true;
+                    }
+                    return false;
+                // Some forms listed here for clarity
+                case 200 /* VoidExpression */: // Explicit opt-out
+                case 194 /* TypeAssertionExpression */: // Not SEF, but can produce useful type warnings
+                case 212 /* AsExpression */: // Not SEF, but can produce useful type warnings
+                default:
+                    return false;
+            }
+        }
+        function isTypeEqualityComparableTo(source, target) {
+            return (target.flags & 98304 /* Nullable */) !== 0 || isTypeComparableTo(source, target);
+        }
+        function checkBinaryExpression(node, checkMode) {
+            if (ts.isInJSFile(node) && ts.getAssignedExpandoInitializer(node)) {
+                return checkExpression(node.right, checkMode);
+            }
+            return checkBinaryLikeExpression(node.left, node.operatorToken, node.right, checkMode, node);
+        }
+        function checkBinaryLikeExpression(left, operatorToken, right, checkMode, errorNode) {
+            var operator = operatorToken.kind;
+            if (operator === 59 /* EqualsToken */ && (left.kind === 188 /* ObjectLiteralExpression */ || left.kind === 187 /* ArrayLiteralExpression */)) {
+                return checkDestructuringAssignment(left, checkExpression(right, checkMode), checkMode, right.kind === 100 /* ThisKeyword */);
+            }
+            var leftType;
+            if (operator === 54 /* AmpersandAmpersandToken */ || operator === 55 /* BarBarToken */) {
+                leftType = checkTruthinessExpression(left, checkMode);
+            }
+            else {
+                leftType = checkExpression(left, checkMode);
+            }
+            var rightType = checkExpression(right, checkMode);
+            switch (operator) {
+                case 40 /* AsteriskToken */:
+                case 41 /* AsteriskAsteriskToken */:
+                case 62 /* AsteriskEqualsToken */:
+                case 63 /* AsteriskAsteriskEqualsToken */:
+                case 42 /* SlashToken */:
+                case 64 /* SlashEqualsToken */:
+                case 43 /* PercentToken */:
+                case 65 /* PercentEqualsToken */:
+                case 39 /* MinusToken */:
+                case 61 /* MinusEqualsToken */:
+                case 46 /* LessThanLessThanToken */:
+                case 66 /* LessThanLessThanEqualsToken */:
+                case 47 /* GreaterThanGreaterThanToken */:
+                case 67 /* GreaterThanGreaterThanEqualsToken */:
+                case 48 /* GreaterThanGreaterThanGreaterThanToken */:
+                case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                case 50 /* BarToken */:
+                case 70 /* BarEqualsToken */:
+                case 51 /* CaretToken */:
+                case 71 /* CaretEqualsToken */:
+                case 49 /* AmpersandToken */:
+                case 69 /* AmpersandEqualsToken */:
+                    if (leftType === silentNeverType || rightType === silentNeverType) {
+                        return silentNeverType;
+                    }
+                    leftType = checkNonNullType(leftType, left);
+                    rightType = checkNonNullType(rightType, right);
+                    var suggestedOperator = void 0;
+                    // if a user tries to apply a bitwise operator to 2 boolean operands
+                    // try and return them a helpful suggestion
+                    if ((leftType.flags & 528 /* BooleanLike */) &&
+                        (rightType.flags & 528 /* BooleanLike */) &&
+                        (suggestedOperator = getSuggestedBooleanOperator(operatorToken.kind)) !== undefined) {
+                        error(errorNode || operatorToken, ts.Diagnostics.The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead, ts.tokenToString(operatorToken.kind), ts.tokenToString(suggestedOperator));
+                        return numberType;
+                    }
+                    else {
+                        // otherwise just check each operand separately and report errors as normal
+                        var leftOk = checkArithmeticOperandType(left, leftType, ts.Diagnostics.The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type);
+                        var rightOk = checkArithmeticOperandType(right, rightType, ts.Diagnostics.The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_bigint_or_an_enum_type);
+                        var resultType_1;
+                        // If both are any or unknown, allow operation; assume it will resolve to number
+                        if ((isTypeAssignableToKind(leftType, 3 /* AnyOrUnknown */) && isTypeAssignableToKind(rightType, 3 /* AnyOrUnknown */)) ||
+                            // Or, if neither could be bigint, implicit coercion results in a number result
+                            !(maybeTypeOfKind(leftType, 2112 /* BigIntLike */) || maybeTypeOfKind(rightType, 2112 /* BigIntLike */))) {
+                            resultType_1 = numberType;
+                        }
+                        // At least one is assignable to bigint, so both should be only assignable to bigint
+                        else if (isTypeAssignableToKind(leftType, 2112 /* BigIntLike */) && isTypeAssignableToKind(rightType, 2112 /* BigIntLike */)) {
+                            switch (operator) {
+                                case 48 /* GreaterThanGreaterThanGreaterThanToken */:
+                                case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                                    reportOperatorError();
+                            }
+                            resultType_1 = bigintType;
+                        }
+                        else {
+                            reportOperatorError();
+                            resultType_1 = errorType;
+                        }
+                        if (leftOk && rightOk) {
+                            checkAssignmentOperator(resultType_1);
+                        }
+                        return resultType_1;
+                    }
+                case 38 /* PlusToken */:
+                case 60 /* PlusEqualsToken */:
+                    if (leftType === silentNeverType || rightType === silentNeverType) {
+                        return silentNeverType;
+                    }
+                    if (!isTypeAssignableToKind(leftType, 132 /* StringLike */) && !isTypeAssignableToKind(rightType, 132 /* StringLike */)) {
+                        leftType = checkNonNullType(leftType, left);
+                        rightType = checkNonNullType(rightType, right);
+                    }
+                    var resultType = void 0;
+                    if (isTypeAssignableToKind(leftType, 296 /* NumberLike */, /*strict*/ true) && isTypeAssignableToKind(rightType, 296 /* NumberLike */, /*strict*/ true)) {
+                        // Operands of an enum type are treated as having the primitive type Number.
+                        // If both operands are of the Number primitive type, the result is of the Number primitive type.
+                        resultType = numberType;
+                    }
+                    else if (isTypeAssignableToKind(leftType, 2112 /* BigIntLike */, /*strict*/ true) && isTypeAssignableToKind(rightType, 2112 /* BigIntLike */, /*strict*/ true)) {
+                        // If both operands are of the BigInt primitive type, the result is of the BigInt primitive type.
+                        resultType = bigintType;
+                    }
+                    else if (isTypeAssignableToKind(leftType, 132 /* StringLike */, /*strict*/ true) || isTypeAssignableToKind(rightType, 132 /* StringLike */, /*strict*/ true)) {
+                        // If one or both operands are of the String primitive type, the result is of the String primitive type.
+                        resultType = stringType;
+                    }
+                    else if (isTypeAny(leftType) || isTypeAny(rightType)) {
+                        // Otherwise, the result is of type Any.
+                        // NOTE: unknown type here denotes error type. Old compiler treated this case as any type so do we.
+                        resultType = leftType === errorType || rightType === errorType ? errorType : anyType;
+                    }
+                    // Symbols are not allowed at all in arithmetic expressions
+                    if (resultType && !checkForDisallowedESSymbolOperand(operator)) {
+                        return resultType;
+                    }
+                    if (!resultType) {
+                        reportOperatorError();
+                        return anyType;
+                    }
+                    if (operator === 60 /* PlusEqualsToken */) {
+                        checkAssignmentOperator(resultType);
+                    }
+                    return resultType;
+                case 28 /* LessThanToken */:
+                case 30 /* GreaterThanToken */:
+                case 31 /* LessThanEqualsToken */:
+                case 32 /* GreaterThanEqualsToken */:
+                    if (checkForDisallowedESSymbolOperand(operator)) {
+                        leftType = getBaseTypeOfLiteralType(checkNonNullType(leftType, left));
+                        rightType = getBaseTypeOfLiteralType(checkNonNullType(rightType, right));
+                        if (!(isTypeComparableTo(leftType, rightType) || isTypeComparableTo(rightType, leftType) ||
+                            (isTypeAssignableTo(leftType, numberOrBigIntType) && isTypeAssignableTo(rightType, numberOrBigIntType)))) {
+                            reportOperatorError();
+                        }
+                    }
+                    return booleanType;
+                case 33 /* EqualsEqualsToken */:
+                case 34 /* ExclamationEqualsToken */:
+                case 35 /* EqualsEqualsEqualsToken */:
+                case 36 /* ExclamationEqualsEqualsToken */:
+                    var leftIsLiteral = isLiteralType(leftType);
+                    var rightIsLiteral = isLiteralType(rightType);
+                    if (!leftIsLiteral || !rightIsLiteral) {
+                        leftType = leftIsLiteral ? getBaseTypeOfLiteralType(leftType) : leftType;
+                        rightType = rightIsLiteral ? getBaseTypeOfLiteralType(rightType) : rightType;
+                    }
+                    if (!isTypeEqualityComparableTo(leftType, rightType) && !isTypeEqualityComparableTo(rightType, leftType)) {
+                        reportOperatorError();
+                    }
+                    return booleanType;
+                case 94 /* InstanceOfKeyword */:
+                    return checkInstanceOfExpression(left, right, leftType, rightType);
+                case 93 /* InKeyword */:
+                    return checkInExpression(left, right, leftType, rightType);
+                case 54 /* AmpersandAmpersandToken */:
+                    return getTypeFacts(leftType) & 4194304 /* Truthy */ ?
+                        getUnionType([extractDefinitelyFalsyTypes(strictNullChecks ? leftType : getBaseTypeOfLiteralType(rightType)), rightType]) :
+                        leftType;
+                case 55 /* BarBarToken */:
+                    return getTypeFacts(leftType) & 8388608 /* Falsy */ ?
+                        getUnionType([removeDefinitelyFalsyTypes(leftType), rightType], 2 /* Subtype */) :
+                        leftType;
+                case 59 /* EqualsToken */:
+                    var declKind = ts.isBinaryExpression(left.parent) ? ts.getAssignmentDeclarationKind(left.parent) : 0 /* None */;
+                    checkAssignmentDeclaration(declKind, rightType);
+                    if (isAssignmentDeclaration(declKind)) {
+                        if (!(rightType.flags & 524288 /* Object */) ||
+                            declKind !== 2 /* ModuleExports */ &&
+                                declKind !== 6 /* Prototype */ &&
+                                !isEmptyObjectType(rightType) &&
+                                !isFunctionObjectType(rightType) &&
+                                !(ts.getObjectFlags(rightType) & 1 /* Class */)) {
+                            // don't check assignability of module.exports=, C.prototype=, or expando types because they will necessarily be incomplete
+                            checkAssignmentOperator(rightType);
+                        }
+                        return leftType;
+                    }
+                    else {
+                        checkAssignmentOperator(rightType);
+                        return getRegularTypeOfObjectLiteral(rightType);
+                    }
+                case 27 /* CommaToken */:
+                    if (!compilerOptions.allowUnreachableCode && isSideEffectFree(left) && !isEvalNode(right)) {
+                        error(left, ts.Diagnostics.Left_side_of_comma_operator_is_unused_and_has_no_side_effects);
+                    }
+                    return rightType;
+                default:
+                    return ts.Debug.fail();
+            }
+            function checkAssignmentDeclaration(kind, rightType) {
+                if (kind === 2 /* ModuleExports */) {
+                    for (var _i = 0, _a = getPropertiesOfObjectType(rightType); _i < _a.length; _i++) {
+                        var prop = _a[_i];
+                        var propType = getTypeOfSymbol(prop);
+                        if (propType.symbol && propType.symbol.flags & 32 /* Class */) {
+                            var name = prop.escapedName;
+                            var symbol = resolveName(prop.valueDeclaration, name, 67897832 /* Type */, undefined, name, /*isUse*/ false);
+                            if (symbol && symbol.declarations.some(ts.isJSDocTypedefTag)) {
+                                grammarErrorOnNode(symbol.declarations[0], ts.Diagnostics.Duplicate_identifier_0, ts.unescapeLeadingUnderscores(name));
+                                return grammarErrorOnNode(prop.valueDeclaration, ts.Diagnostics.Duplicate_identifier_0, ts.unescapeLeadingUnderscores(name));
+                            }
+                        }
+                    }
+                }
+            }
+            function isEvalNode(node) {
+                return node.kind === 72 /* Identifier */ && node.escapedText === "eval";
+            }
+            // Return true if there was no error, false if there was an error.
+            function checkForDisallowedESSymbolOperand(operator) {
+                var offendingSymbolOperand = maybeTypeOfKind(leftType, 12288 /* ESSymbolLike */) ? left :
+                    maybeTypeOfKind(rightType, 12288 /* ESSymbolLike */) ? right :
+                        undefined;
+                if (offendingSymbolOperand) {
+                    error(offendingSymbolOperand, ts.Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, ts.tokenToString(operator));
+                    return false;
+                }
+                return true;
+            }
+            function getSuggestedBooleanOperator(operator) {
+                switch (operator) {
+                    case 50 /* BarToken */:
+                    case 70 /* BarEqualsToken */:
+                        return 55 /* BarBarToken */;
+                    case 51 /* CaretToken */:
+                    case 71 /* CaretEqualsToken */:
+                        return 36 /* ExclamationEqualsEqualsToken */;
+                    case 49 /* AmpersandToken */:
+                    case 69 /* AmpersandEqualsToken */:
+                        return 54 /* AmpersandAmpersandToken */;
+                    default:
+                        return undefined;
+                }
+            }
+            function checkAssignmentOperator(valueType) {
+                if (produceDiagnostics && ts.isAssignmentOperator(operator)) {
+                    // TypeScript 1.0 spec (April 2014): 4.17
+                    // An assignment of the form
+                    //    VarExpr = ValueExpr
+                    // requires VarExpr to be classified as a reference
+                    // A compound assignment furthermore requires VarExpr to be classified as a reference (section 4.1)
+                    // and the type of the non-compound operation to be assignable to the type of VarExpr.
+                    if (checkReferenceExpression(left, ts.Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access)
+                        && (!ts.isIdentifier(left) || ts.unescapeLeadingUnderscores(left.escapedText) !== "exports")) {
+                        // to avoid cascading errors check assignability only if 'isReference' check succeeded and no errors were reported
+                        checkTypeAssignableToAndOptionallyElaborate(valueType, leftType, left, right);
+                    }
+                }
+            }
+            function isAssignmentDeclaration(kind) {
+                switch (kind) {
+                    case 2 /* ModuleExports */:
+                        return true;
+                    case 1 /* ExportsProperty */:
+                    case 5 /* Property */:
+                    case 6 /* Prototype */:
+                    case 3 /* PrototypeProperty */:
+                    case 4 /* ThisProperty */:
+                        var symbol = getSymbolOfNode(left);
+                        var init = ts.getAssignedExpandoInitializer(right);
+                        return init && ts.isObjectLiteralExpression(init) &&
+                            symbol && ts.hasEntries(symbol.exports);
+                    default:
+                        return false;
+                }
+            }
+            function reportOperatorError() {
+                var leftStr = typeToString(leftType);
+                var rightStr = typeToString(rightType);
+                var errNode = errorNode || operatorToken;
+                if (!tryGiveBetterPrimaryError(errNode, leftStr, rightStr)) {
+                    error(errNode, ts.Diagnostics.Operator_0_cannot_be_applied_to_types_1_and_2, ts.tokenToString(operatorToken.kind), leftStr, rightStr);
+                }
+            }
+            function tryGiveBetterPrimaryError(errNode, leftStr, rightStr) {
+                switch (operatorToken.kind) {
+                    case 35 /* EqualsEqualsEqualsToken */:
+                    case 33 /* EqualsEqualsToken */:
+                        return error(errNode, ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap, "false", leftStr, rightStr);
+                    case 36 /* ExclamationEqualsEqualsToken */:
+                    case 34 /* ExclamationEqualsToken */:
+                        return error(errNode, ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap, "true", leftStr, rightStr);
+                }
+                return undefined;
+            }
+        }
+        function isYieldExpressionInClass(node) {
+            var current = node;
+            var parent = node.parent;
+            while (parent) {
+                if (ts.isFunctionLike(parent) && current === parent.body) {
+                    return false;
+                }
+                else if (ts.isClassLike(current)) {
+                    return true;
+                }
+                current = parent;
+                parent = parent.parent;
+            }
+            return false;
+        }
+        function checkYieldExpression(node) {
+            // Grammar checking
+            if (produceDiagnostics) {
+                if (!(node.flags & 4096 /* YieldContext */) || isYieldExpressionInClass(node)) {
+                    grammarErrorOnFirstToken(node, ts.Diagnostics.A_yield_expression_is_only_allowed_in_a_generator_body);
+                }
+                if (isInParameterInitializerBeforeContainingFunction(node)) {
+                    error(node, ts.Diagnostics.yield_expressions_cannot_be_used_in_a_parameter_initializer);
+                }
+            }
+            var func = ts.getContainingFunction(node);
+            if (!func)
+                return anyType;
+            var functionFlags = ts.getFunctionFlags(func);
+            if (!(functionFlags & 1 /* Generator */)) {
+                // If the user's code is syntactically correct, the func should always have a star. After all, we are in a yield context.
+                return anyType;
+            }
+            if (node.asteriskToken) {
+                // Async generator functions prior to ESNext require the __await, __asyncDelegator,
+                // and __asyncValues helpers
+                if ((functionFlags & 3 /* AsyncGenerator */) === 3 /* AsyncGenerator */ &&
+                    languageVersion < 6 /* ESNext */) {
+                    checkExternalEmitHelpers(node, 26624 /* AsyncDelegatorIncludes */);
+                }
+                // Generator functions prior to ES2015 require the __values helper
+                if ((functionFlags & 3 /* AsyncGenerator */) === 1 /* Generator */ &&
+                    languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
+                    checkExternalEmitHelpers(node, 256 /* Values */);
+                }
+            }
+            var isAsync = (functionFlags & 2 /* Async */) !== 0;
+            var yieldedType = getYieldedTypeOfYieldExpression(node, isAsync); // TODO: GH#18217
+            // There is no point in doing an assignability check if the function
+            // has no explicit return type because the return type is directly computed
+            // from the yield expressions.
+            var returnType = getReturnTypeFromAnnotation(func);
+            if (returnType) {
+                var signatureElementType = getIteratedTypeOfGenerator(returnType, isAsync) || anyType;
+                checkTypeAssignableToAndOptionallyElaborate(yieldedType, signatureElementType, node.expression || node, node.expression);
+            }
+            // Both yield and yield* expressions have type 'any'
+            return anyType;
+        }
+        function checkConditionalExpression(node, checkMode) {
+            checkTruthinessExpression(node.condition);
+            var type1 = checkExpression(node.whenTrue, checkMode);
+            var type2 = checkExpression(node.whenFalse, checkMode);
+            return getUnionType([type1, type2], 2 /* Subtype */);
+        }
+        function checkTemplateExpression(node) {
+            // We just want to check each expressions, but we are unconcerned with
+            // the type of each expression, as any value may be coerced into a string.
+            // It is worth asking whether this is what we really want though.
+            // A place where we actually *are* concerned with the expressions' types are
+            // in tagged templates.
+            ts.forEach(node.templateSpans, function (templateSpan) {
+                if (maybeTypeOfKind(checkExpression(templateSpan.expression), 12288 /* ESSymbolLike */)) {
+                    error(templateSpan.expression, ts.Diagnostics.Implicit_conversion_of_a_symbol_to_a_string_will_fail_at_runtime_Consider_wrapping_this_expression_in_String);
+                }
+            });
+            return stringType;
+        }
+        function getContextNode(node) {
+            if (node.kind === 268 /* JsxAttributes */ && !ts.isJsxSelfClosingElement(node.parent)) {
+                return node.parent.parent; // Needs to be the root JsxElement, so it encompasses the attributes _and_ the children (which are essentially part of the attributes)
+            }
+            return node;
+        }
+        function checkExpressionWithContextualType(node, contextualType, contextualMapper) {
+            var context = getContextNode(node);
+            var saveContextualType = context.contextualType;
+            var saveContextualMapper = context.contextualMapper;
+            context.contextualType = contextualType;
+            context.contextualMapper = contextualMapper;
+            var checkMode = contextualMapper === identityMapper ? 1 /* SkipContextSensitive */ :
+                contextualMapper ? 2 /* Inferential */ : 3 /* Contextual */;
+            var result = checkExpression(node, checkMode);
+            context.contextualType = saveContextualType;
+            context.contextualMapper = saveContextualMapper;
+            return result;
+        }
+        function checkExpressionCached(node, checkMode) {
+            var links = getNodeLinks(node);
+            if (!links.resolvedType) {
+                if (checkMode) {
+                    return checkExpression(node, checkMode);
+                }
+                // When computing a type that we're going to cache, we need to ignore any ongoing control flow
+                // analysis because variables may have transient types in indeterminable states. Moving flowLoopStart
+                // to the top of the stack ensures all transient types are computed from a known point.
+                var saveFlowLoopStart = flowLoopStart;
+                flowLoopStart = flowLoopCount;
+                links.resolvedType = checkExpression(node, checkMode);
+                flowLoopStart = saveFlowLoopStart;
+            }
+            return links.resolvedType;
+        }
+        function isTypeAssertion(node) {
+            node = ts.skipParentheses(node);
+            return node.kind === 194 /* TypeAssertionExpression */ || node.kind === 212 /* AsExpression */;
+        }
+        function checkDeclarationInitializer(declaration) {
+            var initializer = ts.getEffectiveInitializer(declaration);
+            var type = getTypeOfExpression(initializer, /*cache*/ true);
+            var widened = ts.getCombinedNodeFlags(declaration) & 2 /* Const */ ||
+                ts.isDeclarationReadonly(declaration) ||
+                isTypeAssertion(initializer) ||
+                isLiteralOfContextualType(type, getContextualType(initializer)) ? type : getWidenedLiteralType(type);
+            if (ts.isInJSFile(declaration)) {
+                if (widened.flags & 98304 /* Nullable */) {
+                    reportImplicitAny(declaration, anyType);
+                    return anyType;
+                }
+                else if (isEmptyArrayLiteralType(widened)) {
+                    reportImplicitAny(declaration, anyArrayType);
+                    return anyArrayType;
+                }
+            }
+            return widened;
+        }
+        function isLiteralOfContextualType(candidateType, contextualType) {
+            if (contextualType) {
+                if (contextualType.flags & 3145728 /* UnionOrIntersection */) {
+                    var types = contextualType.types;
+                    return ts.some(types, function (t) { return isLiteralOfContextualType(candidateType, t); });
+                }
+                if (contextualType.flags & 58982400 /* InstantiableNonPrimitive */) {
+                    // If the contextual type is a type variable constrained to a primitive type, consider
+                    // this a literal context for literals of that primitive type. For example, given a
+                    // type parameter 'T extends string', infer string literal types for T.
+                    var constraint = getBaseConstraintOfType(contextualType) || emptyObjectType;
+                    return maybeTypeOfKind(constraint, 4 /* String */) && maybeTypeOfKind(candidateType, 128 /* StringLiteral */) ||
+                        maybeTypeOfKind(constraint, 8 /* Number */) && maybeTypeOfKind(candidateType, 256 /* NumberLiteral */) ||
+                        maybeTypeOfKind(constraint, 64 /* BigInt */) && maybeTypeOfKind(candidateType, 2048 /* BigIntLiteral */) ||
+                        maybeTypeOfKind(constraint, 4096 /* ESSymbol */) && maybeTypeOfKind(candidateType, 8192 /* UniqueESSymbol */) ||
+                        isLiteralOfContextualType(candidateType, constraint);
+                }
+                // If the contextual type is a literal of a particular primitive type, we consider this a
+                // literal context for all literals of that primitive type.
+                return !!(contextualType.flags & (128 /* StringLiteral */ | 4194304 /* Index */) && maybeTypeOfKind(candidateType, 128 /* StringLiteral */) ||
+                    contextualType.flags & 256 /* NumberLiteral */ && maybeTypeOfKind(candidateType, 256 /* NumberLiteral */) ||
+                    contextualType.flags & 2048 /* BigIntLiteral */ && maybeTypeOfKind(candidateType, 2048 /* BigIntLiteral */) ||
+                    contextualType.flags & 512 /* BooleanLiteral */ && maybeTypeOfKind(candidateType, 512 /* BooleanLiteral */) ||
+                    contextualType.flags & 8192 /* UniqueESSymbol */ && maybeTypeOfKind(candidateType, 8192 /* UniqueESSymbol */));
+            }
+            return false;
+        }
+        function checkExpressionForMutableLocation(node, checkMode, contextualType, forceTuple) {
+            if (arguments.length === 2) {
+                contextualType = getContextualType(node);
+            }
+            var type = checkExpression(node, checkMode, forceTuple);
+            return isTypeAssertion(node) ? type :
+                getWidenedLiteralLikeTypeForContextualType(type, contextualType);
+        }
+        function checkPropertyAssignment(node, checkMode) {
+            // Do not use hasDynamicName here, because that returns false for well known symbols.
+            // We want to perform checkComputedPropertyName for all computed properties, including
+            // well known symbols.
+            if (node.name.kind === 149 /* ComputedPropertyName */) {
+                checkComputedPropertyName(node.name);
+            }
+            return checkExpressionForMutableLocation(node.initializer, checkMode);
+        }
+        function checkObjectLiteralMethod(node, checkMode) {
+            // Grammar checking
+            checkGrammarMethod(node);
+            // Do not use hasDynamicName here, because that returns false for well known symbols.
+            // We want to perform checkComputedPropertyName for all computed properties, including
+            // well known symbols.
+            if (node.name.kind === 149 /* ComputedPropertyName */) {
+                checkComputedPropertyName(node.name);
+            }
+            var uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, checkMode);
+            return instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, checkMode);
+        }
+        function instantiateTypeWithSingleGenericCallSignature(node, type, checkMode) {
+            if (checkMode === 2 /* Inferential */) {
+                var signature = getSingleCallSignature(type);
+                if (signature && signature.typeParameters) {
+                    var contextualType = getApparentTypeOfContextualType(node);
+                    if (contextualType) {
+                        var contextualSignature = getSingleCallSignature(getNonNullableType(contextualType));
+                        if (contextualSignature && !contextualSignature.typeParameters) {
+                            return getOrCreateTypeFromSignature(instantiateSignatureInContextOf(signature, contextualSignature, getContextualMapper(node)));
+                        }
+                    }
+                }
+            }
+            return type;
+        }
+        /**
+         * Returns the type of an expression. Unlike checkExpression, this function is simply concerned
+         * with computing the type and may not fully check all contained sub-expressions for errors.
+         * A cache argument of true indicates that if the function performs a full type check, it is ok
+         * to cache the result.
+         */
+        function getTypeOfExpression(node, cache) {
+            var expr = ts.skipParentheses(node);
+            // Optimize for the common case of a call to a function with a single non-generic call
+            // signature where we can just fetch the return type without checking the arguments.
+            if (expr.kind === 191 /* CallExpression */ && expr.expression.kind !== 98 /* SuperKeyword */ && !ts.isRequireCall(expr, /*checkArgumentIsStringLiteralLike*/ true) && !isSymbolOrSymbolForCall(expr)) {
+                var funcType = checkNonNullExpression(expr.expression);
+                var signature = getSingleCallSignature(funcType);
+                if (signature && !signature.typeParameters) {
+                    return getReturnTypeOfSignature(signature);
+                }
+            }
+            else if (expr.kind === 194 /* TypeAssertionExpression */ || expr.kind === 212 /* AsExpression */) {
+                return getTypeFromTypeNode(expr.type);
+            }
+            // Otherwise simply call checkExpression. Ideally, the entire family of checkXXX functions
+            // should have a parameter that indicates whether full error checking is required such that
+            // we can perform the optimizations locally.
+            return cache ? checkExpressionCached(node) : checkExpression(node);
+        }
+        /**
+         * Returns the type of an expression. Unlike checkExpression, this function is simply concerned
+         * with computing the type and may not fully check all contained sub-expressions for errors.
+         * It is intended for uses where you know there is no contextual type,
+         * and requesting the contextual type might cause a circularity or other bad behaviour.
+         * It sets the contextual type of the node to any before calling getTypeOfExpression.
+         */
+        function getContextFreeTypeOfExpression(node) {
+            var links = getNodeLinks(node);
+            if (links.contextFreeType) {
+                return links.contextFreeType;
+            }
+            var saveContextualType = node.contextualType;
+            node.contextualType = anyType;
+            var type = links.contextFreeType = checkExpression(node, 1 /* SkipContextSensitive */);
+            node.contextualType = saveContextualType;
+            return type;
+        }
+        // Checks an expression and returns its type. The contextualMapper parameter serves two purposes: When
+        // contextualMapper is not undefined and not equal to the identityMapper function object it indicates that the
+        // expression is being inferentially typed (section 4.15.2 in spec) and provides the type mapper to use in
+        // conjunction with the generic contextual type. When contextualMapper is equal to the identityMapper function
+        // object, it serves as an indicator that all contained function and arrow expressions should be considered to
+        // have the wildcard function type; this form of type check is used during overload resolution to exclude
+        // contextually typed function and arrow expressions in the initial phase.
+        function checkExpression(node, checkMode, forceTuple) {
+            var type;
+            if (node.kind === 148 /* QualifiedName */) {
+                type = checkQualifiedName(node);
+            }
+            else {
+                var uninstantiatedType = checkExpressionWorker(node, checkMode, forceTuple);
+                type = instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, checkMode);
+            }
+            if (isConstEnumObjectType(type)) {
+                // enum object type for const enums are only permitted in:
+                // - 'left' in property access
+                // - 'object' in indexed access
+                // - target in rhs of import statement
+                var ok = (node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.expression === node) ||
+                    (node.parent.kind === 190 /* ElementAccessExpression */ && node.parent.expression === node) ||
+                    ((node.kind === 72 /* Identifier */ || node.kind === 148 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node) ||
+                        (node.parent.kind === 167 /* TypeQuery */ && node.parent.exprName === node));
+                if (!ok) {
+                    error(node, ts.Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment_or_type_query);
+                }
+            }
+            return type;
+        }
+        function checkParenthesizedExpression(node, checkMode) {
+            var tag = ts.isInJSFile(node) ? ts.getJSDocTypeTag(node) : undefined;
+            if (tag) {
+                return checkAssertionWorker(tag, tag.typeExpression.type, node.expression, checkMode);
+            }
+            return checkExpression(node.expression, checkMode);
+        }
+        function checkExpressionWorker(node, checkMode, forceTuple) {
+            switch (node.kind) {
+                case 72 /* Identifier */:
+                    return checkIdentifier(node);
+                case 100 /* ThisKeyword */:
+                    return checkThisExpression(node);
+                case 98 /* SuperKeyword */:
+                    return checkSuperExpression(node);
+                case 96 /* NullKeyword */:
+                    return nullWideningType;
+                case 14 /* NoSubstitutionTemplateLiteral */:
+                case 10 /* StringLiteral */:
+                    return getFreshTypeOfLiteralType(getLiteralType(node.text));
+                case 8 /* NumericLiteral */:
+                    checkGrammarNumericLiteral(node);
+                    return getFreshTypeOfLiteralType(getLiteralType(+node.text));
+                case 9 /* BigIntLiteral */:
+                    checkGrammarBigIntLiteral(node);
+                    return getFreshTypeOfLiteralType(getBigIntLiteralType(node));
+                case 102 /* TrueKeyword */:
+                    return trueType;
+                case 87 /* FalseKeyword */:
+                    return falseType;
+                case 206 /* TemplateExpression */:
+                    return checkTemplateExpression(node);
+                case 13 /* RegularExpressionLiteral */:
+                    return globalRegExpType;
+                case 187 /* ArrayLiteralExpression */:
+                    return checkArrayLiteral(node, checkMode, forceTuple);
+                case 188 /* ObjectLiteralExpression */:
+                    return checkObjectLiteral(node, checkMode);
+                case 189 /* PropertyAccessExpression */:
+                    return checkPropertyAccessExpression(node);
+                case 190 /* ElementAccessExpression */:
+                    return checkIndexedAccess(node);
+                case 191 /* CallExpression */:
+                    if (node.expression.kind === 92 /* ImportKeyword */) {
+                        return checkImportCallExpression(node);
+                    }
+                /* falls through */
+                case 192 /* NewExpression */:
+                    return checkCallExpression(node);
+                case 193 /* TaggedTemplateExpression */:
+                    return checkTaggedTemplateExpression(node);
+                case 195 /* ParenthesizedExpression */:
+                    return checkParenthesizedExpression(node, checkMode);
+                case 209 /* ClassExpression */:
+                    return checkClassExpression(node);
+                case 196 /* FunctionExpression */:
+                case 197 /* ArrowFunction */:
+                    return checkFunctionExpressionOrObjectLiteralMethod(node, checkMode);
+                case 199 /* TypeOfExpression */:
+                    return checkTypeOfExpression(node);
+                case 194 /* TypeAssertionExpression */:
+                case 212 /* AsExpression */:
+                    return checkAssertion(node);
+                case 213 /* NonNullExpression */:
+                    return checkNonNullAssertion(node);
+                case 214 /* MetaProperty */:
+                    return checkMetaProperty(node);
+                case 198 /* DeleteExpression */:
+                    return checkDeleteExpression(node);
+                case 200 /* VoidExpression */:
+                    return checkVoidExpression(node);
+                case 201 /* AwaitExpression */:
+                    return checkAwaitExpression(node);
+                case 202 /* PrefixUnaryExpression */:
+                    return checkPrefixUnaryExpression(node);
+                case 203 /* PostfixUnaryExpression */:
+                    return checkPostfixUnaryExpression(node);
+                case 204 /* BinaryExpression */:
+                    return checkBinaryExpression(node, checkMode);
+                case 205 /* ConditionalExpression */:
+                    return checkConditionalExpression(node, checkMode);
+                case 208 /* SpreadElement */:
+                    return checkSpreadExpression(node, checkMode);
+                case 210 /* OmittedExpression */:
+                    return undefinedWideningType;
+                case 207 /* YieldExpression */:
+                    return checkYieldExpression(node);
+                case 215 /* SyntheticExpression */:
+                    return node.type;
+                case 270 /* JsxExpression */:
+                    return checkJsxExpression(node, checkMode);
+                case 260 /* JsxElement */:
+                    return checkJsxElement(node, checkMode);
+                case 261 /* JsxSelfClosingElement */:
+                    return checkJsxSelfClosingElement(node, checkMode);
+                case 264 /* JsxFragment */:
+                    return checkJsxFragment(node);
+                case 268 /* JsxAttributes */:
+                    return checkJsxAttributes(node, checkMode);
+                case 262 /* JsxOpeningElement */:
+                    ts.Debug.fail("Shouldn't ever directly check a JsxOpeningElement");
+            }
+            return errorType;
+        }
+        // DECLARATION AND STATEMENT TYPE CHECKING
+        function checkTypeParameter(node) {
+            // Grammar Checking
+            if (node.expression) {
+                grammarErrorOnFirstToken(node.expression, ts.Diagnostics.Type_expected);
+            }
+            checkSourceElement(node.constraint);
+            checkSourceElement(node.default);
+            var typeParameter = getDeclaredTypeOfTypeParameter(getSymbolOfNode(node));
+            if (!hasNonCircularBaseConstraint(typeParameter)) {
+                error(ts.getEffectiveConstraintOfTypeParameter(node), ts.Diagnostics.Type_parameter_0_has_a_circular_constraint, typeToString(typeParameter));
+            }
+            if (!hasNonCircularTypeParameterDefault(typeParameter)) {
+                error(node.default, ts.Diagnostics.Type_parameter_0_has_a_circular_default, typeToString(typeParameter));
+            }
+            var constraintType = getConstraintOfTypeParameter(typeParameter);
+            var defaultType = getDefaultFromTypeParameter(typeParameter);
+            if (constraintType && defaultType) {
+                checkTypeAssignableTo(defaultType, getTypeWithThisArgument(constraintType, defaultType), node.default, ts.Diagnostics.Type_0_does_not_satisfy_the_constraint_1);
+            }
+            if (produceDiagnostics) {
+                checkTypeNameIsReserved(node.name, ts.Diagnostics.Type_parameter_name_cannot_be_0);
+            }
+        }
+        function checkParameter(node) {
+            // Grammar checking
+            // It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs as the
+            // Identifier in a PropertySetParameterList of a PropertyAssignment that is contained in strict code
+            // or if its FunctionBody is strict code(11.1.5).
+            checkGrammarDecoratorsAndModifiers(node);
+            checkVariableLikeDeclaration(node);
+            var func = ts.getContainingFunction(node);
+            if (ts.hasModifier(node, 92 /* ParameterPropertyModifier */)) {
+                if (!(func.kind === 157 /* Constructor */ && ts.nodeIsPresent(func.body))) {
+                    error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
+                }
+            }
+            if (node.questionToken && ts.isBindingPattern(node.name) && func.body) {
+                error(node, ts.Diagnostics.A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature);
+            }
+            if (node.name && ts.isIdentifier(node.name) && (node.name.escapedText === "this" || node.name.escapedText === "new")) {
+                if (func.parameters.indexOf(node) !== 0) {
+                    error(node, ts.Diagnostics.A_0_parameter_must_be_the_first_parameter, node.name.escapedText);
+                }
+                if (func.kind === 157 /* Constructor */ || func.kind === 161 /* ConstructSignature */ || func.kind === 166 /* ConstructorType */) {
+                    error(node, ts.Diagnostics.A_constructor_cannot_have_a_this_parameter);
+                }
+                if (func.kind === 197 /* ArrowFunction */) {
+                    error(node, ts.Diagnostics.An_arrow_function_cannot_have_a_this_parameter);
+                }
+            }
+            // Only check rest parameter type if it's not a binding pattern. Since binding patterns are
+            // not allowed in a rest parameter, we already have an error from checkGrammarParameterList.
+            if (node.dotDotDotToken && !ts.isBindingPattern(node.name) && !isTypeAssignableTo(getTypeOfSymbol(node.symbol), anyArrayType)) {
+                error(node, ts.Diagnostics.A_rest_parameter_must_be_of_an_array_type);
+            }
+        }
+        function checkTypePredicate(node) {
+            var parent = getTypePredicateParent(node);
+            if (!parent) {
+                // The parent must not be valid.
+                error(node, ts.Diagnostics.A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods);
+                return;
+            }
+            var typePredicate = getTypePredicateOfSignature(getSignatureFromDeclaration(parent));
+            if (!typePredicate) {
+                return;
+            }
+            checkSourceElement(node.type);
+            var parameterName = node.parameterName;
+            if (ts.isThisTypePredicate(typePredicate)) {
+                getTypeFromThisTypeNode(parameterName);
+            }
+            else {
+                if (typePredicate.parameterIndex >= 0) {
+                    if (parent.parameters[typePredicate.parameterIndex].dotDotDotToken) {
+                        error(parameterName, ts.Diagnostics.A_type_predicate_cannot_reference_a_rest_parameter);
+                    }
+                    else {
+                        var leadingError = function () { return ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type); };
+                        checkTypeAssignableTo(typePredicate.type, getTypeOfNode(parent.parameters[typePredicate.parameterIndex]), node.type, 
+                        /*headMessage*/ undefined, leadingError);
+                    }
+                }
+                else if (parameterName) {
+                    var hasReportedError = false;
+                    for (var _i = 0, _a = parent.parameters; _i < _a.length; _i++) {
+                        var name = _a[_i].name;
+                        if (ts.isBindingPattern(name) &&
+                            checkIfTypePredicateVariableIsDeclaredInBindingPattern(name, parameterName, typePredicate.parameterName)) {
+                            hasReportedError = true;
+                            break;
+                        }
+                    }
+                    if (!hasReportedError) {
+                        error(node.parameterName, ts.Diagnostics.Cannot_find_parameter_0, typePredicate.parameterName);
+                    }
+                }
+            }
+        }
+        function getTypePredicateParent(node) {
+            switch (node.parent.kind) {
+                case 197 /* ArrowFunction */:
+                case 160 /* CallSignature */:
+                case 239 /* FunctionDeclaration */:
+                case 196 /* FunctionExpression */:
+                case 165 /* FunctionType */:
+                case 156 /* MethodDeclaration */:
+                case 155 /* MethodSignature */:
+                    var parent = node.parent;
+                    if (node === parent.type) {
+                        return parent;
+                    }
+            }
+        }
+        function checkIfTypePredicateVariableIsDeclaredInBindingPattern(pattern, predicateVariableNode, predicateVariableName) {
+            for (var _i = 0, _a = pattern.elements; _i < _a.length; _i++) {
+                var element = _a[_i];
+                if (ts.isOmittedExpression(element)) {
+                    continue;
+                }
+                var name = element.name;
+                if (name.kind === 72 /* Identifier */ && name.escapedText === predicateVariableName) {
+                    error(predicateVariableNode, ts.Diagnostics.A_type_predicate_cannot_reference_element_0_in_a_binding_pattern, predicateVariableName);
+                    return true;
+                }
+                else if (name.kind === 185 /* ArrayBindingPattern */ || name.kind === 184 /* ObjectBindingPattern */) {
+                    if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name, predicateVariableNode, predicateVariableName)) {
+                        return true;
+                    }
+                }
+            }
+        }
+        function checkSignatureDeclaration(node) {
+            // Grammar checking
+            if (node.kind === 162 /* IndexSignature */) {
+                checkGrammarIndexSignature(node);
+            }
+            // TODO (yuisu): Remove this check in else-if when SyntaxKind.Construct is moved and ambient context is handled
+            else if (node.kind === 165 /* FunctionType */ || node.kind === 239 /* FunctionDeclaration */ || node.kind === 166 /* ConstructorType */ ||
+                node.kind === 160 /* CallSignature */ || node.kind === 157 /* Constructor */ ||
+                node.kind === 161 /* ConstructSignature */) {
+                checkGrammarFunctionLikeDeclaration(node);
+            }
+            var functionFlags = ts.getFunctionFlags(node);
+            if (!(functionFlags & 4 /* Invalid */)) {
+                // Async generators prior to ESNext require the __await and __asyncGenerator helpers
+                if ((functionFlags & 3 /* AsyncGenerator */) === 3 /* AsyncGenerator */ && languageVersion < 6 /* ESNext */) {
+                    checkExternalEmitHelpers(node, 6144 /* AsyncGeneratorIncludes */);
+                }
+                // Async functions prior to ES2017 require the __awaiter helper
+                if ((functionFlags & 3 /* AsyncGenerator */) === 2 /* Async */ && languageVersion < 4 /* ES2017 */) {
+                    checkExternalEmitHelpers(node, 64 /* Awaiter */);
+                }
+                // Generator functions, Async functions, and Async Generator functions prior to
+                // ES2015 require the __generator helper
+                if ((functionFlags & 3 /* AsyncGenerator */) !== 0 /* Normal */ && languageVersion < 2 /* ES2015 */) {
+                    checkExternalEmitHelpers(node, 128 /* Generator */);
+                }
+            }
+            checkTypeParameters(node.typeParameters);
+            ts.forEach(node.parameters, checkParameter);
+            // TODO(rbuckton): Should we start checking JSDoc types?
+            if (node.type) {
+                checkSourceElement(node.type);
+            }
+            if (produceDiagnostics) {
+                checkCollisionWithArgumentsInGeneratedCode(node);
+                var returnTypeNode = ts.getEffectiveReturnTypeNode(node);
+                if (noImplicitAny && !returnTypeNode) {
+                    switch (node.kind) {
+                        case 161 /* ConstructSignature */:
+                            error(node, ts.Diagnostics.Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
+                            break;
+                        case 160 /* CallSignature */:
+                            error(node, ts.Diagnostics.Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
+                            break;
+                    }
+                }
+                if (returnTypeNode) {
+                    var functionFlags_1 = ts.getFunctionFlags(node);
+                    if ((functionFlags_1 & (4 /* Invalid */ | 1 /* Generator */)) === 1 /* Generator */) {
+                        var returnType = getTypeFromTypeNode(returnTypeNode);
+                        if (returnType === voidType) {
+                            error(returnTypeNode, ts.Diagnostics.A_generator_cannot_have_a_void_type_annotation);
+                        }
+                        else {
+                            var generatorElementType = getIteratedTypeOfGenerator(returnType, (functionFlags_1 & 2 /* Async */) !== 0) || anyType;
+                            var iterableIteratorInstantiation = functionFlags_1 & 2 /* Async */
+                                ? createAsyncIterableIteratorType(generatorElementType) // AsyncGenerator function
+                                : createIterableIteratorType(generatorElementType); // Generator function
+                            // Naively, one could check that IterableIterator<any> is assignable to the return type annotation.
+                            // However, that would not catch the error in the following case.
+                            //
+                            //    interface BadGenerator extends Iterable<number>, Iterator<string> { }
+                            //    function* g(): BadGenerator { } // Iterable and Iterator have different types!
+                            //
+                            checkTypeAssignableTo(iterableIteratorInstantiation, returnType, returnTypeNode);
+                        }
+                    }
+                    else if ((functionFlags_1 & 3 /* AsyncGenerator */) === 2 /* Async */) {
+                        checkAsyncFunctionReturnType(node, returnTypeNode);
+                    }
+                }
+                if (node.kind !== 162 /* IndexSignature */ && node.kind !== 289 /* JSDocFunctionType */) {
+                    registerForUnusedIdentifiersCheck(node);
+                }
+            }
+        }
+        function checkClassForDuplicateDeclarations(node) {
+            var Declaration;
+            (function (Declaration) {
+                Declaration[Declaration["Getter"] = 1] = "Getter";
+                Declaration[Declaration["Setter"] = 2] = "Setter";
+                Declaration[Declaration["Method"] = 4] = "Method";
+                Declaration[Declaration["Property"] = 3] = "Property";
+            })(Declaration || (Declaration = {}));
+            var instanceNames = ts.createUnderscoreEscapedMap();
+            var staticNames = ts.createUnderscoreEscapedMap();
+            for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
+                var member = _a[_i];
+                if (member.kind === 157 /* Constructor */) {
+                    for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
+                        var param = _c[_b];
+                        if (ts.isParameterPropertyDeclaration(param) && !ts.isBindingPattern(param.name)) {
+                            addName(instanceNames, param.name, param.name.escapedText, 3 /* Property */);
+                        }
+                    }
+                }
+                else {
+                    var isStatic = ts.hasModifier(member, 32 /* Static */);
+                    var names = isStatic ? staticNames : instanceNames;
+                    var name = member.name;
+                    var memberName = name && ts.getPropertyNameForPropertyNameNode(name);
+                    if (name && memberName) {
+                        switch (member.kind) {
+                            case 158 /* GetAccessor */:
+                                addName(names, name, memberName, 1 /* Getter */);
+                                break;
+                            case 159 /* SetAccessor */:
+                                addName(names, name, memberName, 2 /* Setter */);
+                                break;
+                            case 154 /* PropertyDeclaration */:
+                                addName(names, name, memberName, 3 /* Property */);
+                                break;
+                            case 156 /* MethodDeclaration */:
+                                addName(names, name, memberName, 4 /* Method */);
+                                break;
+                        }
+                    }
+                }
+            }
+            function addName(names, location, name, meaning) {
+                var prev = names.get(name);
+                if (prev) {
+                    if (prev & 4 /* Method */) {
+                        if (meaning !== 4 /* Method */) {
+                            error(location, ts.Diagnostics.Duplicate_identifier_0, ts.getTextOfNode(location));
+                        }
+                    }
+                    else if (prev & meaning) {
+                        error(location, ts.Diagnostics.Duplicate_identifier_0, ts.getTextOfNode(location));
+                    }
+                    else {
+                        names.set(name, prev | meaning);
+                    }
+                }
+                else {
+                    names.set(name, meaning);
+                }
+            }
+        }
+        /**
+         * Static members being set on a constructor function may conflict with built-in properties
+         * of Function. Esp. in ECMAScript 5 there are non-configurable and non-writable
+         * built-in properties. This check issues a transpile error when a class has a static
+         * member with the same name as a non-writable built-in property.
+         *
+         * @see http://www.ecma-international.org/ecma-262/5.1/#sec-15.3.3
+         * @see http://www.ecma-international.org/ecma-262/5.1/#sec-15.3.5
+         * @see http://www.ecma-international.org/ecma-262/6.0/#sec-properties-of-the-function-constructor
+         * @see http://www.ecma-international.org/ecma-262/6.0/#sec-function-instances
+         */
+        function checkClassForStaticPropertyNameConflicts(node) {
+            for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
+                var member = _a[_i];
+                var memberNameNode = member.name;
+                var isStatic = ts.hasModifier(member, 32 /* Static */);
+                if (isStatic && memberNameNode) {
+                    var memberName = ts.getPropertyNameForPropertyNameNode(memberNameNode);
+                    switch (memberName) {
+                        case "name":
+                        case "length":
+                        case "caller":
+                        case "arguments":
+                        case "prototype":
+                            var message = ts.Diagnostics.Static_property_0_conflicts_with_built_in_property_Function_0_of_constructor_function_1;
+                            var className = getNameOfSymbolAsWritten(getSymbolOfNode(node));
+                            error(memberNameNode, message, memberName, className);
+                            break;
+                    }
+                }
+            }
+        }
+        function checkObjectTypeForDuplicateDeclarations(node) {
+            var names = ts.createMap();
+            for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
+                var member = _a[_i];
+                if (member.kind === 153 /* PropertySignature */) {
+                    var memberName = void 0;
+                    var name = member.name;
+                    switch (name.kind) {
+                        case 10 /* StringLiteral */:
+                        case 8 /* NumericLiteral */:
+                            memberName = name.text;
+                            break;
+                        case 72 /* Identifier */:
+                            memberName = ts.idText(name);
+                            break;
+                        default:
+                            continue;
+                    }
+                    if (names.get(memberName)) {
+                        error(ts.getNameOfDeclaration(member.symbol.valueDeclaration), ts.Diagnostics.Duplicate_identifier_0, memberName);
+                        error(member.name, ts.Diagnostics.Duplicate_identifier_0, memberName);
+                    }
+                    else {
+                        names.set(memberName, true);
+                    }
+                }
+            }
+        }
+        function checkTypeForDuplicateIndexSignatures(node) {
+            if (node.kind === 241 /* InterfaceDeclaration */) {
+                var nodeSymbol = getSymbolOfNode(node);
+                // in case of merging interface declaration it is possible that we'll enter this check procedure several times for every declaration
+                // to prevent this run check only for the first declaration of a given kind
+                if (nodeSymbol.declarations.length > 0 && nodeSymbol.declarations[0] !== node) {
+                    return;
+                }
+            }
+            // TypeScript 1.0 spec (April 2014)
+            // 3.7.4: An object type can contain at most one string index signature and one numeric index signature.
+            // 8.5: A class declaration can have at most one string index member declaration and one numeric index member declaration
+            var indexSymbol = getIndexSymbol(getSymbolOfNode(node));
+            if (indexSymbol) {
+                var seenNumericIndexer = false;
+                var seenStringIndexer = false;
+                for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
+                    var decl = _a[_i];
+                    var declaration = decl;
+                    if (declaration.parameters.length === 1 && declaration.parameters[0].type) {
+                        switch (declaration.parameters[0].type.kind) {
+                            case 138 /* StringKeyword */:
+                                if (!seenStringIndexer) {
+                                    seenStringIndexer = true;
+                                }
+                                else {
+                                    error(declaration, ts.Diagnostics.Duplicate_string_index_signature);
+                                }
+                                break;
+                            case 135 /* NumberKeyword */:
+                                if (!seenNumericIndexer) {
+                                    seenNumericIndexer = true;
+                                }
+                                else {
+                                    error(declaration, ts.Diagnostics.Duplicate_number_index_signature);
+                                }
+                                break;
+                        }
+                    }
+                }
+            }
+        }
+        function checkPropertyDeclaration(node) {
+            // Grammar checking
+            if (!checkGrammarDecoratorsAndModifiers(node) && !checkGrammarProperty(node))
+                checkGrammarComputedPropertyName(node.name);
+            checkVariableLikeDeclaration(node);
+        }
+        function checkMethodDeclaration(node) {
+            // Grammar checking
+            if (!checkGrammarMethod(node))
+                checkGrammarComputedPropertyName(node.name);
+            // Grammar checking for modifiers is done inside the function checkGrammarFunctionLikeDeclaration
+            checkFunctionOrMethodDeclaration(node);
+            // Abstract methods cannot have an implementation.
+            // Extra checks are to avoid reporting multiple errors relating to the "abstractness" of the node.
+            if (ts.hasModifier(node, 128 /* Abstract */) && node.kind === 156 /* MethodDeclaration */ && node.body) {
+                error(node, ts.Diagnostics.Method_0_cannot_have_an_implementation_because_it_is_marked_abstract, ts.declarationNameToString(node.name));
+            }
+        }
+        function checkConstructorDeclaration(node) {
+            // Grammar check on signature of constructor and modifier of the constructor is done in checkSignatureDeclaration function.
+            checkSignatureDeclaration(node);
+            // Grammar check for checking only related to constructorDeclaration
+            if (!checkGrammarConstructorTypeParameters(node))
+                checkGrammarConstructorTypeAnnotation(node);
+            checkSourceElement(node.body);
+            var symbol = getSymbolOfNode(node);
+            var firstDeclaration = ts.getDeclarationOfKind(symbol, node.kind);
+            // Only type check the symbol once
+            if (node === firstDeclaration) {
+                checkFunctionOrConstructorSymbol(symbol);
+            }
+            // exit early in the case of signature - super checks are not relevant to them
+            if (ts.nodeIsMissing(node.body)) {
+                return;
+            }
+            if (!produceDiagnostics) {
+                return;
+            }
+            function isInstancePropertyWithInitializer(n) {
+                return n.kind === 154 /* PropertyDeclaration */ &&
+                    !ts.hasModifier(n, 32 /* Static */) &&
+                    !!n.initializer;
+            }
+            // TS 1.0 spec (April 2014): 8.3.2
+            // Constructors of classes with no extends clause may not contain super calls, whereas
+            // constructors of derived classes must contain at least one super call somewhere in their function body.
+            var containingClassDecl = node.parent;
+            if (ts.getClassExtendsHeritageElement(containingClassDecl)) {
+                captureLexicalThis(node.parent, containingClassDecl);
+                var classExtendsNull = classDeclarationExtendsNull(containingClassDecl);
+                var superCall = getSuperCallInConstructor(node);
+                if (superCall) {
+                    if (classExtendsNull) {
+                        error(superCall, ts.Diagnostics.A_constructor_cannot_contain_a_super_call_when_its_class_extends_null);
+                    }
+                    // The first statement in the body of a constructor (excluding prologue directives) must be a super call
+                    // if both of the following are true:
+                    // - The containing class is a derived class.
+                    // - The constructor declares parameter properties
+                    //   or the containing class declares instance member variables with initializers.
+                    var superCallShouldBeFirst = ts.some(node.parent.members, isInstancePropertyWithInitializer) ||
+                        ts.some(node.parameters, function (p) { return ts.hasModifier(p, 92 /* ParameterPropertyModifier */); });
+                    // Skip past any prologue directives to find the first statement
+                    // to ensure that it was a super call.
+                    if (superCallShouldBeFirst) {
+                        var statements = node.body.statements;
+                        var superCallStatement = void 0;
+                        for (var _i = 0, statements_2 = statements; _i < statements_2.length; _i++) {
+                            var statement = statements_2[_i];
+                            if (statement.kind === 221 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
+                                superCallStatement = statement;
+                                break;
+                            }
+                            if (!ts.isPrologueDirective(statement)) {
+                                break;
+                            }
+                        }
+                        if (!superCallStatement) {
+                            error(node, ts.Diagnostics.A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties);
+                        }
+                    }
+                }
+                else if (!classExtendsNull) {
+                    error(node, ts.Diagnostics.Constructors_for_derived_classes_must_contain_a_super_call);
+                }
+            }
+        }
+        function checkAccessorDeclaration(node) {
+            if (produceDiagnostics) {
+                // Grammar checking accessors
+                if (!checkGrammarFunctionLikeDeclaration(node) && !checkGrammarAccessor(node))
+                    checkGrammarComputedPropertyName(node.name);
+                checkDecorators(node);
+                checkSignatureDeclaration(node);
+                if (node.kind === 158 /* GetAccessor */) {
+                    if (!(node.flags & 4194304 /* Ambient */) && ts.nodeIsPresent(node.body) && (node.flags & 128 /* HasImplicitReturn */)) {
+                        if (!(node.flags & 256 /* HasExplicitReturn */)) {
+                            error(node.name, ts.Diagnostics.A_get_accessor_must_return_a_value);
+                        }
+                    }
+                }
+                // Do not use hasDynamicName here, because that returns false for well known symbols.
+                // We want to perform checkComputedPropertyName for all computed properties, including
+                // well known symbols.
+                if (node.name.kind === 149 /* ComputedPropertyName */) {
+                    checkComputedPropertyName(node.name);
+                }
+                if (!hasNonBindableDynamicName(node)) {
+                    // TypeScript 1.0 spec (April 2014): 8.4.3
+                    // Accessors for the same member name must specify the same accessibility.
+                    var otherKind = node.kind === 158 /* GetAccessor */ ? 159 /* SetAccessor */ : 158 /* GetAccessor */;
+                    var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(node), otherKind);
+                    if (otherAccessor) {
+                        var nodeFlags = ts.getModifierFlags(node);
+                        var otherFlags = ts.getModifierFlags(otherAccessor);
+                        if ((nodeFlags & 28 /* AccessibilityModifier */) !== (otherFlags & 28 /* AccessibilityModifier */)) {
+                            error(node.name, ts.Diagnostics.Getter_and_setter_accessors_do_not_agree_in_visibility);
+                        }
+                        if ((nodeFlags & 128 /* Abstract */) !== (otherFlags & 128 /* Abstract */)) {
+                            error(node.name, ts.Diagnostics.Accessors_must_both_be_abstract_or_non_abstract);
+                        }
+                        // TypeScript 1.0 spec (April 2014): 4.5
+                        // If both accessors include type annotations, the specified types must be identical.
+                        checkAccessorDeclarationTypesIdentical(node, otherAccessor, getAnnotatedAccessorType, ts.Diagnostics.get_and_set_accessor_must_have_the_same_type);
+                        checkAccessorDeclarationTypesIdentical(node, otherAccessor, getThisTypeOfDeclaration, ts.Diagnostics.get_and_set_accessor_must_have_the_same_this_type);
+                    }
+                }
+                var returnType = getTypeOfAccessors(getSymbolOfNode(node));
+                if (node.kind === 158 /* GetAccessor */) {
+                    checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType);
+                }
+            }
+            checkSourceElement(node.body);
+        }
+        function checkAccessorDeclarationTypesIdentical(first, second, getAnnotatedType, message) {
+            var firstType = getAnnotatedType(first);
+            var secondType = getAnnotatedType(second);
+            if (firstType && secondType && !isTypeIdenticalTo(firstType, secondType)) {
+                error(first, message);
+            }
+        }
+        function checkMissingDeclaration(node) {
+            checkDecorators(node);
+        }
+        function getEffectiveTypeArguments(node, typeParameters) {
+            return fillMissingTypeArguments(ts.map(node.typeArguments, getTypeFromTypeNode), typeParameters, getMinTypeArgumentCount(typeParameters), ts.isInJSFile(node));
+        }
+        function checkTypeArgumentConstraints(node, typeParameters) {
+            var typeArguments;
+            var mapper;
+            var result = true;
+            for (var i = 0; i < typeParameters.length; i++) {
+                var constraint = getConstraintOfTypeParameter(typeParameters[i]);
+                if (constraint) {
+                    if (!typeArguments) {
+                        typeArguments = getEffectiveTypeArguments(node, typeParameters);
+                        mapper = createTypeMapper(typeParameters, typeArguments);
+                    }
+                    result = result && checkTypeAssignableTo(typeArguments[i], instantiateType(constraint, mapper), node.typeArguments[i], ts.Diagnostics.Type_0_does_not_satisfy_the_constraint_1);
+                }
+            }
+            return result;
+        }
+        function getTypeParametersForTypeReference(node) {
+            var type = getTypeFromTypeReference(node);
+            if (type !== errorType) {
+                var symbol = getNodeLinks(node).resolvedSymbol;
+                if (symbol) {
+                    return symbol.flags & 524288 /* TypeAlias */ && getSymbolLinks(symbol).typeParameters ||
+                        (ts.getObjectFlags(type) & 4 /* Reference */ ? type.target.localTypeParameters : undefined);
+                }
+            }
+            return undefined;
+        }
+        function checkTypeReferenceNode(node) {
+            checkGrammarTypeArguments(node, node.typeArguments);
+            if (node.kind === 164 /* TypeReference */ && node.typeName.jsdocDotPos !== undefined && !ts.isInJSFile(node) && !ts.isInJSDoc(node)) {
+                grammarErrorAtPos(node, node.typeName.jsdocDotPos, 1, ts.Diagnostics.JSDoc_types_can_only_be_used_inside_documentation_comments);
+            }
+            var type = getTypeFromTypeReference(node);
+            if (type !== errorType) {
+                if (node.typeArguments) {
+                    // Do type argument local checks only if referenced type is successfully resolved
+                    ts.forEach(node.typeArguments, checkSourceElement);
+                    if (produceDiagnostics) {
+                        var typeParameters = getTypeParametersForTypeReference(node);
+                        if (typeParameters) {
+                            checkTypeArgumentConstraints(node, typeParameters);
+                        }
+                    }
+                }
+                if (type.flags & 32 /* Enum */ && getNodeLinks(node).resolvedSymbol.flags & 8 /* EnumMember */) {
+                    error(node, ts.Diagnostics.Enum_type_0_has_members_with_initializers_that_are_not_literals, typeToString(type));
+                }
+            }
+        }
+        function getTypeArgumentConstraint(node) {
+            var typeReferenceNode = ts.tryCast(node.parent, ts.isTypeReferenceType);
+            if (!typeReferenceNode)
+                return undefined;
+            var typeParameters = getTypeParametersForTypeReference(typeReferenceNode); // TODO: GH#18217
+            var constraint = getConstraintOfTypeParameter(typeParameters[typeReferenceNode.typeArguments.indexOf(node)]);
+            return constraint && instantiateType(constraint, createTypeMapper(typeParameters, getEffectiveTypeArguments(typeReferenceNode, typeParameters)));
+        }
+        function checkTypeQuery(node) {
+            getTypeFromTypeQueryNode(node);
+        }
+        function checkTypeLiteral(node) {
+            ts.forEach(node.members, checkSourceElement);
+            if (produceDiagnostics) {
+                var type = getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
+                checkIndexConstraints(type);
+                checkTypeForDuplicateIndexSignatures(node);
+                checkObjectTypeForDuplicateDeclarations(node);
+            }
+        }
+        function checkArrayType(node) {
+            checkSourceElement(node.elementType);
+        }
+        function checkTupleType(node) {
+            var elementTypes = node.elementTypes;
+            var seenOptionalElement = false;
+            for (var i = 0; i < elementTypes.length; i++) {
+                var e = elementTypes[i];
+                if (e.kind === 172 /* RestType */) {
+                    if (i !== elementTypes.length - 1) {
+                        grammarErrorOnNode(e, ts.Diagnostics.A_rest_element_must_be_last_in_a_tuple_type);
+                        break;
+                    }
+                    if (!isArrayType(getTypeFromTypeNode(e))) {
+                        error(e, ts.Diagnostics.A_rest_element_type_must_be_an_array_type);
+                    }
+                }
+                else if (e.kind === 171 /* OptionalType */) {
+                    seenOptionalElement = true;
+                }
+                else if (seenOptionalElement) {
+                    grammarErrorOnNode(e, ts.Diagnostics.A_required_element_cannot_follow_an_optional_element);
+                    break;
+                }
+            }
+            ts.forEach(node.elementTypes, checkSourceElement);
+        }
+        function checkUnionOrIntersectionType(node) {
+            ts.forEach(node.types, checkSourceElement);
+        }
+        function checkIndexedAccessIndexType(type, accessNode) {
+            if (!(type.flags & 8388608 /* IndexedAccess */)) {
+                return type;
+            }
+            // Check if the index type is assignable to 'keyof T' for the object type.
+            var objectType = type.objectType;
+            var indexType = type.indexType;
+            if (isTypeAssignableTo(indexType, getIndexType(objectType, /*stringsOnly*/ false))) {
+                if (accessNode.kind === 190 /* ElementAccessExpression */ && ts.isAssignmentTarget(accessNode) &&
+                    ts.getObjectFlags(objectType) & 32 /* Mapped */ && getMappedTypeModifiers(objectType) & 1 /* IncludeReadonly */) {
+                    error(accessNode, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
+                }
+                return type;
+            }
+            // Check if we're indexing with a numeric type and if either object or index types
+            // is a generic type with a constraint that has a numeric index signature.
+            if (getIndexInfoOfType(getApparentType(objectType), 1 /* Number */) && isTypeAssignableToKind(indexType, 296 /* NumberLike */)) {
+                return type;
+            }
+            error(accessNode, ts.Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(objectType));
+            return type;
+        }
+        function checkIndexedAccessType(node) {
+            checkSourceElement(node.objectType);
+            checkSourceElement(node.indexType);
+            checkIndexedAccessIndexType(getTypeFromIndexedAccessTypeNode(node), node);
+        }
+        function checkMappedType(node) {
+            checkSourceElement(node.typeParameter);
+            checkSourceElement(node.type);
+            if (!node.type) {
+                reportImplicitAny(node, anyType);
+            }
+            var type = getTypeFromMappedTypeNode(node);
+            var constraintType = getConstraintTypeFromMappedType(type);
+            checkTypeAssignableTo(constraintType, keyofConstraintType, ts.getEffectiveConstraintOfTypeParameter(node.typeParameter));
+        }
+        function checkThisType(node) {
+            getTypeFromThisTypeNode(node);
+        }
+        function checkTypeOperator(node) {
+            checkGrammarTypeOperatorNode(node);
+            checkSourceElement(node.type);
+        }
+        function checkConditionalType(node) {
+            ts.forEachChild(node, checkSourceElement);
+        }
+        function checkInferType(node) {
+            if (!ts.findAncestor(node, function (n) { return n.parent && n.parent.kind === 175 /* ConditionalType */ && n.parent.extendsType === n; })) {
+                grammarErrorOnNode(node, ts.Diagnostics.infer_declarations_are_only_permitted_in_the_extends_clause_of_a_conditional_type);
+            }
+            checkSourceElement(node.typeParameter);
+            registerForUnusedIdentifiersCheck(node);
+        }
+        function checkImportType(node) {
+            checkSourceElement(node.argument);
+            getTypeFromTypeNode(node);
+        }
+        function isPrivateWithinAmbient(node) {
+            return ts.hasModifier(node, 8 /* Private */) && !!(node.flags & 4194304 /* Ambient */);
+        }
+        function getEffectiveDeclarationFlags(n, flagsToCheck) {
+            var flags = ts.getCombinedModifierFlags(n);
+            // children of classes (even ambient classes) should not be marked as ambient or export
+            // because those flags have no useful semantics there.
+            if (n.parent.kind !== 241 /* InterfaceDeclaration */ &&
+                n.parent.kind !== 240 /* ClassDeclaration */ &&
+                n.parent.kind !== 209 /* ClassExpression */ &&
+                n.flags & 4194304 /* Ambient */) {
+                if (!(flags & 2 /* Ambient */) && !(ts.isModuleBlock(n.parent) && ts.isModuleDeclaration(n.parent.parent) && ts.isGlobalScopeAugmentation(n.parent.parent))) {
+                    // It is nested in an ambient context, which means it is automatically exported
+                    flags |= 1 /* Export */;
+                }
+                flags |= 2 /* Ambient */;
+            }
+            return flags & flagsToCheck;
+        }
+        function checkFunctionOrConstructorSymbol(symbol) {
+            if (!produceDiagnostics) {
+                return;
+            }
+            function getCanonicalOverload(overloads, implementation) {
+                // Consider the canonical set of flags to be the flags of the bodyDeclaration or the first declaration
+                // Error on all deviations from this canonical set of flags
+                // The caveat is that if some overloads are defined in lib.d.ts, we don't want to
+                // report the errors on those. To achieve this, we will say that the implementation is
+                // the canonical signature only if it is in the same container as the first overload
+                var implementationSharesContainerWithFirstOverload = implementation !== undefined && implementation.parent === overloads[0].parent;
+                return implementationSharesContainerWithFirstOverload ? implementation : overloads[0];
+            }
+            function checkFlagAgreementBetweenOverloads(overloads, implementation, flagsToCheck, someOverloadFlags, allOverloadFlags) {
+                // Error if some overloads have a flag that is not shared by all overloads. To find the
+                // deviations, we XOR someOverloadFlags with allOverloadFlags
+                var someButNotAllOverloadFlags = someOverloadFlags ^ allOverloadFlags;
+                if (someButNotAllOverloadFlags !== 0) {
+                    var canonicalFlags_1 = getEffectiveDeclarationFlags(getCanonicalOverload(overloads, implementation), flagsToCheck);
+                    ts.forEach(overloads, function (o) {
+                        var deviation = getEffectiveDeclarationFlags(o, flagsToCheck) ^ canonicalFlags_1;
+                        if (deviation & 1 /* Export */) {
+                            error(ts.getNameOfDeclaration(o), ts.Diagnostics.Overload_signatures_must_all_be_exported_or_non_exported);
+                        }
+                        else if (deviation & 2 /* Ambient */) {
+                            error(ts.getNameOfDeclaration(o), ts.Diagnostics.Overload_signatures_must_all_be_ambient_or_non_ambient);
+                        }
+                        else if (deviation & (8 /* Private */ | 16 /* Protected */)) {
+                            error(ts.getNameOfDeclaration(o) || o, ts.Diagnostics.Overload_signatures_must_all_be_public_private_or_protected);
+                        }
+                        else if (deviation & 128 /* Abstract */) {
+                            error(ts.getNameOfDeclaration(o), ts.Diagnostics.Overload_signatures_must_all_be_abstract_or_non_abstract);
+                        }
+                    });
+                }
+            }
+            function checkQuestionTokenAgreementBetweenOverloads(overloads, implementation, someHaveQuestionToken, allHaveQuestionToken) {
+                if (someHaveQuestionToken !== allHaveQuestionToken) {
+                    var canonicalHasQuestionToken_1 = ts.hasQuestionToken(getCanonicalOverload(overloads, implementation));
+                    ts.forEach(overloads, function (o) {
+                        var deviation = ts.hasQuestionToken(o) !== canonicalHasQuestionToken_1;
+                        if (deviation) {
+                            error(ts.getNameOfDeclaration(o), ts.Diagnostics.Overload_signatures_must_all_be_optional_or_required);
+                        }
+                    });
+                }
+            }
+            var flagsToCheck = 1 /* Export */ | 2 /* Ambient */ | 8 /* Private */ | 16 /* Protected */ | 128 /* Abstract */;
+            var someNodeFlags = 0 /* None */;
+            var allNodeFlags = flagsToCheck;
+            var someHaveQuestionToken = false;
+            var allHaveQuestionToken = true;
+            var hasOverloads = false;
+            var bodyDeclaration;
+            var lastSeenNonAmbientDeclaration;
+            var previousDeclaration;
+            var declarations = symbol.declarations;
+            var isConstructor = (symbol.flags & 16384 /* Constructor */) !== 0;
+            function reportImplementationExpectedError(node) {
+                if (node.name && ts.nodeIsMissing(node.name)) {
+                    return;
+                }
+                var seen = false;
+                var subsequentNode = ts.forEachChild(node.parent, function (c) {
+                    if (seen) {
+                        return c;
+                    }
+                    else {
+                        seen = c === node;
+                    }
+                });
+                // We may be here because of some extra nodes between overloads that could not be parsed into a valid node.
+                // In this case the subsequent node is not really consecutive (.pos !== node.end), and we must ignore it here.
+                if (subsequentNode && subsequentNode.pos === node.end) {
+                    if (subsequentNode.kind === node.kind) {
+                        var errorNode_1 = subsequentNode.name || subsequentNode;
+                        // TODO: GH#17345: These are methods, so handle computed name case. (`Always allowing computed property names is *not* the correct behavior!)
+                        var subsequentName = subsequentNode.name;
+                        if (node.name && subsequentName &&
+                            (ts.isComputedPropertyName(node.name) && ts.isComputedPropertyName(subsequentName) ||
+                                !ts.isComputedPropertyName(node.name) && !ts.isComputedPropertyName(subsequentName) && ts.getEscapedTextOfIdentifierOrLiteral(node.name) === ts.getEscapedTextOfIdentifierOrLiteral(subsequentName))) {
+                            var reportError = (node.kind === 156 /* MethodDeclaration */ || node.kind === 155 /* MethodSignature */) &&
+                                ts.hasModifier(node, 32 /* Static */) !== ts.hasModifier(subsequentNode, 32 /* Static */);
+                            // we can get here in two cases
+                            // 1. mixed static and instance class members
+                            // 2. something with the same name was defined before the set of overloads that prevents them from merging
+                            // here we'll report error only for the first case since for second we should already report error in binder
+                            if (reportError) {
+                                var diagnostic = ts.hasModifier(node, 32 /* Static */) ? ts.Diagnostics.Function_overload_must_be_static : ts.Diagnostics.Function_overload_must_not_be_static;
+                                error(errorNode_1, diagnostic);
+                            }
+                            return;
+                        }
+                        else if (ts.nodeIsPresent(subsequentNode.body)) {
+                            error(errorNode_1, ts.Diagnostics.Function_implementation_name_must_be_0, ts.declarationNameToString(node.name));
+                            return;
+                        }
+                    }
+                }
+                var errorNode = node.name || node;
+                if (isConstructor) {
+                    error(errorNode, ts.Diagnostics.Constructor_implementation_is_missing);
+                }
+                else {
+                    // Report different errors regarding non-consecutive blocks of declarations depending on whether
+                    // the node in question is abstract.
+                    if (ts.hasModifier(node, 128 /* Abstract */)) {
+                        error(errorNode, ts.Diagnostics.All_declarations_of_an_abstract_method_must_be_consecutive);
+                    }
+                    else {
+                        error(errorNode, ts.Diagnostics.Function_implementation_is_missing_or_not_immediately_following_the_declaration);
+                    }
+                }
+            }
+            var duplicateFunctionDeclaration = false;
+            var multipleConstructorImplementation = false;
+            for (var _i = 0, declarations_4 = declarations; _i < declarations_4.length; _i++) {
+                var current = declarations_4[_i];
+                var node = current;
+                var inAmbientContext = node.flags & 4194304 /* Ambient */;
+                var inAmbientContextOrInterface = node.parent.kind === 241 /* InterfaceDeclaration */ || node.parent.kind === 168 /* TypeLiteral */ || inAmbientContext;
+                if (inAmbientContextOrInterface) {
+                    // check if declarations are consecutive only if they are non-ambient
+                    // 1. ambient declarations can be interleaved
+                    // i.e. this is legal
+                    //     declare function foo();
+                    //     declare function bar();
+                    //     declare function foo();
+                    // 2. mixing ambient and non-ambient declarations is a separate error that will be reported - do not want to report an extra one
+                    previousDeclaration = undefined;
+                }
+                if (node.kind === 239 /* FunctionDeclaration */ || node.kind === 156 /* MethodDeclaration */ || node.kind === 155 /* MethodSignature */ || node.kind === 157 /* Constructor */) {
+                    var currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
+                    someNodeFlags |= currentNodeFlags;
+                    allNodeFlags &= currentNodeFlags;
+                    someHaveQuestionToken = someHaveQuestionToken || ts.hasQuestionToken(node);
+                    allHaveQuestionToken = allHaveQuestionToken && ts.hasQuestionToken(node);
+                    if (ts.nodeIsPresent(node.body) && bodyDeclaration) {
+                        if (isConstructor) {
+                            multipleConstructorImplementation = true;
+                        }
+                        else {
+                            duplicateFunctionDeclaration = true;
+                        }
+                    }
+                    else if (previousDeclaration && previousDeclaration.parent === node.parent && previousDeclaration.end !== node.pos) {
+                        reportImplementationExpectedError(previousDeclaration);
+                    }
+                    if (ts.nodeIsPresent(node.body)) {
+                        if (!bodyDeclaration) {
+                            bodyDeclaration = node;
+                        }
+                    }
+                    else {
+                        hasOverloads = true;
+                    }
+                    previousDeclaration = node;
+                    if (!inAmbientContextOrInterface) {
+                        lastSeenNonAmbientDeclaration = node;
+                    }
+                }
+            }
+            if (multipleConstructorImplementation) {
+                ts.forEach(declarations, function (declaration) {
+                    error(declaration, ts.Diagnostics.Multiple_constructor_implementations_are_not_allowed);
+                });
+            }
+            if (duplicateFunctionDeclaration) {
+                ts.forEach(declarations, function (declaration) {
+                    error(ts.getNameOfDeclaration(declaration), ts.Diagnostics.Duplicate_function_implementation);
+                });
+            }
+            // Abstract methods can't have an implementation -- in particular, they don't need one.
+            if (lastSeenNonAmbientDeclaration && !lastSeenNonAmbientDeclaration.body &&
+                !ts.hasModifier(lastSeenNonAmbientDeclaration, 128 /* Abstract */) && !lastSeenNonAmbientDeclaration.questionToken) {
+                reportImplementationExpectedError(lastSeenNonAmbientDeclaration);
+            }
+            if (hasOverloads) {
+                checkFlagAgreementBetweenOverloads(declarations, bodyDeclaration, flagsToCheck, someNodeFlags, allNodeFlags);
+                checkQuestionTokenAgreementBetweenOverloads(declarations, bodyDeclaration, someHaveQuestionToken, allHaveQuestionToken);
+                if (bodyDeclaration) {
+                    var signatures = getSignaturesOfSymbol(symbol);
+                    var bodySignature = getSignatureFromDeclaration(bodyDeclaration);
+                    for (var _a = 0, signatures_6 = signatures; _a < signatures_6.length; _a++) {
+                        var signature = signatures_6[_a];
+                        if (!isImplementationCompatibleWithOverload(bodySignature, signature)) {
+                            error(signature.declaration, ts.Diagnostics.Overload_signature_is_not_compatible_with_function_implementation);
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        var DeclarationSpaces;
+        (function (DeclarationSpaces) {
+            DeclarationSpaces[DeclarationSpaces["None"] = 0] = "None";
+            DeclarationSpaces[DeclarationSpaces["ExportValue"] = 1] = "ExportValue";
+            DeclarationSpaces[DeclarationSpaces["ExportType"] = 2] = "ExportType";
+            DeclarationSpaces[DeclarationSpaces["ExportNamespace"] = 4] = "ExportNamespace";
+        })(DeclarationSpaces || (DeclarationSpaces = {}));
+        function checkExportsOnMergedDeclarations(node) {
+            if (!produceDiagnostics) {
+                return;
+            }
+            // if localSymbol is defined on node then node itself is exported - check is required
+            var symbol = node.localSymbol;
+            if (!symbol) {
+                // local symbol is undefined => this declaration is non-exported.
+                // however symbol might contain other declarations that are exported
+                symbol = getSymbolOfNode(node);
+                if (!symbol.exportSymbol) {
+                    // this is a pure local symbol (all declarations are non-exported) - no need to check anything
+                    return;
+                }
+            }
+            // run the check only for the first declaration in the list
+            if (ts.getDeclarationOfKind(symbol, node.kind) !== node) {
+                return;
+            }
+            var exportedDeclarationSpaces = 0 /* None */;
+            var nonExportedDeclarationSpaces = 0 /* None */;
+            var defaultExportedDeclarationSpaces = 0 /* None */;
+            for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                var d = _a[_i];
+                var declarationSpaces = getDeclarationSpaces(d);
+                var effectiveDeclarationFlags = getEffectiveDeclarationFlags(d, 1 /* Export */ | 512 /* Default */);
+                if (effectiveDeclarationFlags & 1 /* Export */) {
+                    if (effectiveDeclarationFlags & 512 /* Default */) {
+                        defaultExportedDeclarationSpaces |= declarationSpaces;
+                    }
+                    else {
+                        exportedDeclarationSpaces |= declarationSpaces;
+                    }
+                }
+                else {
+                    nonExportedDeclarationSpaces |= declarationSpaces;
+                }
+            }
+            // Spaces for anything not declared a 'default export'.
+            var nonDefaultExportedDeclarationSpaces = exportedDeclarationSpaces | nonExportedDeclarationSpaces;
+            var commonDeclarationSpacesForExportsAndLocals = exportedDeclarationSpaces & nonExportedDeclarationSpaces;
+            var commonDeclarationSpacesForDefaultAndNonDefault = defaultExportedDeclarationSpaces & nonDefaultExportedDeclarationSpaces;
+            if (commonDeclarationSpacesForExportsAndLocals || commonDeclarationSpacesForDefaultAndNonDefault) {
+                // declaration spaces for exported and non-exported declarations intersect
+                for (var _b = 0, _c = symbol.declarations; _b < _c.length; _b++) {
+                    var d = _c[_b];
+                    var declarationSpaces = getDeclarationSpaces(d);
+                    var name = ts.getNameOfDeclaration(d);
+                    // Only error on the declarations that contributed to the intersecting spaces.
+                    if (declarationSpaces & commonDeclarationSpacesForDefaultAndNonDefault) {
+                        error(name, ts.Diagnostics.Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_default_0_declaration_instead, ts.declarationNameToString(name));
+                    }
+                    else if (declarationSpaces & commonDeclarationSpacesForExportsAndLocals) {
+                        error(name, ts.Diagnostics.Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local, ts.declarationNameToString(name));
+                    }
+                }
+            }
+            function getDeclarationSpaces(decl) {
+                var d = decl;
+                switch (d.kind) {
+                    case 241 /* InterfaceDeclaration */:
+                    case 242 /* TypeAliasDeclaration */:
+                    // A jsdoc typedef and callback are, by definition, type aliases
+                    case 304 /* JSDocTypedefTag */:
+                    case 297 /* JSDocCallbackTag */:
+                        return 2 /* ExportType */;
+                    case 244 /* ModuleDeclaration */:
+                        return ts.isAmbientModule(d) || ts.getModuleInstanceState(d) !== 0 /* NonInstantiated */
+                            ? 4 /* ExportNamespace */ | 1 /* ExportValue */
+                            : 4 /* ExportNamespace */;
+                    case 240 /* ClassDeclaration */:
+                    case 243 /* EnumDeclaration */:
+                        return 2 /* ExportType */ | 1 /* ExportValue */;
+                    case 279 /* SourceFile */:
+                        return 2 /* ExportType */ | 1 /* ExportValue */ | 4 /* ExportNamespace */;
+                    case 254 /* ExportAssignment */:
+                        // Export assigned entity name expressions act as aliases and should fall through, otherwise they export values
+                        if (!ts.isEntityNameExpression(d.expression)) {
+                            return 1 /* ExportValue */;
+                        }
+                        d = d.expression;
+                    /* falls through */
+                    // The below options all declare an Alias, which is allowed to merge with other values within the importing module
+                    case 248 /* ImportEqualsDeclaration */:
+                    case 251 /* NamespaceImport */:
+                    case 250 /* ImportClause */:
+                        var result_5 = 0 /* None */;
+                        var target = resolveAlias(getSymbolOfNode(d));
+                        ts.forEach(target.declarations, function (d) { result_5 |= getDeclarationSpaces(d); });
+                        return result_5;
+                    case 237 /* VariableDeclaration */:
+                    case 186 /* BindingElement */:
+                    case 239 /* FunctionDeclaration */:
+                    case 253 /* ImportSpecifier */: // https://github.com/Microsoft/TypeScript/pull/7591
+                        return 1 /* ExportValue */;
+                    default:
+                        return ts.Debug.fail(ts.Debug.showSyntaxKind(d));
+                }
+            }
+        }
+        function getAwaitedTypeOfPromise(type, errorNode, diagnosticMessage) {
+            var promisedType = getPromisedTypeOfPromise(type, errorNode);
+            return promisedType && getAwaitedType(promisedType, errorNode, diagnosticMessage);
+        }
+        /**
+         * Gets the "promised type" of a promise.
+         * @param type The type of the promise.
+         * @remarks The "promised type" of a type is the type of the "value" parameter of the "onfulfilled" callback.
+         */
+        function getPromisedTypeOfPromise(promise, errorNode) {
+            //
+            //  { // promise
+            //      then( // thenFunction
+            //          onfulfilled: ( // onfulfilledParameterType
+            //              value: T // valueParameterType
+            //          ) => any
+            //      ): any;
+            //  }
+            //
+            if (isTypeAny(promise)) {
+                return undefined;
+            }
+            var typeAsPromise = promise;
+            if (typeAsPromise.promisedTypeOfPromise) {
+                return typeAsPromise.promisedTypeOfPromise;
+            }
+            if (isReferenceToType(promise, getGlobalPromiseType(/*reportErrors*/ false))) {
+                return typeAsPromise.promisedTypeOfPromise = promise.typeArguments[0];
+            }
+            var thenFunction = getTypeOfPropertyOfType(promise, "then"); // TODO: GH#18217
+            if (isTypeAny(thenFunction)) {
+                return undefined;
+            }
+            var thenSignatures = thenFunction ? getSignaturesOfType(thenFunction, 0 /* Call */) : ts.emptyArray;
+            if (thenSignatures.length === 0) {
+                if (errorNode) {
+                    error(errorNode, ts.Diagnostics.A_promise_must_have_a_then_method);
+                }
+                return undefined;
+            }
+            var onfulfilledParameterType = getTypeWithFacts(getUnionType(ts.map(thenSignatures, getTypeOfFirstParameterOfSignature)), 2097152 /* NEUndefinedOrNull */);
+            if (isTypeAny(onfulfilledParameterType)) {
+                return undefined;
+            }
+            var onfulfilledParameterSignatures = getSignaturesOfType(onfulfilledParameterType, 0 /* Call */);
+            if (onfulfilledParameterSignatures.length === 0) {
+                if (errorNode) {
+                    error(errorNode, ts.Diagnostics.The_first_parameter_of_the_then_method_of_a_promise_must_be_a_callback);
+                }
+                return undefined;
+            }
+            return typeAsPromise.promisedTypeOfPromise = getUnionType(ts.map(onfulfilledParameterSignatures, getTypeOfFirstParameterOfSignature), 2 /* Subtype */);
+        }
+        /**
+         * Gets the "awaited type" of a type.
+         * @param type The type to await.
+         * @remarks The "awaited type" of an expression is its "promised type" if the expression is a
+         * Promise-like type; otherwise, it is the type of the expression. This is used to reflect
+         * The runtime behavior of the `await` keyword.
+         */
+        function checkAwaitedType(type, errorNode, diagnosticMessage) {
+            return getAwaitedType(type, errorNode, diagnosticMessage) || errorType;
+        }
+        function getAwaitedType(type, errorNode, diagnosticMessage) {
+            var typeAsAwaitable = type;
+            if (typeAsAwaitable.awaitedTypeOfType) {
+                return typeAsAwaitable.awaitedTypeOfType;
+            }
+            if (isTypeAny(type)) {
+                return typeAsAwaitable.awaitedTypeOfType = type;
+            }
+            if (type.flags & 1048576 /* Union */) {
+                var types = void 0;
+                for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                    var constituentType = _a[_i];
+                    types = ts.append(types, getAwaitedType(constituentType, errorNode, diagnosticMessage));
+                }
+                if (!types) {
+                    return undefined;
+                }
+                return typeAsAwaitable.awaitedTypeOfType = getUnionType(types);
+            }
+            var promisedType = getPromisedTypeOfPromise(type);
+            if (promisedType) {
+                if (type.id === promisedType.id || awaitedTypeStack.indexOf(promisedType.id) >= 0) {
+                    // Verify that we don't have a bad actor in the form of a promise whose
+                    // promised type is the same as the promise type, or a mutually recursive
+                    // promise. If so, we return undefined as we cannot guess the shape. If this
+                    // were the actual case in the JavaScript, this Promise would never resolve.
+                    //
+                    // An example of a bad actor with a singly-recursive promise type might
+                    // be:
+                    //
+                    //  interface BadPromise {
+                    //      then(
+                    //          onfulfilled: (value: BadPromise) => any,
+                    //          onrejected: (error: any) => any): BadPromise;
+                    //  }
+                    // The above interface will pass the PromiseLike check, and return a
+                    // promised type of `BadPromise`. Since this is a self reference, we
+                    // don't want to keep recursing ad infinitum.
+                    //
+                    // An example of a bad actor in the form of a mutually-recursive
+                    // promise type might be:
+                    //
+                    //  interface BadPromiseA {
+                    //      then(
+                    //          onfulfilled: (value: BadPromiseB) => any,
+                    //          onrejected: (error: any) => any): BadPromiseB;
+                    //  }
+                    //
+                    //  interface BadPromiseB {
+                    //      then(
+                    //          onfulfilled: (value: BadPromiseA) => any,
+                    //          onrejected: (error: any) => any): BadPromiseA;
+                    //  }
+                    //
+                    if (errorNode) {
+                        error(errorNode, ts.Diagnostics.Type_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method);
+                    }
+                    return undefined;
+                }
+                // Keep track of the type we're about to unwrap to avoid bad recursive promise types.
+                // See the comments above for more information.
+                awaitedTypeStack.push(type.id);
+                var awaitedType = getAwaitedType(promisedType, errorNode, diagnosticMessage);
+                awaitedTypeStack.pop();
+                if (!awaitedType) {
+                    return undefined;
+                }
+                return typeAsAwaitable.awaitedTypeOfType = awaitedType;
+            }
+            // The type was not a promise, so it could not be unwrapped any further.
+            // As long as the type does not have a callable "then" property, it is
+            // safe to return the type; otherwise, an error will be reported in
+            // the call to getNonThenableType and we will return undefined.
+            //
+            // An example of a non-promise "thenable" might be:
+            //
+            //  await { then(): void {} }
+            //
+            // The "thenable" does not match the minimal definition for a promise. When
+            // a Promise/A+-compatible or ES6 promise tries to adopt this value, the promise
+            // will never settle. We treat this as an error to help flag an early indicator
+            // of a runtime problem. If the user wants to return this value from an async
+            // function, they would need to wrap it in some other value. If they want it to
+            // be treated as a promise, they can cast to <any>.
+            var thenFunction = getTypeOfPropertyOfType(type, "then");
+            if (thenFunction && getSignaturesOfType(thenFunction, 0 /* Call */).length > 0) {
+                if (errorNode) {
+                    if (!diagnosticMessage)
+                        return ts.Debug.fail();
+                    error(errorNode, diagnosticMessage);
+                }
+                return undefined;
+            }
+            return typeAsAwaitable.awaitedTypeOfType = type;
+        }
+        /**
+         * Checks the return type of an async function to ensure it is a compatible
+         * Promise implementation.
+         *
+         * This checks that an async function has a valid Promise-compatible return type.
+         * An async function has a valid Promise-compatible return type if the resolved value
+         * of the return type has a construct signature that takes in an `initializer` function
+         * that in turn supplies a `resolve` function as one of its arguments and results in an
+         * object with a callable `then` signature.
+         *
+         * @param node The signature to check
+         */
+        function checkAsyncFunctionReturnType(node, returnTypeNode) {
+            // As part of our emit for an async function, we will need to emit the entity name of
+            // the return type annotation as an expression. To meet the necessary runtime semantics
+            // for __awaiter, we must also check that the type of the declaration (e.g. the static
+            // side or "constructor" of the promise type) is compatible `PromiseConstructorLike`.
+            //
+            // An example might be (from lib.es6.d.ts):
+            //
+            //  interface Promise<T> { ... }
+            //  interface PromiseConstructor {
+            //      new <T>(...): Promise<T>;
+            //  }
+            //  declare var Promise: PromiseConstructor;
+            //
+            // When an async function declares a return type annotation of `Promise<T>`, we
+            // need to get the type of the `Promise` variable declaration above, which would
+            // be `PromiseConstructor`.
+            //
+            // The same case applies to a class:
+            //
+            //  declare class Promise<T> {
+            //      constructor(...);
+            //      then<U>(...): Promise<U>;
+            //  }
+            //
+            var returnType = getTypeFromTypeNode(returnTypeNode);
+            if (languageVersion >= 2 /* ES2015 */) {
+                if (returnType === errorType) {
+                    return;
+                }
+                var globalPromiseType = getGlobalPromiseType(/*reportErrors*/ true);
+                if (globalPromiseType !== emptyGenericType && !isReferenceToType(returnType, globalPromiseType)) {
+                    // The promise type was not a valid type reference to the global promise type, so we
+                    // report an error and return the unknown type.
+                    error(returnTypeNode, ts.Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type);
+                    return;
+                }
+            }
+            else {
+                // Always mark the type node as referenced if it points to a value
+                markTypeNodeAsReferenced(returnTypeNode);
+                if (returnType === errorType) {
+                    return;
+                }
+                var promiseConstructorName = ts.getEntityNameFromTypeNode(returnTypeNode);
+                if (promiseConstructorName === undefined) {
+                    error(returnTypeNode, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, typeToString(returnType));
+                    return;
+                }
+                var promiseConstructorSymbol = resolveEntityName(promiseConstructorName, 67220415 /* Value */, /*ignoreErrors*/ true);
+                var promiseConstructorType = promiseConstructorSymbol ? getTypeOfSymbol(promiseConstructorSymbol) : errorType;
+                if (promiseConstructorType === errorType) {
+                    if (promiseConstructorName.kind === 72 /* Identifier */ && promiseConstructorName.escapedText === "Promise" && getTargetType(returnType) === getGlobalPromiseType(/*reportErrors*/ false)) {
+                        error(returnTypeNode, ts.Diagnostics.An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option);
+                    }
+                    else {
+                        error(returnTypeNode, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, ts.entityNameToString(promiseConstructorName));
+                    }
+                    return;
+                }
+                var globalPromiseConstructorLikeType = getGlobalPromiseConstructorLikeType(/*reportErrors*/ true);
+                if (globalPromiseConstructorLikeType === emptyObjectType) {
+                    // If we couldn't resolve the global PromiseConstructorLike type we cannot verify
+                    // compatibility with __awaiter.
+                    error(returnTypeNode, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, ts.entityNameToString(promiseConstructorName));
+                    return;
+                }
+                if (!checkTypeAssignableTo(promiseConstructorType, globalPromiseConstructorLikeType, returnTypeNode, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_SlashES3_because_it_does_not_refer_to_a_Promise_compatible_constructor_value)) {
+                    return;
+                }
+                // Verify there is no local declaration that could collide with the promise constructor.
+                var rootName = promiseConstructorName && getFirstIdentifier(promiseConstructorName);
+                var collidingSymbol = getSymbol(node.locals, rootName.escapedText, 67220415 /* Value */);
+                if (collidingSymbol) {
+                    error(collidingSymbol.valueDeclaration, ts.Diagnostics.Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions, ts.idText(rootName), ts.entityNameToString(promiseConstructorName));
+                    return;
+                }
+            }
+            checkAwaitedType(returnType, node, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
+        }
+        /** Check a decorator */
+        function checkDecorator(node) {
+            var signature = getResolvedSignature(node);
+            var returnType = getReturnTypeOfSignature(signature);
+            if (returnType.flags & 1 /* Any */) {
+                return;
+            }
+            var expectedReturnType;
+            var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
+            var errorInfo;
+            switch (node.parent.kind) {
+                case 240 /* ClassDeclaration */:
+                    var classSymbol = getSymbolOfNode(node.parent);
+                    var classConstructorType = getTypeOfSymbol(classSymbol);
+                    expectedReturnType = getUnionType([classConstructorType, voidType]);
+                    break;
+                case 151 /* Parameter */:
+                    expectedReturnType = voidType;
+                    errorInfo = ts.chainDiagnosticMessages(
+                    /*details*/ undefined, ts.Diagnostics.The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any);
+                    break;
+                case 154 /* PropertyDeclaration */:
+                    expectedReturnType = voidType;
+                    errorInfo = ts.chainDiagnosticMessages(
+                    /*details*/ undefined, ts.Diagnostics.The_return_type_of_a_property_decorator_function_must_be_either_void_or_any);
+                    break;
+                case 156 /* MethodDeclaration */:
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                    var methodType = getTypeOfNode(node.parent);
+                    var descriptorType = createTypedPropertyDescriptorType(methodType);
+                    expectedReturnType = getUnionType([descriptorType, voidType]);
+                    break;
+                default:
+                    return ts.Debug.fail();
+            }
+            checkTypeAssignableTo(returnType, expectedReturnType, node, headMessage, function () { return errorInfo; });
+        }
+        /**
+         * If a TypeNode can be resolved to a value symbol imported from an external module, it is
+         * marked as referenced to prevent import elision.
+         */
+        function markTypeNodeAsReferenced(node) {
+            markEntityNameOrEntityExpressionAsReference(node && ts.getEntityNameFromTypeNode(node));
+        }
+        function markEntityNameOrEntityExpressionAsReference(typeName) {
+            if (!typeName)
+                return;
+            var rootName = getFirstIdentifier(typeName);
+            var meaning = (typeName.kind === 72 /* Identifier */ ? 67897832 /* Type */ : 1920 /* Namespace */) | 2097152 /* Alias */;
+            var rootSymbol = resolveName(rootName, rootName.escapedText, meaning, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isRefernce*/ true);
+            if (rootSymbol
+                && rootSymbol.flags & 2097152 /* Alias */
+                && symbolIsValue(rootSymbol)
+                && !isConstEnumOrConstEnumOnlyModule(resolveAlias(rootSymbol))) {
+                markAliasSymbolAsReferenced(rootSymbol);
+            }
+        }
+        /**
+         * This function marks the type used for metadata decorator as referenced if it is import
+         * from external module.
+         * This is different from markTypeNodeAsReferenced because it tries to simplify type nodes in
+         * union and intersection type
+         * @param node
+         */
+        function markDecoratorMedataDataTypeNodeAsReferenced(node) {
+            var entityName = getEntityNameForDecoratorMetadata(node);
+            if (entityName && ts.isEntityName(entityName)) {
+                markEntityNameOrEntityExpressionAsReference(entityName);
+            }
+        }
+        function getEntityNameForDecoratorMetadata(node) {
+            if (node) {
+                switch (node.kind) {
+                    case 174 /* IntersectionType */:
+                    case 173 /* UnionType */:
+                        return getEntityNameForDecoratorMetadataFromTypeList(node.types);
+                    case 175 /* ConditionalType */:
+                        return getEntityNameForDecoratorMetadataFromTypeList([node.trueType, node.falseType]);
+                    case 177 /* ParenthesizedType */:
+                        return getEntityNameForDecoratorMetadata(node.type);
+                    case 164 /* TypeReference */:
+                        return node.typeName;
+                }
+            }
+        }
+        function getEntityNameForDecoratorMetadataFromTypeList(types) {
+            var commonEntityName;
+            for (var _i = 0, types_16 = types; _i < types_16.length; _i++) {
+                var typeNode = types_16[_i];
+                while (typeNode.kind === 177 /* ParenthesizedType */) {
+                    typeNode = typeNode.type; // Skip parens if need be
+                }
+                if (typeNode.kind === 132 /* NeverKeyword */) {
+                    continue; // Always elide `never` from the union/intersection if possible
+                }
+                if (!strictNullChecks && (typeNode.kind === 96 /* NullKeyword */ || typeNode.kind === 141 /* UndefinedKeyword */)) {
+                    continue; // Elide null and undefined from unions for metadata, just like what we did prior to the implementation of strict null checks
+                }
+                var individualEntityName = getEntityNameForDecoratorMetadata(typeNode);
+                if (!individualEntityName) {
+                    // Individual is something like string number
+                    // So it would be serialized to either that type or object
+                    // Safe to return here
+                    return undefined;
+                }
+                if (commonEntityName) {
+                    // Note this is in sync with the transformation that happens for type node.
+                    // Keep this in sync with serializeUnionOrIntersectionType
+                    // Verify if they refer to same entity and is identifier
+                    // return undefined if they dont match because we would emit object
+                    if (!ts.isIdentifier(commonEntityName) ||
+                        !ts.isIdentifier(individualEntityName) ||
+                        commonEntityName.escapedText !== individualEntityName.escapedText) {
+                        return undefined;
+                    }
+                }
+                else {
+                    commonEntityName = individualEntityName;
+                }
+            }
+            return commonEntityName;
+        }
+        function getParameterTypeNodeForDecoratorCheck(node) {
+            var typeNode = ts.getEffectiveTypeAnnotationNode(node);
+            return ts.isRestParameter(node) ? ts.getRestParameterElementType(typeNode) : typeNode;
+        }
+        /** Check the decorators of a node */
+        function checkDecorators(node) {
+            if (!node.decorators) {
+                return;
+            }
+            // skip this check for nodes that cannot have decorators. These should have already had an error reported by
+            // checkGrammarDecorators.
+            if (!ts.nodeCanBeDecorated(node, node.parent, node.parent.parent)) {
+                return;
+            }
+            if (!compilerOptions.experimentalDecorators) {
+                error(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning);
+            }
+            var firstDecorator = node.decorators[0];
+            checkExternalEmitHelpers(firstDecorator, 8 /* Decorate */);
+            if (node.kind === 151 /* Parameter */) {
+                checkExternalEmitHelpers(firstDecorator, 32 /* Param */);
+            }
+            if (compilerOptions.emitDecoratorMetadata) {
+                checkExternalEmitHelpers(firstDecorator, 16 /* Metadata */);
+                // we only need to perform these checks if we are emitting serialized type metadata for the target of a decorator.
+                switch (node.kind) {
+                    case 240 /* ClassDeclaration */:
+                        var constructor = ts.getFirstConstructorWithBody(node);
+                        if (constructor) {
+                            for (var _i = 0, _a = constructor.parameters; _i < _a.length; _i++) {
+                                var parameter = _a[_i];
+                                markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(parameter));
+                            }
+                        }
+                        break;
+                    case 158 /* GetAccessor */:
+                    case 159 /* SetAccessor */:
+                        var otherKind = node.kind === 158 /* GetAccessor */ ? 159 /* SetAccessor */ : 158 /* GetAccessor */;
+                        var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(node), otherKind);
+                        markDecoratorMedataDataTypeNodeAsReferenced(getAnnotatedAccessorTypeNode(node) || otherAccessor && getAnnotatedAccessorTypeNode(otherAccessor));
+                        break;
+                    case 156 /* MethodDeclaration */:
+                        for (var _b = 0, _c = node.parameters; _b < _c.length; _b++) {
+                            var parameter = _c[_b];
+                            markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(parameter));
+                        }
+                        markDecoratorMedataDataTypeNodeAsReferenced(ts.getEffectiveReturnTypeNode(node));
+                        break;
+                    case 154 /* PropertyDeclaration */:
+                        markDecoratorMedataDataTypeNodeAsReferenced(ts.getEffectiveTypeAnnotationNode(node));
+                        break;
+                    case 151 /* Parameter */:
+                        markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(node));
+                        var containingSignature = node.parent;
+                        for (var _d = 0, _e = containingSignature.parameters; _d < _e.length; _d++) {
+                            var parameter = _e[_d];
+                            markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(parameter));
+                        }
+                        break;
+                }
+            }
+            ts.forEach(node.decorators, checkDecorator);
+        }
+        function checkFunctionDeclaration(node) {
+            if (produceDiagnostics) {
+                checkFunctionOrMethodDeclaration(node);
+                checkGrammarForGenerator(node);
+                checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+                checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
+            }
+        }
+        function checkJSDocTypeAliasTag(node) {
+            if (!node.typeExpression) {
+                // If the node had `@property` tags, `typeExpression` would have been set to the first property tag.
+                error(node.name, ts.Diagnostics.JSDoc_typedef_tag_should_either_have_a_type_annotation_or_be_followed_by_property_or_member_tags);
+            }
+            if (node.name) {
+                checkTypeNameIsReserved(node.name, ts.Diagnostics.Type_alias_name_cannot_be_0);
+            }
+            checkSourceElement(node.typeExpression);
+        }
+        function checkJSDocTemplateTag(node) {
+            checkSourceElement(node.constraint);
+            for (var _i = 0, _a = node.typeParameters; _i < _a.length; _i++) {
+                var tp = _a[_i];
+                checkSourceElement(tp);
+            }
+        }
+        function checkJSDocTypeTag(node) {
+            checkSourceElement(node.typeExpression);
+        }
+        function checkJSDocParameterTag(node) {
+            checkSourceElement(node.typeExpression);
+            if (!ts.getParameterSymbolFromJSDoc(node)) {
+                var decl = ts.getHostSignatureFromJSDoc(node);
+                // don't issue an error for invalid hosts -- just functions --
+                // and give a better error message when the host function mentions `arguments`
+                // but the tag doesn't have an array type
+                if (decl) {
+                    var i = ts.getJSDocTags(decl).filter(ts.isJSDocParameterTag).indexOf(node);
+                    if (i > -1 && i < decl.parameters.length && ts.isBindingPattern(decl.parameters[i].name)) {
+                        return;
+                    }
+                    if (!containsArgumentsReference(decl)) {
+                        if (ts.isQualifiedName(node.name)) {
+                            error(node.name, ts.Diagnostics.Qualified_name_0_is_not_allowed_without_a_leading_param_object_1, ts.entityNameToString(node.name), ts.entityNameToString(node.name.left));
+                        }
+                        else {
+                            error(node.name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name, ts.idText(node.name));
+                        }
+                    }
+                    else if (ts.findLast(ts.getJSDocTags(decl), ts.isJSDocParameterTag) === node &&
+                        node.typeExpression && node.typeExpression.type &&
+                        !isArrayType(getTypeFromTypeNode(node.typeExpression.type))) {
+                        error(node.name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_It_would_match_arguments_if_it_had_an_array_type, ts.idText(node.name.kind === 148 /* QualifiedName */ ? node.name.right : node.name));
+                    }
+                }
+            }
+        }
+        function checkJSDocFunctionType(node) {
+            if (produceDiagnostics && !node.type && !ts.isJSDocConstructSignature(node)) {
+                reportImplicitAny(node, anyType);
+            }
+            checkSignatureDeclaration(node);
+        }
+        function checkJSDocAugmentsTag(node) {
+            var classLike = ts.getJSDocHost(node);
+            if (!ts.isClassDeclaration(classLike) && !ts.isClassExpression(classLike)) {
+                error(classLike, ts.Diagnostics.JSDoc_0_is_not_attached_to_a_class, ts.idText(node.tagName));
+                return;
+            }
+            var augmentsTags = ts.getJSDocTags(classLike).filter(ts.isJSDocAugmentsTag);
+            ts.Debug.assert(augmentsTags.length > 0);
+            if (augmentsTags.length > 1) {
+                error(augmentsTags[1], ts.Diagnostics.Class_declarations_cannot_have_more_than_one_augments_or_extends_tag);
+            }
+            var name = getIdentifierFromEntityNameExpression(node.class.expression);
+            var extend = ts.getClassExtendsHeritageElement(classLike);
+            if (extend) {
+                var className = getIdentifierFromEntityNameExpression(extend.expression);
+                if (className && name.escapedText !== className.escapedText) {
+                    error(name, ts.Diagnostics.JSDoc_0_1_does_not_match_the_extends_2_clause, ts.idText(node.tagName), ts.idText(name), ts.idText(className));
+                }
+            }
+        }
+        function getIdentifierFromEntityNameExpression(node) {
+            switch (node.kind) {
+                case 72 /* Identifier */:
+                    return node;
+                case 189 /* PropertyAccessExpression */:
+                    return node.name;
+                default:
+                    return undefined;
+            }
+        }
+        function checkFunctionOrMethodDeclaration(node) {
+            checkDecorators(node);
+            checkSignatureDeclaration(node);
+            var functionFlags = ts.getFunctionFlags(node);
+            // Do not use hasDynamicName here, because that returns false for well known symbols.
+            // We want to perform checkComputedPropertyName for all computed properties, including
+            // well known symbols.
+            if (node.name && node.name.kind === 149 /* ComputedPropertyName */) {
+                // This check will account for methods in class/interface declarations,
+                // as well as accessors in classes/object literals
+                checkComputedPropertyName(node.name);
+            }
+            if (!hasNonBindableDynamicName(node)) {
+                // first we want to check the local symbol that contain this declaration
+                // - if node.localSymbol !== undefined - this is current declaration is exported and localSymbol points to the local symbol
+                // - if node.localSymbol === undefined - this node is non-exported so we can just pick the result of getSymbolOfNode
+                var symbol = getSymbolOfNode(node);
+                var localSymbol = node.localSymbol || symbol;
+                // Since the javascript won't do semantic analysis like typescript,
+                // if the javascript file comes before the typescript file and both contain same name functions,
+                // checkFunctionOrConstructorSymbol wouldn't be called if we didnt ignore javascript function.
+                var firstDeclaration = ts.find(localSymbol.declarations, 
+                // Get first non javascript function declaration
+                function (declaration) { return declaration.kind === node.kind && !(declaration.flags & 65536 /* JavaScriptFile */); });
+                // Only type check the symbol once
+                if (node === firstDeclaration) {
+                    checkFunctionOrConstructorSymbol(localSymbol);
+                }
+                if (symbol.parent) {
+                    // run check once for the first declaration
+                    if (ts.getDeclarationOfKind(symbol, node.kind) === node) {
+                        // run check on export symbol to check that modifiers agree across all exported declarations
+                        checkFunctionOrConstructorSymbol(symbol);
+                    }
+                }
+            }
+            var body = node.kind === 155 /* MethodSignature */ ? undefined : node.body;
+            checkSourceElement(body);
+            if ((functionFlags & 1 /* Generator */) === 0) { // Async function or normal function
+                var returnOrPromisedType = getReturnOrPromisedType(node, functionFlags);
+                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnOrPromisedType);
+            }
+            if (produceDiagnostics && !ts.getEffectiveReturnTypeNode(node)) {
+                // Report an implicit any error if there is no body, no explicit return type, and node is not a private method
+                // in an ambient context
+                if (ts.nodeIsMissing(body) && !isPrivateWithinAmbient(node)) {
+                    reportImplicitAny(node, anyType);
+                }
+                if (functionFlags & 1 /* Generator */ && ts.nodeIsPresent(body)) {
+                    // A generator with a body and no type annotation can still cause errors. It can error if the
+                    // yielded values have no common supertype, or it can give an implicit any error if it has no
+                    // yielded values. The only way to trigger these errors is to try checking its return type.
+                    getReturnTypeOfSignature(getSignatureFromDeclaration(node));
+                }
+            }
+            // A js function declaration can have a @type tag instead of a return type node, but that type must have a call signature
+            if (ts.isInJSFile(node)) {
+                var typeTag = ts.getJSDocTypeTag(node);
+                if (typeTag && typeTag.typeExpression && !getContextualCallSignature(getTypeFromTypeNode(typeTag.typeExpression), node)) {
+                    error(typeTag, ts.Diagnostics.The_type_of_a_function_declaration_must_match_the_function_s_signature);
+                }
+            }
+        }
+        function registerForUnusedIdentifiersCheck(node) {
+            // May be in a call such as getTypeOfNode that happened to call this. But potentiallyUnusedIdentifiers is only defined in the scope of `checkSourceFile`.
+            if (produceDiagnostics && !(node.flags & 4194304 /* Ambient */)) {
+                var sourceFile = ts.getSourceFileOfNode(node);
+                var potentiallyUnusedIdentifiers = allPotentiallyUnusedIdentifiers.get(sourceFile.path);
+                if (!potentiallyUnusedIdentifiers) {
+                    potentiallyUnusedIdentifiers = [];
+                    allPotentiallyUnusedIdentifiers.set(sourceFile.path, potentiallyUnusedIdentifiers);
+                }
+                // TODO: GH#22580
+                // Debug.assert(addToSeen(seenPotentiallyUnusedIdentifiers, getNodeId(node)), "Adding potentially-unused identifier twice");
+                potentiallyUnusedIdentifiers.push(node);
+            }
+        }
+        function checkUnusedIdentifiers(potentiallyUnusedIdentifiers, addDiagnostic) {
+            for (var _i = 0, potentiallyUnusedIdentifiers_1 = potentiallyUnusedIdentifiers; _i < potentiallyUnusedIdentifiers_1.length; _i++) {
+                var node = potentiallyUnusedIdentifiers_1[_i];
+                switch (node.kind) {
+                    case 240 /* ClassDeclaration */:
+                    case 209 /* ClassExpression */:
+                        checkUnusedClassMembers(node, addDiagnostic);
+                        checkUnusedTypeParameters(node, addDiagnostic);
+                        break;
+                    case 279 /* SourceFile */:
+                    case 244 /* ModuleDeclaration */:
+                    case 218 /* Block */:
+                    case 246 /* CaseBlock */:
+                    case 225 /* ForStatement */:
+                    case 226 /* ForInStatement */:
+                    case 227 /* ForOfStatement */:
+                        checkUnusedLocalsAndParameters(node, addDiagnostic);
+                        break;
+                    case 157 /* Constructor */:
+                    case 196 /* FunctionExpression */:
+                    case 239 /* FunctionDeclaration */:
+                    case 197 /* ArrowFunction */:
+                    case 156 /* MethodDeclaration */:
+                    case 158 /* GetAccessor */:
+                    case 159 /* SetAccessor */:
+                        if (node.body) { // Don't report unused parameters in overloads
+                            checkUnusedLocalsAndParameters(node, addDiagnostic);
+                        }
+                        checkUnusedTypeParameters(node, addDiagnostic);
+                        break;
+                    case 155 /* MethodSignature */:
+                    case 160 /* CallSignature */:
+                    case 161 /* ConstructSignature */:
+                    case 165 /* FunctionType */:
+                    case 166 /* ConstructorType */:
+                    case 242 /* TypeAliasDeclaration */:
+                    case 241 /* InterfaceDeclaration */:
+                        checkUnusedTypeParameters(node, addDiagnostic);
+                        break;
+                    case 176 /* InferType */:
+                        checkUnusedInferTypeParameter(node, addDiagnostic);
+                        break;
+                    default:
+                        ts.Debug.assertNever(node, "Node should not have been registered for unused identifiers check");
+                }
+            }
+        }
+        function errorUnusedLocal(declaration, name, addDiagnostic) {
+            var node = ts.getNameOfDeclaration(declaration) || declaration;
+            var message = isTypeDeclaration(declaration) ? ts.Diagnostics._0_is_declared_but_never_used : ts.Diagnostics._0_is_declared_but_its_value_is_never_read;
+            addDiagnostic(declaration, 0 /* Local */, ts.createDiagnosticForNode(node, message, name));
+        }
+        function isIdentifierThatStartsWithUnderscore(node) {
+            return ts.isIdentifier(node) && ts.idText(node).charCodeAt(0) === 95 /* _ */;
+        }
+        function checkUnusedClassMembers(node, addDiagnostic) {
+            for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
+                var member = _a[_i];
+                switch (member.kind) {
+                    case 156 /* MethodDeclaration */:
+                    case 154 /* PropertyDeclaration */:
+                    case 158 /* GetAccessor */:
+                    case 159 /* SetAccessor */:
+                        if (member.kind === 159 /* SetAccessor */ && member.symbol.flags & 32768 /* GetAccessor */) {
+                            // Already would have reported an error on the getter.
+                            break;
+                        }
+                        var symbol = getSymbolOfNode(member);
+                        if (!symbol.isReferenced && ts.hasModifier(member, 8 /* Private */)) {
+                            addDiagnostic(member, 0 /* Local */, ts.createDiagnosticForNode(member.name, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, symbolToString(symbol)));
+                        }
+                        break;
+                    case 157 /* Constructor */:
+                        for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
+                            var parameter = _c[_b];
+                            if (!parameter.symbol.isReferenced && ts.hasModifier(parameter, 8 /* Private */)) {
+                                addDiagnostic(parameter, 0 /* Local */, ts.createDiagnosticForNode(parameter.name, ts.Diagnostics.Property_0_is_declared_but_its_value_is_never_read, ts.symbolName(parameter.symbol)));
+                            }
+                        }
+                        break;
+                    case 162 /* IndexSignature */:
+                    case 217 /* SemicolonClassElement */:
+                        // Can't be private
+                        break;
+                    default:
+                        ts.Debug.fail();
+                }
+            }
+        }
+        function checkUnusedInferTypeParameter(node, addDiagnostic) {
+            var typeParameter = node.typeParameter;
+            if (isTypeParameterUnused(typeParameter)) {
+                addDiagnostic(node, 1 /* Parameter */, ts.createDiagnosticForNode(node, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, ts.idText(typeParameter.name)));
+            }
+        }
+        function checkUnusedTypeParameters(node, addDiagnostic) {
+            // Only report errors on the last declaration for the type parameter container;
+            // this ensures that all uses have been accounted for.
+            if (ts.last(getSymbolOfNode(node).declarations) !== node)
+                return;
+            var typeParameters = ts.getEffectiveTypeParameterDeclarations(node);
+            var seenParentsWithEveryUnused = new ts.NodeSet();
+            for (var _i = 0, typeParameters_2 = typeParameters; _i < typeParameters_2.length; _i++) {
+                var typeParameter = typeParameters_2[_i];
+                if (!isTypeParameterUnused(typeParameter))
+                    continue;
+                var name = ts.idText(typeParameter.name);
+                var parent = typeParameter.parent;
+                if (parent.kind !== 176 /* InferType */ && parent.typeParameters.every(isTypeParameterUnused)) {
+                    if (seenParentsWithEveryUnused.tryAdd(parent)) {
+                        var range = ts.isJSDocTemplateTag(parent)
+                            // Whole @template tag
+                            ? ts.rangeOfNode(parent)
+                            // Include the `<>` in the error message
+                            : ts.rangeOfTypeParameters(parent.typeParameters);
+                        var only = typeParameters.length === 1;
+                        var message = only ? ts.Diagnostics._0_is_declared_but_its_value_is_never_read : ts.Diagnostics.All_type_parameters_are_unused;
+                        var arg0 = only ? name : undefined;
+                        addDiagnostic(typeParameter, 1 /* Parameter */, ts.createFileDiagnostic(ts.getSourceFileOfNode(parent), range.pos, range.end - range.pos, message, arg0));
+                    }
+                }
+                else {
+                    addDiagnostic(typeParameter, 1 /* Parameter */, ts.createDiagnosticForNode(typeParameter, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, name));
+                }
+            }
+        }
+        function isTypeParameterUnused(typeParameter) {
+            return !(getMergedSymbol(typeParameter.symbol).isReferenced & 262144 /* TypeParameter */) && !isIdentifierThatStartsWithUnderscore(typeParameter.name);
+        }
+        function addToGroup(map, key, value, getKey) {
+            var keyString = String(getKey(key));
+            var group = map.get(keyString);
+            if (group) {
+                group[1].push(value);
+            }
+            else {
+                map.set(keyString, [key, [value]]);
+            }
+        }
+        function tryGetRootParameterDeclaration(node) {
+            return ts.tryCast(ts.getRootDeclaration(node), ts.isParameter);
+        }
+        function checkUnusedLocalsAndParameters(nodeWithLocals, addDiagnostic) {
+            if (nodeWithLocals.flags & 4194304 /* Ambient */)
+                return;
+            // Ideally we could use the ImportClause directly as a key, but must wait until we have full ES6 maps. So must store key along with value.
+            var unusedImports = ts.createMap();
+            var unusedDestructures = ts.createMap();
+            var unusedVariables = ts.createMap();
+            nodeWithLocals.locals.forEach(function (local) {
+                // If it's purely a type parameter, ignore, will be checked in `checkUnusedTypeParameters`.
+                // If it's a type parameter merged with a parameter, check if the parameter-side is used.
+                if (local.flags & 262144 /* TypeParameter */ ? !(local.flags & 3 /* Variable */ && !(local.isReferenced & 3 /* Variable */)) : local.isReferenced || local.exportSymbol) {
+                    return;
+                }
+                for (var _i = 0, _a = local.declarations; _i < _a.length; _i++) {
+                    var declaration = _a[_i];
+                    if (ts.isAmbientModule(declaration) ||
+                        (ts.isVariableDeclaration(declaration) && ts.isForInOrOfStatement(declaration.parent.parent) || isImportedDeclaration(declaration)) && isIdentifierThatStartsWithUnderscore(declaration.name)) {
+                        continue;
+                    }
+                    if (isImportedDeclaration(declaration)) {
+                        addToGroup(unusedImports, importClauseFromImported(declaration), declaration, getNodeId);
+                    }
+                    else if (ts.isBindingElement(declaration) && ts.isObjectBindingPattern(declaration.parent)) {
+                        // In `{ a, ...b }, `a` is considered used since it removes a property from `b`. `b` may still be unused though.
+                        var lastElement = ts.last(declaration.parent.elements);
+                        if (declaration === lastElement || !ts.last(declaration.parent.elements).dotDotDotToken) {
+                            addToGroup(unusedDestructures, declaration.parent, declaration, getNodeId);
+                        }
+                    }
+                    else if (ts.isVariableDeclaration(declaration)) {
+                        addToGroup(unusedVariables, declaration.parent, declaration, getNodeId);
+                    }
+                    else {
+                        var parameter = local.valueDeclaration && tryGetRootParameterDeclaration(local.valueDeclaration);
+                        var name = local.valueDeclaration && ts.getNameOfDeclaration(local.valueDeclaration);
+                        if (parameter && name) {
+                            if (!ts.isParameterPropertyDeclaration(parameter) && !ts.parameterIsThisKeyword(parameter) && !isIdentifierThatStartsWithUnderscore(name)) {
+                                addDiagnostic(parameter, 1 /* Parameter */, ts.createDiagnosticForNode(name, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, ts.symbolName(local)));
+                            }
+                        }
+                        else {
+                            errorUnusedLocal(declaration, ts.symbolName(local), addDiagnostic);
+                        }
+                    }
+                }
+            });
+            unusedImports.forEach(function (_a) {
+                var importClause = _a[0], unuseds = _a[1];
+                var importDecl = importClause.parent;
+                var nDeclarations = (importClause.name ? 1 : 0) +
+                    (importClause.namedBindings ?
+                        (importClause.namedBindings.kind === 251 /* NamespaceImport */ ? 1 : importClause.namedBindings.elements.length)
+                        : 0);
+                if (nDeclarations === unuseds.length) {
+                    addDiagnostic(importDecl, 0 /* Local */, unuseds.length === 1
+                        ? ts.createDiagnosticForNode(importDecl, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, ts.idText(ts.first(unuseds).name))
+                        : ts.createDiagnosticForNode(importDecl, ts.Diagnostics.All_imports_in_import_declaration_are_unused));
+                }
+                else {
+                    for (var _i = 0, unuseds_1 = unuseds; _i < unuseds_1.length; _i++) {
+                        var unused = unuseds_1[_i];
+                        errorUnusedLocal(unused, ts.idText(unused.name), addDiagnostic);
+                    }
+                }
+            });
+            unusedDestructures.forEach(function (_a) {
+                var bindingPattern = _a[0], bindingElements = _a[1];
+                var kind = tryGetRootParameterDeclaration(bindingPattern.parent) ? 1 /* Parameter */ : 0 /* Local */;
+                if (bindingPattern.elements.length === bindingElements.length) {
+                    if (bindingElements.length === 1 && bindingPattern.parent.kind === 237 /* VariableDeclaration */ && bindingPattern.parent.parent.kind === 238 /* VariableDeclarationList */) {
+                        addToGroup(unusedVariables, bindingPattern.parent.parent, bindingPattern.parent, getNodeId);
+                    }
+                    else {
+                        addDiagnostic(bindingPattern, kind, bindingElements.length === 1
+                            ? ts.createDiagnosticForNode(bindingPattern, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, bindingNameText(ts.first(bindingElements).name))
+                            : ts.createDiagnosticForNode(bindingPattern, ts.Diagnostics.All_destructured_elements_are_unused));
+                    }
+                }
+                else {
+                    for (var _i = 0, bindingElements_1 = bindingElements; _i < bindingElements_1.length; _i++) {
+                        var e = bindingElements_1[_i];
+                        addDiagnostic(e, kind, ts.createDiagnosticForNode(e, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, bindingNameText(e.name)));
+                    }
+                }
+            });
+            unusedVariables.forEach(function (_a) {
+                var declarationList = _a[0], declarations = _a[1];
+                if (declarationList.declarations.length === declarations.length) {
+                    addDiagnostic(declarationList, 0 /* Local */, declarations.length === 1
+                        ? ts.createDiagnosticForNode(ts.first(declarations).name, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, bindingNameText(ts.first(declarations).name))
+                        : ts.createDiagnosticForNode(declarationList.parent.kind === 219 /* VariableStatement */ ? declarationList.parent : declarationList, ts.Diagnostics.All_variables_are_unused));
+                }
+                else {
+                    for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
+                        var decl = declarations_5[_i];
+                        addDiagnostic(decl, 0 /* Local */, ts.createDiagnosticForNode(decl, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, bindingNameText(decl.name)));
+                    }
+                }
+            });
+        }
+        function bindingNameText(name) {
+            switch (name.kind) {
+                case 72 /* Identifier */:
+                    return ts.idText(name);
+                case 185 /* ArrayBindingPattern */:
+                case 184 /* ObjectBindingPattern */:
+                    return bindingNameText(ts.cast(ts.first(name.elements), ts.isBindingElement).name);
+                default:
+                    return ts.Debug.assertNever(name);
+            }
+        }
+        function isImportedDeclaration(node) {
+            return node.kind === 250 /* ImportClause */ || node.kind === 253 /* ImportSpecifier */ || node.kind === 251 /* NamespaceImport */;
+        }
+        function importClauseFromImported(decl) {
+            return decl.kind === 250 /* ImportClause */ ? decl : decl.kind === 251 /* NamespaceImport */ ? decl.parent : decl.parent.parent;
+        }
+        function checkBlock(node) {
+            // Grammar checking for SyntaxKind.Block
+            if (node.kind === 218 /* Block */) {
+                checkGrammarStatementInAmbientContext(node);
+            }
+            if (ts.isFunctionOrModuleBlock(node)) {
+                var saveFlowAnalysisDisabled = flowAnalysisDisabled;
+                ts.forEach(node.statements, checkSourceElement);
+                flowAnalysisDisabled = saveFlowAnalysisDisabled;
+            }
+            else {
+                ts.forEach(node.statements, checkSourceElement);
+            }
+            if (node.locals) {
+                registerForUnusedIdentifiersCheck(node);
+            }
+        }
+        function checkCollisionWithArgumentsInGeneratedCode(node) {
+            // no rest parameters \ declaration context \ overload - no codegen impact
+            if (languageVersion >= 2 /* ES2015 */ || compilerOptions.noEmit || !ts.hasRestParameter(node) || node.flags & 4194304 /* Ambient */ || ts.nodeIsMissing(node.body)) {
+                return;
+            }
+            ts.forEach(node.parameters, function (p) {
+                if (p.name && !ts.isBindingPattern(p.name) && p.name.escapedText === argumentsSymbol.escapedName) {
+                    error(p, ts.Diagnostics.Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters);
+                }
+            });
+        }
+        function needCollisionCheckForIdentifier(node, identifier, name) {
+            if (!(identifier && identifier.escapedText === name)) {
+                return false;
+            }
+            if (node.kind === 154 /* PropertyDeclaration */ ||
+                node.kind === 153 /* PropertySignature */ ||
+                node.kind === 156 /* MethodDeclaration */ ||
+                node.kind === 155 /* MethodSignature */ ||
+                node.kind === 158 /* GetAccessor */ ||
+                node.kind === 159 /* SetAccessor */) {
+                // it is ok to have member named '_super' or '_this' - member access is always qualified
+                return false;
+            }
+            if (node.flags & 4194304 /* Ambient */) {
+                // ambient context - no codegen impact
+                return false;
+            }
+            var root = ts.getRootDeclaration(node);
+            if (root.kind === 151 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
+                // just an overload - no codegen impact
+                return false;
+            }
+            return true;
+        }
+        // this function will run after checking the source file so 'CaptureThis' is correct for all nodes
+        function checkIfThisIsCapturedInEnclosingScope(node) {
+            ts.findAncestor(node, function (current) {
+                if (getNodeCheckFlags(current) & 4 /* CaptureThis */) {
+                    var isDeclaration_1 = node.kind !== 72 /* Identifier */;
+                    if (isDeclaration_1) {
+                        error(ts.getNameOfDeclaration(node), ts.Diagnostics.Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference);
+                    }
+                    else {
+                        error(node, ts.Diagnostics.Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference);
+                    }
+                    return true;
+                }
+                return false;
+            });
+        }
+        function checkIfNewTargetIsCapturedInEnclosingScope(node) {
+            ts.findAncestor(node, function (current) {
+                if (getNodeCheckFlags(current) & 8 /* CaptureNewTarget */) {
+                    var isDeclaration_2 = node.kind !== 72 /* Identifier */;
+                    if (isDeclaration_2) {
+                        error(ts.getNameOfDeclaration(node), ts.Diagnostics.Duplicate_identifier_newTarget_Compiler_uses_variable_declaration_newTarget_to_capture_new_target_meta_property_reference);
+                    }
+                    else {
+                        error(node, ts.Diagnostics.Expression_resolves_to_variable_declaration_newTarget_that_compiler_uses_to_capture_new_target_meta_property_reference);
+                    }
+                    return true;
+                }
+                return false;
+            });
+        }
+        function checkCollisionWithRequireExportsInGeneratedCode(node, name) {
+            // No need to check for require or exports for ES6 modules and later
+            if (moduleKind >= ts.ModuleKind.ES2015 || compilerOptions.noEmit) {
+                return;
+            }
+            if (!needCollisionCheckForIdentifier(node, name, "require") && !needCollisionCheckForIdentifier(node, name, "exports")) {
+                return;
+            }
+            // Uninstantiated modules shouldnt do this check
+            if (ts.isModuleDeclaration(node) && ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
+                return;
+            }
+            // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
+            var parent = getDeclarationContainer(node);
+            if (parent.kind === 279 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
+                // If the declaration happens to be in external module, report error that require and exports are reserved keywords
+                error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name));
+            }
+        }
+        function checkCollisionWithGlobalPromiseInGeneratedCode(node, name) {
+            if (languageVersion >= 4 /* ES2017 */ || compilerOptions.noEmit || !needCollisionCheckForIdentifier(node, name, "Promise")) {
+                return;
+            }
+            // Uninstantiated modules shouldnt do this check
+            if (ts.isModuleDeclaration(node) && ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
+                return;
+            }
+            // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
+            var parent = getDeclarationContainer(node);
+            if (parent.kind === 279 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 1024 /* HasAsyncFunctions */) {
+                // If the declaration happens to be in external module, report error that Promise is a reserved identifier.
+                error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions, ts.declarationNameToString(name), ts.declarationNameToString(name));
+            }
+        }
+        function checkVarDeclaredNamesNotShadowed(node) {
+            // - ScriptBody : StatementList
+            // It is a Syntax Error if any element of the LexicallyDeclaredNames of StatementList
+            // also occurs in the VarDeclaredNames of StatementList.
+            // - Block : { StatementList }
+            // It is a Syntax Error if any element of the LexicallyDeclaredNames of StatementList
+            // also occurs in the VarDeclaredNames of StatementList.
+            // Variable declarations are hoisted to the top of their function scope. They can shadow
+            // block scoped declarations, which bind tighter. this will not be flagged as duplicate definition
+            // by the binder as the declaration scope is different.
+            // A non-initialized declaration is a no-op as the block declaration will resolve before the var
+            // declaration. the problem is if the declaration has an initializer. this will act as a write to the
+            // block declared value. this is fine for let, but not const.
+            // Only consider declarations with initializers, uninitialized const declarations will not
+            // step on a let/const variable.
+            // Do not consider const and const declarations, as duplicate block-scoped declarations
+            // are handled by the binder.
+            // We are only looking for const declarations that step on let\const declarations from a
+            // different scope. e.g.:
+            //      {
+            //          const x = 0; // localDeclarationSymbol obtained after name resolution will correspond to this declaration
+            //          const x = 0; // symbol for this declaration will be 'symbol'
+            //      }
+            // skip block-scoped variables and parameters
+            if ((ts.getCombinedNodeFlags(node) & 3 /* BlockScoped */) !== 0 || ts.isParameterDeclaration(node)) {
+                return;
+            }
+            // skip variable declarations that don't have initializers
+            // NOTE: in ES6 spec initializer is required in variable declarations where name is binding pattern
+            // so we'll always treat binding elements as initialized
+            if (node.kind === 237 /* VariableDeclaration */ && !node.initializer) {
+                return;
+            }
+            var symbol = getSymbolOfNode(node);
+            if (symbol.flags & 1 /* FunctionScopedVariable */) {
+                if (!ts.isIdentifier(node.name))
+                    return ts.Debug.fail();
+                var localDeclarationSymbol = resolveName(node, node.name.escapedText, 3 /* Variable */, /*nodeNotFoundErrorMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false);
+                if (localDeclarationSymbol &&
+                    localDeclarationSymbol !== symbol &&
+                    localDeclarationSymbol.flags & 2 /* BlockScopedVariable */) {
+                    if (getDeclarationNodeFlagsFromSymbol(localDeclarationSymbol) & 3 /* BlockScoped */) {
+                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 238 /* VariableDeclarationList */);
+                        var container = varDeclList.parent.kind === 219 /* VariableStatement */ && varDeclList.parent.parent
+                            ? varDeclList.parent.parent
+                            : undefined;
+                        // names of block-scoped and function scoped variables can collide only
+                        // if block scoped variable is defined in the function\module\source file scope (because of variable hoisting)
+                        var namesShareScope = container &&
+                            (container.kind === 218 /* Block */ && ts.isFunctionLike(container.parent) ||
+                                container.kind === 245 /* ModuleBlock */ ||
+                                container.kind === 244 /* ModuleDeclaration */ ||
+                                container.kind === 279 /* SourceFile */);
+                        // here we know that function scoped variable is shadowed by block scoped one
+                        // if they are defined in the same scope - binder has already reported redeclaration error
+                        // otherwise if variable has an initializer - show error that initialization will fail
+                        // since LHS will be block scoped name instead of function scoped
+                        if (!namesShareScope) {
+                            var name = symbolToString(localDeclarationSymbol);
+                            error(node, ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name, name);
+                        }
+                    }
+                }
+            }
+        }
+        // Check that a parameter initializer contains no references to parameters declared to the right of itself
+        function checkParameterInitializer(node) {
+            if (ts.getRootDeclaration(node).kind !== 151 /* Parameter */) {
+                return;
+            }
+            var func = ts.getContainingFunction(node);
+            visit(node.initializer);
+            function visit(n) {
+                if (ts.isTypeNode(n) || ts.isDeclarationName(n)) {
+                    // do not dive in types
+                    // skip declaration names (i.e. in object literal expressions)
+                    return;
+                }
+                if (n.kind === 189 /* PropertyAccessExpression */) {
+                    // skip property names in property access expression
+                    return visit(n.expression);
+                }
+                else if (n.kind === 72 /* Identifier */) {
+                    // check FunctionLikeDeclaration.locals (stores parameters\function local variable)
+                    // if it contains entry with a specified name
+                    var symbol = resolveName(n, n.escapedText, 67220415 /* Value */ | 2097152 /* Alias */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false);
+                    if (!symbol || symbol === unknownSymbol || !symbol.valueDeclaration) {
+                        return;
+                    }
+                    if (symbol.valueDeclaration === node) {
+                        error(n, ts.Diagnostics.Parameter_0_cannot_be_referenced_in_its_initializer, ts.declarationNameToString(node.name));
+                        return;
+                    }
+                    // locals map for function contain both parameters and function locals
+                    // so we need to do a bit of extra work to check if reference is legal
+                    var enclosingContainer = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
+                    if (enclosingContainer === func) {
+                        if (symbol.valueDeclaration.kind === 151 /* Parameter */ ||
+                            symbol.valueDeclaration.kind === 186 /* BindingElement */) {
+                            // it is ok to reference parameter in initializer if either
+                            // - parameter is located strictly on the left of current parameter declaration
+                            if (symbol.valueDeclaration.pos < node.pos) {
+                                return;
+                            }
+                            // - parameter is wrapped in function-like entity
+                            if (ts.findAncestor(n, function (current) {
+                                if (current === node.initializer) {
+                                    return "quit";
+                                }
+                                return ts.isFunctionLike(current.parent) ||
+                                    // computed property names/initializers in instance property declaration of class like entities
+                                    // are executed in constructor and thus deferred
+                                    (current.parent.kind === 154 /* PropertyDeclaration */ &&
+                                        !(ts.hasModifier(current.parent, 32 /* Static */)) &&
+                                        ts.isClassLike(current.parent.parent));
+                            })) {
+                                return;
+                            }
+                            // fall through to report error
+                        }
+                        error(n, ts.Diagnostics.Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it, ts.declarationNameToString(node.name), ts.declarationNameToString(n));
+                    }
+                }
+                else {
+                    return ts.forEachChild(n, visit);
+                }
+            }
+        }
+        function convertAutoToAny(type) {
+            return type === autoType ? anyType : type === autoArrayType ? anyArrayType : type;
+        }
+        // Check variable, parameter, or property declaration
+        function checkVariableLikeDeclaration(node) {
+            checkDecorators(node);
+            if (!ts.isBindingElement(node)) {
+                checkSourceElement(node.type);
+            }
+            // JSDoc `function(string, string): string` syntax results in parameters with no name
+            if (!node.name) {
+                return;
+            }
+            // For a computed property, just check the initializer and exit
+            // Do not use hasDynamicName here, because that returns false for well known symbols.
+            // We want to perform checkComputedPropertyName for all computed properties, including
+            // well known symbols.
+            if (node.name.kind === 149 /* ComputedPropertyName */) {
+                checkComputedPropertyName(node.name);
+                if (node.initializer) {
+                    checkExpressionCached(node.initializer);
+                }
+            }
+            if (node.kind === 186 /* BindingElement */) {
+                if (node.parent.kind === 184 /* ObjectBindingPattern */ && languageVersion < 6 /* ESNext */) {
+                    checkExternalEmitHelpers(node, 4 /* Rest */);
+                }
+                // check computed properties inside property names of binding elements
+                if (node.propertyName && node.propertyName.kind === 149 /* ComputedPropertyName */) {
+                    checkComputedPropertyName(node.propertyName);
+                }
+                // check private/protected variable access
+                var parent = node.parent.parent;
+                var parentType = getTypeForBindingElementParent(parent);
+                var name = node.propertyName || node.name;
+                if (!ts.isBindingPattern(name) && parentType) {
+                    var exprType = getLiteralTypeFromPropertyName(name);
+                    if (isTypeUsableAsPropertyName(exprType)) {
+                        var nameText = getPropertyNameFromType(exprType);
+                        var property = getPropertyOfType(parentType, nameText);
+                        if (property) {
+                            markPropertyAsReferenced(property, /*nodeForCheckWriteOnly*/ undefined, /*isThisAccess*/ false); // A destructuring is never a write-only reference.
+                            checkPropertyAccessibility(parent, !!parent.initializer && parent.initializer.kind === 98 /* SuperKeyword */, parentType, property);
+                        }
+                    }
+                }
+            }
+            // For a binding pattern, check contained binding elements
+            if (ts.isBindingPattern(node.name)) {
+                if (node.name.kind === 185 /* ArrayBindingPattern */ && languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
+                    checkExternalEmitHelpers(node, 512 /* Read */);
+                }
+                ts.forEach(node.name.elements, checkSourceElement);
+            }
+            // For a parameter declaration with an initializer, error and exit if the containing function doesn't have a body
+            if (node.initializer && ts.getRootDeclaration(node).kind === 151 /* Parameter */ && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
+                error(node, ts.Diagnostics.A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation);
+                return;
+            }
+            // For a binding pattern, validate the initializer and exit
+            if (ts.isBindingPattern(node.name)) {
+                // Don't validate for-in initializer as it is already an error
+                if (node.initializer && node.parent.parent.kind !== 226 /* ForInStatement */) {
+                    var initializerType = checkExpressionCached(node.initializer);
+                    if (strictNullChecks && node.name.elements.length === 0) {
+                        checkNonNullType(initializerType, node);
+                    }
+                    else {
+                        checkTypeAssignableToAndOptionallyElaborate(initializerType, getWidenedTypeForVariableLikeDeclaration(node), node, node.initializer);
+                    }
+                    checkParameterInitializer(node);
+                }
+                return;
+            }
+            var symbol = getSymbolOfNode(node);
+            var type = convertAutoToAny(getTypeOfSymbol(symbol));
+            if (node === symbol.valueDeclaration) {
+                // Node is the primary declaration of the symbol, just validate the initializer
+                // Don't validate for-in initializer as it is already an error
+                var initializer = ts.getEffectiveInitializer(node);
+                if (initializer) {
+                    var isJSObjectLiteralInitializer = ts.isInJSFile(node) &&
+                        ts.isObjectLiteralExpression(initializer) &&
+                        (initializer.properties.length === 0 || ts.isPrototypeAccess(node.name)) &&
+                        ts.hasEntries(symbol.exports);
+                    if (!isJSObjectLiteralInitializer && node.parent.parent.kind !== 226 /* ForInStatement */) {
+                        checkTypeAssignableToAndOptionallyElaborate(checkExpressionCached(initializer), type, node, initializer, /*headMessage*/ undefined);
+                        checkParameterInitializer(node);
+                    }
+                }
+                if (symbol.declarations.length > 1) {
+                    if (ts.some(symbol.declarations, function (d) { return d !== node && ts.isVariableLike(d) && !areDeclarationFlagsIdentical(d, node); })) {
+                        error(node.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_modifiers, ts.declarationNameToString(node.name));
+                    }
+                }
+            }
+            else {
+                // Node is a secondary declaration, check that type is identical to primary declaration and check that
+                // initializer is consistent with type associated with the node
+                var declarationType = convertAutoToAny(getWidenedTypeForVariableLikeDeclaration(node));
+                if (type !== errorType && declarationType !== errorType &&
+                    !isTypeIdenticalTo(type, declarationType) &&
+                    !(symbol.flags & 67108864 /* Assignment */)) {
+                    errorNextVariableOrPropertyDeclarationMustHaveSameType(type, node, declarationType);
+                }
+                if (node.initializer) {
+                    checkTypeAssignableToAndOptionallyElaborate(checkExpressionCached(node.initializer), declarationType, node, node.initializer, /*headMessage*/ undefined);
+                }
+                if (!areDeclarationFlagsIdentical(node, symbol.valueDeclaration)) {
+                    error(node.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_modifiers, ts.declarationNameToString(node.name));
+                }
+            }
+            if (node.kind !== 154 /* PropertyDeclaration */ && node.kind !== 153 /* PropertySignature */) {
+                // We know we don't have a binding pattern or computed name here
+                checkExportsOnMergedDeclarations(node);
+                if (node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */) {
+                    checkVarDeclaredNamesNotShadowed(node);
+                }
+                checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+                checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
+            }
+        }
+        function errorNextVariableOrPropertyDeclarationMustHaveSameType(firstType, nextDeclaration, nextType) {
+            var nextDeclarationName = ts.getNameOfDeclaration(nextDeclaration);
+            var message = nextDeclaration.kind === 154 /* PropertyDeclaration */ || nextDeclaration.kind === 153 /* PropertySignature */
+                ? ts.Diagnostics.Subsequent_property_declarations_must_have_the_same_type_Property_0_must_be_of_type_1_but_here_has_type_2
+                : ts.Diagnostics.Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2;
+            error(nextDeclarationName, message, ts.declarationNameToString(nextDeclarationName), typeToString(firstType), typeToString(nextType));
+        }
+        function areDeclarationFlagsIdentical(left, right) {
+            if ((left.kind === 151 /* Parameter */ && right.kind === 237 /* VariableDeclaration */) ||
+                (left.kind === 237 /* VariableDeclaration */ && right.kind === 151 /* Parameter */)) {
+                // Differences in optionality between parameters and variables are allowed.
+                return true;
+            }
+            if (ts.hasQuestionToken(left) !== ts.hasQuestionToken(right)) {
+                return false;
+            }
+            var interestingFlags = 8 /* Private */ |
+                16 /* Protected */ |
+                256 /* Async */ |
+                128 /* Abstract */ |
+                64 /* Readonly */ |
+                32 /* Static */;
+            return ts.getSelectedModifierFlags(left, interestingFlags) === ts.getSelectedModifierFlags(right, interestingFlags);
+        }
+        function checkVariableDeclaration(node) {
+            checkGrammarVariableDeclaration(node);
+            return checkVariableLikeDeclaration(node);
+        }
+        function checkBindingElement(node) {
+            checkGrammarBindingElement(node);
+            return checkVariableLikeDeclaration(node);
+        }
+        function checkVariableStatement(node) {
+            // Grammar checking
+            if (!checkGrammarDecoratorsAndModifiers(node) && !checkGrammarVariableDeclarationList(node.declarationList))
+                checkGrammarForDisallowedLetOrConstStatement(node);
+            ts.forEach(node.declarationList.declarations, checkSourceElement);
+        }
+        function checkExpressionStatement(node) {
+            // Grammar checking
+            checkGrammarStatementInAmbientContext(node);
+            checkExpression(node.expression);
+        }
+        function checkIfStatement(node) {
+            // Grammar checking
+            checkGrammarStatementInAmbientContext(node);
+            checkTruthinessExpression(node.expression);
+            checkSourceElement(node.thenStatement);
+            if (node.thenStatement.kind === 220 /* EmptyStatement */) {
+                error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
+            }
+            checkSourceElement(node.elseStatement);
+        }
+        function checkDoStatement(node) {
+            // Grammar checking
+            checkGrammarStatementInAmbientContext(node);
+            checkSourceElement(node.statement);
+            checkTruthinessExpression(node.expression);
+        }
+        function checkWhileStatement(node) {
+            // Grammar checking
+            checkGrammarStatementInAmbientContext(node);
+            checkTruthinessExpression(node.expression);
+            checkSourceElement(node.statement);
+        }
+        function checkTruthinessExpression(node, checkMode) {
+            var type = checkExpression(node, checkMode);
+            if (type.flags & 16384 /* Void */) {
+                error(node, ts.Diagnostics.An_expression_of_type_void_cannot_be_tested_for_truthiness);
+            }
+            return type;
+        }
+        function checkForStatement(node) {
+            // Grammar checking
+            if (!checkGrammarStatementInAmbientContext(node)) {
+                if (node.initializer && node.initializer.kind === 238 /* VariableDeclarationList */) {
+                    checkGrammarVariableDeclarationList(node.initializer);
+                }
+            }
+            if (node.initializer) {
+                if (node.initializer.kind === 238 /* VariableDeclarationList */) {
+                    ts.forEach(node.initializer.declarations, checkVariableDeclaration);
+                }
+                else {
+                    checkExpression(node.initializer);
+                }
+            }
+            if (node.condition)
+                checkTruthinessExpression(node.condition);
+            if (node.incrementor)
+                checkExpression(node.incrementor);
+            checkSourceElement(node.statement);
+            if (node.locals) {
+                registerForUnusedIdentifiersCheck(node);
+            }
+        }
+        function checkForOfStatement(node) {
+            checkGrammarForInOrForOfStatement(node);
+            if (node.awaitModifier) {
+                var functionFlags = ts.getFunctionFlags(ts.getContainingFunction(node));
+                if ((functionFlags & (4 /* Invalid */ | 2 /* Async */)) === 2 /* Async */ && languageVersion < 6 /* ESNext */) {
+                    // for..await..of in an async function or async generator function prior to ESNext requires the __asyncValues helper
+                    checkExternalEmitHelpers(node, 16384 /* ForAwaitOfIncludes */);
+                }
+            }
+            else if (compilerOptions.downlevelIteration && languageVersion < 2 /* ES2015 */) {
+                // for..of prior to ES2015 requires the __values helper when downlevelIteration is enabled
+                checkExternalEmitHelpers(node, 256 /* ForOfIncludes */);
+            }
+            // Check the LHS and RHS
+            // If the LHS is a declaration, just check it as a variable declaration, which will in turn check the RHS
+            // via checkRightHandSideOfForOf.
+            // If the LHS is an expression, check the LHS, as a destructuring assignment or as a reference.
+            // Then check that the RHS is assignable to it.
+            if (node.initializer.kind === 238 /* VariableDeclarationList */) {
+                checkForInOrForOfVariableDeclaration(node);
+            }
+            else {
+                var varExpr = node.initializer;
+                var iteratedType = checkRightHandSideOfForOf(node.expression, node.awaitModifier);
+                // There may be a destructuring assignment on the left side
+                if (varExpr.kind === 187 /* ArrayLiteralExpression */ || varExpr.kind === 188 /* ObjectLiteralExpression */) {
+                    // iteratedType may be undefined. In this case, we still want to check the structure of
+                    // varExpr, in particular making sure it's a valid LeftHandSideExpression. But we'd like
+                    // to short circuit the type relation checking as much as possible, so we pass the unknownType.
+                    checkDestructuringAssignment(varExpr, iteratedType || errorType);
+                }
+                else {
+                    var leftType = checkExpression(varExpr);
+                    checkReferenceExpression(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_must_be_a_variable_or_a_property_access);
+                    // iteratedType will be undefined if the rightType was missing properties/signatures
+                    // required to get its iteratedType (like [Symbol.iterator] or next). This may be
+                    // because we accessed properties from anyType, or it may have led to an error inside
+                    // getElementTypeOfIterable.
+                    if (iteratedType) {
+                        checkTypeAssignableToAndOptionallyElaborate(iteratedType, leftType, varExpr, node.expression);
+                    }
+                }
+            }
+            checkSourceElement(node.statement);
+            if (node.locals) {
+                registerForUnusedIdentifiersCheck(node);
+            }
+        }
+        function checkForInStatement(node) {
+            // Grammar checking
+            checkGrammarForInOrForOfStatement(node);
+            var rightType = getNonNullableTypeIfNeeded(checkExpression(node.expression));
+            // TypeScript 1.0 spec (April 2014): 5.4
+            // In a 'for-in' statement of the form
+            // for (let VarDecl in Expr) Statement
+            //   VarDecl must be a variable declaration without a type annotation that declares a variable of type Any,
+            //   and Expr must be an expression of type Any, an object type, or a type parameter type.
+            if (node.initializer.kind === 238 /* VariableDeclarationList */) {
+                var variable = node.initializer.declarations[0];
+                if (variable && ts.isBindingPattern(variable.name)) {
+                    error(variable.name, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
+                }
+                checkForInOrForOfVariableDeclaration(node);
+            }
+            else {
+                // In a 'for-in' statement of the form
+                // for (Var in Expr) Statement
+                //   Var must be an expression classified as a reference of type Any or the String primitive type,
+                //   and Expr must be an expression of type Any, an object type, or a type parameter type.
+                var varExpr = node.initializer;
+                var leftType = checkExpression(varExpr);
+                if (varExpr.kind === 187 /* ArrayLiteralExpression */ || varExpr.kind === 188 /* ObjectLiteralExpression */) {
+                    error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
+                }
+                else if (!isTypeAssignableTo(getIndexTypeOrString(rightType), leftType)) {
+                    error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any);
+                }
+                else {
+                    // run check only former check succeeded to avoid cascading errors
+                    checkReferenceExpression(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_must_be_a_variable_or_a_property_access);
+                }
+            }
+            // unknownType is returned i.e. if node.expression is identifier whose name cannot be resolved
+            // in this case error about missing name is already reported - do not report extra one
+            if (rightType === neverType || !isTypeAssignableToKind(rightType, 67108864 /* NonPrimitive */ | 58982400 /* InstantiableNonPrimitive */)) {
+                error(node.expression, ts.Diagnostics.The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter_but_here_has_type_0, typeToString(rightType));
+            }
+            checkSourceElement(node.statement);
+            if (node.locals) {
+                registerForUnusedIdentifiersCheck(node);
+            }
+        }
+        function checkForInOrForOfVariableDeclaration(iterationStatement) {
+            var variableDeclarationList = iterationStatement.initializer;
+            // checkGrammarForInOrForOfStatement will check that there is exactly one declaration.
+            if (variableDeclarationList.declarations.length >= 1) {
+                var decl = variableDeclarationList.declarations[0];
+                checkVariableDeclaration(decl);
+            }
+        }
+        function checkRightHandSideOfForOf(rhsExpression, awaitModifier) {
+            var expressionType = checkNonNullExpression(rhsExpression);
+            return checkIteratedTypeOrElementType(expressionType, rhsExpression, /*allowStringInput*/ true, awaitModifier !== undefined);
+        }
+        function checkIteratedTypeOrElementType(inputType, errorNode, allowStringInput, allowAsyncIterables) {
+            if (isTypeAny(inputType)) {
+                return inputType;
+            }
+            return getIteratedTypeOrElementType(inputType, errorNode, allowStringInput, allowAsyncIterables, /*checkAssignability*/ true) || anyType;
+        }
+        /**
+         * When consuming an iterable type in a for..of, spread, or iterator destructuring assignment
+         * we want to get the iterated type of an iterable for ES2015 or later, or the iterated type
+         * of a iterable (if defined globally) or element type of an array like for ES2015 or earlier.
+         */
+        function getIteratedTypeOrElementType(inputType, errorNode, allowStringInput, allowAsyncIterables, checkAssignability) {
+            if (inputType === neverType) {
+                reportTypeNotIterableError(errorNode, inputType, allowAsyncIterables); // TODO: GH#18217
+                return undefined;
+            }
+            var uplevelIteration = languageVersion >= 2 /* ES2015 */;
+            var downlevelIteration = !uplevelIteration && compilerOptions.downlevelIteration;
+            // Get the iterated type of an `Iterable<T>` or `IterableIterator<T>` only in ES2015
+            // or higher, when inside of an async generator or for-await-if, or when
+            // downlevelIteration is requested.
+            if (uplevelIteration || downlevelIteration || allowAsyncIterables) {
+                // We only report errors for an invalid iterable type in ES2015 or higher.
+                var iteratedType = getIteratedTypeOfIterable(inputType, uplevelIteration ? errorNode : undefined, allowAsyncIterables, /*allowSyncIterables*/ true, checkAssignability);
+                if (iteratedType || uplevelIteration) {
+                    return iteratedType;
+                }
+            }
+            var arrayType = inputType;
+            var reportedError = false;
+            var hasStringConstituent = false;
+            // If strings are permitted, remove any string-like constituents from the array type.
+            // This allows us to find other non-string element types from an array unioned with
+            // a string.
+            if (allowStringInput) {
+                if (arrayType.flags & 1048576 /* Union */) {
+                    // After we remove all types that are StringLike, we will know if there was a string constituent
+                    // based on whether the result of filter is a new array.
+                    var arrayTypes = inputType.types;
+                    var filteredTypes = ts.filter(arrayTypes, function (t) { return !(t.flags & 132 /* StringLike */); });
+                    if (filteredTypes !== arrayTypes) {
+                        arrayType = getUnionType(filteredTypes, 2 /* Subtype */);
+                    }
+                }
+                else if (arrayType.flags & 132 /* StringLike */) {
+                    arrayType = neverType;
+                }
+                hasStringConstituent = arrayType !== inputType;
+                if (hasStringConstituent) {
+                    if (languageVersion < 1 /* ES5 */) {
+                        if (errorNode) {
+                            error(errorNode, ts.Diagnostics.Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher);
+                            reportedError = true;
+                        }
+                    }
+                    // Now that we've removed all the StringLike types, if no constituents remain, then the entire
+                    // arrayOrStringType was a string.
+                    if (arrayType.flags & 131072 /* Never */) {
+                        return stringType;
+                    }
+                }
+            }
+            if (!isArrayLikeType(arrayType)) {
+                if (errorNode && !reportedError) {
+                    // Which error we report depends on whether we allow strings or if there was a
+                    // string constituent. For example, if the input type is number | string, we
+                    // want to say that number is not an array type. But if the input was just
+                    // number and string input is allowed, we want to say that number is not an
+                    // array type or a string type.
+                    var isIterable = !!getIteratedTypeOfIterable(inputType, /* errorNode */ undefined, allowAsyncIterables, /*allowSyncIterables*/ true, checkAssignability);
+                    var diagnostic = !allowStringInput || hasStringConstituent
+                        ? downlevelIteration
+                            ? ts.Diagnostics.Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator
+                            : isIterable
+                                ? ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators
+                                : ts.Diagnostics.Type_0_is_not_an_array_type
+                        : downlevelIteration
+                            ? ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator
+                            : isIterable
+                                ? ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators
+                                : ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type;
+                    error(errorNode, diagnostic, typeToString(arrayType));
+                }
+                return hasStringConstituent ? stringType : undefined;
+            }
+            var arrayElementType = getIndexTypeOfType(arrayType, 1 /* Number */);
+            if (hasStringConstituent && arrayElementType) {
+                // This is just an optimization for the case where arrayOrStringType is string | string[]
+                if (arrayElementType.flags & 132 /* StringLike */) {
+                    return stringType;
+                }
+                return getUnionType([arrayElementType, stringType], 2 /* Subtype */);
+            }
+            return arrayElementType;
+        }
+        /**
+         * We want to treat type as an iterable, and get the type it is an iterable of. The iterable
+         * must have the following structure (annotated with the names of the variables below):
+         *
+         *     { // iterable
+         *         [Symbol.iterator]: { // iteratorMethod
+         *             (): Iterator<T>
+         *         }
+         *     }
+         *
+         * For an async iterable, we expect the following structure:
+         *
+         *     { // iterable
+         *         [Symbol.asyncIterator]: { // iteratorMethod
+         *             (): AsyncIterator<T>
+         *         }
+         *     }
+         *
+         * T is the type we are after. At every level that involves analyzing return types
+         * of signatures, we union the return types of all the signatures.
+         *
+         * Another thing to note is that at any step of this process, we could run into a dead end,
+         * meaning either the property is missing, or we run into the anyType. If either of these things
+         * happens, we return undefined to signal that we could not find the iterated type. If a property
+         * is missing, and the previous step did not result in 'any', then we also give an error if the
+         * caller requested it. Then the caller can decide what to do in the case where there is no iterated
+         * type. This is different from returning anyType, because that would signify that we have matched the
+         * whole pattern and that T (above) is 'any'.
+         *
+         * For a **for-of** statement, `yield*` (in a normal generator), spread, array
+         * destructuring, or normal generator we will only ever look for a `[Symbol.iterator]()`
+         * method.
+         *
+         * For an async generator we will only ever look at the `[Symbol.asyncIterator]()` method.
+         *
+         * For a **for-await-of** statement or a `yield*` in an async generator we will look for
+         * the `[Symbol.asyncIterator]()` method first, and then the `[Symbol.iterator]()` method.
+         */
+        function getIteratedTypeOfIterable(type, errorNode, allowAsyncIterables, allowSyncIterables, checkAssignability) {
+            if (isTypeAny(type)) {
+                return undefined;
+            }
+            return mapType(type, getIteratedType);
+            function getIteratedType(type) {
+                var typeAsIterable = type;
+                if (allowAsyncIterables) {
+                    if (typeAsIterable.iteratedTypeOfAsyncIterable) {
+                        return typeAsIterable.iteratedTypeOfAsyncIterable;
+                    }
+                    // As an optimization, if the type is an instantiation of the global `AsyncIterable<T>`
+                    // or the global `AsyncIterableIterator<T>` then just grab its type argument.
+                    if (isReferenceToType(type, getGlobalAsyncIterableType(/*reportErrors*/ false)) ||
+                        isReferenceToType(type, getGlobalAsyncIterableIteratorType(/*reportErrors*/ false))) {
+                        return typeAsIterable.iteratedTypeOfAsyncIterable = type.typeArguments[0];
+                    }
+                }
+                if (allowSyncIterables) {
+                    if (typeAsIterable.iteratedTypeOfIterable) {
+                        return allowAsyncIterables
+                            ? typeAsIterable.iteratedTypeOfAsyncIterable = getAwaitedType(typeAsIterable.iteratedTypeOfIterable)
+                            : typeAsIterable.iteratedTypeOfIterable;
+                    }
+                    // As an optimization, if the type is an instantiation of the global `Iterable<T>` or
+                    // `IterableIterator<T>` then just grab its type argument.
+                    if (isReferenceToType(type, getGlobalIterableType(/*reportErrors*/ false)) ||
+                        isReferenceToType(type, getGlobalIterableIteratorType(/*reportErrors*/ false))) {
+                        return allowAsyncIterables
+                            ? typeAsIterable.iteratedTypeOfAsyncIterable = getAwaitedType(type.typeArguments[0])
+                            : typeAsIterable.iteratedTypeOfIterable = type.typeArguments[0];
+                    }
+                }
+                var asyncMethodType = allowAsyncIterables && getTypeOfPropertyOfType(type, ts.getPropertyNameForKnownSymbolName("asyncIterator"));
+                var methodType = asyncMethodType || (allowSyncIterables ? getTypeOfPropertyOfType(type, ts.getPropertyNameForKnownSymbolName("iterator")) : undefined);
+                if (isTypeAny(methodType)) {
+                    return undefined;
+                }
+                var signatures = methodType ? getSignaturesOfType(methodType, 0 /* Call */) : undefined;
+                if (!ts.some(signatures)) {
+                    if (errorNode) {
+                        // only report on the first error
+                        reportTypeNotIterableError(errorNode, type, allowAsyncIterables);
+                        errorNode = undefined;
+                    }
+                    return undefined;
+                }
+                var returnType = getUnionType(ts.map(signatures, getReturnTypeOfSignature), 2 /* Subtype */);
+                var iteratedType = getIteratedTypeOfIterator(returnType, errorNode, /*isAsyncIterator*/ !!asyncMethodType);
+                if (checkAssignability && errorNode && iteratedType) {
+                    // If `checkAssignability` was specified, we were called from
+                    // `checkIteratedTypeOrElementType`. As such, we need to validate that
+                    // the type passed in is actually an Iterable.
+                    checkTypeAssignableTo(type, asyncMethodType
+                        ? createAsyncIterableType(iteratedType)
+                        : createIterableType(iteratedType), errorNode);
+                }
+                if (iteratedType) {
+                    return allowAsyncIterables
+                        ? typeAsIterable.iteratedTypeOfAsyncIterable = asyncMethodType ? iteratedType : getAwaitedType(iteratedType)
+                        : typeAsIterable.iteratedTypeOfIterable = iteratedType;
+                }
+            }
+        }
+        function reportTypeNotIterableError(errorNode, type, allowAsyncIterables) {
+            error(errorNode, allowAsyncIterables
+                ? ts.Diagnostics.Type_0_must_have_a_Symbol_asyncIterator_method_that_returns_an_async_iterator
+                : ts.Diagnostics.Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator, typeToString(type));
+        }
+        /**
+         * This function has very similar logic as getIteratedTypeOfIterable, except that it operates on
+         * Iterators instead of Iterables. Here is the structure:
+         *
+         *  { // iterator
+         *      next: { // nextMethod
+         *          (): { // nextResult
+         *              value: T // nextValue
+         *          }
+         *      }
+         *  }
+         *
+         * For an async iterator, we expect the following structure:
+         *
+         *  { // iterator
+         *      next: { // nextMethod
+         *          (): PromiseLike<{ // nextResult
+         *              value: T // nextValue
+         *          }>
+         *      }
+         *  }
+         */
+        function getIteratedTypeOfIterator(type, errorNode, isAsyncIterator) {
+            if (isTypeAny(type)) {
+                return undefined;
+            }
+            var typeAsIterator = type;
+            if (isAsyncIterator ? typeAsIterator.iteratedTypeOfAsyncIterator : typeAsIterator.iteratedTypeOfIterator) {
+                return isAsyncIterator ? typeAsIterator.iteratedTypeOfAsyncIterator : typeAsIterator.iteratedTypeOfIterator;
+            }
+            // As an optimization, if the type is an instantiation of the global `Iterator<T>` (for
+            // a non-async iterator) or the global `AsyncIterator<T>` (for an async-iterator) then
+            // just grab its type argument.
+            var getIteratorType = isAsyncIterator ? getGlobalAsyncIteratorType : getGlobalIteratorType;
+            if (isReferenceToType(type, getIteratorType(/*reportErrors*/ false))) {
+                return isAsyncIterator
+                    ? typeAsIterator.iteratedTypeOfAsyncIterator = type.typeArguments[0]
+                    : typeAsIterator.iteratedTypeOfIterator = type.typeArguments[0];
+            }
+            // Both async and non-async iterators must have a `next` method.
+            var nextMethod = getTypeOfPropertyOfType(type, "next");
+            if (isTypeAny(nextMethod)) {
+                return undefined;
+            }
+            var nextMethodSignatures = nextMethod ? getSignaturesOfType(nextMethod, 0 /* Call */) : ts.emptyArray;
+            if (nextMethodSignatures.length === 0) {
+                if (errorNode) {
+                    error(errorNode, isAsyncIterator
+                        ? ts.Diagnostics.An_async_iterator_must_have_a_next_method
+                        : ts.Diagnostics.An_iterator_must_have_a_next_method);
+                }
+                return undefined;
+            }
+            var nextResult = getUnionType(ts.map(nextMethodSignatures, getReturnTypeOfSignature), 2 /* Subtype */);
+            if (isTypeAny(nextResult)) {
+                return undefined;
+            }
+            // For an async iterator, we must get the awaited type of the return type.
+            if (isAsyncIterator) {
+                nextResult = getAwaitedTypeOfPromise(nextResult, errorNode, ts.Diagnostics.The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property);
+                if (isTypeAny(nextResult)) {
+                    return undefined;
+                }
+            }
+            var nextValue = nextResult && getTypeOfPropertyOfType(nextResult, "value");
+            if (!nextValue) {
+                if (errorNode) {
+                    error(errorNode, isAsyncIterator
+                        ? ts.Diagnostics.The_type_returned_by_the_next_method_of_an_async_iterator_must_be_a_promise_for_a_type_with_a_value_property
+                        : ts.Diagnostics.The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property);
+                }
+                return undefined;
+            }
+            return isAsyncIterator
+                ? typeAsIterator.iteratedTypeOfAsyncIterator = nextValue
+                : typeAsIterator.iteratedTypeOfIterator = nextValue;
+        }
+        /**
+         * A generator may have a return type of `Iterator<T>`, `Iterable<T>`, or
+         * `IterableIterator<T>`. An async generator may have a return type of `AsyncIterator<T>`,
+         * `AsyncIterable<T>`, or `AsyncIterableIterator<T>`. This function can be used to extract
+         * the iterated type from this return type for contextual typing and verifying signatures.
+         */
+        function getIteratedTypeOfGenerator(returnType, isAsyncGenerator) {
+            if (isTypeAny(returnType)) {
+                return undefined;
+            }
+            return getIteratedTypeOfIterable(returnType, /*errorNode*/ undefined, /*allowAsyncIterables*/ isAsyncGenerator, /*allowSyncIterables*/ !isAsyncGenerator, /*checkAssignability*/ false)
+                || getIteratedTypeOfIterator(returnType, /*errorNode*/ undefined, isAsyncGenerator);
+        }
+        function checkBreakOrContinueStatement(node) {
+            // Grammar checking
+            if (!checkGrammarStatementInAmbientContext(node))
+                checkGrammarBreakOrContinueStatement(node);
+            // TODO: Check that target label is valid
+        }
+        function isUnwrappedReturnTypeVoidOrAny(func, returnType) {
+            var unwrappedReturnType = (ts.getFunctionFlags(func) & 3 /* AsyncGenerator */) === 2 /* Async */
+                ? getPromisedTypeOfPromise(returnType) // Async function
+                : returnType; // AsyncGenerator function, Generator function, or normal function
+            return !!unwrappedReturnType && maybeTypeOfKind(unwrappedReturnType, 16384 /* Void */ | 3 /* AnyOrUnknown */);
+        }
+        function checkReturnStatement(node) {
+            // Grammar checking
+            if (checkGrammarStatementInAmbientContext(node)) {
+                return;
+            }
+            var func = ts.getContainingFunction(node);
+            if (!func) {
+                grammarErrorOnFirstToken(node, ts.Diagnostics.A_return_statement_can_only_be_used_within_a_function_body);
+                return;
+            }
+            var signature = getSignatureFromDeclaration(func);
+            var returnType = getReturnTypeOfSignature(signature);
+            var functionFlags = ts.getFunctionFlags(func);
+            var isGenerator = functionFlags & 1 /* Generator */;
+            if (strictNullChecks || node.expression || returnType.flags & 131072 /* Never */) {
+                var exprType = node.expression ? checkExpressionCached(node.expression) : undefinedType;
+                if (isGenerator) { // AsyncGenerator function or Generator function
+                    // A generator does not need its return expressions checked against its return type.
+                    // Instead, the yield expressions are checked against the element type.
+                    // TODO: Check return types of generators when return type tracking is added
+                    // for generators.
+                    return;
+                }
+                else if (func.kind === 159 /* SetAccessor */) {
+                    if (node.expression) {
+                        error(node, ts.Diagnostics.Setters_cannot_return_a_value);
+                    }
+                }
+                else if (func.kind === 157 /* Constructor */) {
+                    if (node.expression && !checkTypeAssignableToAndOptionallyElaborate(exprType, returnType, node, node.expression)) {
+                        error(node, ts.Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
+                    }
+                }
+                else if (getReturnTypeFromAnnotation(func)) {
+                    if (functionFlags & 2 /* Async */) { // Async function
+                        var promisedType = getPromisedTypeOfPromise(returnType);
+                        var awaitedType = checkAwaitedType(exprType, node, ts.Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
+                        if (promisedType) {
+                            // If the function has a return type, but promisedType is
+                            // undefined, an error will be reported in checkAsyncFunctionReturnType
+                            // so we don't need to report one here.
+                            checkTypeAssignableTo(awaitedType, promisedType, node);
+                        }
+                    }
+                    else {
+                        checkTypeAssignableToAndOptionallyElaborate(exprType, returnType, node, node.expression);
+                    }
+                }
+            }
+            else if (func.kind !== 157 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType) && !isGenerator) {
+                // The function has a return type, but the return statement doesn't have an expression.
+                error(node, ts.Diagnostics.Not_all_code_paths_return_a_value);
+            }
+        }
+        function checkWithStatement(node) {
+            // Grammar checking for withStatement
+            if (!checkGrammarStatementInAmbientContext(node)) {
+                if (node.flags & 16384 /* AwaitContext */) {
+                    grammarErrorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_an_async_function_block);
+                }
+            }
+            checkExpression(node.expression);
+            var sourceFile = ts.getSourceFileOfNode(node);
+            if (!hasParseDiagnostics(sourceFile)) {
+                var start = ts.getSpanOfTokenAtPosition(sourceFile, node.pos).start;
+                var end = node.statement.pos;
+                grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.The_with_statement_is_not_supported_All_symbols_in_a_with_block_will_have_type_any);
+            }
+        }
+        function checkSwitchStatement(node) {
+            // Grammar checking
+            checkGrammarStatementInAmbientContext(node);
+            var firstDefaultClause;
+            var hasDuplicateDefaultClause = false;
+            var expressionType = checkExpression(node.expression);
+            var expressionIsLiteral = isLiteralType(expressionType);
+            ts.forEach(node.caseBlock.clauses, function (clause) {
+                // Grammar check for duplicate default clauses, skip if we already report duplicate default clause
+                if (clause.kind === 272 /* DefaultClause */ && !hasDuplicateDefaultClause) {
+                    if (firstDefaultClause === undefined) {
+                        firstDefaultClause = clause;
+                    }
+                    else {
+                        var sourceFile = ts.getSourceFileOfNode(node);
+                        var start = ts.skipTrivia(sourceFile.text, clause.pos);
+                        var end = clause.statements.length > 0 ? clause.statements[0].pos : clause.end;
+                        grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.A_default_clause_cannot_appear_more_than_once_in_a_switch_statement);
+                        hasDuplicateDefaultClause = true;
+                    }
+                }
+                if (produceDiagnostics && clause.kind === 271 /* CaseClause */) {
+                    // TypeScript 1.0 spec (April 2014): 5.9
+                    // In a 'switch' statement, each 'case' expression must be of a type that is comparable
+                    // to or from the type of the 'switch' expression.
+                    var caseType = checkExpression(clause.expression);
+                    var caseIsLiteral = isLiteralType(caseType);
+                    var comparedExpressionType = expressionType;
+                    if (!caseIsLiteral || !expressionIsLiteral) {
+                        caseType = caseIsLiteral ? getBaseTypeOfLiteralType(caseType) : caseType;
+                        comparedExpressionType = getBaseTypeOfLiteralType(expressionType);
+                    }
+                    if (!isTypeEqualityComparableTo(comparedExpressionType, caseType)) {
+                        // expressionType is not comparable to caseType, try the reversed check and report errors if it fails
+                        checkTypeComparableTo(caseType, comparedExpressionType, clause.expression, /*headMessage*/ undefined);
+                    }
+                }
+                ts.forEach(clause.statements, checkSourceElement);
+            });
+            if (node.caseBlock.locals) {
+                registerForUnusedIdentifiersCheck(node.caseBlock);
+            }
+        }
+        function checkLabeledStatement(node) {
+            // Grammar checking
+            if (!checkGrammarStatementInAmbientContext(node)) {
+                ts.findAncestor(node.parent, function (current) {
+                    if (ts.isFunctionLike(current)) {
+                        return "quit";
+                    }
+                    if (current.kind === 233 /* LabeledStatement */ && current.label.escapedText === node.label.escapedText) {
+                        grammarErrorOnNode(node.label, ts.Diagnostics.Duplicate_label_0, ts.getTextOfNode(node.label));
+                        return true;
+                    }
+                    return false;
+                });
+            }
+            // ensure that label is unique
+            checkSourceElement(node.statement);
+        }
+        function checkThrowStatement(node) {
+            // Grammar checking
+            if (!checkGrammarStatementInAmbientContext(node)) {
+                if (node.expression === undefined) {
+                    grammarErrorAfterFirstToken(node, ts.Diagnostics.Line_break_not_permitted_here);
+                }
+            }
+            if (node.expression) {
+                checkExpression(node.expression);
+            }
+        }
+        function checkTryStatement(node) {
+            // Grammar checking
+            checkGrammarStatementInAmbientContext(node);
+            checkBlock(node.tryBlock);
+            var catchClause = node.catchClause;
+            if (catchClause) {
+                // Grammar checking
+                if (catchClause.variableDeclaration) {
+                    if (catchClause.variableDeclaration.type) {
+                        grammarErrorOnFirstToken(catchClause.variableDeclaration.type, ts.Diagnostics.Catch_clause_variable_cannot_have_a_type_annotation);
+                    }
+                    else if (catchClause.variableDeclaration.initializer) {
+                        grammarErrorOnFirstToken(catchClause.variableDeclaration.initializer, ts.Diagnostics.Catch_clause_variable_cannot_have_an_initializer);
+                    }
+                    else {
+                        var blockLocals_1 = catchClause.block.locals;
+                        if (blockLocals_1) {
+                            ts.forEachKey(catchClause.locals, function (caughtName) {
+                                var blockLocal = blockLocals_1.get(caughtName);
+                                if (blockLocal && (blockLocal.flags & 2 /* BlockScopedVariable */) !== 0) {
+                                    grammarErrorOnNode(blockLocal.valueDeclaration, ts.Diagnostics.Cannot_redeclare_identifier_0_in_catch_clause, caughtName);
+                                }
+                            });
+                        }
+                    }
+                }
+                checkBlock(catchClause.block);
+            }
+            if (node.finallyBlock) {
+                checkBlock(node.finallyBlock);
+            }
+        }
+        function checkIndexConstraints(type) {
+            var declaredNumberIndexer = getIndexDeclarationOfSymbol(type.symbol, 1 /* Number */);
+            var declaredStringIndexer = getIndexDeclarationOfSymbol(type.symbol, 0 /* String */);
+            var stringIndexType = getIndexTypeOfType(type, 0 /* String */);
+            var numberIndexType = getIndexTypeOfType(type, 1 /* Number */);
+            if (stringIndexType || numberIndexType) {
+                ts.forEach(getPropertiesOfObjectType(type), function (prop) {
+                    var propType = getTypeOfSymbol(prop);
+                    checkIndexConstraintForProperty(prop, propType, type, declaredStringIndexer, stringIndexType, 0 /* String */);
+                    checkIndexConstraintForProperty(prop, propType, type, declaredNumberIndexer, numberIndexType, 1 /* Number */);
+                });
+                var classDeclaration = type.symbol.valueDeclaration;
+                if (ts.getObjectFlags(type) & 1 /* Class */ && ts.isClassLike(classDeclaration)) {
+                    for (var _i = 0, _a = classDeclaration.members; _i < _a.length; _i++) {
+                        var member = _a[_i];
+                        // Only process instance properties with computed names here.
+                        // Static properties cannot be in conflict with indexers,
+                        // and properties with literal names were already checked.
+                        if (!ts.hasModifier(member, 32 /* Static */) && hasNonBindableDynamicName(member)) {
+                            var symbol = getSymbolOfNode(member);
+                            var propType = getTypeOfSymbol(symbol);
+                            checkIndexConstraintForProperty(symbol, propType, type, declaredStringIndexer, stringIndexType, 0 /* String */);
+                            checkIndexConstraintForProperty(symbol, propType, type, declaredNumberIndexer, numberIndexType, 1 /* Number */);
+                        }
+                    }
+                }
+            }
+            var errorNode;
+            if (stringIndexType && numberIndexType) {
+                errorNode = declaredNumberIndexer || declaredStringIndexer;
+                // condition 'errorNode === undefined' may appear if types does not declare nor string neither number indexer
+                if (!errorNode && (ts.getObjectFlags(type) & 2 /* Interface */)) {
+                    var someBaseTypeHasBothIndexers = ts.forEach(getBaseTypes(type), function (base) { return getIndexTypeOfType(base, 0 /* String */) && getIndexTypeOfType(base, 1 /* Number */); });
+                    errorNode = someBaseTypeHasBothIndexers ? undefined : type.symbol.declarations[0];
+                }
+            }
+            if (errorNode && !isTypeAssignableTo(numberIndexType, stringIndexType)) { // TODO: GH#18217
+                error(errorNode, ts.Diagnostics.Numeric_index_type_0_is_not_assignable_to_string_index_type_1, typeToString(numberIndexType), typeToString(stringIndexType));
+            }
+            function checkIndexConstraintForProperty(prop, propertyType, containingType, indexDeclaration, indexType, indexKind) {
+                // ESSymbol properties apply to neither string nor numeric indexers.
+                if (!indexType || ts.isKnownSymbol(prop)) {
+                    return;
+                }
+                var propDeclaration = prop.valueDeclaration;
+                var name = propDeclaration && ts.getNameOfDeclaration(propDeclaration);
+                // index is numeric and property name is not valid numeric literal
+                if (indexKind === 1 /* Number */ && !(name ? isNumericName(name) : isNumericLiteralName(prop.escapedName))) {
+                    return;
+                }
+                // perform property check if property or indexer is declared in 'type'
+                // this allows us to rule out cases when both property and indexer are inherited from the base class
+                var errorNode;
+                if (propDeclaration && name &&
+                    (propDeclaration.kind === 204 /* BinaryExpression */ ||
+                        name.kind === 149 /* ComputedPropertyName */ ||
+                        prop.parent === containingType.symbol)) {
+                    errorNode = propDeclaration;
+                }
+                else if (indexDeclaration) {
+                    errorNode = indexDeclaration;
+                }
+                else if (ts.getObjectFlags(containingType) & 2 /* Interface */) {
+                    // for interfaces property and indexer might be inherited from different bases
+                    // check if any base class already has both property and indexer.
+                    // check should be performed only if 'type' is the first type that brings property\indexer together
+                    var someBaseClassHasBothPropertyAndIndexer = ts.forEach(getBaseTypes(containingType), function (base) { return getPropertyOfObjectType(base, prop.escapedName) && getIndexTypeOfType(base, indexKind); });
+                    errorNode = someBaseClassHasBothPropertyAndIndexer ? undefined : containingType.symbol.declarations[0];
+                }
+                if (errorNode && !isTypeAssignableTo(propertyType, indexType)) {
+                    var errorMessage = indexKind === 0 /* String */
+                        ? ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_string_index_type_2
+                        : ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2;
+                    error(errorNode, errorMessage, symbolToString(prop), typeToString(propertyType), typeToString(indexType));
+                }
+            }
+        }
+        function checkTypeNameIsReserved(name, message) {
+            // TS 1.0 spec (April 2014): 3.6.1
+            // The predefined type keywords are reserved and cannot be used as names of user defined types.
+            switch (name.escapedText) {
+                case "any":
+                case "unknown":
+                case "number":
+                case "bigint":
+                case "boolean":
+                case "string":
+                case "symbol":
+                case "void":
+                case "object":
+                    error(name, message, name.escapedText);
+            }
+        }
+        /**
+         * The name cannot be used as 'Object' of user defined types with special target.
+         */
+        function checkClassNameCollisionWithObject(name) {
+            if (languageVersion === 1 /* ES5 */ && name.escapedText === "Object"
+                && moduleKind !== ts.ModuleKind.ES2015 && moduleKind !== ts.ModuleKind.ESNext) {
+                error(name, ts.Diagnostics.Class_name_cannot_be_Object_when_targeting_ES5_with_module_0, ts.ModuleKind[moduleKind]); // https://github.com/Microsoft/TypeScript/issues/17494
+            }
+        }
+        /**
+         * Check each type parameter and check that type parameters have no duplicate type parameter declarations
+         */
+        function checkTypeParameters(typeParameterDeclarations) {
+            if (typeParameterDeclarations) {
+                var seenDefault = false;
+                for (var i = 0; i < typeParameterDeclarations.length; i++) {
+                    var node = typeParameterDeclarations[i];
+                    checkTypeParameter(node);
+                    if (produceDiagnostics) {
+                        if (node.default) {
+                            seenDefault = true;
+                            checkTypeParametersNotReferenced(node.default, typeParameterDeclarations, i);
+                        }
+                        else if (seenDefault) {
+                            error(node, ts.Diagnostics.Required_type_parameters_may_not_follow_optional_type_parameters);
+                        }
+                        for (var j = 0; j < i; j++) {
+                            if (typeParameterDeclarations[j].symbol === node.symbol) {
+                                error(node.name, ts.Diagnostics.Duplicate_identifier_0, ts.declarationNameToString(node.name));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        /** Check that type parameter defaults only reference previously declared type parameters */
+        function checkTypeParametersNotReferenced(root, typeParameters, index) {
+            visit(root);
+            function visit(node) {
+                if (node.kind === 164 /* TypeReference */) {
+                    var type = getTypeFromTypeReference(node);
+                    if (type.flags & 262144 /* TypeParameter */) {
+                        for (var i = index; i < typeParameters.length; i++) {
+                            if (type.symbol === getSymbolOfNode(typeParameters[i])) {
+                                error(node, ts.Diagnostics.Type_parameter_defaults_can_only_reference_previously_declared_type_parameters);
+                            }
+                        }
+                    }
+                }
+                ts.forEachChild(node, visit);
+            }
+        }
+        /** Check that type parameter lists are identical across multiple declarations */
+        function checkTypeParameterListsIdentical(symbol) {
+            if (symbol.declarations.length === 1) {
+                return;
+            }
+            var links = getSymbolLinks(symbol);
+            if (!links.typeParametersChecked) {
+                links.typeParametersChecked = true;
+                var declarations = getClassOrInterfaceDeclarationsOfSymbol(symbol);
+                if (declarations.length <= 1) {
+                    return;
+                }
+                var type = getDeclaredTypeOfSymbol(symbol);
+                if (!areTypeParametersIdentical(declarations, type.localTypeParameters)) {
+                    // Report an error on every conflicting declaration.
+                    var name = symbolToString(symbol);
+                    for (var _i = 0, declarations_6 = declarations; _i < declarations_6.length; _i++) {
+                        var declaration = declarations_6[_i];
+                        error(declaration.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_type_parameters, name);
+                    }
+                }
+            }
+        }
+        function areTypeParametersIdentical(declarations, targetParameters) {
+            var maxTypeArgumentCount = ts.length(targetParameters);
+            var minTypeArgumentCount = getMinTypeArgumentCount(targetParameters);
+            for (var _i = 0, declarations_7 = declarations; _i < declarations_7.length; _i++) {
+                var declaration = declarations_7[_i];
+                // If this declaration has too few or too many type parameters, we report an error
+                var sourceParameters = ts.getEffectiveTypeParameterDeclarations(declaration);
+                var numTypeParameters = sourceParameters.length;
+                if (numTypeParameters < minTypeArgumentCount || numTypeParameters > maxTypeArgumentCount) {
+                    return false;
+                }
+                for (var i = 0; i < numTypeParameters; i++) {
+                    var source = sourceParameters[i];
+                    var target = targetParameters[i];
+                    // If the type parameter node does not have the same as the resolved type
+                    // parameter at this position, we report an error.
+                    if (source.name.escapedText !== target.symbol.escapedName) {
+                        return false;
+                    }
+                    // If the type parameter node does not have an identical constraint as the resolved
+                    // type parameter at this position, we report an error.
+                    var constraint = ts.getEffectiveConstraintOfTypeParameter(source);
+                    var sourceConstraint = constraint && getTypeFromTypeNode(constraint);
+                    var targetConstraint = getConstraintOfTypeParameter(target);
+                    if (sourceConstraint) {
+                        // relax check if later interface augmentation has no constraint
+                        if (!targetConstraint || !isTypeIdenticalTo(sourceConstraint, targetConstraint)) {
+                            return false;
+                        }
+                    }
+                    // If the type parameter node has a default and it is not identical to the default
+                    // for the type parameter at this position, we report an error.
+                    var sourceDefault = source.default && getTypeFromTypeNode(source.default);
+                    var targetDefault = getDefaultFromTypeParameter(target);
+                    if (sourceDefault && targetDefault && !isTypeIdenticalTo(sourceDefault, targetDefault)) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+        function checkClassExpression(node) {
+            checkClassLikeDeclaration(node);
+            checkNodeDeferred(node);
+            return getTypeOfSymbol(getSymbolOfNode(node));
+        }
+        function checkClassExpressionDeferred(node) {
+            ts.forEach(node.members, checkSourceElement);
+            registerForUnusedIdentifiersCheck(node);
+        }
+        function checkClassDeclaration(node) {
+            if (!node.name && !ts.hasModifier(node, 512 /* Default */)) {
+                grammarErrorOnFirstToken(node, ts.Diagnostics.A_class_declaration_without_the_default_modifier_must_have_a_name);
+            }
+            checkClassLikeDeclaration(node);
+            ts.forEach(node.members, checkSourceElement);
+            registerForUnusedIdentifiersCheck(node);
+        }
+        function checkClassLikeDeclaration(node) {
+            checkGrammarClassLikeDeclaration(node);
+            checkDecorators(node);
+            if (node.name) {
+                checkTypeNameIsReserved(node.name, ts.Diagnostics.Class_name_cannot_be_0);
+                checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+                checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
+                if (!(node.flags & 4194304 /* Ambient */)) {
+                    checkClassNameCollisionWithObject(node.name);
+                }
+            }
+            checkTypeParameters(ts.getEffectiveTypeParameterDeclarations(node));
+            checkExportsOnMergedDeclarations(node);
+            var symbol = getSymbolOfNode(node);
+            var type = getDeclaredTypeOfSymbol(symbol);
+            var typeWithThis = getTypeWithThisArgument(type);
+            var staticType = getTypeOfSymbol(symbol);
+            checkTypeParameterListsIdentical(symbol);
+            checkClassForDuplicateDeclarations(node);
+            // Only check for reserved static identifiers on non-ambient context.
+            if (!(node.flags & 4194304 /* Ambient */)) {
+                checkClassForStaticPropertyNameConflicts(node);
+            }
+            var baseTypeNode = ts.getEffectiveBaseTypeNode(node);
+            if (baseTypeNode) {
+                if (languageVersion < 2 /* ES2015 */) {
+                    checkExternalEmitHelpers(baseTypeNode.parent, 1 /* Extends */);
+                }
+                var baseTypes = getBaseTypes(type);
+                if (baseTypes.length && produceDiagnostics) {
+                    var baseType_1 = baseTypes[0];
+                    var baseConstructorType = getBaseConstructorTypeOfClass(type);
+                    var staticBaseType = getApparentType(baseConstructorType);
+                    checkBaseTypeAccessibility(staticBaseType, baseTypeNode);
+                    checkSourceElement(baseTypeNode.expression);
+                    var extendsNode = ts.getClassExtendsHeritageElement(node);
+                    if (extendsNode && extendsNode !== baseTypeNode) {
+                        checkExpression(extendsNode.expression);
+                    }
+                    if (ts.some(baseTypeNode.typeArguments)) {
+                        ts.forEach(baseTypeNode.typeArguments, checkSourceElement);
+                        for (var _i = 0, _a = getConstructorsForTypeArguments(staticBaseType, baseTypeNode.typeArguments, baseTypeNode); _i < _a.length; _i++) {
+                            var constructor = _a[_i];
+                            if (!checkTypeArgumentConstraints(baseTypeNode, constructor.typeParameters)) {
+                                break;
+                            }
+                        }
+                    }
+                    var baseWithThis = getTypeWithThisArgument(baseType_1, type.thisType);
+                    if (!checkTypeAssignableTo(typeWithThis, baseWithThis, /*errorNode*/ undefined)) {
+                        issueMemberSpecificError(node, typeWithThis, baseWithThis, ts.Diagnostics.Class_0_incorrectly_extends_base_class_1);
+                    }
+                    else {
+                        // Report static side error only when instance type is assignable
+                        checkTypeAssignableTo(staticType, getTypeWithoutSignatures(staticBaseType), node.name || node, ts.Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1);
+                    }
+                    if (baseConstructorType.flags & 8650752 /* TypeVariable */ && !isMixinConstructorType(staticType)) {
+                        error(node.name || node, ts.Diagnostics.A_mixin_class_must_have_a_constructor_with_a_single_rest_parameter_of_type_any);
+                    }
+                    if (!(staticBaseType.symbol && staticBaseType.symbol.flags & 32 /* Class */) && !(baseConstructorType.flags & 8650752 /* TypeVariable */)) {
+                        // When the static base type is a "class-like" constructor function (but not actually a class), we verify
+                        // that all instantiated base constructor signatures return the same type. We can simply compare the type
+                        // references (as opposed to checking the structure of the types) because elsewhere we have already checked
+                        // that the base type is a class or interface type (and not, for example, an anonymous object type).
+                        // (Javascript constructor functions have this property trivially true since their return type is ignored.)
+                        var constructors = getInstantiatedConstructorsForTypeArguments(staticBaseType, baseTypeNode.typeArguments, baseTypeNode);
+                        if (ts.forEach(constructors, function (sig) { return !isJSConstructor(sig.declaration) && getReturnTypeOfSignature(sig) !== baseType_1; })) {
+                            error(baseTypeNode.expression, ts.Diagnostics.Base_constructors_must_all_have_the_same_return_type);
+                        }
+                    }
+                    checkKindsOfPropertyMemberOverrides(type, baseType_1);
+                }
+            }
+            var implementedTypeNodes = ts.getClassImplementsHeritageClauseElements(node);
+            if (implementedTypeNodes) {
+                for (var _b = 0, implementedTypeNodes_1 = implementedTypeNodes; _b < implementedTypeNodes_1.length; _b++) {
+                    var typeRefNode = implementedTypeNodes_1[_b];
+                    if (!ts.isEntityNameExpression(typeRefNode.expression)) {
+                        error(typeRefNode.expression, ts.Diagnostics.A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments);
+                    }
+                    checkTypeReferenceNode(typeRefNode);
+                    if (produceDiagnostics) {
+                        var t = getTypeFromTypeNode(typeRefNode);
+                        if (t !== errorType) {
+                            if (isValidBaseType(t)) {
+                                var genericDiag = t.symbol && t.symbol.flags & 32 /* Class */ ?
+                                    ts.Diagnostics.Class_0_incorrectly_implements_class_1_Did_you_mean_to_extend_1_and_inherit_its_members_as_a_subclass :
+                                    ts.Diagnostics.Class_0_incorrectly_implements_interface_1;
+                                var baseWithThis = getTypeWithThisArgument(t, type.thisType);
+                                if (!checkTypeAssignableTo(typeWithThis, baseWithThis, /*errorNode*/ undefined)) {
+                                    issueMemberSpecificError(node, typeWithThis, baseWithThis, genericDiag);
+                                }
+                            }
+                            else {
+                                error(typeRefNode, ts.Diagnostics.A_class_can_only_implement_an_object_type_or_intersection_of_object_types_with_statically_known_members);
+                            }
+                        }
+                    }
+                }
+            }
+            if (produceDiagnostics) {
+                checkIndexConstraints(type);
+                checkTypeForDuplicateIndexSignatures(node);
+                checkPropertyInitialization(node);
+            }
+        }
+        function issueMemberSpecificError(node, typeWithThis, baseWithThis, broadDiag) {
+            // iterate over all implemented properties and issue errors on each one which isn't compatible, rather than the class as a whole, if possible
+            var issuedMemberError = false;
+            var _loop_9 = function (member) {
+                if (ts.hasStaticModifier(member)) {
+                    return "continue";
+                }
+                var declaredProp = member.name && getSymbolAtLocation(member.name) || getSymbolAtLocation(member);
+                if (declaredProp) {
+                    var prop = getPropertyOfType(typeWithThis, declaredProp.escapedName);
+                    var baseProp = getPropertyOfType(baseWithThis, declaredProp.escapedName);
+                    if (prop && baseProp) {
+                        var rootChain = function () { return ts.chainDiagnosticMessages(
+                        /*details*/ undefined, ts.Diagnostics.Property_0_in_type_1_is_not_assignable_to_the_same_property_in_base_type_2, symbolToString(declaredProp), typeToString(typeWithThis), typeToString(baseWithThis)); };
+                        if (!checkTypeAssignableTo(getTypeOfSymbol(prop), getTypeOfSymbol(baseProp), member.name || member, /*message*/ undefined, rootChain)) {
+                            issuedMemberError = true;
+                        }
+                    }
+                }
+            };
+            for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
+                var member = _a[_i];
+                _loop_9(member);
+            }
+            if (!issuedMemberError) {
+                // check again with diagnostics to generate a less-specific error
+                checkTypeAssignableTo(typeWithThis, baseWithThis, node.name || node, broadDiag);
+            }
+        }
+        function checkBaseTypeAccessibility(type, node) {
+            var signatures = getSignaturesOfType(type, 1 /* Construct */);
+            if (signatures.length) {
+                var declaration = signatures[0].declaration;
+                if (declaration && ts.hasModifier(declaration, 8 /* Private */)) {
+                    var typeClassDeclaration = ts.getClassLikeDeclarationOfSymbol(type.symbol);
+                    if (!isNodeWithinClass(node, typeClassDeclaration)) {
+                        error(node, ts.Diagnostics.Cannot_extend_a_class_0_Class_constructor_is_marked_as_private, getFullyQualifiedName(type.symbol));
+                    }
+                }
+            }
+        }
+        function getTargetSymbol(s) {
+            // if symbol is instantiated its flags are not copied from the 'target'
+            // so we'll need to get back original 'target' symbol to work with correct set of flags
+            return ts.getCheckFlags(s) & 1 /* Instantiated */ ? s.target : s;
+        }
+        function getClassOrInterfaceDeclarationsOfSymbol(symbol) {
+            return ts.filter(symbol.declarations, function (d) {
+                return d.kind === 240 /* ClassDeclaration */ || d.kind === 241 /* InterfaceDeclaration */;
+            });
+        }
+        function checkKindsOfPropertyMemberOverrides(type, baseType) {
+            // TypeScript 1.0 spec (April 2014): 8.2.3
+            // A derived class inherits all members from its base class it doesn't override.
+            // Inheritance means that a derived class implicitly contains all non - overridden members of the base class.
+            // Both public and private property members are inherited, but only public property members can be overridden.
+            // A property member in a derived class is said to override a property member in a base class
+            // when the derived class property member has the same name and kind(instance or static)
+            // as the base class property member.
+            // The type of an overriding property member must be assignable(section 3.8.4)
+            // to the type of the overridden property member, or otherwise a compile - time error occurs.
+            // Base class instance member functions can be overridden by derived class instance member functions,
+            // but not by other kinds of members.
+            // Base class instance member variables and accessors can be overridden by
+            // derived class instance member variables and accessors, but not by other kinds of members.
+            // NOTE: assignability is checked in checkClassDeclaration
+            var baseProperties = getPropertiesOfType(baseType);
+            for (var _i = 0, baseProperties_1 = baseProperties; _i < baseProperties_1.length; _i++) {
+                var baseProperty = baseProperties_1[_i];
+                var base = getTargetSymbol(baseProperty);
+                if (base.flags & 4194304 /* Prototype */) {
+                    continue;
+                }
+                var derived = getTargetSymbol(getPropertyOfObjectType(type, base.escapedName)); // TODO: GH#18217
+                var baseDeclarationFlags = ts.getDeclarationModifierFlagsFromSymbol(base);
+                ts.Debug.assert(!!derived, "derived should point to something, even if it is the base class' declaration.");
+                if (derived) {
+                    // In order to resolve whether the inherited method was overridden in the base class or not,
+                    // we compare the Symbols obtained. Since getTargetSymbol returns the symbol on the *uninstantiated*
+                    // type declaration, derived and base resolve to the same symbol even in the case of generic classes.
+                    if (derived === base) {
+                        // derived class inherits base without override/redeclaration
+                        var derivedClassDecl = ts.getClassLikeDeclarationOfSymbol(type.symbol);
+                        // It is an error to inherit an abstract member without implementing it or being declared abstract.
+                        // If there is no declaration for the derived class (as in the case of class expressions),
+                        // then the class cannot be declared abstract.
+                        if (baseDeclarationFlags & 128 /* Abstract */ && (!derivedClassDecl || !ts.hasModifier(derivedClassDecl, 128 /* Abstract */))) {
+                            if (derivedClassDecl.kind === 209 /* ClassExpression */) {
+                                error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType));
+                            }
+                            else {
+                                error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2, typeToString(type), symbolToString(baseProperty), typeToString(baseType));
+                            }
+                        }
+                    }
+                    else {
+                        // derived overrides base.
+                        var derivedDeclarationFlags = ts.getDeclarationModifierFlagsFromSymbol(derived);
+                        if (baseDeclarationFlags & 8 /* Private */ || derivedDeclarationFlags & 8 /* Private */) {
+                            // either base or derived property is private - not override, skip it
+                            continue;
+                        }
+                        if (isPrototypeProperty(base) || base.flags & 98308 /* PropertyOrAccessor */ && derived.flags & 98308 /* PropertyOrAccessor */) {
+                            // method is overridden with method or property/accessor is overridden with property/accessor - correct case
+                            continue;
+                        }
+                        var errorMessage = void 0;
+                        if (isPrototypeProperty(base)) {
+                            if (derived.flags & 98304 /* Accessor */) {
+                                errorMessage = ts.Diagnostics.Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor;
+                            }
+                            else {
+                                errorMessage = ts.Diagnostics.Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_property;
+                            }
+                        }
+                        else if (base.flags & 98304 /* Accessor */) {
+                            errorMessage = ts.Diagnostics.Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function;
+                        }
+                        else {
+                            errorMessage = ts.Diagnostics.Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function;
+                        }
+                        error(ts.getNameOfDeclaration(derived.valueDeclaration) || derived.valueDeclaration, errorMessage, typeToString(baseType), symbolToString(base), typeToString(type));
+                    }
+                }
+            }
+        }
+        function checkInheritedPropertiesAreIdentical(type, typeNode) {
+            var baseTypes = getBaseTypes(type);
+            if (baseTypes.length < 2) {
+                return true;
+            }
+            var seen = ts.createUnderscoreEscapedMap();
+            ts.forEach(resolveDeclaredMembers(type).declaredProperties, function (p) { seen.set(p.escapedName, { prop: p, containingType: type }); });
+            var ok = true;
+            for (var _i = 0, baseTypes_2 = baseTypes; _i < baseTypes_2.length; _i++) {
+                var base = baseTypes_2[_i];
+                var properties = getPropertiesOfType(getTypeWithThisArgument(base, type.thisType));
+                for (var _a = 0, properties_7 = properties; _a < properties_7.length; _a++) {
+                    var prop = properties_7[_a];
+                    var existing = seen.get(prop.escapedName);
+                    if (!existing) {
+                        seen.set(prop.escapedName, { prop: prop, containingType: base });
+                    }
+                    else {
+                        var isInheritedProperty = existing.containingType !== type;
+                        if (isInheritedProperty && !isPropertyIdenticalTo(existing.prop, prop)) {
+                            ok = false;
+                            var typeName1 = typeToString(existing.containingType);
+                            var typeName2 = typeToString(base);
+                            var errorInfo = ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Named_property_0_of_types_1_and_2_are_not_identical, symbolToString(prop), typeName1, typeName2);
+                            errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Interface_0_cannot_simultaneously_extend_types_1_and_2, typeToString(type), typeName1, typeName2);
+                            diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(typeNode, errorInfo));
+                        }
+                    }
+                }
+            }
+            return ok;
+        }
+        function checkPropertyInitialization(node) {
+            if (!strictNullChecks || !strictPropertyInitialization || node.flags & 4194304 /* Ambient */) {
+                return;
+            }
+            var constructor = findConstructorDeclaration(node);
+            for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
+                var member = _a[_i];
+                if (isInstancePropertyWithoutInitializer(member)) {
+                    var propName = member.name;
+                    if (ts.isIdentifier(propName)) {
+                        var type = getTypeOfSymbol(getSymbolOfNode(member));
+                        if (!(type.flags & 3 /* AnyOrUnknown */ || getFalsyFlags(type) & 32768 /* Undefined */)) {
+                            if (!constructor || !isPropertyInitializedInConstructor(propName, type, constructor)) {
+                                error(member.name, ts.Diagnostics.Property_0_has_no_initializer_and_is_not_definitely_assigned_in_the_constructor, ts.declarationNameToString(propName));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        function isInstancePropertyWithoutInitializer(node) {
+            return node.kind === 154 /* PropertyDeclaration */ &&
+                !ts.hasModifier(node, 32 /* Static */ | 128 /* Abstract */) &&
+                !node.exclamationToken &&
+                !node.initializer;
+        }
+        function isPropertyInitializedInConstructor(propName, propType, constructor) {
+            var reference = ts.createPropertyAccess(ts.createThis(), propName);
+            reference.expression.parent = reference;
+            reference.parent = constructor;
+            reference.flowNode = constructor.returnFlowNode;
+            var flowType = getFlowTypeOfReference(reference, propType, getOptionalType(propType));
+            return !(getFalsyFlags(flowType) & 32768 /* Undefined */);
+        }
+        function checkInterfaceDeclaration(node) {
+            // Grammar checking
+            if (!checkGrammarDecoratorsAndModifiers(node))
+                checkGrammarInterfaceDeclaration(node);
+            checkTypeParameters(node.typeParameters);
+            if (produceDiagnostics) {
+                checkTypeNameIsReserved(node.name, ts.Diagnostics.Interface_name_cannot_be_0);
+                checkExportsOnMergedDeclarations(node);
+                var symbol = getSymbolOfNode(node);
+                checkTypeParameterListsIdentical(symbol);
+                // Only check this symbol once
+                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 241 /* InterfaceDeclaration */);
+                if (node === firstInterfaceDecl) {
+                    var type = getDeclaredTypeOfSymbol(symbol);
+                    var typeWithThis = getTypeWithThisArgument(type);
+                    // run subsequent checks only if first set succeeded
+                    if (checkInheritedPropertiesAreIdentical(type, node.name)) {
+                        for (var _i = 0, _a = getBaseTypes(type); _i < _a.length; _i++) {
+                            var baseType = _a[_i];
+                            checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(baseType, type.thisType), node.name, ts.Diagnostics.Interface_0_incorrectly_extends_interface_1);
+                        }
+                        checkIndexConstraints(type);
+                    }
+                }
+                checkObjectTypeForDuplicateDeclarations(node);
+            }
+            ts.forEach(ts.getInterfaceBaseTypeNodes(node), function (heritageElement) {
+                if (!ts.isEntityNameExpression(heritageElement.expression)) {
+                    error(heritageElement.expression, ts.Diagnostics.An_interface_can_only_extend_an_identifier_Slashqualified_name_with_optional_type_arguments);
+                }
+                checkTypeReferenceNode(heritageElement);
+            });
+            ts.forEach(node.members, checkSourceElement);
+            if (produceDiagnostics) {
+                checkTypeForDuplicateIndexSignatures(node);
+                registerForUnusedIdentifiersCheck(node);
+            }
+        }
+        function checkTypeAliasDeclaration(node) {
+            // Grammar checking
+            checkGrammarDecoratorsAndModifiers(node);
+            checkTypeNameIsReserved(node.name, ts.Diagnostics.Type_alias_name_cannot_be_0);
+            checkTypeParameters(node.typeParameters);
+            checkSourceElement(node.type);
+            registerForUnusedIdentifiersCheck(node);
+        }
+        function computeEnumMemberValues(node) {
+            var nodeLinks = getNodeLinks(node);
+            if (!(nodeLinks.flags & 16384 /* EnumValuesComputed */)) {
+                nodeLinks.flags |= 16384 /* EnumValuesComputed */;
+                var autoValue = 0;
+                for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
+                    var member = _a[_i];
+                    var value = computeMemberValue(member, autoValue);
+                    getNodeLinks(member).enumMemberValue = value;
+                    autoValue = typeof value === "number" ? value + 1 : undefined;
+                }
+            }
+        }
+        function computeMemberValue(member, autoValue) {
+            if (isComputedNonLiteralName(member.name)) {
+                error(member.name, ts.Diagnostics.Computed_property_names_are_not_allowed_in_enums);
+            }
+            else {
+                var text = ts.getTextOfPropertyName(member.name);
+                if (isNumericLiteralName(text) && !isInfinityOrNaNString(text)) {
+                    error(member.name, ts.Diagnostics.An_enum_member_cannot_have_a_numeric_name);
+                }
+            }
+            if (member.initializer) {
+                return computeConstantValue(member);
+            }
+            // In ambient enum declarations that specify no const modifier, enum member declarations that omit
+            // a value are considered computed members (as opposed to having auto-incremented values).
+            if (member.parent.flags & 4194304 /* Ambient */ && !ts.isEnumConst(member.parent)) {
+                return undefined;
+            }
+            // If the member declaration specifies no value, the member is considered a constant enum member.
+            // If the member is the first member in the enum declaration, it is assigned the value zero.
+            // Otherwise, it is assigned the value of the immediately preceding member plus one, and an error
+            // occurs if the immediately preceding member is not a constant enum member.
+            if (autoValue !== undefined) {
+                return autoValue;
+            }
+            error(member.name, ts.Diagnostics.Enum_member_must_have_initializer);
+            return undefined;
+        }
+        function computeConstantValue(member) {
+            var enumKind = getEnumKind(getSymbolOfNode(member.parent));
+            var isConstEnum = ts.isEnumConst(member.parent);
+            var initializer = member.initializer;
+            var value = enumKind === 1 /* Literal */ && !isLiteralEnumMember(member) ? undefined : evaluate(initializer);
+            if (value !== undefined) {
+                if (isConstEnum && typeof value === "number" && !isFinite(value)) {
+                    error(initializer, isNaN(value) ?
+                        ts.Diagnostics.const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN :
+                        ts.Diagnostics.const_enum_member_initializer_was_evaluated_to_a_non_finite_value);
+                }
+            }
+            else if (enumKind === 1 /* Literal */) {
+                error(initializer, ts.Diagnostics.Computed_values_are_not_permitted_in_an_enum_with_string_valued_members);
+                return 0;
+            }
+            else if (isConstEnum) {
+                error(initializer, ts.Diagnostics.const_enum_member_initializers_can_only_contain_literal_values_and_other_computed_enum_values);
+            }
+            else if (member.parent.flags & 4194304 /* Ambient */) {
+                error(initializer, ts.Diagnostics.In_ambient_enum_declarations_member_initializer_must_be_constant_expression);
+            }
+            else {
+                // Only here do we need to check that the initializer is assignable to the enum type.
+                checkTypeAssignableTo(checkExpression(initializer), getDeclaredTypeOfSymbol(getSymbolOfNode(member.parent)), initializer, /*headMessage*/ undefined);
+            }
+            return value;
+            function evaluate(expr) {
+                switch (expr.kind) {
+                    case 202 /* PrefixUnaryExpression */:
+                        var value_2 = evaluate(expr.operand);
+                        if (typeof value_2 === "number") {
+                            switch (expr.operator) {
+                                case 38 /* PlusToken */: return value_2;
+                                case 39 /* MinusToken */: return -value_2;
+                                case 53 /* TildeToken */: return ~value_2;
+                            }
+                        }
+                        break;
+                    case 204 /* BinaryExpression */:
+                        var left = evaluate(expr.left);
+                        var right = evaluate(expr.right);
+                        if (typeof left === "number" && typeof right === "number") {
+                            switch (expr.operatorToken.kind) {
+                                case 50 /* BarToken */: return left | right;
+                                case 49 /* AmpersandToken */: return left & right;
+                                case 47 /* GreaterThanGreaterThanToken */: return left >> right;
+                                case 48 /* GreaterThanGreaterThanGreaterThanToken */: return left >>> right;
+                                case 46 /* LessThanLessThanToken */: return left << right;
+                                case 51 /* CaretToken */: return left ^ right;
+                                case 40 /* AsteriskToken */: return left * right;
+                                case 42 /* SlashToken */: return left / right;
+                                case 38 /* PlusToken */: return left + right;
+                                case 39 /* MinusToken */: return left - right;
+                                case 43 /* PercentToken */: return left % right;
+                                case 41 /* AsteriskAsteriskToken */: return Math.pow(left, right);
+                            }
+                        }
+                        else if (typeof left === "string" && typeof right === "string" && expr.operatorToken.kind === 38 /* PlusToken */) {
+                            return left + right;
+                        }
+                        break;
+                    case 10 /* StringLiteral */:
+                        return expr.text;
+                    case 8 /* NumericLiteral */:
+                        checkGrammarNumericLiteral(expr);
+                        return +expr.text;
+                    case 195 /* ParenthesizedExpression */:
+                        return evaluate(expr.expression);
+                    case 72 /* Identifier */:
+                        var identifier = expr;
+                        if (isInfinityOrNaNString(identifier.escapedText)) {
+                            return +(identifier.escapedText);
+                        }
+                        return ts.nodeIsMissing(expr) ? 0 : evaluateEnumMember(expr, getSymbolOfNode(member.parent), identifier.escapedText);
+                    case 190 /* ElementAccessExpression */:
+                    case 189 /* PropertyAccessExpression */:
+                        var ex = expr;
+                        if (isConstantMemberAccess(ex)) {
+                            var type = getTypeOfExpression(ex.expression);
+                            if (type.symbol && type.symbol.flags & 384 /* Enum */) {
+                                var name = void 0;
+                                if (ex.kind === 189 /* PropertyAccessExpression */) {
+                                    name = ex.name.escapedText;
+                                }
+                                else {
+                                    var argument = ex.argumentExpression;
+                                    ts.Debug.assert(ts.isLiteralExpression(argument));
+                                    name = ts.escapeLeadingUnderscores(argument.text);
+                                }
+                                return evaluateEnumMember(expr, type.symbol, name);
+                            }
+                        }
+                        break;
+                }
+                return undefined;
+            }
+            function evaluateEnumMember(expr, enumSymbol, name) {
+                var memberSymbol = enumSymbol.exports.get(name);
+                if (memberSymbol) {
+                    var declaration = memberSymbol.valueDeclaration;
+                    if (declaration !== member) {
+                        if (isBlockScopedNameDeclaredBeforeUse(declaration, member)) {
+                            return getEnumMemberValue(declaration);
+                        }
+                        error(expr, ts.Diagnostics.A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums);
+                        return 0;
+                    }
+                }
+                return undefined;
+            }
+        }
+        function isConstantMemberAccess(node) {
+            return node.kind === 72 /* Identifier */ ||
+                node.kind === 189 /* PropertyAccessExpression */ && isConstantMemberAccess(node.expression) ||
+                node.kind === 190 /* ElementAccessExpression */ && isConstantMemberAccess(node.expression) &&
+                    node.argumentExpression.kind === 10 /* StringLiteral */;
+        }
+        function checkEnumDeclaration(node) {
+            if (!produceDiagnostics) {
+                return;
+            }
+            // Grammar checking
+            checkGrammarDecoratorsAndModifiers(node);
+            checkTypeNameIsReserved(node.name, ts.Diagnostics.Enum_name_cannot_be_0);
+            checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+            checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
+            checkExportsOnMergedDeclarations(node);
+            computeEnumMemberValues(node);
+            var enumIsConst = ts.isEnumConst(node);
+            if (compilerOptions.isolatedModules && enumIsConst && node.flags & 4194304 /* Ambient */) {
+                error(node.name, ts.Diagnostics.Ambient_const_enums_are_not_allowed_when_the_isolatedModules_flag_is_provided);
+            }
+            // Spec 2014 - Section 9.3:
+            // It isn't possible for one enum declaration to continue the automatic numbering sequence of another,
+            // and when an enum type has multiple declarations, only one declaration is permitted to omit a value
+            // for the first member.
+            //
+            // Only perform this check once per symbol
+            var enumSymbol = getSymbolOfNode(node);
+            var firstDeclaration = ts.getDeclarationOfKind(enumSymbol, node.kind);
+            if (node === firstDeclaration) {
+                if (enumSymbol.declarations.length > 1) {
+                    // check that const is placed\omitted on all enum declarations
+                    ts.forEach(enumSymbol.declarations, function (decl) {
+                        if (ts.isEnumDeclaration(decl) && ts.isEnumConst(decl) !== enumIsConst) {
+                            error(ts.getNameOfDeclaration(decl), ts.Diagnostics.Enum_declarations_must_all_be_const_or_non_const);
+                        }
+                    });
+                }
+                var seenEnumMissingInitialInitializer_1 = false;
+                ts.forEach(enumSymbol.declarations, function (declaration) {
+                    // return true if we hit a violation of the rule, false otherwise
+                    if (declaration.kind !== 243 /* EnumDeclaration */) {
+                        return false;
+                    }
+                    var enumDeclaration = declaration;
+                    if (!enumDeclaration.members.length) {
+                        return false;
+                    }
+                    var firstEnumMember = enumDeclaration.members[0];
+                    if (!firstEnumMember.initializer) {
+                        if (seenEnumMissingInitialInitializer_1) {
+                            error(firstEnumMember.name, ts.Diagnostics.In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element);
+                        }
+                        else {
+                            seenEnumMissingInitialInitializer_1 = true;
+                        }
+                    }
+                });
+            }
+        }
+        function getFirstNonAmbientClassOrFunctionDeclaration(symbol) {
+            var declarations = symbol.declarations;
+            for (var _i = 0, declarations_8 = declarations; _i < declarations_8.length; _i++) {
+                var declaration = declarations_8[_i];
+                if ((declaration.kind === 240 /* ClassDeclaration */ ||
+                    (declaration.kind === 239 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
+                    !(declaration.flags & 4194304 /* Ambient */)) {
+                    return declaration;
+                }
+            }
+            return undefined;
+        }
+        function inSameLexicalScope(node1, node2) {
+            var container1 = ts.getEnclosingBlockScopeContainer(node1);
+            var container2 = ts.getEnclosingBlockScopeContainer(node2);
+            if (isGlobalSourceFile(container1)) {
+                return isGlobalSourceFile(container2);
+            }
+            else if (isGlobalSourceFile(container2)) {
+                return false;
+            }
+            else {
+                return container1 === container2;
+            }
+        }
+        function checkModuleDeclaration(node) {
+            if (produceDiagnostics) {
+                // Grammar checking
+                var isGlobalAugmentation = ts.isGlobalScopeAugmentation(node);
+                var inAmbientContext = node.flags & 4194304 /* Ambient */;
+                if (isGlobalAugmentation && !inAmbientContext) {
+                    error(node.name, ts.Diagnostics.Augmentations_for_the_global_scope_should_have_declare_modifier_unless_they_appear_in_already_ambient_context);
+                }
+                var isAmbientExternalModule = ts.isAmbientModule(node);
+                var contextErrorMessage = isAmbientExternalModule
+                    ? ts.Diagnostics.An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file
+                    : ts.Diagnostics.A_namespace_declaration_is_only_allowed_in_a_namespace_or_module;
+                if (checkGrammarModuleElementContext(node, contextErrorMessage)) {
+                    // If we hit a module declaration in an illegal context, just bail out to avoid cascading errors.
+                    return;
+                }
+                if (!checkGrammarDecoratorsAndModifiers(node)) {
+                    if (!inAmbientContext && node.name.kind === 10 /* StringLiteral */) {
+                        grammarErrorOnNode(node.name, ts.Diagnostics.Only_ambient_modules_can_use_quoted_names);
+                    }
+                }
+                if (ts.isIdentifier(node.name)) {
+                    checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+                    checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
+                }
+                checkExportsOnMergedDeclarations(node);
+                var symbol = getSymbolOfNode(node);
+                // The following checks only apply on a non-ambient instantiated module declaration.
+                if (symbol.flags & 512 /* ValueModule */
+                    && symbol.declarations.length > 1
+                    && !inAmbientContext
+                    && isInstantiatedModule(node, !!compilerOptions.preserveConstEnums || !!compilerOptions.isolatedModules)) {
+                    var firstNonAmbientClassOrFunc = getFirstNonAmbientClassOrFunctionDeclaration(symbol);
+                    if (firstNonAmbientClassOrFunc) {
+                        if (ts.getSourceFileOfNode(node) !== ts.getSourceFileOfNode(firstNonAmbientClassOrFunc)) {
+                            error(node.name, ts.Diagnostics.A_namespace_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merged);
+                        }
+                        else if (node.pos < firstNonAmbientClassOrFunc.pos) {
+                            error(node.name, ts.Diagnostics.A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged);
+                        }
+                    }
+                    // if the module merges with a class declaration in the same lexical scope,
+                    // we need to track this to ensure the correct emit.
+                    var mergedClass = ts.getDeclarationOfKind(symbol, 240 /* ClassDeclaration */);
+                    if (mergedClass &&
+                        inSameLexicalScope(node, mergedClass)) {
+                        getNodeLinks(node).flags |= 32768 /* LexicalModuleMergesWithClass */;
+                    }
+                }
+                if (isAmbientExternalModule) {
+                    if (ts.isExternalModuleAugmentation(node)) {
+                        // body of the augmentation should be checked for consistency only if augmentation was applied to its target (either global scope or module)
+                        // otherwise we'll be swamped in cascading errors.
+                        // We can detect if augmentation was applied using following rules:
+                        // - augmentation for a global scope is always applied
+                        // - augmentation for some external module is applied if symbol for augmentation is merged (it was combined with target module).
+                        var checkBody = isGlobalAugmentation || (getSymbolOfNode(node).flags & 33554432 /* Transient */);
+                        if (checkBody && node.body) {
+                            for (var _i = 0, _a = node.body.statements; _i < _a.length; _i++) {
+                                var statement = _a[_i];
+                                checkModuleAugmentationElement(statement, isGlobalAugmentation);
+                            }
+                        }
+                    }
+                    else if (isGlobalSourceFile(node.parent)) {
+                        if (isGlobalAugmentation) {
+                            error(node.name, ts.Diagnostics.Augmentations_for_the_global_scope_can_only_be_directly_nested_in_external_modules_or_ambient_module_declarations);
+                        }
+                        else if (ts.isExternalModuleNameRelative(ts.getTextOfIdentifierOrLiteral(node.name))) {
+                            error(node.name, ts.Diagnostics.Ambient_module_declaration_cannot_specify_relative_module_name);
+                        }
+                    }
+                    else {
+                        if (isGlobalAugmentation) {
+                            error(node.name, ts.Diagnostics.Augmentations_for_the_global_scope_can_only_be_directly_nested_in_external_modules_or_ambient_module_declarations);
+                        }
+                        else {
+                            // Node is not an augmentation and is not located on the script level.
+                            // This means that this is declaration of ambient module that is located in other module or namespace which is prohibited.
+                            error(node.name, ts.Diagnostics.Ambient_modules_cannot_be_nested_in_other_modules_or_namespaces);
+                        }
+                    }
+                }
+            }
+            if (node.body) {
+                checkSourceElement(node.body);
+                if (!ts.isGlobalScopeAugmentation(node)) {
+                    registerForUnusedIdentifiersCheck(node);
+                }
+            }
+        }
+        function checkModuleAugmentationElement(node, isGlobalAugmentation) {
+            switch (node.kind) {
+                case 219 /* VariableStatement */:
+                    // error each individual name in variable statement instead of marking the entire variable statement
+                    for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                        var decl = _a[_i];
+                        checkModuleAugmentationElement(decl, isGlobalAugmentation);
+                    }
+                    break;
+                case 254 /* ExportAssignment */:
+                case 255 /* ExportDeclaration */:
+                    grammarErrorOnFirstToken(node, ts.Diagnostics.Exports_and_export_assignments_are_not_permitted_in_module_augmentations);
+                    break;
+                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportDeclaration */:
+                    grammarErrorOnFirstToken(node, ts.Diagnostics.Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module);
+                    break;
+                case 186 /* BindingElement */:
+                case 237 /* VariableDeclaration */:
+                    var name = node.name;
+                    if (ts.isBindingPattern(name)) {
+                        for (var _b = 0, _c = name.elements; _b < _c.length; _b++) {
+                            var el = _c[_b];
+                            // mark individual names in binding pattern
+                            checkModuleAugmentationElement(el, isGlobalAugmentation);
+                        }
+                        break;
+                    }
+                // falls through
+                case 240 /* ClassDeclaration */:
+                case 243 /* EnumDeclaration */:
+                case 239 /* FunctionDeclaration */:
+                case 241 /* InterfaceDeclaration */:
+                case 244 /* ModuleDeclaration */:
+                case 242 /* TypeAliasDeclaration */:
+                    if (isGlobalAugmentation) {
+                        return;
+                    }
+                    var symbol = getSymbolOfNode(node);
+                    if (symbol) {
+                        // module augmentations cannot introduce new names on the top level scope of the module
+                        // this is done it two steps
+                        // 1. quick check - if symbol for node is not merged - this is local symbol to this augmentation - report error
+                        // 2. main check - report error if value declaration of the parent symbol is module augmentation)
+                        var reportError = !(symbol.flags & 33554432 /* Transient */);
+                        if (!reportError) {
+                            // symbol should not originate in augmentation
+                            reportError = !!symbol.parent && ts.isExternalModuleAugmentation(symbol.parent.declarations[0]);
+                        }
+                    }
+                    break;
+            }
+        }
+        function getFirstIdentifier(node) {
+            switch (node.kind) {
+                case 72 /* Identifier */:
+                    return node;
+                case 148 /* QualifiedName */:
+                    do {
+                        node = node.left;
+                    } while (node.kind !== 72 /* Identifier */);
+                    return node;
+                case 189 /* PropertyAccessExpression */:
+                    do {
+                        node = node.expression;
+                    } while (node.kind !== 72 /* Identifier */);
+                    return node;
+            }
+        }
+        function checkExternalImportOrExportDeclaration(node) {
+            var moduleName = ts.getExternalModuleName(node);
+            if (!moduleName || ts.nodeIsMissing(moduleName)) {
+                // Should be a parse error.
+                return false;
+            }
+            if (!ts.isStringLiteral(moduleName)) {
+                error(moduleName, ts.Diagnostics.String_literal_expected);
+                return false;
+            }
+            var inAmbientExternalModule = node.parent.kind === 245 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+            if (node.parent.kind !== 279 /* SourceFile */ && !inAmbientExternalModule) {
+                error(moduleName, node.kind === 255 /* ExportDeclaration */ ?
+                    ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace :
+                    ts.Diagnostics.Import_declarations_in_a_namespace_cannot_reference_a_module);
+                return false;
+            }
+            if (inAmbientExternalModule && ts.isExternalModuleNameRelative(moduleName.text)) {
+                // we have already reported errors on top level imports\exports in external module augmentations in checkModuleDeclaration
+                // no need to do this again.
+                if (!isTopLevelInExternalModuleAugmentation(node)) {
+                    // TypeScript 1.0 spec (April 2013): 12.1.6
+                    // An ExternalImportDeclaration in an AmbientExternalModuleDeclaration may reference
+                    // other external modules only through top - level external module names.
+                    // Relative external module names are not permitted.
+                    error(node, ts.Diagnostics.Import_or_export_declaration_in_an_ambient_module_declaration_cannot_reference_module_through_relative_module_name);
+                    return false;
+                }
+            }
+            return true;
+        }
+        function checkAliasSymbol(node) {
+            var symbol = getSymbolOfNode(node);
+            var target = resolveAlias(symbol);
+            if (target !== unknownSymbol) {
+                // For external modules symbol represent local symbol for an alias.
+                // This local symbol will merge any other local declarations (excluding other aliases)
+                // and symbol.flags will contains combined representation for all merged declaration.
+                // Based on symbol.flags we can compute a set of excluded meanings (meaning that resolved alias should not have,
+                // otherwise it will conflict with some local declaration). Note that in addition to normal flags we include matching SymbolFlags.Export*
+                // in order to prevent collisions with declarations that were exported from the current module (they still contribute to local names).
+                var excludedMeanings = (symbol.flags & (67220415 /* Value */ | 1048576 /* ExportValue */) ? 67220415 /* Value */ : 0) |
+                    (symbol.flags & 67897832 /* Type */ ? 67897832 /* Type */ : 0) |
+                    (symbol.flags & 1920 /* Namespace */ ? 1920 /* Namespace */ : 0);
+                if (target.flags & excludedMeanings) {
+                    var message = node.kind === 257 /* ExportSpecifier */ ?
+                        ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 :
+                        ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
+                    error(node, message, symbolToString(symbol));
+                }
+                // Don't allow to re-export something with no value side when `--isolatedModules` is set.
+                if (compilerOptions.isolatedModules
+                    && node.kind === 257 /* ExportSpecifier */
+                    && !(target.flags & 67220415 /* Value */)
+                    && !(node.flags & 4194304 /* Ambient */)) {
+                    error(node, ts.Diagnostics.Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided);
+                }
+            }
+        }
+        function checkImportBinding(node) {
+            checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
+            checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
+            checkAliasSymbol(node);
+        }
+        function checkImportDeclaration(node) {
+            if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_import_declaration_can_only_be_used_in_a_namespace_or_module)) {
+                // If we hit an import declaration in an illegal context, just bail out to avoid cascading errors.
+                return;
+            }
+            if (!checkGrammarDecoratorsAndModifiers(node) && ts.hasModifiers(node)) {
+                grammarErrorOnFirstToken(node, ts.Diagnostics.An_import_declaration_cannot_have_modifiers);
+            }
+            if (checkExternalImportOrExportDeclaration(node)) {
+                var importClause = node.importClause;
+                if (importClause) {
+                    if (importClause.name) {
+                        checkImportBinding(importClause);
+                    }
+                    if (importClause.namedBindings) {
+                        if (importClause.namedBindings.kind === 251 /* NamespaceImport */) {
+                            checkImportBinding(importClause.namedBindings);
+                        }
+                        else {
+                            var moduleExisted = resolveExternalModuleName(node, node.moduleSpecifier);
+                            if (moduleExisted) {
+                                ts.forEach(importClause.namedBindings.elements, checkImportBinding);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        function checkImportEqualsDeclaration(node) {
+            if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_import_declaration_can_only_be_used_in_a_namespace_or_module)) {
+                // If we hit an import declaration in an illegal context, just bail out to avoid cascading errors.
+                return;
+            }
+            checkGrammarDecoratorsAndModifiers(node);
+            if (ts.isInternalModuleImportEqualsDeclaration(node) || checkExternalImportOrExportDeclaration(node)) {
+                checkImportBinding(node);
+                if (ts.hasModifier(node, 1 /* Export */)) {
+                    markExportAsReferenced(node);
+                }
+                if (node.moduleReference.kind !== 259 /* ExternalModuleReference */) {
+                    var target = resolveAlias(getSymbolOfNode(node));
+                    if (target !== unknownSymbol) {
+                        if (target.flags & 67220415 /* Value */) {
+                            // Target is a value symbol, check that it is not hidden by a local declaration with the same name
+                            var moduleName = getFirstIdentifier(node.moduleReference);
+                            if (!(resolveEntityName(moduleName, 67220415 /* Value */ | 1920 /* Namespace */).flags & 1920 /* Namespace */)) {
+                                error(moduleName, ts.Diagnostics.Module_0_is_hidden_by_a_local_declaration_with_the_same_name, ts.declarationNameToString(moduleName));
+                            }
+                        }
+                        if (target.flags & 67897832 /* Type */) {
+                            checkTypeNameIsReserved(node.name, ts.Diagnostics.Import_name_cannot_be_0);
+                        }
+                    }
+                }
+                else {
+                    if (moduleKind >= ts.ModuleKind.ES2015 && !(node.flags & 4194304 /* Ambient */)) {
+                        // Import equals declaration is deprecated in es6 or above
+                        grammarErrorOnNode(node, ts.Diagnostics.Import_assignment_cannot_be_used_when_targeting_ECMAScript_modules_Consider_using_import_Asterisk_as_ns_from_mod_import_a_from_mod_import_d_from_mod_or_another_module_format_instead);
+                    }
+                }
+            }
+        }
+        function checkExportDeclaration(node) {
+            if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_export_declaration_can_only_be_used_in_a_module)) {
+                // If we hit an export in an illegal context, just bail out to avoid cascading errors.
+                return;
+            }
+            if (!checkGrammarDecoratorsAndModifiers(node) && ts.hasModifiers(node)) {
+                grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_declaration_cannot_have_modifiers);
+            }
+            if (!node.moduleSpecifier || checkExternalImportOrExportDeclaration(node)) {
+                if (node.exportClause) {
+                    // export { x, y }
+                    // export { x, y } from "foo"
+                    ts.forEach(node.exportClause.elements, checkExportSpecifier);
+                    var inAmbientExternalModule = node.parent.kind === 245 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+                    var inAmbientNamespaceDeclaration = !inAmbientExternalModule && node.parent.kind === 245 /* ModuleBlock */ &&
+                        !node.moduleSpecifier && node.flags & 4194304 /* Ambient */;
+                    if (node.parent.kind !== 279 /* SourceFile */ && !inAmbientExternalModule && !inAmbientNamespaceDeclaration) {
+                        error(node, ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace);
+                    }
+                }
+                else {
+                    // export * from "foo"
+                    var moduleSymbol = resolveExternalModuleName(node, node.moduleSpecifier);
+                    if (moduleSymbol && hasExportAssignmentSymbol(moduleSymbol)) {
+                        error(node.moduleSpecifier, ts.Diagnostics.Module_0_uses_export_and_cannot_be_used_with_export_Asterisk, symbolToString(moduleSymbol));
+                    }
+                    if (moduleKind !== ts.ModuleKind.System && moduleKind !== ts.ModuleKind.ES2015 && moduleKind !== ts.ModuleKind.ESNext) {
+                        checkExternalEmitHelpers(node, 32768 /* ExportStar */);
+                    }
+                }
+            }
+        }
+        function checkGrammarModuleElementContext(node, errorMessage) {
+            var isInAppropriateContext = node.parent.kind === 279 /* SourceFile */ || node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 244 /* ModuleDeclaration */;
+            if (!isInAppropriateContext) {
+                grammarErrorOnFirstToken(node, errorMessage);
+            }
+            return !isInAppropriateContext;
+        }
+        function checkExportSpecifier(node) {
+            checkAliasSymbol(node);
+            if (ts.getEmitDeclarations(compilerOptions)) {
+                collectLinkedAliases(node.propertyName || node.name, /*setVisibility*/ true);
+            }
+            if (!node.parent.parent.moduleSpecifier) {
+                var exportedName = node.propertyName || node.name;
+                // find immediate value referenced by exported name (SymbolFlags.Alias is set so we don't chase down aliases)
+                var symbol = resolveName(exportedName, exportedName.escapedText, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */, 
+                /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ true);
+                if (symbol && (symbol === undefinedSymbol || isGlobalSourceFile(getDeclarationContainer(symbol.declarations[0])))) {
+                    error(exportedName, ts.Diagnostics.Cannot_export_0_Only_local_declarations_can_be_exported_from_a_module, ts.idText(exportedName));
+                }
+                else {
+                    markExportAsReferenced(node);
+                }
+            }
+        }
+        function checkExportAssignment(node) {
+            if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_export_assignment_can_only_be_used_in_a_module)) {
+                // If we hit an export assignment in an illegal context, just bail out to avoid cascading errors.
+                return;
+            }
+            var container = node.parent.kind === 279 /* SourceFile */ ? node.parent : node.parent.parent;
+            if (container.kind === 244 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
+                if (node.isExportEquals) {
+                    error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
+                }
+                else {
+                    error(node, ts.Diagnostics.A_default_export_can_only_be_used_in_an_ECMAScript_style_module);
+                }
+                return;
+            }
+            // Grammar checking
+            if (!checkGrammarDecoratorsAndModifiers(node) && ts.hasModifiers(node)) {
+                grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_assignment_cannot_have_modifiers);
+            }
+            if (node.expression.kind === 72 /* Identifier */) {
+                markExportAsReferenced(node);
+                if (ts.getEmitDeclarations(compilerOptions)) {
+                    collectLinkedAliases(node.expression, /*setVisibility*/ true);
+                }
+            }
+            else {
+                checkExpressionCached(node.expression);
+            }
+            checkExternalModuleExports(container);
+            if ((node.flags & 4194304 /* Ambient */) && !ts.isEntityNameExpression(node.expression)) {
+                grammarErrorOnNode(node.expression, ts.Diagnostics.The_expression_of_an_export_assignment_must_be_an_identifier_or_qualified_name_in_an_ambient_context);
+            }
+            if (node.isExportEquals && !(node.flags & 4194304 /* Ambient */)) {
+                if (moduleKind >= ts.ModuleKind.ES2015) {
+                    // export assignment is not supported in es6 modules
+                    grammarErrorOnNode(node, ts.Diagnostics.Export_assignment_cannot_be_used_when_targeting_ECMAScript_modules_Consider_using_export_default_or_another_module_format_instead);
+                }
+                else if (moduleKind === ts.ModuleKind.System) {
+                    // system modules does not support export assignment
+                    grammarErrorOnNode(node, ts.Diagnostics.Export_assignment_is_not_supported_when_module_flag_is_system);
+                }
+            }
+        }
+        function hasExportedMembers(moduleSymbol) {
+            return ts.forEachEntry(moduleSymbol.exports, function (_, id) { return id !== "export="; });
+        }
+        function checkExternalModuleExports(node) {
+            var moduleSymbol = getSymbolOfNode(node);
+            var links = getSymbolLinks(moduleSymbol);
+            if (!links.exportsChecked) {
+                var exportEqualsSymbol = moduleSymbol.exports.get("export=");
+                if (exportEqualsSymbol && hasExportedMembers(moduleSymbol)) {
+                    var declaration = getDeclarationOfAliasSymbol(exportEqualsSymbol) || exportEqualsSymbol.valueDeclaration;
+                    if (!isTopLevelInExternalModuleAugmentation(declaration) && !ts.isInJSFile(declaration)) {
+                        error(declaration, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements);
+                    }
+                }
+                // Checks for export * conflicts
+                var exports_1 = getExportsOfModule(moduleSymbol);
+                if (exports_1) {
+                    exports_1.forEach(function (_a, id) {
+                        var declarations = _a.declarations, flags = _a.flags;
+                        if (id === "__export") {
+                            return;
+                        }
+                        // ECMA262: 15.2.1.1 It is a Syntax Error if the ExportedNames of ModuleItemList contains any duplicate entries.
+                        // (TS Exceptions: namespaces, function overloads, enums, and interfaces)
+                        if (flags & (1920 /* Namespace */ | 64 /* Interface */ | 384 /* Enum */)) {
+                            return;
+                        }
+                        var exportedDeclarationsCount = ts.countWhere(declarations, isNotOverloadAndNotAccessor);
+                        if (flags & 524288 /* TypeAlias */ && exportedDeclarationsCount <= 2) {
+                            // it is legal to merge type alias with other values
+                            // so count should be either 1 (just type alias) or 2 (type alias + merged value)
+                            return;
+                        }
+                        if (exportedDeclarationsCount > 1) {
+                            for (var _i = 0, declarations_9 = declarations; _i < declarations_9.length; _i++) {
+                                var declaration = declarations_9[_i];
+                                if (isNotOverload(declaration)) {
+                                    diagnostics.add(ts.createDiagnosticForNode(declaration, ts.Diagnostics.Cannot_redeclare_exported_variable_0, ts.unescapeLeadingUnderscores(id)));
+                                }
+                            }
+                        }
+                    });
+                }
+                links.exportsChecked = true;
+            }
+        }
+        function isNotAccessor(declaration) {
+            // Accessors check for their own matching duplicates, and in contexts where they are valid, there are already duplicate identifier checks
+            return !ts.isAccessor(declaration);
+        }
+        function isNotOverload(declaration) {
+            return (declaration.kind !== 239 /* FunctionDeclaration */ && declaration.kind !== 156 /* MethodDeclaration */) ||
+                !!declaration.body;
+        }
+        function checkSourceElement(node) {
+            if (!node) {
+                return;
+            }
+            if (ts.isInJSFile(node)) {
+                ts.forEach(node.jsDoc, function (_a) {
+                    var tags = _a.tags;
+                    return ts.forEach(tags, checkSourceElement);
+                });
+            }
+            var kind = node.kind;
+            if (cancellationToken) {
+                // Only bother checking on a few construct kinds.  We don't want to be excessively
+                // hitting the cancellation token on every node we check.
+                switch (kind) {
+                    case 244 /* ModuleDeclaration */:
+                    case 240 /* ClassDeclaration */:
+                    case 241 /* InterfaceDeclaration */:
+                    case 239 /* FunctionDeclaration */:
+                        cancellationToken.throwIfCancellationRequested();
+                }
+            }
+            switch (kind) {
+                case 150 /* TypeParameter */:
+                    return checkTypeParameter(node);
+                case 151 /* Parameter */:
+                    return checkParameter(node);
+                case 154 /* PropertyDeclaration */:
+                case 153 /* PropertySignature */:
+                    return checkPropertyDeclaration(node);
+                case 165 /* FunctionType */:
+                case 166 /* ConstructorType */:
+                case 160 /* CallSignature */:
+                case 161 /* ConstructSignature */:
+                case 162 /* IndexSignature */:
+                    return checkSignatureDeclaration(node);
+                case 156 /* MethodDeclaration */:
+                case 155 /* MethodSignature */:
+                    return checkMethodDeclaration(node);
+                case 157 /* Constructor */:
+                    return checkConstructorDeclaration(node);
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                    return checkAccessorDeclaration(node);
+                case 164 /* TypeReference */:
+                    return checkTypeReferenceNode(node);
+                case 163 /* TypePredicate */:
+                    return checkTypePredicate(node);
+                case 167 /* TypeQuery */:
+                    return checkTypeQuery(node);
+                case 168 /* TypeLiteral */:
+                    return checkTypeLiteral(node);
+                case 169 /* ArrayType */:
+                    return checkArrayType(node);
+                case 170 /* TupleType */:
+                    return checkTupleType(node);
+                case 173 /* UnionType */:
+                case 174 /* IntersectionType */:
+                    return checkUnionOrIntersectionType(node);
+                case 177 /* ParenthesizedType */:
+                case 171 /* OptionalType */:
+                case 172 /* RestType */:
+                    return checkSourceElement(node.type);
+                case 178 /* ThisType */:
+                    return checkThisType(node);
+                case 179 /* TypeOperator */:
+                    return checkTypeOperator(node);
+                case 175 /* ConditionalType */:
+                    return checkConditionalType(node);
+                case 176 /* InferType */:
+                    return checkInferType(node);
+                case 183 /* ImportType */:
+                    return checkImportType(node);
+                case 295 /* JSDocAugmentsTag */:
+                    return checkJSDocAugmentsTag(node);
+                case 304 /* JSDocTypedefTag */:
+                case 297 /* JSDocCallbackTag */:
+                    return checkJSDocTypeAliasTag(node);
+                case 303 /* JSDocTemplateTag */:
+                    return checkJSDocTemplateTag(node);
+                case 302 /* JSDocTypeTag */:
+                    return checkJSDocTypeTag(node);
+                case 299 /* JSDocParameterTag */:
+                    return checkJSDocParameterTag(node);
+                case 289 /* JSDocFunctionType */:
+                    checkJSDocFunctionType(node);
+                // falls through
+                case 287 /* JSDocNonNullableType */:
+                case 286 /* JSDocNullableType */:
+                case 284 /* JSDocAllType */:
+                case 285 /* JSDocUnknownType */:
+                case 292 /* JSDocTypeLiteral */:
+                    checkJSDocTypeIsInJsFile(node);
+                    ts.forEachChild(node, checkSourceElement);
+                    return;
+                case 290 /* JSDocVariadicType */:
+                    checkJSDocVariadicType(node);
+                    return;
+                case 283 /* JSDocTypeExpression */:
+                    return checkSourceElement(node.type);
+                case 180 /* IndexedAccessType */:
+                    return checkIndexedAccessType(node);
+                case 181 /* MappedType */:
+                    return checkMappedType(node);
+                case 239 /* FunctionDeclaration */:
+                    return checkFunctionDeclaration(node);
+                case 218 /* Block */:
+                case 245 /* ModuleBlock */:
+                    return checkBlock(node);
+                case 219 /* VariableStatement */:
+                    return checkVariableStatement(node);
+                case 221 /* ExpressionStatement */:
+                    return checkExpressionStatement(node);
+                case 222 /* IfStatement */:
+                    return checkIfStatement(node);
+                case 223 /* DoStatement */:
+                    return checkDoStatement(node);
+                case 224 /* WhileStatement */:
+                    return checkWhileStatement(node);
+                case 225 /* ForStatement */:
+                    return checkForStatement(node);
+                case 226 /* ForInStatement */:
+                    return checkForInStatement(node);
+                case 227 /* ForOfStatement */:
+                    return checkForOfStatement(node);
+                case 228 /* ContinueStatement */:
+                case 229 /* BreakStatement */:
+                    return checkBreakOrContinueStatement(node);
+                case 230 /* ReturnStatement */:
+                    return checkReturnStatement(node);
+                case 231 /* WithStatement */:
+                    return checkWithStatement(node);
+                case 232 /* SwitchStatement */:
+                    return checkSwitchStatement(node);
+                case 233 /* LabeledStatement */:
+                    return checkLabeledStatement(node);
+                case 234 /* ThrowStatement */:
+                    return checkThrowStatement(node);
+                case 235 /* TryStatement */:
+                    return checkTryStatement(node);
+                case 237 /* VariableDeclaration */:
+                    return checkVariableDeclaration(node);
+                case 186 /* BindingElement */:
+                    return checkBindingElement(node);
+                case 240 /* ClassDeclaration */:
+                    return checkClassDeclaration(node);
+                case 241 /* InterfaceDeclaration */:
+                    return checkInterfaceDeclaration(node);
+                case 242 /* TypeAliasDeclaration */:
+                    return checkTypeAliasDeclaration(node);
+                case 243 /* EnumDeclaration */:
+                    return checkEnumDeclaration(node);
+                case 244 /* ModuleDeclaration */:
+                    return checkModuleDeclaration(node);
+                case 249 /* ImportDeclaration */:
+                    return checkImportDeclaration(node);
+                case 248 /* ImportEqualsDeclaration */:
+                    return checkImportEqualsDeclaration(node);
+                case 255 /* ExportDeclaration */:
+                    return checkExportDeclaration(node);
+                case 254 /* ExportAssignment */:
+                    return checkExportAssignment(node);
+                case 220 /* EmptyStatement */:
+                case 236 /* DebuggerStatement */:
+                    checkGrammarStatementInAmbientContext(node);
+                    return;
+                case 258 /* MissingDeclaration */:
+                    return checkMissingDeclaration(node);
+            }
+        }
+        function checkJSDocTypeIsInJsFile(node) {
+            if (!ts.isInJSFile(node)) {
+                grammarErrorOnNode(node, ts.Diagnostics.JSDoc_types_can_only_be_used_inside_documentation_comments);
+            }
+        }
+        function checkJSDocVariadicType(node) {
+            checkJSDocTypeIsInJsFile(node);
+            checkSourceElement(node.type);
+            // Only legal location is in the *last* parameter tag or last parameter of a JSDoc function.
+            var parent = node.parent;
+            if (ts.isParameter(parent) && ts.isJSDocFunctionType(parent.parent)) {
+                if (ts.last(parent.parent.parameters) !== parent) {
+                    error(node, ts.Diagnostics.A_rest_parameter_must_be_last_in_a_parameter_list);
+                }
+                return;
+            }
+            if (!ts.isJSDocTypeExpression(parent)) {
+                error(node, ts.Diagnostics.JSDoc_may_only_appear_in_the_last_parameter_of_a_signature);
+            }
+            var paramTag = node.parent.parent;
+            if (!ts.isJSDocParameterTag(paramTag)) {
+                error(node, ts.Diagnostics.JSDoc_may_only_appear_in_the_last_parameter_of_a_signature);
+                return;
+            }
+            var param = ts.getParameterSymbolFromJSDoc(paramTag);
+            if (!param) {
+                // We will error in `checkJSDocParameterTag`.
+                return;
+            }
+            var host = ts.getHostSignatureFromJSDoc(paramTag);
+            if (!host || ts.last(host.parameters).symbol !== param) {
+                error(node, ts.Diagnostics.A_rest_parameter_must_be_last_in_a_parameter_list);
+            }
+        }
+        function getTypeFromJSDocVariadicType(node) {
+            var type = getTypeFromTypeNode(node.type);
+            var parent = node.parent;
+            var paramTag = node.parent.parent;
+            if (ts.isJSDocTypeExpression(node.parent) && ts.isJSDocParameterTag(paramTag)) {
+                // Else we will add a diagnostic, see `checkJSDocVariadicType`.
+                var host_1 = ts.getHostSignatureFromJSDoc(paramTag);
+                if (host_1) {
+                    /*
+                    Only return an array type if the corresponding parameter is marked as a rest parameter, or if there are no parameters.
+                    So in the following situation we will not create an array type:
+                        /** @param {...number} a * /
+                        function f(a) {}
+                    Because `a` will just be of type `number | undefined`. A synthetic `...args` will also be added, which *will* get an array type.
+                    */
+                    var lastParamDeclaration = ts.lastOrUndefined(host_1.parameters);
+                    var symbol = ts.getParameterSymbolFromJSDoc(paramTag);
+                    if (!lastParamDeclaration ||
+                        symbol && lastParamDeclaration.symbol === symbol && ts.isRestParameter(lastParamDeclaration)) {
+                        return createArrayType(type);
+                    }
+                }
+            }
+            if (ts.isParameter(parent) && ts.isJSDocFunctionType(parent.parent)) {
+                return createArrayType(type);
+            }
+            return addOptionality(type);
+        }
+        // Function and class expression bodies are checked after all statements in the enclosing body. This is
+        // to ensure constructs like the following are permitted:
+        //     const foo = function () {
+        //        const s = foo();
+        //        return "hello";
+        //     }
+        // Here, performing a full type check of the body of the function expression whilst in the process of
+        // determining the type of foo would cause foo to be given type any because of the recursive reference.
+        // Delaying the type check of the body ensures foo has been assigned a type.
+        function checkNodeDeferred(node) {
+            var enclosingFile = ts.getSourceFileOfNode(node);
+            var links = getNodeLinks(enclosingFile);
+            if (!(links.flags & 1 /* TypeChecked */)) {
+                links.deferredNodes = links.deferredNodes || ts.createMap();
+                var id = "" + getNodeId(node);
+                links.deferredNodes.set(id, node);
+            }
+        }
+        function checkDeferredNodes(context) {
+            var links = getNodeLinks(context);
+            if (!links.deferredNodes) {
+                return;
+            }
+            links.deferredNodes.forEach(function (node) {
+                switch (node.kind) {
+                    case 196 /* FunctionExpression */:
+                    case 197 /* ArrowFunction */:
+                    case 156 /* MethodDeclaration */:
+                    case 155 /* MethodSignature */:
+                        checkFunctionExpressionOrObjectLiteralMethodDeferred(node);
+                        break;
+                    case 158 /* GetAccessor */:
+                    case 159 /* SetAccessor */:
+                        checkAccessorDeclaration(node);
+                        break;
+                    case 209 /* ClassExpression */:
+                        checkClassExpressionDeferred(node);
+                        break;
+                    case 261 /* JsxSelfClosingElement */:
+                        checkJsxSelfClosingElementDeferred(node);
+                        break;
+                    case 260 /* JsxElement */:
+                        checkJsxElementDeferred(node);
+                        break;
+                }
+            });
+        }
+        function checkSourceFile(node) {
+            ts.performance.mark("beforeCheck");
+            checkSourceFileWorker(node);
+            ts.performance.mark("afterCheck");
+            ts.performance.measure("Check", "beforeCheck", "afterCheck");
+        }
+        function unusedIsError(kind) {
+            switch (kind) {
+                case 0 /* Local */:
+                    return !!compilerOptions.noUnusedLocals;
+                case 1 /* Parameter */:
+                    return !!compilerOptions.noUnusedParameters;
+                default:
+                    return ts.Debug.assertNever(kind);
+            }
+        }
+        function getPotentiallyUnusedIdentifiers(sourceFile) {
+            return allPotentiallyUnusedIdentifiers.get(sourceFile.path) || ts.emptyArray;
+        }
+        // Fully type check a source file and collect the relevant diagnostics.
+        function checkSourceFileWorker(node) {
+            var links = getNodeLinks(node);
+            if (!(links.flags & 1 /* TypeChecked */)) {
+                if (ts.skipTypeChecking(node, compilerOptions)) {
+                    return;
+                }
+                // Grammar checking
+                checkGrammarSourceFile(node);
+                ts.clear(potentialThisCollisions);
+                ts.clear(potentialNewTargetCollisions);
+                ts.forEach(node.statements, checkSourceElement);
+                checkSourceElement(node.endOfFileToken);
+                checkDeferredNodes(node);
+                if (ts.isExternalOrCommonJsModule(node)) {
+                    registerForUnusedIdentifiersCheck(node);
+                }
+                if (!node.isDeclarationFile && (compilerOptions.noUnusedLocals || compilerOptions.noUnusedParameters)) {
+                    checkUnusedIdentifiers(getPotentiallyUnusedIdentifiers(node), function (containingNode, kind, diag) {
+                        if (!ts.containsParseError(containingNode) && unusedIsError(kind)) {
+                            diagnostics.add(diag);
+                        }
+                    });
+                }
+                if (ts.isExternalOrCommonJsModule(node)) {
+                    checkExternalModuleExports(node);
+                }
+                if (potentialThisCollisions.length) {
+                    ts.forEach(potentialThisCollisions, checkIfThisIsCapturedInEnclosingScope);
+                    ts.clear(potentialThisCollisions);
+                }
+                if (potentialNewTargetCollisions.length) {
+                    ts.forEach(potentialNewTargetCollisions, checkIfNewTargetIsCapturedInEnclosingScope);
+                    ts.clear(potentialNewTargetCollisions);
+                }
+                links.flags |= 1 /* TypeChecked */;
+            }
+        }
+        function getDiagnostics(sourceFile, ct) {
+            try {
+                // Record the cancellation token so it can be checked later on during checkSourceElement.
+                // Do this in a finally block so we can ensure that it gets reset back to nothing after
+                // this call is done.
+                cancellationToken = ct;
+                return getDiagnosticsWorker(sourceFile);
+            }
+            finally {
+                cancellationToken = undefined;
+            }
+        }
+        function getDiagnosticsWorker(sourceFile) {
+            throwIfNonDiagnosticsProducing();
+            if (sourceFile) {
+                // Some global diagnostics are deferred until they are needed and
+                // may not be reported in the firt call to getGlobalDiagnostics.
+                // We should catch these changes and report them.
+                var previousGlobalDiagnostics = diagnostics.getGlobalDiagnostics();
+                var previousGlobalDiagnosticsSize = previousGlobalDiagnostics.length;
+                checkSourceFile(sourceFile);
+                var semanticDiagnostics = diagnostics.getDiagnostics(sourceFile.fileName);
+                var currentGlobalDiagnostics = diagnostics.getGlobalDiagnostics();
+                if (currentGlobalDiagnostics !== previousGlobalDiagnostics) {
+                    // If the arrays are not the same reference, new diagnostics were added.
+                    var deferredGlobalDiagnostics = ts.relativeComplement(previousGlobalDiagnostics, currentGlobalDiagnostics, ts.compareDiagnostics);
+                    return ts.concatenate(deferredGlobalDiagnostics, semanticDiagnostics);
+                }
+                else if (previousGlobalDiagnosticsSize === 0 && currentGlobalDiagnostics.length > 0) {
+                    // If the arrays are the same reference, but the length has changed, a single
+                    // new diagnostic was added as DiagnosticCollection attempts to reuse the
+                    // same array.
+                    return ts.concatenate(currentGlobalDiagnostics, semanticDiagnostics);
+                }
+                return semanticDiagnostics;
+            }
+            // Global diagnostics are always added when a file is not provided to
+            // getDiagnostics
+            ts.forEach(host.getSourceFiles(), checkSourceFile);
+            return diagnostics.getDiagnostics();
+        }
+        function getGlobalDiagnostics() {
+            throwIfNonDiagnosticsProducing();
+            return diagnostics.getGlobalDiagnostics();
+        }
+        function throwIfNonDiagnosticsProducing() {
+            if (!produceDiagnostics) {
+                throw new Error("Trying to get diagnostics from a type checker that does not produce them.");
+            }
+        }
+        // Language service support
+        function getSymbolsInScope(location, meaning) {
+            if (location.flags & 8388608 /* InWithStatement */) {
+                // We cannot answer semantic questions within a with block, do not proceed any further
+                return [];
+            }
+            var symbols = ts.createSymbolTable();
+            var isStatic = false;
+            populateSymbols();
+            symbols.delete("this" /* This */); // Not a symbol, a keyword
+            return symbolsToArray(symbols);
+            function populateSymbols() {
+                while (location) {
+                    if (location.locals && !isGlobalSourceFile(location)) {
+                        copySymbols(location.locals, meaning);
+                    }
+                    switch (location.kind) {
+                        case 279 /* SourceFile */:
+                            if (!ts.isExternalOrCommonJsModule(location))
+                                break;
+                        // falls through
+                        case 244 /* ModuleDeclaration */:
+                            copySymbols(getSymbolOfNode(location).exports, meaning & 2623475 /* ModuleMember */);
+                            break;
+                        case 243 /* EnumDeclaration */:
+                            copySymbols(getSymbolOfNode(location).exports, meaning & 8 /* EnumMember */);
+                            break;
+                        case 209 /* ClassExpression */:
+                            var className = location.name;
+                            if (className) {
+                                copySymbol(location.symbol, meaning);
+                            }
+                        // falls through
+                        // this fall-through is necessary because we would like to handle
+                        // type parameter inside class expression similar to how we handle it in classDeclaration and interface Declaration
+                        case 240 /* ClassDeclaration */:
+                        case 241 /* InterfaceDeclaration */:
+                            // If we didn't come from static member of class or interface,
+                            // add the type parameters into the symbol table
+                            // (type parameters of classDeclaration/classExpression and interface are in member property of the symbol.
+                            // Note: that the memberFlags come from previous iteration.
+                            if (!isStatic) {
+                                copySymbols(getMembersOfSymbol(getSymbolOfNode(location)), meaning & 67897832 /* Type */);
+                            }
+                            break;
+                        case 196 /* FunctionExpression */:
+                            var funcName = location.name;
+                            if (funcName) {
+                                copySymbol(location.symbol, meaning);
+                            }
+                            break;
+                    }
+                    if (ts.introducesArgumentsExoticObject(location)) {
+                        copySymbol(argumentsSymbol, meaning);
+                    }
+                    isStatic = ts.hasModifier(location, 32 /* Static */);
+                    location = location.parent;
+                }
+                copySymbols(globals, meaning);
+            }
+            /**
+             * Copy the given symbol into symbol tables if the symbol has the given meaning
+             * and it doesn't already existed in the symbol table
+             * @param key a key for storing in symbol table; if undefined, use symbol.name
+             * @param symbol the symbol to be added into symbol table
+             * @param meaning meaning of symbol to filter by before adding to symbol table
+             */
+            function copySymbol(symbol, meaning) {
+                if (ts.getCombinedLocalAndExportSymbolFlags(symbol) & meaning) {
+                    var id = symbol.escapedName;
+                    // We will copy all symbol regardless of its reserved name because
+                    // symbolsToArray will check whether the key is a reserved name and
+                    // it will not copy symbol with reserved name to the array
+                    if (!symbols.has(id)) {
+                        symbols.set(id, symbol);
+                    }
+                }
+            }
+            function copySymbols(source, meaning) {
+                if (meaning) {
+                    source.forEach(function (symbol) {
+                        copySymbol(symbol, meaning);
+                    });
+                }
+            }
+        }
+        function isTypeDeclarationName(name) {
+            return name.kind === 72 /* Identifier */ &&
+                isTypeDeclaration(name.parent) &&
+                name.parent.name === name;
+        }
+        function isTypeDeclaration(node) {
+            switch (node.kind) {
+                case 150 /* TypeParameter */:
+                case 240 /* ClassDeclaration */:
+                case 241 /* InterfaceDeclaration */:
+                case 242 /* TypeAliasDeclaration */:
+                case 243 /* EnumDeclaration */:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+        // True if the given identifier is part of a type reference
+        function isTypeReferenceIdentifier(node) {
+            while (node.parent.kind === 148 /* QualifiedName */) {
+                node = node.parent;
+            }
+            return node.parent.kind === 164 /* TypeReference */;
+        }
+        function isHeritageClauseElementIdentifier(node) {
+            while (node.parent.kind === 189 /* PropertyAccessExpression */) {
+                node = node.parent;
+            }
+            return node.parent.kind === 211 /* ExpressionWithTypeArguments */;
+        }
+        function forEachEnclosingClass(node, callback) {
+            var result;
+            while (true) {
+                node = ts.getContainingClass(node);
+                if (!node)
+                    break;
+                if (result = callback(node))
+                    break;
+            }
+            return result;
+        }
+        function isNodeUsedDuringClassInitialization(node) {
+            return !!ts.findAncestor(node, function (element) {
+                if (ts.isConstructorDeclaration(element) && ts.nodeIsPresent(element.body) || ts.isPropertyDeclaration(element)) {
+                    return true;
+                }
+                else if (ts.isClassLike(element) || ts.isFunctionLikeDeclaration(element)) {
+                    return "quit";
+                }
+                return false;
+            });
+        }
+        function isNodeWithinClass(node, classDeclaration) {
+            return !!forEachEnclosingClass(node, function (n) { return n === classDeclaration; });
+        }
+        function getLeftSideOfImportEqualsOrExportAssignment(nodeOnRightSide) {
+            while (nodeOnRightSide.parent.kind === 148 /* QualifiedName */) {
+                nodeOnRightSide = nodeOnRightSide.parent;
+            }
+            if (nodeOnRightSide.parent.kind === 248 /* ImportEqualsDeclaration */) {
+                return nodeOnRightSide.parent.moduleReference === nodeOnRightSide ? nodeOnRightSide.parent : undefined;
+            }
+            if (nodeOnRightSide.parent.kind === 254 /* ExportAssignment */) {
+                return nodeOnRightSide.parent.expression === nodeOnRightSide ? nodeOnRightSide.parent : undefined;
+            }
+            return undefined;
+        }
+        function isInRightSideOfImportOrExportAssignment(node) {
+            return getLeftSideOfImportEqualsOrExportAssignment(node) !== undefined;
+        }
+        function getSpecialPropertyAssignmentSymbolFromEntityName(entityName) {
+            var specialPropertyAssignmentKind = ts.getAssignmentDeclarationKind(entityName.parent.parent);
+            switch (specialPropertyAssignmentKind) {
+                case 1 /* ExportsProperty */:
+                case 3 /* PrototypeProperty */:
+                    return getSymbolOfNode(entityName.parent);
+                case 4 /* ThisProperty */:
+                case 2 /* ModuleExports */:
+                case 5 /* Property */:
+                    return getSymbolOfNode(entityName.parent.parent);
+            }
+        }
+        function isImportTypeQualifierPart(node) {
+            var parent = node.parent;
+            while (ts.isQualifiedName(parent)) {
+                node = parent;
+                parent = parent.parent;
+            }
+            if (parent && parent.kind === 183 /* ImportType */ && parent.qualifier === node) {
+                return parent;
+            }
+            return undefined;
+        }
+        function getSymbolOfEntityNameOrPropertyAccessExpression(entityName) {
+            if (ts.isDeclarationName(entityName)) {
+                return getSymbolOfNode(entityName.parent);
+            }
+            if (ts.isInJSFile(entityName) &&
+                entityName.parent.kind === 189 /* PropertyAccessExpression */ &&
+                entityName.parent === entityName.parent.parent.left) {
+                // Check if this is a special property assignment
+                var specialPropertyAssignmentSymbol = getSpecialPropertyAssignmentSymbolFromEntityName(entityName);
+                if (specialPropertyAssignmentSymbol) {
+                    return specialPropertyAssignmentSymbol;
+                }
+            }
+            if (entityName.parent.kind === 254 /* ExportAssignment */ && ts.isEntityNameExpression(entityName)) {
+                // Even an entity name expression that doesn't resolve as an entityname may still typecheck as a property access expression
+                var success = resolveEntityName(entityName, 
+                /*all meanings*/ 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */, /*ignoreErrors*/ true);
+                if (success && success !== unknownSymbol) {
+                    return success;
+                }
+            }
+            else if (!ts.isPropertyAccessExpression(entityName) && isInRightSideOfImportOrExportAssignment(entityName)) {
+                // Since we already checked for ExportAssignment, this really could only be an Import
+                var importEqualsDeclaration = ts.getAncestor(entityName, 248 /* ImportEqualsDeclaration */);
+                ts.Debug.assert(importEqualsDeclaration !== undefined);
+                return getSymbolOfPartOfRightHandSideOfImportEquals(entityName, /*dontResolveAlias*/ true);
+            }
+            if (!ts.isPropertyAccessExpression(entityName)) {
+                var possibleImportNode = isImportTypeQualifierPart(entityName);
+                if (possibleImportNode) {
+                    getTypeFromTypeNode(possibleImportNode);
+                    var sym = getNodeLinks(entityName).resolvedSymbol;
+                    return sym === unknownSymbol ? undefined : sym;
+                }
+            }
+            while (ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
+                entityName = entityName.parent;
+            }
+            if (isHeritageClauseElementIdentifier(entityName)) {
+                var meaning = 0 /* None */;
+                // In an interface or class, we're definitely interested in a type.
+                if (entityName.parent.kind === 211 /* ExpressionWithTypeArguments */) {
+                    meaning = 67897832 /* Type */;
+                    // In a class 'extends' clause we are also looking for a value.
+                    if (ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
+                        meaning |= 67220415 /* Value */;
+                    }
+                }
+                else {
+                    meaning = 1920 /* Namespace */;
+                }
+                meaning |= 2097152 /* Alias */;
+                var entityNameSymbol = ts.isEntityNameExpression(entityName) ? resolveEntityName(entityName, meaning) : undefined;
+                if (entityNameSymbol) {
+                    return entityNameSymbol;
+                }
+            }
+            if (entityName.parent.kind === 299 /* JSDocParameterTag */) {
+                return ts.getParameterSymbolFromJSDoc(entityName.parent);
+            }
+            if (entityName.parent.kind === 150 /* TypeParameter */ && entityName.parent.parent.kind === 303 /* JSDocTemplateTag */) {
+                ts.Debug.assert(!ts.isInJSFile(entityName)); // Otherwise `isDeclarationName` would have been true.
+                var typeParameter = ts.getTypeParameterFromJsDoc(entityName.parent);
+                return typeParameter && typeParameter.symbol;
+            }
+            if (ts.isExpressionNode(entityName)) {
+                if (ts.nodeIsMissing(entityName)) {
+                    // Missing entity name.
+                    return undefined;
+                }
+                if (entityName.kind === 72 /* Identifier */) {
+                    if (ts.isJSXTagName(entityName) && isJsxIntrinsicIdentifier(entityName)) {
+                        var symbol = getIntrinsicTagSymbol(entityName.parent);
+                        return symbol === unknownSymbol ? undefined : symbol;
+                    }
+                    return resolveEntityName(entityName, 67220415 /* Value */, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
+                }
+                else if (entityName.kind === 189 /* PropertyAccessExpression */ || entityName.kind === 148 /* QualifiedName */) {
+                    var links = getNodeLinks(entityName);
+                    if (links.resolvedSymbol) {
+                        return links.resolvedSymbol;
+                    }
+                    if (entityName.kind === 189 /* PropertyAccessExpression */) {
+                        checkPropertyAccessExpression(entityName);
+                    }
+                    else {
+                        checkQualifiedName(entityName);
+                    }
+                    return links.resolvedSymbol;
+                }
+            }
+            else if (isTypeReferenceIdentifier(entityName)) {
+                var meaning = entityName.parent.kind === 164 /* TypeReference */ ? 67897832 /* Type */ : 1920 /* Namespace */;
+                return resolveEntityName(entityName, meaning, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
+            }
+            if (entityName.parent.kind === 163 /* TypePredicate */) {
+                return resolveEntityName(entityName, /*meaning*/ 1 /* FunctionScopedVariable */);
+            }
+            // Do we want to return undefined here?
+            return undefined;
+        }
+        function getSymbolAtLocation(node) {
+            if (node.kind === 279 /* SourceFile */) {
+                return ts.isExternalModule(node) ? getMergedSymbol(node.symbol) : undefined;
+            }
+            var parent = node.parent;
+            var grandParent = parent.parent;
+            if (node.flags & 8388608 /* InWithStatement */) {
+                // We cannot answer semantic questions within a with block, do not proceed any further
+                return undefined;
+            }
+            if (isDeclarationNameOrImportPropertyName(node)) {
+                // This is a declaration, call getSymbolOfNode
+                var parentSymbol = getSymbolOfNode(parent);
+                return ts.isImportOrExportSpecifier(node.parent) && node.parent.propertyName === node
+                    ? getImmediateAliasedSymbol(parentSymbol)
+                    : parentSymbol;
+            }
+            else if (ts.isLiteralComputedPropertyDeclarationName(node)) {
+                return getSymbolOfNode(parent.parent);
+            }
+            if (node.kind === 72 /* Identifier */) {
+                if (isInRightSideOfImportOrExportAssignment(node)) {
+                    return getSymbolOfEntityNameOrPropertyAccessExpression(node);
+                }
+                else if (parent.kind === 186 /* BindingElement */ &&
+                    grandParent.kind === 184 /* ObjectBindingPattern */ &&
+                    node === parent.propertyName) {
+                    var typeOfPattern = getTypeOfNode(grandParent);
+                    var propertyDeclaration = getPropertyOfType(typeOfPattern, node.escapedText);
+                    if (propertyDeclaration) {
+                        return propertyDeclaration;
+                    }
+                }
+            }
+            switch (node.kind) {
+                case 72 /* Identifier */:
+                case 189 /* PropertyAccessExpression */:
+                case 148 /* QualifiedName */:
+                    return getSymbolOfEntityNameOrPropertyAccessExpression(node);
+                case 100 /* ThisKeyword */:
+                    var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
+                    if (ts.isFunctionLike(container)) {
+                        var sig = getSignatureFromDeclaration(container);
+                        if (sig.thisParameter) {
+                            return sig.thisParameter;
+                        }
+                    }
+                    if (ts.isInExpressionContext(node)) {
+                        return checkExpression(node).symbol;
+                    }
+                // falls through
+                case 178 /* ThisType */:
+                    return getTypeFromThisTypeNode(node).symbol;
+                case 98 /* SuperKeyword */:
+                    return checkExpression(node).symbol;
+                case 124 /* ConstructorKeyword */:
+                    // constructor keyword for an overload, should take us to the definition if it exist
+                    var constructorDeclaration = node.parent;
+                    if (constructorDeclaration && constructorDeclaration.kind === 157 /* Constructor */) {
+                        return constructorDeclaration.parent.symbol;
+                    }
+                    return undefined;
+                case 10 /* StringLiteral */:
+                case 14 /* NoSubstitutionTemplateLiteral */:
+                    // 1). import x = require("./mo/*gotToDefinitionHere*/d")
+                    // 2). External module name in an import declaration
+                    // 3). Dynamic import call or require in javascript
+                    // 4). type A = import("./f/*gotToDefinitionHere*/oo")
+                    if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
+                        ((node.parent.kind === 249 /* ImportDeclaration */ || node.parent.kind === 255 /* ExportDeclaration */) && node.parent.moduleSpecifier === node) ||
+                        ((ts.isInJSFile(node) && ts.isRequireCall(node.parent, /*checkArgumentIsStringLiteralLike*/ false)) || ts.isImportCall(node.parent)) ||
+                        (ts.isLiteralTypeNode(node.parent) && ts.isLiteralImportTypeNode(node.parent.parent) && node.parent.parent.argument === node.parent)) {
+                        return resolveExternalModuleName(node, node);
+                    }
+                    if (ts.isCallExpression(parent) && ts.isBindableObjectDefinePropertyCall(parent) && parent.arguments[1] === node) {
+                        return getSymbolOfNode(parent);
+                    }
+                // falls through
+                case 8 /* NumericLiteral */:
+                    // index access
+                    var objectType = ts.isElementAccessExpression(parent)
+                        ? parent.argumentExpression === node ? getTypeOfExpression(parent.expression) : undefined
+                        : ts.isLiteralTypeNode(parent) && ts.isIndexedAccessTypeNode(grandParent)
+                            ? getTypeFromTypeNode(grandParent.objectType)
+                            : undefined;
+                    return objectType && getPropertyOfType(objectType, ts.escapeLeadingUnderscores(node.text));
+                case 80 /* DefaultKeyword */:
+                case 90 /* FunctionKeyword */:
+                case 37 /* EqualsGreaterThanToken */:
+                case 76 /* ClassKeyword */:
+                    return getSymbolOfNode(node.parent);
+                case 183 /* ImportType */:
+                    return ts.isLiteralImportTypeNode(node) ? getSymbolAtLocation(node.argument.literal) : undefined;
+                case 85 /* ExportKeyword */:
+                    return ts.isExportAssignment(node.parent) ? ts.Debug.assertDefined(node.parent.symbol) : undefined;
+                default:
+                    return undefined;
+            }
+        }
+        function getShorthandAssignmentValueSymbol(location) {
+            if (location && location.kind === 276 /* ShorthandPropertyAssignment */) {
+                return resolveEntityName(location.name, 67220415 /* Value */ | 2097152 /* Alias */);
+            }
+            return undefined;
+        }
+        /** Returns the target of an export specifier without following aliases */
+        function getExportSpecifierLocalTargetSymbol(node) {
+            return node.parent.parent.moduleSpecifier ?
+                getExternalModuleMember(node.parent.parent, node) :
+                resolveEntityName(node.propertyName || node.name, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */);
+        }
+        function getTypeOfNode(node) {
+            if (node.flags & 8388608 /* InWithStatement */) {
+                // We cannot answer semantic questions within a with block, do not proceed any further
+                return errorType;
+            }
+            var classDecl = ts.tryGetClassImplementingOrExtendingExpressionWithTypeArguments(node);
+            var classType = classDecl && getDeclaredTypeOfClassOrInterface(getSymbolOfNode(classDecl.class));
+            if (ts.isPartOfTypeNode(node)) {
+                var typeFromTypeNode = getTypeFromTypeNode(node);
+                return classType ? getTypeWithThisArgument(typeFromTypeNode, classType.thisType) : typeFromTypeNode;
+            }
+            if (ts.isExpressionNode(node)) {
+                return getRegularTypeOfExpression(node);
+            }
+            if (classType && !classDecl.isImplements) {
+                // A SyntaxKind.ExpressionWithTypeArguments is considered a type node, except when it occurs in the
+                // extends clause of a class. We handle that case here.
+                var baseType = ts.firstOrUndefined(getBaseTypes(classType));
+                return baseType ? getTypeWithThisArgument(baseType, classType.thisType) : errorType;
+            }
+            if (isTypeDeclaration(node)) {
+                // In this case, we call getSymbolOfNode instead of getSymbolAtLocation because it is a declaration
+                var symbol = getSymbolOfNode(node);
+                return getDeclaredTypeOfSymbol(symbol);
+            }
+            if (isTypeDeclarationName(node)) {
+                var symbol = getSymbolAtLocation(node);
+                return symbol ? getDeclaredTypeOfSymbol(symbol) : errorType;
+            }
+            if (ts.isDeclaration(node)) {
+                // In this case, we call getSymbolOfNode instead of getSymbolAtLocation because it is a declaration
+                var symbol = getSymbolOfNode(node);
+                return getTypeOfSymbol(symbol);
+            }
+            if (isDeclarationNameOrImportPropertyName(node)) {
+                var symbol = getSymbolAtLocation(node);
+                return symbol ? getTypeOfSymbol(symbol) : errorType;
+            }
+            if (ts.isBindingPattern(node)) {
+                return getTypeForVariableLikeDeclaration(node.parent, /*includeOptionality*/ true) || errorType;
+            }
+            if (isInRightSideOfImportOrExportAssignment(node)) {
+                var symbol = getSymbolAtLocation(node);
+                if (symbol) {
+                    var declaredType = getDeclaredTypeOfSymbol(symbol);
+                    return declaredType !== errorType ? declaredType : getTypeOfSymbol(symbol);
+                }
+            }
+            return errorType;
+        }
+        // Gets the type of object literal or array literal of destructuring assignment.
+        // { a } from
+        //     for ( { a } of elems) {
+        //     }
+        // [ a ] from
+        //     [a] = [ some array ...]
+        function getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr) {
+            ts.Debug.assert(expr.kind === 188 /* ObjectLiteralExpression */ || expr.kind === 187 /* ArrayLiteralExpression */);
+            // If this is from "for of"
+            //     for ( { a } of elems) {
+            //     }
+            if (expr.parent.kind === 227 /* ForOfStatement */) {
+                var iteratedType = checkRightHandSideOfForOf(expr.parent.expression, expr.parent.awaitModifier);
+                return checkDestructuringAssignment(expr, iteratedType || errorType);
+            }
+            // If this is from "for" initializer
+            //     for ({a } = elems[0];.....) { }
+            if (expr.parent.kind === 204 /* BinaryExpression */) {
+                var iteratedType = getTypeOfExpression(expr.parent.right);
+                return checkDestructuringAssignment(expr, iteratedType || errorType);
+            }
+            // If this is from nested object binding pattern
+            //     for ({ skills: { primary, secondary } } = multiRobot, i = 0; i < 1; i++) {
+            if (expr.parent.kind === 275 /* PropertyAssignment */) {
+                var typeOfParentObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent.parent);
+                return checkObjectLiteralDestructuringPropertyAssignment(typeOfParentObjectLiteral || errorType, expr.parent); // TODO: GH#18217
+            }
+            // Array literal assignment - array destructuring pattern
+            ts.Debug.assert(expr.parent.kind === 187 /* ArrayLiteralExpression */);
+            //    [{ property1: p1, property2 }] = elems;
+            var typeOfArrayLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent);
+            var elementType = checkIteratedTypeOrElementType(typeOfArrayLiteral || errorType, expr.parent, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) || errorType;
+            return checkArrayLiteralDestructuringElementAssignment(expr.parent, typeOfArrayLiteral, expr.parent.elements.indexOf(expr), elementType || errorType); // TODO: GH#18217
+        }
+        // Gets the property symbol corresponding to the property in destructuring assignment
+        // 'property1' from
+        //     for ( { property1: a } of elems) {
+        //     }
+        // 'property1' at location 'a' from:
+        //     [a] = [ property1, property2 ]
+        function getPropertySymbolOfDestructuringAssignment(location) {
+            // Get the type of the object or array literal and then look for property of given name in the type
+            var typeOfObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(location.parent.parent);
+            return typeOfObjectLiteral && getPropertyOfType(typeOfObjectLiteral, location.escapedText);
+        }
+        function getRegularTypeOfExpression(expr) {
+            if (ts.isRightSideOfQualifiedNameOrPropertyAccess(expr)) {
+                expr = expr.parent;
+            }
+            return getRegularTypeOfLiteralType(getTypeOfExpression(expr));
+        }
+        /**
+         * Gets either the static or instance type of a class element, based on
+         * whether the element is declared as "static".
+         */
+        function getParentTypeOfClassElement(node) {
+            var classSymbol = getSymbolOfNode(node.parent);
+            return ts.hasModifier(node, 32 /* Static */)
+                ? getTypeOfSymbol(classSymbol)
+                : getDeclaredTypeOfSymbol(classSymbol);
+        }
+        function getClassElementPropertyKeyType(element) {
+            var name = element.name;
+            switch (name.kind) {
+                case 72 /* Identifier */:
+                    return getLiteralType(ts.idText(name));
+                case 8 /* NumericLiteral */:
+                case 10 /* StringLiteral */:
+                    return getLiteralType(name.text);
+                case 149 /* ComputedPropertyName */:
+                    var nameType = checkComputedPropertyName(name);
+                    return isTypeAssignableToKind(nameType, 12288 /* ESSymbolLike */) ? nameType : stringType;
+                default:
+                    ts.Debug.fail("Unsupported property name.");
+                    return errorType;
+            }
+        }
+        // Return the list of properties of the given type, augmented with properties from Function
+        // if the type has call or construct signatures
+        function getAugmentedPropertiesOfType(type) {
+            type = getApparentType(type);
+            var propsByName = ts.createSymbolTable(getPropertiesOfType(type));
+            var functionType = getSignaturesOfType(type, 0 /* Call */).length ? globalCallableFunctionType :
+                getSignaturesOfType(type, 1 /* Construct */).length ? globalNewableFunctionType :
+                    undefined;
+            if (functionType) {
+                ts.forEach(getPropertiesOfType(functionType), function (p) {
+                    if (!propsByName.has(p.escapedName)) {
+                        propsByName.set(p.escapedName, p);
+                    }
+                });
+            }
+            return getNamedMembers(propsByName);
+        }
+        function typeHasCallOrConstructSignatures(type) {
+            return ts.typeHasCallOrConstructSignatures(type, checker);
+        }
+        function getRootSymbols(symbol) {
+            var roots = getImmediateRootSymbols(symbol);
+            return roots ? ts.flatMap(roots, getRootSymbols) : [symbol];
+        }
+        function getImmediateRootSymbols(symbol) {
+            if (ts.getCheckFlags(symbol) & 6 /* Synthetic */) {
+                return ts.mapDefined(getSymbolLinks(symbol).containingType.types, function (type) { return getPropertyOfType(type, symbol.escapedName); });
+            }
+            else if (symbol.flags & 33554432 /* Transient */) {
+                var _a = symbol, leftSpread = _a.leftSpread, rightSpread = _a.rightSpread, syntheticOrigin = _a.syntheticOrigin;
+                return leftSpread ? [leftSpread, rightSpread]
+                    : syntheticOrigin ? [syntheticOrigin]
+                        : ts.singleElementArray(tryGetAliasTarget(symbol));
+            }
+            return undefined;
+        }
+        function tryGetAliasTarget(symbol) {
+            var target;
+            var next = symbol;
+            while (next = getSymbolLinks(next).target) {
+                target = next;
+            }
+            return target;
+        }
+        // Emitter support
+        function isArgumentsLocalBinding(nodeIn) {
+            if (!ts.isGeneratedIdentifier(nodeIn)) {
+                var node = ts.getParseTreeNode(nodeIn, ts.isIdentifier);
+                if (node) {
+                    var isPropertyName_1 = node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node;
+                    return !isPropertyName_1 && getReferencedValueSymbol(node) === argumentsSymbol;
+                }
+            }
+            return false;
+        }
+        function moduleExportsSomeValue(moduleReferenceExpression) {
+            var moduleSymbol = resolveExternalModuleName(moduleReferenceExpression.parent, moduleReferenceExpression);
+            if (!moduleSymbol || ts.isShorthandAmbientModuleSymbol(moduleSymbol)) {
+                // If the module is not found or is shorthand, assume that it may export a value.
+                return true;
+            }
+            var hasExportAssignment = hasExportAssignmentSymbol(moduleSymbol);
+            // if module has export assignment then 'resolveExternalModuleSymbol' will return resolved symbol for export assignment
+            // otherwise it will return moduleSymbol itself
+            moduleSymbol = resolveExternalModuleSymbol(moduleSymbol);
+            var symbolLinks = getSymbolLinks(moduleSymbol);
+            if (symbolLinks.exportsSomeValue === undefined) {
+                // for export assignments - check if resolved symbol for RHS is itself a value
+                // otherwise - check if at least one export is value
+                symbolLinks.exportsSomeValue = hasExportAssignment
+                    ? !!(moduleSymbol.flags & 67220415 /* Value */)
+                    : ts.forEachEntry(getExportsOfModule(moduleSymbol), isValue);
+            }
+            return symbolLinks.exportsSomeValue;
+            function isValue(s) {
+                s = resolveSymbol(s);
+                return s && !!(s.flags & 67220415 /* Value */);
+            }
+        }
+        function isNameOfModuleOrEnumDeclaration(node) {
+            return ts.isModuleOrEnumDeclaration(node.parent) && node === node.parent.name;
+        }
+        // When resolved as an expression identifier, if the given node references an exported entity, return the declaration
+        // node of the exported entity's container. Otherwise, return undefined.
+        function getReferencedExportContainer(nodeIn, prefixLocals) {
+            var node = ts.getParseTreeNode(nodeIn, ts.isIdentifier);
+            if (node) {
+                // When resolving the export container for the name of a module or enum
+                // declaration, we need to start resolution at the declaration's container.
+                // Otherwise, we could incorrectly resolve the export container as the
+                // declaration if it contains an exported member with the same name.
+                var symbol = getReferencedValueSymbol(node, /*startInDeclarationContainer*/ isNameOfModuleOrEnumDeclaration(node));
+                if (symbol) {
+                    if (symbol.flags & 1048576 /* ExportValue */) {
+                        // If we reference an exported entity within the same module declaration, then whether
+                        // we prefix depends on the kind of entity. SymbolFlags.ExportHasLocal encompasses all the
+                        // kinds that we do NOT prefix.
+                        var exportSymbol = getMergedSymbol(symbol.exportSymbol);
+                        if (!prefixLocals && exportSymbol.flags & 944 /* ExportHasLocal */ && !(exportSymbol.flags & 3 /* Variable */)) {
+                            return undefined;
+                        }
+                        symbol = exportSymbol;
+                    }
+                    var parentSymbol_1 = getParentOfSymbol(symbol);
+                    if (parentSymbol_1) {
+                        if (parentSymbol_1.flags & 512 /* ValueModule */ && parentSymbol_1.valueDeclaration.kind === 279 /* SourceFile */) {
+                            var symbolFile = parentSymbol_1.valueDeclaration;
+                            var referenceFile = ts.getSourceFileOfNode(node);
+                            // If `node` accesses an export and that export isn't in the same file, then symbol is a namespace export, so return undefined.
+                            var symbolIsUmdExport = symbolFile !== referenceFile;
+                            return symbolIsUmdExport ? undefined : symbolFile;
+                        }
+                        return ts.findAncestor(node.parent, function (n) { return ts.isModuleOrEnumDeclaration(n) && getSymbolOfNode(n) === parentSymbol_1; });
+                    }
+                }
+            }
+        }
+        // When resolved as an expression identifier, if the given node references an import, return the declaration of
+        // that import. Otherwise, return undefined.
+        function getReferencedImportDeclaration(nodeIn) {
+            var node = ts.getParseTreeNode(nodeIn, ts.isIdentifier);
+            if (node) {
+                var symbol = getReferencedValueSymbol(node);
+                // We should only get the declaration of an alias if there isn't a local value
+                // declaration for the symbol
+                if (isNonLocalAlias(symbol, /*excludes*/ 67220415 /* Value */)) {
+                    return getDeclarationOfAliasSymbol(symbol);
+                }
+            }
+            return undefined;
+        }
+        function isSymbolOfDeclarationWithCollidingName(symbol) {
+            if (symbol.flags & 418 /* BlockScoped */) {
+                var links = getSymbolLinks(symbol);
+                if (links.isDeclarationWithCollidingName === undefined) {
+                    var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
+                    if (ts.isStatementWithLocals(container)) {
+                        var nodeLinks_1 = getNodeLinks(symbol.valueDeclaration);
+                        if (resolveName(container.parent, symbol.escapedName, 67220415 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false)) {
+                            // redeclaration - always should be renamed
+                            links.isDeclarationWithCollidingName = true;
+                        }
+                        else if (nodeLinks_1.flags & 262144 /* CapturedBlockScopedBinding */) {
+                            // binding is captured in the function
+                            // should be renamed if:
+                            // - binding is not top level - top level bindings never collide with anything
+                            // AND
+                            //   - binding is not declared in loop, should be renamed to avoid name reuse across siblings
+                            //     let a, b
+                            //     { let x = 1; a = () => x; }
+                            //     { let x = 100; b = () => x; }
+                            //     console.log(a()); // should print '1'
+                            //     console.log(b()); // should print '100'
+                            //     OR
+                            //   - binding is declared inside loop but not in inside initializer of iteration statement or directly inside loop body
+                            //     * variables from initializer are passed to rewritten loop body as parameters so they are not captured directly
+                            //     * variables that are declared immediately in loop body will become top level variable after loop is rewritten and thus
+                            //       they will not collide with anything
+                            var isDeclaredInLoop = nodeLinks_1.flags & 524288 /* BlockScopedBindingInLoop */;
+                            var inLoopInitializer = ts.isIterationStatement(container, /*lookInLabeledStatements*/ false);
+                            var inLoopBodyBlock = container.kind === 218 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
+                            links.isDeclarationWithCollidingName = !ts.isBlockScopedContainerTopLevel(container) && (!isDeclaredInLoop || (!inLoopInitializer && !inLoopBodyBlock));
+                        }
+                        else {
+                            links.isDeclarationWithCollidingName = false;
+                        }
+                    }
+                }
+                return links.isDeclarationWithCollidingName;
+            }
+            return false;
+        }
+        // When resolved as an expression identifier, if the given node references a nested block scoped entity with
+        // a name that either hides an existing name or might hide it when compiled downlevel,
+        // return the declaration of that entity. Otherwise, return undefined.
+        function getReferencedDeclarationWithCollidingName(nodeIn) {
+            if (!ts.isGeneratedIdentifier(nodeIn)) {
+                var node = ts.getParseTreeNode(nodeIn, ts.isIdentifier);
+                if (node) {
+                    var symbol = getReferencedValueSymbol(node);
+                    if (symbol && isSymbolOfDeclarationWithCollidingName(symbol)) {
+                        return symbol.valueDeclaration;
+                    }
+                }
+            }
+            return undefined;
+        }
+        // Return true if the given node is a declaration of a nested block scoped entity with a name that either hides an
+        // existing name or might hide a name when compiled downlevel
+        function isDeclarationWithCollidingName(nodeIn) {
+            var node = ts.getParseTreeNode(nodeIn, ts.isDeclaration);
+            if (node) {
+                var symbol = getSymbolOfNode(node);
+                if (symbol) {
+                    return isSymbolOfDeclarationWithCollidingName(symbol);
+                }
+            }
+            return false;
+        }
+        function isValueAliasDeclaration(node) {
+            switch (node.kind) {
+                case 248 /* ImportEqualsDeclaration */:
+                case 250 /* ImportClause */:
+                case 251 /* NamespaceImport */:
+                case 253 /* ImportSpecifier */:
+                case 257 /* ExportSpecifier */:
+                    return isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol);
+                case 255 /* ExportDeclaration */:
+                    var exportClause = node.exportClause;
+                    return !!exportClause && ts.some(exportClause.elements, isValueAliasDeclaration);
+                case 254 /* ExportAssignment */:
+                    return node.expression
+                        && node.expression.kind === 72 /* Identifier */
+                        ? isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol)
+                        : true;
+            }
+            return false;
+        }
+        function isTopLevelValueImportEqualsWithEntityName(nodeIn) {
+            var node = ts.getParseTreeNode(nodeIn, ts.isImportEqualsDeclaration);
+            if (node === undefined || node.parent.kind !== 279 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
+                // parent is not source file or it is not reference to internal module
+                return false;
+            }
+            var isValue = isAliasResolvedToValue(getSymbolOfNode(node));
+            return isValue && node.moduleReference && !ts.nodeIsMissing(node.moduleReference);
+        }
+        function isAliasResolvedToValue(symbol) {
+            var target = resolveAlias(symbol);
+            if (target === unknownSymbol) {
+                return true;
+            }
+            // const enums and modules that contain only const enums are not considered values from the emit perspective
+            // unless 'preserveConstEnums' option is set to true
+            return !!(target.flags & 67220415 /* Value */) &&
+                (compilerOptions.preserveConstEnums || !isConstEnumOrConstEnumOnlyModule(target));
+        }
+        function isConstEnumOrConstEnumOnlyModule(s) {
+            return isConstEnumSymbol(s) || !!s.constEnumOnlyModule;
+        }
+        function isReferencedAliasDeclaration(node, checkChildren) {
+            if (ts.isAliasSymbolDeclaration(node)) {
+                var symbol = getSymbolOfNode(node);
+                if (symbol && getSymbolLinks(symbol).referenced) {
+                    return true;
+                }
+                var target = getSymbolLinks(symbol).target; // TODO: GH#18217
+                if (target && ts.getModifierFlags(node) & 1 /* Export */ &&
+                    target.flags & 67220415 /* Value */ && (compilerOptions.preserveConstEnums || !isConstEnumOrConstEnumOnlyModule(target))) {
+                    // An `export import ... =` of a value symbol is always considered referenced
+                    return true;
+                }
+            }
+            if (checkChildren) {
+                return !!ts.forEachChild(node, function (node) { return isReferencedAliasDeclaration(node, checkChildren); });
+            }
+            return false;
+        }
+        function isImplementationOfOverload(node) {
+            if (ts.nodeIsPresent(node.body)) {
+                if (ts.isGetAccessor(node) || ts.isSetAccessor(node))
+                    return false; // Get or set accessors can never be overload implementations, but can have up to 2 signatures
+                var symbol = getSymbolOfNode(node);
+                var signaturesOfSymbol = getSignaturesOfSymbol(symbol);
+                // If this function body corresponds to function with multiple signature, it is implementation of overload
+                // e.g.: function foo(a: string): string;
+                //       function foo(a: number): number;
+                //       function foo(a: any) { // This is implementation of the overloads
+                //           return a;
+                //       }
+                return signaturesOfSymbol.length > 1 ||
+                    // If there is single signature for the symbol, it is overload if that signature isn't coming from the node
+                    // e.g.: function foo(a: string): string;
+                    //       function foo(a: any) { // This is implementation of the overloads
+                    //           return a;
+                    //       }
+                    (signaturesOfSymbol.length === 1 && signaturesOfSymbol[0].declaration !== node);
+            }
+            return false;
+        }
+        function isRequiredInitializedParameter(parameter) {
+            return !!strictNullChecks &&
+                !isOptionalParameter(parameter) &&
+                !ts.isJSDocParameterTag(parameter) &&
+                !!parameter.initializer &&
+                !ts.hasModifier(parameter, 92 /* ParameterPropertyModifier */);
+        }
+        function isOptionalUninitializedParameterProperty(parameter) {
+            return strictNullChecks &&
+                isOptionalParameter(parameter) &&
+                !parameter.initializer &&
+                ts.hasModifier(parameter, 92 /* ParameterPropertyModifier */);
+        }
+        function isExpandoFunctionDeclaration(node) {
+            var declaration = ts.getParseTreeNode(node, ts.isFunctionDeclaration);
+            if (!declaration) {
+                return false;
+            }
+            var symbol = getSymbolOfNode(declaration);
+            if (!symbol || !(symbol.flags & 16 /* Function */)) {
+                return false;
+            }
+            return !!ts.forEachEntry(getExportsOfSymbol(symbol), function (p) { return p.flags & 67220415 /* Value */ && ts.isPropertyAccessExpression(p.valueDeclaration); });
+        }
+        function getPropertiesOfContainerFunction(node) {
+            var declaration = ts.getParseTreeNode(node, ts.isFunctionDeclaration);
+            if (!declaration) {
+                return ts.emptyArray;
+            }
+            var symbol = getSymbolOfNode(declaration);
+            return symbol && getPropertiesOfType(getTypeOfSymbol(symbol)) || ts.emptyArray;
+        }
+        function getNodeCheckFlags(node) {
+            return getNodeLinks(node).flags || 0;
+        }
+        function getEnumMemberValue(node) {
+            computeEnumMemberValues(node.parent);
+            return getNodeLinks(node).enumMemberValue;
+        }
+        function canHaveConstantValue(node) {
+            switch (node.kind) {
+                case 278 /* EnumMember */:
+                case 189 /* PropertyAccessExpression */:
+                case 190 /* ElementAccessExpression */:
+                    return true;
+            }
+            return false;
+        }
+        function getConstantValue(node) {
+            if (node.kind === 278 /* EnumMember */) {
+                return getEnumMemberValue(node);
+            }
+            var symbol = getNodeLinks(node).resolvedSymbol;
+            if (symbol && (symbol.flags & 8 /* EnumMember */)) {
+                // inline property\index accesses only for const enums
+                var member = symbol.valueDeclaration;
+                if (ts.isEnumConst(member.parent)) {
+                    return getEnumMemberValue(member);
+                }
+            }
+            return undefined;
+        }
+        function isFunctionType(type) {
+            return !!(type.flags & 524288 /* Object */) && getSignaturesOfType(type, 0 /* Call */).length > 0;
+        }
+        function getTypeReferenceSerializationKind(typeNameIn, location) {
+            // ensure both `typeName` and `location` are parse tree nodes.
+            var typeName = ts.getParseTreeNode(typeNameIn, ts.isEntityName);
+            if (!typeName)
+                return ts.TypeReferenceSerializationKind.Unknown;
+            if (location) {
+                location = ts.getParseTreeNode(location);
+                if (!location)
+                    return ts.TypeReferenceSerializationKind.Unknown;
+            }
+            // Resolve the symbol as a value to ensure the type can be reached at runtime during emit.
+            var valueSymbol = resolveEntityName(typeName, 67220415 /* Value */, /*ignoreErrors*/ true, /*dontResolveAlias*/ false, location);
+            // Resolve the symbol as a type so that we can provide a more useful hint for the type serializer.
+            var typeSymbol = resolveEntityName(typeName, 67897832 /* Type */, /*ignoreErrors*/ true, /*dontResolveAlias*/ false, location);
+            if (valueSymbol && valueSymbol === typeSymbol) {
+                var globalPromiseSymbol = getGlobalPromiseConstructorSymbol(/*reportErrors*/ false);
+                if (globalPromiseSymbol && valueSymbol === globalPromiseSymbol) {
+                    return ts.TypeReferenceSerializationKind.Promise;
+                }
+                var constructorType = getTypeOfSymbol(valueSymbol);
+                if (constructorType && isConstructorType(constructorType)) {
+                    return ts.TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue;
+                }
+            }
+            // We might not be able to resolve type symbol so use unknown type in that case (eg error case)
+            if (!typeSymbol) {
+                return ts.TypeReferenceSerializationKind.Unknown;
+            }
+            var type = getDeclaredTypeOfSymbol(typeSymbol);
+            if (type === errorType) {
+                return ts.TypeReferenceSerializationKind.Unknown;
+            }
+            else if (type.flags & 3 /* AnyOrUnknown */) {
+                return ts.TypeReferenceSerializationKind.ObjectType;
+            }
+            else if (isTypeAssignableToKind(type, 16384 /* Void */ | 98304 /* Nullable */ | 131072 /* Never */)) {
+                return ts.TypeReferenceSerializationKind.VoidNullableOrNeverType;
+            }
+            else if (isTypeAssignableToKind(type, 528 /* BooleanLike */)) {
+                return ts.TypeReferenceSerializationKind.BooleanType;
+            }
+            else if (isTypeAssignableToKind(type, 296 /* NumberLike */)) {
+                return ts.TypeReferenceSerializationKind.NumberLikeType;
+            }
+            else if (isTypeAssignableToKind(type, 2112 /* BigIntLike */)) {
+                return ts.TypeReferenceSerializationKind.BigIntLikeType;
+            }
+            else if (isTypeAssignableToKind(type, 132 /* StringLike */)) {
+                return ts.TypeReferenceSerializationKind.StringLikeType;
+            }
+            else if (isTupleType(type)) {
+                return ts.TypeReferenceSerializationKind.ArrayLikeType;
+            }
+            else if (isTypeAssignableToKind(type, 12288 /* ESSymbolLike */)) {
+                return ts.TypeReferenceSerializationKind.ESSymbolType;
+            }
+            else if (isFunctionType(type)) {
+                return ts.TypeReferenceSerializationKind.TypeWithCallSignature;
+            }
+            else if (isArrayType(type)) {
+                return ts.TypeReferenceSerializationKind.ArrayLikeType;
+            }
+            else {
+                return ts.TypeReferenceSerializationKind.ObjectType;
+            }
+        }
+        function createTypeOfDeclaration(declarationIn, enclosingDeclaration, flags, tracker, addUndefined) {
+            var declaration = ts.getParseTreeNode(declarationIn, ts.isVariableLikeOrAccessor);
+            if (!declaration) {
+                return ts.createToken(120 /* AnyKeyword */);
+            }
+            // Get type of the symbol if this is the valid symbol otherwise get type at location
+            var symbol = getSymbolOfNode(declaration);
+            var type = symbol && !(symbol.flags & (2048 /* TypeLiteral */ | 131072 /* Signature */))
+                ? getWidenedLiteralType(getTypeOfSymbol(symbol))
+                : errorType;
+            if (type.flags & 8192 /* UniqueESSymbol */ &&
+                type.symbol === symbol) {
+                flags |= 1048576 /* AllowUniqueESSymbolType */;
+            }
+            if (addUndefined) {
+                type = getOptionalType(type);
+            }
+            return nodeBuilder.typeToTypeNode(type, enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */, tracker);
+        }
+        function createReturnTypeOfSignatureDeclaration(signatureDeclarationIn, enclosingDeclaration, flags, tracker) {
+            var signatureDeclaration = ts.getParseTreeNode(signatureDeclarationIn, ts.isFunctionLike);
+            if (!signatureDeclaration) {
+                return ts.createToken(120 /* AnyKeyword */);
+            }
+            var signature = getSignatureFromDeclaration(signatureDeclaration);
+            return nodeBuilder.typeToTypeNode(getReturnTypeOfSignature(signature), enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */, tracker);
+        }
+        function createTypeOfExpression(exprIn, enclosingDeclaration, flags, tracker) {
+            var expr = ts.getParseTreeNode(exprIn, ts.isExpression);
+            if (!expr) {
+                return ts.createToken(120 /* AnyKeyword */);
+            }
+            var type = getWidenedType(getRegularTypeOfExpression(expr));
+            return nodeBuilder.typeToTypeNode(type, enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */, tracker);
+        }
+        function hasGlobalName(name) {
+            return globals.has(ts.escapeLeadingUnderscores(name));
+        }
+        function getReferencedValueSymbol(reference, startInDeclarationContainer) {
+            var resolvedSymbol = getNodeLinks(reference).resolvedSymbol;
+            if (resolvedSymbol) {
+                return resolvedSymbol;
+            }
+            var location = reference;
+            if (startInDeclarationContainer) {
+                // When resolving the name of a declaration as a value, we need to start resolution
+                // at a point outside of the declaration.
+                var parent = reference.parent;
+                if (ts.isDeclaration(parent) && reference === parent.name) {
+                    location = getDeclarationContainer(parent);
+                }
+            }
+            return resolveName(location, reference.escapedText, 67220415 /* Value */ | 1048576 /* ExportValue */ | 2097152 /* Alias */, /*nodeNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ true);
+        }
+        function getReferencedValueDeclaration(referenceIn) {
+            if (!ts.isGeneratedIdentifier(referenceIn)) {
+                var reference = ts.getParseTreeNode(referenceIn, ts.isIdentifier);
+                if (reference) {
+                    var symbol = getReferencedValueSymbol(reference);
+                    if (symbol) {
+                        return getExportSymbolOfValueSymbolIfExported(symbol).valueDeclaration;
+                    }
+                }
+            }
+            return undefined;
+        }
+        function isLiteralConstDeclaration(node) {
+            if (ts.isDeclarationReadonly(node) || ts.isVariableDeclaration(node) && ts.isVarConst(node)) {
+                return isFreshLiteralType(getTypeOfSymbol(getSymbolOfNode(node)));
+            }
+            return false;
+        }
+        function literalTypeToNode(type, enclosing, tracker) {
+            var enumResult = type.flags & 1024 /* EnumLiteral */ ? nodeBuilder.symbolToExpression(type.symbol, 67220415 /* Value */, enclosing, /*flags*/ undefined, tracker)
+                : type === trueType ? ts.createTrue() : type === falseType && ts.createFalse();
+            return enumResult || ts.createLiteral(type.value);
+        }
+        function createLiteralConstValue(node, tracker) {
+            var type = getTypeOfSymbol(getSymbolOfNode(node));
+            return literalTypeToNode(type, node, tracker);
+        }
+        function createResolver() {
+            // this variable and functions that use it are deliberately moved here from the outer scope
+            // to avoid scope pollution
+            var resolvedTypeReferenceDirectives = host.getResolvedTypeReferenceDirectives();
+            var fileToDirective;
+            if (resolvedTypeReferenceDirectives) {
+                // populate reverse mapping: file path -> type reference directive that was resolved to this file
+                fileToDirective = ts.createMap();
+                resolvedTypeReferenceDirectives.forEach(function (resolvedDirective, key) {
+                    if (!resolvedDirective || !resolvedDirective.resolvedFileName) {
+                        return;
+                    }
+                    var file = host.getSourceFile(resolvedDirective.resolvedFileName);
+                    // Add the transitive closure of path references loaded by this file (as long as they are not)
+                    // part of an existing type reference.
+                    addReferencedFilesToTypeDirective(file, key);
+                });
+            }
+            return {
+                getReferencedExportContainer: getReferencedExportContainer,
+                getReferencedImportDeclaration: getReferencedImportDeclaration,
+                getReferencedDeclarationWithCollidingName: getReferencedDeclarationWithCollidingName,
+                isDeclarationWithCollidingName: isDeclarationWithCollidingName,
+                isValueAliasDeclaration: function (node) {
+                    node = ts.getParseTreeNode(node);
+                    // Synthesized nodes are always treated like values.
+                    return node ? isValueAliasDeclaration(node) : true;
+                },
+                hasGlobalName: hasGlobalName,
+                isReferencedAliasDeclaration: function (node, checkChildren) {
+                    node = ts.getParseTreeNode(node);
+                    // Synthesized nodes are always treated as referenced.
+                    return node ? isReferencedAliasDeclaration(node, checkChildren) : true;
+                },
+                getNodeCheckFlags: function (node) {
+                    node = ts.getParseTreeNode(node);
+                    return node ? getNodeCheckFlags(node) : 0;
+                },
+                isTopLevelValueImportEqualsWithEntityName: isTopLevelValueImportEqualsWithEntityName,
+                isDeclarationVisible: isDeclarationVisible,
+                isImplementationOfOverload: isImplementationOfOverload,
+                isRequiredInitializedParameter: isRequiredInitializedParameter,
+                isOptionalUninitializedParameterProperty: isOptionalUninitializedParameterProperty,
+                isExpandoFunctionDeclaration: isExpandoFunctionDeclaration,
+                getPropertiesOfContainerFunction: getPropertiesOfContainerFunction,
+                createTypeOfDeclaration: createTypeOfDeclaration,
+                createReturnTypeOfSignatureDeclaration: createReturnTypeOfSignatureDeclaration,
+                createTypeOfExpression: createTypeOfExpression,
+                createLiteralConstValue: createLiteralConstValue,
+                isSymbolAccessible: isSymbolAccessible,
+                isEntityNameVisible: isEntityNameVisible,
+                getConstantValue: function (nodeIn) {
+                    var node = ts.getParseTreeNode(nodeIn, canHaveConstantValue);
+                    return node ? getConstantValue(node) : undefined;
+                },
+                collectLinkedAliases: collectLinkedAliases,
+                getReferencedValueDeclaration: getReferencedValueDeclaration,
+                getTypeReferenceSerializationKind: getTypeReferenceSerializationKind,
+                isOptionalParameter: isOptionalParameter,
+                moduleExportsSomeValue: moduleExportsSomeValue,
+                isArgumentsLocalBinding: isArgumentsLocalBinding,
+                getExternalModuleFileFromDeclaration: getExternalModuleFileFromDeclaration,
+                getTypeReferenceDirectivesForEntityName: getTypeReferenceDirectivesForEntityName,
+                getTypeReferenceDirectivesForSymbol: getTypeReferenceDirectivesForSymbol,
+                isLiteralConstDeclaration: isLiteralConstDeclaration,
+                isLateBound: function (nodeIn) {
+                    var node = ts.getParseTreeNode(nodeIn, ts.isDeclaration);
+                    var symbol = node && getSymbolOfNode(node);
+                    return !!(symbol && ts.getCheckFlags(symbol) & 2048 /* Late */);
+                },
+                getJsxFactoryEntity: function (location) { return location ? (getJsxNamespace(location), (ts.getSourceFileOfNode(location).localJsxFactory || _jsxFactoryEntity)) : _jsxFactoryEntity; },
+                getAllAccessorDeclarations: function (accessor) {
+                    accessor = ts.getParseTreeNode(accessor, ts.isGetOrSetAccessorDeclaration); // TODO: GH#18217
+                    var otherKind = accessor.kind === 159 /* SetAccessor */ ? 158 /* GetAccessor */ : 159 /* SetAccessor */;
+                    var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(accessor), otherKind);
+                    var firstAccessor = otherAccessor && (otherAccessor.pos < accessor.pos) ? otherAccessor : accessor;
+                    var secondAccessor = otherAccessor && (otherAccessor.pos < accessor.pos) ? accessor : otherAccessor;
+                    var setAccessor = accessor.kind === 159 /* SetAccessor */ ? accessor : otherAccessor;
+                    var getAccessor = accessor.kind === 158 /* GetAccessor */ ? accessor : otherAccessor;
+                    return {
+                        firstAccessor: firstAccessor,
+                        secondAccessor: secondAccessor,
+                        setAccessor: setAccessor,
+                        getAccessor: getAccessor
+                    };
+                },
+                getSymbolOfExternalModuleSpecifier: function (moduleName) { return resolveExternalModuleNameWorker(moduleName, moduleName, /*moduleNotFoundError*/ undefined); },
+                isBindingCapturedByNode: function (node, decl) {
+                    var parseNode = ts.getParseTreeNode(node);
+                    var parseDecl = ts.getParseTreeNode(decl);
+                    return !!parseNode && !!parseDecl && (ts.isVariableDeclaration(parseDecl) || ts.isBindingElement(parseDecl)) && isBindingCapturedByNode(parseNode, parseDecl);
+                }
+            };
+            function isInHeritageClause(node) {
+                return node.parent && node.parent.kind === 211 /* ExpressionWithTypeArguments */ && node.parent.parent && node.parent.parent.kind === 273 /* HeritageClause */;
+            }
+            // defined here to avoid outer scope pollution
+            function getTypeReferenceDirectivesForEntityName(node) {
+                // program does not have any files with type reference directives - bail out
+                if (!fileToDirective) {
+                    return undefined;
+                }
+                // property access can only be used as values, or types when within an expression with type arguments inside a heritage clause
+                // qualified names can only be used as types\namespaces
+                // identifiers are treated as values only if they appear in type queries
+                var meaning = 67897832 /* Type */ | 1920 /* Namespace */;
+                if ((node.kind === 72 /* Identifier */ && isInTypeQuery(node)) || (node.kind === 189 /* PropertyAccessExpression */ && !isInHeritageClause(node))) {
+                    meaning = 67220415 /* Value */ | 1048576 /* ExportValue */;
+                }
+                var symbol = resolveEntityName(node, meaning, /*ignoreErrors*/ true);
+                return symbol && symbol !== unknownSymbol ? getTypeReferenceDirectivesForSymbol(symbol, meaning) : undefined;
+            }
+            // defined here to avoid outer scope pollution
+            function getTypeReferenceDirectivesForSymbol(symbol, meaning) {
+                // program does not have any files with type reference directives - bail out
+                if (!fileToDirective) {
+                    return undefined;
+                }
+                if (!isSymbolFromTypeDeclarationFile(symbol)) {
+                    return undefined;
+                }
+                // check what declarations in the symbol can contribute to the target meaning
+                var typeReferenceDirectives;
+                for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                    var decl = _a[_i];
+                    // check meaning of the local symbol to see if declaration needs to be analyzed further
+                    if (decl.symbol && decl.symbol.flags & meaning) {
+                        var file = ts.getSourceFileOfNode(decl);
+                        var typeReferenceDirective = fileToDirective.get(file.path);
+                        if (typeReferenceDirective) {
+                            (typeReferenceDirectives || (typeReferenceDirectives = [])).push(typeReferenceDirective);
+                        }
+                        else {
+                            // found at least one entry that does not originate from type reference directive
+                            return undefined;
+                        }
+                    }
+                }
+                return typeReferenceDirectives;
+            }
+            function isSymbolFromTypeDeclarationFile(symbol) {
+                // bail out if symbol does not have associated declarations (i.e. this is transient symbol created for property in binding pattern)
+                if (!symbol.declarations) {
+                    return false;
+                }
+                // walk the parent chain for symbols to make sure that top level parent symbol is in the global scope
+                // external modules cannot define or contribute to type declaration files
+                var current = symbol;
+                while (true) {
+                    var parent = getParentOfSymbol(current);
+                    if (parent) {
+                        current = parent;
+                    }
+                    else {
+                        break;
+                    }
+                }
+                if (current.valueDeclaration && current.valueDeclaration.kind === 279 /* SourceFile */ && current.flags & 512 /* ValueModule */) {
+                    return false;
+                }
+                // check that at least one declaration of top level symbol originates from type declaration file
+                for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                    var decl = _a[_i];
+                    var file = ts.getSourceFileOfNode(decl);
+                    if (fileToDirective.has(file.path)) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+            function addReferencedFilesToTypeDirective(file, key) {
+                if (fileToDirective.has(file.path))
+                    return;
+                fileToDirective.set(file.path, key);
+                for (var _i = 0, _a = file.referencedFiles; _i < _a.length; _i++) {
+                    var fileName = _a[_i].fileName;
+                    var resolvedFile = ts.resolveTripleslashReference(fileName, file.originalFileName);
+                    var referencedFile = host.getSourceFile(resolvedFile);
+                    if (referencedFile) {
+                        addReferencedFilesToTypeDirective(referencedFile, key);
+                    }
+                }
+            }
+        }
+        function getExternalModuleFileFromDeclaration(declaration) {
+            var specifier = declaration.kind === 244 /* ModuleDeclaration */ ? ts.tryCast(declaration.name, ts.isStringLiteral) : ts.getExternalModuleName(declaration);
+            var moduleSymbol = resolveExternalModuleNameWorker(specifier, specifier, /*moduleNotFoundError*/ undefined); // TODO: GH#18217
+            if (!moduleSymbol) {
+                return undefined;
+            }
+            return ts.getDeclarationOfKind(moduleSymbol, 279 /* SourceFile */);
+        }
+        function initializeTypeChecker() {
+            // Bind all source files and propagate errors
+            for (var _i = 0, _a = host.getSourceFiles(); _i < _a.length; _i++) {
+                var file = _a[_i];
+                ts.bindSourceFile(file, compilerOptions);
+            }
+            amalgamatedDuplicates = ts.createMap();
+            // Initialize global symbol table
+            var augmentations;
+            for (var _b = 0, _c = host.getSourceFiles(); _b < _c.length; _b++) {
+                var file = _c[_b];
+                if (file.redirectInfo) {
+                    continue;
+                }
+                if (!ts.isExternalOrCommonJsModule(file)) {
+                    mergeSymbolTable(globals, file.locals);
+                }
+                if (file.jsGlobalAugmentations) {
+                    mergeSymbolTable(globals, file.jsGlobalAugmentations);
+                }
+                if (file.patternAmbientModules && file.patternAmbientModules.length) {
+                    patternAmbientModules = ts.concatenate(patternAmbientModules, file.patternAmbientModules);
+                }
+                if (file.moduleAugmentations.length) {
+                    (augmentations || (augmentations = [])).push(file.moduleAugmentations);
+                }
+                if (file.symbol && file.symbol.globalExports) {
+                    // Merge in UMD exports with first-in-wins semantics (see #9771)
+                    var source = file.symbol.globalExports;
+                    source.forEach(function (sourceSymbol, id) {
+                        if (!globals.has(id)) {
+                            globals.set(id, sourceSymbol);
+                        }
+                    });
+                }
+            }
+            // We do global augmentations separately from module augmentations (and before creating global types) because they
+            //  1. Affect global types. We won't have the correct global types until global augmentations are merged. Also,
+            //  2. Module augmentation instantiation requires creating the type of a module, which, in turn, can require
+            //       checking for an export or property on the module (if export=) which, in turn, can fall back to the
+            //       apparent type of the module - either globalObjectType or globalFunctionType - which wouldn't exist if we
+            //       did module augmentations prior to finalizing the global types.
+            if (augmentations) {
+                // merge _global_ module augmentations.
+                // this needs to be done after global symbol table is initialized to make sure that all ambient modules are indexed
+                for (var _d = 0, augmentations_1 = augmentations; _d < augmentations_1.length; _d++) {
+                    var list = augmentations_1[_d];
+                    for (var _e = 0, list_1 = list; _e < list_1.length; _e++) {
+                        var augmentation = list_1[_e];
+                        if (!ts.isGlobalScopeAugmentation(augmentation.parent))
+                            continue;
+                        mergeModuleAugmentation(augmentation);
+                    }
+                }
+            }
+            // Setup global builtins
+            addToSymbolTable(globals, builtinGlobals, ts.Diagnostics.Declaration_name_conflicts_with_built_in_global_identifier_0);
+            getSymbolLinks(undefinedSymbol).type = undefinedWideningType;
+            getSymbolLinks(argumentsSymbol).type = getGlobalType("IArguments", /*arity*/ 0, /*reportErrors*/ true);
+            getSymbolLinks(unknownSymbol).type = errorType;
+            // Initialize special types
+            globalArrayType = getGlobalType("Array", /*arity*/ 1, /*reportErrors*/ true);
+            globalObjectType = getGlobalType("Object", /*arity*/ 0, /*reportErrors*/ true);
+            globalFunctionType = getGlobalType("Function", /*arity*/ 0, /*reportErrors*/ true);
+            globalCallableFunctionType = strictBindCallApply && getGlobalType("CallableFunction", /*arity*/ 0, /*reportErrors*/ true) || globalFunctionType;
+            globalNewableFunctionType = strictBindCallApply && getGlobalType("NewableFunction", /*arity*/ 0, /*reportErrors*/ true) || globalFunctionType;
+            globalStringType = getGlobalType("String", /*arity*/ 0, /*reportErrors*/ true);
+            globalNumberType = getGlobalType("Number", /*arity*/ 0, /*reportErrors*/ true);
+            globalBooleanType = getGlobalType("Boolean", /*arity*/ 0, /*reportErrors*/ true);
+            globalRegExpType = getGlobalType("RegExp", /*arity*/ 0, /*reportErrors*/ true);
+            anyArrayType = createArrayType(anyType);
+            autoArrayType = createArrayType(autoType);
+            if (autoArrayType === emptyObjectType) {
+                // autoArrayType is used as a marker, so even if global Array type is not defined, it needs to be a unique type
+                autoArrayType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
+            }
+            globalReadonlyArrayType = getGlobalTypeOrUndefined("ReadonlyArray", /*arity*/ 1);
+            anyReadonlyArrayType = globalReadonlyArrayType ? createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]) : anyArrayType;
+            globalThisType = getGlobalTypeOrUndefined("ThisType", /*arity*/ 1);
+            if (augmentations) {
+                // merge _nonglobal_ module augmentations.
+                // this needs to be done after global symbol table is initialized to make sure that all ambient modules are indexed
+                for (var _f = 0, augmentations_2 = augmentations; _f < augmentations_2.length; _f++) {
+                    var list = augmentations_2[_f];
+                    for (var _g = 0, list_2 = list; _g < list_2.length; _g++) {
+                        var augmentation = list_2[_g];
+                        if (ts.isGlobalScopeAugmentation(augmentation.parent))
+                            continue;
+                        mergeModuleAugmentation(augmentation);
+                    }
+                }
+            }
+            amalgamatedDuplicates.forEach(function (_a) {
+                var firstFile = _a.firstFile, secondFile = _a.secondFile, conflictingSymbols = _a.conflictingSymbols;
+                // If not many things conflict, issue individual errors
+                if (conflictingSymbols.size < 8) {
+                    conflictingSymbols.forEach(function (_a, symbolName) {
+                        var isBlockScoped = _a.isBlockScoped, firstFileLocations = _a.firstFileLocations, secondFileLocations = _a.secondFileLocations;
+                        var message = isBlockScoped ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0;
+                        for (var _i = 0, firstFileLocations_1 = firstFileLocations; _i < firstFileLocations_1.length; _i++) {
+                            var node = firstFileLocations_1[_i];
+                            addDuplicateDeclarationError(node, message, symbolName, secondFileLocations);
+                        }
+                        for (var _b = 0, secondFileLocations_1 = secondFileLocations; _b < secondFileLocations_1.length; _b++) {
+                            var node = secondFileLocations_1[_b];
+                            addDuplicateDeclarationError(node, message, symbolName, firstFileLocations);
+                        }
+                    });
+                }
+                else {
+                    // Otherwise issue top-level error since the files appear very identical in terms of what they contain
+                    var list = ts.arrayFrom(conflictingSymbols.keys()).join(", ");
+                    diagnostics.add(addRelatedInfo(ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Conflicts_are_in_this_file)));
+                    diagnostics.add(addRelatedInfo(ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Conflicts_are_in_this_file)));
+                }
+            });
+            amalgamatedDuplicates = undefined;
+        }
+        function checkExternalEmitHelpers(location, helpers) {
+            if ((requestedExternalEmitHelpers & helpers) !== helpers && compilerOptions.importHelpers) {
+                var sourceFile = ts.getSourceFileOfNode(location);
+                if (ts.isEffectiveExternalModule(sourceFile, compilerOptions) && !(location.flags & 4194304 /* Ambient */)) {
+                    var helpersModule = resolveHelpersModule(sourceFile, location);
+                    if (helpersModule !== unknownSymbol) {
+                        var uncheckedHelpers = helpers & ~requestedExternalEmitHelpers;
+                        for (var helper = 1 /* FirstEmitHelper */; helper <= 65536 /* LastEmitHelper */; helper <<= 1) {
+                            if (uncheckedHelpers & helper) {
+                                var name = getHelperName(helper);
+                                var symbol = getSymbol(helpersModule.exports, ts.escapeLeadingUnderscores(name), 67220415 /* Value */);
+                                if (!symbol) {
+                                    error(location, ts.Diagnostics.This_syntax_requires_an_imported_helper_named_1_but_module_0_has_no_exported_member_1, ts.externalHelpersModuleNameText, name);
+                                }
+                            }
+                        }
+                    }
+                    requestedExternalEmitHelpers |= helpers;
+                }
+            }
+        }
+        function getHelperName(helper) {
+            switch (helper) {
+                case 1 /* Extends */: return "__extends";
+                case 2 /* Assign */: return "__assign";
+                case 4 /* Rest */: return "__rest";
+                case 8 /* Decorate */: return "__decorate";
+                case 16 /* Metadata */: return "__metadata";
+                case 32 /* Param */: return "__param";
+                case 64 /* Awaiter */: return "__awaiter";
+                case 128 /* Generator */: return "__generator";
+                case 256 /* Values */: return "__values";
+                case 512 /* Read */: return "__read";
+                case 1024 /* Spread */: return "__spread";
+                case 2048 /* Await */: return "__await";
+                case 4096 /* AsyncGenerator */: return "__asyncGenerator";
+                case 8192 /* AsyncDelegator */: return "__asyncDelegator";
+                case 16384 /* AsyncValues */: return "__asyncValues";
+                case 32768 /* ExportStar */: return "__exportStar";
+                case 65536 /* MakeTemplateObject */: return "__makeTemplateObject";
+                default: return ts.Debug.fail("Unrecognized helper");
+            }
+        }
+        function resolveHelpersModule(node, errorNode) {
+            if (!externalHelpersModule) {
+                externalHelpersModule = resolveExternalModule(node, ts.externalHelpersModuleNameText, ts.Diagnostics.This_syntax_requires_an_imported_helper_but_module_0_cannot_be_found, errorNode) || unknownSymbol;
+            }
+            return externalHelpersModule;
+        }
+        // GRAMMAR CHECKING
+        function checkGrammarDecoratorsAndModifiers(node) {
+            return checkGrammarDecorators(node) || checkGrammarModifiers(node);
+        }
+        function checkGrammarDecorators(node) {
+            if (!node.decorators) {
+                return false;
+            }
+            if (!ts.nodeCanBeDecorated(node, node.parent, node.parent.parent)) {
+                if (node.kind === 156 /* MethodDeclaration */ && !ts.nodeIsPresent(node.body)) {
+                    return grammarErrorOnFirstToken(node, ts.Diagnostics.A_decorator_can_only_decorate_a_method_implementation_not_an_overload);
+                }
+                else {
+                    return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_are_not_valid_here);
+                }
+            }
+            else if (node.kind === 158 /* GetAccessor */ || node.kind === 159 /* SetAccessor */) {
+                var accessors = ts.getAllAccessorDeclarations(node.parent.members, node);
+                if (accessors.firstAccessor.decorators && node === accessors.secondAccessor) {
+                    return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name);
+                }
+            }
+            return false;
+        }
+        function checkGrammarModifiers(node) {
+            var quickResult = reportObviousModifierErrors(node);
+            if (quickResult !== undefined) {
+                return quickResult;
+            }
+            var lastStatic, lastDeclare, lastAsync, lastReadonly;
+            var flags = 0 /* None */;
+            for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
+                var modifier = _a[_i];
+                if (modifier.kind !== 133 /* ReadonlyKeyword */) {
+                    if (node.kind === 153 /* PropertySignature */ || node.kind === 155 /* MethodSignature */) {
+                        return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_type_member, ts.tokenToString(modifier.kind));
+                    }
+                    if (node.kind === 162 /* IndexSignature */) {
+                        return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_an_index_signature, ts.tokenToString(modifier.kind));
+                    }
+                }
+                switch (modifier.kind) {
+                    case 77 /* ConstKeyword */:
+                        if (node.kind !== 243 /* EnumDeclaration */) {
+                            return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(77 /* ConstKeyword */));
+                        }
+                        break;
+                    case 115 /* PublicKeyword */:
+                    case 114 /* ProtectedKeyword */:
+                    case 113 /* PrivateKeyword */:
+                        var text = visibilityToString(ts.modifierToFlag(modifier.kind));
+                        if (flags & 28 /* AccessibilityModifier */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics.Accessibility_modifier_already_seen);
+                        }
+                        else if (flags & 32 /* Static */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "static");
+                        }
+                        else if (flags & 64 /* Readonly */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "readonly");
+                        }
+                        else if (flags & 256 /* Async */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "async");
+                        }
+                        else if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 279 /* SourceFile */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text);
+                        }
+                        else if (flags & 128 /* Abstract */) {
+                            if (modifier.kind === 113 /* PrivateKeyword */) {
+                                return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, text, "abstract");
+                            }
+                            else {
+                                return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "abstract");
+                            }
+                        }
+                        flags |= ts.modifierToFlag(modifier.kind);
+                        break;
+                    case 116 /* StaticKeyword */:
+                        if (flags & 32 /* Static */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static");
+                        }
+                        else if (flags & 64 /* Readonly */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "readonly");
+                        }
+                        else if (flags & 256 /* Async */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "async");
+                        }
+                        else if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 279 /* SourceFile */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, "static");
+                        }
+                        else if (node.kind === 151 /* Parameter */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
+                        }
+                        else if (flags & 128 /* Abstract */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "static", "abstract");
+                        }
+                        flags |= 32 /* Static */;
+                        lastStatic = modifier;
+                        break;
+                    case 133 /* ReadonlyKeyword */:
+                        if (flags & 64 /* Readonly */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "readonly");
+                        }
+                        else if (node.kind !== 154 /* PropertyDeclaration */ && node.kind !== 153 /* PropertySignature */ && node.kind !== 162 /* IndexSignature */ && node.kind !== 151 /* Parameter */) {
+                            // If node.kind === SyntaxKind.Parameter, checkParameter report an error if it's not a parameter property.
+                            return grammarErrorOnNode(modifier, ts.Diagnostics.readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature);
+                        }
+                        flags |= 64 /* Readonly */;
+                        lastReadonly = modifier;
+                        break;
+                    case 85 /* ExportKeyword */:
+                        if (flags & 1 /* Export */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "export");
+                        }
+                        else if (flags & 2 /* Ambient */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "declare");
+                        }
+                        else if (flags & 128 /* Abstract */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "abstract");
+                        }
+                        else if (flags & 256 /* Async */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "async");
+                        }
+                        else if (node.parent.kind === 240 /* ClassDeclaration */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "export");
+                        }
+                        else if (node.kind === 151 /* Parameter */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
+                        }
+                        flags |= 1 /* Export */;
+                        break;
+                    case 80 /* DefaultKeyword */:
+                        var container = node.parent.kind === 279 /* SourceFile */ ? node.parent : node.parent.parent;
+                        if (container.kind === 244 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics.A_default_export_can_only_be_used_in_an_ECMAScript_style_module);
+                        }
+                        flags |= 512 /* Default */;
+                        break;
+                    case 125 /* DeclareKeyword */:
+                        if (flags & 2 /* Ambient */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "declare");
+                        }
+                        else if (flags & 256 /* Async */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
+                        }
+                        else if (node.parent.kind === 240 /* ClassDeclaration */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "declare");
+                        }
+                        else if (node.kind === 151 /* Parameter */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "declare");
+                        }
+                        else if ((node.parent.flags & 4194304 /* Ambient */) && node.parent.kind === 245 /* ModuleBlock */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
+                        }
+                        flags |= 2 /* Ambient */;
+                        lastDeclare = modifier;
+                        break;
+                    case 118 /* AbstractKeyword */:
+                        if (flags & 128 /* Abstract */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract");
+                        }
+                        if (node.kind !== 240 /* ClassDeclaration */) {
+                            if (node.kind !== 156 /* MethodDeclaration */ &&
+                                node.kind !== 154 /* PropertyDeclaration */ &&
+                                node.kind !== 158 /* GetAccessor */ &&
+                                node.kind !== 159 /* SetAccessor */) {
+                                return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration);
+                            }
+                            if (!(node.parent.kind === 240 /* ClassDeclaration */ && ts.hasModifier(node.parent, 128 /* Abstract */))) {
+                                return grammarErrorOnNode(modifier, ts.Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class);
+                            }
+                            if (flags & 32 /* Static */) {
+                                return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "static", "abstract");
+                            }
+                            if (flags & 8 /* Private */) {
+                                return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "private", "abstract");
+                            }
+                        }
+                        flags |= 128 /* Abstract */;
+                        break;
+                    case 121 /* AsyncKeyword */:
+                        if (flags & 256 /* Async */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "async");
+                        }
+                        else if (flags & 2 /* Ambient */ || node.parent.flags & 4194304 /* Ambient */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
+                        }
+                        else if (node.kind === 151 /* Parameter */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
+                        }
+                        flags |= 256 /* Async */;
+                        lastAsync = modifier;
+                        break;
+                }
+            }
+            if (node.kind === 157 /* Constructor */) {
+                if (flags & 32 /* Static */) {
+                    return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
+                }
+                if (flags & 128 /* Abstract */) {
+                    return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "abstract"); // TODO: GH#18217
+                }
+                else if (flags & 256 /* Async */) {
+                    return grammarErrorOnNode(lastAsync, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "async");
+                }
+                else if (flags & 64 /* Readonly */) {
+                    return grammarErrorOnNode(lastReadonly, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "readonly");
+                }
+                return false;
+            }
+            else if ((node.kind === 249 /* ImportDeclaration */ || node.kind === 248 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
+                return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
+            }
+            else if (node.kind === 151 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && ts.isBindingPattern(node.name)) {
+                return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_may_not_be_declared_using_a_binding_pattern);
+            }
+            else if (node.kind === 151 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && node.dotDotDotToken) {
+                return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_cannot_be_declared_using_a_rest_parameter);
+            }
+            if (flags & 256 /* Async */) {
+                return checkGrammarAsyncModifier(node, lastAsync);
+            }
+            return false;
+        }
+        /**
+         * true | false: Early return this value from checkGrammarModifiers.
+         * undefined: Need to do full checking on the modifiers.
+         */
+        function reportObviousModifierErrors(node) {
+            return !node.modifiers
+                ? false
+                : shouldReportBadModifier(node)
+                    ? grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here)
+                    : undefined;
+        }
+        function shouldReportBadModifier(node) {
+            switch (node.kind) {
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                case 157 /* Constructor */:
+                case 154 /* PropertyDeclaration */:
+                case 153 /* PropertySignature */:
+                case 156 /* MethodDeclaration */:
+                case 155 /* MethodSignature */:
+                case 162 /* IndexSignature */:
+                case 244 /* ModuleDeclaration */:
+                case 249 /* ImportDeclaration */:
+                case 248 /* ImportEqualsDeclaration */:
+                case 255 /* ExportDeclaration */:
+                case 254 /* ExportAssignment */:
+                case 196 /* FunctionExpression */:
+                case 197 /* ArrowFunction */:
+                case 151 /* Parameter */:
+                    return false;
+                default:
+                    if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 279 /* SourceFile */) {
+                        return false;
+                    }
+                    switch (node.kind) {
+                        case 239 /* FunctionDeclaration */:
+                            return nodeHasAnyModifiersExcept(node, 121 /* AsyncKeyword */);
+                        case 240 /* ClassDeclaration */:
+                            return nodeHasAnyModifiersExcept(node, 118 /* AbstractKeyword */);
+                        case 241 /* InterfaceDeclaration */:
+                        case 219 /* VariableStatement */:
+                        case 242 /* TypeAliasDeclaration */:
+                            return true;
+                        case 243 /* EnumDeclaration */:
+                            return nodeHasAnyModifiersExcept(node, 77 /* ConstKeyword */);
+                        default:
+                            ts.Debug.fail();
+                            return false;
+                    }
+            }
+        }
+        function nodeHasAnyModifiersExcept(node, allowedModifier) {
+            return node.modifiers.length > 1 || node.modifiers[0].kind !== allowedModifier;
+        }
+        function checkGrammarAsyncModifier(node, asyncModifier) {
+            switch (node.kind) {
+                case 156 /* MethodDeclaration */:
+                case 239 /* FunctionDeclaration */:
+                case 196 /* FunctionExpression */:
+                case 197 /* ArrowFunction */:
+                    return false;
+            }
+            return grammarErrorOnNode(asyncModifier, ts.Diagnostics._0_modifier_cannot_be_used_here, "async");
+        }
+        function checkGrammarForDisallowedTrailingComma(list, diag) {
+            if (diag === void 0) { diag = ts.Diagnostics.Trailing_comma_not_allowed; }
+            if (list && list.hasTrailingComma) {
+                return grammarErrorAtPos(list[0], list.end - ",".length, ",".length, diag);
+            }
+            return false;
+        }
+        function checkGrammarTypeParameterList(typeParameters, file) {
+            if (typeParameters && typeParameters.length === 0) {
+                var start = typeParameters.pos - "<".length;
+                var end = ts.skipTrivia(file.text, typeParameters.end) + ">".length;
+                return grammarErrorAtPos(file, start, end - start, ts.Diagnostics.Type_parameter_list_cannot_be_empty);
+            }
+            return false;
+        }
+        function checkGrammarParameterList(parameters) {
+            var seenOptionalParameter = false;
+            var parameterCount = parameters.length;
+            for (var i = 0; i < parameterCount; i++) {
+                var parameter = parameters[i];
+                if (parameter.dotDotDotToken) {
+                    if (i !== (parameterCount - 1)) {
+                        return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.A_rest_parameter_must_be_last_in_a_parameter_list);
+                    }
+                    if (!(parameter.flags & 4194304 /* Ambient */)) { // Allow `...foo,` in ambient declarations; see GH#23070
+                        checkGrammarForDisallowedTrailingComma(parameters, ts.Diagnostics.A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma);
+                    }
+                    if (parameter.questionToken) {
+                        return grammarErrorOnNode(parameter.questionToken, ts.Diagnostics.A_rest_parameter_cannot_be_optional);
+                    }
+                    if (parameter.initializer) {
+                        return grammarErrorOnNode(parameter.name, ts.Diagnostics.A_rest_parameter_cannot_have_an_initializer);
+                    }
+                }
+                else if (parameter.questionToken) {
+                    seenOptionalParameter = true;
+                    if (parameter.initializer) {
+                        return grammarErrorOnNode(parameter.name, ts.Diagnostics.Parameter_cannot_have_question_mark_and_initializer);
+                    }
+                }
+                else if (seenOptionalParameter && !parameter.initializer) {
+                    return grammarErrorOnNode(parameter.name, ts.Diagnostics.A_required_parameter_cannot_follow_an_optional_parameter);
+                }
+            }
+        }
+        function getNonSimpleParameters(parameters) {
+            return ts.filter(parameters, function (parameter) { return !!parameter.initializer || ts.isBindingPattern(parameter.name) || ts.isRestParameter(parameter); });
+        }
+        function checkGrammarForUseStrictSimpleParameterList(node) {
+            if (languageVersion >= 3 /* ES2016 */) {
+                var useStrictDirective_1 = node.body && ts.isBlock(node.body) && ts.findUseStrictPrologue(node.body.statements);
+                if (useStrictDirective_1) {
+                    var nonSimpleParameters = getNonSimpleParameters(node.parameters);
+                    if (ts.length(nonSimpleParameters)) {
+                        ts.forEach(nonSimpleParameters, function (parameter) {
+                            addRelatedInfo(error(parameter, ts.Diagnostics.This_parameter_is_not_allowed_with_use_strict_directive), ts.createDiagnosticForNode(useStrictDirective_1, ts.Diagnostics.use_strict_directive_used_here));
+                        });
+                        var diagnostics_1 = nonSimpleParameters.map(function (parameter, index) { return (index === 0 ? ts.createDiagnosticForNode(parameter, ts.Diagnostics.Non_simple_parameter_declared_here) : ts.createDiagnosticForNode(parameter, ts.Diagnostics.and_here)); });
+                        addRelatedInfo.apply(void 0, [error(useStrictDirective_1, ts.Diagnostics.use_strict_directive_cannot_be_used_with_non_simple_parameter_list)].concat(diagnostics_1));
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        function checkGrammarFunctionLikeDeclaration(node) {
+            // Prevent cascading error by short-circuit
+            var file = ts.getSourceFileOfNode(node);
+            return checkGrammarDecoratorsAndModifiers(node) || checkGrammarTypeParameterList(node.typeParameters, file) ||
+                checkGrammarParameterList(node.parameters) || checkGrammarArrowFunction(node, file) ||
+                (ts.isFunctionLikeDeclaration(node) && checkGrammarForUseStrictSimpleParameterList(node));
+        }
+        function checkGrammarClassLikeDeclaration(node) {
+            var file = ts.getSourceFileOfNode(node);
+            return checkGrammarClassDeclarationHeritageClauses(node) || checkGrammarTypeParameterList(node.typeParameters, file);
+        }
+        function checkGrammarArrowFunction(node, file) {
+            if (!ts.isArrowFunction(node)) {
+                return false;
+            }
+            var equalsGreaterThanToken = node.equalsGreaterThanToken;
+            var startLine = ts.getLineAndCharacterOfPosition(file, equalsGreaterThanToken.pos).line;
+            var endLine = ts.getLineAndCharacterOfPosition(file, equalsGreaterThanToken.end).line;
+            return startLine !== endLine && grammarErrorOnNode(equalsGreaterThanToken, ts.Diagnostics.Line_terminator_not_permitted_before_arrow);
+        }
+        function checkGrammarIndexSignatureParameters(node) {
+            var parameter = node.parameters[0];
+            if (node.parameters.length !== 1) {
+                if (parameter) {
+                    return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_must_have_exactly_one_parameter);
+                }
+                else {
+                    return grammarErrorOnNode(node, ts.Diagnostics.An_index_signature_must_have_exactly_one_parameter);
+                }
+            }
+            if (parameter.dotDotDotToken) {
+                return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.An_index_signature_cannot_have_a_rest_parameter);
+            }
+            if (ts.hasModifiers(parameter)) {
+                return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_cannot_have_an_accessibility_modifier);
+            }
+            if (parameter.questionToken) {
+                return grammarErrorOnNode(parameter.questionToken, ts.Diagnostics.An_index_signature_parameter_cannot_have_a_question_mark);
+            }
+            if (parameter.initializer) {
+                return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_cannot_have_an_initializer);
+            }
+            if (!parameter.type) {
+                return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_must_have_a_type_annotation);
+            }
+            if (parameter.type.kind !== 138 /* StringKeyword */ && parameter.type.kind !== 135 /* NumberKeyword */) {
+                var type = getTypeFromTypeNode(parameter.type);
+                if (type.flags & 4 /* String */ || type.flags & 8 /* Number */) {
+                    return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_type_alias_Consider_writing_0_Colon_1_Colon_2_instead, ts.getTextOfNode(parameter.name), typeToString(type), typeToString(getTypeFromTypeNode(node.type)));
+                }
+                if (type.flags & 1048576 /* Union */ && allTypesAssignableToKind(type, 128 /* StringLiteral */, /*strict*/ true)) {
+                    return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_union_type_Consider_using_a_mapped_object_type_instead);
+                }
+                return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_must_be_string_or_number);
+            }
+            if (!node.type) {
+                return grammarErrorOnNode(node, ts.Diagnostics.An_index_signature_must_have_a_type_annotation);
+            }
+            return false;
+        }
+        function checkGrammarIndexSignature(node) {
+            // Prevent cascading error by short-circuit
+            return checkGrammarDecoratorsAndModifiers(node) || checkGrammarIndexSignatureParameters(node);
+        }
+        function checkGrammarForAtLeastOneTypeArgument(node, typeArguments) {
+            if (typeArguments && typeArguments.length === 0) {
+                var sourceFile = ts.getSourceFileOfNode(node);
+                var start = typeArguments.pos - "<".length;
+                var end = ts.skipTrivia(sourceFile.text, typeArguments.end) + ">".length;
+                return grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.Type_argument_list_cannot_be_empty);
+            }
+            return false;
+        }
+        function checkGrammarTypeArguments(node, typeArguments) {
+            return checkGrammarForDisallowedTrailingComma(typeArguments) ||
+                checkGrammarForAtLeastOneTypeArgument(node, typeArguments);
+        }
+        function checkGrammarForOmittedArgument(args) {
+            if (args) {
+                for (var _i = 0, args_5 = args; _i < args_5.length; _i++) {
+                    var arg = args_5[_i];
+                    if (arg.kind === 210 /* OmittedExpression */) {
+                        return grammarErrorAtPos(arg, arg.pos, 0, ts.Diagnostics.Argument_expression_expected);
+                    }
+                }
+            }
+            return false;
+        }
+        function checkGrammarArguments(args) {
+            return checkGrammarForOmittedArgument(args);
+        }
+        function checkGrammarHeritageClause(node) {
+            var types = node.types;
+            if (checkGrammarForDisallowedTrailingComma(types)) {
+                return true;
+            }
+            if (types && types.length === 0) {
+                var listType = ts.tokenToString(node.token);
+                return grammarErrorAtPos(node, types.pos, 0, ts.Diagnostics._0_list_cannot_be_empty, listType);
+            }
+            return ts.some(types, checkGrammarExpressionWithTypeArguments);
+        }
+        function checkGrammarExpressionWithTypeArguments(node) {
+            return checkGrammarTypeArguments(node, node.typeArguments);
+        }
+        function checkGrammarClassDeclarationHeritageClauses(node) {
+            var seenExtendsClause = false;
+            var seenImplementsClause = false;
+            if (!checkGrammarDecoratorsAndModifiers(node) && node.heritageClauses) {
+                for (var _i = 0, _a = node.heritageClauses; _i < _a.length; _i++) {
+                    var heritageClause = _a[_i];
+                    if (heritageClause.token === 86 /* ExtendsKeyword */) {
+                        if (seenExtendsClause) {
+                            return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.extends_clause_already_seen);
+                        }
+                        if (seenImplementsClause) {
+                            return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.extends_clause_must_precede_implements_clause);
+                        }
+                        if (heritageClause.types.length > 1) {
+                            return grammarErrorOnFirstToken(heritageClause.types[1], ts.Diagnostics.Classes_can_only_extend_a_single_class);
+                        }
+                        seenExtendsClause = true;
+                    }
+                    else {
+                        ts.Debug.assert(heritageClause.token === 109 /* ImplementsKeyword */);
+                        if (seenImplementsClause) {
+                            return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.implements_clause_already_seen);
+                        }
+                        seenImplementsClause = true;
+                    }
+                    // Grammar checking heritageClause inside class declaration
+                    checkGrammarHeritageClause(heritageClause);
+                }
+            }
+        }
+        function checkGrammarInterfaceDeclaration(node) {
+            var seenExtendsClause = false;
+            if (node.heritageClauses) {
+                for (var _i = 0, _a = node.heritageClauses; _i < _a.length; _i++) {
+                    var heritageClause = _a[_i];
+                    if (heritageClause.token === 86 /* ExtendsKeyword */) {
+                        if (seenExtendsClause) {
+                            return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.extends_clause_already_seen);
+                        }
+                        seenExtendsClause = true;
+                    }
+                    else {
+                        ts.Debug.assert(heritageClause.token === 109 /* ImplementsKeyword */);
+                        return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.Interface_declaration_cannot_have_implements_clause);
+                    }
+                    // Grammar checking heritageClause inside class declaration
+                    checkGrammarHeritageClause(heritageClause);
+                }
+            }
+            return false;
+        }
+        function checkGrammarComputedPropertyName(node) {
+            // If node is not a computedPropertyName, just skip the grammar checking
+            if (node.kind !== 149 /* ComputedPropertyName */) {
+                return false;
+            }
+            var computedPropertyName = node;
+            if (computedPropertyName.expression.kind === 204 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 27 /* CommaToken */) {
+                return grammarErrorOnNode(computedPropertyName.expression, ts.Diagnostics.A_comma_expression_is_not_allowed_in_a_computed_property_name);
+            }
+            return false;
+        }
+        function checkGrammarForGenerator(node) {
+            if (node.asteriskToken) {
+                ts.Debug.assert(node.kind === 239 /* FunctionDeclaration */ ||
+                    node.kind === 196 /* FunctionExpression */ ||
+                    node.kind === 156 /* MethodDeclaration */);
+                if (node.flags & 4194304 /* Ambient */) {
+                    return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
+                }
+                if (!node.body) {
+                    return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.An_overload_signature_cannot_be_declared_as_a_generator);
+                }
+            }
+        }
+        function checkGrammarForInvalidQuestionMark(questionToken, message) {
+            return !!questionToken && grammarErrorOnNode(questionToken, message);
+        }
+        function checkGrammarForInvalidExclamationToken(exclamationToken, message) {
+            return !!exclamationToken && grammarErrorOnNode(exclamationToken, message);
+        }
+        function checkGrammarObjectLiteralExpression(node, inDestructuring) {
+            var Flags;
+            (function (Flags) {
+                Flags[Flags["Property"] = 1] = "Property";
+                Flags[Flags["GetAccessor"] = 2] = "GetAccessor";
+                Flags[Flags["SetAccessor"] = 4] = "SetAccessor";
+                Flags[Flags["GetOrSetAccessor"] = 6] = "GetOrSetAccessor";
+            })(Flags || (Flags = {}));
+            var seen = ts.createUnderscoreEscapedMap();
+            for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
+                var prop = _a[_i];
+                if (prop.kind === 277 /* SpreadAssignment */) {
+                    continue;
+                }
+                var name = prop.name;
+                if (name.kind === 149 /* ComputedPropertyName */) {
+                    // If the name is not a ComputedPropertyName, the grammar checking will skip it
+                    checkGrammarComputedPropertyName(name);
+                }
+                if (prop.kind === 276 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) {
+                    // having objectAssignmentInitializer is only valid in ObjectAssignmentPattern
+                    // outside of destructuring it is a syntax error
+                    return grammarErrorOnNode(prop.equalsToken, ts.Diagnostics.can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment);
+                }
+                // Modifiers are never allowed on properties except for 'async' on a method declaration
+                if (prop.modifiers) {
+                    for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) { // TODO: GH#19955
+                        var mod = _c[_b];
+                        if (mod.kind !== 121 /* AsyncKeyword */ || prop.kind !== 156 /* MethodDeclaration */) {
+                            grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
+                        }
+                    }
+                }
+                // ECMA-262 11.1.5 Object Initializer
+                // If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true
+                // a.This production is contained in strict code and IsDataDescriptor(previous) is true and
+                // IsDataDescriptor(propId.descriptor) is true.
+                //    b.IsDataDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true.
+                //    c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true.
+                //    d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true
+                // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
+                var currentKind = void 0;
+                switch (prop.kind) {
+                    case 276 /* ShorthandPropertyAssignment */:
+                        checkGrammarForInvalidExclamationToken(prop.exclamationToken, ts.Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context);
+                    /* tslint:disable:no-switch-case-fall-through */
+                    case 275 /* PropertyAssignment */:
+                        // Grammar checking for computedPropertyName and shorthandPropertyAssignment
+                        checkGrammarForInvalidQuestionMark(prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional);
+                        if (name.kind === 8 /* NumericLiteral */) {
+                            checkGrammarNumericLiteral(name);
+                        }
+                    // falls through
+                    case 156 /* MethodDeclaration */:
+                        currentKind = 1 /* Property */;
+                        break;
+                    case 158 /* GetAccessor */:
+                        currentKind = 2 /* GetAccessor */;
+                        break;
+                    case 159 /* SetAccessor */:
+                        currentKind = 4 /* SetAccessor */;
+                        break;
+                    default:
+                        throw ts.Debug.assertNever(prop, "Unexpected syntax kind:" + prop.kind);
+                }
+                var effectiveName = ts.getPropertyNameForPropertyNameNode(name);
+                if (effectiveName === undefined) {
+                    continue;
+                }
+                var existingKind = seen.get(effectiveName);
+                if (!existingKind) {
+                    seen.set(effectiveName, currentKind);
+                }
+                else {
+                    if (currentKind === 1 /* Property */ && existingKind === 1 /* Property */) {
+                        grammarErrorOnNode(name, ts.Diagnostics.Duplicate_identifier_0, ts.getTextOfNode(name));
+                    }
+                    else if ((currentKind & 6 /* GetOrSetAccessor */) && (existingKind & 6 /* GetOrSetAccessor */)) {
+                        if (existingKind !== 6 /* GetOrSetAccessor */ && currentKind !== existingKind) {
+                            seen.set(effectiveName, currentKind | existingKind);
+                        }
+                        else {
+                            return grammarErrorOnNode(name, ts.Diagnostics.An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name);
+                        }
+                    }
+                    else {
+                        return grammarErrorOnNode(name, ts.Diagnostics.An_object_literal_cannot_have_property_and_accessor_with_the_same_name);
+                    }
+                }
+            }
+        }
+        function checkGrammarJsxElement(node) {
+            checkGrammarTypeArguments(node, node.typeArguments);
+            var seen = ts.createUnderscoreEscapedMap();
+            for (var _i = 0, _a = node.attributes.properties; _i < _a.length; _i++) {
+                var attr = _a[_i];
+                if (attr.kind === 269 /* JsxSpreadAttribute */) {
+                    continue;
+                }
+                var name = attr.name, initializer = attr.initializer;
+                if (!seen.get(name.escapedText)) {
+                    seen.set(name.escapedText, true);
+                }
+                else {
+                    return grammarErrorOnNode(name, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
+                }
+                if (initializer && initializer.kind === 270 /* JsxExpression */ && !initializer.expression) {
+                    return grammarErrorOnNode(initializer, ts.Diagnostics.JSX_attributes_must_only_be_assigned_a_non_empty_expression);
+                }
+            }
+        }
+        function checkGrammarForInOrForOfStatement(forInOrOfStatement) {
+            if (checkGrammarStatementInAmbientContext(forInOrOfStatement)) {
+                return true;
+            }
+            if (forInOrOfStatement.kind === 227 /* ForOfStatement */ && forInOrOfStatement.awaitModifier) {
+                if ((forInOrOfStatement.flags & 16384 /* AwaitContext */) === 0 /* None */) {
+                    return grammarErrorOnNode(forInOrOfStatement.awaitModifier, ts.Diagnostics.A_for_await_of_statement_is_only_allowed_within_an_async_function_or_async_generator);
+                }
+            }
+            if (forInOrOfStatement.initializer.kind === 238 /* VariableDeclarationList */) {
+                var variableList = forInOrOfStatement.initializer;
+                if (!checkGrammarVariableDeclarationList(variableList)) {
+                    var declarations = variableList.declarations;
+                    // declarations.length can be zero if there is an error in variable declaration in for-of or for-in
+                    // See http://www.ecma-international.org/ecma-262/6.0/#sec-for-in-and-for-of-statements for details
+                    // For example:
+                    //      var let = 10;
+                    //      for (let of [1,2,3]) {} // this is invalid ES6 syntax
+                    //      for (let in [1,2,3]) {} // this is invalid ES6 syntax
+                    // We will then want to skip on grammar checking on variableList declaration
+                    if (!declarations.length) {
+                        return false;
+                    }
+                    if (declarations.length > 1) {
+                        var diagnostic = forInOrOfStatement.kind === 226 /* ForInStatement */
+                            ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement
+                            : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement;
+                        return grammarErrorOnFirstToken(variableList.declarations[1], diagnostic);
+                    }
+                    var firstDeclaration = declarations[0];
+                    if (firstDeclaration.initializer) {
+                        var diagnostic = forInOrOfStatement.kind === 226 /* ForInStatement */
+                            ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer
+                            : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer;
+                        return grammarErrorOnNode(firstDeclaration.name, diagnostic);
+                    }
+                    if (firstDeclaration.type) {
+                        var diagnostic = forInOrOfStatement.kind === 226 /* ForInStatement */
+                            ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation
+                            : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation;
+                        return grammarErrorOnNode(firstDeclaration, diagnostic);
+                    }
+                }
+            }
+            return false;
+        }
+        function checkGrammarAccessor(accessor) {
+            var kind = accessor.kind;
+            if (languageVersion < 1 /* ES5 */) {
+                return grammarErrorOnNode(accessor.name, ts.Diagnostics.Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher);
+            }
+            else if (accessor.flags & 4194304 /* Ambient */) {
+                return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_be_declared_in_an_ambient_context);
+            }
+            else if (accessor.body === undefined && !ts.hasModifier(accessor, 128 /* Abstract */)) {
+                return grammarErrorAtPos(accessor, accessor.end - 1, ";".length, ts.Diagnostics._0_expected, "{");
+            }
+            else if (accessor.body && ts.hasModifier(accessor, 128 /* Abstract */)) {
+                return grammarErrorOnNode(accessor, ts.Diagnostics.An_abstract_accessor_cannot_have_an_implementation);
+            }
+            else if (accessor.typeParameters) {
+                return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_have_type_parameters);
+            }
+            else if (!doesAccessorHaveCorrectParameterCount(accessor)) {
+                return grammarErrorOnNode(accessor.name, kind === 158 /* GetAccessor */ ?
+                    ts.Diagnostics.A_get_accessor_cannot_have_parameters :
+                    ts.Diagnostics.A_set_accessor_must_have_exactly_one_parameter);
+            }
+            else if (kind === 159 /* SetAccessor */) {
+                if (accessor.type) {
+                    return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_set_accessor_cannot_have_a_return_type_annotation);
+                }
+                else {
+                    var parameter = accessor.parameters[0];
+                    if (parameter.dotDotDotToken) {
+                        return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.A_set_accessor_cannot_have_rest_parameter);
+                    }
+                    else if (parameter.questionToken) {
+                        return grammarErrorOnNode(parameter.questionToken, ts.Diagnostics.A_set_accessor_cannot_have_an_optional_parameter);
+                    }
+                    else if (parameter.initializer) {
+                        return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_set_accessor_parameter_cannot_have_an_initializer);
+                    }
+                }
+            }
+            return false;
+        }
+        /** Does the accessor have the right number of parameters?
+         * A get accessor has no parameters or a single `this` parameter.
+         * A set accessor has one parameter or a `this` parameter and one more parameter.
+         */
+        function doesAccessorHaveCorrectParameterCount(accessor) {
+            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 158 /* GetAccessor */ ? 0 : 1);
+        }
+        function getAccessorThisParameter(accessor) {
+            if (accessor.parameters.length === (accessor.kind === 158 /* GetAccessor */ ? 1 : 2)) {
+                return ts.getThisParameter(accessor);
+            }
+        }
+        function checkGrammarTypeOperatorNode(node) {
+            if (node.operator === 142 /* UniqueKeyword */) {
+                if (node.type.kind !== 139 /* SymbolKeyword */) {
+                    return grammarErrorOnNode(node.type, ts.Diagnostics._0_expected, ts.tokenToString(139 /* SymbolKeyword */));
+                }
+                var parent = ts.walkUpParenthesizedTypes(node.parent);
+                switch (parent.kind) {
+                    case 237 /* VariableDeclaration */:
+                        var decl = parent;
+                        if (decl.name.kind !== 72 /* Identifier */) {
+                            return grammarErrorOnNode(node, ts.Diagnostics.unique_symbol_types_may_not_be_used_on_a_variable_declaration_with_a_binding_name);
+                        }
+                        if (!ts.isVariableDeclarationInVariableStatement(decl)) {
+                            return grammarErrorOnNode(node, ts.Diagnostics.unique_symbol_types_are_only_allowed_on_variables_in_a_variable_statement);
+                        }
+                        if (!(decl.parent.flags & 2 /* Const */)) {
+                            return grammarErrorOnNode(parent.name, ts.Diagnostics.A_variable_whose_type_is_a_unique_symbol_type_must_be_const);
+                        }
+                        break;
+                    case 154 /* PropertyDeclaration */:
+                        if (!ts.hasModifier(parent, 32 /* Static */) ||
+                            !ts.hasModifier(parent, 64 /* Readonly */)) {
+                            return grammarErrorOnNode(parent.name, ts.Diagnostics.A_property_of_a_class_whose_type_is_a_unique_symbol_type_must_be_both_static_and_readonly);
+                        }
+                        break;
+                    case 153 /* PropertySignature */:
+                        if (!ts.hasModifier(parent, 64 /* Readonly */)) {
+                            return grammarErrorOnNode(parent.name, ts.Diagnostics.A_property_of_an_interface_or_type_literal_whose_type_is_a_unique_symbol_type_must_be_readonly);
+                        }
+                        break;
+                    default:
+                        return grammarErrorOnNode(node, ts.Diagnostics.unique_symbol_types_are_not_allowed_here);
+                }
+            }
+        }
+        function checkGrammarForInvalidDynamicName(node, message) {
+            if (isNonBindableDynamicName(node)) {
+                return grammarErrorOnNode(node, message);
+            }
+        }
+        function checkGrammarMethod(node) {
+            if (checkGrammarFunctionLikeDeclaration(node)) {
+                return true;
+            }
+            if (node.kind === 156 /* MethodDeclaration */) {
+                if (node.parent.kind === 188 /* ObjectLiteralExpression */) {
+                    // We only disallow modifier on a method declaration if it is a property of object-literal-expression
+                    if (node.modifiers && !(node.modifiers.length === 1 && ts.first(node.modifiers).kind === 121 /* AsyncKeyword */)) {
+                        return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
+                    }
+                    else if (checkGrammarForInvalidQuestionMark(node.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional)) {
+                        return true;
+                    }
+                    else if (checkGrammarForInvalidExclamationToken(node.exclamationToken, ts.Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context)) {
+                        return true;
+                    }
+                    else if (node.body === undefined) {
+                        return grammarErrorAtPos(node, node.end - 1, ";".length, ts.Diagnostics._0_expected, "{");
+                    }
+                }
+                if (checkGrammarForGenerator(node)) {
+                    return true;
+                }
+            }
+            if (ts.isClassLike(node.parent)) {
+                // Technically, computed properties in ambient contexts is disallowed
+                // for property declarations and accessors too, not just methods.
+                // However, property declarations disallow computed names in general,
+                // and accessors are not allowed in ambient contexts in general,
+                // so this error only really matters for methods.
+                if (node.flags & 4194304 /* Ambient */) {
+                    return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_ambient_context_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
+                }
+                else if (node.kind === 156 /* MethodDeclaration */ && !node.body) {
+                    return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_method_overload_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
+                }
+            }
+            else if (node.parent.kind === 241 /* InterfaceDeclaration */) {
+                return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
+            }
+            else if (node.parent.kind === 168 /* TypeLiteral */) {
+                return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
+            }
+        }
+        function checkGrammarBreakOrContinueStatement(node) {
+            var current = node;
+            while (current) {
+                if (ts.isFunctionLike(current)) {
+                    return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary);
+                }
+                switch (current.kind) {
+                    case 233 /* LabeledStatement */:
+                        if (node.label && current.label.escapedText === node.label.escapedText) {
+                            // found matching label - verify that label usage is correct
+                            // continue can only target labels that are on iteration statements
+                            var isMisplacedContinueLabel = node.kind === 228 /* ContinueStatement */
+                                && !ts.isIterationStatement(current.statement, /*lookInLabeledStatement*/ true);
+                            if (isMisplacedContinueLabel) {
+                                return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement);
+                            }
+                            return false;
+                        }
+                        break;
+                    case 232 /* SwitchStatement */:
+                        if (node.kind === 229 /* BreakStatement */ && !node.label) {
+                            // unlabeled break within switch statement - ok
+                            return false;
+                        }
+                        break;
+                    default:
+                        if (ts.isIterationStatement(current, /*lookInLabeledStatement*/ false) && !node.label) {
+                            // unlabeled break or continue within iteration statement - ok
+                            return false;
+                        }
+                        break;
+                }
+                current = current.parent;
+            }
+            if (node.label) {
+                var message = node.kind === 229 /* BreakStatement */
+                    ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement
+                    : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement;
+                return grammarErrorOnNode(node, message);
+            }
+            else {
+                var message = node.kind === 229 /* BreakStatement */
+                    ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement
+                    : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement;
+                return grammarErrorOnNode(node, message);
+            }
+        }
+        function checkGrammarBindingElement(node) {
+            if (node.dotDotDotToken) {
+                var elements = node.parent.elements;
+                if (node !== ts.last(elements)) {
+                    return grammarErrorOnNode(node, ts.Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern);
+                }
+                checkGrammarForDisallowedTrailingComma(elements, ts.Diagnostics.A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma);
+                if (node.propertyName) {
+                    return grammarErrorOnNode(node.name, ts.Diagnostics.A_rest_element_cannot_have_a_property_name);
+                }
+                if (node.initializer) {
+                    // Error on equals token which immediately precedes the initializer
+                    return grammarErrorAtPos(node, node.initializer.pos - 1, 1, ts.Diagnostics.A_rest_element_cannot_have_an_initializer);
+                }
+            }
+        }
+        function isStringOrNumberLiteralExpression(expr) {
+            return expr.kind === 10 /* StringLiteral */ || expr.kind === 8 /* NumericLiteral */ ||
+                expr.kind === 202 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
+                    expr.operand.kind === 8 /* NumericLiteral */;
+        }
+        function isBigIntLiteralExpression(expr) {
+            return expr.kind === 9 /* BigIntLiteral */ ||
+                expr.kind === 202 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
+                    expr.operand.kind === 9 /* BigIntLiteral */;
+        }
+        function isSimpleLiteralEnumReference(expr) {
+            if ((ts.isPropertyAccessExpression(expr) || (ts.isElementAccessExpression(expr) && isStringOrNumberLiteralExpression(expr.argumentExpression))) &&
+                ts.isEntityNameExpression(expr.expression))
+                return !!(checkExpressionCached(expr).flags & 1024 /* EnumLiteral */);
+        }
+        function checkAmbientInitializer(node) {
+            var initializer = node.initializer;
+            if (initializer) {
+                var isInvalidInitializer = !(isStringOrNumberLiteralExpression(initializer) ||
+                    isSimpleLiteralEnumReference(initializer) ||
+                    initializer.kind === 102 /* TrueKeyword */ || initializer.kind === 87 /* FalseKeyword */ ||
+                    isBigIntLiteralExpression(initializer));
+                var isConstOrReadonly = ts.isDeclarationReadonly(node) || ts.isVariableDeclaration(node) && ts.isVarConst(node);
+                if (isConstOrReadonly && !node.type) {
+                    if (isInvalidInitializer) {
+                        return grammarErrorOnNode(initializer, ts.Diagnostics.A_const_initializer_in_an_ambient_context_must_be_a_string_or_numeric_literal_or_literal_enum_reference);
+                    }
+                }
+                else {
+                    return grammarErrorOnNode(initializer, ts.Diagnostics.Initializers_are_not_allowed_in_ambient_contexts);
+                }
+                if (!isConstOrReadonly || isInvalidInitializer) {
+                    return grammarErrorOnNode(initializer, ts.Diagnostics.Initializers_are_not_allowed_in_ambient_contexts);
+                }
+            }
+        }
+        function checkGrammarVariableDeclaration(node) {
+            if (node.parent.parent.kind !== 226 /* ForInStatement */ && node.parent.parent.kind !== 227 /* ForOfStatement */) {
+                if (node.flags & 4194304 /* Ambient */) {
+                    checkAmbientInitializer(node);
+                }
+                else if (!node.initializer) {
+                    if (ts.isBindingPattern(node.name) && !ts.isBindingPattern(node.parent)) {
+                        return grammarErrorOnNode(node, ts.Diagnostics.A_destructuring_declaration_must_have_an_initializer);
+                    }
+                    if (ts.isVarConst(node)) {
+                        return grammarErrorOnNode(node, ts.Diagnostics.const_declarations_must_be_initialized);
+                    }
+                }
+            }
+            if (node.exclamationToken && (node.parent.parent.kind !== 219 /* VariableStatement */ || !node.type || node.initializer || node.flags & 4194304 /* Ambient */)) {
+                return grammarErrorOnNode(node.exclamationToken, ts.Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context);
+            }
+            if (compilerOptions.module !== ts.ModuleKind.ES2015 && compilerOptions.module !== ts.ModuleKind.ESNext && compilerOptions.module !== ts.ModuleKind.System && !compilerOptions.noEmit &&
+                !(node.parent.parent.flags & 4194304 /* Ambient */) && ts.hasModifier(node.parent.parent, 1 /* Export */)) {
+                checkESModuleMarker(node.name);
+            }
+            var checkLetConstNames = (ts.isLet(node) || ts.isVarConst(node));
+            // 1. LexicalDeclaration : LetOrConst BindingList ;
+            // It is a Syntax Error if the BoundNames of BindingList contains "let".
+            // 2. ForDeclaration: ForDeclaration : LetOrConst ForBinding
+            // It is a Syntax Error if the BoundNames of ForDeclaration contains "let".
+            // It is a SyntaxError if a VariableDeclaration or VariableDeclarationNoIn occurs within strict code
+            // and its Identifier is eval or arguments
+            return checkLetConstNames && checkGrammarNameInLetOrConstDeclarations(node.name);
+        }
+        function checkESModuleMarker(name) {
+            if (name.kind === 72 /* Identifier */) {
+                if (ts.idText(name) === "__esModule") {
+                    return grammarErrorOnNode(name, ts.Diagnostics.Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules);
+                }
+            }
+            else {
+                var elements = name.elements;
+                for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
+                    var element = elements_1[_i];
+                    if (!ts.isOmittedExpression(element)) {
+                        return checkESModuleMarker(element.name);
+                    }
+                }
+            }
+            return false;
+        }
+        function checkGrammarNameInLetOrConstDeclarations(name) {
+            if (name.kind === 72 /* Identifier */) {
+                if (name.originalKeywordKind === 111 /* LetKeyword */) {
+                    return grammarErrorOnNode(name, ts.Diagnostics.let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations);
+                }
+            }
+            else {
+                var elements = name.elements;
+                for (var _i = 0, elements_2 = elements; _i < elements_2.length; _i++) {
+                    var element = elements_2[_i];
+                    if (!ts.isOmittedExpression(element)) {
+                        checkGrammarNameInLetOrConstDeclarations(element.name);
+                    }
+                }
+            }
+            return false;
+        }
+        function checkGrammarVariableDeclarationList(declarationList) {
+            var declarations = declarationList.declarations;
+            if (checkGrammarForDisallowedTrailingComma(declarationList.declarations)) {
+                return true;
+            }
+            if (!declarationList.declarations.length) {
+                return grammarErrorAtPos(declarationList, declarations.pos, declarations.end - declarations.pos, ts.Diagnostics.Variable_declaration_list_cannot_be_empty);
+            }
+            return false;
+        }
+        function allowLetAndConstDeclarations(parent) {
+            switch (parent.kind) {
+                case 222 /* IfStatement */:
+                case 223 /* DoStatement */:
+                case 224 /* WhileStatement */:
+                case 231 /* WithStatement */:
+                case 225 /* ForStatement */:
+                case 226 /* ForInStatement */:
+                case 227 /* ForOfStatement */:
+                    return false;
+                case 233 /* LabeledStatement */:
+                    return allowLetAndConstDeclarations(parent.parent);
+            }
+            return true;
+        }
+        function checkGrammarForDisallowedLetOrConstStatement(node) {
+            if (!allowLetAndConstDeclarations(node.parent)) {
+                if (ts.isLet(node.declarationList)) {
+                    return grammarErrorOnNode(node, ts.Diagnostics.let_declarations_can_only_be_declared_inside_a_block);
+                }
+                else if (ts.isVarConst(node.declarationList)) {
+                    return grammarErrorOnNode(node, ts.Diagnostics.const_declarations_can_only_be_declared_inside_a_block);
+                }
+            }
+        }
+        function checkGrammarMetaProperty(node) {
+            var escapedText = node.name.escapedText;
+            switch (node.keywordToken) {
+                case 95 /* NewKeyword */:
+                    if (escapedText !== "target") {
+                        return grammarErrorOnNode(node.name, ts.Diagnostics._0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_2, node.name.escapedText, ts.tokenToString(node.keywordToken), "target");
+                    }
+                    break;
+                case 92 /* ImportKeyword */:
+                    if (escapedText !== "meta") {
+                        return grammarErrorOnNode(node.name, ts.Diagnostics._0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_2, node.name.escapedText, ts.tokenToString(node.keywordToken), "meta");
+                    }
+                    break;
+            }
+        }
+        function hasParseDiagnostics(sourceFile) {
+            return sourceFile.parseDiagnostics.length > 0;
+        }
+        function grammarErrorOnFirstToken(node, message, arg0, arg1, arg2) {
+            var sourceFile = ts.getSourceFileOfNode(node);
+            if (!hasParseDiagnostics(sourceFile)) {
+                var span = ts.getSpanOfTokenAtPosition(sourceFile, node.pos);
+                diagnostics.add(ts.createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2));
+                return true;
+            }
+            return false;
+        }
+        function grammarErrorAtPos(nodeForSourceFile, start, length, message, arg0, arg1, arg2) {
+            var sourceFile = ts.getSourceFileOfNode(nodeForSourceFile);
+            if (!hasParseDiagnostics(sourceFile)) {
+                diagnostics.add(ts.createFileDiagnostic(sourceFile, start, length, message, arg0, arg1, arg2));
+                return true;
+            }
+            return false;
+        }
+        function grammarErrorOnNode(node, message, arg0, arg1, arg2) {
+            var sourceFile = ts.getSourceFileOfNode(node);
+            if (!hasParseDiagnostics(sourceFile)) {
+                diagnostics.add(ts.createDiagnosticForNode(node, message, arg0, arg1, arg2));
+                return true;
+            }
+            return false;
+        }
+        function checkGrammarConstructorTypeParameters(node) {
+            var jsdocTypeParameters = ts.isInJSFile(node) ? ts.getJSDocTypeParameterDeclarations(node) : undefined;
+            var range = node.typeParameters || jsdocTypeParameters && ts.firstOrUndefined(jsdocTypeParameters);
+            if (range) {
+                var pos = range.pos === range.end ? range.pos : ts.skipTrivia(ts.getSourceFileOfNode(node).text, range.pos);
+                return grammarErrorAtPos(node, pos, range.end - pos, ts.Diagnostics.Type_parameters_cannot_appear_on_a_constructor_declaration);
+            }
+        }
+        function checkGrammarConstructorTypeAnnotation(node) {
+            var type = ts.getEffectiveReturnTypeNode(node);
+            if (type) {
+                return grammarErrorOnNode(type, ts.Diagnostics.Type_annotation_cannot_appear_on_a_constructor_declaration);
+            }
+        }
+        function checkGrammarProperty(node) {
+            if (ts.isClassLike(node.parent)) {
+                if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_class_property_declaration_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
+                    return true;
+                }
+            }
+            else if (node.parent.kind === 241 /* InterfaceDeclaration */) {
+                if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
+                    return true;
+                }
+                if (node.initializer) {
+                    return grammarErrorOnNode(node.initializer, ts.Diagnostics.An_interface_property_cannot_have_an_initializer);
+                }
+            }
+            else if (node.parent.kind === 168 /* TypeLiteral */) {
+                if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
+                    return true;
+                }
+                if (node.initializer) {
+                    return grammarErrorOnNode(node.initializer, ts.Diagnostics.A_type_literal_property_cannot_have_an_initializer);
+                }
+            }
+            if (node.flags & 4194304 /* Ambient */) {
+                checkAmbientInitializer(node);
+            }
+            if (ts.isPropertyDeclaration(node) && node.exclamationToken && (!ts.isClassLike(node.parent) || !node.type || node.initializer ||
+                node.flags & 4194304 /* Ambient */ || ts.hasModifier(node, 32 /* Static */ | 128 /* Abstract */))) {
+                return grammarErrorOnNode(node.exclamationToken, ts.Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context);
+            }
+        }
+        function checkGrammarTopLevelElementForRequiredDeclareModifier(node) {
+            // A declare modifier is required for any top level .d.ts declaration except export=, export default, export as namespace
+            // interfaces and imports categories:
+            //
+            //  DeclarationElement:
+            //     ExportAssignment
+            //     export_opt   InterfaceDeclaration
+            //     export_opt   TypeAliasDeclaration
+            //     export_opt   ImportDeclaration
+            //     export_opt   ExternalImportDeclaration
+            //     export_opt   AmbientDeclaration
+            //
+            // TODO: The spec needs to be amended to reflect this grammar.
+            if (node.kind === 241 /* InterfaceDeclaration */ ||
+                node.kind === 242 /* TypeAliasDeclaration */ ||
+                node.kind === 249 /* ImportDeclaration */ ||
+                node.kind === 248 /* ImportEqualsDeclaration */ ||
+                node.kind === 255 /* ExportDeclaration */ ||
+                node.kind === 254 /* ExportAssignment */ ||
+                node.kind === 247 /* NamespaceExportDeclaration */ ||
+                ts.hasModifier(node, 2 /* Ambient */ | 1 /* Export */ | 512 /* Default */)) {
+                return false;
+            }
+            return grammarErrorOnFirstToken(node, ts.Diagnostics.A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file);
+        }
+        function checkGrammarTopLevelElementsForRequiredDeclareModifier(file) {
+            for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
+                var decl = _a[_i];
+                if (ts.isDeclaration(decl) || decl.kind === 219 /* VariableStatement */) {
+                    if (checkGrammarTopLevelElementForRequiredDeclareModifier(decl)) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        function checkGrammarSourceFile(node) {
+            return !!(node.flags & 4194304 /* Ambient */) && checkGrammarTopLevelElementsForRequiredDeclareModifier(node);
+        }
+        function checkGrammarStatementInAmbientContext(node) {
+            if (node.flags & 4194304 /* Ambient */) {
+                // An accessors is already reported about the ambient context
+                if (ts.isAccessor(node.parent)) {
+                    return getNodeLinks(node).hasReportedStatementInAmbientContext = true;
+                }
+                // Find containing block which is either Block, ModuleBlock, SourceFile
+                var links = getNodeLinks(node);
+                if (!links.hasReportedStatementInAmbientContext && ts.isFunctionLike(node.parent)) {
+                    return getNodeLinks(node).hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.An_implementation_cannot_be_declared_in_ambient_contexts);
+                }
+                // We are either parented by another statement, or some sort of block.
+                // If we're in a block, we only want to really report an error once
+                // to prevent noisiness.  So use a bit on the block to indicate if
+                // this has already been reported, and don't report if it has.
+                //
+                if (node.parent.kind === 218 /* Block */ || node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 279 /* SourceFile */) {
+                    var links_2 = getNodeLinks(node.parent);
+                    // Check if the containing block ever report this error
+                    if (!links_2.hasReportedStatementInAmbientContext) {
+                        return links_2.hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.Statements_are_not_allowed_in_ambient_contexts);
+                    }
+                }
+                else {
+                    // We must be parented by a statement.  If so, there's no need
+                    // to report the error as our parent will have already done it.
+                    // Debug.assert(isStatement(node.parent));
+                }
+            }
+            return false;
+        }
+        function checkGrammarNumericLiteral(node) {
+            // Grammar checking
+            if (node.numericLiteralFlags & 32 /* Octal */) {
+                var diagnosticMessage = void 0;
+                if (languageVersion >= 1 /* ES5 */) {
+                    diagnosticMessage = ts.Diagnostics.Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher_Use_the_syntax_0;
+                }
+                else if (ts.isChildOfNodeWithKind(node, 182 /* LiteralType */)) {
+                    diagnosticMessage = ts.Diagnostics.Octal_literal_types_must_use_ES2015_syntax_Use_the_syntax_0;
+                }
+                else if (ts.isChildOfNodeWithKind(node, 278 /* EnumMember */)) {
+                    diagnosticMessage = ts.Diagnostics.Octal_literals_are_not_allowed_in_enums_members_initializer_Use_the_syntax_0;
+                }
+                if (diagnosticMessage) {
+                    var withMinus = ts.isPrefixUnaryExpression(node.parent) && node.parent.operator === 39 /* MinusToken */;
+                    var literal = (withMinus ? "-" : "") + "0o" + node.text;
+                    return grammarErrorOnNode(withMinus ? node.parent : node, diagnosticMessage, literal);
+                }
+            }
+            return false;
+        }
+        function checkGrammarBigIntLiteral(node) {
+            var literalType = ts.isLiteralTypeNode(node.parent) ||
+                ts.isPrefixUnaryExpression(node.parent) && ts.isLiteralTypeNode(node.parent.parent);
+            if (!literalType) {
+                if (languageVersion < 6 /* ESNext */) {
+                    if (grammarErrorOnNode(node, ts.Diagnostics.BigInt_literals_are_not_available_when_targeting_lower_than_ESNext)) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        function grammarErrorAfterFirstToken(node, message, arg0, arg1, arg2) {
+            var sourceFile = ts.getSourceFileOfNode(node);
+            if (!hasParseDiagnostics(sourceFile)) {
+                var span = ts.getSpanOfTokenAtPosition(sourceFile, node.pos);
+                diagnostics.add(ts.createFileDiagnostic(sourceFile, ts.textSpanEnd(span), /*length*/ 0, message, arg0, arg1, arg2));
+                return true;
+            }
+            return false;
+        }
+        function getAmbientModules() {
+            if (!ambientModulesCache) {
+                ambientModulesCache = [];
+                globals.forEach(function (global, sym) {
+                    // No need to `unescapeLeadingUnderscores`, an escaped symbol is never an ambient module.
+                    if (ambientModuleSymbolRegex.test(sym)) {
+                        ambientModulesCache.push(global);
+                    }
+                });
+            }
+            return ambientModulesCache;
+        }
+        function checkGrammarImportCallExpression(node) {
+            if (moduleKind === ts.ModuleKind.ES2015) {
+                return grammarErrorOnNode(node, ts.Diagnostics.Dynamic_import_is_only_supported_when_module_flag_is_commonjs_or_esNext);
+            }
+            if (node.typeArguments) {
+                return grammarErrorOnNode(node, ts.Diagnostics.Dynamic_import_cannot_have_type_arguments);
+            }
+            var nodeArguments = node.arguments;
+            if (nodeArguments.length !== 1) {
+                return grammarErrorOnNode(node, ts.Diagnostics.Dynamic_import_must_have_one_specifier_as_an_argument);
+            }
+            checkGrammarForDisallowedTrailingComma(nodeArguments);
+            // see: parseArgumentOrArrayLiteralElement...we use this function which parse arguments of callExpression to parse specifier for dynamic import.
+            // parseArgumentOrArrayLiteralElement allows spread element to be in an argument list which is not allowed as specifier in dynamic import.
+            if (ts.isSpreadElement(nodeArguments[0])) {
+                return grammarErrorOnNode(nodeArguments[0], ts.Diagnostics.Specifier_of_dynamic_import_cannot_be_spread_element);
+            }
+            return false;
+        }
+    }
+    ts.createTypeChecker = createTypeChecker;
+    /** Like 'isDeclarationName', but returns true for LHS of `import { x as y }` or `export { x as y }`. */
+    function isDeclarationNameOrImportPropertyName(name) {
+        switch (name.parent.kind) {
+            case 253 /* ImportSpecifier */:
+            case 257 /* ExportSpecifier */:
+                return ts.isIdentifier(name);
+            default:
+                return ts.isDeclarationName(name);
+        }
+    }
+    function isSomeImportDeclaration(decl) {
+        switch (decl.kind) {
+            case 250 /* ImportClause */: // For default import
+            case 248 /* ImportEqualsDeclaration */:
+            case 251 /* NamespaceImport */:
+            case 253 /* ImportSpecifier */: // For rename import `x as y`
+                return true;
+            case 72 /* Identifier */:
+                // For regular import, `decl` is an Identifier under the ImportSpecifier.
+                return decl.parent.kind === 253 /* ImportSpecifier */;
+            default:
+                return false;
+        }
+    }
+    var JsxNames;
+    (function (JsxNames) {
+        // tslint:disable variable-name
+        JsxNames.JSX = "JSX";
+        JsxNames.IntrinsicElements = "IntrinsicElements";
+        JsxNames.ElementClass = "ElementClass";
+        JsxNames.ElementAttributesPropertyNameContainer = "ElementAttributesProperty"; // TODO: Deprecate and remove support
+        JsxNames.ElementChildrenAttributeNameContainer = "ElementChildrenAttribute";
+        JsxNames.Element = "Element";
+        JsxNames.IntrinsicAttributes = "IntrinsicAttributes";
+        JsxNames.IntrinsicClassAttributes = "IntrinsicClassAttributes";
+        JsxNames.LibraryManagedAttributes = "LibraryManagedAttributes";
+        // tslint:enable variable-name
+    })(JsxNames || (JsxNames = {}));
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    function createSynthesizedNode(kind) {
+        var node = ts.createNode(kind, -1, -1);
+        node.flags |= 8 /* Synthesized */;
+        return node;
+    }
+    /* @internal */
+    function updateNode(updated, original) {
+        if (updated !== original) {
+            setOriginalNode(updated, original);
+            setTextRange(updated, original);
+            ts.aggregateTransformFlags(updated);
+        }
+        return updated;
+    }
+    ts.updateNode = updateNode;
+    /**
+     * Make `elements` into a `NodeArray<T>`. If `elements` is `undefined`, returns an empty `NodeArray<T>`.
+     */
+    function createNodeArray(elements, hasTrailingComma) {
+        if (!elements || elements === ts.emptyArray) {
+            elements = [];
+        }
+        else if (ts.isNodeArray(elements)) {
+            return elements;
+        }
+        var array = elements;
+        array.pos = -1;
+        array.end = -1;
+        array.hasTrailingComma = hasTrailingComma;
+        return array;
+    }
+    ts.createNodeArray = createNodeArray;
+    /**
+     * Creates a shallow, memberwise clone of a node with no source map location.
+     */
+    /* @internal */
+    function getSynthesizedClone(node) {
+        // We don't use "clone" from core.ts here, as we need to preserve the prototype chain of
+        // the original node. We also need to exclude specific properties and only include own-
+        // properties (to skip members already defined on the shared prototype).
+        if (node === undefined) {
+            return node;
+        }
+        var clone = createSynthesizedNode(node.kind);
+        clone.flags |= node.flags;
+        setOriginalNode(clone, node);
+        for (var key in node) {
+            if (clone.hasOwnProperty(key) || !node.hasOwnProperty(key)) {
+                continue;
+            }
+            clone[key] = node[key];
+        }
+        return clone;
+    }
+    ts.getSynthesizedClone = getSynthesizedClone;
+    function createLiteral(value, isSingleQuote) {
+        if (typeof value === "number") {
+            return createNumericLiteral(value + "");
+        }
+        if (typeof value === "object" && "base10Value" in value) { // PseudoBigInt
+            return createBigIntLiteral(ts.pseudoBigIntToString(value) + "n");
+        }
+        if (typeof value === "boolean") {
+            return value ? createTrue() : createFalse();
+        }
+        if (ts.isString(value)) {
+            var res = createStringLiteral(value);
+            if (isSingleQuote)
+                res.singleQuote = true;
+            return res;
+        }
+        return createLiteralFromNode(value);
+    }
+    ts.createLiteral = createLiteral;
+    function createNumericLiteral(value) {
+        var node = createSynthesizedNode(8 /* NumericLiteral */);
+        node.text = value;
+        node.numericLiteralFlags = 0;
+        return node;
+    }
+    ts.createNumericLiteral = createNumericLiteral;
+    function createBigIntLiteral(value) {
+        var node = createSynthesizedNode(9 /* BigIntLiteral */);
+        node.text = value;
+        return node;
+    }
+    ts.createBigIntLiteral = createBigIntLiteral;
+    function createStringLiteral(text) {
+        var node = createSynthesizedNode(10 /* StringLiteral */);
+        node.text = text;
+        return node;
+    }
+    ts.createStringLiteral = createStringLiteral;
+    function createRegularExpressionLiteral(text) {
+        var node = createSynthesizedNode(13 /* RegularExpressionLiteral */);
+        node.text = text;
+        return node;
+    }
+    ts.createRegularExpressionLiteral = createRegularExpressionLiteral;
+    function createLiteralFromNode(sourceNode) {
+        var node = createStringLiteral(ts.getTextOfIdentifierOrLiteral(sourceNode));
+        node.textSourceNode = sourceNode;
+        return node;
+    }
+    function createIdentifier(text, typeArguments) {
+        var node = createSynthesizedNode(72 /* Identifier */);
+        node.escapedText = ts.escapeLeadingUnderscores(text);
+        node.originalKeywordKind = text ? ts.stringToToken(text) : 0 /* Unknown */;
+        node.autoGenerateFlags = 0 /* None */;
+        node.autoGenerateId = 0;
+        if (typeArguments) {
+            node.typeArguments = createNodeArray(typeArguments);
+        }
+        return node;
+    }
+    ts.createIdentifier = createIdentifier;
+    function updateIdentifier(node, typeArguments) {
+        return node.typeArguments !== typeArguments
+            ? updateNode(createIdentifier(ts.idText(node), typeArguments), node)
+            : node;
+    }
+    ts.updateIdentifier = updateIdentifier;
+    var nextAutoGenerateId = 0;
+    function createTempVariable(recordTempVariable, reservedInNestedScopes) {
+        var name = createIdentifier("");
+        name.autoGenerateFlags = 1 /* Auto */;
+        name.autoGenerateId = nextAutoGenerateId;
+        nextAutoGenerateId++;
+        if (recordTempVariable) {
+            recordTempVariable(name);
+        }
+        if (reservedInNestedScopes) {
+            name.autoGenerateFlags |= 8 /* ReservedInNestedScopes */;
+        }
+        return name;
+    }
+    ts.createTempVariable = createTempVariable;
+    /** Create a unique temporary variable for use in a loop. */
+    function createLoopVariable() {
+        var name = createIdentifier("");
+        name.autoGenerateFlags = 2 /* Loop */;
+        name.autoGenerateId = nextAutoGenerateId;
+        nextAutoGenerateId++;
+        return name;
+    }
+    ts.createLoopVariable = createLoopVariable;
+    /** Create a unique name based on the supplied text. */
+    function createUniqueName(text) {
+        var name = createIdentifier(text);
+        name.autoGenerateFlags = 3 /* Unique */;
+        name.autoGenerateId = nextAutoGenerateId;
+        nextAutoGenerateId++;
+        return name;
+    }
+    ts.createUniqueName = createUniqueName;
+    function createOptimisticUniqueName(text) {
+        var name = createIdentifier(text);
+        name.autoGenerateFlags = 3 /* Unique */ | 16 /* Optimistic */;
+        name.autoGenerateId = nextAutoGenerateId;
+        nextAutoGenerateId++;
+        return name;
+    }
+    ts.createOptimisticUniqueName = createOptimisticUniqueName;
+    /** Create a unique name based on the supplied text. This does not consider names injected by the transformer. */
+    function createFileLevelUniqueName(text) {
+        var name = createOptimisticUniqueName(text);
+        name.autoGenerateFlags |= 32 /* FileLevel */;
+        return name;
+    }
+    ts.createFileLevelUniqueName = createFileLevelUniqueName;
+    function getGeneratedNameForNode(node, flags) {
+        var name = createIdentifier(node && ts.isIdentifier(node) ? ts.idText(node) : "");
+        name.autoGenerateFlags = 4 /* Node */ | flags;
+        name.autoGenerateId = nextAutoGenerateId;
+        name.original = node;
+        nextAutoGenerateId++;
+        return name;
+    }
+    ts.getGeneratedNameForNode = getGeneratedNameForNode;
+    // Punctuation
+    function createToken(token) {
+        return createSynthesizedNode(token);
+    }
+    ts.createToken = createToken;
+    // Reserved words
+    function createSuper() {
+        return createSynthesizedNode(98 /* SuperKeyword */);
+    }
+    ts.createSuper = createSuper;
+    function createThis() {
+        return createSynthesizedNode(100 /* ThisKeyword */);
+    }
+    ts.createThis = createThis;
+    function createNull() {
+        return createSynthesizedNode(96 /* NullKeyword */);
+    }
+    ts.createNull = createNull;
+    function createTrue() {
+        return createSynthesizedNode(102 /* TrueKeyword */);
+    }
+    ts.createTrue = createTrue;
+    function createFalse() {
+        return createSynthesizedNode(87 /* FalseKeyword */);
+    }
+    ts.createFalse = createFalse;
+    // Modifiers
+    function createModifier(kind) {
+        return createToken(kind);
+    }
+    ts.createModifier = createModifier;
+    function createModifiersFromModifierFlags(flags) {
+        var result = [];
+        if (flags & 1 /* Export */) {
+            result.push(createModifier(85 /* ExportKeyword */));
+        }
+        if (flags & 2 /* Ambient */) {
+            result.push(createModifier(125 /* DeclareKeyword */));
+        }
+        if (flags & 512 /* Default */) {
+            result.push(createModifier(80 /* DefaultKeyword */));
+        }
+        if (flags & 2048 /* Const */) {
+            result.push(createModifier(77 /* ConstKeyword */));
+        }
+        if (flags & 4 /* Public */) {
+            result.push(createModifier(115 /* PublicKeyword */));
+        }
+        if (flags & 8 /* Private */) {
+            result.push(createModifier(113 /* PrivateKeyword */));
+        }
+        if (flags & 16 /* Protected */) {
+            result.push(createModifier(114 /* ProtectedKeyword */));
+        }
+        if (flags & 128 /* Abstract */) {
+            result.push(createModifier(118 /* AbstractKeyword */));
+        }
+        if (flags & 32 /* Static */) {
+            result.push(createModifier(116 /* StaticKeyword */));
+        }
+        if (flags & 64 /* Readonly */) {
+            result.push(createModifier(133 /* ReadonlyKeyword */));
+        }
+        if (flags & 256 /* Async */) {
+            result.push(createModifier(121 /* AsyncKeyword */));
+        }
+        return result;
+    }
+    ts.createModifiersFromModifierFlags = createModifiersFromModifierFlags;
+    // Names
+    function createQualifiedName(left, right) {
+        var node = createSynthesizedNode(148 /* QualifiedName */);
+        node.left = left;
+        node.right = asName(right);
+        return node;
+    }
+    ts.createQualifiedName = createQualifiedName;
+    function updateQualifiedName(node, left, right) {
+        return node.left !== left
+            || node.right !== right
+            ? updateNode(createQualifiedName(left, right), node)
+            : node;
+    }
+    ts.updateQualifiedName = updateQualifiedName;
+    function parenthesizeForComputedName(expression) {
+        return ts.isCommaSequence(expression)
+            ? createParen(expression)
+            : expression;
+    }
+    function createComputedPropertyName(expression) {
+        var node = createSynthesizedNode(149 /* ComputedPropertyName */);
+        node.expression = parenthesizeForComputedName(expression);
+        return node;
+    }
+    ts.createComputedPropertyName = createComputedPropertyName;
+    function updateComputedPropertyName(node, expression) {
+        return node.expression !== expression
+            ? updateNode(createComputedPropertyName(expression), node)
+            : node;
+    }
+    ts.updateComputedPropertyName = updateComputedPropertyName;
+    // Signature elements
+    function createTypeParameterDeclaration(name, constraint, defaultType) {
+        var node = createSynthesizedNode(150 /* TypeParameter */);
+        node.name = asName(name);
+        node.constraint = constraint;
+        node.default = defaultType;
+        return node;
+    }
+    ts.createTypeParameterDeclaration = createTypeParameterDeclaration;
+    function updateTypeParameterDeclaration(node, name, constraint, defaultType) {
+        return node.name !== name
+            || node.constraint !== constraint
+            || node.default !== defaultType
+            ? updateNode(createTypeParameterDeclaration(name, constraint, defaultType), node)
+            : node;
+    }
+    ts.updateTypeParameterDeclaration = updateTypeParameterDeclaration;
+    function createParameter(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer) {
+        var node = createSynthesizedNode(151 /* Parameter */);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
+        node.dotDotDotToken = dotDotDotToken;
+        node.name = asName(name);
+        node.questionToken = questionToken;
+        node.type = type;
+        node.initializer = initializer ? ts.parenthesizeExpressionForList(initializer) : undefined;
+        return node;
+    }
+    ts.createParameter = createParameter;
+    function updateParameter(node, decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer) {
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.dotDotDotToken !== dotDotDotToken
+            || node.name !== name
+            || node.questionToken !== questionToken
+            || node.type !== type
+            || node.initializer !== initializer
+            ? updateNode(createParameter(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer), node)
+            : node;
+    }
+    ts.updateParameter = updateParameter;
+    function createDecorator(expression) {
+        var node = createSynthesizedNode(152 /* Decorator */);
+        node.expression = ts.parenthesizeForAccess(expression);
+        return node;
+    }
+    ts.createDecorator = createDecorator;
+    function updateDecorator(node, expression) {
+        return node.expression !== expression
+            ? updateNode(createDecorator(expression), node)
+            : node;
+    }
+    ts.updateDecorator = updateDecorator;
+    // Type Elements
+    function createPropertySignature(modifiers, name, questionToken, type, initializer) {
+        var node = createSynthesizedNode(153 /* PropertySignature */);
+        node.modifiers = asNodeArray(modifiers);
+        node.name = asName(name);
+        node.questionToken = questionToken;
+        node.type = type;
+        node.initializer = initializer;
+        return node;
+    }
+    ts.createPropertySignature = createPropertySignature;
+    function updatePropertySignature(node, modifiers, name, questionToken, type, initializer) {
+        return node.modifiers !== modifiers
+            || node.name !== name
+            || node.questionToken !== questionToken
+            || node.type !== type
+            || node.initializer !== initializer
+            ? updateNode(createPropertySignature(modifiers, name, questionToken, type, initializer), node)
+            : node;
+    }
+    ts.updatePropertySignature = updatePropertySignature;
+    function createProperty(decorators, modifiers, name, questionOrExclamationToken, type, initializer) {
+        var node = createSynthesizedNode(154 /* PropertyDeclaration */);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
+        node.name = asName(name);
+        node.questionToken = questionOrExclamationToken !== undefined && questionOrExclamationToken.kind === 56 /* QuestionToken */ ? questionOrExclamationToken : undefined;
+        node.exclamationToken = questionOrExclamationToken !== undefined && questionOrExclamationToken.kind === 52 /* ExclamationToken */ ? questionOrExclamationToken : undefined;
+        node.type = type;
+        node.initializer = initializer;
+        return node;
+    }
+    ts.createProperty = createProperty;
+    function updateProperty(node, decorators, modifiers, name, questionOrExclamationToken, type, initializer) {
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.name !== name
+            || node.questionToken !== (questionOrExclamationToken !== undefined && questionOrExclamationToken.kind === 56 /* QuestionToken */ ? questionOrExclamationToken : undefined)
+            || node.exclamationToken !== (questionOrExclamationToken !== undefined && questionOrExclamationToken.kind === 52 /* ExclamationToken */ ? questionOrExclamationToken : undefined)
+            || node.type !== type
+            || node.initializer !== initializer
+            ? updateNode(createProperty(decorators, modifiers, name, questionOrExclamationToken, type, initializer), node)
+            : node;
+    }
+    ts.updateProperty = updateProperty;
+    function createMethodSignature(typeParameters, parameters, type, name, questionToken) {
+        var node = createSignatureDeclaration(155 /* MethodSignature */, typeParameters, parameters, type);
+        node.name = asName(name);
+        node.questionToken = questionToken;
+        return node;
+    }
+    ts.createMethodSignature = createMethodSignature;
+    function updateMethodSignature(node, typeParameters, parameters, type, name, questionToken) {
+        return node.typeParameters !== typeParameters
+            || node.parameters !== parameters
+            || node.type !== type
+            || node.name !== name
+            || node.questionToken !== questionToken
+            ? updateNode(createMethodSignature(typeParameters, parameters, type, name, questionToken), node)
+            : node;
+    }
+    ts.updateMethodSignature = updateMethodSignature;
+    function createMethod(decorators, modifiers, asteriskToken, name, questionToken, typeParameters, parameters, type, body) {
+        var node = createSynthesizedNode(156 /* MethodDeclaration */);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
+        node.asteriskToken = asteriskToken;
+        node.name = asName(name);
+        node.questionToken = questionToken;
+        node.typeParameters = asNodeArray(typeParameters);
+        node.parameters = createNodeArray(parameters);
+        node.type = type;
+        node.body = body;
+        return node;
+    }
+    ts.createMethod = createMethod;
+    function updateMethod(node, decorators, modifiers, asteriskToken, name, questionToken, typeParameters, parameters, type, body) {
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.asteriskToken !== asteriskToken
+            || node.name !== name
+            || node.questionToken !== questionToken
+            || node.typeParameters !== typeParameters
+            || node.parameters !== parameters
+            || node.type !== type
+            || node.body !== body
+            ? updateNode(createMethod(decorators, modifiers, asteriskToken, name, questionToken, typeParameters, parameters, type, body), node)
+            : node;
+    }
+    ts.updateMethod = updateMethod;
+    function createConstructor(decorators, modifiers, parameters, body) {
+        var node = createSynthesizedNode(157 /* Constructor */);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
+        node.typeParameters = undefined;
+        node.parameters = createNodeArray(parameters);
+        node.type = undefined;
+        node.body = body;
+        return node;
+    }
+    ts.createConstructor = createConstructor;
+    function updateConstructor(node, decorators, modifiers, parameters, body) {
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.parameters !== parameters
+            || node.body !== body
+            ? updateNode(createConstructor(decorators, modifiers, parameters, body), node)
+            : node;
+    }
+    ts.updateConstructor = updateConstructor;
+    function createGetAccessor(decorators, modifiers, name, parameters, type, body) {
+        var node = createSynthesizedNode(158 /* GetAccessor */);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
+        node.name = asName(name);
+        node.typeParameters = undefined;
+        node.parameters = createNodeArray(parameters);
+        node.type = type;
+        node.body = body;
+        return node;
+    }
+    ts.createGetAccessor = createGetAccessor;
+    function updateGetAccessor(node, decorators, modifiers, name, parameters, type, body) {
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.name !== name
+            || node.parameters !== parameters
+            || node.type !== type
+            || node.body !== body
+            ? updateNode(createGetAccessor(decorators, modifiers, name, parameters, type, body), node)
+            : node;
+    }
+    ts.updateGetAccessor = updateGetAccessor;
+    function createSetAccessor(decorators, modifiers, name, parameters, body) {
+        var node = createSynthesizedNode(159 /* SetAccessor */);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
+        node.name = asName(name);
+        node.typeParameters = undefined;
+        node.parameters = createNodeArray(parameters);
+        node.body = body;
+        return node;
+    }
+    ts.createSetAccessor = createSetAccessor;
+    function updateSetAccessor(node, decorators, modifiers, name, parameters, body) {
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.name !== name
+            || node.parameters !== parameters
+            || node.body !== body
+            ? updateNode(createSetAccessor(decorators, modifiers, name, parameters, body), node)
+            : node;
+    }
+    ts.updateSetAccessor = updateSetAccessor;
+    function createCallSignature(typeParameters, parameters, type) {
+        return createSignatureDeclaration(160 /* CallSignature */, typeParameters, parameters, type);
+    }
+    ts.createCallSignature = createCallSignature;
+    function updateCallSignature(node, typeParameters, parameters, type) {
+        return updateSignatureDeclaration(node, typeParameters, parameters, type);
+    }
+    ts.updateCallSignature = updateCallSignature;
+    function createConstructSignature(typeParameters, parameters, type) {
+        return createSignatureDeclaration(161 /* ConstructSignature */, typeParameters, parameters, type);
+    }
+    ts.createConstructSignature = createConstructSignature;
+    function updateConstructSignature(node, typeParameters, parameters, type) {
+        return updateSignatureDeclaration(node, typeParameters, parameters, type);
+    }
+    ts.updateConstructSignature = updateConstructSignature;
+    function createIndexSignature(decorators, modifiers, parameters, type) {
+        var node = createSynthesizedNode(162 /* IndexSignature */);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
+        node.parameters = createNodeArray(parameters);
+        node.type = type;
+        return node;
+    }
+    ts.createIndexSignature = createIndexSignature;
+    function updateIndexSignature(node, decorators, modifiers, parameters, type) {
+        return node.parameters !== parameters
+            || node.type !== type
+            || node.decorators !== decorators
+            || node.modifiers !== modifiers
+            ? updateNode(createIndexSignature(decorators, modifiers, parameters, type), node)
+            : node;
+    }
+    ts.updateIndexSignature = updateIndexSignature;
+    /* @internal */
+    function createSignatureDeclaration(kind, typeParameters, parameters, type, typeArguments) {
+        var node = createSynthesizedNode(kind);
+        node.typeParameters = asNodeArray(typeParameters);
+        node.parameters = asNodeArray(parameters);
+        node.type = type;
+        node.typeArguments = asNodeArray(typeArguments);
+        return node;
+    }
+    ts.createSignatureDeclaration = createSignatureDeclaration;
+    function updateSignatureDeclaration(node, typeParameters, parameters, type) {
+        return node.typeParameters !== typeParameters
+            || node.parameters !== parameters
+            || node.type !== type
+            ? updateNode(createSignatureDeclaration(node.kind, typeParameters, parameters, type), node)
+            : node;
+    }
+    // Types
+    function createKeywordTypeNode(kind) {
+        return createSynthesizedNode(kind);
+    }
+    ts.createKeywordTypeNode = createKeywordTypeNode;
+    function createTypePredicateNode(parameterName, type) {
+        var node = createSynthesizedNode(163 /* TypePredicate */);
+        node.parameterName = asName(parameterName);
+        node.type = type;
+        return node;
+    }
+    ts.createTypePredicateNode = createTypePredicateNode;
+    function updateTypePredicateNode(node, parameterName, type) {
+        return node.parameterName !== parameterName
+            || node.type !== type
+            ? updateNode(createTypePredicateNode(parameterName, type), node)
+            : node;
+    }
+    ts.updateTypePredicateNode = updateTypePredicateNode;
+    function createTypeReferenceNode(typeName, typeArguments) {
+        var node = createSynthesizedNode(164 /* TypeReference */);
+        node.typeName = asName(typeName);
+        node.typeArguments = typeArguments && ts.parenthesizeTypeParameters(typeArguments);
+        return node;
+    }
+    ts.createTypeReferenceNode = createTypeReferenceNode;
+    function updateTypeReferenceNode(node, typeName, typeArguments) {
+        return node.typeName !== typeName
+            || node.typeArguments !== typeArguments
+            ? updateNode(createTypeReferenceNode(typeName, typeArguments), node)
+            : node;
+    }
+    ts.updateTypeReferenceNode = updateTypeReferenceNode;
+    function createFunctionTypeNode(typeParameters, parameters, type) {
+        return createSignatureDeclaration(165 /* FunctionType */, typeParameters, parameters, type);
+    }
+    ts.createFunctionTypeNode = createFunctionTypeNode;
+    function updateFunctionTypeNode(node, typeParameters, parameters, type) {
+        return updateSignatureDeclaration(node, typeParameters, parameters, type);
+    }
+    ts.updateFunctionTypeNode = updateFunctionTypeNode;
+    function createConstructorTypeNode(typeParameters, parameters, type) {
+        return createSignatureDeclaration(166 /* ConstructorType */, typeParameters, parameters, type);
+    }
+    ts.createConstructorTypeNode = createConstructorTypeNode;
+    function updateConstructorTypeNode(node, typeParameters, parameters, type) {
+        return updateSignatureDeclaration(node, typeParameters, parameters, type);
+    }
+    ts.updateConstructorTypeNode = updateConstructorTypeNode;
+    function createTypeQueryNode(exprName) {
+        var node = createSynthesizedNode(167 /* TypeQuery */);
+        node.exprName = exprName;
+        return node;
+    }
+    ts.createTypeQueryNode = createTypeQueryNode;
+    function updateTypeQueryNode(node, exprName) {
+        return node.exprName !== exprName
+            ? updateNode(createTypeQueryNode(exprName), node)
+            : node;
+    }
+    ts.updateTypeQueryNode = updateTypeQueryNode;
+    function createTypeLiteralNode(members) {
+        var node = createSynthesizedNode(168 /* TypeLiteral */);
+        node.members = createNodeArray(members);
+        return node;
+    }
+    ts.createTypeLiteralNode = createTypeLiteralNode;
+    function updateTypeLiteralNode(node, members) {
+        return node.members !== members
+            ? updateNode(createTypeLiteralNode(members), node)
+            : node;
+    }
+    ts.updateTypeLiteralNode = updateTypeLiteralNode;
+    function createArrayTypeNode(elementType) {
+        var node = createSynthesizedNode(169 /* ArrayType */);
+        node.elementType = ts.parenthesizeArrayTypeMember(elementType);
+        return node;
+    }
+    ts.createArrayTypeNode = createArrayTypeNode;
+    function updateArrayTypeNode(node, elementType) {
+        return node.elementType !== elementType
+            ? updateNode(createArrayTypeNode(elementType), node)
+            : node;
+    }
+    ts.updateArrayTypeNode = updateArrayTypeNode;
+    function createTupleTypeNode(elementTypes) {
+        var node = createSynthesizedNode(170 /* TupleType */);
+        node.elementTypes = createNodeArray(elementTypes);
+        return node;
+    }
+    ts.createTupleTypeNode = createTupleTypeNode;
+    function updateTupleTypeNode(node, elementTypes) {
+        return node.elementTypes !== elementTypes
+            ? updateNode(createTupleTypeNode(elementTypes), node)
+            : node;
+    }
+    ts.updateTupleTypeNode = updateTupleTypeNode;
+    function createOptionalTypeNode(type) {
+        var node = createSynthesizedNode(171 /* OptionalType */);
+        node.type = ts.parenthesizeArrayTypeMember(type);
+        return node;
+    }
+    ts.createOptionalTypeNode = createOptionalTypeNode;
+    function updateOptionalTypeNode(node, type) {
+        return node.type !== type
+            ? updateNode(createOptionalTypeNode(type), node)
+            : node;
+    }
+    ts.updateOptionalTypeNode = updateOptionalTypeNode;
+    function createRestTypeNode(type) {
+        var node = createSynthesizedNode(172 /* RestType */);
+        node.type = type;
+        return node;
+    }
+    ts.createRestTypeNode = createRestTypeNode;
+    function updateRestTypeNode(node, type) {
+        return node.type !== type
+            ? updateNode(createRestTypeNode(type), node)
+            : node;
+    }
+    ts.updateRestTypeNode = updateRestTypeNode;
+    function createUnionTypeNode(types) {
+        return createUnionOrIntersectionTypeNode(173 /* UnionType */, types);
+    }
+    ts.createUnionTypeNode = createUnionTypeNode;
+    function updateUnionTypeNode(node, types) {
+        return updateUnionOrIntersectionTypeNode(node, types);
+    }
+    ts.updateUnionTypeNode = updateUnionTypeNode;
+    function createIntersectionTypeNode(types) {
+        return createUnionOrIntersectionTypeNode(174 /* IntersectionType */, types);
+    }
+    ts.createIntersectionTypeNode = createIntersectionTypeNode;
+    function updateIntersectionTypeNode(node, types) {
+        return updateUnionOrIntersectionTypeNode(node, types);
+    }
+    ts.updateIntersectionTypeNode = updateIntersectionTypeNode;
+    function createUnionOrIntersectionTypeNode(kind, types) {
+        var node = createSynthesizedNode(kind);
+        node.types = ts.parenthesizeElementTypeMembers(types);
+        return node;
+    }
+    ts.createUnionOrIntersectionTypeNode = createUnionOrIntersectionTypeNode;
+    function updateUnionOrIntersectionTypeNode(node, types) {
+        return node.types !== types
+            ? updateNode(createUnionOrIntersectionTypeNode(node.kind, types), node)
+            : node;
+    }
+    function createConditionalTypeNode(checkType, extendsType, trueType, falseType) {
+        var node = createSynthesizedNode(175 /* ConditionalType */);
+        node.checkType = ts.parenthesizeConditionalTypeMember(checkType);
+        node.extendsType = ts.parenthesizeConditionalTypeMember(extendsType);
+        node.trueType = trueType;
+        node.falseType = falseType;
+        return node;
+    }
+    ts.createConditionalTypeNode = createConditionalTypeNode;
+    function updateConditionalTypeNode(node, checkType, extendsType, trueType, falseType) {
+        return node.checkType !== checkType
+            || node.extendsType !== extendsType
+            || node.trueType !== trueType
+            || node.falseType !== falseType
+            ? updateNode(createConditionalTypeNode(checkType, extendsType, trueType, falseType), node)
+            : node;
+    }
+    ts.updateConditionalTypeNode = updateConditionalTypeNode;
+    function createInferTypeNode(typeParameter) {
+        var node = createSynthesizedNode(176 /* InferType */);
+        node.typeParameter = typeParameter;
+        return node;
+    }
+    ts.createInferTypeNode = createInferTypeNode;
+    function updateInferTypeNode(node, typeParameter) {
+        return node.typeParameter !== typeParameter
+            ? updateNode(createInferTypeNode(typeParameter), node)
+            : node;
+    }
+    ts.updateInferTypeNode = updateInferTypeNode;
+    function createImportTypeNode(argument, qualifier, typeArguments, isTypeOf) {
+        var node = createSynthesizedNode(183 /* ImportType */);
+        node.argument = argument;
+        node.qualifier = qualifier;
+        node.typeArguments = asNodeArray(typeArguments);
+        node.isTypeOf = isTypeOf;
+        return node;
+    }
+    ts.createImportTypeNode = createImportTypeNode;
+    function updateImportTypeNode(node, argument, qualifier, typeArguments, isTypeOf) {
+        return node.argument !== argument
+            || node.qualifier !== qualifier
+            || node.typeArguments !== typeArguments
+            || node.isTypeOf !== isTypeOf
+            ? updateNode(createImportTypeNode(argument, qualifier, typeArguments, isTypeOf), node)
+            : node;
+    }
+    ts.updateImportTypeNode = updateImportTypeNode;
+    function createParenthesizedType(type) {
+        var node = createSynthesizedNode(177 /* ParenthesizedType */);
+        node.type = type;
+        return node;
+    }
+    ts.createParenthesizedType = createParenthesizedType;
+    function updateParenthesizedType(node, type) {
+        return node.type !== type
+            ? updateNode(createParenthesizedType(type), node)
+            : node;
+    }
+    ts.updateParenthesizedType = updateParenthesizedType;
+    function createThisTypeNode() {
+        return createSynthesizedNode(178 /* ThisType */);
+    }
+    ts.createThisTypeNode = createThisTypeNode;
+    function createTypeOperatorNode(operatorOrType, type) {
+        var node = createSynthesizedNode(179 /* TypeOperator */);
+        node.operator = typeof operatorOrType === "number" ? operatorOrType : 129 /* KeyOfKeyword */;
+        node.type = ts.parenthesizeElementTypeMember(typeof operatorOrType === "number" ? type : operatorOrType);
+        return node;
+    }
+    ts.createTypeOperatorNode = createTypeOperatorNode;
+    function updateTypeOperatorNode(node, type) {
+        return node.type !== type ? updateNode(createTypeOperatorNode(node.operator, type), node) : node;
+    }
+    ts.updateTypeOperatorNode = updateTypeOperatorNode;
+    function createIndexedAccessTypeNode(objectType, indexType) {
+        var node = createSynthesizedNode(180 /* IndexedAccessType */);
+        node.objectType = ts.parenthesizeElementTypeMember(objectType);
+        node.indexType = indexType;
+        return node;
+    }
+    ts.createIndexedAccessTypeNode = createIndexedAccessTypeNode;
+    function updateIndexedAccessTypeNode(node, objectType, indexType) {
+        return node.objectType !== objectType
+            || node.indexType !== indexType
+            ? updateNode(createIndexedAccessTypeNode(objectType, indexType), node)
+            : node;
+    }
+    ts.updateIndexedAccessTypeNode = updateIndexedAccessTypeNode;
+    function createMappedTypeNode(readonlyToken, typeParameter, questionToken, type) {
+        var node = createSynthesizedNode(181 /* MappedType */);
+        node.readonlyToken = readonlyToken;
+        node.typeParameter = typeParameter;
+        node.questionToken = questionToken;
+        node.type = type;
+        return node;
+    }
+    ts.createMappedTypeNode = createMappedTypeNode;
+    function updateMappedTypeNode(node, readonlyToken, typeParameter, questionToken, type) {
+        return node.readonlyToken !== readonlyToken
+            || node.typeParameter !== typeParameter
+            || node.questionToken !== questionToken
+            || node.type !== type
+            ? updateNode(createMappedTypeNode(readonlyToken, typeParameter, questionToken, type), node)
+            : node;
+    }
+    ts.updateMappedTypeNode = updateMappedTypeNode;
+    function createLiteralTypeNode(literal) {
+        var node = createSynthesizedNode(182 /* LiteralType */);
+        node.literal = literal;
+        return node;
+    }
+    ts.createLiteralTypeNode = createLiteralTypeNode;
+    function updateLiteralTypeNode(node, literal) {
+        return node.literal !== literal
+            ? updateNode(createLiteralTypeNode(literal), node)
+            : node;
+    }
+    ts.updateLiteralTypeNode = updateLiteralTypeNode;
+    // Binding Patterns
+    function createObjectBindingPattern(elements) {
+        var node = createSynthesizedNode(184 /* ObjectBindingPattern */);
+        node.elements = createNodeArray(elements);
+        return node;
+    }
+    ts.createObjectBindingPattern = createObjectBindingPattern;
+    function updateObjectBindingPattern(node, elements) {
+        return node.elements !== elements
+            ? updateNode(createObjectBindingPattern(elements), node)
+            : node;
+    }
+    ts.updateObjectBindingPattern = updateObjectBindingPattern;
+    function createArrayBindingPattern(elements) {
+        var node = createSynthesizedNode(185 /* ArrayBindingPattern */);
+        node.elements = createNodeArray(elements);
+        return node;
+    }
+    ts.createArrayBindingPattern = createArrayBindingPattern;
+    function updateArrayBindingPattern(node, elements) {
+        return node.elements !== elements
+            ? updateNode(createArrayBindingPattern(elements), node)
+            : node;
+    }
+    ts.updateArrayBindingPattern = updateArrayBindingPattern;
+    function createBindingElement(dotDotDotToken, propertyName, name, initializer) {
+        var node = createSynthesizedNode(186 /* BindingElement */);
+        node.dotDotDotToken = dotDotDotToken;
+        node.propertyName = asName(propertyName);
+        node.name = asName(name);
+        node.initializer = initializer;
+        return node;
+    }
+    ts.createBindingElement = createBindingElement;
+    function updateBindingElement(node, dotDotDotToken, propertyName, name, initializer) {
+        return node.propertyName !== propertyName
+            || node.dotDotDotToken !== dotDotDotToken
+            || node.name !== name
+            || node.initializer !== initializer
+            ? updateNode(createBindingElement(dotDotDotToken, propertyName, name, initializer), node)
+            : node;
+    }
+    ts.updateBindingElement = updateBindingElement;
+    // Expression
+    function createArrayLiteral(elements, multiLine) {
+        var node = createSynthesizedNode(187 /* ArrayLiteralExpression */);
+        node.elements = ts.parenthesizeListElements(createNodeArray(elements));
+        if (multiLine)
+            node.multiLine = true;
+        return node;
+    }
+    ts.createArrayLiteral = createArrayLiteral;
+    function updateArrayLiteral(node, elements) {
+        return node.elements !== elements
+            ? updateNode(createArrayLiteral(elements, node.multiLine), node)
+            : node;
+    }
+    ts.updateArrayLiteral = updateArrayLiteral;
+    function createObjectLiteral(properties, multiLine) {
+        var node = createSynthesizedNode(188 /* ObjectLiteralExpression */);
+        node.properties = createNodeArray(properties);
+        if (multiLine)
+            node.multiLine = true;
+        return node;
+    }
+    ts.createObjectLiteral = createObjectLiteral;
+    function updateObjectLiteral(node, properties) {
+        return node.properties !== properties
+            ? updateNode(createObjectLiteral(properties, node.multiLine), node)
+            : node;
+    }
+    ts.updateObjectLiteral = updateObjectLiteral;
+    function createPropertyAccess(expression, name) {
+        var node = createSynthesizedNode(189 /* PropertyAccessExpression */);
+        node.expression = ts.parenthesizeForAccess(expression);
+        node.name = asName(name); // TODO: GH#18217
+        setEmitFlags(node, 131072 /* NoIndentation */);
+        return node;
+    }
+    ts.createPropertyAccess = createPropertyAccess;
+    function updatePropertyAccess(node, expression, name) {
+        // Because we are updating existed propertyAccess we want to inherit its emitFlags
+        // instead of using the default from createPropertyAccess
+        return node.expression !== expression
+            || node.name !== name
+            ? updateNode(setEmitFlags(createPropertyAccess(expression, name), ts.getEmitFlags(node)), node)
+            : node;
+    }
+    ts.updatePropertyAccess = updatePropertyAccess;
+    function createElementAccess(expression, index) {
+        var node = createSynthesizedNode(190 /* ElementAccessExpression */);
+        node.expression = ts.parenthesizeForAccess(expression);
+        node.argumentExpression = asExpression(index);
+        return node;
+    }
+    ts.createElementAccess = createElementAccess;
+    function updateElementAccess(node, expression, argumentExpression) {
+        return node.expression !== expression
+            || node.argumentExpression !== argumentExpression
+            ? updateNode(createElementAccess(expression, argumentExpression), node)
+            : node;
+    }
+    ts.updateElementAccess = updateElementAccess;
+    function createCall(expression, typeArguments, argumentsArray) {
+        var node = createSynthesizedNode(191 /* CallExpression */);
+        node.expression = ts.parenthesizeForAccess(expression);
+        node.typeArguments = asNodeArray(typeArguments);
+        node.arguments = ts.parenthesizeListElements(createNodeArray(argumentsArray));
+        return node;
+    }
+    ts.createCall = createCall;
+    function updateCall(node, expression, typeArguments, argumentsArray) {
+        return node.expression !== expression
+            || node.typeArguments !== typeArguments
+            || node.arguments !== argumentsArray
+            ? updateNode(createCall(expression, typeArguments, argumentsArray), node)
+            : node;
+    }
+    ts.updateCall = updateCall;
+    function createNew(expression, typeArguments, argumentsArray) {
+        var node = createSynthesizedNode(192 /* NewExpression */);
+        node.expression = ts.parenthesizeForNew(expression);
+        node.typeArguments = asNodeArray(typeArguments);
+        node.arguments = argumentsArray ? ts.parenthesizeListElements(createNodeArray(argumentsArray)) : undefined;
+        return node;
+    }
+    ts.createNew = createNew;
+    function updateNew(node, expression, typeArguments, argumentsArray) {
+        return node.expression !== expression
+            || node.typeArguments !== typeArguments
+            || node.arguments !== argumentsArray
+            ? updateNode(createNew(expression, typeArguments, argumentsArray), node)
+            : node;
+    }
+    ts.updateNew = updateNew;
+    function createTaggedTemplate(tag, typeArgumentsOrTemplate, template) {
+        var node = createSynthesizedNode(193 /* TaggedTemplateExpression */);
+        node.tag = ts.parenthesizeForAccess(tag);
+        if (template) {
+            node.typeArguments = asNodeArray(typeArgumentsOrTemplate);
+            node.template = template;
+        }
+        else {
+            node.typeArguments = undefined;
+            node.template = typeArgumentsOrTemplate;
+        }
+        return node;
+    }
+    ts.createTaggedTemplate = createTaggedTemplate;
+    function updateTaggedTemplate(node, tag, typeArgumentsOrTemplate, template) {
+        return node.tag !== tag
+            || (template
+                ? node.typeArguments !== typeArgumentsOrTemplate || node.template !== template
+                : node.typeArguments !== undefined || node.template !== typeArgumentsOrTemplate)
+            ? updateNode(createTaggedTemplate(tag, typeArgumentsOrTemplate, template), node)
+            : node;
+    }
+    ts.updateTaggedTemplate = updateTaggedTemplate;
+    function createTypeAssertion(type, expression) {
+        var node = createSynthesizedNode(194 /* TypeAssertionExpression */);
+        node.type = type;
+        node.expression = ts.parenthesizePrefixOperand(expression);
+        return node;
+    }
+    ts.createTypeAssertion = createTypeAssertion;
+    function updateTypeAssertion(node, type, expression) {
+        return node.type !== type
+            || node.expression !== expression
+            ? updateNode(createTypeAssertion(type, expression), node)
+            : node;
+    }
+    ts.updateTypeAssertion = updateTypeAssertion;
+    function createParen(expression) {
+        var node = createSynthesizedNode(195 /* ParenthesizedExpression */);
+        node.expression = expression;
+        return node;
+    }
+    ts.createParen = createParen;
+    function updateParen(node, expression) {
+        return node.expression !== expression
+            ? updateNode(createParen(expression), node)
+            : node;
+    }
+    ts.updateParen = updateParen;
+    function createFunctionExpression(modifiers, asteriskToken, name, typeParameters, parameters, type, body) {
+        var node = createSynthesizedNode(196 /* FunctionExpression */);
+        node.modifiers = asNodeArray(modifiers);
+        node.asteriskToken = asteriskToken;
+        node.name = asName(name);
+        node.typeParameters = asNodeArray(typeParameters);
+        node.parameters = createNodeArray(parameters);
+        node.type = type;
+        node.body = body;
+        return node;
+    }
+    ts.createFunctionExpression = createFunctionExpression;
+    function updateFunctionExpression(node, modifiers, asteriskToken, name, typeParameters, parameters, type, body) {
+        return node.name !== name
+            || node.modifiers !== modifiers
+            || node.asteriskToken !== asteriskToken
+            || node.typeParameters !== typeParameters
+            || node.parameters !== parameters
+            || node.type !== type
+            || node.body !== body
+            ? updateNode(createFunctionExpression(modifiers, asteriskToken, name, typeParameters, parameters, type, body), node)
+            : node;
+    }
+    ts.updateFunctionExpression = updateFunctionExpression;
+    function createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body) {
+        var node = createSynthesizedNode(197 /* ArrowFunction */);
+        node.modifiers = asNodeArray(modifiers);
+        node.typeParameters = asNodeArray(typeParameters);
+        node.parameters = createNodeArray(parameters);
+        node.type = type;
+        node.equalsGreaterThanToken = equalsGreaterThanToken || createToken(37 /* EqualsGreaterThanToken */);
+        node.body = ts.parenthesizeConciseBody(body);
+        return node;
+    }
+    ts.createArrowFunction = createArrowFunction;
+    function updateArrowFunction(node, modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body) {
+        return node.modifiers !== modifiers
+            || node.typeParameters !== typeParameters
+            || node.parameters !== parameters
+            || node.type !== type
+            || node.equalsGreaterThanToken !== equalsGreaterThanToken
+            || node.body !== body
+            ? updateNode(createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body), node)
+            : node;
+    }
+    ts.updateArrowFunction = updateArrowFunction;
+    function createDelete(expression) {
+        var node = createSynthesizedNode(198 /* DeleteExpression */);
+        node.expression = ts.parenthesizePrefixOperand(expression);
+        return node;
+    }
+    ts.createDelete = createDelete;
+    function updateDelete(node, expression) {
+        return node.expression !== expression
+            ? updateNode(createDelete(expression), node)
+            : node;
+    }
+    ts.updateDelete = updateDelete;
+    function createTypeOf(expression) {
+        var node = createSynthesizedNode(199 /* TypeOfExpression */);
+        node.expression = ts.parenthesizePrefixOperand(expression);
+        return node;
+    }
+    ts.createTypeOf = createTypeOf;
+    function updateTypeOf(node, expression) {
+        return node.expression !== expression
+            ? updateNode(createTypeOf(expression), node)
+            : node;
+    }
+    ts.updateTypeOf = updateTypeOf;
+    function createVoid(expression) {
+        var node = createSynthesizedNode(200 /* VoidExpression */);
+        node.expression = ts.parenthesizePrefixOperand(expression);
+        return node;
+    }
+    ts.createVoid = createVoid;
+    function updateVoid(node, expression) {
+        return node.expression !== expression
+            ? updateNode(createVoid(expression), node)
+            : node;
+    }
+    ts.updateVoid = updateVoid;
+    function createAwait(expression) {
+        var node = createSynthesizedNode(201 /* AwaitExpression */);
+        node.expression = ts.parenthesizePrefixOperand(expression);
+        return node;
+    }
+    ts.createAwait = createAwait;
+    function updateAwait(node, expression) {
+        return node.expression !== expression
+            ? updateNode(createAwait(expression), node)
+            : node;
+    }
+    ts.updateAwait = updateAwait;
+    function createPrefix(operator, operand) {
+        var node = createSynthesizedNode(202 /* PrefixUnaryExpression */);
+        node.operator = operator;
+        node.operand = ts.parenthesizePrefixOperand(operand);
+        return node;
+    }
+    ts.createPrefix = createPrefix;
+    function updatePrefix(node, operand) {
+        return node.operand !== operand
+            ? updateNode(createPrefix(node.operator, operand), node)
+            : node;
+    }
+    ts.updatePrefix = updatePrefix;
+    function createPostfix(operand, operator) {
+        var node = createSynthesizedNode(203 /* PostfixUnaryExpression */);
+        node.operand = ts.parenthesizePostfixOperand(operand);
+        node.operator = operator;
+        return node;
+    }
+    ts.createPostfix = createPostfix;
+    function updatePostfix(node, operand) {
+        return node.operand !== operand
+            ? updateNode(createPostfix(operand, node.operator), node)
+            : node;
+    }
+    ts.updatePostfix = updatePostfix;
+    function createBinary(left, operator, right) {
+        var node = createSynthesizedNode(204 /* BinaryExpression */);
+        var operatorToken = asToken(operator);
+        var operatorKind = operatorToken.kind;
+        node.left = ts.parenthesizeBinaryOperand(operatorKind, left, /*isLeftSideOfBinary*/ true, /*leftOperand*/ undefined);
+        node.operatorToken = operatorToken;
+        node.right = ts.parenthesizeBinaryOperand(operatorKind, right, /*isLeftSideOfBinary*/ false, node.left);
+        return node;
+    }
+    ts.createBinary = createBinary;
+    function updateBinary(node, left, right, operator) {
+        return node.left !== left
+            || node.right !== right
+            ? updateNode(createBinary(left, operator || node.operatorToken, right), node)
+            : node;
+    }
+    ts.updateBinary = updateBinary;
+    function createConditional(condition, questionTokenOrWhenTrue, whenTrueOrWhenFalse, colonToken, whenFalse) {
+        var node = createSynthesizedNode(205 /* ConditionalExpression */);
+        node.condition = ts.parenthesizeForConditionalHead(condition);
+        node.questionToken = whenFalse ? questionTokenOrWhenTrue : createToken(56 /* QuestionToken */);
+        node.whenTrue = ts.parenthesizeSubexpressionOfConditionalExpression(whenFalse ? whenTrueOrWhenFalse : questionTokenOrWhenTrue);
+        node.colonToken = whenFalse ? colonToken : createToken(57 /* ColonToken */);
+        node.whenFalse = ts.parenthesizeSubexpressionOfConditionalExpression(whenFalse ? whenFalse : whenTrueOrWhenFalse);
+        return node;
+    }
+    ts.createConditional = createConditional;
+    function updateConditional(node, condition, questionToken, whenTrue, colonToken, whenFalse) {
+        return node.condition !== condition
+            || node.questionToken !== questionToken
+            || node.whenTrue !== whenTrue
+            || node.colonToken !== colonToken
+            || node.whenFalse !== whenFalse
+            ? updateNode(createConditional(condition, questionToken, whenTrue, colonToken, whenFalse), node)
+            : node;
+    }
+    ts.updateConditional = updateConditional;
+    function createTemplateExpression(head, templateSpans) {
+        var node = createSynthesizedNode(206 /* TemplateExpression */);
+        node.head = head;
+        node.templateSpans = createNodeArray(templateSpans);
+        return node;
+    }
+    ts.createTemplateExpression = createTemplateExpression;
+    function updateTemplateExpression(node, head, templateSpans) {
+        return node.head !== head
+            || node.templateSpans !== templateSpans
+            ? updateNode(createTemplateExpression(head, templateSpans), node)
+            : node;
+    }
+    ts.updateTemplateExpression = updateTemplateExpression;
+    function createTemplateHead(text) {
+        var node = createSynthesizedNode(15 /* TemplateHead */);
+        node.text = text;
+        return node;
+    }
+    ts.createTemplateHead = createTemplateHead;
+    function createTemplateMiddle(text) {
+        var node = createSynthesizedNode(16 /* TemplateMiddle */);
+        node.text = text;
+        return node;
+    }
+    ts.createTemplateMiddle = createTemplateMiddle;
+    function createTemplateTail(text) {
+        var node = createSynthesizedNode(17 /* TemplateTail */);
+        node.text = text;
+        return node;
+    }
+    ts.createTemplateTail = createTemplateTail;
+    function createNoSubstitutionTemplateLiteral(text) {
+        var node = createSynthesizedNode(14 /* NoSubstitutionTemplateLiteral */);
+        node.text = text;
+        return node;
+    }
+    ts.createNoSubstitutionTemplateLiteral = createNoSubstitutionTemplateLiteral;
+    function createYield(asteriskTokenOrExpression, expression) {
+        var node = createSynthesizedNode(207 /* YieldExpression */);
+        node.asteriskToken = asteriskTokenOrExpression && asteriskTokenOrExpression.kind === 40 /* AsteriskToken */ ? asteriskTokenOrExpression : undefined;
+        node.expression = asteriskTokenOrExpression && asteriskTokenOrExpression.kind !== 40 /* AsteriskToken */ ? asteriskTokenOrExpression : expression;
+        return node;
+    }
+    ts.createYield = createYield;
+    function updateYield(node, asteriskToken, expression) {
+        return node.expression !== expression
+            || node.asteriskToken !== asteriskToken
+            ? updateNode(createYield(asteriskToken, expression), node)
+            : node;
+    }
+    ts.updateYield = updateYield;
+    function createSpread(expression) {
+        var node = createSynthesizedNode(208 /* SpreadElement */);
+        node.expression = ts.parenthesizeExpressionForList(expression);
+        return node;
+    }
+    ts.createSpread = createSpread;
+    function updateSpread(node, expression) {
+        return node.expression !== expression
+            ? updateNode(createSpread(expression), node)
+            : node;
+    }
+    ts.updateSpread = updateSpread;
+    function createClassExpression(modifiers, name, typeParameters, heritageClauses, members) {
+        var node = createSynthesizedNode(209 /* ClassExpression */);
+        node.decorators = undefined;
+        node.modifiers = asNodeArray(modifiers);
+        node.name = asName(name);
+        node.typeParameters = asNodeArray(typeParameters);
+        node.heritageClauses = asNodeArray(heritageClauses);
+        node.members = createNodeArray(members);
+        return node;
+    }
+    ts.createClassExpression = createClassExpression;
+    function updateClassExpression(node, modifiers, name, typeParameters, heritageClauses, members) {
+        return node.modifiers !== modifiers
+            || node.name !== name
+            || node.typeParameters !== typeParameters
+            || node.heritageClauses !== heritageClauses
+            || node.members !== members
+            ? updateNode(createClassExpression(modifiers, name, typeParameters, heritageClauses, members), node)
+            : node;
+    }
+    ts.updateClassExpression = updateClassExpression;
+    function createOmittedExpression() {
+        return createSynthesizedNode(210 /* OmittedExpression */);
+    }
+    ts.createOmittedExpression = createOmittedExpression;
+    function createExpressionWithTypeArguments(typeArguments, expression) {
+        var node = createSynthesizedNode(211 /* ExpressionWithTypeArguments */);
+        node.expression = ts.parenthesizeForAccess(expression);
+        node.typeArguments = asNodeArray(typeArguments);
+        return node;
+    }
+    ts.createExpressionWithTypeArguments = createExpressionWithTypeArguments;
+    function updateExpressionWithTypeArguments(node, typeArguments, expression) {
+        return node.typeArguments !== typeArguments
+            || node.expression !== expression
+            ? updateNode(createExpressionWithTypeArguments(typeArguments, expression), node)
+            : node;
+    }
+    ts.updateExpressionWithTypeArguments = updateExpressionWithTypeArguments;
+    function createAsExpression(expression, type) {
+        var node = createSynthesizedNode(212 /* AsExpression */);
+        node.expression = expression;
+        node.type = type;
+        return node;
+    }
+    ts.createAsExpression = createAsExpression;
+    function updateAsExpression(node, expression, type) {
+        return node.expression !== expression
+            || node.type !== type
+            ? updateNode(createAsExpression(expression, type), node)
+            : node;
+    }
+    ts.updateAsExpression = updateAsExpression;
+    function createNonNullExpression(expression) {
+        var node = createSynthesizedNode(213 /* NonNullExpression */);
+        node.expression = ts.parenthesizeForAccess(expression);
+        return node;
+    }
+    ts.createNonNullExpression = createNonNullExpression;
+    function updateNonNullExpression(node, expression) {
+        return node.expression !== expression
+            ? updateNode(createNonNullExpression(expression), node)
+            : node;
+    }
+    ts.updateNonNullExpression = updateNonNullExpression;
+    function createMetaProperty(keywordToken, name) {
+        var node = createSynthesizedNode(214 /* MetaProperty */);
+        node.keywordToken = keywordToken;
+        node.name = name;
+        return node;
+    }
+    ts.createMetaProperty = createMetaProperty;
+    function updateMetaProperty(node, name) {
+        return node.name !== name
+            ? updateNode(createMetaProperty(node.keywordToken, name), node)
+            : node;
+    }
+    ts.updateMetaProperty = updateMetaProperty;
+    // Misc
+    function createTemplateSpan(expression, literal) {
+        var node = createSynthesizedNode(216 /* TemplateSpan */);
+        node.expression = expression;
+        node.literal = literal;
+        return node;
+    }
+    ts.createTemplateSpan = createTemplateSpan;
+    function updateTemplateSpan(node, expression, literal) {
+        return node.expression !== expression
+            || node.literal !== literal
+            ? updateNode(createTemplateSpan(expression, literal), node)
+            : node;
+    }
+    ts.updateTemplateSpan = updateTemplateSpan;
+    function createSemicolonClassElement() {
+        return createSynthesizedNode(217 /* SemicolonClassElement */);
+    }
+    ts.createSemicolonClassElement = createSemicolonClassElement;
+    // Element
+    function createBlock(statements, multiLine) {
+        var block = createSynthesizedNode(218 /* Block */);
+        block.statements = createNodeArray(statements);
+        if (multiLine)
+            block.multiLine = multiLine;
+        return block;
+    }
+    ts.createBlock = createBlock;
+    function updateBlock(node, statements) {
+        return node.statements !== statements
+            ? updateNode(createBlock(statements, node.multiLine), node)
+            : node;
+    }
+    ts.updateBlock = updateBlock;
+    function createVariableStatement(modifiers, declarationList) {
+        var node = createSynthesizedNode(219 /* VariableStatement */);
+        node.decorators = undefined;
+        node.modifiers = asNodeArray(modifiers);
+        node.declarationList = ts.isArray(declarationList) ? createVariableDeclarationList(declarationList) : declarationList;
+        return node;
+    }
+    ts.createVariableStatement = createVariableStatement;
+    function updateVariableStatement(node, modifiers, declarationList) {
+        return node.modifiers !== modifiers
+            || node.declarationList !== declarationList
+            ? updateNode(createVariableStatement(modifiers, declarationList), node)
+            : node;
+    }
+    ts.updateVariableStatement = updateVariableStatement;
+    function createEmptyStatement() {
+        return createSynthesizedNode(220 /* EmptyStatement */);
+    }
+    ts.createEmptyStatement = createEmptyStatement;
+    function createExpressionStatement(expression) {
+        var node = createSynthesizedNode(221 /* ExpressionStatement */);
+        node.expression = ts.parenthesizeExpressionForExpressionStatement(expression);
+        return node;
+    }
+    ts.createExpressionStatement = createExpressionStatement;
+    function updateExpressionStatement(node, expression) {
+        return node.expression !== expression
+            ? updateNode(createExpressionStatement(expression), node)
+            : node;
+    }
+    ts.updateExpressionStatement = updateExpressionStatement;
+    /** @deprecated Use `createExpressionStatement` instead.  */
+    ts.createStatement = createExpressionStatement;
+    /** @deprecated Use `updateExpressionStatement` instead.  */
+    ts.updateStatement = updateExpressionStatement;
+    function createIf(expression, thenStatement, elseStatement) {
+        var node = createSynthesizedNode(222 /* IfStatement */);
+        node.expression = expression;
+        node.thenStatement = thenStatement;
+        node.elseStatement = elseStatement;
+        return node;
+    }
+    ts.createIf = createIf;
+    function updateIf(node, expression, thenStatement, elseStatement) {
+        return node.expression !== expression
+            || node.thenStatement !== thenStatement
+            || node.elseStatement !== elseStatement
+            ? updateNode(createIf(expression, thenStatement, elseStatement), node)
+            : node;
+    }
+    ts.updateIf = updateIf;
+    function createDo(statement, expression) {
+        var node = createSynthesizedNode(223 /* DoStatement */);
+        node.statement = statement;
+        node.expression = expression;
+        return node;
+    }
+    ts.createDo = createDo;
+    function updateDo(node, statement, expression) {
+        return node.statement !== statement
+            || node.expression !== expression
+            ? updateNode(createDo(statement, expression), node)
+            : node;
+    }
+    ts.updateDo = updateDo;
+    function createWhile(expression, statement) {
+        var node = createSynthesizedNode(224 /* WhileStatement */);
+        node.expression = expression;
+        node.statement = statement;
+        return node;
+    }
+    ts.createWhile = createWhile;
+    function updateWhile(node, expression, statement) {
+        return node.expression !== expression
+            || node.statement !== statement
+            ? updateNode(createWhile(expression, statement), node)
+            : node;
+    }
+    ts.updateWhile = updateWhile;
+    function createFor(initializer, condition, incrementor, statement) {
+        var node = createSynthesizedNode(225 /* ForStatement */);
+        node.initializer = initializer;
+        node.condition = condition;
+        node.incrementor = incrementor;
+        node.statement = statement;
+        return node;
+    }
+    ts.createFor = createFor;
+    function updateFor(node, initializer, condition, incrementor, statement) {
+        return node.initializer !== initializer
+            || node.condition !== condition
+            || node.incrementor !== incrementor
+            || node.statement !== statement
+            ? updateNode(createFor(initializer, condition, incrementor, statement), node)
+            : node;
+    }
+    ts.updateFor = updateFor;
+    function createForIn(initializer, expression, statement) {
+        var node = createSynthesizedNode(226 /* ForInStatement */);
+        node.initializer = initializer;
+        node.expression = expression;
+        node.statement = statement;
+        return node;
+    }
+    ts.createForIn = createForIn;
+    function updateForIn(node, initializer, expression, statement) {
+        return node.initializer !== initializer
+            || node.expression !== expression
+            || node.statement !== statement
+            ? updateNode(createForIn(initializer, expression, statement), node)
+            : node;
+    }
+    ts.updateForIn = updateForIn;
+    function createForOf(awaitModifier, initializer, expression, statement) {
+        var node = createSynthesizedNode(227 /* ForOfStatement */);
+        node.awaitModifier = awaitModifier;
+        node.initializer = initializer;
+        node.expression = expression;
+        node.statement = statement;
+        return node;
+    }
+    ts.createForOf = createForOf;
+    function updateForOf(node, awaitModifier, initializer, expression, statement) {
+        return node.awaitModifier !== awaitModifier
+            || node.initializer !== initializer
+            || node.expression !== expression
+            || node.statement !== statement
+            ? updateNode(createForOf(awaitModifier, initializer, expression, statement), node)
+            : node;
+    }
+    ts.updateForOf = updateForOf;
+    function createContinue(label) {
+        var node = createSynthesizedNode(228 /* ContinueStatement */);
+        node.label = asName(label);
+        return node;
+    }
+    ts.createContinue = createContinue;
+    function updateContinue(node, label) {
+        return node.label !== label
+            ? updateNode(createContinue(label), node)
+            : node;
+    }
+    ts.updateContinue = updateContinue;
+    function createBreak(label) {
+        var node = createSynthesizedNode(229 /* BreakStatement */);
+        node.label = asName(label);
+        return node;
+    }
+    ts.createBreak = createBreak;
+    function updateBreak(node, label) {
+        return node.label !== label
+            ? updateNode(createBreak(label), node)
+            : node;
+    }
+    ts.updateBreak = updateBreak;
+    function createReturn(expression) {
+        var node = createSynthesizedNode(230 /* ReturnStatement */);
+        node.expression = expression;
+        return node;
+    }
+    ts.createReturn = createReturn;
+    function updateReturn(node, expression) {
+        return node.expression !== expression
+            ? updateNode(createReturn(expression), node)
+            : node;
+    }
+    ts.updateReturn = updateReturn;
+    function createWith(expression, statement) {
+        var node = createSynthesizedNode(231 /* WithStatement */);
+        node.expression = expression;
+        node.statement = statement;
+        return node;
+    }
+    ts.createWith = createWith;
+    function updateWith(node, expression, statement) {
+        return node.expression !== expression
+            || node.statement !== statement
+            ? updateNode(createWith(expression, statement), node)
+            : node;
+    }
+    ts.updateWith = updateWith;
+    function createSwitch(expression, caseBlock) {
+        var node = createSynthesizedNode(232 /* SwitchStatement */);
+        node.expression = ts.parenthesizeExpressionForList(expression);
+        node.caseBlock = caseBlock;
+        return node;
+    }
+    ts.createSwitch = createSwitch;
+    function updateSwitch(node, expression, caseBlock) {
+        return node.expression !== expression
+            || node.caseBlock !== caseBlock
+            ? updateNode(createSwitch(expression, caseBlock), node)
+            : node;
+    }
+    ts.updateSwitch = updateSwitch;
+    function createLabel(label, statement) {
+        var node = createSynthesizedNode(233 /* LabeledStatement */);
+        node.label = asName(label);
+        node.statement = statement;
+        return node;
+    }
+    ts.createLabel = createLabel;
+    function updateLabel(node, label, statement) {
+        return node.label !== label
+            || node.statement !== statement
+            ? updateNode(createLabel(label, statement), node)
+            : node;
+    }
+    ts.updateLabel = updateLabel;
+    function createThrow(expression) {
+        var node = createSynthesizedNode(234 /* ThrowStatement */);
+        node.expression = expression;
+        return node;
+    }
+    ts.createThrow = createThrow;
+    function updateThrow(node, expression) {
+        return node.expression !== expression
+            ? updateNode(createThrow(expression), node)
+            : node;
+    }
+    ts.updateThrow = updateThrow;
+    function createTry(tryBlock, catchClause, finallyBlock) {
+        var node = createSynthesizedNode(235 /* TryStatement */);
+        node.tryBlock = tryBlock;
+        node.catchClause = catchClause;
+        node.finallyBlock = finallyBlock;
+        return node;
+    }
+    ts.createTry = createTry;
+    function updateTry(node, tryBlock, catchClause, finallyBlock) {
+        return node.tryBlock !== tryBlock
+            || node.catchClause !== catchClause
+            || node.finallyBlock !== finallyBlock
+            ? updateNode(createTry(tryBlock, catchClause, finallyBlock), node)
+            : node;
+    }
+    ts.updateTry = updateTry;
+    function createDebuggerStatement() {
+        return createSynthesizedNode(236 /* DebuggerStatement */);
+    }
+    ts.createDebuggerStatement = createDebuggerStatement;
+    function createVariableDeclaration(name, type, initializer) {
+        var node = createSynthesizedNode(237 /* VariableDeclaration */);
+        node.name = asName(name);
+        node.type = type;
+        node.initializer = initializer !== undefined ? ts.parenthesizeExpressionForList(initializer) : undefined;
+        return node;
+    }
+    ts.createVariableDeclaration = createVariableDeclaration;
+    function updateVariableDeclaration(node, name, type, initializer) {
+        return node.name !== name
+            || node.type !== type
+            || node.initializer !== initializer
+            ? updateNode(createVariableDeclaration(name, type, initializer), node)
+            : node;
+    }
+    ts.updateVariableDeclaration = updateVariableDeclaration;
+    function createVariableDeclarationList(declarations, flags) {
+        if (flags === void 0) { flags = 0 /* None */; }
+        var node = createSynthesizedNode(238 /* VariableDeclarationList */);
+        node.flags |= flags & 3 /* BlockScoped */;
+        node.declarations = createNodeArray(declarations);
+        return node;
+    }
+    ts.createVariableDeclarationList = createVariableDeclarationList;
+    function updateVariableDeclarationList(node, declarations) {
+        return node.declarations !== declarations
+            ? updateNode(createVariableDeclarationList(declarations, node.flags), node)
+            : node;
+    }
+    ts.updateVariableDeclarationList = updateVariableDeclarationList;
+    function createFunctionDeclaration(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body) {
+        var node = createSynthesizedNode(239 /* FunctionDeclaration */);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
+        node.asteriskToken = asteriskToken;
+        node.name = asName(name);
+        node.typeParameters = asNodeArray(typeParameters);
+        node.parameters = createNodeArray(parameters);
+        node.type = type;
+        node.body = body;
+        return node;
+    }
+    ts.createFunctionDeclaration = createFunctionDeclaration;
+    function updateFunctionDeclaration(node, decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body) {
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.asteriskToken !== asteriskToken
+            || node.name !== name
+            || node.typeParameters !== typeParameters
+            || node.parameters !== parameters
+            || node.type !== type
+            || node.body !== body
+            ? updateNode(createFunctionDeclaration(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body), node)
+            : node;
+    }
+    ts.updateFunctionDeclaration = updateFunctionDeclaration;
+    function createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) {
+        var node = createSynthesizedNode(240 /* ClassDeclaration */);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
+        node.name = asName(name);
+        node.typeParameters = asNodeArray(typeParameters);
+        node.heritageClauses = asNodeArray(heritageClauses);
+        node.members = createNodeArray(members);
+        return node;
+    }
+    ts.createClassDeclaration = createClassDeclaration;
+    function updateClassDeclaration(node, decorators, modifiers, name, typeParameters, heritageClauses, members) {
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.name !== name
+            || node.typeParameters !== typeParameters
+            || node.heritageClauses !== heritageClauses
+            || node.members !== members
+            ? updateNode(createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members), node)
+            : node;
+    }
+    ts.updateClassDeclaration = updateClassDeclaration;
+    function createInterfaceDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) {
+        var node = createSynthesizedNode(241 /* InterfaceDeclaration */);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
+        node.name = asName(name);
+        node.typeParameters = asNodeArray(typeParameters);
+        node.heritageClauses = asNodeArray(heritageClauses);
+        node.members = createNodeArray(members);
+        return node;
+    }
+    ts.createInterfaceDeclaration = createInterfaceDeclaration;
+    function updateInterfaceDeclaration(node, decorators, modifiers, name, typeParameters, heritageClauses, members) {
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.name !== name
+            || node.typeParameters !== typeParameters
+            || node.heritageClauses !== heritageClauses
+            || node.members !== members
+            ? updateNode(createInterfaceDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members), node)
+            : node;
+    }
+    ts.updateInterfaceDeclaration = updateInterfaceDeclaration;
+    function createTypeAliasDeclaration(decorators, modifiers, name, typeParameters, type) {
+        var node = createSynthesizedNode(242 /* TypeAliasDeclaration */);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
+        node.name = asName(name);
+        node.typeParameters = asNodeArray(typeParameters);
+        node.type = type;
+        return node;
+    }
+    ts.createTypeAliasDeclaration = createTypeAliasDeclaration;
+    function updateTypeAliasDeclaration(node, decorators, modifiers, name, typeParameters, type) {
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.name !== name
+            || node.typeParameters !== typeParameters
+            || node.type !== type
+            ? updateNode(createTypeAliasDeclaration(decorators, modifiers, name, typeParameters, type), node)
+            : node;
+    }
+    ts.updateTypeAliasDeclaration = updateTypeAliasDeclaration;
+    function createEnumDeclaration(decorators, modifiers, name, members) {
+        var node = createSynthesizedNode(243 /* EnumDeclaration */);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
+        node.name = asName(name);
+        node.members = createNodeArray(members);
+        return node;
+    }
+    ts.createEnumDeclaration = createEnumDeclaration;
+    function updateEnumDeclaration(node, decorators, modifiers, name, members) {
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.name !== name
+            || node.members !== members
+            ? updateNode(createEnumDeclaration(decorators, modifiers, name, members), node)
+            : node;
+    }
+    ts.updateEnumDeclaration = updateEnumDeclaration;
+    function createModuleDeclaration(decorators, modifiers, name, body, flags) {
+        if (flags === void 0) { flags = 0 /* None */; }
+        var node = createSynthesizedNode(244 /* ModuleDeclaration */);
+        node.flags |= flags & (16 /* Namespace */ | 4 /* NestedNamespace */ | 512 /* GlobalAugmentation */);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
+        node.name = name;
+        node.body = body;
+        return node;
+    }
+    ts.createModuleDeclaration = createModuleDeclaration;
+    function updateModuleDeclaration(node, decorators, modifiers, name, body) {
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.name !== name
+            || node.body !== body
+            ? updateNode(createModuleDeclaration(decorators, modifiers, name, body, node.flags), node)
+            : node;
+    }
+    ts.updateModuleDeclaration = updateModuleDeclaration;
+    function createModuleBlock(statements) {
+        var node = createSynthesizedNode(245 /* ModuleBlock */);
+        node.statements = createNodeArray(statements);
+        return node;
+    }
+    ts.createModuleBlock = createModuleBlock;
+    function updateModuleBlock(node, statements) {
+        return node.statements !== statements
+            ? updateNode(createModuleBlock(statements), node)
+            : node;
+    }
+    ts.updateModuleBlock = updateModuleBlock;
+    function createCaseBlock(clauses) {
+        var node = createSynthesizedNode(246 /* CaseBlock */);
+        node.clauses = createNodeArray(clauses);
+        return node;
+    }
+    ts.createCaseBlock = createCaseBlock;
+    function updateCaseBlock(node, clauses) {
+        return node.clauses !== clauses
+            ? updateNode(createCaseBlock(clauses), node)
+            : node;
+    }
+    ts.updateCaseBlock = updateCaseBlock;
+    function createNamespaceExportDeclaration(name) {
+        var node = createSynthesizedNode(247 /* NamespaceExportDeclaration */);
+        node.name = asName(name);
+        return node;
+    }
+    ts.createNamespaceExportDeclaration = createNamespaceExportDeclaration;
+    function updateNamespaceExportDeclaration(node, name) {
+        return node.name !== name
+            ? updateNode(createNamespaceExportDeclaration(name), node)
+            : node;
+    }
+    ts.updateNamespaceExportDeclaration = updateNamespaceExportDeclaration;
+    function createImportEqualsDeclaration(decorators, modifiers, name, moduleReference) {
+        var node = createSynthesizedNode(248 /* ImportEqualsDeclaration */);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
+        node.name = asName(name);
+        node.moduleReference = moduleReference;
+        return node;
+    }
+    ts.createImportEqualsDeclaration = createImportEqualsDeclaration;
+    function updateImportEqualsDeclaration(node, decorators, modifiers, name, moduleReference) {
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.name !== name
+            || node.moduleReference !== moduleReference
+            ? updateNode(createImportEqualsDeclaration(decorators, modifiers, name, moduleReference), node)
+            : node;
+    }
+    ts.updateImportEqualsDeclaration = updateImportEqualsDeclaration;
+    function createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier) {
+        var node = createSynthesizedNode(249 /* ImportDeclaration */);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
+        node.importClause = importClause;
+        node.moduleSpecifier = moduleSpecifier;
+        return node;
+    }
+    ts.createImportDeclaration = createImportDeclaration;
+    function updateImportDeclaration(node, decorators, modifiers, importClause, moduleSpecifier) {
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.importClause !== importClause
+            || node.moduleSpecifier !== moduleSpecifier
+            ? updateNode(createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier), node)
+            : node;
+    }
+    ts.updateImportDeclaration = updateImportDeclaration;
+    function createImportClause(name, namedBindings) {
+        var node = createSynthesizedNode(250 /* ImportClause */);
+        node.name = name;
+        node.namedBindings = namedBindings;
+        return node;
+    }
+    ts.createImportClause = createImportClause;
+    function updateImportClause(node, name, namedBindings) {
+        return node.name !== name
+            || node.namedBindings !== namedBindings
+            ? updateNode(createImportClause(name, namedBindings), node)
+            : node;
+    }
+    ts.updateImportClause = updateImportClause;
+    function createNamespaceImport(name) {
+        var node = createSynthesizedNode(251 /* NamespaceImport */);
+        node.name = name;
+        return node;
+    }
+    ts.createNamespaceImport = createNamespaceImport;
+    function updateNamespaceImport(node, name) {
+        return node.name !== name
+            ? updateNode(createNamespaceImport(name), node)
+            : node;
+    }
+    ts.updateNamespaceImport = updateNamespaceImport;
+    function createNamedImports(elements) {
+        var node = createSynthesizedNode(252 /* NamedImports */);
+        node.elements = createNodeArray(elements);
+        return node;
+    }
+    ts.createNamedImports = createNamedImports;
+    function updateNamedImports(node, elements) {
+        return node.elements !== elements
+            ? updateNode(createNamedImports(elements), node)
+            : node;
+    }
+    ts.updateNamedImports = updateNamedImports;
+    function createImportSpecifier(propertyName, name) {
+        var node = createSynthesizedNode(253 /* ImportSpecifier */);
+        node.propertyName = propertyName;
+        node.name = name;
+        return node;
+    }
+    ts.createImportSpecifier = createImportSpecifier;
+    function updateImportSpecifier(node, propertyName, name) {
+        return node.propertyName !== propertyName
+            || node.name !== name
+            ? updateNode(createImportSpecifier(propertyName, name), node)
+            : node;
+    }
+    ts.updateImportSpecifier = updateImportSpecifier;
+    function createExportAssignment(decorators, modifiers, isExportEquals, expression) {
+        var node = createSynthesizedNode(254 /* ExportAssignment */);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
+        node.isExportEquals = isExportEquals;
+        node.expression = isExportEquals ? ts.parenthesizeBinaryOperand(59 /* EqualsToken */, expression, /*isLeftSideOfBinary*/ false, /*leftOperand*/ undefined) : ts.parenthesizeDefaultExpression(expression);
+        return node;
+    }
+    ts.createExportAssignment = createExportAssignment;
+    function updateExportAssignment(node, decorators, modifiers, expression) {
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.expression !== expression
+            ? updateNode(createExportAssignment(decorators, modifiers, node.isExportEquals, expression), node)
+            : node;
+    }
+    ts.updateExportAssignment = updateExportAssignment;
+    function createExportDeclaration(decorators, modifiers, exportClause, moduleSpecifier) {
+        var node = createSynthesizedNode(255 /* ExportDeclaration */);
+        node.decorators = asNodeArray(decorators);
+        node.modifiers = asNodeArray(modifiers);
+        node.exportClause = exportClause;
+        node.moduleSpecifier = moduleSpecifier;
+        return node;
+    }
+    ts.createExportDeclaration = createExportDeclaration;
+    function updateExportDeclaration(node, decorators, modifiers, exportClause, moduleSpecifier) {
+        return node.decorators !== decorators
+            || node.modifiers !== modifiers
+            || node.exportClause !== exportClause
+            || node.moduleSpecifier !== moduleSpecifier
+            ? updateNode(createExportDeclaration(decorators, modifiers, exportClause, moduleSpecifier), node)
+            : node;
+    }
+    ts.updateExportDeclaration = updateExportDeclaration;
+    function createNamedExports(elements) {
+        var node = createSynthesizedNode(256 /* NamedExports */);
+        node.elements = createNodeArray(elements);
+        return node;
+    }
+    ts.createNamedExports = createNamedExports;
+    function updateNamedExports(node, elements) {
+        return node.elements !== elements
+            ? updateNode(createNamedExports(elements), node)
+            : node;
+    }
+    ts.updateNamedExports = updateNamedExports;
+    function createExportSpecifier(propertyName, name) {
+        var node = createSynthesizedNode(257 /* ExportSpecifier */);
+        node.propertyName = asName(propertyName);
+        node.name = asName(name);
+        return node;
+    }
+    ts.createExportSpecifier = createExportSpecifier;
+    function updateExportSpecifier(node, propertyName, name) {
+        return node.propertyName !== propertyName
+            || node.name !== name
+            ? updateNode(createExportSpecifier(propertyName, name), node)
+            : node;
+    }
+    ts.updateExportSpecifier = updateExportSpecifier;
+    // Module references
+    function createExternalModuleReference(expression) {
+        var node = createSynthesizedNode(259 /* ExternalModuleReference */);
+        node.expression = expression;
+        return node;
+    }
+    ts.createExternalModuleReference = createExternalModuleReference;
+    function updateExternalModuleReference(node, expression) {
+        return node.expression !== expression
+            ? updateNode(createExternalModuleReference(expression), node)
+            : node;
+    }
+    ts.updateExternalModuleReference = updateExternalModuleReference;
+    // JSDoc
+    /* @internal */
+    function createJSDocTypeExpression(type) {
+        var node = createSynthesizedNode(283 /* JSDocTypeExpression */);
+        node.type = type;
+        return node;
+    }
+    ts.createJSDocTypeExpression = createJSDocTypeExpression;
+    /* @internal */
+    function createJSDocTypeTag(typeExpression, comment) {
+        var tag = createJSDocTag(302 /* JSDocTypeTag */, "type");
+        tag.typeExpression = typeExpression;
+        tag.comment = comment;
+        return tag;
+    }
+    ts.createJSDocTypeTag = createJSDocTypeTag;
+    /* @internal */
+    function createJSDocReturnTag(typeExpression, comment) {
+        var tag = createJSDocTag(300 /* JSDocReturnTag */, "returns");
+        tag.typeExpression = typeExpression;
+        tag.comment = comment;
+        return tag;
+    }
+    ts.createJSDocReturnTag = createJSDocReturnTag;
+    /* @internal */
+    function createJSDocParamTag(name, isBracketed, typeExpression, comment) {
+        var tag = createJSDocTag(299 /* JSDocParameterTag */, "param");
+        tag.typeExpression = typeExpression;
+        tag.name = name;
+        tag.isBracketed = isBracketed;
+        tag.comment = comment;
+        return tag;
+    }
+    ts.createJSDocParamTag = createJSDocParamTag;
+    /* @internal */
+    function createJSDocComment(comment, tags) {
+        var node = createSynthesizedNode(291 /* JSDocComment */);
+        node.comment = comment;
+        node.tags = tags;
+        return node;
+    }
+    ts.createJSDocComment = createJSDocComment;
+    /* @internal */
+    function createJSDocTag(kind, tagName) {
+        var node = createSynthesizedNode(kind);
+        node.tagName = createIdentifier(tagName);
+        return node;
+    }
+    // JSX
+    function createJsxElement(openingElement, children, closingElement) {
+        var node = createSynthesizedNode(260 /* JsxElement */);
+        node.openingElement = openingElement;
+        node.children = createNodeArray(children);
+        node.closingElement = closingElement;
+        return node;
+    }
+    ts.createJsxElement = createJsxElement;
+    function updateJsxElement(node, openingElement, children, closingElement) {
+        return node.openingElement !== openingElement
+            || node.children !== children
+            || node.closingElement !== closingElement
+            ? updateNode(createJsxElement(openingElement, children, closingElement), node)
+            : node;
+    }
+    ts.updateJsxElement = updateJsxElement;
+    function createJsxSelfClosingElement(tagName, typeArguments, attributes) {
+        var node = createSynthesizedNode(261 /* JsxSelfClosingElement */);
+        node.tagName = tagName;
+        node.typeArguments = asNodeArray(typeArguments);
+        node.attributes = attributes;
+        return node;
+    }
+    ts.createJsxSelfClosingElement = createJsxSelfClosingElement;
+    function updateJsxSelfClosingElement(node, tagName, typeArguments, attributes) {
+        return node.tagName !== tagName
+            || node.typeArguments !== typeArguments
+            || node.attributes !== attributes
+            ? updateNode(createJsxSelfClosingElement(tagName, typeArguments, attributes), node)
+            : node;
+    }
+    ts.updateJsxSelfClosingElement = updateJsxSelfClosingElement;
+    function createJsxOpeningElement(tagName, typeArguments, attributes) {
+        var node = createSynthesizedNode(262 /* JsxOpeningElement */);
+        node.tagName = tagName;
+        node.typeArguments = asNodeArray(typeArguments);
+        node.attributes = attributes;
+        return node;
+    }
+    ts.createJsxOpeningElement = createJsxOpeningElement;
+    function updateJsxOpeningElement(node, tagName, typeArguments, attributes) {
+        return node.tagName !== tagName
+            || node.typeArguments !== typeArguments
+            || node.attributes !== attributes
+            ? updateNode(createJsxOpeningElement(tagName, typeArguments, attributes), node)
+            : node;
+    }
+    ts.updateJsxOpeningElement = updateJsxOpeningElement;
+    function createJsxClosingElement(tagName) {
+        var node = createSynthesizedNode(263 /* JsxClosingElement */);
+        node.tagName = tagName;
+        return node;
+    }
+    ts.createJsxClosingElement = createJsxClosingElement;
+    function updateJsxClosingElement(node, tagName) {
+        return node.tagName !== tagName
+            ? updateNode(createJsxClosingElement(tagName), node)
+            : node;
+    }
+    ts.updateJsxClosingElement = updateJsxClosingElement;
+    function createJsxFragment(openingFragment, children, closingFragment) {
+        var node = createSynthesizedNode(264 /* JsxFragment */);
+        node.openingFragment = openingFragment;
+        node.children = createNodeArray(children);
+        node.closingFragment = closingFragment;
+        return node;
+    }
+    ts.createJsxFragment = createJsxFragment;
+    function updateJsxFragment(node, openingFragment, children, closingFragment) {
+        return node.openingFragment !== openingFragment
+            || node.children !== children
+            || node.closingFragment !== closingFragment
+            ? updateNode(createJsxFragment(openingFragment, children, closingFragment), node)
+            : node;
+    }
+    ts.updateJsxFragment = updateJsxFragment;
+    function createJsxAttribute(name, initializer) {
+        var node = createSynthesizedNode(267 /* JsxAttribute */);
+        node.name = name;
+        node.initializer = initializer;
+        return node;
+    }
+    ts.createJsxAttribute = createJsxAttribute;
+    function updateJsxAttribute(node, name, initializer) {
+        return node.name !== name
+            || node.initializer !== initializer
+            ? updateNode(createJsxAttribute(name, initializer), node)
+            : node;
+    }
+    ts.updateJsxAttribute = updateJsxAttribute;
+    function createJsxAttributes(properties) {
+        var node = createSynthesizedNode(268 /* JsxAttributes */);
+        node.properties = createNodeArray(properties);
+        return node;
+    }
+    ts.createJsxAttributes = createJsxAttributes;
+    function updateJsxAttributes(node, properties) {
+        return node.properties !== properties
+            ? updateNode(createJsxAttributes(properties), node)
+            : node;
+    }
+    ts.updateJsxAttributes = updateJsxAttributes;
+    function createJsxSpreadAttribute(expression) {
+        var node = createSynthesizedNode(269 /* JsxSpreadAttribute */);
+        node.expression = expression;
+        return node;
+    }
+    ts.createJsxSpreadAttribute = createJsxSpreadAttribute;
+    function updateJsxSpreadAttribute(node, expression) {
+        return node.expression !== expression
+            ? updateNode(createJsxSpreadAttribute(expression), node)
+            : node;
+    }
+    ts.updateJsxSpreadAttribute = updateJsxSpreadAttribute;
+    function createJsxExpression(dotDotDotToken, expression) {
+        var node = createSynthesizedNode(270 /* JsxExpression */);
+        node.dotDotDotToken = dotDotDotToken;
+        node.expression = expression;
+        return node;
+    }
+    ts.createJsxExpression = createJsxExpression;
+    function updateJsxExpression(node, expression) {
+        return node.expression !== expression
+            ? updateNode(createJsxExpression(node.dotDotDotToken, expression), node)
+            : node;
+    }
+    ts.updateJsxExpression = updateJsxExpression;
+    // Clauses
+    function createCaseClause(expression, statements) {
+        var node = createSynthesizedNode(271 /* CaseClause */);
+        node.expression = ts.parenthesizeExpressionForList(expression);
+        node.statements = createNodeArray(statements);
+        return node;
+    }
+    ts.createCaseClause = createCaseClause;
+    function updateCaseClause(node, expression, statements) {
+        return node.expression !== expression
+            || node.statements !== statements
+            ? updateNode(createCaseClause(expression, statements), node)
+            : node;
+    }
+    ts.updateCaseClause = updateCaseClause;
+    function createDefaultClause(statements) {
+        var node = createSynthesizedNode(272 /* DefaultClause */);
+        node.statements = createNodeArray(statements);
+        return node;
+    }
+    ts.createDefaultClause = createDefaultClause;
+    function updateDefaultClause(node, statements) {
+        return node.statements !== statements
+            ? updateNode(createDefaultClause(statements), node)
+            : node;
+    }
+    ts.updateDefaultClause = updateDefaultClause;
+    function createHeritageClause(token, types) {
+        var node = createSynthesizedNode(273 /* HeritageClause */);
+        node.token = token;
+        node.types = createNodeArray(types);
+        return node;
+    }
+    ts.createHeritageClause = createHeritageClause;
+    function updateHeritageClause(node, types) {
+        return node.types !== types
+            ? updateNode(createHeritageClause(node.token, types), node)
+            : node;
+    }
+    ts.updateHeritageClause = updateHeritageClause;
+    function createCatchClause(variableDeclaration, block) {
+        var node = createSynthesizedNode(274 /* CatchClause */);
+        node.variableDeclaration = ts.isString(variableDeclaration) ? createVariableDeclaration(variableDeclaration) : variableDeclaration;
+        node.block = block;
+        return node;
+    }
+    ts.createCatchClause = createCatchClause;
+    function updateCatchClause(node, variableDeclaration, block) {
+        return node.variableDeclaration !== variableDeclaration
+            || node.block !== block
+            ? updateNode(createCatchClause(variableDeclaration, block), node)
+            : node;
+    }
+    ts.updateCatchClause = updateCatchClause;
+    // Property assignments
+    function createPropertyAssignment(name, initializer) {
+        var node = createSynthesizedNode(275 /* PropertyAssignment */);
+        node.name = asName(name);
+        node.questionToken = undefined;
+        node.initializer = ts.parenthesizeExpressionForList(initializer);
+        return node;
+    }
+    ts.createPropertyAssignment = createPropertyAssignment;
+    function updatePropertyAssignment(node, name, initializer) {
+        return node.name !== name
+            || node.initializer !== initializer
+            ? updateNode(createPropertyAssignment(name, initializer), node)
+            : node;
+    }
+    ts.updatePropertyAssignment = updatePropertyAssignment;
+    function createShorthandPropertyAssignment(name, objectAssignmentInitializer) {
+        var node = createSynthesizedNode(276 /* ShorthandPropertyAssignment */);
+        node.name = asName(name);
+        node.objectAssignmentInitializer = objectAssignmentInitializer !== undefined ? ts.parenthesizeExpressionForList(objectAssignmentInitializer) : undefined;
+        return node;
+    }
+    ts.createShorthandPropertyAssignment = createShorthandPropertyAssignment;
+    function updateShorthandPropertyAssignment(node, name, objectAssignmentInitializer) {
+        return node.name !== name
+            || node.objectAssignmentInitializer !== objectAssignmentInitializer
+            ? updateNode(createShorthandPropertyAssignment(name, objectAssignmentInitializer), node)
+            : node;
+    }
+    ts.updateShorthandPropertyAssignment = updateShorthandPropertyAssignment;
+    function createSpreadAssignment(expression) {
+        var node = createSynthesizedNode(277 /* SpreadAssignment */);
+        node.expression = expression !== undefined ? ts.parenthesizeExpressionForList(expression) : undefined; // TODO: GH#18217
+        return node;
+    }
+    ts.createSpreadAssignment = createSpreadAssignment;
+    function updateSpreadAssignment(node, expression) {
+        return node.expression !== expression
+            ? updateNode(createSpreadAssignment(expression), node)
+            : node;
+    }
+    ts.updateSpreadAssignment = updateSpreadAssignment;
+    // Enum
+    function createEnumMember(name, initializer) {
+        var node = createSynthesizedNode(278 /* EnumMember */);
+        node.name = asName(name);
+        node.initializer = initializer && ts.parenthesizeExpressionForList(initializer);
+        return node;
+    }
+    ts.createEnumMember = createEnumMember;
+    function updateEnumMember(node, name, initializer) {
+        return node.name !== name
+            || node.initializer !== initializer
+            ? updateNode(createEnumMember(name, initializer), node)
+            : node;
+    }
+    ts.updateEnumMember = updateEnumMember;
+    // Top-level nodes
+    function updateSourceFileNode(node, statements, isDeclarationFile, referencedFiles, typeReferences, hasNoDefaultLib, libReferences) {
+        if (node.statements !== statements ||
+            (isDeclarationFile !== undefined && node.isDeclarationFile !== isDeclarationFile) ||
+            (referencedFiles !== undefined && node.referencedFiles !== referencedFiles) ||
+            (typeReferences !== undefined && node.typeReferenceDirectives !== typeReferences) ||
+            (libReferences !== undefined && node.libReferenceDirectives !== libReferences) ||
+            (hasNoDefaultLib !== undefined && node.hasNoDefaultLib !== hasNoDefaultLib)) {
+            var updated = createSynthesizedNode(279 /* SourceFile */);
+            updated.flags |= node.flags;
+            updated.statements = createNodeArray(statements);
+            updated.endOfFileToken = node.endOfFileToken;
+            updated.fileName = node.fileName;
+            updated.path = node.path;
+            updated.text = node.text;
+            updated.isDeclarationFile = isDeclarationFile === undefined ? node.isDeclarationFile : isDeclarationFile;
+            updated.referencedFiles = referencedFiles === undefined ? node.referencedFiles : referencedFiles;
+            updated.typeReferenceDirectives = typeReferences === undefined ? node.typeReferenceDirectives : typeReferences;
+            updated.hasNoDefaultLib = hasNoDefaultLib === undefined ? node.hasNoDefaultLib : hasNoDefaultLib;
+            updated.libReferenceDirectives = libReferences === undefined ? node.libReferenceDirectives : libReferences;
+            if (node.amdDependencies !== undefined)
+                updated.amdDependencies = node.amdDependencies;
+            if (node.moduleName !== undefined)
+                updated.moduleName = node.moduleName;
+            if (node.languageVariant !== undefined)
+                updated.languageVariant = node.languageVariant;
+            if (node.renamedDependencies !== undefined)
+                updated.renamedDependencies = node.renamedDependencies;
+            if (node.languageVersion !== undefined)
+                updated.languageVersion = node.languageVersion;
+            if (node.scriptKind !== undefined)
+                updated.scriptKind = node.scriptKind;
+            if (node.externalModuleIndicator !== undefined)
+                updated.externalModuleIndicator = node.externalModuleIndicator;
+            if (node.commonJsModuleIndicator !== undefined)
+                updated.commonJsModuleIndicator = node.commonJsModuleIndicator;
+            if (node.identifiers !== undefined)
+                updated.identifiers = node.identifiers;
+            if (node.nodeCount !== undefined)
+                updated.nodeCount = node.nodeCount;
+            if (node.identifierCount !== undefined)
+                updated.identifierCount = node.identifierCount;
+            if (node.symbolCount !== undefined)
+                updated.symbolCount = node.symbolCount;
+            if (node.parseDiagnostics !== undefined)
+                updated.parseDiagnostics = node.parseDiagnostics;
+            if (node.bindDiagnostics !== undefined)
+                updated.bindDiagnostics = node.bindDiagnostics;
+            if (node.bindSuggestionDiagnostics !== undefined)
+                updated.bindSuggestionDiagnostics = node.bindSuggestionDiagnostics;
+            if (node.lineMap !== undefined)
+                updated.lineMap = node.lineMap;
+            if (node.classifiableNames !== undefined)
+                updated.classifiableNames = node.classifiableNames;
+            if (node.resolvedModules !== undefined)
+                updated.resolvedModules = node.resolvedModules;
+            if (node.resolvedTypeReferenceDirectiveNames !== undefined)
+                updated.resolvedTypeReferenceDirectiveNames = node.resolvedTypeReferenceDirectiveNames;
+            if (node.imports !== undefined)
+                updated.imports = node.imports;
+            if (node.moduleAugmentations !== undefined)
+                updated.moduleAugmentations = node.moduleAugmentations;
+            if (node.pragmas !== undefined)
+                updated.pragmas = node.pragmas;
+            if (node.localJsxFactory !== undefined)
+                updated.localJsxFactory = node.localJsxFactory;
+            if (node.localJsxNamespace !== undefined)
+                updated.localJsxNamespace = node.localJsxNamespace;
+            return updateNode(updated, node);
+        }
+        return node;
+    }
+    ts.updateSourceFileNode = updateSourceFileNode;
+    /**
+     * Creates a shallow, memberwise clone of a node for mutation.
+     */
+    function getMutableClone(node) {
+        var clone = getSynthesizedClone(node);
+        clone.pos = node.pos;
+        clone.end = node.end;
+        clone.parent = node.parent;
+        return clone;
+    }
+    ts.getMutableClone = getMutableClone;
+    // Transformation nodes
+    /**
+     * Creates a synthetic statement to act as a placeholder for a not-emitted statement in
+     * order to preserve comments.
+     *
+     * @param original The original statement.
+     */
+    function createNotEmittedStatement(original) {
+        var node = createSynthesizedNode(307 /* NotEmittedStatement */);
+        node.original = original;
+        setTextRange(node, original);
+        return node;
+    }
+    ts.createNotEmittedStatement = createNotEmittedStatement;
+    /**
+     * Creates a synthetic element to act as a placeholder for the end of an emitted declaration in
+     * order to properly emit exports.
+     */
+    /* @internal */
+    function createEndOfDeclarationMarker(original) {
+        var node = createSynthesizedNode(311 /* EndOfDeclarationMarker */);
+        node.emitNode = {};
+        node.original = original;
+        return node;
+    }
+    ts.createEndOfDeclarationMarker = createEndOfDeclarationMarker;
+    /**
+     * Creates a synthetic element to act as a placeholder for the beginning of a merged declaration in
+     * order to properly emit exports.
+     */
+    /* @internal */
+    function createMergeDeclarationMarker(original) {
+        var node = createSynthesizedNode(310 /* MergeDeclarationMarker */);
+        node.emitNode = {};
+        node.original = original;
+        return node;
+    }
+    ts.createMergeDeclarationMarker = createMergeDeclarationMarker;
+    /**
+     * Creates a synthetic expression to act as a placeholder for a not-emitted expression in
+     * order to preserve comments or sourcemap positions.
+     *
+     * @param expression The inner expression to emit.
+     * @param original The original outer expression.
+     * @param location The location for the expression. Defaults to the positions from "original" if provided.
+     */
+    function createPartiallyEmittedExpression(expression, original) {
+        var node = createSynthesizedNode(308 /* PartiallyEmittedExpression */);
+        node.expression = expression;
+        node.original = original;
+        setTextRange(node, original);
+        return node;
+    }
+    ts.createPartiallyEmittedExpression = createPartiallyEmittedExpression;
+    function updatePartiallyEmittedExpression(node, expression) {
+        if (node.expression !== expression) {
+            return updateNode(createPartiallyEmittedExpression(expression, node.original), node);
+        }
+        return node;
+    }
+    ts.updatePartiallyEmittedExpression = updatePartiallyEmittedExpression;
+    function flattenCommaElements(node) {
+        if (ts.nodeIsSynthesized(node) && !ts.isParseTreeNode(node) && !node.original && !node.emitNode && !node.id) {
+            if (node.kind === 309 /* CommaListExpression */) {
+                return node.elements;
+            }
+            if (ts.isBinaryExpression(node) && node.operatorToken.kind === 27 /* CommaToken */) {
+                return [node.left, node.right];
+            }
+        }
+        return node;
+    }
+    function createCommaList(elements) {
+        var node = createSynthesizedNode(309 /* CommaListExpression */);
+        node.elements = createNodeArray(ts.sameFlatMap(elements, flattenCommaElements));
+        return node;
+    }
+    ts.createCommaList = createCommaList;
+    function updateCommaList(node, elements) {
+        return node.elements !== elements
+            ? updateNode(createCommaList(elements), node)
+            : node;
+    }
+    ts.updateCommaList = updateCommaList;
+    function createBundle(sourceFiles, prepends) {
+        if (prepends === void 0) { prepends = ts.emptyArray; }
+        var node = ts.createNode(280 /* Bundle */);
+        node.prepends = prepends;
+        node.sourceFiles = sourceFiles;
+        return node;
+    }
+    ts.createBundle = createBundle;
+    function createUnparsedSourceFile(textOrInputFiles, mapPathOrType, map) {
+        var node = ts.createNode(281 /* UnparsedSource */);
+        if (!ts.isString(textOrInputFiles)) {
+            ts.Debug.assert(mapPathOrType === "js" || mapPathOrType === "dts");
+            node.fileName = mapPathOrType === "js" ? textOrInputFiles.javascriptPath : textOrInputFiles.declarationPath;
+            node.sourceMapPath = mapPathOrType === "js" ? textOrInputFiles.javascriptMapPath : textOrInputFiles.declarationMapPath;
+            Object.defineProperties(node, {
+                text: { get: function () { return mapPathOrType === "js" ? textOrInputFiles.javascriptText : textOrInputFiles.declarationText; } },
+                sourceMapText: { get: function () { return mapPathOrType === "js" ? textOrInputFiles.javascriptMapText : textOrInputFiles.declarationMapText; } },
+            });
+        }
+        else {
+            node.text = textOrInputFiles;
+            node.sourceMapPath = mapPathOrType;
+            node.sourceMapText = map;
+        }
+        return node;
+    }
+    ts.createUnparsedSourceFile = createUnparsedSourceFile;
+    function createInputFiles(javascriptTextOrReadFileText, declarationTextOrJavascriptPath, javascriptMapPath, javascriptMapTextOrDeclarationPath, declarationMapPath, declarationMapText) {
+        var node = ts.createNode(282 /* InputFiles */);
+        if (!ts.isString(javascriptTextOrReadFileText)) {
+            var cache_1 = ts.createMap();
+            var textGetter_1 = function (path) {
+                if (path === undefined)
+                    return undefined;
+                var value = cache_1.get(path);
+                if (value === undefined) {
+                    value = javascriptTextOrReadFileText(path);
+                    cache_1.set(path, value !== undefined ? value : false);
+                }
+                return value !== false ? value : undefined;
+            };
+            var definedTextGetter_1 = function (path) {
+                var result = textGetter_1(path);
+                return result !== undefined ? result : "/* Input file " + path + " was missing */\r\n";
+            };
+            node.javascriptPath = declarationTextOrJavascriptPath;
+            node.javascriptMapPath = javascriptMapPath;
+            node.declarationPath = ts.Debug.assertDefined(javascriptMapTextOrDeclarationPath);
+            node.declarationMapPath = declarationMapPath;
+            Object.defineProperties(node, {
+                javascriptText: { get: function () { return definedTextGetter_1(declarationTextOrJavascriptPath); } },
+                javascriptMapText: { get: function () { return textGetter_1(javascriptMapPath); } },
+                declarationText: { get: function () { return definedTextGetter_1(ts.Debug.assertDefined(javascriptMapTextOrDeclarationPath)); } },
+                declarationMapText: { get: function () { return textGetter_1(declarationMapPath); } } // TODO:: if there is inline sourceMap in dtsFile, use that
+            });
+        }
+        else {
+            node.javascriptText = javascriptTextOrReadFileText;
+            node.javascriptMapPath = javascriptMapPath;
+            node.javascriptMapText = javascriptMapTextOrDeclarationPath;
+            node.declarationText = declarationTextOrJavascriptPath;
+            node.declarationMapPath = declarationMapPath;
+            node.declarationMapText = declarationMapText;
+        }
+        return node;
+    }
+    ts.createInputFiles = createInputFiles;
+    function updateBundle(node, sourceFiles, prepends) {
+        if (prepends === void 0) { prepends = ts.emptyArray; }
+        if (node.sourceFiles !== sourceFiles || node.prepends !== prepends) {
+            return createBundle(sourceFiles, prepends);
+        }
+        return node;
+    }
+    ts.updateBundle = updateBundle;
+    function createImmediatelyInvokedFunctionExpression(statements, param, paramValue) {
+        return createCall(createFunctionExpression(
+        /*modifiers*/ undefined, 
+        /*asteriskToken*/ undefined, 
+        /*name*/ undefined, 
+        /*typeParameters*/ undefined, 
+        /*parameters*/ param ? [param] : [], 
+        /*type*/ undefined, createBlock(statements, /*multiLine*/ true)), 
+        /*typeArguments*/ undefined, 
+        /*argumentsArray*/ paramValue ? [paramValue] : []);
+    }
+    ts.createImmediatelyInvokedFunctionExpression = createImmediatelyInvokedFunctionExpression;
+    function createImmediatelyInvokedArrowFunction(statements, param, paramValue) {
+        return createCall(createArrowFunction(
+        /*modifiers*/ undefined, 
+        /*typeParameters*/ undefined, 
+        /*parameters*/ param ? [param] : [], 
+        /*type*/ undefined, 
+        /*equalsGreaterThanToken*/ undefined, createBlock(statements, /*multiLine*/ true)), 
+        /*typeArguments*/ undefined, 
+        /*argumentsArray*/ paramValue ? [paramValue] : []);
+    }
+    ts.createImmediatelyInvokedArrowFunction = createImmediatelyInvokedArrowFunction;
+    function createComma(left, right) {
+        return createBinary(left, 27 /* CommaToken */, right);
+    }
+    ts.createComma = createComma;
+    function createLessThan(left, right) {
+        return createBinary(left, 28 /* LessThanToken */, right);
+    }
+    ts.createLessThan = createLessThan;
+    function createAssignment(left, right) {
+        return createBinary(left, 59 /* EqualsToken */, right);
+    }
+    ts.createAssignment = createAssignment;
+    function createStrictEquality(left, right) {
+        return createBinary(left, 35 /* EqualsEqualsEqualsToken */, right);
+    }
+    ts.createStrictEquality = createStrictEquality;
+    function createStrictInequality(left, right) {
+        return createBinary(left, 36 /* ExclamationEqualsEqualsToken */, right);
+    }
+    ts.createStrictInequality = createStrictInequality;
+    function createAdd(left, right) {
+        return createBinary(left, 38 /* PlusToken */, right);
+    }
+    ts.createAdd = createAdd;
+    function createSubtract(left, right) {
+        return createBinary(left, 39 /* MinusToken */, right);
+    }
+    ts.createSubtract = createSubtract;
+    function createPostfixIncrement(operand) {
+        return createPostfix(operand, 44 /* PlusPlusToken */);
+    }
+    ts.createPostfixIncrement = createPostfixIncrement;
+    function createLogicalAnd(left, right) {
+        return createBinary(left, 54 /* AmpersandAmpersandToken */, right);
+    }
+    ts.createLogicalAnd = createLogicalAnd;
+    function createLogicalOr(left, right) {
+        return createBinary(left, 55 /* BarBarToken */, right);
+    }
+    ts.createLogicalOr = createLogicalOr;
+    function createLogicalNot(operand) {
+        return createPrefix(52 /* ExclamationToken */, operand);
+    }
+    ts.createLogicalNot = createLogicalNot;
+    function createVoidZero() {
+        return createVoid(createLiteral(0));
+    }
+    ts.createVoidZero = createVoidZero;
+    function createExportDefault(expression) {
+        return createExportAssignment(/*decorators*/ undefined, /*modifiers*/ undefined, /*isExportEquals*/ false, expression);
+    }
+    ts.createExportDefault = createExportDefault;
+    function createExternalModuleExport(exportName) {
+        return createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, createNamedExports([createExportSpecifier(/*propertyName*/ undefined, exportName)]));
+    }
+    ts.createExternalModuleExport = createExternalModuleExport;
+    // Utilities
+    function asName(name) {
+        return ts.isString(name) ? createIdentifier(name) : name;
+    }
+    function asExpression(value) {
+        return ts.isString(value) || typeof value === "number" ? createLiteral(value) : value;
+    }
+    function asNodeArray(array) {
+        return array ? createNodeArray(array) : undefined;
+    }
+    function asToken(value) {
+        return typeof value === "number" ? createToken(value) : value;
+    }
+    /**
+     * Clears any EmitNode entries from parse-tree nodes.
+     * @param sourceFile A source file.
+     */
+    function disposeEmitNodes(sourceFile) {
+        // During transformation we may need to annotate a parse tree node with transient
+        // transformation properties. As parse tree nodes live longer than transformation
+        // nodes, we need to make sure we reclaim any memory allocated for custom ranges
+        // from these nodes to ensure we do not hold onto entire subtrees just for position
+        // information. We also need to reset these nodes to a pre-transformation state
+        // for incremental parsing scenarios so that we do not impact later emit.
+        sourceFile = ts.getSourceFileOfNode(ts.getParseTreeNode(sourceFile));
+        var emitNode = sourceFile && sourceFile.emitNode;
+        var annotatedNodes = emitNode && emitNode.annotatedNodes;
+        if (annotatedNodes) {
+            for (var _i = 0, annotatedNodes_1 = annotatedNodes; _i < annotatedNodes_1.length; _i++) {
+                var node = annotatedNodes_1[_i];
+                node.emitNode = undefined;
+            }
+        }
+    }
+    ts.disposeEmitNodes = disposeEmitNodes;
+    /**
+     * Associates a node with the current transformation, initializing
+     * various transient transformation properties.
+     */
+    /* @internal */
+    function getOrCreateEmitNode(node) {
+        if (!node.emitNode) {
+            if (ts.isParseTreeNode(node)) {
+                // To avoid holding onto transformation artifacts, we keep track of any
+                // parse tree node we are annotating. This allows us to clean them up after
+                // all transformations have completed.
+                if (node.kind === 279 /* SourceFile */) {
+                    return node.emitNode = { annotatedNodes: [node] };
+                }
+                var sourceFile = ts.getSourceFileOfNode(node);
+                getOrCreateEmitNode(sourceFile).annotatedNodes.push(node);
+            }
+            node.emitNode = {};
+        }
+        return node.emitNode;
+    }
+    ts.getOrCreateEmitNode = getOrCreateEmitNode;
+    function setTextRange(range, location) {
+        if (location) {
+            range.pos = location.pos;
+            range.end = location.end;
+        }
+        return range;
+    }
+    ts.setTextRange = setTextRange;
+    /**
+     * Sets flags that control emit behavior of a node.
+     */
+    function setEmitFlags(node, emitFlags) {
+        getOrCreateEmitNode(node).flags = emitFlags;
+        return node;
+    }
+    ts.setEmitFlags = setEmitFlags;
+    /**
+     * Sets flags that control emit behavior of a node.
+     */
+    /* @internal */
+    function addEmitFlags(node, emitFlags) {
+        var emitNode = getOrCreateEmitNode(node);
+        emitNode.flags = emitNode.flags | emitFlags;
+        return node;
+    }
+    ts.addEmitFlags = addEmitFlags;
+    /**
+     * Gets a custom text range to use when emitting source maps.
+     */
+    function getSourceMapRange(node) {
+        var emitNode = node.emitNode;
+        return (emitNode && emitNode.sourceMapRange) || node;
+    }
+    ts.getSourceMapRange = getSourceMapRange;
+    /**
+     * Sets a custom text range to use when emitting source maps.
+     */
+    function setSourceMapRange(node, range) {
+        getOrCreateEmitNode(node).sourceMapRange = range;
+        return node;
+    }
+    ts.setSourceMapRange = setSourceMapRange;
+    // tslint:disable-next-line variable-name
+    var SourceMapSource;
+    /**
+     * Create an external source map source file reference
+     */
+    function createSourceMapSource(fileName, text, skipTrivia) {
+        return new (SourceMapSource || (SourceMapSource = ts.objectAllocator.getSourceMapSourceConstructor()))(fileName, text, skipTrivia);
+    }
+    ts.createSourceMapSource = createSourceMapSource;
+    /**
+     * Gets the TextRange to use for source maps for a token of a node.
+     */
+    function getTokenSourceMapRange(node, token) {
+        var emitNode = node.emitNode;
+        var tokenSourceMapRanges = emitNode && emitNode.tokenSourceMapRanges;
+        return tokenSourceMapRanges && tokenSourceMapRanges[token];
+    }
+    ts.getTokenSourceMapRange = getTokenSourceMapRange;
+    /**
+     * Sets the TextRange to use for source maps for a token of a node.
+     */
+    function setTokenSourceMapRange(node, token, range) {
+        var emitNode = getOrCreateEmitNode(node);
+        var tokenSourceMapRanges = emitNode.tokenSourceMapRanges || (emitNode.tokenSourceMapRanges = []);
+        tokenSourceMapRanges[token] = range;
+        return node;
+    }
+    ts.setTokenSourceMapRange = setTokenSourceMapRange;
+    /**
+     * Gets a custom text range to use when emitting comments.
+     */
+    /*@internal*/
+    function getStartsOnNewLine(node) {
+        var emitNode = node.emitNode;
+        return emitNode && emitNode.startsOnNewLine;
+    }
+    ts.getStartsOnNewLine = getStartsOnNewLine;
+    /**
+     * Sets a custom text range to use when emitting comments.
+     */
+    /*@internal*/
+    function setStartsOnNewLine(node, newLine) {
+        getOrCreateEmitNode(node).startsOnNewLine = newLine;
+        return node;
+    }
+    ts.setStartsOnNewLine = setStartsOnNewLine;
+    /**
+     * Gets a custom text range to use when emitting comments.
+     */
+    function getCommentRange(node) {
+        var emitNode = node.emitNode;
+        return (emitNode && emitNode.commentRange) || node;
+    }
+    ts.getCommentRange = getCommentRange;
+    /**
+     * Sets a custom text range to use when emitting comments.
+     */
+    function setCommentRange(node, range) {
+        getOrCreateEmitNode(node).commentRange = range;
+        return node;
+    }
+    ts.setCommentRange = setCommentRange;
+    function getSyntheticLeadingComments(node) {
+        var emitNode = node.emitNode;
+        return emitNode && emitNode.leadingComments;
+    }
+    ts.getSyntheticLeadingComments = getSyntheticLeadingComments;
+    function setSyntheticLeadingComments(node, comments) {
+        getOrCreateEmitNode(node).leadingComments = comments;
+        return node;
+    }
+    ts.setSyntheticLeadingComments = setSyntheticLeadingComments;
+    function addSyntheticLeadingComment(node, kind, text, hasTrailingNewLine) {
+        return setSyntheticLeadingComments(node, ts.append(getSyntheticLeadingComments(node), { kind: kind, pos: -1, end: -1, hasTrailingNewLine: hasTrailingNewLine, text: text }));
+    }
+    ts.addSyntheticLeadingComment = addSyntheticLeadingComment;
+    function getSyntheticTrailingComments(node) {
+        var emitNode = node.emitNode;
+        return emitNode && emitNode.trailingComments;
+    }
+    ts.getSyntheticTrailingComments = getSyntheticTrailingComments;
+    function setSyntheticTrailingComments(node, comments) {
+        getOrCreateEmitNode(node).trailingComments = comments;
+        return node;
+    }
+    ts.setSyntheticTrailingComments = setSyntheticTrailingComments;
+    function addSyntheticTrailingComment(node, kind, text, hasTrailingNewLine) {
+        return setSyntheticTrailingComments(node, ts.append(getSyntheticTrailingComments(node), { kind: kind, pos: -1, end: -1, hasTrailingNewLine: hasTrailingNewLine, text: text }));
+    }
+    ts.addSyntheticTrailingComment = addSyntheticTrailingComment;
+    function moveSyntheticComments(node, original) {
+        setSyntheticLeadingComments(node, getSyntheticLeadingComments(original));
+        setSyntheticTrailingComments(node, getSyntheticTrailingComments(original));
+        var emit = getOrCreateEmitNode(original);
+        emit.leadingComments = undefined;
+        emit.trailingComments = undefined;
+        return node;
+    }
+    ts.moveSyntheticComments = moveSyntheticComments;
+    /**
+     * Gets the constant value to emit for an expression.
+     */
+    function getConstantValue(node) {
+        var emitNode = node.emitNode;
+        return emitNode && emitNode.constantValue;
+    }
+    ts.getConstantValue = getConstantValue;
+    /**
+     * Sets the constant value to emit for an expression.
+     */
+    function setConstantValue(node, value) {
+        var emitNode = getOrCreateEmitNode(node);
+        emitNode.constantValue = value;
+        return node;
+    }
+    ts.setConstantValue = setConstantValue;
+    /**
+     * Adds an EmitHelper to a node.
+     */
+    function addEmitHelper(node, helper) {
+        var emitNode = getOrCreateEmitNode(node);
+        emitNode.helpers = ts.append(emitNode.helpers, helper);
+        return node;
+    }
+    ts.addEmitHelper = addEmitHelper;
+    /**
+     * Add EmitHelpers to a node.
+     */
+    function addEmitHelpers(node, helpers) {
+        if (ts.some(helpers)) {
+            var emitNode = getOrCreateEmitNode(node);
+            for (var _i = 0, helpers_1 = helpers; _i < helpers_1.length; _i++) {
+                var helper = helpers_1[_i];
+                emitNode.helpers = ts.appendIfUnique(emitNode.helpers, helper);
+            }
+        }
+        return node;
+    }
+    ts.addEmitHelpers = addEmitHelpers;
+    /**
+     * Removes an EmitHelper from a node.
+     */
+    function removeEmitHelper(node, helper) {
+        var emitNode = node.emitNode;
+        if (emitNode) {
+            var helpers = emitNode.helpers;
+            if (helpers) {
+                return ts.orderedRemoveItem(helpers, helper);
+            }
+        }
+        return false;
+    }
+    ts.removeEmitHelper = removeEmitHelper;
+    /**
+     * Gets the EmitHelpers of a node.
+     */
+    function getEmitHelpers(node) {
+        var emitNode = node.emitNode;
+        return emitNode && emitNode.helpers;
+    }
+    ts.getEmitHelpers = getEmitHelpers;
+    /**
+     * Moves matching emit helpers from a source node to a target node.
+     */
+    function moveEmitHelpers(source, target, predicate) {
+        var sourceEmitNode = source.emitNode;
+        var sourceEmitHelpers = sourceEmitNode && sourceEmitNode.helpers;
+        if (!ts.some(sourceEmitHelpers))
+            return;
+        var targetEmitNode = getOrCreateEmitNode(target);
+        var helpersRemoved = 0;
+        for (var i = 0; i < sourceEmitHelpers.length; i++) {
+            var helper = sourceEmitHelpers[i];
+            if (predicate(helper)) {
+                helpersRemoved++;
+                targetEmitNode.helpers = ts.appendIfUnique(targetEmitNode.helpers, helper);
+            }
+            else if (helpersRemoved > 0) {
+                sourceEmitHelpers[i - helpersRemoved] = helper;
+            }
+        }
+        if (helpersRemoved > 0) {
+            sourceEmitHelpers.length -= helpersRemoved;
+        }
+    }
+    ts.moveEmitHelpers = moveEmitHelpers;
+    /* @internal */
+    function compareEmitHelpers(x, y) {
+        if (x === y)
+            return 0 /* EqualTo */;
+        if (x.priority === y.priority)
+            return 0 /* EqualTo */;
+        if (x.priority === undefined)
+            return 1 /* GreaterThan */;
+        if (y.priority === undefined)
+            return -1 /* LessThan */;
+        return ts.compareValues(x.priority, y.priority);
+    }
+    ts.compareEmitHelpers = compareEmitHelpers;
+    function setOriginalNode(node, original) {
+        node.original = original;
+        if (original) {
+            var emitNode = original.emitNode;
+            if (emitNode)
+                node.emitNode = mergeEmitNode(emitNode, node.emitNode);
+        }
+        return node;
+    }
+    ts.setOriginalNode = setOriginalNode;
+    function mergeEmitNode(sourceEmitNode, destEmitNode) {
+        var flags = sourceEmitNode.flags, leadingComments = sourceEmitNode.leadingComments, trailingComments = sourceEmitNode.trailingComments, commentRange = sourceEmitNode.commentRange, sourceMapRange = sourceEmitNode.sourceMapRange, tokenSourceMapRanges = sourceEmitNode.tokenSourceMapRanges, constantValue = sourceEmitNode.constantValue, helpers = sourceEmitNode.helpers, startsOnNewLine = sourceEmitNode.startsOnNewLine;
+        if (!destEmitNode)
+            destEmitNode = {};
+        // We are using `.slice()` here in case `destEmitNode.leadingComments` is pushed to later.
+        if (leadingComments)
+            destEmitNode.leadingComments = ts.addRange(leadingComments.slice(), destEmitNode.leadingComments);
+        if (trailingComments)
+            destEmitNode.trailingComments = ts.addRange(trailingComments.slice(), destEmitNode.trailingComments);
+        if (flags)
+            destEmitNode.flags = flags;
+        if (commentRange)
+            destEmitNode.commentRange = commentRange;
+        if (sourceMapRange)
+            destEmitNode.sourceMapRange = sourceMapRange;
+        if (tokenSourceMapRanges)
+            destEmitNode.tokenSourceMapRanges = mergeTokenSourceMapRanges(tokenSourceMapRanges, destEmitNode.tokenSourceMapRanges);
+        if (constantValue !== undefined)
+            destEmitNode.constantValue = constantValue;
+        if (helpers)
+            destEmitNode.helpers = ts.addRange(destEmitNode.helpers, helpers);
+        if (startsOnNewLine !== undefined)
+            destEmitNode.startsOnNewLine = startsOnNewLine;
+        return destEmitNode;
+    }
+    function mergeTokenSourceMapRanges(sourceRanges, destRanges) {
+        if (!destRanges)
+            destRanges = [];
+        for (var key in sourceRanges) {
+            destRanges[key] = sourceRanges[key];
+        }
+        return destRanges;
+    }
+})(ts || (ts = {}));
+/* @internal */
+(function (ts) {
+    ts.nullTransformationContext = {
+        enableEmitNotification: ts.noop,
+        enableSubstitution: ts.noop,
+        endLexicalEnvironment: function () { return undefined; },
+        getCompilerOptions: ts.notImplemented,
+        getEmitHost: ts.notImplemented,
+        getEmitResolver: ts.notImplemented,
+        hoistFunctionDeclaration: ts.noop,
+        hoistVariableDeclaration: ts.noop,
+        isEmitNotificationEnabled: ts.notImplemented,
+        isSubstitutionEnabled: ts.notImplemented,
+        onEmitNode: ts.noop,
+        onSubstituteNode: ts.notImplemented,
+        readEmitHelpers: ts.notImplemented,
+        requestEmitHelper: ts.noop,
+        resumeLexicalEnvironment: ts.noop,
+        startLexicalEnvironment: ts.noop,
+        suspendLexicalEnvironment: ts.noop,
+        addDiagnostic: ts.noop,
+    };
+    function createTypeCheck(value, tag) {
+        return tag === "undefined"
+            ? ts.createStrictEquality(value, ts.createVoidZero())
+            : ts.createStrictEquality(ts.createTypeOf(value), ts.createLiteral(tag));
+    }
+    ts.createTypeCheck = createTypeCheck;
+    function createMemberAccessForPropertyName(target, memberName, location) {
+        if (ts.isComputedPropertyName(memberName)) {
+            return ts.setTextRange(ts.createElementAccess(target, memberName.expression), location);
+        }
+        else {
+            var expression = ts.setTextRange(ts.isIdentifier(memberName)
+                ? ts.createPropertyAccess(target, memberName)
+                : ts.createElementAccess(target, memberName), memberName);
+            ts.getOrCreateEmitNode(expression).flags |= 64 /* NoNestedSourceMaps */;
+            return expression;
+        }
+    }
+    ts.createMemberAccessForPropertyName = createMemberAccessForPropertyName;
+    function createFunctionCall(func, thisArg, argumentsList, location) {
+        return ts.setTextRange(ts.createCall(ts.createPropertyAccess(func, "call"), 
+        /*typeArguments*/ undefined, [
+            thisArg
+        ].concat(argumentsList)), location);
+    }
+    ts.createFunctionCall = createFunctionCall;
+    function createFunctionApply(func, thisArg, argumentsExpression, location) {
+        return ts.setTextRange(ts.createCall(ts.createPropertyAccess(func, "apply"), 
+        /*typeArguments*/ undefined, [
+            thisArg,
+            argumentsExpression
+        ]), location);
+    }
+    ts.createFunctionApply = createFunctionApply;
+    function createArraySlice(array, start) {
+        var argumentsList = [];
+        if (start !== undefined) {
+            argumentsList.push(typeof start === "number" ? ts.createLiteral(start) : start);
+        }
+        return ts.createCall(ts.createPropertyAccess(array, "slice"), /*typeArguments*/ undefined, argumentsList);
+    }
+    ts.createArraySlice = createArraySlice;
+    function createArrayConcat(array, values) {
+        return ts.createCall(ts.createPropertyAccess(array, "concat"), 
+        /*typeArguments*/ undefined, values);
+    }
+    ts.createArrayConcat = createArrayConcat;
+    function createMathPow(left, right, location) {
+        return ts.setTextRange(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Math"), "pow"), 
+        /*typeArguments*/ undefined, [left, right]), location);
+    }
+    ts.createMathPow = createMathPow;
+    function createReactNamespace(reactNamespace, parent) {
+        // To ensure the emit resolver can properly resolve the namespace, we need to
+        // treat this identifier as if it were a source tree node by clearing the `Synthesized`
+        // flag and setting a parent node.
+        var react = ts.createIdentifier(reactNamespace || "React");
+        react.flags &= ~8 /* Synthesized */;
+        // Set the parent that is in parse tree
+        // this makes sure that parent chain is intact for checker to traverse complete scope tree
+        react.parent = ts.getParseTreeNode(parent);
+        return react;
+    }
+    function createJsxFactoryExpressionFromEntityName(jsxFactory, parent) {
+        if (ts.isQualifiedName(jsxFactory)) {
+            var left = createJsxFactoryExpressionFromEntityName(jsxFactory.left, parent);
+            var right = ts.createIdentifier(ts.idText(jsxFactory.right));
+            right.escapedText = jsxFactory.right.escapedText;
+            return ts.createPropertyAccess(left, right);
+        }
+        else {
+            return createReactNamespace(ts.idText(jsxFactory), parent);
+        }
+    }
+    function createJsxFactoryExpression(jsxFactoryEntity, reactNamespace, parent) {
+        return jsxFactoryEntity ?
+            createJsxFactoryExpressionFromEntityName(jsxFactoryEntity, parent) :
+            ts.createPropertyAccess(createReactNamespace(reactNamespace, parent), "createElement");
+    }
+    function createExpressionForJsxElement(jsxFactoryEntity, reactNamespace, tagName, props, children, parentElement, location) {
+        var argumentsList = [tagName];
+        if (props) {
+            argumentsList.push(props);
+        }
+        if (children && children.length > 0) {
+            if (!props) {
+                argumentsList.push(ts.createNull());
+            }
+            if (children.length > 1) {
+                for (var _i = 0, children_1 = children; _i < children_1.length; _i++) {
+                    var child = children_1[_i];
+                    startOnNewLine(child);
+                    argumentsList.push(child);
+                }
+            }
+            else {
+                argumentsList.push(children[0]);
+            }
+        }
+        return ts.setTextRange(ts.createCall(createJsxFactoryExpression(jsxFactoryEntity, reactNamespace, parentElement), 
+        /*typeArguments*/ undefined, argumentsList), location);
+    }
+    ts.createExpressionForJsxElement = createExpressionForJsxElement;
+    function createExpressionForJsxFragment(jsxFactoryEntity, reactNamespace, children, parentElement, location) {
+        var tagName = ts.createPropertyAccess(createReactNamespace(reactNamespace, parentElement), "Fragment");
+        var argumentsList = [tagName];
+        argumentsList.push(ts.createNull());
+        if (children && children.length > 0) {
+            if (children.length > 1) {
+                for (var _i = 0, children_2 = children; _i < children_2.length; _i++) {
+                    var child = children_2[_i];
+                    startOnNewLine(child);
+                    argumentsList.push(child);
+                }
+            }
+            else {
+                argumentsList.push(children[0]);
+            }
+        }
+        return ts.setTextRange(ts.createCall(createJsxFactoryExpression(jsxFactoryEntity, reactNamespace, parentElement), 
+        /*typeArguments*/ undefined, argumentsList), location);
+    }
+    ts.createExpressionForJsxFragment = createExpressionForJsxFragment;
+    // Helpers
+    function getHelperName(name) {
+        return ts.setEmitFlags(ts.createIdentifier(name), 4096 /* HelperName */ | 2 /* AdviseOnEmitNode */);
+    }
+    ts.getHelperName = getHelperName;
+    var valuesHelper = {
+        name: "typescript:values",
+        scoped: false,
+        text: "\n            var __values = (this && this.__values) || function (o) {\n                var m = typeof Symbol === \"function\" && o[Symbol.iterator], i = 0;\n                if (m) return m.call(o);\n                return {\n                    next: function () {\n                        if (o && i >= o.length) o = void 0;\n                        return { value: o && o[i++], done: !o };\n                    }\n                };\n            };"
+    };
+    function createValuesHelper(context, expression, location) {
+        context.requestEmitHelper(valuesHelper);
+        return ts.setTextRange(ts.createCall(getHelperName("__values"), 
+        /*typeArguments*/ undefined, [expression]), location);
+    }
+    ts.createValuesHelper = createValuesHelper;
+    var readHelper = {
+        name: "typescript:read",
+        scoped: false,
+        text: "\n            var __read = (this && this.__read) || function (o, n) {\n                var m = typeof Symbol === \"function\" && o[Symbol.iterator];\n                if (!m) return o;\n                var i = m.call(o), r, ar = [], e;\n                try {\n                    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);\n                }\n                catch (error) { e = { error: error }; }\n                finally {\n                    try {\n                        if (r && !r.done && (m = i[\"return\"])) m.call(i);\n                    }\n                    finally { if (e) throw e.error; }\n                }\n                return ar;\n            };"
+    };
+    function createReadHelper(context, iteratorRecord, count, location) {
+        context.requestEmitHelper(readHelper);
+        return ts.setTextRange(ts.createCall(getHelperName("__read"), 
+        /*typeArguments*/ undefined, count !== undefined
+            ? [iteratorRecord, ts.createLiteral(count)]
+            : [iteratorRecord]), location);
+    }
+    ts.createReadHelper = createReadHelper;
+    var spreadHelper = {
+        name: "typescript:spread",
+        scoped: false,
+        text: "\n            var __spread = (this && this.__spread) || function () {\n                for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));\n                return ar;\n            };"
+    };
+    function createSpreadHelper(context, argumentList, location) {
+        context.requestEmitHelper(readHelper);
+        context.requestEmitHelper(spreadHelper);
+        return ts.setTextRange(ts.createCall(getHelperName("__spread"), 
+        /*typeArguments*/ undefined, argumentList), location);
+    }
+    ts.createSpreadHelper = createSpreadHelper;
+    // Utilities
+    function createForOfBindingStatement(node, boundValue) {
+        if (ts.isVariableDeclarationList(node)) {
+            var firstDeclaration = ts.first(node.declarations);
+            var updatedDeclaration = ts.updateVariableDeclaration(firstDeclaration, firstDeclaration.name, 
+            /*typeNode*/ undefined, boundValue);
+            return ts.setTextRange(ts.createVariableStatement(
+            /*modifiers*/ undefined, ts.updateVariableDeclarationList(node, [updatedDeclaration])), 
+            /*location*/ node);
+        }
+        else {
+            var updatedExpression = ts.setTextRange(ts.createAssignment(node, boundValue), /*location*/ node);
+            return ts.setTextRange(ts.createStatement(updatedExpression), /*location*/ node);
+        }
+    }
+    ts.createForOfBindingStatement = createForOfBindingStatement;
+    function insertLeadingStatement(dest, source) {
+        if (ts.isBlock(dest)) {
+            return ts.updateBlock(dest, ts.setTextRange(ts.createNodeArray([source].concat(dest.statements)), dest.statements));
+        }
+        else {
+            return ts.createBlock(ts.createNodeArray([dest, source]), /*multiLine*/ true);
+        }
+    }
+    ts.insertLeadingStatement = insertLeadingStatement;
+    function restoreEnclosingLabel(node, outermostLabeledStatement, afterRestoreLabelCallback) {
+        if (!outermostLabeledStatement) {
+            return node;
+        }
+        var updated = ts.updateLabel(outermostLabeledStatement, outermostLabeledStatement.label, outermostLabeledStatement.statement.kind === 233 /* LabeledStatement */
+            ? restoreEnclosingLabel(node, outermostLabeledStatement.statement)
+            : node);
+        if (afterRestoreLabelCallback) {
+            afterRestoreLabelCallback(outermostLabeledStatement);
+        }
+        return updated;
+    }
+    ts.restoreEnclosingLabel = restoreEnclosingLabel;
+    function shouldBeCapturedInTempVariable(node, cacheIdentifiers) {
+        var target = ts.skipParentheses(node);
+        switch (target.kind) {
+            case 72 /* Identifier */:
+                return cacheIdentifiers;
+            case 100 /* ThisKeyword */:
+            case 8 /* NumericLiteral */:
+            case 9 /* BigIntLiteral */:
+            case 10 /* StringLiteral */:
+                return false;
+            case 187 /* ArrayLiteralExpression */:
+                var elements = target.elements;
+                if (elements.length === 0) {
+                    return false;
+                }
+                return true;
+            case 188 /* ObjectLiteralExpression */:
+                return target.properties.length > 0;
+            default:
+                return true;
+        }
+    }
+    function createCallBinding(expression, recordTempVariable, languageVersion, cacheIdentifiers) {
+        if (cacheIdentifiers === void 0) { cacheIdentifiers = false; }
+        var callee = skipOuterExpressions(expression, 7 /* All */);
+        var thisArg;
+        var target;
+        if (ts.isSuperProperty(callee)) {
+            thisArg = ts.createThis();
+            target = callee;
+        }
+        else if (callee.kind === 98 /* SuperKeyword */) {
+            thisArg = ts.createThis();
+            target = languageVersion < 2 /* ES2015 */
+                ? ts.setTextRange(ts.createIdentifier("_super"), callee)
+                : callee;
+        }
+        else if (ts.getEmitFlags(callee) & 4096 /* HelperName */) {
+            thisArg = ts.createVoidZero();
+            target = parenthesizeForAccess(callee);
+        }
+        else {
+            switch (callee.kind) {
+                case 189 /* PropertyAccessExpression */: {
+                    if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
+                        // for `a.b()` target is `(_a = a).b` and thisArg is `_a`
+                        thisArg = ts.createTempVariable(recordTempVariable);
+                        target = ts.createPropertyAccess(ts.setTextRange(ts.createAssignment(thisArg, callee.expression), callee.expression), callee.name);
+                        ts.setTextRange(target, callee);
+                    }
+                    else {
+                        thisArg = callee.expression;
+                        target = callee;
+                    }
+                    break;
+                }
+                case 190 /* ElementAccessExpression */: {
+                    if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
+                        // for `a[b]()` target is `(_a = a)[b]` and thisArg is `_a`
+                        thisArg = ts.createTempVariable(recordTempVariable);
+                        target = ts.createElementAccess(ts.setTextRange(ts.createAssignment(thisArg, callee.expression), callee.expression), callee.argumentExpression);
+                        ts.setTextRange(target, callee);
+                    }
+                    else {
+                        thisArg = callee.expression;
+                        target = callee;
+                    }
+                    break;
+                }
+                default: {
+                    // for `a()` target is `a` and thisArg is `void 0`
+                    thisArg = ts.createVoidZero();
+                    target = parenthesizeForAccess(expression);
+                    break;
+                }
+            }
+        }
+        return { target: target, thisArg: thisArg };
+    }
+    ts.createCallBinding = createCallBinding;
+    function inlineExpressions(expressions) {
+        // Avoid deeply nested comma expressions as traversing them during emit can result in "Maximum call
+        // stack size exceeded" errors.
+        return expressions.length > 10
+            ? ts.createCommaList(expressions)
+            : ts.reduceLeft(expressions, ts.createComma);
+    }
+    ts.inlineExpressions = inlineExpressions;
+    function createExpressionFromEntityName(node) {
+        if (ts.isQualifiedName(node)) {
+            var left = createExpressionFromEntityName(node.left);
+            var right = ts.getMutableClone(node.right);
+            return ts.setTextRange(ts.createPropertyAccess(left, right), node);
+        }
+        else {
+            return ts.getMutableClone(node);
+        }
+    }
+    ts.createExpressionFromEntityName = createExpressionFromEntityName;
+    function createExpressionForPropertyName(memberName) {
+        if (ts.isIdentifier(memberName)) {
+            return ts.createLiteral(memberName);
+        }
+        else if (ts.isComputedPropertyName(memberName)) {
+            return ts.getMutableClone(memberName.expression);
+        }
+        else {
+            return ts.getMutableClone(memberName);
+        }
+    }
+    ts.createExpressionForPropertyName = createExpressionForPropertyName;
+    function createExpressionForObjectLiteralElementLike(node, property, receiver) {
+        switch (property.kind) {
+            case 158 /* GetAccessor */:
+            case 159 /* SetAccessor */:
+                return createExpressionForAccessorDeclaration(node.properties, property, receiver, !!node.multiLine);
+            case 275 /* PropertyAssignment */:
+                return createExpressionForPropertyAssignment(property, receiver);
+            case 276 /* ShorthandPropertyAssignment */:
+                return createExpressionForShorthandPropertyAssignment(property, receiver);
+            case 156 /* MethodDeclaration */:
+                return createExpressionForMethodDeclaration(property, receiver);
+        }
+    }
+    ts.createExpressionForObjectLiteralElementLike = createExpressionForObjectLiteralElementLike;
+    function createExpressionForAccessorDeclaration(properties, property, receiver, multiLine) {
+        var _a = ts.getAllAccessorDeclarations(properties, property), firstAccessor = _a.firstAccessor, getAccessor = _a.getAccessor, setAccessor = _a.setAccessor;
+        if (property === firstAccessor) {
+            var properties_8 = [];
+            if (getAccessor) {
+                var getterFunction = ts.createFunctionExpression(getAccessor.modifiers, 
+                /*asteriskToken*/ undefined, 
+                /*name*/ undefined, 
+                /*typeParameters*/ undefined, getAccessor.parameters, 
+                /*type*/ undefined, getAccessor.body // TODO: GH#18217
+                );
+                ts.setTextRange(getterFunction, getAccessor);
+                ts.setOriginalNode(getterFunction, getAccessor);
+                var getter = ts.createPropertyAssignment("get", getterFunction);
+                properties_8.push(getter);
+            }
+            if (setAccessor) {
+                var setterFunction = ts.createFunctionExpression(setAccessor.modifiers, 
+                /*asteriskToken*/ undefined, 
+                /*name*/ undefined, 
+                /*typeParameters*/ undefined, setAccessor.parameters, 
+                /*type*/ undefined, setAccessor.body // TODO: GH#18217
+                );
+                ts.setTextRange(setterFunction, setAccessor);
+                ts.setOriginalNode(setterFunction, setAccessor);
+                var setter = ts.createPropertyAssignment("set", setterFunction);
+                properties_8.push(setter);
+            }
+            properties_8.push(ts.createPropertyAssignment("enumerable", ts.createTrue()));
+            properties_8.push(ts.createPropertyAssignment("configurable", ts.createTrue()));
+            var expression = ts.setTextRange(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), 
+            /*typeArguments*/ undefined, [
+                receiver,
+                createExpressionForPropertyName(property.name),
+                ts.createObjectLiteral(properties_8, multiLine)
+            ]), 
+            /*location*/ firstAccessor);
+            return ts.aggregateTransformFlags(expression);
+        }
+        return undefined;
+    }
+    function createExpressionForPropertyAssignment(property, receiver) {
+        return ts.aggregateTransformFlags(ts.setOriginalNode(ts.setTextRange(ts.createAssignment(createMemberAccessForPropertyName(receiver, property.name, /*location*/ property.name), property.initializer), property), property));
+    }
+    function createExpressionForShorthandPropertyAssignment(property, receiver) {
+        return ts.aggregateTransformFlags(ts.setOriginalNode(ts.setTextRange(ts.createAssignment(createMemberAccessForPropertyName(receiver, property.name, /*location*/ property.name), ts.getSynthesizedClone(property.name)), 
+        /*location*/ property), 
+        /*original*/ property));
+    }
+    function createExpressionForMethodDeclaration(method, receiver) {
+        return ts.aggregateTransformFlags(ts.setOriginalNode(ts.setTextRange(ts.createAssignment(createMemberAccessForPropertyName(receiver, method.name, /*location*/ method.name), ts.setOriginalNode(ts.setTextRange(ts.createFunctionExpression(method.modifiers, method.asteriskToken, 
+        /*name*/ undefined, 
+        /*typeParameters*/ undefined, method.parameters, 
+        /*type*/ undefined, method.body // TODO: GH#18217
+        ), 
+        /*location*/ method), 
+        /*original*/ method)), 
+        /*location*/ method), 
+        /*original*/ method));
+    }
+    /**
+     * Gets the internal name of a declaration. This is primarily used for declarations that can be
+     * referred to by name in the body of an ES5 class function body. An internal name will *never*
+     * be prefixed with an module or namespace export modifier like "exports." when emitted as an
+     * expression. An internal name will also *never* be renamed due to a collision with a block
+     * scoped variable.
+     *
+     * @param node The declaration.
+     * @param allowComments A value indicating whether comments may be emitted for the name.
+     * @param allowSourceMaps A value indicating whether source maps may be emitted for the name.
+     */
+    function getInternalName(node, allowComments, allowSourceMaps) {
+        return getName(node, allowComments, allowSourceMaps, 16384 /* LocalName */ | 32768 /* InternalName */);
+    }
+    ts.getInternalName = getInternalName;
+    /**
+     * Gets whether an identifier should only be referred to by its internal name.
+     */
+    function isInternalName(node) {
+        return (ts.getEmitFlags(node) & 32768 /* InternalName */) !== 0;
+    }
+    ts.isInternalName = isInternalName;
+    /**
+     * Gets the local name of a declaration. This is primarily used for declarations that can be
+     * referred to by name in the declaration's immediate scope (classes, enums, namespaces). A
+     * local name will *never* be prefixed with an module or namespace export modifier like
+     * "exports." when emitted as an expression.
+     *
+     * @param node The declaration.
+     * @param allowComments A value indicating whether comments may be emitted for the name.
+     * @param allowSourceMaps A value indicating whether source maps may be emitted for the name.
+     */
+    function getLocalName(node, allowComments, allowSourceMaps) {
+        return getName(node, allowComments, allowSourceMaps, 16384 /* LocalName */);
+    }
+    ts.getLocalName = getLocalName;
+    /**
+     * Gets whether an identifier should only be referred to by its local name.
+     */
+    function isLocalName(node) {
+        return (ts.getEmitFlags(node) & 16384 /* LocalName */) !== 0;
+    }
+    ts.isLocalName = isLocalName;
+    /**
+     * Gets the export name of a declaration. This is primarily used for declarations that can be
+     * referred to by name in the declaration's immediate scope (classes, enums, namespaces). An
+     * export name will *always* be prefixed with an module or namespace export modifier like
+     * `"exports."` when emitted as an expression if the name points to an exported symbol.
+     *
+     * @param node The declaration.
+     * @param allowComments A value indicating whether comments may be emitted for the name.
+     * @param allowSourceMaps A value indicating whether source maps may be emitted for the name.
+     */
+    function getExportName(node, allowComments, allowSourceMaps) {
+        return getName(node, allowComments, allowSourceMaps, 8192 /* ExportName */);
+    }
+    ts.getExportName = getExportName;
+    /**
+     * Gets whether an identifier should only be referred to by its export representation if the
+     * name points to an exported symbol.
+     */
+    function isExportName(node) {
+        return (ts.getEmitFlags(node) & 8192 /* ExportName */) !== 0;
+    }
+    ts.isExportName = isExportName;
+    /**
+     * Gets the name of a declaration for use in declarations.
+     *
+     * @param node The declaration.
+     * @param allowComments A value indicating whether comments may be emitted for the name.
+     * @param allowSourceMaps A value indicating whether source maps may be emitted for the name.
+     */
+    function getDeclarationName(node, allowComments, allowSourceMaps) {
+        return getName(node, allowComments, allowSourceMaps);
+    }
+    ts.getDeclarationName = getDeclarationName;
+    function getName(node, allowComments, allowSourceMaps, emitFlags) {
+        if (emitFlags === void 0) { emitFlags = 0; }
+        var nodeName = ts.getNameOfDeclaration(node);
+        if (nodeName && ts.isIdentifier(nodeName) && !ts.isGeneratedIdentifier(nodeName)) {
+            var name = ts.getMutableClone(nodeName);
+            emitFlags |= ts.getEmitFlags(nodeName);
+            if (!allowSourceMaps)
+                emitFlags |= 48 /* NoSourceMap */;
+            if (!allowComments)
+                emitFlags |= 1536 /* NoComments */;
+            if (emitFlags)
+                ts.setEmitFlags(name, emitFlags);
+            return name;
+        }
+        return ts.getGeneratedNameForNode(node);
+    }
+    /**
+     * Gets the exported name of a declaration for use in expressions.
+     *
+     * An exported name will *always* be prefixed with an module or namespace export modifier like
+     * "exports." if the name points to an exported symbol.
+     *
+     * @param ns The namespace identifier.
+     * @param node The declaration.
+     * @param allowComments A value indicating whether comments may be emitted for the name.
+     * @param allowSourceMaps A value indicating whether source maps may be emitted for the name.
+     */
+    function getExternalModuleOrNamespaceExportName(ns, node, allowComments, allowSourceMaps) {
+        if (ns && ts.hasModifier(node, 1 /* Export */)) {
+            return getNamespaceMemberName(ns, getName(node), allowComments, allowSourceMaps);
+        }
+        return getExportName(node, allowComments, allowSourceMaps);
+    }
+    ts.getExternalModuleOrNamespaceExportName = getExternalModuleOrNamespaceExportName;
+    /**
+     * Gets a namespace-qualified name for use in expressions.
+     *
+     * @param ns The namespace identifier.
+     * @param name The name.
+     * @param allowComments A value indicating whether comments may be emitted for the name.
+     * @param allowSourceMaps A value indicating whether source maps may be emitted for the name.
+     */
+    function getNamespaceMemberName(ns, name, allowComments, allowSourceMaps) {
+        var qualifiedName = ts.createPropertyAccess(ns, ts.nodeIsSynthesized(name) ? name : ts.getSynthesizedClone(name));
+        ts.setTextRange(qualifiedName, name);
+        var emitFlags = 0;
+        if (!allowSourceMaps)
+            emitFlags |= 48 /* NoSourceMap */;
+        if (!allowComments)
+            emitFlags |= 1536 /* NoComments */;
+        if (emitFlags)
+            ts.setEmitFlags(qualifiedName, emitFlags);
+        return qualifiedName;
+    }
+    ts.getNamespaceMemberName = getNamespaceMemberName;
+    function convertToFunctionBody(node, multiLine) {
+        return ts.isBlock(node) ? node : ts.setTextRange(ts.createBlock([ts.setTextRange(ts.createReturn(node), node)], multiLine), node);
+    }
+    ts.convertToFunctionBody = convertToFunctionBody;
+    function convertFunctionDeclarationToExpression(node) {
+        if (!node.body)
+            return ts.Debug.fail();
+        var updated = ts.createFunctionExpression(node.modifiers, node.asteriskToken, node.name, node.typeParameters, node.parameters, node.type, node.body);
+        ts.setOriginalNode(updated, node);
+        ts.setTextRange(updated, node);
+        if (ts.getStartsOnNewLine(node)) {
+            ts.setStartsOnNewLine(updated, /*newLine*/ true);
+        }
+        ts.aggregateTransformFlags(updated);
+        return updated;
+    }
+    ts.convertFunctionDeclarationToExpression = convertFunctionDeclarationToExpression;
+    function isUseStrictPrologue(node) {
+        return ts.isStringLiteral(node.expression) && node.expression.text === "use strict";
+    }
+    /**
+     * Add any necessary prologue-directives into target statement-array.
+     * The function needs to be called during each transformation step.
+     * This function needs to be called whenever we transform the statement
+     * list of a source file, namespace, or function-like body.
+     *
+     * @param target: result statements array
+     * @param source: origin statements array
+     * @param ensureUseStrict: boolean determining whether the function need to add prologue-directives
+     * @param visitor: Optional callback used to visit any custom prologue directives.
+     */
+    function addPrologue(target, source, ensureUseStrict, visitor) {
+        var offset = addStandardPrologue(target, source, ensureUseStrict);
+        return addCustomPrologue(target, source, offset, visitor);
+    }
+    ts.addPrologue = addPrologue;
+    /**
+     * Add just the standard (string-expression) prologue-directives into target statement-array.
+     * The function needs to be called during each transformation step.
+     * This function needs to be called whenever we transform the statement
+     * list of a source file, namespace, or function-like body.
+     */
+    function addStandardPrologue(target, source, ensureUseStrict) {
+        ts.Debug.assert(target.length === 0, "Prologue directives should be at the first statement in the target statements array");
+        var foundUseStrict = false;
+        var statementOffset = 0;
+        var numStatements = source.length;
+        while (statementOffset < numStatements) {
+            var statement = source[statementOffset];
+            if (ts.isPrologueDirective(statement)) {
+                if (isUseStrictPrologue(statement)) {
+                    foundUseStrict = true;
+                }
+                target.push(statement);
+            }
+            else {
+                break;
+            }
+            statementOffset++;
+        }
+        if (ensureUseStrict && !foundUseStrict) {
+            target.push(startOnNewLine(ts.createStatement(ts.createLiteral("use strict"))));
+        }
+        return statementOffset;
+    }
+    ts.addStandardPrologue = addStandardPrologue;
+    function addCustomPrologue(target, source, statementOffset, visitor) {
+        var numStatements = source.length;
+        while (statementOffset !== undefined && statementOffset < numStatements) {
+            var statement = source[statementOffset];
+            if (ts.getEmitFlags(statement) & 1048576 /* CustomPrologue */) {
+                ts.append(target, visitor ? ts.visitNode(statement, visitor, ts.isStatement) : statement);
+            }
+            else {
+                break;
+            }
+            statementOffset++;
+        }
+        return statementOffset;
+    }
+    ts.addCustomPrologue = addCustomPrologue;
+    function findUseStrictPrologue(statements) {
+        for (var _i = 0, statements_3 = statements; _i < statements_3.length; _i++) {
+            var statement = statements_3[_i];
+            if (ts.isPrologueDirective(statement)) {
+                if (isUseStrictPrologue(statement)) {
+                    return statement;
+                }
+            }
+            else {
+                break;
+            }
+        }
+        return undefined;
+    }
+    ts.findUseStrictPrologue = findUseStrictPrologue;
+    function startsWithUseStrict(statements) {
+        var firstStatement = ts.firstOrUndefined(statements);
+        return firstStatement !== undefined
+            && ts.isPrologueDirective(firstStatement)
+            && isUseStrictPrologue(firstStatement);
+    }
+    ts.startsWithUseStrict = startsWithUseStrict;
+    /**
+     * Ensures "use strict" directive is added
+     *
+     * @param statements An array of statements
+     */
+    function ensureUseStrict(statements) {
+        var foundUseStrict = findUseStrictPrologue(statements);
+        if (!foundUseStrict) {
+            return ts.setTextRange(ts.createNodeArray([
+                startOnNewLine(ts.createStatement(ts.createLiteral("use strict")))
+            ].concat(statements)), statements);
+        }
+        return statements;
+    }
+    ts.ensureUseStrict = ensureUseStrict;
+    /**
+     * Wraps the operand to a BinaryExpression in parentheses if they are needed to preserve the intended
+     * order of operations.
+     *
+     * @param binaryOperator The operator for the BinaryExpression.
+     * @param operand The operand for the BinaryExpression.
+     * @param isLeftSideOfBinary A value indicating whether the operand is the left side of the
+     *                           BinaryExpression.
+     */
+    function parenthesizeBinaryOperand(binaryOperator, operand, isLeftSideOfBinary, leftOperand) {
+        var skipped = ts.skipPartiallyEmittedExpressions(operand);
+        // If the resulting expression is already parenthesized, we do not need to do any further processing.
+        if (skipped.kind === 195 /* ParenthesizedExpression */) {
+            return operand;
+        }
+        return binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand)
+            ? ts.createParen(operand)
+            : operand;
+    }
+    ts.parenthesizeBinaryOperand = parenthesizeBinaryOperand;
+    /**
+     * Determines whether the operand to a BinaryExpression needs to be parenthesized.
+     *
+     * @param binaryOperator The operator for the BinaryExpression.
+     * @param operand The operand for the BinaryExpression.
+     * @param isLeftSideOfBinary A value indicating whether the operand is the left side of the
+     *                           BinaryExpression.
+     */
+    function binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand) {
+        // If the operand has lower precedence, then it needs to be parenthesized to preserve the
+        // intent of the expression. For example, if the operand is `a + b` and the operator is
+        // `*`, then we need to parenthesize the operand to preserve the intended order of
+        // operations: `(a + b) * x`.
+        //
+        // If the operand has higher precedence, then it does not need to be parenthesized. For
+        // example, if the operand is `a * b` and the operator is `+`, then we do not need to
+        // parenthesize to preserve the intended order of operations: `a * b + x`.
+        //
+        // If the operand has the same precedence, then we need to check the associativity of
+        // the operator based on whether this is the left or right operand of the expression.
+        //
+        // For example, if `a / d` is on the right of operator `*`, we need to parenthesize
+        // to preserve the intended order of operations: `x * (a / d)`
+        //
+        // If `a ** d` is on the left of operator `**`, we need to parenthesize to preserve
+        // the intended order of operations: `(a ** b) ** c`
+        var binaryOperatorPrecedence = ts.getOperatorPrecedence(204 /* BinaryExpression */, binaryOperator);
+        var binaryOperatorAssociativity = ts.getOperatorAssociativity(204 /* BinaryExpression */, binaryOperator);
+        var emittedOperand = ts.skipPartiallyEmittedExpressions(operand);
+        if (!isLeftSideOfBinary && operand.kind === 197 /* ArrowFunction */ && binaryOperatorPrecedence > 4) {
+            // We need to parenthesize arrow functions on the right side to avoid it being
+            // parsed as parenthesized expression: `a && (() => {})`
+            return true;
+        }
+        var operandPrecedence = ts.getExpressionPrecedence(emittedOperand);
+        switch (ts.compareValues(operandPrecedence, binaryOperatorPrecedence)) {
+            case -1 /* LessThan */:
+                // If the operand is the right side of a right-associative binary operation
+                // and is a yield expression, then we do not need parentheses.
+                if (!isLeftSideOfBinary
+                    && binaryOperatorAssociativity === 1 /* Right */
+                    && operand.kind === 207 /* YieldExpression */) {
+                    return false;
+                }
+                return true;
+            case 1 /* GreaterThan */:
+                return false;
+            case 0 /* EqualTo */:
+                if (isLeftSideOfBinary) {
+                    // No need to parenthesize the left operand when the binary operator is
+                    // left associative:
+                    //  (a*b)/x    -> a*b/x
+                    //  (a**b)/x   -> a**b/x
+                    //
+                    // Parentheses are needed for the left operand when the binary operator is
+                    // right associative:
+                    //  (a/b)**x   -> (a/b)**x
+                    //  (a**b)**x  -> (a**b)**x
+                    return binaryOperatorAssociativity === 1 /* Right */;
+                }
+                else {
+                    if (ts.isBinaryExpression(emittedOperand)
+                        && emittedOperand.operatorToken.kind === binaryOperator) {
+                        // No need to parenthesize the right operand when the binary operator and
+                        // operand are the same and one of the following:
+                        //  x*(a*b)     => x*a*b
+                        //  x|(a|b)     => x|a|b
+                        //  x&(a&b)     => x&a&b
+                        //  x^(a^b)     => x^a^b
+                        if (operatorHasAssociativeProperty(binaryOperator)) {
+                            return false;
+                        }
+                        // No need to parenthesize the right operand when the binary operator
+                        // is plus (+) if both the left and right operands consist solely of either
+                        // literals of the same kind or binary plus (+) expressions for literals of
+                        // the same kind (recursively).
+                        //  "a"+(1+2)       => "a"+(1+2)
+                        //  "a"+("b"+"c")   => "a"+"b"+"c"
+                        if (binaryOperator === 38 /* PlusToken */) {
+                            var leftKind = leftOperand ? getLiteralKindOfBinaryPlusOperand(leftOperand) : 0 /* Unknown */;
+                            if (ts.isLiteralKind(leftKind) && leftKind === getLiteralKindOfBinaryPlusOperand(emittedOperand)) {
+                                return false;
+                            }
+                        }
+                    }
+                    // No need to parenthesize the right operand when the operand is right
+                    // associative:
+                    //  x/(a**b)    -> x/a**b
+                    //  x**(a**b)   -> x**a**b
+                    //
+                    // Parentheses are needed for the right operand when the operand is left
+                    // associative:
+                    //  x/(a*b)     -> x/(a*b)
+                    //  x**(a/b)    -> x**(a/b)
+                    var operandAssociativity = ts.getExpressionAssociativity(emittedOperand);
+                    return operandAssociativity === 0 /* Left */;
+                }
+        }
+    }
+    /**
+     * Determines whether a binary operator is mathematically associative.
+     *
+     * @param binaryOperator The binary operator.
+     */
+    function operatorHasAssociativeProperty(binaryOperator) {
+        // The following operators are associative in JavaScript:
+        //  (a*b)*c     -> a*(b*c)  -> a*b*c
+        //  (a|b)|c     -> a|(b|c)  -> a|b|c
+        //  (a&b)&c     -> a&(b&c)  -> a&b&c
+        //  (a^b)^c     -> a^(b^c)  -> a^b^c
+        //
+        // While addition is associative in mathematics, JavaScript's `+` is not
+        // guaranteed to be associative as it is overloaded with string concatenation.
+        return binaryOperator === 40 /* AsteriskToken */
+            || binaryOperator === 50 /* BarToken */
+            || binaryOperator === 49 /* AmpersandToken */
+            || binaryOperator === 51 /* CaretToken */;
+    }
+    /**
+     * This function determines whether an expression consists of a homogeneous set of
+     * literal expressions or binary plus expressions that all share the same literal kind.
+     * It is used to determine whether the right-hand operand of a binary plus expression can be
+     * emitted without parentheses.
+     */
+    function getLiteralKindOfBinaryPlusOperand(node) {
+        node = ts.skipPartiallyEmittedExpressions(node);
+        if (ts.isLiteralKind(node.kind)) {
+            return node.kind;
+        }
+        if (node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 38 /* PlusToken */) {
+            if (node.cachedLiteralKind !== undefined) {
+                return node.cachedLiteralKind;
+            }
+            var leftKind = getLiteralKindOfBinaryPlusOperand(node.left);
+            var literalKind = ts.isLiteralKind(leftKind)
+                && leftKind === getLiteralKindOfBinaryPlusOperand(node.right)
+                ? leftKind
+                : 0 /* Unknown */;
+            node.cachedLiteralKind = literalKind;
+            return literalKind;
+        }
+        return 0 /* Unknown */;
+    }
+    function parenthesizeForConditionalHead(condition) {
+        var conditionalPrecedence = ts.getOperatorPrecedence(205 /* ConditionalExpression */, 56 /* QuestionToken */);
+        var emittedCondition = ts.skipPartiallyEmittedExpressions(condition);
+        var conditionPrecedence = ts.getExpressionPrecedence(emittedCondition);
+        if (ts.compareValues(conditionPrecedence, conditionalPrecedence) === -1 /* LessThan */) {
+            return ts.createParen(condition);
+        }
+        return condition;
+    }
+    ts.parenthesizeForConditionalHead = parenthesizeForConditionalHead;
+    function parenthesizeSubexpressionOfConditionalExpression(e) {
+        // per ES grammar both 'whenTrue' and 'whenFalse' parts of conditional expression are assignment expressions
+        // so in case when comma expression is introduced as a part of previous transformations
+        // if should be wrapped in parens since comma operator has the lowest precedence
+        var emittedExpression = ts.skipPartiallyEmittedExpressions(e);
+        return isCommaSequence(emittedExpression)
+            ? ts.createParen(e)
+            : e;
+    }
+    ts.parenthesizeSubexpressionOfConditionalExpression = parenthesizeSubexpressionOfConditionalExpression;
+    /**
+     *  [Per the spec](https://tc39.github.io/ecma262/#prod-ExportDeclaration), `export default` accepts _AssigmentExpression_ but
+     *  has a lookahead restriction for `function`, `async function`, and `class`.
+     *
+     * Basically, that means we need to parenthesize in the following cases:
+     *
+     * - BinaryExpression of CommaToken
+     * - CommaList (synthetic list of multiple comma expressions)
+     * - FunctionExpression
+     * - ClassExpression
+     */
+    function parenthesizeDefaultExpression(e) {
+        var check = ts.skipPartiallyEmittedExpressions(e);
+        var needsParens = isCommaSequence(check);
+        if (!needsParens) {
+            switch (getLeftmostExpression(check, /*stopAtCallExpression*/ false).kind) {
+                case 209 /* ClassExpression */:
+                case 196 /* FunctionExpression */:
+                    needsParens = true;
+            }
+        }
+        return needsParens ? ts.createParen(e) : e;
+    }
+    ts.parenthesizeDefaultExpression = parenthesizeDefaultExpression;
+    /**
+     * Wraps an expression in parentheses if it is needed in order to use the expression
+     * as the expression of a NewExpression node.
+     *
+     * @param expression The Expression node.
+     */
+    function parenthesizeForNew(expression) {
+        var leftmostExpr = getLeftmostExpression(expression, /*stopAtCallExpressions*/ true);
+        switch (leftmostExpr.kind) {
+            case 191 /* CallExpression */:
+                return ts.createParen(expression);
+            case 192 /* NewExpression */:
+                return !leftmostExpr.arguments
+                    ? ts.createParen(expression)
+                    : expression;
+        }
+        return parenthesizeForAccess(expression);
+    }
+    ts.parenthesizeForNew = parenthesizeForNew;
+    /**
+     * Wraps an expression in parentheses if it is needed in order to use the expression for
+     * property or element access.
+     *
+     * @param expr The expression node.
+     */
+    function parenthesizeForAccess(expression) {
+        // isLeftHandSideExpression is almost the correct criterion for when it is not necessary
+        // to parenthesize the expression before a dot. The known exception is:
+        //
+        //    NewExpression:
+        //       new C.x        -> not the same as (new C).x
+        //
+        var emittedExpression = ts.skipPartiallyEmittedExpressions(expression);
+        if (ts.isLeftHandSideExpression(emittedExpression)
+            && (emittedExpression.kind !== 192 /* NewExpression */ || emittedExpression.arguments)) {
+            return expression;
+        }
+        return ts.setTextRange(ts.createParen(expression), expression);
+    }
+    ts.parenthesizeForAccess = parenthesizeForAccess;
+    function parenthesizePostfixOperand(operand) {
+        return ts.isLeftHandSideExpression(operand)
+            ? operand
+            : ts.setTextRange(ts.createParen(operand), operand);
+    }
+    ts.parenthesizePostfixOperand = parenthesizePostfixOperand;
+    function parenthesizePrefixOperand(operand) {
+        return ts.isUnaryExpression(operand)
+            ? operand
+            : ts.setTextRange(ts.createParen(operand), operand);
+    }
+    ts.parenthesizePrefixOperand = parenthesizePrefixOperand;
+    function parenthesizeListElements(elements) {
+        var result;
+        for (var i = 0; i < elements.length; i++) {
+            var element = parenthesizeExpressionForList(elements[i]);
+            if (result !== undefined || element !== elements[i]) {
+                if (result === undefined) {
+                    result = elements.slice(0, i);
+                }
+                result.push(element);
+            }
+        }
+        if (result !== undefined) {
+            return ts.setTextRange(ts.createNodeArray(result, elements.hasTrailingComma), elements);
+        }
+        return elements;
+    }
+    ts.parenthesizeListElements = parenthesizeListElements;
+    function parenthesizeExpressionForList(expression) {
+        var emittedExpression = ts.skipPartiallyEmittedExpressions(expression);
+        var expressionPrecedence = ts.getExpressionPrecedence(emittedExpression);
+        var commaPrecedence = ts.getOperatorPrecedence(204 /* BinaryExpression */, 27 /* CommaToken */);
+        return expressionPrecedence > commaPrecedence
+            ? expression
+            : ts.setTextRange(ts.createParen(expression), expression);
+    }
+    ts.parenthesizeExpressionForList = parenthesizeExpressionForList;
+    function parenthesizeExpressionForExpressionStatement(expression) {
+        var emittedExpression = ts.skipPartiallyEmittedExpressions(expression);
+        if (ts.isCallExpression(emittedExpression)) {
+            var callee = emittedExpression.expression;
+            var kind = ts.skipPartiallyEmittedExpressions(callee).kind;
+            if (kind === 196 /* FunctionExpression */ || kind === 197 /* ArrowFunction */) {
+                var mutableCall = ts.getMutableClone(emittedExpression);
+                mutableCall.expression = ts.setTextRange(ts.createParen(callee), callee);
+                return recreateOuterExpressions(expression, mutableCall, 4 /* PartiallyEmittedExpressions */);
+            }
+        }
+        var leftmostExpressionKind = getLeftmostExpression(emittedExpression, /*stopAtCallExpressions*/ false).kind;
+        if (leftmostExpressionKind === 188 /* ObjectLiteralExpression */ || leftmostExpressionKind === 196 /* FunctionExpression */) {
+            return ts.setTextRange(ts.createParen(expression), expression);
+        }
+        return expression;
+    }
+    ts.parenthesizeExpressionForExpressionStatement = parenthesizeExpressionForExpressionStatement;
+    function parenthesizeConditionalTypeMember(member) {
+        return member.kind === 175 /* ConditionalType */ ? ts.createParenthesizedType(member) : member;
+    }
+    ts.parenthesizeConditionalTypeMember = parenthesizeConditionalTypeMember;
+    function parenthesizeElementTypeMember(member) {
+        switch (member.kind) {
+            case 173 /* UnionType */:
+            case 174 /* IntersectionType */:
+            case 165 /* FunctionType */:
+            case 166 /* ConstructorType */:
+                return ts.createParenthesizedType(member);
+        }
+        return parenthesizeConditionalTypeMember(member);
+    }
+    ts.parenthesizeElementTypeMember = parenthesizeElementTypeMember;
+    function parenthesizeArrayTypeMember(member) {
+        switch (member.kind) {
+            case 167 /* TypeQuery */:
+            case 179 /* TypeOperator */:
+            case 176 /* InferType */:
+                return ts.createParenthesizedType(member);
+        }
+        return parenthesizeElementTypeMember(member);
+    }
+    ts.parenthesizeArrayTypeMember = parenthesizeArrayTypeMember;
+    function parenthesizeElementTypeMembers(members) {
+        return ts.createNodeArray(ts.sameMap(members, parenthesizeElementTypeMember));
+    }
+    ts.parenthesizeElementTypeMembers = parenthesizeElementTypeMembers;
+    function parenthesizeTypeParameters(typeParameters) {
+        if (ts.some(typeParameters)) {
+            var params = [];
+            for (var i = 0; i < typeParameters.length; ++i) {
+                var entry = typeParameters[i];
+                params.push(i === 0 && ts.isFunctionOrConstructorTypeNode(entry) && entry.typeParameters ?
+                    ts.createParenthesizedType(entry) :
+                    entry);
+            }
+            return ts.createNodeArray(params);
+        }
+    }
+    ts.parenthesizeTypeParameters = parenthesizeTypeParameters;
+    function getLeftmostExpression(node, stopAtCallExpressions) {
+        while (true) {
+            switch (node.kind) {
+                case 203 /* PostfixUnaryExpression */:
+                    node = node.operand;
+                    continue;
+                case 204 /* BinaryExpression */:
+                    node = node.left;
+                    continue;
+                case 205 /* ConditionalExpression */:
+                    node = node.condition;
+                    continue;
+                case 193 /* TaggedTemplateExpression */:
+                    node = node.tag;
+                    continue;
+                case 191 /* CallExpression */:
+                    if (stopAtCallExpressions) {
+                        return node;
+                    }
+                // falls through
+                case 212 /* AsExpression */:
+                case 190 /* ElementAccessExpression */:
+                case 189 /* PropertyAccessExpression */:
+                case 213 /* NonNullExpression */:
+                case 308 /* PartiallyEmittedExpression */:
+                    node = node.expression;
+                    continue;
+            }
+            return node;
+        }
+    }
+    function parenthesizeConciseBody(body) {
+        if (!ts.isBlock(body) && (isCommaSequence(body) || getLeftmostExpression(body, /*stopAtCallExpressions*/ false).kind === 188 /* ObjectLiteralExpression */)) {
+            return ts.setTextRange(ts.createParen(body), body);
+        }
+        return body;
+    }
+    ts.parenthesizeConciseBody = parenthesizeConciseBody;
+    function isCommaSequence(node) {
+        return node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 27 /* CommaToken */ ||
+            node.kind === 309 /* CommaListExpression */;
+    }
+    ts.isCommaSequence = isCommaSequence;
+    var OuterExpressionKinds;
+    (function (OuterExpressionKinds) {
+        OuterExpressionKinds[OuterExpressionKinds["Parentheses"] = 1] = "Parentheses";
+        OuterExpressionKinds[OuterExpressionKinds["Assertions"] = 2] = "Assertions";
+        OuterExpressionKinds[OuterExpressionKinds["PartiallyEmittedExpressions"] = 4] = "PartiallyEmittedExpressions";
+        OuterExpressionKinds[OuterExpressionKinds["All"] = 7] = "All";
+    })(OuterExpressionKinds = ts.OuterExpressionKinds || (ts.OuterExpressionKinds = {}));
+    function isOuterExpression(node, kinds) {
+        if (kinds === void 0) { kinds = 7 /* All */; }
+        switch (node.kind) {
+            case 195 /* ParenthesizedExpression */:
+                return (kinds & 1 /* Parentheses */) !== 0;
+            case 194 /* TypeAssertionExpression */:
+            case 212 /* AsExpression */:
+            case 213 /* NonNullExpression */:
+                return (kinds & 2 /* Assertions */) !== 0;
+            case 308 /* PartiallyEmittedExpression */:
+                return (kinds & 4 /* PartiallyEmittedExpressions */) !== 0;
+        }
+        return false;
+    }
+    ts.isOuterExpression = isOuterExpression;
+    function skipOuterExpressions(node, kinds) {
+        if (kinds === void 0) { kinds = 7 /* All */; }
+        var previousNode;
+        do {
+            previousNode = node;
+            if (kinds & 1 /* Parentheses */) {
+                node = ts.skipParentheses(node);
+            }
+            if (kinds & 2 /* Assertions */) {
+                node = skipAssertions(node);
+            }
+            if (kinds & 4 /* PartiallyEmittedExpressions */) {
+                node = ts.skipPartiallyEmittedExpressions(node);
+            }
+        } while (previousNode !== node);
+        return node;
+    }
+    ts.skipOuterExpressions = skipOuterExpressions;
+    function skipAssertions(node) {
+        while (ts.isAssertionExpression(node) || node.kind === 213 /* NonNullExpression */) {
+            node = node.expression;
+        }
+        return node;
+    }
+    ts.skipAssertions = skipAssertions;
+    function updateOuterExpression(outerExpression, expression) {
+        switch (outerExpression.kind) {
+            case 195 /* ParenthesizedExpression */: return ts.updateParen(outerExpression, expression);
+            case 194 /* TypeAssertionExpression */: return ts.updateTypeAssertion(outerExpression, outerExpression.type, expression);
+            case 212 /* AsExpression */: return ts.updateAsExpression(outerExpression, expression, outerExpression.type);
+            case 213 /* NonNullExpression */: return ts.updateNonNullExpression(outerExpression, expression);
+            case 308 /* PartiallyEmittedExpression */: return ts.updatePartiallyEmittedExpression(outerExpression, expression);
+        }
+    }
+    /**
+     * Determines whether a node is a parenthesized expression that can be ignored when recreating outer expressions.
+     *
+     * A parenthesized expression can be ignored when all of the following are true:
+     *
+     * - It's `pos` and `end` are not -1
+     * - It does not have a custom source map range
+     * - It does not have a custom comment range
+     * - It does not have synthetic leading or trailing comments
+     *
+     * If an outermost parenthesized expression is ignored, but the containing expression requires a parentheses around
+     * the expression to maintain precedence, a new parenthesized expression should be created automatically when
+     * the containing expression is created/updated.
+     */
+    function isIgnorableParen(node) {
+        return node.kind === 195 /* ParenthesizedExpression */
+            && ts.nodeIsSynthesized(node)
+            && ts.nodeIsSynthesized(ts.getSourceMapRange(node))
+            && ts.nodeIsSynthesized(ts.getCommentRange(node))
+            && !ts.some(ts.getSyntheticLeadingComments(node))
+            && !ts.some(ts.getSyntheticTrailingComments(node));
+    }
+    function recreateOuterExpressions(outerExpression, innerExpression, kinds) {
+        if (kinds === void 0) { kinds = 7 /* All */; }
+        if (outerExpression && isOuterExpression(outerExpression, kinds) && !isIgnorableParen(outerExpression)) {
+            return updateOuterExpression(outerExpression, recreateOuterExpressions(outerExpression.expression, innerExpression));
+        }
+        return innerExpression;
+    }
+    ts.recreateOuterExpressions = recreateOuterExpressions;
+    function startOnNewLine(node) {
+        return ts.setStartsOnNewLine(node, /*newLine*/ true);
+    }
+    ts.startOnNewLine = startOnNewLine;
+    function getExternalHelpersModuleName(node) {
+        var parseNode = ts.getOriginalNode(node, ts.isSourceFile);
+        var emitNode = parseNode && parseNode.emitNode;
+        return emitNode && emitNode.externalHelpersModuleName;
+    }
+    ts.getExternalHelpersModuleName = getExternalHelpersModuleName;
+    function getOrCreateExternalHelpersModuleNameIfNeeded(node, compilerOptions, hasExportStarsToExportValues, hasImportStarOrImportDefault) {
+        if (compilerOptions.importHelpers && ts.isEffectiveExternalModule(node, compilerOptions)) {
+            var externalHelpersModuleName = getExternalHelpersModuleName(node);
+            if (externalHelpersModuleName) {
+                return externalHelpersModuleName;
+            }
+            var moduleKind = ts.getEmitModuleKind(compilerOptions);
+            var create = (hasExportStarsToExportValues || (compilerOptions.esModuleInterop && hasImportStarOrImportDefault))
+                && moduleKind !== ts.ModuleKind.System
+                && moduleKind !== ts.ModuleKind.ES2015
+                && moduleKind !== ts.ModuleKind.ESNext;
+            if (!create) {
+                var helpers = ts.getEmitHelpers(node);
+                if (helpers) {
+                    for (var _i = 0, helpers_2 = helpers; _i < helpers_2.length; _i++) {
+                        var helper = helpers_2[_i];
+                        if (!helper.scoped) {
+                            create = true;
+                            break;
+                        }
+                    }
+                }
+            }
+            if (create) {
+                var parseNode = ts.getOriginalNode(node, ts.isSourceFile);
+                var emitNode = ts.getOrCreateEmitNode(parseNode);
+                return emitNode.externalHelpersModuleName || (emitNode.externalHelpersModuleName = ts.createUniqueName(ts.externalHelpersModuleNameText));
+            }
+        }
+    }
+    ts.getOrCreateExternalHelpersModuleNameIfNeeded = getOrCreateExternalHelpersModuleNameIfNeeded;
+    /**
+     * Get the name of that target module from an import or export declaration
+     */
+    function getLocalNameForExternalImport(node, sourceFile) {
+        var namespaceDeclaration = ts.getNamespaceDeclarationNode(node);
+        if (namespaceDeclaration && !ts.isDefaultImport(node)) {
+            var name = namespaceDeclaration.name;
+            return ts.isGeneratedIdentifier(name) ? name : ts.createIdentifier(ts.getSourceTextOfNodeFromSourceFile(sourceFile, name) || ts.idText(name));
+        }
+        if (node.kind === 249 /* ImportDeclaration */ && node.importClause) {
+            return ts.getGeneratedNameForNode(node);
+        }
+        if (node.kind === 255 /* ExportDeclaration */ && node.moduleSpecifier) {
+            return ts.getGeneratedNameForNode(node);
+        }
+        return undefined;
+    }
+    ts.getLocalNameForExternalImport = getLocalNameForExternalImport;
+    /**
+     * Get the name of a target module from an import/export declaration as should be written in the emitted output.
+     * The emitted output name can be different from the input if:
+     *  1. The module has a /// <amd-module name="<new name>" />
+     *  2. --out or --outFile is used, making the name relative to the rootDir
+     *  3- The containing SourceFile has an entry in renamedDependencies for the import as requested by some module loaders (e.g. System).
+     * Otherwise, a new StringLiteral node representing the module name will be returned.
+     */
+    function getExternalModuleNameLiteral(importNode, sourceFile, host, resolver, compilerOptions) {
+        var moduleName = ts.getExternalModuleName(importNode); // TODO: GH#18217
+        if (moduleName.kind === 10 /* StringLiteral */) {
+            return tryGetModuleNameFromDeclaration(importNode, host, resolver, compilerOptions)
+                || tryRenameExternalModule(moduleName, sourceFile)
+                || ts.getSynthesizedClone(moduleName);
+        }
+        return undefined;
+    }
+    ts.getExternalModuleNameLiteral = getExternalModuleNameLiteral;
+    /**
+     * Some bundlers (SystemJS builder) sometimes want to rename dependencies.
+     * Here we check if alternative name was provided for a given moduleName and return it if possible.
+     */
+    function tryRenameExternalModule(moduleName, sourceFile) {
+        var rename = sourceFile.renamedDependencies && sourceFile.renamedDependencies.get(moduleName.text);
+        return rename && ts.createLiteral(rename);
+    }
+    /**
+     * Get the name of a module as should be written in the emitted output.
+     * The emitted output name can be different from the input if:
+     *  1. The module has a /// <amd-module name="<new name>" />
+     *  2. --out or --outFile is used, making the name relative to the rootDir
+     * Otherwise, a new StringLiteral node representing the module name will be returned.
+     */
+    function tryGetModuleNameFromFile(file, host, options) {
+        if (!file) {
+            return undefined;
+        }
+        if (file.moduleName) {
+            return ts.createLiteral(file.moduleName);
+        }
+        if (!file.isDeclarationFile && (options.out || options.outFile)) {
+            return ts.createLiteral(ts.getExternalModuleNameFromPath(host, file.fileName));
+        }
+        return undefined;
+    }
+    ts.tryGetModuleNameFromFile = tryGetModuleNameFromFile;
+    function tryGetModuleNameFromDeclaration(declaration, host, resolver, compilerOptions) {
+        return tryGetModuleNameFromFile(resolver.getExternalModuleFileFromDeclaration(declaration), host, compilerOptions);
+    }
+    /**
+     * Gets the initializer of an BindingOrAssignmentElement.
+     */
+    function getInitializerOfBindingOrAssignmentElement(bindingElement) {
+        if (ts.isDeclarationBindingElement(bindingElement)) {
+            // `1` in `let { a = 1 } = ...`
+            // `1` in `let { a: b = 1 } = ...`
+            // `1` in `let { a: {b} = 1 } = ...`
+            // `1` in `let { a: [b] = 1 } = ...`
+            // `1` in `let [a = 1] = ...`
+            // `1` in `let [{a} = 1] = ...`
+            // `1` in `let [[a] = 1] = ...`
+            return bindingElement.initializer;
+        }
+        if (ts.isPropertyAssignment(bindingElement)) {
+            // `1` in `({ a: b = 1 } = ...)`
+            // `1` in `({ a: {b} = 1 } = ...)`
+            // `1` in `({ a: [b] = 1 } = ...)`
+            var initializer = bindingElement.initializer;
+            return ts.isAssignmentExpression(initializer, /*excludeCompoundAssignment*/ true)
+                ? initializer.right
+                : undefined;
+        }
+        if (ts.isShorthandPropertyAssignment(bindingElement)) {
+            // `1` in `({ a = 1 } = ...)`
+            return bindingElement.objectAssignmentInitializer;
+        }
+        if (ts.isAssignmentExpression(bindingElement, /*excludeCompoundAssignment*/ true)) {
+            // `1` in `[a = 1] = ...`
+            // `1` in `[{a} = 1] = ...`
+            // `1` in `[[a] = 1] = ...`
+            return bindingElement.right;
+        }
+        if (ts.isSpreadElement(bindingElement)) {
+            // Recovery consistent with existing emit.
+            return getInitializerOfBindingOrAssignmentElement(bindingElement.expression);
+        }
+    }
+    ts.getInitializerOfBindingOrAssignmentElement = getInitializerOfBindingOrAssignmentElement;
+    /**
+     * Gets the name of an BindingOrAssignmentElement.
+     */
+    function getTargetOfBindingOrAssignmentElement(bindingElement) {
+        if (ts.isDeclarationBindingElement(bindingElement)) {
+            // `a` in `let { a } = ...`
+            // `a` in `let { a = 1 } = ...`
+            // `b` in `let { a: b } = ...`
+            // `b` in `let { a: b = 1 } = ...`
+            // `a` in `let { ...a } = ...`
+            // `{b}` in `let { a: {b} } = ...`
+            // `{b}` in `let { a: {b} = 1 } = ...`
+            // `[b]` in `let { a: [b] } = ...`
+            // `[b]` in `let { a: [b] = 1 } = ...`
+            // `a` in `let [a] = ...`
+            // `a` in `let [a = 1] = ...`
+            // `a` in `let [...a] = ...`
+            // `{a}` in `let [{a}] = ...`
+            // `{a}` in `let [{a} = 1] = ...`
+            // `[a]` in `let [[a]] = ...`
+            // `[a]` in `let [[a] = 1] = ...`
+            return bindingElement.name;
+        }
+        if (ts.isObjectLiteralElementLike(bindingElement)) {
+            switch (bindingElement.kind) {
+                case 275 /* PropertyAssignment */:
+                    // `b` in `({ a: b } = ...)`
+                    // `b` in `({ a: b = 1 } = ...)`
+                    // `{b}` in `({ a: {b} } = ...)`
+                    // `{b}` in `({ a: {b} = 1 } = ...)`
+                    // `[b]` in `({ a: [b] } = ...)`
+                    // `[b]` in `({ a: [b] = 1 } = ...)`
+                    // `b.c` in `({ a: b.c } = ...)`
+                    // `b.c` in `({ a: b.c = 1 } = ...)`
+                    // `b[0]` in `({ a: b[0] } = ...)`
+                    // `b[0]` in `({ a: b[0] = 1 } = ...)`
+                    return getTargetOfBindingOrAssignmentElement(bindingElement.initializer);
+                case 276 /* ShorthandPropertyAssignment */:
+                    // `a` in `({ a } = ...)`
+                    // `a` in `({ a = 1 } = ...)`
+                    return bindingElement.name;
+                case 277 /* SpreadAssignment */:
+                    // `a` in `({ ...a } = ...)`
+                    return getTargetOfBindingOrAssignmentElement(bindingElement.expression);
+            }
+            // no target
+            return undefined;
+        }
+        if (ts.isAssignmentExpression(bindingElement, /*excludeCompoundAssignment*/ true)) {
+            // `a` in `[a = 1] = ...`
+            // `{a}` in `[{a} = 1] = ...`
+            // `[a]` in `[[a] = 1] = ...`
+            // `a.b` in `[a.b = 1] = ...`
+            // `a[0]` in `[a[0] = 1] = ...`
+            return getTargetOfBindingOrAssignmentElement(bindingElement.left);
+        }
+        if (ts.isSpreadElement(bindingElement)) {
+            // `a` in `[...a] = ...`
+            return getTargetOfBindingOrAssignmentElement(bindingElement.expression);
+        }
+        // `a` in `[a] = ...`
+        // `{a}` in `[{a}] = ...`
+        // `[a]` in `[[a]] = ...`
+        // `a.b` in `[a.b] = ...`
+        // `a[0]` in `[a[0]] = ...`
+        return bindingElement;
+    }
+    ts.getTargetOfBindingOrAssignmentElement = getTargetOfBindingOrAssignmentElement;
+    /**
+     * Determines whether an BindingOrAssignmentElement is a rest element.
+     */
+    function getRestIndicatorOfBindingOrAssignmentElement(bindingElement) {
+        switch (bindingElement.kind) {
+            case 151 /* Parameter */:
+            case 186 /* BindingElement */:
+                // `...` in `let [...a] = ...`
+                return bindingElement.dotDotDotToken;
+            case 208 /* SpreadElement */:
+            case 277 /* SpreadAssignment */:
+                // `...` in `[...a] = ...`
+                return bindingElement;
+        }
+        return undefined;
+    }
+    ts.getRestIndicatorOfBindingOrAssignmentElement = getRestIndicatorOfBindingOrAssignmentElement;
+    /**
+     * Gets the property name of a BindingOrAssignmentElement
+     */
+    function getPropertyNameOfBindingOrAssignmentElement(bindingElement) {
+        switch (bindingElement.kind) {
+            case 186 /* BindingElement */:
+                // `a` in `let { a: b } = ...`
+                // `[a]` in `let { [a]: b } = ...`
+                // `"a"` in `let { "a": b } = ...`
+                // `1` in `let { 1: b } = ...`
+                if (bindingElement.propertyName) {
+                    var propertyName = bindingElement.propertyName;
+                    return ts.isComputedPropertyName(propertyName) && isStringOrNumericLiteral(propertyName.expression)
+                        ? propertyName.expression
+                        : propertyName;
+                }
+                break;
+            case 275 /* PropertyAssignment */:
+                // `a` in `({ a: b } = ...)`
+                // `[a]` in `({ [a]: b } = ...)`
+                // `"a"` in `({ "a": b } = ...)`
+                // `1` in `({ 1: b } = ...)`
+                if (bindingElement.name) {
+                    var propertyName = bindingElement.name;
+                    return ts.isComputedPropertyName(propertyName) && isStringOrNumericLiteral(propertyName.expression)
+                        ? propertyName.expression
+                        : propertyName;
+                }
+                break;
+            case 277 /* SpreadAssignment */:
+                // `a` in `({ ...a } = ...)`
+                return bindingElement.name;
+        }
+        var target = getTargetOfBindingOrAssignmentElement(bindingElement);
+        if (target && ts.isPropertyName(target)) {
+            return ts.isComputedPropertyName(target) && isStringOrNumericLiteral(target.expression)
+                ? target.expression
+                : target;
+        }
+        ts.Debug.fail("Invalid property name for binding element.");
+    }
+    ts.getPropertyNameOfBindingOrAssignmentElement = getPropertyNameOfBindingOrAssignmentElement;
+    function isStringOrNumericLiteral(node) {
+        var kind = node.kind;
+        return kind === 10 /* StringLiteral */
+            || kind === 8 /* NumericLiteral */;
+    }
+    /**
+     * Gets the elements of a BindingOrAssignmentPattern
+     */
+    function getElementsOfBindingOrAssignmentPattern(name) {
+        switch (name.kind) {
+            case 184 /* ObjectBindingPattern */:
+            case 185 /* ArrayBindingPattern */:
+            case 187 /* ArrayLiteralExpression */:
+                // `a` in `{a}`
+                // `a` in `[a]`
+                return name.elements;
+            case 188 /* ObjectLiteralExpression */:
+                // `a` in `{a}`
+                return name.properties;
+        }
+    }
+    ts.getElementsOfBindingOrAssignmentPattern = getElementsOfBindingOrAssignmentPattern;
+    function convertToArrayAssignmentElement(element) {
+        if (ts.isBindingElement(element)) {
+            if (element.dotDotDotToken) {
+                ts.Debug.assertNode(element.name, ts.isIdentifier);
+                return ts.setOriginalNode(ts.setTextRange(ts.createSpread(element.name), element), element);
+            }
+            var expression = convertToAssignmentElementTarget(element.name);
+            return element.initializer
+                ? ts.setOriginalNode(ts.setTextRange(ts.createAssignment(expression, element.initializer), element), element)
+                : expression;
+        }
+        ts.Debug.assertNode(element, ts.isExpression);
+        return element;
+    }
+    ts.convertToArrayAssignmentElement = convertToArrayAssignmentElement;
+    function convertToObjectAssignmentElement(element) {
+        if (ts.isBindingElement(element)) {
+            if (element.dotDotDotToken) {
+                ts.Debug.assertNode(element.name, ts.isIdentifier);
+                return ts.setOriginalNode(ts.setTextRange(ts.createSpreadAssignment(element.name), element), element);
+            }
+            if (element.propertyName) {
+                var expression = convertToAssignmentElementTarget(element.name);
+                return ts.setOriginalNode(ts.setTextRange(ts.createPropertyAssignment(element.propertyName, element.initializer ? ts.createAssignment(expression, element.initializer) : expression), element), element);
+            }
+            ts.Debug.assertNode(element.name, ts.isIdentifier);
+            return ts.setOriginalNode(ts.setTextRange(ts.createShorthandPropertyAssignment(element.name, element.initializer), element), element);
+        }
+        ts.Debug.assertNode(element, ts.isObjectLiteralElementLike);
+        return element;
+    }
+    ts.convertToObjectAssignmentElement = convertToObjectAssignmentElement;
+    function convertToAssignmentPattern(node) {
+        switch (node.kind) {
+            case 185 /* ArrayBindingPattern */:
+            case 187 /* ArrayLiteralExpression */:
+                return convertToArrayAssignmentPattern(node);
+            case 184 /* ObjectBindingPattern */:
+            case 188 /* ObjectLiteralExpression */:
+                return convertToObjectAssignmentPattern(node);
+        }
+    }
+    ts.convertToAssignmentPattern = convertToAssignmentPattern;
+    function convertToObjectAssignmentPattern(node) {
+        if (ts.isObjectBindingPattern(node)) {
+            return ts.setOriginalNode(ts.setTextRange(ts.createObjectLiteral(ts.map(node.elements, convertToObjectAssignmentElement)), node), node);
+        }
+        ts.Debug.assertNode(node, ts.isObjectLiteralExpression);
+        return node;
+    }
+    ts.convertToObjectAssignmentPattern = convertToObjectAssignmentPattern;
+    function convertToArrayAssignmentPattern(node) {
+        if (ts.isArrayBindingPattern(node)) {
+            return ts.setOriginalNode(ts.setTextRange(ts.createArrayLiteral(ts.map(node.elements, convertToArrayAssignmentElement)), node), node);
+        }
+        ts.Debug.assertNode(node, ts.isArrayLiteralExpression);
+        return node;
+    }
+    ts.convertToArrayAssignmentPattern = convertToArrayAssignmentPattern;
+    function convertToAssignmentElementTarget(node) {
+        if (ts.isBindingPattern(node)) {
+            return convertToAssignmentPattern(node);
+        }
+        ts.Debug.assertNode(node, ts.isExpression);
+        return node;
+    }
+    ts.convertToAssignmentElementTarget = convertToAssignmentElementTarget;
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    var isTypeNodeOrTypeParameterDeclaration = ts.or(ts.isTypeNode, ts.isTypeParameterDeclaration);
+    function visitNode(node, visitor, test, lift) {
+        if (node === undefined || visitor === undefined) {
+            return node;
+        }
+        ts.aggregateTransformFlags(node);
+        var visited = visitor(node);
+        if (visited === node) {
+            return node;
+        }
+        var visitedNode;
+        if (visited === undefined) {
+            return undefined;
+        }
+        else if (ts.isArray(visited)) {
+            visitedNode = (lift || extractSingleNode)(visited);
+        }
+        else {
+            visitedNode = visited;
+        }
+        ts.Debug.assertNode(visitedNode, test);
+        ts.aggregateTransformFlags(visitedNode);
+        return visitedNode;
+    }
+    ts.visitNode = visitNode;
+    /**
+     * Visits a NodeArray using the supplied visitor, possibly returning a new NodeArray in its place.
+     *
+     * @param nodes The NodeArray to visit.
+     * @param visitor The callback used to visit a Node.
+     * @param test A node test to execute for each node.
+     * @param start An optional value indicating the starting offset at which to start visiting.
+     * @param count An optional value indicating the maximum number of nodes to visit.
+     */
+    function visitNodes(nodes, visitor, test, start, count) {
+        if (nodes === undefined || visitor === undefined) {
+            return nodes;
+        }
+        var updated;
+        // Ensure start and count have valid values
+        var length = nodes.length;
+        if (start === undefined || start < 0) {
+            start = 0;
+        }
+        if (count === undefined || count > length - start) {
+            count = length - start;
+        }
+        if (start > 0 || count < length) {
+            // If we are not visiting all of the original nodes, we must always create a new array.
+            // Since this is a fragment of a node array, we do not copy over the previous location
+            // and will only copy over `hasTrailingComma` if we are including the last element.
+            updated = ts.createNodeArray([], /*hasTrailingComma*/ nodes.hasTrailingComma && start + count === length);
+        }
+        // Visit each original node.
+        for (var i = 0; i < count; i++) {
+            var node = nodes[i + start];
+            ts.aggregateTransformFlags(node);
+            var visited = node !== undefined ? visitor(node) : undefined;
+            if (updated !== undefined || visited === undefined || visited !== node) {
+                if (updated === undefined) {
+                    // Ensure we have a copy of `nodes`, up to the current index.
+                    updated = ts.createNodeArray(nodes.slice(0, i), nodes.hasTrailingComma);
+                    ts.setTextRange(updated, nodes);
+                }
+                if (visited) {
+                    if (ts.isArray(visited)) {
+                        for (var _i = 0, visited_1 = visited; _i < visited_1.length; _i++) {
+                            var visitedNode = visited_1[_i];
+                            ts.Debug.assertNode(visitedNode, test);
+                            ts.aggregateTransformFlags(visitedNode);
+                            updated.push(visitedNode);
+                        }
+                    }
+                    else {
+                        ts.Debug.assertNode(visited, test);
+                        ts.aggregateTransformFlags(visited);
+                        updated.push(visited);
+                    }
+                }
+            }
+        }
+        return updated || nodes;
+    }
+    ts.visitNodes = visitNodes;
+    /**
+     * Starts a new lexical environment and visits a statement list, ending the lexical environment
+     * and merging hoisted declarations upon completion.
+     */
+    function visitLexicalEnvironment(statements, visitor, context, start, ensureUseStrict) {
+        context.startLexicalEnvironment();
+        statements = visitNodes(statements, visitor, ts.isStatement, start);
+        if (ensureUseStrict && !ts.startsWithUseStrict(statements)) {
+            statements = ts.setTextRange(ts.createNodeArray([ts.createExpressionStatement(ts.createLiteral("use strict"))].concat(statements)), statements);
+        }
+        var declarations = context.endLexicalEnvironment();
+        return ts.setTextRange(ts.createNodeArray(ts.concatenate(declarations, statements)), statements);
+    }
+    ts.visitLexicalEnvironment = visitLexicalEnvironment;
+    /**
+     * Starts a new lexical environment and visits a parameter list, suspending the lexical
+     * environment upon completion.
+     */
+    function visitParameterList(nodes, visitor, context, nodesVisitor) {
+        if (nodesVisitor === void 0) { nodesVisitor = visitNodes; }
+        context.startLexicalEnvironment();
+        var updated = nodesVisitor(nodes, visitor, ts.isParameterDeclaration);
+        context.suspendLexicalEnvironment();
+        return updated;
+    }
+    ts.visitParameterList = visitParameterList;
+    function visitFunctionBody(node, visitor, context) {
+        context.resumeLexicalEnvironment();
+        var updated = visitNode(node, visitor, ts.isConciseBody);
+        var declarations = context.endLexicalEnvironment();
+        if (ts.some(declarations)) {
+            var block = ts.convertToFunctionBody(updated);
+            var statements = ts.mergeLexicalEnvironment(block.statements, declarations);
+            return ts.updateBlock(block, statements);
+        }
+        return updated;
+    }
+    ts.visitFunctionBody = visitFunctionBody;
+    function visitEachChild(node, visitor, context, nodesVisitor, tokenVisitor) {
+        if (nodesVisitor === void 0) { nodesVisitor = visitNodes; }
+        if (node === undefined) {
+            return undefined;
+        }
+        var kind = node.kind;
+        // No need to visit nodes with no children.
+        if ((kind > 0 /* FirstToken */ && kind <= 147 /* LastToken */) || kind === 178 /* ThisType */) {
+            return node;
+        }
+        switch (kind) {
+            // Names
+            case 72 /* Identifier */:
+                return ts.updateIdentifier(node, nodesVisitor(node.typeArguments, visitor, isTypeNodeOrTypeParameterDeclaration));
+            case 148 /* QualifiedName */:
+                return ts.updateQualifiedName(node, visitNode(node.left, visitor, ts.isEntityName), visitNode(node.right, visitor, ts.isIdentifier));
+            case 149 /* ComputedPropertyName */:
+                return ts.updateComputedPropertyName(node, visitNode(node.expression, visitor, ts.isExpression));
+            // Signature elements
+            case 150 /* TypeParameter */:
+                return ts.updateTypeParameterDeclaration(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.constraint, visitor, ts.isTypeNode), visitNode(node.default, visitor, ts.isTypeNode));
+            case 151 /* Parameter */:
+                return ts.updateParameter(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.dotDotDotToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
+            case 152 /* Decorator */:
+                return ts.updateDecorator(node, visitNode(node.expression, visitor, ts.isExpression));
+            // Type elements
+            case 153 /* PropertySignature */:
+                return ts.updatePropertySignature(node, nodesVisitor(node.modifiers, visitor, ts.isToken), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
+            case 154 /* PropertyDeclaration */:
+                return ts.updateProperty(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
+            case 155 /* MethodSignature */:
+                return ts.updateMethodSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken));
+            case 156 /* MethodDeclaration */:
+                return ts.updateMethod(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
+            case 157 /* Constructor */:
+                return ts.updateConstructor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitFunctionBody(node.body, visitor, context));
+            case 158 /* GetAccessor */:
+                return ts.updateGetAccessor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
+            case 159 /* SetAccessor */:
+                return ts.updateSetAccessor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitFunctionBody(node.body, visitor, context));
+            case 160 /* CallSignature */:
+                return ts.updateCallSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
+            case 161 /* ConstructSignature */:
+                return ts.updateConstructSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
+            case 162 /* IndexSignature */:
+                return ts.updateIndexSignature(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
+            // Types
+            case 163 /* TypePredicate */:
+                return ts.updateTypePredicateNode(node, visitNode(node.parameterName, visitor), visitNode(node.type, visitor, ts.isTypeNode));
+            case 164 /* TypeReference */:
+                return ts.updateTypeReferenceNode(node, visitNode(node.typeName, visitor, ts.isEntityName), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode));
+            case 165 /* FunctionType */:
+                return ts.updateFunctionTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
+            case 166 /* ConstructorType */:
+                return ts.updateConstructorTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
+            case 167 /* TypeQuery */:
+                return ts.updateTypeQueryNode(node, visitNode(node.exprName, visitor, ts.isEntityName));
+            case 168 /* TypeLiteral */:
+                return ts.updateTypeLiteralNode(node, nodesVisitor(node.members, visitor, ts.isTypeElement));
+            case 169 /* ArrayType */:
+                return ts.updateArrayTypeNode(node, visitNode(node.elementType, visitor, ts.isTypeNode));
+            case 170 /* TupleType */:
+                return ts.updateTupleTypeNode(node, nodesVisitor(node.elementTypes, visitor, ts.isTypeNode));
+            case 171 /* OptionalType */:
+                return ts.updateOptionalTypeNode(node, visitNode(node.type, visitor, ts.isTypeNode));
+            case 172 /* RestType */:
+                return ts.updateRestTypeNode(node, visitNode(node.type, visitor, ts.isTypeNode));
+            case 173 /* UnionType */:
+                return ts.updateUnionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode));
+            case 174 /* IntersectionType */:
+                return ts.updateIntersectionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode));
+            case 175 /* ConditionalType */:
+                return ts.updateConditionalTypeNode(node, visitNode(node.checkType, visitor, ts.isTypeNode), visitNode(node.extendsType, visitor, ts.isTypeNode), visitNode(node.trueType, visitor, ts.isTypeNode), visitNode(node.falseType, visitor, ts.isTypeNode));
+            case 176 /* InferType */:
+                return ts.updateInferTypeNode(node, visitNode(node.typeParameter, visitor, ts.isTypeParameterDeclaration));
+            case 183 /* ImportType */:
+                return ts.updateImportTypeNode(node, visitNode(node.argument, visitor, ts.isTypeNode), visitNode(node.qualifier, visitor, ts.isEntityName), visitNodes(node.typeArguments, visitor, ts.isTypeNode), node.isTypeOf);
+            case 177 /* ParenthesizedType */:
+                return ts.updateParenthesizedType(node, visitNode(node.type, visitor, ts.isTypeNode));
+            case 179 /* TypeOperator */:
+                return ts.updateTypeOperatorNode(node, visitNode(node.type, visitor, ts.isTypeNode));
+            case 180 /* IndexedAccessType */:
+                return ts.updateIndexedAccessTypeNode(node, visitNode(node.objectType, visitor, ts.isTypeNode), visitNode(node.indexType, visitor, ts.isTypeNode));
+            case 181 /* MappedType */:
+                return ts.updateMappedTypeNode(node, visitNode(node.readonlyToken, tokenVisitor, ts.isToken), visitNode(node.typeParameter, visitor, ts.isTypeParameterDeclaration), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode));
+            case 182 /* LiteralType */:
+                return ts.updateLiteralTypeNode(node, visitNode(node.literal, visitor, ts.isExpression));
+            // Binding patterns
+            case 184 /* ObjectBindingPattern */:
+                return ts.updateObjectBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isBindingElement));
+            case 185 /* ArrayBindingPattern */:
+                return ts.updateArrayBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isArrayBindingElement));
+            case 186 /* BindingElement */:
+                return ts.updateBindingElement(node, visitNode(node.dotDotDotToken, tokenVisitor, ts.isToken), visitNode(node.propertyName, visitor, ts.isPropertyName), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.initializer, visitor, ts.isExpression));
+            // Expression
+            case 187 /* ArrayLiteralExpression */:
+                return ts.updateArrayLiteral(node, nodesVisitor(node.elements, visitor, ts.isExpression));
+            case 188 /* ObjectLiteralExpression */:
+                return ts.updateObjectLiteral(node, nodesVisitor(node.properties, visitor, ts.isObjectLiteralElementLike));
+            case 189 /* PropertyAccessExpression */:
+                return ts.updatePropertyAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.name, visitor, ts.isIdentifier));
+            case 190 /* ElementAccessExpression */:
+                return ts.updateElementAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.argumentExpression, visitor, ts.isExpression));
+            case 191 /* CallExpression */:
+                return ts.updateCall(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression));
+            case 192 /* NewExpression */:
+                return ts.updateNew(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression));
+            case 193 /* TaggedTemplateExpression */:
+                return ts.updateTaggedTemplate(node, visitNode(node.tag, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isExpression), visitNode(node.template, visitor, ts.isTemplateLiteral));
+            case 194 /* TypeAssertionExpression */:
+                return ts.updateTypeAssertion(node, visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
+            case 195 /* ParenthesizedExpression */:
+                return ts.updateParen(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 196 /* FunctionExpression */:
+                return ts.updateFunctionExpression(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
+            case 197 /* ArrowFunction */:
+                return ts.updateArrowFunction(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.equalsGreaterThanToken, visitor, ts.isToken), visitFunctionBody(node.body, visitor, context));
+            case 198 /* DeleteExpression */:
+                return ts.updateDelete(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 199 /* TypeOfExpression */:
+                return ts.updateTypeOf(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 200 /* VoidExpression */:
+                return ts.updateVoid(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 201 /* AwaitExpression */:
+                return ts.updateAwait(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 202 /* PrefixUnaryExpression */:
+                return ts.updatePrefix(node, visitNode(node.operand, visitor, ts.isExpression));
+            case 203 /* PostfixUnaryExpression */:
+                return ts.updatePostfix(node, visitNode(node.operand, visitor, ts.isExpression));
+            case 204 /* BinaryExpression */:
+                return ts.updateBinary(node, visitNode(node.left, visitor, ts.isExpression), visitNode(node.right, visitor, ts.isExpression), visitNode(node.operatorToken, visitor, ts.isToken));
+            case 205 /* ConditionalExpression */:
+                return ts.updateConditional(node, visitNode(node.condition, visitor, ts.isExpression), visitNode(node.questionToken, visitor, ts.isToken), visitNode(node.whenTrue, visitor, ts.isExpression), visitNode(node.colonToken, visitor, ts.isToken), visitNode(node.whenFalse, visitor, ts.isExpression));
+            case 206 /* TemplateExpression */:
+                return ts.updateTemplateExpression(node, visitNode(node.head, visitor, ts.isTemplateHead), nodesVisitor(node.templateSpans, visitor, ts.isTemplateSpan));
+            case 207 /* YieldExpression */:
+                return ts.updateYield(node, visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.expression, visitor, ts.isExpression));
+            case 208 /* SpreadElement */:
+                return ts.updateSpread(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 209 /* ClassExpression */:
+                return ts.updateClassExpression(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isClassElement));
+            case 211 /* ExpressionWithTypeArguments */:
+                return ts.updateExpressionWithTypeArguments(node, nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
+            case 212 /* AsExpression */:
+                return ts.updateAsExpression(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.type, visitor, ts.isTypeNode));
+            case 213 /* NonNullExpression */:
+                return ts.updateNonNullExpression(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 214 /* MetaProperty */:
+                return ts.updateMetaProperty(node, visitNode(node.name, visitor, ts.isIdentifier));
+            // Misc
+            case 216 /* TemplateSpan */:
+                return ts.updateTemplateSpan(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.literal, visitor, ts.isTemplateMiddleOrTemplateTail));
+            // Element
+            case 218 /* Block */:
+                return ts.updateBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement));
+            case 219 /* VariableStatement */:
+                return ts.updateVariableStatement(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.declarationList, visitor, ts.isVariableDeclarationList));
+            case 221 /* ExpressionStatement */:
+                return ts.updateExpressionStatement(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 222 /* IfStatement */:
+                return ts.updateIf(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.thenStatement, visitor, ts.isStatement, ts.liftToBlock), visitNode(node.elseStatement, visitor, ts.isStatement, ts.liftToBlock));
+            case 223 /* DoStatement */:
+                return ts.updateDo(node, visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock), visitNode(node.expression, visitor, ts.isExpression));
+            case 224 /* WhileStatement */:
+                return ts.updateWhile(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
+            case 225 /* ForStatement */:
+                return ts.updateFor(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.condition, visitor, ts.isExpression), visitNode(node.incrementor, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
+            case 226 /* ForInStatement */:
+                return ts.updateForIn(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
+            case 227 /* ForOfStatement */:
+                return ts.updateForOf(node, visitNode(node.awaitModifier, visitor, ts.isToken), visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
+            case 228 /* ContinueStatement */:
+                return ts.updateContinue(node, visitNode(node.label, visitor, ts.isIdentifier));
+            case 229 /* BreakStatement */:
+                return ts.updateBreak(node, visitNode(node.label, visitor, ts.isIdentifier));
+            case 230 /* ReturnStatement */:
+                return ts.updateReturn(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 231 /* WithStatement */:
+                return ts.updateWith(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
+            case 232 /* SwitchStatement */:
+                return ts.updateSwitch(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.caseBlock, visitor, ts.isCaseBlock));
+            case 233 /* LabeledStatement */:
+                return ts.updateLabel(node, visitNode(node.label, visitor, ts.isIdentifier), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
+            case 234 /* ThrowStatement */:
+                return ts.updateThrow(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 235 /* TryStatement */:
+                return ts.updateTry(node, visitNode(node.tryBlock, visitor, ts.isBlock), visitNode(node.catchClause, visitor, ts.isCatchClause), visitNode(node.finallyBlock, visitor, ts.isBlock));
+            case 237 /* VariableDeclaration */:
+                return ts.updateVariableDeclaration(node, visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
+            case 238 /* VariableDeclarationList */:
+                return ts.updateVariableDeclarationList(node, nodesVisitor(node.declarations, visitor, ts.isVariableDeclaration));
+            case 239 /* FunctionDeclaration */:
+                return ts.updateFunctionDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
+            case 240 /* ClassDeclaration */:
+                return ts.updateClassDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isClassElement));
+            case 241 /* InterfaceDeclaration */:
+                return ts.updateInterfaceDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isTypeElement));
+            case 242 /* TypeAliasDeclaration */:
+                return ts.updateTypeAliasDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
+            case 243 /* EnumDeclaration */:
+                return ts.updateEnumDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.members, visitor, ts.isEnumMember));
+            case 244 /* ModuleDeclaration */:
+                return ts.updateModuleDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.body, visitor, ts.isModuleBody));
+            case 245 /* ModuleBlock */:
+                return ts.updateModuleBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement));
+            case 246 /* CaseBlock */:
+                return ts.updateCaseBlock(node, nodesVisitor(node.clauses, visitor, ts.isCaseOrDefaultClause));
+            case 247 /* NamespaceExportDeclaration */:
+                return ts.updateNamespaceExportDeclaration(node, visitNode(node.name, visitor, ts.isIdentifier));
+            case 248 /* ImportEqualsDeclaration */:
+                return ts.updateImportEqualsDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.moduleReference, visitor, ts.isModuleReference));
+            case 249 /* ImportDeclaration */:
+                return ts.updateImportDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.importClause, visitor, ts.isImportClause), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
+            case 250 /* ImportClause */:
+                return ts.updateImportClause(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.namedBindings, visitor, ts.isNamedImportBindings));
+            case 251 /* NamespaceImport */:
+                return ts.updateNamespaceImport(node, visitNode(node.name, visitor, ts.isIdentifier));
+            case 252 /* NamedImports */:
+                return ts.updateNamedImports(node, nodesVisitor(node.elements, visitor, ts.isImportSpecifier));
+            case 253 /* ImportSpecifier */:
+                return ts.updateImportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier), visitNode(node.name, visitor, ts.isIdentifier));
+            case 254 /* ExportAssignment */:
+                return ts.updateExportAssignment(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.expression, visitor, ts.isExpression));
+            case 255 /* ExportDeclaration */:
+                return ts.updateExportDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.exportClause, visitor, ts.isNamedExports), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
+            case 256 /* NamedExports */:
+                return ts.updateNamedExports(node, nodesVisitor(node.elements, visitor, ts.isExportSpecifier));
+            case 257 /* ExportSpecifier */:
+                return ts.updateExportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier), visitNode(node.name, visitor, ts.isIdentifier));
+            // Module references
+            case 259 /* ExternalModuleReference */:
+                return ts.updateExternalModuleReference(node, visitNode(node.expression, visitor, ts.isExpression));
+            // JSX
+            case 260 /* JsxElement */:
+                return ts.updateJsxElement(node, visitNode(node.openingElement, visitor, ts.isJsxOpeningElement), nodesVisitor(node.children, visitor, ts.isJsxChild), visitNode(node.closingElement, visitor, ts.isJsxClosingElement));
+            case 261 /* JsxSelfClosingElement */:
+                return ts.updateJsxSelfClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.attributes, visitor, ts.isJsxAttributes));
+            case 262 /* JsxOpeningElement */:
+                return ts.updateJsxOpeningElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.attributes, visitor, ts.isJsxAttributes));
+            case 263 /* JsxClosingElement */:
+                return ts.updateJsxClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression));
+            case 264 /* JsxFragment */:
+                return ts.updateJsxFragment(node, visitNode(node.openingFragment, visitor, ts.isJsxOpeningFragment), nodesVisitor(node.children, visitor, ts.isJsxChild), visitNode(node.closingFragment, visitor, ts.isJsxClosingFragment));
+            case 267 /* JsxAttribute */:
+                return ts.updateJsxAttribute(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.initializer, visitor, ts.isStringLiteralOrJsxExpression));
+            case 268 /* JsxAttributes */:
+                return ts.updateJsxAttributes(node, nodesVisitor(node.properties, visitor, ts.isJsxAttributeLike));
+            case 269 /* JsxSpreadAttribute */:
+                return ts.updateJsxSpreadAttribute(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 270 /* JsxExpression */:
+                return ts.updateJsxExpression(node, visitNode(node.expression, visitor, ts.isExpression));
+            // Clauses
+            case 271 /* CaseClause */:
+                return ts.updateCaseClause(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.statements, visitor, ts.isStatement));
+            case 272 /* DefaultClause */:
+                return ts.updateDefaultClause(node, nodesVisitor(node.statements, visitor, ts.isStatement));
+            case 273 /* HeritageClause */:
+                return ts.updateHeritageClause(node, nodesVisitor(node.types, visitor, ts.isExpressionWithTypeArguments));
+            case 274 /* CatchClause */:
+                return ts.updateCatchClause(node, visitNode(node.variableDeclaration, visitor, ts.isVariableDeclaration), visitNode(node.block, visitor, ts.isBlock));
+            // Property assignments
+            case 275 /* PropertyAssignment */:
+                return ts.updatePropertyAssignment(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
+            case 276 /* ShorthandPropertyAssignment */:
+                return ts.updateShorthandPropertyAssignment(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.objectAssignmentInitializer, visitor, ts.isExpression));
+            case 277 /* SpreadAssignment */:
+                return ts.updateSpreadAssignment(node, visitNode(node.expression, visitor, ts.isExpression));
+            // Enum
+            case 278 /* EnumMember */:
+                return ts.updateEnumMember(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
+            // Top-level nodes
+            case 279 /* SourceFile */:
+                return ts.updateSourceFileNode(node, visitLexicalEnvironment(node.statements, visitor, context));
+            // Transformation nodes
+            case 308 /* PartiallyEmittedExpression */:
+                return ts.updatePartiallyEmittedExpression(node, visitNode(node.expression, visitor, ts.isExpression));
+            case 309 /* CommaListExpression */:
+                return ts.updateCommaList(node, nodesVisitor(node.elements, visitor, ts.isExpression));
+            default:
+                // No need to visit nodes with no children.
+                return node;
+        }
+    }
+    ts.visitEachChild = visitEachChild;
+    /**
+     * Extracts the single node from a NodeArray.
+     *
+     * @param nodes The NodeArray.
+     */
+    function extractSingleNode(nodes) {
+        ts.Debug.assert(nodes.length <= 1, "Too many nodes written to output.");
+        return ts.singleOrUndefined(nodes);
+    }
+})(ts || (ts = {}));
+/* @internal */
+(function (ts) {
+    function reduceNode(node, f, initial) {
+        return node ? f(initial, node) : initial;
+    }
+    function reduceNodeArray(nodes, f, initial) {
+        return nodes ? f(initial, nodes) : initial;
+    }
+    /**
+     * Similar to `reduceLeft`, performs a reduction against each child of a node.
+     * NOTE: Unlike `forEachChild`, this does *not* visit every node.
+     *
+     * @param node The node containing the children to reduce.
+     * @param initial The initial value to supply to the reduction.
+     * @param f The callback function
+     */
+    function reduceEachChild(node, initial, cbNode, cbNodeArray) {
+        if (node === undefined) {
+            return initial;
+        }
+        var reduceNodes = cbNodeArray ? reduceNodeArray : ts.reduceLeft;
+        var cbNodes = cbNodeArray || cbNode;
+        var kind = node.kind;
+        // No need to visit nodes with no children.
+        if ((kind > 0 /* FirstToken */ && kind <= 147 /* LastToken */)) {
+            return initial;
+        }
+        // We do not yet support types.
+        if ((kind >= 163 /* TypePredicate */ && kind <= 182 /* LiteralType */)) {
+            return initial;
+        }
+        var result = initial;
+        switch (node.kind) {
+            // Leaf nodes
+            case 217 /* SemicolonClassElement */:
+            case 220 /* EmptyStatement */:
+            case 210 /* OmittedExpression */:
+            case 236 /* DebuggerStatement */:
+            case 307 /* NotEmittedStatement */:
+                // No need to visit nodes with no children.
+                break;
+            // Names
+            case 148 /* QualifiedName */:
+                result = reduceNode(node.left, cbNode, result);
+                result = reduceNode(node.right, cbNode, result);
+                break;
+            case 149 /* ComputedPropertyName */:
+                result = reduceNode(node.expression, cbNode, result);
+                break;
+            // Signature elements
+            case 151 /* Parameter */:
+                result = reduceNodes(node.decorators, cbNodes, result);
+                result = reduceNodes(node.modifiers, cbNodes, result);
+                result = reduceNode(node.name, cbNode, result);
+                result = reduceNode(node.type, cbNode, result);
+                result = reduceNode(node.initializer, cbNode, result);
+                break;
+            case 152 /* Decorator */:
+                result = reduceNode(node.expression, cbNode, result);
+                break;
+            // Type member
+            case 153 /* PropertySignature */:
+                result = reduceNodes(node.modifiers, cbNodes, result);
+                result = reduceNode(node.name, cbNode, result);
+                result = reduceNode(node.questionToken, cbNode, result);
+                result = reduceNode(node.type, cbNode, result);
+                result = reduceNode(node.initializer, cbNode, result);
+                break;
+            case 154 /* PropertyDeclaration */:
+                result = reduceNodes(node.decorators, cbNodes, result);
+                result = reduceNodes(node.modifiers, cbNodes, result);
+                result = reduceNode(node.name, cbNode, result);
+                result = reduceNode(node.type, cbNode, result);
+                result = reduceNode(node.initializer, cbNode, result);
+                break;
+            case 156 /* MethodDeclaration */:
+                result = reduceNodes(node.decorators, cbNodes, result);
+                result = reduceNodes(node.modifiers, cbNodes, result);
+                result = reduceNode(node.name, cbNode, result);
+                result = reduceNodes(node.typeParameters, cbNodes, result);
+                result = reduceNodes(node.parameters, cbNodes, result);
+                result = reduceNode(node.type, cbNode, result);
+                result = reduceNode(node.body, cbNode, result);
+                break;
+            case 157 /* Constructor */:
+                result = reduceNodes(node.modifiers, cbNodes, result);
+                result = reduceNodes(node.parameters, cbNodes, result);
+                result = reduceNode(node.body, cbNode, result);
+                break;
+            case 158 /* GetAccessor */:
+                result = reduceNodes(node.decorators, cbNodes, result);
+                result = reduceNodes(node.modifiers, cbNodes, result);
+                result = reduceNode(node.name, cbNode, result);
+                result = reduceNodes(node.parameters, cbNodes, result);
+                result = reduceNode(node.type, cbNode, result);
+                result = reduceNode(node.body, cbNode, result);
+                break;
+            case 159 /* SetAccessor */:
+                result = reduceNodes(node.decorators, cbNodes, result);
+                result = reduceNodes(node.modifiers, cbNodes, result);
+                result = reduceNode(node.name, cbNode, result);
+                result = reduceNodes(node.parameters, cbNodes, result);
+                result = reduceNode(node.body, cbNode, result);
+                break;
+            // Binding patterns
+            case 184 /* ObjectBindingPattern */:
+            case 185 /* ArrayBindingPattern */:
+                result = reduceNodes(node.elements, cbNodes, result);
+                break;
+            case 186 /* BindingElement */:
+                result = reduceNode(node.propertyName, cbNode, result);
+                result = reduceNode(node.name, cbNode, result);
+                result = reduceNode(node.initializer, cbNode, result);
+                break;
+            // Expression
+            case 187 /* ArrayLiteralExpression */:
+                result = reduceNodes(node.elements, cbNodes, result);
+                break;
+            case 188 /* ObjectLiteralExpression */:
+                result = reduceNodes(node.properties, cbNodes, result);
+                break;
+            case 189 /* PropertyAccessExpression */:
+                result = reduceNode(node.expression, cbNode, result);
+                result = reduceNode(node.name, cbNode, result);
+                break;
+            case 190 /* ElementAccessExpression */:
+                result = reduceNode(node.expression, cbNode, result);
+                result = reduceNode(node.argumentExpression, cbNode, result);
+                break;
+            case 191 /* CallExpression */:
+                result = reduceNode(node.expression, cbNode, result);
+                result = reduceNodes(node.typeArguments, cbNodes, result);
+                result = reduceNodes(node.arguments, cbNodes, result);
+                break;
+            case 192 /* NewExpression */:
+                result = reduceNode(node.expression, cbNode, result);
+                result = reduceNodes(node.typeArguments, cbNodes, result);
+                result = reduceNodes(node.arguments, cbNodes, result);
+                break;
+            case 193 /* TaggedTemplateExpression */:
+                result = reduceNode(node.tag, cbNode, result);
+                result = reduceNodes(node.typeArguments, cbNodes, result);
+                result = reduceNode(node.template, cbNode, result);
+                break;
+            case 194 /* TypeAssertionExpression */:
+                result = reduceNode(node.type, cbNode, result);
+                result = reduceNode(node.expression, cbNode, result);
+                break;
+            case 196 /* FunctionExpression */:
+                result = reduceNodes(node.modifiers, cbNodes, result);
+                result = reduceNode(node.name, cbNode, result);
+                result = reduceNodes(node.typeParameters, cbNodes, result);
+                result = reduceNodes(node.parameters, cbNodes, result);
+                result = reduceNode(node.type, cbNode, result);
+                result = reduceNode(node.body, cbNode, result);
+                break;
+            case 197 /* ArrowFunction */:
+                result = reduceNodes(node.modifiers, cbNodes, result);
+                result = reduceNodes(node.typeParameters, cbNodes, result);
+                result = reduceNodes(node.parameters, cbNodes, result);
+                result = reduceNode(node.type, cbNode, result);
+                result = reduceNode(node.body, cbNode, result);
+                break;
+            case 195 /* ParenthesizedExpression */:
+            case 198 /* DeleteExpression */:
+            case 199 /* TypeOfExpression */:
+            case 200 /* VoidExpression */:
+            case 201 /* AwaitExpression */:
+            case 207 /* YieldExpression */:
+            case 208 /* SpreadElement */:
+            case 213 /* NonNullExpression */:
+                result = reduceNode(node.expression, cbNode, result);
+                break;
+            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PostfixUnaryExpression */:
+                result = reduceNode(node.operand, cbNode, result);
+                break;
+            case 204 /* BinaryExpression */:
+                result = reduceNode(node.left, cbNode, result);
+                result = reduceNode(node.right, cbNode, result);
+                break;
+            case 205 /* ConditionalExpression */:
+                result = reduceNode(node.condition, cbNode, result);
+                result = reduceNode(node.whenTrue, cbNode, result);
+                result = reduceNode(node.whenFalse, cbNode, result);
+                break;
+            case 206 /* TemplateExpression */:
+                result = reduceNode(node.head, cbNode, result);
+                result = reduceNodes(node.templateSpans, cbNodes, result);
+                break;
+            case 209 /* ClassExpression */:
+                result = reduceNodes(node.modifiers, cbNodes, result);
+                result = reduceNode(node.name, cbNode, result);
+                result = reduceNodes(node.typeParameters, cbNodes, result);
+                result = reduceNodes(node.heritageClauses, cbNodes, result);
+                result = reduceNodes(node.members, cbNodes, result);
+                break;
+            case 211 /* ExpressionWithTypeArguments */:
+                result = reduceNode(node.expression, cbNode, result);
+                result = reduceNodes(node.typeArguments, cbNodes, result);
+                break;
+            case 212 /* AsExpression */:
+                result = reduceNode(node.expression, cbNode, result);
+                result = reduceNode(node.type, cbNode, result);
+                break;
+            // Misc
+            case 216 /* TemplateSpan */:
+                result = reduceNode(node.expression, cbNode, result);
+                result = reduceNode(node.literal, cbNode, result);
+                break;
+            // Element
+            case 218 /* Block */:
+                result = reduceNodes(node.statements, cbNodes, result);
+                break;
+            case 219 /* VariableStatement */:
+                result = reduceNodes(node.modifiers, cbNodes, result);
+                result = reduceNode(node.declarationList, cbNode, result);
+                break;
+            case 221 /* ExpressionStatement */:
+                result = reduceNode(node.expression, cbNode, result);
+                break;
+            case 222 /* IfStatement */:
+                result = reduceNode(node.expression, cbNode, result);
+                result = reduceNode(node.thenStatement, cbNode, result);
+                result = reduceNode(node.elseStatement, cbNode, result);
+                break;
+            case 223 /* DoStatement */:
+                result = reduceNode(node.statement, cbNode, result);
+                result = reduceNode(node.expression, cbNode, result);
+                break;
+            case 224 /* WhileStatement */:
+            case 231 /* WithStatement */:
+                result = reduceNode(node.expression, cbNode, result);
+                result = reduceNode(node.statement, cbNode, result);
+                break;
+            case 225 /* ForStatement */:
+                result = reduceNode(node.initializer, cbNode, result);
+                result = reduceNode(node.condition, cbNode, result);
+                result = reduceNode(node.incrementor, cbNode, result);
+                result = reduceNode(node.statement, cbNode, result);
+                break;
+            case 226 /* ForInStatement */:
+            case 227 /* ForOfStatement */:
+                result = reduceNode(node.initializer, cbNode, result);
+                result = reduceNode(node.expression, cbNode, result);
+                result = reduceNode(node.statement, cbNode, result);
+                break;
+            case 230 /* ReturnStatement */:
+            case 234 /* ThrowStatement */:
+                result = reduceNode(node.expression, cbNode, result);
+                break;
+            case 232 /* SwitchStatement */:
+                result = reduceNode(node.expression, cbNode, result);
+                result = reduceNode(node.caseBlock, cbNode, result);
+                break;
+            case 233 /* LabeledStatement */:
+                result = reduceNode(node.label, cbNode, result);
+                result = reduceNode(node.statement, cbNode, result);
+                break;
+            case 235 /* TryStatement */:
+                result = reduceNode(node.tryBlock, cbNode, result);
+                result = reduceNode(node.catchClause, cbNode, result);
+                result = reduceNode(node.finallyBlock, cbNode, result);
+                break;
+            case 237 /* VariableDeclaration */:
+                result = reduceNode(node.name, cbNode, result);
+                result = reduceNode(node.type, cbNode, result);
+                result = reduceNode(node.initializer, cbNode, result);
+                break;
+            case 238 /* VariableDeclarationList */:
+                result = reduceNodes(node.declarations, cbNodes, result);
+                break;
+            case 239 /* FunctionDeclaration */:
+                result = reduceNodes(node.decorators, cbNodes, result);
+                result = reduceNodes(node.modifiers, cbNodes, result);
+                result = reduceNode(node.name, cbNode, result);
+                result = reduceNodes(node.typeParameters, cbNodes, result);
+                result = reduceNodes(node.parameters, cbNodes, result);
+                result = reduceNode(node.type, cbNode, result);
+                result = reduceNode(node.body, cbNode, result);
+                break;
+            case 240 /* ClassDeclaration */:
+                result = reduceNodes(node.decorators, cbNodes, result);
+                result = reduceNodes(node.modifiers, cbNodes, result);
+                result = reduceNode(node.name, cbNode, result);
+                result = reduceNodes(node.typeParameters, cbNodes, result);
+                result = reduceNodes(node.heritageClauses, cbNodes, result);
+                result = reduceNodes(node.members, cbNodes, result);
+                break;
+            case 243 /* EnumDeclaration */:
+                result = reduceNodes(node.decorators, cbNodes, result);
+                result = reduceNodes(node.modifiers, cbNodes, result);
+                result = reduceNode(node.name, cbNode, result);
+                result = reduceNodes(node.members, cbNodes, result);
+                break;
+            case 244 /* ModuleDeclaration */:
+                result = reduceNodes(node.decorators, cbNodes, result);
+                result = reduceNodes(node.modifiers, cbNodes, result);
+                result = reduceNode(node.name, cbNode, result);
+                result = reduceNode(node.body, cbNode, result);
+                break;
+            case 245 /* ModuleBlock */:
+                result = reduceNodes(node.statements, cbNodes, result);
+                break;
+            case 246 /* CaseBlock */:
+                result = reduceNodes(node.clauses, cbNodes, result);
+                break;
+            case 248 /* ImportEqualsDeclaration */:
+                result = reduceNodes(node.decorators, cbNodes, result);
+                result = reduceNodes(node.modifiers, cbNodes, result);
+                result = reduceNode(node.name, cbNode, result);
+                result = reduceNode(node.moduleReference, cbNode, result);
+                break;
+            case 249 /* ImportDeclaration */:
+                result = reduceNodes(node.decorators, cbNodes, result);
+                result = reduceNodes(node.modifiers, cbNodes, result);
+                result = reduceNode(node.importClause, cbNode, result);
+                result = reduceNode(node.moduleSpecifier, cbNode, result);
+                break;
+            case 250 /* ImportClause */:
+                result = reduceNode(node.name, cbNode, result);
+                result = reduceNode(node.namedBindings, cbNode, result);
+                break;
+            case 251 /* NamespaceImport */:
+                result = reduceNode(node.name, cbNode, result);
+                break;
+            case 252 /* NamedImports */:
+            case 256 /* NamedExports */:
+                result = reduceNodes(node.elements, cbNodes, result);
+                break;
+            case 253 /* ImportSpecifier */:
+            case 257 /* ExportSpecifier */:
+                result = reduceNode(node.propertyName, cbNode, result);
+                result = reduceNode(node.name, cbNode, result);
+                break;
+            case 254 /* ExportAssignment */:
+                result = ts.reduceLeft(node.decorators, cbNode, result);
+                result = ts.reduceLeft(node.modifiers, cbNode, result);
+                result = reduceNode(node.expression, cbNode, result);
+                break;
+            case 255 /* ExportDeclaration */:
+                result = ts.reduceLeft(node.decorators, cbNode, result);
+                result = ts.reduceLeft(node.modifiers, cbNode, result);
+                result = reduceNode(node.exportClause, cbNode, result);
+                result = reduceNode(node.moduleSpecifier, cbNode, result);
+                break;
+            // Module references
+            case 259 /* ExternalModuleReference */:
+                result = reduceNode(node.expression, cbNode, result);
+                break;
+            // JSX
+            case 260 /* JsxElement */:
+                result = reduceNode(node.openingElement, cbNode, result);
+                result = ts.reduceLeft(node.children, cbNode, result);
+                result = reduceNode(node.closingElement, cbNode, result);
+                break;
+            case 264 /* JsxFragment */:
+                result = reduceNode(node.openingFragment, cbNode, result);
+                result = ts.reduceLeft(node.children, cbNode, result);
+                result = reduceNode(node.closingFragment, cbNode, result);
+                break;
+            case 261 /* JsxSelfClosingElement */:
+            case 262 /* JsxOpeningElement */:
+                result = reduceNode(node.tagName, cbNode, result);
+                result = reduceNodes(node.typeArguments, cbNode, result);
+                result = reduceNode(node.attributes, cbNode, result);
+                break;
+            case 268 /* JsxAttributes */:
+                result = reduceNodes(node.properties, cbNodes, result);
+                break;
+            case 263 /* JsxClosingElement */:
+                result = reduceNode(node.tagName, cbNode, result);
+                break;
+            case 267 /* JsxAttribute */:
+                result = reduceNode(node.name, cbNode, result);
+                result = reduceNode(node.initializer, cbNode, result);
+                break;
+            case 269 /* JsxSpreadAttribute */:
+                result = reduceNode(node.expression, cbNode, result);
+                break;
+            case 270 /* JsxExpression */:
+                result = reduceNode(node.expression, cbNode, result);
+                break;
+            // Clauses
+            case 271 /* CaseClause */:
+                result = reduceNode(node.expression, cbNode, result);
+            // falls through
+            case 272 /* DefaultClause */:
+                result = reduceNodes(node.statements, cbNodes, result);
+                break;
+            case 273 /* HeritageClause */:
+                result = reduceNodes(node.types, cbNodes, result);
+                break;
+            case 274 /* CatchClause */:
+                result = reduceNode(node.variableDeclaration, cbNode, result);
+                result = reduceNode(node.block, cbNode, result);
+                break;
+            // Property assignments
+            case 275 /* PropertyAssignment */:
+                result = reduceNode(node.name, cbNode, result);
+                result = reduceNode(node.initializer, cbNode, result);
+                break;
+            case 276 /* ShorthandPropertyAssignment */:
+                result = reduceNode(node.name, cbNode, result);
+                result = reduceNode(node.objectAssignmentInitializer, cbNode, result);
+                break;
+            case 277 /* SpreadAssignment */:
+                result = reduceNode(node.expression, cbNode, result);
+                break;
+            // Enum
+            case 278 /* EnumMember */:
+                result = reduceNode(node.name, cbNode, result);
+                result = reduceNode(node.initializer, cbNode, result);
+                break;
+            // Top-level nodes
+            case 279 /* SourceFile */:
+                result = reduceNodes(node.statements, cbNodes, result);
+                break;
+            // Transformation nodes
+            case 308 /* PartiallyEmittedExpression */:
+                result = reduceNode(node.expression, cbNode, result);
+                break;
+            case 309 /* CommaListExpression */:
+                result = reduceNodes(node.elements, cbNodes, result);
+                break;
+            default:
+                break;
+        }
+        return result;
+    }
+    ts.reduceEachChild = reduceEachChild;
+    function mergeLexicalEnvironment(statements, declarations) {
+        if (!ts.some(declarations)) {
+            return statements;
+        }
+        return ts.isNodeArray(statements)
+            ? ts.setTextRange(ts.createNodeArray(ts.addStatementsAfterPrologue(statements.slice(), declarations)), statements)
+            : ts.addStatementsAfterPrologue(statements, declarations);
+    }
+    ts.mergeLexicalEnvironment = mergeLexicalEnvironment;
+    /**
+     * Lifts a NodeArray containing only Statement nodes to a block.
+     *
+     * @param nodes The NodeArray.
+     */
+    function liftToBlock(nodes) {
+        Debug.assert(ts.every(nodes, ts.isStatement), "Cannot lift nodes to a Block.");
+        return ts.singleOrUndefined(nodes) || ts.createBlock(nodes);
+    }
+    ts.liftToBlock = liftToBlock;
+    /**
+     * Aggregates the TransformFlags for a Node and its subtree.
+     */
+    function aggregateTransformFlags(node) {
+        aggregateTransformFlagsForNode(node);
+        return node;
+    }
+    ts.aggregateTransformFlags = aggregateTransformFlags;
+    /**
+     * Aggregates the TransformFlags for a Node and its subtree. The flags for the subtree are
+     * computed first, then the transform flags for the current node are computed from the subtree
+     * flags and the state of the current node. Finally, the transform flags of the node are
+     * returned, excluding any flags that should not be included in its parent node's subtree
+     * flags.
+     */
+    function aggregateTransformFlagsForNode(node) {
+        if (node === undefined) {
+            return 0 /* None */;
+        }
+        if (node.transformFlags & 536870912 /* HasComputedFlags */) {
+            return node.transformFlags & ~ts.getTransformFlagsSubtreeExclusions(node.kind);
+        }
+        var subtreeFlags = aggregateTransformFlagsForSubtree(node);
+        return ts.computeTransformFlagsForNode(node, subtreeFlags);
+    }
+    function aggregateTransformFlagsForNodeArray(nodes) {
+        if (nodes === undefined) {
+            return 0 /* None */;
+        }
+        var subtreeFlags = 0 /* None */;
+        var nodeArrayFlags = 0 /* None */;
+        for (var _i = 0, nodes_3 = nodes; _i < nodes_3.length; _i++) {
+            var node = nodes_3[_i];
+            subtreeFlags |= aggregateTransformFlagsForNode(node);
+            nodeArrayFlags |= node.transformFlags & ~536870912 /* HasComputedFlags */;
+        }
+        nodes.transformFlags = nodeArrayFlags | 536870912 /* HasComputedFlags */;
+        return subtreeFlags;
+    }
+    /**
+     * Aggregates the transform flags for the subtree of a node.
+     */
+    function aggregateTransformFlagsForSubtree(node) {
+        // We do not transform ambient declarations or types, so there is no need to
+        // recursively aggregate transform flags.
+        if (ts.hasModifier(node, 2 /* Ambient */) || (ts.isTypeNode(node) && node.kind !== 211 /* ExpressionWithTypeArguments */)) {
+            return 0 /* None */;
+        }
+        // Aggregate the transform flags of each child.
+        return reduceEachChild(node, 0 /* None */, aggregateTransformFlagsForChildNode, aggregateTransformFlagsForChildNodes);
+    }
+    /**
+     * Aggregates the TransformFlags of a child node with the TransformFlags of its
+     * siblings.
+     */
+    function aggregateTransformFlagsForChildNode(transformFlags, node) {
+        return transformFlags | aggregateTransformFlagsForNode(node);
+    }
+    function aggregateTransformFlagsForChildNodes(transformFlags, nodes) {
+        return transformFlags | aggregateTransformFlagsForNodeArray(nodes);
+    }
+    var Debug;
+    (function (Debug) {
+        var isDebugInfoEnabled = false;
+        function failBadSyntaxKind(node, message) {
+            return Debug.fail((message || "Unexpected node.") + "\r\nNode " + ts.formatSyntaxKind(node.kind) + " was unexpected.", failBadSyntaxKind);
+        }
+        Debug.failBadSyntaxKind = failBadSyntaxKind;
+        Debug.assertEachNode = Debug.shouldAssert(1 /* Normal */)
+            ? function (nodes, test, message) { return Debug.assert(test === undefined || ts.every(nodes, test), message || "Unexpected node.", function () { return "Node array did not pass test '" + Debug.getFunctionName(test) + "'."; }, Debug.assertEachNode); }
+            : ts.noop;
+        Debug.assertNode = Debug.shouldAssert(1 /* Normal */)
+            ? function (node, test, message) { return Debug.assert(test === undefined || test(node), message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " did not pass test '" + Debug.getFunctionName(test) + "'."; }, Debug.assertNode); }
+            : ts.noop;
+        Debug.assertOptionalNode = Debug.shouldAssert(1 /* Normal */)
+            ? function (node, test, message) { return Debug.assert(test === undefined || node === undefined || test(node), message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " did not pass test '" + Debug.getFunctionName(test) + "'."; }, Debug.assertOptionalNode); }
+            : ts.noop;
+        Debug.assertOptionalToken = Debug.shouldAssert(1 /* Normal */)
+            ? function (node, kind, message) { return Debug.assert(kind === undefined || node === undefined || node.kind === kind, message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " was not a '" + ts.formatSyntaxKind(kind) + "' token."; }, Debug.assertOptionalToken); }
+            : ts.noop;
+        Debug.assertMissingNode = Debug.shouldAssert(1 /* Normal */)
+            ? function (node, message) { return Debug.assert(node === undefined, message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " was unexpected'."; }, Debug.assertMissingNode); }
+            : ts.noop;
+        /**
+         * Injects debug information into frequently used types.
+         */
+        function enableDebugInfo() {
+            if (isDebugInfoEnabled)
+                return;
+            // Add additional properties in debug mode to assist with debugging.
+            Object.defineProperties(ts.objectAllocator.getSymbolConstructor().prototype, {
+                __debugFlags: { get: function () { return ts.formatSymbolFlags(this.flags); } }
+            });
+            Object.defineProperties(ts.objectAllocator.getTypeConstructor().prototype, {
+                __debugFlags: { get: function () { return ts.formatTypeFlags(this.flags); } },
+                __debugObjectFlags: { get: function () { return this.flags & 524288 /* Object */ ? ts.formatObjectFlags(this.objectFlags) : ""; } },
+                __debugTypeToString: { value: function () { return this.checker.typeToString(this); } },
+            });
+            var nodeConstructors = [
+                ts.objectAllocator.getNodeConstructor(),
+                ts.objectAllocator.getIdentifierConstructor(),
+                ts.objectAllocator.getTokenConstructor(),
+                ts.objectAllocator.getSourceFileConstructor()
+            ];
+            for (var _i = 0, nodeConstructors_1 = nodeConstructors; _i < nodeConstructors_1.length; _i++) {
+                var ctor = nodeConstructors_1[_i];
+                if (!ctor.prototype.hasOwnProperty("__debugKind")) {
+                    Object.defineProperties(ctor.prototype, {
+                        __debugKind: { get: function () { return ts.formatSyntaxKind(this.kind); } },
+                        __debugModifierFlags: { get: function () { return ts.formatModifierFlags(ts.getModifierFlagsNoCache(this)); } },
+                        __debugTransformFlags: { get: function () { return ts.formatTransformFlags(this.transformFlags); } },
+                        __debugEmitFlags: { get: function () { return ts.formatEmitFlags(ts.getEmitFlags(this)); } },
+                        __debugGetText: {
+                            value: function (includeTrivia) {
+                                if (ts.nodeIsSynthesized(this))
+                                    return "";
+                                var parseNode = ts.getParseTreeNode(this);
+                                var sourceFile = parseNode && ts.getSourceFileOfNode(parseNode);
+                                return sourceFile ? ts.getSourceTextOfNodeFromSourceFile(sourceFile, parseNode, includeTrivia) : "";
+                            }
+                        }
+                    });
+                }
+            }
+            isDebugInfoEnabled = true;
+        }
+        Debug.enableDebugInfo = enableDebugInfo;
+    })(Debug = ts.Debug || (ts.Debug = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    function createSourceMapGenerator(host, file, sourceRoot, sourcesDirectoryPath, generatorOptions) {
+        var _a = generatorOptions.extendedDiagnostics
+            ? ts.performance.createTimer("Source Map", "beforeSourcemap", "afterSourcemap")
+            : ts.performance.nullTimer, enter = _a.enter, exit = _a.exit;
+        // Current source map file and its index in the sources list
+        var rawSources = [];
+        var sources = [];
+        var sourceToSourceIndexMap = ts.createMap();
+        var sourcesContent;
+        var names = [];
+        var nameToNameIndexMap;
+        var mappings = "";
+        // Last recorded and encoded mappings
+        var lastGeneratedLine = 0;
+        var lastGeneratedCharacter = 0;
+        var lastSourceIndex = 0;
+        var lastSourceLine = 0;
+        var lastSourceCharacter = 0;
+        var lastNameIndex = 0;
+        var hasLast = false;
+        var pendingGeneratedLine = 0;
+        var pendingGeneratedCharacter = 0;
+        var pendingSourceIndex = 0;
+        var pendingSourceLine = 0;
+        var pendingSourceCharacter = 0;
+        var pendingNameIndex = 0;
+        var hasPending = false;
+        var hasPendingSource = false;
+        var hasPendingName = false;
+        return {
+            getSources: function () { return rawSources; },
+            addSource: addSource,
+            setSourceContent: setSourceContent,
+            addName: addName,
+            addMapping: addMapping,
+            appendSourceMap: appendSourceMap,
+            toJSON: toJSON,
+            toString: function () { return JSON.stringify(toJSON()); }
+        };
+        function addSource(fileName) {
+            enter();
+            var source = ts.getRelativePathToDirectoryOrUrl(sourcesDirectoryPath, fileName, host.getCurrentDirectory(), host.getCanonicalFileName, 
+            /*isAbsolutePathAnUrl*/ true);
+            var sourceIndex = sourceToSourceIndexMap.get(source);
+            if (sourceIndex === undefined) {
+                sourceIndex = sources.length;
+                sources.push(source);
+                rawSources.push(fileName);
+                sourceToSourceIndexMap.set(source, sourceIndex);
+            }
+            exit();
+            return sourceIndex;
+        }
+        function setSourceContent(sourceIndex, content) {
+            enter();
+            if (content !== null) {
+                if (!sourcesContent)
+                    sourcesContent = [];
+                while (sourcesContent.length < sourceIndex) {
+                    // tslint:disable-next-line:no-null-keyword boolean-trivia
+                    sourcesContent.push(null);
+                }
+                sourcesContent[sourceIndex] = content;
+            }
+            exit();
+        }
+        function addName(name) {
+            enter();
+            if (!nameToNameIndexMap)
+                nameToNameIndexMap = ts.createMap();
+            var nameIndex = nameToNameIndexMap.get(name);
+            if (nameIndex === undefined) {
+                nameIndex = names.length;
+                names.push(name);
+                nameToNameIndexMap.set(name, nameIndex);
+            }
+            exit();
+            return nameIndex;
+        }
+        function isNewGeneratedPosition(generatedLine, generatedCharacter) {
+            return !hasPending
+                || pendingGeneratedLine !== generatedLine
+                || pendingGeneratedCharacter !== generatedCharacter;
+        }
+        function isBacktrackingSourcePosition(sourceIndex, sourceLine, sourceCharacter) {
+            return sourceIndex !== undefined
+                && sourceLine !== undefined
+                && sourceCharacter !== undefined
+                && pendingSourceIndex === sourceIndex
+                && (pendingSourceLine > sourceLine
+                    || pendingSourceLine === sourceLine && pendingSourceCharacter > sourceCharacter);
+        }
+        function addMapping(generatedLine, generatedCharacter, sourceIndex, sourceLine, sourceCharacter, nameIndex) {
+            ts.Debug.assert(generatedLine >= pendingGeneratedLine, "generatedLine cannot backtrack");
+            ts.Debug.assert(generatedCharacter >= 0, "generatedCharacter cannot be negative");
+            ts.Debug.assert(sourceIndex === undefined || sourceIndex >= 0, "sourceIndex cannot be negative");
+            ts.Debug.assert(sourceLine === undefined || sourceLine >= 0, "sourceLine cannot be negative");
+            ts.Debug.assert(sourceCharacter === undefined || sourceCharacter >= 0, "sourceCharacter cannot be negative");
+            enter();
+            // If this location wasn't recorded or the location in source is going backwards, record the mapping
+            if (isNewGeneratedPosition(generatedLine, generatedCharacter) ||
+                isBacktrackingSourcePosition(sourceIndex, sourceLine, sourceCharacter)) {
+                commitPendingMapping();
+                pendingGeneratedLine = generatedLine;
+                pendingGeneratedCharacter = generatedCharacter;
+                hasPendingSource = false;
+                hasPendingName = false;
+                hasPending = true;
+            }
+            if (sourceIndex !== undefined && sourceLine !== undefined && sourceCharacter !== undefined) {
+                pendingSourceIndex = sourceIndex;
+                pendingSourceLine = sourceLine;
+                pendingSourceCharacter = sourceCharacter;
+                hasPendingSource = true;
+                if (nameIndex !== undefined) {
+                    pendingNameIndex = nameIndex;
+                    hasPendingName = true;
+                }
+            }
+            exit();
+        }
+        function appendSourceMap(generatedLine, generatedCharacter, map, sourceMapPath) {
+            var _a;
+            ts.Debug.assert(generatedLine >= pendingGeneratedLine, "generatedLine cannot backtrack");
+            ts.Debug.assert(generatedCharacter >= 0, "generatedCharacter cannot be negative");
+            enter();
+            // First, decode the old component sourcemap
+            var sourceIndexToNewSourceIndexMap = [];
+            var nameIndexToNewNameIndexMap;
+            var mappingIterator = decodeMappings(map.mappings);
+            for (var _b = mappingIterator.next(), raw = _b.value, done = _b.done; !done; _a = mappingIterator.next(), raw = _a.value, done = _a.done, _a) {
+                // Then reencode all the updated mappings into the overall map
+                var newSourceIndex = void 0;
+                var newSourceLine = void 0;
+                var newSourceCharacter = void 0;
+                var newNameIndex = void 0;
+                if (raw.sourceIndex !== undefined) {
+                    newSourceIndex = sourceIndexToNewSourceIndexMap[raw.sourceIndex];
+                    if (newSourceIndex === undefined) {
+                        // Apply offsets to each position and fixup source entries
+                        var rawPath = map.sources[raw.sourceIndex];
+                        var relativePath = map.sourceRoot ? ts.combinePaths(map.sourceRoot, rawPath) : rawPath;
+                        var combinedPath = ts.combinePaths(ts.getDirectoryPath(sourceMapPath), relativePath);
+                        sourceIndexToNewSourceIndexMap[raw.sourceIndex] = newSourceIndex = addSource(combinedPath);
+                        if (map.sourcesContent && typeof map.sourcesContent[raw.sourceIndex] === "string") {
+                            setSourceContent(newSourceIndex, map.sourcesContent[raw.sourceIndex]);
+                        }
+                    }
+                    newSourceLine = raw.sourceLine;
+                    newSourceCharacter = raw.sourceCharacter;
+                    if (map.names && raw.nameIndex !== undefined) {
+                        if (!nameIndexToNewNameIndexMap)
+                            nameIndexToNewNameIndexMap = [];
+                        newNameIndex = nameIndexToNewNameIndexMap[raw.nameIndex];
+                        if (newNameIndex === undefined) {
+                            nameIndexToNewNameIndexMap[raw.nameIndex] = newNameIndex = addName(map.names[raw.nameIndex]);
+                        }
+                    }
+                }
+                var newGeneratedLine = raw.generatedLine + generatedLine;
+                var newGeneratedCharacter = raw.generatedLine === 0 ? raw.generatedCharacter + generatedCharacter : raw.generatedCharacter;
+                addMapping(newGeneratedLine, newGeneratedCharacter, newSourceIndex, newSourceLine, newSourceCharacter, newNameIndex);
+            }
+            exit();
+        }
+        function shouldCommitMapping() {
+            return !hasLast
+                || lastGeneratedLine !== pendingGeneratedLine
+                || lastGeneratedCharacter !== pendingGeneratedCharacter
+                || lastSourceIndex !== pendingSourceIndex
+                || lastSourceLine !== pendingSourceLine
+                || lastSourceCharacter !== pendingSourceCharacter
+                || lastNameIndex !== pendingNameIndex;
+        }
+        function commitPendingMapping() {
+            if (!hasPending || !shouldCommitMapping()) {
+                return;
+            }
+            enter();
+            // Line/Comma delimiters
+            if (lastGeneratedLine < pendingGeneratedLine) {
+                // Emit line delimiters
+                do {
+                    mappings += ";";
+                    lastGeneratedLine++;
+                    lastGeneratedCharacter = 0;
+                } while (lastGeneratedLine < pendingGeneratedLine);
+            }
+            else {
+                ts.Debug.assertEqual(lastGeneratedLine, pendingGeneratedLine, "generatedLine cannot backtrack");
+                // Emit comma to separate the entry
+                if (hasLast) {
+                    mappings += ",";
+                }
+            }
+            // 1. Relative generated character
+            mappings += base64VLQFormatEncode(pendingGeneratedCharacter - lastGeneratedCharacter);
+            lastGeneratedCharacter = pendingGeneratedCharacter;
+            if (hasPendingSource) {
+                // 2. Relative sourceIndex
+                mappings += base64VLQFormatEncode(pendingSourceIndex - lastSourceIndex);
+                lastSourceIndex = pendingSourceIndex;
+                // 3. Relative source line
+                mappings += base64VLQFormatEncode(pendingSourceLine - lastSourceLine);
+                lastSourceLine = pendingSourceLine;
+                // 4. Relative source character
+                mappings += base64VLQFormatEncode(pendingSourceCharacter - lastSourceCharacter);
+                lastSourceCharacter = pendingSourceCharacter;
+                if (hasPendingName) {
+                    // 5. Relative nameIndex
+                    mappings += base64VLQFormatEncode(pendingNameIndex - lastNameIndex);
+                    lastNameIndex = pendingNameIndex;
+                }
+            }
+            hasLast = true;
+            exit();
+        }
+        function toJSON() {
+            commitPendingMapping();
+            return {
+                version: 3,
+                file: file,
+                sourceRoot: sourceRoot,
+                sources: sources,
+                names: names,
+                mappings: mappings,
+                sourcesContent: sourcesContent,
+            };
+        }
+    }
+    ts.createSourceMapGenerator = createSourceMapGenerator;
+    // Sometimes tools can see the following line as a source mapping url comment, so we mangle it a bit (the [M])
+    var sourceMapCommentRegExp = /^\/\/[@#] source[M]appingURL=(.+)\s*$/;
+    var whitespaceOrMapCommentRegExp = /^\s*(\/\/[@#] .*)?$/;
+    function getLineInfo(text, lineStarts) {
+        return {
+            getLineCount: function () { return lineStarts.length; },
+            getLineText: function (line) { return text.substring(lineStarts[line], lineStarts[line + 1]); }
+        };
+    }
+    ts.getLineInfo = getLineInfo;
+    /**
+     * Tries to find the sourceMappingURL comment at the end of a file.
+     */
+    function tryGetSourceMappingURL(lineInfo) {
+        for (var index = lineInfo.getLineCount() - 1; index >= 0; index--) {
+            var line = lineInfo.getLineText(index);
+            var comment = sourceMapCommentRegExp.exec(line);
+            if (comment) {
+                return comment[1];
+            }
+            // If we see a non-whitespace/map comment-like line, break, to avoid scanning up the entire file
+            else if (!line.match(whitespaceOrMapCommentRegExp)) {
+                break;
+            }
+        }
+    }
+    ts.tryGetSourceMappingURL = tryGetSourceMappingURL;
+    function isStringOrNull(x) {
+        // tslint:disable-next-line:no-null-keyword
+        return typeof x === "string" || x === null;
+    }
+    function isRawSourceMap(x) {
+        // tslint:disable-next-line:no-null-keyword
+        return x !== null
+            && typeof x === "object"
+            && x.version === 3
+            && typeof x.file === "string"
+            && typeof x.mappings === "string"
+            && ts.isArray(x.sources) && ts.every(x.sources, ts.isString)
+            && (x.sourceRoot === undefined || x.sourceRoot === null || typeof x.sourceRoot === "string")
+            && (x.sourcesContent === undefined || x.sourcesContent === null || ts.isArray(x.sourcesContent) && ts.every(x.sourcesContent, isStringOrNull))
+            && (x.names === undefined || x.names === null || ts.isArray(x.names) && ts.every(x.names, ts.isString));
+    }
+    ts.isRawSourceMap = isRawSourceMap;
+    function tryParseRawSourceMap(text) {
+        try {
+            var parsed = JSON.parse(text);
+            if (isRawSourceMap(parsed)) {
+                return parsed;
+            }
+        }
+        catch (_a) {
+            // empty
+        }
+        return undefined;
+    }
+    ts.tryParseRawSourceMap = tryParseRawSourceMap;
+    function decodeMappings(mappings) {
+        var done = false;
+        var pos = 0;
+        var generatedLine = 0;
+        var generatedCharacter = 0;
+        var sourceIndex = 0;
+        var sourceLine = 0;
+        var sourceCharacter = 0;
+        var nameIndex = 0;
+        var error;
+        return {
+            get pos() { return pos; },
+            get error() { return error; },
+            get state() { return captureMapping(/*hasSource*/ true, /*hasName*/ true); },
+            next: function () {
+                while (!done && pos < mappings.length) {
+                    var ch = mappings.charCodeAt(pos);
+                    if (ch === 59 /* semicolon */) {
+                        // new line
+                        generatedLine++;
+                        generatedCharacter = 0;
+                        pos++;
+                        continue;
+                    }
+                    if (ch === 44 /* comma */) {
+                        // Next entry is on same line - no action needed
+                        pos++;
+                        continue;
+                    }
+                    var hasSource = false;
+                    var hasName = false;
+                    generatedCharacter += base64VLQFormatDecode();
+                    if (hasReportedError())
+                        return stopIterating();
+                    if (generatedCharacter < 0)
+                        return setErrorAndStopIterating("Invalid generatedCharacter found");
+                    if (!isSourceMappingSegmentEnd()) {
+                        hasSource = true;
+                        sourceIndex += base64VLQFormatDecode();
+                        if (hasReportedError())
+                            return stopIterating();
+                        if (sourceIndex < 0)
+                            return setErrorAndStopIterating("Invalid sourceIndex found");
+                        if (isSourceMappingSegmentEnd())
+                            return setErrorAndStopIterating("Unsupported Format: No entries after sourceIndex");
+                        sourceLine += base64VLQFormatDecode();
+                        if (hasReportedError())
+                            return stopIterating();
+                        if (sourceLine < 0)
+                            return setErrorAndStopIterating("Invalid sourceLine found");
+                        if (isSourceMappingSegmentEnd())
+                            return setErrorAndStopIterating("Unsupported Format: No entries after sourceLine");
+                        sourceCharacter += base64VLQFormatDecode();
+                        if (hasReportedError())
+                            return stopIterating();
+                        if (sourceCharacter < 0)
+                            return setErrorAndStopIterating("Invalid sourceCharacter found");
+                        if (!isSourceMappingSegmentEnd()) {
+                            hasName = true;
+                            nameIndex += base64VLQFormatDecode();
+                            if (hasReportedError())
+                                return stopIterating();
+                            if (nameIndex < 0)
+                                return setErrorAndStopIterating("Invalid nameIndex found");
+                            if (!isSourceMappingSegmentEnd())
+                                return setErrorAndStopIterating("Unsupported Error Format: Entries after nameIndex");
+                        }
+                    }
+                    return { value: captureMapping(hasSource, hasName), done: done };
+                }
+                return stopIterating();
+            }
+        };
+        function captureMapping(hasSource, hasName) {
+            return {
+                generatedLine: generatedLine,
+                generatedCharacter: generatedCharacter,
+                sourceIndex: hasSource ? sourceIndex : undefined,
+                sourceLine: hasSource ? sourceLine : undefined,
+                sourceCharacter: hasSource ? sourceCharacter : undefined,
+                nameIndex: hasName ? nameIndex : undefined
+            };
+        }
+        function stopIterating() {
+            done = true;
+            return { value: undefined, done: true };
+        }
+        function setError(message) {
+            if (error === undefined) {
+                error = message;
+            }
+        }
+        function setErrorAndStopIterating(message) {
+            setError(message);
+            return stopIterating();
+        }
+        function hasReportedError() {
+            return error !== undefined;
+        }
+        function isSourceMappingSegmentEnd() {
+            return (pos === mappings.length ||
+                mappings.charCodeAt(pos) === 44 /* comma */ ||
+                mappings.charCodeAt(pos) === 59 /* semicolon */);
+        }
+        function base64VLQFormatDecode() {
+            var moreDigits = true;
+            var shiftCount = 0;
+            var value = 0;
+            for (; moreDigits; pos++) {
+                if (pos >= mappings.length)
+                    return setError("Error in decoding base64VLQFormatDecode, past the mapping string"), -1;
+                // 6 digit number
+                var currentByte = base64FormatDecode(mappings.charCodeAt(pos));
+                if (currentByte === -1)
+                    return setError("Invalid character in VLQ"), -1;
+                // If msb is set, we still have more bits to continue
+                moreDigits = (currentByte & 32) !== 0;
+                // least significant 5 bits are the next msbs in the final value.
+                value = value | ((currentByte & 31) << shiftCount);
+                shiftCount += 5;
+            }
+            // Least significant bit if 1 represents negative and rest of the msb is actual absolute value
+            if ((value & 1) === 0) {
+                // + number
+                value = value >> 1;
+            }
+            else {
+                // - number
+                value = value >> 1;
+                value = -value;
+            }
+            return value;
+        }
+    }
+    ts.decodeMappings = decodeMappings;
+    function sameMapping(left, right) {
+        return left === right
+            || left.generatedLine === right.generatedLine
+                && left.generatedCharacter === right.generatedCharacter
+                && left.sourceIndex === right.sourceIndex
+                && left.sourceLine === right.sourceLine
+                && left.sourceCharacter === right.sourceCharacter
+                && left.nameIndex === right.nameIndex;
+    }
+    ts.sameMapping = sameMapping;
+    function isSourceMapping(mapping) {
+        return mapping.sourceIndex !== undefined
+            && mapping.sourceLine !== undefined
+            && mapping.sourceCharacter !== undefined;
+    }
+    ts.isSourceMapping = isSourceMapping;
+    function base64FormatEncode(value) {
+        return value >= 0 && value < 26 ? 65 /* A */ + value :
+            value >= 26 && value < 52 ? 97 /* a */ + value - 26 :
+                value >= 52 && value < 62 ? 48 /* _0 */ + value - 52 :
+                    value === 62 ? 43 /* plus */ :
+                        value === 63 ? 47 /* slash */ :
+                            ts.Debug.fail(value + ": not a base64 value");
+    }
+    function base64FormatDecode(ch) {
+        return ch >= 65 /* A */ && ch <= 90 /* Z */ ? ch - 65 /* A */ :
+            ch >= 97 /* a */ && ch <= 122 /* z */ ? ch - 97 /* a */ + 26 :
+                ch >= 48 /* _0 */ && ch <= 57 /* _9 */ ? ch - 48 /* _0 */ + 52 :
+                    ch === 43 /* plus */ ? 62 :
+                        ch === 47 /* slash */ ? 63 :
+                            -1;
+    }
+    function base64VLQFormatEncode(inValue) {
+        // Add a new least significant bit that has the sign of the value.
+        // if negative number the least significant bit that gets added to the number has value 1
+        // else least significant bit value that gets added is 0
+        // eg. -1 changes to binary : 01 [1] => 3
+        //     +1 changes to binary : 01 [0] => 2
+        if (inValue < 0) {
+            inValue = ((-inValue) << 1) + 1;
+        }
+        else {
+            inValue = inValue << 1;
+        }
+        // Encode 5 bits at a time starting from least significant bits
+        var encodedStr = "";
+        do {
+            var currentDigit = inValue & 31; // 11111
+            inValue = inValue >> 5;
+            if (inValue > 0) {
+                // There are still more digits to decode, set the msb (6th bit)
+                currentDigit = currentDigit | 32;
+            }
+            encodedStr = encodedStr + String.fromCharCode(base64FormatEncode(currentDigit));
+        } while (inValue > 0);
+        return encodedStr;
+    }
+    function isSourceMappedPosition(value) {
+        return value.sourceIndex !== undefined
+            && value.sourcePosition !== undefined;
+    }
+    function sameMappedPosition(left, right) {
+        return left.generatedPosition === right.generatedPosition
+            && left.sourceIndex === right.sourceIndex
+            && left.sourcePosition === right.sourcePosition;
+    }
+    function compareSourcePositions(left, right) {
+        // Compares sourcePosition without comparing sourceIndex
+        // since the mappings are grouped by sourceIndex
+        ts.Debug.assert(left.sourceIndex === right.sourceIndex);
+        return ts.compareValues(left.sourcePosition, right.sourcePosition);
+    }
+    function compareGeneratedPositions(left, right) {
+        return ts.compareValues(left.generatedPosition, right.generatedPosition);
+    }
+    function getSourcePositionOfMapping(value) {
+        return value.sourcePosition;
+    }
+    function getGeneratedPositionOfMapping(value) {
+        return value.generatedPosition;
+    }
+    function createDocumentPositionMapper(host, map, mapPath) {
+        var mapDirectory = ts.getDirectoryPath(mapPath);
+        var sourceRoot = map.sourceRoot ? ts.getNormalizedAbsolutePath(map.sourceRoot, mapDirectory) : mapDirectory;
+        var generatedAbsoluteFilePath = ts.getNormalizedAbsolutePath(map.file, mapDirectory);
+        var generatedFile = host.getSourceFileLike(generatedAbsoluteFilePath);
+        var sourceFileAbsolutePaths = map.sources.map(function (source) { return ts.getNormalizedAbsolutePath(source, sourceRoot); });
+        var sourceToSourceIndexMap = ts.createMapFromEntries(sourceFileAbsolutePaths.map(function (source, i) { return [host.getCanonicalFileName(source), i]; }));
+        var decodedMappings;
+        var generatedMappings;
+        var sourceMappings;
+        return {
+            getSourcePosition: getSourcePosition,
+            getGeneratedPosition: getGeneratedPosition
+        };
+        function processMapping(mapping) {
+            var generatedPosition = generatedFile !== undefined
+                ? ts.getPositionOfLineAndCharacter(generatedFile, mapping.generatedLine, mapping.generatedCharacter, /*allowEdits*/ true)
+                : -1;
+            var source;
+            var sourcePosition;
+            if (isSourceMapping(mapping)) {
+                var sourceFile = host.getSourceFileLike(sourceFileAbsolutePaths[mapping.sourceIndex]);
+                source = map.sources[mapping.sourceIndex];
+                sourcePosition = sourceFile !== undefined
+                    ? ts.getPositionOfLineAndCharacter(sourceFile, mapping.sourceLine, mapping.sourceCharacter, /*allowEdits*/ true)
+                    : -1;
+            }
+            return {
+                generatedPosition: generatedPosition,
+                source: source,
+                sourceIndex: mapping.sourceIndex,
+                sourcePosition: sourcePosition,
+                nameIndex: mapping.nameIndex
+            };
+        }
+        function getDecodedMappings() {
+            if (decodedMappings === undefined) {
+                var decoder = decodeMappings(map.mappings);
+                var mappings = ts.arrayFrom(decoder, processMapping);
+                if (decoder.error !== undefined) {
+                    if (host.log) {
+                        host.log("Encountered error while decoding sourcemap: " + decoder.error);
+                    }
+                    decodedMappings = ts.emptyArray;
+                }
+                else {
+                    decodedMappings = mappings;
+                }
+            }
+            return decodedMappings;
+        }
+        function getSourceMappings(sourceIndex) {
+            if (sourceMappings === undefined) {
+                var lists = [];
+                for (var _i = 0, _a = getDecodedMappings(); _i < _a.length; _i++) {
+                    var mapping = _a[_i];
+                    if (!isSourceMappedPosition(mapping))
+                        continue;
+                    var list = lists[mapping.sourceIndex];
+                    if (!list)
+                        lists[mapping.sourceIndex] = list = [];
+                    list.push(mapping);
+                }
+                sourceMappings = lists.map(function (list) { return ts.sortAndDeduplicate(list, compareSourcePositions, sameMappedPosition); });
+            }
+            return sourceMappings[sourceIndex];
+        }
+        function getGeneratedMappings() {
+            if (generatedMappings === undefined) {
+                var list = [];
+                for (var _i = 0, _a = getDecodedMappings(); _i < _a.length; _i++) {
+                    var mapping = _a[_i];
+                    list.push(mapping);
+                }
+                generatedMappings = ts.sortAndDeduplicate(list, compareGeneratedPositions, sameMappedPosition);
+            }
+            return generatedMappings;
+        }
+        function getGeneratedPosition(loc) {
+            var sourceIndex = sourceToSourceIndexMap.get(host.getCanonicalFileName(loc.fileName));
+            if (sourceIndex === undefined)
+                return loc;
+            var sourceMappings = getSourceMappings(sourceIndex);
+            if (!ts.some(sourceMappings))
+                return loc;
+            var targetIndex = ts.binarySearchKey(sourceMappings, loc.pos, getSourcePositionOfMapping, ts.compareValues);
+            if (targetIndex < 0) {
+                // if no exact match, closest is 2's complement of result
+                targetIndex = ~targetIndex;
+            }
+            var mapping = sourceMappings[targetIndex];
+            if (mapping === undefined || mapping.sourceIndex !== sourceIndex) {
+                return loc;
+            }
+            return { fileName: generatedAbsoluteFilePath, pos: mapping.generatedPosition }; // Closest pos
+        }
+        function getSourcePosition(loc) {
+            var generatedMappings = getGeneratedMappings();
+            if (!ts.some(generatedMappings))
+                return loc;
+            var targetIndex = ts.binarySearchKey(generatedMappings, loc.pos, getGeneratedPositionOfMapping, ts.compareValues);
+            if (targetIndex < 0) {
+                // if no exact match, closest is 2's complement of result
+                targetIndex = ~targetIndex;
+            }
+            var mapping = generatedMappings[targetIndex];
+            if (mapping === undefined || !isSourceMappedPosition(mapping)) {
+                return loc;
+            }
+            return { fileName: sourceFileAbsolutePaths[mapping.sourceIndex], pos: mapping.sourcePosition }; // Closest pos
+        }
+    }
+    ts.createDocumentPositionMapper = createDocumentPositionMapper;
+    ts.identitySourceMapConsumer = {
+        getSourcePosition: ts.identity,
+        getGeneratedPosition: ts.identity
+    };
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    function getOriginalNodeId(node) {
+        node = ts.getOriginalNode(node);
+        return node ? ts.getNodeId(node) : 0;
+    }
+    ts.getOriginalNodeId = getOriginalNodeId;
+    function containsDefaultReference(node) {
+        if (!node)
+            return false;
+        if (!ts.isNamedImports(node))
+            return false;
+        return ts.some(node.elements, isNamedDefaultReference);
+    }
+    function isNamedDefaultReference(e) {
+        return e.propertyName !== undefined && e.propertyName.escapedText === "default" /* Default */;
+    }
+    function chainBundle(transformSourceFile) {
+        return transformSourceFileOrBundle;
+        function transformSourceFileOrBundle(node) {
+            return node.kind === 279 /* SourceFile */ ? transformSourceFile(node) : transformBundle(node);
+        }
+        function transformBundle(node) {
+            return ts.createBundle(ts.map(node.sourceFiles, transformSourceFile), node.prepends);
+        }
+    }
+    ts.chainBundle = chainBundle;
+    function getImportNeedsImportStarHelper(node) {
+        if (!!ts.getNamespaceDeclarationNode(node)) {
+            return true;
+        }
+        var bindings = node.importClause && node.importClause.namedBindings;
+        if (!bindings) {
+            return false;
+        }
+        if (!ts.isNamedImports(bindings))
+            return false;
+        var defaultRefCount = 0;
+        for (var _i = 0, _a = bindings.elements; _i < _a.length; _i++) {
+            var binding = _a[_i];
+            if (isNamedDefaultReference(binding)) {
+                defaultRefCount++;
+            }
+        }
+        // Import star is required if there's default named refs mixed with non-default refs, or if theres non-default refs and it has a default import
+        return (defaultRefCount > 0 && defaultRefCount !== bindings.elements.length) || (!!(bindings.elements.length - defaultRefCount) && ts.isDefaultImport(node));
+    }
+    ts.getImportNeedsImportStarHelper = getImportNeedsImportStarHelper;
+    function getImportNeedsImportDefaultHelper(node) {
+        // Import default is needed if there's a default import or a default ref and no other refs (meaning an import star helper wasn't requested)
+        return !getImportNeedsImportStarHelper(node) && (ts.isDefaultImport(node) || (!!node.importClause && ts.isNamedImports(node.importClause.namedBindings) && containsDefaultReference(node.importClause.namedBindings))); // TODO: GH#18217
+    }
+    ts.getImportNeedsImportDefaultHelper = getImportNeedsImportDefaultHelper;
+    function collectExternalModuleInfo(sourceFile, resolver, compilerOptions) {
+        var externalImports = [];
+        var exportSpecifiers = ts.createMultiMap();
+        var exportedBindings = [];
+        var uniqueExports = ts.createMap();
+        var exportedNames;
+        var hasExportDefault = false;
+        var exportEquals;
+        var hasExportStarsToExportValues = false;
+        var hasImportStarOrImportDefault = false;
+        for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
+            var node = _a[_i];
+            switch (node.kind) {
+                case 249 /* ImportDeclaration */:
+                    // import "mod"
+                    // import x from "mod"
+                    // import * as x from "mod"
+                    // import { x, y } from "mod"
+                    externalImports.push(node);
+                    hasImportStarOrImportDefault = hasImportStarOrImportDefault || getImportNeedsImportStarHelper(node) || getImportNeedsImportDefaultHelper(node);
+                    break;
+                case 248 /* ImportEqualsDeclaration */:
+                    if (node.moduleReference.kind === 259 /* ExternalModuleReference */) {
+                        // import x = require("mod")
+                        externalImports.push(node);
+                    }
+                    break;
+                case 255 /* ExportDeclaration */:
+                    if (node.moduleSpecifier) {
+                        if (!node.exportClause) {
+                            // export * from "mod"
+                            externalImports.push(node);
+                            hasExportStarsToExportValues = true;
+                        }
+                        else {
+                            // export { x, y } from "mod"
+                            externalImports.push(node);
+                        }
+                    }
+                    else {
+                        // export { x, y }
+                        for (var _b = 0, _c = node.exportClause.elements; _b < _c.length; _b++) {
+                            var specifier = _c[_b];
+                            if (!uniqueExports.get(ts.idText(specifier.name))) {
+                                var name = specifier.propertyName || specifier.name;
+                                exportSpecifiers.add(ts.idText(name), specifier);
+                                var decl = resolver.getReferencedImportDeclaration(name)
+                                    || resolver.getReferencedValueDeclaration(name);
+                                if (decl) {
+                                    multiMapSparseArrayAdd(exportedBindings, getOriginalNodeId(decl), specifier.name);
+                                }
+                                uniqueExports.set(ts.idText(specifier.name), true);
+                                exportedNames = ts.append(exportedNames, specifier.name);
+                            }
+                        }
+                    }
+                    break;
+                case 254 /* ExportAssignment */:
+                    if (node.isExportEquals && !exportEquals) {
+                        // export = x
+                        exportEquals = node;
+                    }
+                    break;
+                case 219 /* VariableStatement */:
+                    if (ts.hasModifier(node, 1 /* Export */)) {
+                        for (var _d = 0, _e = node.declarationList.declarations; _d < _e.length; _d++) {
+                            var decl = _e[_d];
+                            exportedNames = collectExportedVariableInfo(decl, uniqueExports, exportedNames);
+                        }
+                    }
+                    break;
+                case 239 /* FunctionDeclaration */:
+                    if (ts.hasModifier(node, 1 /* Export */)) {
+                        if (ts.hasModifier(node, 512 /* Default */)) {
+                            // export default function() { }
+                            if (!hasExportDefault) {
+                                multiMapSparseArrayAdd(exportedBindings, getOriginalNodeId(node), ts.getDeclarationName(node));
+                                hasExportDefault = true;
+                            }
+                        }
+                        else {
+                            // export function x() { }
+                            var name = node.name;
+                            if (!uniqueExports.get(ts.idText(name))) {
+                                multiMapSparseArrayAdd(exportedBindings, getOriginalNodeId(node), name);
+                                uniqueExports.set(ts.idText(name), true);
+                                exportedNames = ts.append(exportedNames, name);
+                            }
+                        }
+                    }
+                    break;
+                case 240 /* ClassDeclaration */:
+                    if (ts.hasModifier(node, 1 /* Export */)) {
+                        if (ts.hasModifier(node, 512 /* Default */)) {
+                            // export default class { }
+                            if (!hasExportDefault) {
+                                multiMapSparseArrayAdd(exportedBindings, getOriginalNodeId(node), ts.getDeclarationName(node));
+                                hasExportDefault = true;
+                            }
+                        }
+                        else {
+                            // export class x { }
+                            var name = node.name;
+                            if (name && !uniqueExports.get(ts.idText(name))) {
+                                multiMapSparseArrayAdd(exportedBindings, getOriginalNodeId(node), name);
+                                uniqueExports.set(ts.idText(name), true);
+                                exportedNames = ts.append(exportedNames, name);
+                            }
+                        }
+                    }
+                    break;
+            }
+        }
+        var externalHelpersModuleName = ts.getOrCreateExternalHelpersModuleNameIfNeeded(sourceFile, compilerOptions, hasExportStarsToExportValues, hasImportStarOrImportDefault);
+        var externalHelpersImportDeclaration = externalHelpersModuleName && ts.createImportDeclaration(
+        /*decorators*/ undefined, 
+        /*modifiers*/ undefined, ts.createImportClause(/*name*/ undefined, ts.createNamespaceImport(externalHelpersModuleName)), ts.createLiteral(ts.externalHelpersModuleNameText));
+        if (externalHelpersImportDeclaration) {
+            ts.addEmitFlags(externalHelpersImportDeclaration, 67108864 /* NeverApplyImportHelper */);
+            externalImports.unshift(externalHelpersImportDeclaration);
+        }
+        return { externalImports: externalImports, exportSpecifiers: exportSpecifiers, exportEquals: exportEquals, hasExportStarsToExportValues: hasExportStarsToExportValues, exportedBindings: exportedBindings, exportedNames: exportedNames, externalHelpersImportDeclaration: externalHelpersImportDeclaration };
+    }
+    ts.collectExternalModuleInfo = collectExternalModuleInfo;
+    function collectExportedVariableInfo(decl, uniqueExports, exportedNames) {
+        if (ts.isBindingPattern(decl.name)) {
+            for (var _i = 0, _a = decl.name.elements; _i < _a.length; _i++) {
+                var element = _a[_i];
+                if (!ts.isOmittedExpression(element)) {
+                    exportedNames = collectExportedVariableInfo(element, uniqueExports, exportedNames);
+                }
+            }
+        }
+        else if (!ts.isGeneratedIdentifier(decl.name)) {
+            var text = ts.idText(decl.name);
+            if (!uniqueExports.get(text)) {
+                uniqueExports.set(text, true);
+                exportedNames = ts.append(exportedNames, decl.name);
+            }
+        }
+        return exportedNames;
+    }
+    /** Use a sparse array as a multi-map. */
+    function multiMapSparseArrayAdd(map, key, value) {
+        var values = map[key];
+        if (values) {
+            values.push(value);
+        }
+        else {
+            map[key] = values = [value];
+        }
+        return values;
+    }
+    /**
+     * Used in the module transformer to check if an expression is reasonably without sideeffect,
+     *  and thus better to copy into multiple places rather than to cache in a temporary variable
+     *  - this is mostly subjective beyond the requirement that the expression not be sideeffecting
+     */
+    function isSimpleCopiableExpression(expression) {
+        return ts.isStringLiteralLike(expression) ||
+            expression.kind === 8 /* NumericLiteral */ ||
+            ts.isKeyword(expression.kind) ||
+            ts.isIdentifier(expression);
+    }
+    ts.isSimpleCopiableExpression = isSimpleCopiableExpression;
+    /**
+     * @param input Template string input strings
+     * @param args Names which need to be made file-level unique
+     */
+    function helperString(input) {
+        var args = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            args[_i - 1] = arguments[_i];
+        }
+        return function (uniqueName) {
+            var result = "";
+            for (var i = 0; i < args.length; i++) {
+                result += input[i];
+                result += uniqueName(args[i]);
+            }
+            result += input[input.length - 1];
+            return result;
+        };
+    }
+    ts.helperString = helperString;
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
+(function (ts) {
+    var FlattenLevel;
+    (function (FlattenLevel) {
+        FlattenLevel[FlattenLevel["All"] = 0] = "All";
+        FlattenLevel[FlattenLevel["ObjectRest"] = 1] = "ObjectRest";
+    })(FlattenLevel = ts.FlattenLevel || (ts.FlattenLevel = {}));
+    /**
+     * Flattens a DestructuringAssignment or a VariableDeclaration to an expression.
+     *
+     * @param node The node to flatten.
+     * @param visitor An optional visitor used to visit initializers.
+     * @param context The transformation context.
+     * @param level Indicates the extent to which flattening should occur.
+     * @param needsValue An optional value indicating whether the value from the right-hand-side of
+     * the destructuring assignment is needed as part of a larger expression.
+     * @param createAssignmentCallback An optional callback used to create the assignment expression.
+     */
+    function flattenDestructuringAssignment(node, visitor, context, level, needsValue, createAssignmentCallback) {
+        var location = node;
+        var value;
+        if (ts.isDestructuringAssignment(node)) {
+            value = node.right;
+            while (ts.isEmptyArrayLiteral(node.left) || ts.isEmptyObjectLiteral(node.left)) {
+                if (ts.isDestructuringAssignment(value)) {
+                    location = node = value;
+                    value = node.right;
+                }
+                else {
+                    return ts.visitNode(value, visitor, ts.isExpression);
+                }
+            }
+        }
+        var expressions;
+        var flattenContext = {
+            context: context,
+            level: level,
+            downlevelIteration: !!context.getCompilerOptions().downlevelIteration,
+            hoistTempVariables: true,
+            emitExpression: emitExpression,
+            emitBindingOrAssignment: emitBindingOrAssignment,
+            createArrayBindingOrAssignmentPattern: makeArrayAssignmentPattern,
+            createObjectBindingOrAssignmentPattern: makeObjectAssignmentPattern,
+            createArrayBindingOrAssignmentElement: makeAssignmentElement,
+            visitor: visitor
+        };
+        if (value) {
+            value = ts.visitNode(value, visitor, ts.isExpression);
+            if (ts.isIdentifier(value) && bindingOrAssignmentElementAssignsToName(node, value.escapedText)) {
+                // If the right-hand value of the assignment is also an assignment target then
+                // we need to cache the right-hand value.
+                value = ensureIdentifier(flattenContext, value, /*reuseIdentifierExpressions*/ false, location);
+            }
+            else if (needsValue) {
+                // If the right-hand value of the destructuring assignment needs to be preserved (as
+                // is the case when the destructuring assignment is part of a larger expression),
+                // then we need to cache the right-hand value.
+                //
+                // The source map location for the assignment should point to the entire binary
+                // expression.
+                value = ensureIdentifier(flattenContext, value, /*reuseIdentifierExpressions*/ true, location);
+            }
+            else if (ts.nodeIsSynthesized(node)) {
+                // Generally, the source map location for a destructuring assignment is the root
+                // expression.
+                //
+                // However, if the root expression is synthesized (as in the case
+                // of the initializer when transforming a ForOfStatement), then the source map
+                // location should point to the right-hand value of the expression.
+                location = value;
+            }
+        }
+        flattenBindingOrAssignmentElement(flattenContext, node, value, location, /*skipInitializer*/ ts.isDestructuringAssignment(node));
+        if (value && needsValue) {
+            if (!ts.some(expressions)) {
+                return value;
+            }
+            expressions.push(value);
+        }
+        return ts.aggregateTransformFlags(ts.inlineExpressions(expressions)) || ts.createOmittedExpression();
+        function emitExpression(expression) {
+            // NOTE: this completely disables source maps, but aligns with the behavior of
+            //       `emitAssignment` in the old emitter.
+            ts.setEmitFlags(expression, 64 /* NoNestedSourceMaps */);
+            ts.aggregateTransformFlags(expression);
+            expressions = ts.append(expressions, expression);
+        }
+        function emitBindingOrAssignment(target, value, location, original) {
+            ts.Debug.assertNode(target, createAssignmentCallback ? ts.isIdentifier : ts.isExpression);
+            var expression = createAssignmentCallback
+                ? createAssignmentCallback(target, value, location)
+                : ts.setTextRange(ts.createAssignment(ts.visitNode(target, visitor, ts.isExpression), value), location);
+            expression.original = original;
+            emitExpression(expression);
+        }
+    }
+    ts.flattenDestructuringAssignment = flattenDestructuringAssignment;
+    function bindingOrAssignmentElementAssignsToName(element, escapedName) {
+        var target = ts.getTargetOfBindingOrAssignmentElement(element); // TODO: GH#18217
+        if (ts.isBindingOrAssignmentPattern(target)) {
+            return bindingOrAssignmentPatternAssignsToName(target, escapedName);
+        }
+        else if (ts.isIdentifier(target)) {
+            return target.escapedText === escapedName;
+        }
+        return false;
+    }
+    function bindingOrAssignmentPatternAssignsToName(pattern, escapedName) {
+        var elements = ts.getElementsOfBindingOrAssignmentPattern(pattern);
+        for (var _i = 0, elements_3 = elements; _i < elements_3.length; _i++) {
+            var element = elements_3[_i];
+            if (bindingOrAssignmentElementAssignsToName(element, escapedName)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    /**
+     * Flattens a VariableDeclaration or ParameterDeclaration to one or more variable declarations.
+     *
+     * @param node The node to flatten.
+     * @param visitor An optional visitor used to visit initializers.
+     * @param context The transformation context.
+     * @param boundValue The value bound to the declaration.
+     * @param skipInitializer A value indicating whether to ignore the initializer of `node`.
+     * @param hoistTempVariables Indicates whether temporary variables should not be recorded in-line.
+     * @param level Indicates the extent to which flattening should occur.
+     */
+    function flattenDestructuringBinding(node, visitor, context, level, rval, hoistTempVariables, skipInitializer) {
+        if (hoistTempVariables === void 0) { hoistTempVariables = false; }
+        var pendingExpressions;
+        var pendingDeclarations = [];
+        var declarations = [];
+        var flattenContext = {
+            context: context,
+            level: level,
+            downlevelIteration: !!context.getCompilerOptions().downlevelIteration,
+            hoistTempVariables: hoistTempVariables,
+            emitExpression: emitExpression,
+            emitBindingOrAssignment: emitBindingOrAssignment,
+            createArrayBindingOrAssignmentPattern: makeArrayBindingPattern,
+            createObjectBindingOrAssignmentPattern: makeObjectBindingPattern,
+            createArrayBindingOrAssignmentElement: makeBindingElement,
+            visitor: visitor
+        };
+        if (ts.isVariableDeclaration(node)) {
+            var initializer = ts.getInitializerOfBindingOrAssignmentElement(node);
+            if (initializer && ts.isIdentifier(initializer) && bindingOrAssignmentElementAssignsToName(node, initializer.escapedText)) {
+                // If the right-hand value of the assignment is also an assignment target then
+                // we need to cache the right-hand value.
+                initializer = ensureIdentifier(flattenContext, initializer, /*reuseIdentifierExpressions*/ false, initializer);
+                node = ts.updateVariableDeclaration(node, node.name, node.type, initializer);
+            }
+        }
+        flattenBindingOrAssignmentElement(flattenContext, node, rval, node, skipInitializer);
+        if (pendingExpressions) {
+            var temp = ts.createTempVariable(/*recordTempVariable*/ undefined);
+            if (hoistTempVariables) {
+                var value = ts.inlineExpressions(pendingExpressions);
+                pendingExpressions = undefined;
+                emitBindingOrAssignment(temp, value, /*location*/ undefined, /*original*/ undefined);
+            }
+            else {
+                context.hoistVariableDeclaration(temp);
+                var pendingDeclaration = ts.last(pendingDeclarations);
+                pendingDeclaration.pendingExpressions = ts.append(pendingDeclaration.pendingExpressions, ts.createAssignment(temp, pendingDeclaration.value));
+                ts.addRange(pendingDeclaration.pendingExpressions, pendingExpressions);
+                pendingDeclaration.value = temp;
+            }
+        }
+        for (var _i = 0, pendingDeclarations_1 = pendingDeclarations; _i < pendingDeclarations_1.length; _i++) {
+            var _a = pendingDeclarations_1[_i], pendingExpressions_1 = _a.pendingExpressions, name = _a.name, value = _a.value, location = _a.location, original = _a.original;
+            var variable = ts.createVariableDeclaration(name, 
+            /*type*/ undefined, pendingExpressions_1 ? ts.inlineExpressions(ts.append(pendingExpressions_1, value)) : value);
+            variable.original = original;
+            ts.setTextRange(variable, location);
+            if (ts.isIdentifier(name)) {
+                ts.setEmitFlags(variable, 64 /* NoNestedSourceMaps */);
+            }
+            ts.aggregateTransformFlags(variable);
+            declarations.push(variable);
+        }
+        return declarations;
+        function emitExpression(value) {
+            pendingExpressions = ts.append(pendingExpressions, value);
+        }
+        function emitBindingOrAssignment(target, value, location, original) {
+            ts.Debug.assertNode(target, ts.isBindingName);
+            if (pendingExpressions) {
+                value = ts.inlineExpressions(ts.append(pendingExpressions, value));
+                pendingExpressions = undefined;
+            }
+            pendingDeclarations.push({ pendingExpressions: pendingExpressions, name: target, value: value, location: location, original: original });
+        }
+    }
+    ts.flattenDestructuringBinding = flattenDestructuringBinding;
+    /**
+     * Flattens a BindingOrAssignmentElement into zero or more bindings or assignments.
+     *
+     * @param flattenContext Options used to control flattening.
+     * @param element The element to flatten.
+     * @param value The current RHS value to assign to the element.
+     * @param location The location to use for source maps and comments.
+     * @param skipInitializer An optional value indicating whether to include the initializer
+     * for the element.
+     */
+    function flattenBindingOrAssignmentElement(flattenContext, element, value, location, skipInitializer) {
+        if (!skipInitializer) {
+            var initializer = ts.visitNode(ts.getInitializerOfBindingOrAssignmentElement(element), flattenContext.visitor, ts.isExpression);
+            if (initializer) {
+                // Combine value and initializer
+                value = value ? createDefaultValueCheck(flattenContext, value, initializer, location) : initializer;
+            }
+            else if (!value) {
+                // Use 'void 0' in absence of value and initializer
+                value = ts.createVoidZero();
+            }
+        }
+        var bindingTarget = ts.getTargetOfBindingOrAssignmentElement(element); // TODO: GH#18217
+        if (ts.isObjectBindingOrAssignmentPattern(bindingTarget)) {
+            flattenObjectBindingOrAssignmentPattern(flattenContext, element, bindingTarget, value, location);
+        }
+        else if (ts.isArrayBindingOrAssignmentPattern(bindingTarget)) {
+            flattenArrayBindingOrAssignmentPattern(flattenContext, element, bindingTarget, value, location);
+        }
+        else {
+            flattenContext.emitBindingOrAssignment(bindingTarget, value, location, /*original*/ element); // TODO: GH#18217
+        }
+    }
+    /**
+     * Flattens an ObjectBindingOrAssignmentPattern into zero or more bindings or assignments.
+     *
+     * @param flattenContext Options used to control flattening.
+     * @param parent The parent element of the pattern.
+     * @param pattern The ObjectBindingOrAssignmentPattern to flatten.
+     * @param value The current RHS value to assign to the element.
+     * @param location The location to use for source maps and comments.
+     */
+    function flattenObjectBindingOrAssignmentPattern(flattenContext, parent, pattern, value, location) {
+        var elements = ts.getElementsOfBindingOrAssignmentPattern(pattern);
+        var numElements = elements.length;
+        if (numElements !== 1) {
+            // For anything other than a single-element destructuring we need to generate a temporary
+            // to ensure value is evaluated exactly once. Additionally, if we have zero elements
+            // we need to emit *something* to ensure that in case a 'var' keyword was already emitted,
+            // so in that case, we'll intentionally create that temporary.
+            var reuseIdentifierExpressions = !ts.isDeclarationBindingElement(parent) || numElements !== 0;
+            value = ensureIdentifier(flattenContext, value, reuseIdentifierExpressions, location);
+        }
+        var bindingElements;
+        var computedTempVariables;
+        for (var i = 0; i < numElements; i++) {
+            var element = elements[i];
+            if (!ts.getRestIndicatorOfBindingOrAssignmentElement(element)) {
+                var propertyName = ts.getPropertyNameOfBindingOrAssignmentElement(element);
+                if (flattenContext.level >= 1 /* ObjectRest */
+                    && !(element.transformFlags & (131072 /* ContainsRestOrSpread */ | 262144 /* ContainsObjectRestOrSpread */))
+                    && !(ts.getTargetOfBindingOrAssignmentElement(element).transformFlags & (131072 /* ContainsRestOrSpread */ | 262144 /* ContainsObjectRestOrSpread */))
+                    && !ts.isComputedPropertyName(propertyName)) {
+                    bindingElements = ts.append(bindingElements, element);
+                }
+                else {
+                    if (bindingElements) {
+                        flattenContext.emitBindingOrAssignment(flattenContext.createObjectBindingOrAssignmentPattern(bindingElements), value, location, pattern);
+                        bindingElements = undefined;
+                    }
+                    var rhsValue = createDestructuringPropertyAccess(flattenContext, value, propertyName);
+                    if (ts.isComputedPropertyName(propertyName)) {
+                        computedTempVariables = ts.append(computedTempVariables, rhsValue.argumentExpression);
+                    }
+                    flattenBindingOrAssignmentElement(flattenContext, element, rhsValue, /*location*/ element);
+                }
+            }
+            else if (i === numElements - 1) {
+                if (bindingElements) {
+                    flattenContext.emitBindingOrAssignment(flattenContext.createObjectBindingOrAssignmentPattern(bindingElements), value, location, pattern);
+                    bindingElements = undefined;
+                }
+                var rhsValue = createRestCall(flattenContext.context, value, elements, computedTempVariables, pattern); // TODO: GH#18217
+                flattenBindingOrAssignmentElement(flattenContext, element, rhsValue, element);
+            }
+        }
+        if (bindingElements) {
+            flattenContext.emitBindingOrAssignment(flattenContext.createObjectBindingOrAssignmentPattern(bindingElements), value, location, pattern);
+        }
+    }
+    /**
+     * Flattens an ArrayBindingOrAssignmentPattern into zero or more bindings or assignments.
+     *
+     * @param flattenContext Options used to control flattening.
+     * @param parent The parent element of the pattern.
+     * @param pattern The ArrayBindingOrAssignmentPattern to flatten.
+     * @param value The current RHS value to assign to the element.
+     * @param location The location to use for source maps and comments.
+     */
+    function flattenArrayBindingOrAssignmentPattern(flattenContext, parent, pattern, value, location) {
+        var elements = ts.getElementsOfBindingOrAssignmentPattern(pattern);
+        var numElements = elements.length;
+        if (flattenContext.level < 1 /* ObjectRest */ && flattenContext.downlevelIteration) {
+            // Read the elements of the iterable into an array
+            value = ensureIdentifier(flattenContext, ts.createReadHelper(flattenContext.context, value, numElements > 0 && ts.getRestIndicatorOfBindingOrAssignmentElement(elements[numElements - 1])
+                ? undefined
+                : numElements, location), 
+            /*reuseIdentifierExpressions*/ false, location);
+        }
+        else if (numElements !== 1 && (flattenContext.level < 1 /* ObjectRest */ || numElements === 0)
+            || ts.every(elements, ts.isOmittedExpression)) {
+            // For anything other than a single-element destructuring we need to generate a temporary
+            // to ensure value is evaluated exactly once. Additionally, if we have zero elements
+            // we need to emit *something* to ensure that in case a 'var' keyword was already emitted,
+            // so in that case, we'll intentionally create that temporary.
+            // Or all the elements of the binding pattern are omitted expression such as "var [,] = [1,2]",
+            // then we will create temporary variable.
+            var reuseIdentifierExpressions = !ts.isDeclarationBindingElement(parent) || numElements !== 0;
+            value = ensureIdentifier(flattenContext, value, reuseIdentifierExpressions, location);
+        }
+        var bindingElements;
+        var restContainingElements;
+        for (var i = 0; i < numElements; i++) {
+            var element = elements[i];
+            if (flattenContext.level >= 1 /* ObjectRest */) {
+                // If an array pattern contains an ObjectRest, we must cache the result so that we
+                // can perform the ObjectRest destructuring in a different declaration
+                if (element.transformFlags & 262144 /* ContainsObjectRestOrSpread */) {
+                    var temp = ts.createTempVariable(/*recordTempVariable*/ undefined);
+                    if (flattenContext.hoistTempVariables) {
+                        flattenContext.context.hoistVariableDeclaration(temp);
+                    }
+                    restContainingElements = ts.append(restContainingElements, [temp, element]);
+                    bindingElements = ts.append(bindingElements, flattenContext.createArrayBindingOrAssignmentElement(temp));
+                }
+                else {
+                    bindingElements = ts.append(bindingElements, element);
+                }
+            }
+            else if (ts.isOmittedExpression(element)) {
+                continue;
+            }
+            else if (!ts.getRestIndicatorOfBindingOrAssignmentElement(element)) {
+                var rhsValue = ts.createElementAccess(value, i);
+                flattenBindingOrAssignmentElement(flattenContext, element, rhsValue, /*location*/ element);
+            }
+            else if (i === numElements - 1) {
+                var rhsValue = ts.createArraySlice(value, i);
+                flattenBindingOrAssignmentElement(flattenContext, element, rhsValue, /*location*/ element);
+            }
+        }
+        if (bindingElements) {
+            flattenContext.emitBindingOrAssignment(flattenContext.createArrayBindingOrAssignmentPattern(bindingElements), value, location, pattern);
+        }
+        if (restContainingElements) {
+            for (var _i = 0, restContainingElements_1 = restContainingElements; _i < restContainingElements_1.length; _i++) {
+                var _a = restContainingElements_1[_i], id = _a[0], element = _a[1];
+                flattenBindingOrAssignmentElement(flattenContext, element, id, element);
+            }
+        }
+    }
+    /**
+     * Creates an expression used to provide a default value if a value is `undefined` at runtime.
+     *
+     * @param flattenContext Options used to control flattening.
+     * @param value The RHS value to test.
+     * @param defaultValue The default value to use if `value` is `undefined` at runtime.
+     * @param location The location to use for source maps and comments.
+     */
+    function createDefaultValueCheck(flattenContext, value, defaultValue, location) {
+        value = ensureIdentifier(flattenContext, value, /*reuseIdentifierExpressions*/ true, location);
+        return ts.createConditional(ts.createTypeCheck(value, "undefined"), defaultValue, value);
+    }
+    /**
+     * Creates either a PropertyAccessExpression or an ElementAccessExpression for the
+     * right-hand side of a transformed destructuring assignment.
+     *
+     * @link https://tc39.github.io/ecma262/#sec-runtime-semantics-keyeddestructuringassignmentevaluation
+     *
+     * @param flattenContext Options used to control flattening.
+     * @param value The RHS value that is the source of the property.
+     * @param propertyName The destructuring property name.
+     */
+    function createDestructuringPropertyAccess(flattenContext, value, propertyName) {
+        if (ts.isComputedPropertyName(propertyName)) {
+            var argumentExpression = ensureIdentifier(flattenContext, ts.visitNode(propertyName.expression, flattenContext.visitor), /*reuseIdentifierExpressions*/ false, /*location*/ propertyName);
+            return ts.createElementAccess(value, argumentExpression);
+        }
+        else if (ts.isStringOrNumericLiteralLike(propertyName)) {
+            var argumentExpression = ts.getSynthesizedClone(propertyName);
+            argumentExpression.text = argumentExpression.text;
+            return ts.createElementAccess(value, argumentExpression);
+        }
+        else {
+            var name = ts.createIdentifier(ts.idText(propertyName));
+            return ts.createPropertyAccess(value, name);
+        }
+    }
+    /**
+     * Ensures that there exists a declared identifier whose value holds the given expression.
+     * This function is useful to ensure that the expression's value can be read from in subsequent expressions.
+     * Unless 'reuseIdentifierExpressions' is false, 'value' will be returned if it is just an identifier.
+     *
+     * @param flattenContext Options used to control flattening.
+     * @param value the expression whose value needs to be bound.
+     * @param reuseIdentifierExpressions true if identifier expressions can simply be returned;
+     * false if it is necessary to always emit an identifier.
+     * @param location The location to use for source maps and comments.
+     */
+    function ensureIdentifier(flattenContext, value, reuseIdentifierExpressions, location) {
+        if (ts.isIdentifier(value) && reuseIdentifierExpressions) {
+            return value;
+        }
+        else {
+            var temp = ts.createTempVariable(/*recordTempVariable*/ undefined);
+            if (flattenContext.hoistTempVariables) {
+                flattenContext.context.hoistVariableDeclaration(temp);
+                flattenContext.emitExpression(ts.setTextRange(ts.createAssignment(temp, value), location));
+            }
+            else {
+                flattenContext.emitBindingOrAssignment(temp, value, location, /*original*/ undefined);
+            }
+            return temp;
+        }
+    }
+    function makeArrayBindingPattern(elements) {
+        ts.Debug.assertEachNode(elements, ts.isArrayBindingElement);
+        return ts.createArrayBindingPattern(elements);
+    }
+    function makeArrayAssignmentPattern(elements) {
+        return ts.createArrayLiteral(ts.map(elements, ts.convertToArrayAssignmentElement));
+    }
+    function makeObjectBindingPattern(elements) {
+        ts.Debug.assertEachNode(elements, ts.isBindingElement);
+        return ts.createObjectBindingPattern(elements);
+    }
+    function makeObjectAssignmentPattern(elements) {
+        return ts.createObjectLiteral(ts.map(elements, ts.convertToObjectAssignmentElement));
+    }
+    function makeBindingElement(name) {
+        return ts.createBindingElement(/*dotDotDotToken*/ undefined, /*propertyName*/ undefined, name);
+    }
+    function makeAssignmentElement(name) {
+        return name;
+    }
+    var restHelper = {
+        name: "typescript:rest",
+        scoped: false,
+        text: "\n            var __rest = (this && this.__rest) || function (s, e) {\n                var t = {};\n                for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)\n                    t[p] = s[p];\n                if (s != null && typeof Object.getOwnPropertySymbols === \"function\")\n                    for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)\n                        t[p[i]] = s[p[i]];\n                return t;\n            };"
+    };
+    /** Given value: o, propName: p, pattern: { a, b, ...p } from the original statement
+     * `{ a, b, ...p } = o`, create `p = __rest(o, ["a", "b"]);`
+     */
+    function createRestCall(context, value, elements, computedTempVariables, location) {
+        context.requestEmitHelper(restHelper);
+        var propertyNames = [];
+        var computedTempVariableOffset = 0;
+        for (var i = 0; i < elements.length - 1; i++) {
+            var propertyName = ts.getPropertyNameOfBindingOrAssignmentElement(elements[i]);
+            if (propertyName) {
+                if (ts.isComputedPropertyName(propertyName)) {
+                    var temp = computedTempVariables[computedTempVariableOffset];
+                    computedTempVariableOffset++;
+                    // typeof _tmp === "symbol" ? _tmp : _tmp + ""
+                    propertyNames.push(ts.createConditional(ts.createTypeCheck(temp, "symbol"), temp, ts.createAdd(temp, ts.createLiteral(""))));
+                }
+                else {
+                    propertyNames.push(ts.createLiteral(propertyName));
+                }
+            }
+        }
+        return ts.createCall(ts.getHelperName("__rest"), 
+        /*typeArguments*/ undefined, [
+            value,
+            ts.setTextRange(ts.createArrayLiteral(propertyNames), location)
+        ]);
+    }
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
+(function (ts) {
+    /**
+     * Indicates whether to emit type metadata in the new format.
+     */
+    var USE_NEW_TYPE_METADATA_FORMAT = false;
+    var TypeScriptSubstitutionFlags;
+    (function (TypeScriptSubstitutionFlags) {
+        /** Enables substitutions for decorated classes. */
+        TypeScriptSubstitutionFlags[TypeScriptSubstitutionFlags["ClassAliases"] = 1] = "ClassAliases";
+        /** Enables substitutions for namespace exports. */
+        TypeScriptSubstitutionFlags[TypeScriptSubstitutionFlags["NamespaceExports"] = 2] = "NamespaceExports";
+        /* Enables substitutions for unqualified enum members */
+        TypeScriptSubstitutionFlags[TypeScriptSubstitutionFlags["NonQualifiedEnumMembers"] = 8] = "NonQualifiedEnumMembers";
+    })(TypeScriptSubstitutionFlags || (TypeScriptSubstitutionFlags = {}));
+    var ClassFacts;
+    (function (ClassFacts) {
+        ClassFacts[ClassFacts["None"] = 0] = "None";
+        ClassFacts[ClassFacts["HasStaticInitializedProperties"] = 1] = "HasStaticInitializedProperties";
+        ClassFacts[ClassFacts["HasConstructorDecorators"] = 2] = "HasConstructorDecorators";
+        ClassFacts[ClassFacts["HasMemberDecorators"] = 4] = "HasMemberDecorators";
+        ClassFacts[ClassFacts["IsExportOfNamespace"] = 8] = "IsExportOfNamespace";
+        ClassFacts[ClassFacts["IsNamedExternalExport"] = 16] = "IsNamedExternalExport";
+        ClassFacts[ClassFacts["IsDefaultExternalExport"] = 32] = "IsDefaultExternalExport";
+        ClassFacts[ClassFacts["IsDerivedClass"] = 64] = "IsDerivedClass";
+        ClassFacts[ClassFacts["UseImmediatelyInvokedFunctionExpression"] = 128] = "UseImmediatelyInvokedFunctionExpression";
+        ClassFacts[ClassFacts["HasAnyDecorators"] = 6] = "HasAnyDecorators";
+        ClassFacts[ClassFacts["NeedsName"] = 5] = "NeedsName";
+        ClassFacts[ClassFacts["MayNeedImmediatelyInvokedFunctionExpression"] = 7] = "MayNeedImmediatelyInvokedFunctionExpression";
+        ClassFacts[ClassFacts["IsExported"] = 56] = "IsExported";
+    })(ClassFacts || (ClassFacts = {}));
+    function transformTypeScript(context) {
+        var startLexicalEnvironment = context.startLexicalEnvironment, resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
+        var resolver = context.getEmitResolver();
+        var compilerOptions = context.getCompilerOptions();
+        var strictNullChecks = ts.getStrictOptionValue(compilerOptions, "strictNullChecks");
+        var languageVersion = ts.getEmitScriptTarget(compilerOptions);
+        var moduleKind = ts.getEmitModuleKind(compilerOptions);
+        // Save the previous transformation hooks.
+        var previousOnEmitNode = context.onEmitNode;
+        var previousOnSubstituteNode = context.onSubstituteNode;
+        // Set new transformation hooks.
+        context.onEmitNode = onEmitNode;
+        context.onSubstituteNode = onSubstituteNode;
+        // Enable substitution for property/element access to emit const enum values.
+        context.enableSubstitution(189 /* PropertyAccessExpression */);
+        context.enableSubstitution(190 /* ElementAccessExpression */);
+        // These variables contain state that changes as we descend into the tree.
+        var currentSourceFile;
+        var currentNamespace;
+        var currentNamespaceContainerName;
+        var currentLexicalScope;
+        var currentNameScope;
+        var currentScopeFirstDeclarationsOfName;
+        /**
+         * Keeps track of whether expression substitution has been enabled for specific edge cases.
+         * They are persisted between each SourceFile transformation and should not be reset.
+         */
+        var enabledSubstitutions;
+        /**
+         * A map that keeps track of aliases created for classes with decorators to avoid issues
+         * with the double-binding behavior of classes.
+         */
+        var classAliases;
+        /**
+         * Keeps track of whether we are within any containing namespaces when performing
+         * just-in-time substitution while printing an expression identifier.
+         */
+        var applicableSubstitutions;
+        /**
+         * Tracks what computed name expressions originating from elided names must be inlined
+         * at the next execution site, in document order
+         */
+        var pendingExpressions;
+        return transformSourceFileOrBundle;
+        function transformSourceFileOrBundle(node) {
+            if (node.kind === 280 /* Bundle */) {
+                return transformBundle(node);
+            }
+            return transformSourceFile(node);
+        }
+        function transformBundle(node) {
+            return ts.createBundle(node.sourceFiles.map(transformSourceFile), ts.mapDefined(node.prepends, function (prepend) {
+                if (prepend.kind === 282 /* InputFiles */) {
+                    return ts.createUnparsedSourceFile(prepend, "js");
+                }
+                return prepend;
+            }));
+        }
+        /**
+         * Transform TypeScript-specific syntax in a SourceFile.
+         *
+         * @param node A SourceFile node.
+         */
+        function transformSourceFile(node) {
+            if (node.isDeclarationFile) {
+                return node;
+            }
+            currentSourceFile = node;
+            var visited = saveStateAndInvoke(node, visitSourceFile);
+            ts.addEmitHelpers(visited, context.readEmitHelpers());
+            currentSourceFile = undefined;
+            return visited;
+        }
+        /**
+         * Visits a node, saving and restoring state variables on the stack.
+         *
+         * @param node The node to visit.
+         */
+        function saveStateAndInvoke(node, f) {
+            // Save state
+            var savedCurrentScope = currentLexicalScope;
+            var savedCurrentNameScope = currentNameScope;
+            var savedCurrentScopeFirstDeclarationsOfName = currentScopeFirstDeclarationsOfName;
+            // Handle state changes before visiting a node.
+            onBeforeVisitNode(node);
+            var visited = f(node);
+            // Restore state
+            if (currentLexicalScope !== savedCurrentScope) {
+                currentScopeFirstDeclarationsOfName = savedCurrentScopeFirstDeclarationsOfName;
+            }
+            currentLexicalScope = savedCurrentScope;
+            currentNameScope = savedCurrentNameScope;
+            return visited;
+        }
+        /**
+         * Performs actions that should always occur immediately before visiting a node.
+         *
+         * @param node The node to visit.
+         */
+        function onBeforeVisitNode(node) {
+            switch (node.kind) {
+                case 279 /* SourceFile */:
+                case 246 /* CaseBlock */:
+                case 245 /* ModuleBlock */:
+                case 218 /* Block */:
+                    currentLexicalScope = node;
+                    currentNameScope = undefined;
+                    currentScopeFirstDeclarationsOfName = undefined;
+                    break;
+                case 240 /* ClassDeclaration */:
+                case 239 /* FunctionDeclaration */:
+                    if (ts.hasModifier(node, 2 /* Ambient */)) {
+                        break;
+                    }
+                    // Record these declarations provided that they have a name.
+                    if (node.name) {
+                        recordEmittedDeclarationInScope(node);
+                    }
+                    else {
+                        // These nodes should always have names unless they are default-exports;
+                        // however, class declaration parsing allows for undefined names, so syntactically invalid
+                        // programs may also have an undefined name.
+                        ts.Debug.assert(node.kind === 240 /* ClassDeclaration */ || ts.hasModifier(node, 512 /* Default */));
+                    }
+                    if (ts.isClassDeclaration(node)) {
+                        // XXX: should probably also cover interfaces and type aliases that can have type variables?
+                        currentNameScope = node;
+                    }
+                    break;
+            }
+        }
+        /**
+         * General-purpose node visitor.
+         *
+         * @param node The node to visit.
+         */
+        function visitor(node) {
+            return saveStateAndInvoke(node, visitorWorker);
+        }
+        /**
+         * Visits and possibly transforms any node.
+         *
+         * @param node The node to visit.
+         */
+        function visitorWorker(node) {
+            if (node.transformFlags & 1 /* TypeScript */) {
+                // This node is explicitly marked as TypeScript, so we should transform the node.
+                return visitTypeScript(node);
+            }
+            else if (node.transformFlags & 2 /* ContainsTypeScript */) {
+                // This node contains TypeScript, so we should visit its children.
+                return ts.visitEachChild(node, visitor, context);
+            }
+            return node;
+        }
+        /**
+         * Specialized visitor that visits the immediate children of a SourceFile.
+         *
+         * @param node The node to visit.
+         */
+        function sourceElementVisitor(node) {
+            return saveStateAndInvoke(node, sourceElementVisitorWorker);
+        }
+        /**
+         * Specialized visitor that visits the immediate children of a SourceFile.
+         *
+         * @param node The node to visit.
+         */
+        function sourceElementVisitorWorker(node) {
+            switch (node.kind) {
+                case 249 /* ImportDeclaration */:
+                case 248 /* ImportEqualsDeclaration */:
+                case 254 /* ExportAssignment */:
+                case 255 /* ExportDeclaration */:
+                    return visitEllidableStatement(node);
+                default:
+                    return visitorWorker(node);
+            }
+        }
+        function visitEllidableStatement(node) {
+            var parsed = ts.getParseTreeNode(node);
+            if (parsed !== node) {
+                // If the node has been transformed by a `before` transformer, perform no ellision on it
+                // As the type information we would attempt to lookup to perform ellision is potentially unavailable for the synthesized nodes
+                // We do not reuse `visitorWorker`, as the ellidable statement syntax kinds are technically unrecognized by the switch-case in `visitTypeScript`,
+                // and will trigger debug failures when debug verbosity is turned up
+                if (node.transformFlags & 2 /* ContainsTypeScript */) {
+                    // This node contains TypeScript, so we should visit its children.
+                    return ts.visitEachChild(node, visitor, context);
+                }
+                // Otherwise, we can just return the node
+                return node;
+            }
+            switch (node.kind) {
+                case 249 /* ImportDeclaration */:
+                    return visitImportDeclaration(node);
+                case 248 /* ImportEqualsDeclaration */:
+                    return visitImportEqualsDeclaration(node);
+                case 254 /* ExportAssignment */:
+                    return visitExportAssignment(node);
+                case 255 /* ExportDeclaration */:
+                    return visitExportDeclaration(node);
+                default:
+                    ts.Debug.fail("Unhandled ellided statement");
+            }
+        }
+        /**
+         * Specialized visitor that visits the immediate children of a namespace.
+         *
+         * @param node The node to visit.
+         */
+        function namespaceElementVisitor(node) {
+            return saveStateAndInvoke(node, namespaceElementVisitorWorker);
+        }
+        /**
+         * Specialized visitor that visits the immediate children of a namespace.
+         *
+         * @param node The node to visit.
+         */
+        function namespaceElementVisitorWorker(node) {
+            if (node.kind === 255 /* ExportDeclaration */ ||
+                node.kind === 249 /* ImportDeclaration */ ||
+                node.kind === 250 /* ImportClause */ ||
+                (node.kind === 248 /* ImportEqualsDeclaration */ &&
+                    node.moduleReference.kind === 259 /* ExternalModuleReference */)) {
+                // do not emit ES6 imports and exports since they are illegal inside a namespace
+                return undefined;
+            }
+            else if (node.transformFlags & 1 /* TypeScript */ || ts.hasModifier(node, 1 /* Export */)) {
+                // This node is explicitly marked as TypeScript, or is exported at the namespace
+                // level, so we should transform the node.
+                return visitTypeScript(node);
+            }
+            else if (node.transformFlags & 2 /* ContainsTypeScript */) {
+                // This node contains TypeScript, so we should visit its children.
+                return ts.visitEachChild(node, visitor, context);
+            }
+            return node;
+        }
+        /**
+         * Specialized visitor that visits the immediate children of a class with TypeScript syntax.
+         *
+         * @param node The node to visit.
+         */
+        function classElementVisitor(node) {
+            return saveStateAndInvoke(node, classElementVisitorWorker);
+        }
+        /**
+         * Specialized visitor that visits the immediate children of a class with TypeScript syntax.
+         *
+         * @param node The node to visit.
+         */
+        function classElementVisitorWorker(node) {
+            switch (node.kind) {
+                case 157 /* Constructor */:
+                    // TypeScript constructors are transformed in `visitClassDeclaration`.
+                    // We elide them here as `visitorWorker` checks transform flags, which could
+                    // erronously include an ES6 constructor without TypeScript syntax.
+                    return undefined;
+                case 154 /* PropertyDeclaration */:
+                case 162 /* IndexSignature */:
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                case 156 /* MethodDeclaration */:
+                    // Fallback to the default visit behavior.
+                    return visitorWorker(node);
+                case 217 /* SemicolonClassElement */:
+                    return node;
+                default:
+                    return ts.Debug.failBadSyntaxKind(node);
+            }
+        }
+        function modifierVisitor(node) {
+            if (ts.modifierToFlag(node.kind) & 2270 /* TypeScriptModifier */) {
+                return undefined;
+            }
+            else if (currentNamespace && node.kind === 85 /* ExportKeyword */) {
+                return undefined;
+            }
+            return node;
+        }
+        /**
+         * Branching visitor, visits a TypeScript syntax node.
+         *
+         * @param node The node to visit.
+         */
+        function visitTypeScript(node) {
+            if (ts.hasModifier(node, 2 /* Ambient */) && ts.isStatement(node)) {
+                // TypeScript ambient declarations are elided, but some comments may be preserved.
+                // See the implementation of `getLeadingComments` in comments.ts for more details.
+                return ts.createNotEmittedStatement(node);
+            }
+            switch (node.kind) {
+                case 85 /* ExportKeyword */:
+                case 80 /* DefaultKeyword */:
+                    // ES6 export and default modifiers are elided when inside a namespace.
+                    return currentNamespace ? undefined : node;
+                case 115 /* PublicKeyword */:
+                case 113 /* PrivateKeyword */:
+                case 114 /* ProtectedKeyword */:
+                case 118 /* AbstractKeyword */:
+                case 77 /* ConstKeyword */:
+                case 125 /* DeclareKeyword */:
+                case 133 /* ReadonlyKeyword */:
+                // TypeScript accessibility and readonly modifiers are elided.
+                case 169 /* ArrayType */:
+                case 170 /* TupleType */:
+                case 171 /* OptionalType */:
+                case 172 /* RestType */:
+                case 168 /* TypeLiteral */:
+                case 163 /* TypePredicate */:
+                case 150 /* TypeParameter */:
+                case 120 /* AnyKeyword */:
+                case 143 /* UnknownKeyword */:
+                case 123 /* BooleanKeyword */:
+                case 138 /* StringKeyword */:
+                case 135 /* NumberKeyword */:
+                case 132 /* NeverKeyword */:
+                case 106 /* VoidKeyword */:
+                case 139 /* SymbolKeyword */:
+                case 166 /* ConstructorType */:
+                case 165 /* FunctionType */:
+                case 167 /* TypeQuery */:
+                case 164 /* TypeReference */:
+                case 173 /* UnionType */:
+                case 174 /* IntersectionType */:
+                case 175 /* ConditionalType */:
+                case 177 /* ParenthesizedType */:
+                case 178 /* ThisType */:
+                case 179 /* TypeOperator */:
+                case 180 /* IndexedAccessType */:
+                case 181 /* MappedType */:
+                case 182 /* LiteralType */:
+                // TypeScript type nodes are elided.
+                case 162 /* IndexSignature */:
+                // TypeScript index signatures are elided.
+                case 152 /* Decorator */:
+                // TypeScript decorators are elided. They will be emitted as part of visitClassDeclaration.
+                case 242 /* TypeAliasDeclaration */:
+                    // TypeScript type-only declarations are elided.
+                    return undefined;
+                case 154 /* PropertyDeclaration */:
+                    // TypeScript property declarations are elided. However their names are still visited, and can potentially be retained if they could have sideeffects
+                    return visitPropertyDeclaration(node);
+                case 247 /* NamespaceExportDeclaration */:
+                    // TypeScript namespace export declarations are elided.
+                    return undefined;
+                case 157 /* Constructor */:
+                    return visitConstructor(node);
+                case 241 /* InterfaceDeclaration */:
+                    // TypeScript interfaces are elided, but some comments may be preserved.
+                    // See the implementation of `getLeadingComments` in comments.ts for more details.
+                    return ts.createNotEmittedStatement(node);
+                case 240 /* ClassDeclaration */:
+                    // This is a class declaration with TypeScript syntax extensions.
+                    //
+                    // TypeScript class syntax extensions include:
+                    // - decorators
+                    // - optional `implements` heritage clause
+                    // - parameter property assignments in the constructor
+                    // - property declarations
+                    // - index signatures
+                    // - method overload signatures
+                    return visitClassDeclaration(node);
+                case 209 /* ClassExpression */:
+                    // This is a class expression with TypeScript syntax extensions.
+                    //
+                    // TypeScript class syntax extensions include:
+                    // - decorators
+                    // - optional `implements` heritage clause
+                    // - parameter property assignments in the constructor
+                    // - property declarations
+                    // - index signatures
+                    // - method overload signatures
+                    return visitClassExpression(node);
+                case 273 /* HeritageClause */:
+                    // This is a heritage clause with TypeScript syntax extensions.
+                    //
+                    // TypeScript heritage clause extensions include:
+                    // - `implements` clause
+                    return visitHeritageClause(node);
+                case 211 /* ExpressionWithTypeArguments */:
+                    // TypeScript supports type arguments on an expression in an `extends` heritage clause.
+                    return visitExpressionWithTypeArguments(node);
+                case 156 /* MethodDeclaration */:
+                    // TypeScript method declarations may have decorators, modifiers
+                    // or type annotations.
+                    return visitMethodDeclaration(node);
+                case 158 /* GetAccessor */:
+                    // Get Accessors can have TypeScript modifiers, decorators, and type annotations.
+                    return visitGetAccessor(node);
+                case 159 /* SetAccessor */:
+                    // Set Accessors can have TypeScript modifiers and type annotations.
+                    return visitSetAccessor(node);
+                case 239 /* FunctionDeclaration */:
+                    // Typescript function declarations can have modifiers, decorators, and type annotations.
+                    return visitFunctionDeclaration(node);
+                case 196 /* FunctionExpression */:
+                    // TypeScript function expressions can have modifiers and type annotations.
+                    return visitFunctionExpression(node);
+                case 197 /* ArrowFunction */:
+                    // TypeScript arrow functions can have modifiers and type annotations.
+                    return visitArrowFunction(node);
+                case 151 /* Parameter */:
+                    // This is a parameter declaration with TypeScript syntax extensions.
+                    //
+                    // TypeScript parameter declaration syntax extensions include:
+                    // - decorators
+                    // - accessibility modifiers
+                    // - the question mark (?) token for optional parameters
+                    // - type annotations
+                    // - this parameters
+                    return visitParameter(node);
+                case 195 /* ParenthesizedExpression */:
+                    // ParenthesizedExpressions are TypeScript if their expression is a
+                    // TypeAssertion or AsExpression
+                    return visitParenthesizedExpression(node);
+                case 194 /* TypeAssertionExpression */:
+                case 212 /* AsExpression */:
+                    // TypeScript type assertions are removed, but their subtrees are preserved.
+                    return visitAssertionExpression(node);
+                case 191 /* CallExpression */:
+                    return visitCallExpression(node);
+                case 192 /* NewExpression */:
+                    return visitNewExpression(node);
+                case 193 /* TaggedTemplateExpression */:
+                    return visitTaggedTemplateExpression(node);
+                case 213 /* NonNullExpression */:
+                    // TypeScript non-null expressions are removed, but their subtrees are preserved.
+                    return visitNonNullExpression(node);
+                case 243 /* EnumDeclaration */:
+                    // TypeScript enum declarations do not exist in ES6 and must be rewritten.
+                    return visitEnumDeclaration(node);
+                case 219 /* VariableStatement */:
+                    // TypeScript namespace exports for variable statements must be transformed.
+                    return visitVariableStatement(node);
+                case 237 /* VariableDeclaration */:
+                    return visitVariableDeclaration(node);
+                case 244 /* ModuleDeclaration */:
+                    // TypeScript namespace declarations must be transformed.
+                    return visitModuleDeclaration(node);
+                case 248 /* ImportEqualsDeclaration */:
+                    // TypeScript namespace or external module import.
+                    return visitImportEqualsDeclaration(node);
+                default:
+                    return ts.Debug.failBadSyntaxKind(node);
+            }
+        }
+        function visitSourceFile(node) {
+            var alwaysStrict = ts.getStrictOptionValue(compilerOptions, "alwaysStrict") &&
+                !(ts.isExternalModule(node) && moduleKind >= ts.ModuleKind.ES2015) &&
+                !ts.isJsonSourceFile(node);
+            return ts.updateSourceFileNode(node, ts.visitLexicalEnvironment(node.statements, sourceElementVisitor, context, /*start*/ 0, alwaysStrict));
+        }
+        /**
+         * Tests whether we should emit a __decorate call for a class declaration.
+         */
+        function shouldEmitDecorateCallForClass(node) {
+            if (node.decorators && node.decorators.length > 0) {
+                return true;
+            }
+            var constructor = ts.getFirstConstructorWithBody(node);
+            if (constructor) {
+                return ts.forEach(constructor.parameters, shouldEmitDecorateCallForParameter);
+            }
+            return false;
+        }
+        /**
+         * Tests whether we should emit a __decorate call for a parameter declaration.
+         */
+        function shouldEmitDecorateCallForParameter(parameter) {
+            return parameter.decorators !== undefined && parameter.decorators.length > 0;
+        }
+        function getClassFacts(node, staticProperties) {
+            var facts = 0 /* None */;
+            if (ts.some(staticProperties))
+                facts |= 1 /* HasStaticInitializedProperties */;
+            var extendsClauseElement = ts.getEffectiveBaseTypeNode(node);
+            if (extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 96 /* NullKeyword */)
+                facts |= 64 /* IsDerivedClass */;
+            if (shouldEmitDecorateCallForClass(node))
+                facts |= 2 /* HasConstructorDecorators */;
+            if (ts.childIsDecorated(node))
+                facts |= 4 /* HasMemberDecorators */;
+            if (isExportOfNamespace(node))
+                facts |= 8 /* IsExportOfNamespace */;
+            else if (isDefaultExternalModuleExport(node))
+                facts |= 32 /* IsDefaultExternalExport */;
+            else if (isNamedExternalModuleExport(node))
+                facts |= 16 /* IsNamedExternalExport */;
+            if (languageVersion <= 1 /* ES5 */ && (facts & 7 /* MayNeedImmediatelyInvokedFunctionExpression */))
+                facts |= 128 /* UseImmediatelyInvokedFunctionExpression */;
+            return facts;
+        }
+        /**
+         * Transforms a class declaration with TypeScript syntax into compatible ES6.
+         *
+         * This function will only be called when one of the following conditions are met:
+         * - The class has decorators.
+         * - The class has property declarations with initializers.
+         * - The class contains a constructor that contains parameters with accessibility modifiers.
+         * - The class is an export in a TypeScript namespace.
+         *
+         * @param node The node to transform.
+         */
+        function visitClassDeclaration(node) {
+            var savedPendingExpressions = pendingExpressions;
+            pendingExpressions = undefined;
+            var staticProperties = getInitializedProperties(node, /*isStatic*/ true);
+            var facts = getClassFacts(node, staticProperties);
+            if (facts & 128 /* UseImmediatelyInvokedFunctionExpression */) {
+                context.startLexicalEnvironment();
+            }
+            var name = node.name || (facts & 5 /* NeedsName */ ? ts.getGeneratedNameForNode(node) : undefined);
+            var classStatement = facts & 2 /* HasConstructorDecorators */
+                ? createClassDeclarationHeadWithDecorators(node, name, facts)
+                : createClassDeclarationHeadWithoutDecorators(node, name, facts);
+            var statements = [classStatement];
+            // Write any pending expressions from elided or moved computed property names
+            if (ts.some(pendingExpressions)) {
+                statements.push(ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions)));
+            }
+            pendingExpressions = savedPendingExpressions;
+            // Emit static property assignment. Because classDeclaration is lexically evaluated,
+            // it is safe to emit static property assignment after classDeclaration
+            // From ES6 specification:
+            //      HasLexicalDeclaration (N) : Determines if the argument identifier has a binding in this environment record that was created using
+            //                                  a lexical declaration such as a LexicalDeclaration or a ClassDeclaration.
+            if (facts & 1 /* HasStaticInitializedProperties */) {
+                addInitializedPropertyStatements(statements, staticProperties, facts & 128 /* UseImmediatelyInvokedFunctionExpression */ ? ts.getInternalName(node) : ts.getLocalName(node));
+            }
+            // Write any decorators of the node.
+            addClassElementDecorationStatements(statements, node, /*isStatic*/ false);
+            addClassElementDecorationStatements(statements, node, /*isStatic*/ true);
+            addConstructorDecorationStatement(statements, node);
+            if (facts & 128 /* UseImmediatelyInvokedFunctionExpression */) {
+                // When we emit a TypeScript class down to ES5, we must wrap it in an IIFE so that the
+                // 'es2015' transformer can properly nest static initializers and decorators. The result
+                // looks something like:
+                //
+                //  var C = function () {
+                //      class C {
+                //      }
+                //      C.static_prop = 1;
+                //      return C;
+                //  }();
+                //
+                var closingBraceLocation = ts.createTokenRange(ts.skipTrivia(currentSourceFile.text, node.members.end), 19 /* CloseBraceToken */);
+                var localName = ts.getInternalName(node);
+                // The following partially-emitted expression exists purely to align our sourcemap
+                // emit with the original emitter.
+                var outer = ts.createPartiallyEmittedExpression(localName);
+                outer.end = closingBraceLocation.end;
+                ts.setEmitFlags(outer, 1536 /* NoComments */);
+                var statement = ts.createReturn(outer);
+                statement.pos = closingBraceLocation.pos;
+                ts.setEmitFlags(statement, 1536 /* NoComments */ | 384 /* NoTokenSourceMaps */);
+                statements.push(statement);
+                ts.addStatementsAfterPrologue(statements, context.endLexicalEnvironment());
+                var iife = ts.createImmediatelyInvokedArrowFunction(statements);
+                ts.setEmitFlags(iife, 33554432 /* TypeScriptClassWrapper */);
+                var varStatement = ts.createVariableStatement(
+                /*modifiers*/ undefined, ts.createVariableDeclarationList([
+                    ts.createVariableDeclaration(ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ false), 
+                    /*type*/ undefined, iife)
+                ]));
+                ts.setOriginalNode(varStatement, node);
+                ts.setCommentRange(varStatement, node);
+                ts.setSourceMapRange(varStatement, ts.moveRangePastDecorators(node));
+                ts.startOnNewLine(varStatement);
+                statements = [varStatement];
+            }
+            // If the class is exported as part of a TypeScript namespace, emit the namespace export.
+            // Otherwise, if the class was exported at the top level and was decorated, emit an export
+            // declaration or export default for the class.
+            if (facts & 8 /* IsExportOfNamespace */) {
+                addExportMemberAssignment(statements, node);
+            }
+            else if (facts & 128 /* UseImmediatelyInvokedFunctionExpression */ || facts & 2 /* HasConstructorDecorators */) {
+                if (facts & 32 /* IsDefaultExternalExport */) {
+                    statements.push(ts.createExportDefault(ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true)));
+                }
+                else if (facts & 16 /* IsNamedExternalExport */) {
+                    statements.push(ts.createExternalModuleExport(ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true)));
+                }
+            }
+            if (statements.length > 1) {
+                // Add a DeclarationMarker as a marker for the end of the declaration
+                statements.push(ts.createEndOfDeclarationMarker(node));
+                ts.setEmitFlags(classStatement, ts.getEmitFlags(classStatement) | 4194304 /* HasEndOfDeclarationMarker */);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Transforms a non-decorated class declaration and appends the resulting statements.
+         *
+         * @param node A ClassDeclaration node.
+         * @param name The name of the class.
+         * @param facts Precomputed facts about the class.
+         */
+        function createClassDeclarationHeadWithoutDecorators(node, name, facts) {
+            //  ${modifiers} class ${name} ${heritageClauses} {
+            //      ${members}
+            //  }
+            // we do not emit modifiers on the declaration if we are emitting an IIFE
+            var modifiers = !(facts & 128 /* UseImmediatelyInvokedFunctionExpression */)
+                ? ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier)
+                : undefined;
+            var classDeclaration = ts.createClassDeclaration(
+            /*decorators*/ undefined, modifiers, name, 
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, (facts & 64 /* IsDerivedClass */) !== 0));
+            // To better align with the old emitter, we should not emit a trailing source map
+            // entry if the class has static properties.
+            var emitFlags = ts.getEmitFlags(node);
+            if (facts & 1 /* HasStaticInitializedProperties */) {
+                emitFlags |= 32 /* NoTrailingSourceMap */;
+            }
+            ts.setTextRange(classDeclaration, node);
+            ts.setOriginalNode(classDeclaration, node);
+            ts.setEmitFlags(classDeclaration, emitFlags);
+            return classDeclaration;
+        }
+        /**
+         * Transforms a decorated class declaration and appends the resulting statements. If
+         * the class requires an alias to avoid issues with double-binding, the alias is returned.
+         */
+        function createClassDeclarationHeadWithDecorators(node, name, facts) {
+            // When we emit an ES6 class that has a class decorator, we must tailor the
+            // emit to certain specific cases.
+            //
+            // In the simplest case, we emit the class declaration as a let declaration, and
+            // evaluate decorators after the close of the class body:
+            //
+            //  [Example 1]
+            //  ---------------------------------------------------------------------
+            //  TypeScript                      | Javascript
+            //  ---------------------------------------------------------------------
+            //  @dec                            | let C = class C {
+            //  class C {                       | }
+            //  }                               | C = __decorate([dec], C);
+            //  ---------------------------------------------------------------------
+            //  @dec                            | let C = class C {
+            //  export class C {                | }
+            //  }                               | C = __decorate([dec], C);
+            //                                  | export { C };
+            //  ---------------------------------------------------------------------
+            //
+            // If a class declaration contains a reference to itself *inside* of the class body,
+            // this introduces two bindings to the class: One outside of the class body, and one
+            // inside of the class body. If we apply decorators as in [Example 1] above, there
+            // is the possibility that the decorator `dec` will return a new value for the
+            // constructor, which would result in the binding inside of the class no longer
+            // pointing to the same reference as the binding outside of the class.
+            //
+            // As a result, we must instead rewrite all references to the class *inside* of the
+            // class body to instead point to a local temporary alias for the class:
+            //
+            //  [Example 2]
+            //  ---------------------------------------------------------------------
+            //  TypeScript                      | Javascript
+            //  ---------------------------------------------------------------------
+            //  @dec                            | let C = C_1 = class C {
+            //  class C {                       |   static x() { return C_1.y; }
+            //    static x() { return C.y; }    | }
+            //    static y = 1;                 | C.y = 1;
+            //  }                               | C = C_1 = __decorate([dec], C);
+            //                                  | var C_1;
+            //  ---------------------------------------------------------------------
+            //  @dec                            | let C = class C {
+            //  export class C {                |   static x() { return C_1.y; }
+            //    static x() { return C.y; }    | }
+            //    static y = 1;                 | C.y = 1;
+            //  }                               | C = C_1 = __decorate([dec], C);
+            //                                  | export { C };
+            //                                  | var C_1;
+            //  ---------------------------------------------------------------------
+            //
+            // If a class declaration is the default export of a module, we instead emit
+            // the export after the decorated declaration:
+            //
+            //  [Example 3]
+            //  ---------------------------------------------------------------------
+            //  TypeScript                      | Javascript
+            //  ---------------------------------------------------------------------
+            //  @dec                            | let default_1 = class {
+            //  export default class {          | }
+            //  }                               | default_1 = __decorate([dec], default_1);
+            //                                  | export default default_1;
+            //  ---------------------------------------------------------------------
+            //  @dec                            | let C = class C {
+            //  export default class C {        | }
+            //  }                               | C = __decorate([dec], C);
+            //                                  | export default C;
+            //  ---------------------------------------------------------------------
+            //
+            // If the class declaration is the default export and a reference to itself
+            // inside of the class body, we must emit both an alias for the class *and*
+            // move the export after the declaration:
+            //
+            //  [Example 4]
+            //  ---------------------------------------------------------------------
+            //  TypeScript                      | Javascript
+            //  ---------------------------------------------------------------------
+            //  @dec                            | let C = class C {
+            //  export default class C {        |   static x() { return C_1.y; }
+            //    static x() { return C.y; }    | }
+            //    static y = 1;                 | C.y = 1;
+            //  }                               | C = C_1 = __decorate([dec], C);
+            //                                  | export default C;
+            //                                  | var C_1;
+            //  ---------------------------------------------------------------------
+            //
+            var location = ts.moveRangePastDecorators(node);
+            var classAlias = getClassAliasIfNeeded(node);
+            var declName = ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
+            //  ... = class ${name} ${heritageClauses} {
+            //      ${members}
+            //  }
+            var heritageClauses = ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause);
+            var members = transformClassMembers(node, (facts & 64 /* IsDerivedClass */) !== 0);
+            var classExpression = ts.createClassExpression(/*modifiers*/ undefined, name, /*typeParameters*/ undefined, heritageClauses, members);
+            ts.setOriginalNode(classExpression, node);
+            ts.setTextRange(classExpression, location);
+            //  let ${name} = ${classExpression} where name is either declaredName if the class doesn't contain self-reference
+            //                                         or decoratedClassAlias if the class contain self-reference.
+            var statement = ts.createVariableStatement(
+            /*modifiers*/ undefined, ts.createVariableDeclarationList([
+                ts.createVariableDeclaration(declName, 
+                /*type*/ undefined, classAlias ? ts.createAssignment(classAlias, classExpression) : classExpression)
+            ], 1 /* Let */));
+            ts.setOriginalNode(statement, node);
+            ts.setTextRange(statement, location);
+            ts.setCommentRange(statement, node);
+            return statement;
+        }
+        /**
+         * Transforms a class expression with TypeScript syntax into compatible ES6.
+         *
+         * This function will only be called when one of the following conditions are met:
+         * - The class has property declarations with initializers.
+         * - The class contains a constructor that contains parameters with accessibility modifiers.
+         *
+         * @param node The node to transform.
+         */
+        function visitClassExpression(node) {
+            var savedPendingExpressions = pendingExpressions;
+            pendingExpressions = undefined;
+            var staticProperties = getInitializedProperties(node, /*isStatic*/ true);
+            var heritageClauses = ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause);
+            var members = transformClassMembers(node, ts.some(heritageClauses, function (c) { return c.token === 86 /* ExtendsKeyword */; }));
+            var classExpression = ts.createClassExpression(
+            /*modifiers*/ undefined, node.name, 
+            /*typeParameters*/ undefined, heritageClauses, members);
+            ts.setOriginalNode(classExpression, node);
+            ts.setTextRange(classExpression, node);
+            if (ts.some(staticProperties) || ts.some(pendingExpressions)) {
+                var expressions = [];
+                var isClassWithConstructorReference = resolver.getNodeCheckFlags(node) & 16777216 /* ClassWithConstructorReference */;
+                var temp = ts.createTempVariable(hoistVariableDeclaration, !!isClassWithConstructorReference);
+                if (isClassWithConstructorReference) {
+                    // record an alias as the class name is not in scope for statics.
+                    enableSubstitutionForClassAliases();
+                    var alias = ts.getSynthesizedClone(temp);
+                    alias.autoGenerateFlags &= ~8 /* ReservedInNestedScopes */;
+                    classAliases[ts.getOriginalNodeId(node)] = alias;
+                }
+                // To preserve the behavior of the old emitter, we explicitly indent
+                // the body of a class with static initializers.
+                ts.setEmitFlags(classExpression, 65536 /* Indented */ | ts.getEmitFlags(classExpression));
+                expressions.push(ts.startOnNewLine(ts.createAssignment(temp, classExpression)));
+                // Add any pending expressions leftover from elided or relocated computed property names
+                ts.addRange(expressions, ts.map(pendingExpressions, ts.startOnNewLine));
+                pendingExpressions = savedPendingExpressions;
+                ts.addRange(expressions, generateInitializedPropertyExpressions(staticProperties, temp));
+                expressions.push(ts.startOnNewLine(temp));
+                return ts.inlineExpressions(expressions);
+            }
+            pendingExpressions = savedPendingExpressions;
+            return classExpression;
+        }
+        /**
+         * Transforms the members of a class.
+         *
+         * @param node The current class.
+         * @param isDerivedClass A value indicating whether the class has an extends clause that does not extend 'null'.
+         */
+        function transformClassMembers(node, isDerivedClass) {
+            var members = [];
+            var constructor = transformConstructor(node, isDerivedClass);
+            if (constructor) {
+                members.push(constructor);
+            }
+            ts.addRange(members, ts.visitNodes(node.members, classElementVisitor, ts.isClassElement));
+            return ts.setTextRange(ts.createNodeArray(members), /*location*/ node.members);
+        }
+        /**
+         * Transforms (or creates) a constructor for a class.
+         *
+         * @param node The current class.
+         * @param isDerivedClass A value indicating whether the class has an extends clause that does not extend 'null'.
+         */
+        function transformConstructor(node, isDerivedClass) {
+            // Check if we have property assignment inside class declaration.
+            // If there is a property assignment, we need to emit constructor whether users define it or not
+            // If there is no property assignment, we can omit constructor if users do not define it
+            var constructor = ts.getFirstConstructorWithBody(node);
+            var hasInstancePropertyWithInitializer = ts.forEach(node.members, isInstanceInitializedProperty);
+            var hasParameterPropertyAssignments = constructor &&
+                constructor.transformFlags & 4096 /* ContainsTypeScriptClassSyntax */ &&
+                ts.forEach(constructor.parameters, isParameterWithPropertyAssignment);
+            // If the class does not contain nodes that require a synthesized constructor,
+            // accept the current constructor if it exists.
+            if (!hasInstancePropertyWithInitializer && !hasParameterPropertyAssignments) {
+                return ts.visitEachChild(constructor, visitor, context);
+            }
+            var parameters = transformConstructorParameters(constructor);
+            var body = transformConstructorBody(node, constructor, isDerivedClass);
+            //  constructor(${parameters}) {
+            //      ${body}
+            //  }
+            return ts.startOnNewLine(ts.setOriginalNode(ts.setTextRange(ts.createConstructor(
+            /*decorators*/ undefined, 
+            /*modifiers*/ undefined, parameters, body), constructor || node), constructor));
+        }
+        /**
+         * Transforms (or creates) the parameters for the constructor of a class with
+         * parameter property assignments or instance property initializers.
+         *
+         * @param constructor The constructor declaration.
+         */
+        function transformConstructorParameters(constructor) {
+            // The ES2015 spec specifies in 14.5.14. Runtime Semantics: ClassDefinitionEvaluation:
+            // If constructor is empty, then
+            //     If ClassHeritag_eopt is present and protoParent is not null, then
+            //          Let constructor be the result of parsing the source text
+            //              constructor(...args) { super (...args);}
+            //          using the syntactic grammar with the goal symbol MethodDefinition[~Yield].
+            //      Else,
+            //           Let constructor be the result of parsing the source text
+            //               constructor( ){ }
+            //           using the syntactic grammar with the goal symbol MethodDefinition[~Yield].
+            //
+            // While we could emit the '...args' rest parameter, certain later tools in the pipeline might
+            // downlevel the '...args' portion less efficiently by naively copying the contents of 'arguments' to an array.
+            // Instead, we'll avoid using a rest parameter and spread into the super call as
+            // 'super(...arguments)' instead of 'super(...args)', as you can see in "transformConstructorBody".
+            return ts.visitParameterList(constructor && constructor.parameters, visitor, context)
+                || [];
+        }
+        /**
+         * Transforms (or creates) a constructor body for a class with parameter property
+         * assignments or instance property initializers.
+         *
+         * @param node The current class.
+         * @param constructor The current class constructor.
+         * @param isDerivedClass A value indicating whether the class has an extends clause that does not extend 'null'.
+         */
+        function transformConstructorBody(node, constructor, isDerivedClass) {
+            var statements = [];
+            var indexOfFirstStatement = 0;
+            resumeLexicalEnvironment();
+            if (constructor) {
+                indexOfFirstStatement = addPrologueDirectivesAndInitialSuperCall(constructor, statements);
+                // Add parameters with property assignments. Transforms this:
+                //
+                //  constructor (public x, public y) {
+                //  }
+                //
+                // Into this:
+                //
+                //  constructor (x, y) {
+                //      this.x = x;
+                //      this.y = y;
+                //  }
+                //
+                var propertyAssignments = getParametersWithPropertyAssignments(constructor);
+                ts.addRange(statements, ts.map(propertyAssignments, transformParameterWithPropertyAssignment));
+            }
+            else if (isDerivedClass) {
+                // Add a synthetic `super` call:
+                //
+                //  super(...arguments);
+                //
+                statements.push(ts.createExpressionStatement(ts.createCall(ts.createSuper(), 
+                /*typeArguments*/ undefined, [ts.createSpread(ts.createIdentifier("arguments"))])));
+            }
+            // Add the property initializers. Transforms this:
+            //
+            //  public x = 1;
+            //
+            // Into this:
+            //
+            //  constructor() {
+            //      this.x = 1;
+            //  }
+            //
+            var properties = getInitializedProperties(node, /*isStatic*/ false);
+            addInitializedPropertyStatements(statements, properties, ts.createThis());
+            if (constructor) {
+                // The class already had a constructor, so we should add the existing statements, skipping the initial super call.
+                ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatement));
+            }
+            // End the lexical environment.
+            statements = ts.mergeLexicalEnvironment(statements, endLexicalEnvironment());
+            return ts.setTextRange(ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), 
+            /*location*/ constructor ? constructor.body.statements : node.members), 
+            /*multiLine*/ true), 
+            /*location*/ constructor ? constructor.body : undefined);
+        }
+        /**
+         * Adds super call and preceding prologue directives into the list of statements.
+         *
+         * @param ctor The constructor node.
+         * @returns index of the statement that follows super call
+         */
+        function addPrologueDirectivesAndInitialSuperCall(ctor, result) {
+            if (ctor.body) {
+                var statements = ctor.body.statements;
+                // add prologue directives to the list (if any)
+                var index = ts.addPrologue(result, statements, /*ensureUseStrict*/ false, visitor);
+                if (index === statements.length) {
+                    // list contains nothing but prologue directives (or empty) - exit
+                    return index;
+                }
+                var statement = statements[index];
+                if (statement.kind === 221 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
+                    result.push(ts.visitNode(statement, visitor, ts.isStatement));
+                    return index + 1;
+                }
+                return index;
+            }
+            return 0;
+        }
+        /**
+         * Gets all parameters of a constructor that should be transformed into property assignments.
+         *
+         * @param node The constructor node.
+         */
+        function getParametersWithPropertyAssignments(node) {
+            return ts.filter(node.parameters, isParameterWithPropertyAssignment);
+        }
+        /**
+         * Determines whether a parameter should be transformed into a property assignment.
+         *
+         * @param parameter The parameter node.
+         */
+        function isParameterWithPropertyAssignment(parameter) {
+            return ts.hasModifier(parameter, 92 /* ParameterPropertyModifier */)
+                && ts.isIdentifier(parameter.name);
+        }
+        /**
+         * Transforms a parameter into a property assignment statement.
+         *
+         * @param node The parameter declaration.
+         */
+        function transformParameterWithPropertyAssignment(node) {
+            ts.Debug.assert(ts.isIdentifier(node.name));
+            var name = node.name;
+            var propertyName = ts.getMutableClone(name);
+            ts.setEmitFlags(propertyName, 1536 /* NoComments */ | 48 /* NoSourceMap */);
+            var localName = ts.getMutableClone(name);
+            ts.setEmitFlags(localName, 1536 /* NoComments */);
+            return ts.startOnNewLine(ts.setEmitFlags(ts.setTextRange(ts.createExpressionStatement(ts.createAssignment(ts.setTextRange(ts.createPropertyAccess(ts.createThis(), propertyName), node.name), localName)), ts.moveRangePos(node, -1)), 1536 /* NoComments */));
+        }
+        /**
+         * Gets all property declarations with initializers on either the static or instance side of a class.
+         *
+         * @param node The class node.
+         * @param isStatic A value indicating whether to get properties from the static or instance side of the class.
+         */
+        function getInitializedProperties(node, isStatic) {
+            return ts.filter(node.members, isStatic ? isStaticInitializedProperty : isInstanceInitializedProperty);
+        }
+        /**
+         * Gets a value indicating whether a class element is a static property declaration with an initializer.
+         *
+         * @param member The class element node.
+         */
+        function isStaticInitializedProperty(member) {
+            return isInitializedProperty(member, /*isStatic*/ true);
+        }
+        /**
+         * Gets a value indicating whether a class element is an instance property declaration with an initializer.
+         *
+         * @param member The class element node.
+         */
+        function isInstanceInitializedProperty(member) {
+            return isInitializedProperty(member, /*isStatic*/ false);
+        }
+        /**
+         * Gets a value indicating whether a class element is either a static or an instance property declaration with an initializer.
+         *
+         * @param member The class element node.
+         * @param isStatic A value indicating whether the member should be a static or instance member.
+         */
+        function isInitializedProperty(member, isStatic) {
+            return member.kind === 154 /* PropertyDeclaration */
+                && isStatic === ts.hasModifier(member, 32 /* Static */)
+                && member.initializer !== undefined;
+        }
+        /**
+         * Generates assignment statements for property initializers.
+         *
+         * @param properties An array of property declarations to transform.
+         * @param receiver The receiver on which each property should be assigned.
+         */
+        function addInitializedPropertyStatements(statements, properties, receiver) {
+            for (var _i = 0, properties_9 = properties; _i < properties_9.length; _i++) {
+                var property = properties_9[_i];
+                var statement = ts.createExpressionStatement(transformInitializedProperty(property, receiver));
+                ts.setSourceMapRange(statement, ts.moveRangePastModifiers(property));
+                ts.setCommentRange(statement, property);
+                ts.setOriginalNode(statement, property);
+                statements.push(statement);
+            }
+        }
+        /**
+         * Generates assignment expressions for property initializers.
+         *
+         * @param properties An array of property declarations to transform.
+         * @param receiver The receiver on which each property should be assigned.
+         */
+        function generateInitializedPropertyExpressions(properties, receiver) {
+            var expressions = [];
+            for (var _i = 0, properties_10 = properties; _i < properties_10.length; _i++) {
+                var property = properties_10[_i];
+                var expression = transformInitializedProperty(property, receiver);
+                ts.startOnNewLine(expression);
+                ts.setSourceMapRange(expression, ts.moveRangePastModifiers(property));
+                ts.setCommentRange(expression, property);
+                ts.setOriginalNode(expression, property);
+                expressions.push(expression);
+            }
+            return expressions;
+        }
+        /**
+         * Transforms a property initializer into an assignment statement.
+         *
+         * @param property The property declaration.
+         * @param receiver The object receiving the property assignment.
+         */
+        function transformInitializedProperty(property, receiver) {
+            // We generate a name here in order to reuse the value cached by the relocated computed name expression (which uses the same generated name)
+            var propertyName = ts.isComputedPropertyName(property.name) && !isSimpleInlineableExpression(property.name.expression)
+                ? ts.updateComputedPropertyName(property.name, ts.getGeneratedNameForNode(property.name))
+                : property.name;
+            var initializer = ts.visitNode(property.initializer, visitor, ts.isExpression);
+            var memberAccess = ts.createMemberAccessForPropertyName(receiver, propertyName, /*location*/ propertyName);
+            return ts.createAssignment(memberAccess, initializer);
+        }
+        /**
+         * Gets either the static or instance members of a class that are decorated, or have
+         * parameters that are decorated.
+         *
+         * @param node The class containing the member.
+         * @param isStatic A value indicating whether to retrieve static or instance members of
+         *                 the class.
+         */
+        function getDecoratedClassElements(node, isStatic) {
+            return ts.filter(node.members, isStatic ? function (m) { return isStaticDecoratedClassElement(m, node); } : function (m) { return isInstanceDecoratedClassElement(m, node); });
+        }
+        /**
+         * Determines whether a class member is a static member of a class that is decorated, or
+         * has parameters that are decorated.
+         *
+         * @param member The class member.
+         */
+        function isStaticDecoratedClassElement(member, parent) {
+            return isDecoratedClassElement(member, /*isStatic*/ true, parent);
+        }
+        /**
+         * Determines whether a class member is an instance member of a class that is decorated,
+         * or has parameters that are decorated.
+         *
+         * @param member The class member.
+         */
+        function isInstanceDecoratedClassElement(member, parent) {
+            return isDecoratedClassElement(member, /*isStatic*/ false, parent);
+        }
+        /**
+         * Determines whether a class member is either a static or an instance member of a class
+         * that is decorated, or has parameters that are decorated.
+         *
+         * @param member The class member.
+         */
+        function isDecoratedClassElement(member, isStatic, parent) {
+            return ts.nodeOrChildIsDecorated(member, parent)
+                && isStatic === ts.hasModifier(member, 32 /* Static */);
+        }
+        /**
+         * Gets an array of arrays of decorators for the parameters of a function-like node.
+         * The offset into the result array should correspond to the offset of the parameter.
+         *
+         * @param node The function-like node.
+         */
+        function getDecoratorsOfParameters(node) {
+            var decorators;
+            if (node) {
+                var parameters = node.parameters;
+                for (var i = 0; i < parameters.length; i++) {
+                    var parameter = parameters[i];
+                    if (decorators || parameter.decorators) {
+                        if (!decorators) {
+                            decorators = new Array(parameters.length);
+                        }
+                        decorators[i] = parameter.decorators;
+                    }
+                }
+            }
+            return decorators;
+        }
+        /**
+         * Gets an AllDecorators object containing the decorators for the class and the decorators for the
+         * parameters of the constructor of the class.
+         *
+         * @param node The class node.
+         */
+        function getAllDecoratorsOfConstructor(node) {
+            var decorators = node.decorators;
+            var parameters = getDecoratorsOfParameters(ts.getFirstConstructorWithBody(node));
+            if (!decorators && !parameters) {
+                return undefined;
+            }
+            return {
+                decorators: decorators,
+                parameters: parameters
+            };
+        }
+        /**
+         * Gets an AllDecorators object containing the decorators for the member and its parameters.
+         *
+         * @param node The class node that contains the member.
+         * @param member The class member.
+         */
+        function getAllDecoratorsOfClassElement(node, member) {
+            switch (member.kind) {
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                    return getAllDecoratorsOfAccessors(node, member);
+                case 156 /* MethodDeclaration */:
+                    return getAllDecoratorsOfMethod(member);
+                case 154 /* PropertyDeclaration */:
+                    return getAllDecoratorsOfProperty(member);
+                default:
+                    return undefined;
+            }
+        }
+        /**
+         * Gets an AllDecorators object containing the decorators for the accessor and its parameters.
+         *
+         * @param node The class node that contains the accessor.
+         * @param accessor The class accessor member.
+         */
+        function getAllDecoratorsOfAccessors(node, accessor) {
+            if (!accessor.body) {
+                return undefined;
+            }
+            var _a = ts.getAllAccessorDeclarations(node.members, accessor), firstAccessor = _a.firstAccessor, secondAccessor = _a.secondAccessor, setAccessor = _a.setAccessor;
+            var firstAccessorWithDecorators = firstAccessor.decorators ? firstAccessor : secondAccessor && secondAccessor.decorators ? secondAccessor : undefined;
+            if (!firstAccessorWithDecorators || accessor !== firstAccessorWithDecorators) {
+                return undefined;
+            }
+            var decorators = firstAccessorWithDecorators.decorators;
+            var parameters = getDecoratorsOfParameters(setAccessor);
+            if (!decorators && !parameters) {
+                return undefined;
+            }
+            return { decorators: decorators, parameters: parameters };
+        }
+        /**
+         * Gets an AllDecorators object containing the decorators for the method and its parameters.
+         *
+         * @param method The class method member.
+         */
+        function getAllDecoratorsOfMethod(method) {
+            if (!method.body) {
+                return undefined;
+            }
+            var decorators = method.decorators;
+            var parameters = getDecoratorsOfParameters(method);
+            if (!decorators && !parameters) {
+                return undefined;
+            }
+            return { decorators: decorators, parameters: parameters };
+        }
+        /**
+         * Gets an AllDecorators object containing the decorators for the property.
+         *
+         * @param property The class property member.
+         */
+        function getAllDecoratorsOfProperty(property) {
+            var decorators = property.decorators;
+            if (!decorators) {
+                return undefined;
+            }
+            return { decorators: decorators };
+        }
+        /**
+         * Transforms all of the decorators for a declaration into an array of expressions.
+         *
+         * @param node The declaration node.
+         * @param allDecorators An object containing all of the decorators for the declaration.
+         */
+        function transformAllDecoratorsOfDeclaration(node, container, allDecorators) {
+            if (!allDecorators) {
+                return undefined;
+            }
+            var decoratorExpressions = [];
+            ts.addRange(decoratorExpressions, ts.map(allDecorators.decorators, transformDecorator));
+            ts.addRange(decoratorExpressions, ts.flatMap(allDecorators.parameters, transformDecoratorsOfParameter));
+            addTypeMetadata(node, container, decoratorExpressions);
+            return decoratorExpressions;
+        }
+        /**
+         * Generates statements used to apply decorators to either the static or instance members
+         * of a class.
+         *
+         * @param node The class node.
+         * @param isStatic A value indicating whether to generate statements for static or
+         *                 instance members.
+         */
+        function addClassElementDecorationStatements(statements, node, isStatic) {
+            ts.addRange(statements, ts.map(generateClassElementDecorationExpressions(node, isStatic), expressionToStatement));
+        }
+        /**
+         * Generates expressions used to apply decorators to either the static or instance members
+         * of a class.
+         *
+         * @param node The class node.
+         * @param isStatic A value indicating whether to generate expressions for static or
+         *                 instance members.
+         */
+        function generateClassElementDecorationExpressions(node, isStatic) {
+            var members = getDecoratedClassElements(node, isStatic);
+            var expressions;
+            for (var _i = 0, members_5 = members; _i < members_5.length; _i++) {
+                var member = members_5[_i];
+                var expression = generateClassElementDecorationExpression(node, member);
+                if (expression) {
+                    if (!expressions) {
+                        expressions = [expression];
+                    }
+                    else {
+                        expressions.push(expression);
+                    }
+                }
+            }
+            return expressions;
+        }
+        /**
+         * Generates an expression used to evaluate class element decorators at runtime.
+         *
+         * @param node The class node that contains the member.
+         * @param member The class member.
+         */
+        function generateClassElementDecorationExpression(node, member) {
+            var allDecorators = getAllDecoratorsOfClassElement(node, member);
+            var decoratorExpressions = transformAllDecoratorsOfDeclaration(member, node, allDecorators);
+            if (!decoratorExpressions) {
+                return undefined;
+            }
+            // Emit the call to __decorate. Given the following:
+            //
+            //   class C {
+            //     @dec method(@dec2 x) {}
+            //     @dec get accessor() {}
+            //     @dec prop;
+            //   }
+            //
+            // The emit for a method is:
+            //
+            //   __decorate([
+            //       dec,
+            //       __param(0, dec2),
+            //       __metadata("design:type", Function),
+            //       __metadata("design:paramtypes", [Object]),
+            //       __metadata("design:returntype", void 0)
+            //   ], C.prototype, "method", null);
+            //
+            // The emit for an accessor is:
+            //
+            //   __decorate([
+            //       dec
+            //   ], C.prototype, "accessor", null);
+            //
+            // The emit for a property is:
+            //
+            //   __decorate([
+            //       dec
+            //   ], C.prototype, "prop");
+            //
+            var prefix = getClassMemberPrefix(node, member);
+            var memberName = getExpressionForPropertyName(member, /*generateNameForComputedPropertyName*/ true);
+            var descriptor = languageVersion > 0 /* ES3 */
+                ? member.kind === 154 /* PropertyDeclaration */
+                    // We emit `void 0` here to indicate to `__decorate` that it can invoke `Object.defineProperty` directly, but that it
+                    // should not invoke `Object.getOwnPropertyDescriptor`.
+                    ? ts.createVoidZero()
+                    // We emit `null` here to indicate to `__decorate` that it can invoke `Object.getOwnPropertyDescriptor` directly.
+                    // We have this extra argument here so that we can inject an explicit property descriptor at a later date.
+                    : ts.createNull()
+                : undefined;
+            var helper = createDecorateHelper(context, decoratorExpressions, prefix, memberName, descriptor, ts.moveRangePastDecorators(member));
+            ts.setEmitFlags(helper, 1536 /* NoComments */);
+            return helper;
+        }
+        /**
+         * Generates a __decorate helper call for a class constructor.
+         *
+         * @param node The class node.
+         */
+        function addConstructorDecorationStatement(statements, node) {
+            var expression = generateConstructorDecorationExpression(node);
+            if (expression) {
+                statements.push(ts.setOriginalNode(ts.createExpressionStatement(expression), node));
+            }
+        }
+        /**
+         * Generates a __decorate helper call for a class constructor.
+         *
+         * @param node The class node.
+         */
+        function generateConstructorDecorationExpression(node) {
+            var allDecorators = getAllDecoratorsOfConstructor(node);
+            var decoratorExpressions = transformAllDecoratorsOfDeclaration(node, node, allDecorators);
+            if (!decoratorExpressions) {
+                return undefined;
+            }
+            var classAlias = classAliases && classAliases[ts.getOriginalNodeId(node)];
+            var localName = ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
+            var decorate = createDecorateHelper(context, decoratorExpressions, localName);
+            var expression = ts.createAssignment(localName, classAlias ? ts.createAssignment(classAlias, decorate) : decorate);
+            ts.setEmitFlags(expression, 1536 /* NoComments */);
+            ts.setSourceMapRange(expression, ts.moveRangePastDecorators(node));
+            return expression;
+        }
+        /**
+         * Transforms a decorator into an expression.
+         *
+         * @param decorator The decorator node.
+         */
+        function transformDecorator(decorator) {
+            return ts.visitNode(decorator.expression, visitor, ts.isExpression);
+        }
+        /**
+         * Transforms the decorators of a parameter.
+         *
+         * @param decorators The decorators for the parameter at the provided offset.
+         * @param parameterOffset The offset of the parameter.
+         */
+        function transformDecoratorsOfParameter(decorators, parameterOffset) {
+            var expressions;
+            if (decorators) {
+                expressions = [];
+                for (var _i = 0, decorators_1 = decorators; _i < decorators_1.length; _i++) {
+                    var decorator = decorators_1[_i];
+                    var helper = createParamHelper(context, transformDecorator(decorator), parameterOffset, 
+                    /*location*/ decorator.expression);
+                    ts.setEmitFlags(helper, 1536 /* NoComments */);
+                    expressions.push(helper);
+                }
+            }
+            return expressions;
+        }
+        /**
+         * Adds optional type metadata for a declaration.
+         *
+         * @param node The declaration node.
+         * @param decoratorExpressions The destination array to which to add new decorator expressions.
+         */
+        function addTypeMetadata(node, container, decoratorExpressions) {
+            if (USE_NEW_TYPE_METADATA_FORMAT) {
+                addNewTypeMetadata(node, container, decoratorExpressions);
+            }
+            else {
+                addOldTypeMetadata(node, container, decoratorExpressions);
+            }
+        }
+        function addOldTypeMetadata(node, container, decoratorExpressions) {
+            if (compilerOptions.emitDecoratorMetadata) {
+                if (shouldAddTypeMetadata(node)) {
+                    decoratorExpressions.push(createMetadataHelper(context, "design:type", serializeTypeOfNode(node)));
+                }
+                if (shouldAddParamTypesMetadata(node)) {
+                    decoratorExpressions.push(createMetadataHelper(context, "design:paramtypes", serializeParameterTypesOfNode(node, container)));
+                }
+                if (shouldAddReturnTypeMetadata(node)) {
+                    decoratorExpressions.push(createMetadataHelper(context, "design:returntype", serializeReturnTypeOfNode(node)));
+                }
+            }
+        }
+        function addNewTypeMetadata(node, container, decoratorExpressions) {
+            if (compilerOptions.emitDecoratorMetadata) {
+                var properties = void 0;
+                if (shouldAddTypeMetadata(node)) {
+                    (properties || (properties = [])).push(ts.createPropertyAssignment("type", ts.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, ts.createToken(37 /* EqualsGreaterThanToken */), serializeTypeOfNode(node))));
+                }
+                if (shouldAddParamTypesMetadata(node)) {
+                    (properties || (properties = [])).push(ts.createPropertyAssignment("paramTypes", ts.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, ts.createToken(37 /* EqualsGreaterThanToken */), serializeParameterTypesOfNode(node, container))));
+                }
+                if (shouldAddReturnTypeMetadata(node)) {
+                    (properties || (properties = [])).push(ts.createPropertyAssignment("returnType", ts.createArrowFunction(/*modifiers*/ undefined, /*typeParameters*/ undefined, [], /*type*/ undefined, ts.createToken(37 /* EqualsGreaterThanToken */), serializeReturnTypeOfNode(node))));
+                }
+                if (properties) {
+                    decoratorExpressions.push(createMetadataHelper(context, "design:typeinfo", ts.createObjectLiteral(properties, /*multiLine*/ true)));
+                }
+            }
+        }
+        /**
+         * Determines whether to emit the "design:type" metadata based on the node's kind.
+         * The caller should have already tested whether the node has decorators and whether the
+         * emitDecoratorMetadata compiler option is set.
+         *
+         * @param node The node to test.
+         */
+        function shouldAddTypeMetadata(node) {
+            var kind = node.kind;
+            return kind === 156 /* MethodDeclaration */
+                || kind === 158 /* GetAccessor */
+                || kind === 159 /* SetAccessor */
+                || kind === 154 /* PropertyDeclaration */;
+        }
+        /**
+         * Determines whether to emit the "design:returntype" metadata based on the node's kind.
+         * The caller should have already tested whether the node has decorators and whether the
+         * emitDecoratorMetadata compiler option is set.
+         *
+         * @param node The node to test.
+         */
+        function shouldAddReturnTypeMetadata(node) {
+            return node.kind === 156 /* MethodDeclaration */;
+        }
+        /**
+         * Determines whether to emit the "design:paramtypes" metadata based on the node's kind.
+         * The caller should have already tested whether the node has decorators and whether the
+         * emitDecoratorMetadata compiler option is set.
+         *
+         * @param node The node to test.
+         */
+        function shouldAddParamTypesMetadata(node) {
+            switch (node.kind) {
+                case 240 /* ClassDeclaration */:
+                case 209 /* ClassExpression */:
+                    return ts.getFirstConstructorWithBody(node) !== undefined;
+                case 156 /* MethodDeclaration */:
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                    return true;
+            }
+            return false;
+        }
+        function getAccessorTypeNode(node) {
+            var accessors = resolver.getAllAccessorDeclarations(node);
+            return accessors.setAccessor && ts.getSetAccessorTypeAnnotationNode(accessors.setAccessor)
+                || accessors.getAccessor && ts.getEffectiveReturnTypeNode(accessors.getAccessor);
+        }
+        /**
+         * Serializes the type of a node for use with decorator type metadata.
+         *
+         * @param node The node that should have its type serialized.
+         */
+        function serializeTypeOfNode(node) {
+            switch (node.kind) {
+                case 154 /* PropertyDeclaration */:
+                case 151 /* Parameter */:
+                    return serializeTypeNode(node.type);
+                case 159 /* SetAccessor */:
+                case 158 /* GetAccessor */:
+                    return serializeTypeNode(getAccessorTypeNode(node));
+                case 240 /* ClassDeclaration */:
+                case 209 /* ClassExpression */:
+                case 156 /* MethodDeclaration */:
+                    return ts.createIdentifier("Function");
+                default:
+                    return ts.createVoidZero();
+            }
+        }
+        /**
+         * Serializes the types of the parameters of a node for use with decorator type metadata.
+         *
+         * @param node The node that should have its parameter types serialized.
+         */
+        function serializeParameterTypesOfNode(node, container) {
+            var valueDeclaration = ts.isClassLike(node)
+                ? ts.getFirstConstructorWithBody(node)
+                : ts.isFunctionLike(node) && ts.nodeIsPresent(node.body)
+                    ? node
+                    : undefined;
+            var expressions = [];
+            if (valueDeclaration) {
+                var parameters = getParametersOfDecoratedDeclaration(valueDeclaration, container);
+                var numParameters = parameters.length;
+                for (var i = 0; i < numParameters; i++) {
+                    var parameter = parameters[i];
+                    if (i === 0 && ts.isIdentifier(parameter.name) && parameter.name.escapedText === "this") {
+                        continue;
+                    }
+                    if (parameter.dotDotDotToken) {
+                        expressions.push(serializeTypeNode(ts.getRestParameterElementType(parameter.type)));
+                    }
+                    else {
+                        expressions.push(serializeTypeOfNode(parameter));
+                    }
+                }
+            }
+            return ts.createArrayLiteral(expressions);
+        }
+        function getParametersOfDecoratedDeclaration(node, container) {
+            if (container && node.kind === 158 /* GetAccessor */) {
+                var setAccessor = ts.getAllAccessorDeclarations(container.members, node).setAccessor;
+                if (setAccessor) {
+                    return setAccessor.parameters;
+                }
+            }
+            return node.parameters;
+        }
+        /**
+         * Serializes the return type of a node for use with decorator type metadata.
+         *
+         * @param node The node that should have its return type serialized.
+         */
+        function serializeReturnTypeOfNode(node) {
+            if (ts.isFunctionLike(node) && node.type) {
+                return serializeTypeNode(node.type);
+            }
+            else if (ts.isAsyncFunction(node)) {
+                return ts.createIdentifier("Promise");
+            }
+            return ts.createVoidZero();
+        }
+        /**
+         * Serializes a type node for use with decorator type metadata.
+         *
+         * Types are serialized in the following fashion:
+         * - Void types point to "undefined" (e.g. "void 0")
+         * - Function and Constructor types point to the global "Function" constructor.
+         * - Interface types with a call or construct signature types point to the global
+         *   "Function" constructor.
+         * - Array and Tuple types point to the global "Array" constructor.
+         * - Type predicates and booleans point to the global "Boolean" constructor.
+         * - String literal types and strings point to the global "String" constructor.
+         * - Enum and number types point to the global "Number" constructor.
+         * - Symbol types point to the global "Symbol" constructor.
+         * - Type references to classes (or class-like variables) point to the constructor for the class.
+         * - Anything else points to the global "Object" constructor.
+         *
+         * @param node The type node to serialize.
+         */
+        function serializeTypeNode(node) {
+            if (node === undefined) {
+                return ts.createIdentifier("Object");
+            }
+            switch (node.kind) {
+                case 106 /* VoidKeyword */:
+                case 141 /* UndefinedKeyword */:
+                case 96 /* NullKeyword */:
+                case 132 /* NeverKeyword */:
+                    return ts.createVoidZero();
+                case 177 /* ParenthesizedType */:
+                    return serializeTypeNode(node.type);
+                case 165 /* FunctionType */:
+                case 166 /* ConstructorType */:
+                    return ts.createIdentifier("Function");
+                case 169 /* ArrayType */:
+                case 170 /* TupleType */:
+                    return ts.createIdentifier("Array");
+                case 163 /* TypePredicate */:
+                case 123 /* BooleanKeyword */:
+                    return ts.createIdentifier("Boolean");
+                case 138 /* StringKeyword */:
+                    return ts.createIdentifier("String");
+                case 136 /* ObjectKeyword */:
+                    return ts.createIdentifier("Object");
+                case 182 /* LiteralType */:
+                    switch (node.literal.kind) {
+                        case 10 /* StringLiteral */:
+                            return ts.createIdentifier("String");
+                        case 202 /* PrefixUnaryExpression */:
+                        case 8 /* NumericLiteral */:
+                            return ts.createIdentifier("Number");
+                        case 9 /* BigIntLiteral */:
+                            return getGlobalBigIntNameWithFallback();
+                        case 102 /* TrueKeyword */:
+                        case 87 /* FalseKeyword */:
+                            return ts.createIdentifier("Boolean");
+                        default:
+                            return ts.Debug.failBadSyntaxKind(node.literal);
+                    }
+                case 135 /* NumberKeyword */:
+                    return ts.createIdentifier("Number");
+                case 146 /* BigIntKeyword */:
+                    return getGlobalBigIntNameWithFallback();
+                case 139 /* SymbolKeyword */:
+                    return languageVersion < 2 /* ES2015 */
+                        ? getGlobalSymbolNameWithFallback()
+                        : ts.createIdentifier("Symbol");
+                case 164 /* TypeReference */:
+                    return serializeTypeReferenceNode(node);
+                case 174 /* IntersectionType */:
+                case 173 /* UnionType */:
+                    return serializeTypeList(node.types);
+                case 175 /* ConditionalType */:
+                    return serializeTypeList([node.trueType, node.falseType]);
+                case 167 /* TypeQuery */:
+                case 179 /* TypeOperator */:
+                case 180 /* IndexedAccessType */:
+                case 181 /* MappedType */:
+                case 168 /* TypeLiteral */:
+                case 120 /* AnyKeyword */:
+                case 143 /* UnknownKeyword */:
+                case 178 /* ThisType */:
+                case 183 /* ImportType */:
+                    break;
+                default:
+                    return ts.Debug.failBadSyntaxKind(node);
+            }
+            return ts.createIdentifier("Object");
+        }
+        function serializeTypeList(types) {
+            // Note when updating logic here also update getEntityNameForDecoratorMetadata
+            // so that aliases can be marked as referenced
+            var serializedUnion;
+            for (var _i = 0, types_17 = types; _i < types_17.length; _i++) {
+                var typeNode = types_17[_i];
+                while (typeNode.kind === 177 /* ParenthesizedType */) {
+                    typeNode = typeNode.type; // Skip parens if need be
+                }
+                if (typeNode.kind === 132 /* NeverKeyword */) {
+                    continue; // Always elide `never` from the union/intersection if possible
+                }
+                if (!strictNullChecks && (typeNode.kind === 96 /* NullKeyword */ || typeNode.kind === 141 /* UndefinedKeyword */)) {
+                    continue; // Elide null and undefined from unions for metadata, just like what we did prior to the implementation of strict null checks
+                }
+                var serializedIndividual = serializeTypeNode(typeNode);
+                if (ts.isIdentifier(serializedIndividual) && serializedIndividual.escapedText === "Object") {
+                    // One of the individual is global object, return immediately
+                    return serializedIndividual;
+                }
+                // If there exists union that is not void 0 expression, check if the the common type is identifier.
+                // anything more complex and we will just default to Object
+                else if (serializedUnion) {
+                    // Different types
+                    if (!ts.isIdentifier(serializedUnion) ||
+                        !ts.isIdentifier(serializedIndividual) ||
+                        serializedUnion.escapedText !== serializedIndividual.escapedText) {
+                        return ts.createIdentifier("Object");
+                    }
+                }
+                else {
+                    // Initialize the union type
+                    serializedUnion = serializedIndividual;
+                }
+            }
+            // If we were able to find common type, use it
+            return serializedUnion || ts.createVoidZero(); // Fallback is only hit if all union constituients are null/undefined/never
+        }
+        /**
+         * Serializes a TypeReferenceNode to an appropriate JS constructor value for use with
+         * decorator type metadata.
+         *
+         * @param node The type reference node.
+         */
+        function serializeTypeReferenceNode(node) {
+            var kind = resolver.getTypeReferenceSerializationKind(node.typeName, currentNameScope || currentLexicalScope);
+            switch (kind) {
+                case ts.TypeReferenceSerializationKind.Unknown:
+                    // From conditional type type reference that cannot be resolved is Similar to any or unknown
+                    if (ts.findAncestor(node, function (n) { return n.parent && ts.isConditionalTypeNode(n.parent) && (n.parent.trueType === n || n.parent.falseType === n); })) {
+                        return ts.createIdentifier("Object");
+                    }
+                    var serialized = serializeEntityNameAsExpressionFallback(node.typeName);
+                    var temp = ts.createTempVariable(hoistVariableDeclaration);
+                    return ts.createConditional(ts.createTypeCheck(ts.createAssignment(temp, serialized), "function"), temp, ts.createIdentifier("Object"));
+                case ts.TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue:
+                    return serializeEntityNameAsExpression(node.typeName);
+                case ts.TypeReferenceSerializationKind.VoidNullableOrNeverType:
+                    return ts.createVoidZero();
+                case ts.TypeReferenceSerializationKind.BigIntLikeType:
+                    return getGlobalBigIntNameWithFallback();
+                case ts.TypeReferenceSerializationKind.BooleanType:
+                    return ts.createIdentifier("Boolean");
+                case ts.TypeReferenceSerializationKind.NumberLikeType:
+                    return ts.createIdentifier("Number");
+                case ts.TypeReferenceSerializationKind.StringLikeType:
+                    return ts.createIdentifier("String");
+                case ts.TypeReferenceSerializationKind.ArrayLikeType:
+                    return ts.createIdentifier("Array");
+                case ts.TypeReferenceSerializationKind.ESSymbolType:
+                    return languageVersion < 2 /* ES2015 */
+                        ? getGlobalSymbolNameWithFallback()
+                        : ts.createIdentifier("Symbol");
+                case ts.TypeReferenceSerializationKind.TypeWithCallSignature:
+                    return ts.createIdentifier("Function");
+                case ts.TypeReferenceSerializationKind.Promise:
+                    return ts.createIdentifier("Promise");
+                case ts.TypeReferenceSerializationKind.ObjectType:
+                    return ts.createIdentifier("Object");
+                default:
+                    return ts.Debug.assertNever(kind);
+            }
+        }
+        function createCheckedValue(left, right) {
+            return ts.createLogicalAnd(ts.createStrictInequality(ts.createTypeOf(left), ts.createLiteral("undefined")), right);
+        }
+        /**
+         * Serializes an entity name which may not exist at runtime, but whose access shouldn't throw
+         *
+         * @param node The entity name to serialize.
+         */
+        function serializeEntityNameAsExpressionFallback(node) {
+            if (node.kind === 72 /* Identifier */) {
+                // A -> typeof A !== undefined && A
+                var copied = serializeEntityNameAsExpression(node);
+                return createCheckedValue(copied, copied);
+            }
+            if (node.left.kind === 72 /* Identifier */) {
+                // A.B -> typeof A !== undefined && A.B
+                return createCheckedValue(serializeEntityNameAsExpression(node.left), serializeEntityNameAsExpression(node));
+            }
+            // A.B.C -> typeof A !== undefined && (_a = A.B) !== void 0 && _a.C
+            var left = serializeEntityNameAsExpressionFallback(node.left);
+            var temp = ts.createTempVariable(hoistVariableDeclaration);
+            return ts.createLogicalAnd(ts.createLogicalAnd(left.left, ts.createStrictInequality(ts.createAssignment(temp, left.right), ts.createVoidZero())), ts.createPropertyAccess(temp, node.right));
+        }
+        /**
+         * Serializes an entity name as an expression for decorator type metadata.
+         *
+         * @param node The entity name to serialize.
+         */
+        function serializeEntityNameAsExpression(node) {
+            switch (node.kind) {
+                case 72 /* Identifier */:
+                    // Create a clone of the name with a new parent, and treat it as if it were
+                    // a source tree node for the purposes of the checker.
+                    var name = ts.getMutableClone(node);
+                    name.flags &= ~8 /* Synthesized */;
+                    name.original = undefined;
+                    name.parent = ts.getParseTreeNode(currentLexicalScope); // ensure the parent is set to a parse tree node.
+                    return name;
+                case 148 /* QualifiedName */:
+                    return serializeQualifiedNameAsExpression(node);
+            }
+        }
+        /**
+         * Serializes an qualified name as an expression for decorator type metadata.
+         *
+         * @param node The qualified name to serialize.
+         * @param useFallback A value indicating whether to use logical operators to test for the
+         *                    qualified name at runtime.
+         */
+        function serializeQualifiedNameAsExpression(node) {
+            return ts.createPropertyAccess(serializeEntityNameAsExpression(node.left), node.right);
+        }
+        /**
+         * Gets an expression that points to the global "Symbol" constructor at runtime if it is
+         * available.
+         */
+        function getGlobalSymbolNameWithFallback() {
+            return ts.createConditional(ts.createTypeCheck(ts.createIdentifier("Symbol"), "function"), ts.createIdentifier("Symbol"), ts.createIdentifier("Object"));
+        }
+        /**
+         * Gets an expression that points to the global "BigInt" constructor at runtime if it is
+         * available.
+         */
+        function getGlobalBigIntNameWithFallback() {
+            return languageVersion < 6 /* ESNext */
+                ? ts.createConditional(ts.createTypeCheck(ts.createIdentifier("BigInt"), "function"), ts.createIdentifier("BigInt"), ts.createIdentifier("Object"))
+                : ts.createIdentifier("BigInt");
+        }
+        /**
+         * A simple inlinable expression is an expression which can be copied into multiple locations
+         * without risk of repeating any sideeffects and whose value could not possibly change between
+         * any such locations
+         */
+        function isSimpleInlineableExpression(expression) {
+            return !ts.isIdentifier(expression) && ts.isSimpleCopiableExpression(expression) ||
+                ts.isWellKnownSymbolSyntactically(expression);
+        }
+        /**
+         * Gets an expression that represents a property name. For a computed property, a
+         * name is generated for the node.
+         *
+         * @param member The member whose name should be converted into an expression.
+         */
+        function getExpressionForPropertyName(member, generateNameForComputedPropertyName) {
+            var name = member.name;
+            if (ts.isComputedPropertyName(name)) {
+                return generateNameForComputedPropertyName && !isSimpleInlineableExpression(name.expression)
+                    ? ts.getGeneratedNameForNode(name)
+                    : name.expression;
+            }
+            else if (ts.isIdentifier(name)) {
+                return ts.createLiteral(ts.idText(name));
+            }
+            else {
+                return ts.getSynthesizedClone(name);
+            }
+        }
+        /**
+         * If the name is a computed property, this function transforms it, then either returns an expression which caches the
+         * value of the result or the expression itself if the value is either unused or safe to inline into multiple locations
+         * @param shouldHoist Does the expression need to be reused? (ie, for an initializer or a decorator)
+         * @param omitSimple Should expressions with no observable side-effects be elided? (ie, the expression is not hoisted for a decorator or initializer and is a literal)
+         */
+        function getPropertyNameExpressionIfNeeded(name, shouldHoist, omitSimple) {
+            if (ts.isComputedPropertyName(name)) {
+                var expression = ts.visitNode(name.expression, visitor, ts.isExpression);
+                var innerExpression = ts.skipPartiallyEmittedExpressions(expression);
+                var inlinable = isSimpleInlineableExpression(innerExpression);
+                if (!inlinable && shouldHoist) {
+                    var generatedName = ts.getGeneratedNameForNode(name);
+                    hoistVariableDeclaration(generatedName);
+                    return ts.createAssignment(generatedName, expression);
+                }
+                return (omitSimple && (inlinable || ts.isIdentifier(innerExpression))) ? undefined : expression;
+            }
+        }
+        /**
+         * Visits the property name of a class element, for use when emitting property
+         * initializers. For a computed property on a node with decorators, a temporary
+         * value is stored for later use.
+         *
+         * @param member The member whose name should be visited.
+         */
+        function visitPropertyNameOfClassElement(member) {
+            var name = member.name;
+            var expr = getPropertyNameExpressionIfNeeded(name, ts.some(member.decorators), /*omitSimple*/ false);
+            if (expr) { // expr only exists if `name` is a computed property name
+                // Inline any pending expressions from previous elided or relocated computed property name expressions in order to preserve execution order
+                if (ts.some(pendingExpressions)) {
+                    expr = ts.inlineExpressions(pendingExpressions.concat([expr]));
+                    pendingExpressions.length = 0;
+                }
+                return ts.updateComputedPropertyName(name, expr);
+            }
+            else {
+                return name;
+            }
+        }
+        /**
+         * Transforms a HeritageClause with TypeScript syntax.
+         *
+         * This function will only be called when one of the following conditions are met:
+         * - The node is a non-`extends` heritage clause that should be elided.
+         * - The node is an `extends` heritage clause that should be visited, but only allow a single type.
+         *
+         * @param node The HeritageClause to transform.
+         */
+        function visitHeritageClause(node) {
+            if (node.token === 86 /* ExtendsKeyword */) {
+                var types = ts.visitNodes(node.types, visitor, ts.isExpressionWithTypeArguments, 0, 1);
+                return ts.setTextRange(ts.createHeritageClause(86 /* ExtendsKeyword */, types), node);
+            }
+            return undefined;
+        }
+        /**
+         * Transforms an ExpressionWithTypeArguments with TypeScript syntax.
+         *
+         * This function will only be called when one of the following conditions are met:
+         * - The node contains type arguments that should be elided.
+         *
+         * @param node The ExpressionWithTypeArguments to transform.
+         */
+        function visitExpressionWithTypeArguments(node) {
+            return ts.updateExpressionWithTypeArguments(node, 
+            /*typeArguments*/ undefined, ts.visitNode(node.expression, visitor, ts.isLeftHandSideExpression));
+        }
+        /**
+         * Determines whether to emit a function-like declaration. We should not emit the
+         * declaration if it does not have a body.
+         *
+         * @param node The declaration node.
+         */
+        function shouldEmitFunctionLikeDeclaration(node) {
+            return !ts.nodeIsMissing(node.body);
+        }
+        function visitPropertyDeclaration(node) {
+            var expr = getPropertyNameExpressionIfNeeded(node.name, ts.some(node.decorators) || !!node.initializer, /*omitSimple*/ true);
+            if (expr && !isSimpleInlineableExpression(expr)) {
+                (pendingExpressions || (pendingExpressions = [])).push(expr);
+            }
+            return undefined;
+        }
+        function visitConstructor(node) {
+            if (!shouldEmitFunctionLikeDeclaration(node)) {
+                return undefined;
+            }
+            return ts.updateConstructor(node, ts.visitNodes(node.decorators, visitor, ts.isDecorator), ts.visitNodes(node.modifiers, visitor, ts.isModifier), ts.visitParameterList(node.parameters, visitor, context), ts.visitFunctionBody(node.body, visitor, context));
+        }
+        /**
+         * Visits a method declaration of a class.
+         *
+         * This function will be called when one of the following conditions are met:
+         * - The node is an overload
+         * - The node is marked as abstract, public, private, protected, or readonly
+         * - The node has a computed property name
+         *
+         * @param node The method node.
+         */
+        function visitMethodDeclaration(node) {
+            if (!shouldEmitFunctionLikeDeclaration(node)) {
+                return undefined;
+            }
+            var updated = ts.updateMethod(node, 
+            /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, visitPropertyNameOfClassElement(node), 
+            /*questionToken*/ undefined, 
+            /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), 
+            /*type*/ undefined, ts.visitFunctionBody(node.body, visitor, context));
+            if (updated !== node) {
+                // While we emit the source map for the node after skipping decorators and modifiers,
+                // we need to emit the comments for the original range.
+                ts.setCommentRange(updated, node);
+                ts.setSourceMapRange(updated, ts.moveRangePastDecorators(node));
+            }
+            return updated;
+        }
+        /**
+         * Determines whether to emit an accessor declaration. We should not emit the
+         * declaration if it does not have a body and is abstract.
+         *
+         * @param node The declaration node.
+         */
+        function shouldEmitAccessorDeclaration(node) {
+            return !(ts.nodeIsMissing(node.body) && ts.hasModifier(node, 128 /* Abstract */));
+        }
+        /**
+         * Visits a get accessor declaration of a class.
+         *
+         * This function will be called when one of the following conditions are met:
+         * - The node is marked as abstract, public, private, or protected
+         * - The node has a computed property name
+         *
+         * @param node The get accessor node.
+         */
+        function visitGetAccessor(node) {
+            if (!shouldEmitAccessorDeclaration(node)) {
+                return undefined;
+            }
+            var updated = ts.updateGetAccessor(node, 
+            /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitParameterList(node.parameters, visitor, context), 
+            /*type*/ undefined, ts.visitFunctionBody(node.body, visitor, context) || ts.createBlock([]));
+            if (updated !== node) {
+                // While we emit the source map for the node after skipping decorators and modifiers,
+                // we need to emit the comments for the original range.
+                ts.setCommentRange(updated, node);
+                ts.setSourceMapRange(updated, ts.moveRangePastDecorators(node));
+            }
+            return updated;
+        }
+        /**
+         * Visits a set accessor declaration of a class.
+         *
+         * This function will be called when one of the following conditions are met:
+         * - The node is marked as abstract, public, private, or protected
+         * - The node has a computed property name
+         *
+         * @param node The set accessor node.
+         */
+        function visitSetAccessor(node) {
+            if (!shouldEmitAccessorDeclaration(node)) {
+                return undefined;
+            }
+            var updated = ts.updateSetAccessor(node, 
+            /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), visitPropertyNameOfClassElement(node), ts.visitParameterList(node.parameters, visitor, context), ts.visitFunctionBody(node.body, visitor, context) || ts.createBlock([]));
+            if (updated !== node) {
+                // While we emit the source map for the node after skipping decorators and modifiers,
+                // we need to emit the comments for the original range.
+                ts.setCommentRange(updated, node);
+                ts.setSourceMapRange(updated, ts.moveRangePastDecorators(node));
+            }
+            return updated;
+        }
+        /**
+         * Visits a function declaration.
+         *
+         * This function will be called when one of the following conditions are met:
+         * - The node is an overload
+         * - The node is exported from a TypeScript namespace
+         * - The node has decorators
+         *
+         * @param node The function node.
+         */
+        function visitFunctionDeclaration(node) {
+            if (!shouldEmitFunctionLikeDeclaration(node)) {
+                return ts.createNotEmittedStatement(node);
+            }
+            var updated = ts.updateFunctionDeclaration(node, 
+            /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, node.name, 
+            /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), 
+            /*type*/ undefined, ts.visitFunctionBody(node.body, visitor, context) || ts.createBlock([]));
+            if (isExportOfNamespace(node)) {
+                var statements = [updated];
+                addExportMemberAssignment(statements, node);
+                return statements;
+            }
+            return updated;
+        }
+        /**
+         * Visits a function expression node.
+         *
+         * This function will be called when one of the following conditions are met:
+         * - The node has type annotations
+         *
+         * @param node The function expression node.
+         */
+        function visitFunctionExpression(node) {
+            if (!shouldEmitFunctionLikeDeclaration(node)) {
+                return ts.createOmittedExpression();
+            }
+            var updated = ts.updateFunctionExpression(node, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, node.name, 
+            /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), 
+            /*type*/ undefined, ts.visitFunctionBody(node.body, visitor, context) || ts.createBlock([]));
+            return updated;
+        }
+        /**
+         * @remarks
+         * This function will be called when one of the following conditions are met:
+         * - The node has type annotations
+         */
+        function visitArrowFunction(node) {
+            var updated = ts.updateArrowFunction(node, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), 
+            /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), 
+            /*type*/ undefined, node.equalsGreaterThanToken, ts.visitFunctionBody(node.body, visitor, context));
+            return updated;
+        }
+        /**
+         * Visits a parameter declaration node.
+         *
+         * This function will be called when one of the following conditions are met:
+         * - The node has an accessibility modifier.
+         * - The node has a questionToken.
+         * - The node's kind is ThisKeyword.
+         *
+         * @param node The parameter declaration node.
+         */
+        function visitParameter(node) {
+            if (ts.parameterIsThisKeyword(node)) {
+                return undefined;
+            }
+            var parameter = ts.createParameter(
+            /*decorators*/ undefined, 
+            /*modifiers*/ undefined, node.dotDotDotToken, ts.visitNode(node.name, visitor, ts.isBindingName), 
+            /*questionToken*/ undefined, 
+            /*type*/ undefined, ts.visitNode(node.initializer, visitor, ts.isExpression));
+            // While we emit the source map for the node after skipping decorators and modifiers,
+            // we need to emit the comments for the original range.
+            ts.setOriginalNode(parameter, node);
+            ts.setTextRange(parameter, ts.moveRangePastModifiers(node));
+            ts.setCommentRange(parameter, node);
+            ts.setSourceMapRange(parameter, ts.moveRangePastModifiers(node));
+            ts.setEmitFlags(parameter.name, 32 /* NoTrailingSourceMap */);
+            return parameter;
+        }
+        /**
+         * Visits a variable statement in a namespace.
+         *
+         * This function will be called when one of the following conditions are met:
+         * - The node is exported from a TypeScript namespace.
+         */
+        function visitVariableStatement(node) {
+            if (isExportOfNamespace(node)) {
+                var variables = ts.getInitializedVariables(node.declarationList);
+                if (variables.length === 0) {
+                    // elide statement if there are no initialized variables.
+                    return undefined;
+                }
+                return ts.setTextRange(ts.createExpressionStatement(ts.inlineExpressions(ts.map(variables, transformInitializedVariable))), node);
+            }
+            else {
+                return ts.visitEachChild(node, visitor, context);
+            }
+        }
+        function transformInitializedVariable(node) {
+            var name = node.name;
+            if (ts.isBindingPattern(name)) {
+                return ts.flattenDestructuringAssignment(node, visitor, context, 0 /* All */, 
+                /*needsValue*/ false, createNamespaceExportExpression);
+            }
+            else {
+                return ts.setTextRange(ts.createAssignment(getNamespaceMemberNameWithSourceMapsAndWithoutComments(name), ts.visitNode(node.initializer, visitor, ts.isExpression)), 
+                /*location*/ node);
+            }
+        }
+        function visitVariableDeclaration(node) {
+            return ts.updateVariableDeclaration(node, ts.visitNode(node.name, visitor, ts.isBindingName), 
+            /*type*/ undefined, ts.visitNode(node.initializer, visitor, ts.isExpression));
+        }
+        /**
+         * Visits a parenthesized expression that contains either a type assertion or an `as`
+         * expression.
+         *
+         * @param node The parenthesized expression node.
+         */
+        function visitParenthesizedExpression(node) {
+            var innerExpression = ts.skipOuterExpressions(node.expression, ~2 /* Assertions */);
+            if (ts.isAssertionExpression(innerExpression)) {
+                // Make sure we consider all nested cast expressions, e.g.:
+                // (<any><number><any>-A).x;
+                var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
+                // We have an expression of the form: (<Type>SubExpr). Emitting this as (SubExpr)
+                // is really not desirable. We would like to emit the subexpression as-is. Omitting
+                // the parentheses, however, could cause change in the semantics of the generated
+                // code if the casted expression has a lower precedence than the rest of the
+                // expression.
+                //
+                // To preserve comments, we return a "PartiallyEmittedExpression" here which will
+                // preserve the position information of the original expression.
+                //
+                // Due to the auto-parenthesization rules used by the visitor and factory functions
+                // we can safely elide the parentheses here, as a new synthetic
+                // ParenthesizedExpression will be inserted if we remove parentheses too
+                // aggressively.
+                // HOWEVER - if there are leading comments on the expression itself, to handle ASI
+                // correctly for return and throw, we must keep the parenthesis
+                if (ts.length(ts.getLeadingCommentRangesOfNode(expression, currentSourceFile))) {
+                    return ts.updateParen(node, expression);
+                }
+                return ts.createPartiallyEmittedExpression(expression, node);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitAssertionExpression(node) {
+            var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
+            return ts.createPartiallyEmittedExpression(expression, node);
+        }
+        function visitNonNullExpression(node) {
+            var expression = ts.visitNode(node.expression, visitor, ts.isLeftHandSideExpression);
+            return ts.createPartiallyEmittedExpression(expression, node);
+        }
+        function visitCallExpression(node) {
+            return ts.updateCall(node, ts.visitNode(node.expression, visitor, ts.isExpression), 
+            /*typeArguments*/ undefined, ts.visitNodes(node.arguments, visitor, ts.isExpression));
+        }
+        function visitNewExpression(node) {
+            return ts.updateNew(node, ts.visitNode(node.expression, visitor, ts.isExpression), 
+            /*typeArguments*/ undefined, ts.visitNodes(node.arguments, visitor, ts.isExpression));
+        }
+        function visitTaggedTemplateExpression(node) {
+            return ts.updateTaggedTemplate(node, ts.visitNode(node.tag, visitor, ts.isExpression), 
+            /*typeArguments*/ undefined, ts.visitNode(node.template, visitor, ts.isExpression));
+        }
+        /**
+         * Determines whether to emit an enum declaration.
+         *
+         * @param node The enum declaration node.
+         */
+        function shouldEmitEnumDeclaration(node) {
+            return !ts.isEnumConst(node)
+                || compilerOptions.preserveConstEnums
+                || compilerOptions.isolatedModules;
+        }
+        /**
+         * Visits an enum declaration.
+         *
+         * This function will be called any time a TypeScript enum is encountered.
+         *
+         * @param node The enum declaration node.
+         */
+        function visitEnumDeclaration(node) {
+            if (!shouldEmitEnumDeclaration(node)) {
+                return undefined;
+            }
+            var statements = [];
+            // We request to be advised when the printer is about to print this node. This allows
+            // us to set up the correct state for later substitutions.
+            var emitFlags = 2 /* AdviseOnEmitNode */;
+            // If needed, we should emit a variable declaration for the enum. If we emit
+            // a leading variable declaration, we should not emit leading comments for the
+            // enum body.
+            var varAdded = addVarForEnumOrModuleDeclaration(statements, node);
+            if (varAdded) {
+                // We should still emit the comments if we are emitting a system module.
+                if (moduleKind !== ts.ModuleKind.System || currentLexicalScope !== currentSourceFile) {
+                    emitFlags |= 512 /* NoLeadingComments */;
+                }
+            }
+            // `parameterName` is the declaration name used inside of the enum.
+            var parameterName = getNamespaceParameterName(node);
+            // `containerName` is the expression used inside of the enum for assignments.
+            var containerName = getNamespaceContainerName(node);
+            // `exportName` is the expression used within this node's container for any exported references.
+            var exportName = ts.hasModifier(node, 1 /* Export */)
+                ? ts.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, /*allowComments*/ false, /*allowSourceMaps*/ true)
+                : ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
+            //  x || (x = {})
+            //  exports.x || (exports.x = {})
+            var moduleArg = ts.createLogicalOr(exportName, ts.createAssignment(exportName, ts.createObjectLiteral()));
+            if (hasNamespaceQualifiedExportName(node)) {
+                // `localName` is the expression used within this node's containing scope for any local references.
+                var localName = ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
+                //  x = (exports.x || (exports.x = {}))
+                moduleArg = ts.createAssignment(localName, moduleArg);
+            }
+            //  (function (x) {
+            //      x[x["y"] = 0] = "y";
+            //      ...
+            //  })(x || (x = {}));
+            var enumStatement = ts.createExpressionStatement(ts.createCall(ts.createFunctionExpression(
+            /*modifiers*/ undefined, 
+            /*asteriskToken*/ undefined, 
+            /*name*/ undefined, 
+            /*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, parameterName)], 
+            /*type*/ undefined, transformEnumBody(node, containerName)), 
+            /*typeArguments*/ undefined, [moduleArg]));
+            ts.setOriginalNode(enumStatement, node);
+            if (varAdded) {
+                // If a variable was added, synthetic comments are emitted on it, not on the moduleStatement.
+                ts.setSyntheticLeadingComments(enumStatement, undefined);
+                ts.setSyntheticTrailingComments(enumStatement, undefined);
+            }
+            ts.setTextRange(enumStatement, node);
+            ts.addEmitFlags(enumStatement, emitFlags);
+            statements.push(enumStatement);
+            // Add a DeclarationMarker for the enum to preserve trailing comments and mark
+            // the end of the declaration.
+            statements.push(ts.createEndOfDeclarationMarker(node));
+            return statements;
+        }
+        /**
+         * Transforms the body of an enum declaration.
+         *
+         * @param node The enum declaration node.
+         */
+        function transformEnumBody(node, localName) {
+            var savedCurrentNamespaceLocalName = currentNamespaceContainerName;
+            currentNamespaceContainerName = localName;
+            var statements = [];
+            startLexicalEnvironment();
+            var members = ts.map(node.members, transformEnumMember);
+            ts.addStatementsAfterPrologue(statements, endLexicalEnvironment());
+            ts.addRange(statements, members);
+            currentNamespaceContainerName = savedCurrentNamespaceLocalName;
+            return ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), /*location*/ node.members), 
+            /*multiLine*/ true);
+        }
+        /**
+         * Transforms an enum member into a statement.
+         *
+         * @param member The enum member node.
+         */
+        function transformEnumMember(member) {
+            // enums don't support computed properties
+            // we pass false as 'generateNameForComputedPropertyName' for a backward compatibility purposes
+            // old emitter always generate 'expression' part of the name as-is.
+            var name = getExpressionForPropertyName(member, /*generateNameForComputedPropertyName*/ false);
+            var valueExpression = transformEnumMemberDeclarationValue(member);
+            var innerAssignment = ts.createAssignment(ts.createElementAccess(currentNamespaceContainerName, name), valueExpression);
+            var outerAssignment = valueExpression.kind === 10 /* StringLiteral */ ?
+                innerAssignment :
+                ts.createAssignment(ts.createElementAccess(currentNamespaceContainerName, innerAssignment), name);
+            return ts.setTextRange(ts.createExpressionStatement(ts.setTextRange(outerAssignment, member)), member);
+        }
+        /**
+         * Transforms the value of an enum member.
+         *
+         * @param member The enum member node.
+         */
+        function transformEnumMemberDeclarationValue(member) {
+            var value = resolver.getConstantValue(member);
+            if (value !== undefined) {
+                return ts.createLiteral(value);
+            }
+            else {
+                enableSubstitutionForNonQualifiedEnumMembers();
+                if (member.initializer) {
+                    return ts.visitNode(member.initializer, visitor, ts.isExpression);
+                }
+                else {
+                    return ts.createVoidZero();
+                }
+            }
+        }
+        /**
+         * Determines whether to elide a module declaration.
+         *
+         * @param node The module declaration node.
+         */
+        function shouldEmitModuleDeclaration(node) {
+            return ts.isInstantiatedModule(node, !!compilerOptions.preserveConstEnums || !!compilerOptions.isolatedModules);
+        }
+        /**
+         * Determines whether an exported declaration will have a qualified export name (e.g. `f.x`
+         * or `exports.x`).
+         */
+        function hasNamespaceQualifiedExportName(node) {
+            return isExportOfNamespace(node)
+                || (isExternalModuleExport(node)
+                    && moduleKind !== ts.ModuleKind.ES2015
+                    && moduleKind !== ts.ModuleKind.ESNext
+                    && moduleKind !== ts.ModuleKind.System);
+        }
+        /**
+         * Records that a declaration was emitted in the current scope, if it was the first
+         * declaration for the provided symbol.
+         */
+        function recordEmittedDeclarationInScope(node) {
+            if (!currentScopeFirstDeclarationsOfName) {
+                currentScopeFirstDeclarationsOfName = ts.createUnderscoreEscapedMap();
+            }
+            var name = declaredNameInScope(node);
+            if (!currentScopeFirstDeclarationsOfName.has(name)) {
+                currentScopeFirstDeclarationsOfName.set(name, node);
+            }
+        }
+        /**
+         * Determines whether a declaration is the first declaration with
+         * the same name emitted in the current scope.
+         */
+        function isFirstEmittedDeclarationInScope(node) {
+            if (currentScopeFirstDeclarationsOfName) {
+                var name = declaredNameInScope(node);
+                return currentScopeFirstDeclarationsOfName.get(name) === node;
+            }
+            return true;
+        }
+        function declaredNameInScope(node) {
+            ts.Debug.assertNode(node.name, ts.isIdentifier);
+            return node.name.escapedText;
+        }
+        /**
+         * Adds a leading VariableStatement for a enum or module declaration.
+         */
+        function addVarForEnumOrModuleDeclaration(statements, node) {
+            // Emit a variable statement for the module. We emit top-level enums as a `var`
+            // declaration to avoid static errors in global scripts scripts due to redeclaration.
+            // enums in any other scope are emitted as a `let` declaration.
+            var statement = ts.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.createVariableDeclarationList([
+                ts.createVariableDeclaration(ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true))
+            ], currentLexicalScope.kind === 279 /* SourceFile */ ? 0 /* None */ : 1 /* Let */));
+            ts.setOriginalNode(statement, node);
+            recordEmittedDeclarationInScope(node);
+            if (isFirstEmittedDeclarationInScope(node)) {
+                // Adjust the source map emit to match the old emitter.
+                if (node.kind === 243 /* EnumDeclaration */) {
+                    ts.setSourceMapRange(statement.declarationList, node);
+                }
+                else {
+                    ts.setSourceMapRange(statement, node);
+                }
+                // Trailing comments for module declaration should be emitted after the function closure
+                // instead of the variable statement:
+                //
+                //     /** Module comment*/
+                //     module m1 {
+                //         function foo4Export() {
+                //         }
+                //     } // trailing comment module
+                //
+                // Should emit:
+                //
+                //     /** Module comment*/
+                //     var m1;
+                //     (function (m1) {
+                //         function foo4Export() {
+                //         }
+                //     })(m1 || (m1 = {})); // trailing comment module
+                //
+                ts.setCommentRange(statement, node);
+                ts.addEmitFlags(statement, 1024 /* NoTrailingComments */ | 4194304 /* HasEndOfDeclarationMarker */);
+                statements.push(statement);
+                return true;
+            }
+            else {
+                // For an EnumDeclaration or ModuleDeclaration that merges with a preceeding
+                // declaration we do not emit a leading variable declaration. To preserve the
+                // begin/end semantics of the declararation and to properly handle exports
+                // we wrap the leading variable declaration in a `MergeDeclarationMarker`.
+                var mergeMarker = ts.createMergeDeclarationMarker(statement);
+                ts.setEmitFlags(mergeMarker, 1536 /* NoComments */ | 4194304 /* HasEndOfDeclarationMarker */);
+                statements.push(mergeMarker);
+                return false;
+            }
+        }
+        /**
+         * Visits a module declaration node.
+         *
+         * This function will be called any time a TypeScript namespace (ModuleDeclaration) is encountered.
+         *
+         * @param node The module declaration node.
+         */
+        function visitModuleDeclaration(node) {
+            if (!shouldEmitModuleDeclaration(node)) {
+                return ts.createNotEmittedStatement(node);
+            }
+            ts.Debug.assertNode(node.name, ts.isIdentifier, "A TypeScript namespace should have an Identifier name.");
+            enableSubstitutionForNamespaceExports();
+            var statements = [];
+            // We request to be advised when the printer is about to print this node. This allows
+            // us to set up the correct state for later substitutions.
+            var emitFlags = 2 /* AdviseOnEmitNode */;
+            // If needed, we should emit a variable declaration for the module. If we emit
+            // a leading variable declaration, we should not emit leading comments for the
+            // module body.
+            var varAdded = addVarForEnumOrModuleDeclaration(statements, node);
+            if (varAdded) {
+                // We should still emit the comments if we are emitting a system module.
+                if (moduleKind !== ts.ModuleKind.System || currentLexicalScope !== currentSourceFile) {
+                    emitFlags |= 512 /* NoLeadingComments */;
+                }
+            }
+            // `parameterName` is the declaration name used inside of the namespace.
+            var parameterName = getNamespaceParameterName(node);
+            // `containerName` is the expression used inside of the namespace for exports.
+            var containerName = getNamespaceContainerName(node);
+            // `exportName` is the expression used within this node's container for any exported references.
+            var exportName = ts.hasModifier(node, 1 /* Export */)
+                ? ts.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, /*allowComments*/ false, /*allowSourceMaps*/ true)
+                : ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
+            //  x || (x = {})
+            //  exports.x || (exports.x = {})
+            var moduleArg = ts.createLogicalOr(exportName, ts.createAssignment(exportName, ts.createObjectLiteral()));
+            if (hasNamespaceQualifiedExportName(node)) {
+                // `localName` is the expression used within this node's containing scope for any local references.
+                var localName = ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
+                //  x = (exports.x || (exports.x = {}))
+                moduleArg = ts.createAssignment(localName, moduleArg);
+            }
+            //  (function (x_1) {
+            //      x_1.y = ...;
+            //  })(x || (x = {}));
+            var moduleStatement = ts.createExpressionStatement(ts.createCall(ts.createFunctionExpression(
+            /*modifiers*/ undefined, 
+            /*asteriskToken*/ undefined, 
+            /*name*/ undefined, 
+            /*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, parameterName)], 
+            /*type*/ undefined, transformModuleBody(node, containerName)), 
+            /*typeArguments*/ undefined, [moduleArg]));
+            ts.setOriginalNode(moduleStatement, node);
+            if (varAdded) {
+                // If a variable was added, synthetic comments are emitted on it, not on the moduleStatement.
+                ts.setSyntheticLeadingComments(moduleStatement, undefined);
+                ts.setSyntheticTrailingComments(moduleStatement, undefined);
+            }
+            ts.setTextRange(moduleStatement, node);
+            ts.addEmitFlags(moduleStatement, emitFlags);
+            statements.push(moduleStatement);
+            // Add a DeclarationMarker for the namespace to preserve trailing comments and mark
+            // the end of the declaration.
+            statements.push(ts.createEndOfDeclarationMarker(node));
+            return statements;
+        }
+        /**
+         * Transforms the body of a module declaration.
+         *
+         * @param node The module declaration node.
+         */
+        function transformModuleBody(node, namespaceLocalName) {
+            var savedCurrentNamespaceContainerName = currentNamespaceContainerName;
+            var savedCurrentNamespace = currentNamespace;
+            var savedCurrentScopeFirstDeclarationsOfName = currentScopeFirstDeclarationsOfName;
+            currentNamespaceContainerName = namespaceLocalName;
+            currentNamespace = node;
+            currentScopeFirstDeclarationsOfName = undefined;
+            var statements = [];
+            startLexicalEnvironment();
+            var statementsLocation;
+            var blockLocation;
+            var body = node.body;
+            if (body.kind === 245 /* ModuleBlock */) {
+                saveStateAndInvoke(body, function (body) { return ts.addRange(statements, ts.visitNodes(body.statements, namespaceElementVisitor, ts.isStatement)); });
+                statementsLocation = body.statements;
+                blockLocation = body;
+            }
+            else {
+                var result = visitModuleDeclaration(body);
+                if (result) {
+                    if (ts.isArray(result)) {
+                        ts.addRange(statements, result);
+                    }
+                    else {
+                        statements.push(result);
+                    }
+                }
+                var moduleBlock = getInnerMostModuleDeclarationFromDottedModule(node).body;
+                statementsLocation = ts.moveRangePos(moduleBlock.statements, -1);
+            }
+            ts.addStatementsAfterPrologue(statements, endLexicalEnvironment());
+            currentNamespaceContainerName = savedCurrentNamespaceContainerName;
+            currentNamespace = savedCurrentNamespace;
+            currentScopeFirstDeclarationsOfName = savedCurrentScopeFirstDeclarationsOfName;
+            var block = ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), 
+            /*location*/ statementsLocation), 
+            /*multiLine*/ true);
+            ts.setTextRange(block, blockLocation);
+            // namespace hello.hi.world {
+            //      function foo() {}
+            //
+            //      // TODO, blah
+            // }
+            //
+            // should be emitted as
+            //
+            // var hello;
+            // (function (hello) {
+            //     var hi;
+            //     (function (hi) {
+            //         var world;
+            //         (function (world) {
+            //             function foo() { }
+            //             // TODO, blah
+            //         })(world = hi.world || (hi.world = {}));
+            //     })(hi = hello.hi || (hello.hi = {}));
+            // })(hello || (hello = {}));
+            // We only want to emit comment on the namespace which contains block body itself, not the containing namespaces.
+            if (body.kind !== 245 /* ModuleBlock */) {
+                ts.setEmitFlags(block, ts.getEmitFlags(block) | 1536 /* NoComments */);
+            }
+            return block;
+        }
+        function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration) {
+            if (moduleDeclaration.body.kind === 244 /* ModuleDeclaration */) {
+                var recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration.body);
+                return recursiveInnerModule || moduleDeclaration.body;
+            }
+        }
+        /**
+         * Visits an import declaration, eliding it if it is not referenced.
+         *
+         * @param node The import declaration node.
+         */
+        function visitImportDeclaration(node) {
+            if (!node.importClause) {
+                // Do not elide a side-effect only import declaration.
+                //  import "foo";
+                return node;
+            }
+            // Elide the declaration if the import clause was elided.
+            var importClause = ts.visitNode(node.importClause, visitImportClause, ts.isImportClause);
+            return importClause
+                ? ts.updateImportDeclaration(node, 
+                /*decorators*/ undefined, 
+                /*modifiers*/ undefined, importClause, node.moduleSpecifier)
+                : undefined;
+        }
+        /**
+         * Visits an import clause, eliding it if it is not referenced.
+         *
+         * @param node The import clause node.
+         */
+        function visitImportClause(node) {
+            // Elide the import clause if we elide both its name and its named bindings.
+            var name = resolver.isReferencedAliasDeclaration(node) ? node.name : undefined;
+            var namedBindings = ts.visitNode(node.namedBindings, visitNamedImportBindings, ts.isNamedImportBindings);
+            return (name || namedBindings) ? ts.updateImportClause(node, name, namedBindings) : undefined;
+        }
+        /**
+         * Visits named import bindings, eliding it if it is not referenced.
+         *
+         * @param node The named import bindings node.
+         */
+        function visitNamedImportBindings(node) {
+            if (node.kind === 251 /* NamespaceImport */) {
+                // Elide a namespace import if it is not referenced.
+                return resolver.isReferencedAliasDeclaration(node) ? node : undefined;
+            }
+            else {
+                // Elide named imports if all of its import specifiers are elided.
+                var elements = ts.visitNodes(node.elements, visitImportSpecifier, ts.isImportSpecifier);
+                return ts.some(elements) ? ts.updateNamedImports(node, elements) : undefined;
+            }
+        }
+        /**
+         * Visits an import specifier, eliding it if it is not referenced.
+         *
+         * @param node The import specifier node.
+         */
+        function visitImportSpecifier(node) {
+            // Elide an import specifier if it is not referenced.
+            return resolver.isReferencedAliasDeclaration(node) ? node : undefined;
+        }
+        /**
+         * Visits an export assignment, eliding it if it does not contain a clause that resolves
+         * to a value.
+         *
+         * @param node The export assignment node.
+         */
+        function visitExportAssignment(node) {
+            // Elide the export assignment if it does not reference a value.
+            return resolver.isValueAliasDeclaration(node)
+                ? ts.visitEachChild(node, visitor, context)
+                : undefined;
+        }
+        /**
+         * Visits an export declaration, eliding it if it does not contain a clause that resolves
+         * to a value.
+         *
+         * @param node The export declaration node.
+         */
+        function visitExportDeclaration(node) {
+            if (!node.exportClause) {
+                // Elide a star export if the module it references does not export a value.
+                return compilerOptions.isolatedModules || resolver.moduleExportsSomeValue(node.moduleSpecifier) ? node : undefined;
+            }
+            if (!resolver.isValueAliasDeclaration(node)) {
+                // Elide the export declaration if it does not export a value.
+                return undefined;
+            }
+            // Elide the export declaration if all of its named exports are elided.
+            var exportClause = ts.visitNode(node.exportClause, visitNamedExports, ts.isNamedExports);
+            return exportClause
+                ? ts.updateExportDeclaration(node, 
+                /*decorators*/ undefined, 
+                /*modifiers*/ undefined, exportClause, node.moduleSpecifier)
+                : undefined;
+        }
+        /**
+         * Visits named exports, eliding it if it does not contain an export specifier that
+         * resolves to a value.
+         *
+         * @param node The named exports node.
+         */
+        function visitNamedExports(node) {
+            // Elide the named exports if all of its export specifiers were elided.
+            var elements = ts.visitNodes(node.elements, visitExportSpecifier, ts.isExportSpecifier);
+            return ts.some(elements) ? ts.updateNamedExports(node, elements) : undefined;
+        }
+        /**
+         * Visits an export specifier, eliding it if it does not resolve to a value.
+         *
+         * @param node The export specifier node.
+         */
+        function visitExportSpecifier(node) {
+            // Elide an export specifier if it does not reference a value.
+            return resolver.isValueAliasDeclaration(node) ? node : undefined;
+        }
+        /**
+         * Determines whether to emit an import equals declaration.
+         *
+         * @param node The import equals declaration node.
+         */
+        function shouldEmitImportEqualsDeclaration(node) {
+            // preserve old compiler's behavior: emit 'var' for import declaration (even if we do not consider them referenced) when
+            // - current file is not external module
+            // - import declaration is top level and target is value imported by entity name
+            return resolver.isReferencedAliasDeclaration(node)
+                || (!ts.isExternalModule(currentSourceFile)
+                    && resolver.isTopLevelValueImportEqualsWithEntityName(node));
+        }
+        /**
+         * Visits an import equals declaration.
+         *
+         * @param node The import equals declaration node.
+         */
+        function visitImportEqualsDeclaration(node) {
+            if (ts.isExternalModuleImportEqualsDeclaration(node)) {
+                // Elide external module `import=` if it is not referenced.
+                return resolver.isReferencedAliasDeclaration(node)
+                    ? ts.visitEachChild(node, visitor, context)
+                    : undefined;
+            }
+            if (!shouldEmitImportEqualsDeclaration(node)) {
+                return undefined;
+            }
+            var moduleReference = ts.createExpressionFromEntityName(node.moduleReference);
+            ts.setEmitFlags(moduleReference, 1536 /* NoComments */ | 2048 /* NoNestedComments */);
+            if (isNamedExternalModuleExport(node) || !isExportOfNamespace(node)) {
+                //  export var ${name} = ${moduleReference};
+                //  var ${name} = ${moduleReference};
+                return ts.setOriginalNode(ts.setTextRange(ts.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.createVariableDeclarationList([
+                    ts.setOriginalNode(ts.createVariableDeclaration(node.name, 
+                    /*type*/ undefined, moduleReference), node)
+                ])), node), node);
+            }
+            else {
+                // exports.${name} = ${moduleReference};
+                return ts.setOriginalNode(createNamespaceExport(node.name, moduleReference, node), node);
+            }
+        }
+        /**
+         * Gets a value indicating whether the node is exported from a namespace.
+         *
+         * @param node The node to test.
+         */
+        function isExportOfNamespace(node) {
+            return currentNamespace !== undefined && ts.hasModifier(node, 1 /* Export */);
+        }
+        /**
+         * Gets a value indicating whether the node is exported from an external module.
+         *
+         * @param node The node to test.
+         */
+        function isExternalModuleExport(node) {
+            return currentNamespace === undefined && ts.hasModifier(node, 1 /* Export */);
+        }
+        /**
+         * Gets a value indicating whether the node is a named export from an external module.
+         *
+         * @param node The node to test.
+         */
+        function isNamedExternalModuleExport(node) {
+            return isExternalModuleExport(node)
+                && !ts.hasModifier(node, 512 /* Default */);
+        }
+        /**
+         * Gets a value indicating whether the node is the default export of an external module.
+         *
+         * @param node The node to test.
+         */
+        function isDefaultExternalModuleExport(node) {
+            return isExternalModuleExport(node)
+                && ts.hasModifier(node, 512 /* Default */);
+        }
+        /**
+         * Creates a statement for the provided expression. This is used in calls to `map`.
+         */
+        function expressionToStatement(expression) {
+            return ts.createExpressionStatement(expression);
+        }
+        function addExportMemberAssignment(statements, node) {
+            var expression = ts.createAssignment(ts.getExternalModuleOrNamespaceExportName(currentNamespaceContainerName, node, /*allowComments*/ false, /*allowSourceMaps*/ true), ts.getLocalName(node));
+            ts.setSourceMapRange(expression, ts.createRange(node.name ? node.name.pos : node.pos, node.end));
+            var statement = ts.createExpressionStatement(expression);
+            ts.setSourceMapRange(statement, ts.createRange(-1, node.end));
+            statements.push(statement);
+        }
+        function createNamespaceExport(exportName, exportValue, location) {
+            return ts.setTextRange(ts.createExpressionStatement(ts.createAssignment(ts.getNamespaceMemberName(currentNamespaceContainerName, exportName, /*allowComments*/ false, /*allowSourceMaps*/ true), exportValue)), location);
+        }
+        function createNamespaceExportExpression(exportName, exportValue, location) {
+            return ts.setTextRange(ts.createAssignment(getNamespaceMemberNameWithSourceMapsAndWithoutComments(exportName), exportValue), location);
+        }
+        function getNamespaceMemberNameWithSourceMapsAndWithoutComments(name) {
+            return ts.getNamespaceMemberName(currentNamespaceContainerName, name, /*allowComments*/ false, /*allowSourceMaps*/ true);
+        }
+        /**
+         * Gets the declaration name used inside of a namespace or enum.
+         */
+        function getNamespaceParameterName(node) {
+            var name = ts.getGeneratedNameForNode(node);
+            ts.setSourceMapRange(name, node.name);
+            return name;
+        }
+        /**
+         * Gets the expression used to refer to a namespace or enum within the body
+         * of its declaration.
+         */
+        function getNamespaceContainerName(node) {
+            return ts.getGeneratedNameForNode(node);
+        }
+        /**
+         * Gets a local alias for a class declaration if it is a decorated class with an internal
+         * reference to the static side of the class. This is necessary to avoid issues with
+         * double-binding semantics for the class name.
+         */
+        function getClassAliasIfNeeded(node) {
+            if (resolver.getNodeCheckFlags(node) & 16777216 /* ClassWithConstructorReference */) {
+                enableSubstitutionForClassAliases();
+                var classAlias = ts.createUniqueName(node.name && !ts.isGeneratedIdentifier(node.name) ? ts.idText(node.name) : "default");
+                classAliases[ts.getOriginalNodeId(node)] = classAlias;
+                hoistVariableDeclaration(classAlias);
+                return classAlias;
+            }
+        }
+        function getClassPrototype(node) {
+            return ts.createPropertyAccess(ts.getDeclarationName(node), "prototype");
+        }
+        function getClassMemberPrefix(node, member) {
+            return ts.hasModifier(member, 32 /* Static */)
+                ? ts.getDeclarationName(node)
+                : getClassPrototype(node);
+        }
+        function enableSubstitutionForNonQualifiedEnumMembers() {
+            if ((enabledSubstitutions & 8 /* NonQualifiedEnumMembers */) === 0) {
+                enabledSubstitutions |= 8 /* NonQualifiedEnumMembers */;
+                context.enableSubstitution(72 /* Identifier */);
+            }
+        }
+        function enableSubstitutionForClassAliases() {
+            if ((enabledSubstitutions & 1 /* ClassAliases */) === 0) {
+                enabledSubstitutions |= 1 /* ClassAliases */;
+                // We need to enable substitutions for identifiers. This allows us to
+                // substitute class names inside of a class declaration.
+                context.enableSubstitution(72 /* Identifier */);
+                // Keep track of class aliases.
+                classAliases = [];
+            }
+        }
+        function enableSubstitutionForNamespaceExports() {
+            if ((enabledSubstitutions & 2 /* NamespaceExports */) === 0) {
+                enabledSubstitutions |= 2 /* NamespaceExports */;
+                // We need to enable substitutions for identifiers and shorthand property assignments. This allows us to
+                // substitute the names of exported members of a namespace.
+                context.enableSubstitution(72 /* Identifier */);
+                context.enableSubstitution(276 /* ShorthandPropertyAssignment */);
+                // We need to be notified when entering and exiting namespaces.
+                context.enableEmitNotification(244 /* ModuleDeclaration */);
+            }
+        }
+        function isTransformedModuleDeclaration(node) {
+            return ts.getOriginalNode(node).kind === 244 /* ModuleDeclaration */;
+        }
+        function isTransformedEnumDeclaration(node) {
+            return ts.getOriginalNode(node).kind === 243 /* EnumDeclaration */;
+        }
+        /**
+         * Hook for node emit.
+         *
+         * @param hint A hint as to the intended usage of the node.
+         * @param node The node to emit.
+         * @param emit A callback used to emit the node in the printer.
+         */
+        function onEmitNode(hint, node, emitCallback) {
+            var savedApplicableSubstitutions = applicableSubstitutions;
+            var savedCurrentSourceFile = currentSourceFile;
+            if (ts.isSourceFile(node)) {
+                currentSourceFile = node;
+            }
+            if (enabledSubstitutions & 2 /* NamespaceExports */ && isTransformedModuleDeclaration(node)) {
+                applicableSubstitutions |= 2 /* NamespaceExports */;
+            }
+            if (enabledSubstitutions & 8 /* NonQualifiedEnumMembers */ && isTransformedEnumDeclaration(node)) {
+                applicableSubstitutions |= 8 /* NonQualifiedEnumMembers */;
+            }
+            previousOnEmitNode(hint, node, emitCallback);
+            applicableSubstitutions = savedApplicableSubstitutions;
+            currentSourceFile = savedCurrentSourceFile;
+        }
+        /**
+         * Hooks node substitutions.
+         *
+         * @param hint A hint as to the intended usage of the node.
+         * @param node The node to substitute.
+         */
+        function onSubstituteNode(hint, node) {
+            node = previousOnSubstituteNode(hint, node);
+            if (hint === 1 /* Expression */) {
+                return substituteExpression(node);
+            }
+            else if (ts.isShorthandPropertyAssignment(node)) {
+                return substituteShorthandPropertyAssignment(node);
+            }
+            return node;
+        }
+        function substituteShorthandPropertyAssignment(node) {
+            if (enabledSubstitutions & 2 /* NamespaceExports */) {
+                var name = node.name;
+                var exportedName = trySubstituteNamespaceExportedName(name);
+                if (exportedName) {
+                    // A shorthand property with an assignment initializer is probably part of a
+                    // destructuring assignment
+                    if (node.objectAssignmentInitializer) {
+                        var initializer = ts.createAssignment(exportedName, node.objectAssignmentInitializer);
+                        return ts.setTextRange(ts.createPropertyAssignment(name, initializer), node);
+                    }
+                    return ts.setTextRange(ts.createPropertyAssignment(name, exportedName), node);
+                }
+            }
+            return node;
+        }
+        function substituteExpression(node) {
+            switch (node.kind) {
+                case 72 /* Identifier */:
+                    return substituteExpressionIdentifier(node);
+                case 189 /* PropertyAccessExpression */:
+                    return substitutePropertyAccessExpression(node);
+                case 190 /* ElementAccessExpression */:
+                    return substituteElementAccessExpression(node);
+            }
+            return node;
+        }
+        function substituteExpressionIdentifier(node) {
+            return trySubstituteClassAlias(node)
+                || trySubstituteNamespaceExportedName(node)
+                || node;
+        }
+        function trySubstituteClassAlias(node) {
+            if (enabledSubstitutions & 1 /* ClassAliases */) {
+                if (resolver.getNodeCheckFlags(node) & 33554432 /* ConstructorReferenceInClass */) {
+                    // Due to the emit for class decorators, any reference to the class from inside of the class body
+                    // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
+                    // behavior of class names in ES6.
+                    // Also, when emitting statics for class expressions, we must substitute a class alias for
+                    // constructor references in static property initializers.
+                    var declaration = resolver.getReferencedValueDeclaration(node);
+                    if (declaration) {
+                        var classAlias = classAliases[declaration.id]; // TODO: GH#18217
+                        if (classAlias) {
+                            var clone_1 = ts.getSynthesizedClone(classAlias);
+                            ts.setSourceMapRange(clone_1, node);
+                            ts.setCommentRange(clone_1, node);
+                            return clone_1;
+                        }
+                    }
+                }
+            }
+            return undefined;
+        }
+        function trySubstituteNamespaceExportedName(node) {
+            // If this is explicitly a local name, do not substitute.
+            if (enabledSubstitutions & applicableSubstitutions && !ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) {
+                // If we are nested within a namespace declaration, we may need to qualifiy
+                // an identifier that is exported from a merged namespace.
+                var container = resolver.getReferencedExportContainer(node, /*prefixLocals*/ false);
+                if (container && container.kind !== 279 /* SourceFile */) {
+                    var substitute = (applicableSubstitutions & 2 /* NamespaceExports */ && container.kind === 244 /* ModuleDeclaration */) ||
+                        (applicableSubstitutions & 8 /* NonQualifiedEnumMembers */ && container.kind === 243 /* EnumDeclaration */);
+                    if (substitute) {
+                        return ts.setTextRange(ts.createPropertyAccess(ts.getGeneratedNameForNode(container), node), 
+                        /*location*/ node);
+                    }
+                }
+            }
+            return undefined;
+        }
+        function substitutePropertyAccessExpression(node) {
+            return substituteConstantValue(node);
+        }
+        function substituteElementAccessExpression(node) {
+            return substituteConstantValue(node);
+        }
+        function substituteConstantValue(node) {
+            var constantValue = tryGetConstEnumValue(node);
+            if (constantValue !== undefined) {
+                // track the constant value on the node for the printer in needsDotDotForPropertyAccess
+                ts.setConstantValue(node, constantValue);
+                var substitute = ts.createLiteral(constantValue);
+                if (!compilerOptions.removeComments) {
+                    var propertyName = ts.isPropertyAccessExpression(node)
+                        ? ts.declarationNameToString(node.name)
+                        : ts.getTextOfNode(node.argumentExpression);
+                    ts.addSyntheticTrailingComment(substitute, 3 /* MultiLineCommentTrivia */, " " + propertyName + " ");
+                }
+                return substitute;
+            }
+            return node;
+        }
+        function tryGetConstEnumValue(node) {
+            if (compilerOptions.isolatedModules) {
+                return undefined;
+            }
+            return ts.isPropertyAccessExpression(node) || ts.isElementAccessExpression(node) ? resolver.getConstantValue(node) : undefined;
+        }
+    }
+    ts.transformTypeScript = transformTypeScript;
+    function createDecorateHelper(context, decoratorExpressions, target, memberName, descriptor, location) {
+        var argumentsArray = [];
+        argumentsArray.push(ts.createArrayLiteral(decoratorExpressions, /*multiLine*/ true));
+        argumentsArray.push(target);
+        if (memberName) {
+            argumentsArray.push(memberName);
+            if (descriptor) {
+                argumentsArray.push(descriptor);
+            }
+        }
+        context.requestEmitHelper(decorateHelper);
+        return ts.setTextRange(ts.createCall(ts.getHelperName("__decorate"), 
+        /*typeArguments*/ undefined, argumentsArray), location);
+    }
+    var decorateHelper = {
+        name: "typescript:decorate",
+        scoped: false,
+        priority: 2,
+        text: "\n            var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {\n                var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\n                if (typeof Reflect === \"object\" && typeof Reflect.decorate === \"function\") r = Reflect.decorate(decorators, target, key, desc);\n                else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;\n                return c > 3 && r && Object.defineProperty(target, key, r), r;\n            };"
+    };
+    function createMetadataHelper(context, metadataKey, metadataValue) {
+        context.requestEmitHelper(metadataHelper);
+        return ts.createCall(ts.getHelperName("__metadata"), 
+        /*typeArguments*/ undefined, [
+            ts.createLiteral(metadataKey),
+            metadataValue
+        ]);
+    }
+    var metadataHelper = {
+        name: "typescript:metadata",
+        scoped: false,
+        priority: 3,
+        text: "\n            var __metadata = (this && this.__metadata) || function (k, v) {\n                if (typeof Reflect === \"object\" && typeof Reflect.metadata === \"function\") return Reflect.metadata(k, v);\n            };"
+    };
+    function createParamHelper(context, expression, parameterOffset, location) {
+        context.requestEmitHelper(paramHelper);
+        return ts.setTextRange(ts.createCall(ts.getHelperName("__param"), 
+        /*typeArguments*/ undefined, [
+            ts.createLiteral(parameterOffset),
+            expression
+        ]), location);
+    }
+    var paramHelper = {
+        name: "typescript:param",
+        scoped: false,
+        priority: 4,
+        text: "\n            var __param = (this && this.__param) || function (paramIndex, decorator) {\n                return function (target, key) { decorator(target, key, paramIndex); }\n            };"
+    };
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
+(function (ts) {
+    var ES2017SubstitutionFlags;
+    (function (ES2017SubstitutionFlags) {
+        /** Enables substitutions for async methods with `super` calls. */
+        ES2017SubstitutionFlags[ES2017SubstitutionFlags["AsyncMethodsWithSuper"] = 1] = "AsyncMethodsWithSuper";
+    })(ES2017SubstitutionFlags || (ES2017SubstitutionFlags = {}));
+    function transformES2017(context) {
+        var resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
+        var resolver = context.getEmitResolver();
+        var compilerOptions = context.getCompilerOptions();
+        var languageVersion = ts.getEmitScriptTarget(compilerOptions);
+        /**
+         * Keeps track of whether expression substitution has been enabled for specific edge cases.
+         * They are persisted between each SourceFile transformation and should not be reset.
+         */
+        var enabledSubstitutions;
+        /**
+         * This keeps track of containers where `super` is valid, for use with
+         * just-in-time substitution for `super` expressions inside of async methods.
+         */
+        var enclosingSuperContainerFlags = 0;
+        var enclosingFunctionParameterNames;
+        /**
+         * Keeps track of property names accessed on super (`super.x`) within async functions.
+         */
+        var capturedSuperProperties;
+        /** Whether the async function contains an element access on super (`super[x]`). */
+        var hasSuperElementAccess;
+        /** A set of node IDs for generated super accessors (variable statements). */
+        var substitutedSuperAccessors = [];
+        // Save the previous transformation hooks.
+        var previousOnEmitNode = context.onEmitNode;
+        var previousOnSubstituteNode = context.onSubstituteNode;
+        // Set new transformation hooks.
+        context.onEmitNode = onEmitNode;
+        context.onSubstituteNode = onSubstituteNode;
+        return ts.chainBundle(transformSourceFile);
+        function transformSourceFile(node) {
+            if (node.isDeclarationFile) {
+                return node;
+            }
+            var visited = ts.visitEachChild(node, visitor, context);
+            ts.addEmitHelpers(visited, context.readEmitHelpers());
+            return visited;
+        }
+        function visitor(node) {
+            if ((node.transformFlags & 16 /* ContainsES2017 */) === 0) {
+                return node;
+            }
+            switch (node.kind) {
+                case 121 /* AsyncKeyword */:
+                    // ES2017 async modifier should be elided for targets < ES2017
+                    return undefined;
+                case 201 /* AwaitExpression */:
+                    return visitAwaitExpression(node);
+                case 156 /* MethodDeclaration */:
+                    return visitMethodDeclaration(node);
+                case 239 /* FunctionDeclaration */:
+                    return visitFunctionDeclaration(node);
+                case 196 /* FunctionExpression */:
+                    return visitFunctionExpression(node);
+                case 197 /* ArrowFunction */:
+                    return visitArrowFunction(node);
+                case 189 /* PropertyAccessExpression */:
+                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 98 /* SuperKeyword */) {
+                        capturedSuperProperties.set(node.name.escapedText, true);
+                    }
+                    return ts.visitEachChild(node, visitor, context);
+                case 190 /* ElementAccessExpression */:
+                    if (capturedSuperProperties && node.expression.kind === 98 /* SuperKeyword */) {
+                        hasSuperElementAccess = true;
+                    }
+                    return ts.visitEachChild(node, visitor, context);
+                default:
+                    return ts.visitEachChild(node, visitor, context);
+            }
+        }
+        function asyncBodyVisitor(node) {
+            if (ts.isNodeWithPossibleHoistedDeclaration(node)) {
+                switch (node.kind) {
+                    case 219 /* VariableStatement */:
+                        return visitVariableStatementInAsyncBody(node);
+                    case 225 /* ForStatement */:
+                        return visitForStatementInAsyncBody(node);
+                    case 226 /* ForInStatement */:
+                        return visitForInStatementInAsyncBody(node);
+                    case 227 /* ForOfStatement */:
+                        return visitForOfStatementInAsyncBody(node);
+                    case 274 /* CatchClause */:
+                        return visitCatchClauseInAsyncBody(node);
+                    case 218 /* Block */:
+                    case 232 /* SwitchStatement */:
+                    case 246 /* CaseBlock */:
+                    case 271 /* CaseClause */:
+                    case 272 /* DefaultClause */:
+                    case 235 /* TryStatement */:
+                    case 223 /* DoStatement */:
+                    case 224 /* WhileStatement */:
+                    case 222 /* IfStatement */:
+                    case 231 /* WithStatement */:
+                    case 233 /* LabeledStatement */:
+                        return ts.visitEachChild(node, asyncBodyVisitor, context);
+                    default:
+                        return ts.Debug.assertNever(node, "Unhandled node.");
+                }
+            }
+            return visitor(node);
+        }
+        function visitCatchClauseInAsyncBody(node) {
+            var catchClauseNames = ts.createUnderscoreEscapedMap();
+            recordDeclarationName(node.variableDeclaration, catchClauseNames); // TODO: GH#18217
+            // names declared in a catch variable are block scoped
+            var catchClauseUnshadowedNames;
+            catchClauseNames.forEach(function (_, escapedName) {
+                if (enclosingFunctionParameterNames.has(escapedName)) {
+                    if (!catchClauseUnshadowedNames) {
+                        catchClauseUnshadowedNames = ts.cloneMap(enclosingFunctionParameterNames);
+                    }
+                    catchClauseUnshadowedNames.delete(escapedName);
+                }
+            });
+            if (catchClauseUnshadowedNames) {
+                var savedEnclosingFunctionParameterNames = enclosingFunctionParameterNames;
+                enclosingFunctionParameterNames = catchClauseUnshadowedNames;
+                var result = ts.visitEachChild(node, asyncBodyVisitor, context);
+                enclosingFunctionParameterNames = savedEnclosingFunctionParameterNames;
+                return result;
+            }
+            else {
+                return ts.visitEachChild(node, asyncBodyVisitor, context);
+            }
+        }
+        function visitVariableStatementInAsyncBody(node) {
+            if (isVariableDeclarationListWithCollidingName(node.declarationList)) {
+                var expression = visitVariableDeclarationListWithCollidingNames(node.declarationList, /*hasReceiver*/ false);
+                return expression ? ts.createExpressionStatement(expression) : undefined;
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitForInStatementInAsyncBody(node) {
+            return ts.updateForIn(node, isVariableDeclarationListWithCollidingName(node.initializer)
+                ? visitVariableDeclarationListWithCollidingNames(node.initializer, /*hasReceiver*/ true)
+                : ts.visitNode(node.initializer, visitor, ts.isForInitializer), ts.visitNode(node.expression, visitor, ts.isExpression), ts.visitNode(node.statement, asyncBodyVisitor, ts.isStatement, ts.liftToBlock));
+        }
+        function visitForOfStatementInAsyncBody(node) {
+            return ts.updateForOf(node, ts.visitNode(node.awaitModifier, visitor, ts.isToken), isVariableDeclarationListWithCollidingName(node.initializer)
+                ? visitVariableDeclarationListWithCollidingNames(node.initializer, /*hasReceiver*/ true)
+                : ts.visitNode(node.initializer, visitor, ts.isForInitializer), ts.visitNode(node.expression, visitor, ts.isExpression), ts.visitNode(node.statement, asyncBodyVisitor, ts.isStatement, ts.liftToBlock));
+        }
+        function visitForStatementInAsyncBody(node) {
+            var initializer = node.initializer; // TODO: GH#18217
+            return ts.updateFor(node, isVariableDeclarationListWithCollidingName(initializer)
+                ? visitVariableDeclarationListWithCollidingNames(initializer, /*hasReceiver*/ false)
+                : ts.visitNode(node.initializer, visitor, ts.isForInitializer), ts.visitNode(node.condition, visitor, ts.isExpression), ts.visitNode(node.incrementor, visitor, ts.isExpression), ts.visitNode(node.statement, asyncBodyVisitor, ts.isStatement, ts.liftToBlock));
+        }
+        /**
+         * Visits an AwaitExpression node.
+         *
+         * This function will be called any time a ES2017 await expression is encountered.
+         *
+         * @param node The node to visit.
+         */
+        function visitAwaitExpression(node) {
+            return ts.setOriginalNode(ts.setTextRange(ts.createYield(
+            /*asteriskToken*/ undefined, ts.visitNode(node.expression, visitor, ts.isExpression)), node), node);
+        }
+        /**
+         * Visits a MethodDeclaration node.
+         *
+         * This function will be called when one of the following conditions are met:
+         * - The node is marked as async
+         *
+         * @param node The node to visit.
+         */
+        function visitMethodDeclaration(node) {
+            return ts.updateMethod(node, 
+            /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, node.name, 
+            /*questionToken*/ undefined, 
+            /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), 
+            /*type*/ undefined, ts.getFunctionFlags(node) & 2 /* Async */
+                ? transformAsyncFunctionBody(node)
+                : ts.visitFunctionBody(node.body, visitor, context));
+        }
+        /**
+         * Visits a FunctionDeclaration node.
+         *
+         * This function will be called when one of the following conditions are met:
+         * - The node is marked async
+         *
+         * @param node The node to visit.
+         */
+        function visitFunctionDeclaration(node) {
+            return ts.updateFunctionDeclaration(node, 
+            /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, node.name, 
+            /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), 
+            /*type*/ undefined, ts.getFunctionFlags(node) & 2 /* Async */
+                ? transformAsyncFunctionBody(node)
+                : ts.visitFunctionBody(node.body, visitor, context));
+        }
+        /**
+         * Visits a FunctionExpression node.
+         *
+         * This function will be called when one of the following conditions are met:
+         * - The node is marked async
+         *
+         * @param node The node to visit.
+         */
+        function visitFunctionExpression(node) {
+            return ts.updateFunctionExpression(node, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, node.name, 
+            /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), 
+            /*type*/ undefined, ts.getFunctionFlags(node) & 2 /* Async */
+                ? transformAsyncFunctionBody(node)
+                : ts.visitFunctionBody(node.body, visitor, context));
+        }
+        /**
+         * Visits an ArrowFunction.
+         *
+         * This function will be called when one of the following conditions are met:
+         * - The node is marked async
+         *
+         * @param node The node to visit.
+         */
+        function visitArrowFunction(node) {
+            return ts.updateArrowFunction(node, ts.visitNodes(node.modifiers, visitor, ts.isModifier), 
+            /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), 
+            /*type*/ undefined, node.equalsGreaterThanToken, ts.getFunctionFlags(node) & 2 /* Async */
+                ? transformAsyncFunctionBody(node)
+                : ts.visitFunctionBody(node.body, visitor, context));
+        }
+        function recordDeclarationName(_a, names) {
+            var name = _a.name;
+            if (ts.isIdentifier(name)) {
+                names.set(name.escapedText, true);
+            }
+            else {
+                for (var _i = 0, _b = name.elements; _i < _b.length; _i++) {
+                    var element = _b[_i];
+                    if (!ts.isOmittedExpression(element)) {
+                        recordDeclarationName(element, names);
+                    }
+                }
+            }
+        }
+        function isVariableDeclarationListWithCollidingName(node) {
+            return !!node
+                && ts.isVariableDeclarationList(node)
+                && !(node.flags & 3 /* BlockScoped */)
+                && node.declarations.some(collidesWithParameterName);
+        }
+        function visitVariableDeclarationListWithCollidingNames(node, hasReceiver) {
+            hoistVariableDeclarationList(node);
+            var variables = ts.getInitializedVariables(node);
+            if (variables.length === 0) {
+                if (hasReceiver) {
+                    return ts.visitNode(ts.convertToAssignmentElementTarget(node.declarations[0].name), visitor, ts.isExpression);
+                }
+                return undefined;
+            }
+            return ts.inlineExpressions(ts.map(variables, transformInitializedVariable));
+        }
+        function hoistVariableDeclarationList(node) {
+            ts.forEach(node.declarations, hoistVariable);
+        }
+        function hoistVariable(_a) {
+            var name = _a.name;
+            if (ts.isIdentifier(name)) {
+                hoistVariableDeclaration(name);
+            }
+            else {
+                for (var _i = 0, _b = name.elements; _i < _b.length; _i++) {
+                    var element = _b[_i];
+                    if (!ts.isOmittedExpression(element)) {
+                        hoistVariable(element);
+                    }
+                }
+            }
+        }
+        function transformInitializedVariable(node) {
+            var converted = ts.setSourceMapRange(ts.createAssignment(ts.convertToAssignmentElementTarget(node.name), node.initializer), node);
+            return ts.visitNode(converted, visitor, ts.isExpression);
+        }
+        function collidesWithParameterName(_a) {
+            var name = _a.name;
+            if (ts.isIdentifier(name)) {
+                return enclosingFunctionParameterNames.has(name.escapedText);
+            }
+            else {
+                for (var _i = 0, _b = name.elements; _i < _b.length; _i++) {
+                    var element = _b[_i];
+                    if (!ts.isOmittedExpression(element) && collidesWithParameterName(element)) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        function transformAsyncFunctionBody(node) {
+            resumeLexicalEnvironment();
+            var original = ts.getOriginalNode(node, ts.isFunctionLike);
+            var nodeType = original.type;
+            var promiseConstructor = languageVersion < 2 /* ES2015 */ ? getPromiseConstructor(nodeType) : undefined;
+            var isArrowFunction = node.kind === 197 /* ArrowFunction */;
+            var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 8192 /* CaptureArguments */) !== 0;
+            // An async function is emit as an outer function that calls an inner
+            // generator function. To preserve lexical bindings, we pass the current
+            // `this` and `arguments` objects to `__awaiter`. The generator function
+            // passed to `__awaiter` is executed inside of the callback to the
+            // promise constructor.
+            var savedEnclosingFunctionParameterNames = enclosingFunctionParameterNames;
+            enclosingFunctionParameterNames = ts.createUnderscoreEscapedMap();
+            for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
+                var parameter = _a[_i];
+                recordDeclarationName(parameter, enclosingFunctionParameterNames);
+            }
+            var savedCapturedSuperProperties = capturedSuperProperties;
+            var savedHasSuperElementAccess = hasSuperElementAccess;
+            capturedSuperProperties = ts.createUnderscoreEscapedMap();
+            hasSuperElementAccess = false;
+            var result;
+            if (!isArrowFunction) {
+                var statements = [];
+                var statementOffset = ts.addPrologue(statements, node.body.statements, /*ensureUseStrict*/ false, visitor);
+                statements.push(ts.createReturn(createAwaiterHelper(context, hasLexicalArguments, promiseConstructor, transformAsyncFunctionBodyWorker(node.body, statementOffset))));
+                ts.addStatementsAfterPrologue(statements, endLexicalEnvironment());
+                // Minor optimization, emit `_super` helper to capture `super` access in an arrow.
+                // This step isn't needed if we eventually transform this to ES5.
+                var emitSuperHelpers = languageVersion >= 2 /* ES2015 */ && resolver.getNodeCheckFlags(node) & (4096 /* AsyncMethodWithSuperBinding */ | 2048 /* AsyncMethodWithSuper */);
+                if (emitSuperHelpers) {
+                    enableSubstitutionForAsyncMethodsWithSuper();
+                    var variableStatement = createSuperAccessVariableStatement(resolver, node, capturedSuperProperties);
+                    substitutedSuperAccessors[ts.getNodeId(variableStatement)] = true;
+                    ts.addStatementsAfterPrologue(statements, [variableStatement]);
+                }
+                var block = ts.createBlock(statements, /*multiLine*/ true);
+                ts.setTextRange(block, node.body);
+                if (emitSuperHelpers && hasSuperElementAccess) {
+                    // Emit helpers for super element access expressions (`super[x]`).
+                    if (resolver.getNodeCheckFlags(node) & 4096 /* AsyncMethodWithSuperBinding */) {
+                        ts.addEmitHelper(block, ts.advancedAsyncSuperHelper);
+                    }
+                    else if (resolver.getNodeCheckFlags(node) & 2048 /* AsyncMethodWithSuper */) {
+                        ts.addEmitHelper(block, ts.asyncSuperHelper);
+                    }
+                }
+                result = block;
+            }
+            else {
+                var expression = createAwaiterHelper(context, hasLexicalArguments, promiseConstructor, transformAsyncFunctionBodyWorker(node.body));
+                var declarations = endLexicalEnvironment();
+                if (ts.some(declarations)) {
+                    var block = ts.convertToFunctionBody(expression);
+                    result = ts.updateBlock(block, ts.setTextRange(ts.createNodeArray(ts.concatenate(declarations, block.statements)), block.statements));
+                }
+                else {
+                    result = expression;
+                }
+            }
+            enclosingFunctionParameterNames = savedEnclosingFunctionParameterNames;
+            capturedSuperProperties = savedCapturedSuperProperties;
+            hasSuperElementAccess = savedHasSuperElementAccess;
+            return result;
+        }
+        function transformAsyncFunctionBodyWorker(body, start) {
+            if (ts.isBlock(body)) {
+                return ts.updateBlock(body, ts.visitNodes(body.statements, asyncBodyVisitor, ts.isStatement, start));
+            }
+            else {
+                return ts.convertToFunctionBody(ts.visitNode(body, asyncBodyVisitor, ts.isConciseBody));
+            }
+        }
+        function getPromiseConstructor(type) {
+            var typeName = type && ts.getEntityNameFromTypeNode(type);
+            if (typeName && ts.isEntityName(typeName)) {
+                var serializationKind = resolver.getTypeReferenceSerializationKind(typeName);
+                if (serializationKind === ts.TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue
+                    || serializationKind === ts.TypeReferenceSerializationKind.Unknown) {
+                    return typeName;
+                }
+            }
+            return undefined;
+        }
+        function enableSubstitutionForAsyncMethodsWithSuper() {
+            if ((enabledSubstitutions & 1 /* AsyncMethodsWithSuper */) === 0) {
+                enabledSubstitutions |= 1 /* AsyncMethodsWithSuper */;
+                // We need to enable substitutions for call, property access, and element access
+                // if we need to rewrite super calls.
+                context.enableSubstitution(191 /* CallExpression */);
+                context.enableSubstitution(189 /* PropertyAccessExpression */);
+                context.enableSubstitution(190 /* ElementAccessExpression */);
+                // We need to be notified when entering and exiting declarations that bind super.
+                context.enableEmitNotification(240 /* ClassDeclaration */);
+                context.enableEmitNotification(156 /* MethodDeclaration */);
+                context.enableEmitNotification(158 /* GetAccessor */);
+                context.enableEmitNotification(159 /* SetAccessor */);
+                context.enableEmitNotification(157 /* Constructor */);
+                // We need to be notified when entering the generated accessor arrow functions.
+                context.enableEmitNotification(219 /* VariableStatement */);
+            }
+        }
+        /**
+         * Hook for node emit.
+         *
+         * @param hint A hint as to the intended usage of the node.
+         * @param node The node to emit.
+         * @param emit A callback used to emit the node in the printer.
+         */
+        function onEmitNode(hint, node, emitCallback) {
+            // If we need to support substitutions for `super` in an async method,
+            // we should track it here.
+            if (enabledSubstitutions & 1 /* AsyncMethodsWithSuper */ && isSuperContainer(node)) {
+                var superContainerFlags = resolver.getNodeCheckFlags(node) & (2048 /* AsyncMethodWithSuper */ | 4096 /* AsyncMethodWithSuperBinding */);
+                if (superContainerFlags !== enclosingSuperContainerFlags) {
+                    var savedEnclosingSuperContainerFlags = enclosingSuperContainerFlags;
+                    enclosingSuperContainerFlags = superContainerFlags;
+                    previousOnEmitNode(hint, node, emitCallback);
+                    enclosingSuperContainerFlags = savedEnclosingSuperContainerFlags;
+                    return;
+                }
+            }
+            // Disable substitution in the generated super accessor itself.
+            else if (enabledSubstitutions && substitutedSuperAccessors[ts.getNodeId(node)]) {
+                var savedEnclosingSuperContainerFlags = enclosingSuperContainerFlags;
+                enclosingSuperContainerFlags = 0;
+                previousOnEmitNode(hint, node, emitCallback);
+                enclosingSuperContainerFlags = savedEnclosingSuperContainerFlags;
+                return;
+            }
+            previousOnEmitNode(hint, node, emitCallback);
+        }
+        /**
+         * Hooks node substitutions.
+         *
+         * @param hint A hint as to the intended usage of the node.
+         * @param node The node to substitute.
+         */
+        function onSubstituteNode(hint, node) {
+            node = previousOnSubstituteNode(hint, node);
+            if (hint === 1 /* Expression */ && enclosingSuperContainerFlags) {
+                return substituteExpression(node);
+            }
+            return node;
+        }
+        function substituteExpression(node) {
+            switch (node.kind) {
+                case 189 /* PropertyAccessExpression */:
+                    return substitutePropertyAccessExpression(node);
+                case 190 /* ElementAccessExpression */:
+                    return substituteElementAccessExpression(node);
+                case 191 /* CallExpression */:
+                    return substituteCallExpression(node);
+            }
+            return node;
+        }
+        function substitutePropertyAccessExpression(node) {
+            if (node.expression.kind === 98 /* SuperKeyword */) {
+                return ts.setTextRange(ts.createPropertyAccess(ts.createFileLevelUniqueName("_super"), node.name), node);
+            }
+            return node;
+        }
+        function substituteElementAccessExpression(node) {
+            if (node.expression.kind === 98 /* SuperKeyword */) {
+                return createSuperElementAccessInAsyncMethod(node.argumentExpression, node);
+            }
+            return node;
+        }
+        function substituteCallExpression(node) {
+            var expression = node.expression;
+            if (ts.isSuperProperty(expression)) {
+                var argumentExpression = ts.isPropertyAccessExpression(expression)
+                    ? substitutePropertyAccessExpression(expression)
+                    : substituteElementAccessExpression(expression);
+                return ts.createCall(ts.createPropertyAccess(argumentExpression, "call"), 
+                /*typeArguments*/ undefined, [
+                    ts.createThis()
+                ].concat(node.arguments));
+            }
+            return node;
+        }
+        function isSuperContainer(node) {
+            var kind = node.kind;
+            return kind === 240 /* ClassDeclaration */
+                || kind === 157 /* Constructor */
+                || kind === 156 /* MethodDeclaration */
+                || kind === 158 /* GetAccessor */
+                || kind === 159 /* SetAccessor */;
+        }
+        function createSuperElementAccessInAsyncMethod(argumentExpression, location) {
+            if (enclosingSuperContainerFlags & 4096 /* AsyncMethodWithSuperBinding */) {
+                return ts.setTextRange(ts.createPropertyAccess(ts.createCall(ts.createFileLevelUniqueName("_superIndex"), 
+                /*typeArguments*/ undefined, [argumentExpression]), "value"), location);
+            }
+            else {
+                return ts.setTextRange(ts.createCall(ts.createFileLevelUniqueName("_superIndex"), 
+                /*typeArguments*/ undefined, [argumentExpression]), location);
+            }
+        }
+    }
+    ts.transformES2017 = transformES2017;
+    /** Creates a variable named `_super` with accessor properties for the given property names. */
+    function createSuperAccessVariableStatement(resolver, node, names) {
+        // Create a variable declaration with a getter/setter (if binding) definition for each name:
+        //   const _super = Object.create(null, { x: { get: () => super.x, set: (v) => super.x = v }, ... });
+        var hasBinding = (resolver.getNodeCheckFlags(node) & 4096 /* AsyncMethodWithSuperBinding */) !== 0;
+        var accessors = [];
+        names.forEach(function (_, key) {
+            var name = ts.unescapeLeadingUnderscores(key);
+            var getterAndSetter = [];
+            getterAndSetter.push(ts.createPropertyAssignment("get", ts.createArrowFunction(
+            /* modifiers */ undefined, 
+            /* typeParameters */ undefined, 
+            /* parameters */ [], 
+            /* type */ undefined, 
+            /* equalsGreaterThanToken */ undefined, ts.createPropertyAccess(ts.createSuper(), name))));
+            if (hasBinding) {
+                getterAndSetter.push(ts.createPropertyAssignment("set", ts.createArrowFunction(
+                /* modifiers */ undefined, 
+                /* typeParameters */ undefined, 
+                /* parameters */ [
+                    ts.createParameter(
+                    /* decorators */ undefined, 
+                    /* modifiers */ undefined, 
+                    /* dotDotDotToken */ undefined, "v", 
+                    /* questionToken */ undefined, 
+                    /* type */ undefined, 
+                    /* initializer */ undefined)
+                ], 
+                /* type */ undefined, 
+                /* equalsGreaterThanToken */ undefined, ts.createAssignment(ts.createPropertyAccess(ts.createSuper(), name), ts.createIdentifier("v")))));
+            }
+            accessors.push(ts.createPropertyAssignment(name, ts.createObjectLiteral(getterAndSetter)));
+        });
+        return ts.createVariableStatement(
+        /* modifiers */ undefined, ts.createVariableDeclarationList([
+            ts.createVariableDeclaration(ts.createFileLevelUniqueName("_super"), 
+            /* type */ undefined, ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "create"), 
+            /* typeArguments */ undefined, [
+                ts.createNull(),
+                ts.createObjectLiteral(accessors, /* multiline */ true)
+            ]))
+        ], 2 /* Const */));
+    }
+    ts.createSuperAccessVariableStatement = createSuperAccessVariableStatement;
+    var awaiterHelper = {
+        name: "typescript:awaiter",
+        scoped: false,
+        priority: 5,
+        text: "\n            var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n                return new (P || (P = Promise))(function (resolve, reject) {\n                    function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n                    function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n                    function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }\n                    step((generator = generator.apply(thisArg, _arguments || [])).next());\n                });\n            };"
+    };
+    function createAwaiterHelper(context, hasLexicalArguments, promiseConstructor, body) {
+        context.requestEmitHelper(awaiterHelper);
+        var generatorFunc = ts.createFunctionExpression(
+        /*modifiers*/ undefined, ts.createToken(40 /* AsteriskToken */), 
+        /*name*/ undefined, 
+        /*typeParameters*/ undefined, 
+        /*parameters*/ [], 
+        /*type*/ undefined, body);
+        // Mark this node as originally an async function
+        (generatorFunc.emitNode || (generatorFunc.emitNode = {})).flags |= 262144 /* AsyncFunctionBody */ | 524288 /* ReuseTempVariableScope */;
+        return ts.createCall(ts.getHelperName("__awaiter"), 
+        /*typeArguments*/ undefined, [
+            ts.createThis(),
+            hasLexicalArguments ? ts.createIdentifier("arguments") : ts.createVoidZero(),
+            promiseConstructor ? ts.createExpressionFromEntityName(promiseConstructor) : ts.createVoidZero(),
+            generatorFunc
+        ]);
+    }
+    ts.asyncSuperHelper = {
+        name: "typescript:async-super",
+        scoped: true,
+        text: ts.helperString(__makeTemplateObject(["\n            const ", " = name => super[name];"], ["\n            const ", " = name => super[name];"]), "_superIndex")
+    };
+    ts.advancedAsyncSuperHelper = {
+        name: "typescript:advanced-async-super",
+        scoped: true,
+        text: ts.helperString(__makeTemplateObject(["\n            const ", " = (function (geti, seti) {\n                const cache = Object.create(null);\n                return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } });\n            })(name => super[name], (name, value) => super[name] = value);"], ["\n            const ", " = (function (geti, seti) {\n                const cache = Object.create(null);\n                return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } });\n            })(name => super[name], (name, value) => super[name] = value);"]), "_superIndex")
+    };
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
+(function (ts) {
+    var ESNextSubstitutionFlags;
+    (function (ESNextSubstitutionFlags) {
+        /** Enables substitutions for async methods with `super` calls. */
+        ESNextSubstitutionFlags[ESNextSubstitutionFlags["AsyncMethodsWithSuper"] = 1] = "AsyncMethodsWithSuper";
+    })(ESNextSubstitutionFlags || (ESNextSubstitutionFlags = {}));
+    function transformESNext(context) {
+        var resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
+        var resolver = context.getEmitResolver();
+        var compilerOptions = context.getCompilerOptions();
+        var languageVersion = ts.getEmitScriptTarget(compilerOptions);
+        var previousOnEmitNode = context.onEmitNode;
+        context.onEmitNode = onEmitNode;
+        var previousOnSubstituteNode = context.onSubstituteNode;
+        context.onSubstituteNode = onSubstituteNode;
+        var enabledSubstitutions;
+        var enclosingFunctionFlags;
+        var enclosingSuperContainerFlags = 0;
+        /** Keeps track of property names accessed on super (`super.x`) within async functions. */
+        var capturedSuperProperties;
+        /** Whether the async function contains an element access on super (`super[x]`). */
+        var hasSuperElementAccess;
+        /** A set of node IDs for generated super accessors. */
+        var substitutedSuperAccessors = [];
+        return ts.chainBundle(transformSourceFile);
+        function transformSourceFile(node) {
+            if (node.isDeclarationFile) {
+                return node;
+            }
+            var visited = ts.visitEachChild(node, visitor, context);
+            ts.addEmitHelpers(visited, context.readEmitHelpers());
+            return visited;
+        }
+        function visitor(node) {
+            return visitorWorker(node, /*noDestructuringValue*/ false);
+        }
+        function visitorNoDestructuringValue(node) {
+            return visitorWorker(node, /*noDestructuringValue*/ true);
+        }
+        function visitorNoAsyncModifier(node) {
+            if (node.kind === 121 /* AsyncKeyword */) {
+                return undefined;
+            }
+            return node;
+        }
+        function visitorWorker(node, noDestructuringValue) {
+            if ((node.transformFlags & 8 /* ContainsESNext */) === 0) {
+                return node;
+            }
+            switch (node.kind) {
+                case 201 /* AwaitExpression */:
+                    return visitAwaitExpression(node);
+                case 207 /* YieldExpression */:
+                    return visitYieldExpression(node);
+                case 230 /* ReturnStatement */:
+                    return visitReturnStatement(node);
+                case 233 /* LabeledStatement */:
+                    return visitLabeledStatement(node);
+                case 188 /* ObjectLiteralExpression */:
+                    return visitObjectLiteralExpression(node);
+                case 204 /* BinaryExpression */:
+                    return visitBinaryExpression(node, noDestructuringValue);
+                case 237 /* VariableDeclaration */:
+                    return visitVariableDeclaration(node);
+                case 227 /* ForOfStatement */:
+                    return visitForOfStatement(node, /*outermostLabeledStatement*/ undefined);
+                case 225 /* ForStatement */:
+                    return visitForStatement(node);
+                case 200 /* VoidExpression */:
+                    return visitVoidExpression(node);
+                case 157 /* Constructor */:
+                    return visitConstructorDeclaration(node);
+                case 156 /* MethodDeclaration */:
+                    return visitMethodDeclaration(node);
+                case 158 /* GetAccessor */:
+                    return visitGetAccessorDeclaration(node);
+                case 159 /* SetAccessor */:
+                    return visitSetAccessorDeclaration(node);
+                case 239 /* FunctionDeclaration */:
+                    return visitFunctionDeclaration(node);
+                case 196 /* FunctionExpression */:
+                    return visitFunctionExpression(node);
+                case 197 /* ArrowFunction */:
+                    return visitArrowFunction(node);
+                case 151 /* Parameter */:
+                    return visitParameter(node);
+                case 221 /* ExpressionStatement */:
+                    return visitExpressionStatement(node);
+                case 195 /* ParenthesizedExpression */:
+                    return visitParenthesizedExpression(node, noDestructuringValue);
+                case 274 /* CatchClause */:
+                    return visitCatchClause(node);
+                case 189 /* PropertyAccessExpression */:
+                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 98 /* SuperKeyword */) {
+                        capturedSuperProperties.set(node.name.escapedText, true);
+                    }
+                    return ts.visitEachChild(node, visitor, context);
+                case 190 /* ElementAccessExpression */:
+                    if (capturedSuperProperties && node.expression.kind === 98 /* SuperKeyword */) {
+                        hasSuperElementAccess = true;
+                    }
+                    return ts.visitEachChild(node, visitor, context);
+                default:
+                    return ts.visitEachChild(node, visitor, context);
+            }
+        }
+        function visitAwaitExpression(node) {
+            if (enclosingFunctionFlags & 2 /* Async */ && enclosingFunctionFlags & 1 /* Generator */) {
+                return ts.setOriginalNode(ts.setTextRange(ts.createYield(createAwaitHelper(context, ts.visitNode(node.expression, visitor, ts.isExpression))), 
+                /*location*/ node), node);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitYieldExpression(node) {
+            if (enclosingFunctionFlags & 2 /* Async */ && enclosingFunctionFlags & 1 /* Generator */) {
+                if (node.asteriskToken) {
+                    var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
+                    return ts.setOriginalNode(ts.setTextRange(ts.createYield(createAwaitHelper(context, ts.updateYield(node, node.asteriskToken, createAsyncDelegatorHelper(context, createAsyncValuesHelper(context, expression, expression), expression)))), node), node);
+                }
+                return ts.setOriginalNode(ts.setTextRange(ts.createYield(createDownlevelAwait(node.expression
+                    ? ts.visitNode(node.expression, visitor, ts.isExpression)
+                    : ts.createVoidZero())), node), node);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitReturnStatement(node) {
+            if (enclosingFunctionFlags & 2 /* Async */ && enclosingFunctionFlags & 1 /* Generator */) {
+                return ts.updateReturn(node, createDownlevelAwait(node.expression ? ts.visitNode(node.expression, visitor, ts.isExpression) : ts.createVoidZero()));
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitLabeledStatement(node) {
+            if (enclosingFunctionFlags & 2 /* Async */) {
+                var statement = ts.unwrapInnermostStatementOfLabel(node);
+                if (statement.kind === 227 /* ForOfStatement */ && statement.awaitModifier) {
+                    return visitForOfStatement(statement, node);
+                }
+                return ts.restoreEnclosingLabel(ts.visitEachChild(statement, visitor, context), node);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function chunkObjectLiteralElements(elements) {
+            var chunkObject;
+            var objects = [];
+            for (var _i = 0, elements_4 = elements; _i < elements_4.length; _i++) {
+                var e = elements_4[_i];
+                if (e.kind === 277 /* SpreadAssignment */) {
+                    if (chunkObject) {
+                        objects.push(ts.createObjectLiteral(chunkObject));
+                        chunkObject = undefined;
+                    }
+                    var target = e.expression;
+                    objects.push(ts.visitNode(target, visitor, ts.isExpression));
+                }
+                else {
+                    chunkObject = ts.append(chunkObject, e.kind === 275 /* PropertyAssignment */
+                        ? ts.createPropertyAssignment(e.name, ts.visitNode(e.initializer, visitor, ts.isExpression))
+                        : ts.visitNode(e, visitor, ts.isObjectLiteralElementLike));
+                }
+            }
+            if (chunkObject) {
+                objects.push(ts.createObjectLiteral(chunkObject));
+            }
+            return objects;
+        }
+        function visitObjectLiteralExpression(node) {
+            if (node.transformFlags & 262144 /* ContainsObjectRestOrSpread */) {
+                // spread elements emit like so:
+                // non-spread elements are chunked together into object literals, and then all are passed to __assign:
+                //     { a, ...o, b } => __assign({a}, o, {b});
+                // If the first element is a spread element, then the first argument to __assign is {}:
+                //     { ...o, a, b, ...o2 } => __assign({}, o, {a, b}, o2)
+                var objects = chunkObjectLiteralElements(node.properties);
+                if (objects.length && objects[0].kind !== 188 /* ObjectLiteralExpression */) {
+                    objects.unshift(ts.createObjectLiteral());
+                }
+                return createAssignHelper(context, objects);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitExpressionStatement(node) {
+            return ts.visitEachChild(node, visitorNoDestructuringValue, context);
+        }
+        function visitParenthesizedExpression(node, noDestructuringValue) {
+            return ts.visitEachChild(node, noDestructuringValue ? visitorNoDestructuringValue : visitor, context);
+        }
+        function visitCatchClause(node) {
+            if (!node.variableDeclaration) {
+                return ts.updateCatchClause(node, ts.createVariableDeclaration(ts.createTempVariable(/*recordTempVariable*/ undefined)), ts.visitNode(node.block, visitor, ts.isBlock));
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        /**
+         * Visits a BinaryExpression that contains a destructuring assignment.
+         *
+         * @param node A BinaryExpression node.
+         */
+        function visitBinaryExpression(node, noDestructuringValue) {
+            if (ts.isDestructuringAssignment(node) && node.left.transformFlags & 262144 /* ContainsObjectRestOrSpread */) {
+                return ts.flattenDestructuringAssignment(node, visitor, context, 1 /* ObjectRest */, !noDestructuringValue);
+            }
+            else if (node.operatorToken.kind === 27 /* CommaToken */) {
+                return ts.updateBinary(node, ts.visitNode(node.left, visitorNoDestructuringValue, ts.isExpression), ts.visitNode(node.right, noDestructuringValue ? visitorNoDestructuringValue : visitor, ts.isExpression));
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        /**
+         * Visits a VariableDeclaration node with a binding pattern.
+         *
+         * @param node A VariableDeclaration node.
+         */
+        function visitVariableDeclaration(node) {
+            // If we are here it is because the name contains a binding pattern with a rest somewhere in it.
+            if (ts.isBindingPattern(node.name) && node.name.transformFlags & 262144 /* ContainsObjectRestOrSpread */) {
+                return ts.flattenDestructuringBinding(node, visitor, context, 1 /* ObjectRest */);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitForStatement(node) {
+            return ts.updateFor(node, ts.visitNode(node.initializer, visitorNoDestructuringValue, ts.isForInitializer), ts.visitNode(node.condition, visitor, ts.isExpression), ts.visitNode(node.incrementor, visitor, ts.isExpression), ts.visitNode(node.statement, visitor, ts.isStatement));
+        }
+        function visitVoidExpression(node) {
+            return ts.visitEachChild(node, visitorNoDestructuringValue, context);
+        }
+        /**
+         * Visits a ForOfStatement and converts it into a ES2015-compatible ForOfStatement.
+         *
+         * @param node A ForOfStatement.
+         */
+        function visitForOfStatement(node, outermostLabeledStatement) {
+            if (node.initializer.transformFlags & 262144 /* ContainsObjectRestOrSpread */) {
+                node = transformForOfStatementWithObjectRest(node);
+            }
+            if (node.awaitModifier) {
+                return transformForAwaitOfStatement(node, outermostLabeledStatement);
+            }
+            else {
+                return ts.restoreEnclosingLabel(ts.visitEachChild(node, visitor, context), outermostLabeledStatement);
+            }
+        }
+        function transformForOfStatementWithObjectRest(node) {
+            var initializerWithoutParens = ts.skipParentheses(node.initializer);
+            if (ts.isVariableDeclarationList(initializerWithoutParens) || ts.isAssignmentPattern(initializerWithoutParens)) {
+                var bodyLocation = void 0;
+                var statementsLocation = void 0;
+                var temp = ts.createTempVariable(/*recordTempVariable*/ undefined);
+                var statements = [ts.createForOfBindingStatement(initializerWithoutParens, temp)];
+                if (ts.isBlock(node.statement)) {
+                    ts.addRange(statements, node.statement.statements);
+                    bodyLocation = node.statement;
+                    statementsLocation = node.statement.statements;
+                }
+                else if (node.statement) {
+                    ts.append(statements, node.statement);
+                    bodyLocation = node.statement;
+                    statementsLocation = node.statement;
+                }
+                return ts.updateForOf(node, node.awaitModifier, ts.setTextRange(ts.createVariableDeclarationList([
+                    ts.setTextRange(ts.createVariableDeclaration(temp), node.initializer)
+                ], 1 /* Let */), node.initializer), node.expression, ts.setTextRange(ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), statementsLocation), 
+                /*multiLine*/ true), bodyLocation));
+            }
+            return node;
+        }
+        function convertForOfStatementHead(node, boundValue) {
+            var binding = ts.createForOfBindingStatement(node.initializer, boundValue);
+            var bodyLocation;
+            var statementsLocation;
+            var statements = [ts.visitNode(binding, visitor, ts.isStatement)];
+            var statement = ts.visitNode(node.statement, visitor, ts.isStatement);
+            if (ts.isBlock(statement)) {
+                ts.addRange(statements, statement.statements);
+                bodyLocation = statement;
+                statementsLocation = statement.statements;
+            }
+            else {
+                statements.push(statement);
+            }
+            return ts.setEmitFlags(ts.setTextRange(ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), statementsLocation), 
+            /*multiLine*/ true), bodyLocation), 48 /* NoSourceMap */ | 384 /* NoTokenSourceMaps */);
+        }
+        function createDownlevelAwait(expression) {
+            return enclosingFunctionFlags & 1 /* Generator */
+                ? ts.createYield(/*asteriskToken*/ undefined, createAwaitHelper(context, expression))
+                : ts.createAwait(expression);
+        }
+        function transformForAwaitOfStatement(node, outermostLabeledStatement) {
+            var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
+            var iterator = ts.isIdentifier(expression) ? ts.getGeneratedNameForNode(expression) : ts.createTempVariable(/*recordTempVariable*/ undefined);
+            var result = ts.isIdentifier(expression) ? ts.getGeneratedNameForNode(iterator) : ts.createTempVariable(/*recordTempVariable*/ undefined);
+            var errorRecord = ts.createUniqueName("e");
+            var catchVariable = ts.getGeneratedNameForNode(errorRecord);
+            var returnMethod = ts.createTempVariable(/*recordTempVariable*/ undefined);
+            var callValues = createAsyncValuesHelper(context, expression, /*location*/ node.expression);
+            var callNext = ts.createCall(ts.createPropertyAccess(iterator, "next"), /*typeArguments*/ undefined, []);
+            var getDone = ts.createPropertyAccess(result, "done");
+            var getValue = ts.createPropertyAccess(result, "value");
+            var callReturn = ts.createFunctionCall(returnMethod, iterator, []);
+            hoistVariableDeclaration(errorRecord);
+            hoistVariableDeclaration(returnMethod);
+            var forStatement = ts.setEmitFlags(ts.setTextRange(ts.createFor(
+            /*initializer*/ ts.setEmitFlags(ts.setTextRange(ts.createVariableDeclarationList([
+                ts.setTextRange(ts.createVariableDeclaration(iterator, /*type*/ undefined, callValues), node.expression),
+                ts.createVariableDeclaration(result)
+            ]), node.expression), 2097152 /* NoHoisting */), 
+            /*condition*/ ts.createComma(ts.createAssignment(result, createDownlevelAwait(callNext)), ts.createLogicalNot(getDone)), 
+            /*incrementor*/ undefined, 
+            /*statement*/ convertForOfStatementHead(node, getValue)), 
+            /*location*/ node), 256 /* NoTokenTrailingSourceMaps */);
+            return ts.createTry(ts.createBlock([
+                ts.restoreEnclosingLabel(forStatement, outermostLabeledStatement)
+            ]), ts.createCatchClause(ts.createVariableDeclaration(catchVariable), ts.setEmitFlags(ts.createBlock([
+                ts.createExpressionStatement(ts.createAssignment(errorRecord, ts.createObjectLiteral([
+                    ts.createPropertyAssignment("error", catchVariable)
+                ])))
+            ]), 1 /* SingleLine */)), ts.createBlock([
+                ts.createTry(
+                /*tryBlock*/ ts.createBlock([
+                    ts.setEmitFlags(ts.createIf(ts.createLogicalAnd(ts.createLogicalAnd(result, ts.createLogicalNot(getDone)), ts.createAssignment(returnMethod, ts.createPropertyAccess(iterator, "return"))), ts.createExpressionStatement(createDownlevelAwait(callReturn))), 1 /* SingleLine */)
+                ]), 
+                /*catchClause*/ undefined, 
+                /*finallyBlock*/ ts.setEmitFlags(ts.createBlock([
+                    ts.setEmitFlags(ts.createIf(errorRecord, ts.createThrow(ts.createPropertyAccess(errorRecord, "error"))), 1 /* SingleLine */)
+                ]), 1 /* SingleLine */))
+            ]));
+        }
+        function visitParameter(node) {
+            if (node.transformFlags & 262144 /* ContainsObjectRestOrSpread */) {
+                // Binding patterns are converted into a generated name and are
+                // evaluated inside the function body.
+                return ts.updateParameter(node, 
+                /*decorators*/ undefined, 
+                /*modifiers*/ undefined, node.dotDotDotToken, ts.getGeneratedNameForNode(node), 
+                /*questionToken*/ undefined, 
+                /*type*/ undefined, ts.visitNode(node.initializer, visitor, ts.isExpression));
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitConstructorDeclaration(node) {
+            var savedEnclosingFunctionFlags = enclosingFunctionFlags;
+            enclosingFunctionFlags = 0 /* Normal */;
+            var updated = ts.updateConstructor(node, 
+            /*decorators*/ undefined, node.modifiers, ts.visitParameterList(node.parameters, visitor, context), transformFunctionBody(node));
+            enclosingFunctionFlags = savedEnclosingFunctionFlags;
+            return updated;
+        }
+        function visitGetAccessorDeclaration(node) {
+            var savedEnclosingFunctionFlags = enclosingFunctionFlags;
+            enclosingFunctionFlags = 0 /* Normal */;
+            var updated = ts.updateGetAccessor(node, 
+            /*decorators*/ undefined, node.modifiers, ts.visitNode(node.name, visitor, ts.isPropertyName), ts.visitParameterList(node.parameters, visitor, context), 
+            /*type*/ undefined, transformFunctionBody(node));
+            enclosingFunctionFlags = savedEnclosingFunctionFlags;
+            return updated;
+        }
+        function visitSetAccessorDeclaration(node) {
+            var savedEnclosingFunctionFlags = enclosingFunctionFlags;
+            enclosingFunctionFlags = 0 /* Normal */;
+            var updated = ts.updateSetAccessor(node, 
+            /*decorators*/ undefined, node.modifiers, ts.visitNode(node.name, visitor, ts.isPropertyName), ts.visitParameterList(node.parameters, visitor, context), transformFunctionBody(node));
+            enclosingFunctionFlags = savedEnclosingFunctionFlags;
+            return updated;
+        }
+        function visitMethodDeclaration(node) {
+            var savedEnclosingFunctionFlags = enclosingFunctionFlags;
+            enclosingFunctionFlags = ts.getFunctionFlags(node);
+            var updated = ts.updateMethod(node, 
+            /*decorators*/ undefined, enclosingFunctionFlags & 1 /* Generator */
+                ? ts.visitNodes(node.modifiers, visitorNoAsyncModifier, ts.isModifier)
+                : node.modifiers, enclosingFunctionFlags & 2 /* Async */
+                ? undefined
+                : node.asteriskToken, ts.visitNode(node.name, visitor, ts.isPropertyName), ts.visitNode(/*questionToken*/ undefined, visitor, ts.isToken), 
+            /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), 
+            /*type*/ undefined, enclosingFunctionFlags & 2 /* Async */ && enclosingFunctionFlags & 1 /* Generator */
+                ? transformAsyncGeneratorFunctionBody(node)
+                : transformFunctionBody(node));
+            enclosingFunctionFlags = savedEnclosingFunctionFlags;
+            return updated;
+        }
+        function visitFunctionDeclaration(node) {
+            var savedEnclosingFunctionFlags = enclosingFunctionFlags;
+            enclosingFunctionFlags = ts.getFunctionFlags(node);
+            var updated = ts.updateFunctionDeclaration(node, 
+            /*decorators*/ undefined, enclosingFunctionFlags & 1 /* Generator */
+                ? ts.visitNodes(node.modifiers, visitorNoAsyncModifier, ts.isModifier)
+                : node.modifiers, enclosingFunctionFlags & 2 /* Async */
+                ? undefined
+                : node.asteriskToken, node.name, 
+            /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), 
+            /*type*/ undefined, enclosingFunctionFlags & 2 /* Async */ && enclosingFunctionFlags & 1 /* Generator */
+                ? transformAsyncGeneratorFunctionBody(node)
+                : transformFunctionBody(node));
+            enclosingFunctionFlags = savedEnclosingFunctionFlags;
+            return updated;
+        }
+        function visitArrowFunction(node) {
+            var savedEnclosingFunctionFlags = enclosingFunctionFlags;
+            enclosingFunctionFlags = ts.getFunctionFlags(node);
+            var updated = ts.updateArrowFunction(node, node.modifiers, 
+            /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), 
+            /*type*/ undefined, node.equalsGreaterThanToken, transformFunctionBody(node));
+            enclosingFunctionFlags = savedEnclosingFunctionFlags;
+            return updated;
+        }
+        function visitFunctionExpression(node) {
+            var savedEnclosingFunctionFlags = enclosingFunctionFlags;
+            enclosingFunctionFlags = ts.getFunctionFlags(node);
+            var updated = ts.updateFunctionExpression(node, enclosingFunctionFlags & 1 /* Generator */
+                ? ts.visitNodes(node.modifiers, visitorNoAsyncModifier, ts.isModifier)
+                : node.modifiers, enclosingFunctionFlags & 2 /* Async */
+                ? undefined
+                : node.asteriskToken, node.name, 
+            /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), 
+            /*type*/ undefined, enclosingFunctionFlags & 2 /* Async */ && enclosingFunctionFlags & 1 /* Generator */
+                ? transformAsyncGeneratorFunctionBody(node)
+                : transformFunctionBody(node));
+            enclosingFunctionFlags = savedEnclosingFunctionFlags;
+            return updated;
+        }
+        function transformAsyncGeneratorFunctionBody(node) {
+            resumeLexicalEnvironment();
+            var statements = [];
+            var statementOffset = ts.addPrologue(statements, node.body.statements, /*ensureUseStrict*/ false, visitor);
+            appendObjectRestAssignmentsIfNeeded(statements, node);
+            var savedCapturedSuperProperties = capturedSuperProperties;
+            var savedHasSuperElementAccess = hasSuperElementAccess;
+            capturedSuperProperties = ts.createUnderscoreEscapedMap();
+            hasSuperElementAccess = false;
+            var returnStatement = ts.createReturn(createAsyncGeneratorHelper(context, ts.createFunctionExpression(
+            /*modifiers*/ undefined, ts.createToken(40 /* AsteriskToken */), node.name && ts.getGeneratedNameForNode(node.name), 
+            /*typeParameters*/ undefined, 
+            /*parameters*/ [], 
+            /*type*/ undefined, ts.updateBlock(node.body, ts.visitLexicalEnvironment(node.body.statements, visitor, context, statementOffset)))));
+            // Minor optimization, emit `_super` helper to capture `super` access in an arrow.
+            // This step isn't needed if we eventually transform this to ES5.
+            var emitSuperHelpers = languageVersion >= 2 /* ES2015 */ && resolver.getNodeCheckFlags(node) & (4096 /* AsyncMethodWithSuperBinding */ | 2048 /* AsyncMethodWithSuper */);
+            if (emitSuperHelpers) {
+                enableSubstitutionForAsyncMethodsWithSuper();
+                var variableStatement = ts.createSuperAccessVariableStatement(resolver, node, capturedSuperProperties);
+                substitutedSuperAccessors[ts.getNodeId(variableStatement)] = true;
+                ts.addStatementsAfterPrologue(statements, [variableStatement]);
+            }
+            statements.push(returnStatement);
+            ts.addStatementsAfterPrologue(statements, endLexicalEnvironment());
+            var block = ts.updateBlock(node.body, statements);
+            if (emitSuperHelpers && hasSuperElementAccess) {
+                if (resolver.getNodeCheckFlags(node) & 4096 /* AsyncMethodWithSuperBinding */) {
+                    ts.addEmitHelper(block, ts.advancedAsyncSuperHelper);
+                }
+                else if (resolver.getNodeCheckFlags(node) & 2048 /* AsyncMethodWithSuper */) {
+                    ts.addEmitHelper(block, ts.asyncSuperHelper);
+                }
+            }
+            capturedSuperProperties = savedCapturedSuperProperties;
+            hasSuperElementAccess = savedHasSuperElementAccess;
+            return block;
+        }
+        function transformFunctionBody(node) {
+            resumeLexicalEnvironment();
+            var statementOffset = 0;
+            var statements = [];
+            var body = ts.visitNode(node.body, visitor, ts.isConciseBody);
+            if (ts.isBlock(body)) {
+                statementOffset = ts.addPrologue(statements, body.statements, /*ensureUseStrict*/ false, visitor);
+            }
+            ts.addRange(statements, appendObjectRestAssignmentsIfNeeded(/*statements*/ undefined, node));
+            var leadingStatements = endLexicalEnvironment();
+            if (statementOffset > 0 || ts.some(statements) || ts.some(leadingStatements)) {
+                var block = ts.convertToFunctionBody(body, /*multiLine*/ true);
+                ts.addStatementsAfterPrologue(statements, leadingStatements);
+                ts.addRange(statements, block.statements.slice(statementOffset));
+                return ts.updateBlock(block, ts.setTextRange(ts.createNodeArray(statements), block.statements));
+            }
+            return body;
+        }
+        function appendObjectRestAssignmentsIfNeeded(statements, node) {
+            for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
+                var parameter = _a[_i];
+                if (parameter.transformFlags & 262144 /* ContainsObjectRestOrSpread */) {
+                    var temp = ts.getGeneratedNameForNode(parameter);
+                    var declarations = ts.flattenDestructuringBinding(parameter, visitor, context, 1 /* ObjectRest */, temp, 
+                    /*doNotRecordTempVariablesInLine*/ false, 
+                    /*skipInitializer*/ true);
+                    if (ts.some(declarations)) {
+                        var statement = ts.createVariableStatement(
+                        /*modifiers*/ undefined, ts.createVariableDeclarationList(declarations));
+                        ts.setEmitFlags(statement, 1048576 /* CustomPrologue */);
+                        statements = ts.append(statements, statement);
+                    }
+                }
+            }
+            return statements;
+        }
+        function enableSubstitutionForAsyncMethodsWithSuper() {
+            if ((enabledSubstitutions & 1 /* AsyncMethodsWithSuper */) === 0) {
+                enabledSubstitutions |= 1 /* AsyncMethodsWithSuper */;
+                // We need to enable substitutions for call, property access, and element access
+                // if we need to rewrite super calls.
+                context.enableSubstitution(191 /* CallExpression */);
+                context.enableSubstitution(189 /* PropertyAccessExpression */);
+                context.enableSubstitution(190 /* ElementAccessExpression */);
+                // We need to be notified when entering and exiting declarations that bind super.
+                context.enableEmitNotification(240 /* ClassDeclaration */);
+                context.enableEmitNotification(156 /* MethodDeclaration */);
+                context.enableEmitNotification(158 /* GetAccessor */);
+                context.enableEmitNotification(159 /* SetAccessor */);
+                context.enableEmitNotification(157 /* Constructor */);
+                // We need to be notified when entering the generated accessor arrow functions.
+                context.enableEmitNotification(219 /* VariableStatement */);
+            }
+        }
+        /**
+         * Called by the printer just before a node is printed.
+         *
+         * @param hint A hint as to the intended usage of the node.
+         * @param node The node to be printed.
+         * @param emitCallback The callback used to emit the node.
+         */
+        function onEmitNode(hint, node, emitCallback) {
+            // If we need to support substitutions for `super` in an async method,
+            // we should track it here.
+            if (enabledSubstitutions & 1 /* AsyncMethodsWithSuper */ && isSuperContainer(node)) {
+                var superContainerFlags = resolver.getNodeCheckFlags(node) & (2048 /* AsyncMethodWithSuper */ | 4096 /* AsyncMethodWithSuperBinding */);
+                if (superContainerFlags !== enclosingSuperContainerFlags) {
+                    var savedEnclosingSuperContainerFlags = enclosingSuperContainerFlags;
+                    enclosingSuperContainerFlags = superContainerFlags;
+                    previousOnEmitNode(hint, node, emitCallback);
+                    enclosingSuperContainerFlags = savedEnclosingSuperContainerFlags;
+                    return;
+                }
+            }
+            // Disable substitution in the generated super accessor itself.
+            else if (enabledSubstitutions && substitutedSuperAccessors[ts.getNodeId(node)]) {
+                var savedEnclosingSuperContainerFlags = enclosingSuperContainerFlags;
+                enclosingSuperContainerFlags = 0;
+                previousOnEmitNode(hint, node, emitCallback);
+                enclosingSuperContainerFlags = savedEnclosingSuperContainerFlags;
+                return;
+            }
+            previousOnEmitNode(hint, node, emitCallback);
+        }
+        /**
+         * Hooks node substitutions.
+         *
+         * @param hint The context for the emitter.
+         * @param node The node to substitute.
+         */
+        function onSubstituteNode(hint, node) {
+            node = previousOnSubstituteNode(hint, node);
+            if (hint === 1 /* Expression */ && enclosingSuperContainerFlags) {
+                return substituteExpression(node);
+            }
+            return node;
+        }
+        function substituteExpression(node) {
+            switch (node.kind) {
+                case 189 /* PropertyAccessExpression */:
+                    return substitutePropertyAccessExpression(node);
+                case 190 /* ElementAccessExpression */:
+                    return substituteElementAccessExpression(node);
+                case 191 /* CallExpression */:
+                    return substituteCallExpression(node);
+            }
+            return node;
+        }
+        function substitutePropertyAccessExpression(node) {
+            if (node.expression.kind === 98 /* SuperKeyword */) {
+                return ts.setTextRange(ts.createPropertyAccess(ts.createFileLevelUniqueName("_super"), node.name), node);
+            }
+            return node;
+        }
+        function substituteElementAccessExpression(node) {
+            if (node.expression.kind === 98 /* SuperKeyword */) {
+                return createSuperElementAccessInAsyncMethod(node.argumentExpression, node);
+            }
+            return node;
+        }
+        function substituteCallExpression(node) {
+            var expression = node.expression;
+            if (ts.isSuperProperty(expression)) {
+                var argumentExpression = ts.isPropertyAccessExpression(expression)
+                    ? substitutePropertyAccessExpression(expression)
+                    : substituteElementAccessExpression(expression);
+                return ts.createCall(ts.createPropertyAccess(argumentExpression, "call"), 
+                /*typeArguments*/ undefined, [
+                    ts.createThis()
+                ].concat(node.arguments));
+            }
+            return node;
+        }
+        function isSuperContainer(node) {
+            var kind = node.kind;
+            return kind === 240 /* ClassDeclaration */
+                || kind === 157 /* Constructor */
+                || kind === 156 /* MethodDeclaration */
+                || kind === 158 /* GetAccessor */
+                || kind === 159 /* SetAccessor */;
+        }
+        function createSuperElementAccessInAsyncMethod(argumentExpression, location) {
+            if (enclosingSuperContainerFlags & 4096 /* AsyncMethodWithSuperBinding */) {
+                return ts.setTextRange(ts.createPropertyAccess(ts.createCall(ts.createIdentifier("_superIndex"), 
+                /*typeArguments*/ undefined, [argumentExpression]), "value"), location);
+            }
+            else {
+                return ts.setTextRange(ts.createCall(ts.createIdentifier("_superIndex"), 
+                /*typeArguments*/ undefined, [argumentExpression]), location);
+            }
+        }
+    }
+    ts.transformESNext = transformESNext;
+    var assignHelper = {
+        name: "typescript:assign",
+        scoped: false,
+        priority: 1,
+        text: "\n            var __assign = (this && this.__assign) || function () {\n                __assign = Object.assign || function(t) {\n                    for (var s, i = 1, n = arguments.length; i < n; i++) {\n                        s = arguments[i];\n                        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))\n                            t[p] = s[p];\n                    }\n                    return t;\n                };\n                return __assign.apply(this, arguments);\n            };"
+    };
+    function createAssignHelper(context, attributesSegments) {
+        if (context.getCompilerOptions().target >= 2 /* ES2015 */) {
+            return ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "assign"), 
+            /*typeArguments*/ undefined, attributesSegments);
+        }
+        context.requestEmitHelper(assignHelper);
+        return ts.createCall(ts.getHelperName("__assign"), 
+        /*typeArguments*/ undefined, attributesSegments);
+    }
+    ts.createAssignHelper = createAssignHelper;
+    var awaitHelper = {
+        name: "typescript:await",
+        scoped: false,
+        text: "\n            var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }"
+    };
+    function createAwaitHelper(context, expression) {
+        context.requestEmitHelper(awaitHelper);
+        return ts.createCall(ts.getHelperName("__await"), /*typeArguments*/ undefined, [expression]);
+    }
+    var asyncGeneratorHelper = {
+        name: "typescript:asyncGenerator",
+        scoped: false,
+        text: "\n            var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {\n                if (!Symbol.asyncIterator) throw new TypeError(\"Symbol.asyncIterator is not defined.\");\n                var g = generator.apply(thisArg, _arguments || []), i, q = [];\n                return i = {}, verb(\"next\"), verb(\"throw\"), verb(\"return\"), i[Symbol.asyncIterator] = function () { return this; }, i;\n                function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }\n                function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }\n                function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }\n                function fulfill(value) { resume(\"next\", value); }\n                function reject(value) { resume(\"throw\", value); }\n                function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }\n            };"
+    };
+    function createAsyncGeneratorHelper(context, generatorFunc) {
+        context.requestEmitHelper(awaitHelper);
+        context.requestEmitHelper(asyncGeneratorHelper);
+        // Mark this node as originally an async function
+        (generatorFunc.emitNode || (generatorFunc.emitNode = {})).flags |= 262144 /* AsyncFunctionBody */;
+        return ts.createCall(ts.getHelperName("__asyncGenerator"), 
+        /*typeArguments*/ undefined, [
+            ts.createThis(),
+            ts.createIdentifier("arguments"),
+            generatorFunc
+        ]);
+    }
+    var asyncDelegator = {
+        name: "typescript:asyncDelegator",
+        scoped: false,
+        text: "\n            var __asyncDelegator = (this && this.__asyncDelegator) || function (o) {\n                var i, p;\n                return i = {}, verb(\"next\"), verb(\"throw\", function (e) { throw e; }), verb(\"return\"), i[Symbol.iterator] = function () { return this; }, i;\n                function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === \"return\" } : f ? f(v) : v; } : f; }\n            };"
+    };
+    function createAsyncDelegatorHelper(context, expression, location) {
+        context.requestEmitHelper(awaitHelper);
+        context.requestEmitHelper(asyncDelegator);
+        return ts.setTextRange(ts.createCall(ts.getHelperName("__asyncDelegator"), 
+        /*typeArguments*/ undefined, [expression]), location);
+    }
+    var asyncValues = {
+        name: "typescript:asyncValues",
+        scoped: false,
+        text: "\n            var __asyncValues = (this && this.__asyncValues) || function (o) {\n                if (!Symbol.asyncIterator) throw new TypeError(\"Symbol.asyncIterator is not defined.\");\n                var m = o[Symbol.asyncIterator], i;\n                return m ? m.call(o) : (o = typeof __values === \"function\" ? __values(o) : o[Symbol.iterator](), i = {}, verb(\"next\"), verb(\"throw\"), verb(\"return\"), i[Symbol.asyncIterator] = function () { return this; }, i);\n                function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }\n                function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }\n            };"
+    };
+    function createAsyncValuesHelper(context, expression, location) {
+        context.requestEmitHelper(asyncValues);
+        return ts.setTextRange(ts.createCall(ts.getHelperName("__asyncValues"), 
+        /*typeArguments*/ undefined, [expression]), location);
+    }
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
+(function (ts) {
+    function transformJsx(context) {
+        var compilerOptions = context.getCompilerOptions();
+        var currentSourceFile;
+        return ts.chainBundle(transformSourceFile);
+        /**
+         * Transform JSX-specific syntax in a SourceFile.
+         *
+         * @param node A SourceFile node.
+         */
+        function transformSourceFile(node) {
+            if (node.isDeclarationFile) {
+                return node;
+            }
+            currentSourceFile = node;
+            var visited = ts.visitEachChild(node, visitor, context);
+            ts.addEmitHelpers(visited, context.readEmitHelpers());
+            return visited;
+        }
+        function visitor(node) {
+            if (node.transformFlags & 4 /* ContainsJsx */) {
+                return visitorWorker(node);
+            }
+            else {
+                return node;
+            }
+        }
+        function visitorWorker(node) {
+            switch (node.kind) {
+                case 260 /* JsxElement */:
+                    return visitJsxElement(node, /*isChild*/ false);
+                case 261 /* JsxSelfClosingElement */:
+                    return visitJsxSelfClosingElement(node, /*isChild*/ false);
+                case 264 /* JsxFragment */:
+                    return visitJsxFragment(node, /*isChild*/ false);
+                case 270 /* JsxExpression */:
+                    return visitJsxExpression(node);
+                default:
+                    return ts.visitEachChild(node, visitor, context);
+            }
+        }
+        function transformJsxChildToExpression(node) {
+            switch (node.kind) {
+                case 11 /* JsxText */:
+                    return visitJsxText(node);
+                case 270 /* JsxExpression */:
+                    return visitJsxExpression(node);
+                case 260 /* JsxElement */:
+                    return visitJsxElement(node, /*isChild*/ true);
+                case 261 /* JsxSelfClosingElement */:
+                    return visitJsxSelfClosingElement(node, /*isChild*/ true);
+                case 264 /* JsxFragment */:
+                    return visitJsxFragment(node, /*isChild*/ true);
+                default:
+                    return ts.Debug.failBadSyntaxKind(node);
+            }
+        }
+        function visitJsxElement(node, isChild) {
+            return visitJsxOpeningLikeElement(node.openingElement, node.children, isChild, /*location*/ node);
+        }
+        function visitJsxSelfClosingElement(node, isChild) {
+            return visitJsxOpeningLikeElement(node, /*children*/ undefined, isChild, /*location*/ node);
+        }
+        function visitJsxFragment(node, isChild) {
+            return visitJsxOpeningFragment(node.openingFragment, node.children, isChild, /*location*/ node);
+        }
+        function visitJsxOpeningLikeElement(node, children, isChild, location) {
+            var tagName = getTagName(node);
+            var objectProperties;
+            var attrs = node.attributes.properties;
+            if (attrs.length === 0) {
+                // When there are no attributes, React wants "null"
+                objectProperties = ts.createNull();
+            }
+            else {
+                // Map spans of JsxAttribute nodes into object literals and spans
+                // of JsxSpreadAttribute nodes into expressions.
+                var segments = ts.flatten(ts.spanMap(attrs, ts.isJsxSpreadAttribute, function (attrs, isSpread) { return isSpread
+                    ? ts.map(attrs, transformJsxSpreadAttributeToExpression)
+                    : ts.createObjectLiteral(ts.map(attrs, transformJsxAttributeToObjectLiteralElement)); }));
+                if (ts.isJsxSpreadAttribute(attrs[0])) {
+                    // We must always emit at least one object literal before a spread
+                    // argument.
+                    segments.unshift(ts.createObjectLiteral());
+                }
+                // Either emit one big object literal (no spread attribs), or
+                // a call to the __assign helper.
+                objectProperties = ts.singleOrUndefined(segments);
+                if (!objectProperties) {
+                    objectProperties = ts.createAssignHelper(context, segments);
+                }
+            }
+            var element = ts.createExpressionForJsxElement(context.getEmitResolver().getJsxFactoryEntity(currentSourceFile), compilerOptions.reactNamespace, // TODO: GH#18217
+            tagName, objectProperties, ts.mapDefined(children, transformJsxChildToExpression), node, location);
+            if (isChild) {
+                ts.startOnNewLine(element);
+            }
+            return element;
+        }
+        function visitJsxOpeningFragment(node, children, isChild, location) {
+            var element = ts.createExpressionForJsxFragment(context.getEmitResolver().getJsxFactoryEntity(currentSourceFile), compilerOptions.reactNamespace, // TODO: GH#18217
+            ts.mapDefined(children, transformJsxChildToExpression), node, location);
+            if (isChild) {
+                ts.startOnNewLine(element);
+            }
+            return element;
+        }
+        function transformJsxSpreadAttributeToExpression(node) {
+            return ts.visitNode(node.expression, visitor, ts.isExpression);
+        }
+        function transformJsxAttributeToObjectLiteralElement(node) {
+            var name = getAttributeName(node);
+            var expression = transformJsxAttributeInitializer(node.initializer);
+            return ts.createPropertyAssignment(name, expression);
+        }
+        function transformJsxAttributeInitializer(node) {
+            if (node === undefined) {
+                return ts.createTrue();
+            }
+            else if (node.kind === 10 /* StringLiteral */) {
+                // Always recreate the literal to escape any escape sequences or newlines which may be in the original jsx string and which
+                // Need to be escaped to be handled correctly in a normal string
+                var literal = ts.createLiteral(tryDecodeEntities(node.text) || node.text);
+                literal.singleQuote = node.singleQuote !== undefined ? node.singleQuote : !ts.isStringDoubleQuoted(node, currentSourceFile);
+                return ts.setTextRange(literal, node);
+            }
+            else if (node.kind === 270 /* JsxExpression */) {
+                if (node.expression === undefined) {
+                    return ts.createTrue();
+                }
+                return visitJsxExpression(node);
+            }
+            else {
+                return ts.Debug.failBadSyntaxKind(node);
+            }
+        }
+        function visitJsxText(node) {
+            var fixed = fixupWhitespaceAndDecodeEntities(ts.getTextOfNode(node, /*includeTrivia*/ true));
+            return fixed === undefined ? undefined : ts.createLiteral(fixed);
+        }
+        /**
+         * JSX trims whitespace at the end and beginning of lines, except that the
+         * start/end of a tag is considered a start/end of a line only if that line is
+         * on the same line as the closing tag. See examples in
+         * tests/cases/conformance/jsx/tsxReactEmitWhitespace.tsx
+         * See also https://www.w3.org/TR/html4/struct/text.html#h-9.1 and https://www.w3.org/TR/CSS2/text.html#white-space-model
+         *
+         * An equivalent algorithm would be:
+         * - If there is only one line, return it.
+         * - If there is only whitespace (but multiple lines), return `undefined`.
+         * - Split the text into lines.
+         * - 'trimRight' the first line, 'trimLeft' the last line, 'trim' middle lines.
+         * - Decode entities on each line (individually).
+         * - Remove empty lines and join the rest with " ".
+         */
+        function fixupWhitespaceAndDecodeEntities(text) {
+            var acc;
+            // First non-whitespace character on this line.
+            var firstNonWhitespace = 0;
+            // Last non-whitespace character on this line.
+            var lastNonWhitespace = -1;
+            // These initial values are special because the first line is:
+            // firstNonWhitespace = 0 to indicate that we want leading whitsepace,
+            // but lastNonWhitespace = -1 as a special flag to indicate that we *don't* include the line if it's all whitespace.
+            for (var i = 0; i < text.length; i++) {
+                var c = text.charCodeAt(i);
+                if (ts.isLineBreak(c)) {
+                    // If we've seen any non-whitespace characters on this line, add the 'trim' of the line.
+                    // (lastNonWhitespace === -1 is a special flag to detect whether the first line is all whitespace.)
+                    if (firstNonWhitespace !== -1 && lastNonWhitespace !== -1) {
+                        acc = addLineOfJsxText(acc, text.substr(firstNonWhitespace, lastNonWhitespace - firstNonWhitespace + 1));
+                    }
+                    // Reset firstNonWhitespace for the next line.
+                    // Don't bother to reset lastNonWhitespace because we ignore it if firstNonWhitespace = -1.
+                    firstNonWhitespace = -1;
+                }
+                else if (!ts.isWhiteSpaceSingleLine(c)) {
+                    lastNonWhitespace = i;
+                    if (firstNonWhitespace === -1) {
+                        firstNonWhitespace = i;
+                    }
+                }
+            }
+            return firstNonWhitespace !== -1
+                // Last line had a non-whitespace character. Emit the 'trimLeft', meaning keep trailing whitespace.
+                ? addLineOfJsxText(acc, text.substr(firstNonWhitespace))
+                // Last line was all whitespace, so ignore it
+                : acc;
+        }
+        function addLineOfJsxText(acc, trimmedLine) {
+            // We do not escape the string here as that is handled by the printer
+            // when it emits the literal. We do, however, need to decode JSX entities.
+            var decoded = decodeEntities(trimmedLine);
+            return acc === undefined ? decoded : acc + " " + decoded;
+        }
+        /**
+         * Replace entities like "&nbsp;", "&#123;", and "&#xDEADBEEF;" with the characters they encode.
+         * See https://en.wikipedia.org/wiki/List_of_XML_and_HTML_character_entity_references
+         */
+        function decodeEntities(text) {
+            return text.replace(/&((#((\d+)|x([\da-fA-F]+)))|(\w+));/g, function (match, _all, _number, _digits, decimal, hex, word) {
+                if (decimal) {
+                    return String.fromCharCode(parseInt(decimal, 10));
+                }
+                else if (hex) {
+                    return String.fromCharCode(parseInt(hex, 16));
+                }
+                else {
+                    var ch = entities.get(word);
+                    // If this is not a valid entity, then just use `match` (replace it with itself, i.e. don't replace)
+                    return ch ? String.fromCharCode(ch) : match;
+                }
+            });
+        }
+        /** Like `decodeEntities` but returns `undefined` if there were no entities to decode. */
+        function tryDecodeEntities(text) {
+            var decoded = decodeEntities(text);
+            return decoded === text ? undefined : decoded;
+        }
+        function getTagName(node) {
+            if (node.kind === 260 /* JsxElement */) {
+                return getTagName(node.openingElement);
+            }
+            else {
+                var name = node.tagName;
+                if (ts.isIdentifier(name) && ts.isIntrinsicJsxName(name.escapedText)) {
+                    return ts.createLiteral(ts.idText(name));
+                }
+                else {
+                    return ts.createExpressionFromEntityName(name);
+                }
+            }
+        }
+        /**
+         * Emit an attribute name, which is quoted if it needs to be quoted. Because
+         * these emit into an object literal property name, we don't need to be worried
+         * about keywords, just non-identifier characters
+         */
+        function getAttributeName(node) {
+            var name = node.name;
+            var text = ts.idText(name);
+            if (/^[A-Za-z_]\w*$/.test(text)) {
+                return name;
+            }
+            else {
+                return ts.createLiteral(text);
+            }
+        }
+        function visitJsxExpression(node) {
+            return ts.visitNode(node.expression, visitor, ts.isExpression);
+        }
+    }
+    ts.transformJsx = transformJsx;
+    var entities = ts.createMapFromTemplate({
+        quot: 0x0022,
+        amp: 0x0026,
+        apos: 0x0027,
+        lt: 0x003C,
+        gt: 0x003E,
+        nbsp: 0x00A0,
+        iexcl: 0x00A1,
+        cent: 0x00A2,
+        pound: 0x00A3,
+        curren: 0x00A4,
+        yen: 0x00A5,
+        brvbar: 0x00A6,
+        sect: 0x00A7,
+        uml: 0x00A8,
+        copy: 0x00A9,
+        ordf: 0x00AA,
+        laquo: 0x00AB,
+        not: 0x00AC,
+        shy: 0x00AD,
+        reg: 0x00AE,
+        macr: 0x00AF,
+        deg: 0x00B0,
+        plusmn: 0x00B1,
+        sup2: 0x00B2,
+        sup3: 0x00B3,
+        acute: 0x00B4,
+        micro: 0x00B5,
+        para: 0x00B6,
+        middot: 0x00B7,
+        cedil: 0x00B8,
+        sup1: 0x00B9,
+        ordm: 0x00BA,
+        raquo: 0x00BB,
+        frac14: 0x00BC,
+        frac12: 0x00BD,
+        frac34: 0x00BE,
+        iquest: 0x00BF,
+        Agrave: 0x00C0,
+        Aacute: 0x00C1,
+        Acirc: 0x00C2,
+        Atilde: 0x00C3,
+        Auml: 0x00C4,
+        Aring: 0x00C5,
+        AElig: 0x00C6,
+        Ccedil: 0x00C7,
+        Egrave: 0x00C8,
+        Eacute: 0x00C9,
+        Ecirc: 0x00CA,
+        Euml: 0x00CB,
+        Igrave: 0x00CC,
+        Iacute: 0x00CD,
+        Icirc: 0x00CE,
+        Iuml: 0x00CF,
+        ETH: 0x00D0,
+        Ntilde: 0x00D1,
+        Ograve: 0x00D2,
+        Oacute: 0x00D3,
+        Ocirc: 0x00D4,
+        Otilde: 0x00D5,
+        Ouml: 0x00D6,
+        times: 0x00D7,
+        Oslash: 0x00D8,
+        Ugrave: 0x00D9,
+        Uacute: 0x00DA,
+        Ucirc: 0x00DB,
+        Uuml: 0x00DC,
+        Yacute: 0x00DD,
+        THORN: 0x00DE,
+        szlig: 0x00DF,
+        agrave: 0x00E0,
+        aacute: 0x00E1,
+        acirc: 0x00E2,
+        atilde: 0x00E3,
+        auml: 0x00E4,
+        aring: 0x00E5,
+        aelig: 0x00E6,
+        ccedil: 0x00E7,
+        egrave: 0x00E8,
+        eacute: 0x00E9,
+        ecirc: 0x00EA,
+        euml: 0x00EB,
+        igrave: 0x00EC,
+        iacute: 0x00ED,
+        icirc: 0x00EE,
+        iuml: 0x00EF,
+        eth: 0x00F0,
+        ntilde: 0x00F1,
+        ograve: 0x00F2,
+        oacute: 0x00F3,
+        ocirc: 0x00F4,
+        otilde: 0x00F5,
+        ouml: 0x00F6,
+        divide: 0x00F7,
+        oslash: 0x00F8,
+        ugrave: 0x00F9,
+        uacute: 0x00FA,
+        ucirc: 0x00FB,
+        uuml: 0x00FC,
+        yacute: 0x00FD,
+        thorn: 0x00FE,
+        yuml: 0x00FF,
+        OElig: 0x0152,
+        oelig: 0x0153,
+        Scaron: 0x0160,
+        scaron: 0x0161,
+        Yuml: 0x0178,
+        fnof: 0x0192,
+        circ: 0x02C6,
+        tilde: 0x02DC,
+        Alpha: 0x0391,
+        Beta: 0x0392,
+        Gamma: 0x0393,
+        Delta: 0x0394,
+        Epsilon: 0x0395,
+        Zeta: 0x0396,
+        Eta: 0x0397,
+        Theta: 0x0398,
+        Iota: 0x0399,
+        Kappa: 0x039A,
+        Lambda: 0x039B,
+        Mu: 0x039C,
+        Nu: 0x039D,
+        Xi: 0x039E,
+        Omicron: 0x039F,
+        Pi: 0x03A0,
+        Rho: 0x03A1,
+        Sigma: 0x03A3,
+        Tau: 0x03A4,
+        Upsilon: 0x03A5,
+        Phi: 0x03A6,
+        Chi: 0x03A7,
+        Psi: 0x03A8,
+        Omega: 0x03A9,
+        alpha: 0x03B1,
+        beta: 0x03B2,
+        gamma: 0x03B3,
+        delta: 0x03B4,
+        epsilon: 0x03B5,
+        zeta: 0x03B6,
+        eta: 0x03B7,
+        theta: 0x03B8,
+        iota: 0x03B9,
+        kappa: 0x03BA,
+        lambda: 0x03BB,
+        mu: 0x03BC,
+        nu: 0x03BD,
+        xi: 0x03BE,
+        omicron: 0x03BF,
+        pi: 0x03C0,
+        rho: 0x03C1,
+        sigmaf: 0x03C2,
+        sigma: 0x03C3,
+        tau: 0x03C4,
+        upsilon: 0x03C5,
+        phi: 0x03C6,
+        chi: 0x03C7,
+        psi: 0x03C8,
+        omega: 0x03C9,
+        thetasym: 0x03D1,
+        upsih: 0x03D2,
+        piv: 0x03D6,
+        ensp: 0x2002,
+        emsp: 0x2003,
+        thinsp: 0x2009,
+        zwnj: 0x200C,
+        zwj: 0x200D,
+        lrm: 0x200E,
+        rlm: 0x200F,
+        ndash: 0x2013,
+        mdash: 0x2014,
+        lsquo: 0x2018,
+        rsquo: 0x2019,
+        sbquo: 0x201A,
+        ldquo: 0x201C,
+        rdquo: 0x201D,
+        bdquo: 0x201E,
+        dagger: 0x2020,
+        Dagger: 0x2021,
+        bull: 0x2022,
+        hellip: 0x2026,
+        permil: 0x2030,
+        prime: 0x2032,
+        Prime: 0x2033,
+        lsaquo: 0x2039,
+        rsaquo: 0x203A,
+        oline: 0x203E,
+        frasl: 0x2044,
+        euro: 0x20AC,
+        image: 0x2111,
+        weierp: 0x2118,
+        real: 0x211C,
+        trade: 0x2122,
+        alefsym: 0x2135,
+        larr: 0x2190,
+        uarr: 0x2191,
+        rarr: 0x2192,
+        darr: 0x2193,
+        harr: 0x2194,
+        crarr: 0x21B5,
+        lArr: 0x21D0,
+        uArr: 0x21D1,
+        rArr: 0x21D2,
+        dArr: 0x21D3,
+        hArr: 0x21D4,
+        forall: 0x2200,
+        part: 0x2202,
+        exist: 0x2203,
+        empty: 0x2205,
+        nabla: 0x2207,
+        isin: 0x2208,
+        notin: 0x2209,
+        ni: 0x220B,
+        prod: 0x220F,
+        sum: 0x2211,
+        minus: 0x2212,
+        lowast: 0x2217,
+        radic: 0x221A,
+        prop: 0x221D,
+        infin: 0x221E,
+        ang: 0x2220,
+        and: 0x2227,
+        or: 0x2228,
+        cap: 0x2229,
+        cup: 0x222A,
+        int: 0x222B,
+        there4: 0x2234,
+        sim: 0x223C,
+        cong: 0x2245,
+        asymp: 0x2248,
+        ne: 0x2260,
+        equiv: 0x2261,
+        le: 0x2264,
+        ge: 0x2265,
+        sub: 0x2282,
+        sup: 0x2283,
+        nsub: 0x2284,
+        sube: 0x2286,
+        supe: 0x2287,
+        oplus: 0x2295,
+        otimes: 0x2297,
+        perp: 0x22A5,
+        sdot: 0x22C5,
+        lceil: 0x2308,
+        rceil: 0x2309,
+        lfloor: 0x230A,
+        rfloor: 0x230B,
+        lang: 0x2329,
+        rang: 0x232A,
+        loz: 0x25CA,
+        spades: 0x2660,
+        clubs: 0x2663,
+        hearts: 0x2665,
+        diams: 0x2666
+    });
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
+(function (ts) {
+    function transformES2016(context) {
+        var hoistVariableDeclaration = context.hoistVariableDeclaration;
+        return ts.chainBundle(transformSourceFile);
+        function transformSourceFile(node) {
+            if (node.isDeclarationFile) {
+                return node;
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitor(node) {
+            if ((node.transformFlags & 32 /* ContainsES2016 */) === 0) {
+                return node;
+            }
+            switch (node.kind) {
+                case 204 /* BinaryExpression */:
+                    return visitBinaryExpression(node);
+                default:
+                    return ts.visitEachChild(node, visitor, context);
+            }
+        }
+        function visitBinaryExpression(node) {
+            switch (node.operatorToken.kind) {
+                case 63 /* AsteriskAsteriskEqualsToken */:
+                    return visitExponentiationAssignmentExpression(node);
+                case 41 /* AsteriskAsteriskToken */:
+                    return visitExponentiationExpression(node);
+                default:
+                    return ts.visitEachChild(node, visitor, context);
+            }
+        }
+        function visitExponentiationAssignmentExpression(node) {
+            var target;
+            var value;
+            var left = ts.visitNode(node.left, visitor, ts.isExpression);
+            var right = ts.visitNode(node.right, visitor, ts.isExpression);
+            if (ts.isElementAccessExpression(left)) {
+                // Transforms `a[x] **= b` into `(_a = a)[_x = x] = Math.pow(_a[_x], b)`
+                var expressionTemp = ts.createTempVariable(hoistVariableDeclaration);
+                var argumentExpressionTemp = ts.createTempVariable(hoistVariableDeclaration);
+                target = ts.setTextRange(ts.createElementAccess(ts.setTextRange(ts.createAssignment(expressionTemp, left.expression), left.expression), ts.setTextRange(ts.createAssignment(argumentExpressionTemp, left.argumentExpression), left.argumentExpression)), left);
+                value = ts.setTextRange(ts.createElementAccess(expressionTemp, argumentExpressionTemp), left);
+            }
+            else if (ts.isPropertyAccessExpression(left)) {
+                // Transforms `a.x **= b` into `(_a = a).x = Math.pow(_a.x, b)`
+                var expressionTemp = ts.createTempVariable(hoistVariableDeclaration);
+                target = ts.setTextRange(ts.createPropertyAccess(ts.setTextRange(ts.createAssignment(expressionTemp, left.expression), left.expression), left.name), left);
+                value = ts.setTextRange(ts.createPropertyAccess(expressionTemp, left.name), left);
+            }
+            else {
+                // Transforms `a **= b` into `a = Math.pow(a, b)`
+                target = left;
+                value = left;
+            }
+            return ts.setTextRange(ts.createAssignment(target, ts.createMathPow(value, right, /*location*/ node)), node);
+        }
+        function visitExponentiationExpression(node) {
+            // Transforms `a ** b` into `Math.pow(a, b)`
+            var left = ts.visitNode(node.left, visitor, ts.isExpression);
+            var right = ts.visitNode(node.right, visitor, ts.isExpression);
+            return ts.createMathPow(left, right, /*location*/ node);
+        }
+    }
+    ts.transformES2016 = transformES2016;
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
+(function (ts) {
+    var ES2015SubstitutionFlags;
+    (function (ES2015SubstitutionFlags) {
+        /** Enables substitutions for captured `this` */
+        ES2015SubstitutionFlags[ES2015SubstitutionFlags["CapturedThis"] = 1] = "CapturedThis";
+        /** Enables substitutions for block-scoped bindings. */
+        ES2015SubstitutionFlags[ES2015SubstitutionFlags["BlockScopedBindings"] = 2] = "BlockScopedBindings";
+    })(ES2015SubstitutionFlags || (ES2015SubstitutionFlags = {}));
+    var LoopOutParameterFlags;
+    (function (LoopOutParameterFlags) {
+        LoopOutParameterFlags[LoopOutParameterFlags["Body"] = 1] = "Body";
+        LoopOutParameterFlags[LoopOutParameterFlags["Initializer"] = 2] = "Initializer";
+    })(LoopOutParameterFlags || (LoopOutParameterFlags = {}));
+    var CopyDirection;
+    (function (CopyDirection) {
+        CopyDirection[CopyDirection["ToOriginal"] = 0] = "ToOriginal";
+        CopyDirection[CopyDirection["ToOutParameter"] = 1] = "ToOutParameter";
+    })(CopyDirection || (CopyDirection = {}));
+    var Jump;
+    (function (Jump) {
+        Jump[Jump["Break"] = 2] = "Break";
+        Jump[Jump["Continue"] = 4] = "Continue";
+        Jump[Jump["Return"] = 8] = "Return";
+    })(Jump || (Jump = {}));
+    var SuperCaptureResult;
+    (function (SuperCaptureResult) {
+        /**
+         * A capture may have been added for calls to 'super', but
+         * the caller should emit subsequent statements normally.
+         */
+        SuperCaptureResult[SuperCaptureResult["NoReplacement"] = 0] = "NoReplacement";
+        /**
+         * A call to 'super()' got replaced with a capturing statement like:
+         *
+         *  var _this = _super.call(...) || this;
+         *
+         * Callers should skip the current statement.
+         */
+        SuperCaptureResult[SuperCaptureResult["ReplaceSuperCapture"] = 1] = "ReplaceSuperCapture";
+        /**
+         * A call to 'super()' got replaced with a capturing statement like:
+         *
+         *  return _super.call(...) || this;
+         *
+         * Callers should skip the current statement and avoid any returns of '_this'.
+         */
+        SuperCaptureResult[SuperCaptureResult["ReplaceWithReturn"] = 2] = "ReplaceWithReturn";
+    })(SuperCaptureResult || (SuperCaptureResult = {}));
+    // Facts we track as we traverse the tree
+    var HierarchyFacts;
+    (function (HierarchyFacts) {
+        HierarchyFacts[HierarchyFacts["None"] = 0] = "None";
+        //
+        // Ancestor facts
+        //
+        HierarchyFacts[HierarchyFacts["Function"] = 1] = "Function";
+        HierarchyFacts[HierarchyFacts["ArrowFunction"] = 2] = "ArrowFunction";
+        HierarchyFacts[HierarchyFacts["AsyncFunctionBody"] = 4] = "AsyncFunctionBody";
+        HierarchyFacts[HierarchyFacts["NonStaticClassElement"] = 8] = "NonStaticClassElement";
+        HierarchyFacts[HierarchyFacts["CapturesThis"] = 16] = "CapturesThis";
+        HierarchyFacts[HierarchyFacts["ExportedVariableStatement"] = 32] = "ExportedVariableStatement";
+        HierarchyFacts[HierarchyFacts["TopLevel"] = 64] = "TopLevel";
+        HierarchyFacts[HierarchyFacts["Block"] = 128] = "Block";
+        HierarchyFacts[HierarchyFacts["IterationStatement"] = 256] = "IterationStatement";
+        HierarchyFacts[HierarchyFacts["IterationStatementBlock"] = 512] = "IterationStatementBlock";
+        HierarchyFacts[HierarchyFacts["ForStatement"] = 1024] = "ForStatement";
+        HierarchyFacts[HierarchyFacts["ForInOrForOfStatement"] = 2048] = "ForInOrForOfStatement";
+        HierarchyFacts[HierarchyFacts["ConstructorWithCapturedSuper"] = 4096] = "ConstructorWithCapturedSuper";
+        HierarchyFacts[HierarchyFacts["ComputedPropertyName"] = 8192] = "ComputedPropertyName";
+        // NOTE: do not add more ancestor flags without also updating AncestorFactsMask below.
+        //
+        // Ancestor masks
+        //
+        HierarchyFacts[HierarchyFacts["AncestorFactsMask"] = 16383] = "AncestorFactsMask";
+        // We are always in *some* kind of block scope, but only specific block-scope containers are
+        // top-level or Blocks.
+        HierarchyFacts[HierarchyFacts["BlockScopeIncludes"] = 0] = "BlockScopeIncludes";
+        HierarchyFacts[HierarchyFacts["BlockScopeExcludes"] = 4032] = "BlockScopeExcludes";
+        // A source file is a top-level block scope.
+        HierarchyFacts[HierarchyFacts["SourceFileIncludes"] = 64] = "SourceFileIncludes";
+        HierarchyFacts[HierarchyFacts["SourceFileExcludes"] = 3968] = "SourceFileExcludes";
+        // Functions, methods, and accessors are both new lexical scopes and new block scopes.
+        HierarchyFacts[HierarchyFacts["FunctionIncludes"] = 65] = "FunctionIncludes";
+        HierarchyFacts[HierarchyFacts["FunctionExcludes"] = 16286] = "FunctionExcludes";
+        HierarchyFacts[HierarchyFacts["AsyncFunctionBodyIncludes"] = 69] = "AsyncFunctionBodyIncludes";
+        HierarchyFacts[HierarchyFacts["AsyncFunctionBodyExcludes"] = 16278] = "AsyncFunctionBodyExcludes";
+        // Arrow functions are lexically scoped to their container, but are new block scopes.
+        HierarchyFacts[HierarchyFacts["ArrowFunctionIncludes"] = 66] = "ArrowFunctionIncludes";
+        HierarchyFacts[HierarchyFacts["ArrowFunctionExcludes"] = 16256] = "ArrowFunctionExcludes";
+        // Constructors are both new lexical scopes and new block scopes. Constructors are also
+        // always considered non-static members of a class.
+        HierarchyFacts[HierarchyFacts["ConstructorIncludes"] = 73] = "ConstructorIncludes";
+        HierarchyFacts[HierarchyFacts["ConstructorExcludes"] = 16278] = "ConstructorExcludes";
+        // 'do' and 'while' statements are not block scopes. We track that the subtree is contained
+        // within an IterationStatement to indicate whether the embedded statement is an
+        // IterationStatementBlock.
+        HierarchyFacts[HierarchyFacts["DoOrWhileStatementIncludes"] = 256] = "DoOrWhileStatementIncludes";
+        HierarchyFacts[HierarchyFacts["DoOrWhileStatementExcludes"] = 0] = "DoOrWhileStatementExcludes";
+        // 'for' statements are new block scopes and have special handling for 'let' declarations.
+        HierarchyFacts[HierarchyFacts["ForStatementIncludes"] = 1280] = "ForStatementIncludes";
+        HierarchyFacts[HierarchyFacts["ForStatementExcludes"] = 3008] = "ForStatementExcludes";
+        // 'for-in' and 'for-of' statements are new block scopes and have special handling for
+        // 'let' declarations.
+        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementIncludes"] = 2304] = "ForInOrForOfStatementIncludes";
+        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementExcludes"] = 1984] = "ForInOrForOfStatementExcludes";
+        // Blocks (other than function bodies) are new block scopes.
+        HierarchyFacts[HierarchyFacts["BlockIncludes"] = 128] = "BlockIncludes";
+        HierarchyFacts[HierarchyFacts["BlockExcludes"] = 3904] = "BlockExcludes";
+        HierarchyFacts[HierarchyFacts["IterationStatementBlockIncludes"] = 512] = "IterationStatementBlockIncludes";
+        HierarchyFacts[HierarchyFacts["IterationStatementBlockExcludes"] = 4032] = "IterationStatementBlockExcludes";
+        // Computed property names track subtree flags differently than their containing members.
+        HierarchyFacts[HierarchyFacts["ComputedPropertyNameIncludes"] = 8192] = "ComputedPropertyNameIncludes";
+        HierarchyFacts[HierarchyFacts["ComputedPropertyNameExcludes"] = 0] = "ComputedPropertyNameExcludes";
+        //
+        // Subtree facts
+        //
+        HierarchyFacts[HierarchyFacts["NewTarget"] = 16384] = "NewTarget";
+        HierarchyFacts[HierarchyFacts["NewTargetInComputedPropertyName"] = 32768] = "NewTargetInComputedPropertyName";
+        //
+        // Subtree masks
+        //
+        HierarchyFacts[HierarchyFacts["SubtreeFactsMask"] = -16384] = "SubtreeFactsMask";
+        HierarchyFacts[HierarchyFacts["PropagateNewTargetMask"] = 49152] = "PropagateNewTargetMask";
+    })(HierarchyFacts || (HierarchyFacts = {}));
+    function transformES2015(context) {
+        var startLexicalEnvironment = context.startLexicalEnvironment, resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
+        var compilerOptions = context.getCompilerOptions();
+        var resolver = context.getEmitResolver();
+        var previousOnSubstituteNode = context.onSubstituteNode;
+        var previousOnEmitNode = context.onEmitNode;
+        context.onEmitNode = onEmitNode;
+        context.onSubstituteNode = onSubstituteNode;
+        var currentSourceFile;
+        var currentText;
+        var hierarchyFacts;
+        var taggedTemplateStringDeclarations;
+        function recordTaggedTemplateString(temp) {
+            taggedTemplateStringDeclarations = ts.append(taggedTemplateStringDeclarations, ts.createVariableDeclaration(temp));
+        }
+        /**
+         * Used to track if we are emitting body of the converted loop
+         */
+        var convertedLoopState;
+        /**
+         * Keeps track of whether substitutions have been enabled for specific cases.
+         * They are persisted between each SourceFile transformation and should not
+         * be reset.
+         */
+        var enabledSubstitutions;
+        return ts.chainBundle(transformSourceFile);
+        function transformSourceFile(node) {
+            if (node.isDeclarationFile) {
+                return node;
+            }
+            currentSourceFile = node;
+            currentText = node.text;
+            var visited = visitSourceFile(node);
+            ts.addEmitHelpers(visited, context.readEmitHelpers());
+            currentSourceFile = undefined;
+            currentText = undefined;
+            taggedTemplateStringDeclarations = undefined;
+            hierarchyFacts = 0 /* None */;
+            return visited;
+        }
+        /**
+         * Sets the `HierarchyFacts` for this node prior to visiting this node's subtree, returning the facts set prior to modification.
+         * @param excludeFacts The existing `HierarchyFacts` to reset before visiting the subtree.
+         * @param includeFacts The new `HierarchyFacts` to set before visiting the subtree.
+         */
+        function enterSubtree(excludeFacts, includeFacts) {
+            var ancestorFacts = hierarchyFacts;
+            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & 16383 /* AncestorFactsMask */;
+            return ancestorFacts;
+        }
+        /**
+         * Restores the `HierarchyFacts` for this node's ancestor after visiting this node's
+         * subtree, propagating specific facts from the subtree.
+         * @param ancestorFacts The `HierarchyFacts` of the ancestor to restore after visiting the subtree.
+         * @param excludeFacts The existing `HierarchyFacts` of the subtree that should not be propagated.
+         * @param includeFacts The new `HierarchyFacts` of the subtree that should be propagated.
+         */
+        function exitSubtree(ancestorFacts, excludeFacts, includeFacts) {
+            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & -16384 /* SubtreeFactsMask */ | ancestorFacts;
+        }
+        function isReturnVoidStatementInConstructorWithCapturedSuper(node) {
+            return (hierarchyFacts & 4096 /* ConstructorWithCapturedSuper */) !== 0
+                && node.kind === 230 /* ReturnStatement */
+                && !node.expression;
+        }
+        function shouldVisitNode(node) {
+            return (node.transformFlags & 128 /* ContainsES2015 */) !== 0
+                || convertedLoopState !== undefined
+                || (hierarchyFacts & 4096 /* ConstructorWithCapturedSuper */ && (ts.isStatement(node) || (node.kind === 218 /* Block */)))
+                || (ts.isIterationStatement(node, /*lookInLabeledStatements*/ false) && shouldConvertIterationStatement(node))
+                || (ts.getEmitFlags(node) & 33554432 /* TypeScriptClassWrapper */) !== 0;
+        }
+        function visitor(node) {
+            if (shouldVisitNode(node)) {
+                return visitJavaScript(node);
+            }
+            else {
+                return node;
+            }
+        }
+        function functionBodyVisitor(node) {
+            if (shouldVisitNode(node)) {
+                return visitBlock(node, /*isFunctionBody*/ true);
+            }
+            return node;
+        }
+        function callExpressionVisitor(node) {
+            if (node.kind === 98 /* SuperKeyword */) {
+                return visitSuperKeyword(/*isExpressionOfCall*/ true);
+            }
+            return visitor(node);
+        }
+        function visitJavaScript(node) {
+            switch (node.kind) {
+                case 116 /* StaticKeyword */:
+                    return undefined; // elide static keyword
+                case 240 /* ClassDeclaration */:
+                    return visitClassDeclaration(node);
+                case 209 /* ClassExpression */:
+                    return visitClassExpression(node);
+                case 151 /* Parameter */:
+                    return visitParameter(node);
+                case 239 /* FunctionDeclaration */:
+                    return visitFunctionDeclaration(node);
+                case 197 /* ArrowFunction */:
+                    return visitArrowFunction(node);
+                case 196 /* FunctionExpression */:
+                    return visitFunctionExpression(node);
+                case 237 /* VariableDeclaration */:
+                    return visitVariableDeclaration(node);
+                case 72 /* Identifier */:
+                    return visitIdentifier(node);
+                case 238 /* VariableDeclarationList */:
+                    return visitVariableDeclarationList(node);
+                case 232 /* SwitchStatement */:
+                    return visitSwitchStatement(node);
+                case 246 /* CaseBlock */:
+                    return visitCaseBlock(node);
+                case 218 /* Block */:
+                    return visitBlock(node, /*isFunctionBody*/ false);
+                case 229 /* BreakStatement */:
+                case 228 /* ContinueStatement */:
+                    return visitBreakOrContinueStatement(node);
+                case 233 /* LabeledStatement */:
+                    return visitLabeledStatement(node);
+                case 223 /* DoStatement */:
+                case 224 /* WhileStatement */:
+                    return visitDoOrWhileStatement(node, /*outermostLabeledStatement*/ undefined);
+                case 225 /* ForStatement */:
+                    return visitForStatement(node, /*outermostLabeledStatement*/ undefined);
+                case 226 /* ForInStatement */:
+                    return visitForInStatement(node, /*outermostLabeledStatement*/ undefined);
+                case 227 /* ForOfStatement */:
+                    return visitForOfStatement(node, /*outermostLabeledStatement*/ undefined);
+                case 221 /* ExpressionStatement */:
+                    return visitExpressionStatement(node);
+                case 188 /* ObjectLiteralExpression */:
+                    return visitObjectLiteralExpression(node);
+                case 274 /* CatchClause */:
+                    return visitCatchClause(node);
+                case 276 /* ShorthandPropertyAssignment */:
+                    return visitShorthandPropertyAssignment(node);
+                case 149 /* ComputedPropertyName */:
+                    return visitComputedPropertyName(node);
+                case 187 /* ArrayLiteralExpression */:
+                    return visitArrayLiteralExpression(node);
+                case 191 /* CallExpression */:
+                    return visitCallExpression(node);
+                case 192 /* NewExpression */:
+                    return visitNewExpression(node);
+                case 195 /* ParenthesizedExpression */:
+                    return visitParenthesizedExpression(node, /*needsDestructuringValue*/ true);
+                case 204 /* BinaryExpression */:
+                    return visitBinaryExpression(node, /*needsDestructuringValue*/ true);
+                case 14 /* NoSubstitutionTemplateLiteral */:
+                case 15 /* TemplateHead */:
+                case 16 /* TemplateMiddle */:
+                case 17 /* TemplateTail */:
+                    return visitTemplateLiteral(node);
+                case 10 /* StringLiteral */:
+                    return visitStringLiteral(node);
+                case 8 /* NumericLiteral */:
+                    return visitNumericLiteral(node);
+                case 193 /* TaggedTemplateExpression */:
+                    return visitTaggedTemplateExpression(node);
+                case 206 /* TemplateExpression */:
+                    return visitTemplateExpression(node);
+                case 207 /* YieldExpression */:
+                    return visitYieldExpression(node);
+                case 208 /* SpreadElement */:
+                    return visitSpreadElement(node);
+                case 98 /* SuperKeyword */:
+                    return visitSuperKeyword(/*isExpressionOfCall*/ false);
+                case 100 /* ThisKeyword */:
+                    return visitThisKeyword(node);
+                case 214 /* MetaProperty */:
+                    return visitMetaProperty(node);
+                case 156 /* MethodDeclaration */:
+                    return visitMethodDeclaration(node);
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                    return visitAccessorDeclaration(node);
+                case 219 /* VariableStatement */:
+                    return visitVariableStatement(node);
+                case 230 /* ReturnStatement */:
+                    return visitReturnStatement(node);
+                default:
+                    return ts.visitEachChild(node, visitor, context);
+            }
+        }
+        function visitSourceFile(node) {
+            var ancestorFacts = enterSubtree(3968 /* SourceFileExcludes */, 64 /* SourceFileIncludes */);
+            var statements = [];
+            startLexicalEnvironment();
+            var statementOffset = ts.addStandardPrologue(statements, node.statements, /*ensureUseStrict*/ false);
+            addCaptureThisForNodeIfNeeded(statements, node);
+            statementOffset = ts.addCustomPrologue(statements, node.statements, statementOffset, visitor);
+            ts.addRange(statements, ts.visitNodes(node.statements, visitor, ts.isStatement, statementOffset));
+            if (taggedTemplateStringDeclarations) {
+                statements.push(ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList(taggedTemplateStringDeclarations)));
+            }
+            ts.addStatementsAfterPrologue(statements, endLexicalEnvironment());
+            exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
+            return ts.updateSourceFileNode(node, ts.setTextRange(ts.createNodeArray(statements), node.statements));
+        }
+        function visitSwitchStatement(node) {
+            if (convertedLoopState !== undefined) {
+                var savedAllowedNonLabeledJumps = convertedLoopState.allowedNonLabeledJumps;
+                // for switch statement allow only non-labeled break
+                convertedLoopState.allowedNonLabeledJumps |= 2 /* Break */;
+                var result = ts.visitEachChild(node, visitor, context);
+                convertedLoopState.allowedNonLabeledJumps = savedAllowedNonLabeledJumps;
+                return result;
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitCaseBlock(node) {
+            var ancestorFacts = enterSubtree(4032 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
+            var updated = ts.visitEachChild(node, visitor, context);
+            exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
+            return updated;
+        }
+        function returnCapturedThis(node) {
+            return ts.setOriginalNode(ts.createReturn(ts.createFileLevelUniqueName("_this")), node);
+        }
+        function visitReturnStatement(node) {
+            if (convertedLoopState) {
+                convertedLoopState.nonLocalJumps |= 8 /* Return */;
+                if (isReturnVoidStatementInConstructorWithCapturedSuper(node)) {
+                    node = returnCapturedThis(node);
+                }
+                return ts.createReturn(ts.createObjectLiteral([
+                    ts.createPropertyAssignment(ts.createIdentifier("value"), node.expression
+                        ? ts.visitNode(node.expression, visitor, ts.isExpression)
+                        : ts.createVoidZero())
+                ]));
+            }
+            else if (isReturnVoidStatementInConstructorWithCapturedSuper(node)) {
+                return returnCapturedThis(node);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitThisKeyword(node) {
+            if (convertedLoopState) {
+                if (hierarchyFacts & 2 /* ArrowFunction */) {
+                    // if the enclosing function is an ArrowFunction then we use the captured 'this' keyword.
+                    convertedLoopState.containsLexicalThis = true;
+                    return node;
+                }
+                return convertedLoopState.thisName || (convertedLoopState.thisName = ts.createUniqueName("this"));
+            }
+            return node;
+        }
+        function visitIdentifier(node) {
+            if (!convertedLoopState) {
+                return node;
+            }
+            if (ts.isGeneratedIdentifier(node)) {
+                return node;
+            }
+            if (node.escapedText !== "arguments" || !resolver.isArgumentsLocalBinding(node)) {
+                return node;
+            }
+            return convertedLoopState.argumentsName || (convertedLoopState.argumentsName = ts.createUniqueName("arguments"));
+        }
+        function visitBreakOrContinueStatement(node) {
+            if (convertedLoopState) {
+                // check if we can emit break/continue as is
+                // it is possible if either
+                //   - break/continue is labeled and label is located inside the converted loop
+                //   - break/continue is non-labeled and located in non-converted loop/switch statement
+                var jump = node.kind === 229 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
+                var canUseBreakOrContinue = (node.label && convertedLoopState.labels && convertedLoopState.labels.get(ts.idText(node.label))) ||
+                    (!node.label && (convertedLoopState.allowedNonLabeledJumps & jump));
+                if (!canUseBreakOrContinue) {
+                    var labelMarker = void 0;
+                    var label = node.label;
+                    if (!label) {
+                        if (node.kind === 229 /* BreakStatement */) {
+                            convertedLoopState.nonLocalJumps |= 2 /* Break */;
+                            labelMarker = "break";
+                        }
+                        else {
+                            convertedLoopState.nonLocalJumps |= 4 /* Continue */;
+                            // note: return value is emitted only to simplify debugging, call to converted loop body does not do any dispatching on it.
+                            labelMarker = "continue";
+                        }
+                    }
+                    else {
+                        if (node.kind === 229 /* BreakStatement */) {
+                            labelMarker = "break-" + label.escapedText;
+                            setLabeledJump(convertedLoopState, /*isBreak*/ true, ts.idText(label), labelMarker);
+                        }
+                        else {
+                            labelMarker = "continue-" + label.escapedText;
+                            setLabeledJump(convertedLoopState, /*isBreak*/ false, ts.idText(label), labelMarker);
+                        }
+                    }
+                    var returnExpression = ts.createLiteral(labelMarker);
+                    if (convertedLoopState.loopOutParameters.length) {
+                        var outParams = convertedLoopState.loopOutParameters;
+                        var expr = void 0;
+                        for (var i = 0; i < outParams.length; i++) {
+                            var copyExpr = copyOutParameter(outParams[i], 1 /* ToOutParameter */);
+                            if (i === 0) {
+                                expr = copyExpr;
+                            }
+                            else {
+                                expr = ts.createBinary(expr, 27 /* CommaToken */, copyExpr);
+                            }
+                        }
+                        returnExpression = ts.createBinary(expr, 27 /* CommaToken */, returnExpression);
+                    }
+                    return ts.createReturn(returnExpression);
+                }
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        /**
+         * Visits a ClassDeclaration and transforms it into a variable statement.
+         *
+         * @param node A ClassDeclaration node.
+         */
+        function visitClassDeclaration(node) {
+            // [source]
+            //      class C { }
+            //
+            // [output]
+            //      var C = (function () {
+            //          function C() {
+            //          }
+            //          return C;
+            //      }());
+            var variable = ts.createVariableDeclaration(ts.getLocalName(node, /*allowComments*/ true), 
+            /*type*/ undefined, transformClassLikeDeclarationToExpression(node));
+            ts.setOriginalNode(variable, node);
+            var statements = [];
+            var statement = ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList([variable]));
+            ts.setOriginalNode(statement, node);
+            ts.setTextRange(statement, node);
+            ts.startOnNewLine(statement);
+            statements.push(statement);
+            // Add an `export default` statement for default exports (for `--target es5 --module es6`)
+            if (ts.hasModifier(node, 1 /* Export */)) {
+                var exportStatement = ts.hasModifier(node, 512 /* Default */)
+                    ? ts.createExportDefault(ts.getLocalName(node))
+                    : ts.createExternalModuleExport(ts.getLocalName(node));
+                ts.setOriginalNode(exportStatement, statement);
+                statements.push(exportStatement);
+            }
+            var emitFlags = ts.getEmitFlags(node);
+            if ((emitFlags & 4194304 /* HasEndOfDeclarationMarker */) === 0) {
+                // Add a DeclarationMarker as a marker for the end of the declaration
+                statements.push(ts.createEndOfDeclarationMarker(node));
+                ts.setEmitFlags(statement, emitFlags | 4194304 /* HasEndOfDeclarationMarker */);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Visits a ClassExpression and transforms it into an expression.
+         *
+         * @param node A ClassExpression node.
+         */
+        function visitClassExpression(node) {
+            // [source]
+            //      C = class { }
+            //
+            // [output]
+            //      C = (function () {
+            //          function class_1() {
+            //          }
+            //          return class_1;
+            //      }())
+            return transformClassLikeDeclarationToExpression(node);
+        }
+        /**
+         * Transforms a ClassExpression or ClassDeclaration into an expression.
+         *
+         * @param node A ClassExpression or ClassDeclaration node.
+         */
+        function transformClassLikeDeclarationToExpression(node) {
+            // [source]
+            //      class C extends D {
+            //          constructor() {}
+            //          method() {}
+            //          get prop() {}
+            //          set prop(v) {}
+            //      }
+            //
+            // [output]
+            //      (function (_super) {
+            //          __extends(C, _super);
+            //          function C() {
+            //          }
+            //          C.prototype.method = function () {}
+            //          Object.defineProperty(C.prototype, "prop", {
+            //              get: function() {},
+            //              set: function() {},
+            //              enumerable: true,
+            //              configurable: true
+            //          });
+            //          return C;
+            //      }(D))
+            if (node.name) {
+                enableSubstitutionsForBlockScopedBindings();
+            }
+            var extendsClauseElement = ts.getClassExtendsHeritageElement(node);
+            var classFunction = ts.createFunctionExpression(
+            /*modifiers*/ undefined, 
+            /*asteriskToken*/ undefined, 
+            /*name*/ undefined, 
+            /*typeParameters*/ undefined, extendsClauseElement ? [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, ts.createFileLevelUniqueName("_super"))] : [], 
+            /*type*/ undefined, transformClassBody(node, extendsClauseElement));
+            // To preserve the behavior of the old emitter, we explicitly indent
+            // the body of the function here if it was requested in an earlier
+            // transformation.
+            ts.setEmitFlags(classFunction, (ts.getEmitFlags(node) & 65536 /* Indented */) | 524288 /* ReuseTempVariableScope */);
+            // "inner" and "outer" below are added purely to preserve source map locations from
+            // the old emitter
+            var inner = ts.createPartiallyEmittedExpression(classFunction);
+            inner.end = node.end;
+            ts.setEmitFlags(inner, 1536 /* NoComments */);
+            var outer = ts.createPartiallyEmittedExpression(inner);
+            outer.end = ts.skipTrivia(currentText, node.pos);
+            ts.setEmitFlags(outer, 1536 /* NoComments */);
+            var result = ts.createParen(ts.createCall(outer, 
+            /*typeArguments*/ undefined, extendsClauseElement
+                ? [ts.visitNode(extendsClauseElement.expression, visitor, ts.isExpression)]
+                : []));
+            ts.addSyntheticLeadingComment(result, 3 /* MultiLineCommentTrivia */, "* @class ");
+            return result;
+        }
+        /**
+         * Transforms a ClassExpression or ClassDeclaration into a function body.
+         *
+         * @param node A ClassExpression or ClassDeclaration node.
+         * @param extendsClauseElement The expression for the class `extends` clause.
+         */
+        function transformClassBody(node, extendsClauseElement) {
+            var statements = [];
+            startLexicalEnvironment();
+            addExtendsHelperIfNeeded(statements, node, extendsClauseElement);
+            addConstructor(statements, node, extendsClauseElement);
+            addClassMembers(statements, node);
+            // Create a synthetic text range for the return statement.
+            var closingBraceLocation = ts.createTokenRange(ts.skipTrivia(currentText, node.members.end), 19 /* CloseBraceToken */);
+            var localName = ts.getInternalName(node);
+            // The following partially-emitted expression exists purely to align our sourcemap
+            // emit with the original emitter.
+            var outer = ts.createPartiallyEmittedExpression(localName);
+            outer.end = closingBraceLocation.end;
+            ts.setEmitFlags(outer, 1536 /* NoComments */);
+            var statement = ts.createReturn(outer);
+            statement.pos = closingBraceLocation.pos;
+            ts.setEmitFlags(statement, 1536 /* NoComments */ | 384 /* NoTokenSourceMaps */);
+            statements.push(statement);
+            ts.addStatementsAfterPrologue(statements, endLexicalEnvironment());
+            var block = ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), /*location*/ node.members), /*multiLine*/ true);
+            ts.setEmitFlags(block, 1536 /* NoComments */);
+            return block;
+        }
+        /**
+         * Adds a call to the `__extends` helper if needed for a class.
+         *
+         * @param statements The statements of the class body function.
+         * @param node The ClassExpression or ClassDeclaration node.
+         * @param extendsClauseElement The expression for the class `extends` clause.
+         */
+        function addExtendsHelperIfNeeded(statements, node, extendsClauseElement) {
+            if (extendsClauseElement) {
+                statements.push(ts.setTextRange(ts.createExpressionStatement(createExtendsHelper(context, ts.getInternalName(node))), 
+                /*location*/ extendsClauseElement));
+            }
+        }
+        /**
+         * Adds the constructor of the class to a class body function.
+         *
+         * @param statements The statements of the class body function.
+         * @param node The ClassExpression or ClassDeclaration node.
+         * @param extendsClauseElement The expression for the class `extends` clause.
+         */
+        function addConstructor(statements, node, extendsClauseElement) {
+            var savedConvertedLoopState = convertedLoopState;
+            convertedLoopState = undefined;
+            var ancestorFacts = enterSubtree(16278 /* ConstructorExcludes */, 73 /* ConstructorIncludes */);
+            var constructor = ts.getFirstConstructorWithBody(node);
+            var hasSynthesizedSuper = hasSynthesizedDefaultSuperCall(constructor, extendsClauseElement !== undefined);
+            var constructorFunction = ts.createFunctionDeclaration(
+            /*decorators*/ undefined, 
+            /*modifiers*/ undefined, 
+            /*asteriskToken*/ undefined, ts.getInternalName(node), 
+            /*typeParameters*/ undefined, transformConstructorParameters(constructor, hasSynthesizedSuper), 
+            /*type*/ undefined, transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper));
+            ts.setTextRange(constructorFunction, constructor || node);
+            if (extendsClauseElement) {
+                ts.setEmitFlags(constructorFunction, 8 /* CapturesThis */);
+            }
+            statements.push(constructorFunction);
+            exitSubtree(ancestorFacts, 49152 /* PropagateNewTargetMask */, 0 /* None */);
+            convertedLoopState = savedConvertedLoopState;
+        }
+        /**
+         * Transforms the parameters of the constructor declaration of a class.
+         *
+         * @param constructor The constructor for the class.
+         * @param hasSynthesizedSuper A value indicating whether the constructor starts with a
+         *                            synthesized `super` call.
+         */
+        function transformConstructorParameters(constructor, hasSynthesizedSuper) {
+            // If the TypeScript transformer needed to synthesize a constructor for property
+            // initializers, it would have also added a synthetic `...args` parameter and
+            // `super` call.
+            // If this is the case, we do not include the synthetic `...args` parameter and
+            // will instead use the `arguments` object in ES5/3.
+            return ts.visitParameterList(constructor && !hasSynthesizedSuper ? constructor.parameters : undefined, visitor, context)
+                || [];
+        }
+        /**
+         * Transforms the body of a constructor declaration of a class.
+         *
+         * @param constructor The constructor for the class.
+         * @param node The node which contains the constructor.
+         * @param extendsClauseElement The expression for the class `extends` clause.
+         * @param hasSynthesizedSuper A value indicating whether the constructor starts with a
+         *                            synthesized `super` call.
+         */
+        function transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper) {
+            var statements = [];
+            resumeLexicalEnvironment();
+            var statementOffset = -1;
+            if (hasSynthesizedSuper) {
+                // If a super call has already been synthesized,
+                // we're going to assume that we should just transform everything after that.
+                // The assumption is that no prior step in the pipeline has added any prologue directives.
+                statementOffset = 0;
+            }
+            else if (constructor) {
+                statementOffset = ts.addStandardPrologue(statements, constructor.body.statements, /*ensureUseStrict*/ false);
+            }
+            if (constructor) {
+                addDefaultValueAssignmentsIfNeeded(statements, constructor);
+                addRestParameterIfNeeded(statements, constructor, hasSynthesizedSuper);
+                if (!hasSynthesizedSuper) {
+                    // If no super call has been synthesized, emit custom prologue directives.
+                    statementOffset = ts.addCustomPrologue(statements, constructor.body.statements, statementOffset, visitor);
+                }
+                ts.Debug.assert(statementOffset >= 0, "statementOffset not initialized correctly!");
+            }
+            // determine whether the class is known syntactically to be a derived class (e.g. a
+            // class that extends a value that is not syntactically known to be `null`).
+            var isDerivedClass = !!extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 96 /* NullKeyword */;
+            var superCaptureStatus = declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, constructor, isDerivedClass, hasSynthesizedSuper, statementOffset);
+            // The last statement expression was replaced. Skip it.
+            if (superCaptureStatus === 1 /* ReplaceSuperCapture */ || superCaptureStatus === 2 /* ReplaceWithReturn */) {
+                statementOffset++;
+            }
+            if (constructor) {
+                if (superCaptureStatus === 1 /* ReplaceSuperCapture */) {
+                    hierarchyFacts |= 4096 /* ConstructorWithCapturedSuper */;
+                }
+                ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, /*start*/ statementOffset));
+            }
+            // Return `_this` unless we're sure enough that it would be pointless to add a return statement.
+            // If there's a constructor that we can tell returns in enough places, then we *do not* want to add a return.
+            if (isDerivedClass
+                && superCaptureStatus !== 2 /* ReplaceWithReturn */
+                && !(constructor && isSufficientlyCoveredByReturnStatements(constructor.body))) {
+                statements.push(ts.createReturn(ts.createFileLevelUniqueName("_this")));
+            }
+            ts.addStatementsAfterPrologue(statements, endLexicalEnvironment());
+            if (constructor) {
+                prependCaptureNewTargetIfNeeded(statements, constructor, /*copyOnWrite*/ false);
+            }
+            var block = ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), 
+            /*location*/ constructor ? constructor.body.statements : node.members), 
+            /*multiLine*/ true);
+            ts.setTextRange(block, constructor ? constructor.body : node);
+            if (!constructor) {
+                ts.setEmitFlags(block, 1536 /* NoComments */);
+            }
+            return block;
+        }
+        /**
+         * We want to try to avoid emitting a return statement in certain cases if a user already returned something.
+         * It would generate obviously dead code, so we'll try to make things a little bit prettier
+         * by doing a minimal check on whether some common patterns always explicitly return.
+         */
+        function isSufficientlyCoveredByReturnStatements(statement) {
+            // A return statement is considered covered.
+            if (statement.kind === 230 /* ReturnStatement */) {
+                return true;
+            }
+            // An if-statement with two covered branches is covered.
+            else if (statement.kind === 222 /* IfStatement */) {
+                var ifStatement = statement;
+                if (ifStatement.elseStatement) {
+                    return isSufficientlyCoveredByReturnStatements(ifStatement.thenStatement) &&
+                        isSufficientlyCoveredByReturnStatements(ifStatement.elseStatement);
+                }
+            }
+            // A block is covered if it has a last statement which is covered.
+            else if (statement.kind === 218 /* Block */) {
+                var lastStatement = ts.lastOrUndefined(statement.statements);
+                if (lastStatement && isSufficientlyCoveredByReturnStatements(lastStatement)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        /**
+         * Declares a `_this` variable for derived classes and for when arrow functions capture `this`.
+         *
+         * @returns The new statement offset into the `statements` array.
+         */
+        function declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, ctor, isDerivedClass, hasSynthesizedSuper, statementOffset) {
+            // If this isn't a derived class, just capture 'this' for arrow functions if necessary.
+            if (!isDerivedClass) {
+                if (ctor) {
+                    addCaptureThisForNodeIfNeeded(statements, ctor);
+                }
+                return 0 /* NoReplacement */;
+            }
+            // We must be here because the user didn't write a constructor
+            // but we needed to call 'super(...args)' anyway as per 14.5.14 of the ES2016 spec.
+            // If that's the case we can just immediately return the result of a 'super()' call.
+            if (!ctor) {
+                statements.push(ts.createReturn(createDefaultSuperCallOrThis()));
+                return 2 /* ReplaceWithReturn */;
+            }
+            // The constructor exists, but it and the 'super()' call it contains were generated
+            // for something like property initializers.
+            // Create a captured '_this' variable and assume it will subsequently be used.
+            if (hasSynthesizedSuper) {
+                captureThisForNode(statements, ctor, createDefaultSuperCallOrThis());
+                enableSubstitutionsForCapturedThis();
+                return 1 /* ReplaceSuperCapture */;
+            }
+            // Most of the time, a 'super' call will be the first real statement in a constructor body.
+            // In these cases, we'd like to transform these into a *single* statement instead of a declaration
+            // followed by an assignment statement for '_this'. For instance, if we emitted without an initializer,
+            // we'd get:
+            //
+            //      var _this;
+            //      _this = _super.call(...) || this;
+            //
+            // instead of
+            //
+            //      var _this = _super.call(...) || this;
+            //
+            // Additionally, if the 'super()' call is the last statement, we should just avoid capturing
+            // entirely and immediately return the result like so:
+            //
+            //      return _super.call(...) || this;
+            //
+            var firstStatement;
+            var superCallExpression;
+            var ctorStatements = ctor.body.statements;
+            if (statementOffset < ctorStatements.length) {
+                firstStatement = ctorStatements[statementOffset];
+                if (firstStatement.kind === 221 /* ExpressionStatement */ && ts.isSuperCall(firstStatement.expression)) {
+                    superCallExpression = visitImmediateSuperCallInBody(firstStatement.expression);
+                }
+            }
+            // Return the result if we have an immediate super() call on the last statement,
+            // but only if the constructor itself doesn't use 'this' elsewhere.
+            if (superCallExpression
+                && statementOffset === ctorStatements.length - 1
+                && !(ctor.transformFlags & (8192 /* ContainsLexicalThis */ | 16384 /* ContainsCapturedLexicalThis */))) {
+                var returnStatement = ts.createReturn(superCallExpression);
+                if (superCallExpression.kind !== 204 /* BinaryExpression */
+                    || superCallExpression.left.kind !== 191 /* CallExpression */) {
+                    ts.Debug.fail("Assumed generated super call would have form 'super.call(...) || this'.");
+                }
+                // Shift comments from the original super call to the return statement.
+                ts.setCommentRange(returnStatement, ts.getCommentRange(ts.setEmitFlags(superCallExpression.left, 1536 /* NoComments */)));
+                statements.push(returnStatement);
+                return 2 /* ReplaceWithReturn */;
+            }
+            // Perform the capture.
+            captureThisForNode(statements, ctor, superCallExpression || createActualThis());
+            // If we're actually replacing the original statement, we need to signal this to the caller.
+            if (superCallExpression) {
+                return 1 /* ReplaceSuperCapture */;
+            }
+            return 0 /* NoReplacement */;
+        }
+        function createActualThis() {
+            return ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */);
+        }
+        function createDefaultSuperCallOrThis() {
+            return ts.createLogicalOr(ts.createLogicalAnd(ts.createStrictInequality(ts.createFileLevelUniqueName("_super"), ts.createNull()), ts.createFunctionApply(ts.createFileLevelUniqueName("_super"), createActualThis(), ts.createIdentifier("arguments"))), createActualThis());
+        }
+        /**
+         * Visits a parameter declaration.
+         *
+         * @param node A ParameterDeclaration node.
+         */
+        function visitParameter(node) {
+            if (node.dotDotDotToken) {
+                // rest parameters are elided
+                return undefined;
+            }
+            else if (ts.isBindingPattern(node.name)) {
+                // Binding patterns are converted into a generated name and are
+                // evaluated inside the function body.
+                return ts.setOriginalNode(ts.setTextRange(ts.createParameter(
+                /*decorators*/ undefined, 
+                /*modifiers*/ undefined, 
+                /*dotDotDotToken*/ undefined, ts.getGeneratedNameForNode(node), 
+                /*questionToken*/ undefined, 
+                /*type*/ undefined, 
+                /*initializer*/ undefined), 
+                /*location*/ node), 
+                /*original*/ node);
+            }
+            else if (node.initializer) {
+                // Initializers are elided
+                return ts.setOriginalNode(ts.setTextRange(ts.createParameter(
+                /*decorators*/ undefined, 
+                /*modifiers*/ undefined, 
+                /*dotDotDotToken*/ undefined, node.name, 
+                /*questionToken*/ undefined, 
+                /*type*/ undefined, 
+                /*initializer*/ undefined), 
+                /*location*/ node), 
+                /*original*/ node);
+            }
+            else {
+                return node;
+            }
+        }
+        /**
+         * Gets a value indicating whether we need to add default value assignments for a
+         * function-like node.
+         *
+         * @param node A function-like node.
+         */
+        function shouldAddDefaultValueAssignments(node) {
+            return (node.transformFlags & 65536 /* ContainsDefaultValueAssignments */) !== 0;
+        }
+        /**
+         * Adds statements to the body of a function-like node if it contains parameters with
+         * binding patterns or initializers.
+         *
+         * @param statements The statements for the new function body.
+         * @param node A function-like node.
+         */
+        function addDefaultValueAssignmentsIfNeeded(statements, node) {
+            if (!shouldAddDefaultValueAssignments(node)) {
+                return;
+            }
+            for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
+                var parameter = _a[_i];
+                var name = parameter.name, initializer = parameter.initializer, dotDotDotToken = parameter.dotDotDotToken;
+                // A rest parameter cannot have a binding pattern or an initializer,
+                // so let's just ignore it.
+                if (dotDotDotToken) {
+                    continue;
+                }
+                if (ts.isBindingPattern(name)) {
+                    addDefaultValueAssignmentForBindingPattern(statements, parameter, name, initializer);
+                }
+                else if (initializer) {
+                    addDefaultValueAssignmentForInitializer(statements, parameter, name, initializer);
+                }
+            }
+        }
+        /**
+         * Adds statements to the body of a function-like node for parameters with binding patterns
+         *
+         * @param statements The statements for the new function body.
+         * @param parameter The parameter for the function.
+         * @param name The name of the parameter.
+         * @param initializer The initializer for the parameter.
+         */
+        function addDefaultValueAssignmentForBindingPattern(statements, parameter, name, initializer) {
+            var temp = ts.getGeneratedNameForNode(parameter);
+            // In cases where a binding pattern is simply '[]' or '{}',
+            // we usually don't want to emit a var declaration; however, in the presence
+            // of an initializer, we must emit that expression to preserve side effects.
+            if (name.elements.length > 0) {
+                statements.push(ts.setEmitFlags(ts.createVariableStatement(
+                /*modifiers*/ undefined, ts.createVariableDeclarationList(ts.flattenDestructuringBinding(parameter, visitor, context, 0 /* All */, temp))), 1048576 /* CustomPrologue */));
+            }
+            else if (initializer) {
+                statements.push(ts.setEmitFlags(ts.createExpressionStatement(ts.createAssignment(temp, ts.visitNode(initializer, visitor, ts.isExpression))), 1048576 /* CustomPrologue */));
+            }
+        }
+        /**
+         * Adds statements to the body of a function-like node for parameters with initializers.
+         *
+         * @param statements The statements for the new function body.
+         * @param parameter The parameter for the function.
+         * @param name The name of the parameter.
+         * @param initializer The initializer for the parameter.
+         */
+        function addDefaultValueAssignmentForInitializer(statements, parameter, name, initializer) {
+            initializer = ts.visitNode(initializer, visitor, ts.isExpression);
+            var statement = ts.createIf(ts.createTypeCheck(ts.getSynthesizedClone(name), "undefined"), ts.setEmitFlags(ts.setTextRange(ts.createBlock([
+                ts.createExpressionStatement(ts.setEmitFlags(ts.setTextRange(ts.createAssignment(ts.setEmitFlags(ts.getMutableClone(name), 48 /* NoSourceMap */), ts.setEmitFlags(initializer, 48 /* NoSourceMap */ | ts.getEmitFlags(initializer) | 1536 /* NoComments */)), parameter), 1536 /* NoComments */))
+            ]), parameter), 1 /* SingleLine */ | 32 /* NoTrailingSourceMap */ | 384 /* NoTokenSourceMaps */ | 1536 /* NoComments */));
+            ts.startOnNewLine(statement);
+            ts.setTextRange(statement, parameter);
+            ts.setEmitFlags(statement, 384 /* NoTokenSourceMaps */ | 32 /* NoTrailingSourceMap */ | 1048576 /* CustomPrologue */ | 1536 /* NoComments */);
+            statements.push(statement);
+        }
+        /**
+         * Gets a value indicating whether we need to add statements to handle a rest parameter.
+         *
+         * @param node A ParameterDeclaration node.
+         * @param inConstructorWithSynthesizedSuper A value indicating whether the parameter is
+         *                                          part of a constructor declaration with a
+         *                                          synthesized call to `super`
+         */
+        function shouldAddRestParameter(node, inConstructorWithSynthesizedSuper) {
+            return !!(node && node.dotDotDotToken && !inConstructorWithSynthesizedSuper);
+        }
+        /**
+         * Adds statements to the body of a function-like node if it contains a rest parameter.
+         *
+         * @param statements The statements for the new function body.
+         * @param node A function-like node.
+         * @param inConstructorWithSynthesizedSuper A value indicating whether the parameter is
+         *                                          part of a constructor declaration with a
+         *                                          synthesized call to `super`
+         */
+        function addRestParameterIfNeeded(statements, node, inConstructorWithSynthesizedSuper) {
+            var parameter = ts.lastOrUndefined(node.parameters);
+            if (!shouldAddRestParameter(parameter, inConstructorWithSynthesizedSuper)) {
+                return;
+            }
+            // `declarationName` is the name of the local declaration for the parameter.
+            var declarationName = parameter.name.kind === 72 /* Identifier */ ? ts.getMutableClone(parameter.name) : ts.createTempVariable(/*recordTempVariable*/ undefined);
+            ts.setEmitFlags(declarationName, 48 /* NoSourceMap */);
+            // `expressionName` is the name of the parameter used in expressions.
+            var expressionName = parameter.name.kind === 72 /* Identifier */ ? ts.getSynthesizedClone(parameter.name) : declarationName;
+            var restIndex = node.parameters.length - 1;
+            var temp = ts.createLoopVariable();
+            // var param = [];
+            statements.push(ts.setEmitFlags(ts.setTextRange(ts.createVariableStatement(
+            /*modifiers*/ undefined, ts.createVariableDeclarationList([
+                ts.createVariableDeclaration(declarationName, 
+                /*type*/ undefined, ts.createArrayLiteral([]))
+            ])), 
+            /*location*/ parameter), 1048576 /* CustomPrologue */));
+            // for (var _i = restIndex; _i < arguments.length; _i++) {
+            //   param[_i - restIndex] = arguments[_i];
+            // }
+            var forStatement = ts.createFor(ts.setTextRange(ts.createVariableDeclarationList([
+                ts.createVariableDeclaration(temp, /*type*/ undefined, ts.createLiteral(restIndex))
+            ]), parameter), ts.setTextRange(ts.createLessThan(temp, ts.createPropertyAccess(ts.createIdentifier("arguments"), "length")), parameter), ts.setTextRange(ts.createPostfixIncrement(temp), parameter), ts.createBlock([
+                ts.startOnNewLine(ts.setTextRange(ts.createExpressionStatement(ts.createAssignment(ts.createElementAccess(expressionName, restIndex === 0
+                    ? temp
+                    : ts.createSubtract(temp, ts.createLiteral(restIndex))), ts.createElementAccess(ts.createIdentifier("arguments"), temp))), 
+                /*location*/ parameter))
+            ]));
+            ts.setEmitFlags(forStatement, 1048576 /* CustomPrologue */);
+            ts.startOnNewLine(forStatement);
+            statements.push(forStatement);
+            if (parameter.name.kind !== 72 /* Identifier */) {
+                // do the actual destructuring of the rest parameter if necessary
+                statements.push(ts.setEmitFlags(ts.setTextRange(ts.createVariableStatement(
+                /*modifiers*/ undefined, ts.createVariableDeclarationList(ts.flattenDestructuringBinding(parameter, visitor, context, 0 /* All */, expressionName))), parameter), 1048576 /* CustomPrologue */));
+            }
+        }
+        /**
+         * Adds a statement to capture the `this` of a function declaration if it is needed.
+         *
+         * @param statements The statements for the new function body.
+         * @param node A node.
+         */
+        function addCaptureThisForNodeIfNeeded(statements, node) {
+            if (node.transformFlags & 16384 /* ContainsCapturedLexicalThis */ && node.kind !== 197 /* ArrowFunction */) {
+                captureThisForNode(statements, node, ts.createThis());
+            }
+        }
+        function captureThisForNode(statements, node, initializer) {
+            enableSubstitutionsForCapturedThis();
+            var captureThisStatement = ts.createVariableStatement(
+            /*modifiers*/ undefined, ts.createVariableDeclarationList([
+                ts.createVariableDeclaration(ts.createFileLevelUniqueName("_this"), 
+                /*type*/ undefined, initializer)
+            ]));
+            ts.setEmitFlags(captureThisStatement, 1536 /* NoComments */ | 1048576 /* CustomPrologue */);
+            ts.setSourceMapRange(captureThisStatement, node);
+            statements.push(captureThisStatement);
+        }
+        function prependCaptureNewTargetIfNeeded(statements, node, copyOnWrite) {
+            if (hierarchyFacts & 16384 /* NewTarget */) {
+                var newTarget = void 0;
+                switch (node.kind) {
+                    case 197 /* ArrowFunction */:
+                        return statements;
+                    case 156 /* MethodDeclaration */:
+                    case 158 /* GetAccessor */:
+                    case 159 /* SetAccessor */:
+                        // Methods and accessors cannot be constructors, so 'new.target' will
+                        // always return 'undefined'.
+                        newTarget = ts.createVoidZero();
+                        break;
+                    case 157 /* Constructor */:
+                        // Class constructors can only be called with `new`, so `this.constructor`
+                        // should be relatively safe to use.
+                        newTarget = ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), "constructor");
+                        break;
+                    case 239 /* FunctionDeclaration */:
+                    case 196 /* FunctionExpression */:
+                        // Functions can be called or constructed, and may have a `this` due to
+                        // being a member or when calling an imported function via `other_1.f()`.
+                        newTarget = ts.createConditional(ts.createLogicalAnd(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), ts.createBinary(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), 94 /* InstanceOfKeyword */, ts.getLocalName(node))), ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), "constructor"), ts.createVoidZero());
+                        break;
+                    default:
+                        return ts.Debug.failBadSyntaxKind(node);
+                }
+                var captureNewTargetStatement = ts.createVariableStatement(
+                /*modifiers*/ undefined, ts.createVariableDeclarationList([
+                    ts.createVariableDeclaration(ts.createFileLevelUniqueName("_newTarget"), 
+                    /*type*/ undefined, newTarget)
+                ]));
+                if (copyOnWrite) {
+                    return [captureNewTargetStatement].concat(statements);
+                }
+                statements.unshift(captureNewTargetStatement);
+            }
+            return statements;
+        }
+        /**
+         * Adds statements to the class body function for a class to define the members of the
+         * class.
+         *
+         * @param statements The statements for the class body function.
+         * @param node The ClassExpression or ClassDeclaration node.
+         */
+        function addClassMembers(statements, node) {
+            for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
+                var member = _a[_i];
+                switch (member.kind) {
+                    case 217 /* SemicolonClassElement */:
+                        statements.push(transformSemicolonClassElementToStatement(member));
+                        break;
+                    case 156 /* MethodDeclaration */:
+                        statements.push(transformClassMethodDeclarationToStatement(getClassMemberPrefix(node, member), member, node));
+                        break;
+                    case 158 /* GetAccessor */:
+                    case 159 /* SetAccessor */:
+                        var accessors = ts.getAllAccessorDeclarations(node.members, member);
+                        if (member === accessors.firstAccessor) {
+                            statements.push(transformAccessorsToStatement(getClassMemberPrefix(node, member), accessors, node));
+                        }
+                        break;
+                    case 157 /* Constructor */:
+                        // Constructors are handled in visitClassExpression/visitClassDeclaration
+                        break;
+                    default:
+                        ts.Debug.failBadSyntaxKind(node);
+                        break;
+                }
+            }
+        }
+        /**
+         * Transforms a SemicolonClassElement into a statement for a class body function.
+         *
+         * @param member The SemicolonClassElement node.
+         */
+        function transformSemicolonClassElementToStatement(member) {
+            return ts.setTextRange(ts.createEmptyStatement(), member);
+        }
+        /**
+         * Transforms a MethodDeclaration into a statement for a class body function.
+         *
+         * @param receiver The receiver for the member.
+         * @param member The MethodDeclaration node.
+         */
+        function transformClassMethodDeclarationToStatement(receiver, member, container) {
+            var ancestorFacts = enterSubtree(0 /* None */, 0 /* None */);
+            var commentRange = ts.getCommentRange(member);
+            var sourceMapRange = ts.getSourceMapRange(member);
+            var memberName = ts.createMemberAccessForPropertyName(receiver, ts.visitNode(member.name, visitor, ts.isPropertyName), /*location*/ member.name);
+            var memberFunction = transformFunctionLikeToExpression(member, /*location*/ member, /*name*/ undefined, container);
+            ts.setEmitFlags(memberFunction, 1536 /* NoComments */);
+            ts.setSourceMapRange(memberFunction, sourceMapRange);
+            var statement = ts.setTextRange(ts.createExpressionStatement(ts.createAssignment(memberName, memberFunction)), 
+            /*location*/ member);
+            ts.setOriginalNode(statement, member);
+            ts.setCommentRange(statement, commentRange);
+            // The location for the statement is used to emit comments only.
+            // No source map should be emitted for this statement to align with the
+            // old emitter.
+            ts.setEmitFlags(statement, 48 /* NoSourceMap */);
+            exitSubtree(ancestorFacts, 49152 /* PropagateNewTargetMask */, hierarchyFacts & 49152 /* PropagateNewTargetMask */ ? 16384 /* NewTarget */ : 0 /* None */);
+            return statement;
+        }
+        /**
+         * Transforms a set of related of get/set accessors into a statement for a class body function.
+         *
+         * @param receiver The receiver for the member.
+         * @param accessors The set of related get/set accessors.
+         */
+        function transformAccessorsToStatement(receiver, accessors, container) {
+            var statement = ts.createExpressionStatement(transformAccessorsToExpression(receiver, accessors, container, /*startsOnNewLine*/ false));
+            // The location for the statement is used to emit source maps only.
+            // No comments should be emitted for this statement to align with the
+            // old emitter.
+            ts.setEmitFlags(statement, 1536 /* NoComments */);
+            ts.setSourceMapRange(statement, ts.getSourceMapRange(accessors.firstAccessor));
+            return statement;
+        }
+        /**
+         * Transforms a set of related get/set accessors into an expression for either a class
+         * body function or an ObjectLiteralExpression with computed properties.
+         *
+         * @param receiver The receiver for the member.
+         */
+        function transformAccessorsToExpression(receiver, _a, container, startsOnNewLine) {
+            var firstAccessor = _a.firstAccessor, getAccessor = _a.getAccessor, setAccessor = _a.setAccessor;
+            var ancestorFacts = enterSubtree(0 /* None */, 0 /* None */);
+            // To align with source maps in the old emitter, the receiver and property name
+            // arguments are both mapped contiguously to the accessor name.
+            var target = ts.getMutableClone(receiver);
+            ts.setEmitFlags(target, 1536 /* NoComments */ | 32 /* NoTrailingSourceMap */);
+            ts.setSourceMapRange(target, firstAccessor.name); // TODO: GH#18217
+            var propertyName = ts.createExpressionForPropertyName(ts.visitNode(firstAccessor.name, visitor, ts.isPropertyName));
+            ts.setEmitFlags(propertyName, 1536 /* NoComments */ | 16 /* NoLeadingSourceMap */);
+            ts.setSourceMapRange(propertyName, firstAccessor.name);
+            var properties = [];
+            if (getAccessor) {
+                var getterFunction = transformFunctionLikeToExpression(getAccessor, /*location*/ undefined, /*name*/ undefined, container);
+                ts.setSourceMapRange(getterFunction, ts.getSourceMapRange(getAccessor));
+                ts.setEmitFlags(getterFunction, 512 /* NoLeadingComments */);
+                var getter = ts.createPropertyAssignment("get", getterFunction);
+                ts.setCommentRange(getter, ts.getCommentRange(getAccessor));
+                properties.push(getter);
+            }
+            if (setAccessor) {
+                var setterFunction = transformFunctionLikeToExpression(setAccessor, /*location*/ undefined, /*name*/ undefined, container);
+                ts.setSourceMapRange(setterFunction, ts.getSourceMapRange(setAccessor));
+                ts.setEmitFlags(setterFunction, 512 /* NoLeadingComments */);
+                var setter = ts.createPropertyAssignment("set", setterFunction);
+                ts.setCommentRange(setter, ts.getCommentRange(setAccessor));
+                properties.push(setter);
+            }
+            properties.push(ts.createPropertyAssignment("enumerable", ts.createTrue()), ts.createPropertyAssignment("configurable", ts.createTrue()));
+            var call = ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), 
+            /*typeArguments*/ undefined, [
+                target,
+                propertyName,
+                ts.createObjectLiteral(properties, /*multiLine*/ true)
+            ]);
+            if (startsOnNewLine) {
+                ts.startOnNewLine(call);
+            }
+            exitSubtree(ancestorFacts, 49152 /* PropagateNewTargetMask */, hierarchyFacts & 49152 /* PropagateNewTargetMask */ ? 16384 /* NewTarget */ : 0 /* None */);
+            return call;
+        }
+        /**
+         * Visits an ArrowFunction and transforms it into a FunctionExpression.
+         *
+         * @param node An ArrowFunction node.
+         */
+        function visitArrowFunction(node) {
+            if (node.transformFlags & 8192 /* ContainsLexicalThis */) {
+                enableSubstitutionsForCapturedThis();
+            }
+            var savedConvertedLoopState = convertedLoopState;
+            convertedLoopState = undefined;
+            var ancestorFacts = enterSubtree(16256 /* ArrowFunctionExcludes */, 66 /* ArrowFunctionIncludes */);
+            var func = ts.createFunctionExpression(
+            /*modifiers*/ undefined, 
+            /*asteriskToken*/ undefined, 
+            /*name*/ undefined, 
+            /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), 
+            /*type*/ undefined, transformFunctionBody(node));
+            ts.setTextRange(func, node);
+            ts.setOriginalNode(func, node);
+            ts.setEmitFlags(func, 8 /* CapturesThis */);
+            exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
+            convertedLoopState = savedConvertedLoopState;
+            return func;
+        }
+        /**
+         * Visits a FunctionExpression node.
+         *
+         * @param node a FunctionExpression node.
+         */
+        function visitFunctionExpression(node) {
+            var ancestorFacts = ts.getEmitFlags(node) & 262144 /* AsyncFunctionBody */
+                ? enterSubtree(16278 /* AsyncFunctionBodyExcludes */, 69 /* AsyncFunctionBodyIncludes */)
+                : enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+            var savedConvertedLoopState = convertedLoopState;
+            convertedLoopState = undefined;
+            var parameters = ts.visitParameterList(node.parameters, visitor, context);
+            var body = node.transformFlags & 64 /* ES2015 */
+                ? transformFunctionBody(node)
+                : visitFunctionBodyDownLevel(node);
+            var name = hierarchyFacts & 16384 /* NewTarget */
+                ? ts.getLocalName(node)
+                : node.name;
+            exitSubtree(ancestorFacts, 49152 /* PropagateNewTargetMask */, 0 /* None */);
+            convertedLoopState = savedConvertedLoopState;
+            return ts.updateFunctionExpression(node, 
+            /*modifiers*/ undefined, node.asteriskToken, name, 
+            /*typeParameters*/ undefined, parameters, 
+            /*type*/ undefined, body);
+        }
+        /**
+         * Visits a FunctionDeclaration node.
+         *
+         * @param node a FunctionDeclaration node.
+         */
+        function visitFunctionDeclaration(node) {
+            var savedConvertedLoopState = convertedLoopState;
+            convertedLoopState = undefined;
+            var ancestorFacts = enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+            var parameters = ts.visitParameterList(node.parameters, visitor, context);
+            var body = node.transformFlags & 64 /* ES2015 */
+                ? transformFunctionBody(node)
+                : visitFunctionBodyDownLevel(node);
+            var name = hierarchyFacts & 16384 /* NewTarget */
+                ? ts.getLocalName(node)
+                : node.name;
+            exitSubtree(ancestorFacts, 49152 /* PropagateNewTargetMask */, 0 /* None */);
+            convertedLoopState = savedConvertedLoopState;
+            return ts.updateFunctionDeclaration(node, 
+            /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, name, 
+            /*typeParameters*/ undefined, parameters, 
+            /*type*/ undefined, body);
+        }
+        /**
+         * Transforms a function-like node into a FunctionExpression.
+         *
+         * @param node The function-like node to transform.
+         * @param location The source-map location for the new FunctionExpression.
+         * @param name The name of the new FunctionExpression.
+         */
+        function transformFunctionLikeToExpression(node, location, name, container) {
+            var savedConvertedLoopState = convertedLoopState;
+            convertedLoopState = undefined;
+            var ancestorFacts = container && ts.isClassLike(container) && !ts.hasModifier(node, 32 /* Static */)
+                ? enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */ | 8 /* NonStaticClassElement */)
+                : enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+            var parameters = ts.visitParameterList(node.parameters, visitor, context);
+            var body = transformFunctionBody(node);
+            if (hierarchyFacts & 16384 /* NewTarget */ && !name && (node.kind === 239 /* FunctionDeclaration */ || node.kind === 196 /* FunctionExpression */)) {
+                name = ts.getGeneratedNameForNode(node);
+            }
+            exitSubtree(ancestorFacts, 49152 /* PropagateNewTargetMask */, 0 /* None */);
+            convertedLoopState = savedConvertedLoopState;
+            return ts.setOriginalNode(ts.setTextRange(ts.createFunctionExpression(
+            /*modifiers*/ undefined, node.asteriskToken, name, 
+            /*typeParameters*/ undefined, parameters, 
+            /*type*/ undefined, body), location), 
+            /*original*/ node);
+        }
+        /**
+         * Transforms the body of a function-like node.
+         *
+         * @param node A function-like node.
+         */
+        function transformFunctionBody(node) {
+            var multiLine = false; // indicates whether the block *must* be emitted as multiple lines
+            var singleLine = false; // indicates whether the block *may* be emitted as a single line
+            var statementsLocation;
+            var closeBraceLocation;
+            var leadingStatements = [];
+            var statements = [];
+            var body = node.body;
+            var statementOffset;
+            resumeLexicalEnvironment();
+            if (ts.isBlock(body)) {
+                // ensureUseStrict is false because no new prologue-directive should be added.
+                // addStandardPrologue will put already-existing directives at the beginning of the target statement-array
+                statementOffset = ts.addStandardPrologue(leadingStatements, body.statements, /*ensureUseStrict*/ false);
+            }
+            addCaptureThisForNodeIfNeeded(leadingStatements, node);
+            addDefaultValueAssignmentsIfNeeded(leadingStatements, node);
+            addRestParameterIfNeeded(leadingStatements, node, /*inConstructorWithSynthesizedSuper*/ false);
+            if (ts.isBlock(body)) {
+                // addCustomPrologue puts already-existing directives at the beginning of the target statement-array
+                statementOffset = ts.addCustomPrologue(leadingStatements, body.statements, statementOffset, visitor);
+                statementsLocation = body.statements;
+                ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, statementOffset));
+                // If the original body was a multi-line block, this must be a multi-line block.
+                if (!multiLine && body.multiLine) {
+                    multiLine = true;
+                }
+            }
+            else {
+                ts.Debug.assert(node.kind === 197 /* ArrowFunction */);
+                // To align with the old emitter, we use a synthetic end position on the location
+                // for the statement list we synthesize when we down-level an arrow function with
+                // an expression function body. This prevents both comments and source maps from
+                // being emitted for the end position only.
+                statementsLocation = ts.moveRangeEnd(body, -1);
+                var equalsGreaterThanToken = node.equalsGreaterThanToken;
+                if (!ts.nodeIsSynthesized(equalsGreaterThanToken) && !ts.nodeIsSynthesized(body)) {
+                    if (ts.rangeEndIsOnSameLineAsRangeStart(equalsGreaterThanToken, body, currentSourceFile)) {
+                        singleLine = true;
+                    }
+                    else {
+                        multiLine = true;
+                    }
+                }
+                var expression = ts.visitNode(body, visitor, ts.isExpression);
+                var returnStatement = ts.createReturn(expression);
+                ts.setTextRange(returnStatement, body);
+                ts.moveSyntheticComments(returnStatement, body);
+                ts.setEmitFlags(returnStatement, 384 /* NoTokenSourceMaps */ | 32 /* NoTrailingSourceMap */ | 1024 /* NoTrailingComments */);
+                statements.push(returnStatement);
+                // To align with the source map emit for the old emitter, we set a custom
+                // source map location for the close brace.
+                closeBraceLocation = body;
+            }
+            var lexicalEnvironment = context.endLexicalEnvironment();
+            ts.addStatementsAfterPrologue(statements, lexicalEnvironment);
+            prependCaptureNewTargetIfNeeded(statements, node, /*copyOnWrite*/ false);
+            // If we added any final generated statements, this must be a multi-line block
+            if (ts.some(leadingStatements) || ts.some(lexicalEnvironment)) {
+                multiLine = true;
+            }
+            var block = ts.createBlock(ts.setTextRange(ts.createNodeArray(leadingStatements.concat(statements)), statementsLocation), multiLine);
+            ts.setTextRange(block, node.body);
+            if (!multiLine && singleLine) {
+                ts.setEmitFlags(block, 1 /* SingleLine */);
+            }
+            if (closeBraceLocation) {
+                ts.setTokenSourceMapRange(block, 19 /* CloseBraceToken */, closeBraceLocation);
+            }
+            ts.setOriginalNode(block, node.body);
+            return block;
+        }
+        function visitFunctionBodyDownLevel(node) {
+            var updated = ts.visitFunctionBody(node.body, functionBodyVisitor, context);
+            return ts.updateBlock(updated, ts.setTextRange(ts.createNodeArray(prependCaptureNewTargetIfNeeded(updated.statements, node, /*copyOnWrite*/ true)), 
+            /*location*/ updated.statements));
+        }
+        function visitBlock(node, isFunctionBody) {
+            if (isFunctionBody) {
+                // A function body is not a block scope.
+                return ts.visitEachChild(node, visitor, context);
+            }
+            var ancestorFacts = hierarchyFacts & 256 /* IterationStatement */
+                ? enterSubtree(4032 /* IterationStatementBlockExcludes */, 512 /* IterationStatementBlockIncludes */)
+                : enterSubtree(3904 /* BlockExcludes */, 128 /* BlockIncludes */);
+            var updated = ts.visitEachChild(node, visitor, context);
+            exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
+            return updated;
+        }
+        /**
+         * Visits an ExpressionStatement that contains a destructuring assignment.
+         *
+         * @param node An ExpressionStatement node.
+         */
+        function visitExpressionStatement(node) {
+            // If we are here it is most likely because our expression is a destructuring assignment.
+            switch (node.expression.kind) {
+                case 195 /* ParenthesizedExpression */:
+                    return ts.updateExpressionStatement(node, visitParenthesizedExpression(node.expression, /*needsDestructuringValue*/ false));
+                case 204 /* BinaryExpression */:
+                    return ts.updateExpressionStatement(node, visitBinaryExpression(node.expression, /*needsDestructuringValue*/ false));
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        /**
+         * Visits a ParenthesizedExpression that may contain a destructuring assignment.
+         *
+         * @param node A ParenthesizedExpression node.
+         * @param needsDestructuringValue A value indicating whether we need to hold onto the rhs
+         *                                of a destructuring assignment.
+         */
+        function visitParenthesizedExpression(node, needsDestructuringValue) {
+            // If we are here it is most likely because our expression is a destructuring assignment.
+            if (!needsDestructuringValue) {
+                // By default we always emit the RHS at the end of a flattened destructuring
+                // expression. If we are in a state where we do not need the destructuring value,
+                // we pass that information along to the children that care about it.
+                switch (node.expression.kind) {
+                    case 195 /* ParenthesizedExpression */:
+                        return ts.updateParen(node, visitParenthesizedExpression(node.expression, /*needsDestructuringValue*/ false));
+                    case 204 /* BinaryExpression */:
+                        return ts.updateParen(node, visitBinaryExpression(node.expression, /*needsDestructuringValue*/ false));
+                }
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        /**
+         * Visits a BinaryExpression that contains a destructuring assignment.
+         *
+         * @param node A BinaryExpression node.
+         * @param needsDestructuringValue A value indicating whether we need to hold onto the rhs
+         *                                of a destructuring assignment.
+         */
+        function visitBinaryExpression(node, needsDestructuringValue) {
+            // If we are here it is because this is a destructuring assignment.
+            if (ts.isDestructuringAssignment(node)) {
+                return ts.flattenDestructuringAssignment(node, visitor, context, 0 /* All */, needsDestructuringValue);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitVariableStatement(node) {
+            var ancestorFacts = enterSubtree(0 /* None */, ts.hasModifier(node, 1 /* Export */) ? 32 /* ExportedVariableStatement */ : 0 /* None */);
+            var updated;
+            if (convertedLoopState && (node.declarationList.flags & 3 /* BlockScoped */) === 0) {
+                // we are inside a converted loop - hoist variable declarations
+                var assignments = void 0;
+                for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                    var decl = _a[_i];
+                    hoistVariableDeclarationDeclaredInConvertedLoop(convertedLoopState, decl);
+                    if (decl.initializer) {
+                        var assignment = void 0;
+                        if (ts.isBindingPattern(decl.name)) {
+                            assignment = ts.flattenDestructuringAssignment(decl, visitor, context, 0 /* All */);
+                        }
+                        else {
+                            assignment = ts.createBinary(decl.name, 59 /* EqualsToken */, ts.visitNode(decl.initializer, visitor, ts.isExpression));
+                            ts.setTextRange(assignment, decl);
+                        }
+                        assignments = ts.append(assignments, assignment);
+                    }
+                }
+                if (assignments) {
+                    updated = ts.setTextRange(ts.createExpressionStatement(ts.inlineExpressions(assignments)), node);
+                }
+                else {
+                    // none of declarations has initializer - the entire variable statement can be deleted
+                    updated = undefined;
+                }
+            }
+            else {
+                updated = ts.visitEachChild(node, visitor, context);
+            }
+            exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
+            return updated;
+        }
+        /**
+         * Visits a VariableDeclarationList that is block scoped (e.g. `let` or `const`).
+         *
+         * @param node A VariableDeclarationList node.
+         */
+        function visitVariableDeclarationList(node) {
+            if (node.transformFlags & 64 /* ES2015 */) {
+                if (node.flags & 3 /* BlockScoped */) {
+                    enableSubstitutionsForBlockScopedBindings();
+                }
+                var declarations = ts.flatMap(node.declarations, node.flags & 1 /* Let */
+                    ? visitVariableDeclarationInLetDeclarationList
+                    : visitVariableDeclaration);
+                var declarationList = ts.createVariableDeclarationList(declarations);
+                ts.setOriginalNode(declarationList, node);
+                ts.setTextRange(declarationList, node);
+                ts.setCommentRange(declarationList, node);
+                // If the first or last declaration is a binding pattern, we need to modify
+                // the source map range for the declaration list.
+                if (node.transformFlags & 2097152 /* ContainsBindingPattern */
+                    && (ts.isBindingPattern(node.declarations[0].name) || ts.isBindingPattern(ts.last(node.declarations).name))) {
+                    ts.setSourceMapRange(declarationList, getRangeUnion(declarations));
+                }
+                return declarationList;
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function getRangeUnion(declarations) {
+            // declarations may not be sorted by position.
+            // pos should be the minimum* position over all nodes (that's not -1), end should be the maximum end over all nodes.
+            var pos = -1, end = -1;
+            for (var _i = 0, declarations_10 = declarations; _i < declarations_10.length; _i++) {
+                var node = declarations_10[_i];
+                pos = pos === -1 ? node.pos : node.pos === -1 ? pos : Math.min(pos, node.pos);
+                end = Math.max(end, node.end);
+            }
+            return ts.createRange(pos, end);
+        }
+        /**
+         * Gets a value indicating whether we should emit an explicit initializer for a variable
+         * declaration in a `let` declaration list.
+         *
+         * @param node A VariableDeclaration node.
+         */
+        function shouldEmitExplicitInitializerForLetDeclaration(node) {
+            // Nested let bindings might need to be initialized explicitly to preserve
+            // ES6 semantic:
+            //
+            //  { let x = 1; }
+            //  { let x; } // x here should be undefined. not 1
+            //
+            // Top level bindings never collide with anything and thus don't require
+            // explicit initialization. As for nested let bindings there are two cases:
+            //
+            // - Nested let bindings that were not renamed definitely should be
+            //   initialized explicitly:
+            //
+            //    { let x = 1; }
+            //    { let x; if (some-condition) { x = 1}; if (x) { /*1*/ } }
+            //
+            //   Without explicit initialization code in /*1*/ can be executed even if
+            //   some-condition is evaluated to false.
+            //
+            // - Renaming introduces fresh name that should not collide with any
+            //   existing names, however renamed bindings sometimes also should be
+            //   explicitly initialized. One particular case: non-captured binding
+            //   declared inside loop body (but not in loop initializer):
+            //
+            //    let x;
+            //    for (;;) {
+            //        let x;
+            //    }
+            //
+            //   In downlevel codegen inner 'x' will be renamed so it won't collide
+            //   with outer 'x' however it will should be reset on every iteration as
+            //   if it was declared anew.
+            //
+            //   * Why non-captured binding?
+            //     - Because if loop contains block scoped binding captured in some
+            //       function then loop body will be rewritten to have a fresh scope
+            //       on every iteration so everything will just work.
+            //
+            //   * Why loop initializer is excluded?
+            //     - Since we've introduced a fresh name it already will be undefined.
+            var flags = resolver.getNodeCheckFlags(node);
+            var isCapturedInFunction = flags & 262144 /* CapturedBlockScopedBinding */;
+            var isDeclaredInLoop = flags & 524288 /* BlockScopedBindingInLoop */;
+            var emittedAsTopLevel = (hierarchyFacts & 64 /* TopLevel */) !== 0
+                || (isCapturedInFunction
+                    && isDeclaredInLoop
+                    && (hierarchyFacts & 512 /* IterationStatementBlock */) !== 0);
+            var emitExplicitInitializer = !emittedAsTopLevel
+                && (hierarchyFacts & 2048 /* ForInOrForOfStatement */) === 0
+                && (!resolver.isDeclarationWithCollidingName(node)
+                    || (isDeclaredInLoop
+                        && !isCapturedInFunction
+                        && (hierarchyFacts & (1024 /* ForStatement */ | 2048 /* ForInOrForOfStatement */)) === 0));
+            return emitExplicitInitializer;
+        }
+        /**
+         * Visits a VariableDeclaration in a `let` declaration list.
+         *
+         * @param node A VariableDeclaration node.
+         */
+        function visitVariableDeclarationInLetDeclarationList(node) {
+            // For binding pattern names that lack initializers there is no point to emit
+            // explicit initializer since downlevel codegen for destructuring will fail
+            // in the absence of initializer so all binding elements will say uninitialized
+            var name = node.name;
+            if (ts.isBindingPattern(name)) {
+                return visitVariableDeclaration(node);
+            }
+            if (!node.initializer && shouldEmitExplicitInitializerForLetDeclaration(node)) {
+                var clone_2 = ts.getMutableClone(node);
+                clone_2.initializer = ts.createVoidZero();
+                return clone_2;
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        /**
+         * Visits a VariableDeclaration node with a binding pattern.
+         *
+         * @param node A VariableDeclaration node.
+         */
+        function visitVariableDeclaration(node) {
+            var ancestorFacts = enterSubtree(32 /* ExportedVariableStatement */, 0 /* None */);
+            var updated;
+            if (ts.isBindingPattern(node.name)) {
+                updated = ts.flattenDestructuringBinding(node, visitor, context, 0 /* All */, 
+                /*value*/ undefined, (ancestorFacts & 32 /* ExportedVariableStatement */) !== 0);
+            }
+            else {
+                updated = ts.visitEachChild(node, visitor, context);
+            }
+            exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
+            return updated;
+        }
+        function recordLabel(node) {
+            convertedLoopState.labels.set(ts.idText(node.label), true);
+        }
+        function resetLabel(node) {
+            convertedLoopState.labels.set(ts.idText(node.label), false);
+        }
+        function visitLabeledStatement(node) {
+            if (convertedLoopState && !convertedLoopState.labels) {
+                convertedLoopState.labels = ts.createMap();
+            }
+            var statement = ts.unwrapInnermostStatementOfLabel(node, convertedLoopState && recordLabel);
+            return ts.isIterationStatement(statement, /*lookInLabeledStatements*/ false)
+                ? visitIterationStatement(statement, /*outermostLabeledStatement*/ node)
+                : ts.restoreEnclosingLabel(ts.visitNode(statement, visitor, ts.isStatement, ts.liftToBlock), node, convertedLoopState && resetLabel);
+        }
+        function visitIterationStatement(node, outermostLabeledStatement) {
+            switch (node.kind) {
+                case 223 /* DoStatement */:
+                case 224 /* WhileStatement */:
+                    return visitDoOrWhileStatement(node, outermostLabeledStatement);
+                case 225 /* ForStatement */:
+                    return visitForStatement(node, outermostLabeledStatement);
+                case 226 /* ForInStatement */:
+                    return visitForInStatement(node, outermostLabeledStatement);
+                case 227 /* ForOfStatement */:
+                    return visitForOfStatement(node, outermostLabeledStatement);
+            }
+        }
+        function visitIterationStatementWithFacts(excludeFacts, includeFacts, node, outermostLabeledStatement, convert) {
+            var ancestorFacts = enterSubtree(excludeFacts, includeFacts);
+            var updated = convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, convert);
+            exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
+            return updated;
+        }
+        function visitDoOrWhileStatement(node, outermostLabeledStatement) {
+            return visitIterationStatementWithFacts(0 /* DoOrWhileStatementExcludes */, 256 /* DoOrWhileStatementIncludes */, node, outermostLabeledStatement);
+        }
+        function visitForStatement(node, outermostLabeledStatement) {
+            return visitIterationStatementWithFacts(3008 /* ForStatementExcludes */, 1280 /* ForStatementIncludes */, node, outermostLabeledStatement);
+        }
+        function visitForInStatement(node, outermostLabeledStatement) {
+            return visitIterationStatementWithFacts(1984 /* ForInOrForOfStatementExcludes */, 2304 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement);
+        }
+        function visitForOfStatement(node, outermostLabeledStatement) {
+            return visitIterationStatementWithFacts(1984 /* ForInOrForOfStatementExcludes */, 2304 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement, compilerOptions.downlevelIteration ? convertForOfStatementForIterable : convertForOfStatementForArray);
+        }
+        function convertForOfStatementHead(node, boundValue, convertedLoopBodyStatements) {
+            var statements = [];
+            var initializer = node.initializer;
+            if (ts.isVariableDeclarationList(initializer)) {
+                if (node.initializer.flags & 3 /* BlockScoped */) {
+                    enableSubstitutionsForBlockScopedBindings();
+                }
+                var firstOriginalDeclaration = ts.firstOrUndefined(initializer.declarations);
+                if (firstOriginalDeclaration && ts.isBindingPattern(firstOriginalDeclaration.name)) {
+                    // This works whether the declaration is a var, let, or const.
+                    // It will use rhsIterationValue _a[_i] as the initializer.
+                    var declarations = ts.flattenDestructuringBinding(firstOriginalDeclaration, visitor, context, 0 /* All */, boundValue);
+                    var declarationList = ts.setTextRange(ts.createVariableDeclarationList(declarations), node.initializer);
+                    ts.setOriginalNode(declarationList, node.initializer);
+                    // Adjust the source map range for the first declaration to align with the old
+                    // emitter.
+                    ts.setSourceMapRange(declarationList, ts.createRange(declarations[0].pos, ts.last(declarations).end));
+                    statements.push(ts.createVariableStatement(
+                    /*modifiers*/ undefined, declarationList));
+                }
+                else {
+                    // The following call does not include the initializer, so we have
+                    // to emit it separately.
+                    statements.push(ts.setTextRange(ts.createVariableStatement(
+                    /*modifiers*/ undefined, ts.setOriginalNode(ts.setTextRange(ts.createVariableDeclarationList([
+                        ts.createVariableDeclaration(firstOriginalDeclaration ? firstOriginalDeclaration.name : ts.createTempVariable(/*recordTempVariable*/ undefined), 
+                        /*type*/ undefined, boundValue)
+                    ]), ts.moveRangePos(initializer, -1)), initializer)), ts.moveRangeEnd(initializer, -1)));
+                }
+            }
+            else {
+                // Initializer is an expression. Emit the expression in the body, so that it's
+                // evaluated on every iteration.
+                var assignment = ts.createAssignment(initializer, boundValue);
+                if (ts.isDestructuringAssignment(assignment)) {
+                    ts.aggregateTransformFlags(assignment);
+                    statements.push(ts.createExpressionStatement(visitBinaryExpression(assignment, /*needsDestructuringValue*/ false)));
+                }
+                else {
+                    assignment.end = initializer.end;
+                    statements.push(ts.setTextRange(ts.createExpressionStatement(ts.visitNode(assignment, visitor, ts.isExpression)), ts.moveRangeEnd(initializer, -1)));
+                }
+            }
+            if (convertedLoopBodyStatements) {
+                return createSyntheticBlockForConvertedStatements(ts.addRange(statements, convertedLoopBodyStatements));
+            }
+            else {
+                var statement = ts.visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock);
+                if (ts.isBlock(statement)) {
+                    return ts.updateBlock(statement, ts.setTextRange(ts.createNodeArray(ts.concatenate(statements, statement.statements)), statement.statements));
+                }
+                else {
+                    statements.push(statement);
+                    return createSyntheticBlockForConvertedStatements(statements);
+                }
+            }
+        }
+        function createSyntheticBlockForConvertedStatements(statements) {
+            return ts.setEmitFlags(ts.createBlock(ts.createNodeArray(statements), 
+            /*multiLine*/ true), 48 /* NoSourceMap */ | 384 /* NoTokenSourceMaps */);
+        }
+        function convertForOfStatementForArray(node, outermostLabeledStatement, convertedLoopBodyStatements) {
+            // The following ES6 code:
+            //
+            //    for (let v of expr) { }
+            //
+            // should be emitted as
+            //
+            //    for (var _i = 0, _a = expr; _i < _a.length; _i++) {
+            //        var v = _a[_i];
+            //    }
+            //
+            // where _a and _i are temps emitted to capture the RHS and the counter,
+            // respectively.
+            // When the left hand side is an expression instead of a let declaration,
+            // the "let v" is not emitted.
+            // When the left hand side is a let/const, the v is renamed if there is
+            // another v in scope.
+            // Note that all assignments to the LHS are emitted in the body, including
+            // all destructuring.
+            // Note also that because an extra statement is needed to assign to the LHS,
+            // for-of bodies are always emitted as blocks.
+            var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
+            // In the case where the user wrote an identifier as the RHS, like this:
+            //
+            //     for (let v of arr) { }
+            //
+            // we don't want to emit a temporary variable for the RHS, just use it directly.
+            var counter = ts.createLoopVariable();
+            var rhsReference = ts.isIdentifier(expression) ? ts.getGeneratedNameForNode(expression) : ts.createTempVariable(/*recordTempVariable*/ undefined);
+            // The old emitter does not emit source maps for the expression
+            ts.setEmitFlags(expression, 48 /* NoSourceMap */ | ts.getEmitFlags(expression));
+            var forStatement = ts.setTextRange(ts.createFor(
+            /*initializer*/ ts.setEmitFlags(ts.setTextRange(ts.createVariableDeclarationList([
+                ts.setTextRange(ts.createVariableDeclaration(counter, /*type*/ undefined, ts.createLiteral(0)), ts.moveRangePos(node.expression, -1)),
+                ts.setTextRange(ts.createVariableDeclaration(rhsReference, /*type*/ undefined, expression), node.expression)
+            ]), node.expression), 2097152 /* NoHoisting */), 
+            /*condition*/ ts.setTextRange(ts.createLessThan(counter, ts.createPropertyAccess(rhsReference, "length")), node.expression), 
+            /*incrementor*/ ts.setTextRange(ts.createPostfixIncrement(counter), node.expression), 
+            /*statement*/ convertForOfStatementHead(node, ts.createElementAccess(rhsReference, counter), convertedLoopBodyStatements)), 
+            /*location*/ node);
+            // Disable trailing source maps for the OpenParenToken to align source map emit with the old emitter.
+            ts.setEmitFlags(forStatement, 256 /* NoTokenTrailingSourceMaps */);
+            ts.setTextRange(forStatement, node);
+            return ts.restoreEnclosingLabel(forStatement, outermostLabeledStatement, convertedLoopState && resetLabel);
+        }
+        function convertForOfStatementForIterable(node, outermostLabeledStatement, convertedLoopBodyStatements) {
+            var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
+            var iterator = ts.isIdentifier(expression) ? ts.getGeneratedNameForNode(expression) : ts.createTempVariable(/*recordTempVariable*/ undefined);
+            var result = ts.isIdentifier(expression) ? ts.getGeneratedNameForNode(iterator) : ts.createTempVariable(/*recordTempVariable*/ undefined);
+            var errorRecord = ts.createUniqueName("e");
+            var catchVariable = ts.getGeneratedNameForNode(errorRecord);
+            var returnMethod = ts.createTempVariable(/*recordTempVariable*/ undefined);
+            var values = ts.createValuesHelper(context, expression, node.expression);
+            var next = ts.createCall(ts.createPropertyAccess(iterator, "next"), /*typeArguments*/ undefined, []);
+            hoistVariableDeclaration(errorRecord);
+            hoistVariableDeclaration(returnMethod);
+            var forStatement = ts.setEmitFlags(ts.setTextRange(ts.createFor(
+            /*initializer*/ ts.setEmitFlags(ts.setTextRange(ts.createVariableDeclarationList([
+                ts.setTextRange(ts.createVariableDeclaration(iterator, /*type*/ undefined, values), node.expression),
+                ts.createVariableDeclaration(result, /*type*/ undefined, next)
+            ]), node.expression), 2097152 /* NoHoisting */), 
+            /*condition*/ ts.createLogicalNot(ts.createPropertyAccess(result, "done")), 
+            /*incrementor*/ ts.createAssignment(result, next), 
+            /*statement*/ convertForOfStatementHead(node, ts.createPropertyAccess(result, "value"), convertedLoopBodyStatements)), 
+            /*location*/ node), 256 /* NoTokenTrailingSourceMaps */);
+            return ts.createTry(ts.createBlock([
+                ts.restoreEnclosingLabel(forStatement, outermostLabeledStatement, convertedLoopState && resetLabel)
+            ]), ts.createCatchClause(ts.createVariableDeclaration(catchVariable), ts.setEmitFlags(ts.createBlock([
+                ts.createExpressionStatement(ts.createAssignment(errorRecord, ts.createObjectLiteral([
+                    ts.createPropertyAssignment("error", catchVariable)
+                ])))
+            ]), 1 /* SingleLine */)), ts.createBlock([
+                ts.createTry(
+                /*tryBlock*/ ts.createBlock([
+                    ts.setEmitFlags(ts.createIf(ts.createLogicalAnd(ts.createLogicalAnd(result, ts.createLogicalNot(ts.createPropertyAccess(result, "done"))), ts.createAssignment(returnMethod, ts.createPropertyAccess(iterator, "return"))), ts.createExpressionStatement(ts.createFunctionCall(returnMethod, iterator, []))), 1 /* SingleLine */),
+                ]), 
+                /*catchClause*/ undefined, 
+                /*finallyBlock*/ ts.setEmitFlags(ts.createBlock([
+                    ts.setEmitFlags(ts.createIf(errorRecord, ts.createThrow(ts.createPropertyAccess(errorRecord, "error"))), 1 /* SingleLine */)
+                ]), 1 /* SingleLine */))
+            ]));
+        }
+        /**
+         * Visits an ObjectLiteralExpression with computed property names.
+         *
+         * @param node An ObjectLiteralExpression node.
+         */
+        function visitObjectLiteralExpression(node) {
+            // We are here because a ComputedPropertyName was used somewhere in the expression.
+            var properties = node.properties;
+            var numProperties = properties.length;
+            // Find the first computed property.
+            // Everything until that point can be emitted as part of the initial object literal.
+            var numInitialProperties = numProperties;
+            var numInitialPropertiesWithoutYield = numProperties;
+            for (var i = 0; i < numProperties; i++) {
+                var property = properties[i];
+                if ((property.transformFlags & 4194304 /* ContainsYield */ && hierarchyFacts & 4 /* AsyncFunctionBody */)
+                    && i < numInitialPropertiesWithoutYield) {
+                    numInitialPropertiesWithoutYield = i;
+                }
+                if (property.name.kind === 149 /* ComputedPropertyName */) {
+                    numInitialProperties = i;
+                    break;
+                }
+            }
+            if (numInitialProperties !== numProperties) {
+                if (numInitialPropertiesWithoutYield < numInitialProperties) {
+                    numInitialProperties = numInitialPropertiesWithoutYield;
+                }
+                // For computed properties, we need to create a unique handle to the object
+                // literal so we can modify it without risking internal assignments tainting the object.
+                var temp = ts.createTempVariable(hoistVariableDeclaration);
+                // Write out the first non-computed properties, then emit the rest through indexing on the temp variable.
+                var expressions = [];
+                var assignment = ts.createAssignment(temp, ts.setEmitFlags(ts.createObjectLiteral(ts.visitNodes(properties, visitor, ts.isObjectLiteralElementLike, 0, numInitialProperties), node.multiLine), 65536 /* Indented */));
+                if (node.multiLine) {
+                    ts.startOnNewLine(assignment);
+                }
+                expressions.push(assignment);
+                addObjectLiteralMembers(expressions, node, temp, numInitialProperties);
+                // We need to clone the temporary identifier so that we can write it on a
+                // new line
+                expressions.push(node.multiLine ? ts.startOnNewLine(ts.getMutableClone(temp)) : temp);
+                return ts.inlineExpressions(expressions);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function shouldConvertPartOfIterationStatement(node) {
+            return (resolver.getNodeCheckFlags(node) & 131072 /* ContainsCapturedBlockScopeBinding */) !== 0;
+        }
+        function shouldConvertInitializerOfForStatement(node) {
+            return ts.isForStatement(node) && !!node.initializer && shouldConvertPartOfIterationStatement(node.initializer);
+        }
+        function shouldConvertConditionOfForStatement(node) {
+            return ts.isForStatement(node) && !!node.condition && shouldConvertPartOfIterationStatement(node.condition);
+        }
+        function shouldConvertIncrementorOfForStatement(node) {
+            return ts.isForStatement(node) && !!node.incrementor && shouldConvertPartOfIterationStatement(node.incrementor);
+        }
+        function shouldConvertIterationStatement(node) {
+            return shouldConvertBodyOfIterationStatement(node)
+                || shouldConvertInitializerOfForStatement(node);
+        }
+        function shouldConvertBodyOfIterationStatement(node) {
+            return (resolver.getNodeCheckFlags(node) & 65536 /* LoopWithCapturedBlockScopedBinding */) !== 0;
+        }
+        /**
+         * Records constituents of name for the given variable to be hoisted in the outer scope.
+         */
+        function hoistVariableDeclarationDeclaredInConvertedLoop(state, node) {
+            if (!state.hoistedLocalVariables) {
+                state.hoistedLocalVariables = [];
+            }
+            visit(node.name);
+            function visit(node) {
+                if (node.kind === 72 /* Identifier */) {
+                    state.hoistedLocalVariables.push(node);
+                }
+                else {
+                    for (var _i = 0, _a = node.elements; _i < _a.length; _i++) {
+                        var element = _a[_i];
+                        if (!ts.isOmittedExpression(element)) {
+                            visit(element.name);
+                        }
+                    }
+                }
+            }
+        }
+        function convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, convert) {
+            if (!shouldConvertIterationStatement(node)) {
+                var saveAllowedNonLabeledJumps = void 0;
+                if (convertedLoopState) {
+                    // we get here if we are trying to emit normal loop loop inside converted loop
+                    // set allowedNonLabeledJumps to Break | Continue to mark that break\continue inside the loop should be emitted as is
+                    saveAllowedNonLabeledJumps = convertedLoopState.allowedNonLabeledJumps;
+                    convertedLoopState.allowedNonLabeledJumps = 2 /* Break */ | 4 /* Continue */;
+                }
+                var result = convert
+                    ? convert(node, outermostLabeledStatement, /*convertedLoopBodyStatements*/ undefined)
+                    : ts.restoreEnclosingLabel(ts.visitEachChild(node, visitor, context), outermostLabeledStatement, convertedLoopState && resetLabel);
+                if (convertedLoopState) {
+                    convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
+                }
+                return result;
+            }
+            var currentState = createConvertedLoopState(node);
+            var statements = [];
+            var outerConvertedLoopState = convertedLoopState;
+            convertedLoopState = currentState;
+            var initializerFunction = shouldConvertInitializerOfForStatement(node) ? createFunctionForInitializerOfForStatement(node, currentState) : undefined;
+            var bodyFunction = shouldConvertBodyOfIterationStatement(node) ? createFunctionForBodyOfIterationStatement(node, currentState, outerConvertedLoopState) : undefined;
+            convertedLoopState = outerConvertedLoopState;
+            if (initializerFunction)
+                statements.push(initializerFunction.functionDeclaration);
+            if (bodyFunction)
+                statements.push(bodyFunction.functionDeclaration);
+            addExtraDeclarationsForConvertedLoop(statements, currentState, outerConvertedLoopState);
+            if (initializerFunction) {
+                statements.push(generateCallToConvertedLoopInitializer(initializerFunction.functionName, initializerFunction.containsYield));
+            }
+            var loop;
+            if (bodyFunction) {
+                if (convert) {
+                    loop = convert(node, outermostLabeledStatement, bodyFunction.part);
+                }
+                else {
+                    var clone_3 = convertIterationStatementCore(node, initializerFunction, ts.createBlock(bodyFunction.part, /*multiLine*/ true));
+                    ts.aggregateTransformFlags(clone_3);
+                    loop = ts.restoreEnclosingLabel(clone_3, outermostLabeledStatement, convertedLoopState && resetLabel);
+                }
+            }
+            else {
+                var clone_4 = convertIterationStatementCore(node, initializerFunction, ts.visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
+                ts.aggregateTransformFlags(clone_4);
+                loop = ts.restoreEnclosingLabel(clone_4, outermostLabeledStatement, convertedLoopState && resetLabel);
+            }
+            statements.push(loop);
+            return statements;
+        }
+        function convertIterationStatementCore(node, initializerFunction, convertedLoopBody) {
+            switch (node.kind) {
+                case 225 /* ForStatement */: return convertForStatement(node, initializerFunction, convertedLoopBody);
+                case 226 /* ForInStatement */: return convertForInStatement(node, convertedLoopBody);
+                case 227 /* ForOfStatement */: return convertForOfStatement(node, convertedLoopBody);
+                case 223 /* DoStatement */: return convertDoStatement(node, convertedLoopBody);
+                case 224 /* WhileStatement */: return convertWhileStatement(node, convertedLoopBody);
+                default: return ts.Debug.failBadSyntaxKind(node, "IterationStatement expected");
+            }
+        }
+        function convertForStatement(node, initializerFunction, convertedLoopBody) {
+            var shouldConvertCondition = node.condition && shouldConvertPartOfIterationStatement(node.condition);
+            var shouldConvertIncrementor = shouldConvertCondition || node.incrementor && shouldConvertPartOfIterationStatement(node.incrementor);
+            return ts.updateFor(node, ts.visitNode(initializerFunction ? initializerFunction.part : node.initializer, visitor, ts.isForInitializer), ts.visitNode(shouldConvertCondition ? undefined : node.condition, visitor, ts.isExpression), ts.visitNode(shouldConvertIncrementor ? undefined : node.incrementor, visitor, ts.isExpression), convertedLoopBody);
+        }
+        function convertForOfStatement(node, convertedLoopBody) {
+            return ts.updateForOf(node, 
+            /*awaitModifier*/ undefined, ts.visitNode(node.initializer, visitor, ts.isForInitializer), ts.visitNode(node.expression, visitor, ts.isExpression), convertedLoopBody);
+        }
+        function convertForInStatement(node, convertedLoopBody) {
+            return ts.updateForIn(node, ts.visitNode(node.initializer, visitor, ts.isForInitializer), ts.visitNode(node.expression, visitor, ts.isExpression), convertedLoopBody);
+        }
+        function convertDoStatement(node, convertedLoopBody) {
+            return ts.updateDo(node, convertedLoopBody, ts.visitNode(node.expression, visitor, ts.isExpression));
+        }
+        function convertWhileStatement(node, convertedLoopBody) {
+            return ts.updateWhile(node, ts.visitNode(node.expression, visitor, ts.isExpression), convertedLoopBody);
+        }
+        function createConvertedLoopState(node) {
+            var loopInitializer;
+            switch (node.kind) {
+                case 225 /* ForStatement */:
+                case 226 /* ForInStatement */:
+                case 227 /* ForOfStatement */:
+                    var initializer = node.initializer;
+                    if (initializer && initializer.kind === 238 /* VariableDeclarationList */) {
+                        loopInitializer = initializer;
+                    }
+                    break;
+            }
+            // variables that will be passed to the loop as parameters
+            var loopParameters = [];
+            // variables declared in the loop initializer that will be changed inside the loop
+            var loopOutParameters = [];
+            if (loopInitializer && (ts.getCombinedNodeFlags(loopInitializer) & 3 /* BlockScoped */)) {
+                var hasCapturedBindingsInForInitializer = shouldConvertInitializerOfForStatement(node);
+                for (var _i = 0, _a = loopInitializer.declarations; _i < _a.length; _i++) {
+                    var decl = _a[_i];
+                    processLoopVariableDeclaration(node, decl, loopParameters, loopOutParameters, hasCapturedBindingsInForInitializer);
+                }
+            }
+            var currentState = { loopParameters: loopParameters, loopOutParameters: loopOutParameters };
+            if (convertedLoopState) {
+                // convertedOuterLoopState !== undefined means that this converted loop is nested in another converted loop.
+                // if outer converted loop has already accumulated some state - pass it through
+                if (convertedLoopState.argumentsName) {
+                    // outer loop has already used 'arguments' so we've already have some name to alias it
+                    // use the same name in all nested loops
+                    currentState.argumentsName = convertedLoopState.argumentsName;
+                }
+                if (convertedLoopState.thisName) {
+                    // outer loop has already used 'this' so we've already have some name to alias it
+                    // use the same name in all nested loops
+                    currentState.thisName = convertedLoopState.thisName;
+                }
+                if (convertedLoopState.hoistedLocalVariables) {
+                    // we've already collected some non-block scoped variable declarations in enclosing loop
+                    // use the same storage in nested loop
+                    currentState.hoistedLocalVariables = convertedLoopState.hoistedLocalVariables;
+                }
+            }
+            return currentState;
+        }
+        function addExtraDeclarationsForConvertedLoop(statements, state, outerState) {
+            var extraVariableDeclarations;
+            // propagate state from the inner loop to the outer loop if necessary
+            if (state.argumentsName) {
+                // if alias for arguments is set
+                if (outerState) {
+                    // pass it to outer converted loop
+                    outerState.argumentsName = state.argumentsName;
+                }
+                else {
+                    // this is top level converted loop and we need to create an alias for 'arguments' object
+                    (extraVariableDeclarations || (extraVariableDeclarations = [])).push(ts.createVariableDeclaration(state.argumentsName, 
+                    /*type*/ undefined, ts.createIdentifier("arguments")));
+                }
+            }
+            if (state.thisName) {
+                // if alias for this is set
+                if (outerState) {
+                    // pass it to outer converted loop
+                    outerState.thisName = state.thisName;
+                }
+                else {
+                    // this is top level converted loop so we need to create an alias for 'this' here
+                    // NOTE:
+                    // if converted loops were all nested in arrow function then we'll always emit '_this' so convertedLoopState.thisName will not be set.
+                    // If it is set this means that all nested loops are not nested in arrow function and it is safe to capture 'this'.
+                    (extraVariableDeclarations || (extraVariableDeclarations = [])).push(ts.createVariableDeclaration(state.thisName, 
+                    /*type*/ undefined, ts.createIdentifier("this")));
+                }
+            }
+            if (state.hoistedLocalVariables) {
+                // if hoistedLocalVariables !== undefined this means that we've possibly collected some variable declarations to be hoisted later
+                if (outerState) {
+                    // pass them to outer converted loop
+                    outerState.hoistedLocalVariables = state.hoistedLocalVariables;
+                }
+                else {
+                    if (!extraVariableDeclarations) {
+                        extraVariableDeclarations = [];
+                    }
+                    // hoist collected variable declarations
+                    for (var _i = 0, _a = state.hoistedLocalVariables; _i < _a.length; _i++) {
+                        var identifier = _a[_i];
+                        extraVariableDeclarations.push(ts.createVariableDeclaration(identifier));
+                    }
+                }
+            }
+            // add extra variables to hold out parameters if necessary
+            if (state.loopOutParameters.length) {
+                if (!extraVariableDeclarations) {
+                    extraVariableDeclarations = [];
+                }
+                for (var _b = 0, _c = state.loopOutParameters; _b < _c.length; _b++) {
+                    var outParam = _c[_b];
+                    extraVariableDeclarations.push(ts.createVariableDeclaration(outParam.outParamName));
+                }
+            }
+            if (state.conditionVariable) {
+                if (!extraVariableDeclarations) {
+                    extraVariableDeclarations = [];
+                }
+                extraVariableDeclarations.push(ts.createVariableDeclaration(state.conditionVariable, /*type*/ undefined, ts.createFalse()));
+            }
+            // create variable statement to hold all introduced variable declarations
+            if (extraVariableDeclarations) {
+                statements.push(ts.createVariableStatement(
+                /*modifiers*/ undefined, ts.createVariableDeclarationList(extraVariableDeclarations)));
+            }
+        }
+        function createOutVariable(p) {
+            return ts.createVariableDeclaration(p.originalName, /*type*/ undefined, p.outParamName);
+        }
+        /**
+         * Creates a `_loop_init` function for a `ForStatement` with a block-scoped initializer
+         * that is captured in a closure inside of the initializer. The `_loop_init` function is
+         * used to preserve the per-iteration environment semantics of
+         * [13.7.4.8 RS: ForBodyEvaluation](https://tc39.github.io/ecma262/#sec-forbodyevaluation).
+         */
+        function createFunctionForInitializerOfForStatement(node, currentState) {
+            var functionName = ts.createUniqueName("_loop_init");
+            var containsYield = (node.initializer.transformFlags & 4194304 /* ContainsYield */) !== 0;
+            var emitFlags = 0 /* None */;
+            if (currentState.containsLexicalThis)
+                emitFlags |= 8 /* CapturesThis */;
+            if (containsYield && hierarchyFacts & 4 /* AsyncFunctionBody */)
+                emitFlags |= 262144 /* AsyncFunctionBody */;
+            var statements = [];
+            statements.push(ts.createVariableStatement(/*modifiers*/ undefined, node.initializer));
+            copyOutParameters(currentState.loopOutParameters, 2 /* Initializer */, 1 /* ToOutParameter */, statements);
+            // This transforms the following ES2015 syntax:
+            //
+            //  for (let i = (setImmediate(() => console.log(i)), 0); i < 2; i++) {
+            //      // loop body
+            //  }
+            //
+            // Into the following ES5 syntax:
+            //
+            //  var _loop_init_1 = function () {
+            //      var i = (setImmediate(() => console.log(i)), 0);
+            //      out_i_1 = i;
+            //  };
+            //  var out_i_1;
+            //  _loop_init_1();
+            //  for (var i = out_i_1; i < 2; i++) {
+            //      // loop body
+            //  }
+            //
+            // Which prevents mutations to `i` in the per-iteration environment of the body
+            // from affecting the initial value for `i` outside of the per-iteration environment.
+            var functionDeclaration = ts.createVariableStatement(
+            /*modifiers*/ undefined, ts.setEmitFlags(ts.createVariableDeclarationList([
+                ts.createVariableDeclaration(functionName, 
+                /*type*/ undefined, ts.setEmitFlags(ts.createFunctionExpression(
+                /*modifiers*/ undefined, containsYield ? ts.createToken(40 /* AsteriskToken */) : undefined, 
+                /*name*/ undefined, 
+                /*typeParameters*/ undefined, 
+                /*parameters*/ undefined, 
+                /*type*/ undefined, ts.visitNode(ts.createBlock(statements, /*multiLine*/ true), visitor, ts.isBlock)), emitFlags))
+            ]), 2097152 /* NoHoisting */));
+            var part = ts.createVariableDeclarationList(ts.map(currentState.loopOutParameters, createOutVariable));
+            return { functionName: functionName, containsYield: containsYield, functionDeclaration: functionDeclaration, part: part };
+        }
+        /**
+         * Creates a `_loop` function for an `IterationStatement` with a block-scoped initializer
+         * that is captured in a closure inside of the loop body. The `_loop` function is used to
+         * preserve the per-iteration environment semantics of
+         * [13.7.4.8 RS: ForBodyEvaluation](https://tc39.github.io/ecma262/#sec-forbodyevaluation).
+         */
+        function createFunctionForBodyOfIterationStatement(node, currentState, outerState) {
+            var functionName = ts.createUniqueName("_loop");
+            startLexicalEnvironment();
+            var statement = ts.visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock);
+            var lexicalEnvironment = endLexicalEnvironment();
+            var statements = [];
+            if (shouldConvertConditionOfForStatement(node) || shouldConvertIncrementorOfForStatement(node)) {
+                // If a block-scoped variable declared in the initializer of `node` is captured in
+                // the condition or incrementor, we must move the condition and incrementor into
+                // the body of the for loop.
+                //
+                // This transforms the following ES2015 syntax:
+                //
+                //  for (let i = 0; setImmediate(() => console.log(i)), i < 2; setImmediate(() => console.log(i)), i++) {
+                //      // loop body
+                //  }
+                //
+                // Into the following ES5 syntax:
+                //
+                //  var _loop_1 = function (i) {
+                //      if (inc_1)
+                //          setImmediate(() => console.log(i)), i++;
+                //      else
+                //          inc_1 = true;
+                //      if (!(setImmediate(() => console.log(i)), i < 2))
+                //          return out_i_1 = i, "break";
+                //      // loop body
+                //      out_i_1 = i;
+                //  }
+                //  var out_i_1, inc_1 = false;
+                //  for (var i = 0;;) {
+                //      var state_1 = _loop_1(i);
+                //      i = out_i_1;
+                //      if (state_1 === "break")
+                //          break;
+                //  }
+                //
+                // Which prevents mutations to `i` in the per-iteration environment of the body
+                // from affecting the value of `i` in the previous per-iteration environment.
+                //
+                // Note that the incrementor of a `for` loop is evaluated in a *new* per-iteration
+                // environment that is carried over to the next iteration of the loop. As a result,
+                // we must indicate whether this is the first evaluation of the loop body so that
+                // we only evaluate the incrementor on subsequent evaluations.
+                currentState.conditionVariable = ts.createUniqueName("inc");
+                statements.push(ts.createIf(currentState.conditionVariable, ts.createStatement(ts.visitNode(node.incrementor, visitor, ts.isExpression)), ts.createStatement(ts.createAssignment(currentState.conditionVariable, ts.createTrue()))));
+                if (shouldConvertConditionOfForStatement(node)) {
+                    statements.push(ts.createIf(ts.createPrefix(52 /* ExclamationToken */, ts.visitNode(node.condition, visitor, ts.isExpression)), ts.visitNode(ts.createBreak(), visitor, ts.isStatement)));
+                }
+            }
+            if (ts.isBlock(statement)) {
+                ts.addRange(statements, statement.statements);
+            }
+            else {
+                statements.push(statement);
+            }
+            copyOutParameters(currentState.loopOutParameters, 1 /* Body */, 1 /* ToOutParameter */, statements);
+            ts.addStatementsAfterPrologue(statements, lexicalEnvironment);
+            var loopBody = ts.createBlock(statements, /*multiLine*/ true);
+            if (ts.isBlock(statement))
+                ts.setOriginalNode(loopBody, statement);
+            var containsYield = (node.statement.transformFlags & 4194304 /* ContainsYield */) !== 0;
+            var emitFlags = 0;
+            if (currentState.containsLexicalThis)
+                emitFlags |= 8 /* CapturesThis */;
+            if (containsYield && (hierarchyFacts & 4 /* AsyncFunctionBody */) !== 0)
+                emitFlags |= 262144 /* AsyncFunctionBody */;
+            // This transforms the following ES2015 syntax (in addition to other variations):
+            //
+            //  for (let i = 0; i < 2; i++) {
+            //      setImmediate(() => console.log(i));
+            //  }
+            //
+            // Into the following ES5 syntax:
+            //
+            //  var _loop_1 = function (i) {
+            //      setImmediate(() => console.log(i));
+            //  };
+            //  for (var i = 0; i < 2; i++) {
+            //      _loop_1(i);
+            //  }
+            var functionDeclaration = ts.createVariableStatement(
+            /*modifiers*/ undefined, ts.setEmitFlags(ts.createVariableDeclarationList([
+                ts.createVariableDeclaration(functionName, 
+                /*type*/ undefined, ts.setEmitFlags(ts.createFunctionExpression(
+                /*modifiers*/ undefined, containsYield ? ts.createToken(40 /* AsteriskToken */) : undefined, 
+                /*name*/ undefined, 
+                /*typeParameters*/ undefined, currentState.loopParameters, 
+                /*type*/ undefined, loopBody), emitFlags))
+            ]), 2097152 /* NoHoisting */));
+            var part = generateCallToConvertedLoop(functionName, currentState, outerState, containsYield);
+            return { functionName: functionName, containsYield: containsYield, functionDeclaration: functionDeclaration, part: part };
+        }
+        function copyOutParameter(outParam, copyDirection) {
+            var source = copyDirection === 0 /* ToOriginal */ ? outParam.outParamName : outParam.originalName;
+            var target = copyDirection === 0 /* ToOriginal */ ? outParam.originalName : outParam.outParamName;
+            return ts.createBinary(target, 59 /* EqualsToken */, source);
+        }
+        function copyOutParameters(outParams, partFlags, copyDirection, statements) {
+            for (var _i = 0, outParams_1 = outParams; _i < outParams_1.length; _i++) {
+                var outParam = outParams_1[_i];
+                if (outParam.flags & partFlags) {
+                    statements.push(ts.createExpressionStatement(copyOutParameter(outParam, copyDirection)));
+                }
+            }
+        }
+        function generateCallToConvertedLoopInitializer(initFunctionExpressionName, containsYield) {
+            var call = ts.createCall(initFunctionExpressionName, /*typeArguments*/ undefined, []);
+            var callResult = containsYield
+                ? ts.createYield(ts.createToken(40 /* AsteriskToken */), ts.setEmitFlags(call, 8388608 /* Iterator */))
+                : call;
+            return ts.createStatement(callResult);
+        }
+        function generateCallToConvertedLoop(loopFunctionExpressionName, state, outerState, containsYield) {
+            var statements = [];
+            // loop is considered simple if it does not have any return statements or break\continue that transfer control outside of the loop
+            // simple loops are emitted as just 'loop()';
+            // NOTE: if loop uses only 'continue' it still will be emitted as simple loop
+            var isSimpleLoop = !(state.nonLocalJumps & ~4 /* Continue */) &&
+                !state.labeledNonLocalBreaks &&
+                !state.labeledNonLocalContinues;
+            var call = ts.createCall(loopFunctionExpressionName, /*typeArguments*/ undefined, ts.map(state.loopParameters, function (p) { return p.name; }));
+            var callResult = containsYield
+                ? ts.createYield(ts.createToken(40 /* AsteriskToken */), ts.setEmitFlags(call, 8388608 /* Iterator */))
+                : call;
+            if (isSimpleLoop) {
+                statements.push(ts.createExpressionStatement(callResult));
+                copyOutParameters(state.loopOutParameters, 1 /* Body */, 0 /* ToOriginal */, statements);
+            }
+            else {
+                var loopResultName = ts.createUniqueName("state");
+                var stateVariable = ts.createVariableStatement(
+                /*modifiers*/ undefined, ts.createVariableDeclarationList([ts.createVariableDeclaration(loopResultName, /*type*/ undefined, callResult)]));
+                statements.push(stateVariable);
+                copyOutParameters(state.loopOutParameters, 1 /* Body */, 0 /* ToOriginal */, statements);
+                if (state.nonLocalJumps & 8 /* Return */) {
+                    var returnStatement = void 0;
+                    if (outerState) {
+                        outerState.nonLocalJumps |= 8 /* Return */;
+                        returnStatement = ts.createReturn(loopResultName);
+                    }
+                    else {
+                        returnStatement = ts.createReturn(ts.createPropertyAccess(loopResultName, "value"));
+                    }
+                    statements.push(ts.createIf(ts.createBinary(ts.createTypeOf(loopResultName), 35 /* EqualsEqualsEqualsToken */, ts.createLiteral("object")), returnStatement));
+                }
+                if (state.nonLocalJumps & 2 /* Break */) {
+                    statements.push(ts.createIf(ts.createBinary(loopResultName, 35 /* EqualsEqualsEqualsToken */, ts.createLiteral("break")), ts.createBreak()));
+                }
+                if (state.labeledNonLocalBreaks || state.labeledNonLocalContinues) {
+                    var caseClauses = [];
+                    processLabeledJumps(state.labeledNonLocalBreaks, /*isBreak*/ true, loopResultName, outerState, caseClauses);
+                    processLabeledJumps(state.labeledNonLocalContinues, /*isBreak*/ false, loopResultName, outerState, caseClauses);
+                    statements.push(ts.createSwitch(loopResultName, ts.createCaseBlock(caseClauses)));
+                }
+            }
+            return statements;
+        }
+        function setLabeledJump(state, isBreak, labelText, labelMarker) {
+            if (isBreak) {
+                if (!state.labeledNonLocalBreaks) {
+                    state.labeledNonLocalBreaks = ts.createMap();
+                }
+                state.labeledNonLocalBreaks.set(labelText, labelMarker);
+            }
+            else {
+                if (!state.labeledNonLocalContinues) {
+                    state.labeledNonLocalContinues = ts.createMap();
+                }
+                state.labeledNonLocalContinues.set(labelText, labelMarker);
+            }
+        }
+        function processLabeledJumps(table, isBreak, loopResultName, outerLoop, caseClauses) {
+            if (!table) {
+                return;
+            }
+            table.forEach(function (labelMarker, labelText) {
+                var statements = [];
+                // if there are no outer converted loop or outer label in question is located inside outer converted loop
+                // then emit labeled break\continue
+                // otherwise propagate pair 'label -> marker' to outer converted loop and emit 'return labelMarker' so outer loop can later decide what to do
+                if (!outerLoop || (outerLoop.labels && outerLoop.labels.get(labelText))) {
+                    var label = ts.createIdentifier(labelText);
+                    statements.push(isBreak ? ts.createBreak(label) : ts.createContinue(label));
+                }
+                else {
+                    setLabeledJump(outerLoop, isBreak, labelText, labelMarker);
+                    statements.push(ts.createReturn(loopResultName));
+                }
+                caseClauses.push(ts.createCaseClause(ts.createLiteral(labelMarker), statements));
+            });
+        }
+        function processLoopVariableDeclaration(container, decl, loopParameters, loopOutParameters, hasCapturedBindingsInForInitializer) {
+            var name = decl.name;
+            if (ts.isBindingPattern(name)) {
+                for (var _i = 0, _a = name.elements; _i < _a.length; _i++) {
+                    var element = _a[_i];
+                    if (!ts.isOmittedExpression(element)) {
+                        processLoopVariableDeclaration(container, element, loopParameters, loopOutParameters, hasCapturedBindingsInForInitializer);
+                    }
+                }
+            }
+            else {
+                loopParameters.push(ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, name));
+                var checkFlags = resolver.getNodeCheckFlags(decl);
+                if (checkFlags & 4194304 /* NeedsLoopOutParameter */ || hasCapturedBindingsInForInitializer) {
+                    var outParamName = ts.createUniqueName("out_" + ts.idText(name));
+                    var flags = 0;
+                    if (checkFlags & 4194304 /* NeedsLoopOutParameter */) {
+                        flags |= 1 /* Body */;
+                    }
+                    if (ts.isForStatement(container) && container.initializer && resolver.isBindingCapturedByNode(container.initializer, decl)) {
+                        flags |= 2 /* Initializer */;
+                    }
+                    loopOutParameters.push({ flags: flags, originalName: name, outParamName: outParamName });
+                }
+            }
+        }
+        /**
+         * Adds the members of an object literal to an array of expressions.
+         *
+         * @param expressions An array of expressions.
+         * @param node An ObjectLiteralExpression node.
+         * @param receiver The receiver for members of the ObjectLiteralExpression.
+         * @param numInitialNonComputedProperties The number of initial properties without
+         *                                        computed property names.
+         */
+        function addObjectLiteralMembers(expressions, node, receiver, start) {
+            var properties = node.properties;
+            var numProperties = properties.length;
+            for (var i = start; i < numProperties; i++) {
+                var property = properties[i];
+                switch (property.kind) {
+                    case 158 /* GetAccessor */:
+                    case 159 /* SetAccessor */:
+                        var accessors = ts.getAllAccessorDeclarations(node.properties, property);
+                        if (property === accessors.firstAccessor) {
+                            expressions.push(transformAccessorsToExpression(receiver, accessors, node, !!node.multiLine));
+                        }
+                        break;
+                    case 156 /* MethodDeclaration */:
+                        expressions.push(transformObjectLiteralMethodDeclarationToExpression(property, receiver, node, node.multiLine));
+                        break;
+                    case 275 /* PropertyAssignment */:
+                        expressions.push(transformPropertyAssignmentToExpression(property, receiver, node.multiLine));
+                        break;
+                    case 276 /* ShorthandPropertyAssignment */:
+                        expressions.push(transformShorthandPropertyAssignmentToExpression(property, receiver, node.multiLine));
+                        break;
+                    default:
+                        ts.Debug.failBadSyntaxKind(node);
+                        break;
+                }
+            }
+        }
+        /**
+         * Transforms a PropertyAssignment node into an expression.
+         *
+         * @param node The ObjectLiteralExpression that contains the PropertyAssignment.
+         * @param property The PropertyAssignment node.
+         * @param receiver The receiver for the assignment.
+         */
+        function transformPropertyAssignmentToExpression(property, receiver, startsOnNewLine) {
+            var expression = ts.createAssignment(ts.createMemberAccessForPropertyName(receiver, ts.visitNode(property.name, visitor, ts.isPropertyName)), ts.visitNode(property.initializer, visitor, ts.isExpression));
+            ts.setTextRange(expression, property);
+            if (startsOnNewLine) {
+                ts.startOnNewLine(expression);
+            }
+            return expression;
+        }
+        /**
+         * Transforms a ShorthandPropertyAssignment node into an expression.
+         *
+         * @param node The ObjectLiteralExpression that contains the ShorthandPropertyAssignment.
+         * @param property The ShorthandPropertyAssignment node.
+         * @param receiver The receiver for the assignment.
+         */
+        function transformShorthandPropertyAssignmentToExpression(property, receiver, startsOnNewLine) {
+            var expression = ts.createAssignment(ts.createMemberAccessForPropertyName(receiver, ts.visitNode(property.name, visitor, ts.isPropertyName)), ts.getSynthesizedClone(property.name));
+            ts.setTextRange(expression, property);
+            if (startsOnNewLine) {
+                ts.startOnNewLine(expression);
+            }
+            return expression;
+        }
+        /**
+         * Transforms a MethodDeclaration of an ObjectLiteralExpression into an expression.
+         *
+         * @param node The ObjectLiteralExpression that contains the MethodDeclaration.
+         * @param method The MethodDeclaration node.
+         * @param receiver The receiver for the assignment.
+         */
+        function transformObjectLiteralMethodDeclarationToExpression(method, receiver, container, startsOnNewLine) {
+            var ancestorFacts = enterSubtree(0 /* None */, 0 /* None */);
+            var expression = ts.createAssignment(ts.createMemberAccessForPropertyName(receiver, ts.visitNode(method.name, visitor, ts.isPropertyName)), transformFunctionLikeToExpression(method, /*location*/ method, /*name*/ undefined, container));
+            ts.setTextRange(expression, method);
+            if (startsOnNewLine) {
+                ts.startOnNewLine(expression);
+            }
+            exitSubtree(ancestorFacts, 49152 /* PropagateNewTargetMask */, hierarchyFacts & 49152 /* PropagateNewTargetMask */ ? 16384 /* NewTarget */ : 0 /* None */);
+            return expression;
+        }
+        function visitCatchClause(node) {
+            var ancestorFacts = enterSubtree(4032 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
+            var updated;
+            ts.Debug.assert(!!node.variableDeclaration, "Catch clause variable should always be present when downleveling ES2015.");
+            if (ts.isBindingPattern(node.variableDeclaration.name)) {
+                var temp = ts.createTempVariable(/*recordTempVariable*/ undefined);
+                var newVariableDeclaration = ts.createVariableDeclaration(temp);
+                ts.setTextRange(newVariableDeclaration, node.variableDeclaration);
+                var vars = ts.flattenDestructuringBinding(node.variableDeclaration, visitor, context, 0 /* All */, temp);
+                var list = ts.createVariableDeclarationList(vars);
+                ts.setTextRange(list, node.variableDeclaration);
+                var destructure = ts.createVariableStatement(/*modifiers*/ undefined, list);
+                updated = ts.updateCatchClause(node, newVariableDeclaration, addStatementToStartOfBlock(node.block, destructure));
+            }
+            else {
+                updated = ts.visitEachChild(node, visitor, context);
+            }
+            exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
+            return updated;
+        }
+        function addStatementToStartOfBlock(block, statement) {
+            var transformedStatements = ts.visitNodes(block.statements, visitor, ts.isStatement);
+            return ts.updateBlock(block, [statement].concat(transformedStatements));
+        }
+        /**
+         * Visits a MethodDeclaration of an ObjectLiteralExpression and transforms it into a
+         * PropertyAssignment.
+         *
+         * @param node A MethodDeclaration node.
+         */
+        function visitMethodDeclaration(node) {
+            // We should only get here for methods on an object literal with regular identifier names.
+            // Methods on classes are handled in visitClassDeclaration/visitClassExpression.
+            // Methods with computed property names are handled in visitObjectLiteralExpression.
+            ts.Debug.assert(!ts.isComputedPropertyName(node.name));
+            var functionExpression = transformFunctionLikeToExpression(node, /*location*/ ts.moveRangePos(node, -1), /*name*/ undefined, /*container*/ undefined);
+            ts.setEmitFlags(functionExpression, 512 /* NoLeadingComments */ | ts.getEmitFlags(functionExpression));
+            return ts.setTextRange(ts.createPropertyAssignment(node.name, functionExpression), 
+            /*location*/ node);
+        }
+        /**
+         * Visits an AccessorDeclaration of an ObjectLiteralExpression.
+         *
+         * @param node An AccessorDeclaration node.
+         */
+        function visitAccessorDeclaration(node) {
+            ts.Debug.assert(!ts.isComputedPropertyName(node.name));
+            var savedConvertedLoopState = convertedLoopState;
+            convertedLoopState = undefined;
+            var ancestorFacts = enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+            var updated;
+            var parameters = ts.visitParameterList(node.parameters, visitor, context);
+            var body = node.transformFlags & (16384 /* ContainsCapturedLexicalThis */ | 128 /* ContainsES2015 */)
+                ? transformFunctionBody(node)
+                : visitFunctionBodyDownLevel(node);
+            if (node.kind === 158 /* GetAccessor */) {
+                updated = ts.updateGetAccessor(node, node.decorators, node.modifiers, node.name, parameters, node.type, body);
+            }
+            else {
+                updated = ts.updateSetAccessor(node, node.decorators, node.modifiers, node.name, parameters, body);
+            }
+            exitSubtree(ancestorFacts, 49152 /* PropagateNewTargetMask */, 0 /* None */);
+            convertedLoopState = savedConvertedLoopState;
+            return updated;
+        }
+        /**
+         * Visits a ShorthandPropertyAssignment and transforms it into a PropertyAssignment.
+         *
+         * @param node A ShorthandPropertyAssignment node.
+         */
+        function visitShorthandPropertyAssignment(node) {
+            return ts.setTextRange(ts.createPropertyAssignment(node.name, ts.getSynthesizedClone(node.name)), 
+            /*location*/ node);
+        }
+        function visitComputedPropertyName(node) {
+            var ancestorFacts = enterSubtree(0 /* ComputedPropertyNameExcludes */, 8192 /* ComputedPropertyNameIncludes */);
+            var updated = ts.visitEachChild(node, visitor, context);
+            exitSubtree(ancestorFacts, 49152 /* PropagateNewTargetMask */, hierarchyFacts & 49152 /* PropagateNewTargetMask */ ? 32768 /* NewTargetInComputedPropertyName */ : 0 /* None */);
+            return updated;
+        }
+        /**
+         * Visits a YieldExpression node.
+         *
+         * @param node A YieldExpression node.
+         */
+        function visitYieldExpression(node) {
+            // `yield` expressions are transformed using the generators transformer.
+            return ts.visitEachChild(node, visitor, context);
+        }
+        /**
+         * Visits an ArrayLiteralExpression that contains a spread element.
+         *
+         * @param node An ArrayLiteralExpression node.
+         */
+        function visitArrayLiteralExpression(node) {
+            if (node.transformFlags & 64 /* ES2015 */) {
+                // We are here because we contain a SpreadElementExpression.
+                return transformAndSpreadElements(node.elements, /*needsUniqueCopy*/ true, !!node.multiLine, /*hasTrailingComma*/ !!node.elements.hasTrailingComma);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        /**
+         * Visits a CallExpression that contains either a spread element or `super`.
+         *
+         * @param node a CallExpression.
+         */
+        function visitCallExpression(node) {
+            if (ts.getEmitFlags(node) & 33554432 /* TypeScriptClassWrapper */) {
+                return visitTypeScriptClassWrapper(node);
+            }
+            if (node.transformFlags & 64 /* ES2015 */) {
+                return visitCallExpressionWithPotentialCapturedThisAssignment(node, /*assignToCapturedThis*/ true);
+            }
+            return ts.updateCall(node, ts.visitNode(node.expression, callExpressionVisitor, ts.isExpression), 
+            /*typeArguments*/ undefined, ts.visitNodes(node.arguments, visitor, ts.isExpression));
+        }
+        function visitTypeScriptClassWrapper(node) {
+            // This is a call to a class wrapper function (an IIFE) created by the 'ts' transformer.
+            // The wrapper has a form similar to:
+            //
+            //  (function() {
+            //      class C { // 1
+            //      }
+            //      C.x = 1; // 2
+            //      return C;
+            //  }())
+            //
+            // When we transform the class, we end up with something like this:
+            //
+            //  (function () {
+            //      var C = (function () { // 3
+            //          function C() {
+            //          }
+            //          return C; // 4
+            //      }());
+            //      C.x = 1;
+            //      return C;
+            //  }())
+            //
+            // We want to simplify the two nested IIFEs to end up with something like this:
+            //
+            //  (function () {
+            //      function C() {
+            //      }
+            //      C.x = 1;
+            //      return C;
+            //  }())
+            // We skip any outer expressions in a number of places to get to the innermost
+            // expression, but we will restore them later to preserve comments and source maps.
+            var body = ts.cast(ts.cast(ts.skipOuterExpressions(node.expression), ts.isArrowFunction).body, ts.isBlock);
+            // The class statements are the statements generated by visiting the first statement with initializer of the
+            // body (1), while all other statements are added to remainingStatements (2)
+            var isVariableStatementWithInitializer = function (stmt) { return ts.isVariableStatement(stmt) && !!ts.first(stmt.declarationList.declarations).initializer; };
+            var bodyStatements = ts.visitNodes(body.statements, visitor, ts.isStatement);
+            var classStatements = ts.filter(bodyStatements, isVariableStatementWithInitializer);
+            var remainingStatements = ts.filter(bodyStatements, function (stmt) { return !isVariableStatementWithInitializer(stmt); });
+            var varStatement = ts.cast(ts.first(classStatements), ts.isVariableStatement);
+            // We know there is only one variable declaration here as we verified this in an
+            // earlier call to isTypeScriptClassWrapper
+            var variable = varStatement.declarationList.declarations[0];
+            var initializer = ts.skipOuterExpressions(variable.initializer);
+            // Under certain conditions, the 'ts' transformer may introduce a class alias, which
+            // we see as an assignment, for example:
+            //
+            //  (function () {
+            //      var C_1;
+            //      var C = C_1 = (function () {
+            //          function C() {
+            //          }
+            //          C.x = function () { return C_1; }
+            //          return C;
+            //      }());
+            //      C = C_1 = __decorate([dec], C);
+            //      return C;
+            //  }())
+            //
+            var aliasAssignment = ts.tryCast(initializer, ts.isAssignmentExpression);
+            // The underlying call (3) is another IIFE that may contain a '_super' argument.
+            var call = ts.cast(aliasAssignment ? ts.skipOuterExpressions(aliasAssignment.right) : initializer, ts.isCallExpression);
+            var func = ts.cast(ts.skipOuterExpressions(call.expression), ts.isFunctionExpression);
+            var funcStatements = func.body.statements;
+            var classBodyStart = 0;
+            var classBodyEnd = -1;
+            var statements = [];
+            if (aliasAssignment) {
+                // If we have a class alias assignment, we need to move it to the down-level constructor
+                // function we generated for the class.
+                var extendsCall = ts.tryCast(funcStatements[classBodyStart], ts.isExpressionStatement);
+                if (extendsCall) {
+                    statements.push(extendsCall);
+                    classBodyStart++;
+                }
+                // The next statement is the function declaration.
+                statements.push(funcStatements[classBodyStart]);
+                classBodyStart++;
+                // Add the class alias following the declaration.
+                statements.push(ts.createExpressionStatement(ts.createAssignment(aliasAssignment.left, ts.cast(variable.name, ts.isIdentifier))));
+            }
+            // Find the trailing 'return' statement (4)
+            while (!ts.isReturnStatement(ts.elementAt(funcStatements, classBodyEnd))) {
+                classBodyEnd--;
+            }
+            // When we extract the statements of the inner IIFE, we exclude the 'return' statement (4)
+            // as we already have one that has been introduced by the 'ts' transformer.
+            ts.addRange(statements, funcStatements, classBodyStart, classBodyEnd);
+            if (classBodyEnd < -1) {
+                // If there were any hoisted declarations following the return statement, we should
+                // append them.
+                ts.addRange(statements, funcStatements, classBodyEnd + 1);
+            }
+            // Add the remaining statements of the outer wrapper.
+            ts.addRange(statements, remainingStatements);
+            // The 'es2015' class transform may add an end-of-declaration marker. If so we will add it
+            // after the remaining statements from the 'ts' transformer.
+            ts.addRange(statements, classStatements, /*start*/ 1);
+            // Recreate any outer parentheses or partially-emitted expressions to preserve source map
+            // and comment locations.
+            return ts.recreateOuterExpressions(node.expression, ts.recreateOuterExpressions(variable.initializer, ts.recreateOuterExpressions(aliasAssignment && aliasAssignment.right, ts.updateCall(call, ts.recreateOuterExpressions(call.expression, ts.updateFunctionExpression(func, 
+            /*modifiers*/ undefined, 
+            /*asteriskToken*/ undefined, 
+            /*name*/ undefined, 
+            /*typeParameters*/ undefined, func.parameters, 
+            /*type*/ undefined, ts.updateBlock(func.body, statements))), 
+            /*typeArguments*/ undefined, call.arguments))));
+        }
+        function visitImmediateSuperCallInBody(node) {
+            return visitCallExpressionWithPotentialCapturedThisAssignment(node, /*assignToCapturedThis*/ false);
+        }
+        function visitCallExpressionWithPotentialCapturedThisAssignment(node, assignToCapturedThis) {
+            // We are here either because SuperKeyword was used somewhere in the expression, or
+            // because we contain a SpreadElementExpression.
+            if (node.transformFlags & 131072 /* ContainsRestOrSpread */ ||
+                node.expression.kind === 98 /* SuperKeyword */ ||
+                ts.isSuperProperty(ts.skipOuterExpressions(node.expression))) {
+                var _a = ts.createCallBinding(node.expression, hoistVariableDeclaration), target = _a.target, thisArg = _a.thisArg;
+                if (node.expression.kind === 98 /* SuperKeyword */) {
+                    ts.setEmitFlags(thisArg, 4 /* NoSubstitution */);
+                }
+                var resultingCall = void 0;
+                if (node.transformFlags & 131072 /* ContainsRestOrSpread */) {
+                    // [source]
+                    //      f(...a, b)
+                    //      x.m(...a, b)
+                    //      super(...a, b)
+                    //      super.m(...a, b) // in static
+                    //      super.m(...a, b) // in instance
+                    //
+                    // [output]
+                    //      f.apply(void 0, a.concat([b]))
+                    //      (_a = x).m.apply(_a, a.concat([b]))
+                    //      _super.apply(this, a.concat([b]))
+                    //      _super.m.apply(this, a.concat([b]))
+                    //      _super.prototype.m.apply(this, a.concat([b]))
+                    resultingCall = ts.createFunctionApply(ts.visitNode(target, callExpressionVisitor, ts.isExpression), ts.visitNode(thisArg, visitor, ts.isExpression), transformAndSpreadElements(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*hasTrailingComma*/ false));
+                }
+                else {
+                    // [source]
+                    //      super(a)
+                    //      super.m(a) // in static
+                    //      super.m(a) // in instance
+                    //
+                    // [output]
+                    //      _super.call(this, a)
+                    //      _super.m.call(this, a)
+                    //      _super.prototype.m.call(this, a)
+                    resultingCall = ts.createFunctionCall(ts.visitNode(target, callExpressionVisitor, ts.isExpression), ts.visitNode(thisArg, visitor, ts.isExpression), ts.visitNodes(node.arguments, visitor, ts.isExpression), 
+                    /*location*/ node);
+                }
+                if (node.expression.kind === 98 /* SuperKeyword */) {
+                    var actualThis = ts.createThis();
+                    ts.setEmitFlags(actualThis, 4 /* NoSubstitution */);
+                    var initializer = ts.createLogicalOr(resultingCall, actualThis);
+                    resultingCall = assignToCapturedThis
+                        ? ts.createAssignment(ts.createFileLevelUniqueName("_this"), initializer)
+                        : initializer;
+                }
+                return ts.setOriginalNode(resultingCall, node);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        /**
+         * Visits a NewExpression that contains a spread element.
+         *
+         * @param node A NewExpression node.
+         */
+        function visitNewExpression(node) {
+            if (node.transformFlags & 131072 /* ContainsRestOrSpread */) {
+                // We are here because we contain a SpreadElementExpression.
+                // [source]
+                //      new C(...a)
+                //
+                // [output]
+                //      new ((_a = C).bind.apply(_a, [void 0].concat(a)))()
+                var _a = ts.createCallBinding(ts.createPropertyAccess(node.expression, "bind"), hoistVariableDeclaration), target = _a.target, thisArg = _a.thisArg;
+                return ts.createNew(ts.createFunctionApply(ts.visitNode(target, visitor, ts.isExpression), thisArg, transformAndSpreadElements(ts.createNodeArray([ts.createVoidZero()].concat(node.arguments)), /*needsUniqueCopy*/ false, /*multiLine*/ false, /*hasTrailingComma*/ false)), 
+                /*typeArguments*/ undefined, []);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        /**
+         * Transforms an array of Expression nodes that contains a SpreadExpression.
+         *
+         * @param elements The array of Expression nodes.
+         * @param needsUniqueCopy A value indicating whether to ensure that the result is a fresh array.
+         * @param multiLine A value indicating whether the result should be emitted on multiple lines.
+         */
+        function transformAndSpreadElements(elements, needsUniqueCopy, multiLine, hasTrailingComma) {
+            // [source]
+            //      [a, ...b, c]
+            //
+            // [output]
+            //      [a].concat(b, [c])
+            // Map spans of spread expressions into their expressions and spans of other
+            // expressions into an array literal.
+            var numElements = elements.length;
+            var segments = ts.flatten(ts.spanMap(elements, partitionSpread, function (partition, visitPartition, _start, end) {
+                return visitPartition(partition, multiLine, hasTrailingComma && end === numElements);
+            }));
+            if (compilerOptions.downlevelIteration) {
+                if (segments.length === 1) {
+                    var firstSegment = segments[0];
+                    if (ts.isCallExpression(firstSegment)
+                        && ts.isIdentifier(firstSegment.expression)
+                        && (ts.getEmitFlags(firstSegment.expression) & 4096 /* HelperName */)
+                        && firstSegment.expression.escapedText === "___spread") {
+                        return segments[0];
+                    }
+                }
+                return ts.createSpreadHelper(context, segments);
+            }
+            else {
+                if (segments.length === 1) {
+                    var firstElement = elements[0];
+                    return needsUniqueCopy && ts.isSpreadElement(firstElement) && firstElement.expression.kind !== 187 /* ArrayLiteralExpression */
+                        ? ts.createArraySlice(segments[0])
+                        : segments[0];
+                }
+                // Rewrite using the pattern <segment0>.concat(<segment1>, <segment2>, ...)
+                return ts.createArrayConcat(segments.shift(), segments);
+            }
+        }
+        function partitionSpread(node) {
+            return ts.isSpreadElement(node)
+                ? visitSpanOfSpreads
+                : visitSpanOfNonSpreads;
+        }
+        function visitSpanOfSpreads(chunk) {
+            return ts.map(chunk, visitExpressionOfSpread);
+        }
+        function visitSpanOfNonSpreads(chunk, multiLine, hasTrailingComma) {
+            return ts.createArrayLiteral(ts.visitNodes(ts.createNodeArray(chunk, hasTrailingComma), visitor, ts.isExpression), multiLine);
+        }
+        function visitSpreadElement(node) {
+            return ts.visitNode(node.expression, visitor, ts.isExpression);
+        }
+        /**
+         * Transforms the expression of a SpreadExpression node.
+         *
+         * @param node A SpreadExpression node.
+         */
+        function visitExpressionOfSpread(node) {
+            return ts.visitNode(node.expression, visitor, ts.isExpression);
+        }
+        /**
+         * Visits a template literal.
+         *
+         * @param node A template literal.
+         */
+        function visitTemplateLiteral(node) {
+            return ts.setTextRange(ts.createLiteral(node.text), node);
+        }
+        /**
+         * Visits a string literal with an extended unicode escape.
+         *
+         * @param node A string literal.
+         */
+        function visitStringLiteral(node) {
+            if (node.hasExtendedUnicodeEscape) {
+                return ts.setTextRange(ts.createLiteral(node.text), node);
+            }
+            return node;
+        }
+        /**
+         * Visits a binary or octal (ES6) numeric literal.
+         *
+         * @param node A string literal.
+         */
+        function visitNumericLiteral(node) {
+            if (node.numericLiteralFlags & 384 /* BinaryOrOctalSpecifier */) {
+                return ts.setTextRange(ts.createNumericLiteral(node.text), node);
+            }
+            return node;
+        }
+        /**
+         * Visits a TaggedTemplateExpression node.
+         *
+         * @param node A TaggedTemplateExpression node.
+         */
+        function visitTaggedTemplateExpression(node) {
+            // Visit the tag expression
+            var tag = ts.visitNode(node.tag, visitor, ts.isExpression);
+            // Build up the template arguments and the raw and cooked strings for the template.
+            // We start out with 'undefined' for the first argument and revisit later
+            // to avoid walking over the template string twice and shifting all our arguments over after the fact.
+            var templateArguments = [undefined];
+            var cookedStrings = [];
+            var rawStrings = [];
+            var template = node.template;
+            if (ts.isNoSubstitutionTemplateLiteral(template)) {
+                cookedStrings.push(ts.createLiteral(template.text));
+                rawStrings.push(getRawLiteral(template));
+            }
+            else {
+                cookedStrings.push(ts.createLiteral(template.head.text));
+                rawStrings.push(getRawLiteral(template.head));
+                for (var _i = 0, _a = template.templateSpans; _i < _a.length; _i++) {
+                    var templateSpan = _a[_i];
+                    cookedStrings.push(ts.createLiteral(templateSpan.literal.text));
+                    rawStrings.push(getRawLiteral(templateSpan.literal));
+                    templateArguments.push(ts.visitNode(templateSpan.expression, visitor, ts.isExpression));
+                }
+            }
+            var helperCall = createTemplateObjectHelper(context, ts.createArrayLiteral(cookedStrings), ts.createArrayLiteral(rawStrings));
+            // Create a variable to cache the template object if we're in a module.
+            // Do not do this in the global scope, as any variable we currently generate could conflict with
+            // variables from outside of the current compilation. In the future, we can revisit this behavior.
+            if (ts.isExternalModule(currentSourceFile)) {
+                var tempVar = ts.createUniqueName("templateObject");
+                recordTaggedTemplateString(tempVar);
+                templateArguments[0] = ts.createLogicalOr(tempVar, ts.createAssignment(tempVar, helperCall));
+            }
+            else {
+                templateArguments[0] = helperCall;
+            }
+            return ts.createCall(tag, /*typeArguments*/ undefined, templateArguments);
+        }
+        /**
+         * Creates an ES5 compatible literal from an ES6 template literal.
+         *
+         * @param node The ES6 template literal.
+         */
+        function getRawLiteral(node) {
+            // Find original source text, since we need to emit the raw strings of the tagged template.
+            // The raw strings contain the (escaped) strings of what the user wrote.
+            // Examples: `\n` is converted to "\\n", a template string with a newline to "\n".
+            var text = ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node);
+            // text contains the original source, it will also contain quotes ("`"), dolar signs and braces ("${" and "}"),
+            // thus we need to remove those characters.
+            // First template piece starts with "`", others with "}"
+            // Last template piece ends with "`", others with "${"
+            var isLast = node.kind === 14 /* NoSubstitutionTemplateLiteral */ || node.kind === 17 /* TemplateTail */;
+            text = text.substring(1, text.length - (isLast ? 1 : 2));
+            // Newline normalization:
+            // ES6 Spec 11.8.6.1 - Static Semantics of TV's and TRV's
+            // <CR><LF> and <CR> LineTerminatorSequences are normalized to <LF> for both TV and TRV.
+            text = text.replace(/\r\n?/g, "\n");
+            return ts.setTextRange(ts.createLiteral(text), node);
+        }
+        /**
+         * Visits a TemplateExpression node.
+         *
+         * @param node A TemplateExpression node.
+         */
+        function visitTemplateExpression(node) {
+            var expressions = [];
+            addTemplateHead(expressions, node);
+            addTemplateSpans(expressions, node);
+            // createAdd will check if each expression binds less closely than binary '+'.
+            // If it does, it wraps the expression in parentheses. Otherwise, something like
+            //    `abc${ 1 << 2 }`
+            // becomes
+            //    "abc" + 1 << 2 + ""
+            // which is really
+            //    ("abc" + 1) << (2 + "")
+            // rather than
+            //    "abc" + (1 << 2) + ""
+            var expression = ts.reduceLeft(expressions, ts.createAdd);
+            if (ts.nodeIsSynthesized(expression)) {
+                expression.pos = node.pos;
+                expression.end = node.end;
+            }
+            return expression;
+        }
+        /**
+         * Gets a value indicating whether we need to include the head of a TemplateExpression.
+         *
+         * @param node A TemplateExpression node.
+         */
+        function shouldAddTemplateHead(node) {
+            // If this expression has an empty head literal and the first template span has a non-empty
+            // literal, then emitting the empty head literal is not necessary.
+            //     `${ foo } and ${ bar }`
+            // can be emitted as
+            //     foo + " and " + bar
+            // This is because it is only required that one of the first two operands in the emit
+            // output must be a string literal, so that the other operand and all following operands
+            // are forced into strings.
+            //
+            // If the first template span has an empty literal, then the head must still be emitted.
+            //     `${ foo }${ bar }`
+            // must still be emitted as
+            //     "" + foo + bar
+            // There is always atleast one templateSpan in this code path, since
+            // NoSubstitutionTemplateLiterals are directly emitted via emitLiteral()
+            ts.Debug.assert(node.templateSpans.length !== 0);
+            return node.head.text.length !== 0 || node.templateSpans[0].literal.text.length === 0;
+        }
+        /**
+         * Adds the head of a TemplateExpression to an array of expressions.
+         *
+         * @param expressions An array of expressions.
+         * @param node A TemplateExpression node.
+         */
+        function addTemplateHead(expressions, node) {
+            if (!shouldAddTemplateHead(node)) {
+                return;
+            }
+            expressions.push(ts.createLiteral(node.head.text));
+        }
+        /**
+         * Visits and adds the template spans of a TemplateExpression to an array of expressions.
+         *
+         * @param expressions An array of expressions.
+         * @param node A TemplateExpression node.
+         */
+        function addTemplateSpans(expressions, node) {
+            for (var _i = 0, _a = node.templateSpans; _i < _a.length; _i++) {
+                var span = _a[_i];
+                expressions.push(ts.visitNode(span.expression, visitor, ts.isExpression));
+                // Only emit if the literal is non-empty.
+                // The binary '+' operator is left-associative, so the first string concatenation
+                // with the head will force the result up to this point to be a string.
+                // Emitting a '+ ""' has no semantic effect for middles and tails.
+                if (span.literal.text.length !== 0) {
+                    expressions.push(ts.createLiteral(span.literal.text));
+                }
+            }
+        }
+        /**
+         * Visits the `super` keyword
+         */
+        function visitSuperKeyword(isExpressionOfCall) {
+            return hierarchyFacts & 8 /* NonStaticClassElement */
+                && !isExpressionOfCall
+                ? ts.createPropertyAccess(ts.createFileLevelUniqueName("_super"), "prototype")
+                : ts.createFileLevelUniqueName("_super");
+        }
+        function visitMetaProperty(node) {
+            if (node.keywordToken === 95 /* NewKeyword */ && node.name.escapedText === "target") {
+                if (hierarchyFacts & 8192 /* ComputedPropertyName */) {
+                    hierarchyFacts |= 32768 /* NewTargetInComputedPropertyName */;
+                }
+                else {
+                    hierarchyFacts |= 16384 /* NewTarget */;
+                }
+                return ts.createFileLevelUniqueName("_newTarget");
+            }
+            return node;
+        }
+        /**
+         * Called by the printer just before a node is printed.
+         *
+         * @param hint A hint as to the intended usage of the node.
+         * @param node The node to be printed.
+         * @param emitCallback The callback used to emit the node.
+         */
+        function onEmitNode(hint, node, emitCallback) {
+            if (enabledSubstitutions & 1 /* CapturedThis */ && ts.isFunctionLike(node)) {
+                // If we are tracking a captured `this`, keep track of the enclosing function.
+                var ancestorFacts = enterSubtree(16286 /* FunctionExcludes */, ts.getEmitFlags(node) & 8 /* CapturesThis */
+                    ? 65 /* FunctionIncludes */ | 16 /* CapturesThis */
+                    : 65 /* FunctionIncludes */);
+                previousOnEmitNode(hint, node, emitCallback);
+                exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
+                return;
+            }
+            previousOnEmitNode(hint, node, emitCallback);
+        }
+        /**
+         * Enables a more costly code path for substitutions when we determine a source file
+         * contains block-scoped bindings (e.g. `let` or `const`).
+         */
+        function enableSubstitutionsForBlockScopedBindings() {
+            if ((enabledSubstitutions & 2 /* BlockScopedBindings */) === 0) {
+                enabledSubstitutions |= 2 /* BlockScopedBindings */;
+                context.enableSubstitution(72 /* Identifier */);
+            }
+        }
+        /**
+         * Enables a more costly code path for substitutions when we determine a source file
+         * contains a captured `this`.
+         */
+        function enableSubstitutionsForCapturedThis() {
+            if ((enabledSubstitutions & 1 /* CapturedThis */) === 0) {
+                enabledSubstitutions |= 1 /* CapturedThis */;
+                context.enableSubstitution(100 /* ThisKeyword */);
+                context.enableEmitNotification(157 /* Constructor */);
+                context.enableEmitNotification(156 /* MethodDeclaration */);
+                context.enableEmitNotification(158 /* GetAccessor */);
+                context.enableEmitNotification(159 /* SetAccessor */);
+                context.enableEmitNotification(197 /* ArrowFunction */);
+                context.enableEmitNotification(196 /* FunctionExpression */);
+                context.enableEmitNotification(239 /* FunctionDeclaration */);
+            }
+        }
+        /**
+         * Hooks node substitutions.
+         *
+         * @param hint The context for the emitter.
+         * @param node The node to substitute.
+         */
+        function onSubstituteNode(hint, node) {
+            node = previousOnSubstituteNode(hint, node);
+            if (hint === 1 /* Expression */) {
+                return substituteExpression(node);
+            }
+            if (ts.isIdentifier(node)) {
+                return substituteIdentifier(node);
+            }
+            return node;
+        }
+        /**
+         * Hooks substitutions for non-expression identifiers.
+         */
+        function substituteIdentifier(node) {
+            // Only substitute the identifier if we have enabled substitutions for block-scoped
+            // bindings.
+            if (enabledSubstitutions & 2 /* BlockScopedBindings */ && !ts.isInternalName(node)) {
+                var original = ts.getParseTreeNode(node, ts.isIdentifier);
+                if (original && isNameOfDeclarationWithCollidingName(original)) {
+                    return ts.setTextRange(ts.getGeneratedNameForNode(original), node);
+                }
+            }
+            return node;
+        }
+        /**
+         * Determines whether a name is the name of a declaration with a colliding name.
+         * NOTE: This function expects to be called with an original source tree node.
+         *
+         * @param node An original source tree node.
+         */
+        function isNameOfDeclarationWithCollidingName(node) {
+            switch (node.parent.kind) {
+                case 186 /* BindingElement */:
+                case 240 /* ClassDeclaration */:
+                case 243 /* EnumDeclaration */:
+                case 237 /* VariableDeclaration */:
+                    return node.parent.name === node
+                        && resolver.isDeclarationWithCollidingName(node.parent);
+            }
+            return false;
+        }
+        /**
+         * Substitutes an expression.
+         *
+         * @param node An Expression node.
+         */
+        function substituteExpression(node) {
+            switch (node.kind) {
+                case 72 /* Identifier */:
+                    return substituteExpressionIdentifier(node);
+                case 100 /* ThisKeyword */:
+                    return substituteThisKeyword(node);
+            }
+            return node;
+        }
+        /**
+         * Substitutes an expression identifier.
+         *
+         * @param node An Identifier node.
+         */
+        function substituteExpressionIdentifier(node) {
+            if (enabledSubstitutions & 2 /* BlockScopedBindings */ && !ts.isInternalName(node)) {
+                var declaration = resolver.getReferencedDeclarationWithCollidingName(node);
+                if (declaration && !(ts.isClassLike(declaration) && isPartOfClassBody(declaration, node))) {
+                    return ts.setTextRange(ts.getGeneratedNameForNode(ts.getNameOfDeclaration(declaration)), node);
+                }
+            }
+            return node;
+        }
+        function isPartOfClassBody(declaration, node) {
+            var currentNode = ts.getParseTreeNode(node);
+            if (!currentNode || currentNode === declaration || currentNode.end <= declaration.pos || currentNode.pos >= declaration.end) {
+                // if the node has no correlation to a parse tree node, its definitely not
+                // part of the body.
+                // if the node is outside of the document range of the declaration, its
+                // definitely not part of the body.
+                return false;
+            }
+            var blockScope = ts.getEnclosingBlockScopeContainer(declaration);
+            while (currentNode) {
+                if (currentNode === blockScope || currentNode === declaration) {
+                    // if we are in the enclosing block scope of the declaration, we are definitely
+                    // not inside the class body.
+                    return false;
+                }
+                if (ts.isClassElement(currentNode) && currentNode.parent === declaration) {
+                    return true;
+                }
+                currentNode = currentNode.parent;
+            }
+            return false;
+        }
+        /**
+         * Substitutes `this` when contained within an arrow function.
+         *
+         * @param node The ThisKeyword node.
+         */
+        function substituteThisKeyword(node) {
+            if (enabledSubstitutions & 1 /* CapturedThis */
+                && hierarchyFacts & 16 /* CapturesThis */) {
+                return ts.setTextRange(ts.createFileLevelUniqueName("_this"), node);
+            }
+            return node;
+        }
+        function getClassMemberPrefix(node, member) {
+            return ts.hasModifier(member, 32 /* Static */)
+                ? ts.getInternalName(node)
+                : ts.createPropertyAccess(ts.getInternalName(node), "prototype");
+        }
+        function hasSynthesizedDefaultSuperCall(constructor, hasExtendsClause) {
+            if (!constructor || !hasExtendsClause) {
+                return false;
+            }
+            if (ts.some(constructor.parameters)) {
+                return false;
+            }
+            var statement = ts.firstOrUndefined(constructor.body.statements);
+            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 221 /* ExpressionStatement */) {
+                return false;
+            }
+            var statementExpression = statement.expression;
+            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 191 /* CallExpression */) {
+                return false;
+            }
+            var callTarget = statementExpression.expression;
+            if (!ts.nodeIsSynthesized(callTarget) || callTarget.kind !== 98 /* SuperKeyword */) {
+                return false;
+            }
+            var callArgument = ts.singleOrUndefined(statementExpression.arguments);
+            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 208 /* SpreadElement */) {
+                return false;
+            }
+            var expression = callArgument.expression;
+            return ts.isIdentifier(expression) && expression.escapedText === "arguments";
+        }
+    }
+    ts.transformES2015 = transformES2015;
+    function createExtendsHelper(context, name) {
+        context.requestEmitHelper(extendsHelper);
+        return ts.createCall(ts.getHelperName("__extends"), 
+        /*typeArguments*/ undefined, [
+            name,
+            ts.createFileLevelUniqueName("_super")
+        ]);
+    }
+    function createTemplateObjectHelper(context, cooked, raw) {
+        context.requestEmitHelper(templateObjectHelper);
+        return ts.createCall(ts.getHelperName("__makeTemplateObject"), 
+        /*typeArguments*/ undefined, [
+            cooked,
+            raw
+        ]);
+    }
+    var extendsHelper = {
+        name: "typescript:extends",
+        scoped: false,
+        priority: 0,
+        text: "\n            var __extends = (this && this.__extends) || (function () {\n                var extendStatics = function (d, b) {\n                    extendStatics = Object.setPrototypeOf ||\n                        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||\n                        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };\n                    return extendStatics(d, b);\n                };\n\n                return function (d, b) {\n                    extendStatics(d, b);\n                    function __() { this.constructor = d; }\n                    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());\n                };\n            })();"
+    };
+    var templateObjectHelper = {
+        name: "typescript:makeTemplateObject",
+        scoped: false,
+        priority: 0,
+        text: "\n            var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {\n                if (Object.defineProperty) { Object.defineProperty(cooked, \"raw\", { value: raw }); } else { cooked.raw = raw; }\n                return cooked;\n            };"
+    };
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
+(function (ts) {
+    /**
+     * Transforms ES5 syntax into ES3 syntax.
+     *
+     * @param context Context and state information for the transformation.
+     */
+    function transformES5(context) {
+        var compilerOptions = context.getCompilerOptions();
+        // enable emit notification only if using --jsx preserve or react-native
+        var previousOnEmitNode;
+        var noSubstitution;
+        if (compilerOptions.jsx === 1 /* Preserve */ || compilerOptions.jsx === 3 /* ReactNative */) {
+            previousOnEmitNode = context.onEmitNode;
+            context.onEmitNode = onEmitNode;
+            context.enableEmitNotification(262 /* JsxOpeningElement */);
+            context.enableEmitNotification(263 /* JsxClosingElement */);
+            context.enableEmitNotification(261 /* JsxSelfClosingElement */);
+            noSubstitution = [];
+        }
+        var previousOnSubstituteNode = context.onSubstituteNode;
+        context.onSubstituteNode = onSubstituteNode;
+        context.enableSubstitution(189 /* PropertyAccessExpression */);
+        context.enableSubstitution(275 /* PropertyAssignment */);
+        return ts.chainBundle(transformSourceFile);
+        /**
+         * Transforms an ES5 source file to ES3.
+         *
+         * @param node A SourceFile
+         */
+        function transformSourceFile(node) {
+            return node;
+        }
+        /**
+         * Called by the printer just before a node is printed.
+         *
+         * @param hint A hint as to the intended usage of the node.
+         * @param node The node to emit.
+         * @param emitCallback A callback used to emit the node.
+         */
+        function onEmitNode(hint, node, emitCallback) {
+            switch (node.kind) {
+                case 262 /* JsxOpeningElement */:
+                case 263 /* JsxClosingElement */:
+                case 261 /* JsxSelfClosingElement */:
+                    var tagName = node.tagName;
+                    noSubstitution[ts.getOriginalNodeId(tagName)] = true;
+                    break;
+            }
+            previousOnEmitNode(hint, node, emitCallback);
+        }
+        /**
+         * Hooks node substitutions.
+         *
+         * @param hint A hint as to the intended usage of the node.
+         * @param node The node to substitute.
+         */
+        function onSubstituteNode(hint, node) {
+            if (node.id && noSubstitution && noSubstitution[node.id]) {
+                return previousOnSubstituteNode(hint, node);
+            }
+            node = previousOnSubstituteNode(hint, node);
+            if (ts.isPropertyAccessExpression(node)) {
+                return substitutePropertyAccessExpression(node);
+            }
+            else if (ts.isPropertyAssignment(node)) {
+                return substitutePropertyAssignment(node);
+            }
+            return node;
+        }
+        /**
+         * Substitutes a PropertyAccessExpression whose name is a reserved word.
+         *
+         * @param node A PropertyAccessExpression
+         */
+        function substitutePropertyAccessExpression(node) {
+            var literalName = trySubstituteReservedName(node.name);
+            if (literalName) {
+                return ts.setTextRange(ts.createElementAccess(node.expression, literalName), node);
+            }
+            return node;
+        }
+        /**
+         * Substitutes a PropertyAssignment whose name is a reserved word.
+         *
+         * @param node A PropertyAssignment
+         */
+        function substitutePropertyAssignment(node) {
+            var literalName = ts.isIdentifier(node.name) && trySubstituteReservedName(node.name);
+            if (literalName) {
+                return ts.updatePropertyAssignment(node, literalName, node.initializer);
+            }
+            return node;
+        }
+        /**
+         * If an identifier name is a reserved word, returns a string literal for the name.
+         *
+         * @param name An Identifier
+         */
+        function trySubstituteReservedName(name) {
+            var token = name.originalKeywordKind || (ts.nodeIsSynthesized(name) ? ts.stringToToken(ts.idText(name)) : undefined);
+            if (token !== undefined && token >= 73 /* FirstReservedWord */ && token <= 108 /* LastReservedWord */) {
+                return ts.setTextRange(ts.createLiteral(name), name);
+            }
+            return undefined;
+        }
+    }
+    ts.transformES5 = transformES5;
+})(ts || (ts = {}));
+// Transforms generator functions into a compatible ES5 representation with similar runtime
+// semantics. This is accomplished by first transforming the body of each generator
+// function into an intermediate representation that is the compiled into a JavaScript
+// switch statement.
+//
+// Many functions in this transformer will contain comments indicating the expected
+// intermediate representation. For illustrative purposes, the following intermediate
+// language is used to define this intermediate representation:
+//
+//  .nop                            - Performs no operation.
+//  .local NAME, ...                - Define local variable declarations.
+//  .mark LABEL                     - Mark the location of a label.
+//  .br LABEL                       - Jump to a label. If jumping out of a protected
+//                                    region, all .finally blocks are executed.
+//  .brtrue LABEL, (x)              - Jump to a label IIF the expression `x` is truthy.
+//                                    If jumping out of a protected region, all .finally
+//                                    blocks are executed.
+//  .brfalse LABEL, (x)             - Jump to a label IIF the expression `x` is falsey.
+//                                    If jumping out of a protected region, all .finally
+//                                    blocks are executed.
+//  .yield (x)                      - Yield the value of the optional expression `x`.
+//                                    Resume at the next label.
+//  .yieldstar (x)                  - Delegate yield to the value of the optional
+//                                    expression `x`. Resume at the next label.
+//                                    NOTE: `x` must be an Iterator, not an Iterable.
+//  .loop CONTINUE, BREAK           - Marks the beginning of a loop. Any "continue" or
+//                                    "break" abrupt completions jump to the CONTINUE or
+//                                    BREAK labels, respectively.
+//  .endloop                        - Marks the end of a loop.
+//  .with (x)                       - Marks the beginning of a WithStatement block, using
+//                                    the supplied expression.
+//  .endwith                        - Marks the end of a WithStatement.
+//  .switch                         - Marks the beginning of a SwitchStatement.
+//  .endswitch                      - Marks the end of a SwitchStatement.
+//  .labeled NAME                   - Marks the beginning of a LabeledStatement with the
+//                                    supplied name.
+//  .endlabeled                     - Marks the end of a LabeledStatement.
+//  .try TRY, CATCH, FINALLY, END   - Marks the beginning of a protected region, and the
+//                                    labels for each block.
+//  .catch (x)                      - Marks the beginning of a catch block.
+//  .finally                        - Marks the beginning of a finally block.
+//  .endfinally                     - Marks the end of a finally block.
+//  .endtry                         - Marks the end of a protected region.
+//  .throw (x)                      - Throws the value of the expression `x`.
+//  .return (x)                     - Returns the value of the expression `x`.
+//
+// In addition, the illustrative intermediate representation introduces some special
+// variables:
+//
+//  %sent%                          - Either returns the next value sent to the generator,
+//                                    returns the result of a delegated yield, or throws
+//                                    the exception sent to the generator.
+//  %error%                         - Returns the value of the current exception in a
+//                                    catch block.
+//
+// This intermediate representation is then compiled into JavaScript syntax. The resulting
+// compilation output looks something like the following:
+//
+//  function f() {
+//      var /*locals*/;
+//      /*functions*/
+//      return __generator(function (state) {
+//          switch (state.label) {
+//              /*cases per label*/
+//          }
+//      });
+//  }
+//
+// Each of the above instructions corresponds to JavaScript emit similar to the following:
+//
+//  .local NAME                   | var NAME;
+// -------------------------------|----------------------------------------------
+//  .mark LABEL                   | case LABEL:
+// -------------------------------|----------------------------------------------
+//  .br LABEL                     |     return [3 /*break*/, LABEL];
+// -------------------------------|----------------------------------------------
+//  .brtrue LABEL, (x)            |     if (x) return [3 /*break*/, LABEL];
+// -------------------------------|----------------------------------------------
+//  .brfalse LABEL, (x)           |     if (!(x)) return [3, /*break*/, LABEL];
+// -------------------------------|----------------------------------------------
+//  .yield (x)                    |     return [4 /*yield*/, x];
+//  .mark RESUME                  | case RESUME:
+//      a = %sent%;               |     a = state.sent();
+// -------------------------------|----------------------------------------------
+//  .yieldstar (x)                |     return [5 /*yield**/, x];
+//  .mark RESUME                  | case RESUME:
+//      a = %sent%;               |     a = state.sent();
+// -------------------------------|----------------------------------------------
+//  .with (_a)                    |     with (_a) {
+//      a();                      |         a();
+//                                |     }
+//                                |     state.label = LABEL;
+//  .mark LABEL                   | case LABEL:
+//                                |     with (_a) {
+//      b();                      |         b();
+//                                |     }
+//  .endwith                      |
+// -------------------------------|----------------------------------------------
+//                                | case 0:
+//                                |     state.trys = [];
+//                                | ...
+//  .try TRY, CATCH, FINALLY, END |
+//  .mark TRY                     | case TRY:
+//                                |     state.trys.push([TRY, CATCH, FINALLY, END]);
+//  .nop                          |
+//      a();                      |     a();
+//  .br END                       |     return [3 /*break*/, END];
+//  .catch (e)                    |
+//  .mark CATCH                   | case CATCH:
+//                                |     e = state.sent();
+//      b();                      |     b();
+//  .br END                       |     return [3 /*break*/, END];
+//  .finally                      |
+//  .mark FINALLY                 | case FINALLY:
+//      c();                      |     c();
+//  .endfinally                   |     return [7 /*endfinally*/];
+//  .endtry                       |
+//  .mark END                     | case END:
+/*@internal*/
+var ts;
+(function (ts) {
+    var OpCode;
+    (function (OpCode) {
+        OpCode[OpCode["Nop"] = 0] = "Nop";
+        OpCode[OpCode["Statement"] = 1] = "Statement";
+        OpCode[OpCode["Assign"] = 2] = "Assign";
+        OpCode[OpCode["Break"] = 3] = "Break";
+        OpCode[OpCode["BreakWhenTrue"] = 4] = "BreakWhenTrue";
+        OpCode[OpCode["BreakWhenFalse"] = 5] = "BreakWhenFalse";
+        OpCode[OpCode["Yield"] = 6] = "Yield";
+        OpCode[OpCode["YieldStar"] = 7] = "YieldStar";
+        OpCode[OpCode["Return"] = 8] = "Return";
+        OpCode[OpCode["Throw"] = 9] = "Throw";
+        OpCode[OpCode["Endfinally"] = 10] = "Endfinally"; // Marks the end of a `finally` block
+    })(OpCode || (OpCode = {}));
+    // whether a generated code block is opening or closing at the current operation for a FunctionBuilder
+    var BlockAction;
+    (function (BlockAction) {
+        BlockAction[BlockAction["Open"] = 0] = "Open";
+        BlockAction[BlockAction["Close"] = 1] = "Close";
+    })(BlockAction || (BlockAction = {}));
+    // the kind for a generated code block in a FunctionBuilder
+    var CodeBlockKind;
+    (function (CodeBlockKind) {
+        CodeBlockKind[CodeBlockKind["Exception"] = 0] = "Exception";
+        CodeBlockKind[CodeBlockKind["With"] = 1] = "With";
+        CodeBlockKind[CodeBlockKind["Switch"] = 2] = "Switch";
+        CodeBlockKind[CodeBlockKind["Loop"] = 3] = "Loop";
+        CodeBlockKind[CodeBlockKind["Labeled"] = 4] = "Labeled";
+    })(CodeBlockKind || (CodeBlockKind = {}));
+    // the state for a generated code exception block
+    var ExceptionBlockState;
+    (function (ExceptionBlockState) {
+        ExceptionBlockState[ExceptionBlockState["Try"] = 0] = "Try";
+        ExceptionBlockState[ExceptionBlockState["Catch"] = 1] = "Catch";
+        ExceptionBlockState[ExceptionBlockState["Finally"] = 2] = "Finally";
+        ExceptionBlockState[ExceptionBlockState["Done"] = 3] = "Done";
+    })(ExceptionBlockState || (ExceptionBlockState = {}));
+    // NOTE: changes to this enum should be reflected in the __generator helper.
+    var Instruction;
+    (function (Instruction) {
+        Instruction[Instruction["Next"] = 0] = "Next";
+        Instruction[Instruction["Throw"] = 1] = "Throw";
+        Instruction[Instruction["Return"] = 2] = "Return";
+        Instruction[Instruction["Break"] = 3] = "Break";
+        Instruction[Instruction["Yield"] = 4] = "Yield";
+        Instruction[Instruction["YieldStar"] = 5] = "YieldStar";
+        Instruction[Instruction["Catch"] = 6] = "Catch";
+        Instruction[Instruction["Endfinally"] = 7] = "Endfinally";
+    })(Instruction || (Instruction = {}));
+    function getInstructionName(instruction) {
+        switch (instruction) {
+            case 2 /* Return */: return "return";
+            case 3 /* Break */: return "break";
+            case 4 /* Yield */: return "yield";
+            case 5 /* YieldStar */: return "yield*";
+            case 7 /* Endfinally */: return "endfinally";
+            default: return undefined; // TODO: GH#18217
+        }
+    }
+    function transformGenerators(context) {
+        var resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistFunctionDeclaration = context.hoistFunctionDeclaration, hoistVariableDeclaration = context.hoistVariableDeclaration;
+        var compilerOptions = context.getCompilerOptions();
+        var languageVersion = ts.getEmitScriptTarget(compilerOptions);
+        var resolver = context.getEmitResolver();
+        var previousOnSubstituteNode = context.onSubstituteNode;
+        context.onSubstituteNode = onSubstituteNode;
+        var renamedCatchVariables;
+        var renamedCatchVariableDeclarations;
+        var inGeneratorFunctionBody;
+        var inStatementContainingYield;
+        // The following three arrays store information about generated code blocks.
+        // All three arrays are correlated by their index. This approach is used over allocating
+        // objects to store the same information to avoid GC overhead.
+        //
+        var blocks; // Information about the code block
+        var blockOffsets; // The operation offset at which a code block begins or ends
+        var blockActions; // Whether the code block is opened or closed
+        var blockStack; // A stack of currently open code blocks
+        // Labels are used to mark locations in the code that can be the target of a Break (jump)
+        // operation. These are translated into case clauses in a switch statement.
+        // The following two arrays are correlated by their index. This approach is used over
+        // allocating objects to store the same information to avoid GC overhead.
+        //
+        var labelOffsets; // The operation offset at which the label is defined.
+        var labelExpressions; // The NumericLiteral nodes bound to each label.
+        var nextLabelId = 1; // The next label id to use.
+        // Operations store information about generated code for the function body. This
+        // Includes things like statements, assignments, breaks (jumps), and yields.
+        // The following three arrays are correlated by their index. This approach is used over
+        // allocating objects to store the same information to avoid GC overhead.
+        //
+        var operations; // The operation to perform.
+        var operationArguments; // The arguments to the operation.
+        var operationLocations; // The source map location for the operation.
+        var state; // The name of the state object used by the generator at runtime.
+        // The following variables store information used by the `build` function:
+        //
+        var blockIndex = 0; // The index of the current block.
+        var labelNumber = 0; // The current label number.
+        var labelNumbers;
+        var lastOperationWasAbrupt; // Indicates whether the last operation was abrupt (break/continue).
+        var lastOperationWasCompletion; // Indicates whether the last operation was a completion (return/throw).
+        var clauses; // The case clauses generated for labels.
+        var statements; // The statements for the current label.
+        var exceptionBlockStack; // A stack of containing exception blocks.
+        var currentExceptionBlock; // The current exception block.
+        var withBlockStack; // A stack containing `with` blocks.
+        return ts.chainBundle(transformSourceFile);
+        function transformSourceFile(node) {
+            if (node.isDeclarationFile || (node.transformFlags & 512 /* ContainsGenerator */) === 0) {
+                return node;
+            }
+            var visited = ts.visitEachChild(node, visitor, context);
+            ts.addEmitHelpers(visited, context.readEmitHelpers());
+            return visited;
+        }
+        /**
+         * Visits a node.
+         *
+         * @param node The node to visit.
+         */
+        function visitor(node) {
+            var transformFlags = node.transformFlags;
+            if (inStatementContainingYield) {
+                return visitJavaScriptInStatementContainingYield(node);
+            }
+            else if (inGeneratorFunctionBody) {
+                return visitJavaScriptInGeneratorFunctionBody(node);
+            }
+            else if (transformFlags & 256 /* Generator */) {
+                return visitGenerator(node);
+            }
+            else if (transformFlags & 512 /* ContainsGenerator */) {
+                return ts.visitEachChild(node, visitor, context);
+            }
+            else {
+                return node;
+            }
+        }
+        /**
+         * Visits a node that is contained within a statement that contains yield.
+         *
+         * @param node The node to visit.
+         */
+        function visitJavaScriptInStatementContainingYield(node) {
+            switch (node.kind) {
+                case 223 /* DoStatement */:
+                    return visitDoStatement(node);
+                case 224 /* WhileStatement */:
+                    return visitWhileStatement(node);
+                case 232 /* SwitchStatement */:
+                    return visitSwitchStatement(node);
+                case 233 /* LabeledStatement */:
+                    return visitLabeledStatement(node);
+                default:
+                    return visitJavaScriptInGeneratorFunctionBody(node);
+            }
+        }
+        /**
+         * Visits a node that is contained within a generator function.
+         *
+         * @param node The node to visit.
+         */
+        function visitJavaScriptInGeneratorFunctionBody(node) {
+            switch (node.kind) {
+                case 239 /* FunctionDeclaration */:
+                    return visitFunctionDeclaration(node);
+                case 196 /* FunctionExpression */:
+                    return visitFunctionExpression(node);
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                    return visitAccessorDeclaration(node);
+                case 219 /* VariableStatement */:
+                    return visitVariableStatement(node);
+                case 225 /* ForStatement */:
+                    return visitForStatement(node);
+                case 226 /* ForInStatement */:
+                    return visitForInStatement(node);
+                case 229 /* BreakStatement */:
+                    return visitBreakStatement(node);
+                case 228 /* ContinueStatement */:
+                    return visitContinueStatement(node);
+                case 230 /* ReturnStatement */:
+                    return visitReturnStatement(node);
+                default:
+                    if (node.transformFlags & 4194304 /* ContainsYield */) {
+                        return visitJavaScriptContainingYield(node);
+                    }
+                    else if (node.transformFlags & (512 /* ContainsGenerator */ | 8388608 /* ContainsHoistedDeclarationOrCompletion */)) {
+                        return ts.visitEachChild(node, visitor, context);
+                    }
+                    else {
+                        return node;
+                    }
+            }
+        }
+        /**
+         * Visits a node that contains a YieldExpression.
+         *
+         * @param node The node to visit.
+         */
+        function visitJavaScriptContainingYield(node) {
+            switch (node.kind) {
+                case 204 /* BinaryExpression */:
+                    return visitBinaryExpression(node);
+                case 205 /* ConditionalExpression */:
+                    return visitConditionalExpression(node);
+                case 207 /* YieldExpression */:
+                    return visitYieldExpression(node);
+                case 187 /* ArrayLiteralExpression */:
+                    return visitArrayLiteralExpression(node);
+                case 188 /* ObjectLiteralExpression */:
+                    return visitObjectLiteralExpression(node);
+                case 190 /* ElementAccessExpression */:
+                    return visitElementAccessExpression(node);
+                case 191 /* CallExpression */:
+                    return visitCallExpression(node);
+                case 192 /* NewExpression */:
+                    return visitNewExpression(node);
+                default:
+                    return ts.visitEachChild(node, visitor, context);
+            }
+        }
+        /**
+         * Visits a generator function.
+         *
+         * @param node The node to visit.
+         */
+        function visitGenerator(node) {
+            switch (node.kind) {
+                case 239 /* FunctionDeclaration */:
+                    return visitFunctionDeclaration(node);
+                case 196 /* FunctionExpression */:
+                    return visitFunctionExpression(node);
+                default:
+                    return ts.Debug.failBadSyntaxKind(node);
+            }
+        }
+        /**
+         * Visits a function declaration.
+         *
+         * This will be called when one of the following conditions are met:
+         * - The function declaration is a generator function.
+         * - The function declaration is contained within the body of a generator function.
+         *
+         * @param node The node to visit.
+         */
+        function visitFunctionDeclaration(node) {
+            // Currently, we only support generators that were originally async functions.
+            if (node.asteriskToken) {
+                node = ts.setOriginalNode(ts.setTextRange(ts.createFunctionDeclaration(
+                /*decorators*/ undefined, node.modifiers, 
+                /*asteriskToken*/ undefined, node.name, 
+                /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), 
+                /*type*/ undefined, transformGeneratorFunctionBody(node.body)), 
+                /*location*/ node), node);
+            }
+            else {
+                var savedInGeneratorFunctionBody = inGeneratorFunctionBody;
+                var savedInStatementContainingYield = inStatementContainingYield;
+                inGeneratorFunctionBody = false;
+                inStatementContainingYield = false;
+                node = ts.visitEachChild(node, visitor, context);
+                inGeneratorFunctionBody = savedInGeneratorFunctionBody;
+                inStatementContainingYield = savedInStatementContainingYield;
+            }
+            if (inGeneratorFunctionBody) {
+                // Function declarations in a generator function body are hoisted
+                // to the top of the lexical scope and elided from the current statement.
+                hoistFunctionDeclaration(node);
+                return undefined;
+            }
+            else {
+                return node;
+            }
+        }
+        /**
+         * Visits a function expression.
+         *
+         * This will be called when one of the following conditions are met:
+         * - The function expression is a generator function.
+         * - The function expression is contained within the body of a generator function.
+         *
+         * @param node The node to visit.
+         */
+        function visitFunctionExpression(node) {
+            // Currently, we only support generators that were originally async functions.
+            if (node.asteriskToken) {
+                node = ts.setOriginalNode(ts.setTextRange(ts.createFunctionExpression(
+                /*modifiers*/ undefined, 
+                /*asteriskToken*/ undefined, node.name, 
+                /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), 
+                /*type*/ undefined, transformGeneratorFunctionBody(node.body)), 
+                /*location*/ node), node);
+            }
+            else {
+                var savedInGeneratorFunctionBody = inGeneratorFunctionBody;
+                var savedInStatementContainingYield = inStatementContainingYield;
+                inGeneratorFunctionBody = false;
+                inStatementContainingYield = false;
+                node = ts.visitEachChild(node, visitor, context);
+                inGeneratorFunctionBody = savedInGeneratorFunctionBody;
+                inStatementContainingYield = savedInStatementContainingYield;
+            }
+            return node;
+        }
+        /**
+         * Visits a get or set accessor declaration.
+         *
+         * This will be called when one of the following conditions are met:
+         * - The accessor is contained within the body of a generator function.
+         *
+         * @param node The node to visit.
+         */
+        function visitAccessorDeclaration(node) {
+            var savedInGeneratorFunctionBody = inGeneratorFunctionBody;
+            var savedInStatementContainingYield = inStatementContainingYield;
+            inGeneratorFunctionBody = false;
+            inStatementContainingYield = false;
+            node = ts.visitEachChild(node, visitor, context);
+            inGeneratorFunctionBody = savedInGeneratorFunctionBody;
+            inStatementContainingYield = savedInStatementContainingYield;
+            return node;
+        }
+        /**
+         * Transforms the body of a generator function declaration.
+         *
+         * @param node The function body to transform.
+         */
+        function transformGeneratorFunctionBody(body) {
+            // Save existing generator state
+            var statements = [];
+            var savedInGeneratorFunctionBody = inGeneratorFunctionBody;
+            var savedInStatementContainingYield = inStatementContainingYield;
+            var savedBlocks = blocks;
+            var savedBlockOffsets = blockOffsets;
+            var savedBlockActions = blockActions;
+            var savedBlockStack = blockStack;
+            var savedLabelOffsets = labelOffsets;
+            var savedLabelExpressions = labelExpressions;
+            var savedNextLabelId = nextLabelId;
+            var savedOperations = operations;
+            var savedOperationArguments = operationArguments;
+            var savedOperationLocations = operationLocations;
+            var savedState = state;
+            // Initialize generator state
+            inGeneratorFunctionBody = true;
+            inStatementContainingYield = false;
+            blocks = undefined;
+            blockOffsets = undefined;
+            blockActions = undefined;
+            blockStack = undefined;
+            labelOffsets = undefined;
+            labelExpressions = undefined;
+            nextLabelId = 1;
+            operations = undefined;
+            operationArguments = undefined;
+            operationLocations = undefined;
+            state = ts.createTempVariable(/*recordTempVariable*/ undefined);
+            // Build the generator
+            resumeLexicalEnvironment();
+            var statementOffset = ts.addPrologue(statements, body.statements, /*ensureUseStrict*/ false, visitor);
+            transformAndEmitStatements(body.statements, statementOffset);
+            var buildResult = build();
+            ts.addStatementsAfterPrologue(statements, endLexicalEnvironment());
+            statements.push(ts.createReturn(buildResult));
+            // Restore previous generator state
+            inGeneratorFunctionBody = savedInGeneratorFunctionBody;
+            inStatementContainingYield = savedInStatementContainingYield;
+            blocks = savedBlocks;
+            blockOffsets = savedBlockOffsets;
+            blockActions = savedBlockActions;
+            blockStack = savedBlockStack;
+            labelOffsets = savedLabelOffsets;
+            labelExpressions = savedLabelExpressions;
+            nextLabelId = savedNextLabelId;
+            operations = savedOperations;
+            operationArguments = savedOperationArguments;
+            operationLocations = savedOperationLocations;
+            state = savedState;
+            return ts.setTextRange(ts.createBlock(statements, body.multiLine), body);
+        }
+        /**
+         * Visits a variable statement.
+         *
+         * This will be called when one of the following conditions are met:
+         * - The variable statement is contained within the body of a generator function.
+         *
+         * @param node The node to visit.
+         */
+        function visitVariableStatement(node) {
+            if (node.transformFlags & 4194304 /* ContainsYield */) {
+                transformAndEmitVariableDeclarationList(node.declarationList);
+                return undefined;
+            }
+            else {
+                // Do not hoist custom prologues.
+                if (ts.getEmitFlags(node) & 1048576 /* CustomPrologue */) {
+                    return node;
+                }
+                for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                    var variable = _a[_i];
+                    hoistVariableDeclaration(variable.name);
+                }
+                var variables = ts.getInitializedVariables(node.declarationList);
+                if (variables.length === 0) {
+                    return undefined;
+                }
+                return ts.setSourceMapRange(ts.createExpressionStatement(ts.inlineExpressions(ts.map(variables, transformInitializedVariable))), node);
+            }
+        }
+        /**
+         * Visits a binary expression.
+         *
+         * This will be called when one of the following conditions are met:
+         * - The node contains a YieldExpression.
+         *
+         * @param node The node to visit.
+         */
+        function visitBinaryExpression(node) {
+            var assoc = ts.getExpressionAssociativity(node);
+            switch (assoc) {
+                case 0 /* Left */:
+                    return visitLeftAssociativeBinaryExpression(node);
+                case 1 /* Right */:
+                    return visitRightAssociativeBinaryExpression(node);
+                default:
+                    return ts.Debug.assertNever(assoc);
+            }
+        }
+        function isCompoundAssignment(kind) {
+            return kind >= 60 /* FirstCompoundAssignment */
+                && kind <= 71 /* LastCompoundAssignment */;
+        }
+        function getOperatorForCompoundAssignment(kind) {
+            switch (kind) {
+                case 60 /* PlusEqualsToken */: return 38 /* PlusToken */;
+                case 61 /* MinusEqualsToken */: return 39 /* MinusToken */;
+                case 62 /* AsteriskEqualsToken */: return 40 /* AsteriskToken */;
+                case 63 /* AsteriskAsteriskEqualsToken */: return 41 /* AsteriskAsteriskToken */;
+                case 64 /* SlashEqualsToken */: return 42 /* SlashToken */;
+                case 65 /* PercentEqualsToken */: return 43 /* PercentToken */;
+                case 66 /* LessThanLessThanEqualsToken */: return 46 /* LessThanLessThanToken */;
+                case 67 /* GreaterThanGreaterThanEqualsToken */: return 47 /* GreaterThanGreaterThanToken */;
+                case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */: return 48 /* GreaterThanGreaterThanGreaterThanToken */;
+                case 69 /* AmpersandEqualsToken */: return 49 /* AmpersandToken */;
+                case 70 /* BarEqualsToken */: return 50 /* BarToken */;
+                case 71 /* CaretEqualsToken */: return 51 /* CaretToken */;
+            }
+        }
+        /**
+         * Visits a right-associative binary expression containing `yield`.
+         *
+         * @param node The node to visit.
+         */
+        function visitRightAssociativeBinaryExpression(node) {
+            var left = node.left, right = node.right;
+            if (containsYield(right)) {
+                var target = void 0;
+                switch (left.kind) {
+                    case 189 /* PropertyAccessExpression */:
+                        // [source]
+                        //      a.b = yield;
+                        //
+                        // [intermediate]
+                        //  .local _a
+                        //      _a = a;
+                        //  .yield resumeLabel
+                        //  .mark resumeLabel
+                        //      _a.b = %sent%;
+                        target = ts.updatePropertyAccess(left, cacheExpression(ts.visitNode(left.expression, visitor, ts.isLeftHandSideExpression)), left.name);
+                        break;
+                    case 190 /* ElementAccessExpression */:
+                        // [source]
+                        //      a[b] = yield;
+                        //
+                        // [intermediate]
+                        //  .local _a, _b
+                        //      _a = a;
+                        //      _b = b;
+                        //  .yield resumeLabel
+                        //  .mark resumeLabel
+                        //      _a[_b] = %sent%;
+                        target = ts.updateElementAccess(left, cacheExpression(ts.visitNode(left.expression, visitor, ts.isLeftHandSideExpression)), cacheExpression(ts.visitNode(left.argumentExpression, visitor, ts.isExpression)));
+                        break;
+                    default:
+                        target = ts.visitNode(left, visitor, ts.isExpression);
+                        break;
+                }
+                var operator = node.operatorToken.kind;
+                if (isCompoundAssignment(operator)) {
+                    return ts.setTextRange(ts.createAssignment(target, ts.setTextRange(ts.createBinary(cacheExpression(target), getOperatorForCompoundAssignment(operator), ts.visitNode(right, visitor, ts.isExpression)), node)), node);
+                }
+                else {
+                    return ts.updateBinary(node, target, ts.visitNode(right, visitor, ts.isExpression));
+                }
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitLeftAssociativeBinaryExpression(node) {
+            if (containsYield(node.right)) {
+                if (ts.isLogicalOperator(node.operatorToken.kind)) {
+                    return visitLogicalBinaryExpression(node);
+                }
+                else if (node.operatorToken.kind === 27 /* CommaToken */) {
+                    return visitCommaExpression(node);
+                }
+                // [source]
+                //      a() + (yield) + c()
+                //
+                // [intermediate]
+                //  .local _a
+                //      _a = a();
+                //  .yield resumeLabel
+                //      _a + %sent% + c()
+                var clone_5 = ts.getMutableClone(node);
+                clone_5.left = cacheExpression(ts.visitNode(node.left, visitor, ts.isExpression));
+                clone_5.right = ts.visitNode(node.right, visitor, ts.isExpression);
+                return clone_5;
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        /**
+         * Visits a logical binary expression containing `yield`.
+         *
+         * @param node A node to visit.
+         */
+        function visitLogicalBinaryExpression(node) {
+            // Logical binary expressions (`&&` and `||`) are shortcutting expressions and need
+            // to be transformed as such:
+            //
+            // [source]
+            //      x = a() && yield;
+            //
+            // [intermediate]
+            //  .local _a
+            //      _a = a();
+            //  .brfalse resultLabel, (_a)
+            //  .yield resumeLabel
+            //  .mark resumeLabel
+            //      _a = %sent%;
+            //  .mark resultLabel
+            //      x = _a;
+            //
+            // [source]
+            //      x = a() || yield;
+            //
+            // [intermediate]
+            //  .local _a
+            //      _a = a();
+            //  .brtrue resultLabel, (_a)
+            //  .yield resumeLabel
+            //  .mark resumeLabel
+            //      _a = %sent%;
+            //  .mark resultLabel
+            //      x = _a;
+            var resultLabel = defineLabel();
+            var resultLocal = declareLocal();
+            emitAssignment(resultLocal, ts.visitNode(node.left, visitor, ts.isExpression), /*location*/ node.left);
+            if (node.operatorToken.kind === 54 /* AmpersandAmpersandToken */) {
+                // Logical `&&` shortcuts when the left-hand operand is falsey.
+                emitBreakWhenFalse(resultLabel, resultLocal, /*location*/ node.left);
+            }
+            else {
+                // Logical `||` shortcuts when the left-hand operand is truthy.
+                emitBreakWhenTrue(resultLabel, resultLocal, /*location*/ node.left);
+            }
+            emitAssignment(resultLocal, ts.visitNode(node.right, visitor, ts.isExpression), /*location*/ node.right);
+            markLabel(resultLabel);
+            return resultLocal;
+        }
+        /**
+         * Visits a comma expression containing `yield`.
+         *
+         * @param node The node to visit.
+         */
+        function visitCommaExpression(node) {
+            // [source]
+            //      x = a(), yield, b();
+            //
+            // [intermediate]
+            //      a();
+            //  .yield resumeLabel
+            //  .mark resumeLabel
+            //      x = %sent%, b();
+            var pendingExpressions = [];
+            visit(node.left);
+            visit(node.right);
+            return ts.inlineExpressions(pendingExpressions);
+            function visit(node) {
+                if (ts.isBinaryExpression(node) && node.operatorToken.kind === 27 /* CommaToken */) {
+                    visit(node.left);
+                    visit(node.right);
+                }
+                else {
+                    if (containsYield(node) && pendingExpressions.length > 0) {
+                        emitWorker(1 /* Statement */, [ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions))]);
+                        pendingExpressions = [];
+                    }
+                    pendingExpressions.push(ts.visitNode(node, visitor, ts.isExpression));
+                }
+            }
+        }
+        /**
+         * Visits a conditional expression containing `yield`.
+         *
+         * @param node The node to visit.
+         */
+        function visitConditionalExpression(node) {
+            // [source]
+            //      x = a() ? yield : b();
+            //
+            // [intermediate]
+            //  .local _a
+            //  .brfalse whenFalseLabel, (a())
+            //  .yield resumeLabel
+            //  .mark resumeLabel
+            //      _a = %sent%;
+            //  .br resultLabel
+            //  .mark whenFalseLabel
+            //      _a = b();
+            //  .mark resultLabel
+            //      x = _a;
+            // We only need to perform a specific transformation if a `yield` expression exists
+            // in either the `whenTrue` or `whenFalse` branches.
+            // A `yield` in the condition will be handled by the normal visitor.
+            if (containsYield(node.whenTrue) || containsYield(node.whenFalse)) {
+                var whenFalseLabel = defineLabel();
+                var resultLabel = defineLabel();
+                var resultLocal = declareLocal();
+                emitBreakWhenFalse(whenFalseLabel, ts.visitNode(node.condition, visitor, ts.isExpression), /*location*/ node.condition);
+                emitAssignment(resultLocal, ts.visitNode(node.whenTrue, visitor, ts.isExpression), /*location*/ node.whenTrue);
+                emitBreak(resultLabel);
+                markLabel(whenFalseLabel);
+                emitAssignment(resultLocal, ts.visitNode(node.whenFalse, visitor, ts.isExpression), /*location*/ node.whenFalse);
+                markLabel(resultLabel);
+                return resultLocal;
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        /**
+         * Visits a `yield` expression.
+         *
+         * @param node The node to visit.
+         */
+        function visitYieldExpression(node) {
+            // [source]
+            //      x = yield a();
+            //
+            // [intermediate]
+            //  .yield resumeLabel, (a())
+            //  .mark resumeLabel
+            //      x = %sent%;
+            var resumeLabel = defineLabel();
+            var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
+            if (node.asteriskToken) {
+                var iterator = (ts.getEmitFlags(node.expression) & 8388608 /* Iterator */) === 0
+                    ? ts.createValuesHelper(context, expression, /*location*/ node)
+                    : expression;
+                emitYieldStar(iterator, /*location*/ node);
+            }
+            else {
+                emitYield(expression, /*location*/ node);
+            }
+            markLabel(resumeLabel);
+            return createGeneratorResume(/*location*/ node);
+        }
+        /**
+         * Visits an ArrayLiteralExpression that contains a YieldExpression.
+         *
+         * @param node The node to visit.
+         */
+        function visitArrayLiteralExpression(node) {
+            return visitElements(node.elements, /*leadingElement*/ undefined, /*location*/ undefined, node.multiLine);
+        }
+        /**
+         * Visits an array of expressions containing one or more YieldExpression nodes
+         * and returns an expression for the resulting value.
+         *
+         * @param elements The elements to visit.
+         * @param multiLine Whether array literals created should be emitted on multiple lines.
+         */
+        function visitElements(elements, leadingElement, location, multiLine) {
+            // [source]
+            //      ar = [1, yield, 2];
+            //
+            // [intermediate]
+            //  .local _a
+            //      _a = [1];
+            //  .yield resumeLabel
+            //  .mark resumeLabel
+            //      ar = _a.concat([%sent%, 2]);
+            var numInitialElements = countInitialNodesWithoutYield(elements);
+            var temp;
+            if (numInitialElements > 0) {
+                temp = declareLocal();
+                var initialElements = ts.visitNodes(elements, visitor, ts.isExpression, 0, numInitialElements);
+                emitAssignment(temp, ts.createArrayLiteral(leadingElement
+                    ? [leadingElement].concat(initialElements) : initialElements));
+                leadingElement = undefined;
+            }
+            var expressions = ts.reduceLeft(elements, reduceElement, [], numInitialElements);
+            return temp
+                ? ts.createArrayConcat(temp, [ts.createArrayLiteral(expressions, multiLine)])
+                : ts.setTextRange(ts.createArrayLiteral(leadingElement ? [leadingElement].concat(expressions) : expressions, multiLine), location);
+            function reduceElement(expressions, element) {
+                if (containsYield(element) && expressions.length > 0) {
+                    var hasAssignedTemp = temp !== undefined;
+                    if (!temp) {
+                        temp = declareLocal();
+                    }
+                    emitAssignment(temp, hasAssignedTemp
+                        ? ts.createArrayConcat(temp, [ts.createArrayLiteral(expressions, multiLine)])
+                        : ts.createArrayLiteral(leadingElement ? [leadingElement].concat(expressions) : expressions, multiLine));
+                    leadingElement = undefined;
+                    expressions = [];
+                }
+                expressions.push(ts.visitNode(element, visitor, ts.isExpression));
+                return expressions;
+            }
+        }
+        function visitObjectLiteralExpression(node) {
+            // [source]
+            //      o = {
+            //          a: 1,
+            //          b: yield,
+            //          c: 2
+            //      };
+            //
+            // [intermediate]
+            //  .local _a
+            //      _a = {
+            //          a: 1
+            //      };
+            //  .yield resumeLabel
+            //  .mark resumeLabel
+            //      o = (_a.b = %sent%,
+            //          _a.c = 2,
+            //          _a);
+            var properties = node.properties;
+            var multiLine = node.multiLine;
+            var numInitialProperties = countInitialNodesWithoutYield(properties);
+            var temp = declareLocal();
+            emitAssignment(temp, ts.createObjectLiteral(ts.visitNodes(properties, visitor, ts.isObjectLiteralElementLike, 0, numInitialProperties), multiLine));
+            var expressions = ts.reduceLeft(properties, reduceProperty, [], numInitialProperties);
+            expressions.push(multiLine ? ts.startOnNewLine(ts.getMutableClone(temp)) : temp);
+            return ts.inlineExpressions(expressions);
+            function reduceProperty(expressions, property) {
+                if (containsYield(property) && expressions.length > 0) {
+                    emitStatement(ts.createExpressionStatement(ts.inlineExpressions(expressions)));
+                    expressions = [];
+                }
+                var expression = ts.createExpressionForObjectLiteralElementLike(node, property, temp);
+                var visited = ts.visitNode(expression, visitor, ts.isExpression);
+                if (visited) {
+                    if (multiLine) {
+                        ts.startOnNewLine(visited);
+                    }
+                    expressions.push(visited);
+                }
+                return expressions;
+            }
+        }
+        /**
+         * Visits an ElementAccessExpression that contains a YieldExpression.
+         *
+         * @param node The node to visit.
+         */
+        function visitElementAccessExpression(node) {
+            if (containsYield(node.argumentExpression)) {
+                // [source]
+                //      a = x[yield];
+                //
+                // [intermediate]
+                //  .local _a
+                //      _a = x;
+                //  .yield resumeLabel
+                //  .mark resumeLabel
+                //      a = _a[%sent%]
+                var clone_6 = ts.getMutableClone(node);
+                clone_6.expression = cacheExpression(ts.visitNode(node.expression, visitor, ts.isLeftHandSideExpression));
+                clone_6.argumentExpression = ts.visitNode(node.argumentExpression, visitor, ts.isExpression);
+                return clone_6;
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitCallExpression(node) {
+            if (!ts.isImportCall(node) && ts.forEach(node.arguments, containsYield)) {
+                // [source]
+                //      a.b(1, yield, 2);
+                //
+                // [intermediate]
+                //  .local _a, _b, _c
+                //      _b = (_a = a).b;
+                //      _c = [1];
+                //  .yield resumeLabel
+                //  .mark resumeLabel
+                //      _b.apply(_a, _c.concat([%sent%, 2]));
+                var _a = ts.createCallBinding(node.expression, hoistVariableDeclaration, languageVersion, /*cacheIdentifiers*/ true), target = _a.target, thisArg = _a.thisArg;
+                return ts.setOriginalNode(ts.createFunctionApply(cacheExpression(ts.visitNode(target, visitor, ts.isLeftHandSideExpression)), thisArg, visitElements(node.arguments), 
+                /*location*/ node), node);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitNewExpression(node) {
+            if (ts.forEach(node.arguments, containsYield)) {
+                // [source]
+                //      new a.b(1, yield, 2);
+                //
+                // [intermediate]
+                //  .local _a, _b, _c
+                //      _b = (_a = a.b).bind;
+                //      _c = [1];
+                //  .yield resumeLabel
+                //  .mark resumeLabel
+                //      new (_b.apply(_a, _c.concat([%sent%, 2])));
+                var _a = ts.createCallBinding(ts.createPropertyAccess(node.expression, "bind"), hoistVariableDeclaration), target = _a.target, thisArg = _a.thisArg;
+                return ts.setOriginalNode(ts.setTextRange(ts.createNew(ts.createFunctionApply(cacheExpression(ts.visitNode(target, visitor, ts.isExpression)), thisArg, visitElements(node.arguments, 
+                /*leadingElement*/ ts.createVoidZero())), 
+                /*typeArguments*/ undefined, []), node), node);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function transformAndEmitStatements(statements, start) {
+            if (start === void 0) { start = 0; }
+            var numStatements = statements.length;
+            for (var i = start; i < numStatements; i++) {
+                transformAndEmitStatement(statements[i]);
+            }
+        }
+        function transformAndEmitEmbeddedStatement(node) {
+            if (ts.isBlock(node)) {
+                transformAndEmitStatements(node.statements);
+            }
+            else {
+                transformAndEmitStatement(node);
+            }
+        }
+        function transformAndEmitStatement(node) {
+            var savedInStatementContainingYield = inStatementContainingYield;
+            if (!inStatementContainingYield) {
+                inStatementContainingYield = containsYield(node);
+            }
+            transformAndEmitStatementWorker(node);
+            inStatementContainingYield = savedInStatementContainingYield;
+        }
+        function transformAndEmitStatementWorker(node) {
+            switch (node.kind) {
+                case 218 /* Block */:
+                    return transformAndEmitBlock(node);
+                case 221 /* ExpressionStatement */:
+                    return transformAndEmitExpressionStatement(node);
+                case 222 /* IfStatement */:
+                    return transformAndEmitIfStatement(node);
+                case 223 /* DoStatement */:
+                    return transformAndEmitDoStatement(node);
+                case 224 /* WhileStatement */:
+                    return transformAndEmitWhileStatement(node);
+                case 225 /* ForStatement */:
+                    return transformAndEmitForStatement(node);
+                case 226 /* ForInStatement */:
+                    return transformAndEmitForInStatement(node);
+                case 228 /* ContinueStatement */:
+                    return transformAndEmitContinueStatement(node);
+                case 229 /* BreakStatement */:
+                    return transformAndEmitBreakStatement(node);
+                case 230 /* ReturnStatement */:
+                    return transformAndEmitReturnStatement(node);
+                case 231 /* WithStatement */:
+                    return transformAndEmitWithStatement(node);
+                case 232 /* SwitchStatement */:
+                    return transformAndEmitSwitchStatement(node);
+                case 233 /* LabeledStatement */:
+                    return transformAndEmitLabeledStatement(node);
+                case 234 /* ThrowStatement */:
+                    return transformAndEmitThrowStatement(node);
+                case 235 /* TryStatement */:
+                    return transformAndEmitTryStatement(node);
+                default:
+                    return emitStatement(ts.visitNode(node, visitor, ts.isStatement));
+            }
+        }
+        function transformAndEmitBlock(node) {
+            if (containsYield(node)) {
+                transformAndEmitStatements(node.statements);
+            }
+            else {
+                emitStatement(ts.visitNode(node, visitor, ts.isStatement));
+            }
+        }
+        function transformAndEmitExpressionStatement(node) {
+            emitStatement(ts.visitNode(node, visitor, ts.isStatement));
+        }
+        function transformAndEmitVariableDeclarationList(node) {
+            for (var _i = 0, _a = node.declarations; _i < _a.length; _i++) {
+                var variable = _a[_i];
+                var name = ts.getSynthesizedClone(variable.name);
+                ts.setCommentRange(name, variable.name);
+                hoistVariableDeclaration(name);
+            }
+            var variables = ts.getInitializedVariables(node);
+            var numVariables = variables.length;
+            var variablesWritten = 0;
+            var pendingExpressions = [];
+            while (variablesWritten < numVariables) {
+                for (var i = variablesWritten; i < numVariables; i++) {
+                    var variable = variables[i];
+                    if (containsYield(variable.initializer) && pendingExpressions.length > 0) {
+                        break;
+                    }
+                    pendingExpressions.push(transformInitializedVariable(variable));
+                }
+                if (pendingExpressions.length) {
+                    emitStatement(ts.createExpressionStatement(ts.inlineExpressions(pendingExpressions)));
+                    variablesWritten += pendingExpressions.length;
+                    pendingExpressions = [];
+                }
+            }
+            return undefined;
+        }
+        function transformInitializedVariable(node) {
+            return ts.setSourceMapRange(ts.createAssignment(ts.setSourceMapRange(ts.getSynthesizedClone(node.name), node.name), ts.visitNode(node.initializer, visitor, ts.isExpression)), node);
+        }
+        function transformAndEmitIfStatement(node) {
+            if (containsYield(node)) {
+                // [source]
+                //      if (x)
+                //          /*thenStatement*/
+                //      else
+                //          /*elseStatement*/
+                //
+                // [intermediate]
+                //  .brfalse elseLabel, (x)
+                //      /*thenStatement*/
+                //  .br endLabel
+                //  .mark elseLabel
+                //      /*elseStatement*/
+                //  .mark endLabel
+                if (containsYield(node.thenStatement) || containsYield(node.elseStatement)) {
+                    var endLabel = defineLabel();
+                    var elseLabel = node.elseStatement ? defineLabel() : undefined;
+                    emitBreakWhenFalse(node.elseStatement ? elseLabel : endLabel, ts.visitNode(node.expression, visitor, ts.isExpression), /*location*/ node.expression);
+                    transformAndEmitEmbeddedStatement(node.thenStatement);
+                    if (node.elseStatement) {
+                        emitBreak(endLabel);
+                        markLabel(elseLabel);
+                        transformAndEmitEmbeddedStatement(node.elseStatement);
+                    }
+                    markLabel(endLabel);
+                }
+                else {
+                    emitStatement(ts.visitNode(node, visitor, ts.isStatement));
+                }
+            }
+            else {
+                emitStatement(ts.visitNode(node, visitor, ts.isStatement));
+            }
+        }
+        function transformAndEmitDoStatement(node) {
+            if (containsYield(node)) {
+                // [source]
+                //      do {
+                //          /*body*/
+                //      }
+                //      while (i < 10);
+                //
+                // [intermediate]
+                //  .loop conditionLabel, endLabel
+                //  .mark loopLabel
+                //      /*body*/
+                //  .mark conditionLabel
+                //  .brtrue loopLabel, (i < 10)
+                //  .endloop
+                //  .mark endLabel
+                var conditionLabel = defineLabel();
+                var loopLabel = defineLabel();
+                beginLoopBlock(/*continueLabel*/ conditionLabel);
+                markLabel(loopLabel);
+                transformAndEmitEmbeddedStatement(node.statement);
+                markLabel(conditionLabel);
+                emitBreakWhenTrue(loopLabel, ts.visitNode(node.expression, visitor, ts.isExpression));
+                endLoopBlock();
+            }
+            else {
+                emitStatement(ts.visitNode(node, visitor, ts.isStatement));
+            }
+        }
+        function visitDoStatement(node) {
+            if (inStatementContainingYield) {
+                beginScriptLoopBlock();
+                node = ts.visitEachChild(node, visitor, context);
+                endLoopBlock();
+                return node;
+            }
+            else {
+                return ts.visitEachChild(node, visitor, context);
+            }
+        }
+        function transformAndEmitWhileStatement(node) {
+            if (containsYield(node)) {
+                // [source]
+                //      while (i < 10) {
+                //          /*body*/
+                //      }
+                //
+                // [intermediate]
+                //  .loop loopLabel, endLabel
+                //  .mark loopLabel
+                //  .brfalse endLabel, (i < 10)
+                //      /*body*/
+                //  .br loopLabel
+                //  .endloop
+                //  .mark endLabel
+                var loopLabel = defineLabel();
+                var endLabel = beginLoopBlock(loopLabel);
+                markLabel(loopLabel);
+                emitBreakWhenFalse(endLabel, ts.visitNode(node.expression, visitor, ts.isExpression));
+                transformAndEmitEmbeddedStatement(node.statement);
+                emitBreak(loopLabel);
+                endLoopBlock();
+            }
+            else {
+                emitStatement(ts.visitNode(node, visitor, ts.isStatement));
+            }
+        }
+        function visitWhileStatement(node) {
+            if (inStatementContainingYield) {
+                beginScriptLoopBlock();
+                node = ts.visitEachChild(node, visitor, context);
+                endLoopBlock();
+                return node;
+            }
+            else {
+                return ts.visitEachChild(node, visitor, context);
+            }
+        }
+        function transformAndEmitForStatement(node) {
+            if (containsYield(node)) {
+                // [source]
+                //      for (var i = 0; i < 10; i++) {
+                //          /*body*/
+                //      }
+                //
+                // [intermediate]
+                //  .local i
+                //      i = 0;
+                //  .loop incrementLabel, endLoopLabel
+                //  .mark conditionLabel
+                //  .brfalse endLoopLabel, (i < 10)
+                //      /*body*/
+                //  .mark incrementLabel
+                //      i++;
+                //  .br conditionLabel
+                //  .endloop
+                //  .mark endLoopLabel
+                var conditionLabel = defineLabel();
+                var incrementLabel = defineLabel();
+                var endLabel = beginLoopBlock(incrementLabel);
+                if (node.initializer) {
+                    var initializer = node.initializer;
+                    if (ts.isVariableDeclarationList(initializer)) {
+                        transformAndEmitVariableDeclarationList(initializer);
+                    }
+                    else {
+                        emitStatement(ts.setTextRange(ts.createExpressionStatement(ts.visitNode(initializer, visitor, ts.isExpression)), initializer));
+                    }
+                }
+                markLabel(conditionLabel);
+                if (node.condition) {
+                    emitBreakWhenFalse(endLabel, ts.visitNode(node.condition, visitor, ts.isExpression));
+                }
+                transformAndEmitEmbeddedStatement(node.statement);
+                markLabel(incrementLabel);
+                if (node.incrementor) {
+                    emitStatement(ts.setTextRange(ts.createExpressionStatement(ts.visitNode(node.incrementor, visitor, ts.isExpression)), node.incrementor));
+                }
+                emitBreak(conditionLabel);
+                endLoopBlock();
+            }
+            else {
+                emitStatement(ts.visitNode(node, visitor, ts.isStatement));
+            }
+        }
+        function visitForStatement(node) {
+            if (inStatementContainingYield) {
+                beginScriptLoopBlock();
+            }
+            var initializer = node.initializer;
+            if (initializer && ts.isVariableDeclarationList(initializer)) {
+                for (var _i = 0, _a = initializer.declarations; _i < _a.length; _i++) {
+                    var variable = _a[_i];
+                    hoistVariableDeclaration(variable.name);
+                }
+                var variables = ts.getInitializedVariables(initializer);
+                node = ts.updateFor(node, variables.length > 0
+                    ? ts.inlineExpressions(ts.map(variables, transformInitializedVariable))
+                    : undefined, ts.visitNode(node.condition, visitor, ts.isExpression), ts.visitNode(node.incrementor, visitor, ts.isExpression), ts.visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
+            }
+            else {
+                node = ts.visitEachChild(node, visitor, context);
+            }
+            if (inStatementContainingYield) {
+                endLoopBlock();
+            }
+            return node;
+        }
+        function transformAndEmitForInStatement(node) {
+            // TODO(rbuckton): Source map locations
+            if (containsYield(node)) {
+                // [source]
+                //      for (var p in o) {
+                //          /*body*/
+                //      }
+                //
+                // [intermediate]
+                //  .local _a, _b, _i
+                //      _a = [];
+                //      for (_b in o) _a.push(_b);
+                //      _i = 0;
+                //  .loop incrementLabel, endLoopLabel
+                //  .mark conditionLabel
+                //  .brfalse endLoopLabel, (_i < _a.length)
+                //      p = _a[_i];
+                //      /*body*/
+                //  .mark incrementLabel
+                //      _b++;
+                //  .br conditionLabel
+                //  .endloop
+                //  .mark endLoopLabel
+                var keysArray = declareLocal(); // _a
+                var key = declareLocal(); // _b
+                var keysIndex = ts.createLoopVariable(); // _i
+                var initializer = node.initializer;
+                hoistVariableDeclaration(keysIndex);
+                emitAssignment(keysArray, ts.createArrayLiteral());
+                emitStatement(ts.createForIn(key, ts.visitNode(node.expression, visitor, ts.isExpression), ts.createExpressionStatement(ts.createCall(ts.createPropertyAccess(keysArray, "push"), 
+                /*typeArguments*/ undefined, [key]))));
+                emitAssignment(keysIndex, ts.createLiteral(0));
+                var conditionLabel = defineLabel();
+                var incrementLabel = defineLabel();
+                var endLabel = beginLoopBlock(incrementLabel);
+                markLabel(conditionLabel);
+                emitBreakWhenFalse(endLabel, ts.createLessThan(keysIndex, ts.createPropertyAccess(keysArray, "length")));
+                var variable = void 0;
+                if (ts.isVariableDeclarationList(initializer)) {
+                    for (var _i = 0, _a = initializer.declarations; _i < _a.length; _i++) {
+                        var variable_1 = _a[_i];
+                        hoistVariableDeclaration(variable_1.name);
+                    }
+                    variable = ts.getSynthesizedClone(initializer.declarations[0].name);
+                }
+                else {
+                    variable = ts.visitNode(initializer, visitor, ts.isExpression);
+                    ts.Debug.assert(ts.isLeftHandSideExpression(variable));
+                }
+                emitAssignment(variable, ts.createElementAccess(keysArray, keysIndex));
+                transformAndEmitEmbeddedStatement(node.statement);
+                markLabel(incrementLabel);
+                emitStatement(ts.createExpressionStatement(ts.createPostfixIncrement(keysIndex)));
+                emitBreak(conditionLabel);
+                endLoopBlock();
+            }
+            else {
+                emitStatement(ts.visitNode(node, visitor, ts.isStatement));
+            }
+        }
+        function visitForInStatement(node) {
+            // [source]
+            //      for (var x in a) {
+            //          /*body*/
+            //      }
+            //
+            // [intermediate]
+            //  .local x
+            //  .loop
+            //      for (x in a) {
+            //          /*body*/
+            //      }
+            //  .endloop
+            if (inStatementContainingYield) {
+                beginScriptLoopBlock();
+            }
+            var initializer = node.initializer;
+            if (ts.isVariableDeclarationList(initializer)) {
+                for (var _i = 0, _a = initializer.declarations; _i < _a.length; _i++) {
+                    var variable = _a[_i];
+                    hoistVariableDeclaration(variable.name);
+                }
+                node = ts.updateForIn(node, initializer.declarations[0].name, ts.visitNode(node.expression, visitor, ts.isExpression), ts.visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
+            }
+            else {
+                node = ts.visitEachChild(node, visitor, context);
+            }
+            if (inStatementContainingYield) {
+                endLoopBlock();
+            }
+            return node;
+        }
+        function transformAndEmitContinueStatement(node) {
+            var label = findContinueTarget(node.label ? ts.idText(node.label) : undefined);
+            if (label > 0) {
+                emitBreak(label, /*location*/ node);
+            }
+            else {
+                // invalid continue without a containing loop. Leave the node as is, per #17875.
+                emitStatement(node);
+            }
+        }
+        function visitContinueStatement(node) {
+            if (inStatementContainingYield) {
+                var label = findContinueTarget(node.label && ts.idText(node.label));
+                if (label > 0) {
+                    return createInlineBreak(label, /*location*/ node);
+                }
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function transformAndEmitBreakStatement(node) {
+            var label = findBreakTarget(node.label ? ts.idText(node.label) : undefined);
+            if (label > 0) {
+                emitBreak(label, /*location*/ node);
+            }
+            else {
+                // invalid break without a containing loop, switch, or labeled statement. Leave the node as is, per #17875.
+                emitStatement(node);
+            }
+        }
+        function visitBreakStatement(node) {
+            if (inStatementContainingYield) {
+                var label = findBreakTarget(node.label && ts.idText(node.label));
+                if (label > 0) {
+                    return createInlineBreak(label, /*location*/ node);
+                }
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function transformAndEmitReturnStatement(node) {
+            emitReturn(ts.visitNode(node.expression, visitor, ts.isExpression), 
+            /*location*/ node);
+        }
+        function visitReturnStatement(node) {
+            return createInlineReturn(ts.visitNode(node.expression, visitor, ts.isExpression), 
+            /*location*/ node);
+        }
+        function transformAndEmitWithStatement(node) {
+            if (containsYield(node)) {
+                // [source]
+                //      with (x) {
+                //          /*body*/
+                //      }
+                //
+                // [intermediate]
+                //  .with (x)
+                //      /*body*/
+                //  .endwith
+                beginWithBlock(cacheExpression(ts.visitNode(node.expression, visitor, ts.isExpression)));
+                transformAndEmitEmbeddedStatement(node.statement);
+                endWithBlock();
+            }
+            else {
+                emitStatement(ts.visitNode(node, visitor, ts.isStatement));
+            }
+        }
+        function transformAndEmitSwitchStatement(node) {
+            if (containsYield(node.caseBlock)) {
+                // [source]
+                //      switch (x) {
+                //          case a:
+                //              /*caseStatements*/
+                //          case b:
+                //              /*caseStatements*/
+                //          default:
+                //              /*defaultStatements*/
+                //      }
+                //
+                // [intermediate]
+                //  .local _a
+                //  .switch endLabel
+                //      _a = x;
+                //      switch (_a) {
+                //          case a:
+                //  .br clauseLabels[0]
+                //      }
+                //      switch (_a) {
+                //          case b:
+                //  .br clauseLabels[1]
+                //      }
+                //  .br clauseLabels[2]
+                //  .mark clauseLabels[0]
+                //      /*caseStatements*/
+                //  .mark clauseLabels[1]
+                //      /*caseStatements*/
+                //  .mark clauseLabels[2]
+                //      /*caseStatements*/
+                //  .endswitch
+                //  .mark endLabel
+                var caseBlock = node.caseBlock;
+                var numClauses = caseBlock.clauses.length;
+                var endLabel = beginSwitchBlock();
+                var expression = cacheExpression(ts.visitNode(node.expression, visitor, ts.isExpression));
+                // Create labels for each clause and find the index of the first default clause.
+                var clauseLabels = [];
+                var defaultClauseIndex = -1;
+                for (var i = 0; i < numClauses; i++) {
+                    var clause = caseBlock.clauses[i];
+                    clauseLabels.push(defineLabel());
+                    if (clause.kind === 272 /* DefaultClause */ && defaultClauseIndex === -1) {
+                        defaultClauseIndex = i;
+                    }
+                }
+                // Emit switch statements for each run of case clauses either from the first case
+                // clause or the next case clause with a `yield` in its expression, up to the next
+                // case clause with a `yield` in its expression.
+                var clausesWritten = 0;
+                var pendingClauses = [];
+                while (clausesWritten < numClauses) {
+                    var defaultClausesSkipped = 0;
+                    for (var i = clausesWritten; i < numClauses; i++) {
+                        var clause = caseBlock.clauses[i];
+                        if (clause.kind === 271 /* CaseClause */) {
+                            if (containsYield(clause.expression) && pendingClauses.length > 0) {
+                                break;
+                            }
+                            pendingClauses.push(ts.createCaseClause(ts.visitNode(clause.expression, visitor, ts.isExpression), [
+                                createInlineBreak(clauseLabels[i], /*location*/ clause.expression)
+                            ]));
+                        }
+                        else {
+                            defaultClausesSkipped++;
+                        }
+                    }
+                    if (pendingClauses.length) {
+                        emitStatement(ts.createSwitch(expression, ts.createCaseBlock(pendingClauses)));
+                        clausesWritten += pendingClauses.length;
+                        pendingClauses = [];
+                    }
+                    if (defaultClausesSkipped > 0) {
+                        clausesWritten += defaultClausesSkipped;
+                        defaultClausesSkipped = 0;
+                    }
+                }
+                if (defaultClauseIndex >= 0) {
+                    emitBreak(clauseLabels[defaultClauseIndex]);
+                }
+                else {
+                    emitBreak(endLabel);
+                }
+                for (var i = 0; i < numClauses; i++) {
+                    markLabel(clauseLabels[i]);
+                    transformAndEmitStatements(caseBlock.clauses[i].statements);
+                }
+                endSwitchBlock();
+            }
+            else {
+                emitStatement(ts.visitNode(node, visitor, ts.isStatement));
+            }
+        }
+        function visitSwitchStatement(node) {
+            if (inStatementContainingYield) {
+                beginScriptSwitchBlock();
+            }
+            node = ts.visitEachChild(node, visitor, context);
+            if (inStatementContainingYield) {
+                endSwitchBlock();
+            }
+            return node;
+        }
+        function transformAndEmitLabeledStatement(node) {
+            if (containsYield(node)) {
+                // [source]
+                //      x: {
+                //          /*body*/
+                //      }
+                //
+                // [intermediate]
+                //  .labeled "x", endLabel
+                //      /*body*/
+                //  .endlabeled
+                //  .mark endLabel
+                beginLabeledBlock(ts.idText(node.label));
+                transformAndEmitEmbeddedStatement(node.statement);
+                endLabeledBlock();
+            }
+            else {
+                emitStatement(ts.visitNode(node, visitor, ts.isStatement));
+            }
+        }
+        function visitLabeledStatement(node) {
+            if (inStatementContainingYield) {
+                beginScriptLabeledBlock(ts.idText(node.label));
+            }
+            node = ts.visitEachChild(node, visitor, context);
+            if (inStatementContainingYield) {
+                endLabeledBlock();
+            }
+            return node;
+        }
+        function transformAndEmitThrowStatement(node) {
+            emitThrow(ts.visitNode(node.expression, visitor, ts.isExpression), 
+            /*location*/ node);
+        }
+        function transformAndEmitTryStatement(node) {
+            if (containsYield(node)) {
+                // [source]
+                //      try {
+                //          /*tryBlock*/
+                //      }
+                //      catch (e) {
+                //          /*catchBlock*/
+                //      }
+                //      finally {
+                //          /*finallyBlock*/
+                //      }
+                //
+                // [intermediate]
+                //  .local _a
+                //  .try tryLabel, catchLabel, finallyLabel, endLabel
+                //  .mark tryLabel
+                //  .nop
+                //      /*tryBlock*/
+                //  .br endLabel
+                //  .catch
+                //  .mark catchLabel
+                //      _a = %error%;
+                //      /*catchBlock*/
+                //  .br endLabel
+                //  .finally
+                //  .mark finallyLabel
+                //      /*finallyBlock*/
+                //  .endfinally
+                //  .endtry
+                //  .mark endLabel
+                beginExceptionBlock();
+                transformAndEmitEmbeddedStatement(node.tryBlock);
+                if (node.catchClause) {
+                    beginCatchBlock(node.catchClause.variableDeclaration); // TODO: GH#18217
+                    transformAndEmitEmbeddedStatement(node.catchClause.block);
+                }
+                if (node.finallyBlock) {
+                    beginFinallyBlock();
+                    transformAndEmitEmbeddedStatement(node.finallyBlock);
+                }
+                endExceptionBlock();
+            }
+            else {
+                emitStatement(ts.visitEachChild(node, visitor, context));
+            }
+        }
+        function containsYield(node) {
+            return !!node && (node.transformFlags & 4194304 /* ContainsYield */) !== 0;
+        }
+        function countInitialNodesWithoutYield(nodes) {
+            var numNodes = nodes.length;
+            for (var i = 0; i < numNodes; i++) {
+                if (containsYield(nodes[i])) {
+                    return i;
+                }
+            }
+            return -1;
+        }
+        function onSubstituteNode(hint, node) {
+            node = previousOnSubstituteNode(hint, node);
+            if (hint === 1 /* Expression */) {
+                return substituteExpression(node);
+            }
+            return node;
+        }
+        function substituteExpression(node) {
+            if (ts.isIdentifier(node)) {
+                return substituteExpressionIdentifier(node);
+            }
+            return node;
+        }
+        function substituteExpressionIdentifier(node) {
+            if (!ts.isGeneratedIdentifier(node) && renamedCatchVariables && renamedCatchVariables.has(ts.idText(node))) {
+                var original = ts.getOriginalNode(node);
+                if (ts.isIdentifier(original) && original.parent) {
+                    var declaration = resolver.getReferencedValueDeclaration(original);
+                    if (declaration) {
+                        var name = renamedCatchVariableDeclarations[ts.getOriginalNodeId(declaration)];
+                        if (name) {
+                            var clone_7 = ts.getMutableClone(name);
+                            ts.setSourceMapRange(clone_7, node);
+                            ts.setCommentRange(clone_7, node);
+                            return clone_7;
+                        }
+                    }
+                }
+            }
+            return node;
+        }
+        function cacheExpression(node) {
+            var temp;
+            if (ts.isGeneratedIdentifier(node) || ts.getEmitFlags(node) & 4096 /* HelperName */) {
+                return node;
+            }
+            temp = ts.createTempVariable(hoistVariableDeclaration);
+            emitAssignment(temp, node, /*location*/ node);
+            return temp;
+        }
+        function declareLocal(name) {
+            var temp = name
+                ? ts.createUniqueName(name)
+                : ts.createTempVariable(/*recordTempVariable*/ undefined);
+            hoistVariableDeclaration(temp);
+            return temp;
+        }
+        /**
+         * Defines a label, uses as the target of a Break operation.
+         */
+        function defineLabel() {
+            if (!labelOffsets) {
+                labelOffsets = [];
+            }
+            var label = nextLabelId;
+            nextLabelId++;
+            labelOffsets[label] = -1;
+            return label;
+        }
+        /**
+         * Marks the current operation with the specified label.
+         */
+        function markLabel(label) {
+            ts.Debug.assert(labelOffsets !== undefined, "No labels were defined.");
+            labelOffsets[label] = operations ? operations.length : 0;
+        }
+        /**
+         * Begins a block operation (With, Break/Continue, Try/Catch/Finally)
+         *
+         * @param block Information about the block.
+         */
+        function beginBlock(block) {
+            if (!blocks) {
+                blocks = [];
+                blockActions = [];
+                blockOffsets = [];
+                blockStack = [];
+            }
+            var index = blockActions.length;
+            blockActions[index] = 0 /* Open */;
+            blockOffsets[index] = operations ? operations.length : 0;
+            blocks[index] = block;
+            blockStack.push(block);
+            return index;
+        }
+        /**
+         * Ends the current block operation.
+         */
+        function endBlock() {
+            var block = peekBlock();
+            if (block === undefined)
+                return ts.Debug.fail("beginBlock was never called.");
+            var index = blockActions.length;
+            blockActions[index] = 1 /* Close */;
+            blockOffsets[index] = operations ? operations.length : 0;
+            blocks[index] = block;
+            blockStack.pop();
+            return block;
+        }
+        /**
+         * Gets the current open block.
+         */
+        function peekBlock() {
+            return ts.lastOrUndefined(blockStack);
+        }
+        /**
+         * Gets the kind of the current open block.
+         */
+        function peekBlockKind() {
+            var block = peekBlock();
+            return block && block.kind;
+        }
+        /**
+         * Begins a code block for a generated `with` statement.
+         *
+         * @param expression An identifier representing expression for the `with` block.
+         */
+        function beginWithBlock(expression) {
+            var startLabel = defineLabel();
+            var endLabel = defineLabel();
+            markLabel(startLabel);
+            beginBlock({
+                kind: 1 /* With */,
+                expression: expression,
+                startLabel: startLabel,
+                endLabel: endLabel
+            });
+        }
+        /**
+         * Ends a code block for a generated `with` statement.
+         */
+        function endWithBlock() {
+            ts.Debug.assert(peekBlockKind() === 1 /* With */);
+            var block = endBlock();
+            markLabel(block.endLabel);
+        }
+        /**
+         * Begins a code block for a generated `try` statement.
+         */
+        function beginExceptionBlock() {
+            var startLabel = defineLabel();
+            var endLabel = defineLabel();
+            markLabel(startLabel);
+            beginBlock({
+                kind: 0 /* Exception */,
+                state: 0 /* Try */,
+                startLabel: startLabel,
+                endLabel: endLabel
+            });
+            emitNop();
+            return endLabel;
+        }
+        /**
+         * Enters the `catch` clause of a generated `try` statement.
+         *
+         * @param variable The catch variable.
+         */
+        function beginCatchBlock(variable) {
+            ts.Debug.assert(peekBlockKind() === 0 /* Exception */);
+            // generated identifiers should already be unique within a file
+            var name;
+            if (ts.isGeneratedIdentifier(variable.name)) {
+                name = variable.name;
+                hoistVariableDeclaration(variable.name);
+            }
+            else {
+                var text = ts.idText(variable.name);
+                name = declareLocal(text);
+                if (!renamedCatchVariables) {
+                    renamedCatchVariables = ts.createMap();
+                    renamedCatchVariableDeclarations = [];
+                    context.enableSubstitution(72 /* Identifier */);
+                }
+                renamedCatchVariables.set(text, true);
+                renamedCatchVariableDeclarations[ts.getOriginalNodeId(variable)] = name;
+            }
+            var exception = peekBlock();
+            ts.Debug.assert(exception.state < 1 /* Catch */);
+            var endLabel = exception.endLabel;
+            emitBreak(endLabel);
+            var catchLabel = defineLabel();
+            markLabel(catchLabel);
+            exception.state = 1 /* Catch */;
+            exception.catchVariable = name;
+            exception.catchLabel = catchLabel;
+            emitAssignment(name, ts.createCall(ts.createPropertyAccess(state, "sent"), /*typeArguments*/ undefined, []));
+            emitNop();
+        }
+        /**
+         * Enters the `finally` block of a generated `try` statement.
+         */
+        function beginFinallyBlock() {
+            ts.Debug.assert(peekBlockKind() === 0 /* Exception */);
+            var exception = peekBlock();
+            ts.Debug.assert(exception.state < 2 /* Finally */);
+            var endLabel = exception.endLabel;
+            emitBreak(endLabel);
+            var finallyLabel = defineLabel();
+            markLabel(finallyLabel);
+            exception.state = 2 /* Finally */;
+            exception.finallyLabel = finallyLabel;
+        }
+        /**
+         * Ends the code block for a generated `try` statement.
+         */
+        function endExceptionBlock() {
+            ts.Debug.assert(peekBlockKind() === 0 /* Exception */);
+            var exception = endBlock();
+            var state = exception.state;
+            if (state < 2 /* Finally */) {
+                emitBreak(exception.endLabel);
+            }
+            else {
+                emitEndfinally();
+            }
+            markLabel(exception.endLabel);
+            emitNop();
+            exception.state = 3 /* Done */;
+        }
+        /**
+         * Begins a code block that supports `break` or `continue` statements that are defined in
+         * the source tree and not from generated code.
+         *
+         * @param labelText Names from containing labeled statements.
+         */
+        function beginScriptLoopBlock() {
+            beginBlock({
+                kind: 3 /* Loop */,
+                isScript: true,
+                breakLabel: -1,
+                continueLabel: -1
+            });
+        }
+        /**
+         * Begins a code block that supports `break` or `continue` statements that are defined in
+         * generated code. Returns a label used to mark the operation to which to jump when a
+         * `break` statement targets this block.
+         *
+         * @param continueLabel A Label used to mark the operation to which to jump when a
+         *                      `continue` statement targets this block.
+         */
+        function beginLoopBlock(continueLabel) {
+            var breakLabel = defineLabel();
+            beginBlock({
+                kind: 3 /* Loop */,
+                isScript: false,
+                breakLabel: breakLabel,
+                continueLabel: continueLabel,
+            });
+            return breakLabel;
+        }
+        /**
+         * Ends a code block that supports `break` or `continue` statements that are defined in
+         * generated code or in the source tree.
+         */
+        function endLoopBlock() {
+            ts.Debug.assert(peekBlockKind() === 3 /* Loop */);
+            var block = endBlock();
+            var breakLabel = block.breakLabel;
+            if (!block.isScript) {
+                markLabel(breakLabel);
+            }
+        }
+        /**
+         * Begins a code block that supports `break` statements that are defined in the source
+         * tree and not from generated code.
+         *
+         */
+        function beginScriptSwitchBlock() {
+            beginBlock({
+                kind: 2 /* Switch */,
+                isScript: true,
+                breakLabel: -1
+            });
+        }
+        /**
+         * Begins a code block that supports `break` statements that are defined in generated code.
+         * Returns a label used to mark the operation to which to jump when a `break` statement
+         * targets this block.
+         */
+        function beginSwitchBlock() {
+            var breakLabel = defineLabel();
+            beginBlock({
+                kind: 2 /* Switch */,
+                isScript: false,
+                breakLabel: breakLabel,
+            });
+            return breakLabel;
+        }
+        /**
+         * Ends a code block that supports `break` statements that are defined in generated code.
+         */
+        function endSwitchBlock() {
+            ts.Debug.assert(peekBlockKind() === 2 /* Switch */);
+            var block = endBlock();
+            var breakLabel = block.breakLabel;
+            if (!block.isScript) {
+                markLabel(breakLabel);
+            }
+        }
+        function beginScriptLabeledBlock(labelText) {
+            beginBlock({
+                kind: 4 /* Labeled */,
+                isScript: true,
+                labelText: labelText,
+                breakLabel: -1
+            });
+        }
+        function beginLabeledBlock(labelText) {
+            var breakLabel = defineLabel();
+            beginBlock({
+                kind: 4 /* Labeled */,
+                isScript: false,
+                labelText: labelText,
+                breakLabel: breakLabel
+            });
+        }
+        function endLabeledBlock() {
+            ts.Debug.assert(peekBlockKind() === 4 /* Labeled */);
+            var block = endBlock();
+            if (!block.isScript) {
+                markLabel(block.breakLabel);
+            }
+        }
+        /**
+         * Indicates whether the provided block supports `break` statements.
+         *
+         * @param block A code block.
+         */
+        function supportsUnlabeledBreak(block) {
+            return block.kind === 2 /* Switch */
+                || block.kind === 3 /* Loop */;
+        }
+        /**
+         * Indicates whether the provided block supports `break` statements with labels.
+         *
+         * @param block A code block.
+         */
+        function supportsLabeledBreakOrContinue(block) {
+            return block.kind === 4 /* Labeled */;
+        }
+        /**
+         * Indicates whether the provided block supports `continue` statements.
+         *
+         * @param block A code block.
+         */
+        function supportsUnlabeledContinue(block) {
+            return block.kind === 3 /* Loop */;
+        }
+        function hasImmediateContainingLabeledBlock(labelText, start) {
+            for (var j = start; j >= 0; j--) {
+                var containingBlock = blockStack[j];
+                if (supportsLabeledBreakOrContinue(containingBlock)) {
+                    if (containingBlock.labelText === labelText) {
+                        return true;
+                    }
+                }
+                else {
+                    break;
+                }
+            }
+            return false;
+        }
+        /**
+         * Finds the label that is the target for a `break` statement.
+         *
+         * @param labelText An optional name of a containing labeled statement.
+         */
+        function findBreakTarget(labelText) {
+            if (blockStack) {
+                if (labelText) {
+                    for (var i = blockStack.length - 1; i >= 0; i--) {
+                        var block = blockStack[i];
+                        if (supportsLabeledBreakOrContinue(block) && block.labelText === labelText) {
+                            return block.breakLabel;
+                        }
+                        else if (supportsUnlabeledBreak(block) && hasImmediateContainingLabeledBlock(labelText, i - 1)) {
+                            return block.breakLabel;
+                        }
+                    }
+                }
+                else {
+                    for (var i = blockStack.length - 1; i >= 0; i--) {
+                        var block = blockStack[i];
+                        if (supportsUnlabeledBreak(block)) {
+                            return block.breakLabel;
+                        }
+                    }
+                }
+            }
+            return 0;
+        }
+        /**
+         * Finds the label that is the target for a `continue` statement.
+         *
+         * @param labelText An optional name of a containing labeled statement.
+         */
+        function findContinueTarget(labelText) {
+            if (blockStack) {
+                if (labelText) {
+                    for (var i = blockStack.length - 1; i >= 0; i--) {
+                        var block = blockStack[i];
+                        if (supportsUnlabeledContinue(block) && hasImmediateContainingLabeledBlock(labelText, i - 1)) {
+                            return block.continueLabel;
+                        }
+                    }
+                }
+                else {
+                    for (var i = blockStack.length - 1; i >= 0; i--) {
+                        var block = blockStack[i];
+                        if (supportsUnlabeledContinue(block)) {
+                            return block.continueLabel;
+                        }
+                    }
+                }
+            }
+            return 0;
+        }
+        /**
+         * Creates an expression that can be used to indicate the value for a label.
+         *
+         * @param label A label.
+         */
+        function createLabel(label) {
+            if (label !== undefined && label > 0) {
+                if (labelExpressions === undefined) {
+                    labelExpressions = [];
+                }
+                var expression = ts.createLiteral(-1);
+                if (labelExpressions[label] === undefined) {
+                    labelExpressions[label] = [expression];
+                }
+                else {
+                    labelExpressions[label].push(expression);
+                }
+                return expression;
+            }
+            return ts.createOmittedExpression();
+        }
+        /**
+         * Creates a numeric literal for the provided instruction.
+         */
+        function createInstruction(instruction) {
+            var literal = ts.createLiteral(instruction);
+            ts.addSyntheticTrailingComment(literal, 3 /* MultiLineCommentTrivia */, getInstructionName(instruction));
+            return literal;
+        }
+        /**
+         * Creates a statement that can be used indicate a Break operation to the provided label.
+         *
+         * @param label A label.
+         * @param location An optional source map location for the statement.
+         */
+        function createInlineBreak(label, location) {
+            ts.Debug.assertLessThan(0, label, "Invalid label");
+            return ts.setTextRange(ts.createReturn(ts.createArrayLiteral([
+                createInstruction(3 /* Break */),
+                createLabel(label)
+            ])), location);
+        }
+        /**
+         * Creates a statement that can be used indicate a Return operation.
+         *
+         * @param expression The expression for the return statement.
+         * @param location An optional source map location for the statement.
+         */
+        function createInlineReturn(expression, location) {
+            return ts.setTextRange(ts.createReturn(ts.createArrayLiteral(expression
+                ? [createInstruction(2 /* Return */), expression]
+                : [createInstruction(2 /* Return */)])), location);
+        }
+        /**
+         * Creates an expression that can be used to resume from a Yield operation.
+         */
+        function createGeneratorResume(location) {
+            return ts.setTextRange(ts.createCall(ts.createPropertyAccess(state, "sent"), 
+            /*typeArguments*/ undefined, []), location);
+        }
+        /**
+         * Emits an empty instruction.
+         */
+        function emitNop() {
+            emitWorker(0 /* Nop */);
+        }
+        /**
+         * Emits a Statement.
+         *
+         * @param node A statement.
+         */
+        function emitStatement(node) {
+            if (node) {
+                emitWorker(1 /* Statement */, [node]);
+            }
+            else {
+                emitNop();
+            }
+        }
+        /**
+         * Emits an Assignment operation.
+         *
+         * @param left The left-hand side of the assignment.
+         * @param right The right-hand side of the assignment.
+         * @param location An optional source map location for the assignment.
+         */
+        function emitAssignment(left, right, location) {
+            emitWorker(2 /* Assign */, [left, right], location);
+        }
+        /**
+         * Emits a Break operation to the specified label.
+         *
+         * @param label A label.
+         * @param location An optional source map location for the assignment.
+         */
+        function emitBreak(label, location) {
+            emitWorker(3 /* Break */, [label], location);
+        }
+        /**
+         * Emits a Break operation to the specified label when a condition evaluates to a truthy
+         * value at runtime.
+         *
+         * @param label A label.
+         * @param condition The condition.
+         * @param location An optional source map location for the assignment.
+         */
+        function emitBreakWhenTrue(label, condition, location) {
+            emitWorker(4 /* BreakWhenTrue */, [label, condition], location);
+        }
+        /**
+         * Emits a Break to the specified label when a condition evaluates to a falsey value at
+         * runtime.
+         *
+         * @param label A label.
+         * @param condition The condition.
+         * @param location An optional source map location for the assignment.
+         */
+        function emitBreakWhenFalse(label, condition, location) {
+            emitWorker(5 /* BreakWhenFalse */, [label, condition], location);
+        }
+        /**
+         * Emits a YieldStar operation for the provided expression.
+         *
+         * @param expression An optional value for the yield operation.
+         * @param location An optional source map location for the assignment.
+         */
+        function emitYieldStar(expression, location) {
+            emitWorker(7 /* YieldStar */, [expression], location);
+        }
+        /**
+         * Emits a Yield operation for the provided expression.
+         *
+         * @param expression An optional value for the yield operation.
+         * @param location An optional source map location for the assignment.
+         */
+        function emitYield(expression, location) {
+            emitWorker(6 /* Yield */, [expression], location);
+        }
+        /**
+         * Emits a Return operation for the provided expression.
+         *
+         * @param expression An optional value for the operation.
+         * @param location An optional source map location for the assignment.
+         */
+        function emitReturn(expression, location) {
+            emitWorker(8 /* Return */, [expression], location);
+        }
+        /**
+         * Emits a Throw operation for the provided expression.
+         *
+         * @param expression A value for the operation.
+         * @param location An optional source map location for the assignment.
+         */
+        function emitThrow(expression, location) {
+            emitWorker(9 /* Throw */, [expression], location);
+        }
+        /**
+         * Emits an Endfinally operation. This is used to handle `finally` block semantics.
+         */
+        function emitEndfinally() {
+            emitWorker(10 /* Endfinally */);
+        }
+        /**
+         * Emits an operation.
+         *
+         * @param code The OpCode for the operation.
+         * @param args The optional arguments for the operation.
+         */
+        function emitWorker(code, args, location) {
+            if (operations === undefined) {
+                operations = [];
+                operationArguments = [];
+                operationLocations = [];
+            }
+            if (labelOffsets === undefined) {
+                // mark entry point
+                markLabel(defineLabel());
+            }
+            var operationIndex = operations.length;
+            operations[operationIndex] = code;
+            operationArguments[operationIndex] = args;
+            operationLocations[operationIndex] = location;
+        }
+        /**
+         * Builds the generator function body.
+         */
+        function build() {
+            blockIndex = 0;
+            labelNumber = 0;
+            labelNumbers = undefined;
+            lastOperationWasAbrupt = false;
+            lastOperationWasCompletion = false;
+            clauses = undefined;
+            statements = undefined;
+            exceptionBlockStack = undefined;
+            currentExceptionBlock = undefined;
+            withBlockStack = undefined;
+            var buildResult = buildStatements();
+            return createGeneratorHelper(context, ts.setEmitFlags(ts.createFunctionExpression(
+            /*modifiers*/ undefined, 
+            /*asteriskToken*/ undefined, 
+            /*name*/ undefined, 
+            /*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, state)], 
+            /*type*/ undefined, ts.createBlock(buildResult, 
+            /*multiLine*/ buildResult.length > 0)), 524288 /* ReuseTempVariableScope */));
+        }
+        /**
+         * Builds the statements for the generator function body.
+         */
+        function buildStatements() {
+            if (operations) {
+                for (var operationIndex = 0; operationIndex < operations.length; operationIndex++) {
+                    writeOperation(operationIndex);
+                }
+                flushFinalLabel(operations.length);
+            }
+            else {
+                flushFinalLabel(0);
+            }
+            if (clauses) {
+                var labelExpression = ts.createPropertyAccess(state, "label");
+                var switchStatement = ts.createSwitch(labelExpression, ts.createCaseBlock(clauses));
+                return [ts.startOnNewLine(switchStatement)];
+            }
+            if (statements) {
+                return statements;
+            }
+            return [];
+        }
+        /**
+         * Flush the current label and advance to a new label.
+         */
+        function flushLabel() {
+            if (!statements) {
+                return;
+            }
+            appendLabel(/*markLabelEnd*/ !lastOperationWasAbrupt);
+            lastOperationWasAbrupt = false;
+            lastOperationWasCompletion = false;
+            labelNumber++;
+        }
+        /**
+         * Flush the final label of the generator function body.
+         */
+        function flushFinalLabel(operationIndex) {
+            if (isFinalLabelReachable(operationIndex)) {
+                tryEnterLabel(operationIndex);
+                withBlockStack = undefined;
+                writeReturn(/*expression*/ undefined, /*operationLocation*/ undefined);
+            }
+            if (statements && clauses) {
+                appendLabel(/*markLabelEnd*/ false);
+            }
+            updateLabelExpressions();
+        }
+        /**
+         * Tests whether the final label of the generator function body
+         * is reachable by user code.
+         */
+        function isFinalLabelReachable(operationIndex) {
+            // if the last operation was *not* a completion (return/throw) then
+            // the final label is reachable.
+            if (!lastOperationWasCompletion) {
+                return true;
+            }
+            // if there are no labels defined or referenced, then the final label is
+            // not reachable.
+            if (!labelOffsets || !labelExpressions) {
+                return false;
+            }
+            // if the label for this offset is referenced, then the final label
+            // is reachable.
+            for (var label = 0; label < labelOffsets.length; label++) {
+                if (labelOffsets[label] === operationIndex && labelExpressions[label]) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        /**
+         * Appends a case clause for the last label and sets the new label.
+         *
+         * @param markLabelEnd Indicates that the transition between labels was a fall-through
+         *                     from a previous case clause and the change in labels should be
+         *                     reflected on the `state` object.
+         */
+        function appendLabel(markLabelEnd) {
+            if (!clauses) {
+                clauses = [];
+            }
+            if (statements) {
+                if (withBlockStack) {
+                    // The previous label was nested inside one or more `with` blocks, so we
+                    // surround the statements in generated `with` blocks to create the same environment.
+                    for (var i = withBlockStack.length - 1; i >= 0; i--) {
+                        var withBlock = withBlockStack[i];
+                        statements = [ts.createWith(withBlock.expression, ts.createBlock(statements))];
+                    }
+                }
+                if (currentExceptionBlock) {
+                    // The previous label was nested inside of an exception block, so we must
+                    // indicate entry into a protected region by pushing the label numbers
+                    // for each block in the protected region.
+                    var startLabel = currentExceptionBlock.startLabel, catchLabel = currentExceptionBlock.catchLabel, finallyLabel = currentExceptionBlock.finallyLabel, endLabel = currentExceptionBlock.endLabel;
+                    statements.unshift(ts.createExpressionStatement(ts.createCall(ts.createPropertyAccess(ts.createPropertyAccess(state, "trys"), "push"), 
+                    /*typeArguments*/ undefined, [
+                        ts.createArrayLiteral([
+                            createLabel(startLabel),
+                            createLabel(catchLabel),
+                            createLabel(finallyLabel),
+                            createLabel(endLabel)
+                        ])
+                    ])));
+                    currentExceptionBlock = undefined;
+                }
+                if (markLabelEnd) {
+                    // The case clause for the last label falls through to this label, so we
+                    // add an assignment statement to reflect the change in labels.
+                    statements.push(ts.createExpressionStatement(ts.createAssignment(ts.createPropertyAccess(state, "label"), ts.createLiteral(labelNumber + 1))));
+                }
+            }
+            clauses.push(ts.createCaseClause(ts.createLiteral(labelNumber), statements || []));
+            statements = undefined;
+        }
+        /**
+         * Tries to enter into a new label at the current operation index.
+         */
+        function tryEnterLabel(operationIndex) {
+            if (!labelOffsets) {
+                return;
+            }
+            for (var label = 0; label < labelOffsets.length; label++) {
+                if (labelOffsets[label] === operationIndex) {
+                    flushLabel();
+                    if (labelNumbers === undefined) {
+                        labelNumbers = [];
+                    }
+                    if (labelNumbers[labelNumber] === undefined) {
+                        labelNumbers[labelNumber] = [label];
+                    }
+                    else {
+                        labelNumbers[labelNumber].push(label);
+                    }
+                }
+            }
+        }
+        /**
+         * Updates literal expressions for labels with actual label numbers.
+         */
+        function updateLabelExpressions() {
+            if (labelExpressions !== undefined && labelNumbers !== undefined) {
+                for (var labelNumber_1 = 0; labelNumber_1 < labelNumbers.length; labelNumber_1++) {
+                    var labels = labelNumbers[labelNumber_1];
+                    if (labels !== undefined) {
+                        for (var _i = 0, labels_1 = labels; _i < labels_1.length; _i++) {
+                            var label = labels_1[_i];
+                            var expressions = labelExpressions[label];
+                            if (expressions !== undefined) {
+                                for (var _a = 0, expressions_1 = expressions; _a < expressions_1.length; _a++) {
+                                    var expression = expressions_1[_a];
+                                    expression.text = String(labelNumber_1);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        /**
+         * Tries to enter or leave a code block.
+         */
+        function tryEnterOrLeaveBlock(operationIndex) {
+            if (blocks) {
+                for (; blockIndex < blockActions.length && blockOffsets[blockIndex] <= operationIndex; blockIndex++) {
+                    var block = blocks[blockIndex];
+                    var blockAction = blockActions[blockIndex];
+                    switch (block.kind) {
+                        case 0 /* Exception */:
+                            if (blockAction === 0 /* Open */) {
+                                if (!exceptionBlockStack) {
+                                    exceptionBlockStack = [];
+                                }
+                                if (!statements) {
+                                    statements = [];
+                                }
+                                exceptionBlockStack.push(currentExceptionBlock);
+                                currentExceptionBlock = block;
+                            }
+                            else if (blockAction === 1 /* Close */) {
+                                currentExceptionBlock = exceptionBlockStack.pop();
+                            }
+                            break;
+                        case 1 /* With */:
+                            if (blockAction === 0 /* Open */) {
+                                if (!withBlockStack) {
+                                    withBlockStack = [];
+                                }
+                                withBlockStack.push(block);
+                            }
+                            else if (blockAction === 1 /* Close */) {
+                                withBlockStack.pop();
+                            }
+                            break;
+                        // default: do nothing
+                    }
+                }
+            }
+        }
+        /**
+         * Writes an operation as a statement to the current label's statement list.
+         *
+         * @param operation The OpCode of the operation
+         */
+        function writeOperation(operationIndex) {
+            tryEnterLabel(operationIndex);
+            tryEnterOrLeaveBlock(operationIndex);
+            // early termination, nothing else to process in this label
+            if (lastOperationWasAbrupt) {
+                return;
+            }
+            lastOperationWasAbrupt = false;
+            lastOperationWasCompletion = false;
+            var opcode = operations[operationIndex];
+            if (opcode === 0 /* Nop */) {
+                return;
+            }
+            else if (opcode === 10 /* Endfinally */) {
+                return writeEndfinally();
+            }
+            var args = operationArguments[operationIndex];
+            if (opcode === 1 /* Statement */) {
+                return writeStatement(args[0]);
+            }
+            var location = operationLocations[operationIndex];
+            switch (opcode) {
+                case 2 /* Assign */:
+                    return writeAssign(args[0], args[1], location);
+                case 3 /* Break */:
+                    return writeBreak(args[0], location);
+                case 4 /* BreakWhenTrue */:
+                    return writeBreakWhenTrue(args[0], args[1], location);
+                case 5 /* BreakWhenFalse */:
+                    return writeBreakWhenFalse(args[0], args[1], location);
+                case 6 /* Yield */:
+                    return writeYield(args[0], location);
+                case 7 /* YieldStar */:
+                    return writeYieldStar(args[0], location);
+                case 8 /* Return */:
+                    return writeReturn(args[0], location);
+                case 9 /* Throw */:
+                    return writeThrow(args[0], location);
+            }
+        }
+        /**
+         * Writes a statement to the current label's statement list.
+         *
+         * @param statement A statement to write.
+         */
+        function writeStatement(statement) {
+            if (statement) {
+                if (!statements) {
+                    statements = [statement];
+                }
+                else {
+                    statements.push(statement);
+                }
+            }
+        }
+        /**
+         * Writes an Assign operation to the current label's statement list.
+         *
+         * @param left The left-hand side of the assignment.
+         * @param right The right-hand side of the assignment.
+         * @param operationLocation The source map location for the operation.
+         */
+        function writeAssign(left, right, operationLocation) {
+            writeStatement(ts.setTextRange(ts.createExpressionStatement(ts.createAssignment(left, right)), operationLocation));
+        }
+        /**
+         * Writes a Throw operation to the current label's statement list.
+         *
+         * @param expression The value to throw.
+         * @param operationLocation The source map location for the operation.
+         */
+        function writeThrow(expression, operationLocation) {
+            lastOperationWasAbrupt = true;
+            lastOperationWasCompletion = true;
+            writeStatement(ts.setTextRange(ts.createThrow(expression), operationLocation));
+        }
+        /**
+         * Writes a Return operation to the current label's statement list.
+         *
+         * @param expression The value to return.
+         * @param operationLocation The source map location for the operation.
+         */
+        function writeReturn(expression, operationLocation) {
+            lastOperationWasAbrupt = true;
+            lastOperationWasCompletion = true;
+            writeStatement(ts.setEmitFlags(ts.setTextRange(ts.createReturn(ts.createArrayLiteral(expression
+                ? [createInstruction(2 /* Return */), expression]
+                : [createInstruction(2 /* Return */)])), operationLocation), 384 /* NoTokenSourceMaps */));
+        }
+        /**
+         * Writes a Break operation to the current label's statement list.
+         *
+         * @param label The label for the Break.
+         * @param operationLocation The source map location for the operation.
+         */
+        function writeBreak(label, operationLocation) {
+            lastOperationWasAbrupt = true;
+            writeStatement(ts.setEmitFlags(ts.setTextRange(ts.createReturn(ts.createArrayLiteral([
+                createInstruction(3 /* Break */),
+                createLabel(label)
+            ])), operationLocation), 384 /* NoTokenSourceMaps */));
+        }
+        /**
+         * Writes a BreakWhenTrue operation to the current label's statement list.
+         *
+         * @param label The label for the Break.
+         * @param condition The condition for the Break.
+         * @param operationLocation The source map location for the operation.
+         */
+        function writeBreakWhenTrue(label, condition, operationLocation) {
+            writeStatement(ts.setEmitFlags(ts.createIf(condition, ts.setEmitFlags(ts.setTextRange(ts.createReturn(ts.createArrayLiteral([
+                createInstruction(3 /* Break */),
+                createLabel(label)
+            ])), operationLocation), 384 /* NoTokenSourceMaps */)), 1 /* SingleLine */));
+        }
+        /**
+         * Writes a BreakWhenFalse operation to the current label's statement list.
+         *
+         * @param label The label for the Break.
+         * @param condition The condition for the Break.
+         * @param operationLocation The source map location for the operation.
+         */
+        function writeBreakWhenFalse(label, condition, operationLocation) {
+            writeStatement(ts.setEmitFlags(ts.createIf(ts.createLogicalNot(condition), ts.setEmitFlags(ts.setTextRange(ts.createReturn(ts.createArrayLiteral([
+                createInstruction(3 /* Break */),
+                createLabel(label)
+            ])), operationLocation), 384 /* NoTokenSourceMaps */)), 1 /* SingleLine */));
+        }
+        /**
+         * Writes a Yield operation to the current label's statement list.
+         *
+         * @param expression The expression to yield.
+         * @param operationLocation The source map location for the operation.
+         */
+        function writeYield(expression, operationLocation) {
+            lastOperationWasAbrupt = true;
+            writeStatement(ts.setEmitFlags(ts.setTextRange(ts.createReturn(ts.createArrayLiteral(expression
+                ? [createInstruction(4 /* Yield */), expression]
+                : [createInstruction(4 /* Yield */)])), operationLocation), 384 /* NoTokenSourceMaps */));
+        }
+        /**
+         * Writes a YieldStar instruction to the current label's statement list.
+         *
+         * @param expression The expression to yield.
+         * @param operationLocation The source map location for the operation.
+         */
+        function writeYieldStar(expression, operationLocation) {
+            lastOperationWasAbrupt = true;
+            writeStatement(ts.setEmitFlags(ts.setTextRange(ts.createReturn(ts.createArrayLiteral([
+                createInstruction(5 /* YieldStar */),
+                expression
+            ])), operationLocation), 384 /* NoTokenSourceMaps */));
+        }
+        /**
+         * Writes an Endfinally instruction to the current label's statement list.
+         */
+        function writeEndfinally() {
+            lastOperationWasAbrupt = true;
+            writeStatement(ts.createReturn(ts.createArrayLiteral([
+                createInstruction(7 /* Endfinally */)
+            ])));
+        }
+    }
+    ts.transformGenerators = transformGenerators;
+    function createGeneratorHelper(context, body) {
+        context.requestEmitHelper(generatorHelper);
+        return ts.createCall(ts.getHelperName("__generator"), 
+        /*typeArguments*/ undefined, [ts.createThis(), body]);
+    }
+    // The __generator helper is used by down-level transformations to emulate the runtime
+    // semantics of an ES2015 generator function. When called, this helper returns an
+    // object that implements the Iterator protocol, in that it has `next`, `return`, and
+    // `throw` methods that step through the generator when invoked.
+    //
+    // parameters:
+    //  @param thisArg  The value to use as the `this` binding for the transformed generator body.
+    //  @param body     A function that acts as the transformed generator body.
+    //
+    // variables:
+    //  _       Persistent state for the generator that is shared between the helper and the
+    //          generator body. The state object has the following members:
+    //            sent() - A method that returns or throws the current completion value.
+    //            label  - The next point at which to resume evaluation of the generator body.
+    //            trys   - A stack of protected regions (try/catch/finally blocks).
+    //            ops    - A stack of pending instructions when inside of a finally block.
+    //  f       A value indicating whether the generator is executing.
+    //  y       An iterator to delegate for a yield*.
+    //  t       A temporary variable that holds one of the following values (note that these
+    //          cases do not overlap):
+    //          - The completion value when resuming from a `yield` or `yield*`.
+    //          - The error value for a catch block.
+    //          - The current protected region (array of try/catch/finally/end labels).
+    //          - The verb (`next`, `throw`, or `return` method) to delegate to the expression
+    //            of a `yield*`.
+    //          - The result of evaluating the verb delegated to the expression of a `yield*`.
+    //
+    // functions:
+    //  verb(n)     Creates a bound callback to the `step` function for opcode `n`.
+    //  step(op)    Evaluates opcodes in a generator body until execution is suspended or
+    //              completed.
+    //
+    // The __generator helper understands a limited set of instructions:
+    //  0: next(value?)     - Start or resume the generator with the specified value.
+    //  1: throw(error)     - Resume the generator with an exception. If the generator is
+    //                        suspended inside of one or more protected regions, evaluates
+    //                        any intervening finally blocks between the current label and
+    //                        the nearest catch block or function boundary. If uncaught, the
+    //                        exception is thrown to the caller.
+    //  2: return(value?)   - Resume the generator as if with a return. If the generator is
+    //                        suspended inside of one or more protected regions, evaluates any
+    //                        intervening finally blocks.
+    //  3: break(label)     - Jump to the specified label. If the label is outside of the
+    //                        current protected region, evaluates any intervening finally
+    //                        blocks.
+    //  4: yield(value?)    - Yield execution to the caller with an optional value. When
+    //                        resumed, the generator will continue at the next label.
+    //  5: yield*(value)    - Delegates evaluation to the supplied iterator. When
+    //                        delegation completes, the generator will continue at the next
+    //                        label.
+    //  6: catch(error)     - Handles an exception thrown from within the generator body. If
+    //                        the current label is inside of one or more protected regions,
+    //                        evaluates any intervening finally blocks between the current
+    //                        label and the nearest catch block or function boundary. If
+    //                        uncaught, the exception is thrown to the caller.
+    //  7: endfinally       - Ends a finally block, resuming the last instruction prior to
+    //                        entering a finally block.
+    //
+    // For examples of how these are used, see the comments in ./transformers/generators.ts
+    var generatorHelper = {
+        name: "typescript:generator",
+        scoped: false,
+        priority: 6,
+        text: "\n            var __generator = (this && this.__generator) || function (thisArg, body) {\n                var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;\n                return g = { next: verb(0), \"throw\": verb(1), \"return\": verb(2) }, typeof Symbol === \"function\" && (g[Symbol.iterator] = function() { return this; }), g;\n                function verb(n) { return function (v) { return step([n, v]); }; }\n                function step(op) {\n                    if (f) throw new TypeError(\"Generator is already executing.\");\n                    while (_) try {\n                        if (f = 1, y && (t = op[0] & 2 ? y[\"return\"] : op[0] ? y[\"throw\"] || ((t = y[\"return\"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;\n                        if (y = 0, t) op = [op[0] & 2, t.value];\n                        switch (op[0]) {\n                            case 0: case 1: t = op; break;\n                            case 4: _.label++; return { value: op[1], done: false };\n                            case 5: _.label++; y = op[1]; op = [0]; continue;\n                            case 7: op = _.ops.pop(); _.trys.pop(); continue;\n                            default:\n                                if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }\n                                if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }\n                                if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }\n                                if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }\n                                if (t[2]) _.ops.pop();\n                                _.trys.pop(); continue;\n                        }\n                        op = body.call(thisArg, _);\n                    } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }\n                    if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };\n                }\n            };"
+    };
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
+(function (ts) {
+    function transformModule(context) {
+        function getTransformModuleDelegate(moduleKind) {
+            switch (moduleKind) {
+                case ts.ModuleKind.AMD: return transformAMDModule;
+                case ts.ModuleKind.UMD: return transformUMDModule;
+                default: return transformCommonJSModule;
+            }
+        }
+        var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
+        var compilerOptions = context.getCompilerOptions();
+        var resolver = context.getEmitResolver();
+        var host = context.getEmitHost();
+        var languageVersion = ts.getEmitScriptTarget(compilerOptions);
+        var moduleKind = ts.getEmitModuleKind(compilerOptions);
+        var previousOnSubstituteNode = context.onSubstituteNode;
+        var previousOnEmitNode = context.onEmitNode;
+        context.onSubstituteNode = onSubstituteNode;
+        context.onEmitNode = onEmitNode;
+        context.enableSubstitution(72 /* Identifier */); // Substitutes expression identifiers with imported/exported symbols.
+        context.enableSubstitution(204 /* BinaryExpression */); // Substitutes assignments to exported symbols.
+        context.enableSubstitution(202 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(203 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(276 /* ShorthandPropertyAssignment */); // Substitutes shorthand property assignments for imported/exported symbols.
+        context.enableEmitNotification(279 /* SourceFile */); // Restore state when substituting nodes in a file.
+        var moduleInfoMap = []; // The ExternalModuleInfo for each file.
+        var deferredExports = []; // Exports to defer until an EndOfDeclarationMarker is found.
+        var currentSourceFile; // The current file.
+        var currentModuleInfo; // The ExternalModuleInfo for the current file.
+        var noSubstitution; // Set of nodes for which substitution rules should be ignored.
+        var needUMDDynamicImportHelper;
+        return ts.chainBundle(transformSourceFile);
+        /**
+         * Transforms the module aspects of a SourceFile.
+         *
+         * @param node The SourceFile node.
+         */
+        function transformSourceFile(node) {
+            if (node.isDeclarationFile ||
+                !(ts.isEffectiveExternalModule(node, compilerOptions) ||
+                    node.transformFlags & 16777216 /* ContainsDynamicImport */ ||
+                    (ts.isJsonSourceFile(node) && ts.hasJsonModuleEmitEnabled(compilerOptions) && (compilerOptions.out || compilerOptions.outFile)))) {
+                return node;
+            }
+            currentSourceFile = node;
+            currentModuleInfo = ts.collectExternalModuleInfo(node, resolver, compilerOptions);
+            moduleInfoMap[ts.getOriginalNodeId(node)] = currentModuleInfo;
+            // Perform the transformation.
+            var transformModule = getTransformModuleDelegate(moduleKind);
+            var updated = transformModule(node);
+            currentSourceFile = undefined;
+            currentModuleInfo = undefined;
+            needUMDDynamicImportHelper = false;
+            return ts.aggregateTransformFlags(updated);
+        }
+        function shouldEmitUnderscoreUnderscoreESModule() {
+            if (!currentModuleInfo.exportEquals && ts.isExternalModule(currentSourceFile)) {
+                return true;
+            }
+            return false;
+        }
+        /**
+         * Transforms a SourceFile into a CommonJS module.
+         *
+         * @param node The SourceFile node.
+         */
+        function transformCommonJSModule(node) {
+            startLexicalEnvironment();
+            var statements = [];
+            var ensureUseStrict = ts.getStrictOptionValue(compilerOptions, "alwaysStrict") || (!compilerOptions.noImplicitUseStrict && ts.isExternalModule(currentSourceFile));
+            var statementOffset = ts.addPrologue(statements, node.statements, ensureUseStrict, sourceElementVisitor);
+            if (shouldEmitUnderscoreUnderscoreESModule()) {
+                ts.append(statements, createUnderscoreUnderscoreESModule());
+            }
+            ts.append(statements, ts.visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, ts.isStatement));
+            ts.addRange(statements, ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset));
+            addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false);
+            ts.addStatementsAfterPrologue(statements, endLexicalEnvironment());
+            var updated = ts.updateSourceFileNode(node, ts.setTextRange(ts.createNodeArray(statements), node.statements));
+            if (currentModuleInfo.hasExportStarsToExportValues && !compilerOptions.importHelpers) {
+                // If we have any `export * from ...` declarations
+                // we need to inform the emitter to add the __export helper.
+                ts.addEmitHelper(updated, exportStarHelper);
+            }
+            ts.addEmitHelpers(updated, context.readEmitHelpers());
+            return updated;
+        }
+        /**
+         * Transforms a SourceFile into an AMD module.
+         *
+         * @param node The SourceFile node.
+         */
+        function transformAMDModule(node) {
+            var define = ts.createIdentifier("define");
+            var moduleName = ts.tryGetModuleNameFromFile(node, host, compilerOptions);
+            var jsonSourceFile = ts.isJsonSourceFile(node) && node;
+            // An AMD define function has the following shape:
+            //
+            //     define(id?, dependencies?, factory);
+            //
+            // This has the shape of the following:
+            //
+            //     define(name, ["module1", "module2"], function (module1Alias) { ... }
+            //
+            // The location of the alias in the parameter list in the factory function needs to
+            // match the position of the module name in the dependency list.
+            //
+            // To ensure this is true in cases of modules with no aliases, e.g.:
+            //
+            //     import "module"
+            //
+            // or
+            //
+            //     /// <amd-dependency path= "a.css" />
+            //
+            // we need to add modules without alias names to the end of the dependencies list
+            var _a = collectAsynchronousDependencies(node, /*includeNonAmdDependencies*/ true), aliasedModuleNames = _a.aliasedModuleNames, unaliasedModuleNames = _a.unaliasedModuleNames, importAliasNames = _a.importAliasNames;
+            // Create an updated SourceFile:
+            //
+            //     define(moduleName?, ["module1", "module2"], function ...
+            var updated = ts.updateSourceFileNode(node, ts.setTextRange(ts.createNodeArray([
+                ts.createExpressionStatement(ts.createCall(define, 
+                /*typeArguments*/ undefined, (moduleName ? [moduleName] : []).concat([
+                    // Add the dependency array argument:
+                    //
+                    //     ["require", "exports", module1", "module2", ...]
+                    ts.createArrayLiteral(jsonSourceFile ? ts.emptyArray : [
+                        ts.createLiteral("require"),
+                        ts.createLiteral("exports")
+                    ].concat(aliasedModuleNames, unaliasedModuleNames)),
+                    // Add the module body function argument:
+                    //
+                    //     function (require, exports, module1, module2) ...
+                    jsonSourceFile ?
+                        jsonSourceFile.statements.length ? jsonSourceFile.statements[0].expression : ts.createObjectLiteral() :
+                        ts.createFunctionExpression(
+                        /*modifiers*/ undefined, 
+                        /*asteriskToken*/ undefined, 
+                        /*name*/ undefined, 
+                        /*typeParameters*/ undefined, [
+                            ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "require"),
+                            ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "exports")
+                        ].concat(importAliasNames), 
+                        /*type*/ undefined, transformAsynchronousModuleBody(node))
+                ])))
+            ]), 
+            /*location*/ node.statements));
+            ts.addEmitHelpers(updated, context.readEmitHelpers());
+            return updated;
+        }
+        /**
+         * Transforms a SourceFile into a UMD module.
+         *
+         * @param node The SourceFile node.
+         */
+        function transformUMDModule(node) {
+            var _a = collectAsynchronousDependencies(node, /*includeNonAmdDependencies*/ false), aliasedModuleNames = _a.aliasedModuleNames, unaliasedModuleNames = _a.unaliasedModuleNames, importAliasNames = _a.importAliasNames;
+            var moduleName = ts.tryGetModuleNameFromFile(node, host, compilerOptions);
+            var umdHeader = ts.createFunctionExpression(
+            /*modifiers*/ undefined, 
+            /*asteriskToken*/ undefined, 
+            /*name*/ undefined, 
+            /*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "factory")], 
+            /*type*/ undefined, ts.setTextRange(ts.createBlock([
+                ts.createIf(ts.createLogicalAnd(ts.createTypeCheck(ts.createIdentifier("module"), "object"), ts.createTypeCheck(ts.createPropertyAccess(ts.createIdentifier("module"), "exports"), "object")), ts.createBlock([
+                    ts.createVariableStatement(
+                    /*modifiers*/ undefined, [
+                        ts.createVariableDeclaration("v", 
+                        /*type*/ undefined, ts.createCall(ts.createIdentifier("factory"), 
+                        /*typeArguments*/ undefined, [
+                            ts.createIdentifier("require"),
+                            ts.createIdentifier("exports")
+                        ]))
+                    ]),
+                    ts.setEmitFlags(ts.createIf(ts.createStrictInequality(ts.createIdentifier("v"), ts.createIdentifier("undefined")), ts.createExpressionStatement(ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("module"), "exports"), ts.createIdentifier("v")))), 1 /* SingleLine */)
+                ]), ts.createIf(ts.createLogicalAnd(ts.createTypeCheck(ts.createIdentifier("define"), "function"), ts.createPropertyAccess(ts.createIdentifier("define"), "amd")), ts.createBlock([
+                    ts.createExpressionStatement(ts.createCall(ts.createIdentifier("define"), 
+                    /*typeArguments*/ undefined, (moduleName ? [moduleName] : []).concat([
+                        ts.createArrayLiteral([
+                            ts.createLiteral("require"),
+                            ts.createLiteral("exports")
+                        ].concat(aliasedModuleNames, unaliasedModuleNames)),
+                        ts.createIdentifier("factory")
+                    ])))
+                ])))
+            ], 
+            /*multiLine*/ true), 
+            /*location*/ undefined));
+            // Create an updated SourceFile:
+            //
+            //  (function (factory) {
+            //      if (typeof module === "object" && typeof module.exports === "object") {
+            //          var v = factory(require, exports);
+            //          if (v !== undefined) module.exports = v;
+            //      }
+            //      else if (typeof define === 'function' && define.amd) {
+            //          define(["require", "exports"], factory);
+            //      }
+            //  })(function ...)
+            var updated = ts.updateSourceFileNode(node, ts.setTextRange(ts.createNodeArray([
+                ts.createExpressionStatement(ts.createCall(umdHeader, 
+                /*typeArguments*/ undefined, [
+                    // Add the module body function argument:
+                    //
+                    //     function (require, exports) ...
+                    ts.createFunctionExpression(
+                    /*modifiers*/ undefined, 
+                    /*asteriskToken*/ undefined, 
+                    /*name*/ undefined, 
+                    /*typeParameters*/ undefined, [
+                        ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "require"),
+                        ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, "exports")
+                    ].concat(importAliasNames), 
+                    /*type*/ undefined, transformAsynchronousModuleBody(node))
+                ]))
+            ]), 
+            /*location*/ node.statements));
+            ts.addEmitHelpers(updated, context.readEmitHelpers());
+            return updated;
+        }
+        /**
+         * Collect the additional asynchronous dependencies for the module.
+         *
+         * @param node The source file.
+         * @param includeNonAmdDependencies A value indicating whether to include non-AMD dependencies.
+         */
+        function collectAsynchronousDependencies(node, includeNonAmdDependencies) {
+            // names of modules with corresponding parameter in the factory function
+            var aliasedModuleNames = [];
+            // names of modules with no corresponding parameters in factory function
+            var unaliasedModuleNames = [];
+            // names of the parameters in the factory function; these
+            // parameters need to match the indexes of the corresponding
+            // module names in aliasedModuleNames.
+            var importAliasNames = [];
+            // Fill in amd-dependency tags
+            for (var _i = 0, _a = node.amdDependencies; _i < _a.length; _i++) {
+                var amdDependency = _a[_i];
+                if (amdDependency.name) {
+                    aliasedModuleNames.push(ts.createLiteral(amdDependency.path));
+                    importAliasNames.push(ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, amdDependency.name));
+                }
+                else {
+                    unaliasedModuleNames.push(ts.createLiteral(amdDependency.path));
+                }
+            }
+            for (var _b = 0, _c = currentModuleInfo.externalImports; _b < _c.length; _b++) {
+                var importNode = _c[_b];
+                // Find the name of the external module
+                var externalModuleName = ts.getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
+                // Find the name of the module alias, if there is one
+                var importAliasName = ts.getLocalNameForExternalImport(importNode, currentSourceFile);
+                // It is possible that externalModuleName is undefined if it is not string literal.
+                // This can happen in the invalid import syntax.
+                // E.g : "import * from alias from 'someLib';"
+                if (externalModuleName) {
+                    if (includeNonAmdDependencies && importAliasName) {
+                        // Set emitFlags on the name of the classDeclaration
+                        // This is so that when printer will not substitute the identifier
+                        ts.setEmitFlags(importAliasName, 4 /* NoSubstitution */);
+                        aliasedModuleNames.push(externalModuleName);
+                        importAliasNames.push(ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, importAliasName));
+                    }
+                    else {
+                        unaliasedModuleNames.push(externalModuleName);
+                    }
+                }
+            }
+            return { aliasedModuleNames: aliasedModuleNames, unaliasedModuleNames: unaliasedModuleNames, importAliasNames: importAliasNames };
+        }
+        function getAMDImportExpressionForImport(node) {
+            if (ts.isImportEqualsDeclaration(node) || ts.isExportDeclaration(node) || !ts.getExternalModuleNameLiteral(node, currentSourceFile, host, resolver, compilerOptions)) {
+                return undefined;
+            }
+            var name = ts.getLocalNameForExternalImport(node, currentSourceFile); // TODO: GH#18217
+            var expr = getHelperExpressionForImport(node, name);
+            if (expr === name) {
+                return undefined;
+            }
+            return ts.createExpressionStatement(ts.createAssignment(name, expr));
+        }
+        /**
+         * Transforms a SourceFile into an AMD or UMD module body.
+         *
+         * @param node The SourceFile node.
+         */
+        function transformAsynchronousModuleBody(node) {
+            startLexicalEnvironment();
+            var statements = [];
+            var statementOffset = ts.addPrologue(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
+            if (shouldEmitUnderscoreUnderscoreESModule()) {
+                ts.append(statements, createUnderscoreUnderscoreESModule());
+            }
+            // Visit each statement of the module body.
+            ts.append(statements, ts.visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, ts.isStatement));
+            if (moduleKind === ts.ModuleKind.AMD) {
+                ts.addRange(statements, ts.mapDefined(currentModuleInfo.externalImports, getAMDImportExpressionForImport));
+            }
+            ts.addRange(statements, ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset));
+            // Append the 'export =' statement if provided.
+            addExportEqualsIfNeeded(statements, /*emitAsReturn*/ true);
+            // End the lexical environment for the module body
+            // and merge any new lexical declarations.
+            ts.addStatementsAfterPrologue(statements, endLexicalEnvironment());
+            var body = ts.createBlock(statements, /*multiLine*/ true);
+            if (currentModuleInfo.hasExportStarsToExportValues && !compilerOptions.importHelpers) {
+                // If we have any `export * from ...` declarations
+                // we need to inform the emitter to add the __export helper.
+                ts.addEmitHelper(body, exportStarHelper);
+            }
+            if (needUMDDynamicImportHelper) {
+                ts.addEmitHelper(body, dynamicImportUMDHelper);
+            }
+            return body;
+        }
+        /**
+         * Adds the down-level representation of `export=` to the statement list if one exists
+         * in the source file.
+         *
+         * @param statements The Statement list to modify.
+         * @param emitAsReturn A value indicating whether to emit the `export=` statement as a
+         * return statement.
+         */
+        function addExportEqualsIfNeeded(statements, emitAsReturn) {
+            if (currentModuleInfo.exportEquals) {
+                var expressionResult = ts.visitNode(currentModuleInfo.exportEquals.expression, moduleExpressionElementVisitor);
+                if (expressionResult) {
+                    if (emitAsReturn) {
+                        var statement = ts.createReturn(expressionResult);
+                        ts.setTextRange(statement, currentModuleInfo.exportEquals);
+                        ts.setEmitFlags(statement, 384 /* NoTokenSourceMaps */ | 1536 /* NoComments */);
+                        statements.push(statement);
+                    }
+                    else {
+                        var statement = ts.createExpressionStatement(ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("module"), "exports"), expressionResult));
+                        ts.setTextRange(statement, currentModuleInfo.exportEquals);
+                        ts.setEmitFlags(statement, 1536 /* NoComments */);
+                        statements.push(statement);
+                    }
+                }
+            }
+        }
+        //
+        // Top-Level Source Element Visitors
+        //
+        /**
+         * Visits a node at the top level of the source file.
+         *
+         * @param node The node to visit.
+         */
+        function sourceElementVisitor(node) {
+            switch (node.kind) {
+                case 249 /* ImportDeclaration */:
+                    return visitImportDeclaration(node);
+                case 248 /* ImportEqualsDeclaration */:
+                    return visitImportEqualsDeclaration(node);
+                case 255 /* ExportDeclaration */:
+                    return visitExportDeclaration(node);
+                case 254 /* ExportAssignment */:
+                    return visitExportAssignment(node);
+                case 219 /* VariableStatement */:
+                    return visitVariableStatement(node);
+                case 239 /* FunctionDeclaration */:
+                    return visitFunctionDeclaration(node);
+                case 240 /* ClassDeclaration */:
+                    return visitClassDeclaration(node);
+                case 310 /* MergeDeclarationMarker */:
+                    return visitMergeDeclarationMarker(node);
+                case 311 /* EndOfDeclarationMarker */:
+                    return visitEndOfDeclarationMarker(node);
+                default:
+                    return ts.visitEachChild(node, moduleExpressionElementVisitor, context);
+            }
+        }
+        function moduleExpressionElementVisitor(node) {
+            // This visitor does not need to descend into the tree if there is no dynamic import or destructuring assignment,
+            // as export/import statements are only transformed at the top level of a file.
+            if (!(node.transformFlags & 16777216 /* ContainsDynamicImport */) && !(node.transformFlags & 2048 /* ContainsDestructuringAssignment */)) {
+                return node;
+            }
+            if (ts.isImportCall(node)) {
+                return visitImportCallExpression(node);
+            }
+            else if (node.transformFlags & 1024 /* DestructuringAssignment */ && ts.isBinaryExpression(node)) {
+                return visitDestructuringAssignment(node);
+            }
+            else {
+                return ts.visitEachChild(node, moduleExpressionElementVisitor, context);
+            }
+        }
+        function destructuringNeedsFlattening(node) {
+            if (ts.isObjectLiteralExpression(node)) {
+                for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
+                    var elem = _a[_i];
+                    switch (elem.kind) {
+                        case 275 /* PropertyAssignment */:
+                            if (destructuringNeedsFlattening(elem.initializer)) {
+                                return true;
+                            }
+                            break;
+                        case 276 /* ShorthandPropertyAssignment */:
+                            if (destructuringNeedsFlattening(elem.name)) {
+                                return true;
+                            }
+                            break;
+                        case 277 /* SpreadAssignment */:
+                            if (destructuringNeedsFlattening(elem.expression)) {
+                                return true;
+                            }
+                            break;
+                        case 156 /* MethodDeclaration */:
+                        case 158 /* GetAccessor */:
+                        case 159 /* SetAccessor */:
+                            return false;
+                        default: ts.Debug.assertNever(elem, "Unhandled object member kind");
+                    }
+                }
+            }
+            else if (ts.isArrayLiteralExpression(node)) {
+                for (var _b = 0, _c = node.elements; _b < _c.length; _b++) {
+                    var elem = _c[_b];
+                    if (ts.isSpreadElement(elem)) {
+                        if (destructuringNeedsFlattening(elem.expression)) {
+                            return true;
+                        }
+                    }
+                    else if (destructuringNeedsFlattening(elem)) {
+                        return true;
+                    }
+                }
+            }
+            else if (ts.isIdentifier(node)) {
+                return ts.length(getExports(node)) > (ts.isExportName(node) ? 1 : 0);
+            }
+            return false;
+        }
+        function visitDestructuringAssignment(node) {
+            if (destructuringNeedsFlattening(node.left)) {
+                return ts.flattenDestructuringAssignment(node, moduleExpressionElementVisitor, context, 0 /* All */, /*needsValue*/ false, createAllExportExpressions);
+            }
+            return ts.visitEachChild(node, moduleExpressionElementVisitor, context);
+        }
+        function visitImportCallExpression(node) {
+            var argument = ts.visitNode(ts.firstOrUndefined(node.arguments), moduleExpressionElementVisitor);
+            var containsLexicalThis = !!(node.transformFlags & 8192 /* ContainsLexicalThis */);
+            switch (compilerOptions.module) {
+                case ts.ModuleKind.AMD:
+                    return createImportCallExpressionAMD(argument, containsLexicalThis);
+                case ts.ModuleKind.UMD:
+                    return createImportCallExpressionUMD(argument, containsLexicalThis);
+                case ts.ModuleKind.CommonJS:
+                default:
+                    return createImportCallExpressionCommonJS(argument, containsLexicalThis);
+            }
+        }
+        function createImportCallExpressionUMD(arg, containsLexicalThis) {
+            // (function (factory) {
+            //      ... (regular UMD)
+            // }
+            // })(function (require, exports, useSyncRequire) {
+            //      "use strict";
+            //      Object.defineProperty(exports, "__esModule", { value: true });
+            //      var __syncRequire = typeof module === "object" && typeof module.exports === "object";
+            //      var __resolved = new Promise(function (resolve) { resolve(); });
+            //      .....
+            //      __syncRequire
+            //          ? __resolved.then(function () { return require(x); }) /*CommonJs Require*/
+            //          : new Promise(function (_a, _b) { require([x], _a, _b); }); /*Amd Require*/
+            // });
+            needUMDDynamicImportHelper = true;
+            if (ts.isSimpleCopiableExpression(arg)) {
+                var argClone = ts.isGeneratedIdentifier(arg) ? arg : ts.isStringLiteral(arg) ? ts.createLiteral(arg) : ts.setEmitFlags(ts.setTextRange(ts.getSynthesizedClone(arg), arg), 1536 /* NoComments */);
+                return ts.createConditional(
+                /*condition*/ ts.createIdentifier("__syncRequire"), 
+                /*whenTrue*/ createImportCallExpressionCommonJS(arg, containsLexicalThis), 
+                /*whenFalse*/ createImportCallExpressionAMD(argClone, containsLexicalThis));
+            }
+            else {
+                var temp = ts.createTempVariable(hoistVariableDeclaration);
+                return ts.createComma(ts.createAssignment(temp, arg), ts.createConditional(
+                /*condition*/ ts.createIdentifier("__syncRequire"), 
+                /*whenTrue*/ createImportCallExpressionCommonJS(temp, containsLexicalThis), 
+                /*whenFalse*/ createImportCallExpressionAMD(temp, containsLexicalThis)));
+            }
+        }
+        function createImportCallExpressionAMD(arg, containsLexicalThis) {
+            // improt("./blah")
+            // emit as
+            // define(["require", "exports", "blah"], function (require, exports) {
+            //     ...
+            //     new Promise(function (_a, _b) { require([x], _a, _b); }); /*Amd Require*/
+            // });
+            var resolve = ts.createUniqueName("resolve");
+            var reject = ts.createUniqueName("reject");
+            var parameters = [
+                ts.createParameter(/*decorator*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, /*name*/ resolve),
+                ts.createParameter(/*decorator*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, /*name*/ reject)
+            ];
+            var body = ts.createBlock([
+                ts.createExpressionStatement(ts.createCall(ts.createIdentifier("require"), 
+                /*typeArguments*/ undefined, [ts.createArrayLiteral([arg || ts.createOmittedExpression()]), resolve, reject]))
+            ]);
+            var func;
+            if (languageVersion >= 2 /* ES2015 */) {
+                func = ts.createArrowFunction(
+                /*modifiers*/ undefined, 
+                /*typeParameters*/ undefined, parameters, 
+                /*type*/ undefined, 
+                /*equalsGreaterThanToken*/ undefined, body);
+            }
+            else {
+                func = ts.createFunctionExpression(
+                /*modifiers*/ undefined, 
+                /*asteriskToken*/ undefined, 
+                /*name*/ undefined, 
+                /*typeParameters*/ undefined, parameters, 
+                /*type*/ undefined, body);
+                // if there is a lexical 'this' in the import call arguments, ensure we indicate
+                // that this new function expression indicates it captures 'this' so that the
+                // es2015 transformer will properly substitute 'this' with '_this'.
+                if (containsLexicalThis) {
+                    ts.setEmitFlags(func, 8 /* CapturesThis */);
+                }
+            }
+            var promise = ts.createNew(ts.createIdentifier("Promise"), /*typeArguments*/ undefined, [func]);
+            if (compilerOptions.esModuleInterop) {
+                context.requestEmitHelper(importStarHelper);
+                return ts.createCall(ts.createPropertyAccess(promise, ts.createIdentifier("then")), /*typeArguments*/ undefined, [ts.getHelperName("__importStar")]);
+            }
+            return promise;
+        }
+        function createImportCallExpressionCommonJS(arg, containsLexicalThis) {
+            // import("./blah")
+            // emit as
+            // Promise.resolve().then(function () { return require(x); }) /*CommonJs Require*/
+            // We have to wrap require in then callback so that require is done in asynchronously
+            // if we simply do require in resolve callback in Promise constructor. We will execute the loading immediately
+            var promiseResolveCall = ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Promise"), "resolve"), /*typeArguments*/ undefined, /*argumentsArray*/ []);
+            var requireCall = ts.createCall(ts.createIdentifier("require"), /*typeArguments*/ undefined, arg ? [arg] : []);
+            if (compilerOptions.esModuleInterop) {
+                context.requestEmitHelper(importStarHelper);
+                requireCall = ts.createCall(ts.getHelperName("__importStar"), /*typeArguments*/ undefined, [requireCall]);
+            }
+            var func;
+            if (languageVersion >= 2 /* ES2015 */) {
+                func = ts.createArrowFunction(
+                /*modifiers*/ undefined, 
+                /*typeParameters*/ undefined, 
+                /*parameters*/ [], 
+                /*type*/ undefined, 
+                /*equalsGreaterThanToken*/ undefined, requireCall);
+            }
+            else {
+                func = ts.createFunctionExpression(
+                /*modifiers*/ undefined, 
+                /*asteriskToken*/ undefined, 
+                /*name*/ undefined, 
+                /*typeParameters*/ undefined, 
+                /*parameters*/ [], 
+                /*type*/ undefined, ts.createBlock([ts.createReturn(requireCall)]));
+                // if there is a lexical 'this' in the import call arguments, ensure we indicate
+                // that this new function expression indicates it captures 'this' so that the
+                // es2015 transformer will properly substitute 'this' with '_this'.
+                if (containsLexicalThis) {
+                    ts.setEmitFlags(func, 8 /* CapturesThis */);
+                }
+            }
+            return ts.createCall(ts.createPropertyAccess(promiseResolveCall, "then"), /*typeArguments*/ undefined, [func]);
+        }
+        function getHelperExpressionForImport(node, innerExpr) {
+            if (!compilerOptions.esModuleInterop || ts.getEmitFlags(node) & 67108864 /* NeverApplyImportHelper */) {
+                return innerExpr;
+            }
+            if (ts.getImportNeedsImportStarHelper(node)) {
+                context.requestEmitHelper(importStarHelper);
+                return ts.createCall(ts.getHelperName("__importStar"), /*typeArguments*/ undefined, [innerExpr]);
+            }
+            if (ts.getImportNeedsImportDefaultHelper(node)) {
+                context.requestEmitHelper(importDefaultHelper);
+                return ts.createCall(ts.getHelperName("__importDefault"), /*typeArguments*/ undefined, [innerExpr]);
+            }
+            return innerExpr;
+        }
+        /**
+         * Visits an ImportDeclaration node.
+         *
+         * @param node The node to visit.
+         */
+        function visitImportDeclaration(node) {
+            var statements;
+            var namespaceDeclaration = ts.getNamespaceDeclarationNode(node);
+            if (moduleKind !== ts.ModuleKind.AMD) {
+                if (!node.importClause) {
+                    // import "mod";
+                    return ts.setOriginalNode(ts.setTextRange(ts.createExpressionStatement(createRequireCall(node)), node), node);
+                }
+                else {
+                    var variables = [];
+                    if (namespaceDeclaration && !ts.isDefaultImport(node)) {
+                        // import * as n from "mod";
+                        variables.push(ts.createVariableDeclaration(ts.getSynthesizedClone(namespaceDeclaration.name), 
+                        /*type*/ undefined, getHelperExpressionForImport(node, createRequireCall(node))));
+                    }
+                    else {
+                        // import d from "mod";
+                        // import { x, y } from "mod";
+                        // import d, { x, y } from "mod";
+                        // import d, * as n from "mod";
+                        variables.push(ts.createVariableDeclaration(ts.getGeneratedNameForNode(node), 
+                        /*type*/ undefined, getHelperExpressionForImport(node, createRequireCall(node))));
+                        if (namespaceDeclaration && ts.isDefaultImport(node)) {
+                            variables.push(ts.createVariableDeclaration(ts.getSynthesizedClone(namespaceDeclaration.name), 
+                            /*type*/ undefined, ts.getGeneratedNameForNode(node)));
+                        }
+                    }
+                    statements = ts.append(statements, ts.setOriginalNode(ts.setTextRange(ts.createVariableStatement(
+                    /*modifiers*/ undefined, ts.createVariableDeclarationList(variables, languageVersion >= 2 /* ES2015 */ ? 2 /* Const */ : 0 /* None */)), 
+                    /*location*/ node), 
+                    /*original*/ node));
+                }
+            }
+            else if (namespaceDeclaration && ts.isDefaultImport(node)) {
+                // import d, * as n from "mod";
+                statements = ts.append(statements, ts.createVariableStatement(
+                /*modifiers*/ undefined, ts.createVariableDeclarationList([
+                    ts.setOriginalNode(ts.setTextRange(ts.createVariableDeclaration(ts.getSynthesizedClone(namespaceDeclaration.name), 
+                    /*type*/ undefined, ts.getGeneratedNameForNode(node)), 
+                    /*location*/ node), 
+                    /*original*/ node)
+                ], languageVersion >= 2 /* ES2015 */ ? 2 /* Const */ : 0 /* None */)));
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfImportDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfImportDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Creates a `require()` call to import an external module.
+         *
+         * @param importNode The declararation to import.
+         */
+        function createRequireCall(importNode) {
+            var moduleName = ts.getExternalModuleNameLiteral(importNode, currentSourceFile, host, resolver, compilerOptions);
+            var args = [];
+            if (moduleName) {
+                args.push(moduleName);
+            }
+            return ts.createCall(ts.createIdentifier("require"), /*typeArguments*/ undefined, args);
+        }
+        /**
+         * Visits an ImportEqualsDeclaration node.
+         *
+         * @param node The node to visit.
+         */
+        function visitImportEqualsDeclaration(node) {
+            ts.Debug.assert(ts.isExternalModuleImportEqualsDeclaration(node), "import= for internal module references should be handled in an earlier transformer.");
+            var statements;
+            if (moduleKind !== ts.ModuleKind.AMD) {
+                if (ts.hasModifier(node, 1 /* Export */)) {
+                    statements = ts.append(statements, ts.setOriginalNode(ts.setTextRange(ts.createExpressionStatement(createExportExpression(node.name, createRequireCall(node))), node), node));
+                }
+                else {
+                    statements = ts.append(statements, ts.setOriginalNode(ts.setTextRange(ts.createVariableStatement(
+                    /*modifiers*/ undefined, ts.createVariableDeclarationList([
+                        ts.createVariableDeclaration(ts.getSynthesizedClone(node.name), 
+                        /*type*/ undefined, createRequireCall(node))
+                    ], 
+                    /*flags*/ languageVersion >= 2 /* ES2015 */ ? 2 /* Const */ : 0 /* None */)), node), node));
+                }
+            }
+            else {
+                if (ts.hasModifier(node, 1 /* Export */)) {
+                    statements = ts.append(statements, ts.setOriginalNode(ts.setTextRange(ts.createExpressionStatement(createExportExpression(ts.getExportName(node), ts.getLocalName(node))), node), node));
+                }
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfImportEqualsDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfImportEqualsDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Visits an ExportDeclaration node.
+         *
+         * @param The node to visit.
+         */
+        function visitExportDeclaration(node) {
+            if (!node.moduleSpecifier) {
+                // Elide export declarations with no module specifier as they are handled
+                // elsewhere.
+                return undefined;
+            }
+            var generatedName = ts.getGeneratedNameForNode(node);
+            if (node.exportClause) {
+                var statements = [];
+                // export { x, y } from "mod";
+                if (moduleKind !== ts.ModuleKind.AMD) {
+                    statements.push(ts.setOriginalNode(ts.setTextRange(ts.createVariableStatement(
+                    /*modifiers*/ undefined, ts.createVariableDeclarationList([
+                        ts.createVariableDeclaration(generatedName, 
+                        /*type*/ undefined, createRequireCall(node))
+                    ])), 
+                    /*location*/ node), 
+                    /* original */ node));
+                }
+                for (var _i = 0, _a = node.exportClause.elements; _i < _a.length; _i++) {
+                    var specifier = _a[_i];
+                    var exportedValue = ts.createPropertyAccess(generatedName, specifier.propertyName || specifier.name);
+                    statements.push(ts.setOriginalNode(ts.setTextRange(ts.createExpressionStatement(createExportExpression(ts.getExportName(specifier), exportedValue)), specifier), specifier));
+                }
+                return ts.singleOrMany(statements);
+            }
+            else {
+                // export * from "mod";
+                return ts.setOriginalNode(ts.setTextRange(ts.createExpressionStatement(createExportStarHelper(context, moduleKind !== ts.ModuleKind.AMD ? createRequireCall(node) : generatedName)), node), node);
+            }
+        }
+        /**
+         * Visits an ExportAssignment node.
+         *
+         * @param node The node to visit.
+         */
+        function visitExportAssignment(node) {
+            if (node.isExportEquals) {
+                return undefined;
+            }
+            var statements;
+            var original = node.original;
+            if (original && hasAssociatedEndOfDeclarationMarker(original)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportStatement(deferredExports[id], ts.createIdentifier("default"), ts.visitNode(node.expression, moduleExpressionElementVisitor), /*location*/ node, /*allowComments*/ true);
+            }
+            else {
+                statements = appendExportStatement(statements, ts.createIdentifier("default"), ts.visitNode(node.expression, moduleExpressionElementVisitor), /*location*/ node, /*allowComments*/ true);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Visits a FunctionDeclaration node.
+         *
+         * @param node The node to visit.
+         */
+        function visitFunctionDeclaration(node) {
+            var statements;
+            if (ts.hasModifier(node, 1 /* Export */)) {
+                statements = ts.append(statements, ts.setOriginalNode(ts.setTextRange(ts.createFunctionDeclaration(
+                /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, ts.getDeclarationName(node, /*allowComments*/ true, /*allowSourceMaps*/ true), 
+                /*typeParameters*/ undefined, ts.visitNodes(node.parameters, moduleExpressionElementVisitor), 
+                /*type*/ undefined, ts.visitEachChild(node.body, moduleExpressionElementVisitor, context)), 
+                /*location*/ node), 
+                /*original*/ node));
+            }
+            else {
+                statements = ts.append(statements, ts.visitEachChild(node, moduleExpressionElementVisitor, context));
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfHoistedDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfHoistedDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Visits a ClassDeclaration node.
+         *
+         * @param node The node to visit.
+         */
+        function visitClassDeclaration(node) {
+            var statements;
+            if (ts.hasModifier(node, 1 /* Export */)) {
+                statements = ts.append(statements, ts.setOriginalNode(ts.setTextRange(ts.createClassDeclaration(
+                /*decorators*/ undefined, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.getDeclarationName(node, /*allowComments*/ true, /*allowSourceMaps*/ true), 
+                /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, moduleExpressionElementVisitor), ts.visitNodes(node.members, moduleExpressionElementVisitor)), node), node));
+            }
+            else {
+                statements = ts.append(statements, ts.visitEachChild(node, moduleExpressionElementVisitor, context));
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfHoistedDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfHoistedDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Visits a VariableStatement node.
+         *
+         * @param node The node to visit.
+         */
+        function visitVariableStatement(node) {
+            var statements;
+            var variables;
+            var expressions;
+            if (ts.hasModifier(node, 1 /* Export */)) {
+                var modifiers = void 0;
+                // If we're exporting these variables, then these just become assignments to 'exports.x'.
+                // We only want to emit assignments for variables with initializers.
+                for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                    var variable = _a[_i];
+                    if (ts.isIdentifier(variable.name) && ts.isLocalName(variable.name)) {
+                        if (!modifiers) {
+                            modifiers = ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier);
+                        }
+                        variables = ts.append(variables, variable);
+                    }
+                    else if (variable.initializer) {
+                        expressions = ts.append(expressions, transformInitializedVariable(variable));
+                    }
+                }
+                if (variables) {
+                    statements = ts.append(statements, ts.updateVariableStatement(node, modifiers, ts.updateVariableDeclarationList(node.declarationList, variables)));
+                }
+                if (expressions) {
+                    statements = ts.append(statements, ts.setOriginalNode(ts.setTextRange(ts.createExpressionStatement(ts.inlineExpressions(expressions)), node), node));
+                }
+            }
+            else {
+                statements = ts.append(statements, ts.visitEachChild(node, moduleExpressionElementVisitor, context));
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfVariableStatement(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        function createAllExportExpressions(name, value, location) {
+            var exportedNames = getExports(name);
+            if (exportedNames) {
+                // For each additional export of the declaration, apply an export assignment.
+                var expression = ts.isExportName(name) ? value : ts.createAssignment(name, value);
+                for (var _i = 0, exportedNames_1 = exportedNames; _i < exportedNames_1.length; _i++) {
+                    var exportName = exportedNames_1[_i];
+                    // Mark the node to prevent triggering substitution.
+                    ts.setEmitFlags(expression, 4 /* NoSubstitution */);
+                    expression = createExportExpression(exportName, expression, /*location*/ location);
+                }
+                return expression;
+            }
+            return ts.createAssignment(name, value);
+        }
+        /**
+         * Transforms an exported variable with an initializer into an expression.
+         *
+         * @param node The node to transform.
+         */
+        function transformInitializedVariable(node) {
+            if (ts.isBindingPattern(node.name)) {
+                return ts.flattenDestructuringAssignment(ts.visitNode(node, moduleExpressionElementVisitor), 
+                /*visitor*/ undefined, context, 0 /* All */, 
+                /*needsValue*/ false, createAllExportExpressions);
+            }
+            else {
+                return ts.createAssignment(ts.setTextRange(ts.createPropertyAccess(ts.createIdentifier("exports"), node.name), 
+                /*location*/ node.name), ts.visitNode(node.initializer, moduleExpressionElementVisitor));
+            }
+        }
+        /**
+         * Visits a MergeDeclarationMarker used as a placeholder for the beginning of a merged
+         * and transformed declaration.
+         *
+         * @param node The node to visit.
+         */
+        function visitMergeDeclarationMarker(node) {
+            // For an EnumDeclaration or ModuleDeclaration that merges with a preceeding
+            // declaration we do not emit a leading variable declaration. To preserve the
+            // begin/end semantics of the declararation and to properly handle exports
+            // we wrapped the leading variable declaration in a `MergeDeclarationMarker`.
+            //
+            // To balance the declaration, add the exports of the elided variable
+            // statement.
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 219 /* VariableStatement */) {
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original);
+            }
+            return node;
+        }
+        /**
+         * Determines whether a node has an associated EndOfDeclarationMarker.
+         *
+         * @param node The node to test.
+         */
+        function hasAssociatedEndOfDeclarationMarker(node) {
+            return (ts.getEmitFlags(node) & 4194304 /* HasEndOfDeclarationMarker */) !== 0;
+        }
+        /**
+         * Visits a DeclarationMarker used as a placeholder for the end of a transformed
+         * declaration.
+         *
+         * @param node The node to visit.
+         */
+        function visitEndOfDeclarationMarker(node) {
+            // For some transformations we emit an `EndOfDeclarationMarker` to mark the actual
+            // end of the transformed declaration. We use this marker to emit any deferred exports
+            // of the declaration.
+            var id = ts.getOriginalNodeId(node);
+            var statements = deferredExports[id];
+            if (statements) {
+                delete deferredExports[id];
+                return ts.append(statements, node);
+            }
+            return node;
+        }
+        /**
+         * Appends the exports of an ImportDeclaration to a statement list, returning the
+         * statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration whose exports are to be recorded.
+         */
+        function appendExportsOfImportDeclaration(statements, decl) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            var importClause = decl.importClause;
+            if (!importClause) {
+                return statements;
+            }
+            if (importClause.name) {
+                statements = appendExportsOfDeclaration(statements, importClause);
+            }
+            var namedBindings = importClause.namedBindings;
+            if (namedBindings) {
+                switch (namedBindings.kind) {
+                    case 251 /* NamespaceImport */:
+                        statements = appendExportsOfDeclaration(statements, namedBindings);
+                        break;
+                    case 252 /* NamedImports */:
+                        for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
+                            var importBinding = _a[_i];
+                            statements = appendExportsOfDeclaration(statements, importBinding);
+                        }
+                        break;
+                }
+            }
+            return statements;
+        }
+        /**
+         * Appends the exports of an ImportEqualsDeclaration to a statement list, returning the
+         * statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration whose exports are to be recorded.
+         */
+        function appendExportsOfImportEqualsDeclaration(statements, decl) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            return appendExportsOfDeclaration(statements, decl);
+        }
+        /**
+         * Appends the exports of a VariableStatement to a statement list, returning the statement
+         * list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param node The VariableStatement whose exports are to be recorded.
+         */
+        function appendExportsOfVariableStatement(statements, node) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                var decl = _a[_i];
+                statements = appendExportsOfBindingElement(statements, decl);
+            }
+            return statements;
+        }
+        /**
+         * Appends the exports of a VariableDeclaration or BindingElement to a statement list,
+         * returning the statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration whose exports are to be recorded.
+         */
+        function appendExportsOfBindingElement(statements, decl) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            if (ts.isBindingPattern(decl.name)) {
+                for (var _i = 0, _a = decl.name.elements; _i < _a.length; _i++) {
+                    var element = _a[_i];
+                    if (!ts.isOmittedExpression(element)) {
+                        statements = appendExportsOfBindingElement(statements, element);
+                    }
+                }
+            }
+            else if (!ts.isGeneratedIdentifier(decl.name)) {
+                statements = appendExportsOfDeclaration(statements, decl);
+            }
+            return statements;
+        }
+        /**
+         * Appends the exports of a ClassDeclaration or FunctionDeclaration to a statement list,
+         * returning the statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration whose exports are to be recorded.
+         */
+        function appendExportsOfHoistedDeclaration(statements, decl) {
+            if (currentModuleInfo.exportEquals) {
+                return statements;
+            }
+            if (ts.hasModifier(decl, 1 /* Export */)) {
+                var exportName = ts.hasModifier(decl, 512 /* Default */) ? ts.createIdentifier("default") : ts.getDeclarationName(decl);
+                statements = appendExportStatement(statements, exportName, ts.getLocalName(decl), /*location*/ decl);
+            }
+            if (decl.name) {
+                statements = appendExportsOfDeclaration(statements, decl);
+            }
+            return statements;
+        }
+        /**
+         * Appends the exports of a declaration to a statement list, returning the statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration to export.
+         */
+        function appendExportsOfDeclaration(statements, decl) {
+            var name = ts.getDeclarationName(decl);
+            var exportSpecifiers = currentModuleInfo.exportSpecifiers.get(ts.idText(name));
+            if (exportSpecifiers) {
+                for (var _i = 0, exportSpecifiers_1 = exportSpecifiers; _i < exportSpecifiers_1.length; _i++) {
+                    var exportSpecifier = exportSpecifiers_1[_i];
+                    statements = appendExportStatement(statements, exportSpecifier.name, name, /*location*/ exportSpecifier.name);
+                }
+            }
+            return statements;
+        }
+        /**
+         * Appends the down-level representation of an export to a statement list, returning the
+         * statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param exportName The name of the export.
+         * @param expression The expression to export.
+         * @param location The location to use for source maps and comments for the export.
+         * @param allowComments Whether to allow comments on the export.
+         */
+        function appendExportStatement(statements, exportName, expression, location, allowComments) {
+            statements = ts.append(statements, createExportStatement(exportName, expression, location, allowComments));
+            return statements;
+        }
+        function createUnderscoreUnderscoreESModule() {
+            var statement;
+            if (languageVersion === 0 /* ES3 */) {
+                statement = ts.createExpressionStatement(createExportExpression(ts.createIdentifier("__esModule"), ts.createLiteral(/*value*/ true)));
+            }
+            else {
+                statement = ts.createExpressionStatement(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), 
+                /*typeArguments*/ undefined, [
+                    ts.createIdentifier("exports"),
+                    ts.createLiteral("__esModule"),
+                    ts.createObjectLiteral([
+                        ts.createPropertyAssignment("value", ts.createLiteral(/*value*/ true))
+                    ])
+                ]));
+            }
+            ts.setEmitFlags(statement, 1048576 /* CustomPrologue */);
+            return statement;
+        }
+        /**
+         * Creates a call to the current file's export function to export a value.
+         *
+         * @param name The bound name of the export.
+         * @param value The exported value.
+         * @param location The location to use for source maps and comments for the export.
+         * @param allowComments An optional value indicating whether to emit comments for the statement.
+         */
+        function createExportStatement(name, value, location, allowComments) {
+            var statement = ts.setTextRange(ts.createExpressionStatement(createExportExpression(name, value)), location);
+            ts.startOnNewLine(statement);
+            if (!allowComments) {
+                ts.setEmitFlags(statement, 1536 /* NoComments */);
+            }
+            return statement;
+        }
+        /**
+         * Creates a call to the current file's export function to export a value.
+         *
+         * @param name The bound name of the export.
+         * @param value The exported value.
+         * @param location The location to use for source maps and comments for the export.
+         */
+        function createExportExpression(name, value, location) {
+            return ts.setTextRange(ts.createAssignment(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(name)), value), location);
+        }
+        //
+        // Modifier Visitors
+        //
+        /**
+         * Visit nodes to elide module-specific modifiers.
+         *
+         * @param node The node to visit.
+         */
+        function modifierVisitor(node) {
+            // Elide module-specific modifiers.
+            switch (node.kind) {
+                case 85 /* ExportKeyword */:
+                case 80 /* DefaultKeyword */:
+                    return undefined;
+            }
+            return node;
+        }
+        //
+        // Emit Notification
+        //
+        /**
+         * Hook for node emit notifications.
+         *
+         * @param hint A hint as to the intended usage of the node.
+         * @param node The node to emit.
+         * @param emit A callback used to emit the node in the printer.
+         */
+        function onEmitNode(hint, node, emitCallback) {
+            if (node.kind === 279 /* SourceFile */) {
+                currentSourceFile = node;
+                currentModuleInfo = moduleInfoMap[ts.getOriginalNodeId(currentSourceFile)];
+                noSubstitution = [];
+                previousOnEmitNode(hint, node, emitCallback);
+                currentSourceFile = undefined;
+                currentModuleInfo = undefined;
+                noSubstitution = undefined;
+            }
+            else {
+                previousOnEmitNode(hint, node, emitCallback);
+            }
+        }
+        //
+        // Substitutions
+        //
+        /**
+         * Hooks node substitutions.
+         *
+         * @param hint A hint as to the intended usage of the node.
+         * @param node The node to substitute.
+         */
+        function onSubstituteNode(hint, node) {
+            node = previousOnSubstituteNode(hint, node);
+            if (node.id && noSubstitution[node.id]) {
+                return node;
+            }
+            if (hint === 1 /* Expression */) {
+                return substituteExpression(node);
+            }
+            else if (ts.isShorthandPropertyAssignment(node)) {
+                return substituteShorthandPropertyAssignment(node);
+            }
+            return node;
+        }
+        /**
+         * Substitution for a ShorthandPropertyAssignment whose declaration name is an imported
+         * or exported symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteShorthandPropertyAssignment(node) {
+            var name = node.name;
+            var exportedOrImportedName = substituteExpressionIdentifier(name);
+            if (exportedOrImportedName !== name) {
+                // A shorthand property with an assignment initializer is probably part of a
+                // destructuring assignment
+                if (node.objectAssignmentInitializer) {
+                    var initializer = ts.createAssignment(exportedOrImportedName, node.objectAssignmentInitializer);
+                    return ts.setTextRange(ts.createPropertyAssignment(name, initializer), node);
+                }
+                return ts.setTextRange(ts.createPropertyAssignment(name, exportedOrImportedName), node);
+            }
+            return node;
+        }
+        /**
+         * Substitution for an Expression that may contain an imported or exported symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteExpression(node) {
+            switch (node.kind) {
+                case 72 /* Identifier */:
+                    return substituteExpressionIdentifier(node);
+                case 204 /* BinaryExpression */:
+                    return substituteBinaryExpression(node);
+                case 203 /* PostfixUnaryExpression */:
+                case 202 /* PrefixUnaryExpression */:
+                    return substituteUnaryExpression(node);
+            }
+            return node;
+        }
+        /**
+         * Substitution for an Identifier expression that may contain an imported or exported
+         * symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteExpressionIdentifier(node) {
+            if (ts.getEmitFlags(node) & 4096 /* HelperName */) {
+                var externalHelpersModuleName = ts.getExternalHelpersModuleName(currentSourceFile);
+                if (externalHelpersModuleName) {
+                    return ts.createPropertyAccess(externalHelpersModuleName, node);
+                }
+                return node;
+            }
+            if (!ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) {
+                var exportContainer = resolver.getReferencedExportContainer(node, ts.isExportName(node));
+                if (exportContainer && exportContainer.kind === 279 /* SourceFile */) {
+                    return ts.setTextRange(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(node)), 
+                    /*location*/ node);
+                }
+                var importDeclaration = resolver.getReferencedImportDeclaration(node);
+                if (importDeclaration) {
+                    if (ts.isImportClause(importDeclaration)) {
+                        return ts.setTextRange(ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent), ts.createIdentifier("default")), 
+                        /*location*/ node);
+                    }
+                    else if (ts.isImportSpecifier(importDeclaration)) {
+                        var name = importDeclaration.propertyName || importDeclaration.name;
+                        return ts.setTextRange(ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent.parent.parent), ts.getSynthesizedClone(name)), 
+                        /*location*/ node);
+                    }
+                }
+            }
+            return node;
+        }
+        /**
+         * Substitution for a BinaryExpression that may contain an imported or exported symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteBinaryExpression(node) {
+            // When we see an assignment expression whose left-hand side is an exported symbol,
+            // we should ensure all exports of that symbol are updated with the correct value.
+            //
+            // - We do not substitute generated identifiers for any reason.
+            // - We do not substitute identifiers tagged with the LocalName flag.
+            // - We do not substitute identifiers that were originally the name of an enum or
+            //   namespace due to how they are transformed in TypeScript.
+            // - We only substitute identifiers that are exported at the top level.
+            if (ts.isAssignmentOperator(node.operatorToken.kind)
+                && ts.isIdentifier(node.left)
+                && !ts.isGeneratedIdentifier(node.left)
+                && !ts.isLocalName(node.left)
+                && !ts.isDeclarationNameOfEnumOrNamespace(node.left)) {
+                var exportedNames = getExports(node.left);
+                if (exportedNames) {
+                    // For each additional export of the declaration, apply an export assignment.
+                    var expression = node;
+                    for (var _i = 0, exportedNames_2 = exportedNames; _i < exportedNames_2.length; _i++) {
+                        var exportName = exportedNames_2[_i];
+                        // Mark the node to prevent triggering this rule again.
+                        noSubstitution[ts.getNodeId(expression)] = true;
+                        expression = createExportExpression(exportName, expression, /*location*/ node);
+                    }
+                    return expression;
+                }
+            }
+            return node;
+        }
+        /**
+         * Substitution for a UnaryExpression that may contain an imported or exported symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteUnaryExpression(node) {
+            // When we see a prefix or postfix increment expression whose operand is an exported
+            // symbol, we should ensure all exports of that symbol are updated with the correct
+            // value.
+            //
+            // - We do not substitute generated identifiers for any reason.
+            // - We do not substitute identifiers tagged with the LocalName flag.
+            // - We do not substitute identifiers that were originally the name of an enum or
+            //   namespace due to how they are transformed in TypeScript.
+            // - We only substitute identifiers that are exported at the top level.
+            if ((node.operator === 44 /* PlusPlusToken */ || node.operator === 45 /* MinusMinusToken */)
+                && ts.isIdentifier(node.operand)
+                && !ts.isGeneratedIdentifier(node.operand)
+                && !ts.isLocalName(node.operand)
+                && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
+                var exportedNames = getExports(node.operand);
+                if (exportedNames) {
+                    var expression = node.kind === 203 /* PostfixUnaryExpression */
+                        ? ts.setTextRange(ts.createBinary(node.operand, ts.createToken(node.operator === 44 /* PlusPlusToken */ ? 60 /* PlusEqualsToken */ : 61 /* MinusEqualsToken */), ts.createLiteral(1)), 
+                        /*location*/ node)
+                        : node;
+                    for (var _i = 0, exportedNames_3 = exportedNames; _i < exportedNames_3.length; _i++) {
+                        var exportName = exportedNames_3[_i];
+                        // Mark the node to prevent triggering this rule again.
+                        noSubstitution[ts.getNodeId(expression)] = true;
+                        expression = createExportExpression(exportName, expression);
+                    }
+                    return expression;
+                }
+            }
+            return node;
+        }
+        /**
+         * Gets the additional exports of a name.
+         *
+         * @param name The name.
+         */
+        function getExports(name) {
+            if (!ts.isGeneratedIdentifier(name)) {
+                var valueDeclaration = resolver.getReferencedImportDeclaration(name)
+                    || resolver.getReferencedValueDeclaration(name);
+                if (valueDeclaration) {
+                    return currentModuleInfo
+                        && currentModuleInfo.exportedBindings[ts.getOriginalNodeId(valueDeclaration)];
+                }
+            }
+        }
+    }
+    ts.transformModule = transformModule;
+    // emit output for the __export helper function
+    var exportStarHelper = {
+        name: "typescript:export-star",
+        scoped: true,
+        text: "\n            function __export(m) {\n                for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];\n            }"
+    };
+    function createExportStarHelper(context, module) {
+        var compilerOptions = context.getCompilerOptions();
+        return compilerOptions.importHelpers
+            ? ts.createCall(ts.getHelperName("__exportStar"), /*typeArguments*/ undefined, [module, ts.createIdentifier("exports")])
+            : ts.createCall(ts.createIdentifier("__export"), /*typeArguments*/ undefined, [module]);
+    }
+    // emit helper for dynamic import
+    var dynamicImportUMDHelper = {
+        name: "typescript:dynamicimport-sync-require",
+        scoped: true,
+        text: "\n            var __syncRequire = typeof module === \"object\" && typeof module.exports === \"object\";"
+    };
+    // emit helper for `import * as Name from "foo"`
+    var importStarHelper = {
+        name: "typescript:commonjsimportstar",
+        scoped: false,
+        text: "\nvar __importStar = (this && this.__importStar) || function (mod) {\n    if (mod && mod.__esModule) return mod;\n    var result = {};\n    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];\n    result[\"default\"] = mod;\n    return result;\n};"
+    };
+    // emit helper for `import Name from "foo"`
+    var importDefaultHelper = {
+        name: "typescript:commonjsimportdefault",
+        scoped: false,
+        text: "\nvar __importDefault = (this && this.__importDefault) || function (mod) {\n    return (mod && mod.__esModule) ? mod : { \"default\": mod };\n};"
+    };
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
+(function (ts) {
+    function transformSystemModule(context) {
+        var startLexicalEnvironment = context.startLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
+        var compilerOptions = context.getCompilerOptions();
+        var resolver = context.getEmitResolver();
+        var host = context.getEmitHost();
+        var previousOnSubstituteNode = context.onSubstituteNode;
+        var previousOnEmitNode = context.onEmitNode;
+        context.onSubstituteNode = onSubstituteNode;
+        context.onEmitNode = onEmitNode;
+        context.enableSubstitution(72 /* Identifier */); // Substitutes expression identifiers for imported symbols.
+        context.enableSubstitution(276 /* ShorthandPropertyAssignment */); // Substitutes expression identifiers for imported symbols
+        context.enableSubstitution(204 /* BinaryExpression */); // Substitutes assignments to exported symbols.
+        context.enableSubstitution(202 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(203 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableEmitNotification(279 /* SourceFile */); // Restore state when substituting nodes in a file.
+        var moduleInfoMap = []; // The ExternalModuleInfo for each file.
+        var deferredExports = []; // Exports to defer until an EndOfDeclarationMarker is found.
+        var exportFunctionsMap = []; // The export function associated with a source file.
+        var noSubstitutionMap = []; // Set of nodes for which substitution rules should be ignored for each file.
+        var currentSourceFile; // The current file.
+        var moduleInfo; // ExternalModuleInfo for the current file.
+        var exportFunction; // The export function for the current file.
+        var contextObject; // The context object for the current file.
+        var hoistedStatements;
+        var enclosingBlockScopedContainer;
+        var noSubstitution; // Set of nodes for which substitution rules should be ignored.
+        return ts.chainBundle(transformSourceFile);
+        /**
+         * Transforms the module aspects of a SourceFile.
+         *
+         * @param node The SourceFile node.
+         */
+        function transformSourceFile(node) {
+            if (node.isDeclarationFile || !(ts.isEffectiveExternalModule(node, compilerOptions) || node.transformFlags & 16777216 /* ContainsDynamicImport */)) {
+                return node;
+            }
+            var id = ts.getOriginalNodeId(node);
+            currentSourceFile = node;
+            enclosingBlockScopedContainer = node;
+            // System modules have the following shape:
+            //
+            //     System.register(['dep-1', ... 'dep-n'], function(exports) {/* module body function */})
+            //
+            // The parameter 'exports' here is a callback '<T>(name: string, value: T) => T' that
+            // is used to publish exported values. 'exports' returns its 'value' argument so in
+            // most cases expressions that mutate exported values can be rewritten as:
+            //
+            //     expr -> exports('name', expr)
+            //
+            // The only exception in this rule is postfix unary operators,
+            // see comment to 'substitutePostfixUnaryExpression' for more details
+            // Collect information about the external module and dependency groups.
+            moduleInfo = moduleInfoMap[id] = ts.collectExternalModuleInfo(node, resolver, compilerOptions);
+            // Make sure that the name of the 'exports' function does not conflict with
+            // existing identifiers.
+            exportFunction = ts.createUniqueName("exports");
+            exportFunctionsMap[id] = exportFunction;
+            contextObject = ts.createUniqueName("context");
+            // Add the body of the module.
+            var dependencyGroups = collectDependencyGroups(moduleInfo.externalImports);
+            var moduleBodyBlock = createSystemModuleBody(node, dependencyGroups);
+            var moduleBodyFunction = ts.createFunctionExpression(
+            /*modifiers*/ undefined, 
+            /*asteriskToken*/ undefined, 
+            /*name*/ undefined, 
+            /*typeParameters*/ undefined, [
+                ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, exportFunction),
+                ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, contextObject)
+            ], 
+            /*type*/ undefined, moduleBodyBlock);
+            // Write the call to `System.register`
+            // Clear the emit-helpers flag for later passes since we'll have already used it in the module body
+            // So the helper will be emit at the correct position instead of at the top of the source-file
+            var moduleName = ts.tryGetModuleNameFromFile(node, host, compilerOptions);
+            var dependencies = ts.createArrayLiteral(ts.map(dependencyGroups, function (dependencyGroup) { return dependencyGroup.name; }));
+            var updated = ts.setEmitFlags(ts.updateSourceFileNode(node, ts.setTextRange(ts.createNodeArray([
+                ts.createExpressionStatement(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("System"), "register"), 
+                /*typeArguments*/ undefined, moduleName
+                    ? [moduleName, dependencies, moduleBodyFunction]
+                    : [dependencies, moduleBodyFunction]))
+            ]), node.statements)), 1024 /* NoTrailingComments */);
+            if (!(compilerOptions.outFile || compilerOptions.out)) {
+                ts.moveEmitHelpers(updated, moduleBodyBlock, function (helper) { return !helper.scoped; });
+            }
+            if (noSubstitution) {
+                noSubstitutionMap[id] = noSubstitution;
+                noSubstitution = undefined;
+            }
+            currentSourceFile = undefined;
+            moduleInfo = undefined;
+            exportFunction = undefined;
+            contextObject = undefined;
+            hoistedStatements = undefined;
+            enclosingBlockScopedContainer = undefined;
+            return ts.aggregateTransformFlags(updated);
+        }
+        /**
+         * Collects the dependency groups for this files imports.
+         *
+         * @param externalImports The imports for the file.
+         */
+        function collectDependencyGroups(externalImports) {
+            var groupIndices = ts.createMap();
+            var dependencyGroups = [];
+            for (var _i = 0, externalImports_1 = externalImports; _i < externalImports_1.length; _i++) {
+                var externalImport = externalImports_1[_i];
+                var externalModuleName = ts.getExternalModuleNameLiteral(externalImport, currentSourceFile, host, resolver, compilerOptions);
+                if (externalModuleName) {
+                    var text = externalModuleName.text;
+                    var groupIndex = groupIndices.get(text);
+                    if (groupIndex !== undefined) {
+                        // deduplicate/group entries in dependency list by the dependency name
+                        dependencyGroups[groupIndex].externalImports.push(externalImport);
+                    }
+                    else {
+                        groupIndices.set(text, dependencyGroups.length);
+                        dependencyGroups.push({
+                            name: externalModuleName,
+                            externalImports: [externalImport]
+                        });
+                    }
+                }
+            }
+            return dependencyGroups;
+        }
+        /**
+         * Adds the statements for the module body function for the source file.
+         *
+         * @param node The source file for the module.
+         * @param dependencyGroups The grouped dependencies of the module.
+         */
+        function createSystemModuleBody(node, dependencyGroups) {
+            // Shape of the body in system modules:
+            //
+            //  function (exports) {
+            //      <list of local aliases for imports>
+            //      <hoisted variable declarations>
+            //      <hoisted function declarations>
+            //      return {
+            //          setters: [
+            //              <list of setter function for imports>
+            //          ],
+            //          execute: function() {
+            //              <module statements>
+            //          }
+            //      }
+            //      <temp declarations>
+            //  }
+            //
+            // i.e:
+            //
+            //   import {x} from 'file1'
+            //   var y = 1;
+            //   export function foo() { return y + x(); }
+            //   console.log(y);
+            //
+            // Will be transformed to:
+            //
+            //  function(exports) {
+            //      function foo() { return y + file_1.x(); }
+            //      exports("foo", foo);
+            //      var file_1, y;
+            //      return {
+            //          setters: [
+            //              function(v) { file_1 = v }
+            //          ],
+            //          execute(): function() {
+            //              y = 1;
+            //              console.log(y);
+            //          }
+            //      };
+            //  }
+            var statements = [];
+            // We start a new lexical environment in this function body, but *not* in the
+            // body of the execute function. This allows us to emit temporary declarations
+            // only in the outer module body and not in the inner one.
+            startLexicalEnvironment();
+            // Add any prologue directives.
+            var ensureUseStrict = ts.getStrictOptionValue(compilerOptions, "alwaysStrict") || (!compilerOptions.noImplicitUseStrict && ts.isExternalModule(currentSourceFile));
+            var statementOffset = ts.addPrologue(statements, node.statements, ensureUseStrict, sourceElementVisitor);
+            // var __moduleName = context_1 && context_1.id;
+            statements.push(ts.createVariableStatement(
+            /*modifiers*/ undefined, ts.createVariableDeclarationList([
+                ts.createVariableDeclaration("__moduleName", 
+                /*type*/ undefined, ts.createLogicalAnd(contextObject, ts.createPropertyAccess(contextObject, "id")))
+            ])));
+            // Visit the synthetic external helpers import declaration if present
+            ts.visitNode(moduleInfo.externalHelpersImportDeclaration, sourceElementVisitor, ts.isStatement);
+            // Visit the statements of the source file, emitting any transformations into
+            // the `executeStatements` array. We do this *before* we fill the `setters` array
+            // as we both emit transformations as well as aggregate some data used when creating
+            // setters. This allows us to reduce the number of times we need to loop through the
+            // statements of the source file.
+            var executeStatements = ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset);
+            // Emit early exports for function declarations.
+            ts.addRange(statements, hoistedStatements);
+            // We emit hoisted variables early to align roughly with our previous emit output.
+            // Two key differences in this approach are:
+            // - Temporary variables will appear at the top rather than at the bottom of the file
+            ts.addStatementsAfterPrologue(statements, endLexicalEnvironment());
+            var exportStarFunction = addExportStarIfNeeded(statements); // TODO: GH#18217
+            var moduleObject = ts.createObjectLiteral([
+                ts.createPropertyAssignment("setters", createSettersArray(exportStarFunction, dependencyGroups)),
+                ts.createPropertyAssignment("execute", ts.createFunctionExpression(
+                /*modifiers*/ undefined, 
+                /*asteriskToken*/ undefined, 
+                /*name*/ undefined, 
+                /*typeParameters*/ undefined, 
+                /*parameters*/ [], 
+                /*type*/ undefined, ts.createBlock(executeStatements, /*multiLine*/ true)))
+            ]);
+            moduleObject.multiLine = true;
+            statements.push(ts.createReturn(moduleObject));
+            return ts.createBlock(statements, /*multiLine*/ true);
+        }
+        /**
+         * Adds an exportStar function to a statement list if it is needed for the file.
+         *
+         * @param statements A statement list.
+         */
+        function addExportStarIfNeeded(statements) {
+            if (!moduleInfo.hasExportStarsToExportValues) {
+                return;
+            }
+            // when resolving exports local exported entries/indirect exported entries in the module
+            // should always win over entries with similar names that were added via star exports
+            // to support this we store names of local/indirect exported entries in a set.
+            // this set is used to filter names brought by star expors.
+            // local names set should only be added if we have anything exported
+            if (!moduleInfo.exportedNames && moduleInfo.exportSpecifiers.size === 0) {
+                // no exported declarations (export var ...) or export specifiers (export {x})
+                // check if we have any non star export declarations.
+                var hasExportDeclarationWithExportClause = false;
+                for (var _i = 0, _a = moduleInfo.externalImports; _i < _a.length; _i++) {
+                    var externalImport = _a[_i];
+                    if (externalImport.kind === 255 /* ExportDeclaration */ && externalImport.exportClause) {
+                        hasExportDeclarationWithExportClause = true;
+                        break;
+                    }
+                }
+                if (!hasExportDeclarationWithExportClause) {
+                    // we still need to emit exportStar helper
+                    var exportStarFunction_1 = createExportStarFunction(/*localNames*/ undefined);
+                    statements.push(exportStarFunction_1);
+                    return exportStarFunction_1.name;
+                }
+            }
+            var exportedNames = [];
+            if (moduleInfo.exportedNames) {
+                for (var _b = 0, _c = moduleInfo.exportedNames; _b < _c.length; _b++) {
+                    var exportedLocalName = _c[_b];
+                    if (exportedLocalName.escapedText === "default") {
+                        continue;
+                    }
+                    // write name of exported declaration, i.e 'export var x...'
+                    exportedNames.push(ts.createPropertyAssignment(ts.createLiteral(exportedLocalName), ts.createTrue()));
+                }
+            }
+            for (var _d = 0, _e = moduleInfo.externalImports; _d < _e.length; _d++) {
+                var externalImport = _e[_d];
+                if (externalImport.kind !== 255 /* ExportDeclaration */) {
+                    continue;
+                }
+                if (!externalImport.exportClause) {
+                    // export * from ...
+                    continue;
+                }
+                for (var _f = 0, _g = externalImport.exportClause.elements; _f < _g.length; _f++) {
+                    var element = _g[_f];
+                    // write name of indirectly exported entry, i.e. 'export {x} from ...'
+                    exportedNames.push(ts.createPropertyAssignment(ts.createLiteral(ts.idText(element.name || element.propertyName)), ts.createTrue()));
+                }
+            }
+            var exportedNamesStorageRef = ts.createUniqueName("exportedNames");
+            statements.push(ts.createVariableStatement(
+            /*modifiers*/ undefined, ts.createVariableDeclarationList([
+                ts.createVariableDeclaration(exportedNamesStorageRef, 
+                /*type*/ undefined, ts.createObjectLiteral(exportedNames, /*multiline*/ true))
+            ])));
+            var exportStarFunction = createExportStarFunction(exportedNamesStorageRef);
+            statements.push(exportStarFunction);
+            return exportStarFunction.name;
+        }
+        /**
+         * Creates an exportStar function for the file, with an optional set of excluded local
+         * names.
+         *
+         * @param localNames An optional reference to an object containing a set of excluded local
+         * names.
+         */
+        function createExportStarFunction(localNames) {
+            var exportStarFunction = ts.createUniqueName("exportStar");
+            var m = ts.createIdentifier("m");
+            var n = ts.createIdentifier("n");
+            var exports = ts.createIdentifier("exports");
+            var condition = ts.createStrictInequality(n, ts.createLiteral("default"));
+            if (localNames) {
+                condition = ts.createLogicalAnd(condition, ts.createLogicalNot(ts.createCall(ts.createPropertyAccess(localNames, "hasOwnProperty"), 
+                /*typeArguments*/ undefined, [n])));
+            }
+            return ts.createFunctionDeclaration(
+            /*decorators*/ undefined, 
+            /*modifiers*/ undefined, 
+            /*asteriskToken*/ undefined, exportStarFunction, 
+            /*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, m)], 
+            /*type*/ undefined, ts.createBlock([
+                ts.createVariableStatement(
+                /*modifiers*/ undefined, ts.createVariableDeclarationList([
+                    ts.createVariableDeclaration(exports, 
+                    /*type*/ undefined, ts.createObjectLiteral([]))
+                ])),
+                ts.createForIn(ts.createVariableDeclarationList([
+                    ts.createVariableDeclaration(n, /*type*/ undefined)
+                ]), m, ts.createBlock([
+                    ts.setEmitFlags(ts.createIf(condition, ts.createExpressionStatement(ts.createAssignment(ts.createElementAccess(exports, n), ts.createElementAccess(m, n)))), 1 /* SingleLine */)
+                ])),
+                ts.createExpressionStatement(ts.createCall(exportFunction, 
+                /*typeArguments*/ undefined, [exports]))
+            ], /*multiline*/ true));
+        }
+        /**
+         * Creates an array setter callbacks for each dependency group.
+         *
+         * @param exportStarFunction A reference to an exportStarFunction for the file.
+         * @param dependencyGroups An array of grouped dependencies.
+         */
+        function createSettersArray(exportStarFunction, dependencyGroups) {
+            var setters = [];
+            for (var _i = 0, dependencyGroups_1 = dependencyGroups; _i < dependencyGroups_1.length; _i++) {
+                var group_1 = dependencyGroups_1[_i];
+                // derive a unique name for parameter from the first named entry in the group
+                var localName = ts.forEach(group_1.externalImports, function (i) { return ts.getLocalNameForExternalImport(i, currentSourceFile); });
+                var parameterName = localName ? ts.getGeneratedNameForNode(localName) : ts.createUniqueName("");
+                var statements = [];
+                for (var _a = 0, _b = group_1.externalImports; _a < _b.length; _a++) {
+                    var entry = _b[_a];
+                    var importVariableName = ts.getLocalNameForExternalImport(entry, currentSourceFile); // TODO: GH#18217
+                    switch (entry.kind) {
+                        case 249 /* ImportDeclaration */:
+                            if (!entry.importClause) {
+                                // 'import "..."' case
+                                // module is imported only for side-effects, no emit required
+                                break;
+                            }
+                        // falls through
+                        case 248 /* ImportEqualsDeclaration */:
+                            ts.Debug.assert(importVariableName !== undefined);
+                            // save import into the local
+                            statements.push(ts.createExpressionStatement(ts.createAssignment(importVariableName, parameterName)));
+                            break;
+                        case 255 /* ExportDeclaration */:
+                            ts.Debug.assert(importVariableName !== undefined);
+                            if (entry.exportClause) {
+                                //  export {a, b as c} from 'foo'
+                                //
+                                // emit as:
+                                //
+                                //  exports_({
+                                //     "a": _["a"],
+                                //     "c": _["b"]
+                                //  });
+                                var properties = [];
+                                for (var _c = 0, _d = entry.exportClause.elements; _c < _d.length; _c++) {
+                                    var e = _d[_c];
+                                    properties.push(ts.createPropertyAssignment(ts.createLiteral(ts.idText(e.name)), ts.createElementAccess(parameterName, ts.createLiteral(ts.idText(e.propertyName || e.name)))));
+                                }
+                                statements.push(ts.createExpressionStatement(ts.createCall(exportFunction, 
+                                /*typeArguments*/ undefined, [ts.createObjectLiteral(properties, /*multiline*/ true)])));
+                            }
+                            else {
+                                //  export * from 'foo'
+                                //
+                                // emit as:
+                                //
+                                //  exportStar(foo_1_1);
+                                statements.push(ts.createExpressionStatement(ts.createCall(exportStarFunction, 
+                                /*typeArguments*/ undefined, [parameterName])));
+                            }
+                            break;
+                    }
+                }
+                setters.push(ts.createFunctionExpression(
+                /*modifiers*/ undefined, 
+                /*asteriskToken*/ undefined, 
+                /*name*/ undefined, 
+                /*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, parameterName)], 
+                /*type*/ undefined, ts.createBlock(statements, /*multiLine*/ true)));
+            }
+            return ts.createArrayLiteral(setters, /*multiLine*/ true);
+        }
+        //
+        // Top-level Source Element Visitors
+        //
+        /**
+         * Visit source elements at the top-level of a module.
+         *
+         * @param node The node to visit.
+         */
+        function sourceElementVisitor(node) {
+            switch (node.kind) {
+                case 249 /* ImportDeclaration */:
+                    return visitImportDeclaration(node);
+                case 248 /* ImportEqualsDeclaration */:
+                    return visitImportEqualsDeclaration(node);
+                case 255 /* ExportDeclaration */:
+                    // ExportDeclarations are elided as they are handled via
+                    // `appendExportsOfDeclaration`.
+                    return undefined;
+                case 254 /* ExportAssignment */:
+                    return visitExportAssignment(node);
+                default:
+                    return nestedElementVisitor(node);
+            }
+        }
+        /**
+         * Visits an ImportDeclaration node.
+         *
+         * @param node The node to visit.
+         */
+        function visitImportDeclaration(node) {
+            var statements;
+            if (node.importClause) {
+                hoistVariableDeclaration(ts.getLocalNameForExternalImport(node, currentSourceFile)); // TODO: GH#18217
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfImportDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfImportDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Visits an ImportEqualsDeclaration node.
+         *
+         * @param node The node to visit.
+         */
+        function visitImportEqualsDeclaration(node) {
+            ts.Debug.assert(ts.isExternalModuleImportEqualsDeclaration(node), "import= for internal module references should be handled in an earlier transformer.");
+            var statements;
+            hoistVariableDeclaration(ts.getLocalNameForExternalImport(node, currentSourceFile)); // TODO: GH#18217
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfImportEqualsDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfImportEqualsDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Visits an ExportAssignment node.
+         *
+         * @param node The node to visit.
+         */
+        function visitExportAssignment(node) {
+            if (node.isExportEquals) {
+                // Elide `export=` as it is illegal in a SystemJS module.
+                return undefined;
+            }
+            var expression = ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression);
+            var original = node.original;
+            if (original && hasAssociatedEndOfDeclarationMarker(original)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportStatement(deferredExports[id], ts.createIdentifier("default"), expression, /*allowComments*/ true);
+            }
+            else {
+                return createExportStatement(ts.createIdentifier("default"), expression, /*allowComments*/ true);
+            }
+        }
+        /**
+         * Visits a FunctionDeclaration, hoisting it to the outer module body function.
+         *
+         * @param node The node to visit.
+         */
+        function visitFunctionDeclaration(node) {
+            if (ts.hasModifier(node, 1 /* Export */)) {
+                hoistedStatements = ts.append(hoistedStatements, ts.updateFunctionDeclaration(node, node.decorators, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), node.asteriskToken, ts.getDeclarationName(node, /*allowComments*/ true, /*allowSourceMaps*/ true), 
+                /*typeParameters*/ undefined, ts.visitNodes(node.parameters, destructuringAndImportCallVisitor, ts.isParameterDeclaration), 
+                /*type*/ undefined, ts.visitNode(node.body, destructuringAndImportCallVisitor, ts.isBlock)));
+            }
+            else {
+                hoistedStatements = ts.append(hoistedStatements, ts.visitEachChild(node, destructuringAndImportCallVisitor, context));
+            }
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfHoistedDeclaration(deferredExports[id], node);
+            }
+            else {
+                hoistedStatements = appendExportsOfHoistedDeclaration(hoistedStatements, node);
+            }
+            return undefined;
+        }
+        /**
+         * Visits a ClassDeclaration, hoisting its name to the outer module body function.
+         *
+         * @param node The node to visit.
+         */
+        function visitClassDeclaration(node) {
+            var statements;
+            // Hoist the name of the class declaration to the outer module body function.
+            var name = ts.getLocalName(node);
+            hoistVariableDeclaration(name);
+            // Rewrite the class declaration into an assignment of a class expression.
+            statements = ts.append(statements, ts.setTextRange(ts.createExpressionStatement(ts.createAssignment(name, ts.setTextRange(ts.createClassExpression(
+            /*modifiers*/ undefined, node.name, 
+            /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, destructuringAndImportCallVisitor, ts.isHeritageClause), ts.visitNodes(node.members, destructuringAndImportCallVisitor, ts.isClassElement)), node))), node));
+            if (hasAssociatedEndOfDeclarationMarker(node)) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfHoistedDeclaration(deferredExports[id], node);
+            }
+            else {
+                statements = appendExportsOfHoistedDeclaration(statements, node);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Visits a variable statement, hoisting declared names to the top-level module body.
+         * Each declaration is rewritten into an assignment expression.
+         *
+         * @param node The node to visit.
+         */
+        function visitVariableStatement(node) {
+            if (!shouldHoistVariableDeclarationList(node.declarationList)) {
+                return ts.visitNode(node, destructuringAndImportCallVisitor, ts.isStatement);
+            }
+            var expressions;
+            var isExportedDeclaration = ts.hasModifier(node, 1 /* Export */);
+            var isMarkedDeclaration = hasAssociatedEndOfDeclarationMarker(node);
+            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                var variable = _a[_i];
+                if (variable.initializer) {
+                    expressions = ts.append(expressions, transformInitializedVariable(variable, isExportedDeclaration && !isMarkedDeclaration));
+                }
+                else {
+                    hoistBindingElement(variable);
+                }
+            }
+            var statements;
+            if (expressions) {
+                statements = ts.append(statements, ts.setTextRange(ts.createExpressionStatement(ts.inlineExpressions(expressions)), node));
+            }
+            if (isMarkedDeclaration) {
+                // Defer exports until we encounter an EndOfDeclarationMarker node
+                var id = ts.getOriginalNodeId(node);
+                deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node, isExportedDeclaration);
+            }
+            else {
+                statements = appendExportsOfVariableStatement(statements, node, /*exportSelf*/ false);
+            }
+            return ts.singleOrMany(statements);
+        }
+        /**
+         * Hoists the declared names of a VariableDeclaration or BindingElement.
+         *
+         * @param node The declaration to hoist.
+         */
+        function hoistBindingElement(node) {
+            if (ts.isBindingPattern(node.name)) {
+                for (var _i = 0, _a = node.name.elements; _i < _a.length; _i++) {
+                    var element = _a[_i];
+                    if (!ts.isOmittedExpression(element)) {
+                        hoistBindingElement(element);
+                    }
+                }
+            }
+            else {
+                hoistVariableDeclaration(ts.getSynthesizedClone(node.name));
+            }
+        }
+        /**
+         * Determines whether a VariableDeclarationList should be hoisted.
+         *
+         * @param node The node to test.
+         */
+        function shouldHoistVariableDeclarationList(node) {
+            // hoist only non-block scoped declarations or block scoped declarations parented by source file
+            return (ts.getEmitFlags(node) & 2097152 /* NoHoisting */) === 0
+                && (enclosingBlockScopedContainer.kind === 279 /* SourceFile */
+                    || (ts.getOriginalNode(node).flags & 3 /* BlockScoped */) === 0);
+        }
+        /**
+         * Transform an initialized variable declaration into an expression.
+         *
+         * @param node The node to transform.
+         * @param isExportedDeclaration A value indicating whether the variable is exported.
+         */
+        function transformInitializedVariable(node, isExportedDeclaration) {
+            var createAssignment = isExportedDeclaration ? createExportedVariableAssignment : createNonExportedVariableAssignment;
+            return ts.isBindingPattern(node.name)
+                ? ts.flattenDestructuringAssignment(node, destructuringAndImportCallVisitor, context, 0 /* All */, 
+                /*needsValue*/ false, createAssignment)
+                : node.initializer ? createAssignment(node.name, ts.visitNode(node.initializer, destructuringAndImportCallVisitor, ts.isExpression)) : node.name;
+        }
+        /**
+         * Creates an assignment expression for an exported variable declaration.
+         *
+         * @param name The name of the variable.
+         * @param value The value of the variable's initializer.
+         * @param location The source map location for the assignment.
+         */
+        function createExportedVariableAssignment(name, value, location) {
+            return createVariableAssignment(name, value, location, /*isExportedDeclaration*/ true);
+        }
+        /**
+         * Creates an assignment expression for a non-exported variable declaration.
+         *
+         * @param name The name of the variable.
+         * @param value The value of the variable's initializer.
+         * @param location The source map location for the assignment.
+         */
+        function createNonExportedVariableAssignment(name, value, location) {
+            return createVariableAssignment(name, value, location, /*isExportedDeclaration*/ false);
+        }
+        /**
+         * Creates an assignment expression for a variable declaration.
+         *
+         * @param name The name of the variable.
+         * @param value The value of the variable's initializer.
+         * @param location The source map location for the assignment.
+         * @param isExportedDeclaration A value indicating whether the variable is exported.
+         */
+        function createVariableAssignment(name, value, location, isExportedDeclaration) {
+            hoistVariableDeclaration(ts.getSynthesizedClone(name));
+            return isExportedDeclaration
+                ? createExportExpression(name, preventSubstitution(ts.setTextRange(ts.createAssignment(name, value), location)))
+                : preventSubstitution(ts.setTextRange(ts.createAssignment(name, value), location));
+        }
+        /**
+         * Visits a MergeDeclarationMarker used as a placeholder for the beginning of a merged
+         * and transformed declaration.
+         *
+         * @param node The node to visit.
+         */
+        function visitMergeDeclarationMarker(node) {
+            // For an EnumDeclaration or ModuleDeclaration that merges with a preceeding
+            // declaration we do not emit a leading variable declaration. To preserve the
+            // begin/end semantics of the declararation and to properly handle exports
+            // we wrapped the leading variable declaration in a `MergeDeclarationMarker`.
+            //
+            // To balance the declaration, we defer the exports of the elided variable
+            // statement until we visit this declaration's `EndOfDeclarationMarker`.
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 219 /* VariableStatement */) {
+                var id = ts.getOriginalNodeId(node);
+                var isExportedDeclaration = ts.hasModifier(node.original, 1 /* Export */);
+                deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original, isExportedDeclaration);
+            }
+            return node;
+        }
+        /**
+         * Determines whether a node has an associated EndOfDeclarationMarker.
+         *
+         * @param node The node to test.
+         */
+        function hasAssociatedEndOfDeclarationMarker(node) {
+            return (ts.getEmitFlags(node) & 4194304 /* HasEndOfDeclarationMarker */) !== 0;
+        }
+        /**
+         * Visits a DeclarationMarker used as a placeholder for the end of a transformed
+         * declaration.
+         *
+         * @param node The node to visit.
+         */
+        function visitEndOfDeclarationMarker(node) {
+            // For some transformations we emit an `EndOfDeclarationMarker` to mark the actual
+            // end of the transformed declaration. We use this marker to emit any deferred exports
+            // of the declaration.
+            var id = ts.getOriginalNodeId(node);
+            var statements = deferredExports[id];
+            if (statements) {
+                delete deferredExports[id];
+                return ts.append(statements, node);
+            }
+            else {
+                var original = ts.getOriginalNode(node);
+                if (ts.isModuleOrEnumDeclaration(original)) {
+                    return ts.append(appendExportsOfDeclaration(statements, original), node);
+                }
+            }
+            return node;
+        }
+        /**
+         * Appends the exports of an ImportDeclaration to a statement list, returning the
+         * statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration whose exports are to be recorded.
+         */
+        function appendExportsOfImportDeclaration(statements, decl) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            var importClause = decl.importClause;
+            if (!importClause) {
+                return statements;
+            }
+            if (importClause.name) {
+                statements = appendExportsOfDeclaration(statements, importClause);
+            }
+            var namedBindings = importClause.namedBindings;
+            if (namedBindings) {
+                switch (namedBindings.kind) {
+                    case 251 /* NamespaceImport */:
+                        statements = appendExportsOfDeclaration(statements, namedBindings);
+                        break;
+                    case 252 /* NamedImports */:
+                        for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
+                            var importBinding = _a[_i];
+                            statements = appendExportsOfDeclaration(statements, importBinding);
+                        }
+                        break;
+                }
+            }
+            return statements;
+        }
+        /**
+         * Appends the export of an ImportEqualsDeclaration to a statement list, returning the
+         * statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration whose exports are to be recorded.
+         */
+        function appendExportsOfImportEqualsDeclaration(statements, decl) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            return appendExportsOfDeclaration(statements, decl);
+        }
+        /**
+         * Appends the exports of a VariableStatement to a statement list, returning the statement
+         * list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param node The VariableStatement whose exports are to be recorded.
+         * @param exportSelf A value indicating whether to also export each VariableDeclaration of
+         * `nodes` declaration list.
+         */
+        function appendExportsOfVariableStatement(statements, node, exportSelf) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                var decl = _a[_i];
+                if (decl.initializer || exportSelf) {
+                    statements = appendExportsOfBindingElement(statements, decl, exportSelf);
+                }
+            }
+            return statements;
+        }
+        /**
+         * Appends the exports of a VariableDeclaration or BindingElement to a statement list,
+         * returning the statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration whose exports are to be recorded.
+         * @param exportSelf A value indicating whether to also export the declaration itself.
+         */
+        function appendExportsOfBindingElement(statements, decl, exportSelf) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            if (ts.isBindingPattern(decl.name)) {
+                for (var _i = 0, _a = decl.name.elements; _i < _a.length; _i++) {
+                    var element = _a[_i];
+                    if (!ts.isOmittedExpression(element)) {
+                        statements = appendExportsOfBindingElement(statements, element, exportSelf);
+                    }
+                }
+            }
+            else if (!ts.isGeneratedIdentifier(decl.name)) {
+                var excludeName = void 0;
+                if (exportSelf) {
+                    statements = appendExportStatement(statements, decl.name, ts.getLocalName(decl));
+                    excludeName = ts.idText(decl.name);
+                }
+                statements = appendExportsOfDeclaration(statements, decl, excludeName);
+            }
+            return statements;
+        }
+        /**
+         * Appends the exports of a ClassDeclaration or FunctionDeclaration to a statement list,
+         * returning the statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration whose exports are to be recorded.
+         */
+        function appendExportsOfHoistedDeclaration(statements, decl) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            var excludeName;
+            if (ts.hasModifier(decl, 1 /* Export */)) {
+                var exportName = ts.hasModifier(decl, 512 /* Default */) ? ts.createLiteral("default") : decl.name;
+                statements = appendExportStatement(statements, exportName, ts.getLocalName(decl));
+                excludeName = ts.getTextOfIdentifierOrLiteral(exportName);
+            }
+            if (decl.name) {
+                statements = appendExportsOfDeclaration(statements, decl, excludeName);
+            }
+            return statements;
+        }
+        /**
+         * Appends the exports of a declaration to a statement list, returning the statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param decl The declaration to export.
+         * @param excludeName An optional name to exclude from exports.
+         */
+        function appendExportsOfDeclaration(statements, decl, excludeName) {
+            if (moduleInfo.exportEquals) {
+                return statements;
+            }
+            var name = ts.getDeclarationName(decl);
+            var exportSpecifiers = moduleInfo.exportSpecifiers.get(ts.idText(name));
+            if (exportSpecifiers) {
+                for (var _i = 0, exportSpecifiers_2 = exportSpecifiers; _i < exportSpecifiers_2.length; _i++) {
+                    var exportSpecifier = exportSpecifiers_2[_i];
+                    if (exportSpecifier.name.escapedText !== excludeName) {
+                        statements = appendExportStatement(statements, exportSpecifier.name, name);
+                    }
+                }
+            }
+            return statements;
+        }
+        /**
+         * Appends the down-level representation of an export to a statement list, returning the
+         * statement list.
+         *
+         * @param statements A statement list to which the down-level export statements are to be
+         * appended. If `statements` is `undefined`, a new array is allocated if statements are
+         * appended.
+         * @param exportName The name of the export.
+         * @param expression The expression to export.
+         * @param allowComments Whether to allow comments on the export.
+         */
+        function appendExportStatement(statements, exportName, expression, allowComments) {
+            statements = ts.append(statements, createExportStatement(exportName, expression, allowComments));
+            return statements;
+        }
+        /**
+         * Creates a call to the current file's export function to export a value.
+         *
+         * @param name The bound name of the export.
+         * @param value The exported value.
+         * @param allowComments An optional value indicating whether to emit comments for the statement.
+         */
+        function createExportStatement(name, value, allowComments) {
+            var statement = ts.createExpressionStatement(createExportExpression(name, value));
+            ts.startOnNewLine(statement);
+            if (!allowComments) {
+                ts.setEmitFlags(statement, 1536 /* NoComments */);
+            }
+            return statement;
+        }
+        /**
+         * Creates a call to the current file's export function to export a value.
+         *
+         * @param name The bound name of the export.
+         * @param value The exported value.
+         */
+        function createExportExpression(name, value) {
+            var exportName = ts.isIdentifier(name) ? ts.createLiteral(name) : name;
+            ts.setEmitFlags(value, ts.getEmitFlags(value) | 1536 /* NoComments */);
+            return ts.setCommentRange(ts.createCall(exportFunction, /*typeArguments*/ undefined, [exportName, value]), value);
+        }
+        //
+        // Top-Level or Nested Source Element Visitors
+        //
+        /**
+         * Visit nested elements at the top-level of a module.
+         *
+         * @param node The node to visit.
+         */
+        function nestedElementVisitor(node) {
+            switch (node.kind) {
+                case 219 /* VariableStatement */:
+                    return visitVariableStatement(node);
+                case 239 /* FunctionDeclaration */:
+                    return visitFunctionDeclaration(node);
+                case 240 /* ClassDeclaration */:
+                    return visitClassDeclaration(node);
+                case 225 /* ForStatement */:
+                    return visitForStatement(node);
+                case 226 /* ForInStatement */:
+                    return visitForInStatement(node);
+                case 227 /* ForOfStatement */:
+                    return visitForOfStatement(node);
+                case 223 /* DoStatement */:
+                    return visitDoStatement(node);
+                case 224 /* WhileStatement */:
+                    return visitWhileStatement(node);
+                case 233 /* LabeledStatement */:
+                    return visitLabeledStatement(node);
+                case 231 /* WithStatement */:
+                    return visitWithStatement(node);
+                case 232 /* SwitchStatement */:
+                    return visitSwitchStatement(node);
+                case 246 /* CaseBlock */:
+                    return visitCaseBlock(node);
+                case 271 /* CaseClause */:
+                    return visitCaseClause(node);
+                case 272 /* DefaultClause */:
+                    return visitDefaultClause(node);
+                case 235 /* TryStatement */:
+                    return visitTryStatement(node);
+                case 274 /* CatchClause */:
+                    return visitCatchClause(node);
+                case 218 /* Block */:
+                    return visitBlock(node);
+                case 310 /* MergeDeclarationMarker */:
+                    return visitMergeDeclarationMarker(node);
+                case 311 /* EndOfDeclarationMarker */:
+                    return visitEndOfDeclarationMarker(node);
+                default:
+                    return destructuringAndImportCallVisitor(node);
+            }
+        }
+        /**
+         * Visits the body of a ForStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitForStatement(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateFor(node, node.initializer && visitForInitializer(node.initializer), ts.visitNode(node.condition, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.incrementor, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        /**
+         * Visits the body of a ForInStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitForInStatement(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateForIn(node, visitForInitializer(node.initializer), ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, ts.liftToBlock));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        /**
+         * Visits the body of a ForOfStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitForOfStatement(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateForOf(node, node.awaitModifier, visitForInitializer(node.initializer), ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, ts.liftToBlock));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        /**
+         * Determines whether to hoist the initializer of a ForStatement, ForInStatement, or
+         * ForOfStatement.
+         *
+         * @param node The node to test.
+         */
+        function shouldHoistForInitializer(node) {
+            return ts.isVariableDeclarationList(node)
+                && shouldHoistVariableDeclarationList(node);
+        }
+        /**
+         * Visits the initializer of a ForStatement, ForInStatement, or ForOfStatement
+         *
+         * @param node The node to visit.
+         */
+        function visitForInitializer(node) {
+            if (shouldHoistForInitializer(node)) {
+                var expressions = void 0;
+                for (var _i = 0, _a = node.declarations; _i < _a.length; _i++) {
+                    var variable = _a[_i];
+                    expressions = ts.append(expressions, transformInitializedVariable(variable, /*isExportedDeclaration*/ false));
+                    if (!variable.initializer) {
+                        hoistBindingElement(variable);
+                    }
+                }
+                return expressions ? ts.inlineExpressions(expressions) : ts.createOmittedExpression();
+            }
+            else {
+                return ts.visitEachChild(node, nestedElementVisitor, context);
+            }
+        }
+        /**
+         * Visits the body of a DoStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitDoStatement(node) {
+            return ts.updateDo(node, ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, ts.liftToBlock), ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression));
+        }
+        /**
+         * Visits the body of a WhileStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitWhileStatement(node) {
+            return ts.updateWhile(node, ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, ts.liftToBlock));
+        }
+        /**
+         * Visits the body of a LabeledStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitLabeledStatement(node) {
+            return ts.updateLabel(node, node.label, ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, ts.liftToBlock));
+        }
+        /**
+         * Visits the body of a WithStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitWithStatement(node) {
+            return ts.updateWith(node, ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, ts.liftToBlock));
+        }
+        /**
+         * Visits the body of a SwitchStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitSwitchStatement(node) {
+            return ts.updateSwitch(node, ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.caseBlock, nestedElementVisitor, ts.isCaseBlock));
+        }
+        /**
+         * Visits the body of a CaseBlock to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitCaseBlock(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateCaseBlock(node, ts.visitNodes(node.clauses, nestedElementVisitor, ts.isCaseOrDefaultClause));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        /**
+         * Visits the body of a CaseClause to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitCaseClause(node) {
+            return ts.updateCaseClause(node, ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNodes(node.statements, nestedElementVisitor, ts.isStatement));
+        }
+        /**
+         * Visits the body of a DefaultClause to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitDefaultClause(node) {
+            return ts.visitEachChild(node, nestedElementVisitor, context);
+        }
+        /**
+         * Visits the body of a TryStatement to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitTryStatement(node) {
+            return ts.visitEachChild(node, nestedElementVisitor, context);
+        }
+        /**
+         * Visits the body of a CatchClause to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitCatchClause(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.updateCatchClause(node, node.variableDeclaration, ts.visitNode(node.block, nestedElementVisitor, ts.isBlock));
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        /**
+         * Visits the body of a Block to hoist declarations.
+         *
+         * @param node The node to visit.
+         */
+        function visitBlock(node) {
+            var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
+            enclosingBlockScopedContainer = node;
+            node = ts.visitEachChild(node, nestedElementVisitor, context);
+            enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
+            return node;
+        }
+        //
+        // Destructuring Assignment Visitors
+        //
+        /**
+         * Visit nodes to flatten destructuring assignments to exported symbols.
+         *
+         * @param node The node to visit.
+         */
+        function destructuringAndImportCallVisitor(node) {
+            if (node.transformFlags & 1024 /* DestructuringAssignment */
+                && node.kind === 204 /* BinaryExpression */) {
+                return visitDestructuringAssignment(node);
+            }
+            else if (ts.isImportCall(node)) {
+                return visitImportCallExpression(node);
+            }
+            else if ((node.transformFlags & 2048 /* ContainsDestructuringAssignment */) || (node.transformFlags & 16777216 /* ContainsDynamicImport */)) {
+                return ts.visitEachChild(node, destructuringAndImportCallVisitor, context);
+            }
+            else {
+                return node;
+            }
+        }
+        function visitImportCallExpression(node) {
+            // import("./blah")
+            // emit as
+            // System.register([], function (_export, _context) {
+            //     return {
+            //         setters: [],
+            //         execute: () => {
+            //             _context.import('./blah');
+            //         }
+            //     };
+            // });
+            return ts.createCall(ts.createPropertyAccess(contextObject, ts.createIdentifier("import")), 
+            /*typeArguments*/ undefined, ts.some(node.arguments) ? [ts.visitNode(node.arguments[0], destructuringAndImportCallVisitor)] : []);
+        }
+        /**
+         * Visits a DestructuringAssignment to flatten destructuring to exported symbols.
+         *
+         * @param node The node to visit.
+         */
+        function visitDestructuringAssignment(node) {
+            if (hasExportedReferenceInDestructuringTarget(node.left)) {
+                return ts.flattenDestructuringAssignment(node, destructuringAndImportCallVisitor, context, 0 /* All */, 
+                /*needsValue*/ true);
+            }
+            return ts.visitEachChild(node, destructuringAndImportCallVisitor, context);
+        }
+        /**
+         * Determines whether the target of a destructuring assigment refers to an exported symbol.
+         *
+         * @param node The destructuring target.
+         */
+        function hasExportedReferenceInDestructuringTarget(node) {
+            if (ts.isAssignmentExpression(node, /*excludeCompoundAssignment*/ true)) {
+                return hasExportedReferenceInDestructuringTarget(node.left);
+            }
+            else if (ts.isSpreadElement(node)) {
+                return hasExportedReferenceInDestructuringTarget(node.expression);
+            }
+            else if (ts.isObjectLiteralExpression(node)) {
+                return ts.some(node.properties, hasExportedReferenceInDestructuringTarget);
+            }
+            else if (ts.isArrayLiteralExpression(node)) {
+                return ts.some(node.elements, hasExportedReferenceInDestructuringTarget);
+            }
+            else if (ts.isShorthandPropertyAssignment(node)) {
+                return hasExportedReferenceInDestructuringTarget(node.name);
+            }
+            else if (ts.isPropertyAssignment(node)) {
+                return hasExportedReferenceInDestructuringTarget(node.initializer);
+            }
+            else if (ts.isIdentifier(node)) {
+                var container = resolver.getReferencedExportContainer(node);
+                return container !== undefined && container.kind === 279 /* SourceFile */;
+            }
+            else {
+                return false;
+            }
+        }
+        //
+        // Modifier Visitors
+        //
+        /**
+         * Visit nodes to elide module-specific modifiers.
+         *
+         * @param node The node to visit.
+         */
+        function modifierVisitor(node) {
+            switch (node.kind) {
+                case 85 /* ExportKeyword */:
+                case 80 /* DefaultKeyword */:
+                    return undefined;
+            }
+            return node;
+        }
+        //
+        // Emit Notification
+        //
+        /**
+         * Hook for node emit notifications.
+         *
+         * @param hint A hint as to the intended usage of the node.
+         * @param node The node to emit.
+         * @param emitCallback A callback used to emit the node in the printer.
+         */
+        function onEmitNode(hint, node, emitCallback) {
+            if (node.kind === 279 /* SourceFile */) {
+                var id = ts.getOriginalNodeId(node);
+                currentSourceFile = node;
+                moduleInfo = moduleInfoMap[id];
+                exportFunction = exportFunctionsMap[id];
+                noSubstitution = noSubstitutionMap[id];
+                if (noSubstitution) {
+                    delete noSubstitutionMap[id];
+                }
+                previousOnEmitNode(hint, node, emitCallback);
+                currentSourceFile = undefined;
+                moduleInfo = undefined;
+                exportFunction = undefined;
+                noSubstitution = undefined;
+            }
+            else {
+                previousOnEmitNode(hint, node, emitCallback);
+            }
+        }
+        //
+        // Substitutions
+        //
+        /**
+         * Hooks node substitutions.
+         *
+         * @param hint A hint as to the intended usage of the node.
+         * @param node The node to substitute.
+         */
+        function onSubstituteNode(hint, node) {
+            node = previousOnSubstituteNode(hint, node);
+            if (isSubstitutionPrevented(node)) {
+                return node;
+            }
+            if (hint === 1 /* Expression */) {
+                return substituteExpression(node);
+            }
+            else if (hint === 4 /* Unspecified */) {
+                return substituteUnspecified(node);
+            }
+            return node;
+        }
+        /**
+         * Substitute the node, if necessary.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteUnspecified(node) {
+            switch (node.kind) {
+                case 276 /* ShorthandPropertyAssignment */:
+                    return substituteShorthandPropertyAssignment(node);
+            }
+            return node;
+        }
+        /**
+         * Substitution for a ShorthandPropertyAssignment whose name that may contain an imported or exported symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteShorthandPropertyAssignment(node) {
+            var name = node.name;
+            if (!ts.isGeneratedIdentifier(name) && !ts.isLocalName(name)) {
+                var importDeclaration = resolver.getReferencedImportDeclaration(name);
+                if (importDeclaration) {
+                    if (ts.isImportClause(importDeclaration)) {
+                        return ts.setTextRange(ts.createPropertyAssignment(ts.getSynthesizedClone(name), ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent), ts.createIdentifier("default"))), 
+                        /*location*/ node);
+                    }
+                    else if (ts.isImportSpecifier(importDeclaration)) {
+                        return ts.setTextRange(ts.createPropertyAssignment(ts.getSynthesizedClone(name), ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent.parent.parent), ts.getSynthesizedClone(importDeclaration.propertyName || importDeclaration.name))), 
+                        /*location*/ node);
+                    }
+                }
+            }
+            return node;
+        }
+        /**
+         * Substitute the expression, if necessary.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteExpression(node) {
+            switch (node.kind) {
+                case 72 /* Identifier */:
+                    return substituteExpressionIdentifier(node);
+                case 204 /* BinaryExpression */:
+                    return substituteBinaryExpression(node);
+                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PostfixUnaryExpression */:
+                    return substituteUnaryExpression(node);
+            }
+            return node;
+        }
+        /**
+         * Substitution for an Identifier expression that may contain an imported or exported symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteExpressionIdentifier(node) {
+            if (ts.getEmitFlags(node) & 4096 /* HelperName */) {
+                var externalHelpersModuleName = ts.getExternalHelpersModuleName(currentSourceFile);
+                if (externalHelpersModuleName) {
+                    return ts.createPropertyAccess(externalHelpersModuleName, node);
+                }
+                return node;
+            }
+            // When we see an identifier in an expression position that
+            // points to an imported symbol, we should substitute a qualified
+            // reference to the imported symbol if one is needed.
+            //
+            // - We do not substitute generated identifiers for any reason.
+            // - We do not substitute identifiers tagged with the LocalName flag.
+            if (!ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) {
+                var importDeclaration = resolver.getReferencedImportDeclaration(node);
+                if (importDeclaration) {
+                    if (ts.isImportClause(importDeclaration)) {
+                        return ts.setTextRange(ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent), ts.createIdentifier("default")), 
+                        /*location*/ node);
+                    }
+                    else if (ts.isImportSpecifier(importDeclaration)) {
+                        return ts.setTextRange(ts.createPropertyAccess(ts.getGeneratedNameForNode(importDeclaration.parent.parent.parent), ts.getSynthesizedClone(importDeclaration.propertyName || importDeclaration.name)), 
+                        /*location*/ node);
+                    }
+                }
+            }
+            return node;
+        }
+        /**
+         * Substitution for a BinaryExpression that may contain an imported or exported symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteBinaryExpression(node) {
+            // When we see an assignment expression whose left-hand side is an exported symbol,
+            // we should ensure all exports of that symbol are updated with the correct value.
+            //
+            // - We do not substitute generated identifiers for any reason.
+            // - We do not substitute identifiers tagged with the LocalName flag.
+            // - We do not substitute identifiers that were originally the name of an enum or
+            //   namespace due to how they are transformed in TypeScript.
+            // - We only substitute identifiers that are exported at the top level.
+            if (ts.isAssignmentOperator(node.operatorToken.kind)
+                && ts.isIdentifier(node.left)
+                && !ts.isGeneratedIdentifier(node.left)
+                && !ts.isLocalName(node.left)
+                && !ts.isDeclarationNameOfEnumOrNamespace(node.left)) {
+                var exportedNames = getExports(node.left);
+                if (exportedNames) {
+                    // For each additional export of the declaration, apply an export assignment.
+                    var expression = node;
+                    for (var _i = 0, exportedNames_4 = exportedNames; _i < exportedNames_4.length; _i++) {
+                        var exportName = exportedNames_4[_i];
+                        expression = createExportExpression(exportName, preventSubstitution(expression));
+                    }
+                    return expression;
+                }
+            }
+            return node;
+        }
+        /**
+         * Substitution for a UnaryExpression that may contain an imported or exported symbol.
+         *
+         * @param node The node to substitute.
+         */
+        function substituteUnaryExpression(node) {
+            // When we see a prefix or postfix increment expression whose operand is an exported
+            // symbol, we should ensure all exports of that symbol are updated with the correct
+            // value.
+            //
+            // - We do not substitute generated identifiers for any reason.
+            // - We do not substitute identifiers tagged with the LocalName flag.
+            // - We do not substitute identifiers that were originally the name of an enum or
+            //   namespace due to how they are transformed in TypeScript.
+            // - We only substitute identifiers that are exported at the top level.
+            if ((node.operator === 44 /* PlusPlusToken */ || node.operator === 45 /* MinusMinusToken */)
+                && ts.isIdentifier(node.operand)
+                && !ts.isGeneratedIdentifier(node.operand)
+                && !ts.isLocalName(node.operand)
+                && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
+                var exportedNames = getExports(node.operand);
+                if (exportedNames) {
+                    var expression = node.kind === 203 /* PostfixUnaryExpression */
+                        ? ts.setTextRange(ts.createPrefix(node.operator, node.operand), node)
+                        : node;
+                    for (var _i = 0, exportedNames_5 = exportedNames; _i < exportedNames_5.length; _i++) {
+                        var exportName = exportedNames_5[_i];
+                        expression = createExportExpression(exportName, preventSubstitution(expression));
+                    }
+                    if (node.kind === 203 /* PostfixUnaryExpression */) {
+                        expression = node.operator === 44 /* PlusPlusToken */
+                            ? ts.createSubtract(preventSubstitution(expression), ts.createLiteral(1))
+                            : ts.createAdd(preventSubstitution(expression), ts.createLiteral(1));
+                    }
+                    return expression;
+                }
+            }
+            return node;
+        }
+        /**
+         * Gets the exports of a name.
+         *
+         * @param name The name.
+         */
+        function getExports(name) {
+            var exportedNames;
+            if (!ts.isGeneratedIdentifier(name)) {
+                var valueDeclaration = resolver.getReferencedImportDeclaration(name)
+                    || resolver.getReferencedValueDeclaration(name);
+                if (valueDeclaration) {
+                    var exportContainer = resolver.getReferencedExportContainer(name, /*prefixLocals*/ false);
+                    if (exportContainer && exportContainer.kind === 279 /* SourceFile */) {
+                        exportedNames = ts.append(exportedNames, ts.getDeclarationName(valueDeclaration));
+                    }
+                    exportedNames = ts.addRange(exportedNames, moduleInfo && moduleInfo.exportedBindings[ts.getOriginalNodeId(valueDeclaration)]);
+                }
+            }
+            return exportedNames;
+        }
+        /**
+         * Prevent substitution of a node for this transformer.
+         *
+         * @param node The node which should not be substituted.
+         */
+        function preventSubstitution(node) {
+            if (noSubstitution === undefined)
+                noSubstitution = [];
+            noSubstitution[ts.getNodeId(node)] = true;
+            return node;
+        }
+        /**
+         * Determines whether a node should not be substituted.
+         *
+         * @param node The node to test.
+         */
+        function isSubstitutionPrevented(node) {
+            return noSubstitution && node.id && noSubstitution[node.id];
+        }
+    }
+    ts.transformSystemModule = transformSystemModule;
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
+(function (ts) {
+    function transformES2015Module(context) {
+        var compilerOptions = context.getCompilerOptions();
+        var previousOnEmitNode = context.onEmitNode;
+        var previousOnSubstituteNode = context.onSubstituteNode;
+        context.onEmitNode = onEmitNode;
+        context.onSubstituteNode = onSubstituteNode;
+        context.enableEmitNotification(279 /* SourceFile */);
+        context.enableSubstitution(72 /* Identifier */);
+        var currentSourceFile;
+        return ts.chainBundle(transformSourceFile);
+        function transformSourceFile(node) {
+            if (node.isDeclarationFile) {
+                return node;
+            }
+            if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
+                var externalHelpersModuleName = ts.getOrCreateExternalHelpersModuleNameIfNeeded(node, compilerOptions);
+                if (externalHelpersModuleName) {
+                    var statements = [];
+                    var statementOffset = ts.addPrologue(statements, node.statements);
+                    var tslibImport = ts.createImportDeclaration(
+                    /*decorators*/ undefined, 
+                    /*modifiers*/ undefined, ts.createImportClause(/*name*/ undefined, ts.createNamespaceImport(externalHelpersModuleName)), ts.createLiteral(ts.externalHelpersModuleNameText));
+                    ts.addEmitFlags(tslibImport, 67108864 /* NeverApplyImportHelper */);
+                    ts.append(statements, tslibImport);
+                    ts.addRange(statements, ts.visitNodes(node.statements, visitor, ts.isStatement, statementOffset));
+                    return ts.updateSourceFileNode(node, ts.setTextRange(ts.createNodeArray(statements), node.statements));
+                }
+                else {
+                    return ts.visitEachChild(node, visitor, context);
+                }
+            }
+            return node;
+        }
+        function visitor(node) {
+            switch (node.kind) {
+                case 248 /* ImportEqualsDeclaration */:
+                    // Elide `import=` as it is not legal with --module ES6
+                    return undefined;
+                case 254 /* ExportAssignment */:
+                    return visitExportAssignment(node);
+            }
+            return node;
+        }
+        function visitExportAssignment(node) {
+            // Elide `export=` as it is not legal with --module ES6
+            return node.isExportEquals ? undefined : node;
+        }
+        //
+        // Emit Notification
+        //
+        /**
+         * Hook for node emit.
+         *
+         * @param hint A hint as to the intended usage of the node.
+         * @param node The node to emit.
+         * @param emit A callback used to emit the node in the printer.
+         */
+        function onEmitNode(hint, node, emitCallback) {
+            if (ts.isSourceFile(node)) {
+                currentSourceFile = node;
+                previousOnEmitNode(hint, node, emitCallback);
+                currentSourceFile = undefined;
+            }
+            else {
+                previousOnEmitNode(hint, node, emitCallback);
+            }
+        }
+        //
+        // Substitutions
+        //
+        /**
+         * Hooks node substitutions.
+         *
+         * @param hint A hint as to the intended usage of the node.
+         * @param node The node to substitute.
+         */
+        function onSubstituteNode(hint, node) {
+            node = previousOnSubstituteNode(hint, node);
+            if (ts.isIdentifier(node) && hint === 1 /* Expression */) {
+                return substituteExpressionIdentifier(node);
+            }
+            return node;
+        }
+        function substituteExpressionIdentifier(node) {
+            if (ts.getEmitFlags(node) & 4096 /* HelperName */) {
+                var externalHelpersModuleName = ts.getExternalHelpersModuleName(currentSourceFile);
+                if (externalHelpersModuleName) {
+                    return ts.createPropertyAccess(externalHelpersModuleName, node);
+                }
+            }
+            return node;
+        }
+    }
+    ts.transformES2015Module = transformES2015Module;
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    function canProduceDiagnostics(node) {
+        return ts.isVariableDeclaration(node) ||
+            ts.isPropertyDeclaration(node) ||
+            ts.isPropertySignature(node) ||
+            ts.isBindingElement(node) ||
+            ts.isSetAccessor(node) ||
+            ts.isGetAccessor(node) ||
+            ts.isConstructSignatureDeclaration(node) ||
+            ts.isCallSignatureDeclaration(node) ||
+            ts.isMethodDeclaration(node) ||
+            ts.isMethodSignature(node) ||
+            ts.isFunctionDeclaration(node) ||
+            ts.isParameter(node) ||
+            ts.isTypeParameterDeclaration(node) ||
+            ts.isExpressionWithTypeArguments(node) ||
+            ts.isImportEqualsDeclaration(node) ||
+            ts.isTypeAliasDeclaration(node) ||
+            ts.isConstructorDeclaration(node) ||
+            ts.isIndexSignatureDeclaration(node);
+    }
+    ts.canProduceDiagnostics = canProduceDiagnostics;
+    function createGetSymbolAccessibilityDiagnosticForNodeName(node) {
+        if (ts.isSetAccessor(node) || ts.isGetAccessor(node)) {
+            return getAccessorNameVisibilityError;
+        }
+        else if (ts.isMethodSignature(node) || ts.isMethodDeclaration(node)) {
+            return getMethodNameVisibilityError;
+        }
+        else {
+            return createGetSymbolAccessibilityDiagnosticForNode(node);
+        }
+        function getAccessorNameVisibilityError(symbolAccessibilityResult) {
+            var diagnosticMessage = getAccessorNameVisibilityDiagnosticMessage(symbolAccessibilityResult);
+            return diagnosticMessage !== undefined ? {
+                diagnosticMessage: diagnosticMessage,
+                errorNode: node,
+                typeName: node.name
+            } : undefined;
+        }
+        function getAccessorNameVisibilityDiagnosticMessage(symbolAccessibilityResult) {
+            if (ts.hasModifier(node, 32 /* Static */)) {
+                return symbolAccessibilityResult.errorModuleName ?
+                    symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                        ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
+                        ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
+                    ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
+            }
+            else if (node.parent.kind === 240 /* ClassDeclaration */) {
+                return symbolAccessibilityResult.errorModuleName ?
+                    symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                        ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
+                        ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
+                    ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_private_name_1;
+            }
+            else {
+                return symbolAccessibilityResult.errorModuleName ?
+                    ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2 :
+                    ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_private_name_1;
+            }
+        }
+        function getMethodNameVisibilityError(symbolAccessibilityResult) {
+            var diagnosticMessage = getMethodNameVisibilityDiagnosticMessage(symbolAccessibilityResult);
+            return diagnosticMessage !== undefined ? {
+                diagnosticMessage: diagnosticMessage,
+                errorNode: node,
+                typeName: node.name
+            } : undefined;
+        }
+        function getMethodNameVisibilityDiagnosticMessage(symbolAccessibilityResult) {
+            if (ts.hasModifier(node, 32 /* Static */)) {
+                return symbolAccessibilityResult.errorModuleName ?
+                    symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                        ts.Diagnostics.Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
+                        ts.Diagnostics.Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
+                    ts.Diagnostics.Public_static_method_0_of_exported_class_has_or_is_using_private_name_1;
+            }
+            else if (node.parent.kind === 240 /* ClassDeclaration */) {
+                return symbolAccessibilityResult.errorModuleName ?
+                    symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                        ts.Diagnostics.Public_method_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
+                        ts.Diagnostics.Public_method_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
+                    ts.Diagnostics.Public_method_0_of_exported_class_has_or_is_using_private_name_1;
+            }
+            else {
+                return symbolAccessibilityResult.errorModuleName ?
+                    ts.Diagnostics.Method_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2 :
+                    ts.Diagnostics.Method_0_of_exported_interface_has_or_is_using_private_name_1;
+            }
+        }
+    }
+    ts.createGetSymbolAccessibilityDiagnosticForNodeName = createGetSymbolAccessibilityDiagnosticForNodeName;
+    function createGetSymbolAccessibilityDiagnosticForNode(node) {
+        if (ts.isVariableDeclaration(node) || ts.isPropertyDeclaration(node) || ts.isPropertySignature(node) || ts.isBindingElement(node) || ts.isConstructorDeclaration(node)) {
+            return getVariableDeclarationTypeVisibilityError;
+        }
+        else if (ts.isSetAccessor(node) || ts.isGetAccessor(node)) {
+            return getAccessorDeclarationTypeVisibilityError;
+        }
+        else if (ts.isConstructSignatureDeclaration(node) || ts.isCallSignatureDeclaration(node) || ts.isMethodDeclaration(node) || ts.isMethodSignature(node) || ts.isFunctionDeclaration(node) || ts.isIndexSignatureDeclaration(node)) {
+            return getReturnTypeVisibilityError;
+        }
+        else if (ts.isParameter(node)) {
+            if (ts.isParameterPropertyDeclaration(node) && ts.hasModifier(node.parent, 8 /* Private */)) {
+                return getVariableDeclarationTypeVisibilityError;
+            }
+            return getParameterDeclarationTypeVisibilityError;
+        }
+        else if (ts.isTypeParameterDeclaration(node)) {
+            return getTypeParameterConstraintVisibilityError;
+        }
+        else if (ts.isExpressionWithTypeArguments(node)) {
+            return getHeritageClauseVisibilityError;
+        }
+        else if (ts.isImportEqualsDeclaration(node)) {
+            return getImportEntityNameVisibilityError;
+        }
+        else if (ts.isTypeAliasDeclaration(node)) {
+            return getTypeAliasDeclarationVisibilityError;
+        }
+        else {
+            return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: " + ts.SyntaxKind[node.kind]);
+        }
+        function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
+            if (node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */) {
+                return symbolAccessibilityResult.errorModuleName ?
+                    symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                        ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
+                        ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_private_module_2 :
+                    ts.Diagnostics.Exported_variable_0_has_or_is_using_private_name_1;
+            }
+            // This check is to ensure we don't report error on constructor parameter property as that error would be reported during parameter emit
+            // The only exception here is if the constructor was marked as private. we are not emitting the constructor parameters at all.
+            else if (node.kind === 154 /* PropertyDeclaration */ || node.kind === 153 /* PropertySignature */ ||
+                (node.kind === 151 /* Parameter */ && ts.hasModifier(node.parent, 8 /* Private */))) {
+                // TODO(jfreeman): Deal with computed properties in error reporting.
+                if (ts.hasModifier(node, 32 /* Static */)) {
+                    return symbolAccessibilityResult.errorModuleName ?
+                        symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                            ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
+                            ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
+                        ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
+                }
+                else if (node.parent.kind === 240 /* ClassDeclaration */ || node.kind === 151 /* Parameter */) {
+                    return symbolAccessibilityResult.errorModuleName ?
+                        symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                            ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
+                            ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
+                        ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_private_name_1;
+                }
+                else {
+                    // Interfaces cannot have types that cannot be named
+                    return symbolAccessibilityResult.errorModuleName ?
+                        ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2 :
+                        ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_private_name_1;
+                }
+            }
+        }
+        function getVariableDeclarationTypeVisibilityError(symbolAccessibilityResult) {
+            var diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult);
+            return diagnosticMessage !== undefined ? {
+                diagnosticMessage: diagnosticMessage,
+                errorNode: node,
+                typeName: node.name
+            } : undefined;
+        }
+        function getAccessorDeclarationTypeVisibilityError(symbolAccessibilityResult) {
+            var diagnosticMessage;
+            if (node.kind === 159 /* SetAccessor */) {
+                // Getters can infer the return type from the returned expression, but setters cannot, so the
+                // "_from_external_module_1_but_cannot_be_named" case cannot occur.
+                if (ts.hasModifier(node, 32 /* Static */)) {
+                    diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                        ts.Diagnostics.Parameter_type_of_public_static_setter_0_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
+                        ts.Diagnostics.Parameter_type_of_public_static_setter_0_from_exported_class_has_or_is_using_private_name_1;
+                }
+                else {
+                    diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                        ts.Diagnostics.Parameter_type_of_public_setter_0_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
+                        ts.Diagnostics.Parameter_type_of_public_setter_0_from_exported_class_has_or_is_using_private_name_1;
+                }
+            }
+            else {
+                if (ts.hasModifier(node, 32 /* Static */)) {
+                    diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                        symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                            ts.Diagnostics.Return_type_of_public_static_getter_0_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
+                            ts.Diagnostics.Return_type_of_public_static_getter_0_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
+                        ts.Diagnostics.Return_type_of_public_static_getter_0_from_exported_class_has_or_is_using_private_name_1;
+                }
+                else {
+                    diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                        symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                            ts.Diagnostics.Return_type_of_public_getter_0_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
+                            ts.Diagnostics.Return_type_of_public_getter_0_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
+                        ts.Diagnostics.Return_type_of_public_getter_0_from_exported_class_has_or_is_using_private_name_1;
+                }
+            }
+            return {
+                diagnosticMessage: diagnosticMessage,
+                errorNode: node.name,
+                typeName: node.name
+            };
+        }
+        function getReturnTypeVisibilityError(symbolAccessibilityResult) {
+            var diagnosticMessage;
+            switch (node.kind) {
+                case 161 /* ConstructSignature */:
+                    // Interfaces cannot have return types that cannot be named
+                    diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                        ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
+                        ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0;
+                    break;
+                case 160 /* CallSignature */:
+                    // Interfaces cannot have return types that cannot be named
+                    diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                        ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
+                        ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0;
+                    break;
+                case 162 /* IndexSignature */:
+                    // Interfaces cannot have return types that cannot be named
+                    diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                        ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
+                        ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0;
+                    break;
+                case 156 /* MethodDeclaration */:
+                case 155 /* MethodSignature */:
+                    if (ts.hasModifier(node, 32 /* Static */)) {
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                                ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
+                                ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
+                            ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0;
+                    }
+                    else if (node.parent.kind === 240 /* ClassDeclaration */) {
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                                ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
+                                ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
+                            ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0;
+                    }
+                    else {
+                        // Interfaces cannot have return types that cannot be named
+                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                            ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
+                            ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
+                    }
+                    break;
+                case 239 /* FunctionDeclaration */:
+                    diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
+                        symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                            ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
+                            ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1 :
+                        ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_private_name_0;
+                    break;
+                default:
+                    return ts.Debug.fail("This is unknown kind for signature: " + node.kind);
+            }
+            return {
+                diagnosticMessage: diagnosticMessage,
+                errorNode: node.name || node
+            };
+        }
+        function getParameterDeclarationTypeVisibilityError(symbolAccessibilityResult) {
+            var diagnosticMessage = getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult);
+            return diagnosticMessage !== undefined ? {
+                diagnosticMessage: diagnosticMessage,
+                errorNode: node,
+                typeName: node.name
+            } : undefined;
+        }
+        function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
+            switch (node.parent.kind) {
+                case 157 /* Constructor */:
+                    return symbolAccessibilityResult.errorModuleName ?
+                        symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                            ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
+                            ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
+                        ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1;
+                case 161 /* ConstructSignature */:
+                case 166 /* ConstructorType */:
+                    // Interfaces cannot have parameter types that cannot be named
+                    return symbolAccessibilityResult.errorModuleName ?
+                        ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
+                        ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
+                case 160 /* CallSignature */:
+                    // Interfaces cannot have parameter types that cannot be named
+                    return symbolAccessibilityResult.errorModuleName ?
+                        ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
+                        ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
+                case 162 /* IndexSignature */:
+                    // Interfaces cannot have parameter types that cannot be named
+                    return symbolAccessibilityResult.errorModuleName ?
+                        ts.Diagnostics.Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
+                        ts.Diagnostics.Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1;
+                case 156 /* MethodDeclaration */:
+                case 155 /* MethodSignature */:
+                    if (ts.hasModifier(node.parent, 32 /* Static */)) {
+                        return symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                                ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
+                                ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
+                            ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
+                    }
+                    else if (node.parent.parent.kind === 240 /* ClassDeclaration */) {
+                        return symbolAccessibilityResult.errorModuleName ?
+                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                                ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
+                                ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
+                            ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
+                    }
+                    else {
+                        // Interfaces cannot have parameter types that cannot be named
+                        return symbolAccessibilityResult.errorModuleName ?
+                            ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
+                            ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
+                    }
+                case 239 /* FunctionDeclaration */:
+                case 165 /* FunctionType */:
+                    return symbolAccessibilityResult.errorModuleName ?
+                        symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
+                            ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
+                            ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2 :
+                        ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_private_name_1;
+                default:
+                    return ts.Debug.fail("Unknown parent for parameter: " + ts.SyntaxKind[node.parent.kind]);
+            }
+        }
+        function getTypeParameterConstraintVisibilityError() {
+            // Type parameter constraints are named by user so we should always be able to name it
+            var diagnosticMessage;
+            switch (node.parent.kind) {
+                case 240 /* ClassDeclaration */:
+                    diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_class_has_or_is_using_private_name_1;
+                    break;
+                case 241 /* InterfaceDeclaration */:
+                    diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1;
+                    break;
+                case 166 /* ConstructorType */:
+                case 161 /* ConstructSignature */:
+                    diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
+                    break;
+                case 160 /* CallSignature */:
+                    diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
+                    break;
+                case 156 /* MethodDeclaration */:
+                case 155 /* MethodSignature */:
+                    if (ts.hasModifier(node.parent, 32 /* Static */)) {
+                        diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
+                    }
+                    else if (node.parent.parent.kind === 240 /* ClassDeclaration */) {
+                        diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
+                    }
+                    else {
+                        diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
+                    }
+                    break;
+                case 165 /* FunctionType */:
+                case 239 /* FunctionDeclaration */:
+                    diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_function_has_or_is_using_private_name_1;
+                    break;
+                case 242 /* TypeAliasDeclaration */:
+                    diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1;
+                    break;
+                default:
+                    return ts.Debug.fail("This is unknown parent for type parameter: " + node.parent.kind);
+            }
+            return {
+                diagnosticMessage: diagnosticMessage,
+                errorNode: node,
+                typeName: node.name
+            };
+        }
+        function getHeritageClauseVisibilityError() {
+            var diagnosticMessage;
+            // Heritage clause is written by user so it can always be named
+            if (node.parent.parent.kind === 240 /* ClassDeclaration */) {
+                // Class or Interface implemented/extended is inaccessible
+                diagnosticMessage = ts.isHeritageClause(node.parent) && node.parent.token === 109 /* ImplementsKeyword */ ?
+                    ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 :
+                    ts.Diagnostics.extends_clause_of_exported_class_0_has_or_is_using_private_name_1;
+            }
+            else {
+                // interface is inaccessible
+                diagnosticMessage = ts.Diagnostics.extends_clause_of_exported_interface_0_has_or_is_using_private_name_1;
+            }
+            return {
+                diagnosticMessage: diagnosticMessage,
+                errorNode: node,
+                typeName: ts.getNameOfDeclaration(node.parent.parent)
+            };
+        }
+        function getImportEntityNameVisibilityError() {
+            return {
+                diagnosticMessage: ts.Diagnostics.Import_declaration_0_is_using_private_name_1,
+                errorNode: node,
+                typeName: node.name
+            };
+        }
+        function getTypeAliasDeclarationVisibilityError() {
+            return {
+                diagnosticMessage: ts.Diagnostics.Exported_type_alias_0_has_or_is_using_private_name_1,
+                errorNode: node.type,
+                typeName: node.name
+            };
+        }
+    }
+    ts.createGetSymbolAccessibilityDiagnosticForNode = createGetSymbolAccessibilityDiagnosticForNode;
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
+(function (ts) {
+    function getDeclarationDiagnostics(host, resolver, file) {
+        if (file && ts.isSourceFileJS(file)) {
+            return []; // No declaration diagnostics for js for now
+        }
+        var compilerOptions = host.getCompilerOptions();
+        var result = ts.transformNodes(resolver, host, compilerOptions, file ? [file] : ts.filter(host.getSourceFiles(), ts.isSourceFileNotJS), [transformDeclarations], /*allowDtsFiles*/ false);
+        return result.diagnostics;
+    }
+    ts.getDeclarationDiagnostics = getDeclarationDiagnostics;
+    var declarationEmitNodeBuilderFlags = 1024 /* MultilineObjectLiterals */ |
+        2048 /* WriteClassExpressionAsTypeLiteral */ |
+        4096 /* UseTypeOfFunction */ |
+        8 /* UseStructuralFallback */ |
+        524288 /* AllowEmptyTuple */ |
+        4 /* GenerateNamesForShadowedTypeParams */ |
+        1 /* NoTruncation */;
+    /**
+     * Transforms a ts file into a .d.ts file
+     * This process requires type information, which is retrieved through the emit resolver. Because of this,
+     * in many places this transformer assumes it will be operating on parse tree nodes directly.
+     * This means that _no transforms should be allowed to occur before this one_.
+     */
+    function transformDeclarations(context) {
+        var throwDiagnostic = function () { return ts.Debug.fail("Diagnostic emitted without context"); };
+        var getSymbolAccessibilityDiagnostic = throwDiagnostic;
+        var needsDeclare = true;
+        var isBundledEmit = false;
+        var resultHasExternalModuleIndicator = false;
+        var needsScopeFixMarker = false;
+        var resultHasScopeMarker = false;
+        var enclosingDeclaration;
+        var necessaryTypeReferences;
+        var lateMarkedStatements;
+        var lateStatementReplacementMap;
+        var suppressNewDiagnosticContexts;
+        var exportedModulesFromDeclarationEmit;
+        var host = context.getEmitHost();
+        var symbolTracker = {
+            trackSymbol: trackSymbol,
+            reportInaccessibleThisError: reportInaccessibleThisError,
+            reportInaccessibleUniqueSymbolError: reportInaccessibleUniqueSymbolError,
+            reportPrivateInBaseOfClassExpression: reportPrivateInBaseOfClassExpression,
+            reportLikelyUnsafeImportRequiredError: reportLikelyUnsafeImportRequiredError,
+            moduleResolverHost: host,
+            trackReferencedAmbientModule: trackReferencedAmbientModule,
+            trackExternalModuleSymbolOfImportTypeNode: trackExternalModuleSymbolOfImportTypeNode
+        };
+        var errorNameNode;
+        var currentSourceFile;
+        var refs;
+        var libs;
+        var resolver = context.getEmitResolver();
+        var options = context.getCompilerOptions();
+        var newLine = ts.getNewLineCharacter(options);
+        var noResolve = options.noResolve, stripInternal = options.stripInternal;
+        return transformRoot;
+        function recordTypeReferenceDirectivesIfNecessary(typeReferenceDirectives) {
+            if (!typeReferenceDirectives) {
+                return;
+            }
+            necessaryTypeReferences = necessaryTypeReferences || ts.createMap();
+            for (var _i = 0, typeReferenceDirectives_2 = typeReferenceDirectives; _i < typeReferenceDirectives_2.length; _i++) {
+                var ref = typeReferenceDirectives_2[_i];
+                necessaryTypeReferences.set(ref, true);
+            }
+        }
+        function trackReferencedAmbientModule(node, symbol) {
+            // If it is visible via `// <reference types="..."/>`, then we should just use that
+            var directives = resolver.getTypeReferenceDirectivesForSymbol(symbol, 67108863 /* All */);
+            if (ts.length(directives)) {
+                return recordTypeReferenceDirectivesIfNecessary(directives);
+            }
+            // Otherwise we should emit a path-based reference
+            var container = ts.getSourceFileOfNode(node);
+            refs.set("" + ts.getOriginalNodeId(container), container);
+        }
+        function handleSymbolAccessibilityError(symbolAccessibilityResult) {
+            if (symbolAccessibilityResult.accessibility === 0 /* Accessible */) {
+                // Add aliases back onto the possible imports list if they're not there so we can try them again with updated visibility info
+                if (symbolAccessibilityResult && symbolAccessibilityResult.aliasesToMakeVisible) {
+                    if (!lateMarkedStatements) {
+                        lateMarkedStatements = symbolAccessibilityResult.aliasesToMakeVisible;
+                    }
+                    else {
+                        for (var _i = 0, _a = symbolAccessibilityResult.aliasesToMakeVisible; _i < _a.length; _i++) {
+                            var ref = _a[_i];
+                            ts.pushIfUnique(lateMarkedStatements, ref);
+                        }
+                    }
+                }
+                // TODO: Do all these accessibility checks inside/after the first pass in the checker when declarations are enabled, if possible
+            }
+            else {
+                // Report error
+                var errorInfo = getSymbolAccessibilityDiagnostic(symbolAccessibilityResult);
+                if (errorInfo) {
+                    if (errorInfo.typeName) {
+                        context.addDiagnostic(ts.createDiagnosticForNode(symbolAccessibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getTextOfNode(errorInfo.typeName), symbolAccessibilityResult.errorSymbolName, symbolAccessibilityResult.errorModuleName));
+                    }
+                    else {
+                        context.addDiagnostic(ts.createDiagnosticForNode(symbolAccessibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, symbolAccessibilityResult.errorSymbolName, symbolAccessibilityResult.errorModuleName));
+                    }
+                }
+            }
+        }
+        function trackExternalModuleSymbolOfImportTypeNode(symbol) {
+            if (!isBundledEmit) {
+                (exportedModulesFromDeclarationEmit || (exportedModulesFromDeclarationEmit = [])).push(symbol);
+            }
+        }
+        function trackSymbol(symbol, enclosingDeclaration, meaning) {
+            if (symbol.flags & 262144 /* TypeParameter */)
+                return;
+            handleSymbolAccessibilityError(resolver.isSymbolAccessible(symbol, enclosingDeclaration, meaning, /*shouldComputeAliasesToMakeVisible*/ true));
+            recordTypeReferenceDirectivesIfNecessary(resolver.getTypeReferenceDirectivesForSymbol(symbol, meaning));
+        }
+        function reportPrivateInBaseOfClassExpression(propertyName) {
+            if (errorNameNode) {
+                context.addDiagnostic(ts.createDiagnosticForNode(errorNameNode, ts.Diagnostics.Property_0_of_exported_class_expression_may_not_be_private_or_protected, propertyName));
+            }
+        }
+        function reportInaccessibleUniqueSymbolError() {
+            if (errorNameNode) {
+                context.addDiagnostic(ts.createDiagnosticForNode(errorNameNode, ts.Diagnostics.The_inferred_type_of_0_references_an_inaccessible_1_type_A_type_annotation_is_necessary, ts.declarationNameToString(errorNameNode), "unique symbol"));
+            }
+        }
+        function reportInaccessibleThisError() {
+            if (errorNameNode) {
+                context.addDiagnostic(ts.createDiagnosticForNode(errorNameNode, ts.Diagnostics.The_inferred_type_of_0_references_an_inaccessible_1_type_A_type_annotation_is_necessary, ts.declarationNameToString(errorNameNode), "this"));
+            }
+        }
+        function reportLikelyUnsafeImportRequiredError(specifier) {
+            if (errorNameNode) {
+                context.addDiagnostic(ts.createDiagnosticForNode(errorNameNode, ts.Diagnostics.The_inferred_type_of_0_cannot_be_named_without_a_reference_to_1_This_is_likely_not_portable_A_type_annotation_is_necessary, ts.declarationNameToString(errorNameNode), specifier));
+            }
+        }
+        function transformRoot(node) {
+            if (node.kind === 279 /* SourceFile */ && (node.isDeclarationFile || ts.isSourceFileJS(node))) {
+                return node;
+            }
+            if (node.kind === 280 /* Bundle */) {
+                isBundledEmit = true;
+                refs = ts.createMap();
+                libs = ts.createMap();
+                var hasNoDefaultLib_1 = false;
+                var bundle = ts.createBundle(ts.map(node.sourceFiles, function (sourceFile) {
+                    if (sourceFile.isDeclarationFile || ts.isSourceFileJS(sourceFile))
+                        return undefined; // Omit declaration files from bundle results, too // TODO: GH#18217
+                    hasNoDefaultLib_1 = hasNoDefaultLib_1 || sourceFile.hasNoDefaultLib;
+                    currentSourceFile = sourceFile;
+                    enclosingDeclaration = sourceFile;
+                    lateMarkedStatements = undefined;
+                    suppressNewDiagnosticContexts = false;
+                    lateStatementReplacementMap = ts.createMap();
+                    getSymbolAccessibilityDiagnostic = throwDiagnostic;
+                    needsScopeFixMarker = false;
+                    resultHasScopeMarker = false;
+                    collectReferences(sourceFile, refs);
+                    collectLibs(sourceFile, libs);
+                    if (ts.isExternalModule(sourceFile)) {
+                        resultHasExternalModuleIndicator = false; // unused in external module bundle emit (all external modules are within module blocks, therefore are known to be modules)
+                        needsDeclare = false;
+                        var statements_4 = ts.visitNodes(sourceFile.statements, visitDeclarationStatements);
+                        var newFile = ts.updateSourceFileNode(sourceFile, [ts.createModuleDeclaration([], [ts.createModifier(125 /* DeclareKeyword */)], ts.createLiteral(ts.getResolvedExternalModuleName(context.getEmitHost(), sourceFile)), ts.createModuleBlock(ts.setTextRange(ts.createNodeArray(transformAndReplaceLatePaintedStatements(statements_4)), sourceFile.statements)))], /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []);
+                        return newFile;
+                    }
+                    needsDeclare = true;
+                    var updated = ts.visitNodes(sourceFile.statements, visitDeclarationStatements);
+                    return ts.updateSourceFileNode(sourceFile, transformAndReplaceLatePaintedStatements(updated), /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []);
+                }), ts.mapDefined(node.prepends, function (prepend) {
+                    if (prepend.kind === 282 /* InputFiles */) {
+                        return ts.createUnparsedSourceFile(prepend, "dts");
+                    }
+                }));
+                bundle.syntheticFileReferences = [];
+                bundle.syntheticTypeReferences = getFileReferencesForUsedTypeReferences();
+                bundle.syntheticLibReferences = getLibReferences();
+                bundle.hasNoDefaultLib = hasNoDefaultLib_1;
+                var outputFilePath_1 = ts.getDirectoryPath(ts.normalizeSlashes(ts.getOutputPathsFor(node, host, /*forceDtsPaths*/ true).declarationFilePath));
+                var referenceVisitor_1 = mapReferencesIntoArray(bundle.syntheticFileReferences, outputFilePath_1);
+                refs.forEach(referenceVisitor_1);
+                return bundle;
+            }
+            // Single source file
+            needsDeclare = true;
+            needsScopeFixMarker = false;
+            resultHasScopeMarker = false;
+            enclosingDeclaration = node;
+            currentSourceFile = node;
+            getSymbolAccessibilityDiagnostic = throwDiagnostic;
+            isBundledEmit = false;
+            resultHasExternalModuleIndicator = false;
+            suppressNewDiagnosticContexts = false;
+            lateMarkedStatements = undefined;
+            lateStatementReplacementMap = ts.createMap();
+            necessaryTypeReferences = undefined;
+            refs = collectReferences(currentSourceFile, ts.createMap());
+            libs = collectLibs(currentSourceFile, ts.createMap());
+            var references = [];
+            var outputFilePath = ts.getDirectoryPath(ts.normalizeSlashes(ts.getOutputPathsFor(node, host, /*forceDtsPaths*/ true).declarationFilePath));
+            var referenceVisitor = mapReferencesIntoArray(references, outputFilePath);
+            var statements = ts.visitNodes(node.statements, visitDeclarationStatements);
+            var combinedStatements = ts.setTextRange(ts.createNodeArray(transformAndReplaceLatePaintedStatements(statements)), node.statements);
+            refs.forEach(referenceVisitor);
+            var emittedImports = ts.filter(combinedStatements, ts.isAnyImportSyntax);
+            if (ts.isExternalModule(node) && (!resultHasExternalModuleIndicator || (needsScopeFixMarker && !resultHasScopeMarker))) {
+                combinedStatements = ts.setTextRange(ts.createNodeArray(combinedStatements.concat([ts.createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createNamedExports([]), /*moduleSpecifier*/ undefined)])), combinedStatements);
+            }
+            var updated = ts.updateSourceFileNode(node, combinedStatements, /*isDeclarationFile*/ true, references, getFileReferencesForUsedTypeReferences(), node.hasNoDefaultLib, getLibReferences());
+            updated.exportedModulesFromDeclarationEmit = exportedModulesFromDeclarationEmit;
+            return updated;
+            function getLibReferences() {
+                return ts.map(ts.arrayFrom(libs.keys()), function (lib) { return ({ fileName: lib, pos: -1, end: -1 }); });
+            }
+            function getFileReferencesForUsedTypeReferences() {
+                return necessaryTypeReferences ? ts.mapDefined(ts.arrayFrom(necessaryTypeReferences.keys()), getFileReferenceForTypeName) : [];
+            }
+            function getFileReferenceForTypeName(typeName) {
+                // Elide type references for which we have imports
+                if (emittedImports) {
+                    for (var _i = 0, emittedImports_1 = emittedImports; _i < emittedImports_1.length; _i++) {
+                        var importStatement = emittedImports_1[_i];
+                        if (ts.isImportEqualsDeclaration(importStatement) && ts.isExternalModuleReference(importStatement.moduleReference)) {
+                            var expr = importStatement.moduleReference.expression;
+                            if (ts.isStringLiteralLike(expr) && expr.text === typeName) {
+                                return undefined;
+                            }
+                        }
+                        else if (ts.isImportDeclaration(importStatement) && ts.isStringLiteral(importStatement.moduleSpecifier) && importStatement.moduleSpecifier.text === typeName) {
+                            return undefined;
+                        }
+                    }
+                }
+                return { fileName: typeName, pos: -1, end: -1 };
+            }
+            function mapReferencesIntoArray(references, outputFilePath) {
+                return function (file) {
+                    var declFileName;
+                    if (file.isDeclarationFile) { // Neither decl files or js should have their refs changed
+                        declFileName = file.fileName;
+                    }
+                    else {
+                        if (isBundledEmit && ts.contains(node.sourceFiles, file))
+                            return; // Omit references to files which are being merged
+                        var paths = ts.getOutputPathsFor(file, host, /*forceDtsPaths*/ true);
+                        declFileName = paths.declarationFilePath || paths.jsFilePath || file.fileName;
+                    }
+                    if (declFileName) {
+                        var fileName = ts.getRelativePathToDirectoryOrUrl(outputFilePath, declFileName, host.getCurrentDirectory(), host.getCanonicalFileName, 
+                        /*isAbsolutePathAnUrl*/ false);
+                        if (ts.startsWith(fileName, "./") && ts.hasExtension(fileName)) {
+                            fileName = fileName.substring(2);
+                        }
+                        // omit references to files from node_modules (npm may disambiguate module
+                        // references when installing this package, making the path is unreliable).
+                        if (ts.startsWith(fileName, "node_modules/") || fileName.indexOf("/node_modules/") !== -1) {
+                            return;
+                        }
+                        references.push({ pos: -1, end: -1, fileName: fileName });
+                    }
+                };
+            }
+        }
+        function collectReferences(sourceFile, ret) {
+            if (noResolve || ts.isSourceFileJS(sourceFile))
+                return ret;
+            ts.forEach(sourceFile.referencedFiles, function (f) {
+                var elem = ts.tryResolveScriptReference(host, sourceFile, f);
+                if (elem) {
+                    ret.set("" + ts.getOriginalNodeId(elem), elem);
+                }
+            });
+            return ret;
+        }
+        function collectLibs(sourceFile, ret) {
+            ts.forEach(sourceFile.libReferenceDirectives, function (ref) {
+                var lib = host.getLibFileFromReference(ref);
+                if (lib) {
+                    ret.set(ref.fileName.toLocaleLowerCase(), true);
+                }
+            });
+            return ret;
+        }
+        function filterBindingPatternInitializers(name) {
+            if (name.kind === 72 /* Identifier */) {
+                return name;
+            }
+            else {
+                if (name.kind === 185 /* ArrayBindingPattern */) {
+                    return ts.updateArrayBindingPattern(name, ts.visitNodes(name.elements, visitBindingElement));
+                }
+                else {
+                    return ts.updateObjectBindingPattern(name, ts.visitNodes(name.elements, visitBindingElement));
+                }
+            }
+            function visitBindingElement(elem) {
+                if (elem.kind === 210 /* OmittedExpression */) {
+                    return elem;
+                }
+                return ts.updateBindingElement(elem, elem.dotDotDotToken, elem.propertyName, filterBindingPatternInitializers(elem.name), shouldPrintWithInitializer(elem) ? elem.initializer : undefined);
+            }
+        }
+        function ensureParameter(p, modifierMask) {
+            var oldDiag;
+            if (!suppressNewDiagnosticContexts) {
+                oldDiag = getSymbolAccessibilityDiagnostic;
+                getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(p);
+            }
+            var newParam = ts.updateParameter(p, 
+            /*decorators*/ undefined, maskModifiers(p, modifierMask), p.dotDotDotToken, filterBindingPatternInitializers(p.name), resolver.isOptionalParameter(p) ? (p.questionToken || ts.createToken(56 /* QuestionToken */)) : undefined, ensureType(p, p.type, /*ignorePrivate*/ true), // Ignore private param props, since this type is going straight back into a param
+            ensureNoInitializer(p));
+            if (!suppressNewDiagnosticContexts) {
+                getSymbolAccessibilityDiagnostic = oldDiag;
+            }
+            return newParam;
+        }
+        function shouldPrintWithInitializer(node) {
+            return canHaveLiteralInitializer(node) && resolver.isLiteralConstDeclaration(ts.getParseTreeNode(node)); // TODO: Make safe
+        }
+        function ensureNoInitializer(node) {
+            if (shouldPrintWithInitializer(node)) {
+                return resolver.createLiteralConstValue(ts.getParseTreeNode(node), symbolTracker); // TODO: Make safe
+            }
+            return undefined;
+        }
+        function ensureType(node, type, ignorePrivate) {
+            if (!ignorePrivate && ts.hasModifier(node, 8 /* Private */)) {
+                // Private nodes emit no types (except private parameter properties, whose parameter types are actually visible)
+                return;
+            }
+            if (shouldPrintWithInitializer(node)) {
+                // Literal const declarations will have an initializer ensured rather than a type
+                return;
+            }
+            var shouldUseResolverType = node.kind === 151 /* Parameter */ &&
+                (resolver.isRequiredInitializedParameter(node) ||
+                    resolver.isOptionalUninitializedParameterProperty(node));
+            if (type && !shouldUseResolverType) {
+                return ts.visitNode(type, visitDeclarationSubtree);
+            }
+            if (!ts.getParseTreeNode(node)) {
+                return type ? ts.visitNode(type, visitDeclarationSubtree) : ts.createKeywordTypeNode(120 /* AnyKeyword */);
+            }
+            if (node.kind === 159 /* SetAccessor */) {
+                // Set accessors with no associated type node (from it's param or get accessor return) are `any` since they are never contextually typed right now
+                // (The inferred type here will be void, but the old declaration emitter printed `any`, so this replicates that)
+                return ts.createKeywordTypeNode(120 /* AnyKeyword */);
+            }
+            errorNameNode = node.name;
+            var oldDiag;
+            if (!suppressNewDiagnosticContexts) {
+                oldDiag = getSymbolAccessibilityDiagnostic;
+                getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(node);
+            }
+            if (node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */) {
+                return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker));
+            }
+            if (node.kind === 151 /* Parameter */
+                || node.kind === 154 /* PropertyDeclaration */
+                || node.kind === 153 /* PropertySignature */) {
+                if (!node.initializer)
+                    return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker, shouldUseResolverType));
+                return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker, shouldUseResolverType) || resolver.createTypeOfExpression(node.initializer, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker));
+            }
+            return cleanup(resolver.createReturnTypeOfSignatureDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker));
+            function cleanup(returnValue) {
+                errorNameNode = undefined;
+                if (!suppressNewDiagnosticContexts) {
+                    getSymbolAccessibilityDiagnostic = oldDiag;
+                }
+                return returnValue || ts.createKeywordTypeNode(120 /* AnyKeyword */);
+            }
+        }
+        function isDeclarationAndNotVisible(node) {
+            node = ts.getParseTreeNode(node);
+            switch (node.kind) {
+                case 239 /* FunctionDeclaration */:
+                case 244 /* ModuleDeclaration */:
+                case 241 /* InterfaceDeclaration */:
+                case 240 /* ClassDeclaration */:
+                case 242 /* TypeAliasDeclaration */:
+                case 243 /* EnumDeclaration */:
+                    return !resolver.isDeclarationVisible(node);
+                // The following should be doing their own visibility checks based on filtering their members
+                case 237 /* VariableDeclaration */:
+                    return !getBindingNameVisible(node);
+                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportDeclaration */:
+                case 255 /* ExportDeclaration */:
+                case 254 /* ExportAssignment */:
+                    return false;
+            }
+            return false;
+        }
+        function getBindingNameVisible(elem) {
+            if (ts.isOmittedExpression(elem)) {
+                return false;
+            }
+            if (ts.isBindingPattern(elem.name)) {
+                // If any child binding pattern element has been marked visible (usually by collect linked aliases), then this is visible
+                return ts.some(elem.name.elements, getBindingNameVisible);
+            }
+            else {
+                return resolver.isDeclarationVisible(elem);
+            }
+        }
+        function updateParamsList(node, params, modifierMask) {
+            if (ts.hasModifier(node, 8 /* Private */)) {
+                return undefined; // TODO: GH#18217
+            }
+            var newParams = ts.map(params, function (p) { return ensureParameter(p, modifierMask); });
+            if (!newParams) {
+                return undefined; // TODO: GH#18217
+            }
+            return ts.createNodeArray(newParams, params.hasTrailingComma);
+        }
+        function ensureTypeParams(node, params) {
+            return ts.hasModifier(node, 8 /* Private */) ? undefined : ts.visitNodes(params, visitDeclarationSubtree);
+        }
+        function isEnclosingDeclaration(node) {
+            return ts.isSourceFile(node)
+                || ts.isTypeAliasDeclaration(node)
+                || ts.isModuleDeclaration(node)
+                || ts.isClassDeclaration(node)
+                || ts.isInterfaceDeclaration(node)
+                || ts.isFunctionLike(node)
+                || ts.isIndexSignatureDeclaration(node)
+                || ts.isMappedTypeNode(node);
+        }
+        function checkEntityNameVisibility(entityName, enclosingDeclaration) {
+            var visibilityResult = resolver.isEntityNameVisible(entityName, enclosingDeclaration);
+            handleSymbolAccessibilityError(visibilityResult);
+            recordTypeReferenceDirectivesIfNecessary(resolver.getTypeReferenceDirectivesForEntityName(entityName));
+        }
+        function preserveJsDoc(updated, original) {
+            if (ts.hasJSDocNodes(updated) && ts.hasJSDocNodes(original)) {
+                updated.jsDoc = original.jsDoc;
+            }
+            return ts.setCommentRange(updated, ts.getCommentRange(original));
+        }
+        function rewriteModuleSpecifier(parent, input) {
+            if (!input)
+                return undefined; // TODO: GH#18217
+            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || (parent.kind !== 244 /* ModuleDeclaration */ && parent.kind !== 183 /* ImportType */);
+            if (ts.isStringLiteralLike(input)) {
+                if (isBundledEmit) {
+                    var newName = ts.getExternalModuleNameFromDeclaration(context.getEmitHost(), resolver, parent);
+                    if (newName) {
+                        return ts.createLiteral(newName);
+                    }
+                }
+                else {
+                    var symbol = resolver.getSymbolOfExternalModuleSpecifier(input);
+                    if (symbol) {
+                        (exportedModulesFromDeclarationEmit || (exportedModulesFromDeclarationEmit = [])).push(symbol);
+                    }
+                }
+            }
+            return input;
+        }
+        function transformImportEqualsDeclaration(decl) {
+            if (!resolver.isDeclarationVisible(decl))
+                return;
+            if (decl.moduleReference.kind === 259 /* ExternalModuleReference */) {
+                // Rewrite external module names if necessary
+                var specifier = ts.getExternalModuleImportEqualsDeclarationExpression(decl);
+                return ts.updateImportEqualsDeclaration(decl, 
+                /*decorators*/ undefined, decl.modifiers, decl.name, ts.updateExternalModuleReference(decl.moduleReference, rewriteModuleSpecifier(decl, specifier)));
+            }
+            else {
+                var oldDiag = getSymbolAccessibilityDiagnostic;
+                getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(decl);
+                checkEntityNameVisibility(decl.moduleReference, enclosingDeclaration);
+                getSymbolAccessibilityDiagnostic = oldDiag;
+                return decl;
+            }
+        }
+        function transformImportDeclaration(decl) {
+            if (!decl.importClause) {
+                // import "mod" - possibly needed for side effects? (global interface patches, module augmentations, etc)
+                return ts.updateImportDeclaration(decl, 
+                /*decorators*/ undefined, decl.modifiers, decl.importClause, rewriteModuleSpecifier(decl, decl.moduleSpecifier));
+            }
+            // The `importClause` visibility corresponds to the default's visibility.
+            var visibleDefaultBinding = decl.importClause && decl.importClause.name && resolver.isDeclarationVisible(decl.importClause) ? decl.importClause.name : undefined;
+            if (!decl.importClause.namedBindings) {
+                // No named bindings (either namespace or list), meaning the import is just default or should be elided
+                return visibleDefaultBinding && ts.updateImportDeclaration(decl, /*decorators*/ undefined, decl.modifiers, ts.updateImportClause(decl.importClause, visibleDefaultBinding, 
+                /*namedBindings*/ undefined), rewriteModuleSpecifier(decl, decl.moduleSpecifier));
+            }
+            if (decl.importClause.namedBindings.kind === 251 /* NamespaceImport */) {
+                // Namespace import (optionally with visible default)
+                var namedBindings = resolver.isDeclarationVisible(decl.importClause.namedBindings) ? decl.importClause.namedBindings : /*namedBindings*/ undefined;
+                return visibleDefaultBinding || namedBindings ? ts.updateImportDeclaration(decl, /*decorators*/ undefined, decl.modifiers, ts.updateImportClause(decl.importClause, visibleDefaultBinding, namedBindings), rewriteModuleSpecifier(decl, decl.moduleSpecifier)) : undefined;
+            }
+            // Named imports (optionally with visible default)
+            var bindingList = ts.mapDefined(decl.importClause.namedBindings.elements, function (b) { return resolver.isDeclarationVisible(b) ? b : undefined; });
+            if ((bindingList && bindingList.length) || visibleDefaultBinding) {
+                return ts.updateImportDeclaration(decl, 
+                /*decorators*/ undefined, decl.modifiers, ts.updateImportClause(decl.importClause, visibleDefaultBinding, bindingList && bindingList.length ? ts.updateNamedImports(decl.importClause.namedBindings, bindingList) : undefined), rewriteModuleSpecifier(decl, decl.moduleSpecifier));
+            }
+            // Nothing visible
+        }
+        function transformAndReplaceLatePaintedStatements(statements) {
+            // This is a `while` loop because `handleSymbolAccessibilityError` can see additional import aliases marked as visible during
+            // error handling which must now be included in the output and themselves checked for errors.
+            // For example:
+            // ```
+            // module A {
+            //   export module Q {}
+            //   import B = Q;
+            //   import C = B;
+            //   export import D = C;
+            // }
+            // ```
+            // In such a scenario, only Q and D are initially visible, but we don't consider imports as private names - instead we say they if they are referenced they must
+            // be recorded. So while checking D's visibility we mark C as visible, then we must check C which in turn marks B, completing the chain of
+            // dependent imports and allowing a valid declaration file output. Today, this dependent alias marking only happens for internal import aliases.
+            while (ts.length(lateMarkedStatements)) {
+                var i = lateMarkedStatements.shift();
+                if (!ts.isLateVisibilityPaintedStatement(i)) {
+                    return ts.Debug.fail("Late replaced statement was found which is not handled by the declaration transformer!: " + (ts.SyntaxKind ? ts.SyntaxKind[i.kind] : i.kind));
+                }
+                var priorNeedsDeclare = needsDeclare;
+                needsDeclare = i.parent && ts.isSourceFile(i.parent) && !(ts.isExternalModule(i.parent) && isBundledEmit);
+                var result = transformTopLevelDeclaration(i, /*privateDeclaration*/ true);
+                needsDeclare = priorNeedsDeclare;
+                lateStatementReplacementMap.set("" + ts.getOriginalNodeId(i), result);
+            }
+            // And lastly, we need to get the final form of all those indetermine import declarations from before and add them to the output list
+            // (and remove them from the set to examine for outter declarations)
+            return ts.visitNodes(statements, visitLateVisibilityMarkedStatements);
+            function visitLateVisibilityMarkedStatements(statement) {
+                if (ts.isLateVisibilityPaintedStatement(statement)) {
+                    var key = "" + ts.getOriginalNodeId(statement);
+                    if (lateStatementReplacementMap.has(key)) {
+                        var result = lateStatementReplacementMap.get(key);
+                        lateStatementReplacementMap.delete(key);
+                        if (result && ts.isSourceFile(statement.parent)) {
+                            if (ts.isArray(result) ? ts.some(result, needsScopeMarker) : needsScopeMarker(result)) {
+                                // Top-level declarations in .d.ts files are always considered exported even without a modifier unless there's an export assignment or specifier
+                                needsScopeFixMarker = true;
+                            }
+                            if (ts.isArray(result) ? ts.some(result, isExternalModuleIndicator) : isExternalModuleIndicator(result)) {
+                                resultHasExternalModuleIndicator = true;
+                            }
+                        }
+                        return result;
+                    }
+                }
+                return statement;
+            }
+        }
+        function isExternalModuleIndicator(result) {
+            // Exported top-level member indicates moduleness
+            return ts.isAnyImportOrReExport(result) || ts.isExportAssignment(result) || ts.hasModifier(result, 1 /* Export */);
+        }
+        function needsScopeMarker(result) {
+            return !ts.isAnyImportOrReExport(result) && !ts.isExportAssignment(result) && !ts.hasModifier(result, 1 /* Export */) && !ts.isAmbientModule(result);
+        }
+        function visitDeclarationSubtree(input) {
+            if (shouldStripInternal(input))
+                return;
+            if (ts.isDeclaration(input)) {
+                if (isDeclarationAndNotVisible(input))
+                    return;
+                if (ts.hasDynamicName(input) && !resolver.isLateBound(ts.getParseTreeNode(input))) {
+                    return;
+                }
+            }
+            // Elide implementation signatures from overload sets
+            if (ts.isFunctionLike(input) && resolver.isImplementationOfOverload(input))
+                return;
+            // Elide semicolon class statements
+            if (ts.isSemicolonClassElement(input))
+                return;
+            var previousEnclosingDeclaration;
+            if (isEnclosingDeclaration(input)) {
+                previousEnclosingDeclaration = enclosingDeclaration;
+                enclosingDeclaration = input;
+            }
+            var oldDiag = getSymbolAccessibilityDiagnostic;
+            // Emit methods which are private as properties with no type information
+            if (ts.isMethodDeclaration(input) || ts.isMethodSignature(input)) {
+                if (ts.hasModifier(input, 8 /* Private */)) {
+                    if (input.symbol && input.symbol.declarations && input.symbol.declarations[0] !== input)
+                        return; // Elide all but the first overload
+                    return cleanup(ts.createProperty(/*decorators*/ undefined, ensureModifiers(input), input.name, /*questionToken*/ undefined, /*type*/ undefined, /*initializer*/ undefined));
+                }
+            }
+            var canProdiceDiagnostic = ts.canProduceDiagnostics(input);
+            if (canProdiceDiagnostic && !suppressNewDiagnosticContexts) {
+                getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(input);
+            }
+            if (ts.isTypeQueryNode(input)) {
+                checkEntityNameVisibility(input.exprName, enclosingDeclaration);
+            }
+            var oldWithinObjectLiteralType = suppressNewDiagnosticContexts;
+            var shouldEnterSuppressNewDiagnosticsContextContext = ((input.kind === 168 /* TypeLiteral */ || input.kind === 181 /* MappedType */) && input.parent.kind !== 242 /* TypeAliasDeclaration */);
+            if (shouldEnterSuppressNewDiagnosticsContextContext) {
+                // We stop making new diagnostic contexts within object literal types. Unless it's an object type on the RHS of a type alias declaration. Then we do.
+                suppressNewDiagnosticContexts = true;
+            }
+            if (isProcessedComponent(input)) {
+                switch (input.kind) {
+                    case 211 /* ExpressionWithTypeArguments */: {
+                        if ((ts.isEntityName(input.expression) || ts.isEntityNameExpression(input.expression))) {
+                            checkEntityNameVisibility(input.expression, enclosingDeclaration);
+                        }
+                        var node = ts.visitEachChild(input, visitDeclarationSubtree, context);
+                        return cleanup(ts.updateExpressionWithTypeArguments(node, ts.parenthesizeTypeParameters(node.typeArguments), node.expression));
+                    }
+                    case 164 /* TypeReference */: {
+                        checkEntityNameVisibility(input.typeName, enclosingDeclaration);
+                        var node = ts.visitEachChild(input, visitDeclarationSubtree, context);
+                        return cleanup(ts.updateTypeReferenceNode(node, node.typeName, ts.parenthesizeTypeParameters(node.typeArguments)));
+                    }
+                    case 161 /* ConstructSignature */:
+                        return cleanup(ts.updateConstructSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type)));
+                    case 157 /* Constructor */: {
+                        var isPrivate = ts.hasModifier(input, 8 /* Private */);
+                        // A constructor declaration may not have a type annotation
+                        var ctor = ts.createSignatureDeclaration(157 /* Constructor */, isPrivate ? undefined : ensureTypeParams(input, input.typeParameters), 
+                        // TODO: GH#18217
+                        isPrivate ? undefined : updateParamsList(input, input.parameters, 0 /* None */), 
+                        /*type*/ undefined);
+                        ctor.modifiers = ts.createNodeArray(ensureModifiers(input));
+                        return cleanup(ctor);
+                    }
+                    case 156 /* MethodDeclaration */: {
+                        var sig = ts.createSignatureDeclaration(155 /* MethodSignature */, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type));
+                        sig.name = input.name;
+                        sig.modifiers = ts.createNodeArray(ensureModifiers(input));
+                        sig.questionToken = input.questionToken;
+                        return cleanup(sig);
+                    }
+                    case 158 /* GetAccessor */: {
+                        var newNode = ensureAccessor(input);
+                        return cleanup(newNode);
+                    }
+                    case 159 /* SetAccessor */: {
+                        var newNode = ensureAccessor(input);
+                        return cleanup(newNode);
+                    }
+                    case 154 /* PropertyDeclaration */:
+                        return cleanup(ts.updateProperty(input, 
+                        /*decorators*/ undefined, ensureModifiers(input), input.name, input.questionToken, !ts.hasModifier(input, 8 /* Private */) ? ensureType(input, input.type) : undefined, ensureNoInitializer(input)));
+                    case 153 /* PropertySignature */:
+                        return cleanup(ts.updatePropertySignature(input, ensureModifiers(input), input.name, input.questionToken, !ts.hasModifier(input, 8 /* Private */) ? ensureType(input, input.type) : undefined, ensureNoInitializer(input)));
+                    case 155 /* MethodSignature */: {
+                        return cleanup(ts.updateMethodSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type), input.name, input.questionToken));
+                    }
+                    case 160 /* CallSignature */: {
+                        return cleanup(ts.updateCallSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type)));
+                    }
+                    case 162 /* IndexSignature */: {
+                        return cleanup(ts.updateIndexSignature(input, 
+                        /*decorators*/ undefined, ensureModifiers(input), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree) || ts.createKeywordTypeNode(120 /* AnyKeyword */)));
+                    }
+                    case 237 /* VariableDeclaration */: {
+                        if (ts.isBindingPattern(input.name)) {
+                            return recreateBindingPattern(input.name);
+                        }
+                        shouldEnterSuppressNewDiagnosticsContextContext = true;
+                        suppressNewDiagnosticContexts = true; // Variable declaration types also suppress new diagnostic contexts, provided the contexts wouldn't be made for binding pattern types
+                        return cleanup(ts.updateVariableDeclaration(input, input.name, ensureType(input, input.type), ensureNoInitializer(input)));
+                    }
+                    case 150 /* TypeParameter */: {
+                        if (isPrivateMethodTypeParameter(input) && (input.default || input.constraint)) {
+                            return cleanup(ts.updateTypeParameterDeclaration(input, input.name, /*constraint*/ undefined, /*defaultType*/ undefined));
+                        }
+                        return cleanup(ts.visitEachChild(input, visitDeclarationSubtree, context));
+                    }
+                    case 175 /* ConditionalType */: {
+                        // We have to process conditional types in a special way because for visibility purposes we need to push a new enclosingDeclaration
+                        // just for the `infer` types in the true branch. It's an implicit declaration scope that only applies to _part_ of the type.
+                        var checkType = ts.visitNode(input.checkType, visitDeclarationSubtree);
+                        var extendsType = ts.visitNode(input.extendsType, visitDeclarationSubtree);
+                        var oldEnclosingDecl = enclosingDeclaration;
+                        enclosingDeclaration = input.trueType;
+                        var trueType = ts.visitNode(input.trueType, visitDeclarationSubtree);
+                        enclosingDeclaration = oldEnclosingDecl;
+                        var falseType = ts.visitNode(input.falseType, visitDeclarationSubtree);
+                        return cleanup(ts.updateConditionalTypeNode(input, checkType, extendsType, trueType, falseType));
+                    }
+                    case 165 /* FunctionType */: {
+                        return cleanup(ts.updateFunctionTypeNode(input, ts.visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree)));
+                    }
+                    case 166 /* ConstructorType */: {
+                        return cleanup(ts.updateConstructorTypeNode(input, ts.visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree)));
+                    }
+                    case 183 /* ImportType */: {
+                        if (!ts.isLiteralImportTypeNode(input))
+                            return cleanup(input);
+                        return cleanup(ts.updateImportTypeNode(input, ts.updateLiteralTypeNode(input.argument, rewriteModuleSpecifier(input, input.argument.literal)), input.qualifier, ts.visitNodes(input.typeArguments, visitDeclarationSubtree, ts.isTypeNode), input.isTypeOf));
+                    }
+                    default: ts.Debug.assertNever(input, "Attempted to process unhandled node kind: " + ts.SyntaxKind[input.kind]);
+                }
+            }
+            return cleanup(ts.visitEachChild(input, visitDeclarationSubtree, context));
+            function cleanup(returnValue) {
+                if (returnValue && canProdiceDiagnostic && ts.hasDynamicName(input)) {
+                    checkName(input);
+                }
+                if (isEnclosingDeclaration(input)) {
+                    enclosingDeclaration = previousEnclosingDeclaration;
+                }
+                if (canProdiceDiagnostic && !suppressNewDiagnosticContexts) {
+                    getSymbolAccessibilityDiagnostic = oldDiag;
+                }
+                if (shouldEnterSuppressNewDiagnosticsContextContext) {
+                    suppressNewDiagnosticContexts = oldWithinObjectLiteralType;
+                }
+                if (returnValue === input) {
+                    return returnValue;
+                }
+                return returnValue && ts.setOriginalNode(preserveJsDoc(returnValue, input), input);
+            }
+        }
+        function isPrivateMethodTypeParameter(node) {
+            return node.parent.kind === 156 /* MethodDeclaration */ && ts.hasModifier(node.parent, 8 /* Private */);
+        }
+        function visitDeclarationStatements(input) {
+            if (!isPreservedDeclarationStatement(input)) {
+                // return undefined for unmatched kinds to omit them from the tree
+                return;
+            }
+            if (shouldStripInternal(input))
+                return;
+            switch (input.kind) {
+                case 255 /* ExportDeclaration */: {
+                    if (ts.isSourceFile(input.parent)) {
+                        resultHasExternalModuleIndicator = true;
+                        resultHasScopeMarker = true;
+                    }
+                    // Always visible if the parent node isn't dropped for being not visible
+                    // Rewrite external module names if necessary
+                    return ts.updateExportDeclaration(input, /*decorators*/ undefined, input.modifiers, input.exportClause, rewriteModuleSpecifier(input, input.moduleSpecifier));
+                }
+                case 254 /* ExportAssignment */: {
+                    // Always visible if the parent node isn't dropped for being not visible
+                    if (ts.isSourceFile(input.parent)) {
+                        resultHasExternalModuleIndicator = true;
+                        resultHasScopeMarker = true;
+                    }
+                    if (input.expression.kind === 72 /* Identifier */) {
+                        return input;
+                    }
+                    else {
+                        var newId = ts.createOptimisticUniqueName("_default");
+                        getSymbolAccessibilityDiagnostic = function () { return ({
+                            diagnosticMessage: ts.Diagnostics.Default_export_of_the_module_has_or_is_using_private_name_0,
+                            errorNode: input
+                        }); };
+                        var varDecl = ts.createVariableDeclaration(newId, resolver.createTypeOfExpression(input.expression, input, declarationEmitNodeBuilderFlags, symbolTracker), /*initializer*/ undefined);
+                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(125 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
+                        return [statement, ts.updateExportAssignment(input, input.decorators, input.modifiers, newId)];
+                    }
+                }
+            }
+            var result = transformTopLevelDeclaration(input);
+            // Don't actually transform yet; just leave as original node - will be elided/swapped by late pass
+            lateStatementReplacementMap.set("" + ts.getOriginalNodeId(input), result);
+            return input;
+        }
+        function transformTopLevelDeclaration(input, isPrivate) {
+            if (shouldStripInternal(input))
+                return;
+            switch (input.kind) {
+                case 248 /* ImportEqualsDeclaration */: {
+                    return transformImportEqualsDeclaration(input);
+                }
+                case 249 /* ImportDeclaration */: {
+                    return transformImportDeclaration(input);
+                }
+            }
+            if (ts.isDeclaration(input) && isDeclarationAndNotVisible(input))
+                return;
+            // Elide implementation signatures from overload sets
+            if (ts.isFunctionLike(input) && resolver.isImplementationOfOverload(input))
+                return;
+            var previousEnclosingDeclaration;
+            if (isEnclosingDeclaration(input)) {
+                previousEnclosingDeclaration = enclosingDeclaration;
+                enclosingDeclaration = input;
+            }
+            var canProdiceDiagnostic = ts.canProduceDiagnostics(input);
+            var oldDiag = getSymbolAccessibilityDiagnostic;
+            if (canProdiceDiagnostic) {
+                getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(input);
+            }
+            var previousNeedsDeclare = needsDeclare;
+            switch (input.kind) {
+                case 242 /* TypeAliasDeclaration */: // Type aliases get `declare`d if need be (for legacy support), but that's all
+                    return cleanup(ts.updateTypeAliasDeclaration(input, 
+                    /*decorators*/ undefined, ensureModifiers(input, isPrivate), input.name, ts.visitNodes(input.typeParameters, visitDeclarationSubtree, ts.isTypeParameterDeclaration), ts.visitNode(input.type, visitDeclarationSubtree, ts.isTypeNode)));
+                case 241 /* InterfaceDeclaration */: {
+                    return cleanup(ts.updateInterfaceDeclaration(input, 
+                    /*decorators*/ undefined, ensureModifiers(input, isPrivate), input.name, ensureTypeParams(input, input.typeParameters), transformHeritageClauses(input.heritageClauses), ts.visitNodes(input.members, visitDeclarationSubtree)));
+                }
+                case 239 /* FunctionDeclaration */: {
+                    // Generators lose their generator-ness, excepting their return type
+                    var clean = cleanup(ts.updateFunctionDeclaration(input, 
+                    /*decorators*/ undefined, ensureModifiers(input, isPrivate), 
+                    /*asteriskToken*/ undefined, input.name, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type), 
+                    /*body*/ undefined));
+                    if (clean && resolver.isExpandoFunctionDeclaration(input)) {
+                        var declarations = ts.mapDefined(resolver.getPropertiesOfContainerFunction(input), function (p) {
+                            if (!ts.isPropertyAccessExpression(p.valueDeclaration)) {
+                                return undefined;
+                            }
+                            var type = resolver.createTypeOfDeclaration(p.valueDeclaration, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker);
+                            var varDecl = ts.createVariableDeclaration(ts.unescapeLeadingUnderscores(p.escapedName), type, /*initializer*/ undefined);
+                            return ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList([varDecl]));
+                        });
+                        var namespaceDecl = ts.createModuleDeclaration(/*decorators*/ undefined, ensureModifiers(input, isPrivate), input.name, ts.createModuleBlock(declarations), 16 /* Namespace */);
+                        return [clean, namespaceDecl];
+                    }
+                    else {
+                        return clean;
+                    }
+                }
+                case 244 /* ModuleDeclaration */: {
+                    needsDeclare = false;
+                    var inner = input.body;
+                    if (inner && inner.kind === 245 /* ModuleBlock */) {
+                        var statements = ts.visitNodes(inner.statements, visitDeclarationStatements);
+                        var body = ts.updateModuleBlock(inner, transformAndReplaceLatePaintedStatements(statements));
+                        needsDeclare = previousNeedsDeclare;
+                        var mods = ensureModifiers(input, isPrivate);
+                        return cleanup(ts.updateModuleDeclaration(input, 
+                        /*decorators*/ undefined, mods, ts.isExternalModuleAugmentation(input) ? rewriteModuleSpecifier(input, input.name) : input.name, body));
+                    }
+                    else {
+                        needsDeclare = previousNeedsDeclare;
+                        var mods = ensureModifiers(input, isPrivate);
+                        needsDeclare = false;
+                        ts.visitNode(inner, visitDeclarationStatements);
+                        // eagerly transform nested namespaces (the nesting doesn't need any elision or painting done)
+                        var id = "" + ts.getOriginalNodeId(inner); // TODO: GH#18217
+                        var body = lateStatementReplacementMap.get(id);
+                        lateStatementReplacementMap.delete(id);
+                        return cleanup(ts.updateModuleDeclaration(input, 
+                        /*decorators*/ undefined, mods, input.name, body));
+                    }
+                }
+                case 240 /* ClassDeclaration */: {
+                    var modifiers = ts.createNodeArray(ensureModifiers(input, isPrivate));
+                    var typeParameters = ensureTypeParams(input, input.typeParameters);
+                    var ctor = ts.getFirstConstructorWithBody(input);
+                    var parameterProperties = void 0;
+                    if (ctor) {
+                        var oldDiag_1 = getSymbolAccessibilityDiagnostic;
+                        parameterProperties = ts.compact(ts.flatMap(ctor.parameters, function (param) {
+                            if (!ts.hasModifier(param, 92 /* ParameterPropertyModifier */))
+                                return;
+                            getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(param);
+                            if (param.name.kind === 72 /* Identifier */) {
+                                return preserveJsDoc(ts.createProperty(
+                                /*decorators*/ undefined, ensureModifiers(param), param.name, param.questionToken, ensureType(param, param.type), ensureNoInitializer(param)), param);
+                            }
+                            else {
+                                // Pattern - this is currently an error, but we emit declarations for it somewhat correctly
+                                return walkBindingPattern(param.name);
+                            }
+                            function walkBindingPattern(pattern) {
+                                var elems;
+                                for (var _i = 0, _a = pattern.elements; _i < _a.length; _i++) {
+                                    var elem = _a[_i];
+                                    if (ts.isOmittedExpression(elem))
+                                        continue;
+                                    if (ts.isBindingPattern(elem.name)) {
+                                        elems = ts.concatenate(elems, walkBindingPattern(elem.name));
+                                    }
+                                    elems = elems || [];
+                                    elems.push(ts.createProperty(
+                                    /*decorators*/ undefined, ensureModifiers(param), elem.name, 
+                                    /*questionToken*/ undefined, ensureType(elem, /*type*/ undefined), 
+                                    /*initializer*/ undefined));
+                                }
+                                return elems;
+                            }
+                        }));
+                        getSymbolAccessibilityDiagnostic = oldDiag_1;
+                    }
+                    var members = ts.createNodeArray(ts.concatenate(parameterProperties, ts.visitNodes(input.members, visitDeclarationSubtree)));
+                    var extendsClause_1 = ts.getEffectiveBaseTypeNode(input);
+                    if (extendsClause_1 && !ts.isEntityNameExpression(extendsClause_1.expression) && extendsClause_1.expression.kind !== 96 /* NullKeyword */) {
+                        // We must add a temporary declaration for the extends clause expression
+                        var oldId = input.name ? ts.unescapeLeadingUnderscores(input.name.escapedText) : "default";
+                        var newId_1 = ts.createOptimisticUniqueName(oldId + "_base");
+                        getSymbolAccessibilityDiagnostic = function () { return ({
+                            diagnosticMessage: ts.Diagnostics.extends_clause_of_exported_class_0_has_or_is_using_private_name_1,
+                            errorNode: extendsClause_1,
+                            typeName: input.name
+                        }); };
+                        var varDecl = ts.createVariableDeclaration(newId_1, resolver.createTypeOfExpression(extendsClause_1.expression, input, declarationEmitNodeBuilderFlags, symbolTracker), /*initializer*/ undefined);
+                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(125 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
+                        var heritageClauses = ts.createNodeArray(ts.map(input.heritageClauses, function (clause) {
+                            if (clause.token === 86 /* ExtendsKeyword */) {
+                                var oldDiag_2 = getSymbolAccessibilityDiagnostic;
+                                getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(clause.types[0]);
+                                var newClause = ts.updateHeritageClause(clause, ts.map(clause.types, function (t) { return ts.updateExpressionWithTypeArguments(t, ts.visitNodes(t.typeArguments, visitDeclarationSubtree), newId_1); }));
+                                getSymbolAccessibilityDiagnostic = oldDiag_2;
+                                return newClause;
+                            }
+                            return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) { return ts.isEntityNameExpression(t.expression) || t.expression.kind === 96 /* NullKeyword */; })), visitDeclarationSubtree));
+                        }));
+                        return [statement, cleanup(ts.updateClassDeclaration(input, 
+                            /*decorators*/ undefined, modifiers, input.name, typeParameters, heritageClauses, members))]; // TODO: GH#18217
+                    }
+                    else {
+                        var heritageClauses = transformHeritageClauses(input.heritageClauses);
+                        return cleanup(ts.updateClassDeclaration(input, 
+                        /*decorators*/ undefined, modifiers, input.name, typeParameters, heritageClauses, members));
+                    }
+                }
+                case 219 /* VariableStatement */: {
+                    return cleanup(transformVariableStatement(input, isPrivate));
+                }
+                case 243 /* EnumDeclaration */: {
+                    return cleanup(ts.updateEnumDeclaration(input, /*decorators*/ undefined, ts.createNodeArray(ensureModifiers(input, isPrivate)), input.name, ts.createNodeArray(ts.mapDefined(input.members, function (m) {
+                        if (shouldStripInternal(m))
+                            return;
+                        // Rewrite enum values to their constants, if available
+                        var constValue = resolver.getConstantValue(m);
+                        return preserveJsDoc(ts.updateEnumMember(m, m.name, constValue !== undefined ? ts.createLiteral(constValue) : undefined), m);
+                    }))));
+                }
+            }
+            // Anything left unhandled is an error, so this should be unreachable
+            return ts.Debug.assertNever(input, "Unhandled top-level node in declaration emit: " + ts.SyntaxKind[input.kind]);
+            function cleanup(node) {
+                if (isEnclosingDeclaration(input)) {
+                    enclosingDeclaration = previousEnclosingDeclaration;
+                }
+                if (canProdiceDiagnostic) {
+                    getSymbolAccessibilityDiagnostic = oldDiag;
+                }
+                if (input.kind === 244 /* ModuleDeclaration */) {
+                    needsDeclare = previousNeedsDeclare;
+                }
+                if (node === input) {
+                    return node;
+                }
+                return node && ts.setOriginalNode(preserveJsDoc(node, input), input);
+            }
+        }
+        function transformVariableStatement(input, privateDeclaration) {
+            if (!ts.forEach(input.declarationList.declarations, getBindingNameVisible))
+                return;
+            var nodes = ts.visitNodes(input.declarationList.declarations, visitDeclarationSubtree);
+            if (!ts.length(nodes))
+                return;
+            return ts.updateVariableStatement(input, ts.createNodeArray(ensureModifiers(input, privateDeclaration)), ts.updateVariableDeclarationList(input.declarationList, nodes));
+        }
+        function recreateBindingPattern(d) {
+            return ts.flatten(ts.mapDefined(d.elements, function (e) { return recreateBindingElement(e); }));
+        }
+        function recreateBindingElement(e) {
+            if (e.kind === 210 /* OmittedExpression */) {
+                return;
+            }
+            if (e.name) {
+                if (!getBindingNameVisible(e))
+                    return;
+                if (ts.isBindingPattern(e.name)) {
+                    return recreateBindingPattern(e.name);
+                }
+                else {
+                    return ts.createVariableDeclaration(e.name, ensureType(e, /*type*/ undefined), /*initializer*/ undefined);
+                }
+            }
+        }
+        function checkName(node) {
+            var oldDiag;
+            if (!suppressNewDiagnosticContexts) {
+                oldDiag = getSymbolAccessibilityDiagnostic;
+                getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNodeName(node);
+            }
+            errorNameNode = node.name;
+            ts.Debug.assert(resolver.isLateBound(ts.getParseTreeNode(node))); // Should only be called with dynamic names
+            var decl = node;
+            var entityName = decl.name.expression;
+            checkEntityNameVisibility(entityName, enclosingDeclaration);
+            if (!suppressNewDiagnosticContexts) {
+                getSymbolAccessibilityDiagnostic = oldDiag;
+            }
+            errorNameNode = undefined;
+        }
+        function hasInternalAnnotation(range) {
+            var comment = currentSourceFile.text.substring(range.pos, range.end);
+            return ts.stringContains(comment, "@internal");
+        }
+        function shouldStripInternal(node) {
+            if (stripInternal && node) {
+                var leadingCommentRanges = ts.getLeadingCommentRangesOfNode(ts.getParseTreeNode(node), currentSourceFile);
+                if (ts.forEach(leadingCommentRanges, hasInternalAnnotation)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        function isScopeMarker(node) {
+            return ts.isExportAssignment(node) || ts.isExportDeclaration(node);
+        }
+        function hasScopeMarker(node) {
+            if (ts.isModuleBlock(node)) {
+                return ts.some(node.statements, isScopeMarker);
+            }
+            return false;
+        }
+        function ensureModifiers(node, privateDeclaration) {
+            var currentFlags = ts.getModifierFlags(node);
+            var newFlags = ensureModifierFlags(node, privateDeclaration);
+            if (currentFlags === newFlags) {
+                return node.modifiers;
+            }
+            return ts.createModifiersFromModifierFlags(newFlags);
+        }
+        function ensureModifierFlags(node, privateDeclaration) {
+            var mask = 3071 /* All */ ^ (4 /* Public */ | 256 /* Async */); // No async modifiers in declaration files
+            var additions = (needsDeclare && !isAlwaysType(node)) ? 2 /* Ambient */ : 0 /* None */;
+            var parentIsFile = node.parent.kind === 279 /* SourceFile */;
+            if (!parentIsFile || (isBundledEmit && parentIsFile && ts.isExternalModule(node.parent))) {
+                mask ^= ((privateDeclaration || (isBundledEmit && parentIsFile) || hasScopeMarker(node.parent) ? 0 : 1 /* Export */) | 2 /* Ambient */);
+                additions = 0 /* None */;
+            }
+            return maskModifierFlags(node, mask, additions);
+        }
+        function ensureAccessor(node) {
+            var accessors = resolver.getAllAccessorDeclarations(node);
+            if (node.kind !== accessors.firstAccessor.kind) {
+                return;
+            }
+            var accessorType = getTypeAnnotationFromAccessor(node);
+            if (!accessorType && accessors.secondAccessor) {
+                accessorType = getTypeAnnotationFromAccessor(accessors.secondAccessor);
+                // If we end up pulling the type from the second accessor, we also need to change the diagnostic context to get the expected error message
+                getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(accessors.secondAccessor);
+            }
+            var prop = ts.createProperty(/*decorators*/ undefined, maskModifiers(node, /*mask*/ undefined, (!accessors.setAccessor) ? 64 /* Readonly */ : 0 /* None */), node.name, node.questionToken, ensureType(node, accessorType), /*initializer*/ undefined);
+            var leadingsSyntheticCommentRanges = accessors.secondAccessor && ts.getLeadingCommentRangesOfNode(accessors.secondAccessor, currentSourceFile);
+            if (leadingsSyntheticCommentRanges) {
+                var _loop_10 = function (range) {
+                    if (range.kind === 3 /* MultiLineCommentTrivia */) {
+                        var text = currentSourceFile.text.slice(range.pos + 2, range.end - 2);
+                        var lines = text.split(/\r\n?|\n/g);
+                        if (lines.length > 1) {
+                            var lastLines = lines.slice(1);
+                            var indentation_1 = ts.guessIndentation(lastLines);
+                            text = [lines[0]].concat(ts.map(lastLines, function (l) { return l.slice(indentation_1); })).join(newLine);
+                        }
+                        ts.addSyntheticLeadingComment(prop, range.kind, text, range.hasTrailingNewLine);
+                    }
+                };
+                for (var _i = 0, leadingsSyntheticCommentRanges_1 = leadingsSyntheticCommentRanges; _i < leadingsSyntheticCommentRanges_1.length; _i++) {
+                    var range = leadingsSyntheticCommentRanges_1[_i];
+                    _loop_10(range);
+                }
+            }
+            return prop;
+        }
+        function transformHeritageClauses(nodes) {
+            return ts.createNodeArray(ts.filter(ts.map(nodes, function (clause) { return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) {
+                return ts.isEntityNameExpression(t.expression) || (clause.token === 86 /* ExtendsKeyword */ && t.expression.kind === 96 /* NullKeyword */);
+            })), visitDeclarationSubtree)); }), function (clause) { return clause.types && !!clause.types.length; }));
+        }
+    }
+    ts.transformDeclarations = transformDeclarations;
+    function isAlwaysType(node) {
+        if (node.kind === 241 /* InterfaceDeclaration */) {
+            return true;
+        }
+        return false;
+    }
+    // Elide "public" modifier, as it is the default
+    function maskModifiers(node, modifierMask, modifierAdditions) {
+        return ts.createModifiersFromModifierFlags(maskModifierFlags(node, modifierMask, modifierAdditions));
+    }
+    function maskModifierFlags(node, modifierMask, modifierAdditions) {
+        if (modifierMask === void 0) { modifierMask = 3071 /* All */ ^ 4 /* Public */; }
+        if (modifierAdditions === void 0) { modifierAdditions = 0 /* None */; }
+        var flags = (ts.getModifierFlags(node) & modifierMask) | modifierAdditions;
+        if (flags & 512 /* Default */ && !(flags & 1 /* Export */)) {
+            // A non-exported default is a nonsequitor - we usually try to remove all export modifiers
+            // from statements in ambient declarations; but a default export must retain its export modifier to be syntactically valid
+            flags ^= 1 /* Export */;
+        }
+        if (flags & 512 /* Default */ && flags & 2 /* Ambient */) {
+            flags ^= 2 /* Ambient */; // `declare` is never required alongside `default` (and would be an error if printed)
+        }
+        return flags;
+    }
+    function getTypeAnnotationFromAccessor(accessor) {
+        if (accessor) {
+            return accessor.kind === 158 /* GetAccessor */
+                ? accessor.type // Getter - return type
+                : accessor.parameters.length > 0
+                    ? accessor.parameters[0].type // Setter parameter type
+                    : undefined;
+        }
+    }
+    function canHaveLiteralInitializer(node) {
+        switch (node.kind) {
+            case 154 /* PropertyDeclaration */:
+            case 153 /* PropertySignature */:
+                return !ts.hasModifier(node, 8 /* Private */);
+            case 151 /* Parameter */:
+            case 237 /* VariableDeclaration */:
+                return true;
+        }
+        return false;
+    }
+    function isPreservedDeclarationStatement(node) {
+        switch (node.kind) {
+            case 239 /* FunctionDeclaration */:
+            case 244 /* ModuleDeclaration */:
+            case 248 /* ImportEqualsDeclaration */:
+            case 241 /* InterfaceDeclaration */:
+            case 240 /* ClassDeclaration */:
+            case 242 /* TypeAliasDeclaration */:
+            case 243 /* EnumDeclaration */:
+            case 219 /* VariableStatement */:
+            case 249 /* ImportDeclaration */:
+            case 255 /* ExportDeclaration */:
+            case 254 /* ExportAssignment */:
+                return true;
+        }
+        return false;
+    }
+    function isProcessedComponent(node) {
+        switch (node.kind) {
+            case 161 /* ConstructSignature */:
+            case 157 /* Constructor */:
+            case 156 /* MethodDeclaration */:
+            case 158 /* GetAccessor */:
+            case 159 /* SetAccessor */:
+            case 154 /* PropertyDeclaration */:
+            case 153 /* PropertySignature */:
+            case 155 /* MethodSignature */:
+            case 160 /* CallSignature */:
+            case 162 /* IndexSignature */:
+            case 237 /* VariableDeclaration */:
+            case 150 /* TypeParameter */:
+            case 211 /* ExpressionWithTypeArguments */:
+            case 164 /* TypeReference */:
+            case 175 /* ConditionalType */:
+            case 165 /* FunctionType */:
+            case 166 /* ConstructorType */:
+            case 183 /* ImportType */:
+                return true;
+        }
+        return false;
+    }
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    function getModuleTransformer(moduleKind) {
+        switch (moduleKind) {
+            case ts.ModuleKind.ESNext:
+            case ts.ModuleKind.ES2015:
+                return ts.transformES2015Module;
+            case ts.ModuleKind.System:
+                return ts.transformSystemModule;
+            default:
+                return ts.transformModule;
+        }
+    }
+    var TransformationState;
+    (function (TransformationState) {
+        TransformationState[TransformationState["Uninitialized"] = 0] = "Uninitialized";
+        TransformationState[TransformationState["Initialized"] = 1] = "Initialized";
+        TransformationState[TransformationState["Completed"] = 2] = "Completed";
+        TransformationState[TransformationState["Disposed"] = 3] = "Disposed";
+    })(TransformationState || (TransformationState = {}));
+    var SyntaxKindFeatureFlags;
+    (function (SyntaxKindFeatureFlags) {
+        SyntaxKindFeatureFlags[SyntaxKindFeatureFlags["Substitution"] = 1] = "Substitution";
+        SyntaxKindFeatureFlags[SyntaxKindFeatureFlags["EmitNotifications"] = 2] = "EmitNotifications";
+    })(SyntaxKindFeatureFlags || (SyntaxKindFeatureFlags = {}));
+    function getTransformers(compilerOptions, customTransformers) {
+        var jsx = compilerOptions.jsx;
+        var languageVersion = ts.getEmitScriptTarget(compilerOptions);
+        var moduleKind = ts.getEmitModuleKind(compilerOptions);
+        var transformers = [];
+        ts.addRange(transformers, customTransformers && customTransformers.before);
+        transformers.push(ts.transformTypeScript);
+        if (jsx === 2 /* React */) {
+            transformers.push(ts.transformJsx);
+        }
+        if (languageVersion < 6 /* ESNext */) {
+            transformers.push(ts.transformESNext);
+        }
+        if (languageVersion < 4 /* ES2017 */) {
+            transformers.push(ts.transformES2017);
+        }
+        if (languageVersion < 3 /* ES2016 */) {
+            transformers.push(ts.transformES2016);
+        }
+        if (languageVersion < 2 /* ES2015 */) {
+            transformers.push(ts.transformES2015);
+            transformers.push(ts.transformGenerators);
+        }
+        transformers.push(getModuleTransformer(moduleKind));
+        // The ES5 transformer is last so that it can substitute expressions like `exports.default`
+        // for ES3.
+        if (languageVersion < 1 /* ES5 */) {
+            transformers.push(ts.transformES5);
+        }
+        ts.addRange(transformers, customTransformers && customTransformers.after);
+        return transformers;
+    }
+    ts.getTransformers = getTransformers;
+    function noEmitSubstitution(_hint, node) {
+        return node;
+    }
+    ts.noEmitSubstitution = noEmitSubstitution;
+    function noEmitNotification(hint, node, callback) {
+        callback(hint, node);
+    }
+    ts.noEmitNotification = noEmitNotification;
+    /**
+     * Transforms an array of SourceFiles by passing them through each transformer.
+     *
+     * @param resolver The emit resolver provided by the checker.
+     * @param host The emit host object used to interact with the file system.
+     * @param options Compiler options to surface in the `TransformationContext`.
+     * @param nodes An array of nodes to transform.
+     * @param transforms An array of `TransformerFactory` callbacks.
+     * @param allowDtsFiles A value indicating whether to allow the transformation of .d.ts files.
+     */
+    function transformNodes(resolver, host, options, nodes, transformers, allowDtsFiles) {
+        var enabledSyntaxKindFeatures = new Array(312 /* Count */);
+        var lexicalEnvironmentVariableDeclarations;
+        var lexicalEnvironmentFunctionDeclarations;
+        var lexicalEnvironmentVariableDeclarationsStack = [];
+        var lexicalEnvironmentFunctionDeclarationsStack = [];
+        var lexicalEnvironmentStackOffset = 0;
+        var lexicalEnvironmentSuspended = false;
+        var emitHelpers;
+        var onSubstituteNode = noEmitSubstitution;
+        var onEmitNode = noEmitNotification;
+        var state = 0 /* Uninitialized */;
+        var diagnostics = [];
+        // The transformation context is provided to each transformer as part of transformer
+        // initialization.
+        var context = {
+            getCompilerOptions: function () { return options; },
+            getEmitResolver: function () { return resolver; },
+            getEmitHost: function () { return host; },
+            startLexicalEnvironment: startLexicalEnvironment,
+            suspendLexicalEnvironment: suspendLexicalEnvironment,
+            resumeLexicalEnvironment: resumeLexicalEnvironment,
+            endLexicalEnvironment: endLexicalEnvironment,
+            hoistVariableDeclaration: hoistVariableDeclaration,
+            hoistFunctionDeclaration: hoistFunctionDeclaration,
+            requestEmitHelper: requestEmitHelper,
+            readEmitHelpers: readEmitHelpers,
+            enableSubstitution: enableSubstitution,
+            enableEmitNotification: enableEmitNotification,
+            isSubstitutionEnabled: isSubstitutionEnabled,
+            isEmitNotificationEnabled: isEmitNotificationEnabled,
+            get onSubstituteNode() { return onSubstituteNode; },
+            set onSubstituteNode(value) {
+                ts.Debug.assert(state < 1 /* Initialized */, "Cannot modify transformation hooks after initialization has completed.");
+                ts.Debug.assert(value !== undefined, "Value must not be 'undefined'");
+                onSubstituteNode = value;
+            },
+            get onEmitNode() { return onEmitNode; },
+            set onEmitNode(value) {
+                ts.Debug.assert(state < 1 /* Initialized */, "Cannot modify transformation hooks after initialization has completed.");
+                ts.Debug.assert(value !== undefined, "Value must not be 'undefined'");
+                onEmitNode = value;
+            },
+            addDiagnostic: function (diag) {
+                diagnostics.push(diag);
+            }
+        };
+        // Ensure the parse tree is clean before applying transformations
+        for (var _i = 0, nodes_4 = nodes; _i < nodes_4.length; _i++) {
+            var node = nodes_4[_i];
+            ts.disposeEmitNodes(ts.getSourceFileOfNode(ts.getParseTreeNode(node)));
+        }
+        ts.performance.mark("beforeTransform");
+        // Chain together and initialize each transformer.
+        var transformation = ts.chain.apply(void 0, transformers)(context);
+        // prevent modification of transformation hooks.
+        state = 1 /* Initialized */;
+        // Transform each node.
+        var transformed = ts.map(nodes, allowDtsFiles ? transformation : transformRoot);
+        // prevent modification of the lexical environment.
+        state = 2 /* Completed */;
+        ts.performance.mark("afterTransform");
+        ts.performance.measure("transformTime", "beforeTransform", "afterTransform");
+        return {
+            transformed: transformed,
+            substituteNode: substituteNode,
+            emitNodeWithNotification: emitNodeWithNotification,
+            dispose: dispose,
+            diagnostics: diagnostics
+        };
+        function transformRoot(node) {
+            return node && (!ts.isSourceFile(node) || !node.isDeclarationFile) ? transformation(node) : node;
+        }
+        /**
+         * Enables expression substitutions in the pretty printer for the provided SyntaxKind.
+         */
+        function enableSubstitution(kind) {
+            ts.Debug.assert(state < 2 /* Completed */, "Cannot modify the transformation context after transformation has completed.");
+            enabledSyntaxKindFeatures[kind] |= 1 /* Substitution */;
+        }
+        /**
+         * Determines whether expression substitutions are enabled for the provided node.
+         */
+        function isSubstitutionEnabled(node) {
+            return (enabledSyntaxKindFeatures[node.kind] & 1 /* Substitution */) !== 0
+                && (ts.getEmitFlags(node) & 4 /* NoSubstitution */) === 0;
+        }
+        /**
+         * Emits a node with possible substitution.
+         *
+         * @param hint A hint as to the intended usage of the node.
+         * @param node The node to emit.
+         * @param emitCallback The callback used to emit the node or its substitute.
+         */
+        function substituteNode(hint, node) {
+            ts.Debug.assert(state < 3 /* Disposed */, "Cannot substitute a node after the result is disposed.");
+            return node && isSubstitutionEnabled(node) && onSubstituteNode(hint, node) || node;
+        }
+        /**
+         * Enables before/after emit notifications in the pretty printer for the provided SyntaxKind.
+         */
+        function enableEmitNotification(kind) {
+            ts.Debug.assert(state < 2 /* Completed */, "Cannot modify the transformation context after transformation has completed.");
+            enabledSyntaxKindFeatures[kind] |= 2 /* EmitNotifications */;
+        }
+        /**
+         * Determines whether before/after emit notifications should be raised in the pretty
+         * printer when it emits a node.
+         */
+        function isEmitNotificationEnabled(node) {
+            return (enabledSyntaxKindFeatures[node.kind] & 2 /* EmitNotifications */) !== 0
+                || (ts.getEmitFlags(node) & 2 /* AdviseOnEmitNode */) !== 0;
+        }
+        /**
+         * Emits a node with possible emit notification.
+         *
+         * @param hint A hint as to the intended usage of the node.
+         * @param node The node to emit.
+         * @param emitCallback The callback used to emit the node.
+         */
+        function emitNodeWithNotification(hint, node, emitCallback) {
+            ts.Debug.assert(state < 3 /* Disposed */, "Cannot invoke TransformationResult callbacks after the result is disposed.");
+            if (node) {
+                if (isEmitNotificationEnabled(node)) {
+                    onEmitNode(hint, node, emitCallback);
+                }
+                else {
+                    emitCallback(hint, node);
+                }
+            }
+        }
+        /**
+         * Records a hoisted variable declaration for the provided name within a lexical environment.
+         */
+        function hoistVariableDeclaration(name) {
+            ts.Debug.assert(state > 0 /* Uninitialized */, "Cannot modify the lexical environment during initialization.");
+            ts.Debug.assert(state < 2 /* Completed */, "Cannot modify the lexical environment after transformation has completed.");
+            var decl = ts.setEmitFlags(ts.createVariableDeclaration(name), 64 /* NoNestedSourceMaps */);
+            if (!lexicalEnvironmentVariableDeclarations) {
+                lexicalEnvironmentVariableDeclarations = [decl];
+            }
+            else {
+                lexicalEnvironmentVariableDeclarations.push(decl);
+            }
+        }
+        /**
+         * Records a hoisted function declaration within a lexical environment.
+         */
+        function hoistFunctionDeclaration(func) {
+            ts.Debug.assert(state > 0 /* Uninitialized */, "Cannot modify the lexical environment during initialization.");
+            ts.Debug.assert(state < 2 /* Completed */, "Cannot modify the lexical environment after transformation has completed.");
+            if (!lexicalEnvironmentFunctionDeclarations) {
+                lexicalEnvironmentFunctionDeclarations = [func];
+            }
+            else {
+                lexicalEnvironmentFunctionDeclarations.push(func);
+            }
+        }
+        /**
+         * Starts a new lexical environment. Any existing hoisted variable or function declarations
+         * are pushed onto a stack, and the related storage variables are reset.
+         */
+        function startLexicalEnvironment() {
+            ts.Debug.assert(state > 0 /* Uninitialized */, "Cannot modify the lexical environment during initialization.");
+            ts.Debug.assert(state < 2 /* Completed */, "Cannot modify the lexical environment after transformation has completed.");
+            ts.Debug.assert(!lexicalEnvironmentSuspended, "Lexical environment is suspended.");
+            // Save the current lexical environment. Rather than resizing the array we adjust the
+            // stack size variable. This allows us to reuse existing array slots we've
+            // already allocated between transformations to avoid allocation and GC overhead during
+            // transformation.
+            lexicalEnvironmentVariableDeclarationsStack[lexicalEnvironmentStackOffset] = lexicalEnvironmentVariableDeclarations;
+            lexicalEnvironmentFunctionDeclarationsStack[lexicalEnvironmentStackOffset] = lexicalEnvironmentFunctionDeclarations;
+            lexicalEnvironmentStackOffset++;
+            lexicalEnvironmentVariableDeclarations = undefined;
+            lexicalEnvironmentFunctionDeclarations = undefined;
+        }
+        /** Suspends the current lexical environment, usually after visiting a parameter list. */
+        function suspendLexicalEnvironment() {
+            ts.Debug.assert(state > 0 /* Uninitialized */, "Cannot modify the lexical environment during initialization.");
+            ts.Debug.assert(state < 2 /* Completed */, "Cannot modify the lexical environment after transformation has completed.");
+            ts.Debug.assert(!lexicalEnvironmentSuspended, "Lexical environment is already suspended.");
+            lexicalEnvironmentSuspended = true;
+        }
+        /** Resumes a suspended lexical environment, usually before visiting a function body. */
+        function resumeLexicalEnvironment() {
+            ts.Debug.assert(state > 0 /* Uninitialized */, "Cannot modify the lexical environment during initialization.");
+            ts.Debug.assert(state < 2 /* Completed */, "Cannot modify the lexical environment after transformation has completed.");
+            ts.Debug.assert(lexicalEnvironmentSuspended, "Lexical environment is not suspended.");
+            lexicalEnvironmentSuspended = false;
+        }
+        /**
+         * Ends a lexical environment. The previous set of hoisted declarations are restored and
+         * any hoisted declarations added in this environment are returned.
+         */
+        function endLexicalEnvironment() {
+            ts.Debug.assert(state > 0 /* Uninitialized */, "Cannot modify the lexical environment during initialization.");
+            ts.Debug.assert(state < 2 /* Completed */, "Cannot modify the lexical environment after transformation has completed.");
+            ts.Debug.assert(!lexicalEnvironmentSuspended, "Lexical environment is suspended.");
+            var statements;
+            if (lexicalEnvironmentVariableDeclarations || lexicalEnvironmentFunctionDeclarations) {
+                if (lexicalEnvironmentFunctionDeclarations) {
+                    statements = lexicalEnvironmentFunctionDeclarations.slice();
+                }
+                if (lexicalEnvironmentVariableDeclarations) {
+                    var statement = ts.createVariableStatement(
+                    /*modifiers*/ undefined, ts.createVariableDeclarationList(lexicalEnvironmentVariableDeclarations));
+                    if (!statements) {
+                        statements = [statement];
+                    }
+                    else {
+                        statements.push(statement);
+                    }
+                }
+            }
+            // Restore the previous lexical environment.
+            lexicalEnvironmentStackOffset--;
+            lexicalEnvironmentVariableDeclarations = lexicalEnvironmentVariableDeclarationsStack[lexicalEnvironmentStackOffset];
+            lexicalEnvironmentFunctionDeclarations = lexicalEnvironmentFunctionDeclarationsStack[lexicalEnvironmentStackOffset];
+            if (lexicalEnvironmentStackOffset === 0) {
+                lexicalEnvironmentVariableDeclarationsStack = [];
+                lexicalEnvironmentFunctionDeclarationsStack = [];
+            }
+            return statements;
+        }
+        function requestEmitHelper(helper) {
+            ts.Debug.assert(state > 0 /* Uninitialized */, "Cannot modify the transformation context during initialization.");
+            ts.Debug.assert(state < 2 /* Completed */, "Cannot modify the transformation context after transformation has completed.");
+            ts.Debug.assert(!helper.scoped, "Cannot request a scoped emit helper.");
+            emitHelpers = ts.append(emitHelpers, helper);
+        }
+        function readEmitHelpers() {
+            ts.Debug.assert(state > 0 /* Uninitialized */, "Cannot modify the transformation context during initialization.");
+            ts.Debug.assert(state < 2 /* Completed */, "Cannot modify the transformation context after transformation has completed.");
+            var helpers = emitHelpers;
+            emitHelpers = undefined;
+            return helpers;
+        }
+        function dispose() {
+            if (state < 3 /* Disposed */) {
+                // Clean up emit nodes on parse tree
+                for (var _i = 0, nodes_5 = nodes; _i < nodes_5.length; _i++) {
+                    var node = nodes_5[_i];
+                    ts.disposeEmitNodes(ts.getSourceFileOfNode(ts.getParseTreeNode(node)));
+                }
+                // Release references to external entries for GC purposes.
+                lexicalEnvironmentVariableDeclarations = undefined;
+                lexicalEnvironmentVariableDeclarationsStack = undefined;
+                lexicalEnvironmentFunctionDeclarations = undefined;
+                lexicalEnvironmentFunctionDeclarationsStack = undefined;
+                onSubstituteNode = undefined;
+                onEmitNode = undefined;
+                emitHelpers = undefined;
+                // Prevent further use of the transformation result.
+                state = 3 /* Disposed */;
+            }
+        }
+    }
+    ts.transformNodes = transformNodes;
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    var infoExtension = ".tsbundleinfo";
+    var brackets = createBracketsMap();
+    var syntheticParent = { pos: -1, end: -1 };
+    /*@internal*/
+    /**
+     * Iterates over the source files that are expected to have an emit output.
+     *
+     * @param host An EmitHost.
+     * @param action The action to execute.
+     * @param sourceFilesOrTargetSourceFile
+     *   If an array, the full list of source files to emit.
+     *   Else, calls `getSourceFilesToEmit` with the (optional) target source file to determine the list of source files to emit.
+     */
+    function forEachEmittedFile(host, action, sourceFilesOrTargetSourceFile, emitOnlyDtsFiles) {
+        if (emitOnlyDtsFiles === void 0) { emitOnlyDtsFiles = false; }
+        var sourceFiles = ts.isArray(sourceFilesOrTargetSourceFile) ? sourceFilesOrTargetSourceFile : ts.getSourceFilesToEmit(host, sourceFilesOrTargetSourceFile);
+        var options = host.getCompilerOptions();
+        if (options.outFile || options.out) {
+            if (sourceFiles.length) {
+                var bundle = ts.createBundle(sourceFiles, host.getPrependNodes());
+                var result = action(getOutputPathsFor(bundle, host, emitOnlyDtsFiles), bundle);
+                if (result) {
+                    return result;
+                }
+            }
+        }
+        else {
+            for (var _a = 0, sourceFiles_1 = sourceFiles; _a < sourceFiles_1.length; _a++) {
+                var sourceFile = sourceFiles_1[_a];
+                var result = action(getOutputPathsFor(sourceFile, host, emitOnlyDtsFiles), sourceFile);
+                if (result) {
+                    return result;
+                }
+            }
+        }
+    }
+    ts.forEachEmittedFile = forEachEmittedFile;
+    /*@internal*/
+    function getOutputPathsForBundle(options, forceDtsPaths) {
+        var outPath = options.outFile || options.out;
+        var jsFilePath = options.emitDeclarationOnly ? undefined : outPath;
+        var sourceMapFilePath = jsFilePath && getSourceMapFilePath(jsFilePath, options);
+        var declarationFilePath = (forceDtsPaths || ts.getEmitDeclarations(options)) ? ts.removeFileExtension(outPath) + ".d.ts" /* Dts */ : undefined;
+        var declarationMapPath = declarationFilePath && ts.getAreDeclarationMapsEnabled(options) ? declarationFilePath + ".map" : undefined;
+        var bundleInfoPath = options.references && jsFilePath ? (ts.removeFileExtension(jsFilePath) + infoExtension) : undefined;
+        return { jsFilePath: jsFilePath, sourceMapFilePath: sourceMapFilePath, declarationFilePath: declarationFilePath, declarationMapPath: declarationMapPath, bundleInfoPath: bundleInfoPath };
+    }
+    ts.getOutputPathsForBundle = getOutputPathsForBundle;
+    /*@internal*/
+    function getOutputPathsFor(sourceFile, host, forceDtsPaths) {
+        var options = host.getCompilerOptions();
+        if (sourceFile.kind === 280 /* Bundle */) {
+            return getOutputPathsForBundle(options, forceDtsPaths);
+        }
+        else {
+            var ownOutputFilePath = ts.getOwnEmitOutputFilePath(sourceFile.fileName, host, getOutputExtension(sourceFile, options));
+            // If json file emits to the same location skip writing it, if emitDeclarationOnly skip writing it
+            var isJsonEmittedToSameLocation = ts.isJsonSourceFile(sourceFile) &&
+                ts.comparePaths(sourceFile.fileName, ownOutputFilePath, host.getCurrentDirectory(), !host.useCaseSensitiveFileNames()) === 0 /* EqualTo */;
+            var jsFilePath = options.emitDeclarationOnly || isJsonEmittedToSameLocation ? undefined : ownOutputFilePath;
+            var sourceMapFilePath = !jsFilePath || ts.isJsonSourceFile(sourceFile) ? undefined : getSourceMapFilePath(jsFilePath, options);
+            // For legacy reasons (ie, we have baselines capturing the behavior), js files don't report a .d.ts output path - this would only matter if `declaration` and `allowJs` were both on, which is currently an error
+            var isJs = ts.isSourceFileJS(sourceFile);
+            var declarationFilePath = ((forceDtsPaths || ts.getEmitDeclarations(options)) && !isJs) ? ts.getDeclarationEmitOutputFilePath(sourceFile.fileName, host) : undefined;
+            var declarationMapPath = declarationFilePath && ts.getAreDeclarationMapsEnabled(options) ? declarationFilePath + ".map" : undefined;
+            return { jsFilePath: jsFilePath, sourceMapFilePath: sourceMapFilePath, declarationFilePath: declarationFilePath, declarationMapPath: declarationMapPath, bundleInfoPath: undefined };
+        }
+    }
+    ts.getOutputPathsFor = getOutputPathsFor;
+    function getSourceMapFilePath(jsFilePath, options) {
+        return (options.sourceMap && !options.inlineSourceMap) ? jsFilePath + ".map" : undefined;
+    }
+    function createDefaultBundleInfo() {
+        return {
+            originalOffset: -1,
+            totalLength: -1
+        };
+    }
+    // JavaScript files are always LanguageVariant.JSX, as JSX syntax is allowed in .js files also.
+    // So for JavaScript files, '.jsx' is only emitted if the input was '.jsx', and JsxEmit.Preserve.
+    // For TypeScript, the only time to emit with a '.jsx' extension, is on JSX input, and JsxEmit.Preserve
+    /* @internal */
+    function getOutputExtension(sourceFile, options) {
+        if (ts.isJsonSourceFile(sourceFile)) {
+            return ".json" /* Json */;
+        }
+        if (options.jsx === 1 /* Preserve */) {
+            if (ts.isSourceFileJS(sourceFile)) {
+                if (ts.fileExtensionIs(sourceFile.fileName, ".jsx" /* Jsx */)) {
+                    return ".jsx" /* Jsx */;
+                }
+            }
+            else if (sourceFile.languageVariant === 1 /* JSX */) {
+                // TypeScript source file preserving JSX syntax
+                return ".jsx" /* Jsx */;
+            }
+        }
+        return ".js" /* Js */;
+    }
+    ts.getOutputExtension = getOutputExtension;
+    /*@internal*/
+    // targetSourceFile is when users only want one file in entire project to be emitted. This is used in compileOnSave feature
+    function emitFiles(resolver, host, targetSourceFile, emitOnlyDtsFiles, transformers, declarationTransformers) {
+        var compilerOptions = host.getCompilerOptions();
+        var sourceMapDataList = (compilerOptions.sourceMap || compilerOptions.inlineSourceMap || ts.getAreDeclarationMapsEnabled(compilerOptions)) ? [] : undefined;
+        var emittedFilesList = compilerOptions.listEmittedFiles ? [] : undefined;
+        var emitterDiagnostics = ts.createDiagnosticCollection();
+        var newLine = ts.getNewLineCharacter(compilerOptions, function () { return host.getNewLine(); });
+        var writer = ts.createTextWriter(newLine);
+        var _a = ts.performance.createTimer("printTime", "beforePrint", "afterPrint"), enter = _a.enter, exit = _a.exit;
+        var bundleInfo = createDefaultBundleInfo();
+        var emitSkipped = false;
+        var exportedModulesFromDeclarationEmit;
+        // Emit each output file
+        enter();
+        forEachEmittedFile(host, emitSourceFileOrBundle, ts.getSourceFilesToEmit(host, targetSourceFile), emitOnlyDtsFiles);
+        exit();
+        return {
+            emitSkipped: emitSkipped,
+            diagnostics: emitterDiagnostics.getDiagnostics(),
+            emittedFiles: emittedFilesList,
+            sourceMaps: sourceMapDataList,
+            exportedModulesFromDeclarationEmit: exportedModulesFromDeclarationEmit
+        };
+        function emitSourceFileOrBundle(_a, sourceFileOrBundle) {
+            var jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, bundleInfoPath = _a.bundleInfoPath;
+            emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, bundleInfoPath);
+            emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath);
+            if (!emitSkipped && emittedFilesList) {
+                if (!emitOnlyDtsFiles) {
+                    if (jsFilePath) {
+                        emittedFilesList.push(jsFilePath);
+                    }
+                    if (sourceMapFilePath) {
+                        emittedFilesList.push(sourceMapFilePath);
+                    }
+                    if (bundleInfoPath) {
+                        emittedFilesList.push(bundleInfoPath);
+                    }
+                }
+                if (declarationFilePath) {
+                    emittedFilesList.push(declarationFilePath);
+                }
+                if (declarationMapPath) {
+                    emittedFilesList.push(declarationMapPath);
+                }
+            }
+        }
+        function emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, bundleInfoPath) {
+            if (emitOnlyDtsFiles || !jsFilePath) {
+                return;
+            }
+            // Make sure not to write js file and source map file if any of them cannot be written
+            if ((jsFilePath && host.isEmitBlocked(jsFilePath)) || compilerOptions.noEmit) {
+                emitSkipped = true;
+                return;
+            }
+            // Transform the source files
+            var transform = ts.transformNodes(resolver, host, compilerOptions, [sourceFileOrBundle], transformers, /*allowDtsFiles*/ false);
+            var printerOptions = {
+                removeComments: compilerOptions.removeComments,
+                newLine: compilerOptions.newLine,
+                noEmitHelpers: compilerOptions.noEmitHelpers,
+                module: compilerOptions.module,
+                target: compilerOptions.target,
+                sourceMap: compilerOptions.sourceMap,
+                inlineSourceMap: compilerOptions.inlineSourceMap,
+                inlineSources: compilerOptions.inlineSources,
+                extendedDiagnostics: compilerOptions.extendedDiagnostics,
+            };
+            // Create a printer to print the nodes
+            var printer = createPrinter(printerOptions, {
+                // resolver hooks
+                hasGlobalName: resolver.hasGlobalName,
+                // transform hooks
+                onEmitNode: transform.emitNodeWithNotification,
+                substituteNode: transform.substituteNode,
+            });
+            ts.Debug.assert(transform.transformed.length === 1, "Should only see one output from the transform");
+            printSourceFileOrBundle(jsFilePath, sourceMapFilePath, transform.transformed[0], bundleInfoPath, printer, compilerOptions);
+            // Clean up emit nodes on parse tree
+            transform.dispose();
+        }
+        function emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath) {
+            if (!(declarationFilePath && !ts.isInJSFile(sourceFileOrBundle))) {
+                return;
+            }
+            var sourceFiles = ts.isSourceFile(sourceFileOrBundle) ? [sourceFileOrBundle] : sourceFileOrBundle.sourceFiles;
+            // Setup and perform the transformation to retrieve declarations from the input files
+            var nonJsFiles = ts.filter(sourceFiles, ts.isSourceFileNotJS);
+            var inputListOrBundle = (compilerOptions.outFile || compilerOptions.out) ? [ts.createBundle(nonJsFiles, !ts.isSourceFile(sourceFileOrBundle) ? sourceFileOrBundle.prepends : undefined)] : nonJsFiles;
+            if (emitOnlyDtsFiles && !ts.getEmitDeclarations(compilerOptions)) {
+                // Checker wont collect the linked aliases since thats only done when declaration is enabled.
+                // Do that here when emitting only dts files
+                nonJsFiles.forEach(collectLinkedAliases);
+            }
+            var declarationTransform = ts.transformNodes(resolver, host, compilerOptions, inputListOrBundle, ts.concatenate([ts.transformDeclarations], declarationTransformers), /*allowDtsFiles*/ false);
+            if (ts.length(declarationTransform.diagnostics)) {
+                for (var _a = 0, _b = declarationTransform.diagnostics; _a < _b.length; _a++) {
+                    var diagnostic = _b[_a];
+                    emitterDiagnostics.add(diagnostic);
+                }
+            }
+            var printerOptions = {
+                removeComments: compilerOptions.removeComments,
+                newLine: compilerOptions.newLine,
+                noEmitHelpers: true,
+                module: compilerOptions.module,
+                target: compilerOptions.target,
+                sourceMap: compilerOptions.sourceMap,
+                inlineSourceMap: compilerOptions.inlineSourceMap,
+                extendedDiagnostics: compilerOptions.extendedDiagnostics,
+                onlyPrintJsDocStyle: true,
+            };
+            var declarationPrinter = createPrinter(printerOptions, {
+                // resolver hooks
+                hasGlobalName: resolver.hasGlobalName,
+                // transform hooks
+                onEmitNode: declarationTransform.emitNodeWithNotification,
+                substituteNode: declarationTransform.substituteNode,
+            });
+            var declBlocked = (!!declarationTransform.diagnostics && !!declarationTransform.diagnostics.length) || !!host.isEmitBlocked(declarationFilePath) || !!compilerOptions.noEmit;
+            emitSkipped = emitSkipped || declBlocked;
+            if (!declBlocked || emitOnlyDtsFiles) {
+                ts.Debug.assert(declarationTransform.transformed.length === 1, "Should only see one output from the decl transform");
+                printSourceFileOrBundle(declarationFilePath, declarationMapPath, declarationTransform.transformed[0], /* bundleInfopath*/ undefined, declarationPrinter, {
+                    sourceMap: compilerOptions.declarationMap,
+                    sourceRoot: compilerOptions.sourceRoot,
+                    mapRoot: compilerOptions.mapRoot,
+                    extendedDiagnostics: compilerOptions.extendedDiagnostics,
+                });
+                if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === 279 /* SourceFile */) {
+                    var sourceFile = declarationTransform.transformed[0];
+                    exportedModulesFromDeclarationEmit = sourceFile.exportedModulesFromDeclarationEmit;
+                }
+            }
+            declarationTransform.dispose();
+        }
+        function collectLinkedAliases(node) {
+            if (ts.isExportAssignment(node)) {
+                if (node.expression.kind === 72 /* Identifier */) {
+                    resolver.collectLinkedAliases(node.expression, /*setVisibility*/ true);
+                }
+                return;
+            }
+            else if (ts.isExportSpecifier(node)) {
+                resolver.collectLinkedAliases(node.propertyName || node.name, /*setVisibility*/ true);
+                return;
+            }
+            ts.forEachChild(node, collectLinkedAliases);
+        }
+        function printSourceFileOrBundle(jsFilePath, sourceMapFilePath, sourceFileOrBundle, bundleInfoPath, printer, mapOptions) {
+            var bundle = sourceFileOrBundle.kind === 280 /* Bundle */ ? sourceFileOrBundle : undefined;
+            var sourceFile = sourceFileOrBundle.kind === 279 /* SourceFile */ ? sourceFileOrBundle : undefined;
+            var sourceFiles = bundle ? bundle.sourceFiles : [sourceFile];
+            var sourceMapGenerator;
+            if (shouldEmitSourceMaps(mapOptions, sourceFileOrBundle)) {
+                sourceMapGenerator = ts.createSourceMapGenerator(host, ts.getBaseFileName(ts.normalizeSlashes(jsFilePath)), getSourceRoot(mapOptions), getSourceMapDirectory(mapOptions, jsFilePath, sourceFile), mapOptions);
+            }
+            if (bundle) {
+                printer.writeBundle(bundle, bundleInfo, writer, sourceMapGenerator);
+            }
+            else {
+                printer.writeFile(sourceFile, writer, sourceMapGenerator);
+            }
+            if (sourceMapGenerator) {
+                if (sourceMapDataList) {
+                    sourceMapDataList.push({
+                        inputSourceFileNames: sourceMapGenerator.getSources(),
+                        sourceMap: sourceMapGenerator.toJSON()
+                    });
+                }
+                var sourceMappingURL = getSourceMappingURL(mapOptions, sourceMapGenerator, jsFilePath, sourceMapFilePath, sourceFile);
+                if (sourceMappingURL) {
+                    if (!writer.isAtStartOfLine())
+                        writer.rawWrite(newLine);
+                    writer.writeComment("//# " + "sourceMappingURL" + "=" + sourceMappingURL); // Tools can sometimes see this line as a source mapping url comment
+                }
+                // Write the source map
+                if (sourceMapFilePath) {
+                    var sourceMap = sourceMapGenerator.toString();
+                    ts.writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap, /*writeByteOrderMark*/ false, sourceFiles);
+                }
+            }
+            else {
+                writer.writeLine();
+            }
+            // Write the output file
+            ts.writeFile(host, emitterDiagnostics, jsFilePath, writer.getText(), !!compilerOptions.emitBOM, sourceFiles);
+            // Write bundled offset information if applicable
+            if (bundleInfoPath) {
+                bundleInfo.totalLength = writer.getTextPos();
+                ts.writeFile(host, emitterDiagnostics, bundleInfoPath, JSON.stringify(bundleInfo, undefined, 2), /*writeByteOrderMark*/ false);
+            }
+            // Reset state
+            writer.clear();
+            bundleInfo = createDefaultBundleInfo();
+        }
+        function shouldEmitSourceMaps(mapOptions, sourceFileOrBundle) {
+            return (mapOptions.sourceMap || mapOptions.inlineSourceMap)
+                && (sourceFileOrBundle.kind !== 279 /* SourceFile */ || !ts.fileExtensionIs(sourceFileOrBundle.fileName, ".json" /* Json */));
+        }
+        function getSourceRoot(mapOptions) {
+            // Normalize source root and make sure it has trailing "/" so that it can be used to combine paths with the
+            // relative paths of the sources list in the sourcemap
+            var sourceRoot = ts.normalizeSlashes(mapOptions.sourceRoot || "");
+            return sourceRoot ? ts.ensureTrailingDirectorySeparator(sourceRoot) : sourceRoot;
+        }
+        function getSourceMapDirectory(mapOptions, filePath, sourceFile) {
+            if (mapOptions.sourceRoot)
+                return host.getCommonSourceDirectory();
+            if (mapOptions.mapRoot) {
+                var sourceMapDir = ts.normalizeSlashes(mapOptions.mapRoot);
+                if (sourceFile) {
+                    // For modules or multiple emit files the mapRoot will have directory structure like the sources
+                    // So if src\a.ts and src\lib\b.ts are compiled together user would be moving the maps into mapRoot\a.js.map and mapRoot\lib\b.js.map
+                    sourceMapDir = ts.getDirectoryPath(ts.getSourceFilePathInNewDir(sourceFile.fileName, host, sourceMapDir));
+                }
+                if (ts.getRootLength(sourceMapDir) === 0) {
+                    // The relative paths are relative to the common directory
+                    sourceMapDir = ts.combinePaths(host.getCommonSourceDirectory(), sourceMapDir);
+                }
+                return sourceMapDir;
+            }
+            return ts.getDirectoryPath(ts.normalizePath(filePath));
+        }
+        function getSourceMappingURL(mapOptions, sourceMapGenerator, filePath, sourceMapFilePath, sourceFile) {
+            if (mapOptions.inlineSourceMap) {
+                // Encode the sourceMap into the sourceMap url
+                var sourceMapText = sourceMapGenerator.toString();
+                var base64SourceMapText = ts.base64encode(ts.sys, sourceMapText);
+                return "data:application/json;base64," + base64SourceMapText;
+            }
+            var sourceMapFile = ts.getBaseFileName(ts.normalizeSlashes(ts.Debug.assertDefined(sourceMapFilePath)));
+            if (mapOptions.mapRoot) {
+                var sourceMapDir = ts.normalizeSlashes(mapOptions.mapRoot);
+                if (sourceFile) {
+                    // For modules or multiple emit files the mapRoot will have directory structure like the sources
+                    // So if src\a.ts and src\lib\b.ts are compiled together user would be moving the maps into mapRoot\a.js.map and mapRoot\lib\b.js.map
+                    sourceMapDir = ts.getDirectoryPath(ts.getSourceFilePathInNewDir(sourceFile.fileName, host, sourceMapDir));
+                }
+                if (ts.getRootLength(sourceMapDir) === 0) {
+                    // The relative paths are relative to the common directory
+                    sourceMapDir = ts.combinePaths(host.getCommonSourceDirectory(), sourceMapDir);
+                    return ts.getRelativePathToDirectoryOrUrl(ts.getDirectoryPath(ts.normalizePath(filePath)), // get the relative sourceMapDir path based on jsFilePath
+                    ts.combinePaths(sourceMapDir, sourceMapFile), // this is where user expects to see sourceMap
+                    host.getCurrentDirectory(), host.getCanonicalFileName, 
+                    /*isAbsolutePathAnUrl*/ true);
+                }
+                else {
+                    return ts.combinePaths(sourceMapDir, sourceMapFile);
+                }
+            }
+            return sourceMapFile;
+        }
+    }
+    ts.emitFiles = emitFiles;
+    var PipelinePhase;
+    (function (PipelinePhase) {
+        PipelinePhase[PipelinePhase["Notification"] = 0] = "Notification";
+        PipelinePhase[PipelinePhase["Substitution"] = 1] = "Substitution";
+        PipelinePhase[PipelinePhase["Comments"] = 2] = "Comments";
+        PipelinePhase[PipelinePhase["SourceMaps"] = 3] = "SourceMaps";
+        PipelinePhase[PipelinePhase["Emit"] = 4] = "Emit";
+    })(PipelinePhase || (PipelinePhase = {}));
+    function createPrinter(printerOptions, handlers) {
+        if (printerOptions === void 0) { printerOptions = {}; }
+        if (handlers === void 0) { handlers = {}; }
+        var hasGlobalName = handlers.hasGlobalName, _a = handlers.onEmitNode, onEmitNode = _a === void 0 ? ts.noEmitNotification : _a, _b = handlers.substituteNode, substituteNode = _b === void 0 ? ts.noEmitSubstitution : _b, onBeforeEmitNodeArray = handlers.onBeforeEmitNodeArray, onAfterEmitNodeArray = handlers.onAfterEmitNodeArray, onBeforeEmitToken = handlers.onBeforeEmitToken, onAfterEmitToken = handlers.onAfterEmitToken;
+        var extendedDiagnostics = !!printerOptions.extendedDiagnostics;
+        var newLine = ts.getNewLineCharacter(printerOptions);
+        var moduleKind = ts.getEmitModuleKind(printerOptions);
+        var bundledHelpers = ts.createMap();
+        var currentSourceFile;
+        var nodeIdToGeneratedName; // Map of generated names for specific nodes.
+        var autoGeneratedIdToGeneratedName; // Map of generated names for temp and loop variables.
+        var generatedNames; // Set of names generated by the NameGenerator.
+        var tempFlagsStack; // Stack of enclosing name generation scopes.
+        var tempFlags; // TempFlags for the current name generation scope.
+        var reservedNamesStack; // Stack of TempFlags reserved in enclosing name generation scopes.
+        var reservedNames; // TempFlags to reserve in nested name generation scopes.
+        var writer;
+        var ownWriter; // Reusable `EmitTextWriter` for basic printing.
+        var write = writeBase;
+        var isOwnFileEmit;
+        // Source Maps
+        var sourceMapsDisabled = true;
+        var sourceMapGenerator;
+        var sourceMapSource;
+        var sourceMapSourceIndex = -1;
+        // Comments
+        var containerPos = -1;
+        var containerEnd = -1;
+        var declarationListContainerEnd = -1;
+        var currentLineMap;
+        var detachedCommentsInfo;
+        var hasWrittenComment = false;
+        var commentsDisabled = !!printerOptions.removeComments;
+        var _c = ts.performance.createTimerIf(extendedDiagnostics, "commentTime", "beforeComment", "afterComment"), enterComment = _c.enter, exitComment = _c.exit;
+        reset();
+        return {
+            // public API
+            printNode: printNode,
+            printList: printList,
+            printFile: printFile,
+            printBundle: printBundle,
+            // internal API
+            writeNode: writeNode,
+            writeList: writeList,
+            writeFile: writeFile,
+            writeBundle: writeBundle
+        };
+        function printNode(hint, node, sourceFile) {
+            switch (hint) {
+                case 0 /* SourceFile */:
+                    ts.Debug.assert(ts.isSourceFile(node), "Expected a SourceFile node.");
+                    break;
+                case 2 /* IdentifierName */:
+                    ts.Debug.assert(ts.isIdentifier(node), "Expected an Identifier node.");
+                    break;
+                case 1 /* Expression */:
+                    ts.Debug.assert(ts.isExpression(node), "Expected an Expression node.");
+                    break;
+            }
+            switch (node.kind) {
+                case 279 /* SourceFile */: return printFile(node);
+                case 280 /* Bundle */: return printBundle(node);
+                case 281 /* UnparsedSource */: return printUnparsedSource(node);
+            }
+            writeNode(hint, node, sourceFile, beginPrint());
+            return endPrint();
+        }
+        function printList(format, nodes, sourceFile) {
+            writeList(format, nodes, sourceFile, beginPrint());
+            return endPrint();
+        }
+        function printBundle(bundle) {
+            writeBundle(bundle, /*bundleInfo*/ undefined, beginPrint(), /*sourceMapEmitter*/ undefined);
+            return endPrint();
+        }
+        function printFile(sourceFile) {
+            writeFile(sourceFile, beginPrint(), /*sourceMapEmitter*/ undefined);
+            return endPrint();
+        }
+        function printUnparsedSource(unparsed) {
+            writeUnparsedSource(unparsed, beginPrint());
+            return endPrint();
+        }
+        function writeNode(hint, node, sourceFile, output) {
+            var previousWriter = writer;
+            setWriter(output, /*_sourceMapGenerator*/ undefined);
+            print(hint, node, sourceFile);
+            reset();
+            writer = previousWriter;
+        }
+        function writeList(format, nodes, sourceFile, output) {
+            var previousWriter = writer;
+            setWriter(output, /*_sourceMapGenerator*/ undefined);
+            if (sourceFile) {
+                setSourceFile(sourceFile);
+            }
+            emitList(syntheticParent, nodes, format);
+            reset();
+            writer = previousWriter;
+        }
+        function writeBundle(bundle, bundleInfo, output, sourceMapGenerator) {
+            isOwnFileEmit = false;
+            var previousWriter = writer;
+            setWriter(output, sourceMapGenerator);
+            emitShebangIfNeeded(bundle);
+            emitPrologueDirectivesIfNeeded(bundle);
+            emitHelpers(bundle);
+            emitSyntheticTripleSlashReferencesIfNeeded(bundle);
+            for (var _a = 0, _b = bundle.prepends; _a < _b.length; _a++) {
+                var prepend = _b[_a];
+                writeLine();
+                print(4 /* Unspecified */, prepend, /*sourceFile*/ undefined);
+            }
+            if (bundleInfo) {
+                bundleInfo.originalOffset = writer.getTextPos();
+            }
+            for (var _c = 0, _d = bundle.sourceFiles; _c < _d.length; _c++) {
+                var sourceFile = _d[_c];
+                print(0 /* SourceFile */, sourceFile, sourceFile);
+            }
+            reset();
+            writer = previousWriter;
+        }
+        function writeUnparsedSource(unparsed, output) {
+            var previousWriter = writer;
+            setWriter(output, /*_sourceMapGenerator*/ undefined);
+            print(4 /* Unspecified */, unparsed, /*sourceFile*/ undefined);
+            reset();
+            writer = previousWriter;
+        }
+        function writeFile(sourceFile, output, sourceMapGenerator) {
+            isOwnFileEmit = true;
+            var previousWriter = writer;
+            setWriter(output, sourceMapGenerator);
+            emitShebangIfNeeded(sourceFile);
+            emitPrologueDirectivesIfNeeded(sourceFile);
+            print(0 /* SourceFile */, sourceFile, sourceFile);
+            reset();
+            writer = previousWriter;
+        }
+        function beginPrint() {
+            return ownWriter || (ownWriter = ts.createTextWriter(newLine));
+        }
+        function endPrint() {
+            var text = ownWriter.getText();
+            ownWriter.clear();
+            return text;
+        }
+        function print(hint, node, sourceFile) {
+            if (sourceFile) {
+                setSourceFile(sourceFile);
+            }
+            var pipelinePhase = getPipelinePhase(0 /* Notification */, node);
+            pipelinePhase(hint, node);
+        }
+        function setSourceFile(sourceFile) {
+            currentSourceFile = sourceFile;
+            currentLineMap = undefined;
+            detachedCommentsInfo = undefined;
+            if (sourceFile) {
+                setSourceMapSource(sourceFile);
+            }
+        }
+        function setWriter(_writer, _sourceMapGenerator) {
+            if (_writer && printerOptions.omitTrailingSemicolon) {
+                _writer = ts.getTrailingSemicolonOmittingWriter(_writer);
+            }
+            writer = _writer; // TODO: GH#18217
+            sourceMapGenerator = _sourceMapGenerator;
+            sourceMapsDisabled = !writer || !sourceMapGenerator;
+        }
+        function reset() {
+            nodeIdToGeneratedName = [];
+            autoGeneratedIdToGeneratedName = [];
+            generatedNames = ts.createMap();
+            tempFlagsStack = [];
+            tempFlags = 0 /* Auto */;
+            reservedNamesStack = [];
+            currentSourceFile = undefined;
+            currentLineMap = undefined;
+            detachedCommentsInfo = undefined;
+            setWriter(/*output*/ undefined, /*_sourceMapGenerator*/ undefined);
+        }
+        function getCurrentLineMap() {
+            return currentLineMap || (currentLineMap = ts.getLineStarts(currentSourceFile));
+        }
+        function emit(node) {
+            if (node === undefined)
+                return;
+            var pipelinePhase = getPipelinePhase(0 /* Notification */, node);
+            pipelinePhase(4 /* Unspecified */, node);
+        }
+        function emitIdentifierName(node) {
+            if (node === undefined)
+                return;
+            var pipelinePhase = getPipelinePhase(0 /* Notification */, node);
+            pipelinePhase(2 /* IdentifierName */, node);
+        }
+        function emitExpression(node) {
+            if (node === undefined)
+                return;
+            var pipelinePhase = getPipelinePhase(0 /* Notification */, node);
+            pipelinePhase(1 /* Expression */, node);
+        }
+        function getPipelinePhase(phase, node) {
+            switch (phase) {
+                case 0 /* Notification */:
+                    if (onEmitNode !== ts.noEmitNotification) {
+                        return pipelineEmitWithNotification;
+                    }
+                // falls through
+                case 1 /* Substitution */:
+                    if (substituteNode !== ts.noEmitSubstitution) {
+                        return pipelineEmitWithSubstitution;
+                    }
+                // falls through
+                case 2 /* Comments */:
+                    if (!commentsDisabled && node.kind !== 279 /* SourceFile */) {
+                        return pipelineEmitWithComments;
+                    }
+                // falls through
+                case 3 /* SourceMaps */:
+                    if (!sourceMapsDisabled && node.kind !== 279 /* SourceFile */ && !ts.isInJsonFile(node)) {
+                        return pipelineEmitWithSourceMap;
+                    }
+                // falls through
+                case 4 /* Emit */:
+                    return pipelineEmitWithHint;
+                default:
+                    return ts.Debug.assertNever(phase);
+            }
+        }
+        function getNextPipelinePhase(currentPhase, node) {
+            return getPipelinePhase(currentPhase + 1, node);
+        }
+        function pipelineEmitWithNotification(hint, node) {
+            var pipelinePhase = getNextPipelinePhase(0 /* Notification */, node);
+            onEmitNode(hint, node, pipelinePhase);
+        }
+        function pipelineEmitWithHint(hint, node) {
+            if (hint === 0 /* SourceFile */)
+                return emitSourceFile(ts.cast(node, ts.isSourceFile));
+            if (hint === 2 /* IdentifierName */)
+                return emitIdentifier(ts.cast(node, ts.isIdentifier));
+            if (hint === 3 /* MappedTypeParameter */)
+                return emitMappedTypeParameter(ts.cast(node, ts.isTypeParameterDeclaration));
+            if (hint === 5 /* EmbeddedStatement */) {
+                ts.Debug.assertNode(node, ts.isEmptyStatement);
+                return emitEmptyStatement(/*isEmbeddedStatement*/ true);
+            }
+            if (hint === 4 /* Unspecified */) {
+                if (ts.isKeyword(node.kind))
+                    return writeTokenNode(node, writeKeyword);
+                switch (node.kind) {
+                    // Pseudo-literals
+                    case 15 /* TemplateHead */:
+                    case 16 /* TemplateMiddle */:
+                    case 17 /* TemplateTail */:
+                        return emitLiteral(node);
+                    case 281 /* UnparsedSource */:
+                        return emitUnparsedSource(node);
+                    // Identifiers
+                    case 72 /* Identifier */:
+                        return emitIdentifier(node);
+                    // Parse tree nodes
+                    // Names
+                    case 148 /* QualifiedName */:
+                        return emitQualifiedName(node);
+                    case 149 /* ComputedPropertyName */:
+                        return emitComputedPropertyName(node);
+                    // Signature elements
+                    case 150 /* TypeParameter */:
+                        return emitTypeParameter(node);
+                    case 151 /* Parameter */:
+                        return emitParameter(node);
+                    case 152 /* Decorator */:
+                        return emitDecorator(node);
+                    // Type members
+                    case 153 /* PropertySignature */:
+                        return emitPropertySignature(node);
+                    case 154 /* PropertyDeclaration */:
+                        return emitPropertyDeclaration(node);
+                    case 155 /* MethodSignature */:
+                        return emitMethodSignature(node);
+                    case 156 /* MethodDeclaration */:
+                        return emitMethodDeclaration(node);
+                    case 157 /* Constructor */:
+                        return emitConstructor(node);
+                    case 158 /* GetAccessor */:
+                    case 159 /* SetAccessor */:
+                        return emitAccessorDeclaration(node);
+                    case 160 /* CallSignature */:
+                        return emitCallSignature(node);
+                    case 161 /* ConstructSignature */:
+                        return emitConstructSignature(node);
+                    case 162 /* IndexSignature */:
+                        return emitIndexSignature(node);
+                    // Types
+                    case 163 /* TypePredicate */:
+                        return emitTypePredicate(node);
+                    case 164 /* TypeReference */:
+                        return emitTypeReference(node);
+                    case 165 /* FunctionType */:
+                        return emitFunctionType(node);
+                    case 289 /* JSDocFunctionType */:
+                        return emitJSDocFunctionType(node);
+                    case 166 /* ConstructorType */:
+                        return emitConstructorType(node);
+                    case 167 /* TypeQuery */:
+                        return emitTypeQuery(node);
+                    case 168 /* TypeLiteral */:
+                        return emitTypeLiteral(node);
+                    case 169 /* ArrayType */:
+                        return emitArrayType(node);
+                    case 170 /* TupleType */:
+                        return emitTupleType(node);
+                    case 171 /* OptionalType */:
+                        return emitOptionalType(node);
+                    case 173 /* UnionType */:
+                        return emitUnionType(node);
+                    case 174 /* IntersectionType */:
+                        return emitIntersectionType(node);
+                    case 175 /* ConditionalType */:
+                        return emitConditionalType(node);
+                    case 176 /* InferType */:
+                        return emitInferType(node);
+                    case 177 /* ParenthesizedType */:
+                        return emitParenthesizedType(node);
+                    case 211 /* ExpressionWithTypeArguments */:
+                        return emitExpressionWithTypeArguments(node);
+                    case 178 /* ThisType */:
+                        return emitThisType();
+                    case 179 /* TypeOperator */:
+                        return emitTypeOperator(node);
+                    case 180 /* IndexedAccessType */:
+                        return emitIndexedAccessType(node);
+                    case 181 /* MappedType */:
+                        return emitMappedType(node);
+                    case 182 /* LiteralType */:
+                        return emitLiteralType(node);
+                    case 183 /* ImportType */:
+                        return emitImportTypeNode(node);
+                    case 284 /* JSDocAllType */:
+                        writePunctuation("*");
+                        return;
+                    case 285 /* JSDocUnknownType */:
+                        writePunctuation("?");
+                        return;
+                    case 286 /* JSDocNullableType */:
+                        return emitJSDocNullableType(node);
+                    case 287 /* JSDocNonNullableType */:
+                        return emitJSDocNonNullableType(node);
+                    case 288 /* JSDocOptionalType */:
+                        return emitJSDocOptionalType(node);
+                    case 172 /* RestType */:
+                    case 290 /* JSDocVariadicType */:
+                        return emitRestOrJSDocVariadicType(node);
+                    // Binding patterns
+                    case 184 /* ObjectBindingPattern */:
+                        return emitObjectBindingPattern(node);
+                    case 185 /* ArrayBindingPattern */:
+                        return emitArrayBindingPattern(node);
+                    case 186 /* BindingElement */:
+                        return emitBindingElement(node);
+                    // Misc
+                    case 216 /* TemplateSpan */:
+                        return emitTemplateSpan(node);
+                    case 217 /* SemicolonClassElement */:
+                        return emitSemicolonClassElement();
+                    // Statements
+                    case 218 /* Block */:
+                        return emitBlock(node);
+                    case 219 /* VariableStatement */:
+                        return emitVariableStatement(node);
+                    case 220 /* EmptyStatement */:
+                        return emitEmptyStatement(/*isEmbeddedStatement*/ false);
+                    case 221 /* ExpressionStatement */:
+                        return emitExpressionStatement(node);
+                    case 222 /* IfStatement */:
+                        return emitIfStatement(node);
+                    case 223 /* DoStatement */:
+                        return emitDoStatement(node);
+                    case 224 /* WhileStatement */:
+                        return emitWhileStatement(node);
+                    case 225 /* ForStatement */:
+                        return emitForStatement(node);
+                    case 226 /* ForInStatement */:
+                        return emitForInStatement(node);
+                    case 227 /* ForOfStatement */:
+                        return emitForOfStatement(node);
+                    case 228 /* ContinueStatement */:
+                        return emitContinueStatement(node);
+                    case 229 /* BreakStatement */:
+                        return emitBreakStatement(node);
+                    case 230 /* ReturnStatement */:
+                        return emitReturnStatement(node);
+                    case 231 /* WithStatement */:
+                        return emitWithStatement(node);
+                    case 232 /* SwitchStatement */:
+                        return emitSwitchStatement(node);
+                    case 233 /* LabeledStatement */:
+                        return emitLabeledStatement(node);
+                    case 234 /* ThrowStatement */:
+                        return emitThrowStatement(node);
+                    case 235 /* TryStatement */:
+                        return emitTryStatement(node);
+                    case 236 /* DebuggerStatement */:
+                        return emitDebuggerStatement(node);
+                    // Declarations
+                    case 237 /* VariableDeclaration */:
+                        return emitVariableDeclaration(node);
+                    case 238 /* VariableDeclarationList */:
+                        return emitVariableDeclarationList(node);
+                    case 239 /* FunctionDeclaration */:
+                        return emitFunctionDeclaration(node);
+                    case 240 /* ClassDeclaration */:
+                        return emitClassDeclaration(node);
+                    case 241 /* InterfaceDeclaration */:
+                        return emitInterfaceDeclaration(node);
+                    case 242 /* TypeAliasDeclaration */:
+                        return emitTypeAliasDeclaration(node);
+                    case 243 /* EnumDeclaration */:
+                        return emitEnumDeclaration(node);
+                    case 244 /* ModuleDeclaration */:
+                        return emitModuleDeclaration(node);
+                    case 245 /* ModuleBlock */:
+                        return emitModuleBlock(node);
+                    case 246 /* CaseBlock */:
+                        return emitCaseBlock(node);
+                    case 247 /* NamespaceExportDeclaration */:
+                        return emitNamespaceExportDeclaration(node);
+                    case 248 /* ImportEqualsDeclaration */:
+                        return emitImportEqualsDeclaration(node);
+                    case 249 /* ImportDeclaration */:
+                        return emitImportDeclaration(node);
+                    case 250 /* ImportClause */:
+                        return emitImportClause(node);
+                    case 251 /* NamespaceImport */:
+                        return emitNamespaceImport(node);
+                    case 252 /* NamedImports */:
+                        return emitNamedImports(node);
+                    case 253 /* ImportSpecifier */:
+                        return emitImportSpecifier(node);
+                    case 254 /* ExportAssignment */:
+                        return emitExportAssignment(node);
+                    case 255 /* ExportDeclaration */:
+                        return emitExportDeclaration(node);
+                    case 256 /* NamedExports */:
+                        return emitNamedExports(node);
+                    case 257 /* ExportSpecifier */:
+                        return emitExportSpecifier(node);
+                    case 258 /* MissingDeclaration */:
+                        return;
+                    // Module references
+                    case 259 /* ExternalModuleReference */:
+                        return emitExternalModuleReference(node);
+                    // JSX (non-expression)
+                    case 11 /* JsxText */:
+                        return emitJsxText(node);
+                    case 262 /* JsxOpeningElement */:
+                    case 265 /* JsxOpeningFragment */:
+                        return emitJsxOpeningElementOrFragment(node);
+                    case 263 /* JsxClosingElement */:
+                    case 266 /* JsxClosingFragment */:
+                        return emitJsxClosingElementOrFragment(node);
+                    case 267 /* JsxAttribute */:
+                        return emitJsxAttribute(node);
+                    case 268 /* JsxAttributes */:
+                        return emitJsxAttributes(node);
+                    case 269 /* JsxSpreadAttribute */:
+                        return emitJsxSpreadAttribute(node);
+                    case 270 /* JsxExpression */:
+                        return emitJsxExpression(node);
+                    // Clauses
+                    case 271 /* CaseClause */:
+                        return emitCaseClause(node);
+                    case 272 /* DefaultClause */:
+                        return emitDefaultClause(node);
+                    case 273 /* HeritageClause */:
+                        return emitHeritageClause(node);
+                    case 274 /* CatchClause */:
+                        return emitCatchClause(node);
+                    // Property assignments
+                    case 275 /* PropertyAssignment */:
+                        return emitPropertyAssignment(node);
+                    case 276 /* ShorthandPropertyAssignment */:
+                        return emitShorthandPropertyAssignment(node);
+                    case 277 /* SpreadAssignment */:
+                        return emitSpreadAssignment(node);
+                    // Enum
+                    case 278 /* EnumMember */:
+                        return emitEnumMember(node);
+                    // JSDoc nodes (only used in codefixes currently)
+                    case 299 /* JSDocParameterTag */:
+                    case 305 /* JSDocPropertyTag */:
+                        return emitJSDocPropertyLikeTag(node);
+                    case 300 /* JSDocReturnTag */:
+                    case 302 /* JSDocTypeTag */:
+                    case 301 /* JSDocThisTag */:
+                    case 298 /* JSDocEnumTag */:
+                        return emitJSDocSimpleTypedTag(node);
+                    case 295 /* JSDocAugmentsTag */:
+                        return emitJSDocAugmentsTag(node);
+                    case 303 /* JSDocTemplateTag */:
+                        return emitJSDocTemplateTag(node);
+                    case 304 /* JSDocTypedefTag */:
+                        return emitJSDocTypedefTag(node);
+                    case 297 /* JSDocCallbackTag */:
+                        return emitJSDocCallbackTag(node);
+                    case 293 /* JSDocSignature */:
+                        return emitJSDocSignature(node);
+                    case 292 /* JSDocTypeLiteral */:
+                        return emitJSDocTypeLiteral(node);
+                    case 296 /* JSDocClassTag */:
+                    case 294 /* JSDocTag */:
+                        return emitJSDocSimpleTag(node);
+                    case 291 /* JSDocComment */:
+                        return emitJSDoc(node);
+                    // Transformation nodes (ignored)
+                }
+                if (ts.isExpression(node)) {
+                    hint = 1 /* Expression */;
+                    if (substituteNode !== ts.noEmitSubstitution) {
+                        node = substituteNode(hint, node);
+                    }
+                }
+                else if (ts.isToken(node)) {
+                    return writeTokenNode(node, writePunctuation);
+                }
+            }
+            if (hint === 1 /* Expression */) {
+                switch (node.kind) {
+                    // Literals
+                    case 8 /* NumericLiteral */:
+                    case 9 /* BigIntLiteral */:
+                        return emitNumericOrBigIntLiteral(node);
+                    case 10 /* StringLiteral */:
+                    case 13 /* RegularExpressionLiteral */:
+                    case 14 /* NoSubstitutionTemplateLiteral */:
+                        return emitLiteral(node);
+                    // Identifiers
+                    case 72 /* Identifier */:
+                        return emitIdentifier(node);
+                    // Reserved words
+                    case 87 /* FalseKeyword */:
+                    case 96 /* NullKeyword */:
+                    case 98 /* SuperKeyword */:
+                    case 102 /* TrueKeyword */:
+                    case 100 /* ThisKeyword */:
+                    case 92 /* ImportKeyword */:
+                        writeTokenNode(node, writeKeyword);
+                        return;
+                    // Expressions
+                    case 187 /* ArrayLiteralExpression */:
+                        return emitArrayLiteralExpression(node);
+                    case 188 /* ObjectLiteralExpression */:
+                        return emitObjectLiteralExpression(node);
+                    case 189 /* PropertyAccessExpression */:
+                        return emitPropertyAccessExpression(node);
+                    case 190 /* ElementAccessExpression */:
+                        return emitElementAccessExpression(node);
+                    case 191 /* CallExpression */:
+                        return emitCallExpression(node);
+                    case 192 /* NewExpression */:
+                        return emitNewExpression(node);
+                    case 193 /* TaggedTemplateExpression */:
+                        return emitTaggedTemplateExpression(node);
+                    case 194 /* TypeAssertionExpression */:
+                        return emitTypeAssertionExpression(node);
+                    case 195 /* ParenthesizedExpression */:
+                        return emitParenthesizedExpression(node);
+                    case 196 /* FunctionExpression */:
+                        return emitFunctionExpression(node);
+                    case 197 /* ArrowFunction */:
+                        return emitArrowFunction(node);
+                    case 198 /* DeleteExpression */:
+                        return emitDeleteExpression(node);
+                    case 199 /* TypeOfExpression */:
+                        return emitTypeOfExpression(node);
+                    case 200 /* VoidExpression */:
+                        return emitVoidExpression(node);
+                    case 201 /* AwaitExpression */:
+                        return emitAwaitExpression(node);
+                    case 202 /* PrefixUnaryExpression */:
+                        return emitPrefixUnaryExpression(node);
+                    case 203 /* PostfixUnaryExpression */:
+                        return emitPostfixUnaryExpression(node);
+                    case 204 /* BinaryExpression */:
+                        return emitBinaryExpression(node);
+                    case 205 /* ConditionalExpression */:
+                        return emitConditionalExpression(node);
+                    case 206 /* TemplateExpression */:
+                        return emitTemplateExpression(node);
+                    case 207 /* YieldExpression */:
+                        return emitYieldExpression(node);
+                    case 208 /* SpreadElement */:
+                        return emitSpreadExpression(node);
+                    case 209 /* ClassExpression */:
+                        return emitClassExpression(node);
+                    case 210 /* OmittedExpression */:
+                        return;
+                    case 212 /* AsExpression */:
+                        return emitAsExpression(node);
+                    case 213 /* NonNullExpression */:
+                        return emitNonNullExpression(node);
+                    case 214 /* MetaProperty */:
+                        return emitMetaProperty(node);
+                    // JSX
+                    case 260 /* JsxElement */:
+                        return emitJsxElement(node);
+                    case 261 /* JsxSelfClosingElement */:
+                        return emitJsxSelfClosingElement(node);
+                    case 264 /* JsxFragment */:
+                        return emitJsxFragment(node);
+                    // Transformation nodes
+                    case 308 /* PartiallyEmittedExpression */:
+                        return emitPartiallyEmittedExpression(node);
+                    case 309 /* CommaListExpression */:
+                        return emitCommaList(node);
+                }
+            }
+        }
+        function emitMappedTypeParameter(node) {
+            emit(node.name);
+            writeSpace();
+            writeKeyword("in");
+            writeSpace();
+            emit(node.constraint);
+        }
+        function pipelineEmitWithSubstitution(hint, node) {
+            var pipelinePhase = getNextPipelinePhase(1 /* Substitution */, node);
+            pipelinePhase(hint, substituteNode(hint, node));
+        }
+        function emitHelpers(node) {
+            var helpersEmitted = false;
+            var bundle = node.kind === 280 /* Bundle */ ? node : undefined;
+            if (bundle && moduleKind === ts.ModuleKind.None) {
+                return;
+            }
+            var numNodes = bundle ? bundle.sourceFiles.length : 1;
+            for (var i = 0; i < numNodes; i++) {
+                var currentNode = bundle ? bundle.sourceFiles[i] : node;
+                var sourceFile = ts.isSourceFile(currentNode) ? currentNode : currentSourceFile;
+                var shouldSkip = printerOptions.noEmitHelpers || ts.getExternalHelpersModuleName(sourceFile) !== undefined;
+                var shouldBundle = ts.isSourceFile(currentNode) && !isOwnFileEmit;
+                var helpers = ts.getEmitHelpers(currentNode);
+                if (helpers) {
+                    for (var _a = 0, _b = ts.stableSort(helpers, ts.compareEmitHelpers); _a < _b.length; _a++) {
+                        var helper = _b[_a];
+                        if (!helper.scoped) {
+                            // Skip the helper if it can be skipped and the noEmitHelpers compiler
+                            // option is set, or if it can be imported and the importHelpers compiler
+                            // option is set.
+                            if (shouldSkip)
+                                continue;
+                            // Skip the helper if it can be bundled but hasn't already been emitted and we
+                            // are emitting a bundled module.
+                            if (shouldBundle) {
+                                if (bundledHelpers.get(helper.name)) {
+                                    continue;
+                                }
+                                bundledHelpers.set(helper.name, true);
+                            }
+                        }
+                        else if (bundle) {
+                            // Skip the helper if it is scoped and we are emitting bundled helpers
+                            continue;
+                        }
+                        if (typeof helper.text === "string") {
+                            writeLines(helper.text);
+                        }
+                        else {
+                            writeLines(helper.text(makeFileLevelOptimisticUniqueName));
+                        }
+                        helpersEmitted = true;
+                    }
+                }
+            }
+            return helpersEmitted;
+        }
+        //
+        // Literals/Pseudo-literals
+        //
+        // SyntaxKind.NumericLiteral
+        // SyntaxKind.BigIntLiteral
+        function emitNumericOrBigIntLiteral(node) {
+            emitLiteral(node);
+        }
+        // SyntaxKind.StringLiteral
+        // SyntaxKind.RegularExpressionLiteral
+        // SyntaxKind.NoSubstitutionTemplateLiteral
+        // SyntaxKind.TemplateHead
+        // SyntaxKind.TemplateMiddle
+        // SyntaxKind.TemplateTail
+        function emitLiteral(node) {
+            var text = getLiteralTextOfNode(node, printerOptions.neverAsciiEscape);
+            if ((printerOptions.sourceMap || printerOptions.inlineSourceMap)
+                && (node.kind === 10 /* StringLiteral */ || ts.isTemplateLiteralKind(node.kind))) {
+                writeLiteral(text);
+            }
+            else {
+                // Quick info expects all literals to be called with writeStringLiteral, as there's no specific type for numberLiterals
+                writeStringLiteral(text);
+            }
+        }
+        // SyntaxKind.UnparsedSource
+        function emitUnparsedSource(unparsed) {
+            writer.rawWrite(unparsed.text);
+        }
+        //
+        // Identifiers
+        //
+        function emitIdentifier(node) {
+            var writeText = node.symbol ? writeSymbol : write;
+            writeText(getTextOfNode(node, /*includeTrivia*/ false), node.symbol);
+            emitList(node, node.typeArguments, 53776 /* TypeParameters */); // Call emitList directly since it could be an array of TypeParameterDeclarations _or_ type arguments
+        }
+        //
+        // Names
+        //
+        function emitQualifiedName(node) {
+            emitEntityName(node.left);
+            writePunctuation(".");
+            emit(node.right);
+        }
+        function emitEntityName(node) {
+            if (node.kind === 72 /* Identifier */) {
+                emitExpression(node);
+            }
+            else {
+                emit(node);
+            }
+        }
+        function emitComputedPropertyName(node) {
+            writePunctuation("[");
+            emitExpression(node.expression);
+            writePunctuation("]");
+        }
+        //
+        // Signature elements
+        //
+        function emitTypeParameter(node) {
+            emit(node.name);
+            if (node.constraint) {
+                writeSpace();
+                writeKeyword("extends");
+                writeSpace();
+                emit(node.constraint);
+            }
+            if (node.default) {
+                writeSpace();
+                writeOperator("=");
+                writeSpace();
+                emit(node.default);
+            }
+        }
+        function emitParameter(node) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emit(node.dotDotDotToken);
+            emitNodeWithWriter(node.name, writeParameter);
+            emit(node.questionToken);
+            if (node.parent && node.parent.kind === 289 /* JSDocFunctionType */ && !node.name) {
+                emit(node.type);
+            }
+            else {
+                emitTypeAnnotation(node.type);
+            }
+            // The comment position has to fallback to any present node within the parameterdeclaration because as it turns out, the parser can make parameter declarations with _just_ an initializer.
+            emitInitializer(node.initializer, node.type ? node.type.end : node.questionToken ? node.questionToken.end : node.name ? node.name.end : node.modifiers ? node.modifiers.end : node.decorators ? node.decorators.end : node.pos, node);
+        }
+        function emitDecorator(decorator) {
+            writePunctuation("@");
+            emitExpression(decorator.expression);
+        }
+        //
+        // Type members
+        //
+        function emitPropertySignature(node) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emitNodeWithWriter(node.name, writeProperty);
+            emit(node.questionToken);
+            emitTypeAnnotation(node.type);
+            writeTrailingSemicolon();
+        }
+        function emitPropertyDeclaration(node) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emit(node.name);
+            emit(node.questionToken);
+            emit(node.exclamationToken);
+            emitTypeAnnotation(node.type);
+            emitInitializer(node.initializer, node.type ? node.type.end : node.questionToken ? node.questionToken.end : node.name.end, node);
+            writeTrailingSemicolon();
+        }
+        function emitMethodSignature(node) {
+            pushNameGenerationScope(node);
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emit(node.name);
+            emit(node.questionToken);
+            emitTypeParameters(node, node.typeParameters);
+            emitParameters(node, node.parameters);
+            emitTypeAnnotation(node.type);
+            writeTrailingSemicolon();
+            popNameGenerationScope(node);
+        }
+        function emitMethodDeclaration(node) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emit(node.asteriskToken);
+            emit(node.name);
+            emit(node.questionToken);
+            emitSignatureAndBody(node, emitSignatureHead);
+        }
+        function emitConstructor(node) {
+            emitModifiers(node, node.modifiers);
+            writeKeyword("constructor");
+            emitSignatureAndBody(node, emitSignatureHead);
+        }
+        function emitAccessorDeclaration(node) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            writeKeyword(node.kind === 158 /* GetAccessor */ ? "get" : "set");
+            writeSpace();
+            emit(node.name);
+            emitSignatureAndBody(node, emitSignatureHead);
+        }
+        function emitCallSignature(node) {
+            pushNameGenerationScope(node);
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emitTypeParameters(node, node.typeParameters);
+            emitParameters(node, node.parameters);
+            emitTypeAnnotation(node.type);
+            writeTrailingSemicolon();
+            popNameGenerationScope(node);
+        }
+        function emitConstructSignature(node) {
+            pushNameGenerationScope(node);
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            writeKeyword("new");
+            writeSpace();
+            emitTypeParameters(node, node.typeParameters);
+            emitParameters(node, node.parameters);
+            emitTypeAnnotation(node.type);
+            writeTrailingSemicolon();
+            popNameGenerationScope(node);
+        }
+        function emitIndexSignature(node) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emitParametersForIndexSignature(node, node.parameters);
+            emitTypeAnnotation(node.type);
+            writeTrailingSemicolon();
+        }
+        function emitSemicolonClassElement() {
+            writeTrailingSemicolon();
+        }
+        //
+        // Types
+        //
+        function emitTypePredicate(node) {
+            emit(node.parameterName);
+            writeSpace();
+            writeKeyword("is");
+            writeSpace();
+            emit(node.type);
+        }
+        function emitTypeReference(node) {
+            emit(node.typeName);
+            emitTypeArguments(node, node.typeArguments);
+        }
+        function emitFunctionType(node) {
+            pushNameGenerationScope(node);
+            emitTypeParameters(node, node.typeParameters);
+            emitParametersForArrow(node, node.parameters);
+            writeSpace();
+            writePunctuation("=>");
+            writeSpace();
+            emit(node.type);
+            popNameGenerationScope(node);
+        }
+        function emitJSDocFunctionType(node) {
+            writeKeyword("function");
+            emitParameters(node, node.parameters);
+            writePunctuation(":");
+            emit(node.type);
+        }
+        function emitJSDocNullableType(node) {
+            writePunctuation("?");
+            emit(node.type);
+        }
+        function emitJSDocNonNullableType(node) {
+            writePunctuation("!");
+            emit(node.type);
+        }
+        function emitJSDocOptionalType(node) {
+            emit(node.type);
+            writePunctuation("=");
+        }
+        function emitConstructorType(node) {
+            pushNameGenerationScope(node);
+            writeKeyword("new");
+            writeSpace();
+            emitTypeParameters(node, node.typeParameters);
+            emitParameters(node, node.parameters);
+            writeSpace();
+            writePunctuation("=>");
+            writeSpace();
+            emit(node.type);
+            popNameGenerationScope(node);
+        }
+        function emitTypeQuery(node) {
+            writeKeyword("typeof");
+            writeSpace();
+            emit(node.exprName);
+        }
+        function emitTypeLiteral(node) {
+            writePunctuation("{");
+            var flags = ts.getEmitFlags(node) & 1 /* SingleLine */ ? 768 /* SingleLineTypeLiteralMembers */ : 32897 /* MultiLineTypeLiteralMembers */;
+            emitList(node, node.members, flags | 524288 /* NoSpaceIfEmpty */);
+            writePunctuation("}");
+        }
+        function emitArrayType(node) {
+            emit(node.elementType);
+            writePunctuation("[");
+            writePunctuation("]");
+        }
+        function emitRestOrJSDocVariadicType(node) {
+            writePunctuation("...");
+            emit(node.type);
+        }
+        function emitTupleType(node) {
+            writePunctuation("[");
+            emitList(node, node.elementTypes, 528 /* TupleTypeElements */);
+            writePunctuation("]");
+        }
+        function emitOptionalType(node) {
+            emit(node.type);
+            writePunctuation("?");
+        }
+        function emitUnionType(node) {
+            emitList(node, node.types, 516 /* UnionTypeConstituents */);
+        }
+        function emitIntersectionType(node) {
+            emitList(node, node.types, 520 /* IntersectionTypeConstituents */);
+        }
+        function emitConditionalType(node) {
+            emit(node.checkType);
+            writeSpace();
+            writeKeyword("extends");
+            writeSpace();
+            emit(node.extendsType);
+            writeSpace();
+            writePunctuation("?");
+            writeSpace();
+            emit(node.trueType);
+            writeSpace();
+            writePunctuation(":");
+            writeSpace();
+            emit(node.falseType);
+        }
+        function emitInferType(node) {
+            writeKeyword("infer");
+            writeSpace();
+            emit(node.typeParameter);
+        }
+        function emitParenthesizedType(node) {
+            writePunctuation("(");
+            emit(node.type);
+            writePunctuation(")");
+        }
+        function emitThisType() {
+            writeKeyword("this");
+        }
+        function emitTypeOperator(node) {
+            writeTokenText(node.operator, writeKeyword);
+            writeSpace();
+            emit(node.type);
+        }
+        function emitIndexedAccessType(node) {
+            emit(node.objectType);
+            writePunctuation("[");
+            emit(node.indexType);
+            writePunctuation("]");
+        }
+        function emitMappedType(node) {
+            var emitFlags = ts.getEmitFlags(node);
+            writePunctuation("{");
+            if (emitFlags & 1 /* SingleLine */) {
+                writeSpace();
+            }
+            else {
+                writeLine();
+                increaseIndent();
+            }
+            if (node.readonlyToken) {
+                emit(node.readonlyToken);
+                if (node.readonlyToken.kind !== 133 /* ReadonlyKeyword */) {
+                    writeKeyword("readonly");
+                }
+                writeSpace();
+            }
+            writePunctuation("[");
+            var pipelinePhase = getPipelinePhase(0 /* Notification */, node.typeParameter);
+            pipelinePhase(3 /* MappedTypeParameter */, node.typeParameter);
+            writePunctuation("]");
+            if (node.questionToken) {
+                emit(node.questionToken);
+                if (node.questionToken.kind !== 56 /* QuestionToken */) {
+                    writePunctuation("?");
+                }
+            }
+            writePunctuation(":");
+            writeSpace();
+            emit(node.type);
+            writeTrailingSemicolon();
+            if (emitFlags & 1 /* SingleLine */) {
+                writeSpace();
+            }
+            else {
+                writeLine();
+                decreaseIndent();
+            }
+            writePunctuation("}");
+        }
+        function emitLiteralType(node) {
+            emitExpression(node.literal);
+        }
+        function emitImportTypeNode(node) {
+            if (node.isTypeOf) {
+                writeKeyword("typeof");
+                writeSpace();
+            }
+            writeKeyword("import");
+            writePunctuation("(");
+            emit(node.argument);
+            writePunctuation(")");
+            if (node.qualifier) {
+                writePunctuation(".");
+                emit(node.qualifier);
+            }
+            emitTypeArguments(node, node.typeArguments);
+        }
+        //
+        // Binding patterns
+        //
+        function emitObjectBindingPattern(node) {
+            writePunctuation("{");
+            emitList(node, node.elements, 525136 /* ObjectBindingPatternElements */);
+            writePunctuation("}");
+        }
+        function emitArrayBindingPattern(node) {
+            writePunctuation("[");
+            emitList(node, node.elements, 524880 /* ArrayBindingPatternElements */);
+            writePunctuation("]");
+        }
+        function emitBindingElement(node) {
+            emit(node.dotDotDotToken);
+            if (node.propertyName) {
+                emit(node.propertyName);
+                writePunctuation(":");
+                writeSpace();
+            }
+            emit(node.name);
+            emitInitializer(node.initializer, node.name.end, node);
+        }
+        //
+        // Expressions
+        //
+        function emitArrayLiteralExpression(node) {
+            var elements = node.elements;
+            var preferNewLine = node.multiLine ? 65536 /* PreferNewLine */ : 0 /* None */;
+            emitExpressionList(node, elements, 8914 /* ArrayLiteralExpressionElements */ | preferNewLine);
+        }
+        function emitObjectLiteralExpression(node) {
+            ts.forEach(node.properties, generateMemberNames);
+            var indentedFlag = ts.getEmitFlags(node) & 65536 /* Indented */;
+            if (indentedFlag) {
+                increaseIndent();
+            }
+            var preferNewLine = node.multiLine ? 65536 /* PreferNewLine */ : 0 /* None */;
+            var allowTrailingComma = currentSourceFile.languageVersion >= 1 /* ES5 */ && !ts.isJsonSourceFile(currentSourceFile) ? 64 /* AllowTrailingComma */ : 0 /* None */;
+            emitList(node, node.properties, 526226 /* ObjectLiteralExpressionProperties */ | allowTrailingComma | preferNewLine);
+            if (indentedFlag) {
+                decreaseIndent();
+            }
+        }
+        function emitPropertyAccessExpression(node) {
+            var indentBeforeDot = false;
+            var indentAfterDot = false;
+            var dotRangeFirstCommentStart = ts.skipTrivia(currentSourceFile.text, node.expression.end, 
+            /*stopAfterLineBreak*/ false, 
+            /*stopAtComments*/ true);
+            var dotRangeStart = ts.skipTrivia(currentSourceFile.text, dotRangeFirstCommentStart);
+            var dotRangeEnd = dotRangeStart + 1;
+            if (!(ts.getEmitFlags(node) & 131072 /* NoIndentation */)) {
+                var dotToken = ts.createToken(24 /* DotToken */);
+                dotToken.pos = node.expression.end;
+                dotToken.end = dotRangeEnd;
+                indentBeforeDot = needsIndentation(node, node.expression, dotToken);
+                indentAfterDot = needsIndentation(node, dotToken, node.name);
+            }
+            emitExpression(node.expression);
+            increaseIndentIf(indentBeforeDot, /*writeSpaceIfNotIndenting*/ false);
+            var dotHasCommentTrivia = dotRangeFirstCommentStart !== dotRangeStart;
+            var shouldEmitDotDot = !indentBeforeDot && needsDotDotForPropertyAccess(node.expression, dotHasCommentTrivia);
+            if (shouldEmitDotDot) {
+                writePunctuation(".");
+            }
+            emitTokenWithComment(24 /* DotToken */, node.expression.end, writePunctuation, node);
+            increaseIndentIf(indentAfterDot, /*writeSpaceIfNotIndenting*/ false);
+            emit(node.name);
+            decreaseIndentIf(indentBeforeDot, indentAfterDot);
+        }
+        // 1..toString is a valid property access, emit a dot after the literal
+        // Also emit a dot if expression is a integer const enum value - it will appear in generated code as numeric literal
+        function needsDotDotForPropertyAccess(expression, dotHasTrivia) {
+            expression = ts.skipPartiallyEmittedExpressions(expression);
+            if (ts.isNumericLiteral(expression)) {
+                // check if numeric literal is a decimal literal that was originally written with a dot
+                var text = getLiteralTextOfNode(expression, /*neverAsciiEscape*/ true);
+                // If he number will be printed verbatim and it doesn't already contain a dot, add one
+                // if the expression doesn't have any comments that will be emitted.
+                return !expression.numericLiteralFlags && !ts.stringContains(text, ts.tokenToString(24 /* DotToken */)) &&
+                    (!dotHasTrivia || printerOptions.removeComments);
+            }
+            else if (ts.isPropertyAccessExpression(expression) || ts.isElementAccessExpression(expression)) {
+                // check if constant enum value is integer
+                var constantValue = ts.getConstantValue(expression);
+                // isFinite handles cases when constantValue is undefined
+                return typeof constantValue === "number" && isFinite(constantValue)
+                    && Math.floor(constantValue) === constantValue
+                    && printerOptions.removeComments;
+            }
+        }
+        function emitElementAccessExpression(node) {
+            emitExpression(node.expression);
+            emitTokenWithComment(22 /* OpenBracketToken */, node.expression.end, writePunctuation, node);
+            emitExpression(node.argumentExpression);
+            emitTokenWithComment(23 /* CloseBracketToken */, node.argumentExpression.end, writePunctuation, node);
+        }
+        function emitCallExpression(node) {
+            emitExpression(node.expression);
+            emitTypeArguments(node, node.typeArguments);
+            emitExpressionList(node, node.arguments, 2576 /* CallExpressionArguments */);
+        }
+        function emitNewExpression(node) {
+            emitTokenWithComment(95 /* NewKeyword */, node.pos, writeKeyword, node);
+            writeSpace();
+            emitExpression(node.expression);
+            emitTypeArguments(node, node.typeArguments);
+            emitExpressionList(node, node.arguments, 18960 /* NewExpressionArguments */);
+        }
+        function emitTaggedTemplateExpression(node) {
+            emitExpression(node.tag);
+            emitTypeArguments(node, node.typeArguments);
+            writeSpace();
+            emitExpression(node.template);
+        }
+        function emitTypeAssertionExpression(node) {
+            writePunctuation("<");
+            emit(node.type);
+            writePunctuation(">");
+            emitExpression(node.expression);
+        }
+        function emitParenthesizedExpression(node) {
+            var openParenPos = emitTokenWithComment(20 /* OpenParenToken */, node.pos, writePunctuation, node);
+            emitExpression(node.expression);
+            emitTokenWithComment(21 /* CloseParenToken */, node.expression ? node.expression.end : openParenPos, writePunctuation, node);
+        }
+        function emitFunctionExpression(node) {
+            generateNameIfNeeded(node.name);
+            emitFunctionDeclarationOrExpression(node);
+        }
+        function emitArrowFunction(node) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            emitSignatureAndBody(node, emitArrowFunctionHead);
+        }
+        function emitArrowFunctionHead(node) {
+            emitTypeParameters(node, node.typeParameters);
+            emitParametersForArrow(node, node.parameters);
+            emitTypeAnnotation(node.type);
+            writeSpace();
+            emit(node.equalsGreaterThanToken);
+        }
+        function emitDeleteExpression(node) {
+            emitTokenWithComment(81 /* DeleteKeyword */, node.pos, writeKeyword, node);
+            writeSpace();
+            emitExpression(node.expression);
+        }
+        function emitTypeOfExpression(node) {
+            emitTokenWithComment(104 /* TypeOfKeyword */, node.pos, writeKeyword, node);
+            writeSpace();
+            emitExpression(node.expression);
+        }
+        function emitVoidExpression(node) {
+            emitTokenWithComment(106 /* VoidKeyword */, node.pos, writeKeyword, node);
+            writeSpace();
+            emitExpression(node.expression);
+        }
+        function emitAwaitExpression(node) {
+            emitTokenWithComment(122 /* AwaitKeyword */, node.pos, writeKeyword, node);
+            writeSpace();
+            emitExpression(node.expression);
+        }
+        function emitPrefixUnaryExpression(node) {
+            writeTokenText(node.operator, writeOperator);
+            if (shouldEmitWhitespaceBeforeOperand(node)) {
+                writeSpace();
+            }
+            emitExpression(node.operand);
+        }
+        function shouldEmitWhitespaceBeforeOperand(node) {
+            // In some cases, we need to emit a space between the operator and the operand. One obvious case
+            // is when the operator is an identifier, like delete or typeof. We also need to do this for plus
+            // and minus expressions in certain cases. Specifically, consider the following two cases (parens
+            // are just for clarity of exposition, and not part of the source code):
+            //
+            //  (+(+1))
+            //  (+(++1))
+            //
+            // We need to emit a space in both cases. In the first case, the absence of a space will make
+            // the resulting expression a prefix increment operation. And in the second, it will make the resulting
+            // expression a prefix increment whose operand is a plus expression - (++(+x))
+            // The same is true of minus of course.
+            var operand = node.operand;
+            return operand.kind === 202 /* PrefixUnaryExpression */
+                && ((node.operator === 38 /* PlusToken */ && (operand.operator === 38 /* PlusToken */ || operand.operator === 44 /* PlusPlusToken */))
+                    || (node.operator === 39 /* MinusToken */ && (operand.operator === 39 /* MinusToken */ || operand.operator === 45 /* MinusMinusToken */)));
+        }
+        function emitPostfixUnaryExpression(node) {
+            emitExpression(node.operand);
+            writeTokenText(node.operator, writeOperator);
+        }
+        function emitBinaryExpression(node) {
+            var isCommaOperator = node.operatorToken.kind !== 27 /* CommaToken */;
+            var indentBeforeOperator = needsIndentation(node, node.left, node.operatorToken);
+            var indentAfterOperator = needsIndentation(node, node.operatorToken, node.right);
+            emitExpression(node.left);
+            increaseIndentIf(indentBeforeOperator, isCommaOperator);
+            emitLeadingCommentsOfPosition(node.operatorToken.pos);
+            writeTokenNode(node.operatorToken, node.operatorToken.kind === 93 /* InKeyword */ ? writeKeyword : writeOperator);
+            emitTrailingCommentsOfPosition(node.operatorToken.end, /*prefixSpace*/ true); // Binary operators should have a space before the comment starts
+            increaseIndentIf(indentAfterOperator, /*writeSpaceIfNotIndenting*/ true);
+            emitExpression(node.right);
+            decreaseIndentIf(indentBeforeOperator, indentAfterOperator);
+        }
+        function emitConditionalExpression(node) {
+            var indentBeforeQuestion = needsIndentation(node, node.condition, node.questionToken);
+            var indentAfterQuestion = needsIndentation(node, node.questionToken, node.whenTrue);
+            var indentBeforeColon = needsIndentation(node, node.whenTrue, node.colonToken);
+            var indentAfterColon = needsIndentation(node, node.colonToken, node.whenFalse);
+            emitExpression(node.condition);
+            increaseIndentIf(indentBeforeQuestion, /*writeSpaceIfNotIndenting*/ true);
+            emit(node.questionToken);
+            increaseIndentIf(indentAfterQuestion, /*writeSpaceIfNotIndenting*/ true);
+            emitExpression(node.whenTrue);
+            decreaseIndentIf(indentBeforeQuestion, indentAfterQuestion);
+            increaseIndentIf(indentBeforeColon, /*writeSpaceIfNotIndenting*/ true);
+            emit(node.colonToken);
+            increaseIndentIf(indentAfterColon, /*writeSpaceIfNotIndenting*/ true);
+            emitExpression(node.whenFalse);
+            decreaseIndentIf(indentBeforeColon, indentAfterColon);
+        }
+        function emitTemplateExpression(node) {
+            emit(node.head);
+            emitList(node, node.templateSpans, 262144 /* TemplateExpressionSpans */);
+        }
+        function emitYieldExpression(node) {
+            emitTokenWithComment(117 /* YieldKeyword */, node.pos, writeKeyword, node);
+            emit(node.asteriskToken);
+            emitExpressionWithLeadingSpace(node.expression);
+        }
+        function emitSpreadExpression(node) {
+            emitTokenWithComment(25 /* DotDotDotToken */, node.pos, writePunctuation, node);
+            emitExpression(node.expression);
+        }
+        function emitClassExpression(node) {
+            generateNameIfNeeded(node.name);
+            emitClassDeclarationOrExpression(node);
+        }
+        function emitExpressionWithTypeArguments(node) {
+            emitExpression(node.expression);
+            emitTypeArguments(node, node.typeArguments);
+        }
+        function emitAsExpression(node) {
+            emitExpression(node.expression);
+            if (node.type) {
+                writeSpace();
+                writeKeyword("as");
+                writeSpace();
+                emit(node.type);
+            }
+        }
+        function emitNonNullExpression(node) {
+            emitExpression(node.expression);
+            writeOperator("!");
+        }
+        function emitMetaProperty(node) {
+            writeToken(node.keywordToken, node.pos, writePunctuation);
+            writePunctuation(".");
+            emit(node.name);
+        }
+        //
+        // Misc
+        //
+        function emitTemplateSpan(node) {
+            emitExpression(node.expression);
+            emit(node.literal);
+        }
+        //
+        // Statements
+        //
+        function emitBlock(node) {
+            emitBlockStatements(node, /*forceSingleLine*/ !node.multiLine && isEmptyBlock(node));
+        }
+        function emitBlockStatements(node, forceSingleLine) {
+            emitTokenWithComment(18 /* OpenBraceToken */, node.pos, writePunctuation, /*contextNode*/ node);
+            var format = forceSingleLine || ts.getEmitFlags(node) & 1 /* SingleLine */ ? 768 /* SingleLineBlockStatements */ : 129 /* MultiLineBlockStatements */;
+            emitList(node, node.statements, format);
+            emitTokenWithComment(19 /* CloseBraceToken */, node.statements.end, writePunctuation, /*contextNode*/ node, /*indentLeading*/ !!(format & 1 /* MultiLine */));
+        }
+        function emitVariableStatement(node) {
+            emitModifiers(node, node.modifiers);
+            emit(node.declarationList);
+            writeTrailingSemicolon();
+        }
+        function emitEmptyStatement(isEmbeddedStatement) {
+            // While most trailing semicolons are possibly insignificant, an embedded "empty"
+            // statement is significant and cannot be elided by a trailing-semicolon-omitting writer.
+            if (isEmbeddedStatement) {
+                writePunctuation(";");
+            }
+            else {
+                writeTrailingSemicolon();
+            }
+        }
+        function emitExpressionStatement(node) {
+            emitExpression(node.expression);
+            // Emit semicolon in non json files
+            // or if json file that created synthesized expression(eg.define expression statement when --out and amd code generation)
+            if (!ts.isJsonSourceFile(currentSourceFile) || ts.nodeIsSynthesized(node.expression)) {
+                writeTrailingSemicolon();
+            }
+        }
+        function emitIfStatement(node) {
+            var openParenPos = emitTokenWithComment(91 /* IfKeyword */, node.pos, writeKeyword, node);
+            writeSpace();
+            emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
+            emitExpression(node.expression);
+            emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
+            emitEmbeddedStatement(node, node.thenStatement);
+            if (node.elseStatement) {
+                writeLineOrSpace(node);
+                emitTokenWithComment(83 /* ElseKeyword */, node.thenStatement.end, writeKeyword, node);
+                if (node.elseStatement.kind === 222 /* IfStatement */) {
+                    writeSpace();
+                    emit(node.elseStatement);
+                }
+                else {
+                    emitEmbeddedStatement(node, node.elseStatement);
+                }
+            }
+        }
+        function emitWhileClause(node, startPos) {
+            var openParenPos = emitTokenWithComment(107 /* WhileKeyword */, startPos, writeKeyword, node);
+            writeSpace();
+            emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
+            emitExpression(node.expression);
+            emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
+        }
+        function emitDoStatement(node) {
+            emitTokenWithComment(82 /* DoKeyword */, node.pos, writeKeyword, node);
+            emitEmbeddedStatement(node, node.statement);
+            if (ts.isBlock(node.statement)) {
+                writeSpace();
+            }
+            else {
+                writeLineOrSpace(node);
+            }
+            emitWhileClause(node, node.statement.end);
+            writePunctuation(";");
+        }
+        function emitWhileStatement(node) {
+            emitWhileClause(node, node.pos);
+            emitEmbeddedStatement(node, node.statement);
+        }
+        function emitForStatement(node) {
+            var openParenPos = emitTokenWithComment(89 /* ForKeyword */, node.pos, writeKeyword, node);
+            writeSpace();
+            var pos = emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, /*contextNode*/ node);
+            emitForBinding(node.initializer);
+            pos = emitTokenWithComment(26 /* SemicolonToken */, node.initializer ? node.initializer.end : pos, writePunctuation, node);
+            emitExpressionWithLeadingSpace(node.condition);
+            pos = emitTokenWithComment(26 /* SemicolonToken */, node.condition ? node.condition.end : pos, writePunctuation, node);
+            emitExpressionWithLeadingSpace(node.incrementor);
+            emitTokenWithComment(21 /* CloseParenToken */, node.incrementor ? node.incrementor.end : pos, writePunctuation, node);
+            emitEmbeddedStatement(node, node.statement);
+        }
+        function emitForInStatement(node) {
+            var openParenPos = emitTokenWithComment(89 /* ForKeyword */, node.pos, writeKeyword, node);
+            writeSpace();
+            emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
+            emitForBinding(node.initializer);
+            writeSpace();
+            emitTokenWithComment(93 /* InKeyword */, node.initializer.end, writeKeyword, node);
+            writeSpace();
+            emitExpression(node.expression);
+            emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
+            emitEmbeddedStatement(node, node.statement);
+        }
+        function emitForOfStatement(node) {
+            var openParenPos = emitTokenWithComment(89 /* ForKeyword */, node.pos, writeKeyword, node);
+            writeSpace();
+            emitWithTrailingSpace(node.awaitModifier);
+            emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
+            emitForBinding(node.initializer);
+            writeSpace();
+            emitTokenWithComment(147 /* OfKeyword */, node.initializer.end, writeKeyword, node);
+            writeSpace();
+            emitExpression(node.expression);
+            emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
+            emitEmbeddedStatement(node, node.statement);
+        }
+        function emitForBinding(node) {
+            if (node !== undefined) {
+                if (node.kind === 238 /* VariableDeclarationList */) {
+                    emit(node);
+                }
+                else {
+                    emitExpression(node);
+                }
+            }
+        }
+        function emitContinueStatement(node) {
+            emitTokenWithComment(78 /* ContinueKeyword */, node.pos, writeKeyword, node);
+            emitWithLeadingSpace(node.label);
+            writeTrailingSemicolon();
+        }
+        function emitBreakStatement(node) {
+            emitTokenWithComment(73 /* BreakKeyword */, node.pos, writeKeyword, node);
+            emitWithLeadingSpace(node.label);
+            writeTrailingSemicolon();
+        }
+        function emitTokenWithComment(token, pos, writer, contextNode, indentLeading) {
+            var node = ts.getParseTreeNode(contextNode);
+            var isSimilarNode = node && node.kind === contextNode.kind;
+            var startPos = pos;
+            if (isSimilarNode) {
+                pos = ts.skipTrivia(currentSourceFile.text, pos);
+            }
+            if (emitLeadingCommentsOfPosition && isSimilarNode && contextNode.pos !== startPos) {
+                var needsIndent = indentLeading && !ts.positionsAreOnSameLine(startPos, pos, currentSourceFile);
+                if (needsIndent) {
+                    increaseIndent();
+                }
+                emitLeadingCommentsOfPosition(startPos);
+                if (needsIndent) {
+                    decreaseIndent();
+                }
+            }
+            pos = writeTokenText(token, writer, pos);
+            if (emitTrailingCommentsOfPosition && isSimilarNode && contextNode.end !== pos) {
+                emitTrailingCommentsOfPosition(pos, /*prefixSpace*/ true);
+            }
+            return pos;
+        }
+        function emitReturnStatement(node) {
+            emitTokenWithComment(97 /* ReturnKeyword */, node.pos, writeKeyword, /*contextNode*/ node);
+            emitExpressionWithLeadingSpace(node.expression);
+            writeTrailingSemicolon();
+        }
+        function emitWithStatement(node) {
+            var openParenPos = emitTokenWithComment(108 /* WithKeyword */, node.pos, writeKeyword, node);
+            writeSpace();
+            emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
+            emitExpression(node.expression);
+            emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
+            emitEmbeddedStatement(node, node.statement);
+        }
+        function emitSwitchStatement(node) {
+            var openParenPos = emitTokenWithComment(99 /* SwitchKeyword */, node.pos, writeKeyword, node);
+            writeSpace();
+            emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
+            emitExpression(node.expression);
+            emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
+            writeSpace();
+            emit(node.caseBlock);
+        }
+        function emitLabeledStatement(node) {
+            emit(node.label);
+            emitTokenWithComment(57 /* ColonToken */, node.label.end, writePunctuation, node);
+            writeSpace();
+            emit(node.statement);
+        }
+        function emitThrowStatement(node) {
+            emitTokenWithComment(101 /* ThrowKeyword */, node.pos, writeKeyword, node);
+            emitExpressionWithLeadingSpace(node.expression);
+            writeTrailingSemicolon();
+        }
+        function emitTryStatement(node) {
+            emitTokenWithComment(103 /* TryKeyword */, node.pos, writeKeyword, node);
+            writeSpace();
+            emit(node.tryBlock);
+            if (node.catchClause) {
+                writeLineOrSpace(node);
+                emit(node.catchClause);
+            }
+            if (node.finallyBlock) {
+                writeLineOrSpace(node);
+                emitTokenWithComment(88 /* FinallyKeyword */, (node.catchClause || node.tryBlock).end, writeKeyword, node);
+                writeSpace();
+                emit(node.finallyBlock);
+            }
+        }
+        function emitDebuggerStatement(node) {
+            writeToken(79 /* DebuggerKeyword */, node.pos, writeKeyword);
+            writeTrailingSemicolon();
+        }
+        //
+        // Declarations
+        //
+        function emitVariableDeclaration(node) {
+            emit(node.name);
+            emitTypeAnnotation(node.type);
+            emitInitializer(node.initializer, node.type ? node.type.end : node.name.end, node);
+        }
+        function emitVariableDeclarationList(node) {
+            writeKeyword(ts.isLet(node) ? "let" : ts.isVarConst(node) ? "const" : "var");
+            writeSpace();
+            emitList(node, node.declarations, 528 /* VariableDeclarationList */);
+        }
+        function emitFunctionDeclaration(node) {
+            emitFunctionDeclarationOrExpression(node);
+        }
+        function emitFunctionDeclarationOrExpression(node) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            writeKeyword("function");
+            emit(node.asteriskToken);
+            writeSpace();
+            emitIdentifierName(node.name); // TODO: GH#18217
+            emitSignatureAndBody(node, emitSignatureHead);
+        }
+        function emitBlockCallback(_hint, body) {
+            emitBlockFunctionBody(body);
+        }
+        function emitSignatureAndBody(node, emitSignatureHead) {
+            var body = node.body;
+            if (body) {
+                if (ts.isBlock(body)) {
+                    var indentedFlag = ts.getEmitFlags(node) & 65536 /* Indented */;
+                    if (indentedFlag) {
+                        increaseIndent();
+                    }
+                    pushNameGenerationScope(node);
+                    ts.forEach(node.parameters, generateNames);
+                    generateNames(node.body);
+                    emitSignatureHead(node);
+                    if (onEmitNode) {
+                        onEmitNode(4 /* Unspecified */, body, emitBlockCallback);
+                    }
+                    else {
+                        emitBlockFunctionBody(body);
+                    }
+                    popNameGenerationScope(node);
+                    if (indentedFlag) {
+                        decreaseIndent();
+                    }
+                }
+                else {
+                    emitSignatureHead(node);
+                    writeSpace();
+                    emitExpression(body);
+                }
+            }
+            else {
+                emitSignatureHead(node);
+                writeTrailingSemicolon();
+            }
+        }
+        function emitSignatureHead(node) {
+            emitTypeParameters(node, node.typeParameters);
+            emitParameters(node, node.parameters);
+            emitTypeAnnotation(node.type);
+        }
+        function shouldEmitBlockFunctionBodyOnSingleLine(body) {
+            // We must emit a function body as a single-line body in the following case:
+            // * The body has NodeEmitFlags.SingleLine specified.
+            // We must emit a function body as a multi-line body in the following cases:
+            // * The body is explicitly marked as multi-line.
+            // * A non-synthesized body's start and end position are on different lines.
+            // * Any statement in the body starts on a new line.
+            if (ts.getEmitFlags(body) & 1 /* SingleLine */) {
+                return true;
+            }
+            if (body.multiLine) {
+                return false;
+            }
+            if (!ts.nodeIsSynthesized(body) && !ts.rangeIsOnSingleLine(body, currentSourceFile)) {
+                return false;
+            }
+            if (shouldWriteLeadingLineTerminator(body, body.statements, 2 /* PreserveLines */)
+                || shouldWriteClosingLineTerminator(body, body.statements, 2 /* PreserveLines */)) {
+                return false;
+            }
+            var previousStatement;
+            for (var _a = 0, _b = body.statements; _a < _b.length; _a++) {
+                var statement = _b[_a];
+                if (shouldWriteSeparatingLineTerminator(previousStatement, statement, 2 /* PreserveLines */)) {
+                    return false;
+                }
+                previousStatement = statement;
+            }
+            return true;
+        }
+        function emitBlockFunctionBody(body) {
+            writeSpace();
+            writePunctuation("{");
+            increaseIndent();
+            var emitBlockFunctionBody = shouldEmitBlockFunctionBodyOnSingleLine(body)
+                ? emitBlockFunctionBodyOnSingleLine
+                : emitBlockFunctionBodyWorker;
+            if (emitBodyWithDetachedComments) {
+                emitBodyWithDetachedComments(body, body.statements, emitBlockFunctionBody);
+            }
+            else {
+                emitBlockFunctionBody(body);
+            }
+            decreaseIndent();
+            writeToken(19 /* CloseBraceToken */, body.statements.end, writePunctuation, body);
+        }
+        function emitBlockFunctionBodyOnSingleLine(body) {
+            emitBlockFunctionBodyWorker(body, /*emitBlockFunctionBodyOnSingleLine*/ true);
+        }
+        function emitBlockFunctionBodyWorker(body, emitBlockFunctionBodyOnSingleLine) {
+            // Emit all the prologue directives (like "use strict").
+            var statementOffset = emitPrologueDirectives(body.statements, /*startWithNewLine*/ true);
+            var pos = writer.getTextPos();
+            emitHelpers(body);
+            if (statementOffset === 0 && pos === writer.getTextPos() && emitBlockFunctionBodyOnSingleLine) {
+                decreaseIndent();
+                emitList(body, body.statements, 768 /* SingleLineFunctionBodyStatements */);
+                increaseIndent();
+            }
+            else {
+                emitList(body, body.statements, 1 /* MultiLineFunctionBodyStatements */, statementOffset);
+            }
+        }
+        function emitClassDeclaration(node) {
+            emitClassDeclarationOrExpression(node);
+        }
+        function emitClassDeclarationOrExpression(node) {
+            ts.forEach(node.members, generateMemberNames);
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            writeKeyword("class");
+            if (node.name) {
+                writeSpace();
+                emitIdentifierName(node.name);
+            }
+            var indentedFlag = ts.getEmitFlags(node) & 65536 /* Indented */;
+            if (indentedFlag) {
+                increaseIndent();
+            }
+            emitTypeParameters(node, node.typeParameters);
+            emitList(node, node.heritageClauses, 0 /* ClassHeritageClauses */);
+            writeSpace();
+            writePunctuation("{");
+            emitList(node, node.members, 129 /* ClassMembers */);
+            writePunctuation("}");
+            if (indentedFlag) {
+                decreaseIndent();
+            }
+        }
+        function emitInterfaceDeclaration(node) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            writeKeyword("interface");
+            writeSpace();
+            emit(node.name);
+            emitTypeParameters(node, node.typeParameters);
+            emitList(node, node.heritageClauses, 512 /* HeritageClauses */);
+            writeSpace();
+            writePunctuation("{");
+            emitList(node, node.members, 129 /* InterfaceMembers */);
+            writePunctuation("}");
+        }
+        function emitTypeAliasDeclaration(node) {
+            emitDecorators(node, node.decorators);
+            emitModifiers(node, node.modifiers);
+            writeKeyword("type");
+            writeSpace();
+            emit(node.name);
+            emitTypeParameters(node, node.typeParameters);
+            writeSpace();
+            writePunctuation("=");
+            writeSpace();
+            emit(node.type);
+            writeTrailingSemicolon();
+        }
+        function emitEnumDeclaration(node) {
+            emitModifiers(node, node.modifiers);
+            writeKeyword("enum");
+            writeSpace();
+            emit(node.name);
+            writeSpace();
+            writePunctuation("{");
+            emitList(node, node.members, 145 /* EnumMembers */);
+            writePunctuation("}");
+        }
+        function emitModuleDeclaration(node) {
+            emitModifiers(node, node.modifiers);
+            if (~node.flags & 512 /* GlobalAugmentation */) {
+                writeKeyword(node.flags & 16 /* Namespace */ ? "namespace" : "module");
+                writeSpace();
+            }
+            emit(node.name);
+            var body = node.body;
+            if (!body)
+                return writeTrailingSemicolon();
+            while (body.kind === 244 /* ModuleDeclaration */) {
+                writePunctuation(".");
+                emit(body.name);
+                body = body.body;
+            }
+            writeSpace();
+            emit(body);
+        }
+        function emitModuleBlock(node) {
+            pushNameGenerationScope(node);
+            ts.forEach(node.statements, generateNames);
+            emitBlockStatements(node, /*forceSingleLine*/ isEmptyBlock(node));
+            popNameGenerationScope(node);
+        }
+        function emitCaseBlock(node) {
+            emitTokenWithComment(18 /* OpenBraceToken */, node.pos, writePunctuation, node);
+            emitList(node, node.clauses, 129 /* CaseBlockClauses */);
+            emitTokenWithComment(19 /* CloseBraceToken */, node.clauses.end, writePunctuation, node, /*indentLeading*/ true);
+        }
+        function emitImportEqualsDeclaration(node) {
+            emitModifiers(node, node.modifiers);
+            emitTokenWithComment(92 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
+            writeSpace();
+            emit(node.name);
+            writeSpace();
+            emitTokenWithComment(59 /* EqualsToken */, node.name.end, writePunctuation, node);
+            writeSpace();
+            emitModuleReference(node.moduleReference);
+            writeTrailingSemicolon();
+        }
+        function emitModuleReference(node) {
+            if (node.kind === 72 /* Identifier */) {
+                emitExpression(node);
+            }
+            else {
+                emit(node);
+            }
+        }
+        function emitImportDeclaration(node) {
+            emitModifiers(node, node.modifiers);
+            emitTokenWithComment(92 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
+            writeSpace();
+            if (node.importClause) {
+                emit(node.importClause);
+                writeSpace();
+                emitTokenWithComment(144 /* FromKeyword */, node.importClause.end, writeKeyword, node);
+                writeSpace();
+            }
+            emitExpression(node.moduleSpecifier);
+            writeTrailingSemicolon();
+        }
+        function emitImportClause(node) {
+            emit(node.name);
+            if (node.name && node.namedBindings) {
+                emitTokenWithComment(27 /* CommaToken */, node.name.end, writePunctuation, node);
+                writeSpace();
+            }
+            emit(node.namedBindings);
+        }
+        function emitNamespaceImport(node) {
+            var asPos = emitTokenWithComment(40 /* AsteriskToken */, node.pos, writePunctuation, node);
+            writeSpace();
+            emitTokenWithComment(119 /* AsKeyword */, asPos, writeKeyword, node);
+            writeSpace();
+            emit(node.name);
+        }
+        function emitNamedImports(node) {
+            emitNamedImportsOrExports(node);
+        }
+        function emitImportSpecifier(node) {
+            emitImportOrExportSpecifier(node);
+        }
+        function emitExportAssignment(node) {
+            var nextPos = emitTokenWithComment(85 /* ExportKeyword */, node.pos, writeKeyword, node);
+            writeSpace();
+            if (node.isExportEquals) {
+                emitTokenWithComment(59 /* EqualsToken */, nextPos, writeOperator, node);
+            }
+            else {
+                emitTokenWithComment(80 /* DefaultKeyword */, nextPos, writeKeyword, node);
+            }
+            writeSpace();
+            emitExpression(node.expression);
+            writeTrailingSemicolon();
+        }
+        function emitExportDeclaration(node) {
+            var nextPos = emitTokenWithComment(85 /* ExportKeyword */, node.pos, writeKeyword, node);
+            writeSpace();
+            if (node.exportClause) {
+                emit(node.exportClause);
+            }
+            else {
+                nextPos = emitTokenWithComment(40 /* AsteriskToken */, nextPos, writePunctuation, node);
+            }
+            if (node.moduleSpecifier) {
+                writeSpace();
+                var fromPos = node.exportClause ? node.exportClause.end : nextPos;
+                emitTokenWithComment(144 /* FromKeyword */, fromPos, writeKeyword, node);
+                writeSpace();
+                emitExpression(node.moduleSpecifier);
+            }
+            writeTrailingSemicolon();
+        }
+        function emitNamespaceExportDeclaration(node) {
+            var nextPos = emitTokenWithComment(85 /* ExportKeyword */, node.pos, writeKeyword, node);
+            writeSpace();
+            nextPos = emitTokenWithComment(119 /* AsKeyword */, nextPos, writeKeyword, node);
+            writeSpace();
+            nextPos = emitTokenWithComment(131 /* NamespaceKeyword */, nextPos, writeKeyword, node);
+            writeSpace();
+            emit(node.name);
+            writeTrailingSemicolon();
+        }
+        function emitNamedExports(node) {
+            emitNamedImportsOrExports(node);
+        }
+        function emitExportSpecifier(node) {
+            emitImportOrExportSpecifier(node);
+        }
+        function emitNamedImportsOrExports(node) {
+            writePunctuation("{");
+            emitList(node, node.elements, 525136 /* NamedImportsOrExportsElements */);
+            writePunctuation("}");
+        }
+        function emitImportOrExportSpecifier(node) {
+            if (node.propertyName) {
+                emit(node.propertyName);
+                writeSpace();
+                emitTokenWithComment(119 /* AsKeyword */, node.propertyName.end, writeKeyword, node);
+                writeSpace();
+            }
+            emit(node.name);
+        }
+        //
+        // Module references
+        //
+        function emitExternalModuleReference(node) {
+            writeKeyword("require");
+            writePunctuation("(");
+            emitExpression(node.expression);
+            writePunctuation(")");
+        }
+        //
+        // JSX
+        //
+        function emitJsxElement(node) {
+            emit(node.openingElement);
+            emitList(node, node.children, 262144 /* JsxElementOrFragmentChildren */);
+            emit(node.closingElement);
+        }
+        function emitJsxSelfClosingElement(node) {
+            writePunctuation("<");
+            emitJsxTagName(node.tagName);
+            emitTypeArguments(node, node.typeArguments);
+            writeSpace();
+            emit(node.attributes);
+            writePunctuation("/>");
+        }
+        function emitJsxFragment(node) {
+            emit(node.openingFragment);
+            emitList(node, node.children, 262144 /* JsxElementOrFragmentChildren */);
+            emit(node.closingFragment);
+        }
+        function emitJsxOpeningElementOrFragment(node) {
+            writePunctuation("<");
+            if (ts.isJsxOpeningElement(node)) {
+                emitJsxTagName(node.tagName);
+                emitTypeArguments(node, node.typeArguments);
+                if (node.attributes.properties && node.attributes.properties.length > 0) {
+                    writeSpace();
+                }
+                emit(node.attributes);
+            }
+            writePunctuation(">");
+        }
+        function emitJsxText(node) {
+            writer.writeLiteral(getTextOfNode(node, /*includeTrivia*/ true));
+        }
+        function emitJsxClosingElementOrFragment(node) {
+            writePunctuation("</");
+            if (ts.isJsxClosingElement(node)) {
+                emitJsxTagName(node.tagName);
+            }
+            writePunctuation(">");
+        }
+        function emitJsxAttributes(node) {
+            emitList(node, node.properties, 262656 /* JsxElementAttributes */);
+        }
+        function emitJsxAttribute(node) {
+            emit(node.name);
+            emitNodeWithPrefix("=", writePunctuation, node.initializer, emit); // TODO: GH#18217
+        }
+        function emitJsxSpreadAttribute(node) {
+            writePunctuation("{...");
+            emitExpression(node.expression);
+            writePunctuation("}");
+        }
+        function emitJsxExpression(node) {
+            if (node.expression) {
+                writePunctuation("{");
+                emit(node.dotDotDotToken);
+                emitExpression(node.expression);
+                writePunctuation("}");
+            }
+        }
+        function emitJsxTagName(node) {
+            if (node.kind === 72 /* Identifier */) {
+                emitExpression(node);
+            }
+            else {
+                emit(node);
+            }
+        }
+        //
+        // Clauses
+        //
+        function emitCaseClause(node) {
+            emitTokenWithComment(74 /* CaseKeyword */, node.pos, writeKeyword, node);
+            writeSpace();
+            emitExpression(node.expression);
+            emitCaseOrDefaultClauseRest(node, node.statements, node.expression.end);
+        }
+        function emitDefaultClause(node) {
+            var pos = emitTokenWithComment(80 /* DefaultKeyword */, node.pos, writeKeyword, node);
+            emitCaseOrDefaultClauseRest(node, node.statements, pos);
+        }
+        function emitCaseOrDefaultClauseRest(parentNode, statements, colonPos) {
+            var emitAsSingleStatement = statements.length === 1 &&
+                (
+                // treat synthesized nodes as located on the same line for emit purposes
+                ts.nodeIsSynthesized(parentNode) ||
+                    ts.nodeIsSynthesized(statements[0]) ||
+                    ts.rangeStartPositionsAreOnSameLine(parentNode, statements[0], currentSourceFile));
+            var format = 163969 /* CaseOrDefaultClauseStatements */;
+            if (emitAsSingleStatement) {
+                writeToken(57 /* ColonToken */, colonPos, writePunctuation, parentNode);
+                writeSpace();
+                format &= ~(1 /* MultiLine */ | 128 /* Indented */);
+            }
+            else {
+                emitTokenWithComment(57 /* ColonToken */, colonPos, writePunctuation, parentNode);
+            }
+            emitList(parentNode, statements, format);
+        }
+        function emitHeritageClause(node) {
+            writeSpace();
+            writeTokenText(node.token, writeKeyword);
+            writeSpace();
+            emitList(node, node.types, 528 /* HeritageClauseTypes */);
+        }
+        function emitCatchClause(node) {
+            var openParenPos = emitTokenWithComment(75 /* CatchKeyword */, node.pos, writeKeyword, node);
+            writeSpace();
+            if (node.variableDeclaration) {
+                emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
+                emit(node.variableDeclaration);
+                emitTokenWithComment(21 /* CloseParenToken */, node.variableDeclaration.end, writePunctuation, node);
+                writeSpace();
+            }
+            emit(node.block);
+        }
+        //
+        // Property assignments
+        //
+        function emitPropertyAssignment(node) {
+            emit(node.name);
+            writePunctuation(":");
+            writeSpace();
+            // This is to ensure that we emit comment in the following case:
+            //      For example:
+            //          obj = {
+            //              id: /*comment1*/ ()=>void
+            //          }
+            // "comment1" is not considered to be leading comment for node.initializer
+            // but rather a trailing comment on the previous node.
+            var initializer = node.initializer;
+            if (emitTrailingCommentsOfPosition && (ts.getEmitFlags(initializer) & 512 /* NoLeadingComments */) === 0) {
+                var commentRange = ts.getCommentRange(initializer);
+                emitTrailingCommentsOfPosition(commentRange.pos);
+            }
+            emitExpression(initializer);
+        }
+        function emitShorthandPropertyAssignment(node) {
+            emit(node.name);
+            if (node.objectAssignmentInitializer) {
+                writeSpace();
+                writePunctuation("=");
+                writeSpace();
+                emitExpression(node.objectAssignmentInitializer);
+            }
+        }
+        function emitSpreadAssignment(node) {
+            if (node.expression) {
+                emitTokenWithComment(25 /* DotDotDotToken */, node.pos, writePunctuation, node);
+                emitExpression(node.expression);
+            }
+        }
+        //
+        // Enum
+        //
+        function emitEnumMember(node) {
+            emit(node.name);
+            emitInitializer(node.initializer, node.name.end, node);
+        }
+        //
+        // JSDoc
+        //
+        function emitJSDoc(node) {
+            write("/**");
+            if (node.comment) {
+                var lines = node.comment.split(/\r\n?|\n/g);
+                for (var _a = 0, lines_2 = lines; _a < lines_2.length; _a++) {
+                    var line = lines_2[_a];
+                    writeLine();
+                    writeSpace();
+                    writePunctuation("*");
+                    writeSpace();
+                    write(line);
+                }
+            }
+            if (node.tags) {
+                if (node.tags.length === 1 && node.tags[0].kind === 302 /* JSDocTypeTag */ && !node.comment) {
+                    writeSpace();
+                    emit(node.tags[0]);
+                }
+                else {
+                    emitList(node, node.tags, 33 /* JSDocComment */);
+                }
+            }
+            writeSpace();
+            write("*/");
+        }
+        function emitJSDocSimpleTypedTag(tag) {
+            emitJSDocTagName(tag.tagName);
+            emitJSDocTypeExpression(tag.typeExpression);
+            emitJSDocComment(tag.comment);
+        }
+        function emitJSDocAugmentsTag(tag) {
+            emitJSDocTagName(tag.tagName);
+            writeSpace();
+            writePunctuation("{");
+            emit(tag.class);
+            writePunctuation("}");
+            emitJSDocComment(tag.comment);
+        }
+        function emitJSDocTemplateTag(tag) {
+            emitJSDocTagName(tag.tagName);
+            emitJSDocTypeExpression(tag.constraint);
+            writeSpace();
+            emitList(tag, tag.typeParameters, 528 /* CommaListElements */);
+            emitJSDocComment(tag.comment);
+        }
+        function emitJSDocTypedefTag(tag) {
+            emitJSDocTagName(tag.tagName);
+            if (tag.typeExpression) {
+                if (tag.typeExpression.kind === 283 /* JSDocTypeExpression */) {
+                    emitJSDocTypeExpression(tag.typeExpression);
+                }
+                else {
+                    writeSpace();
+                    writePunctuation("{");
+                    write("Object");
+                    if (tag.typeExpression.isArrayType) {
+                        writePunctuation("[");
+                        writePunctuation("]");
+                    }
+                    writePunctuation("}");
+                }
+            }
+            if (tag.fullName) {
+                writeSpace();
+                emit(tag.fullName);
+            }
+            emitJSDocComment(tag.comment);
+            if (tag.typeExpression && tag.typeExpression.kind === 292 /* JSDocTypeLiteral */) {
+                emitJSDocTypeLiteral(tag.typeExpression);
+            }
+        }
+        function emitJSDocCallbackTag(tag) {
+            emitJSDocTagName(tag.tagName);
+            if (tag.name) {
+                writeSpace();
+                emit(tag.name);
+            }
+            emitJSDocComment(tag.comment);
+            emitJSDocSignature(tag.typeExpression);
+        }
+        function emitJSDocSimpleTag(tag) {
+            emitJSDocTagName(tag.tagName);
+            emitJSDocComment(tag.comment);
+        }
+        function emitJSDocTypeLiteral(lit) {
+            emitList(lit, ts.createNodeArray(lit.jsDocPropertyTags), 33 /* JSDocComment */);
+        }
+        function emitJSDocSignature(sig) {
+            if (sig.typeParameters) {
+                emitList(sig, ts.createNodeArray(sig.typeParameters), 33 /* JSDocComment */);
+            }
+            if (sig.parameters) {
+                emitList(sig, ts.createNodeArray(sig.parameters), 33 /* JSDocComment */);
+            }
+            if (sig.type) {
+                writeLine();
+                writeSpace();
+                writePunctuation("*");
+                writeSpace();
+                emit(sig.type);
+            }
+        }
+        function emitJSDocPropertyLikeTag(param) {
+            emitJSDocTagName(param.tagName);
+            emitJSDocTypeExpression(param.typeExpression);
+            writeSpace();
+            if (param.isBracketed) {
+                writePunctuation("[");
+            }
+            emit(param.name);
+            if (param.isBracketed) {
+                writePunctuation("]");
+            }
+            emitJSDocComment(param.comment);
+        }
+        function emitJSDocTagName(tagName) {
+            writePunctuation("@");
+            emit(tagName);
+        }
+        function emitJSDocComment(comment) {
+            if (comment) {
+                writeSpace();
+                write(comment);
+            }
+        }
+        function emitJSDocTypeExpression(typeExpression) {
+            if (typeExpression) {
+                writeSpace();
+                writePunctuation("{");
+                emit(typeExpression.type);
+                writePunctuation("}");
+            }
+        }
+        //
+        // Top-level nodes
+        //
+        function emitSourceFile(node) {
+            writeLine();
+            var statements = node.statements;
+            if (emitBodyWithDetachedComments) {
+                // Emit detached comment if there are no prologue directives or if the first node is synthesized.
+                // The synthesized node will have no leading comment so some comments may be missed.
+                var shouldEmitDetachedComment = statements.length === 0 ||
+                    !ts.isPrologueDirective(statements[0]) ||
+                    ts.nodeIsSynthesized(statements[0]);
+                if (shouldEmitDetachedComment) {
+                    emitBodyWithDetachedComments(node, statements, emitSourceFileWorker);
+                    return;
+                }
+            }
+            emitSourceFileWorker(node);
+        }
+        function emitSyntheticTripleSlashReferencesIfNeeded(node) {
+            emitTripleSlashDirectives(!!node.hasNoDefaultLib, node.syntheticFileReferences || [], node.syntheticTypeReferences || [], node.syntheticLibReferences || []);
+        }
+        function emitTripleSlashDirectivesIfNeeded(node) {
+            if (node.isDeclarationFile)
+                emitTripleSlashDirectives(node.hasNoDefaultLib, node.referencedFiles, node.typeReferenceDirectives, node.libReferenceDirectives);
+        }
+        function emitTripleSlashDirectives(hasNoDefaultLib, files, types, libs) {
+            if (hasNoDefaultLib) {
+                writeComment("/// <reference no-default-lib=\"true\"/>");
+                writeLine();
+            }
+            if (currentSourceFile && currentSourceFile.moduleName) {
+                writeComment("/// <amd-module name=\"" + currentSourceFile.moduleName + "\" />");
+                writeLine();
+            }
+            if (currentSourceFile && currentSourceFile.amdDependencies) {
+                for (var _a = 0, _b = currentSourceFile.amdDependencies; _a < _b.length; _a++) {
+                    var dep = _b[_a];
+                    if (dep.name) {
+                        writeComment("/// <amd-dependency name=\"" + dep.name + "\" path=\"" + dep.path + "\" />");
+                    }
+                    else {
+                        writeComment("/// <amd-dependency path=\"" + dep.path + "\" />");
+                    }
+                    writeLine();
+                }
+            }
+            for (var _c = 0, files_1 = files; _c < files_1.length; _c++) {
+                var directive = files_1[_c];
+                writeComment("/// <reference path=\"" + directive.fileName + "\" />");
+                writeLine();
+            }
+            for (var _d = 0, types_18 = types; _d < types_18.length; _d++) {
+                var directive = types_18[_d];
+                writeComment("/// <reference types=\"" + directive.fileName + "\" />");
+                writeLine();
+            }
+            for (var _e = 0, libs_1 = libs; _e < libs_1.length; _e++) {
+                var directive = libs_1[_e];
+                writeComment("/// <reference lib=\"" + directive.fileName + "\" />");
+                writeLine();
+            }
+        }
+        function emitSourceFileWorker(node) {
+            var statements = node.statements;
+            pushNameGenerationScope(node);
+            ts.forEach(node.statements, generateNames);
+            emitHelpers(node);
+            var index = ts.findIndex(statements, function (statement) { return !ts.isPrologueDirective(statement); });
+            emitTripleSlashDirectivesIfNeeded(node);
+            emitList(node, statements, 1 /* MultiLine */, index === -1 ? statements.length : index);
+            popNameGenerationScope(node);
+        }
+        // Transformation nodes
+        function emitPartiallyEmittedExpression(node) {
+            emitExpression(node.expression);
+        }
+        function emitCommaList(node) {
+            emitExpressionList(node, node.elements, 528 /* CommaListElements */);
+        }
+        /**
+         * Emits any prologue directives at the start of a Statement list, returning the
+         * number of prologue directives written to the output.
+         */
+        function emitPrologueDirectives(statements, startWithNewLine, seenPrologueDirectives) {
+            for (var i = 0; i < statements.length; i++) {
+                var statement = statements[i];
+                if (ts.isPrologueDirective(statement)) {
+                    var shouldEmitPrologueDirective = seenPrologueDirectives ? !seenPrologueDirectives.has(statement.expression.text) : true;
+                    if (shouldEmitPrologueDirective) {
+                        if (startWithNewLine || i > 0) {
+                            writeLine();
+                        }
+                        emit(statement);
+                        if (seenPrologueDirectives) {
+                            seenPrologueDirectives.set(statement.expression.text, true);
+                        }
+                    }
+                }
+                else {
+                    // return index of the first non prologue directive
+                    return i;
+                }
+            }
+            return statements.length;
+        }
+        function emitPrologueDirectivesIfNeeded(sourceFileOrBundle) {
+            if (ts.isSourceFile(sourceFileOrBundle)) {
+                setSourceFile(sourceFileOrBundle);
+                emitPrologueDirectives(sourceFileOrBundle.statements);
+            }
+            else {
+                var seenPrologueDirectives = ts.createMap();
+                for (var _a = 0, _b = sourceFileOrBundle.sourceFiles; _a < _b.length; _a++) {
+                    var sourceFile = _b[_a];
+                    setSourceFile(sourceFile);
+                    emitPrologueDirectives(sourceFile.statements, /*startWithNewLine*/ true, seenPrologueDirectives);
+                }
+                setSourceFile(undefined);
+            }
+        }
+        function emitShebangIfNeeded(sourceFileOrBundle) {
+            if (ts.isSourceFile(sourceFileOrBundle)) {
+                var shebang = ts.getShebang(sourceFileOrBundle.text);
+                if (shebang) {
+                    writeComment(shebang);
+                    writeLine();
+                    return true;
+                }
+            }
+            else {
+                for (var _a = 0, _b = sourceFileOrBundle.sourceFiles; _a < _b.length; _a++) {
+                    var sourceFile = _b[_a];
+                    // Emit only the first encountered shebang
+                    if (emitShebangIfNeeded(sourceFile)) {
+                        break;
+                    }
+                }
+            }
+        }
+        //
+        // Helpers
+        //
+        function emitNodeWithWriter(node, writer) {
+            if (!node)
+                return;
+            var savedWrite = write;
+            write = writer;
+            emit(node);
+            write = savedWrite;
+        }
+        function emitModifiers(node, modifiers) {
+            if (modifiers && modifiers.length) {
+                emitList(node, modifiers, 262656 /* Modifiers */);
+                writeSpace();
+            }
+        }
+        function emitTypeAnnotation(node) {
+            if (node) {
+                writePunctuation(":");
+                writeSpace();
+                emit(node);
+            }
+        }
+        function emitInitializer(node, equalCommentStartPos, container) {
+            if (node) {
+                writeSpace();
+                emitTokenWithComment(59 /* EqualsToken */, equalCommentStartPos, writeOperator, container);
+                writeSpace();
+                emitExpression(node);
+            }
+        }
+        function emitNodeWithPrefix(prefix, prefixWriter, node, emit) {
+            if (node) {
+                prefixWriter(prefix);
+                emit(node);
+            }
+        }
+        function emitWithLeadingSpace(node) {
+            if (node) {
+                writeSpace();
+                emit(node);
+            }
+        }
+        function emitExpressionWithLeadingSpace(node) {
+            if (node) {
+                writeSpace();
+                emitExpression(node);
+            }
+        }
+        function emitWithTrailingSpace(node) {
+            if (node) {
+                emit(node);
+                writeSpace();
+            }
+        }
+        function emitEmbeddedStatement(parent, node) {
+            if (ts.isBlock(node) || ts.getEmitFlags(parent) & 1 /* SingleLine */) {
+                writeSpace();
+                emit(node);
+            }
+            else {
+                writeLine();
+                increaseIndent();
+                if (ts.isEmptyStatement(node)) {
+                    var pipelinePhase = getPipelinePhase(0 /* Notification */, node);
+                    pipelinePhase(5 /* EmbeddedStatement */, node);
+                }
+                else {
+                    emit(node);
+                }
+                decreaseIndent();
+            }
+        }
+        function emitDecorators(parentNode, decorators) {
+            emitList(parentNode, decorators, 49153 /* Decorators */);
+        }
+        function emitTypeArguments(parentNode, typeArguments) {
+            emitList(parentNode, typeArguments, 53776 /* TypeArguments */);
+        }
+        function emitTypeParameters(parentNode, typeParameters) {
+            if (ts.isFunctionLike(parentNode) && parentNode.typeArguments) { // Quick info uses type arguments in place of type parameters on instantiated signatures
+                return emitTypeArguments(parentNode, parentNode.typeArguments);
+            }
+            emitList(parentNode, typeParameters, 53776 /* TypeParameters */);
+        }
+        function emitParameters(parentNode, parameters) {
+            emitList(parentNode, parameters, 2576 /* Parameters */);
+        }
+        function canEmitSimpleArrowHead(parentNode, parameters) {
+            var parameter = ts.singleOrUndefined(parameters);
+            return parameter
+                && parameter.pos === parentNode.pos // may not have parsed tokens between parent and parameter
+                && ts.isArrowFunction(parentNode) // only arrow functions may have simple arrow head
+                && !parentNode.type // arrow function may not have return type annotation
+                && !ts.some(parentNode.decorators) // parent may not have decorators
+                && !ts.some(parentNode.modifiers) // parent may not have modifiers
+                && !ts.some(parentNode.typeParameters) // parent may not have type parameters
+                && !ts.some(parameter.decorators) // parameter may not have decorators
+                && !ts.some(parameter.modifiers) // parameter may not have modifiers
+                && !parameter.dotDotDotToken // parameter may not be rest
+                && !parameter.questionToken // parameter may not be optional
+                && !parameter.type // parameter may not have a type annotation
+                && !parameter.initializer // parameter may not have an initializer
+                && ts.isIdentifier(parameter.name); // parameter name must be identifier
+        }
+        function emitParametersForArrow(parentNode, parameters) {
+            if (canEmitSimpleArrowHead(parentNode, parameters)) {
+                emitList(parentNode, parameters, 2576 /* Parameters */ & ~2048 /* Parenthesis */);
+            }
+            else {
+                emitParameters(parentNode, parameters);
+            }
+        }
+        function emitParametersForIndexSignature(parentNode, parameters) {
+            emitList(parentNode, parameters, 8848 /* IndexSignatureParameters */);
+        }
+        function emitList(parentNode, children, format, start, count) {
+            emitNodeList(emit, parentNode, children, format, start, count);
+        }
+        function emitExpressionList(parentNode, children, format, start, count) {
+            emitNodeList(emitExpression, parentNode, children, format, start, count); // TODO: GH#18217
+        }
+        function writeDelimiter(format) {
+            switch (format & 60 /* DelimitersMask */) {
+                case 0 /* None */:
+                    break;
+                case 16 /* CommaDelimited */:
+                    writePunctuation(",");
+                    break;
+                case 4 /* BarDelimited */:
+                    writeSpace();
+                    writePunctuation("|");
+                    break;
+                case 32 /* AsteriskDelimited */:
+                    writeSpace();
+                    writePunctuation("*");
+                    writeSpace();
+                    break;
+                case 8 /* AmpersandDelimited */:
+                    writeSpace();
+                    writePunctuation("&");
+                    break;
+            }
+        }
+        function emitNodeList(emit, parentNode, children, format, start, count) {
+            if (start === void 0) { start = 0; }
+            if (count === void 0) { count = children ? children.length - start : 0; }
+            var isUndefined = children === undefined;
+            if (isUndefined && format & 16384 /* OptionalIfUndefined */) {
+                return;
+            }
+            var isEmpty = children === undefined || start >= children.length || count === 0;
+            if (isEmpty && format & 32768 /* OptionalIfEmpty */) {
+                if (onBeforeEmitNodeArray) {
+                    onBeforeEmitNodeArray(children);
+                }
+                if (onAfterEmitNodeArray) {
+                    onAfterEmitNodeArray(children);
+                }
+                return;
+            }
+            if (format & 15360 /* BracketsMask */) {
+                writePunctuation(getOpeningBracket(format));
+                if (isEmpty && !isUndefined) {
+                    // TODO: GH#18217
+                    emitTrailingCommentsOfPosition(children.pos, /*prefixSpace*/ true); // Emit comments within empty bracketed lists
+                }
+            }
+            if (onBeforeEmitNodeArray) {
+                onBeforeEmitNodeArray(children);
+            }
+            if (isEmpty) {
+                // Write a line terminator if the parent node was multi-line
+                if (format & 1 /* MultiLine */) {
+                    writeLine();
+                }
+                else if (format & 256 /* SpaceBetweenBraces */ && !(format & 524288 /* NoSpaceIfEmpty */)) {
+                    writeSpace();
+                }
+            }
+            else {
+                // Write the opening line terminator or leading whitespace.
+                var mayEmitInterveningComments = (format & 262144 /* NoInterveningComments */) === 0;
+                var shouldEmitInterveningComments = mayEmitInterveningComments;
+                if (shouldWriteLeadingLineTerminator(parentNode, children, format)) { // TODO: GH#18217
+                    writeLine();
+                    shouldEmitInterveningComments = false;
+                }
+                else if (format & 256 /* SpaceBetweenBraces */) {
+                    writeSpace();
+                }
+                // Increase the indent, if requested.
+                if (format & 128 /* Indented */) {
+                    increaseIndent();
+                }
+                // Emit each child.
+                var previousSibling = void 0;
+                var shouldDecreaseIndentAfterEmit = false;
+                for (var i = 0; i < count; i++) {
+                    var child = children[start + i];
+                    // Write the delimiter if this is not the first node.
+                    if (format & 32 /* AsteriskDelimited */) {
+                        // always write JSDoc in the format "\n *"
+                        writeLine();
+                        writeDelimiter(format);
+                    }
+                    else if (previousSibling) {
+                        // i.e
+                        //      function commentedParameters(
+                        //          /* Parameter a */
+                        //          a
+                        //          /* End of parameter a */ -> this comment isn't considered to be trailing comment of parameter "a" due to newline
+                        //          ,
+                        if (format & 60 /* DelimitersMask */ && previousSibling.end !== parentNode.end) {
+                            emitLeadingCommentsOfPosition(previousSibling.end);
+                        }
+                        writeDelimiter(format);
+                        // Write either a line terminator or whitespace to separate the elements.
+                        if (shouldWriteSeparatingLineTerminator(previousSibling, child, format)) {
+                            // If a synthesized node in a single-line list starts on a new
+                            // line, we should increase the indent.
+                            if ((format & (3 /* LinesMask */ | 128 /* Indented */)) === 0 /* SingleLine */) {
+                                increaseIndent();
+                                shouldDecreaseIndentAfterEmit = true;
+                            }
+                            writeLine();
+                            shouldEmitInterveningComments = false;
+                        }
+                        else if (previousSibling && format & 512 /* SpaceBetweenSiblings */) {
+                            writeSpace();
+                        }
+                    }
+                    // Emit this child.
+                    if (shouldEmitInterveningComments) {
+                        if (emitTrailingCommentsOfPosition) {
+                            var commentRange = ts.getCommentRange(child);
+                            emitTrailingCommentsOfPosition(commentRange.pos);
+                        }
+                    }
+                    else {
+                        shouldEmitInterveningComments = mayEmitInterveningComments;
+                    }
+                    emit(child);
+                    if (shouldDecreaseIndentAfterEmit) {
+                        decreaseIndent();
+                        shouldDecreaseIndentAfterEmit = false;
+                    }
+                    previousSibling = child;
+                }
+                // Write a trailing comma, if requested.
+                var hasTrailingComma = (format & 64 /* AllowTrailingComma */) && children.hasTrailingComma;
+                if (format & 16 /* CommaDelimited */ && hasTrailingComma) {
+                    writePunctuation(",");
+                }
+                // Emit any trailing comment of the last element in the list
+                // i.e
+                //       var array = [...
+                //          2
+                //          /* end of element 2 */
+                //       ];
+                if (previousSibling && format & 60 /* DelimitersMask */ && previousSibling.end !== parentNode.end && !(ts.getEmitFlags(previousSibling) & 1024 /* NoTrailingComments */)) {
+                    emitLeadingCommentsOfPosition(previousSibling.end);
+                }
+                // Decrease the indent, if requested.
+                if (format & 128 /* Indented */) {
+                    decreaseIndent();
+                }
+                // Write the closing line terminator or closing whitespace.
+                if (shouldWriteClosingLineTerminator(parentNode, children, format)) {
+                    writeLine();
+                }
+                else if (format & 256 /* SpaceBetweenBraces */) {
+                    writeSpace();
+                }
+            }
+            if (onAfterEmitNodeArray) {
+                onAfterEmitNodeArray(children);
+            }
+            if (format & 15360 /* BracketsMask */) {
+                if (isEmpty && !isUndefined) {
+                    // TODO: GH#18217
+                    emitLeadingCommentsOfPosition(children.end); // Emit leading comments within empty lists
+                }
+                writePunctuation(getClosingBracket(format));
+            }
+        }
+        // Writers
+        function writeLiteral(s) {
+            writer.writeLiteral(s);
+        }
+        function writeStringLiteral(s) {
+            writer.writeStringLiteral(s);
+        }
+        function writeBase(s) {
+            writer.write(s);
+        }
+        function writeSymbol(s, sym) {
+            writer.writeSymbol(s, sym);
+        }
+        function writePunctuation(s) {
+            writer.writePunctuation(s);
+        }
+        function writeTrailingSemicolon() {
+            writer.writeTrailingSemicolon(";");
+        }
+        function writeKeyword(s) {
+            writer.writeKeyword(s);
+        }
+        function writeOperator(s) {
+            writer.writeOperator(s);
+        }
+        function writeParameter(s) {
+            writer.writeParameter(s);
+        }
+        function writeComment(s) {
+            writer.writeComment(s);
+        }
+        function writeSpace() {
+            writer.writeSpace(" ");
+        }
+        function writeProperty(s) {
+            writer.writeProperty(s);
+        }
+        function writeLine() {
+            writer.writeLine();
+        }
+        function increaseIndent() {
+            writer.increaseIndent();
+        }
+        function decreaseIndent() {
+            writer.decreaseIndent();
+        }
+        function writeToken(token, pos, writer, contextNode) {
+            return !sourceMapsDisabled
+                ? emitTokenWithSourceMap(contextNode, token, writer, pos, writeTokenText)
+                : writeTokenText(token, writer, pos);
+        }
+        function writeTokenNode(node, writer) {
+            if (onBeforeEmitToken) {
+                onBeforeEmitToken(node);
+            }
+            writer(ts.tokenToString(node.kind));
+            if (onAfterEmitToken) {
+                onAfterEmitToken(node);
+            }
+        }
+        function writeTokenText(token, writer, pos) {
+            var tokenString = ts.tokenToString(token);
+            writer(tokenString);
+            return pos < 0 ? pos : pos + tokenString.length;
+        }
+        function writeLineOrSpace(node) {
+            if (ts.getEmitFlags(node) & 1 /* SingleLine */) {
+                writeSpace();
+            }
+            else {
+                writeLine();
+            }
+        }
+        function writeLines(text) {
+            var lines = text.split(/\r\n?|\n/g);
+            var indentation = ts.guessIndentation(lines);
+            for (var _a = 0, lines_3 = lines; _a < lines_3.length; _a++) {
+                var lineText = lines_3[_a];
+                var line = indentation ? lineText.slice(indentation) : lineText;
+                if (line.length) {
+                    writeLine();
+                    write(line);
+                    writer.rawWrite(newLine);
+                }
+            }
+        }
+        function increaseIndentIf(value, writeSpaceIfNotIndenting) {
+            if (value) {
+                increaseIndent();
+                writeLine();
+            }
+            else if (writeSpaceIfNotIndenting) {
+                writeSpace();
+            }
+        }
+        // Helper function to decrease the indent if we previously indented.  Allows multiple
+        // previous indent values to be considered at a time.  This also allows caller to just
+        // call this once, passing in all their appropriate indent values, instead of needing
+        // to call this helper function multiple times.
+        function decreaseIndentIf(value1, value2) {
+            if (value1) {
+                decreaseIndent();
+            }
+            if (value2) {
+                decreaseIndent();
+            }
+        }
+        function shouldWriteLeadingLineTerminator(parentNode, children, format) {
+            if (format & 1 /* MultiLine */) {
+                return true;
+            }
+            if (format & 2 /* PreserveLines */) {
+                if (format & 65536 /* PreferNewLine */) {
+                    return true;
+                }
+                var firstChild = children[0];
+                if (firstChild === undefined) {
+                    return !ts.rangeIsOnSingleLine(parentNode, currentSourceFile);
+                }
+                else if (ts.positionIsSynthesized(parentNode.pos) || ts.nodeIsSynthesized(firstChild)) {
+                    return synthesizedNodeStartsOnNewLine(firstChild, format);
+                }
+                else {
+                    return !ts.rangeStartPositionsAreOnSameLine(parentNode, firstChild, currentSourceFile);
+                }
+            }
+            else {
+                return false;
+            }
+        }
+        function shouldWriteSeparatingLineTerminator(previousNode, nextNode, format) {
+            if (format & 1 /* MultiLine */) {
+                return true;
+            }
+            else if (format & 2 /* PreserveLines */) {
+                if (previousNode === undefined || nextNode === undefined) {
+                    return false;
+                }
+                else if (ts.nodeIsSynthesized(previousNode) || ts.nodeIsSynthesized(nextNode)) {
+                    return synthesizedNodeStartsOnNewLine(previousNode, format) || synthesizedNodeStartsOnNewLine(nextNode, format);
+                }
+                else {
+                    return !ts.rangeEndIsOnSameLineAsRangeStart(previousNode, nextNode, currentSourceFile);
+                }
+            }
+            else {
+                return ts.getStartsOnNewLine(nextNode);
+            }
+        }
+        function shouldWriteClosingLineTerminator(parentNode, children, format) {
+            if (format & 1 /* MultiLine */) {
+                return (format & 131072 /* NoTrailingNewLine */) === 0;
+            }
+            else if (format & 2 /* PreserveLines */) {
+                if (format & 65536 /* PreferNewLine */) {
+                    return true;
+                }
+                var lastChild = ts.lastOrUndefined(children);
+                if (lastChild === undefined) {
+                    return !ts.rangeIsOnSingleLine(parentNode, currentSourceFile);
+                }
+                else if (ts.positionIsSynthesized(parentNode.pos) || ts.nodeIsSynthesized(lastChild)) {
+                    return synthesizedNodeStartsOnNewLine(lastChild, format);
+                }
+                else {
+                    return !ts.rangeEndPositionsAreOnSameLine(parentNode, lastChild, currentSourceFile);
+                }
+            }
+            else {
+                return false;
+            }
+        }
+        function synthesizedNodeStartsOnNewLine(node, format) {
+            if (ts.nodeIsSynthesized(node)) {
+                var startsOnNewLine = ts.getStartsOnNewLine(node);
+                if (startsOnNewLine === undefined) {
+                    return (format & 65536 /* PreferNewLine */) !== 0;
+                }
+                return startsOnNewLine;
+            }
+            return (format & 65536 /* PreferNewLine */) !== 0;
+        }
+        function needsIndentation(parent, node1, node2) {
+            parent = skipSynthesizedParentheses(parent);
+            node1 = skipSynthesizedParentheses(node1);
+            node2 = skipSynthesizedParentheses(node2);
+            // Always use a newline for synthesized code if the synthesizer desires it.
+            if (ts.getStartsOnNewLine(node2)) {
+                return true;
+            }
+            return !ts.nodeIsSynthesized(parent)
+                && !ts.nodeIsSynthesized(node1)
+                && !ts.nodeIsSynthesized(node2)
+                && !ts.rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile);
+        }
+        function isEmptyBlock(block) {
+            return block.statements.length === 0
+                && ts.rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile);
+        }
+        function skipSynthesizedParentheses(node) {
+            while (node.kind === 195 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) {
+                node = node.expression;
+            }
+            return node;
+        }
+        function getTextOfNode(node, includeTrivia) {
+            if (ts.isGeneratedIdentifier(node)) {
+                return generateName(node);
+            }
+            else if (ts.isIdentifier(node) && (ts.nodeIsSynthesized(node) || !node.parent || !currentSourceFile || (node.parent && currentSourceFile && ts.getSourceFileOfNode(node) !== ts.getOriginalNode(currentSourceFile)))) {
+                return ts.idText(node);
+            }
+            else if (node.kind === 10 /* StringLiteral */ && node.textSourceNode) {
+                return getTextOfNode(node.textSourceNode, includeTrivia);
+            }
+            else if (ts.isLiteralExpression(node) && (ts.nodeIsSynthesized(node) || !node.parent)) {
+                return node.text;
+            }
+            return ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node, includeTrivia);
+        }
+        function getLiteralTextOfNode(node, neverAsciiEscape) {
+            if (node.kind === 10 /* StringLiteral */ && node.textSourceNode) {
+                var textSourceNode = node.textSourceNode;
+                if (ts.isIdentifier(textSourceNode)) {
+                    return neverAsciiEscape || (ts.getEmitFlags(node) & 16777216 /* NoAsciiEscaping */) ?
+                        "\"" + ts.escapeString(getTextOfNode(textSourceNode)) + "\"" :
+                        "\"" + ts.escapeNonAsciiString(getTextOfNode(textSourceNode)) + "\"";
+                }
+                else {
+                    return getLiteralTextOfNode(textSourceNode, neverAsciiEscape);
+                }
+            }
+            return ts.getLiteralText(node, currentSourceFile, neverAsciiEscape);
+        }
+        /**
+         * Push a new name generation scope.
+         */
+        function pushNameGenerationScope(node) {
+            if (node && ts.getEmitFlags(node) & 524288 /* ReuseTempVariableScope */) {
+                return;
+            }
+            tempFlagsStack.push(tempFlags);
+            tempFlags = 0;
+            reservedNamesStack.push(reservedNames);
+        }
+        /**
+         * Pop the current name generation scope.
+         */
+        function popNameGenerationScope(node) {
+            if (node && ts.getEmitFlags(node) & 524288 /* ReuseTempVariableScope */) {
+                return;
+            }
+            tempFlags = tempFlagsStack.pop();
+            reservedNames = reservedNamesStack.pop();
+        }
+        function reserveNameInNestedScopes(name) {
+            if (!reservedNames || reservedNames === ts.lastOrUndefined(reservedNamesStack)) {
+                reservedNames = ts.createMap();
+            }
+            reservedNames.set(name, true);
+        }
+        function generateNames(node) {
+            if (!node)
+                return;
+            switch (node.kind) {
+                case 218 /* Block */:
+                    ts.forEach(node.statements, generateNames);
+                    break;
+                case 233 /* LabeledStatement */:
+                case 231 /* WithStatement */:
+                case 223 /* DoStatement */:
+                case 224 /* WhileStatement */:
+                    generateNames(node.statement);
+                    break;
+                case 222 /* IfStatement */:
+                    generateNames(node.thenStatement);
+                    generateNames(node.elseStatement);
+                    break;
+                case 225 /* ForStatement */:
+                case 227 /* ForOfStatement */:
+                case 226 /* ForInStatement */:
+                    generateNames(node.initializer);
+                    generateNames(node.statement);
+                    break;
+                case 232 /* SwitchStatement */:
+                    generateNames(node.caseBlock);
+                    break;
+                case 246 /* CaseBlock */:
+                    ts.forEach(node.clauses, generateNames);
+                    break;
+                case 271 /* CaseClause */:
+                case 272 /* DefaultClause */:
+                    ts.forEach(node.statements, generateNames);
+                    break;
+                case 235 /* TryStatement */:
+                    generateNames(node.tryBlock);
+                    generateNames(node.catchClause);
+                    generateNames(node.finallyBlock);
+                    break;
+                case 274 /* CatchClause */:
+                    generateNames(node.variableDeclaration);
+                    generateNames(node.block);
+                    break;
+                case 219 /* VariableStatement */:
+                    generateNames(node.declarationList);
+                    break;
+                case 238 /* VariableDeclarationList */:
+                    ts.forEach(node.declarations, generateNames);
+                    break;
+                case 237 /* VariableDeclaration */:
+                case 151 /* Parameter */:
+                case 186 /* BindingElement */:
+                case 240 /* ClassDeclaration */:
+                    generateNameIfNeeded(node.name);
+                    break;
+                case 239 /* FunctionDeclaration */:
+                    generateNameIfNeeded(node.name);
+                    if (ts.getEmitFlags(node) & 524288 /* ReuseTempVariableScope */) {
+                        ts.forEach(node.parameters, generateNames);
+                        generateNames(node.body);
+                    }
+                    break;
+                case 184 /* ObjectBindingPattern */:
+                case 185 /* ArrayBindingPattern */:
+                    ts.forEach(node.elements, generateNames);
+                    break;
+                case 249 /* ImportDeclaration */:
+                    generateNames(node.importClause);
+                    break;
+                case 250 /* ImportClause */:
+                    generateNameIfNeeded(node.name);
+                    generateNames(node.namedBindings);
+                    break;
+                case 251 /* NamespaceImport */:
+                    generateNameIfNeeded(node.name);
+                    break;
+                case 252 /* NamedImports */:
+                    ts.forEach(node.elements, generateNames);
+                    break;
+                case 253 /* ImportSpecifier */:
+                    generateNameIfNeeded(node.propertyName || node.name);
+                    break;
+            }
+        }
+        function generateMemberNames(node) {
+            if (!node)
+                return;
+            switch (node.kind) {
+                case 275 /* PropertyAssignment */:
+                case 276 /* ShorthandPropertyAssignment */:
+                case 154 /* PropertyDeclaration */:
+                case 156 /* MethodDeclaration */:
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                    generateNameIfNeeded(node.name);
+                    break;
+            }
+        }
+        function generateNameIfNeeded(name) {
+            if (name) {
+                if (ts.isGeneratedIdentifier(name)) {
+                    generateName(name);
+                }
+                else if (ts.isBindingPattern(name)) {
+                    generateNames(name);
+                }
+            }
+        }
+        /**
+         * Generate the text for a generated identifier.
+         */
+        function generateName(name) {
+            if ((name.autoGenerateFlags & 7 /* KindMask */) === 4 /* Node */) {
+                // Node names generate unique names based on their original node
+                // and are cached based on that node's id.
+                return generateNameCached(getNodeForGeneratedName(name), name.autoGenerateFlags);
+            }
+            else {
+                // Auto, Loop, and Unique names are cached based on their unique
+                // autoGenerateId.
+                var autoGenerateId = name.autoGenerateId;
+                return autoGeneratedIdToGeneratedName[autoGenerateId] || (autoGeneratedIdToGeneratedName[autoGenerateId] = makeName(name));
+            }
+        }
+        function generateNameCached(node, flags) {
+            var nodeId = ts.getNodeId(node);
+            return nodeIdToGeneratedName[nodeId] || (nodeIdToGeneratedName[nodeId] = generateNameForNode(node, flags));
+        }
+        /**
+         * Returns a value indicating whether a name is unique globally, within the current file,
+         * or within the NameGenerator.
+         */
+        function isUniqueName(name) {
+            return isFileLevelUniqueName(name)
+                && !generatedNames.has(name)
+                && !(reservedNames && reservedNames.has(name));
+        }
+        /**
+         * Returns a value indicating whether a name is unique globally or within the current file.
+         */
+        function isFileLevelUniqueName(name) {
+            return currentSourceFile ? ts.isFileLevelUniqueName(currentSourceFile, name, hasGlobalName) : true;
+        }
+        /**
+         * Returns a value indicating whether a name is unique within a container.
+         */
+        function isUniqueLocalName(name, container) {
+            for (var node = container; ts.isNodeDescendantOf(node, container); node = node.nextContainer) {
+                if (node.locals) {
+                    var local = node.locals.get(ts.escapeLeadingUnderscores(name));
+                    // We conservatively include alias symbols to cover cases where they're emitted as locals
+                    if (local && local.flags & (67220415 /* Value */ | 1048576 /* ExportValue */ | 2097152 /* Alias */)) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+        /**
+         * Return the next available name in the pattern _a ... _z, _0, _1, ...
+         * TempFlags._i or TempFlags._n may be used to express a preference for that dedicated name.
+         * Note that names generated by makeTempVariableName and makeUniqueName will never conflict.
+         */
+        function makeTempVariableName(flags, reservedInNestedScopes) {
+            if (flags && !(tempFlags & flags)) {
+                var name = flags === 268435456 /* _i */ ? "_i" : "_n";
+                if (isUniqueName(name)) {
+                    tempFlags |= flags;
+                    if (reservedInNestedScopes) {
+                        reserveNameInNestedScopes(name);
+                    }
+                    return name;
+                }
+            }
+            while (true) {
+                var count = tempFlags & 268435455 /* CountMask */;
+                tempFlags++;
+                // Skip over 'i' and 'n'
+                if (count !== 8 && count !== 13) {
+                    var name = count < 26
+                        ? "_" + String.fromCharCode(97 /* a */ + count)
+                        : "_" + (count - 26);
+                    if (isUniqueName(name)) {
+                        if (reservedInNestedScopes) {
+                            reserveNameInNestedScopes(name);
+                        }
+                        return name;
+                    }
+                }
+            }
+        }
+        /**
+         * Generate a name that is unique within the current file and doesn't conflict with any names
+         * in global scope. The name is formed by adding an '_n' suffix to the specified base name,
+         * where n is a positive integer. Note that names generated by makeTempVariableName and
+         * makeUniqueName are guaranteed to never conflict.
+         * If `optimistic` is set, the first instance will use 'baseName' verbatim instead of 'baseName_1'
+         */
+        function makeUniqueName(baseName, checkFn, optimistic, scoped) {
+            if (checkFn === void 0) { checkFn = isUniqueName; }
+            if (optimistic) {
+                if (checkFn(baseName)) {
+                    if (scoped) {
+                        reserveNameInNestedScopes(baseName);
+                    }
+                    else {
+                        generatedNames.set(baseName, true);
+                    }
+                    return baseName;
+                }
+            }
+            // Find the first unique 'name_n', where n is a positive number
+            if (baseName.charCodeAt(baseName.length - 1) !== 95 /* _ */) {
+                baseName += "_";
+            }
+            var i = 1;
+            while (true) {
+                var generatedName = baseName + i;
+                if (checkFn(generatedName)) {
+                    if (scoped) {
+                        reserveNameInNestedScopes(generatedName);
+                    }
+                    else {
+                        generatedNames.set(generatedName, true);
+                    }
+                    return generatedName;
+                }
+                i++;
+            }
+        }
+        function makeFileLevelOptimisticUniqueName(name) {
+            return makeUniqueName(name, isFileLevelUniqueName, /*optimistic*/ true);
+        }
+        /**
+         * Generates a unique name for a ModuleDeclaration or EnumDeclaration.
+         */
+        function generateNameForModuleOrEnum(node) {
+            var name = getTextOfNode(node.name);
+            // Use module/enum name itself if it is unique, otherwise make a unique variation
+            return isUniqueLocalName(name, node) ? name : makeUniqueName(name);
+        }
+        /**
+         * Generates a unique name for an ImportDeclaration or ExportDeclaration.
+         */
+        function generateNameForImportOrExportDeclaration(node) {
+            var expr = ts.getExternalModuleName(node); // TODO: GH#18217
+            var baseName = ts.isStringLiteral(expr) ?
+                ts.makeIdentifierFromModuleName(expr.text) : "module";
+            return makeUniqueName(baseName);
+        }
+        /**
+         * Generates a unique name for a default export.
+         */
+        function generateNameForExportDefault() {
+            return makeUniqueName("default");
+        }
+        /**
+         * Generates a unique name for a class expression.
+         */
+        function generateNameForClassExpression() {
+            return makeUniqueName("class");
+        }
+        function generateNameForMethodOrAccessor(node) {
+            if (ts.isIdentifier(node.name)) {
+                return generateNameCached(node.name);
+            }
+            return makeTempVariableName(0 /* Auto */);
+        }
+        /**
+         * Generates a unique name from a node.
+         */
+        function generateNameForNode(node, flags) {
+            switch (node.kind) {
+                case 72 /* Identifier */:
+                    return makeUniqueName(getTextOfNode(node), isUniqueName, !!(flags & 16 /* Optimistic */), !!(flags & 8 /* ReservedInNestedScopes */));
+                case 244 /* ModuleDeclaration */:
+                case 243 /* EnumDeclaration */:
+                    return generateNameForModuleOrEnum(node);
+                case 249 /* ImportDeclaration */:
+                case 255 /* ExportDeclaration */:
+                    return generateNameForImportOrExportDeclaration(node);
+                case 239 /* FunctionDeclaration */:
+                case 240 /* ClassDeclaration */:
+                case 254 /* ExportAssignment */:
+                    return generateNameForExportDefault();
+                case 209 /* ClassExpression */:
+                    return generateNameForClassExpression();
+                case 156 /* MethodDeclaration */:
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                    return generateNameForMethodOrAccessor(node);
+                default:
+                    return makeTempVariableName(0 /* Auto */);
+            }
+        }
+        /**
+         * Generates a unique identifier for a node.
+         */
+        function makeName(name) {
+            switch (name.autoGenerateFlags & 7 /* KindMask */) {
+                case 1 /* Auto */:
+                    return makeTempVariableName(0 /* Auto */, !!(name.autoGenerateFlags & 8 /* ReservedInNestedScopes */));
+                case 2 /* Loop */:
+                    return makeTempVariableName(268435456 /* _i */, !!(name.autoGenerateFlags & 8 /* ReservedInNestedScopes */));
+                case 3 /* Unique */:
+                    return makeUniqueName(ts.idText(name), (name.autoGenerateFlags & 32 /* FileLevel */) ? isFileLevelUniqueName : isUniqueName, !!(name.autoGenerateFlags & 16 /* Optimistic */), !!(name.autoGenerateFlags & 8 /* ReservedInNestedScopes */));
+            }
+            return ts.Debug.fail("Unsupported GeneratedIdentifierKind.");
+        }
+        /**
+         * Gets the node from which a name should be generated.
+         */
+        function getNodeForGeneratedName(name) {
+            var autoGenerateId = name.autoGenerateId;
+            var node = name;
+            var original = node.original;
+            while (original) {
+                node = original;
+                // if "node" is a different generated name (having a different
+                // "autoGenerateId"), use it and stop traversing.
+                if (ts.isIdentifier(node)
+                    && !!(node.autoGenerateFlags & 4 /* Node */)
+                    && node.autoGenerateId !== autoGenerateId) {
+                    break;
+                }
+                original = node.original;
+            }
+            // otherwise, return the original node for the source;
+            return node;
+        }
+        // Comments
+        function pipelineEmitWithComments(hint, node) {
+            enterComment();
+            hasWrittenComment = false;
+            var emitFlags = ts.getEmitFlags(node);
+            var _a = ts.getCommentRange(node), pos = _a.pos, end = _a.end;
+            var isEmittedNode = node.kind !== 307 /* NotEmittedStatement */;
+            // We have to explicitly check that the node is JsxText because if the compilerOptions.jsx is "preserve" we will not do any transformation.
+            // It is expensive to walk entire tree just to set one kind of node to have no comments.
+            var skipLeadingComments = pos < 0 || (emitFlags & 512 /* NoLeadingComments */) !== 0 || node.kind === 11 /* JsxText */;
+            var skipTrailingComments = end < 0 || (emitFlags & 1024 /* NoTrailingComments */) !== 0 || node.kind === 11 /* JsxText */;
+            // Save current container state on the stack.
+            var savedContainerPos = containerPos;
+            var savedContainerEnd = containerEnd;
+            var savedDeclarationListContainerEnd = declarationListContainerEnd;
+            if ((pos > 0 || end > 0) && pos !== end) {
+                // Emit leading comments if the position is not synthesized and the node
+                // has not opted out from emitting leading comments.
+                if (!skipLeadingComments) {
+                    emitLeadingComments(pos, isEmittedNode);
+                }
+                if (!skipLeadingComments || (pos >= 0 && (emitFlags & 512 /* NoLeadingComments */) !== 0)) {
+                    // Advance the container position if comments get emitted or if they've been disabled explicitly using NoLeadingComments.
+                    containerPos = pos;
+                }
+                if (!skipTrailingComments || (end >= 0 && (emitFlags & 1024 /* NoTrailingComments */) !== 0)) {
+                    // As above.
+                    containerEnd = end;
+                    // To avoid invalid comment emit in a down-level binding pattern, we
+                    // keep track of the last declaration list container's end
+                    if (node.kind === 238 /* VariableDeclarationList */) {
+                        declarationListContainerEnd = end;
+                    }
+                }
+            }
+            ts.forEach(ts.getSyntheticLeadingComments(node), emitLeadingSynthesizedComment);
+            exitComment();
+            var pipelinePhase = getNextPipelinePhase(2 /* Comments */, node);
+            if (emitFlags & 2048 /* NoNestedComments */) {
+                commentsDisabled = true;
+                pipelinePhase(hint, node);
+                commentsDisabled = false;
+            }
+            else {
+                pipelinePhase(hint, node);
+            }
+            enterComment();
+            ts.forEach(ts.getSyntheticTrailingComments(node), emitTrailingSynthesizedComment);
+            if ((pos > 0 || end > 0) && pos !== end) {
+                // Restore previous container state.
+                containerPos = savedContainerPos;
+                containerEnd = savedContainerEnd;
+                declarationListContainerEnd = savedDeclarationListContainerEnd;
+                // Emit trailing comments if the position is not synthesized and the node
+                // has not opted out from emitting leading comments and is an emitted node.
+                if (!skipTrailingComments && isEmittedNode) {
+                    emitTrailingComments(end);
+                }
+            }
+            exitComment();
+        }
+        function emitLeadingSynthesizedComment(comment) {
+            if (comment.kind === 2 /* SingleLineCommentTrivia */) {
+                writer.writeLine();
+            }
+            writeSynthesizedComment(comment);
+            if (comment.hasTrailingNewLine || comment.kind === 2 /* SingleLineCommentTrivia */) {
+                writer.writeLine();
+            }
+            else {
+                writer.writeSpace(" ");
+            }
+        }
+        function emitTrailingSynthesizedComment(comment) {
+            if (!writer.isAtStartOfLine()) {
+                writer.writeSpace(" ");
+            }
+            writeSynthesizedComment(comment);
+            if (comment.hasTrailingNewLine) {
+                writer.writeLine();
+            }
+        }
+        function writeSynthesizedComment(comment) {
+            var text = formatSynthesizedComment(comment);
+            var lineMap = comment.kind === 3 /* MultiLineCommentTrivia */ ? ts.computeLineStarts(text) : undefined;
+            ts.writeCommentRange(text, lineMap, writer, 0, text.length, newLine);
+        }
+        function formatSynthesizedComment(comment) {
+            return comment.kind === 3 /* MultiLineCommentTrivia */
+                ? "/*" + comment.text + "*/"
+                : "//" + comment.text;
+        }
+        function emitBodyWithDetachedComments(node, detachedRange, emitCallback) {
+            enterComment();
+            var pos = detachedRange.pos, end = detachedRange.end;
+            var emitFlags = ts.getEmitFlags(node);
+            var skipLeadingComments = pos < 0 || (emitFlags & 512 /* NoLeadingComments */) !== 0;
+            var skipTrailingComments = commentsDisabled || end < 0 || (emitFlags & 1024 /* NoTrailingComments */) !== 0;
+            if (!skipLeadingComments) {
+                emitDetachedCommentsAndUpdateCommentsInfo(detachedRange);
+            }
+            exitComment();
+            if (emitFlags & 2048 /* NoNestedComments */ && !commentsDisabled) {
+                commentsDisabled = true;
+                emitCallback(node);
+                commentsDisabled = false;
+            }
+            else {
+                emitCallback(node);
+            }
+            enterComment();
+            if (!skipTrailingComments) {
+                emitLeadingComments(detachedRange.end, /*isEmittedNode*/ true);
+                if (hasWrittenComment && !writer.isAtStartOfLine()) {
+                    writer.writeLine();
+                }
+            }
+            exitComment();
+        }
+        function emitLeadingComments(pos, isEmittedNode) {
+            hasWrittenComment = false;
+            if (isEmittedNode) {
+                forEachLeadingCommentToEmit(pos, emitLeadingComment);
+            }
+            else if (pos === 0) {
+                // If the node will not be emitted in JS, remove all the comments(normal, pinned and ///) associated with the node,
+                // unless it is a triple slash comment at the top of the file.
+                // For Example:
+                //      /// <reference-path ...>
+                //      declare var x;
+                //      /// <reference-path ...>
+                //      interface F {}
+                //  The first /// will NOT be removed while the second one will be removed even though both node will not be emitted
+                forEachLeadingCommentToEmit(pos, emitTripleSlashLeadingComment);
+            }
+        }
+        function emitTripleSlashLeadingComment(commentPos, commentEnd, kind, hasTrailingNewLine, rangePos) {
+            if (isTripleSlashComment(commentPos, commentEnd)) {
+                emitLeadingComment(commentPos, commentEnd, kind, hasTrailingNewLine, rangePos);
+            }
+        }
+        function shouldWriteComment(text, pos) {
+            if (printerOptions.onlyPrintJsDocStyle) {
+                return (ts.isJSDocLikeText(text, pos) || ts.isPinnedComment(text, pos));
+            }
+            return true;
+        }
+        function emitLeadingComment(commentPos, commentEnd, kind, hasTrailingNewLine, rangePos) {
+            if (!shouldWriteComment(currentSourceFile.text, commentPos))
+                return;
+            if (!hasWrittenComment) {
+                ts.emitNewLineBeforeLeadingCommentOfPosition(getCurrentLineMap(), writer, rangePos, commentPos);
+                hasWrittenComment = true;
+            }
+            // Leading comments are emitted at /*leading comment1 */space/*leading comment*/space
+            emitPos(commentPos);
+            ts.writeCommentRange(currentSourceFile.text, getCurrentLineMap(), writer, commentPos, commentEnd, newLine);
+            emitPos(commentEnd);
+            if (hasTrailingNewLine) {
+                writer.writeLine();
+            }
+            else if (kind === 3 /* MultiLineCommentTrivia */) {
+                writer.writeSpace(" ");
+            }
+        }
+        function emitLeadingCommentsOfPosition(pos) {
+            if (commentsDisabled || pos === -1) {
+                return;
+            }
+            emitLeadingComments(pos, /*isEmittedNode*/ true);
+        }
+        function emitTrailingComments(pos) {
+            forEachTrailingCommentToEmit(pos, emitTrailingComment);
+        }
+        function emitTrailingComment(commentPos, commentEnd, _kind, hasTrailingNewLine) {
+            if (!shouldWriteComment(currentSourceFile.text, commentPos))
+                return;
+            // trailing comments are emitted at space/*trailing comment1 */space/*trailing comment2*/
+            if (!writer.isAtStartOfLine()) {
+                writer.writeSpace(" ");
+            }
+            emitPos(commentPos);
+            ts.writeCommentRange(currentSourceFile.text, getCurrentLineMap(), writer, commentPos, commentEnd, newLine);
+            emitPos(commentEnd);
+            if (hasTrailingNewLine) {
+                writer.writeLine();
+            }
+        }
+        function emitTrailingCommentsOfPosition(pos, prefixSpace) {
+            if (commentsDisabled) {
+                return;
+            }
+            enterComment();
+            forEachTrailingCommentToEmit(pos, prefixSpace ? emitTrailingComment : emitTrailingCommentOfPosition);
+            exitComment();
+        }
+        function emitTrailingCommentOfPosition(commentPos, commentEnd, _kind, hasTrailingNewLine) {
+            // trailing comments of a position are emitted at /*trailing comment1 */space/*trailing comment*/space
+            emitPos(commentPos);
+            ts.writeCommentRange(currentSourceFile.text, getCurrentLineMap(), writer, commentPos, commentEnd, newLine);
+            emitPos(commentEnd);
+            if (hasTrailingNewLine) {
+                writer.writeLine();
+            }
+            else {
+                writer.writeSpace(" ");
+            }
+        }
+        function forEachLeadingCommentToEmit(pos, cb) {
+            // Emit the leading comments only if the container's pos doesn't match because the container should take care of emitting these comments
+            if (currentSourceFile && (containerPos === -1 || pos !== containerPos)) {
+                if (hasDetachedComments(pos)) {
+                    forEachLeadingCommentWithoutDetachedComments(cb);
+                }
+                else {
+                    ts.forEachLeadingCommentRange(currentSourceFile.text, pos, cb, /*state*/ pos);
+                }
+            }
+        }
+        function forEachTrailingCommentToEmit(end, cb) {
+            // Emit the trailing comments only if the container's end doesn't match because the container should take care of emitting these comments
+            if (currentSourceFile && (containerEnd === -1 || (end !== containerEnd && end !== declarationListContainerEnd))) {
+                ts.forEachTrailingCommentRange(currentSourceFile.text, end, cb);
+            }
+        }
+        function hasDetachedComments(pos) {
+            return detachedCommentsInfo !== undefined && ts.last(detachedCommentsInfo).nodePos === pos;
+        }
+        function forEachLeadingCommentWithoutDetachedComments(cb) {
+            // get the leading comments from detachedPos
+            var pos = ts.last(detachedCommentsInfo).detachedCommentEndPos;
+            if (detachedCommentsInfo.length - 1) {
+                detachedCommentsInfo.pop();
+            }
+            else {
+                detachedCommentsInfo = undefined;
+            }
+            ts.forEachLeadingCommentRange(currentSourceFile.text, pos, cb, /*state*/ pos);
+        }
+        function emitDetachedCommentsAndUpdateCommentsInfo(range) {
+            var currentDetachedCommentInfo = ts.emitDetachedComments(currentSourceFile.text, getCurrentLineMap(), writer, emitComment, range, newLine, commentsDisabled);
+            if (currentDetachedCommentInfo) {
+                if (detachedCommentsInfo) {
+                    detachedCommentsInfo.push(currentDetachedCommentInfo);
+                }
+                else {
+                    detachedCommentsInfo = [currentDetachedCommentInfo];
+                }
+            }
+        }
+        function emitComment(text, lineMap, writer, commentPos, commentEnd, newLine) {
+            if (!shouldWriteComment(currentSourceFile.text, commentPos))
+                return;
+            emitPos(commentPos);
+            ts.writeCommentRange(text, lineMap, writer, commentPos, commentEnd, newLine);
+            emitPos(commentEnd);
+        }
+        /**
+         * Determine if the given comment is a triple-slash
+         *
+         * @return true if the comment is a triple-slash comment else false
+         */
+        function isTripleSlashComment(commentPos, commentEnd) {
+            return ts.isRecognizedTripleSlashComment(currentSourceFile.text, commentPos, commentEnd);
+        }
+        // Source Maps
+        function pipelineEmitWithSourceMap(hint, node) {
+            var pipelinePhase = getNextPipelinePhase(3 /* SourceMaps */, node);
+            if (ts.isUnparsedSource(node) && node.sourceMapText !== undefined) {
+                var parsed = ts.tryParseRawSourceMap(node.sourceMapText);
+                if (parsed) {
+                    sourceMapGenerator.appendSourceMap(writer.getLine(), writer.getColumn(), parsed, node.sourceMapPath);
+                }
+                pipelinePhase(hint, node);
+            }
+            else {
+                var _a = ts.getSourceMapRange(node), pos = _a.pos, end = _a.end, _b = _a.source, source = _b === void 0 ? sourceMapSource : _b;
+                var emitFlags = ts.getEmitFlags(node);
+                if (node.kind !== 307 /* NotEmittedStatement */
+                    && (emitFlags & 16 /* NoLeadingSourceMap */) === 0
+                    && pos >= 0) {
+                    emitSourcePos(source, skipSourceTrivia(source, pos));
+                }
+                if (emitFlags & 64 /* NoNestedSourceMaps */) {
+                    sourceMapsDisabled = true;
+                    pipelinePhase(hint, node);
+                    sourceMapsDisabled = false;
+                }
+                else {
+                    pipelinePhase(hint, node);
+                }
+                if (node.kind !== 307 /* NotEmittedStatement */
+                    && (emitFlags & 32 /* NoTrailingSourceMap */) === 0
+                    && end >= 0) {
+                    emitSourcePos(source, end);
+                }
+            }
+        }
+        /**
+         * Skips trivia such as comments and white-space that can be optionally overridden by the source-map source
+         */
+        function skipSourceTrivia(source, pos) {
+            return source.skipTrivia ? source.skipTrivia(pos) : ts.skipTrivia(source.text, pos);
+        }
+        /**
+         * Emits a mapping.
+         *
+         * If the position is synthetic (undefined or a negative value), no mapping will be
+         * created.
+         *
+         * @param pos The position.
+         */
+        function emitPos(pos) {
+            if (sourceMapsDisabled || ts.positionIsSynthesized(pos) || isJsonSourceMapSource(sourceMapSource)) {
+                return;
+            }
+            var _a = ts.getLineAndCharacterOfPosition(sourceMapSource, pos), sourceLine = _a.line, sourceCharacter = _a.character;
+            sourceMapGenerator.addMapping(writer.getLine(), writer.getColumn(), sourceMapSourceIndex, sourceLine, sourceCharacter, 
+            /*nameIndex*/ undefined);
+        }
+        function emitSourcePos(source, pos) {
+            if (source !== sourceMapSource) {
+                var savedSourceMapSource = sourceMapSource;
+                setSourceMapSource(source);
+                emitPos(pos);
+                setSourceMapSource(savedSourceMapSource);
+            }
+            else {
+                emitPos(pos);
+            }
+        }
+        /**
+         * Emits a token of a node with possible leading and trailing source maps.
+         *
+         * @param node The node containing the token.
+         * @param token The token to emit.
+         * @param tokenStartPos The start pos of the token.
+         * @param emitCallback The callback used to emit the token.
+         */
+        function emitTokenWithSourceMap(node, token, writer, tokenPos, emitCallback) {
+            if (sourceMapsDisabled || node && ts.isInJsonFile(node)) {
+                return emitCallback(token, writer, tokenPos);
+            }
+            var emitNode = node && node.emitNode;
+            var emitFlags = emitNode && emitNode.flags || 0 /* None */;
+            var range = emitNode && emitNode.tokenSourceMapRanges && emitNode.tokenSourceMapRanges[token];
+            var source = range && range.source || sourceMapSource;
+            tokenPos = skipSourceTrivia(source, range ? range.pos : tokenPos);
+            if ((emitFlags & 128 /* NoTokenLeadingSourceMaps */) === 0 && tokenPos >= 0) {
+                emitSourcePos(source, tokenPos);
+            }
+            tokenPos = emitCallback(token, writer, tokenPos);
+            if (range)
+                tokenPos = range.end;
+            if ((emitFlags & 256 /* NoTokenTrailingSourceMaps */) === 0 && tokenPos >= 0) {
+                emitSourcePos(source, tokenPos);
+            }
+            return tokenPos;
+        }
+        function setSourceMapSource(source) {
+            if (sourceMapsDisabled) {
+                return;
+            }
+            sourceMapSource = source;
+            if (isJsonSourceMapSource(source)) {
+                return;
+            }
+            sourceMapSourceIndex = sourceMapGenerator.addSource(source.fileName);
+            if (printerOptions.inlineSources) {
+                sourceMapGenerator.setSourceContent(sourceMapSourceIndex, source.text);
+            }
+        }
+        function isJsonSourceMapSource(sourceFile) {
+            return ts.fileExtensionIs(sourceFile.fileName, ".json" /* Json */);
+        }
+    }
+    ts.createPrinter = createPrinter;
+    function createBracketsMap() {
+        var brackets = [];
+        brackets[1024 /* Braces */] = ["{", "}"];
+        brackets[2048 /* Parenthesis */] = ["(", ")"];
+        brackets[4096 /* AngleBrackets */] = ["<", ">"];
+        brackets[8192 /* SquareBrackets */] = ["[", "]"];
+        return brackets;
+    }
+    function getOpeningBracket(format) {
+        return brackets[format & 15360 /* BracketsMask */][0];
+    }
+    function getClosingBracket(format) {
+        return brackets[format & 15360 /* BracketsMask */][1];
+    }
+    // Flags enum to track count of temp variables and a few dedicated names
+    var TempFlags;
+    (function (TempFlags) {
+        TempFlags[TempFlags["Auto"] = 0] = "Auto";
+        TempFlags[TempFlags["CountMask"] = 268435455] = "CountMask";
+        TempFlags[TempFlags["_i"] = 268435456] = "_i";
+    })(TempFlags || (TempFlags = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    function createCachedDirectoryStructureHost(host, currentDirectory, useCaseSensitiveFileNames) {
+        if (!host.getDirectories || !host.readDirectory) {
+            return undefined;
+        }
+        var cachedReadDirectoryResult = ts.createMap();
+        var getCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
+        return {
+            useCaseSensitiveFileNames: useCaseSensitiveFileNames,
+            fileExists: fileExists,
+            readFile: function (path, encoding) { return host.readFile(path, encoding); },
+            directoryExists: host.directoryExists && directoryExists,
+            getDirectories: getDirectories,
+            readDirectory: readDirectory,
+            createDirectory: host.createDirectory && createDirectory,
+            writeFile: host.writeFile && writeFile,
+            addOrDeleteFileOrDirectory: addOrDeleteFileOrDirectory,
+            addOrDeleteFile: addOrDeleteFile,
+            clearCache: clearCache
+        };
+        function toPath(fileName) {
+            return ts.toPath(fileName, currentDirectory, getCanonicalFileName);
+        }
+        function getCachedFileSystemEntries(rootDirPath) {
+            return cachedReadDirectoryResult.get(ts.ensureTrailingDirectorySeparator(rootDirPath));
+        }
+        function getCachedFileSystemEntriesForBaseDir(path) {
+            return getCachedFileSystemEntries(ts.getDirectoryPath(path));
+        }
+        function getBaseNameOfFileName(fileName) {
+            return ts.getBaseFileName(ts.normalizePath(fileName));
+        }
+        function createCachedFileSystemEntries(rootDir, rootDirPath) {
+            var resultFromHost = {
+                files: ts.map(host.readDirectory(rootDir, /*extensions*/ undefined, /*exclude*/ undefined, /*include*/ ["*.*"]), getBaseNameOfFileName) || [],
+                directories: host.getDirectories(rootDir) || []
+            };
+            cachedReadDirectoryResult.set(ts.ensureTrailingDirectorySeparator(rootDirPath), resultFromHost);
+            return resultFromHost;
+        }
+        /**
+         * If the readDirectory result was already cached, it returns that
+         * Otherwise gets result from host and caches it.
+         * The host request is done under try catch block to avoid caching incorrect result
+         */
+        function tryReadDirectory(rootDir, rootDirPath) {
+            rootDirPath = ts.ensureTrailingDirectorySeparator(rootDirPath);
+            var cachedResult = getCachedFileSystemEntries(rootDirPath);
+            if (cachedResult) {
+                return cachedResult;
+            }
+            try {
+                return createCachedFileSystemEntries(rootDir, rootDirPath);
+            }
+            catch (_e) {
+                // If there is exception to read directories, dont cache the result and direct the calls to host
+                ts.Debug.assert(!cachedReadDirectoryResult.has(ts.ensureTrailingDirectorySeparator(rootDirPath)));
+                return undefined;
+            }
+        }
+        function fileNameEqual(name1, name2) {
+            return getCanonicalFileName(name1) === getCanonicalFileName(name2);
+        }
+        function hasEntry(entries, name) {
+            return ts.some(entries, function (file) { return fileNameEqual(file, name); });
+        }
+        function updateFileSystemEntry(entries, baseName, isValid) {
+            if (hasEntry(entries, baseName)) {
+                if (!isValid) {
+                    return ts.filterMutate(entries, function (entry) { return !fileNameEqual(entry, baseName); });
+                }
+            }
+            else if (isValid) {
+                return entries.push(baseName);
+            }
+        }
+        function writeFile(fileName, data, writeByteOrderMark) {
+            var path = toPath(fileName);
+            var result = getCachedFileSystemEntriesForBaseDir(path);
+            if (result) {
+                updateFilesOfFileSystemEntry(result, getBaseNameOfFileName(fileName), /*fileExists*/ true);
+            }
+            return host.writeFile(fileName, data, writeByteOrderMark);
+        }
+        function fileExists(fileName) {
+            var path = toPath(fileName);
+            var result = getCachedFileSystemEntriesForBaseDir(path);
+            return result && hasEntry(result.files, getBaseNameOfFileName(fileName)) ||
+                host.fileExists(fileName);
+        }
+        function directoryExists(dirPath) {
+            var path = toPath(dirPath);
+            return cachedReadDirectoryResult.has(ts.ensureTrailingDirectorySeparator(path)) || host.directoryExists(dirPath);
+        }
+        function createDirectory(dirPath) {
+            var path = toPath(dirPath);
+            var result = getCachedFileSystemEntriesForBaseDir(path);
+            var baseFileName = getBaseNameOfFileName(dirPath);
+            if (result) {
+                updateFileSystemEntry(result.directories, baseFileName, /*isValid*/ true);
+            }
+            host.createDirectory(dirPath);
+        }
+        function getDirectories(rootDir) {
+            var rootDirPath = toPath(rootDir);
+            var result = tryReadDirectory(rootDir, rootDirPath);
+            if (result) {
+                return result.directories.slice();
+            }
+            return host.getDirectories(rootDir);
+        }
+        function readDirectory(rootDir, extensions, excludes, includes, depth) {
+            var rootDirPath = toPath(rootDir);
+            var result = tryReadDirectory(rootDir, rootDirPath);
+            if (result) {
+                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries);
+            }
+            return host.readDirectory(rootDir, extensions, excludes, includes, depth);
+            function getFileSystemEntries(dir) {
+                var path = toPath(dir);
+                if (path === rootDirPath) {
+                    return result;
+                }
+                return tryReadDirectory(dir, path) || ts.emptyFileSystemEntries;
+            }
+        }
+        function addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath) {
+            var existingResult = getCachedFileSystemEntries(fileOrDirectoryPath);
+            if (existingResult) {
+                // Just clear the cache for now
+                // For now just clear the cache, since this could mean that multiple level entries might need to be re-evaluated
+                clearCache();
+                return undefined;
+            }
+            var parentResult = getCachedFileSystemEntriesForBaseDir(fileOrDirectoryPath);
+            if (!parentResult) {
+                return undefined;
+            }
+            // This was earlier a file (hence not in cached directory contents)
+            // or we never cached the directory containing it
+            if (!host.directoryExists) {
+                // Since host doesnt support directory exists, clear the cache as otherwise it might not be same
+                clearCache();
+                return undefined;
+            }
+            var baseName = getBaseNameOfFileName(fileOrDirectory);
+            var fsQueryResult = {
+                fileExists: host.fileExists(fileOrDirectoryPath),
+                directoryExists: host.directoryExists(fileOrDirectoryPath)
+            };
+            if (fsQueryResult.directoryExists || hasEntry(parentResult.directories, baseName)) {
+                // Folder added or removed, clear the cache instead of updating the folder and its structure
+                clearCache();
+            }
+            else {
+                // No need to update the directory structure, just files
+                updateFilesOfFileSystemEntry(parentResult, baseName, fsQueryResult.fileExists);
+            }
+            return fsQueryResult;
+        }
+        function addOrDeleteFile(fileName, filePath, eventKind) {
+            if (eventKind === ts.FileWatcherEventKind.Changed) {
+                return;
+            }
+            var parentResult = getCachedFileSystemEntriesForBaseDir(filePath);
+            if (parentResult) {
+                updateFilesOfFileSystemEntry(parentResult, getBaseNameOfFileName(fileName), eventKind === ts.FileWatcherEventKind.Created);
+            }
+        }
+        function updateFilesOfFileSystemEntry(parentResult, baseName, fileExists) {
+            updateFileSystemEntry(parentResult.files, baseName, fileExists);
+        }
+        function clearCache() {
+            cachedReadDirectoryResult.clear();
+        }
+    }
+    ts.createCachedDirectoryStructureHost = createCachedDirectoryStructureHost;
+    var ConfigFileProgramReloadLevel;
+    (function (ConfigFileProgramReloadLevel) {
+        ConfigFileProgramReloadLevel[ConfigFileProgramReloadLevel["None"] = 0] = "None";
+        /** Update the file name list from the disk */
+        ConfigFileProgramReloadLevel[ConfigFileProgramReloadLevel["Partial"] = 1] = "Partial";
+        /** Reload completely by re-reading contents of config file from disk and updating program */
+        ConfigFileProgramReloadLevel[ConfigFileProgramReloadLevel["Full"] = 2] = "Full";
+    })(ConfigFileProgramReloadLevel = ts.ConfigFileProgramReloadLevel || (ts.ConfigFileProgramReloadLevel = {}));
+    /**
+     * Updates the existing missing file watches with the new set of missing files after new program is created
+     */
+    function updateMissingFilePathsWatch(program, missingFileWatches, createMissingFileWatch) {
+        var missingFilePaths = program.getMissingFilePaths();
+        var newMissingFilePathMap = ts.arrayToSet(missingFilePaths);
+        // Update the missing file paths watcher
+        ts.mutateMap(missingFileWatches, newMissingFilePathMap, {
+            // Watch the missing files
+            createNewValue: createMissingFileWatch,
+            // Files that are no longer missing (e.g. because they are no longer required)
+            // should no longer be watched.
+            onDeleteValue: ts.closeFileWatcher
+        });
+    }
+    ts.updateMissingFilePathsWatch = updateMissingFilePathsWatch;
+    /**
+     * Updates the existing wild card directory watches with the new set of wild card directories from the config file
+     * after new program is created because the config file was reloaded or program was created first time from the config file
+     * Note that there is no need to call this function when the program is updated with additional files without reloading config files,
+     * as wildcard directories wont change unless reloading config file
+     */
+    function updateWatchingWildcardDirectories(existingWatchedForWildcards, wildcardDirectories, watchDirectory) {
+        ts.mutateMap(existingWatchedForWildcards, wildcardDirectories, {
+            // Create new watch and recursive info
+            createNewValue: createWildcardDirectoryWatcher,
+            // Close existing watch thats not needed any more
+            onDeleteValue: closeFileWatcherOf,
+            // Close existing watch that doesnt match in the flags
+            onExistingValue: updateWildcardDirectoryWatcher
+        });
+        function createWildcardDirectoryWatcher(directory, flags) {
+            // Create new watch and recursive info
+            return {
+                watcher: watchDirectory(directory, flags),
+                flags: flags
+            };
+        }
+        function updateWildcardDirectoryWatcher(existingWatcher, flags, directory) {
+            // Watcher needs to be updated if the recursive flags dont match
+            if (existingWatcher.flags === flags) {
+                return;
+            }
+            existingWatcher.watcher.close();
+            existingWatchedForWildcards.set(directory, createWildcardDirectoryWatcher(directory, flags));
+        }
+    }
+    ts.updateWatchingWildcardDirectories = updateWatchingWildcardDirectories;
+    function isEmittedFileOfProgram(program, file) {
+        if (!program) {
+            return false;
+        }
+        return program.isEmittedFile(file);
+    }
+    ts.isEmittedFileOfProgram = isEmittedFileOfProgram;
+    var WatchLogLevel;
+    (function (WatchLogLevel) {
+        WatchLogLevel[WatchLogLevel["None"] = 0] = "None";
+        WatchLogLevel[WatchLogLevel["TriggerOnly"] = 1] = "TriggerOnly";
+        WatchLogLevel[WatchLogLevel["Verbose"] = 2] = "Verbose";
+    })(WatchLogLevel = ts.WatchLogLevel || (ts.WatchLogLevel = {}));
+    function getWatchFactory(watchLogLevel, log, getDetailWatchInfo) {
+        return getWatchFactoryWith(watchLogLevel, log, getDetailWatchInfo, watchFile, watchDirectory);
+    }
+    ts.getWatchFactory = getWatchFactory;
+    function getWatchFactoryWith(watchLogLevel, log, getDetailWatchInfo, watchFile, watchDirectory) {
+        var createFileWatcher = getCreateFileWatcher(watchLogLevel, watchFile);
+        var createFilePathWatcher = watchLogLevel === WatchLogLevel.None ? watchFilePath : createFileWatcher;
+        var createDirectoryWatcher = getCreateFileWatcher(watchLogLevel, watchDirectory);
+        return {
+            watchFile: function (host, file, callback, pollingInterval, detailInfo1, detailInfo2) {
+                return createFileWatcher(host, file, callback, pollingInterval, /*passThrough*/ undefined, detailInfo1, detailInfo2, watchFile, log, "FileWatcher", getDetailWatchInfo);
+            },
+            watchFilePath: function (host, file, callback, pollingInterval, path, detailInfo1, detailInfo2) {
+                return createFilePathWatcher(host, file, callback, pollingInterval, path, detailInfo1, detailInfo2, watchFile, log, "FileWatcher", getDetailWatchInfo);
+            },
+            watchDirectory: function (host, directory, callback, flags, detailInfo1, detailInfo2) {
+                return createDirectoryWatcher(host, directory, callback, flags, /*passThrough*/ undefined, detailInfo1, detailInfo2, watchDirectory, log, "DirectoryWatcher", getDetailWatchInfo);
+            }
+        };
+        function watchFilePath(host, file, callback, pollingInterval, path) {
+            return watchFile(host, file, function (fileName, eventKind) { return callback(fileName, eventKind, path); }, pollingInterval);
+        }
+    }
+    function watchFile(host, file, callback, pollingInterval) {
+        return host.watchFile(file, callback, pollingInterval);
+    }
+    function watchDirectory(host, directory, callback, flags) {
+        return host.watchDirectory(directory, callback, (flags & 1 /* Recursive */) !== 0);
+    }
+    function getCreateFileWatcher(watchLogLevel, addWatch) {
+        switch (watchLogLevel) {
+            case WatchLogLevel.None:
+                return addWatch;
+            case WatchLogLevel.TriggerOnly:
+                return createFileWatcherWithTriggerLogging;
+            case WatchLogLevel.Verbose:
+                return addWatch === watchDirectory ? createDirectoryWatcherWithLogging : createFileWatcherWithLogging;
+        }
+    }
+    function createFileWatcherWithLogging(host, file, cb, flags, passThrough, detailInfo1, detailInfo2, addWatch, log, watchCaption, getDetailWatchInfo) {
+        log(watchCaption + ":: Added:: " + getWatchInfo(file, flags, detailInfo1, detailInfo2, getDetailWatchInfo));
+        var watcher = createFileWatcherWithTriggerLogging(host, file, cb, flags, passThrough, detailInfo1, detailInfo2, addWatch, log, watchCaption, getDetailWatchInfo);
+        return {
+            close: function () {
+                log(watchCaption + ":: Close:: " + getWatchInfo(file, flags, detailInfo1, detailInfo2, getDetailWatchInfo));
+                watcher.close();
+            }
+        };
+    }
+    function createDirectoryWatcherWithLogging(host, file, cb, flags, passThrough, detailInfo1, detailInfo2, addWatch, log, watchCaption, getDetailWatchInfo) {
+        var watchInfo = watchCaption + ":: Added:: " + getWatchInfo(file, flags, detailInfo1, detailInfo2, getDetailWatchInfo);
+        log(watchInfo);
+        var start = ts.timestamp();
+        var watcher = createFileWatcherWithTriggerLogging(host, file, cb, flags, passThrough, detailInfo1, detailInfo2, addWatch, log, watchCaption, getDetailWatchInfo);
+        var elapsed = ts.timestamp() - start;
+        log("Elapsed:: " + elapsed + "ms " + watchInfo);
+        return {
+            close: function () {
+                var watchInfo = watchCaption + ":: Close:: " + getWatchInfo(file, flags, detailInfo1, detailInfo2, getDetailWatchInfo);
+                log(watchInfo);
+                var start = ts.timestamp();
+                watcher.close();
+                var elapsed = ts.timestamp() - start;
+                log("Elapsed:: " + elapsed + "ms " + watchInfo);
+            }
+        };
+    }
+    function createFileWatcherWithTriggerLogging(host, file, cb, flags, passThrough, detailInfo1, detailInfo2, addWatch, log, watchCaption, getDetailWatchInfo) {
+        return addWatch(host, file, function (fileName, cbOptional) {
+            var triggerredInfo = watchCaption + ":: Triggered with " + fileName + " " + (cbOptional !== undefined ? cbOptional : "") + ":: " + getWatchInfo(file, flags, detailInfo1, detailInfo2, getDetailWatchInfo);
+            log(triggerredInfo);
+            var start = ts.timestamp();
+            cb(fileName, cbOptional, passThrough);
+            var elapsed = ts.timestamp() - start;
+            log("Elapsed:: " + elapsed + "ms " + triggerredInfo);
+        }, flags);
+    }
+    function getWatchInfo(file, flags, detailInfo1, detailInfo2, getDetailWatchInfo) {
+        return "WatchInfo: " + file + " " + flags + " " + (getDetailWatchInfo ? getDetailWatchInfo(detailInfo1, detailInfo2) : detailInfo2 === undefined ? detailInfo1 : detailInfo1 + " " + detailInfo2);
+    }
+    function closeFileWatcherOf(objWithWatcher) {
+        objWithWatcher.watcher.close();
+    }
+    ts.closeFileWatcherOf = closeFileWatcherOf;
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    var ignoreDiagnosticCommentRegEx = /(^\s*$)|(^\s*\/\/\/?\s*(@ts-ignore)?)/;
+    function findConfigFile(searchPath, fileExists, configName) {
+        if (configName === void 0) { configName = "tsconfig.json"; }
+        return ts.forEachAncestorDirectory(searchPath, function (ancestor) {
+            var fileName = ts.combinePaths(ancestor, configName);
+            return fileExists(fileName) ? fileName : undefined;
+        });
+    }
+    ts.findConfigFile = findConfigFile;
+    function resolveTripleslashReference(moduleName, containingFile) {
+        var basePath = ts.getDirectoryPath(containingFile);
+        var referencedFileName = ts.isRootedDiskPath(moduleName) ? moduleName : ts.combinePaths(basePath, moduleName);
+        return ts.normalizePath(referencedFileName);
+    }
+    ts.resolveTripleslashReference = resolveTripleslashReference;
+    /* @internal */
+    function computeCommonSourceDirectoryOfFilenames(fileNames, currentDirectory, getCanonicalFileName) {
+        var commonPathComponents;
+        var failed = ts.forEach(fileNames, function (sourceFile) {
+            // Each file contributes into common source file path
+            var sourcePathComponents = ts.getNormalizedPathComponents(sourceFile, currentDirectory);
+            sourcePathComponents.pop(); // The base file name is not part of the common directory path
+            if (!commonPathComponents) {
+                // first file
+                commonPathComponents = sourcePathComponents;
+                return;
+            }
+            var n = Math.min(commonPathComponents.length, sourcePathComponents.length);
+            for (var i = 0; i < n; i++) {
+                if (getCanonicalFileName(commonPathComponents[i]) !== getCanonicalFileName(sourcePathComponents[i])) {
+                    if (i === 0) {
+                        // Failed to find any common path component
+                        return true;
+                    }
+                    // New common path found that is 0 -> i-1
+                    commonPathComponents.length = i;
+                    break;
+                }
+            }
+            // If the sourcePathComponents was shorter than the commonPathComponents, truncate to the sourcePathComponents
+            if (sourcePathComponents.length < commonPathComponents.length) {
+                commonPathComponents.length = sourcePathComponents.length;
+            }
+        });
+        // A common path can not be found when paths span multiple drives on windows, for example
+        if (failed) {
+            return "";
+        }
+        if (!commonPathComponents) { // Can happen when all input files are .d.ts files
+            return currentDirectory;
+        }
+        return ts.getPathFromPathComponents(commonPathComponents);
+    }
+    ts.computeCommonSourceDirectoryOfFilenames = computeCommonSourceDirectoryOfFilenames;
+    function createCompilerHost(options, setParentNodes) {
+        return createCompilerHostWorker(options, setParentNodes);
+    }
+    ts.createCompilerHost = createCompilerHost;
+    /*@internal*/
+    // TODO(shkamat): update this after reworking ts build API
+    function createCompilerHostWorker(options, setParentNodes, system) {
+        if (system === void 0) { system = ts.sys; }
+        var existingDirectories = ts.createMap();
+        function getCanonicalFileName(fileName) {
+            // if underlying system can distinguish between two files whose names differs only in cases then file name already in canonical form.
+            // otherwise use toLowerCase as a canonical form.
+            return system.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
+        }
+        function getSourceFile(fileName, languageVersion, onError) {
+            var text;
+            try {
+                ts.performance.mark("beforeIORead");
+                text = compilerHost.readFile(fileName);
+                ts.performance.mark("afterIORead");
+                ts.performance.measure("I/O Read", "beforeIORead", "afterIORead");
+            }
+            catch (e) {
+                if (onError) {
+                    onError(e.message);
+                }
+                text = "";
+            }
+            return text !== undefined ? ts.createSourceFile(fileName, text, languageVersion, setParentNodes) : undefined;
+        }
+        function directoryExists(directoryPath) {
+            if (existingDirectories.has(directoryPath)) {
+                return true;
+            }
+            if (system.directoryExists(directoryPath)) {
+                existingDirectories.set(directoryPath, true);
+                return true;
+            }
+            return false;
+        }
+        function ensureDirectoriesExist(directoryPath) {
+            if (directoryPath.length > ts.getRootLength(directoryPath) && !directoryExists(directoryPath)) {
+                var parentDirectory = ts.getDirectoryPath(directoryPath);
+                ensureDirectoriesExist(parentDirectory);
+                if (compilerHost.createDirectory) {
+                    compilerHost.createDirectory(directoryPath);
+                }
+                else {
+                    system.createDirectory(directoryPath);
+                }
+            }
+        }
+        var outputFingerprints;
+        function writeFileIfUpdated(fileName, data, writeByteOrderMark) {
+            if (!outputFingerprints) {
+                outputFingerprints = ts.createMap();
+            }
+            var hash = system.createHash(data); // TODO: GH#18217
+            var mtimeBefore = system.getModifiedTime(fileName); // TODO: GH#18217
+            if (mtimeBefore) {
+                var fingerprint = outputFingerprints.get(fileName);
+                // If output has not been changed, and the file has no external modification
+                if (fingerprint &&
+                    fingerprint.byteOrderMark === writeByteOrderMark &&
+                    fingerprint.hash === hash &&
+                    fingerprint.mtime.getTime() === mtimeBefore.getTime()) {
+                    return;
+                }
+            }
+            system.writeFile(fileName, data, writeByteOrderMark);
+            var mtimeAfter = system.getModifiedTime(fileName) || ts.missingFileModifiedTime; // TODO: GH#18217
+            outputFingerprints.set(fileName, {
+                hash: hash,
+                byteOrderMark: writeByteOrderMark,
+                mtime: mtimeAfter
+            });
+        }
+        function writeFile(fileName, data, writeByteOrderMark, onError) {
+            try {
+                ts.performance.mark("beforeIOWrite");
+                ensureDirectoriesExist(ts.getDirectoryPath(ts.normalizePath(fileName)));
+                if (ts.isWatchSet(options) && system.createHash && system.getModifiedTime) {
+                    writeFileIfUpdated(fileName, data, writeByteOrderMark);
+                }
+                else {
+                    system.writeFile(fileName, data, writeByteOrderMark);
+                }
+                ts.performance.mark("afterIOWrite");
+                ts.performance.measure("I/O Write", "beforeIOWrite", "afterIOWrite");
+            }
+            catch (e) {
+                if (onError) {
+                    onError(e.message);
+                }
+            }
+        }
+        function getDefaultLibLocation() {
+            return ts.getDirectoryPath(ts.normalizePath(system.getExecutingFilePath()));
+        }
+        var newLine = ts.getNewLineCharacter(options, function () { return system.newLine; });
+        var realpath = system.realpath && (function (path) { return system.realpath(path); });
+        var compilerHost = {
+            getSourceFile: getSourceFile,
+            getDefaultLibLocation: getDefaultLibLocation,
+            getDefaultLibFileName: function (options) { return ts.combinePaths(getDefaultLibLocation(), ts.getDefaultLibFileName(options)); },
+            writeFile: writeFile,
+            getCurrentDirectory: ts.memoize(function () { return system.getCurrentDirectory(); }),
+            useCaseSensitiveFileNames: function () { return system.useCaseSensitiveFileNames; },
+            getCanonicalFileName: getCanonicalFileName,
+            getNewLine: function () { return newLine; },
+            fileExists: function (fileName) { return system.fileExists(fileName); },
+            readFile: function (fileName) { return system.readFile(fileName); },
+            trace: function (s) { return system.write(s + newLine); },
+            directoryExists: function (directoryName) { return system.directoryExists(directoryName); },
+            getEnvironmentVariable: function (name) { return system.getEnvironmentVariable ? system.getEnvironmentVariable(name) : ""; },
+            getDirectories: function (path) { return system.getDirectories(path); },
+            realpath: realpath,
+            readDirectory: function (path, extensions, include, exclude, depth) { return system.readDirectory(path, extensions, include, exclude, depth); },
+            createDirectory: function (d) { return system.createDirectory(d); }
+        };
+        return compilerHost;
+    }
+    ts.createCompilerHostWorker = createCompilerHostWorker;
+    /*@internal*/
+    function changeCompilerHostLikeToUseCache(host, toPath, getSourceFile) {
+        var originalReadFile = host.readFile;
+        var originalFileExists = host.fileExists;
+        var originalDirectoryExists = host.directoryExists;
+        var originalCreateDirectory = host.createDirectory;
+        var originalWriteFile = host.writeFile;
+        var readFileCache = ts.createMap();
+        var fileExistsCache = ts.createMap();
+        var directoryExistsCache = ts.createMap();
+        var sourceFileCache = ts.createMap();
+        var readFileWithCache = function (fileName) {
+            var key = toPath(fileName);
+            var value = readFileCache.get(key);
+            if (value !== undefined)
+                return value || undefined;
+            return setReadFileCache(key, fileName);
+        };
+        var setReadFileCache = function (key, fileName) {
+            var newValue = originalReadFile.call(host, fileName);
+            readFileCache.set(key, newValue || false);
+            return newValue;
+        };
+        host.readFile = function (fileName) {
+            var key = toPath(fileName);
+            var value = readFileCache.get(key);
+            if (value !== undefined)
+                return value; // could be .d.ts from output
+            if (!ts.fileExtensionIs(fileName, ".json" /* Json */)) {
+                return originalReadFile.call(host, fileName);
+            }
+            return setReadFileCache(key, fileName);
+        };
+        var getSourceFileWithCache = getSourceFile ? function (fileName, languageVersion, onError, shouldCreateNewSourceFile) {
+            var key = toPath(fileName);
+            var value = sourceFileCache.get(key);
+            if (value)
+                return value;
+            var sourceFile = getSourceFile(fileName, languageVersion, onError, shouldCreateNewSourceFile);
+            if (sourceFile && (ts.isDeclarationFileName(fileName) || ts.fileExtensionIs(fileName, ".json" /* Json */))) {
+                sourceFileCache.set(key, sourceFile);
+            }
+            return sourceFile;
+        } : undefined;
+        // fileExists for any kind of extension
+        host.fileExists = function (fileName) {
+            var key = toPath(fileName);
+            var value = fileExistsCache.get(key);
+            if (value !== undefined)
+                return value;
+            var newValue = originalFileExists.call(host, fileName);
+            fileExistsCache.set(key, !!newValue);
+            return newValue;
+        };
+        if (originalWriteFile) {
+            host.writeFile = function (fileName, data, writeByteOrderMark, onError, sourceFiles) {
+                var key = toPath(fileName);
+                fileExistsCache.delete(key);
+                var value = readFileCache.get(key);
+                if (value && value !== data) {
+                    readFileCache.delete(key);
+                    sourceFileCache.delete(key);
+                }
+                else if (getSourceFileWithCache) {
+                    var sourceFile = sourceFileCache.get(key);
+                    if (sourceFile && sourceFile.text !== data) {
+                        sourceFileCache.delete(key);
+                    }
+                }
+                originalWriteFile.call(host, fileName, data, writeByteOrderMark, onError, sourceFiles);
+            };
+        }
+        // directoryExists
+        if (originalDirectoryExists && originalCreateDirectory) {
+            host.directoryExists = function (directory) {
+                var key = toPath(directory);
+                var value = directoryExistsCache.get(key);
+                if (value !== undefined)
+                    return value;
+                var newValue = originalDirectoryExists.call(host, directory);
+                directoryExistsCache.set(key, !!newValue);
+                return newValue;
+            };
+            host.createDirectory = function (directory) {
+                var key = toPath(directory);
+                directoryExistsCache.delete(key);
+                originalCreateDirectory.call(host, directory);
+            };
+        }
+        return {
+            originalReadFile: originalReadFile,
+            originalFileExists: originalFileExists,
+            originalDirectoryExists: originalDirectoryExists,
+            originalCreateDirectory: originalCreateDirectory,
+            originalWriteFile: originalWriteFile,
+            getSourceFileWithCache: getSourceFileWithCache,
+            readFileWithCache: readFileWithCache
+        };
+    }
+    ts.changeCompilerHostLikeToUseCache = changeCompilerHostLikeToUseCache;
+    function getPreEmitDiagnostics(program, sourceFile, cancellationToken) {
+        var diagnostics = program.getConfigFileParsingDiagnostics().concat(program.getOptionsDiagnostics(cancellationToken), program.getSyntacticDiagnostics(sourceFile, cancellationToken), program.getGlobalDiagnostics(cancellationToken), program.getSemanticDiagnostics(sourceFile, cancellationToken));
+        if (ts.getEmitDeclarations(program.getCompilerOptions())) {
+            ts.addRange(diagnostics, program.getDeclarationDiagnostics(sourceFile, cancellationToken));
+        }
+        return ts.sortAndDeduplicateDiagnostics(diagnostics);
+    }
+    ts.getPreEmitDiagnostics = getPreEmitDiagnostics;
+    function formatDiagnostics(diagnostics, host) {
+        var output = "";
+        for (var _i = 0, diagnostics_2 = diagnostics; _i < diagnostics_2.length; _i++) {
+            var diagnostic = diagnostics_2[_i];
+            output += formatDiagnostic(diagnostic, host);
+        }
+        return output;
+    }
+    ts.formatDiagnostics = formatDiagnostics;
+    function formatDiagnostic(diagnostic, host) {
+        var errorMessage = ts.diagnosticCategoryName(diagnostic) + " TS" + diagnostic.code + ": " + flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine()) + host.getNewLine();
+        if (diagnostic.file) {
+            var _a = ts.getLineAndCharacterOfPosition(diagnostic.file, diagnostic.start), line = _a.line, character = _a.character; // TODO: GH#18217
+            var fileName = diagnostic.file.fileName;
+            var relativeFileName = ts.convertToRelativePath(fileName, host.getCurrentDirectory(), function (fileName) { return host.getCanonicalFileName(fileName); });
+            return relativeFileName + "(" + (line + 1) + "," + (character + 1) + "): " + errorMessage;
+        }
+        return errorMessage;
+    }
+    ts.formatDiagnostic = formatDiagnostic;
+    /** @internal */
+    var ForegroundColorEscapeSequences;
+    (function (ForegroundColorEscapeSequences) {
+        ForegroundColorEscapeSequences["Grey"] = "\u001B[90m";
+        ForegroundColorEscapeSequences["Red"] = "\u001B[91m";
+        ForegroundColorEscapeSequences["Yellow"] = "\u001B[93m";
+        ForegroundColorEscapeSequences["Blue"] = "\u001B[94m";
+        ForegroundColorEscapeSequences["Cyan"] = "\u001B[96m";
+    })(ForegroundColorEscapeSequences = ts.ForegroundColorEscapeSequences || (ts.ForegroundColorEscapeSequences = {}));
+    var gutterStyleSequence = "\u001b[7m";
+    var gutterSeparator = " ";
+    var resetEscapeSequence = "\u001b[0m";
+    var ellipsis = "...";
+    var halfIndent = "  ";
+    var indent = "    ";
+    function getCategoryFormat(category) {
+        switch (category) {
+            case ts.DiagnosticCategory.Error: return ForegroundColorEscapeSequences.Red;
+            case ts.DiagnosticCategory.Warning: return ForegroundColorEscapeSequences.Yellow;
+            case ts.DiagnosticCategory.Suggestion: return ts.Debug.fail("Should never get an Info diagnostic on the command line.");
+            case ts.DiagnosticCategory.Message: return ForegroundColorEscapeSequences.Blue;
+        }
+    }
+    /** @internal */
+    function formatColorAndReset(text, formatStyle) {
+        return formatStyle + text + resetEscapeSequence;
+    }
+    ts.formatColorAndReset = formatColorAndReset;
+    function padLeft(s, length) {
+        while (s.length < length) {
+            s = " " + s;
+        }
+        return s;
+    }
+    function formatCodeSpan(file, start, length, indent, squiggleColor, host) {
+        var _a = ts.getLineAndCharacterOfPosition(file, start), firstLine = _a.line, firstLineChar = _a.character;
+        var _b = ts.getLineAndCharacterOfPosition(file, start + length), lastLine = _b.line, lastLineChar = _b.character;
+        var lastLineInFile = ts.getLineAndCharacterOfPosition(file, file.text.length).line;
+        var hasMoreThanFiveLines = (lastLine - firstLine) >= 4;
+        var gutterWidth = (lastLine + 1 + "").length;
+        if (hasMoreThanFiveLines) {
+            gutterWidth = Math.max(ellipsis.length, gutterWidth);
+        }
+        var context = "";
+        for (var i = firstLine; i <= lastLine; i++) {
+            context += host.getNewLine();
+            // If the error spans over 5 lines, we'll only show the first 2 and last 2 lines,
+            // so we'll skip ahead to the second-to-last line.
+            if (hasMoreThanFiveLines && firstLine + 1 < i && i < lastLine - 1) {
+                context += indent + formatColorAndReset(padLeft(ellipsis, gutterWidth), gutterStyleSequence) + gutterSeparator + host.getNewLine();
+                i = lastLine - 1;
+            }
+            var lineStart = ts.getPositionOfLineAndCharacter(file, i, 0);
+            var lineEnd = i < lastLineInFile ? ts.getPositionOfLineAndCharacter(file, i + 1, 0) : file.text.length;
+            var lineContent = file.text.slice(lineStart, lineEnd);
+            lineContent = lineContent.replace(/\s+$/g, ""); // trim from end
+            lineContent = lineContent.replace("\t", " "); // convert tabs to single spaces
+            // Output the gutter and the actual contents of the line.
+            context += indent + formatColorAndReset(padLeft(i + 1 + "", gutterWidth), gutterStyleSequence) + gutterSeparator;
+            context += lineContent + host.getNewLine();
+            // Output the gutter and the error span for the line using tildes.
+            context += indent + formatColorAndReset(padLeft("", gutterWidth), gutterStyleSequence) + gutterSeparator;
+            context += squiggleColor;
+            if (i === firstLine) {
+                // If we're on the last line, then limit it to the last character of the last line.
+                // Otherwise, we'll just squiggle the rest of the line, giving 'slice' no end position.
+                var lastCharForLine = i === lastLine ? lastLineChar : undefined;
+                context += lineContent.slice(0, firstLineChar).replace(/\S/g, " ");
+                context += lineContent.slice(firstLineChar, lastCharForLine).replace(/./g, "~");
+            }
+            else if (i === lastLine) {
+                context += lineContent.slice(0, lastLineChar).replace(/./g, "~");
+            }
+            else {
+                // Squiggle the entire line.
+                context += lineContent.replace(/./g, "~");
+            }
+            context += resetEscapeSequence;
+        }
+        return context;
+    }
+    /* @internal */
+    function formatLocation(file, start, host, color) {
+        if (color === void 0) { color = formatColorAndReset; }
+        var _a = ts.getLineAndCharacterOfPosition(file, start), firstLine = _a.line, firstLineChar = _a.character; // TODO: GH#18217
+        var relativeFileName = host ? ts.convertToRelativePath(file.fileName, host.getCurrentDirectory(), function (fileName) { return host.getCanonicalFileName(fileName); }) : file.fileName;
+        var output = "";
+        output += color(relativeFileName, ForegroundColorEscapeSequences.Cyan);
+        output += ":";
+        output += color("" + (firstLine + 1), ForegroundColorEscapeSequences.Yellow);
+        output += ":";
+        output += color("" + (firstLineChar + 1), ForegroundColorEscapeSequences.Yellow);
+        return output;
+    }
+    ts.formatLocation = formatLocation;
+    function formatDiagnosticsWithColorAndContext(diagnostics, host) {
+        var output = "";
+        for (var _i = 0, diagnostics_3 = diagnostics; _i < diagnostics_3.length; _i++) {
+            var diagnostic = diagnostics_3[_i];
+            if (diagnostic.file) {
+                var file = diagnostic.file, start = diagnostic.start;
+                output += formatLocation(file, start, host); // TODO: GH#18217
+                output += " - ";
+            }
+            output += formatColorAndReset(ts.diagnosticCategoryName(diagnostic), getCategoryFormat(diagnostic.category));
+            output += formatColorAndReset(" TS" + diagnostic.code + ": ", ForegroundColorEscapeSequences.Grey);
+            output += flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine());
+            if (diagnostic.file) {
+                output += host.getNewLine();
+                output += formatCodeSpan(diagnostic.file, diagnostic.start, diagnostic.length, "", getCategoryFormat(diagnostic.category), host); // TODO: GH#18217
+                if (diagnostic.relatedInformation) {
+                    output += host.getNewLine();
+                    for (var _a = 0, _b = diagnostic.relatedInformation; _a < _b.length; _a++) {
+                        var _c = _b[_a], file = _c.file, start = _c.start, length_4 = _c.length, messageText = _c.messageText;
+                        if (file) {
+                            output += host.getNewLine();
+                            output += halfIndent + formatLocation(file, start, host); // TODO: GH#18217
+                            output += formatCodeSpan(file, start, length_4, indent, ForegroundColorEscapeSequences.Cyan, host); // TODO: GH#18217
+                        }
+                        output += host.getNewLine();
+                        output += indent + flattenDiagnosticMessageText(messageText, host.getNewLine());
+                    }
+                }
+            }
+            output += host.getNewLine();
+        }
+        return output;
+    }
+    ts.formatDiagnosticsWithColorAndContext = formatDiagnosticsWithColorAndContext;
+    function flattenDiagnosticMessageText(messageText, newLine) {
+        if (ts.isString(messageText)) {
+            return messageText;
+        }
+        else {
+            var diagnosticChain = messageText;
+            var result = "";
+            var indent_1 = 0;
+            while (diagnosticChain) {
+                if (indent_1) {
+                    result += newLine;
+                    for (var i = 0; i < indent_1; i++) {
+                        result += "  ";
+                    }
+                }
+                result += diagnosticChain.messageText;
+                indent_1++;
+                diagnosticChain = diagnosticChain.next;
+            }
+            return result;
+        }
+    }
+    ts.flattenDiagnosticMessageText = flattenDiagnosticMessageText;
+    function loadWithLocalCache(names, containingFile, redirectedReference, loader) {
+        if (names.length === 0) {
+            return [];
+        }
+        var resolutions = [];
+        var cache = ts.createMap();
+        for (var _i = 0, names_1 = names; _i < names_1.length; _i++) {
+            var name = names_1[_i];
+            var result = void 0;
+            if (cache.has(name)) {
+                result = cache.get(name);
+            }
+            else {
+                cache.set(name, result = loader(name, containingFile, redirectedReference));
+            }
+            resolutions.push(result);
+        }
+        return resolutions;
+    }
+    /**
+     * Determines if program structure is upto date or needs to be recreated
+     */
+    /* @internal */
+    function isProgramUptoDate(program, rootFileNames, newOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, projectReferences) {
+        // If we haven't created a program yet or have changed automatic type directives, then it is not up-to-date
+        if (!program || hasChangedAutomaticTypeDirectiveNames) {
+            return false;
+        }
+        // If number of files in the program do not match, it is not up-to-date
+        if (program.getRootFileNames().length !== rootFileNames.length) {
+            return false;
+        }
+        var seenResolvedRefs;
+        // If project references dont match
+        if (!ts.arrayIsEqualTo(program.getProjectReferences(), projectReferences, projectReferenceUptoDate)) {
+            return false;
+        }
+        // If any file is not up-to-date, then the whole program is not up-to-date
+        if (program.getSourceFiles().some(sourceFileNotUptoDate)) {
+            return false;
+        }
+        // If any of the missing file paths are now created
+        if (program.getMissingFilePaths().some(fileExists)) {
+            return false;
+        }
+        var currentOptions = program.getCompilerOptions();
+        // If the compilation settings do no match, then the program is not up-to-date
+        if (!ts.compareDataObjects(currentOptions, newOptions)) {
+            return false;
+        }
+        // If everything matches but the text of config file is changed,
+        // error locations can change for program options, so update the program
+        if (currentOptions.configFile && newOptions.configFile) {
+            return currentOptions.configFile.text === newOptions.configFile.text;
+        }
+        return true;
+        function sourceFileNotUptoDate(sourceFile) {
+            return !sourceFileVersionUptoDate(sourceFile) ||
+                hasInvalidatedResolution(sourceFile.path);
+        }
+        function sourceFileVersionUptoDate(sourceFile) {
+            return sourceFile.version === getSourceVersion(sourceFile.resolvedPath);
+        }
+        function projectReferenceUptoDate(oldRef, newRef, index) {
+            if (!ts.projectReferenceIsEqualTo(oldRef, newRef)) {
+                return false;
+            }
+            return resolvedProjectReferenceUptoDate(program.getResolvedProjectReferences()[index], oldRef);
+        }
+        function resolvedProjectReferenceUptoDate(oldResolvedRef, oldRef) {
+            if (oldResolvedRef) {
+                if (ts.contains(seenResolvedRefs, oldResolvedRef)) {
+                    // Assume true
+                    return true;
+                }
+                // If sourceFile for the oldResolvedRef existed, check the version for uptodate
+                if (!sourceFileVersionUptoDate(oldResolvedRef.sourceFile)) {
+                    return false;
+                }
+                // Add to seen before checking the referenced paths of this config file
+                (seenResolvedRefs || (seenResolvedRefs = [])).push(oldResolvedRef);
+                // If child project references are upto date, this project reference is uptodate
+                return !ts.forEach(oldResolvedRef.references, function (childResolvedRef, index) {
+                    return !resolvedProjectReferenceUptoDate(childResolvedRef, oldResolvedRef.commandLine.projectReferences[index]);
+                });
+            }
+            // In old program, not able to resolve project reference path,
+            // so if config file doesnt exist, it is uptodate.
+            return !fileExists(resolveProjectReferencePath(oldRef));
+        }
+    }
+    ts.isProgramUptoDate = isProgramUptoDate;
+    function getConfigFileParsingDiagnostics(configFileParseResult) {
+        return configFileParseResult.options.configFile ? configFileParseResult.options.configFile.parseDiagnostics.concat(configFileParseResult.errors) :
+            configFileParseResult.errors;
+    }
+    ts.getConfigFileParsingDiagnostics = getConfigFileParsingDiagnostics;
+    /**
+     * Determine if source file needs to be re-created even if its text hasn't changed
+     */
+    function shouldProgramCreateNewSourceFiles(program, newOptions) {
+        if (!program)
+            return false;
+        // If any compiler options change, we can't reuse old source file even if version match
+        // The change in options like these could result in change in syntax tree or `sourceFile.bindDiagnostics`.
+        var oldOptions = program.getCompilerOptions();
+        return !!ts.sourceFileAffectingCompilerOptions.some(function (option) {
+            return !ts.isJsonEqual(ts.getCompilerOptionValue(oldOptions, option), ts.getCompilerOptionValue(newOptions, option));
+        });
+    }
+    function createCreateProgramOptions(rootNames, options, host, oldProgram, configFileParsingDiagnostics) {
+        return {
+            rootNames: rootNames,
+            options: options,
+            host: host,
+            oldProgram: oldProgram,
+            configFileParsingDiagnostics: configFileParsingDiagnostics
+        };
+    }
+    function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _configFileParsingDiagnostics) {
+        var createProgramOptions = ts.isArray(rootNamesOrOptions) ? createCreateProgramOptions(rootNamesOrOptions, _options, _host, _oldProgram, _configFileParsingDiagnostics) : rootNamesOrOptions; // TODO: GH#18217
+        var rootNames = createProgramOptions.rootNames, options = createProgramOptions.options, configFileParsingDiagnostics = createProgramOptions.configFileParsingDiagnostics, projectReferences = createProgramOptions.projectReferences;
+        var oldProgram = createProgramOptions.oldProgram;
+        var program;
+        var processingDefaultLibFiles;
+        var processingOtherFiles;
+        var files;
+        var commonSourceDirectory;
+        var diagnosticsProducingTypeChecker;
+        var noDiagnosticsTypeChecker;
+        var classifiableNames;
+        var ambientModuleNameToUnmodifiedFileName = ts.createMap();
+        var cachedSemanticDiagnosticsForFile = {};
+        var cachedDeclarationDiagnosticsForFile = {};
+        var resolvedTypeReferenceDirectives = ts.createMap();
+        var fileProcessingDiagnostics = ts.createDiagnosticCollection();
+        // The below settings are to track if a .js file should be add to the program if loaded via searching under node_modules.
+        // This works as imported modules are discovered recursively in a depth first manner, specifically:
+        // - For each root file, findSourceFile is called.
+        // - This calls processImportedModules for each module imported in the source file.
+        // - This calls resolveModuleNames, and then calls findSourceFile for each resolved module.
+        // As all these operations happen - and are nested - within the createProgram call, they close over the below variables.
+        // The current resolution depth is tracked by incrementing/decrementing as the depth first search progresses.
+        var maxNodeModuleJsDepth = typeof options.maxNodeModuleJsDepth === "number" ? options.maxNodeModuleJsDepth : 0;
+        var currentNodeModulesDepth = 0;
+        // If a module has some of its imports skipped due to being at the depth limit under node_modules, then track
+        // this, as it may be imported at a shallower depth later, and then it will need its skipped imports processed.
+        var modulesWithElidedImports = ts.createMap();
+        // Track source files that are source files found by searching under node_modules, as these shouldn't be compiled.
+        var sourceFilesFoundSearchingNodeModules = ts.createMap();
+        ts.performance.mark("beforeProgram");
+        var host = createProgramOptions.host || createCompilerHost(options);
+        var configParsingHost = parseConfigHostFromCompilerHostLike(host);
+        var skipDefaultLib = options.noLib;
+        var getDefaultLibraryFileName = ts.memoize(function () { return host.getDefaultLibFileName(options); });
+        var defaultLibraryPath = host.getDefaultLibLocation ? host.getDefaultLibLocation() : ts.getDirectoryPath(getDefaultLibraryFileName());
+        var programDiagnostics = ts.createDiagnosticCollection();
+        var currentDirectory = host.getCurrentDirectory();
+        var supportedExtensions = ts.getSupportedExtensions(options);
+        var supportedExtensionsWithJsonIfResolveJsonModule = ts.getSuppoertedExtensionsWithJsonIfResolveJsonModule(options, supportedExtensions);
+        // Map storing if there is emit blocking diagnostics for given input
+        var hasEmitBlockingDiagnostics = ts.createMap();
+        var _compilerOptionsObjectLiteralSyntax;
+        var moduleResolutionCache;
+        var resolveModuleNamesWorker;
+        var hasInvalidatedResolution = host.hasInvalidatedResolution || ts.returnFalse;
+        if (host.resolveModuleNames) {
+            resolveModuleNamesWorker = function (moduleNames, containingFile, reusedNames, redirectedReference) { return host.resolveModuleNames(ts.Debug.assertEachDefined(moduleNames), containingFile, reusedNames, redirectedReference).map(function (resolved) {
+                // An older host may have omitted extension, in which case we should infer it from the file extension of resolvedFileName.
+                if (!resolved || resolved.extension !== undefined) {
+                    return resolved;
+                }
+                var withExtension = ts.clone(resolved);
+                withExtension.extension = ts.extensionFromPath(resolved.resolvedFileName);
+                return withExtension;
+            }); };
+        }
+        else {
+            moduleResolutionCache = ts.createModuleResolutionCache(currentDirectory, function (x) { return host.getCanonicalFileName(x); });
+            var loader_1 = function (moduleName, containingFile, redirectedReference) { return ts.resolveModuleName(moduleName, containingFile, options, host, moduleResolutionCache, redirectedReference).resolvedModule; }; // TODO: GH#18217
+            resolveModuleNamesWorker = function (moduleNames, containingFile, _reusedNames, redirectedReference) { return loadWithLocalCache(ts.Debug.assertEachDefined(moduleNames), containingFile, redirectedReference, loader_1); };
+        }
+        var resolveTypeReferenceDirectiveNamesWorker;
+        if (host.resolveTypeReferenceDirectives) {
+            resolveTypeReferenceDirectiveNamesWorker = function (typeDirectiveNames, containingFile, redirectedReference) { return host.resolveTypeReferenceDirectives(ts.Debug.assertEachDefined(typeDirectiveNames), containingFile, redirectedReference); };
+        }
+        else {
+            var loader_2 = function (typesRef, containingFile, redirectedReference) { return ts.resolveTypeReferenceDirective(typesRef, containingFile, options, host, redirectedReference).resolvedTypeReferenceDirective; }; // TODO: GH#18217
+            resolveTypeReferenceDirectiveNamesWorker = function (typeReferenceDirectiveNames, containingFile, redirectedReference) { return loadWithLocalCache(ts.Debug.assertEachDefined(typeReferenceDirectiveNames), containingFile, redirectedReference, loader_2); };
+        }
+        // Map from a stringified PackageId to the source file with that id.
+        // Only one source file may have a given packageId. Others become redirects (see createRedirectSourceFile).
+        // `packageIdToSourceFile` is only used while building the program, while `sourceFileToPackageName` and `isSourceFileTargetOfRedirect` are kept around.
+        var packageIdToSourceFile = ts.createMap();
+        // Maps from a SourceFile's `.path` to the name of the package it was imported with.
+        var sourceFileToPackageName = ts.createMap();
+        // Key is a file name. Value is the (non-empty, or undefined) list of files that redirect to it.
+        var redirectTargetsMap = ts.createMultiMap();
+        /**
+         * map with
+         * - SourceFile if present
+         * - false if sourceFile missing for source of project reference redirect
+         * - undefined otherwise
+         */
+        var filesByName = ts.createMap();
+        var missingFilePaths;
+        // stores 'filename -> file association' ignoring case
+        // used to track cases when two file names differ only in casing
+        var filesByNameIgnoreCase = host.useCaseSensitiveFileNames() ? ts.createMap() : undefined;
+        // A parallel array to projectReferences storing the results of reading in the referenced tsconfig files
+        var resolvedProjectReferences;
+        var projectReferenceRedirects;
+        var mapFromFileToProjectReferenceRedirects;
+        var shouldCreateNewSourceFile = shouldProgramCreateNewSourceFiles(oldProgram, options);
+        var structuralIsReused = tryReuseStructureFromOldProgram();
+        if (structuralIsReused !== 2 /* Completely */) {
+            processingDefaultLibFiles = [];
+            processingOtherFiles = [];
+            if (projectReferences) {
+                if (!resolvedProjectReferences) {
+                    resolvedProjectReferences = projectReferences.map(parseProjectReferenceConfigFile);
+                }
+                if (rootNames.length) {
+                    for (var _i = 0, resolvedProjectReferences_1 = resolvedProjectReferences; _i < resolvedProjectReferences_1.length; _i++) {
+                        var parsedRef = resolvedProjectReferences_1[_i];
+                        if (parsedRef) {
+                            var out = parsedRef.commandLine.options.outFile || parsedRef.commandLine.options.out;
+                            if (out) {
+                                var dtsOutfile = ts.changeExtension(out, ".d.ts");
+                                processSourceFile(dtsOutfile, /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
+                            }
+                        }
+                    }
+                }
+            }
+            ts.forEach(rootNames, function (name) { return processRootFile(name, /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false); });
+            // load type declarations specified via 'types' argument or implicitly from types/ and node_modules/@types folders
+            var typeReferences = rootNames.length ? ts.getAutomaticTypeDirectiveNames(options, host) : ts.emptyArray;
+            if (typeReferences.length) {
+                // This containingFilename needs to match with the one used in managed-side
+                var containingDirectory = options.configFilePath ? ts.getDirectoryPath(options.configFilePath) : host.getCurrentDirectory();
+                var containingFilename = ts.combinePaths(containingDirectory, "__inferred type names__.ts");
+                var resolutions = resolveTypeReferenceDirectiveNamesWorker(typeReferences, containingFilename);
+                for (var i = 0; i < typeReferences.length; i++) {
+                    processTypeReferenceDirective(typeReferences[i], resolutions[i]);
+                }
+            }
+            // Do not process the default library if:
+            //  - The '--noLib' flag is used.
+            //  - A 'no-default-lib' reference comment is encountered in
+            //      processing the root files.
+            if (rootNames.length && !skipDefaultLib) {
+                // If '--lib' is not specified, include default library file according to '--target'
+                // otherwise, using options specified in '--lib' instead of '--target' default library file
+                var defaultLibraryFileName = getDefaultLibraryFileName();
+                if (!options.lib && defaultLibraryFileName) {
+                    processRootFile(defaultLibraryFileName, /*isDefaultLib*/ true, /*ignoreNoDefaultLib*/ false);
+                }
+                else {
+                    ts.forEach(options.lib, function (libFileName) {
+                        processRootFile(ts.combinePaths(defaultLibraryPath, libFileName), /*isDefaultLib*/ true, /*ignoreNoDefaultLib*/ false);
+                    });
+                }
+            }
+            missingFilePaths = ts.arrayFrom(ts.mapDefinedIterator(filesByName.entries(), function (_a) {
+                var path = _a[0], file = _a[1];
+                return file === undefined ? path : undefined;
+            }));
+            files = ts.stableSort(processingDefaultLibFiles, compareDefaultLibFiles).concat(processingOtherFiles);
+            processingDefaultLibFiles = undefined;
+            processingOtherFiles = undefined;
+        }
+        ts.Debug.assert(!!missingFilePaths);
+        // Release any files we have acquired in the old program but are
+        // not part of the new program.
+        if (oldProgram && host.onReleaseOldSourceFile) {
+            var oldSourceFiles = oldProgram.getSourceFiles();
+            for (var _a = 0, oldSourceFiles_1 = oldSourceFiles; _a < oldSourceFiles_1.length; _a++) {
+                var oldSourceFile = oldSourceFiles_1[_a];
+                var newFile = getSourceFileByPath(oldSourceFile.resolvedPath);
+                if (shouldCreateNewSourceFile || !newFile ||
+                    // old file wasnt redirect but new file is
+                    (oldSourceFile.resolvedPath === oldSourceFile.path && newFile.resolvedPath !== oldSourceFile.path)) {
+                    host.onReleaseOldSourceFile(oldSourceFile, oldProgram.getCompilerOptions(), !!getSourceFileByPath(oldSourceFile.path));
+                }
+            }
+            oldProgram.forEachResolvedProjectReference(function (resolvedProjectReference, resolvedProjectReferencePath) {
+                if (resolvedProjectReference && !getResolvedProjectReferenceByPath(resolvedProjectReferencePath)) {
+                    host.onReleaseOldSourceFile(resolvedProjectReference.sourceFile, oldProgram.getCompilerOptions(), /*hasSourceFileByPath*/ false);
+                }
+            });
+        }
+        // unconditionally set oldProgram to undefined to prevent it from being captured in closure
+        oldProgram = undefined;
+        program = {
+            getRootFileNames: function () { return rootNames; },
+            getSourceFile: getSourceFile,
+            getSourceFileByPath: getSourceFileByPath,
+            getSourceFiles: function () { return files; },
+            getMissingFilePaths: function () { return missingFilePaths; },
+            getCompilerOptions: function () { return options; },
+            getSyntacticDiagnostics: getSyntacticDiagnostics,
+            getOptionsDiagnostics: getOptionsDiagnostics,
+            getGlobalDiagnostics: getGlobalDiagnostics,
+            getSemanticDiagnostics: getSemanticDiagnostics,
+            getSuggestionDiagnostics: getSuggestionDiagnostics,
+            getDeclarationDiagnostics: getDeclarationDiagnostics,
+            getTypeChecker: getTypeChecker,
+            getClassifiableNames: getClassifiableNames,
+            getDiagnosticsProducingTypeChecker: getDiagnosticsProducingTypeChecker,
+            getCommonSourceDirectory: getCommonSourceDirectory,
+            emit: emit,
+            getCurrentDirectory: function () { return currentDirectory; },
+            getNodeCount: function () { return getDiagnosticsProducingTypeChecker().getNodeCount(); },
+            getIdentifierCount: function () { return getDiagnosticsProducingTypeChecker().getIdentifierCount(); },
+            getSymbolCount: function () { return getDiagnosticsProducingTypeChecker().getSymbolCount(); },
+            getTypeCount: function () { return getDiagnosticsProducingTypeChecker().getTypeCount(); },
+            getFileProcessingDiagnostics: function () { return fileProcessingDiagnostics; },
+            getResolvedTypeReferenceDirectives: function () { return resolvedTypeReferenceDirectives; },
+            isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
+            isSourceFileDefaultLibrary: isSourceFileDefaultLibrary,
+            dropDiagnosticsProducingTypeChecker: dropDiagnosticsProducingTypeChecker,
+            getSourceFileFromReference: getSourceFileFromReference,
+            getLibFileFromReference: getLibFileFromReference,
+            sourceFileToPackageName: sourceFileToPackageName,
+            redirectTargetsMap: redirectTargetsMap,
+            isEmittedFile: isEmittedFile,
+            getConfigFileParsingDiagnostics: getConfigFileParsingDiagnostics,
+            getResolvedModuleWithFailedLookupLocationsFromCache: getResolvedModuleWithFailedLookupLocationsFromCache,
+            getProjectReferences: getProjectReferences,
+            getResolvedProjectReferences: getResolvedProjectReferences,
+            getProjectReferenceRedirect: getProjectReferenceRedirect,
+            getResolvedProjectReferenceToRedirect: getResolvedProjectReferenceToRedirect,
+            getResolvedProjectReferenceByPath: getResolvedProjectReferenceByPath,
+            forEachResolvedProjectReference: forEachResolvedProjectReference
+        };
+        verifyCompilerOptions();
+        ts.performance.mark("afterProgram");
+        ts.performance.measure("Program", "beforeProgram", "afterProgram");
+        return program;
+        function compareDefaultLibFiles(a, b) {
+            return ts.compareValues(getDefaultLibFilePriority(a), getDefaultLibFilePriority(b));
+        }
+        function getDefaultLibFilePriority(a) {
+            if (ts.containsPath(defaultLibraryPath, a.fileName, /*ignoreCase*/ false)) {
+                var basename = ts.getBaseFileName(a.fileName);
+                if (basename === "lib.d.ts" || basename === "lib.es6.d.ts")
+                    return 0;
+                var name = ts.removeSuffix(ts.removePrefix(basename, "lib."), ".d.ts");
+                var index = ts.libs.indexOf(name);
+                if (index !== -1)
+                    return index + 1;
+            }
+            return ts.libs.length + 2;
+        }
+        function getResolvedModuleWithFailedLookupLocationsFromCache(moduleName, containingFile) {
+            return moduleResolutionCache && ts.resolveModuleNameFromCache(moduleName, containingFile, moduleResolutionCache);
+        }
+        function toPath(fileName) {
+            return ts.toPath(fileName, currentDirectory, getCanonicalFileName);
+        }
+        function getCommonSourceDirectory() {
+            if (commonSourceDirectory === undefined) {
+                var emittedFiles = ts.filter(files, function (file) { return ts.sourceFileMayBeEmitted(file, options, isSourceFileFromExternalLibrary); });
+                if (options.rootDir && checkSourceFilesBelongToPath(emittedFiles, options.rootDir)) {
+                    // If a rootDir is specified use it as the commonSourceDirectory
+                    commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, currentDirectory);
+                }
+                else if (options.composite && options.configFilePath) {
+                    // Project compilations never infer their root from the input source paths
+                    commonSourceDirectory = ts.getDirectoryPath(ts.normalizeSlashes(options.configFilePath));
+                    checkSourceFilesBelongToPath(emittedFiles, commonSourceDirectory);
+                }
+                else {
+                    commonSourceDirectory = computeCommonSourceDirectory(emittedFiles);
+                }
+                if (commonSourceDirectory && commonSourceDirectory[commonSourceDirectory.length - 1] !== ts.directorySeparator) {
+                    // Make sure directory path ends with directory separator so this string can directly
+                    // used to replace with "" to get the relative path of the source file and the relative path doesn't
+                    // start with / making it rooted path
+                    commonSourceDirectory += ts.directorySeparator;
+                }
+            }
+            return commonSourceDirectory;
+        }
+        function getClassifiableNames() {
+            if (!classifiableNames) {
+                // Initialize a checker so that all our files are bound.
+                getTypeChecker();
+                classifiableNames = ts.createUnderscoreEscapedMap();
+                for (var _i = 0, files_2 = files; _i < files_2.length; _i++) {
+                    var sourceFile = files_2[_i];
+                    ts.copyEntries(sourceFile.classifiableNames, classifiableNames);
+                }
+            }
+            return classifiableNames;
+        }
+        function resolveModuleNamesReusingOldState(moduleNames, containingFile, file) {
+            if (structuralIsReused === 0 /* Not */ && !file.ambientModuleNames.length) {
+                // If the old program state does not permit reusing resolutions and `file` does not contain locally defined ambient modules,
+                // the best we can do is fallback to the default logic.
+                return resolveModuleNamesWorker(moduleNames, containingFile, /*reusedNames*/ undefined, getResolvedProjectReferenceToRedirect(file.originalFileName));
+            }
+            var oldSourceFile = oldProgram && oldProgram.getSourceFile(containingFile);
+            if (oldSourceFile !== file && file.resolvedModules) {
+                // `file` was created for the new program.
+                //
+                // We only set `file.resolvedModules` via work from the current function,
+                // so it is defined iff we already called the current function on `file`.
+                // That call happened no later than the creation of the `file` object,
+                // which per above occurred during the current program creation.
+                // Since we assume the filesystem does not change during program creation,
+                // it is safe to reuse resolutions from the earlier call.
+                var result_6 = [];
+                for (var _i = 0, moduleNames_1 = moduleNames; _i < moduleNames_1.length; _i++) {
+                    var moduleName = moduleNames_1[_i];
+                    var resolvedModule = file.resolvedModules.get(moduleName);
+                    result_6.push(resolvedModule);
+                }
+                return result_6;
+            }
+            // At this point, we know at least one of the following hold:
+            // - file has local declarations for ambient modules
+            // - old program state is available
+            // With this information, we can infer some module resolutions without performing resolution.
+            /** An ordered list of module names for which we cannot recover the resolution. */
+            var unknownModuleNames;
+            /**
+             * The indexing of elements in this list matches that of `moduleNames`.
+             *
+             * Before combining results, result[i] is in one of the following states:
+             * * undefined: needs to be recomputed,
+             * * predictedToResolveToAmbientModuleMarker: known to be an ambient module.
+             * Needs to be reset to undefined before returning,
+             * * ResolvedModuleFull instance: can be reused.
+             */
+            var result;
+            var reusedNames;
+            /** A transient placeholder used to mark predicted resolution in the result list. */
+            var predictedToResolveToAmbientModuleMarker = {};
+            for (var i = 0; i < moduleNames.length; i++) {
+                var moduleName = moduleNames[i];
+                // If the source file is unchanged and doesnt have invalidated resolution, reuse the module resolutions
+                if (file === oldSourceFile && !hasInvalidatedResolution(oldSourceFile.path)) {
+                    var oldResolvedModule = oldSourceFile && oldSourceFile.resolvedModules.get(moduleName);
+                    if (oldResolvedModule) {
+                        if (ts.isTraceEnabled(options, host)) {
+                            ts.trace(host, ts.Diagnostics.Reusing_resolution_of_module_0_to_file_1_from_old_program, moduleName, containingFile);
+                        }
+                        (result || (result = new Array(moduleNames.length)))[i] = oldResolvedModule;
+                        (reusedNames || (reusedNames = [])).push(moduleName);
+                        continue;
+                    }
+                }
+                // We know moduleName resolves to an ambient module provided that moduleName:
+                // - is in the list of ambient modules locally declared in the current source file.
+                // - resolved to an ambient module in the old program whose declaration is in an unmodified file
+                //   (so the same module declaration will land in the new program)
+                var resolvesToAmbientModuleInNonModifiedFile = false;
+                if (ts.contains(file.ambientModuleNames, moduleName)) {
+                    resolvesToAmbientModuleInNonModifiedFile = true;
+                    if (ts.isTraceEnabled(options, host)) {
+                        ts.trace(host, ts.Diagnostics.Module_0_was_resolved_as_locally_declared_ambient_module_in_file_1, moduleName, containingFile);
+                    }
+                }
+                else {
+                    resolvesToAmbientModuleInNonModifiedFile = moduleNameResolvesToAmbientModuleInNonModifiedFile(moduleName);
+                }
+                if (resolvesToAmbientModuleInNonModifiedFile) {
+                    (result || (result = new Array(moduleNames.length)))[i] = predictedToResolveToAmbientModuleMarker;
+                }
+                else {
+                    // Resolution failed in the old program, or resolved to an ambient module for which we can't reuse the result.
+                    (unknownModuleNames || (unknownModuleNames = [])).push(moduleName);
+                }
+            }
+            var resolutions = unknownModuleNames && unknownModuleNames.length
+                ? resolveModuleNamesWorker(unknownModuleNames, containingFile, reusedNames, getResolvedProjectReferenceToRedirect(file.originalFileName))
+                : ts.emptyArray;
+            // Combine results of resolutions and predicted results
+            if (!result) {
+                // There were no unresolved/ambient resolutions.
+                ts.Debug.assert(resolutions.length === moduleNames.length);
+                return resolutions;
+            }
+            var j = 0;
+            for (var i = 0; i < result.length; i++) {
+                if (result[i]) {
+                    // `result[i]` is either a `ResolvedModuleFull` or a marker.
+                    // If it is the former, we can leave it as is.
+                    if (result[i] === predictedToResolveToAmbientModuleMarker) {
+                        result[i] = undefined; // TODO: GH#18217
+                    }
+                }
+                else {
+                    result[i] = resolutions[j];
+                    j++;
+                }
+            }
+            ts.Debug.assert(j === resolutions.length);
+            return result;
+            // If we change our policy of rechecking failed lookups on each program create,
+            // we should adjust the value returned here.
+            function moduleNameResolvesToAmbientModuleInNonModifiedFile(moduleName) {
+                var resolutionToFile = ts.getResolvedModule(oldSourceFile, moduleName);
+                var resolvedFile = resolutionToFile && oldProgram.getSourceFile(resolutionToFile.resolvedFileName);
+                if (resolutionToFile && resolvedFile && !resolvedFile.externalModuleIndicator) {
+                    // In the old program, we resolved to an ambient module that was in the same
+                    //   place as we expected to find an actual module file.
+                    // We actually need to return 'false' here even though this seems like a 'true' case
+                    //   because the normal module resolution algorithm will find this anyway.
+                    return false;
+                }
+                // at least one of declarations should come from non-modified source file
+                var unmodifiedFile = ambientModuleNameToUnmodifiedFileName.get(moduleName);
+                if (!unmodifiedFile) {
+                    return false;
+                }
+                if (ts.isTraceEnabled(options, host)) {
+                    ts.trace(host, ts.Diagnostics.Module_0_was_resolved_as_ambient_module_declared_in_1_since_this_file_was_not_modified, moduleName, unmodifiedFile);
+                }
+                return true;
+            }
+        }
+        function canReuseProjectReferences() {
+            return !forEachProjectReference(oldProgram.getProjectReferences(), oldProgram.getResolvedProjectReferences(), function (oldResolvedRef, index, parent) {
+                var newRef = (parent ? parent.commandLine.projectReferences : projectReferences)[index];
+                var newResolvedRef = parseProjectReferenceConfigFile(newRef);
+                if (oldResolvedRef) {
+                    // Resolved project reference has gone missing or changed
+                    return !newResolvedRef || newResolvedRef.sourceFile !== oldResolvedRef.sourceFile;
+                }
+                else {
+                    // A previously-unresolved reference may be resolved now
+                    return newResolvedRef !== undefined;
+                }
+            }, function (oldProjectReferences, parent) {
+                // If array of references is changed, we cant resue old program
+                var newReferences = parent ? getResolvedProjectReferenceByPath(parent.sourceFile.path).commandLine.projectReferences : projectReferences;
+                return !ts.arrayIsEqualTo(oldProjectReferences, newReferences, ts.projectReferenceIsEqualTo);
+            });
+        }
+        function tryReuseStructureFromOldProgram() {
+            if (!oldProgram) {
+                return 0 /* Not */;
+            }
+            // check properties that can affect structure of the program or module resolution strategy
+            // if any of these properties has changed - structure cannot be reused
+            var oldOptions = oldProgram.getCompilerOptions();
+            if (ts.changesAffectModuleResolution(oldOptions, options)) {
+                return oldProgram.structureIsReused = 0 /* Not */;
+            }
+            ts.Debug.assert(!(oldProgram.structureIsReused & (2 /* Completely */ | 1 /* SafeModules */)));
+            // there is an old program, check if we can reuse its structure
+            var oldRootNames = oldProgram.getRootFileNames();
+            if (!ts.arrayIsEqualTo(oldRootNames, rootNames)) {
+                return oldProgram.structureIsReused = 0 /* Not */;
+            }
+            if (!ts.arrayIsEqualTo(options.types, oldOptions.types)) {
+                return oldProgram.structureIsReused = 0 /* Not */;
+            }
+            // Check if any referenced project tsconfig files are different
+            if (!canReuseProjectReferences()) {
+                return oldProgram.structureIsReused = 0 /* Not */;
+            }
+            if (projectReferences) {
+                resolvedProjectReferences = projectReferences.map(parseProjectReferenceConfigFile);
+            }
+            // check if program source files has changed in the way that can affect structure of the program
+            var newSourceFiles = [];
+            var modifiedSourceFiles = [];
+            oldProgram.structureIsReused = 2 /* Completely */;
+            // If the missing file paths are now present, it can change the progam structure,
+            // and hence cant reuse the structure.
+            // This is same as how we dont reuse the structure if one of the file from old program is now missing
+            if (oldProgram.getMissingFilePaths().some(function (missingFilePath) { return host.fileExists(missingFilePath); })) {
+                return oldProgram.structureIsReused = 0 /* Not */;
+            }
+            var oldSourceFiles = oldProgram.getSourceFiles();
+            var SeenPackageName;
+            (function (SeenPackageName) {
+                SeenPackageName[SeenPackageName["Exists"] = 0] = "Exists";
+                SeenPackageName[SeenPackageName["Modified"] = 1] = "Modified";
+            })(SeenPackageName || (SeenPackageName = {}));
+            var seenPackageNames = ts.createMap();
+            for (var _i = 0, oldSourceFiles_2 = oldSourceFiles; _i < oldSourceFiles_2.length; _i++) {
+                var oldSourceFile = oldSourceFiles_2[_i];
+                var newSourceFile = host.getSourceFileByPath
+                    ? host.getSourceFileByPath(oldSourceFile.fileName, oldSourceFile.resolvedPath, options.target, /*onError*/ undefined, shouldCreateNewSourceFile)
+                    : host.getSourceFile(oldSourceFile.fileName, options.target, /*onError*/ undefined, shouldCreateNewSourceFile); // TODO: GH#18217
+                if (!newSourceFile) {
+                    return oldProgram.structureIsReused = 0 /* Not */;
+                }
+                ts.Debug.assert(!newSourceFile.redirectInfo, "Host should not return a redirect source file from `getSourceFile`");
+                var fileChanged = void 0;
+                if (oldSourceFile.redirectInfo) {
+                    // We got `newSourceFile` by path, so it is actually for the unredirected file.
+                    // This lets us know if the unredirected file has changed. If it has we should break the redirect.
+                    if (newSourceFile !== oldSourceFile.redirectInfo.unredirected) {
+                        // Underlying file has changed. Might not redirect anymore. Must rebuild program.
+                        return oldProgram.structureIsReused = 0 /* Not */;
+                    }
+                    fileChanged = false;
+                    newSourceFile = oldSourceFile; // Use the redirect.
+                }
+                else if (oldProgram.redirectTargetsMap.has(oldSourceFile.path)) {
+                    // If a redirected-to source file changes, the redirect may be broken.
+                    if (newSourceFile !== oldSourceFile) {
+                        return oldProgram.structureIsReused = 0 /* Not */;
+                    }
+                    fileChanged = false;
+                }
+                else {
+                    fileChanged = newSourceFile !== oldSourceFile;
+                }
+                // Since the project references havent changed, its right to set originalFileName and resolvedPath here
+                newSourceFile.path = oldSourceFile.path;
+                newSourceFile.originalFileName = oldSourceFile.originalFileName;
+                newSourceFile.resolvedPath = oldSourceFile.resolvedPath;
+                newSourceFile.fileName = oldSourceFile.fileName;
+                var packageName = oldProgram.sourceFileToPackageName.get(oldSourceFile.path);
+                if (packageName !== undefined) {
+                    // If there are 2 different source files for the same package name and at least one of them changes,
+                    // they might become redirects. So we must rebuild the program.
+                    var prevKind = seenPackageNames.get(packageName);
+                    var newKind = fileChanged ? 1 /* Modified */ : 0 /* Exists */;
+                    if ((prevKind !== undefined && newKind === 1 /* Modified */) || prevKind === 1 /* Modified */) {
+                        return oldProgram.structureIsReused = 0 /* Not */;
+                    }
+                    seenPackageNames.set(packageName, newKind);
+                }
+                if (fileChanged) {
+                    // The `newSourceFile` object was created for the new program.
+                    if (!ts.arrayIsEqualTo(oldSourceFile.libReferenceDirectives, newSourceFile.libReferenceDirectives, fileReferenceIsEqualTo)) {
+                        // 'lib' references has changed. Matches behavior in changesAffectModuleResolution
+                        return oldProgram.structureIsReused = 0 /* Not */;
+                    }
+                    if (oldSourceFile.hasNoDefaultLib !== newSourceFile.hasNoDefaultLib) {
+                        // value of no-default-lib has changed
+                        // this will affect if default library is injected into the list of files
+                        oldProgram.structureIsReused = 1 /* SafeModules */;
+                    }
+                    // check tripleslash references
+                    if (!ts.arrayIsEqualTo(oldSourceFile.referencedFiles, newSourceFile.referencedFiles, fileReferenceIsEqualTo)) {
+                        // tripleslash references has changed
+                        oldProgram.structureIsReused = 1 /* SafeModules */;
+                    }
+                    // check imports and module augmentations
+                    collectExternalModuleReferences(newSourceFile);
+                    if (!ts.arrayIsEqualTo(oldSourceFile.imports, newSourceFile.imports, moduleNameIsEqualTo)) {
+                        // imports has changed
+                        oldProgram.structureIsReused = 1 /* SafeModules */;
+                    }
+                    if (!ts.arrayIsEqualTo(oldSourceFile.moduleAugmentations, newSourceFile.moduleAugmentations, moduleNameIsEqualTo)) {
+                        // moduleAugmentations has changed
+                        oldProgram.structureIsReused = 1 /* SafeModules */;
+                    }
+                    if ((oldSourceFile.flags & 1572864 /* PermanentlySetIncrementalFlags */) !== (newSourceFile.flags & 1572864 /* PermanentlySetIncrementalFlags */)) {
+                        // dynamicImport has changed
+                        oldProgram.structureIsReused = 1 /* SafeModules */;
+                    }
+                    if (!ts.arrayIsEqualTo(oldSourceFile.typeReferenceDirectives, newSourceFile.typeReferenceDirectives, fileReferenceIsEqualTo)) {
+                        // 'types' references has changed
+                        oldProgram.structureIsReused = 1 /* SafeModules */;
+                    }
+                    // tentatively approve the file
+                    modifiedSourceFiles.push({ oldFile: oldSourceFile, newFile: newSourceFile });
+                }
+                else if (hasInvalidatedResolution(oldSourceFile.path)) {
+                    // 'module/types' references could have changed
+                    oldProgram.structureIsReused = 1 /* SafeModules */;
+                    // add file to the modified list so that we will resolve it later
+                    modifiedSourceFiles.push({ oldFile: oldSourceFile, newFile: newSourceFile });
+                }
+                // if file has passed all checks it should be safe to reuse it
+                newSourceFiles.push(newSourceFile);
+            }
+            if (oldProgram.structureIsReused !== 2 /* Completely */) {
+                return oldProgram.structureIsReused;
+            }
+            var modifiedFiles = modifiedSourceFiles.map(function (f) { return f.oldFile; });
+            for (var _a = 0, oldSourceFiles_3 = oldSourceFiles; _a < oldSourceFiles_3.length; _a++) {
+                var oldFile = oldSourceFiles_3[_a];
+                if (!ts.contains(modifiedFiles, oldFile)) {
+                    for (var _b = 0, _c = oldFile.ambientModuleNames; _b < _c.length; _b++) {
+                        var moduleName = _c[_b];
+                        ambientModuleNameToUnmodifiedFileName.set(moduleName, oldFile.fileName);
+                    }
+                }
+            }
+            // try to verify results of module resolution
+            for (var _d = 0, modifiedSourceFiles_1 = modifiedSourceFiles; _d < modifiedSourceFiles_1.length; _d++) {
+                var _e = modifiedSourceFiles_1[_d], oldSourceFile = _e.oldFile, newSourceFile = _e.newFile;
+                var newSourceFilePath = ts.getNormalizedAbsolutePath(newSourceFile.originalFileName, currentDirectory);
+                if (resolveModuleNamesWorker) {
+                    var moduleNames = getModuleNames(newSourceFile);
+                    var resolutions = resolveModuleNamesReusingOldState(moduleNames, newSourceFilePath, newSourceFile);
+                    // ensure that module resolution results are still correct
+                    var resolutionsChanged = ts.hasChangesInResolutions(moduleNames, resolutions, oldSourceFile.resolvedModules, ts.moduleResolutionIsEqualTo);
+                    if (resolutionsChanged) {
+                        oldProgram.structureIsReused = 1 /* SafeModules */;
+                        newSourceFile.resolvedModules = ts.zipToMap(moduleNames, resolutions);
+                    }
+                    else {
+                        newSourceFile.resolvedModules = oldSourceFile.resolvedModules;
+                    }
+                }
+                if (resolveTypeReferenceDirectiveNamesWorker) {
+                    // We lower-case all type references because npm automatically lowercases all packages. See GH#9824.
+                    var typesReferenceDirectives = ts.map(newSourceFile.typeReferenceDirectives, function (ref) { return ref.fileName.toLocaleLowerCase(); });
+                    var resolutions = resolveTypeReferenceDirectiveNamesWorker(typesReferenceDirectives, newSourceFilePath, getResolvedProjectReferenceToRedirect(newSourceFile.originalFileName));
+                    // ensure that types resolutions are still correct
+                    var resolutionsChanged = ts.hasChangesInResolutions(typesReferenceDirectives, resolutions, oldSourceFile.resolvedTypeReferenceDirectiveNames, ts.typeDirectiveIsEqualTo);
+                    if (resolutionsChanged) {
+                        oldProgram.structureIsReused = 1 /* SafeModules */;
+                        newSourceFile.resolvedTypeReferenceDirectiveNames = ts.zipToMap(typesReferenceDirectives, resolutions);
+                    }
+                    else {
+                        newSourceFile.resolvedTypeReferenceDirectiveNames = oldSourceFile.resolvedTypeReferenceDirectiveNames;
+                    }
+                }
+            }
+            if (oldProgram.structureIsReused !== 2 /* Completely */) {
+                return oldProgram.structureIsReused;
+            }
+            if (host.hasChangedAutomaticTypeDirectiveNames) {
+                return oldProgram.structureIsReused = 1 /* SafeModules */;
+            }
+            missingFilePaths = oldProgram.getMissingFilePaths();
+            // update fileName -> file mapping
+            for (var _f = 0, newSourceFiles_1 = newSourceFiles; _f < newSourceFiles_1.length; _f++) {
+                var newSourceFile = newSourceFiles_1[_f];
+                var filePath = newSourceFile.path;
+                addFileToFilesByName(newSourceFile, filePath, newSourceFile.resolvedPath);
+                // Set the file as found during node modules search if it was found that way in old progra,
+                if (oldProgram.isSourceFileFromExternalLibrary(oldProgram.getSourceFileByPath(filePath))) {
+                    sourceFilesFoundSearchingNodeModules.set(filePath, true);
+                }
+            }
+            files = newSourceFiles;
+            fileProcessingDiagnostics = oldProgram.getFileProcessingDiagnostics();
+            for (var _g = 0, modifiedSourceFiles_2 = modifiedSourceFiles; _g < modifiedSourceFiles_2.length; _g++) {
+                var modifiedFile = modifiedSourceFiles_2[_g];
+                fileProcessingDiagnostics.reattachFileDiagnostics(modifiedFile.newFile);
+            }
+            resolvedTypeReferenceDirectives = oldProgram.getResolvedTypeReferenceDirectives();
+            sourceFileToPackageName = oldProgram.sourceFileToPackageName;
+            redirectTargetsMap = oldProgram.redirectTargetsMap;
+            return oldProgram.structureIsReused = 2 /* Completely */;
+        }
+        function getEmitHost(writeFileCallback) {
+            return __assign({ getPrependNodes: getPrependNodes,
+                getCanonicalFileName: getCanonicalFileName, getCommonSourceDirectory: program.getCommonSourceDirectory, getCompilerOptions: program.getCompilerOptions, getCurrentDirectory: function () { return currentDirectory; }, getNewLine: function () { return host.getNewLine(); }, getSourceFile: program.getSourceFile, getSourceFileByPath: program.getSourceFileByPath, getSourceFiles: program.getSourceFiles, getLibFileFromReference: program.getLibFileFromReference, isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary, writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }), isEmitBlocked: isEmitBlocked, readFile: function (f) { return host.readFile(f); }, fileExists: function (f) {
+                    // Use local caches
+                    var path = toPath(f);
+                    if (getSourceFileByPath(path))
+                        return true;
+                    if (ts.contains(missingFilePaths, path))
+                        return false;
+                    // Before falling back to the host
+                    return host.fileExists(f);
+                } }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {}), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); } });
+        }
+        function getResolvedProjectReferences() {
+            return resolvedProjectReferences;
+        }
+        function getProjectReferences() {
+            return projectReferences;
+        }
+        function getPrependNodes() {
+            if (!projectReferences) {
+                return ts.emptyArray;
+            }
+            var nodes = [];
+            for (var i = 0; i < projectReferences.length; i++) {
+                var ref = projectReferences[i];
+                var resolvedRefOpts = resolvedProjectReferences[i].commandLine;
+                if (ref.prepend && resolvedRefOpts && resolvedRefOpts.options) {
+                    var out = resolvedRefOpts.options.outFile || resolvedRefOpts.options.out;
+                    // Upstream project didn't have outFile set -- skip (error will have been issued earlier)
+                    if (!out)
+                        continue;
+                    var _a = ts.getOutputPathsForBundle(resolvedRefOpts.options, /*forceDtsPaths*/ true), jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath;
+                    var node = ts.createInputFiles(function (fileName) {
+                        var path = toPath(fileName);
+                        var sourceFile = getSourceFileByPath(path);
+                        return sourceFile ? sourceFile.text : filesByName.has(path) ? undefined : host.readFile(path);
+                    }, jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath);
+                    nodes.push(node);
+                }
+            }
+            return nodes;
+        }
+        function isSourceFileFromExternalLibrary(file) {
+            return !!sourceFilesFoundSearchingNodeModules.get(file.path);
+        }
+        function isSourceFileDefaultLibrary(file) {
+            if (file.hasNoDefaultLib) {
+                return true;
+            }
+            if (!options.noLib) {
+                return false;
+            }
+            // If '--lib' is not specified, include default library file according to '--target'
+            // otherwise, using options specified in '--lib' instead of '--target' default library file
+            var equalityComparer = host.useCaseSensitiveFileNames() ? ts.equateStringsCaseSensitive : ts.equateStringsCaseInsensitive;
+            if (!options.lib) {
+                return equalityComparer(file.fileName, getDefaultLibraryFileName());
+            }
+            else {
+                return ts.some(options.lib, function (libFileName) { return equalityComparer(file.fileName, ts.combinePaths(defaultLibraryPath, libFileName)); });
+            }
+        }
+        function getDiagnosticsProducingTypeChecker() {
+            return diagnosticsProducingTypeChecker || (diagnosticsProducingTypeChecker = ts.createTypeChecker(program, /*produceDiagnostics:*/ true));
+        }
+        function dropDiagnosticsProducingTypeChecker() {
+            diagnosticsProducingTypeChecker = undefined;
+        }
+        function getTypeChecker() {
+            return noDiagnosticsTypeChecker || (noDiagnosticsTypeChecker = ts.createTypeChecker(program, /*produceDiagnostics:*/ false));
+        }
+        function emit(sourceFile, writeFileCallback, cancellationToken, emitOnlyDtsFiles, transformers) {
+            return runWithCancellationToken(function () { return emitWorker(program, sourceFile, writeFileCallback, cancellationToken, emitOnlyDtsFiles, transformers); });
+        }
+        function isEmitBlocked(emitFileName) {
+            return hasEmitBlockingDiagnostics.has(toPath(emitFileName));
+        }
+        function emitWorker(program, sourceFile, writeFileCallback, cancellationToken, emitOnlyDtsFiles, customTransformers) {
+            var declarationDiagnostics = [];
+            if (!emitOnlyDtsFiles) {
+                if (options.noEmit) {
+                    return { diagnostics: declarationDiagnostics, sourceMaps: undefined, emittedFiles: undefined, emitSkipped: true };
+                }
+                // If the noEmitOnError flag is set, then check if we have any errors so far.  If so,
+                // immediately bail out.  Note that we pass 'undefined' for 'sourceFile' so that we
+                // get any preEmit diagnostics, not just the ones
+                if (options.noEmitOnError) {
+                    var diagnostics = program.getOptionsDiagnostics(cancellationToken).concat(program.getSyntacticDiagnostics(sourceFile, cancellationToken), program.getGlobalDiagnostics(cancellationToken), program.getSemanticDiagnostics(sourceFile, cancellationToken));
+                    if (diagnostics.length === 0 && ts.getEmitDeclarations(program.getCompilerOptions())) {
+                        declarationDiagnostics = program.getDeclarationDiagnostics(/*sourceFile*/ undefined, cancellationToken);
+                    }
+                    if (diagnostics.length > 0 || declarationDiagnostics.length > 0) {
+                        return {
+                            diagnostics: ts.concatenate(diagnostics, declarationDiagnostics),
+                            sourceMaps: undefined,
+                            emittedFiles: undefined,
+                            emitSkipped: true
+                        };
+                    }
+                }
+            }
+            // Create the emit resolver outside of the "emitTime" tracking code below.  That way
+            // any cost associated with it (like type checking) are appropriate associated with
+            // the type-checking counter.
+            //
+            // If the -out option is specified, we should not pass the source file to getEmitResolver.
+            // This is because in the -out scenario all files need to be emitted, and therefore all
+            // files need to be type checked. And the way to specify that all files need to be type
+            // checked is to not pass the file to getEmitResolver.
+            var emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver((options.outFile || options.out) ? undefined : sourceFile, cancellationToken);
+            ts.performance.mark("beforeEmit");
+            var transformers = emitOnlyDtsFiles ? [] : ts.getTransformers(options, customTransformers);
+            var emitResult = ts.emitFiles(emitResolver, getEmitHost(writeFileCallback), sourceFile, // TODO: GH#18217
+            emitOnlyDtsFiles, transformers, customTransformers && customTransformers.afterDeclarations);
+            ts.performance.mark("afterEmit");
+            ts.performance.measure("Emit", "beforeEmit", "afterEmit");
+            return emitResult;
+        }
+        function getSourceFile(fileName) {
+            return getSourceFileByPath(toPath(fileName));
+        }
+        function getSourceFileByPath(path) {
+            return filesByName.get(path) || undefined;
+        }
+        function getDiagnosticsHelper(sourceFile, getDiagnostics, cancellationToken) {
+            if (sourceFile) {
+                return getDiagnostics(sourceFile, cancellationToken);
+            }
+            return ts.sortAndDeduplicateDiagnostics(ts.flatMap(program.getSourceFiles(), function (sourceFile) {
+                if (cancellationToken) {
+                    cancellationToken.throwIfCancellationRequested();
+                }
+                return getDiagnostics(sourceFile, cancellationToken);
+            }));
+        }
+        function getSyntacticDiagnostics(sourceFile, cancellationToken) {
+            return getDiagnosticsHelper(sourceFile, getSyntacticDiagnosticsForFile, cancellationToken);
+        }
+        function getSemanticDiagnostics(sourceFile, cancellationToken) {
+            return getDiagnosticsHelper(sourceFile, getSemanticDiagnosticsForFile, cancellationToken);
+        }
+        function getDeclarationDiagnostics(sourceFile, cancellationToken) {
+            var options = program.getCompilerOptions();
+            // collect diagnostics from the program only once if either no source file was specified or out/outFile is set (bundled emit)
+            if (!sourceFile || options.out || options.outFile) {
+                return getDeclarationDiagnosticsWorker(sourceFile, cancellationToken);
+            }
+            else {
+                return getDiagnosticsHelper(sourceFile, getDeclarationDiagnosticsForFile, cancellationToken);
+            }
+        }
+        function getSyntacticDiagnosticsForFile(sourceFile) {
+            // For JavaScript files, we report semantic errors for using TypeScript-only
+            // constructs from within a JavaScript file as syntactic errors.
+            if (ts.isSourceFileJS(sourceFile)) {
+                if (!sourceFile.additionalSyntacticDiagnostics) {
+                    sourceFile.additionalSyntacticDiagnostics = getJSSyntacticDiagnosticsForFile(sourceFile);
+                }
+                return ts.concatenate(sourceFile.additionalSyntacticDiagnostics, sourceFile.parseDiagnostics);
+            }
+            return sourceFile.parseDiagnostics;
+        }
+        function runWithCancellationToken(func) {
+            try {
+                return func();
+            }
+            catch (e) {
+                if (e instanceof ts.OperationCanceledException) {
+                    // We were canceled while performing the operation.  Because our type checker
+                    // might be a bad state, we need to throw it away.
+                    //
+                    // Note: we are overly aggressive here.  We do not actually *have* to throw away
+                    // the "noDiagnosticsTypeChecker".  However, for simplicity, i'd like to keep
+                    // the lifetimes of these two TypeCheckers the same.  Also, we generally only
+                    // cancel when the user has made a change anyways.  And, in that case, we (the
+                    // program instance) will get thrown away anyways.  So trying to keep one of
+                    // these type checkers alive doesn't serve much purpose.
+                    noDiagnosticsTypeChecker = undefined;
+                    diagnosticsProducingTypeChecker = undefined;
+                }
+                throw e;
+            }
+        }
+        function getSemanticDiagnosticsForFile(sourceFile, cancellationToken) {
+            return getAndCacheDiagnostics(sourceFile, cancellationToken, cachedSemanticDiagnosticsForFile, getSemanticDiagnosticsForFileNoCache);
+        }
+        function getSemanticDiagnosticsForFileNoCache(sourceFile, cancellationToken) {
+            return runWithCancellationToken(function () {
+                if (ts.skipTypeChecking(sourceFile, options)) {
+                    return ts.emptyArray;
+                }
+                var typeChecker = getDiagnosticsProducingTypeChecker();
+                ts.Debug.assert(!!sourceFile.bindDiagnostics);
+                var isCheckJs = ts.isCheckJsEnabledForFile(sourceFile, options);
+                // By default, only type-check .ts, .tsx, 'Deferred' and 'External' files (external files are added by plugins)
+                var includeBindAndCheckDiagnostics = sourceFile.scriptKind === 3 /* TS */ || sourceFile.scriptKind === 4 /* TSX */ ||
+                    sourceFile.scriptKind === 5 /* External */ || isCheckJs || sourceFile.scriptKind === 7 /* Deferred */;
+                var bindDiagnostics = includeBindAndCheckDiagnostics ? sourceFile.bindDiagnostics : ts.emptyArray;
+                var checkDiagnostics = includeBindAndCheckDiagnostics ? typeChecker.getDiagnostics(sourceFile, cancellationToken) : ts.emptyArray;
+                var fileProcessingDiagnosticsInFile = fileProcessingDiagnostics.getDiagnostics(sourceFile.fileName);
+                var programDiagnosticsInFile = programDiagnostics.getDiagnostics(sourceFile.fileName);
+                var diagnostics;
+                for (var _i = 0, _a = [bindDiagnostics, checkDiagnostics, fileProcessingDiagnosticsInFile, programDiagnosticsInFile, isCheckJs ? sourceFile.jsDocDiagnostics : undefined]; _i < _a.length; _i++) {
+                    var diags = _a[_i];
+                    if (diags) {
+                        for (var _b = 0, diags_1 = diags; _b < diags_1.length; _b++) {
+                            var diag = diags_1[_b];
+                            if (shouldReportDiagnostic(diag)) {
+                                diagnostics = ts.append(diagnostics, diag);
+                            }
+                        }
+                    }
+                }
+                return diagnostics;
+            });
+        }
+        function getSuggestionDiagnostics(sourceFile, cancellationToken) {
+            return runWithCancellationToken(function () {
+                return getDiagnosticsProducingTypeChecker().getSuggestionDiagnostics(sourceFile, cancellationToken);
+            });
+        }
+        /**
+         * Skip errors if previous line start with '// @ts-ignore' comment, not counting non-empty non-comment lines
+         */
+        function shouldReportDiagnostic(diagnostic) {
+            var file = diagnostic.file, start = diagnostic.start;
+            if (file) {
+                var lineStarts = ts.getLineStarts(file);
+                var line = ts.computeLineAndCharacterOfPosition(lineStarts, start).line; // TODO: GH#18217
+                while (line > 0) {
+                    var previousLineText = file.text.slice(lineStarts[line - 1], lineStarts[line]);
+                    var result = ignoreDiagnosticCommentRegEx.exec(previousLineText);
+                    if (!result) {
+                        // non-empty line
+                        return true;
+                    }
+                    if (result[3]) {
+                        // @ts-ignore
+                        return false;
+                    }
+                    line--;
+                }
+            }
+            return true;
+        }
+        function getJSSyntacticDiagnosticsForFile(sourceFile) {
+            return runWithCancellationToken(function () {
+                var diagnostics = [];
+                var parent = sourceFile;
+                walk(sourceFile);
+                return diagnostics;
+                function walk(node) {
+                    // Return directly from the case if the given node doesnt want to visit each child
+                    // Otherwise break to visit each child
+                    switch (parent.kind) {
+                        case 151 /* Parameter */:
+                        case 154 /* PropertyDeclaration */:
+                            if (parent.questionToken === node) {
+                                diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, "?"));
+                                return;
+                            }
+                        // falls through
+                        case 156 /* MethodDeclaration */:
+                        case 155 /* MethodSignature */:
+                        case 157 /* Constructor */:
+                        case 158 /* GetAccessor */:
+                        case 159 /* SetAccessor */:
+                        case 196 /* FunctionExpression */:
+                        case 239 /* FunctionDeclaration */:
+                        case 197 /* ArrowFunction */:
+                        case 237 /* VariableDeclaration */:
+                            // type annotation
+                            if (parent.type === node) {
+                                diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
+                                return;
+                            }
+                    }
+                    switch (node.kind) {
+                        case 248 /* ImportEqualsDeclaration */:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 254 /* ExportAssignment */:
+                            if (node.isExportEquals) {
+                                diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
+                                return;
+                            }
+                            break;
+                        case 273 /* HeritageClause */:
+                            var heritageClause = node;
+                            if (heritageClause.token === 109 /* ImplementsKeyword */) {
+                                diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
+                                return;
+                            }
+                            break;
+                        case 241 /* InterfaceDeclaration */:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 244 /* ModuleDeclaration */:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 242 /* TypeAliasDeclaration */:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 243 /* EnumDeclaration */:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 213 /* NonNullExpression */:
+                            diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.non_null_assertions_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 212 /* AsExpression */:
+                            diagnostics.push(createDiagnosticForNode(node.type, ts.Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
+                            return;
+                        case 194 /* TypeAssertionExpression */:
+                            ts.Debug.fail(); // Won't parse these in a JS file anyway, as they are interpreted as JSX.
+                    }
+                    var prevParent = parent;
+                    parent = node;
+                    ts.forEachChild(node, walk, walkArray);
+                    parent = prevParent;
+                }
+                function walkArray(nodes) {
+                    if (parent.decorators === nodes && !options.experimentalDecorators) {
+                        diagnostics.push(createDiagnosticForNode(parent, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning));
+                    }
+                    switch (parent.kind) {
+                        case 240 /* ClassDeclaration */:
+                        case 156 /* MethodDeclaration */:
+                        case 155 /* MethodSignature */:
+                        case 157 /* Constructor */:
+                        case 158 /* GetAccessor */:
+                        case 159 /* SetAccessor */:
+                        case 196 /* FunctionExpression */:
+                        case 239 /* FunctionDeclaration */:
+                        case 197 /* ArrowFunction */:
+                            // Check type parameters
+                            if (nodes === parent.typeParameters) {
+                                diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.type_parameter_declarations_can_only_be_used_in_a_ts_file));
+                                return;
+                            }
+                        // falls through
+                        case 219 /* VariableStatement */:
+                            // Check modifiers
+                            if (nodes === parent.modifiers) {
+                                return checkModifiers(nodes, parent.kind === 219 /* VariableStatement */);
+                            }
+                            break;
+                        case 154 /* PropertyDeclaration */:
+                            // Check modifiers of property declaration
+                            if (nodes === parent.modifiers) {
+                                for (var _i = 0, _a = nodes; _i < _a.length; _i++) {
+                                    var modifier = _a[_i];
+                                    if (modifier.kind !== 116 /* StaticKeyword */) {
+                                        diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
+                                    }
+                                }
+                                return;
+                            }
+                            break;
+                        case 151 /* Parameter */:
+                            // Check modifiers of parameter declaration
+                            if (nodes === parent.modifiers) {
+                                diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.parameter_modifiers_can_only_be_used_in_a_ts_file));
+                                return;
+                            }
+                            break;
+                        case 191 /* CallExpression */:
+                        case 192 /* NewExpression */:
+                        case 211 /* ExpressionWithTypeArguments */:
+                        case 261 /* JsxSelfClosingElement */:
+                        case 262 /* JsxOpeningElement */:
+                            // Check type arguments
+                            if (nodes === parent.typeArguments) {
+                                diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.type_arguments_can_only_be_used_in_a_ts_file));
+                                return;
+                            }
+                            break;
+                    }
+                    for (var _b = 0, nodes_6 = nodes; _b < nodes_6.length; _b++) {
+                        var node = nodes_6[_b];
+                        walk(node);
+                    }
+                }
+                function checkModifiers(modifiers, isConstValid) {
+                    for (var _i = 0, modifiers_1 = modifiers; _i < modifiers_1.length; _i++) {
+                        var modifier = modifiers_1[_i];
+                        switch (modifier.kind) {
+                            case 77 /* ConstKeyword */:
+                                if (isConstValid) {
+                                    continue;
+                                }
+                            // to report error,
+                            // falls through
+                            case 115 /* PublicKeyword */:
+                            case 113 /* PrivateKeyword */:
+                            case 114 /* ProtectedKeyword */:
+                            case 133 /* ReadonlyKeyword */:
+                            case 125 /* DeclareKeyword */:
+                            case 118 /* AbstractKeyword */:
+                                diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
+                                break;
+                            // These are all legal modifiers.
+                            case 116 /* StaticKeyword */:
+                            case 85 /* ExportKeyword */:
+                            case 80 /* DefaultKeyword */:
+                        }
+                    }
+                }
+                function createDiagnosticForNodeArray(nodes, message, arg0, arg1, arg2) {
+                    var start = nodes.pos;
+                    return ts.createFileDiagnostic(sourceFile, start, nodes.end - start, message, arg0, arg1, arg2);
+                }
+                // Since these are syntactic diagnostics, parent might not have been set
+                // this means the sourceFile cannot be infered from the node
+                function createDiagnosticForNode(node, message, arg0, arg1, arg2) {
+                    return ts.createDiagnosticForNodeInSourceFile(sourceFile, node, message, arg0, arg1, arg2);
+                }
+            });
+        }
+        function getDeclarationDiagnosticsWorker(sourceFile, cancellationToken) {
+            return getAndCacheDiagnostics(sourceFile, cancellationToken, cachedDeclarationDiagnosticsForFile, getDeclarationDiagnosticsForFileNoCache);
+        }
+        function getDeclarationDiagnosticsForFileNoCache(sourceFile, cancellationToken) {
+            return runWithCancellationToken(function () {
+                var resolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile, cancellationToken);
+                // Don't actually write any files since we're just getting diagnostics.
+                return ts.getDeclarationDiagnostics(getEmitHost(ts.noop), resolver, sourceFile);
+            });
+        }
+        function getAndCacheDiagnostics(sourceFile, cancellationToken, cache, getDiagnostics) {
+            var cachedResult = sourceFile
+                ? cache.perFile && cache.perFile.get(sourceFile.path)
+                : cache.allDiagnostics;
+            if (cachedResult) {
+                return cachedResult;
+            }
+            var result = getDiagnostics(sourceFile, cancellationToken) || ts.emptyArray; // TODO: GH#18217
+            if (sourceFile) {
+                if (!cache.perFile) {
+                    cache.perFile = ts.createMap();
+                }
+                cache.perFile.set(sourceFile.path, result);
+            }
+            else {
+                cache.allDiagnostics = result;
+            }
+            return result;
+        }
+        function getDeclarationDiagnosticsForFile(sourceFile, cancellationToken) {
+            return sourceFile.isDeclarationFile ? [] : getDeclarationDiagnosticsWorker(sourceFile, cancellationToken);
+        }
+        function getOptionsDiagnostics() {
+            return ts.sortAndDeduplicateDiagnostics(ts.concatenate(fileProcessingDiagnostics.getGlobalDiagnostics(), ts.concatenate(programDiagnostics.getGlobalDiagnostics(), getOptionsDiagnosticsOfConfigFile())));
+        }
+        function getOptionsDiagnosticsOfConfigFile() {
+            if (!options.configFile) {
+                return ts.emptyArray;
+            }
+            var diagnostics = programDiagnostics.getDiagnostics(options.configFile.fileName);
+            forEachResolvedProjectReference(function (resolvedRef) {
+                if (resolvedRef) {
+                    diagnostics = ts.concatenate(diagnostics, programDiagnostics.getDiagnostics(resolvedRef.sourceFile.fileName));
+                }
+            });
+            return diagnostics;
+        }
+        function getGlobalDiagnostics() {
+            return rootNames.length ? ts.sortAndDeduplicateDiagnostics(getDiagnosticsProducingTypeChecker().getGlobalDiagnostics().slice()) : ts.emptyArray;
+        }
+        function getConfigFileParsingDiagnostics() {
+            return configFileParsingDiagnostics || ts.emptyArray;
+        }
+        function processRootFile(fileName, isDefaultLib, ignoreNoDefaultLib) {
+            processSourceFile(ts.normalizePath(fileName), isDefaultLib, ignoreNoDefaultLib, /*packageId*/ undefined);
+        }
+        function fileReferenceIsEqualTo(a, b) {
+            return a.fileName === b.fileName;
+        }
+        function moduleNameIsEqualTo(a, b) {
+            return a.kind === 72 /* Identifier */
+                ? b.kind === 72 /* Identifier */ && a.escapedText === b.escapedText
+                : b.kind === 10 /* StringLiteral */ && a.text === b.text;
+        }
+        function collectExternalModuleReferences(file) {
+            if (file.imports) {
+                return;
+            }
+            var isJavaScriptFile = ts.isSourceFileJS(file);
+            var isExternalModuleFile = ts.isExternalModule(file);
+            // file.imports may not be undefined if there exists dynamic import
+            var imports;
+            var moduleAugmentations;
+            var ambientModules;
+            // If we are importing helpers, we need to add a synthetic reference to resolve the
+            // helpers library.
+            if (options.importHelpers
+                && (options.isolatedModules || isExternalModuleFile)
+                && !file.isDeclarationFile) {
+                // synthesize 'import "tslib"' declaration
+                var externalHelpersModuleReference = ts.createLiteral(ts.externalHelpersModuleNameText);
+                var importDecl = ts.createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*importClause*/ undefined, externalHelpersModuleReference);
+                ts.addEmitFlags(importDecl, 67108864 /* NeverApplyImportHelper */);
+                externalHelpersModuleReference.parent = importDecl;
+                importDecl.parent = file;
+                imports = [externalHelpersModuleReference];
+            }
+            for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
+                var node = _a[_i];
+                collectModuleReferences(node, /*inAmbientModule*/ false);
+            }
+            if ((file.flags & 524288 /* PossiblyContainsDynamicImport */) || isJavaScriptFile) {
+                collectDynamicImportOrRequireCalls(file);
+            }
+            file.imports = imports || ts.emptyArray;
+            file.moduleAugmentations = moduleAugmentations || ts.emptyArray;
+            file.ambientModuleNames = ambientModules || ts.emptyArray;
+            return;
+            function collectModuleReferences(node, inAmbientModule) {
+                if (ts.isAnyImportOrReExport(node)) {
+                    var moduleNameExpr = ts.getExternalModuleName(node);
+                    // TypeScript 1.0 spec (April 2014): 12.1.6
+                    // An ExternalImportDeclaration in an AmbientExternalModuleDeclaration may reference other external modules
+                    // only through top - level external module names. Relative external module names are not permitted.
+                    if (moduleNameExpr && ts.isStringLiteral(moduleNameExpr) && moduleNameExpr.text && (!inAmbientModule || !ts.isExternalModuleNameRelative(moduleNameExpr.text))) {
+                        imports = ts.append(imports, moduleNameExpr);
+                    }
+                }
+                else if (ts.isModuleDeclaration(node)) {
+                    if (ts.isAmbientModule(node) && (inAmbientModule || ts.hasModifier(node, 2 /* Ambient */) || file.isDeclarationFile)) {
+                        var nameText = ts.getTextOfIdentifierOrLiteral(node.name);
+                        // Ambient module declarations can be interpreted as augmentations for some existing external modules.
+                        // This will happen in two cases:
+                        // - if current file is external module then module augmentation is a ambient module declaration defined in the top level scope
+                        // - if current file is not external module then module augmentation is an ambient module declaration with non-relative module name
+                        //   immediately nested in top level ambient module declaration .
+                        if (isExternalModuleFile || (inAmbientModule && !ts.isExternalModuleNameRelative(nameText))) {
+                            (moduleAugmentations || (moduleAugmentations = [])).push(node.name);
+                        }
+                        else if (!inAmbientModule) {
+                            if (file.isDeclarationFile) {
+                                // for global .d.ts files record name of ambient module
+                                (ambientModules || (ambientModules = [])).push(nameText);
+                            }
+                            // An AmbientExternalModuleDeclaration declares an external module.
+                            // This type of declaration is permitted only in the global module.
+                            // The StringLiteral must specify a top - level external module name.
+                            // Relative external module names are not permitted
+                            // NOTE: body of ambient module is always a module block, if it exists
+                            var body = node.body;
+                            if (body) {
+                                for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
+                                    var statement = _a[_i];
+                                    collectModuleReferences(statement, /*inAmbientModule*/ true);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            function collectDynamicImportOrRequireCalls(file) {
+                var r = /import|require/g;
+                while (r.exec(file.text) !== null) {
+                    var node = getNodeAtPosition(file, r.lastIndex);
+                    if (ts.isRequireCall(node, /*checkArgumentIsStringLiteralLike*/ true)) {
+                        imports = ts.append(imports, node.arguments[0]);
+                    }
+                    // we have to check the argument list has length of 1. We will still have to process these even though we have parsing error.
+                    else if (ts.isImportCall(node) && node.arguments.length === 1 && ts.isStringLiteralLike(node.arguments[0])) {
+                        imports = ts.append(imports, node.arguments[0]);
+                    }
+                    else if (ts.isLiteralImportTypeNode(node)) {
+                        imports = ts.append(imports, node.argument.literal);
+                    }
+                }
+            }
+            /** Returns a token if position is in [start-of-leading-trivia, end), includes JSDoc only in JS files */
+            function getNodeAtPosition(sourceFile, position) {
+                var current = sourceFile;
+                var getContainingChild = function (child) {
+                    if (child.pos <= position && (position < child.end || (position === child.end && (child.kind === 1 /* EndOfFileToken */)))) {
+                        return child;
+                    }
+                };
+                while (true) {
+                    var child = isJavaScriptFile && ts.hasJSDocNodes(current) && ts.forEach(current.jsDoc, getContainingChild) || ts.forEachChild(current, getContainingChild);
+                    if (!child) {
+                        return current;
+                    }
+                    current = child;
+                }
+            }
+        }
+        function getLibFileFromReference(ref) {
+            var libName = ref.fileName.toLocaleLowerCase();
+            var libFileName = ts.libMap.get(libName);
+            if (libFileName) {
+                return getSourceFile(ts.combinePaths(defaultLibraryPath, libFileName));
+            }
+        }
+        /** This should have similar behavior to 'processSourceFile' without diagnostics or mutation. */
+        function getSourceFileFromReference(referencingFile, ref) {
+            return getSourceFileFromReferenceWorker(resolveTripleslashReference(ref.fileName, referencingFile.fileName), function (fileName) { return filesByName.get(toPath(fileName)) || undefined; });
+        }
+        function getSourceFileFromReferenceWorker(fileName, getSourceFile, fail, refFile) {
+            if (ts.hasExtension(fileName)) {
+                if (!options.allowNonTsExtensions && !ts.forEach(supportedExtensionsWithJsonIfResolveJsonModule, function (extension) { return ts.fileExtensionIs(host.getCanonicalFileName(fileName), extension); })) {
+                    if (fail)
+                        fail(ts.Diagnostics.File_0_has_unsupported_extension_The_only_supported_extensions_are_1, fileName, "'" + supportedExtensions.join("', '") + "'");
+                    return undefined;
+                }
+                var sourceFile = getSourceFile(fileName);
+                if (fail) {
+                    if (!sourceFile) {
+                        var redirect = getProjectReferenceRedirect(fileName);
+                        if (redirect) {
+                            fail(ts.Diagnostics.Output_file_0_has_not_been_built_from_source_file_1, redirect, fileName);
+                        }
+                        else {
+                            fail(ts.Diagnostics.File_0_not_found, fileName);
+                        }
+                    }
+                    else if (refFile && host.getCanonicalFileName(fileName) === host.getCanonicalFileName(refFile.fileName)) {
+                        fail(ts.Diagnostics.A_file_cannot_have_a_reference_to_itself);
+                    }
+                }
+                return sourceFile;
+            }
+            else {
+                var sourceFileNoExtension = options.allowNonTsExtensions && getSourceFile(fileName);
+                if (sourceFileNoExtension)
+                    return sourceFileNoExtension;
+                if (fail && options.allowNonTsExtensions) {
+                    fail(ts.Diagnostics.File_0_not_found, fileName);
+                    return undefined;
+                }
+                var sourceFileWithAddedExtension = ts.forEach(supportedExtensions, function (extension) { return getSourceFile(fileName + extension); });
+                if (fail && !sourceFileWithAddedExtension)
+                    fail(ts.Diagnostics.File_0_not_found, fileName + ".ts" /* Ts */);
+                return sourceFileWithAddedExtension;
+            }
+        }
+        /** This has side effects through `findSourceFile`. */
+        function processSourceFile(fileName, isDefaultLib, ignoreNoDefaultLib, packageId, refFile, refPos, refEnd) {
+            getSourceFileFromReferenceWorker(fileName, function (fileName) { return findSourceFile(fileName, toPath(fileName), isDefaultLib, ignoreNoDefaultLib, refFile, refPos, refEnd, packageId); }, // TODO: GH#18217
+            function (diagnostic) {
+                var args = [];
+                for (var _i = 1; _i < arguments.length; _i++) {
+                    args[_i - 1] = arguments[_i];
+                }
+                fileProcessingDiagnostics.add(refFile !== undefined && refEnd !== undefined && refPos !== undefined
+                    ? ts.createFileDiagnostic.apply(void 0, [refFile, refPos, refEnd - refPos, diagnostic].concat(args)) : ts.createCompilerDiagnostic.apply(void 0, [diagnostic].concat(args)));
+            }, refFile);
+        }
+        function reportFileNamesDifferOnlyInCasingError(fileName, existingFileName, refFile, refPos, refEnd) {
+            if (refFile !== undefined && refPos !== undefined && refEnd !== undefined) {
+                fileProcessingDiagnostics.add(ts.createFileDiagnostic(refFile, refPos, refEnd - refPos, ts.Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, existingFileName));
+            }
+            else {
+                fileProcessingDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, existingFileName));
+            }
+        }
+        function createRedirectSourceFile(redirectTarget, unredirected, fileName, path, resolvedPath, originalFileName) {
+            var redirect = Object.create(redirectTarget);
+            redirect.fileName = fileName;
+            redirect.path = path;
+            redirect.resolvedPath = resolvedPath;
+            redirect.originalFileName = originalFileName;
+            redirect.redirectInfo = { redirectTarget: redirectTarget, unredirected: unredirected };
+            sourceFilesFoundSearchingNodeModules.set(path, currentNodeModulesDepth > 0);
+            Object.defineProperties(redirect, {
+                id: {
+                    get: function () { return this.redirectInfo.redirectTarget.id; },
+                    set: function (value) { this.redirectInfo.redirectTarget.id = value; },
+                },
+                symbol: {
+                    get: function () { return this.redirectInfo.redirectTarget.symbol; },
+                    set: function (value) { this.redirectInfo.redirectTarget.symbol = value; },
+                },
+            });
+            return redirect;
+        }
+        // Get source file from normalized fileName
+        function findSourceFile(fileName, path, isDefaultLib, ignoreNoDefaultLib, refFile, refPos, refEnd, packageId) {
+            var originalFileName = fileName;
+            if (filesByName.has(path)) {
+                var file_1 = filesByName.get(path);
+                // try to check if we've already seen this file but with a different casing in path
+                // NOTE: this only makes sense for case-insensitive file systems, and only on files which are not redirected
+                if (file_1 && options.forceConsistentCasingInFileNames) {
+                    var inputName = fileName;
+                    var checkedName = file_1.fileName;
+                    var isRedirect = toPath(checkedName) !== toPath(inputName);
+                    if (isRedirect) {
+                        inputName = getProjectReferenceRedirect(fileName) || fileName;
+                    }
+                    if (ts.getNormalizedAbsolutePath(checkedName, currentDirectory) !== ts.getNormalizedAbsolutePath(inputName, currentDirectory)) {
+                        reportFileNamesDifferOnlyInCasingError(inputName, checkedName, refFile, refPos, refEnd);
+                    }
+                }
+                // If the file was previously found via a node_modules search, but is now being processed as a root file,
+                // then everything it sucks in may also be marked incorrectly, and needs to be checked again.
+                if (file_1 && sourceFilesFoundSearchingNodeModules.get(file_1.path) && currentNodeModulesDepth === 0) {
+                    sourceFilesFoundSearchingNodeModules.set(file_1.path, false);
+                    if (!options.noResolve) {
+                        processReferencedFiles(file_1, isDefaultLib);
+                        processTypeReferenceDirectives(file_1);
+                    }
+                    if (!options.noLib) {
+                        processLibReferenceDirectives(file_1);
+                    }
+                    modulesWithElidedImports.set(file_1.path, false);
+                    processImportedModules(file_1);
+                }
+                // See if we need to reprocess the imports due to prior skipped imports
+                else if (file_1 && modulesWithElidedImports.get(file_1.path)) {
+                    if (currentNodeModulesDepth < maxNodeModuleJsDepth) {
+                        modulesWithElidedImports.set(file_1.path, false);
+                        processImportedModules(file_1);
+                    }
+                }
+                return file_1 || undefined;
+            }
+            var redirectedPath;
+            if (refFile) {
+                var redirect = getProjectReferenceRedirect(fileName);
+                if (redirect) {
+                    (refFile.redirectedReferences || (refFile.redirectedReferences = [])).push(fileName);
+                    fileName = redirect;
+                    // Once we start redirecting to a file, we can potentially come back to it
+                    // via a back-reference from another file in the .d.ts folder. If that happens we'll
+                    // end up trying to add it to the program *again* because we were tracking it via its
+                    // original (un-redirected) name. So we have to map both the original path and the redirected path
+                    // to the source file we're about to find/create
+                    redirectedPath = toPath(redirect);
+                }
+            }
+            // We haven't looked for this file, do so now and cache result
+            var file = host.getSourceFile(fileName, options.target, function (hostErrorMessage) {
+                if (refFile !== undefined && refPos !== undefined && refEnd !== undefined) {
+                    fileProcessingDiagnostics.add(ts.createFileDiagnostic(refFile, refPos, refEnd - refPos, ts.Diagnostics.Cannot_read_file_0_Colon_1, fileName, hostErrorMessage));
+                }
+                else {
+                    fileProcessingDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_read_file_0_Colon_1, fileName, hostErrorMessage));
+                }
+            }, shouldCreateNewSourceFile);
+            if (packageId) {
+                var packageIdKey = ts.packageIdToString(packageId);
+                var fileFromPackageId = packageIdToSourceFile.get(packageIdKey);
+                if (fileFromPackageId) {
+                    // Some other SourceFile already exists with this package name and version.
+                    // Instead of creating a duplicate, just redirect to the existing one.
+                    var dupFile = createRedirectSourceFile(fileFromPackageId, file, fileName, path, toPath(fileName), originalFileName); // TODO: GH#18217
+                    redirectTargetsMap.add(fileFromPackageId.path, fileName);
+                    addFileToFilesByName(dupFile, path, redirectedPath);
+                    sourceFileToPackageName.set(path, packageId.name);
+                    processingOtherFiles.push(dupFile);
+                    return dupFile;
+                }
+                else if (file) {
+                    // This is the first source file to have this packageId.
+                    packageIdToSourceFile.set(packageIdKey, file);
+                    sourceFileToPackageName.set(path, packageId.name);
+                }
+            }
+            addFileToFilesByName(file, path, redirectedPath);
+            if (file) {
+                sourceFilesFoundSearchingNodeModules.set(path, currentNodeModulesDepth > 0);
+                file.path = path;
+                file.resolvedPath = toPath(fileName);
+                file.originalFileName = originalFileName;
+                if (host.useCaseSensitiveFileNames()) {
+                    var pathLowerCase = path.toLowerCase();
+                    // for case-sensitive file systems check if we've already seen some file with similar filename ignoring case
+                    var existingFile = filesByNameIgnoreCase.get(pathLowerCase);
+                    if (existingFile) {
+                        reportFileNamesDifferOnlyInCasingError(fileName, existingFile.fileName, refFile, refPos, refEnd);
+                    }
+                    else {
+                        filesByNameIgnoreCase.set(pathLowerCase, file);
+                    }
+                }
+                skipDefaultLib = skipDefaultLib || (file.hasNoDefaultLib && !ignoreNoDefaultLib);
+                if (!options.noResolve) {
+                    processReferencedFiles(file, isDefaultLib);
+                    processTypeReferenceDirectives(file);
+                }
+                if (!options.noLib) {
+                    processLibReferenceDirectives(file);
+                }
+                // always process imported modules to record module name resolutions
+                processImportedModules(file);
+                if (isDefaultLib) {
+                    processingDefaultLibFiles.push(file);
+                }
+                else {
+                    processingOtherFiles.push(file);
+                }
+            }
+            return file;
+        }
+        function addFileToFilesByName(file, path, redirectedPath) {
+            if (redirectedPath) {
+                filesByName.set(redirectedPath, file);
+                filesByName.set(path, file || false);
+            }
+            else {
+                filesByName.set(path, file);
+            }
+        }
+        function getProjectReferenceRedirect(fileName) {
+            // Ignore dts or any of the non ts files
+            if (!resolvedProjectReferences || !resolvedProjectReferences.length || ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) || !ts.fileExtensionIsOneOf(fileName, ts.supportedTSExtensions)) {
+                return undefined;
+            }
+            // If this file is produced by a referenced project, we need to rewrite it to
+            // look in the output folder of the referenced project rather than the input
+            var referencedProject = getResolvedProjectReferenceToRedirect(fileName);
+            if (!referencedProject) {
+                return undefined;
+            }
+            var out = referencedProject.commandLine.options.outFile || referencedProject.commandLine.options.out;
+            return out ?
+                ts.changeExtension(out, ".d.ts" /* Dts */) :
+                ts.getOutputDeclarationFileName(fileName, referencedProject.commandLine);
+        }
+        /**
+         * Get the referenced project if the file is input file from that reference project
+         */
+        function getResolvedProjectReferenceToRedirect(fileName) {
+            if (mapFromFileToProjectReferenceRedirects === undefined) {
+                mapFromFileToProjectReferenceRedirects = ts.createMap();
+                forEachResolvedProjectReference(function (referencedProject, referenceProjectPath) {
+                    // not input file from the referenced project, ignore
+                    if (referencedProject &&
+                        toPath(options.configFilePath) !== referenceProjectPath) {
+                        referencedProject.commandLine.fileNames.forEach(function (f) {
+                            return mapFromFileToProjectReferenceRedirects.set(toPath(f), referenceProjectPath);
+                        });
+                    }
+                });
+            }
+            var referencedProjectPath = mapFromFileToProjectReferenceRedirects.get(toPath(fileName));
+            return referencedProjectPath && getResolvedProjectReferenceByPath(referencedProjectPath);
+        }
+        function forEachResolvedProjectReference(cb) {
+            return forEachProjectReference(projectReferences, resolvedProjectReferences, function (resolvedRef, index, parent) {
+                var ref = (parent ? parent.commandLine.projectReferences : projectReferences)[index];
+                var resolvedRefPath = toPath(resolveProjectReferencePath(ref));
+                return cb(resolvedRef, resolvedRefPath);
+            });
+        }
+        function forEachProjectReference(projectReferences, resolvedProjectReferences, cbResolvedRef, cbRef) {
+            var seenResolvedRefs;
+            return worker(projectReferences, resolvedProjectReferences, /*parent*/ undefined, cbResolvedRef, cbRef);
+            function worker(projectReferences, resolvedProjectReferences, parent, cbResolvedRef, cbRef) {
+                // Visit project references first
+                if (cbRef) {
+                    var result = cbRef(projectReferences, parent);
+                    if (result) {
+                        return result;
+                    }
+                }
+                return ts.forEach(resolvedProjectReferences, function (resolvedRef, index) {
+                    if (ts.contains(seenResolvedRefs, resolvedRef)) {
+                        // ignore recursives
+                        return undefined;
+                    }
+                    var result = cbResolvedRef(resolvedRef, index, parent);
+                    if (result) {
+                        return result;
+                    }
+                    if (!resolvedRef)
+                        return undefined;
+                    (seenResolvedRefs || (seenResolvedRefs = [])).push(resolvedRef);
+                    return worker(resolvedRef.commandLine.projectReferences, resolvedRef.references, resolvedRef, cbResolvedRef, cbRef);
+                });
+            }
+        }
+        function getResolvedProjectReferenceByPath(projectReferencePath) {
+            if (!projectReferenceRedirects) {
+                return undefined;
+            }
+            return projectReferenceRedirects.get(projectReferencePath) || undefined;
+        }
+        function processReferencedFiles(file, isDefaultLib) {
+            ts.forEach(file.referencedFiles, function (ref) {
+                var referencedFileName = resolveTripleslashReference(ref.fileName, file.originalFileName);
+                processSourceFile(referencedFileName, isDefaultLib, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined, file, ref.pos, ref.end);
+            });
+        }
+        function processTypeReferenceDirectives(file) {
+            // We lower-case all type references because npm automatically lowercases all packages. See GH#9824.
+            var typeDirectives = ts.map(file.typeReferenceDirectives, function (ref) { return ref.fileName.toLocaleLowerCase(); });
+            if (!typeDirectives) {
+                return;
+            }
+            var resolutions = resolveTypeReferenceDirectiveNamesWorker(typeDirectives, file.originalFileName, getResolvedProjectReferenceToRedirect(file.originalFileName));
+            for (var i = 0; i < typeDirectives.length; i++) {
+                var ref = file.typeReferenceDirectives[i];
+                var resolvedTypeReferenceDirective = resolutions[i];
+                // store resolved type directive on the file
+                var fileName = ref.fileName.toLocaleLowerCase();
+                ts.setResolvedTypeReferenceDirective(file, fileName, resolvedTypeReferenceDirective);
+                processTypeReferenceDirective(fileName, resolvedTypeReferenceDirective, file, ref.pos, ref.end);
+            }
+        }
+        function processTypeReferenceDirective(typeReferenceDirective, resolvedTypeReferenceDirective, refFile, refPos, refEnd) {
+            // If we already found this library as a primary reference - nothing to do
+            var previousResolution = resolvedTypeReferenceDirectives.get(typeReferenceDirective);
+            if (previousResolution && previousResolution.primary) {
+                return;
+            }
+            var saveResolution = true;
+            if (resolvedTypeReferenceDirective) {
+                if (resolvedTypeReferenceDirective.isExternalLibraryImport)
+                    currentNodeModulesDepth++;
+                if (resolvedTypeReferenceDirective.primary) {
+                    // resolved from the primary path
+                    processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, resolvedTypeReferenceDirective.packageId, refFile, refPos, refEnd); // TODO: GH#18217
+                }
+                else {
+                    // If we already resolved to this file, it must have been a secondary reference. Check file contents
+                    // for sameness and possibly issue an error
+                    if (previousResolution) {
+                        // Don't bother reading the file again if it's the same file.
+                        if (resolvedTypeReferenceDirective.resolvedFileName !== previousResolution.resolvedFileName) {
+                            var otherFileText = host.readFile(resolvedTypeReferenceDirective.resolvedFileName);
+                            if (otherFileText !== getSourceFile(previousResolution.resolvedFileName).text) {
+                                fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd, // TODO: GH#18217
+                                ts.Diagnostics.Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict, typeReferenceDirective, resolvedTypeReferenceDirective.resolvedFileName, previousResolution.resolvedFileName));
+                            }
+                        }
+                        // don't overwrite previous resolution result
+                        saveResolution = false;
+                    }
+                    else {
+                        // First resolution of this library
+                        processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, resolvedTypeReferenceDirective.packageId, refFile, refPos, refEnd);
+                    }
+                }
+                if (resolvedTypeReferenceDirective.isExternalLibraryImport)
+                    currentNodeModulesDepth--;
+            }
+            else {
+                fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd, ts.Diagnostics.Cannot_find_type_definition_file_for_0, typeReferenceDirective)); // TODO: GH#18217
+            }
+            if (saveResolution) {
+                resolvedTypeReferenceDirectives.set(typeReferenceDirective, resolvedTypeReferenceDirective);
+            }
+        }
+        function processLibReferenceDirectives(file) {
+            ts.forEach(file.libReferenceDirectives, function (libReference) {
+                var libName = libReference.fileName.toLocaleLowerCase();
+                var libFileName = ts.libMap.get(libName);
+                if (libFileName) {
+                    // we ignore any 'no-default-lib' reference set on this file.
+                    processRootFile(ts.combinePaths(defaultLibraryPath, libFileName), /*isDefaultLib*/ true, /*ignoreNoDefaultLib*/ true);
+                }
+                else {
+                    var unqualifiedLibName = ts.removeSuffix(ts.removePrefix(libName, "lib."), ".d.ts");
+                    var suggestion = ts.getSpellingSuggestion(unqualifiedLibName, ts.libs, ts.identity);
+                    var message = suggestion ? ts.Diagnostics.Cannot_find_lib_definition_for_0_Did_you_mean_1 : ts.Diagnostics.Cannot_find_lib_definition_for_0;
+                    fileProcessingDiagnostics.add(createDiagnostic(file, libReference.pos, libReference.end, message, libName, suggestion));
+                }
+            });
+        }
+        function createDiagnostic(refFile, refPos, refEnd, message) {
+            var args = [];
+            for (var _i = 4; _i < arguments.length; _i++) {
+                args[_i - 4] = arguments[_i];
+            }
+            if (refFile === undefined || refPos === undefined || refEnd === undefined) {
+                return ts.createCompilerDiagnostic.apply(void 0, [message].concat(args));
+            }
+            else {
+                return ts.createFileDiagnostic.apply(void 0, [refFile, refPos, refEnd - refPos, message].concat(args));
+            }
+        }
+        function getCanonicalFileName(fileName) {
+            return host.getCanonicalFileName(fileName);
+        }
+        function processImportedModules(file) {
+            collectExternalModuleReferences(file);
+            if (file.imports.length || file.moduleAugmentations.length) {
+                // Because global augmentation doesn't have string literal name, we can check for global augmentation as such.
+                var moduleNames = getModuleNames(file);
+                var resolutions = resolveModuleNamesReusingOldState(moduleNames, ts.getNormalizedAbsolutePath(file.originalFileName, currentDirectory), file);
+                ts.Debug.assert(resolutions.length === moduleNames.length);
+                for (var i = 0; i < moduleNames.length; i++) {
+                    var resolution = resolutions[i];
+                    ts.setResolvedModule(file, moduleNames[i], resolution);
+                    if (!resolution) {
+                        continue;
+                    }
+                    var isFromNodeModulesSearch = resolution.isExternalLibraryImport;
+                    var isJsFile = !ts.resolutionExtensionIsTSOrJson(resolution.extension);
+                    var isJsFileFromNodeModules = isFromNodeModulesSearch && isJsFile;
+                    var resolvedFileName = resolution.resolvedFileName;
+                    if (isFromNodeModulesSearch) {
+                        currentNodeModulesDepth++;
+                    }
+                    // add file to program only if:
+                    // - resolution was successful
+                    // - noResolve is falsy
+                    // - module name comes from the list of imports
+                    // - it's not a top level JavaScript module that exceeded the search max
+                    var elideImport = isJsFileFromNodeModules && currentNodeModulesDepth > maxNodeModuleJsDepth;
+                    // Don't add the file if it has a bad extension (e.g. 'tsx' if we don't have '--allowJs')
+                    // This may still end up being an untyped module -- the file won't be included but imports will be allowed.
+                    var shouldAddFile = resolvedFileName
+                        && !getResolutionDiagnostic(options, resolution)
+                        && !options.noResolve
+                        && i < file.imports.length
+                        && !elideImport
+                        && !(isJsFile && !options.allowJs)
+                        && (ts.isInJSFile(file.imports[i]) || !(file.imports[i].flags & 2097152 /* JSDoc */));
+                    if (elideImport) {
+                        modulesWithElidedImports.set(file.path, true);
+                    }
+                    else if (shouldAddFile) {
+                        var path = toPath(resolvedFileName);
+                        var pos = ts.skipTrivia(file.text, file.imports[i].pos);
+                        findSourceFile(resolvedFileName, path, /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, file, pos, file.imports[i].end, resolution.packageId);
+                    }
+                    if (isFromNodeModulesSearch) {
+                        currentNodeModulesDepth--;
+                    }
+                }
+            }
+            else {
+                // no imports - drop cached module resolutions
+                file.resolvedModules = undefined;
+            }
+        }
+        function computeCommonSourceDirectory(sourceFiles) {
+            var fileNames = ts.mapDefined(sourceFiles, function (file) { return file.isDeclarationFile ? undefined : file.fileName; });
+            return computeCommonSourceDirectoryOfFilenames(fileNames, currentDirectory, getCanonicalFileName);
+        }
+        function checkSourceFilesBelongToPath(sourceFiles, rootDirectory) {
+            var allFilesBelongToPath = true;
+            var absoluteRootDirectoryPath = host.getCanonicalFileName(ts.getNormalizedAbsolutePath(rootDirectory, currentDirectory));
+            for (var _i = 0, sourceFiles_2 = sourceFiles; _i < sourceFiles_2.length; _i++) {
+                var sourceFile = sourceFiles_2[_i];
+                if (!sourceFile.isDeclarationFile) {
+                    var absoluteSourceFilePath = host.getCanonicalFileName(ts.getNormalizedAbsolutePath(sourceFile.fileName, currentDirectory));
+                    if (absoluteSourceFilePath.indexOf(absoluteRootDirectoryPath) !== 0) {
+                        programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files, sourceFile.fileName, rootDirectory));
+                        allFilesBelongToPath = false;
+                    }
+                }
+            }
+            return allFilesBelongToPath;
+        }
+        function parseProjectReferenceConfigFile(ref) {
+            if (!projectReferenceRedirects) {
+                projectReferenceRedirects = ts.createMap();
+            }
+            // The actual filename (i.e. add "/tsconfig.json" if necessary)
+            var refPath = resolveProjectReferencePath(ref);
+            var sourceFilePath = toPath(refPath);
+            var fromCache = projectReferenceRedirects.get(sourceFilePath);
+            if (fromCache !== undefined) {
+                return fromCache || undefined;
+            }
+            // An absolute path pointing to the containing directory of the config file
+            var basePath = ts.getNormalizedAbsolutePath(ts.getDirectoryPath(refPath), host.getCurrentDirectory());
+            var sourceFile = host.getSourceFile(refPath, 100 /* JSON */);
+            addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined);
+            if (sourceFile === undefined) {
+                projectReferenceRedirects.set(sourceFilePath, false);
+                return undefined;
+            }
+            sourceFile.path = sourceFilePath;
+            sourceFile.resolvedPath = sourceFilePath;
+            sourceFile.originalFileName = refPath;
+            var commandLine = ts.parseJsonSourceFileConfigFileContent(sourceFile, configParsingHost, basePath, /*existingOptions*/ undefined, refPath);
+            var resolvedRef = { commandLine: commandLine, sourceFile: sourceFile };
+            projectReferenceRedirects.set(sourceFilePath, resolvedRef);
+            if (commandLine.projectReferences) {
+                resolvedRef.references = commandLine.projectReferences.map(parseProjectReferenceConfigFile);
+            }
+            return resolvedRef;
+        }
+        function verifyCompilerOptions() {
+            if (options.strictPropertyInitialization && !ts.getStrictOptionValue(options, "strictNullChecks")) {
+                createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "strictPropertyInitialization", "strictNullChecks");
+            }
+            if (options.isolatedModules) {
+                if (ts.getEmitDeclarations(options)) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, getEmitDeclarationOptionName(options), "isolatedModules");
+                }
+                if (options.noEmitOnError) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmitOnError", "isolatedModules");
+                }
+                if (options.out) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "out", "isolatedModules");
+                }
+                if (options.outFile) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "outFile", "isolatedModules");
+                }
+            }
+            if (options.inlineSourceMap) {
+                if (options.sourceMap) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "sourceMap", "inlineSourceMap");
+                }
+                if (options.mapRoot) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "mapRoot", "inlineSourceMap");
+                }
+            }
+            if (options.paths && options.baseUrl === undefined) {
+                createDiagnosticForOptionName(ts.Diagnostics.Option_paths_cannot_be_used_without_specifying_baseUrl_option, "paths");
+            }
+            if (options.composite) {
+                if (options.declaration === false) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Composite_projects_may_not_disable_declaration_emit, "declaration");
+                }
+            }
+            verifyProjectReferences();
+            // List of collected files is complete; validate exhautiveness if this is a project with a file list
+            if (options.composite) {
+                var sourceFiles = files.filter(function (f) { return !f.isDeclarationFile; });
+                if (rootNames.length < sourceFiles.length) {
+                    var normalizedRootNames = rootNames.map(function (r) { return ts.normalizePath(r).toLowerCase(); });
+                    for (var _i = 0, _a = sourceFiles.map(function (f) { return ts.normalizePath(f.path).toLowerCase(); }); _i < _a.length; _i++) {
+                        var file = _a[_i];
+                        if (normalizedRootNames.indexOf(file) === -1) {
+                            programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern, file));
+                        }
+                    }
+                }
+            }
+            if (options.paths) {
+                for (var key in options.paths) {
+                    if (!ts.hasProperty(options.paths, key)) {
+                        continue;
+                    }
+                    if (!ts.hasZeroOrOneAsteriskCharacter(key)) {
+                        createDiagnosticForOptionPaths(/*onKey*/ true, key, ts.Diagnostics.Pattern_0_can_have_at_most_one_Asterisk_character, key);
+                    }
+                    if (ts.isArray(options.paths[key])) {
+                        var len = options.paths[key].length;
+                        if (len === 0) {
+                            createDiagnosticForOptionPaths(/*onKey*/ false, key, ts.Diagnostics.Substitutions_for_pattern_0_shouldn_t_be_an_empty_array, key);
+                        }
+                        for (var i = 0; i < len; i++) {
+                            var subst = options.paths[key][i];
+                            var typeOfSubst = typeof subst;
+                            if (typeOfSubst === "string") {
+                                if (!ts.hasZeroOrOneAsteriskCharacter(subst)) {
+                                    createDiagnosticForOptionPathKeyValue(key, i, ts.Diagnostics.Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character, subst, key);
+                                }
+                            }
+                            else {
+                                createDiagnosticForOptionPathKeyValue(key, i, ts.Diagnostics.Substitution_0_for_pattern_1_has_incorrect_type_expected_string_got_2, subst, key, typeOfSubst);
+                            }
+                        }
+                    }
+                    else {
+                        createDiagnosticForOptionPaths(/*onKey*/ false, key, ts.Diagnostics.Substitutions_for_pattern_0_should_be_an_array, key);
+                    }
+                }
+            }
+            if (!options.sourceMap && !options.inlineSourceMap) {
+                if (options.inlineSources) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided, "inlineSources");
+                }
+                if (options.sourceRoot) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided, "sourceRoot");
+                }
+            }
+            if (options.out && options.outFile) {
+                createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "out", "outFile");
+            }
+            if (options.mapRoot && !(options.sourceMap || options.declarationMap)) {
+                // Error to specify --mapRoot without --sourcemap
+                createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1_or_option_2, "mapRoot", "sourceMap", "declarationMap");
+            }
+            if (options.declarationDir) {
+                if (!ts.getEmitDeclarations(options)) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1_or_option_2, "declarationDir", "declaration", "composite");
+                }
+                if (options.out || options.outFile) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "declarationDir", options.out ? "out" : "outFile");
+                }
+            }
+            if (options.declarationMap && !ts.getEmitDeclarations(options)) {
+                createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1_or_option_2, "declarationMap", "declaration", "composite");
+            }
+            if (options.lib && options.noLib) {
+                createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "lib", "noLib");
+            }
+            if (options.noImplicitUseStrict && ts.getStrictOptionValue(options, "alwaysStrict")) {
+                createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noImplicitUseStrict", "alwaysStrict");
+            }
+            var languageVersion = options.target || 0 /* ES3 */;
+            var outFile = options.outFile || options.out;
+            var firstNonAmbientExternalModuleSourceFile = ts.find(files, function (f) { return ts.isExternalModule(f) && !f.isDeclarationFile; });
+            if (options.isolatedModules) {
+                if (options.module === ts.ModuleKind.None && languageVersion < 2 /* ES2015 */) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher, "isolatedModules", "target");
+                }
+                var firstNonExternalModuleSourceFile = ts.find(files, function (f) { return !ts.isExternalModule(f) && !f.isDeclarationFile && f.scriptKind !== 6 /* JSON */; });
+                if (firstNonExternalModuleSourceFile) {
+                    var span = ts.getErrorSpanForNode(firstNonExternalModuleSourceFile, firstNonExternalModuleSourceFile);
+                    programDiagnostics.add(ts.createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided));
+                }
+            }
+            else if (firstNonAmbientExternalModuleSourceFile && languageVersion < 2 /* ES2015 */ && options.module === ts.ModuleKind.None) {
+                // We cannot use createDiagnosticFromNode because nodes do not have parents yet
+                var span = ts.getErrorSpanForNode(firstNonAmbientExternalModuleSourceFile, firstNonAmbientExternalModuleSourceFile.externalModuleIndicator);
+                programDiagnostics.add(ts.createFileDiagnostic(firstNonAmbientExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_use_imports_exports_or_module_augmentations_when_module_is_none));
+            }
+            // Cannot specify module gen that isn't amd or system with --out
+            if (outFile && !options.emitDeclarationOnly) {
+                if (options.module && !(options.module === ts.ModuleKind.AMD || options.module === ts.ModuleKind.System)) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Only_amd_and_system_modules_are_supported_alongside_0, options.out ? "out" : "outFile", "module");
+                }
+                else if (options.module === undefined && firstNonAmbientExternalModuleSourceFile) {
+                    var span = ts.getErrorSpanForNode(firstNonAmbientExternalModuleSourceFile, firstNonAmbientExternalModuleSourceFile.externalModuleIndicator);
+                    programDiagnostics.add(ts.createFileDiagnostic(firstNonAmbientExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_modules_using_option_0_unless_the_module_flag_is_amd_or_system, options.out ? "out" : "outFile"));
+                }
+            }
+            if (options.resolveJsonModule) {
+                if (ts.getEmitModuleResolutionKind(options) !== ts.ModuleResolutionKind.NodeJs) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Option_resolveJsonModule_cannot_be_specified_without_node_module_resolution_strategy, "resolveJsonModule");
+                }
+                // Any emit other than common js, amd, es2015 or esnext is error
+                else if (!ts.hasJsonModuleEmitEnabled(options)) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Option_resolveJsonModule_can_only_be_specified_when_module_code_generation_is_commonjs_amd_es2015_or_esNext, "resolveJsonModule", "module");
+                }
+            }
+            // there has to be common source directory if user specified --outdir || --sourceRoot
+            // if user specified --mapRoot, there needs to be common source directory if there would be multiple files being emitted
+            if (options.outDir || // there is --outDir specified
+                options.sourceRoot || // there is --sourceRoot specified
+                options.mapRoot) { // there is --mapRoot specified
+                // Precalculate and cache the common source directory
+                var dir = getCommonSourceDirectory();
+                // If we failed to find a good common directory, but outDir is specified and at least one of our files is on a windows drive/URL/other resource, add a failure
+                if (options.outDir && dir === "" && files.some(function (file) { return ts.getRootLength(file.fileName) > 1; })) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Cannot_find_the_common_subdirectory_path_for_the_input_files, "outDir");
+                }
+            }
+            if (!options.noEmit && options.allowJs && ts.getEmitDeclarations(options)) {
+                createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "allowJs", getEmitDeclarationOptionName(options));
+            }
+            if (options.checkJs && !options.allowJs) {
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "checkJs", "allowJs"));
+            }
+            if (options.emitDeclarationOnly) {
+                if (!ts.getEmitDeclarations(options)) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1_or_option_2, "emitDeclarationOnly", "declaration", "composite");
+                }
+                if (options.noEmit) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "emitDeclarationOnly", "noEmit");
+                }
+            }
+            if (options.emitDecoratorMetadata &&
+                !options.experimentalDecorators) {
+                createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "emitDecoratorMetadata", "experimentalDecorators");
+            }
+            if (options.jsxFactory) {
+                if (options.reactNamespace) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "reactNamespace", "jsxFactory");
+                }
+                if (!ts.parseIsolatedEntityName(options.jsxFactory, languageVersion)) {
+                    createOptionValueDiagnostic("jsxFactory", ts.Diagnostics.Invalid_value_for_jsxFactory_0_is_not_a_valid_identifier_or_qualified_name, options.jsxFactory);
+                }
+            }
+            else if (options.reactNamespace && !ts.isIdentifierText(options.reactNamespace, languageVersion)) {
+                createOptionValueDiagnostic("reactNamespace", ts.Diagnostics.Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier, options.reactNamespace);
+            }
+            // If the emit is enabled make sure that every output file is unique and not overwriting any of the input files
+            if (!options.noEmit && !options.suppressOutputPathCheck) {
+                var emitHost = getEmitHost();
+                var emitFilesSeen_1 = ts.createMap();
+                ts.forEachEmittedFile(emitHost, function (emitFileNames) {
+                    if (!options.emitDeclarationOnly) {
+                        verifyEmitFilePath(emitFileNames.jsFilePath, emitFilesSeen_1);
+                    }
+                    verifyEmitFilePath(emitFileNames.declarationFilePath, emitFilesSeen_1);
+                });
+            }
+            // Verify that all the emit files are unique and don't overwrite input files
+            function verifyEmitFilePath(emitFileName, emitFilesSeen) {
+                if (emitFileName) {
+                    var emitFilePath = toPath(emitFileName);
+                    // Report error if the output overwrites input file
+                    if (filesByName.has(emitFilePath)) {
+                        var chain_2;
+                        if (!options.configFilePath) {
+                            // The program is from either an inferred project or an external project
+                            chain_2 = ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
+                        }
+                        chain_2 = ts.chainDiagnosticMessages(chain_2, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
+                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnosticFromMessageChain(chain_2));
+                    }
+                    var emitFileKey = !host.useCaseSensitiveFileNames() ? emitFilePath.toLocaleLowerCase() : emitFilePath;
+                    // Report error if multiple files write into same file
+                    if (emitFilesSeen.has(emitFileKey)) {
+                        // Already seen the same emit file - report error
+                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files, emitFileName));
+                    }
+                    else {
+                        emitFilesSeen.set(emitFileKey, true);
+                    }
+                }
+            }
+        }
+        function verifyProjectReferences() {
+            forEachProjectReference(projectReferences, resolvedProjectReferences, function (resolvedRef, index, parent) {
+                var ref = (parent ? parent.commandLine.projectReferences : projectReferences)[index];
+                var parentFile = parent && parent.sourceFile;
+                if (!resolvedRef) {
+                    createDiagnosticForReference(parentFile, index, ts.Diagnostics.File_0_not_found, ref.path);
+                    return;
+                }
+                var options = resolvedRef.commandLine.options;
+                if (!options.composite) {
+                    // ok to not have composite if the current program is container only
+                    var inputs = parent ? parent.commandLine.fileNames : rootNames;
+                    if (inputs.length) {
+                        createDiagnosticForReference(parentFile, index, ts.Diagnostics.Referenced_project_0_must_have_setting_composite_Colon_true, ref.path);
+                    }
+                }
+                if (ref.prepend) {
+                    var out = options.outFile || options.out;
+                    if (out) {
+                        if (!host.fileExists(out)) {
+                            createDiagnosticForReference(parentFile, index, ts.Diagnostics.Output_file_0_from_project_1_does_not_exist, out, ref.path);
+                        }
+                    }
+                    else {
+                        createDiagnosticForReference(parentFile, index, ts.Diagnostics.Cannot_prepend_project_0_because_it_does_not_have_outFile_set, ref.path);
+                    }
+                }
+            });
+        }
+        function createDiagnosticForOptionPathKeyValue(key, valueIndex, message, arg0, arg1, arg2) {
+            var needCompilerDiagnostic = true;
+            var pathsSyntax = getOptionPathsSyntax();
+            for (var _i = 0, pathsSyntax_1 = pathsSyntax; _i < pathsSyntax_1.length; _i++) {
+                var pathProp = pathsSyntax_1[_i];
+                if (ts.isObjectLiteralExpression(pathProp.initializer)) {
+                    for (var _a = 0, _b = ts.getPropertyAssignment(pathProp.initializer, key); _a < _b.length; _a++) {
+                        var keyProps = _b[_a];
+                        var initializer = keyProps.initializer;
+                        if (ts.isArrayLiteralExpression(initializer) && initializer.elements.length > valueIndex) {
+                            programDiagnostics.add(ts.createDiagnosticForNodeInSourceFile(options.configFile, initializer.elements[valueIndex], message, arg0, arg1, arg2));
+                            needCompilerDiagnostic = false;
+                        }
+                    }
+                }
+            }
+            if (needCompilerDiagnostic) {
+                programDiagnostics.add(ts.createCompilerDiagnostic(message, arg0, arg1, arg2));
+            }
+        }
+        function createDiagnosticForOptionPaths(onKey, key, message, arg0) {
+            var needCompilerDiagnostic = true;
+            var pathsSyntax = getOptionPathsSyntax();
+            for (var _i = 0, pathsSyntax_2 = pathsSyntax; _i < pathsSyntax_2.length; _i++) {
+                var pathProp = pathsSyntax_2[_i];
+                if (ts.isObjectLiteralExpression(pathProp.initializer) &&
+                    createOptionDiagnosticInObjectLiteralSyntax(pathProp.initializer, onKey, key, /*key2*/ undefined, message, arg0)) {
+                    needCompilerDiagnostic = false;
+                }
+            }
+            if (needCompilerDiagnostic) {
+                programDiagnostics.add(ts.createCompilerDiagnostic(message, arg0));
+            }
+        }
+        function getOptionsSyntaxByName(name) {
+            var compilerOptionsObjectLiteralSyntax = getCompilerOptionsObjectLiteralSyntax();
+            if (compilerOptionsObjectLiteralSyntax) {
+                return ts.getPropertyAssignment(compilerOptionsObjectLiteralSyntax, name);
+            }
+            return undefined;
+        }
+        function getOptionPathsSyntax() {
+            return getOptionsSyntaxByName("paths") || ts.emptyArray;
+        }
+        function createDiagnosticForOptionName(message, option1, option2, option3) {
+            createDiagnosticForOption(/*onKey*/ true, option1, option2, message, option1, option2, option3);
+        }
+        function createOptionValueDiagnostic(option1, message, arg0) {
+            createDiagnosticForOption(/*onKey*/ false, option1, /*option2*/ undefined, message, arg0);
+        }
+        function createDiagnosticForReference(sourceFile, index, message, arg0, arg1) {
+            var referencesSyntax = ts.firstDefined(ts.getTsConfigPropArray(sourceFile || options.configFile, "references"), function (property) { return ts.isArrayLiteralExpression(property.initializer) ? property.initializer : undefined; });
+            if (referencesSyntax && referencesSyntax.elements.length > index) {
+                programDiagnostics.add(ts.createDiagnosticForNodeInSourceFile(sourceFile || options.configFile, referencesSyntax.elements[index], message, arg0, arg1));
+            }
+            else {
+                programDiagnostics.add(ts.createCompilerDiagnostic(message, arg0, arg1));
+            }
+        }
+        function createDiagnosticForOption(onKey, option1, option2, message, arg0, arg1, arg2) {
+            var compilerOptionsObjectLiteralSyntax = getCompilerOptionsObjectLiteralSyntax();
+            var needCompilerDiagnostic = !compilerOptionsObjectLiteralSyntax ||
+                !createOptionDiagnosticInObjectLiteralSyntax(compilerOptionsObjectLiteralSyntax, onKey, option1, option2, message, arg0, arg1, arg2);
+            if (needCompilerDiagnostic) {
+                programDiagnostics.add(ts.createCompilerDiagnostic(message, arg0, arg1, arg2));
+            }
+        }
+        function getCompilerOptionsObjectLiteralSyntax() {
+            if (_compilerOptionsObjectLiteralSyntax === undefined) {
+                _compilerOptionsObjectLiteralSyntax = null; // tslint:disable-line:no-null-keyword
+                var jsonObjectLiteral = ts.getTsConfigObjectLiteralExpression(options.configFile);
+                if (jsonObjectLiteral) {
+                    for (var _i = 0, _a = ts.getPropertyAssignment(jsonObjectLiteral, "compilerOptions"); _i < _a.length; _i++) {
+                        var prop = _a[_i];
+                        if (ts.isObjectLiteralExpression(prop.initializer)) {
+                            _compilerOptionsObjectLiteralSyntax = prop.initializer;
+                            break;
+                        }
+                    }
+                }
+            }
+            return _compilerOptionsObjectLiteralSyntax;
+        }
+        function createOptionDiagnosticInObjectLiteralSyntax(objectLiteral, onKey, key1, key2, message, arg0, arg1, arg2) {
+            var props = ts.getPropertyAssignment(objectLiteral, key1, key2);
+            for (var _i = 0, props_2 = props; _i < props_2.length; _i++) {
+                var prop = props_2[_i];
+                programDiagnostics.add(ts.createDiagnosticForNodeInSourceFile(options.configFile, onKey ? prop.name : prop.initializer, message, arg0, arg1, arg2));
+            }
+            return !!props.length;
+        }
+        function blockEmittingOfFile(emitFileName, diag) {
+            hasEmitBlockingDiagnostics.set(toPath(emitFileName), true);
+            programDiagnostics.add(diag);
+        }
+        function isEmittedFile(file) {
+            if (options.noEmit) {
+                return false;
+            }
+            // If this is source file, its not emitted file
+            var filePath = toPath(file);
+            if (getSourceFileByPath(filePath)) {
+                return false;
+            }
+            // If options have --outFile or --out just check that
+            var out = options.outFile || options.out;
+            if (out) {
+                return isSameFile(filePath, out) || isSameFile(filePath, ts.removeFileExtension(out) + ".d.ts" /* Dts */);
+            }
+            // If declarationDir is specified, return if its a file in that directory
+            if (options.declarationDir && ts.containsPath(options.declarationDir, filePath, currentDirectory, !host.useCaseSensitiveFileNames())) {
+                return true;
+            }
+            // If --outDir, check if file is in that directory
+            if (options.outDir) {
+                return ts.containsPath(options.outDir, filePath, currentDirectory, !host.useCaseSensitiveFileNames());
+            }
+            if (ts.fileExtensionIsOneOf(filePath, ts.supportedJSExtensions) || ts.fileExtensionIs(filePath, ".d.ts" /* Dts */)) {
+                // Otherwise just check if sourceFile with the name exists
+                var filePathWithoutExtension = ts.removeFileExtension(filePath);
+                return !!getSourceFileByPath((filePathWithoutExtension + ".ts" /* Ts */)) ||
+                    !!getSourceFileByPath((filePathWithoutExtension + ".tsx" /* Tsx */));
+            }
+            return false;
+        }
+        function isSameFile(file1, file2) {
+            return ts.comparePaths(file1, file2, currentDirectory, !host.useCaseSensitiveFileNames()) === 0 /* EqualTo */;
+        }
+    }
+    ts.createProgram = createProgram;
+    /* @internal */
+    function parseConfigHostFromCompilerHostLike(host, directoryStructureHost) {
+        if (directoryStructureHost === void 0) { directoryStructureHost = host; }
+        return {
+            fileExists: function (f) { return directoryStructureHost.fileExists(f); },
+            readDirectory: function (root, extensions, excludes, includes, depth) {
+                ts.Debug.assertDefined(directoryStructureHost.readDirectory, "'CompilerHost.readDirectory' must be implemented to correctly process 'projectReferences'");
+                return directoryStructureHost.readDirectory(root, extensions, excludes, includes, depth);
+            },
+            readFile: function (f) { return directoryStructureHost.readFile(f); },
+            useCaseSensitiveFileNames: host.useCaseSensitiveFileNames(),
+            getCurrentDirectory: function () { return host.getCurrentDirectory(); },
+            onUnRecoverableConfigFileDiagnostic: host.onUnRecoverableConfigFileDiagnostic || (function () { return undefined; }),
+            trace: host.trace ? function (s) { return host.trace(s); } : undefined
+        };
+    }
+    ts.parseConfigHostFromCompilerHostLike = parseConfigHostFromCompilerHostLike;
+    function resolveProjectReferencePath(hostOrRef, ref) {
+        var passedInRef = ref ? ref : hostOrRef;
+        return ts.resolveConfigFileProjectName(passedInRef.path);
+    }
+    ts.resolveProjectReferencePath = resolveProjectReferencePath;
+    function getEmitDeclarationOptionName(options) {
+        return options.declaration ? "declaration" : "composite";
+    }
+    /* @internal */
+    /**
+     * Returns a DiagnosticMessage if we won't include a resolved module due to its extension.
+     * The DiagnosticMessage's parameters are the imported module name, and the filename it resolved to.
+     * This returns a diagnostic even if the module will be an untyped module.
+     */
+    function getResolutionDiagnostic(options, _a) {
+        var extension = _a.extension;
+        switch (extension) {
+            case ".ts" /* Ts */:
+            case ".d.ts" /* Dts */:
+                // These are always allowed.
+                return undefined;
+            case ".tsx" /* Tsx */:
+                return needJsx();
+            case ".jsx" /* Jsx */:
+                return needJsx() || needAllowJs();
+            case ".js" /* Js */:
+                return needAllowJs();
+            case ".json" /* Json */:
+                return needResolveJsonModule();
+        }
+        function needJsx() {
+            return options.jsx ? undefined : ts.Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set;
+        }
+        function needAllowJs() {
+            return options.allowJs || !ts.getStrictOptionValue(options, "noImplicitAny") ? undefined : ts.Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type;
+        }
+        function needResolveJsonModule() {
+            return options.resolveJsonModule ? undefined : ts.Diagnostics.Module_0_was_resolved_to_1_but_resolveJsonModule_is_not_used;
+        }
+    }
+    ts.getResolutionDiagnostic = getResolutionDiagnostic;
+    function getModuleNames(_a) {
+        var imports = _a.imports, moduleAugmentations = _a.moduleAugmentations;
+        var res = imports.map(function (i) { return i.text; });
+        for (var _i = 0, moduleAugmentations_1 = moduleAugmentations; _i < moduleAugmentations_1.length; _i++) {
+            var aug = moduleAugmentations_1[_i];
+            if (aug.kind === 10 /* StringLiteral */) {
+                res.push(aug.text);
+            }
+            // Do nothing if it's an Identifier; we don't need to do module resolution for `declare global`.
+        }
+        return res;
+    }
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
+(function (ts) {
+    function getFileEmitOutput(program, sourceFile, emitOnlyDtsFiles, cancellationToken, customTransformers) {
+        var outputFiles = [];
+        var emitResult = program.emit(sourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers);
+        return { outputFiles: outputFiles, emitSkipped: emitResult.emitSkipped, exportedModulesFromDeclarationEmit: emitResult.exportedModulesFromDeclarationEmit };
+        function writeFile(fileName, text, writeByteOrderMark) {
+            outputFiles.push({ name: fileName, writeByteOrderMark: writeByteOrderMark, text: text });
+        }
+    }
+    ts.getFileEmitOutput = getFileEmitOutput;
+    function cloneMapOrUndefined(map) {
+        return map ? ts.cloneMap(map) : undefined;
+    }
+    ts.cloneMapOrUndefined = cloneMapOrUndefined;
+})(ts || (ts = {}));
+/*@internal*/
+(function (ts) {
+    var BuilderState;
+    (function (BuilderState) {
+        /**
+         * Get the referencedFile from the imported module symbol
+         */
+        function getReferencedFileFromImportedModuleSymbol(symbol) {
+            if (symbol.declarations && symbol.declarations[0]) {
+                var declarationSourceFile = ts.getSourceFileOfNode(symbol.declarations[0]);
+                return declarationSourceFile && declarationSourceFile.resolvedPath;
+            }
+        }
+        /**
+         * Get the referencedFile from the import name node from file
+         */
+        function getReferencedFileFromImportLiteral(checker, importName) {
+            var symbol = checker.getSymbolAtLocation(importName);
+            return symbol && getReferencedFileFromImportedModuleSymbol(symbol);
+        }
+        /**
+         * Gets the path to reference file from file name, it could be resolvedPath if present otherwise path
+         */
+        function getReferencedFileFromFileName(program, fileName, sourceFileDirectory, getCanonicalFileName) {
+            return ts.toPath(program.getProjectReferenceRedirect(fileName) || fileName, sourceFileDirectory, getCanonicalFileName);
+        }
+        /**
+         * Gets the referenced files for a file from the program with values for the keys as referenced file's path to be true
+         */
+        function getReferencedFiles(program, sourceFile, getCanonicalFileName) {
+            var referencedFiles;
+            // We need to use a set here since the code can contain the same import twice,
+            // but that will only be one dependency.
+            // To avoid invernal conversion, the key of the referencedFiles map must be of type Path
+            if (sourceFile.imports && sourceFile.imports.length > 0) {
+                var checker = program.getTypeChecker();
+                for (var _i = 0, _a = sourceFile.imports; _i < _a.length; _i++) {
+                    var importName = _a[_i];
+                    var declarationSourceFilePath = getReferencedFileFromImportLiteral(checker, importName);
+                    if (declarationSourceFilePath) {
+                        addReferencedFile(declarationSourceFilePath);
+                    }
+                }
+            }
+            var sourceFileDirectory = ts.getDirectoryPath(sourceFile.path);
+            // Handle triple slash references
+            if (sourceFile.referencedFiles && sourceFile.referencedFiles.length > 0) {
+                for (var _b = 0, _c = sourceFile.referencedFiles; _b < _c.length; _b++) {
+                    var referencedFile = _c[_b];
+                    var referencedPath = getReferencedFileFromFileName(program, referencedFile.fileName, sourceFileDirectory, getCanonicalFileName);
+                    addReferencedFile(referencedPath);
+                }
+            }
+            // Handle type reference directives
+            if (sourceFile.resolvedTypeReferenceDirectiveNames) {
+                sourceFile.resolvedTypeReferenceDirectiveNames.forEach(function (resolvedTypeReferenceDirective) {
+                    if (!resolvedTypeReferenceDirective) {
+                        return;
+                    }
+                    var fileName = resolvedTypeReferenceDirective.resolvedFileName; // TODO: GH#18217
+                    var typeFilePath = getReferencedFileFromFileName(program, fileName, sourceFileDirectory, getCanonicalFileName);
+                    addReferencedFile(typeFilePath);
+                });
+            }
+            // Add module augmentation as references
+            if (sourceFile.moduleAugmentations.length) {
+                var checker = program.getTypeChecker();
+                for (var _d = 0, _e = sourceFile.moduleAugmentations; _d < _e.length; _d++) {
+                    var moduleName = _e[_d];
+                    if (!ts.isStringLiteral(moduleName)) {
+                        continue;
+                    }
+                    var symbol = checker.getSymbolAtLocation(moduleName);
+                    if (!symbol) {
+                        continue;
+                    }
+                    // Add any file other than our own as reference
+                    addReferenceFromAmbientModule(symbol);
+                }
+            }
+            // From ambient modules
+            for (var _f = 0, _g = program.getTypeChecker().getAmbientModules(); _f < _g.length; _f++) {
+                var ambientModule = _g[_f];
+                if (ambientModule.declarations.length > 1) {
+                    addReferenceFromAmbientModule(ambientModule);
+                }
+            }
+            return referencedFiles;
+            function addReferenceFromAmbientModule(symbol) {
+                // Add any file other than our own as reference
+                for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                    var declaration = _a[_i];
+                    var declarationSourceFile = ts.getSourceFileOfNode(declaration);
+                    if (declarationSourceFile &&
+                        declarationSourceFile !== sourceFile) {
+                        addReferencedFile(declarationSourceFile.resolvedPath);
+                    }
+                }
+            }
+            function addReferencedFile(referencedPath) {
+                if (!referencedFiles) {
+                    referencedFiles = ts.createMap();
+                }
+                referencedFiles.set(referencedPath, true);
+            }
+        }
+        /**
+         * Returns true if oldState is reusable, that is the emitKind = module/non module has not changed
+         */
+        function canReuseOldState(newReferencedMap, oldState) {
+            return oldState && !oldState.referencedMap === !newReferencedMap;
+        }
+        BuilderState.canReuseOldState = canReuseOldState;
+        /**
+         * Creates the state of file references and signature for the new program from oldState if it is safe
+         */
+        function create(newProgram, getCanonicalFileName, oldState) {
+            var fileInfos = ts.createMap();
+            var referencedMap = newProgram.getCompilerOptions().module !== ts.ModuleKind.None ? ts.createMap() : undefined;
+            var exportedModulesMap = referencedMap ? ts.createMap() : undefined;
+            var hasCalledUpdateShapeSignature = ts.createMap();
+            var useOldState = canReuseOldState(referencedMap, oldState);
+            // Create the reference map, and set the file infos
+            for (var _i = 0, _a = newProgram.getSourceFiles(); _i < _a.length; _i++) {
+                var sourceFile = _a[_i];
+                var version_1 = sourceFile.version;
+                var oldInfo = useOldState ? oldState.fileInfos.get(sourceFile.path) : undefined;
+                if (referencedMap) {
+                    var newReferences = getReferencedFiles(newProgram, sourceFile, getCanonicalFileName);
+                    if (newReferences) {
+                        referencedMap.set(sourceFile.path, newReferences);
+                    }
+                    // Copy old visible to outside files map
+                    if (useOldState) {
+                        var exportedModules = oldState.exportedModulesMap.get(sourceFile.path);
+                        if (exportedModules) {
+                            exportedModulesMap.set(sourceFile.path, exportedModules);
+                        }
+                    }
+                }
+                fileInfos.set(sourceFile.path, { version: version_1, signature: oldInfo && oldInfo.signature });
+            }
+            return {
+                fileInfos: fileInfos,
+                referencedMap: referencedMap,
+                exportedModulesMap: exportedModulesMap,
+                hasCalledUpdateShapeSignature: hasCalledUpdateShapeSignature
+            };
+        }
+        BuilderState.create = create;
+        /**
+         * Releases needed properties
+         */
+        function releaseCache(state) {
+            state.allFilesExcludingDefaultLibraryFile = undefined;
+            state.allFileNames = undefined;
+        }
+        BuilderState.releaseCache = releaseCache;
+        /**
+         * Creates a clone of the state
+         */
+        function clone(state) {
+            var fileInfos = ts.createMap();
+            state.fileInfos.forEach(function (value, key) {
+                fileInfos.set(key, __assign({}, value));
+            });
+            // Dont need to backup allFiles info since its cache anyway
+            return {
+                fileInfos: fileInfos,
+                referencedMap: ts.cloneMapOrUndefined(state.referencedMap),
+                exportedModulesMap: ts.cloneMapOrUndefined(state.exportedModulesMap),
+                hasCalledUpdateShapeSignature: ts.cloneMap(state.hasCalledUpdateShapeSignature),
+            };
+        }
+        BuilderState.clone = clone;
+        /**
+         * Gets the files affected by the path from the program
+         */
+        function getFilesAffectedBy(state, programOfThisState, path, cancellationToken, computeHash, cacheToUpdateSignature, exportedModulesMapCache) {
+            // Since the operation could be cancelled, the signatures are always stored in the cache
+            // They will be commited once it is safe to use them
+            // eg when calling this api from tsserver, if there is no cancellation of the operation
+            // In the other cases the affected files signatures are commited only after the iteration through the result is complete
+            var signatureCache = cacheToUpdateSignature || ts.createMap();
+            var sourceFile = programOfThisState.getSourceFileByPath(path);
+            if (!sourceFile) {
+                return ts.emptyArray;
+            }
+            if (!updateShapeSignature(state, programOfThisState, sourceFile, signatureCache, cancellationToken, computeHash, exportedModulesMapCache)) {
+                return [sourceFile];
+            }
+            var result = (state.referencedMap ? getFilesAffectedByUpdatedShapeWhenModuleEmit : getFilesAffectedByUpdatedShapeWhenNonModuleEmit)(state, programOfThisState, sourceFile, signatureCache, cancellationToken, computeHash, exportedModulesMapCache);
+            if (!cacheToUpdateSignature) {
+                // Commit all the signatures in the signature cache
+                updateSignaturesFromCache(state, signatureCache);
+            }
+            return result;
+        }
+        BuilderState.getFilesAffectedBy = getFilesAffectedBy;
+        /**
+         * Updates the signatures from the cache into state's fileinfo signatures
+         * This should be called whenever it is safe to commit the state of the builder
+         */
+        function updateSignaturesFromCache(state, signatureCache) {
+            signatureCache.forEach(function (signature, path) {
+                state.fileInfos.get(path).signature = signature;
+                state.hasCalledUpdateShapeSignature.set(path, true);
+            });
+        }
+        BuilderState.updateSignaturesFromCache = updateSignaturesFromCache;
+        /**
+         * Returns if the shape of the signature has changed since last emit
+         */
+        function updateShapeSignature(state, programOfThisState, sourceFile, cacheToUpdateSignature, cancellationToken, computeHash, exportedModulesMapCache) {
+            ts.Debug.assert(!!sourceFile);
+            ts.Debug.assert(!exportedModulesMapCache || !!state.exportedModulesMap, "Compute visible to outside map only if visibleToOutsideReferencedMap present in the state");
+            // If we have cached the result for this file, that means hence forth we should assume file shape is uptodate
+            if (state.hasCalledUpdateShapeSignature.has(sourceFile.path) || cacheToUpdateSignature.has(sourceFile.path)) {
+                return false;
+            }
+            var info = state.fileInfos.get(sourceFile.path);
+            if (!info)
+                return ts.Debug.fail();
+            var prevSignature = info.signature;
+            var latestSignature;
+            if (sourceFile.isDeclarationFile) {
+                latestSignature = sourceFile.version;
+                if (exportedModulesMapCache && latestSignature !== prevSignature) {
+                    // All the references in this file are exported
+                    var references = state.referencedMap ? state.referencedMap.get(sourceFile.path) : undefined;
+                    exportedModulesMapCache.set(sourceFile.path, references || false);
+                }
+            }
+            else {
+                var emitOutput = ts.getFileEmitOutput(programOfThisState, sourceFile, /*emitOnlyDtsFiles*/ true, cancellationToken);
+                if (emitOutput.outputFiles && emitOutput.outputFiles.length > 0) {
+                    latestSignature = computeHash(emitOutput.outputFiles[0].text);
+                    if (exportedModulesMapCache && latestSignature !== prevSignature) {
+                        updateExportedModules(sourceFile, emitOutput.exportedModulesFromDeclarationEmit, exportedModulesMapCache);
+                    }
+                }
+                else {
+                    latestSignature = prevSignature; // TODO: GH#18217
+                }
+            }
+            cacheToUpdateSignature.set(sourceFile.path, latestSignature);
+            return !prevSignature || latestSignature !== prevSignature;
+        }
+        /**
+         * Coverts the declaration emit result into exported modules map
+         */
+        function updateExportedModules(sourceFile, exportedModulesFromDeclarationEmit, exportedModulesMapCache) {
+            if (!exportedModulesFromDeclarationEmit) {
+                exportedModulesMapCache.set(sourceFile.path, false);
+                return;
+            }
+            var exportedModules;
+            exportedModulesFromDeclarationEmit.forEach(function (symbol) { return addExportedModule(getReferencedFileFromImportedModuleSymbol(symbol)); });
+            exportedModulesMapCache.set(sourceFile.path, exportedModules || false);
+            function addExportedModule(exportedModulePath) {
+                if (exportedModulePath) {
+                    if (!exportedModules) {
+                        exportedModules = ts.createMap();
+                    }
+                    exportedModules.set(exportedModulePath, true);
+                }
+            }
+        }
+        /**
+         * Updates the exported modules from cache into state's exported modules map
+         * This should be called whenever it is safe to commit the state of the builder
+         */
+        function updateExportedFilesMapFromCache(state, exportedModulesMapCache) {
+            if (exportedModulesMapCache) {
+                ts.Debug.assert(!!state.exportedModulesMap);
+                exportedModulesMapCache.forEach(function (exportedModules, path) {
+                    if (exportedModules) {
+                        state.exportedModulesMap.set(path, exportedModules);
+                    }
+                    else {
+                        state.exportedModulesMap.delete(path);
+                    }
+                });
+            }
+        }
+        BuilderState.updateExportedFilesMapFromCache = updateExportedFilesMapFromCache;
+        /**
+         * Get all the dependencies of the sourceFile
+         */
+        function getAllDependencies(state, programOfThisState, sourceFile) {
+            var _a;
+            var compilerOptions = programOfThisState.getCompilerOptions();
+            // With --out or --outFile all outputs go into single file, all files depend on each other
+            if (compilerOptions.outFile || compilerOptions.out) {
+                return getAllFileNames(state, programOfThisState);
+            }
+            // If this is non module emit, or its a global file, it depends on all the source files
+            if (!state.referencedMap || isFileAffectingGlobalScope(sourceFile)) {
+                return getAllFileNames(state, programOfThisState);
+            }
+            // Get the references, traversing deep from the referenceMap
+            var seenMap = ts.createMap();
+            var queue = [sourceFile.path];
+            while (queue.length) {
+                var path = queue.pop();
+                if (!seenMap.has(path)) {
+                    seenMap.set(path, true);
+                    var references = state.referencedMap.get(path);
+                    if (references) {
+                        var iterator = references.keys();
+                        for (var _b = iterator.next(), value = _b.value, done = _b.done; !done; _a = iterator.next(), value = _a.value, done = _a.done, _a) {
+                            queue.push(value);
+                        }
+                    }
+                }
+            }
+            return ts.arrayFrom(ts.mapDefinedIterator(seenMap.keys(), function (path) {
+                var file = programOfThisState.getSourceFileByPath(path);
+                return file ? file.fileName : path;
+            }));
+        }
+        BuilderState.getAllDependencies = getAllDependencies;
+        /**
+         * Gets the names of all files from the program
+         */
+        function getAllFileNames(state, programOfThisState) {
+            if (!state.allFileNames) {
+                var sourceFiles = programOfThisState.getSourceFiles();
+                state.allFileNames = sourceFiles === ts.emptyArray ? ts.emptyArray : sourceFiles.map(function (file) { return file.fileName; });
+            }
+            return state.allFileNames;
+        }
+        /**
+         * Gets the files referenced by the the file path
+         */
+        function getReferencedByPaths(state, referencedFilePath) {
+            return ts.arrayFrom(ts.mapDefinedIterator(state.referencedMap.entries(), function (_a) {
+                var filePath = _a[0], referencesInFile = _a[1];
+                return referencesInFile.has(referencedFilePath) ? filePath : undefined;
+            }));
+        }
+        /**
+         * For script files that contains only ambient external modules, although they are not actually external module files,
+         * they can only be consumed via importing elements from them. Regular script files cannot consume them. Therefore,
+         * there are no point to rebuild all script files if these special files have changed. However, if any statement
+         * in the file is not ambient external module, we treat it as a regular script file.
+         */
+        function containsOnlyAmbientModules(sourceFile) {
+            for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
+                var statement = _a[_i];
+                if (!ts.isModuleWithStringLiteralName(statement)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+        /**
+         * Return true if file contains anything that augments to global scope we need to build them as if
+         * they are global files as well as module
+         */
+        function containsGlobalScopeAugmentation(sourceFile) {
+            return ts.some(sourceFile.moduleAugmentations, function (augmentation) { return ts.isGlobalScopeAugmentation(augmentation.parent); });
+        }
+        /**
+         * Return true if the file will invalidate all files because it affectes global scope
+         */
+        function isFileAffectingGlobalScope(sourceFile) {
+            return containsGlobalScopeAugmentation(sourceFile) ||
+                !ts.isExternalModule(sourceFile) && !containsOnlyAmbientModules(sourceFile);
+        }
+        /**
+         * Gets all files of the program excluding the default library file
+         */
+        function getAllFilesExcludingDefaultLibraryFile(state, programOfThisState, firstSourceFile) {
+            // Use cached result
+            if (state.allFilesExcludingDefaultLibraryFile) {
+                return state.allFilesExcludingDefaultLibraryFile;
+            }
+            var result;
+            addSourceFile(firstSourceFile);
+            for (var _i = 0, _a = programOfThisState.getSourceFiles(); _i < _a.length; _i++) {
+                var sourceFile = _a[_i];
+                if (sourceFile !== firstSourceFile) {
+                    addSourceFile(sourceFile);
+                }
+            }
+            state.allFilesExcludingDefaultLibraryFile = result || ts.emptyArray;
+            return state.allFilesExcludingDefaultLibraryFile;
+            function addSourceFile(sourceFile) {
+                if (!programOfThisState.isSourceFileDefaultLibrary(sourceFile)) {
+                    (result || (result = [])).push(sourceFile);
+                }
+            }
+        }
+        /**
+         * When program emits non modular code, gets the files affected by the sourceFile whose shape has changed
+         */
+        function getFilesAffectedByUpdatedShapeWhenNonModuleEmit(state, programOfThisState, sourceFileWithUpdatedShape) {
+            var compilerOptions = programOfThisState.getCompilerOptions();
+            // If `--out` or `--outFile` is specified, any new emit will result in re-emitting the entire project,
+            // so returning the file itself is good enough.
+            if (compilerOptions && (compilerOptions.out || compilerOptions.outFile)) {
+                return [sourceFileWithUpdatedShape];
+            }
+            return getAllFilesExcludingDefaultLibraryFile(state, programOfThisState, sourceFileWithUpdatedShape);
+        }
+        /**
+         * When program emits modular code, gets the files affected by the sourceFile whose shape has changed
+         */
+        function getFilesAffectedByUpdatedShapeWhenModuleEmit(state, programOfThisState, sourceFileWithUpdatedShape, cacheToUpdateSignature, cancellationToken, computeHash, exportedModulesMapCache) {
+            if (isFileAffectingGlobalScope(sourceFileWithUpdatedShape)) {
+                return getAllFilesExcludingDefaultLibraryFile(state, programOfThisState, sourceFileWithUpdatedShape);
+            }
+            var compilerOptions = programOfThisState.getCompilerOptions();
+            if (compilerOptions && (compilerOptions.isolatedModules || compilerOptions.out || compilerOptions.outFile)) {
+                return [sourceFileWithUpdatedShape];
+            }
+            // Now we need to if each file in the referencedBy list has a shape change as well.
+            // Because if so, its own referencedBy files need to be saved as well to make the
+            // emitting result consistent with files on disk.
+            var seenFileNamesMap = ts.createMap();
+            // Start with the paths this file was referenced by
+            seenFileNamesMap.set(sourceFileWithUpdatedShape.path, sourceFileWithUpdatedShape);
+            var queue = getReferencedByPaths(state, sourceFileWithUpdatedShape.resolvedPath);
+            while (queue.length > 0) {
+                var currentPath = queue.pop();
+                if (!seenFileNamesMap.has(currentPath)) {
+                    var currentSourceFile = programOfThisState.getSourceFileByPath(currentPath);
+                    seenFileNamesMap.set(currentPath, currentSourceFile);
+                    if (currentSourceFile && updateShapeSignature(state, programOfThisState, currentSourceFile, cacheToUpdateSignature, cancellationToken, computeHash, exportedModulesMapCache)) { // TODO: GH#18217
+                        queue.push.apply(// TODO: GH#18217
+                        queue, getReferencedByPaths(state, currentSourceFile.resolvedPath));
+                    }
+                }
+            }
+            // Return array of values that needs emit
+            // Return array of values that needs emit
+            return ts.arrayFrom(ts.mapDefinedIterator(seenFileNamesMap.values(), function (value) { return value; }));
+        }
+    })(BuilderState = ts.BuilderState || (ts.BuilderState = {}));
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
+(function (ts) {
+    function hasSameKeys(map1, map2) {
+        // Has same size and every key is present in both maps
+        return map1 === map2 || map1 !== undefined && map2 !== undefined && map1.size === map2.size && !ts.forEachKey(map1, function (key) { return !map2.has(key); });
+    }
+    /**
+     * Create the state so that we can iterate on changedFiles/affected files
+     */
+    function createBuilderProgramState(newProgram, getCanonicalFileName, oldState) {
+        var state = ts.BuilderState.create(newProgram, getCanonicalFileName, oldState);
+        state.program = newProgram;
+        var compilerOptions = newProgram.getCompilerOptions();
+        state.compilerOptions = compilerOptions;
+        // With --out or --outFile, any change affects all semantic diagnostics so no need to cache them
+        // With --isolatedModules, emitting changed file doesnt emit dependent files so we cant know of dependent files to retrieve errors so dont cache the errors
+        if (!compilerOptions.outFile && !compilerOptions.out && !compilerOptions.isolatedModules) {
+            state.semanticDiagnosticsPerFile = ts.createMap();
+        }
+        state.changedFilesSet = ts.createMap();
+        var useOldState = ts.BuilderState.canReuseOldState(state.referencedMap, oldState);
+        var oldCompilerOptions = useOldState ? oldState.compilerOptions : undefined;
+        var canCopySemanticDiagnostics = useOldState && oldState.semanticDiagnosticsPerFile && !!state.semanticDiagnosticsPerFile &&
+            !ts.compilerOptionsAffectSemanticDiagnostics(compilerOptions, oldCompilerOptions);
+        if (useOldState) {
+            // Verify the sanity of old state
+            if (!oldState.currentChangedFilePath) {
+                var affectedSignatures = oldState.currentAffectedFilesSignatures;
+                ts.Debug.assert(!oldState.affectedFiles && (!affectedSignatures || !affectedSignatures.size), "Cannot reuse if only few affected files of currentChangedFile were iterated");
+            }
+            if (canCopySemanticDiagnostics) {
+                ts.Debug.assert(!ts.forEachKey(oldState.changedFilesSet, function (path) { return oldState.semanticDiagnosticsPerFile.has(path); }), "Semantic diagnostics shouldnt be available for changed files");
+            }
+            // Copy old state's changed files set
+            ts.copyEntries(oldState.changedFilesSet, state.changedFilesSet);
+            if (!compilerOptions.outFile && !compilerOptions.out && oldState.affectedFilesPendingEmit) {
+                state.affectedFilesPendingEmit = oldState.affectedFilesPendingEmit;
+                state.affectedFilesPendingEmitIndex = oldState.affectedFilesPendingEmitIndex;
+            }
+        }
+        // Update changed files and copy semantic diagnostics if we can
+        var referencedMap = state.referencedMap;
+        var oldReferencedMap = useOldState ? oldState.referencedMap : undefined;
+        var copyDeclarationFileDiagnostics = canCopySemanticDiagnostics && !compilerOptions.skipLibCheck === !oldCompilerOptions.skipLibCheck;
+        var copyLibFileDiagnostics = copyDeclarationFileDiagnostics && !compilerOptions.skipDefaultLibCheck === !oldCompilerOptions.skipDefaultLibCheck;
+        state.fileInfos.forEach(function (info, sourceFilePath) {
+            var oldInfo;
+            var newReferences;
+            // if not using old state, every file is changed
+            if (!useOldState ||
+                // File wasnt present in old state
+                !(oldInfo = oldState.fileInfos.get(sourceFilePath)) ||
+                // versions dont match
+                oldInfo.version !== info.version ||
+                // Referenced files changed
+                !hasSameKeys(newReferences = referencedMap && referencedMap.get(sourceFilePath), oldReferencedMap && oldReferencedMap.get(sourceFilePath)) ||
+                // Referenced file was deleted in the new program
+                newReferences && ts.forEachKey(newReferences, function (path) { return !state.fileInfos.has(path) && oldState.fileInfos.has(path); })) {
+                // Register file as changed file and do not copy semantic diagnostics, since all changed files need to be re-evaluated
+                state.changedFilesSet.set(sourceFilePath, true);
+            }
+            else if (canCopySemanticDiagnostics) {
+                var sourceFile = newProgram.getSourceFileByPath(sourceFilePath);
+                if (sourceFile.isDeclarationFile && !copyDeclarationFileDiagnostics) {
+                    return;
+                }
+                if (sourceFile.hasNoDefaultLib && !copyLibFileDiagnostics) {
+                    return;
+                }
+                // Unchanged file copy diagnostics
+                var diagnostics = oldState.semanticDiagnosticsPerFile.get(sourceFilePath);
+                if (diagnostics) {
+                    state.semanticDiagnosticsPerFile.set(sourceFilePath, diagnostics);
+                    if (!state.semanticDiagnosticsFromOldState) {
+                        state.semanticDiagnosticsFromOldState = ts.createMap();
+                    }
+                    state.semanticDiagnosticsFromOldState.set(sourceFilePath, true);
+                }
+            }
+        });
+        return state;
+    }
+    /**
+     * Releases program and other related not needed properties
+     */
+    function releaseCache(state) {
+        ts.BuilderState.releaseCache(state);
+        state.program = undefined;
+    }
+    /**
+     * Creates a clone of the state
+     */
+    function cloneBuilderProgramState(state) {
+        var newState = ts.BuilderState.clone(state);
+        newState.semanticDiagnosticsPerFile = ts.cloneMapOrUndefined(state.semanticDiagnosticsPerFile);
+        newState.changedFilesSet = ts.cloneMap(state.changedFilesSet);
+        newState.affectedFiles = state.affectedFiles;
+        newState.affectedFilesIndex = state.affectedFilesIndex;
+        newState.currentChangedFilePath = state.currentChangedFilePath;
+        newState.currentAffectedFilesSignatures = ts.cloneMapOrUndefined(state.currentAffectedFilesSignatures);
+        newState.currentAffectedFilesExportedModulesMap = ts.cloneMapOrUndefined(state.currentAffectedFilesExportedModulesMap);
+        newState.seenAffectedFiles = ts.cloneMapOrUndefined(state.seenAffectedFiles);
+        newState.cleanedDiagnosticsOfLibFiles = state.cleanedDiagnosticsOfLibFiles;
+        newState.semanticDiagnosticsFromOldState = ts.cloneMapOrUndefined(state.semanticDiagnosticsFromOldState);
+        newState.program = state.program;
+        newState.compilerOptions = state.compilerOptions;
+        newState.affectedFilesPendingEmit = state.affectedFilesPendingEmit;
+        newState.affectedFilesPendingEmitIndex = state.affectedFilesPendingEmitIndex;
+        newState.seenEmittedFiles = ts.cloneMapOrUndefined(state.seenEmittedFiles);
+        newState.programEmitComplete = state.programEmitComplete;
+        return newState;
+    }
+    /**
+     * Verifies that source file is ok to be used in calls that arent handled by next
+     */
+    function assertSourceFileOkWithoutNextAffectedCall(state, sourceFile) {
+        ts.Debug.assert(!sourceFile || !state.affectedFiles || state.affectedFiles[state.affectedFilesIndex - 1] !== sourceFile || !state.semanticDiagnosticsPerFile.has(sourceFile.path));
+    }
+    /**
+     * This function returns the next affected file to be processed.
+     * Note that until doneAffected is called it would keep reporting same result
+     * This is to allow the callers to be able to actually remove affected file only when the operation is complete
+     * eg. if during diagnostics check cancellation token ends up cancelling the request, the affected file should be retained
+     */
+    function getNextAffectedFile(state, cancellationToken, computeHash) {
+        while (true) {
+            var affectedFiles = state.affectedFiles;
+            if (affectedFiles) {
+                var seenAffectedFiles = state.seenAffectedFiles;
+                var affectedFilesIndex = state.affectedFilesIndex; // TODO: GH#18217
+                while (affectedFilesIndex < affectedFiles.length) {
+                    var affectedFile = affectedFiles[affectedFilesIndex];
+                    if (!seenAffectedFiles.has(affectedFile.path)) {
+                        // Set the next affected file as seen and remove the cached semantic diagnostics
+                        state.affectedFilesIndex = affectedFilesIndex;
+                        cleanSemanticDiagnosticsOfAffectedFile(state, affectedFile);
+                        return affectedFile;
+                    }
+                    seenAffectedFiles.set(affectedFile.path, true);
+                    affectedFilesIndex++;
+                }
+                // Remove the changed file from the change set
+                state.changedFilesSet.delete(state.currentChangedFilePath);
+                state.currentChangedFilePath = undefined;
+                // Commit the changes in file signature
+                ts.BuilderState.updateSignaturesFromCache(state, state.currentAffectedFilesSignatures);
+                state.currentAffectedFilesSignatures.clear();
+                ts.BuilderState.updateExportedFilesMapFromCache(state, state.currentAffectedFilesExportedModulesMap);
+                state.affectedFiles = undefined;
+            }
+            // Get next changed file
+            var nextKey = state.changedFilesSet.keys().next();
+            if (nextKey.done) {
+                // Done
+                return undefined;
+            }
+            // With --out or --outFile all outputs go into single file
+            // so operations are performed directly on program, return program
+            var program = ts.Debug.assertDefined(state.program);
+            var compilerOptions = program.getCompilerOptions();
+            if (compilerOptions.outFile || compilerOptions.out) {
+                ts.Debug.assert(!state.semanticDiagnosticsPerFile);
+                return program;
+            }
+            // Get next batch of affected files
+            state.currentAffectedFilesSignatures = state.currentAffectedFilesSignatures || ts.createMap();
+            if (state.exportedModulesMap) {
+                state.currentAffectedFilesExportedModulesMap = state.currentAffectedFilesExportedModulesMap || ts.createMap();
+            }
+            state.affectedFiles = ts.BuilderState.getFilesAffectedBy(state, program, nextKey.value, cancellationToken, computeHash, state.currentAffectedFilesSignatures, state.currentAffectedFilesExportedModulesMap);
+            state.currentChangedFilePath = nextKey.value;
+            state.affectedFilesIndex = 0;
+            state.seenAffectedFiles = state.seenAffectedFiles || ts.createMap();
+        }
+    }
+    /**
+     * Returns next file to be emitted from files that retrieved semantic diagnostics but did not emit yet
+     */
+    function getNextAffectedFilePendingEmit(state) {
+        var affectedFilesPendingEmit = state.affectedFilesPendingEmit;
+        if (affectedFilesPendingEmit) {
+            var seenEmittedFiles = state.seenEmittedFiles || (state.seenEmittedFiles = ts.createMap());
+            for (var i = state.affectedFilesPendingEmitIndex; i < affectedFilesPendingEmit.length; i++) {
+                var affectedFile = ts.Debug.assertDefined(state.program).getSourceFileByPath(affectedFilesPendingEmit[i]);
+                if (affectedFile && !seenEmittedFiles.has(affectedFile.path)) {
+                    // emit this file
+                    state.affectedFilesPendingEmitIndex = i;
+                    return affectedFile;
+                }
+            }
+            state.affectedFilesPendingEmit = undefined;
+            state.affectedFilesPendingEmitIndex = undefined;
+        }
+        return undefined;
+    }
+    /**
+     * Remove the semantic diagnostics cached from old state for affected File and the files that are referencing modules that export entities from affected file
+     */
+    function cleanSemanticDiagnosticsOfAffectedFile(state, affectedFile) {
+        if (removeSemanticDiagnosticsOf(state, affectedFile.path)) {
+            // If there are no more diagnostics from old cache, done
+            return;
+        }
+        // Clean lib file diagnostics if its all files excluding default files to emit
+        if (state.allFilesExcludingDefaultLibraryFile === state.affectedFiles && !state.cleanedDiagnosticsOfLibFiles) {
+            state.cleanedDiagnosticsOfLibFiles = true;
+            var program_1 = ts.Debug.assertDefined(state.program);
+            var options_2 = program_1.getCompilerOptions();
+            if (ts.forEach(program_1.getSourceFiles(), function (f) {
+                return program_1.isSourceFileDefaultLibrary(f) &&
+                    !ts.skipTypeChecking(f, options_2) &&
+                    removeSemanticDiagnosticsOf(state, f.path);
+            })) {
+                return;
+            }
+        }
+        // If there was change in signature for the changed file,
+        // then delete the semantic diagnostics for files that are affected by using exports of this module
+        if (!state.exportedModulesMap || state.affectedFiles.length === 1 || !state.changedFilesSet.has(affectedFile.path)) {
+            return;
+        }
+        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
+        var seenFileAndExportsOfFile = ts.createMap();
+        // Go through exported modules from cache first
+        // If exported modules has path, all files referencing file exported from are affected
+        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
+            return exportedModules &&
+                exportedModules.has(affectedFile.path) &&
+                removeSemanticDiagnosticsOfFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile);
+        })) {
+            return;
+        }
+        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
+        ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
+            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) && // If we already iterated this through cache, ignore it
+                exportedModules.has(affectedFile.path) &&
+                removeSemanticDiagnosticsOfFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile);
+        });
+    }
+    /**
+     * removes the semantic diagnostics of files referencing referencedPath and
+     * returns true if there are no more semantic diagnostics from old state
+     */
+    function removeSemanticDiagnosticsOfFilesReferencingPath(state, referencedPath, seenFileAndExportsOfFile) {
+        return ts.forEachEntry(state.referencedMap, function (referencesInFile, filePath) {
+            return referencesInFile.has(referencedPath) && removeSemanticDiagnosticsOfFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile);
+        });
+    }
+    /**
+     * Removes semantic diagnostics of file and anything that exports this file
+     */
+    function removeSemanticDiagnosticsOfFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile) {
+        if (!ts.addToSeen(seenFileAndExportsOfFile, filePath)) {
+            return false;
+        }
+        if (removeSemanticDiagnosticsOf(state, filePath)) {
+            // If there are no more diagnostics from old cache, done
+            return true;
+        }
+        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
+        // Go through exported modules from cache first
+        // If exported modules has path, all files referencing file exported from are affected
+        if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
+            return exportedModules &&
+                exportedModules.has(filePath) &&
+                removeSemanticDiagnosticsOfFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile);
+        })) {
+            return true;
+        }
+        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
+        if (ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
+            return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) && // If we already iterated this through cache, ignore it
+                exportedModules.has(filePath) &&
+                removeSemanticDiagnosticsOfFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile);
+        })) {
+            return true;
+        }
+        // Remove diagnostics of files that import this file (without going to exports of referencing files)
+        return !!ts.forEachEntry(state.referencedMap, function (referencesInFile, referencingFilePath) {
+            return referencesInFile.has(filePath) &&
+                !seenFileAndExportsOfFile.has(referencingFilePath) && // Not already removed diagnostic file
+                removeSemanticDiagnosticsOf(state, referencingFilePath);
+        } // Dont add to seen since this is not yet done with the export removal
+        );
+    }
+    /**
+     * Removes semantic diagnostics for path and
+     * returns true if there are no more semantic diagnostics from the old state
+     */
+    function removeSemanticDiagnosticsOf(state, path) {
+        if (!state.semanticDiagnosticsFromOldState) {
+            return true;
+        }
+        state.semanticDiagnosticsFromOldState.delete(path);
+        state.semanticDiagnosticsPerFile.delete(path);
+        return !state.semanticDiagnosticsFromOldState.size;
+    }
+    /**
+     * This is called after completing operation on the next affected file.
+     * The operations here are postponed to ensure that cancellation during the iteration is handled correctly
+     */
+    function doneWithAffectedFile(state, affected, isPendingEmit) {
+        if (affected === state.program) {
+            state.changedFilesSet.clear();
+            state.programEmitComplete = true;
+        }
+        else {
+            state.seenAffectedFiles.set(affected.path, true);
+            if (isPendingEmit) {
+                state.affectedFilesPendingEmitIndex++;
+            }
+            else {
+                state.affectedFilesIndex++;
+            }
+        }
+    }
+    /**
+     * Returns the result with affected file
+     */
+    function toAffectedFileResult(state, result, affected, isPendingEmit) {
+        doneWithAffectedFile(state, affected, isPendingEmit);
+        return { result: result, affected: affected };
+    }
+    /**
+     * Gets the semantic diagnostics either from cache if present, or otherwise from program and caches it
+     * Note that it is assumed that the when asked about semantic diagnostics, the file has been taken out of affected files/changed file set
+     */
+    function getSemanticDiagnosticsOfFile(state, sourceFile, cancellationToken) {
+        var path = sourceFile.path;
+        if (state.semanticDiagnosticsPerFile) {
+            var cachedDiagnostics = state.semanticDiagnosticsPerFile.get(path);
+            // Report the semantic diagnostics from the cache if we already have those diagnostics present
+            if (cachedDiagnostics) {
+                return cachedDiagnostics;
+            }
+        }
+        // Diagnostics werent cached, get them from program, and cache the result
+        var diagnostics = ts.Debug.assertDefined(state.program).getSemanticDiagnostics(sourceFile, cancellationToken);
+        if (state.semanticDiagnosticsPerFile) {
+            state.semanticDiagnosticsPerFile.set(path, diagnostics);
+        }
+        return diagnostics;
+    }
+    var BuilderProgramKind;
+    (function (BuilderProgramKind) {
+        BuilderProgramKind[BuilderProgramKind["SemanticDiagnosticsBuilderProgram"] = 0] = "SemanticDiagnosticsBuilderProgram";
+        BuilderProgramKind[BuilderProgramKind["EmitAndSemanticDiagnosticsBuilderProgram"] = 1] = "EmitAndSemanticDiagnosticsBuilderProgram";
+    })(BuilderProgramKind = ts.BuilderProgramKind || (ts.BuilderProgramKind = {}));
+    function getBuilderCreationParameters(newProgramOrRootNames, hostOrOptions, oldProgramOrHost, configFileParsingDiagnosticsOrOldProgram, configFileParsingDiagnostics, projectReferences) {
+        var host;
+        var newProgram;
+        var oldProgram;
+        if (newProgramOrRootNames === undefined) {
+            ts.Debug.assert(hostOrOptions === undefined);
+            host = oldProgramOrHost;
+            oldProgram = configFileParsingDiagnosticsOrOldProgram;
+            ts.Debug.assert(!!oldProgram);
+            newProgram = oldProgram.getProgram();
+        }
+        else if (ts.isArray(newProgramOrRootNames)) {
+            oldProgram = configFileParsingDiagnosticsOrOldProgram;
+            newProgram = ts.createProgram({
+                rootNames: newProgramOrRootNames,
+                options: hostOrOptions,
+                host: oldProgramOrHost,
+                oldProgram: oldProgram && oldProgram.getProgramOrUndefined(),
+                configFileParsingDiagnostics: configFileParsingDiagnostics,
+                projectReferences: projectReferences
+            });
+            host = oldProgramOrHost;
+        }
+        else {
+            newProgram = newProgramOrRootNames;
+            host = hostOrOptions;
+            oldProgram = oldProgramOrHost;
+            configFileParsingDiagnostics = configFileParsingDiagnosticsOrOldProgram;
+        }
+        return { host: host, newProgram: newProgram, oldProgram: oldProgram, configFileParsingDiagnostics: configFileParsingDiagnostics || ts.emptyArray };
+    }
+    ts.getBuilderCreationParameters = getBuilderCreationParameters;
+    function createBuilderProgram(kind, _a) {
+        var newProgram = _a.newProgram, host = _a.host, oldProgram = _a.oldProgram, configFileParsingDiagnostics = _a.configFileParsingDiagnostics;
+        // Return same program if underlying program doesnt change
+        var oldState = oldProgram && oldProgram.getState();
+        if (oldState && newProgram === oldState.program && configFileParsingDiagnostics === newProgram.getConfigFileParsingDiagnostics()) {
+            newProgram = undefined; // TODO: GH#18217
+            oldState = undefined;
+            return oldProgram;
+        }
+        /**
+         * Create the canonical file name for identity
+         */
+        var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames());
+        /**
+         * Computing hash to for signature verification
+         */
+        var computeHash = host.createHash || ts.generateDjb2Hash;
+        var state = createBuilderProgramState(newProgram, getCanonicalFileName, oldState);
+        var backupState;
+        // To ensure that we arent storing any references to old program or new program without state
+        newProgram = undefined; // TODO: GH#18217
+        oldProgram = undefined;
+        oldState = undefined;
+        var result = createRedirectedBuilderProgram(state, configFileParsingDiagnostics);
+        result.getState = function () { return state; };
+        result.backupState = function () {
+            ts.Debug.assert(backupState === undefined);
+            backupState = cloneBuilderProgramState(state);
+        };
+        result.restoreState = function () {
+            state = ts.Debug.assertDefined(backupState);
+            backupState = undefined;
+        };
+        result.getAllDependencies = function (sourceFile) { return ts.BuilderState.getAllDependencies(state, ts.Debug.assertDefined(state.program), sourceFile); };
+        result.getSemanticDiagnostics = getSemanticDiagnostics;
+        result.emit = emit;
+        result.releaseProgram = function () {
+            releaseCache(state);
+            backupState = undefined;
+        };
+        if (kind === BuilderProgramKind.SemanticDiagnosticsBuilderProgram) {
+            result.getSemanticDiagnosticsOfNextAffectedFile = getSemanticDiagnosticsOfNextAffectedFile;
+        }
+        else if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
+            result.emitNextAffectedFile = emitNextAffectedFile;
+        }
+        else {
+            ts.notImplemented();
+        }
+        return result;
+        /**
+         * Emits the next affected file's emit result (EmitResult and sourceFiles emitted) or returns undefined if iteration is complete
+         * The first of writeFile if provided, writeFile of BuilderProgramHost if provided, writeFile of compiler host
+         * in that order would be used to write the files
+         */
+        function emitNextAffectedFile(writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
+            var affected = getNextAffectedFile(state, cancellationToken, computeHash);
+            var isPendingEmitFile = false;
+            if (!affected) {
+                if (!state.compilerOptions.out && !state.compilerOptions.outFile) {
+                    affected = getNextAffectedFilePendingEmit(state);
+                    if (!affected) {
+                        return undefined;
+                    }
+                    isPendingEmitFile = true;
+                }
+                else {
+                    var program = ts.Debug.assertDefined(state.program);
+                    // Check if program uses any prepend project references, if thats the case we cant track of the js files of those, so emit even though there are no changes
+                    if (state.programEmitComplete || !ts.some(program.getProjectReferences(), function (ref) { return !!ref.prepend; })) {
+                        state.programEmitComplete = true;
+                        return undefined;
+                    }
+                    affected = program;
+                }
+            }
+            // Mark seen emitted files if there are pending files to be emitted
+            if (state.affectedFilesPendingEmit && state.program !== affected) {
+                (state.seenEmittedFiles || (state.seenEmittedFiles = ts.createMap())).set(affected.path, true);
+            }
+            return toAffectedFileResult(state, 
+            // When whole program is affected, do emit only once (eg when --out or --outFile is specified)
+            // Otherwise just affected file
+            ts.Debug.assertDefined(state.program).emit(affected === state.program ? undefined : affected, writeFile || host.writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers), affected, isPendingEmitFile);
+        }
+        /**
+         * Emits the JavaScript and declaration files.
+         * When targetSource file is specified, emits the files corresponding to that source file,
+         * otherwise for the whole program.
+         * In case of EmitAndSemanticDiagnosticsBuilderProgram, when targetSourceFile is specified,
+         * it is assumed that that file is handled from affected file list. If targetSourceFile is not specified,
+         * it will only emit all the affected files instead of whole program
+         *
+         * The first of writeFile if provided, writeFile of BuilderProgramHost if provided, writeFile of compiler host
+         * in that order would be used to write the files
+         */
+        function emit(targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
+            if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
+                assertSourceFileOkWithoutNextAffectedCall(state, targetSourceFile);
+                if (!targetSourceFile) {
+                    // Emit and report any errors we ran into.
+                    var sourceMaps = [];
+                    var emitSkipped = false;
+                    var diagnostics = void 0;
+                    var emittedFiles = [];
+                    var affectedEmitResult = void 0;
+                    while (affectedEmitResult = emitNextAffectedFile(writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers)) {
+                        emitSkipped = emitSkipped || affectedEmitResult.result.emitSkipped;
+                        diagnostics = ts.addRange(diagnostics, affectedEmitResult.result.diagnostics);
+                        emittedFiles = ts.addRange(emittedFiles, affectedEmitResult.result.emittedFiles);
+                        sourceMaps = ts.addRange(sourceMaps, affectedEmitResult.result.sourceMaps);
+                    }
+                    return {
+                        emitSkipped: emitSkipped,
+                        diagnostics: diagnostics || ts.emptyArray,
+                        emittedFiles: emittedFiles,
+                        sourceMaps: sourceMaps
+                    };
+                }
+            }
+            return ts.Debug.assertDefined(state.program).emit(targetSourceFile, writeFile || host.writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers);
+        }
+        /**
+         * Return the semantic diagnostics for the next affected file or undefined if iteration is complete
+         * If provided ignoreSourceFile would be called before getting the diagnostics and would ignore the sourceFile if the returned value was true
+         */
+        function getSemanticDiagnosticsOfNextAffectedFile(cancellationToken, ignoreSourceFile) {
+            while (true) {
+                var affected = getNextAffectedFile(state, cancellationToken, computeHash);
+                if (!affected) {
+                    // Done
+                    return undefined;
+                }
+                else if (affected === state.program) {
+                    // When whole program is affected, get all semantic diagnostics (eg when --out or --outFile is specified)
+                    return toAffectedFileResult(state, state.program.getSemanticDiagnostics(/*targetSourceFile*/ undefined, cancellationToken), affected);
+                }
+                // Get diagnostics for the affected file if its not ignored
+                if (ignoreSourceFile && ignoreSourceFile(affected)) {
+                    // Get next affected file
+                    doneWithAffectedFile(state, affected);
+                    continue;
+                }
+                return toAffectedFileResult(state, getSemanticDiagnosticsOfFile(state, affected, cancellationToken), affected);
+            }
+        }
+        /**
+         * Gets the semantic diagnostics from the program corresponding to this state of file (if provided) or whole program
+         * The semantic diagnostics are cached and managed here
+         * Note that it is assumed that when asked about semantic diagnostics through this API,
+         * the file has been taken out of affected files so it is safe to use cache or get from program and cache the diagnostics
+         * In case of SemanticDiagnosticsBuilderProgram if the source file is not provided,
+         * it will iterate through all the affected files, to ensure that cache stays valid and yet provide a way to get all semantic diagnostics
+         */
+        function getSemanticDiagnostics(sourceFile, cancellationToken) {
+            assertSourceFileOkWithoutNextAffectedCall(state, sourceFile);
+            var compilerOptions = ts.Debug.assertDefined(state.program).getCompilerOptions();
+            if (compilerOptions.outFile || compilerOptions.out) {
+                ts.Debug.assert(!state.semanticDiagnosticsPerFile);
+                // We dont need to cache the diagnostics just return them from program
+                return ts.Debug.assertDefined(state.program).getSemanticDiagnostics(sourceFile, cancellationToken);
+            }
+            if (sourceFile) {
+                return getSemanticDiagnosticsOfFile(state, sourceFile, cancellationToken);
+            }
+            // When semantic builder asks for diagnostics of the whole program,
+            // ensure that all the affected files are handled
+            var affected;
+            var affectedFilesPendingEmit;
+            while (affected = getNextAffectedFile(state, cancellationToken, computeHash)) {
+                if (affected !== state.program && kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
+                    (affectedFilesPendingEmit || (affectedFilesPendingEmit = [])).push(affected.path);
+                }
+                doneWithAffectedFile(state, affected);
+            }
+            // In case of emit builder, cache the files to be emitted
+            if (affectedFilesPendingEmit) {
+                state.affectedFilesPendingEmit = ts.concatenate(state.affectedFilesPendingEmit, affectedFilesPendingEmit);
+                // affectedFilesPendingEmitIndex === undefined
+                // - means the emit state.affectedFilesPendingEmit was undefined before adding current affected files
+                //   so start from 0 as array would be affectedFilesPendingEmit
+                // else, continue to iterate from existing index, the current set is appended to existing files
+                if (state.affectedFilesPendingEmitIndex === undefined) {
+                    state.affectedFilesPendingEmitIndex = 0;
+                }
+            }
+            var diagnostics;
+            for (var _i = 0, _a = ts.Debug.assertDefined(state.program).getSourceFiles(); _i < _a.length; _i++) {
+                var sourceFile_2 = _a[_i];
+                diagnostics = ts.addRange(diagnostics, getSemanticDiagnosticsOfFile(state, sourceFile_2, cancellationToken));
+            }
+            return diagnostics || ts.emptyArray;
+        }
+    }
+    ts.createBuilderProgram = createBuilderProgram;
+    function createRedirectedBuilderProgram(state, configFileParsingDiagnostics) {
+        return {
+            getState: ts.notImplemented,
+            backupState: ts.noop,
+            restoreState: ts.noop,
+            getProgram: getProgram,
+            getProgramOrUndefined: function () { return state.program; },
+            releaseProgram: function () { return state.program = undefined; },
+            getCompilerOptions: function () { return state.compilerOptions; },
+            getSourceFile: function (fileName) { return getProgram().getSourceFile(fileName); },
+            getSourceFiles: function () { return getProgram().getSourceFiles(); },
+            getOptionsDiagnostics: function (cancellationToken) { return getProgram().getOptionsDiagnostics(cancellationToken); },
+            getGlobalDiagnostics: function (cancellationToken) { return getProgram().getGlobalDiagnostics(cancellationToken); },
+            getConfigFileParsingDiagnostics: function () { return configFileParsingDiagnostics; },
+            getSyntacticDiagnostics: function (sourceFile, cancellationToken) { return getProgram().getSyntacticDiagnostics(sourceFile, cancellationToken); },
+            getDeclarationDiagnostics: function (sourceFile, cancellationToken) { return getProgram().getDeclarationDiagnostics(sourceFile, cancellationToken); },
+            getSemanticDiagnostics: function (sourceFile, cancellationToken) { return getProgram().getSemanticDiagnostics(sourceFile, cancellationToken); },
+            emit: function (sourceFile, writeFile, cancellationToken, emitOnlyDts, customTransformers) { return getProgram().emit(sourceFile, writeFile, cancellationToken, emitOnlyDts, customTransformers); },
+            getAllDependencies: ts.notImplemented,
+            getCurrentDirectory: function () { return getProgram().getCurrentDirectory(); }
+        };
+        function getProgram() {
+            return ts.Debug.assertDefined(state.program);
+        }
+    }
+    ts.createRedirectedBuilderProgram = createRedirectedBuilderProgram;
+})(ts || (ts = {}));
+(function (ts) {
+    function createSemanticDiagnosticsBuilderProgram(newProgramOrRootNames, hostOrOptions, oldProgramOrHost, configFileParsingDiagnosticsOrOldProgram, configFileParsingDiagnostics, projectReferences) {
+        return ts.createBuilderProgram(ts.BuilderProgramKind.SemanticDiagnosticsBuilderProgram, ts.getBuilderCreationParameters(newProgramOrRootNames, hostOrOptions, oldProgramOrHost, configFileParsingDiagnosticsOrOldProgram, configFileParsingDiagnostics, projectReferences));
+    }
+    ts.createSemanticDiagnosticsBuilderProgram = createSemanticDiagnosticsBuilderProgram;
+    function createEmitAndSemanticDiagnosticsBuilderProgram(newProgramOrRootNames, hostOrOptions, oldProgramOrHost, configFileParsingDiagnosticsOrOldProgram, configFileParsingDiagnostics, projectReferences) {
+        return ts.createBuilderProgram(ts.BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram, ts.getBuilderCreationParameters(newProgramOrRootNames, hostOrOptions, oldProgramOrHost, configFileParsingDiagnosticsOrOldProgram, configFileParsingDiagnostics, projectReferences));
+    }
+    ts.createEmitAndSemanticDiagnosticsBuilderProgram = createEmitAndSemanticDiagnosticsBuilderProgram;
+    function createAbstractBuilder(newProgramOrRootNames, hostOrOptions, oldProgramOrHost, configFileParsingDiagnosticsOrOldProgram, configFileParsingDiagnostics, projectReferences) {
+        var _a = ts.getBuilderCreationParameters(newProgramOrRootNames, hostOrOptions, oldProgramOrHost, configFileParsingDiagnosticsOrOldProgram, configFileParsingDiagnostics, projectReferences), newProgram = _a.newProgram, newConfigFileParsingDiagnostics = _a.configFileParsingDiagnostics;
+        return ts.createRedirectedBuilderProgram({ program: newProgram, compilerOptions: newProgram.getCompilerOptions() }, newConfigFileParsingDiagnostics);
+    }
+    ts.createAbstractBuilder = createAbstractBuilder;
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
+(function (ts) {
+    function isPathInNodeModulesStartingWithDot(path) {
+        return ts.stringContains(path, "/node_modules/.");
+    }
+    ts.isPathInNodeModulesStartingWithDot = isPathInNodeModulesStartingWithDot;
+    ts.maxNumberOfFilesToIterateForInvalidation = 256;
+    function createResolutionCache(resolutionHost, rootDirForResolution, logChangesWhenResolvingModule) {
+        var filesWithChangedSetOfUnresolvedImports;
+        var filesWithInvalidatedResolutions;
+        var filesWithInvalidatedNonRelativeUnresolvedImports;
+        var allFilesHaveInvalidatedResolution = false;
+        var nonRelativeExternalModuleResolutions = ts.createMultiMap();
+        var getCurrentDirectory = ts.memoize(function () { return resolutionHost.getCurrentDirectory(); }); // TODO: GH#18217
+        var cachedDirectoryStructureHost = resolutionHost.getCachedDirectoryStructureHost();
+        // The resolvedModuleNames and resolvedTypeReferenceDirectives are the cache of resolutions per file.
+        // The key in the map is source file's path.
+        // The values are Map of resolutions with key being name lookedup.
+        var resolvedModuleNames = ts.createMap();
+        var perDirectoryResolvedModuleNames = ts.createCacheWithRedirects();
+        var nonRelativeModuleNameCache = ts.createCacheWithRedirects();
+        var moduleResolutionCache = ts.createModuleResolutionCacheWithMaps(perDirectoryResolvedModuleNames, nonRelativeModuleNameCache, getCurrentDirectory(), resolutionHost.getCanonicalFileName);
+        var resolvedTypeReferenceDirectives = ts.createMap();
+        var perDirectoryResolvedTypeReferenceDirectives = ts.createCacheWithRedirects();
+        /**
+         * These are the extensions that failed lookup files will have by default,
+         * any other extension of failed lookup will be store that path in custom failed lookup path
+         * This helps in not having to comb through all resolutions when files are added/removed
+         * Note that .d.ts file also has .d.ts extension hence will be part of default extensions
+         */
+        var failedLookupDefaultExtensions = [".ts" /* Ts */, ".tsx" /* Tsx */, ".js" /* Js */, ".jsx" /* Jsx */, ".json" /* Json */];
+        var customFailedLookupPaths = ts.createMap();
+        var directoryWatchesOfFailedLookups = ts.createMap();
+        var rootDir = rootDirForResolution && ts.removeTrailingDirectorySeparator(ts.getNormalizedAbsolutePath(rootDirForResolution, getCurrentDirectory()));
+        var rootPath = (rootDir && resolutionHost.toPath(rootDir)); // TODO: GH#18217
+        // TypeRoot watches for the types that get added as part of getAutomaticTypeDirectiveNames
+        var typeRootsWatches = ts.createMap();
+        return {
+            startRecordingFilesWithChangedResolutions: startRecordingFilesWithChangedResolutions,
+            finishRecordingFilesWithChangedResolutions: finishRecordingFilesWithChangedResolutions,
+            // perDirectoryResolvedModuleNames and perDirectoryResolvedTypeReferenceDirectives could be non empty if there was exception during program update
+            // (between startCachingPerDirectoryResolution and finishCachingPerDirectoryResolution)
+            startCachingPerDirectoryResolution: clearPerDirectoryResolutions,
+            finishCachingPerDirectoryResolution: finishCachingPerDirectoryResolution,
+            resolveModuleNames: resolveModuleNames,
+            getResolvedModuleWithFailedLookupLocationsFromCache: getResolvedModuleWithFailedLookupLocationsFromCache,
+            resolveTypeReferenceDirectives: resolveTypeReferenceDirectives,
+            removeResolutionsFromProjectReferenceRedirects: removeResolutionsFromProjectReferenceRedirects,
+            removeResolutionsOfFile: removeResolutionsOfFile,
+            invalidateResolutionOfFile: invalidateResolutionOfFile,
+            setFilesWithInvalidatedNonRelativeUnresolvedImports: setFilesWithInvalidatedNonRelativeUnresolvedImports,
+            createHasInvalidatedResolution: createHasInvalidatedResolution,
+            updateTypeRootsWatch: updateTypeRootsWatch,
+            closeTypeRootsWatch: closeTypeRootsWatch,
+            clear: clear
+        };
+        function getResolvedModule(resolution) {
+            return resolution.resolvedModule;
+        }
+        function getResolvedTypeReferenceDirective(resolution) {
+            return resolution.resolvedTypeReferenceDirective;
+        }
+        function isInDirectoryPath(dir, file) {
+            if (dir === undefined || file.length <= dir.length) {
+                return false;
+            }
+            return ts.startsWith(file, dir) && file[dir.length] === ts.directorySeparator;
+        }
+        function clear() {
+            ts.clearMap(directoryWatchesOfFailedLookups, ts.closeFileWatcherOf);
+            customFailedLookupPaths.clear();
+            nonRelativeExternalModuleResolutions.clear();
+            closeTypeRootsWatch();
+            resolvedModuleNames.clear();
+            resolvedTypeReferenceDirectives.clear();
+            allFilesHaveInvalidatedResolution = false;
+            // perDirectoryResolvedModuleNames and perDirectoryResolvedTypeReferenceDirectives could be non empty if there was exception during program update
+            // (between startCachingPerDirectoryResolution and finishCachingPerDirectoryResolution)
+            clearPerDirectoryResolutions();
+        }
+        function startRecordingFilesWithChangedResolutions() {
+            filesWithChangedSetOfUnresolvedImports = [];
+        }
+        function finishRecordingFilesWithChangedResolutions() {
+            var collected = filesWithChangedSetOfUnresolvedImports;
+            filesWithChangedSetOfUnresolvedImports = undefined;
+            return collected;
+        }
+        function isFileWithInvalidatedNonRelativeUnresolvedImports(path) {
+            if (!filesWithInvalidatedNonRelativeUnresolvedImports) {
+                return false;
+            }
+            // Invalidated if file has unresolved imports
+            var value = filesWithInvalidatedNonRelativeUnresolvedImports.get(path);
+            return !!value && !!value.length;
+        }
+        function createHasInvalidatedResolution(forceAllFilesAsInvalidated) {
+            if (allFilesHaveInvalidatedResolution || forceAllFilesAsInvalidated) {
+                // Any file asked would have invalidated resolution
+                filesWithInvalidatedResolutions = undefined;
+                return ts.returnTrue;
+            }
+            var collected = filesWithInvalidatedResolutions;
+            filesWithInvalidatedResolutions = undefined;
+            return function (path) { return (!!collected && collected.has(path)) ||
+                isFileWithInvalidatedNonRelativeUnresolvedImports(path); };
+        }
+        function clearPerDirectoryResolutions() {
+            perDirectoryResolvedModuleNames.clear();
+            nonRelativeModuleNameCache.clear();
+            perDirectoryResolvedTypeReferenceDirectives.clear();
+            nonRelativeExternalModuleResolutions.forEach(watchFailedLookupLocationOfNonRelativeModuleResolutions);
+            nonRelativeExternalModuleResolutions.clear();
+        }
+        function finishCachingPerDirectoryResolution() {
+            allFilesHaveInvalidatedResolution = false;
+            filesWithInvalidatedNonRelativeUnresolvedImports = undefined;
+            clearPerDirectoryResolutions();
+            directoryWatchesOfFailedLookups.forEach(function (watcher, path) {
+                if (watcher.refCount === 0) {
+                    directoryWatchesOfFailedLookups.delete(path);
+                    watcher.watcher.close();
+                }
+            });
+        }
+        function resolveModuleName(moduleName, containingFile, compilerOptions, host, redirectedReference) {
+            var primaryResult = ts.resolveModuleName(moduleName, containingFile, compilerOptions, host, moduleResolutionCache, redirectedReference);
+            // return result immediately only if global cache support is not enabled or if it is .ts, .tsx or .d.ts
+            if (!resolutionHost.getGlobalCache) {
+                return primaryResult;
+            }
+            // otherwise try to load typings from @types
+            var globalCache = resolutionHost.getGlobalCache();
+            if (globalCache !== undefined && !ts.isExternalModuleNameRelative(moduleName) && !(primaryResult.resolvedModule && ts.extensionIsTS(primaryResult.resolvedModule.extension))) {
+                // create different collection of failed lookup locations for second pass
+                // if it will fail and we've already found something during the first pass - we don't want to pollute its results
+                var _a = ts.loadModuleFromGlobalCache(moduleName, resolutionHost.projectName, compilerOptions, host, globalCache), resolvedModule = _a.resolvedModule, failedLookupLocations = _a.failedLookupLocations;
+                if (resolvedModule) {
+                    return { resolvedModule: resolvedModule, failedLookupLocations: ts.addRange(primaryResult.failedLookupLocations, failedLookupLocations) };
+                }
+            }
+            // Default return the result from the first pass
+            return primaryResult;
+        }
+        function resolveNamesWithLocalCache(names, containingFile, redirectedReference, cache, perDirectoryCacheWithRedirects, loader, getResolutionWithResolvedFileName, shouldRetryResolution, reusedNames, logChanges) {
+            var path = resolutionHost.toPath(containingFile);
+            var resolutionsInFile = cache.get(path) || cache.set(path, ts.createMap()).get(path);
+            var dirPath = ts.getDirectoryPath(path);
+            var perDirectoryCache = perDirectoryCacheWithRedirects.getOrCreateMapOfCacheRedirects(redirectedReference);
+            var perDirectoryResolution = perDirectoryCache.get(dirPath);
+            if (!perDirectoryResolution) {
+                perDirectoryResolution = ts.createMap();
+                perDirectoryCache.set(dirPath, perDirectoryResolution);
+            }
+            var resolvedModules = [];
+            var compilerOptions = resolutionHost.getCompilationSettings();
+            var hasInvalidatedNonRelativeUnresolvedImport = logChanges && isFileWithInvalidatedNonRelativeUnresolvedImports(path);
+            // All the resolutions in this file are invalidated if this file wasnt resolved using same redirect
+            var program = resolutionHost.getCurrentProgram();
+            var oldRedirect = program && program.getResolvedProjectReferenceToRedirect(containingFile);
+            var unmatchedRedirects = oldRedirect ?
+                !redirectedReference || redirectedReference.sourceFile.path !== oldRedirect.sourceFile.path :
+                !!redirectedReference;
+            var seenNamesInFile = ts.createMap();
+            for (var _i = 0, names_2 = names; _i < names_2.length; _i++) {
+                var name = names_2[_i];
+                var resolution = resolutionsInFile.get(name);
+                // Resolution is valid if it is present and not invalidated
+                if (!seenNamesInFile.has(name) &&
+                    allFilesHaveInvalidatedResolution || unmatchedRedirects || !resolution || resolution.isInvalidated ||
+                    // If the name is unresolved import that was invalidated, recalculate
+                    (hasInvalidatedNonRelativeUnresolvedImport && !ts.isExternalModuleNameRelative(name) && shouldRetryResolution(resolution))) {
+                    var existingResolution = resolution;
+                    var resolutionInDirectory = perDirectoryResolution.get(name);
+                    if (resolutionInDirectory) {
+                        resolution = resolutionInDirectory;
+                    }
+                    else {
+                        resolution = loader(name, containingFile, compilerOptions, resolutionHost, redirectedReference);
+                        perDirectoryResolution.set(name, resolution);
+                    }
+                    resolutionsInFile.set(name, resolution);
+                    watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution);
+                    if (existingResolution) {
+                        stopWatchFailedLookupLocationOfResolution(existingResolution);
+                    }
+                    if (logChanges && filesWithChangedSetOfUnresolvedImports && !resolutionIsEqualTo(existingResolution, resolution)) {
+                        filesWithChangedSetOfUnresolvedImports.push(path);
+                        // reset log changes to avoid recording the same file multiple times
+                        logChanges = false;
+                    }
+                }
+                ts.Debug.assert(resolution !== undefined && !resolution.isInvalidated);
+                seenNamesInFile.set(name, true);
+                resolvedModules.push(getResolutionWithResolvedFileName(resolution));
+            }
+            // Stop watching and remove the unused name
+            resolutionsInFile.forEach(function (resolution, name) {
+                if (!seenNamesInFile.has(name) && !ts.contains(reusedNames, name)) {
+                    stopWatchFailedLookupLocationOfResolution(resolution);
+                    resolutionsInFile.delete(name);
+                }
+            });
+            return resolvedModules;
+            function resolutionIsEqualTo(oldResolution, newResolution) {
+                if (oldResolution === newResolution) {
+                    return true;
+                }
+                if (!oldResolution || !newResolution) {
+                    return false;
+                }
+                var oldResult = getResolutionWithResolvedFileName(oldResolution);
+                var newResult = getResolutionWithResolvedFileName(newResolution);
+                if (oldResult === newResult) {
+                    return true;
+                }
+                if (!oldResult || !newResult) {
+                    return false;
+                }
+                return oldResult.resolvedFileName === newResult.resolvedFileName;
+            }
+        }
+        function resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference) {
+            return resolveNamesWithLocalCache(typeDirectiveNames, containingFile, redirectedReference, resolvedTypeReferenceDirectives, perDirectoryResolvedTypeReferenceDirectives, ts.resolveTypeReferenceDirective, getResolvedTypeReferenceDirective, 
+            /*shouldRetryResolution*/ function (resolution) { return resolution.resolvedTypeReferenceDirective === undefined; }, 
+            /*reusedNames*/ undefined, /*logChanges*/ false);
+        }
+        function resolveModuleNames(moduleNames, containingFile, reusedNames, redirectedReference) {
+            return resolveNamesWithLocalCache(moduleNames, containingFile, redirectedReference, resolvedModuleNames, perDirectoryResolvedModuleNames, resolveModuleName, getResolvedModule, 
+            /*shouldRetryResolution*/ function (resolution) { return !resolution.resolvedModule || !ts.resolutionExtensionIsTSOrJson(resolution.resolvedModule.extension); }, reusedNames, logChangesWhenResolvingModule);
+        }
+        function getResolvedModuleWithFailedLookupLocationsFromCache(moduleName, containingFile) {
+            var cache = resolvedModuleNames.get(resolutionHost.toPath(containingFile));
+            return cache && cache.get(moduleName);
+        }
+        function isNodeModulesDirectory(dirPath) {
+            return ts.endsWith(dirPath, "/node_modules");
+        }
+        function isNodeModulesAtTypesDirectory(dirPath) {
+            return ts.endsWith(dirPath, "/node_modules/@types");
+        }
+        /**
+         * Filter out paths like
+         * "/", "/user", "/user/username", "/user/username/folderAtRoot",
+         * "c:/", "c:/users", "c:/users/username", "c:/users/username/folderAtRoot", "c:/folderAtRoot"
+         * @param dirPath
+         */
+        function canWatchDirectory(dirPath) {
+            var rootLength = ts.getRootLength(dirPath);
+            if (dirPath.length === rootLength) {
+                // Ignore "/", "c:/"
+                return false;
+            }
+            var nextDirectorySeparator = dirPath.indexOf(ts.directorySeparator, rootLength);
+            if (nextDirectorySeparator === -1) {
+                // ignore "/user", "c:/users" or "c:/folderAtRoot"
+                return false;
+            }
+            if (dirPath.charCodeAt(0) !== 47 /* slash */ &&
+                dirPath.substr(rootLength, nextDirectorySeparator).search(/users/i) === -1) {
+                // Paths like c:/folderAtRoot/subFolder are allowed
+                return true;
+            }
+            for (var searchIndex = nextDirectorySeparator + 1, searchLevels = 2; searchLevels > 0; searchLevels--) {
+                searchIndex = dirPath.indexOf(ts.directorySeparator, searchIndex) + 1;
+                if (searchIndex === 0) {
+                    // Folder isnt at expected minimun levels
+                    return false;
+                }
+            }
+            return true;
+        }
+        function getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath) {
+            if (isInDirectoryPath(rootPath, failedLookupLocationPath)) {
+                // Ensure failed look up is normalized path
+                failedLookupLocation = ts.isRootedDiskPath(failedLookupLocation) ? ts.normalizePath(failedLookupLocation) : ts.getNormalizedAbsolutePath(failedLookupLocation, getCurrentDirectory());
+                ts.Debug.assert(failedLookupLocation.length === failedLookupLocationPath.length, "FailedLookup: " + failedLookupLocation + " failedLookupLocationPath: " + failedLookupLocationPath); // tslint:disable-line
+                var subDirectoryInRoot = failedLookupLocationPath.indexOf(ts.directorySeparator, rootPath.length + 1);
+                if (subDirectoryInRoot !== -1) {
+                    // Instead of watching root, watch directory in root to avoid watching excluded directories not needed for module resolution
+                    return { dir: failedLookupLocation.substr(0, subDirectoryInRoot), dirPath: failedLookupLocationPath.substr(0, subDirectoryInRoot) };
+                }
+                else {
+                    // Always watch root directory non recursively
+                    return { dir: rootDir, dirPath: rootPath, nonRecursive: false }; // TODO: GH#18217
+                }
+            }
+            return getDirectoryToWatchFromFailedLookupLocationDirectory(ts.getDirectoryPath(ts.getNormalizedAbsolutePath(failedLookupLocation, getCurrentDirectory())), ts.getDirectoryPath(failedLookupLocationPath));
+        }
+        function getDirectoryToWatchFromFailedLookupLocationDirectory(dir, dirPath) {
+            // If directory path contains node module, get the most parent node_modules directory for watching
+            while (ts.pathContainsNodeModules(dirPath)) {
+                dir = ts.getDirectoryPath(dir);
+                dirPath = ts.getDirectoryPath(dirPath);
+            }
+            // If the directory is node_modules use it to watch, always watch it recursively
+            if (isNodeModulesDirectory(dirPath)) {
+                return canWatchDirectory(ts.getDirectoryPath(dirPath)) ? { dir: dir, dirPath: dirPath } : undefined;
+            }
+            var nonRecursive = true;
+            // Use some ancestor of the root directory
+            var subDirectoryPath, subDirectory;
+            if (rootPath !== undefined) {
+                while (!isInDirectoryPath(dirPath, rootPath)) {
+                    var parentPath = ts.getDirectoryPath(dirPath);
+                    if (parentPath === dirPath) {
+                        break;
+                    }
+                    nonRecursive = false;
+                    subDirectoryPath = dirPath;
+                    subDirectory = dir;
+                    dirPath = parentPath;
+                    dir = ts.getDirectoryPath(dir);
+                }
+            }
+            return canWatchDirectory(dirPath) ? { dir: subDirectory || dir, dirPath: subDirectoryPath || dirPath, nonRecursive: nonRecursive } : undefined;
+        }
+        function isPathWithDefaultFailedLookupExtension(path) {
+            return ts.fileExtensionIsOneOf(path, failedLookupDefaultExtensions);
+        }
+        function watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution) {
+            // No need to set the resolution refCount
+            if (resolution.failedLookupLocations && resolution.failedLookupLocations.length) {
+                if (resolution.refCount) {
+                    resolution.refCount++;
+                }
+                else {
+                    resolution.refCount = 1;
+                    if (ts.isExternalModuleNameRelative(name)) {
+                        watchFailedLookupLocationOfResolution(resolution);
+                    }
+                    else {
+                        nonRelativeExternalModuleResolutions.add(name, resolution);
+                    }
+                }
+            }
+        }
+        function watchFailedLookupLocationOfResolution(resolution) {
+            ts.Debug.assert(!!resolution.refCount);
+            var failedLookupLocations = resolution.failedLookupLocations;
+            var setAtRoot = false;
+            for (var _i = 0, failedLookupLocations_1 = failedLookupLocations; _i < failedLookupLocations_1.length; _i++) {
+                var failedLookupLocation = failedLookupLocations_1[_i];
+                var failedLookupLocationPath = resolutionHost.toPath(failedLookupLocation);
+                var toWatch = getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath);
+                if (toWatch) {
+                    var dir = toWatch.dir, dirPath = toWatch.dirPath, nonRecursive = toWatch.nonRecursive;
+                    // If the failed lookup location path is not one of the supported extensions,
+                    // store it in the custom path
+                    if (!isPathWithDefaultFailedLookupExtension(failedLookupLocationPath)) {
+                        var refCount = customFailedLookupPaths.get(failedLookupLocationPath) || 0;
+                        customFailedLookupPaths.set(failedLookupLocationPath, refCount + 1);
+                    }
+                    if (dirPath === rootPath) {
+                        ts.Debug.assert(!nonRecursive);
+                        setAtRoot = true;
+                    }
+                    else {
+                        setDirectoryWatcher(dir, dirPath, nonRecursive);
+                    }
+                }
+            }
+            if (setAtRoot) {
+                // This is always non recursive
+                setDirectoryWatcher(rootDir, rootPath, /*nonRecursive*/ true); // TODO: GH#18217
+            }
+        }
+        function setRefCountToUndefined(resolution) {
+            resolution.refCount = undefined;
+        }
+        function watchFailedLookupLocationOfNonRelativeModuleResolutions(resolutions, name) {
+            var program = resolutionHost.getCurrentProgram();
+            var updateResolution = program && program.getTypeChecker().tryFindAmbientModuleWithoutAugmentations(name) ?
+                setRefCountToUndefined : watchFailedLookupLocationOfResolution;
+            resolutions.forEach(updateResolution);
+        }
+        function setDirectoryWatcher(dir, dirPath, nonRecursive) {
+            var dirWatcher = directoryWatchesOfFailedLookups.get(dirPath);
+            if (dirWatcher) {
+                ts.Debug.assert(!!nonRecursive === !!dirWatcher.nonRecursive);
+                dirWatcher.refCount++;
+            }
+            else {
+                directoryWatchesOfFailedLookups.set(dirPath, { watcher: createDirectoryWatcher(dir, dirPath, nonRecursive), refCount: 1, nonRecursive: nonRecursive });
+            }
+        }
+        function stopWatchFailedLookupLocationOfResolution(resolution) {
+            if (!resolution.refCount) {
+                return;
+            }
+            resolution.refCount--;
+            if (resolution.refCount) {
+                return;
+            }
+            var failedLookupLocations = resolution.failedLookupLocations;
+            var removeAtRoot = false;
+            for (var _i = 0, failedLookupLocations_2 = failedLookupLocations; _i < failedLookupLocations_2.length; _i++) {
+                var failedLookupLocation = failedLookupLocations_2[_i];
+                var failedLookupLocationPath = resolutionHost.toPath(failedLookupLocation);
+                var toWatch = getDirectoryToWatchFailedLookupLocation(failedLookupLocation, failedLookupLocationPath);
+                if (toWatch) {
+                    var dirPath = toWatch.dirPath;
+                    var refCount = customFailedLookupPaths.get(failedLookupLocationPath);
+                    if (refCount) {
+                        if (refCount === 1) {
+                            customFailedLookupPaths.delete(failedLookupLocationPath);
+                        }
+                        else {
+                            ts.Debug.assert(refCount > 1);
+                            customFailedLookupPaths.set(failedLookupLocationPath, refCount - 1);
+                        }
+                    }
+                    if (dirPath === rootPath) {
+                        removeAtRoot = true;
+                    }
+                    else {
+                        removeDirectoryWatcher(dirPath);
+                    }
+                }
+            }
+            if (removeAtRoot) {
+                removeDirectoryWatcher(rootPath);
+            }
+        }
+        function removeDirectoryWatcher(dirPath) {
+            var dirWatcher = directoryWatchesOfFailedLookups.get(dirPath);
+            // Do not close the watcher yet since it might be needed by other failed lookup locations.
+            dirWatcher.refCount--;
+        }
+        function createDirectoryWatcher(directory, dirPath, nonRecursive) {
+            return resolutionHost.watchDirectoryOfFailedLookupLocation(directory, function (fileOrDirectory) {
+                var fileOrDirectoryPath = resolutionHost.toPath(fileOrDirectory);
+                if (cachedDirectoryStructureHost) {
+                    // Since the file existence changed, update the sourceFiles cache
+                    cachedDirectoryStructureHost.addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath);
+                }
+                if (!allFilesHaveInvalidatedResolution && invalidateResolutionOfFailedLookupLocation(fileOrDirectoryPath, dirPath === fileOrDirectoryPath)) {
+                    resolutionHost.onInvalidatedResolution();
+                }
+            }, nonRecursive ? 0 /* None */ : 1 /* Recursive */);
+        }
+        function removeResolutionsOfFileFromCache(cache, filePath) {
+            // Deleted file, stop watching failed lookups for all the resolutions in the file
+            var resolutions = cache.get(filePath);
+            if (resolutions) {
+                resolutions.forEach(stopWatchFailedLookupLocationOfResolution);
+                cache.delete(filePath);
+            }
+        }
+        function removeResolutionsFromProjectReferenceRedirects(filePath) {
+            if (!ts.fileExtensionIs(filePath, ".json" /* Json */)) {
+                return;
+            }
+            var program = resolutionHost.getCurrentProgram();
+            if (!program) {
+                return;
+            }
+            // If this file is input file for the referenced project, get it
+            var resolvedProjectReference = program.getResolvedProjectReferenceByPath(filePath);
+            if (!resolvedProjectReference) {
+                return;
+            }
+            // filePath is for the projectReference and the containing file is from this project reference, invalidate the resolution
+            resolvedProjectReference.commandLine.fileNames.forEach(function (f) { return removeResolutionsOfFile(resolutionHost.toPath(f)); });
+        }
+        function removeResolutionsOfFile(filePath) {
+            removeResolutionsOfFileFromCache(resolvedModuleNames, filePath);
+            removeResolutionsOfFileFromCache(resolvedTypeReferenceDirectives, filePath);
+        }
+        function invalidateResolutionCache(cache, isInvalidatedResolution, getResolutionWithResolvedFileName) {
+            var seen = ts.createMap();
+            cache.forEach(function (resolutions, containingFilePath) {
+                var dirPath = ts.getDirectoryPath(containingFilePath);
+                var seenInDir = seen.get(dirPath);
+                if (!seenInDir) {
+                    seenInDir = ts.createMap();
+                    seen.set(dirPath, seenInDir);
+                }
+                resolutions.forEach(function (resolution, name) {
+                    if (seenInDir.has(name)) {
+                        return;
+                    }
+                    seenInDir.set(name, true);
+                    if (!resolution.isInvalidated && isInvalidatedResolution(resolution, getResolutionWithResolvedFileName)) {
+                        // Mark the file as needing re-evaluation of module resolution instead of using it blindly.
+                        resolution.isInvalidated = true;
+                        (filesWithInvalidatedResolutions || (filesWithInvalidatedResolutions = ts.createMap())).set(containingFilePath, true);
+                    }
+                });
+            });
+        }
+        function hasReachedResolutionIterationLimit() {
+            var maxSize = resolutionHost.maxNumberOfFilesToIterateForInvalidation || ts.maxNumberOfFilesToIterateForInvalidation;
+            return resolvedModuleNames.size > maxSize || resolvedTypeReferenceDirectives.size > maxSize;
+        }
+        function invalidateResolutions(isInvalidatedResolution) {
+            // If more than maxNumberOfFilesToIterateForInvalidation present,
+            // just invalidated all files and recalculate the resolutions for files instead
+            if (hasReachedResolutionIterationLimit()) {
+                allFilesHaveInvalidatedResolution = true;
+                return;
+            }
+            invalidateResolutionCache(resolvedModuleNames, isInvalidatedResolution, getResolvedModule);
+            invalidateResolutionCache(resolvedTypeReferenceDirectives, isInvalidatedResolution, getResolvedTypeReferenceDirective);
+        }
+        function invalidateResolutionOfFile(filePath) {
+            removeResolutionsOfFile(filePath);
+            invalidateResolutions(
+            // Resolution is invalidated if the resulting file name is same as the deleted file path
+            function (resolution, getResolutionWithResolvedFileName) {
+                var result = getResolutionWithResolvedFileName(resolution);
+                return !!result && resolutionHost.toPath(result.resolvedFileName) === filePath; // TODO: GH#18217
+            });
+        }
+        function setFilesWithInvalidatedNonRelativeUnresolvedImports(filesMap) {
+            ts.Debug.assert(filesWithInvalidatedNonRelativeUnresolvedImports === filesMap || filesWithInvalidatedNonRelativeUnresolvedImports === undefined);
+            filesWithInvalidatedNonRelativeUnresolvedImports = filesMap;
+        }
+        function invalidateResolutionOfFailedLookupLocation(fileOrDirectoryPath, isCreatingWatchedDirectory) {
+            var isChangedFailedLookupLocation;
+            if (isCreatingWatchedDirectory) {
+                // Watching directory is created
+                // Invalidate any resolution has failed lookup in this directory
+                isChangedFailedLookupLocation = function (location) { return isInDirectoryPath(fileOrDirectoryPath, resolutionHost.toPath(location)); };
+            }
+            else {
+                // If something to do with folder/file starting with "." in node_modules folder, skip it
+                if (isPathInNodeModulesStartingWithDot(fileOrDirectoryPath))
+                    return false;
+                // Some file or directory in the watching directory is created
+                // Return early if it does not have any of the watching extension or not the custom failed lookup path
+                var dirOfFileOrDirectory = ts.getDirectoryPath(fileOrDirectoryPath);
+                if (isNodeModulesAtTypesDirectory(fileOrDirectoryPath) || isNodeModulesDirectory(fileOrDirectoryPath) ||
+                    isNodeModulesAtTypesDirectory(dirOfFileOrDirectory) || isNodeModulesDirectory(dirOfFileOrDirectory)) {
+                    // Invalidate any resolution from this directory
+                    isChangedFailedLookupLocation = function (location) {
+                        var locationPath = resolutionHost.toPath(location);
+                        return locationPath === fileOrDirectoryPath || ts.startsWith(resolutionHost.toPath(location), fileOrDirectoryPath);
+                    };
+                }
+                else {
+                    if (!isPathWithDefaultFailedLookupExtension(fileOrDirectoryPath) && !customFailedLookupPaths.has(fileOrDirectoryPath)) {
+                        return false;
+                    }
+                    // Ignore emits from the program
+                    if (ts.isEmittedFileOfProgram(resolutionHost.getCurrentProgram(), fileOrDirectoryPath)) {
+                        return false;
+                    }
+                    // Resolution need to be invalidated if failed lookup location is same as the file or directory getting created
+                    isChangedFailedLookupLocation = function (location) { return resolutionHost.toPath(location) === fileOrDirectoryPath; };
+                }
+            }
+            var hasChangedFailedLookupLocation = function (resolution) { return ts.some(resolution.failedLookupLocations, isChangedFailedLookupLocation); };
+            var invalidatedFilesCount = filesWithInvalidatedResolutions && filesWithInvalidatedResolutions.size;
+            invalidateResolutions(
+            // Resolution is invalidated if the resulting file name is same as the deleted file path
+            hasChangedFailedLookupLocation);
+            return allFilesHaveInvalidatedResolution || filesWithInvalidatedResolutions && filesWithInvalidatedResolutions.size !== invalidatedFilesCount;
+        }
+        function closeTypeRootsWatch() {
+            ts.clearMap(typeRootsWatches, ts.closeFileWatcher);
+        }
+        function getDirectoryToWatchFailedLookupLocationFromTypeRoot(typeRoot, typeRootPath) {
+            if (allFilesHaveInvalidatedResolution) {
+                return undefined;
+            }
+            if (isInDirectoryPath(rootPath, typeRootPath)) {
+                return rootPath;
+            }
+            var toWatch = getDirectoryToWatchFromFailedLookupLocationDirectory(typeRoot, typeRootPath);
+            return toWatch && directoryWatchesOfFailedLookups.has(toWatch.dirPath) ? toWatch.dirPath : undefined;
+        }
+        function createTypeRootsWatch(typeRootPath, typeRoot) {
+            // Create new watch and recursive info
+            return resolutionHost.watchTypeRootsDirectory(typeRoot, function (fileOrDirectory) {
+                var fileOrDirectoryPath = resolutionHost.toPath(fileOrDirectory);
+                if (cachedDirectoryStructureHost) {
+                    // Since the file existence changed, update the sourceFiles cache
+                    cachedDirectoryStructureHost.addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath);
+                }
+                // For now just recompile
+                // We could potentially store more data here about whether it was/would be really be used or not
+                // and with that determine to trigger compilation but for now this is enough
+                resolutionHost.onChangedAutomaticTypeDirectiveNames();
+                // Since directory watchers invoked are flaky, the failed lookup location events might not be triggered
+                // So handle to failed lookup locations here as well to ensure we are invalidating resolutions
+                var dirPath = getDirectoryToWatchFailedLookupLocationFromTypeRoot(typeRoot, typeRootPath);
+                if (dirPath && invalidateResolutionOfFailedLookupLocation(fileOrDirectoryPath, dirPath === fileOrDirectoryPath)) {
+                    resolutionHost.onInvalidatedResolution();
+                }
+            }, 1 /* Recursive */);
+        }
+        /**
+         * Watches the types that would get added as part of getAutomaticTypeDirectiveNames
+         * To be called when compiler options change
+         */
+        function updateTypeRootsWatch() {
+            var options = resolutionHost.getCompilationSettings();
+            if (options.types) {
+                // No need to do any watch since resolution cache is going to handle the failed lookups
+                // for the types added by this
+                closeTypeRootsWatch();
+                return;
+            }
+            // we need to assume the directories exist to ensure that we can get all the type root directories that get included
+            // But filter directories that are at root level to say directory doesnt exist, so that we arent watching them
+            var typeRoots = ts.getEffectiveTypeRoots(options, { directoryExists: directoryExistsForTypeRootWatch, getCurrentDirectory: getCurrentDirectory });
+            if (typeRoots) {
+                ts.mutateMap(typeRootsWatches, ts.arrayToMap(typeRoots, function (tr) { return resolutionHost.toPath(tr); }), {
+                    createNewValue: createTypeRootsWatch,
+                    onDeleteValue: ts.closeFileWatcher
+                });
+            }
+            else {
+                closeTypeRootsWatch();
+            }
+        }
+        /**
+         * Use this function to return if directory exists to get type roots to watch
+         * If we return directory exists then only the paths will be added to type roots
+         * Hence return true for all directories except root directories which are filtered from watching
+         */
+        function directoryExistsForTypeRootWatch(nodeTypesDirectory) {
+            var dir = ts.getDirectoryPath(ts.getDirectoryPath(nodeTypesDirectory));
+            var dirPath = resolutionHost.toPath(dir);
+            return dirPath === rootPath || canWatchDirectory(dirPath);
+        }
+    }
+    ts.createResolutionCache = createResolutionCache;
+})(ts || (ts = {}));
+// Used by importFixes, getEditsForFileRename, and declaration emit to synthesize import module specifiers.
+/* @internal */
+var ts;
+(function (ts) {
+    var moduleSpecifiers;
+    (function (moduleSpecifiers) {
+        var RelativePreference;
+        (function (RelativePreference) {
+            RelativePreference[RelativePreference["Relative"] = 0] = "Relative";
+            RelativePreference[RelativePreference["NonRelative"] = 1] = "NonRelative";
+            RelativePreference[RelativePreference["Auto"] = 2] = "Auto";
+        })(RelativePreference || (RelativePreference = {}));
+        // See UserPreferences#importPathEnding
+        var Ending;
+        (function (Ending) {
+            Ending[Ending["Minimal"] = 0] = "Minimal";
+            Ending[Ending["Index"] = 1] = "Index";
+            Ending[Ending["JsExtension"] = 2] = "JsExtension";
+        })(Ending || (Ending = {}));
+        function getPreferences(_a, compilerOptions, importingSourceFile) {
+            var importModuleSpecifierPreference = _a.importModuleSpecifierPreference, importModuleSpecifierEnding = _a.importModuleSpecifierEnding;
+            return {
+                relativePreference: importModuleSpecifierPreference === "relative" ? 0 /* Relative */ : importModuleSpecifierPreference === "non-relative" ? 1 /* NonRelative */ : 2 /* Auto */,
+                ending: getEnding(),
+            };
+            function getEnding() {
+                switch (importModuleSpecifierEnding) {
+                    case "minimal": return 0 /* Minimal */;
+                    case "index": return 1 /* Index */;
+                    case "js": return 2 /* JsExtension */;
+                    default: return usesJsExtensionOnImports(importingSourceFile) ? 2 /* JsExtension */
+                        : ts.getEmitModuleResolutionKind(compilerOptions) !== ts.ModuleResolutionKind.NodeJs ? 1 /* Index */ : 0 /* Minimal */;
+                }
+            }
+        }
+        function getPreferencesForUpdate(compilerOptions, oldImportSpecifier) {
+            return {
+                relativePreference: ts.isExternalModuleNameRelative(oldImportSpecifier) ? 0 /* Relative */ : 1 /* NonRelative */,
+                ending: ts.hasJSOrJsonFileExtension(oldImportSpecifier) ? 2 /* JsExtension */
+                    : ts.getEmitModuleResolutionKind(compilerOptions) !== ts.ModuleResolutionKind.NodeJs || ts.endsWith(oldImportSpecifier, "index") ? 1 /* Index */ : 0 /* Minimal */,
+            };
+        }
+        function updateModuleSpecifier(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, oldImportSpecifier) {
+            var res = getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, getPreferencesForUpdate(compilerOptions, oldImportSpecifier));
+            if (res === oldImportSpecifier)
+                return undefined;
+            return res;
+        }
+        moduleSpecifiers.updateModuleSpecifier = updateModuleSpecifier;
+        // Note: importingSourceFile is just for usesJsExtensionOnImports
+        function getModuleSpecifier(compilerOptions, importingSourceFile, importingSourceFileName, toFileName, host, files, preferences, redirectTargetsMap) {
+            if (preferences === void 0) { preferences = {}; }
+            return getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, getPreferences(preferences, compilerOptions, importingSourceFile));
+        }
+        moduleSpecifiers.getModuleSpecifier = getModuleSpecifier;
+        function getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, preferences) {
+            var info = getInfo(importingSourceFileName, host);
+            var modulePaths = getAllModulePaths(files, importingSourceFileName, toFileName, info.getCanonicalFileName, host, redirectTargetsMap);
+            return ts.firstDefined(modulePaths, function (moduleFileName) { return tryGetModuleNameAsNodeModule(moduleFileName, info, host, compilerOptions); }) ||
+                getLocalModuleSpecifier(toFileName, info, compilerOptions, preferences);
+        }
+        // Returns an import for each symlink and for the realpath.
+        function getModuleSpecifiers(moduleSymbol, compilerOptions, importingSourceFile, host, files, userPreferences, redirectTargetsMap) {
+            var ambient = tryGetModuleNameFromAmbientModule(moduleSymbol);
+            if (ambient)
+                return [ambient];
+            var info = getInfo(importingSourceFile.path, host);
+            var moduleSourceFile = ts.getSourceFileOfNode(moduleSymbol.valueDeclaration || ts.getNonAugmentationDeclaration(moduleSymbol));
+            var modulePaths = getAllModulePaths(files, importingSourceFile.path, moduleSourceFile.fileName, info.getCanonicalFileName, host, redirectTargetsMap);
+            var preferences = getPreferences(userPreferences, compilerOptions, importingSourceFile);
+            var global = ts.mapDefined(modulePaths, function (moduleFileName) { return tryGetModuleNameAsNodeModule(moduleFileName, info, host, compilerOptions); });
+            return global.length ? global : modulePaths.map(function (moduleFileName) { return getLocalModuleSpecifier(moduleFileName, info, compilerOptions, preferences); });
+        }
+        moduleSpecifiers.getModuleSpecifiers = getModuleSpecifiers;
+        // importingSourceFileName is separate because getEditsForFileRename may need to specify an updated path
+        function getInfo(importingSourceFileName, host) {
+            var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames ? host.useCaseSensitiveFileNames() : true);
+            var sourceDirectory = ts.getDirectoryPath(importingSourceFileName);
+            return { getCanonicalFileName: getCanonicalFileName, sourceDirectory: sourceDirectory };
+        }
+        function getLocalModuleSpecifier(moduleFileName, _a, compilerOptions, _b) {
+            var getCanonicalFileName = _a.getCanonicalFileName, sourceDirectory = _a.sourceDirectory;
+            var ending = _b.ending, relativePreference = _b.relativePreference;
+            var baseUrl = compilerOptions.baseUrl, paths = compilerOptions.paths, rootDirs = compilerOptions.rootDirs;
+            var relativePath = rootDirs && tryGetModuleNameFromRootDirs(rootDirs, moduleFileName, sourceDirectory, getCanonicalFileName) ||
+                removeExtensionAndIndexPostFix(ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(sourceDirectory, moduleFileName, getCanonicalFileName)), ending, compilerOptions);
+            if (!baseUrl || relativePreference === 0 /* Relative */) {
+                return relativePath;
+            }
+            var relativeToBaseUrl = getRelativePathIfInDirectory(moduleFileName, baseUrl, getCanonicalFileName);
+            if (!relativeToBaseUrl) {
+                return relativePath;
+            }
+            var importRelativeToBaseUrl = removeExtensionAndIndexPostFix(relativeToBaseUrl, ending, compilerOptions);
+            var fromPaths = paths && tryGetModuleNameFromPaths(ts.removeFileExtension(relativeToBaseUrl), importRelativeToBaseUrl, paths);
+            var nonRelative = fromPaths === undefined ? importRelativeToBaseUrl : fromPaths;
+            if (relativePreference === 1 /* NonRelative */) {
+                return nonRelative;
+            }
+            if (relativePreference !== 2 /* Auto */)
+                ts.Debug.assertNever(relativePreference);
+            // Prefer a relative import over a baseUrl import if it has fewer components.
+            return isPathRelativeToParent(nonRelative) || countPathComponents(relativePath) < countPathComponents(nonRelative) ? relativePath : nonRelative;
+        }
+        function countPathComponents(path) {
+            var count = 0;
+            for (var i = ts.startsWith(path, "./") ? 2 : 0; i < path.length; i++) {
+                if (path.charCodeAt(i) === 47 /* slash */)
+                    count++;
+            }
+            return count;
+        }
+        moduleSpecifiers.countPathComponents = countPathComponents;
+        function usesJsExtensionOnImports(_a) {
+            var imports = _a.imports;
+            return ts.firstDefined(imports, function (_a) {
+                var text = _a.text;
+                return ts.pathIsRelative(text) ? ts.hasJSOrJsonFileExtension(text) : undefined;
+            }) || false;
+        }
+        function stringsEqual(a, b, getCanonicalFileName) {
+            return getCanonicalFileName(a) === getCanonicalFileName(b);
+        }
+        // KLUDGE: Don't assume one 'node_modules' links to another. More likely a single directory inside the node_modules is the symlink.
+        // ALso, don't assume that an `@foo` directory is linked. More likely the contents of that are linked.
+        function isNodeModulesOrScopedPackageDirectory(s, getCanonicalFileName) {
+            return getCanonicalFileName(s) === "node_modules" || ts.startsWith(s, "@");
+        }
+        function guessDirectorySymlink(a, b, cwd, getCanonicalFileName) {
+            var aParts = ts.getPathComponents(ts.toPath(a, cwd, getCanonicalFileName));
+            var bParts = ts.getPathComponents(ts.toPath(b, cwd, getCanonicalFileName));
+            while (!isNodeModulesOrScopedPackageDirectory(aParts[aParts.length - 2], getCanonicalFileName) &&
+                !isNodeModulesOrScopedPackageDirectory(bParts[bParts.length - 2], getCanonicalFileName) &&
+                stringsEqual(aParts[aParts.length - 1], bParts[bParts.length - 1], getCanonicalFileName)) {
+                aParts.pop();
+                bParts.pop();
+            }
+            return [ts.getPathFromPathComponents(aParts), ts.getPathFromPathComponents(bParts)];
+        }
+        function discoverProbableSymlinks(files, getCanonicalFileName, cwd) {
+            var result = ts.createMap();
+            var symlinks = ts.mapDefined(files, function (sf) {
+                return sf.resolvedModules && ts.firstDefinedIterator(sf.resolvedModules.values(), function (res) {
+                    return res && res.originalPath && res.resolvedFileName !== res.originalPath ? [res.resolvedFileName, res.originalPath] : undefined;
+                });
+            });
+            for (var _i = 0, symlinks_1 = symlinks; _i < symlinks_1.length; _i++) {
+                var _a = symlinks_1[_i], resolvedPath = _a[0], originalPath = _a[1];
+                var _b = guessDirectorySymlink(resolvedPath, originalPath, cwd, getCanonicalFileName), commonResolved = _b[0], commonOriginal = _b[1];
+                result.set(commonOriginal, commonResolved);
+            }
+            return result;
+        }
+        /**
+         * Looks for existing imports that use symlinks to this module.
+         * Symlinks will be returned first so they are preferred over the real path.
+         */
+        function getAllModulePaths(files, importingFileName, importedFileName, getCanonicalFileName, host, redirectTargetsMap) {
+            var redirects = redirectTargetsMap.get(importedFileName);
+            var importedFileNames = redirects ? redirects.concat([importedFileName]) : [importedFileName];
+            var cwd = host.getCurrentDirectory ? host.getCurrentDirectory() : "";
+            var targets = importedFileNames.map(function (f) { return ts.getNormalizedAbsolutePath(f, cwd); });
+            var links = discoverProbableSymlinks(files, getCanonicalFileName, cwd);
+            var result = [];
+            var compareStrings = (!host.useCaseSensitiveFileNames || host.useCaseSensitiveFileNames()) ? ts.compareStringsCaseSensitive : ts.compareStringsCaseInsensitive;
+            links.forEach(function (resolved, path) {
+                if (ts.startsWithDirectory(importingFileName, resolved, getCanonicalFileName)) {
+                    return; // Don't want to a package to globally import from itself
+                }
+                var target = ts.find(targets, function (t) { return compareStrings(t.slice(0, resolved.length + 1), resolved + "/") === 0 /* EqualTo */; });
+                if (target === undefined)
+                    return;
+                var relative = ts.getRelativePathFromDirectory(resolved, target, getCanonicalFileName);
+                var option = ts.resolvePath(path, relative);
+                if (!host.fileExists || host.fileExists(option)) {
+                    result.push(option);
+                }
+            });
+            result.push.apply(result, targets);
+            return result;
+        }
+        function tryGetModuleNameFromAmbientModule(moduleSymbol) {
+            var decl = ts.find(moduleSymbol.declarations, function (d) { return ts.isNonGlobalAmbientModule(d) && (!ts.isExternalModuleAugmentation(d) || !ts.isExternalModuleNameRelative(ts.getTextOfIdentifierOrLiteral(d.name))); });
+            if (decl) {
+                return decl.name.text;
+            }
+        }
+        function tryGetModuleNameFromPaths(relativeToBaseUrlWithIndex, relativeToBaseUrl, paths) {
+            for (var key in paths) {
+                for (var _i = 0, _a = paths[key]; _i < _a.length; _i++) {
+                    var patternText_1 = _a[_i];
+                    var pattern = ts.removeFileExtension(ts.normalizePath(patternText_1));
+                    var indexOfStar = pattern.indexOf("*");
+                    if (indexOfStar !== -1) {
+                        var prefix = pattern.substr(0, indexOfStar);
+                        var suffix = pattern.substr(indexOfStar + 1);
+                        if (relativeToBaseUrl.length >= prefix.length + suffix.length &&
+                            ts.startsWith(relativeToBaseUrl, prefix) &&
+                            ts.endsWith(relativeToBaseUrl, suffix) ||
+                            !suffix && relativeToBaseUrl === ts.removeTrailingDirectorySeparator(prefix)) {
+                            var matchedStar = relativeToBaseUrl.substr(prefix.length, relativeToBaseUrl.length - suffix.length);
+                            return key.replace("*", matchedStar);
+                        }
+                    }
+                    else if (pattern === relativeToBaseUrl || pattern === relativeToBaseUrlWithIndex) {
+                        return key;
+                    }
+                }
+            }
+        }
+        function tryGetModuleNameFromRootDirs(rootDirs, moduleFileName, sourceDirectory, getCanonicalFileName) {
+            var normalizedTargetPath = getPathRelativeToRootDirs(moduleFileName, rootDirs, getCanonicalFileName);
+            if (normalizedTargetPath === undefined) {
+                return undefined;
+            }
+            var normalizedSourcePath = getPathRelativeToRootDirs(sourceDirectory, rootDirs, getCanonicalFileName);
+            var relativePath = normalizedSourcePath !== undefined ? ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(normalizedSourcePath, normalizedTargetPath, getCanonicalFileName)) : normalizedTargetPath;
+            return ts.removeFileExtension(relativePath);
+        }
+        function tryGetModuleNameAsNodeModule(moduleFileName, _a, host, options) {
+            var getCanonicalFileName = _a.getCanonicalFileName, sourceDirectory = _a.sourceDirectory;
+            if (!host.fileExists || !host.readFile) {
+                return undefined;
+            }
+            var parts = getNodeModulePathParts(moduleFileName);
+            if (!parts) {
+                return undefined;
+            }
+            var packageRootPath = moduleFileName.substring(0, parts.packageRootIndex);
+            var packageJsonPath = ts.combinePaths(packageRootPath, "package.json");
+            var packageJsonContent = host.fileExists(packageJsonPath)
+                ? JSON.parse(host.readFile(packageJsonPath))
+                : undefined;
+            var versionPaths = packageJsonContent && packageJsonContent.typesVersions
+                ? ts.getPackageJsonTypesVersionsPaths(packageJsonContent.typesVersions)
+                : undefined;
+            if (versionPaths) {
+                var subModuleName = moduleFileName.slice(parts.packageRootIndex + 1);
+                var fromPaths = tryGetModuleNameFromPaths(ts.removeFileExtension(subModuleName), removeExtensionAndIndexPostFix(subModuleName, 0 /* Minimal */, options), versionPaths.paths);
+                if (fromPaths !== undefined) {
+                    moduleFileName = ts.combinePaths(moduleFileName.slice(0, parts.packageRootIndex), fromPaths);
+                }
+            }
+            // Simplify the full file path to something that can be resolved by Node.
+            // If the module could be imported by a directory name, use that directory's name
+            var moduleSpecifier = getDirectoryOrExtensionlessFileName(moduleFileName);
+            // Get a path that's relative to node_modules or the importing file's path
+            // if node_modules folder is in this folder or any of its parent folders, no need to keep it.
+            if (!ts.startsWith(sourceDirectory, getCanonicalFileName(moduleSpecifier.substring(0, parts.topLevelNodeModulesIndex))))
+                return undefined;
+            // If the module was found in @types, get the actual Node package name
+            var nodeModulesDirectoryName = moduleSpecifier.substring(parts.topLevelPackageNameIndex + 1);
+            var packageName = ts.getPackageNameFromTypesPackageName(nodeModulesDirectoryName);
+            // For classic resolution, only allow importing from node_modules/@types, not other node_modules
+            return ts.getEmitModuleResolutionKind(options) !== ts.ModuleResolutionKind.NodeJs && packageName === nodeModulesDirectoryName ? undefined : packageName;
+            function getDirectoryOrExtensionlessFileName(path) {
+                // If the file is the main module, it can be imported by the package name
+                if (packageJsonContent) {
+                    var mainFileRelative = packageJsonContent.typings || packageJsonContent.types || packageJsonContent.main;
+                    if (mainFileRelative) {
+                        var mainExportFile = ts.toPath(mainFileRelative, packageRootPath, getCanonicalFileName);
+                        if (ts.removeFileExtension(mainExportFile) === ts.removeFileExtension(getCanonicalFileName(path))) {
+                            return packageRootPath;
+                        }
+                    }
+                }
+                // We still have a file name - remove the extension
+                var fullModulePathWithoutExtension = ts.removeFileExtension(path);
+                // If the file is /index, it can be imported by its directory name
+                // IFF there is not _also_ a file by the same name
+                if (getCanonicalFileName(fullModulePathWithoutExtension.substring(parts.fileNameIndex)) === "/index" && !tryGetAnyFileFromPath(host, fullModulePathWithoutExtension.substring(0, parts.fileNameIndex))) {
+                    return fullModulePathWithoutExtension.substring(0, parts.fileNameIndex);
+                }
+                return fullModulePathWithoutExtension;
+            }
+        }
+        function tryGetAnyFileFromPath(host, path) {
+            if (!host.fileExists)
+                return;
+            // We check all js, `node` and `json` extensions in addition to TS, since node module resolution would also choose those over the directory
+            var extensions = ts.getSupportedExtensions({ allowJs: true }, [{ extension: "node", isMixedContent: false }, { extension: "json", isMixedContent: false, scriptKind: 6 /* JSON */ }]);
+            for (var _i = 0, extensions_3 = extensions; _i < extensions_3.length; _i++) {
+                var e = extensions_3[_i];
+                var fullPath = path + e;
+                if (host.fileExists(fullPath)) {
+                    return fullPath;
+                }
+            }
+        }
+        function getNodeModulePathParts(fullPath) {
+            // If fullPath can't be valid module file within node_modules, returns undefined.
+            // Example of expected pattern: /base/path/node_modules/[@scope/otherpackage/@otherscope/node_modules/]package/[subdirectory/]file.js
+            // Returns indices:                       ^            ^                                                      ^             ^
+            var topLevelNodeModulesIndex = 0;
+            var topLevelPackageNameIndex = 0;
+            var packageRootIndex = 0;
+            var fileNameIndex = 0;
+            var States;
+            (function (States) {
+                States[States["BeforeNodeModules"] = 0] = "BeforeNodeModules";
+                States[States["NodeModules"] = 1] = "NodeModules";
+                States[States["Scope"] = 2] = "Scope";
+                States[States["PackageContent"] = 3] = "PackageContent";
+            })(States || (States = {}));
+            var partStart = 0;
+            var partEnd = 0;
+            var state = 0 /* BeforeNodeModules */;
+            while (partEnd >= 0) {
+                partStart = partEnd;
+                partEnd = fullPath.indexOf("/", partStart + 1);
+                switch (state) {
+                    case 0 /* BeforeNodeModules */:
+                        if (fullPath.indexOf(ts.nodeModulesPathPart, partStart) === partStart) {
+                            topLevelNodeModulesIndex = partStart;
+                            topLevelPackageNameIndex = partEnd;
+                            state = 1 /* NodeModules */;
+                        }
+                        break;
+                    case 1 /* NodeModules */:
+                    case 2 /* Scope */:
+                        if (state === 1 /* NodeModules */ && fullPath.charAt(partStart + 1) === "@") {
+                            state = 2 /* Scope */;
+                        }
+                        else {
+                            packageRootIndex = partEnd;
+                            state = 3 /* PackageContent */;
+                        }
+                        break;
+                    case 3 /* PackageContent */:
+                        if (fullPath.indexOf(ts.nodeModulesPathPart, partStart) === partStart) {
+                            state = 1 /* NodeModules */;
+                        }
+                        else {
+                            state = 3 /* PackageContent */;
+                        }
+                        break;
+                }
+            }
+            fileNameIndex = partStart;
+            return state > 1 /* NodeModules */ ? { topLevelNodeModulesIndex: topLevelNodeModulesIndex, topLevelPackageNameIndex: topLevelPackageNameIndex, packageRootIndex: packageRootIndex, fileNameIndex: fileNameIndex } : undefined;
+        }
+        function getPathRelativeToRootDirs(path, rootDirs, getCanonicalFileName) {
+            return ts.firstDefined(rootDirs, function (rootDir) {
+                var relativePath = getRelativePathIfInDirectory(path, rootDir, getCanonicalFileName); // TODO: GH#18217
+                return isPathRelativeToParent(relativePath) ? undefined : relativePath;
+            });
+        }
+        function removeExtensionAndIndexPostFix(fileName, ending, options) {
+            if (ts.fileExtensionIs(fileName, ".json" /* Json */))
+                return fileName;
+            var noExtension = ts.removeFileExtension(fileName);
+            switch (ending) {
+                case 0 /* Minimal */:
+                    return ts.removeSuffix(noExtension, "/index");
+                case 1 /* Index */:
+                    return noExtension;
+                case 2 /* JsExtension */:
+                    return noExtension + getJSExtensionForFile(fileName, options);
+                default:
+                    return ts.Debug.assertNever(ending);
+            }
+        }
+        function getJSExtensionForFile(fileName, options) {
+            var ext = ts.extensionFromPath(fileName);
+            switch (ext) {
+                case ".ts" /* Ts */:
+                case ".d.ts" /* Dts */:
+                    return ".js" /* Js */;
+                case ".tsx" /* Tsx */:
+                    return options.jsx === 1 /* Preserve */ ? ".jsx" /* Jsx */ : ".js" /* Js */;
+                case ".js" /* Js */:
+                case ".jsx" /* Jsx */:
+                case ".json" /* Json */:
+                    return ext;
+                default:
+                    return ts.Debug.assertNever(ext);
+            }
+        }
+        function getRelativePathIfInDirectory(path, directoryPath, getCanonicalFileName) {
+            var relativePath = ts.getRelativePathToDirectoryOrUrl(directoryPath, path, directoryPath, getCanonicalFileName, /*isAbsolutePathAnUrl*/ false);
+            return ts.isRootedDiskPath(relativePath) ? undefined : relativePath;
+        }
+        function isPathRelativeToParent(path) {
+            return ts.startsWith(path, "..");
+        }
+    })(moduleSpecifiers = ts.moduleSpecifiers || (ts.moduleSpecifiers = {}));
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
+(function (ts) {
+    var sysFormatDiagnosticsHost = ts.sys ? {
+        getCurrentDirectory: function () { return ts.sys.getCurrentDirectory(); },
+        getNewLine: function () { return ts.sys.newLine; },
+        getCanonicalFileName: ts.createGetCanonicalFileName(ts.sys.useCaseSensitiveFileNames)
+    } : undefined; // TODO: GH#18217
+    /**
+     * Create a function that reports error by writing to the system and handles the formating of the diagnostic
+     */
+    function createDiagnosticReporter(system, pretty) {
+        var host = system === ts.sys ? sysFormatDiagnosticsHost : {
+            getCurrentDirectory: function () { return system.getCurrentDirectory(); },
+            getNewLine: function () { return system.newLine; },
+            getCanonicalFileName: ts.createGetCanonicalFileName(system.useCaseSensitiveFileNames),
+        };
+        if (!pretty) {
+            return function (diagnostic) { return system.write(ts.formatDiagnostic(diagnostic, host)); };
+        }
+        var diagnostics = new Array(1);
+        return function (diagnostic) {
+            diagnostics[0] = diagnostic;
+            system.write(ts.formatDiagnosticsWithColorAndContext(diagnostics, host) + host.getNewLine());
+            diagnostics[0] = undefined; // TODO: GH#18217
+        };
+    }
+    ts.createDiagnosticReporter = createDiagnosticReporter;
+    /**
+     * @returns Whether the screen was cleared.
+     */
+    function clearScreenIfNotWatchingForFileChanges(system, diagnostic, options) {
+        if (system.clearScreen &&
+            !options.preserveWatchOutput &&
+            !options.extendedDiagnostics &&
+            !options.diagnostics &&
+            ts.contains(ts.screenStartingMessageCodes, diagnostic.code)) {
+            system.clearScreen();
+            return true;
+        }
+        return false;
+    }
+    ts.screenStartingMessageCodes = [
+        ts.Diagnostics.Starting_compilation_in_watch_mode.code,
+        ts.Diagnostics.File_change_detected_Starting_incremental_compilation.code,
+    ];
+    function getPlainDiagnosticFollowingNewLines(diagnostic, newLine) {
+        return ts.contains(ts.screenStartingMessageCodes, diagnostic.code)
+            ? newLine + newLine
+            : newLine;
+    }
+    /**
+     * Create a function that reports watch status by writing to the system and handles the formating of the diagnostic
+     */
+    function createWatchStatusReporter(system, pretty) {
+        return pretty ?
+            function (diagnostic, newLine, options) {
+                clearScreenIfNotWatchingForFileChanges(system, diagnostic, options);
+                var output = "[" + ts.formatColorAndReset(new Date().toLocaleTimeString(), ts.ForegroundColorEscapeSequences.Grey) + "] ";
+                output += "" + ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine) + (newLine + newLine);
+                system.write(output);
+            } :
+            function (diagnostic, newLine, options) {
+                var output = "";
+                if (!clearScreenIfNotWatchingForFileChanges(system, diagnostic, options)) {
+                    output += newLine;
+                }
+                output += new Date().toLocaleTimeString() + " - ";
+                output += "" + ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine) + getPlainDiagnosticFollowingNewLines(diagnostic, newLine);
+                system.write(output);
+            };
+    }
+    ts.createWatchStatusReporter = createWatchStatusReporter;
+    /** Parses config file using System interface */
+    function parseConfigFileWithSystem(configFileName, optionsToExtend, system, reportDiagnostic) {
+        var host = system;
+        host.onUnRecoverableConfigFileDiagnostic = function (diagnostic) { return reportUnrecoverableDiagnostic(ts.sys, reportDiagnostic, diagnostic); };
+        var result = ts.getParsedCommandLineOfConfigFile(configFileName, optionsToExtend, host);
+        host.onUnRecoverableConfigFileDiagnostic = undefined; // TODO: GH#18217
+        return result;
+    }
+    ts.parseConfigFileWithSystem = parseConfigFileWithSystem;
+    function getErrorCountForSummary(diagnostics) {
+        return ts.countWhere(diagnostics, function (diagnostic) { return diagnostic.category === ts.DiagnosticCategory.Error; });
+    }
+    ts.getErrorCountForSummary = getErrorCountForSummary;
+    function getWatchErrorSummaryDiagnosticMessage(errorCount) {
+        return errorCount === 1 ?
+            ts.Diagnostics.Found_1_error_Watching_for_file_changes :
+            ts.Diagnostics.Found_0_errors_Watching_for_file_changes;
+    }
+    ts.getWatchErrorSummaryDiagnosticMessage = getWatchErrorSummaryDiagnosticMessage;
+    function getErrorSummaryText(errorCount, newLine) {
+        if (errorCount === 0)
+            return "";
+        var d = ts.createCompilerDiagnostic(errorCount === 1 ? ts.Diagnostics.Found_1_error : ts.Diagnostics.Found_0_errors, errorCount);
+        return "" + newLine + ts.flattenDiagnosticMessageText(d.messageText, newLine) + newLine + newLine;
+    }
+    ts.getErrorSummaryText = getErrorSummaryText;
+    /**
+     * Helper that emit files, report diagnostics and lists emitted and/or source files depending on compiler options
+     */
+    function emitFilesAndReportErrors(program, reportDiagnostic, writeFileName, reportSummary, writeFile) {
+        // First get and report any syntactic errors.
+        var diagnostics = program.getConfigFileParsingDiagnostics().slice();
+        var configFileParsingDiagnosticsLength = diagnostics.length;
+        ts.addRange(diagnostics, program.getSyntacticDiagnostics());
+        var reportSemanticDiagnostics = false;
+        // If we didn't have any syntactic errors, then also try getting the global and
+        // semantic errors.
+        if (diagnostics.length === configFileParsingDiagnosticsLength) {
+            ts.addRange(diagnostics, program.getOptionsDiagnostics());
+            ts.addRange(diagnostics, program.getGlobalDiagnostics());
+            if (diagnostics.length === configFileParsingDiagnosticsLength) {
+                reportSemanticDiagnostics = true;
+            }
+        }
+        // Emit and report any errors we ran into.
+        var _a = program.emit(/*targetSourceFile*/ undefined, writeFile), emittedFiles = _a.emittedFiles, emitSkipped = _a.emitSkipped, emitDiagnostics = _a.diagnostics;
+        ts.addRange(diagnostics, emitDiagnostics);
+        if (reportSemanticDiagnostics) {
+            ts.addRange(diagnostics, program.getSemanticDiagnostics());
+        }
+        ts.sortAndDeduplicateDiagnostics(diagnostics).forEach(reportDiagnostic);
+        if (writeFileName) {
+            var currentDir_1 = program.getCurrentDirectory();
+            ts.forEach(emittedFiles, function (file) {
+                var filepath = ts.getNormalizedAbsolutePath(file, currentDir_1);
+                writeFileName("TSFILE: " + filepath);
+            });
+            if (program.getCompilerOptions().listFiles) {
+                ts.forEach(program.getSourceFiles(), function (file) {
+                    writeFileName(file.fileName);
+                });
+            }
+        }
+        if (reportSummary) {
+            reportSummary(getErrorCountForSummary(diagnostics));
+        }
+        if (emitSkipped && diagnostics.length > 0) {
+            // If the emitter didn't emit anything, then pass that value along.
+            return ts.ExitStatus.DiagnosticsPresent_OutputsSkipped;
+        }
+        else if (diagnostics.length > 0) {
+            // The emitter emitted something, inform the caller if that happened in the presence
+            // of diagnostics or not.
+            return ts.ExitStatus.DiagnosticsPresent_OutputsGenerated;
+        }
+        return ts.ExitStatus.Success;
+    }
+    ts.emitFilesAndReportErrors = emitFilesAndReportErrors;
+    var noopFileWatcher = { close: ts.noop };
+    function createWatchHost(system, reportWatchStatus) {
+        if (system === void 0) { system = ts.sys; }
+        var onWatchStatusChange = reportWatchStatus || createWatchStatusReporter(system);
+        return {
+            onWatchStatusChange: onWatchStatusChange,
+            watchFile: ts.maybeBind(system, system.watchFile) || (function () { return noopFileWatcher; }),
+            watchDirectory: ts.maybeBind(system, system.watchDirectory) || (function () { return noopFileWatcher; }),
+            setTimeout: ts.maybeBind(system, system.setTimeout) || ts.noop,
+            clearTimeout: ts.maybeBind(system, system.clearTimeout) || ts.noop
+        };
+    }
+    ts.createWatchHost = createWatchHost;
+    var WatchType;
+    (function (WatchType) {
+        WatchType["ConfigFile"] = "Config file";
+        WatchType["SourceFile"] = "Source file";
+        WatchType["MissingFile"] = "Missing file";
+        WatchType["WildcardDirectory"] = "Wild card directory";
+        WatchType["FailedLookupLocations"] = "Failed Lookup Locations";
+        WatchType["TypeRoots"] = "Type roots";
+    })(WatchType = ts.WatchType || (ts.WatchType = {}));
+    function createWatchFactory(host, options) {
+        var watchLogLevel = host.trace ? options.extendedDiagnostics ? ts.WatchLogLevel.Verbose : options.diagnostics ? ts.WatchLogLevel.TriggerOnly : ts.WatchLogLevel.None : ts.WatchLogLevel.None;
+        var writeLog = watchLogLevel !== ts.WatchLogLevel.None ? (function (s) { return host.trace(s); }) : ts.noop;
+        var result = ts.getWatchFactory(watchLogLevel, writeLog);
+        result.writeLog = writeLog;
+        return result;
+    }
+    ts.createWatchFactory = createWatchFactory;
+    function createCompilerHostFromProgramHost(host, getCompilerOptions, directoryStructureHost) {
+        if (directoryStructureHost === void 0) { directoryStructureHost = host; }
+        var useCaseSensitiveFileNames = host.useCaseSensitiveFileNames();
+        var hostGetNewLine = ts.memoize(function () { return host.getNewLine(); });
+        return {
+            getSourceFile: function (fileName, languageVersion, onError) {
+                var text;
+                try {
+                    ts.performance.mark("beforeIORead");
+                    text = host.readFile(fileName, getCompilerOptions().charset);
+                    ts.performance.mark("afterIORead");
+                    ts.performance.measure("I/O Read", "beforeIORead", "afterIORead");
+                }
+                catch (e) {
+                    if (onError) {
+                        onError(e.message);
+                    }
+                    text = "";
+                }
+                return text !== undefined ? ts.createSourceFile(fileName, text, languageVersion) : undefined;
+            },
+            getDefaultLibLocation: ts.maybeBind(host, host.getDefaultLibLocation),
+            getDefaultLibFileName: function (options) { return host.getDefaultLibFileName(options); },
+            writeFile: writeFile,
+            getCurrentDirectory: ts.memoize(function () { return host.getCurrentDirectory(); }),
+            useCaseSensitiveFileNames: function () { return useCaseSensitiveFileNames; },
+            getCanonicalFileName: ts.createGetCanonicalFileName(useCaseSensitiveFileNames),
+            getNewLine: function () { return ts.getNewLineCharacter(getCompilerOptions(), hostGetNewLine); },
+            fileExists: function (f) { return host.fileExists(f); },
+            readFile: function (f) { return host.readFile(f); },
+            trace: ts.maybeBind(host, host.trace),
+            directoryExists: ts.maybeBind(directoryStructureHost, directoryStructureHost.directoryExists),
+            getDirectories: ts.maybeBind(directoryStructureHost, directoryStructureHost.getDirectories),
+            realpath: ts.maybeBind(host, host.realpath),
+            getEnvironmentVariable: ts.maybeBind(host, host.getEnvironmentVariable) || (function () { return ""; }),
+            createHash: ts.maybeBind(host, host.createHash),
+            readDirectory: ts.maybeBind(host, host.readDirectory),
+        };
+        function ensureDirectoriesExist(directoryPath) {
+            if (directoryPath.length > ts.getRootLength(directoryPath) && !host.directoryExists(directoryPath)) {
+                var parentDirectory = ts.getDirectoryPath(directoryPath);
+                ensureDirectoriesExist(parentDirectory);
+                if (host.createDirectory)
+                    host.createDirectory(directoryPath);
+            }
+        }
+        function writeFile(fileName, text, writeByteOrderMark, onError) {
+            try {
+                ts.performance.mark("beforeIOWrite");
+                ensureDirectoriesExist(ts.getDirectoryPath(ts.normalizePath(fileName)));
+                host.writeFile(fileName, text, writeByteOrderMark);
+                ts.performance.mark("afterIOWrite");
+                ts.performance.measure("I/O Write", "beforeIOWrite", "afterIOWrite");
+            }
+            catch (e) {
+                if (onError) {
+                    onError(e.message);
+                }
+            }
+        }
+    }
+    ts.createCompilerHostFromProgramHost = createCompilerHostFromProgramHost;
+    /**
+     * Creates the watch compiler host that can be extended with config file or root file names and options host
+     */
+    function createProgramHost(system, createProgram) {
+        var getDefaultLibLocation = ts.memoize(function () { return ts.getDirectoryPath(ts.normalizePath(system.getExecutingFilePath())); });
+        var host = system;
+        host; // tslint:disable-line no-unused-expression (TODO: `host` is unused!)
+        return {
+            useCaseSensitiveFileNames: function () { return system.useCaseSensitiveFileNames; },
+            getNewLine: function () { return system.newLine; },
+            getCurrentDirectory: ts.memoize(function () { return system.getCurrentDirectory(); }),
+            getDefaultLibLocation: getDefaultLibLocation,
+            getDefaultLibFileName: function (options) { return ts.combinePaths(getDefaultLibLocation(), ts.getDefaultLibFileName(options)); },
+            fileExists: function (path) { return system.fileExists(path); },
+            readFile: function (path, encoding) { return system.readFile(path, encoding); },
+            directoryExists: function (path) { return system.directoryExists(path); },
+            getDirectories: function (path) { return system.getDirectories(path); },
+            readDirectory: function (path, extensions, exclude, include, depth) { return system.readDirectory(path, extensions, exclude, include, depth); },
+            realpath: ts.maybeBind(system, system.realpath),
+            getEnvironmentVariable: ts.maybeBind(system, system.getEnvironmentVariable),
+            trace: function (s) { return system.write(s + system.newLine); },
+            createDirectory: function (path) { return system.createDirectory(path); },
+            writeFile: function (path, data, writeByteOrderMark) { return system.writeFile(path, data, writeByteOrderMark); },
+            onCachedDirectoryStructureHostCreate: function (cacheHost) { return host = cacheHost || system; },
+            createHash: ts.maybeBind(system, system.createHash),
+            createProgram: createProgram
+        };
+    }
+    ts.createProgramHost = createProgramHost;
+    /**
+     * Creates the watch compiler host that can be extended with config file or root file names and options host
+     */
+    function createWatchCompilerHost(system, createProgram, reportDiagnostic, reportWatchStatus) {
+        if (system === void 0) { system = ts.sys; }
+        var writeFileName = function (s) { return system.write(s + system.newLine); };
+        var result = createProgramHost(system, createProgram || ts.createEmitAndSemanticDiagnosticsBuilderProgram);
+        ts.copyProperties(result, createWatchHost(system, reportWatchStatus));
+        result.afterProgramCreate = function (builderProgram) {
+            var compilerOptions = builderProgram.getCompilerOptions();
+            var newLine = ts.getNewLineCharacter(compilerOptions, function () { return system.newLine; });
+            emitFilesAndReportErrors(builderProgram, reportDiagnostic, writeFileName, function (errorCount) { return result.onWatchStatusChange(ts.createCompilerDiagnostic(getWatchErrorSummaryDiagnosticMessage(errorCount), errorCount), newLine, compilerOptions); });
+        };
+        return result;
+    }
+    /**
+     * Report error and exit
+     */
+    function reportUnrecoverableDiagnostic(system, reportDiagnostic, diagnostic) {
+        reportDiagnostic(diagnostic);
+        system.exit(ts.ExitStatus.DiagnosticsPresent_OutputsSkipped);
+    }
+    /**
+     * Creates the watch compiler host from system for config file in watch mode
+     */
+    function createWatchCompilerHostOfConfigFile(configFileName, optionsToExtend, system, createProgram, reportDiagnostic, reportWatchStatus) {
+        var diagnosticReporter = reportDiagnostic || createDiagnosticReporter(system);
+        var host = createWatchCompilerHost(system, createProgram, diagnosticReporter, reportWatchStatus);
+        host.onUnRecoverableConfigFileDiagnostic = function (diagnostic) { return reportUnrecoverableDiagnostic(system, diagnosticReporter, diagnostic); };
+        host.configFileName = configFileName;
+        host.optionsToExtend = optionsToExtend;
+        return host;
+    }
+    ts.createWatchCompilerHostOfConfigFile = createWatchCompilerHostOfConfigFile;
+    /**
+     * Creates the watch compiler host from system for compiling root files and options in watch mode
+     */
+    function createWatchCompilerHostOfFilesAndCompilerOptions(rootFiles, options, system, createProgram, reportDiagnostic, reportWatchStatus, projectReferences) {
+        var host = createWatchCompilerHost(system, createProgram, reportDiagnostic || createDiagnosticReporter(system), reportWatchStatus);
+        host.rootFiles = rootFiles;
+        host.options = options;
+        host.projectReferences = projectReferences;
+        return host;
+    }
+    ts.createWatchCompilerHostOfFilesAndCompilerOptions = createWatchCompilerHostOfFilesAndCompilerOptions;
+})(ts || (ts = {}));
+(function (ts) {
+    function createWatchCompilerHost(rootFilesOrConfigFileName, options, system, createProgram, reportDiagnostic, reportWatchStatus, projectReferences) {
+        if (ts.isArray(rootFilesOrConfigFileName)) {
+            return ts.createWatchCompilerHostOfFilesAndCompilerOptions(rootFilesOrConfigFileName, options, system, createProgram, reportDiagnostic, reportWatchStatus, projectReferences); // TODO: GH#18217
+        }
+        else {
+            return ts.createWatchCompilerHostOfConfigFile(rootFilesOrConfigFileName, options, system, createProgram, reportDiagnostic, reportWatchStatus);
+        }
+    }
+    ts.createWatchCompilerHost = createWatchCompilerHost;
+    var initialVersion = 1;
+    function createWatchProgram(host) {
+        var builderProgram;
+        var reloadLevel; // level to indicate if the program needs to be reloaded from config file/just filenames etc
+        var missingFilesMap; // Map of file watchers for the missing files
+        var watchedWildcardDirectories; // map of watchers for the wild card directories in the config file
+        var timerToUpdateProgram; // timer callback to recompile the program
+        var sourceFilesCache = ts.createMap(); // Cache that stores the source file and version info
+        var missingFilePathsRequestedForRelease; // These paths are held temparirly so that we can remove the entry from source file cache if the file is not tracked by missing files
+        var hasChangedCompilerOptions = false; // True if the compiler options have changed between compilations
+        var hasChangedAutomaticTypeDirectiveNames = false; // True if the automatic type directives have changed
+        var useCaseSensitiveFileNames = host.useCaseSensitiveFileNames();
+        var currentDirectory = host.getCurrentDirectory();
+        var configFileName = host.configFileName, _a = host.optionsToExtend, optionsToExtendForConfigFile = _a === void 0 ? {} : _a, createProgram = host.createProgram;
+        var rootFileNames = host.rootFiles, compilerOptions = host.options, projectReferences = host.projectReferences;
+        var configFileSpecs;
+        var configFileParsingDiagnostics;
+        var canConfigFileJsonReportNoInputFiles = false;
+        var hasChangedConfigFileParsingErrors = false;
+        var cachedDirectoryStructureHost = configFileName === undefined ? undefined : ts.createCachedDirectoryStructureHost(host, currentDirectory, useCaseSensitiveFileNames);
+        if (cachedDirectoryStructureHost && host.onCachedDirectoryStructureHostCreate) {
+            host.onCachedDirectoryStructureHostCreate(cachedDirectoryStructureHost);
+        }
+        var directoryStructureHost = cachedDirectoryStructureHost || host;
+        var parseConfigFileHost = ts.parseConfigHostFromCompilerHostLike(host, directoryStructureHost);
+        // From tsc we want to get already parsed result and hence check for rootFileNames
+        var newLine = updateNewLine();
+        if (configFileName && host.configFileParsingResult) {
+            setConfigFileParsingResult(host.configFileParsingResult);
+            newLine = updateNewLine();
+        }
+        reportWatchDiagnostic(ts.Diagnostics.Starting_compilation_in_watch_mode);
+        if (configFileName && !host.configFileParsingResult) {
+            newLine = ts.getNewLineCharacter(optionsToExtendForConfigFile, function () { return host.getNewLine(); });
+            ts.Debug.assert(!rootFileNames);
+            parseConfigFile();
+            newLine = updateNewLine();
+        }
+        var _b = ts.createWatchFactory(host, compilerOptions), watchFile = _b.watchFile, watchFilePath = _b.watchFilePath, watchDirectory = _b.watchDirectory, writeLog = _b.writeLog;
+        var getCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
+        writeLog("Current directory: " + currentDirectory + " CaseSensitiveFileNames: " + useCaseSensitiveFileNames);
+        if (configFileName) {
+            watchFile(host, configFileName, scheduleProgramReload, ts.PollingInterval.High, "Config file" /* ConfigFile */);
+        }
+        var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
+        // Members for CompilerHost
+        var getNewSourceFile = compilerHost.getSourceFile;
+        compilerHost.getSourceFile = function (fileName) {
+            var args = [];
+            for (var _i = 1; _i < arguments.length; _i++) {
+                args[_i - 1] = arguments[_i];
+            }
+            return getVersionedSourceFileByPath.apply(void 0, [fileName, toPath(fileName)].concat(args));
+        };
+        compilerHost.getSourceFileByPath = getVersionedSourceFileByPath;
+        compilerHost.getNewLine = function () { return newLine; };
+        compilerHost.fileExists = fileExists;
+        compilerHost.onReleaseOldSourceFile = onReleaseOldSourceFile;
+        // Members for ResolutionCacheHost
+        compilerHost.toPath = toPath;
+        compilerHost.getCompilationSettings = function () { return compilerOptions; };
+        compilerHost.watchDirectoryOfFailedLookupLocation = function (dir, cb, flags) { return watchDirectory(host, dir, cb, flags, "Failed Lookup Locations" /* FailedLookupLocations */); };
+        compilerHost.watchTypeRootsDirectory = function (dir, cb, flags) { return watchDirectory(host, dir, cb, flags, "Type roots" /* TypeRoots */); };
+        compilerHost.getCachedDirectoryStructureHost = function () { return cachedDirectoryStructureHost; };
+        compilerHost.onInvalidatedResolution = scheduleProgramUpdate;
+        compilerHost.onChangedAutomaticTypeDirectiveNames = function () {
+            hasChangedAutomaticTypeDirectiveNames = true;
+            scheduleProgramUpdate();
+        };
+        compilerHost.maxNumberOfFilesToIterateForInvalidation = host.maxNumberOfFilesToIterateForInvalidation;
+        compilerHost.getCurrentProgram = getCurrentProgram;
+        compilerHost.writeLog = writeLog;
+        // Cache for the module resolution
+        var resolutionCache = ts.createResolutionCache(compilerHost, configFileName ?
+            ts.getDirectoryPath(ts.getNormalizedAbsolutePath(configFileName, currentDirectory)) :
+            currentDirectory, 
+        /*logChangesWhenResolvingModule*/ false);
+        // Resolve module using host module resolution strategy if provided otherwise use resolution cache to resolve module names
+        compilerHost.resolveModuleNames = host.resolveModuleNames ?
+            (function (moduleNames, containingFile, reusedNames, redirectedReference) { return host.resolveModuleNames(moduleNames, containingFile, reusedNames, redirectedReference); }) :
+            (function (moduleNames, containingFile, reusedNames, redirectedReference) { return resolutionCache.resolveModuleNames(moduleNames, containingFile, reusedNames, redirectedReference); });
+        compilerHost.resolveTypeReferenceDirectives = host.resolveTypeReferenceDirectives ?
+            (function (typeDirectiveNames, containingFile, redirectedReference) { return host.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference); }) :
+            (function (typeDirectiveNames, containingFile, redirectedReference) { return resolutionCache.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference); });
+        var userProvidedResolution = !!host.resolveModuleNames || !!host.resolveTypeReferenceDirectives;
+        synchronizeProgram();
+        // Update the wild card directory watch
+        watchConfigFileWildCardDirectories();
+        return configFileName ?
+            { getCurrentProgram: getCurrentBuilderProgram, getProgram: synchronizeProgram } :
+            { getCurrentProgram: getCurrentBuilderProgram, getProgram: synchronizeProgram, updateRootFileNames: updateRootFileNames };
+        function getCurrentBuilderProgram() {
+            return builderProgram;
+        }
+        function getCurrentProgram() {
+            return builderProgram && builderProgram.getProgram();
+        }
+        function synchronizeProgram() {
+            writeLog("Synchronizing program");
+            var program = getCurrentProgram();
+            if (hasChangedCompilerOptions) {
+                newLine = updateNewLine();
+                if (program && ts.changesAffectModuleResolution(program.getCompilerOptions(), compilerOptions)) {
+                    resolutionCache.clear();
+                }
+            }
+            // All resolutions are invalid if user provided resolutions
+            var hasInvalidatedResolution = resolutionCache.createHasInvalidatedResolution(userProvidedResolution);
+            if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, projectReferences)) {
+                if (hasChangedConfigFileParsingErrors) {
+                    builderProgram = createProgram(/*rootNames*/ undefined, /*options*/ undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
+                    hasChangedConfigFileParsingErrors = false;
+                }
+            }
+            else {
+                createNewProgram(program, hasInvalidatedResolution);
+            }
+            if (host.afterProgramCreate) {
+                host.afterProgramCreate(builderProgram);
+            }
+            return builderProgram;
+        }
+        function createNewProgram(program, hasInvalidatedResolution) {
+            // Compile the program
+            writeLog("CreatingProgramWith::");
+            writeLog("  roots: " + JSON.stringify(rootFileNames));
+            writeLog("  options: " + JSON.stringify(compilerOptions));
+            var needsUpdateInTypeRootWatch = hasChangedCompilerOptions || !program;
+            hasChangedCompilerOptions = false;
+            hasChangedConfigFileParsingErrors = false;
+            resolutionCache.startCachingPerDirectoryResolution();
+            compilerHost.hasInvalidatedResolution = hasInvalidatedResolution;
+            compilerHost.hasChangedAutomaticTypeDirectiveNames = hasChangedAutomaticTypeDirectiveNames;
+            builderProgram = createProgram(rootFileNames, compilerOptions, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
+            resolutionCache.finishCachingPerDirectoryResolution();
+            // Update watches
+            ts.updateMissingFilePathsWatch(builderProgram.getProgram(), missingFilesMap || (missingFilesMap = ts.createMap()), watchMissingFilePath);
+            if (needsUpdateInTypeRootWatch) {
+                resolutionCache.updateTypeRootsWatch();
+            }
+            if (missingFilePathsRequestedForRelease) {
+                // These are the paths that program creater told us as not in use any more but were missing on the disk.
+                // We didnt remove the entry for them from sourceFiles cache so that we dont have to do File IO,
+                // if there is already watcher for it (for missing files)
+                // At this point our watches were updated, hence now we know that these paths are not tracked and need to be removed
+                // so that at later time we have correct result of their presence
+                for (var _i = 0, missingFilePathsRequestedForRelease_1 = missingFilePathsRequestedForRelease; _i < missingFilePathsRequestedForRelease_1.length; _i++) {
+                    var missingFilePath = missingFilePathsRequestedForRelease_1[_i];
+                    if (!missingFilesMap.has(missingFilePath)) {
+                        sourceFilesCache.delete(missingFilePath);
+                    }
+                }
+                missingFilePathsRequestedForRelease = undefined;
+            }
+        }
+        function updateRootFileNames(files) {
+            ts.Debug.assert(!configFileName, "Cannot update root file names with config file watch mode");
+            rootFileNames = files;
+            scheduleProgramUpdate();
+        }
+        function updateNewLine() {
+            return ts.getNewLineCharacter(compilerOptions || optionsToExtendForConfigFile, function () { return host.getNewLine(); });
+        }
+        function toPath(fileName) {
+            return ts.toPath(fileName, currentDirectory, getCanonicalFileName);
+        }
+        function isFileMissingOnHost(hostSourceFile) {
+            return typeof hostSourceFile === "number";
+        }
+        function isFilePresentOnHost(hostSourceFile) {
+            return !!hostSourceFile.sourceFile;
+        }
+        function fileExists(fileName) {
+            var path = toPath(fileName);
+            // If file is missing on host from cache, we can definitely say file doesnt exist
+            // otherwise we need to ensure from the disk
+            if (isFileMissingOnHost(sourceFilesCache.get(path))) {
+                return true;
+            }
+            return directoryStructureHost.fileExists(fileName);
+        }
+        function getVersionedSourceFileByPath(fileName, path, languageVersion, onError, shouldCreateNewSourceFile) {
+            var hostSourceFile = sourceFilesCache.get(path);
+            // No source file on the host
+            if (isFileMissingOnHost(hostSourceFile)) {
+                return undefined;
+            }
+            // Create new source file if requested or the versions dont match
+            if (!hostSourceFile || shouldCreateNewSourceFile || !isFilePresentOnHost(hostSourceFile) || hostSourceFile.version.toString() !== hostSourceFile.sourceFile.version) {
+                var sourceFile = getNewSourceFile(fileName, languageVersion, onError);
+                if (hostSourceFile) {
+                    if (shouldCreateNewSourceFile) {
+                        hostSourceFile.version++;
+                    }
+                    if (sourceFile) {
+                        // Set the source file and create file watcher now that file was present on the disk
+                        hostSourceFile.sourceFile = sourceFile;
+                        sourceFile.version = hostSourceFile.version.toString();
+                        if (!hostSourceFile.fileWatcher) {
+                            hostSourceFile.fileWatcher = watchFilePath(host, fileName, onSourceFileChange, ts.PollingInterval.Low, path, "Source file" /* SourceFile */);
+                        }
+                    }
+                    else {
+                        // There is no source file on host any more, close the watch, missing file paths will track it
+                        if (isFilePresentOnHost(hostSourceFile)) {
+                            hostSourceFile.fileWatcher.close();
+                        }
+                        sourceFilesCache.set(path, hostSourceFile.version);
+                    }
+                }
+                else {
+                    if (sourceFile) {
+                        sourceFile.version = initialVersion.toString();
+                        var fileWatcher = watchFilePath(host, fileName, onSourceFileChange, ts.PollingInterval.Low, path, "Source file" /* SourceFile */);
+                        sourceFilesCache.set(path, { sourceFile: sourceFile, version: initialVersion, fileWatcher: fileWatcher });
+                    }
+                    else {
+                        sourceFilesCache.set(path, initialVersion);
+                    }
+                }
+                return sourceFile;
+            }
+            return hostSourceFile.sourceFile;
+        }
+        function nextSourceFileVersion(path) {
+            var hostSourceFile = sourceFilesCache.get(path);
+            if (hostSourceFile !== undefined) {
+                if (isFileMissingOnHost(hostSourceFile)) {
+                    // The next version, lets set it as presence unknown file
+                    sourceFilesCache.set(path, { version: Number(hostSourceFile) + 1 });
+                }
+                else {
+                    hostSourceFile.version++;
+                }
+            }
+        }
+        function getSourceVersion(path) {
+            var hostSourceFile = sourceFilesCache.get(path);
+            return !hostSourceFile || isFileMissingOnHost(hostSourceFile) ? undefined : hostSourceFile.version.toString();
+        }
+        function onReleaseOldSourceFile(oldSourceFile, _oldOptions, hasSourceFileByPath) {
+            var hostSourceFileInfo = sourceFilesCache.get(oldSourceFile.resolvedPath);
+            // If this is the source file thats in the cache and new program doesnt need it,
+            // remove the cached entry.
+            // Note we arent deleting entry if file became missing in new program or
+            // there was version update and new source file was created.
+            if (hostSourceFileInfo) {
+                // record the missing file paths so they can be removed later if watchers arent tracking them
+                if (isFileMissingOnHost(hostSourceFileInfo)) {
+                    (missingFilePathsRequestedForRelease || (missingFilePathsRequestedForRelease = [])).push(oldSourceFile.path);
+                }
+                else if (hostSourceFileInfo.sourceFile === oldSourceFile) {
+                    if (hostSourceFileInfo.fileWatcher) {
+                        hostSourceFileInfo.fileWatcher.close();
+                    }
+                    sourceFilesCache.delete(oldSourceFile.resolvedPath);
+                    if (!hasSourceFileByPath) {
+                        resolutionCache.removeResolutionsOfFile(oldSourceFile.path);
+                    }
+                }
+            }
+        }
+        function reportWatchDiagnostic(message) {
+            if (host.onWatchStatusChange) {
+                host.onWatchStatusChange(ts.createCompilerDiagnostic(message), newLine, compilerOptions || optionsToExtendForConfigFile);
+            }
+        }
+        // Upon detecting a file change, wait for 250ms and then perform a recompilation. This gives batch
+        // operations (such as saving all modified files in an editor) a chance to complete before we kick
+        // off a new compilation.
+        function scheduleProgramUpdate() {
+            if (!host.setTimeout || !host.clearTimeout) {
+                return;
+            }
+            if (timerToUpdateProgram) {
+                host.clearTimeout(timerToUpdateProgram);
+            }
+            writeLog("Scheduling update");
+            timerToUpdateProgram = host.setTimeout(updateProgram, 250);
+        }
+        function scheduleProgramReload() {
+            ts.Debug.assert(!!configFileName);
+            reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
+            scheduleProgramUpdate();
+        }
+        function updateProgram() {
+            timerToUpdateProgram = undefined;
+            reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
+            switch (reloadLevel) {
+                case ts.ConfigFileProgramReloadLevel.Partial:
+                    return reloadFileNamesFromConfigFile();
+                case ts.ConfigFileProgramReloadLevel.Full:
+                    return reloadConfigFile();
+                default:
+                    synchronizeProgram();
+                    return;
+            }
+        }
+        function reloadFileNamesFromConfigFile() {
+            writeLog("Reloading new file names and options");
+            var result = ts.getFileNamesFromConfigSpecs(configFileSpecs, ts.getDirectoryPath(configFileName), compilerOptions, parseConfigFileHost);
+            if (ts.updateErrorForNoInputFiles(result, configFileName, configFileSpecs, configFileParsingDiagnostics, canConfigFileJsonReportNoInputFiles)) {
+                hasChangedConfigFileParsingErrors = true;
+            }
+            rootFileNames = result.fileNames;
+            // Update the program
+            synchronizeProgram();
+        }
+        function reloadConfigFile() {
+            writeLog("Reloading config file: " + configFileName);
+            reloadLevel = ts.ConfigFileProgramReloadLevel.None;
+            if (cachedDirectoryStructureHost) {
+                cachedDirectoryStructureHost.clearCache();
+            }
+            parseConfigFile();
+            hasChangedCompilerOptions = true;
+            synchronizeProgram();
+            // Update the wild card directory watch
+            watchConfigFileWildCardDirectories();
+        }
+        function parseConfigFile() {
+            setConfigFileParsingResult(ts.getParsedCommandLineOfConfigFile(configFileName, optionsToExtendForConfigFile, parseConfigFileHost)); // TODO: GH#18217
+        }
+        function setConfigFileParsingResult(configFileParseResult) {
+            rootFileNames = configFileParseResult.fileNames;
+            compilerOptions = configFileParseResult.options;
+            configFileSpecs = configFileParseResult.configFileSpecs; // TODO: GH#18217
+            projectReferences = configFileParseResult.projectReferences;
+            configFileParsingDiagnostics = ts.getConfigFileParsingDiagnostics(configFileParseResult).slice();
+            canConfigFileJsonReportNoInputFiles = ts.canJsonReportNoInutFiles(configFileParseResult.raw);
+            hasChangedConfigFileParsingErrors = true;
+        }
+        function onSourceFileChange(fileName, eventKind, path) {
+            updateCachedSystemWithFile(fileName, path, eventKind);
+            // Update the source file cache
+            if (eventKind === ts.FileWatcherEventKind.Deleted && sourceFilesCache.get(path)) {
+                resolutionCache.invalidateResolutionOfFile(path);
+            }
+            resolutionCache.removeResolutionsFromProjectReferenceRedirects(path);
+            nextSourceFileVersion(path);
+            // Update the program
+            scheduleProgramUpdate();
+        }
+        function updateCachedSystemWithFile(fileName, path, eventKind) {
+            if (cachedDirectoryStructureHost) {
+                cachedDirectoryStructureHost.addOrDeleteFile(fileName, path, eventKind);
+            }
+        }
+        function watchMissingFilePath(missingFilePath) {
+            return watchFilePath(host, missingFilePath, onMissingFileChange, ts.PollingInterval.Medium, missingFilePath, "Missing file" /* MissingFile */);
+        }
+        function onMissingFileChange(fileName, eventKind, missingFilePath) {
+            updateCachedSystemWithFile(fileName, missingFilePath, eventKind);
+            if (eventKind === ts.FileWatcherEventKind.Created && missingFilesMap.has(missingFilePath)) {
+                missingFilesMap.get(missingFilePath).close();
+                missingFilesMap.delete(missingFilePath);
+                // Delete the entry in the source files cache so that new source file is created
+                nextSourceFileVersion(missingFilePath);
+                // When a missing file is created, we should update the graph.
+                scheduleProgramUpdate();
+            }
+        }
+        function watchConfigFileWildCardDirectories() {
+            if (configFileSpecs) {
+                ts.updateWatchingWildcardDirectories(watchedWildcardDirectories || (watchedWildcardDirectories = ts.createMap()), ts.createMapFromTemplate(configFileSpecs.wildcardDirectories), watchWildcardDirectory);
+            }
+            else if (watchedWildcardDirectories) {
+                ts.clearMap(watchedWildcardDirectories, ts.closeFileWatcherOf);
+            }
+        }
+        function watchWildcardDirectory(directory, flags) {
+            return watchDirectory(host, directory, function (fileOrDirectory) {
+                ts.Debug.assert(!!configFileName);
+                var fileOrDirectoryPath = toPath(fileOrDirectory);
+                // Since the file existance changed, update the sourceFiles cache
+                if (cachedDirectoryStructureHost) {
+                    cachedDirectoryStructureHost.addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath);
+                }
+                nextSourceFileVersion(fileOrDirectoryPath);
+                if (ts.isPathInNodeModulesStartingWithDot(fileOrDirectoryPath))
+                    return;
+                // If the the added or created file or directory is not supported file name, ignore the file
+                // But when watched directory is added/removed, we need to reload the file list
+                if (fileOrDirectoryPath !== directory && ts.hasExtension(fileOrDirectoryPath) && !ts.isSupportedSourceFileName(fileOrDirectory, compilerOptions)) {
+                    writeLog("Project: " + configFileName + " Detected file add/remove of non supported extension: " + fileOrDirectory);
+                    return;
+                }
+                // Reload is pending, do the reload
+                if (reloadLevel !== ts.ConfigFileProgramReloadLevel.Full) {
+                    reloadLevel = ts.ConfigFileProgramReloadLevel.Partial;
+                    // Schedule Update the program
+                    scheduleProgramUpdate();
+                }
+            }, flags, "Wild card directory" /* WildcardDirectory */);
+        }
+    }
+    ts.createWatchProgram = createWatchProgram;
+})(ts || (ts = {}));
+// Currently we do not want to expose API for build, we should work out the API, and then expose it just like we did for builder/watch
+/*@internal*/
+var ts;
+(function (ts) {
+    var minimumDate = new Date(-8640000000000000);
+    var maximumDate = new Date(8640000000000000);
+    var BuildResultFlags;
+    (function (BuildResultFlags) {
+        BuildResultFlags[BuildResultFlags["None"] = 0] = "None";
+        /**
+         * No errors of any kind occurred during build
+         */
+        BuildResultFlags[BuildResultFlags["Success"] = 1] = "Success";
+        /**
+         * None of the .d.ts files emitted by this build were
+         * different from the existing files on disk
+         */
+        BuildResultFlags[BuildResultFlags["DeclarationOutputUnchanged"] = 2] = "DeclarationOutputUnchanged";
+        BuildResultFlags[BuildResultFlags["ConfigFileErrors"] = 4] = "ConfigFileErrors";
+        BuildResultFlags[BuildResultFlags["SyntaxErrors"] = 8] = "SyntaxErrors";
+        BuildResultFlags[BuildResultFlags["TypeErrors"] = 16] = "TypeErrors";
+        BuildResultFlags[BuildResultFlags["DeclarationEmitErrors"] = 32] = "DeclarationEmitErrors";
+        BuildResultFlags[BuildResultFlags["EmitErrors"] = 64] = "EmitErrors";
+        BuildResultFlags[BuildResultFlags["AnyErrors"] = 124] = "AnyErrors";
+    })(BuildResultFlags || (BuildResultFlags = {}));
+    var UpToDateStatusType;
+    (function (UpToDateStatusType) {
+        UpToDateStatusType[UpToDateStatusType["Unbuildable"] = 0] = "Unbuildable";
+        UpToDateStatusType[UpToDateStatusType["UpToDate"] = 1] = "UpToDate";
+        /**
+         * The project appears out of date because its upstream inputs are newer than its outputs,
+         * but all of its outputs are actually newer than the previous identical outputs of its (.d.ts) inputs.
+         * This means we can Pseudo-build (just touch timestamps), as if we had actually built this project.
+         */
+        UpToDateStatusType[UpToDateStatusType["UpToDateWithUpstreamTypes"] = 2] = "UpToDateWithUpstreamTypes";
+        UpToDateStatusType[UpToDateStatusType["OutputMissing"] = 3] = "OutputMissing";
+        UpToDateStatusType[UpToDateStatusType["OutOfDateWithSelf"] = 4] = "OutOfDateWithSelf";
+        UpToDateStatusType[UpToDateStatusType["OutOfDateWithUpstream"] = 5] = "OutOfDateWithUpstream";
+        UpToDateStatusType[UpToDateStatusType["UpstreamOutOfDate"] = 6] = "UpstreamOutOfDate";
+        UpToDateStatusType[UpToDateStatusType["UpstreamBlocked"] = 7] = "UpstreamBlocked";
+        UpToDateStatusType[UpToDateStatusType["ComputingUpstream"] = 8] = "ComputingUpstream";
+        /**
+         * Projects with no outputs (i.e. "solution" files)
+         */
+        UpToDateStatusType[UpToDateStatusType["ContainerOnly"] = 9] = "ContainerOnly";
+    })(UpToDateStatusType = ts.UpToDateStatusType || (ts.UpToDateStatusType = {}));
+    function createFileMap(toPath) {
+        // tslint:disable-next-line:no-null-keyword
+        var lookup = ts.createMap();
+        return {
+            setValue: setValue,
+            getValue: getValue,
+            removeKey: removeKey,
+            forEach: forEach,
+            hasKey: hasKey,
+            getSize: getSize,
+            clear: clear
+        };
+        function forEach(action) {
+            lookup.forEach(action);
+        }
+        function hasKey(fileName) {
+            return lookup.has(toPath(fileName));
+        }
+        function removeKey(fileName) {
+            lookup.delete(toPath(fileName));
+        }
+        function setValue(fileName, value) {
+            lookup.set(toPath(fileName), value);
+        }
+        function getValue(fileName) {
+            return lookup.get(toPath(fileName));
+        }
+        function getSize() {
+            return lookup.size;
+        }
+        function clear() {
+            lookup.clear();
+        }
+    }
+    function getOrCreateValueFromConfigFileMap(configFileMap, resolved, createT) {
+        var existingValue = configFileMap.getValue(resolved);
+        var newValue;
+        if (!existingValue) {
+            newValue = createT();
+            configFileMap.setValue(resolved, newValue);
+        }
+        return existingValue || newValue;
+    }
+    function getOrCreateValueMapFromConfigFileMap(configFileMap, resolved) {
+        return getOrCreateValueFromConfigFileMap(configFileMap, resolved, ts.createMap);
+    }
+    function getOutputDeclarationFileName(inputFileName, configFile) {
+        var relativePath = ts.getRelativePathFromDirectory(rootDirOfOptions(configFile.options, configFile.options.configFilePath), inputFileName, /*ignoreCase*/ true);
+        var outputPath = ts.resolvePath(configFile.options.declarationDir || configFile.options.outDir || ts.getDirectoryPath(configFile.options.configFilePath), relativePath);
+        return ts.changeExtension(outputPath, ".d.ts" /* Dts */);
+    }
+    ts.getOutputDeclarationFileName = getOutputDeclarationFileName;
+    function getOutputJSFileName(inputFileName, configFile) {
+        var relativePath = ts.getRelativePathFromDirectory(rootDirOfOptions(configFile.options, configFile.options.configFilePath), inputFileName, /*ignoreCase*/ true);
+        var outputPath = ts.resolvePath(configFile.options.outDir || ts.getDirectoryPath(configFile.options.configFilePath), relativePath);
+        var newExtension = ts.fileExtensionIs(inputFileName, ".json" /* Json */) ? ".json" /* Json */ :
+            ts.fileExtensionIs(inputFileName, ".tsx" /* Tsx */) && configFile.options.jsx === 1 /* Preserve */ ? ".jsx" /* Jsx */ : ".js" /* Js */;
+        return ts.changeExtension(outputPath, newExtension);
+    }
+    function getOutputFileNames(inputFileName, configFile) {
+        // outFile is handled elsewhere; .d.ts files don't generate outputs
+        if (configFile.options.outFile || configFile.options.out || ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */)) {
+            return ts.emptyArray;
+        }
+        var outputs = [];
+        var js = getOutputJSFileName(inputFileName, configFile);
+        outputs.push(js);
+        if (configFile.options.sourceMap) {
+            outputs.push(js + ".map");
+        }
+        if (ts.getEmitDeclarations(configFile.options) && !ts.fileExtensionIs(inputFileName, ".json" /* Json */)) {
+            var dts = getOutputDeclarationFileName(inputFileName, configFile);
+            outputs.push(dts);
+            if (configFile.options.declarationMap) {
+                outputs.push(dts + ".map");
+            }
+        }
+        return outputs;
+    }
+    function getOutFileOutputs(project) {
+        var out = project.options.outFile || project.options.out;
+        if (!out) {
+            return ts.Debug.fail("outFile must be set");
+        }
+        var outputs = [];
+        outputs.push(out);
+        if (project.options.sourceMap) {
+            outputs.push(out + ".map");
+        }
+        if (ts.getEmitDeclarations(project.options)) {
+            var dts = ts.changeExtension(out, ".d.ts" /* Dts */);
+            outputs.push(dts);
+            if (project.options.declarationMap) {
+                outputs.push(dts + ".map");
+            }
+        }
+        return outputs;
+    }
+    function rootDirOfOptions(opts, configFileName) {
+        return opts.rootDir || ts.getDirectoryPath(configFileName);
+    }
+    function newer(date1, date2) {
+        return date2 > date1 ? date2 : date1;
+    }
+    function isDeclarationFile(fileName) {
+        return ts.fileExtensionIs(fileName, ".d.ts" /* Dts */);
+    }
+    /**
+     * Create a function that reports watch status by writing to the system and handles the formating of the diagnostic
+     */
+    function createBuilderStatusReporter(system, pretty) {
+        return function (diagnostic) {
+            var output = pretty ? "[" + ts.formatColorAndReset(new Date().toLocaleTimeString(), ts.ForegroundColorEscapeSequences.Grey) + "] " : new Date().toLocaleTimeString() + " - ";
+            output += "" + ts.flattenDiagnosticMessageText(diagnostic.messageText, system.newLine) + (system.newLine + system.newLine);
+            system.write(output);
+        };
+    }
+    ts.createBuilderStatusReporter = createBuilderStatusReporter;
+    function createSolutionBuilderHostBase(system, createProgram, reportDiagnostic, reportSolutionBuilderStatus) {
+        var host = ts.createProgramHost(system, createProgram);
+        host.getModifiedTime = system.getModifiedTime ? function (path) { return system.getModifiedTime(path); } : function () { return undefined; };
+        host.setModifiedTime = system.setModifiedTime ? function (path, date) { return system.setModifiedTime(path, date); } : ts.noop;
+        host.deleteFile = system.deleteFile ? function (path) { return system.deleteFile(path); } : ts.noop;
+        host.reportDiagnostic = reportDiagnostic || ts.createDiagnosticReporter(system);
+        host.reportSolutionBuilderStatus = reportSolutionBuilderStatus || createBuilderStatusReporter(system);
+        return host;
+    }
+    function createSolutionBuilderHost(system, createProgram, reportDiagnostic, reportSolutionBuilderStatus, reportErrorSummary) {
+        if (system === void 0) { system = ts.sys; }
+        var host = createSolutionBuilderHostBase(system, createProgram || ts.createAbstractBuilder, reportDiagnostic, reportSolutionBuilderStatus);
+        host.reportErrorSummary = reportErrorSummary;
+        return host;
+    }
+    ts.createSolutionBuilderHost = createSolutionBuilderHost;
+    function createSolutionBuilderWithWatchHost(system, createProgram, reportDiagnostic, reportSolutionBuilderStatus, reportWatchStatus) {
+        if (system === void 0) { system = ts.sys; }
+        var host = createSolutionBuilderHostBase(system, createProgram || ts.createEmitAndSemanticDiagnosticsBuilderProgram, reportDiagnostic, reportSolutionBuilderStatus);
+        var watchHost = ts.createWatchHost(system, reportWatchStatus);
+        ts.copyProperties(host, watchHost);
+        return host;
+    }
+    ts.createSolutionBuilderWithWatchHost = createSolutionBuilderWithWatchHost;
+    function getCompilerOptionsOfBuildOptions(buildOptions) {
+        var result = {};
+        ts.commonOptionsWithBuild.forEach(function (option) {
+            result[option.name] = buildOptions[option.name];
+        });
+        return result;
+    }
+    function createSolutionBuilder(host, rootNames, defaultOptions) {
+        var hostWithWatch = host;
+        var currentDirectory = host.getCurrentDirectory();
+        var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames());
+        var parseConfigFileHost = ts.parseConfigHostFromCompilerHostLike(host);
+        // State of the solution
+        var options = defaultOptions;
+        var baseCompilerOptions = getCompilerOptionsOfBuildOptions(options);
+        var configFileCache = createFileMap(toPath);
+        /** Map from output file name to its pre-build timestamp */
+        var unchangedOutputs = createFileMap(toPath);
+        /** Map from config file name to up-to-date status */
+        var projectStatus = createFileMap(toPath);
+        var missingRoots = ts.createMap();
+        var globalDependencyGraph;
+        var writeFileName = function (s) { return host.trace && host.trace(s); };
+        var readFileWithCache = function (f) { return host.readFile(f); };
+        var projectCompilerOptions = baseCompilerOptions;
+        var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return projectCompilerOptions; });
+        var originalGetSourceFile = compilerHost.getSourceFile;
+        var computeHash = host.createHash || ts.generateDjb2Hash;
+        updateGetSourceFile();
+        // Watch state
+        var builderPrograms = createFileMap(toPath);
+        var diagnostics = createFileMap(toPath);
+        var projectPendingBuild = createFileMap(toPath);
+        var projectErrorsReported = createFileMap(toPath);
+        var invalidatedProjectQueue = [];
+        var nextProjectToBuild = 0;
+        var timerToBuildInvalidatedProject;
+        var reportFileChangeDetected = false;
+        var _a = ts.createWatchFactory(host, options), watchFile = _a.watchFile, watchFilePath = _a.watchFilePath, watchDirectory = _a.watchDirectory, writeLog = _a.writeLog;
+        // Watches for the solution
+        var allWatchedWildcardDirectories = createFileMap(toPath);
+        var allWatchedInputFiles = createFileMap(toPath);
+        var allWatchedConfigFiles = createFileMap(toPath);
+        return {
+            buildAllProjects: buildAllProjects,
+            getUpToDateStatusOfFile: getUpToDateStatusOfFile,
+            cleanAllProjects: cleanAllProjects,
+            resetBuildContext: resetBuildContext,
+            getBuildGraph: getBuildGraph,
+            invalidateProject: invalidateProject,
+            buildInvalidatedProject: buildInvalidatedProject,
+            resolveProjectName: resolveProjectName,
+            startWatching: startWatching
+        };
+        function toPath(fileName) {
+            return ts.toPath(fileName, currentDirectory, getCanonicalFileName);
+        }
+        function resetBuildContext(opts) {
+            if (opts === void 0) { opts = defaultOptions; }
+            options = opts;
+            baseCompilerOptions = getCompilerOptionsOfBuildOptions(options);
+            configFileCache.clear();
+            unchangedOutputs.clear();
+            projectStatus.clear();
+            missingRoots.clear();
+            globalDependencyGraph = undefined;
+            diagnostics.clear();
+            projectPendingBuild.clear();
+            projectErrorsReported.clear();
+            invalidatedProjectQueue.length = 0;
+            nextProjectToBuild = 0;
+            if (timerToBuildInvalidatedProject) {
+                clearTimeout(timerToBuildInvalidatedProject);
+                timerToBuildInvalidatedProject = undefined;
+            }
+            reportFileChangeDetected = false;
+            ts.clearMap(allWatchedWildcardDirectories, function (wildCardWatches) { return ts.clearMap(wildCardWatches, ts.closeFileWatcherOf); });
+            ts.clearMap(allWatchedInputFiles, function (inputFileWatches) { return ts.clearMap(inputFileWatches, ts.closeFileWatcher); });
+            ts.clearMap(allWatchedConfigFiles, ts.closeFileWatcher);
+            builderPrograms.clear();
+            updateGetSourceFile();
+        }
+        function updateGetSourceFile() {
+            if (options.watch) {
+                if (compilerHost.getSourceFile === originalGetSourceFile) {
+                    compilerHost.getSourceFile = function () {
+                        var args = [];
+                        for (var _i = 0; _i < arguments.length; _i++) {
+                            args[_i] = arguments[_i];
+                        }
+                        var result = originalGetSourceFile.call.apply(originalGetSourceFile, [compilerHost].concat(args));
+                        if (result && options.watch) {
+                            result.version = computeHash.call(host, result.text);
+                        }
+                        return result;
+                    };
+                }
+            }
+            else {
+                if (compilerHost.getSourceFile !== originalGetSourceFile) {
+                    compilerHost.getSourceFile = originalGetSourceFile;
+                }
+            }
+        }
+        function isParsedCommandLine(entry) {
+            return !!entry.options;
+        }
+        function parseConfigFile(configFilePath) {
+            var value = configFileCache.getValue(configFilePath);
+            if (value) {
+                return isParsedCommandLine(value) ? value : undefined;
+            }
+            var diagnostic;
+            parseConfigFileHost.onUnRecoverableConfigFileDiagnostic = function (d) { return diagnostic = d; };
+            var parsed = ts.getParsedCommandLineOfConfigFile(configFilePath, baseCompilerOptions, parseConfigFileHost);
+            parseConfigFileHost.onUnRecoverableConfigFileDiagnostic = ts.noop;
+            configFileCache.setValue(configFilePath, parsed || diagnostic);
+            return parsed;
+        }
+        function reportStatus(message) {
+            var args = [];
+            for (var _i = 1; _i < arguments.length; _i++) {
+                args[_i - 1] = arguments[_i];
+            }
+            host.reportSolutionBuilderStatus(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)));
+        }
+        function reportWatchStatus(message) {
+            var args = [];
+            for (var _i = 1; _i < arguments.length; _i++) {
+                args[_i - 1] = arguments[_i];
+            }
+            if (hostWithWatch.onWatchStatusChange) {
+                hostWithWatch.onWatchStatusChange(ts.createCompilerDiagnostic.apply(void 0, [message].concat(args)), host.getNewLine(), baseCompilerOptions);
+            }
+        }
+        function startWatching() {
+            var graph = getGlobalDependencyGraph();
+            for (var _i = 0, _a = graph.buildQueue; _i < _a.length; _i++) {
+                var resolved = _a[_i];
+                // Watch this file
+                watchConfigFile(resolved);
+                var cfg = parseConfigFile(resolved);
+                if (cfg) {
+                    // Update watchers for wildcard directories
+                    watchWildCardDirectories(resolved, cfg);
+                    // Watch input files
+                    watchInputFiles(resolved, cfg);
+                }
+            }
+        }
+        function watchConfigFile(resolved) {
+            if (options.watch && !allWatchedConfigFiles.hasKey(resolved)) {
+                allWatchedConfigFiles.setValue(resolved, watchFile(hostWithWatch, resolved, function () {
+                    invalidateProjectAndScheduleBuilds(resolved, ts.ConfigFileProgramReloadLevel.Full);
+                }, ts.PollingInterval.High, "Config file" /* ConfigFile */, resolved));
+            }
+        }
+        function watchWildCardDirectories(resolved, parsed) {
+            if (!options.watch)
+                return;
+            ts.updateWatchingWildcardDirectories(getOrCreateValueMapFromConfigFileMap(allWatchedWildcardDirectories, resolved), ts.createMapFromTemplate(parsed.configFileSpecs.wildcardDirectories), function (dir, flags) {
+                return watchDirectory(hostWithWatch, dir, function (fileOrDirectory) {
+                    var fileOrDirectoryPath = toPath(fileOrDirectory);
+                    if (fileOrDirectoryPath !== toPath(dir) && ts.hasExtension(fileOrDirectoryPath) && !ts.isSupportedSourceFileName(fileOrDirectory, parsed.options)) {
+                        writeLog("Project: " + resolved + " Detected file add/remove of non supported extension: " + fileOrDirectory);
+                        return;
+                    }
+                    if (isOutputFile(fileOrDirectory, parsed)) {
+                        writeLog(fileOrDirectory + " is output file");
+                        return;
+                    }
+                    invalidateProjectAndScheduleBuilds(resolved, ts.ConfigFileProgramReloadLevel.Partial);
+                }, flags, "Wild card directory" /* WildcardDirectory */, resolved);
+            });
+        }
+        function watchInputFiles(resolved, parsed) {
+            if (!options.watch)
+                return;
+            ts.mutateMap(getOrCreateValueMapFromConfigFileMap(allWatchedInputFiles, resolved), ts.arrayToMap(parsed.fileNames, toPath), {
+                createNewValue: function (path, input) { return watchFilePath(hostWithWatch, input, function () { return invalidateProjectAndScheduleBuilds(resolved, ts.ConfigFileProgramReloadLevel.None); }, ts.PollingInterval.Low, path, "Source file" /* SourceFile */, resolved); },
+                onDeleteValue: ts.closeFileWatcher,
+            });
+        }
+        function isOutputFile(fileName, configFile) {
+            if (configFile.options.noEmit)
+                return false;
+            // ts or tsx files are not output
+            if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) &&
+                (ts.fileExtensionIs(fileName, ".ts" /* Ts */) || ts.fileExtensionIs(fileName, ".tsx" /* Tsx */))) {
+                return false;
+            }
+            // If options have --outFile or --out, check if its that
+            var out = configFile.options.outFile || configFile.options.out;
+            if (out && (isSameFile(fileName, out) || isSameFile(fileName, ts.removeFileExtension(out) + ".d.ts" /* Dts */))) {
+                return true;
+            }
+            // If declarationDir is specified, return if its a file in that directory
+            if (configFile.options.declarationDir && ts.containsPath(configFile.options.declarationDir, fileName, currentDirectory, !host.useCaseSensitiveFileNames())) {
+                return true;
+            }
+            // If --outDir, check if file is in that directory
+            if (configFile.options.outDir && ts.containsPath(configFile.options.outDir, fileName, currentDirectory, !host.useCaseSensitiveFileNames())) {
+                return true;
+            }
+            return !ts.forEach(configFile.fileNames, function (inputFile) { return isSameFile(fileName, inputFile); });
+        }
+        function isSameFile(file1, file2) {
+            return ts.comparePaths(file1, file2, currentDirectory, !host.useCaseSensitiveFileNames()) === 0 /* EqualTo */;
+        }
+        function invalidateProjectAndScheduleBuilds(resolved, reloadLevel) {
+            reportFileChangeDetected = true;
+            invalidateResolvedProject(resolved, reloadLevel);
+            scheduleBuildInvalidatedProject();
+        }
+        function getUpToDateStatusOfFile(configFileName) {
+            return getUpToDateStatus(parseConfigFile(configFileName));
+        }
+        function getBuildGraph(configFileNames) {
+            return createDependencyGraph(resolveProjectNames(configFileNames));
+        }
+        function getGlobalDependencyGraph() {
+            return globalDependencyGraph || (globalDependencyGraph = getBuildGraph(rootNames));
+        }
+        function getUpToDateStatus(project) {
+            if (project === undefined) {
+                return { type: UpToDateStatusType.Unbuildable, reason: "File deleted mid-build" };
+            }
+            var prior = projectStatus.getValue(project.options.configFilePath);
+            if (prior !== undefined) {
+                return prior;
+            }
+            var actual = getUpToDateStatusWorker(project);
+            projectStatus.setValue(project.options.configFilePath, actual);
+            return actual;
+        }
+        function getUpToDateStatusWorker(project) {
+            var newestInputFileName = undefined;
+            var newestInputFileTime = minimumDate;
+            // Get timestamps of input files
+            for (var _i = 0, _a = project.fileNames; _i < _a.length; _i++) {
+                var inputFile = _a[_i];
+                if (!host.fileExists(inputFile)) {
+                    return {
+                        type: UpToDateStatusType.Unbuildable,
+                        reason: inputFile + " does not exist"
+                    };
+                }
+                var inputTime = host.getModifiedTime(inputFile) || ts.missingFileModifiedTime;
+                if (inputTime > newestInputFileTime) {
+                    newestInputFileName = inputFile;
+                    newestInputFileTime = inputTime;
+                }
+            }
+            // Collect the expected outputs of this project
+            var outputs = getAllProjectOutputs(project);
+            if (outputs.length === 0) {
+                return {
+                    type: UpToDateStatusType.ContainerOnly
+                };
+            }
+            // Now see if all outputs are newer than the newest input
+            var oldestOutputFileName = "(none)";
+            var oldestOutputFileTime = maximumDate;
+            var newestOutputFileName = "(none)";
+            var newestOutputFileTime = minimumDate;
+            var missingOutputFileName;
+            var newestDeclarationFileContentChangedTime = minimumDate;
+            var isOutOfDateWithInputs = false;
+            for (var _b = 0, outputs_1 = outputs; _b < outputs_1.length; _b++) {
+                var output = outputs_1[_b];
+                // Output is missing; can stop checking
+                // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
+                if (!host.fileExists(output)) {
+                    missingOutputFileName = output;
+                    break;
+                }
+                var outputTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
+                if (outputTime < oldestOutputFileTime) {
+                    oldestOutputFileTime = outputTime;
+                    oldestOutputFileName = output;
+                }
+                // If an output is older than the newest input, we can stop checking
+                // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
+                if (outputTime < newestInputFileTime) {
+                    isOutOfDateWithInputs = true;
+                    break;
+                }
+                if (outputTime > newestOutputFileTime) {
+                    newestOutputFileTime = outputTime;
+                    newestOutputFileName = output;
+                }
+                // Keep track of when the most recent time a .d.ts file was changed.
+                // In addition to file timestamps, we also keep track of when a .d.ts file
+                // had its file touched but not had its contents changed - this allows us
+                // to skip a downstream typecheck
+                if (isDeclarationFile(output)) {
+                    var unchangedTime = unchangedOutputs.getValue(output);
+                    if (unchangedTime !== undefined) {
+                        newestDeclarationFileContentChangedTime = newer(unchangedTime, newestDeclarationFileContentChangedTime);
+                    }
+                    else {
+                        var outputModifiedTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
+                        newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputModifiedTime);
+                    }
+                }
+            }
+            var pseudoUpToDate = false;
+            var usesPrepend = false;
+            var upstreamChangedProject;
+            if (project.projectReferences) {
+                projectStatus.setValue(project.options.configFilePath, { type: UpToDateStatusType.ComputingUpstream });
+                for (var _c = 0, _d = project.projectReferences; _c < _d.length; _c++) {
+                    var ref = _d[_c];
+                    usesPrepend = usesPrepend || !!(ref.prepend);
+                    var resolvedRef = ts.resolveProjectReferencePath(ref);
+                    var refStatus = getUpToDateStatus(parseConfigFile(resolvedRef));
+                    // Its a circular reference ignore the status of this project
+                    if (refStatus.type === UpToDateStatusType.ComputingUpstream) {
+                        continue;
+                    }
+                    // An upstream project is blocked
+                    if (refStatus.type === UpToDateStatusType.Unbuildable) {
+                        return {
+                            type: UpToDateStatusType.UpstreamBlocked,
+                            upstreamProjectName: ref.path
+                        };
+                    }
+                    // If the upstream project is out of date, then so are we (someone shouldn't have asked, though?)
+                    if (refStatus.type !== UpToDateStatusType.UpToDate) {
+                        return {
+                            type: UpToDateStatusType.UpstreamOutOfDate,
+                            upstreamProjectName: ref.path
+                        };
+                    }
+                    // If the upstream project's newest file is older than our oldest output, we
+                    // can't be out of date because of it
+                    if (refStatus.newestInputFileTime && refStatus.newestInputFileTime <= oldestOutputFileTime) {
+                        continue;
+                    }
+                    // If the upstream project has only change .d.ts files, and we've built
+                    // *after* those files, then we're "psuedo up to date" and eligible for a fast rebuild
+                    if (refStatus.newestDeclarationFileContentChangedTime && refStatus.newestDeclarationFileContentChangedTime <= oldestOutputFileTime) {
+                        pseudoUpToDate = true;
+                        upstreamChangedProject = ref.path;
+                        continue;
+                    }
+                    // We have an output older than an upstream output - we are out of date
+                    ts.Debug.assert(oldestOutputFileName !== undefined, "Should have an oldest output filename here");
+                    return {
+                        type: UpToDateStatusType.OutOfDateWithUpstream,
+                        outOfDateOutputFileName: oldestOutputFileName,
+                        newerProjectName: ref.path
+                    };
+                }
+            }
+            if (missingOutputFileName !== undefined) {
+                return {
+                    type: UpToDateStatusType.OutputMissing,
+                    missingOutputFileName: missingOutputFileName
+                };
+            }
+            if (isOutOfDateWithInputs) {
+                return {
+                    type: UpToDateStatusType.OutOfDateWithSelf,
+                    outOfDateOutputFileName: oldestOutputFileName,
+                    newerInputFileName: newestInputFileName
+                };
+            }
+            if (usesPrepend && pseudoUpToDate) {
+                return {
+                    type: UpToDateStatusType.OutOfDateWithUpstream,
+                    outOfDateOutputFileName: oldestOutputFileName,
+                    newerProjectName: upstreamChangedProject
+                };
+            }
+            // Up to date
+            return {
+                type: pseudoUpToDate ? UpToDateStatusType.UpToDateWithUpstreamTypes : UpToDateStatusType.UpToDate,
+                newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTime,
+                newestInputFileTime: newestInputFileTime,
+                newestOutputFileTime: newestOutputFileTime,
+                newestInputFileName: newestInputFileName,
+                newestOutputFileName: newestOutputFileName,
+                oldestOutputFileName: oldestOutputFileName
+            };
+        }
+        function invalidateProject(configFileName, reloadLevel) {
+            invalidateResolvedProject(resolveProjectName(configFileName), reloadLevel);
+        }
+        function invalidateResolvedProject(resolved, reloadLevel) {
+            if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
+                configFileCache.removeKey(resolved);
+                globalDependencyGraph = undefined;
+            }
+            projectStatus.removeKey(resolved);
+            diagnostics.removeKey(resolved);
+            addProjToQueue(resolved, reloadLevel);
+        }
+        /**
+         * return true if new addition
+         */
+        function addProjToQueue(proj, reloadLevel) {
+            var value = projectPendingBuild.getValue(proj);
+            if (value === undefined) {
+                projectPendingBuild.setValue(proj, reloadLevel || ts.ConfigFileProgramReloadLevel.None);
+                invalidatedProjectQueue.push(proj);
+            }
+            else if (value < (reloadLevel || ts.ConfigFileProgramReloadLevel.None)) {
+                projectPendingBuild.setValue(proj, reloadLevel || ts.ConfigFileProgramReloadLevel.None);
+            }
+        }
+        function getNextInvalidatedProject() {
+            if (nextProjectToBuild < invalidatedProjectQueue.length) {
+                var project = invalidatedProjectQueue[nextProjectToBuild];
+                nextProjectToBuild++;
+                var reloadLevel = projectPendingBuild.getValue(project);
+                projectPendingBuild.removeKey(project);
+                if (!projectPendingBuild.getSize()) {
+                    invalidatedProjectQueue.length = 0;
+                    nextProjectToBuild = 0;
+                }
+                return { project: project, reloadLevel: reloadLevel };
+            }
+        }
+        function hasPendingInvalidatedProjects() {
+            return !!projectPendingBuild.getSize();
+        }
+        function scheduleBuildInvalidatedProject() {
+            if (!hostWithWatch.setTimeout || !hostWithWatch.clearTimeout) {
+                return;
+            }
+            if (timerToBuildInvalidatedProject) {
+                hostWithWatch.clearTimeout(timerToBuildInvalidatedProject);
+            }
+            timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildInvalidatedProject, 250);
+        }
+        function buildInvalidatedProject() {
+            timerToBuildInvalidatedProject = undefined;
+            if (reportFileChangeDetected) {
+                reportFileChangeDetected = false;
+                projectErrorsReported.clear();
+                reportWatchStatus(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
+            }
+            var buildProject = getNextInvalidatedProject();
+            if (buildProject) {
+                buildSingleInvalidatedProject(buildProject.project, buildProject.reloadLevel);
+                if (hasPendingInvalidatedProjects()) {
+                    if (options.watch && !timerToBuildInvalidatedProject) {
+                        scheduleBuildInvalidatedProject();
+                    }
+                }
+                else {
+                    reportErrorSummary();
+                }
+            }
+        }
+        function reportErrorSummary() {
+            if (options.watch || host.reportErrorSummary) {
+                // Report errors from the other projects
+                getGlobalDependencyGraph().buildQueue.forEach(function (project) {
+                    if (!projectErrorsReported.hasKey(project)) {
+                        reportErrors(diagnostics.getValue(project) || ts.emptyArray);
+                    }
+                });
+                var totalErrors_1 = 0;
+                diagnostics.forEach(function (singleProjectErrors) { return totalErrors_1 += ts.getErrorCountForSummary(singleProjectErrors); });
+                if (options.watch) {
+                    reportWatchStatus(ts.getWatchErrorSummaryDiagnosticMessage(totalErrors_1), totalErrors_1);
+                }
+                else {
+                    host.reportErrorSummary(totalErrors_1);
+                }
+            }
+        }
+        function buildSingleInvalidatedProject(resolved, reloadLevel) {
+            var proj = parseConfigFile(resolved);
+            if (!proj) {
+                reportParseConfigFileDiagnostic(resolved);
+                return;
+            }
+            if (reloadLevel === ts.ConfigFileProgramReloadLevel.Full) {
+                watchConfigFile(resolved);
+                watchWildCardDirectories(resolved, proj);
+                watchInputFiles(resolved, proj);
+            }
+            else if (reloadLevel === ts.ConfigFileProgramReloadLevel.Partial) {
+                // Update file names
+                var result = ts.getFileNamesFromConfigSpecs(proj.configFileSpecs, ts.getDirectoryPath(resolved), proj.options, parseConfigFileHost);
+                ts.updateErrorForNoInputFiles(result, resolved, proj.configFileSpecs, proj.errors, ts.canJsonReportNoInutFiles(proj.raw));
+                proj.fileNames = result.fileNames;
+                watchInputFiles(resolved, proj);
+            }
+            var status = getUpToDateStatus(proj);
+            verboseReportProjectStatus(resolved, status);
+            if (status.type === UpToDateStatusType.UpstreamBlocked) {
+                if (options.verbose)
+                    reportStatus(ts.Diagnostics.Skipping_build_of_project_0_because_its_dependency_1_has_errors, resolved, status.upstreamProjectName);
+                return;
+            }
+            if (status.type === UpToDateStatusType.UpToDateWithUpstreamTypes) {
+                // Fake that files have been built by updating output file stamps
+                updateOutputTimestamps(proj);
+                return;
+            }
+            var buildResult = buildSingleProject(resolved);
+            if (buildResult & BuildResultFlags.AnyErrors)
+                return;
+            var _a = getGlobalDependencyGraph(), referencingProjectsMap = _a.referencingProjectsMap, buildQueue = _a.buildQueue;
+            var referencingProjects = referencingProjectsMap.getValue(resolved);
+            if (!referencingProjects)
+                return;
+            // Always use build order to queue projects
+            for (var index = buildQueue.indexOf(resolved) + 1; index < buildQueue.length; index++) {
+                var project = buildQueue[index];
+                var prepend = referencingProjects.getValue(project);
+                if (prepend !== undefined) {
+                    // If the project is referenced with prepend, always build downstream projects,
+                    // If declaration output is changed, build the project
+                    // otherwise mark the project UpToDateWithUpstreamTypes so it updates output time stamps
+                    var status_1 = projectStatus.getValue(project);
+                    if (prepend || !(buildResult & BuildResultFlags.DeclarationOutputUnchanged)) {
+                        if (status_1 && (status_1.type === UpToDateStatusType.UpToDate || status_1.type === UpToDateStatusType.UpToDateWithUpstreamTypes)) {
+                            projectStatus.setValue(project, {
+                                type: UpToDateStatusType.OutOfDateWithUpstream,
+                                outOfDateOutputFileName: status_1.oldestOutputFileName,
+                                newerProjectName: resolved
+                            });
+                        }
+                    }
+                    else if (status_1 && status_1.type === UpToDateStatusType.UpToDate) {
+                        status_1.type = UpToDateStatusType.UpToDateWithUpstreamTypes;
+                    }
+                    addProjToQueue(project);
+                }
+            }
+        }
+        function createDependencyGraph(roots) {
+            var temporaryMarks = createFileMap(toPath);
+            var permanentMarks = createFileMap(toPath);
+            var circularityReportStack = [];
+            var buildOrder = [];
+            var referencingProjectsMap = createFileMap(toPath);
+            for (var _i = 0, roots_1 = roots; _i < roots_1.length; _i++) {
+                var root = roots_1[_i];
+                visit(root);
+            }
+            return {
+                buildQueue: buildOrder,
+                referencingProjectsMap: referencingProjectsMap
+            };
+            function visit(projPath, inCircularContext) {
+                // Already visited
+                if (permanentMarks.hasKey(projPath))
+                    return;
+                // Circular
+                if (temporaryMarks.hasKey(projPath)) {
+                    if (!inCircularContext) {
+                        // TODO:: Do we report this as error?
+                        reportStatus(ts.Diagnostics.Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0, circularityReportStack.join("\r\n"));
+                    }
+                    return;
+                }
+                temporaryMarks.setValue(projPath, true);
+                circularityReportStack.push(projPath);
+                var parsed = parseConfigFile(projPath);
+                if (parsed && parsed.projectReferences) {
+                    for (var _i = 0, _a = parsed.projectReferences; _i < _a.length; _i++) {
+                        var ref = _a[_i];
+                        var resolvedRefPath = resolveProjectName(ref.path);
+                        visit(resolvedRefPath, inCircularContext || ref.circular);
+                        // Get projects referencing resolvedRefPath and add projPath to it
+                        var referencingProjects = getOrCreateValueFromConfigFileMap(referencingProjectsMap, resolvedRefPath, function () { return createFileMap(toPath); });
+                        referencingProjects.setValue(projPath, !!ref.prepend);
+                    }
+                }
+                circularityReportStack.pop();
+                permanentMarks.setValue(projPath, true);
+                buildOrder.push(projPath);
+            }
+        }
+        function buildSingleProject(proj) {
+            if (options.dry) {
+                reportStatus(ts.Diagnostics.A_non_dry_build_would_build_project_0, proj);
+                return BuildResultFlags.Success;
+            }
+            if (options.verbose)
+                reportStatus(ts.Diagnostics.Building_project_0, proj);
+            var resultFlags = BuildResultFlags.None;
+            resultFlags |= BuildResultFlags.DeclarationOutputUnchanged;
+            var configFile = parseConfigFile(proj);
+            if (!configFile) {
+                // Failed to read the config file
+                resultFlags |= BuildResultFlags.ConfigFileErrors;
+                reportParseConfigFileDiagnostic(proj);
+                projectStatus.setValue(proj, { type: UpToDateStatusType.Unbuildable, reason: "Config file errors" });
+                return resultFlags;
+            }
+            if (configFile.fileNames.length === 0) {
+                reportAndStoreErrors(proj, configFile.errors);
+                // Nothing to build - must be a solution file, basically
+                return BuildResultFlags.None;
+            }
+            // TODO: handle resolve module name to cache result in project reference redirect
+            projectCompilerOptions = configFile.options;
+            var program = host.createProgram(configFile.fileNames, configFile.options, compilerHost, builderPrograms.getValue(proj), configFile.errors, configFile.projectReferences);
+            projectCompilerOptions = baseCompilerOptions;
+            // Don't emit anything in the presence of syntactic errors or options diagnostics
+            var syntaxDiagnostics = program.getConfigFileParsingDiagnostics().concat(program.getOptionsDiagnostics(), program.getGlobalDiagnostics(), program.getSyntacticDiagnostics());
+            if (syntaxDiagnostics.length) {
+                return buildErrors(syntaxDiagnostics, BuildResultFlags.SyntaxErrors, "Syntactic");
+            }
+            // Same as above but now for semantic diagnostics
+            var semanticDiagnostics = program.getSemanticDiagnostics();
+            if (semanticDiagnostics.length) {
+                return buildErrors(semanticDiagnostics, BuildResultFlags.TypeErrors, "Semantic");
+            }
+            // Before emitting lets backup state, so we can revert it back if there are declaration errors to handle emit and declaration errors correctly
+            program.backupState();
+            var newestDeclarationFileContentChangedTime = minimumDate;
+            var anyDtsChanged = false;
+            var declDiagnostics;
+            var reportDeclarationDiagnostics = function (d) { return (declDiagnostics || (declDiagnostics = [])).push(d); };
+            var outputFiles = [];
+            ts.emitFilesAndReportErrors(program, reportDeclarationDiagnostics, writeFileName, /*reportSummary*/ undefined, function (name, text, writeByteOrderMark) { return outputFiles.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark }); });
+            // Don't emit .d.ts if there are decl file errors
+            if (declDiagnostics) {
+                program.restoreState();
+                return buildErrors(declDiagnostics, BuildResultFlags.DeclarationEmitErrors, "Declaration file");
+            }
+            // Actual Emit
+            var emitterDiagnostics = ts.createDiagnosticCollection();
+            var emittedOutputs = createFileMap(toPath);
+            outputFiles.forEach(function (_a) {
+                var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark;
+                var priorChangeTime;
+                if (!anyDtsChanged && isDeclarationFile(name)) {
+                    // Check for unchanged .d.ts files
+                    if (host.fileExists(name) && readFileWithCache(name) === text) {
+                        priorChangeTime = host.getModifiedTime(name);
+                    }
+                    else {
+                        resultFlags &= ~BuildResultFlags.DeclarationOutputUnchanged;
+                        anyDtsChanged = true;
+                    }
+                }
+                emittedOutputs.setValue(name, true);
+                ts.writeFile(compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
+                if (priorChangeTime !== undefined) {
+                    newestDeclarationFileContentChangedTime = newer(priorChangeTime, newestDeclarationFileContentChangedTime);
+                    unchangedOutputs.setValue(name, priorChangeTime);
+                }
+            });
+            var emitDiagnostics = emitterDiagnostics.getDiagnostics();
+            if (emitDiagnostics.length) {
+                return buildErrors(emitDiagnostics, BuildResultFlags.EmitErrors, "Emit");
+            }
+            // Update time stamps for rest of the outputs
+            newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(configFile, newestDeclarationFileContentChangedTime, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
+            var status = {
+                type: UpToDateStatusType.UpToDate,
+                newestDeclarationFileContentChangedTime: anyDtsChanged ? maximumDate : newestDeclarationFileContentChangedTime,
+                oldestOutputFileName: outputFiles.length ? outputFiles[0].name : getFirstProjectOutput(configFile)
+            };
+            diagnostics.removeKey(proj);
+            projectStatus.setValue(proj, status);
+            afterProgramCreate(proj, program);
+            return resultFlags;
+            function buildErrors(diagnostics, errorFlags, errorType) {
+                resultFlags |= errorFlags;
+                reportAndStoreErrors(proj, diagnostics);
+                projectStatus.setValue(proj, { type: UpToDateStatusType.Unbuildable, reason: errorType + " errors" });
+                afterProgramCreate(proj, program);
+                return resultFlags;
+            }
+        }
+        function afterProgramCreate(proj, program) {
+            if (host.afterProgramEmitAndDiagnostics) {
+                host.afterProgramEmitAndDiagnostics(program);
+            }
+            if (options.watch) {
+                program.releaseProgram();
+                builderPrograms.setValue(proj, program);
+            }
+        }
+        function updateOutputTimestamps(proj) {
+            if (options.dry) {
+                return reportStatus(ts.Diagnostics.A_non_dry_build_would_build_project_0, proj.options.configFilePath);
+            }
+            var priorNewestUpdateTime = updateOutputTimestampsWorker(proj, minimumDate, ts.Diagnostics.Updating_output_timestamps_of_project_0);
+            projectStatus.setValue(proj.options.configFilePath, { type: UpToDateStatusType.UpToDate, newestDeclarationFileContentChangedTime: priorNewestUpdateTime });
+        }
+        function updateOutputTimestampsWorker(proj, priorNewestUpdateTime, verboseMessage, skipOutputs) {
+            var outputs = getAllProjectOutputs(proj);
+            if (!skipOutputs || outputs.length !== skipOutputs.getSize()) {
+                if (options.verbose) {
+                    reportStatus(verboseMessage, proj.options.configFilePath);
+                }
+                var now = host.now ? host.now() : new Date();
+                for (var _i = 0, outputs_2 = outputs; _i < outputs_2.length; _i++) {
+                    var file = outputs_2[_i];
+                    if (skipOutputs && skipOutputs.hasKey(file)) {
+                        continue;
+                    }
+                    if (isDeclarationFile(file)) {
+                        priorNewestUpdateTime = newer(priorNewestUpdateTime, host.getModifiedTime(file) || ts.missingFileModifiedTime);
+                    }
+                    host.setModifiedTime(file, now);
+                    if (proj.options.listEmittedFiles) {
+                        writeFileName("TSFILE: " + file);
+                    }
+                }
+            }
+            return priorNewestUpdateTime;
+        }
+        function getFilesToClean() {
+            // Get the same graph for cleaning we'd use for building
+            var graph = getGlobalDependencyGraph();
+            var filesToDelete = [];
+            for (var _i = 0, _a = graph.buildQueue; _i < _a.length; _i++) {
+                var proj = _a[_i];
+                var parsed = parseConfigFile(proj);
+                if (parsed === undefined) {
+                    // File has gone missing; fine to ignore here
+                    reportParseConfigFileDiagnostic(proj);
+                    continue;
+                }
+                var outputs = getAllProjectOutputs(parsed);
+                for (var _b = 0, outputs_3 = outputs; _b < outputs_3.length; _b++) {
+                    var output = outputs_3[_b];
+                    if (host.fileExists(output)) {
+                        filesToDelete.push(output);
+                    }
+                }
+            }
+            return filesToDelete;
+        }
+        function cleanAllProjects() {
+            var filesToDelete = getFilesToClean();
+            if (options.dry) {
+                reportStatus(ts.Diagnostics.A_non_dry_build_would_delete_the_following_files_Colon_0, filesToDelete.map(function (f) { return "\r\n * " + f; }).join(""));
+                return ts.ExitStatus.Success;
+            }
+            for (var _i = 0, filesToDelete_1 = filesToDelete; _i < filesToDelete_1.length; _i++) {
+                var output = filesToDelete_1[_i];
+                host.deleteFile(output);
+            }
+            return ts.ExitStatus.Success;
+        }
+        function resolveProjectName(name) {
+            return resolveConfigFileProjectName(ts.resolvePath(host.getCurrentDirectory(), name));
+        }
+        function resolveProjectNames(configFileNames) {
+            return configFileNames.map(resolveProjectName);
+        }
+        function buildAllProjects() {
+            if (options.watch) {
+                reportWatchStatus(ts.Diagnostics.Starting_compilation_in_watch_mode);
+            }
+            // TODO:: In watch mode as well to use caches for incremental build once we can invalidate caches correctly and have right api
+            // Override readFile for json files and output .d.ts to cache the text
+            var savedReadFileWithCache = readFileWithCache;
+            var savedGetSourceFile = compilerHost.getSourceFile;
+            var _a = ts.changeCompilerHostLikeToUseCache(host, toPath, function () {
+                var args = [];
+                for (var _i = 0; _i < arguments.length; _i++) {
+                    args[_i] = arguments[_i];
+                }
+                return savedGetSourceFile.call.apply(savedGetSourceFile, [compilerHost].concat(args));
+            }), originalReadFile = _a.originalReadFile, originalFileExists = _a.originalFileExists, originalDirectoryExists = _a.originalDirectoryExists, originalCreateDirectory = _a.originalCreateDirectory, originalWriteFile = _a.originalWriteFile, getSourceFileWithCache = _a.getSourceFileWithCache, newReadFileWithCache = _a.readFileWithCache;
+            readFileWithCache = newReadFileWithCache;
+            compilerHost.getSourceFile = getSourceFileWithCache;
+            var graph = getGlobalDependencyGraph();
+            reportBuildQueue(graph);
+            var anyFailed = false;
+            for (var _i = 0, _b = graph.buildQueue; _i < _b.length; _i++) {
+                var next = _b[_i];
+                var proj = parseConfigFile(next);
+                if (proj === undefined) {
+                    reportParseConfigFileDiagnostic(next);
+                    anyFailed = true;
+                    break;
+                }
+                // report errors early when using continue or break statements
+                var errors = proj.errors;
+                var status = getUpToDateStatus(proj);
+                verboseReportProjectStatus(next, status);
+                var projName = proj.options.configFilePath;
+                if (status.type === UpToDateStatusType.UpToDate && !options.force) {
+                    reportAndStoreErrors(next, errors);
+                    // Up to date, skip
+                    if (defaultOptions.dry) {
+                        // In a dry build, inform the user of this fact
+                        reportStatus(ts.Diagnostics.Project_0_is_up_to_date, projName);
+                    }
+                    continue;
+                }
+                if (status.type === UpToDateStatusType.UpToDateWithUpstreamTypes && !options.force) {
+                    reportAndStoreErrors(next, errors);
+                    // Fake build
+                    updateOutputTimestamps(proj);
+                    continue;
+                }
+                if (status.type === UpToDateStatusType.UpstreamBlocked) {
+                    reportAndStoreErrors(next, errors);
+                    if (options.verbose)
+                        reportStatus(ts.Diagnostics.Skipping_build_of_project_0_because_its_dependency_1_has_errors, projName, status.upstreamProjectName);
+                    continue;
+                }
+                if (status.type === UpToDateStatusType.ContainerOnly) {
+                    reportAndStoreErrors(next, errors);
+                    // Do nothing
+                    continue;
+                }
+                var buildResult = buildSingleProject(next);
+                anyFailed = anyFailed || !!(buildResult & BuildResultFlags.AnyErrors);
+            }
+            reportErrorSummary();
+            host.readFile = originalReadFile;
+            host.fileExists = originalFileExists;
+            host.directoryExists = originalDirectoryExists;
+            host.createDirectory = originalCreateDirectory;
+            host.writeFile = originalWriteFile;
+            compilerHost.getSourceFile = savedGetSourceFile;
+            readFileWithCache = savedReadFileWithCache;
+            return anyFailed ? ts.ExitStatus.DiagnosticsPresent_OutputsSkipped : ts.ExitStatus.Success;
+        }
+        function reportParseConfigFileDiagnostic(proj) {
+            reportAndStoreErrors(proj, [configFileCache.getValue(proj)]);
+        }
+        function reportAndStoreErrors(proj, errors) {
+            reportErrors(errors);
+            projectErrorsReported.setValue(proj, true);
+            diagnostics.setValue(proj, errors);
+        }
+        function reportErrors(errors) {
+            errors.forEach(function (err) { return host.reportDiagnostic(err); });
+        }
+        /**
+         * Report the build ordering inferred from the current project graph if we're in verbose mode
+         */
+        function reportBuildQueue(graph) {
+            if (options.verbose) {
+                reportStatus(ts.Diagnostics.Projects_in_this_build_Colon_0, graph.buildQueue.map(function (s) { return "\r\n    * " + relName(s); }).join(""));
+            }
+        }
+        function relName(path) {
+            return ts.convertToRelativePath(path, host.getCurrentDirectory(), function (f) { return compilerHost.getCanonicalFileName(f); });
+        }
+        /**
+         * Report the up-to-date status of a project if we're in verbose mode
+         */
+        function verboseReportProjectStatus(configFileName, status) {
+            if (!options.verbose)
+                return;
+            return formatUpToDateStatus(configFileName, status, relName, reportStatus);
+        }
+    }
+    ts.createSolutionBuilder = createSolutionBuilder;
+    function resolveConfigFileProjectName(project) {
+        if (ts.fileExtensionIs(project, ".json" /* Json */)) {
+            return project;
+        }
+        return ts.combinePaths(project, "tsconfig.json");
+    }
+    ts.resolveConfigFileProjectName = resolveConfigFileProjectName;
+    function getAllProjectOutputs(project) {
+        if (project.options.outFile || project.options.out) {
+            return getOutFileOutputs(project);
+        }
+        else {
+            var outputs = [];
+            for (var _i = 0, _a = project.fileNames; _i < _a.length; _i++) {
+                var inputFile = _a[_i];
+                outputs.push.apply(outputs, getOutputFileNames(inputFile, project));
+            }
+            return outputs;
+        }
+    }
+    ts.getAllProjectOutputs = getAllProjectOutputs;
+    function getFirstProjectOutput(project) {
+        if (project.options.outFile || project.options.out) {
+            return ts.first(getOutFileOutputs(project));
+        }
+        for (var _i = 0, _a = project.fileNames; _i < _a.length; _i++) {
+            var inputFile = _a[_i];
+            var outputs = getOutputFileNames(inputFile, project);
+            if (outputs.length) {
+                return ts.first(outputs);
+            }
+        }
+        return ts.Debug.fail("project " + project.options.configFilePath + " expected to have at least one output");
+    }
+    function formatUpToDateStatus(configFileName, status, relName, formatMessage) {
+        switch (status.type) {
+            case UpToDateStatusType.OutOfDateWithSelf:
+                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(configFileName), relName(status.outOfDateOutputFileName), relName(status.newerInputFileName));
+            case UpToDateStatusType.OutOfDateWithUpstream:
+                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(configFileName), relName(status.outOfDateOutputFileName), relName(status.newerProjectName));
+            case UpToDateStatusType.OutputMissing:
+                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist, relName(configFileName), relName(status.missingOutputFileName));
+            case UpToDateStatusType.UpToDate:
+                if (status.newestInputFileTime !== undefined) {
+                    return formatMessage(ts.Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2, relName(configFileName), relName(status.newestInputFileName || ""), relName(status.oldestOutputFileName || ""));
+                }
+                // Don't report anything for "up to date because it was already built" -- too verbose
+                break;
+            case UpToDateStatusType.UpToDateWithUpstreamTypes:
+                return formatMessage(ts.Diagnostics.Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies, relName(configFileName));
+            case UpToDateStatusType.UpstreamOutOfDate:
+                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_its_dependency_1_is_out_of_date, relName(configFileName), relName(status.upstreamProjectName));
+            case UpToDateStatusType.UpstreamBlocked:
+                return formatMessage(ts.Diagnostics.Project_0_can_t_be_built_because_its_dependency_1_has_errors, relName(configFileName), relName(status.upstreamProjectName));
+            case UpToDateStatusType.Unbuildable:
+                return formatMessage(ts.Diagnostics.Failed_to_parse_file_0_Colon_1, relName(configFileName), status.reason);
+            case UpToDateStatusType.ContainerOnly:
+            // Don't report status on "solution" projects
+            case UpToDateStatusType.ComputingUpstream:
+                // Should never leak from getUptoDateStatusWorker
+                break;
+            default:
+                ts.assertType(status);
+        }
+    }
+    ts.formatUpToDateStatus = formatUpToDateStatus;
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var ValueKind;
+    (function (ValueKind) {
+        ValueKind[ValueKind["Const"] = 0] = "Const";
+        ValueKind[ValueKind["Array"] = 1] = "Array";
+        ValueKind[ValueKind["FunctionOrClass"] = 2] = "FunctionOrClass";
+        ValueKind[ValueKind["Object"] = 3] = "Object";
+    })(ValueKind = ts.ValueKind || (ts.ValueKind = {}));
+    function inspectModule(fileNameToRequire) {
+        return inspectValue(ts.removeFileExtension(ts.getBaseFileName(fileNameToRequire)), tryRequire(fileNameToRequire));
+    }
+    ts.inspectModule = inspectModule;
+    function inspectValue(name, value) {
+        return getValueInfo(name, value, getRecurser());
+    }
+    ts.inspectValue = inspectValue;
+    function getRecurser() {
+        var seen = [];
+        var nameStack = [];
+        return function (obj, name, cbOk, cbFail) {
+            if (seen.indexOf(obj) !== -1 || nameStack.length > 4) {
+                return cbFail(seen.indexOf(obj) !== -1, nameStack);
+            }
+            seen.push(obj);
+            nameStack.push(name);
+            var res = cbOk();
+            nameStack.pop();
+            seen.pop();
+            return res;
+        };
+    }
+    function getValueInfo(name, value, recurser) {
+        return recurser(value, name, function () {
+            if (typeof value === "function")
+                return getFunctionOrClassInfo(value, name, recurser);
+            if (typeof value === "object") {
+                var builtin = getBuiltinType(name, value, recurser);
+                if (builtin !== undefined)
+                    return builtin;
+                var entries = getEntriesOfObject(value);
+                var hasNontrivialPrototype = Object.getPrototypeOf(value) !== Object.prototype;
+                var members = ts.flatMap(entries, function (_a) {
+                    var key = _a.key, value = _a.value;
+                    return getValueInfo(key, value, recurser);
+                });
+                return { kind: 3 /* Object */, name: name, hasNontrivialPrototype: hasNontrivialPrototype, members: members };
+            }
+            return { kind: 0 /* Const */, name: name, typeName: isNullOrUndefined(value) ? "any" : typeof value };
+        }, function (isCircularReference, keyStack) { return anyValue(name, " " + (isCircularReference ? "Circular reference" : "Too-deep object hierarchy") + " from " + keyStack.join(".")); });
+    }
+    function getFunctionOrClassInfo(fn, name, recurser) {
+        var prototypeMembers = getPrototypeMembers(fn, recurser);
+        var namespaceMembers = ts.flatMap(getEntriesOfObject(fn), function (_a) {
+            var key = _a.key, value = _a.value;
+            return getValueInfo(key, value, recurser);
+        });
+        var toString = ts.cast(Function.prototype.toString.call(fn), ts.isString);
+        var source = ts.stringContains(toString, "{ [native code] }") ? getFunctionLength(fn) : toString;
+        return { kind: 2 /* FunctionOrClass */, name: name, source: source, namespaceMembers: namespaceMembers, prototypeMembers: prototypeMembers };
+    }
+    var builtins = ts.memoize(function () {
+        var map = ts.createMap();
+        for (var _i = 0, _a = getEntriesOfObject(global); _i < _a.length; _i++) {
+            var _b = _a[_i], key = _b.key, value = _b.value;
+            if (typeof value === "function" && typeof value.prototype === "object" && value !== Object) {
+                map.set(key, value);
+            }
+        }
+        return map;
+    });
+    function getBuiltinType(name, value, recurser) {
+        return ts.isArray(value)
+            ? { name: name, kind: 1 /* Array */, inner: value.length && getValueInfo("element", ts.first(value), recurser) || anyValue(name) }
+            : ts.forEachEntry(builtins(), function (builtin, builtinName) {
+                return value instanceof builtin ? { kind: 0 /* Const */, name: name, typeName: builtinName } : undefined;
+            });
+    }
+    function getPrototypeMembers(fn, recurser) {
+        var prototype = fn.prototype;
+        // tslint:disable-next-line no-unnecessary-type-assertion (TODO: update LKG and it will really be unnecessary)
+        return typeof prototype !== "object" || prototype === null ? ts.emptyArray : ts.mapDefined(getEntriesOfObject(prototype), function (_a) {
+            var key = _a.key, value = _a.value;
+            return key === "constructor" ? undefined : getValueInfo(key, value, recurser);
+        });
+    }
+    var ignoredProperties = ["arguments", "caller", "constructor", "eval", "super_"];
+    var reservedFunctionProperties = Object.getOwnPropertyNames(ts.noop);
+    function getEntriesOfObject(obj) {
+        var seen = ts.createMap();
+        var entries = [];
+        var chain = obj;
+        while (!isNullOrUndefined(chain) && chain !== Object.prototype && chain !== Function.prototype) {
+            for (var _i = 0, _a = Object.getOwnPropertyNames(chain); _i < _a.length; _i++) {
+                var key = _a[_i];
+                if (!isJsPrivate(key) &&
+                    ignoredProperties.indexOf(key) === -1 &&
+                    (typeof obj !== "function" || reservedFunctionProperties.indexOf(key) === -1) &&
+                    // Don't add property from a higher prototype if it already exists in a lower one
+                    ts.addToSeen(seen, key)) {
+                    var value = safeGetPropertyOfObject(chain, key);
+                    // Don't repeat "toString" that matches signature from Object.prototype
+                    if (!(key === "toString" && typeof value === "function" && value.length === 0)) {
+                        entries.push({ key: key, value: value });
+                    }
+                }
+            }
+            chain = Object.getPrototypeOf(chain);
+        }
+        return entries.sort(function (e1, e2) { return ts.compareStringsCaseSensitive(e1.key, e2.key); });
+    }
+    function getFunctionLength(fn) {
+        return ts.tryCast(safeGetPropertyOfObject(fn, "length"), ts.isNumber) || 0;
+    }
+    function safeGetPropertyOfObject(obj, key) {
+        var desc = Object.getOwnPropertyDescriptor(obj, key);
+        return desc && desc.value;
+    }
+    function isNullOrUndefined(value) {
+        return value == null; // tslint:disable-line
+    }
+    function anyValue(name, comment) {
+        return { kind: 0 /* Const */, name: name, typeName: "any", comment: comment };
+    }
+    function isJsPrivate(name) {
+        return ts.startsWith(name, "_");
+    }
+    ts.isJsPrivate = isJsPrivate;
+    function tryRequire(fileNameToRequire) {
+        try {
+            return require(fileNameToRequire);
+        }
+        catch (_a) {
+            return undefined;
+        }
+    }
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var server;
+    (function (server) {
+        // tslint:disable variable-name
+        server.ActionSet = "action::set";
+        server.ActionInvalidate = "action::invalidate";
+        server.ActionPackageInstalled = "action::packageInstalled";
+        server.ActionValueInspected = "action::valueInspected";
+        server.EventTypesRegistry = "event::typesRegistry";
+        server.EventBeginInstallTypes = "event::beginInstallTypes";
+        server.EventEndInstallTypes = "event::endInstallTypes";
+        server.EventInitializationFailed = "event::initializationFailed";
+        var Arguments;
+        (function (Arguments) {
+            Arguments.GlobalCacheLocation = "--globalTypingsCacheLocation";
+            Arguments.LogFile = "--logFile";
+            Arguments.EnableTelemetry = "--enableTelemetry";
+            Arguments.TypingSafeListLocation = "--typingSafeListLocation";
+            Arguments.TypesMapLocation = "--typesMapLocation";
+            /**
+             * This argument specifies the location of the NPM executable.
+             * typingsInstaller will run the command with `${npmLocation} install ...`.
+             */
+            Arguments.NpmLocation = "--npmLocation";
+        })(Arguments = server.Arguments || (server.Arguments = {}));
+        function hasArgument(argumentName) {
+            return ts.sys.args.indexOf(argumentName) >= 0;
+        }
+        server.hasArgument = hasArgument;
+        function findArgument(argumentName) {
+            var index = ts.sys.args.indexOf(argumentName);
+            return index >= 0 && index < ts.sys.args.length - 1
+                ? ts.sys.args[index + 1]
+                : undefined;
+        }
+        server.findArgument = findArgument;
+        function nowString() {
+            // E.g. "12:34:56.789"
+            var d = new Date();
+            return d.getHours() + ":" + d.getMinutes() + ":" + d.getSeconds() + "." + d.getMilliseconds();
+        }
+        server.nowString = nowString;
+    })(server = ts.server || (ts.server = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var JsTyping;
+    (function (JsTyping) {
+        function isTypingUpToDate(cachedTyping, availableTypingVersions) {
+            var availableVersion = new ts.Version(ts.getProperty(availableTypingVersions, "ts" + ts.versionMajorMinor) || ts.getProperty(availableTypingVersions, "latest"));
+            return availableVersion.compareTo(cachedTyping.version) <= 0;
+        }
+        JsTyping.isTypingUpToDate = isTypingUpToDate;
+        JsTyping.nodeCoreModuleList = [
+            "assert",
+            "async_hooks",
+            "buffer",
+            "child_process",
+            "cluster",
+            "console",
+            "constants",
+            "crypto",
+            "dgram",
+            "dns",
+            "domain",
+            "events",
+            "fs",
+            "http",
+            "https",
+            "http2",
+            "inspector",
+            "net",
+            "os",
+            "path",
+            "perf_hooks",
+            "process",
+            "punycode",
+            "querystring",
+            "readline",
+            "repl",
+            "stream",
+            "string_decoder",
+            "timers",
+            "tls",
+            "tty",
+            "url",
+            "util",
+            "v8",
+            "vm",
+            "zlib"
+        ];
+        JsTyping.nodeCoreModules = ts.arrayToSet(JsTyping.nodeCoreModuleList);
+        function loadSafeList(host, safeListPath) {
+            var result = ts.readConfigFile(safeListPath, function (path) { return host.readFile(path); });
+            return ts.createMapFromTemplate(result.config);
+        }
+        JsTyping.loadSafeList = loadSafeList;
+        function loadTypesMap(host, typesMapPath) {
+            var result = ts.readConfigFile(typesMapPath, function (path) { return host.readFile(path); });
+            if (result.config) {
+                return ts.createMapFromTemplate(result.config.simpleMap);
+            }
+            return undefined;
+        }
+        JsTyping.loadTypesMap = loadTypesMap;
+        /**
+         * @param host is the object providing I/O related operations.
+         * @param fileNames are the file names that belong to the same project
+         * @param projectRootPath is the path to the project root directory
+         * @param safeListPath is the path used to retrieve the safe list
+         * @param packageNameToTypingLocation is the map of package names to their cached typing locations and installed versions
+         * @param typeAcquisition is used to customize the typing acquisition process
+         * @param compilerOptions are used as a source for typing inference
+         */
+        function discoverTypings(host, log, fileNames, projectRootPath, safeList, packageNameToTypingLocation, typeAcquisition, unresolvedImports, typesRegistry) {
+            if (!typeAcquisition || !typeAcquisition.enable) {
+                return { cachedTypingPaths: [], newTypingNames: [], filesToWatch: [] };
+            }
+            // A typing name to typing file path mapping
+            var inferredTypings = ts.createMap();
+            // Only infer typings for .js and .jsx files
+            fileNames = ts.mapDefined(fileNames, function (fileName) {
+                var path = ts.normalizePath(fileName);
+                if (ts.hasJSFileExtension(path)) {
+                    return path;
+                }
+            });
+            var filesToWatch = [];
+            if (typeAcquisition.include)
+                addInferredTypings(typeAcquisition.include, "Explicitly included types");
+            var exclude = typeAcquisition.exclude || [];
+            // Directories to search for package.json, bower.json and other typing information
+            var possibleSearchDirs = ts.arrayToSet(fileNames, ts.getDirectoryPath);
+            possibleSearchDirs.set(projectRootPath, true);
+            possibleSearchDirs.forEach(function (_true, searchDir) {
+                var packageJsonPath = ts.combinePaths(searchDir, "package.json");
+                getTypingNamesFromJson(packageJsonPath, filesToWatch);
+                var bowerJsonPath = ts.combinePaths(searchDir, "bower.json");
+                getTypingNamesFromJson(bowerJsonPath, filesToWatch);
+                var bowerComponentsPath = ts.combinePaths(searchDir, "bower_components");
+                getTypingNamesFromPackagesFolder(bowerComponentsPath, filesToWatch);
+                var nodeModulesPath = ts.combinePaths(searchDir, "node_modules");
+                getTypingNamesFromPackagesFolder(nodeModulesPath, filesToWatch);
+            });
+            getTypingNamesFromSourceFileNames(fileNames);
+            // add typings for unresolved imports
+            if (unresolvedImports) {
+                var module_1 = ts.deduplicate(unresolvedImports.map(function (moduleId) { return JsTyping.nodeCoreModules.has(moduleId) ? "node" : moduleId; }), ts.equateStringsCaseSensitive, ts.compareStringsCaseSensitive);
+                addInferredTypings(module_1, "Inferred typings from unresolved imports");
+            }
+            // Add the cached typing locations for inferred typings that are already installed
+            packageNameToTypingLocation.forEach(function (typing, name) {
+                var registryEntry = typesRegistry.get(name);
+                if (inferredTypings.has(name) && inferredTypings.get(name) === undefined && registryEntry !== undefined && isTypingUpToDate(typing, registryEntry)) {
+                    inferredTypings.set(name, typing.typingLocation);
+                }
+            });
+            // Remove typings that the user has added to the exclude list
+            for (var _i = 0, exclude_1 = exclude; _i < exclude_1.length; _i++) {
+                var excludeTypingName = exclude_1[_i];
+                var didDelete = inferredTypings.delete(excludeTypingName);
+                if (didDelete && log)
+                    log("Typing for " + excludeTypingName + " is in exclude list, will be ignored.");
+            }
+            var newTypingNames = [];
+            var cachedTypingPaths = [];
+            inferredTypings.forEach(function (inferred, typing) {
+                if (inferred !== undefined) {
+                    cachedTypingPaths.push(inferred);
+                }
+                else {
+                    newTypingNames.push(typing);
+                }
+            });
+            var result = { cachedTypingPaths: cachedTypingPaths, newTypingNames: newTypingNames, filesToWatch: filesToWatch };
+            if (log)
+                log("Result: " + JSON.stringify(result));
+            return result;
+            function addInferredTyping(typingName) {
+                if (!inferredTypings.has(typingName)) {
+                    inferredTypings.set(typingName, undefined); // TODO: GH#18217
+                }
+            }
+            function addInferredTypings(typingNames, message) {
+                if (log)
+                    log(message + ": " + JSON.stringify(typingNames));
+                ts.forEach(typingNames, addInferredTyping);
+            }
+            /**
+             * Get the typing info from common package manager json files like package.json or bower.json
+             */
+            function getTypingNamesFromJson(jsonPath, filesToWatch) {
+                if (!host.fileExists(jsonPath)) {
+                    return;
+                }
+                filesToWatch.push(jsonPath);
+                var jsonConfig = ts.readConfigFile(jsonPath, function (path) { return host.readFile(path); }).config;
+                var jsonTypingNames = ts.flatMap([jsonConfig.dependencies, jsonConfig.devDependencies, jsonConfig.optionalDependencies, jsonConfig.peerDependencies], ts.getOwnKeys);
+                addInferredTypings(jsonTypingNames, "Typing names in '" + jsonPath + "' dependencies");
+            }
+            /**
+             * Infer typing names from given file names. For example, the file name "jquery-min.2.3.4.js"
+             * should be inferred to the 'jquery' typing name; and "angular-route.1.2.3.js" should be inferred
+             * to the 'angular-route' typing name.
+             * @param fileNames are the names for source files in the project
+             */
+            function getTypingNamesFromSourceFileNames(fileNames) {
+                var fromFileNames = ts.mapDefined(fileNames, function (j) {
+                    if (!ts.hasJSFileExtension(j))
+                        return undefined;
+                    var inferredTypingName = ts.removeFileExtension(ts.getBaseFileName(j.toLowerCase()));
+                    var cleanedTypingName = ts.removeMinAndVersionNumbers(inferredTypingName);
+                    return safeList.get(cleanedTypingName);
+                });
+                if (fromFileNames.length) {
+                    addInferredTypings(fromFileNames, "Inferred typings from file names");
+                }
+                var hasJsxFile = ts.some(fileNames, function (f) { return ts.fileExtensionIs(f, ".jsx" /* Jsx */); });
+                if (hasJsxFile) {
+                    if (log)
+                        log("Inferred 'react' typings due to presence of '.jsx' extension");
+                    addInferredTyping("react");
+                }
+            }
+            /**
+             * Infer typing names from packages folder (ex: node_module, bower_components)
+             * @param packagesFolderPath is the path to the packages folder
+             */
+            function getTypingNamesFromPackagesFolder(packagesFolderPath, filesToWatch) {
+                filesToWatch.push(packagesFolderPath);
+                // Todo: add support for ModuleResolutionHost too
+                if (!host.directoryExists(packagesFolderPath)) {
+                    return;
+                }
+                // depth of 2, so we access `node_modules/foo` but not `node_modules/foo/bar`
+                var fileNames = host.readDirectory(packagesFolderPath, [".json" /* Json */], /*excludes*/ undefined, /*includes*/ undefined, /*depth*/ 2);
+                if (log)
+                    log("Searching for typing names in " + packagesFolderPath + "; all files: " + JSON.stringify(fileNames));
+                var packageNames = [];
+                for (var _i = 0, fileNames_1 = fileNames; _i < fileNames_1.length; _i++) {
+                    var fileName = fileNames_1[_i];
+                    var normalizedFileName = ts.normalizePath(fileName);
+                    var baseFileName = ts.getBaseFileName(normalizedFileName);
+                    if (baseFileName !== "package.json" && baseFileName !== "bower.json") {
+                        continue;
+                    }
+                    var result_7 = ts.readConfigFile(normalizedFileName, function (path) { return host.readFile(path); });
+                    var packageJson = result_7.config;
+                    // npm 3's package.json contains a "_requiredBy" field
+                    // we should include all the top level module names for npm 2, and only module names whose
+                    // "_requiredBy" field starts with "#" or equals "/" for npm 3.
+                    if (baseFileName === "package.json" && packageJson._requiredBy &&
+                        ts.filter(packageJson._requiredBy, function (r) { return r[0] === "#" || r === "/"; }).length === 0) {
+                        continue;
+                    }
+                    // If the package has its own d.ts typings, those will take precedence. Otherwise the package name will be used
+                    // to download d.ts files from DefinitelyTyped
+                    if (!packageJson.name) {
+                        continue;
+                    }
+                    var ownTypes = packageJson.types || packageJson.typings;
+                    if (ownTypes) {
+                        var absolutePath = ts.getNormalizedAbsolutePath(ownTypes, ts.getDirectoryPath(normalizedFileName));
+                        if (log)
+                            log("    Package '" + packageJson.name + "' provides its own types.");
+                        inferredTypings.set(packageJson.name, absolutePath);
+                    }
+                    else {
+                        packageNames.push(packageJson.name);
+                    }
+                }
+                addInferredTypings(packageNames, "    Found package names");
+            }
+        }
+        JsTyping.discoverTypings = discoverTypings;
+        var PackageNameValidationResult;
+        (function (PackageNameValidationResult) {
+            PackageNameValidationResult[PackageNameValidationResult["Ok"] = 0] = "Ok";
+            PackageNameValidationResult[PackageNameValidationResult["ScopedPackagesNotSupported"] = 1] = "ScopedPackagesNotSupported";
+            PackageNameValidationResult[PackageNameValidationResult["EmptyName"] = 2] = "EmptyName";
+            PackageNameValidationResult[PackageNameValidationResult["NameTooLong"] = 3] = "NameTooLong";
+            PackageNameValidationResult[PackageNameValidationResult["NameStartsWithDot"] = 4] = "NameStartsWithDot";
+            PackageNameValidationResult[PackageNameValidationResult["NameStartsWithUnderscore"] = 5] = "NameStartsWithUnderscore";
+            PackageNameValidationResult[PackageNameValidationResult["NameContainsNonURISafeCharacters"] = 6] = "NameContainsNonURISafeCharacters";
+        })(PackageNameValidationResult = JsTyping.PackageNameValidationResult || (JsTyping.PackageNameValidationResult = {}));
+        var maxPackageNameLength = 214;
+        /**
+         * Validates package name using rules defined at https://docs.npmjs.com/files/package.json
+         */
+        function validatePackageName(packageName) {
+            if (!packageName) {
+                return 2 /* EmptyName */;
+            }
+            if (packageName.length > maxPackageNameLength) {
+                return 3 /* NameTooLong */;
+            }
+            if (packageName.charCodeAt(0) === 46 /* dot */) {
+                return 4 /* NameStartsWithDot */;
+            }
+            if (packageName.charCodeAt(0) === 95 /* _ */) {
+                return 5 /* NameStartsWithUnderscore */;
+            }
+            // check if name is scope package like: starts with @ and has one '/' in the middle
+            // scoped packages are not currently supported
+            // TODO: when support will be added we'll need to split and check both scope and package name
+            if (/^@[^/]+\/[^/]+$/.test(packageName)) {
+                return 1 /* ScopedPackagesNotSupported */;
+            }
+            if (encodeURIComponent(packageName) !== packageName) {
+                return 6 /* NameContainsNonURISafeCharacters */;
+            }
+            return 0 /* Ok */;
+        }
+        JsTyping.validatePackageName = validatePackageName;
+        function renderPackageNameValidationFailure(result, typing) {
+            switch (result) {
+                case 2 /* EmptyName */:
+                    return "Package name '" + typing + "' cannot be empty";
+                case 3 /* NameTooLong */:
+                    return "Package name '" + typing + "' should be less than " + maxPackageNameLength + " characters";
+                case 4 /* NameStartsWithDot */:
+                    return "Package name '" + typing + "' cannot start with '.'";
+                case 5 /* NameStartsWithUnderscore */:
+                    return "Package name '" + typing + "' cannot start with '_'";
+                case 1 /* ScopedPackagesNotSupported */:
+                    return "Package '" + typing + "' is scoped and currently is not supported";
+                case 6 /* NameContainsNonURISafeCharacters */:
+                    return "Package name '" + typing + "' contains non URI safe characters";
+                case 0 /* Ok */:
+                    return ts.Debug.fail(); // Shouldn't have called this.
+                default:
+                    throw ts.Debug.assertNever(result);
+            }
+        }
+        JsTyping.renderPackageNameValidationFailure = renderPackageNameValidationFailure;
+    })(JsTyping = ts.JsTyping || (ts.JsTyping = {}));
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    var ScriptSnapshot;
+    (function (ScriptSnapshot) {
+        var StringScriptSnapshot = /** @class */ (function () {
+            function StringScriptSnapshot(text) {
+                this.text = text;
+            }
+            StringScriptSnapshot.prototype.getText = function (start, end) {
+                return start === 0 && end === this.text.length
+                    ? this.text
+                    : this.text.substring(start, end);
+            };
+            StringScriptSnapshot.prototype.getLength = function () {
+                return this.text.length;
+            };
+            StringScriptSnapshot.prototype.getChangeRange = function () {
+                // Text-based snapshots do not support incremental parsing. Return undefined
+                // to signal that to the caller.
+                return undefined;
+            };
+            return StringScriptSnapshot;
+        }());
+        function fromString(text) {
+            return new StringScriptSnapshot(text);
+        }
+        ScriptSnapshot.fromString = fromString;
+    })(ScriptSnapshot = ts.ScriptSnapshot || (ts.ScriptSnapshot = {}));
+    /* @internal */
+    ts.emptyOptions = {};
+    var HighlightSpanKind;
+    (function (HighlightSpanKind) {
+        HighlightSpanKind["none"] = "none";
+        HighlightSpanKind["definition"] = "definition";
+        HighlightSpanKind["reference"] = "reference";
+        HighlightSpanKind["writtenReference"] = "writtenReference";
+    })(HighlightSpanKind = ts.HighlightSpanKind || (ts.HighlightSpanKind = {}));
+    var IndentStyle;
+    (function (IndentStyle) {
+        IndentStyle[IndentStyle["None"] = 0] = "None";
+        IndentStyle[IndentStyle["Block"] = 1] = "Block";
+        IndentStyle[IndentStyle["Smart"] = 2] = "Smart";
+    })(IndentStyle = ts.IndentStyle || (ts.IndentStyle = {}));
+    function getDefaultFormatCodeSettings(newLineCharacter) {
+        return {
+            indentSize: 4,
+            tabSize: 4,
+            newLineCharacter: newLineCharacter || "\n",
+            convertTabsToSpaces: true,
+            indentStyle: IndentStyle.Smart,
+            insertSpaceAfterConstructor: false,
+            insertSpaceAfterCommaDelimiter: true,
+            insertSpaceAfterSemicolonInForStatements: true,
+            insertSpaceBeforeAndAfterBinaryOperators: true,
+            insertSpaceAfterKeywordsInControlFlowStatements: true,
+            insertSpaceAfterFunctionKeywordForAnonymousFunctions: false,
+            insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: false,
+            insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: false,
+            insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces: true,
+            insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: false,
+            insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces: false,
+            insertSpaceBeforeFunctionParenthesis: false,
+            placeOpenBraceOnNewLineForFunctions: false,
+            placeOpenBraceOnNewLineForControlBlocks: false,
+        };
+    }
+    ts.getDefaultFormatCodeSettings = getDefaultFormatCodeSettings;
+    /* @internal */
+    ts.testFormatSettings = getDefaultFormatCodeSettings("\n");
+    var SymbolDisplayPartKind;
+    (function (SymbolDisplayPartKind) {
+        SymbolDisplayPartKind[SymbolDisplayPartKind["aliasName"] = 0] = "aliasName";
+        SymbolDisplayPartKind[SymbolDisplayPartKind["className"] = 1] = "className";
+        SymbolDisplayPartKind[SymbolDisplayPartKind["enumName"] = 2] = "enumName";
+        SymbolDisplayPartKind[SymbolDisplayPartKind["fieldName"] = 3] = "fieldName";
+        SymbolDisplayPartKind[SymbolDisplayPartKind["interfaceName"] = 4] = "interfaceName";
+        SymbolDisplayPartKind[SymbolDisplayPartKind["keyword"] = 5] = "keyword";
+        SymbolDisplayPartKind[SymbolDisplayPartKind["lineBreak"] = 6] = "lineBreak";
+        SymbolDisplayPartKind[SymbolDisplayPartKind["numericLiteral"] = 7] = "numericLiteral";
+        SymbolDisplayPartKind[SymbolDisplayPartKind["stringLiteral"] = 8] = "stringLiteral";
+        SymbolDisplayPartKind[SymbolDisplayPartKind["localName"] = 9] = "localName";
+        SymbolDisplayPartKind[SymbolDisplayPartKind["methodName"] = 10] = "methodName";
+        SymbolDisplayPartKind[SymbolDisplayPartKind["moduleName"] = 11] = "moduleName";
+        SymbolDisplayPartKind[SymbolDisplayPartKind["operator"] = 12] = "operator";
+        SymbolDisplayPartKind[SymbolDisplayPartKind["parameterName"] = 13] = "parameterName";
+        SymbolDisplayPartKind[SymbolDisplayPartKind["propertyName"] = 14] = "propertyName";
+        SymbolDisplayPartKind[SymbolDisplayPartKind["punctuation"] = 15] = "punctuation";
+        SymbolDisplayPartKind[SymbolDisplayPartKind["space"] = 16] = "space";
+        SymbolDisplayPartKind[SymbolDisplayPartKind["text"] = 17] = "text";
+        SymbolDisplayPartKind[SymbolDisplayPartKind["typeParameterName"] = 18] = "typeParameterName";
+        SymbolDisplayPartKind[SymbolDisplayPartKind["enumMemberName"] = 19] = "enumMemberName";
+        SymbolDisplayPartKind[SymbolDisplayPartKind["functionName"] = 20] = "functionName";
+        SymbolDisplayPartKind[SymbolDisplayPartKind["regularExpressionLiteral"] = 21] = "regularExpressionLiteral";
+    })(SymbolDisplayPartKind = ts.SymbolDisplayPartKind || (ts.SymbolDisplayPartKind = {}));
+    var OutliningSpanKind;
+    (function (OutliningSpanKind) {
+        /** Single or multi-line comments */
+        OutliningSpanKind["Comment"] = "comment";
+        /** Sections marked by '// #region' and '// #endregion' comments */
+        OutliningSpanKind["Region"] = "region";
+        /** Declarations and expressions */
+        OutliningSpanKind["Code"] = "code";
+        /** Contiguous blocks of import declarations */
+        OutliningSpanKind["Imports"] = "imports";
+    })(OutliningSpanKind = ts.OutliningSpanKind || (ts.OutliningSpanKind = {}));
+    var OutputFileType;
+    (function (OutputFileType) {
+        OutputFileType[OutputFileType["JavaScript"] = 0] = "JavaScript";
+        OutputFileType[OutputFileType["SourceMap"] = 1] = "SourceMap";
+        OutputFileType[OutputFileType["Declaration"] = 2] = "Declaration";
+    })(OutputFileType = ts.OutputFileType || (ts.OutputFileType = {}));
+    var EndOfLineState;
+    (function (EndOfLineState) {
+        EndOfLineState[EndOfLineState["None"] = 0] = "None";
+        EndOfLineState[EndOfLineState["InMultiLineCommentTrivia"] = 1] = "InMultiLineCommentTrivia";
+        EndOfLineState[EndOfLineState["InSingleQuoteStringLiteral"] = 2] = "InSingleQuoteStringLiteral";
+        EndOfLineState[EndOfLineState["InDoubleQuoteStringLiteral"] = 3] = "InDoubleQuoteStringLiteral";
+        EndOfLineState[EndOfLineState["InTemplateHeadOrNoSubstitutionTemplate"] = 4] = "InTemplateHeadOrNoSubstitutionTemplate";
+        EndOfLineState[EndOfLineState["InTemplateMiddleOrTail"] = 5] = "InTemplateMiddleOrTail";
+        EndOfLineState[EndOfLineState["InTemplateSubstitutionPosition"] = 6] = "InTemplateSubstitutionPosition";
+    })(EndOfLineState = ts.EndOfLineState || (ts.EndOfLineState = {}));
+    var TokenClass;
+    (function (TokenClass) {
+        TokenClass[TokenClass["Punctuation"] = 0] = "Punctuation";
+        TokenClass[TokenClass["Keyword"] = 1] = "Keyword";
+        TokenClass[TokenClass["Operator"] = 2] = "Operator";
+        TokenClass[TokenClass["Comment"] = 3] = "Comment";
+        TokenClass[TokenClass["Whitespace"] = 4] = "Whitespace";
+        TokenClass[TokenClass["Identifier"] = 5] = "Identifier";
+        TokenClass[TokenClass["NumberLiteral"] = 6] = "NumberLiteral";
+        TokenClass[TokenClass["BigIntLiteral"] = 7] = "BigIntLiteral";
+        TokenClass[TokenClass["StringLiteral"] = 8] = "StringLiteral";
+        TokenClass[TokenClass["RegExpLiteral"] = 9] = "RegExpLiteral";
+    })(TokenClass = ts.TokenClass || (ts.TokenClass = {}));
+    var ScriptElementKind;
+    (function (ScriptElementKind) {
+        ScriptElementKind["unknown"] = "";
+        ScriptElementKind["warning"] = "warning";
+        /** predefined type (void) or keyword (class) */
+        ScriptElementKind["keyword"] = "keyword";
+        /** top level script node */
+        ScriptElementKind["scriptElement"] = "script";
+        /** module foo {} */
+        ScriptElementKind["moduleElement"] = "module";
+        /** class X {} */
+        ScriptElementKind["classElement"] = "class";
+        /** var x = class X {} */
+        ScriptElementKind["localClassElement"] = "local class";
+        /** interface Y {} */
+        ScriptElementKind["interfaceElement"] = "interface";
+        /** type T = ... */
+        ScriptElementKind["typeElement"] = "type";
+        /** enum E */
+        ScriptElementKind["enumElement"] = "enum";
+        ScriptElementKind["enumMemberElement"] = "enum member";
+        /**
+         * Inside module and script only
+         * const v = ..
+         */
+        ScriptElementKind["variableElement"] = "var";
+        /** Inside function */
+        ScriptElementKind["localVariableElement"] = "local var";
+        /**
+         * Inside module and script only
+         * function f() { }
+         */
+        ScriptElementKind["functionElement"] = "function";
+        /** Inside function */
+        ScriptElementKind["localFunctionElement"] = "local function";
+        /** class X { [public|private]* foo() {} } */
+        ScriptElementKind["memberFunctionElement"] = "method";
+        /** class X { [public|private]* [get|set] foo:number; } */
+        ScriptElementKind["memberGetAccessorElement"] = "getter";
+        ScriptElementKind["memberSetAccessorElement"] = "setter";
+        /**
+         * class X { [public|private]* foo:number; }
+         * interface Y { foo:number; }
+         */
+        ScriptElementKind["memberVariableElement"] = "property";
+        /** class X { constructor() { } } */
+        ScriptElementKind["constructorImplementationElement"] = "constructor";
+        /** interface Y { ():number; } */
+        ScriptElementKind["callSignatureElement"] = "call";
+        /** interface Y { []:number; } */
+        ScriptElementKind["indexSignatureElement"] = "index";
+        /** interface Y { new():Y; } */
+        ScriptElementKind["constructSignatureElement"] = "construct";
+        /** function foo(*Y*: string) */
+        ScriptElementKind["parameterElement"] = "parameter";
+        ScriptElementKind["typeParameterElement"] = "type parameter";
+        ScriptElementKind["primitiveType"] = "primitive type";
+        ScriptElementKind["label"] = "label";
+        ScriptElementKind["alias"] = "alias";
+        ScriptElementKind["constElement"] = "const";
+        ScriptElementKind["letElement"] = "let";
+        ScriptElementKind["directory"] = "directory";
+        ScriptElementKind["externalModuleName"] = "external module name";
+        /**
+         * <JsxTagName attribute1 attribute2={0} />
+         */
+        ScriptElementKind["jsxAttribute"] = "JSX attribute";
+        /** String literal */
+        ScriptElementKind["string"] = "string";
+    })(ScriptElementKind = ts.ScriptElementKind || (ts.ScriptElementKind = {}));
+    var ScriptElementKindModifier;
+    (function (ScriptElementKindModifier) {
+        ScriptElementKindModifier["none"] = "";
+        ScriptElementKindModifier["publicMemberModifier"] = "public";
+        ScriptElementKindModifier["privateMemberModifier"] = "private";
+        ScriptElementKindModifier["protectedMemberModifier"] = "protected";
+        ScriptElementKindModifier["exportedModifier"] = "export";
+        ScriptElementKindModifier["ambientModifier"] = "declare";
+        ScriptElementKindModifier["staticModifier"] = "static";
+        ScriptElementKindModifier["abstractModifier"] = "abstract";
+        ScriptElementKindModifier["optionalModifier"] = "optional";
+        ScriptElementKindModifier["dtsModifier"] = ".d.ts";
+        ScriptElementKindModifier["tsModifier"] = ".ts";
+        ScriptElementKindModifier["tsxModifier"] = ".tsx";
+        ScriptElementKindModifier["jsModifier"] = ".js";
+        ScriptElementKindModifier["jsxModifier"] = ".jsx";
+        ScriptElementKindModifier["jsonModifier"] = ".json";
+    })(ScriptElementKindModifier = ts.ScriptElementKindModifier || (ts.ScriptElementKindModifier = {}));
+    var ClassificationTypeNames;
+    (function (ClassificationTypeNames) {
+        ClassificationTypeNames["comment"] = "comment";
+        ClassificationTypeNames["identifier"] = "identifier";
+        ClassificationTypeNames["keyword"] = "keyword";
+        ClassificationTypeNames["numericLiteral"] = "number";
+        ClassificationTypeNames["bigintLiteral"] = "bigint";
+        ClassificationTypeNames["operator"] = "operator";
+        ClassificationTypeNames["stringLiteral"] = "string";
+        ClassificationTypeNames["whiteSpace"] = "whitespace";
+        ClassificationTypeNames["text"] = "text";
+        ClassificationTypeNames["punctuation"] = "punctuation";
+        ClassificationTypeNames["className"] = "class name";
+        ClassificationTypeNames["enumName"] = "enum name";
+        ClassificationTypeNames["interfaceName"] = "interface name";
+        ClassificationTypeNames["moduleName"] = "module name";
+        ClassificationTypeNames["typeParameterName"] = "type parameter name";
+        ClassificationTypeNames["typeAliasName"] = "type alias name";
+        ClassificationTypeNames["parameterName"] = "parameter name";
+        ClassificationTypeNames["docCommentTagName"] = "doc comment tag name";
+        ClassificationTypeNames["jsxOpenTagName"] = "jsx open tag name";
+        ClassificationTypeNames["jsxCloseTagName"] = "jsx close tag name";
+        ClassificationTypeNames["jsxSelfClosingTagName"] = "jsx self closing tag name";
+        ClassificationTypeNames["jsxAttribute"] = "jsx attribute";
+        ClassificationTypeNames["jsxText"] = "jsx text";
+        ClassificationTypeNames["jsxAttributeStringLiteralValue"] = "jsx attribute string literal value";
+    })(ClassificationTypeNames = ts.ClassificationTypeNames || (ts.ClassificationTypeNames = {}));
+    var ClassificationType;
+    (function (ClassificationType) {
+        ClassificationType[ClassificationType["comment"] = 1] = "comment";
+        ClassificationType[ClassificationType["identifier"] = 2] = "identifier";
+        ClassificationType[ClassificationType["keyword"] = 3] = "keyword";
+        ClassificationType[ClassificationType["numericLiteral"] = 4] = "numericLiteral";
+        ClassificationType[ClassificationType["operator"] = 5] = "operator";
+        ClassificationType[ClassificationType["stringLiteral"] = 6] = "stringLiteral";
+        ClassificationType[ClassificationType["regularExpressionLiteral"] = 7] = "regularExpressionLiteral";
+        ClassificationType[ClassificationType["whiteSpace"] = 8] = "whiteSpace";
+        ClassificationType[ClassificationType["text"] = 9] = "text";
+        ClassificationType[ClassificationType["punctuation"] = 10] = "punctuation";
+        ClassificationType[ClassificationType["className"] = 11] = "className";
+        ClassificationType[ClassificationType["enumName"] = 12] = "enumName";
+        ClassificationType[ClassificationType["interfaceName"] = 13] = "interfaceName";
+        ClassificationType[ClassificationType["moduleName"] = 14] = "moduleName";
+        ClassificationType[ClassificationType["typeParameterName"] = 15] = "typeParameterName";
+        ClassificationType[ClassificationType["typeAliasName"] = 16] = "typeAliasName";
+        ClassificationType[ClassificationType["parameterName"] = 17] = "parameterName";
+        ClassificationType[ClassificationType["docCommentTagName"] = 18] = "docCommentTagName";
+        ClassificationType[ClassificationType["jsxOpenTagName"] = 19] = "jsxOpenTagName";
+        ClassificationType[ClassificationType["jsxCloseTagName"] = 20] = "jsxCloseTagName";
+        ClassificationType[ClassificationType["jsxSelfClosingTagName"] = 21] = "jsxSelfClosingTagName";
+        ClassificationType[ClassificationType["jsxAttribute"] = 22] = "jsxAttribute";
+        ClassificationType[ClassificationType["jsxText"] = 23] = "jsxText";
+        ClassificationType[ClassificationType["jsxAttributeStringLiteralValue"] = 24] = "jsxAttributeStringLiteralValue";
+        ClassificationType[ClassificationType["bigintLiteral"] = 25] = "bigintLiteral";
+    })(ClassificationType = ts.ClassificationType || (ts.ClassificationType = {}));
+})(ts || (ts = {}));
+// These utilities are common to multiple language service features.
+/* @internal */
+var ts;
+(function (ts) {
+    ts.scanner = ts.createScanner(6 /* Latest */, /*skipTrivia*/ true);
+    var SemanticMeaning;
+    (function (SemanticMeaning) {
+        SemanticMeaning[SemanticMeaning["None"] = 0] = "None";
+        SemanticMeaning[SemanticMeaning["Value"] = 1] = "Value";
+        SemanticMeaning[SemanticMeaning["Type"] = 2] = "Type";
+        SemanticMeaning[SemanticMeaning["Namespace"] = 4] = "Namespace";
+        SemanticMeaning[SemanticMeaning["All"] = 7] = "All";
+    })(SemanticMeaning = ts.SemanticMeaning || (ts.SemanticMeaning = {}));
+    function getMeaningFromDeclaration(node) {
+        switch (node.kind) {
+            case 237 /* VariableDeclaration */:
+                return ts.isInJSFile(node) && ts.getJSDocEnumTag(node) ? 7 /* All */ : 1 /* Value */;
+            case 151 /* Parameter */:
+            case 186 /* BindingElement */:
+            case 154 /* PropertyDeclaration */:
+            case 153 /* PropertySignature */:
+            case 275 /* PropertyAssignment */:
+            case 276 /* ShorthandPropertyAssignment */:
+            case 156 /* MethodDeclaration */:
+            case 155 /* MethodSignature */:
+            case 157 /* Constructor */:
+            case 158 /* GetAccessor */:
+            case 159 /* SetAccessor */:
+            case 239 /* FunctionDeclaration */:
+            case 196 /* FunctionExpression */:
+            case 197 /* ArrowFunction */:
+            case 274 /* CatchClause */:
+            case 267 /* JsxAttribute */:
+                return 1 /* Value */;
+            case 150 /* TypeParameter */:
+            case 241 /* InterfaceDeclaration */:
+            case 242 /* TypeAliasDeclaration */:
+            case 168 /* TypeLiteral */:
+                return 2 /* Type */;
+            case 304 /* JSDocTypedefTag */:
+                // If it has no name node, it shares the name with the value declaration below it.
+                return node.name === undefined ? 1 /* Value */ | 2 /* Type */ : 2 /* Type */;
+            case 278 /* EnumMember */:
+            case 240 /* ClassDeclaration */:
+                return 1 /* Value */ | 2 /* Type */;
+            case 244 /* ModuleDeclaration */:
+                if (ts.isAmbientModule(node)) {
+                    return 4 /* Namespace */ | 1 /* Value */;
+                }
+                else if (ts.getModuleInstanceState(node) === 1 /* Instantiated */) {
+                    return 4 /* Namespace */ | 1 /* Value */;
+                }
+                else {
+                    return 4 /* Namespace */;
+                }
+            case 243 /* EnumDeclaration */:
+            case 252 /* NamedImports */:
+            case 253 /* ImportSpecifier */:
+            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportDeclaration */:
+            case 254 /* ExportAssignment */:
+            case 255 /* ExportDeclaration */:
+                return 7 /* All */;
+            // An external module can be a Value
+            case 279 /* SourceFile */:
+                return 4 /* Namespace */ | 1 /* Value */;
+        }
+        return 7 /* All */;
+    }
+    ts.getMeaningFromDeclaration = getMeaningFromDeclaration;
+    function getMeaningFromLocation(node) {
+        if (node.kind === 279 /* SourceFile */) {
+            return 1 /* Value */;
+        }
+        else if (node.parent.kind === 254 /* ExportAssignment */ || node.parent.kind === 259 /* ExternalModuleReference */) {
+            return 7 /* All */;
+        }
+        else if (isInRightSideOfInternalImportEqualsDeclaration(node)) {
+            return getMeaningFromRightHandSideOfImportEquals(node);
+        }
+        else if (ts.isDeclarationName(node)) {
+            return getMeaningFromDeclaration(node.parent);
+        }
+        else if (isTypeReference(node)) {
+            return 2 /* Type */;
+        }
+        else if (isNamespaceReference(node)) {
+            return 4 /* Namespace */;
+        }
+        else if (ts.isTypeParameterDeclaration(node.parent)) {
+            ts.Debug.assert(ts.isJSDocTemplateTag(node.parent.parent)); // Else would be handled by isDeclarationName
+            return 2 /* Type */;
+        }
+        else if (ts.isLiteralTypeNode(node.parent)) {
+            // This might be T["name"], which is actually referencing a property and not a type. So allow both meanings.
+            return 2 /* Type */ | 1 /* Value */;
+        }
+        else {
+            return 1 /* Value */;
+        }
+    }
+    ts.getMeaningFromLocation = getMeaningFromLocation;
+    function getMeaningFromRightHandSideOfImportEquals(node) {
+        //     import a = |b|; // Namespace
+        //     import a = |b.c|; // Value, type, namespace
+        //     import a = |b.c|.d; // Namespace
+        var name = node.kind === 148 /* QualifiedName */ ? node : ts.isQualifiedName(node.parent) && node.parent.right === node ? node.parent : undefined;
+        return name && name.parent.kind === 248 /* ImportEqualsDeclaration */ ? 7 /* All */ : 4 /* Namespace */;
+    }
+    function isInRightSideOfInternalImportEqualsDeclaration(node) {
+        while (node.parent.kind === 148 /* QualifiedName */) {
+            node = node.parent;
+        }
+        return ts.isInternalModuleImportEqualsDeclaration(node.parent) && node.parent.moduleReference === node;
+    }
+    ts.isInRightSideOfInternalImportEqualsDeclaration = isInRightSideOfInternalImportEqualsDeclaration;
+    function isNamespaceReference(node) {
+        return isQualifiedNameNamespaceReference(node) || isPropertyAccessNamespaceReference(node);
+    }
+    function isQualifiedNameNamespaceReference(node) {
+        var root = node;
+        var isLastClause = true;
+        if (root.parent.kind === 148 /* QualifiedName */) {
+            while (root.parent && root.parent.kind === 148 /* QualifiedName */) {
+                root = root.parent;
+            }
+            isLastClause = root.right === node;
+        }
+        return root.parent.kind === 164 /* TypeReference */ && !isLastClause;
+    }
+    function isPropertyAccessNamespaceReference(node) {
+        var root = node;
+        var isLastClause = true;
+        if (root.parent.kind === 189 /* PropertyAccessExpression */) {
+            while (root.parent && root.parent.kind === 189 /* PropertyAccessExpression */) {
+                root = root.parent;
+            }
+            isLastClause = root.name === node;
+        }
+        if (!isLastClause && root.parent.kind === 211 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 273 /* HeritageClause */) {
+            var decl = root.parent.parent.parent;
+            return (decl.kind === 240 /* ClassDeclaration */ && root.parent.parent.token === 109 /* ImplementsKeyword */) ||
+                (decl.kind === 241 /* InterfaceDeclaration */ && root.parent.parent.token === 86 /* ExtendsKeyword */);
+        }
+        return false;
+    }
+    function isTypeReference(node) {
+        if (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
+            node = node.parent;
+        }
+        switch (node.kind) {
+            case 100 /* ThisKeyword */:
+                return !ts.isExpressionNode(node);
+            case 178 /* ThisType */:
+                return true;
+        }
+        switch (node.parent.kind) {
+            case 164 /* TypeReference */:
+                return true;
+            case 183 /* ImportType */:
+                return !node.parent.isTypeOf;
+            case 211 /* ExpressionWithTypeArguments */:
+                return !ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent);
+        }
+        return false;
+    }
+    function isCallExpressionTarget(node) {
+        return isCallOrNewExpressionTargetWorker(node, ts.isCallExpression);
+    }
+    ts.isCallExpressionTarget = isCallExpressionTarget;
+    function isNewExpressionTarget(node) {
+        return isCallOrNewExpressionTargetWorker(node, ts.isNewExpression);
+    }
+    ts.isNewExpressionTarget = isNewExpressionTarget;
+    function isCallOrNewExpressionTarget(node) {
+        return isCallOrNewExpressionTargetWorker(node, ts.isCallOrNewExpression);
+    }
+    ts.isCallOrNewExpressionTarget = isCallOrNewExpressionTarget;
+    function isCallOrNewExpressionTargetWorker(node, pred) {
+        var target = climbPastPropertyAccess(node);
+        return !!target && !!target.parent && pred(target.parent) && target.parent.expression === target;
+    }
+    function climbPastPropertyAccess(node) {
+        return isRightSideOfPropertyAccess(node) ? node.parent : node;
+    }
+    ts.climbPastPropertyAccess = climbPastPropertyAccess;
+    function getTargetLabel(referenceNode, labelName) {
+        while (referenceNode) {
+            if (referenceNode.kind === 233 /* LabeledStatement */ && referenceNode.label.escapedText === labelName) {
+                return referenceNode.label;
+            }
+            referenceNode = referenceNode.parent;
+        }
+        return undefined;
+    }
+    ts.getTargetLabel = getTargetLabel;
+    function hasPropertyAccessExpressionWithName(node, funcName) {
+        if (!ts.isPropertyAccessExpression(node.expression)) {
+            return false;
+        }
+        return node.expression.name.text === funcName;
+    }
+    ts.hasPropertyAccessExpressionWithName = hasPropertyAccessExpressionWithName;
+    function isJumpStatementTarget(node) {
+        return node.kind === 72 /* Identifier */ && ts.isBreakOrContinueStatement(node.parent) && node.parent.label === node;
+    }
+    ts.isJumpStatementTarget = isJumpStatementTarget;
+    function isLabelOfLabeledStatement(node) {
+        return node.kind === 72 /* Identifier */ && ts.isLabeledStatement(node.parent) && node.parent.label === node;
+    }
+    ts.isLabelOfLabeledStatement = isLabelOfLabeledStatement;
+    function isLabelName(node) {
+        return isLabelOfLabeledStatement(node) || isJumpStatementTarget(node);
+    }
+    ts.isLabelName = isLabelName;
+    function isTagName(node) {
+        return ts.isJSDocTag(node.parent) && node.parent.tagName === node;
+    }
+    ts.isTagName = isTagName;
+    function isRightSideOfQualifiedName(node) {
+        return node.parent.kind === 148 /* QualifiedName */ && node.parent.right === node;
+    }
+    ts.isRightSideOfQualifiedName = isRightSideOfQualifiedName;
+    function isRightSideOfPropertyAccess(node) {
+        return node && node.parent && node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node;
+    }
+    ts.isRightSideOfPropertyAccess = isRightSideOfPropertyAccess;
+    function isNameOfModuleDeclaration(node) {
+        return node.parent.kind === 244 /* ModuleDeclaration */ && node.parent.name === node;
+    }
+    ts.isNameOfModuleDeclaration = isNameOfModuleDeclaration;
+    function isNameOfFunctionDeclaration(node) {
+        return node.kind === 72 /* Identifier */ &&
+            ts.isFunctionLike(node.parent) && node.parent.name === node;
+    }
+    ts.isNameOfFunctionDeclaration = isNameOfFunctionDeclaration;
+    function isLiteralNameOfPropertyDeclarationOrIndexAccess(node) {
+        switch (node.parent.kind) {
+            case 154 /* PropertyDeclaration */:
+            case 153 /* PropertySignature */:
+            case 275 /* PropertyAssignment */:
+            case 278 /* EnumMember */:
+            case 156 /* MethodDeclaration */:
+            case 155 /* MethodSignature */:
+            case 158 /* GetAccessor */:
+            case 159 /* SetAccessor */:
+            case 244 /* ModuleDeclaration */:
+                return ts.getNameOfDeclaration(node.parent) === node;
+            case 190 /* ElementAccessExpression */:
+                return node.parent.argumentExpression === node;
+            case 149 /* ComputedPropertyName */:
+                return true;
+            case 182 /* LiteralType */:
+                return node.parent.parent.kind === 180 /* IndexedAccessType */;
+            default:
+                return false;
+        }
+    }
+    ts.isLiteralNameOfPropertyDeclarationOrIndexAccess = isLiteralNameOfPropertyDeclarationOrIndexAccess;
+    function isExpressionOfExternalModuleImportEqualsDeclaration(node) {
+        return ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) &&
+            ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node;
+    }
+    ts.isExpressionOfExternalModuleImportEqualsDeclaration = isExpressionOfExternalModuleImportEqualsDeclaration;
+    function getContainerNode(node) {
+        if (ts.isJSDocTypeAlias(node)) {
+            // This doesn't just apply to the node immediately under the comment, but to everything in its parent's scope.
+            // node.parent = the JSDoc comment, node.parent.parent = the node having the comment.
+            // Then we get parent again in the loop.
+            node = node.parent.parent;
+        }
+        while (true) {
+            node = node.parent;
+            if (!node) {
+                return undefined;
+            }
+            switch (node.kind) {
+                case 279 /* SourceFile */:
+                case 156 /* MethodDeclaration */:
+                case 155 /* MethodSignature */:
+                case 239 /* FunctionDeclaration */:
+                case 196 /* FunctionExpression */:
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                case 240 /* ClassDeclaration */:
+                case 241 /* InterfaceDeclaration */:
+                case 243 /* EnumDeclaration */:
+                case 244 /* ModuleDeclaration */:
+                    return node;
+            }
+        }
+    }
+    ts.getContainerNode = getContainerNode;
+    function getNodeKind(node) {
+        switch (node.kind) {
+            case 279 /* SourceFile */:
+                return ts.isExternalModule(node) ? "module" /* moduleElement */ : "script" /* scriptElement */;
+            case 244 /* ModuleDeclaration */:
+                return "module" /* moduleElement */;
+            case 240 /* ClassDeclaration */:
+            case 209 /* ClassExpression */:
+                return "class" /* classElement */;
+            case 241 /* InterfaceDeclaration */: return "interface" /* interfaceElement */;
+            case 242 /* TypeAliasDeclaration */:
+            case 297 /* JSDocCallbackTag */:
+            case 304 /* JSDocTypedefTag */:
+                return "type" /* typeElement */;
+            case 243 /* EnumDeclaration */: return "enum" /* enumElement */;
+            case 237 /* VariableDeclaration */:
+                return getKindOfVariableDeclaration(node);
+            case 186 /* BindingElement */:
+                return getKindOfVariableDeclaration(ts.getRootDeclaration(node));
+            case 197 /* ArrowFunction */:
+            case 239 /* FunctionDeclaration */:
+            case 196 /* FunctionExpression */:
+                return "function" /* functionElement */;
+            case 158 /* GetAccessor */: return "getter" /* memberGetAccessorElement */;
+            case 159 /* SetAccessor */: return "setter" /* memberSetAccessorElement */;
+            case 156 /* MethodDeclaration */:
+            case 155 /* MethodSignature */:
+                return "method" /* memberFunctionElement */;
+            case 154 /* PropertyDeclaration */:
+            case 153 /* PropertySignature */:
+                return "property" /* memberVariableElement */;
+            case 162 /* IndexSignature */: return "index" /* indexSignatureElement */;
+            case 161 /* ConstructSignature */: return "construct" /* constructSignatureElement */;
+            case 160 /* CallSignature */: return "call" /* callSignatureElement */;
+            case 157 /* Constructor */: return "constructor" /* constructorImplementationElement */;
+            case 150 /* TypeParameter */: return "type parameter" /* typeParameterElement */;
+            case 278 /* EnumMember */: return "enum member" /* enumMemberElement */;
+            case 151 /* Parameter */: return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) ? "property" /* memberVariableElement */ : "parameter" /* parameterElement */;
+            case 248 /* ImportEqualsDeclaration */:
+            case 253 /* ImportSpecifier */:
+            case 257 /* ExportSpecifier */:
+            case 251 /* NamespaceImport */:
+                return "alias" /* alias */;
+            case 204 /* BinaryExpression */:
+                var kind = ts.getAssignmentDeclarationKind(node);
+                var right = node.right;
+                switch (kind) {
+                    case 7 /* ObjectDefinePropertyValue */:
+                    case 8 /* ObjectDefinePropertyExports */:
+                    case 9 /* ObjectDefinePrototypeProperty */:
+                    case 0 /* None */:
+                        return "" /* unknown */;
+                    case 1 /* ExportsProperty */:
+                    case 2 /* ModuleExports */:
+                        var rightKind = getNodeKind(right);
+                        return rightKind === "" /* unknown */ ? "const" /* constElement */ : rightKind;
+                    case 3 /* PrototypeProperty */:
+                        return ts.isFunctionExpression(right) ? "method" /* memberFunctionElement */ : "property" /* memberVariableElement */;
+                    case 4 /* ThisProperty */:
+                        return "property" /* memberVariableElement */; // property
+                    case 5 /* Property */:
+                        // static method / property
+                        return ts.isFunctionExpression(right) ? "method" /* memberFunctionElement */ : "property" /* memberVariableElement */;
+                    case 6 /* Prototype */:
+                        return "local class" /* localClassElement */;
+                    default: {
+                        ts.assertType(kind);
+                        return "" /* unknown */;
+                    }
+                }
+            case 72 /* Identifier */:
+                return ts.isImportClause(node.parent) ? "alias" /* alias */ : "" /* unknown */;
+            default:
+                return "" /* unknown */;
+        }
+        function getKindOfVariableDeclaration(v) {
+            return ts.isVarConst(v)
+                ? "const" /* constElement */
+                : ts.isLet(v)
+                    ? "let" /* letElement */
+                    : "var" /* variableElement */;
+        }
+    }
+    ts.getNodeKind = getNodeKind;
+    function isThis(node) {
+        switch (node.kind) {
+            case 100 /* ThisKeyword */:
+                // case SyntaxKind.ThisType: TODO: GH#9267
+                return true;
+            case 72 /* Identifier */:
+                // 'this' as a parameter
+                return ts.identifierIsThisKeyword(node) && node.parent.kind === 151 /* Parameter */;
+            default:
+                return false;
+        }
+    }
+    ts.isThis = isThis;
+    // Matches the beginning of a triple slash directive
+    var tripleSlashDirectivePrefixRegex = /^\/\/\/\s*</;
+    function getLineStartPositionForPosition(position, sourceFile) {
+        var lineStarts = ts.getLineStarts(sourceFile);
+        var line = sourceFile.getLineAndCharacterOfPosition(position).line;
+        return lineStarts[line];
+    }
+    ts.getLineStartPositionForPosition = getLineStartPositionForPosition;
+    function rangeContainsRange(r1, r2) {
+        return startEndContainsRange(r1.pos, r1.end, r2);
+    }
+    ts.rangeContainsRange = rangeContainsRange;
+    function rangeContainsRangeExclusive(r1, r2) {
+        return rangeContainsPositionExclusive(r1, r2.pos) && rangeContainsPositionExclusive(r1, r2.end);
+    }
+    ts.rangeContainsRangeExclusive = rangeContainsRangeExclusive;
+    function rangeContainsPosition(r, pos) {
+        return r.pos <= pos && pos <= r.end;
+    }
+    ts.rangeContainsPosition = rangeContainsPosition;
+    function rangeContainsPositionExclusive(r, pos) {
+        return r.pos < pos && pos < r.end;
+    }
+    ts.rangeContainsPositionExclusive = rangeContainsPositionExclusive;
+    function startEndContainsRange(start, end, range) {
+        return start <= range.pos && end >= range.end;
+    }
+    ts.startEndContainsRange = startEndContainsRange;
+    function rangeContainsStartEnd(range, start, end) {
+        return range.pos <= start && range.end >= end;
+    }
+    ts.rangeContainsStartEnd = rangeContainsStartEnd;
+    function rangeOverlapsWithStartEnd(r1, start, end) {
+        return startEndOverlapsWithStartEnd(r1.pos, r1.end, start, end);
+    }
+    ts.rangeOverlapsWithStartEnd = rangeOverlapsWithStartEnd;
+    function nodeOverlapsWithStartEnd(node, sourceFile, start, end) {
+        return startEndOverlapsWithStartEnd(node.getStart(sourceFile), node.end, start, end);
+    }
+    ts.nodeOverlapsWithStartEnd = nodeOverlapsWithStartEnd;
+    function startEndOverlapsWithStartEnd(start1, end1, start2, end2) {
+        var start = Math.max(start1, start2);
+        var end = Math.min(end1, end2);
+        return start < end;
+    }
+    ts.startEndOverlapsWithStartEnd = startEndOverlapsWithStartEnd;
+    /**
+     * Assumes `candidate.start <= position` holds.
+     */
+    function positionBelongsToNode(candidate, position, sourceFile) {
+        ts.Debug.assert(candidate.pos <= position);
+        return position < candidate.end || !isCompletedNode(candidate, sourceFile);
+    }
+    ts.positionBelongsToNode = positionBelongsToNode;
+    function isCompletedNode(n, sourceFile) {
+        if (n === undefined || ts.nodeIsMissing(n)) {
+            return false;
+        }
+        switch (n.kind) {
+            case 240 /* ClassDeclaration */:
+            case 241 /* InterfaceDeclaration */:
+            case 243 /* EnumDeclaration */:
+            case 188 /* ObjectLiteralExpression */:
+            case 184 /* ObjectBindingPattern */:
+            case 168 /* TypeLiteral */:
+            case 218 /* Block */:
+            case 245 /* ModuleBlock */:
+            case 246 /* CaseBlock */:
+            case 252 /* NamedImports */:
+            case 256 /* NamedExports */:
+                return nodeEndsWith(n, 19 /* CloseBraceToken */, sourceFile);
+            case 274 /* CatchClause */:
+                return isCompletedNode(n.block, sourceFile);
+            case 192 /* NewExpression */:
+                if (!n.arguments) {
+                    return true;
+                }
+            // falls through
+            case 191 /* CallExpression */:
+            case 195 /* ParenthesizedExpression */:
+            case 177 /* ParenthesizedType */:
+                return nodeEndsWith(n, 21 /* CloseParenToken */, sourceFile);
+            case 165 /* FunctionType */:
+            case 166 /* ConstructorType */:
+                return isCompletedNode(n.type, sourceFile);
+            case 157 /* Constructor */:
+            case 158 /* GetAccessor */:
+            case 159 /* SetAccessor */:
+            case 239 /* FunctionDeclaration */:
+            case 196 /* FunctionExpression */:
+            case 156 /* MethodDeclaration */:
+            case 155 /* MethodSignature */:
+            case 161 /* ConstructSignature */:
+            case 160 /* CallSignature */:
+            case 197 /* ArrowFunction */:
+                if (n.body) {
+                    return isCompletedNode(n.body, sourceFile);
+                }
+                if (n.type) {
+                    return isCompletedNode(n.type, sourceFile);
+                }
+                // Even though type parameters can be unclosed, we can get away with
+                // having at least a closing paren.
+                return hasChildOfKind(n, 21 /* CloseParenToken */, sourceFile);
+            case 244 /* ModuleDeclaration */:
+                return !!n.body && isCompletedNode(n.body, sourceFile);
+            case 222 /* IfStatement */:
+                if (n.elseStatement) {
+                    return isCompletedNode(n.elseStatement, sourceFile);
+                }
+                return isCompletedNode(n.thenStatement, sourceFile);
+            case 221 /* ExpressionStatement */:
+                return isCompletedNode(n.expression, sourceFile) ||
+                    hasChildOfKind(n, 26 /* SemicolonToken */, sourceFile);
+            case 187 /* ArrayLiteralExpression */:
+            case 185 /* ArrayBindingPattern */:
+            case 190 /* ElementAccessExpression */:
+            case 149 /* ComputedPropertyName */:
+            case 170 /* TupleType */:
+                return nodeEndsWith(n, 23 /* CloseBracketToken */, sourceFile);
+            case 162 /* IndexSignature */:
+                if (n.type) {
+                    return isCompletedNode(n.type, sourceFile);
+                }
+                return hasChildOfKind(n, 23 /* CloseBracketToken */, sourceFile);
+            case 271 /* CaseClause */:
+            case 272 /* DefaultClause */:
+                // there is no such thing as terminator token for CaseClause/DefaultClause so for simplicity always consider them non-completed
+                return false;
+            case 225 /* ForStatement */:
+            case 226 /* ForInStatement */:
+            case 227 /* ForOfStatement */:
+            case 224 /* WhileStatement */:
+                return isCompletedNode(n.statement, sourceFile);
+            case 223 /* DoStatement */:
+                // rough approximation: if DoStatement has While keyword - then if node is completed is checking the presence of ')';
+                return hasChildOfKind(n, 107 /* WhileKeyword */, sourceFile)
+                    ? nodeEndsWith(n, 21 /* CloseParenToken */, sourceFile)
+                    : isCompletedNode(n.statement, sourceFile);
+            case 167 /* TypeQuery */:
+                return isCompletedNode(n.exprName, sourceFile);
+            case 199 /* TypeOfExpression */:
+            case 198 /* DeleteExpression */:
+            case 200 /* VoidExpression */:
+            case 207 /* YieldExpression */:
+            case 208 /* SpreadElement */:
+                var unaryWordExpression = n;
+                return isCompletedNode(unaryWordExpression.expression, sourceFile);
+            case 193 /* TaggedTemplateExpression */:
+                return isCompletedNode(n.template, sourceFile);
+            case 206 /* TemplateExpression */:
+                var lastSpan = ts.lastOrUndefined(n.templateSpans);
+                return isCompletedNode(lastSpan, sourceFile);
+            case 216 /* TemplateSpan */:
+                return ts.nodeIsPresent(n.literal);
+            case 255 /* ExportDeclaration */:
+            case 249 /* ImportDeclaration */:
+                return ts.nodeIsPresent(n.moduleSpecifier);
+            case 202 /* PrefixUnaryExpression */:
+                return isCompletedNode(n.operand, sourceFile);
+            case 204 /* BinaryExpression */:
+                return isCompletedNode(n.right, sourceFile);
+            case 205 /* ConditionalExpression */:
+                return isCompletedNode(n.whenFalse, sourceFile);
+            default:
+                return true;
+        }
+    }
+    /*
+     * Checks if node ends with 'expectedLastToken'.
+     * If child at position 'length - 1' is 'SemicolonToken' it is skipped and 'expectedLastToken' is compared with child at position 'length - 2'.
+     */
+    function nodeEndsWith(n, expectedLastToken, sourceFile) {
+        var children = n.getChildren(sourceFile);
+        if (children.length) {
+            var lastChild = ts.last(children);
+            if (lastChild.kind === expectedLastToken) {
+                return true;
+            }
+            else if (lastChild.kind === 26 /* SemicolonToken */ && children.length !== 1) {
+                return children[children.length - 2].kind === expectedLastToken;
+            }
+        }
+        return false;
+    }
+    function findListItemInfo(node) {
+        var list = findContainingList(node);
+        // It is possible at this point for syntaxList to be undefined, either if
+        // node.parent had no list child, or if none of its list children contained
+        // the span of node. If this happens, return undefined. The caller should
+        // handle this case.
+        if (!list) {
+            return undefined;
+        }
+        var children = list.getChildren();
+        var listItemIndex = ts.indexOfNode(children, node);
+        return {
+            listItemIndex: listItemIndex,
+            list: list
+        };
+    }
+    ts.findListItemInfo = findListItemInfo;
+    function hasChildOfKind(n, kind, sourceFile) {
+        return !!findChildOfKind(n, kind, sourceFile);
+    }
+    ts.hasChildOfKind = hasChildOfKind;
+    function findChildOfKind(n, kind, sourceFile) {
+        return ts.find(n.getChildren(sourceFile), function (c) { return c.kind === kind; });
+    }
+    ts.findChildOfKind = findChildOfKind;
+    function findContainingList(node) {
+        // The node might be a list element (nonsynthetic) or a comma (synthetic). Either way, it will
+        // be parented by the container of the SyntaxList, not the SyntaxList itself.
+        // In order to find the list item index, we first need to locate SyntaxList itself and then search
+        // for the position of the relevant node (or comma).
+        var syntaxList = ts.find(node.parent.getChildren(), function (c) { return ts.isSyntaxList(c) && rangeContainsRange(c, node); });
+        // Either we didn't find an appropriate list, or the list must contain us.
+        ts.Debug.assert(!syntaxList || ts.contains(syntaxList.getChildren(), node));
+        return syntaxList;
+    }
+    ts.findContainingList = findContainingList;
+    /**
+     * Gets the token whose text has range [start, end) and
+     * position >= start and (position < end or (position === end && token is literal or keyword or identifier))
+     */
+    function getTouchingPropertyName(sourceFile, position) {
+        return getTouchingToken(sourceFile, position, function (n) { return ts.isPropertyNameLiteral(n) || ts.isKeyword(n.kind); });
+    }
+    ts.getTouchingPropertyName = getTouchingPropertyName;
+    /**
+     * Returns the token if position is in [start, end).
+     * If position === end, returns the preceding token if includeItemAtEndPosition(previousToken) === true
+     */
+    function getTouchingToken(sourceFile, position, includePrecedingTokenAtEndPosition) {
+        return getTokenAtPositionWorker(sourceFile, position, /*allowPositionInLeadingTrivia*/ false, includePrecedingTokenAtEndPosition, /*includeEndPosition*/ false);
+    }
+    ts.getTouchingToken = getTouchingToken;
+    /** Returns a token if position is in [start-of-leading-trivia, end) */
+    function getTokenAtPosition(sourceFile, position) {
+        return getTokenAtPositionWorker(sourceFile, position, /*allowPositionInLeadingTrivia*/ true, /*includePrecedingTokenAtEndPosition*/ undefined, /*includeEndPosition*/ false);
+    }
+    ts.getTokenAtPosition = getTokenAtPosition;
+    /** Get the token whose text contains the position */
+    function getTokenAtPositionWorker(sourceFile, position, allowPositionInLeadingTrivia, includePrecedingTokenAtEndPosition, includeEndPosition) {
+        var current = sourceFile;
+        outer: while (true) {
+            // find the child that contains 'position'
+            for (var _i = 0, _a = current.getChildren(sourceFile); _i < _a.length; _i++) {
+                var child = _a[_i];
+                var start = allowPositionInLeadingTrivia ? child.getFullStart() : child.getStart(sourceFile, /*includeJsDoc*/ true);
+                if (start > position) {
+                    // If this child begins after position, then all subsequent children will as well.
+                    break;
+                }
+                var end = child.getEnd();
+                if (position < end || (position === end && (child.kind === 1 /* EndOfFileToken */ || includeEndPosition))) {
+                    current = child;
+                    continue outer;
+                }
+                else if (includePrecedingTokenAtEndPosition && end === position) {
+                    var previousToken = findPrecedingToken(position, sourceFile, child);
+                    if (previousToken && includePrecedingTokenAtEndPosition(previousToken)) {
+                        return previousToken;
+                    }
+                }
+            }
+            return current;
+        }
+    }
+    /**
+     * The token on the left of the position is the token that strictly includes the position
+     * or sits to the left of the cursor if it is on a boundary. For example
+     *
+     *   fo|o               -> will return foo
+     *   foo <comment> |bar -> will return foo
+     *
+     */
+    function findTokenOnLeftOfPosition(file, position) {
+        // Ideally, getTokenAtPosition should return a token. However, it is currently
+        // broken, so we do a check to make sure the result was indeed a token.
+        var tokenAtPosition = getTokenAtPosition(file, position);
+        if (ts.isToken(tokenAtPosition) && position > tokenAtPosition.getStart(file) && position < tokenAtPosition.getEnd()) {
+            return tokenAtPosition;
+        }
+        return findPrecedingToken(position, file);
+    }
+    ts.findTokenOnLeftOfPosition = findTokenOnLeftOfPosition;
+    function findNextToken(previousToken, parent, sourceFile) {
+        return find(parent);
+        function find(n) {
+            if (ts.isToken(n) && n.pos === previousToken.end) {
+                // this is token that starts at the end of previous token - return it
+                return n;
+            }
+            return ts.firstDefined(n.getChildren(), function (child) {
+                var shouldDiveInChildNode = 
+                // previous token is enclosed somewhere in the child
+                (child.pos <= previousToken.pos && child.end > previousToken.end) ||
+                    // previous token ends exactly at the beginning of child
+                    (child.pos === previousToken.end);
+                return shouldDiveInChildNode && nodeHasTokens(child, sourceFile) ? find(child) : undefined;
+            });
+        }
+    }
+    ts.findNextToken = findNextToken;
+    /**
+     * Finds the rightmost token satisfying `token.end <= position`,
+     * excluding `JsxText` tokens containing only whitespace.
+     */
+    function findPrecedingToken(position, sourceFile, startNode, excludeJsdoc) {
+        var result = find(startNode || sourceFile);
+        ts.Debug.assert(!(result && isWhiteSpaceOnlyJsxText(result)));
+        return result;
+        function find(n) {
+            if (isNonWhitespaceToken(n) && n.kind !== 1 /* EndOfFileToken */) {
+                return n;
+            }
+            var children = n.getChildren(sourceFile);
+            for (var i = 0; i < children.length; i++) {
+                var child = children[i];
+                // Note that the span of a node's tokens is [node.getStart(...), node.end).
+                // Given that `position < child.end` and child has constituent tokens, we distinguish these cases:
+                // 1) `position` precedes `child`'s tokens or `child` has no tokens (ie: in a comment or whitespace preceding `child`):
+                // we need to find the last token in a previous child.
+                // 2) `position` is within the same span: we recurse on `child`.
+                if (position < child.end) {
+                    var start = child.getStart(sourceFile, /*includeJsDoc*/ !excludeJsdoc);
+                    var lookInPreviousChild = (start >= position) || // cursor in the leading trivia
+                        !nodeHasTokens(child, sourceFile) ||
+                        isWhiteSpaceOnlyJsxText(child);
+                    if (lookInPreviousChild) {
+                        // actual start of the node is past the position - previous token should be at the end of previous child
+                        var candidate_2 = findRightmostChildNodeWithTokens(children, /*exclusiveStartPosition*/ i, sourceFile);
+                        return candidate_2 && findRightmostToken(candidate_2, sourceFile);
+                    }
+                    else {
+                        // candidate should be in this node
+                        return find(child);
+                    }
+                }
+            }
+            ts.Debug.assert(startNode !== undefined || n.kind === 279 /* SourceFile */ || n.kind === 1 /* EndOfFileToken */ || ts.isJSDocCommentContainingNode(n));
+            // Here we know that none of child token nodes embrace the position,
+            // the only known case is when position is at the end of the file.
+            // Try to find the rightmost token in the file without filtering.
+            // Namely we are skipping the check: 'position < node.end'
+            var candidate = findRightmostChildNodeWithTokens(children, /*exclusiveStartPosition*/ children.length, sourceFile);
+            return candidate && findRightmostToken(candidate, sourceFile);
+        }
+    }
+    ts.findPrecedingToken = findPrecedingToken;
+    function isNonWhitespaceToken(n) {
+        return ts.isToken(n) && !isWhiteSpaceOnlyJsxText(n);
+    }
+    function findRightmostToken(n, sourceFile) {
+        if (isNonWhitespaceToken(n)) {
+            return n;
+        }
+        var children = n.getChildren(sourceFile);
+        var candidate = findRightmostChildNodeWithTokens(children, /*exclusiveStartPosition*/ children.length, sourceFile);
+        return candidate && findRightmostToken(candidate, sourceFile);
+    }
+    /**
+     * Finds the rightmost child to the left of `children[exclusiveStartPosition]` which is a non-all-whitespace token or has constituent tokens.
+     */
+    function findRightmostChildNodeWithTokens(children, exclusiveStartPosition, sourceFile) {
+        for (var i = exclusiveStartPosition - 1; i >= 0; i--) {
+            var child = children[i];
+            if (isWhiteSpaceOnlyJsxText(child)) {
+                ts.Debug.assert(i > 0, "`JsxText` tokens should not be the first child of `JsxElement | JsxSelfClosingElement`");
+            }
+            else if (nodeHasTokens(children[i], sourceFile)) {
+                return children[i];
+            }
+        }
+    }
+    function isInString(sourceFile, position, previousToken) {
+        if (previousToken === void 0) { previousToken = findPrecedingToken(position, sourceFile); }
+        if (previousToken && ts.isStringTextContainingNode(previousToken)) {
+            var start = previousToken.getStart(sourceFile);
+            var end = previousToken.getEnd();
+            // To be "in" one of these literals, the position has to be:
+            //   1. entirely within the token text.
+            //   2. at the end position of an unterminated token.
+            //   3. at the end of a regular expression (due to trailing flags like '/foo/g').
+            if (start < position && position < end) {
+                return true;
+            }
+            if (position === end) {
+                return !!previousToken.isUnterminated;
+            }
+        }
+        return false;
+    }
+    ts.isInString = isInString;
+    /**
+     * returns true if the position is in between the open and close elements of an JSX expression.
+     */
+    function isInsideJsxElementOrAttribute(sourceFile, position) {
+        var token = getTokenAtPosition(sourceFile, position);
+        if (!token) {
+            return false;
+        }
+        if (token.kind === 11 /* JsxText */) {
+            return true;
+        }
+        // <div>Hello |</div>
+        if (token.kind === 28 /* LessThanToken */ && token.parent.kind === 11 /* JsxText */) {
+            return true;
+        }
+        // <div> { | </div> or <div a={| </div>
+        if (token.kind === 28 /* LessThanToken */ && token.parent.kind === 270 /* JsxExpression */) {
+            return true;
+        }
+        // <div> {
+        // |
+        // } < /div>
+        if (token && token.kind === 19 /* CloseBraceToken */ && token.parent.kind === 270 /* JsxExpression */) {
+            return true;
+        }
+        // <div>|</div>
+        if (token.kind === 28 /* LessThanToken */ && token.parent.kind === 263 /* JsxClosingElement */) {
+            return true;
+        }
+        return false;
+    }
+    ts.isInsideJsxElementOrAttribute = isInsideJsxElementOrAttribute;
+    function isWhiteSpaceOnlyJsxText(node) {
+        return ts.isJsxText(node) && node.containsOnlyWhiteSpaces;
+    }
+    function isInTemplateString(sourceFile, position) {
+        var token = getTokenAtPosition(sourceFile, position);
+        return ts.isTemplateLiteralKind(token.kind) && position > token.getStart(sourceFile);
+    }
+    ts.isInTemplateString = isInTemplateString;
+    function isInJSXText(sourceFile, position) {
+        var token = getTokenAtPosition(sourceFile, position);
+        if (ts.isJsxText(token)) {
+            return true;
+        }
+        if (token.kind === 18 /* OpenBraceToken */ && ts.isJsxExpression(token.parent) && ts.isJsxElement(token.parent.parent)) {
+            return true;
+        }
+        if (token.kind === 28 /* LessThanToken */ && ts.isJsxOpeningLikeElement(token.parent) && ts.isJsxElement(token.parent.parent)) {
+            return true;
+        }
+        return false;
+    }
+    ts.isInJSXText = isInJSXText;
+    function findPrecedingMatchingToken(token, matchingTokenKind, sourceFile) {
+        var tokenKind = token.kind;
+        var remainingMatchingTokens = 0;
+        while (true) {
+            var preceding = findPrecedingToken(token.getFullStart(), sourceFile);
+            if (!preceding) {
+                return undefined;
+            }
+            token = preceding;
+            if (token.kind === matchingTokenKind) {
+                if (remainingMatchingTokens === 0) {
+                    return token;
+                }
+                remainingMatchingTokens--;
+            }
+            else if (token.kind === tokenKind) {
+                remainingMatchingTokens++;
+            }
+        }
+    }
+    ts.findPrecedingMatchingToken = findPrecedingMatchingToken;
+    function isPossiblyTypeArgumentPosition(token, sourceFile, checker) {
+        var info = getPossibleTypeArgumentsInfo(token, sourceFile);
+        return info !== undefined && (ts.isPartOfTypeNode(info.called) ||
+            getPossibleGenericSignatures(info.called, info.nTypeArguments, checker).length !== 0 ||
+            isPossiblyTypeArgumentPosition(info.called, sourceFile, checker));
+    }
+    ts.isPossiblyTypeArgumentPosition = isPossiblyTypeArgumentPosition;
+    function getPossibleGenericSignatures(called, typeArgumentCount, checker) {
+        var type = checker.getTypeAtLocation(called);
+        var signatures = ts.isNewExpression(called.parent) ? type.getConstructSignatures() : type.getCallSignatures();
+        return signatures.filter(function (candidate) { return !!candidate.typeParameters && candidate.typeParameters.length >= typeArgumentCount; });
+    }
+    ts.getPossibleGenericSignatures = getPossibleGenericSignatures;
+    // Get info for an expression like `f <` that may be the start of type arguments.
+    function getPossibleTypeArgumentsInfo(tokenIn, sourceFile) {
+        var token = tokenIn;
+        // This function determines if the node could be type argument position
+        // Since during editing, when type argument list is not complete,
+        // the tree could be of any shape depending on the tokens parsed before current node,
+        // scanning of the previous identifier followed by "<" before current node would give us better result
+        // Note that we also balance out the already provided type arguments, arrays, object literals while doing so
+        var remainingLessThanTokens = 0;
+        var nTypeArguments = 0;
+        while (token) {
+            switch (token.kind) {
+                case 28 /* LessThanToken */:
+                    // Found the beginning of the generic argument expression
+                    token = findPrecedingToken(token.getFullStart(), sourceFile);
+                    if (!token || !ts.isIdentifier(token))
+                        return undefined;
+                    if (!remainingLessThanTokens) {
+                        return ts.isDeclarationName(token) ? undefined : { called: token, nTypeArguments: nTypeArguments };
+                    }
+                    remainingLessThanTokens--;
+                    break;
+                case 48 /* GreaterThanGreaterThanGreaterThanToken */:
+                    remainingLessThanTokens = +3;
+                    break;
+                case 47 /* GreaterThanGreaterThanToken */:
+                    remainingLessThanTokens = +2;
+                    break;
+                case 30 /* GreaterThanToken */:
+                    remainingLessThanTokens++;
+                    break;
+                case 19 /* CloseBraceToken */:
+                    // This can be object type, skip until we find the matching open brace token
+                    // Skip until the matching open brace token
+                    token = findPrecedingMatchingToken(token, 18 /* OpenBraceToken */, sourceFile);
+                    if (!token)
+                        return undefined;
+                    break;
+                case 21 /* CloseParenToken */:
+                    // This can be object type, skip until we find the matching open brace token
+                    // Skip until the matching open brace token
+                    token = findPrecedingMatchingToken(token, 20 /* OpenParenToken */, sourceFile);
+                    if (!token)
+                        return undefined;
+                    break;
+                case 23 /* CloseBracketToken */:
+                    // This can be object type, skip until we find the matching open brace token
+                    // Skip until the matching open brace token
+                    token = findPrecedingMatchingToken(token, 22 /* OpenBracketToken */, sourceFile);
+                    if (!token)
+                        return undefined;
+                    break;
+                // Valid tokens in a type name. Skip.
+                case 27 /* CommaToken */:
+                    nTypeArguments++;
+                    break;
+                case 37 /* EqualsGreaterThanToken */:
+                case 72 /* Identifier */:
+                case 10 /* StringLiteral */:
+                case 8 /* NumericLiteral */:
+                case 9 /* BigIntLiteral */:
+                case 102 /* TrueKeyword */:
+                case 87 /* FalseKeyword */:
+                case 104 /* TypeOfKeyword */:
+                case 86 /* ExtendsKeyword */:
+                case 129 /* KeyOfKeyword */:
+                case 24 /* DotToken */:
+                case 50 /* BarToken */:
+                case 56 /* QuestionToken */:
+                case 57 /* ColonToken */:
+                    break;
+                default:
+                    if (ts.isTypeNode(token)) {
+                        break;
+                    }
+                    // Invalid token in type
+                    return undefined;
+            }
+            token = findPrecedingToken(token.getFullStart(), sourceFile);
+        }
+        return undefined;
+    }
+    ts.getPossibleTypeArgumentsInfo = getPossibleTypeArgumentsInfo;
+    /**
+     * Returns true if the cursor at position in sourceFile is within a comment.
+     *
+     * @param tokenAtPosition Must equal `getTokenAtPosition(sourceFile, position)
+     * @param predicate Additional predicate to test on the comment range.
+     */
+    function isInComment(sourceFile, position, tokenAtPosition) {
+        return ts.formatting.getRangeOfEnclosingComment(sourceFile, position, /*precedingToken*/ undefined, tokenAtPosition);
+    }
+    ts.isInComment = isInComment;
+    function hasDocComment(sourceFile, position) {
+        var token = getTokenAtPosition(sourceFile, position);
+        return !!ts.findAncestor(token, ts.isJSDoc);
+    }
+    ts.hasDocComment = hasDocComment;
+    function nodeHasTokens(n, sourceFile) {
+        // If we have a token or node that has a non-zero width, it must have tokens.
+        // Note: getWidth() does not take trivia into account.
+        return n.kind === 1 /* EndOfFileToken */ ? !!n.jsDoc : n.getWidth(sourceFile) !== 0;
+    }
+    function getNodeModifiers(node) {
+        var flags = ts.isDeclaration(node) ? ts.getCombinedModifierFlags(node) : 0 /* None */;
+        var result = [];
+        if (flags & 8 /* Private */)
+            result.push("private" /* privateMemberModifier */);
+        if (flags & 16 /* Protected */)
+            result.push("protected" /* protectedMemberModifier */);
+        if (flags & 4 /* Public */)
+            result.push("public" /* publicMemberModifier */);
+        if (flags & 32 /* Static */)
+            result.push("static" /* staticModifier */);
+        if (flags & 128 /* Abstract */)
+            result.push("abstract" /* abstractModifier */);
+        if (flags & 1 /* Export */)
+            result.push("export" /* exportedModifier */);
+        if (node.flags & 4194304 /* Ambient */)
+            result.push("declare" /* ambientModifier */);
+        return result.length > 0 ? result.join(",") : "" /* none */;
+    }
+    ts.getNodeModifiers = getNodeModifiers;
+    function getTypeArgumentOrTypeParameterList(node) {
+        if (node.kind === 164 /* TypeReference */ || node.kind === 191 /* CallExpression */) {
+            return node.typeArguments;
+        }
+        if (ts.isFunctionLike(node) || node.kind === 240 /* ClassDeclaration */ || node.kind === 241 /* InterfaceDeclaration */) {
+            return node.typeParameters;
+        }
+        return undefined;
+    }
+    ts.getTypeArgumentOrTypeParameterList = getTypeArgumentOrTypeParameterList;
+    function isComment(kind) {
+        return kind === 2 /* SingleLineCommentTrivia */ || kind === 3 /* MultiLineCommentTrivia */;
+    }
+    ts.isComment = isComment;
+    function isStringOrRegularExpressionOrTemplateLiteral(kind) {
+        if (kind === 10 /* StringLiteral */
+            || kind === 13 /* RegularExpressionLiteral */
+            || ts.isTemplateLiteralKind(kind)) {
+            return true;
+        }
+        return false;
+    }
+    ts.isStringOrRegularExpressionOrTemplateLiteral = isStringOrRegularExpressionOrTemplateLiteral;
+    function isPunctuation(kind) {
+        return 18 /* FirstPunctuation */ <= kind && kind <= 71 /* LastPunctuation */;
+    }
+    ts.isPunctuation = isPunctuation;
+    function isInsideTemplateLiteral(node, position, sourceFile) {
+        return ts.isTemplateLiteralKind(node.kind)
+            && (node.getStart(sourceFile) < position && position < node.end) || (!!node.isUnterminated && position === node.end);
+    }
+    ts.isInsideTemplateLiteral = isInsideTemplateLiteral;
+    function isAccessibilityModifier(kind) {
+        switch (kind) {
+            case 115 /* PublicKeyword */:
+            case 113 /* PrivateKeyword */:
+            case 114 /* ProtectedKeyword */:
+                return true;
+        }
+        return false;
+    }
+    ts.isAccessibilityModifier = isAccessibilityModifier;
+    function cloneCompilerOptions(options) {
+        var result = ts.clone(options);
+        ts.setConfigFileInOptions(result, options && options.configFile);
+        return result;
+    }
+    ts.cloneCompilerOptions = cloneCompilerOptions;
+    function isArrayLiteralOrObjectLiteralDestructuringPattern(node) {
+        if (node.kind === 187 /* ArrayLiteralExpression */ ||
+            node.kind === 188 /* ObjectLiteralExpression */) {
+            // [a,b,c] from:
+            // [a, b, c] = someExpression;
+            if (node.parent.kind === 204 /* BinaryExpression */ &&
+                node.parent.left === node &&
+                node.parent.operatorToken.kind === 59 /* EqualsToken */) {
+                return true;
+            }
+            // [a, b, c] from:
+            // for([a, b, c] of expression)
+            if (node.parent.kind === 227 /* ForOfStatement */ &&
+                node.parent.initializer === node) {
+                return true;
+            }
+            // [a, b, c] of
+            // [x, [a, b, c] ] = someExpression
+            // or
+            // {x, a: {a, b, c} } = someExpression
+            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 275 /* PropertyAssignment */ ? node.parent.parent : node.parent)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    ts.isArrayLiteralOrObjectLiteralDestructuringPattern = isArrayLiteralOrObjectLiteralDestructuringPattern;
+    function isInReferenceComment(sourceFile, position) {
+        return isInReferenceCommentWorker(sourceFile, position, /*shouldBeReference*/ true);
+    }
+    ts.isInReferenceComment = isInReferenceComment;
+    function isInNonReferenceComment(sourceFile, position) {
+        return isInReferenceCommentWorker(sourceFile, position, /*shouldBeReference*/ false);
+    }
+    ts.isInNonReferenceComment = isInNonReferenceComment;
+    function isInReferenceCommentWorker(sourceFile, position, shouldBeReference) {
+        var range = isInComment(sourceFile, position, /*tokenAtPosition*/ undefined);
+        return !!range && shouldBeReference === tripleSlashDirectivePrefixRegex.test(sourceFile.text.substring(range.pos, range.end));
+    }
+    function createTextSpanFromNode(node, sourceFile) {
+        return ts.createTextSpanFromBounds(node.getStart(sourceFile), node.getEnd());
+    }
+    ts.createTextSpanFromNode = createTextSpanFromNode;
+    function createTextRangeFromNode(node, sourceFile) {
+        return ts.createRange(node.getStart(sourceFile), node.end);
+    }
+    ts.createTextRangeFromNode = createTextRangeFromNode;
+    function createTextSpanFromRange(range) {
+        return ts.createTextSpanFromBounds(range.pos, range.end);
+    }
+    ts.createTextSpanFromRange = createTextSpanFromRange;
+    function createTextRangeFromSpan(span) {
+        return ts.createRange(span.start, span.start + span.length);
+    }
+    ts.createTextRangeFromSpan = createTextRangeFromSpan;
+    function createTextChangeFromStartLength(start, length, newText) {
+        return createTextChange(ts.createTextSpan(start, length), newText);
+    }
+    ts.createTextChangeFromStartLength = createTextChangeFromStartLength;
+    function createTextChange(span, newText) {
+        return { span: span, newText: newText };
+    }
+    ts.createTextChange = createTextChange;
+    ts.typeKeywords = [
+        120 /* AnyKeyword */,
+        146 /* BigIntKeyword */,
+        123 /* BooleanKeyword */,
+        87 /* FalseKeyword */,
+        129 /* KeyOfKeyword */,
+        132 /* NeverKeyword */,
+        96 /* NullKeyword */,
+        135 /* NumberKeyword */,
+        136 /* ObjectKeyword */,
+        138 /* StringKeyword */,
+        139 /* SymbolKeyword */,
+        102 /* TrueKeyword */,
+        106 /* VoidKeyword */,
+        141 /* UndefinedKeyword */,
+        142 /* UniqueKeyword */,
+        143 /* UnknownKeyword */,
+    ];
+    function isTypeKeyword(kind) {
+        return ts.contains(ts.typeKeywords, kind);
+    }
+    ts.isTypeKeyword = isTypeKeyword;
+    /** True if the symbol is for an external module, as opposed to a namespace. */
+    function isExternalModuleSymbol(moduleSymbol) {
+        return !!(moduleSymbol.flags & 1536 /* Module */) && moduleSymbol.name.charCodeAt(0) === 34 /* doubleQuote */;
+    }
+    ts.isExternalModuleSymbol = isExternalModuleSymbol;
+    function nodeSeenTracker() {
+        var seen = [];
+        return function (node) {
+            var id = ts.getNodeId(node);
+            return !seen[id] && (seen[id] = true);
+        };
+    }
+    ts.nodeSeenTracker = nodeSeenTracker;
+    function getSnapshotText(snap) {
+        return snap.getText(0, snap.getLength());
+    }
+    ts.getSnapshotText = getSnapshotText;
+    function repeatString(str, count) {
+        var result = "";
+        for (var i = 0; i < count; i++) {
+            result += str;
+        }
+        return result;
+    }
+    ts.repeatString = repeatString;
+    function skipConstraint(type) {
+        return type.isTypeParameter() ? type.getConstraint() || type : type;
+    }
+    ts.skipConstraint = skipConstraint;
+    function getNameFromPropertyName(name) {
+        return name.kind === 149 /* ComputedPropertyName */
+            // treat computed property names where expression is string/numeric literal as just string/numeric literal
+            ? ts.isStringOrNumericLiteralLike(name.expression) ? name.expression.text : undefined
+            : ts.getTextOfIdentifierOrLiteral(name);
+    }
+    ts.getNameFromPropertyName = getNameFromPropertyName;
+    function programContainsEs6Modules(program) {
+        return program.getSourceFiles().some(function (s) { return !s.isDeclarationFile && !program.isSourceFileFromExternalLibrary(s) && !!s.externalModuleIndicator; });
+    }
+    ts.programContainsEs6Modules = programContainsEs6Modules;
+    function compilerOptionsIndicateEs6Modules(compilerOptions) {
+        return !!compilerOptions.module || compilerOptions.target >= 2 /* ES2015 */ || !!compilerOptions.noEmit;
+    }
+    ts.compilerOptionsIndicateEs6Modules = compilerOptionsIndicateEs6Modules;
+    function hostUsesCaseSensitiveFileNames(host) {
+        return host.useCaseSensitiveFileNames ? host.useCaseSensitiveFileNames() : false;
+    }
+    ts.hostUsesCaseSensitiveFileNames = hostUsesCaseSensitiveFileNames;
+    function hostGetCanonicalFileName(host) {
+        return ts.createGetCanonicalFileName(hostUsesCaseSensitiveFileNames(host));
+    }
+    ts.hostGetCanonicalFileName = hostGetCanonicalFileName;
+    function makeImportIfNecessary(defaultImport, namedImports, moduleSpecifier, quotePreference) {
+        return defaultImport || namedImports && namedImports.length ? makeImport(defaultImport, namedImports, moduleSpecifier, quotePreference) : undefined;
+    }
+    ts.makeImportIfNecessary = makeImportIfNecessary;
+    function makeImport(defaultImport, namedImports, moduleSpecifier, quotePreference) {
+        return ts.createImportDeclaration(
+        /*decorators*/ undefined, 
+        /*modifiers*/ undefined, defaultImport || namedImports
+            ? ts.createImportClause(defaultImport, namedImports && namedImports.length ? ts.createNamedImports(namedImports) : undefined)
+            : undefined, typeof moduleSpecifier === "string" ? makeStringLiteral(moduleSpecifier, quotePreference) : moduleSpecifier);
+    }
+    ts.makeImport = makeImport;
+    function makeStringLiteral(text, quotePreference) {
+        return ts.createLiteral(text, quotePreference === 0 /* Single */);
+    }
+    ts.makeStringLiteral = makeStringLiteral;
+    var QuotePreference;
+    (function (QuotePreference) {
+        QuotePreference[QuotePreference["Single"] = 0] = "Single";
+        QuotePreference[QuotePreference["Double"] = 1] = "Double";
+    })(QuotePreference = ts.QuotePreference || (ts.QuotePreference = {}));
+    function quotePreferenceFromString(str, sourceFile) {
+        return ts.isStringDoubleQuoted(str, sourceFile) ? 1 /* Double */ : 0 /* Single */;
+    }
+    ts.quotePreferenceFromString = quotePreferenceFromString;
+    function getQuotePreference(sourceFile, preferences) {
+        if (preferences.quotePreference && preferences.quotePreference !== "auto") {
+            return preferences.quotePreference === "single" ? 0 /* Single */ : 1 /* Double */;
+        }
+        else {
+            var firstModuleSpecifier = sourceFile.imports && ts.find(sourceFile.imports, ts.isStringLiteral);
+            return firstModuleSpecifier ? quotePreferenceFromString(firstModuleSpecifier, sourceFile) : 1 /* Double */;
+        }
+    }
+    ts.getQuotePreference = getQuotePreference;
+    function getQuoteFromPreference(qp) {
+        switch (qp) {
+            case 0 /* Single */: return "'";
+            case 1 /* Double */: return '"';
+            default: return ts.Debug.assertNever(qp);
+        }
+    }
+    ts.getQuoteFromPreference = getQuoteFromPreference;
+    function symbolNameNoDefault(symbol) {
+        var escaped = symbolEscapedNameNoDefault(symbol);
+        return escaped === undefined ? undefined : ts.unescapeLeadingUnderscores(escaped);
+    }
+    ts.symbolNameNoDefault = symbolNameNoDefault;
+    function symbolEscapedNameNoDefault(symbol) {
+        if (symbol.escapedName !== "default" /* Default */) {
+            return symbol.escapedName;
+        }
+        return ts.firstDefined(symbol.declarations, function (decl) {
+            var name = ts.getNameOfDeclaration(decl);
+            return name && name.kind === 72 /* Identifier */ ? name.escapedText : undefined;
+        });
+    }
+    ts.symbolEscapedNameNoDefault = symbolEscapedNameNoDefault;
+    function isObjectBindingElementWithoutPropertyName(bindingElement) {
+        return ts.isBindingElement(bindingElement) &&
+            ts.isObjectBindingPattern(bindingElement.parent) &&
+            ts.isIdentifier(bindingElement.name) &&
+            !bindingElement.propertyName;
+    }
+    ts.isObjectBindingElementWithoutPropertyName = isObjectBindingElementWithoutPropertyName;
+    function getPropertySymbolFromBindingElement(checker, bindingElement) {
+        var typeOfPattern = checker.getTypeAtLocation(bindingElement.parent);
+        return typeOfPattern && checker.getPropertyOfType(typeOfPattern, bindingElement.name.text);
+    }
+    ts.getPropertySymbolFromBindingElement = getPropertySymbolFromBindingElement;
+    /**
+     * Find symbol of the given property-name and add the symbol to the given result array
+     * @param symbol a symbol to start searching for the given propertyName
+     * @param propertyName a name of property to search for
+     * @param result an array of symbol of found property symbols
+     * @param previousIterationSymbolsCache a cache of symbol from previous iterations of calling this function to prevent infinite revisiting of the same symbol.
+     *                                The value of previousIterationSymbol is undefined when the function is first called.
+     */
+    function getPropertySymbolsFromBaseTypes(symbol, propertyName, checker, cb) {
+        var seen = ts.createMap();
+        return recur(symbol);
+        function recur(symbol) {
+            // Use `addToSeen` to ensure we don't infinitely recurse in this situation:
+            //      interface C extends C {
+            //          /*findRef*/propName: string;
+            //      }
+            if (!(symbol.flags & (32 /* Class */ | 64 /* Interface */)) || !ts.addToSeen(seen, ts.getSymbolId(symbol)))
+                return;
+            return ts.firstDefined(symbol.declarations, function (declaration) { return ts.firstDefined(ts.getAllSuperTypeNodes(declaration), function (typeReference) {
+                var type = checker.getTypeAtLocation(typeReference);
+                var propertySymbol = type && type.symbol && checker.getPropertyOfType(type, propertyName);
+                // Visit the typeReference as well to see if it directly or indirectly uses that property
+                return type && propertySymbol && (ts.firstDefined(checker.getRootSymbols(propertySymbol), cb) || recur(type.symbol));
+            }); });
+        }
+    }
+    ts.getPropertySymbolsFromBaseTypes = getPropertySymbolsFromBaseTypes;
+    function isMemberSymbolInBaseType(memberSymbol, checker) {
+        return getPropertySymbolsFromBaseTypes(memberSymbol.parent, memberSymbol.name, checker, function (_) { return true; }) || false;
+    }
+    ts.isMemberSymbolInBaseType = isMemberSymbolInBaseType;
+    function getParentNodeInSpan(node, file, span) {
+        if (!node)
+            return undefined;
+        while (node.parent) {
+            if (ts.isSourceFile(node.parent) || !spanContainsNode(span, node.parent, file)) {
+                return node;
+            }
+            node = node.parent;
+        }
+    }
+    ts.getParentNodeInSpan = getParentNodeInSpan;
+    function spanContainsNode(span, node, file) {
+        return ts.textSpanContainsPosition(span, node.getStart(file)) &&
+            node.getEnd() <= ts.textSpanEnd(span);
+    }
+    function findModifier(node, kind) {
+        return node.modifiers && ts.find(node.modifiers, function (m) { return m.kind === kind; });
+    }
+    ts.findModifier = findModifier;
+    function insertImport(changes, sourceFile, importDecl) {
+        var lastImportDeclaration = ts.findLast(sourceFile.statements, ts.isAnyImportSyntax);
+        if (lastImportDeclaration) {
+            changes.insertNodeAfter(sourceFile, lastImportDeclaration, importDecl);
+        }
+        else {
+            changes.insertNodeAtTopOfFile(sourceFile, importDecl, /*blankLineBetween*/ true);
+        }
+    }
+    ts.insertImport = insertImport;
+    function textSpansEqual(a, b) {
+        return !!a && !!b && a.start === b.start && a.length === b.length;
+    }
+    ts.textSpansEqual = textSpansEqual;
+    function documentSpansEqual(a, b) {
+        return a.fileName === b.fileName && textSpansEqual(a.textSpan, b.textSpan);
+    }
+    ts.documentSpansEqual = documentSpansEqual;
+})(ts || (ts = {}));
+// Display-part writer helpers
+/* @internal */
+(function (ts) {
+    function isFirstDeclarationOfSymbolParameter(symbol) {
+        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 151 /* Parameter */;
+    }
+    ts.isFirstDeclarationOfSymbolParameter = isFirstDeclarationOfSymbolParameter;
+    var displayPartWriter = getDisplayPartWriter();
+    function getDisplayPartWriter() {
+        var absoluteMaximumLength = ts.defaultMaximumTruncationLength * 10; // A hard cutoff to avoid overloading the messaging channel in worst-case scenarios
+        var displayParts;
+        var lineStart;
+        var indent;
+        var length;
+        resetWriter();
+        var unknownWrite = function (text) { return writeKind(text, ts.SymbolDisplayPartKind.text); };
+        return {
+            displayParts: function () {
+                var finalText = displayParts.length && displayParts[displayParts.length - 1].text;
+                if (length > absoluteMaximumLength && finalText && finalText !== "...") {
+                    if (!ts.isWhiteSpaceLike(finalText.charCodeAt(finalText.length - 1))) {
+                        displayParts.push(displayPart(" ", ts.SymbolDisplayPartKind.space));
+                    }
+                    displayParts.push(displayPart("...", ts.SymbolDisplayPartKind.punctuation));
+                }
+                return displayParts;
+            },
+            writeKeyword: function (text) { return writeKind(text, ts.SymbolDisplayPartKind.keyword); },
+            writeOperator: function (text) { return writeKind(text, ts.SymbolDisplayPartKind.operator); },
+            writePunctuation: function (text) { return writeKind(text, ts.SymbolDisplayPartKind.punctuation); },
+            writeTrailingSemicolon: function (text) { return writeKind(text, ts.SymbolDisplayPartKind.punctuation); },
+            writeSpace: function (text) { return writeKind(text, ts.SymbolDisplayPartKind.space); },
+            writeStringLiteral: function (text) { return writeKind(text, ts.SymbolDisplayPartKind.stringLiteral); },
+            writeParameter: function (text) { return writeKind(text, ts.SymbolDisplayPartKind.parameterName); },
+            writeProperty: function (text) { return writeKind(text, ts.SymbolDisplayPartKind.propertyName); },
+            writeLiteral: function (text) { return writeKind(text, ts.SymbolDisplayPartKind.stringLiteral); },
+            writeSymbol: writeSymbol,
+            writeLine: writeLine,
+            write: unknownWrite,
+            writeComment: unknownWrite,
+            getText: function () { return ""; },
+            getTextPos: function () { return 0; },
+            getColumn: function () { return 0; },
+            getLine: function () { return 0; },
+            isAtStartOfLine: function () { return false; },
+            rawWrite: ts.notImplemented,
+            getIndent: function () { return indent; },
+            increaseIndent: function () { indent++; },
+            decreaseIndent: function () { indent--; },
+            clear: resetWriter,
+            trackSymbol: ts.noop,
+            reportInaccessibleThisError: ts.noop,
+            reportInaccessibleUniqueSymbolError: ts.noop,
+            reportPrivateInBaseOfClassExpression: ts.noop,
+        };
+        function writeIndent() {
+            if (length > absoluteMaximumLength)
+                return;
+            if (lineStart) {
+                var indentString = ts.getIndentString(indent);
+                if (indentString) {
+                    length += indentString.length;
+                    displayParts.push(displayPart(indentString, ts.SymbolDisplayPartKind.space));
+                }
+                lineStart = false;
+            }
+        }
+        function writeKind(text, kind) {
+            if (length > absoluteMaximumLength)
+                return;
+            writeIndent();
+            length += text.length;
+            displayParts.push(displayPart(text, kind));
+        }
+        function writeSymbol(text, symbol) {
+            if (length > absoluteMaximumLength)
+                return;
+            writeIndent();
+            length += text.length;
+            displayParts.push(symbolPart(text, symbol));
+        }
+        function writeLine() {
+            if (length > absoluteMaximumLength)
+                return;
+            length += 1;
+            displayParts.push(lineBreakPart());
+            lineStart = true;
+        }
+        function resetWriter() {
+            displayParts = [];
+            lineStart = true;
+            indent = 0;
+            length = 0;
+        }
+    }
+    function symbolPart(text, symbol) {
+        return displayPart(text, displayPartKind(symbol));
+        function displayPartKind(symbol) {
+            var flags = symbol.flags;
+            if (flags & 3 /* Variable */) {
+                return isFirstDeclarationOfSymbolParameter(symbol) ? ts.SymbolDisplayPartKind.parameterName : ts.SymbolDisplayPartKind.localName;
+            }
+            else if (flags & 4 /* Property */) {
+                return ts.SymbolDisplayPartKind.propertyName;
+            }
+            else if (flags & 32768 /* GetAccessor */) {
+                return ts.SymbolDisplayPartKind.propertyName;
+            }
+            else if (flags & 65536 /* SetAccessor */) {
+                return ts.SymbolDisplayPartKind.propertyName;
+            }
+            else if (flags & 8 /* EnumMember */) {
+                return ts.SymbolDisplayPartKind.enumMemberName;
+            }
+            else if (flags & 16 /* Function */) {
+                return ts.SymbolDisplayPartKind.functionName;
+            }
+            else if (flags & 32 /* Class */) {
+                return ts.SymbolDisplayPartKind.className;
+            }
+            else if (flags & 64 /* Interface */) {
+                return ts.SymbolDisplayPartKind.interfaceName;
+            }
+            else if (flags & 384 /* Enum */) {
+                return ts.SymbolDisplayPartKind.enumName;
+            }
+            else if (flags & 1536 /* Module */) {
+                return ts.SymbolDisplayPartKind.moduleName;
+            }
+            else if (flags & 8192 /* Method */) {
+                return ts.SymbolDisplayPartKind.methodName;
+            }
+            else if (flags & 262144 /* TypeParameter */) {
+                return ts.SymbolDisplayPartKind.typeParameterName;
+            }
+            else if (flags & 524288 /* TypeAlias */) {
+                return ts.SymbolDisplayPartKind.aliasName;
+            }
+            else if (flags & 2097152 /* Alias */) {
+                return ts.SymbolDisplayPartKind.aliasName;
+            }
+            return ts.SymbolDisplayPartKind.text;
+        }
+    }
+    ts.symbolPart = symbolPart;
+    function displayPart(text, kind) {
+        return { text: text, kind: ts.SymbolDisplayPartKind[kind] };
+    }
+    ts.displayPart = displayPart;
+    function spacePart() {
+        return displayPart(" ", ts.SymbolDisplayPartKind.space);
+    }
+    ts.spacePart = spacePart;
+    function keywordPart(kind) {
+        return displayPart(ts.tokenToString(kind), ts.SymbolDisplayPartKind.keyword);
+    }
+    ts.keywordPart = keywordPart;
+    function punctuationPart(kind) {
+        return displayPart(ts.tokenToString(kind), ts.SymbolDisplayPartKind.punctuation);
+    }
+    ts.punctuationPart = punctuationPart;
+    function operatorPart(kind) {
+        return displayPart(ts.tokenToString(kind), ts.SymbolDisplayPartKind.operator);
+    }
+    ts.operatorPart = operatorPart;
+    function textOrKeywordPart(text) {
+        var kind = ts.stringToToken(text);
+        return kind === undefined
+            ? textPart(text)
+            : keywordPart(kind);
+    }
+    ts.textOrKeywordPart = textOrKeywordPart;
+    function textPart(text) {
+        return displayPart(text, ts.SymbolDisplayPartKind.text);
+    }
+    ts.textPart = textPart;
+    var carriageReturnLineFeed = "\r\n";
+    /**
+     * The default is CRLF.
+     */
+    function getNewLineOrDefaultFromHost(host, formatSettings) {
+        return (formatSettings && formatSettings.newLineCharacter) ||
+            (host.getNewLine && host.getNewLine()) ||
+            carriageReturnLineFeed;
+    }
+    ts.getNewLineOrDefaultFromHost = getNewLineOrDefaultFromHost;
+    function lineBreakPart() {
+        return displayPart("\n", ts.SymbolDisplayPartKind.lineBreak);
+    }
+    ts.lineBreakPart = lineBreakPart;
+    function mapToDisplayParts(writeDisplayParts) {
+        try {
+            writeDisplayParts(displayPartWriter);
+            return displayPartWriter.displayParts();
+        }
+        finally {
+            displayPartWriter.clear();
+        }
+    }
+    ts.mapToDisplayParts = mapToDisplayParts;
+    function typeToDisplayParts(typechecker, type, enclosingDeclaration, flags) {
+        if (flags === void 0) { flags = 0 /* None */; }
+        return mapToDisplayParts(function (writer) {
+            typechecker.writeType(type, enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */ | 16384 /* UseAliasDefinedOutsideCurrentScope */, writer);
+        });
+    }
+    ts.typeToDisplayParts = typeToDisplayParts;
+    function symbolToDisplayParts(typeChecker, symbol, enclosingDeclaration, meaning, flags) {
+        if (flags === void 0) { flags = 0 /* None */; }
+        return mapToDisplayParts(function (writer) {
+            typeChecker.writeSymbol(symbol, enclosingDeclaration, meaning, flags | 8 /* UseAliasDefinedOutsideCurrentScope */, writer);
+        });
+    }
+    ts.symbolToDisplayParts = symbolToDisplayParts;
+    function signatureToDisplayParts(typechecker, signature, enclosingDeclaration, flags) {
+        if (flags === void 0) { flags = 0 /* None */; }
+        flags |= 16384 /* UseAliasDefinedOutsideCurrentScope */ | 1024 /* MultilineObjectLiterals */ | 32 /* WriteTypeArgumentsOfSignature */ | 8192 /* OmitParameterModifiers */;
+        return mapToDisplayParts(function (writer) {
+            typechecker.writeSignature(signature, enclosingDeclaration, flags, /*signatureKind*/ undefined, writer);
+        });
+    }
+    ts.signatureToDisplayParts = signatureToDisplayParts;
+    function isImportOrExportSpecifierName(location) {
+        return !!location.parent && ts.isImportOrExportSpecifier(location.parent) && location.parent.propertyName === location;
+    }
+    ts.isImportOrExportSpecifierName = isImportOrExportSpecifierName;
+    /**
+     * Strip off existed single quotes or double quotes from a given string
+     *
+     * @return non-quoted string
+     */
+    function stripQuotes(name) {
+        var length = name.length;
+        if (length >= 2 && name.charCodeAt(0) === name.charCodeAt(length - 1) && startsWithQuote(name)) {
+            return name.substring(1, length - 1);
+        }
+        return name;
+    }
+    ts.stripQuotes = stripQuotes;
+    function startsWithQuote(name) {
+        return ts.isSingleOrDoubleQuote(name.charCodeAt(0));
+    }
+    ts.startsWithQuote = startsWithQuote;
+    function scriptKindIs(fileName, host) {
+        var scriptKinds = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            scriptKinds[_i - 2] = arguments[_i];
+        }
+        var scriptKind = getScriptKind(fileName, host);
+        return ts.some(scriptKinds, function (k) { return k === scriptKind; });
+    }
+    ts.scriptKindIs = scriptKindIs;
+    function getScriptKind(fileName, host) {
+        // First check to see if the script kind was specified by the host. Chances are the host
+        // may override the default script kind for the file extension.
+        return ts.ensureScriptKind(fileName, host && host.getScriptKind && host.getScriptKind(fileName));
+    }
+    ts.getScriptKind = getScriptKind;
+    function getUniqueSymbolId(symbol, checker) {
+        return ts.getSymbolId(ts.skipAlias(symbol, checker));
+    }
+    ts.getUniqueSymbolId = getUniqueSymbolId;
+    function getFirstNonSpaceCharacterPosition(text, position) {
+        while (ts.isWhiteSpaceLike(text.charCodeAt(position))) {
+            position += 1;
+        }
+        return position;
+    }
+    ts.getFirstNonSpaceCharacterPosition = getFirstNonSpaceCharacterPosition;
+    function getPrecedingNonSpaceCharacterPosition(text, position) {
+        while (position > -1 && ts.isWhiteSpaceSingleLine(text.charCodeAt(position))) {
+            position -= 1;
+        }
+        return position + 1;
+    }
+    ts.getPrecedingNonSpaceCharacterPosition = getPrecedingNonSpaceCharacterPosition;
+    /**
+     * Creates a deep, memberwise clone of a node with no source map location.
+     *
+     * WARNING: This is an expensive operation and is only intended to be used in refactorings
+     * and code fixes (because those are triggered by explicit user actions).
+     */
+    function getSynthesizedDeepClone(node, includeTrivia) {
+        if (includeTrivia === void 0) { includeTrivia = true; }
+        var clone = node && getSynthesizedDeepCloneWorker(node);
+        if (clone && !includeTrivia)
+            suppressLeadingAndTrailingTrivia(clone);
+        return clone;
+    }
+    ts.getSynthesizedDeepClone = getSynthesizedDeepClone;
+    function getSynthesizedDeepCloneWithRenames(node, includeTrivia, renameMap, checker, callback) {
+        if (includeTrivia === void 0) { includeTrivia = true; }
+        var clone;
+        if (ts.isIdentifier(node) && renameMap && checker) {
+            var symbol = checker.getSymbolAtLocation(node);
+            var renameInfo = symbol && renameMap.get(String(ts.getSymbolId(symbol)));
+            if (renameInfo) {
+                clone = ts.createIdentifier(renameInfo.text);
+            }
+        }
+        if (!clone) {
+            clone = getSynthesizedDeepCloneWorker(node, renameMap, checker, callback);
+        }
+        if (clone && !includeTrivia)
+            suppressLeadingAndTrailingTrivia(clone);
+        if (callback && clone)
+            callback(node, clone);
+        return clone;
+    }
+    ts.getSynthesizedDeepCloneWithRenames = getSynthesizedDeepCloneWithRenames;
+    function getSynthesizedDeepCloneWorker(node, renameMap, checker, callback) {
+        var visited = (renameMap || checker || callback) ?
+            ts.visitEachChild(node, wrapper, ts.nullTransformationContext) :
+            ts.visitEachChild(node, getSynthesizedDeepClone, ts.nullTransformationContext);
+        if (visited === node) {
+            // This only happens for leaf nodes - internal nodes always see their children change.
+            var clone_8 = ts.getSynthesizedClone(node);
+            if (ts.isStringLiteral(clone_8)) {
+                clone_8.textSourceNode = node;
+            }
+            else if (ts.isNumericLiteral(clone_8)) {
+                clone_8.numericLiteralFlags = node.numericLiteralFlags;
+            }
+            return ts.setTextRange(clone_8, node);
+        }
+        // PERF: As an optimization, rather than calling getSynthesizedClone, we'll update
+        // the new node created by visitEachChild with the extra changes getSynthesizedClone
+        // would have made.
+        visited.parent = undefined;
+        return visited;
+        function wrapper(node) {
+            return getSynthesizedDeepCloneWithRenames(node, /*includeTrivia*/ true, renameMap, checker, callback);
+        }
+    }
+    function getSynthesizedDeepClones(nodes, includeTrivia) {
+        if (includeTrivia === void 0) { includeTrivia = true; }
+        return nodes && ts.createNodeArray(nodes.map(function (n) { return getSynthesizedDeepClone(n, includeTrivia); }), nodes.hasTrailingComma);
+    }
+    ts.getSynthesizedDeepClones = getSynthesizedDeepClones;
+    /**
+     * Sets EmitFlags to suppress leading and trailing trivia on the node.
+     */
+    function suppressLeadingAndTrailingTrivia(node) {
+        suppressLeadingTrivia(node);
+        suppressTrailingTrivia(node);
+    }
+    ts.suppressLeadingAndTrailingTrivia = suppressLeadingAndTrailingTrivia;
+    /**
+     * Sets EmitFlags to suppress leading trivia on the node.
+     */
+    function suppressLeadingTrivia(node) {
+        addEmitFlagsRecursively(node, 512 /* NoLeadingComments */, getFirstChild);
+    }
+    ts.suppressLeadingTrivia = suppressLeadingTrivia;
+    /**
+     * Sets EmitFlags to suppress trailing trivia on the node.
+     */
+    function suppressTrailingTrivia(node) {
+        addEmitFlagsRecursively(node, 1024 /* NoTrailingComments */, ts.getLastChild);
+    }
+    ts.suppressTrailingTrivia = suppressTrailingTrivia;
+    function addEmitFlagsRecursively(node, flag, getChild) {
+        ts.addEmitFlags(node, flag);
+        var child = getChild(node);
+        if (child)
+            addEmitFlagsRecursively(child, flag, getChild);
+    }
+    function getFirstChild(node) {
+        return node.forEachChild(function (child) { return child; });
+    }
+    function getUniqueName(baseName, sourceFile) {
+        var nameText = baseName;
+        for (var i = 1; !ts.isFileLevelUniqueName(sourceFile, nameText); i++) {
+            nameText = baseName + "_" + i;
+        }
+        return nameText;
+    }
+    ts.getUniqueName = getUniqueName;
+    /**
+     * @return The index of the (only) reference to the extracted symbol.  We want the cursor
+     * to be on the reference, rather than the declaration, because it's closer to where the
+     * user was before extracting it.
+     */
+    function getRenameLocation(edits, renameFilename, name, preferLastLocation) {
+        var delta = 0;
+        var lastPos = -1;
+        for (var _i = 0, edits_1 = edits; _i < edits_1.length; _i++) {
+            var _a = edits_1[_i], fileName = _a.fileName, textChanges_2 = _a.textChanges;
+            ts.Debug.assert(fileName === renameFilename);
+            for (var _b = 0, textChanges_1 = textChanges_2; _b < textChanges_1.length; _b++) {
+                var change = textChanges_1[_b];
+                var span = change.span, newText = change.newText;
+                var index = indexInTextChange(newText, name);
+                if (index !== -1) {
+                    lastPos = span.start + delta + index;
+                    // If the reference comes first, return immediately.
+                    if (!preferLastLocation) {
+                        return lastPos;
+                    }
+                }
+                delta += newText.length - span.length;
+            }
+        }
+        // If the declaration comes first, return the position of the last occurrence.
+        ts.Debug.assert(preferLastLocation);
+        ts.Debug.assert(lastPos >= 0);
+        return lastPos;
+    }
+    ts.getRenameLocation = getRenameLocation;
+    function copyComments(sourceNode, targetNode, sourceFile, commentKind, hasTrailingNewLine) {
+        ts.forEachLeadingCommentRange(sourceFile.text, sourceNode.pos, function (pos, end, kind, htnl) {
+            if (kind === 3 /* MultiLineCommentTrivia */) {
+                // Remove leading /*
+                pos += 2;
+                // Remove trailing */
+                end -= 2;
+            }
+            else {
+                // Remove leading //
+                pos += 2;
+            }
+            ts.addSyntheticLeadingComment(targetNode, commentKind || kind, sourceFile.text.slice(pos, end), hasTrailingNewLine !== undefined ? hasTrailingNewLine : htnl);
+        });
+    }
+    ts.copyComments = copyComments;
+    function indexInTextChange(change, name) {
+        if (ts.startsWith(change, name))
+            return 0;
+        // Add a " " to avoid references inside words
+        var idx = change.indexOf(" " + name);
+        if (idx === -1)
+            idx = change.indexOf("." + name);
+        if (idx === -1)
+            idx = change.indexOf('"' + name);
+        return idx === -1 ? -1 : idx + 1;
+    }
+    function getContextualTypeFromParent(node, checker) {
+        var parent = node.parent;
+        switch (parent.kind) {
+            case 192 /* NewExpression */:
+                return checker.getContextualType(parent);
+            case 204 /* BinaryExpression */: {
+                var _a = parent, left = _a.left, operatorToken = _a.operatorToken, right = _a.right;
+                return isEqualityOperatorKind(operatorToken.kind)
+                    ? checker.getTypeAtLocation(node === right ? left : right)
+                    : checker.getContextualType(node);
+            }
+            case 271 /* CaseClause */:
+                return parent.expression === node ? getSwitchedType(parent, checker) : undefined;
+            default:
+                return checker.getContextualType(node);
+        }
+    }
+    ts.getContextualTypeFromParent = getContextualTypeFromParent;
+    function quote(text, preferences) {
+        if (/^\d+$/.test(text)) {
+            return text;
+        }
+        // Editors can pass in undefined or empty string - we want to infer the preference in those cases.
+        var quotePreference = preferences.quotePreference || "auto";
+        var quoted = JSON.stringify(text);
+        switch (quotePreference) {
+            // TODO use getQuotePreference to infer the actual quote style.
+            case "auto":
+            case "double":
+                return quoted;
+            case "single":
+                return "'" + stripQuotes(quoted).replace("'", "\\'").replace('\\"', '"') + "'";
+            default:
+                return ts.Debug.assertNever(quotePreference);
+        }
+    }
+    ts.quote = quote;
+    function isEqualityOperatorKind(kind) {
+        switch (kind) {
+            case 35 /* EqualsEqualsEqualsToken */:
+            case 33 /* EqualsEqualsToken */:
+            case 36 /* ExclamationEqualsEqualsToken */:
+            case 34 /* ExclamationEqualsToken */:
+                return true;
+            default:
+                return false;
+        }
+    }
+    ts.isEqualityOperatorKind = isEqualityOperatorKind;
+    function isStringLiteralOrTemplate(node) {
+        switch (node.kind) {
+            case 10 /* StringLiteral */:
+            case 14 /* NoSubstitutionTemplateLiteral */:
+            case 206 /* TemplateExpression */:
+            case 193 /* TaggedTemplateExpression */:
+                return true;
+            default:
+                return false;
+        }
+    }
+    ts.isStringLiteralOrTemplate = isStringLiteralOrTemplate;
+    function hasIndexSignature(type) {
+        return !!type.getStringIndexType() || !!type.getNumberIndexType();
+    }
+    ts.hasIndexSignature = hasIndexSignature;
+    function getSwitchedType(caseClause, checker) {
+        return checker.getTypeAtLocation(caseClause.parent.parent.expression);
+    }
+    ts.getSwitchedType = getSwitchedType;
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    function createClassifier() {
+        var scanner = ts.createScanner(6 /* Latest */, /*skipTrivia*/ false);
+        function getClassificationsForLine(text, lexState, syntacticClassifierAbsent) {
+            return convertClassificationsToResult(getEncodedLexicalClassifications(text, lexState, syntacticClassifierAbsent), text);
+        }
+        // If there is a syntactic classifier ('syntacticClassifierAbsent' is false),
+        // we will be more conservative in order to avoid conflicting with the syntactic classifier.
+        function getEncodedLexicalClassifications(text, lexState, syntacticClassifierAbsent) {
+            var token = 0 /* Unknown */;
+            var lastNonTriviaToken = 0 /* Unknown */;
+            // Just a stack of TemplateHeads and OpenCurlyBraces, used to perform rudimentary (inexact)
+            // classification on template strings. Because of the context free nature of templates,
+            // the only precise way to classify a template portion would be by propagating the stack across
+            // lines, just as we do with the end-of-line state. However, this is a burden for implementers,
+            // and the behavior is entirely subsumed by the syntactic classifier anyway, so we instead
+            // flatten any nesting when the template stack is non-empty and encode it in the end-of-line state.
+            // Situations in which this fails are
+            //  1) When template strings are nested across different lines:
+            //          `hello ${ `world
+            //          ` }`
+            //
+            //     Where on the second line, you will get the closing of a template,
+            //     a closing curly, and a new template.
+            //
+            //  2) When substitution expressions have curly braces and the curly brace falls on the next line:
+            //          `hello ${ () => {
+            //          return "world" } } `
+            //
+            //     Where on the second line, you will get the 'return' keyword,
+            //     a string literal, and a template end consisting of '} } `'.
+            var templateStack = [];
+            var _a = getPrefixFromLexState(lexState), prefix = _a.prefix, pushTemplate = _a.pushTemplate;
+            text = prefix + text;
+            var offset = prefix.length;
+            if (pushTemplate) {
+                templateStack.push(15 /* TemplateHead */);
+            }
+            scanner.setText(text);
+            var endOfLineState = 0 /* None */;
+            var spans = [];
+            // We can run into an unfortunate interaction between the lexical and syntactic classifier
+            // when the user is typing something generic.  Consider the case where the user types:
+            //
+            //      Foo<number
+            //
+            // From the lexical classifier's perspective, 'number' is a keyword, and so the word will
+            // be classified as such.  However, from the syntactic classifier's tree-based perspective
+            // this is simply an expression with the identifier 'number' on the RHS of the less than
+            // token.  So the classification will go back to being an identifier.  The moment the user
+            // types again, number will become a keyword, then an identifier, etc. etc.
+            //
+            // To try to avoid this problem, we avoid classifying contextual keywords as keywords
+            // when the user is potentially typing something generic.  We just can't do a good enough
+            // job at the lexical level, and so well leave it up to the syntactic classifier to make
+            // the determination.
+            //
+            // In order to determine if the user is potentially typing something generic, we use a
+            // weak heuristic where we track < and > tokens.  It's a weak heuristic, but should
+            // work well enough in practice.
+            var angleBracketStack = 0;
+            do {
+                token = scanner.scan();
+                if (!ts.isTrivia(token)) {
+                    handleToken();
+                    lastNonTriviaToken = token;
+                }
+                var end = scanner.getTextPos();
+                pushEncodedClassification(scanner.getTokenPos(), end, offset, classFromKind(token), spans);
+                if (end >= text.length) {
+                    var end_1 = getNewEndOfLineState(scanner, token, ts.lastOrUndefined(templateStack));
+                    if (end_1 !== undefined) {
+                        endOfLineState = end_1;
+                    }
+                }
+            } while (token !== 1 /* EndOfFileToken */);
+            function handleToken() {
+                switch (token) {
+                    case 42 /* SlashToken */:
+                    case 64 /* SlashEqualsToken */:
+                        if (!noRegexTable[lastNonTriviaToken] && scanner.reScanSlashToken() === 13 /* RegularExpressionLiteral */) {
+                            token = 13 /* RegularExpressionLiteral */;
+                        }
+                        break;
+                    case 28 /* LessThanToken */:
+                        if (lastNonTriviaToken === 72 /* Identifier */) {
+                            // Could be the start of something generic.  Keep track of that by bumping
+                            // up the current count of generic contexts we may be in.
+                            angleBracketStack++;
+                        }
+                        break;
+                    case 30 /* GreaterThanToken */:
+                        if (angleBracketStack > 0) {
+                            // If we think we're currently in something generic, then mark that that
+                            // generic entity is complete.
+                            angleBracketStack--;
+                        }
+                        break;
+                    case 120 /* AnyKeyword */:
+                    case 138 /* StringKeyword */:
+                    case 135 /* NumberKeyword */:
+                    case 123 /* BooleanKeyword */:
+                    case 139 /* SymbolKeyword */:
+                        if (angleBracketStack > 0 && !syntacticClassifierAbsent) {
+                            // If it looks like we're could be in something generic, don't classify this
+                            // as a keyword.  We may just get overwritten by the syntactic classifier,
+                            // causing a noisy experience for the user.
+                            token = 72 /* Identifier */;
+                        }
+                        break;
+                    case 15 /* TemplateHead */:
+                        templateStack.push(token);
+                        break;
+                    case 18 /* OpenBraceToken */:
+                        // If we don't have anything on the template stack,
+                        // then we aren't trying to keep track of a previously scanned template head.
+                        if (templateStack.length > 0) {
+                            templateStack.push(token);
+                        }
+                        break;
+                    case 19 /* CloseBraceToken */:
+                        // If we don't have anything on the template stack,
+                        // then we aren't trying to keep track of a previously scanned template head.
+                        if (templateStack.length > 0) {
+                            var lastTemplateStackToken = ts.lastOrUndefined(templateStack);
+                            if (lastTemplateStackToken === 15 /* TemplateHead */) {
+                                token = scanner.reScanTemplateToken();
+                                // Only pop on a TemplateTail; a TemplateMiddle indicates there is more for us.
+                                if (token === 17 /* TemplateTail */) {
+                                    templateStack.pop();
+                                }
+                                else {
+                                    ts.Debug.assertEqual(token, 16 /* TemplateMiddle */, "Should have been a template middle.");
+                                }
+                            }
+                            else {
+                                ts.Debug.assertEqual(lastTemplateStackToken, 18 /* OpenBraceToken */, "Should have been an open brace");
+                                templateStack.pop();
+                            }
+                        }
+                        break;
+                    default:
+                        if (!ts.isKeyword(token)) {
+                            break;
+                        }
+                        if (lastNonTriviaToken === 24 /* DotToken */) {
+                            token = 72 /* Identifier */;
+                        }
+                        else if (ts.isKeyword(lastNonTriviaToken) && ts.isKeyword(token) && !canFollow(lastNonTriviaToken, token)) {
+                            // We have two keywords in a row.  Only treat the second as a keyword if
+                            // it's a sequence that could legally occur in the language.  Otherwise
+                            // treat it as an identifier.  This way, if someone writes "private var"
+                            // we recognize that 'var' is actually an identifier here.
+                            token = 72 /* Identifier */;
+                        }
+                }
+            }
+            return { endOfLineState: endOfLineState, spans: spans };
+        }
+        return { getClassificationsForLine: getClassificationsForLine, getEncodedLexicalClassifications: getEncodedLexicalClassifications };
+    }
+    ts.createClassifier = createClassifier;
+    /// We do not have a full parser support to know when we should parse a regex or not
+    /// If we consider every slash token to be a regex, we could be missing cases like "1/2/3", where
+    /// we have a series of divide operator. this list allows us to be more accurate by ruling out
+    /// locations where a regexp cannot exist.
+    var noRegexTable = ts.arrayToNumericMap([
+        72 /* Identifier */,
+        10 /* StringLiteral */,
+        8 /* NumericLiteral */,
+        9 /* BigIntLiteral */,
+        13 /* RegularExpressionLiteral */,
+        100 /* ThisKeyword */,
+        44 /* PlusPlusToken */,
+        45 /* MinusMinusToken */,
+        21 /* CloseParenToken */,
+        23 /* CloseBracketToken */,
+        19 /* CloseBraceToken */,
+        102 /* TrueKeyword */,
+        87 /* FalseKeyword */,
+    ], function (token) { return token; }, function () { return true; });
+    function getNewEndOfLineState(scanner, token, lastOnTemplateStack) {
+        switch (token) {
+            case 10 /* StringLiteral */: {
+                // Check to see if we finished up on a multiline string literal.
+                if (!scanner.isUnterminated())
+                    return undefined;
+                var tokenText = scanner.getTokenText();
+                var lastCharIndex = tokenText.length - 1;
+                var numBackslashes = 0;
+                while (tokenText.charCodeAt(lastCharIndex - numBackslashes) === 92 /* backslash */) {
+                    numBackslashes++;
+                }
+                // If we have an odd number of backslashes, then the multiline string is unclosed
+                if ((numBackslashes & 1) === 0)
+                    return undefined;
+                return tokenText.charCodeAt(0) === 34 /* doubleQuote */ ? 3 /* InDoubleQuoteStringLiteral */ : 2 /* InSingleQuoteStringLiteral */;
+            }
+            case 3 /* MultiLineCommentTrivia */:
+                // Check to see if the multiline comment was unclosed.
+                return scanner.isUnterminated() ? 1 /* InMultiLineCommentTrivia */ : undefined;
+            default:
+                if (ts.isTemplateLiteralKind(token)) {
+                    if (!scanner.isUnterminated()) {
+                        return undefined;
+                    }
+                    switch (token) {
+                        case 17 /* TemplateTail */:
+                            return 5 /* InTemplateMiddleOrTail */;
+                        case 14 /* NoSubstitutionTemplateLiteral */:
+                            return 4 /* InTemplateHeadOrNoSubstitutionTemplate */;
+                        default:
+                            return ts.Debug.fail("Only 'NoSubstitutionTemplateLiteral's and 'TemplateTail's can be unterminated; got SyntaxKind #" + token);
+                    }
+                }
+                return lastOnTemplateStack === 15 /* TemplateHead */ ? 6 /* InTemplateSubstitutionPosition */ : undefined;
+        }
+    }
+    function pushEncodedClassification(start, end, offset, classification, result) {
+        if (classification === 8 /* whiteSpace */) {
+            // Don't bother with whitespace classifications.  They're not needed.
+            return;
+        }
+        if (start === 0 && offset > 0) {
+            // We're classifying the first token, and this was a case where we prepended text.
+            // We should consider the start of this token to be at the start of the original text.
+            start += offset;
+        }
+        var length = end - start;
+        if (length > 0) {
+            // All our tokens are in relation to the augmented text.  Move them back to be
+            // relative to the original text.
+            result.push(start - offset, length, classification);
+        }
+    }
+    function convertClassificationsToResult(classifications, text) {
+        var entries = [];
+        var dense = classifications.spans;
+        var lastEnd = 0;
+        for (var i = 0; i < dense.length; i += 3) {
+            var start = dense[i];
+            var length_5 = dense[i + 1];
+            var type = dense[i + 2];
+            // Make a whitespace entry between the last item and this one.
+            if (lastEnd >= 0) {
+                var whitespaceLength_1 = start - lastEnd;
+                if (whitespaceLength_1 > 0) {
+                    entries.push({ length: whitespaceLength_1, classification: ts.TokenClass.Whitespace });
+                }
+            }
+            entries.push({ length: length_5, classification: convertClassification(type) });
+            lastEnd = start + length_5;
+        }
+        var whitespaceLength = text.length - lastEnd;
+        if (whitespaceLength > 0) {
+            entries.push({ length: whitespaceLength, classification: ts.TokenClass.Whitespace });
+        }
+        return { entries: entries, finalLexState: classifications.endOfLineState };
+    }
+    function convertClassification(type) {
+        switch (type) {
+            case 1 /* comment */: return ts.TokenClass.Comment;
+            case 3 /* keyword */: return ts.TokenClass.Keyword;
+            case 4 /* numericLiteral */: return ts.TokenClass.NumberLiteral;
+            case 25 /* bigintLiteral */: return ts.TokenClass.BigIntLiteral;
+            case 5 /* operator */: return ts.TokenClass.Operator;
+            case 6 /* stringLiteral */: return ts.TokenClass.StringLiteral;
+            case 8 /* whiteSpace */: return ts.TokenClass.Whitespace;
+            case 10 /* punctuation */: return ts.TokenClass.Punctuation;
+            case 2 /* identifier */:
+            case 11 /* className */:
+            case 12 /* enumName */:
+            case 13 /* interfaceName */:
+            case 14 /* moduleName */:
+            case 15 /* typeParameterName */:
+            case 16 /* typeAliasName */:
+            case 9 /* text */:
+            case 17 /* parameterName */:
+                return ts.TokenClass.Identifier;
+            default:
+                return undefined; // TODO: GH#18217 Debug.assertNever(type);
+        }
+    }
+    /** Returns true if 'keyword2' can legally follow 'keyword1' in any language construct. */
+    function canFollow(keyword1, keyword2) {
+        if (!ts.isAccessibilityModifier(keyword1)) {
+            // Assume any other keyword combination is legal.
+            // This can be refined in the future if there are more cases we want the classifier to be better at.
+            return true;
+        }
+        switch (keyword2) {
+            case 126 /* GetKeyword */:
+            case 137 /* SetKeyword */:
+            case 124 /* ConstructorKeyword */:
+            case 116 /* StaticKeyword */:
+                return true; // Allow things like "public get", "public constructor" and "public static".
+            default:
+                return false; // Any other keyword following "public" is actually an identifier, not a real keyword.
+        }
+    }
+    function getPrefixFromLexState(lexState) {
+        // If we're in a string literal, then prepend: "\
+        // (and a newline).  That way when we lex we'll think we're still in a string literal.
+        //
+        // If we're in a multiline comment, then prepend: /*
+        // (and a newline).  That way when we lex we'll think we're still in a multiline comment.
+        switch (lexState) {
+            case 3 /* InDoubleQuoteStringLiteral */:
+                return { prefix: "\"\\\n" };
+            case 2 /* InSingleQuoteStringLiteral */:
+                return { prefix: "'\\\n" };
+            case 1 /* InMultiLineCommentTrivia */:
+                return { prefix: "/*\n" };
+            case 4 /* InTemplateHeadOrNoSubstitutionTemplate */:
+                return { prefix: "`\n" };
+            case 5 /* InTemplateMiddleOrTail */:
+                return { prefix: "}\n", pushTemplate: true };
+            case 6 /* InTemplateSubstitutionPosition */:
+                return { prefix: "", pushTemplate: true };
+            case 0 /* None */:
+                return { prefix: "" };
+            default:
+                return ts.Debug.assertNever(lexState);
+        }
+    }
+    function isBinaryExpressionOperatorToken(token) {
+        switch (token) {
+            case 40 /* AsteriskToken */:
+            case 42 /* SlashToken */:
+            case 43 /* PercentToken */:
+            case 38 /* PlusToken */:
+            case 39 /* MinusToken */:
+            case 46 /* LessThanLessThanToken */:
+            case 47 /* GreaterThanGreaterThanToken */:
+            case 48 /* GreaterThanGreaterThanGreaterThanToken */:
+            case 28 /* LessThanToken */:
+            case 30 /* GreaterThanToken */:
+            case 31 /* LessThanEqualsToken */:
+            case 32 /* GreaterThanEqualsToken */:
+            case 94 /* InstanceOfKeyword */:
+            case 93 /* InKeyword */:
+            case 119 /* AsKeyword */:
+            case 33 /* EqualsEqualsToken */:
+            case 34 /* ExclamationEqualsToken */:
+            case 35 /* EqualsEqualsEqualsToken */:
+            case 36 /* ExclamationEqualsEqualsToken */:
+            case 49 /* AmpersandToken */:
+            case 51 /* CaretToken */:
+            case 50 /* BarToken */:
+            case 54 /* AmpersandAmpersandToken */:
+            case 55 /* BarBarToken */:
+            case 70 /* BarEqualsToken */:
+            case 69 /* AmpersandEqualsToken */:
+            case 71 /* CaretEqualsToken */:
+            case 66 /* LessThanLessThanEqualsToken */:
+            case 67 /* GreaterThanGreaterThanEqualsToken */:
+            case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+            case 60 /* PlusEqualsToken */:
+            case 61 /* MinusEqualsToken */:
+            case 62 /* AsteriskEqualsToken */:
+            case 64 /* SlashEqualsToken */:
+            case 65 /* PercentEqualsToken */:
+            case 59 /* EqualsToken */:
+            case 27 /* CommaToken */:
+                return true;
+            default:
+                return false;
+        }
+    }
+    function isPrefixUnaryExpressionOperatorToken(token) {
+        switch (token) {
+            case 38 /* PlusToken */:
+            case 39 /* MinusToken */:
+            case 53 /* TildeToken */:
+            case 52 /* ExclamationToken */:
+            case 44 /* PlusPlusToken */:
+            case 45 /* MinusMinusToken */:
+                return true;
+            default:
+                return false;
+        }
+    }
+    function classFromKind(token) {
+        if (ts.isKeyword(token)) {
+            return 3 /* keyword */;
+        }
+        else if (isBinaryExpressionOperatorToken(token) || isPrefixUnaryExpressionOperatorToken(token)) {
+            return 5 /* operator */;
+        }
+        else if (token >= 18 /* FirstPunctuation */ && token <= 71 /* LastPunctuation */) {
+            return 10 /* punctuation */;
+        }
+        switch (token) {
+            case 8 /* NumericLiteral */:
+                return 4 /* numericLiteral */;
+            case 9 /* BigIntLiteral */:
+                return 25 /* bigintLiteral */;
+            case 10 /* StringLiteral */:
+                return 6 /* stringLiteral */;
+            case 13 /* RegularExpressionLiteral */:
+                return 7 /* regularExpressionLiteral */;
+            case 7 /* ConflictMarkerTrivia */:
+            case 3 /* MultiLineCommentTrivia */:
+            case 2 /* SingleLineCommentTrivia */:
+                return 1 /* comment */;
+            case 5 /* WhitespaceTrivia */:
+            case 4 /* NewLineTrivia */:
+                return 8 /* whiteSpace */;
+            case 72 /* Identifier */:
+            default:
+                if (ts.isTemplateLiteralKind(token)) {
+                    return 6 /* stringLiteral */;
+                }
+                return 2 /* identifier */;
+        }
+    }
+    /* @internal */
+    function getSemanticClassifications(typeChecker, cancellationToken, sourceFile, classifiableNames, span) {
+        return convertClassificationsToSpans(getEncodedSemanticClassifications(typeChecker, cancellationToken, sourceFile, classifiableNames, span));
+    }
+    ts.getSemanticClassifications = getSemanticClassifications;
+    function checkForClassificationCancellation(cancellationToken, kind) {
+        // We don't want to actually call back into our host on every node to find out if we've
+        // been canceled.  That would be an enormous amount of chattyness, along with the all
+        // the overhead of marshalling the data to/from the host.  So instead we pick a few
+        // reasonable node kinds to bother checking on.  These node kinds represent high level
+        // constructs that we would expect to see commonly, but just at a far less frequent
+        // interval.
+        //
+        // For example, in checker.ts (around 750k) we only have around 600 of these constructs.
+        // That means we're calling back into the host around every 1.2k of the file we process.
+        // Lib.d.ts has similar numbers.
+        switch (kind) {
+            case 244 /* ModuleDeclaration */:
+            case 240 /* ClassDeclaration */:
+            case 241 /* InterfaceDeclaration */:
+            case 239 /* FunctionDeclaration */:
+                cancellationToken.throwIfCancellationRequested();
+        }
+    }
+    /* @internal */
+    function getEncodedSemanticClassifications(typeChecker, cancellationToken, sourceFile, classifiableNames, span) {
+        var spans = [];
+        sourceFile.forEachChild(function cb(node) {
+            // Only walk into nodes that intersect the requested span.
+            if (!node || !ts.textSpanIntersectsWith(span, node.pos, node.getFullWidth())) {
+                return;
+            }
+            checkForClassificationCancellation(cancellationToken, node.kind);
+            // Only bother calling into the typechecker if this is an identifier that
+            // could possibly resolve to a type name.  This makes classification run
+            // in a third of the time it would normally take.
+            if (ts.isIdentifier(node) && !ts.nodeIsMissing(node) && classifiableNames.has(node.escapedText)) {
+                var symbol = typeChecker.getSymbolAtLocation(node);
+                var type = symbol && classifySymbol(symbol, ts.getMeaningFromLocation(node), typeChecker);
+                if (type) {
+                    pushClassification(node.getStart(sourceFile), node.getEnd(), type);
+                }
+            }
+            node.forEachChild(cb);
+        });
+        return { spans: spans, endOfLineState: 0 /* None */ };
+        function pushClassification(start, end, type) {
+            spans.push(start);
+            spans.push(end - start);
+            spans.push(type);
+        }
+    }
+    ts.getEncodedSemanticClassifications = getEncodedSemanticClassifications;
+    function classifySymbol(symbol, meaningAtPosition, checker) {
+        var flags = symbol.getFlags();
+        if ((flags & 2885600 /* Classifiable */) === 0 /* None */) {
+            return undefined;
+        }
+        else if (flags & 32 /* Class */) {
+            return 11 /* className */;
+        }
+        else if (flags & 384 /* Enum */) {
+            return 12 /* enumName */;
+        }
+        else if (flags & 524288 /* TypeAlias */) {
+            return 16 /* typeAliasName */;
+        }
+        else if (flags & 1536 /* Module */) {
+            // Only classify a module as such if
+            //  - It appears in a namespace context.
+            //  - There exists a module declaration which actually impacts the value side.
+            return meaningAtPosition & 4 /* Namespace */ || meaningAtPosition & 1 /* Value */ && hasValueSideModule(symbol) ? 14 /* moduleName */ : undefined;
+        }
+        else if (flags & 2097152 /* Alias */) {
+            return classifySymbol(checker.getAliasedSymbol(symbol), meaningAtPosition, checker);
+        }
+        else if (meaningAtPosition & 2 /* Type */) {
+            return flags & 64 /* Interface */ ? 13 /* interfaceName */ : flags & 262144 /* TypeParameter */ ? 15 /* typeParameterName */ : undefined;
+        }
+        else {
+            return undefined;
+        }
+    }
+    /** Returns true if there exists a module that introduces entities on the value side. */
+    function hasValueSideModule(symbol) {
+        return ts.some(symbol.declarations, function (declaration) {
+            return ts.isModuleDeclaration(declaration) && ts.getModuleInstanceState(declaration) === 1 /* Instantiated */;
+        });
+    }
+    function getClassificationTypeName(type) {
+        switch (type) {
+            case 1 /* comment */: return "comment" /* comment */;
+            case 2 /* identifier */: return "identifier" /* identifier */;
+            case 3 /* keyword */: return "keyword" /* keyword */;
+            case 4 /* numericLiteral */: return "number" /* numericLiteral */;
+            case 25 /* bigintLiteral */: return "bigint" /* bigintLiteral */;
+            case 5 /* operator */: return "operator" /* operator */;
+            case 6 /* stringLiteral */: return "string" /* stringLiteral */;
+            case 8 /* whiteSpace */: return "whitespace" /* whiteSpace */;
+            case 9 /* text */: return "text" /* text */;
+            case 10 /* punctuation */: return "punctuation" /* punctuation */;
+            case 11 /* className */: return "class name" /* className */;
+            case 12 /* enumName */: return "enum name" /* enumName */;
+            case 13 /* interfaceName */: return "interface name" /* interfaceName */;
+            case 14 /* moduleName */: return "module name" /* moduleName */;
+            case 15 /* typeParameterName */: return "type parameter name" /* typeParameterName */;
+            case 16 /* typeAliasName */: return "type alias name" /* typeAliasName */;
+            case 17 /* parameterName */: return "parameter name" /* parameterName */;
+            case 18 /* docCommentTagName */: return "doc comment tag name" /* docCommentTagName */;
+            case 19 /* jsxOpenTagName */: return "jsx open tag name" /* jsxOpenTagName */;
+            case 20 /* jsxCloseTagName */: return "jsx close tag name" /* jsxCloseTagName */;
+            case 21 /* jsxSelfClosingTagName */: return "jsx self closing tag name" /* jsxSelfClosingTagName */;
+            case 22 /* jsxAttribute */: return "jsx attribute" /* jsxAttribute */;
+            case 23 /* jsxText */: return "jsx text" /* jsxText */;
+            case 24 /* jsxAttributeStringLiteralValue */: return "jsx attribute string literal value" /* jsxAttributeStringLiteralValue */;
+            default: return undefined; // TODO: GH#18217 throw Debug.assertNever(type);
+        }
+    }
+    function convertClassificationsToSpans(classifications) {
+        ts.Debug.assert(classifications.spans.length % 3 === 0);
+        var dense = classifications.spans;
+        var result = [];
+        for (var i = 0; i < dense.length; i += 3) {
+            result.push({
+                textSpan: ts.createTextSpan(dense[i], dense[i + 1]),
+                classificationType: getClassificationTypeName(dense[i + 2])
+            });
+        }
+        return result;
+    }
+    /* @internal */
+    function getSyntacticClassifications(cancellationToken, sourceFile, span) {
+        return convertClassificationsToSpans(getEncodedSyntacticClassifications(cancellationToken, sourceFile, span));
+    }
+    ts.getSyntacticClassifications = getSyntacticClassifications;
+    /* @internal */
+    function getEncodedSyntacticClassifications(cancellationToken, sourceFile, span) {
+        var spanStart = span.start;
+        var spanLength = span.length;
+        // Make a scanner we can get trivia from.
+        var triviaScanner = ts.createScanner(6 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
+        var mergeConflictScanner = ts.createScanner(6 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
+        var result = [];
+        processElement(sourceFile);
+        return { spans: result, endOfLineState: 0 /* None */ };
+        function pushClassification(start, length, type) {
+            result.push(start);
+            result.push(length);
+            result.push(type);
+        }
+        function classifyLeadingTriviaAndGetTokenStart(token) {
+            triviaScanner.setTextPos(token.pos);
+            while (true) {
+                var start = triviaScanner.getTextPos();
+                // only bother scanning if we have something that could be trivia.
+                if (!ts.couldStartTrivia(sourceFile.text, start)) {
+                    return start;
+                }
+                var kind = triviaScanner.scan();
+                var end = triviaScanner.getTextPos();
+                var width = end - start;
+                // The moment we get something that isn't trivia, then stop processing.
+                if (!ts.isTrivia(kind)) {
+                    return start;
+                }
+                switch (kind) {
+                    case 4 /* NewLineTrivia */:
+                    case 5 /* WhitespaceTrivia */:
+                        // Don't bother with newlines/whitespace.
+                        continue;
+                    case 2 /* SingleLineCommentTrivia */:
+                    case 3 /* MultiLineCommentTrivia */:
+                        // Only bother with the trivia if it at least intersects the span of interest.
+                        classifyComment(token, kind, start, width);
+                        // Classifying a comment might cause us to reuse the trivia scanner
+                        // (because of jsdoc comments).  So after we classify the comment make
+                        // sure we set the scanner position back to where it needs to be.
+                        triviaScanner.setTextPos(end);
+                        continue;
+                    case 7 /* ConflictMarkerTrivia */:
+                        var text = sourceFile.text;
+                        var ch = text.charCodeAt(start);
+                        // for the <<<<<<< and >>>>>>> markers, we just add them in as comments
+                        // in the classification stream.
+                        if (ch === 60 /* lessThan */ || ch === 62 /* greaterThan */) {
+                            pushClassification(start, width, 1 /* comment */);
+                            continue;
+                        }
+                        // for the ||||||| and ======== markers, add a comment for the first line,
+                        // and then lex all subsequent lines up until the end of the conflict marker.
+                        ts.Debug.assert(ch === 124 /* bar */ || ch === 61 /* equals */);
+                        classifyDisabledMergeCode(text, start, end);
+                        break;
+                    case 6 /* ShebangTrivia */:
+                        // TODO: Maybe we should classify these.
+                        break;
+                    default:
+                        ts.Debug.assertNever(kind);
+                }
+            }
+        }
+        function classifyComment(token, kind, start, width) {
+            if (kind === 3 /* MultiLineCommentTrivia */) {
+                // See if this is a doc comment.  If so, we'll classify certain portions of it
+                // specially.
+                var docCommentAndDiagnostics = ts.parseIsolatedJSDocComment(sourceFile.text, start, width);
+                if (docCommentAndDiagnostics && docCommentAndDiagnostics.jsDoc) {
+                    // TODO: This should be predicated on `token["kind"]` being compatible with `HasJSDoc["kind"]`
+                    docCommentAndDiagnostics.jsDoc.parent = token;
+                    classifyJSDocComment(docCommentAndDiagnostics.jsDoc);
+                    return;
+                }
+            }
+            // Simple comment.  Just add as is.
+            pushCommentRange(start, width);
+        }
+        function pushCommentRange(start, width) {
+            pushClassification(start, width, 1 /* comment */);
+        }
+        function classifyJSDocComment(docComment) {
+            var pos = docComment.pos;
+            if (docComment.tags) {
+                for (var _i = 0, _a = docComment.tags; _i < _a.length; _i++) {
+                    var tag = _a[_i];
+                    // As we walk through each tag, classify the portion of text from the end of
+                    // the last tag (or the start of the entire doc comment) as 'comment'.
+                    if (tag.pos !== pos) {
+                        pushCommentRange(pos, tag.pos - pos);
+                    }
+                    pushClassification(tag.pos, 1, 10 /* punctuation */); // "@"
+                    pushClassification(tag.tagName.pos, tag.tagName.end - tag.tagName.pos, 18 /* docCommentTagName */); // e.g. "param"
+                    pos = tag.tagName.end;
+                    switch (tag.kind) {
+                        case 299 /* JSDocParameterTag */:
+                            processJSDocParameterTag(tag);
+                            break;
+                        case 303 /* JSDocTemplateTag */:
+                            processJSDocTemplateTag(tag);
+                            pos = tag.end;
+                            break;
+                        case 302 /* JSDocTypeTag */:
+                            processElement(tag.typeExpression);
+                            pos = tag.end;
+                            break;
+                        case 300 /* JSDocReturnTag */:
+                            processElement(tag.typeExpression);
+                            pos = tag.end;
+                            break;
+                    }
+                }
+            }
+            if (pos !== docComment.end) {
+                pushCommentRange(pos, docComment.end - pos);
+            }
+            return;
+            function processJSDocParameterTag(tag) {
+                if (tag.isNameFirst) {
+                    pushCommentRange(pos, tag.name.pos - pos);
+                    pushClassification(tag.name.pos, tag.name.end - tag.name.pos, 17 /* parameterName */);
+                    pos = tag.name.end;
+                }
+                if (tag.typeExpression) {
+                    pushCommentRange(pos, tag.typeExpression.pos - pos);
+                    processElement(tag.typeExpression);
+                    pos = tag.typeExpression.end;
+                }
+                if (!tag.isNameFirst) {
+                    pushCommentRange(pos, tag.name.pos - pos);
+                    pushClassification(tag.name.pos, tag.name.end - tag.name.pos, 17 /* parameterName */);
+                    pos = tag.name.end;
+                }
+            }
+        }
+        function processJSDocTemplateTag(tag) {
+            for (var _i = 0, _a = tag.getChildren(); _i < _a.length; _i++) {
+                var child = _a[_i];
+                processElement(child);
+            }
+        }
+        function classifyDisabledMergeCode(text, start, end) {
+            // Classify the line that the ||||||| or ======= marker is on as a comment.
+            // Then just lex all further tokens and add them to the result.
+            var i;
+            for (i = start; i < end; i++) {
+                if (ts.isLineBreak(text.charCodeAt(i))) {
+                    break;
+                }
+            }
+            pushClassification(start, i - start, 1 /* comment */);
+            mergeConflictScanner.setTextPos(i);
+            while (mergeConflictScanner.getTextPos() < end) {
+                classifyDisabledCodeToken();
+            }
+        }
+        function classifyDisabledCodeToken() {
+            var start = mergeConflictScanner.getTextPos();
+            var tokenKind = mergeConflictScanner.scan();
+            var end = mergeConflictScanner.getTextPos();
+            var type = classifyTokenType(tokenKind);
+            if (type) {
+                pushClassification(start, end - start, type);
+            }
+        }
+        /**
+         * Returns true if node should be treated as classified and no further processing is required.
+         * False will mean that node is not classified and traverse routine should recurse into node contents.
+         */
+        function tryClassifyNode(node) {
+            if (ts.isJSDoc(node)) {
+                return true;
+            }
+            if (ts.nodeIsMissing(node)) {
+                return true;
+            }
+            var classifiedElementName = tryClassifyJsxElementName(node);
+            if (!ts.isToken(node) && node.kind !== 11 /* JsxText */ && classifiedElementName === undefined) {
+                return false;
+            }
+            var tokenStart = node.kind === 11 /* JsxText */ ? node.pos : classifyLeadingTriviaAndGetTokenStart(node);
+            var tokenWidth = node.end - tokenStart;
+            ts.Debug.assert(tokenWidth >= 0);
+            if (tokenWidth > 0) {
+                var type = classifiedElementName || classifyTokenType(node.kind, node);
+                if (type) {
+                    pushClassification(tokenStart, tokenWidth, type);
+                }
+            }
+            return true;
+        }
+        function tryClassifyJsxElementName(token) {
+            switch (token.parent && token.parent.kind) {
+                case 262 /* JsxOpeningElement */:
+                    if (token.parent.tagName === token) {
+                        return 19 /* jsxOpenTagName */;
+                    }
+                    break;
+                case 263 /* JsxClosingElement */:
+                    if (token.parent.tagName === token) {
+                        return 20 /* jsxCloseTagName */;
+                    }
+                    break;
+                case 261 /* JsxSelfClosingElement */:
+                    if (token.parent.tagName === token) {
+                        return 21 /* jsxSelfClosingTagName */;
+                    }
+                    break;
+                case 267 /* JsxAttribute */:
+                    if (token.parent.name === token) {
+                        return 22 /* jsxAttribute */;
+                    }
+                    break;
+            }
+            return undefined;
+        }
+        // for accurate classification, the actual token should be passed in.  however, for
+        // cases like 'disabled merge code' classification, we just get the token kind and
+        // classify based on that instead.
+        function classifyTokenType(tokenKind, token) {
+            if (ts.isKeyword(tokenKind)) {
+                return 3 /* keyword */;
+            }
+            // Special case `<` and `>`: If they appear in a generic context they are punctuation,
+            // not operators.
+            if (tokenKind === 28 /* LessThanToken */ || tokenKind === 30 /* GreaterThanToken */) {
+                // If the node owning the token has a type argument list or type parameter list, then
+                // we can effectively assume that a '<' and '>' belong to those lists.
+                if (token && ts.getTypeArgumentOrTypeParameterList(token.parent)) {
+                    return 10 /* punctuation */;
+                }
+            }
+            if (ts.isPunctuation(tokenKind)) {
+                if (token) {
+                    var parent = token.parent;
+                    if (tokenKind === 59 /* EqualsToken */) {
+                        // the '=' in a variable declaration is special cased here.
+                        if (parent.kind === 237 /* VariableDeclaration */ ||
+                            parent.kind === 154 /* PropertyDeclaration */ ||
+                            parent.kind === 151 /* Parameter */ ||
+                            parent.kind === 267 /* JsxAttribute */) {
+                            return 5 /* operator */;
+                        }
+                    }
+                    if (parent.kind === 204 /* BinaryExpression */ ||
+                        parent.kind === 202 /* PrefixUnaryExpression */ ||
+                        parent.kind === 203 /* PostfixUnaryExpression */ ||
+                        parent.kind === 205 /* ConditionalExpression */) {
+                        return 5 /* operator */;
+                    }
+                }
+                return 10 /* punctuation */;
+            }
+            else if (tokenKind === 8 /* NumericLiteral */) {
+                return 4 /* numericLiteral */;
+            }
+            else if (tokenKind === 9 /* BigIntLiteral */) {
+                return 25 /* bigintLiteral */;
+            }
+            else if (tokenKind === 10 /* StringLiteral */) {
+                // TODO: GH#18217
+                return token.parent.kind === 267 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */;
+            }
+            else if (tokenKind === 13 /* RegularExpressionLiteral */) {
+                // TODO: we should get another classification type for these literals.
+                return 6 /* stringLiteral */;
+            }
+            else if (ts.isTemplateLiteralKind(tokenKind)) {
+                // TODO (drosen): we should *also* get another classification type for these literals.
+                return 6 /* stringLiteral */;
+            }
+            else if (tokenKind === 11 /* JsxText */) {
+                return 23 /* jsxText */;
+            }
+            else if (tokenKind === 72 /* Identifier */) {
+                if (token) {
+                    switch (token.parent.kind) {
+                        case 240 /* ClassDeclaration */:
+                            if (token.parent.name === token) {
+                                return 11 /* className */;
+                            }
+                            return;
+                        case 150 /* TypeParameter */:
+                            if (token.parent.name === token) {
+                                return 15 /* typeParameterName */;
+                            }
+                            return;
+                        case 241 /* InterfaceDeclaration */:
+                            if (token.parent.name === token) {
+                                return 13 /* interfaceName */;
+                            }
+                            return;
+                        case 243 /* EnumDeclaration */:
+                            if (token.parent.name === token) {
+                                return 12 /* enumName */;
+                            }
+                            return;
+                        case 244 /* ModuleDeclaration */:
+                            if (token.parent.name === token) {
+                                return 14 /* moduleName */;
+                            }
+                            return;
+                        case 151 /* Parameter */:
+                            if (token.parent.name === token) {
+                                return ts.isThisIdentifier(token) ? 3 /* keyword */ : 17 /* parameterName */;
+                            }
+                            return;
+                    }
+                }
+                return 2 /* identifier */;
+            }
+        }
+        function processElement(element) {
+            if (!element) {
+                return;
+            }
+            // Ignore nodes that don't intersect the original span to classify.
+            if (ts.decodedTextSpanIntersectsWith(spanStart, spanLength, element.pos, element.getFullWidth())) {
+                checkForClassificationCancellation(cancellationToken, element.kind);
+                for (var _i = 0, _a = element.getChildren(sourceFile); _i < _a.length; _i++) {
+                    var child = _a[_i];
+                    if (!tryClassifyNode(child)) {
+                        // Recurse into our child nodes.
+                        processElement(child);
+                    }
+                }
+            }
+        }
+    }
+    ts.getEncodedSyntacticClassifications = getEncodedSyntacticClassifications;
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var Completions;
+    (function (Completions) {
+        var StringCompletions;
+        (function (StringCompletions) {
+            function getStringLiteralCompletions(sourceFile, position, contextToken, checker, options, host, log, preferences) {
+                if (ts.isInReferenceComment(sourceFile, position)) {
+                    var entries = getTripleSlashReferenceCompletion(sourceFile, position, options, host);
+                    return entries && convertPathCompletions(entries);
+                }
+                if (ts.isInString(sourceFile, position, contextToken)) {
+                    return !contextToken || !ts.isStringLiteralLike(contextToken)
+                        ? undefined
+                        : convertStringLiteralCompletions(getStringLiteralCompletionEntries(sourceFile, contextToken, position, checker, options, host), sourceFile, checker, log, preferences);
+                }
+            }
+            StringCompletions.getStringLiteralCompletions = getStringLiteralCompletions;
+            function convertStringLiteralCompletions(completion, sourceFile, checker, log, preferences) {
+                if (completion === undefined) {
+                    return undefined;
+                }
+                switch (completion.kind) {
+                    case 0 /* Paths */:
+                        return convertPathCompletions(completion.paths);
+                    case 1 /* Properties */: {
+                        var entries = [];
+                        Completions.getCompletionEntriesFromSymbols(completion.symbols, entries, sourceFile, sourceFile, checker, 6 /* ESNext */, log, 4 /* String */, preferences); // Target will not be used, so arbitrary
+                        return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: completion.hasIndexSignature, entries: entries };
+                    }
+                    case 2 /* Types */: {
+                        var entries = completion.types.map(function (type) { return ({ name: type.value, kindModifiers: "" /* none */, kind: "string" /* string */, sortText: "0" }); });
+                        return { isGlobalCompletion: false, isMemberCompletion: false, isNewIdentifierLocation: completion.isNewIdentifier, entries: entries };
+                    }
+                    default:
+                        return ts.Debug.assertNever(completion);
+                }
+            }
+            function getStringLiteralCompletionDetails(name, sourceFile, position, contextToken, checker, options, host, cancellationToken) {
+                if (!contextToken || !ts.isStringLiteralLike(contextToken))
+                    return undefined;
+                var completions = getStringLiteralCompletionEntries(sourceFile, contextToken, position, checker, options, host);
+                return completions && stringLiteralCompletionDetails(name, contextToken, completions, sourceFile, checker, cancellationToken);
+            }
+            StringCompletions.getStringLiteralCompletionDetails = getStringLiteralCompletionDetails;
+            function stringLiteralCompletionDetails(name, location, completion, sourceFile, checker, cancellationToken) {
+                switch (completion.kind) {
+                    case 0 /* Paths */: {
+                        var match = ts.find(completion.paths, function (p) { return p.name === name; });
+                        return match && Completions.createCompletionDetails(name, kindModifiersFromExtension(match.extension), match.kind, [ts.textPart(name)]);
+                    }
+                    case 1 /* Properties */: {
+                        var match = ts.find(completion.symbols, function (s) { return s.name === name; });
+                        return match && Completions.createCompletionDetailsForSymbol(match, checker, sourceFile, location, cancellationToken);
+                    }
+                    case 2 /* Types */:
+                        return ts.find(completion.types, function (t) { return t.value === name; }) ? Completions.createCompletionDetails(name, "" /* none */, "type" /* typeElement */, [ts.textPart(name)]) : undefined;
+                    default:
+                        return ts.Debug.assertNever(completion);
+                }
+            }
+            function convertPathCompletions(pathCompletions) {
+                var isGlobalCompletion = false; // We don't want the editor to offer any other completions, such as snippets, inside a comment.
+                var isNewIdentifierLocation = true; // The user may type in a path that doesn't yet exist, creating a "new identifier" with respect to the collection of identifiers the server is aware of.
+                var entries = pathCompletions.map(function (_a) {
+                    var name = _a.name, kind = _a.kind, span = _a.span, extension = _a.extension;
+                    return ({ name: name, kind: kind, kindModifiers: kindModifiersFromExtension(extension), sortText: "0", replacementSpan: span });
+                });
+                return { isGlobalCompletion: isGlobalCompletion, isMemberCompletion: false, isNewIdentifierLocation: isNewIdentifierLocation, entries: entries };
+            }
+            function kindModifiersFromExtension(extension) {
+                switch (extension) {
+                    case ".d.ts" /* Dts */: return ".d.ts" /* dtsModifier */;
+                    case ".js" /* Js */: return ".js" /* jsModifier */;
+                    case ".json" /* Json */: return ".json" /* jsonModifier */;
+                    case ".jsx" /* Jsx */: return ".jsx" /* jsxModifier */;
+                    case ".ts" /* Ts */: return ".ts" /* tsModifier */;
+                    case ".tsx" /* Tsx */: return ".tsx" /* tsxModifier */;
+                    case undefined: return "" /* none */;
+                    default:
+                        return ts.Debug.assertNever(extension);
+                }
+            }
+            var StringLiteralCompletionKind;
+            (function (StringLiteralCompletionKind) {
+                StringLiteralCompletionKind[StringLiteralCompletionKind["Paths"] = 0] = "Paths";
+                StringLiteralCompletionKind[StringLiteralCompletionKind["Properties"] = 1] = "Properties";
+                StringLiteralCompletionKind[StringLiteralCompletionKind["Types"] = 2] = "Types";
+            })(StringLiteralCompletionKind || (StringLiteralCompletionKind = {}));
+            function getStringLiteralCompletionEntries(sourceFile, node, position, typeChecker, compilerOptions, host) {
+                var parent = node.parent;
+                switch (parent.kind) {
+                    case 182 /* LiteralType */:
+                        switch (parent.parent.kind) {
+                            case 164 /* TypeReference */:
+                                return { kind: 2 /* Types */, types: getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(parent)), isNewIdentifier: false };
+                            case 180 /* IndexedAccessType */:
+                                // Get all apparent property names
+                                // i.e. interface Foo {
+                                //          foo: string;
+                                //          bar: string;
+                                //      }
+                                //      let x: Foo["/*completion position*/"]
+                                return stringLiteralCompletionsFromProperties(typeChecker.getTypeFromTypeNode(parent.parent.objectType));
+                            case 183 /* ImportType */:
+                                return { kind: 0 /* Paths */, paths: getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker) };
+                            case 173 /* UnionType */: {
+                                if (!ts.isTypeReferenceNode(parent.parent.parent))
+                                    return undefined;
+                                var alreadyUsedTypes_1 = getAlreadyUsedTypesInStringLiteralUnion(parent.parent, parent);
+                                var types = getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(parent.parent)).filter(function (t) { return !ts.contains(alreadyUsedTypes_1, t.value); });
+                                return { kind: 2 /* Types */, types: types, isNewIdentifier: false };
+                            }
+                            default:
+                                return undefined;
+                        }
+                    case 275 /* PropertyAssignment */:
+                        if (ts.isObjectLiteralExpression(parent.parent) && parent.name === node) {
+                            // Get quoted name of properties of the object literal expression
+                            // i.e. interface ConfigFiles {
+                            //          'jspm:dev': string
+                            //      }
+                            //      let files: ConfigFiles = {
+                            //          '/*completion position*/'
+                            //      }
+                            //
+                            //      function foo(c: ConfigFiles) {}
+                            //      foo({
+                            //          '/*completion position*/'
+                            //      });
+                            return stringLiteralCompletionsFromProperties(typeChecker.getContextualType(parent.parent));
+                        }
+                        return fromContextualType();
+                    case 190 /* ElementAccessExpression */: {
+                        var _a = parent, expression = _a.expression, argumentExpression = _a.argumentExpression;
+                        if (node === argumentExpression) {
+                            // Get all names of properties on the expression
+                            // i.e. interface A {
+                            //      'prop1': string
+                            // }
+                            // let a: A;
+                            // a['/*completion position*/']
+                            return stringLiteralCompletionsFromProperties(typeChecker.getTypeAtLocation(expression));
+                        }
+                        return undefined;
+                    }
+                    case 191 /* CallExpression */:
+                    case 192 /* NewExpression */:
+                        if (!ts.isRequireCall(parent, /*checkArgumentIsStringLiteralLike*/ false) && !ts.isImportCall(parent)) {
+                            var argumentInfo = ts.SignatureHelp.getArgumentInfoForCompletions(node, position, sourceFile);
+                            // Get string literal completions from specialized signatures of the target
+                            // i.e. declare function f(a: 'A');
+                            // f("/*completion position*/")
+                            return argumentInfo ? getStringLiteralCompletionsFromSignature(argumentInfo, typeChecker) : fromContextualType();
+                        }
+                    // falls through (is `require("")` or `import("")`)
+                    case 249 /* ImportDeclaration */:
+                    case 255 /* ExportDeclaration */:
+                    case 259 /* ExternalModuleReference */:
+                        // Get all known external module names or complete a path to a module
+                        // i.e. import * as ns from "/*completion position*/";
+                        //      var y = import("/*completion position*/");
+                        //      import x = require("/*completion position*/");
+                        //      var y = require("/*completion position*/");
+                        //      export * from "/*completion position*/";
+                        return { kind: 0 /* Paths */, paths: getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker) };
+                    default:
+                        return fromContextualType();
+                }
+                function fromContextualType() {
+                    // Get completion for string literal from string literal type
+                    // i.e. var x: "hi" | "hello" = "/*completion position*/"
+                    return { kind: 2 /* Types */, types: getStringLiteralTypes(ts.getContextualTypeFromParent(node, typeChecker)), isNewIdentifier: false };
+                }
+            }
+            function getAlreadyUsedTypesInStringLiteralUnion(union, current) {
+                return ts.mapDefined(union.types, function (type) {
+                    return type !== current && ts.isLiteralTypeNode(type) && ts.isStringLiteral(type.literal) ? type.literal.text : undefined;
+                });
+            }
+            function getStringLiteralCompletionsFromSignature(argumentInfo, checker) {
+                var isNewIdentifier = false;
+                var uniques = ts.createMap();
+                var candidates = [];
+                checker.getResolvedSignature(argumentInfo.invocation, candidates, argumentInfo.argumentCount);
+                var types = ts.flatMap(candidates, function (candidate) {
+                    if (!candidate.hasRestParameter && argumentInfo.argumentCount > candidate.parameters.length)
+                        return;
+                    var type = checker.getParameterType(candidate, argumentInfo.argumentIndex);
+                    isNewIdentifier = isNewIdentifier || !!(type.flags & 4 /* String */);
+                    return getStringLiteralTypes(type, uniques);
+                });
+                return { kind: 2 /* Types */, types: types, isNewIdentifier: isNewIdentifier };
+            }
+            function stringLiteralCompletionsFromProperties(type) {
+                return type && { kind: 1 /* Properties */, symbols: type.getApparentProperties(), hasIndexSignature: ts.hasIndexSignature(type) };
+            }
+            function getStringLiteralTypes(type, uniques) {
+                if (uniques === void 0) { uniques = ts.createMap(); }
+                if (!type)
+                    return ts.emptyArray;
+                type = ts.skipConstraint(type);
+                return type.isUnion()
+                    ? ts.flatMap(type.types, function (t) { return getStringLiteralTypes(t, uniques); })
+                    : type.isStringLiteral() && !(type.flags & 1024 /* EnumLiteral */) && ts.addToSeen(uniques, type.value)
+                        ? [type]
+                        : ts.emptyArray;
+            }
+            function nameAndKind(name, kind, extension) {
+                return { name: name, kind: kind, extension: extension };
+            }
+            function directoryResult(name) {
+                return nameAndKind(name, "directory" /* directory */, /*extension*/ undefined);
+            }
+            function addReplacementSpans(text, textStart, names) {
+                var span = getDirectoryFragmentTextSpan(text, textStart);
+                return names.map(function (_a) {
+                    var name = _a.name, kind = _a.kind, extension = _a.extension;
+                    return ({ name: name, kind: kind, extension: extension, span: span });
+                });
+            }
+            function getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker) {
+                return addReplacementSpans(node.text, node.getStart(sourceFile) + 1, getStringLiteralCompletionsFromModuleNamesWorker(sourceFile, node, compilerOptions, host, typeChecker));
+            }
+            function getStringLiteralCompletionsFromModuleNamesWorker(sourceFile, node, compilerOptions, host, typeChecker) {
+                var literalValue = ts.normalizeSlashes(node.text);
+                var scriptPath = sourceFile.path;
+                var scriptDirectory = ts.getDirectoryPath(scriptPath);
+                return isPathRelativeToScript(literalValue) || !compilerOptions.baseUrl && (ts.isRootedDiskPath(literalValue) || ts.isUrl(literalValue))
+                    ? getCompletionEntriesForRelativeModules(literalValue, scriptDirectory, compilerOptions, host, scriptPath)
+                    : getCompletionEntriesForNonRelativeModules(literalValue, scriptDirectory, compilerOptions, host, typeChecker);
+            }
+            function getExtensionOptions(compilerOptions, includeExtensions) {
+                if (includeExtensions === void 0) { includeExtensions = false; }
+                return { extensions: getSupportedExtensionsForModuleResolution(compilerOptions), includeExtensions: includeExtensions };
+            }
+            function getCompletionEntriesForRelativeModules(literalValue, scriptDirectory, compilerOptions, host, scriptPath) {
+                var extensionOptions = getExtensionOptions(compilerOptions);
+                if (compilerOptions.rootDirs) {
+                    return getCompletionEntriesForDirectoryFragmentWithRootDirs(compilerOptions.rootDirs, literalValue, scriptDirectory, extensionOptions, compilerOptions, host, scriptPath);
+                }
+                else {
+                    return getCompletionEntriesForDirectoryFragment(literalValue, scriptDirectory, extensionOptions, host, scriptPath);
+                }
+            }
+            function getSupportedExtensionsForModuleResolution(compilerOptions) {
+                var extensions = ts.getSupportedExtensions(compilerOptions);
+                return compilerOptions.resolveJsonModule && ts.getEmitModuleResolutionKind(compilerOptions) === ts.ModuleResolutionKind.NodeJs ?
+                    extensions.concat(".json" /* Json */) :
+                    extensions;
+            }
+            /**
+             * Takes a script path and returns paths for all potential folders that could be merged with its
+             * containing folder via the "rootDirs" compiler option
+             */
+            function getBaseDirectoriesFromRootDirs(rootDirs, basePath, scriptDirectory, ignoreCase) {
+                // Make all paths absolute/normalized if they are not already
+                rootDirs = rootDirs.map(function (rootDirectory) { return ts.normalizePath(ts.isRootedDiskPath(rootDirectory) ? rootDirectory : ts.combinePaths(basePath, rootDirectory)); });
+                // Determine the path to the directory containing the script relative to the root directory it is contained within
+                var relativeDirectory = ts.firstDefined(rootDirs, function (rootDirectory) {
+                    return ts.containsPath(rootDirectory, scriptDirectory, basePath, ignoreCase) ? scriptDirectory.substr(rootDirectory.length) : undefined;
+                }); // TODO: GH#18217
+                // Now find a path for each potential directory that is to be merged with the one containing the script
+                return ts.deduplicate(rootDirs.map(function (rootDirectory) { return ts.combinePaths(rootDirectory, relativeDirectory); }).concat([scriptDirectory]), ts.equateStringsCaseSensitive, ts.compareStringsCaseSensitive);
+            }
+            function getCompletionEntriesForDirectoryFragmentWithRootDirs(rootDirs, fragment, scriptDirectory, extensionOptions, compilerOptions, host, exclude) {
+                var basePath = compilerOptions.project || host.getCurrentDirectory();
+                var ignoreCase = !(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames());
+                var baseDirectories = getBaseDirectoriesFromRootDirs(rootDirs, basePath, scriptDirectory, ignoreCase);
+                return ts.flatMap(baseDirectories, function (baseDirectory) { return getCompletionEntriesForDirectoryFragment(fragment, baseDirectory, extensionOptions, host, exclude); });
+            }
+            /**
+             * Given a path ending at a directory, gets the completions for the path, and filters for those entries containing the basename.
+             */
+            function getCompletionEntriesForDirectoryFragment(fragment, scriptPath, _a, host, exclude, result) {
+                var extensions = _a.extensions, includeExtensions = _a.includeExtensions;
+                if (result === void 0) { result = []; }
+                if (fragment === undefined) {
+                    fragment = "";
+                }
+                fragment = ts.normalizeSlashes(fragment);
+                /**
+                 * Remove the basename from the path. Note that we don't use the basename to filter completions;
+                 * the client is responsible for refining completions.
+                 */
+                if (!ts.hasTrailingDirectorySeparator(fragment)) {
+                    fragment = ts.getDirectoryPath(fragment);
+                }
+                if (fragment === "") {
+                    fragment = "." + ts.directorySeparator;
+                }
+                fragment = ts.ensureTrailingDirectorySeparator(fragment);
+                // const absolutePath = normalizeAndPreserveTrailingSlash(isRootedDiskPath(fragment) ? fragment : combinePaths(scriptPath, fragment)); // TODO(rbuckton): should use resolvePaths
+                var absolutePath = ts.resolvePath(scriptPath, fragment);
+                var baseDirectory = ts.hasTrailingDirectorySeparator(absolutePath) ? absolutePath : ts.getDirectoryPath(absolutePath);
+                var ignoreCase = !(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames());
+                if (!tryDirectoryExists(host, baseDirectory))
+                    return result;
+                // Enumerate the available files if possible
+                var files = tryReadDirectory(host, baseDirectory, extensions, /*exclude*/ undefined, /*include*/ ["./*"]);
+                if (files) {
+                    /**
+                     * Multiple file entries might map to the same truncated name once we remove extensions
+                     * (happens iff includeExtensions === false)so we use a set-like data structure. Eg:
+                     *
+                     * both foo.ts and foo.tsx become foo
+                     */
+                    var foundFiles = ts.createMap(); // maps file to its extension
+                    for (var _i = 0, files_3 = files; _i < files_3.length; _i++) {
+                        var filePath = files_3[_i];
+                        filePath = ts.normalizePath(filePath);
+                        if (exclude && ts.comparePaths(filePath, exclude, scriptPath, ignoreCase) === 0 /* EqualTo */) {
+                            continue;
+                        }
+                        var foundFileName = includeExtensions || ts.fileExtensionIs(filePath, ".json" /* Json */) ? ts.getBaseFileName(filePath) : ts.removeFileExtension(ts.getBaseFileName(filePath));
+                        foundFiles.set(foundFileName, ts.tryGetExtensionFromPath(filePath));
+                    }
+                    foundFiles.forEach(function (ext, foundFile) {
+                        result.push(nameAndKind(foundFile, "script" /* scriptElement */, ext));
+                    });
+                }
+                // If possible, get folder completion as well
+                var directories = tryGetDirectories(host, baseDirectory);
+                if (directories) {
+                    for (var _b = 0, directories_1 = directories; _b < directories_1.length; _b++) {
+                        var directory = directories_1[_b];
+                        var directoryName = ts.getBaseFileName(ts.normalizePath(directory));
+                        if (directoryName !== "@types") {
+                            result.push(directoryResult(directoryName));
+                        }
+                    }
+                }
+                // check for a version redirect
+                var packageJsonPath = findPackageJson(baseDirectory, host);
+                if (packageJsonPath) {
+                    var packageJson = ts.readJson(packageJsonPath, host);
+                    var typesVersions = packageJson.typesVersions;
+                    if (typeof typesVersions === "object") {
+                        var versionResult = ts.getPackageJsonTypesVersionsPaths(typesVersions);
+                        var versionPaths = versionResult && versionResult.paths;
+                        var rest = absolutePath.slice(ts.ensureTrailingDirectorySeparator(baseDirectory).length);
+                        if (versionPaths) {
+                            addCompletionEntriesFromPaths(result, rest, baseDirectory, extensions, versionPaths, host);
+                        }
+                    }
+                }
+                return result;
+            }
+            function addCompletionEntriesFromPaths(result, fragment, baseDirectory, fileExtensions, paths, host) {
+                for (var path in paths) {
+                    if (!ts.hasProperty(paths, path))
+                        continue;
+                    var patterns = paths[path];
+                    if (patterns) {
+                        var _loop_11 = function (name, kind, extension) {
+                            // Path mappings may provide a duplicate way to get to something we've already added, so don't add again.
+                            if (!result.some(function (entry) { return entry.name === name; })) {
+                                result.push(nameAndKind(name, kind, extension));
+                            }
+                        };
+                        for (var _i = 0, _a = getCompletionsForPathMapping(path, patterns, fragment, baseDirectory, fileExtensions, host); _i < _a.length; _i++) {
+                            var _b = _a[_i], name = _b.name, kind = _b.kind, extension = _b.extension;
+                            _loop_11(name, kind, extension);
+                        }
+                    }
+                }
+            }
+            /**
+             * Check all of the declared modules and those in node modules. Possible sources of modules:
+             *      Modules that are found by the type checker
+             *      Modules found relative to "baseUrl" compliler options (including patterns from "paths" compiler option)
+             *      Modules from node_modules (i.e. those listed in package.json)
+             *          This includes all files that are found in node_modules/moduleName/ with acceptable file extensions
+             */
+            function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, compilerOptions, host, typeChecker) {
+                var baseUrl = compilerOptions.baseUrl, paths = compilerOptions.paths;
+                var result = [];
+                var extensionOptions = getExtensionOptions(compilerOptions);
+                if (baseUrl) {
+                    var projectDir = compilerOptions.project || host.getCurrentDirectory();
+                    var absolute = ts.normalizePath(ts.combinePaths(projectDir, baseUrl));
+                    getCompletionEntriesForDirectoryFragment(fragment, absolute, extensionOptions, host, /*exclude*/ undefined, result);
+                    if (paths) {
+                        addCompletionEntriesFromPaths(result, fragment, absolute, extensionOptions.extensions, paths, host);
+                    }
+                }
+                var fragmentDirectory = getFragmentDirectory(fragment);
+                for (var _i = 0, _a = getAmbientModuleCompletions(fragment, fragmentDirectory, typeChecker); _i < _a.length; _i++) {
+                    var ambientName = _a[_i];
+                    result.push(nameAndKind(ambientName, "external module name" /* externalModuleName */, /*extension*/ undefined));
+                }
+                getCompletionEntriesFromTypings(host, compilerOptions, scriptPath, fragmentDirectory, extensionOptions, result);
+                if (ts.getEmitModuleResolutionKind(compilerOptions) === ts.ModuleResolutionKind.NodeJs) {
+                    // If looking for a global package name, don't just include everything in `node_modules` because that includes dependencies' own dependencies.
+                    // (But do if we didn't find anything, e.g. 'package.json' missing.)
+                    var foundGlobal = false;
+                    if (fragmentDirectory === undefined) {
+                        var _loop_12 = function (moduleName) {
+                            if (!result.some(function (entry) { return entry.name === moduleName; })) {
+                                foundGlobal = true;
+                                result.push(nameAndKind(moduleName, "external module name" /* externalModuleName */, /*extension*/ undefined));
+                            }
+                        };
+                        for (var _b = 0, _c = enumerateNodeModulesVisibleToScript(host, scriptPath); _b < _c.length; _b++) {
+                            var moduleName = _c[_b];
+                            _loop_12(moduleName);
+                        }
+                    }
+                    if (!foundGlobal) {
+                        ts.forEachAncestorDirectory(scriptPath, function (ancestor) {
+                            var nodeModules = ts.combinePaths(ancestor, "node_modules");
+                            if (tryDirectoryExists(host, nodeModules)) {
+                                getCompletionEntriesForDirectoryFragment(fragment, nodeModules, extensionOptions, host, /*exclude*/ undefined, result);
+                            }
+                        });
+                    }
+                }
+                return result;
+            }
+            function getFragmentDirectory(fragment) {
+                return containsSlash(fragment) ? ts.hasTrailingDirectorySeparator(fragment) ? fragment : ts.getDirectoryPath(fragment) : undefined;
+            }
+            function getCompletionsForPathMapping(path, patterns, fragment, baseUrl, fileExtensions, host) {
+                if (!ts.endsWith(path, "*")) {
+                    // For a path mapping "foo": ["/x/y/z.ts"], add "foo" itself as a completion.
+                    return !ts.stringContains(path, "*") ? justPathMappingName(path) : ts.emptyArray;
+                }
+                var pathPrefix = path.slice(0, path.length - 1);
+                var remainingFragment = ts.tryRemovePrefix(fragment, pathPrefix);
+                return remainingFragment === undefined ? justPathMappingName(pathPrefix) : ts.flatMap(patterns, function (pattern) {
+                    return getModulesForPathsPattern(remainingFragment, baseUrl, pattern, fileExtensions, host);
+                });
+                function justPathMappingName(name) {
+                    return ts.startsWith(name, fragment) ? [directoryResult(name)] : ts.emptyArray;
+                }
+            }
+            function getModulesForPathsPattern(fragment, baseUrl, pattern, fileExtensions, host) {
+                if (!host.readDirectory) {
+                    return undefined;
+                }
+                var parsed = ts.hasZeroOrOneAsteriskCharacter(pattern) ? ts.tryParsePattern(pattern) : undefined;
+                if (!parsed) {
+                    return undefined;
+                }
+                // The prefix has two effective parts: the directory path and the base component after the filepath that is not a
+                // full directory component. For example: directory/path/of/prefix/base*
+                var normalizedPrefix = ts.resolvePath(parsed.prefix);
+                var normalizedPrefixDirectory = ts.hasTrailingDirectorySeparator(parsed.prefix) ? normalizedPrefix : ts.getDirectoryPath(normalizedPrefix);
+                var normalizedPrefixBase = ts.hasTrailingDirectorySeparator(parsed.prefix) ? "" : ts.getBaseFileName(normalizedPrefix);
+                var fragmentHasPath = containsSlash(fragment);
+                var fragmentDirectory = fragmentHasPath ? ts.hasTrailingDirectorySeparator(fragment) ? fragment : ts.getDirectoryPath(fragment) : undefined;
+                // Try and expand the prefix to include any path from the fragment so that we can limit the readDirectory call
+                var expandedPrefixDirectory = fragmentHasPath ? ts.combinePaths(normalizedPrefixDirectory, normalizedPrefixBase + fragmentDirectory) : normalizedPrefixDirectory;
+                var normalizedSuffix = ts.normalizePath(parsed.suffix);
+                // Need to normalize after combining: If we combinePaths("a", "../b"), we want "b" and not "a/../b".
+                var baseDirectory = ts.normalizePath(ts.combinePaths(baseUrl, expandedPrefixDirectory));
+                var completePrefix = fragmentHasPath ? baseDirectory : ts.ensureTrailingDirectorySeparator(baseDirectory) + normalizedPrefixBase;
+                // If we have a suffix, then we need to read the directory all the way down. We could create a glob
+                // that encodes the suffix, but we would have to escape the character "?" which readDirectory
+                // doesn't support. For now, this is safer but slower
+                var includeGlob = normalizedSuffix ? "**/*" : "./*";
+                var matches = ts.mapDefined(tryReadDirectory(host, baseDirectory, fileExtensions, /*exclude*/ undefined, [includeGlob]), function (match) {
+                    var extension = ts.tryGetExtensionFromPath(match);
+                    var name = trimPrefixAndSuffix(match);
+                    return name === undefined ? undefined : nameAndKind(ts.removeFileExtension(name), "script" /* scriptElement */, extension);
+                });
+                var directories = ts.mapDefined(tryGetDirectories(host, baseDirectory).map(function (d) { return ts.combinePaths(baseDirectory, d); }), function (dir) {
+                    var name = trimPrefixAndSuffix(dir);
+                    return name === undefined ? undefined : directoryResult(name);
+                });
+                return matches.concat(directories);
+                function trimPrefixAndSuffix(path) {
+                    var inner = withoutStartAndEnd(ts.normalizePath(path), completePrefix, normalizedSuffix);
+                    return inner === undefined ? undefined : removeLeadingDirectorySeparator(inner);
+                }
+            }
+            function withoutStartAndEnd(s, start, end) {
+                return ts.startsWith(s, start) && ts.endsWith(s, end) ? s.slice(start.length, s.length - end.length) : undefined;
+            }
+            function removeLeadingDirectorySeparator(path) {
+                return path[0] === ts.directorySeparator ? path.slice(1) : path;
+            }
+            function getAmbientModuleCompletions(fragment, fragmentDirectory, checker) {
+                // Get modules that the type checker picked up
+                var ambientModules = checker.getAmbientModules().map(function (sym) { return ts.stripQuotes(sym.name); });
+                var nonRelativeModuleNames = ambientModules.filter(function (moduleName) { return ts.startsWith(moduleName, fragment); });
+                // Nested modules of the form "module-name/sub" need to be adjusted to only return the string
+                // after the last '/' that appears in the fragment because that's where the replacement span
+                // starts
+                if (fragmentDirectory !== undefined) {
+                    var moduleNameWithSeparator_1 = ts.ensureTrailingDirectorySeparator(fragmentDirectory);
+                    return nonRelativeModuleNames.map(function (nonRelativeModuleName) { return ts.removePrefix(nonRelativeModuleName, moduleNameWithSeparator_1); });
+                }
+                return nonRelativeModuleNames;
+            }
+            function getTripleSlashReferenceCompletion(sourceFile, position, compilerOptions, host) {
+                var token = ts.getTokenAtPosition(sourceFile, position);
+                var commentRanges = ts.getLeadingCommentRanges(sourceFile.text, token.pos);
+                var range = commentRanges && ts.find(commentRanges, function (commentRange) { return position >= commentRange.pos && position <= commentRange.end; });
+                if (!range) {
+                    return undefined;
+                }
+                var text = sourceFile.text.slice(range.pos, position);
+                var match = tripleSlashDirectiveFragmentRegex.exec(text);
+                if (!match) {
+                    return undefined;
+                }
+                var prefix = match[1], kind = match[2], toComplete = match[3];
+                var scriptPath = ts.getDirectoryPath(sourceFile.path);
+                var names = kind === "path" ? getCompletionEntriesForDirectoryFragment(toComplete, scriptPath, getExtensionOptions(compilerOptions, /*includeExtensions*/ true), host, sourceFile.path)
+                    : kind === "types" ? getCompletionEntriesFromTypings(host, compilerOptions, scriptPath, getFragmentDirectory(toComplete), getExtensionOptions(compilerOptions))
+                        : ts.Debug.fail();
+                return addReplacementSpans(toComplete, range.pos + prefix.length, names);
+            }
+            function getCompletionEntriesFromTypings(host, options, scriptPath, fragmentDirectory, extensionOptions, result) {
+                if (result === void 0) { result = []; }
+                // Check for typings specified in compiler options
+                var seen = ts.createMap();
+                var typeRoots = tryAndIgnoreErrors(function () { return ts.getEffectiveTypeRoots(options, host); }) || ts.emptyArray;
+                for (var _i = 0, typeRoots_2 = typeRoots; _i < typeRoots_2.length; _i++) {
+                    var root = typeRoots_2[_i];
+                    getCompletionEntriesFromDirectories(root);
+                }
+                // Also get all @types typings installed in visible node_modules directories
+                for (var _a = 0, _b = findPackageJsons(scriptPath, host); _a < _b.length; _a++) {
+                    var packageJson = _b[_a];
+                    var typesDir = ts.combinePaths(ts.getDirectoryPath(packageJson), "node_modules/@types");
+                    getCompletionEntriesFromDirectories(typesDir);
+                }
+                return result;
+                function getCompletionEntriesFromDirectories(directory) {
+                    if (!tryDirectoryExists(host, directory))
+                        return;
+                    for (var _i = 0, _a = tryGetDirectories(host, directory); _i < _a.length; _i++) {
+                        var typeDirectoryName = _a[_i];
+                        var packageName = ts.unmangleScopedPackageName(typeDirectoryName);
+                        if (options.types && !ts.contains(options.types, packageName))
+                            continue;
+                        if (fragmentDirectory === undefined) {
+                            if (!seen.has(packageName)) {
+                                result.push(nameAndKind(packageName, "external module name" /* externalModuleName */, /*extension*/ undefined));
+                                seen.set(packageName, true);
+                            }
+                        }
+                        else {
+                            var baseDirectory = ts.combinePaths(directory, typeDirectoryName);
+                            var remainingFragment = ts.tryRemoveDirectoryPrefix(fragmentDirectory, packageName, ts.hostGetCanonicalFileName(host));
+                            if (remainingFragment !== undefined) {
+                                getCompletionEntriesForDirectoryFragment(remainingFragment, baseDirectory, extensionOptions, host, /*exclude*/ undefined, result);
+                            }
+                        }
+                    }
+                }
+            }
+            function findPackageJsons(directory, host) {
+                var paths = [];
+                ts.forEachAncestorDirectory(directory, function (ancestor) {
+                    var currentConfigPath = ts.findConfigFile(ancestor, function (f) { return tryFileExists(host, f); }, "package.json");
+                    if (!currentConfigPath) {
+                        return true; // break out
+                    }
+                    paths.push(currentConfigPath);
+                });
+                return paths;
+            }
+            function findPackageJson(directory, host) {
+                var packageJson;
+                ts.forEachAncestorDirectory(directory, function (ancestor) {
+                    if (ancestor === "node_modules")
+                        return true;
+                    packageJson = ts.findConfigFile(ancestor, function (f) { return tryFileExists(host, f); }, "package.json");
+                    if (packageJson) {
+                        return true; // break out
+                    }
+                });
+                return packageJson;
+            }
+            function enumerateNodeModulesVisibleToScript(host, scriptPath) {
+                if (!host.readFile || !host.fileExists)
+                    return ts.emptyArray;
+                var result = [];
+                for (var _i = 0, _a = findPackageJsons(scriptPath, host); _i < _a.length; _i++) {
+                    var packageJson = _a[_i];
+                    var contents = ts.readJson(packageJson, host); // Cast to assert that readFile is defined
+                    // Provide completions for all non @types dependencies
+                    for (var _b = 0, nodeModulesDependencyKeys_1 = nodeModulesDependencyKeys; _b < nodeModulesDependencyKeys_1.length; _b++) {
+                        var key = nodeModulesDependencyKeys_1[_b];
+                        var dependencies = contents[key];
+                        if (!dependencies)
+                            continue;
+                        for (var dep in dependencies) {
+                            if (dependencies.hasOwnProperty(dep) && !ts.startsWith(dep, "@types/")) {
+                                result.push(dep);
+                            }
+                        }
+                    }
+                }
+                return result;
+            }
+            // Replace everything after the last directory separator that appears
+            function getDirectoryFragmentTextSpan(text, textStart) {
+                var index = Math.max(text.lastIndexOf(ts.directorySeparator), text.lastIndexOf("\\"));
+                var offset = index !== -1 ? index + 1 : 0;
+                // If the range is an identifier, span is unnecessary.
+                var length = text.length - offset;
+                return length === 0 || ts.isIdentifierText(text.substr(offset, length), 6 /* ESNext */) ? undefined : ts.createTextSpan(textStart + offset, length);
+            }
+            // Returns true if the path is explicitly relative to the script (i.e. relative to . or ..)
+            function isPathRelativeToScript(path) {
+                if (path && path.length >= 2 && path.charCodeAt(0) === 46 /* dot */) {
+                    var slashIndex = path.length >= 3 && path.charCodeAt(1) === 46 /* dot */ ? 2 : 1;
+                    var slashCharCode = path.charCodeAt(slashIndex);
+                    return slashCharCode === 47 /* slash */ || slashCharCode === 92 /* backslash */;
+                }
+                return false;
+            }
+            /**
+             * Matches a triple slash reference directive with an incomplete string literal for its path. Used
+             * to determine if the caret is currently within the string literal and capture the literal fragment
+             * for completions.
+             * For example, this matches
+             *
+             * /// <reference path="fragment
+             *
+             * but not
+             *
+             * /// <reference path="fragment"
+             */
+            var tripleSlashDirectiveFragmentRegex = /^(\/\/\/\s*<reference\s+(path|types)\s*=\s*(?:'|"))([^\3"]*)$/;
+            var nodeModulesDependencyKeys = ["dependencies", "devDependencies", "peerDependencies", "optionalDependencies"];
+            function tryGetDirectories(host, directoryName) {
+                return tryIOAndConsumeErrors(host, host.getDirectories, directoryName) || [];
+            }
+            function tryReadDirectory(host, path, extensions, exclude, include) {
+                return tryIOAndConsumeErrors(host, host.readDirectory, path, extensions, exclude, include) || ts.emptyArray;
+            }
+            function tryFileExists(host, path) {
+                return tryIOAndConsumeErrors(host, host.fileExists, path);
+            }
+            function tryDirectoryExists(host, path) {
+                return tryAndIgnoreErrors(function () { return ts.directoryProbablyExists(path, host); }) || false;
+            }
+            function tryIOAndConsumeErrors(host, toApply) {
+                var args = [];
+                for (var _i = 2; _i < arguments.length; _i++) {
+                    args[_i - 2] = arguments[_i];
+                }
+                return tryAndIgnoreErrors(function () { return toApply && toApply.apply(host, args); });
+            }
+            function tryAndIgnoreErrors(cb) {
+                try {
+                    return cb();
+                }
+                catch (_a) {
+                    return undefined;
+                }
+            }
+            function containsSlash(fragment) {
+                return ts.stringContains(fragment, ts.directorySeparator);
+            }
+        })(StringCompletions = Completions.StringCompletions || (Completions.StringCompletions = {}));
+    })(Completions = ts.Completions || (ts.Completions = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var Completions;
+    (function (Completions) {
+        var SymbolOriginInfoKind;
+        (function (SymbolOriginInfoKind) {
+            SymbolOriginInfoKind[SymbolOriginInfoKind["ThisType"] = 0] = "ThisType";
+            SymbolOriginInfoKind[SymbolOriginInfoKind["SymbolMemberNoExport"] = 1] = "SymbolMemberNoExport";
+            SymbolOriginInfoKind[SymbolOriginInfoKind["SymbolMemberExport"] = 2] = "SymbolMemberExport";
+            SymbolOriginInfoKind[SymbolOriginInfoKind["Export"] = 3] = "Export";
+        })(SymbolOriginInfoKind || (SymbolOriginInfoKind = {}));
+        function originIsSymbolMember(origin) {
+            return origin.kind === 2 /* SymbolMemberExport */ || origin.kind === 1 /* SymbolMemberNoExport */;
+        }
+        function originIsExport(origin) {
+            return origin.kind === 2 /* SymbolMemberExport */ || origin.kind === 3 /* Export */;
+        }
+        var KeywordCompletionFilters;
+        (function (KeywordCompletionFilters) {
+            KeywordCompletionFilters[KeywordCompletionFilters["None"] = 0] = "None";
+            KeywordCompletionFilters[KeywordCompletionFilters["All"] = 1] = "All";
+            KeywordCompletionFilters[KeywordCompletionFilters["ClassElementKeywords"] = 2] = "ClassElementKeywords";
+            KeywordCompletionFilters[KeywordCompletionFilters["InterfaceElementKeywords"] = 3] = "InterfaceElementKeywords";
+            KeywordCompletionFilters[KeywordCompletionFilters["ConstructorParameterKeywords"] = 4] = "ConstructorParameterKeywords";
+            KeywordCompletionFilters[KeywordCompletionFilters["FunctionLikeBodyKeywords"] = 5] = "FunctionLikeBodyKeywords";
+            KeywordCompletionFilters[KeywordCompletionFilters["TypeKeywords"] = 6] = "TypeKeywords";
+        })(KeywordCompletionFilters || (KeywordCompletionFilters = {}));
+        var GlobalsSearch;
+        (function (GlobalsSearch) {
+            GlobalsSearch[GlobalsSearch["Continue"] = 0] = "Continue";
+            GlobalsSearch[GlobalsSearch["Success"] = 1] = "Success";
+            GlobalsSearch[GlobalsSearch["Fail"] = 2] = "Fail";
+        })(GlobalsSearch || (GlobalsSearch = {}));
+        function getCompletionsAtPosition(host, program, log, sourceFile, position, preferences, triggerCharacter) {
+            var typeChecker = program.getTypeChecker();
+            var compilerOptions = program.getCompilerOptions();
+            var contextToken = ts.findPrecedingToken(position, sourceFile);
+            if (triggerCharacter && !isValidTrigger(sourceFile, triggerCharacter, contextToken, position))
+                return undefined;
+            var stringCompletions = Completions.StringCompletions.getStringLiteralCompletions(sourceFile, position, contextToken, typeChecker, compilerOptions, host, log, preferences);
+            if (stringCompletions) {
+                return stringCompletions;
+            }
+            if (contextToken && ts.isBreakOrContinueStatement(contextToken.parent)
+                && (contextToken.kind === 73 /* BreakKeyword */ || contextToken.kind === 78 /* ContinueKeyword */ || contextToken.kind === 72 /* Identifier */)) {
+                return getLabelCompletionAtPosition(contextToken.parent);
+            }
+            var completionData = getCompletionData(program, log, sourceFile, isUncheckedFile(sourceFile, compilerOptions), position, preferences, /*detailsEntryId*/ undefined);
+            if (!completionData) {
+                return undefined;
+            }
+            switch (completionData.kind) {
+                case 0 /* Data */:
+                    return completionInfoFromData(sourceFile, typeChecker, compilerOptions, log, completionData, preferences);
+                case 1 /* JsDocTagName */:
+                    // If the current position is a jsDoc tag name, only tag names should be provided for completion
+                    return jsdocCompletionInfo(ts.JsDoc.getJSDocTagNameCompletions());
+                case 2 /* JsDocTag */:
+                    // If the current position is a jsDoc tag, only tags should be provided for completion
+                    return jsdocCompletionInfo(ts.JsDoc.getJSDocTagCompletions());
+                case 3 /* JsDocParameterName */:
+                    return jsdocCompletionInfo(ts.JsDoc.getJSDocParameterNameCompletions(completionData.tag));
+                default:
+                    return ts.Debug.assertNever(completionData);
+            }
+        }
+        Completions.getCompletionsAtPosition = getCompletionsAtPosition;
+        function jsdocCompletionInfo(entries) {
+            return { isGlobalCompletion: false, isMemberCompletion: false, isNewIdentifierLocation: false, entries: entries };
+        }
+        function completionInfoFromData(sourceFile, typeChecker, compilerOptions, log, completionData, preferences) {
+            var symbols = completionData.symbols, completionKind = completionData.completionKind, isInSnippetScope = completionData.isInSnippetScope, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, propertyAccessToConvert = completionData.propertyAccessToConvert, keywordFilters = completionData.keywordFilters, literals = completionData.literals, symbolToOriginInfoMap = completionData.symbolToOriginInfoMap, recommendedCompletion = completionData.recommendedCompletion, isJsxInitializer = completionData.isJsxInitializer;
+            if (location && location.parent && ts.isJsxClosingElement(location.parent)) {
+                // In the TypeScript JSX element, if such element is not defined. When users query for completion at closing tag,
+                // instead of simply giving unknown value, the completion will return the tag-name of an associated opening-element.
+                // For example:
+                //     var x = <div> </ /*1*/
+                // The completion list at "1" will contain "div>" with type any
+                // And at `<div> </ /*1*/ >` (with a closing `>`), the completion list will contain "div".
+                var tagName = location.parent.parent.openingElement.tagName;
+                var hasClosingAngleBracket = !!ts.findChildOfKind(location.parent, 30 /* GreaterThanToken */, sourceFile);
+                var entry = {
+                    name: tagName.getFullText(sourceFile) + (hasClosingAngleBracket ? "" : ">"),
+                    kind: "class" /* classElement */,
+                    kindModifiers: undefined,
+                    sortText: "0",
+                };
+                return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: false, entries: [entry] };
+            }
+            var entries = [];
+            if (isUncheckedFile(sourceFile, compilerOptions)) {
+                var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap);
+                getJSCompletionEntries(sourceFile, location.pos, uniqueNames, compilerOptions.target, entries); // TODO: GH#18217
+            }
+            else {
+                if (!isNewIdentifierLocation && (!symbols || symbols.length === 0) && keywordFilters === 0 /* None */) {
+                    return undefined;
+                }
+                getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap);
+            }
+            if (keywordFilters !== 0 /* None */) {
+                var entryNames = ts.arrayToSet(entries, function (e) { return e.name; });
+                for (var _i = 0, _a = getKeywordCompletions(keywordFilters); _i < _a.length; _i++) {
+                    var keywordEntry = _a[_i];
+                    if (!entryNames.has(keywordEntry.name)) {
+                        entries.push(keywordEntry);
+                    }
+                }
+            }
+            for (var _b = 0, literals_1 = literals; _b < literals_1.length; _b++) {
+                var literal = literals_1[_b];
+                entries.push(createCompletionEntryForLiteral(literal));
+            }
+            return { isGlobalCompletion: isInSnippetScope, isMemberCompletion: isMemberCompletionKind(completionKind), isNewIdentifierLocation: isNewIdentifierLocation, entries: entries };
+        }
+        function isUncheckedFile(sourceFile, compilerOptions) {
+            return ts.isSourceFileJS(sourceFile) && !ts.isCheckJsEnabledForFile(sourceFile, compilerOptions);
+        }
+        function isMemberCompletionKind(kind) {
+            switch (kind) {
+                case 0 /* ObjectPropertyDeclaration */:
+                case 3 /* MemberLike */:
+                case 2 /* PropertyAccess */:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+        function getJSCompletionEntries(sourceFile, position, uniqueNames, target, entries) {
+            ts.getNameTable(sourceFile).forEach(function (pos, name) {
+                // Skip identifiers produced only from the current location
+                if (pos === position) {
+                    return;
+                }
+                var realName = ts.unescapeLeadingUnderscores(name);
+                if (ts.addToSeen(uniqueNames, realName) && ts.isIdentifierText(realName, target)) {
+                    entries.push({
+                        name: realName,
+                        kind: "warning" /* warning */,
+                        kindModifiers: "",
+                        sortText: "1"
+                    });
+                }
+            });
+        }
+        var completionNameForLiteral = function (literal) {
+            return typeof literal === "object" ? ts.pseudoBigIntToString(literal) + "n" : JSON.stringify(literal);
+        };
+        function createCompletionEntryForLiteral(literal) {
+            return { name: completionNameForLiteral(literal), kind: "string" /* string */, kindModifiers: "" /* none */, sortText: "0" };
+        }
+        function createCompletionEntry(symbol, location, sourceFile, typeChecker, target, kind, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences) {
+            var info = getCompletionEntryDisplayNameForSymbol(symbol, target, origin, kind);
+            if (!info) {
+                return undefined;
+            }
+            var name = info.name, needsConvertPropertyAccess = info.needsConvertPropertyAccess;
+            var insertText;
+            var replacementSpan;
+            if (origin && origin.kind === 0 /* ThisType */) {
+                insertText = needsConvertPropertyAccess ? "this[" + ts.quote(name, preferences) + "]" : "this." + name;
+            }
+            // We should only have needsConvertPropertyAccess if there's a property access to convert. But see #21790.
+            // Somehow there was a global with a non-identifier name. Hopefully someone will complain about getting a "foo bar" global completion and provide a repro.
+            else if ((origin && originIsSymbolMember(origin) || needsConvertPropertyAccess) && propertyAccessToConvert) {
+                insertText = needsConvertPropertyAccess ? "[" + ts.quote(name, preferences) + "]" : "[" + name + "]";
+                var dot = ts.findChildOfKind(propertyAccessToConvert, 24 /* DotToken */, sourceFile);
+                // If the text after the '.' starts with this name, write over it. Else, add new text.
+                var end = ts.startsWith(name, propertyAccessToConvert.name.text) ? propertyAccessToConvert.name.end : dot.end;
+                replacementSpan = ts.createTextSpanFromBounds(dot.getStart(sourceFile), end);
+            }
+            if (isJsxInitializer) {
+                if (insertText === undefined)
+                    insertText = name;
+                insertText = "{" + insertText + "}";
+                if (typeof isJsxInitializer !== "boolean") {
+                    replacementSpan = ts.createTextSpanFromNode(isJsxInitializer, sourceFile);
+                }
+            }
+            if (insertText !== undefined && !preferences.includeCompletionsWithInsertText) {
+                return undefined;
+            }
+            // TODO(drosen): Right now we just permit *all* semantic meanings when calling
+            // 'getSymbolKind' which is permissible given that it is backwards compatible; but
+            // really we should consider passing the meaning for the node so that we don't report
+            // that a suggestion for a value is an interface.  We COULD also just do what
+            // 'getSymbolModifiers' does, which is to use the first declaration.
+            // Use a 'sortText' of 0' so that all symbol completion entries come before any other
+            // entries (like JavaScript identifier entries).
+            return {
+                name: name,
+                kind: ts.SymbolDisplay.getSymbolKind(typeChecker, symbol, location),
+                kindModifiers: ts.SymbolDisplay.getSymbolModifiers(symbol),
+                sortText: "0",
+                source: getSourceFromOrigin(origin),
+                hasAction: trueOrUndefined(!!origin && originIsExport(origin)),
+                isRecommended: trueOrUndefined(isRecommendedCompletionMatch(symbol, recommendedCompletion, typeChecker)),
+                insertText: insertText,
+                replacementSpan: replacementSpan,
+            };
+        }
+        function isRecommendedCompletionMatch(localSymbol, recommendedCompletion, checker) {
+            return localSymbol === recommendedCompletion ||
+                !!(localSymbol.flags & 1048576 /* ExportValue */) && checker.getExportSymbolOfSymbol(localSymbol) === recommendedCompletion;
+        }
+        function trueOrUndefined(b) {
+            return b ? true : undefined;
+        }
+        function getSourceFromOrigin(origin) {
+            return origin && originIsExport(origin) ? ts.stripQuotes(origin.moduleSymbol.name) : undefined;
+        }
+        function getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, target, log, kind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap) {
+            var start = ts.timestamp();
+            // Tracks unique names.
+            // We don't set this for global variables or completions from external module exports, because we can have multiple of those.
+            // Based on the order we add things we will always see locals first, then globals, then module exports.
+            // So adding a completion for a local will prevent us from adding completions for external module exports sharing the same name.
+            var uniques = ts.createMap();
+            for (var _i = 0, symbols_3 = symbols; _i < symbols_3.length; _i++) {
+                var symbol = symbols_3[_i];
+                var origin = symbolToOriginInfoMap ? symbolToOriginInfoMap[ts.getSymbolId(symbol)] : undefined;
+                var entry = createCompletionEntry(symbol, location, sourceFile, typeChecker, target, kind, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences);
+                if (!entry) {
+                    continue;
+                }
+                var name = entry.name;
+                if (uniques.has(name)) {
+                    continue;
+                }
+                // Latter case tests whether this is a global variable.
+                if (!origin && !(symbol.parent === undefined && !ts.some(symbol.declarations, function (d) { return d.getSourceFile() === location.getSourceFile(); }))) { // TODO: GH#18217
+                    uniques.set(name, true);
+                }
+                entries.push(entry);
+            }
+            log("getCompletionsAtPosition: getCompletionEntriesFromSymbols: " + (ts.timestamp() - start));
+            return uniques;
+        }
+        Completions.getCompletionEntriesFromSymbols = getCompletionEntriesFromSymbols;
+        function getLabelCompletionAtPosition(node) {
+            var entries = getLabelStatementCompletions(node);
+            if (entries.length) {
+                return { isGlobalCompletion: false, isMemberCompletion: false, isNewIdentifierLocation: false, entries: entries };
+            }
+        }
+        function getLabelStatementCompletions(node) {
+            var entries = [];
+            var uniques = ts.createMap();
+            var current = node;
+            while (current) {
+                if (ts.isFunctionLike(current)) {
+                    break;
+                }
+                if (ts.isLabeledStatement(current)) {
+                    var name = current.label.text;
+                    if (!uniques.has(name)) {
+                        uniques.set(name, true);
+                        entries.push({
+                            name: name,
+                            kindModifiers: "" /* none */,
+                            kind: "label" /* label */,
+                            sortText: "0"
+                        });
+                    }
+                }
+                current = current.parent;
+            }
+            return entries;
+        }
+        function getSymbolCompletionFromEntryId(program, log, sourceFile, position, entryId) {
+            var compilerOptions = program.getCompilerOptions();
+            var completionData = getCompletionData(program, log, sourceFile, isUncheckedFile(sourceFile, compilerOptions), position, { includeCompletionsForModuleExports: true, includeCompletionsWithInsertText: true }, entryId);
+            if (!completionData) {
+                return { type: "none" };
+            }
+            if (completionData.kind !== 0 /* Data */) {
+                return { type: "request", request: completionData };
+            }
+            var symbols = completionData.symbols, literals = completionData.literals, location = completionData.location, completionKind = completionData.completionKind, symbolToOriginInfoMap = completionData.symbolToOriginInfoMap, previousToken = completionData.previousToken, isJsxInitializer = completionData.isJsxInitializer;
+            var literal = ts.find(literals, function (l) { return completionNameForLiteral(l) === entryId.name; });
+            if (literal !== undefined)
+                return { type: "literal", literal: literal };
+            // Find the symbol with the matching entry name.
+            // We don't need to perform character checks here because we're only comparing the
+            // name against 'entryName' (which is known to be good), not building a new
+            // completion entry.
+            return ts.firstDefined(symbols, function (symbol) {
+                var origin = symbolToOriginInfoMap[ts.getSymbolId(symbol)];
+                var info = getCompletionEntryDisplayNameForSymbol(symbol, compilerOptions.target, origin, completionKind);
+                return info && info.name === entryId.name && getSourceFromOrigin(origin) === entryId.source
+                    ? { type: "symbol", symbol: symbol, location: location, symbolToOriginInfoMap: symbolToOriginInfoMap, previousToken: previousToken, isJsxInitializer: isJsxInitializer }
+                    : undefined;
+            }) || { type: "none" };
+        }
+        function getSymbolName(symbol, origin, target) {
+            return origin && originIsExport(origin) && ((origin.isDefaultExport && symbol.escapedName === "default" /* Default */) ||
+                (symbol.escapedName === "export=" /* ExportEquals */))
+                // Name of "export default foo;" is "foo". Name of "export default 0" is the filename converted to camelCase.
+                ? ts.firstDefined(symbol.declarations, function (d) { return ts.isExportAssignment(d) && ts.isIdentifier(d.expression) ? d.expression.text : undefined; })
+                    || ts.codefix.moduleSymbolToValidIdentifier(origin.moduleSymbol, target)
+                : symbol.name;
+        }
+        function getCompletionEntryDetails(program, log, sourceFile, position, entryId, host, formatContext, preferences, cancellationToken) {
+            var typeChecker = program.getTypeChecker();
+            var compilerOptions = program.getCompilerOptions();
+            var name = entryId.name;
+            var contextToken = ts.findPrecedingToken(position, sourceFile);
+            if (ts.isInString(sourceFile, position, contextToken)) {
+                return Completions.StringCompletions.getStringLiteralCompletionDetails(name, sourceFile, position, contextToken, typeChecker, compilerOptions, host, cancellationToken);
+            }
+            // Compute all the completion symbols again.
+            var symbolCompletion = getSymbolCompletionFromEntryId(program, log, sourceFile, position, entryId);
+            switch (symbolCompletion.type) {
+                case "request": {
+                    var request = symbolCompletion.request;
+                    switch (request.kind) {
+                        case 1 /* JsDocTagName */:
+                            return ts.JsDoc.getJSDocTagNameCompletionDetails(name);
+                        case 2 /* JsDocTag */:
+                            return ts.JsDoc.getJSDocTagCompletionDetails(name);
+                        case 3 /* JsDocParameterName */:
+                            return ts.JsDoc.getJSDocParameterNameCompletionDetails(name);
+                        default:
+                            return ts.Debug.assertNever(request);
+                    }
+                }
+                case "symbol": {
+                    var symbol = symbolCompletion.symbol, location = symbolCompletion.location, symbolToOriginInfoMap = symbolCompletion.symbolToOriginInfoMap, previousToken = symbolCompletion.previousToken;
+                    var _a = getCompletionEntryCodeActionsAndSourceDisplay(symbolToOriginInfoMap, symbol, program, typeChecker, host, compilerOptions, sourceFile, position, previousToken, formatContext, preferences), codeActions = _a.codeActions, sourceDisplay = _a.sourceDisplay;
+                    return createCompletionDetailsForSymbol(symbol, typeChecker, sourceFile, location, cancellationToken, codeActions, sourceDisplay); // TODO: GH#18217
+                }
+                case "literal": {
+                    var literal = symbolCompletion.literal;
+                    return createSimpleDetails(completionNameForLiteral(literal), "string" /* string */, typeof literal === "string" ? ts.SymbolDisplayPartKind.stringLiteral : ts.SymbolDisplayPartKind.numericLiteral);
+                }
+                case "none":
+                    // Didn't find a symbol with this name.  See if we can find a keyword instead.
+                    return allKeywordsCompletions().some(function (c) { return c.name === name; }) ? createSimpleDetails(name, "keyword" /* keyword */, ts.SymbolDisplayPartKind.keyword) : undefined;
+                default:
+                    ts.Debug.assertNever(symbolCompletion);
+            }
+        }
+        Completions.getCompletionEntryDetails = getCompletionEntryDetails;
+        function createSimpleDetails(name, kind, kind2) {
+            return createCompletionDetails(name, "" /* none */, kind, [ts.displayPart(name, kind2)]);
+        }
+        function createCompletionDetailsForSymbol(symbol, checker, sourceFile, location, cancellationToken, codeActions, sourceDisplay) {
+            var _a = checker.runWithCancellationToken(cancellationToken, function (checker) {
+                return ts.SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(checker, symbol, sourceFile, location, location, 7 /* All */);
+            }), displayParts = _a.displayParts, documentation = _a.documentation, symbolKind = _a.symbolKind, tags = _a.tags;
+            return createCompletionDetails(symbol.name, ts.SymbolDisplay.getSymbolModifiers(symbol), symbolKind, displayParts, documentation, tags, codeActions, sourceDisplay);
+        }
+        Completions.createCompletionDetailsForSymbol = createCompletionDetailsForSymbol;
+        function createCompletionDetails(name, kindModifiers, kind, displayParts, documentation, tags, codeActions, source) {
+            return { name: name, kindModifiers: kindModifiers, kind: kind, displayParts: displayParts, documentation: documentation, tags: tags, codeActions: codeActions, source: source };
+        }
+        Completions.createCompletionDetails = createCompletionDetails;
+        function getCompletionEntryCodeActionsAndSourceDisplay(symbolToOriginInfoMap, symbol, program, checker, host, compilerOptions, sourceFile, position, previousToken, formatContext, preferences) {
+            var symbolOriginInfo = symbolToOriginInfoMap[ts.getSymbolId(symbol)];
+            if (!symbolOriginInfo || !originIsExport(symbolOriginInfo)) {
+                return { codeActions: undefined, sourceDisplay: undefined };
+            }
+            var moduleSymbol = symbolOriginInfo.moduleSymbol;
+            var exportedSymbol = checker.getMergedSymbol(ts.skipAlias(symbol.exportSymbol || symbol, checker));
+            var _a = ts.codefix.getImportCompletionAction(exportedSymbol, moduleSymbol, sourceFile, getSymbolName(symbol, symbolOriginInfo, compilerOptions.target), host, program, formatContext, previousToken && ts.isIdentifier(previousToken) ? previousToken.getStart(sourceFile) : position, preferences), moduleSpecifier = _a.moduleSpecifier, codeAction = _a.codeAction;
+            return { sourceDisplay: [ts.textPart(moduleSpecifier)], codeActions: [codeAction] };
+        }
+        function getCompletionEntrySymbol(program, log, sourceFile, position, entryId) {
+            var completion = getSymbolCompletionFromEntryId(program, log, sourceFile, position, entryId);
+            return completion.type === "symbol" ? completion.symbol : undefined;
+        }
+        Completions.getCompletionEntrySymbol = getCompletionEntrySymbol;
+        var CompletionDataKind;
+        (function (CompletionDataKind) {
+            CompletionDataKind[CompletionDataKind["Data"] = 0] = "Data";
+            CompletionDataKind[CompletionDataKind["JsDocTagName"] = 1] = "JsDocTagName";
+            CompletionDataKind[CompletionDataKind["JsDocTag"] = 2] = "JsDocTag";
+            CompletionDataKind[CompletionDataKind["JsDocParameterName"] = 3] = "JsDocParameterName";
+        })(CompletionDataKind || (CompletionDataKind = {}));
+        var CompletionKind;
+        (function (CompletionKind) {
+            CompletionKind[CompletionKind["ObjectPropertyDeclaration"] = 0] = "ObjectPropertyDeclaration";
+            CompletionKind[CompletionKind["Global"] = 1] = "Global";
+            CompletionKind[CompletionKind["PropertyAccess"] = 2] = "PropertyAccess";
+            CompletionKind[CompletionKind["MemberLike"] = 3] = "MemberLike";
+            CompletionKind[CompletionKind["String"] = 4] = "String";
+            CompletionKind[CompletionKind["None"] = 5] = "None";
+        })(CompletionKind = Completions.CompletionKind || (Completions.CompletionKind = {}));
+        function getRecommendedCompletion(previousToken, contextualType, checker) {
+            // For a union, return the first one with a recommended completion.
+            return ts.firstDefined(contextualType && (contextualType.isUnion() ? contextualType.types : [contextualType]), function (type) {
+                var symbol = type && type.symbol;
+                // Don't include make a recommended completion for an abstract class
+                return symbol && (symbol.flags & (8 /* EnumMember */ | 384 /* Enum */ | 32 /* Class */) && !ts.isAbstractConstructorSymbol(symbol))
+                    ? getFirstSymbolInChain(symbol, previousToken, checker)
+                    : undefined;
+            });
+        }
+        function getContextualType(previousToken, position, sourceFile, checker) {
+            var parent = previousToken.parent;
+            switch (previousToken.kind) {
+                case 72 /* Identifier */:
+                    return ts.getContextualTypeFromParent(previousToken, checker);
+                case 59 /* EqualsToken */:
+                    switch (parent.kind) {
+                        case 237 /* VariableDeclaration */:
+                            return checker.getContextualType(parent.initializer); // TODO: GH#18217
+                        case 204 /* BinaryExpression */:
+                            return checker.getTypeAtLocation(parent.left);
+                        case 267 /* JsxAttribute */:
+                            return checker.getContextualTypeForJsxAttribute(parent);
+                        default:
+                            return undefined;
+                    }
+                case 95 /* NewKeyword */:
+                    return checker.getContextualType(parent);
+                case 74 /* CaseKeyword */:
+                    return ts.getSwitchedType(ts.cast(parent, ts.isCaseClause), checker);
+                case 18 /* OpenBraceToken */:
+                    return ts.isJsxExpression(parent) && parent.parent.kind !== 260 /* JsxElement */ ? checker.getContextualTypeForJsxAttribute(parent.parent) : undefined;
+                default:
+                    var argInfo = ts.SignatureHelp.getArgumentInfoForCompletions(previousToken, position, sourceFile);
+                    return argInfo
+                        // At `,`, treat this as the next argument after the comma.
+                        ? checker.getContextualTypeForArgumentAtIndex(argInfo.invocation, argInfo.argumentIndex + (previousToken.kind === 27 /* CommaToken */ ? 1 : 0))
+                        : ts.isEqualityOperatorKind(previousToken.kind) && ts.isBinaryExpression(parent) && ts.isEqualityOperatorKind(parent.operatorToken.kind)
+                            // completion at `x ===/**/` should be for the right side
+                            ? checker.getTypeAtLocation(parent.left)
+                            : checker.getContextualType(previousToken);
+            }
+        }
+        function getFirstSymbolInChain(symbol, enclosingDeclaration, checker) {
+            var chain = checker.getAccessibleSymbolChain(symbol, enclosingDeclaration, /*meaning*/ 67108863 /* All */, /*useOnlyExternalAliasing*/ false);
+            if (chain)
+                return ts.first(chain);
+            return symbol.parent && (isModuleSymbol(symbol.parent) ? symbol : getFirstSymbolInChain(symbol.parent, enclosingDeclaration, checker));
+        }
+        function isModuleSymbol(symbol) {
+            return symbol.declarations.some(function (d) { return d.kind === 279 /* SourceFile */; });
+        }
+        function getCompletionData(program, log, sourceFile, isUncheckedFile, position, preferences, detailsEntryId) {
+            var typeChecker = program.getTypeChecker();
+            var start = ts.timestamp();
+            var currentToken = ts.getTokenAtPosition(sourceFile, position); // TODO: GH#15853
+            // We will check for jsdoc comments with insideComment and getJsDocTagAtPosition. (TODO: that seems rather inefficient to check the same thing so many times.)
+            log("getCompletionData: Get current token: " + (ts.timestamp() - start));
+            start = ts.timestamp();
+            var insideComment = ts.isInComment(sourceFile, position, currentToken);
+            log("getCompletionData: Is inside comment: " + (ts.timestamp() - start));
+            var insideJsDocTagTypeExpression = false;
+            var isInSnippetScope = false;
+            if (insideComment) {
+                if (ts.hasDocComment(sourceFile, position)) {
+                    if (sourceFile.text.charCodeAt(position - 1) === 64 /* at */) {
+                        // The current position is next to the '@' sign, when no tag name being provided yet.
+                        // Provide a full list of tag names
+                        return { kind: 1 /* JsDocTagName */ };
+                    }
+                    else {
+                        // When completion is requested without "@", we will have check to make sure that
+                        // there are no comments prefix the request position. We will only allow "*" and space.
+                        // e.g
+                        //   /** |c| /*
+                        //
+                        //   /**
+                        //     |c|
+                        //    */
+                        //
+                        //   /**
+                        //    * |c|
+                        //    */
+                        //
+                        //   /**
+                        //    *         |c|
+                        //    */
+                        var lineStart = ts.getLineStartPositionForPosition(position, sourceFile);
+                        if (!(sourceFile.text.substring(lineStart, position).match(/[^\*|\s|(/\*\*)]/))) {
+                            return { kind: 2 /* JsDocTag */ };
+                        }
+                    }
+                }
+                // Completion should work inside certain JsDoc tags. For example:
+                //     /** @type {number | string} */
+                // Completion should work in the brackets
+                var tag = getJsDocTagAtPosition(currentToken, position);
+                if (tag) {
+                    if (tag.tagName.pos <= position && position <= tag.tagName.end) {
+                        return { kind: 1 /* JsDocTagName */ };
+                    }
+                    if (isTagWithTypeExpression(tag) && tag.typeExpression && tag.typeExpression.kind === 283 /* JSDocTypeExpression */) {
+                        currentToken = ts.getTokenAtPosition(sourceFile, position);
+                        if (!currentToken ||
+                            (!ts.isDeclarationName(currentToken) &&
+                                (currentToken.parent.kind !== 305 /* JSDocPropertyTag */ ||
+                                    currentToken.parent.name !== currentToken))) {
+                            // Use as type location if inside tag's type expression
+                            insideJsDocTagTypeExpression = isCurrentlyEditingNode(tag.typeExpression);
+                        }
+                    }
+                    if (ts.isJSDocParameterTag(tag) && (ts.nodeIsMissing(tag.name) || tag.name.pos <= position && position <= tag.name.end)) {
+                        return { kind: 3 /* JsDocParameterName */, tag: tag };
+                    }
+                }
+                if (!insideJsDocTagTypeExpression) {
+                    // Proceed if the current position is in jsDoc tag expression; otherwise it is a normal
+                    // comment or the plain text part of a jsDoc comment, so no completion should be available
+                    log("Returning an empty list because completion was inside a regular comment or plain text part of a JsDoc comment.");
+                    return undefined;
+                }
+            }
+            start = ts.timestamp();
+            var previousToken = ts.findPrecedingToken(position, sourceFile, /*startNode*/ undefined); // TODO: GH#18217
+            log("getCompletionData: Get previous token 1: " + (ts.timestamp() - start));
+            // The decision to provide completion depends on the contextToken, which is determined through the previousToken.
+            // Note: 'previousToken' (and thus 'contextToken') can be undefined if we are the beginning of the file
+            var contextToken = previousToken;
+            // Check if the caret is at the end of an identifier; this is a partial identifier that we want to complete: e.g. a.toS|
+            // Skip this partial identifier and adjust the contextToken to the token that precedes it.
+            if (contextToken && position <= contextToken.end && (ts.isIdentifier(contextToken) || ts.isKeyword(contextToken.kind))) {
+                var start_3 = ts.timestamp();
+                contextToken = ts.findPrecedingToken(contextToken.getFullStart(), sourceFile, /*startNode*/ undefined); // TODO: GH#18217
+                log("getCompletionData: Get previous token 2: " + (ts.timestamp() - start_3));
+            }
+            // Find the node where completion is requested on.
+            // Also determine whether we are trying to complete with members of that node
+            // or attributes of a JSX tag.
+            var node = currentToken;
+            var propertyAccessToConvert;
+            var isRightOfDot = false;
+            var isRightOfOpenTag = false;
+            var isStartingCloseTag = false;
+            var isJsxInitializer = false;
+            var location = ts.getTouchingPropertyName(sourceFile, position);
+            if (contextToken) {
+                // Bail out if this is a known invalid completion location
+                if (isCompletionListBlocker(contextToken)) {
+                    log("Returning an empty list because completion was requested in an invalid position.");
+                    return undefined;
+                }
+                var parent = contextToken.parent;
+                if (contextToken.kind === 24 /* DotToken */) {
+                    isRightOfDot = true;
+                    switch (parent.kind) {
+                        case 189 /* PropertyAccessExpression */:
+                            propertyAccessToConvert = parent;
+                            node = propertyAccessToConvert.expression;
+                            break;
+                        case 148 /* QualifiedName */:
+                            node = parent.left;
+                            break;
+                        case 244 /* ModuleDeclaration */:
+                            node = parent.name;
+                            break;
+                        case 183 /* ImportType */:
+                        case 214 /* MetaProperty */:
+                            node = parent;
+                            break;
+                        default:
+                            // There is nothing that precedes the dot, so this likely just a stray character
+                            // or leading into a '...' token. Just bail out instead.
+                            return undefined;
+                    }
+                }
+                else if (sourceFile.languageVariant === 1 /* JSX */) {
+                    // <UI.Test /* completion position */ />
+                    // If the tagname is a property access expression, we will then walk up to the top most of property access expression.
+                    // Then, try to get a JSX container and its associated attributes type.
+                    if (parent && parent.kind === 189 /* PropertyAccessExpression */) {
+                        contextToken = parent;
+                        parent = parent.parent;
+                    }
+                    // Fix location
+                    if (currentToken.parent === location) {
+                        switch (currentToken.kind) {
+                            case 30 /* GreaterThanToken */:
+                                if (currentToken.parent.kind === 260 /* JsxElement */ || currentToken.parent.kind === 262 /* JsxOpeningElement */) {
+                                    location = currentToken;
+                                }
+                                break;
+                            case 42 /* SlashToken */:
+                                if (currentToken.parent.kind === 261 /* JsxSelfClosingElement */) {
+                                    location = currentToken;
+                                }
+                                break;
+                        }
+                    }
+                    switch (parent.kind) {
+                        case 263 /* JsxClosingElement */:
+                            if (contextToken.kind === 42 /* SlashToken */) {
+                                isStartingCloseTag = true;
+                                location = contextToken;
+                            }
+                            break;
+                        case 204 /* BinaryExpression */:
+                            if (!binaryExpressionMayBeOpenTag(parent)) {
+                                break;
+                            }
+                        // falls through
+                        case 261 /* JsxSelfClosingElement */:
+                        case 260 /* JsxElement */:
+                        case 262 /* JsxOpeningElement */:
+                            if (contextToken.kind === 28 /* LessThanToken */) {
+                                isRightOfOpenTag = true;
+                                location = contextToken;
+                            }
+                            break;
+                        case 267 /* JsxAttribute */:
+                            switch (previousToken.kind) {
+                                case 59 /* EqualsToken */:
+                                    isJsxInitializer = true;
+                                    break;
+                                case 72 /* Identifier */:
+                                    // For `<div x=[|f/**/|]`, `parent` will be `x` and `previousToken.parent` will be `f` (which is its own JsxAttribute)
+                                    // Note for `<div someBool f>` we don't want to treat this as a jsx inializer, instead it's the attribute name.
+                                    if (parent !== previousToken.parent &&
+                                        !parent.initializer &&
+                                        ts.findChildOfKind(parent, 59 /* EqualsToken */, sourceFile)) {
+                                        isJsxInitializer = previousToken;
+                                    }
+                            }
+                            break;
+                    }
+                }
+            }
+            var semanticStart = ts.timestamp();
+            var completionKind = 5 /* None */;
+            var isNewIdentifierLocation = false;
+            var keywordFilters = 0 /* None */;
+            var symbols = [];
+            var symbolToOriginInfoMap = [];
+            if (isRightOfDot) {
+                getTypeScriptMemberSymbols();
+            }
+            else if (isRightOfOpenTag) {
+                var tagSymbols = ts.Debug.assertEachDefined(typeChecker.getJsxIntrinsicTagNamesAt(location), "getJsxIntrinsicTagNames() should all be defined");
+                tryGetGlobalSymbols();
+                symbols = tagSymbols.concat(symbols);
+                completionKind = 3 /* MemberLike */;
+                keywordFilters = 0 /* None */;
+            }
+            else if (isStartingCloseTag) {
+                var tagName = contextToken.parent.parent.openingElement.tagName;
+                var tagSymbol = typeChecker.getSymbolAtLocation(tagName);
+                if (tagSymbol) {
+                    symbols = [tagSymbol];
+                }
+                completionKind = 3 /* MemberLike */;
+                keywordFilters = 0 /* None */;
+            }
+            else {
+                // For JavaScript or TypeScript, if we're not after a dot, then just try to get the
+                // global symbols in scope.  These results should be valid for either language as
+                // the set of symbols that can be referenced from this location.
+                if (!tryGetGlobalSymbols()) {
+                    return undefined;
+                }
+            }
+            log("getCompletionData: Semantic work: " + (ts.timestamp() - semanticStart));
+            var contextualType = previousToken && getContextualType(previousToken, position, sourceFile, typeChecker);
+            var literals = ts.mapDefined(contextualType && (contextualType.isUnion() ? contextualType.types : [contextualType]), function (t) { return t.isLiteral() ? t.value : undefined; });
+            var recommendedCompletion = previousToken && contextualType && getRecommendedCompletion(previousToken, contextualType, typeChecker);
+            return { kind: 0 /* Data */, symbols: symbols, completionKind: completionKind, isInSnippetScope: isInSnippetScope, propertyAccessToConvert: propertyAccessToConvert, isNewIdentifierLocation: isNewIdentifierLocation, location: location, keywordFilters: keywordFilters, literals: literals, symbolToOriginInfoMap: symbolToOriginInfoMap, recommendedCompletion: recommendedCompletion, previousToken: previousToken, isJsxInitializer: isJsxInitializer };
+            function isTagWithTypeExpression(tag) {
+                switch (tag.kind) {
+                    case 299 /* JSDocParameterTag */:
+                    case 305 /* JSDocPropertyTag */:
+                    case 300 /* JSDocReturnTag */:
+                    case 302 /* JSDocTypeTag */:
+                    case 304 /* JSDocTypedefTag */:
+                        return true;
+                    default:
+                        return false;
+                }
+            }
+            function getTypeScriptMemberSymbols() {
+                // Right of dot member completion list
+                completionKind = 2 /* PropertyAccess */;
+                // Since this is qualified name check its a type node location
+                var isImportType = ts.isLiteralImportTypeNode(node);
+                var isTypeLocation = insideJsDocTagTypeExpression || (isImportType && !node.isTypeOf) || ts.isPartOfTypeNode(node.parent);
+                var isRhsOfImportDeclaration = ts.isInRightSideOfInternalImportEqualsDeclaration(node);
+                var allowTypeOrValue = isRhsOfImportDeclaration || (!isTypeLocation && ts.isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker));
+                if (ts.isEntityName(node) || isImportType) {
+                    var isNamespaceName = ts.isModuleDeclaration(node.parent);
+                    if (isNamespaceName)
+                        isNewIdentifierLocation = true;
+                    var symbol = typeChecker.getSymbolAtLocation(node);
+                    if (symbol) {
+                        symbol = ts.skipAlias(symbol, typeChecker);
+                        if (symbol.flags & (1536 /* Module */ | 384 /* Enum */)) {
+                            // Extract module or enum members
+                            var exportedSymbols = ts.Debug.assertEachDefined(typeChecker.getExportsOfModule(symbol), "getExportsOfModule() should all be defined");
+                            var isValidValueAccess_1 = function (symbol) { return typeChecker.isValidPropertyAccess(isImportType ? node : (node.parent), symbol.name); };
+                            var isValidTypeAccess_1 = function (symbol) { return symbolCanBeReferencedAtTypeLocation(symbol); };
+                            var isValidAccess = isNamespaceName
+                                // At `namespace N.M/**/`, if this is the only declaration of `M`, don't include `M` as a completion.
+                                ? function (symbol) { return !!(symbol.flags & 1920 /* Namespace */) && !symbol.declarations.every(function (d) { return d.parent === node.parent; }); }
+                                : allowTypeOrValue ?
+                                    // Any kind is allowed when dotting off namespace in internal import equals declaration
+                                    function (symbol) { return isValidTypeAccess_1(symbol) || isValidValueAccess_1(symbol); } :
+                                    isTypeLocation ? isValidTypeAccess_1 : isValidValueAccess_1;
+                            for (var _i = 0, exportedSymbols_1 = exportedSymbols; _i < exportedSymbols_1.length; _i++) {
+                                var exportedSymbol = exportedSymbols_1[_i];
+                                if (isValidAccess(exportedSymbol)) {
+                                    symbols.push(exportedSymbol);
+                                }
+                            }
+                            // If the module is merged with a value, we must get the type of the class and add its propertes (for inherited static methods).
+                            if (!isTypeLocation && symbol.declarations.some(function (d) { return d.kind !== 279 /* SourceFile */ && d.kind !== 244 /* ModuleDeclaration */ && d.kind !== 243 /* EnumDeclaration */; })) {
+                                addTypeProperties(typeChecker.getTypeOfSymbolAtLocation(symbol, node));
+                            }
+                            return;
+                        }
+                    }
+                }
+                if (ts.isMetaProperty(node) && (node.keywordToken === 95 /* NewKeyword */ || node.keywordToken === 92 /* ImportKeyword */)) {
+                    var completion = (node.keywordToken === 95 /* NewKeyword */) ? "target" : "meta";
+                    symbols.push(typeChecker.createSymbol(4 /* Property */, ts.escapeLeadingUnderscores(completion)));
+                    return;
+                }
+                if (!isTypeLocation) {
+                    addTypeProperties(typeChecker.getTypeAtLocation(node));
+                }
+            }
+            function addTypeProperties(type) {
+                isNewIdentifierLocation = !!type.getStringIndexType();
+                if (isUncheckedFile) {
+                    // In javascript files, for union types, we don't just get the members that
+                    // the individual types have in common, we also include all the members that
+                    // each individual type has. This is because we're going to add all identifiers
+                    // anyways. So we might as well elevate the members that were at least part
+                    // of the individual types to a higher status since we know what they are.
+                    symbols.push.apply(symbols, getPropertiesForCompletion(type, typeChecker));
+                }
+                else {
+                    for (var _i = 0, _a = type.getApparentProperties(); _i < _a.length; _i++) {
+                        var symbol = _a[_i];
+                        if (typeChecker.isValidPropertyAccessForCompletions(node.kind === 183 /* ImportType */ ? node : node.parent, type, symbol)) {
+                            addPropertySymbol(symbol);
+                        }
+                    }
+                }
+            }
+            function addPropertySymbol(symbol) {
+                // For a computed property with an accessible name like `Symbol.iterator`,
+                // we'll add a completion for the *name* `Symbol` instead of for the property.
+                // If this is e.g. [Symbol.iterator], add a completion for `Symbol`.
+                var computedPropertyName = ts.firstDefined(symbol.declarations, function (decl) { return ts.tryCast(ts.getNameOfDeclaration(decl), ts.isComputedPropertyName); });
+                if (computedPropertyName) {
+                    var leftMostName = getLeftMostName(computedPropertyName.expression); // The completion is for `Symbol`, not `iterator`.
+                    var nameSymbol = leftMostName && typeChecker.getSymbolAtLocation(leftMostName);
+                    // If this is nested like for `namespace N { export const sym = Symbol(); }`, we'll add the completion for `N`.
+                    var firstAccessibleSymbol = nameSymbol && getFirstSymbolInChain(nameSymbol, contextToken, typeChecker);
+                    if (firstAccessibleSymbol && !symbolToOriginInfoMap[ts.getSymbolId(firstAccessibleSymbol)]) {
+                        symbols.push(firstAccessibleSymbol);
+                        var moduleSymbol = firstAccessibleSymbol.parent;
+                        symbolToOriginInfoMap[ts.getSymbolId(firstAccessibleSymbol)] =
+                            !moduleSymbol || !ts.isExternalModuleSymbol(moduleSymbol) ? { kind: 1 /* SymbolMemberNoExport */ } : { kind: 2 /* SymbolMemberExport */, moduleSymbol: moduleSymbol, isDefaultExport: false };
+                    }
+                }
+                else {
+                    symbols.push(symbol);
+                }
+            }
+            /** Given 'a.b.c', returns 'a'. */
+            function getLeftMostName(e) {
+                return ts.isIdentifier(e) ? e : ts.isPropertyAccessExpression(e) ? getLeftMostName(e.expression) : undefined;
+            }
+            function tryGetGlobalSymbols() {
+                var result = tryGetObjectLikeCompletionSymbols()
+                    || tryGetImportOrExportClauseCompletionSymbols()
+                    || tryGetConstructorCompletion()
+                    || tryGetClassLikeCompletionSymbols()
+                    || tryGetJsxCompletionSymbols()
+                    || (getGlobalCompletions(), 1 /* Success */);
+                return result === 1 /* Success */;
+            }
+            function tryGetConstructorCompletion() {
+                if (!tryGetConstructorLikeCompletionContainer(contextToken))
+                    return 0 /* Continue */;
+                // no members, only keywords
+                completionKind = 5 /* None */;
+                // Declaring new property/method/accessor
+                isNewIdentifierLocation = true;
+                // Has keywords for constructor parameter
+                keywordFilters = 4 /* ConstructorParameterKeywords */;
+                return 1 /* Success */;
+            }
+            function tryGetJsxCompletionSymbols() {
+                var jsxContainer = tryGetContainingJsxElement(contextToken);
+                // Cursor is inside a JSX self-closing element or opening element
+                var attrsType = jsxContainer && typeChecker.getContextualType(jsxContainer.attributes);
+                if (!attrsType)
+                    return 0 /* Continue */;
+                symbols = filterJsxAttributes(getPropertiesForObjectExpression(attrsType, jsxContainer.attributes, typeChecker), jsxContainer.attributes.properties);
+                completionKind = 3 /* MemberLike */;
+                isNewIdentifierLocation = false;
+                return 1 /* Success */;
+            }
+            function getGlobalCompletions() {
+                keywordFilters = tryGetFunctionLikeBodyCompletionContainer(contextToken) ? 5 /* FunctionLikeBodyKeywords */ : 1 /* All */;
+                // Get all entities in the current scope.
+                completionKind = 1 /* Global */;
+                isNewIdentifierLocation = isNewIdentifierDefinitionLocation(contextToken);
+                if (previousToken !== contextToken) {
+                    ts.Debug.assert(!!previousToken, "Expected 'contextToken' to be defined when different from 'previousToken'.");
+                }
+                // We need to find the node that will give us an appropriate scope to begin
+                // aggregating completion candidates. This is achieved in 'getScopeNode'
+                // by finding the first node that encompasses a position, accounting for whether a node
+                // is "complete" to decide whether a position belongs to the node.
+                //
+                // However, at the end of an identifier, we are interested in the scope of the identifier
+                // itself, but fall outside of the identifier. For instance:
+                //
+                //      xyz => x$
+                //
+                // the cursor is outside of both the 'x' and the arrow function 'xyz => x',
+                // so 'xyz' is not returned in our results.
+                //
+                // We define 'adjustedPosition' so that we may appropriately account for
+                // being at the end of an identifier. The intention is that if requesting completion
+                // at the end of an identifier, it should be effectively equivalent to requesting completion
+                // anywhere inside/at the beginning of the identifier. So in the previous case, the
+                // 'adjustedPosition' will work as if requesting completion in the following:
+                //
+                //      xyz => $x
+                //
+                // If previousToken !== contextToken, then
+                //   - 'contextToken' was adjusted to the token prior to 'previousToken'
+                //      because we were at the end of an identifier.
+                //   - 'previousToken' is defined.
+                var adjustedPosition = previousToken !== contextToken ?
+                    previousToken.getStart() :
+                    position;
+                var scopeNode = getScopeNode(contextToken, adjustedPosition, sourceFile) || sourceFile;
+                isInSnippetScope = isSnippetScope(scopeNode);
+                var isTypeOnly = isTypeOnlyCompletion();
+                var symbolMeanings = (isTypeOnly ? 0 /* None */ : 67220415 /* Value */) | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */;
+                symbols = ts.Debug.assertEachDefined(typeChecker.getSymbolsInScope(scopeNode, symbolMeanings), "getSymbolsInScope() should all be defined");
+                // Need to insert 'this.' before properties of `this` type, so only do that if `includeInsertTextCompletions`
+                if (preferences.includeCompletionsWithInsertText && scopeNode.kind !== 279 /* SourceFile */) {
+                    var thisType = typeChecker.tryGetThisTypeAt(scopeNode);
+                    if (thisType) {
+                        for (var _i = 0, _a = getPropertiesForCompletion(thisType, typeChecker); _i < _a.length; _i++) {
+                            var symbol = _a[_i];
+                            symbolToOriginInfoMap[ts.getSymbolId(symbol)] = { kind: 0 /* ThisType */ };
+                            symbols.push(symbol);
+                        }
+                    }
+                }
+                if (shouldOfferImportCompletions()) {
+                    getSymbolsFromOtherSourceFileExports(symbols, previousToken && ts.isIdentifier(previousToken) ? previousToken.text : "", program.getCompilerOptions().target);
+                }
+                filterGlobalCompletion(symbols);
+            }
+            function shouldOfferImportCompletions() {
+                // If not already a module, must have modules enabled and not currently be in a commonjs module. (TODO: import completions for commonjs)
+                if (!preferences.includeCompletionsForModuleExports)
+                    return false;
+                // If already using ES6 modules, OK to continue using them.
+                if (sourceFile.externalModuleIndicator)
+                    return true;
+                // If already using commonjs, don't introduce ES6.
+                if (sourceFile.commonJsModuleIndicator)
+                    return false;
+                // If module transpilation is enabled or we're targeting es6 or above, or not emitting, OK.
+                if (ts.compilerOptionsIndicateEs6Modules(program.getCompilerOptions()))
+                    return true;
+                // If some file is using ES6 modules, assume that it's OK to add more.
+                return ts.programContainsEs6Modules(program);
+            }
+            function isSnippetScope(scopeNode) {
+                switch (scopeNode.kind) {
+                    case 279 /* SourceFile */:
+                    case 206 /* TemplateExpression */:
+                    case 270 /* JsxExpression */:
+                    case 218 /* Block */:
+                        return true;
+                    default:
+                        return ts.isStatement(scopeNode);
+                }
+            }
+            function filterGlobalCompletion(symbols) {
+                var isTypeOnly = isTypeOnlyCompletion();
+                var allowTypes = isTypeOnly || !isContextTokenValueLocation(contextToken) && ts.isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker);
+                if (isTypeOnly)
+                    keywordFilters = 6 /* TypeKeywords */;
+                ts.filterMutate(symbols, function (symbol) {
+                    if (!ts.isSourceFile(location)) {
+                        // export = /**/ here we want to get all meanings, so any symbol is ok
+                        if (ts.isExportAssignment(location.parent)) {
+                            return true;
+                        }
+                        symbol = ts.skipAlias(symbol, typeChecker);
+                        // import m = /**/ <-- It can only access namespace (if typing import = x. this would get member symbols and not namespace)
+                        if (ts.isInRightSideOfInternalImportEqualsDeclaration(location)) {
+                            return !!(symbol.flags & 1920 /* Namespace */);
+                        }
+                        if (allowTypes) {
+                            // Its a type, but you can reach it by namespace.type as well
+                            var symbolAllowedAsType = symbolCanBeReferencedAtTypeLocation(symbol);
+                            if (symbolAllowedAsType || isTypeOnly) {
+                                return symbolAllowedAsType;
+                            }
+                        }
+                    }
+                    // expressions are value space (which includes the value namespaces)
+                    return !!(ts.getCombinedLocalAndExportSymbolFlags(symbol) & 67220415 /* Value */);
+                });
+            }
+            function isTypeOnlyCompletion() {
+                return insideJsDocTagTypeExpression || !isContextTokenValueLocation(contextToken) && (ts.isPartOfTypeNode(location) || isContextTokenTypeLocation(contextToken));
+            }
+            function isContextTokenValueLocation(contextToken) {
+                return contextToken &&
+                    contextToken.kind === 104 /* TypeOfKeyword */ &&
+                    (contextToken.parent.kind === 167 /* TypeQuery */ || ts.isTypeOfExpression(contextToken.parent));
+            }
+            function isContextTokenTypeLocation(contextToken) {
+                if (contextToken) {
+                    var parentKind = contextToken.parent.kind;
+                    switch (contextToken.kind) {
+                        case 57 /* ColonToken */:
+                            return parentKind === 154 /* PropertyDeclaration */ ||
+                                parentKind === 153 /* PropertySignature */ ||
+                                parentKind === 151 /* Parameter */ ||
+                                parentKind === 237 /* VariableDeclaration */ ||
+                                ts.isFunctionLikeKind(parentKind);
+                        case 59 /* EqualsToken */:
+                            return parentKind === 242 /* TypeAliasDeclaration */;
+                        case 119 /* AsKeyword */:
+                            return parentKind === 212 /* AsExpression */;
+                    }
+                }
+                return false;
+            }
+            /** True if symbol is a type or a module containing at least one type. */
+            function symbolCanBeReferencedAtTypeLocation(symbol, seenModules) {
+                if (seenModules === void 0) { seenModules = ts.createMap(); }
+                var sym = ts.skipAlias(symbol.exportSymbol || symbol, typeChecker);
+                return !!(sym.flags & 67897832 /* Type */) ||
+                    !!(sym.flags & 1536 /* Module */) &&
+                        ts.addToSeen(seenModules, ts.getSymbolId(sym)) &&
+                        typeChecker.getExportsOfModule(sym).some(function (e) { return symbolCanBeReferencedAtTypeLocation(e, seenModules); });
+            }
+            function getSymbolsFromOtherSourceFileExports(symbols, tokenText, target) {
+                var tokenTextLowerCase = tokenText.toLowerCase();
+                var seenResolvedModules = ts.createMap();
+                ts.codefix.forEachExternalModuleToImportFrom(typeChecker, sourceFile, program.getSourceFiles(), function (moduleSymbol) {
+                    // Perf -- ignore other modules if this is a request for details
+                    if (detailsEntryId && detailsEntryId.source && ts.stripQuotes(moduleSymbol.name) !== detailsEntryId.source) {
+                        return;
+                    }
+                    var resolvedModuleSymbol = typeChecker.resolveExternalModuleSymbol(moduleSymbol);
+                    // resolvedModuleSymbol may be a namespace. A namespace may be `export =` by multiple module declarations, but only keep the first one.
+                    if (!ts.addToSeen(seenResolvedModules, ts.getSymbolId(resolvedModuleSymbol))) {
+                        return;
+                    }
+                    if (resolvedModuleSymbol !== moduleSymbol &&
+                        // Don't add another completion for `export =` of a symbol that's already global.
+                        // So in `declare namespace foo {} declare module "foo" { export = foo; }`, there will just be the global completion for `foo`.
+                        ts.some(resolvedModuleSymbol.declarations, function (d) { return !!d.getSourceFile().externalModuleIndicator; })) {
+                        symbols.push(resolvedModuleSymbol);
+                        symbolToOriginInfoMap[ts.getSymbolId(resolvedModuleSymbol)] = { kind: 3 /* Export */, moduleSymbol: moduleSymbol, isDefaultExport: false };
+                    }
+                    for (var _i = 0, _a = typeChecker.getExportsOfModule(moduleSymbol); _i < _a.length; _i++) {
+                        var symbol = _a[_i];
+                        // Don't add a completion for a re-export, only for the original.
+                        // The actual import fix might end up coming from a re-export -- we don't compute that until getting completion details.
+                        // This is just to avoid adding duplicate completion entries.
+                        //
+                        // If `symbol.parent !== ...`, this is an `export * from "foo"` re-export. Those don't create new symbols.
+                        if (typeChecker.getMergedSymbol(symbol.parent) !== resolvedModuleSymbol
+                            || ts.some(symbol.declarations, function (d) {
+                                // If `!!d.name.originalKeywordKind`, this is `export { _break as break };` -- skip this and prefer the keyword completion.
+                                // If `!!d.parent.parent.moduleSpecifier`, this is `export { foo } from "foo"` re-export, which creates a new symbol (thus isn't caught by the first check).
+                                return ts.isExportSpecifier(d) && (d.propertyName ? ts.isIdentifierANonContextualKeyword(d.name) : !!d.parent.parent.moduleSpecifier);
+                            })) {
+                            continue;
+                        }
+                        var isDefaultExport = symbol.escapedName === "default" /* Default */;
+                        if (isDefaultExport) {
+                            symbol = ts.getLocalSymbolForExportDefault(symbol) || symbol;
+                        }
+                        var origin = { kind: 3 /* Export */, moduleSymbol: moduleSymbol, isDefaultExport: isDefaultExport };
+                        if (detailsEntryId || stringContainsCharactersInOrder(getSymbolName(symbol, origin, target).toLowerCase(), tokenTextLowerCase)) {
+                            symbols.push(symbol);
+                            symbolToOriginInfoMap[ts.getSymbolId(symbol)] = origin;
+                        }
+                    }
+                });
+            }
+            /**
+             * True if you could remove some characters in `a` to get `b`.
+             * E.g., true for "abcdef" and "bdf".
+             * But not true for "abcdef" and "dbf".
+             */
+            function stringContainsCharactersInOrder(str, characters) {
+                if (characters.length === 0) {
+                    return true;
+                }
+                var characterIndex = 0;
+                for (var strIndex = 0; strIndex < str.length; strIndex++) {
+                    if (str.charCodeAt(strIndex) === characters.charCodeAt(characterIndex)) {
+                        characterIndex++;
+                        if (characterIndex === characters.length) {
+                            return true;
+                        }
+                    }
+                }
+                // Did not find all characters
+                return false;
+            }
+            /**
+             * Finds the first node that "embraces" the position, so that one may
+             * accurately aggregate locals from the closest containing scope.
+             */
+            function getScopeNode(initialToken, position, sourceFile) {
+                var scope = initialToken;
+                while (scope && !ts.positionBelongsToNode(scope, position, sourceFile)) {
+                    scope = scope.parent;
+                }
+                return scope;
+            }
+            function isCompletionListBlocker(contextToken) {
+                var start = ts.timestamp();
+                var result = isInStringOrRegularExpressionOrTemplateLiteral(contextToken) ||
+                    isSolelyIdentifierDefinitionLocation(contextToken) ||
+                    isDotOfNumericLiteral(contextToken) ||
+                    isInJsxText(contextToken);
+                log("getCompletionsAtPosition: isCompletionListBlocker: " + (ts.timestamp() - start));
+                return result;
+            }
+            function isInJsxText(contextToken) {
+                if (contextToken.kind === 11 /* JsxText */) {
+                    return true;
+                }
+                if (contextToken.kind === 30 /* GreaterThanToken */ && contextToken.parent) {
+                    if (contextToken.parent.kind === 262 /* JsxOpeningElement */) {
+                        return true;
+                    }
+                    if (contextToken.parent.kind === 263 /* JsxClosingElement */ || contextToken.parent.kind === 261 /* JsxSelfClosingElement */) {
+                        return !!contextToken.parent.parent && contextToken.parent.parent.kind === 260 /* JsxElement */;
+                    }
+                }
+                return false;
+            }
+            function isNewIdentifierDefinitionLocation(previousToken) {
+                if (previousToken) {
+                    var containingNodeKind = previousToken.parent.kind;
+                    // Previous token may have been a keyword that was converted to an identifier.
+                    switch (keywordForNode(previousToken)) {
+                        case 27 /* CommaToken */:
+                            return containingNodeKind === 191 /* CallExpression */ // func( a, |
+                                || containingNodeKind === 157 /* Constructor */ // constructor( a, |   /* public, protected, private keywords are allowed here, so show completion */
+                                || containingNodeKind === 192 /* NewExpression */ // new C(a, |
+                                || containingNodeKind === 187 /* ArrayLiteralExpression */ // [a, |
+                                || containingNodeKind === 204 /* BinaryExpression */ // const x = (a, |
+                                || containingNodeKind === 165 /* FunctionType */; // var x: (s: string, list|
+                        case 20 /* OpenParenToken */:
+                            return containingNodeKind === 191 /* CallExpression */ // func( |
+                                || containingNodeKind === 157 /* Constructor */ // constructor( |
+                                || containingNodeKind === 192 /* NewExpression */ // new C(a|
+                                || containingNodeKind === 195 /* ParenthesizedExpression */ // const x = (a|
+                                || containingNodeKind === 177 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */
+                        case 22 /* OpenBracketToken */:
+                            return containingNodeKind === 187 /* ArrayLiteralExpression */ // [ |
+                                || containingNodeKind === 162 /* IndexSignature */ // [ | : string ]
+                                || containingNodeKind === 149 /* ComputedPropertyName */; // [ |    /* this can become an index signature */
+                        case 130 /* ModuleKeyword */: // module |
+                        case 131 /* NamespaceKeyword */: // namespace |
+                            return true;
+                        case 24 /* DotToken */:
+                            return containingNodeKind === 244 /* ModuleDeclaration */; // module A.|
+                        case 18 /* OpenBraceToken */:
+                            return containingNodeKind === 240 /* ClassDeclaration */; // class A{ |
+                        case 59 /* EqualsToken */:
+                            return containingNodeKind === 237 /* VariableDeclaration */ // const x = a|
+                                || containingNodeKind === 204 /* BinaryExpression */; // x = a|
+                        case 15 /* TemplateHead */:
+                            return containingNodeKind === 206 /* TemplateExpression */; // `aa ${|
+                        case 16 /* TemplateMiddle */:
+                            return containingNodeKind === 216 /* TemplateSpan */; // `aa ${10} dd ${|
+                        case 115 /* PublicKeyword */:
+                        case 113 /* PrivateKeyword */:
+                        case 114 /* ProtectedKeyword */:
+                            return containingNodeKind === 154 /* PropertyDeclaration */; // class A{ public |
+                    }
+                }
+                return false;
+            }
+            function isInStringOrRegularExpressionOrTemplateLiteral(contextToken) {
+                // To be "in" one of these literals, the position has to be:
+                //   1. entirely within the token text.
+                //   2. at the end position of an unterminated token.
+                //   3. at the end of a regular expression (due to trailing flags like '/foo/g').
+                return (ts.isRegularExpressionLiteral(contextToken) || ts.isStringTextContainingNode(contextToken)) && (ts.rangeContainsPositionExclusive(ts.createTextRangeFromSpan(ts.createTextSpanFromNode(contextToken)), position) ||
+                    position === contextToken.end && (!!contextToken.isUnterminated || ts.isRegularExpressionLiteral(contextToken)));
+            }
+            /**
+             * Aggregates relevant symbols for completion in object literals and object binding patterns.
+             * Relevant symbols are stored in the captured 'symbols' variable.
+             *
+             * @returns true if 'symbols' was successfully populated; false otherwise.
+             */
+            function tryGetObjectLikeCompletionSymbols() {
+                var objectLikeContainer = tryGetObjectLikeCompletionContainer(contextToken);
+                if (!objectLikeContainer)
+                    return 0 /* Continue */;
+                // We're looking up possible property names from contextual/inferred/declared type.
+                completionKind = 0 /* ObjectPropertyDeclaration */;
+                var typeMembers;
+                var existingMembers;
+                if (objectLikeContainer.kind === 188 /* ObjectLiteralExpression */) {
+                    var typeForObject = typeChecker.getContextualType(objectLikeContainer);
+                    if (!typeForObject)
+                        return 2 /* Fail */;
+                    isNewIdentifierLocation = ts.hasIndexSignature(typeForObject);
+                    typeMembers = getPropertiesForObjectExpression(typeForObject, objectLikeContainer, typeChecker);
+                    existingMembers = objectLikeContainer.properties;
+                }
+                else {
+                    ts.Debug.assert(objectLikeContainer.kind === 184 /* ObjectBindingPattern */);
+                    // We are *only* completing on properties from the type being destructured.
+                    isNewIdentifierLocation = false;
+                    var rootDeclaration = ts.getRootDeclaration(objectLikeContainer.parent);
+                    if (!ts.isVariableLike(rootDeclaration))
+                        return ts.Debug.fail("Root declaration is not variable-like.");
+                    // We don't want to complete using the type acquired by the shape
+                    // of the binding pattern; we are only interested in types acquired
+                    // through type declaration or inference.
+                    // Also proceed if rootDeclaration is a parameter and if its containing function expression/arrow function is contextually typed -
+                    // type of parameter will flow in from the contextual type of the function
+                    var canGetType = ts.hasInitializer(rootDeclaration) || ts.hasType(rootDeclaration) || rootDeclaration.parent.parent.kind === 227 /* ForOfStatement */;
+                    if (!canGetType && rootDeclaration.kind === 151 /* Parameter */) {
+                        if (ts.isExpression(rootDeclaration.parent)) {
+                            canGetType = !!typeChecker.getContextualType(rootDeclaration.parent);
+                        }
+                        else if (rootDeclaration.parent.kind === 156 /* MethodDeclaration */ || rootDeclaration.parent.kind === 159 /* SetAccessor */) {
+                            canGetType = ts.isExpression(rootDeclaration.parent.parent) && !!typeChecker.getContextualType(rootDeclaration.parent.parent);
+                        }
+                    }
+                    if (canGetType) {
+                        var typeForObject = typeChecker.getTypeAtLocation(objectLikeContainer);
+                        if (!typeForObject)
+                            return 2 /* Fail */;
+                        // In a binding pattern, get only known properties. Everywhere else we will get all possible properties.
+                        typeMembers = typeChecker.getPropertiesOfType(typeForObject).filter(function (symbol) { return !(ts.getDeclarationModifierFlagsFromSymbol(symbol) & 24 /* NonPublicAccessibilityModifier */); });
+                        existingMembers = objectLikeContainer.elements;
+                    }
+                }
+                if (typeMembers && typeMembers.length > 0) {
+                    // Add filtered items to the completion list
+                    symbols = filterObjectMembersList(typeMembers, ts.Debug.assertDefined(existingMembers));
+                }
+                return 1 /* Success */;
+            }
+            /**
+             * Aggregates relevant symbols for completion in import clauses and export clauses
+             * whose declarations have a module specifier; for instance, symbols will be aggregated for
+             *
+             *      import { | } from "moduleName";
+             *      export { a as foo, | } from "moduleName";
+             *
+             * but not for
+             *
+             *      export { | };
+             *
+             * Relevant symbols are stored in the captured 'symbols' variable.
+             *
+             * @returns true if 'symbols' was successfully populated; false otherwise.
+             */
+            function tryGetImportOrExportClauseCompletionSymbols() {
+                // `import { |` or `import { a as 0, | }`
+                var namedImportsOrExports = contextToken && (contextToken.kind === 18 /* OpenBraceToken */ || contextToken.kind === 27 /* CommaToken */)
+                    ? ts.tryCast(contextToken.parent, ts.isNamedImportsOrExports) : undefined;
+                if (!namedImportsOrExports)
+                    return 0 /* Continue */;
+                // cursor is in an import clause
+                // try to show exported member for imported module
+                var moduleSpecifier = (namedImportsOrExports.kind === 252 /* NamedImports */ ? namedImportsOrExports.parent.parent : namedImportsOrExports.parent).moduleSpecifier;
+                var moduleSpecifierSymbol = typeChecker.getSymbolAtLocation(moduleSpecifier); // TODO: GH#18217
+                if (!moduleSpecifierSymbol)
+                    return 2 /* Fail */;
+                completionKind = 3 /* MemberLike */;
+                isNewIdentifierLocation = false;
+                var exports = typeChecker.getExportsAndPropertiesOfModule(moduleSpecifierSymbol);
+                var existing = ts.arrayToSet(namedImportsOrExports.elements, function (n) { return isCurrentlyEditingNode(n) ? undefined : (n.propertyName || n.name).escapedText; });
+                symbols = exports.filter(function (e) { return e.escapedName !== "default" /* Default */ && !existing.get(e.escapedName); });
+                return 1 /* Success */;
+            }
+            /**
+             * Aggregates relevant symbols for completion in class declaration
+             * Relevant symbols are stored in the captured 'symbols' variable.
+             */
+            function tryGetClassLikeCompletionSymbols() {
+                var decl = tryGetObjectTypeDeclarationCompletionContainer(sourceFile, contextToken, location);
+                if (!decl)
+                    return 0 /* Continue */;
+                // We're looking up possible property names from parent type.
+                completionKind = 3 /* MemberLike */;
+                // Declaring new property/method/accessor
+                isNewIdentifierLocation = true;
+                keywordFilters = contextToken.kind === 40 /* AsteriskToken */ ? 0 /* None */ :
+                    ts.isClassLike(decl) ? 2 /* ClassElementKeywords */ : 3 /* InterfaceElementKeywords */;
+                // If you're in an interface you don't want to repeat things from super-interface. So just stop here.
+                if (!ts.isClassLike(decl))
+                    return 1 /* Success */;
+                var classElement = contextToken.parent;
+                var classElementModifierFlags = ts.isClassElement(classElement) ? ts.getModifierFlags(classElement) : 0 /* None */;
+                // If this is context token is not something we are editing now, consider if this would lead to be modifier
+                if (contextToken.kind === 72 /* Identifier */ && !isCurrentlyEditingNode(contextToken)) {
+                    switch (contextToken.getText()) {
+                        case "private":
+                            classElementModifierFlags = classElementModifierFlags | 8 /* Private */;
+                            break;
+                        case "static":
+                            classElementModifierFlags = classElementModifierFlags | 32 /* Static */;
+                            break;
+                    }
+                }
+                // No member list for private methods
+                if (!(classElementModifierFlags & 8 /* Private */)) {
+                    // List of property symbols of base type that are not private and already implemented
+                    var baseSymbols = ts.flatMap(ts.getAllSuperTypeNodes(decl), function (baseTypeNode) {
+                        var type = typeChecker.getTypeAtLocation(baseTypeNode);
+                        return type && typeChecker.getPropertiesOfType(classElementModifierFlags & 32 /* Static */ ? typeChecker.getTypeOfSymbolAtLocation(type.symbol, decl) : type);
+                    });
+                    symbols = filterClassMembersList(baseSymbols, decl.members, classElementModifierFlags);
+                }
+                return 1 /* Success */;
+            }
+            /**
+             * Returns the immediate owning object literal or binding pattern of a context token,
+             * on the condition that one exists and that the context implies completion should be given.
+             */
+            function tryGetObjectLikeCompletionContainer(contextToken) {
+                if (contextToken) {
+                    var parent = contextToken.parent;
+                    switch (contextToken.kind) {
+                        case 18 /* OpenBraceToken */: // const x = { |
+                        case 27 /* CommaToken */: // const x = { a: 0, |
+                            if (ts.isObjectLiteralExpression(parent) || ts.isObjectBindingPattern(parent)) {
+                                return parent;
+                            }
+                            break;
+                        case 40 /* AsteriskToken */:
+                            return ts.isMethodDeclaration(parent) ? ts.tryCast(parent.parent, ts.isObjectLiteralExpression) : undefined;
+                        case 72 /* Identifier */:
+                            return contextToken.text === "async" && ts.isShorthandPropertyAssignment(contextToken.parent)
+                                ? contextToken.parent.parent : undefined;
+                    }
+                }
+                return undefined;
+            }
+            function isConstructorParameterCompletion(node) {
+                return !!node.parent && ts.isParameter(node.parent) && ts.isConstructorDeclaration(node.parent.parent)
+                    && (ts.isParameterPropertyModifier(node.kind) || ts.isDeclarationName(node));
+            }
+            /**
+             * Returns the immediate owning class declaration of a context token,
+             * on the condition that one exists and that the context implies completion should be given.
+             */
+            function tryGetConstructorLikeCompletionContainer(contextToken) {
+                if (contextToken) {
+                    var parent = contextToken.parent;
+                    switch (contextToken.kind) {
+                        case 20 /* OpenParenToken */:
+                        case 27 /* CommaToken */:
+                            return ts.isConstructorDeclaration(contextToken.parent) ? contextToken.parent : undefined;
+                        default:
+                            if (isConstructorParameterCompletion(contextToken)) {
+                                return parent.parent;
+                            }
+                    }
+                }
+                return undefined;
+            }
+            function tryGetFunctionLikeBodyCompletionContainer(contextToken) {
+                if (contextToken) {
+                    var prev_1;
+                    var container = ts.findAncestor(contextToken.parent, function (node) {
+                        if (ts.isClassLike(node)) {
+                            return "quit";
+                        }
+                        if (ts.isFunctionLikeDeclaration(node) && prev_1 === node.body) {
+                            return true;
+                        }
+                        prev_1 = node;
+                        return false;
+                    });
+                    return container && container;
+                }
+            }
+            function tryGetContainingJsxElement(contextToken) {
+                if (contextToken) {
+                    var parent = contextToken.parent;
+                    switch (contextToken.kind) {
+                        case 30 /* GreaterThanToken */: // End of a type argument list
+                        case 29 /* LessThanSlashToken */:
+                        case 42 /* SlashToken */:
+                        case 72 /* Identifier */:
+                        case 189 /* PropertyAccessExpression */:
+                        case 268 /* JsxAttributes */:
+                        case 267 /* JsxAttribute */:
+                        case 269 /* JsxSpreadAttribute */:
+                            if (parent && (parent.kind === 261 /* JsxSelfClosingElement */ || parent.kind === 262 /* JsxOpeningElement */)) {
+                                if (contextToken.kind === 30 /* GreaterThanToken */) {
+                                    var precedingToken = ts.findPrecedingToken(contextToken.pos, sourceFile, /*startNode*/ undefined);
+                                    if (!parent.typeArguments || (precedingToken && precedingToken.kind === 42 /* SlashToken */))
+                                        break;
+                                }
+                                return parent;
+                            }
+                            else if (parent.kind === 267 /* JsxAttribute */) {
+                                // Currently we parse JsxOpeningLikeElement as:
+                                //      JsxOpeningLikeElement
+                                //          attributes: JsxAttributes
+                                //             properties: NodeArray<JsxAttributeLike>
+                                return parent.parent.parent;
+                            }
+                            break;
+                        // The context token is the closing } or " of an attribute, which means
+                        // its parent is a JsxExpression, whose parent is a JsxAttribute,
+                        // whose parent is a JsxOpeningLikeElement
+                        case 10 /* StringLiteral */:
+                            if (parent && ((parent.kind === 267 /* JsxAttribute */) || (parent.kind === 269 /* JsxSpreadAttribute */))) {
+                                // Currently we parse JsxOpeningLikeElement as:
+                                //      JsxOpeningLikeElement
+                                //          attributes: JsxAttributes
+                                //             properties: NodeArray<JsxAttributeLike>
+                                return parent.parent.parent;
+                            }
+                            break;
+                        case 19 /* CloseBraceToken */:
+                            if (parent &&
+                                parent.kind === 270 /* JsxExpression */ &&
+                                parent.parent && parent.parent.kind === 267 /* JsxAttribute */) {
+                                // Currently we parse JsxOpeningLikeElement as:
+                                //      JsxOpeningLikeElement
+                                //          attributes: JsxAttributes
+                                //             properties: NodeArray<JsxAttributeLike>
+                                //                  each JsxAttribute can have initializer as JsxExpression
+                                return parent.parent.parent.parent;
+                            }
+                            if (parent && parent.kind === 269 /* JsxSpreadAttribute */) {
+                                // Currently we parse JsxOpeningLikeElement as:
+                                //      JsxOpeningLikeElement
+                                //          attributes: JsxAttributes
+                                //             properties: NodeArray<JsxAttributeLike>
+                                return parent.parent.parent;
+                            }
+                            break;
+                    }
+                }
+                return undefined;
+            }
+            /**
+             * @returns true if we are certain that the currently edited location must define a new location; false otherwise.
+             */
+            function isSolelyIdentifierDefinitionLocation(contextToken) {
+                var parent = contextToken.parent;
+                var containingNodeKind = parent.kind;
+                switch (contextToken.kind) {
+                    case 27 /* CommaToken */:
+                        return containingNodeKind === 237 /* VariableDeclaration */ ||
+                            containingNodeKind === 238 /* VariableDeclarationList */ ||
+                            containingNodeKind === 219 /* VariableStatement */ ||
+                            containingNodeKind === 243 /* EnumDeclaration */ || // enum a { foo, |
+                            isFunctionLikeButNotConstructor(containingNodeKind) ||
+                            containingNodeKind === 241 /* InterfaceDeclaration */ || // interface A<T, |
+                            containingNodeKind === 185 /* ArrayBindingPattern */ || // var [x, y|
+                            containingNodeKind === 242 /* TypeAliasDeclaration */ || // type Map, K, |
+                            // class A<T, |
+                            // var C = class D<T, |
+                            (ts.isClassLike(parent) &&
+                                !!parent.typeParameters &&
+                                parent.typeParameters.end >= contextToken.pos);
+                    case 24 /* DotToken */:
+                        return containingNodeKind === 185 /* ArrayBindingPattern */; // var [.|
+                    case 57 /* ColonToken */:
+                        return containingNodeKind === 186 /* BindingElement */; // var {x :html|
+                    case 22 /* OpenBracketToken */:
+                        return containingNodeKind === 185 /* ArrayBindingPattern */; // var [x|
+                    case 20 /* OpenParenToken */:
+                        return containingNodeKind === 274 /* CatchClause */ ||
+                            isFunctionLikeButNotConstructor(containingNodeKind);
+                    case 18 /* OpenBraceToken */:
+                        return containingNodeKind === 243 /* EnumDeclaration */; // enum a { |
+                    case 28 /* LessThanToken */:
+                        return containingNodeKind === 240 /* ClassDeclaration */ || // class A< |
+                            containingNodeKind === 209 /* ClassExpression */ || // var C = class D< |
+                            containingNodeKind === 241 /* InterfaceDeclaration */ || // interface A< |
+                            containingNodeKind === 242 /* TypeAliasDeclaration */ || // type List< |
+                            ts.isFunctionLikeKind(containingNodeKind);
+                    case 116 /* StaticKeyword */:
+                        return containingNodeKind === 154 /* PropertyDeclaration */ && !ts.isClassLike(parent.parent);
+                    case 25 /* DotDotDotToken */:
+                        return containingNodeKind === 151 /* Parameter */ ||
+                            (!!parent.parent && parent.parent.kind === 185 /* ArrayBindingPattern */); // var [...z|
+                    case 115 /* PublicKeyword */:
+                    case 113 /* PrivateKeyword */:
+                    case 114 /* ProtectedKeyword */:
+                        return containingNodeKind === 151 /* Parameter */ && !ts.isConstructorDeclaration(parent.parent);
+                    case 119 /* AsKeyword */:
+                        return containingNodeKind === 253 /* ImportSpecifier */ ||
+                            containingNodeKind === 257 /* ExportSpecifier */ ||
+                            containingNodeKind === 251 /* NamespaceImport */;
+                    case 126 /* GetKeyword */:
+                    case 137 /* SetKeyword */:
+                        return !isFromObjectTypeDeclaration(contextToken);
+                    case 76 /* ClassKeyword */:
+                    case 84 /* EnumKeyword */:
+                    case 110 /* InterfaceKeyword */:
+                    case 90 /* FunctionKeyword */:
+                    case 105 /* VarKeyword */:
+                    case 92 /* ImportKeyword */:
+                    case 111 /* LetKeyword */:
+                    case 77 /* ConstKeyword */:
+                    case 117 /* YieldKeyword */:
+                    case 140 /* TypeKeyword */: // type htm|
+                        return true;
+                    case 40 /* AsteriskToken */:
+                        return ts.isFunctionLike(contextToken.parent) && !ts.isMethodDeclaration(contextToken.parent);
+                }
+                // If the previous token is keyword correspoding to class member completion keyword
+                // there will be completion available here
+                if (isClassMemberCompletionKeyword(keywordForNode(contextToken)) && isFromObjectTypeDeclaration(contextToken)) {
+                    return false;
+                }
+                if (isConstructorParameterCompletion(contextToken)) {
+                    // constructor parameter completion is available only if
+                    // - its modifier of the constructor parameter or
+                    // - its name of the parameter and not being edited
+                    // eg. constructor(a |<- this shouldnt show completion
+                    if (!ts.isIdentifier(contextToken) ||
+                        ts.isParameterPropertyModifier(keywordForNode(contextToken)) ||
+                        isCurrentlyEditingNode(contextToken)) {
+                        return false;
+                    }
+                }
+                // Previous token may have been a keyword that was converted to an identifier.
+                switch (keywordForNode(contextToken)) {
+                    case 118 /* AbstractKeyword */:
+                    case 76 /* ClassKeyword */:
+                    case 77 /* ConstKeyword */:
+                    case 125 /* DeclareKeyword */:
+                    case 84 /* EnumKeyword */:
+                    case 90 /* FunctionKeyword */:
+                    case 110 /* InterfaceKeyword */:
+                    case 111 /* LetKeyword */:
+                    case 113 /* PrivateKeyword */:
+                    case 114 /* ProtectedKeyword */:
+                    case 115 /* PublicKeyword */:
+                    case 116 /* StaticKeyword */:
+                    case 105 /* VarKeyword */:
+                    case 117 /* YieldKeyword */:
+                        return true;
+                    case 121 /* AsyncKeyword */:
+                        return ts.isPropertyDeclaration(contextToken.parent);
+                }
+                return ts.isDeclarationName(contextToken)
+                    && !ts.isJsxAttribute(contextToken.parent)
+                    // Don't block completions if we're in `class C /**/`, because we're *past* the end of the identifier and might want to complete `extends`.
+                    // If `contextToken !== previousToken`, this is `class C ex/**/`.
+                    && !(ts.isClassLike(contextToken.parent) && (contextToken !== previousToken || position > previousToken.end));
+            }
+            function isFunctionLikeButNotConstructor(kind) {
+                return ts.isFunctionLikeKind(kind) && kind !== 157 /* Constructor */;
+            }
+            function isDotOfNumericLiteral(contextToken) {
+                if (contextToken.kind === 8 /* NumericLiteral */) {
+                    var text = contextToken.getFullText();
+                    return text.charAt(text.length - 1) === ".";
+                }
+                return false;
+            }
+            /**
+             * Filters out completion suggestions for named imports or exports.
+             *
+             * @returns Symbols to be suggested in an object binding pattern or object literal expression, barring those whose declarations
+             *          do not occur at the current position and have not otherwise been typed.
+             */
+            function filterObjectMembersList(contextualMemberSymbols, existingMembers) {
+                if (existingMembers.length === 0) {
+                    return contextualMemberSymbols;
+                }
+                var existingMemberNames = ts.createUnderscoreEscapedMap();
+                for (var _i = 0, existingMembers_1 = existingMembers; _i < existingMembers_1.length; _i++) {
+                    var m = existingMembers_1[_i];
+                    // Ignore omitted expressions for missing members
+                    if (m.kind !== 275 /* PropertyAssignment */ &&
+                        m.kind !== 276 /* ShorthandPropertyAssignment */ &&
+                        m.kind !== 186 /* BindingElement */ &&
+                        m.kind !== 156 /* MethodDeclaration */ &&
+                        m.kind !== 158 /* GetAccessor */ &&
+                        m.kind !== 159 /* SetAccessor */) {
+                        continue;
+                    }
+                    // If this is the current item we are editing right now, do not filter it out
+                    if (isCurrentlyEditingNode(m)) {
+                        continue;
+                    }
+                    var existingName = void 0;
+                    if (ts.isBindingElement(m) && m.propertyName) {
+                        // include only identifiers in completion list
+                        if (m.propertyName.kind === 72 /* Identifier */) {
+                            existingName = m.propertyName.escapedText;
+                        }
+                    }
+                    else {
+                        // TODO: Account for computed property name
+                        // NOTE: if one only performs this step when m.name is an identifier,
+                        // things like '__proto__' are not filtered out.
+                        var name = ts.getNameOfDeclaration(m);
+                        existingName = name && ts.isPropertyNameLiteral(name) ? ts.getEscapedTextOfIdentifierOrLiteral(name) : undefined;
+                    }
+                    existingMemberNames.set(existingName, true); // TODO: GH#18217
+                }
+                return contextualMemberSymbols.filter(function (m) { return !existingMemberNames.get(m.escapedName); });
+            }
+            /**
+             * Filters out completion suggestions for class elements.
+             *
+             * @returns Symbols to be suggested in an class element depending on existing memebers and symbol flags
+             */
+            function filterClassMembersList(baseSymbols, existingMembers, currentClassElementModifierFlags) {
+                var existingMemberNames = ts.createUnderscoreEscapedMap();
+                for (var _i = 0, existingMembers_2 = existingMembers; _i < existingMembers_2.length; _i++) {
+                    var m = existingMembers_2[_i];
+                    // Ignore omitted expressions for missing members
+                    if (m.kind !== 154 /* PropertyDeclaration */ &&
+                        m.kind !== 156 /* MethodDeclaration */ &&
+                        m.kind !== 158 /* GetAccessor */ &&
+                        m.kind !== 159 /* SetAccessor */) {
+                        continue;
+                    }
+                    // If this is the current item we are editing right now, do not filter it out
+                    if (isCurrentlyEditingNode(m)) {
+                        continue;
+                    }
+                    // Dont filter member even if the name matches if it is declared private in the list
+                    if (ts.hasModifier(m, 8 /* Private */)) {
+                        continue;
+                    }
+                    // do not filter it out if the static presence doesnt match
+                    if (ts.hasModifier(m, 32 /* Static */) !== !!(currentClassElementModifierFlags & 32 /* Static */)) {
+                        continue;
+                    }
+                    var existingName = ts.getPropertyNameForPropertyNameNode(m.name);
+                    if (existingName) {
+                        existingMemberNames.set(existingName, true);
+                    }
+                }
+                return baseSymbols.filter(function (propertySymbol) {
+                    return !existingMemberNames.has(propertySymbol.escapedName) &&
+                        !!propertySymbol.declarations &&
+                        !(ts.getDeclarationModifierFlagsFromSymbol(propertySymbol) & 8 /* Private */);
+                });
+            }
+            /**
+             * Filters out completion suggestions from 'symbols' according to existing JSX attributes.
+             *
+             * @returns Symbols to be suggested in a JSX element, barring those whose attributes
+             *          do not occur at the current position and have not otherwise been typed.
+             */
+            function filterJsxAttributes(symbols, attributes) {
+                var seenNames = ts.createUnderscoreEscapedMap();
+                for (var _i = 0, attributes_1 = attributes; _i < attributes_1.length; _i++) {
+                    var attr = attributes_1[_i];
+                    // If this is the current item we are editing right now, do not filter it out
+                    if (isCurrentlyEditingNode(attr)) {
+                        continue;
+                    }
+                    if (attr.kind === 267 /* JsxAttribute */) {
+                        seenNames.set(attr.name.escapedText, true);
+                    }
+                }
+                return symbols.filter(function (a) { return !seenNames.get(a.escapedName); });
+            }
+            function isCurrentlyEditingNode(node) {
+                return node.getStart(sourceFile) <= position && position <= node.getEnd();
+            }
+        }
+        function getCompletionEntryDisplayNameForSymbol(symbol, target, origin, kind) {
+            var name = getSymbolName(symbol, origin, target);
+            if (name === undefined
+                // If the symbol is external module, don't show it in the completion list
+                // (i.e declare module "http" { const x; } | // <= request completion here, "http" should not be there)
+                || symbol.flags & 1536 /* Module */ && ts.startsWithQuote(name)
+                // If the symbol is the internal name of an ES symbol, it is not a valid entry. Internal names for ES symbols start with "__@"
+                || ts.isKnownSymbol(symbol)) {
+                return undefined;
+            }
+            var validIdentiferResult = { name: name, needsConvertPropertyAccess: false };
+            if (ts.isIdentifierText(name, target))
+                return validIdentiferResult;
+            switch (kind) {
+                case 3 /* MemberLike */:
+                    return undefined;
+                case 0 /* ObjectPropertyDeclaration */:
+                    // TODO: GH#18169
+                    return { name: JSON.stringify(name), needsConvertPropertyAccess: false };
+                case 2 /* PropertyAccess */:
+                case 1 /* Global */: // For a 'this.' completion it will be in a global context, but may have a non-identifier name.
+                    // Don't add a completion for a name starting with a space. See https://github.com/Microsoft/TypeScript/pull/20547
+                    return name.charCodeAt(0) === 32 /* space */ ? undefined : { name: name, needsConvertPropertyAccess: true };
+                case 5 /* None */:
+                case 4 /* String */:
+                    return validIdentiferResult;
+                default:
+                    ts.Debug.assertNever(kind);
+            }
+        }
+        // A cache of completion entries for keywords, these do not change between sessions
+        var _keywordCompletions = [];
+        var allKeywordsCompletions = ts.memoize(function () {
+            var res = [];
+            for (var i = 73 /* FirstKeyword */; i <= 147 /* LastKeyword */; i++) {
+                res.push({
+                    name: ts.tokenToString(i),
+                    kind: "keyword" /* keyword */,
+                    kindModifiers: "" /* none */,
+                    sortText: "0"
+                });
+            }
+            return res;
+        });
+        function getKeywordCompletions(keywordFilter) {
+            return _keywordCompletions[keywordFilter] || (_keywordCompletions[keywordFilter] = allKeywordsCompletions().filter(function (entry) {
+                var kind = ts.stringToToken(entry.name);
+                switch (keywordFilter) {
+                    case 0 /* None */:
+                        return false;
+                    case 1 /* All */:
+                        return kind === 121 /* AsyncKeyword */ || 122 /* AwaitKeyword */ || !ts.isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind) || kind === 125 /* DeclareKeyword */ || kind === 130 /* ModuleKeyword */
+                            || ts.isTypeKeyword(kind) && kind !== 141 /* UndefinedKeyword */;
+                    case 2 /* ClassElementKeywords */:
+                        return isClassMemberCompletionKeyword(kind);
+                    case 3 /* InterfaceElementKeywords */:
+                        return isInterfaceOrTypeLiteralCompletionKeyword(kind);
+                    case 4 /* ConstructorParameterKeywords */:
+                        return ts.isParameterPropertyModifier(kind);
+                    case 5 /* FunctionLikeBodyKeywords */:
+                        return isFunctionLikeBodyKeyword(kind);
+                    case 6 /* TypeKeywords */:
+                        return ts.isTypeKeyword(kind);
+                    default:
+                        return ts.Debug.assertNever(keywordFilter);
+                }
+            }));
+        }
+        function isInterfaceOrTypeLiteralCompletionKeyword(kind) {
+            return kind === 133 /* ReadonlyKeyword */;
+        }
+        function isClassMemberCompletionKeyword(kind) {
+            switch (kind) {
+                case 118 /* AbstractKeyword */:
+                case 124 /* ConstructorKeyword */:
+                case 126 /* GetKeyword */:
+                case 137 /* SetKeyword */:
+                case 121 /* AsyncKeyword */:
+                    return true;
+                default:
+                    return ts.isClassMemberModifier(kind);
+            }
+        }
+        function isFunctionLikeBodyKeyword(kind) {
+            return kind === 121 /* AsyncKeyword */ || kind === 122 /* AwaitKeyword */ || !ts.isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
+        }
+        function keywordForNode(node) {
+            return ts.isIdentifier(node) ? node.originalKeywordKind || 0 /* Unknown */ : node.kind;
+        }
+        /** Get the corresponding JSDocTag node if the position is in a jsDoc comment */
+        function getJsDocTagAtPosition(node, position) {
+            var jsdoc = ts.findAncestor(node, ts.isJSDoc);
+            return jsdoc && jsdoc.tags && (ts.rangeContainsPosition(jsdoc, position) ? ts.findLast(jsdoc.tags, function (tag) { return tag.pos < position; }) : undefined);
+        }
+        function getPropertiesForObjectExpression(contextualType, obj, checker) {
+            return contextualType.isUnion()
+                ? checker.getAllPossiblePropertiesOfTypes(contextualType.types.filter(function (memberType) {
+                    // If we're providing completions for an object literal, skip primitive, array-like, or callable types since those shouldn't be implemented by object literals.
+                    return !(memberType.flags & 131068 /* Primitive */ ||
+                        checker.isArrayLikeType(memberType) ||
+                        ts.typeHasCallOrConstructSignatures(memberType, checker) ||
+                        checker.isTypeInvalidDueToUnionDiscriminant(memberType, obj));
+                }))
+                : contextualType.getApparentProperties();
+        }
+        /**
+         * Gets all properties on a type, but if that type is a union of several types,
+         * excludes array-like types or callable/constructable types.
+         */
+        function getPropertiesForCompletion(type, checker) {
+            return type.isUnion()
+                ? ts.Debug.assertEachDefined(checker.getAllPossiblePropertiesOfTypes(type.types), "getAllPossiblePropertiesOfTypes() should all be defined")
+                : ts.Debug.assertEachDefined(type.getApparentProperties(), "getApparentProperties() should all be defined");
+        }
+        /**
+         * Returns the immediate owning class declaration of a context token,
+         * on the condition that one exists and that the context implies completion should be given.
+         */
+        function tryGetObjectTypeDeclarationCompletionContainer(sourceFile, contextToken, location) {
+            // class c { method() { } | method2() { } }
+            switch (location.kind) {
+                case 306 /* SyntaxList */:
+                    return ts.tryCast(location.parent, ts.isObjectTypeDeclaration);
+                case 1 /* EndOfFileToken */:
+                    var cls = ts.tryCast(ts.lastOrUndefined(ts.cast(location.parent, ts.isSourceFile).statements), ts.isObjectTypeDeclaration);
+                    if (cls && !ts.findChildOfKind(cls, 19 /* CloseBraceToken */, sourceFile)) {
+                        return cls;
+                    }
+            }
+            if (!contextToken)
+                return undefined;
+            switch (contextToken.kind) {
+                case 26 /* SemicolonToken */: // class c {getValue(): number; | }
+                case 19 /* CloseBraceToken */: // class c { method() { } | }
+                    // class c { method() { } b| }
+                    return isFromObjectTypeDeclaration(location) && location.parent.name === location
+                        ? location.parent.parent
+                        : ts.tryCast(location, ts.isObjectTypeDeclaration);
+                case 18 /* OpenBraceToken */: // class c { |
+                case 27 /* CommaToken */: // class c {getValue(): number, | }
+                    return ts.tryCast(contextToken.parent, ts.isObjectTypeDeclaration);
+                default:
+                    if (!isFromObjectTypeDeclaration(contextToken))
+                        return undefined;
+                    var isValidKeyword = ts.isClassLike(contextToken.parent.parent) ? isClassMemberCompletionKeyword : isInterfaceOrTypeLiteralCompletionKeyword;
+                    return (isValidKeyword(contextToken.kind) || contextToken.kind === 40 /* AsteriskToken */ || ts.isIdentifier(contextToken) && isValidKeyword(ts.stringToToken(contextToken.text))) // TODO: GH#18217
+                        ? contextToken.parent.parent : undefined;
+            }
+        }
+        // TODO: GH#19856 Would like to return `node is Node & { parent: (ClassElement | TypeElement) & { parent: ObjectTypeDeclaration } }` but then compilation takes > 10 minutes
+        function isFromObjectTypeDeclaration(node) {
+            return node.parent && ts.isClassOrTypeElement(node.parent) && ts.isObjectTypeDeclaration(node.parent.parent);
+        }
+        function isValidTrigger(sourceFile, triggerCharacter, contextToken, position) {
+            switch (triggerCharacter) {
+                case ".":
+                case "@":
+                    return true;
+                case '"':
+                case "'":
+                case "`":
+                    // Only automatically bring up completions if this is an opening quote.
+                    return !!contextToken && ts.isStringLiteralOrTemplate(contextToken) && position === contextToken.getStart(sourceFile) + 1;
+                case "<":
+                    // Opening JSX tag
+                    return !!contextToken && contextToken.kind === 28 /* LessThanToken */ && (!ts.isBinaryExpression(contextToken.parent) || binaryExpressionMayBeOpenTag(contextToken.parent));
+                case "/":
+                    return !!contextToken && (ts.isStringLiteralLike(contextToken)
+                        ? !!ts.tryGetImportFromModuleSpecifier(contextToken)
+                        : contextToken.kind === 42 /* SlashToken */ && ts.isJsxClosingElement(contextToken.parent));
+                default:
+                    return ts.Debug.assertNever(triggerCharacter);
+            }
+        }
+        function binaryExpressionMayBeOpenTag(_a) {
+            var left = _a.left;
+            return ts.nodeIsMissing(left);
+        }
+    })(Completions = ts.Completions || (ts.Completions = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var DocumentHighlights;
+    (function (DocumentHighlights) {
+        function getDocumentHighlights(program, cancellationToken, sourceFile, position, sourceFilesToSearch) {
+            var node = ts.getTouchingPropertyName(sourceFile, position);
+            if (node.parent && (ts.isJsxOpeningElement(node.parent) && node.parent.tagName === node || ts.isJsxClosingElement(node.parent))) {
+                // For a JSX element, just highlight the matching tag, not all references.
+                var _a = node.parent.parent, openingElement = _a.openingElement, closingElement = _a.closingElement;
+                var highlightSpans = [openingElement, closingElement].map(function (_a) {
+                    var tagName = _a.tagName;
+                    return getHighlightSpanForNode(tagName, sourceFile);
+                });
+                return [{ fileName: sourceFile.fileName, highlightSpans: highlightSpans }];
+            }
+            return getSemanticDocumentHighlights(position, node, program, cancellationToken, sourceFilesToSearch) || getSyntacticDocumentHighlights(node, sourceFile);
+        }
+        DocumentHighlights.getDocumentHighlights = getDocumentHighlights;
+        function getHighlightSpanForNode(node, sourceFile) {
+            return {
+                fileName: sourceFile.fileName,
+                textSpan: ts.createTextSpanFromNode(node, sourceFile),
+                kind: "none" /* none */
+            };
+        }
+        function getSemanticDocumentHighlights(position, node, program, cancellationToken, sourceFilesToSearch) {
+            var sourceFilesSet = ts.arrayToSet(sourceFilesToSearch, function (f) { return f.fileName; });
+            var referenceEntries = ts.FindAllReferences.getReferenceEntriesForNode(position, node, program, sourceFilesToSearch, cancellationToken, /*options*/ undefined, sourceFilesSet);
+            if (!referenceEntries)
+                return undefined;
+            var map = ts.arrayToMultiMap(referenceEntries.map(ts.FindAllReferences.toHighlightSpan), function (e) { return e.fileName; }, function (e) { return e.span; });
+            return ts.arrayFrom(map.entries(), function (_a) {
+                var fileName = _a[0], highlightSpans = _a[1];
+                if (!sourceFilesSet.has(fileName)) {
+                    ts.Debug.assert(program.redirectTargetsMap.has(fileName));
+                    var redirectTarget_1 = program.getSourceFile(fileName);
+                    var redirect = ts.find(sourceFilesToSearch, function (f) { return !!f.redirectInfo && f.redirectInfo.redirectTarget === redirectTarget_1; });
+                    fileName = redirect.fileName;
+                    ts.Debug.assert(sourceFilesSet.has(fileName));
+                }
+                return { fileName: fileName, highlightSpans: highlightSpans };
+            });
+        }
+        function getSyntacticDocumentHighlights(node, sourceFile) {
+            var highlightSpans = getHighlightSpans(node, sourceFile);
+            return highlightSpans && [{ fileName: sourceFile.fileName, highlightSpans: highlightSpans }];
+        }
+        function getHighlightSpans(node, sourceFile) {
+            switch (node.kind) {
+                case 91 /* IfKeyword */:
+                case 83 /* ElseKeyword */:
+                    return ts.isIfStatement(node.parent) ? getIfElseOccurrences(node.parent, sourceFile) : undefined;
+                case 97 /* ReturnKeyword */:
+                    return useParent(node.parent, ts.isReturnStatement, getReturnOccurrences);
+                case 101 /* ThrowKeyword */:
+                    return useParent(node.parent, ts.isThrowStatement, getThrowOccurrences);
+                case 103 /* TryKeyword */:
+                case 75 /* CatchKeyword */:
+                case 88 /* FinallyKeyword */:
+                    var tryStatement = node.kind === 75 /* CatchKeyword */ ? node.parent.parent : node.parent;
+                    return useParent(tryStatement, ts.isTryStatement, getTryCatchFinallyOccurrences);
+                case 99 /* SwitchKeyword */:
+                    return useParent(node.parent, ts.isSwitchStatement, getSwitchCaseDefaultOccurrences);
+                case 74 /* CaseKeyword */:
+                case 80 /* DefaultKeyword */:
+                    return useParent(node.parent.parent.parent, ts.isSwitchStatement, getSwitchCaseDefaultOccurrences);
+                case 73 /* BreakKeyword */:
+                case 78 /* ContinueKeyword */:
+                    return useParent(node.parent, ts.isBreakOrContinueStatement, getBreakOrContinueStatementOccurrences);
+                case 89 /* ForKeyword */:
+                case 107 /* WhileKeyword */:
+                case 82 /* DoKeyword */:
+                    return useParent(node.parent, function (n) { return ts.isIterationStatement(n, /*lookInLabeledStatements*/ true); }, getLoopBreakContinueOccurrences);
+                case 124 /* ConstructorKeyword */:
+                    return getFromAllDeclarations(ts.isConstructorDeclaration, [124 /* ConstructorKeyword */]);
+                case 126 /* GetKeyword */:
+                case 137 /* SetKeyword */:
+                    return getFromAllDeclarations(ts.isAccessor, [126 /* GetKeyword */, 137 /* SetKeyword */]);
+                case 122 /* AwaitKeyword */:
+                    return useParent(node.parent, ts.isAwaitExpression, getAsyncAndAwaitOccurrences);
+                case 121 /* AsyncKeyword */:
+                    return highlightSpans(getAsyncAndAwaitOccurrences(node));
+                case 117 /* YieldKeyword */:
+                    return highlightSpans(getYieldOccurrences(node));
+                default:
+                    return ts.isModifierKind(node.kind) && (ts.isDeclaration(node.parent) || ts.isVariableStatement(node.parent))
+                        ? highlightSpans(getModifierOccurrences(node.kind, node.parent))
+                        : undefined;
+            }
+            function getFromAllDeclarations(nodeTest, keywords) {
+                return useParent(node.parent, nodeTest, function (decl) { return ts.mapDefined(decl.symbol.declarations, function (d) {
+                    return nodeTest(d) ? ts.find(d.getChildren(sourceFile), function (c) { return ts.contains(keywords, c.kind); }) : undefined;
+                }); });
+            }
+            function useParent(node, nodeTest, getNodes) {
+                return nodeTest(node) ? highlightSpans(getNodes(node, sourceFile)) : undefined;
+            }
+            function highlightSpans(nodes) {
+                return nodes && nodes.map(function (node) { return getHighlightSpanForNode(node, sourceFile); });
+            }
+        }
+        /**
+         * Aggregates all throw-statements within this node *without* crossing
+         * into function boundaries and try-blocks with catch-clauses.
+         */
+        function aggregateOwnedThrowStatements(node) {
+            if (ts.isThrowStatement(node)) {
+                return [node];
+            }
+            else if (ts.isTryStatement(node)) {
+                // Exceptions thrown within a try block lacking a catch clause are "owned" in the current context.
+                return ts.concatenate(node.catchClause ? aggregateOwnedThrowStatements(node.catchClause) : node.tryBlock && aggregateOwnedThrowStatements(node.tryBlock), node.finallyBlock && aggregateOwnedThrowStatements(node.finallyBlock));
+            }
+            // Do not cross function boundaries.
+            return ts.isFunctionLike(node) ? undefined : flatMapChildren(node, aggregateOwnedThrowStatements);
+        }
+        /**
+         * For lack of a better name, this function takes a throw statement and returns the
+         * nearest ancestor that is a try-block (whose try statement has a catch clause),
+         * function-block, or source file.
+         */
+        function getThrowStatementOwner(throwStatement) {
+            var child = throwStatement;
+            while (child.parent) {
+                var parent = child.parent;
+                if (ts.isFunctionBlock(parent) || parent.kind === 279 /* SourceFile */) {
+                    return parent;
+                }
+                // A throw-statement is only owned by a try-statement if the try-statement has
+                // a catch clause, and if the throw-statement occurs within the try block.
+                if (ts.isTryStatement(parent) && parent.tryBlock === child && parent.catchClause) {
+                    return child;
+                }
+                child = parent;
+            }
+            return undefined;
+        }
+        function aggregateAllBreakAndContinueStatements(node) {
+            return ts.isBreakOrContinueStatement(node) ? [node] : ts.isFunctionLike(node) ? undefined : flatMapChildren(node, aggregateAllBreakAndContinueStatements);
+        }
+        function flatMapChildren(node, cb) {
+            var result = [];
+            node.forEachChild(function (child) {
+                var value = cb(child);
+                if (value !== undefined) {
+                    result.push.apply(result, ts.toArray(value));
+                }
+            });
+            return result;
+        }
+        function ownsBreakOrContinueStatement(owner, statement) {
+            var actualOwner = getBreakOrContinueOwner(statement);
+            return !!actualOwner && actualOwner === owner;
+        }
+        function getBreakOrContinueOwner(statement) {
+            return ts.findAncestor(statement, function (node) {
+                switch (node.kind) {
+                    case 232 /* SwitchStatement */:
+                        if (statement.kind === 228 /* ContinueStatement */) {
+                            return false;
+                        }
+                    // falls through
+                    case 225 /* ForStatement */:
+                    case 226 /* ForInStatement */:
+                    case 227 /* ForOfStatement */:
+                    case 224 /* WhileStatement */:
+                    case 223 /* DoStatement */:
+                        return !statement.label || isLabeledBy(node, statement.label.escapedText);
+                    default:
+                        // Don't cross function boundaries.
+                        // TODO: GH#20090
+                        return ts.isFunctionLike(node) && "quit";
+                }
+            });
+        }
+        function getModifierOccurrences(modifier, declaration) {
+            return ts.mapDefined(getNodesToSearchForModifier(declaration, ts.modifierToFlag(modifier)), function (node) { return ts.findModifier(node, modifier); });
+        }
+        function getNodesToSearchForModifier(declaration, modifierFlag) {
+            // Types of node whose children might have modifiers.
+            var container = declaration.parent;
+            switch (container.kind) {
+                case 245 /* ModuleBlock */:
+                case 279 /* SourceFile */:
+                case 218 /* Block */:
+                case 271 /* CaseClause */:
+                case 272 /* DefaultClause */:
+                    // Container is either a class declaration or the declaration is a classDeclaration
+                    if (modifierFlag & 128 /* Abstract */ && ts.isClassDeclaration(declaration)) {
+                        return declaration.members.concat([declaration]);
+                    }
+                    else {
+                        return container.statements;
+                    }
+                case 157 /* Constructor */:
+                case 156 /* MethodDeclaration */:
+                case 239 /* FunctionDeclaration */:
+                    return container.parameters.concat((ts.isClassLike(container.parent) ? container.parent.members : []));
+                case 240 /* ClassDeclaration */:
+                case 209 /* ClassExpression */:
+                    var nodes = container.members;
+                    // If we're an accessibility modifier, we're in an instance member and should search
+                    // the constructor's parameter list for instance members as well.
+                    if (modifierFlag & 28 /* AccessibilityModifier */) {
+                        var constructor = ts.find(container.members, ts.isConstructorDeclaration);
+                        if (constructor) {
+                            return nodes.concat(constructor.parameters);
+                        }
+                    }
+                    else if (modifierFlag & 128 /* Abstract */) {
+                        return nodes.concat([container]);
+                    }
+                    return nodes;
+                default:
+                    ts.Debug.assertNever(container, "Invalid container kind.");
+            }
+        }
+        function pushKeywordIf(keywordList, token) {
+            var expected = [];
+            for (var _i = 2; _i < arguments.length; _i++) {
+                expected[_i - 2] = arguments[_i];
+            }
+            if (token && ts.contains(expected, token.kind)) {
+                keywordList.push(token);
+                return true;
+            }
+            return false;
+        }
+        function getLoopBreakContinueOccurrences(loopNode) {
+            var keywords = [];
+            if (pushKeywordIf(keywords, loopNode.getFirstToken(), 89 /* ForKeyword */, 107 /* WhileKeyword */, 82 /* DoKeyword */)) {
+                // If we succeeded and got a do-while loop, then start looking for a 'while' keyword.
+                if (loopNode.kind === 223 /* DoStatement */) {
+                    var loopTokens = loopNode.getChildren();
+                    for (var i = loopTokens.length - 1; i >= 0; i--) {
+                        if (pushKeywordIf(keywords, loopTokens[i], 107 /* WhileKeyword */)) {
+                            break;
+                        }
+                    }
+                }
+            }
+            ts.forEach(aggregateAllBreakAndContinueStatements(loopNode.statement), function (statement) {
+                if (ownsBreakOrContinueStatement(loopNode, statement)) {
+                    pushKeywordIf(keywords, statement.getFirstToken(), 73 /* BreakKeyword */, 78 /* ContinueKeyword */);
+                }
+            });
+            return keywords;
+        }
+        function getBreakOrContinueStatementOccurrences(breakOrContinueStatement) {
+            var owner = getBreakOrContinueOwner(breakOrContinueStatement);
+            if (owner) {
+                switch (owner.kind) {
+                    case 225 /* ForStatement */:
+                    case 226 /* ForInStatement */:
+                    case 227 /* ForOfStatement */:
+                    case 223 /* DoStatement */:
+                    case 224 /* WhileStatement */:
+                        return getLoopBreakContinueOccurrences(owner);
+                    case 232 /* SwitchStatement */:
+                        return getSwitchCaseDefaultOccurrences(owner);
+                }
+            }
+            return undefined;
+        }
+        function getSwitchCaseDefaultOccurrences(switchStatement) {
+            var keywords = [];
+            pushKeywordIf(keywords, switchStatement.getFirstToken(), 99 /* SwitchKeyword */);
+            // Go through each clause in the switch statement, collecting the 'case'/'default' keywords.
+            ts.forEach(switchStatement.caseBlock.clauses, function (clause) {
+                pushKeywordIf(keywords, clause.getFirstToken(), 74 /* CaseKeyword */, 80 /* DefaultKeyword */);
+                ts.forEach(aggregateAllBreakAndContinueStatements(clause), function (statement) {
+                    if (ownsBreakOrContinueStatement(switchStatement, statement)) {
+                        pushKeywordIf(keywords, statement.getFirstToken(), 73 /* BreakKeyword */);
+                    }
+                });
+            });
+            return keywords;
+        }
+        function getTryCatchFinallyOccurrences(tryStatement, sourceFile) {
+            var keywords = [];
+            pushKeywordIf(keywords, tryStatement.getFirstToken(), 103 /* TryKeyword */);
+            if (tryStatement.catchClause) {
+                pushKeywordIf(keywords, tryStatement.catchClause.getFirstToken(), 75 /* CatchKeyword */);
+            }
+            if (tryStatement.finallyBlock) {
+                var finallyKeyword = ts.findChildOfKind(tryStatement, 88 /* FinallyKeyword */, sourceFile);
+                pushKeywordIf(keywords, finallyKeyword, 88 /* FinallyKeyword */);
+            }
+            return keywords;
+        }
+        function getThrowOccurrences(throwStatement, sourceFile) {
+            var owner = getThrowStatementOwner(throwStatement);
+            if (!owner) {
+                return undefined;
+            }
+            var keywords = [];
+            ts.forEach(aggregateOwnedThrowStatements(owner), function (throwStatement) {
+                keywords.push(ts.findChildOfKind(throwStatement, 101 /* ThrowKeyword */, sourceFile));
+            });
+            // If the "owner" is a function, then we equate 'return' and 'throw' statements in their
+            // ability to "jump out" of the function, and include occurrences for both.
+            if (ts.isFunctionBlock(owner)) {
+                ts.forEachReturnStatement(owner, function (returnStatement) {
+                    keywords.push(ts.findChildOfKind(returnStatement, 97 /* ReturnKeyword */, sourceFile));
+                });
+            }
+            return keywords;
+        }
+        function getReturnOccurrences(returnStatement, sourceFile) {
+            var func = ts.getContainingFunction(returnStatement);
+            if (!func) {
+                return undefined;
+            }
+            var keywords = [];
+            ts.forEachReturnStatement(ts.cast(func.body, ts.isBlock), function (returnStatement) {
+                keywords.push(ts.findChildOfKind(returnStatement, 97 /* ReturnKeyword */, sourceFile));
+            });
+            // Include 'throw' statements that do not occur within a try block.
+            ts.forEach(aggregateOwnedThrowStatements(func.body), function (throwStatement) {
+                keywords.push(ts.findChildOfKind(throwStatement, 101 /* ThrowKeyword */, sourceFile));
+            });
+            return keywords;
+        }
+        function getAsyncAndAwaitOccurrences(node) {
+            var func = ts.getContainingFunction(node);
+            if (!func) {
+                return undefined;
+            }
+            var keywords = [];
+            if (func.modifiers) {
+                func.modifiers.forEach(function (modifier) {
+                    pushKeywordIf(keywords, modifier, 121 /* AsyncKeyword */);
+                });
+            }
+            ts.forEachChild(func, function (child) {
+                traverseWithoutCrossingFunction(child, function (node) {
+                    if (ts.isAwaitExpression(node)) {
+                        pushKeywordIf(keywords, node.getFirstToken(), 122 /* AwaitKeyword */);
+                    }
+                });
+            });
+            return keywords;
+        }
+        function getYieldOccurrences(node) {
+            var func = ts.getContainingFunction(node);
+            if (!func) {
+                return undefined;
+            }
+            var keywords = [];
+            ts.forEachChild(func, function (child) {
+                traverseWithoutCrossingFunction(child, function (node) {
+                    if (ts.isYieldExpression(node)) {
+                        pushKeywordIf(keywords, node.getFirstToken(), 117 /* YieldKeyword */);
+                    }
+                });
+            });
+            return keywords;
+        }
+        // Do not cross function/class/interface/module/type boundaries.
+        function traverseWithoutCrossingFunction(node, cb) {
+            cb(node);
+            if (!ts.isFunctionLike(node) && !ts.isClassLike(node) && !ts.isInterfaceDeclaration(node) && !ts.isModuleDeclaration(node) && !ts.isTypeAliasDeclaration(node) && !ts.isTypeNode(node)) {
+                ts.forEachChild(node, function (child) { return traverseWithoutCrossingFunction(child, cb); });
+            }
+        }
+        function getIfElseOccurrences(ifStatement, sourceFile) {
+            var keywords = getIfElseKeywords(ifStatement, sourceFile);
+            var result = [];
+            // We'd like to highlight else/ifs together if they are only separated by whitespace
+            // (i.e. the keywords are separated by no comments, no newlines).
+            for (var i = 0; i < keywords.length; i++) {
+                if (keywords[i].kind === 83 /* ElseKeyword */ && i < keywords.length - 1) {
+                    var elseKeyword = keywords[i];
+                    var ifKeyword = keywords[i + 1]; // this *should* always be an 'if' keyword.
+                    var shouldCombineElseAndIf = true;
+                    // Avoid recalculating getStart() by iterating backwards.
+                    for (var j = ifKeyword.getStart(sourceFile) - 1; j >= elseKeyword.end; j--) {
+                        if (!ts.isWhiteSpaceSingleLine(sourceFile.text.charCodeAt(j))) {
+                            shouldCombineElseAndIf = false;
+                            break;
+                        }
+                    }
+                    if (shouldCombineElseAndIf) {
+                        result.push({
+                            fileName: sourceFile.fileName,
+                            textSpan: ts.createTextSpanFromBounds(elseKeyword.getStart(), ifKeyword.end),
+                            kind: "reference" /* reference */
+                        });
+                        i++; // skip the next keyword
+                        continue;
+                    }
+                }
+                // Ordinary case: just highlight the keyword.
+                result.push(getHighlightSpanForNode(keywords[i], sourceFile));
+            }
+            return result;
+        }
+        function getIfElseKeywords(ifStatement, sourceFile) {
+            var keywords = [];
+            // Traverse upwards through all parent if-statements linked by their else-branches.
+            while (ts.isIfStatement(ifStatement.parent) && ifStatement.parent.elseStatement === ifStatement) {
+                ifStatement = ifStatement.parent;
+            }
+            // Now traverse back down through the else branches, aggregating if/else keywords of if-statements.
+            while (true) {
+                var children = ifStatement.getChildren(sourceFile);
+                pushKeywordIf(keywords, children[0], 91 /* IfKeyword */);
+                // Generally the 'else' keyword is second-to-last, so we traverse backwards.
+                for (var i = children.length - 1; i >= 0; i--) {
+                    if (pushKeywordIf(keywords, children[i], 83 /* ElseKeyword */)) {
+                        break;
+                    }
+                }
+                if (!ifStatement.elseStatement || !ts.isIfStatement(ifStatement.elseStatement)) {
+                    break;
+                }
+                ifStatement = ifStatement.elseStatement;
+            }
+            return keywords;
+        }
+        /**
+         * Whether or not a 'node' is preceded by a label of the given string.
+         * Note: 'node' cannot be a SourceFile.
+         */
+        function isLabeledBy(node, labelName) {
+            return !!ts.findAncestor(node.parent, function (owner) { return !ts.isLabeledStatement(owner) ? "quit" : owner.label.escapedText === labelName; });
+        }
+    })(DocumentHighlights = ts.DocumentHighlights || (ts.DocumentHighlights = {}));
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    function createDocumentRegistry(useCaseSensitiveFileNames, currentDirectory) {
+        return createDocumentRegistryInternal(useCaseSensitiveFileNames, currentDirectory);
+    }
+    ts.createDocumentRegistry = createDocumentRegistry;
+    /*@internal*/
+    function createDocumentRegistryInternal(useCaseSensitiveFileNames, currentDirectory, externalCache) {
+        if (currentDirectory === void 0) { currentDirectory = ""; }
+        // Maps from compiler setting target (ES3, ES5, etc.) to all the cached documents we have
+        // for those settings.
+        var buckets = ts.createMap();
+        var getCanonicalFileName = ts.createGetCanonicalFileName(!!useCaseSensitiveFileNames);
+        function reportStats() {
+            var bucketInfoArray = ts.arrayFrom(buckets.keys()).filter(function (name) { return name && name.charAt(0) === "_"; }).map(function (name) {
+                var entries = buckets.get(name);
+                var sourceFiles = [];
+                entries.forEach(function (entry, name) {
+                    sourceFiles.push({
+                        name: name,
+                        refCount: entry.languageServiceRefCount
+                    });
+                });
+                sourceFiles.sort(function (x, y) { return y.refCount - x.refCount; });
+                return {
+                    bucket: name,
+                    sourceFiles: sourceFiles
+                };
+            });
+            return JSON.stringify(bucketInfoArray, undefined, 2);
+        }
+        function acquireDocument(fileName, compilationSettings, scriptSnapshot, version, scriptKind) {
+            var path = ts.toPath(fileName, currentDirectory, getCanonicalFileName);
+            var key = getKeyForCompilationSettings(compilationSettings);
+            return acquireDocumentWithKey(fileName, path, compilationSettings, key, scriptSnapshot, version, scriptKind);
+        }
+        function acquireDocumentWithKey(fileName, path, compilationSettings, key, scriptSnapshot, version, scriptKind) {
+            return acquireOrUpdateDocument(fileName, path, compilationSettings, key, scriptSnapshot, version, /*acquiring*/ true, scriptKind);
+        }
+        function updateDocument(fileName, compilationSettings, scriptSnapshot, version, scriptKind) {
+            var path = ts.toPath(fileName, currentDirectory, getCanonicalFileName);
+            var key = getKeyForCompilationSettings(compilationSettings);
+            return updateDocumentWithKey(fileName, path, compilationSettings, key, scriptSnapshot, version, scriptKind);
+        }
+        function updateDocumentWithKey(fileName, path, compilationSettings, key, scriptSnapshot, version, scriptKind) {
+            return acquireOrUpdateDocument(fileName, path, compilationSettings, key, scriptSnapshot, version, /*acquiring*/ false, scriptKind);
+        }
+        function acquireOrUpdateDocument(fileName, path, compilationSettings, key, scriptSnapshot, version, acquiring, scriptKind) {
+            var bucket = ts.getOrUpdate(buckets, key, ts.createMap);
+            var entry = bucket.get(path);
+            var scriptTarget = scriptKind === 6 /* JSON */ ? 100 /* JSON */ : compilationSettings.target || 1 /* ES5 */;
+            if (!entry && externalCache) {
+                var sourceFile = externalCache.getDocument(key, path);
+                if (sourceFile) {
+                    ts.Debug.assert(acquiring);
+                    entry = {
+                        sourceFile: sourceFile,
+                        languageServiceRefCount: 0
+                    };
+                    bucket.set(path, entry);
+                }
+            }
+            if (!entry) {
+                // Have never seen this file with these settings.  Create a new source file for it.
+                var sourceFile = ts.createLanguageServiceSourceFile(fileName, scriptSnapshot, scriptTarget, version, /*setNodeParents*/ false, scriptKind);
+                if (externalCache) {
+                    externalCache.setDocument(key, path, sourceFile);
+                }
+                entry = {
+                    sourceFile: sourceFile,
+                    languageServiceRefCount: 1,
+                };
+                bucket.set(path, entry);
+            }
+            else {
+                // We have an entry for this file.  However, it may be for a different version of
+                // the script snapshot.  If so, update it appropriately.  Otherwise, we can just
+                // return it as is.
+                if (entry.sourceFile.version !== version) {
+                    entry.sourceFile = ts.updateLanguageServiceSourceFile(entry.sourceFile, scriptSnapshot, version, scriptSnapshot.getChangeRange(entry.sourceFile.scriptSnapshot)); // TODO: GH#18217
+                    if (externalCache) {
+                        externalCache.setDocument(key, path, entry.sourceFile);
+                    }
+                }
+                // If we're acquiring, then this is the first time this LS is asking for this document.
+                // Increase our ref count so we know there's another LS using the document.  If we're
+                // not acquiring, then that means the LS is 'updating' the file instead, and that means
+                // it has already acquired the document previously.  As such, we do not need to increase
+                // the ref count.
+                if (acquiring) {
+                    entry.languageServiceRefCount++;
+                }
+            }
+            ts.Debug.assert(entry.languageServiceRefCount !== 0);
+            return entry.sourceFile;
+        }
+        function releaseDocument(fileName, compilationSettings) {
+            var path = ts.toPath(fileName, currentDirectory, getCanonicalFileName);
+            var key = getKeyForCompilationSettings(compilationSettings);
+            return releaseDocumentWithKey(path, key);
+        }
+        function releaseDocumentWithKey(path, key) {
+            var bucket = ts.Debug.assertDefined(buckets.get(key));
+            var entry = bucket.get(path);
+            entry.languageServiceRefCount--;
+            ts.Debug.assert(entry.languageServiceRefCount >= 0);
+            if (entry.languageServiceRefCount === 0) {
+                bucket.delete(path);
+            }
+        }
+        function getLanguageServiceRefCounts(path) {
+            return ts.arrayFrom(buckets.entries(), function (_a) {
+                var key = _a[0], bucket = _a[1];
+                var entry = bucket.get(path);
+                return [key, entry && entry.languageServiceRefCount];
+            });
+        }
+        return {
+            acquireDocument: acquireDocument,
+            acquireDocumentWithKey: acquireDocumentWithKey,
+            updateDocument: updateDocument,
+            updateDocumentWithKey: updateDocumentWithKey,
+            releaseDocument: releaseDocument,
+            releaseDocumentWithKey: releaseDocumentWithKey,
+            getLanguageServiceRefCounts: getLanguageServiceRefCounts,
+            reportStats: reportStats,
+            getKeyForCompilationSettings: getKeyForCompilationSettings
+        };
+    }
+    ts.createDocumentRegistryInternal = createDocumentRegistryInternal;
+    function getKeyForCompilationSettings(settings) {
+        return ts.sourceFileAffectingCompilerOptions.map(function (option) { return ts.getCompilerOptionValue(settings, option); }).join("|");
+    }
+})(ts || (ts = {}));
+/* Code for finding imports of an exported symbol. Used only by FindAllReferences. */
+/* @internal */
+var ts;
+(function (ts) {
+    var FindAllReferences;
+    (function (FindAllReferences) {
+        /** Creates the imports map and returns an ImportTracker that uses it. Call this lazily to avoid calling `getDirectImportsMap` unnecessarily.  */
+        function createImportTracker(sourceFiles, sourceFilesSet, checker, cancellationToken) {
+            var allDirectImports = getDirectImportsMap(sourceFiles, checker, cancellationToken);
+            return function (exportSymbol, exportInfo, isForRename) {
+                var _a = getImportersForExport(sourceFiles, sourceFilesSet, allDirectImports, exportInfo, checker, cancellationToken), directImports = _a.directImports, indirectUsers = _a.indirectUsers;
+                return __assign({ indirectUsers: indirectUsers }, getSearchesFromDirectImports(directImports, exportSymbol, exportInfo.exportKind, checker, isForRename));
+            };
+        }
+        FindAllReferences.createImportTracker = createImportTracker;
+        var ExportKind;
+        (function (ExportKind) {
+            ExportKind[ExportKind["Named"] = 0] = "Named";
+            ExportKind[ExportKind["Default"] = 1] = "Default";
+            ExportKind[ExportKind["ExportEquals"] = 2] = "ExportEquals";
+        })(ExportKind = FindAllReferences.ExportKind || (FindAllReferences.ExportKind = {}));
+        var ImportExport;
+        (function (ImportExport) {
+            ImportExport[ImportExport["Import"] = 0] = "Import";
+            ImportExport[ImportExport["Export"] = 1] = "Export";
+        })(ImportExport = FindAllReferences.ImportExport || (FindAllReferences.ImportExport = {}));
+        /** Returns import statements that directly reference the exporting module, and a list of files that may access the module through a namespace. */
+        function getImportersForExport(sourceFiles, sourceFilesSet, allDirectImports, _a, checker, cancellationToken) {
+            var exportingModuleSymbol = _a.exportingModuleSymbol, exportKind = _a.exportKind;
+            var markSeenDirectImport = ts.nodeSeenTracker();
+            var markSeenIndirectUser = ts.nodeSeenTracker();
+            var directImports = [];
+            var isAvailableThroughGlobal = !!exportingModuleSymbol.globalExports;
+            var indirectUserDeclarations = isAvailableThroughGlobal ? undefined : [];
+            handleDirectImports(exportingModuleSymbol);
+            return { directImports: directImports, indirectUsers: getIndirectUsers() };
+            function getIndirectUsers() {
+                if (isAvailableThroughGlobal) {
+                    // It has `export as namespace`, so anything could potentially use it.
+                    return sourceFiles;
+                }
+                // Module augmentations may use this module's exports without importing it.
+                for (var _i = 0, _a = exportingModuleSymbol.declarations; _i < _a.length; _i++) {
+                    var decl = _a[_i];
+                    if (ts.isExternalModuleAugmentation(decl) && sourceFilesSet.has(decl.getSourceFile().fileName)) {
+                        addIndirectUser(decl);
+                    }
+                }
+                // This may return duplicates (if there are multiple module declarations in a single source file, all importing the same thing as a namespace), but `State.markSearchedSymbol` will handle that.
+                return indirectUserDeclarations.map(ts.getSourceFileOfNode);
+            }
+            function handleDirectImports(exportingModuleSymbol) {
+                var theseDirectImports = getDirectImports(exportingModuleSymbol);
+                if (theseDirectImports) {
+                    for (var _i = 0, theseDirectImports_1 = theseDirectImports; _i < theseDirectImports_1.length; _i++) {
+                        var direct = theseDirectImports_1[_i];
+                        if (!markSeenDirectImport(direct)) {
+                            continue;
+                        }
+                        if (cancellationToken)
+                            cancellationToken.throwIfCancellationRequested();
+                        switch (direct.kind) {
+                            case 191 /* CallExpression */:
+                                if (!isAvailableThroughGlobal) {
+                                    var parent = direct.parent;
+                                    if (exportKind === 2 /* ExportEquals */ && parent.kind === 237 /* VariableDeclaration */) {
+                                        var name = parent.name;
+                                        if (name.kind === 72 /* Identifier */) {
+                                            directImports.push(name);
+                                            break;
+                                        }
+                                    }
+                                    // Don't support re-exporting 'require()' calls, so just add a single indirect user.
+                                    addIndirectUser(direct.getSourceFile());
+                                }
+                                break;
+                            case 72 /* Identifier */: // for 'const x = require("y");
+                                break; // TODO: GH#23879
+                            case 248 /* ImportEqualsDeclaration */:
+                                handleNamespaceImport(direct, direct.name, ts.hasModifier(direct, 1 /* Export */), /*alreadyAddedDirect*/ false);
+                                break;
+                            case 249 /* ImportDeclaration */:
+                                directImports.push(direct);
+                                var namedBindings = direct.importClause && direct.importClause.namedBindings;
+                                if (namedBindings && namedBindings.kind === 251 /* NamespaceImport */) {
+                                    handleNamespaceImport(direct, namedBindings.name, /*isReExport*/ false, /*alreadyAddedDirect*/ true);
+                                }
+                                else if (!isAvailableThroughGlobal && ts.isDefaultImport(direct)) {
+                                    addIndirectUser(getSourceFileLikeForImportDeclaration(direct)); // Add a check for indirect uses to handle synthetic default imports
+                                }
+                                break;
+                            case 255 /* ExportDeclaration */:
+                                if (!direct.exportClause) {
+                                    // This is `export * from "foo"`, so imports of this module may import the export too.
+                                    handleDirectImports(getContainingModuleSymbol(direct, checker));
+                                }
+                                else {
+                                    // This is `export { foo } from "foo"` and creates an alias symbol, so recursive search will get handle re-exports.
+                                    directImports.push(direct);
+                                }
+                                break;
+                            case 183 /* ImportType */:
+                                directImports.push(direct);
+                                break;
+                            default:
+                                ts.Debug.assertNever(direct, "Unexpected import kind: " + ts.Debug.showSyntaxKind(direct));
+                        }
+                    }
+                }
+            }
+            function handleNamespaceImport(importDeclaration, name, isReExport, alreadyAddedDirect) {
+                if (exportKind === 2 /* ExportEquals */) {
+                    // This is a direct import, not import-as-namespace.
+                    if (!alreadyAddedDirect)
+                        directImports.push(importDeclaration);
+                }
+                else if (!isAvailableThroughGlobal) {
+                    var sourceFileLike = getSourceFileLikeForImportDeclaration(importDeclaration);
+                    ts.Debug.assert(sourceFileLike.kind === 279 /* SourceFile */ || sourceFileLike.kind === 244 /* ModuleDeclaration */);
+                    if (isReExport || findNamespaceReExports(sourceFileLike, name, checker)) {
+                        addIndirectUsers(sourceFileLike);
+                    }
+                    else {
+                        addIndirectUser(sourceFileLike);
+                    }
+                }
+            }
+            function addIndirectUser(sourceFileLike) {
+                ts.Debug.assert(!isAvailableThroughGlobal);
+                var isNew = markSeenIndirectUser(sourceFileLike);
+                if (isNew) {
+                    indirectUserDeclarations.push(sourceFileLike); // TODO: GH#18217
+                }
+                return isNew;
+            }
+            /** Adds a module and all of its transitive dependencies as possible indirect users. */
+            function addIndirectUsers(sourceFileLike) {
+                if (!addIndirectUser(sourceFileLike)) {
+                    return;
+                }
+                var moduleSymbol = checker.getMergedSymbol(sourceFileLike.symbol);
+                ts.Debug.assert(!!(moduleSymbol.flags & 1536 /* Module */));
+                var directImports = getDirectImports(moduleSymbol);
+                if (directImports) {
+                    for (var _i = 0, directImports_1 = directImports; _i < directImports_1.length; _i++) {
+                        var directImport = directImports_1[_i];
+                        addIndirectUsers(getSourceFileLikeForImportDeclaration(directImport));
+                    }
+                }
+            }
+            function getDirectImports(moduleSymbol) {
+                return allDirectImports.get(ts.getSymbolId(moduleSymbol).toString());
+            }
+        }
+        /**
+         * Given the set of direct imports of a module, we need to find which ones import the particular exported symbol.
+         * The returned `importSearches` will result in the entire source file being searched.
+         * But re-exports will be placed in 'singleReferences' since they cannot be locally referenced.
+         */
+        function getSearchesFromDirectImports(directImports, exportSymbol, exportKind, checker, isForRename) {
+            var importSearches = [];
+            var singleReferences = [];
+            function addSearch(location, symbol) {
+                importSearches.push([location, symbol]);
+            }
+            if (directImports) {
+                for (var _i = 0, directImports_2 = directImports; _i < directImports_2.length; _i++) {
+                    var decl = directImports_2[_i];
+                    handleImport(decl);
+                }
+            }
+            return { importSearches: importSearches, singleReferences: singleReferences };
+            function handleImport(decl) {
+                if (decl.kind === 248 /* ImportEqualsDeclaration */) {
+                    if (isExternalModuleImportEquals(decl)) {
+                        handleNamespaceImportLike(decl.name);
+                    }
+                    return;
+                }
+                if (decl.kind === 72 /* Identifier */) {
+                    handleNamespaceImportLike(decl);
+                    return;
+                }
+                if (decl.kind === 183 /* ImportType */) {
+                    if (decl.qualifier) {
+                        if (ts.isIdentifier(decl.qualifier) && decl.qualifier.escapedText === ts.symbolName(exportSymbol)) {
+                            singleReferences.push(decl.qualifier);
+                        }
+                    }
+                    else if (exportKind === 2 /* ExportEquals */) {
+                        singleReferences.push(decl.argument.literal);
+                    }
+                    return;
+                }
+                // Ignore if there's a grammar error
+                if (decl.moduleSpecifier.kind !== 10 /* StringLiteral */) {
+                    return;
+                }
+                if (decl.kind === 255 /* ExportDeclaration */) {
+                    searchForNamedImport(decl.exportClause);
+                    return;
+                }
+                var _a = decl.importClause || { name: undefined, namedBindings: undefined }, name = _a.name, namedBindings = _a.namedBindings;
+                if (namedBindings) {
+                    switch (namedBindings.kind) {
+                        case 251 /* NamespaceImport */:
+                            handleNamespaceImportLike(namedBindings.name);
+                            break;
+                        case 252 /* NamedImports */:
+                            // 'default' might be accessed as a named import `{ default as foo }`.
+                            if (exportKind === 0 /* Named */ || exportKind === 1 /* Default */) {
+                                searchForNamedImport(namedBindings);
+                            }
+                            break;
+                        default:
+                            ts.Debug.assertNever(namedBindings);
+                    }
+                }
+                // `export =` might be imported by a default import if `--allowSyntheticDefaultImports` is on, so this handles both ExportKind.Default and ExportKind.ExportEquals.
+                // If a default import has the same name as the default export, allow to rename it.
+                // Given `import f` and `export default function f`, we will rename both, but for `import g` we will rename just that.
+                if (name && (exportKind === 1 /* Default */ || exportKind === 2 /* ExportEquals */) && (!isForRename || name.escapedText === ts.symbolEscapedNameNoDefault(exportSymbol))) {
+                    var defaultImportAlias = checker.getSymbolAtLocation(name);
+                    addSearch(name, defaultImportAlias);
+                }
+            }
+            /**
+             * `import x = require("./x") or `import * as x from "./x"`.
+             * An `export =` may be imported by this syntax, so it may be a direct import.
+             * If it's not a direct import, it will be in `indirectUsers`, so we don't have to do anything here.
+             */
+            function handleNamespaceImportLike(importName) {
+                // Don't rename an import that already has a different name than the export.
+                if (exportKind === 2 /* ExportEquals */ && (!isForRename || isNameMatch(importName.escapedText))) {
+                    addSearch(importName, checker.getSymbolAtLocation(importName));
+                }
+            }
+            function searchForNamedImport(namedBindings) {
+                if (!namedBindings) {
+                    return;
+                }
+                for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
+                    var element = _a[_i];
+                    var name = element.name, propertyName = element.propertyName;
+                    if (!isNameMatch((propertyName || name).escapedText)) {
+                        continue;
+                    }
+                    if (propertyName) {
+                        // This is `import { foo as bar } from "./a"` or `export { foo as bar } from "./a"`. `foo` isn't a local in the file, so just add it as a single reference.
+                        singleReferences.push(propertyName);
+                        // If renaming `{ foo as bar }`, don't touch `bar`, just `foo`.
+                        // But do rename `foo` in ` { default as foo }` if that's the original export name.
+                        if (!isForRename || name.escapedText === exportSymbol.escapedName) {
+                            // Search locally for `bar`.
+                            addSearch(name, checker.getSymbolAtLocation(name));
+                        }
+                    }
+                    else {
+                        var localSymbol = element.kind === 257 /* ExportSpecifier */ && element.propertyName
+                            ? checker.getExportSpecifierLocalTargetSymbol(element) // For re-exporting under a different name, we want to get the re-exported symbol.
+                            : checker.getSymbolAtLocation(name);
+                        addSearch(name, localSymbol);
+                    }
+                }
+            }
+            function isNameMatch(name) {
+                // Use name of "default" even in `export =` case because we may have allowSyntheticDefaultImports
+                return name === exportSymbol.escapedName || exportKind !== 0 /* Named */ && name === "default" /* Default */;
+            }
+        }
+        /** Returns 'true' is the namespace 'name' is re-exported from this module, and 'false' if it is only used locally. */
+        function findNamespaceReExports(sourceFileLike, name, checker) {
+            var namespaceImportSymbol = checker.getSymbolAtLocation(name);
+            return !!forEachPossibleImportOrExportStatement(sourceFileLike, function (statement) {
+                if (!ts.isExportDeclaration(statement))
+                    return;
+                var exportClause = statement.exportClause, moduleSpecifier = statement.moduleSpecifier;
+                return !moduleSpecifier && exportClause &&
+                    exportClause.elements.some(function (element) { return checker.getExportSpecifierLocalTargetSymbol(element) === namespaceImportSymbol; });
+            });
+        }
+        function findModuleReferences(program, sourceFiles, searchModuleSymbol) {
+            var refs = [];
+            var checker = program.getTypeChecker();
+            for (var _i = 0, sourceFiles_3 = sourceFiles; _i < sourceFiles_3.length; _i++) {
+                var referencingFile = sourceFiles_3[_i];
+                var searchSourceFile = searchModuleSymbol.valueDeclaration;
+                if (searchSourceFile.kind === 279 /* SourceFile */) {
+                    for (var _a = 0, _b = referencingFile.referencedFiles; _a < _b.length; _a++) {
+                        var ref = _b[_a];
+                        if (program.getSourceFileFromReference(referencingFile, ref) === searchSourceFile) {
+                            refs.push({ kind: "reference", referencingFile: referencingFile, ref: ref });
+                        }
+                    }
+                    for (var _c = 0, _d = referencingFile.typeReferenceDirectives; _c < _d.length; _c++) {
+                        var ref = _d[_c];
+                        var referenced = program.getResolvedTypeReferenceDirectives().get(ref.fileName);
+                        if (referenced !== undefined && referenced.resolvedFileName === searchSourceFile.fileName) {
+                            refs.push({ kind: "reference", referencingFile: referencingFile, ref: ref });
+                        }
+                    }
+                }
+                forEachImport(referencingFile, function (_importDecl, moduleSpecifier) {
+                    var moduleSymbol = checker.getSymbolAtLocation(moduleSpecifier);
+                    if (moduleSymbol === searchModuleSymbol) {
+                        refs.push({ kind: "import", literal: moduleSpecifier });
+                    }
+                });
+            }
+            return refs;
+        }
+        FindAllReferences.findModuleReferences = findModuleReferences;
+        /** Returns a map from a module symbol Id to all import statements that directly reference the module. */
+        function getDirectImportsMap(sourceFiles, checker, cancellationToken) {
+            var map = ts.createMap();
+            for (var _i = 0, sourceFiles_4 = sourceFiles; _i < sourceFiles_4.length; _i++) {
+                var sourceFile = sourceFiles_4[_i];
+                if (cancellationToken)
+                    cancellationToken.throwIfCancellationRequested();
+                forEachImport(sourceFile, function (importDecl, moduleSpecifier) {
+                    var moduleSymbol = checker.getSymbolAtLocation(moduleSpecifier);
+                    if (moduleSymbol) {
+                        var id = ts.getSymbolId(moduleSymbol).toString();
+                        var imports = map.get(id);
+                        if (!imports) {
+                            map.set(id, imports = []);
+                        }
+                        imports.push(importDecl);
+                    }
+                });
+            }
+            return map;
+        }
+        /** Iterates over all statements at the top level or in module declarations. Returns the first truthy result. */
+        function forEachPossibleImportOrExportStatement(sourceFileLike, action) {
+            return ts.forEach(sourceFileLike.kind === 279 /* SourceFile */ ? sourceFileLike.statements : sourceFileLike.body.statements, function (statement) {
+                return action(statement) || (isAmbientModuleDeclaration(statement) && ts.forEach(statement.body && statement.body.statements, action));
+            });
+        }
+        /** Calls `action` for each import, re-export, or require() in a file. */
+        function forEachImport(sourceFile, action) {
+            if (sourceFile.externalModuleIndicator || sourceFile.imports !== undefined) {
+                for (var _i = 0, _a = sourceFile.imports; _i < _a.length; _i++) {
+                    var i = _a[_i];
+                    action(ts.importFromModuleSpecifier(i), i);
+                }
+            }
+            else {
+                forEachPossibleImportOrExportStatement(sourceFile, function (statement) {
+                    switch (statement.kind) {
+                        case 255 /* ExportDeclaration */:
+                        case 249 /* ImportDeclaration */: {
+                            var decl = statement;
+                            if (decl.moduleSpecifier && ts.isStringLiteral(decl.moduleSpecifier)) {
+                                action(decl, decl.moduleSpecifier);
+                            }
+                            break;
+                        }
+                        case 248 /* ImportEqualsDeclaration */: {
+                            var decl = statement;
+                            if (isExternalModuleImportEquals(decl)) {
+                                action(decl, decl.moduleReference.expression);
+                            }
+                            break;
+                        }
+                    }
+                });
+            }
+        }
+        /**
+         * Given a local reference, we might notice that it's an import/export and recursively search for references of that.
+         * If at an import, look locally for the symbol it imports.
+         * If an an export, look for all imports of it.
+         * This doesn't handle export specifiers; that is done in `getReferencesAtExportSpecifier`.
+         * @param comingFromExport If we are doing a search for all exports, don't bother looking backwards for the imported symbol, since that's the reason we're here.
+         */
+        function getImportOrExportSymbol(node, symbol, checker, comingFromExport) {
+            return comingFromExport ? getExport() : getExport() || getImport();
+            function getExport() {
+                var parent = node.parent;
+                var grandParent = parent.parent;
+                if (symbol.exportSymbol) {
+                    if (parent.kind === 189 /* PropertyAccessExpression */) {
+                        // When accessing an export of a JS module, there's no alias. The symbol will still be flagged as an export even though we're at the use.
+                        // So check that we are at the declaration.
+                        return symbol.declarations.some(function (d) { return d === parent; }) && ts.isBinaryExpression(grandParent)
+                            ? getSpecialPropertyExport(grandParent, /*useLhsSymbol*/ false)
+                            : undefined;
+                    }
+                    else {
+                        return exportInfo(symbol.exportSymbol, getExportKindForDeclaration(parent));
+                    }
+                }
+                else {
+                    var exportNode = getExportNode(parent, node);
+                    if (exportNode && ts.hasModifier(exportNode, 1 /* Export */)) {
+                        if (ts.isImportEqualsDeclaration(exportNode) && exportNode.moduleReference === node) {
+                            // We're at `Y` in `export import X = Y`. This is not the exported symbol, the left-hand-side is. So treat this as an import statement.
+                            if (comingFromExport) {
+                                return undefined;
+                            }
+                            var lhsSymbol = checker.getSymbolAtLocation(exportNode.name);
+                            return { kind: 0 /* Import */, symbol: lhsSymbol };
+                        }
+                        else {
+                            return exportInfo(symbol, getExportKindForDeclaration(exportNode));
+                        }
+                    }
+                    // If we are in `export = a;` or `export default a;`, `parent` is the export assignment.
+                    else if (ts.isExportAssignment(parent)) {
+                        return getExportAssignmentExport(parent);
+                    }
+                    // If we are in `export = class A {};` (or `export = class A {};`) at `A`, `parent.parent` is the export assignment.
+                    else if (ts.isExportAssignment(grandParent)) {
+                        return getExportAssignmentExport(grandParent);
+                    }
+                    // Similar for `module.exports =` and `exports.A =`.
+                    else if (ts.isBinaryExpression(parent)) {
+                        return getSpecialPropertyExport(parent, /*useLhsSymbol*/ true);
+                    }
+                    else if (ts.isBinaryExpression(grandParent)) {
+                        return getSpecialPropertyExport(grandParent, /*useLhsSymbol*/ true);
+                    }
+                    else if (ts.isJSDocTypedefTag(parent)) {
+                        return exportInfo(symbol, 0 /* Named */);
+                    }
+                }
+                function getExportAssignmentExport(ex) {
+                    // Get the symbol for the `export =` node; its parent is the module it's the export of.
+                    var exportingModuleSymbol = ts.Debug.assertDefined(ex.symbol.parent, "Expected export symbol to have a parent");
+                    var exportKind = ex.isExportEquals ? 2 /* ExportEquals */ : 1 /* Default */;
+                    return { kind: 1 /* Export */, symbol: symbol, exportInfo: { exportingModuleSymbol: exportingModuleSymbol, exportKind: exportKind } };
+                }
+                function getSpecialPropertyExport(node, useLhsSymbol) {
+                    var kind;
+                    switch (ts.getAssignmentDeclarationKind(node)) {
+                        case 1 /* ExportsProperty */:
+                            kind = 0 /* Named */;
+                            break;
+                        case 2 /* ModuleExports */:
+                            kind = 2 /* ExportEquals */;
+                            break;
+                        default:
+                            return undefined;
+                    }
+                    var sym = useLhsSymbol ? checker.getSymbolAtLocation(ts.cast(node.left, ts.isPropertyAccessExpression).name) : symbol;
+                    // Better detection for GH#20803
+                    if (sym && !(checker.getMergedSymbol(sym.parent).flags & 1536 /* Module */)) {
+                        ts.Debug.fail("Special property assignment kind does not have a module as its parent. Assignment is " + ts.Debug.showSymbol(sym) + ", parent is " + ts.Debug.showSymbol(sym.parent));
+                    }
+                    return sym && exportInfo(sym, kind);
+                }
+            }
+            function getImport() {
+                var isImport = isNodeImport(node);
+                if (!isImport)
+                    return undefined;
+                // A symbol being imported is always an alias. So get what that aliases to find the local symbol.
+                var importedSymbol = checker.getImmediateAliasedSymbol(symbol);
+                if (!importedSymbol)
+                    return undefined;
+                // Search on the local symbol in the exporting module, not the exported symbol.
+                importedSymbol = skipExportSpecifierSymbol(importedSymbol, checker);
+                // Similarly, skip past the symbol for 'export ='
+                if (importedSymbol.escapedName === "export=") {
+                    importedSymbol = getExportEqualsLocalSymbol(importedSymbol, checker);
+                }
+                // If the import has a different name than the export, do not continue searching.
+                // If `importedName` is undefined, do continue searching as the export is anonymous.
+                // (All imports returned from this function will be ignored anyway if we are in rename and this is a not a named export.)
+                var importedName = ts.symbolEscapedNameNoDefault(importedSymbol);
+                if (importedName === undefined || importedName === "default" /* Default */ || importedName === symbol.escapedName) {
+                    return { kind: 0 /* Import */, symbol: importedSymbol };
+                }
+            }
+            function exportInfo(symbol, kind) {
+                var exportInfo = getExportInfo(symbol, kind, checker);
+                return exportInfo && { kind: 1 /* Export */, symbol: symbol, exportInfo: exportInfo };
+            }
+            // Not meant for use with export specifiers or export assignment.
+            function getExportKindForDeclaration(node) {
+                return ts.hasModifier(node, 512 /* Default */) ? 1 /* Default */ : 0 /* Named */;
+            }
+        }
+        FindAllReferences.getImportOrExportSymbol = getImportOrExportSymbol;
+        function getExportEqualsLocalSymbol(importedSymbol, checker) {
+            if (importedSymbol.flags & 2097152 /* Alias */) {
+                return ts.Debug.assertDefined(checker.getImmediateAliasedSymbol(importedSymbol));
+            }
+            var decl = importedSymbol.valueDeclaration;
+            if (ts.isExportAssignment(decl)) { // `export = class {}`
+                return ts.Debug.assertDefined(decl.expression.symbol);
+            }
+            else if (ts.isBinaryExpression(decl)) { // `module.exports = class {}`
+                return ts.Debug.assertDefined(decl.right.symbol);
+            }
+            else if (ts.isSourceFile(decl)) { // json module
+                return ts.Debug.assertDefined(decl.symbol);
+            }
+            return ts.Debug.fail();
+        }
+        // If a reference is a class expression, the exported node would be its parent.
+        // If a reference is a variable declaration, the exported node would be the variable statement.
+        function getExportNode(parent, node) {
+            if (parent.kind === 237 /* VariableDeclaration */) {
+                var p = parent;
+                return p.name !== node ? undefined :
+                    p.parent.kind === 274 /* CatchClause */ ? undefined : p.parent.parent.kind === 219 /* VariableStatement */ ? p.parent.parent : undefined;
+            }
+            else {
+                return parent;
+            }
+        }
+        function isNodeImport(node) {
+            var parent = node.parent;
+            switch (parent.kind) {
+                case 248 /* ImportEqualsDeclaration */:
+                    return parent.name === node && isExternalModuleImportEquals(parent);
+                case 253 /* ImportSpecifier */:
+                    // For a rename import `{ foo as bar }`, don't search for the imported symbol. Just find local uses of `bar`.
+                    return !parent.propertyName;
+                case 250 /* ImportClause */:
+                case 251 /* NamespaceImport */:
+                    ts.Debug.assert(parent.name === node);
+                    return true;
+                default:
+                    return false;
+            }
+        }
+        function getExportInfo(exportSymbol, exportKind, checker) {
+            var moduleSymbol = exportSymbol.parent;
+            if (!moduleSymbol)
+                return undefined; // This can happen if an `export` is not at the top-level (which is a compile error).
+            var exportingModuleSymbol = checker.getMergedSymbol(moduleSymbol); // Need to get merged symbol in case there's an augmentation.
+            // `export` may appear in a namespace. In that case, just rely on global search.
+            return ts.isExternalModuleSymbol(exportingModuleSymbol) ? { exportingModuleSymbol: exportingModuleSymbol, exportKind: exportKind } : undefined;
+        }
+        FindAllReferences.getExportInfo = getExportInfo;
+        /** If at an export specifier, go to the symbol it refers to. */
+        function skipExportSpecifierSymbol(symbol, checker) {
+            // For `export { foo } from './bar", there's nothing to skip, because it does not create a new alias. But `export { foo } does.
+            if (symbol.declarations) {
+                for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                    var declaration = _a[_i];
+                    if (ts.isExportSpecifier(declaration) && !declaration.propertyName && !declaration.parent.parent.moduleSpecifier) {
+                        return checker.getExportSpecifierLocalTargetSymbol(declaration);
+                    }
+                }
+            }
+            return symbol;
+        }
+        function getContainingModuleSymbol(importer, checker) {
+            return checker.getMergedSymbol(getSourceFileLikeForImportDeclaration(importer).symbol);
+        }
+        function getSourceFileLikeForImportDeclaration(node) {
+            if (node.kind === 191 /* CallExpression */) {
+                return node.getSourceFile();
+            }
+            var parent = node.parent;
+            if (parent.kind === 279 /* SourceFile */) {
+                return parent;
+            }
+            ts.Debug.assert(parent.kind === 245 /* ModuleBlock */);
+            return ts.cast(parent.parent, isAmbientModuleDeclaration);
+        }
+        function isAmbientModuleDeclaration(node) {
+            return node.kind === 244 /* ModuleDeclaration */ && node.name.kind === 10 /* StringLiteral */;
+        }
+        function isExternalModuleImportEquals(eq) {
+            return eq.moduleReference.kind === 259 /* ExternalModuleReference */ && eq.moduleReference.expression.kind === 10 /* StringLiteral */;
+        }
+    })(FindAllReferences = ts.FindAllReferences || (ts.FindAllReferences = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var FindAllReferences;
+    (function (FindAllReferences) {
+        var DefinitionKind;
+        (function (DefinitionKind) {
+            DefinitionKind[DefinitionKind["Symbol"] = 0] = "Symbol";
+            DefinitionKind[DefinitionKind["Label"] = 1] = "Label";
+            DefinitionKind[DefinitionKind["Keyword"] = 2] = "Keyword";
+            DefinitionKind[DefinitionKind["This"] = 3] = "This";
+            DefinitionKind[DefinitionKind["String"] = 4] = "String";
+        })(DefinitionKind = FindAllReferences.DefinitionKind || (FindAllReferences.DefinitionKind = {}));
+        var EntryKind;
+        (function (EntryKind) {
+            EntryKind[EntryKind["Span"] = 0] = "Span";
+            EntryKind[EntryKind["Node"] = 1] = "Node";
+            EntryKind[EntryKind["StringLiteral"] = 2] = "StringLiteral";
+            EntryKind[EntryKind["SearchedLocalFoundProperty"] = 3] = "SearchedLocalFoundProperty";
+            EntryKind[EntryKind["SearchedPropertyFoundLocal"] = 4] = "SearchedPropertyFoundLocal";
+        })(EntryKind = FindAllReferences.EntryKind || (FindAllReferences.EntryKind = {}));
+        function nodeEntry(node, kind) {
+            if (kind === void 0) { kind = 1 /* Node */; }
+            return { kind: kind, node: node.name || node };
+        }
+        FindAllReferences.nodeEntry = nodeEntry;
+        function findReferencedSymbols(program, cancellationToken, sourceFiles, sourceFile, position) {
+            var node = ts.getTouchingPropertyName(sourceFile, position);
+            var referencedSymbols = FindAllReferences.Core.getReferencedSymbolsForNode(position, node, program, sourceFiles, cancellationToken);
+            var checker = program.getTypeChecker();
+            return !referencedSymbols || !referencedSymbols.length ? undefined : ts.mapDefined(referencedSymbols, function (_a) {
+                var definition = _a.definition, references = _a.references;
+                // Only include referenced symbols that have a valid definition.
+                return definition && {
+                    definition: checker.runWithCancellationToken(cancellationToken, function (checker) { return definitionToReferencedSymbolDefinitionInfo(definition, checker, node); }),
+                    references: references.map(toReferenceEntry)
+                };
+            });
+        }
+        FindAllReferences.findReferencedSymbols = findReferencedSymbols;
+        function getImplementationsAtPosition(program, cancellationToken, sourceFiles, sourceFile, position) {
+            var node = ts.getTouchingPropertyName(sourceFile, position);
+            var referenceEntries = getImplementationReferenceEntries(program, cancellationToken, sourceFiles, node, position);
+            var checker = program.getTypeChecker();
+            return ts.map(referenceEntries, function (entry) { return toImplementationLocation(entry, checker); });
+        }
+        FindAllReferences.getImplementationsAtPosition = getImplementationsAtPosition;
+        function getImplementationReferenceEntries(program, cancellationToken, sourceFiles, node, position) {
+            if (node.kind === 279 /* SourceFile */) {
+                return undefined;
+            }
+            var checker = program.getTypeChecker();
+            // If invoked directly on a shorthand property assignment, then return
+            // the declaration of the symbol being assigned (not the symbol being assigned to).
+            if (node.parent.kind === 276 /* ShorthandPropertyAssignment */) {
+                var result_8 = [];
+                FindAllReferences.Core.getReferenceEntriesForShorthandPropertyAssignment(node, checker, function (node) { return result_8.push(nodeEntry(node)); });
+                return result_8;
+            }
+            else if (node.kind === 98 /* SuperKeyword */ || ts.isSuperProperty(node.parent)) {
+                // References to and accesses on the super keyword only have one possible implementation, so no
+                // need to "Find all References"
+                var symbol = checker.getSymbolAtLocation(node);
+                return symbol.valueDeclaration && [nodeEntry(symbol.valueDeclaration)];
+            }
+            else {
+                // Perform "Find all References" and retrieve only those that are implementations
+                return getReferenceEntriesForNode(position, node, program, sourceFiles, cancellationToken, { implementations: true });
+            }
+        }
+        function findReferenceOrRenameEntries(program, cancellationToken, sourceFiles, node, position, options, convertEntry) {
+            return ts.map(flattenEntries(FindAllReferences.Core.getReferencedSymbolsForNode(position, node, program, sourceFiles, cancellationToken, options)), function (entry) { return convertEntry(entry, node, program.getTypeChecker()); });
+        }
+        FindAllReferences.findReferenceOrRenameEntries = findReferenceOrRenameEntries;
+        function getReferenceEntriesForNode(position, node, program, sourceFiles, cancellationToken, options, sourceFilesSet) {
+            if (options === void 0) { options = {}; }
+            if (sourceFilesSet === void 0) { sourceFilesSet = ts.arrayToSet(sourceFiles, function (f) { return f.fileName; }); }
+            return flattenEntries(FindAllReferences.Core.getReferencedSymbolsForNode(position, node, program, sourceFiles, cancellationToken, options, sourceFilesSet));
+        }
+        FindAllReferences.getReferenceEntriesForNode = getReferenceEntriesForNode;
+        function flattenEntries(referenceSymbols) {
+            return referenceSymbols && ts.flatMap(referenceSymbols, function (r) { return r.references; });
+        }
+        function definitionToReferencedSymbolDefinitionInfo(def, checker, originalNode) {
+            var info = (function () {
+                switch (def.type) {
+                    case 0 /* Symbol */: {
+                        var symbol = def.symbol;
+                        var _a = getDefinitionKindAndDisplayParts(symbol, checker, originalNode), displayParts_1 = _a.displayParts, kind_1 = _a.kind;
+                        var name_4 = displayParts_1.map(function (p) { return p.text; }).join("");
+                        return { node: symbol.declarations ? ts.getNameOfDeclaration(ts.first(symbol.declarations)) || ts.first(symbol.declarations) : originalNode, name: name_4, kind: kind_1, displayParts: displayParts_1 };
+                    }
+                    case 1 /* Label */: {
+                        var node_3 = def.node;
+                        return { node: node_3, name: node_3.text, kind: "label" /* label */, displayParts: [ts.displayPart(node_3.text, ts.SymbolDisplayPartKind.text)] };
+                    }
+                    case 2 /* Keyword */: {
+                        var node_4 = def.node;
+                        var name_5 = ts.tokenToString(node_4.kind);
+                        return { node: node_4, name: name_5, kind: "keyword" /* keyword */, displayParts: [{ text: name_5, kind: "keyword" /* keyword */ }] };
+                    }
+                    case 3 /* This */: {
+                        var node_5 = def.node;
+                        var symbol = checker.getSymbolAtLocation(node_5);
+                        var displayParts_2 = symbol && ts.SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(checker, symbol, node_5.getSourceFile(), ts.getContainerNode(node_5), node_5).displayParts || [ts.textPart("this")];
+                        return { node: node_5, name: "this", kind: "var" /* variableElement */, displayParts: displayParts_2 };
+                    }
+                    case 4 /* String */: {
+                        var node_6 = def.node;
+                        return { node: node_6, name: node_6.text, kind: "var" /* variableElement */, displayParts: [ts.displayPart(ts.getTextOfNode(node_6), ts.SymbolDisplayPartKind.stringLiteral)] };
+                    }
+                    default:
+                        return ts.Debug.assertNever(def);
+                }
+            })();
+            var node = info.node, name = info.name, kind = info.kind, displayParts = info.displayParts;
+            var sourceFile = node.getSourceFile();
+            return { containerKind: "" /* unknown */, containerName: "", fileName: sourceFile.fileName, kind: kind, name: name, textSpan: getTextSpan(ts.isComputedPropertyName(node) ? node.expression : node, sourceFile), displayParts: displayParts };
+        }
+        function getDefinitionKindAndDisplayParts(symbol, checker, node) {
+            var meaning = FindAllReferences.Core.getIntersectingMeaningFromDeclarations(node, symbol);
+            var enclosingDeclaration = symbol.declarations && ts.firstOrUndefined(symbol.declarations) || node;
+            var _a = ts.SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(checker, symbol, enclosingDeclaration.getSourceFile(), enclosingDeclaration, enclosingDeclaration, meaning), displayParts = _a.displayParts, symbolKind = _a.symbolKind;
+            return { displayParts: displayParts, kind: symbolKind };
+        }
+        function toRenameLocation(entry, originalNode, checker, providePrefixAndSuffixText) {
+            return __assign({}, entryToDocumentSpan(entry), (providePrefixAndSuffixText && getPrefixAndSuffixText(entry, originalNode, checker)));
+        }
+        FindAllReferences.toRenameLocation = toRenameLocation;
+        function toReferenceEntry(entry) {
+            var _a = entryToDocumentSpan(entry), textSpan = _a.textSpan, fileName = _a.fileName;
+            if (entry.kind === 0 /* Span */) {
+                return { textSpan: textSpan, fileName: fileName, isWriteAccess: false, isDefinition: false };
+            }
+            var kind = entry.kind, node = entry.node;
+            return {
+                textSpan: textSpan,
+                fileName: fileName,
+                isWriteAccess: isWriteAccessForReference(node),
+                isDefinition: node.kind === 80 /* DefaultKeyword */
+                    || !!ts.getDeclarationFromName(node)
+                    || ts.isLiteralComputedPropertyDeclarationName(node),
+                isInString: kind === 2 /* StringLiteral */ ? true : undefined,
+            };
+        }
+        FindAllReferences.toReferenceEntry = toReferenceEntry;
+        function entryToDocumentSpan(entry) {
+            if (entry.kind === 0 /* Span */) {
+                return { textSpan: entry.textSpan, fileName: entry.fileName };
+            }
+            else {
+                var sourceFile = entry.node.getSourceFile();
+                return { textSpan: getTextSpan(entry.node, sourceFile), fileName: sourceFile.fileName };
+            }
+        }
+        function getPrefixAndSuffixText(entry, originalNode, checker) {
+            if (entry.kind !== 0 /* Span */ && ts.isIdentifier(originalNode)) {
+                var node = entry.node, kind = entry.kind;
+                var name = originalNode.text;
+                var isShorthandAssignment = ts.isShorthandPropertyAssignment(node.parent);
+                if (isShorthandAssignment || ts.isObjectBindingElementWithoutPropertyName(node.parent)) {
+                    var prefixColon = { prefixText: name + ": " };
+                    var suffixColon = { suffixText: ": " + name };
+                    return kind === 3 /* SearchedLocalFoundProperty */ ? prefixColon
+                        : kind === 4 /* SearchedPropertyFoundLocal */ ? suffixColon
+                            // In `const o = { x }; o.x`, symbolAtLocation at `x` in `{ x }` is the property symbol.
+                            // For a binding element `const { x } = o;`, symbolAtLocation at `x` is the property symbol.
+                            : isShorthandAssignment ? suffixColon : prefixColon;
+                }
+                else if (ts.isImportSpecifier(entry.node.parent) && !entry.node.parent.propertyName) {
+                    // If the original symbol was using this alias, just rename the alias.
+                    var originalSymbol = ts.isExportSpecifier(originalNode.parent) ? checker.getExportSpecifierLocalTargetSymbol(originalNode.parent) : checker.getSymbolAtLocation(originalNode);
+                    return ts.contains(originalSymbol.declarations, entry.node.parent) ? { prefixText: name + " as " } : ts.emptyOptions;
+                }
+                else if (ts.isExportSpecifier(entry.node.parent) && !entry.node.parent.propertyName) {
+                    return originalNode === entry.node ? { prefixText: name + " as " } : { suffixText: " as " + name };
+                }
+            }
+            return ts.emptyOptions;
+        }
+        function toImplementationLocation(entry, checker) {
+            if (entry.kind !== 0 /* Span */) {
+                var node = entry.node;
+                var sourceFile = node.getSourceFile();
+                return __assign({ textSpan: getTextSpan(node, sourceFile), fileName: sourceFile.fileName }, implementationKindDisplayParts(node, checker));
+            }
+            else {
+                var textSpan = entry.textSpan, fileName = entry.fileName;
+                return { textSpan: textSpan, fileName: fileName, kind: "" /* unknown */, displayParts: [] };
+            }
+        }
+        function implementationKindDisplayParts(node, checker) {
+            var symbol = checker.getSymbolAtLocation(ts.isDeclaration(node) && node.name ? node.name : node);
+            if (symbol) {
+                return getDefinitionKindAndDisplayParts(symbol, checker, node);
+            }
+            else if (node.kind === 188 /* ObjectLiteralExpression */) {
+                return {
+                    kind: "interface" /* interfaceElement */,
+                    displayParts: [ts.punctuationPart(20 /* OpenParenToken */), ts.textPart("object literal"), ts.punctuationPart(21 /* CloseParenToken */)]
+                };
+            }
+            else if (node.kind === 209 /* ClassExpression */) {
+                return {
+                    kind: "local class" /* localClassElement */,
+                    displayParts: [ts.punctuationPart(20 /* OpenParenToken */), ts.textPart("anonymous local class"), ts.punctuationPart(21 /* CloseParenToken */)]
+                };
+            }
+            else {
+                return { kind: ts.getNodeKind(node), displayParts: [] };
+            }
+        }
+        function toHighlightSpan(entry) {
+            if (entry.kind === 0 /* Span */) {
+                var fileName = entry.fileName, textSpan = entry.textSpan;
+                return { fileName: fileName, span: { textSpan: textSpan, kind: "reference" /* reference */ } };
+            }
+            var node = entry.node, kind = entry.kind;
+            var sourceFile = node.getSourceFile();
+            var writeAccess = isWriteAccessForReference(node);
+            var span = {
+                textSpan: getTextSpan(node, sourceFile),
+                kind: writeAccess ? "writtenReference" /* writtenReference */ : "reference" /* reference */,
+                isInString: kind === 2 /* StringLiteral */ ? true : undefined,
+            };
+            return { fileName: sourceFile.fileName, span: span };
+        }
+        FindAllReferences.toHighlightSpan = toHighlightSpan;
+        function getTextSpan(node, sourceFile) {
+            var start = node.getStart(sourceFile);
+            var end = node.getEnd();
+            if (node.kind === 10 /* StringLiteral */) {
+                start += 1;
+                end -= 1;
+            }
+            return ts.createTextSpanFromBounds(start, end);
+        }
+        function getTextSpanOfEntry(entry) {
+            return entry.kind === 0 /* Span */ ? entry.textSpan :
+                getTextSpan(entry.node, entry.node.getSourceFile());
+        }
+        FindAllReferences.getTextSpanOfEntry = getTextSpanOfEntry;
+        /** A node is considered a writeAccess iff it is a name of a declaration or a target of an assignment */
+        function isWriteAccessForReference(node) {
+            var decl = ts.getDeclarationFromName(node);
+            return !!decl && declarationIsWriteAccess(decl) || node.kind === 80 /* DefaultKeyword */ || ts.isWriteAccess(node);
+        }
+        /**
+         * True if 'decl' provides a value, as in `function f() {}`;
+         * false if 'decl' is just a location for a future write, as in 'let x;'
+         */
+        function declarationIsWriteAccess(decl) {
+            // Consider anything in an ambient declaration to be a write access since it may be coming from JS.
+            if (!!(decl.flags & 4194304 /* Ambient */))
+                return true;
+            switch (decl.kind) {
+                case 204 /* BinaryExpression */:
+                case 186 /* BindingElement */:
+                case 240 /* ClassDeclaration */:
+                case 209 /* ClassExpression */:
+                case 80 /* DefaultKeyword */:
+                case 243 /* EnumDeclaration */:
+                case 278 /* EnumMember */:
+                case 257 /* ExportSpecifier */:
+                case 250 /* ImportClause */: // default import
+                case 248 /* ImportEqualsDeclaration */:
+                case 253 /* ImportSpecifier */:
+                case 241 /* InterfaceDeclaration */:
+                case 297 /* JSDocCallbackTag */:
+                case 304 /* JSDocTypedefTag */:
+                case 267 /* JsxAttribute */:
+                case 244 /* ModuleDeclaration */:
+                case 247 /* NamespaceExportDeclaration */:
+                case 251 /* NamespaceImport */:
+                case 151 /* Parameter */:
+                case 276 /* ShorthandPropertyAssignment */:
+                case 242 /* TypeAliasDeclaration */:
+                case 150 /* TypeParameter */:
+                    return true;
+                case 275 /* PropertyAssignment */:
+                    // In `({ x: y } = 0);`, `x` is not a write access. (Won't call this function for `y`.)
+                    return !ts.isArrayLiteralOrObjectLiteralDestructuringPattern(decl.parent);
+                case 239 /* FunctionDeclaration */:
+                case 196 /* FunctionExpression */:
+                case 157 /* Constructor */:
+                case 156 /* MethodDeclaration */:
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                    return !!decl.body;
+                case 237 /* VariableDeclaration */:
+                case 154 /* PropertyDeclaration */:
+                    return !!decl.initializer || ts.isCatchClause(decl.parent);
+                case 155 /* MethodSignature */:
+                case 153 /* PropertySignature */:
+                case 305 /* JSDocPropertyTag */:
+                case 299 /* JSDocParameterTag */:
+                    return false;
+                default:
+                    return ts.Debug.failBadSyntaxKind(decl);
+            }
+        }
+    })(FindAllReferences = ts.FindAllReferences || (ts.FindAllReferences = {}));
+})(ts || (ts = {}));
+/** Encapsulates the core find-all-references algorithm. */
+/* @internal */
+(function (ts) {
+    var FindAllReferences;
+    (function (FindAllReferences) {
+        var Core;
+        (function (Core) {
+            /** Core find-all-references algorithm. Handles special cases before delegating to `getReferencedSymbolsForSymbol`. */
+            function getReferencedSymbolsForNode(position, node, program, sourceFiles, cancellationToken, options, sourceFilesSet) {
+                if (options === void 0) { options = {}; }
+                if (sourceFilesSet === void 0) { sourceFilesSet = ts.arrayToSet(sourceFiles, function (f) { return f.fileName; }); }
+                if (ts.isSourceFile(node)) {
+                    var reference = ts.GoToDefinition.getReferenceAtPosition(node, position, program);
+                    var moduleSymbol = reference && program.getTypeChecker().getMergedSymbol(reference.file.symbol);
+                    return moduleSymbol && getReferencedSymbolsForModule(program, moduleSymbol, /*excludeImportTypeOfExportEquals*/ false, sourceFiles, sourceFilesSet);
+                }
+                if (!options.implementations) {
+                    var special = getReferencedSymbolsSpecial(node, sourceFiles, cancellationToken);
+                    if (special) {
+                        return special;
+                    }
+                }
+                var checker = program.getTypeChecker();
+                var symbol = checker.getSymbolAtLocation(node);
+                // Could not find a symbol e.g. unknown identifier
+                if (!symbol) {
+                    // String literal might be a property (and thus have a symbol), so do this here rather than in getReferencedSymbolsSpecial.
+                    return !options.implementations && ts.isStringLiteral(node) ? getReferencesForStringLiteral(node, sourceFiles, cancellationToken) : undefined;
+                }
+                if (symbol.escapedName === "export=" /* ExportEquals */) {
+                    return getReferencedSymbolsForModule(program, symbol.parent, /*excludeImportTypeOfExportEquals*/ false, sourceFiles, sourceFilesSet);
+                }
+                var moduleReferences = getReferencedSymbolsForModuleIfDeclaredBySourceFile(symbol, program, sourceFiles, cancellationToken, options, sourceFilesSet);
+                if (moduleReferences && !(symbol.flags & 33554432 /* Transient */)) {
+                    return moduleReferences;
+                }
+                var aliasedSymbol = getMergedAliasedSymbolOfNamespaceExportDeclaration(node, symbol, checker);
+                var moduleReferencesOfExportTarget = aliasedSymbol &&
+                    getReferencedSymbolsForModuleIfDeclaredBySourceFile(aliasedSymbol, program, sourceFiles, cancellationToken, options, sourceFilesSet);
+                var references = getReferencedSymbolsForSymbol(symbol, node, sourceFiles, sourceFilesSet, checker, cancellationToken, options);
+                return mergeReferences(program, moduleReferences, references, moduleReferencesOfExportTarget);
+            }
+            Core.getReferencedSymbolsForNode = getReferencedSymbolsForNode;
+            function getMergedAliasedSymbolOfNamespaceExportDeclaration(node, symbol, checker) {
+                if (node.parent && ts.isNamespaceExportDeclaration(node.parent)) {
+                    var aliasedSymbol = checker.getAliasedSymbol(symbol);
+                    var targetSymbol = checker.getMergedSymbol(aliasedSymbol);
+                    if (aliasedSymbol !== targetSymbol) {
+                        return targetSymbol;
+                    }
+                }
+                return undefined;
+            }
+            function getReferencedSymbolsForModuleIfDeclaredBySourceFile(symbol, program, sourceFiles, cancellationToken, options, sourceFilesSet) {
+                var moduleSourceFile = symbol.flags & 1536 /* Module */ ? ts.find(symbol.declarations, ts.isSourceFile) : undefined;
+                if (!moduleSourceFile)
+                    return undefined;
+                var exportEquals = symbol.exports.get("export=" /* ExportEquals */);
+                // If !!exportEquals, we're about to add references to `import("mod")` anyway, so don't double-count them.
+                var moduleReferences = getReferencedSymbolsForModule(program, symbol, !!exportEquals, sourceFiles, sourceFilesSet);
+                if (!exportEquals || !sourceFilesSet.has(moduleSourceFile.fileName))
+                    return moduleReferences;
+                // Continue to get references to 'export ='.
+                var checker = program.getTypeChecker();
+                symbol = ts.skipAlias(exportEquals, checker);
+                return mergeReferences(program, moduleReferences, getReferencedSymbolsForSymbol(symbol, /*node*/ undefined, sourceFiles, sourceFilesSet, checker, cancellationToken, options));
+            }
+            /**
+             * Merges the references by sorting them (by file index in sourceFiles and their location in it) that point to same definition symbol
+             */
+            function mergeReferences(program) {
+                var referencesToMerge = [];
+                for (var _i = 1; _i < arguments.length; _i++) {
+                    referencesToMerge[_i - 1] = arguments[_i];
+                }
+                var result;
+                for (var _a = 0, referencesToMerge_1 = referencesToMerge; _a < referencesToMerge_1.length; _a++) {
+                    var references = referencesToMerge_1[_a];
+                    if (!references || !references.length)
+                        continue;
+                    if (!result) {
+                        result = references;
+                        continue;
+                    }
+                    var _loop_13 = function (entry) {
+                        if (!entry.definition || entry.definition.type !== 0 /* Symbol */) {
+                            result.push(entry);
+                            return "continue";
+                        }
+                        var symbol = entry.definition.symbol;
+                        var refIndex = ts.findIndex(result, function (ref) { return !!ref.definition &&
+                            ref.definition.type === 0 /* Symbol */ &&
+                            ref.definition.symbol === symbol; });
+                        if (refIndex === -1) {
+                            result.push(entry);
+                            return "continue";
+                        }
+                        var reference = result[refIndex];
+                        result[refIndex] = {
+                            definition: reference.definition,
+                            references: reference.references.concat(entry.references).sort(function (entry1, entry2) {
+                                var entry1File = getSourceFileIndexOfEntry(program, entry1);
+                                var entry2File = getSourceFileIndexOfEntry(program, entry2);
+                                if (entry1File !== entry2File) {
+                                    return ts.compareValues(entry1File, entry2File);
+                                }
+                                var entry1Span = FindAllReferences.getTextSpanOfEntry(entry1);
+                                var entry2Span = FindAllReferences.getTextSpanOfEntry(entry2);
+                                return entry1Span.start !== entry2Span.start ?
+                                    ts.compareValues(entry1Span.start, entry2Span.start) :
+                                    ts.compareValues(entry1Span.length, entry2Span.length);
+                            })
+                        };
+                    };
+                    for (var _b = 0, references_1 = references; _b < references_1.length; _b++) {
+                        var entry = references_1[_b];
+                        _loop_13(entry);
+                    }
+                }
+                return result;
+            }
+            function getSourceFileIndexOfEntry(program, entry) {
+                var sourceFile = entry.kind === 0 /* Span */ ?
+                    program.getSourceFile(entry.fileName) :
+                    entry.node.getSourceFile();
+                return program.getSourceFiles().indexOf(sourceFile);
+            }
+            function getReferencedSymbolsForModule(program, symbol, excludeImportTypeOfExportEquals, sourceFiles, sourceFilesSet) {
+                ts.Debug.assert(!!symbol.valueDeclaration);
+                var references = ts.mapDefined(FindAllReferences.findModuleReferences(program, sourceFiles, symbol), function (reference) {
+                    if (reference.kind === "import") {
+                        var parent = reference.literal.parent;
+                        if (ts.isLiteralTypeNode(parent)) {
+                            var importType = ts.cast(parent.parent, ts.isImportTypeNode);
+                            if (excludeImportTypeOfExportEquals && !importType.qualifier) {
+                                return undefined;
+                            }
+                        }
+                        // import("foo") with no qualifier will reference the `export =` of the module, which may be referenced anyway.
+                        return FindAllReferences.nodeEntry(reference.literal);
+                    }
+                    else {
+                        return {
+                            kind: 0 /* Span */,
+                            fileName: reference.referencingFile.fileName,
+                            textSpan: ts.createTextSpanFromRange(reference.ref),
+                        };
+                    }
+                });
+                for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                    var decl = _a[_i];
+                    switch (decl.kind) {
+                        case 279 /* SourceFile */:
+                            // Don't include the source file itself. (This may not be ideal behavior, but awkward to include an entire file as a reference.)
+                            break;
+                        case 244 /* ModuleDeclaration */:
+                            if (sourceFilesSet.has(decl.getSourceFile().fileName)) {
+                                references.push(FindAllReferences.nodeEntry(decl.name));
+                            }
+                            break;
+                        default:
+                            // This may be merged with something.
+                            ts.Debug.assert(!!(symbol.flags & 33554432 /* Transient */), "Expected a module symbol to be declared by a SourceFile or ModuleDeclaration.");
+                    }
+                }
+                var exported = symbol.exports.get("export=" /* ExportEquals */);
+                if (exported) {
+                    for (var _b = 0, _c = exported.declarations; _b < _c.length; _b++) {
+                        var decl = _c[_b];
+                        var sourceFile = decl.getSourceFile();
+                        if (sourceFilesSet.has(sourceFile.fileName)) {
+                            // At `module.exports = ...`, reference node is `module`
+                            var node = ts.isBinaryExpression(decl) && ts.isPropertyAccessExpression(decl.left)
+                                ? decl.left.expression
+                                : ts.isExportAssignment(decl)
+                                    ? ts.Debug.assertDefined(ts.findChildOfKind(decl, 85 /* ExportKeyword */, sourceFile))
+                                    : ts.getNameOfDeclaration(decl) || decl;
+                            references.push(FindAllReferences.nodeEntry(node));
+                        }
+                    }
+                }
+                return references.length ? [{ definition: { type: 0 /* Symbol */, symbol: symbol }, references: references }] : ts.emptyArray;
+            }
+            /** getReferencedSymbols for special node kinds. */
+            function getReferencedSymbolsSpecial(node, sourceFiles, cancellationToken) {
+                if (ts.isTypeKeyword(node.kind)) {
+                    return getAllReferencesForKeyword(sourceFiles, node.kind, cancellationToken);
+                }
+                // Labels
+                if (ts.isJumpStatementTarget(node)) {
+                    var labelDefinition = ts.getTargetLabel(node.parent, node.text);
+                    // if we have a label definition, look within its statement for references, if not, then
+                    // the label is undefined and we have no results..
+                    return labelDefinition && getLabelReferencesInNode(labelDefinition.parent, labelDefinition);
+                }
+                else if (ts.isLabelOfLabeledStatement(node)) {
+                    // it is a label definition and not a target, search within the parent labeledStatement
+                    return getLabelReferencesInNode(node.parent, node);
+                }
+                if (ts.isThis(node)) {
+                    return getReferencesForThisKeyword(node, sourceFiles, cancellationToken);
+                }
+                if (node.kind === 98 /* SuperKeyword */) {
+                    return getReferencesForSuperKeyword(node);
+                }
+                return undefined;
+            }
+            /** Core find-all-references algorithm for a normal symbol. */
+            function getReferencedSymbolsForSymbol(originalSymbol, node, sourceFiles, sourceFilesSet, checker, cancellationToken, options) {
+                var symbol = node && skipPastExportOrImportSpecifierOrUnion(originalSymbol, node, checker, /*useLocalSymbolForExportSpecifier*/ !isForRenameWithPrefixAndSuffixText(options)) || originalSymbol;
+                // Compute the meaning from the location and the symbol it references
+                var searchMeaning = node ? getIntersectingMeaningFromDeclarations(node, symbol) : 7 /* All */;
+                var result = [];
+                var state = new State(sourceFiles, sourceFilesSet, node ? getSpecialSearchKind(node) : 0 /* None */, checker, cancellationToken, searchMeaning, options, result);
+                var exportSpecifier = !isForRenameWithPrefixAndSuffixText(options) ? undefined : ts.find(symbol.declarations, ts.isExportSpecifier);
+                if (exportSpecifier) {
+                    // When renaming at an export specifier, rename the export and not the thing being exported.
+                    getReferencesAtExportSpecifier(exportSpecifier.name, symbol, exportSpecifier, state.createSearch(node, originalSymbol, /*comingFrom*/ undefined), state, /*addReferencesHere*/ true, /*alwaysGetReferences*/ true);
+                }
+                else if (node && node.kind === 80 /* DefaultKeyword */) {
+                    addReference(node, symbol, state);
+                    searchForImportsOfExport(node, symbol, { exportingModuleSymbol: ts.Debug.assertDefined(symbol.parent, "Expected export symbol to have a parent"), exportKind: 1 /* Default */ }, state);
+                }
+                else {
+                    var search = state.createSearch(node, symbol, /*comingFrom*/ undefined, { allSearchSymbols: node ? populateSearchSymbolSet(symbol, node, checker, !!options.isForRename, !!options.providePrefixAndSuffixTextForRename, !!options.implementations) : [symbol] });
+                    // Try to get the smallest valid scope that we can limit our search to;
+                    // otherwise we'll need to search globally (i.e. include each file).
+                    var scope = getSymbolScope(symbol);
+                    if (scope) {
+                        getReferencesInContainer(scope, scope.getSourceFile(), search, state, /*addReferencesHere*/ !(ts.isSourceFile(scope) && !ts.contains(sourceFiles, scope)));
+                    }
+                    else {
+                        // Global search
+                        for (var _i = 0, _a = state.sourceFiles; _i < _a.length; _i++) {
+                            var sourceFile = _a[_i];
+                            state.cancellationToken.throwIfCancellationRequested();
+                            searchForName(sourceFile, search, state);
+                        }
+                    }
+                }
+                return result;
+            }
+            function getSpecialSearchKind(node) {
+                switch (node.kind) {
+                    case 124 /* ConstructorKeyword */:
+                        return 1 /* Constructor */;
+                    case 72 /* Identifier */:
+                        if (ts.isClassLike(node.parent)) {
+                            ts.Debug.assert(node.parent.name === node);
+                            return 2 /* Class */;
+                        }
+                    // falls through
+                    default:
+                        return 0 /* None */;
+                }
+            }
+            /** Handle a few special cases relating to export/import specifiers. */
+            function skipPastExportOrImportSpecifierOrUnion(symbol, node, checker, useLocalSymbolForExportSpecifier) {
+                var parent = node.parent;
+                if (ts.isExportSpecifier(parent) && useLocalSymbolForExportSpecifier) {
+                    return getLocalSymbolForExportSpecifier(node, symbol, parent, checker);
+                }
+                // If the symbol is declared as part of a declaration like `{ type: "a" } | { type: "b" }`, use the property on the union type to get more references.
+                return ts.firstDefined(symbol.declarations, function (decl) {
+                    if (!decl.parent) {
+                        // Ignore UMD module and global merge
+                        if (symbol.flags & 33554432 /* Transient */)
+                            return undefined;
+                        // Assertions for GH#21814. We should be handling SourceFile symbols in `getReferencedSymbolsForModule` instead of getting here.
+                        ts.Debug.fail("Unexpected symbol at " + ts.Debug.showSyntaxKind(node) + ": " + ts.Debug.showSymbol(symbol));
+                    }
+                    return ts.isTypeLiteralNode(decl.parent) && ts.isUnionTypeNode(decl.parent.parent)
+                        ? checker.getPropertyOfType(checker.getTypeFromTypeNode(decl.parent.parent), symbol.name)
+                        : undefined;
+                });
+            }
+            var SpecialSearchKind;
+            (function (SpecialSearchKind) {
+                SpecialSearchKind[SpecialSearchKind["None"] = 0] = "None";
+                SpecialSearchKind[SpecialSearchKind["Constructor"] = 1] = "Constructor";
+                SpecialSearchKind[SpecialSearchKind["Class"] = 2] = "Class";
+            })(SpecialSearchKind || (SpecialSearchKind = {}));
+            function getNonModuleSymbolOfMergedModuleSymbol(symbol) {
+                if (!(symbol.flags & (1536 /* Module */ | 33554432 /* Transient */)))
+                    return undefined;
+                var decl = symbol.declarations && ts.find(symbol.declarations, function (d) { return !ts.isSourceFile(d) && !ts.isModuleDeclaration(d); });
+                return decl && decl.symbol;
+            }
+            /**
+             * Holds all state needed for the finding references.
+             * Unlike `Search`, there is only one `State`.
+             */
+            var State = /** @class */ (function () {
+                function State(sourceFiles, sourceFilesSet, 
+                /** True if we're searching for constructor references. */
+                specialSearchKind, checker, cancellationToken, searchMeaning, options, result) {
+                    this.sourceFiles = sourceFiles;
+                    this.sourceFilesSet = sourceFilesSet;
+                    this.specialSearchKind = specialSearchKind;
+                    this.checker = checker;
+                    this.cancellationToken = cancellationToken;
+                    this.searchMeaning = searchMeaning;
+                    this.options = options;
+                    this.result = result;
+                    /** Cache for `explicitlyinheritsFrom`. */
+                    this.inheritsFromCache = ts.createMap();
+                    /**
+                     * Type nodes can contain multiple references to the same type. For example:
+                     *      let x: Foo & (Foo & Bar) = ...
+                     * Because we are returning the implementation locations and not the identifier locations,
+                     * duplicate entries would be returned here as each of the type references is part of
+                     * the same implementation. For that reason, check before we add a new entry.
+                     */
+                    this.markSeenContainingTypeReference = ts.nodeSeenTracker();
+                    /**
+                     * It's possible that we will encounter the right side of `export { foo as bar } from "x";` more than once.
+                     * For example:
+                     *     // b.ts
+                     *     export { foo as bar } from "./a";
+                     *     import { bar } from "./b";
+                     *
+                     * Normally at `foo as bar` we directly add `foo` and do not locally search for it (since it doesn't declare a local).
+                     * But another reference to it may appear in the same source file.
+                     * See `tests/cases/fourslash/transitiveExportImports3.ts`.
+                     */
+                    this.markSeenReExportRHS = ts.nodeSeenTracker();
+                    this.symbolIdToReferences = [];
+                    // Source file ID → symbol ID → Whether the symbol has been searched for in the source file.
+                    this.sourceFileToSeenSymbols = [];
+                }
+                State.prototype.includesSourceFile = function (sourceFile) {
+                    return this.sourceFilesSet.has(sourceFile.fileName);
+                };
+                /** Gets every place to look for references of an exported symbols. See `ImportsResult` in `importTracker.ts` for more documentation. */
+                State.prototype.getImportSearches = function (exportSymbol, exportInfo) {
+                    if (!this.importTracker)
+                        this.importTracker = FindAllReferences.createImportTracker(this.sourceFiles, this.sourceFilesSet, this.checker, this.cancellationToken);
+                    return this.importTracker(exportSymbol, exportInfo, !!this.options.isForRename);
+                };
+                /** @param allSearchSymbols set of additional symbols for use by `includes`. */
+                State.prototype.createSearch = function (location, symbol, comingFrom, searchOptions) {
+                    if (searchOptions === void 0) { searchOptions = {}; }
+                    // Note: if this is an external module symbol, the name doesn't include quotes.
+                    // Note: getLocalSymbolForExportDefault handles `export default class C {}`, but not `export default C` or `export { C as default }`.
+                    // The other two forms seem to be handled downstream (e.g. in `skipPastExportOrImportSpecifier`), so special-casing the first form
+                    // here appears to be intentional).
+                    var _a = searchOptions.text, text = _a === void 0 ? ts.stripQuotes(ts.unescapeLeadingUnderscores((ts.getLocalSymbolForExportDefault(symbol) || getNonModuleSymbolOfMergedModuleSymbol(symbol) || symbol).escapedName)) : _a, _b = searchOptions.allSearchSymbols, allSearchSymbols = _b === void 0 ? [symbol] : _b;
+                    var escapedText = ts.escapeLeadingUnderscores(text);
+                    var parents = this.options.implementations && location ? getParentSymbolsOfPropertyAccess(location, symbol, this.checker) : undefined;
+                    return { symbol: symbol, comingFrom: comingFrom, text: text, escapedText: escapedText, parents: parents, allSearchSymbols: allSearchSymbols, includes: function (sym) { return ts.contains(allSearchSymbols, sym); } };
+                };
+                /**
+                 * Callback to add references for a particular searched symbol.
+                 * This initializes a reference group, so only call this if you will add at least one reference.
+                 */
+                State.prototype.referenceAdder = function (searchSymbol) {
+                    var symbolId = ts.getSymbolId(searchSymbol);
+                    var references = this.symbolIdToReferences[symbolId];
+                    if (!references) {
+                        references = this.symbolIdToReferences[symbolId] = [];
+                        this.result.push({ definition: { type: 0 /* Symbol */, symbol: searchSymbol }, references: references });
+                    }
+                    return function (node, kind) { return references.push(FindAllReferences.nodeEntry(node, kind)); };
+                };
+                /** Add a reference with no associated definition. */
+                State.prototype.addStringOrCommentReference = function (fileName, textSpan) {
+                    this.result.push({
+                        definition: undefined,
+                        references: [{ kind: 0 /* Span */, fileName: fileName, textSpan: textSpan }]
+                    });
+                };
+                /** Returns `true` the first time we search for a symbol in a file and `false` afterwards. */
+                State.prototype.markSearchedSymbols = function (sourceFile, symbols) {
+                    var sourceId = ts.getNodeId(sourceFile);
+                    var seenSymbols = this.sourceFileToSeenSymbols[sourceId] || (this.sourceFileToSeenSymbols[sourceId] = ts.createMap());
+                    var anyNewSymbols = false;
+                    for (var _i = 0, symbols_4 = symbols; _i < symbols_4.length; _i++) {
+                        var sym = symbols_4[_i];
+                        anyNewSymbols = ts.addToSeen(seenSymbols, ts.getSymbolId(sym)) || anyNewSymbols;
+                    }
+                    return anyNewSymbols;
+                };
+                return State;
+            }());
+            /** Search for all imports of a given exported symbol using `State.getImportSearches`. */
+            function searchForImportsOfExport(exportLocation, exportSymbol, exportInfo, state) {
+                var _a = state.getImportSearches(exportSymbol, exportInfo), importSearches = _a.importSearches, singleReferences = _a.singleReferences, indirectUsers = _a.indirectUsers;
+                // For `import { foo as bar }` just add the reference to `foo`, and don't otherwise search in the file.
+                if (singleReferences.length) {
+                    var addRef = state.referenceAdder(exportSymbol);
+                    for (var _i = 0, singleReferences_1 = singleReferences; _i < singleReferences_1.length; _i++) {
+                        var singleRef = singleReferences_1[_i];
+                        if (shouldAddSingleReference(singleRef, state))
+                            addRef(singleRef);
+                    }
+                }
+                // For each import, find all references to that import in its source file.
+                for (var _b = 0, importSearches_1 = importSearches; _b < importSearches_1.length; _b++) {
+                    var _c = importSearches_1[_b], importLocation = _c[0], importSymbol = _c[1];
+                    getReferencesInSourceFile(importLocation.getSourceFile(), state.createSearch(importLocation, importSymbol, 1 /* Export */), state);
+                }
+                if (indirectUsers.length) {
+                    var indirectSearch = void 0;
+                    switch (exportInfo.exportKind) {
+                        case 0 /* Named */:
+                            indirectSearch = state.createSearch(exportLocation, exportSymbol, 1 /* Export */);
+                            break;
+                        case 1 /* Default */:
+                            // Search for a property access to '.default'. This can't be renamed.
+                            indirectSearch = state.options.isForRename ? undefined : state.createSearch(exportLocation, exportSymbol, 1 /* Export */, { text: "default" });
+                            break;
+                        case 2 /* ExportEquals */:
+                            break;
+                    }
+                    if (indirectSearch) {
+                        for (var _d = 0, indirectUsers_1 = indirectUsers; _d < indirectUsers_1.length; _d++) {
+                            var indirectUser = indirectUsers_1[_d];
+                            searchForName(indirectUser, indirectSearch, state);
+                        }
+                    }
+                }
+            }
+            function eachExportReference(sourceFiles, checker, cancellationToken, exportSymbol, exportingModuleSymbol, exportName, isDefaultExport, cb) {
+                var importTracker = FindAllReferences.createImportTracker(sourceFiles, ts.arrayToSet(sourceFiles, function (f) { return f.fileName; }), checker, cancellationToken);
+                var _a = importTracker(exportSymbol, { exportKind: isDefaultExport ? 1 /* Default */ : 0 /* Named */, exportingModuleSymbol: exportingModuleSymbol }, /*isForRename*/ false), importSearches = _a.importSearches, indirectUsers = _a.indirectUsers;
+                for (var _i = 0, importSearches_2 = importSearches; _i < importSearches_2.length; _i++) {
+                    var importLocation = importSearches_2[_i][0];
+                    cb(importLocation);
+                }
+                for (var _b = 0, indirectUsers_2 = indirectUsers; _b < indirectUsers_2.length; _b++) {
+                    var indirectUser = indirectUsers_2[_b];
+                    for (var _c = 0, _d = getPossibleSymbolReferenceNodes(indirectUser, isDefaultExport ? "default" : exportName); _c < _d.length; _c++) {
+                        var node = _d[_c];
+                        // Import specifiers should be handled by importSearches
+                        if (ts.isIdentifier(node) && !ts.isImportOrExportSpecifier(node.parent) && checker.getSymbolAtLocation(node) === exportSymbol) {
+                            cb(node);
+                        }
+                    }
+                }
+            }
+            Core.eachExportReference = eachExportReference;
+            function shouldAddSingleReference(singleRef, state) {
+                if (!hasMatchingMeaning(singleRef, state))
+                    return false;
+                if (!state.options.isForRename)
+                    return true;
+                // Don't rename an import type `import("./module-name")` when renaming `name` in `export = name;`
+                if (!ts.isIdentifier(singleRef))
+                    return false;
+                // At `default` in `import { default as x }` or `export { default as x }`, do add a reference, but do not rename.
+                return !(ts.isImportOrExportSpecifier(singleRef.parent) && singleRef.escapedText === "default" /* Default */);
+            }
+            // Go to the symbol we imported from and find references for it.
+            function searchForImportedSymbol(symbol, state) {
+                for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                    var declaration = _a[_i];
+                    var exportingFile = declaration.getSourceFile();
+                    // Need to search in the file even if it's not in the search-file set, because it might export the symbol.
+                    getReferencesInSourceFile(exportingFile, state.createSearch(declaration, symbol, 0 /* Import */), state, state.includesSourceFile(exportingFile));
+                }
+            }
+            /** Search for all occurences of an identifier in a source file (and filter out the ones that match). */
+            function searchForName(sourceFile, search, state) {
+                if (ts.getNameTable(sourceFile).get(search.escapedText) !== undefined) {
+                    getReferencesInSourceFile(sourceFile, search, state);
+                }
+            }
+            function getPropertySymbolOfDestructuringAssignment(location, checker) {
+                return ts.isArrayLiteralOrObjectLiteralDestructuringPattern(location.parent.parent)
+                    ? checker.getPropertySymbolOfDestructuringAssignment(location)
+                    : undefined;
+            }
+            /**
+             * Determines the smallest scope in which a symbol may have named references.
+             * Note that not every construct has been accounted for. This function can
+             * probably be improved.
+             *
+             * @returns undefined if the scope cannot be determined, implying that
+             * a reference to a symbol can occur anywhere.
+             */
+            function getSymbolScope(symbol) {
+                // If this is the symbol of a named function expression or named class expression,
+                // then named references are limited to its own scope.
+                var declarations = symbol.declarations, flags = symbol.flags, parent = symbol.parent, valueDeclaration = symbol.valueDeclaration;
+                if (valueDeclaration && (valueDeclaration.kind === 196 /* FunctionExpression */ || valueDeclaration.kind === 209 /* ClassExpression */)) {
+                    return valueDeclaration;
+                }
+                if (!declarations) {
+                    return undefined;
+                }
+                // If this is private property or method, the scope is the containing class
+                if (flags & (4 /* Property */ | 8192 /* Method */)) {
+                    var privateDeclaration = ts.find(declarations, function (d) { return ts.hasModifier(d, 8 /* Private */); });
+                    if (privateDeclaration) {
+                        return ts.getAncestor(privateDeclaration, 240 /* ClassDeclaration */);
+                    }
+                    // Else this is a public property and could be accessed from anywhere.
+                    return undefined;
+                }
+                // If symbol is of object binding pattern element without property name we would want to
+                // look for property too and that could be anywhere
+                if (declarations.some(ts.isObjectBindingElementWithoutPropertyName)) {
+                    return undefined;
+                }
+                /*
+                If the symbol has a parent, it's globally visible unless:
+                - It's a private property (handled above).
+                - It's a type parameter.
+                - The parent is an external module: then we should only search in the module (and recurse on the export later).
+                  - But if the parent has `export as namespace`, the symbol is globally visible through that namespace.
+                */
+                var exposedByParent = parent && !(symbol.flags & 262144 /* TypeParameter */);
+                if (exposedByParent && !(ts.isExternalModuleSymbol(parent) && !parent.globalExports)) {
+                    return undefined;
+                }
+                var scope;
+                for (var _i = 0, declarations_11 = declarations; _i < declarations_11.length; _i++) {
+                    var declaration = declarations_11[_i];
+                    var container = ts.getContainerNode(declaration);
+                    if (scope && scope !== container) {
+                        // Different declarations have different containers, bail out
+                        return undefined;
+                    }
+                    if (!container || container.kind === 279 /* SourceFile */ && !ts.isExternalOrCommonJsModule(container)) {
+                        // This is a global variable and not an external module, any declaration defined
+                        // within this scope is visible outside the file
+                        return undefined;
+                    }
+                    // The search scope is the container node
+                    scope = container;
+                }
+                // If symbol.parent, this means we are in an export of an external module. (Otherwise we would have returned `undefined` above.)
+                // For an export of a module, we may be in a declaration file, and it may be accessed elsewhere. E.g.:
+                //     declare module "a" { export type T = number; }
+                //     declare module "b" { import { T } from "a"; export const x: T; }
+                // So we must search the whole source file. (Because we will mark the source file as seen, we we won't return to it when searching for imports.)
+                return exposedByParent ? scope.getSourceFile() : scope; // TODO: GH#18217
+            }
+            /** Used as a quick check for whether a symbol is used at all in a file (besides its definition). */
+            function isSymbolReferencedInFile(definition, checker, sourceFile) {
+                return eachSymbolReferenceInFile(definition, checker, sourceFile, function () { return true; }) || false;
+            }
+            Core.isSymbolReferencedInFile = isSymbolReferencedInFile;
+            function eachSymbolReferenceInFile(definition, checker, sourceFile, cb) {
+                var symbol = ts.isParameterPropertyDeclaration(definition.parent)
+                    ? ts.first(checker.getSymbolsOfParameterPropertyDeclaration(definition.parent, definition.text))
+                    : checker.getSymbolAtLocation(definition);
+                if (!symbol)
+                    return undefined;
+                for (var _i = 0, _a = getPossibleSymbolReferenceNodes(sourceFile, symbol.name); _i < _a.length; _i++) {
+                    var token = _a[_i];
+                    if (!ts.isIdentifier(token) || token === definition || token.escapedText !== definition.escapedText)
+                        continue;
+                    var referenceSymbol = checker.getSymbolAtLocation(token); // See GH#19955 for why the type annotation is necessary
+                    if (referenceSymbol === symbol
+                        || checker.getShorthandAssignmentValueSymbol(token.parent) === symbol
+                        || ts.isExportSpecifier(token.parent) && getLocalSymbolForExportSpecifier(token, referenceSymbol, token.parent, checker) === symbol) {
+                        var res = cb(token);
+                        if (res)
+                            return res;
+                    }
+                }
+            }
+            Core.eachSymbolReferenceInFile = eachSymbolReferenceInFile;
+            function eachSignatureCall(signature, sourceFiles, checker, cb) {
+                if (!signature.name || !ts.isIdentifier(signature.name))
+                    return;
+                var symbol = ts.Debug.assertDefined(checker.getSymbolAtLocation(signature.name));
+                for (var _i = 0, sourceFiles_5 = sourceFiles; _i < sourceFiles_5.length; _i++) {
+                    var sourceFile = sourceFiles_5[_i];
+                    for (var _a = 0, _b = getPossibleSymbolReferenceNodes(sourceFile, symbol.name); _a < _b.length; _a++) {
+                        var name = _b[_a];
+                        if (!ts.isIdentifier(name) || name === signature.name || name.escapedText !== signature.name.escapedText)
+                            continue;
+                        var called = ts.climbPastPropertyAccess(name);
+                        var call = called.parent;
+                        if (!ts.isCallExpression(call) || call.expression !== called)
+                            continue;
+                        var referenceSymbol = checker.getSymbolAtLocation(name);
+                        if (referenceSymbol && checker.getRootSymbols(referenceSymbol).some(function (s) { return s === symbol; })) {
+                            cb(call);
+                        }
+                    }
+                }
+            }
+            Core.eachSignatureCall = eachSignatureCall;
+            function getPossibleSymbolReferenceNodes(sourceFile, symbolName, container) {
+                if (container === void 0) { container = sourceFile; }
+                return getPossibleSymbolReferencePositions(sourceFile, symbolName, container).map(function (pos) { return ts.getTouchingPropertyName(sourceFile, pos); });
+            }
+            function getPossibleSymbolReferencePositions(sourceFile, symbolName, container) {
+                if (container === void 0) { container = sourceFile; }
+                var positions = [];
+                /// TODO: Cache symbol existence for files to save text search
+                // Also, need to make this work for unicode escapes.
+                // Be resilient in the face of a symbol with no name or zero length name
+                if (!symbolName || !symbolName.length) {
+                    return positions;
+                }
+                var text = sourceFile.text;
+                var sourceLength = text.length;
+                var symbolNameLength = symbolName.length;
+                var position = text.indexOf(symbolName, container.pos);
+                while (position >= 0) {
+                    // If we are past the end, stop looking
+                    if (position > container.end)
+                        break;
+                    // We found a match.  Make sure it's not part of a larger word (i.e. the char
+                    // before and after it have to be a non-identifier char).
+                    var endPosition = position + symbolNameLength;
+                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 6 /* Latest */)) &&
+                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 6 /* Latest */))) {
+                        // Found a real match.  Keep searching.
+                        positions.push(position);
+                    }
+                    position = text.indexOf(symbolName, position + symbolNameLength + 1);
+                }
+                return positions;
+            }
+            function getLabelReferencesInNode(container, targetLabel) {
+                var sourceFile = container.getSourceFile();
+                var labelName = targetLabel.text;
+                var references = ts.mapDefined(getPossibleSymbolReferenceNodes(sourceFile, labelName, container), function (node) {
+                    // Only pick labels that are either the target label, or have a target that is the target label
+                    return node === targetLabel || (ts.isJumpStatementTarget(node) && ts.getTargetLabel(node, labelName) === targetLabel) ? FindAllReferences.nodeEntry(node) : undefined;
+                });
+                return [{ definition: { type: 1 /* Label */, node: targetLabel }, references: references }];
+            }
+            function isValidReferencePosition(node, searchSymbolName) {
+                // Compare the length so we filter out strict superstrings of the symbol we are looking for
+                switch (node.kind) {
+                    case 72 /* Identifier */:
+                        return node.text.length === searchSymbolName.length;
+                    case 10 /* StringLiteral */: {
+                        var str = node;
+                        return (ts.isLiteralNameOfPropertyDeclarationOrIndexAccess(str) || ts.isNameOfModuleDeclaration(node) || ts.isExpressionOfExternalModuleImportEqualsDeclaration(node) || (ts.isCallExpression(node.parent) && ts.isBindableObjectDefinePropertyCall(node.parent) && node.parent.arguments[1] === node)) &&
+                            str.text.length === searchSymbolName.length;
+                    }
+                    case 8 /* NumericLiteral */:
+                        return ts.isLiteralNameOfPropertyDeclarationOrIndexAccess(node) && node.text.length === searchSymbolName.length;
+                    case 80 /* DefaultKeyword */:
+                        return "default".length === searchSymbolName.length;
+                    default:
+                        return false;
+                }
+            }
+            function getAllReferencesForKeyword(sourceFiles, keywordKind, cancellationToken) {
+                var references = ts.flatMap(sourceFiles, function (sourceFile) {
+                    cancellationToken.throwIfCancellationRequested();
+                    return ts.mapDefined(getPossibleSymbolReferenceNodes(sourceFile, ts.tokenToString(keywordKind), sourceFile), function (referenceLocation) {
+                        return referenceLocation.kind === keywordKind ? FindAllReferences.nodeEntry(referenceLocation) : undefined;
+                    });
+                });
+                return references.length ? [{ definition: { type: 2 /* Keyword */, node: references[0].node }, references: references }] : undefined;
+            }
+            function getReferencesInSourceFile(sourceFile, search, state, addReferencesHere) {
+                if (addReferencesHere === void 0) { addReferencesHere = true; }
+                state.cancellationToken.throwIfCancellationRequested();
+                return getReferencesInContainer(sourceFile, sourceFile, search, state, addReferencesHere);
+            }
+            /**
+             * Search within node "container" for references for a search value, where the search value is defined as a
+             * tuple of(searchSymbol, searchText, searchLocation, and searchMeaning).
+             * searchLocation: a node where the search value
+             */
+            function getReferencesInContainer(container, sourceFile, search, state, addReferencesHere) {
+                if (!state.markSearchedSymbols(sourceFile, search.allSearchSymbols)) {
+                    return;
+                }
+                for (var _i = 0, _a = getPossibleSymbolReferencePositions(sourceFile, search.text, container); _i < _a.length; _i++) {
+                    var position = _a[_i];
+                    getReferencesAtLocation(sourceFile, position, search, state, addReferencesHere);
+                }
+            }
+            function hasMatchingMeaning(referenceLocation, state) {
+                return !!(ts.getMeaningFromLocation(referenceLocation) & state.searchMeaning);
+            }
+            function getReferencesAtLocation(sourceFile, position, search, state, addReferencesHere) {
+                var referenceLocation = ts.getTouchingPropertyName(sourceFile, position);
+                if (!isValidReferencePosition(referenceLocation, search.text)) {
+                    // This wasn't the start of a token.  Check to see if it might be a
+                    // match in a comment or string if that's what the caller is asking
+                    // for.
+                    if (!state.options.implementations && (state.options.findInStrings && ts.isInString(sourceFile, position) || state.options.findInComments && ts.isInNonReferenceComment(sourceFile, position))) {
+                        // In the case where we're looking inside comments/strings, we don't have
+                        // an actual definition.  So just use 'undefined' here.  Features like
+                        // 'Rename' won't care (as they ignore the definitions), and features like
+                        // 'FindReferences' will just filter out these results.
+                        state.addStringOrCommentReference(sourceFile.fileName, ts.createTextSpan(position, search.text.length));
+                    }
+                    return;
+                }
+                if (!hasMatchingMeaning(referenceLocation, state))
+                    return;
+                var referenceSymbol = state.checker.getSymbolAtLocation(referenceLocation);
+                if (!referenceSymbol) {
+                    return;
+                }
+                var parent = referenceLocation.parent;
+                if (ts.isImportSpecifier(parent) && parent.propertyName === referenceLocation) {
+                    // This is added through `singleReferences` in ImportsResult. If we happen to see it again, don't add it again.
+                    return;
+                }
+                if (ts.isExportSpecifier(parent)) {
+                    ts.Debug.assert(referenceLocation.kind === 72 /* Identifier */);
+                    getReferencesAtExportSpecifier(referenceLocation, referenceSymbol, parent, search, state, addReferencesHere);
+                    return;
+                }
+                var relatedSymbol = getRelatedSymbol(search, referenceSymbol, referenceLocation, state);
+                if (!relatedSymbol) {
+                    getReferenceForShorthandProperty(referenceSymbol, search, state);
+                    return;
+                }
+                switch (state.specialSearchKind) {
+                    case 0 /* None */:
+                        if (addReferencesHere)
+                            addReference(referenceLocation, relatedSymbol, state);
+                        break;
+                    case 1 /* Constructor */:
+                        addConstructorReferences(referenceLocation, sourceFile, search, state);
+                        break;
+                    case 2 /* Class */:
+                        addClassStaticThisReferences(referenceLocation, search, state);
+                        break;
+                    default:
+                        ts.Debug.assertNever(state.specialSearchKind);
+                }
+                getImportOrExportReferences(referenceLocation, referenceSymbol, search, state);
+            }
+            function getReferencesAtExportSpecifier(referenceLocation, referenceSymbol, exportSpecifier, search, state, addReferencesHere, alwaysGetReferences) {
+                ts.Debug.assert(!alwaysGetReferences || !!state.options.providePrefixAndSuffixTextForRename, "If alwaysGetReferences is true, then prefix/suffix text must be enabled");
+                var parent = exportSpecifier.parent, propertyName = exportSpecifier.propertyName, name = exportSpecifier.name;
+                var exportDeclaration = parent.parent;
+                var localSymbol = getLocalSymbolForExportSpecifier(referenceLocation, referenceSymbol, exportSpecifier, state.checker);
+                if (!alwaysGetReferences && !search.includes(localSymbol)) {
+                    return;
+                }
+                if (!propertyName) {
+                    // Don't rename at `export { default } from "m";`. (but do continue to search for imports of the re-export)
+                    if (!(state.options.isForRename && (name.escapedText === "default" /* Default */))) {
+                        addRef();
+                    }
+                }
+                else if (referenceLocation === propertyName) {
+                    // For `export { foo as bar } from "baz"`, "`foo`" will be added from the singleReferences for import searches of the original export.
+                    // For `export { foo as bar };`, where `foo` is a local, so add it now.
+                    if (!exportDeclaration.moduleSpecifier) {
+                        addRef();
+                    }
+                    if (addReferencesHere && !state.options.isForRename && state.markSeenReExportRHS(name)) {
+                        addReference(name, ts.Debug.assertDefined(exportSpecifier.symbol), state);
+                    }
+                }
+                else {
+                    if (state.markSeenReExportRHS(referenceLocation)) {
+                        addRef();
+                    }
+                }
+                // For `export { foo as bar }`, rename `foo`, but not `bar`.
+                if (!isForRenameWithPrefixAndSuffixText(state.options) || alwaysGetReferences) {
+                    var exportKind = referenceLocation.originalKeywordKind === 80 /* DefaultKeyword */ ? 1 /* Default */ : 0 /* Named */;
+                    var exportSymbol = ts.Debug.assertDefined(exportSpecifier.symbol);
+                    var exportInfo = ts.Debug.assertDefined(FindAllReferences.getExportInfo(exportSymbol, exportKind, state.checker));
+                    searchForImportsOfExport(referenceLocation, exportSymbol, exportInfo, state);
+                }
+                // At `export { x } from "foo"`, also search for the imported symbol `"foo".x`.
+                if (search.comingFrom !== 1 /* Export */ && exportDeclaration.moduleSpecifier && !propertyName && !isForRenameWithPrefixAndSuffixText(state.options)) {
+                    var imported = state.checker.getExportSpecifierLocalTargetSymbol(exportSpecifier);
+                    if (imported)
+                        searchForImportedSymbol(imported, state);
+                }
+                function addRef() {
+                    if (addReferencesHere)
+                        addReference(referenceLocation, localSymbol, state);
+                }
+            }
+            function getLocalSymbolForExportSpecifier(referenceLocation, referenceSymbol, exportSpecifier, checker) {
+                return isExportSpecifierAlias(referenceLocation, exportSpecifier) && checker.getExportSpecifierLocalTargetSymbol(exportSpecifier) || referenceSymbol;
+            }
+            function isExportSpecifierAlias(referenceLocation, exportSpecifier) {
+                var parent = exportSpecifier.parent, propertyName = exportSpecifier.propertyName, name = exportSpecifier.name;
+                ts.Debug.assert(propertyName === referenceLocation || name === referenceLocation);
+                if (propertyName) {
+                    // Given `export { foo as bar } [from "someModule"]`: It's an alias at `foo`, but at `bar` it's a new symbol.
+                    return propertyName === referenceLocation;
+                }
+                else {
+                    // `export { foo } from "foo"` is a re-export.
+                    // `export { foo };` is not a re-export, it creates an alias for the local variable `foo`.
+                    return !parent.parent.moduleSpecifier;
+                }
+            }
+            function getImportOrExportReferences(referenceLocation, referenceSymbol, search, state) {
+                var importOrExport = FindAllReferences.getImportOrExportSymbol(referenceLocation, referenceSymbol, state.checker, search.comingFrom === 1 /* Export */);
+                if (!importOrExport)
+                    return;
+                var symbol = importOrExport.symbol;
+                if (importOrExport.kind === 0 /* Import */) {
+                    if (!(isForRenameWithPrefixAndSuffixText(state.options))) {
+                        searchForImportedSymbol(symbol, state);
+                    }
+                }
+                else {
+                    searchForImportsOfExport(referenceLocation, symbol, importOrExport.exportInfo, state);
+                }
+            }
+            function getReferenceForShorthandProperty(_a, search, state) {
+                var flags = _a.flags, valueDeclaration = _a.valueDeclaration;
+                var shorthandValueSymbol = state.checker.getShorthandAssignmentValueSymbol(valueDeclaration);
+                var name = valueDeclaration && ts.getNameOfDeclaration(valueDeclaration);
+                /*
+                 * Because in short-hand property assignment, an identifier which stored as name of the short-hand property assignment
+                 * has two meanings: property name and property value. Therefore when we do findAllReference at the position where
+                 * an identifier is declared, the language service should return the position of the variable declaration as well as
+                 * the position in short-hand property assignment excluding property accessing. However, if we do findAllReference at the
+                 * position of property accessing, the referenceEntry of such position will be handled in the first case.
+                 */
+                if (!(flags & 33554432 /* Transient */) && name && search.includes(shorthandValueSymbol)) {
+                    addReference(name, shorthandValueSymbol, state);
+                }
+            }
+            function addReference(referenceLocation, relatedSymbol, state) {
+                var _a = "kind" in relatedSymbol ? relatedSymbol : { kind: undefined, symbol: relatedSymbol }, kind = _a.kind, symbol = _a.symbol;
+                var addRef = state.referenceAdder(symbol);
+                if (state.options.implementations) {
+                    addImplementationReferences(referenceLocation, addRef, state);
+                }
+                else {
+                    addRef(referenceLocation, kind);
+                }
+            }
+            /** Adds references when a constructor is used with `new this()` in its own class and `super()` calls in subclasses.  */
+            function addConstructorReferences(referenceLocation, sourceFile, search, state) {
+                if (ts.isNewExpressionTarget(referenceLocation)) {
+                    addReference(referenceLocation, search.symbol, state);
+                }
+                var pusher = function () { return state.referenceAdder(search.symbol); };
+                if (ts.isClassLike(referenceLocation.parent)) {
+                    ts.Debug.assert(referenceLocation.kind === 80 /* DefaultKeyword */ || referenceLocation.parent.name === referenceLocation);
+                    // This is the class declaration containing the constructor.
+                    findOwnConstructorReferences(search.symbol, sourceFile, pusher());
+                }
+                else {
+                    // If this class appears in `extends C`, then the extending class' "super" calls are references.
+                    var classExtending = tryGetClassByExtendingIdentifier(referenceLocation);
+                    if (classExtending) {
+                        findSuperConstructorAccesses(classExtending, pusher());
+                    }
+                }
+            }
+            function addClassStaticThisReferences(referenceLocation, search, state) {
+                addReference(referenceLocation, search.symbol, state);
+                var classLike = referenceLocation.parent;
+                if (state.options.isForRename || !ts.isClassLike(classLike))
+                    return;
+                ts.Debug.assert(classLike.name === referenceLocation);
+                var addRef = state.referenceAdder(search.symbol);
+                for (var _i = 0, _a = classLike.members; _i < _a.length; _i++) {
+                    var member = _a[_i];
+                    if (!(ts.isMethodOrAccessor(member) && ts.hasModifier(member, 32 /* Static */))) {
+                        continue;
+                    }
+                    if (member.body) {
+                        member.body.forEachChild(function cb(node) {
+                            if (node.kind === 100 /* ThisKeyword */) {
+                                addRef(node);
+                            }
+                            else if (!ts.isFunctionLike(node) && !ts.isClassLike(node)) {
+                                node.forEachChild(cb);
+                            }
+                        });
+                    }
+                }
+            }
+            /**
+             * `classSymbol` is the class where the constructor was defined.
+             * Reference the constructor and all calls to `new this()`.
+             */
+            function findOwnConstructorReferences(classSymbol, sourceFile, addNode) {
+                for (var _i = 0, _a = classSymbol.members.get("__constructor" /* Constructor */).declarations; _i < _a.length; _i++) {
+                    var decl = _a[_i];
+                    var ctrKeyword = ts.findChildOfKind(decl, 124 /* ConstructorKeyword */, sourceFile);
+                    ts.Debug.assert(decl.kind === 157 /* Constructor */ && !!ctrKeyword);
+                    addNode(ctrKeyword);
+                }
+                classSymbol.exports.forEach(function (member) {
+                    var decl = member.valueDeclaration;
+                    if (decl && decl.kind === 156 /* MethodDeclaration */) {
+                        var body = decl.body;
+                        if (body) {
+                            forEachDescendantOfKind(body, 100 /* ThisKeyword */, function (thisKeyword) {
+                                if (ts.isNewExpressionTarget(thisKeyword)) {
+                                    addNode(thisKeyword);
+                                }
+                            });
+                        }
+                    }
+                });
+            }
+            /** Find references to `super` in the constructor of an extending class.  */
+            function findSuperConstructorAccesses(cls, addNode) {
+                var ctr = cls.symbol.members.get("__constructor" /* Constructor */);
+                if (!ctr) {
+                    return;
+                }
+                for (var _i = 0, _a = ctr.declarations; _i < _a.length; _i++) {
+                    var decl = _a[_i];
+                    ts.Debug.assert(decl.kind === 157 /* Constructor */);
+                    var body = decl.body;
+                    if (body) {
+                        forEachDescendantOfKind(body, 98 /* SuperKeyword */, function (node) {
+                            if (ts.isCallExpressionTarget(node)) {
+                                addNode(node);
+                            }
+                        });
+                    }
+                }
+            }
+            function addImplementationReferences(refNode, addReference, state) {
+                // Check if we found a function/propertyAssignment/method with an implementation or initializer
+                if (ts.isDeclarationName(refNode) && isImplementation(refNode.parent)) {
+                    addReference(refNode);
+                    return;
+                }
+                if (refNode.kind !== 72 /* Identifier */) {
+                    return;
+                }
+                if (refNode.parent.kind === 276 /* ShorthandPropertyAssignment */) {
+                    // Go ahead and dereference the shorthand assignment by going to its definition
+                    getReferenceEntriesForShorthandPropertyAssignment(refNode, state.checker, addReference);
+                }
+                // Check if the node is within an extends or implements clause
+                var containingClass = getContainingClassIfInHeritageClause(refNode);
+                if (containingClass) {
+                    addReference(containingClass);
+                    return;
+                }
+                // If we got a type reference, try and see if the reference applies to any expressions that can implement an interface
+                // Find the first node whose parent isn't a type node -- i.e., the highest type node.
+                var typeNode = ts.findAncestor(refNode, function (a) { return !ts.isQualifiedName(a.parent) && !ts.isTypeNode(a.parent) && !ts.isTypeElement(a.parent); });
+                var typeHavingNode = typeNode.parent;
+                if (ts.hasType(typeHavingNode) && typeHavingNode.type === typeNode && state.markSeenContainingTypeReference(typeHavingNode)) {
+                    if (ts.hasInitializer(typeHavingNode)) {
+                        addIfImplementation(typeHavingNode.initializer);
+                    }
+                    else if (ts.isFunctionLike(typeHavingNode) && typeHavingNode.body) {
+                        var body = typeHavingNode.body;
+                        if (body.kind === 218 /* Block */) {
+                            ts.forEachReturnStatement(body, function (returnStatement) {
+                                if (returnStatement.expression)
+                                    addIfImplementation(returnStatement.expression);
+                            });
+                        }
+                        else {
+                            addIfImplementation(body);
+                        }
+                    }
+                    else if (ts.isAssertionExpression(typeHavingNode)) {
+                        addIfImplementation(typeHavingNode.expression);
+                    }
+                }
+                function addIfImplementation(e) {
+                    if (isImplementationExpression(e))
+                        addReference(e);
+                }
+            }
+            function getContainingClassIfInHeritageClause(node) {
+                return ts.isIdentifier(node) || ts.isPropertyAccessExpression(node) ? getContainingClassIfInHeritageClause(node.parent)
+                    : ts.isExpressionWithTypeArguments(node) ? ts.tryCast(node.parent.parent, ts.isClassLike) : undefined;
+            }
+            /**
+             * Returns true if this is an expression that can be considered an implementation
+             */
+            function isImplementationExpression(node) {
+                switch (node.kind) {
+                    case 195 /* ParenthesizedExpression */:
+                        return isImplementationExpression(node.expression);
+                    case 197 /* ArrowFunction */:
+                    case 196 /* FunctionExpression */:
+                    case 188 /* ObjectLiteralExpression */:
+                    case 209 /* ClassExpression */:
+                    case 187 /* ArrayLiteralExpression */:
+                        return true;
+                    default:
+                        return false;
+                }
+            }
+            /**
+             * Determines if the parent symbol occurs somewhere in the child's ancestry. If the parent symbol
+             * is an interface, determines if some ancestor of the child symbol extends or inherits from it.
+             * Also takes in a cache of previous results which makes this slightly more efficient and is
+             * necessary to avoid potential loops like so:
+             *     class A extends B { }
+             *     class B extends A { }
+             *
+             * We traverse the AST rather than using the type checker because users are typically only interested
+             * in explicit implementations of an interface/class when calling "Go to Implementation". Sibling
+             * implementations of types that share a common ancestor with the type whose implementation we are
+             * searching for need to be filtered out of the results. The type checker doesn't let us make the
+             * distinction between structurally compatible implementations and explicit implementations, so we
+             * must use the AST.
+             *
+             * @param symbol         A class or interface Symbol
+             * @param parent        Another class or interface Symbol
+             * @param cachedResults A map of symbol id pairs (i.e. "child,parent") to booleans indicating previous results
+             */
+            function explicitlyInheritsFrom(symbol, parent, cachedResults, checker) {
+                if (symbol === parent) {
+                    return true;
+                }
+                var key = ts.getSymbolId(symbol) + "," + ts.getSymbolId(parent);
+                var cached = cachedResults.get(key);
+                if (cached !== undefined) {
+                    return cached;
+                }
+                // Set the key so that we don't infinitely recurse
+                cachedResults.set(key, false);
+                var inherits = symbol.declarations.some(function (declaration) {
+                    return ts.getAllSuperTypeNodes(declaration).some(function (typeReference) {
+                        var type = checker.getTypeAtLocation(typeReference);
+                        return !!type && !!type.symbol && explicitlyInheritsFrom(type.symbol, parent, cachedResults, checker);
+                    });
+                });
+                cachedResults.set(key, inherits);
+                return inherits;
+            }
+            function getReferencesForSuperKeyword(superKeyword) {
+                var searchSpaceNode = ts.getSuperContainer(superKeyword, /*stopOnFunctions*/ false);
+                if (!searchSpaceNode) {
+                    return undefined;
+                }
+                // Whether 'super' occurs in a static context within a class.
+                var staticFlag = 32 /* Static */;
+                switch (searchSpaceNode.kind) {
+                    case 154 /* PropertyDeclaration */:
+                    case 153 /* PropertySignature */:
+                    case 156 /* MethodDeclaration */:
+                    case 155 /* MethodSignature */:
+                    case 157 /* Constructor */:
+                    case 158 /* GetAccessor */:
+                    case 159 /* SetAccessor */:
+                        staticFlag &= ts.getModifierFlags(searchSpaceNode);
+                        searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
+                        break;
+                    default:
+                        return undefined;
+                }
+                var sourceFile = searchSpaceNode.getSourceFile();
+                var references = ts.mapDefined(getPossibleSymbolReferenceNodes(sourceFile, "super", searchSpaceNode), function (node) {
+                    if (node.kind !== 98 /* SuperKeyword */) {
+                        return;
+                    }
+                    var container = ts.getSuperContainer(node, /*stopOnFunctions*/ false);
+                    // If we have a 'super' container, we must have an enclosing class.
+                    // Now make sure the owning class is the same as the search-space
+                    // and has the same static qualifier as the original 'super's owner.
+                    return container && (32 /* Static */ & ts.getModifierFlags(container)) === staticFlag && container.parent.symbol === searchSpaceNode.symbol ? FindAllReferences.nodeEntry(node) : undefined;
+                });
+                return [{ definition: { type: 0 /* Symbol */, symbol: searchSpaceNode.symbol }, references: references }];
+            }
+            function isParameterName(node) {
+                return node.kind === 72 /* Identifier */ && node.parent.kind === 151 /* Parameter */ && node.parent.name === node;
+            }
+            function getReferencesForThisKeyword(thisOrSuperKeyword, sourceFiles, cancellationToken) {
+                var searchSpaceNode = ts.getThisContainer(thisOrSuperKeyword, /* includeArrowFunctions */ false);
+                // Whether 'this' occurs in a static context within a class.
+                var staticFlag = 32 /* Static */;
+                switch (searchSpaceNode.kind) {
+                    case 156 /* MethodDeclaration */:
+                    case 155 /* MethodSignature */:
+                        if (ts.isObjectLiteralMethod(searchSpaceNode)) {
+                            break;
+                        }
+                    // falls through
+                    case 154 /* PropertyDeclaration */:
+                    case 153 /* PropertySignature */:
+                    case 157 /* Constructor */:
+                    case 158 /* GetAccessor */:
+                    case 159 /* SetAccessor */:
+                        staticFlag &= ts.getModifierFlags(searchSpaceNode);
+                        searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
+                        break;
+                    case 279 /* SourceFile */:
+                        if (ts.isExternalModule(searchSpaceNode) || isParameterName(thisOrSuperKeyword)) {
+                            return undefined;
+                        }
+                    // falls through
+                    case 239 /* FunctionDeclaration */:
+                    case 196 /* FunctionExpression */:
+                        break;
+                    // Computed properties in classes are not handled here because references to this are illegal,
+                    // so there is no point finding references to them.
+                    default:
+                        return undefined;
+                }
+                var references = ts.flatMap(searchSpaceNode.kind === 279 /* SourceFile */ ? sourceFiles : [searchSpaceNode.getSourceFile()], function (sourceFile) {
+                    cancellationToken.throwIfCancellationRequested();
+                    return getPossibleSymbolReferenceNodes(sourceFile, "this", ts.isSourceFile(searchSpaceNode) ? sourceFile : searchSpaceNode).filter(function (node) {
+                        if (!ts.isThis(node)) {
+                            return false;
+                        }
+                        var container = ts.getThisContainer(node, /* includeArrowFunctions */ false);
+                        switch (searchSpaceNode.kind) {
+                            case 196 /* FunctionExpression */:
+                            case 239 /* FunctionDeclaration */:
+                                return searchSpaceNode.symbol === container.symbol;
+                            case 156 /* MethodDeclaration */:
+                            case 155 /* MethodSignature */:
+                                return ts.isObjectLiteralMethod(searchSpaceNode) && searchSpaceNode.symbol === container.symbol;
+                            case 209 /* ClassExpression */:
+                            case 240 /* ClassDeclaration */:
+                                // Make sure the container belongs to the same class
+                                // and has the appropriate static modifier from the original container.
+                                return container.parent && searchSpaceNode.symbol === container.parent.symbol && (ts.getModifierFlags(container) & 32 /* Static */) === staticFlag;
+                            case 279 /* SourceFile */:
+                                return container.kind === 279 /* SourceFile */ && !ts.isExternalModule(container) && !isParameterName(node);
+                        }
+                    });
+                }).map(function (n) { return FindAllReferences.nodeEntry(n); });
+                var thisParameter = ts.firstDefined(references, function (r) { return ts.isParameter(r.node.parent) ? r.node : undefined; });
+                return [{
+                        definition: { type: 3 /* This */, node: thisParameter || thisOrSuperKeyword },
+                        references: references
+                    }];
+            }
+            function getReferencesForStringLiteral(node, sourceFiles, cancellationToken) {
+                var references = ts.flatMap(sourceFiles, function (sourceFile) {
+                    cancellationToken.throwIfCancellationRequested();
+                    return ts.mapDefined(getPossibleSymbolReferenceNodes(sourceFile, node.text), function (ref) {
+                        return ts.isStringLiteral(ref) && ref.text === node.text ? FindAllReferences.nodeEntry(ref, 2 /* StringLiteral */) : undefined;
+                    });
+                });
+                return [{
+                        definition: { type: 4 /* String */, node: node },
+                        references: references
+                    }];
+            }
+            // For certain symbol kinds, we need to include other symbols in the search set.
+            // This is not needed when searching for re-exports.
+            function populateSearchSymbolSet(symbol, location, checker, isForRename, providePrefixAndSuffixText, implementations) {
+                var result = [];
+                forEachRelatedSymbol(symbol, location, checker, isForRename, !(isForRename && providePrefixAndSuffixText), function (sym, root, base) { result.push(base || root || sym); }, 
+                /*allowBaseTypes*/ function () { return !implementations; });
+                return result;
+            }
+            function forEachRelatedSymbol(symbol, location, checker, isForRenamePopulateSearchSymbolSet, onlyIncludeBindingElementAtReferenceLocation, cbSymbol, allowBaseTypes) {
+                var containingObjectLiteralElement = ts.getContainingObjectLiteralElement(location);
+                if (containingObjectLiteralElement) {
+                    /* Because in short-hand property assignment, location has two meaning : property name and as value of the property
+                     * When we do findAllReference at the position of the short-hand property assignment, we would want to have references to position of
+                     * property name and variable declaration of the identifier.
+                     * Like in below example, when querying for all references for an identifier 'name', of the property assignment, the language service
+                     * should show both 'name' in 'obj' and 'name' in variable declaration
+                     *      const name = "Foo";
+                     *      const obj = { name };
+                     * In order to do that, we will populate the search set with the value symbol of the identifier as a value of the property assignment
+                     * so that when matching with potential reference symbol, both symbols from property declaration and variable declaration
+                     * will be included correctly.
+                     */
+                    var shorthandValueSymbol = checker.getShorthandAssignmentValueSymbol(location.parent); // gets the local symbol
+                    if (shorthandValueSymbol && isForRenamePopulateSearchSymbolSet) {
+                        // When renaming 'x' in `const o = { x }`, just rename the local variable, not the property.
+                        return cbSymbol(shorthandValueSymbol, /*rootSymbol*/ undefined, /*baseSymbol*/ undefined, 3 /* SearchedLocalFoundProperty */);
+                    }
+                    // If the location is in a context sensitive location (i.e. in an object literal) try
+                    // to get a contextual type for it, and add the property symbol from the contextual
+                    // type to the search set
+                    var contextualType = checker.getContextualType(containingObjectLiteralElement.parent);
+                    var res_1 = contextualType && ts.firstDefined(ts.getPropertySymbolsFromContextualType(containingObjectLiteralElement, checker, contextualType, /*unionSymbolOk*/ true), function (sym) { return fromRoot(sym, 4 /* SearchedPropertyFoundLocal */); });
+                    if (res_1)
+                        return res_1;
+                    // If the location is name of property symbol from object literal destructuring pattern
+                    // Search the property symbol
+                    //      for ( { property: p2 } of elems) { }
+                    var propertySymbol = getPropertySymbolOfDestructuringAssignment(location, checker);
+                    var res1 = propertySymbol && cbSymbol(propertySymbol, /*rootSymbol*/ undefined, /*baseSymbol*/ undefined, 4 /* SearchedPropertyFoundLocal */);
+                    if (res1)
+                        return res1;
+                    var res2 = shorthandValueSymbol && cbSymbol(shorthandValueSymbol, /*rootSymbol*/ undefined, /*baseSymbol*/ undefined, 3 /* SearchedLocalFoundProperty */);
+                    if (res2)
+                        return res2;
+                }
+                var aliasedSymbol = getMergedAliasedSymbolOfNamespaceExportDeclaration(location, symbol, checker);
+                if (aliasedSymbol) {
+                    // In case of UMD module and global merging, search for global as well
+                    var res_2 = cbSymbol(aliasedSymbol, /*rootSymbol*/ undefined, /*baseSymbol*/ undefined, 1 /* Node */);
+                    if (res_2)
+                        return res_2;
+                }
+                var res = fromRoot(symbol);
+                if (res)
+                    return res;
+                if (symbol.valueDeclaration && ts.isParameterPropertyDeclaration(symbol.valueDeclaration)) {
+                    // For a parameter property, now try on the other symbol (property if this was a parameter, parameter if this was a property).
+                    var paramProps = checker.getSymbolsOfParameterPropertyDeclaration(ts.cast(symbol.valueDeclaration, ts.isParameter), symbol.name);
+                    ts.Debug.assert(paramProps.length === 2 && !!(paramProps[0].flags & 1 /* FunctionScopedVariable */) && !!(paramProps[1].flags & 4 /* Property */)); // is [parameter, property]
+                    return fromRoot(symbol.flags & 1 /* FunctionScopedVariable */ ? paramProps[1] : paramProps[0]);
+                }
+                // symbolAtLocation for a binding element is the local symbol. See if the search symbol is the property.
+                // Don't do this when populating search set for a rename when prefix and suffix text will be provided -- just rename the local.
+                if (!isForRenamePopulateSearchSymbolSet) {
+                    var bindingElementPropertySymbol = void 0;
+                    if (onlyIncludeBindingElementAtReferenceLocation) {
+                        bindingElementPropertySymbol = ts.isObjectBindingElementWithoutPropertyName(location.parent) ? ts.getPropertySymbolFromBindingElement(checker, location.parent) : undefined;
+                    }
+                    else {
+                        bindingElementPropertySymbol = getPropertySymbolOfObjectBindingPatternWithoutPropertyName(symbol, checker);
+                    }
+                    return bindingElementPropertySymbol && fromRoot(bindingElementPropertySymbol, 4 /* SearchedPropertyFoundLocal */);
+                }
+                ts.Debug.assert(isForRenamePopulateSearchSymbolSet);
+                // due to the above assert and the arguments at the uses of this function,
+                // (onlyIncludeBindingElementAtReferenceLocation <=> !providePrefixAndSuffixTextForRename) holds
+                var includeOriginalSymbolOfBindingElement = onlyIncludeBindingElementAtReferenceLocation;
+                if (includeOriginalSymbolOfBindingElement) {
+                    var bindingElementPropertySymbol = getPropertySymbolOfObjectBindingPatternWithoutPropertyName(symbol, checker);
+                    return bindingElementPropertySymbol && fromRoot(bindingElementPropertySymbol, 4 /* SearchedPropertyFoundLocal */);
+                }
+                function fromRoot(sym, kind) {
+                    // If this is a union property:
+                    //   - In populateSearchSymbolsSet we will add all the symbols from all its source symbols in all unioned types.
+                    //   - In findRelatedSymbol, we will just use the union symbol if any source symbol is included in the search.
+                    // If the symbol is an instantiation from a another symbol (e.g. widened symbol):
+                    //   - In populateSearchSymbolsSet, add the root the list
+                    //   - In findRelatedSymbol, return the source symbol if that is in the search. (Do not return the instantiation symbol.)
+                    return ts.firstDefined(checker.getRootSymbols(sym), function (rootSymbol) {
+                        return cbSymbol(sym, rootSymbol, /*baseSymbol*/ undefined, kind)
+                            // Add symbol of properties/methods of the same name in base classes and implemented interfaces definitions
+                            || (rootSymbol.parent && rootSymbol.parent.flags & (32 /* Class */ | 64 /* Interface */) && allowBaseTypes(rootSymbol)
+                                ? ts.getPropertySymbolsFromBaseTypes(rootSymbol.parent, rootSymbol.name, checker, function (base) { return cbSymbol(sym, rootSymbol, base, kind); })
+                                : undefined);
+                    });
+                }
+                function getPropertySymbolOfObjectBindingPatternWithoutPropertyName(symbol, checker) {
+                    var bindingElement = ts.getDeclarationOfKind(symbol, 186 /* BindingElement */);
+                    if (bindingElement && ts.isObjectBindingElementWithoutPropertyName(bindingElement)) {
+                        return ts.getPropertySymbolFromBindingElement(checker, bindingElement);
+                    }
+                }
+            }
+            function getRelatedSymbol(search, referenceSymbol, referenceLocation, state) {
+                var checker = state.checker;
+                return forEachRelatedSymbol(referenceSymbol, referenceLocation, checker, /*isForRenamePopulateSearchSymbolSet*/ false, 
+                /*onlyIncludeBindingElementAtReferenceLocation*/ !state.options.isForRename || !!state.options.providePrefixAndSuffixTextForRename, function (sym, rootSymbol, baseSymbol, kind) { return search.includes(baseSymbol || rootSymbol || sym)
+                    // For a base type, use the symbol for the derived type. For a synthetic (e.g. union) property, use the union symbol.
+                    ? { symbol: rootSymbol && !(ts.getCheckFlags(sym) & 6 /* Synthetic */) ? rootSymbol : sym, kind: kind }
+                    : undefined; }, 
+                /*allowBaseTypes*/ function (rootSymbol) {
+                    return !(search.parents && !search.parents.some(function (parent) { return explicitlyInheritsFrom(rootSymbol.parent, parent, state.inheritsFromCache, checker); }));
+                });
+            }
+            /**
+             * Given an initial searchMeaning, extracted from a location, widen the search scope based on the declarations
+             * of the corresponding symbol. e.g. if we are searching for "Foo" in value position, but "Foo" references a class
+             * then we need to widen the search to include type positions as well.
+             * On the contrary, if we are searching for "Bar" in type position and we trace bar to an interface, and an uninstantiated
+             * module, we want to keep the search limited to only types, as the two declarations (interface and uninstantiated module)
+             * do not intersect in any of the three spaces.
+             */
+            function getIntersectingMeaningFromDeclarations(node, symbol) {
+                var meaning = ts.getMeaningFromLocation(node);
+                var declarations = symbol.declarations;
+                if (declarations) {
+                    var lastIterationMeaning = void 0;
+                    do {
+                        // The result is order-sensitive, for instance if initialMeaning === Namespace, and declarations = [class, instantiated module]
+                        // we need to consider both as they initialMeaning intersects with the module in the namespace space, and the module
+                        // intersects with the class in the value space.
+                        // To achieve that we will keep iterating until the result stabilizes.
+                        // Remember the last meaning
+                        lastIterationMeaning = meaning;
+                        for (var _i = 0, declarations_12 = declarations; _i < declarations_12.length; _i++) {
+                            var declaration = declarations_12[_i];
+                            var declarationMeaning = ts.getMeaningFromDeclaration(declaration);
+                            if (declarationMeaning & meaning) {
+                                meaning |= declarationMeaning;
+                            }
+                        }
+                    } while (meaning !== lastIterationMeaning);
+                }
+                return meaning;
+            }
+            Core.getIntersectingMeaningFromDeclarations = getIntersectingMeaningFromDeclarations;
+            function isImplementation(node) {
+                return !!(node.flags & 4194304 /* Ambient */)
+                    ? !(ts.isInterfaceDeclaration(node) || ts.isTypeAliasDeclaration(node))
+                    : (ts.isVariableLike(node) ? ts.hasInitializer(node)
+                        : ts.isFunctionLikeDeclaration(node) ? !!node.body
+                            : ts.isClassLike(node) || ts.isModuleOrEnumDeclaration(node));
+            }
+            function getReferenceEntriesForShorthandPropertyAssignment(node, checker, addReference) {
+                var refSymbol = checker.getSymbolAtLocation(node);
+                var shorthandSymbol = checker.getShorthandAssignmentValueSymbol(refSymbol.valueDeclaration);
+                if (shorthandSymbol) {
+                    for (var _i = 0, _a = shorthandSymbol.getDeclarations(); _i < _a.length; _i++) {
+                        var declaration = _a[_i];
+                        if (ts.getMeaningFromDeclaration(declaration) & 1 /* Value */) {
+                            addReference(declaration);
+                        }
+                    }
+                }
+            }
+            Core.getReferenceEntriesForShorthandPropertyAssignment = getReferenceEntriesForShorthandPropertyAssignment;
+            function forEachDescendantOfKind(node, kind, action) {
+                ts.forEachChild(node, function (child) {
+                    if (child.kind === kind) {
+                        action(child);
+                    }
+                    forEachDescendantOfKind(child, kind, action);
+                });
+            }
+            /** Get `C` given `N` if `N` is in the position `class C extends N` or `class C extends foo.N` where `N` is an identifier. */
+            function tryGetClassByExtendingIdentifier(node) {
+                return ts.tryGetClassExtendingExpressionWithTypeArguments(ts.climbPastPropertyAccess(node).parent);
+            }
+            /**
+             * If we are just looking for implementations and this is a property access expression, we need to get the
+             * symbol of the local type of the symbol the property is being accessed on. This is because our search
+             * symbol may have a different parent symbol if the local type's symbol does not declare the property
+             * being accessed (i.e. it is declared in some parent class or interface)
+             */
+            function getParentSymbolsOfPropertyAccess(location, symbol, checker) {
+                var propertyAccessExpression = ts.isRightSideOfPropertyAccess(location) ? location.parent : undefined;
+                var lhsType = propertyAccessExpression && checker.getTypeAtLocation(propertyAccessExpression.expression);
+                var res = ts.mapDefined(lhsType && (lhsType.isUnionOrIntersection() ? lhsType.types : lhsType.symbol === symbol.parent ? undefined : [lhsType]), function (t) {
+                    return t.symbol && t.symbol.flags & (32 /* Class */ | 64 /* Interface */) ? t.symbol : undefined;
+                });
+                return res.length === 0 ? undefined : res;
+            }
+            function isForRenameWithPrefixAndSuffixText(options) {
+                return options.isForRename && options.providePrefixAndSuffixTextForRename;
+            }
+        })(Core = FindAllReferences.Core || (FindAllReferences.Core = {}));
+    })(FindAllReferences = ts.FindAllReferences || (ts.FindAllReferences = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    function getEditsForFileRename(program, oldFileOrDirPath, newFileOrDirPath, host, formatContext, _preferences, sourceMapper) {
+        var useCaseSensitiveFileNames = ts.hostUsesCaseSensitiveFileNames(host);
+        var getCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
+        var oldToNew = getPathUpdater(oldFileOrDirPath, newFileOrDirPath, getCanonicalFileName, sourceMapper);
+        var newToOld = getPathUpdater(newFileOrDirPath, oldFileOrDirPath, getCanonicalFileName, sourceMapper);
+        return ts.textChanges.ChangeTracker.with({ host: host, formatContext: formatContext }, function (changeTracker) {
+            updateTsconfigFiles(program, changeTracker, oldToNew, oldFileOrDirPath, newFileOrDirPath, host.getCurrentDirectory(), useCaseSensitiveFileNames);
+            updateImports(program, changeTracker, oldToNew, newToOld, host, getCanonicalFileName);
+        });
+    }
+    ts.getEditsForFileRename = getEditsForFileRename;
+    // exported for tests
+    function getPathUpdater(oldFileOrDirPath, newFileOrDirPath, getCanonicalFileName, sourceMapper) {
+        var canonicalOldPath = getCanonicalFileName(oldFileOrDirPath);
+        return function (path) {
+            var originalPath = sourceMapper && sourceMapper.tryGetSourcePosition({ fileName: path, pos: 0 });
+            var updatedPath = getUpdatedPath(originalPath ? originalPath.fileName : path);
+            return originalPath
+                ? updatedPath === undefined ? undefined : makeCorrespondingRelativeChange(originalPath.fileName, updatedPath, path, getCanonicalFileName)
+                : updatedPath;
+        };
+        function getUpdatedPath(pathToUpdate) {
+            if (getCanonicalFileName(pathToUpdate) === canonicalOldPath)
+                return newFileOrDirPath;
+            var suffix = ts.tryRemoveDirectoryPrefix(pathToUpdate, canonicalOldPath, getCanonicalFileName);
+            return suffix === undefined ? undefined : newFileOrDirPath + "/" + suffix;
+        }
+    }
+    ts.getPathUpdater = getPathUpdater;
+    // Relative path from a0 to b0 should be same as relative path from a1 to b1. Returns b1.
+    function makeCorrespondingRelativeChange(a0, b0, a1, getCanonicalFileName) {
+        var rel = ts.getRelativePathFromFile(a0, b0, getCanonicalFileName);
+        return combinePathsSafe(ts.getDirectoryPath(a1), rel);
+    }
+    function updateTsconfigFiles(program, changeTracker, oldToNew, oldFileOrDirPath, newFileOrDirPath, currentDirectory, useCaseSensitiveFileNames) {
+        var configFile = program.getCompilerOptions().configFile;
+        if (!configFile)
+            return;
+        var configDir = ts.getDirectoryPath(configFile.fileName);
+        var jsonObjectLiteral = ts.getTsConfigObjectLiteralExpression(configFile);
+        if (!jsonObjectLiteral)
+            return;
+        forEachProperty(jsonObjectLiteral, function (property, propertyName) {
+            switch (propertyName) {
+                case "files":
+                case "include":
+                case "exclude": {
+                    var foundExactMatch = updatePaths(property);
+                    if (!foundExactMatch && propertyName === "include" && ts.isArrayLiteralExpression(property.initializer)) {
+                        var includes = ts.mapDefined(property.initializer.elements, function (e) { return ts.isStringLiteral(e) ? e.text : undefined; });
+                        var matchers = ts.getFileMatcherPatterns(configDir, /*excludes*/ [], includes, useCaseSensitiveFileNames, currentDirectory);
+                        // If there isn't some include for this, add a new one.
+                        if (ts.getRegexFromPattern(ts.Debug.assertDefined(matchers.includeFilePattern), useCaseSensitiveFileNames).test(oldFileOrDirPath) &&
+                            !ts.getRegexFromPattern(ts.Debug.assertDefined(matchers.includeFilePattern), useCaseSensitiveFileNames).test(newFileOrDirPath)) {
+                            changeTracker.insertNodeAfter(configFile, ts.last(property.initializer.elements), ts.createStringLiteral(relativePath(newFileOrDirPath)));
+                        }
+                    }
+                    break;
+                }
+                case "compilerOptions":
+                    forEachProperty(property.initializer, function (property, propertyName) {
+                        var option = ts.getOptionFromName(propertyName);
+                        if (option && (option.isFilePath || option.type === "list" && option.element.isFilePath)) {
+                            updatePaths(property);
+                        }
+                        else if (propertyName === "paths") {
+                            forEachProperty(property.initializer, function (pathsProperty) {
+                                if (!ts.isArrayLiteralExpression(pathsProperty.initializer))
+                                    return;
+                                for (var _i = 0, _a = pathsProperty.initializer.elements; _i < _a.length; _i++) {
+                                    var e = _a[_i];
+                                    tryUpdateString(e);
+                                }
+                            });
+                        }
+                    });
+                    break;
+            }
+        });
+        function updatePaths(property) {
+            // Type annotation needed due to #7294
+            var elements = ts.isArrayLiteralExpression(property.initializer) ? property.initializer.elements : [property.initializer];
+            var foundExactMatch = false;
+            for (var _i = 0, elements_5 = elements; _i < elements_5.length; _i++) {
+                var element = elements_5[_i];
+                foundExactMatch = tryUpdateString(element) || foundExactMatch;
+            }
+            return foundExactMatch;
+        }
+        function tryUpdateString(element) {
+            if (!ts.isStringLiteral(element))
+                return false;
+            var elementFileName = combinePathsSafe(configDir, element.text);
+            var updated = oldToNew(elementFileName);
+            if (updated !== undefined) {
+                changeTracker.replaceRangeWithText(configFile, createStringRange(element, configFile), relativePath(updated));
+                return true;
+            }
+            return false;
+        }
+        function relativePath(path) {
+            return ts.getRelativePathFromDirectory(configDir, path, /*ignoreCase*/ !useCaseSensitiveFileNames);
+        }
+    }
+    function updateImports(program, changeTracker, oldToNew, newToOld, host, getCanonicalFileName) {
+        var allFiles = program.getSourceFiles();
+        var _loop_14 = function (sourceFile) {
+            var newFromOld = oldToNew(sourceFile.path);
+            var newImportFromPath = newFromOld !== undefined ? newFromOld : sourceFile.path;
+            var newImportFromDirectory = ts.getDirectoryPath(newImportFromPath);
+            var oldFromNew = newToOld(sourceFile.fileName);
+            var oldImportFromPath = oldFromNew || sourceFile.fileName;
+            var oldImportFromDirectory = ts.getDirectoryPath(oldImportFromPath);
+            var importingSourceFileMoved = newFromOld !== undefined || oldFromNew !== undefined;
+            updateImportsWorker(sourceFile, changeTracker, function (referenceText) {
+                if (!ts.pathIsRelative(referenceText))
+                    return undefined;
+                var oldAbsolute = combinePathsSafe(oldImportFromDirectory, referenceText);
+                var newAbsolute = oldToNew(oldAbsolute);
+                return newAbsolute === undefined ? undefined : ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(newImportFromDirectory, newAbsolute, getCanonicalFileName));
+            }, function (importLiteral) {
+                var importedModuleSymbol = program.getTypeChecker().getSymbolAtLocation(importLiteral);
+                // No need to update if it's an ambient module^M
+                if (importedModuleSymbol && importedModuleSymbol.declarations.some(function (d) { return ts.isAmbientModule(d); }))
+                    return undefined;
+                var toImport = oldFromNew !== undefined
+                    // If we're at the new location (file was already renamed), need to redo module resolution starting from the old location.
+                    // TODO:GH#18217
+                    ? getSourceFileToImportFromResolved(ts.resolveModuleName(importLiteral.text, oldImportFromPath, program.getCompilerOptions(), host), oldToNew)
+                    : getSourceFileToImport(importedModuleSymbol, importLiteral, sourceFile, program, host, oldToNew);
+                // Need an update if the imported file moved, or the importing file moved and was using a relative path.
+                return toImport !== undefined && (toImport.updated || (importingSourceFileMoved && ts.pathIsRelative(importLiteral.text)))
+                    ? ts.moduleSpecifiers.updateModuleSpecifier(program.getCompilerOptions(), newImportFromPath, toImport.newFileName, host, allFiles, program.redirectTargetsMap, importLiteral.text)
+                    : undefined;
+            });
+        };
+        for (var _i = 0, allFiles_1 = allFiles; _i < allFiles_1.length; _i++) {
+            var sourceFile = allFiles_1[_i];
+            _loop_14(sourceFile);
+        }
+    }
+    function combineNormal(pathA, pathB) {
+        return ts.normalizePath(ts.combinePaths(pathA, pathB));
+    }
+    function combinePathsSafe(pathA, pathB) {
+        return ts.ensurePathIsNonModuleName(combineNormal(pathA, pathB));
+    }
+    function getSourceFileToImport(importedModuleSymbol, importLiteral, importingSourceFile, program, host, oldToNew) {
+        if (importedModuleSymbol) {
+            // `find` should succeed because we checked for ambient modules before calling this function.
+            var oldFileName = ts.find(importedModuleSymbol.declarations, ts.isSourceFile).fileName;
+            var newFileName = oldToNew(oldFileName);
+            return newFileName === undefined ? { newFileName: oldFileName, updated: false } : { newFileName: newFileName, updated: true };
+        }
+        else {
+            var resolved = host.resolveModuleNames
+                ? host.getResolvedModuleWithFailedLookupLocationsFromCache && host.getResolvedModuleWithFailedLookupLocationsFromCache(importLiteral.text, importingSourceFile.fileName)
+                : program.getResolvedModuleWithFailedLookupLocationsFromCache(importLiteral.text, importingSourceFile.fileName);
+            return getSourceFileToImportFromResolved(resolved, oldToNew);
+        }
+    }
+    function getSourceFileToImportFromResolved(resolved, oldToNew) {
+        // Search through all locations looking for a moved file, and only then test already existing files.
+        // This is because if `a.ts` is compiled to `a.js` and `a.ts` is moved, we don't want to resolve anything to `a.js`, but to `a.ts`'s new location.
+        if (!resolved)
+            return undefined;
+        // First try resolved module
+        if (resolved.resolvedModule) {
+            var result_9 = tryChange(resolved.resolvedModule.resolvedFileName);
+            if (result_9)
+                return result_9;
+        }
+        // Then failed lookups except package.json since we dont want to touch them (only included ts/js files)
+        var result = ts.forEach(resolved.failedLookupLocations, tryChangeWithIgnoringPackageJson);
+        if (result)
+            return result;
+        // If nothing changed, then result is resolved module file thats not updated
+        return resolved.resolvedModule && { newFileName: resolved.resolvedModule.resolvedFileName, updated: false };
+        function tryChangeWithIgnoringPackageJson(oldFileName) {
+            return !ts.endsWith(oldFileName, "/package.json") ? tryChange(oldFileName) : undefined;
+        }
+        function tryChange(oldFileName) {
+            var newFileName = oldToNew(oldFileName);
+            return newFileName && { newFileName: newFileName, updated: true };
+        }
+    }
+    function updateImportsWorker(sourceFile, changeTracker, updateRef, updateImport) {
+        for (var _i = 0, _a = sourceFile.referencedFiles || ts.emptyArray; _i < _a.length; _i++) { // TODO: GH#26162
+            var ref = _a[_i];
+            var updated = updateRef(ref.fileName);
+            if (updated !== undefined && updated !== sourceFile.text.slice(ref.pos, ref.end))
+                changeTracker.replaceRangeWithText(sourceFile, ref, updated);
+        }
+        for (var _b = 0, _c = sourceFile.imports; _b < _c.length; _b++) {
+            var importStringLiteral = _c[_b];
+            var updated = updateImport(importStringLiteral);
+            if (updated !== undefined && updated !== importStringLiteral.text)
+                changeTracker.replaceRangeWithText(sourceFile, createStringRange(importStringLiteral, sourceFile), updated);
+        }
+    }
+    function createStringRange(node, sourceFile) {
+        return ts.createRange(node.getStart(sourceFile) + 1, node.end - 1);
+    }
+    function forEachProperty(objectLiteral, cb) {
+        if (!ts.isObjectLiteralExpression(objectLiteral))
+            return;
+        for (var _i = 0, _a = objectLiteral.properties; _i < _a.length; _i++) {
+            var property = _a[_i];
+            if (ts.isPropertyAssignment(property) && ts.isStringLiteral(property.name)) {
+                cb(property, property.name.text);
+            }
+        }
+    }
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var GoToDefinition;
+    (function (GoToDefinition) {
+        function getDefinitionAtPosition(program, sourceFile, position) {
+            var reference = getReferenceAtPosition(sourceFile, position, program);
+            if (reference) {
+                return [getDefinitionInfoForFileReference(reference.fileName, reference.file.fileName)];
+            }
+            var node = ts.getTouchingPropertyName(sourceFile, position);
+            if (node === sourceFile) {
+                return undefined;
+            }
+            var parent = node.parent;
+            // Labels
+            if (ts.isJumpStatementTarget(node)) {
+                var label = ts.getTargetLabel(node.parent, node.text);
+                return label ? [createDefinitionInfoFromName(label, "label" /* label */, node.text, /*containerName*/ undefined)] : undefined; // TODO: GH#18217
+            }
+            var typeChecker = program.getTypeChecker();
+            var symbol = getSymbol(node, typeChecker);
+            // Could not find a symbol e.g. node is string or number keyword,
+            // or the symbol was an internal symbol and does not have a declaration e.g. undefined symbol
+            if (!symbol) {
+                return getDefinitionInfoForIndexSignatures(node, typeChecker);
+            }
+            var calledDeclaration = tryGetSignatureDeclaration(typeChecker, node);
+            // Don't go to the component constructor definition for a JSX element, just go to the component definition.
+            if (calledDeclaration && !(ts.isJsxOpeningLikeElement(node.parent) && isConstructorLike(calledDeclaration))) {
+                var sigInfo = createDefinitionFromSignatureDeclaration(typeChecker, calledDeclaration);
+                // For a function, if this is the original function definition, return just sigInfo.
+                // If this is the original constructor definition, parent is the class.
+                if (typeChecker.getRootSymbols(symbol).some(function (s) { return symbolMatchesSignature(s, calledDeclaration); }) ||
+                    // TODO: GH#25533 Following check shouldn't be necessary if 'require' is an alias
+                    symbol.declarations && symbol.declarations.some(function (d) { return ts.isVariableDeclaration(d) && !!d.initializer && ts.isRequireCall(d.initializer, /*checkArgumentIsStringLiteralLike*/ false); })) {
+                    return [sigInfo];
+                }
+                else {
+                    var defs = getDefinitionFromSymbol(typeChecker, symbol, node) || ts.emptyArray;
+                    // For a 'super()' call, put the signature first, else put the variable first.
+                    return node.kind === 98 /* SuperKeyword */ ? [sigInfo].concat(defs) : defs.concat([sigInfo]);
+                }
+            }
+            // Because name in short-hand property assignment has two different meanings: property name and property value,
+            // using go-to-definition at such position should go to the variable declaration of the property value rather than
+            // go to the declaration of the property name (in this case stay at the same position). However, if go-to-definition
+            // is performed at the location of property access, we would like to go to definition of the property in the short-hand
+            // assignment. This case and others are handled by the following code.
+            if (node.parent.kind === 276 /* ShorthandPropertyAssignment */) {
+                var shorthandSymbol_1 = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
+                return shorthandSymbol_1 ? shorthandSymbol_1.declarations.map(function (decl) { return createDefinitionInfo(decl, typeChecker, shorthandSymbol_1, node); }) : [];
+            }
+            // If the node is the name of a BindingElement within an ObjectBindingPattern instead of just returning the
+            // declaration the symbol (which is itself), we should try to get to the original type of the ObjectBindingPattern
+            // and return the property declaration for the referenced property.
+            // For example:
+            //      import('./foo').then(({ b/*goto*/ar }) => undefined); => should get use to the declaration in file "./foo"
+            //
+            //      function bar<T>(onfulfilled: (value: T) => void) { //....}
+            //      interface Test {
+            //          pr/*destination*/op1: number
+            //      }
+            //      bar<Test>(({pr/*goto*/op1})=>{});
+            if (ts.isPropertyName(node) && ts.isBindingElement(parent) && ts.isObjectBindingPattern(parent.parent) &&
+                (node === (parent.propertyName || parent.name))) {
+                var name_6 = ts.getNameFromPropertyName(node);
+                var type = typeChecker.getTypeAtLocation(parent.parent);
+                return name_6 === undefined ? ts.emptyArray : ts.flatMap(type.isUnion() ? type.types : [type], function (t) {
+                    var prop = t.getProperty(name_6);
+                    return prop && getDefinitionFromSymbol(typeChecker, prop, node);
+                });
+            }
+            // If the current location we want to find its definition is in an object literal, try to get the contextual type for the
+            // object literal, lookup the property symbol in the contextual type, and use this for goto-definition.
+            // For example
+            //      interface Props{
+            //          /*first*/prop1: number
+            //          prop2: boolean
+            //      }
+            //      function Foo(arg: Props) {}
+            //      Foo( { pr/*1*/op1: 10, prop2: true })
+            var element = ts.getContainingObjectLiteralElement(node);
+            if (element) {
+                var contextualType = element && typeChecker.getContextualType(element.parent);
+                if (contextualType) {
+                    return ts.flatMap(ts.getPropertySymbolsFromContextualType(element, typeChecker, contextualType, /*unionSymbolOk*/ false), function (propertySymbol) {
+                        return getDefinitionFromSymbol(typeChecker, propertySymbol, node);
+                    });
+                }
+            }
+            return getDefinitionFromSymbol(typeChecker, symbol, node);
+        }
+        GoToDefinition.getDefinitionAtPosition = getDefinitionAtPosition;
+        /**
+         * True if we should not add definitions for both the signature symbol and the definition symbol.
+         * True for `const |f = |() => 0`, false for `function |f() {} const |g = f;`.
+         */
+        function symbolMatchesSignature(s, calledDeclaration) {
+            return s === calledDeclaration.symbol || s === calledDeclaration.symbol.parent ||
+                !ts.isCallLikeExpression(calledDeclaration.parent) && s === calledDeclaration.parent.symbol;
+        }
+        function getReferenceAtPosition(sourceFile, position, program) {
+            var referencePath = findReferenceInPosition(sourceFile.referencedFiles, position);
+            if (referencePath) {
+                var file = ts.tryResolveScriptReference(program, sourceFile, referencePath);
+                return file && { fileName: referencePath.fileName, file: file };
+            }
+            var typeReferenceDirective = findReferenceInPosition(sourceFile.typeReferenceDirectives, position);
+            if (typeReferenceDirective) {
+                var reference = program.getResolvedTypeReferenceDirectives().get(typeReferenceDirective.fileName);
+                var file = reference && program.getSourceFile(reference.resolvedFileName); // TODO:GH#18217
+                return file && { fileName: typeReferenceDirective.fileName, file: file };
+            }
+            var libReferenceDirective = findReferenceInPosition(sourceFile.libReferenceDirectives, position);
+            if (libReferenceDirective) {
+                var file = program.getLibFileFromReference(libReferenceDirective);
+                return file && { fileName: libReferenceDirective.fileName, file: file };
+            }
+            return undefined;
+        }
+        GoToDefinition.getReferenceAtPosition = getReferenceAtPosition;
+        /// Goto type
+        function getTypeDefinitionAtPosition(typeChecker, sourceFile, position) {
+            var node = ts.getTouchingPropertyName(sourceFile, position);
+            if (node === sourceFile) {
+                return undefined;
+            }
+            var symbol = typeChecker.getSymbolAtLocation(node);
+            if (!symbol)
+                return undefined;
+            var typeAtLocation = typeChecker.getTypeOfSymbolAtLocation(symbol, node);
+            var returnType = tryGetReturnTypeOfFunction(symbol, typeAtLocation, typeChecker);
+            var fromReturnType = returnType && definitionFromType(returnType, typeChecker, node);
+            // If a function returns 'void' or some other type with no definition, just return the function definition.
+            return fromReturnType && fromReturnType.length !== 0 ? fromReturnType : definitionFromType(typeAtLocation, typeChecker, node);
+        }
+        GoToDefinition.getTypeDefinitionAtPosition = getTypeDefinitionAtPosition;
+        function definitionFromType(type, checker, node) {
+            return ts.flatMap(type.isUnion() && !(type.flags & 32 /* Enum */) ? type.types : [type], function (t) {
+                return t.symbol && getDefinitionFromSymbol(checker, t.symbol, node);
+            });
+        }
+        function tryGetReturnTypeOfFunction(symbol, type, checker) {
+            // If the type is just a function's inferred type,
+            // go-to-type should go to the return type instead, since go-to-definition takes you to the function anyway.
+            if (type.symbol === symbol ||
+                // At `const f = () => {}`, the symbol is `f` and the type symbol is at `() => {}`
+                symbol.valueDeclaration && type.symbol && ts.isVariableDeclaration(symbol.valueDeclaration) && symbol.valueDeclaration.initializer === type.symbol.valueDeclaration) {
+                var sigs = type.getCallSignatures();
+                if (sigs.length === 1)
+                    return checker.getReturnTypeOfSignature(ts.first(sigs));
+            }
+            return undefined;
+        }
+        function getDefinitionAndBoundSpan(program, sourceFile, position) {
+            var definitions = getDefinitionAtPosition(program, sourceFile, position);
+            if (!definitions || definitions.length === 0) {
+                return undefined;
+            }
+            // Check if position is on triple slash reference.
+            var comment = findReferenceInPosition(sourceFile.referencedFiles, position) ||
+                findReferenceInPosition(sourceFile.typeReferenceDirectives, position) ||
+                findReferenceInPosition(sourceFile.libReferenceDirectives, position);
+            if (comment) {
+                return { definitions: definitions, textSpan: ts.createTextSpanFromRange(comment) };
+            }
+            var node = ts.getTouchingPropertyName(sourceFile, position);
+            var textSpan = ts.createTextSpan(node.getStart(), node.getWidth());
+            return { definitions: definitions, textSpan: textSpan };
+        }
+        GoToDefinition.getDefinitionAndBoundSpan = getDefinitionAndBoundSpan;
+        // At 'x.foo', see if the type of 'x' has an index signature, and if so find its declarations.
+        function getDefinitionInfoForIndexSignatures(node, checker) {
+            if (!ts.isPropertyAccessExpression(node.parent) || node.parent.name !== node)
+                return;
+            var type = checker.getTypeAtLocation(node.parent.expression);
+            return ts.mapDefined(type.isUnionOrIntersection() ? type.types : [type], function (nonUnionType) {
+                var info = checker.getIndexInfoOfType(nonUnionType, 0 /* String */);
+                return info && info.declaration && createDefinitionFromSignatureDeclaration(checker, info.declaration);
+            });
+        }
+        function getSymbol(node, checker) {
+            var symbol = checker.getSymbolAtLocation(node);
+            // If this is an alias, and the request came at the declaration location
+            // get the aliased symbol instead. This allows for goto def on an import e.g.
+            //   import {A, B} from "mod";
+            // to jump to the implementation directly.
+            if (symbol && symbol.flags & 2097152 /* Alias */ && shouldSkipAlias(node, symbol.declarations[0])) {
+                var aliased = checker.getAliasedSymbol(symbol);
+                if (aliased.declarations) {
+                    return aliased;
+                }
+            }
+            return symbol;
+        }
+        // Go to the original declaration for cases:
+        //
+        //   (1) when the aliased symbol was declared in the location(parent).
+        //   (2) when the aliased symbol is originating from an import.
+        //
+        function shouldSkipAlias(node, declaration) {
+            if (node.kind !== 72 /* Identifier */) {
+                return false;
+            }
+            if (node.parent === declaration) {
+                return true;
+            }
+            switch (declaration.kind) {
+                case 250 /* ImportClause */:
+                case 248 /* ImportEqualsDeclaration */:
+                    return true;
+                case 253 /* ImportSpecifier */:
+                    return declaration.parent.kind === 252 /* NamedImports */;
+                default:
+                    return false;
+            }
+        }
+        function getDefinitionFromSymbol(typeChecker, symbol, node) {
+            return getConstructSignatureDefinition() || getCallSignatureDefinition() || ts.map(symbol.declarations, function (declaration) { return createDefinitionInfo(declaration, typeChecker, symbol, node); });
+            function getConstructSignatureDefinition() {
+                // Applicable only if we are in a new expression, or we are on a constructor declaration
+                // and in either case the symbol has a construct signature definition, i.e. class
+                if (symbol.flags & 32 /* Class */ && (ts.isNewExpressionTarget(node) || node.kind === 124 /* ConstructorKeyword */)) {
+                    var cls = ts.find(symbol.declarations, ts.isClassLike) || ts.Debug.fail("Expected declaration to have at least one class-like declaration");
+                    return getSignatureDefinition(cls.members, /*selectConstructors*/ true);
+                }
+            }
+            function getCallSignatureDefinition() {
+                return ts.isCallOrNewExpressionTarget(node) || ts.isNameOfFunctionDeclaration(node)
+                    ? getSignatureDefinition(symbol.declarations, /*selectConstructors*/ false)
+                    : undefined;
+            }
+            function getSignatureDefinition(signatureDeclarations, selectConstructors) {
+                if (!signatureDeclarations) {
+                    return undefined;
+                }
+                var declarations = signatureDeclarations.filter(selectConstructors ? ts.isConstructorDeclaration : ts.isFunctionLike);
+                return declarations.length
+                    ? [createDefinitionInfo(ts.find(declarations, function (d) { return !!d.body; }) || ts.last(declarations), typeChecker, symbol, node)]
+                    : undefined;
+            }
+        }
+        /** Creates a DefinitionInfo from a Declaration, using the declaration's name if possible. */
+        function createDefinitionInfo(declaration, checker, symbol, node) {
+            var symbolName = checker.symbolToString(symbol); // Do not get scoped name, just the name of the symbol
+            var symbolKind = ts.SymbolDisplay.getSymbolKind(checker, symbol, node);
+            var containerName = symbol.parent ? checker.symbolToString(symbol.parent, node) : "";
+            return createDefinitionInfoFromName(declaration, symbolKind, symbolName, containerName);
+        }
+        /** Creates a DefinitionInfo directly from the name of a declaration. */
+        function createDefinitionInfoFromName(declaration, symbolKind, symbolName, containerName) {
+            var name = ts.getNameOfDeclaration(declaration) || declaration;
+            var sourceFile = name.getSourceFile();
+            return {
+                fileName: sourceFile.fileName,
+                textSpan: ts.createTextSpanFromNode(name, sourceFile),
+                kind: symbolKind,
+                name: symbolName,
+                containerKind: undefined,
+                containerName: containerName
+            };
+        }
+        function createDefinitionFromSignatureDeclaration(typeChecker, decl) {
+            return createDefinitionInfo(decl, typeChecker, decl.symbol, decl);
+        }
+        function findReferenceInPosition(refs, pos) {
+            return ts.find(refs, function (ref) { return ts.textRangeContainsPositionInclusive(ref, pos); });
+        }
+        GoToDefinition.findReferenceInPosition = findReferenceInPosition;
+        function getDefinitionInfoForFileReference(name, targetFileName) {
+            return {
+                fileName: targetFileName,
+                textSpan: ts.createTextSpanFromBounds(0, 0),
+                kind: "script" /* scriptElement */,
+                name: name,
+                containerName: undefined,
+                containerKind: undefined,
+            };
+        }
+        /** Returns a CallLikeExpression where `node` is the target being invoked. */
+        function getAncestorCallLikeExpression(node) {
+            var target = climbPastManyPropertyAccesses(node);
+            var callLike = target.parent;
+            return callLike && ts.isCallLikeExpression(callLike) && ts.getInvokedExpression(callLike) === target ? callLike : undefined;
+        }
+        function climbPastManyPropertyAccesses(node) {
+            return ts.isRightSideOfPropertyAccess(node) ? climbPastManyPropertyAccesses(node.parent) : node;
+        }
+        function tryGetSignatureDeclaration(typeChecker, node) {
+            var callLike = getAncestorCallLikeExpression(node);
+            var signature = callLike && typeChecker.getResolvedSignature(callLike);
+            // Don't go to a function type, go to the value having that type.
+            return ts.tryCast(signature && signature.declaration, function (d) { return ts.isFunctionLike(d) && !ts.isFunctionTypeNode(d); });
+        }
+        function isConstructorLike(node) {
+            switch (node.kind) {
+                case 157 /* Constructor */:
+                case 166 /* ConstructorType */:
+                case 161 /* ConstructSignature */:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+    })(GoToDefinition = ts.GoToDefinition || (ts.GoToDefinition = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var JsDoc;
+    (function (JsDoc) {
+        var jsDocTagNames = [
+            "abstract",
+            "access",
+            "alias",
+            "argument",
+            "async",
+            "augments",
+            "author",
+            "borrows",
+            "callback",
+            "class",
+            "classdesc",
+            "constant",
+            "constructor",
+            "constructs",
+            "copyright",
+            "default",
+            "deprecated",
+            "description",
+            "emits",
+            "enum",
+            "event",
+            "example",
+            "exports",
+            "extends",
+            "external",
+            "field",
+            "file",
+            "fileoverview",
+            "fires",
+            "function",
+            "generator",
+            "global",
+            "hideconstructor",
+            "host",
+            "ignore",
+            "implements",
+            "inheritdoc",
+            "inner",
+            "instance",
+            "interface",
+            "kind",
+            "lends",
+            "license",
+            "listens",
+            "member",
+            "memberof",
+            "method",
+            "mixes",
+            "module",
+            "name",
+            "namespace",
+            "override",
+            "package",
+            "param",
+            "private",
+            "property",
+            "protected",
+            "public",
+            "readonly",
+            "requires",
+            "returns",
+            "see",
+            "since",
+            "static",
+            "summary",
+            "template",
+            "this",
+            "throws",
+            "todo",
+            "tutorial",
+            "type",
+            "typedef",
+            "var",
+            "variation",
+            "version",
+            "virtual",
+            "yields"
+        ];
+        var jsDocTagNameCompletionEntries;
+        var jsDocTagCompletionEntries;
+        function getJsDocCommentsFromDeclarations(declarations) {
+            // Only collect doc comments from duplicate declarations once:
+            // In case of a union property there might be same declaration multiple times
+            // which only varies in type parameter
+            // Eg. const a: Array<string> | Array<number>; a.length
+            // The property length will have two declarations of property length coming
+            // from Array<T> - Array<string> and Array<number>
+            var documentationComment = [];
+            forEachUnique(declarations, function (declaration) {
+                for (var _i = 0, _a = getCommentHavingNodes(declaration); _i < _a.length; _i++) {
+                    var comment = _a[_i].comment;
+                    if (comment === undefined)
+                        continue;
+                    if (documentationComment.length) {
+                        documentationComment.push(ts.lineBreakPart());
+                    }
+                    documentationComment.push(ts.textPart(comment));
+                }
+            });
+            return documentationComment;
+        }
+        JsDoc.getJsDocCommentsFromDeclarations = getJsDocCommentsFromDeclarations;
+        function getCommentHavingNodes(declaration) {
+            switch (declaration.kind) {
+                case 299 /* JSDocParameterTag */:
+                case 305 /* JSDocPropertyTag */:
+                    return [declaration];
+                case 297 /* JSDocCallbackTag */:
+                case 304 /* JSDocTypedefTag */:
+                    return [declaration, declaration.parent];
+                default:
+                    return ts.getJSDocCommentsAndTags(declaration);
+            }
+        }
+        function getJsDocTagsFromDeclarations(declarations) {
+            // Only collect doc comments from duplicate declarations once.
+            var tags = [];
+            forEachUnique(declarations, function (declaration) {
+                for (var _i = 0, _a = ts.getJSDocTags(declaration); _i < _a.length; _i++) {
+                    var tag = _a[_i];
+                    tags.push({ name: tag.tagName.text, text: getCommentText(tag) });
+                }
+            });
+            return tags;
+        }
+        JsDoc.getJsDocTagsFromDeclarations = getJsDocTagsFromDeclarations;
+        function getCommentText(tag) {
+            var comment = tag.comment;
+            switch (tag.kind) {
+                case 295 /* JSDocAugmentsTag */:
+                    return withNode(tag.class);
+                case 303 /* JSDocTemplateTag */:
+                    return withList(tag.typeParameters);
+                case 302 /* JSDocTypeTag */:
+                    return withNode(tag.typeExpression);
+                case 304 /* JSDocTypedefTag */:
+                case 297 /* JSDocCallbackTag */:
+                case 305 /* JSDocPropertyTag */:
+                case 299 /* JSDocParameterTag */:
+                    var name = tag.name;
+                    return name ? withNode(name) : comment;
+                default:
+                    return comment;
+            }
+            function withNode(node) {
+                return addComment(node.getText());
+            }
+            function withList(list) {
+                return addComment(list.map(function (x) { return x.getText(); }).join(", "));
+            }
+            function addComment(s) {
+                return comment === undefined ? s : s + " " + comment;
+            }
+        }
+        /**
+         * Iterates through 'array' by index and performs the callback on each element of array until the callback
+         * returns a truthy value, then returns that value.
+         * If no such value is found, the callback is applied to each element of array and undefined is returned.
+         */
+        function forEachUnique(array, callback) {
+            if (array) {
+                for (var i = 0; i < array.length; i++) {
+                    if (array.indexOf(array[i]) === i) {
+                        var result = callback(array[i], i);
+                        if (result) {
+                            return result;
+                        }
+                    }
+                }
+            }
+            return undefined;
+        }
+        function getJSDocTagNameCompletions() {
+            return jsDocTagNameCompletionEntries || (jsDocTagNameCompletionEntries = ts.map(jsDocTagNames, function (tagName) {
+                return {
+                    name: tagName,
+                    kind: "keyword" /* keyword */,
+                    kindModifiers: "",
+                    sortText: "0",
+                };
+            }));
+        }
+        JsDoc.getJSDocTagNameCompletions = getJSDocTagNameCompletions;
+        JsDoc.getJSDocTagNameCompletionDetails = getJSDocTagCompletionDetails;
+        function getJSDocTagCompletions() {
+            return jsDocTagCompletionEntries || (jsDocTagCompletionEntries = ts.map(jsDocTagNames, function (tagName) {
+                return {
+                    name: "@" + tagName,
+                    kind: "keyword" /* keyword */,
+                    kindModifiers: "",
+                    sortText: "0"
+                };
+            }));
+        }
+        JsDoc.getJSDocTagCompletions = getJSDocTagCompletions;
+        function getJSDocTagCompletionDetails(name) {
+            return {
+                name: name,
+                kind: "" /* unknown */,
+                kindModifiers: "",
+                displayParts: [ts.textPart(name)],
+                documentation: ts.emptyArray,
+                tags: undefined,
+                codeActions: undefined,
+            };
+        }
+        JsDoc.getJSDocTagCompletionDetails = getJSDocTagCompletionDetails;
+        function getJSDocParameterNameCompletions(tag) {
+            if (!ts.isIdentifier(tag.name)) {
+                return ts.emptyArray;
+            }
+            var nameThusFar = tag.name.text;
+            var jsdoc = tag.parent;
+            var fn = jsdoc.parent;
+            if (!ts.isFunctionLike(fn))
+                return [];
+            return ts.mapDefined(fn.parameters, function (param) {
+                if (!ts.isIdentifier(param.name))
+                    return undefined;
+                var name = param.name.text;
+                if (jsdoc.tags.some(function (t) { return t !== tag && ts.isJSDocParameterTag(t) && ts.isIdentifier(t.name) && t.name.escapedText === name; }) // TODO: GH#18217
+                    || nameThusFar !== undefined && !ts.startsWith(name, nameThusFar)) {
+                    return undefined;
+                }
+                return { name: name, kind: "parameter" /* parameterElement */, kindModifiers: "", sortText: "0" };
+            });
+        }
+        JsDoc.getJSDocParameterNameCompletions = getJSDocParameterNameCompletions;
+        function getJSDocParameterNameCompletionDetails(name) {
+            return {
+                name: name,
+                kind: "parameter" /* parameterElement */,
+                kindModifiers: "",
+                displayParts: [ts.textPart(name)],
+                documentation: ts.emptyArray,
+                tags: undefined,
+                codeActions: undefined,
+            };
+        }
+        JsDoc.getJSDocParameterNameCompletionDetails = getJSDocParameterNameCompletionDetails;
+        /**
+         * Checks if position points to a valid position to add JSDoc comments, and if so,
+         * returns the appropriate template. Otherwise returns an empty string.
+         * Valid positions are
+         *      - outside of comments, statements, and expressions, and
+         *      - preceding a:
+         *          - function/constructor/method declaration
+         *          - class declarations
+         *          - variable statements
+         *          - namespace declarations
+         *          - interface declarations
+         *          - method signatures
+         *          - type alias declarations
+         *
+         * Hosts should ideally check that:
+         * - The line is all whitespace up to 'position' before performing the insertion.
+         * - If the keystroke sequence "/\*\*" induced the call, we also check that the next
+         * non-whitespace character is '*', which (approximately) indicates whether we added
+         * the second '*' to complete an existing (JSDoc) comment.
+         * @param fileName The file in which to perform the check.
+         * @param position The (character-indexed) position in the file where the check should
+         * be performed.
+         */
+        function getDocCommentTemplateAtPosition(newLine, sourceFile, position) {
+            var tokenAtPos = ts.getTokenAtPosition(sourceFile, position);
+            var existingDocComment = ts.findAncestor(tokenAtPos, ts.isJSDoc);
+            if (existingDocComment && (existingDocComment.comment !== undefined || ts.length(existingDocComment.tags))) {
+                // Non-empty comment already exists.
+                return undefined;
+            }
+            var tokenStart = tokenAtPos.getStart(sourceFile);
+            // Don't provide a doc comment template based on a *previous* node. (But an existing empty jsdoc comment will likely start before `position`.)
+            if (!existingDocComment && tokenStart < position) {
+                return undefined;
+            }
+            var commentOwnerInfo = getCommentOwnerInfo(tokenAtPos);
+            if (!commentOwnerInfo) {
+                return undefined;
+            }
+            var commentOwner = commentOwnerInfo.commentOwner, parameters = commentOwnerInfo.parameters;
+            if (commentOwner.getStart(sourceFile) < position) {
+                return undefined;
+            }
+            if (!parameters || parameters.length === 0) {
+                // if there are no parameters, just complete to a single line JSDoc comment
+                var singleLineResult = "/** */";
+                return { newText: singleLineResult, caretOffset: 3 };
+            }
+            var indentationStr = getIndentationStringAtPosition(sourceFile, position);
+            // A doc comment consists of the following
+            // * The opening comment line
+            // * the first line (without a param) for the object's untagged info (this is also where the caret ends up)
+            // * the '@param'-tagged lines
+            // * TODO: other tags.
+            // * the closing comment line
+            // * if the caret was directly in front of the object, then we add an extra line and indentation.
+            var preamble = "/**" + newLine + indentationStr + " * ";
+            var result = preamble + newLine +
+                parameterDocComments(parameters, ts.hasJSFileExtension(sourceFile.fileName), indentationStr, newLine) +
+                indentationStr + " */" +
+                (tokenStart === position ? newLine + indentationStr : "");
+            return { newText: result, caretOffset: preamble.length };
+        }
+        JsDoc.getDocCommentTemplateAtPosition = getDocCommentTemplateAtPosition;
+        function getIndentationStringAtPosition(sourceFile, position) {
+            var text = sourceFile.text;
+            var lineStart = ts.getLineStartPositionForPosition(position, sourceFile);
+            var pos = lineStart;
+            for (; pos <= position && ts.isWhiteSpaceSingleLine(text.charCodeAt(pos)); pos++)
+                ;
+            return text.slice(lineStart, pos);
+        }
+        function parameterDocComments(parameters, isJavaScriptFile, indentationStr, newLine) {
+            return parameters.map(function (_a, i) {
+                var name = _a.name, dotDotDotToken = _a.dotDotDotToken;
+                var paramName = name.kind === 72 /* Identifier */ ? name.text : "param" + i;
+                var type = isJavaScriptFile ? (dotDotDotToken ? "{...any} " : "{any} ") : "";
+                return indentationStr + " * @param " + type + paramName + newLine;
+            }).join("");
+        }
+        function getCommentOwnerInfo(tokenAtPos) {
+            return ts.forEachAncestor(tokenAtPos, getCommentOwnerInfoWorker);
+        }
+        function getCommentOwnerInfoWorker(commentOwner) {
+            switch (commentOwner.kind) {
+                case 239 /* FunctionDeclaration */:
+                case 196 /* FunctionExpression */:
+                case 156 /* MethodDeclaration */:
+                case 157 /* Constructor */:
+                case 155 /* MethodSignature */:
+                    var parameters = commentOwner.parameters;
+                    return { commentOwner: commentOwner, parameters: parameters };
+                case 275 /* PropertyAssignment */:
+                    return getCommentOwnerInfoWorker(commentOwner.initializer);
+                case 240 /* ClassDeclaration */:
+                case 241 /* InterfaceDeclaration */:
+                case 153 /* PropertySignature */:
+                case 243 /* EnumDeclaration */:
+                case 278 /* EnumMember */:
+                case 242 /* TypeAliasDeclaration */:
+                    return { commentOwner: commentOwner };
+                case 219 /* VariableStatement */: {
+                    var varStatement = commentOwner;
+                    var varDeclarations = varStatement.declarationList.declarations;
+                    var parameters_1 = varDeclarations.length === 1 && varDeclarations[0].initializer
+                        ? getParametersFromRightHandSideOfAssignment(varDeclarations[0].initializer)
+                        : undefined;
+                    return { commentOwner: commentOwner, parameters: parameters_1 };
+                }
+                case 279 /* SourceFile */:
+                    return "quit";
+                case 244 /* ModuleDeclaration */:
+                    // If in walking up the tree, we hit a a nested namespace declaration,
+                    // then we must be somewhere within a dotted namespace name; however we don't
+                    // want to give back a JSDoc template for the 'b' or 'c' in 'namespace a.b.c { }'.
+                    return commentOwner.parent.kind === 244 /* ModuleDeclaration */ ? undefined : { commentOwner: commentOwner };
+                case 204 /* BinaryExpression */: {
+                    var be = commentOwner;
+                    if (ts.getAssignmentDeclarationKind(be) === 0 /* None */) {
+                        return "quit";
+                    }
+                    var parameters_2 = ts.isFunctionLike(be.right) ? be.right.parameters : ts.emptyArray;
+                    return { commentOwner: commentOwner, parameters: parameters_2 };
+                }
+            }
+        }
+        /**
+         * Digs into an an initializer or RHS operand of an assignment operation
+         * to get the parameters of an apt signature corresponding to a
+         * function expression or a class expression.
+         *
+         * @param rightHandSide the expression which may contain an appropriate set of parameters
+         * @returns the parameters of a signature found on the RHS if one exists; otherwise 'emptyArray'.
+         */
+        function getParametersFromRightHandSideOfAssignment(rightHandSide) {
+            while (rightHandSide.kind === 195 /* ParenthesizedExpression */) {
+                rightHandSide = rightHandSide.expression;
+            }
+            switch (rightHandSide.kind) {
+                case 196 /* FunctionExpression */:
+                case 197 /* ArrowFunction */:
+                    return rightHandSide.parameters;
+                case 209 /* ClassExpression */: {
+                    var ctr = ts.find(rightHandSide.members, ts.isConstructorDeclaration);
+                    return ctr ? ctr.parameters : ts.emptyArray;
+                }
+            }
+            return ts.emptyArray;
+        }
+    })(JsDoc = ts.JsDoc || (ts.JsDoc = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var NavigateTo;
+    (function (NavigateTo) {
+        function getNavigateToItems(sourceFiles, checker, cancellationToken, searchValue, maxResultCount, excludeDtsFiles) {
+            var patternMatcher = ts.createPatternMatcher(searchValue);
+            if (!patternMatcher)
+                return ts.emptyArray;
+            var rawItems = [];
+            var _loop_15 = function (sourceFile) {
+                cancellationToken.throwIfCancellationRequested();
+                if (excludeDtsFiles && sourceFile.isDeclarationFile) {
+                    return "continue";
+                }
+                sourceFile.getNamedDeclarations().forEach(function (declarations, name) {
+                    getItemsFromNamedDeclaration(patternMatcher, name, declarations, checker, sourceFile.fileName, rawItems);
+                });
+            };
+            // Search the declarations in all files and output matched NavigateToItem into array of NavigateToItem[]
+            for (var _i = 0, sourceFiles_6 = sourceFiles; _i < sourceFiles_6.length; _i++) {
+                var sourceFile = sourceFiles_6[_i];
+                _loop_15(sourceFile);
+            }
+            rawItems.sort(compareNavigateToItems);
+            return (maxResultCount === undefined ? rawItems : rawItems.slice(0, maxResultCount)).map(createNavigateToItem);
+        }
+        NavigateTo.getNavigateToItems = getNavigateToItems;
+        function getItemsFromNamedDeclaration(patternMatcher, name, declarations, checker, fileName, rawItems) {
+            // First do a quick check to see if the name of the declaration matches the
+            // last portion of the (possibly) dotted name they're searching for.
+            var match = patternMatcher.getMatchForLastSegmentOfPattern(name);
+            if (!match) {
+                return; // continue to next named declarations
+            }
+            for (var _i = 0, declarations_13 = declarations; _i < declarations_13.length; _i++) {
+                var declaration = declarations_13[_i];
+                if (!shouldKeepItem(declaration, checker))
+                    continue;
+                if (patternMatcher.patternContainsDots) {
+                    // If the pattern has dots in it, then also see if the declaration container matches as well.
+                    var fullMatch = patternMatcher.getFullMatch(getContainers(declaration), name);
+                    if (fullMatch) {
+                        rawItems.push({ name: name, fileName: fileName, matchKind: fullMatch.kind, isCaseSensitive: fullMatch.isCaseSensitive, declaration: declaration });
+                    }
+                }
+                else {
+                    rawItems.push({ name: name, fileName: fileName, matchKind: match.kind, isCaseSensitive: match.isCaseSensitive, declaration: declaration });
+                }
+            }
+        }
+        function shouldKeepItem(declaration, checker) {
+            switch (declaration.kind) {
+                case 250 /* ImportClause */:
+                case 253 /* ImportSpecifier */:
+                case 248 /* ImportEqualsDeclaration */:
+                    var importer = checker.getSymbolAtLocation(declaration.name); // TODO: GH#18217
+                    var imported = checker.getAliasedSymbol(importer);
+                    return importer.escapedName !== imported.escapedName;
+                default:
+                    return true;
+            }
+        }
+        function tryAddSingleDeclarationName(declaration, containers) {
+            var name = ts.getNameOfDeclaration(declaration);
+            return !!name && (pushLiteral(name, containers) || name.kind === 149 /* ComputedPropertyName */ && tryAddComputedPropertyName(name.expression, containers));
+        }
+        // Only added the names of computed properties if they're simple dotted expressions, like:
+        //
+        //      [X.Y.Z]() { }
+        function tryAddComputedPropertyName(expression, containers) {
+            return pushLiteral(expression, containers)
+                || ts.isPropertyAccessExpression(expression) && (containers.push(expression.name.text), true) && tryAddComputedPropertyName(expression.expression, containers);
+        }
+        function pushLiteral(node, containers) {
+            return ts.isPropertyNameLiteral(node) && (containers.push(ts.getTextOfIdentifierOrLiteral(node)), true);
+        }
+        function getContainers(declaration) {
+            var containers = [];
+            // First, if we started with a computed property name, then add all but the last
+            // portion into the container array.
+            var name = ts.getNameOfDeclaration(declaration);
+            if (name && name.kind === 149 /* ComputedPropertyName */ && !tryAddComputedPropertyName(name.expression, containers)) {
+                return ts.emptyArray;
+            }
+            // Don't include the last portion.
+            containers.shift();
+            // Now, walk up our containers, adding all their names to the container array.
+            var container = ts.getContainerNode(declaration);
+            while (container) {
+                if (!tryAddSingleDeclarationName(container, containers)) {
+                    return ts.emptyArray;
+                }
+                container = ts.getContainerNode(container);
+            }
+            return containers.reverse();
+        }
+        function compareNavigateToItems(i1, i2) {
+            // TODO(cyrusn): get the gamut of comparisons that VS already uses here.
+            return ts.compareValues(i1.matchKind, i2.matchKind)
+                || ts.compareStringsCaseSensitiveUI(i1.name, i2.name);
+        }
+        function createNavigateToItem(rawItem) {
+            var declaration = rawItem.declaration;
+            var container = ts.getContainerNode(declaration);
+            var containerName = container && ts.getNameOfDeclaration(container);
+            return {
+                name: rawItem.name,
+                kind: ts.getNodeKind(declaration),
+                kindModifiers: ts.getNodeModifiers(declaration),
+                matchKind: ts.PatternMatchKind[rawItem.matchKind],
+                isCaseSensitive: rawItem.isCaseSensitive,
+                fileName: rawItem.fileName,
+                textSpan: ts.createTextSpanFromNode(declaration),
+                // TODO(jfreeman): What should be the containerName when the container has a computed name?
+                containerName: containerName ? containerName.text : "",
+                containerKind: containerName ? ts.getNodeKind(container) : "" /* unknown */,
+            };
+        }
+    })(NavigateTo = ts.NavigateTo || (ts.NavigateTo = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var NavigationBar;
+    (function (NavigationBar) {
+        /**
+         * Matches all whitespace characters in a string. Eg:
+         *
+         * "app.
+         *
+         * onactivated"
+         *
+         * matches because of the newline, whereas
+         *
+         * "app.onactivated"
+         *
+         * does not match.
+         */
+        var whiteSpaceRegex = /\s+/g;
+        // Keep sourceFile handy so we don't have to search for it every time we need to call `getText`.
+        var curCancellationToken;
+        var curSourceFile;
+        /**
+         * For performance, we keep navigation bar parents on a stack rather than passing them through each recursion.
+         * `parent` is the current parent and is *not* stored in parentsStack.
+         * `startNode` sets a new parent and `endNode` returns to the previous parent.
+         */
+        var parentsStack = [];
+        var parent;
+        // NavigationBarItem requires an array, but will not mutate it, so just give it this for performance.
+        var emptyChildItemArray = [];
+        function getNavigationBarItems(sourceFile, cancellationToken) {
+            curCancellationToken = cancellationToken;
+            curSourceFile = sourceFile;
+            try {
+                return ts.map(topLevelItems(rootNavigationBarNode(sourceFile)), convertToTopLevelItem);
+            }
+            finally {
+                reset();
+            }
+        }
+        NavigationBar.getNavigationBarItems = getNavigationBarItems;
+        function getNavigationTree(sourceFile, cancellationToken) {
+            curCancellationToken = cancellationToken;
+            curSourceFile = sourceFile;
+            try {
+                return convertToTree(rootNavigationBarNode(sourceFile));
+            }
+            finally {
+                reset();
+            }
+        }
+        NavigationBar.getNavigationTree = getNavigationTree;
+        function reset() {
+            curSourceFile = undefined;
+            curCancellationToken = undefined;
+            parentsStack = [];
+            parent = undefined;
+            emptyChildItemArray = [];
+        }
+        function nodeText(node) {
+            return node.getText(curSourceFile);
+        }
+        function navigationBarNodeKind(n) {
+            return n.node.kind;
+        }
+        function pushChild(parent, child) {
+            if (parent.children) {
+                parent.children.push(child);
+            }
+            else {
+                parent.children = [child];
+            }
+        }
+        function rootNavigationBarNode(sourceFile) {
+            ts.Debug.assert(!parentsStack.length);
+            var root = { node: sourceFile, name: undefined, additionalNodes: undefined, parent: undefined, children: undefined, indent: 0 };
+            parent = root;
+            for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
+                var statement = _a[_i];
+                addChildrenRecursively(statement);
+            }
+            endNode();
+            ts.Debug.assert(!parent && !parentsStack.length);
+            return root;
+        }
+        function addLeafNode(node) {
+            pushChild(parent, emptyNavigationBarNode(node));
+        }
+        function emptyNavigationBarNode(node) {
+            return {
+                node: node,
+                name: ts.isDeclaration(node) || ts.isExpression(node) ? ts.getNameOfDeclaration(node) : undefined,
+                additionalNodes: undefined,
+                parent: parent,
+                children: undefined,
+                indent: parent.indent + 1
+            };
+        }
+        /**
+         * Add a new level of NavigationBarNodes.
+         * This pushes to the stack, so you must call `endNode` when you are done adding to this node.
+         */
+        function startNode(node) {
+            var navNode = emptyNavigationBarNode(node);
+            pushChild(parent, navNode);
+            // Save the old parent
+            parentsStack.push(parent);
+            parent = navNode;
+        }
+        /** Call after calling `startNode` and adding children to it. */
+        function endNode() {
+            if (parent.children) {
+                mergeChildren(parent.children, parent);
+                sortChildren(parent.children);
+            }
+            parent = parentsStack.pop();
+        }
+        function addNodeWithRecursiveChild(node, child) {
+            startNode(node);
+            addChildrenRecursively(child);
+            endNode();
+        }
+        /** Look for navigation bar items in node's subtree, adding them to the current `parent`. */
+        function addChildrenRecursively(node) {
+            curCancellationToken.throwIfCancellationRequested();
+            if (!node || ts.isToken(node)) {
+                return;
+            }
+            switch (node.kind) {
+                case 157 /* Constructor */:
+                    // Get parameter properties, and treat them as being on the *same* level as the constructor, not under it.
+                    var ctr = node;
+                    addNodeWithRecursiveChild(ctr, ctr.body);
+                    // Parameter properties are children of the class, not the constructor.
+                    for (var _i = 0, _a = ctr.parameters; _i < _a.length; _i++) {
+                        var param = _a[_i];
+                        if (ts.isParameterPropertyDeclaration(param)) {
+                            addLeafNode(param);
+                        }
+                    }
+                    break;
+                case 156 /* MethodDeclaration */:
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                case 155 /* MethodSignature */:
+                    if (!ts.hasDynamicName(node)) {
+                        addNodeWithRecursiveChild(node, node.body);
+                    }
+                    break;
+                case 154 /* PropertyDeclaration */:
+                case 153 /* PropertySignature */:
+                    if (!ts.hasDynamicName(node)) {
+                        addLeafNode(node);
+                    }
+                    break;
+                case 250 /* ImportClause */:
+                    var importClause = node;
+                    // Handle default import case e.g.:
+                    //    import d from "mod";
+                    if (importClause.name) {
+                        addLeafNode(importClause.name);
+                    }
+                    // Handle named bindings in imports e.g.:
+                    //    import * as NS from "mod";
+                    //    import {a, b as B} from "mod";
+                    var namedBindings = importClause.namedBindings;
+                    if (namedBindings) {
+                        if (namedBindings.kind === 251 /* NamespaceImport */) {
+                            addLeafNode(namedBindings);
+                        }
+                        else {
+                            for (var _b = 0, _c = namedBindings.elements; _b < _c.length; _b++) {
+                                var element = _c[_b];
+                                addLeafNode(element);
+                            }
+                        }
+                    }
+                    break;
+                case 186 /* BindingElement */:
+                case 237 /* VariableDeclaration */:
+                    var _d = node, name = _d.name, initializer = _d.initializer;
+                    if (ts.isBindingPattern(name)) {
+                        addChildrenRecursively(name);
+                    }
+                    else if (initializer && isFunctionOrClassExpression(initializer)) {
+                        if (initializer.name) {
+                            // Don't add a node for the VariableDeclaration, just for the initializer.
+                            addChildrenRecursively(initializer);
+                        }
+                        else {
+                            // Add a node for the VariableDeclaration, but not for the initializer.
+                            startNode(node);
+                            ts.forEachChild(initializer, addChildrenRecursively);
+                            endNode();
+                        }
+                    }
+                    else {
+                        addNodeWithRecursiveChild(node, initializer);
+                    }
+                    break;
+                case 197 /* ArrowFunction */:
+                case 239 /* FunctionDeclaration */:
+                case 196 /* FunctionExpression */:
+                    addNodeWithRecursiveChild(node, node.body);
+                    break;
+                case 243 /* EnumDeclaration */:
+                    startNode(node);
+                    for (var _e = 0, _f = node.members; _e < _f.length; _e++) {
+                        var member = _f[_e];
+                        if (!isComputedProperty(member)) {
+                            addLeafNode(member);
+                        }
+                    }
+                    endNode();
+                    break;
+                case 240 /* ClassDeclaration */:
+                case 209 /* ClassExpression */:
+                case 241 /* InterfaceDeclaration */:
+                    startNode(node);
+                    for (var _g = 0, _h = node.members; _g < _h.length; _g++) {
+                        var member = _h[_g];
+                        addChildrenRecursively(member);
+                    }
+                    endNode();
+                    break;
+                case 244 /* ModuleDeclaration */:
+                    addNodeWithRecursiveChild(node, getInteriorModule(node).body);
+                    break;
+                case 257 /* ExportSpecifier */:
+                case 248 /* ImportEqualsDeclaration */:
+                case 162 /* IndexSignature */:
+                case 160 /* CallSignature */:
+                case 161 /* ConstructSignature */:
+                case 242 /* TypeAliasDeclaration */:
+                    addLeafNode(node);
+                    break;
+                case 204 /* BinaryExpression */: {
+                    var special = ts.getAssignmentDeclarationKind(node);
+                    switch (special) {
+                        case 1 /* ExportsProperty */:
+                        case 2 /* ModuleExports */:
+                        case 3 /* PrototypeProperty */:
+                        case 6 /* Prototype */:
+                            addNodeWithRecursiveChild(node, node.right);
+                            return;
+                        case 4 /* ThisProperty */:
+                        case 5 /* Property */:
+                        case 0 /* None */:
+                        case 7 /* ObjectDefinePropertyValue */:
+                        case 8 /* ObjectDefinePropertyExports */:
+                        case 9 /* ObjectDefinePrototypeProperty */:
+                            break;
+                        default:
+                            ts.Debug.assertNever(special);
+                    }
+                }
+                // falls through
+                default:
+                    if (ts.hasJSDocNodes(node)) {
+                        ts.forEach(node.jsDoc, function (jsDoc) {
+                            ts.forEach(jsDoc.tags, function (tag) {
+                                if (ts.isJSDocTypeAlias(tag)) {
+                                    addLeafNode(tag);
+                                }
+                            });
+                        });
+                    }
+                    ts.forEachChild(node, addChildrenRecursively);
+            }
+        }
+        /** Merge declarations of the same kind. */
+        function mergeChildren(children, node) {
+            var nameToItems = ts.createMap();
+            ts.filterMutate(children, function (child) {
+                var declName = ts.getNameOfDeclaration(child.node);
+                var name = declName && nodeText(declName);
+                if (!name) {
+                    // Anonymous items are never merged.
+                    return true;
+                }
+                var itemsWithSameName = nameToItems.get(name);
+                if (!itemsWithSameName) {
+                    nameToItems.set(name, child);
+                    return true;
+                }
+                if (itemsWithSameName instanceof Array) {
+                    for (var _i = 0, itemsWithSameName_1 = itemsWithSameName; _i < itemsWithSameName_1.length; _i++) {
+                        var itemWithSameName = itemsWithSameName_1[_i];
+                        if (tryMerge(itemWithSameName, child, node)) {
+                            return false;
+                        }
+                    }
+                    itemsWithSameName.push(child);
+                    return true;
+                }
+                else {
+                    var itemWithSameName = itemsWithSameName;
+                    if (tryMerge(itemWithSameName, child, node)) {
+                        return false;
+                    }
+                    nameToItems.set(name, [itemWithSameName, child]);
+                    return true;
+                }
+            });
+        }
+        function tryMerge(a, b, parent) {
+            if (shouldReallyMerge(a.node, b.node, parent)) {
+                merge(a, b);
+                return true;
+            }
+            return false;
+        }
+        /** a and b have the same name, but they may not be mergeable. */
+        function shouldReallyMerge(a, b, parent) {
+            if (a.kind !== b.kind || a.parent !== b.parent && !(isOwnChild(a, parent) && isOwnChild(b, parent))) {
+                return false;
+            }
+            switch (a.kind) {
+                case 154 /* PropertyDeclaration */:
+                case 156 /* MethodDeclaration */:
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                    return ts.hasModifier(a, 32 /* Static */) === ts.hasModifier(b, 32 /* Static */);
+                case 244 /* ModuleDeclaration */:
+                    return areSameModule(a, b);
+                default:
+                    return true;
+            }
+        }
+        // We want to merge own children like `I` in in `module A { interface I {} } module A { interface I {} }`
+        // We don't want to merge unrelated children like `m` in `const o = { a: { m() {} }, b: { m() {} } };`
+        function isOwnChild(n, parent) {
+            var par = ts.isModuleBlock(n.parent) ? n.parent.parent : n.parent;
+            return par === parent.node || ts.contains(parent.additionalNodes, par);
+        }
+        // We use 1 NavNode to represent 'A.B.C', but there are multiple source nodes.
+        // Only merge module nodes that have the same chain. Don't merge 'A.B.C' with 'A'!
+        function areSameModule(a, b) {
+            // TODO: GH#18217
+            return a.body.kind === b.body.kind && (a.body.kind !== 244 /* ModuleDeclaration */ || areSameModule(a.body, b.body));
+        }
+        /** Merge source into target. Source should be thrown away after this is called. */
+        function merge(target, source) {
+            var _a;
+            target.additionalNodes = target.additionalNodes || [];
+            target.additionalNodes.push(source.node);
+            if (source.additionalNodes) {
+                (_a = target.additionalNodes).push.apply(_a, source.additionalNodes);
+            }
+            target.children = ts.concatenate(target.children, source.children);
+            if (target.children) {
+                mergeChildren(target.children, target);
+                sortChildren(target.children);
+            }
+        }
+        /** Recursively ensure that each NavNode's children are in sorted order. */
+        function sortChildren(children) {
+            children.sort(compareChildren);
+        }
+        function compareChildren(child1, child2) {
+            return ts.compareStringsCaseSensitiveUI(tryGetName(child1.node), tryGetName(child2.node)) // TODO: GH#18217
+                || ts.compareValues(navigationBarNodeKind(child1), navigationBarNodeKind(child2));
+        }
+        /**
+         * This differs from getItemName because this is just used for sorting.
+         * We only sort nodes by name that have a more-or-less "direct" name, as opposed to `new()` and the like.
+         * So `new()` can still come before an `aardvark` method.
+         */
+        function tryGetName(node) {
+            if (node.kind === 244 /* ModuleDeclaration */) {
+                return getModuleName(node);
+            }
+            var declName = ts.getNameOfDeclaration(node);
+            if (declName && ts.isPropertyName(declName)) {
+                return ts.unescapeLeadingUnderscores(ts.getPropertyNameForPropertyNameNode(declName)); // TODO: GH#18217
+            }
+            switch (node.kind) {
+                case 196 /* FunctionExpression */:
+                case 197 /* ArrowFunction */:
+                case 209 /* ClassExpression */:
+                    return getFunctionOrClassName(node);
+                default:
+                    return undefined;
+            }
+        }
+        function getItemName(node, name) {
+            if (node.kind === 244 /* ModuleDeclaration */) {
+                return getModuleName(node);
+            }
+            if (name) {
+                var text = nodeText(name);
+                if (text.length > 0) {
+                    return text;
+                }
+            }
+            switch (node.kind) {
+                case 279 /* SourceFile */:
+                    var sourceFile = node;
+                    return ts.isExternalModule(sourceFile)
+                        ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(sourceFile.fileName)))) + "\""
+                        : "<global>";
+                case 197 /* ArrowFunction */:
+                case 239 /* FunctionDeclaration */:
+                case 196 /* FunctionExpression */:
+                case 240 /* ClassDeclaration */:
+                case 209 /* ClassExpression */:
+                    if (ts.getModifierFlags(node) & 512 /* Default */) {
+                        return "default";
+                    }
+                    // We may get a string with newlines or other whitespace in the case of an object dereference
+                    // (eg: "app\n.onactivated"), so we should remove the whitespace for readabiltiy in the
+                    // navigation bar.
+                    return getFunctionOrClassName(node);
+                case 157 /* Constructor */:
+                    return "constructor";
+                case 161 /* ConstructSignature */:
+                    return "new()";
+                case 160 /* CallSignature */:
+                    return "()";
+                case 162 /* IndexSignature */:
+                    return "[]";
+                default:
+                    return "<unknown>";
+            }
+        }
+        /** Flattens the NavNode tree to a list, keeping only the top-level items. */
+        function topLevelItems(root) {
+            var topLevel = [];
+            function recur(item) {
+                if (isTopLevel(item)) {
+                    topLevel.push(item);
+                    if (item.children) {
+                        for (var _i = 0, _a = item.children; _i < _a.length; _i++) {
+                            var child = _a[_i];
+                            recur(child);
+                        }
+                    }
+                }
+            }
+            recur(root);
+            return topLevel;
+            function isTopLevel(item) {
+                switch (navigationBarNodeKind(item)) {
+                    case 240 /* ClassDeclaration */:
+                    case 209 /* ClassExpression */:
+                    case 243 /* EnumDeclaration */:
+                    case 241 /* InterfaceDeclaration */:
+                    case 244 /* ModuleDeclaration */:
+                    case 279 /* SourceFile */:
+                    case 242 /* TypeAliasDeclaration */:
+                    case 304 /* JSDocTypedefTag */:
+                    case 297 /* JSDocCallbackTag */:
+                        return true;
+                    case 157 /* Constructor */:
+                    case 156 /* MethodDeclaration */:
+                    case 158 /* GetAccessor */:
+                    case 159 /* SetAccessor */:
+                    case 237 /* VariableDeclaration */:
+                        return hasSomeImportantChild(item);
+                    case 197 /* ArrowFunction */:
+                    case 239 /* FunctionDeclaration */:
+                    case 196 /* FunctionExpression */:
+                        return isTopLevelFunctionDeclaration(item);
+                    default:
+                        return false;
+                }
+                function isTopLevelFunctionDeclaration(item) {
+                    if (!item.node.body) {
+                        return false;
+                    }
+                    switch (navigationBarNodeKind(item.parent)) {
+                        case 245 /* ModuleBlock */:
+                        case 279 /* SourceFile */:
+                        case 156 /* MethodDeclaration */:
+                        case 157 /* Constructor */:
+                            return true;
+                        default:
+                            return hasSomeImportantChild(item);
+                    }
+                }
+                function hasSomeImportantChild(item) {
+                    return ts.some(item.children, function (child) {
+                        var childKind = navigationBarNodeKind(child);
+                        return childKind !== 237 /* VariableDeclaration */ && childKind !== 186 /* BindingElement */;
+                    });
+                }
+            }
+        }
+        function convertToTree(n) {
+            return {
+                text: getItemName(n.node, n.name),
+                kind: ts.getNodeKind(n.node),
+                kindModifiers: getModifiers(n.node),
+                spans: getSpans(n),
+                nameSpan: n.name && getNodeSpan(n.name),
+                childItems: ts.map(n.children, convertToTree)
+            };
+        }
+        function convertToTopLevelItem(n) {
+            return {
+                text: getItemName(n.node, n.name),
+                kind: ts.getNodeKind(n.node),
+                kindModifiers: getModifiers(n.node),
+                spans: getSpans(n),
+                childItems: ts.map(n.children, convertToChildItem) || emptyChildItemArray,
+                indent: n.indent,
+                bolded: false,
+                grayed: false
+            };
+            function convertToChildItem(n) {
+                return {
+                    text: getItemName(n.node, n.name),
+                    kind: ts.getNodeKind(n.node),
+                    kindModifiers: ts.getNodeModifiers(n.node),
+                    spans: getSpans(n),
+                    childItems: emptyChildItemArray,
+                    indent: 0,
+                    bolded: false,
+                    grayed: false
+                };
+            }
+        }
+        function getSpans(n) {
+            var spans = [getNodeSpan(n.node)];
+            if (n.additionalNodes) {
+                for (var _i = 0, _a = n.additionalNodes; _i < _a.length; _i++) {
+                    var node = _a[_i];
+                    spans.push(getNodeSpan(node));
+                }
+            }
+            return spans;
+        }
+        function getModuleName(moduleDeclaration) {
+            // We want to maintain quotation marks.
+            if (ts.isAmbientModule(moduleDeclaration)) {
+                return ts.getTextOfNode(moduleDeclaration.name);
+            }
+            // Otherwise, we need to aggregate each identifier to build up the qualified name.
+            var result = [];
+            result.push(ts.getTextOfIdentifierOrLiteral(moduleDeclaration.name));
+            while (moduleDeclaration.body && moduleDeclaration.body.kind === 244 /* ModuleDeclaration */) {
+                moduleDeclaration = moduleDeclaration.body;
+                result.push(ts.getTextOfIdentifierOrLiteral(moduleDeclaration.name));
+            }
+            return result.join(".");
+        }
+        /**
+         * For 'module A.B.C', we want to get the node for 'C'.
+         * We store 'A' as associated with a NavNode, and use getModuleName to traverse down again.
+         */
+        function getInteriorModule(decl) {
+            return decl.body && ts.isModuleDeclaration(decl.body) ? getInteriorModule(decl.body) : decl;
+        }
+        function isComputedProperty(member) {
+            return !member.name || member.name.kind === 149 /* ComputedPropertyName */;
+        }
+        function getNodeSpan(node) {
+            return node.kind === 279 /* SourceFile */ ? ts.createTextSpanFromRange(node) : ts.createTextSpanFromNode(node, curSourceFile);
+        }
+        function getModifiers(node) {
+            if (node.parent && node.parent.kind === 237 /* VariableDeclaration */) {
+                node = node.parent;
+            }
+            return ts.getNodeModifiers(node);
+        }
+        function getFunctionOrClassName(node) {
+            var parent = node.parent;
+            if (node.name && ts.getFullWidth(node.name) > 0) {
+                return ts.declarationNameToString(node.name);
+            }
+            // See if it is a var initializer. If so, use the var name.
+            else if (ts.isVariableDeclaration(parent)) {
+                return ts.declarationNameToString(parent.name);
+            }
+            // See if it is of the form "<expr> = function(){...}". If so, use the text from the left-hand side.
+            else if (ts.isBinaryExpression(parent) && parent.operatorToken.kind === 59 /* EqualsToken */) {
+                return nodeText(parent.left).replace(whiteSpaceRegex, "");
+            }
+            // See if it is a property assignment, and if so use the property name
+            else if (ts.isPropertyAssignment(parent)) {
+                return nodeText(parent.name);
+            }
+            // Default exports are named "default"
+            else if (ts.getModifierFlags(node) & 512 /* Default */) {
+                return "default";
+            }
+            else if (ts.isClassLike(node)) {
+                return "<class>";
+            }
+            else if (ts.isCallExpression(parent)) {
+                var name = getCalledExpressionName(parent.expression);
+                if (name !== undefined) {
+                    var args = ts.mapDefined(parent.arguments, function (a) { return ts.isStringLiteralLike(a) ? a.getText(curSourceFile) : undefined; }).join(", ");
+                    return name + "(" + args + ") callback";
+                }
+            }
+            return "<function>";
+        }
+        function getCalledExpressionName(expr) {
+            if (ts.isIdentifier(expr)) {
+                return expr.text;
+            }
+            else if (ts.isPropertyAccessExpression(expr)) {
+                var left = getCalledExpressionName(expr.expression);
+                var right = expr.name.text;
+                return left === undefined ? right : left + "." + right;
+            }
+            else {
+                return undefined;
+            }
+        }
+        function isFunctionOrClassExpression(node) {
+            switch (node.kind) {
+                case 197 /* ArrowFunction */:
+                case 196 /* FunctionExpression */:
+                case 209 /* ClassExpression */:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+    })(NavigationBar = ts.NavigationBar || (ts.NavigationBar = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var OrganizeImports;
+    (function (OrganizeImports) {
+        /**
+         * Organize imports by:
+         *   1) Removing unused imports
+         *   2) Coalescing imports from the same module
+         *   3) Sorting imports
+         */
+        function organizeImports(sourceFile, formatContext, host, program, _preferences) {
+            var changeTracker = ts.textChanges.ChangeTracker.fromContext({ host: host, formatContext: formatContext });
+            var coalesceAndOrganizeImports = function (importGroup) { return coalesceImports(removeUnusedImports(importGroup, sourceFile, program)); };
+            // All of the old ImportDeclarations in the file, in syntactic order.
+            var topLevelImportDecls = sourceFile.statements.filter(ts.isImportDeclaration);
+            organizeImportsWorker(topLevelImportDecls, coalesceAndOrganizeImports);
+            // All of the old ExportDeclarations in the file, in syntactic order.
+            var topLevelExportDecls = sourceFile.statements.filter(ts.isExportDeclaration);
+            organizeImportsWorker(topLevelExportDecls, coalesceExports);
+            for (var _i = 0, _a = sourceFile.statements.filter(ts.isAmbientModule); _i < _a.length; _i++) {
+                var ambientModule = _a[_i];
+                if (!ambientModule.body) {
+                    continue;
+                }
+                var ambientModuleImportDecls = ambientModule.body.statements.filter(ts.isImportDeclaration);
+                organizeImportsWorker(ambientModuleImportDecls, coalesceAndOrganizeImports);
+                var ambientModuleExportDecls = ambientModule.body.statements.filter(ts.isExportDeclaration);
+                organizeImportsWorker(ambientModuleExportDecls, coalesceExports);
+            }
+            return changeTracker.getChanges();
+            function organizeImportsWorker(oldImportDecls, coalesce) {
+                if (ts.length(oldImportDecls) === 0) {
+                    return;
+                }
+                // Special case: normally, we'd expect leading and trailing trivia to follow each import
+                // around as it's sorted.  However, we do not want this to happen for leading trivia
+                // on the first import because it is probably the header comment for the file.
+                // Consider: we could do a more careful check that this trivia is actually a header,
+                // but the consequences of being wrong are very minor.
+                ts.suppressLeadingTrivia(oldImportDecls[0]);
+                var oldImportGroups = ts.group(oldImportDecls, function (importDecl) { return getExternalModuleName(importDecl.moduleSpecifier); });
+                var sortedImportGroups = ts.stableSort(oldImportGroups, function (group1, group2) { return compareModuleSpecifiers(group1[0].moduleSpecifier, group2[0].moduleSpecifier); });
+                var newImportDecls = ts.flatMap(sortedImportGroups, function (importGroup) {
+                    return getExternalModuleName(importGroup[0].moduleSpecifier)
+                        ? coalesce(importGroup)
+                        : importGroup;
+                });
+                // Delete or replace the first import.
+                if (newImportDecls.length === 0) {
+                    changeTracker.delete(sourceFile, oldImportDecls[0]);
+                }
+                else {
+                    // Note: Delete the surrounding trivia because it will have been retained in newImportDecls.
+                    changeTracker.replaceNodeWithNodes(sourceFile, oldImportDecls[0], newImportDecls, {
+                        useNonAdjustedStartPosition: true,
+                        useNonAdjustedEndPosition: false,
+                        suffix: ts.getNewLineOrDefaultFromHost(host, formatContext.options),
+                    });
+                }
+                // Delete any subsequent imports.
+                for (var i = 1; i < oldImportDecls.length; i++) {
+                    changeTracker.delete(sourceFile, oldImportDecls[i]);
+                }
+            }
+        }
+        OrganizeImports.organizeImports = organizeImports;
+        function removeUnusedImports(oldImports, sourceFile, program) {
+            var typeChecker = program.getTypeChecker();
+            var jsxNamespace = typeChecker.getJsxNamespace(sourceFile);
+            var jsxElementsPresent = !!(sourceFile.transformFlags & 4 /* ContainsJsx */);
+            var usedImports = [];
+            for (var _i = 0, oldImports_1 = oldImports; _i < oldImports_1.length; _i++) {
+                var importDecl = oldImports_1[_i];
+                var importClause = importDecl.importClause;
+                if (!importClause) {
+                    // Imports without import clauses are assumed to be included for their side effects and are not removed.
+                    usedImports.push(importDecl);
+                    continue;
+                }
+                var name = importClause.name, namedBindings = importClause.namedBindings;
+                // Default import
+                if (name && !isDeclarationUsed(name)) {
+                    name = undefined;
+                }
+                if (namedBindings) {
+                    if (ts.isNamespaceImport(namedBindings)) {
+                        // Namespace import
+                        if (!isDeclarationUsed(namedBindings.name)) {
+                            namedBindings = undefined;
+                        }
+                    }
+                    else {
+                        // List of named imports
+                        var newElements = namedBindings.elements.filter(function (e) { return isDeclarationUsed(e.name); });
+                        if (newElements.length < namedBindings.elements.length) {
+                            namedBindings = newElements.length
+                                ? ts.updateNamedImports(namedBindings, newElements)
+                                : undefined;
+                        }
+                    }
+                }
+                if (name || namedBindings) {
+                    usedImports.push(updateImportDeclarationAndClause(importDecl, name, namedBindings));
+                }
+            }
+            return usedImports;
+            function isDeclarationUsed(identifier) {
+                // The JSX factory symbol is always used if JSX elements are present - even if they are not allowed.
+                return jsxElementsPresent && (identifier.text === jsxNamespace) || ts.FindAllReferences.Core.isSymbolReferencedInFile(identifier, typeChecker, sourceFile);
+            }
+        }
+        function getExternalModuleName(specifier) {
+            return specifier !== undefined && ts.isStringLiteralLike(specifier)
+                ? specifier.text
+                : undefined;
+        }
+        // Internal for testing
+        /**
+         * @param importGroup a list of ImportDeclarations, all with the same module name.
+         */
+        function coalesceImports(importGroup) {
+            if (importGroup.length === 0) {
+                return importGroup;
+            }
+            var _a = getCategorizedImports(importGroup), importWithoutClause = _a.importWithoutClause, defaultImports = _a.defaultImports, namespaceImports = _a.namespaceImports, namedImports = _a.namedImports;
+            var coalescedImports = [];
+            if (importWithoutClause) {
+                coalescedImports.push(importWithoutClause);
+            }
+            // Normally, we don't combine default and namespace imports, but it would be silly to
+            // produce two import declarations in this special case.
+            if (defaultImports.length === 1 && namespaceImports.length === 1 && namedImports.length === 0) {
+                // Add the namespace import to the existing default ImportDeclaration.
+                var defaultImport = defaultImports[0];
+                coalescedImports.push(updateImportDeclarationAndClause(defaultImport, defaultImport.importClause.name, namespaceImports[0].importClause.namedBindings)); // TODO: GH#18217
+                return coalescedImports;
+            }
+            var sortedNamespaceImports = ts.stableSort(namespaceImports, function (i1, i2) {
+                return compareIdentifiers(i1.importClause.namedBindings.name, i2.importClause.namedBindings.name);
+            }); // TODO: GH#18217
+            for (var _i = 0, sortedNamespaceImports_1 = sortedNamespaceImports; _i < sortedNamespaceImports_1.length; _i++) {
+                var namespaceImport = sortedNamespaceImports_1[_i];
+                // Drop the name, if any
+                coalescedImports.push(updateImportDeclarationAndClause(namespaceImport, /*name*/ undefined, namespaceImport.importClause.namedBindings)); // TODO: GH#18217
+            }
+            if (defaultImports.length === 0 && namedImports.length === 0) {
+                return coalescedImports;
+            }
+            var newDefaultImport;
+            var newImportSpecifiers = [];
+            if (defaultImports.length === 1) {
+                newDefaultImport = defaultImports[0].importClause.name;
+            }
+            else {
+                for (var _b = 0, defaultImports_1 = defaultImports; _b < defaultImports_1.length; _b++) {
+                    var defaultImport = defaultImports_1[_b];
+                    newImportSpecifiers.push(ts.createImportSpecifier(ts.createIdentifier("default"), defaultImport.importClause.name)); // TODO: GH#18217
+                }
+            }
+            newImportSpecifiers.push.apply(newImportSpecifiers, ts.flatMap(namedImports, function (i) { return i.importClause.namedBindings.elements; })); // TODO: GH#18217
+            var sortedImportSpecifiers = sortSpecifiers(newImportSpecifiers);
+            var importDecl = defaultImports.length > 0
+                ? defaultImports[0]
+                : namedImports[0];
+            var newNamedImports = sortedImportSpecifiers.length === 0
+                ? newDefaultImport
+                    ? undefined
+                    : ts.createNamedImports(ts.emptyArray)
+                : namedImports.length === 0
+                    ? ts.createNamedImports(sortedImportSpecifiers)
+                    : ts.updateNamedImports(namedImports[0].importClause.namedBindings, sortedImportSpecifiers); // TODO: GH#18217
+            coalescedImports.push(updateImportDeclarationAndClause(importDecl, newDefaultImport, newNamedImports));
+            return coalescedImports;
+            /*
+             * Returns entire import declarations because they may already have been rewritten and
+             * may lack parent pointers.  The desired parts can easily be recovered based on the
+             * categorization.
+             *
+             * NB: There may be overlap between `defaultImports` and `namespaceImports`/`namedImports`.
+             */
+            function getCategorizedImports(importGroup) {
+                var importWithoutClause;
+                var defaultImports = [];
+                var namespaceImports = [];
+                var namedImports = [];
+                for (var _i = 0, importGroup_1 = importGroup; _i < importGroup_1.length; _i++) {
+                    var importDeclaration = importGroup_1[_i];
+                    if (importDeclaration.importClause === undefined) {
+                        // Only the first such import is interesting - the others are redundant.
+                        // Note: Unfortunately, we will lose trivia that was on this node.
+                        importWithoutClause = importWithoutClause || importDeclaration;
+                        continue;
+                    }
+                    var _a = importDeclaration.importClause, name = _a.name, namedBindings = _a.namedBindings;
+                    if (name) {
+                        defaultImports.push(importDeclaration);
+                    }
+                    if (namedBindings) {
+                        if (ts.isNamespaceImport(namedBindings)) {
+                            namespaceImports.push(importDeclaration);
+                        }
+                        else {
+                            namedImports.push(importDeclaration);
+                        }
+                    }
+                }
+                return {
+                    importWithoutClause: importWithoutClause,
+                    defaultImports: defaultImports,
+                    namespaceImports: namespaceImports,
+                    namedImports: namedImports,
+                };
+            }
+        }
+        OrganizeImports.coalesceImports = coalesceImports;
+        // Internal for testing
+        /**
+         * @param exportGroup a list of ExportDeclarations, all with the same module name.
+         */
+        function coalesceExports(exportGroup) {
+            if (exportGroup.length === 0) {
+                return exportGroup;
+            }
+            var _a = getCategorizedExports(exportGroup), exportWithoutClause = _a.exportWithoutClause, namedExports = _a.namedExports;
+            var coalescedExports = [];
+            if (exportWithoutClause) {
+                coalescedExports.push(exportWithoutClause);
+            }
+            if (namedExports.length === 0) {
+                return coalescedExports;
+            }
+            var newExportSpecifiers = [];
+            newExportSpecifiers.push.apply(newExportSpecifiers, ts.flatMap(namedExports, function (i) { return (i.exportClause).elements; }));
+            var sortedExportSpecifiers = sortSpecifiers(newExportSpecifiers);
+            var exportDecl = namedExports[0];
+            coalescedExports.push(ts.updateExportDeclaration(exportDecl, exportDecl.decorators, exportDecl.modifiers, ts.updateNamedExports(exportDecl.exportClause, sortedExportSpecifiers), exportDecl.moduleSpecifier));
+            return coalescedExports;
+            /*
+             * Returns entire export declarations because they may already have been rewritten and
+             * may lack parent pointers.  The desired parts can easily be recovered based on the
+             * categorization.
+             */
+            function getCategorizedExports(exportGroup) {
+                var exportWithoutClause;
+                var namedExports = [];
+                for (var _i = 0, exportGroup_1 = exportGroup; _i < exportGroup_1.length; _i++) {
+                    var exportDeclaration = exportGroup_1[_i];
+                    if (exportDeclaration.exportClause === undefined) {
+                        // Only the first such export is interesting - the others are redundant.
+                        // Note: Unfortunately, we will lose trivia that was on this node.
+                        exportWithoutClause = exportWithoutClause || exportDeclaration;
+                    }
+                    else {
+                        namedExports.push(exportDeclaration);
+                    }
+                }
+                return {
+                    exportWithoutClause: exportWithoutClause,
+                    namedExports: namedExports,
+                };
+            }
+        }
+        OrganizeImports.coalesceExports = coalesceExports;
+        function updateImportDeclarationAndClause(importDeclaration, name, namedBindings) {
+            return ts.updateImportDeclaration(importDeclaration, importDeclaration.decorators, importDeclaration.modifiers, ts.updateImportClause(importDeclaration.importClause, name, namedBindings), // TODO: GH#18217
+            importDeclaration.moduleSpecifier);
+        }
+        function sortSpecifiers(specifiers) {
+            return ts.stableSort(specifiers, function (s1, s2) {
+                return compareIdentifiers(s1.propertyName || s1.name, s2.propertyName || s2.name) ||
+                    compareIdentifiers(s1.name, s2.name);
+            });
+        }
+        /* internal */ // Exported for testing
+        function compareModuleSpecifiers(m1, m2) {
+            var name1 = getExternalModuleName(m1);
+            var name2 = getExternalModuleName(m2);
+            return ts.compareBooleans(name1 === undefined, name2 === undefined) ||
+                ts.compareBooleans(ts.isExternalModuleNameRelative(name1), ts.isExternalModuleNameRelative(name2)) ||
+                ts.compareStringsCaseInsensitive(name1, name2);
+        }
+        OrganizeImports.compareModuleSpecifiers = compareModuleSpecifiers;
+        function compareIdentifiers(s1, s2) {
+            return ts.compareStringsCaseInsensitive(s1.text, s2.text);
+        }
+    })(OrganizeImports = ts.OrganizeImports || (ts.OrganizeImports = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var OutliningElementsCollector;
+    (function (OutliningElementsCollector) {
+        function collectElements(sourceFile, cancellationToken) {
+            var res = [];
+            addNodeOutliningSpans(sourceFile, cancellationToken, res);
+            addRegionOutliningSpans(sourceFile, res);
+            return res.sort(function (span1, span2) { return span1.textSpan.start - span2.textSpan.start; });
+        }
+        OutliningElementsCollector.collectElements = collectElements;
+        function addNodeOutliningSpans(sourceFile, cancellationToken, out) {
+            var depthRemaining = 40;
+            var current = 0;
+            var statements = sourceFile.statements;
+            var n = statements.length;
+            while (current < n) {
+                while (current < n && !ts.isAnyImportSyntax(statements[current])) {
+                    visitNonImportNode(statements[current]);
+                    current++;
+                }
+                if (current === n)
+                    break;
+                var firstImport = current;
+                while (current < n && ts.isAnyImportSyntax(statements[current])) {
+                    addOutliningForLeadingCommentsForNode(statements[current], sourceFile, cancellationToken, out);
+                    current++;
+                }
+                var lastImport = current - 1;
+                if (lastImport !== firstImport) {
+                    out.push(createOutliningSpanFromBounds(ts.findChildOfKind(statements[firstImport], 92 /* ImportKeyword */, sourceFile).getStart(sourceFile), statements[lastImport].getEnd(), "imports" /* Imports */));
+                }
+            }
+            function visitNonImportNode(n) {
+                if (depthRemaining === 0)
+                    return;
+                cancellationToken.throwIfCancellationRequested();
+                if (ts.isDeclaration(n)) {
+                    addOutliningForLeadingCommentsForNode(n, sourceFile, cancellationToken, out);
+                }
+                if (isFunctionExpressionAssignedToVariable(n)) {
+                    addOutliningForLeadingCommentsForNode(n.parent.parent.parent, sourceFile, cancellationToken, out);
+                }
+                var span = getOutliningSpanForNode(n, sourceFile);
+                if (span)
+                    out.push(span);
+                depthRemaining--;
+                if (ts.isIfStatement(n) && n.elseStatement && ts.isIfStatement(n.elseStatement)) {
+                    // Consider an 'else if' to be on the same depth as the 'if'.
+                    visitNonImportNode(n.expression);
+                    visitNonImportNode(n.thenStatement);
+                    depthRemaining++;
+                    visitNonImportNode(n.elseStatement);
+                    depthRemaining--;
+                }
+                else {
+                    n.forEachChild(visitNonImportNode);
+                }
+                depthRemaining++;
+            }
+            function isFunctionExpressionAssignedToVariable(n) {
+                if (!ts.isFunctionExpression(n) && !ts.isArrowFunction(n)) {
+                    return false;
+                }
+                var ancestor = ts.findAncestor(n, ts.isVariableStatement);
+                return !!ancestor && ts.getSingleInitializerOfVariableStatementOrPropertyDeclaration(ancestor) === n;
+            }
+        }
+        function addRegionOutliningSpans(sourceFile, out) {
+            var regions = [];
+            var lineStarts = sourceFile.getLineStarts();
+            for (var i = 0; i < lineStarts.length; i++) {
+                var currentLineStart = lineStarts[i];
+                var lineEnd = i + 1 === lineStarts.length ? sourceFile.getEnd() : lineStarts[i + 1] - 1;
+                var lineText = sourceFile.text.substring(currentLineStart, lineEnd);
+                var result = isRegionDelimiter(lineText);
+                if (!result || ts.isInComment(sourceFile, currentLineStart)) {
+                    continue;
+                }
+                if (!result[1]) {
+                    var span = ts.createTextSpanFromBounds(sourceFile.text.indexOf("//", currentLineStart), lineEnd);
+                    regions.push(createOutliningSpan(span, "region" /* Region */, span, /*autoCollapse*/ false, result[2] || "#region"));
+                }
+                else {
+                    var region = regions.pop();
+                    if (region) {
+                        region.textSpan.length = lineEnd - region.textSpan.start;
+                        region.hintSpan.length = lineEnd - region.textSpan.start;
+                        out.push(region);
+                    }
+                }
+            }
+        }
+        var regionDelimiterRegExp = /^\s*\/\/\s*#(end)?region(?:\s+(.*))?(?:\r)?$/;
+        function isRegionDelimiter(lineText) {
+            return regionDelimiterRegExp.exec(lineText);
+        }
+        function addOutliningForLeadingCommentsForNode(n, sourceFile, cancellationToken, out) {
+            var comments = ts.getLeadingCommentRangesOfNode(n, sourceFile);
+            if (!comments)
+                return;
+            var firstSingleLineCommentStart = -1;
+            var lastSingleLineCommentEnd = -1;
+            var singleLineCommentCount = 0;
+            var sourceText = sourceFile.getFullText();
+            for (var _i = 0, comments_2 = comments; _i < comments_2.length; _i++) {
+                var _a = comments_2[_i], kind = _a.kind, pos = _a.pos, end = _a.end;
+                cancellationToken.throwIfCancellationRequested();
+                switch (kind) {
+                    case 2 /* SingleLineCommentTrivia */:
+                        // never fold region delimiters into single-line comment regions
+                        var commentText = sourceText.slice(pos, end);
+                        if (isRegionDelimiter(commentText)) {
+                            combineAndAddMultipleSingleLineComments();
+                            singleLineCommentCount = 0;
+                            break;
+                        }
+                        // For single line comments, combine consecutive ones (2 or more) into
+                        // a single span from the start of the first till the end of the last
+                        if (singleLineCommentCount === 0) {
+                            firstSingleLineCommentStart = pos;
+                        }
+                        lastSingleLineCommentEnd = end;
+                        singleLineCommentCount++;
+                        break;
+                    case 3 /* MultiLineCommentTrivia */:
+                        combineAndAddMultipleSingleLineComments();
+                        out.push(createOutliningSpanFromBounds(pos, end, "comment" /* Comment */));
+                        singleLineCommentCount = 0;
+                        break;
+                    default:
+                        ts.Debug.assertNever(kind);
+                }
+            }
+            combineAndAddMultipleSingleLineComments();
+            function combineAndAddMultipleSingleLineComments() {
+                // Only outline spans of two or more consecutive single line comments
+                if (singleLineCommentCount > 1) {
+                    out.push(createOutliningSpanFromBounds(firstSingleLineCommentStart, lastSingleLineCommentEnd, "comment" /* Comment */));
+                }
+            }
+        }
+        function createOutliningSpanFromBounds(pos, end, kind) {
+            return createOutliningSpan(ts.createTextSpanFromBounds(pos, end), kind);
+        }
+        function getOutliningSpanForNode(n, sourceFile) {
+            switch (n.kind) {
+                case 218 /* Block */:
+                    if (ts.isFunctionBlock(n)) {
+                        return spanForNode(n.parent, /*autoCollapse*/ n.parent.kind !== 197 /* ArrowFunction */);
+                    }
+                    // Check if the block is standalone, or 'attached' to some parent statement.
+                    // If the latter, we want to collapse the block, but consider its hint span
+                    // to be the entire span of the parent.
+                    switch (n.parent.kind) {
+                        case 223 /* DoStatement */:
+                        case 226 /* ForInStatement */:
+                        case 227 /* ForOfStatement */:
+                        case 225 /* ForStatement */:
+                        case 222 /* IfStatement */:
+                        case 224 /* WhileStatement */:
+                        case 231 /* WithStatement */:
+                        case 274 /* CatchClause */:
+                            return spanForNode(n.parent);
+                        case 235 /* TryStatement */:
+                            // Could be the try-block, or the finally-block.
+                            var tryStatement = n.parent;
+                            if (tryStatement.tryBlock === n) {
+                                return spanForNode(n.parent);
+                            }
+                            else if (tryStatement.finallyBlock === n) {
+                                return spanForNode(ts.findChildOfKind(tryStatement, 88 /* FinallyKeyword */, sourceFile));
+                            }
+                        // falls through
+                        default:
+                            // Block was a standalone block.  In this case we want to only collapse
+                            // the span of the block, independent of any parent span.
+                            return createOutliningSpan(ts.createTextSpanFromNode(n, sourceFile), "code" /* Code */);
+                    }
+                case 245 /* ModuleBlock */:
+                    return spanForNode(n.parent);
+                case 240 /* ClassDeclaration */:
+                case 209 /* ClassExpression */:
+                case 241 /* InterfaceDeclaration */:
+                case 243 /* EnumDeclaration */:
+                case 246 /* CaseBlock */:
+                    return spanForNode(n);
+                case 188 /* ObjectLiteralExpression */:
+                    return spanForObjectOrArrayLiteral(n);
+                case 187 /* ArrayLiteralExpression */:
+                    return spanForObjectOrArrayLiteral(n, 22 /* OpenBracketToken */);
+                case 260 /* JsxElement */:
+                    return spanForJSXElement(n);
+                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxOpeningElement */:
+                    return spanForJSXAttributes(n.attributes);
+            }
+            function spanForJSXElement(node) {
+                var textSpan = ts.createTextSpanFromBounds(node.openingElement.getStart(sourceFile), node.closingElement.getEnd());
+                var tagName = node.openingElement.tagName.getText(sourceFile);
+                var bannerText = "<" + tagName + ">...</" + tagName + ">";
+                return createOutliningSpan(textSpan, "code" /* Code */, textSpan, /*autoCollapse*/ false, bannerText);
+            }
+            function spanForJSXAttributes(node) {
+                if (node.properties.length === 0) {
+                    return undefined;
+                }
+                return createOutliningSpanFromBounds(node.getStart(sourceFile), node.getEnd(), "code" /* Code */);
+            }
+            function spanForObjectOrArrayLiteral(node, open) {
+                if (open === void 0) { open = 18 /* OpenBraceToken */; }
+                // If the block has no leading keywords and is inside an array literal or call expression,
+                // we only want to collapse the span of the block.
+                // Otherwise, the collapsed section will include the end of the previous line.
+                return spanForNode(node, /*autoCollapse*/ false, /*useFullStart*/ !ts.isArrayLiteralExpression(node.parent) && !ts.isCallExpression(node.parent), open);
+            }
+            function spanForNode(hintSpanNode, autoCollapse, useFullStart, open) {
+                if (autoCollapse === void 0) { autoCollapse = false; }
+                if (useFullStart === void 0) { useFullStart = true; }
+                if (open === void 0) { open = 18 /* OpenBraceToken */; }
+                var openToken = ts.findChildOfKind(n, open, sourceFile);
+                var close = open === 18 /* OpenBraceToken */ ? 19 /* CloseBraceToken */ : 23 /* CloseBracketToken */;
+                var closeToken = ts.findChildOfKind(n, close, sourceFile);
+                if (!openToken || !closeToken) {
+                    return undefined;
+                }
+                var textSpan = ts.createTextSpanFromBounds(useFullStart ? openToken.getFullStart() : openToken.getStart(sourceFile), closeToken.getEnd());
+                return createOutliningSpan(textSpan, "code" /* Code */, ts.createTextSpanFromNode(hintSpanNode, sourceFile), autoCollapse);
+            }
+        }
+        function createOutliningSpan(textSpan, kind, hintSpan, autoCollapse, bannerText) {
+            if (hintSpan === void 0) { hintSpan = textSpan; }
+            if (autoCollapse === void 0) { autoCollapse = false; }
+            if (bannerText === void 0) { bannerText = "..."; }
+            return { textSpan: textSpan, kind: kind, hintSpan: hintSpan, bannerText: bannerText, autoCollapse: autoCollapse };
+        }
+    })(OutliningElementsCollector = ts.OutliningElementsCollector || (ts.OutliningElementsCollector = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    // Note(cyrusn): this enum is ordered from strongest match type to weakest match type.
+    var PatternMatchKind;
+    (function (PatternMatchKind) {
+        PatternMatchKind[PatternMatchKind["exact"] = 0] = "exact";
+        PatternMatchKind[PatternMatchKind["prefix"] = 1] = "prefix";
+        PatternMatchKind[PatternMatchKind["substring"] = 2] = "substring";
+        PatternMatchKind[PatternMatchKind["camelCase"] = 3] = "camelCase";
+    })(PatternMatchKind = ts.PatternMatchKind || (ts.PatternMatchKind = {}));
+    function createPatternMatch(kind, isCaseSensitive) {
+        return {
+            kind: kind,
+            isCaseSensitive: isCaseSensitive
+        };
+    }
+    function createPatternMatcher(pattern) {
+        // We'll often see the same candidate string many times when searching (For example, when
+        // we see the name of a module that is used everywhere, or the name of an overload).  As
+        // such, we cache the information we compute about the candidate for the life of this
+        // pattern matcher so we don't have to compute it multiple times.
+        var stringToWordSpans = ts.createMap();
+        var dotSeparatedSegments = pattern.trim().split(".").map(function (p) { return createSegment(p.trim()); });
+        // A segment is considered invalid if we couldn't find any words in it.
+        if (dotSeparatedSegments.some(function (segment) { return !segment.subWordTextChunks.length; }))
+            return undefined;
+        return {
+            getFullMatch: function (containers, candidate) { return getFullMatch(containers, candidate, dotSeparatedSegments, stringToWordSpans); },
+            getMatchForLastSegmentOfPattern: function (candidate) { return matchSegment(candidate, ts.last(dotSeparatedSegments), stringToWordSpans); },
+            patternContainsDots: dotSeparatedSegments.length > 1
+        };
+    }
+    ts.createPatternMatcher = createPatternMatcher;
+    function getFullMatch(candidateContainers, candidate, dotSeparatedSegments, stringToWordSpans) {
+        // First, check that the last part of the dot separated pattern matches the name of the
+        // candidate.  If not, then there's no point in proceeding and doing the more
+        // expensive work.
+        var candidateMatch = matchSegment(candidate, ts.last(dotSeparatedSegments), stringToWordSpans);
+        if (!candidateMatch) {
+            return undefined;
+        }
+        // -1 because the last part was checked against the name, and only the rest
+        // of the parts are checked against the container.
+        if (dotSeparatedSegments.length - 1 > candidateContainers.length) {
+            // There weren't enough container parts to match against the pattern parts.
+            // So this definitely doesn't match.
+            return undefined;
+        }
+        var bestMatch;
+        for (var i = dotSeparatedSegments.length - 2, j = candidateContainers.length - 1; i >= 0; i -= 1, j -= 1) {
+            bestMatch = betterMatch(bestMatch, matchSegment(candidateContainers[j], dotSeparatedSegments[i], stringToWordSpans));
+        }
+        return bestMatch;
+    }
+    function getWordSpans(word, stringToWordSpans) {
+        var spans = stringToWordSpans.get(word);
+        if (!spans) {
+            stringToWordSpans.set(word, spans = breakIntoWordSpans(word));
+        }
+        return spans;
+    }
+    function matchTextChunk(candidate, chunk, stringToWordSpans) {
+        var index = indexOfIgnoringCase(candidate, chunk.textLowerCase);
+        if (index === 0) {
+            // a) Check if the word is a prefix of the candidate, in a case insensitive or
+            //    sensitive manner. If it does, return that there was an exact match if the word and candidate are the same length, else a prefix match.
+            return createPatternMatch(chunk.text.length === candidate.length ? PatternMatchKind.exact : PatternMatchKind.prefix, /*isCaseSensitive:*/ ts.startsWith(candidate, chunk.text));
+        }
+        if (chunk.isLowerCase) {
+            if (index === -1)
+                return undefined;
+            // b) If the part is entirely lowercase, then check if it is contained anywhere in the
+            //    candidate in a case insensitive manner.  If so, return that there was a substring
+            //    match.
+            //
+            //    Note: We only have a substring match if the lowercase part is prefix match of some
+            //    word part. That way we don't match something like 'Class' when the user types 'a'.
+            //    But we would match 'FooAttribute' (since 'Attribute' starts with 'a').
+            var wordSpans = getWordSpans(candidate, stringToWordSpans);
+            for (var _i = 0, wordSpans_1 = wordSpans; _i < wordSpans_1.length; _i++) {
+                var span = wordSpans_1[_i];
+                if (partStartsWith(candidate, span, chunk.text, /*ignoreCase:*/ true)) {
+                    return createPatternMatch(PatternMatchKind.substring, /*isCaseSensitive:*/ partStartsWith(candidate, span, chunk.text, /*ignoreCase:*/ false));
+                }
+            }
+            // c) Is the pattern a substring of the candidate starting on one of the candidate's word boundaries?
+            // We could check every character boundary start of the candidate for the pattern. However, that's
+            // an m * n operation in the wost case. Instead, find the first instance of the pattern
+            // substring, and see if it starts on a capital letter. It seems unlikely that the user will try to
+            // filter the list based on a substring that starts on a capital letter and also with a lowercase one.
+            // (Pattern: fogbar, Candidate: quuxfogbarFogBar).
+            if (chunk.text.length < candidate.length && isUpperCaseLetter(candidate.charCodeAt(index))) {
+                return createPatternMatch(PatternMatchKind.substring, /*isCaseSensitive:*/ false);
+            }
+        }
+        else {
+            // d) If the part was not entirely lowercase, then check if it is contained in the
+            //    candidate in a case *sensitive* manner. If so, return that there was a substring
+            //    match.
+            if (candidate.indexOf(chunk.text) > 0) {
+                return createPatternMatch(PatternMatchKind.substring, /*isCaseSensitive:*/ true);
+            }
+            // e) If the part was not entirely lowercase, then attempt a camel cased match as well.
+            if (chunk.characterSpans.length > 0) {
+                var candidateParts = getWordSpans(candidate, stringToWordSpans);
+                var isCaseSensitive = tryCamelCaseMatch(candidate, candidateParts, chunk, /*ignoreCase:*/ false) ? true
+                    : tryCamelCaseMatch(candidate, candidateParts, chunk, /*ignoreCase:*/ true) ? false : undefined;
+                if (isCaseSensitive !== undefined) {
+                    return createPatternMatch(PatternMatchKind.camelCase, isCaseSensitive);
+                }
+            }
+        }
+    }
+    function matchSegment(candidate, segment, stringToWordSpans) {
+        // First check if the segment matches as is.  This is also useful if the segment contains
+        // characters we would normally strip when splitting into parts that we also may want to
+        // match in the candidate.  For example if the segment is "@int" and the candidate is
+        // "@int", then that will show up as an exact match here.
+        //
+        // Note: if the segment contains a space or an asterisk then we must assume that it's a
+        // multi-word segment.
+        if (every(segment.totalTextChunk.text, function (ch) { return ch !== 32 /* space */ && ch !== 42 /* asterisk */; })) {
+            var match = matchTextChunk(candidate, segment.totalTextChunk, stringToWordSpans);
+            if (match)
+                return match;
+        }
+        // The logic for pattern matching is now as follows:
+        //
+        // 1) Break the segment passed in into words.  Breaking is rather simple and a
+        //    good way to think about it that if gives you all the individual alphanumeric words
+        //    of the pattern.
+        //
+        // 2) For each word try to match the word against the candidate value.
+        //
+        // 3) Matching is as follows:
+        //
+        //   a) Check if the word is a prefix of the candidate, in a case insensitive or
+        //      sensitive manner. If it does, return that there was an exact match if the word and candidate are the same length, else a prefix match.
+        //
+        //   If the word is entirely lowercase:
+        //      b) Then check if it is contained anywhere in the
+        //          candidate in a case insensitive manner.  If so, return that there was a substring
+        //          match.
+        //
+        //          Note: We only have a substring match if the lowercase part is prefix match of
+        //          some word part. That way we don't match something like 'Class' when the user
+        //          types 'a'. But we would match 'FooAttribute' (since 'Attribute' starts with
+        //          'a').
+        //
+        //       c) The word is all lower case. Is it a case insensitive substring of the candidate starting
+        //          on a part boundary of the candidate?
+        //
+        //   Else:
+        //       d) If the word was not entirely lowercase, then check if it is contained in the
+        //          candidate in a case *sensitive* manner. If so, return that there was a substring
+        //          match.
+        //
+        //       e) If the word was not entirely lowercase, then attempt a camel cased match as
+        //          well.
+        //
+        // Only if all words have some sort of match is the pattern considered matched.
+        var subWordTextChunks = segment.subWordTextChunks;
+        var bestMatch;
+        for (var _i = 0, subWordTextChunks_1 = subWordTextChunks; _i < subWordTextChunks_1.length; _i++) {
+            var subWordTextChunk = subWordTextChunks_1[_i];
+            bestMatch = betterMatch(bestMatch, matchTextChunk(candidate, subWordTextChunk, stringToWordSpans));
+        }
+        return bestMatch;
+    }
+    function betterMatch(a, b) {
+        return ts.min(a, b, compareMatches);
+    }
+    function compareMatches(a, b) {
+        return a === undefined ? 1 /* GreaterThan */ : b === undefined ? -1 /* LessThan */
+            : ts.compareValues(a.kind, b.kind) || ts.compareBooleans(!a.isCaseSensitive, !b.isCaseSensitive);
+    }
+    function partStartsWith(candidate, candidateSpan, pattern, ignoreCase, patternSpan) {
+        if (patternSpan === void 0) { patternSpan = { start: 0, length: pattern.length }; }
+        return patternSpan.length <= candidateSpan.length // If pattern part is longer than the candidate part there can never be a match.
+            && everyInRange(0, patternSpan.length, function (i) { return equalChars(pattern.charCodeAt(patternSpan.start + i), candidate.charCodeAt(candidateSpan.start + i), ignoreCase); });
+    }
+    function equalChars(ch1, ch2, ignoreCase) {
+        return ignoreCase ? toLowerCase(ch1) === toLowerCase(ch2) : ch1 === ch2;
+    }
+    function tryCamelCaseMatch(candidate, candidateParts, chunk, ignoreCase) {
+        var chunkCharacterSpans = chunk.characterSpans;
+        // Note: we may have more pattern parts than candidate parts.  This is because multiple
+        // pattern parts may match a candidate part.  For example "SiUI" against "SimpleUI".
+        // We'll have 3 pattern parts Si/U/I against two candidate parts Simple/UI.  However, U
+        // and I will both match in UI.
+        var currentCandidate = 0;
+        var currentChunkSpan = 0;
+        var firstMatch;
+        var contiguous;
+        while (true) {
+            // Let's consider our termination cases
+            if (currentChunkSpan === chunkCharacterSpans.length) {
+                return true;
+            }
+            else if (currentCandidate === candidateParts.length) {
+                // No match, since we still have more of the pattern to hit
+                return false;
+            }
+            var candidatePart = candidateParts[currentCandidate];
+            var gotOneMatchThisCandidate = false;
+            // Consider the case of matching SiUI against SimpleUIElement. The candidate parts
+            // will be Simple/UI/Element, and the pattern parts will be Si/U/I.  We'll match 'Si'
+            // against 'Simple' first.  Then we'll match 'U' against 'UI'. However, we want to
+            // still keep matching pattern parts against that candidate part.
+            for (; currentChunkSpan < chunkCharacterSpans.length; currentChunkSpan++) {
+                var chunkCharacterSpan = chunkCharacterSpans[currentChunkSpan];
+                if (gotOneMatchThisCandidate) {
+                    // We've already gotten one pattern part match in this candidate.  We will
+                    // only continue trying to consumer pattern parts if the last part and this
+                    // part are both upper case.
+                    if (!isUpperCaseLetter(chunk.text.charCodeAt(chunkCharacterSpans[currentChunkSpan - 1].start)) ||
+                        !isUpperCaseLetter(chunk.text.charCodeAt(chunkCharacterSpans[currentChunkSpan].start))) {
+                        break;
+                    }
+                }
+                if (!partStartsWith(candidate, candidatePart, chunk.text, ignoreCase, chunkCharacterSpan)) {
+                    break;
+                }
+                gotOneMatchThisCandidate = true;
+                firstMatch = firstMatch === undefined ? currentCandidate : firstMatch;
+                // If we were contiguous, then keep that value.  If we weren't, then keep that
+                // value.  If we don't know, then set the value to 'true' as an initial match is
+                // obviously contiguous.
+                contiguous = contiguous === undefined ? true : contiguous;
+                candidatePart = ts.createTextSpan(candidatePart.start + chunkCharacterSpan.length, candidatePart.length - chunkCharacterSpan.length);
+            }
+            // Check if we matched anything at all.  If we didn't, then we need to unset the
+            // contiguous bit if we currently had it set.
+            // If we haven't set the bit yet, then that means we haven't matched anything so
+            // far, and we don't want to change that.
+            if (!gotOneMatchThisCandidate && contiguous !== undefined) {
+                contiguous = false;
+            }
+            // Move onto the next candidate.
+            currentCandidate++;
+        }
+    }
+    function createSegment(text) {
+        return {
+            totalTextChunk: createTextChunk(text),
+            subWordTextChunks: breakPatternIntoTextChunks(text)
+        };
+    }
+    function isUpperCaseLetter(ch) {
+        // Fast check for the ascii range.
+        if (ch >= 65 /* A */ && ch <= 90 /* Z */) {
+            return true;
+        }
+        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 6 /* Latest */)) {
+            return false;
+        }
+        // TODO: find a way to determine this for any unicode characters in a
+        // non-allocating manner.
+        var str = String.fromCharCode(ch);
+        return str === str.toUpperCase();
+    }
+    function isLowerCaseLetter(ch) {
+        // Fast check for the ascii range.
+        if (ch >= 97 /* a */ && ch <= 122 /* z */) {
+            return true;
+        }
+        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 6 /* Latest */)) {
+            return false;
+        }
+        // TODO: find a way to determine this for any unicode characters in a
+        // non-allocating manner.
+        var str = String.fromCharCode(ch);
+        return str === str.toLowerCase();
+    }
+    // Assumes 'value' is already lowercase.
+    function indexOfIgnoringCase(str, value) {
+        var n = str.length - value.length;
+        var _loop_16 = function (start) {
+            if (every(value, function (valueChar, i) { return toLowerCase(str.charCodeAt(i + start)) === valueChar; })) {
+                return { value: start };
+            }
+        };
+        for (var start = 0; start <= n; start++) {
+            var state_4 = _loop_16(start);
+            if (typeof state_4 === "object")
+                return state_4.value;
+        }
+        return -1;
+    }
+    function toLowerCase(ch) {
+        // Fast convert for the ascii range.
+        if (ch >= 65 /* A */ && ch <= 90 /* Z */) {
+            return 97 /* a */ + (ch - 65 /* A */);
+        }
+        if (ch < 127 /* maxAsciiCharacter */) {
+            return ch;
+        }
+        // TODO: find a way to compute this for any unicode characters in a
+        // non-allocating manner.
+        return String.fromCharCode(ch).toLowerCase().charCodeAt(0);
+    }
+    function isDigit(ch) {
+        // TODO(cyrusn): Find a way to support this for unicode digits.
+        return ch >= 48 /* _0 */ && ch <= 57 /* _9 */;
+    }
+    function isWordChar(ch) {
+        return isUpperCaseLetter(ch) || isLowerCaseLetter(ch) || isDigit(ch) || ch === 95 /* _ */ || ch === 36 /* $ */;
+    }
+    function breakPatternIntoTextChunks(pattern) {
+        var result = [];
+        var wordStart = 0;
+        var wordLength = 0;
+        for (var i = 0; i < pattern.length; i++) {
+            var ch = pattern.charCodeAt(i);
+            if (isWordChar(ch)) {
+                if (wordLength === 0) {
+                    wordStart = i;
+                }
+                wordLength++;
+            }
+            else {
+                if (wordLength > 0) {
+                    result.push(createTextChunk(pattern.substr(wordStart, wordLength)));
+                    wordLength = 0;
+                }
+            }
+        }
+        if (wordLength > 0) {
+            result.push(createTextChunk(pattern.substr(wordStart, wordLength)));
+        }
+        return result;
+    }
+    function createTextChunk(text) {
+        var textLowerCase = text.toLowerCase();
+        return {
+            text: text,
+            textLowerCase: textLowerCase,
+            isLowerCase: text === textLowerCase,
+            characterSpans: breakIntoCharacterSpans(text)
+        };
+    }
+    function breakIntoCharacterSpans(identifier) {
+        return breakIntoSpans(identifier, /*word:*/ false);
+    }
+    ts.breakIntoCharacterSpans = breakIntoCharacterSpans;
+    function breakIntoWordSpans(identifier) {
+        return breakIntoSpans(identifier, /*word:*/ true);
+    }
+    ts.breakIntoWordSpans = breakIntoWordSpans;
+    function breakIntoSpans(identifier, word) {
+        var result = [];
+        var wordStart = 0;
+        for (var i = 1; i < identifier.length; i++) {
+            var lastIsDigit = isDigit(identifier.charCodeAt(i - 1));
+            var currentIsDigit = isDigit(identifier.charCodeAt(i));
+            var hasTransitionFromLowerToUpper = transitionFromLowerToUpper(identifier, word, i);
+            var hasTransitionFromUpperToLower = word && transitionFromUpperToLower(identifier, i, wordStart);
+            if (charIsPunctuation(identifier.charCodeAt(i - 1)) ||
+                charIsPunctuation(identifier.charCodeAt(i)) ||
+                lastIsDigit !== currentIsDigit ||
+                hasTransitionFromLowerToUpper ||
+                hasTransitionFromUpperToLower) {
+                if (!isAllPunctuation(identifier, wordStart, i)) {
+                    result.push(ts.createTextSpan(wordStart, i - wordStart));
+                }
+                wordStart = i;
+            }
+        }
+        if (!isAllPunctuation(identifier, wordStart, identifier.length)) {
+            result.push(ts.createTextSpan(wordStart, identifier.length - wordStart));
+        }
+        return result;
+    }
+    function charIsPunctuation(ch) {
+        switch (ch) {
+            case 33 /* exclamation */:
+            case 34 /* doubleQuote */:
+            case 35 /* hash */:
+            case 37 /* percent */:
+            case 38 /* ampersand */:
+            case 39 /* singleQuote */:
+            case 40 /* openParen */:
+            case 41 /* closeParen */:
+            case 42 /* asterisk */:
+            case 44 /* comma */:
+            case 45 /* minus */:
+            case 46 /* dot */:
+            case 47 /* slash */:
+            case 58 /* colon */:
+            case 59 /* semicolon */:
+            case 63 /* question */:
+            case 64 /* at */:
+            case 91 /* openBracket */:
+            case 92 /* backslash */:
+            case 93 /* closeBracket */:
+            case 95 /* _ */:
+            case 123 /* openBrace */:
+            case 125 /* closeBrace */:
+                return true;
+        }
+        return false;
+    }
+    function isAllPunctuation(identifier, start, end) {
+        return every(identifier, function (ch) { return charIsPunctuation(ch) && ch !== 95 /* _ */; }, start, end);
+    }
+    function transitionFromUpperToLower(identifier, index, wordStart) {
+        // Cases this supports:
+        // 1) IDisposable -> I, Disposable
+        // 2) UIElement -> UI, Element
+        // 3) HTMLDocument -> HTML, Document
+        //
+        // etc.
+        // We have a transition from an upper to a lower letter here.  But we only
+        // want to break if all the letters that preceded are uppercase.  i.e. if we
+        // have "Foo" we don't want to break that into "F, oo".  But if we have
+        // "IFoo" or "UIFoo", then we want to break that into "I, Foo" and "UI,
+        // Foo".  i.e. the last uppercase letter belongs to the lowercase letters
+        // that follows.  Note: this will make the following not split properly:
+        // "HELLOthere".  However, these sorts of names do not show up in .Net
+        // programs.
+        return index !== wordStart
+            && index + 1 < identifier.length
+            && isUpperCaseLetter(identifier.charCodeAt(index))
+            && isLowerCaseLetter(identifier.charCodeAt(index + 1))
+            && every(identifier, isUpperCaseLetter, wordStart, index);
+    }
+    function transitionFromLowerToUpper(identifier, word, index) {
+        var lastIsUpper = isUpperCaseLetter(identifier.charCodeAt(index - 1));
+        var currentIsUpper = isUpperCaseLetter(identifier.charCodeAt(index));
+        // See if the casing indicates we're starting a new word. Note: if we're breaking on
+        // words, then just seeing an upper case character isn't enough.  Instead, it has to
+        // be uppercase and the previous character can't be uppercase.
+        //
+        // For example, breaking "AddMetadata" on words would make: Add Metadata
+        //
+        // on characters would be: A dd M etadata
+        //
+        // Break "AM" on words would be: AM
+        //
+        // on characters would be: A M
+        //
+        // We break the search string on characters.  But we break the symbol name on words.
+        return currentIsUpper && (!word || !lastIsUpper);
+    }
+    function everyInRange(start, end, pred) {
+        for (var i = start; i < end; i++) {
+            if (!pred(i)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    function every(s, pred, start, end) {
+        if (start === void 0) { start = 0; }
+        if (end === void 0) { end = s.length; }
+        return everyInRange(start, end, function (i) { return pred(s.charCodeAt(i), i); });
+    }
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    function preProcessFile(sourceText, readImportFiles, detectJavaScriptImports) {
+        if (readImportFiles === void 0) { readImportFiles = true; }
+        if (detectJavaScriptImports === void 0) { detectJavaScriptImports = false; }
+        var pragmaContext = {
+            languageVersion: 1 /* ES5 */,
+            pragmas: undefined,
+            checkJsDirective: undefined,
+            referencedFiles: [],
+            typeReferenceDirectives: [],
+            libReferenceDirectives: [],
+            amdDependencies: [],
+            hasNoDefaultLib: undefined,
+            moduleName: undefined
+        };
+        var importedFiles = [];
+        var ambientExternalModules;
+        var lastToken;
+        var currentToken;
+        var braceNesting = 0;
+        // assume that text represent an external module if it contains at least one top level import/export
+        // ambient modules that are found inside external modules are interpreted as module augmentations
+        var externalModule = false;
+        function nextToken() {
+            lastToken = currentToken;
+            currentToken = ts.scanner.scan();
+            if (currentToken === 18 /* OpenBraceToken */) {
+                braceNesting++;
+            }
+            else if (currentToken === 19 /* CloseBraceToken */) {
+                braceNesting--;
+            }
+            return currentToken;
+        }
+        function getFileReference() {
+            var fileName = ts.scanner.getTokenValue();
+            var pos = ts.scanner.getTokenPos();
+            return { fileName: fileName, pos: pos, end: pos + fileName.length };
+        }
+        function recordAmbientExternalModule() {
+            if (!ambientExternalModules) {
+                ambientExternalModules = [];
+            }
+            ambientExternalModules.push({ ref: getFileReference(), depth: braceNesting });
+        }
+        function recordModuleName() {
+            importedFiles.push(getFileReference());
+            markAsExternalModuleIfTopLevel();
+        }
+        function markAsExternalModuleIfTopLevel() {
+            if (braceNesting === 0) {
+                externalModule = true;
+            }
+        }
+        /**
+         * Returns true if at least one token was consumed from the stream
+         */
+        function tryConsumeDeclare() {
+            var token = ts.scanner.getToken();
+            if (token === 125 /* DeclareKeyword */) {
+                // declare module "mod"
+                token = nextToken();
+                if (token === 130 /* ModuleKeyword */) {
+                    token = nextToken();
+                    if (token === 10 /* StringLiteral */) {
+                        recordAmbientExternalModule();
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
+        /**
+         * Returns true if at least one token was consumed from the stream
+         */
+        function tryConsumeImport() {
+            if (lastToken === 24 /* DotToken */) {
+                return false;
+            }
+            var token = ts.scanner.getToken();
+            if (token === 92 /* ImportKeyword */) {
+                token = nextToken();
+                if (token === 20 /* OpenParenToken */) {
+                    token = nextToken();
+                    if (token === 10 /* StringLiteral */) {
+                        // import("mod");
+                        recordModuleName();
+                        return true;
+                    }
+                }
+                else if (token === 10 /* StringLiteral */) {
+                    // import "mod";
+                    recordModuleName();
+                    return true;
+                }
+                else {
+                    if (token === 72 /* Identifier */ || ts.isKeyword(token)) {
+                        token = nextToken();
+                        if (token === 144 /* FromKeyword */) {
+                            token = nextToken();
+                            if (token === 10 /* StringLiteral */) {
+                                // import d from "mod";
+                                recordModuleName();
+                                return true;
+                            }
+                        }
+                        else if (token === 59 /* EqualsToken */) {
+                            if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) {
+                                return true;
+                            }
+                        }
+                        else if (token === 27 /* CommaToken */) {
+                            // consume comma and keep going
+                            token = nextToken();
+                        }
+                        else {
+                            // unknown syntax
+                            return true;
+                        }
+                    }
+                    if (token === 18 /* OpenBraceToken */) {
+                        token = nextToken();
+                        // consume "{ a as B, c, d as D}" clauses
+                        // make sure that it stops on EOF
+                        while (token !== 19 /* CloseBraceToken */ && token !== 1 /* EndOfFileToken */) {
+                            token = nextToken();
+                        }
+                        if (token === 19 /* CloseBraceToken */) {
+                            token = nextToken();
+                            if (token === 144 /* FromKeyword */) {
+                                token = nextToken();
+                                if (token === 10 /* StringLiteral */) {
+                                    // import {a as A} from "mod";
+                                    // import d, {a, b as B} from "mod"
+                                    recordModuleName();
+                                }
+                            }
+                        }
+                    }
+                    else if (token === 40 /* AsteriskToken */) {
+                        token = nextToken();
+                        if (token === 119 /* AsKeyword */) {
+                            token = nextToken();
+                            if (token === 72 /* Identifier */ || ts.isKeyword(token)) {
+                                token = nextToken();
+                                if (token === 144 /* FromKeyword */) {
+                                    token = nextToken();
+                                    if (token === 10 /* StringLiteral */) {
+                                        // import * as NS from "mod"
+                                        // import d, * as NS from "mod"
+                                        recordModuleName();
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
+        function tryConsumeExport() {
+            var token = ts.scanner.getToken();
+            if (token === 85 /* ExportKeyword */) {
+                markAsExternalModuleIfTopLevel();
+                token = nextToken();
+                if (token === 18 /* OpenBraceToken */) {
+                    token = nextToken();
+                    // consume "{ a as B, c, d as D}" clauses
+                    // make sure it stops on EOF
+                    while (token !== 19 /* CloseBraceToken */ && token !== 1 /* EndOfFileToken */) {
+                        token = nextToken();
+                    }
+                    if (token === 19 /* CloseBraceToken */) {
+                        token = nextToken();
+                        if (token === 144 /* FromKeyword */) {
+                            token = nextToken();
+                            if (token === 10 /* StringLiteral */) {
+                                // export {a as A} from "mod";
+                                // export {a, b as B} from "mod"
+                                recordModuleName();
+                            }
+                        }
+                    }
+                }
+                else if (token === 40 /* AsteriskToken */) {
+                    token = nextToken();
+                    if (token === 144 /* FromKeyword */) {
+                        token = nextToken();
+                        if (token === 10 /* StringLiteral */) {
+                            // export * from "mod"
+                            recordModuleName();
+                        }
+                    }
+                }
+                else if (token === 92 /* ImportKeyword */) {
+                    token = nextToken();
+                    if (token === 72 /* Identifier */ || ts.isKeyword(token)) {
+                        token = nextToken();
+                        if (token === 59 /* EqualsToken */) {
+                            if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) {
+                                return true;
+                            }
+                        }
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
+        function tryConsumeRequireCall(skipCurrentToken) {
+            var token = skipCurrentToken ? nextToken() : ts.scanner.getToken();
+            if (token === 134 /* RequireKeyword */) {
+                token = nextToken();
+                if (token === 20 /* OpenParenToken */) {
+                    token = nextToken();
+                    if (token === 10 /* StringLiteral */) {
+                        //  require("mod");
+                        recordModuleName();
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
+        function tryConsumeDefine() {
+            var token = ts.scanner.getToken();
+            if (token === 72 /* Identifier */ && ts.scanner.getTokenValue() === "define") {
+                token = nextToken();
+                if (token !== 20 /* OpenParenToken */) {
+                    return true;
+                }
+                token = nextToken();
+                if (token === 10 /* StringLiteral */) {
+                    // looks like define ("modname", ... - skip string literal and comma
+                    token = nextToken();
+                    if (token === 27 /* CommaToken */) {
+                        token = nextToken();
+                    }
+                    else {
+                        // unexpected token
+                        return true;
+                    }
+                }
+                // should be start of dependency list
+                if (token !== 22 /* OpenBracketToken */) {
+                    return true;
+                }
+                // skip open bracket
+                token = nextToken();
+                // scan until ']' or EOF
+                while (token !== 23 /* CloseBracketToken */ && token !== 1 /* EndOfFileToken */) {
+                    // record string literals as module names
+                    if (token === 10 /* StringLiteral */) {
+                        recordModuleName();
+                    }
+                    token = nextToken();
+                }
+                return true;
+            }
+            return false;
+        }
+        function processImports() {
+            ts.scanner.setText(sourceText);
+            nextToken();
+            // Look for:
+            //    import "mod";
+            //    import d from "mod"
+            //    import {a as A } from "mod";
+            //    import * as NS from "mod"
+            //    import d, {a, b as B} from "mod"
+            //    import i = require("mod");
+            //    import("mod");
+            //    export * from "mod"
+            //    export {a as b} from "mod"
+            //    export import i = require("mod")
+            //    (for JavaScript files) require("mod")
+            // Do not look for:
+            //    AnySymbol.import("mod")
+            //    AnySymbol.nested.import("mod")
+            while (true) {
+                if (ts.scanner.getToken() === 1 /* EndOfFileToken */) {
+                    break;
+                }
+                // check if at least one of alternative have moved scanner forward
+                if (tryConsumeDeclare() ||
+                    tryConsumeImport() ||
+                    tryConsumeExport() ||
+                    (detectJavaScriptImports && (tryConsumeRequireCall(/*skipCurrentToken*/ false) || tryConsumeDefine()))) {
+                    continue;
+                }
+                else {
+                    nextToken();
+                }
+            }
+            ts.scanner.setText(undefined);
+        }
+        if (readImportFiles) {
+            processImports();
+        }
+        ts.processCommentPragmas(pragmaContext, sourceText);
+        ts.processPragmasIntoFields(pragmaContext, ts.noop);
+        if (externalModule) {
+            // for external modules module all nested ambient modules are augmentations
+            if (ambientExternalModules) {
+                // move all detected ambient modules to imported files since they need to be resolved
+                for (var _i = 0, ambientExternalModules_1 = ambientExternalModules; _i < ambientExternalModules_1.length; _i++) {
+                    var decl = ambientExternalModules_1[_i];
+                    importedFiles.push(decl.ref);
+                }
+            }
+            return { referencedFiles: pragmaContext.referencedFiles, typeReferenceDirectives: pragmaContext.typeReferenceDirectives, libReferenceDirectives: pragmaContext.libReferenceDirectives, importedFiles: importedFiles, isLibFile: !!pragmaContext.hasNoDefaultLib, ambientExternalModules: undefined };
+        }
+        else {
+            // for global scripts ambient modules still can have augmentations - look for ambient modules with depth > 0
+            var ambientModuleNames = void 0;
+            if (ambientExternalModules) {
+                for (var _a = 0, ambientExternalModules_2 = ambientExternalModules; _a < ambientExternalModules_2.length; _a++) {
+                    var decl = ambientExternalModules_2[_a];
+                    if (decl.depth === 0) {
+                        if (!ambientModuleNames) {
+                            ambientModuleNames = [];
+                        }
+                        ambientModuleNames.push(decl.ref.fileName);
+                    }
+                    else {
+                        importedFiles.push(decl.ref);
+                    }
+                }
+            }
+            return { referencedFiles: pragmaContext.referencedFiles, typeReferenceDirectives: pragmaContext.typeReferenceDirectives, libReferenceDirectives: pragmaContext.libReferenceDirectives, importedFiles: importedFiles, isLibFile: !!pragmaContext.hasNoDefaultLib, ambientExternalModules: ambientModuleNames };
+        }
+    }
+    ts.preProcessFile = preProcessFile;
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var Rename;
+    (function (Rename) {
+        function getRenameInfo(program, sourceFile, position, options) {
+            var node = ts.getTouchingPropertyName(sourceFile, position);
+            var renameInfo = node && nodeIsEligibleForRename(node)
+                ? getRenameInfoForNode(node, program.getTypeChecker(), sourceFile, function (declaration) { return program.isSourceFileDefaultLibrary(declaration.getSourceFile()); }, options)
+                : undefined;
+            return renameInfo || getRenameInfoError(ts.Diagnostics.You_cannot_rename_this_element);
+        }
+        Rename.getRenameInfo = getRenameInfo;
+        function getRenameInfoForNode(node, typeChecker, sourceFile, isDefinedInLibraryFile, options) {
+            var symbol = typeChecker.getSymbolAtLocation(node);
+            if (!symbol)
+                return;
+            // Only allow a symbol to be renamed if it actually has at least one declaration.
+            var declarations = symbol.declarations;
+            if (!declarations || declarations.length === 0)
+                return;
+            // Disallow rename for elements that are defined in the standard TypeScript library.
+            if (declarations.some(isDefinedInLibraryFile)) {
+                return getRenameInfoError(ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library);
+            }
+            // Cannot rename `default` as in `import { default as foo } from "./someModule";
+            if (ts.isIdentifier(node) && node.originalKeywordKind === 80 /* DefaultKeyword */ && symbol.parent.flags & 1536 /* Module */) {
+                return undefined;
+            }
+            if (ts.isStringLiteralLike(node) && ts.tryGetImportFromModuleSpecifier(node)) {
+                return options && options.allowRenameOfImportPath ? getRenameInfoForModule(node, sourceFile, symbol) : undefined;
+            }
+            var kind = ts.SymbolDisplay.getSymbolKind(typeChecker, symbol, node);
+            var specifierName = (ts.isImportOrExportSpecifierName(node) || ts.isStringOrNumericLiteralLike(node) && node.parent.kind === 149 /* ComputedPropertyName */)
+                ? ts.stripQuotes(ts.getTextOfIdentifierOrLiteral(node))
+                : undefined;
+            var displayName = specifierName || typeChecker.symbolToString(symbol);
+            var fullDisplayName = specifierName || typeChecker.getFullyQualifiedName(symbol);
+            return getRenameInfoSuccess(displayName, fullDisplayName, kind, ts.SymbolDisplay.getSymbolModifiers(symbol), node, sourceFile);
+        }
+        function getRenameInfoForModule(node, sourceFile, moduleSymbol) {
+            if (!ts.isExternalModuleNameRelative(node.text)) {
+                return getRenameInfoError(ts.Diagnostics.You_cannot_rename_a_module_via_a_global_import);
+            }
+            var moduleSourceFile = ts.find(moduleSymbol.declarations, ts.isSourceFile);
+            if (!moduleSourceFile)
+                return undefined;
+            var withoutIndex = ts.endsWith(node.text, "/index") || ts.endsWith(node.text, "/index.js") ? undefined : ts.tryRemoveSuffix(ts.removeFileExtension(moduleSourceFile.fileName), "/index");
+            var name = withoutIndex === undefined ? moduleSourceFile.fileName : withoutIndex;
+            var kind = withoutIndex === undefined ? "module" /* moduleElement */ : "directory" /* directory */;
+            var indexAfterLastSlash = node.text.lastIndexOf("/") + 1;
+            // Span should only be the last component of the path. + 1 to account for the quote character.
+            var triggerSpan = ts.createTextSpan(node.getStart(sourceFile) + 1 + indexAfterLastSlash, node.text.length - indexAfterLastSlash);
+            return {
+                canRename: true,
+                fileToRename: name,
+                kind: kind,
+                displayName: name,
+                fullDisplayName: name,
+                kindModifiers: "" /* none */,
+                triggerSpan: triggerSpan,
+            };
+        }
+        function getRenameInfoSuccess(displayName, fullDisplayName, kind, kindModifiers, node, sourceFile) {
+            return {
+                canRename: true,
+                fileToRename: undefined,
+                kind: kind,
+                displayName: displayName,
+                fullDisplayName: fullDisplayName,
+                kindModifiers: kindModifiers,
+                triggerSpan: createTriggerSpanForNode(node, sourceFile)
+            };
+        }
+        function getRenameInfoError(diagnostic) {
+            return { canRename: false, localizedErrorMessage: ts.getLocaleSpecificMessage(diagnostic) };
+        }
+        function createTriggerSpanForNode(node, sourceFile) {
+            var start = node.getStart(sourceFile);
+            var width = node.getWidth(sourceFile);
+            if (node.kind === 10 /* StringLiteral */) {
+                // Exclude the quotes
+                start += 1;
+                width -= 2;
+            }
+            return ts.createTextSpan(start, width);
+        }
+        function nodeIsEligibleForRename(node) {
+            switch (node.kind) {
+                case 72 /* Identifier */:
+                case 10 /* StringLiteral */:
+                case 100 /* ThisKeyword */:
+                    return true;
+                case 8 /* NumericLiteral */:
+                    return ts.isLiteralNameOfPropertyDeclarationOrIndexAccess(node);
+                default:
+                    return false;
+            }
+        }
+    })(Rename = ts.Rename || (ts.Rename = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var SignatureHelp;
+    (function (SignatureHelp) {
+        var InvocationKind;
+        (function (InvocationKind) {
+            InvocationKind[InvocationKind["Call"] = 0] = "Call";
+            InvocationKind[InvocationKind["TypeArgs"] = 1] = "TypeArgs";
+            InvocationKind[InvocationKind["Contextual"] = 2] = "Contextual";
+        })(InvocationKind || (InvocationKind = {}));
+        function getSignatureHelpItems(program, sourceFile, position, triggerReason, cancellationToken) {
+            var typeChecker = program.getTypeChecker();
+            // Decide whether to show signature help
+            var startingToken = ts.findTokenOnLeftOfPosition(sourceFile, position);
+            if (!startingToken) {
+                // We are at the beginning of the file
+                return undefined;
+            }
+            // Only need to be careful if the user typed a character and signature help wasn't showing.
+            var onlyUseSyntacticOwners = !!triggerReason && triggerReason.kind === "characterTyped";
+            // Bail out quickly in the middle of a string or comment, don't provide signature help unless the user explicitly requested it.
+            if (onlyUseSyntacticOwners && (ts.isInString(sourceFile, position, startingToken) || ts.isInComment(sourceFile, position))) {
+                return undefined;
+            }
+            var isManuallyInvoked = !!triggerReason && triggerReason.kind === "invoked";
+            var argumentInfo = getContainingArgumentInfo(startingToken, position, sourceFile, typeChecker, isManuallyInvoked);
+            if (!argumentInfo)
+                return undefined;
+            cancellationToken.throwIfCancellationRequested();
+            // Extra syntactic and semantic filtering of signature help
+            var candidateInfo = getCandidateOrTypeInfo(argumentInfo, typeChecker, sourceFile, startingToken, onlyUseSyntacticOwners);
+            cancellationToken.throwIfCancellationRequested();
+            if (!candidateInfo) {
+                // We didn't have any sig help items produced by the TS compiler.  If this is a JS
+                // file, then see if we can figure out anything better.
+                return ts.isSourceFileJS(sourceFile) ? createJSSignatureHelpItems(argumentInfo, program, cancellationToken) : undefined;
+            }
+            return typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) {
+                return candidateInfo.kind === 0 /* Candidate */
+                    ? createSignatureHelpItems(candidateInfo.candidates, candidateInfo.resolvedSignature, argumentInfo, sourceFile, typeChecker)
+                    : createTypeHelpItems(candidateInfo.symbol, argumentInfo, sourceFile, typeChecker);
+            });
+        }
+        SignatureHelp.getSignatureHelpItems = getSignatureHelpItems;
+        var CandidateOrTypeKind;
+        (function (CandidateOrTypeKind) {
+            CandidateOrTypeKind[CandidateOrTypeKind["Candidate"] = 0] = "Candidate";
+            CandidateOrTypeKind[CandidateOrTypeKind["Type"] = 1] = "Type";
+        })(CandidateOrTypeKind || (CandidateOrTypeKind = {}));
+        function getCandidateOrTypeInfo(_a, checker, sourceFile, startingToken, onlyUseSyntacticOwners) {
+            var invocation = _a.invocation, argumentCount = _a.argumentCount;
+            switch (invocation.kind) {
+                case 0 /* Call */: {
+                    if (onlyUseSyntacticOwners && !isSyntacticOwner(startingToken, invocation.node, sourceFile)) {
+                        return undefined;
+                    }
+                    var candidates = [];
+                    var resolvedSignature = checker.getResolvedSignatureForSignatureHelp(invocation.node, candidates, argumentCount); // TODO: GH#18217
+                    return candidates.length === 0 ? undefined : { kind: 0 /* Candidate */, candidates: candidates, resolvedSignature: resolvedSignature };
+                }
+                case 1 /* TypeArgs */: {
+                    var called = invocation.called;
+                    if (onlyUseSyntacticOwners && !containsPrecedingToken(startingToken, sourceFile, ts.isIdentifier(called) ? called.parent : called)) {
+                        return undefined;
+                    }
+                    var candidates = ts.getPossibleGenericSignatures(called, argumentCount, checker);
+                    if (candidates.length !== 0)
+                        return { kind: 0 /* Candidate */, candidates: candidates, resolvedSignature: ts.first(candidates) };
+                    var symbol = checker.getSymbolAtLocation(called);
+                    return symbol && { kind: 1 /* Type */, symbol: symbol };
+                }
+                case 2 /* Contextual */:
+                    return { kind: 0 /* Candidate */, candidates: [invocation.signature], resolvedSignature: invocation.signature };
+                default:
+                    return ts.Debug.assertNever(invocation);
+            }
+        }
+        function isSyntacticOwner(startingToken, node, sourceFile) {
+            if (!ts.isCallOrNewExpression(node))
+                return false;
+            var invocationChildren = node.getChildren(sourceFile);
+            switch (startingToken.kind) {
+                case 20 /* OpenParenToken */:
+                    return ts.contains(invocationChildren, startingToken);
+                case 27 /* CommaToken */: {
+                    var containingList = ts.findContainingList(startingToken);
+                    return !!containingList && ts.contains(invocationChildren, containingList);
+                }
+                case 28 /* LessThanToken */:
+                    return containsPrecedingToken(startingToken, sourceFile, node.expression);
+                default:
+                    return false;
+            }
+        }
+        function createJSSignatureHelpItems(argumentInfo, program, cancellationToken) {
+            if (argumentInfo.invocation.kind === 2 /* Contextual */)
+                return undefined;
+            // See if we can find some symbol with the call expression name that has call signatures.
+            var expression = getExpressionFromInvocation(argumentInfo.invocation);
+            var name = ts.isIdentifier(expression) ? expression.text : ts.isPropertyAccessExpression(expression) ? expression.name.text : undefined;
+            var typeChecker = program.getTypeChecker();
+            return name === undefined ? undefined : ts.firstDefined(program.getSourceFiles(), function (sourceFile) {
+                return ts.firstDefined(sourceFile.getNamedDeclarations().get(name), function (declaration) {
+                    var type = declaration.symbol && typeChecker.getTypeOfSymbolAtLocation(declaration.symbol, declaration);
+                    var callSignatures = type && type.getCallSignatures();
+                    if (callSignatures && callSignatures.length) {
+                        return typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) { return createSignatureHelpItems(callSignatures, callSignatures[0], argumentInfo, sourceFile, typeChecker); });
+                    }
+                });
+            });
+        }
+        function containsPrecedingToken(startingToken, sourceFile, container) {
+            var precedingToken = ts.Debug.assertDefined(ts.findPrecedingToken(startingToken.getFullStart(), sourceFile, startingToken.parent, /*excludeJsdoc*/ true));
+            return ts.rangeContainsRange(container, precedingToken);
+        }
+        function getArgumentInfoForCompletions(node, position, sourceFile) {
+            var info = getImmediatelyContainingArgumentInfo(node, position, sourceFile);
+            return !info || info.isTypeParameterList || info.invocation.kind !== 0 /* Call */ ? undefined
+                : { invocation: info.invocation.node, argumentCount: info.argumentCount, argumentIndex: info.argumentIndex };
+        }
+        SignatureHelp.getArgumentInfoForCompletions = getArgumentInfoForCompletions;
+        function getArgumentOrParameterListInfo(node, sourceFile) {
+            var info = getArgumentOrParameterListAndIndex(node, sourceFile);
+            if (!info)
+                return undefined;
+            var list = info.list, argumentIndex = info.argumentIndex;
+            var argumentCount = getArgumentCount(list);
+            if (argumentIndex !== 0) {
+                ts.Debug.assertLessThan(argumentIndex, argumentCount);
+            }
+            var argumentsSpan = getApplicableSpanForArguments(list, sourceFile);
+            return { list: list, argumentIndex: argumentIndex, argumentCount: argumentCount, argumentsSpan: argumentsSpan };
+        }
+        function getArgumentOrParameterListAndIndex(node, sourceFile) {
+            if (node.kind === 28 /* LessThanToken */ || node.kind === 20 /* OpenParenToken */) {
+                // Find the list that starts right *after* the < or ( token.
+                // If the user has just opened a list, consider this item 0.
+                return { list: getChildListThatStartsWithOpenerToken(node.parent, node, sourceFile), argumentIndex: 0 };
+            }
+            else {
+                // findListItemInfo can return undefined if we are not in parent's argument list
+                // or type argument list. This includes cases where the cursor is:
+                //   - To the right of the closing parenthesis, non-substitution template, or template tail.
+                //   - Between the type arguments and the arguments (greater than token)
+                //   - On the target of the call (parent.func)
+                //   - On the 'new' keyword in a 'new' expression
+                var list = ts.findContainingList(node);
+                return list && { list: list, argumentIndex: getArgumentIndex(list, node) };
+            }
+        }
+        /**
+         * Returns relevant information for the argument list and the current argument if we are
+         * in the argument of an invocation; returns undefined otherwise.
+         */
+        function getImmediatelyContainingArgumentInfo(node, position, sourceFile) {
+            var parent = node.parent;
+            if (ts.isCallOrNewExpression(parent)) {
+                var invocation = parent;
+                // There are 3 cases to handle:
+                //   1. The token introduces a list, and should begin a signature help session
+                //   2. The token is either not associated with a list, or ends a list, so the session should end
+                //   3. The token is buried inside a list, and should give signature help
+                //
+                // The following are examples of each:
+                //
+                //    Case 1:
+                //          foo<#T, U>(#a, b)    -> The token introduces a list, and should begin a signature help session
+                //    Case 2:
+                //          fo#o<T, U>#(a, b)#   -> The token is either not associated with a list, or ends a list, so the session should end
+                //    Case 3:
+                //          foo<T#, U#>(a#, #b#) -> The token is buried inside a list, and should give signature help
+                // Find out if 'node' is an argument, a type argument, or neither
+                var info = getArgumentOrParameterListInfo(node, sourceFile);
+                if (!info)
+                    return undefined;
+                var list = info.list, argumentIndex = info.argumentIndex, argumentCount = info.argumentCount, argumentsSpan = info.argumentsSpan;
+                var isTypeParameterList = !!parent.typeArguments && parent.typeArguments.pos === list.pos;
+                return { isTypeParameterList: isTypeParameterList, invocation: { kind: 0 /* Call */, node: invocation }, argumentsSpan: argumentsSpan, argumentIndex: argumentIndex, argumentCount: argumentCount };
+            }
+            else if (ts.isNoSubstitutionTemplateLiteral(node) && ts.isTaggedTemplateExpression(parent)) {
+                // Check if we're actually inside the template;
+                // otherwise we'll fall out and return undefined.
+                if (ts.isInsideTemplateLiteral(node, position, sourceFile)) {
+                    return getArgumentListInfoForTemplate(parent, /*argumentIndex*/ 0, sourceFile);
+                }
+                return undefined;
+            }
+            else if (ts.isTemplateHead(node) && parent.parent.kind === 193 /* TaggedTemplateExpression */) {
+                var templateExpression = parent;
+                var tagExpression = templateExpression.parent;
+                ts.Debug.assert(templateExpression.kind === 206 /* TemplateExpression */);
+                var argumentIndex = ts.isInsideTemplateLiteral(node, position, sourceFile) ? 0 : 1;
+                return getArgumentListInfoForTemplate(tagExpression, argumentIndex, sourceFile);
+            }
+            else if (ts.isTemplateSpan(parent) && ts.isTaggedTemplateExpression(parent.parent.parent)) {
+                var templateSpan = parent;
+                var tagExpression = parent.parent.parent;
+                // If we're just after a template tail, don't show signature help.
+                if (ts.isTemplateTail(node) && !ts.isInsideTemplateLiteral(node, position, sourceFile)) {
+                    return undefined;
+                }
+                var spanIndex = templateSpan.parent.templateSpans.indexOf(templateSpan);
+                var argumentIndex = getArgumentIndexForTemplatePiece(spanIndex, node, position, sourceFile);
+                return getArgumentListInfoForTemplate(tagExpression, argumentIndex, sourceFile);
+            }
+            else if (ts.isJsxOpeningLikeElement(parent)) {
+                // Provide a signature help for JSX opening element or JSX self-closing element.
+                // This is not guarantee that JSX tag-name is resolved into stateless function component. (that is done in "getSignatureHelpItems")
+                // i.e
+                //      export function MainButton(props: ButtonProps, context: any): JSX.Element { ... }
+                //      <MainButton /*signatureHelp*/
+                var attributeSpanStart = parent.attributes.pos;
+                var attributeSpanEnd = ts.skipTrivia(sourceFile.text, parent.attributes.end, /*stopAfterLineBreak*/ false);
+                return {
+                    isTypeParameterList: false,
+                    invocation: { kind: 0 /* Call */, node: parent },
+                    argumentsSpan: ts.createTextSpan(attributeSpanStart, attributeSpanEnd - attributeSpanStart),
+                    argumentIndex: 0,
+                    argumentCount: 1
+                };
+            }
+            else {
+                var typeArgInfo = ts.getPossibleTypeArgumentsInfo(node, sourceFile);
+                if (typeArgInfo) {
+                    var called = typeArgInfo.called, nTypeArguments = typeArgInfo.nTypeArguments;
+                    var invocation = { kind: 1 /* TypeArgs */, called: called };
+                    var argumentsSpan = ts.createTextSpanFromBounds(called.getStart(sourceFile), node.end);
+                    return { isTypeParameterList: true, invocation: invocation, argumentsSpan: argumentsSpan, argumentIndex: nTypeArguments, argumentCount: nTypeArguments + 1 };
+                }
+                return undefined;
+            }
+        }
+        function getImmediatelyContainingArgumentOrContextualParameterInfo(node, position, sourceFile, checker) {
+            return tryGetParameterInfo(node, position, sourceFile, checker) || getImmediatelyContainingArgumentInfo(node, position, sourceFile);
+        }
+        function getHighestBinary(b) {
+            return ts.isBinaryExpression(b.parent) ? getHighestBinary(b.parent) : b;
+        }
+        function countBinaryExpressionParameters(b) {
+            return ts.isBinaryExpression(b.left) ? countBinaryExpressionParameters(b.left) + 1 : 2;
+        }
+        function tryGetParameterInfo(startingToken, _position, sourceFile, checker) {
+            var info = getContextualSignatureLocationInfo(startingToken, sourceFile, checker);
+            if (!info)
+                return undefined;
+            var contextualType = info.contextualType, argumentIndex = info.argumentIndex, argumentCount = info.argumentCount, argumentsSpan = info.argumentsSpan;
+            var signatures = contextualType.getCallSignatures();
+            if (signatures.length !== 1)
+                return undefined;
+            var invocation = { kind: 2 /* Contextual */, signature: ts.first(signatures), node: startingToken, symbol: chooseBetterSymbol(contextualType.symbol) };
+            return { isTypeParameterList: false, invocation: invocation, argumentsSpan: argumentsSpan, argumentIndex: argumentIndex, argumentCount: argumentCount };
+        }
+        function getContextualSignatureLocationInfo(startingToken, sourceFile, checker) {
+            if (startingToken.kind !== 20 /* OpenParenToken */ && startingToken.kind !== 27 /* CommaToken */)
+                return undefined;
+            var parent = startingToken.parent;
+            switch (parent.kind) {
+                case 195 /* ParenthesizedExpression */:
+                case 156 /* MethodDeclaration */:
+                case 196 /* FunctionExpression */:
+                case 197 /* ArrowFunction */:
+                    var info = getArgumentOrParameterListInfo(startingToken, sourceFile);
+                    if (!info)
+                        return undefined;
+                    var argumentIndex = info.argumentIndex, argumentCount = info.argumentCount, argumentsSpan = info.argumentsSpan;
+                    var contextualType = ts.isMethodDeclaration(parent) ? checker.getContextualTypeForObjectLiteralElement(parent) : checker.getContextualType(parent);
+                    return contextualType && { contextualType: contextualType, argumentIndex: argumentIndex, argumentCount: argumentCount, argumentsSpan: argumentsSpan };
+                case 204 /* BinaryExpression */: {
+                    var highestBinary = getHighestBinary(parent);
+                    var contextualType_1 = checker.getContextualType(highestBinary);
+                    var argumentIndex_1 = startingToken.kind === 20 /* OpenParenToken */ ? 0 : countBinaryExpressionParameters(parent) - 1;
+                    var argumentCount_1 = countBinaryExpressionParameters(highestBinary);
+                    return contextualType_1 && { contextualType: contextualType_1, argumentIndex: argumentIndex_1, argumentCount: argumentCount_1, argumentsSpan: ts.createTextSpanFromNode(parent) };
+                }
+                default:
+                    return undefined;
+            }
+        }
+        // The type of a function type node has a symbol at that node, but it's better to use the symbol for a parameter or type alias.
+        function chooseBetterSymbol(s) {
+            return s.name === "__type" /* Type */
+                ? ts.firstDefined(s.declarations, function (d) { return ts.isFunctionTypeNode(d) ? d.parent.symbol : undefined; }) || s
+                : s;
+        }
+        function getArgumentIndex(argumentsList, node) {
+            // The list we got back can include commas.  In the presence of errors it may
+            // also just have nodes without commas.  For example "Foo(a b c)" will have 3
+            // args without commas. We want to find what index we're at.  So we count
+            // forward until we hit ourselves, only incrementing the index if it isn't a
+            // comma.
+            //
+            // Note: the subtlety around trailing commas (in getArgumentCount) does not apply
+            // here.  That's because we're only walking forward until we hit the node we're
+            // on.  In that case, even if we're after the trailing comma, we'll still see
+            // that trailing comma in the list, and we'll have generated the appropriate
+            // arg index.
+            var argumentIndex = 0;
+            for (var _i = 0, _a = argumentsList.getChildren(); _i < _a.length; _i++) {
+                var child = _a[_i];
+                if (child === node) {
+                    break;
+                }
+                if (child.kind !== 27 /* CommaToken */) {
+                    argumentIndex++;
+                }
+            }
+            return argumentIndex;
+        }
+        function getArgumentCount(argumentsList) {
+            // The argument count for a list is normally the number of non-comma children it has.
+            // For example, if you have "Foo(a,b)" then there will be three children of the arg
+            // list 'a' '<comma>' 'b'.  So, in this case the arg count will be 2.  However, there
+            // is a small subtlety.  If you have "Foo(a,)", then the child list will just have
+            // 'a' '<comma>'.  So, in the case where the last child is a comma, we increase the
+            // arg count by one to compensate.
+            //
+            // Note: this subtlety only applies to the last comma.  If you had "Foo(a,," then
+            // we'll have: 'a' '<comma>' '<missing>'
+            // That will give us 2 non-commas.  We then add one for the last comma, giving us an
+            // arg count of 3.
+            var listChildren = argumentsList.getChildren();
+            var argumentCount = ts.countWhere(listChildren, function (arg) { return arg.kind !== 27 /* CommaToken */; });
+            if (listChildren.length > 0 && ts.last(listChildren).kind === 27 /* CommaToken */) {
+                argumentCount++;
+            }
+            return argumentCount;
+        }
+        // spanIndex is either the index for a given template span.
+        // This does not give appropriate results for a NoSubstitutionTemplateLiteral
+        function getArgumentIndexForTemplatePiece(spanIndex, node, position, sourceFile) {
+            // Because the TemplateStringsArray is the first argument, we have to offset each substitution expression by 1.
+            // There are three cases we can encounter:
+            //      1. We are precisely in the template literal (argIndex = 0).
+            //      2. We are in or to the right of the substitution expression (argIndex = spanIndex + 1).
+            //      3. We are directly to the right of the template literal, but because we look for the token on the left,
+            //          not enough to put us in the substitution expression; we should consider ourselves part of
+            //          the *next* span's expression by offsetting the index (argIndex = (spanIndex + 1) + 1).
+            //
+            // tslint:disable no-double-space
+            // Example: f  `# abcd $#{#  1 + 1#  }# efghi ${ #"#hello"#  }  #  `
+            //              ^       ^ ^       ^   ^          ^ ^      ^     ^
+            // Case:        1       1 3       2   1          3 2      2     1
+            // tslint:enable no-double-space
+            ts.Debug.assert(position >= node.getStart(), "Assumed 'position' could not occur before node.");
+            if (ts.isTemplateLiteralToken(node)) {
+                if (ts.isInsideTemplateLiteral(node, position, sourceFile)) {
+                    return 0;
+                }
+                return spanIndex + 2;
+            }
+            return spanIndex + 1;
+        }
+        function getArgumentListInfoForTemplate(tagExpression, argumentIndex, sourceFile) {
+            // argumentCount is either 1 or (numSpans + 1) to account for the template strings array argument.
+            var argumentCount = ts.isNoSubstitutionTemplateLiteral(tagExpression.template) ? 1 : tagExpression.template.templateSpans.length + 1;
+            if (argumentIndex !== 0) {
+                ts.Debug.assertLessThan(argumentIndex, argumentCount);
+            }
+            return {
+                isTypeParameterList: false,
+                invocation: { kind: 0 /* Call */, node: tagExpression },
+                argumentsSpan: getApplicableSpanForTaggedTemplate(tagExpression, sourceFile),
+                argumentIndex: argumentIndex,
+                argumentCount: argumentCount
+            };
+        }
+        function getApplicableSpanForArguments(argumentsList, sourceFile) {
+            // We use full start and skip trivia on the end because we want to include trivia on
+            // both sides. For example,
+            //
+            //    foo(   /*comment */     a, b, c      /*comment*/     )
+            //        |                                               |
+            //
+            // The applicable span is from the first bar to the second bar (inclusive,
+            // but not including parentheses)
+            var applicableSpanStart = argumentsList.getFullStart();
+            var applicableSpanEnd = ts.skipTrivia(sourceFile.text, argumentsList.getEnd(), /*stopAfterLineBreak*/ false);
+            return ts.createTextSpan(applicableSpanStart, applicableSpanEnd - applicableSpanStart);
+        }
+        function getApplicableSpanForTaggedTemplate(taggedTemplate, sourceFile) {
+            var template = taggedTemplate.template;
+            var applicableSpanStart = template.getStart();
+            var applicableSpanEnd = template.getEnd();
+            // We need to adjust the end position for the case where the template does not have a tail.
+            // Otherwise, we will not show signature help past the expression.
+            // For example,
+            //
+            //      ` ${ 1 + 1 foo(10)
+            //       |       |
+            // This is because a Missing node has no width. However, what we actually want is to include trivia
+            // leading up to the next token in case the user is about to type in a TemplateMiddle or TemplateTail.
+            if (template.kind === 206 /* TemplateExpression */) {
+                var lastSpan = ts.last(template.templateSpans);
+                if (lastSpan.literal.getFullWidth() === 0) {
+                    applicableSpanEnd = ts.skipTrivia(sourceFile.text, applicableSpanEnd, /*stopAfterLineBreak*/ false);
+                }
+            }
+            return ts.createTextSpan(applicableSpanStart, applicableSpanEnd - applicableSpanStart);
+        }
+        function getContainingArgumentInfo(node, position, sourceFile, checker, isManuallyInvoked) {
+            var _loop_17 = function (n) {
+                // If the node is not a subspan of its parent, this is a big problem.
+                // There have been crashes that might be caused by this violation.
+                ts.Debug.assert(ts.rangeContainsRange(n.parent, n), "Not a subspan", function () { return "Child: " + ts.Debug.showSyntaxKind(n) + ", parent: " + ts.Debug.showSyntaxKind(n.parent); });
+                var argumentInfo = getImmediatelyContainingArgumentOrContextualParameterInfo(n, position, sourceFile, checker);
+                if (argumentInfo) {
+                    return { value: argumentInfo };
+                }
+            };
+            for (var n = node; !ts.isSourceFile(n) && (isManuallyInvoked || !ts.isBlock(n)); n = n.parent) {
+                var state_5 = _loop_17(n);
+                if (typeof state_5 === "object")
+                    return state_5.value;
+            }
+            return undefined;
+        }
+        function getChildListThatStartsWithOpenerToken(parent, openerToken, sourceFile) {
+            var children = parent.getChildren(sourceFile);
+            var indexOfOpenerToken = children.indexOf(openerToken);
+            ts.Debug.assert(indexOfOpenerToken >= 0 && children.length > indexOfOpenerToken + 1);
+            return children[indexOfOpenerToken + 1];
+        }
+        function getExpressionFromInvocation(invocation) {
+            return invocation.kind === 0 /* Call */ ? ts.getInvokedExpression(invocation.node) : invocation.called;
+        }
+        function getEnclosingDeclarationFromInvocation(invocation) {
+            return invocation.kind === 0 /* Call */ ? invocation.node : invocation.kind === 1 /* TypeArgs */ ? invocation.called : invocation.node;
+        }
+        var signatureHelpNodeBuilderFlags = 8192 /* OmitParameterModifiers */ | 70221824 /* IgnoreErrors */ | 16384 /* UseAliasDefinedOutsideCurrentScope */;
+        function createSignatureHelpItems(candidates, resolvedSignature, _a, sourceFile, typeChecker) {
+            var isTypeParameterList = _a.isTypeParameterList, argumentCount = _a.argumentCount, applicableSpan = _a.argumentsSpan, invocation = _a.invocation, argumentIndex = _a.argumentIndex;
+            var enclosingDeclaration = getEnclosingDeclarationFromInvocation(invocation);
+            var callTargetSymbol = invocation.kind === 2 /* Contextual */ ? invocation.symbol : typeChecker.getSymbolAtLocation(getExpressionFromInvocation(invocation));
+            var callTargetDisplayParts = callTargetSymbol ? ts.symbolToDisplayParts(typeChecker, callTargetSymbol, /*enclosingDeclaration*/ undefined, /*meaning*/ undefined) : ts.emptyArray;
+            var items = candidates.map(function (candidateSignature) { return getSignatureHelpItem(candidateSignature, callTargetDisplayParts, isTypeParameterList, typeChecker, enclosingDeclaration, sourceFile); });
+            if (argumentIndex !== 0) {
+                ts.Debug.assertLessThan(argumentIndex, argumentCount);
+            }
+            var selectedItemIndex = candidates.indexOf(resolvedSignature);
+            ts.Debug.assert(selectedItemIndex !== -1); // If candidates is non-empty it should always include bestSignature. We check for an empty candidates before calling this function.
+            return { items: items, applicableSpan: applicableSpan, selectedItemIndex: selectedItemIndex, argumentIndex: argumentIndex, argumentCount: argumentCount };
+        }
+        function createTypeHelpItems(symbol, _a, sourceFile, checker) {
+            var argumentCount = _a.argumentCount, applicableSpan = _a.argumentsSpan, invocation = _a.invocation, argumentIndex = _a.argumentIndex;
+            var typeParameters = checker.getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
+            if (!typeParameters)
+                return undefined;
+            var items = [getTypeHelpItem(symbol, typeParameters, checker, getEnclosingDeclarationFromInvocation(invocation), sourceFile)];
+            return { items: items, applicableSpan: applicableSpan, selectedItemIndex: 0, argumentIndex: argumentIndex, argumentCount: argumentCount };
+        }
+        function getTypeHelpItem(symbol, typeParameters, checker, enclosingDeclaration, sourceFile) {
+            var typeSymbolDisplay = ts.symbolToDisplayParts(checker, symbol);
+            var printer = ts.createPrinter({ removeComments: true });
+            var parameters = typeParameters.map(function (t) { return createSignatureHelpParameterForTypeParameter(t, checker, enclosingDeclaration, sourceFile, printer); });
+            var documentation = symbol.getDocumentationComment(checker);
+            var tags = symbol.getJsDocTags();
+            var prefixDisplayParts = typeSymbolDisplay.concat([ts.punctuationPart(28 /* LessThanToken */)]);
+            return { isVariadic: false, prefixDisplayParts: prefixDisplayParts, suffixDisplayParts: [ts.punctuationPart(30 /* GreaterThanToken */)], separatorDisplayParts: separatorDisplayParts, parameters: parameters, documentation: documentation, tags: tags };
+        }
+        var separatorDisplayParts = [ts.punctuationPart(27 /* CommaToken */), ts.spacePart()];
+        function getSignatureHelpItem(candidateSignature, callTargetDisplayParts, isTypeParameterList, checker, enclosingDeclaration, sourceFile) {
+            var _a = (isTypeParameterList ? itemInfoForTypeParameters : itemInfoForParameters)(candidateSignature, checker, enclosingDeclaration, sourceFile), isVariadic = _a.isVariadic, parameters = _a.parameters, prefix = _a.prefix, suffix = _a.suffix;
+            var prefixDisplayParts = callTargetDisplayParts.concat(prefix);
+            var suffixDisplayParts = suffix.concat(returnTypeToDisplayParts(candidateSignature, enclosingDeclaration, checker));
+            var documentation = candidateSignature.getDocumentationComment(checker);
+            var tags = candidateSignature.getJsDocTags();
+            return { isVariadic: isVariadic, prefixDisplayParts: prefixDisplayParts, suffixDisplayParts: suffixDisplayParts, separatorDisplayParts: separatorDisplayParts, parameters: parameters, documentation: documentation, tags: tags };
+        }
+        function returnTypeToDisplayParts(candidateSignature, enclosingDeclaration, checker) {
+            return ts.mapToDisplayParts(function (writer) {
+                writer.writePunctuation(":");
+                writer.writeSpace(" ");
+                var predicate = checker.getTypePredicateOfSignature(candidateSignature);
+                if (predicate) {
+                    checker.writeTypePredicate(predicate, enclosingDeclaration, /*flags*/ undefined, writer);
+                }
+                else {
+                    checker.writeType(checker.getReturnTypeOfSignature(candidateSignature), enclosingDeclaration, /*flags*/ undefined, writer);
+                }
+            });
+        }
+        function itemInfoForTypeParameters(candidateSignature, checker, enclosingDeclaration, sourceFile) {
+            var typeParameters = (candidateSignature.target || candidateSignature).typeParameters;
+            var printer = ts.createPrinter({ removeComments: true });
+            var parameters = (typeParameters || ts.emptyArray).map(function (t) { return createSignatureHelpParameterForTypeParameter(t, checker, enclosingDeclaration, sourceFile, printer); });
+            var parameterParts = ts.mapToDisplayParts(function (writer) {
+                var thisParameter = candidateSignature.thisParameter ? [checker.symbolToParameterDeclaration(candidateSignature.thisParameter, enclosingDeclaration, signatureHelpNodeBuilderFlags)] : [];
+                var params = ts.createNodeArray(thisParameter.concat(candidateSignature.parameters.map(function (param) { return checker.symbolToParameterDeclaration(param, enclosingDeclaration, signatureHelpNodeBuilderFlags); })));
+                printer.writeList(2576 /* CallExpressionArguments */, params, sourceFile, writer);
+            });
+            return { isVariadic: false, parameters: parameters, prefix: [ts.punctuationPart(28 /* LessThanToken */)], suffix: [ts.punctuationPart(30 /* GreaterThanToken */)].concat(parameterParts) };
+        }
+        function itemInfoForParameters(candidateSignature, checker, enclosingDeclaration, sourceFile) {
+            var isVariadic = candidateSignature.hasRestParameter;
+            var printer = ts.createPrinter({ removeComments: true });
+            var typeParameterParts = ts.mapToDisplayParts(function (writer) {
+                if (candidateSignature.typeParameters && candidateSignature.typeParameters.length) {
+                    var args = ts.createNodeArray(candidateSignature.typeParameters.map(function (p) { return checker.typeParameterToDeclaration(p, enclosingDeclaration); }));
+                    printer.writeList(53776 /* TypeParameters */, args, sourceFile, writer);
+                }
+            });
+            var parameters = candidateSignature.parameters.map(function (p) { return createSignatureHelpParameterForParameter(p, checker, enclosingDeclaration, sourceFile, printer); });
+            return { isVariadic: isVariadic, parameters: parameters, prefix: typeParameterParts.concat([ts.punctuationPart(20 /* OpenParenToken */)]), suffix: [ts.punctuationPart(21 /* CloseParenToken */)] };
+        }
+        function createSignatureHelpParameterForParameter(parameter, checker, enclosingDeclaration, sourceFile, printer) {
+            var displayParts = ts.mapToDisplayParts(function (writer) {
+                var param = checker.symbolToParameterDeclaration(parameter, enclosingDeclaration, signatureHelpNodeBuilderFlags);
+                printer.writeNode(4 /* Unspecified */, param, sourceFile, writer);
+            });
+            var isOptional = checker.isOptionalParameter(parameter.valueDeclaration);
+            return { name: parameter.name, documentation: parameter.getDocumentationComment(checker), displayParts: displayParts, isOptional: isOptional };
+        }
+        function createSignatureHelpParameterForTypeParameter(typeParameter, checker, enclosingDeclaration, sourceFile, printer) {
+            var displayParts = ts.mapToDisplayParts(function (writer) {
+                var param = checker.typeParameterToDeclaration(typeParameter, enclosingDeclaration);
+                printer.writeNode(4 /* Unspecified */, param, sourceFile, writer);
+            });
+            return { name: typeParameter.symbol.name, documentation: typeParameter.symbol.getDocumentationComment(checker), displayParts: displayParts, isOptional: false };
+        }
+    })(SignatureHelp = ts.SignatureHelp || (ts.SignatureHelp = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var base64UrlRegExp = /^data:(?:application\/json(?:;charset=[uU][tT][fF]-8);base64,([A-Za-z0-9+\/=]+)$)?/;
+    function getSourceMapper(host) {
+        var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames());
+        var currentDirectory = host.getCurrentDirectory();
+        var sourceFileLike = ts.createMap();
+        var documentPositionMappers = ts.createMap();
+        return { tryGetSourcePosition: tryGetSourcePosition, tryGetGeneratedPosition: tryGetGeneratedPosition, toLineColumnOffset: toLineColumnOffset, clearCache: clearCache };
+        function toPath(fileName) {
+            return ts.toPath(fileName, currentDirectory, getCanonicalFileName);
+        }
+        function getDocumentPositionMapper(generatedFileName, sourceFileName) {
+            var path = toPath(generatedFileName);
+            var value = documentPositionMappers.get(path);
+            if (value)
+                return value;
+            var mapper;
+            if (host.getDocumentPositionMapper) {
+                mapper = host.getDocumentPositionMapper(generatedFileName, sourceFileName);
+            }
+            else if (host.readFile) {
+                var file = getSourceFileLike(generatedFileName);
+                mapper = file && ts.getDocumentPositionMapper({ getSourceFileLike: getSourceFileLike, getCanonicalFileName: getCanonicalFileName, log: function (s) { return host.log(s); } }, generatedFileName, ts.getLineInfo(file.text, ts.getLineStarts(file)), function (f) { return !host.fileExists || host.fileExists(f) ? host.readFile(f) : undefined; });
+            }
+            documentPositionMappers.set(path, mapper || ts.identitySourceMapConsumer);
+            return mapper || ts.identitySourceMapConsumer;
+        }
+        function tryGetSourcePosition(info) {
+            if (!ts.isDeclarationFileName(info.fileName))
+                return undefined;
+            var file = getSourceFile(info.fileName);
+            if (!file)
+                return undefined;
+            var newLoc = getDocumentPositionMapper(info.fileName).getSourcePosition(info);
+            return !newLoc || newLoc === info ? undefined : tryGetSourcePosition(newLoc) || newLoc;
+        }
+        function tryGetGeneratedPosition(info) {
+            if (ts.isDeclarationFileName(info.fileName))
+                return undefined;
+            var sourceFile = getSourceFile(info.fileName);
+            if (!sourceFile)
+                return undefined;
+            var program = host.getProgram();
+            var options = program.getCompilerOptions();
+            var outPath = options.outFile || options.out;
+            var declarationPath = outPath ?
+                ts.removeFileExtension(outPath) + ".d.ts" /* Dts */ :
+                ts.getDeclarationEmitOutputFilePathWorker(info.fileName, program.getCompilerOptions(), currentDirectory, program.getCommonSourceDirectory(), getCanonicalFileName);
+            if (declarationPath === undefined)
+                return undefined;
+            var newLoc = getDocumentPositionMapper(declarationPath, info.fileName).getGeneratedPosition(info);
+            return newLoc === info ? undefined : newLoc;
+        }
+        function getSourceFile(fileName) {
+            var program = host.getProgram();
+            if (!program)
+                return undefined;
+            var path = toPath(fileName);
+            // file returned here could be .d.ts when asked for .ts file if projectReferences and module resolution created this source file
+            var file = program.getSourceFileByPath(path);
+            return file && file.resolvedPath === path ? file : undefined;
+        }
+        function getOrCreateSourceFileLike(fileName) {
+            var path = toPath(fileName);
+            var fileFromCache = sourceFileLike.get(path);
+            if (fileFromCache !== undefined)
+                return fileFromCache ? fileFromCache : undefined;
+            if (!host.readFile || host.fileExists && !host.fileExists(path)) {
+                sourceFileLike.set(path, false);
+                return undefined;
+            }
+            // And failing that, check the disk
+            var text = host.readFile(path);
+            var file = text ? createSourceFileLike(text) : false;
+            sourceFileLike.set(path, file);
+            return file ? file : undefined;
+        }
+        // This can be called from source mapper in either source program or program that includes generated file
+        function getSourceFileLike(fileName) {
+            return !host.getSourceFileLike ?
+                getSourceFile(fileName) || getOrCreateSourceFileLike(fileName) :
+                host.getSourceFileLike(fileName);
+        }
+        function toLineColumnOffset(fileName, position) {
+            var file = getSourceFileLike(fileName); // TODO: GH#18217
+            return file.getLineAndCharacterOfPosition(position);
+        }
+        function clearCache() {
+            sourceFileLike.clear();
+            documentPositionMappers.clear();
+        }
+    }
+    ts.getSourceMapper = getSourceMapper;
+    function getDocumentPositionMapper(host, generatedFileName, generatedFileLineInfo, readMapFile) {
+        var mapFileName = ts.tryGetSourceMappingURL(generatedFileLineInfo);
+        if (mapFileName) {
+            var match = base64UrlRegExp.exec(mapFileName);
+            if (match) {
+                if (match[1]) {
+                    var base64Object = match[1];
+                    return convertDocumentToSourceMapper(host, ts.base64decode(ts.sys, base64Object), generatedFileName);
+                }
+                // Not a data URL we can parse, skip it
+                mapFileName = undefined;
+            }
+        }
+        var possibleMapLocations = [];
+        if (mapFileName) {
+            possibleMapLocations.push(mapFileName);
+        }
+        possibleMapLocations.push(generatedFileName + ".map");
+        var originalMapFileName = mapFileName && ts.getNormalizedAbsolutePath(mapFileName, ts.getDirectoryPath(generatedFileName));
+        for (var _i = 0, possibleMapLocations_1 = possibleMapLocations; _i < possibleMapLocations_1.length; _i++) {
+            var location = possibleMapLocations_1[_i];
+            var mapFileName_1 = ts.getNormalizedAbsolutePath(location, ts.getDirectoryPath(generatedFileName));
+            var mapFileContents = readMapFile(mapFileName_1, originalMapFileName);
+            if (ts.isString(mapFileContents)) {
+                return convertDocumentToSourceMapper(host, mapFileContents, mapFileName_1);
+            }
+            if (mapFileContents !== undefined) {
+                return mapFileContents || undefined;
+            }
+        }
+        return undefined;
+    }
+    ts.getDocumentPositionMapper = getDocumentPositionMapper;
+    function convertDocumentToSourceMapper(host, contents, mapFileName) {
+        var map = ts.tryParseRawSourceMap(contents);
+        if (!map || !map.sources || !map.file || !map.mappings) {
+            // obviously invalid map
+            return undefined;
+        }
+        return ts.createDocumentPositionMapper(host, map, mapFileName);
+    }
+    function createSourceFileLike(text, lineMap) {
+        return {
+            text: text,
+            lineMap: lineMap,
+            getLineAndCharacterOfPosition: function (pos) {
+                return ts.computeLineAndCharacterOfPosition(ts.getLineStarts(this), pos);
+            }
+        };
+    }
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var visitedNestedConvertibleFunctions = ts.createMap();
+    function computeSuggestionDiagnostics(sourceFile, program, cancellationToken) {
+        program.getSemanticDiagnostics(sourceFile, cancellationToken);
+        var diags = [];
+        var checker = program.getTypeChecker();
+        if (sourceFile.commonJsModuleIndicator &&
+            (ts.programContainsEs6Modules(program) || ts.compilerOptionsIndicateEs6Modules(program.getCompilerOptions())) &&
+            containsTopLevelCommonjs(sourceFile)) {
+            diags.push(ts.createDiagnosticForNode(getErrorNodeFromCommonJsIndicator(sourceFile.commonJsModuleIndicator), ts.Diagnostics.File_is_a_CommonJS_module_it_may_be_converted_to_an_ES6_module));
+        }
+        var isJsFile = ts.isSourceFileJS(sourceFile);
+        visitedNestedConvertibleFunctions.clear();
+        check(sourceFile);
+        if (ts.getAllowSyntheticDefaultImports(program.getCompilerOptions())) {
+            for (var _i = 0, _a = sourceFile.imports; _i < _a.length; _i++) {
+                var moduleSpecifier = _a[_i];
+                var importNode = ts.importFromModuleSpecifier(moduleSpecifier);
+                var name = importNameForConvertToDefaultImport(importNode);
+                if (!name)
+                    continue;
+                var module_2 = ts.getResolvedModule(sourceFile, moduleSpecifier.text);
+                var resolvedFile = module_2 && program.getSourceFile(module_2.resolvedFileName);
+                if (resolvedFile && resolvedFile.externalModuleIndicator && ts.isExportAssignment(resolvedFile.externalModuleIndicator) && resolvedFile.externalModuleIndicator.isExportEquals) {
+                    diags.push(ts.createDiagnosticForNode(name, ts.Diagnostics.Import_may_be_converted_to_a_default_import));
+                }
+            }
+        }
+        ts.addRange(diags, sourceFile.bindSuggestionDiagnostics);
+        ts.addRange(diags, program.getSuggestionDiagnostics(sourceFile, cancellationToken));
+        return diags.sort(function (d1, d2) { return d1.start - d2.start; });
+        function check(node) {
+            if (isJsFile) {
+                switch (node.kind) {
+                    case 196 /* FunctionExpression */:
+                        var decl = ts.getDeclarationOfExpando(node);
+                        if (decl) {
+                            var symbol_2 = decl.symbol;
+                            if (symbol_2 && (symbol_2.exports && symbol_2.exports.size || symbol_2.members && symbol_2.members.size)) {
+                                diags.push(ts.createDiagnosticForNode(ts.isVariableDeclaration(node.parent) ? node.parent.name : node, ts.Diagnostics.This_constructor_function_may_be_converted_to_a_class_declaration));
+                                break;
+                            }
+                        }
+                    // falls through if no diagnostic was created
+                    case 239 /* FunctionDeclaration */:
+                        var symbol = node.symbol;
+                        if (symbol.members && (symbol.members.size > 0)) {
+                            diags.push(ts.createDiagnosticForNode(ts.isVariableDeclaration(node.parent) ? node.parent.name : node, ts.Diagnostics.This_constructor_function_may_be_converted_to_a_class_declaration));
+                        }
+                        break;
+                }
+            }
+            else {
+                if (ts.isVariableStatement(node) &&
+                    node.parent === sourceFile &&
+                    node.declarationList.flags & 2 /* Const */ &&
+                    node.declarationList.declarations.length === 1) {
+                    var init = node.declarationList.declarations[0].initializer;
+                    if (init && ts.isRequireCall(init, /*checkArgumentIsStringLiteralLike*/ true)) {
+                        diags.push(ts.createDiagnosticForNode(init, ts.Diagnostics.require_call_may_be_converted_to_an_import));
+                    }
+                }
+                if (ts.codefix.parameterShouldGetTypeFromJSDoc(node)) {
+                    diags.push(ts.createDiagnosticForNode(node.name || node, ts.Diagnostics.JSDoc_types_may_be_moved_to_TypeScript_types));
+                }
+            }
+            if (ts.isFunctionLikeDeclaration(node)) {
+                addConvertToAsyncFunctionDiagnostics(node, checker, diags);
+            }
+            node.forEachChild(check);
+        }
+    }
+    ts.computeSuggestionDiagnostics = computeSuggestionDiagnostics;
+    // convertToEs6Module only works on top-level, so don't trigger it if commonjs code only appears in nested scopes.
+    function containsTopLevelCommonjs(sourceFile) {
+        return sourceFile.statements.some(function (statement) {
+            switch (statement.kind) {
+                case 219 /* VariableStatement */:
+                    return statement.declarationList.declarations.some(function (decl) {
+                        return !!decl.initializer && ts.isRequireCall(propertyAccessLeftHandSide(decl.initializer), /*checkArgumentIsStringLiteralLike*/ true);
+                    });
+                case 221 /* ExpressionStatement */: {
+                    var expression = statement.expression;
+                    if (!ts.isBinaryExpression(expression))
+                        return ts.isRequireCall(expression, /*checkArgumentIsStringLiteralLike*/ true);
+                    var kind = ts.getAssignmentDeclarationKind(expression);
+                    return kind === 1 /* ExportsProperty */ || kind === 2 /* ModuleExports */;
+                }
+                default:
+                    return false;
+            }
+        });
+    }
+    function propertyAccessLeftHandSide(node) {
+        return ts.isPropertyAccessExpression(node) ? propertyAccessLeftHandSide(node.expression) : node;
+    }
+    function importNameForConvertToDefaultImport(node) {
+        switch (node.kind) {
+            case 249 /* ImportDeclaration */:
+                var importClause = node.importClause, moduleSpecifier = node.moduleSpecifier;
+                return importClause && !importClause.name && importClause.namedBindings && importClause.namedBindings.kind === 251 /* NamespaceImport */ && ts.isStringLiteral(moduleSpecifier)
+                    ? importClause.namedBindings.name
+                    : undefined;
+            case 248 /* ImportEqualsDeclaration */:
+                return node.name;
+            default:
+                return undefined;
+        }
+    }
+    function addConvertToAsyncFunctionDiagnostics(node, checker, diags) {
+        // need to check function before checking map so that deeper levels of nested callbacks are checked
+        if (isConvertibleFunction(node, checker) && !visitedNestedConvertibleFunctions.has(getKeyFromNode(node))) {
+            diags.push(ts.createDiagnosticForNode(!node.name && ts.isVariableDeclaration(node.parent) && ts.isIdentifier(node.parent.name) ? node.parent.name : node, ts.Diagnostics.This_may_be_converted_to_an_async_function));
+        }
+    }
+    function isConvertibleFunction(node, checker) {
+        return !ts.isAsyncFunction(node) &&
+            node.body &&
+            ts.isBlock(node.body) &&
+            hasReturnStatementWithPromiseHandler(node.body) &&
+            returnsPromise(node, checker);
+    }
+    function returnsPromise(node, checker) {
+        var functionType = checker.getTypeAtLocation(node);
+        var callSignatures = checker.getSignaturesOfType(functionType, 0 /* Call */);
+        var returnType = callSignatures.length ? checker.getReturnTypeOfSignature(callSignatures[0]) : undefined;
+        return !!returnType && !!checker.getPromisedTypeOfPromise(returnType);
+    }
+    function getErrorNodeFromCommonJsIndicator(commonJsModuleIndicator) {
+        return ts.isBinaryExpression(commonJsModuleIndicator) ? commonJsModuleIndicator.left : commonJsModuleIndicator;
+    }
+    function hasReturnStatementWithPromiseHandler(body) {
+        return !!ts.forEachReturnStatement(body, isReturnStatementWithFixablePromiseHandler);
+    }
+    function isReturnStatementWithFixablePromiseHandler(node) {
+        return ts.isReturnStatement(node) && !!node.expression && isFixablePromiseHandler(node.expression);
+    }
+    ts.isReturnStatementWithFixablePromiseHandler = isReturnStatementWithFixablePromiseHandler;
+    // Should be kept up to date with transformExpression in convertToAsyncFunction.ts
+    function isFixablePromiseHandler(node) {
+        // ensure outermost call exists and is a promise handler
+        if (!isPromiseHandler(node) || !node.arguments.every(isFixablePromiseArgument)) {
+            return false;
+        }
+        // ensure all chained calls are valid
+        var currentNode = node.expression;
+        while (isPromiseHandler(currentNode) || ts.isPropertyAccessExpression(currentNode)) {
+            if (ts.isCallExpression(currentNode) && !currentNode.arguments.every(isFixablePromiseArgument)) {
+                return false;
+            }
+            currentNode = currentNode.expression;
+        }
+        return true;
+    }
+    ts.isFixablePromiseHandler = isFixablePromiseHandler;
+    function isPromiseHandler(node) {
+        return ts.isCallExpression(node) && (ts.hasPropertyAccessExpressionWithName(node, "then") || ts.hasPropertyAccessExpressionWithName(node, "catch"));
+    }
+    // should be kept up to date with getTransformationBody in convertToAsyncFunction.ts
+    function isFixablePromiseArgument(arg) {
+        switch (arg.kind) {
+            case 239 /* FunctionDeclaration */:
+            case 196 /* FunctionExpression */:
+            case 197 /* ArrowFunction */:
+                visitedNestedConvertibleFunctions.set(getKeyFromNode(arg), true);
+            /* falls through */
+            case 96 /* NullKeyword */:
+            case 72 /* Identifier */: // identifier includes undefined
+                return true;
+            default:
+                return false;
+        }
+    }
+    function getKeyFromNode(exp) {
+        return exp.pos.toString() + ":" + exp.end.toString();
+    }
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var SymbolDisplay;
+    (function (SymbolDisplay) {
+        // TODO(drosen): use contextual SemanticMeaning.
+        function getSymbolKind(typeChecker, symbol, location) {
+            var result = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(typeChecker, symbol, location);
+            if (result !== "" /* unknown */) {
+                return result;
+            }
+            var flags = ts.getCombinedLocalAndExportSymbolFlags(symbol);
+            if (flags & 32 /* Class */) {
+                return ts.getDeclarationOfKind(symbol, 209 /* ClassExpression */) ?
+                    "local class" /* localClassElement */ : "class" /* classElement */;
+            }
+            if (flags & 384 /* Enum */)
+                return "enum" /* enumElement */;
+            if (flags & 524288 /* TypeAlias */)
+                return "type" /* typeElement */;
+            if (flags & 64 /* Interface */)
+                return "interface" /* interfaceElement */;
+            if (flags & 262144 /* TypeParameter */)
+                return "type parameter" /* typeParameterElement */;
+            if (flags & 262144 /* TypeParameter */)
+                return "type parameter" /* typeParameterElement */;
+            if (flags & 8 /* EnumMember */)
+                return "enum member" /* enumMemberElement */;
+            if (flags & 2097152 /* Alias */)
+                return "alias" /* alias */;
+            if (flags & 1536 /* Module */)
+                return "module" /* moduleElement */;
+            return result;
+        }
+        SymbolDisplay.getSymbolKind = getSymbolKind;
+        function getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(typeChecker, symbol, location) {
+            var roots = typeChecker.getRootSymbols(symbol);
+            // If this is a method from a mapped type, leave as a method so long as it still has a call signature.
+            if (roots.length === 1
+                && ts.first(roots).flags & 8192 /* Method */
+                // Ensure the mapped version is still a method, as opposed to `{ [K in keyof I]: number }`.
+                && typeChecker.getTypeOfSymbolAtLocation(symbol, location).getNonNullableType().getCallSignatures().length !== 0) {
+                return "method" /* memberFunctionElement */;
+            }
+            if (typeChecker.isUndefinedSymbol(symbol)) {
+                return "var" /* variableElement */;
+            }
+            if (typeChecker.isArgumentsSymbol(symbol)) {
+                return "local var" /* localVariableElement */;
+            }
+            if (location.kind === 100 /* ThisKeyword */ && ts.isExpression(location)) {
+                return "parameter" /* parameterElement */;
+            }
+            var flags = ts.getCombinedLocalAndExportSymbolFlags(symbol);
+            if (flags & 3 /* Variable */) {
+                if (ts.isFirstDeclarationOfSymbolParameter(symbol)) {
+                    return "parameter" /* parameterElement */;
+                }
+                else if (symbol.valueDeclaration && ts.isVarConst(symbol.valueDeclaration)) {
+                    return "const" /* constElement */;
+                }
+                else if (ts.forEach(symbol.declarations, ts.isLet)) {
+                    return "let" /* letElement */;
+                }
+                return isLocalVariableOrFunction(symbol) ? "local var" /* localVariableElement */ : "var" /* variableElement */;
+            }
+            if (flags & 16 /* Function */)
+                return isLocalVariableOrFunction(symbol) ? "local function" /* localFunctionElement */ : "function" /* functionElement */;
+            if (flags & 32768 /* GetAccessor */)
+                return "getter" /* memberGetAccessorElement */;
+            if (flags & 65536 /* SetAccessor */)
+                return "setter" /* memberSetAccessorElement */;
+            if (flags & 8192 /* Method */)
+                return "method" /* memberFunctionElement */;
+            if (flags & 16384 /* Constructor */)
+                return "constructor" /* constructorImplementationElement */;
+            if (flags & 4 /* Property */) {
+                if (flags & 33554432 /* Transient */ && symbol.checkFlags & 6 /* Synthetic */) {
+                    // If union property is result of union of non method (property/accessors/variables), it is labeled as property
+                    var unionPropertyKind = ts.forEach(typeChecker.getRootSymbols(symbol), function (rootSymbol) {
+                        var rootSymbolFlags = rootSymbol.getFlags();
+                        if (rootSymbolFlags & (98308 /* PropertyOrAccessor */ | 3 /* Variable */)) {
+                            return "property" /* memberVariableElement */;
+                        }
+                        // May be a Function if this was from `typeof N` with `namespace N { function f();. }`.
+                        ts.Debug.assert(!!(rootSymbolFlags & (8192 /* Method */ | 16 /* Function */)));
+                    });
+                    if (!unionPropertyKind) {
+                        // If this was union of all methods,
+                        // make sure it has call signatures before we can label it as method
+                        var typeOfUnionProperty = typeChecker.getTypeOfSymbolAtLocation(symbol, location);
+                        if (typeOfUnionProperty.getCallSignatures().length) {
+                            return "method" /* memberFunctionElement */;
+                        }
+                        return "property" /* memberVariableElement */;
+                    }
+                    return unionPropertyKind;
+                }
+                // If we requested completions after `x.` at the top-level, we may be at a source file location.
+                switch (location.parent && location.parent.kind) {
+                    // If we've typed a character of the attribute name, will be 'JsxAttribute', else will be 'JsxOpeningElement'.
+                    case 262 /* JsxOpeningElement */:
+                    case 260 /* JsxElement */:
+                    case 261 /* JsxSelfClosingElement */:
+                        return location.kind === 72 /* Identifier */ ? "property" /* memberVariableElement */ : "JSX attribute" /* jsxAttribute */;
+                    case 267 /* JsxAttribute */:
+                        return "JSX attribute" /* jsxAttribute */;
+                    default:
+                        return "property" /* memberVariableElement */;
+                }
+            }
+            return "" /* unknown */;
+        }
+        function getSymbolModifiers(symbol) {
+            var nodeModifiers = symbol && symbol.declarations && symbol.declarations.length > 0
+                ? ts.getNodeModifiers(symbol.declarations[0])
+                : "" /* none */;
+            var symbolModifiers = symbol && symbol.flags & 16777216 /* Optional */ ?
+                "optional" /* optionalModifier */
+                : "" /* none */;
+            return nodeModifiers && symbolModifiers ? nodeModifiers + "," + symbolModifiers : nodeModifiers || symbolModifiers;
+        }
+        SymbolDisplay.getSymbolModifiers = getSymbolModifiers;
+        // TODO(drosen): Currently completion entry details passes the SemanticMeaning.All instead of using semanticMeaning of location
+        function getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, sourceFile, enclosingDeclaration, location, semanticMeaning, alias) {
+            if (semanticMeaning === void 0) { semanticMeaning = ts.getMeaningFromLocation(location); }
+            var displayParts = [];
+            var documentation;
+            var tags;
+            var symbolFlags = ts.getCombinedLocalAndExportSymbolFlags(symbol);
+            var symbolKind = semanticMeaning & 1 /* Value */ ? getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(typeChecker, symbol, location) : "" /* unknown */;
+            var hasAddedSymbolInfo = false;
+            var isThisExpression = location.kind === 100 /* ThisKeyword */ && ts.isInExpressionContext(location);
+            var type;
+            var printer;
+            var documentationFromAlias;
+            var tagsFromAlias;
+            if (location.kind === 100 /* ThisKeyword */ && !isThisExpression) {
+                return { displayParts: [ts.keywordPart(100 /* ThisKeyword */)], documentation: [], symbolKind: "primitive type" /* primitiveType */, tags: undefined };
+            }
+            // Class at constructor site need to be shown as constructor apart from property,method, vars
+            if (symbolKind !== "" /* unknown */ || symbolFlags & 32 /* Class */ || symbolFlags & 2097152 /* Alias */) {
+                // If it is accessor they are allowed only if location is at name of the accessor
+                if (symbolKind === "getter" /* memberGetAccessorElement */ || symbolKind === "setter" /* memberSetAccessorElement */) {
+                    symbolKind = "property" /* memberVariableElement */;
+                }
+                var signature = void 0;
+                type = isThisExpression ? typeChecker.getTypeAtLocation(location) : typeChecker.getTypeOfSymbolAtLocation(symbol.exportSymbol || symbol, location);
+                if (location.parent && location.parent.kind === 189 /* PropertyAccessExpression */) {
+                    var right = location.parent.name;
+                    // Either the location is on the right of a property access, or on the left and the right is missing
+                    if (right === location || (right && right.getFullWidth() === 0)) {
+                        location = location.parent;
+                    }
+                }
+                // try get the call/construct signature from the type if it matches
+                var callExpressionLike = void 0;
+                if (ts.isCallOrNewExpression(location)) {
+                    callExpressionLike = location;
+                }
+                else if (ts.isCallExpressionTarget(location) || ts.isNewExpressionTarget(location)) {
+                    callExpressionLike = location.parent;
+                }
+                else if (location.parent && ts.isJsxOpeningLikeElement(location.parent) && ts.isFunctionLike(symbol.valueDeclaration)) {
+                    callExpressionLike = location.parent;
+                }
+                if (callExpressionLike) {
+                    var candidateSignatures = [];
+                    signature = typeChecker.getResolvedSignature(callExpressionLike, candidateSignatures); // TODO: GH#18217
+                    var useConstructSignatures = callExpressionLike.kind === 192 /* NewExpression */ || (ts.isCallExpression(callExpressionLike) && callExpressionLike.expression.kind === 98 /* SuperKeyword */);
+                    var allSignatures = useConstructSignatures ? type.getConstructSignatures() : type.getCallSignatures();
+                    if (!ts.contains(allSignatures, signature.target) && !ts.contains(allSignatures, signature)) {
+                        // Get the first signature if there is one -- allSignatures may contain
+                        // either the original signature or its target, so check for either
+                        signature = allSignatures.length ? allSignatures[0] : undefined;
+                    }
+                    if (signature) {
+                        if (useConstructSignatures && (symbolFlags & 32 /* Class */)) {
+                            // Constructor
+                            symbolKind = "constructor" /* constructorImplementationElement */;
+                            addPrefixForAnyFunctionOrVar(type.symbol, symbolKind);
+                        }
+                        else if (symbolFlags & 2097152 /* Alias */) {
+                            symbolKind = "alias" /* alias */;
+                            pushSymbolKind(symbolKind);
+                            displayParts.push(ts.spacePart());
+                            if (useConstructSignatures) {
+                                displayParts.push(ts.keywordPart(95 /* NewKeyword */));
+                                displayParts.push(ts.spacePart());
+                            }
+                            addFullSymbolName(symbol);
+                        }
+                        else {
+                            addPrefixForAnyFunctionOrVar(symbol, symbolKind);
+                        }
+                        switch (symbolKind) {
+                            case "JSX attribute" /* jsxAttribute */:
+                            case "property" /* memberVariableElement */:
+                            case "var" /* variableElement */:
+                            case "const" /* constElement */:
+                            case "let" /* letElement */:
+                            case "parameter" /* parameterElement */:
+                            case "local var" /* localVariableElement */:
+                                // If it is call or construct signature of lambda's write type name
+                                displayParts.push(ts.punctuationPart(57 /* ColonToken */));
+                                displayParts.push(ts.spacePart());
+                                if (!(ts.getObjectFlags(type) & 16 /* Anonymous */) && type.symbol) {
+                                    ts.addRange(displayParts, ts.symbolToDisplayParts(typeChecker, type.symbol, enclosingDeclaration, /*meaning*/ undefined, 4 /* AllowAnyNodeKind */ | 1 /* WriteTypeParametersOrArguments */));
+                                    displayParts.push(ts.lineBreakPart());
+                                }
+                                if (useConstructSignatures) {
+                                    displayParts.push(ts.keywordPart(95 /* NewKeyword */));
+                                    displayParts.push(ts.spacePart());
+                                }
+                                addSignatureDisplayParts(signature, allSignatures, 262144 /* WriteArrowStyleSignature */);
+                                break;
+                            default:
+                                // Just signature
+                                addSignatureDisplayParts(signature, allSignatures);
+                        }
+                        hasAddedSymbolInfo = true;
+                    }
+                }
+                else if ((ts.isNameOfFunctionDeclaration(location) && !(symbolFlags & 98304 /* Accessor */)) || // name of function declaration
+                    (location.kind === 124 /* ConstructorKeyword */ && location.parent.kind === 157 /* Constructor */)) { // At constructor keyword of constructor declaration
+                    // get the signature from the declaration and write it
+                    var functionDeclaration_1 = location.parent;
+                    // Use function declaration to write the signatures only if the symbol corresponding to this declaration
+                    var locationIsSymbolDeclaration = ts.find(symbol.declarations, function (declaration) {
+                        return declaration === (location.kind === 124 /* ConstructorKeyword */ ? functionDeclaration_1.parent : functionDeclaration_1);
+                    });
+                    if (locationIsSymbolDeclaration) {
+                        var allSignatures = functionDeclaration_1.kind === 157 /* Constructor */ ? type.getNonNullableType().getConstructSignatures() : type.getNonNullableType().getCallSignatures();
+                        if (!typeChecker.isImplementationOfOverload(functionDeclaration_1)) {
+                            signature = typeChecker.getSignatureFromDeclaration(functionDeclaration_1); // TODO: GH#18217
+                        }
+                        else {
+                            signature = allSignatures[0];
+                        }
+                        if (functionDeclaration_1.kind === 157 /* Constructor */) {
+                            // show (constructor) Type(...) signature
+                            symbolKind = "constructor" /* constructorImplementationElement */;
+                            addPrefixForAnyFunctionOrVar(type.symbol, symbolKind);
+                        }
+                        else {
+                            // (function/method) symbol(..signature)
+                            addPrefixForAnyFunctionOrVar(functionDeclaration_1.kind === 160 /* CallSignature */ &&
+                                !(type.symbol.flags & 2048 /* TypeLiteral */ || type.symbol.flags & 4096 /* ObjectLiteral */) ? type.symbol : symbol, symbolKind);
+                        }
+                        addSignatureDisplayParts(signature, allSignatures);
+                        hasAddedSymbolInfo = true;
+                    }
+                }
+            }
+            if (symbolFlags & 32 /* Class */ && !hasAddedSymbolInfo && !isThisExpression) {
+                addAliasPrefixIfNecessary();
+                if (ts.getDeclarationOfKind(symbol, 209 /* ClassExpression */)) {
+                    // Special case for class expressions because we would like to indicate that
+                    // the class name is local to the class body (similar to function expression)
+                    //      (local class) class <className>
+                    pushSymbolKind("local class" /* localClassElement */);
+                }
+                else {
+                    // Class declaration has name which is not local.
+                    displayParts.push(ts.keywordPart(76 /* ClassKeyword */));
+                }
+                displayParts.push(ts.spacePart());
+                addFullSymbolName(symbol);
+                writeTypeParametersOfSymbol(symbol, sourceFile);
+            }
+            if ((symbolFlags & 64 /* Interface */) && (semanticMeaning & 2 /* Type */)) {
+                prefixNextMeaning();
+                displayParts.push(ts.keywordPart(110 /* InterfaceKeyword */));
+                displayParts.push(ts.spacePart());
+                addFullSymbolName(symbol);
+                writeTypeParametersOfSymbol(symbol, sourceFile);
+            }
+            if ((symbolFlags & 524288 /* TypeAlias */) && (semanticMeaning & 2 /* Type */)) {
+                prefixNextMeaning();
+                displayParts.push(ts.keywordPart(140 /* TypeKeyword */));
+                displayParts.push(ts.spacePart());
+                addFullSymbolName(symbol);
+                writeTypeParametersOfSymbol(symbol, sourceFile);
+                displayParts.push(ts.spacePart());
+                displayParts.push(ts.operatorPart(59 /* EqualsToken */));
+                displayParts.push(ts.spacePart());
+                ts.addRange(displayParts, ts.typeToDisplayParts(typeChecker, typeChecker.getDeclaredTypeOfSymbol(symbol), enclosingDeclaration, 8388608 /* InTypeAlias */));
+            }
+            if (symbolFlags & 384 /* Enum */) {
+                prefixNextMeaning();
+                if (ts.some(symbol.declarations, function (d) { return ts.isEnumDeclaration(d) && ts.isEnumConst(d); })) {
+                    displayParts.push(ts.keywordPart(77 /* ConstKeyword */));
+                    displayParts.push(ts.spacePart());
+                }
+                displayParts.push(ts.keywordPart(84 /* EnumKeyword */));
+                displayParts.push(ts.spacePart());
+                addFullSymbolName(symbol);
+            }
+            if (symbolFlags & 1536 /* Module */) {
+                prefixNextMeaning();
+                var declaration = ts.getDeclarationOfKind(symbol, 244 /* ModuleDeclaration */);
+                var isNamespace = declaration && declaration.name && declaration.name.kind === 72 /* Identifier */;
+                displayParts.push(ts.keywordPart(isNamespace ? 131 /* NamespaceKeyword */ : 130 /* ModuleKeyword */));
+                displayParts.push(ts.spacePart());
+                addFullSymbolName(symbol);
+            }
+            if ((symbolFlags & 262144 /* TypeParameter */) && (semanticMeaning & 2 /* Type */)) {
+                prefixNextMeaning();
+                displayParts.push(ts.punctuationPart(20 /* OpenParenToken */));
+                displayParts.push(ts.textPart("type parameter"));
+                displayParts.push(ts.punctuationPart(21 /* CloseParenToken */));
+                displayParts.push(ts.spacePart());
+                addFullSymbolName(symbol);
+                if (symbol.parent) {
+                    // Class/Interface type parameter
+                    addInPrefix();
+                    addFullSymbolName(symbol.parent, enclosingDeclaration);
+                    writeTypeParametersOfSymbol(symbol.parent, enclosingDeclaration);
+                }
+                else {
+                    // Method/function type parameter
+                    var decl = ts.getDeclarationOfKind(symbol, 150 /* TypeParameter */);
+                    if (decl === undefined)
+                        return ts.Debug.fail();
+                    var declaration = decl.parent;
+                    if (declaration) {
+                        if (ts.isFunctionLikeKind(declaration.kind)) {
+                            addInPrefix();
+                            var signature = typeChecker.getSignatureFromDeclaration(declaration); // TODO: GH#18217
+                            if (declaration.kind === 161 /* ConstructSignature */) {
+                                displayParts.push(ts.keywordPart(95 /* NewKeyword */));
+                                displayParts.push(ts.spacePart());
+                            }
+                            else if (declaration.kind !== 160 /* CallSignature */ && declaration.name) {
+                                addFullSymbolName(declaration.symbol);
+                            }
+                            ts.addRange(displayParts, ts.signatureToDisplayParts(typeChecker, signature, sourceFile, 32 /* WriteTypeArgumentsOfSignature */));
+                        }
+                        else if (declaration.kind === 242 /* TypeAliasDeclaration */) {
+                            // Type alias type parameter
+                            // For example
+                            //      type list<T> = T[]; // Both T will go through same code path
+                            addInPrefix();
+                            displayParts.push(ts.keywordPart(140 /* TypeKeyword */));
+                            displayParts.push(ts.spacePart());
+                            addFullSymbolName(declaration.symbol);
+                            writeTypeParametersOfSymbol(declaration.symbol, sourceFile);
+                        }
+                    }
+                }
+            }
+            if (symbolFlags & 8 /* EnumMember */) {
+                symbolKind = "enum member" /* enumMemberElement */;
+                addPrefixForAnyFunctionOrVar(symbol, "enum member");
+                var declaration = symbol.declarations[0];
+                if (declaration.kind === 278 /* EnumMember */) {
+                    var constantValue = typeChecker.getConstantValue(declaration);
+                    if (constantValue !== undefined) {
+                        displayParts.push(ts.spacePart());
+                        displayParts.push(ts.operatorPart(59 /* EqualsToken */));
+                        displayParts.push(ts.spacePart());
+                        displayParts.push(ts.displayPart(ts.getTextOfConstantValue(constantValue), typeof constantValue === "number" ? ts.SymbolDisplayPartKind.numericLiteral : ts.SymbolDisplayPartKind.stringLiteral));
+                    }
+                }
+            }
+            if (symbolFlags & 2097152 /* Alias */) {
+                prefixNextMeaning();
+                if (!hasAddedSymbolInfo) {
+                    var resolvedSymbol = typeChecker.getAliasedSymbol(symbol);
+                    if (resolvedSymbol !== symbol && resolvedSymbol.declarations && resolvedSymbol.declarations.length > 0) {
+                        var resolvedNode = resolvedSymbol.declarations[0];
+                        var declarationName = ts.getNameOfDeclaration(resolvedNode);
+                        if (declarationName) {
+                            var isExternalModuleDeclaration = ts.isModuleWithStringLiteralName(resolvedNode) &&
+                                ts.hasModifier(resolvedNode, 2 /* Ambient */);
+                            var shouldUseAliasName = symbol.name !== "default" && !isExternalModuleDeclaration;
+                            var resolvedInfo = getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, resolvedSymbol, ts.getSourceFileOfNode(resolvedNode), resolvedNode, declarationName, semanticMeaning, shouldUseAliasName ? symbol : resolvedSymbol);
+                            displayParts.push.apply(displayParts, resolvedInfo.displayParts);
+                            displayParts.push(ts.lineBreakPart());
+                            documentationFromAlias = resolvedInfo.documentation;
+                            tagsFromAlias = resolvedInfo.tags;
+                        }
+                    }
+                }
+                switch (symbol.declarations[0].kind) {
+                    case 247 /* NamespaceExportDeclaration */:
+                        displayParts.push(ts.keywordPart(85 /* ExportKeyword */));
+                        displayParts.push(ts.spacePart());
+                        displayParts.push(ts.keywordPart(131 /* NamespaceKeyword */));
+                        break;
+                    case 254 /* ExportAssignment */:
+                        displayParts.push(ts.keywordPart(85 /* ExportKeyword */));
+                        displayParts.push(ts.spacePart());
+                        displayParts.push(ts.keywordPart(symbol.declarations[0].isExportEquals ? 59 /* EqualsToken */ : 80 /* DefaultKeyword */));
+                        break;
+                    case 257 /* ExportSpecifier */:
+                        displayParts.push(ts.keywordPart(85 /* ExportKeyword */));
+                        break;
+                    default:
+                        displayParts.push(ts.keywordPart(92 /* ImportKeyword */));
+                }
+                displayParts.push(ts.spacePart());
+                addFullSymbolName(symbol);
+                ts.forEach(symbol.declarations, function (declaration) {
+                    if (declaration.kind === 248 /* ImportEqualsDeclaration */) {
+                        var importEqualsDeclaration = declaration;
+                        if (ts.isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) {
+                            displayParts.push(ts.spacePart());
+                            displayParts.push(ts.operatorPart(59 /* EqualsToken */));
+                            displayParts.push(ts.spacePart());
+                            displayParts.push(ts.keywordPart(134 /* RequireKeyword */));
+                            displayParts.push(ts.punctuationPart(20 /* OpenParenToken */));
+                            displayParts.push(ts.displayPart(ts.getTextOfNode(ts.getExternalModuleImportEqualsDeclarationExpression(importEqualsDeclaration)), ts.SymbolDisplayPartKind.stringLiteral));
+                            displayParts.push(ts.punctuationPart(21 /* CloseParenToken */));
+                        }
+                        else {
+                            var internalAliasSymbol = typeChecker.getSymbolAtLocation(importEqualsDeclaration.moduleReference);
+                            if (internalAliasSymbol) {
+                                displayParts.push(ts.spacePart());
+                                displayParts.push(ts.operatorPart(59 /* EqualsToken */));
+                                displayParts.push(ts.spacePart());
+                                addFullSymbolName(internalAliasSymbol, enclosingDeclaration);
+                            }
+                        }
+                        return true;
+                    }
+                });
+            }
+            if (!hasAddedSymbolInfo) {
+                if (symbolKind !== "" /* unknown */) {
+                    if (type) {
+                        if (isThisExpression) {
+                            prefixNextMeaning();
+                            displayParts.push(ts.keywordPart(100 /* ThisKeyword */));
+                        }
+                        else {
+                            addPrefixForAnyFunctionOrVar(symbol, symbolKind);
+                        }
+                        // For properties, variables and local vars: show the type
+                        if (symbolKind === "property" /* memberVariableElement */ ||
+                            symbolKind === "JSX attribute" /* jsxAttribute */ ||
+                            symbolFlags & 3 /* Variable */ ||
+                            symbolKind === "local var" /* localVariableElement */ ||
+                            isThisExpression) {
+                            displayParts.push(ts.punctuationPart(57 /* ColonToken */));
+                            displayParts.push(ts.spacePart());
+                            // If the type is type parameter, format it specially
+                            if (type.symbol && type.symbol.flags & 262144 /* TypeParameter */) {
+                                var typeParameterParts = ts.mapToDisplayParts(function (writer) {
+                                    var param = typeChecker.typeParameterToDeclaration(type, enclosingDeclaration);
+                                    getPrinter().writeNode(4 /* Unspecified */, param, ts.getSourceFileOfNode(ts.getParseTreeNode(enclosingDeclaration)), writer);
+                                });
+                                ts.addRange(displayParts, typeParameterParts);
+                            }
+                            else {
+                                ts.addRange(displayParts, ts.typeToDisplayParts(typeChecker, type, enclosingDeclaration));
+                            }
+                        }
+                        else if (symbolFlags & 16 /* Function */ ||
+                            symbolFlags & 8192 /* Method */ ||
+                            symbolFlags & 16384 /* Constructor */ ||
+                            symbolFlags & 131072 /* Signature */ ||
+                            symbolFlags & 98304 /* Accessor */ ||
+                            symbolKind === "method" /* memberFunctionElement */) {
+                            var allSignatures = type.getNonNullableType().getCallSignatures();
+                            if (allSignatures.length) {
+                                addSignatureDisplayParts(allSignatures[0], allSignatures);
+                            }
+                        }
+                    }
+                }
+                else {
+                    symbolKind = getSymbolKind(typeChecker, symbol, location);
+                }
+            }
+            if (!documentation) {
+                documentation = symbol.getDocumentationComment(typeChecker);
+                tags = symbol.getJsDocTags();
+                if (documentation.length === 0 && symbolFlags & 4 /* Property */) {
+                    // For some special property access expressions like `exports.foo = foo` or `module.exports.foo = foo`
+                    // there documentation comments might be attached to the right hand side symbol of their declarations.
+                    // The pattern of such special property access is that the parent symbol is the symbol of the file.
+                    if (symbol.parent && ts.forEach(symbol.parent.declarations, function (declaration) { return declaration.kind === 279 /* SourceFile */; })) {
+                        for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                            var declaration = _a[_i];
+                            if (!declaration.parent || declaration.parent.kind !== 204 /* BinaryExpression */) {
+                                continue;
+                            }
+                            var rhsSymbol = typeChecker.getSymbolAtLocation(declaration.parent.right);
+                            if (!rhsSymbol) {
+                                continue;
+                            }
+                            documentation = rhsSymbol.getDocumentationComment(typeChecker);
+                            tags = rhsSymbol.getJsDocTags();
+                            if (documentation.length > 0) {
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+            if (documentation.length === 0 && documentationFromAlias) {
+                documentation = documentationFromAlias;
+            }
+            if (tags.length === 0 && tagsFromAlias) {
+                tags = tagsFromAlias;
+            }
+            return { displayParts: displayParts, documentation: documentation, symbolKind: symbolKind, tags: tags.length === 0 ? undefined : tags };
+            function getPrinter() {
+                if (!printer) {
+                    printer = ts.createPrinter({ removeComments: true });
+                }
+                return printer;
+            }
+            function prefixNextMeaning() {
+                if (displayParts.length) {
+                    displayParts.push(ts.lineBreakPart());
+                }
+                addAliasPrefixIfNecessary();
+            }
+            function addAliasPrefixIfNecessary() {
+                if (alias) {
+                    pushSymbolKind("alias" /* alias */);
+                    displayParts.push(ts.spacePart());
+                }
+            }
+            function addInPrefix() {
+                displayParts.push(ts.spacePart());
+                displayParts.push(ts.keywordPart(93 /* InKeyword */));
+                displayParts.push(ts.spacePart());
+            }
+            function addFullSymbolName(symbolToDisplay, enclosingDeclaration) {
+                if (alias && symbolToDisplay === symbol) {
+                    symbolToDisplay = alias;
+                }
+                var fullSymbolDisplayParts = ts.symbolToDisplayParts(typeChecker, symbolToDisplay, enclosingDeclaration || sourceFile, /*meaning*/ undefined, 1 /* WriteTypeParametersOrArguments */ | 2 /* UseOnlyExternalAliasing */ | 4 /* AllowAnyNodeKind */);
+                ts.addRange(displayParts, fullSymbolDisplayParts);
+                if (symbol.flags & 16777216 /* Optional */) {
+                    displayParts.push(ts.punctuationPart(56 /* QuestionToken */));
+                }
+            }
+            function addPrefixForAnyFunctionOrVar(symbol, symbolKind) {
+                prefixNextMeaning();
+                if (symbolKind) {
+                    pushSymbolKind(symbolKind);
+                    if (symbol && !ts.some(symbol.declarations, function (d) { return ts.isArrowFunction(d) || (ts.isFunctionExpression(d) || ts.isClassExpression(d)) && !d.name; })) {
+                        displayParts.push(ts.spacePart());
+                        addFullSymbolName(symbol);
+                    }
+                }
+            }
+            function pushSymbolKind(symbolKind) {
+                switch (symbolKind) {
+                    case "var" /* variableElement */:
+                    case "function" /* functionElement */:
+                    case "let" /* letElement */:
+                    case "const" /* constElement */:
+                    case "constructor" /* constructorImplementationElement */:
+                        displayParts.push(ts.textOrKeywordPart(symbolKind));
+                        return;
+                    default:
+                        displayParts.push(ts.punctuationPart(20 /* OpenParenToken */));
+                        displayParts.push(ts.textOrKeywordPart(symbolKind));
+                        displayParts.push(ts.punctuationPart(21 /* CloseParenToken */));
+                        return;
+                }
+            }
+            function addSignatureDisplayParts(signature, allSignatures, flags) {
+                if (flags === void 0) { flags = 0 /* None */; }
+                ts.addRange(displayParts, ts.signatureToDisplayParts(typeChecker, signature, enclosingDeclaration, flags | 32 /* WriteTypeArgumentsOfSignature */));
+                if (allSignatures.length > 1) {
+                    displayParts.push(ts.spacePart());
+                    displayParts.push(ts.punctuationPart(20 /* OpenParenToken */));
+                    displayParts.push(ts.operatorPart(38 /* PlusToken */));
+                    displayParts.push(ts.displayPart((allSignatures.length - 1).toString(), ts.SymbolDisplayPartKind.numericLiteral));
+                    displayParts.push(ts.spacePart());
+                    displayParts.push(ts.textPart(allSignatures.length === 2 ? "overload" : "overloads"));
+                    displayParts.push(ts.punctuationPart(21 /* CloseParenToken */));
+                }
+                var docComment = signature.getDocumentationComment(typeChecker);
+                documentation = docComment.length === 0 ? undefined : docComment;
+                tags = signature.getJsDocTags();
+            }
+            function writeTypeParametersOfSymbol(symbol, enclosingDeclaration) {
+                var typeParameterParts = ts.mapToDisplayParts(function (writer) {
+                    var params = typeChecker.symbolToTypeParameterDeclarations(symbol, enclosingDeclaration);
+                    getPrinter().writeList(53776 /* TypeParameters */, params, ts.getSourceFileOfNode(ts.getParseTreeNode(enclosingDeclaration)), writer);
+                });
+                ts.addRange(displayParts, typeParameterParts);
+            }
+        }
+        SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind = getSymbolDisplayPartsDocumentationAndSymbolKind;
+        function isLocalVariableOrFunction(symbol) {
+            if (symbol.parent) {
+                return false; // This is exported symbol
+            }
+            return ts.forEach(symbol.declarations, function (declaration) {
+                // Function expressions are local
+                if (declaration.kind === 196 /* FunctionExpression */) {
+                    return true;
+                }
+                if (declaration.kind !== 237 /* VariableDeclaration */ && declaration.kind !== 239 /* FunctionDeclaration */) {
+                    return false;
+                }
+                // If the parent is not sourceFile or module block it is local variable
+                for (var parent = declaration.parent; !ts.isFunctionBlock(parent); parent = parent.parent) {
+                    // Reached source file or module block
+                    if (parent.kind === 279 /* SourceFile */ || parent.kind === 245 /* ModuleBlock */) {
+                        return false;
+                    }
+                }
+                // parent is in function block
+                return true;
+            });
+        }
+    })(SymbolDisplay = ts.SymbolDisplay || (ts.SymbolDisplay = {}));
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    /*
+     * This function will compile source text from 'input' argument using specified compiler options.
+     * If not options are provided - it will use a set of default compiler options.
+     * Extra compiler options that will unconditionally be used by this function are:
+     * - isolatedModules = true
+     * - allowNonTsExtensions = true
+     * - noLib = true
+     * - noResolve = true
+     */
+    function transpileModule(input, transpileOptions) {
+        var diagnostics = [];
+        var options = transpileOptions.compilerOptions ? fixupCompilerOptions(transpileOptions.compilerOptions, diagnostics) : ts.getDefaultCompilerOptions();
+        options.isolatedModules = true;
+        // transpileModule does not write anything to disk so there is no need to verify that there are no conflicts between input and output paths.
+        options.suppressOutputPathCheck = true;
+        // Filename can be non-ts file.
+        options.allowNonTsExtensions = true;
+        // We are not returning a sourceFile for lib file when asked by the program,
+        // so pass --noLib to avoid reporting a file not found error.
+        options.noLib = true;
+        // Clear out other settings that would not be used in transpiling this module
+        options.lib = undefined;
+        options.types = undefined;
+        options.noEmit = undefined;
+        options.noEmitOnError = undefined;
+        options.paths = undefined;
+        options.rootDirs = undefined;
+        options.declaration = undefined;
+        options.composite = undefined;
+        options.declarationDir = undefined;
+        options.out = undefined;
+        options.outFile = undefined;
+        // We are not doing a full typecheck, we are not resolving the whole context,
+        // so pass --noResolve to avoid reporting missing file errors.
+        options.noResolve = true;
+        // if jsx is specified then treat file as .tsx
+        var inputFileName = transpileOptions.fileName || (options.jsx ? "module.tsx" : "module.ts");
+        var sourceFile = ts.createSourceFile(inputFileName, input, options.target); // TODO: GH#18217
+        if (transpileOptions.moduleName) {
+            sourceFile.moduleName = transpileOptions.moduleName;
+        }
+        if (transpileOptions.renamedDependencies) {
+            sourceFile.renamedDependencies = ts.createMapFromTemplate(transpileOptions.renamedDependencies);
+        }
+        var newLine = ts.getNewLineCharacter(options);
+        // Output
+        var outputText;
+        var sourceMapText;
+        // Create a compilerHost object to allow the compiler to read and write files
+        var compilerHost = {
+            getSourceFile: function (fileName) { return fileName === ts.normalizePath(inputFileName) ? sourceFile : undefined; },
+            writeFile: function (name, text) {
+                if (ts.fileExtensionIs(name, ".map")) {
+                    ts.Debug.assertEqual(sourceMapText, undefined, "Unexpected multiple source map outputs, file:", name);
+                    sourceMapText = text;
+                }
+                else {
+                    ts.Debug.assertEqual(outputText, undefined, "Unexpected multiple outputs, file:", name);
+                    outputText = text;
+                }
+            },
+            getDefaultLibFileName: function () { return "lib.d.ts"; },
+            useCaseSensitiveFileNames: function () { return false; },
+            getCanonicalFileName: function (fileName) { return fileName; },
+            getCurrentDirectory: function () { return ""; },
+            getNewLine: function () { return newLine; },
+            fileExists: function (fileName) { return fileName === inputFileName; },
+            readFile: function () { return ""; },
+            directoryExists: function () { return true; },
+            getDirectories: function () { return []; }
+        };
+        var program = ts.createProgram([inputFileName], options, compilerHost);
+        if (transpileOptions.reportDiagnostics) {
+            ts.addRange(/*to*/ diagnostics, /*from*/ program.getSyntacticDiagnostics(sourceFile));
+            ts.addRange(/*to*/ diagnostics, /*from*/ program.getOptionsDiagnostics());
+        }
+        // Emit
+        program.emit(/*targetSourceFile*/ undefined, /*writeFile*/ undefined, /*cancellationToken*/ undefined, /*emitOnlyDtsFiles*/ undefined, transpileOptions.transformers);
+        if (outputText === undefined)
+            return ts.Debug.fail("Output generation failed");
+        return { outputText: outputText, diagnostics: diagnostics, sourceMapText: sourceMapText };
+    }
+    ts.transpileModule = transpileModule;
+    /*
+     * This is a shortcut function for transpileModule - it accepts transpileOptions as parameters and returns only outputText part of the result.
+     */
+    function transpile(input, compilerOptions, fileName, diagnostics, moduleName) {
+        var output = transpileModule(input, { compilerOptions: compilerOptions, fileName: fileName, reportDiagnostics: !!diagnostics, moduleName: moduleName });
+        // addRange correctly handles cases when wither 'from' or 'to' argument is missing
+        ts.addRange(diagnostics, output.diagnostics);
+        return output.outputText;
+    }
+    ts.transpile = transpile;
+    var commandLineOptionsStringToEnum;
+    /** JS users may pass in string values for enum compiler options (such as ModuleKind), so convert. */
+    /*@internal*/
+    function fixupCompilerOptions(options, diagnostics) {
+        // Lazily create this value to fix module loading errors.
+        commandLineOptionsStringToEnum = commandLineOptionsStringToEnum || ts.filter(ts.optionDeclarations, function (o) {
+            return typeof o.type === "object" && !ts.forEachEntry(o.type, function (v) { return typeof v !== "number"; });
+        });
+        options = ts.cloneCompilerOptions(options);
+        var _loop_18 = function (opt) {
+            if (!ts.hasProperty(options, opt.name)) {
+                return "continue";
+            }
+            var value = options[opt.name];
+            // Value should be a key of opt.type
+            if (ts.isString(value)) {
+                // If value is not a string, this will fail
+                options[opt.name] = ts.parseCustomTypeOption(opt, value, diagnostics);
+            }
+            else {
+                if (!ts.forEachEntry(opt.type, function (v) { return v === value; })) {
+                    // Supplied value isn't a valid enum value.
+                    diagnostics.push(ts.createCompilerDiagnosticForInvalidCustomType(opt));
+                }
+            }
+        };
+        for (var _i = 0, commandLineOptionsStringToEnum_1 = commandLineOptionsStringToEnum; _i < commandLineOptionsStringToEnum_1.length; _i++) {
+            var opt = commandLineOptionsStringToEnum_1[_i];
+            _loop_18(opt);
+        }
+        return options;
+    }
+    ts.fixupCompilerOptions = fixupCompilerOptions;
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var formatting;
+    (function (formatting) {
+        var FormattingRequestKind;
+        (function (FormattingRequestKind) {
+            FormattingRequestKind[FormattingRequestKind["FormatDocument"] = 0] = "FormatDocument";
+            FormattingRequestKind[FormattingRequestKind["FormatSelection"] = 1] = "FormatSelection";
+            FormattingRequestKind[FormattingRequestKind["FormatOnEnter"] = 2] = "FormatOnEnter";
+            FormattingRequestKind[FormattingRequestKind["FormatOnSemicolon"] = 3] = "FormatOnSemicolon";
+            FormattingRequestKind[FormattingRequestKind["FormatOnOpeningCurlyBrace"] = 4] = "FormatOnOpeningCurlyBrace";
+            FormattingRequestKind[FormattingRequestKind["FormatOnClosingCurlyBrace"] = 5] = "FormatOnClosingCurlyBrace";
+        })(FormattingRequestKind = formatting.FormattingRequestKind || (formatting.FormattingRequestKind = {}));
+        var FormattingContext = /** @class */ (function () {
+            function FormattingContext(sourceFile, formattingRequestKind, options) {
+                this.sourceFile = sourceFile;
+                this.formattingRequestKind = formattingRequestKind;
+                this.options = options;
+            }
+            FormattingContext.prototype.updateContext = function (currentRange, currentTokenParent, nextRange, nextTokenParent, commonParent) {
+                this.currentTokenSpan = ts.Debug.assertDefined(currentRange);
+                this.currentTokenParent = ts.Debug.assertDefined(currentTokenParent);
+                this.nextTokenSpan = ts.Debug.assertDefined(nextRange);
+                this.nextTokenParent = ts.Debug.assertDefined(nextTokenParent);
+                this.contextNode = ts.Debug.assertDefined(commonParent);
+                // drop cached results
+                this.contextNodeAllOnSameLine = undefined;
+                this.nextNodeAllOnSameLine = undefined;
+                this.tokensAreOnSameLine = undefined;
+                this.contextNodeBlockIsOnOneLine = undefined;
+                this.nextNodeBlockIsOnOneLine = undefined;
+            };
+            FormattingContext.prototype.ContextNodeAllOnSameLine = function () {
+                if (this.contextNodeAllOnSameLine === undefined) {
+                    this.contextNodeAllOnSameLine = this.NodeIsOnOneLine(this.contextNode);
+                }
+                return this.contextNodeAllOnSameLine;
+            };
+            FormattingContext.prototype.NextNodeAllOnSameLine = function () {
+                if (this.nextNodeAllOnSameLine === undefined) {
+                    this.nextNodeAllOnSameLine = this.NodeIsOnOneLine(this.nextTokenParent);
+                }
+                return this.nextNodeAllOnSameLine;
+            };
+            FormattingContext.prototype.TokensAreOnSameLine = function () {
+                if (this.tokensAreOnSameLine === undefined) {
+                    var startLine = this.sourceFile.getLineAndCharacterOfPosition(this.currentTokenSpan.pos).line;
+                    var endLine = this.sourceFile.getLineAndCharacterOfPosition(this.nextTokenSpan.pos).line;
+                    this.tokensAreOnSameLine = (startLine === endLine);
+                }
+                return this.tokensAreOnSameLine;
+            };
+            FormattingContext.prototype.ContextNodeBlockIsOnOneLine = function () {
+                if (this.contextNodeBlockIsOnOneLine === undefined) {
+                    this.contextNodeBlockIsOnOneLine = this.BlockIsOnOneLine(this.contextNode);
+                }
+                return this.contextNodeBlockIsOnOneLine;
+            };
+            FormattingContext.prototype.NextNodeBlockIsOnOneLine = function () {
+                if (this.nextNodeBlockIsOnOneLine === undefined) {
+                    this.nextNodeBlockIsOnOneLine = this.BlockIsOnOneLine(this.nextTokenParent);
+                }
+                return this.nextNodeBlockIsOnOneLine;
+            };
+            FormattingContext.prototype.NodeIsOnOneLine = function (node) {
+                var startLine = this.sourceFile.getLineAndCharacterOfPosition(node.getStart(this.sourceFile)).line;
+                var endLine = this.sourceFile.getLineAndCharacterOfPosition(node.getEnd()).line;
+                return startLine === endLine;
+            };
+            FormattingContext.prototype.BlockIsOnOneLine = function (node) {
+                var openBrace = ts.findChildOfKind(node, 18 /* OpenBraceToken */, this.sourceFile);
+                var closeBrace = ts.findChildOfKind(node, 19 /* CloseBraceToken */, this.sourceFile);
+                if (openBrace && closeBrace) {
+                    var startLine = this.sourceFile.getLineAndCharacterOfPosition(openBrace.getEnd()).line;
+                    var endLine = this.sourceFile.getLineAndCharacterOfPosition(closeBrace.getStart(this.sourceFile)).line;
+                    return startLine === endLine;
+                }
+                return false;
+            };
+            return FormattingContext;
+        }());
+        formatting.FormattingContext = FormattingContext;
+    })(formatting = ts.formatting || (ts.formatting = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var formatting;
+    (function (formatting) {
+        var standardScanner = ts.createScanner(6 /* Latest */, /*skipTrivia*/ false, 0 /* Standard */);
+        var jsxScanner = ts.createScanner(6 /* Latest */, /*skipTrivia*/ false, 1 /* JSX */);
+        var ScanAction;
+        (function (ScanAction) {
+            ScanAction[ScanAction["Scan"] = 0] = "Scan";
+            ScanAction[ScanAction["RescanGreaterThanToken"] = 1] = "RescanGreaterThanToken";
+            ScanAction[ScanAction["RescanSlashToken"] = 2] = "RescanSlashToken";
+            ScanAction[ScanAction["RescanTemplateToken"] = 3] = "RescanTemplateToken";
+            ScanAction[ScanAction["RescanJsxIdentifier"] = 4] = "RescanJsxIdentifier";
+            ScanAction[ScanAction["RescanJsxText"] = 5] = "RescanJsxText";
+        })(ScanAction || (ScanAction = {}));
+        function getFormattingScanner(text, languageVariant, startPos, endPos, cb) {
+            var scanner = languageVariant === 1 /* JSX */ ? jsxScanner : standardScanner;
+            scanner.setText(text);
+            scanner.setTextPos(startPos);
+            var wasNewLine = true;
+            var leadingTrivia;
+            var trailingTrivia;
+            var savedPos;
+            var lastScanAction;
+            var lastTokenInfo;
+            var res = cb({
+                advance: advance,
+                readTokenInfo: readTokenInfo,
+                isOnToken: isOnToken,
+                getCurrentLeadingTrivia: function () { return leadingTrivia; },
+                lastTrailingTriviaWasNewLine: function () { return wasNewLine; },
+                skipToEndOf: skipToEndOf,
+            });
+            lastTokenInfo = undefined;
+            scanner.setText(undefined);
+            return res;
+            function advance() {
+                lastTokenInfo = undefined;
+                var isStarted = scanner.getStartPos() !== startPos;
+                if (isStarted) {
+                    wasNewLine = !!trailingTrivia && ts.last(trailingTrivia).kind === 4 /* NewLineTrivia */;
+                }
+                else {
+                    scanner.scan();
+                }
+                leadingTrivia = undefined;
+                trailingTrivia = undefined;
+                var pos = scanner.getStartPos();
+                // Read leading trivia and token
+                while (pos < endPos) {
+                    var t = scanner.getToken();
+                    if (!ts.isTrivia(t)) {
+                        break;
+                    }
+                    // consume leading trivia
+                    scanner.scan();
+                    var item = {
+                        pos: pos,
+                        end: scanner.getStartPos(),
+                        kind: t
+                    };
+                    pos = scanner.getStartPos();
+                    leadingTrivia = ts.append(leadingTrivia, item);
+                }
+                savedPos = scanner.getStartPos();
+            }
+            function shouldRescanGreaterThanToken(node) {
+                switch (node.kind) {
+                    case 32 /* GreaterThanEqualsToken */:
+                    case 67 /* GreaterThanGreaterThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 48 /* GreaterThanGreaterThanGreaterThanToken */:
+                    case 47 /* GreaterThanGreaterThanToken */:
+                        return true;
+                }
+                return false;
+            }
+            function shouldRescanJsxIdentifier(node) {
+                if (node.parent) {
+                    switch (node.parent.kind) {
+                        case 267 /* JsxAttribute */:
+                        case 262 /* JsxOpeningElement */:
+                        case 263 /* JsxClosingElement */:
+                        case 261 /* JsxSelfClosingElement */:
+                            // May parse an identifier like `module-layout`; that will be scanned as a keyword at first, but we should parse the whole thing to get an identifier.
+                            return ts.isKeyword(node.kind) || node.kind === 72 /* Identifier */;
+                    }
+                }
+                return false;
+            }
+            function shouldRescanJsxText(node) {
+                return node.kind === 11 /* JsxText */;
+            }
+            function shouldRescanSlashToken(container) {
+                return container.kind === 13 /* RegularExpressionLiteral */;
+            }
+            function shouldRescanTemplateToken(container) {
+                return container.kind === 16 /* TemplateMiddle */ ||
+                    container.kind === 17 /* TemplateTail */;
+            }
+            function startsWithSlashToken(t) {
+                return t === 42 /* SlashToken */ || t === 64 /* SlashEqualsToken */;
+            }
+            function readTokenInfo(n) {
+                ts.Debug.assert(isOnToken());
+                // normally scanner returns the smallest available token
+                // check the kind of context node to determine if scanner should have more greedy behavior and consume more text.
+                var expectedScanAction = shouldRescanGreaterThanToken(n)
+                    ? 1 /* RescanGreaterThanToken */
+                    : shouldRescanSlashToken(n)
+                        ? 2 /* RescanSlashToken */
+                        : shouldRescanTemplateToken(n)
+                            ? 3 /* RescanTemplateToken */
+                            : shouldRescanJsxIdentifier(n)
+                                ? 4 /* RescanJsxIdentifier */
+                                : shouldRescanJsxText(n)
+                                    ? 5 /* RescanJsxText */
+                                    : 0 /* Scan */;
+                if (lastTokenInfo && expectedScanAction === lastScanAction) {
+                    // readTokenInfo was called before with the same expected scan action.
+                    // No need to re-scan text, return existing 'lastTokenInfo'
+                    // it is ok to call fixTokenKind here since it does not affect
+                    // what portion of text is consumed. In contrast rescanning can change it,
+                    // i.e. for '>=' when originally scanner eats just one character
+                    // and rescanning forces it to consume more.
+                    return fixTokenKind(lastTokenInfo, n);
+                }
+                if (scanner.getStartPos() !== savedPos) {
+                    ts.Debug.assert(lastTokenInfo !== undefined);
+                    // readTokenInfo was called before but scan action differs - rescan text
+                    scanner.setTextPos(savedPos);
+                    scanner.scan();
+                }
+                var currentToken = getNextToken(n, expectedScanAction);
+                var token = {
+                    pos: scanner.getStartPos(),
+                    end: scanner.getTextPos(),
+                    kind: currentToken
+                };
+                // consume trailing trivia
+                if (trailingTrivia) {
+                    trailingTrivia = undefined;
+                }
+                while (scanner.getStartPos() < endPos) {
+                    currentToken = scanner.scan();
+                    if (!ts.isTrivia(currentToken)) {
+                        break;
+                    }
+                    var trivia = {
+                        pos: scanner.getStartPos(),
+                        end: scanner.getTextPos(),
+                        kind: currentToken
+                    };
+                    if (!trailingTrivia) {
+                        trailingTrivia = [];
+                    }
+                    trailingTrivia.push(trivia);
+                    if (currentToken === 4 /* NewLineTrivia */) {
+                        // move past new line
+                        scanner.scan();
+                        break;
+                    }
+                }
+                lastTokenInfo = { leadingTrivia: leadingTrivia, trailingTrivia: trailingTrivia, token: token };
+                return fixTokenKind(lastTokenInfo, n);
+            }
+            function getNextToken(n, expectedScanAction) {
+                var token = scanner.getToken();
+                lastScanAction = 0 /* Scan */;
+                switch (expectedScanAction) {
+                    case 1 /* RescanGreaterThanToken */:
+                        if (token === 30 /* GreaterThanToken */) {
+                            lastScanAction = 1 /* RescanGreaterThanToken */;
+                            var newToken = scanner.reScanGreaterToken();
+                            ts.Debug.assert(n.kind === newToken);
+                            return newToken;
+                        }
+                        break;
+                    case 2 /* RescanSlashToken */:
+                        if (startsWithSlashToken(token)) {
+                            lastScanAction = 2 /* RescanSlashToken */;
+                            var newToken = scanner.reScanSlashToken();
+                            ts.Debug.assert(n.kind === newToken);
+                            return newToken;
+                        }
+                        break;
+                    case 3 /* RescanTemplateToken */:
+                        if (token === 19 /* CloseBraceToken */) {
+                            lastScanAction = 3 /* RescanTemplateToken */;
+                            return scanner.reScanTemplateToken();
+                        }
+                        break;
+                    case 4 /* RescanJsxIdentifier */:
+                        lastScanAction = 4 /* RescanJsxIdentifier */;
+                        return scanner.scanJsxIdentifier();
+                    case 5 /* RescanJsxText */:
+                        lastScanAction = 5 /* RescanJsxText */;
+                        return scanner.reScanJsxToken();
+                    case 0 /* Scan */:
+                        break;
+                    default:
+                        ts.Debug.assertNever(expectedScanAction);
+                }
+                return token;
+            }
+            function isOnToken() {
+                var current = lastTokenInfo ? lastTokenInfo.token.kind : scanner.getToken();
+                var startPos = lastTokenInfo ? lastTokenInfo.token.pos : scanner.getStartPos();
+                return startPos < endPos && current !== 1 /* EndOfFileToken */ && !ts.isTrivia(current);
+            }
+            // when containing node in the tree is token
+            // but its kind differs from the kind that was returned by the scanner,
+            // then kind needs to be fixed. This might happen in cases
+            // when parser interprets token differently, i.e keyword treated as identifier
+            function fixTokenKind(tokenInfo, container) {
+                if (ts.isToken(container) && tokenInfo.token.kind !== container.kind) {
+                    tokenInfo.token.kind = container.kind;
+                }
+                return tokenInfo;
+            }
+            function skipToEndOf(node) {
+                scanner.setTextPos(node.end);
+                savedPos = scanner.getStartPos();
+                lastScanAction = undefined;
+                lastTokenInfo = undefined;
+                wasNewLine = false;
+                leadingTrivia = undefined;
+                trailingTrivia = undefined;
+            }
+        }
+        formatting.getFormattingScanner = getFormattingScanner;
+    })(formatting = ts.formatting || (ts.formatting = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var formatting;
+    (function (formatting) {
+        formatting.anyContext = ts.emptyArray;
+        var RuleAction;
+        (function (RuleAction) {
+            RuleAction[RuleAction["Ignore"] = 1] = "Ignore";
+            RuleAction[RuleAction["Space"] = 2] = "Space";
+            RuleAction[RuleAction["NewLine"] = 4] = "NewLine";
+            RuleAction[RuleAction["Delete"] = 8] = "Delete";
+        })(RuleAction = formatting.RuleAction || (formatting.RuleAction = {}));
+        var RuleFlags;
+        (function (RuleFlags) {
+            RuleFlags[RuleFlags["None"] = 0] = "None";
+            RuleFlags[RuleFlags["CanDeleteNewLines"] = 1] = "CanDeleteNewLines";
+        })(RuleFlags = formatting.RuleFlags || (formatting.RuleFlags = {}));
+    })(formatting = ts.formatting || (ts.formatting = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var formatting;
+    (function (formatting) {
+        function getAllRules() {
+            var allTokens = [];
+            for (var token = 0 /* FirstToken */; token <= 147 /* LastToken */; token++) {
+                allTokens.push(token);
+            }
+            function anyTokenExcept() {
+                var tokens = [];
+                for (var _i = 0; _i < arguments.length; _i++) {
+                    tokens[_i] = arguments[_i];
+                }
+                return { tokens: allTokens.filter(function (t) { return !tokens.some(function (t2) { return t2 === t; }); }), isSpecific: false };
+            }
+            var anyToken = { tokens: allTokens, isSpecific: false };
+            var anyTokenIncludingMultilineComments = tokenRangeFrom(allTokens.concat([3 /* MultiLineCommentTrivia */]));
+            var keywords = tokenRangeFromRange(73 /* FirstKeyword */, 147 /* LastKeyword */);
+            var binaryOperators = tokenRangeFromRange(28 /* FirstBinaryOperator */, 71 /* LastBinaryOperator */);
+            var binaryKeywordOperators = [93 /* InKeyword */, 94 /* InstanceOfKeyword */, 147 /* OfKeyword */, 119 /* AsKeyword */, 128 /* IsKeyword */];
+            var unaryPrefixOperators = [44 /* PlusPlusToken */, 45 /* MinusMinusToken */, 53 /* TildeToken */, 52 /* ExclamationToken */];
+            var unaryPrefixExpressions = [
+                8 /* NumericLiteral */, 9 /* BigIntLiteral */, 72 /* Identifier */, 20 /* OpenParenToken */,
+                22 /* OpenBracketToken */, 18 /* OpenBraceToken */, 100 /* ThisKeyword */, 95 /* NewKeyword */
+            ];
+            var unaryPreincrementExpressions = [72 /* Identifier */, 20 /* OpenParenToken */, 100 /* ThisKeyword */, 95 /* NewKeyword */];
+            var unaryPostincrementExpressions = [72 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 95 /* NewKeyword */];
+            var unaryPredecrementExpressions = [72 /* Identifier */, 20 /* OpenParenToken */, 100 /* ThisKeyword */, 95 /* NewKeyword */];
+            var unaryPostdecrementExpressions = [72 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 95 /* NewKeyword */];
+            var comments = [2 /* SingleLineCommentTrivia */, 3 /* MultiLineCommentTrivia */];
+            var typeNames = [72 /* Identifier */].concat(ts.typeKeywords);
+            // Place a space before open brace in a function declaration
+            // TypeScript: Function can have return types, which can be made of tons of different token kinds
+            var functionOpenBraceLeftTokenRange = anyTokenIncludingMultilineComments;
+            // Place a space before open brace in a TypeScript declaration that has braces as children (class, module, enum, etc)
+            var typeScriptOpenBraceLeftTokenRange = tokenRangeFrom([72 /* Identifier */, 3 /* MultiLineCommentTrivia */, 76 /* ClassKeyword */, 85 /* ExportKeyword */, 92 /* ImportKeyword */]);
+            // Place a space before open brace in a control flow construct
+            var controlOpenBraceLeftTokenRange = tokenRangeFrom([21 /* CloseParenToken */, 3 /* MultiLineCommentTrivia */, 82 /* DoKeyword */, 103 /* TryKeyword */, 88 /* FinallyKeyword */, 83 /* ElseKeyword */]);
+            // These rules are higher in priority than user-configurable
+            var highPriorityCommonRules = [
+                // Leave comments alone
+                rule("IgnoreBeforeComment", anyToken, comments, formatting.anyContext, 1 /* Ignore */),
+                rule("IgnoreAfterLineComment", 2 /* SingleLineCommentTrivia */, anyToken, formatting.anyContext, 1 /* Ignore */),
+                rule("NotSpaceBeforeColon", anyToken, 57 /* ColonToken */, [isNonJsxSameLineTokenContext, isNotBinaryOpContext, isNotTypeAnnotationContext], 8 /* Delete */),
+                rule("SpaceAfterColon", 57 /* ColonToken */, anyToken, [isNonJsxSameLineTokenContext, isNotBinaryOpContext], 2 /* Space */),
+                rule("NoSpaceBeforeQuestionMark", anyToken, 56 /* QuestionToken */, [isNonJsxSameLineTokenContext, isNotBinaryOpContext], 8 /* Delete */),
+                // insert space after '?' only when it is used in conditional operator
+                rule("SpaceAfterQuestionMarkInConditionalOperator", 56 /* QuestionToken */, anyToken, [isNonJsxSameLineTokenContext, isConditionalOperatorContext], 2 /* Space */),
+                // in other cases there should be no space between '?' and next token
+                rule("NoSpaceAfterQuestionMark", 56 /* QuestionToken */, anyToken, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceBeforeDot", anyToken, 24 /* DotToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceAfterDot", 24 /* DotToken */, anyToken, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceBetweenImportParenInImportType", 92 /* ImportKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isImportTypeContext], 8 /* Delete */),
+                // Special handling of unary operators.
+                // Prefix operators generally shouldn't have a space between
+                // them and their target unary expression.
+                rule("NoSpaceAfterUnaryPrefixOperator", unaryPrefixOperators, unaryPrefixExpressions, [isNonJsxSameLineTokenContext, isNotBinaryOpContext], 8 /* Delete */),
+                rule("NoSpaceAfterUnaryPreincrementOperator", 44 /* PlusPlusToken */, unaryPreincrementExpressions, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceAfterUnaryPredecrementOperator", 45 /* MinusMinusToken */, unaryPredecrementExpressions, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceBeforeUnaryPostincrementOperator", unaryPostincrementExpressions, 44 /* PlusPlusToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceBeforeUnaryPostdecrementOperator", unaryPostdecrementExpressions, 45 /* MinusMinusToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                // More unary operator special-casing.
+                // DevDiv 181814: Be careful when removing leading whitespace
+                // around unary operators.  Examples:
+                //      1 - -2  --X--> 1--2
+                //      a + ++b --X--> a+++b
+                rule("SpaceAfterPostincrementWhenFollowedByAdd", 44 /* PlusPlusToken */, 38 /* PlusToken */, [isNonJsxSameLineTokenContext, isBinaryOpContext], 2 /* Space */),
+                rule("SpaceAfterAddWhenFollowedByUnaryPlus", 38 /* PlusToken */, 38 /* PlusToken */, [isNonJsxSameLineTokenContext, isBinaryOpContext], 2 /* Space */),
+                rule("SpaceAfterAddWhenFollowedByPreincrement", 38 /* PlusToken */, 44 /* PlusPlusToken */, [isNonJsxSameLineTokenContext, isBinaryOpContext], 2 /* Space */),
+                rule("SpaceAfterPostdecrementWhenFollowedBySubtract", 45 /* MinusMinusToken */, 39 /* MinusToken */, [isNonJsxSameLineTokenContext, isBinaryOpContext], 2 /* Space */),
+                rule("SpaceAfterSubtractWhenFollowedByUnaryMinus", 39 /* MinusToken */, 39 /* MinusToken */, [isNonJsxSameLineTokenContext, isBinaryOpContext], 2 /* Space */),
+                rule("SpaceAfterSubtractWhenFollowedByPredecrement", 39 /* MinusToken */, 45 /* MinusMinusToken */, [isNonJsxSameLineTokenContext, isBinaryOpContext], 2 /* Space */),
+                rule("NoSpaceAfterCloseBrace", 19 /* CloseBraceToken */, [27 /* CommaToken */, 26 /* SemicolonToken */], [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                // For functions and control block place } on a new line [multi-line rule]
+                rule("NewLineBeforeCloseBraceInBlockContext", anyTokenIncludingMultilineComments, 19 /* CloseBraceToken */, [isMultilineBlockContext], 4 /* NewLine */),
+                // Space/new line after }.
+                rule("SpaceAfterCloseBrace", 19 /* CloseBraceToken */, anyTokenExcept(21 /* CloseParenToken */), [isNonJsxSameLineTokenContext, isAfterCodeBlockContext], 2 /* Space */),
+                // Special case for (}, else) and (}, while) since else & while tokens are not part of the tree which makes SpaceAfterCloseBrace rule not applied
+                // Also should not apply to })
+                rule("SpaceBetweenCloseBraceAndElse", 19 /* CloseBraceToken */, 83 /* ElseKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenCloseBraceAndWhile", 19 /* CloseBraceToken */, 107 /* WhileKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("NoSpaceBetweenEmptyBraceBrackets", 18 /* OpenBraceToken */, 19 /* CloseBraceToken */, [isNonJsxSameLineTokenContext, isObjectContext], 8 /* Delete */),
+                // Add a space after control dec context if the next character is an open bracket ex: 'if (false)[a, b] = [1, 2];' -> 'if (false) [a, b] = [1, 2];'
+                rule("SpaceAfterConditionalClosingParen", 21 /* CloseParenToken */, 22 /* OpenBracketToken */, [isControlDeclContext], 2 /* Space */),
+                rule("NoSpaceBetweenFunctionKeywordAndStar", 90 /* FunctionKeyword */, 40 /* AsteriskToken */, [isFunctionDeclarationOrFunctionExpressionContext], 8 /* Delete */),
+                rule("SpaceAfterStarInGeneratorDeclaration", 40 /* AsteriskToken */, [72 /* Identifier */, 20 /* OpenParenToken */], [isFunctionDeclarationOrFunctionExpressionContext], 2 /* Space */),
+                rule("SpaceAfterFunctionInFuncDecl", 90 /* FunctionKeyword */, anyToken, [isFunctionDeclContext], 2 /* Space */),
+                // Insert new line after { and before } in multi-line contexts.
+                rule("NewLineAfterOpenBraceInBlockContext", 18 /* OpenBraceToken */, anyToken, [isMultilineBlockContext], 4 /* NewLine */),
+                // For get/set members, we check for (identifier,identifier) since get/set don't have tokens and they are represented as just an identifier token.
+                // Though, we do extra check on the context to make sure we are dealing with get/set node. Example:
+                //      get x() {}
+                //      set x(val) {}
+                rule("SpaceAfterGetSetInMember", [126 /* GetKeyword */, 137 /* SetKeyword */], 72 /* Identifier */, [isFunctionDeclContext], 2 /* Space */),
+                rule("NoSpaceBetweenYieldKeywordAndStar", 117 /* YieldKeyword */, 40 /* AsteriskToken */, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 8 /* Delete */),
+                rule("SpaceBetweenYieldOrYieldStarAndOperand", [117 /* YieldKeyword */, 40 /* AsteriskToken */], anyToken, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 2 /* Space */),
+                rule("NoSpaceBetweenReturnAndSemicolon", 97 /* ReturnKeyword */, 26 /* SemicolonToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("SpaceAfterCertainKeywords", [105 /* VarKeyword */, 101 /* ThrowKeyword */, 95 /* NewKeyword */, 81 /* DeleteKeyword */, 97 /* ReturnKeyword */, 104 /* TypeOfKeyword */, 122 /* AwaitKeyword */], anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceAfterLetConstInVariableDeclaration", [111 /* LetKeyword */, 77 /* ConstKeyword */], anyToken, [isNonJsxSameLineTokenContext, isStartOfVariableDeclarationList], 2 /* Space */),
+                rule("NoSpaceBeforeOpenParenInFuncCall", anyToken, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isFunctionCallOrNewContext, isPreviousTokenNotComma], 8 /* Delete */),
+                // Special case for binary operators (that are keywords). For these we have to add a space and shouldn't follow any user options.
+                rule("SpaceBeforeBinaryKeywordOperator", anyToken, binaryKeywordOperators, [isNonJsxSameLineTokenContext, isBinaryOpContext], 2 /* Space */),
+                rule("SpaceAfterBinaryKeywordOperator", binaryKeywordOperators, anyToken, [isNonJsxSameLineTokenContext, isBinaryOpContext], 2 /* Space */),
+                rule("SpaceAfterVoidOperator", 106 /* VoidKeyword */, anyToken, [isNonJsxSameLineTokenContext, isVoidOpContext], 2 /* Space */),
+                // Async-await
+                rule("SpaceBetweenAsyncAndOpenParen", 121 /* AsyncKeyword */, 20 /* OpenParenToken */, [isArrowFunctionContext, isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenAsyncAndFunctionKeyword", 121 /* AsyncKeyword */, 90 /* FunctionKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                // Template string
+                rule("NoSpaceBetweenTagAndTemplateString", [72 /* Identifier */, 21 /* CloseParenToken */], [14 /* NoSubstitutionTemplateLiteral */, 15 /* TemplateHead */], [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                // JSX opening elements
+                rule("SpaceBeforeJsxAttribute", anyToken, 72 /* Identifier */, [isNextTokenParentJsxAttribute, isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBeforeSlashInJsxOpeningElement", anyToken, 42 /* SlashToken */, [isJsxSelfClosingElementContext, isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("NoSpaceBeforeGreaterThanTokenInJsxOpeningElement", 42 /* SlashToken */, 30 /* GreaterThanToken */, [isJsxSelfClosingElementContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceBeforeEqualInJsxAttribute", anyToken, 59 /* EqualsToken */, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceAfterEqualInJsxAttribute", 59 /* EqualsToken */, anyToken, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
+                // TypeScript-specific rules
+                // Use of module as a function call. e.g.: import m2 = module("m2");
+                rule("NoSpaceAfterModuleImport", [130 /* ModuleKeyword */, 134 /* RequireKeyword */], 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                // Add a space around certain TypeScript keywords
+                rule("SpaceAfterCertainTypeScriptKeywords", [
+                    118 /* AbstractKeyword */,
+                    76 /* ClassKeyword */,
+                    125 /* DeclareKeyword */,
+                    80 /* DefaultKeyword */,
+                    84 /* EnumKeyword */,
+                    85 /* ExportKeyword */,
+                    86 /* ExtendsKeyword */,
+                    126 /* GetKeyword */,
+                    109 /* ImplementsKeyword */,
+                    92 /* ImportKeyword */,
+                    110 /* InterfaceKeyword */,
+                    130 /* ModuleKeyword */,
+                    131 /* NamespaceKeyword */,
+                    113 /* PrivateKeyword */,
+                    115 /* PublicKeyword */,
+                    114 /* ProtectedKeyword */,
+                    133 /* ReadonlyKeyword */,
+                    137 /* SetKeyword */,
+                    116 /* StaticKeyword */,
+                    140 /* TypeKeyword */,
+                    144 /* FromKeyword */,
+                    129 /* KeyOfKeyword */,
+                    127 /* InferKeyword */,
+                ], anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBeforeCertainTypeScriptKeywords", anyToken, [86 /* ExtendsKeyword */, 109 /* ImplementsKeyword */, 144 /* FromKeyword */], [isNonJsxSameLineTokenContext], 2 /* Space */),
+                // Treat string literals in module names as identifiers, and add a space between the literal and the opening Brace braces, e.g.: module "m2" {
+                rule("SpaceAfterModuleName", 10 /* StringLiteral */, 18 /* OpenBraceToken */, [isModuleDeclContext], 2 /* Space */),
+                // Lambda expressions
+                rule("SpaceBeforeArrow", anyToken, 37 /* EqualsGreaterThanToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceAfterArrow", 37 /* EqualsGreaterThanToken */, anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                // Optional parameters and let args
+                rule("NoSpaceAfterEllipsis", 25 /* DotDotDotToken */, 72 /* Identifier */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceAfterOptionalParameters", 56 /* QuestionToken */, [21 /* CloseParenToken */, 27 /* CommaToken */], [isNonJsxSameLineTokenContext, isNotBinaryOpContext], 8 /* Delete */),
+                // Remove spaces in empty interface literals. e.g.: x: {}
+                rule("NoSpaceBetweenEmptyInterfaceBraceBrackets", 18 /* OpenBraceToken */, 19 /* CloseBraceToken */, [isNonJsxSameLineTokenContext, isObjectTypeContext], 8 /* Delete */),
+                // generics and type assertions
+                rule("NoSpaceBeforeOpenAngularBracket", typeNames, 28 /* LessThanToken */, [isNonJsxSameLineTokenContext, isTypeArgumentOrParameterOrAssertionContext], 8 /* Delete */),
+                rule("NoSpaceBetweenCloseParenAndAngularBracket", 21 /* CloseParenToken */, 28 /* LessThanToken */, [isNonJsxSameLineTokenContext, isTypeArgumentOrParameterOrAssertionContext], 8 /* Delete */),
+                rule("NoSpaceAfterOpenAngularBracket", 28 /* LessThanToken */, anyToken, [isNonJsxSameLineTokenContext, isTypeArgumentOrParameterOrAssertionContext], 8 /* Delete */),
+                rule("NoSpaceBeforeCloseAngularBracket", anyToken, 30 /* GreaterThanToken */, [isNonJsxSameLineTokenContext, isTypeArgumentOrParameterOrAssertionContext], 8 /* Delete */),
+                rule("NoSpaceAfterCloseAngularBracket", 30 /* GreaterThanToken */, [20 /* OpenParenToken */, 22 /* OpenBracketToken */, 30 /* GreaterThanToken */, 27 /* CommaToken */], [isNonJsxSameLineTokenContext, isTypeArgumentOrParameterOrAssertionContext, isNotFunctionDeclContext /*To prevent an interference with the SpaceBeforeOpenParenInFuncDecl rule*/], 8 /* Delete */),
+                // decorators
+                rule("SpaceBeforeAt", [21 /* CloseParenToken */, 72 /* Identifier */], 58 /* AtToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("NoSpaceAfterAt", 58 /* AtToken */, anyToken, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                // Insert space after @ in decorator
+                rule("SpaceAfterDecorator", anyToken, [
+                    118 /* AbstractKeyword */,
+                    72 /* Identifier */,
+                    85 /* ExportKeyword */,
+                    80 /* DefaultKeyword */,
+                    76 /* ClassKeyword */,
+                    116 /* StaticKeyword */,
+                    115 /* PublicKeyword */,
+                    113 /* PrivateKeyword */,
+                    114 /* ProtectedKeyword */,
+                    126 /* GetKeyword */,
+                    137 /* SetKeyword */,
+                    22 /* OpenBracketToken */,
+                    40 /* AsteriskToken */,
+                ], [isEndOfDecoratorContextOnSameLine], 2 /* Space */),
+                rule("NoSpaceBeforeNonNullAssertionOperator", anyToken, 52 /* ExclamationToken */, [isNonJsxSameLineTokenContext, isNonNullAssertionContext], 8 /* Delete */),
+                rule("NoSpaceAfterNewKeywordOnConstructorSignature", 95 /* NewKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isConstructorSignatureContext], 8 /* Delete */),
+            ];
+            // These rules are applied after high priority
+            var userConfigurableRules = [
+                // Treat constructor as an identifier in a function declaration, and remove spaces between constructor and following left parentheses
+                rule("SpaceAfterConstructor", 124 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("NoSpaceAfterConstructor", 124 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("SpaceAfterComma", 27 /* CommaToken */, anyToken, [isOptionEnabled("insertSpaceAfterCommaDelimiter"), isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext, isNextTokenNotCloseBracket], 2 /* Space */),
+                rule("NoSpaceAfterComma", 27 /* CommaToken */, anyToken, [isOptionDisabledOrUndefined("insertSpaceAfterCommaDelimiter"), isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext], 8 /* Delete */),
+                // Insert space after function keyword for anonymous functions
+                rule("SpaceAfterAnonymousFunctionKeyword", 90 /* FunctionKeyword */, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 2 /* Space */),
+                rule("NoSpaceAfterAnonymousFunctionKeyword", 90 /* FunctionKeyword */, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 8 /* Delete */),
+                // Insert space after keywords in control flow statements
+                rule("SpaceAfterKeywordInControl", keywords, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterKeywordsInControlFlowStatements"), isControlDeclContext], 2 /* Space */),
+                rule("NoSpaceAfterKeywordInControl", keywords, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterKeywordsInControlFlowStatements"), isControlDeclContext], 8 /* Delete */),
+                // Insert space after opening and before closing nonempty parenthesis
+                rule("SpaceAfterOpenParen", 20 /* OpenParenToken */, anyToken, [isOptionEnabled("insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis"), isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBeforeCloseParen", anyToken, 21 /* CloseParenToken */, [isOptionEnabled("insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis"), isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenOpenParens", 20 /* OpenParenToken */, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis"), isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("NoSpaceBetweenParens", 20 /* OpenParenToken */, 21 /* CloseParenToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceAfterOpenParen", 20 /* OpenParenToken */, anyToken, [isOptionDisabledOrUndefined("insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis"), isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceBeforeCloseParen", anyToken, 21 /* CloseParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis"), isNonJsxSameLineTokenContext], 8 /* Delete */),
+                // Insert space after opening and before closing nonempty brackets
+                rule("SpaceAfterOpenBracket", 22 /* OpenBracketToken */, anyToken, [isOptionEnabled("insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets"), isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBeforeCloseBracket", anyToken, 23 /* CloseBracketToken */, [isOptionEnabled("insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets"), isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("NoSpaceBetweenBrackets", 22 /* OpenBracketToken */, 23 /* CloseBracketToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceAfterOpenBracket", 22 /* OpenBracketToken */, anyToken, [isOptionDisabledOrUndefined("insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets"), isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceBeforeCloseBracket", anyToken, 23 /* CloseBracketToken */, [isOptionDisabledOrUndefined("insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets"), isNonJsxSameLineTokenContext], 8 /* Delete */),
+                // Insert a space after { and before } in single-line contexts, but remove space from empty object literals {}.
+                rule("SpaceAfterOpenBrace", 18 /* OpenBraceToken */, anyToken, [isOptionEnabledOrUndefined("insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces"), isBraceWrappedContext], 2 /* Space */),
+                rule("SpaceBeforeCloseBrace", anyToken, 19 /* CloseBraceToken */, [isOptionEnabledOrUndefined("insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces"), isBraceWrappedContext], 2 /* Space */),
+                rule("NoSpaceBetweenEmptyBraceBrackets", 18 /* OpenBraceToken */, 19 /* CloseBraceToken */, [isNonJsxSameLineTokenContext, isObjectContext], 8 /* Delete */),
+                rule("NoSpaceAfterOpenBrace", 18 /* OpenBraceToken */, anyToken, [isOptionDisabled("insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces"), isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceBeforeCloseBrace", anyToken, 19 /* CloseBraceToken */, [isOptionDisabled("insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces"), isNonJsxSameLineTokenContext], 8 /* Delete */),
+                // Insert space after opening and before closing template string braces
+                rule("SpaceAfterTemplateHeadAndMiddle", [15 /* TemplateHead */, 16 /* TemplateMiddle */], anyToken, [isOptionEnabled("insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces"), isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBeforeTemplateMiddleAndTail", anyToken, [16 /* TemplateMiddle */, 17 /* TemplateTail */], [isOptionEnabled("insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces"), isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("NoSpaceAfterTemplateHeadAndMiddle", [15 /* TemplateHead */, 16 /* TemplateMiddle */], anyToken, [isOptionDisabledOrUndefined("insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces"), isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceBeforeTemplateMiddleAndTail", anyToken, [16 /* TemplateMiddle */, 17 /* TemplateTail */], [isOptionDisabledOrUndefined("insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces"), isNonJsxSameLineTokenContext], 8 /* Delete */),
+                // No space after { and before } in JSX expression
+                rule("SpaceAfterOpenBraceInJsxExpression", 18 /* OpenBraceToken */, anyToken, [isOptionEnabled("insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces"), isNonJsxSameLineTokenContext, isJsxExpressionContext], 2 /* Space */),
+                rule("SpaceBeforeCloseBraceInJsxExpression", anyToken, 19 /* CloseBraceToken */, [isOptionEnabled("insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces"), isNonJsxSameLineTokenContext, isJsxExpressionContext], 2 /* Space */),
+                rule("NoSpaceAfterOpenBraceInJsxExpression", 18 /* OpenBraceToken */, anyToken, [isOptionDisabledOrUndefined("insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces"), isNonJsxSameLineTokenContext, isJsxExpressionContext], 8 /* Delete */),
+                rule("NoSpaceBeforeCloseBraceInJsxExpression", anyToken, 19 /* CloseBraceToken */, [isOptionDisabledOrUndefined("insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces"), isNonJsxSameLineTokenContext, isJsxExpressionContext], 8 /* Delete */),
+                // Insert space after semicolon in for statement
+                rule("SpaceAfterSemicolonInFor", 26 /* SemicolonToken */, anyToken, [isOptionEnabled("insertSpaceAfterSemicolonInForStatements"), isNonJsxSameLineTokenContext, isForContext], 2 /* Space */),
+                rule("NoSpaceAfterSemicolonInFor", 26 /* SemicolonToken */, anyToken, [isOptionDisabledOrUndefined("insertSpaceAfterSemicolonInForStatements"), isNonJsxSameLineTokenContext, isForContext], 8 /* Delete */),
+                // Insert space before and after binary operators
+                rule("SpaceBeforeBinaryOperator", anyToken, binaryOperators, [isOptionEnabled("insertSpaceBeforeAndAfterBinaryOperators"), isNonJsxSameLineTokenContext, isBinaryOpContext], 2 /* Space */),
+                rule("SpaceAfterBinaryOperator", binaryOperators, anyToken, [isOptionEnabled("insertSpaceBeforeAndAfterBinaryOperators"), isNonJsxSameLineTokenContext, isBinaryOpContext], 2 /* Space */),
+                rule("NoSpaceBeforeBinaryOperator", anyToken, binaryOperators, [isOptionDisabledOrUndefined("insertSpaceBeforeAndAfterBinaryOperators"), isNonJsxSameLineTokenContext, isBinaryOpContext], 8 /* Delete */),
+                rule("NoSpaceAfterBinaryOperator", binaryOperators, anyToken, [isOptionDisabledOrUndefined("insertSpaceBeforeAndAfterBinaryOperators"), isNonJsxSameLineTokenContext, isBinaryOpContext], 8 /* Delete */),
+                rule("SpaceBeforeOpenParenInFuncDecl", anyToken, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceBeforeFunctionParenthesis"), isNonJsxSameLineTokenContext, isFunctionDeclContext], 2 /* Space */),
+                rule("NoSpaceBeforeOpenParenInFuncDecl", anyToken, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceBeforeFunctionParenthesis"), isNonJsxSameLineTokenContext, isFunctionDeclContext], 8 /* Delete */),
+                // Open Brace braces after control block
+                rule("NewLineBeforeOpenBraceInControl", controlOpenBraceLeftTokenRange, 18 /* OpenBraceToken */, [isOptionEnabled("placeOpenBraceOnNewLineForControlBlocks"), isControlDeclContext, isBeforeMultilineBlockContext], 4 /* NewLine */, 1 /* CanDeleteNewLines */),
+                // Open Brace braces after function
+                // TypeScript: Function can have return types, which can be made of tons of different token kinds
+                rule("NewLineBeforeOpenBraceInFunction", functionOpenBraceLeftTokenRange, 18 /* OpenBraceToken */, [isOptionEnabled("placeOpenBraceOnNewLineForFunctions"), isFunctionDeclContext, isBeforeMultilineBlockContext], 4 /* NewLine */, 1 /* CanDeleteNewLines */),
+                // Open Brace braces after TypeScript module/class/interface
+                rule("NewLineBeforeOpenBraceInTypeScriptDeclWithBlock", typeScriptOpenBraceLeftTokenRange, 18 /* OpenBraceToken */, [isOptionEnabled("placeOpenBraceOnNewLineForFunctions"), isTypeScriptDeclWithBlockContext, isBeforeMultilineBlockContext], 4 /* NewLine */, 1 /* CanDeleteNewLines */),
+                rule("SpaceAfterTypeAssertion", 30 /* GreaterThanToken */, anyToken, [isOptionEnabled("insertSpaceAfterTypeAssertion"), isNonJsxSameLineTokenContext, isTypeAssertionContext], 2 /* Space */),
+                rule("NoSpaceAfterTypeAssertion", 30 /* GreaterThanToken */, anyToken, [isOptionDisabledOrUndefined("insertSpaceAfterTypeAssertion"), isNonJsxSameLineTokenContext, isTypeAssertionContext], 8 /* Delete */),
+                rule("SpaceBeforeTypeAnnotation", anyToken, 57 /* ColonToken */, [isOptionEnabled("insertSpaceBeforeTypeAnnotation"), isNonJsxSameLineTokenContext, isTypeAnnotationContext], 2 /* Space */),
+                rule("NoSpaceBeforeTypeAnnotation", anyToken, 57 /* ColonToken */, [isOptionDisabledOrUndefined("insertSpaceBeforeTypeAnnotation"), isNonJsxSameLineTokenContext, isTypeAnnotationContext], 8 /* Delete */),
+            ];
+            // These rules are lower in priority than user-configurable. Rules earlier in this list have priority over rules later in the list.
+            var lowPriorityCommonRules = [
+                // Space after keyword but not before ; or : or ?
+                rule("NoSpaceBeforeSemicolon", anyToken, 26 /* SemicolonToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("SpaceBeforeOpenBraceInControl", controlOpenBraceLeftTokenRange, 18 /* OpenBraceToken */, [isOptionDisabledOrUndefinedOrTokensOnSameLine("placeOpenBraceOnNewLineForControlBlocks"), isControlDeclContext, isNotFormatOnEnter, isSameLineTokenOrBeforeBlockContext], 2 /* Space */, 1 /* CanDeleteNewLines */),
+                rule("SpaceBeforeOpenBraceInFunction", functionOpenBraceLeftTokenRange, 18 /* OpenBraceToken */, [isOptionDisabledOrUndefinedOrTokensOnSameLine("placeOpenBraceOnNewLineForFunctions"), isFunctionDeclContext, isBeforeBlockContext, isNotFormatOnEnter, isSameLineTokenOrBeforeBlockContext], 2 /* Space */, 1 /* CanDeleteNewLines */),
+                rule("SpaceBeforeOpenBraceInTypeScriptDeclWithBlock", typeScriptOpenBraceLeftTokenRange, 18 /* OpenBraceToken */, [isOptionDisabledOrUndefinedOrTokensOnSameLine("placeOpenBraceOnNewLineForFunctions"), isTypeScriptDeclWithBlockContext, isNotFormatOnEnter, isSameLineTokenOrBeforeBlockContext], 2 /* Space */, 1 /* CanDeleteNewLines */),
+                rule("NoSpaceBeforeComma", anyToken, 27 /* CommaToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                // No space before and after indexer `x[]`
+                rule("NoSpaceBeforeOpenBracket", anyTokenExcept(121 /* AsyncKeyword */, 74 /* CaseKeyword */), 22 /* OpenBracketToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceAfterCloseBracket", 23 /* CloseBracketToken */, anyToken, [isNonJsxSameLineTokenContext, isNotBeforeBlockInFunctionDeclarationContext], 8 /* Delete */),
+                rule("SpaceAfterSemicolon", 26 /* SemicolonToken */, anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                // Remove extra space between for and await
+                rule("SpaceBetweenForAndAwaitKeyword", 89 /* ForKeyword */, 122 /* AwaitKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                // Add a space between statements. All keywords except (do,else,case) has open/close parens after them.
+                // So, we have a rule to add a space for [),Any], [do,Any], [else,Any], and [case,Any]
+                rule("SpaceBetweenStatements", [21 /* CloseParenToken */, 82 /* DoKeyword */, 83 /* ElseKeyword */, 74 /* CaseKeyword */], anyToken, [isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext, isNotForContext], 2 /* Space */),
+                // This low-pri rule takes care of "try {" and "finally {" in case the rule SpaceBeforeOpenBraceInControl didn't execute on FormatOnEnter.
+                rule("SpaceAfterTryFinally", [103 /* TryKeyword */, 88 /* FinallyKeyword */], 18 /* OpenBraceToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+            ];
+            return highPriorityCommonRules.concat(userConfigurableRules, lowPriorityCommonRules);
+        }
+        formatting.getAllRules = getAllRules;
+        function rule(debugName, left, right, context, action, flags) {
+            if (flags === void 0) { flags = 0 /* None */; }
+            return { leftTokenRange: toTokenRange(left), rightTokenRange: toTokenRange(right), rule: { debugName: debugName, context: context, action: action, flags: flags } };
+        }
+        function tokenRangeFrom(tokens) {
+            return { tokens: tokens, isSpecific: true };
+        }
+        function toTokenRange(arg) {
+            return typeof arg === "number" ? tokenRangeFrom([arg]) : ts.isArray(arg) ? tokenRangeFrom(arg) : arg;
+        }
+        function tokenRangeFromRange(from, to, except) {
+            if (except === void 0) { except = []; }
+            var tokens = [];
+            for (var token = from; token <= to; token++) {
+                if (!ts.contains(except, token)) {
+                    tokens.push(token);
+                }
+            }
+            return tokenRangeFrom(tokens);
+        }
+        ///
+        /// Contexts
+        ///
+        function isOptionEnabled(optionName) {
+            return function (context) { return context.options && context.options.hasOwnProperty(optionName) && !!context.options[optionName]; };
+        }
+        function isOptionDisabled(optionName) {
+            return function (context) { return context.options && context.options.hasOwnProperty(optionName) && !context.options[optionName]; };
+        }
+        function isOptionDisabledOrUndefined(optionName) {
+            return function (context) { return !context.options || !context.options.hasOwnProperty(optionName) || !context.options[optionName]; };
+        }
+        function isOptionDisabledOrUndefinedOrTokensOnSameLine(optionName) {
+            return function (context) { return !context.options || !context.options.hasOwnProperty(optionName) || !context.options[optionName] || context.TokensAreOnSameLine(); };
+        }
+        function isOptionEnabledOrUndefined(optionName) {
+            return function (context) { return !context.options || !context.options.hasOwnProperty(optionName) || !!context.options[optionName]; };
+        }
+        function isForContext(context) {
+            return context.contextNode.kind === 225 /* ForStatement */;
+        }
+        function isNotForContext(context) {
+            return !isForContext(context);
+        }
+        function isBinaryOpContext(context) {
+            switch (context.contextNode.kind) {
+                case 204 /* BinaryExpression */:
+                case 205 /* ConditionalExpression */:
+                case 175 /* ConditionalType */:
+                case 212 /* AsExpression */:
+                case 257 /* ExportSpecifier */:
+                case 253 /* ImportSpecifier */:
+                case 163 /* TypePredicate */:
+                case 173 /* UnionType */:
+                case 174 /* IntersectionType */:
+                    return true;
+                // equals in binding elements: function foo([[x, y] = [1, 2]])
+                case 186 /* BindingElement */:
+                // equals in type X = ...
+                case 242 /* TypeAliasDeclaration */:
+                // equal in import a = module('a');
+                case 248 /* ImportEqualsDeclaration */:
+                // equal in let a = 0;
+                case 237 /* VariableDeclaration */:
+                // equal in p = 0;
+                case 151 /* Parameter */:
+                case 278 /* EnumMember */:
+                case 154 /* PropertyDeclaration */:
+                case 153 /* PropertySignature */:
+                    return context.currentTokenSpan.kind === 59 /* EqualsToken */ || context.nextTokenSpan.kind === 59 /* EqualsToken */;
+                // "in" keyword in for (let x in []) { }
+                case 226 /* ForInStatement */:
+                // "in" keyword in [P in keyof T]: T[P]
+                case 150 /* TypeParameter */:
+                    return context.currentTokenSpan.kind === 93 /* InKeyword */ || context.nextTokenSpan.kind === 93 /* InKeyword */;
+                // Technically, "of" is not a binary operator, but format it the same way as "in"
+                case 227 /* ForOfStatement */:
+                    return context.currentTokenSpan.kind === 147 /* OfKeyword */ || context.nextTokenSpan.kind === 147 /* OfKeyword */;
+            }
+            return false;
+        }
+        function isNotBinaryOpContext(context) {
+            return !isBinaryOpContext(context);
+        }
+        function isNotTypeAnnotationContext(context) {
+            return !isTypeAnnotationContext(context);
+        }
+        function isTypeAnnotationContext(context) {
+            var contextKind = context.contextNode.kind;
+            return contextKind === 154 /* PropertyDeclaration */ ||
+                contextKind === 153 /* PropertySignature */ ||
+                contextKind === 151 /* Parameter */ ||
+                contextKind === 237 /* VariableDeclaration */ ||
+                ts.isFunctionLikeKind(contextKind);
+        }
+        function isConditionalOperatorContext(context) {
+            return context.contextNode.kind === 205 /* ConditionalExpression */ ||
+                context.contextNode.kind === 175 /* ConditionalType */;
+        }
+        function isSameLineTokenOrBeforeBlockContext(context) {
+            return context.TokensAreOnSameLine() || isBeforeBlockContext(context);
+        }
+        function isBraceWrappedContext(context) {
+            return context.contextNode.kind === 184 /* ObjectBindingPattern */ ||
+                context.contextNode.kind === 181 /* MappedType */ ||
+                isSingleLineBlockContext(context);
+        }
+        // This check is done before an open brace in a control construct, a function, or a typescript block declaration
+        function isBeforeMultilineBlockContext(context) {
+            return isBeforeBlockContext(context) && !(context.NextNodeAllOnSameLine() || context.NextNodeBlockIsOnOneLine());
+        }
+        function isMultilineBlockContext(context) {
+            return isBlockContext(context) && !(context.ContextNodeAllOnSameLine() || context.ContextNodeBlockIsOnOneLine());
+        }
+        function isSingleLineBlockContext(context) {
+            return isBlockContext(context) && (context.ContextNodeAllOnSameLine() || context.ContextNodeBlockIsOnOneLine());
+        }
+        function isBlockContext(context) {
+            return nodeIsBlockContext(context.contextNode);
+        }
+        function isBeforeBlockContext(context) {
+            return nodeIsBlockContext(context.nextTokenParent);
+        }
+        // IMPORTANT!!! This method must return true ONLY for nodes with open and close braces as immediate children
+        function nodeIsBlockContext(node) {
+            if (nodeIsTypeScriptDeclWithBlockContext(node)) {
+                // This means we are in a context that looks like a block to the user, but in the grammar is actually not a node (it's a class, module, enum, object type literal, etc).
+                return true;
+            }
+            switch (node.kind) {
+                case 218 /* Block */:
+                case 246 /* CaseBlock */:
+                case 188 /* ObjectLiteralExpression */:
+                case 245 /* ModuleBlock */:
+                    return true;
+            }
+            return false;
+        }
+        function isFunctionDeclContext(context) {
+            switch (context.contextNode.kind) {
+                case 239 /* FunctionDeclaration */:
+                case 156 /* MethodDeclaration */:
+                case 155 /* MethodSignature */:
+                // case SyntaxKind.MemberFunctionDeclaration:
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                // case SyntaxKind.MethodSignature:
+                case 160 /* CallSignature */:
+                case 196 /* FunctionExpression */:
+                case 157 /* Constructor */:
+                case 197 /* ArrowFunction */:
+                // case SyntaxKind.ConstructorDeclaration:
+                // case SyntaxKind.SimpleArrowFunctionExpression:
+                // case SyntaxKind.ParenthesizedArrowFunctionExpression:
+                case 241 /* InterfaceDeclaration */: // This one is not truly a function, but for formatting purposes, it acts just like one
+                    return true;
+            }
+            return false;
+        }
+        function isNotFunctionDeclContext(context) {
+            return !isFunctionDeclContext(context);
+        }
+        function isFunctionDeclarationOrFunctionExpressionContext(context) {
+            return context.contextNode.kind === 239 /* FunctionDeclaration */ || context.contextNode.kind === 196 /* FunctionExpression */;
+        }
+        function isTypeScriptDeclWithBlockContext(context) {
+            return nodeIsTypeScriptDeclWithBlockContext(context.contextNode);
+        }
+        function nodeIsTypeScriptDeclWithBlockContext(node) {
+            switch (node.kind) {
+                case 240 /* ClassDeclaration */:
+                case 209 /* ClassExpression */:
+                case 241 /* InterfaceDeclaration */:
+                case 243 /* EnumDeclaration */:
+                case 168 /* TypeLiteral */:
+                case 244 /* ModuleDeclaration */:
+                case 255 /* ExportDeclaration */:
+                case 256 /* NamedExports */:
+                case 249 /* ImportDeclaration */:
+                case 252 /* NamedImports */:
+                    return true;
+            }
+            return false;
+        }
+        function isAfterCodeBlockContext(context) {
+            switch (context.currentTokenParent.kind) {
+                case 240 /* ClassDeclaration */:
+                case 244 /* ModuleDeclaration */:
+                case 243 /* EnumDeclaration */:
+                case 274 /* CatchClause */:
+                case 245 /* ModuleBlock */:
+                case 232 /* SwitchStatement */:
+                    return true;
+                case 218 /* Block */: {
+                    var blockParent = context.currentTokenParent.parent;
+                    // In a codefix scenario, we can't rely on parents being set. So just always return true.
+                    if (!blockParent || blockParent.kind !== 197 /* ArrowFunction */ && blockParent.kind !== 196 /* FunctionExpression */) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        function isControlDeclContext(context) {
+            switch (context.contextNode.kind) {
+                case 222 /* IfStatement */:
+                case 232 /* SwitchStatement */:
+                case 225 /* ForStatement */:
+                case 226 /* ForInStatement */:
+                case 227 /* ForOfStatement */:
+                case 224 /* WhileStatement */:
+                case 235 /* TryStatement */:
+                case 223 /* DoStatement */:
+                case 231 /* WithStatement */:
+                // TODO
+                // case SyntaxKind.ElseClause:
+                case 274 /* CatchClause */:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+        function isObjectContext(context) {
+            return context.contextNode.kind === 188 /* ObjectLiteralExpression */;
+        }
+        function isFunctionCallContext(context) {
+            return context.contextNode.kind === 191 /* CallExpression */;
+        }
+        function isNewContext(context) {
+            return context.contextNode.kind === 192 /* NewExpression */;
+        }
+        function isFunctionCallOrNewContext(context) {
+            return isFunctionCallContext(context) || isNewContext(context);
+        }
+        function isPreviousTokenNotComma(context) {
+            return context.currentTokenSpan.kind !== 27 /* CommaToken */;
+        }
+        function isNextTokenNotCloseBracket(context) {
+            return context.nextTokenSpan.kind !== 23 /* CloseBracketToken */;
+        }
+        function isArrowFunctionContext(context) {
+            return context.contextNode.kind === 197 /* ArrowFunction */;
+        }
+        function isImportTypeContext(context) {
+            return context.contextNode.kind === 183 /* ImportType */;
+        }
+        function isNonJsxSameLineTokenContext(context) {
+            return context.TokensAreOnSameLine() && context.contextNode.kind !== 11 /* JsxText */;
+        }
+        function isNonJsxElementOrFragmentContext(context) {
+            return context.contextNode.kind !== 260 /* JsxElement */ && context.contextNode.kind !== 264 /* JsxFragment */;
+        }
+        function isJsxExpressionContext(context) {
+            return context.contextNode.kind === 270 /* JsxExpression */ || context.contextNode.kind === 269 /* JsxSpreadAttribute */;
+        }
+        function isNextTokenParentJsxAttribute(context) {
+            return context.nextTokenParent.kind === 267 /* JsxAttribute */;
+        }
+        function isJsxAttributeContext(context) {
+            return context.contextNode.kind === 267 /* JsxAttribute */;
+        }
+        function isJsxSelfClosingElementContext(context) {
+            return context.contextNode.kind === 261 /* JsxSelfClosingElement */;
+        }
+        function isNotBeforeBlockInFunctionDeclarationContext(context) {
+            return !isFunctionDeclContext(context) && !isBeforeBlockContext(context);
+        }
+        function isEndOfDecoratorContextOnSameLine(context) {
+            return context.TokensAreOnSameLine() &&
+                !!context.contextNode.decorators &&
+                nodeIsInDecoratorContext(context.currentTokenParent) &&
+                !nodeIsInDecoratorContext(context.nextTokenParent);
+        }
+        function nodeIsInDecoratorContext(node) {
+            while (ts.isExpressionNode(node)) {
+                node = node.parent;
+            }
+            return node.kind === 152 /* Decorator */;
+        }
+        function isStartOfVariableDeclarationList(context) {
+            return context.currentTokenParent.kind === 238 /* VariableDeclarationList */ &&
+                context.currentTokenParent.getStart(context.sourceFile) === context.currentTokenSpan.pos;
+        }
+        function isNotFormatOnEnter(context) {
+            return context.formattingRequestKind !== 2 /* FormatOnEnter */;
+        }
+        function isModuleDeclContext(context) {
+            return context.contextNode.kind === 244 /* ModuleDeclaration */;
+        }
+        function isObjectTypeContext(context) {
+            return context.contextNode.kind === 168 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration;
+        }
+        function isConstructorSignatureContext(context) {
+            return context.contextNode.kind === 161 /* ConstructSignature */;
+        }
+        function isTypeArgumentOrParameterOrAssertion(token, parent) {
+            if (token.kind !== 28 /* LessThanToken */ && token.kind !== 30 /* GreaterThanToken */) {
+                return false;
+            }
+            switch (parent.kind) {
+                case 164 /* TypeReference */:
+                case 194 /* TypeAssertionExpression */:
+                case 242 /* TypeAliasDeclaration */:
+                case 240 /* ClassDeclaration */:
+                case 209 /* ClassExpression */:
+                case 241 /* InterfaceDeclaration */:
+                case 239 /* FunctionDeclaration */:
+                case 196 /* FunctionExpression */:
+                case 197 /* ArrowFunction */:
+                case 156 /* MethodDeclaration */:
+                case 155 /* MethodSignature */:
+                case 160 /* CallSignature */:
+                case 161 /* ConstructSignature */:
+                case 191 /* CallExpression */:
+                case 192 /* NewExpression */:
+                case 211 /* ExpressionWithTypeArguments */:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+        function isTypeArgumentOrParameterOrAssertionContext(context) {
+            return isTypeArgumentOrParameterOrAssertion(context.currentTokenSpan, context.currentTokenParent) ||
+                isTypeArgumentOrParameterOrAssertion(context.nextTokenSpan, context.nextTokenParent);
+        }
+        function isTypeAssertionContext(context) {
+            return context.contextNode.kind === 194 /* TypeAssertionExpression */;
+        }
+        function isVoidOpContext(context) {
+            return context.currentTokenSpan.kind === 106 /* VoidKeyword */ && context.currentTokenParent.kind === 200 /* VoidExpression */;
+        }
+        function isYieldOrYieldStarWithOperand(context) {
+            return context.contextNode.kind === 207 /* YieldExpression */ && context.contextNode.expression !== undefined;
+        }
+        function isNonNullAssertionContext(context) {
+            return context.contextNode.kind === 213 /* NonNullExpression */;
+        }
+    })(formatting = ts.formatting || (ts.formatting = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var formatting;
+    (function (formatting) {
+        function getFormatContext(options) {
+            return { options: options, getRule: getRulesMap() };
+        }
+        formatting.getFormatContext = getFormatContext;
+        var rulesMapCache;
+        function getRulesMap() {
+            if (rulesMapCache === undefined) {
+                rulesMapCache = createRulesMap(formatting.getAllRules());
+            }
+            return rulesMapCache;
+        }
+        function createRulesMap(rules) {
+            var map = buildMap(rules);
+            return function (context) {
+                var bucket = map[getRuleBucketIndex(context.currentTokenSpan.kind, context.nextTokenSpan.kind)];
+                return bucket && ts.find(bucket, function (rule) { return ts.every(rule.context, function (c) { return c(context); }); });
+            };
+        }
+        function buildMap(rules) {
+            // Map from bucket index to array of rules
+            var map = new Array(mapRowLength * mapRowLength);
+            // This array is used only during construction of the rulesbucket in the map
+            var rulesBucketConstructionStateList = new Array(map.length);
+            for (var _i = 0, rules_1 = rules; _i < rules_1.length; _i++) {
+                var rule = rules_1[_i];
+                var specificRule = rule.leftTokenRange.isSpecific && rule.rightTokenRange.isSpecific;
+                for (var _a = 0, _b = rule.leftTokenRange.tokens; _a < _b.length; _a++) {
+                    var left = _b[_a];
+                    for (var _c = 0, _d = rule.rightTokenRange.tokens; _c < _d.length; _c++) {
+                        var right = _d[_c];
+                        var index = getRuleBucketIndex(left, right);
+                        var rulesBucket = map[index];
+                        if (rulesBucket === undefined) {
+                            rulesBucket = map[index] = [];
+                        }
+                        addRule(rulesBucket, rule.rule, specificRule, rulesBucketConstructionStateList, index);
+                    }
+                }
+            }
+            return map;
+        }
+        function getRuleBucketIndex(row, column) {
+            ts.Debug.assert(row <= 147 /* LastKeyword */ && column <= 147 /* LastKeyword */, "Must compute formatting context from tokens");
+            return (row * mapRowLength) + column;
+        }
+        var maskBitSize = 5;
+        var mask = 31; // MaskBitSize bits
+        var mapRowLength = 147 /* LastToken */ + 1;
+        var RulesPosition;
+        (function (RulesPosition) {
+            RulesPosition[RulesPosition["IgnoreRulesSpecific"] = 0] = "IgnoreRulesSpecific";
+            RulesPosition[RulesPosition["IgnoreRulesAny"] = maskBitSize * 1] = "IgnoreRulesAny";
+            RulesPosition[RulesPosition["ContextRulesSpecific"] = maskBitSize * 2] = "ContextRulesSpecific";
+            RulesPosition[RulesPosition["ContextRulesAny"] = maskBitSize * 3] = "ContextRulesAny";
+            RulesPosition[RulesPosition["NoContextRulesSpecific"] = maskBitSize * 4] = "NoContextRulesSpecific";
+            RulesPosition[RulesPosition["NoContextRulesAny"] = maskBitSize * 5] = "NoContextRulesAny";
+        })(RulesPosition || (RulesPosition = {}));
+        // The Rules list contains all the inserted rules into a rulebucket in the following order:
+        //    1- Ignore rules with specific token combination
+        //    2- Ignore rules with any token combination
+        //    3- Context rules with specific token combination
+        //    4- Context rules with any token combination
+        //    5- Non-context rules with specific token combination
+        //    6- Non-context rules with any token combination
+        //
+        // The member rulesInsertionIndexBitmap is used to describe the number of rules
+        // in each sub-bucket (above) hence can be used to know the index of where to insert
+        // the next rule. It's a bitmap which contains 6 different sections each is given 5 bits.
+        //
+        // Example:
+        // In order to insert a rule to the end of sub-bucket (3), we get the index by adding
+        // the values in the bitmap segments 3rd, 2nd, and 1st.
+        function addRule(rules, rule, specificTokens, constructionState, rulesBucketIndex) {
+            var position = rule.action === 1 /* Ignore */
+                ? specificTokens ? RulesPosition.IgnoreRulesSpecific : RulesPosition.IgnoreRulesAny
+                : rule.context !== formatting.anyContext
+                    ? specificTokens ? RulesPosition.ContextRulesSpecific : RulesPosition.ContextRulesAny
+                    : specificTokens ? RulesPosition.NoContextRulesSpecific : RulesPosition.NoContextRulesAny;
+            var state = constructionState[rulesBucketIndex] || 0;
+            rules.splice(getInsertionIndex(state, position), 0, rule);
+            constructionState[rulesBucketIndex] = increaseInsertionIndex(state, position);
+        }
+        function getInsertionIndex(indexBitmap, maskPosition) {
+            var index = 0;
+            for (var pos = 0; pos <= maskPosition; pos += maskBitSize) {
+                index += indexBitmap & mask;
+                indexBitmap >>= maskBitSize;
+            }
+            return index;
+        }
+        function increaseInsertionIndex(indexBitmap, maskPosition) {
+            var value = ((indexBitmap >> maskPosition) & mask) + 1;
+            ts.Debug.assert((value & mask) === value, "Adding more rules into the sub-bucket than allowed. Maximum allowed is 32 rules.");
+            return (indexBitmap & ~(mask << maskPosition)) | (value << maskPosition);
+        }
+    })(formatting = ts.formatting || (ts.formatting = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var formatting;
+    (function (formatting) {
+        var Constants;
+        (function (Constants) {
+            Constants[Constants["Unknown"] = -1] = "Unknown";
+        })(Constants || (Constants = {}));
+        function formatOnEnter(position, sourceFile, formatContext) {
+            var line = sourceFile.getLineAndCharacterOfPosition(position).line;
+            if (line === 0) {
+                return [];
+            }
+            // After the enter key, the cursor is now at a new line. The new line may or may not contain non-whitespace characters.
+            // If the new line has only whitespaces, we won't want to format this line, because that would remove the indentation as
+            // trailing whitespaces. So the end of the formatting span should be the later one between:
+            //  1. the end of the previous line
+            //  2. the last non-whitespace character in the current line
+            var endOfFormatSpan = ts.getEndLinePosition(line, sourceFile);
+            while (ts.isWhiteSpaceSingleLine(sourceFile.text.charCodeAt(endOfFormatSpan))) {
+                endOfFormatSpan--;
+            }
+            // if the character at the end of the span is a line break, we shouldn't include it, because it indicates we don't want to
+            // touch the current line at all. Also, on some OSes the line break consists of two characters (\r\n), we should test if the
+            // previous character before the end of format span is line break character as well.
+            if (ts.isLineBreak(sourceFile.text.charCodeAt(endOfFormatSpan))) {
+                endOfFormatSpan--;
+            }
+            var span = {
+                // get start position for the previous line
+                pos: ts.getStartPositionOfLine(line - 1, sourceFile),
+                // end value is exclusive so add 1 to the result
+                end: endOfFormatSpan + 1
+            };
+            return formatSpan(span, sourceFile, formatContext, 2 /* FormatOnEnter */);
+        }
+        formatting.formatOnEnter = formatOnEnter;
+        function formatOnSemicolon(position, sourceFile, formatContext) {
+            var semicolon = findImmediatelyPrecedingTokenOfKind(position, 26 /* SemicolonToken */, sourceFile);
+            return formatNodeLines(findOutermostNodeWithinListLevel(semicolon), sourceFile, formatContext, 3 /* FormatOnSemicolon */);
+        }
+        formatting.formatOnSemicolon = formatOnSemicolon;
+        function formatOnOpeningCurly(position, sourceFile, formatContext) {
+            var openingCurly = findImmediatelyPrecedingTokenOfKind(position, 18 /* OpenBraceToken */, sourceFile);
+            if (!openingCurly) {
+                return [];
+            }
+            var curlyBraceRange = openingCurly.parent;
+            var outermostNode = findOutermostNodeWithinListLevel(curlyBraceRange);
+            /**
+             * We limit the span to end at the opening curly to handle the case where
+             * the brace matched to that just typed will be incorrect after further edits.
+             * For example, we could type the opening curly for the following method
+             * body without brace-matching activated:
+             * ```
+             * class C {
+             *     foo()
+             * }
+             * ```
+             * and we wouldn't want to move the closing brace.
+             */
+            var textRange = {
+                pos: ts.getLineStartPositionForPosition(outermostNode.getStart(sourceFile), sourceFile),
+                end: position
+            };
+            return formatSpan(textRange, sourceFile, formatContext, 4 /* FormatOnOpeningCurlyBrace */);
+        }
+        formatting.formatOnOpeningCurly = formatOnOpeningCurly;
+        function formatOnClosingCurly(position, sourceFile, formatContext) {
+            var precedingToken = findImmediatelyPrecedingTokenOfKind(position, 19 /* CloseBraceToken */, sourceFile);
+            return formatNodeLines(findOutermostNodeWithinListLevel(precedingToken), sourceFile, formatContext, 5 /* FormatOnClosingCurlyBrace */);
+        }
+        formatting.formatOnClosingCurly = formatOnClosingCurly;
+        function formatDocument(sourceFile, formatContext) {
+            var span = {
+                pos: 0,
+                end: sourceFile.text.length
+            };
+            return formatSpan(span, sourceFile, formatContext, 0 /* FormatDocument */);
+        }
+        formatting.formatDocument = formatDocument;
+        function formatSelection(start, end, sourceFile, formatContext) {
+            // format from the beginning of the line
+            var span = {
+                pos: ts.getLineStartPositionForPosition(start, sourceFile),
+                end: end,
+            };
+            return formatSpan(span, sourceFile, formatContext, 1 /* FormatSelection */);
+        }
+        formatting.formatSelection = formatSelection;
+        /**
+         * Validating `expectedTokenKind` ensures the token was typed in the context we expect (eg: not a comment).
+         * @param expectedTokenKind The kind of the last token constituting the desired parent node.
+         */
+        function findImmediatelyPrecedingTokenOfKind(end, expectedTokenKind, sourceFile) {
+            var precedingToken = ts.findPrecedingToken(end, sourceFile);
+            return precedingToken && precedingToken.kind === expectedTokenKind && end === precedingToken.getEnd() ?
+                precedingToken :
+                undefined;
+        }
+        /**
+         * Finds the highest node enclosing `node` at the same list level as `node`
+         * and whose end does not exceed `node.end`.
+         *
+         * Consider typing the following
+         * ```
+         * let x = 1;
+         * while (true) {
+         * }
+         * ```
+         * Upon typing the closing curly, we want to format the entire `while`-statement, but not the preceding
+         * variable declaration.
+         */
+        function findOutermostNodeWithinListLevel(node) {
+            var current = node;
+            while (current &&
+                current.parent &&
+                current.parent.end === node.end &&
+                !isListElement(current.parent, current)) {
+                current = current.parent;
+            }
+            return current;
+        }
+        // Returns true if node is a element in some list in parent
+        // i.e. parent is class declaration with the list of members and node is one of members.
+        function isListElement(parent, node) {
+            switch (parent.kind) {
+                case 240 /* ClassDeclaration */:
+                case 241 /* InterfaceDeclaration */:
+                    return ts.rangeContainsRange(parent.members, node);
+                case 244 /* ModuleDeclaration */:
+                    var body = parent.body;
+                    return !!body && body.kind === 245 /* ModuleBlock */ && ts.rangeContainsRange(body.statements, node);
+                case 279 /* SourceFile */:
+                case 218 /* Block */:
+                case 245 /* ModuleBlock */:
+                    return ts.rangeContainsRange(parent.statements, node);
+                case 274 /* CatchClause */:
+                    return ts.rangeContainsRange(parent.block.statements, node);
+            }
+            return false;
+        }
+        /** find node that fully contains given text range */
+        function findEnclosingNode(range, sourceFile) {
+            return find(sourceFile);
+            function find(n) {
+                var candidate = ts.forEachChild(n, function (c) { return ts.startEndContainsRange(c.getStart(sourceFile), c.end, range) && c; });
+                if (candidate) {
+                    var result = find(candidate);
+                    if (result) {
+                        return result;
+                    }
+                }
+                return n;
+            }
+        }
+        /** formatting is not applied to ranges that contain parse errors.
+         * This function will return a predicate that for a given text range will tell
+         * if there are any parse errors that overlap with the range.
+         */
+        function prepareRangeContainsErrorFunction(errors, originalRange) {
+            if (!errors.length) {
+                return rangeHasNoErrors;
+            }
+            // pick only errors that fall in range
+            var sorted = errors
+                .filter(function (d) { return ts.rangeOverlapsWithStartEnd(originalRange, d.start, d.start + d.length); }) // TODO: GH#18217
+                .sort(function (e1, e2) { return e1.start - e2.start; });
+            if (!sorted.length) {
+                return rangeHasNoErrors;
+            }
+            var index = 0;
+            return function (r) {
+                // in current implementation sequence of arguments [r1, r2...] is monotonically increasing.
+                // 'index' tracks the index of the most recent error that was checked.
+                while (true) {
+                    if (index >= sorted.length) {
+                        // all errors in the range were already checked -> no error in specified range
+                        return false;
+                    }
+                    var error = sorted[index];
+                    if (r.end <= error.start) {
+                        // specified range ends before the error refered by 'index' - no error in range
+                        return false;
+                    }
+                    if (ts.startEndOverlapsWithStartEnd(r.pos, r.end, error.start, error.start + error.length)) {
+                        // specified range overlaps with error range
+                        return true;
+                    }
+                    index++;
+                }
+            };
+            function rangeHasNoErrors() {
+                return false;
+            }
+        }
+        /**
+         * Start of the original range might fall inside the comment - scanner will not yield appropriate results
+         * This function will look for token that is located before the start of target range
+         * and return its end as start position for the scanner.
+         */
+        function getScanStartPosition(enclosingNode, originalRange, sourceFile) {
+            var start = enclosingNode.getStart(sourceFile);
+            if (start === originalRange.pos && enclosingNode.end === originalRange.end) {
+                return start;
+            }
+            var precedingToken = ts.findPrecedingToken(originalRange.pos, sourceFile);
+            if (!precedingToken) {
+                // no preceding token found - start from the beginning of enclosing node
+                return enclosingNode.pos;
+            }
+            // preceding token ends after the start of original range (i.e when originalRange.pos falls in the middle of literal)
+            // start from the beginning of enclosingNode to handle the entire 'originalRange'
+            if (precedingToken.end >= originalRange.pos) {
+                return enclosingNode.pos;
+            }
+            return precedingToken.end;
+        }
+        /*
+         * For cases like
+         * if (a ||
+         *     b ||$
+         *     c) {...}
+         * If we hit Enter at $ we want line '    b ||' to be indented.
+         * Formatting will be applied to the last two lines.
+         * Node that fully encloses these lines is binary expression 'a ||...'.
+         * Initial indentation for this node will be 0.
+         * Binary expressions don't introduce new indentation scopes, however it is possible
+         * that some parent node on the same line does - like if statement in this case.
+         * Note that we are considering parents only from the same line with initial node -
+         * if parent is on the different line - its delta was already contributed
+         * to the initial indentation.
+         */
+        function getOwnOrInheritedDelta(n, options, sourceFile) {
+            var previousLine = -1 /* Unknown */;
+            var child;
+            while (n) {
+                var line = sourceFile.getLineAndCharacterOfPosition(n.getStart(sourceFile)).line;
+                if (previousLine !== -1 /* Unknown */ && line !== previousLine) {
+                    break;
+                }
+                if (formatting.SmartIndenter.shouldIndentChildNode(options, n, child, sourceFile)) {
+                    return options.indentSize;
+                }
+                previousLine = line;
+                child = n;
+                n = n.parent;
+            }
+            return 0;
+        }
+        function formatNodeGivenIndentation(node, sourceFileLike, languageVariant, initialIndentation, delta, formatContext) {
+            var range = { pos: 0, end: sourceFileLike.text.length };
+            return formatting.getFormattingScanner(sourceFileLike.text, languageVariant, range.pos, range.end, function (scanner) { return formatSpanWorker(range, node, initialIndentation, delta, scanner, formatContext, 1 /* FormatSelection */, function (_) { return false; }, // assume that node does not have any errors
+            sourceFileLike); });
+        }
+        formatting.formatNodeGivenIndentation = formatNodeGivenIndentation;
+        function formatNodeLines(node, sourceFile, formatContext, requestKind) {
+            if (!node) {
+                return [];
+            }
+            var span = {
+                pos: ts.getLineStartPositionForPosition(node.getStart(sourceFile), sourceFile),
+                end: node.end
+            };
+            return formatSpan(span, sourceFile, formatContext, requestKind);
+        }
+        function formatSpan(originalRange, sourceFile, formatContext, requestKind) {
+            // find the smallest node that fully wraps the range and compute the initial indentation for the node
+            var enclosingNode = findEnclosingNode(originalRange, sourceFile);
+            return formatting.getFormattingScanner(sourceFile.text, sourceFile.languageVariant, getScanStartPosition(enclosingNode, originalRange, sourceFile), originalRange.end, function (scanner) { return formatSpanWorker(originalRange, enclosingNode, formatting.SmartIndenter.getIndentationForNode(enclosingNode, originalRange, sourceFile, formatContext.options), getOwnOrInheritedDelta(enclosingNode, formatContext.options, sourceFile), scanner, formatContext, requestKind, prepareRangeContainsErrorFunction(sourceFile.parseDiagnostics, originalRange), sourceFile); });
+        }
+        function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delta, formattingScanner, _a, requestKind, rangeContainsError, sourceFile) {
+            var options = _a.options, getRule = _a.getRule;
+            // formatting context is used by rules provider
+            var formattingContext = new formatting.FormattingContext(sourceFile, requestKind, options);
+            var previousRange;
+            var previousParent;
+            var previousRangeStartLine;
+            var lastIndentedLine;
+            var indentationOnLastIndentedLine = -1 /* Unknown */;
+            var edits = [];
+            formattingScanner.advance();
+            if (formattingScanner.isOnToken()) {
+                var startLine = sourceFile.getLineAndCharacterOfPosition(enclosingNode.getStart(sourceFile)).line;
+                var undecoratedStartLine = startLine;
+                if (enclosingNode.decorators) {
+                    undecoratedStartLine = sourceFile.getLineAndCharacterOfPosition(ts.getNonDecoratorTokenPosOfNode(enclosingNode, sourceFile)).line;
+                }
+                processNode(enclosingNode, enclosingNode, startLine, undecoratedStartLine, initialIndentation, delta);
+            }
+            if (!formattingScanner.isOnToken()) {
+                var leadingTrivia = formattingScanner.getCurrentLeadingTrivia();
+                if (leadingTrivia) {
+                    indentTriviaItems(leadingTrivia, initialIndentation, /*indentNextTokenOrTrivia*/ false, function (item) { return processRange(item, sourceFile.getLineAndCharacterOfPosition(item.pos), enclosingNode, enclosingNode, /*dynamicIndentation*/ undefined); });
+                    trimTrailingWhitespacesForRemainingRange();
+                }
+            }
+            return edits;
+            // local functions
+            /** Tries to compute the indentation for a list element.
+             * If list element is not in range then
+             * function will pick its actual indentation
+             * so it can be pushed downstream as inherited indentation.
+             * If list element is in the range - its indentation will be equal
+             * to inherited indentation from its predecessors.
+             */
+            function tryComputeIndentationForListItem(startPos, endPos, parentStartLine, range, inheritedIndentation) {
+                if (ts.rangeOverlapsWithStartEnd(range, startPos, endPos) ||
+                    ts.rangeContainsStartEnd(range, startPos, endPos) /* Not to miss zero-range nodes e.g. JsxText */) {
+                    if (inheritedIndentation !== -1 /* Unknown */) {
+                        return inheritedIndentation;
+                    }
+                }
+                else {
+                    var startLine = sourceFile.getLineAndCharacterOfPosition(startPos).line;
+                    var startLinePosition = ts.getLineStartPositionForPosition(startPos, sourceFile);
+                    var column = formatting.SmartIndenter.findFirstNonWhitespaceColumn(startLinePosition, startPos, sourceFile, options);
+                    if (startLine !== parentStartLine || startPos === column) {
+                        // Use the base indent size if it is greater than
+                        // the indentation of the inherited predecessor.
+                        var baseIndentSize = formatting.SmartIndenter.getBaseIndentation(options);
+                        return baseIndentSize > column ? baseIndentSize : column;
+                    }
+                }
+                return -1 /* Unknown */;
+            }
+            function computeIndentation(node, startLine, inheritedIndentation, parent, parentDynamicIndentation, effectiveParentStartLine) {
+                var delta = formatting.SmartIndenter.shouldIndentChildNode(options, node) ? options.indentSize : 0;
+                if (effectiveParentStartLine === startLine) {
+                    // if node is located on the same line with the parent
+                    // - inherit indentation from the parent
+                    // - push children if either parent of node itself has non-zero delta
+                    return {
+                        indentation: startLine === lastIndentedLine ? indentationOnLastIndentedLine : parentDynamicIndentation.getIndentation(),
+                        delta: Math.min(options.indentSize, parentDynamicIndentation.getDelta(node) + delta)
+                    };
+                }
+                else if (inheritedIndentation === -1 /* Unknown */) {
+                    if (node.kind === 20 /* OpenParenToken */ && startLine === lastIndentedLine) {
+                        // the is used for chaining methods formatting
+                        // - we need to get the indentation on last line and the delta of parent
+                        return { indentation: indentationOnLastIndentedLine, delta: parentDynamicIndentation.getDelta(node) };
+                    }
+                    else if (formatting.SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement(parent, node, startLine, sourceFile)) {
+                        return { indentation: parentDynamicIndentation.getIndentation(), delta: delta };
+                    }
+                    else {
+                        return { indentation: parentDynamicIndentation.getIndentation() + parentDynamicIndentation.getDelta(node), delta: delta };
+                    }
+                }
+                else {
+                    return { indentation: inheritedIndentation, delta: delta };
+                }
+            }
+            function getFirstNonDecoratorTokenOfNode(node) {
+                if (node.modifiers && node.modifiers.length) {
+                    return node.modifiers[0].kind;
+                }
+                switch (node.kind) {
+                    case 240 /* ClassDeclaration */: return 76 /* ClassKeyword */;
+                    case 241 /* InterfaceDeclaration */: return 110 /* InterfaceKeyword */;
+                    case 239 /* FunctionDeclaration */: return 90 /* FunctionKeyword */;
+                    case 243 /* EnumDeclaration */: return 243 /* EnumDeclaration */;
+                    case 158 /* GetAccessor */: return 126 /* GetKeyword */;
+                    case 159 /* SetAccessor */: return 137 /* SetKeyword */;
+                    case 156 /* MethodDeclaration */:
+                        if (node.asteriskToken) {
+                            return 40 /* AsteriskToken */;
+                        }
+                    // falls through
+                    case 154 /* PropertyDeclaration */:
+                    case 151 /* Parameter */:
+                        var name = ts.getNameOfDeclaration(node);
+                        if (name) {
+                            return name.kind;
+                        }
+                }
+            }
+            function getDynamicIndentation(node, nodeStartLine, indentation, delta) {
+                return {
+                    getIndentationForComment: function (kind, tokenIndentation, container) {
+                        switch (kind) {
+                            // preceding comment to the token that closes the indentation scope inherits the indentation from the scope
+                            // ..  {
+                            //     // comment
+                            // }
+                            case 19 /* CloseBraceToken */:
+                            case 23 /* CloseBracketToken */:
+                            case 21 /* CloseParenToken */:
+                                return indentation + getDelta(container);
+                        }
+                        return tokenIndentation !== -1 /* Unknown */ ? tokenIndentation : indentation;
+                    },
+                    // if list end token is LessThanToken '>' then its delta should be explicitly suppressed
+                    // so that LessThanToken as a binary operator can still be indented.
+                    // foo.then
+                    //     <
+                    //         number,
+                    //         string,
+                    //     >();
+                    // vs
+                    // var a = xValue
+                    //     > yValue;
+                    getIndentationForToken: function (line, kind, container, suppressDelta) {
+                        return !suppressDelta && shouldAddDelta(line, kind, container) ? indentation + getDelta(container) : indentation;
+                    },
+                    getIndentation: function () { return indentation; },
+                    getDelta: getDelta,
+                    recomputeIndentation: function (lineAdded) {
+                        if (node.parent && formatting.SmartIndenter.shouldIndentChildNode(options, node.parent, node, sourceFile)) {
+                            indentation += lineAdded ? options.indentSize : -options.indentSize;
+                            delta = formatting.SmartIndenter.shouldIndentChildNode(options, node) ? options.indentSize : 0;
+                        }
+                    }
+                };
+                function shouldAddDelta(line, kind, container) {
+                    switch (kind) {
+                        // open and close brace, 'else' and 'while' (in do statement) tokens has indentation of the parent
+                        case 18 /* OpenBraceToken */:
+                        case 19 /* CloseBraceToken */:
+                        case 21 /* CloseParenToken */:
+                        case 83 /* ElseKeyword */:
+                        case 107 /* WhileKeyword */:
+                        case 58 /* AtToken */:
+                            return false;
+                        case 42 /* SlashToken */:
+                        case 30 /* GreaterThanToken */:
+                            switch (container.kind) {
+                                case 262 /* JsxOpeningElement */:
+                                case 263 /* JsxClosingElement */:
+                                case 261 /* JsxSelfClosingElement */:
+                                    return false;
+                            }
+                            break;
+                        case 22 /* OpenBracketToken */:
+                        case 23 /* CloseBracketToken */:
+                            if (container.kind !== 181 /* MappedType */) {
+                                return false;
+                            }
+                            break;
+                    }
+                    // if token line equals to the line of containing node (this is a first token in the node) - use node indentation
+                    return nodeStartLine !== line
+                        // if this token is the first token following the list of decorators, we do not need to indent
+                        && !(node.decorators && kind === getFirstNonDecoratorTokenOfNode(node));
+                }
+                function getDelta(child) {
+                    // Delta value should be zero when the node explicitly prevents indentation of the child node
+                    return formatting.SmartIndenter.nodeWillIndentChild(options, node, child, sourceFile, /*indentByDefault*/ true) ? delta : 0;
+                }
+            }
+            function processNode(node, contextNode, nodeStartLine, undecoratedNodeStartLine, indentation, delta) {
+                if (!ts.rangeOverlapsWithStartEnd(originalRange, node.getStart(sourceFile), node.getEnd())) {
+                    return;
+                }
+                var nodeDynamicIndentation = getDynamicIndentation(node, nodeStartLine, indentation, delta);
+                // a useful observations when tracking context node
+                //        /
+                //      [a]
+                //   /   |   \
+                //  [b] [c] [d]
+                // node 'a' is a context node for nodes 'b', 'c', 'd'
+                // except for the leftmost leaf token in [b] - in this case context node ('e') is located somewhere above 'a'
+                // this rule can be applied recursively to child nodes of 'a'.
+                //
+                // context node is set to parent node value after processing every child node
+                // context node is set to parent of the token after processing every token
+                var childContextNode = contextNode;
+                // if there are any tokens that logically belong to node and interleave child nodes
+                // such tokens will be consumed in processChildNode for the child that follows them
+                ts.forEachChild(node, function (child) {
+                    processChildNode(child, /*inheritedIndentation*/ -1 /* Unknown */, node, nodeDynamicIndentation, nodeStartLine, undecoratedNodeStartLine, /*isListItem*/ false);
+                }, function (nodes) {
+                    processChildNodes(nodes, node, nodeStartLine, nodeDynamicIndentation);
+                });
+                // proceed any tokens in the node that are located after child nodes
+                while (formattingScanner.isOnToken()) {
+                    var tokenInfo = formattingScanner.readTokenInfo(node);
+                    if (tokenInfo.token.end > node.end) {
+                        break;
+                    }
+                    consumeTokenAndAdvanceScanner(tokenInfo, node, nodeDynamicIndentation, node);
+                }
+                function processChildNode(child, inheritedIndentation, parent, parentDynamicIndentation, parentStartLine, undecoratedParentStartLine, isListItem, isFirstListItem) {
+                    var childStartPos = child.getStart(sourceFile);
+                    var childStartLine = sourceFile.getLineAndCharacterOfPosition(childStartPos).line;
+                    var undecoratedChildStartLine = childStartLine;
+                    if (child.decorators) {
+                        undecoratedChildStartLine = sourceFile.getLineAndCharacterOfPosition(ts.getNonDecoratorTokenPosOfNode(child, sourceFile)).line;
+                    }
+                    // if child is a list item - try to get its indentation, only if parent is within the original range.
+                    var childIndentationAmount = -1 /* Unknown */;
+                    if (isListItem && ts.rangeContainsRange(originalRange, parent)) {
+                        childIndentationAmount = tryComputeIndentationForListItem(childStartPos, child.end, parentStartLine, originalRange, inheritedIndentation);
+                        if (childIndentationAmount !== -1 /* Unknown */) {
+                            inheritedIndentation = childIndentationAmount;
+                        }
+                    }
+                    // child node is outside the target range - do not dive inside
+                    if (!ts.rangeOverlapsWithStartEnd(originalRange, child.pos, child.end)) {
+                        if (child.end < originalRange.pos) {
+                            formattingScanner.skipToEndOf(child);
+                        }
+                        return inheritedIndentation;
+                    }
+                    if (child.getFullWidth() === 0) {
+                        return inheritedIndentation;
+                    }
+                    while (formattingScanner.isOnToken()) {
+                        // proceed any parent tokens that are located prior to child.getStart()
+                        var tokenInfo = formattingScanner.readTokenInfo(node);
+                        if (tokenInfo.token.end > childStartPos) {
+                            // stop when formatting scanner advances past the beginning of the child
+                            break;
+                        }
+                        consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, node);
+                    }
+                    if (!formattingScanner.isOnToken()) {
+                        return inheritedIndentation;
+                    }
+                    // JSX text shouldn't affect indenting
+                    if (ts.isToken(child) && child.kind !== 11 /* JsxText */) {
+                        // if child node is a token, it does not impact indentation, proceed it using parent indentation scope rules
+                        var tokenInfo = formattingScanner.readTokenInfo(child);
+                        ts.Debug.assert(tokenInfo.token.end === child.end, "Token end is child end");
+                        consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, child);
+                        return inheritedIndentation;
+                    }
+                    var effectiveParentStartLine = child.kind === 152 /* Decorator */ ? childStartLine : undecoratedParentStartLine;
+                    var childIndentation = computeIndentation(child, childStartLine, childIndentationAmount, node, parentDynamicIndentation, effectiveParentStartLine);
+                    processNode(child, childContextNode, childStartLine, undecoratedChildStartLine, childIndentation.indentation, childIndentation.delta);
+                    if (child.kind === 11 /* JsxText */) {
+                        var range = { pos: child.getStart(), end: child.getEnd() };
+                        indentMultilineCommentOrJsxText(range, childIndentation.indentation, /*firstLineIsIndented*/ true, /*indentFinalLine*/ false);
+                    }
+                    childContextNode = node;
+                    if (isFirstListItem && parent.kind === 187 /* ArrayLiteralExpression */ && inheritedIndentation === -1 /* Unknown */) {
+                        inheritedIndentation = childIndentation.indentation;
+                    }
+                    return inheritedIndentation;
+                }
+                function processChildNodes(nodes, parent, parentStartLine, parentDynamicIndentation) {
+                    ts.Debug.assert(ts.isNodeArray(nodes));
+                    var listStartToken = getOpenTokenForList(parent, nodes);
+                    var listDynamicIndentation = parentDynamicIndentation;
+                    var startLine = parentStartLine;
+                    if (listStartToken !== 0 /* Unknown */) {
+                        // introduce a new indentation scope for lists (including list start and end tokens)
+                        while (formattingScanner.isOnToken()) {
+                            var tokenInfo = formattingScanner.readTokenInfo(parent);
+                            if (tokenInfo.token.end > nodes.pos) {
+                                // stop when formatting scanner moves past the beginning of node list
+                                break;
+                            }
+                            else if (tokenInfo.token.kind === listStartToken) {
+                                // consume list start token
+                                startLine = sourceFile.getLineAndCharacterOfPosition(tokenInfo.token.pos).line;
+                                consumeTokenAndAdvanceScanner(tokenInfo, parent, parentDynamicIndentation, parent);
+                                var indentationOnListStartToken = void 0;
+                                if (indentationOnLastIndentedLine !== -1 /* Unknown */) {
+                                    // scanner just processed list start token so consider last indentation as list indentation
+                                    // function foo(): { // last indentation was 0, list item will be indented based on this value
+                                    //   foo: number;
+                                    // }: {};
+                                    indentationOnListStartToken = indentationOnLastIndentedLine;
+                                }
+                                else {
+                                    var startLinePosition = ts.getLineStartPositionForPosition(tokenInfo.token.pos, sourceFile);
+                                    indentationOnListStartToken = formatting.SmartIndenter.findFirstNonWhitespaceColumn(startLinePosition, tokenInfo.token.pos, sourceFile, options);
+                                }
+                                listDynamicIndentation = getDynamicIndentation(parent, parentStartLine, indentationOnListStartToken, options.indentSize); // TODO: GH#18217
+                            }
+                            else {
+                                // consume any tokens that precede the list as child elements of 'node' using its indentation scope
+                                consumeTokenAndAdvanceScanner(tokenInfo, parent, parentDynamicIndentation, parent);
+                            }
+                        }
+                    }
+                    var inheritedIndentation = -1 /* Unknown */;
+                    for (var i = 0; i < nodes.length; i++) {
+                        var child = nodes[i];
+                        inheritedIndentation = processChildNode(child, inheritedIndentation, node, listDynamicIndentation, startLine, startLine, /*isListItem*/ true, /*isFirstListItem*/ i === 0);
+                    }
+                    var listEndToken = getCloseTokenForOpenToken(listStartToken);
+                    if (listEndToken !== 0 /* Unknown */ && formattingScanner.isOnToken()) {
+                        var tokenInfo = formattingScanner.readTokenInfo(parent);
+                        if (tokenInfo.token.kind === 27 /* CommaToken */ && ts.isCallLikeExpression(parent)) {
+                            formattingScanner.advance();
+                            tokenInfo = formattingScanner.isOnToken() ? formattingScanner.readTokenInfo(parent) : undefined;
+                        }
+                        // consume the list end token only if it is still belong to the parent
+                        // there might be the case when current token matches end token but does not considered as one
+                        // function (x: function) <--
+                        // without this check close paren will be interpreted as list end token for function expression which is wrong
+                        if (tokenInfo && tokenInfo.token.kind === listEndToken && ts.rangeContainsRange(parent, tokenInfo.token)) {
+                            // consume list end token
+                            consumeTokenAndAdvanceScanner(tokenInfo, parent, listDynamicIndentation, parent, /*isListEndToken*/ true);
+                        }
+                    }
+                }
+                function consumeTokenAndAdvanceScanner(currentTokenInfo, parent, dynamicIndentation, container, isListEndToken) {
+                    ts.Debug.assert(ts.rangeContainsRange(parent, currentTokenInfo.token));
+                    var lastTriviaWasNewLine = formattingScanner.lastTrailingTriviaWasNewLine();
+                    var indentToken = false;
+                    if (currentTokenInfo.leadingTrivia) {
+                        processTrivia(currentTokenInfo.leadingTrivia, parent, childContextNode, dynamicIndentation);
+                    }
+                    var lineAction = 0 /* None */;
+                    var isTokenInRange = ts.rangeContainsRange(originalRange, currentTokenInfo.token);
+                    var tokenStart = sourceFile.getLineAndCharacterOfPosition(currentTokenInfo.token.pos);
+                    if (isTokenInRange) {
+                        var rangeHasError = rangeContainsError(currentTokenInfo.token);
+                        // save previousRange since processRange will overwrite this value with current one
+                        var savePreviousRange = previousRange;
+                        lineAction = processRange(currentTokenInfo.token, tokenStart, parent, childContextNode, dynamicIndentation);
+                        // do not indent comments\token if token range overlaps with some error
+                        if (!rangeHasError) {
+                            if (lineAction === 0 /* None */) {
+                                // indent token only if end line of previous range does not match start line of the token
+                                var prevEndLine = savePreviousRange && sourceFile.getLineAndCharacterOfPosition(savePreviousRange.end).line;
+                                indentToken = lastTriviaWasNewLine && tokenStart.line !== prevEndLine;
+                            }
+                            else {
+                                indentToken = lineAction === 1 /* LineAdded */;
+                            }
+                        }
+                    }
+                    if (currentTokenInfo.trailingTrivia) {
+                        processTrivia(currentTokenInfo.trailingTrivia, parent, childContextNode, dynamicIndentation);
+                    }
+                    if (indentToken) {
+                        var tokenIndentation = (isTokenInRange && !rangeContainsError(currentTokenInfo.token)) ?
+                            dynamicIndentation.getIndentationForToken(tokenStart.line, currentTokenInfo.token.kind, container, !!isListEndToken) :
+                            -1 /* Unknown */;
+                        var indentNextTokenOrTrivia = true;
+                        if (currentTokenInfo.leadingTrivia) {
+                            var commentIndentation_1 = dynamicIndentation.getIndentationForComment(currentTokenInfo.token.kind, tokenIndentation, container);
+                            indentNextTokenOrTrivia = indentTriviaItems(currentTokenInfo.leadingTrivia, commentIndentation_1, indentNextTokenOrTrivia, function (item) { return insertIndentation(item.pos, commentIndentation_1, /*lineAdded*/ false); });
+                        }
+                        // indent token only if is it is in target range and does not overlap with any error ranges
+                        if (tokenIndentation !== -1 /* Unknown */ && indentNextTokenOrTrivia) {
+                            insertIndentation(currentTokenInfo.token.pos, tokenIndentation, lineAction === 1 /* LineAdded */);
+                            lastIndentedLine = tokenStart.line;
+                            indentationOnLastIndentedLine = tokenIndentation;
+                        }
+                    }
+                    formattingScanner.advance();
+                    childContextNode = parent;
+                }
+            }
+            function indentTriviaItems(trivia, commentIndentation, indentNextTokenOrTrivia, indentSingleLine) {
+                for (var _i = 0, trivia_1 = trivia; _i < trivia_1.length; _i++) {
+                    var triviaItem = trivia_1[_i];
+                    var triviaInRange = ts.rangeContainsRange(originalRange, triviaItem);
+                    switch (triviaItem.kind) {
+                        case 3 /* MultiLineCommentTrivia */:
+                            if (triviaInRange) {
+                                indentMultilineCommentOrJsxText(triviaItem, commentIndentation, /*firstLineIsIndented*/ !indentNextTokenOrTrivia);
+                            }
+                            indentNextTokenOrTrivia = false;
+                            break;
+                        case 2 /* SingleLineCommentTrivia */:
+                            if (indentNextTokenOrTrivia && triviaInRange) {
+                                indentSingleLine(triviaItem);
+                            }
+                            indentNextTokenOrTrivia = false;
+                            break;
+                        case 4 /* NewLineTrivia */:
+                            indentNextTokenOrTrivia = true;
+                            break;
+                    }
+                }
+                return indentNextTokenOrTrivia;
+            }
+            function processTrivia(trivia, parent, contextNode, dynamicIndentation) {
+                for (var _i = 0, trivia_2 = trivia; _i < trivia_2.length; _i++) {
+                    var triviaItem = trivia_2[_i];
+                    if (ts.isComment(triviaItem.kind) && ts.rangeContainsRange(originalRange, triviaItem)) {
+                        var triviaItemStart = sourceFile.getLineAndCharacterOfPosition(triviaItem.pos);
+                        processRange(triviaItem, triviaItemStart, parent, contextNode, dynamicIndentation);
+                    }
+                }
+            }
+            function processRange(range, rangeStart, parent, contextNode, dynamicIndentation) {
+                var rangeHasError = rangeContainsError(range);
+                var lineAction = 0 /* None */;
+                if (!rangeHasError) {
+                    if (!previousRange) {
+                        // trim whitespaces starting from the beginning of the span up to the current line
+                        var originalStart = sourceFile.getLineAndCharacterOfPosition(originalRange.pos);
+                        trimTrailingWhitespacesForLines(originalStart.line, rangeStart.line);
+                    }
+                    else {
+                        lineAction =
+                            processPair(range, rangeStart.line, parent, previousRange, previousRangeStartLine, previousParent, contextNode, dynamicIndentation);
+                    }
+                }
+                previousRange = range;
+                previousParent = parent;
+                previousRangeStartLine = rangeStart.line;
+                return lineAction;
+            }
+            function processPair(currentItem, currentStartLine, currentParent, previousItem, previousStartLine, previousParent, contextNode, dynamicIndentation) {
+                formattingContext.updateContext(previousItem, previousParent, currentItem, currentParent, contextNode);
+                var rule = getRule(formattingContext);
+                var trimTrailingWhitespaces;
+                var lineAction = 0 /* None */;
+                if (rule) {
+                    lineAction = applyRuleEdits(rule, previousItem, previousStartLine, currentItem, currentStartLine);
+                    switch (lineAction) {
+                        case 2 /* LineRemoved */:
+                            // Handle the case where the next line is moved to be the end of this line.
+                            // In this case we don't indent the next line in the next pass.
+                            if (currentParent.getStart(sourceFile) === currentItem.pos) {
+                                dynamicIndentation.recomputeIndentation(/*lineAddedByFormatting*/ false);
+                            }
+                            break;
+                        case 1 /* LineAdded */:
+                            // Handle the case where token2 is moved to the new line.
+                            // In this case we indent token2 in the next pass but we set
+                            // sameLineIndent flag to notify the indenter that the indentation is within the line.
+                            if (currentParent.getStart(sourceFile) === currentItem.pos) {
+                                dynamicIndentation.recomputeIndentation(/*lineAddedByFormatting*/ true);
+                            }
+                            break;
+                        default:
+                            ts.Debug.assert(lineAction === 0 /* None */);
+                    }
+                    // We need to trim trailing whitespace between the tokens if they were on different lines, and no rule was applied to put them on the same line
+                    trimTrailingWhitespaces = !(rule.action & 8 /* Delete */) && rule.flags !== 1 /* CanDeleteNewLines */;
+                }
+                else {
+                    trimTrailingWhitespaces = true;
+                }
+                if (currentStartLine !== previousStartLine && trimTrailingWhitespaces) {
+                    // We need to trim trailing whitespace between the tokens if they were on different lines, and no rule was applied to put them on the same line
+                    trimTrailingWhitespacesForLines(previousStartLine, currentStartLine, previousItem);
+                }
+                return lineAction;
+            }
+            function insertIndentation(pos, indentation, lineAdded) {
+                var indentationString = getIndentationString(indentation, options);
+                if (lineAdded) {
+                    // new line is added before the token by the formatting rules
+                    // insert indentation string at the very beginning of the token
+                    recordReplace(pos, 0, indentationString);
+                }
+                else {
+                    var tokenStart = sourceFile.getLineAndCharacterOfPosition(pos);
+                    var startLinePosition = ts.getStartPositionOfLine(tokenStart.line, sourceFile);
+                    if (indentation !== characterToColumn(startLinePosition, tokenStart.character) || indentationIsDifferent(indentationString, startLinePosition)) {
+                        recordReplace(startLinePosition, tokenStart.character, indentationString);
+                    }
+                }
+            }
+            function characterToColumn(startLinePosition, characterInLine) {
+                var column = 0;
+                for (var i = 0; i < characterInLine; i++) {
+                    if (sourceFile.text.charCodeAt(startLinePosition + i) === 9 /* tab */) {
+                        column += options.tabSize - column % options.tabSize;
+                    }
+                    else {
+                        column++;
+                    }
+                }
+                return column;
+            }
+            function indentationIsDifferent(indentationString, startLinePosition) {
+                return indentationString !== sourceFile.text.substr(startLinePosition, indentationString.length);
+            }
+            function indentMultilineCommentOrJsxText(commentRange, indentation, firstLineIsIndented, indentFinalLine) {
+                if (indentFinalLine === void 0) { indentFinalLine = true; }
+                // split comment in lines
+                var startLine = sourceFile.getLineAndCharacterOfPosition(commentRange.pos).line;
+                var endLine = sourceFile.getLineAndCharacterOfPosition(commentRange.end).line;
+                if (startLine === endLine) {
+                    if (!firstLineIsIndented) {
+                        // treat as single line comment
+                        insertIndentation(commentRange.pos, indentation, /*lineAdded*/ false);
+                    }
+                    return;
+                }
+                var parts = [];
+                var startPos = commentRange.pos;
+                for (var line = startLine; line < endLine; line++) {
+                    var endOfLine = ts.getEndLinePosition(line, sourceFile);
+                    parts.push({ pos: startPos, end: endOfLine });
+                    startPos = ts.getStartPositionOfLine(line + 1, sourceFile);
+                }
+                if (indentFinalLine) {
+                    parts.push({ pos: startPos, end: commentRange.end });
+                }
+                if (parts.length === 0)
+                    return;
+                var startLinePos = ts.getStartPositionOfLine(startLine, sourceFile);
+                var nonWhitespaceColumnInFirstPart = formatting.SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(startLinePos, parts[0].pos, sourceFile, options);
+                if (indentation === nonWhitespaceColumnInFirstPart.column) {
+                    return;
+                }
+                var startIndex = 0;
+                if (firstLineIsIndented) {
+                    startIndex = 1;
+                    startLine++;
+                }
+                // shift all parts on the delta size
+                var delta = indentation - nonWhitespaceColumnInFirstPart.column;
+                for (var i = startIndex; i < parts.length; i++, startLine++) {
+                    var startLinePos_1 = ts.getStartPositionOfLine(startLine, sourceFile);
+                    var nonWhitespaceCharacterAndColumn = i === 0
+                        ? nonWhitespaceColumnInFirstPart
+                        : formatting.SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(parts[i].pos, parts[i].end, sourceFile, options);
+                    var newIndentation = nonWhitespaceCharacterAndColumn.column + delta;
+                    if (newIndentation > 0) {
+                        var indentationString = getIndentationString(newIndentation, options);
+                        recordReplace(startLinePos_1, nonWhitespaceCharacterAndColumn.character, indentationString);
+                    }
+                    else {
+                        recordDelete(startLinePos_1, nonWhitespaceCharacterAndColumn.character);
+                    }
+                }
+            }
+            function trimTrailingWhitespacesForLines(line1, line2, range) {
+                for (var line = line1; line < line2; line++) {
+                    var lineStartPosition = ts.getStartPositionOfLine(line, sourceFile);
+                    var lineEndPosition = ts.getEndLinePosition(line, sourceFile);
+                    // do not trim whitespaces in comments or template expression
+                    if (range && (ts.isComment(range.kind) || ts.isStringOrRegularExpressionOrTemplateLiteral(range.kind)) && range.pos <= lineEndPosition && range.end > lineEndPosition) {
+                        continue;
+                    }
+                    var whitespaceStart = getTrailingWhitespaceStartPosition(lineStartPosition, lineEndPosition);
+                    if (whitespaceStart !== -1) {
+                        ts.Debug.assert(whitespaceStart === lineStartPosition || !ts.isWhiteSpaceSingleLine(sourceFile.text.charCodeAt(whitespaceStart - 1)));
+                        recordDelete(whitespaceStart, lineEndPosition + 1 - whitespaceStart);
+                    }
+                }
+            }
+            /**
+             * @param start The position of the first character in range
+             * @param end The position of the last character in range
+             */
+            function getTrailingWhitespaceStartPosition(start, end) {
+                var pos = end;
+                while (pos >= start && ts.isWhiteSpaceSingleLine(sourceFile.text.charCodeAt(pos))) {
+                    pos--;
+                }
+                if (pos !== end) {
+                    return pos + 1;
+                }
+                return -1;
+            }
+            /**
+             * Trimming will be done for lines after the previous range
+             */
+            function trimTrailingWhitespacesForRemainingRange() {
+                var startPosition = previousRange ? previousRange.end : originalRange.pos;
+                var startLine = sourceFile.getLineAndCharacterOfPosition(startPosition).line;
+                var endLine = sourceFile.getLineAndCharacterOfPosition(originalRange.end).line;
+                trimTrailingWhitespacesForLines(startLine, endLine + 1, previousRange);
+            }
+            function recordDelete(start, len) {
+                if (len) {
+                    edits.push(ts.createTextChangeFromStartLength(start, len, ""));
+                }
+            }
+            function recordReplace(start, len, newText) {
+                if (len || newText) {
+                    edits.push(ts.createTextChangeFromStartLength(start, len, newText));
+                }
+            }
+            function applyRuleEdits(rule, previousRange, previousStartLine, currentRange, currentStartLine) {
+                var onLaterLine = currentStartLine !== previousStartLine;
+                switch (rule.action) {
+                    case 1 /* Ignore */:
+                        // no action required
+                        return 0 /* None */;
+                    case 8 /* Delete */:
+                        if (previousRange.end !== currentRange.pos) {
+                            // delete characters starting from t1.end up to t2.pos exclusive
+                            recordDelete(previousRange.end, currentRange.pos - previousRange.end);
+                            return onLaterLine ? 2 /* LineRemoved */ : 0 /* None */;
+                        }
+                        break;
+                    case 4 /* NewLine */:
+                        // exit early if we on different lines and rule cannot change number of newlines
+                        // if line1 and line2 are on subsequent lines then no edits are required - ok to exit
+                        // if line1 and line2 are separated with more than one newline - ok to exit since we cannot delete extra new lines
+                        if (rule.flags !== 1 /* CanDeleteNewLines */ && previousStartLine !== currentStartLine) {
+                            return 0 /* None */;
+                        }
+                        // edit should not be applied if we have one line feed between elements
+                        var lineDelta = currentStartLine - previousStartLine;
+                        if (lineDelta !== 1) {
+                            recordReplace(previousRange.end, currentRange.pos - previousRange.end, options.newLineCharacter);
+                            return onLaterLine ? 0 /* None */ : 1 /* LineAdded */;
+                        }
+                        break;
+                    case 2 /* Space */:
+                        // exit early if we on different lines and rule cannot change number of newlines
+                        if (rule.flags !== 1 /* CanDeleteNewLines */ && previousStartLine !== currentStartLine) {
+                            return 0 /* None */;
+                        }
+                        var posDelta = currentRange.pos - previousRange.end;
+                        if (posDelta !== 1 || sourceFile.text.charCodeAt(previousRange.end) !== 32 /* space */) {
+                            recordReplace(previousRange.end, currentRange.pos - previousRange.end, " ");
+                            return onLaterLine ? 2 /* LineRemoved */ : 0 /* None */;
+                        }
+                }
+                return 0 /* None */;
+            }
+        }
+        var LineAction;
+        (function (LineAction) {
+            LineAction[LineAction["None"] = 0] = "None";
+            LineAction[LineAction["LineAdded"] = 1] = "LineAdded";
+            LineAction[LineAction["LineRemoved"] = 2] = "LineRemoved";
+        })(LineAction || (LineAction = {}));
+        /**
+         * @param precedingToken pass `null` if preceding token was already computed and result was `undefined`.
+         */
+        function getRangeOfEnclosingComment(sourceFile, position, precedingToken, // tslint:disable-line:no-null-keyword
+        tokenAtPosition) {
+            if (tokenAtPosition === void 0) { tokenAtPosition = ts.getTokenAtPosition(sourceFile, position); }
+            var jsdoc = ts.findAncestor(tokenAtPosition, ts.isJSDoc);
+            if (jsdoc)
+                tokenAtPosition = jsdoc.parent;
+            var tokenStart = tokenAtPosition.getStart(sourceFile);
+            if (tokenStart <= position && position < tokenAtPosition.getEnd()) {
+                return undefined;
+            }
+            precedingToken = precedingToken === null ? undefined : precedingToken === undefined ? ts.findPrecedingToken(position, sourceFile) : precedingToken;
+            // Between two consecutive tokens, all comments are either trailing on the former
+            // or leading on the latter (and none are in both lists).
+            var trailingRangesOfPreviousToken = precedingToken && ts.getTrailingCommentRanges(sourceFile.text, precedingToken.end);
+            var leadingCommentRangesOfNextToken = ts.getLeadingCommentRangesOfNode(tokenAtPosition, sourceFile);
+            var commentRanges = ts.concatenate(trailingRangesOfPreviousToken, leadingCommentRangesOfNextToken);
+            return commentRanges && ts.find(commentRanges, function (range) { return ts.rangeContainsPositionExclusive(range, position) ||
+                // The end marker of a single-line comment does not include the newline character.
+                // With caret at `^`, in the following case, we are inside a comment (^ denotes the cursor position):
+                //
+                //    // asdf   ^\n
+                //
+                // But for closed multi-line comments, we don't want to be inside the comment in the following case:
+                //
+                //    /* asdf */^
+                //
+                // However, unterminated multi-line comments *do* contain their end.
+                //
+                // Internally, we represent the end of the comment at the newline and closing '/', respectively.
+                //
+                position === range.end && (range.kind === 2 /* SingleLineCommentTrivia */ || position === sourceFile.getFullWidth()); });
+        }
+        formatting.getRangeOfEnclosingComment = getRangeOfEnclosingComment;
+        function getOpenTokenForList(node, list) {
+            switch (node.kind) {
+                case 157 /* Constructor */:
+                case 239 /* FunctionDeclaration */:
+                case 196 /* FunctionExpression */:
+                case 156 /* MethodDeclaration */:
+                case 155 /* MethodSignature */:
+                case 197 /* ArrowFunction */:
+                    if (node.typeParameters === list) {
+                        return 28 /* LessThanToken */;
+                    }
+                    else if (node.parameters === list) {
+                        return 20 /* OpenParenToken */;
+                    }
+                    break;
+                case 191 /* CallExpression */:
+                case 192 /* NewExpression */:
+                    if (node.typeArguments === list) {
+                        return 28 /* LessThanToken */;
+                    }
+                    else if (node.arguments === list) {
+                        return 20 /* OpenParenToken */;
+                    }
+                    break;
+                case 164 /* TypeReference */:
+                    if (node.typeArguments === list) {
+                        return 28 /* LessThanToken */;
+                    }
+                    break;
+                case 168 /* TypeLiteral */:
+                    return 18 /* OpenBraceToken */;
+            }
+            return 0 /* Unknown */;
+        }
+        function getCloseTokenForOpenToken(kind) {
+            switch (kind) {
+                case 20 /* OpenParenToken */:
+                    return 21 /* CloseParenToken */;
+                case 28 /* LessThanToken */:
+                    return 30 /* GreaterThanToken */;
+                case 18 /* OpenBraceToken */:
+                    return 19 /* CloseBraceToken */;
+            }
+            return 0 /* Unknown */;
+        }
+        var internedSizes;
+        var internedTabsIndentation;
+        var internedSpacesIndentation;
+        function getIndentationString(indentation, options) {
+            // reset interned strings if FormatCodeOptions were changed
+            var resetInternedStrings = !internedSizes || (internedSizes.tabSize !== options.tabSize || internedSizes.indentSize !== options.indentSize);
+            if (resetInternedStrings) {
+                internedSizes = { tabSize: options.tabSize, indentSize: options.indentSize };
+                internedTabsIndentation = internedSpacesIndentation = undefined;
+            }
+            if (!options.convertTabsToSpaces) {
+                var tabs = Math.floor(indentation / options.tabSize);
+                var spaces = indentation - tabs * options.tabSize;
+                var tabString = void 0;
+                if (!internedTabsIndentation) {
+                    internedTabsIndentation = [];
+                }
+                if (internedTabsIndentation[tabs] === undefined) {
+                    internedTabsIndentation[tabs] = tabString = ts.repeatString("\t", tabs);
+                }
+                else {
+                    tabString = internedTabsIndentation[tabs];
+                }
+                return spaces ? tabString + ts.repeatString(" ", spaces) : tabString;
+            }
+            else {
+                var spacesString = void 0;
+                var quotient = Math.floor(indentation / options.indentSize);
+                var remainder = indentation % options.indentSize;
+                if (!internedSpacesIndentation) {
+                    internedSpacesIndentation = [];
+                }
+                if (internedSpacesIndentation[quotient] === undefined) {
+                    spacesString = ts.repeatString(" ", options.indentSize * quotient);
+                    internedSpacesIndentation[quotient] = spacesString;
+                }
+                else {
+                    spacesString = internedSpacesIndentation[quotient];
+                }
+                return remainder ? spacesString + ts.repeatString(" ", remainder) : spacesString;
+            }
+        }
+        formatting.getIndentationString = getIndentationString;
+    })(formatting = ts.formatting || (ts.formatting = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var formatting;
+    (function (formatting) {
+        var SmartIndenter;
+        (function (SmartIndenter) {
+            var Value;
+            (function (Value) {
+                Value[Value["Unknown"] = -1] = "Unknown";
+            })(Value || (Value = {}));
+            /**
+             * @param assumeNewLineBeforeCloseBrace
+             * `false` when called on text from a real source file.
+             * `true` when we need to assume `position` is on a newline.
+             *
+             * This is useful for codefixes. Consider
+             * ```
+             * function f() {
+             * |}
+             * ```
+             * with `position` at `|`.
+             *
+             * When inserting some text after an open brace, we would like to get indentation as if a newline was already there.
+             * By default indentation at `position` will be 0 so 'assumeNewLineBeforeCloseBrace' overrides this behavior.
+             */
+            function getIndentation(position, sourceFile, options, assumeNewLineBeforeCloseBrace) {
+                if (assumeNewLineBeforeCloseBrace === void 0) { assumeNewLineBeforeCloseBrace = false; }
+                if (position > sourceFile.text.length) {
+                    return getBaseIndentation(options); // past EOF
+                }
+                // no indentation when the indent style is set to none,
+                // so we can return fast
+                if (options.indentStyle === ts.IndentStyle.None) {
+                    return 0;
+                }
+                var precedingToken = ts.findPrecedingToken(position, sourceFile, /*startNode*/ undefined, /*excludeJsdoc*/ true);
+                var enclosingCommentRange = formatting.getRangeOfEnclosingComment(sourceFile, position, precedingToken || null); // tslint:disable-line:no-null-keyword
+                if (enclosingCommentRange && enclosingCommentRange.kind === 3 /* MultiLineCommentTrivia */) {
+                    return getCommentIndent(sourceFile, position, options, enclosingCommentRange);
+                }
+                if (!precedingToken) {
+                    return getBaseIndentation(options);
+                }
+                // no indentation in string \regex\template literals
+                var precedingTokenIsLiteral = ts.isStringOrRegularExpressionOrTemplateLiteral(precedingToken.kind);
+                if (precedingTokenIsLiteral && precedingToken.getStart(sourceFile) <= position && position < precedingToken.end) {
+                    return 0;
+                }
+                var lineAtPosition = sourceFile.getLineAndCharacterOfPosition(position).line;
+                // indentation is first non-whitespace character in a previous line
+                // for block indentation, we should look for a line which contains something that's not
+                // whitespace.
+                if (options.indentStyle === ts.IndentStyle.Block) {
+                    return getBlockIndent(sourceFile, position, options);
+                }
+                if (precedingToken.kind === 27 /* CommaToken */ && precedingToken.parent.kind !== 204 /* BinaryExpression */) {
+                    // previous token is comma that separates items in list - find the previous item and try to derive indentation from it
+                    var actualIndentation = getActualIndentationForListItemBeforeComma(precedingToken, sourceFile, options);
+                    if (actualIndentation !== -1 /* Unknown */) {
+                        return actualIndentation;
+                    }
+                }
+                var containerList = getListByPosition(position, precedingToken.parent, sourceFile);
+                // use list position if the preceding token is before any list items
+                if (containerList && !ts.rangeContainsRange(containerList, precedingToken)) {
+                    return getActualIndentationForListStartLine(containerList, sourceFile, options) + options.indentSize; // TODO: GH#18217
+                }
+                return getSmartIndent(sourceFile, position, precedingToken, lineAtPosition, assumeNewLineBeforeCloseBrace, options);
+            }
+            SmartIndenter.getIndentation = getIndentation;
+            function getCommentIndent(sourceFile, position, options, enclosingCommentRange) {
+                var previousLine = ts.getLineAndCharacterOfPosition(sourceFile, position).line - 1;
+                var commentStartLine = ts.getLineAndCharacterOfPosition(sourceFile, enclosingCommentRange.pos).line;
+                ts.Debug.assert(commentStartLine >= 0);
+                if (previousLine <= commentStartLine) {
+                    return findFirstNonWhitespaceColumn(ts.getStartPositionOfLine(commentStartLine, sourceFile), position, sourceFile, options);
+                }
+                var startPositionOfLine = ts.getStartPositionOfLine(previousLine, sourceFile);
+                var _a = findFirstNonWhitespaceCharacterAndColumn(startPositionOfLine, position, sourceFile, options), column = _a.column, character = _a.character;
+                if (column === 0) {
+                    return column;
+                }
+                var firstNonWhitespaceCharacterCode = sourceFile.text.charCodeAt(startPositionOfLine + character);
+                return firstNonWhitespaceCharacterCode === 42 /* asterisk */ ? column - 1 : column;
+            }
+            function getBlockIndent(sourceFile, position, options) {
+                // move backwards until we find a line with a non-whitespace character,
+                // then find the first non-whitespace character for that line.
+                var current = position;
+                while (current > 0) {
+                    var char = sourceFile.text.charCodeAt(current);
+                    if (!ts.isWhiteSpaceLike(char)) {
+                        break;
+                    }
+                    current--;
+                }
+                var lineStart = ts.getLineStartPositionForPosition(current, sourceFile);
+                return findFirstNonWhitespaceColumn(lineStart, current, sourceFile, options);
+            }
+            function getSmartIndent(sourceFile, position, precedingToken, lineAtPosition, assumeNewLineBeforeCloseBrace, options) {
+                // try to find node that can contribute to indentation and includes 'position' starting from 'precedingToken'
+                // if such node is found - compute initial indentation for 'position' inside this node
+                var previous;
+                var current = precedingToken;
+                while (current) {
+                    if (ts.positionBelongsToNode(current, position, sourceFile) && shouldIndentChildNode(options, current, previous, sourceFile, /*isNextChild*/ true)) {
+                        var currentStart = getStartLineAndCharacterForNode(current, sourceFile);
+                        var nextTokenKind = nextTokenIsCurlyBraceOnSameLineAsCursor(precedingToken, current, lineAtPosition, sourceFile);
+                        var indentationDelta = nextTokenKind !== 0 /* Unknown */
+                            // handle cases when codefix is about to be inserted before the close brace
+                            ? assumeNewLineBeforeCloseBrace && nextTokenKind === 2 /* CloseBrace */ ? options.indentSize : 0
+                            : lineAtPosition !== currentStart.line ? options.indentSize : 0;
+                        return getIndentationForNodeWorker(current, currentStart, /*ignoreActualIndentationRange*/ undefined, indentationDelta, sourceFile, /*isNextChild*/ true, options); // TODO: GH#18217
+                    }
+                    // check if current node is a list item - if yes, take indentation from it
+                    // do not consider parent-child line sharing yet:
+                    // function foo(a
+                    //    | preceding node 'a' does share line with its parent but indentation is expected
+                    var actualIndentation = getActualIndentationForListItem(current, sourceFile, options, /*listIndentsChild*/ true);
+                    if (actualIndentation !== -1 /* Unknown */) {
+                        return actualIndentation;
+                    }
+                    previous = current;
+                    current = current.parent;
+                }
+                // no parent was found - return the base indentation of the SourceFile
+                return getBaseIndentation(options);
+            }
+            function getIndentationForNode(n, ignoreActualIndentationRange, sourceFile, options) {
+                var start = sourceFile.getLineAndCharacterOfPosition(n.getStart(sourceFile));
+                return getIndentationForNodeWorker(n, start, ignoreActualIndentationRange, /*indentationDelta*/ 0, sourceFile, /*isNextChild*/ false, options);
+            }
+            SmartIndenter.getIndentationForNode = getIndentationForNode;
+            function getBaseIndentation(options) {
+                return options.baseIndentSize || 0;
+            }
+            SmartIndenter.getBaseIndentation = getBaseIndentation;
+            function getIndentationForNodeWorker(current, currentStart, ignoreActualIndentationRange, indentationDelta, sourceFile, isNextChild, options) {
+                var parent = current.parent;
+                // Walk up the tree and collect indentation for parent-child node pairs. Indentation is not added if
+                // * parent and child nodes start on the same line, or
+                // * parent is an IfStatement and child starts on the same line as an 'else clause'.
+                while (parent) {
+                    var useActualIndentation = true;
+                    if (ignoreActualIndentationRange) {
+                        var start = current.getStart(sourceFile);
+                        useActualIndentation = start < ignoreActualIndentationRange.pos || start > ignoreActualIndentationRange.end;
+                    }
+                    var containingListOrParentStart = getContainingListOrParentStart(parent, current, sourceFile);
+                    var parentAndChildShareLine = containingListOrParentStart.line === currentStart.line ||
+                        childStartsOnTheSameLineWithElseInIfStatement(parent, current, currentStart.line, sourceFile);
+                    if (useActualIndentation) {
+                        // check if current node is a list item - if yes, take indentation from it
+                        var actualIndentation = getActualIndentationForListItem(current, sourceFile, options, !parentAndChildShareLine);
+                        if (actualIndentation !== -1 /* Unknown */) {
+                            return actualIndentation + indentationDelta;
+                        }
+                        // try to fetch actual indentation for current node from source text
+                        actualIndentation = getActualIndentationForNode(current, parent, currentStart, parentAndChildShareLine, sourceFile, options);
+                        if (actualIndentation !== -1 /* Unknown */) {
+                            return actualIndentation + indentationDelta;
+                        }
+                    }
+                    // increase indentation if parent node wants its content to be indented and parent and child nodes don't start on the same line
+                    if (shouldIndentChildNode(options, parent, current, sourceFile, isNextChild) && !parentAndChildShareLine) {
+                        indentationDelta += options.indentSize;
+                    }
+                    // In our AST, a call argument's `parent` is the call-expression, not the argument list.
+                    // We would like to increase indentation based on the relationship between an argument and its argument-list,
+                    // so we spoof the starting position of the (parent) call-expression to match the (non-parent) argument-list.
+                    // But, the spoofed start-value could then cause a problem when comparing the start position of the call-expression
+                    // to *its* parent (in the case of an iife, an expression statement), adding an extra level of indentation.
+                    //
+                    // Instead, when at an argument, we unspoof the starting position of the enclosing call expression
+                    // *after* applying indentation for the argument.
+                    var useTrueStart = isArgumentAndStartLineOverlapsExpressionBeingCalled(parent, current, currentStart.line, sourceFile);
+                    current = parent;
+                    parent = current.parent;
+                    currentStart = useTrueStart ? sourceFile.getLineAndCharacterOfPosition(current.getStart(sourceFile)) : containingListOrParentStart;
+                }
+                return indentationDelta + getBaseIndentation(options);
+            }
+            function getContainingListOrParentStart(parent, child, sourceFile) {
+                var containingList = getContainingList(child, sourceFile);
+                var startPos = containingList ? containingList.pos : parent.getStart(sourceFile);
+                return sourceFile.getLineAndCharacterOfPosition(startPos);
+            }
+            /*
+             * Function returns Value.Unknown if indentation cannot be determined
+             */
+            function getActualIndentationForListItemBeforeComma(commaToken, sourceFile, options) {
+                // previous token is comma that separates items in list - find the previous item and try to derive indentation from it
+                var commaItemInfo = ts.findListItemInfo(commaToken);
+                if (commaItemInfo && commaItemInfo.listItemIndex > 0) {
+                    return deriveActualIndentationFromList(commaItemInfo.list.getChildren(), commaItemInfo.listItemIndex - 1, sourceFile, options);
+                }
+                else {
+                    // handle broken code gracefully
+                    return -1 /* Unknown */;
+                }
+            }
+            /*
+             * Function returns Value.Unknown if actual indentation for node should not be used (i.e because node is nested expression)
+             */
+            function getActualIndentationForNode(current, parent, currentLineAndChar, parentAndChildShareLine, sourceFile, options) {
+                // actual indentation is used for statements\declarations if one of cases below is true:
+                // - parent is SourceFile - by default immediate children of SourceFile are not indented except when user indents them manually
+                // - parent and child are not on the same line
+                var useActualIndentation = (ts.isDeclaration(current) || ts.isStatementButNotDeclaration(current)) &&
+                    (parent.kind === 279 /* SourceFile */ || !parentAndChildShareLine);
+                if (!useActualIndentation) {
+                    return -1 /* Unknown */;
+                }
+                return findColumnForFirstNonWhitespaceCharacterInLine(currentLineAndChar, sourceFile, options);
+            }
+            var NextTokenKind;
+            (function (NextTokenKind) {
+                NextTokenKind[NextTokenKind["Unknown"] = 0] = "Unknown";
+                NextTokenKind[NextTokenKind["OpenBrace"] = 1] = "OpenBrace";
+                NextTokenKind[NextTokenKind["CloseBrace"] = 2] = "CloseBrace";
+            })(NextTokenKind || (NextTokenKind = {}));
+            function nextTokenIsCurlyBraceOnSameLineAsCursor(precedingToken, current, lineAtPosition, sourceFile) {
+                var nextToken = ts.findNextToken(precedingToken, current, sourceFile);
+                if (!nextToken) {
+                    return 0 /* Unknown */;
+                }
+                if (nextToken.kind === 18 /* OpenBraceToken */) {
+                    // open braces are always indented at the parent level
+                    return 1 /* OpenBrace */;
+                }
+                else if (nextToken.kind === 19 /* CloseBraceToken */) {
+                    // close braces are indented at the parent level if they are located on the same line with cursor
+                    // this means that if new line will be added at $ position, this case will be indented
+                    // class A {
+                    //    $
+                    // }
+                    /// and this one - not
+                    // class A {
+                    // $}
+                    var nextTokenStartLine = getStartLineAndCharacterForNode(nextToken, sourceFile).line;
+                    return lineAtPosition === nextTokenStartLine ? 2 /* CloseBrace */ : 0 /* Unknown */;
+                }
+                return 0 /* Unknown */;
+            }
+            function getStartLineAndCharacterForNode(n, sourceFile) {
+                return sourceFile.getLineAndCharacterOfPosition(n.getStart(sourceFile));
+            }
+            function isArgumentAndStartLineOverlapsExpressionBeingCalled(parent, child, childStartLine, sourceFile) {
+                if (!(ts.isCallExpression(parent) && ts.contains(parent.arguments, child))) {
+                    return false;
+                }
+                var expressionOfCallExpressionEnd = parent.expression.getEnd();
+                var expressionOfCallExpressionEndLine = ts.getLineAndCharacterOfPosition(sourceFile, expressionOfCallExpressionEnd).line;
+                return expressionOfCallExpressionEndLine === childStartLine;
+            }
+            SmartIndenter.isArgumentAndStartLineOverlapsExpressionBeingCalled = isArgumentAndStartLineOverlapsExpressionBeingCalled;
+            function childStartsOnTheSameLineWithElseInIfStatement(parent, child, childStartLine, sourceFile) {
+                if (parent.kind === 222 /* IfStatement */ && parent.elseStatement === child) {
+                    var elseKeyword = ts.findChildOfKind(parent, 83 /* ElseKeyword */, sourceFile);
+                    ts.Debug.assert(elseKeyword !== undefined);
+                    var elseKeywordStartLine = getStartLineAndCharacterForNode(elseKeyword, sourceFile).line;
+                    return elseKeywordStartLine === childStartLine;
+                }
+                return false;
+            }
+            SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement = childStartsOnTheSameLineWithElseInIfStatement;
+            function getContainingList(node, sourceFile) {
+                return node.parent && getListByRange(node.getStart(sourceFile), node.getEnd(), node.parent, sourceFile);
+            }
+            SmartIndenter.getContainingList = getContainingList;
+            function getListByPosition(pos, node, sourceFile) {
+                return node && getListByRange(pos, pos, node, sourceFile);
+            }
+            function getListByRange(start, end, node, sourceFile) {
+                switch (node.kind) {
+                    case 164 /* TypeReference */:
+                        return getList(node.typeArguments);
+                    case 188 /* ObjectLiteralExpression */:
+                        return getList(node.properties);
+                    case 187 /* ArrayLiteralExpression */:
+                        return getList(node.elements);
+                    case 168 /* TypeLiteral */:
+                        return getList(node.members);
+                    case 239 /* FunctionDeclaration */:
+                    case 196 /* FunctionExpression */:
+                    case 197 /* ArrowFunction */:
+                    case 156 /* MethodDeclaration */:
+                    case 155 /* MethodSignature */:
+                    case 160 /* CallSignature */:
+                    case 157 /* Constructor */:
+                    case 166 /* ConstructorType */:
+                    case 161 /* ConstructSignature */:
+                        return getList(node.typeParameters) || getList(node.parameters);
+                    case 240 /* ClassDeclaration */:
+                    case 209 /* ClassExpression */:
+                    case 241 /* InterfaceDeclaration */:
+                    case 242 /* TypeAliasDeclaration */:
+                    case 303 /* JSDocTemplateTag */:
+                        return getList(node.typeParameters);
+                    case 192 /* NewExpression */:
+                    case 191 /* CallExpression */:
+                        return getList(node.typeArguments) || getList(node.arguments);
+                    case 238 /* VariableDeclarationList */:
+                        return getList(node.declarations);
+                    case 252 /* NamedImports */:
+                    case 256 /* NamedExports */:
+                        return getList(node.elements);
+                    case 184 /* ObjectBindingPattern */:
+                    case 185 /* ArrayBindingPattern */:
+                        return getList(node.elements);
+                }
+                function getList(list) {
+                    return list && ts.rangeContainsStartEnd(getVisualListRange(node, list, sourceFile), start, end) ? list : undefined;
+                }
+            }
+            function getVisualListRange(node, list, sourceFile) {
+                var children = node.getChildren(sourceFile);
+                for (var i = 1; i < children.length - 1; i++) {
+                    if (children[i].pos === list.pos && children[i].end === list.end) {
+                        return { pos: children[i - 1].end, end: children[i + 1].getStart(sourceFile) };
+                    }
+                }
+                return list;
+            }
+            function getActualIndentationForListStartLine(list, sourceFile, options) {
+                if (!list) {
+                    return -1 /* Unknown */;
+                }
+                return findColumnForFirstNonWhitespaceCharacterInLine(sourceFile.getLineAndCharacterOfPosition(list.pos), sourceFile, options);
+            }
+            function getActualIndentationForListItem(node, sourceFile, options, listIndentsChild) {
+                if (node.parent && node.parent.kind === 238 /* VariableDeclarationList */) {
+                    // VariableDeclarationList has no wrapping tokens
+                    return -1 /* Unknown */;
+                }
+                var containingList = getContainingList(node, sourceFile);
+                if (containingList) {
+                    var index = containingList.indexOf(node);
+                    if (index !== -1) {
+                        var result = deriveActualIndentationFromList(containingList, index, sourceFile, options);
+                        if (result !== -1 /* Unknown */) {
+                            return result;
+                        }
+                    }
+                    return getActualIndentationForListStartLine(containingList, sourceFile, options) + (listIndentsChild ? options.indentSize : 0); // TODO: GH#18217
+                }
+                return -1 /* Unknown */;
+            }
+            function deriveActualIndentationFromList(list, index, sourceFile, options) {
+                ts.Debug.assert(index >= 0 && index < list.length);
+                var node = list[index];
+                // walk toward the start of the list starting from current node and check if the line is the same for all items.
+                // if end line for item [i - 1] differs from the start line for item [i] - find column of the first non-whitespace character on the line of item [i]
+                var lineAndCharacter = getStartLineAndCharacterForNode(node, sourceFile);
+                for (var i = index - 1; i >= 0; i--) {
+                    if (list[i].kind === 27 /* CommaToken */) {
+                        continue;
+                    }
+                    // skip list items that ends on the same line with the current list element
+                    var prevEndLine = sourceFile.getLineAndCharacterOfPosition(list[i].end).line;
+                    if (prevEndLine !== lineAndCharacter.line) {
+                        return findColumnForFirstNonWhitespaceCharacterInLine(lineAndCharacter, sourceFile, options);
+                    }
+                    lineAndCharacter = getStartLineAndCharacterForNode(list[i], sourceFile);
+                }
+                return -1 /* Unknown */;
+            }
+            function findColumnForFirstNonWhitespaceCharacterInLine(lineAndCharacter, sourceFile, options) {
+                var lineStart = sourceFile.getPositionOfLineAndCharacter(lineAndCharacter.line, 0);
+                return findFirstNonWhitespaceColumn(lineStart, lineStart + lineAndCharacter.character, sourceFile, options);
+            }
+            /**
+             * Character is the actual index of the character since the beginning of the line.
+             * Column - position of the character after expanding tabs to spaces.
+             * "0\t2$"
+             * value of 'character' for '$' is 3
+             * value of 'column' for '$' is 6 (assuming that tab size is 4)
+             */
+            function findFirstNonWhitespaceCharacterAndColumn(startPos, endPos, sourceFile, options) {
+                var character = 0;
+                var column = 0;
+                for (var pos = startPos; pos < endPos; pos++) {
+                    var ch = sourceFile.text.charCodeAt(pos);
+                    if (!ts.isWhiteSpaceSingleLine(ch)) {
+                        break;
+                    }
+                    if (ch === 9 /* tab */) {
+                        column += options.tabSize + (column % options.tabSize);
+                    }
+                    else {
+                        column++;
+                    }
+                    character++;
+                }
+                return { column: column, character: character };
+            }
+            SmartIndenter.findFirstNonWhitespaceCharacterAndColumn = findFirstNonWhitespaceCharacterAndColumn;
+            function findFirstNonWhitespaceColumn(startPos, endPos, sourceFile, options) {
+                return findFirstNonWhitespaceCharacterAndColumn(startPos, endPos, sourceFile, options).column;
+            }
+            SmartIndenter.findFirstNonWhitespaceColumn = findFirstNonWhitespaceColumn;
+            function nodeWillIndentChild(settings, parent, child, sourceFile, indentByDefault) {
+                var childKind = child ? child.kind : 0 /* Unknown */;
+                switch (parent.kind) {
+                    case 221 /* ExpressionStatement */:
+                    case 240 /* ClassDeclaration */:
+                    case 209 /* ClassExpression */:
+                    case 241 /* InterfaceDeclaration */:
+                    case 243 /* EnumDeclaration */:
+                    case 242 /* TypeAliasDeclaration */:
+                    case 187 /* ArrayLiteralExpression */:
+                    case 218 /* Block */:
+                    case 245 /* ModuleBlock */:
+                    case 188 /* ObjectLiteralExpression */:
+                    case 168 /* TypeLiteral */:
+                    case 181 /* MappedType */:
+                    case 170 /* TupleType */:
+                    case 246 /* CaseBlock */:
+                    case 272 /* DefaultClause */:
+                    case 271 /* CaseClause */:
+                    case 195 /* ParenthesizedExpression */:
+                    case 189 /* PropertyAccessExpression */:
+                    case 191 /* CallExpression */:
+                    case 192 /* NewExpression */:
+                    case 219 /* VariableStatement */:
+                    case 254 /* ExportAssignment */:
+                    case 230 /* ReturnStatement */:
+                    case 205 /* ConditionalExpression */:
+                    case 185 /* ArrayBindingPattern */:
+                    case 184 /* ObjectBindingPattern */:
+                    case 262 /* JsxOpeningElement */:
+                    case 265 /* JsxOpeningFragment */:
+                    case 261 /* JsxSelfClosingElement */:
+                    case 270 /* JsxExpression */:
+                    case 155 /* MethodSignature */:
+                    case 160 /* CallSignature */:
+                    case 161 /* ConstructSignature */:
+                    case 151 /* Parameter */:
+                    case 165 /* FunctionType */:
+                    case 166 /* ConstructorType */:
+                    case 177 /* ParenthesizedType */:
+                    case 193 /* TaggedTemplateExpression */:
+                    case 201 /* AwaitExpression */:
+                    case 256 /* NamedExports */:
+                    case 252 /* NamedImports */:
+                    case 257 /* ExportSpecifier */:
+                    case 253 /* ImportSpecifier */:
+                    case 154 /* PropertyDeclaration */:
+                        return true;
+                    case 237 /* VariableDeclaration */:
+                    case 275 /* PropertyAssignment */:
+                        if (!settings.indentMultiLineObjectLiteralBeginningOnBlankLine && sourceFile && childKind === 188 /* ObjectLiteralExpression */) { // TODO: GH#18217
+                            return rangeIsOnOneLine(sourceFile, child);
+                        }
+                        return true;
+                    case 223 /* DoStatement */:
+                    case 224 /* WhileStatement */:
+                    case 226 /* ForInStatement */:
+                    case 227 /* ForOfStatement */:
+                    case 225 /* ForStatement */:
+                    case 222 /* IfStatement */:
+                    case 239 /* FunctionDeclaration */:
+                    case 196 /* FunctionExpression */:
+                    case 156 /* MethodDeclaration */:
+                    case 197 /* ArrowFunction */:
+                    case 157 /* Constructor */:
+                    case 158 /* GetAccessor */:
+                    case 159 /* SetAccessor */:
+                        return childKind !== 218 /* Block */;
+                    case 255 /* ExportDeclaration */:
+                        return childKind !== 256 /* NamedExports */;
+                    case 249 /* ImportDeclaration */:
+                        return childKind !== 250 /* ImportClause */ ||
+                            (!!child.namedBindings && child.namedBindings.kind !== 252 /* NamedImports */);
+                    case 260 /* JsxElement */:
+                        return childKind !== 263 /* JsxClosingElement */;
+                    case 264 /* JsxFragment */:
+                        return childKind !== 266 /* JsxClosingFragment */;
+                    case 174 /* IntersectionType */:
+                    case 173 /* UnionType */:
+                        if (childKind === 168 /* TypeLiteral */) {
+                            return false;
+                        }
+                    // falls through
+                }
+                // No explicit rule for given nodes so the result will follow the default value argument
+                return indentByDefault;
+            }
+            SmartIndenter.nodeWillIndentChild = nodeWillIndentChild;
+            function isControlFlowEndingStatement(kind, parent) {
+                switch (kind) {
+                    case 230 /* ReturnStatement */:
+                    case 234 /* ThrowStatement */:
+                    case 228 /* ContinueStatement */:
+                    case 229 /* BreakStatement */:
+                        return parent.kind !== 218 /* Block */;
+                    default:
+                        return false;
+                }
+            }
+            /**
+             * True when the parent node should indent the given child by an explicit rule.
+             * @param isNextChild If true, we are judging indent of a hypothetical child *after* this one, not the current child.
+             */
+            function shouldIndentChildNode(settings, parent, child, sourceFile, isNextChild) {
+                if (isNextChild === void 0) { isNextChild = false; }
+                return nodeWillIndentChild(settings, parent, child, sourceFile, /*indentByDefault*/ false)
+                    && !(isNextChild && child && isControlFlowEndingStatement(child.kind, parent));
+            }
+            SmartIndenter.shouldIndentChildNode = shouldIndentChildNode;
+            function rangeIsOnOneLine(sourceFile, range) {
+                var rangeStart = ts.skipTrivia(sourceFile.text, range.pos);
+                var startLine = sourceFile.getLineAndCharacterOfPosition(rangeStart).line;
+                var endLine = sourceFile.getLineAndCharacterOfPosition(range.end).line;
+                return startLine === endLine;
+            }
+        })(SmartIndenter = formatting.SmartIndenter || (formatting.SmartIndenter = {}));
+    })(formatting = ts.formatting || (ts.formatting = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var textChanges;
+    (function (textChanges_3) {
+        /**
+         * Currently for simplicity we store recovered positions on the node itself.
+         * It can be changed to side-table later if we decide that current design is too invasive.
+         */
+        function getPos(n) {
+            var result = n.__pos;
+            ts.Debug.assert(typeof result === "number");
+            return result;
+        }
+        function setPos(n, pos) {
+            ts.Debug.assert(typeof pos === "number");
+            n.__pos = pos;
+        }
+        function getEnd(n) {
+            var result = n.__end;
+            ts.Debug.assert(typeof result === "number");
+            return result;
+        }
+        function setEnd(n, end) {
+            ts.Debug.assert(typeof end === "number");
+            n.__end = end;
+        }
+        var Position;
+        (function (Position) {
+            Position[Position["FullStart"] = 0] = "FullStart";
+            Position[Position["Start"] = 1] = "Start";
+        })(Position = textChanges_3.Position || (textChanges_3.Position = {}));
+        function skipWhitespacesAndLineBreaks(text, start) {
+            return ts.skipTrivia(text, start, /*stopAfterLineBreak*/ false, /*stopAtComments*/ true);
+        }
+        function hasCommentsBeforeLineBreak(text, start) {
+            var i = start;
+            while (i < text.length) {
+                var ch = text.charCodeAt(i);
+                if (ts.isWhiteSpaceSingleLine(ch)) {
+                    i++;
+                    continue;
+                }
+                return ch === 47 /* slash */;
+            }
+            return false;
+        }
+        textChanges_3.useNonAdjustedPositions = {
+            useNonAdjustedStartPosition: true,
+            useNonAdjustedEndPosition: true,
+        };
+        var ChangeKind;
+        (function (ChangeKind) {
+            ChangeKind[ChangeKind["Remove"] = 0] = "Remove";
+            ChangeKind[ChangeKind["ReplaceWithSingleNode"] = 1] = "ReplaceWithSingleNode";
+            ChangeKind[ChangeKind["ReplaceWithMultipleNodes"] = 2] = "ReplaceWithMultipleNodes";
+            ChangeKind[ChangeKind["Text"] = 3] = "Text";
+        })(ChangeKind || (ChangeKind = {}));
+        function getAdjustedRange(sourceFile, startNode, endNode, options) {
+            return { pos: getAdjustedStartPosition(sourceFile, startNode, options, Position.Start), end: getAdjustedEndPosition(sourceFile, endNode, options) };
+        }
+        function getAdjustedStartPosition(sourceFile, node, options, position) {
+            if (options.useNonAdjustedStartPosition) {
+                return node.getStart(sourceFile);
+            }
+            var fullStart = node.getFullStart();
+            var start = node.getStart(sourceFile);
+            if (fullStart === start) {
+                return start;
+            }
+            var fullStartLine = ts.getLineStartPositionForPosition(fullStart, sourceFile);
+            var startLine = ts.getLineStartPositionForPosition(start, sourceFile);
+            if (startLine === fullStartLine) {
+                // full start and start of the node are on the same line
+                //   a,     b;
+                //    ^     ^
+                //    |   start
+                // fullstart
+                // when b is replaced - we usually want to keep the leading trvia
+                // when b is deleted - we delete it
+                return position === Position.Start ? start : fullStart;
+            }
+            // get start position of the line following the line that contains fullstart position
+            // (but only if the fullstart isn't the very beginning of the file)
+            var nextLineStart = fullStart > 0 ? 1 : 0;
+            var adjustedStartPosition = ts.getStartPositionOfLine(ts.getLineOfLocalPosition(sourceFile, fullStartLine) + nextLineStart, sourceFile);
+            // skip whitespaces/newlines
+            adjustedStartPosition = skipWhitespacesAndLineBreaks(sourceFile.text, adjustedStartPosition);
+            return ts.getStartPositionOfLine(ts.getLineOfLocalPosition(sourceFile, adjustedStartPosition), sourceFile);
+        }
+        function getAdjustedEndPosition(sourceFile, node, options) {
+            var end = node.end;
+            if (options.useNonAdjustedEndPosition || ts.isExpression(node)) {
+                return end;
+            }
+            var newEnd = ts.skipTrivia(sourceFile.text, end, /*stopAfterLineBreak*/ true);
+            return newEnd !== end && ts.isLineBreak(sourceFile.text.charCodeAt(newEnd - 1))
+                ? newEnd
+                : end;
+        }
+        /**
+         * Checks if 'candidate' argument is a legal separator in the list that contains 'node' as an element
+         */
+        function isSeparator(node, candidate) {
+            return !!candidate && !!node.parent && (candidate.kind === 27 /* CommaToken */ || (candidate.kind === 26 /* SemicolonToken */ && node.parent.kind === 188 /* ObjectLiteralExpression */));
+        }
+        function spaces(count) {
+            var s = "";
+            for (var i = 0; i < count; i++) {
+                s += " ";
+            }
+            return s;
+        }
+        var ChangeTracker = /** @class */ (function () {
+            /** Public for tests only. Other callers should use `ChangeTracker.with`. */
+            function ChangeTracker(newLineCharacter, formatContext) {
+                this.newLineCharacter = newLineCharacter;
+                this.formatContext = formatContext;
+                this.changes = [];
+                this.newFiles = [];
+                this.classesWithNodesInsertedAtStart = ts.createMap(); // Set<ClassDeclaration> implemented as Map<node id, ClassDeclaration>
+                this.deletedNodes = [];
+            }
+            ChangeTracker.fromContext = function (context) {
+                return new ChangeTracker(ts.getNewLineOrDefaultFromHost(context.host, context.formatContext.options), context.formatContext);
+            };
+            ChangeTracker.with = function (context, cb) {
+                var tracker = ChangeTracker.fromContext(context);
+                cb(tracker);
+                return tracker.getChanges();
+            };
+            ChangeTracker.prototype.deleteRange = function (sourceFile, range) {
+                this.changes.push({ kind: ChangeKind.Remove, sourceFile: sourceFile, range: range });
+            };
+            ChangeTracker.prototype.delete = function (sourceFile, node) {
+                this.deletedNodes.push({ sourceFile: sourceFile, node: node });
+            };
+            ChangeTracker.prototype.deleteModifier = function (sourceFile, modifier) {
+                this.deleteRange(sourceFile, { pos: modifier.getStart(sourceFile), end: ts.skipTrivia(sourceFile.text, modifier.end, /*stopAfterLineBreak*/ true) });
+            };
+            ChangeTracker.prototype.deleteNodeRange = function (sourceFile, startNode, endNode, options) {
+                if (options === void 0) { options = {}; }
+                var startPosition = getAdjustedStartPosition(sourceFile, startNode, options, Position.FullStart);
+                var endPosition = getAdjustedEndPosition(sourceFile, endNode, options);
+                this.deleteRange(sourceFile, { pos: startPosition, end: endPosition });
+            };
+            ChangeTracker.prototype.deleteNodeRangeExcludingEnd = function (sourceFile, startNode, afterEndNode, options) {
+                if (options === void 0) { options = {}; }
+                var startPosition = getAdjustedStartPosition(sourceFile, startNode, options, Position.FullStart);
+                var endPosition = afterEndNode === undefined ? sourceFile.text.length : getAdjustedStartPosition(sourceFile, afterEndNode, options, Position.FullStart);
+                this.deleteRange(sourceFile, { pos: startPosition, end: endPosition });
+            };
+            ChangeTracker.prototype.replaceRange = function (sourceFile, range, newNode, options) {
+                if (options === void 0) { options = {}; }
+                this.changes.push({ kind: ChangeKind.ReplaceWithSingleNode, sourceFile: sourceFile, range: range, options: options, node: newNode });
+            };
+            ChangeTracker.prototype.replaceNode = function (sourceFile, oldNode, newNode, options) {
+                if (options === void 0) { options = textChanges_3.useNonAdjustedPositions; }
+                this.replaceRange(sourceFile, getAdjustedRange(sourceFile, oldNode, oldNode, options), newNode, options);
+            };
+            ChangeTracker.prototype.replaceNodeRange = function (sourceFile, startNode, endNode, newNode, options) {
+                if (options === void 0) { options = textChanges_3.useNonAdjustedPositions; }
+                this.replaceRange(sourceFile, getAdjustedRange(sourceFile, startNode, endNode, options), newNode, options);
+            };
+            ChangeTracker.prototype.replaceRangeWithNodes = function (sourceFile, range, newNodes, options) {
+                if (options === void 0) { options = {}; }
+                this.changes.push({ kind: ChangeKind.ReplaceWithMultipleNodes, sourceFile: sourceFile, range: range, options: options, nodes: newNodes });
+            };
+            ChangeTracker.prototype.replaceNodeWithNodes = function (sourceFile, oldNode, newNodes, options) {
+                if (options === void 0) { options = textChanges_3.useNonAdjustedPositions; }
+                this.replaceRangeWithNodes(sourceFile, getAdjustedRange(sourceFile, oldNode, oldNode, options), newNodes, options);
+            };
+            ChangeTracker.prototype.replaceNodeWithText = function (sourceFile, oldNode, text) {
+                this.replaceRangeWithText(sourceFile, getAdjustedRange(sourceFile, oldNode, oldNode, textChanges_3.useNonAdjustedPositions), text);
+            };
+            ChangeTracker.prototype.replaceNodeRangeWithNodes = function (sourceFile, startNode, endNode, newNodes, options) {
+                if (options === void 0) { options = textChanges_3.useNonAdjustedPositions; }
+                this.replaceRangeWithNodes(sourceFile, getAdjustedRange(sourceFile, startNode, endNode, options), newNodes, options);
+            };
+            ChangeTracker.prototype.nextCommaToken = function (sourceFile, node) {
+                var next = ts.findNextToken(node, node.parent, sourceFile);
+                return next && next.kind === 27 /* CommaToken */ ? next : undefined;
+            };
+            ChangeTracker.prototype.replacePropertyAssignment = function (sourceFile, oldNode, newNode) {
+                var suffix = this.nextCommaToken(sourceFile, oldNode) ? "" : ("," + this.newLineCharacter);
+                this.replaceNode(sourceFile, oldNode, newNode, { suffix: suffix });
+            };
+            ChangeTracker.prototype.insertNodeAt = function (sourceFile, pos, newNode, options) {
+                if (options === void 0) { options = {}; }
+                this.replaceRange(sourceFile, ts.createRange(pos), newNode, options);
+            };
+            ChangeTracker.prototype.insertNodesAt = function (sourceFile, pos, newNodes, options) {
+                if (options === void 0) { options = {}; }
+                this.replaceRangeWithNodes(sourceFile, ts.createRange(pos), newNodes, options);
+            };
+            ChangeTracker.prototype.insertNodeAtTopOfFile = function (sourceFile, newNode, blankLineBetween) {
+                var pos = getInsertionPositionAtSourceFileTop(sourceFile);
+                this.insertNodeAt(sourceFile, pos, newNode, {
+                    prefix: pos === 0 ? undefined : this.newLineCharacter,
+                    suffix: (ts.isLineBreak(sourceFile.text.charCodeAt(pos)) ? "" : this.newLineCharacter) + (blankLineBetween ? this.newLineCharacter : ""),
+                });
+            };
+            ChangeTracker.prototype.insertNodeBefore = function (sourceFile, before, newNode, blankLineBetween) {
+                if (blankLineBetween === void 0) { blankLineBetween = false; }
+                this.insertNodeAt(sourceFile, getAdjustedStartPosition(sourceFile, before, {}, Position.Start), newNode, this.getOptionsForInsertNodeBefore(before, blankLineBetween));
+            };
+            ChangeTracker.prototype.insertModifierBefore = function (sourceFile, modifier, before) {
+                var pos = before.getStart(sourceFile);
+                this.insertNodeAt(sourceFile, pos, ts.createToken(modifier), { suffix: " " });
+            };
+            ChangeTracker.prototype.insertLastModifierBefore = function (sourceFile, modifier, before) {
+                if (!before.modifiers) {
+                    this.insertModifierBefore(sourceFile, modifier, before);
+                    return;
+                }
+                var pos = before.modifiers.end;
+                this.insertNodeAt(sourceFile, pos, ts.createToken(modifier), { prefix: " " });
+            };
+            ChangeTracker.prototype.insertCommentBeforeLine = function (sourceFile, lineNumber, position, commentText) {
+                var lineStartPosition = ts.getStartPositionOfLine(lineNumber, sourceFile);
+                var startPosition = ts.getFirstNonSpaceCharacterPosition(sourceFile.text, lineStartPosition);
+                // First try to see if we can put the comment on the previous line.
+                // We need to make sure that we are not in the middle of a string literal or a comment.
+                // If so, we do not want to separate the node from its comment if we can.
+                // Otherwise, add an extra new line immediately before the error span.
+                var insertAtLineStart = isValidLocationToAddComment(sourceFile, startPosition);
+                var token = ts.getTouchingToken(sourceFile, insertAtLineStart ? startPosition : position);
+                var indent = sourceFile.text.slice(lineStartPosition, startPosition);
+                var text = (insertAtLineStart ? "" : this.newLineCharacter) + "//" + commentText + this.newLineCharacter + indent;
+                this.insertText(sourceFile, token.getStart(sourceFile), text);
+            };
+            ChangeTracker.prototype.insertJsdocCommentBefore = function (sourceFile, node, tag) {
+                var fnStart = node.getStart(sourceFile);
+                if (node.jsDoc) {
+                    for (var _i = 0, _a = node.jsDoc; _i < _a.length; _i++) {
+                        var jsdoc = _a[_i];
+                        this.deleteRange(sourceFile, {
+                            pos: ts.getLineStartPositionForPosition(jsdoc.getStart(sourceFile), sourceFile),
+                            end: getAdjustedEndPosition(sourceFile, jsdoc, /*options*/ {})
+                        });
+                    }
+                }
+                var startPosition = ts.getPrecedingNonSpaceCharacterPosition(sourceFile.text, fnStart - 1);
+                var indent = sourceFile.text.slice(startPosition, fnStart);
+                this.insertNodeAt(sourceFile, fnStart, tag, { preserveLeadingWhitespace: false, suffix: this.newLineCharacter + indent });
+            };
+            ChangeTracker.prototype.replaceRangeWithText = function (sourceFile, range, text) {
+                this.changes.push({ kind: ChangeKind.Text, sourceFile: sourceFile, range: range, text: text });
+            };
+            ChangeTracker.prototype.insertText = function (sourceFile, pos, text) {
+                this.replaceRangeWithText(sourceFile, ts.createRange(pos), text);
+            };
+            /** Prefer this over replacing a node with another that has a type annotation, as it avoids reformatting the other parts of the node. */
+            ChangeTracker.prototype.tryInsertTypeAnnotation = function (sourceFile, node, type) {
+                var endNode;
+                if (ts.isFunctionLike(node)) {
+                    endNode = ts.findChildOfKind(node, 21 /* CloseParenToken */, sourceFile);
+                    if (!endNode) {
+                        if (!ts.isArrowFunction(node))
+                            return; // Function missing parentheses, give up
+                        // If no `)`, is an arrow function `x => x`, so use the end of the first parameter
+                        endNode = ts.first(node.parameters);
+                    }
+                }
+                else {
+                    endNode = node.kind !== 237 /* VariableDeclaration */ && node.questionToken ? node.questionToken : node.name;
+                }
+                this.insertNodeAt(sourceFile, endNode.end, type, { prefix: ": " });
+            };
+            ChangeTracker.prototype.insertTypeParameters = function (sourceFile, node, typeParameters) {
+                // If no `(`, is an arrow function `x => x`, so use the pos of the first parameter
+                var start = (ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile) || ts.first(node.parameters)).getStart(sourceFile);
+                this.insertNodesAt(sourceFile, start, typeParameters, { prefix: "<", suffix: ">" });
+            };
+            ChangeTracker.prototype.getOptionsForInsertNodeBefore = function (before, doubleNewlines) {
+                if (ts.isStatement(before) || ts.isClassElement(before)) {
+                    return { suffix: doubleNewlines ? this.newLineCharacter + this.newLineCharacter : this.newLineCharacter };
+                }
+                else if (ts.isVariableDeclaration(before)) { // insert `x = 1, ` into `const x = 1, y = 2;
+                    return { suffix: ", " };
+                }
+                else if (ts.isParameter(before)) {
+                    return {};
+                }
+                else if (ts.isStringLiteral(before) && ts.isImportDeclaration(before.parent) || ts.isNamedImports(before)) {
+                    return { suffix: ", " };
+                }
+                return ts.Debug.failBadSyntaxKind(before); // We haven't handled this kind of node yet -- add it
+            };
+            ChangeTracker.prototype.insertNodeAtConstructorStart = function (sourceFile, ctr, newStatement) {
+                var firstStatement = ts.firstOrUndefined(ctr.body.statements);
+                if (!firstStatement || !ctr.body.multiLine) {
+                    this.replaceConstructorBody(sourceFile, ctr, [newStatement].concat(ctr.body.statements));
+                }
+                else {
+                    this.insertNodeBefore(sourceFile, firstStatement, newStatement);
+                }
+            };
+            ChangeTracker.prototype.insertNodeAtConstructorEnd = function (sourceFile, ctr, newStatement) {
+                var lastStatement = ts.lastOrUndefined(ctr.body.statements);
+                if (!lastStatement || !ctr.body.multiLine) {
+                    this.replaceConstructorBody(sourceFile, ctr, ctr.body.statements.concat([newStatement]));
+                }
+                else {
+                    this.insertNodeAfter(sourceFile, lastStatement, newStatement);
+                }
+            };
+            ChangeTracker.prototype.replaceConstructorBody = function (sourceFile, ctr, statements) {
+                this.replaceNode(sourceFile, ctr.body, ts.createBlock(statements, /*multiLine*/ true));
+            };
+            ChangeTracker.prototype.insertNodeAtEndOfScope = function (sourceFile, scope, newNode) {
+                var pos = getAdjustedStartPosition(sourceFile, scope.getLastToken(), {}, Position.Start);
+                this.insertNodeAt(sourceFile, pos, newNode, {
+                    prefix: ts.isLineBreak(sourceFile.text.charCodeAt(scope.getLastToken().pos)) ? this.newLineCharacter : this.newLineCharacter + this.newLineCharacter,
+                    suffix: this.newLineCharacter
+                });
+            };
+            ChangeTracker.prototype.insertNodeAtClassStart = function (sourceFile, cls, newElement) {
+                this.insertNodeAtStartWorker(sourceFile, cls, newElement);
+            };
+            ChangeTracker.prototype.insertNodeAtObjectStart = function (sourceFile, obj, newElement) {
+                this.insertNodeAtStartWorker(sourceFile, obj, newElement);
+            };
+            ChangeTracker.prototype.insertNodeAtStartWorker = function (sourceFile, cls, newElement) {
+                var clsStart = cls.getStart(sourceFile);
+                var indentation = ts.formatting.SmartIndenter.findFirstNonWhitespaceColumn(ts.getLineStartPositionForPosition(clsStart, sourceFile), clsStart, sourceFile, this.formatContext.options)
+                    + this.formatContext.options.indentSize;
+                this.insertNodeAt(sourceFile, getMembersOrProperties(cls).pos, newElement, __assign({ indentation: indentation }, this.getInsertNodeAtStartPrefixSuffix(sourceFile, cls)));
+            };
+            ChangeTracker.prototype.getInsertNodeAtStartPrefixSuffix = function (sourceFile, cls) {
+                var comma = ts.isObjectLiteralExpression(cls) ? "," : "";
+                if (getMembersOrProperties(cls).length === 0) {
+                    if (ts.addToSeen(this.classesWithNodesInsertedAtStart, ts.getNodeId(cls), { node: cls, sourceFile: sourceFile })) {
+                        // For `class C {\n}`, don't add the trailing "\n"
+                        var shouldSuffix = ts.positionsAreOnSameLine.apply(void 0, getClassOrObjectBraceEnds(cls, sourceFile).concat([sourceFile])); // TODO: GH#4130 remove 'as any'
+                        return { prefix: this.newLineCharacter, suffix: comma + (shouldSuffix ? this.newLineCharacter : "") };
+                    }
+                    else {
+                        return { prefix: "", suffix: comma + this.newLineCharacter };
+                    }
+                }
+                else {
+                    return { prefix: this.newLineCharacter, suffix: comma };
+                }
+            };
+            ChangeTracker.prototype.insertNodeAfterComma = function (sourceFile, after, newNode) {
+                var endPosition = this.insertNodeAfterWorker(sourceFile, this.nextCommaToken(sourceFile, after) || after, newNode);
+                this.insertNodeAt(sourceFile, endPosition, newNode, this.getInsertNodeAfterOptions(sourceFile, after));
+            };
+            ChangeTracker.prototype.insertNodeAfter = function (sourceFile, after, newNode) {
+                var endPosition = this.insertNodeAfterWorker(sourceFile, after, newNode);
+                this.insertNodeAt(sourceFile, endPosition, newNode, this.getInsertNodeAfterOptions(sourceFile, after));
+            };
+            ChangeTracker.prototype.insertNodeAtEndOfList = function (sourceFile, list, newNode) {
+                this.insertNodeAt(sourceFile, list.end, newNode, { prefix: ", " });
+            };
+            ChangeTracker.prototype.insertNodesAfter = function (sourceFile, after, newNodes) {
+                var endPosition = this.insertNodeAfterWorker(sourceFile, after, ts.first(newNodes));
+                this.insertNodesAt(sourceFile, endPosition, newNodes, this.getInsertNodeAfterOptions(sourceFile, after));
+            };
+            ChangeTracker.prototype.insertNodeAfterWorker = function (sourceFile, after, newNode) {
+                if (needSemicolonBetween(after, newNode)) {
+                    // check if previous statement ends with semicolon
+                    // if not - insert semicolon to preserve the code from changing the meaning due to ASI
+                    if (sourceFile.text.charCodeAt(after.end - 1) !== 59 /* semicolon */) {
+                        this.replaceRange(sourceFile, ts.createRange(after.end), ts.createToken(26 /* SemicolonToken */));
+                    }
+                }
+                var endPosition = getAdjustedEndPosition(sourceFile, after, {});
+                return endPosition;
+            };
+            ChangeTracker.prototype.getInsertNodeAfterOptions = function (sourceFile, after) {
+                var options = this.getInsertNodeAfterOptionsWorker(after);
+                return __assign({}, options, { prefix: after.end === sourceFile.end && ts.isStatement(after) ? (options.prefix ? "\n" + options.prefix : "\n") : options.prefix });
+            };
+            ChangeTracker.prototype.getInsertNodeAfterOptionsWorker = function (node) {
+                switch (node.kind) {
+                    case 240 /* ClassDeclaration */:
+                    case 244 /* ModuleDeclaration */:
+                        return { prefix: this.newLineCharacter, suffix: this.newLineCharacter };
+                    case 237 /* VariableDeclaration */:
+                    case 10 /* StringLiteral */:
+                    case 72 /* Identifier */:
+                        return { prefix: ", " };
+                    case 275 /* PropertyAssignment */:
+                        return { suffix: "," + this.newLineCharacter };
+                    case 85 /* ExportKeyword */:
+                        return { prefix: " " };
+                    case 151 /* Parameter */:
+                        return {};
+                    default:
+                        ts.Debug.assert(ts.isStatement(node) || ts.isClassOrTypeElement(node)); // Else we haven't handled this kind of node yet -- add it
+                        return { suffix: this.newLineCharacter };
+                }
+            };
+            ChangeTracker.prototype.insertName = function (sourceFile, node, name) {
+                ts.Debug.assert(!node.name);
+                if (node.kind === 197 /* ArrowFunction */) {
+                    var arrow = ts.findChildOfKind(node, 37 /* EqualsGreaterThanToken */, sourceFile);
+                    var lparen = ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile);
+                    if (lparen) {
+                        // `() => {}` --> `function f() {}`
+                        this.insertNodesAt(sourceFile, lparen.getStart(sourceFile), [ts.createToken(90 /* FunctionKeyword */), ts.createIdentifier(name)], { joiner: " " });
+                        deleteNode(this, sourceFile, arrow);
+                    }
+                    else {
+                        // `x => {}` -> `function f(x) {}`
+                        this.insertText(sourceFile, ts.first(node.parameters).getStart(sourceFile), "function " + name + "(");
+                        // Replacing full range of arrow to get rid of the leading space -- replace ` =>` with `)`
+                        this.replaceRange(sourceFile, arrow, ts.createToken(21 /* CloseParenToken */));
+                    }
+                    if (node.body.kind !== 218 /* Block */) {
+                        // `() => 0` => `function f() { return 0; }`
+                        this.insertNodesAt(sourceFile, node.body.getStart(sourceFile), [ts.createToken(18 /* OpenBraceToken */), ts.createToken(97 /* ReturnKeyword */)], { joiner: " ", suffix: " " });
+                        this.insertNodesAt(sourceFile, node.body.end, [ts.createToken(26 /* SemicolonToken */), ts.createToken(19 /* CloseBraceToken */)], { joiner: " " });
+                    }
+                }
+                else {
+                    var pos = ts.findChildOfKind(node, node.kind === 196 /* FunctionExpression */ ? 90 /* FunctionKeyword */ : 76 /* ClassKeyword */, sourceFile).end;
+                    this.insertNodeAt(sourceFile, pos, ts.createIdentifier(name), { prefix: " " });
+                }
+            };
+            ChangeTracker.prototype.insertExportModifier = function (sourceFile, node) {
+                this.insertText(sourceFile, node.getStart(sourceFile), "export ");
+            };
+            /**
+             * This function should be used to insert nodes in lists when nodes don't carry separators as the part of the node range,
+             * i.e. arguments in arguments lists, parameters in parameter lists etc.
+             * Note that separators are part of the node in statements and class elements.
+             */
+            ChangeTracker.prototype.insertNodeInListAfter = function (sourceFile, after, newNode, containingList) {
+                if (containingList === void 0) { containingList = ts.formatting.SmartIndenter.getContainingList(after, sourceFile); }
+                if (!containingList) {
+                    ts.Debug.fail("node is not a list element");
+                    return;
+                }
+                var index = ts.indexOfNode(containingList, after);
+                if (index < 0) {
+                    return;
+                }
+                var end = after.getEnd();
+                if (index !== containingList.length - 1) {
+                    // any element except the last one
+                    // use next sibling as an anchor
+                    var nextToken = ts.getTokenAtPosition(sourceFile, after.end);
+                    if (nextToken && isSeparator(after, nextToken)) {
+                        // for list
+                        // a, b, c
+                        // create change for adding 'e' after 'a' as
+                        // - find start of next element after a (it is b)
+                        // - use this start as start and end position in final change
+                        // - build text of change by formatting the text of node + separator + whitespace trivia of b
+                        // in multiline case it will work as
+                        //   a,
+                        //   b,
+                        //   c,
+                        // result - '*' denotes leading trivia that will be inserted after new text (displayed as '#')
+                        //   a,*
+                        // ***insertedtext<separator>#
+                        // ###b,
+                        //   c,
+                        // find line and character of the next element
+                        var lineAndCharOfNextElement = ts.getLineAndCharacterOfPosition(sourceFile, skipWhitespacesAndLineBreaks(sourceFile.text, containingList[index + 1].getFullStart()));
+                        // find line and character of the token that precedes next element (usually it is separator)
+                        var lineAndCharOfNextToken = ts.getLineAndCharacterOfPosition(sourceFile, nextToken.end);
+                        var prefix = void 0;
+                        var startPos = void 0;
+                        if (lineAndCharOfNextToken.line === lineAndCharOfNextElement.line) {
+                            // next element is located on the same line with separator:
+                            // a,$$$$b
+                            //  ^    ^
+                            //  |    |-next element
+                            //  |-separator
+                            // where $$$ is some leading trivia
+                            // for a newly inserted node we'll maintain the same relative position comparing to separator and replace leading trivia with spaces
+                            // a,    x,$$$$b
+                            //  ^    ^     ^
+                            //  |    |     |-next element
+                            //  |    |-new inserted node padded with spaces
+                            //  |-separator
+                            startPos = nextToken.end;
+                            prefix = spaces(lineAndCharOfNextElement.character - lineAndCharOfNextToken.character);
+                        }
+                        else {
+                            // next element is located on different line that separator
+                            // let insert position be the beginning of the line that contains next element
+                            startPos = ts.getStartPositionOfLine(lineAndCharOfNextElement.line, sourceFile);
+                        }
+                        // write separator and leading trivia of the next element as suffix
+                        var suffix = "" + ts.tokenToString(nextToken.kind) + sourceFile.text.substring(nextToken.end, containingList[index + 1].getStart(sourceFile));
+                        this.replaceRange(sourceFile, ts.createRange(startPos, containingList[index + 1].getStart(sourceFile)), newNode, { prefix: prefix, suffix: suffix });
+                    }
+                }
+                else {
+                    var afterStart = after.getStart(sourceFile);
+                    var afterStartLinePosition = ts.getLineStartPositionForPosition(afterStart, sourceFile);
+                    var separator = void 0;
+                    var multilineList = false;
+                    // insert element after the last element in the list that has more than one item
+                    // pick the element preceding the after element to:
+                    // - pick the separator
+                    // - determine if list is a multiline
+                    if (containingList.length === 1) {
+                        // if list has only one element then we'll format is as multiline if node has comment in trailing trivia, or as singleline otherwise
+                        // i.e. var x = 1 // this is x
+                        //     | new element will be inserted at this position
+                        separator = 27 /* CommaToken */;
+                    }
+                    else {
+                        // element has more than one element, pick separator from the list
+                        var tokenBeforeInsertPosition = ts.findPrecedingToken(after.pos, sourceFile);
+                        separator = isSeparator(after, tokenBeforeInsertPosition) ? tokenBeforeInsertPosition.kind : 27 /* CommaToken */;
+                        // determine if list is multiline by checking lines of after element and element that precedes it.
+                        var afterMinusOneStartLinePosition = ts.getLineStartPositionForPosition(containingList[index - 1].getStart(sourceFile), sourceFile);
+                        multilineList = afterMinusOneStartLinePosition !== afterStartLinePosition;
+                    }
+                    if (hasCommentsBeforeLineBreak(sourceFile.text, after.end)) {
+                        // in this case we'll always treat containing list as multiline
+                        multilineList = true;
+                    }
+                    if (multilineList) {
+                        // insert separator immediately following the 'after' node to preserve comments in trailing trivia
+                        this.replaceRange(sourceFile, ts.createRange(end), ts.createToken(separator));
+                        // use the same indentation as 'after' item
+                        var indentation = ts.formatting.SmartIndenter.findFirstNonWhitespaceColumn(afterStartLinePosition, afterStart, sourceFile, this.formatContext.options);
+                        // insert element before the line break on the line that contains 'after' element
+                        var insertPos = ts.skipTrivia(sourceFile.text, end, /*stopAfterLineBreak*/ true, /*stopAtComments*/ false);
+                        if (insertPos !== end && ts.isLineBreak(sourceFile.text.charCodeAt(insertPos - 1))) {
+                            insertPos--;
+                        }
+                        this.replaceRange(sourceFile, ts.createRange(insertPos), newNode, { indentation: indentation, prefix: this.newLineCharacter });
+                    }
+                    else {
+                        this.replaceRange(sourceFile, ts.createRange(end), newNode, { prefix: ts.tokenToString(separator) + " " });
+                    }
+                }
+            };
+            ChangeTracker.prototype.finishClassesWithNodesInsertedAtStart = function () {
+                var _this = this;
+                this.classesWithNodesInsertedAtStart.forEach(function (_a) {
+                    var node = _a.node, sourceFile = _a.sourceFile;
+                    var _b = getClassOrObjectBraceEnds(node, sourceFile), openBraceEnd = _b[0], closeBraceEnd = _b[1];
+                    // For `class C { }` remove the whitespace inside the braces.
+                    if (ts.positionsAreOnSameLine(openBraceEnd, closeBraceEnd, sourceFile) && openBraceEnd !== closeBraceEnd - 1) {
+                        _this.deleteRange(sourceFile, ts.createRange(openBraceEnd, closeBraceEnd - 1));
+                    }
+                });
+            };
+            ChangeTracker.prototype.finishDeleteDeclarations = function () {
+                var _this = this;
+                var deletedNodesInLists = new ts.NodeSet(); // Stores nodes in lists that we already deleted. Used to avoid deleting `, ` twice in `a, b`.
+                var _loop_19 = function (sourceFile, node) {
+                    if (!this_1.deletedNodes.some(function (d) { return d.sourceFile === sourceFile && ts.rangeContainsRangeExclusive(d.node, node); })) {
+                        if (ts.isArray(node)) {
+                            this_1.deleteRange(sourceFile, ts.rangeOfTypeParameters(node));
+                        }
+                        else {
+                            deleteDeclaration.deleteDeclaration(this_1, deletedNodesInLists, sourceFile, node);
+                        }
+                    }
+                };
+                var this_1 = this;
+                for (var _i = 0, _a = this.deletedNodes; _i < _a.length; _i++) {
+                    var _b = _a[_i], sourceFile = _b.sourceFile, node = _b.node;
+                    _loop_19(sourceFile, node);
+                }
+                deletedNodesInLists.forEach(function (node) {
+                    var sourceFile = node.getSourceFile();
+                    var list = ts.formatting.SmartIndenter.getContainingList(node, sourceFile);
+                    if (node !== ts.last(list))
+                        return;
+                    var lastNonDeletedIndex = ts.findLastIndex(list, function (n) { return !deletedNodesInLists.has(n); }, list.length - 2);
+                    if (lastNonDeletedIndex !== -1) {
+                        _this.deleteRange(sourceFile, { pos: list[lastNonDeletedIndex].end, end: startPositionToDeleteNodeInList(sourceFile, list[lastNonDeletedIndex + 1]) });
+                    }
+                });
+            };
+            /**
+             * Note: after calling this, the TextChanges object must be discarded!
+             * @param validate only for tests
+             *    The reason we must validate as part of this method is that `getNonFormattedText` changes the node's positions,
+             *    so we can only call this once and can't get the non-formatted text separately.
+             */
+            ChangeTracker.prototype.getChanges = function (validate) {
+                this.finishDeleteDeclarations();
+                this.finishClassesWithNodesInsertedAtStart();
+                var changes = changesToText.getTextChangesFromChanges(this.changes, this.newLineCharacter, this.formatContext, validate);
+                for (var _i = 0, _a = this.newFiles; _i < _a.length; _i++) {
+                    var _b = _a[_i], oldFile = _b.oldFile, fileName = _b.fileName, statements = _b.statements;
+                    changes.push(changesToText.newFileChanges(oldFile, fileName, statements, this.newLineCharacter, this.formatContext));
+                }
+                return changes;
+            };
+            ChangeTracker.prototype.createNewFile = function (oldFile, fileName, statements) {
+                this.newFiles.push({ oldFile: oldFile, fileName: fileName, statements: statements });
+            };
+            return ChangeTracker;
+        }());
+        textChanges_3.ChangeTracker = ChangeTracker;
+        // find first non-whitespace position in the leading trivia of the node
+        function startPositionToDeleteNodeInList(sourceFile, node) {
+            return ts.skipTrivia(sourceFile.text, getAdjustedStartPosition(sourceFile, node, {}, Position.FullStart), /*stopAfterLineBreak*/ false, /*stopAtComments*/ true);
+        }
+        function getClassOrObjectBraceEnds(cls, sourceFile) {
+            return [ts.findChildOfKind(cls, 18 /* OpenBraceToken */, sourceFile).end, ts.findChildOfKind(cls, 19 /* CloseBraceToken */, sourceFile).end];
+        }
+        function getMembersOrProperties(cls) {
+            return ts.isObjectLiteralExpression(cls) ? cls.properties : cls.members;
+        }
+        function getNewFileText(statements, scriptKind, newLineCharacter, formatContext) {
+            return changesToText.newFileChangesWorker(/*oldFile*/ undefined, scriptKind, statements, newLineCharacter, formatContext);
+        }
+        textChanges_3.getNewFileText = getNewFileText;
+        var changesToText;
+        (function (changesToText) {
+            function getTextChangesFromChanges(changes, newLineCharacter, formatContext, validate) {
+                return ts.group(changes, function (c) { return c.sourceFile.path; }).map(function (changesInFile) {
+                    var sourceFile = changesInFile[0].sourceFile;
+                    // order changes by start position
+                    // If the start position is the same, put the shorter range first, since an empty range (x, x) may precede (x, y) but not vice-versa.
+                    var normalized = ts.stableSort(changesInFile, function (a, b) { return (a.range.pos - b.range.pos) || (a.range.end - b.range.end); });
+                    var _loop_20 = function (i) {
+                        ts.Debug.assert(normalized[i].range.end <= normalized[i + 1].range.pos, "Changes overlap", function () {
+                            return JSON.stringify(normalized[i].range) + " and " + JSON.stringify(normalized[i + 1].range);
+                        });
+                    };
+                    // verify that change intervals do not overlap, except possibly at end points.
+                    for (var i = 0; i < normalized.length - 1; i++) {
+                        _loop_20(i);
+                    }
+                    var textChanges = normalized.map(function (c) {
+                        return ts.createTextChange(ts.createTextSpanFromRange(c.range), computeNewText(c, sourceFile, newLineCharacter, formatContext, validate));
+                    });
+                    return { fileName: sourceFile.fileName, textChanges: textChanges };
+                });
+            }
+            changesToText.getTextChangesFromChanges = getTextChangesFromChanges;
+            function newFileChanges(oldFile, fileName, statements, newLineCharacter, formatContext) {
+                var text = newFileChangesWorker(oldFile, ts.getScriptKindFromFileName(fileName), statements, newLineCharacter, formatContext);
+                return { fileName: fileName, textChanges: [ts.createTextChange(ts.createTextSpan(0, 0), text)], isNewFile: true };
+            }
+            changesToText.newFileChanges = newFileChanges;
+            function newFileChangesWorker(oldFile, scriptKind, statements, newLineCharacter, formatContext) {
+                // TODO: this emits the file, parses it back, then formats it that -- may be a less roundabout way to do this
+                var nonFormattedText = statements.map(function (s) { return getNonformattedText(s, oldFile, newLineCharacter).text; }).join(newLineCharacter);
+                var sourceFile = ts.createSourceFile("any file name", nonFormattedText, 6 /* ESNext */, /*setParentNodes*/ true, scriptKind);
+                var changes = ts.formatting.formatDocument(sourceFile, formatContext);
+                return applyChanges(nonFormattedText, changes) + newLineCharacter;
+            }
+            changesToText.newFileChangesWorker = newFileChangesWorker;
+            function computeNewText(change, sourceFile, newLineCharacter, formatContext, validate) {
+                if (change.kind === ChangeKind.Remove) {
+                    return "";
+                }
+                if (change.kind === ChangeKind.Text) {
+                    return change.text;
+                }
+                var _a = change.options, options = _a === void 0 ? {} : _a, pos = change.range.pos;
+                var format = function (n) { return getFormattedTextOfNode(n, sourceFile, pos, options, newLineCharacter, formatContext, validate); };
+                var text = change.kind === ChangeKind.ReplaceWithMultipleNodes
+                    ? change.nodes.map(function (n) { return ts.removeSuffix(format(n), newLineCharacter); }).join(change.options.joiner || newLineCharacter) // TODO: GH#18217
+                    : format(change.node);
+                // strip initial indentation (spaces or tabs) if text will be inserted in the middle of the line
+                var noIndent = (options.preserveLeadingWhitespace || options.indentation !== undefined || ts.getLineStartPositionForPosition(pos, sourceFile) === pos) ? text : text.replace(/^\s+/, "");
+                return (options.prefix || "") + noIndent + (options.suffix || "");
+            }
+            /** Note: this may mutate `nodeIn`. */
+            function getFormattedTextOfNode(nodeIn, sourceFile, pos, _a, newLineCharacter, formatContext, validate) {
+                var indentation = _a.indentation, prefix = _a.prefix, delta = _a.delta;
+                var _b = getNonformattedText(nodeIn, sourceFile, newLineCharacter), node = _b.node, text = _b.text;
+                if (validate)
+                    validate(node, text);
+                var formatOptions = formatContext.options;
+                var initialIndentation = indentation !== undefined
+                    ? indentation
+                    : ts.formatting.SmartIndenter.getIndentation(pos, sourceFile, formatOptions, prefix === newLineCharacter || ts.getLineStartPositionForPosition(pos, sourceFile) === pos);
+                if (delta === undefined) {
+                    delta = ts.formatting.SmartIndenter.shouldIndentChildNode(formatContext.options, nodeIn) ? (formatOptions.indentSize || 0) : 0;
+                }
+                var file = { text: text, getLineAndCharacterOfPosition: function (pos) { return ts.getLineAndCharacterOfPosition(this, pos); } };
+                var changes = ts.formatting.formatNodeGivenIndentation(node, file, sourceFile.languageVariant, initialIndentation, delta, formatContext);
+                return applyChanges(text, changes);
+            }
+            /** Note: output node may be mutated input node. */
+            function getNonformattedText(node, sourceFile, newLineCharacter) {
+                var writer = new Writer(newLineCharacter);
+                var newLine = newLineCharacter === "\n" ? 1 /* LineFeed */ : 0 /* CarriageReturnLineFeed */;
+                ts.createPrinter({ newLine: newLine, neverAsciiEscape: true }, writer).writeNode(4 /* Unspecified */, node, sourceFile, writer);
+                return { text: writer.getText(), node: assignPositionsToNode(node) };
+            }
+            changesToText.getNonformattedText = getNonformattedText;
+        })(changesToText || (changesToText = {}));
+        function applyChanges(text, changes) {
+            for (var i = changes.length - 1; i >= 0; i--) {
+                var _a = changes[i], span = _a.span, newText = _a.newText;
+                text = "" + text.substring(0, span.start) + newText + text.substring(ts.textSpanEnd(span));
+            }
+            return text;
+        }
+        textChanges_3.applyChanges = applyChanges;
+        function isTrivia(s) {
+            return ts.skipTrivia(s, 0) === s.length;
+        }
+        function assignPositionsToNode(node) {
+            var visited = ts.visitEachChild(node, assignPositionsToNode, ts.nullTransformationContext, assignPositionsToNodeArray, assignPositionsToNode); // TODO: GH#18217
+            // create proxy node for non synthesized nodes
+            var newNode = ts.nodeIsSynthesized(visited) ? visited : Object.create(visited);
+            newNode.pos = getPos(node);
+            newNode.end = getEnd(node);
+            return newNode;
+        }
+        function assignPositionsToNodeArray(nodes, visitor, test, start, count) {
+            var visited = ts.visitNodes(nodes, visitor, test, start, count);
+            if (!visited) {
+                return visited;
+            }
+            // clone nodearray if necessary
+            var nodeArray = visited === nodes ? ts.createNodeArray(visited.slice(0)) : visited;
+            nodeArray.pos = getPos(nodes);
+            nodeArray.end = getEnd(nodes);
+            return nodeArray;
+        }
+        var Writer = /** @class */ (function () {
+            function Writer(newLine) {
+                var _this = this;
+                this.lastNonTriviaPosition = 0;
+                this.writer = ts.createTextWriter(newLine);
+                this.onEmitNode = function (hint, node, printCallback) {
+                    if (node) {
+                        setPos(node, _this.lastNonTriviaPosition);
+                    }
+                    printCallback(hint, node);
+                    if (node) {
+                        setEnd(node, _this.lastNonTriviaPosition);
+                    }
+                };
+                this.onBeforeEmitNodeArray = function (nodes) {
+                    if (nodes) {
+                        setPos(nodes, _this.lastNonTriviaPosition);
+                    }
+                };
+                this.onAfterEmitNodeArray = function (nodes) {
+                    if (nodes) {
+                        setEnd(nodes, _this.lastNonTriviaPosition);
+                    }
+                };
+                this.onBeforeEmitToken = function (node) {
+                    if (node) {
+                        setPos(node, _this.lastNonTriviaPosition);
+                    }
+                };
+                this.onAfterEmitToken = function (node) {
+                    if (node) {
+                        setEnd(node, _this.lastNonTriviaPosition);
+                    }
+                };
+            }
+            Writer.prototype.setLastNonTriviaPosition = function (s, force) {
+                if (force || !isTrivia(s)) {
+                    this.lastNonTriviaPosition = this.writer.getTextPos();
+                    var i = 0;
+                    while (ts.isWhiteSpaceLike(s.charCodeAt(s.length - i - 1))) {
+                        i++;
+                    }
+                    // trim trailing whitespaces
+                    this.lastNonTriviaPosition -= i;
+                }
+            };
+            Writer.prototype.write = function (s) {
+                this.writer.write(s);
+                this.setLastNonTriviaPosition(s, /*force*/ false);
+            };
+            Writer.prototype.writeComment = function (s) {
+                this.writer.writeComment(s);
+            };
+            Writer.prototype.writeKeyword = function (s) {
+                this.writer.writeKeyword(s);
+                this.setLastNonTriviaPosition(s, /*force*/ false);
+            };
+            Writer.prototype.writeOperator = function (s) {
+                this.writer.writeOperator(s);
+                this.setLastNonTriviaPosition(s, /*force*/ false);
+            };
+            Writer.prototype.writePunctuation = function (s) {
+                this.writer.writePunctuation(s);
+                this.setLastNonTriviaPosition(s, /*force*/ false);
+            };
+            Writer.prototype.writeTrailingSemicolon = function (s) {
+                this.writer.writeTrailingSemicolon(s);
+                this.setLastNonTriviaPosition(s, /*force*/ false);
+            };
+            Writer.prototype.writeParameter = function (s) {
+                this.writer.writeParameter(s);
+                this.setLastNonTriviaPosition(s, /*force*/ false);
+            };
+            Writer.prototype.writeProperty = function (s) {
+                this.writer.writeProperty(s);
+                this.setLastNonTriviaPosition(s, /*force*/ false);
+            };
+            Writer.prototype.writeSpace = function (s) {
+                this.writer.writeSpace(s);
+                this.setLastNonTriviaPosition(s, /*force*/ false);
+            };
+            Writer.prototype.writeStringLiteral = function (s) {
+                this.writer.writeStringLiteral(s);
+                this.setLastNonTriviaPosition(s, /*force*/ false);
+            };
+            Writer.prototype.writeSymbol = function (s, sym) {
+                this.writer.writeSymbol(s, sym);
+                this.setLastNonTriviaPosition(s, /*force*/ false);
+            };
+            Writer.prototype.writeLine = function () {
+                this.writer.writeLine();
+            };
+            Writer.prototype.increaseIndent = function () {
+                this.writer.increaseIndent();
+            };
+            Writer.prototype.decreaseIndent = function () {
+                this.writer.decreaseIndent();
+            };
+            Writer.prototype.getText = function () {
+                return this.writer.getText();
+            };
+            Writer.prototype.rawWrite = function (s) {
+                this.writer.rawWrite(s);
+                this.setLastNonTriviaPosition(s, /*force*/ false);
+            };
+            Writer.prototype.writeLiteral = function (s) {
+                this.writer.writeLiteral(s);
+                this.setLastNonTriviaPosition(s, /*force*/ true);
+            };
+            Writer.prototype.getTextPos = function () {
+                return this.writer.getTextPos();
+            };
+            Writer.prototype.getLine = function () {
+                return this.writer.getLine();
+            };
+            Writer.prototype.getColumn = function () {
+                return this.writer.getColumn();
+            };
+            Writer.prototype.getIndent = function () {
+                return this.writer.getIndent();
+            };
+            Writer.prototype.isAtStartOfLine = function () {
+                return this.writer.isAtStartOfLine();
+            };
+            Writer.prototype.clear = function () {
+                this.writer.clear();
+                this.lastNonTriviaPosition = 0;
+            };
+            return Writer;
+        }());
+        function getInsertionPositionAtSourceFileTop(sourceFile) {
+            var lastPrologue;
+            for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
+                var node = _a[_i];
+                if (ts.isPrologueDirective(node)) {
+                    lastPrologue = node;
+                }
+                else {
+                    break;
+                }
+            }
+            var position = 0;
+            var text = sourceFile.text;
+            if (lastPrologue) {
+                position = lastPrologue.end;
+                advancePastLineBreak();
+                return position;
+            }
+            var shebang = ts.getShebang(text);
+            if (shebang !== undefined) {
+                position = shebang.length;
+                advancePastLineBreak();
+            }
+            // For a source file, it is possible there are detached comments we should not skip
+            var ranges = ts.getLeadingCommentRanges(text, position);
+            if (!ranges)
+                return position;
+            // However we should still skip a pinned comment at the top
+            if (ranges.length && ranges[0].kind === 3 /* MultiLineCommentTrivia */ && ts.isPinnedComment(text, ranges[0].pos)) {
+                position = ranges[0].end;
+                advancePastLineBreak();
+                ranges = ranges.slice(1);
+            }
+            // As well as any triple slash references
+            for (var _b = 0, ranges_1 = ranges; _b < ranges_1.length; _b++) {
+                var range = ranges_1[_b];
+                if (range.kind === 2 /* SingleLineCommentTrivia */ && ts.isRecognizedTripleSlashComment(text, range.pos, range.end)) {
+                    position = range.end;
+                    advancePastLineBreak();
+                    continue;
+                }
+                break;
+            }
+            return position;
+            function advancePastLineBreak() {
+                if (position < text.length) {
+                    var charCode = text.charCodeAt(position);
+                    if (ts.isLineBreak(charCode)) {
+                        position++;
+                        if (position < text.length && charCode === 13 /* carriageReturn */ && text.charCodeAt(position) === 10 /* lineFeed */) {
+                            position++;
+                        }
+                    }
+                }
+            }
+        }
+        function isValidLocationToAddComment(sourceFile, position) {
+            return !ts.isInComment(sourceFile, position) && !ts.isInString(sourceFile, position) && !ts.isInTemplateString(sourceFile, position) && !ts.isInJSXText(sourceFile, position);
+        }
+        textChanges_3.isValidLocationToAddComment = isValidLocationToAddComment;
+        function needSemicolonBetween(a, b) {
+            return (ts.isPropertySignature(a) || ts.isPropertyDeclaration(a)) && ts.isClassOrTypeElement(b) && b.name.kind === 149 /* ComputedPropertyName */
+                || ts.isStatementButNotDeclaration(a) && ts.isStatementButNotDeclaration(b); // TODO: only if b would start with a `(` or `[`
+        }
+        var deleteDeclaration;
+        (function (deleteDeclaration_1) {
+            function deleteDeclaration(changes, deletedNodesInLists, sourceFile, node) {
+                switch (node.kind) {
+                    case 151 /* Parameter */: {
+                        var oldFunction = node.parent;
+                        if (ts.isArrowFunction(oldFunction) &&
+                            oldFunction.parameters.length === 1 &&
+                            !ts.findChildOfKind(oldFunction, 20 /* OpenParenToken */, sourceFile)) {
+                            // Lambdas with exactly one parameter are special because, after removal, there
+                            // must be an empty parameter list (i.e. `()`) and this won't necessarily be the
+                            // case if the parameter is simply removed (e.g. in `x => 1`).
+                            changes.replaceNodeWithText(sourceFile, node, "()");
+                        }
+                        else {
+                            deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
+                        }
+                        break;
+                    }
+                    case 249 /* ImportDeclaration */:
+                        deleteNode(changes, sourceFile, node, 
+                        // For first import, leave header comment in place
+                        node === sourceFile.imports[0].parent ? { useNonAdjustedStartPosition: true, useNonAdjustedEndPosition: false } : undefined);
+                        break;
+                    case 186 /* BindingElement */:
+                        var pattern = node.parent;
+                        var preserveComma = pattern.kind === 185 /* ArrayBindingPattern */ && node !== ts.last(pattern.elements);
+                        if (preserveComma) {
+                            deleteNode(changes, sourceFile, node);
+                        }
+                        else {
+                            deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
+                        }
+                        break;
+                    case 237 /* VariableDeclaration */:
+                        deleteVariableDeclaration(changes, deletedNodesInLists, sourceFile, node);
+                        break;
+                    case 150 /* TypeParameter */:
+                        deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
+                        break;
+                    case 253 /* ImportSpecifier */:
+                        var namedImports = node.parent;
+                        if (namedImports.elements.length === 1) {
+                            deleteImportBinding(changes, sourceFile, namedImports);
+                        }
+                        else {
+                            deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
+                        }
+                        break;
+                    case 251 /* NamespaceImport */:
+                        deleteImportBinding(changes, sourceFile, node);
+                        break;
+                    default:
+                        if (ts.isImportClause(node.parent) && node.parent.name === node) {
+                            deleteDefaultImport(changes, sourceFile, node.parent);
+                        }
+                        else if (ts.isCallLikeExpression(node.parent)) {
+                            deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
+                        }
+                        else {
+                            deleteNode(changes, sourceFile, node, node.kind === 26 /* SemicolonToken */ ? { useNonAdjustedEndPosition: true } : undefined);
+                        }
+                }
+            }
+            deleteDeclaration_1.deleteDeclaration = deleteDeclaration;
+            function deleteDefaultImport(changes, sourceFile, importClause) {
+                if (!importClause.namedBindings) {
+                    // Delete the whole import
+                    deleteNode(changes, sourceFile, importClause.parent);
+                }
+                else {
+                    // import |d,| * as ns from './file'
+                    var start = importClause.name.getStart(sourceFile);
+                    var nextToken = ts.getTokenAtPosition(sourceFile, importClause.name.end);
+                    if (nextToken && nextToken.kind === 27 /* CommaToken */) {
+                        // shift first non-whitespace position after comma to the start position of the node
+                        var end = ts.skipTrivia(sourceFile.text, nextToken.end, /*stopAfterLineBreaks*/ false, /*stopAtComments*/ true);
+                        changes.deleteRange(sourceFile, { pos: start, end: end });
+                    }
+                    else {
+                        deleteNode(changes, sourceFile, importClause.name);
+                    }
+                }
+            }
+            function deleteImportBinding(changes, sourceFile, node) {
+                if (node.parent.name) {
+                    // Delete named imports while preserving the default import
+                    // import d|, * as ns| from './file'
+                    // import d|, { a }| from './file'
+                    var previousToken = ts.Debug.assertDefined(ts.getTokenAtPosition(sourceFile, node.pos - 1));
+                    changes.deleteRange(sourceFile, { pos: previousToken.getStart(sourceFile), end: node.end });
+                }
+                else {
+                    // Delete the entire import declaration
+                    // |import * as ns from './file'|
+                    // |import { a } from './file'|
+                    var importDecl = ts.getAncestor(node, 249 /* ImportDeclaration */);
+                    deleteNode(changes, sourceFile, importDecl);
+                }
+            }
+            function deleteVariableDeclaration(changes, deletedNodesInLists, sourceFile, node) {
+                var parent = node.parent;
+                if (parent.kind === 274 /* CatchClause */) {
+                    // TODO: There's currently no unused diagnostic for this, could be a suggestion
+                    changes.deleteNodeRange(sourceFile, ts.findChildOfKind(parent, 20 /* OpenParenToken */, sourceFile), ts.findChildOfKind(parent, 21 /* CloseParenToken */, sourceFile));
+                    return;
+                }
+                if (parent.declarations.length !== 1) {
+                    deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
+                    return;
+                }
+                var gp = parent.parent;
+                switch (gp.kind) {
+                    case 227 /* ForOfStatement */:
+                    case 226 /* ForInStatement */:
+                        changes.replaceNode(sourceFile, node, ts.createObjectLiteral());
+                        break;
+                    case 225 /* ForStatement */:
+                        deleteNode(changes, sourceFile, parent);
+                        break;
+                    case 219 /* VariableStatement */:
+                        deleteNode(changes, sourceFile, gp);
+                        break;
+                    default:
+                        ts.Debug.assertNever(gp);
+                }
+            }
+        })(deleteDeclaration || (deleteDeclaration = {}));
+        /** Warning: This deletes comments too. See `copyComments` in `convertFunctionToEs6Class`. */
+        // Exported for tests only! (TODO: improve tests to not need this)
+        function deleteNode(changes, sourceFile, node, options) {
+            if (options === void 0) { options = {}; }
+            var startPosition = getAdjustedStartPosition(sourceFile, node, options, Position.FullStart);
+            var endPosition = getAdjustedEndPosition(sourceFile, node, options);
+            changes.deleteRange(sourceFile, { pos: startPosition, end: endPosition });
+        }
+        textChanges_3.deleteNode = deleteNode;
+        function deleteNodeInList(changes, deletedNodesInLists, sourceFile, node) {
+            var containingList = ts.Debug.assertDefined(ts.formatting.SmartIndenter.getContainingList(node, sourceFile));
+            var index = ts.indexOfNode(containingList, node);
+            ts.Debug.assert(index !== -1);
+            if (containingList.length === 1) {
+                deleteNode(changes, sourceFile, node);
+                return;
+            }
+            // Note: We will only delete a comma *after* a node. This will leave a trailing comma if we delete the last node.
+            // That's handled in the end by `finishTrailingCommaAfterDeletingNodesInList`.
+            ts.Debug.assert(!deletedNodesInLists.has(node), "Deleting a node twice");
+            deletedNodesInLists.add(node);
+            changes.deleteRange(sourceFile, {
+                pos: startPositionToDeleteNodeInList(sourceFile, node),
+                end: index === containingList.length - 1 ? getAdjustedEndPosition(sourceFile, node, {}) : startPositionToDeleteNodeInList(sourceFile, containingList[index + 1]),
+            });
+        }
+    })(textChanges = ts.textChanges || (ts.textChanges = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var errorCodeToFixes = ts.createMultiMap();
+        var fixIdToRegistration = ts.createMap();
+        function diagnosticToString(diag) {
+            return ts.isArray(diag)
+                ? ts.formatStringFromArgs(ts.getLocaleSpecificMessage(diag[0]), diag.slice(1))
+                : ts.getLocaleSpecificMessage(diag);
+        }
+        function createCodeFixActionNoFixId(fixName, changes, description) {
+            return createCodeFixActionWorker(fixName, diagnosticToString(description), changes, /*fixId*/ undefined, /*fixAllDescription*/ undefined);
+        }
+        codefix.createCodeFixActionNoFixId = createCodeFixActionNoFixId;
+        function createCodeFixAction(fixName, changes, description, fixId, fixAllDescription, command) {
+            return createCodeFixActionWorker(fixName, diagnosticToString(description), changes, fixId, diagnosticToString(fixAllDescription), command);
+        }
+        codefix.createCodeFixAction = createCodeFixAction;
+        function createCodeFixActionWorker(fixName, description, changes, fixId, fixAllDescription, command) {
+            return { fixName: fixName, description: description, changes: changes, fixId: fixId, fixAllDescription: fixAllDescription, commands: command ? [command] : undefined };
+        }
+        function registerCodeFix(reg) {
+            for (var _i = 0, _a = reg.errorCodes; _i < _a.length; _i++) {
+                var error = _a[_i];
+                errorCodeToFixes.add(String(error), reg);
+            }
+            if (reg.fixIds) {
+                for (var _b = 0, _c = reg.fixIds; _b < _c.length; _b++) {
+                    var fixId = _c[_b];
+                    ts.Debug.assert(!fixIdToRegistration.has(fixId));
+                    fixIdToRegistration.set(fixId, reg);
+                }
+            }
+        }
+        codefix.registerCodeFix = registerCodeFix;
+        function getSupportedErrorCodes() {
+            return ts.arrayFrom(errorCodeToFixes.keys());
+        }
+        codefix.getSupportedErrorCodes = getSupportedErrorCodes;
+        function getFixes(context) {
+            return ts.flatMap(errorCodeToFixes.get(String(context.errorCode)) || ts.emptyArray, function (f) { return f.getCodeActions(context); });
+        }
+        codefix.getFixes = getFixes;
+        function getAllFixes(context) {
+            // Currently fixId is always a string.
+            return fixIdToRegistration.get(ts.cast(context.fixId, ts.isString)).getAllCodeActions(context);
+        }
+        codefix.getAllFixes = getAllFixes;
+        function createCombinedCodeActions(changes, commands) {
+            return { changes: changes, commands: commands };
+        }
+        codefix.createCombinedCodeActions = createCombinedCodeActions;
+        function createFileTextChanges(fileName, textChanges) {
+            return { fileName: fileName, textChanges: textChanges };
+        }
+        codefix.createFileTextChanges = createFileTextChanges;
+        function codeFixAll(context, errorCodes, use) {
+            var commands = [];
+            var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return eachDiagnostic(context, errorCodes, function (diag) { return use(t, diag, commands); }); });
+            return createCombinedCodeActions(changes, commands.length === 0 ? undefined : commands);
+        }
+        codefix.codeFixAll = codeFixAll;
+        function eachDiagnostic(_a, errorCodes, cb) {
+            var program = _a.program, sourceFile = _a.sourceFile, cancellationToken = _a.cancellationToken;
+            for (var _i = 0, _b = program.getSemanticDiagnostics(sourceFile, cancellationToken).concat(ts.computeSuggestionDiagnostics(sourceFile, program, cancellationToken)); _i < _b.length; _i++) {
+                var diag = _b[_i];
+                if (ts.contains(errorCodes, diag.code)) {
+                    cb(diag);
+                }
+            }
+        }
+        codefix.eachDiagnostic = eachDiagnostic;
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var refactor;
+    (function (refactor_1) {
+        // A map with the refactor code as key, the refactor itself as value
+        // e.g.  nonSuggestableRefactors[refactorCode] -> the refactor you want
+        var refactors = ts.createMap();
+        /** @param name An unique code associated with each refactor. Does not have to be human-readable. */
+        function registerRefactor(name, refactor) {
+            refactors.set(name, refactor);
+        }
+        refactor_1.registerRefactor = registerRefactor;
+        function getApplicableRefactors(context) {
+            return ts.arrayFrom(ts.flatMapIterator(refactors.values(), function (refactor) {
+                return context.cancellationToken && context.cancellationToken.isCancellationRequested() ? undefined : refactor.getAvailableActions(context);
+            }));
+        }
+        refactor_1.getApplicableRefactors = getApplicableRefactors;
+        function getEditsForRefactor(context, refactorName, actionName) {
+            var refactor = refactors.get(refactorName);
+            return refactor && refactor.getEditsForAction(context, actionName);
+        }
+        refactor_1.getEditsForRefactor = getEditsForRefactor;
+    })(refactor = ts.refactor || (ts.refactor = {}));
+    function getRefactorContextSpan(_a) {
+        var startPosition = _a.startPosition, endPosition = _a.endPosition;
+        return ts.createTextSpanFromBounds(startPosition, endPosition === undefined ? startPosition : endPosition);
+    }
+    ts.getRefactorContextSpan = getRefactorContextSpan;
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "addConvertToUnknownForNonOverlappingTypes";
+        var errorCodes = [ts.Diagnostics.Conversion_of_type_0_to_type_1_may_be_a_mistake_because_neither_type_sufficiently_overlaps_with_the_other_If_this_was_intentional_convert_the_expression_to_unknown_first.code];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return makeChange(t, context.sourceFile, context.span.start); });
+                return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Add_unknown_conversion_for_non_overlapping_types, fixId, ts.Diagnostics.Add_unknown_to_all_conversions_of_non_overlapping_types)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) { return makeChange(changes, diag.file, diag.start); }); },
+        });
+        function makeChange(changeTracker, sourceFile, pos) {
+            var token = ts.getTokenAtPosition(sourceFile, pos);
+            var assertion = ts.Debug.assertDefined(ts.findAncestor(token, function (n) { return ts.isAsExpression(n) || ts.isTypeAssertion(n); }));
+            var replacement = ts.isAsExpression(assertion)
+                ? ts.createAsExpression(assertion.expression, ts.createKeywordTypeNode(143 /* UnknownKeyword */))
+                : ts.createTypeAssertion(ts.createKeywordTypeNode(143 /* UnknownKeyword */), assertion.expression);
+            changeTracker.replaceNode(sourceFile, assertion.expression, replacement);
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "addMissingInvocationForDecorator";
+        var errorCodes = [ts.Diagnostics._0_accepts_too_few_arguments_to_be_used_as_a_decorator_here_Did_you_mean_to_call_it_first_and_write_0.code];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return makeChange(t, context.sourceFile, context.span.start); });
+                return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Call_decorator_expression, fixId, ts.Diagnostics.Add_to_all_uncalled_decorators)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) { return makeChange(changes, diag.file, diag.start); }); },
+        });
+        function makeChange(changeTracker, sourceFile, pos) {
+            var token = ts.getTokenAtPosition(sourceFile, pos);
+            var decorator = ts.findAncestor(token, ts.isDecorator);
+            ts.Debug.assert(!!decorator, "Expected position to be owned by a decorator.");
+            var replacement = ts.createCall(decorator.expression, /*typeArguments*/ undefined, /*argumentsArray*/ undefined);
+            changeTracker.replaceNode(sourceFile, decorator.expression, replacement);
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "addNameToNamelessParameter";
+        var errorCodes = [ts.Diagnostics.Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1.code];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return makeChange(t, context.sourceFile, context.span.start); });
+                return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Add_parameter_name, fixId, ts.Diagnostics.Add_names_to_all_parameters_without_names)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) { return makeChange(changes, diag.file, diag.start); }); },
+        });
+        function makeChange(changeTracker, sourceFile, pos) {
+            var token = ts.getTokenAtPosition(sourceFile, pos);
+            if (!ts.isIdentifier(token)) {
+                return ts.Debug.fail("add-name-to-nameless-parameter operates on identifiers, but got a " + ts.formatSyntaxKind(token.kind));
+            }
+            var param = token.parent;
+            if (!ts.isParameter(param)) {
+                return ts.Debug.fail("Tried to add a parameter name to a non-parameter: " + ts.formatSyntaxKind(token.kind));
+            }
+            var i = param.parent.parameters.indexOf(param);
+            ts.Debug.assert(!param.type, "Tried to add a parameter name to a parameter that already had one.");
+            ts.Debug.assert(i > -1, "Parameter not found in parent parameter list.");
+            var replacement = ts.createParameter(
+            /*decorators*/ undefined, param.modifiers, param.dotDotDotToken, "arg" + i, param.questionToken, ts.createTypeReferenceNode(token, /*typeArguments*/ undefined), param.initializer);
+            changeTracker.replaceNode(sourceFile, token, replacement);
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "annotateWithTypeFromJSDoc";
+        var errorCodes = [ts.Diagnostics.JSDoc_types_may_be_moved_to_TypeScript_types.code];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var decl = getDeclaration(context.sourceFile, context.span.start);
+                if (!decl)
+                    return;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, context.sourceFile, decl); });
+                return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Annotate_with_type_from_JSDoc, fixId, ts.Diagnostics.Annotate_everything_with_types_from_JSDoc)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                var decl = getDeclaration(diag.file, diag.start);
+                if (decl)
+                    doChange(changes, diag.file, decl);
+            }); },
+        });
+        function getDeclaration(file, pos) {
+            var name = ts.getTokenAtPosition(file, pos);
+            // For an arrow function with no name, 'name' lands on the first parameter.
+            return ts.tryCast(ts.isParameter(name.parent) ? name.parent.parent : name.parent, parameterShouldGetTypeFromJSDoc);
+        }
+        function parameterShouldGetTypeFromJSDoc(node) {
+            return isDeclarationWithType(node) && hasUsableJSDoc(node);
+        }
+        codefix.parameterShouldGetTypeFromJSDoc = parameterShouldGetTypeFromJSDoc;
+        function hasUsableJSDoc(decl) {
+            return ts.isFunctionLikeDeclaration(decl)
+                ? decl.parameters.some(hasUsableJSDoc) || (!decl.type && !!ts.getJSDocReturnType(decl))
+                : !decl.type && !!ts.getJSDocType(decl);
+        }
+        function doChange(changes, sourceFile, decl) {
+            if (ts.isFunctionLikeDeclaration(decl) && (ts.getJSDocReturnType(decl) || decl.parameters.some(function (p) { return !!ts.getJSDocType(p); }))) {
+                if (!decl.typeParameters) {
+                    var typeParameters = ts.getJSDocTypeParameterDeclarations(decl);
+                    if (typeParameters.length)
+                        changes.insertTypeParameters(sourceFile, decl, typeParameters);
+                }
+                var needParens = ts.isArrowFunction(decl) && !ts.findChildOfKind(decl, 20 /* OpenParenToken */, sourceFile);
+                if (needParens)
+                    changes.insertNodeBefore(sourceFile, ts.first(decl.parameters), ts.createToken(20 /* OpenParenToken */));
+                for (var _i = 0, _a = decl.parameters; _i < _a.length; _i++) {
+                    var param = _a[_i];
+                    if (!param.type) {
+                        var paramType = ts.getJSDocType(param);
+                        if (paramType)
+                            changes.tryInsertTypeAnnotation(sourceFile, param, transformJSDocType(paramType));
+                    }
+                }
+                if (needParens)
+                    changes.insertNodeAfter(sourceFile, ts.last(decl.parameters), ts.createToken(21 /* CloseParenToken */));
+                if (!decl.type) {
+                    var returnType = ts.getJSDocReturnType(decl);
+                    if (returnType)
+                        changes.tryInsertTypeAnnotation(sourceFile, decl, transformJSDocType(returnType));
+                }
+            }
+            else {
+                var jsdocType = ts.Debug.assertDefined(ts.getJSDocType(decl)); // If not defined, shouldn't have been an error to fix
+                ts.Debug.assert(!decl.type); // If defined, shouldn't have been an error to fix.
+                changes.tryInsertTypeAnnotation(sourceFile, decl, transformJSDocType(jsdocType));
+            }
+        }
+        function isDeclarationWithType(node) {
+            return ts.isFunctionLikeDeclaration(node) ||
+                node.kind === 237 /* VariableDeclaration */ ||
+                node.kind === 153 /* PropertySignature */ ||
+                node.kind === 154 /* PropertyDeclaration */;
+        }
+        function transformJSDocType(node) {
+            switch (node.kind) {
+                case 284 /* JSDocAllType */:
+                case 285 /* JSDocUnknownType */:
+                    return ts.createTypeReferenceNode("any", ts.emptyArray);
+                case 288 /* JSDocOptionalType */:
+                    return transformJSDocOptionalType(node);
+                case 287 /* JSDocNonNullableType */:
+                    return transformJSDocType(node.type);
+                case 286 /* JSDocNullableType */:
+                    return transformJSDocNullableType(node);
+                case 290 /* JSDocVariadicType */:
+                    return transformJSDocVariadicType(node);
+                case 289 /* JSDocFunctionType */:
+                    return transformJSDocFunctionType(node);
+                case 164 /* TypeReference */:
+                    return transformJSDocTypeReference(node);
+                default:
+                    var visited = ts.visitEachChild(node, transformJSDocType, /*context*/ undefined); // TODO: GH#18217
+                    ts.setEmitFlags(visited, 1 /* SingleLine */);
+                    return visited;
+            }
+        }
+        function transformJSDocOptionalType(node) {
+            return ts.createUnionTypeNode([ts.visitNode(node.type, transformJSDocType), ts.createTypeReferenceNode("undefined", ts.emptyArray)]);
+        }
+        function transformJSDocNullableType(node) {
+            return ts.createUnionTypeNode([ts.visitNode(node.type, transformJSDocType), ts.createTypeReferenceNode("null", ts.emptyArray)]);
+        }
+        function transformJSDocVariadicType(node) {
+            return ts.createArrayTypeNode(ts.visitNode(node.type, transformJSDocType));
+        }
+        function transformJSDocFunctionType(node) {
+            return ts.createFunctionTypeNode(ts.emptyArray, node.parameters.map(transformJSDocParameter), node.type);
+        }
+        function transformJSDocParameter(node) {
+            var index = node.parent.parameters.indexOf(node);
+            var isRest = node.type.kind === 290 /* JSDocVariadicType */ && index === node.parent.parameters.length - 1; // TODO: GH#18217
+            var name = node.name || (isRest ? "rest" : "arg" + index);
+            var dotdotdot = isRest ? ts.createToken(25 /* DotDotDotToken */) : node.dotDotDotToken;
+            return ts.createParameter(node.decorators, node.modifiers, dotdotdot, name, node.questionToken, ts.visitNode(node.type, transformJSDocType), node.initializer);
+        }
+        function transformJSDocTypeReference(node) {
+            var name = node.typeName;
+            var args = node.typeArguments;
+            if (ts.isIdentifier(node.typeName)) {
+                if (ts.isJSDocIndexSignature(node)) {
+                    return transformJSDocIndexSignature(node);
+                }
+                var text = node.typeName.text;
+                switch (node.typeName.text) {
+                    case "String":
+                    case "Boolean":
+                    case "Object":
+                    case "Number":
+                        text = text.toLowerCase();
+                        break;
+                    case "array":
+                    case "date":
+                    case "promise":
+                        text = text[0].toUpperCase() + text.slice(1);
+                        break;
+                }
+                name = ts.createIdentifier(text);
+                if ((text === "Array" || text === "Promise") && !node.typeArguments) {
+                    args = ts.createNodeArray([ts.createTypeReferenceNode("any", ts.emptyArray)]);
+                }
+                else {
+                    args = ts.visitNodes(node.typeArguments, transformJSDocType);
+                }
+            }
+            return ts.createTypeReferenceNode(name, args);
+        }
+        function transformJSDocIndexSignature(node) {
+            var index = ts.createParameter(
+            /*decorators*/ undefined, 
+            /*modifiers*/ undefined, 
+            /*dotDotDotToken*/ undefined, node.typeArguments[0].kind === 135 /* NumberKeyword */ ? "n" : "s", 
+            /*questionToken*/ undefined, ts.createTypeReferenceNode(node.typeArguments[0].kind === 135 /* NumberKeyword */ ? "number" : "string", []), 
+            /*initializer*/ undefined);
+            var indexSignature = ts.createTypeLiteralNode([ts.createIndexSignature(/*decorators*/ undefined, /*modifiers*/ undefined, [index], node.typeArguments[1])]);
+            ts.setEmitFlags(indexSignature, 1 /* SingleLine */);
+            return indexSignature;
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "inferFromUsage";
+        var errorCodes = [
+            // Variable declarations
+            ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code,
+            // Variable uses
+            ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code,
+            // Parameter declarations
+            ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code,
+            ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code,
+            // Get Accessor declarations
+            ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code,
+            ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code,
+            // Set Accessor declarations
+            ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code,
+            // Property declarations
+            ts.Diagnostics.Member_0_implicitly_has_an_1_type.code,
+            //// Suggestions
+            // Variable declarations
+            ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_but_a_better_type_may_be_inferred_from_usage.code,
+            // Variable uses
+            ts.Diagnostics.Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
+            // Parameter declarations
+            ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
+            ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code,
+            // Get Accessor declarations
+            ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_get_accessor_may_be_inferred_from_usage.code,
+            ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage.code,
+            // Set Accessor declarations
+            ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage.code,
+            // Property declarations
+            ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
+        ];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, program = context.program, start = context.span.start, errorCode = context.errorCode, cancellationToken = context.cancellationToken, host = context.host;
+                var token = ts.getTokenAtPosition(sourceFile, start);
+                var declaration;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (changes) { declaration = doChange(changes, sourceFile, token, errorCode, program, cancellationToken, /*markSeen*/ ts.returnTrue, host); });
+                var name = declaration && ts.getNameOfDeclaration(declaration);
+                return !name || changes.length === 0 ? undefined
+                    : [codefix.createCodeFixAction(fixId, changes, [getDiagnostic(errorCode, token), name.getText(sourceFile)], fixId, ts.Diagnostics.Infer_all_types_from_usage)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) {
+                var sourceFile = context.sourceFile, program = context.program, cancellationToken = context.cancellationToken, host = context.host;
+                var markSeen = ts.nodeSeenTracker();
+                return codefix.codeFixAll(context, errorCodes, function (changes, err) {
+                    doChange(changes, sourceFile, ts.getTokenAtPosition(err.file, err.start), err.code, program, cancellationToken, markSeen, host);
+                });
+            },
+        });
+        function getDiagnostic(errorCode, token) {
+            switch (errorCode) {
+                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code:
+                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.isSetAccessorDeclaration(ts.getContainingFunction(token)) ? ts.Diagnostics.Infer_type_of_0_from_usage : ts.Diagnostics.Infer_parameter_types_from_usage; // TODO: GH#18217
+                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code:
+                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Infer_parameter_types_from_usage;
+                default:
+                    return ts.Diagnostics.Infer_type_of_0_from_usage;
+            }
+        }
+        /** Map suggestion code to error code */
+        function mapSuggestionDiagnostic(errorCode) {
+            switch (errorCode) {
+                case ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code;
+                case ts.Diagnostics.Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code;
+                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code;
+                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code;
+                case ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_get_accessor_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code;
+                case ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code;
+                case ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code;
+                case ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Member_0_implicitly_has_an_1_type.code;
+            }
+            return errorCode;
+        }
+        function doChange(changes, sourceFile, token, errorCode, program, cancellationToken, markSeen, host) {
+            if (!ts.isParameterPropertyModifier(token.kind) && token.kind !== 72 /* Identifier */ && token.kind !== 25 /* DotDotDotToken */ && token.kind !== 100 /* ThisKeyword */) {
+                return undefined;
+            }
+            var parent = token.parent;
+            errorCode = mapSuggestionDiagnostic(errorCode);
+            switch (errorCode) {
+                // Variable and Property declarations
+                case ts.Diagnostics.Member_0_implicitly_has_an_1_type.code:
+                case ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code:
+                    if ((ts.isVariableDeclaration(parent) && markSeen(parent)) || ts.isPropertyDeclaration(parent) || ts.isPropertySignature(parent)) { // handle bad location
+                        annotateVariableDeclaration(changes, sourceFile, parent, program, host, cancellationToken);
+                        return parent;
+                    }
+                    if (ts.isPropertyAccessExpression(parent)) {
+                        var type = inferTypeForVariableFromUsage(parent.name, program, cancellationToken);
+                        var typeNode = getTypeNodeIfAccessible(type, parent, program, host);
+                        if (typeNode) {
+                            // Note that the codefix will never fire with an existing `@type` tag, so there is no need to merge tags
+                            var typeTag = ts.createJSDocTypeTag(ts.createJSDocTypeExpression(typeNode), /*comment*/ "");
+                            addJSDocTags(changes, sourceFile, ts.cast(parent.parent.parent, ts.isExpressionStatement), [typeTag]);
+                        }
+                        return parent;
+                    }
+                    return undefined;
+                case ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code: {
+                    var symbol = program.getTypeChecker().getSymbolAtLocation(token);
+                    if (symbol && symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) && markSeen(symbol.valueDeclaration)) {
+                        annotateVariableDeclaration(changes, sourceFile, symbol.valueDeclaration, program, host, cancellationToken);
+                        return symbol.valueDeclaration;
+                    }
+                    return undefined;
+                }
+            }
+            var containingFunction = ts.getContainingFunction(token);
+            if (containingFunction === undefined) {
+                return undefined;
+            }
+            switch (errorCode) {
+                // Parameter declarations
+                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code:
+                    if (ts.isSetAccessorDeclaration(containingFunction)) {
+                        annotateSetAccessor(changes, sourceFile, containingFunction, program, host, cancellationToken);
+                        return containingFunction;
+                    }
+                // falls through
+                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code:
+                    if (markSeen(containingFunction)) {
+                        var param = ts.cast(parent, ts.isParameter);
+                        annotateParameters(changes, sourceFile, param, containingFunction, program, host, cancellationToken);
+                        return param;
+                    }
+                    return undefined;
+                // Get Accessor declarations
+                case ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code:
+                case ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code:
+                    if (ts.isGetAccessorDeclaration(containingFunction) && ts.isIdentifier(containingFunction.name)) {
+                        annotate(changes, sourceFile, containingFunction, inferTypeForVariableFromUsage(containingFunction.name, program, cancellationToken), program, host);
+                        return containingFunction;
+                    }
+                    return undefined;
+                // Set Accessor declarations
+                case ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code:
+                    if (ts.isSetAccessorDeclaration(containingFunction)) {
+                        annotateSetAccessor(changes, sourceFile, containingFunction, program, host, cancellationToken);
+                        return containingFunction;
+                    }
+                    return undefined;
+                default:
+                    return ts.Debug.fail(String(errorCode));
+            }
+        }
+        function annotateVariableDeclaration(changes, sourceFile, declaration, program, host, cancellationToken) {
+            if (ts.isIdentifier(declaration.name)) {
+                annotate(changes, sourceFile, declaration, inferTypeForVariableFromUsage(declaration.name, program, cancellationToken), program, host);
+            }
+        }
+        function annotateParameters(changes, sourceFile, parameterDeclaration, containingFunction, program, host, cancellationToken) {
+            if (!ts.isIdentifier(parameterDeclaration.name)) {
+                return;
+            }
+            var parameterInferences = inferTypeForParametersFromUsage(containingFunction, sourceFile, program, cancellationToken) ||
+                containingFunction.parameters.map(function (p) { return ({
+                    declaration: p,
+                    type: ts.isIdentifier(p.name) ? inferTypeForVariableFromUsage(p.name, program, cancellationToken) : program.getTypeChecker().getAnyType()
+                }); });
+            ts.Debug.assert(containingFunction.parameters.length === parameterInferences.length);
+            if (ts.isInJSFile(containingFunction)) {
+                annotateJSDocParameters(changes, sourceFile, parameterInferences, program, host);
+            }
+            else {
+                var needParens = ts.isArrowFunction(containingFunction) && !ts.findChildOfKind(containingFunction, 20 /* OpenParenToken */, sourceFile);
+                if (needParens)
+                    changes.insertNodeBefore(sourceFile, ts.first(containingFunction.parameters), ts.createToken(20 /* OpenParenToken */));
+                for (var _i = 0, parameterInferences_1 = parameterInferences; _i < parameterInferences_1.length; _i++) {
+                    var _a = parameterInferences_1[_i], declaration = _a.declaration, type = _a.type;
+                    if (declaration && !declaration.type && !declaration.initializer) {
+                        annotate(changes, sourceFile, declaration, type, program, host);
+                    }
+                }
+                if (needParens)
+                    changes.insertNodeAfter(sourceFile, ts.last(containingFunction.parameters), ts.createToken(21 /* CloseParenToken */));
+            }
+        }
+        function annotateSetAccessor(changes, sourceFile, setAccessorDeclaration, program, host, cancellationToken) {
+            var param = ts.firstOrUndefined(setAccessorDeclaration.parameters);
+            if (param && ts.isIdentifier(setAccessorDeclaration.name) && ts.isIdentifier(param.name)) {
+                var type = inferTypeForVariableFromUsage(setAccessorDeclaration.name, program, cancellationToken);
+                if (type === program.getTypeChecker().getAnyType()) {
+                    type = inferTypeForVariableFromUsage(param.name, program, cancellationToken);
+                }
+                if (ts.isInJSFile(setAccessorDeclaration)) {
+                    annotateJSDocParameters(changes, sourceFile, [{ declaration: param, type: type }], program, host);
+                }
+                else {
+                    annotate(changes, sourceFile, param, type, program, host);
+                }
+            }
+        }
+        function annotate(changes, sourceFile, declaration, type, program, host) {
+            var typeNode = getTypeNodeIfAccessible(type, declaration, program, host);
+            if (typeNode) {
+                if (ts.isInJSFile(sourceFile) && declaration.kind !== 153 /* PropertySignature */) {
+                    var parent = ts.isVariableDeclaration(declaration) ? ts.tryCast(declaration.parent.parent, ts.isVariableStatement) : declaration;
+                    if (!parent) {
+                        return;
+                    }
+                    var typeExpression = ts.createJSDocTypeExpression(typeNode);
+                    var typeTag = ts.isGetAccessorDeclaration(declaration) ? ts.createJSDocReturnTag(typeExpression, "") : ts.createJSDocTypeTag(typeExpression, "");
+                    addJSDocTags(changes, sourceFile, parent, [typeTag]);
+                }
+                else {
+                    changes.tryInsertTypeAnnotation(sourceFile, declaration, typeNode);
+                }
+            }
+        }
+        function annotateJSDocParameters(changes, sourceFile, parameterInferences, program, host) {
+            var signature = parameterInferences.length && parameterInferences[0].declaration.parent;
+            if (!signature) {
+                return;
+            }
+            var paramTags = ts.mapDefined(parameterInferences, function (inference) {
+                var param = inference.declaration;
+                // only infer parameters that have (1) no type and (2) an accessible inferred type
+                if (param.initializer || ts.getJSDocType(param) || !ts.isIdentifier(param.name))
+                    return;
+                var typeNode = inference.type && getTypeNodeIfAccessible(inference.type, param, program, host);
+                var name = ts.getSynthesizedClone(param.name);
+                ts.setEmitFlags(name, 1536 /* NoComments */ | 2048 /* NoNestedComments */);
+                return typeNode && ts.createJSDocParamTag(name, !!inference.isOptional, ts.createJSDocTypeExpression(typeNode), "");
+            });
+            addJSDocTags(changes, sourceFile, signature, paramTags);
+        }
+        function addJSDocTags(changes, sourceFile, parent, newTags) {
+            var comments = ts.mapDefined(parent.jsDoc, function (j) { return j.comment; });
+            var oldTags = ts.flatMapToMutable(parent.jsDoc, function (j) { return j.tags; });
+            var unmergedNewTags = newTags.filter(function (newTag) { return !oldTags || !oldTags.some(function (tag, i) {
+                var merged = tryMergeJsdocTags(tag, newTag);
+                if (merged)
+                    oldTags[i] = merged;
+                return !!merged;
+            }); });
+            var tag = ts.createJSDocComment(comments.join("\n"), ts.createNodeArray((oldTags || ts.emptyArray).concat(unmergedNewTags)));
+            changes.insertJsdocCommentBefore(sourceFile, parent, tag);
+        }
+        function tryMergeJsdocTags(oldTag, newTag) {
+            if (oldTag.kind !== newTag.kind) {
+                return undefined;
+            }
+            switch (oldTag.kind) {
+                case 299 /* JSDocParameterTag */: {
+                    var oldParam = oldTag;
+                    var newParam = newTag;
+                    return ts.isIdentifier(oldParam.name) && ts.isIdentifier(newParam.name) && oldParam.name.escapedText === newParam.name.escapedText
+                        ? ts.createJSDocParamTag(newParam.name, newParam.isBracketed, newParam.typeExpression, oldParam.comment)
+                        : undefined;
+                }
+                case 300 /* JSDocReturnTag */:
+                    return ts.createJSDocReturnTag(newTag.typeExpression, oldTag.comment);
+            }
+        }
+        function getTypeNodeIfAccessible(type, enclosingScope, program, host) {
+            var checker = program.getTypeChecker();
+            var typeIsAccessible = true;
+            var notAccessible = function () { typeIsAccessible = false; };
+            var res = checker.typeToTypeNode(type, enclosingScope, /*flags*/ undefined, {
+                trackSymbol: function (symbol, declaration, meaning) {
+                    // TODO: GH#18217
+                    typeIsAccessible = typeIsAccessible && checker.isSymbolAccessible(symbol, declaration, meaning, /*shouldComputeAliasToMarkVisible*/ false).accessibility === 0 /* Accessible */;
+                },
+                reportInaccessibleThisError: notAccessible,
+                reportPrivateInBaseOfClassExpression: notAccessible,
+                reportInaccessibleUniqueSymbolError: notAccessible,
+                moduleResolverHost: {
+                    readFile: host.readFile,
+                    fileExists: host.fileExists,
+                    directoryExists: host.directoryExists,
+                    getSourceFiles: program.getSourceFiles,
+                    getCurrentDirectory: program.getCurrentDirectory,
+                    getCommonSourceDirectory: program.getCommonSourceDirectory,
+                }
+            });
+            return typeIsAccessible ? res : undefined;
+        }
+        function getReferences(token, program, cancellationToken) {
+            // Position shouldn't matter since token is not a SourceFile.
+            return ts.mapDefined(ts.FindAllReferences.getReferenceEntriesForNode(-1, token, program, program.getSourceFiles(), cancellationToken), function (entry) {
+                return entry.kind !== 0 /* Span */ ? ts.tryCast(entry.node, ts.isIdentifier) : undefined;
+            });
+        }
+        function inferTypeForVariableFromUsage(token, program, cancellationToken) {
+            var references = getReferences(token, program, cancellationToken);
+            var checker = program.getTypeChecker();
+            var types = InferFromReference.inferTypesFromReferences(references, checker, cancellationToken);
+            return InferFromReference.unifyFromContext(types, checker);
+        }
+        function inferTypeForParametersFromUsage(containingFunction, sourceFile, program, cancellationToken) {
+            var searchToken;
+            switch (containingFunction.kind) {
+                case 157 /* Constructor */:
+                    searchToken = ts.findChildOfKind(containingFunction, 124 /* ConstructorKeyword */, sourceFile);
+                    break;
+                case 197 /* ArrowFunction */:
+                case 196 /* FunctionExpression */:
+                    var parent = containingFunction.parent;
+                    searchToken = ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name) ?
+                        parent.name :
+                        containingFunction.name;
+                    break;
+                case 239 /* FunctionDeclaration */:
+                case 156 /* MethodDeclaration */:
+                    searchToken = containingFunction.name;
+                    break;
+            }
+            if (searchToken) {
+                return InferFromReference.inferTypeForParametersFromReferences(getReferences(searchToken, program, cancellationToken), containingFunction, program, cancellationToken);
+            }
+        }
+        var InferFromReference;
+        (function (InferFromReference) {
+            function inferTypesFromReferences(references, checker, cancellationToken) {
+                var usageContext = {};
+                for (var _i = 0, references_2 = references; _i < references_2.length; _i++) {
+                    var reference = references_2[_i];
+                    cancellationToken.throwIfCancellationRequested();
+                    inferTypeFromContext(reference, checker, usageContext);
+                }
+                return inferFromContext(usageContext, checker);
+            }
+            InferFromReference.inferTypesFromReferences = inferTypesFromReferences;
+            function inferTypeForParametersFromReferences(references, declaration, program, cancellationToken) {
+                var checker = program.getTypeChecker();
+                if (references.length === 0) {
+                    return undefined;
+                }
+                if (!declaration.parameters) {
+                    return undefined;
+                }
+                var usageContext = {};
+                for (var _i = 0, references_3 = references; _i < references_3.length; _i++) {
+                    var reference = references_3[_i];
+                    cancellationToken.throwIfCancellationRequested();
+                    inferTypeFromContext(reference, checker, usageContext);
+                }
+                var callContexts = (usageContext.constructContexts || []).concat(usageContext.callContexts || []);
+                return declaration.parameters.map(function (parameter, parameterIndex) {
+                    var types = [];
+                    var isRest = ts.isRestParameter(parameter);
+                    var isOptional = false;
+                    for (var _i = 0, callContexts_1 = callContexts; _i < callContexts_1.length; _i++) {
+                        var callContext = callContexts_1[_i];
+                        if (callContext.argumentTypes.length <= parameterIndex) {
+                            isOptional = ts.isInJSFile(declaration);
+                            types.push(checker.getUndefinedType());
+                        }
+                        else if (isRest) {
+                            for (var i = parameterIndex; i < callContext.argumentTypes.length; i++) {
+                                types.push(checker.getBaseTypeOfLiteralType(callContext.argumentTypes[i]));
+                            }
+                        }
+                        else {
+                            types.push(checker.getBaseTypeOfLiteralType(callContext.argumentTypes[parameterIndex]));
+                        }
+                    }
+                    if (ts.isIdentifier(parameter.name)) {
+                        var inferred = inferTypesFromReferences(getReferences(parameter.name, program, cancellationToken), checker, cancellationToken);
+                        types.push.apply(types, (isRest ? ts.mapDefined(inferred, checker.getElementTypeOfArrayType) : inferred));
+                    }
+                    var type = unifyFromContext(types, checker);
+                    return {
+                        type: isRest ? checker.createArrayType(type) : type,
+                        isOptional: isOptional && !isRest,
+                        declaration: parameter
+                    };
+                });
+            }
+            InferFromReference.inferTypeForParametersFromReferences = inferTypeForParametersFromReferences;
+            function inferTypeFromContext(node, checker, usageContext) {
+                while (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
+                    node = node.parent;
+                }
+                switch (node.parent.kind) {
+                    case 203 /* PostfixUnaryExpression */:
+                        usageContext.isNumber = true;
+                        break;
+                    case 202 /* PrefixUnaryExpression */:
+                        inferTypeFromPrefixUnaryExpressionContext(node.parent, usageContext);
+                        break;
+                    case 204 /* BinaryExpression */:
+                        inferTypeFromBinaryExpressionContext(node, node.parent, checker, usageContext);
+                        break;
+                    case 271 /* CaseClause */:
+                    case 272 /* DefaultClause */:
+                        inferTypeFromSwitchStatementLabelContext(node.parent, checker, usageContext);
+                        break;
+                    case 191 /* CallExpression */:
+                    case 192 /* NewExpression */:
+                        if (node.parent.expression === node) {
+                            inferTypeFromCallExpressionContext(node.parent, checker, usageContext);
+                        }
+                        else {
+                            inferTypeFromContextualType(node, checker, usageContext);
+                        }
+                        break;
+                    case 189 /* PropertyAccessExpression */:
+                        inferTypeFromPropertyAccessExpressionContext(node.parent, checker, usageContext);
+                        break;
+                    case 190 /* ElementAccessExpression */:
+                        inferTypeFromPropertyElementExpressionContext(node.parent, node, checker, usageContext);
+                        break;
+                    case 237 /* VariableDeclaration */: {
+                        var _a = node.parent, name = _a.name, initializer = _a.initializer;
+                        if (node === name) {
+                            if (initializer) { // This can happen for `let x = null;` which still has an implicit-any error.
+                                addCandidateType(usageContext, checker.getTypeAtLocation(initializer));
+                            }
+                            break;
+                        }
+                    }
+                    // falls through
+                    default:
+                        return inferTypeFromContextualType(node, checker, usageContext);
+                }
+            }
+            function inferTypeFromContextualType(node, checker, usageContext) {
+                if (ts.isExpressionNode(node)) {
+                    addCandidateType(usageContext, checker.getContextualType(node));
+                }
+            }
+            function inferTypeFromPrefixUnaryExpressionContext(node, usageContext) {
+                switch (node.operator) {
+                    case 44 /* PlusPlusToken */:
+                    case 45 /* MinusMinusToken */:
+                    case 39 /* MinusToken */:
+                    case 53 /* TildeToken */:
+                        usageContext.isNumber = true;
+                        break;
+                    case 38 /* PlusToken */:
+                        usageContext.isNumberOrString = true;
+                        break;
+                    // case SyntaxKind.ExclamationToken:
+                    // no inferences here;
+                }
+            }
+            function inferTypeFromBinaryExpressionContext(node, parent, checker, usageContext) {
+                switch (parent.operatorToken.kind) {
+                    // ExponentiationOperator
+                    case 41 /* AsteriskAsteriskToken */:
+                    // MultiplicativeOperator
+                    case 40 /* AsteriskToken */:
+                    case 42 /* SlashToken */:
+                    case 43 /* PercentToken */:
+                    // ShiftOperator
+                    case 46 /* LessThanLessThanToken */:
+                    case 47 /* GreaterThanGreaterThanToken */:
+                    case 48 /* GreaterThanGreaterThanGreaterThanToken */:
+                    // BitwiseOperator
+                    case 49 /* AmpersandToken */:
+                    case 50 /* BarToken */:
+                    case 51 /* CaretToken */:
+                    // CompoundAssignmentOperator
+                    case 61 /* MinusEqualsToken */:
+                    case 63 /* AsteriskAsteriskEqualsToken */:
+                    case 62 /* AsteriskEqualsToken */:
+                    case 64 /* SlashEqualsToken */:
+                    case 65 /* PercentEqualsToken */:
+                    case 69 /* AmpersandEqualsToken */:
+                    case 70 /* BarEqualsToken */:
+                    case 71 /* CaretEqualsToken */:
+                    case 66 /* LessThanLessThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 67 /* GreaterThanGreaterThanEqualsToken */:
+                    // AdditiveOperator
+                    case 39 /* MinusToken */:
+                    // RelationalOperator
+                    case 28 /* LessThanToken */:
+                    case 31 /* LessThanEqualsToken */:
+                    case 30 /* GreaterThanToken */:
+                    case 32 /* GreaterThanEqualsToken */:
+                        var operandType = checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
+                        if (operandType.flags & 1056 /* EnumLike */) {
+                            addCandidateType(usageContext, operandType);
+                        }
+                        else {
+                            usageContext.isNumber = true;
+                        }
+                        break;
+                    case 60 /* PlusEqualsToken */:
+                    case 38 /* PlusToken */:
+                        var otherOperandType = checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
+                        if (otherOperandType.flags & 1056 /* EnumLike */) {
+                            addCandidateType(usageContext, otherOperandType);
+                        }
+                        else if (otherOperandType.flags & 296 /* NumberLike */) {
+                            usageContext.isNumber = true;
+                        }
+                        else if (otherOperandType.flags & 132 /* StringLike */) {
+                            usageContext.isString = true;
+                        }
+                        else {
+                            usageContext.isNumberOrString = true;
+                        }
+                        break;
+                    //  AssignmentOperators
+                    case 59 /* EqualsToken */:
+                    case 33 /* EqualsEqualsToken */:
+                    case 35 /* EqualsEqualsEqualsToken */:
+                    case 36 /* ExclamationEqualsEqualsToken */:
+                    case 34 /* ExclamationEqualsToken */:
+                        addCandidateType(usageContext, checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left));
+                        break;
+                    case 93 /* InKeyword */:
+                        if (node === parent.left) {
+                            usageContext.isString = true;
+                        }
+                        break;
+                    // LogicalOperator
+                    case 55 /* BarBarToken */:
+                        if (node === parent.left &&
+                            (node.parent.parent.kind === 237 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) {
+                            // var x = x || {};
+                            // TODO: use getFalsyflagsOfType
+                            addCandidateType(usageContext, checker.getTypeAtLocation(parent.right));
+                        }
+                        break;
+                    case 54 /* AmpersandAmpersandToken */:
+                    case 27 /* CommaToken */:
+                    case 94 /* InstanceOfKeyword */:
+                        // nothing to infer here
+                        break;
+                }
+            }
+            function inferTypeFromSwitchStatementLabelContext(parent, checker, usageContext) {
+                addCandidateType(usageContext, checker.getTypeAtLocation(parent.parent.parent.expression));
+            }
+            function inferTypeFromCallExpressionContext(parent, checker, usageContext) {
+                var callContext = {
+                    argumentTypes: [],
+                    returnType: {}
+                };
+                if (parent.arguments) {
+                    for (var _i = 0, _a = parent.arguments; _i < _a.length; _i++) {
+                        var argument = _a[_i];
+                        callContext.argumentTypes.push(checker.getTypeAtLocation(argument));
+                    }
+                }
+                inferTypeFromContext(parent, checker, callContext.returnType);
+                if (parent.kind === 191 /* CallExpression */) {
+                    (usageContext.callContexts || (usageContext.callContexts = [])).push(callContext);
+                }
+                else {
+                    (usageContext.constructContexts || (usageContext.constructContexts = [])).push(callContext);
+                }
+            }
+            function inferTypeFromPropertyAccessExpressionContext(parent, checker, usageContext) {
+                var name = ts.escapeLeadingUnderscores(parent.name.text);
+                if (!usageContext.properties) {
+                    usageContext.properties = ts.createUnderscoreEscapedMap();
+                }
+                var propertyUsageContext = usageContext.properties.get(name) || {};
+                inferTypeFromContext(parent, checker, propertyUsageContext);
+                usageContext.properties.set(name, propertyUsageContext);
+            }
+            function inferTypeFromPropertyElementExpressionContext(parent, node, checker, usageContext) {
+                if (node === parent.argumentExpression) {
+                    usageContext.isNumberOrString = true;
+                    return;
+                }
+                else {
+                    var indexType = checker.getTypeAtLocation(parent.argumentExpression);
+                    var indexUsageContext = {};
+                    inferTypeFromContext(parent, checker, indexUsageContext);
+                    if (indexType.flags & 296 /* NumberLike */) {
+                        usageContext.numberIndexContext = indexUsageContext;
+                    }
+                    else {
+                        usageContext.stringIndexContext = indexUsageContext;
+                    }
+                }
+            }
+            function removeLowPriorityInferences(inferences, priorities) {
+                var toRemove = [];
+                for (var _i = 0, inferences_2 = inferences; _i < inferences_2.length; _i++) {
+                    var i = inferences_2[_i];
+                    for (var _a = 0, priorities_1 = priorities; _a < priorities_1.length; _a++) {
+                        var _b = priorities_1[_a], high = _b.high, low = _b.low;
+                        if (high(i)) {
+                            ts.Debug.assert(!low(i));
+                            toRemove.push(low);
+                        }
+                    }
+                }
+                return inferences.filter(function (i) { return toRemove.every(function (f) { return !f(i); }); });
+            }
+            function unifyFromContext(inferences, checker, fallback) {
+                if (fallback === void 0) { fallback = checker.getAnyType(); }
+                if (!inferences.length)
+                    return fallback;
+                // 1. string or number individually override string | number
+                // 2. non-any, non-void overrides any or void
+                // 3. non-nullable, non-any, non-void, non-anonymous overrides anonymous types
+                var stringNumber = checker.getUnionType([checker.getStringType(), checker.getNumberType()]);
+                var priorities = [
+                    {
+                        high: function (t) { return t === checker.getStringType() || t === checker.getNumberType(); },
+                        low: function (t) { return t === stringNumber; }
+                    },
+                    {
+                        high: function (t) { return !(t.flags & (1 /* Any */ | 16384 /* Void */)); },
+                        low: function (t) { return !!(t.flags & (1 /* Any */ | 16384 /* Void */)); }
+                    },
+                    {
+                        high: function (t) { return !(t.flags & (98304 /* Nullable */ | 1 /* Any */ | 16384 /* Void */)) && !(checker.getObjectFlags(t) & 16 /* Anonymous */); },
+                        low: function (t) { return !!(checker.getObjectFlags(t) & 16 /* Anonymous */); }
+                    }
+                ];
+                var good = removeLowPriorityInferences(inferences, priorities);
+                var anons = good.filter(function (i) { return checker.getObjectFlags(i) & 16 /* Anonymous */; });
+                if (anons.length) {
+                    good = good.filter(function (i) { return !(checker.getObjectFlags(i) & 16 /* Anonymous */); });
+                    good.push(unifyAnonymousTypes(anons, checker));
+                }
+                return checker.getWidenedType(checker.getUnionType(good));
+            }
+            InferFromReference.unifyFromContext = unifyFromContext;
+            function unifyAnonymousTypes(anons, checker) {
+                if (anons.length === 1) {
+                    return anons[0];
+                }
+                var calls = [];
+                var constructs = [];
+                var stringIndices = [];
+                var numberIndices = [];
+                var stringIndexReadonly = false;
+                var numberIndexReadonly = false;
+                var props = ts.createMultiMap();
+                for (var _i = 0, anons_1 = anons; _i < anons_1.length; _i++) {
+                    var anon = anons_1[_i];
+                    for (var _a = 0, _b = checker.getPropertiesOfType(anon); _a < _b.length; _a++) {
+                        var p = _b[_a];
+                        props.add(p.name, checker.getTypeOfSymbolAtLocation(p, p.valueDeclaration));
+                    }
+                    calls.push.apply(calls, checker.getSignaturesOfType(anon, 0 /* Call */));
+                    constructs.push.apply(constructs, checker.getSignaturesOfType(anon, 1 /* Construct */));
+                    if (anon.stringIndexInfo) {
+                        stringIndices.push(anon.stringIndexInfo.type);
+                        stringIndexReadonly = stringIndexReadonly || anon.stringIndexInfo.isReadonly;
+                    }
+                    if (anon.numberIndexInfo) {
+                        numberIndices.push(anon.numberIndexInfo.type);
+                        numberIndexReadonly = numberIndexReadonly || anon.numberIndexInfo.isReadonly;
+                    }
+                }
+                var members = ts.mapEntries(props, function (name, types) {
+                    var isOptional = types.length < anons.length ? 16777216 /* Optional */ : 0;
+                    var s = checker.createSymbol(4 /* Property */ | isOptional, name);
+                    s.type = checker.getUnionType(types);
+                    return [name, s];
+                });
+                return checker.createAnonymousType(anons[0].symbol, members, calls, constructs, stringIndices.length ? checker.createIndexInfo(checker.getUnionType(stringIndices), stringIndexReadonly) : undefined, numberIndices.length ? checker.createIndexInfo(checker.getUnionType(numberIndices), numberIndexReadonly) : undefined);
+            }
+            function inferFromContext(usageContext, checker) {
+                var types = [];
+                if (usageContext.isNumber) {
+                    types.push(checker.getNumberType());
+                }
+                if (usageContext.isString) {
+                    types.push(checker.getStringType());
+                }
+                if (usageContext.isNumberOrString) {
+                    types.push(checker.getUnionType([checker.getStringType(), checker.getNumberType()]));
+                }
+                types.push.apply(types, (usageContext.candidateTypes || []).map(function (t) { return checker.getBaseTypeOfLiteralType(t); }));
+                if (usageContext.properties && hasCallContext(usageContext.properties.get("then"))) {
+                    var paramType = getParameterTypeFromCallContexts(0, usageContext.properties.get("then").callContexts, /*isRestParameter*/ false, checker); // TODO: GH#18217
+                    var types_19 = paramType.getCallSignatures().map(function (c) { return c.getReturnType(); });
+                    types_19.push(checker.createPromiseType(types_19.length ? checker.getUnionType(types_19, 2 /* Subtype */) : checker.getAnyType()));
+                }
+                else if (usageContext.properties && hasCallContext(usageContext.properties.get("push"))) {
+                    types.push(checker.createArrayType(getParameterTypeFromCallContexts(0, usageContext.properties.get("push").callContexts, /*isRestParameter*/ false, checker)));
+                }
+                if (usageContext.numberIndexContext) {
+                    types.push(checker.createArrayType(recur(usageContext.numberIndexContext)));
+                }
+                else if (usageContext.properties || usageContext.callContexts || usageContext.constructContexts || usageContext.stringIndexContext) {
+                    var members_6 = ts.createUnderscoreEscapedMap();
+                    var callSignatures = [];
+                    var constructSignatures = [];
+                    var stringIndexInfo = void 0;
+                    if (usageContext.properties) {
+                        usageContext.properties.forEach(function (context, name) {
+                            var symbol = checker.createSymbol(4 /* Property */, name);
+                            symbol.type = recur(context);
+                            members_6.set(name, symbol);
+                        });
+                    }
+                    if (usageContext.callContexts) {
+                        for (var _i = 0, _a = usageContext.callContexts; _i < _a.length; _i++) {
+                            var callContext = _a[_i];
+                            callSignatures.push(getSignatureFromCallContext(callContext, checker));
+                        }
+                    }
+                    if (usageContext.constructContexts) {
+                        for (var _b = 0, _c = usageContext.constructContexts; _b < _c.length; _b++) {
+                            var constructContext = _c[_b];
+                            constructSignatures.push(getSignatureFromCallContext(constructContext, checker));
+                        }
+                    }
+                    if (usageContext.stringIndexContext) {
+                        stringIndexInfo = checker.createIndexInfo(recur(usageContext.stringIndexContext), /*isReadonly*/ false);
+                    }
+                    types.push(checker.createAnonymousType(/*symbol*/ undefined, members_6, callSignatures, constructSignatures, stringIndexInfo, /*numberIndexInfo*/ undefined)); // TODO: GH#18217
+                }
+                return types;
+                function recur(innerContext) {
+                    return unifyFromContext(inferFromContext(innerContext, checker), checker);
+                }
+            }
+            function getParameterTypeFromCallContexts(parameterIndex, callContexts, isRestParameter, checker) {
+                var types = [];
+                if (callContexts) {
+                    for (var _i = 0, callContexts_2 = callContexts; _i < callContexts_2.length; _i++) {
+                        var callContext = callContexts_2[_i];
+                        if (callContext.argumentTypes.length > parameterIndex) {
+                            if (isRestParameter) {
+                                types = ts.concatenate(types, ts.map(callContext.argumentTypes.slice(parameterIndex), function (a) { return checker.getBaseTypeOfLiteralType(a); }));
+                            }
+                            else {
+                                types.push(checker.getBaseTypeOfLiteralType(callContext.argumentTypes[parameterIndex]));
+                            }
+                        }
+                    }
+                }
+                if (types.length) {
+                    var type = checker.getWidenedType(checker.getUnionType(types, 2 /* Subtype */));
+                    return isRestParameter ? checker.createArrayType(type) : type;
+                }
+                return undefined;
+            }
+            function getSignatureFromCallContext(callContext, checker) {
+                var parameters = [];
+                for (var i = 0; i < callContext.argumentTypes.length; i++) {
+                    var symbol = checker.createSymbol(1 /* FunctionScopedVariable */, ts.escapeLeadingUnderscores("arg" + i));
+                    symbol.type = checker.getWidenedType(checker.getBaseTypeOfLiteralType(callContext.argumentTypes[i]));
+                    parameters.push(symbol);
+                }
+                var returnType = unifyFromContext(inferFromContext(callContext.returnType, checker), checker, checker.getVoidType());
+                // TODO: GH#18217
+                return checker.createSignature(/*declaration*/ undefined, /*typeParameters*/ undefined, /*thisParameter*/ undefined, parameters, returnType, /*typePredicate*/ undefined, callContext.argumentTypes.length, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
+            }
+            function addCandidateType(context, type) {
+                if (type && !(type.flags & 1 /* Any */) && !(type.flags & 131072 /* Never */)) {
+                    (context.candidateTypes || (context.candidateTypes = [])).push(type);
+                }
+            }
+            function hasCallContext(usageContext) {
+                return !!usageContext && !!usageContext.callContexts;
+            }
+        })(InferFromReference || (InferFromReference = {}));
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "convertFunctionToEs6Class";
+        var errorCodes = [ts.Diagnostics.This_constructor_function_may_be_converted_to_a_class_declaration.code];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, context.sourceFile, context.span.start, context.program.getTypeChecker()); });
+                return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Convert_function_to_an_ES2015_class, fixId, ts.Diagnostics.Convert_all_constructor_functions_to_classes)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, err) { return doChange(changes, err.file, err.start, context.program.getTypeChecker()); }); },
+        });
+        function doChange(changes, sourceFile, position, checker) {
+            var ctorSymbol = checker.getSymbolAtLocation(ts.getTokenAtPosition(sourceFile, position));
+            if (!ctorSymbol || !(ctorSymbol.flags & (16 /* Function */ | 3 /* Variable */))) {
+                // Bad input
+                return undefined;
+            }
+            var ctorDeclaration = ctorSymbol.valueDeclaration;
+            var precedingNode;
+            var newClassDeclaration;
+            switch (ctorDeclaration.kind) {
+                case 239 /* FunctionDeclaration */:
+                    precedingNode = ctorDeclaration;
+                    changes.delete(sourceFile, ctorDeclaration);
+                    newClassDeclaration = createClassFromFunctionDeclaration(ctorDeclaration);
+                    break;
+                case 237 /* VariableDeclaration */:
+                    precedingNode = ctorDeclaration.parent.parent;
+                    newClassDeclaration = createClassFromVariableDeclaration(ctorDeclaration);
+                    if (ctorDeclaration.parent.declarations.length === 1) {
+                        ts.copyComments(precedingNode, newClassDeclaration, sourceFile); // TODO: GH#18217
+                        changes.delete(sourceFile, precedingNode);
+                    }
+                    else {
+                        changes.delete(sourceFile, ctorDeclaration);
+                    }
+                    break;
+            }
+            if (!newClassDeclaration) {
+                return undefined;
+            }
+            ts.copyComments(ctorDeclaration, newClassDeclaration, sourceFile);
+            // Because the preceding node could be touched, we need to insert nodes before delete nodes.
+            changes.insertNodeAfter(sourceFile, precedingNode, newClassDeclaration);
+            function createClassElementsFromSymbol(symbol) {
+                var memberElements = [];
+                // all instance members are stored in the "member" array of symbol
+                if (symbol.members) {
+                    symbol.members.forEach(function (member) {
+                        var memberElement = createClassElement(member, /*modifiers*/ undefined);
+                        if (memberElement) {
+                            memberElements.push(memberElement);
+                        }
+                    });
+                }
+                // all static members are stored in the "exports" array of symbol
+                if (symbol.exports) {
+                    symbol.exports.forEach(function (member) {
+                        var memberElement = createClassElement(member, [ts.createToken(116 /* StaticKeyword */)]);
+                        if (memberElement) {
+                            memberElements.push(memberElement);
+                        }
+                    });
+                }
+                return memberElements;
+                function shouldConvertDeclaration(_target, source) {
+                    // Right now the only thing we can convert are function expressions - other values shouldn't get
+                    // transformed. We can update this once ES public class properties are available.
+                    return ts.isFunctionLike(source);
+                }
+                function createClassElement(symbol, modifiers) {
+                    // Right now the only thing we can convert are function expressions, which are marked as methods
+                    if (!(symbol.flags & 8192 /* Method */)) {
+                        return;
+                    }
+                    var memberDeclaration = symbol.valueDeclaration;
+                    var assignmentBinaryExpression = memberDeclaration.parent;
+                    if (!shouldConvertDeclaration(memberDeclaration, assignmentBinaryExpression.right)) {
+                        return;
+                    }
+                    // delete the entire statement if this expression is the sole expression to take care of the semicolon at the end
+                    var nodeToDelete = assignmentBinaryExpression.parent && assignmentBinaryExpression.parent.kind === 221 /* ExpressionStatement */
+                        ? assignmentBinaryExpression.parent : assignmentBinaryExpression;
+                    changes.delete(sourceFile, nodeToDelete);
+                    if (!assignmentBinaryExpression.right) {
+                        return ts.createProperty([], modifiers, symbol.name, /*questionToken*/ undefined, 
+                        /*type*/ undefined, /*initializer*/ undefined);
+                    }
+                    switch (assignmentBinaryExpression.right.kind) {
+                        case 196 /* FunctionExpression */: {
+                            var functionExpression = assignmentBinaryExpression.right;
+                            var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(functionExpression, 121 /* AsyncKeyword */));
+                            var method = ts.createMethod(/*decorators*/ undefined, fullModifiers, /*asteriskToken*/ undefined, memberDeclaration.name, /*questionToken*/ undefined, 
+                            /*typeParameters*/ undefined, functionExpression.parameters, /*type*/ undefined, functionExpression.body);
+                            ts.copyComments(assignmentBinaryExpression, method, sourceFile);
+                            return method;
+                        }
+                        case 197 /* ArrowFunction */: {
+                            var arrowFunction = assignmentBinaryExpression.right;
+                            var arrowFunctionBody = arrowFunction.body;
+                            var bodyBlock = void 0;
+                            // case 1: () => { return [1,2,3] }
+                            if (arrowFunctionBody.kind === 218 /* Block */) {
+                                bodyBlock = arrowFunctionBody;
+                            }
+                            // case 2: () => [1,2,3]
+                            else {
+                                bodyBlock = ts.createBlock([ts.createReturn(arrowFunctionBody)]);
+                            }
+                            var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(arrowFunction, 121 /* AsyncKeyword */));
+                            var method = ts.createMethod(/*decorators*/ undefined, fullModifiers, /*asteriskToken*/ undefined, memberDeclaration.name, /*questionToken*/ undefined, 
+                            /*typeParameters*/ undefined, arrowFunction.parameters, /*type*/ undefined, bodyBlock);
+                            ts.copyComments(assignmentBinaryExpression, method, sourceFile);
+                            return method;
+                        }
+                        default: {
+                            // Don't try to declare members in JavaScript files
+                            if (ts.isSourceFileJS(sourceFile)) {
+                                return;
+                            }
+                            var prop = ts.createProperty(/*decorators*/ undefined, modifiers, memberDeclaration.name, /*questionToken*/ undefined, 
+                            /*type*/ undefined, assignmentBinaryExpression.right);
+                            ts.copyComments(assignmentBinaryExpression.parent, prop, sourceFile);
+                            return prop;
+                        }
+                    }
+                }
+            }
+            function createClassFromVariableDeclaration(node) {
+                var initializer = node.initializer;
+                if (!initializer || initializer.kind !== 196 /* FunctionExpression */) {
+                    return undefined;
+                }
+                if (node.name.kind !== 72 /* Identifier */) {
+                    return undefined;
+                }
+                var memberElements = createClassElementsFromSymbol(node.symbol);
+                if (initializer.body) {
+                    memberElements.unshift(ts.createConstructor(/*decorators*/ undefined, /*modifiers*/ undefined, initializer.parameters, initializer.body));
+                }
+                var modifiers = getModifierKindFromSource(precedingNode, 85 /* ExportKeyword */);
+                var cls = ts.createClassDeclaration(/*decorators*/ undefined, modifiers, node.name, 
+                /*typeParameters*/ undefined, /*heritageClauses*/ undefined, memberElements);
+                // Don't call copyComments here because we'll already leave them in place
+                return cls;
+            }
+            function createClassFromFunctionDeclaration(node) {
+                var memberElements = createClassElementsFromSymbol(ctorSymbol);
+                if (node.body) {
+                    memberElements.unshift(ts.createConstructor(/*decorators*/ undefined, /*modifiers*/ undefined, node.parameters, node.body));
+                }
+                var modifiers = getModifierKindFromSource(node, 85 /* ExportKeyword */);
+                var cls = ts.createClassDeclaration(/*decorators*/ undefined, modifiers, node.name, 
+                /*typeParameters*/ undefined, /*heritageClauses*/ undefined, memberElements);
+                // Don't call copyComments here because we'll already leave them in place
+                return cls;
+            }
+        }
+        function getModifierKindFromSource(source, kind) {
+            return ts.filter(source.modifiers, function (modifier) { return modifier.kind === kind; });
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "convertToAsyncFunction";
+        var errorCodes = [ts.Diagnostics.This_may_be_converted_to_an_async_function.code];
+        var codeActionSucceeded = true;
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                codeActionSucceeded = true;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return convertToAsyncFunction(t, context.sourceFile, context.span.start, context.program.getTypeChecker(), context); });
+                return codeActionSucceeded ? [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Convert_to_async_function, fixId, ts.Diagnostics.Convert_all_to_async_functions)] : [];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, err) { return convertToAsyncFunction(changes, err.file, err.start, context.program.getTypeChecker(), context); }); },
+        });
+        function convertToAsyncFunction(changes, sourceFile, position, checker, context) {
+            // get the function declaration - returns a promise
+            var tokenAtPosition = ts.getTokenAtPosition(sourceFile, position);
+            var functionToConvert;
+            // if the parent of a FunctionLikeDeclaration is a variable declaration, the convertToAsync diagnostic will be reported on the variable name
+            if (ts.isIdentifier(tokenAtPosition) && ts.isVariableDeclaration(tokenAtPosition.parent) &&
+                tokenAtPosition.parent.initializer && ts.isFunctionLikeDeclaration(tokenAtPosition.parent.initializer)) {
+                functionToConvert = tokenAtPosition.parent.initializer;
+            }
+            else {
+                functionToConvert = ts.tryCast(ts.getContainingFunction(ts.getTokenAtPosition(sourceFile, position)), ts.isFunctionLikeDeclaration);
+            }
+            if (!functionToConvert) {
+                return;
+            }
+            var synthNamesMap = ts.createMap();
+            var originalTypeMap = ts.createMap();
+            var allVarNames = [];
+            var isInJavascript = ts.isInJSFile(functionToConvert);
+            var setOfExpressionsToReturn = getAllPromiseExpressionsToReturn(functionToConvert, checker);
+            var functionToConvertRenamed = renameCollidingVarNames(functionToConvert, checker, synthNamesMap, context, setOfExpressionsToReturn, originalTypeMap, allVarNames);
+            var constIdentifiers = getConstIdentifiers(synthNamesMap);
+            var returnStatements = functionToConvertRenamed.body && ts.isBlock(functionToConvertRenamed.body) ? getReturnStatementsWithPromiseHandlers(functionToConvertRenamed.body) : ts.emptyArray;
+            var transformer = { checker: checker, synthNamesMap: synthNamesMap, allVarNames: allVarNames, setOfExpressionsToReturn: setOfExpressionsToReturn, constIdentifiers: constIdentifiers, originalTypeMap: originalTypeMap, isInJSFile: isInJavascript };
+            if (!returnStatements.length) {
+                return;
+            }
+            // add the async keyword
+            changes.insertLastModifierBefore(sourceFile, 121 /* AsyncKeyword */, functionToConvert);
+            function startTransformation(node, nodeToReplace) {
+                var newNodes = transformExpression(node, transformer, node);
+                changes.replaceNodeWithNodes(sourceFile, nodeToReplace, newNodes);
+            }
+            var _loop_21 = function (statement) {
+                ts.forEachChild(statement, function visit(node) {
+                    if (ts.isCallExpression(node)) {
+                        startTransformation(node, statement);
+                    }
+                    else if (!ts.isFunctionLike(node)) {
+                        ts.forEachChild(node, visit);
+                    }
+                });
+            };
+            for (var _i = 0, returnStatements_1 = returnStatements; _i < returnStatements_1.length; _i++) {
+                var statement = returnStatements_1[_i];
+                _loop_21(statement);
+            }
+        }
+        function getReturnStatementsWithPromiseHandlers(body) {
+            var res = [];
+            ts.forEachReturnStatement(body, function (ret) {
+                if (ts.isReturnStatementWithFixablePromiseHandler(ret))
+                    res.push(ret);
+            });
+            return res;
+        }
+        // Returns the identifiers that are never reassigned in the refactor
+        function getConstIdentifiers(synthNamesMap) {
+            var constIdentifiers = [];
+            synthNamesMap.forEach(function (val) {
+                if (val.numberOfAssignmentsOriginal === 0) {
+                    constIdentifiers.push(val.identifier);
+                }
+            });
+            return constIdentifiers;
+        }
+        /*
+            Finds all of the expressions of promise type that should not be saved in a variable during the refactor
+        */
+        function getAllPromiseExpressionsToReturn(func, checker) {
+            if (!func.body) {
+                return ts.createMap();
+            }
+            var setOfExpressionsToReturn = ts.createMap();
+            ts.forEachChild(func.body, function visit(node) {
+                if (isPromiseReturningExpression(node, checker, "then")) {
+                    setOfExpressionsToReturn.set(ts.getNodeId(node).toString(), true);
+                    ts.forEach(node.arguments, visit);
+                }
+                else if (isPromiseReturningExpression(node, checker, "catch")) {
+                    setOfExpressionsToReturn.set(ts.getNodeId(node).toString(), true);
+                    // if .catch() is the last call in the chain, move leftward in the chain until we hit something else that should be returned
+                    ts.forEachChild(node, visit);
+                }
+                else if (isPromiseReturningExpression(node, checker)) {
+                    setOfExpressionsToReturn.set(ts.getNodeId(node).toString(), true);
+                    // don't recurse here, since we won't refactor any children or arguments of the expression
+                }
+                else {
+                    ts.forEachChild(node, visit);
+                }
+            });
+            return setOfExpressionsToReturn;
+        }
+        /*
+            Returns true if node is a promise returning expression
+            If name is not undefined, node is a promise returning call of name
+        */
+        function isPromiseReturningExpression(node, checker, name) {
+            var isNodeExpression = name ? ts.isCallExpression(node) : ts.isExpression(node);
+            var isExpressionOfName = isNodeExpression && (!name || ts.hasPropertyAccessExpressionWithName(node, name));
+            var nodeType = isExpressionOfName && checker.getTypeAtLocation(node);
+            return !!(nodeType && checker.getPromisedTypeOfPromise(nodeType));
+        }
+        function declaredInFile(symbol, sourceFile) {
+            return symbol.valueDeclaration && symbol.valueDeclaration.getSourceFile() === sourceFile;
+        }
+        /*
+            Renaming of identifiers may be neccesary as the refactor changes scopes -
+            This function collects all existing identifier names and names of identifiers that will be created in the refactor.
+            It then checks for any collisions and renames them through getSynthesizedDeepClone
+        */
+        function renameCollidingVarNames(nodeToRename, checker, synthNamesMap, context, setOfAllExpressionsToReturn, originalType, allVarNames) {
+            var identsToRenameMap = ts.createMap(); // key is the symbol id
+            var collidingSymbolMap = ts.createMap();
+            ts.forEachChild(nodeToRename, function visit(node) {
+                if (!ts.isIdentifier(node)) {
+                    ts.forEachChild(node, visit);
+                    return;
+                }
+                var symbol = checker.getSymbolAtLocation(node);
+                var isDefinedInFile = symbol && declaredInFile(symbol, context.sourceFile);
+                if (symbol && isDefinedInFile) {
+                    var type = checker.getTypeAtLocation(node);
+                    var lastCallSignature = getLastCallSignature(type, checker);
+                    var symbolIdString = ts.getSymbolId(symbol).toString();
+                    // if the identifier refers to a function we want to add the new synthesized variable for the declaration (ex. blob in let blob = res(arg))
+                    // Note - the choice of the last call signature is arbitrary
+                    if (lastCallSignature && !ts.isFunctionLikeDeclaration(node.parent) && !synthNamesMap.has(symbolIdString)) {
+                        var firstParameter = ts.firstOrUndefined(lastCallSignature.parameters);
+                        var ident = firstParameter && ts.isParameter(firstParameter.valueDeclaration) && ts.tryCast(firstParameter.valueDeclaration.name, ts.isIdentifier) || ts.createOptimisticUniqueName("result");
+                        var synthName = getNewNameIfConflict(ident, collidingSymbolMap);
+                        synthNamesMap.set(symbolIdString, synthName);
+                        allVarNames.push({ identifier: synthName.identifier, symbol: symbol });
+                        addNameToFrequencyMap(collidingSymbolMap, ident.text, symbol);
+                    }
+                    // we only care about identifiers that are parameters and declarations (don't care about other uses)
+                    else if (node.parent && (ts.isParameter(node.parent) || ts.isVariableDeclaration(node.parent))) {
+                        var originalName = node.text;
+                        var collidingSymbols = collidingSymbolMap.get(originalName);
+                        // if the identifier name conflicts with a different identifier that we've already seen
+                        if (collidingSymbols && collidingSymbols.some(function (prevSymbol) { return prevSymbol !== symbol; })) {
+                            var newName = getNewNameIfConflict(node, collidingSymbolMap);
+                            identsToRenameMap.set(symbolIdString, newName.identifier);
+                            synthNamesMap.set(symbolIdString, newName);
+                            allVarNames.push({ identifier: newName.identifier, symbol: symbol });
+                            addNameToFrequencyMap(collidingSymbolMap, originalName, symbol);
+                        }
+                        else {
+                            var identifier = ts.getSynthesizedDeepClone(node);
+                            identsToRenameMap.set(symbolIdString, identifier);
+                            synthNamesMap.set(symbolIdString, { identifier: identifier, types: [], numberOfAssignmentsOriginal: allVarNames.filter(function (elem) { return elem.identifier.text === node.text; }).length /*, numberOfAssignmentsSynthesized: 0*/ });
+                            if ((ts.isParameter(node.parent) && isExpressionOrCallOnTypePromise(node.parent.parent)) || ts.isVariableDeclaration(node.parent)) {
+                                allVarNames.push({ identifier: identifier, symbol: symbol });
+                                addNameToFrequencyMap(collidingSymbolMap, originalName, symbol);
+                            }
+                        }
+                    }
+                }
+            });
+            return ts.getSynthesizedDeepCloneWithRenames(nodeToRename, /*includeTrivia*/ true, identsToRenameMap, checker, deepCloneCallback);
+            function isExpressionOrCallOnTypePromise(child) {
+                var node = child.parent;
+                if (ts.isCallExpression(node) || ts.isIdentifier(node) && !setOfAllExpressionsToReturn.get(ts.getNodeId(node).toString())) {
+                    var nodeType = checker.getTypeAtLocation(node);
+                    var isPromise = nodeType && checker.getPromisedTypeOfPromise(nodeType);
+                    return !!isPromise;
+                }
+                return false;
+            }
+            function deepCloneCallback(node, clone) {
+                if (ts.isIdentifier(node)) {
+                    var symbol = checker.getSymbolAtLocation(node);
+                    var symboldIdString = symbol && ts.getSymbolId(symbol).toString();
+                    var renameInfo = symbol && synthNamesMap.get(symboldIdString);
+                    if (renameInfo) {
+                        var type = checker.getTypeAtLocation(node);
+                        originalType.set(ts.getNodeId(clone).toString(), type);
+                    }
+                }
+                var val = setOfAllExpressionsToReturn.get(ts.getNodeId(node).toString());
+                if (val !== undefined) {
+                    setOfAllExpressionsToReturn.delete(ts.getNodeId(node).toString());
+                    setOfAllExpressionsToReturn.set(ts.getNodeId(clone).toString(), val);
+                }
+            }
+        }
+        function addNameToFrequencyMap(renamedVarNameFrequencyMap, originalName, symbol) {
+            if (renamedVarNameFrequencyMap.has(originalName)) {
+                renamedVarNameFrequencyMap.get(originalName).push(symbol);
+            }
+            else {
+                renamedVarNameFrequencyMap.set(originalName, [symbol]);
+            }
+        }
+        function getNewNameIfConflict(name, originalNames) {
+            var numVarsSameName = (originalNames.get(name.text) || ts.emptyArray).length;
+            var numberOfAssignmentsOriginal = 0;
+            var identifier = numVarsSameName === 0 ? name : ts.createIdentifier(name.text + "_" + numVarsSameName);
+            return { identifier: identifier, types: [], numberOfAssignmentsOriginal: numberOfAssignmentsOriginal };
+        }
+        // dispatch function to recursively build the refactoring
+        // should be kept up to date with isFixablePromiseHandler in suggestionDiagnostics.ts
+        function transformExpression(node, transformer, outermostParent, prevArgName) {
+            if (!node) {
+                return ts.emptyArray;
+            }
+            var originalType = ts.isIdentifier(node) && transformer.originalTypeMap.get(ts.getNodeId(node).toString());
+            var nodeType = originalType || transformer.checker.getTypeAtLocation(node);
+            if (ts.isCallExpression(node) && ts.hasPropertyAccessExpressionWithName(node, "then") && nodeType && !!transformer.checker.getPromisedTypeOfPromise(nodeType)) {
+                return transformThen(node, transformer, outermostParent, prevArgName);
+            }
+            else if (ts.isCallExpression(node) && ts.hasPropertyAccessExpressionWithName(node, "catch") && nodeType && !!transformer.checker.getPromisedTypeOfPromise(nodeType)) {
+                return transformCatch(node, transformer, prevArgName);
+            }
+            else if (ts.isPropertyAccessExpression(node)) {
+                return transformExpression(node.expression, transformer, outermostParent, prevArgName);
+            }
+            else if (nodeType && transformer.checker.getPromisedTypeOfPromise(nodeType)) {
+                return transformPromiseCall(node, transformer, prevArgName);
+            }
+            codeActionSucceeded = false;
+            return ts.emptyArray;
+        }
+        function transformCatch(node, transformer, prevArgName) {
+            var func = node.arguments[0];
+            var argName = getArgName(func, transformer);
+            var shouldReturn = transformer.setOfExpressionsToReturn.get(ts.getNodeId(node).toString());
+            /*
+                If there is another call in the chain after the .catch() we are transforming, we will need to save the result of both paths (try block and catch block)
+                To do this, we will need to synthesize a variable that we were not aware of while we were adding identifiers to the synthNamesMap
+                We will use the prevArgName and then update the synthNamesMap with a new variable name for the next transformation step
+            */
+            if (prevArgName && !shouldReturn) {
+                prevArgName.numberOfAssignmentsOriginal = 2; // Try block and catch block
+                transformer.synthNamesMap.forEach(function (val, key) {
+                    if (val.identifier.text === prevArgName.identifier.text) {
+                        var newSynthName = createUniqueSynthName(prevArgName);
+                        transformer.synthNamesMap.set(key, newSynthName);
+                    }
+                });
+                // update the constIdentifiers list
+                if (transformer.constIdentifiers.some(function (elem) { return elem.text === prevArgName.identifier.text; })) {
+                    transformer.constIdentifiers.push(createUniqueSynthName(prevArgName).identifier);
+                }
+            }
+            var tryBlock = ts.createBlock(transformExpression(node.expression, transformer, node, prevArgName));
+            var transformationBody = getTransformationBody(func, prevArgName, argName, node, transformer);
+            var catchArg = argName ? argName.identifier.text : "e";
+            var catchClause = ts.createCatchClause(catchArg, ts.createBlock(transformationBody));
+            /*
+                In order to avoid an implicit any, we will synthesize a type for the declaration using the unions of the types of both paths (try block and catch block)
+            */
+            var varDeclList;
+            if (prevArgName && !shouldReturn) {
+                var typeArray = prevArgName.types;
+                var unionType = transformer.checker.getUnionType(typeArray, 2 /* Subtype */);
+                var unionTypeNode = transformer.isInJSFile ? undefined : transformer.checker.typeToTypeNode(unionType);
+                var varDecl = [ts.createVariableDeclaration(ts.getSynthesizedDeepClone(prevArgName.identifier), unionTypeNode)];
+                varDeclList = ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList(varDecl, 1 /* Let */));
+            }
+            var tryStatement = ts.createTry(tryBlock, catchClause, /*finallyBlock*/ undefined);
+            return varDeclList ? [varDeclList, tryStatement] : [tryStatement];
+        }
+        function createUniqueSynthName(prevArgName) {
+            var renamedPrevArg = ts.createOptimisticUniqueName(prevArgName.identifier.text);
+            var newSynthName = { identifier: renamedPrevArg, types: [], numberOfAssignmentsOriginal: 0 };
+            return newSynthName;
+        }
+        function transformThen(node, transformer, outermostParent, prevArgName) {
+            var _a = node.arguments, res = _a[0], rej = _a[1];
+            if (!res) {
+                return transformExpression(node.expression, transformer, outermostParent);
+            }
+            var argNameRes = getArgName(res, transformer);
+            var transformationBody = getTransformationBody(res, prevArgName, argNameRes, node, transformer);
+            if (rej) {
+                var argNameRej = getArgName(rej, transformer);
+                var tryBlock = ts.createBlock(transformExpression(node.expression, transformer, node, argNameRes).concat(transformationBody));
+                var transformationBody2 = getTransformationBody(rej, prevArgName, argNameRej, node, transformer);
+                var catchArg = argNameRej ? argNameRej.identifier.text : "e";
+                var catchClause = ts.createCatchClause(catchArg, ts.createBlock(transformationBody2));
+                return [ts.createTry(tryBlock, catchClause, /* finallyBlock */ undefined)];
+            }
+            return transformExpression(node.expression, transformer, node, argNameRes).concat(transformationBody);
+        }
+        function getFlagOfIdentifier(node, constIdentifiers) {
+            var inArr = constIdentifiers.some(function (elem) { return elem.text === node.text; });
+            return inArr ? 2 /* Const */ : 1 /* Let */;
+        }
+        function transformPromiseCall(node, transformer, prevArgName) {
+            var shouldReturn = transformer.setOfExpressionsToReturn.get(ts.getNodeId(node).toString());
+            // the identifier is empty when the handler (.then()) ignores the argument - In this situation we do not need to save the result of the promise returning call
+            var originalNodeParent = node.original ? node.original.parent : node.parent;
+            if (prevArgName && !shouldReturn && (!originalNodeParent || ts.isPropertyAccessExpression(originalNodeParent))) {
+                return createTransformedStatement(prevArgName, ts.createAwait(node), transformer);
+            }
+            else if (!prevArgName && !shouldReturn && (!originalNodeParent || ts.isPropertyAccessExpression(originalNodeParent))) {
+                return [ts.createStatement(ts.createAwait(node))];
+            }
+            return [ts.createReturn(ts.getSynthesizedDeepClone(node))];
+        }
+        function createTransformedStatement(prevArgName, rightHandSide, transformer) {
+            if (!prevArgName || prevArgName.identifier.text.length === 0) {
+                // if there's no argName to assign to, there still might be side effects
+                return [ts.createStatement(rightHandSide)];
+            }
+            if (prevArgName.types.length < prevArgName.numberOfAssignmentsOriginal) {
+                // if the variable has already been declared, we don't need "let" or "const"
+                return [ts.createStatement(ts.createAssignment(ts.getSynthesizedDeepClone(prevArgName.identifier), rightHandSide))];
+            }
+            return [ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(ts.getSynthesizedDeepClone(prevArgName.identifier), /*type*/ undefined, rightHandSide)], getFlagOfIdentifier(prevArgName.identifier, transformer.constIdentifiers))))];
+        }
+        // should be kept up to date with isFixablePromiseArgument in suggestionDiagnostics.ts
+        function getTransformationBody(func, prevArgName, argName, parent, transformer) {
+            var shouldReturn = transformer.setOfExpressionsToReturn.get(ts.getNodeId(parent).toString());
+            switch (func.kind) {
+                case 96 /* NullKeyword */:
+                    // do not produce a transformed statement for a null argument
+                    break;
+                case 72 /* Identifier */: // identifier includes undefined
+                    if (!argName) {
+                        // undefined was argument passed to promise handler
+                        break;
+                    }
+                    var synthCall = ts.createCall(ts.getSynthesizedDeepClone(func), /*typeArguments*/ undefined, [argName.identifier]);
+                    if (shouldReturn) {
+                        return [ts.createReturn(synthCall)];
+                    }
+                    var type = transformer.originalTypeMap.get(ts.getNodeId(func).toString()) || transformer.checker.getTypeAtLocation(func);
+                    var callSignatures = transformer.checker.getSignaturesOfType(type, 0 /* Call */);
+                    if (!callSignatures.length) {
+                        // if identifier in handler has no call signatures, it's invalid
+                        codeActionSucceeded = false;
+                        break;
+                    }
+                    var returnType = callSignatures[0].getReturnType();
+                    var varDeclOrAssignment = createTransformedStatement(prevArgName, ts.createAwait(synthCall), transformer);
+                    if (prevArgName) {
+                        prevArgName.types.push(returnType);
+                    }
+                    return varDeclOrAssignment;
+                case 196 /* FunctionExpression */:
+                case 197 /* ArrowFunction */: {
+                    var funcBody = func.body;
+                    // Arrow functions with block bodies { } will enter this control flow
+                    if (ts.isBlock(funcBody)) {
+                        var refactoredStmts = [];
+                        var seenReturnStatement = false;
+                        for (var _i = 0, _a = funcBody.statements; _i < _a.length; _i++) {
+                            var statement = _a[_i];
+                            if (ts.isReturnStatement(statement)) {
+                                seenReturnStatement = true;
+                            }
+                            if (ts.isReturnStatementWithFixablePromiseHandler(statement)) {
+                                refactoredStmts = refactoredStmts.concat(getInnerTransformationBody(transformer, [statement], prevArgName));
+                            }
+                            else {
+                                refactoredStmts.push(statement);
+                            }
+                        }
+                        return shouldReturn ? refactoredStmts.map(function (s) { return ts.getSynthesizedDeepClone(s); }) :
+                            removeReturns(refactoredStmts, prevArgName === undefined ? undefined : prevArgName.identifier, transformer, seenReturnStatement);
+                    }
+                    else {
+                        var innerRetStmts = ts.isFixablePromiseHandler(funcBody) ? [ts.createReturn(funcBody)] : ts.emptyArray;
+                        var innerCbBody = getInnerTransformationBody(transformer, innerRetStmts, prevArgName);
+                        if (innerCbBody.length > 0) {
+                            return innerCbBody;
+                        }
+                        var type_6 = transformer.checker.getTypeAtLocation(func);
+                        var returnType_1 = getLastCallSignature(type_6, transformer.checker).getReturnType();
+                        var rightHandSide = ts.getSynthesizedDeepClone(funcBody);
+                        var possiblyAwaitedRightHandSide = !!transformer.checker.getPromisedTypeOfPromise(returnType_1) ? ts.createAwait(rightHandSide) : rightHandSide;
+                        if (!shouldReturn) {
+                            var transformedStatement = createTransformedStatement(prevArgName, possiblyAwaitedRightHandSide, transformer);
+                            if (prevArgName) {
+                                prevArgName.types.push(returnType_1);
+                            }
+                            return transformedStatement;
+                        }
+                        else {
+                            return [ts.createReturn(possiblyAwaitedRightHandSide)];
+                        }
+                    }
+                }
+                default:
+                    // If no cases apply, we've found a transformation body we don't know how to handle, so the refactoring should no-op to avoid deleting code.
+                    codeActionSucceeded = false;
+                    break;
+            }
+            return ts.emptyArray;
+        }
+        function getLastCallSignature(type, checker) {
+            var callSignatures = checker.getSignaturesOfType(type, 0 /* Call */);
+            return ts.lastOrUndefined(callSignatures);
+        }
+        function removeReturns(stmts, prevArgName, transformer, seenReturnStatement) {
+            var ret = [];
+            for (var _i = 0, stmts_1 = stmts; _i < stmts_1.length; _i++) {
+                var stmt = stmts_1[_i];
+                if (ts.isReturnStatement(stmt)) {
+                    if (stmt.expression) {
+                        var possiblyAwaitedExpression = isPromiseReturningExpression(stmt.expression, transformer.checker) ? ts.createAwait(stmt.expression) : stmt.expression;
+                        if (prevArgName === undefined) {
+                            ret.push(ts.createExpressionStatement(possiblyAwaitedExpression));
+                        }
+                        else {
+                            ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(prevArgName, /*type*/ undefined, possiblyAwaitedExpression)], getFlagOfIdentifier(prevArgName, transformer.constIdentifiers)))));
+                        }
+                    }
+                }
+                else {
+                    ret.push(ts.getSynthesizedDeepClone(stmt));
+                }
+            }
+            // if block has no return statement, need to define prevArgName as undefined to prevent undeclared variables
+            if (!seenReturnStatement && prevArgName !== undefined) {
+                ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(prevArgName, /*type*/ undefined, ts.createIdentifier("undefined"))], getFlagOfIdentifier(prevArgName, transformer.constIdentifiers)))));
+            }
+            return ret;
+        }
+        function getInnerTransformationBody(transformer, innerRetStmts, prevArgName) {
+            var innerCbBody = [];
+            for (var _i = 0, innerRetStmts_1 = innerRetStmts; _i < innerRetStmts_1.length; _i++) {
+                var stmt = innerRetStmts_1[_i];
+                ts.forEachChild(stmt, function visit(node) {
+                    if (ts.isCallExpression(node)) {
+                        var temp = transformExpression(node, transformer, node, prevArgName);
+                        innerCbBody = innerCbBody.concat(temp);
+                        if (innerCbBody.length > 0) {
+                            return;
+                        }
+                    }
+                    else if (!ts.isFunctionLike(node)) {
+                        ts.forEachChild(node, visit);
+                    }
+                });
+            }
+            return innerCbBody;
+        }
+        function getArgName(funcNode, transformer) {
+            var numberOfAssignmentsOriginal = 0;
+            var types = [];
+            var name;
+            if (ts.isFunctionLikeDeclaration(funcNode)) {
+                if (funcNode.parameters.length > 0) {
+                    var param = funcNode.parameters[0].name;
+                    name = getMapEntryOrDefault(param);
+                }
+            }
+            else if (ts.isIdentifier(funcNode)) {
+                name = getMapEntryOrDefault(funcNode);
+            }
+            // return undefined argName when arg is null or undefined
+            if (!name || name.identifier.text === "undefined") {
+                return undefined;
+            }
+            return name;
+            function getMapEntryOrDefault(identifier) {
+                var originalNode = getOriginalNode(identifier);
+                var symbol = getSymbol(originalNode);
+                if (!symbol) {
+                    return { identifier: identifier, types: types, numberOfAssignmentsOriginal: numberOfAssignmentsOriginal };
+                }
+                var mapEntry = transformer.synthNamesMap.get(ts.getSymbolId(symbol).toString());
+                return mapEntry || { identifier: identifier, types: types, numberOfAssignmentsOriginal: numberOfAssignmentsOriginal };
+            }
+            function getSymbol(node) {
+                return node.symbol ? node.symbol : transformer.checker.getSymbolAtLocation(node);
+            }
+            function getOriginalNode(node) {
+                return node.original ? node.original : node;
+            }
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        codefix.registerCodeFix({
+            errorCodes: [ts.Diagnostics.File_is_a_CommonJS_module_it_may_be_converted_to_an_ES6_module.code],
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, program = context.program, preferences = context.preferences;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (changes) {
+                    var moduleExportsChangedToDefault = convertFileToEs6Module(sourceFile, program.getTypeChecker(), changes, program.getCompilerOptions().target, ts.getQuotePreference(sourceFile, preferences));
+                    if (moduleExportsChangedToDefault) {
+                        for (var _i = 0, _a = program.getSourceFiles(); _i < _a.length; _i++) {
+                            var importingFile = _a[_i];
+                            fixImportOfModuleExports(importingFile, sourceFile, changes, ts.getQuotePreference(importingFile, preferences));
+                        }
+                    }
+                });
+                // No support for fix-all since this applies to the whole file at once anyway.
+                return [codefix.createCodeFixActionNoFixId("convertToEs6Module", changes, ts.Diagnostics.Convert_to_ES6_module)];
+            },
+        });
+        function fixImportOfModuleExports(importingFile, exportingFile, changes, quotePreference) {
+            for (var _i = 0, _a = importingFile.imports; _i < _a.length; _i++) {
+                var moduleSpecifier = _a[_i];
+                var imported = ts.getResolvedModule(importingFile, moduleSpecifier.text);
+                if (!imported || imported.resolvedFileName !== exportingFile.fileName) {
+                    continue;
+                }
+                var importNode = ts.importFromModuleSpecifier(moduleSpecifier);
+                switch (importNode.kind) {
+                    case 248 /* ImportEqualsDeclaration */:
+                        changes.replaceNode(importingFile, importNode, ts.makeImport(importNode.name, /*namedImports*/ undefined, moduleSpecifier, quotePreference));
+                        break;
+                    case 191 /* CallExpression */:
+                        if (ts.isRequireCall(importNode, /*checkArgumentIsStringLiteralLike*/ false)) {
+                            changes.replaceNode(importingFile, importNode, ts.createPropertyAccess(ts.getSynthesizedDeepClone(importNode), "default"));
+                        }
+                        break;
+                }
+            }
+        }
+        /** @returns Whether we converted a `module.exports =` to a default export. */
+        function convertFileToEs6Module(sourceFile, checker, changes, target, quotePreference) {
+            var identifiers = { original: collectFreeIdentifiers(sourceFile), additional: ts.createMap() };
+            var exports = collectExportRenames(sourceFile, checker, identifiers);
+            convertExportsAccesses(sourceFile, exports, changes);
+            var moduleExportsChangedToDefault = false;
+            for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
+                var statement = _a[_i];
+                var moduleExportsChanged = convertStatement(sourceFile, statement, checker, changes, identifiers, target, exports, quotePreference);
+                moduleExportsChangedToDefault = moduleExportsChangedToDefault || moduleExportsChanged;
+            }
+            return moduleExportsChangedToDefault;
+        }
+        function collectExportRenames(sourceFile, checker, identifiers) {
+            var res = ts.createMap();
+            forEachExportReference(sourceFile, function (node) {
+                var _a = node.name, text = _a.text, originalKeywordKind = _a.originalKeywordKind;
+                if (!res.has(text) && (originalKeywordKind !== undefined && ts.isNonContextualKeyword(originalKeywordKind)
+                    || checker.resolveName(node.name.text, node, 67220415 /* Value */, /*excludeGlobals*/ true))) {
+                    // Unconditionally add an underscore in case `text` is a keyword.
+                    res.set(text, makeUniqueName("_" + text, identifiers));
+                }
+            });
+            return res;
+        }
+        function convertExportsAccesses(sourceFile, exports, changes) {
+            forEachExportReference(sourceFile, function (node, isAssignmentLhs) {
+                if (isAssignmentLhs) {
+                    return;
+                }
+                var text = node.name.text;
+                changes.replaceNode(sourceFile, node, ts.createIdentifier(exports.get(text) || text));
+            });
+        }
+        function forEachExportReference(sourceFile, cb) {
+            sourceFile.forEachChild(function recur(node) {
+                if (ts.isPropertyAccessExpression(node) && ts.isExportsOrModuleExportsOrAlias(sourceFile, node.expression)) {
+                    var parent = node.parent;
+                    cb(node, ts.isBinaryExpression(parent) && parent.left === node && parent.operatorToken.kind === 59 /* EqualsToken */);
+                }
+                node.forEachChild(recur);
+            });
+        }
+        function convertStatement(sourceFile, statement, checker, changes, identifiers, target, exports, quotePreference) {
+            switch (statement.kind) {
+                case 219 /* VariableStatement */:
+                    convertVariableStatement(sourceFile, statement, changes, checker, identifiers, target, quotePreference);
+                    return false;
+                case 221 /* ExpressionStatement */: {
+                    var expression = statement.expression;
+                    switch (expression.kind) {
+                        case 191 /* CallExpression */: {
+                            if (ts.isRequireCall(expression, /*checkArgumentIsStringLiteralLike*/ true)) {
+                                // For side-effecting require() call, just make a side-effecting import.
+                                changes.replaceNode(sourceFile, statement, ts.makeImport(/*name*/ undefined, /*namedImports*/ undefined, expression.arguments[0], quotePreference));
+                            }
+                            return false;
+                        }
+                        case 204 /* BinaryExpression */: {
+                            var operatorToken = expression.operatorToken;
+                            return operatorToken.kind === 59 /* EqualsToken */ && convertAssignment(sourceFile, checker, expression, changes, exports);
+                        }
+                    }
+                }
+                // falls through
+                default:
+                    return false;
+            }
+        }
+        function convertVariableStatement(sourceFile, statement, changes, checker, identifiers, target, quotePreference) {
+            var declarationList = statement.declarationList;
+            var foundImport = false;
+            var newNodes = ts.flatMap(declarationList.declarations, function (decl) {
+                var name = decl.name, initializer = decl.initializer;
+                if (initializer) {
+                    if (ts.isExportsOrModuleExportsOrAlias(sourceFile, initializer)) {
+                        // `const alias = module.exports;` can be removed.
+                        foundImport = true;
+                        return [];
+                    }
+                    else if (ts.isRequireCall(initializer, /*checkArgumentIsStringLiteralLike*/ true)) {
+                        foundImport = true;
+                        return convertSingleImport(sourceFile, name, initializer.arguments[0], changes, checker, identifiers, target, quotePreference);
+                    }
+                    else if (ts.isPropertyAccessExpression(initializer) && ts.isRequireCall(initializer.expression, /*checkArgumentIsStringLiteralLike*/ true)) {
+                        foundImport = true;
+                        return convertPropertyAccessImport(name, initializer.name.text, initializer.expression.arguments[0], identifiers, quotePreference);
+                    }
+                }
+                // Move it out to its own variable statement. (This will not be used if `!foundImport`)
+                return ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList([decl], declarationList.flags));
+            });
+            if (foundImport) {
+                // useNonAdjustedEndPosition to ensure we don't eat the newline after the statement.
+                changes.replaceNodeWithNodes(sourceFile, statement, newNodes);
+            }
+        }
+        /** Converts `const name = require("moduleSpecifier").propertyName` */
+        function convertPropertyAccessImport(name, propertyName, moduleSpecifier, identifiers, quotePreference) {
+            switch (name.kind) {
+                case 184 /* ObjectBindingPattern */:
+                case 185 /* ArrayBindingPattern */: {
+                    // `const [a, b] = require("c").d` --> `import { d } from "c"; const [a, b] = d;`
+                    var tmp = makeUniqueName(propertyName, identifiers);
+                    return [
+                        makeSingleImport(tmp, propertyName, moduleSpecifier, quotePreference),
+                        makeConst(/*modifiers*/ undefined, name, ts.createIdentifier(tmp)),
+                    ];
+                }
+                case 72 /* Identifier */:
+                    // `const a = require("b").c` --> `import { c as a } from "./b";
+                    return [makeSingleImport(name.text, propertyName, moduleSpecifier, quotePreference)];
+                default:
+                    return ts.Debug.assertNever(name);
+            }
+        }
+        function convertAssignment(sourceFile, checker, assignment, changes, exports) {
+            var left = assignment.left, right = assignment.right;
+            if (!ts.isPropertyAccessExpression(left)) {
+                return false;
+            }
+            if (ts.isExportsOrModuleExportsOrAlias(sourceFile, left)) {
+                if (ts.isExportsOrModuleExportsOrAlias(sourceFile, right)) {
+                    // `const alias = module.exports;` or `module.exports = alias;` can be removed.
+                    changes.delete(sourceFile, assignment.parent);
+                }
+                else {
+                    var replacement = ts.isObjectLiteralExpression(right) ? tryChangeModuleExportsObject(right)
+                        : ts.isRequireCall(right, /*checkArgumentIsStringLiteralLike*/ true) ? convertReExportAll(right.arguments[0], checker)
+                            : undefined;
+                    if (replacement) {
+                        changes.replaceNodeWithNodes(sourceFile, assignment.parent, replacement[0]);
+                        return replacement[1];
+                    }
+                    else {
+                        changes.replaceRangeWithText(sourceFile, ts.createRange(left.getStart(sourceFile), right.pos), "export default");
+                        return true;
+                    }
+                }
+            }
+            else if (ts.isExportsOrModuleExportsOrAlias(sourceFile, left.expression)) {
+                convertNamedExport(sourceFile, assignment, changes, exports);
+            }
+            return false;
+        }
+        /**
+         * Convert `module.exports = { ... }` to individual exports..
+         * We can't always do this if the module has interesting members -- then it will be a default export instead.
+         */
+        function tryChangeModuleExportsObject(object) {
+            var statements = ts.mapAllOrFail(object.properties, function (prop) {
+                switch (prop.kind) {
+                    case 158 /* GetAccessor */:
+                    case 159 /* SetAccessor */:
+                    // TODO: Maybe we should handle this? See fourslash test `refactorConvertToEs6Module_export_object_shorthand.ts`.
+                    case 276 /* ShorthandPropertyAssignment */:
+                    case 277 /* SpreadAssignment */:
+                        return undefined;
+                    case 275 /* PropertyAssignment */:
+                        return !ts.isIdentifier(prop.name) ? undefined : convertExportsDotXEquals_replaceNode(prop.name.text, prop.initializer);
+                    case 156 /* MethodDeclaration */:
+                        return !ts.isIdentifier(prop.name) ? undefined : functionExpressionToDeclaration(prop.name.text, [ts.createToken(85 /* ExportKeyword */)], prop);
+                    default:
+                        ts.Debug.assertNever(prop);
+                }
+            });
+            return statements && [statements, false];
+        }
+        function convertNamedExport(sourceFile, assignment, changes, exports) {
+            // If "originalKeywordKind" was set, this is e.g. `exports.
+            var text = assignment.left.name.text;
+            var rename = exports.get(text);
+            if (rename !== undefined) {
+                /*
+                const _class = 0;
+                export { _class as class };
+                */
+                var newNodes = [
+                    makeConst(/*modifiers*/ undefined, rename, assignment.right),
+                    makeExportDeclaration([ts.createExportSpecifier(rename, text)]),
+                ];
+                changes.replaceNodeWithNodes(sourceFile, assignment.parent, newNodes);
+            }
+            else {
+                convertExportsPropertyAssignment(assignment, sourceFile, changes);
+            }
+        }
+        function convertReExportAll(reExported, checker) {
+            // `module.exports = require("x");` ==> `export * from "x"; export { default } from "x";`
+            var moduleSpecifier = reExported.text;
+            var moduleSymbol = checker.getSymbolAtLocation(reExported);
+            var exports = moduleSymbol ? moduleSymbol.exports : ts.emptyUnderscoreEscapedMap;
+            return exports.has("export=")
+                ? [[reExportDefault(moduleSpecifier)], true]
+                : !exports.has("default")
+                    ? [[reExportStar(moduleSpecifier)], false]
+                    // If there's some non-default export, must include both `export *` and `export default`.
+                    : exports.size > 1 ? [[reExportStar(moduleSpecifier), reExportDefault(moduleSpecifier)], true] : [[reExportDefault(moduleSpecifier)], true];
+        }
+        function reExportStar(moduleSpecifier) {
+            return makeExportDeclaration(/*exportClause*/ undefined, moduleSpecifier);
+        }
+        function reExportDefault(moduleSpecifier) {
+            return makeExportDeclaration([ts.createExportSpecifier(/*propertyName*/ undefined, "default")], moduleSpecifier);
+        }
+        function convertExportsPropertyAssignment(_a, sourceFile, changes) {
+            var left = _a.left, right = _a.right, parent = _a.parent;
+            var name = left.name.text;
+            if ((ts.isFunctionExpression(right) || ts.isArrowFunction(right) || ts.isClassExpression(right)) && (!right.name || right.name.text === name)) {
+                // `exports.f = function() {}` -> `export function f() {}` -- Replace `exports.f = ` with `export `, and insert the name after `function`.
+                changes.replaceRange(sourceFile, { pos: left.getStart(sourceFile), end: right.getStart(sourceFile) }, ts.createToken(85 /* ExportKeyword */), { suffix: " " });
+                if (!right.name)
+                    changes.insertName(sourceFile, right, name);
+                var semi = ts.findChildOfKind(parent, 26 /* SemicolonToken */, sourceFile);
+                if (semi)
+                    changes.delete(sourceFile, semi);
+            }
+            else {
+                // `exports.f = function g() {}` -> `export const f = function g() {}` -- just replace `exports.` with `export const `
+                changes.replaceNodeRangeWithNodes(sourceFile, left.expression, ts.findChildOfKind(left, 24 /* DotToken */, sourceFile), [ts.createToken(85 /* ExportKeyword */), ts.createToken(77 /* ConstKeyword */)], { joiner: " ", suffix: " " });
+            }
+        }
+        // TODO: GH#22492 this will cause an error if a change has been made inside the body of the node.
+        function convertExportsDotXEquals_replaceNode(name, exported) {
+            var modifiers = [ts.createToken(85 /* ExportKeyword */)];
+            switch (exported.kind) {
+                case 196 /* FunctionExpression */: {
+                    var expressionName = exported.name;
+                    if (expressionName && expressionName.text !== name) {
+                        // `exports.f = function g() {}` -> `export const f = function g() {}`
+                        return exportConst();
+                    }
+                }
+                // falls through
+                case 197 /* ArrowFunction */:
+                    // `exports.f = function() {}` --> `export function f() {}`
+                    return functionExpressionToDeclaration(name, modifiers, exported);
+                case 209 /* ClassExpression */:
+                    // `exports.C = class {}` --> `export class C {}`
+                    return classExpressionToDeclaration(name, modifiers, exported);
+                default:
+                    return exportConst();
+            }
+            function exportConst() {
+                // `exports.x = 0;` --> `export const x = 0;`
+                return makeConst(modifiers, ts.createIdentifier(name), exported); // TODO: GH#18217
+            }
+        }
+        /**
+         * Converts `const <<name>> = require("x");`.
+         * Returns nodes that will replace the variable declaration for the commonjs import.
+         * May also make use `changes` to remove qualifiers at the use sites of imports, to change `mod.x` to `x`.
+         */
+        function convertSingleImport(file, name, moduleSpecifier, changes, checker, identifiers, target, quotePreference) {
+            switch (name.kind) {
+                case 184 /* ObjectBindingPattern */: {
+                    var importSpecifiers = ts.mapAllOrFail(name.elements, function (e) {
+                        return e.dotDotDotToken || e.initializer || e.propertyName && !ts.isIdentifier(e.propertyName) || !ts.isIdentifier(e.name)
+                            ? undefined
+                            : makeImportSpecifier(e.propertyName && e.propertyName.text, e.name.text);
+                    }); // tslint:disable-line no-unnecessary-type-assertion (TODO: GH#18217)
+                    if (importSpecifiers) {
+                        return [ts.makeImport(/*name*/ undefined, importSpecifiers, moduleSpecifier, quotePreference)];
+                    }
+                }
+                // falls through -- object destructuring has an interesting pattern and must be a variable declaration
+                case 185 /* ArrayBindingPattern */: {
+                    /*
+                    import x from "x";
+                    const [a, b, c] = x;
+                    */
+                    var tmp = makeUniqueName(codefix.moduleSpecifierToValidIdentifier(moduleSpecifier.text, target), identifiers);
+                    return [
+                        ts.makeImport(ts.createIdentifier(tmp), /*namedImports*/ undefined, moduleSpecifier, quotePreference),
+                        makeConst(/*modifiers*/ undefined, ts.getSynthesizedDeepClone(name), ts.createIdentifier(tmp)),
+                    ];
+                }
+                case 72 /* Identifier */:
+                    return convertSingleIdentifierImport(file, name, moduleSpecifier, changes, checker, identifiers, quotePreference);
+                default:
+                    return ts.Debug.assertNever(name);
+            }
+        }
+        /**
+         * Convert `import x = require("x").`
+         * Also converts uses like `x.y()` to `y()` and uses a named import.
+         */
+        function convertSingleIdentifierImport(file, name, moduleSpecifier, changes, checker, identifiers, quotePreference) {
+            var nameSymbol = checker.getSymbolAtLocation(name);
+            // Maps from module property name to name actually used. (The same if there isn't shadowing.)
+            var namedBindingsNames = ts.createMap();
+            // True if there is some non-property use like `x()` or `f(x)`.
+            var needDefaultImport = false;
+            for (var _i = 0, _a = identifiers.original.get(name.text); _i < _a.length; _i++) {
+                var use = _a[_i];
+                if (checker.getSymbolAtLocation(use) !== nameSymbol || use === name) {
+                    // This was a use of a different symbol with the same name, due to shadowing. Ignore.
+                    continue;
+                }
+                var parent = use.parent;
+                if (ts.isPropertyAccessExpression(parent)) {
+                    var expression = parent.expression, propertyName = parent.name.text;
+                    ts.Debug.assert(expression === use); // Else shouldn't have been in `collectIdentifiers`
+                    var idName = namedBindingsNames.get(propertyName);
+                    if (idName === undefined) {
+                        idName = makeUniqueName(propertyName, identifiers);
+                        namedBindingsNames.set(propertyName, idName);
+                    }
+                    changes.replaceNode(file, parent, ts.createIdentifier(idName));
+                }
+                else {
+                    needDefaultImport = true;
+                }
+            }
+            var namedBindings = namedBindingsNames.size === 0 ? undefined : ts.arrayFrom(ts.mapIterator(namedBindingsNames.entries(), function (_a) {
+                var propertyName = _a[0], idName = _a[1];
+                return ts.createImportSpecifier(propertyName === idName ? undefined : ts.createIdentifier(propertyName), ts.createIdentifier(idName));
+            }));
+            if (!namedBindings) {
+                // If it was unused, ensure that we at least import *something*.
+                needDefaultImport = true;
+            }
+            return [ts.makeImport(needDefaultImport ? ts.getSynthesizedDeepClone(name) : undefined, namedBindings, moduleSpecifier, quotePreference)];
+        }
+        // Identifiers helpers
+        function makeUniqueName(name, identifiers) {
+            while (identifiers.original.has(name) || identifiers.additional.has(name)) {
+                name = "_" + name;
+            }
+            identifiers.additional.set(name, true);
+            return name;
+        }
+        function collectFreeIdentifiers(file) {
+            var map = ts.createMultiMap();
+            forEachFreeIdentifier(file, function (id) { return map.add(id.text, id); });
+            return map;
+        }
+        /**
+         * A free identifier is an identifier that can be accessed through name lookup as a local variable.
+         * In the expression `x.y`, `x` is a free identifier, but `y` is not.
+         */
+        function forEachFreeIdentifier(node, cb) {
+            if (ts.isIdentifier(node) && isFreeIdentifier(node))
+                cb(node);
+            node.forEachChild(function (child) { return forEachFreeIdentifier(child, cb); });
+        }
+        function isFreeIdentifier(node) {
+            var parent = node.parent;
+            switch (parent.kind) {
+                case 189 /* PropertyAccessExpression */:
+                    return parent.name !== node;
+                case 186 /* BindingElement */:
+                    return parent.propertyName !== node;
+                case 253 /* ImportSpecifier */:
+                    return parent.propertyName !== node;
+                default:
+                    return true;
+            }
+        }
+        // Node helpers
+        function functionExpressionToDeclaration(name, additionalModifiers, fn) {
+            return ts.createFunctionDeclaration(ts.getSynthesizedDeepClones(fn.decorators), // TODO: GH#19915 Don't think this is even legal.
+            ts.concatenate(additionalModifiers, ts.getSynthesizedDeepClones(fn.modifiers)), ts.getSynthesizedDeepClone(fn.asteriskToken), name, ts.getSynthesizedDeepClones(fn.typeParameters), ts.getSynthesizedDeepClones(fn.parameters), ts.getSynthesizedDeepClone(fn.type), ts.convertToFunctionBody(ts.getSynthesizedDeepClone(fn.body)));
+        }
+        function classExpressionToDeclaration(name, additionalModifiers, cls) {
+            return ts.createClassDeclaration(ts.getSynthesizedDeepClones(cls.decorators), // TODO: GH#19915 Don't think this is even legal.
+            ts.concatenate(additionalModifiers, ts.getSynthesizedDeepClones(cls.modifiers)), name, ts.getSynthesizedDeepClones(cls.typeParameters), ts.getSynthesizedDeepClones(cls.heritageClauses), ts.getSynthesizedDeepClones(cls.members));
+        }
+        function makeSingleImport(localName, propertyName, moduleSpecifier, quotePreference) {
+            return propertyName === "default"
+                ? ts.makeImport(ts.createIdentifier(localName), /*namedImports*/ undefined, moduleSpecifier, quotePreference)
+                : ts.makeImport(/*name*/ undefined, [makeImportSpecifier(propertyName, localName)], moduleSpecifier, quotePreference);
+        }
+        function makeImportSpecifier(propertyName, name) {
+            return ts.createImportSpecifier(propertyName !== undefined && propertyName !== name ? ts.createIdentifier(propertyName) : undefined, ts.createIdentifier(name));
+        }
+        function makeConst(modifiers, name, init) {
+            return ts.createVariableStatement(modifiers, ts.createVariableDeclarationList([ts.createVariableDeclaration(name, /*type*/ undefined, init)], 2 /* Const */));
+        }
+        function makeExportDeclaration(exportSpecifiers, moduleSpecifier) {
+            return ts.createExportDeclaration(
+            /*decorators*/ undefined, 
+            /*modifiers*/ undefined, exportSpecifiers && ts.createNamedExports(exportSpecifiers), moduleSpecifier === undefined ? undefined : ts.createLiteral(moduleSpecifier));
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "correctQualifiedNameToIndexedAccessType";
+        var errorCodes = [ts.Diagnostics.Cannot_access_0_1_because_0_is_a_type_but_not_a_namespace_Did_you_mean_to_retrieve_the_type_of_the_property_1_in_0_with_0_1.code];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var qualifiedName = getQualifiedName(context.sourceFile, context.span.start);
+                if (!qualifiedName)
+                    return undefined;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, context.sourceFile, qualifiedName); });
+                var newText = qualifiedName.left.text + "[\"" + qualifiedName.right.text + "\"]";
+                return [codefix.createCodeFixAction(fixId, changes, [ts.Diagnostics.Rewrite_as_the_indexed_access_type_0, newText], fixId, ts.Diagnostics.Rewrite_all_as_indexed_access_types)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                var q = getQualifiedName(diag.file, diag.start);
+                if (q) {
+                    doChange(changes, diag.file, q);
+                }
+            }); },
+        });
+        function getQualifiedName(sourceFile, pos) {
+            var qualifiedName = ts.findAncestor(ts.getTokenAtPosition(sourceFile, pos), ts.isQualifiedName);
+            ts.Debug.assert(!!qualifiedName, "Expected position to be owned by a qualified name.");
+            return ts.isIdentifier(qualifiedName.left) ? qualifiedName : undefined;
+        }
+        function doChange(changeTracker, sourceFile, qualifiedName) {
+            var rightText = qualifiedName.right.text;
+            var replacement = ts.createIndexedAccessTypeNode(ts.createTypeReferenceNode(qualifiedName.left, /*typeArguments*/ undefined), ts.createLiteralTypeNode(ts.createLiteral(rightText)));
+            changeTracker.replaceNode(sourceFile, qualifiedName, replacement);
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var errorCodes = [ts.Diagnostics.Class_0_incorrectly_implements_interface_1.code,
+            ts.Diagnostics.Class_0_incorrectly_implements_class_1_Did_you_mean_to_extend_1_and_inherit_its_members_as_a_subclass.code];
+        var fixId = "fixClassIncorrectlyImplementsInterface"; // TODO: share a group with fixClassDoesntImplementInheritedAbstractMember?
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, span = context.span;
+                var classDeclaration = getClass(sourceFile, span.start);
+                return ts.mapDefined(ts.getClassImplementsHeritageClauseElements(classDeclaration), function (implementedTypeNode) {
+                    var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return addMissingDeclarations(context, implementedTypeNode, sourceFile, classDeclaration, t, context.preferences); });
+                    return changes.length === 0 ? undefined : codefix.createCodeFixAction(fixId, changes, [ts.Diagnostics.Implement_interface_0, implementedTypeNode.getText(sourceFile)], fixId, ts.Diagnostics.Implement_all_unimplemented_interfaces);
+                });
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) {
+                var seenClassDeclarations = ts.createMap();
+                return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                    var classDeclaration = getClass(diag.file, diag.start);
+                    if (ts.addToSeen(seenClassDeclarations, ts.getNodeId(classDeclaration))) {
+                        for (var _i = 0, _a = ts.getClassImplementsHeritageClauseElements(classDeclaration); _i < _a.length; _i++) {
+                            var implementedTypeNode = _a[_i];
+                            addMissingDeclarations(context, implementedTypeNode, diag.file, classDeclaration, changes, context.preferences);
+                        }
+                    }
+                });
+            },
+        });
+        function getClass(sourceFile, pos) {
+            return ts.Debug.assertDefined(ts.getContainingClass(ts.getTokenAtPosition(sourceFile, pos)));
+        }
+        function symbolPointsToNonPrivateMember(symbol) {
+            return !(ts.getModifierFlags(symbol.valueDeclaration) & 8 /* Private */);
+        }
+        function addMissingDeclarations(context, implementedTypeNode, sourceFile, classDeclaration, changeTracker, preferences) {
+            var checker = context.program.getTypeChecker();
+            var maybeHeritageClauseSymbol = getHeritageClauseSymbolTable(classDeclaration, checker);
+            // Note that this is ultimately derived from a map indexed by symbol names,
+            // so duplicates cannot occur.
+            var implementedType = checker.getTypeAtLocation(implementedTypeNode);
+            var implementedTypeSymbols = checker.getPropertiesOfType(implementedType);
+            var nonPrivateAndNotExistedInHeritageClauseMembers = implementedTypeSymbols.filter(ts.and(symbolPointsToNonPrivateMember, function (symbol) { return !maybeHeritageClauseSymbol.has(symbol.escapedName); }));
+            var classType = checker.getTypeAtLocation(classDeclaration);
+            if (!classType.getNumberIndexType()) {
+                createMissingIndexSignatureDeclaration(implementedType, 1 /* Number */);
+            }
+            if (!classType.getStringIndexType()) {
+                createMissingIndexSignatureDeclaration(implementedType, 0 /* String */);
+            }
+            codefix.createMissingMemberNodes(classDeclaration, nonPrivateAndNotExistedInHeritageClauseMembers, context, preferences, function (member) { return changeTracker.insertNodeAtClassStart(sourceFile, classDeclaration, member); });
+            function createMissingIndexSignatureDeclaration(type, kind) {
+                var indexInfoOfKind = checker.getIndexInfoOfType(type, kind);
+                if (indexInfoOfKind) {
+                    changeTracker.insertNodeAtClassStart(sourceFile, classDeclaration, checker.indexInfoToIndexSignatureDeclaration(indexInfoOfKind, kind, classDeclaration, /*flags*/ undefined, codefix.getNoopSymbolTrackerWithResolver(context)));
+                }
+            }
+        }
+        function getHeritageClauseSymbolTable(classDeclaration, checker) {
+            var heritageClauseNode = ts.getEffectiveBaseTypeNode(classDeclaration);
+            if (!heritageClauseNode)
+                return ts.createSymbolTable();
+            var heritageClauseType = checker.getTypeAtLocation(heritageClauseNode);
+            var heritageClauseTypeSymbols = checker.getPropertiesOfType(heritageClauseType);
+            return ts.createSymbolTable(heritageClauseTypeSymbols.filter(symbolPointsToNonPrivateMember));
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        codefix.importFixId = "fixMissingImport";
+        var errorCodes = [
+            ts.Diagnostics.Cannot_find_name_0.code,
+            ts.Diagnostics.Cannot_find_name_0_Did_you_mean_1.code,
+            ts.Diagnostics.Cannot_find_name_0_Did_you_mean_the_instance_member_this_0.code,
+            ts.Diagnostics.Cannot_find_name_0_Did_you_mean_the_static_member_1_0.code,
+            ts.Diagnostics.Cannot_find_namespace_0.code,
+            ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead.code,
+            ts.Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here.code,
+        ];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var errorCode = context.errorCode, preferences = context.preferences, sourceFile = context.sourceFile, span = context.span;
+                var info = getFixesInfo(context, errorCode, span.start);
+                if (!info)
+                    return undefined;
+                var fixes = info.fixes, symbolName = info.symbolName;
+                var quotePreference = ts.getQuotePreference(sourceFile, preferences);
+                return fixes.map(function (fix) { return codeActionForFix(context, sourceFile, symbolName, fix, quotePreference); });
+            },
+            fixIds: [codefix.importFixId],
+            getAllCodeActions: function (context) {
+                var sourceFile = context.sourceFile, preferences = context.preferences;
+                // Namespace fixes don't conflict, so just build a list.
+                var addToNamespace = [];
+                var importType = [];
+                // Keys are import clause node IDs.
+                var addToExisting = ts.createMap();
+                // Keys are module specifiers.
+                var newImports = ts.createMap();
+                codefix.eachDiagnostic(context, errorCodes, function (diag) {
+                    var info = getFixesInfo(context, diag.code, diag.start);
+                    if (!info || !info.fixes.length)
+                        return;
+                    var fixes = info.fixes, symbolName = info.symbolName;
+                    var fix = ts.first(fixes);
+                    switch (fix.kind) {
+                        case 0 /* UseNamespace */:
+                            addToNamespace.push(fix);
+                            break;
+                        case 1 /* ImportType */:
+                            importType.push(fix);
+                            break;
+                        case 2 /* AddToExisting */: {
+                            var importClause = fix.importClause, importKind = fix.importKind;
+                            var key = String(ts.getNodeId(importClause));
+                            var entry = addToExisting.get(key);
+                            if (!entry) {
+                                addToExisting.set(key, entry = { importClause: importClause, defaultImport: undefined, namedImports: [] });
+                            }
+                            if (importKind === 0 /* Named */) {
+                                ts.pushIfUnique(entry.namedImports, symbolName);
+                            }
+                            else {
+                                ts.Debug.assert(entry.defaultImport === undefined || entry.defaultImport === symbolName);
+                                entry.defaultImport = symbolName;
+                            }
+                            break;
+                        }
+                        case 3 /* AddNew */: {
+                            var moduleSpecifier = fix.moduleSpecifier, importKind = fix.importKind;
+                            var entry = newImports.get(moduleSpecifier);
+                            if (!entry) {
+                                newImports.set(moduleSpecifier, entry = { defaultImport: undefined, namedImports: [], namespaceLikeImport: undefined });
+                            }
+                            switch (importKind) {
+                                case 1 /* Default */:
+                                    ts.Debug.assert(entry.defaultImport === undefined || entry.defaultImport === symbolName);
+                                    entry.defaultImport = symbolName;
+                                    break;
+                                case 0 /* Named */:
+                                    ts.pushIfUnique(entry.namedImports, symbolName);
+                                    break;
+                                case 3 /* Equals */:
+                                case 2 /* Namespace */:
+                                    ts.Debug.assert(entry.namespaceLikeImport === undefined || entry.namespaceLikeImport.name === symbolName);
+                                    entry.namespaceLikeImport = { importKind: importKind, name: symbolName };
+                                    break;
+                            }
+                            break;
+                        }
+                        default:
+                            ts.Debug.assertNever(fix);
+                    }
+                });
+                return codefix.createCombinedCodeActions(ts.textChanges.ChangeTracker.with(context, function (changes) {
+                    var quotePreference = ts.getQuotePreference(sourceFile, preferences);
+                    for (var _i = 0, addToNamespace_1 = addToNamespace; _i < addToNamespace_1.length; _i++) {
+                        var fix = addToNamespace_1[_i];
+                        addNamespaceQualifier(changes, sourceFile, fix);
+                    }
+                    for (var _a = 0, importType_1 = importType; _a < importType_1.length; _a++) {
+                        var fix = importType_1[_a];
+                        addImportType(changes, sourceFile, fix, quotePreference);
+                    }
+                    addToExisting.forEach(function (_a) {
+                        var importClause = _a.importClause, defaultImport = _a.defaultImport, namedImports = _a.namedImports;
+                        doAddExistingFix(changes, sourceFile, importClause, defaultImport, namedImports);
+                    });
+                    newImports.forEach(function (imports, moduleSpecifier) {
+                        addNewImports(changes, sourceFile, moduleSpecifier, quotePreference, imports);
+                    });
+                }));
+            },
+        });
+        // Sorted with the preferred fix coming first.
+        var ImportFixKind;
+        (function (ImportFixKind) {
+            ImportFixKind[ImportFixKind["UseNamespace"] = 0] = "UseNamespace";
+            ImportFixKind[ImportFixKind["ImportType"] = 1] = "ImportType";
+            ImportFixKind[ImportFixKind["AddToExisting"] = 2] = "AddToExisting";
+            ImportFixKind[ImportFixKind["AddNew"] = 3] = "AddNew";
+        })(ImportFixKind || (ImportFixKind = {}));
+        var ImportKind;
+        (function (ImportKind) {
+            ImportKind[ImportKind["Named"] = 0] = "Named";
+            ImportKind[ImportKind["Default"] = 1] = "Default";
+            ImportKind[ImportKind["Namespace"] = 2] = "Namespace";
+            ImportKind[ImportKind["Equals"] = 3] = "Equals";
+        })(ImportKind || (ImportKind = {}));
+        function getImportCompletionAction(exportedSymbol, moduleSymbol, sourceFile, symbolName, host, program, formatContext, position, preferences) {
+            var exportInfos = getAllReExportingModules(exportedSymbol, moduleSymbol, symbolName, sourceFile, program.getCompilerOptions(), program.getTypeChecker(), program.getSourceFiles());
+            ts.Debug.assert(exportInfos.some(function (info) { return info.moduleSymbol === moduleSymbol; }));
+            // We sort the best codefixes first, so taking `first` is best for completions.
+            var moduleSpecifier = ts.first(getNewImportInfos(program, sourceFile, position, exportInfos, host, preferences)).moduleSpecifier;
+            var fix = ts.first(getFixForImport(exportInfos, symbolName, position, program, sourceFile, host, preferences));
+            return { moduleSpecifier: moduleSpecifier, codeAction: codeFixActionToCodeAction(codeActionForFix({ host: host, formatContext: formatContext }, sourceFile, symbolName, fix, ts.getQuotePreference(sourceFile, preferences))) };
+        }
+        codefix.getImportCompletionAction = getImportCompletionAction;
+        function codeFixActionToCodeAction(_a) {
+            var description = _a.description, changes = _a.changes, commands = _a.commands;
+            return { description: description, changes: changes, commands: commands };
+        }
+        function getAllReExportingModules(exportedSymbol, exportingModuleSymbol, symbolName, sourceFile, compilerOptions, checker, allSourceFiles) {
+            var result = [];
+            forEachExternalModule(checker, allSourceFiles, function (moduleSymbol, moduleFile) {
+                // Don't import from a re-export when looking "up" like to `./index` or `../index`.
+                if (moduleFile && moduleSymbol !== exportingModuleSymbol && ts.startsWith(sourceFile.fileName, ts.getDirectoryPath(moduleFile.fileName))) {
+                    return;
+                }
+                var defaultInfo = getDefaultLikeExportInfo(moduleSymbol, checker, compilerOptions);
+                if (defaultInfo && defaultInfo.name === symbolName && ts.skipAlias(defaultInfo.symbol, checker) === exportedSymbol) {
+                    result.push({ moduleSymbol: moduleSymbol, importKind: defaultInfo.kind, exportedSymbolIsTypeOnly: isTypeOnlySymbol(defaultInfo.symbol, checker) });
+                }
+                for (var _i = 0, _a = checker.getExportsOfModule(moduleSymbol); _i < _a.length; _i++) {
+                    var exported = _a[_i];
+                    if (exported.name === symbolName && ts.skipAlias(exported, checker) === exportedSymbol) {
+                        result.push({ moduleSymbol: moduleSymbol, importKind: 0 /* Named */, exportedSymbolIsTypeOnly: isTypeOnlySymbol(exported, checker) });
+                    }
+                }
+            });
+            return result;
+        }
+        function isTypeOnlySymbol(s, checker) {
+            return !(ts.skipAlias(s, checker).flags & 67220415 /* Value */);
+        }
+        function getFixForImport(exportInfos, symbolName, position, program, sourceFile, host, preferences) {
+            var checker = program.getTypeChecker();
+            var existingImports = ts.flatMap(exportInfos, function (info) { return getExistingImportDeclarations(info, checker, sourceFile); });
+            var useNamespace = position === undefined ? undefined : tryUseExistingNamespaceImport(existingImports, symbolName, position, checker);
+            var addToExisting = tryAddToExistingImport(existingImports);
+            // Don't bother providing an action to add a new import if we can add to an existing one.
+            var addImport = addToExisting ? [addToExisting] : getFixesForAddImport(exportInfos, existingImports, program, sourceFile, position, host, preferences);
+            return (useNamespace ? [useNamespace] : ts.emptyArray).concat(addImport);
+        }
+        function tryUseExistingNamespaceImport(existingImports, symbolName, position, checker) {
+            // It is possible that multiple import statements with the same specifier exist in the file.
+            // e.g.
+            //
+            //     import * as ns from "foo";
+            //     import { member1, member2 } from "foo";
+            //
+            //     member3/**/ <-- cusor here
+            //
+            // in this case we should provie 2 actions:
+            //     1. change "member3" to "ns.member3"
+            //     2. add "member3" to the second import statement's import list
+            // and it is up to the user to decide which one fits best.
+            return ts.firstDefined(existingImports, function (_a) {
+                var declaration = _a.declaration;
+                var namespace = getNamespaceImportName(declaration);
+                if (namespace) {
+                    var moduleSymbol = checker.getAliasedSymbol(checker.getSymbolAtLocation(namespace));
+                    if (moduleSymbol && moduleSymbol.exports.has(ts.escapeLeadingUnderscores(symbolName))) {
+                        return { kind: 0 /* UseNamespace */, namespacePrefix: namespace.text, position: position };
+                    }
+                }
+            });
+        }
+        function tryAddToExistingImport(existingImports) {
+            return ts.firstDefined(existingImports, function (_a) {
+                var declaration = _a.declaration, importKind = _a.importKind;
+                if (declaration.kind !== 249 /* ImportDeclaration */)
+                    return undefined;
+                var importClause = declaration.importClause;
+                if (!importClause)
+                    return undefined;
+                var name = importClause.name, namedBindings = importClause.namedBindings;
+                return importKind === 1 /* Default */ && !name || importKind === 0 /* Named */ && (!namedBindings || namedBindings.kind === 252 /* NamedImports */)
+                    ? { kind: 2 /* AddToExisting */, importClause: importClause, importKind: importKind }
+                    : undefined;
+            });
+        }
+        function getNamespaceImportName(declaration) {
+            if (declaration.kind === 249 /* ImportDeclaration */) {
+                var namedBindings = declaration.importClause && ts.isImportClause(declaration.importClause) && declaration.importClause.namedBindings;
+                return namedBindings && namedBindings.kind === 251 /* NamespaceImport */ ? namedBindings.name : undefined;
+            }
+            else {
+                return declaration.name;
+            }
+        }
+        function getExistingImportDeclarations(_a, checker, sourceFile) {
+            var moduleSymbol = _a.moduleSymbol, importKind = _a.importKind, exportedSymbolIsTypeOnly = _a.exportedSymbolIsTypeOnly;
+            // Can't use an es6 import for a type in JS.
+            return exportedSymbolIsTypeOnly && ts.isSourceFileJS(sourceFile) ? ts.emptyArray : ts.mapDefined(sourceFile.imports, function (moduleSpecifier) {
+                var i = ts.importFromModuleSpecifier(moduleSpecifier);
+                return (i.kind === 249 /* ImportDeclaration */ || i.kind === 248 /* ImportEqualsDeclaration */)
+                    && checker.getSymbolAtLocation(moduleSpecifier) === moduleSymbol ? { declaration: i, importKind: importKind } : undefined;
+            });
+        }
+        function getNewImportInfos(program, sourceFile, position, moduleSymbols, host, preferences) {
+            var isJs = ts.isSourceFileJS(sourceFile);
+            var choicesForEachExportingModule = ts.flatMap(moduleSymbols, function (_a) {
+                var moduleSymbol = _a.moduleSymbol, importKind = _a.importKind, exportedSymbolIsTypeOnly = _a.exportedSymbolIsTypeOnly;
+                return ts.moduleSpecifiers.getModuleSpecifiers(moduleSymbol, program.getCompilerOptions(), sourceFile, host, program.getSourceFiles(), preferences, program.redirectTargetsMap)
+                    .map(function (moduleSpecifier) {
+                    // `position` should only be undefined at a missing jsx namespace, in which case we shouldn't be looking for pure types.
+                    return exportedSymbolIsTypeOnly && isJs ? { kind: 1 /* ImportType */, moduleSpecifier: moduleSpecifier, position: ts.Debug.assertDefined(position) } : { kind: 3 /* AddNew */, moduleSpecifier: moduleSpecifier, importKind: importKind };
+                });
+            });
+            // Sort to keep the shortest paths first
+            return ts.sort(choicesForEachExportingModule, function (a, b) { return a.moduleSpecifier.length - b.moduleSpecifier.length; });
+        }
+        function getFixesForAddImport(exportInfos, existingImports, program, sourceFile, position, host, preferences) {
+            var existingDeclaration = ts.firstDefined(existingImports, newImportInfoFromExistingSpecifier);
+            return existingDeclaration ? [existingDeclaration] : getNewImportInfos(program, sourceFile, position, exportInfos, host, preferences);
+        }
+        function newImportInfoFromExistingSpecifier(_a) {
+            var declaration = _a.declaration, importKind = _a.importKind;
+            var expression = declaration.kind === 249 /* ImportDeclaration */
+                ? declaration.moduleSpecifier
+                : declaration.moduleReference.kind === 259 /* ExternalModuleReference */
+                    ? declaration.moduleReference.expression
+                    : undefined;
+            return expression && ts.isStringLiteral(expression) ? { kind: 3 /* AddNew */, moduleSpecifier: expression.text, importKind: importKind } : undefined;
+        }
+        function getFixesInfo(context, errorCode, pos) {
+            var symbolToken = ts.getTokenAtPosition(context.sourceFile, pos);
+            var info = errorCode === ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead.code
+                ? getFixesInfoForUMDImport(context, symbolToken)
+                : ts.isIdentifier(symbolToken) ? getFixesInfoForNonUMDImport(context, symbolToken) : undefined;
+            return info && __assign({}, info, { fixes: ts.sort(info.fixes, function (a, b) { return a.kind - b.kind; }) });
+        }
+        function getFixesInfoForUMDImport(_a, token) {
+            var sourceFile = _a.sourceFile, program = _a.program, host = _a.host, preferences = _a.preferences;
+            var checker = program.getTypeChecker();
+            var umdSymbol = getUmdSymbol(token, checker);
+            if (!umdSymbol)
+                return undefined;
+            var symbol = checker.getAliasedSymbol(umdSymbol);
+            var symbolName = umdSymbol.name;
+            var exportInfos = [{ moduleSymbol: symbol, importKind: getUmdImportKind(program.getCompilerOptions()), exportedSymbolIsTypeOnly: false }];
+            var fixes = getFixForImport(exportInfos, symbolName, ts.isIdentifier(token) ? token.getStart(sourceFile) : undefined, program, sourceFile, host, preferences);
+            return { fixes: fixes, symbolName: symbolName };
+        }
+        function getUmdSymbol(token, checker) {
+            // try the identifier to see if it is the umd symbol
+            var umdSymbol = ts.isIdentifier(token) ? checker.getSymbolAtLocation(token) : undefined;
+            if (ts.isUMDExportSymbol(umdSymbol))
+                return umdSymbol;
+            // The error wasn't for the symbolAtLocation, it was for the JSX tag itself, which needs access to e.g. `React`.
+            var parent = token.parent;
+            return (ts.isJsxOpeningLikeElement(parent) && parent.tagName === token) || ts.isJsxOpeningFragment(parent)
+                ? ts.tryCast(checker.resolveName(checker.getJsxNamespace(parent), ts.isJsxOpeningLikeElement(parent) ? token : parent, 67220415 /* Value */, /*excludeGlobals*/ false), ts.isUMDExportSymbol)
+                : undefined;
+        }
+        function getUmdImportKind(compilerOptions) {
+            // Import a synthetic `default` if enabled.
+            if (ts.getAllowSyntheticDefaultImports(compilerOptions)) {
+                return 1 /* Default */;
+            }
+            // When a synthetic `default` is unavailable, use `import..require` if the module kind supports it.
+            var moduleKind = ts.getEmitModuleKind(compilerOptions);
+            switch (moduleKind) {
+                case ts.ModuleKind.AMD:
+                case ts.ModuleKind.CommonJS:
+                case ts.ModuleKind.UMD:
+                    return 3 /* Equals */;
+                case ts.ModuleKind.System:
+                case ts.ModuleKind.ES2015:
+                case ts.ModuleKind.ESNext:
+                case ts.ModuleKind.None:
+                    // Fall back to the `import * as ns` style import.
+                    return 2 /* Namespace */;
+                default:
+                    return ts.Debug.assertNever(moduleKind);
+            }
+        }
+        function getFixesInfoForNonUMDImport(_a, symbolToken) {
+            var sourceFile = _a.sourceFile, program = _a.program, cancellationToken = _a.cancellationToken, host = _a.host, preferences = _a.preferences;
+            var checker = program.getTypeChecker();
+            // If we're at `<Foo/>`, we must check if `Foo` is already in scope, and if so, get an import for `React` instead.
+            var symbolName = ts.isJsxOpeningLikeElement(symbolToken.parent)
+                && symbolToken.parent.tagName === symbolToken
+                && (ts.isIntrinsicJsxName(symbolToken.text) || checker.resolveName(symbolToken.text, symbolToken, 67108863 /* All */, /*excludeGlobals*/ false))
+                ? checker.getJsxNamespace(sourceFile)
+                : symbolToken.text;
+            // "default" is a keyword and not a legal identifier for the import, so we don't expect it here
+            ts.Debug.assert(symbolName !== "default" /* Default */);
+            var fixes = ts.arrayFrom(ts.flatMapIterator(getExportInfos(symbolName, ts.getMeaningFromLocation(symbolToken), cancellationToken, sourceFile, checker, program).entries(), function (_a) {
+                var _ = _a[0], exportInfos = _a[1];
+                return getFixForImport(exportInfos, symbolName, symbolToken.getStart(sourceFile), program, sourceFile, host, preferences);
+            }));
+            return { fixes: fixes, symbolName: symbolName };
+        }
+        // Returns a map from an exported symbol's ID to a list of every way it's (re-)exported.
+        function getExportInfos(symbolName, currentTokenMeaning, cancellationToken, sourceFile, checker, program) {
+            // For each original symbol, keep all re-exports of that symbol together so we can call `getCodeActionsForImport` on the whole group at once.
+            // Maps symbol id to info for modules providing that symbol (original export + re-exports).
+            var originalSymbolToExportInfos = ts.createMultiMap();
+            function addSymbol(moduleSymbol, exportedSymbol, importKind) {
+                originalSymbolToExportInfos.add(ts.getUniqueSymbolId(exportedSymbol, checker).toString(), { moduleSymbol: moduleSymbol, importKind: importKind, exportedSymbolIsTypeOnly: isTypeOnlySymbol(exportedSymbol, checker) });
+            }
+            forEachExternalModuleToImportFrom(checker, sourceFile, program.getSourceFiles(), function (moduleSymbol) {
+                cancellationToken.throwIfCancellationRequested();
+                var defaultInfo = getDefaultLikeExportInfo(moduleSymbol, checker, program.getCompilerOptions());
+                if (defaultInfo && defaultInfo.name === symbolName && symbolHasMeaning(defaultInfo.symbolForMeaning, currentTokenMeaning)) {
+                    addSymbol(moduleSymbol, defaultInfo.symbol, defaultInfo.kind);
+                }
+                // check exports with the same name
+                var exportSymbolWithIdenticalName = checker.tryGetMemberInModuleExportsAndProperties(symbolName, moduleSymbol);
+                if (exportSymbolWithIdenticalName && symbolHasMeaning(exportSymbolWithIdenticalName, currentTokenMeaning)) {
+                    addSymbol(moduleSymbol, exportSymbolWithIdenticalName, 0 /* Named */);
+                }
+            });
+            return originalSymbolToExportInfos;
+        }
+        function getDefaultLikeExportInfo(moduleSymbol, checker, compilerOptions) {
+            var exported = getDefaultLikeExportWorker(moduleSymbol, checker);
+            if (!exported)
+                return undefined;
+            var symbol = exported.symbol, kind = exported.kind;
+            var info = getDefaultExportInfoWorker(symbol, moduleSymbol, checker, compilerOptions);
+            return info && __assign({ symbol: symbol, kind: kind }, info);
+        }
+        function getDefaultLikeExportWorker(moduleSymbol, checker) {
+            var defaultExport = checker.tryGetMemberInModuleExports("default" /* Default */, moduleSymbol);
+            if (defaultExport)
+                return { symbol: defaultExport, kind: 1 /* Default */ };
+            var exportEquals = checker.resolveExternalModuleSymbol(moduleSymbol);
+            return exportEquals === moduleSymbol ? undefined : { symbol: exportEquals, kind: 3 /* Equals */ };
+        }
+        function getDefaultExportInfoWorker(defaultExport, moduleSymbol, checker, compilerOptions) {
+            var localSymbol = ts.getLocalSymbolForExportDefault(defaultExport);
+            if (localSymbol)
+                return { symbolForMeaning: localSymbol, name: localSymbol.name };
+            var name = getNameForExportDefault(defaultExport);
+            if (name !== undefined)
+                return { symbolForMeaning: defaultExport, name: name };
+            if (defaultExport.flags & 2097152 /* Alias */) {
+                var aliased = checker.getImmediateAliasedSymbol(defaultExport);
+                return aliased && getDefaultExportInfoWorker(aliased, ts.Debug.assertDefined(aliased.parent), checker, compilerOptions);
+            }
+            else {
+                return { symbolForMeaning: defaultExport, name: moduleSymbolToValidIdentifier(moduleSymbol, compilerOptions.target) };
+            }
+        }
+        function getNameForExportDefault(symbol) {
+            return symbol.declarations && ts.firstDefined(symbol.declarations, function (declaration) {
+                if (ts.isExportAssignment(declaration)) {
+                    if (ts.isIdentifier(declaration.expression)) {
+                        return declaration.expression.text;
+                    }
+                }
+                else if (ts.isExportSpecifier(declaration)) {
+                    ts.Debug.assert(declaration.name.text === "default" /* Default */);
+                    return declaration.propertyName && declaration.propertyName.text;
+                }
+            });
+        }
+        function codeActionForFix(context, sourceFile, symbolName, fix, quotePreference) {
+            var diag;
+            var changes = ts.textChanges.ChangeTracker.with(context, function (tracker) {
+                diag = codeActionForFixWorker(tracker, sourceFile, symbolName, fix, quotePreference);
+            });
+            return codefix.createCodeFixAction("import", changes, diag, codefix.importFixId, ts.Diagnostics.Add_all_missing_imports);
+        }
+        function codeActionForFixWorker(changes, sourceFile, symbolName, fix, quotePreference) {
+            switch (fix.kind) {
+                case 0 /* UseNamespace */:
+                    addNamespaceQualifier(changes, sourceFile, fix);
+                    return [ts.Diagnostics.Change_0_to_1, symbolName, fix.namespacePrefix + "." + symbolName];
+                case 1 /* ImportType */:
+                    addImportType(changes, sourceFile, fix, quotePreference);
+                    return [ts.Diagnostics.Change_0_to_1, symbolName, getImportTypePrefix(fix.moduleSpecifier, quotePreference) + symbolName];
+                case 2 /* AddToExisting */: {
+                    var importClause = fix.importClause, importKind = fix.importKind;
+                    doAddExistingFix(changes, sourceFile, importClause, importKind === 1 /* Default */ ? symbolName : undefined, importKind === 0 /* Named */ ? [symbolName] : ts.emptyArray);
+                    var moduleSpecifierWithoutQuotes = ts.stripQuotes(importClause.parent.moduleSpecifier.getText());
+                    return [importKind === 1 /* Default */ ? ts.Diagnostics.Add_default_import_0_to_existing_import_declaration_from_1 : ts.Diagnostics.Add_0_to_existing_import_declaration_from_1, symbolName, moduleSpecifierWithoutQuotes]; // you too!
+                }
+                case 3 /* AddNew */: {
+                    var importKind = fix.importKind, moduleSpecifier = fix.moduleSpecifier;
+                    addNewImports(changes, sourceFile, moduleSpecifier, quotePreference, importKind === 1 /* Default */ ? { defaultImport: symbolName, namedImports: ts.emptyArray, namespaceLikeImport: undefined }
+                        : importKind === 0 /* Named */ ? { defaultImport: undefined, namedImports: [symbolName], namespaceLikeImport: undefined }
+                            : { defaultImport: undefined, namedImports: ts.emptyArray, namespaceLikeImport: { importKind: importKind, name: symbolName } });
+                    return [importKind === 1 /* Default */ ? ts.Diagnostics.Import_default_0_from_module_1 : ts.Diagnostics.Import_0_from_module_1, symbolName, moduleSpecifier];
+                }
+                default:
+                    return ts.Debug.assertNever(fix);
+            }
+        }
+        function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImports) {
+            if (defaultImport) {
+                ts.Debug.assert(!clause.name);
+                changes.insertNodeAt(sourceFile, clause.getStart(sourceFile), ts.createIdentifier(defaultImport), { suffix: ", " });
+            }
+            if (namedImports.length) {
+                var specifiers = namedImports.map(function (name) { return ts.createImportSpecifier(/*propertyName*/ undefined, ts.createIdentifier(name)); });
+                if (clause.namedBindings && ts.cast(clause.namedBindings, ts.isNamedImports).elements.length) {
+                    for (var _i = 0, specifiers_1 = specifiers; _i < specifiers_1.length; _i++) {
+                        var spec = specifiers_1[_i];
+                        changes.insertNodeInListAfter(sourceFile, ts.last(ts.cast(clause.namedBindings, ts.isNamedImports).elements), spec);
+                    }
+                }
+                else {
+                    if (specifiers.length) {
+                        var namedImports_1 = ts.createNamedImports(specifiers);
+                        if (clause.namedBindings) {
+                            changes.replaceNode(sourceFile, clause.namedBindings, namedImports_1);
+                        }
+                        else {
+                            changes.insertNodeAfter(sourceFile, ts.Debug.assertDefined(clause.name), namedImports_1);
+                        }
+                    }
+                }
+            }
+        }
+        function addNamespaceQualifier(changes, sourceFile, _a) {
+            var namespacePrefix = _a.namespacePrefix, position = _a.position;
+            changes.insertText(sourceFile, position, namespacePrefix + ".");
+        }
+        function addImportType(changes, sourceFile, _a, quotePreference) {
+            var moduleSpecifier = _a.moduleSpecifier, position = _a.position;
+            changes.insertText(sourceFile, position, getImportTypePrefix(moduleSpecifier, quotePreference));
+        }
+        function getImportTypePrefix(moduleSpecifier, quotePreference) {
+            var quote = ts.getQuoteFromPreference(quotePreference);
+            return "import(" + quote + moduleSpecifier + quote + ").";
+        }
+        function addNewImports(changes, sourceFile, moduleSpecifier, quotePreference, _a) {
+            var defaultImport = _a.defaultImport, namedImports = _a.namedImports, namespaceLikeImport = _a.namespaceLikeImport;
+            var quotedModuleSpecifier = ts.makeStringLiteral(moduleSpecifier, quotePreference);
+            if (defaultImport !== undefined || namedImports.length) {
+                ts.insertImport(changes, sourceFile, ts.makeImport(defaultImport === undefined ? undefined : ts.createIdentifier(defaultImport), namedImports.map(function (n) { return ts.createImportSpecifier(/*propertyName*/ undefined, ts.createIdentifier(n)); }), moduleSpecifier, quotePreference));
+            }
+            if (namespaceLikeImport) {
+                ts.insertImport(changes, sourceFile, namespaceLikeImport.importKind === 3 /* Equals */
+                    ? ts.createImportEqualsDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createIdentifier(namespaceLikeImport.name), ts.createExternalModuleReference(quotedModuleSpecifier))
+                    : ts.createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createImportClause(/*name*/ undefined, ts.createNamespaceImport(ts.createIdentifier(namespaceLikeImport.name))), quotedModuleSpecifier));
+            }
+        }
+        function symbolHasMeaning(_a, meaning) {
+            var declarations = _a.declarations;
+            return ts.some(declarations, function (decl) { return !!(ts.getMeaningFromDeclaration(decl) & meaning); });
+        }
+        function forEachExternalModuleToImportFrom(checker, from, allSourceFiles, cb) {
+            forEachExternalModule(checker, allSourceFiles, function (module, sourceFile) {
+                if (sourceFile === undefined || sourceFile !== from && isImportablePath(from.fileName, sourceFile.fileName)) {
+                    cb(module);
+                }
+            });
+        }
+        codefix.forEachExternalModuleToImportFrom = forEachExternalModuleToImportFrom;
+        function forEachExternalModule(checker, allSourceFiles, cb) {
+            for (var _i = 0, _a = checker.getAmbientModules(); _i < _a.length; _i++) {
+                var ambient = _a[_i];
+                cb(ambient, /*sourceFile*/ undefined);
+            }
+            for (var _b = 0, allSourceFiles_1 = allSourceFiles; _b < allSourceFiles_1.length; _b++) {
+                var sourceFile = allSourceFiles_1[_b];
+                if (ts.isExternalOrCommonJsModule(sourceFile)) {
+                    cb(checker.getMergedSymbol(sourceFile.symbol), sourceFile);
+                }
+            }
+        }
+        /**
+         * Don't include something from a `node_modules` that isn't actually reachable by a global import.
+         * A relative import to node_modules is usually a bad idea.
+         */
+        function isImportablePath(fromPath, toPath) {
+            // If it's in a `node_modules` but is not reachable from here via a global import, don't bother.
+            var toNodeModules = ts.forEachAncestorDirectory(toPath, function (ancestor) { return ts.getBaseFileName(ancestor) === "node_modules" ? ancestor : undefined; });
+            return toNodeModules === undefined || ts.startsWith(fromPath, ts.getDirectoryPath(toNodeModules));
+        }
+        function moduleSymbolToValidIdentifier(moduleSymbol, target) {
+            return moduleSpecifierToValidIdentifier(ts.removeFileExtension(ts.stripQuotes(moduleSymbol.name)), target);
+        }
+        codefix.moduleSymbolToValidIdentifier = moduleSymbolToValidIdentifier;
+        function moduleSpecifierToValidIdentifier(moduleSpecifier, target) {
+            var baseName = ts.getBaseFileName(ts.removeSuffix(moduleSpecifier, "/index"));
+            var res = "";
+            var lastCharWasValid = true;
+            var firstCharCode = baseName.charCodeAt(0);
+            if (ts.isIdentifierStart(firstCharCode, target)) {
+                res += String.fromCharCode(firstCharCode);
+            }
+            else {
+                lastCharWasValid = false;
+            }
+            for (var i = 1; i < baseName.length; i++) {
+                var ch = baseName.charCodeAt(i);
+                var isValid = ts.isIdentifierPart(ch, target);
+                if (isValid) {
+                    var char = String.fromCharCode(ch);
+                    if (!lastCharWasValid) {
+                        char = char.toUpperCase();
+                    }
+                    res += char;
+                }
+                lastCharWasValid = isValid;
+            }
+            // Need `|| "_"` to ensure result isn't empty.
+            return !ts.isStringANonContextualKeyword(res) ? res || "_" : "_" + res;
+        }
+        codefix.moduleSpecifierToValidIdentifier = moduleSpecifierToValidIdentifier;
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "fixSpelling";
+        var errorCodes = [
+            ts.Diagnostics.Property_0_does_not_exist_on_type_1_Did_you_mean_2.code,
+            ts.Diagnostics.Cannot_find_name_0_Did_you_mean_1.code,
+            ts.Diagnostics.Cannot_find_name_0_Did_you_mean_the_instance_member_this_0.code,
+            ts.Diagnostics.Cannot_find_name_0_Did_you_mean_the_static_member_1_0.code,
+            ts.Diagnostics.Module_0_has_no_exported_member_1_Did_you_mean_2.code,
+        ];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile;
+                var info = getInfo(sourceFile, context.span.start, context);
+                if (!info)
+                    return undefined;
+                var node = info.node, suggestion = info.suggestion;
+                var target = context.host.getCompilationSettings().target;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, sourceFile, node, suggestion, target); });
+                return [codefix.createCodeFixAction("spelling", changes, [ts.Diagnostics.Change_spelling_to_0, suggestion], fixId, ts.Diagnostics.Fix_all_detected_spelling_errors)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                var info = getInfo(diag.file, diag.start, context);
+                var target = context.host.getCompilationSettings().target;
+                if (info)
+                    doChange(changes, context.sourceFile, info.node, info.suggestion, target);
+            }); },
+        });
+        function getInfo(sourceFile, pos, context) {
+            // This is the identifier of the misspelled word. eg:
+            // this.speling = 1;
+            //      ^^^^^^^
+            var node = ts.getTokenAtPosition(sourceFile, pos);
+            var checker = context.program.getTypeChecker();
+            var suggestion;
+            if (ts.isPropertyAccessExpression(node.parent) && node.parent.name === node) {
+                ts.Debug.assert(node.kind === 72 /* Identifier */);
+                var containingType = checker.getTypeAtLocation(node.parent.expression);
+                suggestion = checker.getSuggestionForNonexistentProperty(node, containingType);
+            }
+            else if (ts.isImportSpecifier(node.parent) && node.parent.name === node) {
+                ts.Debug.assert(node.kind === 72 /* Identifier */);
+                var importDeclaration = ts.findAncestor(node, ts.isImportDeclaration);
+                var resolvedSourceFile = getResolvedSourceFileFromImportDeclaration(sourceFile, context, importDeclaration);
+                if (resolvedSourceFile && resolvedSourceFile.symbol) {
+                    suggestion = checker.getSuggestionForNonexistentExport(node, resolvedSourceFile.symbol);
+                }
+            }
+            else {
+                var meaning = ts.getMeaningFromLocation(node);
+                var name = ts.getTextOfNode(node);
+                ts.Debug.assert(name !== undefined, "name should be defined");
+                suggestion = checker.getSuggestionForNonexistentSymbol(node, name, convertSemanticMeaningToSymbolFlags(meaning));
+            }
+            return suggestion === undefined ? undefined : { node: node, suggestion: suggestion };
+        }
+        function doChange(changes, sourceFile, node, suggestion, target) {
+            if (!ts.isIdentifierText(suggestion, target) && ts.isPropertyAccessExpression(node.parent)) {
+                changes.replaceNode(sourceFile, node.parent, ts.createElementAccess(node.parent.expression, ts.createLiteral(suggestion)));
+            }
+            else {
+                changes.replaceNode(sourceFile, node, ts.createIdentifier(suggestion));
+            }
+        }
+        function convertSemanticMeaningToSymbolFlags(meaning) {
+            var flags = 0;
+            if (meaning & 4 /* Namespace */) {
+                flags |= 1920 /* Namespace */;
+            }
+            if (meaning & 2 /* Type */) {
+                flags |= 67897832 /* Type */;
+            }
+            if (meaning & 1 /* Value */) {
+                flags |= 67220415 /* Value */;
+            }
+            return flags;
+        }
+        function getResolvedSourceFileFromImportDeclaration(sourceFile, context, importDeclaration) {
+            if (!importDeclaration || !ts.isStringLiteralLike(importDeclaration.moduleSpecifier))
+                return undefined;
+            var resolvedModule = ts.getResolvedModule(sourceFile, importDeclaration.moduleSpecifier.text);
+            if (!resolvedModule)
+                return undefined;
+            return context.program.getSourceFile(resolvedModule.resolvedFileName);
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixName = "addMissingMember";
+        var errorCodes = [
+            ts.Diagnostics.Property_0_does_not_exist_on_type_1.code,
+            ts.Diagnostics.Property_0_does_not_exist_on_type_1_Did_you_mean_2.code,
+            ts.Diagnostics.Property_0_is_missing_in_type_1_but_required_in_type_2.code,
+            ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2.code,
+            ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2_and_3_more.code
+        ];
+        var fixId = "addMissingMember";
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var info = getInfo(context.sourceFile, context.span.start, context.program.getTypeChecker());
+                if (!info)
+                    return undefined;
+                if (info.kind === 0 /* Enum */) {
+                    var token_1 = info.token, parentDeclaration_1 = info.parentDeclaration;
+                    var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return addEnumMemberDeclaration(t, context.program.getTypeChecker(), token_1, parentDeclaration_1); });
+                    return [codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Add_missing_enum_member_0, token_1.text], fixId, ts.Diagnostics.Add_all_missing_members)];
+                }
+                var parentDeclaration = info.parentDeclaration, declSourceFile = info.declSourceFile, inJs = info.inJs, makeStatic = info.makeStatic, token = info.token, call = info.call;
+                var methodCodeAction = call && getActionForMethodDeclaration(context, declSourceFile, parentDeclaration, token, call, makeStatic, inJs, context.preferences);
+                var addMember = inJs && !ts.isInterfaceDeclaration(parentDeclaration) ?
+                    ts.singleElementArray(getActionsForAddMissingMemberInJavascriptFile(context, declSourceFile, parentDeclaration, token.text, makeStatic)) :
+                    getActionsForAddMissingMemberInTypeScriptFile(context, declSourceFile, parentDeclaration, token, makeStatic);
+                return ts.concatenate(ts.singleElementArray(methodCodeAction), addMember);
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) {
+                var program = context.program, preferences = context.preferences;
+                var checker = program.getTypeChecker();
+                var seen = ts.createMap();
+                var typeDeclToMembers = new ts.NodeMap();
+                return codefix.createCombinedCodeActions(ts.textChanges.ChangeTracker.with(context, function (changes) {
+                    codefix.eachDiagnostic(context, errorCodes, function (diag) {
+                        var info = getInfo(diag.file, diag.start, checker);
+                        if (!info || !ts.addToSeen(seen, ts.getNodeId(info.parentDeclaration) + "#" + info.token.text)) {
+                            return;
+                        }
+                        if (info.kind === 0 /* Enum */) {
+                            var token = info.token, parentDeclaration = info.parentDeclaration;
+                            addEnumMemberDeclaration(changes, checker, token, parentDeclaration);
+                        }
+                        else {
+                            var parentDeclaration = info.parentDeclaration, token_2 = info.token;
+                            var infos = typeDeclToMembers.getOrUpdate(parentDeclaration, function () { return []; });
+                            if (!infos.some(function (i) { return i.token.text === token_2.text; }))
+                                infos.push(info);
+                        }
+                    });
+                    typeDeclToMembers.forEach(function (infos, classDeclaration) {
+                        var supers = getAllSupers(classDeclaration, checker);
+                        var _loop_22 = function (info) {
+                            // If some superclass added this property, don't add it again.
+                            if (supers.some(function (superClassOrInterface) {
+                                var superInfos = typeDeclToMembers.get(superClassOrInterface);
+                                return !!superInfos && superInfos.some(function (_a) {
+                                    var token = _a.token;
+                                    return token.text === info.token.text;
+                                });
+                            }))
+                                return "continue";
+                            var parentDeclaration = info.parentDeclaration, declSourceFile = info.declSourceFile, inJs = info.inJs, makeStatic = info.makeStatic, token = info.token, call = info.call;
+                            // Always prefer to add a method declaration if possible.
+                            if (call) {
+                                addMethodDeclaration(context, changes, declSourceFile, parentDeclaration, token, call, makeStatic, inJs, preferences);
+                            }
+                            else {
+                                if (inJs && !ts.isInterfaceDeclaration(parentDeclaration)) {
+                                    addMissingMemberInJs(changes, declSourceFile, parentDeclaration, token.text, makeStatic);
+                                }
+                                else {
+                                    var typeNode = getTypeNode(program.getTypeChecker(), parentDeclaration, token);
+                                    addPropertyDeclaration(changes, declSourceFile, parentDeclaration, token.text, typeNode, makeStatic);
+                                }
+                            }
+                        };
+                        for (var _i = 0, infos_1 = infos; _i < infos_1.length; _i++) {
+                            var info = infos_1[_i];
+                            _loop_22(info);
+                        }
+                    });
+                }));
+            },
+        });
+        function getAllSupers(decl, checker) {
+            var res = [];
+            while (decl) {
+                var superElement = ts.getClassExtendsHeritageElement(decl);
+                var superSymbol = superElement && checker.getSymbolAtLocation(superElement.expression);
+                var superDecl = superSymbol && ts.find(superSymbol.declarations, ts.isClassLike);
+                if (superDecl) {
+                    res.push(superDecl);
+                }
+                decl = superDecl;
+            }
+            return res;
+        }
+        var InfoKind;
+        (function (InfoKind) {
+            InfoKind[InfoKind["Enum"] = 0] = "Enum";
+            InfoKind[InfoKind["ClassOrInterface"] = 1] = "ClassOrInterface";
+        })(InfoKind || (InfoKind = {}));
+        function getInfo(tokenSourceFile, tokenPos, checker) {
+            // The identifier of the missing property. eg:
+            // this.missing = 1;
+            //      ^^^^^^^
+            var token = ts.getTokenAtPosition(tokenSourceFile, tokenPos);
+            if (!ts.isIdentifier(token)) {
+                return undefined;
+            }
+            var parent = token.parent;
+            if (!ts.isPropertyAccessExpression(parent))
+                return undefined;
+            var leftExpressionType = ts.skipConstraint(checker.getTypeAtLocation(parent.expression));
+            var symbol = leftExpressionType.symbol;
+            if (!symbol || !symbol.declarations)
+                return undefined;
+            // Prefer to change the class instead of the interface if they are merged
+            var classOrInterface = ts.find(symbol.declarations, ts.isClassLike) || ts.find(symbol.declarations, ts.isInterfaceDeclaration);
+            if (classOrInterface) {
+                var makeStatic = (leftExpressionType.target || leftExpressionType) !== checker.getDeclaredTypeOfSymbol(symbol);
+                var declSourceFile = classOrInterface.getSourceFile();
+                var inJs = ts.isSourceFileJS(declSourceFile);
+                var call = ts.tryCast(parent.parent, ts.isCallExpression);
+                return { kind: 1 /* ClassOrInterface */, token: token, parentDeclaration: classOrInterface, makeStatic: makeStatic, declSourceFile: declSourceFile, inJs: inJs, call: call };
+            }
+            var enumDeclaration = ts.find(symbol.declarations, ts.isEnumDeclaration);
+            if (enumDeclaration) {
+                return { kind: 0 /* Enum */, token: token, parentDeclaration: enumDeclaration };
+            }
+            return undefined;
+        }
+        function getActionsForAddMissingMemberInJavascriptFile(context, declSourceFile, classDeclaration, tokenName, makeStatic) {
+            var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return addMissingMemberInJs(t, declSourceFile, classDeclaration, tokenName, makeStatic); });
+            return changes.length === 0 ? undefined
+                : codefix.createCodeFixAction(fixName, changes, [makeStatic ? ts.Diagnostics.Initialize_static_property_0 : ts.Diagnostics.Initialize_property_0_in_the_constructor, tokenName], fixId, ts.Diagnostics.Add_all_missing_members);
+        }
+        function addMissingMemberInJs(changeTracker, declSourceFile, classDeclaration, tokenName, makeStatic) {
+            if (makeStatic) {
+                if (classDeclaration.kind === 209 /* ClassExpression */) {
+                    return;
+                }
+                var className = classDeclaration.name.getText();
+                var staticInitialization = initializePropertyToUndefined(ts.createIdentifier(className), tokenName);
+                changeTracker.insertNodeAfter(declSourceFile, classDeclaration, staticInitialization);
+            }
+            else {
+                var classConstructor = ts.getFirstConstructorWithBody(classDeclaration);
+                if (!classConstructor) {
+                    return;
+                }
+                var propertyInitialization = initializePropertyToUndefined(ts.createThis(), tokenName);
+                changeTracker.insertNodeAtConstructorEnd(declSourceFile, classConstructor, propertyInitialization);
+            }
+        }
+        function initializePropertyToUndefined(obj, propertyName) {
+            return ts.createStatement(ts.createAssignment(ts.createPropertyAccess(obj, propertyName), ts.createIdentifier("undefined")));
+        }
+        function getActionsForAddMissingMemberInTypeScriptFile(context, declSourceFile, classDeclaration, token, makeStatic) {
+            var typeNode = getTypeNode(context.program.getTypeChecker(), classDeclaration, token);
+            var addProp = createAddPropertyDeclarationAction(context, declSourceFile, classDeclaration, makeStatic, token.text, typeNode);
+            return makeStatic ? [addProp] : [addProp, createAddIndexSignatureAction(context, declSourceFile, classDeclaration, token.text, typeNode)];
+        }
+        function getTypeNode(checker, classDeclaration, token) {
+            var typeNode;
+            if (token.parent.parent.kind === 204 /* BinaryExpression */) {
+                var binaryExpression = token.parent.parent;
+                var otherExpression = token.parent === binaryExpression.left ? binaryExpression.right : binaryExpression.left;
+                var widenedType = checker.getWidenedType(checker.getBaseTypeOfLiteralType(checker.getTypeAtLocation(otherExpression)));
+                typeNode = checker.typeToTypeNode(widenedType, classDeclaration);
+            }
+            else {
+                var contextualType = checker.getContextualType(token.parent);
+                typeNode = contextualType ? checker.typeToTypeNode(contextualType) : undefined;
+            }
+            return typeNode || ts.createKeywordTypeNode(120 /* AnyKeyword */);
+        }
+        function createAddPropertyDeclarationAction(context, declSourceFile, classDeclaration, makeStatic, tokenName, typeNode) {
+            var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return addPropertyDeclaration(t, declSourceFile, classDeclaration, tokenName, typeNode, makeStatic); });
+            return codefix.createCodeFixAction(fixName, changes, [makeStatic ? ts.Diagnostics.Declare_static_property_0 : ts.Diagnostics.Declare_property_0, tokenName], fixId, ts.Diagnostics.Add_all_missing_members);
+        }
+        function addPropertyDeclaration(changeTracker, declSourceFile, classDeclaration, tokenName, typeNode, makeStatic) {
+            var property = ts.createProperty(
+            /*decorators*/ undefined, 
+            /*modifiers*/ makeStatic ? [ts.createToken(116 /* StaticKeyword */)] : undefined, tokenName, 
+            /*questionToken*/ undefined, typeNode, 
+            /*initializer*/ undefined);
+            var lastProp = getNodeToInsertPropertyAfter(classDeclaration);
+            if (lastProp) {
+                changeTracker.insertNodeAfter(declSourceFile, lastProp, property);
+            }
+            else {
+                changeTracker.insertNodeAtClassStart(declSourceFile, classDeclaration, property);
+            }
+        }
+        // Gets the last of the first run of PropertyDeclarations, or undefined if the class does not start with a PropertyDeclaration.
+        function getNodeToInsertPropertyAfter(cls) {
+            var res;
+            for (var _i = 0, _a = cls.members; _i < _a.length; _i++) {
+                var member = _a[_i];
+                if (!ts.isPropertyDeclaration(member))
+                    break;
+                res = member;
+            }
+            return res;
+        }
+        function createAddIndexSignatureAction(context, declSourceFile, classDeclaration, tokenName, typeNode) {
+            // Index signatures cannot have the static modifier.
+            var stringTypeNode = ts.createKeywordTypeNode(138 /* StringKeyword */);
+            var indexingParameter = ts.createParameter(
+            /*decorators*/ undefined, 
+            /*modifiers*/ undefined, 
+            /*dotDotDotToken*/ undefined, "x", 
+            /*questionToken*/ undefined, stringTypeNode, 
+            /*initializer*/ undefined);
+            var indexSignature = ts.createIndexSignature(
+            /*decorators*/ undefined, 
+            /*modifiers*/ undefined, [indexingParameter], typeNode);
+            var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return t.insertNodeAtClassStart(declSourceFile, classDeclaration, indexSignature); });
+            // No fixId here because code-fix-all currently only works on adding individual named properties.
+            return codefix.createCodeFixActionNoFixId(fixName, changes, [ts.Diagnostics.Add_index_signature_for_property_0, tokenName]);
+        }
+        function getActionForMethodDeclaration(context, declSourceFile, classDeclaration, token, callExpression, makeStatic, inJs, preferences) {
+            var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return addMethodDeclaration(context, t, declSourceFile, classDeclaration, token, callExpression, makeStatic, inJs, preferences); });
+            return codefix.createCodeFixAction(fixName, changes, [makeStatic ? ts.Diagnostics.Declare_static_method_0 : ts.Diagnostics.Declare_method_0, token.text], fixId, ts.Diagnostics.Add_all_missing_members);
+        }
+        function addMethodDeclaration(context, changeTracker, declSourceFile, typeDecl, token, callExpression, makeStatic, inJs, preferences) {
+            var methodDeclaration = codefix.createMethodFromCallExpression(context, callExpression, token.text, inJs, makeStatic, preferences, typeDecl);
+            var containingMethodDeclaration = ts.getAncestor(callExpression, 156 /* MethodDeclaration */);
+            if (containingMethodDeclaration && containingMethodDeclaration.parent === typeDecl) {
+                changeTracker.insertNodeAfter(declSourceFile, containingMethodDeclaration, methodDeclaration);
+            }
+            else {
+                changeTracker.insertNodeAtClassStart(declSourceFile, typeDecl, methodDeclaration);
+            }
+        }
+        function addEnumMemberDeclaration(changes, checker, token, enumDeclaration) {
+            /**
+             * create initializer only literal enum that has string initializer.
+             * value of initializer is a string literal that equal to name of enum member.
+             * numeric enum or empty enum will not create initializer.
+             */
+            var hasStringInitializer = ts.some(enumDeclaration.members, function (member) {
+                var type = checker.getTypeAtLocation(member);
+                return !!(type && type.flags & 132 /* StringLike */);
+            });
+            var enumMember = ts.createEnumMember(token, hasStringInitializer ? ts.createStringLiteral(token.text) : undefined);
+            changes.replaceNode(enumDeclaration.getSourceFile(), enumDeclaration, ts.updateEnumDeclaration(enumDeclaration, enumDeclaration.decorators, enumDeclaration.modifiers, enumDeclaration.name, ts.concatenate(enumDeclaration.members, ts.singleElementArray(enumMember))));
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "addMissingNewOperator";
+        var errorCodes = [ts.Diagnostics.Value_of_type_0_is_not_callable_Did_you_mean_to_include_new.code];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, span = context.span;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return addMissingNewOperator(t, sourceFile, span); });
+                return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Add_missing_new_operator_to_call, fixId, ts.Diagnostics.Add_missing_new_operator_to_all_calls)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                return addMissingNewOperator(changes, context.sourceFile, diag);
+            }); },
+        });
+        function addMissingNewOperator(changes, sourceFile, span) {
+            var call = ts.cast(findAncestorMatchingSpan(sourceFile, span), ts.isCallExpression);
+            var newExpression = ts.createNew(call.expression, call.typeArguments, call.arguments);
+            changes.replaceNode(sourceFile, call, newExpression);
+        }
+        function findAncestorMatchingSpan(sourceFile, span) {
+            var token = ts.getTokenAtPosition(sourceFile, span.start);
+            var end = ts.textSpanEnd(span);
+            while (token.end < end) {
+                token = token.parent;
+            }
+            return token;
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixName = "fixCannotFindModule";
+        var fixIdInstallTypesPackage = "installTypesPackage";
+        var fixIdGenerateTypes = "generateTypes";
+        var errorCodeCannotFindModule = ts.Diagnostics.Cannot_find_module_0.code;
+        var errorCodes = [
+            errorCodeCannotFindModule,
+            ts.Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type.code,
+        ];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var host = context.host, sourceFile = context.sourceFile, start = context.span.start;
+                var packageName = tryGetImportedPackageName(sourceFile, start);
+                if (packageName === undefined)
+                    return undefined;
+                var typesPackageName = getTypesPackageNameToInstall(packageName, host, context.errorCode);
+                return typesPackageName === undefined
+                    ? ts.singleElementArray(tryGetGenerateTypesAction(context, packageName))
+                    : [codefix.createCodeFixAction(fixName, /*changes*/ [], [ts.Diagnostics.Install_0, typesPackageName], fixIdInstallTypesPackage, ts.Diagnostics.Install_all_missing_types_packages, getInstallCommand(sourceFile.fileName, typesPackageName))];
+            },
+            fixIds: [fixIdInstallTypesPackage, fixIdGenerateTypes],
+            getAllCodeActions: function (context) {
+                var savedTypesDir = null; // tslint:disable-line no-null-keyword
+                return codefix.codeFixAll(context, errorCodes, function (changes, diag, commands) {
+                    var packageName = tryGetImportedPackageName(diag.file, diag.start);
+                    if (packageName === undefined)
+                        return undefined;
+                    switch (context.fixId) {
+                        case fixIdInstallTypesPackage: {
+                            var pkg = getTypesPackageNameToInstall(packageName, context.host, diag.code);
+                            if (pkg) {
+                                commands.push(getInstallCommand(diag.file.fileName, pkg));
+                            }
+                            break;
+                        }
+                        case fixIdGenerateTypes: {
+                            var typesDir = savedTypesDir !== null ? savedTypesDir : savedTypesDir = getOrCreateTypesDirectory(changes, context);
+                            var command = typesDir === undefined ? undefined : tryGenerateTypes(typesDir, packageName, context);
+                            if (command)
+                                commands.push(command);
+                            break;
+                        }
+                        default:
+                            ts.Debug.fail("Bad fixId: " + context.fixId);
+                    }
+                });
+            },
+        });
+        function tryGetGenerateTypesAction(context, packageName) {
+            var command;
+            var changes = ts.textChanges.ChangeTracker.with(context, function (t) {
+                var typesDir = getOrCreateTypesDirectory(t, context);
+                command = typesDir === undefined ? undefined : tryGenerateTypes(typesDir, packageName, context);
+            });
+            return command && codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Generate_types_for_0, packageName], fixIdGenerateTypes, ts.Diagnostics.Generate_types_for_all_packages_without_types, command);
+        }
+        function tryGenerateTypes(typesDir, packageName, context) {
+            var file = context.sourceFile.fileName;
+            var fileToGenerateTypesFor = ts.tryResolveJSModule(packageName, ts.getDirectoryPath(file), context.host); // TODO: GH#18217
+            if (fileToGenerateTypesFor === undefined)
+                return undefined;
+            var outputFileName = ts.resolvePath(ts.getDirectoryPath(context.program.getCompilerOptions().configFile.fileName), typesDir, packageName + ".d.ts");
+            if (context.host.fileExists(outputFileName))
+                return undefined;
+            return { type: "generate types", file: file, fileToGenerateTypesFor: fileToGenerateTypesFor, outputFileName: outputFileName };
+        }
+        // If no types directory exists yet, adds it to tsconfig.json
+        function getOrCreateTypesDirectory(changes, context) {
+            var configFile = context.program.getCompilerOptions().configFile;
+            if (!configFile)
+                return undefined;
+            var tsconfigObjectLiteral = ts.getTsConfigObjectLiteralExpression(configFile);
+            if (!tsconfigObjectLiteral)
+                return undefined;
+            var compilerOptionsProperty = codefix.findJsonProperty(tsconfigObjectLiteral, "compilerOptions");
+            if (!compilerOptionsProperty) {
+                var newCompilerOptions = ts.createObjectLiteral([makeDefaultBaseUrl(), makeDefaultPaths()]);
+                changes.insertNodeAtObjectStart(configFile, tsconfigObjectLiteral, codefix.createJsonPropertyAssignment("compilerOptions", newCompilerOptions));
+                return defaultTypesDirectoryName;
+            }
+            var compilerOptions = compilerOptionsProperty.initializer;
+            if (!ts.isObjectLiteralExpression(compilerOptions))
+                return defaultTypesDirectoryName;
+            var baseUrl = getOrAddBaseUrl(changes, configFile, compilerOptions);
+            var typesDirectoryFromPathMapping = getOrAddPathMapping(changes, configFile, compilerOptions);
+            return ts.combinePaths(baseUrl, typesDirectoryFromPathMapping);
+        }
+        var defaultBaseUrl = ".";
+        function makeDefaultBaseUrl() {
+            return codefix.createJsonPropertyAssignment("baseUrl", ts.createStringLiteral(defaultBaseUrl));
+        }
+        function getOrAddBaseUrl(changes, tsconfig, compilerOptions) {
+            var baseUrlProp = codefix.findJsonProperty(compilerOptions, "baseUrl");
+            if (baseUrlProp) {
+                return ts.isStringLiteral(baseUrlProp.initializer) ? baseUrlProp.initializer.text : defaultBaseUrl;
+            }
+            else {
+                changes.insertNodeAtObjectStart(tsconfig, compilerOptions, makeDefaultBaseUrl());
+                return defaultBaseUrl;
+            }
+        }
+        var defaultTypesDirectoryName = "types";
+        function makeDefaultPathMapping() {
+            return codefix.createJsonPropertyAssignment("*", ts.createArrayLiteral([ts.createStringLiteral(defaultTypesDirectoryName + "/*")]));
+        }
+        function makeDefaultPaths() {
+            return codefix.createJsonPropertyAssignment("paths", ts.createObjectLiteral([makeDefaultPathMapping()]));
+        }
+        function getOrAddPathMapping(changes, tsconfig, compilerOptions) {
+            var paths = codefix.findJsonProperty(compilerOptions, "paths");
+            if (!paths || !ts.isObjectLiteralExpression(paths.initializer)) {
+                changes.insertNodeAtObjectStart(tsconfig, compilerOptions, makeDefaultPaths());
+                return defaultTypesDirectoryName;
+            }
+            // Look for an existing path mapping. Should look like `"*": "foo/*"`.
+            var existing = ts.firstDefined(paths.initializer.properties, function (prop) {
+                return ts.isPropertyAssignment(prop) && ts.isStringLiteral(prop.name) && prop.name.text === "*" && ts.isArrayLiteralExpression(prop.initializer)
+                    ? ts.firstDefined(prop.initializer.elements, function (value) { return ts.isStringLiteral(value) ? ts.tryRemoveSuffix(value.text, "/*") : undefined; })
+                    : undefined;
+            });
+            if (existing)
+                return existing;
+            changes.insertNodeAtObjectStart(tsconfig, paths.initializer, makeDefaultPathMapping());
+            return defaultTypesDirectoryName;
+        }
+        function getInstallCommand(fileName, packageName) {
+            return { type: "install package", file: fileName, packageName: packageName };
+        }
+        function tryGetImportedPackageName(sourceFile, pos) {
+            var moduleName = ts.cast(ts.getTokenAtPosition(sourceFile, pos), ts.isStringLiteral).text;
+            var packageName = ts.parsePackageName(moduleName).packageName;
+            return ts.isExternalModuleNameRelative(packageName) ? undefined : packageName;
+        }
+        function getTypesPackageNameToInstall(packageName, host, diagCode) {
+            return diagCode === errorCodeCannotFindModule
+                ? (ts.JsTyping.nodeCoreModules.has(packageName) ? "@types/node" : undefined)
+                : (host.isKnownTypesPackageName(packageName) ? ts.getTypesPackageName(packageName) : undefined); // TODO: GH#18217
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var errorCodes = [
+            ts.Diagnostics.Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2.code,
+            ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1.code,
+        ];
+        var fixId = "fixClassDoesntImplementInheritedAbstractMember";
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, span = context.span;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) {
+                    return addMissingMembers(getClass(sourceFile, span.start), sourceFile, context, t, context.preferences);
+                });
+                return changes.length === 0 ? undefined : [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Implement_inherited_abstract_class, fixId, ts.Diagnostics.Implement_all_inherited_abstract_classes)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) {
+                var seenClassDeclarations = ts.createMap();
+                return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                    var classDeclaration = getClass(diag.file, diag.start);
+                    if (ts.addToSeen(seenClassDeclarations, ts.getNodeId(classDeclaration))) {
+                        addMissingMembers(classDeclaration, context.sourceFile, context, changes, context.preferences);
+                    }
+                });
+            },
+        });
+        function getClass(sourceFile, pos) {
+            // Token is the identifier in the case of a class declaration
+            // or the class keyword token in the case of a class expression.
+            var token = ts.getTokenAtPosition(sourceFile, pos);
+            return ts.cast(token.parent, ts.isClassLike);
+        }
+        function addMissingMembers(classDeclaration, sourceFile, context, changeTracker, preferences) {
+            var extendsNode = ts.getEffectiveBaseTypeNode(classDeclaration);
+            var checker = context.program.getTypeChecker();
+            var instantiatedExtendsType = checker.getTypeAtLocation(extendsNode);
+            // Note that this is ultimately derived from a map indexed by symbol names,
+            // so duplicates cannot occur.
+            var abstractAndNonPrivateExtendsSymbols = checker.getPropertiesOfType(instantiatedExtendsType).filter(symbolPointsToNonPrivateAndAbstractMember);
+            codefix.createMissingMemberNodes(classDeclaration, abstractAndNonPrivateExtendsSymbols, context, preferences, function (member) { return changeTracker.insertNodeAtClassStart(sourceFile, classDeclaration, member); });
+        }
+        function symbolPointsToNonPrivateAndAbstractMember(symbol) {
+            // See `codeFixClassExtendAbstractProtectedProperty.ts` in https://github.com/Microsoft/TypeScript/pull/11547/files
+            // (now named `codeFixClassExtendAbstractPrivateProperty.ts`)
+            var flags = ts.getModifierFlags(ts.first(symbol.getDeclarations()));
+            return !(flags & 8 /* Private */) && !!(flags & 128 /* Abstract */);
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "classSuperMustPrecedeThisAccess";
+        var errorCodes = [ts.Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class.code];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, span = context.span;
+                var nodes = getNodes(sourceFile, span.start);
+                if (!nodes)
+                    return undefined;
+                var constructor = nodes.constructor, superCall = nodes.superCall;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, sourceFile, constructor, superCall); });
+                return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Make_super_call_the_first_statement_in_the_constructor, fixId, ts.Diagnostics.Make_all_super_calls_the_first_statement_in_their_constructor)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) {
+                var sourceFile = context.sourceFile;
+                var seenClasses = ts.createMap(); // Ensure we only do this once per class.
+                return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                    var nodes = getNodes(diag.file, diag.start);
+                    if (!nodes)
+                        return;
+                    var constructor = nodes.constructor, superCall = nodes.superCall;
+                    if (ts.addToSeen(seenClasses, ts.getNodeId(constructor.parent))) {
+                        doChange(changes, sourceFile, constructor, superCall);
+                    }
+                });
+            },
+        });
+        function doChange(changes, sourceFile, constructor, superCall) {
+            changes.insertNodeAtConstructorStart(sourceFile, constructor, superCall);
+            changes.delete(sourceFile, superCall);
+        }
+        function getNodes(sourceFile, pos) {
+            var token = ts.getTokenAtPosition(sourceFile, pos);
+            if (token.kind !== 100 /* ThisKeyword */)
+                return undefined;
+            var constructor = ts.getContainingFunction(token);
+            var superCall = findSuperCall(constructor.body);
+            // figure out if the `this` access is actually inside the supercall
+            // i.e. super(this.a), since in that case we won't suggest a fix
+            return superCall && !superCall.expression.arguments.some(function (arg) { return ts.isPropertyAccessExpression(arg) && arg.expression === token; }) ? { constructor: constructor, superCall: superCall } : undefined;
+        }
+        function findSuperCall(n) {
+            return ts.isExpressionStatement(n) && ts.isSuperCall(n.expression)
+                ? n
+                : ts.isFunctionLike(n)
+                    ? undefined
+                    : ts.forEachChild(n, findSuperCall);
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "constructorForDerivedNeedSuperCall";
+        var errorCodes = [ts.Diagnostics.Constructors_for_derived_classes_must_contain_a_super_call.code];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, span = context.span;
+                var ctr = getNode(sourceFile, span.start);
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, sourceFile, ctr); });
+                return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Add_missing_super_call, fixId, ts.Diagnostics.Add_all_missing_super_calls)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                return doChange(changes, context.sourceFile, getNode(diag.file, diag.start));
+            }); },
+        });
+        function getNode(sourceFile, pos) {
+            var token = ts.getTokenAtPosition(sourceFile, pos);
+            ts.Debug.assert(token.kind === 124 /* ConstructorKeyword */);
+            return token.parent;
+        }
+        function doChange(changes, sourceFile, ctr) {
+            var superCall = ts.createStatement(ts.createCall(ts.createSuper(), /*typeArguments*/ undefined, /*argumentsArray*/ ts.emptyArray));
+            changes.insertNodeAtConstructorStart(sourceFile, ctr, superCall);
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "enableExperimentalDecorators";
+        var errorCodes = [
+            ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning.code
+        ];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var configFile = context.program.getCompilerOptions().configFile;
+                if (configFile === undefined) {
+                    return undefined;
+                }
+                var changes = ts.textChanges.ChangeTracker.with(context, function (changeTracker) { return makeChange(changeTracker, configFile); });
+                return [codefix.createCodeFixActionNoFixId(fixId, changes, ts.Diagnostics.Enable_the_experimentalDecorators_option_in_your_configuration_file)];
+            },
+            fixIds: [fixId],
+        });
+        function makeChange(changeTracker, configFile) {
+            codefix.setJsonCompilerOptionValue(changeTracker, configFile, "experimentalDecorators", ts.createTrue());
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "extendsInterfaceBecomesImplements";
+        var errorCodes = [ts.Diagnostics.Cannot_extend_an_interface_0_Did_you_mean_implements.code];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile;
+                var nodes = getNodes(sourceFile, context.span.start);
+                if (!nodes)
+                    return undefined;
+                var extendsToken = nodes.extendsToken, heritageClauses = nodes.heritageClauses;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChanges(t, sourceFile, extendsToken, heritageClauses); });
+                return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Change_extends_to_implements, fixId, ts.Diagnostics.Change_all_extended_interfaces_to_implements)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                var nodes = getNodes(diag.file, diag.start);
+                if (nodes)
+                    doChanges(changes, diag.file, nodes.extendsToken, nodes.heritageClauses);
+            }); },
+        });
+        function getNodes(sourceFile, pos) {
+            var token = ts.getTokenAtPosition(sourceFile, pos);
+            var heritageClauses = ts.getContainingClass(token).heritageClauses;
+            var extendsToken = heritageClauses[0].getFirstToken();
+            return extendsToken.kind === 86 /* ExtendsKeyword */ ? { extendsToken: extendsToken, heritageClauses: heritageClauses } : undefined;
+        }
+        function doChanges(changes, sourceFile, extendsToken, heritageClauses) {
+            changes.replaceNode(sourceFile, extendsToken, ts.createToken(109 /* ImplementsKeyword */));
+            // If there is already an implements clause, replace the implements keyword with a comma.
+            if (heritageClauses.length === 2 &&
+                heritageClauses[0].token === 86 /* ExtendsKeyword */ &&
+                heritageClauses[1].token === 109 /* ImplementsKeyword */) {
+                var implementsToken = heritageClauses[1].getFirstToken();
+                var implementsFullStart = implementsToken.getFullStart();
+                changes.replaceRange(sourceFile, { pos: implementsFullStart, end: implementsFullStart }, ts.createToken(27 /* CommaToken */));
+                // Rough heuristic: delete trailing whitespace after keyword so that it's not excessive.
+                // (Trailing because leading might be indentation, which is more sensitive.)
+                var text = sourceFile.text;
+                var end = implementsToken.end;
+                while (end < text.length && ts.isWhiteSpaceSingleLine(text.charCodeAt(end))) {
+                    end++;
+                }
+                changes.deleteRange(sourceFile, { pos: implementsToken.getStart(), end: end });
+            }
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "forgottenThisPropertyAccess";
+        var didYouMeanStaticMemberCode = ts.Diagnostics.Cannot_find_name_0_Did_you_mean_the_static_member_1_0.code;
+        var errorCodes = [
+            ts.Diagnostics.Cannot_find_name_0_Did_you_mean_the_instance_member_this_0.code,
+            didYouMeanStaticMemberCode,
+        ];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile;
+                var info = getInfo(sourceFile, context.span.start, context.errorCode);
+                if (!info) {
+                    return undefined;
+                }
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, sourceFile, info); });
+                return [codefix.createCodeFixAction(fixId, changes, [ts.Diagnostics.Add_0_to_unresolved_variable, info.className || "this"], fixId, ts.Diagnostics.Add_qualifier_to_all_unresolved_variables_matching_a_member_name)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                var info = getInfo(diag.file, diag.start, diag.code);
+                if (info)
+                    doChange(changes, context.sourceFile, info);
+            }); },
+        });
+        function getInfo(sourceFile, pos, diagCode) {
+            var node = ts.getTokenAtPosition(sourceFile, pos);
+            if (!ts.isIdentifier(node))
+                return undefined;
+            return { node: node, className: diagCode === didYouMeanStaticMemberCode ? ts.getContainingClass(node).name.text : undefined };
+        }
+        function doChange(changes, sourceFile, _a) {
+            var node = _a.node, className = _a.className;
+            // TODO (https://github.com/Microsoft/TypeScript/issues/21246): use shared helper
+            ts.suppressLeadingAndTrailingTrivia(node);
+            changes.replaceNode(sourceFile, node, ts.createPropertyAccess(className ? ts.createIdentifier(className) : ts.createThis(), node));
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixName = "unusedIdentifier";
+        var fixIdPrefix = "unusedIdentifier_prefix";
+        var fixIdDelete = "unusedIdentifier_delete";
+        var fixIdInfer = "unusedIdentifier_infer";
+        var errorCodes = [
+            ts.Diagnostics._0_is_declared_but_its_value_is_never_read.code,
+            ts.Diagnostics._0_is_declared_but_never_used.code,
+            ts.Diagnostics.Property_0_is_declared_but_its_value_is_never_read.code,
+            ts.Diagnostics.All_imports_in_import_declaration_are_unused.code,
+            ts.Diagnostics.All_destructured_elements_are_unused.code,
+            ts.Diagnostics.All_variables_are_unused.code,
+            ts.Diagnostics.All_type_parameters_are_unused.code,
+        ];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var errorCode = context.errorCode, sourceFile = context.sourceFile, program = context.program;
+                var checker = program.getTypeChecker();
+                var sourceFiles = program.getSourceFiles();
+                var token = ts.getTokenAtPosition(sourceFile, context.span.start);
+                if (ts.isJSDocTemplateTag(token)) {
+                    return [createDeleteFix(ts.textChanges.ChangeTracker.with(context, function (t) { return t.delete(sourceFile, token); }), ts.Diagnostics.Remove_template_tag)];
+                }
+                if (token.kind === 28 /* LessThanToken */) {
+                    var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return deleteTypeParameters(t, sourceFile, token); });
+                    return [createDeleteFix(changes, ts.Diagnostics.Remove_type_parameters)];
+                }
+                var importDecl = tryGetFullImport(token);
+                if (importDecl) {
+                    var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return t.delete(sourceFile, importDecl); });
+                    return [createDeleteFix(changes, [ts.Diagnostics.Remove_import_from_0, ts.showModuleSpecifier(importDecl)])];
+                }
+                var delDestructure = ts.textChanges.ChangeTracker.with(context, function (t) {
+                    return tryDeleteFullDestructure(token, t, sourceFile, checker, sourceFiles, /*isFixAll*/ false);
+                });
+                if (delDestructure.length) {
+                    return [createDeleteFix(delDestructure, ts.Diagnostics.Remove_destructuring)];
+                }
+                var delVar = ts.textChanges.ChangeTracker.with(context, function (t) { return tryDeleteFullVariableStatement(sourceFile, token, t); });
+                if (delVar.length) {
+                    return [createDeleteFix(delVar, ts.Diagnostics.Remove_variable_statement)];
+                }
+                var result = [];
+                if (token.kind === 127 /* InferKeyword */) {
+                    var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return changeInferToUnknown(t, sourceFile, token); });
+                    var name = ts.cast(token.parent, ts.isInferTypeNode).typeParameter.name.text;
+                    result.push(codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Replace_infer_0_with_unknown, name], fixIdInfer, ts.Diagnostics.Replace_all_unused_infer_with_unknown));
+                }
+                else {
+                    var deletion = ts.textChanges.ChangeTracker.with(context, function (t) {
+                        return tryDeleteDeclaration(sourceFile, token, t, checker, sourceFiles, /*isFixAll*/ false);
+                    });
+                    if (deletion.length) {
+                        var name = ts.isComputedPropertyName(token.parent) ? token.parent : token;
+                        result.push(createDeleteFix(deletion, [ts.Diagnostics.Remove_declaration_for_Colon_0, name.getText(sourceFile)]));
+                    }
+                }
+                var prefix = ts.textChanges.ChangeTracker.with(context, function (t) { return tryPrefixDeclaration(t, errorCode, sourceFile, token); });
+                if (prefix.length) {
+                    result.push(codefix.createCodeFixAction(fixName, prefix, [ts.Diagnostics.Prefix_0_with_an_underscore, token.getText(sourceFile)], fixIdPrefix, ts.Diagnostics.Prefix_all_unused_declarations_with_where_possible));
+                }
+                return result;
+            },
+            fixIds: [fixIdPrefix, fixIdDelete, fixIdInfer],
+            getAllCodeActions: function (context) {
+                var sourceFile = context.sourceFile, program = context.program;
+                var checker = program.getTypeChecker();
+                var sourceFiles = program.getSourceFiles();
+                return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                    var token = ts.getTokenAtPosition(sourceFile, diag.start);
+                    switch (context.fixId) {
+                        case fixIdPrefix:
+                            tryPrefixDeclaration(changes, diag.code, sourceFile, token);
+                            break;
+                        case fixIdDelete: {
+                            if (token.kind === 127 /* InferKeyword */)
+                                break; // Can't delete
+                            var importDecl = tryGetFullImport(token);
+                            if (importDecl) {
+                                changes.delete(sourceFile, importDecl);
+                            }
+                            else if (ts.isJSDocTemplateTag(token)) {
+                                changes.delete(sourceFile, token);
+                            }
+                            else if (token.kind === 28 /* LessThanToken */) {
+                                deleteTypeParameters(changes, sourceFile, token);
+                            }
+                            else if (!tryDeleteFullDestructure(token, changes, sourceFile, checker, sourceFiles, /*isFixAll*/ true) &&
+                                !tryDeleteFullVariableStatement(sourceFile, token, changes)) {
+                                tryDeleteDeclaration(sourceFile, token, changes, checker, sourceFiles, /*isFixAll*/ true);
+                            }
+                            break;
+                        }
+                        case fixIdInfer:
+                            if (token.kind === 127 /* InferKeyword */) {
+                                changeInferToUnknown(changes, sourceFile, token);
+                            }
+                            break;
+                        default:
+                            ts.Debug.fail(JSON.stringify(context.fixId));
+                    }
+                });
+            },
+        });
+        function changeInferToUnknown(changes, sourceFile, token) {
+            changes.replaceNode(sourceFile, token.parent, ts.createKeywordTypeNode(143 /* UnknownKeyword */));
+        }
+        function createDeleteFix(changes, diag) {
+            return codefix.createCodeFixAction(fixName, changes, diag, fixIdDelete, ts.Diagnostics.Delete_all_unused_declarations);
+        }
+        function deleteTypeParameters(changes, sourceFile, token) {
+            changes.delete(sourceFile, ts.Debug.assertDefined(ts.cast(token.parent, ts.isDeclarationWithTypeParameterChildren).typeParameters));
+        }
+        // Sometimes the diagnostic span is an entire ImportDeclaration, so we should remove the whole thing.
+        function tryGetFullImport(token) {
+            return token.kind === 92 /* ImportKeyword */ ? ts.tryCast(token.parent, ts.isImportDeclaration) : undefined;
+        }
+        function tryDeleteFullDestructure(token, changes, sourceFile, checker, sourceFiles, isFixAll) {
+            if (token.kind !== 18 /* OpenBraceToken */ || !ts.isObjectBindingPattern(token.parent))
+                return false;
+            var decl = token.parent.parent;
+            if (decl.kind === 151 /* Parameter */) {
+                tryDeleteParameter(changes, sourceFile, decl, checker, sourceFiles, isFixAll);
+            }
+            else {
+                changes.delete(sourceFile, decl);
+            }
+            return true;
+        }
+        function tryDeleteFullVariableStatement(sourceFile, token, changes) {
+            var declarationList = ts.tryCast(token.parent, ts.isVariableDeclarationList);
+            if (declarationList && declarationList.getChildren(sourceFile)[0] === token) {
+                changes.delete(sourceFile, declarationList.parent.kind === 219 /* VariableStatement */ ? declarationList.parent : declarationList);
+                return true;
+            }
+            return false;
+        }
+        function tryPrefixDeclaration(changes, errorCode, sourceFile, token) {
+            // Don't offer to prefix a property.
+            if (errorCode === ts.Diagnostics.Property_0_is_declared_but_its_value_is_never_read.code)
+                return;
+            if (token.kind === 127 /* InferKeyword */) {
+                token = ts.cast(token.parent, ts.isInferTypeNode).typeParameter.name;
+            }
+            if (ts.isIdentifier(token) && canPrefix(token)) {
+                changes.replaceNode(sourceFile, token, ts.createIdentifier("_" + token.text));
+            }
+        }
+        function canPrefix(token) {
+            switch (token.parent.kind) {
+                case 151 /* Parameter */:
+                case 150 /* TypeParameter */:
+                    return true;
+                case 237 /* VariableDeclaration */: {
+                    var varDecl = token.parent;
+                    switch (varDecl.parent.parent.kind) {
+                        case 227 /* ForOfStatement */:
+                        case 226 /* ForInStatement */:
+                            return true;
+                    }
+                }
+            }
+            return false;
+        }
+        function tryDeleteDeclaration(sourceFile, token, changes, checker, sourceFiles, isFixAll) {
+            tryDeleteDeclarationWorker(token, changes, sourceFile, checker, sourceFiles, isFixAll);
+            if (ts.isIdentifier(token))
+                deleteAssignments(changes, sourceFile, token, checker);
+        }
+        function deleteAssignments(changes, sourceFile, token, checker) {
+            ts.FindAllReferences.Core.eachSymbolReferenceInFile(token, checker, sourceFile, function (ref) {
+                if (ts.isPropertyAccessExpression(ref.parent) && ref.parent.name === ref)
+                    ref = ref.parent;
+                if (ts.isBinaryExpression(ref.parent) && ts.isExpressionStatement(ref.parent.parent) && ref.parent.left === ref) {
+                    changes.delete(sourceFile, ref.parent.parent);
+                }
+            });
+        }
+        function tryDeleteDeclarationWorker(token, changes, sourceFile, checker, sourceFiles, isFixAll) {
+            var parent = token.parent;
+            if (ts.isParameter(parent)) {
+                tryDeleteParameter(changes, sourceFile, parent, checker, sourceFiles, isFixAll);
+            }
+            else {
+                changes.delete(sourceFile, ts.isImportClause(parent) ? token : ts.isComputedPropertyName(parent) ? parent.parent : parent);
+            }
+        }
+        function tryDeleteParameter(changes, sourceFile, p, checker, sourceFiles, isFixAll) {
+            if (mayDeleteParameter(p, checker, isFixAll)) {
+                if (p.modifiers && p.modifiers.length > 0
+                    && (!ts.isIdentifier(p.name) || ts.FindAllReferences.Core.isSymbolReferencedInFile(p.name, checker, sourceFile))) {
+                    p.modifiers.forEach(function (modifier) {
+                        changes.deleteModifier(sourceFile, modifier);
+                    });
+                }
+                else {
+                    changes.delete(sourceFile, p);
+                    deleteUnusedArguments(changes, sourceFile, p, sourceFiles, checker);
+                }
+            }
+        }
+        function mayDeleteParameter(p, checker, isFixAll) {
+            var parent = p.parent;
+            switch (parent.kind) {
+                case 156 /* MethodDeclaration */:
+                    // Don't remove a parameter if this overrides something.
+                    var symbol = checker.getSymbolAtLocation(parent.name);
+                    if (ts.isMemberSymbolInBaseType(symbol, checker))
+                        return false;
+                // falls through
+                case 157 /* Constructor */:
+                case 239 /* FunctionDeclaration */:
+                    return true;
+                case 196 /* FunctionExpression */:
+                case 197 /* ArrowFunction */: {
+                    // Can't remove a non-last parameter in a callback. Can remove a parameter in code-fix-all if future parameters are also unused.
+                    var parameters = parent.parameters;
+                    var index = parameters.indexOf(p);
+                    ts.Debug.assert(index !== -1);
+                    return isFixAll
+                        ? parameters.slice(index + 1).every(function (p) { return p.name.kind === 72 /* Identifier */ && !p.symbol.isReferenced; })
+                        : index === parameters.length - 1;
+                }
+                case 159 /* SetAccessor */:
+                    // Setter must have a parameter
+                    return false;
+                default:
+                    return ts.Debug.failBadSyntaxKind(parent);
+            }
+        }
+        function deleteUnusedArguments(changes, sourceFile, deletedParameter, sourceFiles, checker) {
+            ts.FindAllReferences.Core.eachSignatureCall(deletedParameter.parent, sourceFiles, checker, function (call) {
+                var index = deletedParameter.parent.parameters.indexOf(deletedParameter);
+                if (call.arguments.length > index) { // Just in case the call didn't provide enough arguments.
+                    changes.delete(sourceFile, call.arguments[index]);
+                }
+            });
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "fixUnreachableCode";
+        var errorCodes = [ts.Diagnostics.Unreachable_code_detected.code];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, context.sourceFile, context.span.start, context.span.length); });
+                return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Remove_unreachable_code, fixId, ts.Diagnostics.Remove_all_unreachable_code)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) { return doChange(changes, diag.file, diag.start, diag.length); }); },
+        });
+        function doChange(changes, sourceFile, start, length) {
+            var token = ts.getTokenAtPosition(sourceFile, start);
+            var statement = ts.findAncestor(token, ts.isStatement);
+            ts.Debug.assert(statement.getStart(sourceFile) === token.getStart(sourceFile));
+            var container = (ts.isBlock(statement.parent) ? statement.parent : statement).parent;
+            if (!ts.isBlock(statement.parent) || statement === ts.first(statement.parent.statements)) {
+                switch (container.kind) {
+                    case 222 /* IfStatement */:
+                        if (container.elseStatement) {
+                            if (ts.isBlock(statement.parent)) {
+                                break;
+                            }
+                            else {
+                                changes.replaceNode(sourceFile, statement, ts.createBlock(ts.emptyArray));
+                            }
+                            return;
+                        }
+                    // falls through
+                    case 224 /* WhileStatement */:
+                    case 225 /* ForStatement */:
+                        changes.delete(sourceFile, container);
+                        return;
+                }
+            }
+            if (ts.isBlock(statement.parent)) {
+                var end_2 = start + length;
+                var lastStatement = ts.Debug.assertDefined(lastWhere(ts.sliceAfter(statement.parent.statements, statement), function (s) { return s.pos < end_2; }));
+                changes.deleteNodeRange(sourceFile, statement, lastStatement);
+            }
+            else {
+                changes.delete(sourceFile, statement);
+            }
+        }
+        function lastWhere(a, pred) {
+            var last;
+            for (var _i = 0, a_1 = a; _i < a_1.length; _i++) {
+                var value = a_1[_i];
+                if (!pred(value))
+                    break;
+                last = value;
+            }
+            return last;
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "fixUnusedLabel";
+        var errorCodes = [ts.Diagnostics.Unused_label.code];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, context.sourceFile, context.span.start); });
+                return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Remove_unused_label, fixId, ts.Diagnostics.Remove_all_unused_labels)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) { return doChange(changes, diag.file, diag.start); }); },
+        });
+        function doChange(changes, sourceFile, start) {
+            var token = ts.getTokenAtPosition(sourceFile, start);
+            var labeledStatement = ts.cast(token.parent, ts.isLabeledStatement);
+            var pos = token.getStart(sourceFile);
+            var statementPos = labeledStatement.statement.getStart(sourceFile);
+            // If label is on a separate line, just delete the rest of that line, but not the indentation of the labeled statement.
+            var end = ts.positionsAreOnSameLine(pos, statementPos, sourceFile) ? statementPos
+                : ts.skipTrivia(sourceFile.text, ts.findChildOfKind(labeledStatement, 57 /* ColonToken */, sourceFile).end, /*stopAfterLineBreak*/ true);
+            changes.deleteRange(sourceFile, { pos: pos, end: end });
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixIdPlain = "fixJSDocTypes_plain";
+        var fixIdNullable = "fixJSDocTypes_nullable";
+        var errorCodes = [ts.Diagnostics.JSDoc_types_can_only_be_used_inside_documentation_comments.code];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile;
+                var checker = context.program.getTypeChecker();
+                var info = getInfo(sourceFile, context.span.start, checker);
+                if (!info)
+                    return undefined;
+                var typeNode = info.typeNode, type = info.type;
+                var original = typeNode.getText(sourceFile);
+                var actions = [fix(type, fixIdPlain, ts.Diagnostics.Change_all_jsdoc_style_types_to_TypeScript)];
+                if (typeNode.kind === 286 /* JSDocNullableType */) {
+                    // for nullable types, suggest the flow-compatible `T | null | undefined`
+                    // in addition to the jsdoc/closure-compatible `T | null`
+                    actions.push(fix(checker.getNullableType(type, 32768 /* Undefined */), fixIdNullable, ts.Diagnostics.Change_all_jsdoc_style_types_to_TypeScript_and_add_undefined_to_nullable_types));
+                }
+                return actions;
+                function fix(type, fixId, fixAllDescription) {
+                    var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, sourceFile, typeNode, type, checker); });
+                    return codefix.createCodeFixAction("jdocTypes", changes, [ts.Diagnostics.Change_0_to_1, original, checker.typeToString(type)], fixId, fixAllDescription);
+                }
+            },
+            fixIds: [fixIdPlain, fixIdNullable],
+            getAllCodeActions: function (context) {
+                var fixId = context.fixId, program = context.program, sourceFile = context.sourceFile;
+                var checker = program.getTypeChecker();
+                return codefix.codeFixAll(context, errorCodes, function (changes, err) {
+                    var info = getInfo(err.file, err.start, checker);
+                    if (!info)
+                        return;
+                    var typeNode = info.typeNode, type = info.type;
+                    var fixedType = typeNode.kind === 286 /* JSDocNullableType */ && fixId === fixIdNullable ? checker.getNullableType(type, 32768 /* Undefined */) : type;
+                    doChange(changes, sourceFile, typeNode, fixedType, checker);
+                });
+            }
+        });
+        function doChange(changes, sourceFile, oldTypeNode, newType, checker) {
+            changes.replaceNode(sourceFile, oldTypeNode, checker.typeToTypeNode(newType, /*enclosingDeclaration*/ oldTypeNode)); // TODO: GH#18217
+        }
+        function getInfo(sourceFile, pos, checker) {
+            var decl = ts.findAncestor(ts.getTokenAtPosition(sourceFile, pos), isTypeContainer);
+            var typeNode = decl && decl.type;
+            return typeNode && { typeNode: typeNode, type: checker.getTypeFromTypeNode(typeNode) };
+        }
+        function isTypeContainer(node) {
+            // NOTE: Some locations are not handled yet:
+            // MappedTypeNode.typeParameters and SignatureDeclaration.typeParameters, as well as CallExpression.typeArguments
+            switch (node.kind) {
+                case 212 /* AsExpression */:
+                case 160 /* CallSignature */:
+                case 161 /* ConstructSignature */:
+                case 239 /* FunctionDeclaration */:
+                case 158 /* GetAccessor */:
+                case 162 /* IndexSignature */:
+                case 181 /* MappedType */:
+                case 156 /* MethodDeclaration */:
+                case 155 /* MethodSignature */:
+                case 151 /* Parameter */:
+                case 154 /* PropertyDeclaration */:
+                case 153 /* PropertySignature */:
+                case 159 /* SetAccessor */:
+                case 242 /* TypeAliasDeclaration */:
+                case 194 /* TypeAssertionExpression */:
+                case 237 /* VariableDeclaration */:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "fixAwaitInSyncFunction";
+        var errorCodes = [
+            ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function.code,
+            ts.Diagnostics.A_for_await_of_statement_is_only_allowed_within_an_async_function_or_async_generator.code,
+        ];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, span = context.span;
+                var nodes = getNodes(sourceFile, span.start);
+                if (!nodes)
+                    return undefined;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, sourceFile, nodes); });
+                return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Add_async_modifier_to_containing_function, fixId, ts.Diagnostics.Add_all_missing_async_modifiers)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                var nodes = getNodes(diag.file, diag.start);
+                if (!nodes)
+                    return;
+                doChange(changes, context.sourceFile, nodes);
+            }); },
+        });
+        function getReturnType(expr) {
+            if (expr.type) {
+                return expr.type;
+            }
+            if (ts.isVariableDeclaration(expr.parent) &&
+                expr.parent.type &&
+                ts.isFunctionTypeNode(expr.parent.type)) {
+                return expr.parent.type.type;
+            }
+        }
+        function getNodes(sourceFile, start) {
+            var token = ts.getTokenAtPosition(sourceFile, start);
+            var containingFunction = ts.getContainingFunction(token);
+            if (!containingFunction) {
+                return;
+            }
+            var insertBefore;
+            switch (containingFunction.kind) {
+                case 156 /* MethodDeclaration */:
+                    insertBefore = containingFunction.name;
+                    break;
+                case 239 /* FunctionDeclaration */:
+                case 196 /* FunctionExpression */:
+                    insertBefore = ts.findChildOfKind(containingFunction, 90 /* FunctionKeyword */, sourceFile);
+                    break;
+                case 197 /* ArrowFunction */:
+                    insertBefore = ts.findChildOfKind(containingFunction, 20 /* OpenParenToken */, sourceFile) || ts.first(containingFunction.parameters);
+                    break;
+                default:
+                    return;
+            }
+            return insertBefore && {
+                insertBefore: insertBefore,
+                returnType: getReturnType(containingFunction)
+            };
+        }
+        function doChange(changes, sourceFile, _a) {
+            var insertBefore = _a.insertBefore, returnType = _a.returnType;
+            if (returnType) {
+                var entityName = ts.getEntityNameFromTypeNode(returnType);
+                if (!entityName || entityName.kind !== 72 /* Identifier */ || entityName.text !== "Promise") {
+                    changes.replaceNode(sourceFile, returnType, ts.createTypeReferenceNode("Promise", ts.createNodeArray([returnType])));
+                }
+            }
+            changes.insertModifierBefore(sourceFile, 121 /* AsyncKeyword */, insertBefore);
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixName = "disableJsDiagnostics";
+        var fixId = "disableJsDiagnostics";
+        var errorCodes = ts.mapDefined(Object.keys(ts.Diagnostics), function (key) {
+            var diag = ts.Diagnostics[key];
+            return diag.category === ts.DiagnosticCategory.Error ? diag.code : undefined;
+        });
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, program = context.program, span = context.span, host = context.host, formatContext = context.formatContext;
+                if (!ts.isInJSFile(sourceFile) || !ts.isCheckJsEnabledForFile(sourceFile, program.getCompilerOptions())) {
+                    return undefined;
+                }
+                var fixes = [
+                    // fixId unnecessary because adding `// @ts-nocheck` even once will ignore every error in the file.
+                    codefix.createCodeFixActionNoFixId(fixName, [codefix.createFileTextChanges(sourceFile.fileName, [
+                            ts.createTextChange(sourceFile.checkJsDirective
+                                ? ts.createTextSpanFromBounds(sourceFile.checkJsDirective.pos, sourceFile.checkJsDirective.end)
+                                : ts.createTextSpan(0, 0), "// @ts-nocheck" + ts.getNewLineOrDefaultFromHost(host, formatContext.options)),
+                        ])], ts.Diagnostics.Disable_checking_for_this_file),
+                ];
+                if (ts.textChanges.isValidLocationToAddComment(sourceFile, span.start)) {
+                    fixes.unshift(codefix.createCodeFixAction(fixName, ts.textChanges.ChangeTracker.with(context, function (t) { return makeChange(t, sourceFile, span.start); }), ts.Diagnostics.Ignore_this_error_message, fixId, ts.Diagnostics.Add_ts_ignore_to_all_error_messages));
+                }
+                return fixes;
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) {
+                var seenLines = ts.createMap();
+                return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                    if (ts.textChanges.isValidLocationToAddComment(diag.file, diag.start)) {
+                        makeChange(changes, diag.file, diag.start, seenLines);
+                    }
+                });
+            },
+        });
+        function makeChange(changes, sourceFile, position, seenLines) {
+            var lineNumber = ts.getLineAndCharacterOfPosition(sourceFile, position).line;
+            // Only need to add `// @ts-ignore` for a line once.
+            if (!seenLines || ts.addToSeen(seenLines, lineNumber)) {
+                changes.insertCommentBeforeLine(sourceFile, lineNumber, position, " @ts-ignore");
+            }
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        /**
+         * Finds members of the resolved type that are missing in the class pointed to by class decl
+         * and generates source code for the missing members.
+         * @param possiblyMissingSymbols The collection of symbols to filter and then get insertions for.
+         * @returns Empty string iff there are no member insertions.
+         */
+        function createMissingMemberNodes(classDeclaration, possiblyMissingSymbols, context, preferences, out) {
+            var classMembers = classDeclaration.symbol.members;
+            for (var _i = 0, possiblyMissingSymbols_1 = possiblyMissingSymbols; _i < possiblyMissingSymbols_1.length; _i++) {
+                var symbol = possiblyMissingSymbols_1[_i];
+                if (!classMembers.has(symbol.escapedName)) {
+                    addNewNodeForMemberSymbol(symbol, classDeclaration, context, preferences, out);
+                }
+            }
+        }
+        codefix.createMissingMemberNodes = createMissingMemberNodes;
+        function getModuleSpecifierResolverHost(context) {
+            return {
+                directoryExists: context.host.directoryExists ? function (d) { return context.host.directoryExists(d); } : undefined,
+                fileExists: context.host.fileExists ? function (f) { return context.host.fileExists(f); } : undefined,
+                getCurrentDirectory: context.host.getCurrentDirectory ? function () { return context.host.getCurrentDirectory(); } : undefined,
+                readFile: context.host.readFile ? function (f) { return context.host.readFile(f); } : undefined,
+                useCaseSensitiveFileNames: context.host.useCaseSensitiveFileNames ? function () { return context.host.useCaseSensitiveFileNames(); } : undefined,
+                getSourceFiles: function () { return context.program.getSourceFiles(); },
+                getCommonSourceDirectory: function () { return context.program.getCommonSourceDirectory(); },
+            };
+        }
+        function getNoopSymbolTrackerWithResolver(context) {
+            return {
+                trackSymbol: ts.noop,
+                moduleResolverHost: getModuleSpecifierResolverHost(context),
+            };
+        }
+        codefix.getNoopSymbolTrackerWithResolver = getNoopSymbolTrackerWithResolver;
+        /**
+         * @returns Empty string iff there we can't figure out a representation for `symbol` in `enclosingDeclaration`.
+         */
+        function addNewNodeForMemberSymbol(symbol, enclosingDeclaration, context, preferences, out) {
+            var declarations = symbol.getDeclarations();
+            if (!(declarations && declarations.length)) {
+                return undefined;
+            }
+            var checker = context.program.getTypeChecker();
+            var declaration = declarations[0];
+            var name = ts.getSynthesizedDeepClone(ts.getNameOfDeclaration(declaration), /*includeTrivia*/ false);
+            var visibilityModifier = createVisibilityModifier(ts.getModifierFlags(declaration));
+            var modifiers = visibilityModifier ? ts.createNodeArray([visibilityModifier]) : undefined;
+            var type = checker.getWidenedType(checker.getTypeOfSymbolAtLocation(symbol, enclosingDeclaration));
+            var optional = !!(symbol.flags & 16777216 /* Optional */);
+            switch (declaration.kind) {
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                case 153 /* PropertySignature */:
+                case 154 /* PropertyDeclaration */:
+                    var typeNode = checker.typeToTypeNode(type, enclosingDeclaration, /*flags*/ undefined, getNoopSymbolTrackerWithResolver(context));
+                    out(ts.createProperty(
+                    /*decorators*/ undefined, modifiers, name, optional ? ts.createToken(56 /* QuestionToken */) : undefined, typeNode, 
+                    /*initializer*/ undefined));
+                    break;
+                case 155 /* MethodSignature */:
+                case 156 /* MethodDeclaration */:
+                    // The signature for the implementation appears as an entry in `signatures` iff
+                    // there is only one signature.
+                    // If there are overloads and an implementation signature, it appears as an
+                    // extra declaration that isn't a signature for `type`.
+                    // If there is more than one overload but no implementation signature
+                    // (eg: an abstract method or interface declaration), there is a 1-1
+                    // correspondence of declarations and signatures.
+                    var signatures = checker.getSignaturesOfType(type, 0 /* Call */);
+                    if (!ts.some(signatures)) {
+                        break;
+                    }
+                    if (declarations.length === 1) {
+                        ts.Debug.assert(signatures.length === 1);
+                        var signature = signatures[0];
+                        outputMethod(signature, modifiers, name, createStubbedMethodBody(preferences));
+                        break;
+                    }
+                    for (var _i = 0, signatures_7 = signatures; _i < signatures_7.length; _i++) {
+                        var signature = signatures_7[_i];
+                        // Need to ensure nodes are fresh each time so they can have different positions.
+                        outputMethod(signature, ts.getSynthesizedDeepClones(modifiers, /*includeTrivia*/ false), ts.getSynthesizedDeepClone(name, /*includeTrivia*/ false));
+                    }
+                    if (declarations.length > signatures.length) {
+                        var signature = checker.getSignatureFromDeclaration(declarations[declarations.length - 1]);
+                        outputMethod(signature, modifiers, name, createStubbedMethodBody(preferences));
+                    }
+                    else {
+                        ts.Debug.assert(declarations.length === signatures.length);
+                        out(createMethodImplementingSignatures(signatures, name, optional, modifiers, preferences));
+                    }
+                    break;
+            }
+            function outputMethod(signature, modifiers, name, body) {
+                var method = signatureToMethodDeclaration(context, signature, enclosingDeclaration, modifiers, name, optional, body);
+                if (method)
+                    out(method);
+            }
+        }
+        function signatureToMethodDeclaration(context, signature, enclosingDeclaration, modifiers, name, optional, body) {
+            var program = context.program;
+            var signatureDeclaration = program.getTypeChecker().signatureToSignatureDeclaration(signature, 156 /* MethodDeclaration */, enclosingDeclaration, 1 /* NoTruncation */ | 256 /* SuppressAnyReturnType */, getNoopSymbolTrackerWithResolver(context));
+            if (!signatureDeclaration) {
+                return undefined;
+            }
+            signatureDeclaration.decorators = undefined;
+            signatureDeclaration.modifiers = modifiers;
+            signatureDeclaration.name = name;
+            signatureDeclaration.questionToken = optional ? ts.createToken(56 /* QuestionToken */) : undefined;
+            signatureDeclaration.body = body;
+            return signatureDeclaration;
+        }
+        function createMethodFromCallExpression(context, call, methodName, inJs, makeStatic, preferences, contextNode) {
+            var body = !ts.isInterfaceDeclaration(contextNode);
+            var typeArguments = call.typeArguments, args = call.arguments, parent = call.parent;
+            var checker = context.program.getTypeChecker();
+            var tracker = getNoopSymbolTrackerWithResolver(context);
+            var types = ts.map(args, function (arg) {
+                // Widen the type so we don't emit nonsense annotations like "function fn(x: 3) {"
+                return checker.typeToTypeNode(checker.getBaseTypeOfLiteralType(checker.getTypeAtLocation(arg)), contextNode, /*flags*/ undefined, tracker);
+            });
+            var names = ts.map(args, function (arg) {
+                return ts.isIdentifier(arg) ? arg.text :
+                    ts.isPropertyAccessExpression(arg) ? arg.name.text : undefined;
+            });
+            var contextualType = checker.getContextualType(call);
+            var returnType = inJs ? undefined : contextualType && checker.typeToTypeNode(contextualType, contextNode, /*flags*/ undefined, tracker) || ts.createKeywordTypeNode(120 /* AnyKeyword */);
+            return ts.createMethod(
+            /*decorators*/ undefined, 
+            /*modifiers*/ makeStatic ? [ts.createToken(116 /* StaticKeyword */)] : undefined, 
+            /*asteriskToken*/ ts.isYieldExpression(parent) ? ts.createToken(40 /* AsteriskToken */) : undefined, methodName, 
+            /*questionToken*/ undefined, 
+            /*typeParameters*/ inJs ? undefined : ts.map(typeArguments, function (_, i) {
+                return ts.createTypeParameterDeclaration(84 /* T */ + typeArguments.length - 1 <= 90 /* Z */ ? String.fromCharCode(84 /* T */ + i) : "T" + i);
+            }), 
+            /*parameters*/ createDummyParameters(args.length, names, types, /*minArgumentCount*/ undefined, inJs), 
+            /*type*/ returnType, body ? createStubbedMethodBody(preferences) : undefined);
+        }
+        codefix.createMethodFromCallExpression = createMethodFromCallExpression;
+        function createDummyParameters(argCount, names, types, minArgumentCount, inJs) {
+            var parameters = [];
+            for (var i = 0; i < argCount; i++) {
+                var newParameter = ts.createParameter(
+                /*decorators*/ undefined, 
+                /*modifiers*/ undefined, 
+                /*dotDotDotToken*/ undefined, 
+                /*name*/ names && names[i] || "arg" + i, 
+                /*questionToken*/ minArgumentCount !== undefined && i >= minArgumentCount ? ts.createToken(56 /* QuestionToken */) : undefined, 
+                /*type*/ inJs ? undefined : types && types[i] || ts.createKeywordTypeNode(120 /* AnyKeyword */), 
+                /*initializer*/ undefined);
+                parameters.push(newParameter);
+            }
+            return parameters;
+        }
+        function createMethodImplementingSignatures(signatures, name, optional, modifiers, preferences) {
+            /** This is *a* signature with the maximal number of arguments,
+             * such that if there is a "maximal" signature without rest arguments,
+             * this is one of them.
+             */
+            var maxArgsSignature = signatures[0];
+            var minArgumentCount = signatures[0].minArgumentCount;
+            var someSigHasRestParameter = false;
+            for (var _i = 0, signatures_8 = signatures; _i < signatures_8.length; _i++) {
+                var sig = signatures_8[_i];
+                minArgumentCount = Math.min(sig.minArgumentCount, minArgumentCount);
+                if (sig.hasRestParameter) {
+                    someSigHasRestParameter = true;
+                }
+                if (sig.parameters.length >= maxArgsSignature.parameters.length && (!sig.hasRestParameter || maxArgsSignature.hasRestParameter)) {
+                    maxArgsSignature = sig;
+                }
+            }
+            var maxNonRestArgs = maxArgsSignature.parameters.length - (maxArgsSignature.hasRestParameter ? 1 : 0);
+            var maxArgsParameterSymbolNames = maxArgsSignature.parameters.map(function (symbol) { return symbol.name; });
+            var parameters = createDummyParameters(maxNonRestArgs, maxArgsParameterSymbolNames, /* types */ undefined, minArgumentCount, /*inJs*/ false);
+            if (someSigHasRestParameter) {
+                var anyArrayType = ts.createArrayTypeNode(ts.createKeywordTypeNode(120 /* AnyKeyword */));
+                var restParameter = ts.createParameter(
+                /*decorators*/ undefined, 
+                /*modifiers*/ undefined, ts.createToken(25 /* DotDotDotToken */), maxArgsParameterSymbolNames[maxNonRestArgs] || "rest", 
+                /*questionToken*/ maxNonRestArgs >= minArgumentCount ? ts.createToken(56 /* QuestionToken */) : undefined, anyArrayType, 
+                /*initializer*/ undefined);
+                parameters.push(restParameter);
+            }
+            return createStubbedMethod(modifiers, name, optional, 
+            /*typeParameters*/ undefined, parameters, 
+            /*returnType*/ undefined, preferences);
+        }
+        function createStubbedMethod(modifiers, name, optional, typeParameters, parameters, returnType, preferences) {
+            return ts.createMethod(
+            /*decorators*/ undefined, modifiers, 
+            /*asteriskToken*/ undefined, name, optional ? ts.createToken(56 /* QuestionToken */) : undefined, typeParameters, parameters, returnType, createStubbedMethodBody(preferences));
+        }
+        function createStubbedMethodBody(preferences) {
+            return ts.createBlock([ts.createThrow(ts.createNew(ts.createIdentifier("Error"), 
+                /*typeArguments*/ undefined, 
+                // TODO Handle auto quote preference.
+                [ts.createLiteral("Method not implemented.", /*isSingleQuote*/ preferences.quotePreference === "single")]))], 
+            /*multiline*/ true);
+        }
+        function createVisibilityModifier(flags) {
+            if (flags & 4 /* Public */) {
+                return ts.createToken(115 /* PublicKeyword */);
+            }
+            else if (flags & 16 /* Protected */) {
+                return ts.createToken(114 /* ProtectedKeyword */);
+            }
+            return undefined;
+        }
+        function setJsonCompilerOptionValue(changeTracker, configFile, optionName, optionValue) {
+            var tsconfigObjectLiteral = ts.getTsConfigObjectLiteralExpression(configFile);
+            if (!tsconfigObjectLiteral)
+                return undefined;
+            var compilerOptionsProperty = findJsonProperty(tsconfigObjectLiteral, "compilerOptions");
+            if (compilerOptionsProperty === undefined) {
+                changeTracker.insertNodeAtObjectStart(configFile, tsconfigObjectLiteral, createJsonPropertyAssignment("compilerOptions", ts.createObjectLiteral([
+                    createJsonPropertyAssignment(optionName, optionValue),
+                ])));
+                return;
+            }
+            var compilerOptions = compilerOptionsProperty.initializer;
+            if (!ts.isObjectLiteralExpression(compilerOptions)) {
+                return;
+            }
+            var optionProperty = findJsonProperty(compilerOptions, optionName);
+            if (optionProperty === undefined) {
+                changeTracker.insertNodeAtObjectStart(configFile, compilerOptions, createJsonPropertyAssignment(optionName, optionValue));
+            }
+            else {
+                changeTracker.replaceNode(configFile, optionProperty.initializer, optionValue);
+            }
+        }
+        codefix.setJsonCompilerOptionValue = setJsonCompilerOptionValue;
+        function createJsonPropertyAssignment(name, initializer) {
+            return ts.createPropertyAssignment(ts.createStringLiteral(name), initializer);
+        }
+        codefix.createJsonPropertyAssignment = createJsonPropertyAssignment;
+        function findJsonProperty(obj, name) {
+            return ts.find(obj.properties, function (p) { return ts.isPropertyAssignment(p) && !!p.name && ts.isStringLiteral(p.name) && p.name.text === name; });
+        }
+        codefix.findJsonProperty = findJsonProperty;
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixName = "invalidImportSyntax";
+        function getCodeFixesForImportDeclaration(context, node) {
+            var sourceFile = ts.getSourceFileOfNode(node);
+            var namespace = ts.getNamespaceDeclarationNode(node);
+            var opts = context.program.getCompilerOptions();
+            var variations = [];
+            // import Bluebird from "bluebird";
+            variations.push(createAction(context, sourceFile, node, ts.makeImport(namespace.name, /*namedImports*/ undefined, node.moduleSpecifier, ts.getQuotePreference(sourceFile, context.preferences))));
+            if (ts.getEmitModuleKind(opts) === ts.ModuleKind.CommonJS) {
+                // import Bluebird = require("bluebird");
+                variations.push(createAction(context, sourceFile, node, ts.createImportEqualsDeclaration(
+                /*decorators*/ undefined, 
+                /*modifiers*/ undefined, namespace.name, ts.createExternalModuleReference(node.moduleSpecifier))));
+            }
+            return variations;
+        }
+        function createAction(context, sourceFile, node, replacement) {
+            var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return t.replaceNode(sourceFile, node, replacement); });
+            return codefix.createCodeFixActionNoFixId(fixName, changes, [ts.Diagnostics.Replace_import_with_0, changes[0].textChanges[0].newText]);
+        }
+        codefix.registerCodeFix({
+            errorCodes: [
+                ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures.code,
+                ts.Diagnostics.Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature.code,
+            ],
+            getCodeActions: getActionsForUsageOfInvalidImport
+        });
+        function getActionsForUsageOfInvalidImport(context) {
+            var sourceFile = context.sourceFile;
+            var targetKind = ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures.code === context.errorCode ? 191 /* CallExpression */ : 192 /* NewExpression */;
+            var node = ts.findAncestor(ts.getTokenAtPosition(sourceFile, context.span.start), function (a) { return a.kind === targetKind && a.getStart() === context.span.start && a.getEnd() === (context.span.start + context.span.length); });
+            if (!node) {
+                return [];
+            }
+            var expr = node.expression;
+            return getImportCodeFixesForExpression(context, expr);
+        }
+        codefix.registerCodeFix({
+            errorCodes: [
+                // The following error codes cover pretty much all assignability errors that could involve an expression
+                ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1.code,
+                ts.Diagnostics.Type_0_does_not_satisfy_the_constraint_1.code,
+                ts.Diagnostics.Type_0_is_not_assignable_to_type_1.code,
+                ts.Diagnostics.Type_0_is_not_assignable_to_type_1_Two_different_types_with_this_name_exist_but_they_are_unrelated.code,
+                ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1.code,
+                ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_string_index_type_2.code,
+                ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2.code,
+                ts.Diagnostics.Numeric_index_type_0_is_not_assignable_to_string_index_type_1.code,
+                ts.Diagnostics.Property_0_in_type_1_is_not_assignable_to_the_same_property_in_base_type_2.code,
+                ts.Diagnostics.Property_0_in_type_1_is_not_assignable_to_type_2.code,
+                ts.Diagnostics.Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property.code,
+                ts.Diagnostics.The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1.code,
+            ],
+            getCodeActions: getActionsForInvalidImportLocation
+        });
+        function getActionsForInvalidImportLocation(context) {
+            var sourceFile = context.sourceFile;
+            var node = ts.findAncestor(ts.getTokenAtPosition(sourceFile, context.span.start), function (a) { return a.getStart() === context.span.start && a.getEnd() === (context.span.start + context.span.length); });
+            if (!node) {
+                return [];
+            }
+            return getImportCodeFixesForExpression(context, node);
+        }
+        function getImportCodeFixesForExpression(context, expr) {
+            var type = context.program.getTypeChecker().getTypeAtLocation(expr);
+            if (!(type.symbol && type.symbol.originatingImport)) {
+                return [];
+            }
+            var fixes = [];
+            var relatedImport = type.symbol.originatingImport; // TODO: GH#18217
+            if (!ts.isImportCall(relatedImport)) {
+                ts.addRange(fixes, getCodeFixesForImportDeclaration(context, relatedImport));
+            }
+            if (ts.isExpression(expr) && !(ts.isNamedDeclaration(expr.parent) && expr.parent.name === expr)) {
+                var sourceFile_3 = context.sourceFile;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return t.replaceNode(sourceFile_3, expr, ts.createPropertyAccess(expr, "default"), {}); });
+                fixes.push(codefix.createCodeFixActionNoFixId(fixName, changes, ts.Diagnostics.Use_synthetic_default_member));
+            }
+            return fixes;
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixName = "strictClassInitialization";
+        var fixIdAddDefiniteAssignmentAssertions = "addMissingPropertyDefiniteAssignmentAssertions";
+        var fixIdAddUndefinedType = "addMissingPropertyUndefinedType";
+        var fixIdAddInitializer = "addMissingPropertyInitializer";
+        var errorCodes = [ts.Diagnostics.Property_0_has_no_initializer_and_is_not_definitely_assigned_in_the_constructor.code];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var propertyDeclaration = getPropertyDeclaration(context.sourceFile, context.span.start);
+                if (!propertyDeclaration)
+                    return;
+                var result = [
+                    getActionForAddMissingUndefinedType(context, propertyDeclaration),
+                    getActionForAddMissingDefiniteAssignmentAssertion(context, propertyDeclaration)
+                ];
+                ts.append(result, getActionForAddMissingInitializer(context, propertyDeclaration));
+                return result;
+            },
+            fixIds: [fixIdAddDefiniteAssignmentAssertions, fixIdAddUndefinedType, fixIdAddInitializer],
+            getAllCodeActions: function (context) {
+                return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                    var propertyDeclaration = getPropertyDeclaration(diag.file, diag.start);
+                    if (!propertyDeclaration)
+                        return;
+                    switch (context.fixId) {
+                        case fixIdAddDefiniteAssignmentAssertions:
+                            addDefiniteAssignmentAssertion(changes, diag.file, propertyDeclaration);
+                            break;
+                        case fixIdAddUndefinedType:
+                            addUndefinedType(changes, diag.file, propertyDeclaration);
+                            break;
+                        case fixIdAddInitializer:
+                            var checker = context.program.getTypeChecker();
+                            var initializer = getInitializer(checker, propertyDeclaration);
+                            if (!initializer)
+                                return;
+                            addInitializer(changes, diag.file, propertyDeclaration, initializer);
+                            break;
+                        default:
+                            ts.Debug.fail(JSON.stringify(context.fixId));
+                    }
+                });
+            },
+        });
+        function getPropertyDeclaration(sourceFile, pos) {
+            var token = ts.getTokenAtPosition(sourceFile, pos);
+            return ts.isIdentifier(token) ? ts.cast(token.parent, ts.isPropertyDeclaration) : undefined;
+        }
+        function getActionForAddMissingDefiniteAssignmentAssertion(context, propertyDeclaration) {
+            var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return addDefiniteAssignmentAssertion(t, context.sourceFile, propertyDeclaration); });
+            return codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Add_definite_assignment_assertion_to_property_0, propertyDeclaration.getText()], fixIdAddDefiniteAssignmentAssertions, ts.Diagnostics.Add_definite_assignment_assertions_to_all_uninitialized_properties);
+        }
+        function addDefiniteAssignmentAssertion(changeTracker, propertyDeclarationSourceFile, propertyDeclaration) {
+            var property = ts.updateProperty(propertyDeclaration, propertyDeclaration.decorators, propertyDeclaration.modifiers, propertyDeclaration.name, ts.createToken(52 /* ExclamationToken */), propertyDeclaration.type, propertyDeclaration.initializer);
+            changeTracker.replaceNode(propertyDeclarationSourceFile, propertyDeclaration, property);
+        }
+        function getActionForAddMissingUndefinedType(context, propertyDeclaration) {
+            var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return addUndefinedType(t, context.sourceFile, propertyDeclaration); });
+            return codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Add_undefined_type_to_property_0, propertyDeclaration.name.getText()], fixIdAddUndefinedType, ts.Diagnostics.Add_undefined_type_to_all_uninitialized_properties);
+        }
+        function addUndefinedType(changeTracker, propertyDeclarationSourceFile, propertyDeclaration) {
+            var undefinedTypeNode = ts.createKeywordTypeNode(141 /* UndefinedKeyword */);
+            var type = propertyDeclaration.type; // TODO: GH#18217
+            var types = ts.isUnionTypeNode(type) ? type.types.concat(undefinedTypeNode) : [type, undefinedTypeNode];
+            changeTracker.replaceNode(propertyDeclarationSourceFile, type, ts.createUnionTypeNode(types));
+        }
+        function getActionForAddMissingInitializer(context, propertyDeclaration) {
+            var checker = context.program.getTypeChecker();
+            var initializer = getInitializer(checker, propertyDeclaration);
+            if (!initializer)
+                return undefined;
+            var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return addInitializer(t, context.sourceFile, propertyDeclaration, initializer); });
+            return codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Add_initializer_to_property_0, propertyDeclaration.name.getText()], fixIdAddInitializer, ts.Diagnostics.Add_initializers_to_all_uninitialized_properties);
+        }
+        function addInitializer(changeTracker, propertyDeclarationSourceFile, propertyDeclaration, initializer) {
+            var property = ts.updateProperty(propertyDeclaration, propertyDeclaration.decorators, propertyDeclaration.modifiers, propertyDeclaration.name, propertyDeclaration.questionToken, propertyDeclaration.type, initializer);
+            changeTracker.replaceNode(propertyDeclarationSourceFile, propertyDeclaration, property);
+        }
+        function getInitializer(checker, propertyDeclaration) {
+            return getDefaultValueFromType(checker, checker.getTypeFromTypeNode(propertyDeclaration.type)); // TODO: GH#18217
+        }
+        function getDefaultValueFromType(checker, type) {
+            if (type.flags & 512 /* BooleanLiteral */) {
+                return (type === checker.getFalseType() || type === checker.getFalseType(/*fresh*/ true)) ? ts.createFalse() : ts.createTrue();
+            }
+            else if (type.isLiteral()) {
+                return ts.createLiteral(type.value);
+            }
+            else if (type.isUnion()) {
+                return ts.firstDefined(type.types, function (t) { return getDefaultValueFromType(checker, t); });
+            }
+            else if (type.isClass()) {
+                var classDeclaration = ts.getClassLikeDeclarationOfSymbol(type.symbol);
+                if (!classDeclaration || ts.hasModifier(classDeclaration, 128 /* Abstract */))
+                    return undefined;
+                var constructorDeclaration = ts.getFirstConstructorWithBody(classDeclaration);
+                if (constructorDeclaration && constructorDeclaration.parameters.length)
+                    return undefined;
+                return ts.createNew(ts.createIdentifier(type.symbol.name), /*typeArguments*/ undefined, /*argumentsArray*/ undefined);
+            }
+            else if (checker.isArrayLikeType(type)) {
+                return ts.createArrayLiteral();
+            }
+            return undefined;
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    function generateTypesForModule(name, moduleValue, formatSettings) {
+        return generateTypesForModuleOrGlobal(name, moduleValue, formatSettings, 0 /* ExportEquals */);
+    }
+    ts.generateTypesForModule = generateTypesForModule;
+    function generateTypesForGlobal(name, globalValue, formatSettings) {
+        return generateTypesForModuleOrGlobal(name, globalValue, formatSettings, 3 /* Global */);
+    }
+    ts.generateTypesForGlobal = generateTypesForGlobal;
+    function generateTypesForModuleOrGlobal(name, globalValue, formatSettings, outputKind) {
+        return valueInfoToDeclarationFileText(ts.inspectValue(name, globalValue), formatSettings, outputKind);
+    }
+    /* @internal */
+    function valueInfoToDeclarationFileText(valueInfo, formatSettings, outputKind) {
+        if (outputKind === void 0) { outputKind = 0 /* ExportEquals */; }
+        return ts.textChanges.getNewFileText(toStatements(valueInfo, outputKind), 3 /* TS */, formatSettings.newLineCharacter || "\n", ts.formatting.getFormatContext(formatSettings));
+    }
+    ts.valueInfoToDeclarationFileText = valueInfoToDeclarationFileText;
+    var OutputKind;
+    (function (OutputKind) {
+        OutputKind[OutputKind["ExportEquals"] = 0] = "ExportEquals";
+        OutputKind[OutputKind["NamedExport"] = 1] = "NamedExport";
+        OutputKind[OutputKind["NamespaceMember"] = 2] = "NamespaceMember";
+        OutputKind[OutputKind["Global"] = 3] = "Global";
+    })(OutputKind || (OutputKind = {}));
+    function toNamespaceMemberStatements(info) {
+        return toStatements(info, 2 /* NamespaceMember */);
+    }
+    function toStatements(info, kind) {
+        var isDefault = info.name === "default" /* Default */;
+        var name = isDefault ? "_default" : info.name;
+        if (!isValidIdentifier(name) || isDefault && kind !== 1 /* NamedExport */)
+            return ts.emptyArray;
+        var modifiers = isDefault && info.kind === 2 /* FunctionOrClass */ ? [ts.createModifier(85 /* ExportKeyword */), ts.createModifier(80 /* DefaultKeyword */)]
+            : kind === 3 /* Global */ || kind === 0 /* ExportEquals */ ? [ts.createModifier(125 /* DeclareKeyword */)]
+                : kind === 1 /* NamedExport */ ? [ts.createModifier(85 /* ExportKeyword */)]
+                    : undefined;
+        var exportEquals = function () { return kind === 0 /* ExportEquals */ ? [exportEqualsOrDefault(info.name, /*isExportEquals*/ true)] : ts.emptyArray; };
+        var exportDefault = function () { return isDefault ? [exportEqualsOrDefault("_default", /*isExportEquals*/ false)] : ts.emptyArray; };
+        switch (info.kind) {
+            case 2 /* FunctionOrClass */:
+                return exportEquals().concat(functionOrClassToStatements(modifiers, name, info));
+            case 3 /* Object */:
+                var members = info.members, hasNontrivialPrototype = info.hasNontrivialPrototype;
+                if (!hasNontrivialPrototype) {
+                    if (kind === 0 /* ExportEquals */) {
+                        return ts.flatMap(members, function (v) { return toStatements(v, 1 /* NamedExport */); });
+                    }
+                    if (members.some(function (m) { return m.kind === 2 /* FunctionOrClass */; })) {
+                        // If some member is a function, use a namespace so it gets a FunctionDeclaration or ClassDeclaration.
+                        return exportDefault().concat([createNamespace(modifiers, name, ts.flatMap(members, toNamespaceMemberStatements))]);
+                    }
+                }
+            // falls through
+            case 0 /* Const */:
+            case 1 /* Array */: {
+                var comment = info.kind === 0 /* Const */ ? info.comment : undefined;
+                var constVar = ts.createVariableStatement(modifiers, ts.createVariableDeclarationList([ts.createVariableDeclaration(name, toType(info))], 2 /* Const */));
+                return exportEquals().concat(exportDefault(), [addComment(constVar, comment)]);
+            }
+            default:
+                return ts.Debug.assertNever(info);
+        }
+    }
+    function exportEqualsOrDefault(name, isExportEquals) {
+        return ts.createExportAssignment(/*decorators*/ undefined, /*modifiers*/ undefined, isExportEquals, ts.createIdentifier(name));
+    }
+    function functionOrClassToStatements(modifiers, name, _a) {
+        var source = _a.source, prototypeMembers = _a.prototypeMembers, namespaceMembers = _a.namespaceMembers;
+        var fnAst = parseClassOrFunctionBody(source);
+        var _b = fnAst === undefined ? { parameters: ts.emptyArray, returnType: anyType() } : getParametersAndReturnType(fnAst), parameters = _b.parameters, returnType = _b.returnType;
+        var protoOrInstanceMembers = ts.createMap();
+        if (typeof fnAst === "object")
+            getConstructorFunctionInstanceProperties(fnAst, protoOrInstanceMembers);
+        for (var _i = 0, prototypeMembers_1 = prototypeMembers; _i < prototypeMembers_1.length; _i++) {
+            var p = prototypeMembers_1[_i];
+            // ignore non-functions on the prototype
+            if (p.kind === 2 /* FunctionOrClass */) {
+                var m = tryGetMethod(p);
+                if (m) {
+                    protoOrInstanceMembers.set(p.name, m);
+                }
+            }
+        }
+        var classStaticMembers = protoOrInstanceMembers.size !== 0 || fnAst === undefined || typeof fnAst !== "number" && fnAst.kind === 157 /* Constructor */ ? [] : undefined;
+        var namespaceStatements = ts.flatMap(namespaceMembers, function (info) {
+            if (!isValidIdentifier(info.name))
+                return undefined;
+            if (classStaticMembers) {
+                switch (info.kind) {
+                    case 3 /* Object */:
+                        if (info.members.some(function (m) { return m.kind === 2 /* FunctionOrClass */; })) {
+                            break;
+                        }
+                    // falls through
+                    case 1 /* Array */:
+                    case 0 /* Const */:
+                        classStaticMembers.push(addComment(ts.createProperty(/*decorators*/ undefined, [ts.createModifier(116 /* StaticKeyword */)], info.name, /*questionOrExclamationToken*/ undefined, toType(info), /*initializer*/ undefined), info.kind === 0 /* Const */ ? info.comment : undefined));
+                        return undefined;
+                    case 2 /* FunctionOrClass */:
+                        if (!info.namespaceMembers.length) { // Else, can't merge a static method with a namespace. Must make it a function on the namespace.
+                            var sig = tryGetMethod(info, [ts.createModifier(116 /* StaticKeyword */)]);
+                            if (sig) {
+                                classStaticMembers.push(sig);
+                                return undefined;
+                            }
+                        }
+                        break;
+                    default:
+                        ts.Debug.assertNever(info);
+                }
+            }
+            return toStatements(info, 2 /* NamespaceMember */);
+        });
+        var decl = classStaticMembers
+            ? ts.createClassDeclaration(
+            /*decorators*/ undefined, modifiers, name, 
+            /*typeParameters*/ undefined, 
+            /*heritageClauses*/ undefined, classStaticMembers.concat((parameters.length ? [ts.createConstructor(/*decorators*/ undefined, /*modifiers*/ undefined, parameters, /*body*/ undefined)] : ts.emptyArray), ts.arrayFrom(protoOrInstanceMembers.values())))
+            : ts.createFunctionDeclaration(/*decorators*/ undefined, modifiers, /*asteriskToken*/ undefined, name, /*typeParameters*/ undefined, parameters, returnType, /*body*/ undefined);
+        return [decl].concat((namespaceStatements.length === 0 ? ts.emptyArray : [createNamespace(modifiers && modifiers.map(function (m) { return ts.getSynthesizedDeepClone(m); }), name, namespaceStatements)]));
+    }
+    function tryGetMethod(_a, modifiers) {
+        var name = _a.name, source = _a.source;
+        if (!isValidIdentifier(name))
+            return undefined;
+        var fnAst = parseClassOrFunctionBody(source);
+        if (fnAst === undefined || (typeof fnAst !== "number" && fnAst.kind === 157 /* Constructor */))
+            return undefined;
+        var sig = getParametersAndReturnType(fnAst);
+        return sig && ts.createMethod(
+        /*decorators*/ undefined, modifiers, 
+        /*asteriskToken*/ undefined, name, 
+        /*questionToken*/ undefined, 
+        /*typeParameters*/ undefined, sig.parameters, sig.returnType, 
+        /*body*/ undefined);
+    }
+    function toType(info) {
+        switch (info.kind) {
+            case 0 /* Const */:
+                return ts.createTypeReferenceNode(info.typeName, /*typeArguments*/ undefined);
+            case 1 /* Array */:
+                return ts.createArrayTypeNode(toType(info.inner));
+            case 2 /* FunctionOrClass */:
+                return ts.createTypeReferenceNode("Function", /*typeArguments*/ undefined); // Normally we create a FunctionDeclaration, but this can happen for a function in an array.
+            case 3 /* Object */:
+                return ts.createTypeLiteralNode(info.members.map(function (m) { return ts.createPropertySignature(/*modifiers*/ undefined, toPropertyName(m.name), /*questionToken*/ undefined, toType(m), /*initializer*/ undefined); }));
+            default:
+                return ts.Debug.assertNever(info);
+        }
+    }
+    function toPropertyName(name) {
+        return ts.isIdentifierText(name, 6 /* ESNext */) ? ts.createIdentifier(name) : ts.createStringLiteral(name);
+    }
+    // Parses assignments to "this.x" in the constructor into class property declarations
+    function getConstructorFunctionInstanceProperties(fnAst, members) {
+        forEachOwnNodeOfFunction(fnAst, function (node) {
+            if (ts.isAssignmentExpression(node, /*excludeCompoundAssignment*/ true) &&
+                ts.isPropertyAccessExpression(node.left) && node.left.expression.kind === 100 /* ThisKeyword */) {
+                var name_7 = node.left.name.text;
+                if (!ts.isJsPrivate(name_7)) {
+                    ts.getOrUpdate(members, name_7, function () { return ts.createProperty(/*decorators*/ undefined, /*modifiers*/ undefined, name_7, /*questionOrExclamationToken*/ undefined, anyType(), /*initializer*/ undefined); });
+                }
+            }
+        });
+    }
+    function getParametersAndReturnType(fnAst) {
+        if (typeof fnAst === "number") {
+            return { parameters: ts.fill(fnAst, function (i) { return makeParameter("p" + i, anyType()); }), returnType: anyType() };
+        }
+        var usedArguments = false, hasReturn = false;
+        forEachOwnNodeOfFunction(fnAst, function (node) {
+            usedArguments = usedArguments || ts.isIdentifier(node) && node.text === "arguments";
+            hasReturn = hasReturn || ts.isReturnStatement(node) && !!node.expression && node.expression.kind !== 200 /* VoidExpression */;
+        });
+        var parameters = fnAst.parameters.map(function (p) { return makeParameter("" + p.name.getText(), inferParameterType(fnAst, p)); }).concat((usedArguments ? [makeRestParameter()] : ts.emptyArray));
+        return { parameters: parameters, returnType: hasReturn ? anyType() : ts.createKeywordTypeNode(106 /* VoidKeyword */) };
+    }
+    function makeParameter(name, type) {
+        return ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, name, /*questionToken*/ undefined, type);
+    }
+    function makeRestParameter() {
+        return ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createToken(25 /* DotDotDotToken */), "args", /*questionToken*/ undefined, ts.createArrayTypeNode(anyType()));
+    }
+    /** Returns 'undefined' for class with no declared constructor */
+    function parseClassOrFunctionBody(source) {
+        if (typeof source === "number")
+            return source;
+        var classOrFunction = ts.tryCast(parseExpression(source), function (node) { return ts.isFunctionExpression(node) || ts.isArrowFunction(node) || ts.isClassExpression(node); });
+        return classOrFunction
+            ? ts.isClassExpression(classOrFunction) ? ts.find(classOrFunction.members, ts.isConstructorDeclaration) : classOrFunction
+            // If that didn't parse, it's a method `m() {}`. Parse again inside of an object literal.
+            : ts.cast(ts.first(ts.cast(parseExpression("{ " + source + " }"), ts.isObjectLiteralExpression).properties), ts.isMethodDeclaration);
+    }
+    function parseExpression(expr) {
+        var text = "const _ = " + expr;
+        var srcFile = ts.createSourceFile("test.ts", text, 6 /* Latest */, /*setParentNodes*/ true);
+        return ts.first(ts.cast(ts.first(srcFile.statements), ts.isVariableStatement).declarationList.declarations).initializer;
+    }
+    function inferParameterType(_fn, _param) {
+        // TODO: Inspect function body for clues (see inferFromUsage.ts)
+        return anyType();
+    }
+    // Descends through all nodes in a function, but not in nested functions.
+    function forEachOwnNodeOfFunction(fnAst, cb) {
+        fnAst.body.forEachChild(function recur(node) {
+            cb(node);
+            if (!ts.isFunctionLike(node))
+                node.forEachChild(recur);
+        });
+    }
+    function isValidIdentifier(name) {
+        var keyword = ts.stringToToken(name);
+        return !(keyword && ts.isNonContextualKeyword(keyword)) && ts.isIdentifierText(name, 6 /* ESNext */);
+    }
+    function addComment(node, comment) {
+        if (comment !== undefined)
+            ts.addSyntheticLeadingComment(node, 2 /* SingleLineCommentTrivia */, comment);
+        return node;
+    }
+    function anyType() {
+        return ts.createKeywordTypeNode(120 /* AnyKeyword */);
+    }
+    function createNamespace(modifiers, name, statements) {
+        return ts.createModuleDeclaration(/*decorators*/ undefined, modifiers, ts.createIdentifier(name), ts.createModuleBlock(statements), 16 /* Namespace */);
+    }
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "requireInTs";
+        var errorCodes = [ts.Diagnostics.require_call_may_be_converted_to_an_import.code];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, context.sourceFile, context.span.start, context.program); });
+                return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Convert_require_to_import, fixId, ts.Diagnostics.Convert_all_require_to_import)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) { return doChange(changes, diag.file, diag.start, context.program); }); },
+        });
+        function doChange(changes, sourceFile, pos, program) {
+            var _a = getInfo(sourceFile, pos), statement = _a.statement, name = _a.name, required = _a.required;
+            changes.replaceNode(sourceFile, statement, ts.getAllowSyntheticDefaultImports(program.getCompilerOptions())
+                ? ts.createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createImportClause(name, /*namedBindings*/ undefined), required)
+                : ts.createImportEqualsDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, name, ts.createExternalModuleReference(required)));
+        }
+        function getInfo(sourceFile, pos) {
+            var parent = ts.getTokenAtPosition(sourceFile, pos).parent;
+            if (!ts.isRequireCall(parent, /*checkArgumentIsStringLiteralLike*/ true))
+                throw ts.Debug.failBadSyntaxKind(parent);
+            var decl = ts.cast(parent.parent, ts.isVariableDeclaration);
+            return { statement: ts.cast(decl.parent.parent, ts.isVariableStatement), name: ts.cast(decl.name, ts.isIdentifier), required: parent.arguments[0] };
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "useDefaultImport";
+        var errorCodes = [ts.Diagnostics.Import_may_be_converted_to_a_default_import.code];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, start = context.span.start;
+                var info = getInfo(sourceFile, start);
+                if (!info)
+                    return undefined;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, sourceFile, info, context.preferences); });
+                return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Convert_to_default_import, fixId, ts.Diagnostics.Convert_all_to_default_imports)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                var info = getInfo(diag.file, diag.start);
+                if (info)
+                    doChange(changes, diag.file, info, context.preferences);
+            }); },
+        });
+        function getInfo(sourceFile, pos) {
+            var name = ts.getTokenAtPosition(sourceFile, pos);
+            if (!ts.isIdentifier(name))
+                return undefined; // bad input
+            var parent = name.parent;
+            if (ts.isImportEqualsDeclaration(parent) && ts.isExternalModuleReference(parent.moduleReference)) {
+                return { importNode: parent, name: name, moduleSpecifier: parent.moduleReference.expression };
+            }
+            else if (ts.isNamespaceImport(parent)) {
+                var importNode = parent.parent.parent;
+                return { importNode: importNode, name: name, moduleSpecifier: importNode.moduleSpecifier };
+            }
+        }
+        function doChange(changes, sourceFile, info, preferences) {
+            changes.replaceNode(sourceFile, info.importNode, ts.makeImport(info.name, /*namedImports*/ undefined, info.moduleSpecifier, ts.getQuotePreference(sourceFile, preferences)));
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixIdAddMissingTypeof = "fixAddModuleReferTypeMissingTypeof";
+        var fixId = fixIdAddMissingTypeof;
+        var errorCodes = [ts.Diagnostics.Module_0_does_not_refer_to_a_type_but_is_used_as_a_type_here_Did_you_mean_typeof_import_0.code];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, span = context.span;
+                var importType = getImportTypeNode(sourceFile, span.start);
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, sourceFile, importType); });
+                return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Add_missing_typeof, fixId, ts.Diagnostics.Add_missing_typeof)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                return doChange(changes, context.sourceFile, getImportTypeNode(diag.file, diag.start));
+            }); },
+        });
+        function getImportTypeNode(sourceFile, pos) {
+            var token = ts.getTokenAtPosition(sourceFile, pos);
+            ts.Debug.assert(token.kind === 92 /* ImportKeyword */);
+            ts.Debug.assert(token.parent.kind === 183 /* ImportType */);
+            return token.parent;
+        }
+        function doChange(changes, sourceFile, importType) {
+            var newTypeNode = ts.updateImportTypeNode(importType, importType.argument, importType.qualifier, importType.typeArguments, /* isTypeOf */ true);
+            changes.replaceNode(sourceFile, importType, newTypeNode);
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixIdAddMissingTypeof = "fixConvertToMappedObjectType";
+        var fixId = fixIdAddMissingTypeof;
+        var errorCodes = [ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_union_type_Consider_using_a_mapped_object_type_instead.code];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, span = context.span;
+                var info = getInfo(sourceFile, span.start);
+                if (!info)
+                    return undefined;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, sourceFile, info); });
+                var name = ts.idText(info.container.name);
+                return [codefix.createCodeFixAction(fixId, changes, [ts.Diagnostics.Convert_0_to_mapped_object_type, name], fixId, [ts.Diagnostics.Convert_0_to_mapped_object_type, name])];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                var info = getInfo(diag.file, diag.start);
+                if (info)
+                    doChange(changes, diag.file, info);
+            }); }
+        });
+        function getInfo(sourceFile, pos) {
+            var token = ts.getTokenAtPosition(sourceFile, pos);
+            var indexSignature = ts.cast(token.parent.parent, ts.isIndexSignatureDeclaration);
+            if (ts.isClassDeclaration(indexSignature.parent))
+                return undefined;
+            var container = ts.isInterfaceDeclaration(indexSignature.parent) ? indexSignature.parent : ts.cast(indexSignature.parent.parent, ts.isTypeAliasDeclaration);
+            return { indexSignature: indexSignature, container: container };
+        }
+        function createTypeAliasFromInterface(declaration, type) {
+            return ts.createTypeAliasDeclaration(declaration.decorators, declaration.modifiers, declaration.name, declaration.typeParameters, type);
+        }
+        function doChange(changes, sourceFile, _a) {
+            var indexSignature = _a.indexSignature, container = _a.container;
+            var members = ts.isInterfaceDeclaration(container) ? container.members : container.type.members;
+            var otherMembers = members.filter(function (member) { return !ts.isIndexSignatureDeclaration(member); });
+            var parameter = ts.first(indexSignature.parameters);
+            var mappedTypeParameter = ts.createTypeParameterDeclaration(ts.cast(parameter.name, ts.isIdentifier), parameter.type);
+            var mappedIntersectionType = ts.createMappedTypeNode(ts.hasReadonlyModifier(indexSignature) ? ts.createModifier(133 /* ReadonlyKeyword */) : undefined, mappedTypeParameter, indexSignature.questionToken, indexSignature.type);
+            var intersectionType = ts.createIntersectionTypeNode(ts.getAllSuperTypeNodes(container).concat([
+                mappedIntersectionType
+            ], (otherMembers.length ? [ts.createTypeLiteralNode(otherMembers)] : ts.emptyArray)));
+            changes.replaceNode(sourceFile, container, createTypeAliasFromInterface(container, intersectionType));
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var refactor;
+    (function (refactor) {
+        var refactorName = "Convert export";
+        var actionNameDefaultToNamed = "Convert default export to named export";
+        var actionNameNamedToDefault = "Convert named export to default export";
+        refactor.registerRefactor(refactorName, {
+            getAvailableActions: function (context) {
+                var info = getInfo(context);
+                if (!info)
+                    return ts.emptyArray;
+                var description = info.wasDefault ? ts.Diagnostics.Convert_default_export_to_named_export.message : ts.Diagnostics.Convert_named_export_to_default_export.message;
+                var actionName = info.wasDefault ? actionNameDefaultToNamed : actionNameNamedToDefault;
+                return [{ name: refactorName, description: description, actions: [{ name: actionName, description: description }] }];
+            },
+            getEditsForAction: function (context, actionName) {
+                ts.Debug.assert(actionName === actionNameDefaultToNamed || actionName === actionNameNamedToDefault);
+                var edits = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(context.file, context.program, ts.Debug.assertDefined(getInfo(context)), t, context.cancellationToken); });
+                return { edits: edits, renameFilename: undefined, renameLocation: undefined };
+            },
+        });
+        function getInfo(context) {
+            var file = context.file;
+            var span = ts.getRefactorContextSpan(context);
+            var token = ts.getTokenAtPosition(file, span.start);
+            var exportNode = ts.getParentNodeInSpan(token, file, span);
+            if (!exportNode || (!ts.isSourceFile(exportNode.parent) && !(ts.isModuleBlock(exportNode.parent) && ts.isAmbientModule(exportNode.parent.parent)))) {
+                return undefined;
+            }
+            var exportingModuleSymbol = ts.isSourceFile(exportNode.parent) ? exportNode.parent.symbol : exportNode.parent.parent.symbol;
+            var flags = ts.getModifierFlags(exportNode);
+            var wasDefault = !!(flags & 512 /* Default */);
+            // If source file already has a default export, don't offer refactor.
+            if (!(flags & 1 /* Export */) || !wasDefault && exportingModuleSymbol.exports.has("default" /* Default */)) {
+                return undefined;
+            }
+            switch (exportNode.kind) {
+                case 239 /* FunctionDeclaration */:
+                case 240 /* ClassDeclaration */:
+                case 241 /* InterfaceDeclaration */:
+                case 243 /* EnumDeclaration */:
+                case 242 /* TypeAliasDeclaration */:
+                case 244 /* ModuleDeclaration */: {
+                    var node = exportNode;
+                    return node.name && ts.isIdentifier(node.name) ? { exportNode: node, exportName: node.name, wasDefault: wasDefault, exportingModuleSymbol: exportingModuleSymbol } : undefined;
+                }
+                case 219 /* VariableStatement */: {
+                    var vs = exportNode;
+                    // Must be `export const x = something;`.
+                    if (!(vs.declarationList.flags & 2 /* Const */) || vs.declarationList.declarations.length !== 1) {
+                        return undefined;
+                    }
+                    var decl = ts.first(vs.declarationList.declarations);
+                    if (!decl.initializer)
+                        return undefined;
+                    ts.Debug.assert(!wasDefault);
+                    return ts.isIdentifier(decl.name) ? { exportNode: vs, exportName: decl.name, wasDefault: wasDefault, exportingModuleSymbol: exportingModuleSymbol } : undefined;
+                }
+                default:
+                    return undefined;
+            }
+        }
+        function doChange(exportingSourceFile, program, info, changes, cancellationToken) {
+            changeExport(exportingSourceFile, info, changes, program.getTypeChecker());
+            changeImports(program, info, changes, cancellationToken);
+        }
+        function changeExport(exportingSourceFile, _a, changes, checker) {
+            var wasDefault = _a.wasDefault, exportNode = _a.exportNode, exportName = _a.exportName;
+            if (wasDefault) {
+                changes.delete(exportingSourceFile, ts.Debug.assertDefined(ts.findModifier(exportNode, 80 /* DefaultKeyword */)));
+            }
+            else {
+                var exportKeyword = ts.Debug.assertDefined(ts.findModifier(exportNode, 85 /* ExportKeyword */));
+                switch (exportNode.kind) {
+                    case 239 /* FunctionDeclaration */:
+                    case 240 /* ClassDeclaration */:
+                    case 241 /* InterfaceDeclaration */:
+                        changes.insertNodeAfter(exportingSourceFile, exportKeyword, ts.createToken(80 /* DefaultKeyword */));
+                        break;
+                    case 219 /* VariableStatement */:
+                        // If 'x' isn't used in this file, `export const x = 0;` --> `export default 0;`
+                        if (!ts.FindAllReferences.Core.isSymbolReferencedInFile(exportName, checker, exportingSourceFile)) {
+                            // We checked in `getInfo` that an initializer exists.
+                            changes.replaceNode(exportingSourceFile, exportNode, ts.createExportDefault(ts.Debug.assertDefined(ts.first(exportNode.declarationList.declarations).initializer)));
+                            break;
+                        }
+                    // falls through
+                    case 243 /* EnumDeclaration */:
+                    case 242 /* TypeAliasDeclaration */:
+                    case 244 /* ModuleDeclaration */:
+                        // `export type T = number;` -> `type T = number; export default T;`
+                        changes.deleteModifier(exportingSourceFile, exportKeyword);
+                        changes.insertNodeAfter(exportingSourceFile, exportNode, ts.createExportDefault(ts.createIdentifier(exportName.text)));
+                        break;
+                    default:
+                        ts.Debug.assertNever(exportNode);
+                }
+            }
+        }
+        function changeImports(program, _a, changes, cancellationToken) {
+            var wasDefault = _a.wasDefault, exportName = _a.exportName, exportingModuleSymbol = _a.exportingModuleSymbol;
+            var checker = program.getTypeChecker();
+            var exportSymbol = ts.Debug.assertDefined(checker.getSymbolAtLocation(exportName));
+            ts.FindAllReferences.Core.eachExportReference(program.getSourceFiles(), checker, cancellationToken, exportSymbol, exportingModuleSymbol, exportName.text, wasDefault, function (ref) {
+                var importingSourceFile = ref.getSourceFile();
+                if (wasDefault) {
+                    changeDefaultToNamedImport(importingSourceFile, ref, changes, exportName.text);
+                }
+                else {
+                    changeNamedToDefaultImport(importingSourceFile, ref, changes);
+                }
+            });
+        }
+        function changeDefaultToNamedImport(importingSourceFile, ref, changes, exportName) {
+            var parent = ref.parent;
+            switch (parent.kind) {
+                case 189 /* PropertyAccessExpression */:
+                    // `a.default` --> `a.foo`
+                    changes.replaceNode(importingSourceFile, ref, ts.createIdentifier(exportName));
+                    break;
+                case 253 /* ImportSpecifier */:
+                case 257 /* ExportSpecifier */: {
+                    var spec = parent;
+                    // `default as foo` --> `foo`, `default as bar` --> `foo as bar`
+                    changes.replaceNode(importingSourceFile, spec, makeImportSpecifier(exportName, spec.name.text));
+                    break;
+                }
+                case 250 /* ImportClause */: {
+                    var clause = parent;
+                    ts.Debug.assert(clause.name === ref);
+                    var spec = makeImportSpecifier(exportName, ref.text);
+                    var namedBindings = clause.namedBindings;
+                    if (!namedBindings) {
+                        // `import foo from "./a";` --> `import { foo } from "./a";`
+                        changes.replaceNode(importingSourceFile, ref, ts.createNamedImports([spec]));
+                    }
+                    else if (namedBindings.kind === 251 /* NamespaceImport */) {
+                        // `import foo, * as a from "./a";` --> `import * as a from ".a/"; import { foo } from "./a";`
+                        changes.deleteRange(importingSourceFile, { pos: ref.getStart(importingSourceFile), end: namedBindings.getStart(importingSourceFile) });
+                        var quotePreference = ts.isStringLiteral(clause.parent.moduleSpecifier) ? ts.quotePreferenceFromString(clause.parent.moduleSpecifier, importingSourceFile) : 1 /* Double */;
+                        var newImport = ts.makeImport(/*default*/ undefined, [makeImportSpecifier(exportName, ref.text)], clause.parent.moduleSpecifier, quotePreference);
+                        changes.insertNodeAfter(importingSourceFile, clause.parent, newImport);
+                    }
+                    else {
+                        // `import foo, { bar } from "./a"` --> `import { bar, foo } from "./a";`
+                        changes.delete(importingSourceFile, ref);
+                        changes.insertNodeAtEndOfList(importingSourceFile, namedBindings.elements, spec);
+                    }
+                    break;
+                }
+                default:
+                    ts.Debug.failBadSyntaxKind(parent);
+            }
+        }
+        function changeNamedToDefaultImport(importingSourceFile, ref, changes) {
+            var parent = ref.parent;
+            switch (parent.kind) {
+                case 189 /* PropertyAccessExpression */:
+                    // `a.foo` --> `a.default`
+                    changes.replaceNode(importingSourceFile, ref, ts.createIdentifier("default"));
+                    break;
+                case 253 /* ImportSpecifier */: {
+                    // `import { foo } from "./a";` --> `import foo from "./a";`
+                    // `import { foo as bar } from "./a";` --> `import bar from "./a";`
+                    var defaultImport = ts.createIdentifier(parent.name.text);
+                    if (parent.parent.elements.length === 1) {
+                        changes.replaceNode(importingSourceFile, parent.parent, defaultImport);
+                    }
+                    else {
+                        changes.delete(importingSourceFile, parent);
+                        changes.insertNodeBefore(importingSourceFile, parent.parent, defaultImport);
+                    }
+                    break;
+                }
+                case 257 /* ExportSpecifier */: {
+                    // `export { foo } from "./a";` --> `export { default as foo } from "./a";`
+                    // `export { foo as bar } from "./a";` --> `export { default as bar } from "./a";`
+                    // `export { foo as default } from "./a";` --> `export { default } from "./a";`
+                    // (Because `export foo from "./a";` isn't valid syntax.)
+                    changes.replaceNode(importingSourceFile, parent, makeExportSpecifier("default", parent.name.text));
+                    break;
+                }
+                default:
+                    ts.Debug.assertNever(parent);
+            }
+        }
+        function makeImportSpecifier(propertyName, name) {
+            return ts.createImportSpecifier(propertyName === name ? undefined : ts.createIdentifier(propertyName), ts.createIdentifier(name));
+        }
+        function makeExportSpecifier(propertyName, name) {
+            return ts.createExportSpecifier(propertyName === name ? undefined : ts.createIdentifier(propertyName), ts.createIdentifier(name));
+        }
+    })(refactor = ts.refactor || (ts.refactor = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var refactor;
+    (function (refactor) {
+        var refactorName = "Convert import";
+        var actionNameNamespaceToNamed = "Convert namespace import to named imports";
+        var actionNameNamedToNamespace = "Convert named imports to namespace import";
+        refactor.registerRefactor(refactorName, {
+            getAvailableActions: function (context) {
+                var i = getImportToConvert(context);
+                if (!i)
+                    return ts.emptyArray;
+                var description = i.kind === 251 /* NamespaceImport */ ? ts.Diagnostics.Convert_namespace_import_to_named_imports.message : ts.Diagnostics.Convert_named_imports_to_namespace_import.message;
+                var actionName = i.kind === 251 /* NamespaceImport */ ? actionNameNamespaceToNamed : actionNameNamedToNamespace;
+                return [{ name: refactorName, description: description, actions: [{ name: actionName, description: description }] }];
+            },
+            getEditsForAction: function (context, actionName) {
+                ts.Debug.assert(actionName === actionNameNamespaceToNamed || actionName === actionNameNamedToNamespace);
+                var edits = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(context.file, context.program, t, ts.Debug.assertDefined(getImportToConvert(context))); });
+                return { edits: edits, renameFilename: undefined, renameLocation: undefined };
+            }
+        });
+        // Can convert imports of the form `import * as m from "m";` or `import d, { x, y } from "m";`.
+        function getImportToConvert(context) {
+            var file = context.file;
+            var span = ts.getRefactorContextSpan(context);
+            var token = ts.getTokenAtPosition(file, span.start);
+            var importDecl = ts.getParentNodeInSpan(token, file, span);
+            if (!importDecl || !ts.isImportDeclaration(importDecl))
+                return undefined;
+            var importClause = importDecl.importClause;
+            return importClause && importClause.namedBindings;
+        }
+        function doChange(sourceFile, program, changes, toConvert) {
+            var checker = program.getTypeChecker();
+            if (toConvert.kind === 251 /* NamespaceImport */) {
+                doChangeNamespaceToNamed(sourceFile, checker, changes, toConvert, ts.getAllowSyntheticDefaultImports(program.getCompilerOptions()));
+            }
+            else {
+                doChangeNamedToNamespace(sourceFile, checker, changes, toConvert);
+            }
+        }
+        function doChangeNamespaceToNamed(sourceFile, checker, changes, toConvert, allowSyntheticDefaultImports) {
+            var usedAsNamespaceOrDefault = false;
+            var nodesToReplace = [];
+            var conflictingNames = ts.createMap();
+            ts.FindAllReferences.Core.eachSymbolReferenceInFile(toConvert.name, checker, sourceFile, function (id) {
+                if (!ts.isPropertyAccessExpression(id.parent)) {
+                    usedAsNamespaceOrDefault = true;
+                }
+                else {
+                    var parent = ts.cast(id.parent, ts.isPropertyAccessExpression);
+                    var exportName = parent.name.text;
+                    if (checker.resolveName(exportName, id, 67108863 /* All */, /*excludeGlobals*/ true)) {
+                        conflictingNames.set(exportName, true);
+                    }
+                    ts.Debug.assert(parent.expression === id);
+                    nodesToReplace.push(parent);
+                }
+            });
+            // We may need to change `mod.x` to `_x` to avoid a name conflict.
+            var exportNameToImportName = ts.createMap();
+            for (var _i = 0, nodesToReplace_1 = nodesToReplace; _i < nodesToReplace_1.length; _i++) {
+                var propertyAccess = nodesToReplace_1[_i];
+                var exportName = propertyAccess.name.text;
+                var importName = exportNameToImportName.get(exportName);
+                if (importName === undefined) {
+                    exportNameToImportName.set(exportName, importName = conflictingNames.has(exportName) ? ts.getUniqueName(exportName, sourceFile) : exportName);
+                }
+                changes.replaceNode(sourceFile, propertyAccess, ts.createIdentifier(importName));
+            }
+            var importSpecifiers = [];
+            exportNameToImportName.forEach(function (name, propertyName) {
+                importSpecifiers.push(ts.createImportSpecifier(name === propertyName ? undefined : ts.createIdentifier(propertyName), ts.createIdentifier(name)));
+            });
+            var importDecl = toConvert.parent.parent;
+            if (usedAsNamespaceOrDefault && !allowSyntheticDefaultImports) {
+                // Need to leave the namespace import alone
+                changes.insertNodeAfter(sourceFile, importDecl, updateImport(importDecl, /*defaultImportName*/ undefined, importSpecifiers));
+            }
+            else {
+                changes.replaceNode(sourceFile, importDecl, updateImport(importDecl, usedAsNamespaceOrDefault ? ts.createIdentifier(toConvert.name.text) : undefined, importSpecifiers));
+            }
+        }
+        function doChangeNamedToNamespace(sourceFile, checker, changes, toConvert) {
+            var importDecl = toConvert.parent.parent;
+            var moduleSpecifier = importDecl.moduleSpecifier;
+            var preferredName = moduleSpecifier && ts.isStringLiteral(moduleSpecifier) ? ts.codefix.moduleSpecifierToValidIdentifier(moduleSpecifier.text, 6 /* ESNext */) : "module";
+            var namespaceNameConflicts = toConvert.elements.some(function (element) {
+                return ts.FindAllReferences.Core.eachSymbolReferenceInFile(element.name, checker, sourceFile, function (id) {
+                    return !!checker.resolveName(preferredName, id, 67108863 /* All */, /*excludeGlobals*/ true);
+                }) || false;
+            });
+            var namespaceImportName = namespaceNameConflicts ? ts.getUniqueName(preferredName, sourceFile) : preferredName;
+            var neededNamedImports = [];
+            var _loop_23 = function (element) {
+                var propertyName = (element.propertyName || element.name).text;
+                ts.FindAllReferences.Core.eachSymbolReferenceInFile(element.name, checker, sourceFile, function (id) {
+                    var access = ts.createPropertyAccess(ts.createIdentifier(namespaceImportName), propertyName);
+                    if (ts.isShorthandPropertyAssignment(id.parent)) {
+                        changes.replaceNode(sourceFile, id.parent, ts.createPropertyAssignment(id.text, access));
+                    }
+                    else if (ts.isExportSpecifier(id.parent) && !id.parent.propertyName) {
+                        if (!neededNamedImports.some(function (n) { return n.name === element.name; })) {
+                            neededNamedImports.push(ts.createImportSpecifier(element.propertyName && ts.createIdentifier(element.propertyName.text), ts.createIdentifier(element.name.text)));
+                        }
+                    }
+                    else {
+                        changes.replaceNode(sourceFile, id, access);
+                    }
+                });
+            };
+            for (var _i = 0, _a = toConvert.elements; _i < _a.length; _i++) {
+                var element = _a[_i];
+                _loop_23(element);
+            }
+            changes.replaceNode(sourceFile, toConvert, ts.createNamespaceImport(ts.createIdentifier(namespaceImportName)));
+            if (neededNamedImports.length) {
+                changes.insertNodeAfter(sourceFile, toConvert.parent.parent, updateImport(importDecl, /*defaultImportName*/ undefined, neededNamedImports));
+            }
+        }
+        function updateImport(old, defaultImportName, elements) {
+            return ts.createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createImportClause(defaultImportName, elements && elements.length ? ts.createNamedImports(elements) : undefined), old.moduleSpecifier);
+        }
+    })(refactor = ts.refactor || (ts.refactor = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var refactor;
+    (function (refactor) {
+        var extractSymbol;
+        (function (extractSymbol) {
+            var refactorName = "Extract Symbol";
+            refactor.registerRefactor(refactorName, { getAvailableActions: getAvailableActions, getEditsForAction: getEditsForAction });
+            /**
+             * Compute the associated code actions
+             * Exported for tests.
+             */
+            function getAvailableActions(context) {
+                var rangeToExtract = getRangeToExtract(context.file, ts.getRefactorContextSpan(context));
+                var targetRange = rangeToExtract.targetRange;
+                if (targetRange === undefined) {
+                    return ts.emptyArray;
+                }
+                var extractions = getPossibleExtractions(targetRange, context);
+                if (extractions === undefined) {
+                    // No extractions possible
+                    return ts.emptyArray;
+                }
+                var functionActions = [];
+                var usedFunctionNames = ts.createMap();
+                var constantActions = [];
+                var usedConstantNames = ts.createMap();
+                var i = 0;
+                for (var _i = 0, extractions_1 = extractions; _i < extractions_1.length; _i++) {
+                    var _a = extractions_1[_i], functionExtraction = _a.functionExtraction, constantExtraction = _a.constantExtraction;
+                    // Skip these since we don't have a way to report errors yet
+                    if (functionExtraction.errors.length === 0) {
+                        // Don't issue refactorings with duplicated names.
+                        // Scopes come back in "innermost first" order, so extractions will
+                        // preferentially go into nearer scopes
+                        var description = functionExtraction.description;
+                        if (!usedFunctionNames.has(description)) {
+                            usedFunctionNames.set(description, true);
+                            functionActions.push({
+                                description: description,
+                                name: "function_scope_" + i
+                            });
+                        }
+                    }
+                    // Skip these since we don't have a way to report errors yet
+                    if (constantExtraction.errors.length === 0) {
+                        // Don't issue refactorings with duplicated names.
+                        // Scopes come back in "innermost first" order, so extractions will
+                        // preferentially go into nearer scopes
+                        var description = constantExtraction.description;
+                        if (!usedConstantNames.has(description)) {
+                            usedConstantNames.set(description, true);
+                            constantActions.push({
+                                description: description,
+                                name: "constant_scope_" + i
+                            });
+                        }
+                    }
+                    // *do* increment i anyway because we'll look for the i-th scope
+                    // later when actually doing the refactoring if the user requests it
+                    i++;
+                }
+                var infos = [];
+                if (functionActions.length) {
+                    infos.push({
+                        name: refactorName,
+                        description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_function),
+                        actions: functionActions
+                    });
+                }
+                if (constantActions.length) {
+                    infos.push({
+                        name: refactorName,
+                        description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_constant),
+                        actions: constantActions
+                    });
+                }
+                return infos.length ? infos : ts.emptyArray;
+            }
+            extractSymbol.getAvailableActions = getAvailableActions;
+            /* Exported for tests */
+            function getEditsForAction(context, actionName) {
+                var rangeToExtract = getRangeToExtract(context.file, ts.getRefactorContextSpan(context));
+                var targetRange = rangeToExtract.targetRange; // TODO:GH#18217
+                var parsedFunctionIndexMatch = /^function_scope_(\d+)$/.exec(actionName);
+                if (parsedFunctionIndexMatch) {
+                    var index = +parsedFunctionIndexMatch[1];
+                    ts.Debug.assert(isFinite(index), "Expected to parse a finite number from the function scope index");
+                    return getFunctionExtractionAtIndex(targetRange, context, index);
+                }
+                var parsedConstantIndexMatch = /^constant_scope_(\d+)$/.exec(actionName);
+                if (parsedConstantIndexMatch) {
+                    var index = +parsedConstantIndexMatch[1];
+                    ts.Debug.assert(isFinite(index), "Expected to parse a finite number from the constant scope index");
+                    return getConstantExtractionAtIndex(targetRange, context, index);
+                }
+                ts.Debug.fail("Unrecognized action name");
+            }
+            extractSymbol.getEditsForAction = getEditsForAction;
+            // Move these into diagnostic messages if they become user-facing
+            var Messages;
+            (function (Messages) {
+                function createMessage(message) {
+                    return { message: message, code: 0, category: ts.DiagnosticCategory.Message, key: message };
+                }
+                Messages.cannotExtractRange = createMessage("Cannot extract range.");
+                Messages.cannotExtractImport = createMessage("Cannot extract import statement.");
+                Messages.cannotExtractSuper = createMessage("Cannot extract super call.");
+                Messages.cannotExtractEmpty = createMessage("Cannot extract empty range.");
+                Messages.expressionExpected = createMessage("expression expected.");
+                Messages.uselessConstantType = createMessage("No reason to extract constant of type.");
+                Messages.statementOrExpressionExpected = createMessage("Statement or expression expected.");
+                Messages.cannotExtractRangeContainingConditionalBreakOrContinueStatements = createMessage("Cannot extract range containing conditional break or continue statements.");
+                Messages.cannotExtractRangeContainingConditionalReturnStatement = createMessage("Cannot extract range containing conditional return statement.");
+                Messages.cannotExtractRangeContainingLabeledBreakOrContinueStatementWithTargetOutsideOfTheRange = createMessage("Cannot extract range containing labeled break or continue with target outside of the range.");
+                Messages.cannotExtractRangeThatContainsWritesToReferencesLocatedOutsideOfTheTargetRangeInGenerators = createMessage("Cannot extract range containing writes to references located outside of the target range in generators.");
+                Messages.typeWillNotBeVisibleInTheNewScope = createMessage("Type will not visible in the new scope.");
+                Messages.functionWillNotBeVisibleInTheNewScope = createMessage("Function will not visible in the new scope.");
+                Messages.cannotExtractIdentifier = createMessage("Select more than a single identifier.");
+                Messages.cannotExtractExportedEntity = createMessage("Cannot extract exported declaration");
+                Messages.cannotWriteInExpression = createMessage("Cannot write back side-effects when extracting an expression");
+                Messages.cannotExtractReadonlyPropertyInitializerOutsideConstructor = createMessage("Cannot move initialization of read-only class property outside of the constructor");
+                Messages.cannotExtractAmbientBlock = createMessage("Cannot extract code from ambient contexts");
+                Messages.cannotAccessVariablesFromNestedScopes = createMessage("Cannot access variables from nested scopes");
+                Messages.cannotExtractToOtherFunctionLike = createMessage("Cannot extract method to a function-like scope that is not a function");
+                Messages.cannotExtractToJSClass = createMessage("Cannot extract constant to a class scope in JS");
+                Messages.cannotExtractToExpressionArrowFunction = createMessage("Cannot extract constant to an arrow function without a block");
+            })(Messages = extractSymbol.Messages || (extractSymbol.Messages = {}));
+            var RangeFacts;
+            (function (RangeFacts) {
+                RangeFacts[RangeFacts["None"] = 0] = "None";
+                RangeFacts[RangeFacts["HasReturn"] = 1] = "HasReturn";
+                RangeFacts[RangeFacts["IsGenerator"] = 2] = "IsGenerator";
+                RangeFacts[RangeFacts["IsAsyncFunction"] = 4] = "IsAsyncFunction";
+                RangeFacts[RangeFacts["UsesThis"] = 8] = "UsesThis";
+                /**
+                 * The range is in a function which needs the 'static' modifier in a class
+                 */
+                RangeFacts[RangeFacts["InStaticRegion"] = 16] = "InStaticRegion";
+            })(RangeFacts || (RangeFacts = {}));
+            /**
+             * getRangeToExtract takes a span inside a text file and returns either an expression or an array
+             * of statements representing the minimum set of nodes needed to extract the entire span. This
+             * process may fail, in which case a set of errors is returned instead (these are currently
+             * not shown to the user, but can be used by us diagnostically)
+             */
+            // exported only for tests
+            function getRangeToExtract(sourceFile, span) {
+                var length = span.length;
+                if (length === 0) {
+                    return { errors: [ts.createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractEmpty)] };
+                }
+                // Walk up starting from the the start position until we find a non-SourceFile node that subsumes the selected span.
+                // This may fail (e.g. you select two statements in the root of a source file)
+                var start = ts.getParentNodeInSpan(ts.getTokenAtPosition(sourceFile, span.start), sourceFile, span);
+                // Do the same for the ending position
+                var end = ts.getParentNodeInSpan(ts.findTokenOnLeftOfPosition(sourceFile, ts.textSpanEnd(span)), sourceFile, span);
+                var declarations = [];
+                // We'll modify these flags as we walk the tree to collect data
+                // about what things need to be done as part of the extraction.
+                var rangeFacts = RangeFacts.None;
+                if (!start || !end) {
+                    // cannot find either start or end node
+                    return { errors: [ts.createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractRange)] };
+                }
+                if (start.parent !== end.parent) {
+                    // start and end nodes belong to different subtrees
+                    return { errors: [ts.createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractRange)] };
+                }
+                if (start !== end) {
+                    // start and end should be statements and parent should be either block or a source file
+                    if (!isBlockLike(start.parent)) {
+                        return { errors: [ts.createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractRange)] };
+                    }
+                    var statements = [];
+                    var start2 = start; // TODO: GH#18217 Need to alias `start` to get this to compile. See https://github.com/Microsoft/TypeScript/issues/19955#issuecomment-344118248
+                    for (var _i = 0, _a = start2.parent.statements; _i < _a.length; _i++) {
+                        var statement = _a[_i];
+                        if (statement === start || statements.length) {
+                            var errors_1 = checkNode(statement);
+                            if (errors_1) {
+                                return { errors: errors_1 };
+                            }
+                            statements.push(statement);
+                        }
+                        if (statement === end) {
+                            break;
+                        }
+                    }
+                    if (!statements.length) {
+                        // https://github.com/Microsoft/TypeScript/issues/20559
+                        // Ranges like [|case 1: break;|] will fail to populate `statements` because
+                        // they will never find `start` in `start.parent.statements`.
+                        // Consider: We could support ranges like [|case 1:|] by refining them to just
+                        // the expression.
+                        return { errors: [ts.createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractRange)] };
+                    }
+                    return { targetRange: { range: statements, facts: rangeFacts, declarations: declarations } };
+                }
+                if (ts.isReturnStatement(start) && !start.expression) {
+                    // Makes no sense to extract an expression-less return statement.
+                    return { errors: [ts.createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractRange)] };
+                }
+                // We have a single node (start)
+                var node = refineNode(start);
+                var errors = checkRootNode(node) || checkNode(node);
+                if (errors) {
+                    return { errors: errors };
+                }
+                return { targetRange: { range: getStatementOrExpressionRange(node), facts: rangeFacts, declarations: declarations } }; // TODO: GH#18217
+                /**
+                 * Attempt to refine the extraction node (generally, by shrinking it) to produce better results.
+                 * @param node The unrefined extraction node.
+                 */
+                function refineNode(node) {
+                    if (ts.isReturnStatement(node)) {
+                        if (node.expression) {
+                            return node.expression;
+                        }
+                    }
+                    else if (ts.isVariableStatement(node)) {
+                        var numInitializers = 0;
+                        var lastInitializer = void 0;
+                        for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                            var declaration = _a[_i];
+                            if (declaration.initializer) {
+                                numInitializers++;
+                                lastInitializer = declaration.initializer;
+                            }
+                        }
+                        if (numInitializers === 1) {
+                            return lastInitializer;
+                        }
+                        // No special handling if there are multiple initializers.
+                    }
+                    else if (ts.isVariableDeclaration(node)) {
+                        if (node.initializer) {
+                            return node.initializer;
+                        }
+                    }
+                    return node;
+                }
+                function checkRootNode(node) {
+                    if (ts.isIdentifier(ts.isExpressionStatement(node) ? node.expression : node)) {
+                        return [ts.createDiagnosticForNode(node, Messages.cannotExtractIdentifier)];
+                    }
+                    return undefined;
+                }
+                function checkForStaticContext(nodeToCheck, containingClass) {
+                    var current = nodeToCheck;
+                    while (current !== containingClass) {
+                        if (current.kind === 154 /* PropertyDeclaration */) {
+                            if (ts.hasModifier(current, 32 /* Static */)) {
+                                rangeFacts |= RangeFacts.InStaticRegion;
+                            }
+                            break;
+                        }
+                        else if (current.kind === 151 /* Parameter */) {
+                            var ctorOrMethod = ts.getContainingFunction(current);
+                            if (ctorOrMethod.kind === 157 /* Constructor */) {
+                                rangeFacts |= RangeFacts.InStaticRegion;
+                            }
+                            break;
+                        }
+                        else if (current.kind === 156 /* MethodDeclaration */) {
+                            if (ts.hasModifier(current, 32 /* Static */)) {
+                                rangeFacts |= RangeFacts.InStaticRegion;
+                            }
+                        }
+                        current = current.parent;
+                    }
+                }
+                // Verifies whether we can actually extract this node or not.
+                function checkNode(nodeToCheck) {
+                    var PermittedJumps;
+                    (function (PermittedJumps) {
+                        PermittedJumps[PermittedJumps["None"] = 0] = "None";
+                        PermittedJumps[PermittedJumps["Break"] = 1] = "Break";
+                        PermittedJumps[PermittedJumps["Continue"] = 2] = "Continue";
+                        PermittedJumps[PermittedJumps["Return"] = 4] = "Return";
+                    })(PermittedJumps || (PermittedJumps = {}));
+                    // We believe it's true because the node is from the (unmodified) tree.
+                    ts.Debug.assert(nodeToCheck.pos <= nodeToCheck.end, "This failure could trigger https://github.com/Microsoft/TypeScript/issues/20809");
+                    // For understanding how skipTrivia functioned:
+                    ts.Debug.assert(!ts.positionIsSynthesized(nodeToCheck.pos), "This failure could trigger https://github.com/Microsoft/TypeScript/issues/20809");
+                    if (!ts.isStatement(nodeToCheck) && !(ts.isExpressionNode(nodeToCheck) && isExtractableExpression(nodeToCheck))) {
+                        return [ts.createDiagnosticForNode(nodeToCheck, Messages.statementOrExpressionExpected)];
+                    }
+                    if (nodeToCheck.flags & 4194304 /* Ambient */) {
+                        return [ts.createDiagnosticForNode(nodeToCheck, Messages.cannotExtractAmbientBlock)];
+                    }
+                    // If we're in a class, see whether we're in a static region (static property initializer, static method, class constructor parameter default)
+                    var containingClass = ts.getContainingClass(nodeToCheck);
+                    if (containingClass) {
+                        checkForStaticContext(nodeToCheck, containingClass);
+                    }
+                    var errors;
+                    var permittedJumps = 4 /* Return */;
+                    var seenLabels;
+                    visit(nodeToCheck);
+                    return errors;
+                    function visit(node) {
+                        if (errors) {
+                            // already found an error - can stop now
+                            return true;
+                        }
+                        if (ts.isDeclaration(node)) {
+                            var declaringNode = (node.kind === 237 /* VariableDeclaration */) ? node.parent.parent : node;
+                            if (ts.hasModifier(declaringNode, 1 /* Export */)) {
+                                // TODO: GH#18217 Silly to use `errors ||` since it's definitely not defined (see top of `visit`)
+                                // Also, if we're only pushing one error, just use `let error: Diagnostic | undefined`!
+                                // Also TODO: GH#19956
+                                (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractExportedEntity));
+                                return true;
+                            }
+                            declarations.push(node.symbol);
+                        }
+                        // Some things can't be extracted in certain situations
+                        switch (node.kind) {
+                            case 249 /* ImportDeclaration */:
+                                (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractImport));
+                                return true;
+                            case 98 /* SuperKeyword */:
+                                // For a super *constructor call*, we have to be extracting the entire class,
+                                // but a super *method call* simply implies a 'this' reference
+                                if (node.parent.kind === 191 /* CallExpression */) {
+                                    // Super constructor call
+                                    var containingClass_1 = ts.getContainingClass(node); // TODO:GH#18217
+                                    if (containingClass_1.pos < span.start || containingClass_1.end >= (span.start + span.length)) {
+                                        (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractSuper));
+                                        return true;
+                                    }
+                                }
+                                else {
+                                    rangeFacts |= RangeFacts.UsesThis;
+                                }
+                                break;
+                        }
+                        if (ts.isFunctionLikeDeclaration(node) || ts.isClassLike(node)) {
+                            switch (node.kind) {
+                                case 239 /* FunctionDeclaration */:
+                                case 240 /* ClassDeclaration */:
+                                    if (ts.isSourceFile(node.parent) && node.parent.externalModuleIndicator === undefined) {
+                                        // You cannot extract global declarations
+                                        (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.functionWillNotBeVisibleInTheNewScope));
+                                    }
+                                    break;
+                            }
+                            // do not dive into functions or classes
+                            return false;
+                        }
+                        var savedPermittedJumps = permittedJumps;
+                        switch (node.kind) {
+                            case 222 /* IfStatement */:
+                                permittedJumps = 0 /* None */;
+                                break;
+                            case 235 /* TryStatement */:
+                                // forbid all jumps inside try blocks
+                                permittedJumps = 0 /* None */;
+                                break;
+                            case 218 /* Block */:
+                                if (node.parent && node.parent.kind === 235 /* TryStatement */ && node.parent.finallyBlock === node) {
+                                    // allow unconditional returns from finally blocks
+                                    permittedJumps = 4 /* Return */;
+                                }
+                                break;
+                            case 271 /* CaseClause */:
+                                // allow unlabeled break inside case clauses
+                                permittedJumps |= 1 /* Break */;
+                                break;
+                            default:
+                                if (ts.isIterationStatement(node, /*lookInLabeledStatements*/ false)) {
+                                    // allow unlabeled break/continue inside loops
+                                    permittedJumps |= 1 /* Break */ | 2 /* Continue */;
+                                }
+                                break;
+                        }
+                        switch (node.kind) {
+                            case 178 /* ThisType */:
+                            case 100 /* ThisKeyword */:
+                                rangeFacts |= RangeFacts.UsesThis;
+                                break;
+                            case 233 /* LabeledStatement */: {
+                                var label = node.label;
+                                (seenLabels || (seenLabels = [])).push(label.escapedText);
+                                ts.forEachChild(node, visit);
+                                seenLabels.pop();
+                                break;
+                            }
+                            case 229 /* BreakStatement */:
+                            case 228 /* ContinueStatement */: {
+                                var label = node.label;
+                                if (label) {
+                                    if (!ts.contains(seenLabels, label.escapedText)) {
+                                        // attempts to jump to label that is not in range to be extracted
+                                        (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractRangeContainingLabeledBreakOrContinueStatementWithTargetOutsideOfTheRange));
+                                    }
+                                }
+                                else {
+                                    if (!(permittedJumps & (node.kind === 229 /* BreakStatement */ ? 1 /* Break */ : 2 /* Continue */))) {
+                                        // attempt to break or continue in a forbidden context
+                                        (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractRangeContainingConditionalBreakOrContinueStatements));
+                                    }
+                                }
+                                break;
+                            }
+                            case 201 /* AwaitExpression */:
+                                rangeFacts |= RangeFacts.IsAsyncFunction;
+                                break;
+                            case 207 /* YieldExpression */:
+                                rangeFacts |= RangeFacts.IsGenerator;
+                                break;
+                            case 230 /* ReturnStatement */:
+                                if (permittedJumps & 4 /* Return */) {
+                                    rangeFacts |= RangeFacts.HasReturn;
+                                }
+                                else {
+                                    (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractRangeContainingConditionalReturnStatement));
+                                }
+                                break;
+                            default:
+                                ts.forEachChild(node, visit);
+                                break;
+                        }
+                        permittedJumps = savedPermittedJumps;
+                    }
+                }
+            }
+            extractSymbol.getRangeToExtract = getRangeToExtract;
+            function getStatementOrExpressionRange(node) {
+                if (ts.isStatement(node)) {
+                    return [node];
+                }
+                else if (ts.isExpressionNode(node)) {
+                    // If our selection is the expression in an ExpressionStatement, expand
+                    // the selection to include the enclosing Statement (this stops us
+                    // from trying to care about the return value of the extracted function
+                    // and eliminates double semicolon insertion in certain scenarios)
+                    return ts.isExpressionStatement(node.parent) ? [node.parent] : node;
+                }
+                return undefined;
+            }
+            function isScope(node) {
+                return ts.isFunctionLikeDeclaration(node) || ts.isSourceFile(node) || ts.isModuleBlock(node) || ts.isClassLike(node);
+            }
+            /**
+             * Computes possible places we could extract the function into. For example,
+             * you may be able to extract into a class method *or* local closure *or* namespace function,
+             * depending on what's in the extracted body.
+             */
+            function collectEnclosingScopes(range) {
+                var current = isReadonlyArray(range.range) ? ts.first(range.range) : range.range;
+                if (range.facts & RangeFacts.UsesThis) {
+                    // if range uses this as keyword or as type inside the class then it can only be extracted to a method of the containing class
+                    var containingClass = ts.getContainingClass(current);
+                    if (containingClass) {
+                        var containingFunction = ts.findAncestor(current, ts.isFunctionLikeDeclaration);
+                        return containingFunction
+                            ? [containingFunction, containingClass]
+                            : [containingClass];
+                    }
+                }
+                var scopes = [];
+                while (true) {
+                    current = current.parent;
+                    // A function parameter's initializer is actually in the outer scope, not the function declaration
+                    if (current.kind === 151 /* Parameter */) {
+                        // Skip all the way to the outer scope of the function that declared this parameter
+                        current = ts.findAncestor(current, function (parent) { return ts.isFunctionLikeDeclaration(parent); }).parent;
+                    }
+                    // We want to find the nearest parent where we can place an "equivalent" sibling to the node we're extracting out of.
+                    // Walk up to the closest parent of a place where we can logically put a sibling:
+                    //  * Function declaration
+                    //  * Class declaration or expression
+                    //  * Module/namespace or source file
+                    if (isScope(current)) {
+                        scopes.push(current);
+                        if (current.kind === 279 /* SourceFile */) {
+                            return scopes;
+                        }
+                    }
+                }
+            }
+            function getFunctionExtractionAtIndex(targetRange, context, requestedChangesIndex) {
+                var _a = getPossibleExtractionsWorker(targetRange, context), scopes = _a.scopes, _b = _a.readsAndWrites, target = _b.target, usagesPerScope = _b.usagesPerScope, functionErrorsPerScope = _b.functionErrorsPerScope, exposedVariableDeclarations = _b.exposedVariableDeclarations;
+                ts.Debug.assert(!functionErrorsPerScope[requestedChangesIndex].length, "The extraction went missing? How?");
+                context.cancellationToken.throwIfCancellationRequested(); // TODO: GH#18217
+                return extractFunctionInScope(target, scopes[requestedChangesIndex], usagesPerScope[requestedChangesIndex], exposedVariableDeclarations, targetRange, context);
+            }
+            function getConstantExtractionAtIndex(targetRange, context, requestedChangesIndex) {
+                var _a = getPossibleExtractionsWorker(targetRange, context), scopes = _a.scopes, _b = _a.readsAndWrites, target = _b.target, usagesPerScope = _b.usagesPerScope, constantErrorsPerScope = _b.constantErrorsPerScope, exposedVariableDeclarations = _b.exposedVariableDeclarations;
+                ts.Debug.assert(!constantErrorsPerScope[requestedChangesIndex].length, "The extraction went missing? How?");
+                ts.Debug.assert(exposedVariableDeclarations.length === 0, "Extract constant accepted a range containing a variable declaration?");
+                context.cancellationToken.throwIfCancellationRequested();
+                var expression = ts.isExpression(target)
+                    ? target
+                    : target.statements[0].expression;
+                return extractConstantInScope(expression, scopes[requestedChangesIndex], usagesPerScope[requestedChangesIndex], targetRange.facts, context);
+            }
+            /**
+             * Given a piece of text to extract ('targetRange'), computes a list of possible extractions.
+             * Each returned ExtractResultForScope corresponds to a possible target scope and is either a set of changes
+             * or an error explaining why we can't extract into that scope.
+             */
+            function getPossibleExtractions(targetRange, context) {
+                var _a = getPossibleExtractionsWorker(targetRange, context), scopes = _a.scopes, _b = _a.readsAndWrites, functionErrorsPerScope = _b.functionErrorsPerScope, constantErrorsPerScope = _b.constantErrorsPerScope;
+                // Need the inner type annotation to avoid https://github.com/Microsoft/TypeScript/issues/7547
+                var extractions = scopes.map(function (scope, i) {
+                    var functionDescriptionPart = getDescriptionForFunctionInScope(scope);
+                    var constantDescriptionPart = getDescriptionForConstantInScope(scope);
+                    var scopeDescription = ts.isFunctionLikeDeclaration(scope)
+                        ? getDescriptionForFunctionLikeDeclaration(scope)
+                        : ts.isClassLike(scope)
+                            ? getDescriptionForClassLikeDeclaration(scope)
+                            : getDescriptionForModuleLikeDeclaration(scope);
+                    var functionDescription;
+                    var constantDescription;
+                    if (scopeDescription === 1 /* Global */) {
+                        functionDescription = ts.formatStringFromArgs(ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_0_in_1_scope), [functionDescriptionPart, "global"]);
+                        constantDescription = ts.formatStringFromArgs(ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_0_in_1_scope), [constantDescriptionPart, "global"]);
+                    }
+                    else if (scopeDescription === 0 /* Module */) {
+                        functionDescription = ts.formatStringFromArgs(ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_0_in_1_scope), [functionDescriptionPart, "module"]);
+                        constantDescription = ts.formatStringFromArgs(ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_0_in_1_scope), [constantDescriptionPart, "module"]);
+                    }
+                    else {
+                        functionDescription = ts.formatStringFromArgs(ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_0_in_1), [functionDescriptionPart, scopeDescription]);
+                        constantDescription = ts.formatStringFromArgs(ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_0_in_1), [constantDescriptionPart, scopeDescription]);
+                    }
+                    // Customize the phrasing for the innermost scope to increase clarity.
+                    if (i === 0 && !ts.isClassLike(scope)) {
+                        constantDescription = ts.formatStringFromArgs(ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_0_in_enclosing_scope), [constantDescriptionPart]);
+                    }
+                    return {
+                        functionExtraction: {
+                            description: functionDescription,
+                            errors: functionErrorsPerScope[i],
+                        },
+                        constantExtraction: {
+                            description: constantDescription,
+                            errors: constantErrorsPerScope[i],
+                        },
+                    };
+                });
+                return extractions;
+            }
+            function getPossibleExtractionsWorker(targetRange, context) {
+                var sourceFile = context.file;
+                var scopes = collectEnclosingScopes(targetRange);
+                var enclosingTextRange = getEnclosingTextRange(targetRange, sourceFile);
+                var readsAndWrites = collectReadsAndWrites(targetRange, scopes, enclosingTextRange, sourceFile, context.program.getTypeChecker(), context.cancellationToken);
+                return { scopes: scopes, readsAndWrites: readsAndWrites };
+            }
+            function getDescriptionForFunctionInScope(scope) {
+                return ts.isFunctionLikeDeclaration(scope)
+                    ? "inner function"
+                    : ts.isClassLike(scope)
+                        ? "method"
+                        : "function";
+            }
+            function getDescriptionForConstantInScope(scope) {
+                return ts.isClassLike(scope)
+                    ? "readonly field"
+                    : "constant";
+            }
+            function getDescriptionForFunctionLikeDeclaration(scope) {
+                switch (scope.kind) {
+                    case 157 /* Constructor */:
+                        return "constructor";
+                    case 196 /* FunctionExpression */:
+                    case 239 /* FunctionDeclaration */:
+                        return scope.name
+                            ? "function '" + scope.name.text + "'"
+                            : "anonymous function";
+                    case 197 /* ArrowFunction */:
+                        return "arrow function";
+                    case 156 /* MethodDeclaration */:
+                        return "method '" + scope.name.getText() + "'";
+                    case 158 /* GetAccessor */:
+                        return "'get " + scope.name.getText() + "'";
+                    case 159 /* SetAccessor */:
+                        return "'set " + scope.name.getText() + "'";
+                    default:
+                        throw ts.Debug.assertNever(scope);
+                }
+            }
+            function getDescriptionForClassLikeDeclaration(scope) {
+                return scope.kind === 240 /* ClassDeclaration */
+                    ? scope.name ? "class '" + scope.name.text + "'" : "anonymous class declaration"
+                    : scope.name ? "class expression '" + scope.name.text + "'" : "anonymous class expression";
+            }
+            function getDescriptionForModuleLikeDeclaration(scope) {
+                return scope.kind === 245 /* ModuleBlock */
+                    ? "namespace '" + scope.parent.name.getText() + "'"
+                    : scope.externalModuleIndicator ? 0 /* Module */ : 1 /* Global */;
+            }
+            var SpecialScope;
+            (function (SpecialScope) {
+                SpecialScope[SpecialScope["Module"] = 0] = "Module";
+                SpecialScope[SpecialScope["Global"] = 1] = "Global";
+            })(SpecialScope || (SpecialScope = {}));
+            /**
+             * Result of 'extractRange' operation for a specific scope.
+             * Stores either a list of changes that should be applied to extract a range or a list of errors
+             */
+            function extractFunctionInScope(node, scope, _a, exposedVariableDeclarations, range, context) {
+                var usagesInScope = _a.usages, typeParameterUsages = _a.typeParameterUsages, substitutions = _a.substitutions;
+                var checker = context.program.getTypeChecker();
+                // Make a unique name for the extracted function
+                var file = scope.getSourceFile();
+                var functionNameText = ts.getUniqueName(ts.isClassLike(scope) ? "newMethod" : "newFunction", file);
+                var isJS = ts.isInJSFile(scope);
+                var functionName = ts.createIdentifier(functionNameText);
+                var returnType;
+                var parameters = [];
+                var callArguments = [];
+                var writes;
+                usagesInScope.forEach(function (usage, name) {
+                    var typeNode;
+                    if (!isJS) {
+                        var type = checker.getTypeOfSymbolAtLocation(usage.symbol, usage.node);
+                        // Widen the type so we don't emit nonsense annotations like "function fn(x: 3) {"
+                        type = checker.getBaseTypeOfLiteralType(type);
+                        typeNode = checker.typeToTypeNode(type, scope, 1 /* NoTruncation */);
+                    }
+                    var paramDecl = ts.createParameter(
+                    /*decorators*/ undefined, 
+                    /*modifiers*/ undefined, 
+                    /*dotDotDotToken*/ undefined, 
+                    /*name*/ name, 
+                    /*questionToken*/ undefined, typeNode);
+                    parameters.push(paramDecl);
+                    if (usage.usage === 2 /* Write */) {
+                        (writes || (writes = [])).push(usage);
+                    }
+                    callArguments.push(ts.createIdentifier(name));
+                });
+                var typeParametersAndDeclarations = ts.arrayFrom(typeParameterUsages.values()).map(function (type) { return ({ type: type, declaration: getFirstDeclaration(type) }); });
+                var sortedTypeParametersAndDeclarations = typeParametersAndDeclarations.sort(compareTypesByDeclarationOrder);
+                var typeParameters = sortedTypeParametersAndDeclarations.length === 0
+                    ? undefined
+                    : sortedTypeParametersAndDeclarations.map(function (t) { return t.declaration; });
+                // Strictly speaking, we should check whether each name actually binds to the appropriate type
+                // parameter.  In cases of shadowing, they may not.
+                var callTypeArguments = typeParameters !== undefined
+                    ? typeParameters.map(function (decl) { return ts.createTypeReferenceNode(decl.name, /*typeArguments*/ undefined); })
+                    : undefined;
+                // Provide explicit return types for contextually-typed functions
+                // to avoid problems when there are literal types present
+                if (ts.isExpression(node) && !isJS) {
+                    var contextualType = checker.getContextualType(node);
+                    returnType = checker.typeToTypeNode(contextualType, scope, 1 /* NoTruncation */); // TODO: GH#18217
+                }
+                var _b = transformFunctionBody(node, exposedVariableDeclarations, writes, substitutions, !!(range.facts & RangeFacts.HasReturn)), body = _b.body, returnValueProperty = _b.returnValueProperty;
+                ts.suppressLeadingAndTrailingTrivia(body);
+                var newFunction;
+                if (ts.isClassLike(scope)) {
+                    // always create private method in TypeScript files
+                    var modifiers = isJS ? [] : [ts.createToken(113 /* PrivateKeyword */)];
+                    if (range.facts & RangeFacts.InStaticRegion) {
+                        modifiers.push(ts.createToken(116 /* StaticKeyword */));
+                    }
+                    if (range.facts & RangeFacts.IsAsyncFunction) {
+                        modifiers.push(ts.createToken(121 /* AsyncKeyword */));
+                    }
+                    newFunction = ts.createMethod(
+                    /*decorators*/ undefined, modifiers.length ? modifiers : undefined, range.facts & RangeFacts.IsGenerator ? ts.createToken(40 /* AsteriskToken */) : undefined, functionName, 
+                    /*questionToken*/ undefined, typeParameters, parameters, returnType, body);
+                }
+                else {
+                    newFunction = ts.createFunctionDeclaration(
+                    /*decorators*/ undefined, range.facts & RangeFacts.IsAsyncFunction ? [ts.createToken(121 /* AsyncKeyword */)] : undefined, range.facts & RangeFacts.IsGenerator ? ts.createToken(40 /* AsteriskToken */) : undefined, functionName, typeParameters, parameters, returnType, body);
+                }
+                var changeTracker = ts.textChanges.ChangeTracker.fromContext(context);
+                var minInsertionPos = (isReadonlyArray(range.range) ? ts.last(range.range) : range.range).end;
+                var nodeToInsertBefore = getNodeToInsertFunctionBefore(minInsertionPos, scope);
+                if (nodeToInsertBefore) {
+                    changeTracker.insertNodeBefore(context.file, nodeToInsertBefore, newFunction, /*blankLineBetween*/ true);
+                }
+                else {
+                    changeTracker.insertNodeAtEndOfScope(context.file, scope, newFunction);
+                }
+                var newNodes = [];
+                // replace range with function call
+                var called = getCalledExpression(scope, range, functionNameText);
+                var call = ts.createCall(called, callTypeArguments, // Note that no attempt is made to take advantage of type argument inference
+                callArguments);
+                if (range.facts & RangeFacts.IsGenerator) {
+                    call = ts.createYield(ts.createToken(40 /* AsteriskToken */), call);
+                }
+                if (range.facts & RangeFacts.IsAsyncFunction) {
+                    call = ts.createAwait(call);
+                }
+                if (exposedVariableDeclarations.length && !writes) {
+                    // No need to mix declarations and writes.
+                    // How could any variables be exposed if there's a return statement?
+                    ts.Debug.assert(!returnValueProperty);
+                    ts.Debug.assert(!(range.facts & RangeFacts.HasReturn));
+                    if (exposedVariableDeclarations.length === 1) {
+                        // Declaring exactly one variable: let x = newFunction();
+                        var variableDeclaration = exposedVariableDeclarations[0];
+                        newNodes.push(ts.createVariableStatement(
+                        /*modifiers*/ undefined, ts.createVariableDeclarationList([ts.createVariableDeclaration(ts.getSynthesizedDeepClone(variableDeclaration.name), /*type*/ ts.getSynthesizedDeepClone(variableDeclaration.type), /*initializer*/ call)], // TODO (acasey): test binding patterns
+                        variableDeclaration.parent.flags)));
+                    }
+                    else {
+                        // Declaring multiple variables / return properties:
+                        //   let {x, y} = newFunction();
+                        var bindingElements = [];
+                        var typeElements = [];
+                        var commonNodeFlags = exposedVariableDeclarations[0].parent.flags;
+                        var sawExplicitType = false;
+                        for (var _i = 0, exposedVariableDeclarations_1 = exposedVariableDeclarations; _i < exposedVariableDeclarations_1.length; _i++) {
+                            var variableDeclaration = exposedVariableDeclarations_1[_i];
+                            bindingElements.push(ts.createBindingElement(
+                            /*dotDotDotToken*/ undefined, 
+                            /*propertyName*/ undefined, 
+                            /*name*/ ts.getSynthesizedDeepClone(variableDeclaration.name)));
+                            // Being returned through an object literal will have widened the type.
+                            var variableType = checker.typeToTypeNode(checker.getBaseTypeOfLiteralType(checker.getTypeAtLocation(variableDeclaration)), scope, 1 /* NoTruncation */);
+                            typeElements.push(ts.createPropertySignature(
+                            /*modifiers*/ undefined, 
+                            /*name*/ variableDeclaration.symbol.name, 
+                            /*questionToken*/ undefined, 
+                            /*type*/ variableType, 
+                            /*initializer*/ undefined));
+                            sawExplicitType = sawExplicitType || variableDeclaration.type !== undefined;
+                            commonNodeFlags = commonNodeFlags & variableDeclaration.parent.flags;
+                        }
+                        var typeLiteral = sawExplicitType ? ts.createTypeLiteralNode(typeElements) : undefined;
+                        if (typeLiteral) {
+                            ts.setEmitFlags(typeLiteral, 1 /* SingleLine */);
+                        }
+                        newNodes.push(ts.createVariableStatement(
+                        /*modifiers*/ undefined, ts.createVariableDeclarationList([ts.createVariableDeclaration(ts.createObjectBindingPattern(bindingElements), 
+                            /*type*/ typeLiteral, 
+                            /*initializer*/ call)], commonNodeFlags)));
+                    }
+                }
+                else if (exposedVariableDeclarations.length || writes) {
+                    if (exposedVariableDeclarations.length) {
+                        // CONSIDER: we're going to create one statement per variable, but we could actually preserve their original grouping.
+                        for (var _c = 0, exposedVariableDeclarations_2 = exposedVariableDeclarations; _c < exposedVariableDeclarations_2.length; _c++) {
+                            var variableDeclaration = exposedVariableDeclarations_2[_c];
+                            var flags = variableDeclaration.parent.flags;
+                            if (flags & 2 /* Const */) {
+                                flags = (flags & ~2 /* Const */) | 1 /* Let */;
+                            }
+                            newNodes.push(ts.createVariableStatement(
+                            /*modifiers*/ undefined, ts.createVariableDeclarationList([ts.createVariableDeclaration(variableDeclaration.symbol.name, getTypeDeepCloneUnionUndefined(variableDeclaration.type))], flags)));
+                        }
+                    }
+                    if (returnValueProperty) {
+                        // has both writes and return, need to create variable declaration to hold return value;
+                        newNodes.push(ts.createVariableStatement(
+                        /*modifiers*/ undefined, ts.createVariableDeclarationList([ts.createVariableDeclaration(returnValueProperty, getTypeDeepCloneUnionUndefined(returnType))], 1 /* Let */)));
+                    }
+                    var assignments = getPropertyAssignmentsForWritesAndVariableDeclarations(exposedVariableDeclarations, writes);
+                    if (returnValueProperty) {
+                        assignments.unshift(ts.createShorthandPropertyAssignment(returnValueProperty));
+                    }
+                    // propagate writes back
+                    if (assignments.length === 1) {
+                        // We would only have introduced a return value property if there had been
+                        // other assignments to make.
+                        ts.Debug.assert(!returnValueProperty);
+                        newNodes.push(ts.createStatement(ts.createAssignment(assignments[0].name, call)));
+                        if (range.facts & RangeFacts.HasReturn) {
+                            newNodes.push(ts.createReturn());
+                        }
+                    }
+                    else {
+                        // emit e.g.
+                        //   { a, b, __return } = newFunction(a, b);
+                        //   return __return;
+                        newNodes.push(ts.createStatement(ts.createAssignment(ts.createObjectLiteral(assignments), call)));
+                        if (returnValueProperty) {
+                            newNodes.push(ts.createReturn(ts.createIdentifier(returnValueProperty)));
+                        }
+                    }
+                }
+                else {
+                    if (range.facts & RangeFacts.HasReturn) {
+                        newNodes.push(ts.createReturn(call));
+                    }
+                    else if (isReadonlyArray(range.range)) {
+                        newNodes.push(ts.createStatement(call));
+                    }
+                    else {
+                        newNodes.push(call);
+                    }
+                }
+                if (isReadonlyArray(range.range)) {
+                    changeTracker.replaceNodeRangeWithNodes(context.file, ts.first(range.range), ts.last(range.range), newNodes);
+                }
+                else {
+                    changeTracker.replaceNodeWithNodes(context.file, range.range, newNodes);
+                }
+                var edits = changeTracker.getChanges();
+                var renameRange = isReadonlyArray(range.range) ? ts.first(range.range) : range.range;
+                var renameFilename = renameRange.getSourceFile().fileName;
+                var renameLocation = ts.getRenameLocation(edits, renameFilename, functionNameText, /*isDeclaredBeforeUse*/ false);
+                return { renameFilename: renameFilename, renameLocation: renameLocation, edits: edits };
+                function getTypeDeepCloneUnionUndefined(typeNode) {
+                    if (typeNode === undefined) {
+                        return undefined;
+                    }
+                    var clone = ts.getSynthesizedDeepClone(typeNode);
+                    var withoutParens = clone;
+                    while (ts.isParenthesizedTypeNode(withoutParens)) {
+                        withoutParens = withoutParens.type;
+                    }
+                    return ts.isUnionTypeNode(withoutParens) && ts.find(withoutParens.types, function (t) { return t.kind === 141 /* UndefinedKeyword */; })
+                        ? clone
+                        : ts.createUnionTypeNode([clone, ts.createKeywordTypeNode(141 /* UndefinedKeyword */)]);
+                }
+            }
+            /**
+             * Result of 'extractRange' operation for a specific scope.
+             * Stores either a list of changes that should be applied to extract a range or a list of errors
+             */
+            function extractConstantInScope(node, scope, _a, rangeFacts, context) {
+                var substitutions = _a.substitutions;
+                var checker = context.program.getTypeChecker();
+                // Make a unique name for the extracted variable
+                var file = scope.getSourceFile();
+                var localNameText = ts.getUniqueName(ts.isClassLike(scope) ? "newProperty" : "newLocal", file);
+                var isJS = ts.isInJSFile(scope);
+                var variableType = isJS || !checker.isContextSensitive(node)
+                    ? undefined
+                    : checker.typeToTypeNode(checker.getContextualType(node), scope, 1 /* NoTruncation */); // TODO: GH#18217
+                var initializer = transformConstantInitializer(node, substitutions);
+                ts.suppressLeadingAndTrailingTrivia(initializer);
+                var changeTracker = ts.textChanges.ChangeTracker.fromContext(context);
+                if (ts.isClassLike(scope)) {
+                    ts.Debug.assert(!isJS); // See CannotExtractToJSClass
+                    var modifiers = [];
+                    modifiers.push(ts.createToken(113 /* PrivateKeyword */));
+                    if (rangeFacts & RangeFacts.InStaticRegion) {
+                        modifiers.push(ts.createToken(116 /* StaticKeyword */));
+                    }
+                    modifiers.push(ts.createToken(133 /* ReadonlyKeyword */));
+                    var newVariable = ts.createProperty(
+                    /*decorators*/ undefined, modifiers, localNameText, 
+                    /*questionToken*/ undefined, variableType, initializer);
+                    var localReference = ts.createPropertyAccess(rangeFacts & RangeFacts.InStaticRegion
+                        ? ts.createIdentifier(scope.name.getText()) // TODO: GH#18217
+                        : ts.createThis(), ts.createIdentifier(localNameText));
+                    // Declare
+                    var maxInsertionPos = node.pos;
+                    var nodeToInsertBefore = getNodeToInsertPropertyBefore(maxInsertionPos, scope);
+                    changeTracker.insertNodeBefore(context.file, nodeToInsertBefore, newVariable, /*blankLineBetween*/ true);
+                    // Consume
+                    changeTracker.replaceNode(context.file, node, localReference);
+                }
+                else {
+                    var newVariableDeclaration = ts.createVariableDeclaration(localNameText, variableType, initializer);
+                    // If the node is part of an initializer in a list of variable declarations, insert a new
+                    // variable declaration into the list (in case it depends on earlier ones).
+                    // CONSIDER: If the declaration list isn't const, we might want to split it into multiple
+                    // lists so that the newly extracted one can be const.
+                    var oldVariableDeclaration = getContainingVariableDeclarationIfInList(node, scope);
+                    if (oldVariableDeclaration) {
+                        // Declare
+                        // CONSIDER: could detect that each is on a separate line (See `extractConstant_VariableList_MultipleLines` in `extractConstants.ts`)
+                        changeTracker.insertNodeBefore(context.file, oldVariableDeclaration, newVariableDeclaration);
+                        // Consume
+                        var localReference = ts.createIdentifier(localNameText);
+                        changeTracker.replaceNode(context.file, node, localReference);
+                    }
+                    else if (node.parent.kind === 221 /* ExpressionStatement */ && scope === ts.findAncestor(node, isScope)) {
+                        // If the parent is an expression statement and the target scope is the immediately enclosing one,
+                        // replace the statement with the declaration.
+                        var newVariableStatement = ts.createVariableStatement(
+                        /*modifiers*/ undefined, ts.createVariableDeclarationList([newVariableDeclaration], 2 /* Const */));
+                        changeTracker.replaceNode(context.file, node.parent, newVariableStatement);
+                    }
+                    else {
+                        var newVariableStatement = ts.createVariableStatement(
+                        /*modifiers*/ undefined, ts.createVariableDeclarationList([newVariableDeclaration], 2 /* Const */));
+                        // Declare
+                        var nodeToInsertBefore = getNodeToInsertConstantBefore(node, scope);
+                        if (nodeToInsertBefore.pos === 0) {
+                            changeTracker.insertNodeAtTopOfFile(context.file, newVariableStatement, /*blankLineBetween*/ false);
+                        }
+                        else {
+                            changeTracker.insertNodeBefore(context.file, nodeToInsertBefore, newVariableStatement, /*blankLineBetween*/ false);
+                        }
+                        // Consume
+                        if (node.parent.kind === 221 /* ExpressionStatement */) {
+                            // If the parent is an expression statement, delete it.
+                            changeTracker.delete(context.file, node.parent);
+                        }
+                        else {
+                            var localReference = ts.createIdentifier(localNameText);
+                            changeTracker.replaceNode(context.file, node, localReference);
+                        }
+                    }
+                }
+                var edits = changeTracker.getChanges();
+                var renameFilename = node.getSourceFile().fileName;
+                var renameLocation = ts.getRenameLocation(edits, renameFilename, localNameText, /*isDeclaredBeforeUse*/ true);
+                return { renameFilename: renameFilename, renameLocation: renameLocation, edits: edits };
+            }
+            function getContainingVariableDeclarationIfInList(node, scope) {
+                var prevNode;
+                while (node !== undefined && node !== scope) {
+                    if (ts.isVariableDeclaration(node) &&
+                        node.initializer === prevNode &&
+                        ts.isVariableDeclarationList(node.parent) &&
+                        node.parent.declarations.length > 1) {
+                        return node;
+                    }
+                    prevNode = node;
+                    node = node.parent;
+                }
+            }
+            function getFirstDeclaration(type) {
+                var firstDeclaration;
+                var symbol = type.symbol;
+                if (symbol && symbol.declarations) {
+                    for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                        var declaration = _a[_i];
+                        if (firstDeclaration === undefined || declaration.pos < firstDeclaration.pos) {
+                            firstDeclaration = declaration;
+                        }
+                    }
+                }
+                return firstDeclaration;
+            }
+            function compareTypesByDeclarationOrder(_a, _b) {
+                var type1 = _a.type, declaration1 = _a.declaration;
+                var type2 = _b.type, declaration2 = _b.declaration;
+                return ts.compareProperties(declaration1, declaration2, "pos", ts.compareValues)
+                    || ts.compareStringsCaseSensitive(type1.symbol ? type1.symbol.getName() : "", type2.symbol ? type2.symbol.getName() : "")
+                    || ts.compareValues(type1.id, type2.id);
+            }
+            function getCalledExpression(scope, range, functionNameText) {
+                var functionReference = ts.createIdentifier(functionNameText);
+                if (ts.isClassLike(scope)) {
+                    var lhs = range.facts & RangeFacts.InStaticRegion ? ts.createIdentifier(scope.name.text) : ts.createThis(); // TODO: GH#18217
+                    return ts.createPropertyAccess(lhs, functionReference);
+                }
+                else {
+                    return functionReference;
+                }
+            }
+            function transformFunctionBody(body, exposedVariableDeclarations, writes, substitutions, hasReturn) {
+                var hasWritesOrVariableDeclarations = writes !== undefined || exposedVariableDeclarations.length > 0;
+                if (ts.isBlock(body) && !hasWritesOrVariableDeclarations && substitutions.size === 0) {
+                    // already block, no declarations or writes to propagate back, no substitutions - can use node as is
+                    return { body: ts.createBlock(body.statements, /*multLine*/ true), returnValueProperty: undefined };
+                }
+                var returnValueProperty;
+                var ignoreReturns = false;
+                var statements = ts.createNodeArray(ts.isBlock(body) ? body.statements.slice(0) : [ts.isStatement(body) ? body : ts.createReturn(body)]);
+                // rewrite body if either there are writes that should be propagated back via return statements or there are substitutions
+                if (hasWritesOrVariableDeclarations || substitutions.size) {
+                    var rewrittenStatements = ts.visitNodes(statements, visitor).slice();
+                    if (hasWritesOrVariableDeclarations && !hasReturn && ts.isStatement(body)) {
+                        // add return at the end to propagate writes back in case if control flow falls out of the function body
+                        // it is ok to know that range has at least one return since it we only allow unconditional returns
+                        var assignments = getPropertyAssignmentsForWritesAndVariableDeclarations(exposedVariableDeclarations, writes);
+                        if (assignments.length === 1) {
+                            rewrittenStatements.push(ts.createReturn(assignments[0].name));
+                        }
+                        else {
+                            rewrittenStatements.push(ts.createReturn(ts.createObjectLiteral(assignments)));
+                        }
+                    }
+                    return { body: ts.createBlock(rewrittenStatements, /*multiLine*/ true), returnValueProperty: returnValueProperty };
+                }
+                else {
+                    return { body: ts.createBlock(statements, /*multiLine*/ true), returnValueProperty: undefined };
+                }
+                function visitor(node) {
+                    if (!ignoreReturns && node.kind === 230 /* ReturnStatement */ && hasWritesOrVariableDeclarations) {
+                        var assignments = getPropertyAssignmentsForWritesAndVariableDeclarations(exposedVariableDeclarations, writes);
+                        if (node.expression) {
+                            if (!returnValueProperty) {
+                                returnValueProperty = "__return";
+                            }
+                            assignments.unshift(ts.createPropertyAssignment(returnValueProperty, ts.visitNode(node.expression, visitor)));
+                        }
+                        if (assignments.length === 1) {
+                            return ts.createReturn(assignments[0].name);
+                        }
+                        else {
+                            return ts.createReturn(ts.createObjectLiteral(assignments));
+                        }
+                    }
+                    else {
+                        var oldIgnoreReturns = ignoreReturns;
+                        ignoreReturns = ignoreReturns || ts.isFunctionLikeDeclaration(node) || ts.isClassLike(node);
+                        var substitution = substitutions.get(ts.getNodeId(node).toString());
+                        var result = substitution ? ts.getSynthesizedDeepClone(substitution) : ts.visitEachChild(node, visitor, ts.nullTransformationContext);
+                        ignoreReturns = oldIgnoreReturns;
+                        return result;
+                    }
+                }
+            }
+            function transformConstantInitializer(initializer, substitutions) {
+                return substitutions.size
+                    ? visitor(initializer)
+                    : initializer;
+                function visitor(node) {
+                    var substitution = substitutions.get(ts.getNodeId(node).toString());
+                    return substitution ? ts.getSynthesizedDeepClone(substitution) : ts.visitEachChild(node, visitor, ts.nullTransformationContext);
+                }
+            }
+            function getStatementsOrClassElements(scope) {
+                if (ts.isFunctionLikeDeclaration(scope)) {
+                    var body = scope.body; // TODO: GH#18217
+                    if (ts.isBlock(body)) {
+                        return body.statements;
+                    }
+                }
+                else if (ts.isModuleBlock(scope) || ts.isSourceFile(scope)) {
+                    return scope.statements;
+                }
+                else if (ts.isClassLike(scope)) {
+                    return scope.members;
+                }
+                else {
+                    ts.assertType(scope);
+                }
+                return ts.emptyArray;
+            }
+            /**
+             * If `scope` contains a function after `minPos`, then return the first such function.
+             * Otherwise, return `undefined`.
+             */
+            function getNodeToInsertFunctionBefore(minPos, scope) {
+                return ts.find(getStatementsOrClassElements(scope), function (child) {
+                    return child.pos >= minPos && ts.isFunctionLikeDeclaration(child) && !ts.isConstructorDeclaration(child);
+                });
+            }
+            function getNodeToInsertPropertyBefore(maxPos, scope) {
+                var members = scope.members;
+                ts.Debug.assert(members.length > 0); // There must be at least one child, since we extracted from one.
+                var prevMember;
+                var allProperties = true;
+                for (var _i = 0, members_7 = members; _i < members_7.length; _i++) {
+                    var member = members_7[_i];
+                    if (member.pos > maxPos) {
+                        return prevMember || members[0];
+                    }
+                    if (allProperties && !ts.isPropertyDeclaration(member)) {
+                        // If it is non-vacuously true that all preceding members are properties,
+                        // insert before the current member (i.e. at the end of the list of properties).
+                        if (prevMember !== undefined) {
+                            return member;
+                        }
+                        allProperties = false;
+                    }
+                    prevMember = member;
+                }
+                if (prevMember === undefined)
+                    return ts.Debug.fail(); // If the loop didn't return, then it did set prevMember.
+                return prevMember;
+            }
+            function getNodeToInsertConstantBefore(node, scope) {
+                ts.Debug.assert(!ts.isClassLike(scope));
+                var prevScope;
+                for (var curr = node; curr !== scope; curr = curr.parent) {
+                    if (isScope(curr)) {
+                        prevScope = curr;
+                    }
+                }
+                for (var curr = (prevScope || node).parent;; curr = curr.parent) {
+                    if (isBlockLike(curr)) {
+                        var prevStatement = void 0;
+                        for (var _i = 0, _a = curr.statements; _i < _a.length; _i++) {
+                            var statement = _a[_i];
+                            if (statement.pos > node.pos) {
+                                break;
+                            }
+                            prevStatement = statement;
+                        }
+                        if (!prevStatement && ts.isCaseClause(curr)) {
+                            // We must have been in the expression of the case clause.
+                            ts.Debug.assert(ts.isSwitchStatement(curr.parent.parent));
+                            return curr.parent.parent;
+                        }
+                        // There must be at least one statement since we started in one.
+                        return ts.Debug.assertDefined(prevStatement);
+                    }
+                    ts.Debug.assert(curr !== scope, "Didn't encounter a block-like before encountering scope");
+                }
+            }
+            function getPropertyAssignmentsForWritesAndVariableDeclarations(exposedVariableDeclarations, writes) {
+                var variableAssignments = ts.map(exposedVariableDeclarations, function (v) { return ts.createShorthandPropertyAssignment(v.symbol.name); });
+                var writeAssignments = ts.map(writes, function (w) { return ts.createShorthandPropertyAssignment(w.symbol.name); });
+                // TODO: GH#18217 `variableAssignments` not possibly undefined!
+                return variableAssignments === undefined
+                    ? writeAssignments
+                    : writeAssignments === undefined
+                        ? variableAssignments
+                        : variableAssignments.concat(writeAssignments);
+            }
+            function isReadonlyArray(v) {
+                return ts.isArray(v);
+            }
+            /**
+             * Produces a range that spans the entirety of nodes, given a selection
+             * that might start/end in the middle of nodes.
+             *
+             * For example, when the user makes a selection like this
+             *                     v---v
+             *   var someThing = foo + bar;
+             *  this returns     ^-------^
+             */
+            function getEnclosingTextRange(targetRange, sourceFile) {
+                return isReadonlyArray(targetRange.range)
+                    ? { pos: ts.first(targetRange.range).getStart(sourceFile), end: ts.last(targetRange.range).getEnd() }
+                    : targetRange.range;
+            }
+            var Usage;
+            (function (Usage) {
+                // value should be passed to extracted method
+                Usage[Usage["Read"] = 1] = "Read";
+                // value should be passed to extracted method and propagated back
+                Usage[Usage["Write"] = 2] = "Write";
+            })(Usage || (Usage = {}));
+            function collectReadsAndWrites(targetRange, scopes, enclosingTextRange, sourceFile, checker, cancellationToken) {
+                var allTypeParameterUsages = ts.createMap(); // Key is type ID
+                var usagesPerScope = [];
+                var substitutionsPerScope = [];
+                var functionErrorsPerScope = [];
+                var constantErrorsPerScope = [];
+                var visibleDeclarationsInExtractedRange = [];
+                var exposedVariableSymbolSet = ts.createMap(); // Key is symbol ID
+                var exposedVariableDeclarations = [];
+                var firstExposedNonVariableDeclaration;
+                var expression = !isReadonlyArray(targetRange.range)
+                    ? targetRange.range
+                    : targetRange.range.length === 1 && ts.isExpressionStatement(targetRange.range[0])
+                        ? targetRange.range[0].expression
+                        : undefined;
+                var expressionDiagnostic;
+                if (expression === undefined) {
+                    var statements = targetRange.range;
+                    var start = ts.first(statements).getStart();
+                    var end = ts.last(statements).end;
+                    expressionDiagnostic = ts.createFileDiagnostic(sourceFile, start, end - start, Messages.expressionExpected);
+                }
+                else if (checker.getTypeAtLocation(expression).flags & (16384 /* Void */ | 131072 /* Never */)) {
+                    expressionDiagnostic = ts.createDiagnosticForNode(expression, Messages.uselessConstantType);
+                }
+                // initialize results
+                for (var _i = 0, scopes_1 = scopes; _i < scopes_1.length; _i++) {
+                    var scope = scopes_1[_i];
+                    usagesPerScope.push({ usages: ts.createMap(), typeParameterUsages: ts.createMap(), substitutions: ts.createMap() });
+                    substitutionsPerScope.push(ts.createMap());
+                    functionErrorsPerScope.push(ts.isFunctionLikeDeclaration(scope) && scope.kind !== 239 /* FunctionDeclaration */
+                        ? [ts.createDiagnosticForNode(scope, Messages.cannotExtractToOtherFunctionLike)]
+                        : []);
+                    var constantErrors = [];
+                    if (expressionDiagnostic) {
+                        constantErrors.push(expressionDiagnostic);
+                    }
+                    if (ts.isClassLike(scope) && ts.isInJSFile(scope)) {
+                        constantErrors.push(ts.createDiagnosticForNode(scope, Messages.cannotExtractToJSClass));
+                    }
+                    if (ts.isArrowFunction(scope) && !ts.isBlock(scope.body)) {
+                        // TODO (https://github.com/Microsoft/TypeScript/issues/18924): allow this
+                        constantErrors.push(ts.createDiagnosticForNode(scope, Messages.cannotExtractToExpressionArrowFunction));
+                    }
+                    constantErrorsPerScope.push(constantErrors);
+                }
+                var seenUsages = ts.createMap();
+                var target = isReadonlyArray(targetRange.range) ? ts.createBlock(targetRange.range) : targetRange.range;
+                var unmodifiedNode = isReadonlyArray(targetRange.range) ? ts.first(targetRange.range) : targetRange.range;
+                var inGenericContext = isInGenericContext(unmodifiedNode);
+                collectUsages(target);
+                // Unfortunately, this code takes advantage of the knowledge that the generated method
+                // will use the contextual type of an expression as the return type of the extracted
+                // method (and will therefore "use" all the types involved).
+                if (inGenericContext && !isReadonlyArray(targetRange.range)) {
+                    var contextualType = checker.getContextualType(targetRange.range); // TODO: GH#18217
+                    recordTypeParameterUsages(contextualType);
+                }
+                if (allTypeParameterUsages.size > 0) {
+                    var seenTypeParameterUsages = ts.createMap(); // Key is type ID
+                    var i_1 = 0;
+                    for (var curr = unmodifiedNode; curr !== undefined && i_1 < scopes.length; curr = curr.parent) {
+                        if (curr === scopes[i_1]) {
+                            // Copy current contents of seenTypeParameterUsages into scope.
+                            seenTypeParameterUsages.forEach(function (typeParameter, id) {
+                                usagesPerScope[i_1].typeParameterUsages.set(id, typeParameter);
+                            });
+                            i_1++;
+                        }
+                        // Note that we add the current node's type parameters *after* updating the corresponding scope.
+                        if (ts.isDeclarationWithTypeParameters(curr)) {
+                            for (var _a = 0, _b = ts.getEffectiveTypeParameterDeclarations(curr); _a < _b.length; _a++) {
+                                var typeParameterDecl = _b[_a];
+                                var typeParameter = checker.getTypeAtLocation(typeParameterDecl);
+                                if (allTypeParameterUsages.has(typeParameter.id.toString())) {
+                                    seenTypeParameterUsages.set(typeParameter.id.toString(), typeParameter);
+                                }
+                            }
+                        }
+                    }
+                    // If we didn't get through all the scopes, then there were some that weren't in our
+                    // parent chain (impossible at time of writing).  A conservative solution would be to
+                    // copy allTypeParameterUsages into all remaining scopes.
+                    ts.Debug.assert(i_1 === scopes.length);
+                }
+                // If there are any declarations in the extracted block that are used in the same enclosing
+                // lexical scope, we can't move the extraction "up" as those declarations will become unreachable
+                if (visibleDeclarationsInExtractedRange.length) {
+                    var containingLexicalScopeOfExtraction = ts.isBlockScope(scopes[0], scopes[0].parent)
+                        ? scopes[0]
+                        : ts.getEnclosingBlockScopeContainer(scopes[0]);
+                    ts.forEachChild(containingLexicalScopeOfExtraction, checkForUsedDeclarations);
+                }
+                var _loop_24 = function (i) {
+                    var scopeUsages = usagesPerScope[i];
+                    // Special case: in the innermost scope, all usages are available.
+                    // (The computed value reflects the value at the top-level of the scope, but the
+                    // local will actually be declared at the same level as the extracted expression).
+                    if (i > 0 && (scopeUsages.usages.size > 0 || scopeUsages.typeParameterUsages.size > 0)) {
+                        var errorNode = isReadonlyArray(targetRange.range) ? targetRange.range[0] : targetRange.range;
+                        constantErrorsPerScope[i].push(ts.createDiagnosticForNode(errorNode, Messages.cannotAccessVariablesFromNestedScopes));
+                    }
+                    var hasWrite = false;
+                    var readonlyClassPropertyWrite;
+                    usagesPerScope[i].usages.forEach(function (value) {
+                        if (value.usage === 2 /* Write */) {
+                            hasWrite = true;
+                            if (value.symbol.flags & 106500 /* ClassMember */ &&
+                                value.symbol.valueDeclaration &&
+                                ts.hasModifier(value.symbol.valueDeclaration, 64 /* Readonly */)) {
+                                readonlyClassPropertyWrite = value.symbol.valueDeclaration;
+                            }
+                        }
+                    });
+                    // If an expression was extracted, then there shouldn't have been any variable declarations.
+                    ts.Debug.assert(isReadonlyArray(targetRange.range) || exposedVariableDeclarations.length === 0);
+                    if (hasWrite && !isReadonlyArray(targetRange.range)) {
+                        var diag = ts.createDiagnosticForNode(targetRange.range, Messages.cannotWriteInExpression);
+                        functionErrorsPerScope[i].push(diag);
+                        constantErrorsPerScope[i].push(diag);
+                    }
+                    else if (readonlyClassPropertyWrite && i > 0) {
+                        var diag = ts.createDiagnosticForNode(readonlyClassPropertyWrite, Messages.cannotExtractReadonlyPropertyInitializerOutsideConstructor);
+                        functionErrorsPerScope[i].push(diag);
+                        constantErrorsPerScope[i].push(diag);
+                    }
+                    else if (firstExposedNonVariableDeclaration) {
+                        var diag = ts.createDiagnosticForNode(firstExposedNonVariableDeclaration, Messages.cannotExtractExportedEntity);
+                        functionErrorsPerScope[i].push(diag);
+                        constantErrorsPerScope[i].push(diag);
+                    }
+                };
+                for (var i = 0; i < scopes.length; i++) {
+                    _loop_24(i);
+                }
+                return { target: target, usagesPerScope: usagesPerScope, functionErrorsPerScope: functionErrorsPerScope, constantErrorsPerScope: constantErrorsPerScope, exposedVariableDeclarations: exposedVariableDeclarations };
+                function isInGenericContext(node) {
+                    return !!ts.findAncestor(node, function (n) { return ts.isDeclarationWithTypeParameters(n) && ts.getEffectiveTypeParameterDeclarations(n).length !== 0; });
+                }
+                function recordTypeParameterUsages(type) {
+                    // PERF: This is potentially very expensive.  `type` could be a library type with
+                    // a lot of properties, each of which the walker will visit.  Unfortunately, the
+                    // solution isn't as trivial as filtering to user types because of (e.g.) Array.
+                    var symbolWalker = checker.getSymbolWalker(function () { return (cancellationToken.throwIfCancellationRequested(), true); });
+                    var visitedTypes = symbolWalker.walkType(type).visitedTypes;
+                    for (var _i = 0, visitedTypes_1 = visitedTypes; _i < visitedTypes_1.length; _i++) {
+                        var visitedType = visitedTypes_1[_i];
+                        if (visitedType.isTypeParameter()) {
+                            allTypeParameterUsages.set(visitedType.id.toString(), visitedType);
+                        }
+                    }
+                }
+                function collectUsages(node, valueUsage) {
+                    if (valueUsage === void 0) { valueUsage = 1 /* Read */; }
+                    if (inGenericContext) {
+                        var type = checker.getTypeAtLocation(node);
+                        recordTypeParameterUsages(type);
+                    }
+                    if (ts.isDeclaration(node) && node.symbol) {
+                        visibleDeclarationsInExtractedRange.push(node);
+                    }
+                    if (ts.isAssignmentExpression(node)) {
+                        // use 'write' as default usage for values
+                        collectUsages(node.left, 2 /* Write */);
+                        collectUsages(node.right);
+                    }
+                    else if (ts.isUnaryExpressionWithWrite(node)) {
+                        collectUsages(node.operand, 2 /* Write */);
+                    }
+                    else if (ts.isPropertyAccessExpression(node) || ts.isElementAccessExpression(node)) {
+                        // use 'write' as default usage for values
+                        ts.forEachChild(node, collectUsages);
+                    }
+                    else if (ts.isIdentifier(node)) {
+                        if (!node.parent) {
+                            return;
+                        }
+                        if (ts.isQualifiedName(node.parent) && node !== node.parent.left) {
+                            return;
+                        }
+                        if (ts.isPropertyAccessExpression(node.parent) && node !== node.parent.expression) {
+                            return;
+                        }
+                        recordUsage(node, valueUsage, /*isTypeNode*/ ts.isPartOfTypeNode(node));
+                    }
+                    else {
+                        ts.forEachChild(node, collectUsages);
+                    }
+                }
+                function recordUsage(n, usage, isTypeNode) {
+                    var symbolId = recordUsagebySymbol(n, usage, isTypeNode);
+                    if (symbolId) {
+                        for (var i = 0; i < scopes.length; i++) {
+                            // push substitution from map<symbolId, subst> to map<nodeId, subst> to simplify rewriting
+                            var substitution = substitutionsPerScope[i].get(symbolId);
+                            if (substitution) {
+                                usagesPerScope[i].substitutions.set(ts.getNodeId(n).toString(), substitution);
+                            }
+                        }
+                    }
+                }
+                function recordUsagebySymbol(identifier, usage, isTypeName) {
+                    var symbol = getSymbolReferencedByIdentifier(identifier);
+                    if (!symbol) {
+                        // cannot find symbol - do nothing
+                        return undefined;
+                    }
+                    var symbolId = ts.getSymbolId(symbol).toString();
+                    var lastUsage = seenUsages.get(symbolId);
+                    // there are two kinds of value usages
+                    // - reads - if range contains a read from the value located outside of the range then value should be passed as a parameter
+                    // - writes - if range contains a write to a value located outside the range the value should be passed as a parameter and
+                    //   returned as a return value
+                    // 'write' case is a superset of 'read' so if we already have processed 'write' of some symbol there is not need to handle 'read'
+                    // since all information is already recorded
+                    if (lastUsage && lastUsage >= usage) {
+                        return symbolId;
+                    }
+                    seenUsages.set(symbolId, usage);
+                    if (lastUsage) {
+                        // if we get here this means that we are trying to handle 'write' and 'read' was already processed
+                        // walk scopes and update existing records.
+                        for (var _i = 0, usagesPerScope_1 = usagesPerScope; _i < usagesPerScope_1.length; _i++) {
+                            var perScope = usagesPerScope_1[_i];
+                            var prevEntry = perScope.usages.get(identifier.text);
+                            if (prevEntry) {
+                                perScope.usages.set(identifier.text, { usage: usage, symbol: symbol, node: identifier });
+                            }
+                        }
+                        return symbolId;
+                    }
+                    // find first declaration in this file
+                    var decls = symbol.getDeclarations();
+                    var declInFile = decls && ts.find(decls, function (d) { return d.getSourceFile() === sourceFile; });
+                    if (!declInFile) {
+                        return undefined;
+                    }
+                    if (ts.rangeContainsStartEnd(enclosingTextRange, declInFile.getStart(), declInFile.end)) {
+                        // declaration is located in range to be extracted - do nothing
+                        return undefined;
+                    }
+                    if (targetRange.facts & RangeFacts.IsGenerator && usage === 2 /* Write */) {
+                        // this is write to a reference located outside of the target scope and range is extracted into generator
+                        // currently this is unsupported scenario
+                        var diag = ts.createDiagnosticForNode(identifier, Messages.cannotExtractRangeThatContainsWritesToReferencesLocatedOutsideOfTheTargetRangeInGenerators);
+                        for (var _a = 0, functionErrorsPerScope_1 = functionErrorsPerScope; _a < functionErrorsPerScope_1.length; _a++) {
+                            var errors = functionErrorsPerScope_1[_a];
+                            errors.push(diag);
+                        }
+                        for (var _b = 0, constantErrorsPerScope_1 = constantErrorsPerScope; _b < constantErrorsPerScope_1.length; _b++) {
+                            var errors = constantErrorsPerScope_1[_b];
+                            errors.push(diag);
+                        }
+                    }
+                    for (var i = 0; i < scopes.length; i++) {
+                        var scope = scopes[i];
+                        var resolvedSymbol = checker.resolveName(symbol.name, scope, symbol.flags, /*excludeGlobals*/ false);
+                        if (resolvedSymbol === symbol) {
+                            continue;
+                        }
+                        if (!substitutionsPerScope[i].has(symbolId)) {
+                            var substitution = tryReplaceWithQualifiedNameOrPropertyAccess(symbol.exportSymbol || symbol, scope, isTypeName);
+                            if (substitution) {
+                                substitutionsPerScope[i].set(symbolId, substitution);
+                            }
+                            else if (isTypeName) {
+                                // If the symbol is a type parameter that won't be in scope, we'll pass it as a type argument
+                                // so there's no problem.
+                                if (!(symbol.flags & 262144 /* TypeParameter */)) {
+                                    var diag = ts.createDiagnosticForNode(identifier, Messages.typeWillNotBeVisibleInTheNewScope);
+                                    functionErrorsPerScope[i].push(diag);
+                                    constantErrorsPerScope[i].push(diag);
+                                }
+                            }
+                            else {
+                                usagesPerScope[i].usages.set(identifier.text, { usage: usage, symbol: symbol, node: identifier });
+                            }
+                        }
+                    }
+                    return symbolId;
+                }
+                function checkForUsedDeclarations(node) {
+                    // If this node is entirely within the original extraction range, we don't need to do anything.
+                    if (node === targetRange.range || (isReadonlyArray(targetRange.range) && targetRange.range.indexOf(node) >= 0)) {
+                        return;
+                    }
+                    // Otherwise check and recurse.
+                    var sym = ts.isIdentifier(node)
+                        ? getSymbolReferencedByIdentifier(node)
+                        : checker.getSymbolAtLocation(node);
+                    if (sym) {
+                        var decl = ts.find(visibleDeclarationsInExtractedRange, function (d) { return d.symbol === sym; });
+                        if (decl) {
+                            if (ts.isVariableDeclaration(decl)) {
+                                var idString = decl.symbol.id.toString();
+                                if (!exposedVariableSymbolSet.has(idString)) {
+                                    exposedVariableDeclarations.push(decl);
+                                    exposedVariableSymbolSet.set(idString, true);
+                                }
+                            }
+                            else {
+                                // CONSIDER: this includes binding elements, which we could
+                                // expose in the same way as variables.
+                                firstExposedNonVariableDeclaration = firstExposedNonVariableDeclaration || decl;
+                            }
+                        }
+                    }
+                    ts.forEachChild(node, checkForUsedDeclarations);
+                }
+                /**
+                 * Return the symbol referenced by an identifier (even if it declares a different symbol).
+                 */
+                function getSymbolReferencedByIdentifier(identifier) {
+                    // If the identifier is both a property name and its value, we're only interested in its value
+                    // (since the name is a declaration and will be included in the extracted range).
+                    return identifier.parent && ts.isShorthandPropertyAssignment(identifier.parent) && identifier.parent.name === identifier
+                        ? checker.getShorthandAssignmentValueSymbol(identifier.parent)
+                        : checker.getSymbolAtLocation(identifier);
+                }
+                function tryReplaceWithQualifiedNameOrPropertyAccess(symbol, scopeDecl, isTypeNode) {
+                    if (!symbol) {
+                        return undefined;
+                    }
+                    var decls = symbol.getDeclarations();
+                    if (decls && decls.some(function (d) { return d.parent === scopeDecl; })) {
+                        return ts.createIdentifier(symbol.name);
+                    }
+                    var prefix = tryReplaceWithQualifiedNameOrPropertyAccess(symbol.parent, scopeDecl, isTypeNode);
+                    if (prefix === undefined) {
+                        return undefined;
+                    }
+                    return isTypeNode
+                        ? ts.createQualifiedName(prefix, ts.createIdentifier(symbol.name))
+                        : ts.createPropertyAccess(prefix, symbol.name);
+                }
+            }
+            /**
+             * Computes whether or not a node represents an expression in a position where it could
+             * be extracted.
+             * The isExpression() in utilities.ts returns some false positives we need to handle,
+             * such as `import x from 'y'` -- the 'y' is a StringLiteral but is *not* an expression
+             * in the sense of something that you could extract on
+             */
+            function isExtractableExpression(node) {
+                var parent = node.parent;
+                switch (parent.kind) {
+                    case 278 /* EnumMember */:
+                        return false;
+                }
+                switch (node.kind) {
+                    case 10 /* StringLiteral */:
+                        return parent.kind !== 249 /* ImportDeclaration */ &&
+                            parent.kind !== 253 /* ImportSpecifier */;
+                    case 208 /* SpreadElement */:
+                    case 184 /* ObjectBindingPattern */:
+                    case 186 /* BindingElement */:
+                        return false;
+                    case 72 /* Identifier */:
+                        return parent.kind !== 186 /* BindingElement */ &&
+                            parent.kind !== 253 /* ImportSpecifier */ &&
+                            parent.kind !== 257 /* ExportSpecifier */;
+                }
+                return true;
+            }
+            function isBlockLike(node) {
+                switch (node.kind) {
+                    case 218 /* Block */:
+                    case 279 /* SourceFile */:
+                    case 245 /* ModuleBlock */:
+                    case 271 /* CaseClause */:
+                        return true;
+                    default:
+                        return false;
+                }
+            }
+        })(extractSymbol = refactor.extractSymbol || (refactor.extractSymbol = {}));
+    })(refactor = ts.refactor || (ts.refactor = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var refactor;
+    (function (refactor) {
+        var generateGetAccessorAndSetAccessor;
+        (function (generateGetAccessorAndSetAccessor) {
+            var actionName = "Generate 'get' and 'set' accessors";
+            var actionDescription = ts.Diagnostics.Generate_get_and_set_accessors.message;
+            refactor.registerRefactor(actionName, { getEditsForAction: getEditsForAction, getAvailableActions: getAvailableActions });
+            function getAvailableActions(context) {
+                if (!getConvertibleFieldAtPosition(context))
+                    return ts.emptyArray;
+                return [{
+                        name: actionName,
+                        description: actionDescription,
+                        actions: [
+                            {
+                                name: actionName,
+                                description: actionDescription
+                            }
+                        ]
+                    }];
+            }
+            function getEditsForAction(context, _actionName) {
+                var file = context.file;
+                var fieldInfo = getConvertibleFieldAtPosition(context);
+                if (!fieldInfo)
+                    return undefined;
+                var isJS = ts.isSourceFileJS(file);
+                var changeTracker = ts.textChanges.ChangeTracker.fromContext(context);
+                var isStatic = fieldInfo.isStatic, isReadonly = fieldInfo.isReadonly, fieldName = fieldInfo.fieldName, accessorName = fieldInfo.accessorName, originalName = fieldInfo.originalName, type = fieldInfo.type, container = fieldInfo.container, declaration = fieldInfo.declaration, renameAccessor = fieldInfo.renameAccessor;
+                ts.suppressLeadingAndTrailingTrivia(fieldName);
+                ts.suppressLeadingAndTrailingTrivia(declaration);
+                ts.suppressLeadingAndTrailingTrivia(container);
+                var isInClassLike = ts.isClassLike(container);
+                // avoid Readonly modifier because it will convert to get accessor
+                var modifierFlags = ts.getModifierFlags(declaration) & ~64 /* Readonly */;
+                var accessorModifiers = isInClassLike
+                    ? !modifierFlags || modifierFlags & 8 /* Private */
+                        ? getModifiers(isJS, isStatic, 115 /* PublicKeyword */)
+                        : ts.createNodeArray(ts.createModifiersFromModifierFlags(modifierFlags))
+                    : undefined;
+                var fieldModifiers = isInClassLike ? getModifiers(isJS, isStatic, 113 /* PrivateKeyword */) : undefined;
+                updateFieldDeclaration(changeTracker, file, declaration, fieldName, fieldModifiers);
+                var getAccessor = generateGetAccessor(fieldName, accessorName, type, accessorModifiers, isStatic, container);
+                ts.suppressLeadingAndTrailingTrivia(getAccessor);
+                insertAccessor(changeTracker, file, getAccessor, declaration, container);
+                if (isReadonly) {
+                    // readonly modifier only existed in classLikeDeclaration
+                    var constructor = ts.getFirstConstructorWithBody(container);
+                    if (constructor) {
+                        updateReadonlyPropertyInitializerStatementConstructor(changeTracker, file, constructor, fieldName.text, originalName);
+                    }
+                }
+                else {
+                    var setAccessor = generateSetAccessor(fieldName, accessorName, type, accessorModifiers, isStatic, container);
+                    ts.suppressLeadingAndTrailingTrivia(setAccessor);
+                    insertAccessor(changeTracker, file, setAccessor, declaration, container);
+                }
+                var edits = changeTracker.getChanges();
+                var renameFilename = file.fileName;
+                var nameNeedRename = renameAccessor ? accessorName : fieldName;
+                var renameLocationOffset = ts.isIdentifier(nameNeedRename) ? 0 : -1;
+                var renameLocation = renameLocationOffset + ts.getRenameLocation(edits, renameFilename, nameNeedRename.text, /*preferLastLocation*/ ts.isParameter(declaration));
+                return { renameFilename: renameFilename, renameLocation: renameLocation, edits: edits };
+            }
+            function isConvertibleName(name) {
+                return ts.isIdentifier(name) || ts.isStringLiteral(name);
+            }
+            function isAcceptedDeclaration(node) {
+                return ts.isParameterPropertyDeclaration(node) || ts.isPropertyDeclaration(node) || ts.isPropertyAssignment(node);
+            }
+            function createPropertyName(name, originalName) {
+                return ts.isIdentifier(originalName) ? ts.createIdentifier(name) : ts.createLiteral(name);
+            }
+            function createAccessorAccessExpression(fieldName, isStatic, container) {
+                var leftHead = isStatic ? container.name : ts.createThis(); // TODO: GH#18217
+                return ts.isIdentifier(fieldName) ? ts.createPropertyAccess(leftHead, fieldName) : ts.createElementAccess(leftHead, ts.createLiteral(fieldName));
+            }
+            function getModifiers(isJS, isStatic, accessModifier) {
+                var modifiers = ts.append(!isJS ? [ts.createToken(accessModifier)] : undefined, isStatic ? ts.createToken(116 /* StaticKeyword */) : undefined);
+                return modifiers && ts.createNodeArray(modifiers);
+            }
+            function startsWithUnderscore(name) {
+                return name.charCodeAt(0) === 95 /* _ */;
+            }
+            function getConvertibleFieldAtPosition(context) {
+                var file = context.file, startPosition = context.startPosition, endPosition = context.endPosition;
+                var node = ts.getTokenAtPosition(file, startPosition);
+                var declaration = ts.findAncestor(node.parent, isAcceptedDeclaration);
+                // make sure declaration have AccessibilityModifier or Static Modifier or Readonly Modifier
+                var meaning = 28 /* AccessibilityModifier */ | 32 /* Static */ | 64 /* Readonly */;
+                if (!declaration || !ts.nodeOverlapsWithStartEnd(declaration.name, file, startPosition, endPosition) // TODO: GH#18217
+                    || !isConvertibleName(declaration.name) || (ts.getModifierFlags(declaration) | meaning) !== meaning)
+                    return undefined;
+                var name = declaration.name.text;
+                var startWithUnderscore = startsWithUnderscore(name);
+                var fieldName = createPropertyName(startWithUnderscore ? name : ts.getUniqueName("_" + name, file), declaration.name);
+                var accessorName = createPropertyName(startWithUnderscore ? ts.getUniqueName(name.substring(1), file) : name, declaration.name);
+                return {
+                    isStatic: ts.hasStaticModifier(declaration),
+                    isReadonly: ts.hasReadonlyModifier(declaration),
+                    type: ts.getTypeAnnotationNode(declaration),
+                    container: declaration.kind === 151 /* Parameter */ ? declaration.parent.parent : declaration.parent,
+                    originalName: declaration.name.text,
+                    declaration: declaration,
+                    fieldName: fieldName,
+                    accessorName: accessorName,
+                    renameAccessor: startWithUnderscore
+                };
+            }
+            function generateGetAccessor(fieldName, accessorName, type, modifiers, isStatic, container) {
+                return ts.createGetAccessor(
+                /*decorators*/ undefined, modifiers, accessorName, 
+                /*parameters*/ undefined, // TODO: GH#18217
+                type, ts.createBlock([
+                    ts.createReturn(createAccessorAccessExpression(fieldName, isStatic, container))
+                ], /*multiLine*/ true));
+            }
+            function generateSetAccessor(fieldName, accessorName, type, modifiers, isStatic, container) {
+                return ts.createSetAccessor(
+                /*decorators*/ undefined, modifiers, accessorName, [ts.createParameter(
+                    /*decorators*/ undefined, 
+                    /*modifiers*/ undefined, 
+                    /*dotDotDotToken*/ undefined, ts.createIdentifier("value"), 
+                    /*questionToken*/ undefined, type)], ts.createBlock([
+                    ts.createStatement(ts.createAssignment(createAccessorAccessExpression(fieldName, isStatic, container), ts.createIdentifier("value")))
+                ], /*multiLine*/ true));
+            }
+            function updatePropertyDeclaration(changeTracker, file, declaration, fieldName, modifiers) {
+                var property = ts.updateProperty(declaration, declaration.decorators, modifiers, fieldName, declaration.questionToken || declaration.exclamationToken, declaration.type, declaration.initializer);
+                changeTracker.replaceNode(file, declaration, property);
+            }
+            function updatePropertyAssignmentDeclaration(changeTracker, file, declaration, fieldName) {
+                var assignment = ts.updatePropertyAssignment(declaration, fieldName, declaration.initializer);
+                changeTracker.replacePropertyAssignment(file, declaration, assignment);
+            }
+            function updateFieldDeclaration(changeTracker, file, declaration, fieldName, modifiers) {
+                if (ts.isPropertyDeclaration(declaration)) {
+                    updatePropertyDeclaration(changeTracker, file, declaration, fieldName, modifiers);
+                }
+                else if (ts.isPropertyAssignment(declaration)) {
+                    updatePropertyAssignmentDeclaration(changeTracker, file, declaration, fieldName);
+                }
+                else {
+                    changeTracker.replaceNode(file, declaration, ts.updateParameter(declaration, declaration.decorators, modifiers, declaration.dotDotDotToken, ts.cast(fieldName, ts.isIdentifier), declaration.questionToken, declaration.type, declaration.initializer));
+                }
+            }
+            function insertAccessor(changeTracker, file, accessor, declaration, container) {
+                ts.isParameterPropertyDeclaration(declaration)
+                    ? changeTracker.insertNodeAtClassStart(file, container, accessor)
+                    : ts.isPropertyAssignment(declaration)
+                        ? changeTracker.insertNodeAfterComma(file, declaration, accessor)
+                        : changeTracker.insertNodeAfter(file, declaration, accessor);
+            }
+            function updateReadonlyPropertyInitializerStatementConstructor(changeTracker, file, constructor, fieldName, originalName) {
+                if (!constructor.body)
+                    return;
+                constructor.body.forEachChild(function recur(node) {
+                    if (ts.isElementAccessExpression(node) &&
+                        node.expression.kind === 100 /* ThisKeyword */ &&
+                        ts.isStringLiteral(node.argumentExpression) &&
+                        node.argumentExpression.text === originalName &&
+                        ts.isWriteAccess(node)) {
+                        changeTracker.replaceNode(file, node.argumentExpression, ts.createStringLiteral(fieldName));
+                    }
+                    if (ts.isPropertyAccessExpression(node) && node.expression.kind === 100 /* ThisKeyword */ && node.name.text === originalName && ts.isWriteAccess(node)) {
+                        changeTracker.replaceNode(file, node.name, ts.createIdentifier(fieldName));
+                    }
+                    if (!ts.isFunctionLike(node) && !ts.isClassLike(node)) {
+                        node.forEachChild(recur);
+                    }
+                });
+            }
+        })(generateGetAccessorAndSetAccessor = refactor.generateGetAccessorAndSetAccessor || (refactor.generateGetAccessorAndSetAccessor = {}));
+    })(refactor = ts.refactor || (ts.refactor = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var refactor;
+    (function (refactor) {
+        var refactorName = "Move to a new file";
+        refactor.registerRefactor(refactorName, {
+            getAvailableActions: function (context) {
+                if (!context.preferences.allowTextChangesInNewFiles || getStatementsToMove(context) === undefined)
+                    return ts.emptyArray;
+                var description = ts.getLocaleSpecificMessage(ts.Diagnostics.Move_to_a_new_file);
+                return [{ name: refactorName, description: description, actions: [{ name: refactorName, description: description }] }];
+            },
+            getEditsForAction: function (context, actionName) {
+                ts.Debug.assert(actionName === refactorName);
+                var statements = ts.Debug.assertDefined(getStatementsToMove(context));
+                var edits = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(context.file, context.program, statements, t, context.host, context.preferences); });
+                return { edits: edits, renameFilename: undefined, renameLocation: undefined };
+            }
+        });
+        function getRangeToMove(context) {
+            var file = context.file;
+            var range = ts.createTextRangeFromSpan(ts.getRefactorContextSpan(context));
+            var statements = file.statements;
+            var startNodeIndex = ts.findIndex(statements, function (s) { return s.end > range.pos; });
+            if (startNodeIndex === -1)
+                return undefined;
+            var startStatement = statements[startNodeIndex];
+            if (ts.isNamedDeclaration(startStatement) && startStatement.name && ts.rangeContainsRange(startStatement.name, range)) {
+                return { toMove: [statements[startNodeIndex]], afterLast: statements[startNodeIndex + 1] };
+            }
+            // Can't only partially include the start node or be partially into the next node
+            if (range.pos > startStatement.getStart(file))
+                return undefined;
+            var afterEndNodeIndex = ts.findIndex(statements, function (s) { return s.end > range.end; }, startNodeIndex);
+            // Can't be partially into the next node
+            if (afterEndNodeIndex !== -1 && (afterEndNodeIndex === 0 || statements[afterEndNodeIndex].getStart(file) < range.end))
+                return undefined;
+            return {
+                toMove: statements.slice(startNodeIndex, afterEndNodeIndex === -1 ? statements.length : afterEndNodeIndex),
+                afterLast: afterEndNodeIndex === -1 ? undefined : statements[afterEndNodeIndex],
+            };
+        }
+        function doChange(oldFile, program, toMove, changes, host, preferences) {
+            var checker = program.getTypeChecker();
+            var usage = getUsageInfo(oldFile, toMove.all, checker);
+            var currentDirectory = ts.getDirectoryPath(oldFile.fileName);
+            var extension = ts.extensionFromPath(oldFile.fileName);
+            var newModuleName = makeUniqueModuleName(getNewModuleName(usage.movedSymbols), extension, currentDirectory, host);
+            var newFileNameWithExtension = newModuleName + extension;
+            // If previous file was global, this is easy.
+            changes.createNewFile(oldFile, ts.combinePaths(currentDirectory, newFileNameWithExtension), getNewStatementsAndRemoveFromOldFile(oldFile, usage, changes, toMove, program, newModuleName, preferences));
+            addNewFileToTsconfig(program, changes, oldFile.fileName, newFileNameWithExtension, ts.hostGetCanonicalFileName(host));
+        }
+        // Filters imports out of the range of statements to move. Imports will be copied to the new file anyway, and may still be needed in the old file.
+        function getStatementsToMove(context) {
+            var rangeToMove = getRangeToMove(context);
+            if (rangeToMove === undefined)
+                return undefined;
+            var all = [];
+            var ranges = [];
+            var toMove = rangeToMove.toMove, afterLast = rangeToMove.afterLast;
+            ts.getRangesWhere(toMove, function (s) { return !isPureImport(s); }, function (start, afterEndIndex) {
+                for (var i = start; i < afterEndIndex; i++)
+                    all.push(toMove[i]);
+                ranges.push({ first: toMove[start], afterLast: afterLast });
+            });
+            return all.length === 0 ? undefined : { all: all, ranges: ranges };
+        }
+        function isPureImport(node) {
+            switch (node.kind) {
+                case 249 /* ImportDeclaration */:
+                    return true;
+                case 248 /* ImportEqualsDeclaration */:
+                    return !ts.hasModifier(node, 1 /* Export */);
+                case 219 /* VariableStatement */:
+                    return node.declarationList.declarations.every(function (d) { return !!d.initializer && ts.isRequireCall(d.initializer, /*checkArgumentIsStringLiteralLike*/ true); });
+                default:
+                    return false;
+            }
+        }
+        function addNewFileToTsconfig(program, changes, oldFileName, newFileNameWithExtension, getCanonicalFileName) {
+            var cfg = program.getCompilerOptions().configFile;
+            if (!cfg)
+                return;
+            var newFileAbsolutePath = ts.normalizePath(ts.combinePaths(oldFileName, "..", newFileNameWithExtension));
+            var newFilePath = ts.getRelativePathFromFile(cfg.fileName, newFileAbsolutePath, getCanonicalFileName);
+            var cfgObject = cfg.statements[0] && ts.tryCast(cfg.statements[0].expression, ts.isObjectLiteralExpression);
+            var filesProp = cfgObject && ts.find(cfgObject.properties, function (prop) {
+                return ts.isPropertyAssignment(prop) && ts.isStringLiteral(prop.name) && prop.name.text === "files";
+            });
+            if (filesProp && ts.isArrayLiteralExpression(filesProp.initializer)) {
+                changes.insertNodeInListAfter(cfg, ts.last(filesProp.initializer.elements), ts.createLiteral(newFilePath), filesProp.initializer.elements);
+            }
+        }
+        function getNewStatementsAndRemoveFromOldFile(oldFile, usage, changes, toMove, program, newModuleName, preferences) {
+            var checker = program.getTypeChecker();
+            if (!oldFile.externalModuleIndicator && !oldFile.commonJsModuleIndicator) {
+                deleteMovedStatements(oldFile, toMove.ranges, changes);
+                return toMove.all;
+            }
+            var useEs6ModuleSyntax = !!oldFile.externalModuleIndicator;
+            var quotePreference = ts.getQuotePreference(oldFile, preferences);
+            var importsFromNewFile = createOldFileImportsFromNewFile(usage.oldFileImportsFromNewFile, newModuleName, useEs6ModuleSyntax, quotePreference);
+            if (importsFromNewFile) {
+                ts.insertImport(changes, oldFile, importsFromNewFile);
+            }
+            deleteUnusedOldImports(oldFile, toMove.all, changes, usage.unusedImportsFromOldFile, checker);
+            deleteMovedStatements(oldFile, toMove.ranges, changes);
+            updateImportsInOtherFiles(changes, program, oldFile, usage.movedSymbols, newModuleName);
+            return getNewFileImportsAndAddExportInOldFile(oldFile, usage.oldImportsNeededByNewFile, usage.newFileImportsFromOldFile, changes, checker, useEs6ModuleSyntax, quotePreference).concat(addExports(oldFile, toMove.all, usage.oldFileImportsFromNewFile, useEs6ModuleSyntax));
+        }
+        function deleteMovedStatements(sourceFile, moved, changes) {
+            for (var _i = 0, moved_1 = moved; _i < moved_1.length; _i++) {
+                var _a = moved_1[_i], first_1 = _a.first, afterLast = _a.afterLast;
+                changes.deleteNodeRangeExcludingEnd(sourceFile, first_1, afterLast);
+            }
+        }
+        function deleteUnusedOldImports(oldFile, toMove, changes, toDelete, checker) {
+            for (var _i = 0, _a = oldFile.statements; _i < _a.length; _i++) {
+                var statement = _a[_i];
+                if (ts.contains(toMove, statement))
+                    continue;
+                forEachImportInStatement(statement, function (i) { return deleteUnusedImports(oldFile, i, changes, function (name) { return toDelete.has(checker.getSymbolAtLocation(name)); }); });
+            }
+        }
+        function updateImportsInOtherFiles(changes, program, oldFile, movedSymbols, newModuleName) {
+            var checker = program.getTypeChecker();
+            var _loop_25 = function (sourceFile) {
+                if (sourceFile === oldFile)
+                    return "continue";
+                var _loop_26 = function (statement) {
+                    forEachImportInStatement(statement, function (importNode) {
+                        if (checker.getSymbolAtLocation(moduleSpecifierFromImport(importNode)) !== oldFile.symbol)
+                            return;
+                        var shouldMove = function (name) {
+                            var symbol = ts.isBindingElement(name.parent)
+                                ? ts.getPropertySymbolFromBindingElement(checker, name.parent)
+                                : ts.skipAlias(checker.getSymbolAtLocation(name), checker); // TODO: GH#18217
+                            return !!symbol && movedSymbols.has(symbol);
+                        };
+                        deleteUnusedImports(sourceFile, importNode, changes, shouldMove); // These will be changed to imports from the new file
+                        var newModuleSpecifier = ts.combinePaths(ts.getDirectoryPath(moduleSpecifierFromImport(importNode).text), newModuleName);
+                        var newImportDeclaration = filterImport(importNode, ts.createLiteral(newModuleSpecifier), shouldMove);
+                        if (newImportDeclaration)
+                            changes.insertNodeAfter(sourceFile, statement, newImportDeclaration);
+                        var ns = getNamespaceLikeImport(importNode);
+                        if (ns)
+                            updateNamespaceLikeImport(changes, sourceFile, checker, movedSymbols, newModuleName, newModuleSpecifier, ns, importNode);
+                    });
+                };
+                for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
+                    var statement = _a[_i];
+                    _loop_26(statement);
+                }
+            };
+            for (var _i = 0, _a = program.getSourceFiles(); _i < _a.length; _i++) {
+                var sourceFile = _a[_i];
+                _loop_25(sourceFile);
+            }
+        }
+        function getNamespaceLikeImport(node) {
+            switch (node.kind) {
+                case 249 /* ImportDeclaration */:
+                    return node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 251 /* NamespaceImport */ ?
+                        node.importClause.namedBindings.name : undefined;
+                case 248 /* ImportEqualsDeclaration */:
+                    return node.name;
+                case 237 /* VariableDeclaration */:
+                    return ts.tryCast(node.name, ts.isIdentifier);
+                default:
+                    return ts.Debug.assertNever(node);
+            }
+        }
+        function updateNamespaceLikeImport(changes, sourceFile, checker, movedSymbols, newModuleName, newModuleSpecifier, oldImportId, oldImportNode) {
+            var preferredNewNamespaceName = ts.codefix.moduleSpecifierToValidIdentifier(newModuleName, 6 /* ESNext */);
+            var needUniqueName = false;
+            var toChange = [];
+            ts.FindAllReferences.Core.eachSymbolReferenceInFile(oldImportId, checker, sourceFile, function (ref) {
+                if (!ts.isPropertyAccessExpression(ref.parent))
+                    return;
+                needUniqueName = needUniqueName || !!checker.resolveName(preferredNewNamespaceName, ref, 67108863 /* All */, /*excludeGlobals*/ true);
+                if (movedSymbols.has(checker.getSymbolAtLocation(ref.parent.name))) {
+                    toChange.push(ref);
+                }
+            });
+            if (toChange.length) {
+                var newNamespaceName = needUniqueName ? ts.getUniqueName(preferredNewNamespaceName, sourceFile) : preferredNewNamespaceName;
+                for (var _i = 0, toChange_1 = toChange; _i < toChange_1.length; _i++) {
+                    var ref = toChange_1[_i];
+                    changes.replaceNode(sourceFile, ref, ts.createIdentifier(newNamespaceName));
+                }
+                changes.insertNodeAfter(sourceFile, oldImportNode, updateNamespaceLikeImportNode(oldImportNode, newModuleName, newModuleSpecifier));
+            }
+        }
+        function updateNamespaceLikeImportNode(node, newNamespaceName, newModuleSpecifier) {
+            var newNamespaceId = ts.createIdentifier(newNamespaceName);
+            var newModuleString = ts.createLiteral(newModuleSpecifier);
+            switch (node.kind) {
+                case 249 /* ImportDeclaration */:
+                    return ts.createImportDeclaration(
+                    /*decorators*/ undefined, /*modifiers*/ undefined, ts.createImportClause(/*name*/ undefined, ts.createNamespaceImport(newNamespaceId)), newModuleString);
+                case 248 /* ImportEqualsDeclaration */:
+                    return ts.createImportEqualsDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, newNamespaceId, ts.createExternalModuleReference(newModuleString));
+                case 237 /* VariableDeclaration */:
+                    return ts.createVariableDeclaration(newNamespaceId, /*type*/ undefined, createRequireCall(newModuleString));
+                default:
+                    return ts.Debug.assertNever(node);
+            }
+        }
+        function moduleSpecifierFromImport(i) {
+            return (i.kind === 249 /* ImportDeclaration */ ? i.moduleSpecifier
+                : i.kind === 248 /* ImportEqualsDeclaration */ ? i.moduleReference.expression
+                    : i.initializer.arguments[0]);
+        }
+        function forEachImportInStatement(statement, cb) {
+            if (ts.isImportDeclaration(statement)) {
+                if (ts.isStringLiteral(statement.moduleSpecifier))
+                    cb(statement);
+            }
+            else if (ts.isImportEqualsDeclaration(statement)) {
+                if (ts.isExternalModuleReference(statement.moduleReference) && ts.isStringLiteralLike(statement.moduleReference.expression)) {
+                    cb(statement);
+                }
+            }
+            else if (ts.isVariableStatement(statement)) {
+                for (var _i = 0, _a = statement.declarationList.declarations; _i < _a.length; _i++) {
+                    var decl = _a[_i];
+                    if (decl.initializer && ts.isRequireCall(decl.initializer, /*checkArgumentIsStringLiteralLike*/ true)) {
+                        cb(decl);
+                    }
+                }
+            }
+        }
+        function createOldFileImportsFromNewFile(newFileNeedExport, newFileNameWithExtension, useEs6Imports, quotePreference) {
+            var defaultImport;
+            var imports = [];
+            newFileNeedExport.forEach(function (symbol) {
+                if (symbol.escapedName === "default" /* Default */) {
+                    defaultImport = ts.createIdentifier(ts.symbolNameNoDefault(symbol)); // TODO: GH#18217
+                }
+                else {
+                    imports.push(symbol.name);
+                }
+            });
+            return makeImportOrRequire(defaultImport, imports, newFileNameWithExtension, useEs6Imports, quotePreference);
+        }
+        function makeImportOrRequire(defaultImport, imports, path, useEs6Imports, quotePreference) {
+            path = ts.ensurePathIsNonModuleName(path);
+            if (useEs6Imports) {
+                var specifiers = imports.map(function (i) { return ts.createImportSpecifier(/*propertyName*/ undefined, ts.createIdentifier(i)); });
+                return ts.makeImportIfNecessary(defaultImport, specifiers, path, quotePreference);
+            }
+            else {
+                ts.Debug.assert(!defaultImport); // If there's a default export, it should have been an es6 module.
+                var bindingElements = imports.map(function (i) { return ts.createBindingElement(/*dotDotDotToken*/ undefined, /*propertyName*/ undefined, i); });
+                return bindingElements.length
+                    ? makeVariableStatement(ts.createObjectBindingPattern(bindingElements), /*type*/ undefined, createRequireCall(ts.createLiteral(path)))
+                    : undefined;
+            }
+        }
+        function makeVariableStatement(name, type, initializer, flags) {
+            if (flags === void 0) { flags = 2 /* Const */; }
+            return ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList([ts.createVariableDeclaration(name, type, initializer)], flags));
+        }
+        function createRequireCall(moduleSpecifier) {
+            return ts.createCall(ts.createIdentifier("require"), /*typeArguments*/ undefined, [moduleSpecifier]);
+        }
+        function addExports(sourceFile, toMove, needExport, useEs6Exports) {
+            return ts.flatMap(toMove, function (statement) {
+                if (isTopLevelDeclarationStatement(statement) &&
+                    !isExported(sourceFile, statement, useEs6Exports) &&
+                    forEachTopLevelDeclaration(statement, function (d) { return needExport.has(ts.Debug.assertDefined(d.symbol)); })) {
+                    var exports_2 = addExport(statement, useEs6Exports);
+                    if (exports_2)
+                        return exports_2;
+                }
+                return statement;
+            });
+        }
+        function deleteUnusedImports(sourceFile, importDecl, changes, isUnused) {
+            switch (importDecl.kind) {
+                case 249 /* ImportDeclaration */:
+                    deleteUnusedImportsInDeclaration(sourceFile, importDecl, changes, isUnused);
+                    break;
+                case 248 /* ImportEqualsDeclaration */:
+                    if (isUnused(importDecl.name)) {
+                        changes.delete(sourceFile, importDecl);
+                    }
+                    break;
+                case 237 /* VariableDeclaration */:
+                    deleteUnusedImportsInVariableDeclaration(sourceFile, importDecl, changes, isUnused);
+                    break;
+                default:
+                    ts.Debug.assertNever(importDecl);
+            }
+        }
+        function deleteUnusedImportsInDeclaration(sourceFile, importDecl, changes, isUnused) {
+            if (!importDecl.importClause)
+                return;
+            var _a = importDecl.importClause, name = _a.name, namedBindings = _a.namedBindings;
+            var defaultUnused = !name || isUnused(name);
+            var namedBindingsUnused = !namedBindings ||
+                (namedBindings.kind === 251 /* NamespaceImport */ ? isUnused(namedBindings.name) : namedBindings.elements.length !== 0 && namedBindings.elements.every(function (e) { return isUnused(e.name); }));
+            if (defaultUnused && namedBindingsUnused) {
+                changes.delete(sourceFile, importDecl);
+            }
+            else {
+                if (name && defaultUnused) {
+                    changes.delete(sourceFile, name);
+                }
+                if (namedBindings) {
+                    if (namedBindingsUnused) {
+                        changes.delete(sourceFile, namedBindings);
+                    }
+                    else if (namedBindings.kind === 252 /* NamedImports */) {
+                        for (var _i = 0, _b = namedBindings.elements; _i < _b.length; _i++) {
+                            var element = _b[_i];
+                            if (isUnused(element.name))
+                                changes.delete(sourceFile, element);
+                        }
+                    }
+                }
+            }
+        }
+        function deleteUnusedImportsInVariableDeclaration(sourceFile, varDecl, changes, isUnused) {
+            var name = varDecl.name;
+            switch (name.kind) {
+                case 72 /* Identifier */:
+                    if (isUnused(name)) {
+                        changes.delete(sourceFile, name);
+                    }
+                    break;
+                case 185 /* ArrayBindingPattern */:
+                    break;
+                case 184 /* ObjectBindingPattern */:
+                    if (name.elements.every(function (e) { return ts.isIdentifier(e.name) && isUnused(e.name); })) {
+                        changes.delete(sourceFile, ts.isVariableDeclarationList(varDecl.parent) && varDecl.parent.declarations.length === 1 ? varDecl.parent.parent : varDecl);
+                    }
+                    else {
+                        for (var _i = 0, _a = name.elements; _i < _a.length; _i++) {
+                            var element = _a[_i];
+                            if (ts.isIdentifier(element.name) && isUnused(element.name)) {
+                                changes.delete(sourceFile, element.name);
+                            }
+                        }
+                    }
+                    break;
+            }
+        }
+        function getNewFileImportsAndAddExportInOldFile(oldFile, importsToCopy, newFileImportsFromOldFile, changes, checker, useEs6ModuleSyntax, quotePreference) {
+            var copiedOldImports = [];
+            for (var _i = 0, _a = oldFile.statements; _i < _a.length; _i++) {
+                var oldStatement = _a[_i];
+                forEachImportInStatement(oldStatement, function (i) {
+                    ts.append(copiedOldImports, filterImport(i, moduleSpecifierFromImport(i), function (name) { return importsToCopy.has(checker.getSymbolAtLocation(name)); }));
+                });
+            }
+            // Also, import things used from the old file, and insert 'export' modifiers as necessary in the old file.
+            var oldFileDefault;
+            var oldFileNamedImports = [];
+            var markSeenTop = ts.nodeSeenTracker(); // Needed because multiple declarations may appear in `const x = 0, y = 1;`.
+            newFileImportsFromOldFile.forEach(function (symbol) {
+                for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                    var decl = _a[_i];
+                    if (!isTopLevelDeclaration(decl))
+                        continue;
+                    var name = nameOfTopLevelDeclaration(decl);
+                    if (!name)
+                        continue;
+                    var top = getTopLevelDeclarationStatement(decl);
+                    if (markSeenTop(top)) {
+                        addExportToChanges(oldFile, top, changes, useEs6ModuleSyntax);
+                    }
+                    if (ts.hasModifier(decl, 512 /* Default */)) {
+                        oldFileDefault = name;
+                    }
+                    else {
+                        oldFileNamedImports.push(name.text);
+                    }
+                }
+            });
+            ts.append(copiedOldImports, makeImportOrRequire(oldFileDefault, oldFileNamedImports, ts.removeFileExtension(ts.getBaseFileName(oldFile.fileName)), useEs6ModuleSyntax, quotePreference));
+            return copiedOldImports;
+        }
+        function makeUniqueModuleName(moduleName, extension, inDirectory, host) {
+            var newModuleName = moduleName;
+            for (var i = 1;; i++) {
+                var name = ts.combinePaths(inDirectory, newModuleName + extension);
+                if (!host.fileExists(name))
+                    return newModuleName; // TODO: GH#18217
+                newModuleName = moduleName + "." + i;
+            }
+        }
+        function getNewModuleName(movedSymbols) {
+            return movedSymbols.forEachEntry(ts.symbolNameNoDefault) || "newFile";
+        }
+        function getUsageInfo(oldFile, toMove, checker) {
+            var movedSymbols = new SymbolSet();
+            var oldImportsNeededByNewFile = new SymbolSet();
+            var newFileImportsFromOldFile = new SymbolSet();
+            var containsJsx = ts.find(toMove, function (statement) { return !!(statement.transformFlags & 4 /* ContainsJsx */); });
+            var jsxNamespaceSymbol = getJsxNamespaceSymbol(containsJsx);
+            if (jsxNamespaceSymbol) { // Might not exist (e.g. in non-compiling code)
+                oldImportsNeededByNewFile.add(jsxNamespaceSymbol);
+            }
+            for (var _i = 0, toMove_1 = toMove; _i < toMove_1.length; _i++) {
+                var statement = toMove_1[_i];
+                forEachTopLevelDeclaration(statement, function (decl) {
+                    movedSymbols.add(ts.Debug.assertDefined(ts.isExpressionStatement(decl) ? checker.getSymbolAtLocation(decl.expression.left) : decl.symbol));
+                });
+            }
+            for (var _a = 0, toMove_2 = toMove; _a < toMove_2.length; _a++) {
+                var statement = toMove_2[_a];
+                forEachReference(statement, checker, function (symbol) {
+                    if (!symbol.declarations)
+                        return;
+                    for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                        var decl = _a[_i];
+                        if (isInImport(decl)) {
+                            oldImportsNeededByNewFile.add(symbol);
+                        }
+                        else if (isTopLevelDeclaration(decl) && sourceFileOfTopLevelDeclaration(decl) === oldFile && !movedSymbols.has(symbol)) {
+                            newFileImportsFromOldFile.add(symbol);
+                        }
+                    }
+                });
+            }
+            var unusedImportsFromOldFile = oldImportsNeededByNewFile.clone();
+            var oldFileImportsFromNewFile = new SymbolSet();
+            for (var _b = 0, _c = oldFile.statements; _b < _c.length; _b++) {
+                var statement = _c[_b];
+                if (ts.contains(toMove, statement))
+                    continue;
+                // jsxNamespaceSymbol will only be set iff it is in oldImportsNeededByNewFile.
+                if (jsxNamespaceSymbol && !!(statement.transformFlags & 4 /* ContainsJsx */)) {
+                    unusedImportsFromOldFile.delete(jsxNamespaceSymbol);
+                }
+                forEachReference(statement, checker, function (symbol) {
+                    if (movedSymbols.has(symbol))
+                        oldFileImportsFromNewFile.add(symbol);
+                    unusedImportsFromOldFile.delete(symbol);
+                });
+            }
+            return { movedSymbols: movedSymbols, newFileImportsFromOldFile: newFileImportsFromOldFile, oldFileImportsFromNewFile: oldFileImportsFromNewFile, oldImportsNeededByNewFile: oldImportsNeededByNewFile, unusedImportsFromOldFile: unusedImportsFromOldFile };
+            function getJsxNamespaceSymbol(containsJsx) {
+                if (containsJsx === undefined) {
+                    return undefined;
+                }
+                var jsxNamespace = checker.getJsxNamespace(containsJsx);
+                // Strictly speaking, this could resolve to a symbol other than the JSX namespace.
+                // This will produce erroneous output (probably, an incorrectly copied import) but
+                // is expected to be very rare and easily reversible.
+                var jsxNamespaceSymbol = checker.resolveName(jsxNamespace, containsJsx, 1920 /* Namespace */, /*excludeGlobals*/ true);
+                return !!jsxNamespaceSymbol && ts.some(jsxNamespaceSymbol.declarations, isInImport)
+                    ? jsxNamespaceSymbol
+                    : undefined;
+            }
+        }
+        // Below should all be utilities
+        function isInImport(decl) {
+            switch (decl.kind) {
+                case 248 /* ImportEqualsDeclaration */:
+                case 253 /* ImportSpecifier */:
+                case 250 /* ImportClause */:
+                    return true;
+                case 237 /* VariableDeclaration */:
+                    return isVariableDeclarationInImport(decl);
+                case 186 /* BindingElement */:
+                    return ts.isVariableDeclaration(decl.parent.parent) && isVariableDeclarationInImport(decl.parent.parent);
+                default:
+                    return false;
+            }
+        }
+        function isVariableDeclarationInImport(decl) {
+            return ts.isSourceFile(decl.parent.parent.parent) &&
+                !!decl.initializer && ts.isRequireCall(decl.initializer, /*checkArgumentIsStringLiteralLike*/ true);
+        }
+        function filterImport(i, moduleSpecifier, keep) {
+            switch (i.kind) {
+                case 249 /* ImportDeclaration */: {
+                    var clause = i.importClause;
+                    if (!clause)
+                        return undefined;
+                    var defaultImport = clause.name && keep(clause.name) ? clause.name : undefined;
+                    var namedBindings = clause.namedBindings && filterNamedBindings(clause.namedBindings, keep);
+                    return defaultImport || namedBindings
+                        ? ts.createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createImportClause(defaultImport, namedBindings), moduleSpecifier)
+                        : undefined;
+                }
+                case 248 /* ImportEqualsDeclaration */:
+                    return keep(i.name) ? i : undefined;
+                case 237 /* VariableDeclaration */: {
+                    var name = filterBindingName(i.name, keep);
+                    return name ? makeVariableStatement(name, i.type, createRequireCall(moduleSpecifier), i.parent.flags) : undefined;
+                }
+                default:
+                    return ts.Debug.assertNever(i);
+            }
+        }
+        function filterNamedBindings(namedBindings, keep) {
+            if (namedBindings.kind === 251 /* NamespaceImport */) {
+                return keep(namedBindings.name) ? namedBindings : undefined;
+            }
+            else {
+                var newElements = namedBindings.elements.filter(function (e) { return keep(e.name); });
+                return newElements.length ? ts.createNamedImports(newElements) : undefined;
+            }
+        }
+        function filterBindingName(name, keep) {
+            switch (name.kind) {
+                case 72 /* Identifier */:
+                    return keep(name) ? name : undefined;
+                case 185 /* ArrayBindingPattern */:
+                    return name;
+                case 184 /* ObjectBindingPattern */: {
+                    // We can't handle nested destructurings or property names well here, so just copy them all.
+                    var newElements = name.elements.filter(function (prop) { return prop.propertyName || !ts.isIdentifier(prop.name) || keep(prop.name); });
+                    return newElements.length ? ts.createObjectBindingPattern(newElements) : undefined;
+                }
+            }
+        }
+        function forEachReference(node, checker, onReference) {
+            node.forEachChild(function cb(node) {
+                if (ts.isIdentifier(node) && !ts.isDeclarationName(node)) {
+                    var sym = checker.getSymbolAtLocation(node);
+                    if (sym)
+                        onReference(sym);
+                }
+                else {
+                    node.forEachChild(cb);
+                }
+            });
+        }
+        var SymbolSet = /** @class */ (function () {
+            function SymbolSet() {
+                this.map = ts.createMap();
+            }
+            SymbolSet.prototype.add = function (symbol) {
+                this.map.set(String(ts.getSymbolId(symbol)), symbol);
+            };
+            SymbolSet.prototype.has = function (symbol) {
+                return this.map.has(String(ts.getSymbolId(symbol)));
+            };
+            SymbolSet.prototype.delete = function (symbol) {
+                this.map.delete(String(ts.getSymbolId(symbol)));
+            };
+            SymbolSet.prototype.forEach = function (cb) {
+                this.map.forEach(cb);
+            };
+            SymbolSet.prototype.forEachEntry = function (cb) {
+                return ts.forEachEntry(this.map, cb);
+            };
+            SymbolSet.prototype.clone = function () {
+                var clone = new SymbolSet();
+                ts.copyEntries(this.map, clone.map);
+                return clone;
+            };
+            return SymbolSet;
+        }());
+        function isTopLevelDeclaration(node) {
+            return isNonVariableTopLevelDeclaration(node) && ts.isSourceFile(node.parent) || ts.isVariableDeclaration(node) && ts.isSourceFile(node.parent.parent.parent);
+        }
+        function sourceFileOfTopLevelDeclaration(node) {
+            return ts.isVariableDeclaration(node) ? node.parent.parent.parent : node.parent;
+        }
+        function isTopLevelDeclarationStatement(node) {
+            ts.Debug.assert(ts.isSourceFile(node.parent));
+            return isNonVariableTopLevelDeclaration(node) || ts.isVariableStatement(node);
+        }
+        function isNonVariableTopLevelDeclaration(node) {
+            switch (node.kind) {
+                case 239 /* FunctionDeclaration */:
+                case 240 /* ClassDeclaration */:
+                case 244 /* ModuleDeclaration */:
+                case 243 /* EnumDeclaration */:
+                case 242 /* TypeAliasDeclaration */:
+                case 241 /* InterfaceDeclaration */:
+                case 248 /* ImportEqualsDeclaration */:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+        function forEachTopLevelDeclaration(statement, cb) {
+            switch (statement.kind) {
+                case 239 /* FunctionDeclaration */:
+                case 240 /* ClassDeclaration */:
+                case 244 /* ModuleDeclaration */:
+                case 243 /* EnumDeclaration */:
+                case 242 /* TypeAliasDeclaration */:
+                case 241 /* InterfaceDeclaration */:
+                case 248 /* ImportEqualsDeclaration */:
+                    return cb(statement);
+                case 219 /* VariableStatement */:
+                    return ts.firstDefined(statement.declarationList.declarations, function (decl) { return forEachTopLevelDeclarationInBindingName(decl.name, cb); });
+                case 221 /* ExpressionStatement */: {
+                    var expression = statement.expression;
+                    return ts.isBinaryExpression(expression) && ts.getAssignmentDeclarationKind(expression) === 1 /* ExportsProperty */
+                        ? cb(statement)
+                        : undefined;
+                }
+            }
+        }
+        function forEachTopLevelDeclarationInBindingName(name, cb) {
+            switch (name.kind) {
+                case 72 /* Identifier */:
+                    return cb(ts.cast(name.parent, function (x) { return ts.isVariableDeclaration(x) || ts.isBindingElement(x); }));
+                case 185 /* ArrayBindingPattern */:
+                case 184 /* ObjectBindingPattern */:
+                    return ts.firstDefined(name.elements, function (em) { return ts.isOmittedExpression(em) ? undefined : forEachTopLevelDeclarationInBindingName(em.name, cb); });
+                default:
+                    return ts.Debug.assertNever(name);
+            }
+        }
+        function nameOfTopLevelDeclaration(d) {
+            return ts.isExpressionStatement(d) ? d.expression.left.name : ts.tryCast(d.name, ts.isIdentifier);
+        }
+        function getTopLevelDeclarationStatement(d) {
+            switch (d.kind) {
+                case 237 /* VariableDeclaration */:
+                    return d.parent.parent;
+                case 186 /* BindingElement */:
+                    return getTopLevelDeclarationStatement(ts.cast(d.parent.parent, function (p) { return ts.isVariableDeclaration(p) || ts.isBindingElement(p); }));
+                default:
+                    return d;
+            }
+        }
+        function addExportToChanges(sourceFile, decl, changes, useEs6Exports) {
+            if (isExported(sourceFile, decl, useEs6Exports))
+                return;
+            if (useEs6Exports) {
+                if (!ts.isExpressionStatement(decl))
+                    changes.insertExportModifier(sourceFile, decl);
+            }
+            else {
+                var names = getNamesToExportInCommonJS(decl);
+                if (names.length !== 0)
+                    changes.insertNodesAfter(sourceFile, decl, names.map(createExportAssignment));
+            }
+        }
+        function isExported(sourceFile, decl, useEs6Exports) {
+            if (useEs6Exports) {
+                return !ts.isExpressionStatement(decl) && ts.hasModifier(decl, 1 /* Export */);
+            }
+            else {
+                return getNamesToExportInCommonJS(decl).some(function (name) { return sourceFile.symbol.exports.has(ts.escapeLeadingUnderscores(name)); });
+            }
+        }
+        function addExport(decl, useEs6Exports) {
+            return useEs6Exports ? [addEs6Export(decl)] : addCommonjsExport(decl);
+        }
+        function addEs6Export(d) {
+            var modifiers = ts.concatenate([ts.createModifier(85 /* ExportKeyword */)], d.modifiers);
+            switch (d.kind) {
+                case 239 /* FunctionDeclaration */:
+                    return ts.updateFunctionDeclaration(d, d.decorators, modifiers, d.asteriskToken, d.name, d.typeParameters, d.parameters, d.type, d.body);
+                case 240 /* ClassDeclaration */:
+                    return ts.updateClassDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.heritageClauses, d.members);
+                case 219 /* VariableStatement */:
+                    return ts.updateVariableStatement(d, modifiers, d.declarationList);
+                case 244 /* ModuleDeclaration */:
+                    return ts.updateModuleDeclaration(d, d.decorators, modifiers, d.name, d.body);
+                case 243 /* EnumDeclaration */:
+                    return ts.updateEnumDeclaration(d, d.decorators, modifiers, d.name, d.members);
+                case 242 /* TypeAliasDeclaration */:
+                    return ts.updateTypeAliasDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.type);
+                case 241 /* InterfaceDeclaration */:
+                    return ts.updateInterfaceDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.heritageClauses, d.members);
+                case 248 /* ImportEqualsDeclaration */:
+                    return ts.updateImportEqualsDeclaration(d, d.decorators, modifiers, d.name, d.moduleReference);
+                case 221 /* ExpressionStatement */:
+                    return ts.Debug.fail(); // Shouldn't try to add 'export' keyword to `exports.x = ...`
+                default:
+                    return ts.Debug.assertNever(d);
+            }
+        }
+        function addCommonjsExport(decl) {
+            return [decl].concat(getNamesToExportInCommonJS(decl).map(createExportAssignment));
+        }
+        function getNamesToExportInCommonJS(decl) {
+            switch (decl.kind) {
+                case 239 /* FunctionDeclaration */:
+                case 240 /* ClassDeclaration */:
+                    return [decl.name.text]; // TODO: GH#18217
+                case 219 /* VariableStatement */:
+                    return ts.mapDefined(decl.declarationList.declarations, function (d) { return ts.isIdentifier(d.name) ? d.name.text : undefined; });
+                case 244 /* ModuleDeclaration */:
+                case 243 /* EnumDeclaration */:
+                case 242 /* TypeAliasDeclaration */:
+                case 241 /* InterfaceDeclaration */:
+                case 248 /* ImportEqualsDeclaration */:
+                    return ts.emptyArray;
+                case 221 /* ExpressionStatement */:
+                    return ts.Debug.fail(); // Shouldn't try to add 'export' keyword to `exports.x = ...`
+                default:
+                    return ts.Debug.assertNever(decl);
+            }
+        }
+        /** Creates `exports.x = x;` */
+        function createExportAssignment(name) {
+            return ts.createExpressionStatement(ts.createBinary(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.createIdentifier(name)), 59 /* EqualsToken */, ts.createIdentifier(name)));
+        }
+    })(refactor = ts.refactor || (ts.refactor = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var refactor;
+    (function (refactor) {
+        var addOrRemoveBracesToArrowFunction;
+        (function (addOrRemoveBracesToArrowFunction) {
+            var refactorName = "Add or remove braces in an arrow function";
+            var refactorDescription = ts.Diagnostics.Add_or_remove_braces_in_an_arrow_function.message;
+            var addBracesActionName = "Add braces to arrow function";
+            var removeBracesActionName = "Remove braces from arrow function";
+            var addBracesActionDescription = ts.Diagnostics.Add_braces_to_arrow_function.message;
+            var removeBracesActionDescription = ts.Diagnostics.Remove_braces_from_arrow_function.message;
+            refactor.registerRefactor(refactorName, { getEditsForAction: getEditsForAction, getAvailableActions: getAvailableActions });
+            function getAvailableActions(context) {
+                var file = context.file, startPosition = context.startPosition;
+                var info = getConvertibleArrowFunctionAtPosition(file, startPosition);
+                if (!info)
+                    return ts.emptyArray;
+                return [{
+                        name: refactorName,
+                        description: refactorDescription,
+                        actions: [
+                            info.addBraces ?
+                                {
+                                    name: addBracesActionName,
+                                    description: addBracesActionDescription
+                                } : {
+                                name: removeBracesActionName,
+                                description: removeBracesActionDescription
+                            }
+                        ]
+                    }];
+            }
+            function getEditsForAction(context, actionName) {
+                var file = context.file, startPosition = context.startPosition;
+                var info = getConvertibleArrowFunctionAtPosition(file, startPosition);
+                if (!info)
+                    return undefined;
+                var expression = info.expression, returnStatement = info.returnStatement, func = info.func;
+                var body;
+                if (actionName === addBracesActionName) {
+                    var returnStatement_1 = ts.createReturn(expression);
+                    body = ts.createBlock([returnStatement_1], /* multiLine */ true);
+                    ts.suppressLeadingAndTrailingTrivia(body);
+                    ts.copyComments(expression, returnStatement_1, file, 3 /* MultiLineCommentTrivia */, /* hasTrailingNewLine */ true);
+                }
+                else if (actionName === removeBracesActionName && returnStatement) {
+                    var actualExpression = expression || ts.createVoidZero();
+                    body = needsParentheses(actualExpression) ? ts.createParen(actualExpression) : actualExpression;
+                    ts.suppressLeadingAndTrailingTrivia(body);
+                    ts.copyComments(returnStatement, body, file, 3 /* MultiLineCommentTrivia */, /* hasTrailingNewLine */ false);
+                }
+                else {
+                    ts.Debug.fail("invalid action");
+                }
+                var edits = ts.textChanges.ChangeTracker.with(context, function (t) { return t.replaceNode(file, func.body, body); });
+                return { renameFilename: undefined, renameLocation: undefined, edits: edits };
+            }
+            function needsParentheses(expression) {
+                return ts.isBinaryExpression(expression) && expression.operatorToken.kind === 27 /* CommaToken */ || ts.isObjectLiteralExpression(expression);
+            }
+            function getConvertibleArrowFunctionAtPosition(file, startPosition) {
+                var node = ts.getTokenAtPosition(file, startPosition);
+                var func = ts.getContainingFunction(node);
+                if (!func || !ts.isArrowFunction(func) || (!ts.rangeContainsRange(func, node) || ts.rangeContainsRange(func.body, node)))
+                    return undefined;
+                if (ts.isExpression(func.body)) {
+                    return {
+                        func: func,
+                        addBraces: true,
+                        expression: func.body
+                    };
+                }
+                else if (func.body.statements.length === 1) {
+                    var firstStatement = ts.first(func.body.statements);
+                    if (ts.isReturnStatement(firstStatement)) {
+                        return {
+                            func: func,
+                            addBraces: false,
+                            expression: firstStatement.expression,
+                            returnStatement: firstStatement
+                        };
+                    }
+                }
+                return undefined;
+            }
+        })(addOrRemoveBracesToArrowFunction = refactor.addOrRemoveBracesToArrowFunction || (refactor.addOrRemoveBracesToArrowFunction = {}));
+    })(refactor = ts.refactor || (ts.refactor = {}));
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    /** The version of the language service API */
+    ts.servicesVersion = "0.8";
+    function createNode(kind, pos, end, parent) {
+        var node = ts.isNodeKind(kind) ? new NodeObject(kind, pos, end) :
+            kind === 72 /* Identifier */ ? new IdentifierObject(72 /* Identifier */, pos, end) :
+                new TokenObject(kind, pos, end);
+        node.parent = parent;
+        node.flags = parent.flags & 12679168 /* ContextFlags */;
+        return node;
+    }
+    var NodeObject = /** @class */ (function () {
+        function NodeObject(kind, pos, end) {
+            this.pos = pos;
+            this.end = end;
+            this.flags = 0 /* None */;
+            this.transformFlags = undefined; // TODO: GH#18217
+            this.parent = undefined;
+            this.kind = kind;
+        }
+        NodeObject.prototype.assertHasRealPosition = function (message) {
+            // tslint:disable-next-line:debug-assert
+            ts.Debug.assert(!ts.positionIsSynthesized(this.pos) && !ts.positionIsSynthesized(this.end), message || "Node must have a real position for this operation");
+        };
+        NodeObject.prototype.getSourceFile = function () {
+            return ts.getSourceFileOfNode(this);
+        };
+        NodeObject.prototype.getStart = function (sourceFile, includeJsDocComment) {
+            this.assertHasRealPosition();
+            return ts.getTokenPosOfNode(this, sourceFile, includeJsDocComment);
+        };
+        NodeObject.prototype.getFullStart = function () {
+            this.assertHasRealPosition();
+            return this.pos;
+        };
+        NodeObject.prototype.getEnd = function () {
+            this.assertHasRealPosition();
+            return this.end;
+        };
+        NodeObject.prototype.getWidth = function (sourceFile) {
+            this.assertHasRealPosition();
+            return this.getEnd() - this.getStart(sourceFile);
+        };
+        NodeObject.prototype.getFullWidth = function () {
+            this.assertHasRealPosition();
+            return this.end - this.pos;
+        };
+        NodeObject.prototype.getLeadingTriviaWidth = function (sourceFile) {
+            this.assertHasRealPosition();
+            return this.getStart(sourceFile) - this.pos;
+        };
+        NodeObject.prototype.getFullText = function (sourceFile) {
+            this.assertHasRealPosition();
+            return (sourceFile || this.getSourceFile()).text.substring(this.pos, this.end);
+        };
+        NodeObject.prototype.getText = function (sourceFile) {
+            this.assertHasRealPosition();
+            if (!sourceFile) {
+                sourceFile = this.getSourceFile();
+            }
+            return sourceFile.text.substring(this.getStart(sourceFile), this.getEnd());
+        };
+        NodeObject.prototype.getChildCount = function (sourceFile) {
+            return this.getChildren(sourceFile).length;
+        };
+        NodeObject.prototype.getChildAt = function (index, sourceFile) {
+            return this.getChildren(sourceFile)[index];
+        };
+        NodeObject.prototype.getChildren = function (sourceFile) {
+            this.assertHasRealPosition("Node without a real position cannot be scanned and thus has no token nodes - use forEachChild and collect the result if that's fine");
+            return this._children || (this._children = createChildren(this, sourceFile));
+        };
+        NodeObject.prototype.getFirstToken = function (sourceFile) {
+            this.assertHasRealPosition();
+            var children = this.getChildren(sourceFile);
+            if (!children.length) {
+                return undefined;
+            }
+            var child = ts.find(children, function (kid) { return kid.kind < 283 /* FirstJSDocNode */ || kid.kind > 305 /* LastJSDocNode */; });
+            return child.kind < 148 /* FirstNode */ ?
+                child :
+                child.getFirstToken(sourceFile);
+        };
+        NodeObject.prototype.getLastToken = function (sourceFile) {
+            this.assertHasRealPosition();
+            var children = this.getChildren(sourceFile);
+            var child = ts.lastOrUndefined(children);
+            if (!child) {
+                return undefined;
+            }
+            return child.kind < 148 /* FirstNode */ ? child : child.getLastToken(sourceFile);
+        };
+        NodeObject.prototype.forEachChild = function (cbNode, cbNodeArray) {
+            return ts.forEachChild(this, cbNode, cbNodeArray);
+        };
+        return NodeObject;
+    }());
+    function createChildren(node, sourceFile) {
+        if (!ts.isNodeKind(node.kind)) {
+            return ts.emptyArray;
+        }
+        var children = [];
+        if (ts.isJSDocCommentContainingNode(node)) {
+            /** Don't add trivia for "tokens" since this is in a comment. */
+            node.forEachChild(function (child) { children.push(child); });
+            return children;
+        }
+        ts.scanner.setText((sourceFile || node.getSourceFile()).text);
+        var pos = node.pos;
+        var processNode = function (child) {
+            addSyntheticNodes(children, pos, child.pos, node);
+            children.push(child);
+            pos = child.end;
+        };
+        var processNodes = function (nodes) {
+            addSyntheticNodes(children, pos, nodes.pos, node);
+            children.push(createSyntaxList(nodes, node));
+            pos = nodes.end;
+        };
+        // jsDocComments need to be the first children
+        ts.forEach(node.jsDoc, processNode);
+        // For syntactic classifications, all trivia are classified together, including jsdoc comments.
+        // For that to work, the jsdoc comments should still be the leading trivia of the first child.
+        // Restoring the scanner position ensures that.
+        pos = node.pos;
+        node.forEachChild(processNode, processNodes);
+        addSyntheticNodes(children, pos, node.end, node);
+        ts.scanner.setText(undefined);
+        return children;
+    }
+    function addSyntheticNodes(nodes, pos, end, parent) {
+        ts.scanner.setTextPos(pos);
+        while (pos < end) {
+            var token = ts.scanner.scan();
+            var textPos = ts.scanner.getTextPos();
+            if (textPos <= end) {
+                if (token === 72 /* Identifier */) {
+                    ts.Debug.fail("Did not expect " + ts.Debug.showSyntaxKind(parent) + " to have an Identifier in its trivia");
+                }
+                nodes.push(createNode(token, pos, textPos, parent));
+            }
+            pos = textPos;
+            if (token === 1 /* EndOfFileToken */) {
+                break;
+            }
+        }
+    }
+    function createSyntaxList(nodes, parent) {
+        var list = createNode(306 /* SyntaxList */, nodes.pos, nodes.end, parent);
+        list._children = [];
+        var pos = nodes.pos;
+        for (var _i = 0, nodes_7 = nodes; _i < nodes_7.length; _i++) {
+            var node = nodes_7[_i];
+            addSyntheticNodes(list._children, pos, node.pos, parent);
+            list._children.push(node);
+            pos = node.end;
+        }
+        addSyntheticNodes(list._children, pos, nodes.end, parent);
+        return list;
+    }
+    var TokenOrIdentifierObject = /** @class */ (function () {
+        function TokenOrIdentifierObject(pos, end) {
+            // Set properties in same order as NodeObject
+            this.pos = pos;
+            this.end = end;
+            this.flags = 0 /* None */;
+            this.parent = undefined;
+        }
+        TokenOrIdentifierObject.prototype.getSourceFile = function () {
+            return ts.getSourceFileOfNode(this);
+        };
+        TokenOrIdentifierObject.prototype.getStart = function (sourceFile, includeJsDocComment) {
+            return ts.getTokenPosOfNode(this, sourceFile, includeJsDocComment);
+        };
+        TokenOrIdentifierObject.prototype.getFullStart = function () {
+            return this.pos;
+        };
+        TokenOrIdentifierObject.prototype.getEnd = function () {
+            return this.end;
+        };
+        TokenOrIdentifierObject.prototype.getWidth = function (sourceFile) {
+            return this.getEnd() - this.getStart(sourceFile);
+        };
+        TokenOrIdentifierObject.prototype.getFullWidth = function () {
+            return this.end - this.pos;
+        };
+        TokenOrIdentifierObject.prototype.getLeadingTriviaWidth = function (sourceFile) {
+            return this.getStart(sourceFile) - this.pos;
+        };
+        TokenOrIdentifierObject.prototype.getFullText = function (sourceFile) {
+            return (sourceFile || this.getSourceFile()).text.substring(this.pos, this.end);
+        };
+        TokenOrIdentifierObject.prototype.getText = function (sourceFile) {
+            if (!sourceFile) {
+                sourceFile = this.getSourceFile();
+            }
+            return sourceFile.text.substring(this.getStart(sourceFile), this.getEnd());
+        };
+        TokenOrIdentifierObject.prototype.getChildCount = function () {
+            return 0;
+        };
+        TokenOrIdentifierObject.prototype.getChildAt = function () {
+            return undefined; // TODO: GH#18217
+        };
+        TokenOrIdentifierObject.prototype.getChildren = function () {
+            return this.kind === 1 /* EndOfFileToken */ ? this.jsDoc || ts.emptyArray : ts.emptyArray;
+        };
+        TokenOrIdentifierObject.prototype.getFirstToken = function () {
+            return undefined;
+        };
+        TokenOrIdentifierObject.prototype.getLastToken = function () {
+            return undefined;
+        };
+        TokenOrIdentifierObject.prototype.forEachChild = function () {
+            return undefined;
+        };
+        return TokenOrIdentifierObject;
+    }());
+    var SymbolObject = /** @class */ (function () {
+        function SymbolObject(flags, name) {
+            this.flags = flags;
+            this.escapedName = name;
+        }
+        SymbolObject.prototype.getFlags = function () {
+            return this.flags;
+        };
+        Object.defineProperty(SymbolObject.prototype, "name", {
+            get: function () {
+                return ts.symbolName(this);
+            },
+            enumerable: true,
+            configurable: true
+        });
+        SymbolObject.prototype.getEscapedName = function () {
+            return this.escapedName;
+        };
+        SymbolObject.prototype.getName = function () {
+            return this.name;
+        };
+        SymbolObject.prototype.getDeclarations = function () {
+            return this.declarations;
+        };
+        SymbolObject.prototype.getDocumentationComment = function (checker) {
+            if (!this.documentationComment) {
+                this.documentationComment = ts.emptyArray; // Set temporarily to avoid an infinite loop finding inherited docs
+                this.documentationComment = getDocumentationComment(this.declarations, checker);
+            }
+            return this.documentationComment;
+        };
+        SymbolObject.prototype.getJsDocTags = function () {
+            if (this.tags === undefined) {
+                this.tags = ts.JsDoc.getJsDocTagsFromDeclarations(this.declarations);
+            }
+            return this.tags;
+        };
+        return SymbolObject;
+    }());
+    var TokenObject = /** @class */ (function (_super) {
+        __extends(TokenObject, _super);
+        function TokenObject(kind, pos, end) {
+            var _this = _super.call(this, pos, end) || this;
+            _this.kind = kind;
+            return _this;
+        }
+        return TokenObject;
+    }(TokenOrIdentifierObject));
+    var IdentifierObject = /** @class */ (function (_super) {
+        __extends(IdentifierObject, _super);
+        function IdentifierObject(_kind, pos, end) {
+            return _super.call(this, pos, end) || this;
+        }
+        Object.defineProperty(IdentifierObject.prototype, "text", {
+            get: function () {
+                return ts.idText(this);
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return IdentifierObject;
+    }(TokenOrIdentifierObject));
+    IdentifierObject.prototype.kind = 72 /* Identifier */;
+    var TypeObject = /** @class */ (function () {
+        function TypeObject(checker, flags) {
+            this.checker = checker;
+            this.flags = flags;
+        }
+        TypeObject.prototype.getFlags = function () {
+            return this.flags;
+        };
+        TypeObject.prototype.getSymbol = function () {
+            return this.symbol;
+        };
+        TypeObject.prototype.getProperties = function () {
+            return this.checker.getPropertiesOfType(this);
+        };
+        TypeObject.prototype.getProperty = function (propertyName) {
+            return this.checker.getPropertyOfType(this, propertyName);
+        };
+        TypeObject.prototype.getApparentProperties = function () {
+            return this.checker.getAugmentedPropertiesOfType(this);
+        };
+        TypeObject.prototype.getCallSignatures = function () {
+            return this.checker.getSignaturesOfType(this, 0 /* Call */);
+        };
+        TypeObject.prototype.getConstructSignatures = function () {
+            return this.checker.getSignaturesOfType(this, 1 /* Construct */);
+        };
+        TypeObject.prototype.getStringIndexType = function () {
+            return this.checker.getIndexTypeOfType(this, 0 /* String */);
+        };
+        TypeObject.prototype.getNumberIndexType = function () {
+            return this.checker.getIndexTypeOfType(this, 1 /* Number */);
+        };
+        TypeObject.prototype.getBaseTypes = function () {
+            return this.isClassOrInterface() ? this.checker.getBaseTypes(this) : undefined;
+        };
+        TypeObject.prototype.getNonNullableType = function () {
+            return this.checker.getNonNullableType(this);
+        };
+        TypeObject.prototype.getConstraint = function () {
+            return this.checker.getBaseConstraintOfType(this);
+        };
+        TypeObject.prototype.getDefault = function () {
+            return this.checker.getDefaultFromTypeParameter(this);
+        };
+        TypeObject.prototype.isUnion = function () {
+            return !!(this.flags & 1048576 /* Union */);
+        };
+        TypeObject.prototype.isIntersection = function () {
+            return !!(this.flags & 2097152 /* Intersection */);
+        };
+        TypeObject.prototype.isUnionOrIntersection = function () {
+            return !!(this.flags & 3145728 /* UnionOrIntersection */);
+        };
+        TypeObject.prototype.isLiteral = function () {
+            return !!(this.flags & 384 /* StringOrNumberLiteral */);
+        };
+        TypeObject.prototype.isStringLiteral = function () {
+            return !!(this.flags & 128 /* StringLiteral */);
+        };
+        TypeObject.prototype.isNumberLiteral = function () {
+            return !!(this.flags & 256 /* NumberLiteral */);
+        };
+        TypeObject.prototype.isTypeParameter = function () {
+            return !!(this.flags & 262144 /* TypeParameter */);
+        };
+        TypeObject.prototype.isClassOrInterface = function () {
+            return !!(ts.getObjectFlags(this) & 3 /* ClassOrInterface */);
+        };
+        TypeObject.prototype.isClass = function () {
+            return !!(ts.getObjectFlags(this) & 1 /* Class */);
+        };
+        return TypeObject;
+    }());
+    var SignatureObject = /** @class */ (function () {
+        function SignatureObject(checker) {
+            this.checker = checker;
+        }
+        SignatureObject.prototype.getDeclaration = function () {
+            return this.declaration;
+        };
+        SignatureObject.prototype.getTypeParameters = function () {
+            return this.typeParameters;
+        };
+        SignatureObject.prototype.getParameters = function () {
+            return this.parameters;
+        };
+        SignatureObject.prototype.getReturnType = function () {
+            return this.checker.getReturnTypeOfSignature(this);
+        };
+        SignatureObject.prototype.getDocumentationComment = function () {
+            return this.documentationComment || (this.documentationComment = getDocumentationComment(ts.singleElementArray(this.declaration), this.checker));
+        };
+        SignatureObject.prototype.getJsDocTags = function () {
+            if (this.jsDocTags === undefined) {
+                this.jsDocTags = this.declaration ? ts.JsDoc.getJsDocTagsFromDeclarations([this.declaration]) : [];
+            }
+            return this.jsDocTags;
+        };
+        return SignatureObject;
+    }());
+    /**
+     * Returns whether or not the given node has a JSDoc "inheritDoc" tag on it.
+     * @param node the Node in question.
+     * @returns `true` if `node` has a JSDoc "inheritDoc" tag on it, otherwise `false`.
+     */
+    function hasJSDocInheritDocTag(node) {
+        return ts.getJSDocTags(node).some(function (tag) { return tag.tagName.text === "inheritDoc"; });
+    }
+    function getDocumentationComment(declarations, checker) {
+        if (!declarations)
+            return ts.emptyArray;
+        var doc = ts.JsDoc.getJsDocCommentsFromDeclarations(declarations);
+        if (doc.length === 0 || declarations.some(hasJSDocInheritDocTag)) {
+            for (var _i = 0, declarations_14 = declarations; _i < declarations_14.length; _i++) {
+                var declaration = declarations_14[_i];
+                var inheritedDocs = findInheritedJSDocComments(declaration, declaration.symbol.name, checker); // TODO: GH#18217
+                // TODO: GH#16312 Return a ReadonlyArray, avoid copying inheritedDocs
+                if (inheritedDocs)
+                    doc = doc.length === 0 ? inheritedDocs.slice() : inheritedDocs.concat(ts.lineBreakPart(), doc);
+            }
+        }
+        return doc;
+    }
+    /**
+     * Attempts to find JSDoc comments for possibly-inherited properties.  Checks superclasses then traverses
+     * implemented interfaces until a symbol is found with the same name and with documentation.
+     * @param declaration The possibly-inherited declaration to find comments for.
+     * @param propertyName The name of the possibly-inherited property.
+     * @param typeChecker A TypeChecker, used to find inherited properties.
+     * @returns A filled array of documentation comments if any were found, otherwise an empty array.
+     */
+    function findInheritedJSDocComments(declaration, propertyName, typeChecker) {
+        return ts.firstDefined(declaration.parent ? ts.getAllSuperTypeNodes(declaration.parent) : ts.emptyArray, function (superTypeNode) {
+            var superType = typeChecker.getTypeAtLocation(superTypeNode);
+            var baseProperty = superType && typeChecker.getPropertyOfType(superType, propertyName);
+            var inheritedDocs = baseProperty && baseProperty.getDocumentationComment(typeChecker);
+            return inheritedDocs && inheritedDocs.length ? inheritedDocs : undefined;
+        });
+    }
+    var SourceFileObject = /** @class */ (function (_super) {
+        __extends(SourceFileObject, _super);
+        function SourceFileObject(kind, pos, end) {
+            return _super.call(this, kind, pos, end) || this;
+        }
+        SourceFileObject.prototype.update = function (newText, textChangeRange) {
+            return ts.updateSourceFile(this, newText, textChangeRange);
+        };
+        SourceFileObject.prototype.getLineAndCharacterOfPosition = function (position) {
+            return ts.getLineAndCharacterOfPosition(this, position);
+        };
+        SourceFileObject.prototype.getLineStarts = function () {
+            return ts.getLineStarts(this);
+        };
+        SourceFileObject.prototype.getPositionOfLineAndCharacter = function (line, character, allowEdits) {
+            return ts.computePositionOfLineAndCharacter(ts.getLineStarts(this), line, character, this.text, allowEdits);
+        };
+        SourceFileObject.prototype.getLineEndOfPosition = function (pos) {
+            var line = this.getLineAndCharacterOfPosition(pos).line;
+            var lineStarts = this.getLineStarts();
+            var lastCharPos;
+            if (line + 1 >= lineStarts.length) {
+                lastCharPos = this.getEnd();
+            }
+            if (!lastCharPos) {
+                lastCharPos = lineStarts[line + 1] - 1;
+            }
+            var fullText = this.getFullText();
+            // if the new line is "\r\n", we should return the last non-new-line-character position
+            return fullText[lastCharPos] === "\n" && fullText[lastCharPos - 1] === "\r" ? lastCharPos - 1 : lastCharPos;
+        };
+        SourceFileObject.prototype.getNamedDeclarations = function () {
+            if (!this.namedDeclarations) {
+                this.namedDeclarations = this.computeNamedDeclarations();
+            }
+            return this.namedDeclarations;
+        };
+        SourceFileObject.prototype.computeNamedDeclarations = function () {
+            var result = ts.createMultiMap();
+            this.forEachChild(visit);
+            return result;
+            function addDeclaration(declaration) {
+                var name = getDeclarationName(declaration);
+                if (name) {
+                    result.add(name, declaration);
+                }
+            }
+            function getDeclarations(name) {
+                var declarations = result.get(name);
+                if (!declarations) {
+                    result.set(name, declarations = []);
+                }
+                return declarations;
+            }
+            function getDeclarationName(declaration) {
+                var name = ts.getNonAssignedNameOfDeclaration(declaration);
+                return name && (ts.isComputedPropertyName(name) && ts.isPropertyAccessExpression(name.expression) ? name.expression.name.text
+                    : ts.isPropertyName(name) ? ts.getNameFromPropertyName(name) : undefined);
+            }
+            function visit(node) {
+                switch (node.kind) {
+                    case 239 /* FunctionDeclaration */:
+                    case 196 /* FunctionExpression */:
+                    case 156 /* MethodDeclaration */:
+                    case 155 /* MethodSignature */:
+                        var functionDeclaration = node;
+                        var declarationName = getDeclarationName(functionDeclaration);
+                        if (declarationName) {
+                            var declarations = getDeclarations(declarationName);
+                            var lastDeclaration = ts.lastOrUndefined(declarations);
+                            // Check whether this declaration belongs to an "overload group".
+                            if (lastDeclaration && functionDeclaration.parent === lastDeclaration.parent && functionDeclaration.symbol === lastDeclaration.symbol) {
+                                // Overwrite the last declaration if it was an overload
+                                // and this one is an implementation.
+                                if (functionDeclaration.body && !lastDeclaration.body) {
+                                    declarations[declarations.length - 1] = functionDeclaration;
+                                }
+                            }
+                            else {
+                                declarations.push(functionDeclaration);
+                            }
+                        }
+                        ts.forEachChild(node, visit);
+                        break;
+                    case 240 /* ClassDeclaration */:
+                    case 209 /* ClassExpression */:
+                    case 241 /* InterfaceDeclaration */:
+                    case 242 /* TypeAliasDeclaration */:
+                    case 243 /* EnumDeclaration */:
+                    case 244 /* ModuleDeclaration */:
+                    case 248 /* ImportEqualsDeclaration */:
+                    case 257 /* ExportSpecifier */:
+                    case 253 /* ImportSpecifier */:
+                    case 250 /* ImportClause */:
+                    case 251 /* NamespaceImport */:
+                    case 158 /* GetAccessor */:
+                    case 159 /* SetAccessor */:
+                    case 168 /* TypeLiteral */:
+                        addDeclaration(node);
+                        ts.forEachChild(node, visit);
+                        break;
+                    case 151 /* Parameter */:
+                        // Only consider parameter properties
+                        if (!ts.hasModifier(node, 92 /* ParameterPropertyModifier */)) {
+                            break;
+                        }
+                    // falls through
+                    case 237 /* VariableDeclaration */:
+                    case 186 /* BindingElement */: {
+                        var decl = node;
+                        if (ts.isBindingPattern(decl.name)) {
+                            ts.forEachChild(decl.name, visit);
+                            break;
+                        }
+                        if (decl.initializer) {
+                            visit(decl.initializer);
+                        }
+                    }
+                    // falls through
+                    case 278 /* EnumMember */:
+                    case 154 /* PropertyDeclaration */:
+                    case 153 /* PropertySignature */:
+                        addDeclaration(node);
+                        break;
+                    case 255 /* ExportDeclaration */:
+                        // Handle named exports case e.g.:
+                        //    export {a, b as B} from "mod";
+                        if (node.exportClause) {
+                            ts.forEach(node.exportClause.elements, visit);
+                        }
+                        break;
+                    case 249 /* ImportDeclaration */:
+                        var importClause = node.importClause;
+                        if (importClause) {
+                            // Handle default import case e.g.:
+                            //    import d from "mod";
+                            if (importClause.name) {
+                                addDeclaration(importClause.name);
+                            }
+                            // Handle named bindings in imports e.g.:
+                            //    import * as NS from "mod";
+                            //    import {a, b as B} from "mod";
+                            if (importClause.namedBindings) {
+                                if (importClause.namedBindings.kind === 251 /* NamespaceImport */) {
+                                    addDeclaration(importClause.namedBindings);
+                                }
+                                else {
+                                    ts.forEach(importClause.namedBindings.elements, visit);
+                                }
+                            }
+                        }
+                        break;
+                    case 204 /* BinaryExpression */:
+                        if (ts.getAssignmentDeclarationKind(node) !== 0 /* None */) {
+                            addDeclaration(node);
+                        }
+                    // falls through
+                    default:
+                        ts.forEachChild(node, visit);
+                }
+            }
+        };
+        return SourceFileObject;
+    }(NodeObject));
+    var SourceMapSourceObject = /** @class */ (function () {
+        function SourceMapSourceObject(fileName, text, skipTrivia) {
+            this.fileName = fileName;
+            this.text = text;
+            this.skipTrivia = skipTrivia;
+        }
+        SourceMapSourceObject.prototype.getLineAndCharacterOfPosition = function (pos) {
+            return ts.getLineAndCharacterOfPosition(this, pos);
+        };
+        return SourceMapSourceObject;
+    }());
+    function getServicesObjectAllocator() {
+        return {
+            getNodeConstructor: function () { return NodeObject; },
+            getTokenConstructor: function () { return TokenObject; },
+            getIdentifierConstructor: function () { return IdentifierObject; },
+            getSourceFileConstructor: function () { return SourceFileObject; },
+            getSymbolConstructor: function () { return SymbolObject; },
+            getTypeConstructor: function () { return TypeObject; },
+            getSignatureConstructor: function () { return SignatureObject; },
+            getSourceMapSourceConstructor: function () { return SourceMapSourceObject; },
+        };
+    }
+    function toEditorSettings(optionsAsMap) {
+        var allPropertiesAreCamelCased = true;
+        for (var key in optionsAsMap) {
+            if (ts.hasProperty(optionsAsMap, key) && !isCamelCase(key)) {
+                allPropertiesAreCamelCased = false;
+                break;
+            }
+        }
+        if (allPropertiesAreCamelCased) {
+            return optionsAsMap;
+        }
+        var settings = {};
+        for (var key in optionsAsMap) {
+            if (ts.hasProperty(optionsAsMap, key)) {
+                var newKey = isCamelCase(key) ? key : key.charAt(0).toLowerCase() + key.substr(1);
+                settings[newKey] = optionsAsMap[key];
+            }
+        }
+        return settings;
+    }
+    ts.toEditorSettings = toEditorSettings;
+    function isCamelCase(s) {
+        return !s.length || s.charAt(0) === s.charAt(0).toLowerCase();
+    }
+    function displayPartsToString(displayParts) {
+        if (displayParts) {
+            return ts.map(displayParts, function (displayPart) { return displayPart.text; }).join("");
+        }
+        return "";
+    }
+    ts.displayPartsToString = displayPartsToString;
+    function getDefaultCompilerOptions() {
+        // Always default to "ScriptTarget.ES5" for the language service
+        return {
+            target: 1 /* ES5 */,
+            jsx: 1 /* Preserve */
+        };
+    }
+    ts.getDefaultCompilerOptions = getDefaultCompilerOptions;
+    function getSupportedCodeFixes() {
+        return ts.codefix.getSupportedErrorCodes();
+    }
+    ts.getSupportedCodeFixes = getSupportedCodeFixes;
+    // Cache host information about script Should be refreshed
+    // at each language service public entry point, since we don't know when
+    // the set of scripts handled by the host changes.
+    var HostCache = /** @class */ (function () {
+        function HostCache(host, getCanonicalFileName) {
+            this.host = host;
+            // script id => script index
+            this.currentDirectory = host.getCurrentDirectory();
+            this.fileNameToEntry = ts.createMap();
+            // Initialize the list with the root file names
+            var rootFileNames = host.getScriptFileNames();
+            for (var _i = 0, rootFileNames_1 = rootFileNames; _i < rootFileNames_1.length; _i++) {
+                var fileName = rootFileNames_1[_i];
+                this.createEntry(fileName, ts.toPath(fileName, this.currentDirectory, getCanonicalFileName));
+            }
+            // store the compilation settings
+            this._compilationSettings = host.getCompilationSettings() || getDefaultCompilerOptions();
+        }
+        HostCache.prototype.compilationSettings = function () {
+            return this._compilationSettings;
+        };
+        HostCache.prototype.getProjectReferences = function () {
+            return this.host.getProjectReferences && this.host.getProjectReferences();
+        };
+        HostCache.prototype.createEntry = function (fileName, path) {
+            var entry;
+            var scriptSnapshot = this.host.getScriptSnapshot(fileName);
+            if (scriptSnapshot) {
+                entry = {
+                    hostFileName: fileName,
+                    version: this.host.getScriptVersion(fileName),
+                    scriptSnapshot: scriptSnapshot,
+                    scriptKind: ts.getScriptKind(fileName, this.host)
+                };
+            }
+            else {
+                entry = fileName;
+            }
+            this.fileNameToEntry.set(path, entry);
+            return entry;
+        };
+        HostCache.prototype.getEntryByPath = function (path) {
+            return this.fileNameToEntry.get(path);
+        };
+        HostCache.prototype.getHostFileInformation = function (path) {
+            var entry = this.fileNameToEntry.get(path);
+            return !ts.isString(entry) ? entry : undefined;
+        };
+        HostCache.prototype.getOrCreateEntryByPath = function (fileName, path) {
+            var info = this.getEntryByPath(path) || this.createEntry(fileName, path);
+            return ts.isString(info) ? undefined : info; // TODO: GH#18217
+        };
+        HostCache.prototype.getRootFileNames = function () {
+            var names = [];
+            this.fileNameToEntry.forEach(function (entry) {
+                if (ts.isString(entry)) {
+                    names.push(entry);
+                }
+                else {
+                    if (entry.scriptKind !== 6 /* JSON */) {
+                        names.push(entry.hostFileName);
+                    }
+                }
+            });
+            return names;
+        };
+        HostCache.prototype.getVersion = function (path) {
+            var file = this.getHostFileInformation(path);
+            return (file && file.version); // TODO: GH#18217
+        };
+        HostCache.prototype.getScriptSnapshot = function (path) {
+            var file = this.getHostFileInformation(path);
+            return (file && file.scriptSnapshot); // TODO: GH#18217
+        };
+        return HostCache;
+    }());
+    var SyntaxTreeCache = /** @class */ (function () {
+        function SyntaxTreeCache(host) {
+            this.host = host;
+        }
+        SyntaxTreeCache.prototype.getCurrentSourceFile = function (fileName) {
+            var scriptSnapshot = this.host.getScriptSnapshot(fileName);
+            if (!scriptSnapshot) {
+                // The host does not know about this file.
+                throw new Error("Could not find file: '" + fileName + "'.");
+            }
+            var scriptKind = ts.getScriptKind(fileName, this.host);
+            var version = this.host.getScriptVersion(fileName);
+            var sourceFile;
+            if (this.currentFileName !== fileName) {
+                // This is a new file, just parse it
+                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 6 /* Latest */, version, /*setNodeParents*/ true, scriptKind);
+            }
+            else if (this.currentFileVersion !== version) {
+                // This is the same file, just a newer version. Incrementally parse the file.
+                var editRange = scriptSnapshot.getChangeRange(this.currentFileScriptSnapshot);
+                sourceFile = updateLanguageServiceSourceFile(this.currentSourceFile, scriptSnapshot, version, editRange);
+            }
+            if (sourceFile) {
+                // All done, ensure state is up to date
+                this.currentFileVersion = version;
+                this.currentFileName = fileName;
+                this.currentFileScriptSnapshot = scriptSnapshot;
+                this.currentSourceFile = sourceFile;
+            }
+            return this.currentSourceFile;
+        };
+        return SyntaxTreeCache;
+    }());
+    function setSourceFileFields(sourceFile, scriptSnapshot, version) {
+        sourceFile.version = version;
+        sourceFile.scriptSnapshot = scriptSnapshot;
+    }
+    function createLanguageServiceSourceFile(fileName, scriptSnapshot, scriptTarget, version, setNodeParents, scriptKind) {
+        var sourceFile = ts.createSourceFile(fileName, ts.getSnapshotText(scriptSnapshot), scriptTarget, setNodeParents, scriptKind);
+        setSourceFileFields(sourceFile, scriptSnapshot, version);
+        return sourceFile;
+    }
+    ts.createLanguageServiceSourceFile = createLanguageServiceSourceFile;
+    ts.disableIncrementalParsing = false;
+    function updateLanguageServiceSourceFile(sourceFile, scriptSnapshot, version, textChangeRange, aggressiveChecks) {
+        // If we were given a text change range, and our version or open-ness changed, then
+        // incrementally parse this file.
+        if (textChangeRange) {
+            if (version !== sourceFile.version) {
+                // Once incremental parsing is ready, then just call into this function.
+                if (!ts.disableIncrementalParsing) {
+                    var newText = void 0;
+                    // grab the fragment from the beginning of the original text to the beginning of the span
+                    var prefix = textChangeRange.span.start !== 0
+                        ? sourceFile.text.substr(0, textChangeRange.span.start)
+                        : "";
+                    // grab the fragment from the end of the span till the end of the original text
+                    var suffix = ts.textSpanEnd(textChangeRange.span) !== sourceFile.text.length
+                        ? sourceFile.text.substr(ts.textSpanEnd(textChangeRange.span))
+                        : "";
+                    if (textChangeRange.newLength === 0) {
+                        // edit was a deletion - just combine prefix and suffix
+                        newText = prefix && suffix ? prefix + suffix : prefix || suffix;
+                    }
+                    else {
+                        // it was actual edit, fetch the fragment of new text that correspond to new span
+                        var changedText = scriptSnapshot.getText(textChangeRange.span.start, textChangeRange.span.start + textChangeRange.newLength);
+                        // combine prefix, changed text and suffix
+                        newText = prefix && suffix
+                            ? prefix + changedText + suffix
+                            : prefix
+                                ? (prefix + changedText)
+                                : (changedText + suffix);
+                    }
+                    var newSourceFile = ts.updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks);
+                    setSourceFileFields(newSourceFile, scriptSnapshot, version);
+                    // after incremental parsing nameTable might not be up-to-date
+                    // drop it so it can be lazily recreated later
+                    newSourceFile.nameTable = undefined;
+                    // dispose all resources held by old script snapshot
+                    if (sourceFile !== newSourceFile && sourceFile.scriptSnapshot) {
+                        if (sourceFile.scriptSnapshot.dispose) {
+                            sourceFile.scriptSnapshot.dispose();
+                        }
+                        sourceFile.scriptSnapshot = undefined;
+                    }
+                    return newSourceFile;
+                }
+            }
+        }
+        // Otherwise, just create a new source file.
+        return createLanguageServiceSourceFile(sourceFile.fileName, scriptSnapshot, sourceFile.languageVersion, version, /*setNodeParents*/ true, sourceFile.scriptKind);
+    }
+    ts.updateLanguageServiceSourceFile = updateLanguageServiceSourceFile;
+    var CancellationTokenObject = /** @class */ (function () {
+        function CancellationTokenObject(cancellationToken) {
+            this.cancellationToken = cancellationToken;
+        }
+        CancellationTokenObject.prototype.isCancellationRequested = function () {
+            return !!this.cancellationToken && this.cancellationToken.isCancellationRequested();
+        };
+        CancellationTokenObject.prototype.throwIfCancellationRequested = function () {
+            if (this.isCancellationRequested()) {
+                throw new ts.OperationCanceledException();
+            }
+        };
+        return CancellationTokenObject;
+    }());
+    /* @internal */
+    /** A cancellation that throttles calls to the host */
+    var ThrottledCancellationToken = /** @class */ (function () {
+        function ThrottledCancellationToken(hostCancellationToken, throttleWaitMilliseconds) {
+            if (throttleWaitMilliseconds === void 0) { throttleWaitMilliseconds = 20; }
+            this.hostCancellationToken = hostCancellationToken;
+            this.throttleWaitMilliseconds = throttleWaitMilliseconds;
+            // Store when we last tried to cancel.  Checking cancellation can be expensive (as we have
+            // to marshall over to the host layer).  So we only bother actually checking once enough
+            // time has passed.
+            this.lastCancellationCheckTime = 0;
+        }
+        ThrottledCancellationToken.prototype.isCancellationRequested = function () {
+            var time = ts.timestamp();
+            var duration = Math.abs(time - this.lastCancellationCheckTime);
+            if (duration >= this.throttleWaitMilliseconds) {
+                // Check no more than once every throttle wait milliseconds
+                this.lastCancellationCheckTime = time;
+                return this.hostCancellationToken.isCancellationRequested();
+            }
+            return false;
+        };
+        ThrottledCancellationToken.prototype.throwIfCancellationRequested = function () {
+            if (this.isCancellationRequested()) {
+                throw new ts.OperationCanceledException();
+            }
+        };
+        return ThrottledCancellationToken;
+    }());
+    ts.ThrottledCancellationToken = ThrottledCancellationToken;
+    function createLanguageService(host, documentRegistry, syntaxOnly) {
+        if (documentRegistry === void 0) { documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory()); }
+        if (syntaxOnly === void 0) { syntaxOnly = false; }
+        var _a;
+        var syntaxTreeCache = new SyntaxTreeCache(host);
+        var program;
+        var lastProjectVersion;
+        var lastTypesRootVersion = 0;
+        var cancellationToken = new CancellationTokenObject(host.getCancellationToken && host.getCancellationToken());
+        var currentDirectory = host.getCurrentDirectory();
+        // Check if the localized messages json is set, otherwise query the host for it
+        if (!ts.localizedDiagnosticMessages && host.getLocalizedDiagnosticMessages) {
+            ts.localizedDiagnosticMessages = host.getLocalizedDiagnosticMessages();
+        }
+        function log(message) {
+            if (host.log) {
+                host.log(message);
+            }
+        }
+        var useCaseSensitiveFileNames = ts.hostUsesCaseSensitiveFileNames(host);
+        var getCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
+        var sourceMapper = ts.getSourceMapper({
+            useCaseSensitiveFileNames: function () { return useCaseSensitiveFileNames; },
+            getCurrentDirectory: function () { return currentDirectory; },
+            getProgram: getProgram,
+            fileExists: host.fileExists && (function (f) { return host.fileExists(f); }),
+            readFile: host.readFile && (function (f, encoding) { return host.readFile(f, encoding); }),
+            getDocumentPositionMapper: host.getDocumentPositionMapper && (function (generatedFileName, sourceFileName) { return host.getDocumentPositionMapper(generatedFileName, sourceFileName); }),
+            getSourceFileLike: host.getSourceFileLike && (function (f) { return host.getSourceFileLike(f); }),
+            log: log
+        });
+        function getValidSourceFile(fileName) {
+            var sourceFile = program.getSourceFile(fileName);
+            if (!sourceFile) {
+                throw new Error("Could not find file: '" + fileName + "'.");
+            }
+            return sourceFile;
+        }
+        function synchronizeHostData() {
+            ts.Debug.assert(!syntaxOnly);
+            // perform fast check if host supports it
+            if (host.getProjectVersion) {
+                var hostProjectVersion = host.getProjectVersion();
+                if (hostProjectVersion) {
+                    if (lastProjectVersion === hostProjectVersion && !host.hasChangedAutomaticTypeDirectiveNames) {
+                        return;
+                    }
+                    lastProjectVersion = hostProjectVersion;
+                }
+            }
+            var typeRootsVersion = host.getTypeRootsVersion ? host.getTypeRootsVersion() : 0;
+            if (lastTypesRootVersion !== typeRootsVersion) {
+                log("TypeRoots version has changed; provide new program");
+                program = undefined; // TODO: GH#18217
+                lastTypesRootVersion = typeRootsVersion;
+            }
+            // Get a fresh cache of the host information
+            var hostCache = new HostCache(host, getCanonicalFileName);
+            var rootFileNames = hostCache.getRootFileNames();
+            var hasInvalidatedResolution = host.hasInvalidatedResolution || ts.returnFalse;
+            var projectReferences = hostCache.getProjectReferences();
+            // If the program is already up-to-date, we can reuse it
+            if (ts.isProgramUptoDate(program, rootFileNames, hostCache.compilationSettings(), function (path) { return hostCache.getVersion(path); }, fileExists, hasInvalidatedResolution, !!host.hasChangedAutomaticTypeDirectiveNames, projectReferences)) {
+                return;
+            }
+            // IMPORTANT - It is critical from this moment onward that we do not check
+            // cancellation tokens.  We are about to mutate source files from a previous program
+            // instance.  If we cancel midway through, we may end up in an inconsistent state where
+            // the program points to old source files that have been invalidated because of
+            // incremental parsing.
+            var newSettings = hostCache.compilationSettings();
+            // Now create a new compiler
+            var compilerHost = {
+                getSourceFile: getOrCreateSourceFile,
+                getSourceFileByPath: getOrCreateSourceFileByPath,
+                getCancellationToken: function () { return cancellationToken; },
+                getCanonicalFileName: getCanonicalFileName,
+                useCaseSensitiveFileNames: function () { return useCaseSensitiveFileNames; },
+                getNewLine: function () { return ts.getNewLineCharacter(newSettings, function () { return ts.getNewLineOrDefaultFromHost(host); }); },
+                getDefaultLibFileName: function (options) { return host.getDefaultLibFileName(options); },
+                writeFile: ts.noop,
+                getCurrentDirectory: function () { return currentDirectory; },
+                fileExists: fileExists,
+                readFile: readFile,
+                realpath: host.realpath && (function (path) { return host.realpath(path); }),
+                directoryExists: function (directoryName) {
+                    return ts.directoryProbablyExists(directoryName, host);
+                },
+                getDirectories: function (path) {
+                    return host.getDirectories ? host.getDirectories(path) : [];
+                },
+                readDirectory: function (path, extensions, exclude, include, depth) {
+                    ts.Debug.assertDefined(host.readDirectory, "'LanguageServiceHost.readDirectory' must be implemented to correctly process 'projectReferences'");
+                    return host.readDirectory(path, extensions, exclude, include, depth);
+                },
+                onReleaseOldSourceFile: onReleaseOldSourceFile,
+                hasInvalidatedResolution: hasInvalidatedResolution,
+                hasChangedAutomaticTypeDirectiveNames: host.hasChangedAutomaticTypeDirectiveNames
+            };
+            if (host.trace) {
+                compilerHost.trace = function (message) { return host.trace(message); };
+            }
+            if (host.resolveModuleNames) {
+                compilerHost.resolveModuleNames = function (moduleNames, containingFile, reusedNames, redirectedReference) { return host.resolveModuleNames(moduleNames, containingFile, reusedNames, redirectedReference); };
+            }
+            if (host.resolveTypeReferenceDirectives) {
+                compilerHost.resolveTypeReferenceDirectives = function (typeReferenceDirectiveNames, containingFile, redirectedReference) {
+                    return host.resolveTypeReferenceDirectives(typeReferenceDirectiveNames, containingFile, redirectedReference);
+                };
+            }
+            var documentRegistryBucketKey = documentRegistry.getKeyForCompilationSettings(newSettings);
+            var options = {
+                rootNames: rootFileNames,
+                options: newSettings,
+                host: compilerHost,
+                oldProgram: program,
+                projectReferences: projectReferences
+            };
+            program = ts.createProgram(options);
+            // hostCache is captured in the closure for 'getOrCreateSourceFile' but it should not be used past this point.
+            // It needs to be cleared to allow all collected snapshots to be released
+            hostCache = undefined;
+            // We reset this cache on structure invalidation so we don't hold on to outdated files for long; however we can't use the `compilerHost` above,
+            // Because it only functions until `hostCache` is cleared, while we'll potentially need the functionality to lazily read sourcemap files during
+            // the course of whatever called `synchronizeHostData`
+            sourceMapper.clearCache();
+            // Make sure all the nodes in the program are both bound, and have their parent
+            // pointers set property.
+            program.getTypeChecker();
+            return;
+            function fileExists(fileName) {
+                var path = ts.toPath(fileName, currentDirectory, getCanonicalFileName);
+                var entry = hostCache && hostCache.getEntryByPath(path);
+                return entry ?
+                    !ts.isString(entry) :
+                    (!!host.fileExists && host.fileExists(fileName));
+            }
+            function readFile(fileName) {
+                // stub missing host functionality
+                var path = ts.toPath(fileName, currentDirectory, getCanonicalFileName);
+                var entry = hostCache && hostCache.getEntryByPath(path);
+                if (entry) {
+                    return ts.isString(entry) ? undefined : ts.getSnapshotText(entry.scriptSnapshot);
+                }
+                return host.readFile && host.readFile(fileName);
+            }
+            // Release any files we have acquired in the old program but are
+            // not part of the new program.
+            function onReleaseOldSourceFile(oldSourceFile, oldOptions) {
+                var oldSettingsKey = documentRegistry.getKeyForCompilationSettings(oldOptions);
+                documentRegistry.releaseDocumentWithKey(oldSourceFile.resolvedPath, oldSettingsKey);
+            }
+            function getOrCreateSourceFile(fileName, languageVersion, onError, shouldCreateNewSourceFile) {
+                return getOrCreateSourceFileByPath(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), languageVersion, onError, shouldCreateNewSourceFile);
+            }
+            function getOrCreateSourceFileByPath(fileName, path, _languageVersion, _onError, shouldCreateNewSourceFile) {
+                ts.Debug.assert(hostCache !== undefined, "getOrCreateSourceFileByPath called after typical CompilerHost lifetime, check the callstack something with a reference to an old host.");
+                // The program is asking for this file, check first if the host can locate it.
+                // If the host can not locate the file, then it does not exist. return undefined
+                // to the program to allow reporting of errors for missing files.
+                var hostFileInformation = hostCache && hostCache.getOrCreateEntryByPath(fileName, path);
+                if (!hostFileInformation) {
+                    return undefined;
+                }
+                // Check if the language version has changed since we last created a program; if they are the same,
+                // it is safe to reuse the sourceFiles; if not, then the shape of the AST can change, and the oldSourceFile
+                // can not be reused. we have to dump all syntax trees and create new ones.
+                if (!shouldCreateNewSourceFile) {
+                    // Check if the old program had this file already
+                    var oldSourceFile = program && program.getSourceFileByPath(path);
+                    if (oldSourceFile) {
+                        // We already had a source file for this file name.  Go to the registry to
+                        // ensure that we get the right up to date version of it.  We need this to
+                        // address the following race-condition.  Specifically, say we have the following:
+                        //
+                        //      LS1
+                        //          \
+                        //           DocumentRegistry
+                        //          /
+                        //      LS2
+                        //
+                        // Each LS has a reference to file 'foo.ts' at version 1.  LS2 then updates
+                        // it's version of 'foo.ts' to version 2.  This will cause LS2 and the
+                        // DocumentRegistry to have version 2 of the document.  HOwever, LS1 will
+                        // have version 1.  And *importantly* this source file will be *corrupt*.
+                        // The act of creating version 2 of the file irrevocably damages the version
+                        // 1 file.
+                        //
+                        // So, later when we call into LS1, we need to make sure that it doesn't use
+                        // it's source file any more, and instead defers to DocumentRegistry to get
+                        // either version 1, version 2 (or some other version) depending on what the
+                        // host says should be used.
+                        // We do not support the scenario where a host can modify a registered
+                        // file's script kind, i.e. in one project some file is treated as ".ts"
+                        // and in another as ".js"
+                        ts.Debug.assertEqual(hostFileInformation.scriptKind, oldSourceFile.scriptKind, "Registered script kind should match new script kind.", path);
+                        return documentRegistry.updateDocumentWithKey(fileName, path, newSettings, documentRegistryBucketKey, hostFileInformation.scriptSnapshot, hostFileInformation.version, hostFileInformation.scriptKind);
+                    }
+                    // We didn't already have the file.  Fall through and acquire it from the registry.
+                }
+                // Could not find this file in the old program, create a new SourceFile for it.
+                return documentRegistry.acquireDocumentWithKey(fileName, path, newSettings, documentRegistryBucketKey, hostFileInformation.scriptSnapshot, hostFileInformation.version, hostFileInformation.scriptKind);
+            }
+        }
+        // TODO: GH#18217 frequently asserted as defined
+        function getProgram() {
+            if (syntaxOnly) {
+                ts.Debug.assert(program === undefined);
+                return undefined;
+            }
+            synchronizeHostData();
+            return program;
+        }
+        function cleanupSemanticCache() {
+            program = undefined; // TODO: GH#18217
+        }
+        function dispose() {
+            if (program) {
+                ts.forEach(program.getSourceFiles(), function (f) {
+                    return documentRegistry.releaseDocument(f.fileName, program.getCompilerOptions());
+                });
+                program = undefined; // TODO: GH#18217
+            }
+            host = undefined;
+        }
+        /// Diagnostics
+        function getSyntacticDiagnostics(fileName) {
+            synchronizeHostData();
+            return program.getSyntacticDiagnostics(getValidSourceFile(fileName), cancellationToken).slice();
+        }
+        /**
+         * getSemanticDiagnostics return array of Diagnostics. If '-d' is not enabled, only report semantic errors
+         * If '-d' enabled, report both semantic and emitter errors
+         */
+        function getSemanticDiagnostics(fileName) {
+            synchronizeHostData();
+            var targetSourceFile = getValidSourceFile(fileName);
+            // Only perform the action per file regardless of '-out' flag as LanguageServiceHost is expected to call this function per file.
+            // Therefore only get diagnostics for given file.
+            var semanticDiagnostics = program.getSemanticDiagnostics(targetSourceFile, cancellationToken);
+            if (!ts.getEmitDeclarations(program.getCompilerOptions())) {
+                return semanticDiagnostics.slice();
+            }
+            // If '-d' is enabled, check for emitter error. One example of emitter error is export class implements non-export interface
+            var declarationDiagnostics = program.getDeclarationDiagnostics(targetSourceFile, cancellationToken);
+            return semanticDiagnostics.concat(declarationDiagnostics);
+        }
+        function getSuggestionDiagnostics(fileName) {
+            synchronizeHostData();
+            return ts.computeSuggestionDiagnostics(getValidSourceFile(fileName), program, cancellationToken);
+        }
+        function getCompilerOptionsDiagnostics() {
+            synchronizeHostData();
+            return program.getOptionsDiagnostics(cancellationToken).concat(program.getGlobalDiagnostics(cancellationToken));
+        }
+        function getCompletionsAtPosition(fileName, position, options) {
+            if (options === void 0) { options = ts.emptyOptions; }
+            // Convert from deprecated options names to new names
+            var fullPreferences = __assign({}, ts.identity(options), { includeCompletionsForModuleExports: options.includeCompletionsForModuleExports || options.includeExternalModuleExports, includeCompletionsWithInsertText: options.includeCompletionsWithInsertText || options.includeInsertTextCompletions });
+            synchronizeHostData();
+            return ts.Completions.getCompletionsAtPosition(host, program, log, getValidSourceFile(fileName), position, fullPreferences, options.triggerCharacter);
+        }
+        function getCompletionEntryDetails(fileName, position, name, formattingOptions, source, preferences) {
+            if (preferences === void 0) { preferences = ts.emptyOptions; }
+            synchronizeHostData();
+            return ts.Completions.getCompletionEntryDetails(program, log, getValidSourceFile(fileName), position, { name: name, source: source }, host, (formattingOptions && ts.formatting.getFormatContext(formattingOptions)), // TODO: GH#18217
+            preferences, cancellationToken);
+        }
+        function getCompletionEntrySymbol(fileName, position, name, source) {
+            synchronizeHostData();
+            return ts.Completions.getCompletionEntrySymbol(program, log, getValidSourceFile(fileName), position, { name: name, source: source });
+        }
+        function getQuickInfoAtPosition(fileName, position) {
+            synchronizeHostData();
+            var sourceFile = getValidSourceFile(fileName);
+            var node = ts.getTouchingPropertyName(sourceFile, position);
+            if (node === sourceFile) {
+                // Avoid giving quickInfo for the sourceFile as a whole.
+                return undefined;
+            }
+            var typeChecker = program.getTypeChecker();
+            var symbol = getSymbolAtLocationForQuickInfo(node, typeChecker);
+            if (!symbol || typeChecker.isUnknownSymbol(symbol)) {
+                var type_7 = shouldGetType(sourceFile, node, position) ? typeChecker.getTypeAtLocation(node) : undefined;
+                return type_7 && {
+                    kind: "" /* unknown */,
+                    kindModifiers: "" /* none */,
+                    textSpan: ts.createTextSpanFromNode(node, sourceFile),
+                    displayParts: typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) { return ts.typeToDisplayParts(typeChecker, type_7, ts.getContainerNode(node)); }),
+                    documentation: type_7.symbol ? type_7.symbol.getDocumentationComment(typeChecker) : undefined,
+                    tags: type_7.symbol ? type_7.symbol.getJsDocTags() : undefined
+                };
+            }
+            var _a = typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) {
+                return ts.SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, sourceFile, ts.getContainerNode(node), node);
+            }), symbolKind = _a.symbolKind, displayParts = _a.displayParts, documentation = _a.documentation, tags = _a.tags;
+            return {
+                kind: symbolKind,
+                kindModifiers: ts.SymbolDisplay.getSymbolModifiers(symbol),
+                textSpan: ts.createTextSpanFromNode(node, sourceFile),
+                displayParts: displayParts,
+                documentation: documentation,
+                tags: tags,
+            };
+        }
+        function shouldGetType(sourceFile, node, position) {
+            switch (node.kind) {
+                case 72 /* Identifier */:
+                    return !ts.isLabelName(node) && !ts.isTagName(node);
+                case 189 /* PropertyAccessExpression */:
+                case 148 /* QualifiedName */:
+                    // Don't return quickInfo if inside the comment in `a/**/.b`
+                    return !ts.isInComment(sourceFile, position);
+                case 100 /* ThisKeyword */:
+                case 178 /* ThisType */:
+                case 98 /* SuperKeyword */:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+        /// Goto definition
+        function getDefinitionAtPosition(fileName, position) {
+            synchronizeHostData();
+            return ts.GoToDefinition.getDefinitionAtPosition(program, getValidSourceFile(fileName), position);
+        }
+        function getDefinitionAndBoundSpan(fileName, position) {
+            synchronizeHostData();
+            return ts.GoToDefinition.getDefinitionAndBoundSpan(program, getValidSourceFile(fileName), position);
+        }
+        function getTypeDefinitionAtPosition(fileName, position) {
+            synchronizeHostData();
+            return ts.GoToDefinition.getTypeDefinitionAtPosition(program.getTypeChecker(), getValidSourceFile(fileName), position);
+        }
+        /// Goto implementation
+        function getImplementationAtPosition(fileName, position) {
+            synchronizeHostData();
+            return ts.FindAllReferences.getImplementationsAtPosition(program, cancellationToken, program.getSourceFiles(), getValidSourceFile(fileName), position);
+        }
+        /// References and Occurrences
+        function getOccurrencesAtPosition(fileName, position) {
+            return ts.flatMap(getDocumentHighlights(fileName, position, [fileName]), function (entry) { return entry.highlightSpans.map(function (highlightSpan) { return ({
+                fileName: entry.fileName,
+                textSpan: highlightSpan.textSpan,
+                isWriteAccess: highlightSpan.kind === "writtenReference" /* writtenReference */,
+                isDefinition: false,
+                isInString: highlightSpan.isInString,
+            }); }); });
+        }
+        function getDocumentHighlights(fileName, position, filesToSearch) {
+            var normalizedFileName = ts.normalizePath(fileName);
+            ts.Debug.assert(filesToSearch.some(function (f) { return ts.normalizePath(f) === normalizedFileName; }));
+            synchronizeHostData();
+            var sourceFilesToSearch = filesToSearch.map(getValidSourceFile);
+            var sourceFile = getValidSourceFile(fileName);
+            return ts.DocumentHighlights.getDocumentHighlights(program, cancellationToken, sourceFile, position, sourceFilesToSearch);
+        }
+        function findRenameLocations(fileName, position, findInStrings, findInComments, providePrefixAndSuffixTextForRename) {
+            synchronizeHostData();
+            var sourceFile = getValidSourceFile(fileName);
+            var node = ts.getTouchingPropertyName(sourceFile, position);
+            if (ts.isIdentifier(node) && (ts.isJsxOpeningElement(node.parent) || ts.isJsxClosingElement(node.parent)) && ts.isIntrinsicJsxName(node.escapedText)) {
+                var _a = node.parent.parent, openingElement = _a.openingElement, closingElement = _a.closingElement;
+                return [openingElement, closingElement].map(function (node) {
+                    return ({ fileName: sourceFile.fileName, textSpan: ts.createTextSpanFromNode(node.tagName, sourceFile) });
+                });
+            }
+            else {
+                return getReferencesWorker(node, position, { findInStrings: findInStrings, findInComments: findInComments, providePrefixAndSuffixTextForRename: providePrefixAndSuffixTextForRename, isForRename: true }, function (entry, originalNode, checker) { return ts.FindAllReferences.toRenameLocation(entry, originalNode, checker, providePrefixAndSuffixTextForRename || false); });
+            }
+        }
+        function getReferencesAtPosition(fileName, position) {
+            synchronizeHostData();
+            return getReferencesWorker(ts.getTouchingPropertyName(getValidSourceFile(fileName), position), position, {}, ts.FindAllReferences.toReferenceEntry);
+        }
+        function getReferencesWorker(node, position, options, cb) {
+            synchronizeHostData();
+            // Exclude default library when renaming as commonly user don't want to change that file.
+            var sourceFiles = options && options.isForRename
+                ? program.getSourceFiles().filter(function (sourceFile) { return !program.isSourceFileDefaultLibrary(sourceFile); })
+                : program.getSourceFiles();
+            return ts.FindAllReferences.findReferenceOrRenameEntries(program, cancellationToken, sourceFiles, node, position, options, cb);
+        }
+        function findReferences(fileName, position) {
+            synchronizeHostData();
+            return ts.FindAllReferences.findReferencedSymbols(program, cancellationToken, program.getSourceFiles(), getValidSourceFile(fileName), position);
+        }
+        function getNavigateToItems(searchValue, maxResultCount, fileName, excludeDtsFiles) {
+            if (excludeDtsFiles === void 0) { excludeDtsFiles = false; }
+            synchronizeHostData();
+            var sourceFiles = fileName ? [getValidSourceFile(fileName)] : program.getSourceFiles();
+            return ts.NavigateTo.getNavigateToItems(sourceFiles, program.getTypeChecker(), cancellationToken, searchValue, maxResultCount, excludeDtsFiles);
+        }
+        function getEmitOutput(fileName, emitOnlyDtsFiles) {
+            if (emitOnlyDtsFiles === void 0) { emitOnlyDtsFiles = false; }
+            synchronizeHostData();
+            var sourceFile = getValidSourceFile(fileName);
+            var customTransformers = host.getCustomTransformers && host.getCustomTransformers();
+            return ts.getFileEmitOutput(program, sourceFile, emitOnlyDtsFiles, cancellationToken, customTransformers);
+        }
+        // Signature help
+        /**
+         * This is a semantic operation.
+         */
+        function getSignatureHelpItems(fileName, position, _a) {
+            var triggerReason = (_a === void 0 ? ts.emptyOptions : _a).triggerReason;
+            synchronizeHostData();
+            var sourceFile = getValidSourceFile(fileName);
+            return ts.SignatureHelp.getSignatureHelpItems(program, sourceFile, position, triggerReason, cancellationToken);
+        }
+        /// Syntactic features
+        function getNonBoundSourceFile(fileName) {
+            return syntaxTreeCache.getCurrentSourceFile(fileName);
+        }
+        function getNameOrDottedNameSpan(fileName, startPos, _endPos) {
+            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
+            // Get node at the location
+            var node = ts.getTouchingPropertyName(sourceFile, startPos);
+            if (node === sourceFile) {
+                return undefined;
+            }
+            switch (node.kind) {
+                case 189 /* PropertyAccessExpression */:
+                case 148 /* QualifiedName */:
+                case 10 /* StringLiteral */:
+                case 87 /* FalseKeyword */:
+                case 102 /* TrueKeyword */:
+                case 96 /* NullKeyword */:
+                case 98 /* SuperKeyword */:
+                case 100 /* ThisKeyword */:
+                case 178 /* ThisType */:
+                case 72 /* Identifier */:
+                    break;
+                // Cant create the text span
+                default:
+                    return undefined;
+            }
+            var nodeForStartPos = node;
+            while (true) {
+                if (ts.isRightSideOfPropertyAccess(nodeForStartPos) || ts.isRightSideOfQualifiedName(nodeForStartPos)) {
+                    // If on the span is in right side of the the property or qualified name, return the span from the qualified name pos to end of this node
+                    nodeForStartPos = nodeForStartPos.parent;
+                }
+                else if (ts.isNameOfModuleDeclaration(nodeForStartPos)) {
+                    // If this is name of a module declarations, check if this is right side of dotted module name
+                    // If parent of the module declaration which is parent of this node is module declaration and its body is the module declaration that this node is name of
+                    // Then this name is name from dotted module
+                    if (nodeForStartPos.parent.parent.kind === 244 /* ModuleDeclaration */ &&
+                        nodeForStartPos.parent.parent.body === nodeForStartPos.parent) {
+                        // Use parent module declarations name for start pos
+                        nodeForStartPos = nodeForStartPos.parent.parent.name;
+                    }
+                    else {
+                        // We have to use this name for start pos
+                        break;
+                    }
+                }
+                else {
+                    // Is not a member expression so we have found the node for start pos
+                    break;
+                }
+            }
+            return ts.createTextSpanFromBounds(nodeForStartPos.getStart(), node.getEnd());
+        }
+        function getBreakpointStatementAtPosition(fileName, position) {
+            // doesn't use compiler - no need to synchronize with host
+            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
+            return ts.BreakpointResolver.spanInSourceFileAtLocation(sourceFile, position);
+        }
+        function getNavigationBarItems(fileName) {
+            return ts.NavigationBar.getNavigationBarItems(syntaxTreeCache.getCurrentSourceFile(fileName), cancellationToken);
+        }
+        function getNavigationTree(fileName) {
+            return ts.NavigationBar.getNavigationTree(syntaxTreeCache.getCurrentSourceFile(fileName), cancellationToken);
+        }
+        function isTsOrTsxFile(fileName) {
+            var kind = ts.getScriptKind(fileName, host);
+            return kind === 3 /* TS */ || kind === 4 /* TSX */;
+        }
+        function getSemanticClassifications(fileName, span) {
+            if (!isTsOrTsxFile(fileName)) {
+                // do not run semantic classification on non-ts-or-tsx files
+                return [];
+            }
+            synchronizeHostData();
+            return ts.getSemanticClassifications(program.getTypeChecker(), cancellationToken, getValidSourceFile(fileName), program.getClassifiableNames(), span);
+        }
+        function getEncodedSemanticClassifications(fileName, span) {
+            if (!isTsOrTsxFile(fileName)) {
+                // do not run semantic classification on non-ts-or-tsx files
+                return { spans: [], endOfLineState: 0 /* None */ };
+            }
+            synchronizeHostData();
+            return ts.getEncodedSemanticClassifications(program.getTypeChecker(), cancellationToken, getValidSourceFile(fileName), program.getClassifiableNames(), span);
+        }
+        function getSyntacticClassifications(fileName, span) {
+            // doesn't use compiler - no need to synchronize with host
+            return ts.getSyntacticClassifications(cancellationToken, syntaxTreeCache.getCurrentSourceFile(fileName), span);
+        }
+        function getEncodedSyntacticClassifications(fileName, span) {
+            // doesn't use compiler - no need to synchronize with host
+            return ts.getEncodedSyntacticClassifications(cancellationToken, syntaxTreeCache.getCurrentSourceFile(fileName), span);
+        }
+        function getOutliningSpans(fileName) {
+            // doesn't use compiler - no need to synchronize with host
+            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
+            return ts.OutliningElementsCollector.collectElements(sourceFile, cancellationToken);
+        }
+        var braceMatching = ts.createMapFromTemplate((_a = {},
+            _a[18 /* OpenBraceToken */] = 19 /* CloseBraceToken */,
+            _a[20 /* OpenParenToken */] = 21 /* CloseParenToken */,
+            _a[22 /* OpenBracketToken */] = 23 /* CloseBracketToken */,
+            _a[30 /* GreaterThanToken */] = 28 /* LessThanToken */,
+            _a));
+        braceMatching.forEach(function (value, key) { return braceMatching.set(value.toString(), Number(key)); });
+        function getBraceMatchingAtPosition(fileName, position) {
+            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
+            var token = ts.getTouchingToken(sourceFile, position);
+            var matchKind = token.getStart(sourceFile) === position ? braceMatching.get(token.kind.toString()) : undefined;
+            var match = matchKind && ts.findChildOfKind(token.parent, matchKind, sourceFile);
+            // We want to order the braces when we return the result.
+            return match ? [ts.createTextSpanFromNode(token, sourceFile), ts.createTextSpanFromNode(match, sourceFile)].sort(function (a, b) { return a.start - b.start; }) : ts.emptyArray;
+        }
+        function getIndentationAtPosition(fileName, position, editorOptions) {
+            var start = ts.timestamp();
+            var settings = toEditorSettings(editorOptions);
+            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
+            log("getIndentationAtPosition: getCurrentSourceFile: " + (ts.timestamp() - start));
+            start = ts.timestamp();
+            var result = ts.formatting.SmartIndenter.getIndentation(position, sourceFile, settings);
+            log("getIndentationAtPosition: computeIndentation  : " + (ts.timestamp() - start));
+            return result;
+        }
+        function getFormattingEditsForRange(fileName, start, end, options) {
+            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
+            return ts.formatting.formatSelection(start, end, sourceFile, ts.formatting.getFormatContext(toEditorSettings(options)));
+        }
+        function getFormattingEditsForDocument(fileName, options) {
+            return ts.formatting.formatDocument(syntaxTreeCache.getCurrentSourceFile(fileName), ts.formatting.getFormatContext(toEditorSettings(options)));
+        }
+        function getFormattingEditsAfterKeystroke(fileName, position, key, options) {
+            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
+            var formatContext = ts.formatting.getFormatContext(toEditorSettings(options));
+            if (!ts.isInComment(sourceFile, position)) {
+                switch (key) {
+                    case "{":
+                        return ts.formatting.formatOnOpeningCurly(position, sourceFile, formatContext);
+                    case "}":
+                        return ts.formatting.formatOnClosingCurly(position, sourceFile, formatContext);
+                    case ";":
+                        return ts.formatting.formatOnSemicolon(position, sourceFile, formatContext);
+                    case "\n":
+                        return ts.formatting.formatOnEnter(position, sourceFile, formatContext);
+                }
+            }
+            return [];
+        }
+        function getCodeFixesAtPosition(fileName, start, end, errorCodes, formatOptions, preferences) {
+            if (preferences === void 0) { preferences = ts.emptyOptions; }
+            synchronizeHostData();
+            var sourceFile = getValidSourceFile(fileName);
+            var span = ts.createTextSpanFromBounds(start, end);
+            var formatContext = ts.formatting.getFormatContext(formatOptions);
+            return ts.flatMap(ts.deduplicate(errorCodes, ts.equateValues, ts.compareValues), function (errorCode) {
+                cancellationToken.throwIfCancellationRequested();
+                return ts.codefix.getFixes({ errorCode: errorCode, sourceFile: sourceFile, span: span, program: program, host: host, cancellationToken: cancellationToken, formatContext: formatContext, preferences: preferences });
+            });
+        }
+        function getCombinedCodeFix(scope, fixId, formatOptions, preferences) {
+            if (preferences === void 0) { preferences = ts.emptyOptions; }
+            synchronizeHostData();
+            ts.Debug.assert(scope.type === "file");
+            var sourceFile = getValidSourceFile(scope.fileName);
+            var formatContext = ts.formatting.getFormatContext(formatOptions);
+            return ts.codefix.getAllFixes({ fixId: fixId, sourceFile: sourceFile, program: program, host: host, cancellationToken: cancellationToken, formatContext: formatContext, preferences: preferences });
+        }
+        function organizeImports(scope, formatOptions, preferences) {
+            if (preferences === void 0) { preferences = ts.emptyOptions; }
+            synchronizeHostData();
+            ts.Debug.assert(scope.type === "file");
+            var sourceFile = getValidSourceFile(scope.fileName);
+            var formatContext = ts.formatting.getFormatContext(formatOptions);
+            return ts.OrganizeImports.organizeImports(sourceFile, formatContext, host, program, preferences);
+        }
+        function getEditsForFileRename(oldFilePath, newFilePath, formatOptions, preferences) {
+            if (preferences === void 0) { preferences = ts.emptyOptions; }
+            return ts.getEditsForFileRename(getProgram(), oldFilePath, newFilePath, host, ts.formatting.getFormatContext(formatOptions), preferences, sourceMapper);
+        }
+        function applyCodeActionCommand(fileName, actionOrFormatSettingsOrUndefined) {
+            var action = typeof fileName === "string" ? actionOrFormatSettingsOrUndefined : fileName;
+            var formatSettings = typeof fileName !== "string" ? actionOrFormatSettingsOrUndefined : undefined;
+            return ts.isArray(action) ? Promise.all(action.map(function (a) { return applySingleCodeActionCommand(a, formatSettings); })) : applySingleCodeActionCommand(action, formatSettings);
+        }
+        function applySingleCodeActionCommand(action, formatSettings) {
+            var getPath = function (path) { return ts.toPath(path, currentDirectory, getCanonicalFileName); };
+            switch (action.type) {
+                case "install package":
+                    return host.installPackage
+                        ? host.installPackage({ fileName: getPath(action.file), packageName: action.packageName })
+                        : Promise.reject("Host does not implement `installPackage`");
+                case "generate types": {
+                    var fileToGenerateTypesFor = action.fileToGenerateTypesFor, outputFileName_1 = action.outputFileName;
+                    if (!host.inspectValue)
+                        return Promise.reject("Host does not implement `installPackage`");
+                    var valueInfoPromise = host.inspectValue({ fileNameToRequire: fileToGenerateTypesFor });
+                    return valueInfoPromise.then(function (valueInfo) {
+                        var fullOut = getPath(outputFileName_1);
+                        host.writeFile(fullOut, ts.valueInfoToDeclarationFileText(valueInfo, formatSettings || ts.testFormatSettings)); // TODO: GH#18217
+                        return { successMessage: "Wrote types to '" + fullOut + "'" };
+                    });
+                }
+                default:
+                    return ts.Debug.assertNever(action);
+            }
+        }
+        function getDocCommentTemplateAtPosition(fileName, position) {
+            return ts.JsDoc.getDocCommentTemplateAtPosition(ts.getNewLineOrDefaultFromHost(host), syntaxTreeCache.getCurrentSourceFile(fileName), position);
+        }
+        function isValidBraceCompletionAtPosition(fileName, position, openingBrace) {
+            // '<' is currently not supported, figuring out if we're in a Generic Type vs. a comparison is too
+            // expensive to do during typing scenarios
+            // i.e. whether we're dealing with:
+            //      var x = new foo<| ( with class foo<T>{} )
+            // or
+            //      var y = 3 <|
+            if (openingBrace === 60 /* lessThan */) {
+                return false;
+            }
+            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
+            // Check if in a context where we don't want to perform any insertion
+            if (ts.isInString(sourceFile, position)) {
+                return false;
+            }
+            if (ts.isInsideJsxElementOrAttribute(sourceFile, position)) {
+                return openingBrace === 123 /* openBrace */;
+            }
+            if (ts.isInTemplateString(sourceFile, position)) {
+                return false;
+            }
+            switch (openingBrace) {
+                case 39 /* singleQuote */:
+                case 34 /* doubleQuote */:
+                case 96 /* backtick */:
+                    return !ts.isInComment(sourceFile, position);
+            }
+            return true;
+        }
+        function getJsxClosingTagAtPosition(fileName, position) {
+            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
+            var token = ts.findPrecedingToken(position, sourceFile);
+            if (!token)
+                return undefined;
+            var element = token.kind === 30 /* GreaterThanToken */ && ts.isJsxOpeningElement(token.parent) ? token.parent.parent
+                : ts.isJsxText(token) ? token.parent : undefined;
+            if (element && isUnclosedTag(element)) {
+                return { newText: "</" + element.openingElement.tagName.getText(sourceFile) + ">" };
+            }
+        }
+        function isUnclosedTag(_a) {
+            var openingElement = _a.openingElement, closingElement = _a.closingElement, parent = _a.parent;
+            return !ts.tagNamesAreEquivalent(openingElement.tagName, closingElement.tagName) ||
+                ts.isJsxElement(parent) && ts.tagNamesAreEquivalent(openingElement.tagName, parent.openingElement.tagName) && isUnclosedTag(parent);
+        }
+        function getSpanOfEnclosingComment(fileName, position, onlyMultiLine) {
+            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
+            var range = ts.formatting.getRangeOfEnclosingComment(sourceFile, position);
+            return range && (!onlyMultiLine || range.kind === 3 /* MultiLineCommentTrivia */) ? ts.createTextSpanFromRange(range) : undefined;
+        }
+        function getTodoComments(fileName, descriptors) {
+            // Note: while getting todo comments seems like a syntactic operation, we actually
+            // treat it as a semantic operation here.  This is because we expect our host to call
+            // this on every single file.  If we treat this syntactically, then that will cause
+            // us to populate and throw away the tree in our syntax tree cache for each file.  By
+            // treating this as a semantic operation, we can access any tree without throwing
+            // anything away.
+            synchronizeHostData();
+            var sourceFile = getValidSourceFile(fileName);
+            cancellationToken.throwIfCancellationRequested();
+            var fileContents = sourceFile.text;
+            var result = [];
+            // Exclude node_modules files as we don't want to show the todos of external libraries.
+            if (descriptors.length > 0 && !isNodeModulesFile(sourceFile.fileName)) {
+                var regExp = getTodoCommentsRegExp();
+                var matchArray = void 0;
+                while (matchArray = regExp.exec(fileContents)) {
+                    cancellationToken.throwIfCancellationRequested();
+                    // If we got a match, here is what the match array will look like.  Say the source text is:
+                    //
+                    //      "    // hack   1"
+                    //
+                    // The result array with the regexp:    will be:
+                    //
+                    //      ["// hack   1", "// ", "hack   1", undefined, "hack"]
+                    //
+                    // Here are the relevant capture groups:
+                    //  0) The full match for the entire regexp.
+                    //  1) The preamble to the message portion.
+                    //  2) The message portion.
+                    //  3...N) The descriptor that was matched - by index.  'undefined' for each
+                    //         descriptor that didn't match.  an actual value if it did match.
+                    //
+                    //  i.e. 'undefined' in position 3 above means TODO(jason) didn't match.
+                    //       "hack"      in position 4 means HACK did match.
+                    var firstDescriptorCaptureIndex = 3;
+                    ts.Debug.assert(matchArray.length === descriptors.length + firstDescriptorCaptureIndex);
+                    var preamble = matchArray[1];
+                    var matchPosition = matchArray.index + preamble.length;
+                    // OK, we have found a match in the file.  This is only an acceptable match if
+                    // it is contained within a comment.
+                    if (!ts.isInComment(sourceFile, matchPosition)) {
+                        continue;
+                    }
+                    var descriptor = void 0;
+                    for (var i = 0; i < descriptors.length; i++) {
+                        if (matchArray[i + firstDescriptorCaptureIndex]) {
+                            descriptor = descriptors[i];
+                        }
+                    }
+                    if (descriptor === undefined)
+                        return ts.Debug.fail();
+                    // We don't want to match something like 'TODOBY', so we make sure a non
+                    // letter/digit follows the match.
+                    if (isLetterOrDigit(fileContents.charCodeAt(matchPosition + descriptor.text.length))) {
+                        continue;
+                    }
+                    var message = matchArray[2];
+                    result.push({ descriptor: descriptor, message: message, position: matchPosition });
+                }
+            }
+            return result;
+            function escapeRegExp(str) {
+                return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
+            }
+            function getTodoCommentsRegExp() {
+                // NOTE: `?:` means 'non-capture group'.  It allows us to have groups without having to
+                // filter them out later in the final result array.
+                // TODO comments can appear in one of the following forms:
+                //
+                //  1)      // TODO     or  /////////// TODO
+                //
+                //  2)      /* TODO     or  /********** TODO
+                //
+                //  3)      /*
+                //           *   TODO
+                //           */
+                //
+                // The following three regexps are used to match the start of the text up to the TODO
+                // comment portion.
+                var singleLineCommentStart = /(?:\/\/+\s*)/.source;
+                var multiLineCommentStart = /(?:\/\*+\s*)/.source;
+                var anyNumberOfSpacesAndAsterisksAtStartOfLine = /(?:^(?:\s|\*)*)/.source;
+                // Match any of the above three TODO comment start regexps.
+                // Note that the outermost group *is* a capture group.  We want to capture the preamble
+                // so that we can determine the starting position of the TODO comment match.
+                var preamble = "(" + anyNumberOfSpacesAndAsterisksAtStartOfLine + "|" + singleLineCommentStart + "|" + multiLineCommentStart + ")";
+                // Takes the descriptors and forms a regexp that matches them as if they were literals.
+                // For example, if the descriptors are "TODO(jason)" and "HACK", then this will be:
+                //
+                //      (?:(TODO\(jason\))|(HACK))
+                //
+                // Note that the outermost group is *not* a capture group, but the innermost groups
+                // *are* capture groups.  By capturing the inner literals we can determine after
+                // matching which descriptor we are dealing with.
+                var literals = "(?:" + ts.map(descriptors, function (d) { return "(" + escapeRegExp(d.text) + ")"; }).join("|") + ")";
+                // After matching a descriptor literal, the following regexp matches the rest of the
+                // text up to the end of the line (or */).
+                var endOfLineOrEndOfComment = /(?:$|\*\/)/.source;
+                var messageRemainder = /(?:.*?)/.source;
+                // This is the portion of the match we'll return as part of the TODO comment result. We
+                // match the literal portion up to the end of the line or end of comment.
+                var messagePortion = "(" + literals + messageRemainder + ")";
+                var regExpString = preamble + messagePortion + endOfLineOrEndOfComment;
+                // The final regexp will look like this:
+                // /((?:\/\/+\s*)|(?:\/\*+\s*)|(?:^(?:\s|\*)*))((?:(TODO\(jason\))|(HACK))(?:.*?))(?:$|\*\/)/gim
+                // The flags of the regexp are important here.
+                //  'g' is so that we are doing a global search and can find matches several times
+                //  in the input.
+                //
+                //  'i' is for case insensitivity (We do this to match C# TODO comment code).
+                //
+                //  'm' is so we can find matches in a multi-line input.
+                return new RegExp(regExpString, "gim");
+            }
+            function isLetterOrDigit(char) {
+                return (char >= 97 /* a */ && char <= 122 /* z */) ||
+                    (char >= 65 /* A */ && char <= 90 /* Z */) ||
+                    (char >= 48 /* _0 */ && char <= 57 /* _9 */);
+            }
+            function isNodeModulesFile(path) {
+                return ts.stringContains(path, "/node_modules/");
+            }
+        }
+        function getRenameInfo(fileName, position, options) {
+            synchronizeHostData();
+            return ts.Rename.getRenameInfo(program, getValidSourceFile(fileName), position, options);
+        }
+        function getRefactorContext(file, positionOrRange, preferences, formatOptions) {
+            var _a = typeof positionOrRange === "number" ? [positionOrRange, undefined] : [positionOrRange.pos, positionOrRange.end], startPosition = _a[0], endPosition = _a[1];
+            return {
+                file: file,
+                startPosition: startPosition,
+                endPosition: endPosition,
+                program: getProgram(),
+                host: host,
+                formatContext: ts.formatting.getFormatContext(formatOptions),
+                cancellationToken: cancellationToken,
+                preferences: preferences,
+            };
+        }
+        function getApplicableRefactors(fileName, positionOrRange, preferences) {
+            if (preferences === void 0) { preferences = ts.emptyOptions; }
+            synchronizeHostData();
+            var file = getValidSourceFile(fileName);
+            return ts.refactor.getApplicableRefactors(getRefactorContext(file, positionOrRange, preferences));
+        }
+        function getEditsForRefactor(fileName, formatOptions, positionOrRange, refactorName, actionName, preferences) {
+            if (preferences === void 0) { preferences = ts.emptyOptions; }
+            synchronizeHostData();
+            var file = getValidSourceFile(fileName);
+            return ts.refactor.getEditsForRefactor(getRefactorContext(file, positionOrRange, preferences, formatOptions), refactorName, actionName);
+        }
+        return {
+            dispose: dispose,
+            cleanupSemanticCache: cleanupSemanticCache,
+            getSyntacticDiagnostics: getSyntacticDiagnostics,
+            getSemanticDiagnostics: getSemanticDiagnostics,
+            getSuggestionDiagnostics: getSuggestionDiagnostics,
+            getCompilerOptionsDiagnostics: getCompilerOptionsDiagnostics,
+            getSyntacticClassifications: getSyntacticClassifications,
+            getSemanticClassifications: getSemanticClassifications,
+            getEncodedSyntacticClassifications: getEncodedSyntacticClassifications,
+            getEncodedSemanticClassifications: getEncodedSemanticClassifications,
+            getCompletionsAtPosition: getCompletionsAtPosition,
+            getCompletionEntryDetails: getCompletionEntryDetails,
+            getCompletionEntrySymbol: getCompletionEntrySymbol,
+            getSignatureHelpItems: getSignatureHelpItems,
+            getQuickInfoAtPosition: getQuickInfoAtPosition,
+            getDefinitionAtPosition: getDefinitionAtPosition,
+            getDefinitionAndBoundSpan: getDefinitionAndBoundSpan,
+            getImplementationAtPosition: getImplementationAtPosition,
+            getTypeDefinitionAtPosition: getTypeDefinitionAtPosition,
+            getReferencesAtPosition: getReferencesAtPosition,
+            findReferences: findReferences,
+            getOccurrencesAtPosition: getOccurrencesAtPosition,
+            getDocumentHighlights: getDocumentHighlights,
+            getNameOrDottedNameSpan: getNameOrDottedNameSpan,
+            getBreakpointStatementAtPosition: getBreakpointStatementAtPosition,
+            getNavigateToItems: getNavigateToItems,
+            getRenameInfo: getRenameInfo,
+            findRenameLocations: findRenameLocations,
+            getNavigationBarItems: getNavigationBarItems,
+            getNavigationTree: getNavigationTree,
+            getOutliningSpans: getOutliningSpans,
+            getTodoComments: getTodoComments,
+            getBraceMatchingAtPosition: getBraceMatchingAtPosition,
+            getIndentationAtPosition: getIndentationAtPosition,
+            getFormattingEditsForRange: getFormattingEditsForRange,
+            getFormattingEditsForDocument: getFormattingEditsForDocument,
+            getFormattingEditsAfterKeystroke: getFormattingEditsAfterKeystroke,
+            getDocCommentTemplateAtPosition: getDocCommentTemplateAtPosition,
+            isValidBraceCompletionAtPosition: isValidBraceCompletionAtPosition,
+            getJsxClosingTagAtPosition: getJsxClosingTagAtPosition,
+            getSpanOfEnclosingComment: getSpanOfEnclosingComment,
+            getCodeFixesAtPosition: getCodeFixesAtPosition,
+            getCombinedCodeFix: getCombinedCodeFix,
+            applyCodeActionCommand: applyCodeActionCommand,
+            organizeImports: organizeImports,
+            getEditsForFileRename: getEditsForFileRename,
+            getEmitOutput: getEmitOutput,
+            getNonBoundSourceFile: getNonBoundSourceFile,
+            getProgram: getProgram,
+            getApplicableRefactors: getApplicableRefactors,
+            getEditsForRefactor: getEditsForRefactor,
+            toLineColumnOffset: sourceMapper.toLineColumnOffset,
+            getSourceMapper: function () { return sourceMapper; },
+        };
+    }
+    ts.createLanguageService = createLanguageService;
+    /* @internal */
+    /** Names in the name table are escaped, so an identifier `__foo` will have a name table entry `___foo`. */
+    function getNameTable(sourceFile) {
+        if (!sourceFile.nameTable) {
+            initializeNameTable(sourceFile);
+        }
+        return sourceFile.nameTable; // TODO: GH#18217
+    }
+    ts.getNameTable = getNameTable;
+    function initializeNameTable(sourceFile) {
+        var nameTable = sourceFile.nameTable = ts.createUnderscoreEscapedMap();
+        sourceFile.forEachChild(function walk(node) {
+            if (ts.isIdentifier(node) && !ts.isTagName(node) && node.escapedText || ts.isStringOrNumericLiteralLike(node) && literalIsName(node)) {
+                var text = ts.getEscapedTextOfIdentifierOrLiteral(node);
+                nameTable.set(text, nameTable.get(text) === undefined ? node.pos : -1);
+            }
+            ts.forEachChild(node, walk);
+            if (ts.hasJSDocNodes(node)) {
+                for (var _i = 0, _a = node.jsDoc; _i < _a.length; _i++) {
+                    var jsDoc = _a[_i];
+                    ts.forEachChild(jsDoc, walk);
+                }
+            }
+        });
+    }
+    /**
+     * We want to store any numbers/strings if they were a name that could be
+     * related to a declaration.  So, if we have 'import x = require("something")'
+     * then we want 'something' to be in the name table.  Similarly, if we have
+     * "a['propname']" then we want to store "propname" in the name table.
+     */
+    function literalIsName(node) {
+        return ts.isDeclarationName(node) ||
+            node.parent.kind === 259 /* ExternalModuleReference */ ||
+            isArgumentOfElementAccessExpression(node) ||
+            ts.isLiteralComputedPropertyDeclarationName(node);
+    }
+    /**
+     * Returns the containing object literal property declaration given a possible name node, e.g. "a" in x = { "a": 1 }
+     */
+    /* @internal */
+    function getContainingObjectLiteralElement(node) {
+        var element = getContainingObjectLiteralElementWorker(node);
+        return element && (ts.isObjectLiteralExpression(element.parent) || ts.isJsxAttributes(element.parent)) ? element : undefined;
+    }
+    ts.getContainingObjectLiteralElement = getContainingObjectLiteralElement;
+    function getContainingObjectLiteralElementWorker(node) {
+        switch (node.kind) {
+            case 10 /* StringLiteral */:
+            case 8 /* NumericLiteral */:
+                if (node.parent.kind === 149 /* ComputedPropertyName */) {
+                    return ts.isObjectLiteralElement(node.parent.parent) ? node.parent.parent : undefined;
+                }
+            // falls through
+            case 72 /* Identifier */:
+                return ts.isObjectLiteralElement(node.parent) &&
+                    (node.parent.parent.kind === 188 /* ObjectLiteralExpression */ || node.parent.parent.kind === 268 /* JsxAttributes */) &&
+                    node.parent.name === node ? node.parent : undefined;
+        }
+        return undefined;
+    }
+    function getSymbolAtLocationForQuickInfo(node, checker) {
+        var object = getContainingObjectLiteralElement(node);
+        if (object) {
+            var contextualType = checker.getContextualType(object.parent);
+            var properties = contextualType && getPropertySymbolsFromContextualType(object, checker, contextualType, /*unionSymbolOk*/ false);
+            if (properties && properties.length === 1) {
+                return ts.first(properties);
+            }
+        }
+        return checker.getSymbolAtLocation(node);
+    }
+    /** Gets all symbols for one property. Does not get symbols for every property. */
+    /* @internal */
+    function getPropertySymbolsFromContextualType(node, checker, contextualType, unionSymbolOk) {
+        var name = ts.getNameFromPropertyName(node.name);
+        if (!name)
+            return ts.emptyArray;
+        if (!contextualType.isUnion()) {
+            var symbol = contextualType.getProperty(name);
+            return symbol ? [symbol] : ts.emptyArray;
+        }
+        var discriminatedPropertySymbols = ts.mapDefined(contextualType.types, function (t) { return ts.isObjectLiteralExpression(node.parent) && checker.isTypeInvalidDueToUnionDiscriminant(t, node.parent) ? undefined : t.getProperty(name); });
+        if (unionSymbolOk && (discriminatedPropertySymbols.length === 0 || discriminatedPropertySymbols.length === contextualType.types.length)) {
+            var symbol = contextualType.getProperty(name);
+            if (symbol)
+                return [symbol];
+        }
+        if (discriminatedPropertySymbols.length === 0) {
+            // Bad discriminant -- do again without discriminating
+            return ts.mapDefined(contextualType.types, function (t) { return t.getProperty(name); });
+        }
+        return discriminatedPropertySymbols;
+    }
+    ts.getPropertySymbolsFromContextualType = getPropertySymbolsFromContextualType;
+    function isArgumentOfElementAccessExpression(node) {
+        return node &&
+            node.parent &&
+            node.parent.kind === 190 /* ElementAccessExpression */ &&
+            node.parent.argumentExpression === node;
+    }
+    /**
+     * Get the path of the default library files (lib.d.ts) as distributed with the typescript
+     * node package.
+     * The functionality is not supported if the ts module is consumed outside of a node module.
+     */
+    function getDefaultLibFilePath(options) {
+        // Check __dirname is defined and that we are on a node.js system.
+        if (typeof __dirname !== "undefined") {
+            return __dirname + ts.directorySeparator + ts.getDefaultLibFileName(options);
+        }
+        throw new Error("getDefaultLibFilePath is only supported when consumed as a node module. ");
+    }
+    ts.getDefaultLibFilePath = getDefaultLibFilePath;
+    ts.objectAllocator = getServicesObjectAllocator();
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var BreakpointResolver;
+    (function (BreakpointResolver) {
+        /**
+         * Get the breakpoint span in given sourceFile
+         */
+        function spanInSourceFileAtLocation(sourceFile, position) {
+            // Cannot set breakpoint in dts file
+            if (sourceFile.isDeclarationFile) {
+                return undefined;
+            }
+            var tokenAtLocation = ts.getTokenAtPosition(sourceFile, position);
+            var lineOfPosition = sourceFile.getLineAndCharacterOfPosition(position).line;
+            if (sourceFile.getLineAndCharacterOfPosition(tokenAtLocation.getStart(sourceFile)).line > lineOfPosition) {
+                // Get previous token if the token is returned starts on new line
+                // eg: let x =10; |--- cursor is here
+                //     let y = 10;
+                // token at position will return let keyword on second line as the token but we would like to use
+                // token on same line if trailing trivia (comments or white spaces on same line) part of the last token on that line
+                var preceding = ts.findPrecedingToken(tokenAtLocation.pos, sourceFile);
+                // It's a blank line
+                if (!preceding || sourceFile.getLineAndCharacterOfPosition(preceding.getEnd()).line !== lineOfPosition) {
+                    return undefined;
+                }
+                tokenAtLocation = preceding;
+            }
+            // Cannot set breakpoint in ambient declarations
+            if (tokenAtLocation.flags & 4194304 /* Ambient */) {
+                return undefined;
+            }
+            // Get the span in the node based on its syntax
+            return spanInNode(tokenAtLocation);
+            function textSpan(startNode, endNode) {
+                var start = startNode.decorators ?
+                    ts.skipTrivia(sourceFile.text, startNode.decorators.end) :
+                    startNode.getStart(sourceFile);
+                return ts.createTextSpanFromBounds(start, (endNode || startNode).getEnd());
+            }
+            function textSpanEndingAtNextToken(startNode, previousTokenToFindNextEndToken) {
+                return textSpan(startNode, ts.findNextToken(previousTokenToFindNextEndToken, previousTokenToFindNextEndToken.parent, sourceFile));
+            }
+            function spanInNodeIfStartsOnSameLine(node, otherwiseOnNode) {
+                if (node && lineOfPosition === sourceFile.getLineAndCharacterOfPosition(node.getStart(sourceFile)).line) {
+                    return spanInNode(node);
+                }
+                return spanInNode(otherwiseOnNode);
+            }
+            function spanInNodeArray(nodeArray) {
+                return ts.createTextSpanFromBounds(ts.skipTrivia(sourceFile.text, nodeArray.pos), nodeArray.end);
+            }
+            function spanInPreviousNode(node) {
+                return spanInNode(ts.findPrecedingToken(node.pos, sourceFile));
+            }
+            function spanInNextNode(node) {
+                return spanInNode(ts.findNextToken(node, node.parent, sourceFile));
+            }
+            function spanInNode(node) {
+                if (node) {
+                    var parent = node.parent;
+                    switch (node.kind) {
+                        case 219 /* VariableStatement */:
+                            // Span on first variable declaration
+                            return spanInVariableDeclaration(node.declarationList.declarations[0]);
+                        case 237 /* VariableDeclaration */:
+                        case 154 /* PropertyDeclaration */:
+                        case 153 /* PropertySignature */:
+                            return spanInVariableDeclaration(node);
+                        case 151 /* Parameter */:
+                            return spanInParameterDeclaration(node);
+                        case 239 /* FunctionDeclaration */:
+                        case 156 /* MethodDeclaration */:
+                        case 155 /* MethodSignature */:
+                        case 158 /* GetAccessor */:
+                        case 159 /* SetAccessor */:
+                        case 157 /* Constructor */:
+                        case 196 /* FunctionExpression */:
+                        case 197 /* ArrowFunction */:
+                            return spanInFunctionDeclaration(node);
+                        case 218 /* Block */:
+                            if (ts.isFunctionBlock(node)) {
+                                return spanInFunctionBlock(node);
+                            }
+                        // falls through
+                        case 245 /* ModuleBlock */:
+                            return spanInBlock(node);
+                        case 274 /* CatchClause */:
+                            return spanInBlock(node.block);
+                        case 221 /* ExpressionStatement */:
+                            // span on the expression
+                            return textSpan(node.expression);
+                        case 230 /* ReturnStatement */:
+                            // span on return keyword and expression if present
+                            return textSpan(node.getChildAt(0), node.expression);
+                        case 224 /* WhileStatement */:
+                            // Span on while(...)
+                            return textSpanEndingAtNextToken(node, node.expression);
+                        case 223 /* DoStatement */:
+                            // span in statement of the do statement
+                            return spanInNode(node.statement);
+                        case 236 /* DebuggerStatement */:
+                            // span on debugger keyword
+                            return textSpan(node.getChildAt(0));
+                        case 222 /* IfStatement */:
+                            // set on if(..) span
+                            return textSpanEndingAtNextToken(node, node.expression);
+                        case 233 /* LabeledStatement */:
+                            // span in statement
+                            return spanInNode(node.statement);
+                        case 229 /* BreakStatement */:
+                        case 228 /* ContinueStatement */:
+                            // On break or continue keyword and label if present
+                            return textSpan(node.getChildAt(0), node.label);
+                        case 225 /* ForStatement */:
+                            return spanInForStatement(node);
+                        case 226 /* ForInStatement */:
+                            // span of for (a in ...)
+                            return textSpanEndingAtNextToken(node, node.expression);
+                        case 227 /* ForOfStatement */:
+                            // span in initializer
+                            return spanInInitializerOfForLike(node);
+                        case 232 /* SwitchStatement */:
+                            // span on switch(...)
+                            return textSpanEndingAtNextToken(node, node.expression);
+                        case 271 /* CaseClause */:
+                        case 272 /* DefaultClause */:
+                            // span in first statement of the clause
+                            return spanInNode(node.statements[0]);
+                        case 235 /* TryStatement */:
+                            // span in try block
+                            return spanInBlock(node.tryBlock);
+                        case 234 /* ThrowStatement */:
+                            // span in throw ...
+                            return textSpan(node, node.expression);
+                        case 254 /* ExportAssignment */:
+                            // span on export = id
+                            return textSpan(node, node.expression);
+                        case 248 /* ImportEqualsDeclaration */:
+                            // import statement without including semicolon
+                            return textSpan(node, node.moduleReference);
+                        case 249 /* ImportDeclaration */:
+                            // import statement without including semicolon
+                            return textSpan(node, node.moduleSpecifier);
+                        case 255 /* ExportDeclaration */:
+                            // import statement without including semicolon
+                            return textSpan(node, node.moduleSpecifier);
+                        case 244 /* ModuleDeclaration */:
+                            // span on complete module if it is instantiated
+                            if (ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
+                                return undefined;
+                            }
+                        // falls through
+                        case 240 /* ClassDeclaration */:
+                        case 243 /* EnumDeclaration */:
+                        case 278 /* EnumMember */:
+                        case 186 /* BindingElement */:
+                            // span on complete node
+                            return textSpan(node);
+                        case 231 /* WithStatement */:
+                            // span in statement
+                            return spanInNode(node.statement);
+                        case 152 /* Decorator */:
+                            return spanInNodeArray(parent.decorators);
+                        case 184 /* ObjectBindingPattern */:
+                        case 185 /* ArrayBindingPattern */:
+                            return spanInBindingPattern(node);
+                        // No breakpoint in interface, type alias
+                        case 241 /* InterfaceDeclaration */:
+                        case 242 /* TypeAliasDeclaration */:
+                            return undefined;
+                        // Tokens:
+                        case 26 /* SemicolonToken */:
+                        case 1 /* EndOfFileToken */:
+                            return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile));
+                        case 27 /* CommaToken */:
+                            return spanInPreviousNode(node);
+                        case 18 /* OpenBraceToken */:
+                            return spanInOpenBraceToken(node);
+                        case 19 /* CloseBraceToken */:
+                            return spanInCloseBraceToken(node);
+                        case 23 /* CloseBracketToken */:
+                            return spanInCloseBracketToken(node);
+                        case 20 /* OpenParenToken */:
+                            return spanInOpenParenToken(node);
+                        case 21 /* CloseParenToken */:
+                            return spanInCloseParenToken(node);
+                        case 57 /* ColonToken */:
+                            return spanInColonToken(node);
+                        case 30 /* GreaterThanToken */:
+                        case 28 /* LessThanToken */:
+                            return spanInGreaterThanOrLessThanToken(node);
+                        // Keywords:
+                        case 107 /* WhileKeyword */:
+                            return spanInWhileKeyword(node);
+                        case 83 /* ElseKeyword */:
+                        case 75 /* CatchKeyword */:
+                        case 88 /* FinallyKeyword */:
+                            return spanInNextNode(node);
+                        case 147 /* OfKeyword */:
+                            return spanInOfKeyword(node);
+                        default:
+                            // Destructuring pattern in destructuring assignment
+                            // [a, b, c] of
+                            // [a, b, c] = expression
+                            if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node)) {
+                                return spanInArrayLiteralOrObjectLiteralDestructuringPattern(node);
+                            }
+                            // Set breakpoint on identifier element of destructuring pattern
+                            // `a` or `...c` or `d: x` from
+                            // `[a, b, ...c]` or `{ a, b }` or `{ d: x }` from destructuring pattern
+                            if ((node.kind === 72 /* Identifier */ ||
+                                node.kind === 208 /* SpreadElement */ ||
+                                node.kind === 275 /* PropertyAssignment */ ||
+                                node.kind === 276 /* ShorthandPropertyAssignment */) &&
+                                ts.isArrayLiteralOrObjectLiteralDestructuringPattern(parent)) {
+                                return textSpan(node);
+                            }
+                            if (node.kind === 204 /* BinaryExpression */) {
+                                var _a = node, left = _a.left, operatorToken = _a.operatorToken;
+                                // Set breakpoint in destructuring pattern if its destructuring assignment
+                                // [a, b, c] or {a, b, c} of
+                                // [a, b, c] = expression or
+                                // {a, b, c} = expression
+                                if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(left)) {
+                                    return spanInArrayLiteralOrObjectLiteralDestructuringPattern(left);
+                                }
+                                if (operatorToken.kind === 59 /* EqualsToken */ && ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
+                                    // Set breakpoint on assignment expression element of destructuring pattern
+                                    // a = expression of
+                                    // [a = expression, b, c] = someExpression or
+                                    // { a = expression, b, c } = someExpression
+                                    return textSpan(node);
+                                }
+                                if (operatorToken.kind === 27 /* CommaToken */) {
+                                    return spanInNode(left);
+                                }
+                            }
+                            if (ts.isExpressionNode(node)) {
+                                switch (parent.kind) {
+                                    case 223 /* DoStatement */:
+                                        // Set span as if on while keyword
+                                        return spanInPreviousNode(node);
+                                    case 152 /* Decorator */:
+                                        // Set breakpoint on the decorator emit
+                                        return spanInNode(node.parent);
+                                    case 225 /* ForStatement */:
+                                    case 227 /* ForOfStatement */:
+                                        return textSpan(node);
+                                    case 204 /* BinaryExpression */:
+                                        if (node.parent.operatorToken.kind === 27 /* CommaToken */) {
+                                            // If this is a comma expression, the breakpoint is possible in this expression
+                                            return textSpan(node);
+                                        }
+                                        break;
+                                    case 197 /* ArrowFunction */:
+                                        if (node.parent.body === node) {
+                                            // If this is body of arrow function, it is allowed to have the breakpoint
+                                            return textSpan(node);
+                                        }
+                                        break;
+                                }
+                            }
+                            switch (node.parent.kind) {
+                                case 275 /* PropertyAssignment */:
+                                    // If this is name of property assignment, set breakpoint in the initializer
+                                    if (node.parent.name === node &&
+                                        !ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.parent)) {
+                                        return spanInNode(node.parent.initializer);
+                                    }
+                                    break;
+                                case 194 /* TypeAssertionExpression */:
+                                    // Breakpoint in type assertion goes to its operand
+                                    if (node.parent.type === node) {
+                                        return spanInNextNode(node.parent.type);
+                                    }
+                                    break;
+                                case 237 /* VariableDeclaration */:
+                                case 151 /* Parameter */: {
+                                    // initializer of variable/parameter declaration go to previous node
+                                    var _b = node.parent, initializer = _b.initializer, type = _b.type;
+                                    if (initializer === node || type === node || ts.isAssignmentOperator(node.kind)) {
+                                        return spanInPreviousNode(node);
+                                    }
+                                    break;
+                                }
+                                case 204 /* BinaryExpression */: {
+                                    var left = node.parent.left;
+                                    if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(left) && node !== left) {
+                                        // If initializer of destructuring assignment move to previous token
+                                        return spanInPreviousNode(node);
+                                    }
+                                    break;
+                                }
+                                default:
+                                    // return type of function go to previous token
+                                    if (ts.isFunctionLike(node.parent) && node.parent.type === node) {
+                                        return spanInPreviousNode(node);
+                                    }
+                            }
+                            // Default go to parent to set the breakpoint
+                            return spanInNode(node.parent);
+                    }
+                }
+                function textSpanFromVariableDeclaration(variableDeclaration) {
+                    if (ts.isVariableDeclarationList(variableDeclaration.parent) && variableDeclaration.parent.declarations[0] === variableDeclaration) {
+                        // First declaration - include let keyword
+                        return textSpan(ts.findPrecedingToken(variableDeclaration.pos, sourceFile, variableDeclaration.parent), variableDeclaration);
+                    }
+                    else {
+                        // Span only on this declaration
+                        return textSpan(variableDeclaration);
+                    }
+                }
+                function spanInVariableDeclaration(variableDeclaration) {
+                    // If declaration of for in statement, just set the span in parent
+                    if (variableDeclaration.parent.parent.kind === 226 /* ForInStatement */) {
+                        return spanInNode(variableDeclaration.parent.parent);
+                    }
+                    var parent = variableDeclaration.parent;
+                    // If this is a destructuring pattern, set breakpoint in binding pattern
+                    if (ts.isBindingPattern(variableDeclaration.name)) {
+                        return spanInBindingPattern(variableDeclaration.name);
+                    }
+                    // Breakpoint is possible in variableDeclaration only if there is initialization
+                    // or its declaration from 'for of'
+                    if (variableDeclaration.initializer ||
+                        ts.hasModifier(variableDeclaration, 1 /* Export */) ||
+                        parent.parent.kind === 227 /* ForOfStatement */) {
+                        return textSpanFromVariableDeclaration(variableDeclaration);
+                    }
+                    if (ts.isVariableDeclarationList(variableDeclaration.parent) &&
+                        variableDeclaration.parent.declarations[0] !== variableDeclaration) {
+                        // If we cannot set breakpoint on this declaration, set it on previous one
+                        // Because the variable declaration may be binding pattern and
+                        // we would like to set breakpoint in last binding element if that's the case,
+                        // use preceding token instead
+                        return spanInNode(ts.findPrecedingToken(variableDeclaration.pos, sourceFile, variableDeclaration.parent));
+                    }
+                }
+                function canHaveSpanInParameterDeclaration(parameter) {
+                    // Breakpoint is possible on parameter only if it has initializer, is a rest parameter, or has public or private modifier
+                    return !!parameter.initializer || parameter.dotDotDotToken !== undefined ||
+                        ts.hasModifier(parameter, 4 /* Public */ | 8 /* Private */);
+                }
+                function spanInParameterDeclaration(parameter) {
+                    if (ts.isBindingPattern(parameter.name)) {
+                        // Set breakpoint in binding pattern
+                        return spanInBindingPattern(parameter.name);
+                    }
+                    else if (canHaveSpanInParameterDeclaration(parameter)) {
+                        return textSpan(parameter);
+                    }
+                    else {
+                        var functionDeclaration = parameter.parent;
+                        var indexOfParameter = functionDeclaration.parameters.indexOf(parameter);
+                        ts.Debug.assert(indexOfParameter !== -1);
+                        if (indexOfParameter !== 0) {
+                            // Not a first parameter, go to previous parameter
+                            return spanInParameterDeclaration(functionDeclaration.parameters[indexOfParameter - 1]);
+                        }
+                        else {
+                            // Set breakpoint in the function declaration body
+                            return spanInNode(functionDeclaration.body);
+                        }
+                    }
+                }
+                function canFunctionHaveSpanInWholeDeclaration(functionDeclaration) {
+                    return ts.hasModifier(functionDeclaration, 1 /* Export */) ||
+                        (functionDeclaration.parent.kind === 240 /* ClassDeclaration */ && functionDeclaration.kind !== 157 /* Constructor */);
+                }
+                function spanInFunctionDeclaration(functionDeclaration) {
+                    // No breakpoints in the function signature
+                    if (!functionDeclaration.body) {
+                        return undefined;
+                    }
+                    if (canFunctionHaveSpanInWholeDeclaration(functionDeclaration)) {
+                        // Set the span on whole function declaration
+                        return textSpan(functionDeclaration);
+                    }
+                    // Set span in function body
+                    return spanInNode(functionDeclaration.body);
+                }
+                function spanInFunctionBlock(block) {
+                    var nodeForSpanInBlock = block.statements.length ? block.statements[0] : block.getLastToken();
+                    if (canFunctionHaveSpanInWholeDeclaration(block.parent)) {
+                        return spanInNodeIfStartsOnSameLine(block.parent, nodeForSpanInBlock);
+                    }
+                    return spanInNode(nodeForSpanInBlock);
+                }
+                function spanInBlock(block) {
+                    switch (block.parent.kind) {
+                        case 244 /* ModuleDeclaration */:
+                            if (ts.getModuleInstanceState(block.parent) !== 1 /* Instantiated */) {
+                                return undefined;
+                            }
+                        // falls through
+                        // Set on parent if on same line otherwise on first statement
+                        case 224 /* WhileStatement */:
+                        case 222 /* IfStatement */:
+                        case 226 /* ForInStatement */:
+                            return spanInNodeIfStartsOnSameLine(block.parent, block.statements[0]);
+                        // Set span on previous token if it starts on same line otherwise on the first statement of the block
+                        case 225 /* ForStatement */:
+                        case 227 /* ForOfStatement */:
+                            return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(block.pos, sourceFile, block.parent), block.statements[0]);
+                    }
+                    // Default action is to set on first statement
+                    return spanInNode(block.statements[0]);
+                }
+                function spanInInitializerOfForLike(forLikeStatement) {
+                    if (forLikeStatement.initializer.kind === 238 /* VariableDeclarationList */) {
+                        // Declaration list - set breakpoint in first declaration
+                        var variableDeclarationList = forLikeStatement.initializer;
+                        if (variableDeclarationList.declarations.length > 0) {
+                            return spanInNode(variableDeclarationList.declarations[0]);
+                        }
+                    }
+                    else {
+                        // Expression - set breakpoint in it
+                        return spanInNode(forLikeStatement.initializer);
+                    }
+                }
+                function spanInForStatement(forStatement) {
+                    if (forStatement.initializer) {
+                        return spanInInitializerOfForLike(forStatement);
+                    }
+                    if (forStatement.condition) {
+                        return textSpan(forStatement.condition);
+                    }
+                    if (forStatement.incrementor) {
+                        return textSpan(forStatement.incrementor);
+                    }
+                }
+                function spanInBindingPattern(bindingPattern) {
+                    // Set breakpoint in first binding element
+                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 210 /* OmittedExpression */ ? element : undefined; });
+                    if (firstBindingElement) {
+                        return spanInNode(firstBindingElement);
+                    }
+                    // Empty binding pattern of binding element, set breakpoint on binding element
+                    if (bindingPattern.parent.kind === 186 /* BindingElement */) {
+                        return textSpan(bindingPattern.parent);
+                    }
+                    // Variable declaration is used as the span
+                    return textSpanFromVariableDeclaration(bindingPattern.parent);
+                }
+                function spanInArrayLiteralOrObjectLiteralDestructuringPattern(node) {
+                    ts.Debug.assert(node.kind !== 185 /* ArrayBindingPattern */ && node.kind !== 184 /* ObjectBindingPattern */);
+                    var elements = node.kind === 187 /* ArrayLiteralExpression */ ? node.elements : node.properties;
+                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 210 /* OmittedExpression */ ? element : undefined; });
+                    if (firstBindingElement) {
+                        return spanInNode(firstBindingElement);
+                    }
+                    // Could be ArrayLiteral from destructuring assignment or
+                    // just nested element in another destructuring assignment
+                    // set breakpoint on assignment when parent is destructuring assignment
+                    // Otherwise set breakpoint for this element
+                    return textSpan(node.parent.kind === 204 /* BinaryExpression */ ? node.parent : node);
+                }
+                // Tokens:
+                function spanInOpenBraceToken(node) {
+                    switch (node.parent.kind) {
+                        case 243 /* EnumDeclaration */:
+                            var enumDeclaration = node.parent;
+                            return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), enumDeclaration.members.length ? enumDeclaration.members[0] : enumDeclaration.getLastToken(sourceFile));
+                        case 240 /* ClassDeclaration */:
+                            var classDeclaration = node.parent;
+                            return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), classDeclaration.members.length ? classDeclaration.members[0] : classDeclaration.getLastToken(sourceFile));
+                        case 246 /* CaseBlock */:
+                            return spanInNodeIfStartsOnSameLine(node.parent.parent, node.parent.clauses[0]);
+                    }
+                    // Default to parent node
+                    return spanInNode(node.parent);
+                }
+                function spanInCloseBraceToken(node) {
+                    switch (node.parent.kind) {
+                        case 245 /* ModuleBlock */:
+                            // If this is not an instantiated module block, no bp span
+                            if (ts.getModuleInstanceState(node.parent.parent) !== 1 /* Instantiated */) {
+                                return undefined;
+                            }
+                        // falls through
+                        case 243 /* EnumDeclaration */:
+                        case 240 /* ClassDeclaration */:
+                            // Span on close brace token
+                            return textSpan(node);
+                        case 218 /* Block */:
+                            if (ts.isFunctionBlock(node.parent)) {
+                                // Span on close brace token
+                                return textSpan(node);
+                            }
+                        // falls through
+                        case 274 /* CatchClause */:
+                            return spanInNode(ts.lastOrUndefined(node.parent.statements));
+                        case 246 /* CaseBlock */:
+                            // breakpoint in last statement of the last clause
+                            var caseBlock = node.parent;
+                            var lastClause = ts.lastOrUndefined(caseBlock.clauses);
+                            if (lastClause) {
+                                return spanInNode(ts.lastOrUndefined(lastClause.statements));
+                            }
+                            return undefined;
+                        case 184 /* ObjectBindingPattern */:
+                            // Breakpoint in last binding element or binding pattern if it contains no elements
+                            var bindingPattern = node.parent;
+                            return spanInNode(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern);
+                        // Default to parent node
+                        default:
+                            if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
+                                // Breakpoint in last binding element or binding pattern if it contains no elements
+                                var objectLiteral = node.parent;
+                                return textSpan(ts.lastOrUndefined(objectLiteral.properties) || objectLiteral);
+                            }
+                            return spanInNode(node.parent);
+                    }
+                }
+                function spanInCloseBracketToken(node) {
+                    switch (node.parent.kind) {
+                        case 185 /* ArrayBindingPattern */:
+                            // Breakpoint in last binding element or binding pattern if it contains no elements
+                            var bindingPattern = node.parent;
+                            return textSpan(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern);
+                        default:
+                            if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
+                                // Breakpoint in last binding element or binding pattern if it contains no elements
+                                var arrayLiteral = node.parent;
+                                return textSpan(ts.lastOrUndefined(arrayLiteral.elements) || arrayLiteral);
+                            }
+                            // Default to parent node
+                            return spanInNode(node.parent);
+                    }
+                }
+                function spanInOpenParenToken(node) {
+                    if (node.parent.kind === 223 /* DoStatement */ || // Go to while keyword and do action instead
+                        node.parent.kind === 191 /* CallExpression */ ||
+                        node.parent.kind === 192 /* NewExpression */) {
+                        return spanInPreviousNode(node);
+                    }
+                    if (node.parent.kind === 195 /* ParenthesizedExpression */) {
+                        return spanInNextNode(node);
+                    }
+                    // Default to parent node
+                    return spanInNode(node.parent);
+                }
+                function spanInCloseParenToken(node) {
+                    // Is this close paren token of parameter list, set span in previous token
+                    switch (node.parent.kind) {
+                        case 196 /* FunctionExpression */:
+                        case 239 /* FunctionDeclaration */:
+                        case 197 /* ArrowFunction */:
+                        case 156 /* MethodDeclaration */:
+                        case 155 /* MethodSignature */:
+                        case 158 /* GetAccessor */:
+                        case 159 /* SetAccessor */:
+                        case 157 /* Constructor */:
+                        case 224 /* WhileStatement */:
+                        case 223 /* DoStatement */:
+                        case 225 /* ForStatement */:
+                        case 227 /* ForOfStatement */:
+                        case 191 /* CallExpression */:
+                        case 192 /* NewExpression */:
+                        case 195 /* ParenthesizedExpression */:
+                            return spanInPreviousNode(node);
+                        // Default to parent node
+                        default:
+                            return spanInNode(node.parent);
+                    }
+                }
+                function spanInColonToken(node) {
+                    // Is this : specifying return annotation of the function declaration
+                    if (ts.isFunctionLike(node.parent) ||
+                        node.parent.kind === 275 /* PropertyAssignment */ ||
+                        node.parent.kind === 151 /* Parameter */) {
+                        return spanInPreviousNode(node);
+                    }
+                    return spanInNode(node.parent);
+                }
+                function spanInGreaterThanOrLessThanToken(node) {
+                    if (node.parent.kind === 194 /* TypeAssertionExpression */) {
+                        return spanInNextNode(node);
+                    }
+                    return spanInNode(node.parent);
+                }
+                function spanInWhileKeyword(node) {
+                    if (node.parent.kind === 223 /* DoStatement */) {
+                        // Set span on while expression
+                        return textSpanEndingAtNextToken(node, node.parent.expression);
+                    }
+                    // Default to parent node
+                    return spanInNode(node.parent);
+                }
+                function spanInOfKeyword(node) {
+                    if (node.parent.kind === 227 /* ForOfStatement */) {
+                        // Set using next token
+                        return spanInNextNode(node);
+                    }
+                    // Default to parent node
+                    return spanInNode(node.parent);
+                }
+            }
+        }
+        BreakpointResolver.spanInSourceFileAtLocation = spanInSourceFileAtLocation;
+    })(BreakpointResolver = ts.BreakpointResolver || (ts.BreakpointResolver = {}));
+})(ts || (ts = {}));
+var ts;
+(function (ts) {
+    /**
+     * Transform one or more nodes using the supplied transformers.
+     * @param source A single `Node` or an array of `Node` objects.
+     * @param transformers An array of `TransformerFactory` callbacks used to process the transformation.
+     * @param compilerOptions Optional compiler options.
+     */
+    function transform(source, transformers, compilerOptions) {
+        var diagnostics = [];
+        compilerOptions = ts.fixupCompilerOptions(compilerOptions, diagnostics); // TODO: GH#18217
+        var nodes = ts.isArray(source) ? source : [source];
+        var result = ts.transformNodes(/*resolver*/ undefined, /*emitHost*/ undefined, compilerOptions, nodes, transformers, /*allowDtsFiles*/ true);
+        result.diagnostics = ts.concatenate(result.diagnostics, diagnostics);
+        return result;
+    }
+    ts.transform = transform;
+})(ts || (ts = {}));
+//
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+/* @internal */
+var debugObjectHost = (function () { return this; })();
+// We need to use 'null' to interface with the managed side.
+/* tslint:disable:no-null-keyword */
+/* tslint:disable:no-in-operator */
+/* @internal */
+var ts;
+(function (ts) {
+    function logInternalError(logger, err) {
+        if (logger) {
+            logger.log("*INTERNAL ERROR* - Exception in typescript services: " + err.message);
+        }
+    }
+    var ScriptSnapshotShimAdapter = /** @class */ (function () {
+        function ScriptSnapshotShimAdapter(scriptSnapshotShim) {
+            this.scriptSnapshotShim = scriptSnapshotShim;
+        }
+        ScriptSnapshotShimAdapter.prototype.getText = function (start, end) {
+            return this.scriptSnapshotShim.getText(start, end);
+        };
+        ScriptSnapshotShimAdapter.prototype.getLength = function () {
+            return this.scriptSnapshotShim.getLength();
+        };
+        ScriptSnapshotShimAdapter.prototype.getChangeRange = function (oldSnapshot) {
+            var oldSnapshotShim = oldSnapshot;
+            var encoded = this.scriptSnapshotShim.getChangeRange(oldSnapshotShim.scriptSnapshotShim);
+            if (encoded === null) {
+                return null; // TODO: GH#18217
+            }
+            var decoded = JSON.parse(encoded); // TODO: GH#18217
+            return ts.createTextChangeRange(ts.createTextSpan(decoded.span.start, decoded.span.length), decoded.newLength);
+        };
+        ScriptSnapshotShimAdapter.prototype.dispose = function () {
+            // if scriptSnapshotShim is a COM object then property check becomes method call with no arguments
+            // 'in' does not have this effect
+            if ("dispose" in this.scriptSnapshotShim) {
+                this.scriptSnapshotShim.dispose(); // TODO: GH#18217 Can we just use `if (this.scriptSnapshotShim.dispose)`?
+            }
+        };
+        return ScriptSnapshotShimAdapter;
+    }());
+    var LanguageServiceShimHostAdapter = /** @class */ (function () {
+        function LanguageServiceShimHostAdapter(shimHost) {
+            var _this = this;
+            this.shimHost = shimHost;
+            this.loggingEnabled = false;
+            this.tracingEnabled = false;
+            // if shimHost is a COM object then property check will become method call with no arguments.
+            // 'in' does not have this effect.
+            if ("getModuleResolutionsForFile" in this.shimHost) {
+                this.resolveModuleNames = function (moduleNames, containingFile) {
+                    var resolutionsInFile = JSON.parse(_this.shimHost.getModuleResolutionsForFile(containingFile)); // TODO: GH#18217
+                    return ts.map(moduleNames, function (name) {
+                        var result = ts.getProperty(resolutionsInFile, name);
+                        return result ? { resolvedFileName: result, extension: ts.extensionFromPath(result), isExternalLibraryImport: false } : undefined;
+                    });
+                };
+            }
+            if ("directoryExists" in this.shimHost) {
+                this.directoryExists = function (directoryName) { return _this.shimHost.directoryExists(directoryName); };
+            }
+            if ("getTypeReferenceDirectiveResolutionsForFile" in this.shimHost) {
+                this.resolveTypeReferenceDirectives = function (typeDirectiveNames, containingFile) {
+                    var typeDirectivesForFile = JSON.parse(_this.shimHost.getTypeReferenceDirectiveResolutionsForFile(containingFile)); // TODO: GH#18217
+                    return ts.map(typeDirectiveNames, function (name) { return ts.getProperty(typeDirectivesForFile, name); });
+                };
+            }
+        }
+        LanguageServiceShimHostAdapter.prototype.log = function (s) {
+            if (this.loggingEnabled) {
+                this.shimHost.log(s);
+            }
+        };
+        LanguageServiceShimHostAdapter.prototype.trace = function (s) {
+            if (this.tracingEnabled) {
+                this.shimHost.trace(s);
+            }
+        };
+        LanguageServiceShimHostAdapter.prototype.error = function (s) {
+            this.shimHost.error(s);
+        };
+        LanguageServiceShimHostAdapter.prototype.getProjectVersion = function () {
+            if (!this.shimHost.getProjectVersion) {
+                // shimmed host does not support getProjectVersion
+                return undefined; // TODO: GH#18217
+            }
+            return this.shimHost.getProjectVersion();
+        };
+        LanguageServiceShimHostAdapter.prototype.getTypeRootsVersion = function () {
+            if (!this.shimHost.getTypeRootsVersion) {
+                return 0;
+            }
+            return this.shimHost.getTypeRootsVersion();
+        };
+        LanguageServiceShimHostAdapter.prototype.useCaseSensitiveFileNames = function () {
+            return this.shimHost.useCaseSensitiveFileNames ? this.shimHost.useCaseSensitiveFileNames() : false;
+        };
+        LanguageServiceShimHostAdapter.prototype.getCompilationSettings = function () {
+            var settingsJson = this.shimHost.getCompilationSettings();
+            if (settingsJson === null || settingsJson === "") {
+                throw Error("LanguageServiceShimHostAdapter.getCompilationSettings: empty compilationSettings");
+            }
+            var compilerOptions = JSON.parse(settingsJson);
+            // permit language service to handle all files (filtering should be performed on the host side)
+            compilerOptions.allowNonTsExtensions = true;
+            return compilerOptions;
+        };
+        LanguageServiceShimHostAdapter.prototype.getScriptFileNames = function () {
+            var encoded = this.shimHost.getScriptFileNames();
+            return JSON.parse(encoded);
+        };
+        LanguageServiceShimHostAdapter.prototype.getScriptSnapshot = function (fileName) {
+            var scriptSnapshot = this.shimHost.getScriptSnapshot(fileName);
+            return scriptSnapshot && new ScriptSnapshotShimAdapter(scriptSnapshot);
+        };
+        LanguageServiceShimHostAdapter.prototype.getScriptKind = function (fileName) {
+            if ("getScriptKind" in this.shimHost) {
+                return this.shimHost.getScriptKind(fileName); // TODO: GH#18217
+            }
+            else {
+                return 0 /* Unknown */;
+            }
+        };
+        LanguageServiceShimHostAdapter.prototype.getScriptVersion = function (fileName) {
+            return this.shimHost.getScriptVersion(fileName);
+        };
+        LanguageServiceShimHostAdapter.prototype.getLocalizedDiagnosticMessages = function () {
+            var diagnosticMessagesJson = this.shimHost.getLocalizedDiagnosticMessages();
+            if (diagnosticMessagesJson === null || diagnosticMessagesJson === "") {
+                return null;
+            }
+            try {
+                return JSON.parse(diagnosticMessagesJson);
+            }
+            catch (e) {
+                this.log(e.description || "diagnosticMessages.generated.json has invalid JSON format");
+                return null;
+            }
+        };
+        LanguageServiceShimHostAdapter.prototype.getCancellationToken = function () {
+            var hostCancellationToken = this.shimHost.getCancellationToken();
+            return new ts.ThrottledCancellationToken(hostCancellationToken);
+        };
+        LanguageServiceShimHostAdapter.prototype.getCurrentDirectory = function () {
+            return this.shimHost.getCurrentDirectory();
+        };
+        LanguageServiceShimHostAdapter.prototype.getDirectories = function (path) {
+            return JSON.parse(this.shimHost.getDirectories(path));
+        };
+        LanguageServiceShimHostAdapter.prototype.getDefaultLibFileName = function (options) {
+            return this.shimHost.getDefaultLibFileName(JSON.stringify(options));
+        };
+        LanguageServiceShimHostAdapter.prototype.readDirectory = function (path, extensions, exclude, include, depth) {
+            var pattern = ts.getFileMatcherPatterns(path, exclude, include, this.shimHost.useCaseSensitiveFileNames(), this.shimHost.getCurrentDirectory()); // TODO: GH#18217
+            return JSON.parse(this.shimHost.readDirectory(path, JSON.stringify(extensions), JSON.stringify(pattern.basePaths), pattern.excludePattern, pattern.includeFilePattern, pattern.includeDirectoryPattern, depth));
+        };
+        LanguageServiceShimHostAdapter.prototype.readFile = function (path, encoding) {
+            return this.shimHost.readFile(path, encoding);
+        };
+        LanguageServiceShimHostAdapter.prototype.fileExists = function (path) {
+            return this.shimHost.fileExists(path);
+        };
+        return LanguageServiceShimHostAdapter;
+    }());
+    ts.LanguageServiceShimHostAdapter = LanguageServiceShimHostAdapter;
+    var CoreServicesShimHostAdapter = /** @class */ (function () {
+        function CoreServicesShimHostAdapter(shimHost) {
+            var _this = this;
+            this.shimHost = shimHost;
+            this.useCaseSensitiveFileNames = this.shimHost.useCaseSensitiveFileNames ? this.shimHost.useCaseSensitiveFileNames() : false;
+            if ("directoryExists" in this.shimHost) {
+                this.directoryExists = function (directoryName) { return _this.shimHost.directoryExists(directoryName); };
+            }
+            else {
+                this.directoryExists = undefined; // TODO: GH#18217
+            }
+            if ("realpath" in this.shimHost) {
+                this.realpath = function (path) { return _this.shimHost.realpath(path); }; // TODO: GH#18217
+            }
+            else {
+                this.realpath = undefined; // TODO: GH#18217
+            }
+        }
+        CoreServicesShimHostAdapter.prototype.readDirectory = function (rootDir, extensions, exclude, include, depth) {
+            var pattern = ts.getFileMatcherPatterns(rootDir, exclude, include, this.shimHost.useCaseSensitiveFileNames(), this.shimHost.getCurrentDirectory()); // TODO: GH#18217
+            return JSON.parse(this.shimHost.readDirectory(rootDir, JSON.stringify(extensions), JSON.stringify(pattern.basePaths), pattern.excludePattern, pattern.includeFilePattern, pattern.includeDirectoryPattern, depth));
+        };
+        CoreServicesShimHostAdapter.prototype.fileExists = function (fileName) {
+            return this.shimHost.fileExists(fileName);
+        };
+        CoreServicesShimHostAdapter.prototype.readFile = function (fileName) {
+            return this.shimHost.readFile(fileName);
+        };
+        CoreServicesShimHostAdapter.prototype.getDirectories = function (path) {
+            return JSON.parse(this.shimHost.getDirectories(path));
+        };
+        return CoreServicesShimHostAdapter;
+    }());
+    ts.CoreServicesShimHostAdapter = CoreServicesShimHostAdapter;
+    function simpleForwardCall(logger, actionDescription, action, logPerformance) {
+        var start;
+        if (logPerformance) {
+            logger.log(actionDescription);
+            start = ts.timestamp();
+        }
+        var result = action();
+        if (logPerformance) {
+            var end = ts.timestamp();
+            logger.log(actionDescription + " completed in " + (end - start) + " msec");
+            if (ts.isString(result)) {
+                var str = result;
+                if (str.length > 128) {
+                    str = str.substring(0, 128) + "...";
+                }
+                logger.log("  result.length=" + str.length + ", result='" + JSON.stringify(str) + "'");
+            }
+        }
+        return result;
+    }
+    function forwardJSONCall(logger, actionDescription, action, logPerformance) {
+        return forwardCall(logger, actionDescription, /*returnJson*/ true, action, logPerformance);
+    }
+    function forwardCall(logger, actionDescription, returnJson, action, logPerformance) {
+        try {
+            var result = simpleForwardCall(logger, actionDescription, action, logPerformance);
+            return returnJson ? JSON.stringify({ result: result }) : result;
+        }
+        catch (err) {
+            if (err instanceof ts.OperationCanceledException) {
+                return JSON.stringify({ canceled: true });
+            }
+            logInternalError(logger, err);
+            err.description = actionDescription;
+            return JSON.stringify({ error: err });
+        }
+    }
+    var ShimBase = /** @class */ (function () {
+        function ShimBase(factory) {
+            this.factory = factory;
+            factory.registerShim(this);
+        }
+        ShimBase.prototype.dispose = function (_dummy) {
+            this.factory.unregisterShim(this);
+        };
+        return ShimBase;
+    }());
+    function realizeDiagnostics(diagnostics, newLine) {
+        return diagnostics.map(function (d) { return realizeDiagnostic(d, newLine); });
+    }
+    ts.realizeDiagnostics = realizeDiagnostics;
+    function realizeDiagnostic(diagnostic, newLine) {
+        return {
+            message: ts.flattenDiagnosticMessageText(diagnostic.messageText, newLine),
+            start: diagnostic.start,
+            length: diagnostic.length,
+            category: ts.diagnosticCategoryName(diagnostic),
+            code: diagnostic.code,
+            reportsUnnecessary: diagnostic.reportsUnnecessary,
+        };
+    }
+    var LanguageServiceShimObject = /** @class */ (function (_super) {
+        __extends(LanguageServiceShimObject, _super);
+        function LanguageServiceShimObject(factory, host, languageService) {
+            var _this = _super.call(this, factory) || this;
+            _this.host = host;
+            _this.languageService = languageService;
+            _this.logPerformance = false;
+            _this.logger = _this.host;
+            return _this;
+        }
+        LanguageServiceShimObject.prototype.forwardJSONCall = function (actionDescription, action) {
+            return forwardJSONCall(this.logger, actionDescription, action, this.logPerformance);
+        };
+        /// DISPOSE
+        /**
+         * Ensure (almost) deterministic release of internal Javascript resources when
+         * some external native objects holds onto us (e.g. Com/Interop).
+         */
+        LanguageServiceShimObject.prototype.dispose = function (dummy) {
+            this.logger.log("dispose()");
+            this.languageService.dispose();
+            this.languageService = null;
+            // force a GC
+            if (debugObjectHost && debugObjectHost.CollectGarbage) {
+                debugObjectHost.CollectGarbage();
+                this.logger.log("CollectGarbage()");
+            }
+            this.logger = null;
+            _super.prototype.dispose.call(this, dummy);
+        };
+        /// REFRESH
+        /**
+         * Update the list of scripts known to the compiler
+         */
+        LanguageServiceShimObject.prototype.refresh = function (throwOnError) {
+            this.forwardJSONCall("refresh(" + throwOnError + ")", function () { return null; });
+        };
+        LanguageServiceShimObject.prototype.cleanupSemanticCache = function () {
+            var _this = this;
+            this.forwardJSONCall("cleanupSemanticCache()", function () {
+                _this.languageService.cleanupSemanticCache();
+                return null;
+            });
+        };
+        LanguageServiceShimObject.prototype.realizeDiagnostics = function (diagnostics) {
+            var newLine = ts.getNewLineOrDefaultFromHost(this.host);
+            return realizeDiagnostics(diagnostics, newLine);
+        };
+        LanguageServiceShimObject.prototype.getSyntacticClassifications = function (fileName, start, length) {
+            var _this = this;
+            return this.forwardJSONCall("getSyntacticClassifications('" + fileName + "', " + start + ", " + length + ")", function () { return _this.languageService.getSyntacticClassifications(fileName, ts.createTextSpan(start, length)); });
+        };
+        LanguageServiceShimObject.prototype.getSemanticClassifications = function (fileName, start, length) {
+            var _this = this;
+            return this.forwardJSONCall("getSemanticClassifications('" + fileName + "', " + start + ", " + length + ")", function () { return _this.languageService.getSemanticClassifications(fileName, ts.createTextSpan(start, length)); });
+        };
+        LanguageServiceShimObject.prototype.getEncodedSyntacticClassifications = function (fileName, start, length) {
+            var _this = this;
+            return this.forwardJSONCall("getEncodedSyntacticClassifications('" + fileName + "', " + start + ", " + length + ")", 
+            // directly serialize the spans out to a string.  This is much faster to decode
+            // on the managed side versus a full JSON array.
+            function () { return convertClassifications(_this.languageService.getEncodedSyntacticClassifications(fileName, ts.createTextSpan(start, length))); });
+        };
+        LanguageServiceShimObject.prototype.getEncodedSemanticClassifications = function (fileName, start, length) {
+            var _this = this;
+            return this.forwardJSONCall("getEncodedSemanticClassifications('" + fileName + "', " + start + ", " + length + ")", 
+            // directly serialize the spans out to a string.  This is much faster to decode
+            // on the managed side versus a full JSON array.
+            function () { return convertClassifications(_this.languageService.getEncodedSemanticClassifications(fileName, ts.createTextSpan(start, length))); });
+        };
+        LanguageServiceShimObject.prototype.getSyntacticDiagnostics = function (fileName) {
+            var _this = this;
+            return this.forwardJSONCall("getSyntacticDiagnostics('" + fileName + "')", function () {
+                var diagnostics = _this.languageService.getSyntacticDiagnostics(fileName);
+                return _this.realizeDiagnostics(diagnostics);
+            });
+        };
+        LanguageServiceShimObject.prototype.getSemanticDiagnostics = function (fileName) {
+            var _this = this;
+            return this.forwardJSONCall("getSemanticDiagnostics('" + fileName + "')", function () {
+                var diagnostics = _this.languageService.getSemanticDiagnostics(fileName);
+                return _this.realizeDiagnostics(diagnostics);
+            });
+        };
+        LanguageServiceShimObject.prototype.getSuggestionDiagnostics = function (fileName) {
+            var _this = this;
+            return this.forwardJSONCall("getSuggestionDiagnostics('" + fileName + "')", function () { return _this.realizeDiagnostics(_this.languageService.getSuggestionDiagnostics(fileName)); });
+        };
+        LanguageServiceShimObject.prototype.getCompilerOptionsDiagnostics = function () {
+            var _this = this;
+            return this.forwardJSONCall("getCompilerOptionsDiagnostics()", function () {
+                var diagnostics = _this.languageService.getCompilerOptionsDiagnostics();
+                return _this.realizeDiagnostics(diagnostics);
+            });
+        };
+        /// QUICKINFO
+        /**
+         * Computes a string representation of the type at the requested position
+         * in the active file.
+         */
+        LanguageServiceShimObject.prototype.getQuickInfoAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getQuickInfoAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getQuickInfoAtPosition(fileName, position); });
+        };
+        /// NAMEORDOTTEDNAMESPAN
+        /**
+         * Computes span information of the name or dotted name at the requested position
+         * in the active file.
+         */
+        LanguageServiceShimObject.prototype.getNameOrDottedNameSpan = function (fileName, startPos, endPos) {
+            var _this = this;
+            return this.forwardJSONCall("getNameOrDottedNameSpan('" + fileName + "', " + startPos + ", " + endPos + ")", function () { return _this.languageService.getNameOrDottedNameSpan(fileName, startPos, endPos); });
+        };
+        /**
+         * STATEMENTSPAN
+         * Computes span information of statement at the requested position in the active file.
+         */
+        LanguageServiceShimObject.prototype.getBreakpointStatementAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getBreakpointStatementAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getBreakpointStatementAtPosition(fileName, position); });
+        };
+        /// SIGNATUREHELP
+        LanguageServiceShimObject.prototype.getSignatureHelpItems = function (fileName, position, options) {
+            var _this = this;
+            return this.forwardJSONCall("getSignatureHelpItems('" + fileName + "', " + position + ")", function () { return _this.languageService.getSignatureHelpItems(fileName, position, options); });
+        };
+        /// GOTO DEFINITION
+        /**
+         * Computes the definition location and file for the symbol
+         * at the requested position.
+         */
+        LanguageServiceShimObject.prototype.getDefinitionAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getDefinitionAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getDefinitionAtPosition(fileName, position); });
+        };
+        /**
+         * Computes the definition location and file for the symbol
+         * at the requested position.
+         */
+        LanguageServiceShimObject.prototype.getDefinitionAndBoundSpan = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getDefinitionAndBoundSpan('" + fileName + "', " + position + ")", function () { return _this.languageService.getDefinitionAndBoundSpan(fileName, position); });
+        };
+        /// GOTO Type
+        /**
+         * Computes the definition location of the type of the symbol
+         * at the requested position.
+         */
+        LanguageServiceShimObject.prototype.getTypeDefinitionAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getTypeDefinitionAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getTypeDefinitionAtPosition(fileName, position); });
+        };
+        /// GOTO Implementation
+        /**
+         * Computes the implementation location of the symbol
+         * at the requested position.
+         */
+        LanguageServiceShimObject.prototype.getImplementationAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getImplementationAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getImplementationAtPosition(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.getRenameInfo = function (fileName, position, options) {
+            var _this = this;
+            return this.forwardJSONCall("getRenameInfo('" + fileName + "', " + position + ")", function () { return _this.languageService.getRenameInfo(fileName, position, options); });
+        };
+        LanguageServiceShimObject.prototype.findRenameLocations = function (fileName, position, findInStrings, findInComments, providePrefixAndSuffixTextForRename) {
+            var _this = this;
+            return this.forwardJSONCall("findRenameLocations('" + fileName + "', " + position + ", " + findInStrings + ", " + findInComments + ", " + providePrefixAndSuffixTextForRename + ")", function () { return _this.languageService.findRenameLocations(fileName, position, findInStrings, findInComments, providePrefixAndSuffixTextForRename); });
+        };
+        /// GET BRACE MATCHING
+        LanguageServiceShimObject.prototype.getBraceMatchingAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getBraceMatchingAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getBraceMatchingAtPosition(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.isValidBraceCompletionAtPosition = function (fileName, position, openingBrace) {
+            var _this = this;
+            return this.forwardJSONCall("isValidBraceCompletionAtPosition('" + fileName + "', " + position + ", " + openingBrace + ")", function () { return _this.languageService.isValidBraceCompletionAtPosition(fileName, position, openingBrace); });
+        };
+        LanguageServiceShimObject.prototype.getSpanOfEnclosingComment = function (fileName, position, onlyMultiLine) {
+            var _this = this;
+            return this.forwardJSONCall("getSpanOfEnclosingComment('" + fileName + "', " + position + ")", function () { return _this.languageService.getSpanOfEnclosingComment(fileName, position, onlyMultiLine); });
+        };
+        /// GET SMART INDENT
+        LanguageServiceShimObject.prototype.getIndentationAtPosition = function (fileName, position, options /*Services.EditorOptions*/) {
+            var _this = this;
+            return this.forwardJSONCall("getIndentationAtPosition('" + fileName + "', " + position + ")", function () {
+                var localOptions = JSON.parse(options);
+                return _this.languageService.getIndentationAtPosition(fileName, position, localOptions);
+            });
+        };
+        /// GET REFERENCES
+        LanguageServiceShimObject.prototype.getReferencesAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getReferencesAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getReferencesAtPosition(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.findReferences = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("findReferences('" + fileName + "', " + position + ")", function () { return _this.languageService.findReferences(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.getOccurrencesAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getOccurrencesAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getOccurrencesAtPosition(fileName, position); });
+        };
+        LanguageServiceShimObject.prototype.getDocumentHighlights = function (fileName, position, filesToSearch) {
+            var _this = this;
+            return this.forwardJSONCall("getDocumentHighlights('" + fileName + "', " + position + ")", function () {
+                var results = _this.languageService.getDocumentHighlights(fileName, position, JSON.parse(filesToSearch));
+                // workaround for VS document highlighting issue - keep only items from the initial file
+                var normalizedName = ts.normalizeSlashes(fileName).toLowerCase();
+                return ts.filter(results, function (r) { return ts.normalizeSlashes(r.fileName).toLowerCase() === normalizedName; });
+            });
+        };
+        /// COMPLETION LISTS
+        /**
+         * Get a string based representation of the completions
+         * to provide at the given source position and providing a member completion
+         * list if requested.
+         */
+        LanguageServiceShimObject.prototype.getCompletionsAtPosition = function (fileName, position, preferences) {
+            var _this = this;
+            return this.forwardJSONCall("getCompletionsAtPosition('" + fileName + "', " + position + ", " + preferences + ")", function () { return _this.languageService.getCompletionsAtPosition(fileName, position, preferences); });
+        };
+        /** Get a string based representation of a completion list entry details */
+        LanguageServiceShimObject.prototype.getCompletionEntryDetails = function (fileName, position, entryName, formatOptions, source, preferences) {
+            var _this = this;
+            return this.forwardJSONCall("getCompletionEntryDetails('" + fileName + "', " + position + ", '" + entryName + "')", function () {
+                var localOptions = formatOptions === undefined ? undefined : JSON.parse(formatOptions);
+                return _this.languageService.getCompletionEntryDetails(fileName, position, entryName, localOptions, source, preferences);
+            });
+        };
+        LanguageServiceShimObject.prototype.getFormattingEditsForRange = function (fileName, start, end, options /*Services.FormatCodeOptions*/) {
+            var _this = this;
+            return this.forwardJSONCall("getFormattingEditsForRange('" + fileName + "', " + start + ", " + end + ")", function () {
+                var localOptions = JSON.parse(options);
+                return _this.languageService.getFormattingEditsForRange(fileName, start, end, localOptions);
+            });
+        };
+        LanguageServiceShimObject.prototype.getFormattingEditsForDocument = function (fileName, options /*Services.FormatCodeOptions*/) {
+            var _this = this;
+            return this.forwardJSONCall("getFormattingEditsForDocument('" + fileName + "')", function () {
+                var localOptions = JSON.parse(options);
+                return _this.languageService.getFormattingEditsForDocument(fileName, localOptions);
+            });
+        };
+        LanguageServiceShimObject.prototype.getFormattingEditsAfterKeystroke = function (fileName, position, key, options /*Services.FormatCodeOptions*/) {
+            var _this = this;
+            return this.forwardJSONCall("getFormattingEditsAfterKeystroke('" + fileName + "', " + position + ", '" + key + "')", function () {
+                var localOptions = JSON.parse(options);
+                return _this.languageService.getFormattingEditsAfterKeystroke(fileName, position, key, localOptions);
+            });
+        };
+        LanguageServiceShimObject.prototype.getDocCommentTemplateAtPosition = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getDocCommentTemplateAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getDocCommentTemplateAtPosition(fileName, position); });
+        };
+        /// NAVIGATE TO
+        /** Return a list of symbols that are interesting to navigate to */
+        LanguageServiceShimObject.prototype.getNavigateToItems = function (searchValue, maxResultCount, fileName) {
+            var _this = this;
+            return this.forwardJSONCall("getNavigateToItems('" + searchValue + "', " + maxResultCount + ", " + fileName + ")", function () { return _this.languageService.getNavigateToItems(searchValue, maxResultCount, fileName); });
+        };
+        LanguageServiceShimObject.prototype.getNavigationBarItems = function (fileName) {
+            var _this = this;
+            return this.forwardJSONCall("getNavigationBarItems('" + fileName + "')", function () { return _this.languageService.getNavigationBarItems(fileName); });
+        };
+        LanguageServiceShimObject.prototype.getNavigationTree = function (fileName) {
+            var _this = this;
+            return this.forwardJSONCall("getNavigationTree('" + fileName + "')", function () { return _this.languageService.getNavigationTree(fileName); });
+        };
+        LanguageServiceShimObject.prototype.getOutliningSpans = function (fileName) {
+            var _this = this;
+            return this.forwardJSONCall("getOutliningSpans('" + fileName + "')", function () { return _this.languageService.getOutliningSpans(fileName); });
+        };
+        LanguageServiceShimObject.prototype.getTodoComments = function (fileName, descriptors) {
+            var _this = this;
+            return this.forwardJSONCall("getTodoComments('" + fileName + "')", function () { return _this.languageService.getTodoComments(fileName, JSON.parse(descriptors)); });
+        };
+        /// Emit
+        LanguageServiceShimObject.prototype.getEmitOutput = function (fileName) {
+            var _this = this;
+            return this.forwardJSONCall("getEmitOutput('" + fileName + "')", function () { return _this.languageService.getEmitOutput(fileName); });
+        };
+        LanguageServiceShimObject.prototype.getEmitOutputObject = function (fileName) {
+            var _this = this;
+            return forwardCall(this.logger, "getEmitOutput('" + fileName + "')", 
+            /*returnJson*/ false, function () { return _this.languageService.getEmitOutput(fileName); }, this.logPerformance);
+        };
+        return LanguageServiceShimObject;
+    }(ShimBase));
+    function convertClassifications(classifications) {
+        return { spans: classifications.spans.join(","), endOfLineState: classifications.endOfLineState };
+    }
+    var ClassifierShimObject = /** @class */ (function (_super) {
+        __extends(ClassifierShimObject, _super);
+        function ClassifierShimObject(factory, logger) {
+            var _this = _super.call(this, factory) || this;
+            _this.logger = logger;
+            _this.logPerformance = false;
+            _this.classifier = ts.createClassifier();
+            return _this;
+        }
+        ClassifierShimObject.prototype.getEncodedLexicalClassifications = function (text, lexState, syntacticClassifierAbsent) {
+            var _this = this;
+            if (syntacticClassifierAbsent === void 0) { syntacticClassifierAbsent = false; }
+            return forwardJSONCall(this.logger, "getEncodedLexicalClassifications", function () { return convertClassifications(_this.classifier.getEncodedLexicalClassifications(text, lexState, syntacticClassifierAbsent)); }, this.logPerformance);
+        };
+        /// COLORIZATION
+        ClassifierShimObject.prototype.getClassificationsForLine = function (text, lexState, classifyKeywordsInGenerics) {
+            if (classifyKeywordsInGenerics === void 0) { classifyKeywordsInGenerics = false; }
+            var classification = this.classifier.getClassificationsForLine(text, lexState, classifyKeywordsInGenerics);
+            var result = "";
+            for (var _i = 0, _a = classification.entries; _i < _a.length; _i++) {
+                var item = _a[_i];
+                result += item.length + "\n";
+                result += item.classification + "\n";
+            }
+            result += classification.finalLexState;
+            return result;
+        };
+        return ClassifierShimObject;
+    }(ShimBase));
+    var CoreServicesShimObject = /** @class */ (function (_super) {
+        __extends(CoreServicesShimObject, _super);
+        function CoreServicesShimObject(factory, logger, host) {
+            var _this = _super.call(this, factory) || this;
+            _this.logger = logger;
+            _this.host = host;
+            _this.logPerformance = false;
+            return _this;
+        }
+        CoreServicesShimObject.prototype.forwardJSONCall = function (actionDescription, action) {
+            return forwardJSONCall(this.logger, actionDescription, action, this.logPerformance);
+        };
+        CoreServicesShimObject.prototype.resolveModuleName = function (fileName, moduleName, compilerOptionsJson) {
+            var _this = this;
+            return this.forwardJSONCall("resolveModuleName('" + fileName + "')", function () {
+                var compilerOptions = JSON.parse(compilerOptionsJson);
+                var result = ts.resolveModuleName(moduleName, ts.normalizeSlashes(fileName), compilerOptions, _this.host);
+                var resolvedFileName = result.resolvedModule ? result.resolvedModule.resolvedFileName : undefined;
+                if (result.resolvedModule && result.resolvedModule.extension !== ".ts" /* Ts */ && result.resolvedModule.extension !== ".tsx" /* Tsx */ && result.resolvedModule.extension !== ".d.ts" /* Dts */) {
+                    resolvedFileName = undefined;
+                }
+                return {
+                    resolvedFileName: resolvedFileName,
+                    failedLookupLocations: result.failedLookupLocations
+                };
+            });
+        };
+        CoreServicesShimObject.prototype.resolveTypeReferenceDirective = function (fileName, typeReferenceDirective, compilerOptionsJson) {
+            var _this = this;
+            return this.forwardJSONCall("resolveTypeReferenceDirective(" + fileName + ")", function () {
+                var compilerOptions = JSON.parse(compilerOptionsJson);
+                var result = ts.resolveTypeReferenceDirective(typeReferenceDirective, ts.normalizeSlashes(fileName), compilerOptions, _this.host);
+                return {
+                    resolvedFileName: result.resolvedTypeReferenceDirective ? result.resolvedTypeReferenceDirective.resolvedFileName : undefined,
+                    primary: result.resolvedTypeReferenceDirective ? result.resolvedTypeReferenceDirective.primary : true,
+                    failedLookupLocations: result.failedLookupLocations
+                };
+            });
+        };
+        CoreServicesShimObject.prototype.getPreProcessedFileInfo = function (fileName, sourceTextSnapshot) {
+            var _this = this;
+            return this.forwardJSONCall("getPreProcessedFileInfo('" + fileName + "')", function () {
+                // for now treat files as JavaScript
+                var result = ts.preProcessFile(ts.getSnapshotText(sourceTextSnapshot), /* readImportFiles */ true, /* detectJavaScriptImports */ true);
+                return {
+                    referencedFiles: _this.convertFileReferences(result.referencedFiles),
+                    importedFiles: _this.convertFileReferences(result.importedFiles),
+                    ambientExternalModules: result.ambientExternalModules,
+                    isLibFile: result.isLibFile,
+                    typeReferenceDirectives: _this.convertFileReferences(result.typeReferenceDirectives),
+                    libReferenceDirectives: _this.convertFileReferences(result.libReferenceDirectives)
+                };
+            });
+        };
+        CoreServicesShimObject.prototype.getAutomaticTypeDirectiveNames = function (compilerOptionsJson) {
+            var _this = this;
+            return this.forwardJSONCall("getAutomaticTypeDirectiveNames('" + compilerOptionsJson + "')", function () {
+                var compilerOptions = JSON.parse(compilerOptionsJson);
+                return ts.getAutomaticTypeDirectiveNames(compilerOptions, _this.host);
+            });
+        };
+        CoreServicesShimObject.prototype.convertFileReferences = function (refs) {
+            if (!refs) {
+                return undefined;
+            }
+            var result = [];
+            for (var _i = 0, refs_1 = refs; _i < refs_1.length; _i++) {
+                var ref = refs_1[_i];
+                result.push({
+                    path: ts.normalizeSlashes(ref.fileName),
+                    position: ref.pos,
+                    length: ref.end - ref.pos
+                });
+            }
+            return result;
+        };
+        CoreServicesShimObject.prototype.getTSConfigFileInfo = function (fileName, sourceTextSnapshot) {
+            var _this = this;
+            return this.forwardJSONCall("getTSConfigFileInfo('" + fileName + "')", function () {
+                var result = ts.parseJsonText(fileName, ts.getSnapshotText(sourceTextSnapshot));
+                var normalizedFileName = ts.normalizeSlashes(fileName);
+                var configFile = ts.parseJsonSourceFileConfigFileContent(result, _this.host, ts.getDirectoryPath(normalizedFileName), /*existingOptions*/ {}, normalizedFileName);
+                return {
+                    options: configFile.options,
+                    typeAcquisition: configFile.typeAcquisition,
+                    files: configFile.fileNames,
+                    raw: configFile.raw,
+                    errors: realizeDiagnostics(result.parseDiagnostics.concat(configFile.errors), "\r\n")
+                };
+            });
+        };
+        CoreServicesShimObject.prototype.getDefaultCompilationSettings = function () {
+            return this.forwardJSONCall("getDefaultCompilationSettings()", function () { return ts.getDefaultCompilerOptions(); });
+        };
+        CoreServicesShimObject.prototype.discoverTypings = function (discoverTypingsJson) {
+            var _this = this;
+            var getCanonicalFileName = ts.createGetCanonicalFileName(/*useCaseSensitivefileNames:*/ false);
+            return this.forwardJSONCall("discoverTypings()", function () {
+                var info = JSON.parse(discoverTypingsJson);
+                if (_this.safeList === undefined) {
+                    _this.safeList = ts.JsTyping.loadSafeList(_this.host, ts.toPath(info.safeListPath, info.safeListPath, getCanonicalFileName));
+                }
+                return ts.JsTyping.discoverTypings(_this.host, function (msg) { return _this.logger.log(msg); }, info.fileNames, ts.toPath(info.projectRootPath, info.projectRootPath, getCanonicalFileName), _this.safeList, info.packageNameToTypingLocation, info.typeAcquisition, info.unresolvedImports, info.typesRegistry);
+            });
+        };
+        return CoreServicesShimObject;
+    }(ShimBase));
+    var TypeScriptServicesFactory = /** @class */ (function () {
+        function TypeScriptServicesFactory() {
+            this._shims = [];
+        }
+        /*
+         * Returns script API version.
+         */
+        TypeScriptServicesFactory.prototype.getServicesVersion = function () {
+            return ts.servicesVersion;
+        };
+        TypeScriptServicesFactory.prototype.createLanguageServiceShim = function (host) {
+            try {
+                if (this.documentRegistry === undefined) {
+                    this.documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory());
+                }
+                var hostAdapter = new LanguageServiceShimHostAdapter(host);
+                var languageService = ts.createLanguageService(hostAdapter, this.documentRegistry, /*syntaxOnly*/ false);
+                return new LanguageServiceShimObject(this, host, languageService);
+            }
+            catch (err) {
+                logInternalError(host, err);
+                throw err;
+            }
+        };
+        TypeScriptServicesFactory.prototype.createClassifierShim = function (logger) {
+            try {
+                return new ClassifierShimObject(this, logger);
+            }
+            catch (err) {
+                logInternalError(logger, err);
+                throw err;
+            }
+        };
+        TypeScriptServicesFactory.prototype.createCoreServicesShim = function (host) {
+            try {
+                var adapter = new CoreServicesShimHostAdapter(host);
+                return new CoreServicesShimObject(this, host, adapter);
+            }
+            catch (err) {
+                logInternalError(host, err);
+                throw err;
+            }
+        };
+        TypeScriptServicesFactory.prototype.close = function () {
+            // Forget all the registered shims
+            ts.clear(this._shims);
+            this.documentRegistry = undefined;
+        };
+        TypeScriptServicesFactory.prototype.registerShim = function (shim) {
+            this._shims.push(shim);
+        };
+        TypeScriptServicesFactory.prototype.unregisterShim = function (shim) {
+            for (var i = 0; i < this._shims.length; i++) {
+                if (this._shims[i] === shim) {
+                    delete this._shims[i];
+                    return;
+                }
+            }
+            throw new Error("Invalid operation");
+        };
+        return TypeScriptServicesFactory;
+    }());
+    ts.TypeScriptServicesFactory = TypeScriptServicesFactory;
+    if (typeof module !== "undefined" && module.exports) {
+        module.exports = ts;
+    }
+})(ts || (ts = {}));
+/* tslint:enable:no-in-operator */
+/* tslint:enable:no-null */
+/// TODO: this is used by VS, clean this up on both sides of the interface
+/* @internal */
+var TypeScript;
+(function (TypeScript) {
+    var Services;
+    (function (Services) {
+        Services.TypeScriptServicesFactory = ts.TypeScriptServicesFactory;
+    })(Services = TypeScript.Services || (TypeScript.Services = {}));
+})(TypeScript || (TypeScript = {}));
+// 'toolsVersion' gets consumed by the managed side, so it's not unused.
+// TODO: it should be moved into a namespace though.
+/* @internal */
+var toolsVersion = ts.versionMajorMinor;
+//# sourceMappingURL=typescriptServices.out.js.map
\ No newline at end of file
diff --git a/packages/schematics/angular/universal/index.ts b/packages/schematics/angular/universal/index.ts
index 85886ab2bcae..9ac859eb80b9 100644
--- a/packages/schematics/angular/universal/index.ts
+++ b/packages/schematics/angular/universal/index.ts
@@ -29,7 +29,7 @@ import {
 import {
   NodePackageInstallTask,
 } from '@angular-devkit/schematics/tasks';
-import * as ts from 'typescript';
+import * as ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { findNode, getDecoratorMetadata } from '../utility/ast-utils';
 import { InsertChange } from '../utility/change';
 import { getWorkspace, updateWorkspace } from '../utility/config';
diff --git a/packages/schematics/angular/utility/ast-utils.ts b/packages/schematics/angular/utility/ast-utils.ts
index 46ea7c441110..101a26cd107b 100644
--- a/packages/schematics/angular/utility/ast-utils.ts
+++ b/packages/schematics/angular/utility/ast-utils.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import * as ts from 'typescript';
+import * as ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { Change, InsertChange, NoopChange } from './change';
 
 
diff --git a/packages/schematics/angular/utility/ast-utils_spec.ts b/packages/schematics/angular/utility/ast-utils_spec.ts
index 2aee6a258d7e..469cebcd3d8a 100644
--- a/packages/schematics/angular/utility/ast-utils_spec.ts
+++ b/packages/schematics/angular/utility/ast-utils_spec.ts
@@ -8,7 +8,7 @@
  */
 import { tags } from '@angular-devkit/core';
 import { HostTree } from '@angular-devkit/schematics';
-import * as ts from 'typescript';
+import * as ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { Change, InsertChange } from '../utility/change';
 import { getFileContent } from '../utility/test';
 import {
diff --git a/packages/schematics/angular/utility/ng-ast-utils.ts b/packages/schematics/angular/utility/ng-ast-utils.ts
index b0cac7e51e7f..ac190943f75f 100644
--- a/packages/schematics/angular/utility/ng-ast-utils.ts
+++ b/packages/schematics/angular/utility/ng-ast-utils.ts
@@ -8,7 +8,7 @@
 import { normalize } from '@angular-devkit/core';
 import { SchematicsException, Tree } from '@angular-devkit/schematics';
 import { dirname } from 'path';
-import * as ts from 'typescript';
+import * as ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { findNode, getSourceNodes } from '../utility/ast-utils';
 
 export function findBootstrapModuleCall(host: Tree, mainPath: string): ts.CallExpression | null {
diff --git a/scripts/lint.ts b/scripts/lint.ts
index 448325b7cab0..c6b6b09296dc 100644
--- a/scripts/lint.ts
+++ b/scripts/lint.ts
@@ -14,9 +14,7 @@ import * as ts from 'typescript';
 
 // Blacklist (regexes) of the files to not lint. Generated files should not be linted.
 // TODO: when moved to using bazel for the build system, this won't be needed.
-const blacklist = [
-  /^dist-schema[\\\/].*/,
-];
+const blacklist = [/^dist-schema[\\\/].*/, /.*\/third_party\/.*/];
 
 
 function _buildRules(logger: logging.Logger) {

From a7d095d9166912a53624f2e40f87241dd134798d Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Tue, 5 Mar 2019 08:12:01 +0100
Subject: [PATCH 0865/1703] feat(@schematics/angular): change layout for root
 applications

This change aligns the file layout of applications generated with `ng new` and `ng generate`

Ref: TOOL-686
---
 .../files/{root => }/browserslist.template    |   0
 .../files/{root => }/karma.conf.js.template   |   0
 ...ot__gitkeep.template => .gitkeep.template} |   0
 .../{root => }/tsconfig.app.json.template     |   8 +-
 .../{root => }/tsconfig.spec.json.template    |   8 +-
 .../__tsLintRoot__ => }/tslint.json.template  |   5 +-
 .../schematics/angular/application/index.ts   | 202 ++++++++++--------
 .../angular/application/index_spec.ts         |  38 ++--
 .../angular/e2e/files/tsconfig.json.template  |   2 +-
 packages/schematics/angular/e2e/index.ts      |   4 +-
 .../schematics/angular/ng-new/index_spec.ts   |   2 +-
 .../schematics/angular/universal/index.ts     |   8 +-
 .../angular/universal/index_spec.ts           |   8 +-
 .../angular/utility/workspace-models.ts       |   2 +-
 .../workspace/files/tslint.json.template      |   2 +-
 15 files changed, 169 insertions(+), 120 deletions(-)
 rename packages/schematics/angular/application/files/{root => }/browserslist.template (100%)
 rename packages/schematics/angular/application/files/{root => }/karma.conf.js.template (100%)
 rename packages/schematics/angular/application/files/src/assets/{__dot__gitkeep.template => .gitkeep.template} (100%)
 rename packages/schematics/angular/application/files/{root => }/tsconfig.app.json.template (77%)
 rename packages/schematics/angular/application/files/{root => }/tsconfig.spec.json.template (65%)
 rename packages/schematics/angular/application/files/{lint/__tsLintRoot__ => }/tslint.json.template (73%)

diff --git a/packages/schematics/angular/application/files/root/browserslist.template b/packages/schematics/angular/application/files/browserslist.template
similarity index 100%
rename from packages/schematics/angular/application/files/root/browserslist.template
rename to packages/schematics/angular/application/files/browserslist.template
diff --git a/packages/schematics/angular/application/files/root/karma.conf.js.template b/packages/schematics/angular/application/files/karma.conf.js.template
similarity index 100%
rename from packages/schematics/angular/application/files/root/karma.conf.js.template
rename to packages/schematics/angular/application/files/karma.conf.js.template
diff --git a/packages/schematics/angular/application/files/src/assets/__dot__gitkeep.template b/packages/schematics/angular/application/files/src/assets/.gitkeep.template
similarity index 100%
rename from packages/schematics/angular/application/files/src/assets/__dot__gitkeep.template
rename to packages/schematics/angular/application/files/src/assets/.gitkeep.template
diff --git a/packages/schematics/angular/application/files/root/tsconfig.app.json.template b/packages/schematics/angular/application/files/tsconfig.app.json.template
similarity index 77%
rename from packages/schematics/angular/application/files/root/tsconfig.app.json.template
rename to packages/schematics/angular/application/files/tsconfig.app.json.template
index d3cef1c5aa03..d24bbb988f70 100644
--- a/packages/schematics/angular/application/files/root/tsconfig.app.json.template
+++ b/packages/schematics/angular/application/files/tsconfig.app.json.template
@@ -4,10 +4,12 @@
     "outDir": "<%= relativePathToWorkspaceRoot %>/out-tsc/app",
     "types": []
   },
+  "include": [
+    "src/**/*.ts"
+  ],
   "exclude": [
-    "test.ts",
-    "**/*.spec.ts",
-    "e2e/**"
+    "src/test.ts",
+    "src/**/*.spec.ts"
   ]<% if (enableIvy) { %>,
   "angularCompilerOptions": {
     "enableIvy": true
diff --git a/packages/schematics/angular/application/files/root/tsconfig.spec.json.template b/packages/schematics/angular/application/files/tsconfig.spec.json.template
similarity index 65%
rename from packages/schematics/angular/application/files/root/tsconfig.spec.json.template
rename to packages/schematics/angular/application/files/tsconfig.spec.json.template
index d275c27a05df..72aa864c8732 100644
--- a/packages/schematics/angular/application/files/root/tsconfig.spec.json.template
+++ b/packages/schematics/angular/application/files/tsconfig.spec.json.template
@@ -8,11 +8,11 @@
     ]
   },
   "files": [
-    "<%= rootInSrc ? '' : 'src/' %>test.ts",
-    "<%= rootInSrc ? '' : 'src/' %>polyfills.ts"
+    "src/test.ts",
+    "src/polyfills.ts"
   ],
   "include": [
-    "**/*.spec.ts",
-    "**/*.d.ts"
+    "src/**/*.spec.ts",
+    "src/**/*.d.ts"
   ]
 }
diff --git a/packages/schematics/angular/application/files/lint/__tsLintRoot__/tslint.json.template b/packages/schematics/angular/application/files/tslint.json.template
similarity index 73%
rename from packages/schematics/angular/application/files/lint/__tsLintRoot__/tslint.json.template
rename to packages/schematics/angular/application/files/tslint.json.template
index 1ebe192c95f2..b9ce956376d6 100644
--- a/packages/schematics/angular/application/files/lint/__tsLintRoot__/tslint.json.template
+++ b/packages/schematics/angular/application/files/tslint.json.template
@@ -1,5 +1,6 @@
-{
-  "extends": "<%= relativePathToWorkspaceRoot %>/tslint.json",
+{<% if (!isRootApp) { %>
+  "extends": "<%= relativePathToWorkspaceRoot %>/tslint.json",<%
+  } %>
   "rules": {
     "directive-selector": [
       true,
diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 8d0b1eb22fa5..7a5d0ea19705 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -6,12 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {
+  JsonAstObject,
   JsonObject,
   JsonParseMode,
   join,
   normalize,
   parseJsonAst,
-  relative,
   strings,
 } from '@angular-devkit/core';
 import {
@@ -103,6 +103,78 @@ function addDependenciesToPackageJson(options: ApplicationOptions) {
   };
 }
 
+function readTsLintConfig(host: Tree, path: string): JsonAstObject {
+  const buffer = host.read(path);
+  if (!buffer) {
+    throw new SchematicsException(`Could not read ${path}.`);
+  }
+
+  const config = parseJsonAst(buffer.toString(), JsonParseMode.Loose);
+  if (config.kind !== 'object') {
+    throw new SchematicsException(`Invalid ${path}. Was expecting an object.`);
+  }
+
+  return config;
+}
+
+/**
+ * Merges the application tslint.json with the workspace tslint.json
+ * when the application being created is a root application
+ *
+ * @param {Tree} parentHost The root host of the schematic
+ */
+function mergeWithRootTsLint(parentHost: Tree) {
+  return (host: Tree) => {
+    const tsLintPath = '/tslint.json';
+    if (!host.exists(tsLintPath)) {
+      return;
+    }
+
+    const rootTslintConfig = readTsLintConfig(parentHost, tsLintPath);
+    const appTslintConfig = readTsLintConfig(host, tsLintPath);
+
+    const recorder = host.beginUpdate(tsLintPath);
+    rootTslintConfig.properties.forEach(prop => {
+      if (findPropertyInAstObject(appTslintConfig, prop.key.value)) {
+        // property already exists. Skip!
+        return;
+      }
+
+      insertPropertyInAstObjectInOrder(
+        recorder,
+        appTslintConfig,
+        prop.key.value,
+        prop.value.value,
+        2,
+      );
+    });
+
+    const rootRules = findPropertyInAstObject(rootTslintConfig, 'rules');
+    const appRules = findPropertyInAstObject(appTslintConfig, 'rules');
+
+    if (!appRules || appRules.kind !== 'object' || !rootRules || rootRules.kind !== 'object') {
+      // rules are not valid. Skip!
+      return;
+    }
+
+    rootRules.properties.forEach(prop => {
+      insertPropertyInAstObjectInOrder(
+        recorder,
+        appRules,
+        prop.key.value,
+        prop.value.value,
+        4,
+      );
+    });
+
+    host.commitUpdate(recorder);
+
+    // this shouldn't be needed but at the moment without this formatting is not correct.
+    const content = readTsLintConfig(host, tsLintPath);
+    host.overwrite(tsLintPath, JSON.stringify(content.value, undefined, 2));
+  };
+}
+
 function addPostInstallScript() {
   return (host: Tree) => {
     const pkgJsonPath = '/package.json';
@@ -148,15 +220,14 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
   // if (workspaceJson.value === null) {
   //   throw new SchematicsException(`Unable to parse configuration file (${workspacePath}).`);
   // }
+
   let projectRoot = options.projectRoot !== undefined
     ? options.projectRoot
-    : `${workspace.newProjectRoot || ''}/${options.name}`;
+    : `${workspace.newProjectRoot}/${options.name}`;
+
   if (projectRoot !== '' && !projectRoot.endsWith('/')) {
     projectRoot += '/';
   }
-  const rootFilesRoot = options.projectRoot === undefined
-    ? projectRoot
-    : projectRoot + 'src/';
 
   const schematics: JsonObject = {};
 
@@ -186,9 +257,10 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
     });
   }
 
+  const sourceRoot = join(normalize(projectRoot), 'src');
   const project: WorkspaceProject = {
     root: projectRoot,
-    sourceRoot: join(normalize(projectRoot), 'src'),
+    sourceRoot,
     projectType: ProjectType.Application,
     prefix: options.prefix || 'app',
     schematics,
@@ -197,16 +269,16 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
         builder: Builders.Browser,
         options: {
           outputPath: `dist/${options.name}`,
-          index: `${projectRoot}src/index.html`,
-          main: `${projectRoot}src/main.ts`,
-          polyfills: `${projectRoot}src/polyfills.ts`,
-          tsConfig: `${rootFilesRoot}tsconfig.app.json`,
+          index: `${sourceRoot}/index.html`,
+          main: `${sourceRoot}/main.ts`,
+          polyfills: `${sourceRoot}/polyfills.ts`,
+          tsConfig: `${projectRoot}tsconfig.app.json`,
           assets: [
-            join(normalize(projectRoot), 'src', 'favicon.ico'),
-            join(normalize(projectRoot), 'src', 'assets'),
+            `${sourceRoot}/favicon.ico`,
+            `${sourceRoot}/assets`,
           ],
           styles: [
-            `${projectRoot}src/styles.${options.style}`,
+            `${sourceRoot}/styles.${options.style}`,
           ],
           scripts: [],
           es5BrowserSupport: true,
@@ -214,8 +286,8 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
         configurations: {
           production: {
             fileReplacements: [{
-              replace: `${projectRoot}src/environments/environment.ts`,
-              with: `${projectRoot}src/environments/environment.prod.ts`,
+              replace: `${sourceRoot}/environments/environment.ts`,
+              with: `${sourceRoot}/environments/environment.prod.ts`,
             }],
             optimization: true,
             outputHashing: 'all',
@@ -254,26 +326,26 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
       test: {
         builder: Builders.Karma,
         options: {
-          main: `${projectRoot}src/test.ts`,
-          polyfills: `${projectRoot}src/polyfills.ts`,
-          tsConfig: `${rootFilesRoot}tsconfig.spec.json`,
-          karmaConfig: `${rootFilesRoot}karma.conf.js`,
+          main: `${sourceRoot}/test.ts`,
+          polyfills: `${sourceRoot}/polyfills.ts`,
+          tsConfig: `${projectRoot}tsconfig.spec.json`,
+          karmaConfig: `${projectRoot}karma.conf.js`,
+          assets: [
+            `${sourceRoot}/favicon.ico`,
+            `${sourceRoot}/assets`,
+          ],
           styles: [
-            `${projectRoot}src/styles.${options.style}`,
+            `${sourceRoot}/styles.${options.style}`,
           ],
           scripts: [],
-          assets: [
-            join(normalize(projectRoot), 'src', 'favicon.ico'),
-            join(normalize(projectRoot), 'src', 'assets'),
-          ],
         },
       },
       lint: {
         builder: Builders.TsLint,
         options: {
           tsConfig: [
-            `${rootFilesRoot}tsconfig.app.json`,
-            `${rootFilesRoot}tsconfig.spec.json`,
+            `${projectRoot}tsconfig.app.json`,
+            `${projectRoot}tsconfig.spec.json`,
           ],
           exclude: [
             '**/node_modules/**',
@@ -282,19 +354,12 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
       },
     },
   };
-  // tslint:disable-next-line:no-any
-  // const projects: JsonObject = (<any> workspaceAst.value).projects || {};
-  // tslint:disable-next-line:no-any
-  // if (!(<any> workspaceAst.value).projects) {
-  //   // tslint:disable-next-line:no-any
-  //   (<any> workspaceAst.value).projects = projects;
-  // }
 
   return addProjectToWorkspace(workspace, options.name, project);
 }
 
 function minimalPathFilter(path: string): boolean {
-  const toRemoveList = /(test.ts|tsconfig.spec.json|karma.conf.js).template$/;
+  const toRemoveList = /(test.ts|tsconfig.spec.json|karma.conf.js|tslint.json).template$/;
 
   return !toRemoveList.test(path);
 }
@@ -305,8 +370,8 @@ export default function (options: ApplicationOptions): Rule {
       throw new SchematicsException(`Invalid options, "name" is required.`);
     }
     validateProjectName(options.name);
-    const prefix = options.prefix || 'app';
-    const appRootSelector = `${prefix}-root`;
+    options.prefix = options.prefix || 'app';
+    const appRootSelector = `${options.prefix}-root`;
     const componentOptions: Partial<ComponentOptions> = !options.minimal ?
       {
         inlineStyle: options.inlineStyle,
@@ -323,23 +388,15 @@ export default function (options: ApplicationOptions): Rule {
       };
 
     const workspace = getWorkspace(host);
-    let newProjectRoot = workspace.newProjectRoot || '';
-    let appDir = `${newProjectRoot}/${options.name}`;
-    let sourceRoot = `${appDir}/src`;
-    let sourceDir = `${sourceRoot}/app`;
-    let relativePathToWorkspaceRoot = appDir.split('/').map(x => '..').join('/');
-    const rootInSrc = options.projectRoot !== undefined;
-    if (options.projectRoot !== undefined) {
-      newProjectRoot = options.projectRoot;
-      appDir = `${newProjectRoot}/src`;
-      sourceRoot = appDir;
-      sourceDir = `${sourceRoot}/app`;
-      relativePathToWorkspaceRoot = relative(normalize('/' + sourceRoot), normalize('/'));
-      if (relativePathToWorkspaceRoot === '') {
-        relativePathToWorkspaceRoot = '.';
-      }
-    }
-    const tsLintRoot = appDir;
+    const newProjectRoot = workspace.newProjectRoot || '';
+    const isRootApp = options.projectRoot !== undefined;
+    const appDir = isRootApp
+      ? options.projectRoot as string
+      : `${newProjectRoot}/${options.name}`;
+    const relativePathToWorkspaceRoot = appDir
+      ? appDir.split('/').map(() => '..').join('/')
+      : '.';
+    const sourceDir = `${appDir}/src/app`;
 
     const e2eOptions: E2eOptions = {
       relatedAppName: options.name,
@@ -349,43 +406,18 @@ export default function (options: ApplicationOptions): Rule {
     return chain([
       addAppToWorkspaceFile(options, workspace),
       mergeWith(
-        apply(url('./files/src'), [
-          options.minimal ? filter(minimalPathFilter) : noop(),
-          applyTemplates({
-            utils: strings,
-            ...options,
-            'dot': '.',
-            relativePathToWorkspaceRoot,
-          }),
-          move(sourceRoot),
-        ])),
-      mergeWith(
-        apply(url('./files/root'), [
+        apply(url('./files'), [
           options.minimal ? filter(minimalPathFilter) : noop(),
           applyTemplates({
             utils: strings,
             ...options,
-            'dot': '.',
             relativePathToWorkspaceRoot,
-            rootInSrc,
             appName: options.name,
+            isRootApp,
           }),
+          isRootApp ? mergeWithRootTsLint(host) : noop(),
           move(appDir),
-        ])),
-      options.minimal ? noop() : mergeWith(
-        apply(url('./files/lint'), [
-          applyTemplates({
-            utils: strings,
-            ...options,
-            tsLintRoot,
-            relativePathToWorkspaceRoot,
-            prefix,
-          }),
-          // TODO: Moving should work but is bugged right now.
-          // The __tsLintRoot__ is being used meanwhile.
-          // Otherwise the tslint.json file could be inside of the root folder and
-          // this block and the lint folder could be removed.
-        ])),
+        ]), MergeStrategy.Overwrite),
       schematic('module', {
         name: 'app',
         commonModule: false,
@@ -410,11 +442,11 @@ export default function (options: ApplicationOptions): Rule {
             ? filter(path => !path.endsWith('.html.template'))
             : noop(),
           componentOptions.skipTests
-            ? filter(path => !/[.|-]spec.ts.template$/.test(path))
+            ? filter(path => !path.endsWith('.spec.ts.template'))
             : noop(),
           applyTemplates({
             utils: strings,
-            ...options as any,  // tslint:disable-line:no-any
+            ...options,
             selector: appRootSelector,
             ...componentOptions,
           }),
@@ -423,7 +455,7 @@ export default function (options: ApplicationOptions): Rule {
       options.minimal ? noop() : schematic('e2e', e2eOptions),
       options.enableIvy ? addPostInstallScript() : noop(),
       options.skipPackageJson ? noop() : addDependenciesToPackageJson(options),
-      options.lintFix ? applyLintFix(sourceDir) : noop(),
+      options.lintFix ? applyLintFix(appDir) : noop(),
     ]);
   };
 }
diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
index efa28c282202..9555887e4838 100644
--- a/packages/schematics/angular/application/index_spec.ts
+++ b/packages/schematics/angular/application/index_spec.ts
@@ -253,10 +253,10 @@ describe('Application Schematic', () => {
       const tree = schematicRunner.runSchematic('application', options, workspaceTree);
       const files = tree.files;
       expect(files).toEqual(jasmine.arrayContaining([
-        '/src/karma.conf.js',
-        '/src/tsconfig.app.json',
-        '/src/tsconfig.spec.json',
-        '/src/tslint.json',
+        '/karma.conf.js',
+        '/tsconfig.app.json',
+        '/tsconfig.spec.json',
+        '/tslint.json',
         '/src/environments/environment.ts',
         '/src/environments/environment.prod.ts',
         '/src/favicon.ico',
@@ -284,12 +284,12 @@ describe('Application Schematic', () => {
       expect(buildOpt.index).toEqual('src/index.html');
       expect(buildOpt.main).toEqual('src/main.ts');
       expect(buildOpt.polyfills).toEqual('src/polyfills.ts');
-      expect(buildOpt.tsConfig).toEqual('src/tsconfig.app.json');
+      expect(buildOpt.tsConfig).toEqual('tsconfig.app.json');
 
       const testOpt = prj.architect.test.options;
       expect(testOpt.main).toEqual('src/test.ts');
-      expect(testOpt.tsConfig).toEqual('src/tsconfig.spec.json');
-      expect(testOpt.karmaConfig).toEqual('src/karma.conf.js');
+      expect(testOpt.tsConfig).toEqual('tsconfig.spec.json');
+      expect(testOpt.karmaConfig).toEqual('karma.conf.js');
       expect(testOpt.styles).toEqual([
         'src/styles.css',
       ]);
@@ -314,21 +314,31 @@ describe('Application Schematic', () => {
     it('should set the relative tsconfig paths', () => {
       const options = { ...defaultOptions, projectRoot: '' };
       const tree = schematicRunner.runSchematic('application', options, workspaceTree);
-      const appTsConfig = JSON.parse(tree.readContent('/src/tsconfig.app.json'));
-      expect(appTsConfig.extends).toEqual('../tsconfig.json');
-      const specTsConfig = JSON.parse(tree.readContent('/src/tsconfig.spec.json'));
-      expect(specTsConfig.extends).toEqual('../tsconfig.json');
-      expect(specTsConfig.files).toEqual(['test.ts', 'polyfills.ts']);
+      const appTsConfig = JSON.parse(tree.readContent('/tsconfig.app.json'));
+      expect(appTsConfig.extends).toEqual('./tsconfig.json');
+      const specTsConfig = JSON.parse(tree.readContent('/tsconfig.spec.json'));
+      expect(specTsConfig.extends).toEqual('./tsconfig.json');
+      expect(specTsConfig.files).toEqual(['src/test.ts', 'src/polyfills.ts']);
     });
 
     it('should set the relative path and prefix in the tslint file', () => {
       const options = { ...defaultOptions, projectRoot: '' };
 
       const tree = schematicRunner.runSchematic('application', options, workspaceTree);
-      const content = JSON.parse(tree.readContent('/src/tslint.json'));
-      expect(content.extends).toMatch('../tslint.json');
+      const content = JSON.parse(tree.readContent('/tslint.json'));
+      expect(content.extends).toMatch('tslint:recommended');
       expect(content.rules['directive-selector'][2]).toMatch('app');
       expect(content.rules['component-selector'][2]).toMatch('app');
     });
+
+    it('should merge tslint file', () => {
+      const options = { ...defaultOptions, projectRoot: '' };
+
+      const tree = schematicRunner.runSchematic('application', options, workspaceTree);
+      const content = JSON.parse(tree.readContent('/tslint.json'));
+      expect(content.extends).toMatch('tslint:recommended');
+      expect(content.rules['component-selector'][2]).toMatch('app');
+      expect(content.rules['trailing-comma']).toBeDefined();
+    });
   });
 });
diff --git a/packages/schematics/angular/e2e/files/tsconfig.json.template b/packages/schematics/angular/e2e/files/tsconfig.json.template
index 5df5f432cbca..cc3e6d1cb952 100644
--- a/packages/schematics/angular/e2e/files/tsconfig.json.template
+++ b/packages/schematics/angular/e2e/files/tsconfig.json.template
@@ -10,4 +10,4 @@
       "node"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/packages/schematics/angular/e2e/index.ts b/packages/schematics/angular/e2e/index.ts
index 9445f2288303..94a47bf8744f 100644
--- a/packages/schematics/angular/e2e/index.ts
+++ b/packages/schematics/angular/e2e/index.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { strings } from '@angular-devkit/core';
+import { normalize, strings } from '@angular-devkit/core';
 import {
   Rule,
   SchematicContext,
@@ -24,7 +24,7 @@ import { Builders, WorkspaceSchema } from '../utility/workspace-models';
 import { Schema as E2eOptions } from './schema';
 
 function getE2eRoot(projectRoot: string): string {
-  const root = projectRoot.split('/').filter(x => x).join('/');
+  const root = normalize(projectRoot);
 
   return root ? root + '/e2e' : 'e2e';
 }
diff --git a/packages/schematics/angular/ng-new/index_spec.ts b/packages/schematics/angular/ng-new/index_spec.ts
index 772ab5b1fd39..96396fc942ad 100644
--- a/packages/schematics/angular/ng-new/index_spec.ts
+++ b/packages/schematics/angular/ng-new/index_spec.ts
@@ -34,7 +34,7 @@ describe('Ng New Schematic', () => {
     const tree = schematicRunner.runSchematic('ng-new', options);
     const files = tree.files;
     expect(files).toEqual(jasmine.arrayContaining([
-      '/bar/src/tsconfig.app.json',
+      '/bar/tsconfig.app.json',
       '/bar/src/main.ts',
       '/bar/src/app/app.module.ts',
       '/bar/e2e/src/app.po.ts',
diff --git a/packages/schematics/angular/universal/index.ts b/packages/schematics/angular/universal/index.ts
index 9ac859eb80b9..7ed9a952ad5a 100644
--- a/packages/schematics/angular/universal/index.ts
+++ b/packages/schematics/angular/universal/index.ts
@@ -248,8 +248,12 @@ export default function (options: UniversalOptions): Rule {
     if (!clientTargets.build) {
       throw targetBuildNotFoundError();
     }
-    const tsConfigExtends = basename(normalize(clientTargets.build.options.tsConfig));
-    const rootInSrc = clientProject.root === '';
+
+    const clientTsConfig = normalize(clientTargets.build.options.tsConfig);
+    const tsConfigExtends = basename(clientTsConfig);
+    // this is needed because prior to version 8, tsconfig might have been in 'src'
+    // and we don't want to break the 'ng add @nguniversal/express-engine schematics'
+    const rootInSrc = clientProject.root === '' && clientTsConfig.includes('src/');
     const tsConfigDirectory = join(normalize(clientProject.root), rootInSrc ? 'src' : '');
 
     if (!options.skipInstall) {
diff --git a/packages/schematics/angular/universal/index_spec.ts b/packages/schematics/angular/universal/index_spec.ts
index e91de58f7e66..9c788f0f591d 100644
--- a/packages/schematics/angular/universal/index_spec.ts
+++ b/packages/schematics/angular/universal/index_spec.ts
@@ -73,22 +73,22 @@ describe('Universal Schematic', () => {
 
   it('should create a tsconfig file for the workspace project', () => {
     const tree = schematicRunner.runSchematic('universal', workspaceUniversalOptions, appTree);
-    const filePath = '/src/tsconfig.server.json';
+    const filePath = '/tsconfig.server.json';
     expect(tree.exists(filePath)).toEqual(true);
     const contents = tree.readContent(filePath);
     expect(JSON.parse(contents)).toEqual({
       extends: './tsconfig.app.json',
       compilerOptions: {
-        outDir: '../out-tsc/app-server',
+        outDir: './out-tsc/app-server',
         baseUrl: '.',
       },
       angularCompilerOptions: {
-        entryModule: 'app/app.server.module#AppServerModule',
+        entryModule: 'src/app/app.server.module#AppServerModule',
       },
     });
     const angularConfig = JSON.parse(tree.readContent('angular.json'));
     expect(angularConfig.projects.workspace.architect
-      .server.options.tsConfig).toEqual('src/tsconfig.server.json');
+      .server.options.tsConfig).toEqual('tsconfig.server.json');
   });
 
   it('should create a tsconfig file for a generated application', () => {
diff --git a/packages/schematics/angular/utility/workspace-models.ts b/packages/schematics/angular/utility/workspace-models.ts
index d697a4bb121d..3d226000317b 100644
--- a/packages/schematics/angular/utility/workspace-models.ts
+++ b/packages/schematics/angular/utility/workspace-models.ts
@@ -37,7 +37,7 @@ export interface BrowserBuilderBaseOptions {
     outputPath?: string;
     index?: string;
     polyfills: string;
-    assets?: object[];
+    assets?: (object|string)[];
     styles?: string[];
     scripts?: string[];
     sourceMap?: boolean;
diff --git a/packages/schematics/angular/workspace/files/tslint.json.template b/packages/schematics/angular/workspace/files/tslint.json.template
index 868ecba0db1b..e7e7c249a543 100644
--- a/packages/schematics/angular/workspace/files/tslint.json.template
+++ b/packages/schematics/angular/workspace/files/tslint.json.template
@@ -72,4 +72,4 @@
     "component-class-suffix": true,
     "directive-class-suffix": true
   }
-}
+}
\ No newline at end of file

From 9d4a0935e98d60a28841db98c2d5b408a4ece6f5 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 5 Mar 2019 08:58:08 +0100
Subject: [PATCH 0866/1703] test: update e2e to support new `ng new` layout

---
 tests/legacy-cli/e2e/tests/basic/test.ts      |   5 +-
 .../e2e/tests/build/build-app-shell.ts        |  21 ++--
 .../e2e/tests/build/build-errors.ts           | 109 ++++++++++--------
 .../e2e/tests/build/platform-server.ts        |  32 ++---
 .../e2e/tests/commands/new/new-minimal.ts     |  38 +++---
 .../e2e/tests/i18n/extract-default.ts         |  26 ++---
 .../e2e/tests/i18n/extract-locale.ts          |   2 +-
 .../e2e/tests/i18n/extract-outfile.ts         |   2 +-
 .../legacy-cli/e2e/tests/i18n/extract-xmb.ts  |  10 +-
 .../e2e/tests/misc/different-file-format.ts   |   2 +-
 tests/legacy-cli/e2e/utils/project.ts         |   4 +-
 11 files changed, 121 insertions(+), 130 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/basic/test.ts b/tests/legacy-cli/e2e/tests/basic/test.ts
index c95a026b867c..c3cd6a3d36f6 100644
--- a/tests/legacy-cli/e2e/tests/basic/test.ts
+++ b/tests/legacy-cli/e2e/tests/basic/test.ts
@@ -5,7 +5,6 @@ import { moveFile } from '../../utils/fs';
 export default function () {
   // make sure both --watch=false work
   return ng('test', '--watch=false')
-    .then(() => moveFile('./src/karma.conf.js',
-      './src/karma.conf.bis.js'))
-    .then(() => ng('test', '--watch=false', '--karmaConfig=src/karma.conf.bis.js'));
+    .then(() => moveFile('./karma.conf.js', './karma.conf.bis.js'))
+    .then(() => ng('test', '--watch=false', '--karmaConfig=karma.conf.bis.js'));
 }
diff --git a/tests/legacy-cli/e2e/tests/build/build-app-shell.ts b/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
index ee8fe2b672cd..70c0b8b8498d 100644
--- a/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
+++ b/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
@@ -1,10 +1,9 @@
-import { ng, npm } from '../../utils/process';
-import { expectFileToMatch, writeFile } from '../../utils/fs';
+import { stripIndent } from 'common-tags';
 import { getGlobalVariable } from '../../utils/env';
-import { expectToFail } from '../../utils/utils';
+import { expectFileToMatch, writeFile } from '../../utils/fs';
+import { ng, npm } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { readNgVersion } from '../../utils/version';
-import { stripIndent } from 'common-tags';
 
 
 export default function () {
@@ -29,7 +28,7 @@ export default function () {
         options: {
           outputPath: 'dist/test-project-server',
           main: 'src/main.server.ts',
-          tsConfig: 'src/tsconfig.server.json'
+          tsConfig: 'tsconfig.server.json'
         }
       };
       appArchitect['app-shell'] = {
@@ -41,21 +40,17 @@ export default function () {
         }
       };
     }))
-    .then(() => writeFile('./src/tsconfig.server.json', `
+    .then(() => writeFile('./tsconfig.server.json', `
       {
-        "extends": "../tsconfig.json",
+        "extends": "./tsconfig.app.json",
         "compilerOptions": {
           "outDir": "../dist-server",
           "baseUrl": "./",
           "module": "commonjs",
           "types": []
         },
-        "exclude": [
-          "test.ts",
-          "**/*.spec.ts"
-        ],
         "angularCompilerOptions": {
-          "entryModule": "app/app.server.module#AppServerModule"
+          "entryModule": "src/app/app.server.module#AppServerModule"
         }
       }
     `))
@@ -137,4 +132,4 @@ export default function () {
     .then(() => npm('install')))
     .then(() => ng('run', 'test-project:app-shell'))
     .then(() => expectFileToMatch('dist/test-project/index.html', /shell Works!/));
-}
+}
\ No newline at end of file
diff --git a/tests/legacy-cli/e2e/tests/build/build-errors.ts b/tests/legacy-cli/e2e/tests/build/build-errors.ts
index 66f4b36807ee..ccfe80b7c117 100644
--- a/tests/legacy-cli/e2e/tests/build/build-errors.ts
+++ b/tests/legacy-cli/e2e/tests/build/build-errors.ts
@@ -12,7 +12,7 @@ const extraErrors = [
   `main.ts is not part of the TypeScript compilation.`,
 ];
 
-export default function () {
+export default function() {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   if (process.platform.startsWith('win')) {
@@ -26,52 +26,61 @@ export default function () {
 
   let origContent: string;
 
-  return Promise.resolve()
-    // Save the original contents of `./src/app/app.component.ts`.
-    .then(() => readFile('./src/app/app.component.ts'))
-    .then((contents) => origContent = contents)
-    // Check `part of the TypeScript compilation` errors.
-    // These should show an error only for the missing file.
-    .then(() => updateJsonFile('./src/tsconfig.app.json', configJson => {
-      configJson.files = ['main.ts'];
-    }))
-    .then(() => expectToFail(() => ng('build')))
-    .then(({ message }) => {
-      if (!message.includes('polyfills.ts is missing from the TypeScript compilation')) {
-        throw new Error(`Expected missing TS file error, got this instead:\n${message}`);
-      }
-      if (extraErrors.some((e) => message.includes(e))) {
-        throw new Error(`Did not expect extra errors but got:\n${message}`);
-      }
-    })
-    .then(() => updateJsonFile('./src/tsconfig.app.json', configJson => {
-      configJson.files = undefined;
-    }))
-    // Check simple single syntax errors.
-    // These shouldn't skip emit and just show a TS error.
-    .then(() => appendToFile('./src/app/app.component.ts', ']]]'))
-    .then(() => expectToFail(() => ng('build')))
-    .then(({ message }) => {
-      if (!message.includes('Declaration or statement expected.')) {
-        throw new Error(`Expected syntax error, got this instead:\n${message}`);
-      }
-      if (extraErrors.some((e) => message.includes(e))) {
-        throw new Error(`Did not expect extra errors but got:\n${message}`);
-      }
-    })
-    .then(() => writeFile('./src/app/app.component.ts', origContent))
-    // Check errors when files were not emitted due to static analysis errors.
-    .then(() => replaceInFile('./src/app/app.component.ts', `'app-root'`, `(() => 'app-root')()`))
-    .then(() => expectToFail(() => ng('build', '--aot')))
-    .then(({ message }) => {
-      if (!message.includes('Function calls are not supported')
-        && !message.includes('Function expressions are not supported in decorators')
-        && !message.includes('selector must be a string')) {
-        throw new Error(`Expected static analysis error, got this instead:\n${message}`);
-      }
-      if (extraErrors.some((e) => message.includes(e))) {
-        throw new Error(`Did not expect extra errors but got:\n${message}`);
-      }
-    })
-    .then(() => writeFile('./src/app/app.component.ts', origContent));
-}
+  return (
+    Promise.resolve()
+      // Save the original contents of `./src/app/app.component.ts`.
+      .then(() => readFile('./src/app/app.component.ts'))
+      .then(contents => (origContent = contents))
+      // Check `part of the TypeScript compilation` errors.
+      // These should show an error only for the missing file.
+      .then(() =>
+        updateJsonFile('./tsconfig.app.json', configJson => {
+          (configJson.include = undefined), (configJson.files = ['src/main.ts']);
+        }),
+      )
+      .then(() => expectToFail(() => ng('build')))
+      .then(({ message }) => {
+        if (!message.includes('polyfills.ts is missing from the TypeScript compilation')) {
+          throw new Error(`Expected missing TS file error, got this instead:\n${message}`);
+        }
+        if (extraErrors.some(e => message.includes(e))) {
+          throw new Error(`Did not expect extra errors but got:\n${message}`);
+        }
+      })
+      .then(() =>
+        updateJsonFile('./tsconfig.app.json', configJson => {
+          configJson.include = ['src/**/*.ts'];
+          configJson.files = undefined;
+        }),
+      )
+      // Check simple single syntax errors.
+      // These shouldn't skip emit and just show a TS error.
+      .then(() => appendToFile('./src/app/app.component.ts', ']]]'))
+      .then(() => expectToFail(() => ng('build')))
+      .then(({ message }) => {
+        if (!message.includes('Declaration or statement expected.')) {
+          throw new Error(`Expected syntax error, got this instead:\n${message}`);
+        }
+        if (extraErrors.some(e => message.includes(e))) {
+          throw new Error(`Did not expect extra errors but got:\n${message}`);
+        }
+      })
+      .then(() => writeFile('./src/app/app.component.ts', origContent))
+      // Check errors when files were not emitted due to static analysis errors.
+      .then(() => replaceInFile('./src/app/app.component.ts', `'app-root'`, `(() => 'app-root')()`))
+      .then(() => expectToFail(() => ng('build', '--aot')))
+      .then(({ message }) => {
+        if (
+          !message.includes('Function calls are not supported') &&
+          !message.includes('Function expressions are not supported in decorators') &&
+          !message.includes('selector must be a string')
+        ) {
+          throw new Error(`Expected static analysis error, got this instead:\n${message}`);
+        }
+        if (extraErrors.some(e => message.includes(e))) {
+          throw new Error(`Did not expect extra errors but got:\n${message}`);
+        }
+      })
+      .then(() => writeFile('./src/app/app.component.ts', origContent))
+  );
+}
\ No newline at end of file
diff --git a/tests/legacy-cli/e2e/tests/build/platform-server.ts b/tests/legacy-cli/e2e/tests/build/platform-server.ts
index 3c7ab71a42b7..fd471cf2b755 100644
--- a/tests/legacy-cli/e2e/tests/build/platform-server.ts
+++ b/tests/legacy-cli/e2e/tests/build/platform-server.ts
@@ -1,17 +1,14 @@
 import { normalize } from 'path';
-
-import { updateJsonFile, updateTsConfig } from '../../utils/project';
+import { getGlobalVariable } from '../../utils/env';
 import {
+  appendToFile,
   expectFileToMatch,
-  writeFile,
-  replaceInFile,
   prependToFile,
-  appendToFile,
+  writeFile,
 } from '../../utils/fs';
-import { ng, silentNpm, exec } from '../../utils/process';
-import { getGlobalVariable } from '../../utils/env';
+import { exec, ng, silentNpm } from '../../utils/process';
+import { updateJsonFile } from '../../utils/project';
 import { readNgVersion } from '../../utils/version';
-import { expectToFail } from '../../utils/utils';
 
 export default function () {
   let platformServerVersion = readNgVersion();
@@ -41,25 +38,21 @@ export default function () {
         options: {
           outputPath: 'dist/test-project-server',
           main: 'src/main.server.ts',
-          tsConfig: 'src/tsconfig.server.json',
+          tsConfig: 'tsconfig.server.json',
         },
       };
     }))
-    .then(() => writeFile('./src/tsconfig.server.json', `
+    .then(() => writeFile('./tsconfig.server.json', `
       {
-        "extends": "../tsconfig.json",
+        "extends": "./tsconfig.app.json",
         "compilerOptions": {
           "outDir": "../dist-server",
           "baseUrl": "./",
           "module": "commonjs",
           "types": []
         },
-        "exclude": [
-          "test.ts",
-          "**/*.spec.ts"
-        ],
         "angularCompilerOptions": {
-          "entryModule": "app/app.server.module#AppServerModule"
+          "entryModule": "src/app/app.server.module#AppServerModule"
         }
       }
     `))
@@ -155,9 +148,4 @@ export default function () {
         fs.writeFileSync('dist/test-project-server/index.html', html);
       \});
     `)))
-    // This part of the test requires a non-aot build, which isn't available anymore.
-    // .then(() => ng('run', 'test-project:server', '--bundle-dependencies=all'))
-    // .then(() => expectToFail(() => expectFileToMatch('./dist/test-project-server/main.js',
-    //   /require\(["']@angular\/[^"']*["']\)/)))
-    // .then(() => exec(normalize('node'), 'dist/test-project-server/main.js'));
-}
+}
\ No newline at end of file
diff --git a/tests/legacy-cli/e2e/tests/commands/new/new-minimal.ts b/tests/legacy-cli/e2e/tests/commands/new/new-minimal.ts
index c12d47fd6101..8134d2490179 100644
--- a/tests/legacy-cli/e2e/tests/commands/new/new-minimal.ts
+++ b/tests/legacy-cli/e2e/tests/commands/new/new-minimal.ts
@@ -6,24 +6,26 @@ import {expectToFail} from '../../../utils/utils';
 
 export default function() {
   // TODO(architect): re-enable after figuring out how a new minimal project looks like.
-  return Promise.resolve()
-    .then(() => createProject('minimal-project', '--minimal'))
-    .then(() => expectFileNotToExist('.editorconfig'))
-    .then(() => expectFileNotToExist('README.md'))
-    .then(() => expectFileNotToExist('karma.conf.js'))
-    .then(() => expectFileNotToExist('protractor.conf.js'))
-    .then(() => expectFileNotToExist('src/test.ts'))
-    .then(() => expectFileNotToExist('src/tsconfig.spec.json'))
-    .then(() => expectFileNotToExist('tslint.json'))
-    .then(() => expectFileNotToExist('src/app/app.component.html'))
-    .then(() => expectFileNotToExist('src/app/app.component.css'))
-    .then(() => expectFileNotToExist('src/app/app.component.spec.ts'))
-    .then(() => expectFileNotToExist('src/app/favicon.ico'))
+  return (
+    Promise.resolve()
+      .then(() => createProject('minimal-project', '--minimal'))
+      .then(() => expectFileNotToExist('.editorconfig'))
+      .then(() => expectFileNotToExist('README.md'))
+      .then(() => expectFileNotToExist('karma.conf.js'))
+      .then(() => expectFileNotToExist('protractor.conf.js'))
+      .then(() => expectFileNotToExist('src/test.ts'))
+      .then(() => expectFileNotToExist('tsconfig.spec.json'))
+      .then(() => expectFileNotToExist('tslint.json'))
+      .then(() => expectFileNotToExist('src/app/app.component.html'))
+      .then(() => expectFileNotToExist('src/app/app.component.css'))
+      .then(() => expectFileNotToExist('src/app/app.component.spec.ts'))
+      .then(() => expectFileNotToExist('src/app/favicon.ico'))
 
-    .then(() => expectToFail(() => expectFileToMatch('package.json', '"protractor":')))
-    .then(() => expectToFail(() => expectFileToMatch('package.json', '"karma":')))
-    .then(() => expectToFail(() => expectFileToMatch('package.json', '"jasmine-core":')))
+      .then(() => expectToFail(() => expectFileToMatch('package.json', '"protractor":')))
+      .then(() => expectToFail(() => expectFileToMatch('package.json', '"karma":')))
+      .then(() => expectToFail(() => expectFileToMatch('package.json', '"jasmine-core":')))
 
-    // Try to run a build.
-    .then(() => ng('build'));
+      // Try to run a build.
+      .then(() => ng('build'))
+  );
 }
diff --git a/tests/legacy-cli/e2e/tests/i18n/extract-default.ts b/tests/legacy-cli/e2e/tests/i18n/extract-default.ts
index af1c0330a396..fb7a2d135993 100644
--- a/tests/legacy-cli/e2e/tests/i18n/extract-default.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/extract-default.ts
@@ -1,19 +1,17 @@
-import {join} from 'path';
-import {ng} from '../../utils/process';
-import {
-  expectFileToExist, writeFile,
-  expectFileToMatch
-} from '../../utils/fs';
+import { join } from 'path';
+import { expectFileToExist, expectFileToMatch, writeFile } from '../../utils/fs';
+import { ng } from '../../utils/process';
 
 
-export default function() {
+export default async function() {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
-  return ng('generate', 'component', 'i18n-test')
-    .then(() => writeFile(
-      join('src/app/i18n-test', 'i18n-test.component.html'),
-      '<p i18n>Hello world</p>'))
-    .then(() => ng('xi18n'))
-    .then(() => expectFileToExist(join('src', 'messages.xlf')))
-    .then(() => expectFileToMatch(join('src', 'messages.xlf'), /Hello world/));
+  await ng('generate', 'component', 'i18n-test');
+  await writeFile(
+    join('src/app/i18n-test', 'i18n-test.component.html'),
+    '<p i18n>Hello world</p>',
+  );
+  await ng('xi18n');
+  await expectFileToExist('messages.xlf');
+  await expectFileToMatch('messages.xlf', /Hello world/);
 }
diff --git a/tests/legacy-cli/e2e/tests/i18n/extract-locale.ts b/tests/legacy-cli/e2e/tests/i18n/extract-locale.ts
index de09da9a8e1e..5c1b5e05bc09 100644
--- a/tests/legacy-cli/e2e/tests/i18n/extract-locale.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/extract-locale.ts
@@ -13,7 +13,7 @@ export default function() {
     .then(() => ng('xi18n', '--i18n-locale', 'fr'))
     .then((output) => {
       if (!output.stderr.match(/starting from Angular v4/)) {
-        return expectFileToMatch('src/messages.xlf', 'source-language="fr"');
+        return expectFileToMatch('messages.xlf', 'source-language="fr"');
       }
     });
 }
diff --git a/tests/legacy-cli/e2e/tests/i18n/extract-outfile.ts b/tests/legacy-cli/e2e/tests/i18n/extract-outfile.ts
index b431e953ef2e..5daf48417c98 100644
--- a/tests/legacy-cli/e2e/tests/i18n/extract-outfile.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/extract-outfile.ts
@@ -13,7 +13,7 @@ export default function() {
     .then(() => ng('xi18n', '--out-file', 'messages.fr.xlf'))
     .then((output) => {
       if (!output.stdout.match(/starting from Angular v4/)) {
-        return expectFileToMatch('src/messages.fr.xlf', 'Hello world');
+        return expectFileToMatch('messages.fr.xlf', 'Hello world');
       }
     });
 }
diff --git a/tests/legacy-cli/e2e/tests/i18n/extract-xmb.ts b/tests/legacy-cli/e2e/tests/i18n/extract-xmb.ts
index f03a37fcd606..e931ec8657ec 100644
--- a/tests/legacy-cli/e2e/tests/i18n/extract-xmb.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/extract-xmb.ts
@@ -10,10 +10,10 @@ export default function() {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   return ng('generate', 'component', 'i18n-test')
-    .then(() => writeFile(
-      join('src/app/i18n-test', 'i18n-test.component.html'),
-      '<p i18n>Hello world</p>'))
+    .then(() =>
+      writeFile(join('src/app/i18n-test', 'i18n-test.component.html'), '<p i18n>Hello world</p>'),
+    )
     .then(() => ng('xi18n', '--i18n-format', 'xmb'))
-    .then(() => expectFileToExist('src/messages.xmb'))
-    .then(() => expectFileToMatch('src/messages.xmb', /Hello world/));
+    .then(() => expectFileToExist('messages.xmb'))
+    .then(() => expectFileToMatch('messages.xmb', /Hello world/));
 }
diff --git a/tests/legacy-cli/e2e/tests/misc/different-file-format.ts b/tests/legacy-cli/e2e/tests/misc/different-file-format.ts
index 47ffe11c0943..60b544bc97a6 100644
--- a/tests/legacy-cli/e2e/tests/misc/different-file-format.ts
+++ b/tests/legacy-cli/e2e/tests/misc/different-file-format.ts
@@ -9,7 +9,7 @@ const options = {
 
 export default function() {
   return Promise.resolve()
-    .then(() => fs.prependToFile('./src/tsconfig.app.json', '\ufeff', options))
+    .then(() => fs.prependToFile('./tsconfig.app.json', '\ufeff', options))
     .then(() => fs.prependToFile('angular.json', '\ufeff', options))
     .then(() => ng('build', '--environment=dev'));
 }
diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts
index 1a64118a99c4..af3c7e13133a 100644
--- a/tests/legacy-cli/e2e/utils/project.ts
+++ b/tests/legacy-cli/e2e/utils/project.ts
@@ -55,7 +55,7 @@ export async function prepareProjectForE2e(name) {
   await git('config', 'commit.gpgSign', 'false');
   await useBuiltPackages();
   await useCIChrome('e2e');
-  await useCIChrome('src');
+  await useCIChrome('');
   await useDevKitSnapshots();
   await argv['ng2'] ? useNg2() : Promise.resolve();
   await argv['ng4'] ? useNg4() : Promise.resolve();
@@ -224,7 +224,7 @@ export function useCIDefaults(projectName = 'test-project') {
 
 export function useCIChrome(projectDir: string) {
   const protractorConf = `${projectDir}/protractor.conf.js`;
-  const karmaConf = `${projectDir}/karma.conf.js`;
+  const karmaConf = `${projectDir ? projectDir + '/' : ''}karma.conf.js`;
 
   return Promise.resolve()
     .then(() => updateJsonFile('package.json', json => {

From 0a4c86bac563cb463f1714a0542151155b5e1702 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Tue, 5 Mar 2019 09:49:11 +0100
Subject: [PATCH 0867/1703] style: format touched files in e2e

---
 .../e2e/tests/build/build-app-shell.ts        | 114 +++++++----
 .../e2e/tests/build/platform-server.ts        | 179 +++++++++++-------
 2 files changed, 182 insertions(+), 111 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/build/build-app-shell.ts b/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
index 70c0b8b8498d..8292aff13260 100644
--- a/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
+++ b/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
@@ -5,8 +5,7 @@ import { ng, npm } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { readNgVersion } from '../../utils/version';
 
-
-export default function () {
+export default function() {
   // Skip this test in Angular 2/4.
   if (getGlobalVariable('argv').ng2 || getGlobalVariable('argv').ng4) {
     return Promise.resolve();
@@ -21,26 +20,31 @@ export default function () {
   }
 
   return Promise.resolve()
-    .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
-      appArchitect['server'] = {
-        builder: '@angular-devkit/build-angular:server',
-        options: {
-          outputPath: 'dist/test-project-server',
-          main: 'src/main.server.ts',
-          tsConfig: 'tsconfig.server.json'
-        }
-      };
-      appArchitect['app-shell'] = {
-        builder: '@angular-devkit/build-angular:app-shell',
-        options: {
-          browserTarget: 'test-project:build:production',
-          serverTarget: 'test-project:server',
-          route: '/shell'
-        }
-      };
-    }))
-    .then(() => writeFile('./tsconfig.server.json', `
+    .then(() =>
+      updateJsonFile('angular.json', workspaceJson => {
+        const appArchitect = workspaceJson.projects['test-project'].architect;
+        appArchitect['server'] = {
+          builder: '@angular-devkit/build-angular:server',
+          options: {
+            outputPath: 'dist/test-project-server',
+            main: 'src/main.server.ts',
+            tsConfig: 'tsconfig.server.json',
+          },
+        };
+        appArchitect['app-shell'] = {
+          builder: '@angular-devkit/build-angular:app-shell',
+          options: {
+            browserTarget: 'test-project:build:production',
+            serverTarget: 'test-project:server',
+            route: '/shell',
+          },
+        };
+      }),
+    )
+    .then(() =>
+      writeFile(
+        './tsconfig.server.json',
+        `
       {
         "extends": "./tsconfig.app.json",
         "compilerOptions": {
@@ -53,8 +57,13 @@ export default function () {
           "entryModule": "src/app/app.server.module#AppServerModule"
         }
       }
-    `))
-    .then(() => writeFile('./src/main.server.ts', `
+    `,
+      ),
+    )
+    .then(() =>
+      writeFile(
+        './src/main.server.ts',
+        `
       import { enableProdMode } from '@angular/core';
 
       import { environment } from './environments/environment';
@@ -64,12 +73,22 @@ export default function () {
       }
 
       export { AppServerModule } from './app/app.server.module';
-    `))
-    .then(() => writeFile('./src/app/app.component.html', stripIndent`
+    `,
+      ),
+    )
+    .then(() =>
+      writeFile(
+        './src/app/app.component.html',
+        stripIndent`
       Hello World
       <router-outlet></router-outlet>
-    `))
-    .then(() => writeFile('./src/app/app.module.ts', stripIndent`
+    `,
+      ),
+    )
+    .then(() =>
+      writeFile(
+        './src/app/app.module.ts',
+        stripIndent`
       import { BrowserModule } from '@angular/platform-browser';
       import { NgModule } from '@angular/core';
       import { RouterModule } from '@angular/router';
@@ -85,8 +104,13 @@ export default function () {
         bootstrap: [AppComponent]
       })
       export class AppModule { }
-    `))
-    .then(() => writeFile('./src/app/app.server.module.ts', stripIndent`
+    `,
+      ),
+    )
+    .then(() =>
+      writeFile(
+        './src/app/app.server.module.ts',
+        stripIndent`
       import {NgModule} from '@angular/core';
       import {ServerModule} from '@angular/platform-server';
       import { Routes, RouterModule } from '@angular/router';
@@ -113,8 +137,13 @@ export default function () {
         declarations: [ShellComponent],
       })
       export class AppServerModule {}
-    `))
-    .then(() => writeFile('./src/app/shell.component.ts', stripIndent`
+    `,
+      ),
+    )
+    .then(() =>
+      writeFile(
+        './src/app/shell.component.ts',
+        stripIndent`
       import { Component } from '@angular/core';
       @Component({
         selector: 'app-shell',
@@ -122,14 +151,17 @@ export default function () {
         styles: []
       })
       export class ShellComponent {}
-    `))
-    .then(() => updateJsonFile('package.json', packageJson => {
-      const dependencies = packageJson['dependencies'];
-      dependencies['@angular/platform-server'] = platformServerVersion;
-      // ServerModule depends on @angular/http regardless the app's dependency.
-      dependencies['@angular/http'] = httpVersion;
-    })
-    .then(() => npm('install')))
+    `,
+      ),
+    )
+    .then(() =>
+      updateJsonFile('package.json', packageJson => {
+        const dependencies = packageJson['dependencies'];
+        dependencies['@angular/platform-server'] = platformServerVersion;
+        // ServerModule depends on @angular/http regardless the app's dependency.
+        dependencies['@angular/http'] = httpVersion;
+      }).then(() => npm('install')),
+    )
     .then(() => ng('run', 'test-project:app-shell'))
     .then(() => expectFileToMatch('dist/test-project/index.html', /shell Works!/));
-}
\ No newline at end of file
+}
diff --git a/tests/legacy-cli/e2e/tests/build/platform-server.ts b/tests/legacy-cli/e2e/tests/build/platform-server.ts
index fd471cf2b755..0440ffbeaccb 100644
--- a/tests/legacy-cli/e2e/tests/build/platform-server.ts
+++ b/tests/legacy-cli/e2e/tests/build/platform-server.ts
@@ -1,16 +1,11 @@
 import { normalize } from 'path';
 import { getGlobalVariable } from '../../utils/env';
-import {
-  appendToFile,
-  expectFileToMatch,
-  prependToFile,
-  writeFile,
-} from '../../utils/fs';
+import { appendToFile, expectFileToMatch, prependToFile, writeFile } from '../../utils/fs';
 import { exec, ng, silentNpm } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { readNgVersion } from '../../utils/version';
 
-export default function () {
+export default function() {
   let platformServerVersion = readNgVersion();
   let httpVersion = readNgVersion();
 
@@ -24,25 +19,33 @@ export default function () {
     return Promise.resolve();
   }
 
-  return Promise.resolve()
-    .then(() => updateJsonFile('package.json', packageJson => {
-      const dependencies = packageJson['dependencies'];
-      dependencies['@angular/platform-server'] = platformServerVersion;
-      // ServerModule depends on @angular/http regardless the app's dependency.
-      dependencies['@angular/http'] = httpVersion;
-    }))
-    .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
-      appArchitect['server'] = {
-        builder: '@angular-devkit/build-angular:server',
-        options: {
-          outputPath: 'dist/test-project-server',
-          main: 'src/main.server.ts',
-          tsConfig: 'tsconfig.server.json',
-        },
-      };
-    }))
-    .then(() => writeFile('./tsconfig.server.json', `
+  return (
+    Promise.resolve()
+      .then(() =>
+        updateJsonFile('package.json', packageJson => {
+          const dependencies = packageJson['dependencies'];
+          dependencies['@angular/platform-server'] = platformServerVersion;
+          // ServerModule depends on @angular/http regardless the app's dependency.
+          dependencies['@angular/http'] = httpVersion;
+        }),
+      )
+      .then(() =>
+        updateJsonFile('angular.json', workspaceJson => {
+          const appArchitect = workspaceJson.projects['test-project'].architect;
+          appArchitect['server'] = {
+            builder: '@angular-devkit/build-angular:server',
+            options: {
+              outputPath: 'dist/test-project-server',
+              main: 'src/main.server.ts',
+              tsConfig: 'tsconfig.server.json',
+            },
+          };
+        }),
+      )
+      .then(() =>
+        writeFile(
+          './tsconfig.server.json',
+          `
       {
         "extends": "./tsconfig.app.json",
         "compilerOptions": {
@@ -55,8 +58,13 @@ export default function () {
           "entryModule": "src/app/app.server.module#AppServerModule"
         }
       }
-    `))
-    .then(() => writeFile('./src/main.server.ts', `
+    `,
+        ),
+      )
+      .then(() =>
+        writeFile(
+          './src/main.server.ts',
+          `
       import { enableProdMode } from '@angular/core';
 
       import { environment } from './environments/environment';
@@ -66,8 +74,13 @@ export default function () {
       }
 
       export { AppServerModule } from './app/app.server.module';
-    `))
-    .then(() => writeFile('./src/app/app.server.module.ts', `
+    `,
+        ),
+      )
+      .then(() =>
+        writeFile(
+          './src/app/app.server.module.ts',
+          `
       import { NgModule } from '@angular/core';
       import { BrowserModule } from '@angular/platform-browser';
       import { ServerModule } from '@angular/platform-server';
@@ -84,35 +97,41 @@ export default function () {
         bootstrap: [AppComponent],
       })
       export class AppServerModule {}
-    `))
-    .then(() => silentNpm('install'))
-    // This part of the test requires a non-aot build, which isn't available anymore.
-    // .then(() => ng('run', 'test-project:server'))
-    // // files were created successfully
-    // .then(() => expectFileToMatch('dist/test-project-server/main.js',
-    //   /exports.*AppServerModule/))
-    // .then(() => writeFile('./index.js', `
-    //   require('zone.js/dist/zone-node');
-    //   require('reflect-metadata');
-    //   const fs = require('fs');
-    //   const \{ AppServerModule \} = require('./dist/test-project-server/main');
-    //   const \{ renderModule \} = require('@angular/platform-server');
+    `,
+        ),
+      )
+      .then(() => silentNpm('install'))
+      // This part of the test requires a non-aot build, which isn't available anymore.
+      // .then(() => ng('run', 'test-project:server'))
+      // // files were created successfully
+      // .then(() => expectFileToMatch('dist/test-project-server/main.js',
+      //   /exports.*AppServerModule/))
+      // .then(() => writeFile('./index.js', `
+      //   require('zone.js/dist/zone-node');
+      //   require('reflect-metadata');
+      //   const fs = require('fs');
+      //   const \{ AppServerModule \} = require('./dist/test-project-server/main');
+      //   const \{ renderModule \} = require('@angular/platform-server');
 
-    //   renderModule(AppServerModule, \{
-    //     url: '/',
-    //     document: '<app-root></app-root>'
-    //   \}).then(html => \{
-    //     fs.writeFileSync('dist/test-project-server/index.html', html);
-    //   \});
-    // `))
-    // .then(() => exec(normalize('node'), 'index.js'))
-    // .then(() => expectFileToMatch('dist/test-project-server/index.html',
-    //   new RegExp('<h2 _ngcontent-c0="">Here are some links to help you start: </h2>')))
-    .then(() => ng('run', 'test-project:server'))
-    // files were created successfully
-    .then(() => expectFileToMatch('dist/test-project-server/main.js',
-      /exports.*AppServerModuleNgFactory/))
-    .then(() => writeFile('./index.js', `
+      //   renderModule(AppServerModule, \{
+      //     url: '/',
+      //     document: '<app-root></app-root>'
+      //   \}).then(html => \{
+      //     fs.writeFileSync('dist/test-project-server/index.html', html);
+      //   \});
+      // `))
+      // .then(() => exec(normalize('node'), 'index.js'))
+      // .then(() => expectFileToMatch('dist/test-project-server/index.html',
+      //   new RegExp('<h2 _ngcontent-c0="">Here are some links to help you start: </h2>')))
+      .then(() => ng('run', 'test-project:server'))
+      // files were created successfully
+      .then(() =>
+        expectFileToMatch('dist/test-project-server/main.js', /exports.*AppServerModuleNgFactory/),
+      )
+      .then(() =>
+        writeFile(
+          './index.js',
+          `
       require('zone.js/dist/zone-node');
       require('reflect-metadata');
       const fs = require('fs');
@@ -125,19 +144,35 @@ export default function () {
       \}).then(html => \{
         fs.writeFileSync('dist/test-project-server/index.html', html);
       \});
-    `))
-    .then(() => exec(normalize('node'), 'index.js'))
-    .then(() => expectFileToMatch('dist/test-project-server/index.html',
-      /<h2.*>Here are some links to help you start: <\/h2>/))
-    .then(() => expectFileToMatch('./dist/test-project-server/main.js',
-      /require\(["']@angular\/[^"']*["']\)/))
+    `,
+        ),
+      )
+      .then(() => exec(normalize('node'), 'index.js'))
+      .then(() =>
+        expectFileToMatch(
+          'dist/test-project-server/index.html',
+          /<h2.*>Here are some links to help you start: <\/h2>/,
+        ),
+      )
+      .then(() =>
+        expectFileToMatch(
+          './dist/test-project-server/main.js',
+          /require\(["']@angular\/[^"']*["']\)/,
+        ),
+      )
 
-    // Check externals.
-    .then(() => prependToFile('./src/app/app.server.module.ts', `
+      // Check externals.
+      .then(() =>
+        prependToFile(
+          './src/app/app.server.module.ts',
+          `
       import 'zone.js/dist/zone-node';
       import 'reflect-metadata';
-    `)
-      .then(() => appendToFile('./src/app/app.server.module.ts', `
+    `,
+        ).then(() =>
+          appendToFile(
+            './src/app/app.server.module.ts',
+            `
       import * as fs from 'fs';
       import { renderModule } from '@angular/platform-server';
 
@@ -147,5 +182,9 @@ export default function () {
       \}).then(html => \{
         fs.writeFileSync('dist/test-project-server/index.html', html);
       \});
-    `)))
-}
\ No newline at end of file
+    `,
+          ),
+        ),
+      )
+  );
+}

From a30ca72074728f09f24e844ddb49e9434bdc70a5 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Wed, 6 Mar 2019 07:21:14 +0100
Subject: [PATCH 0868/1703] ci: add configuration for legacy projects

In some cases, there are still legacy projects, prior to migrations and we should not use `webdriverUpdate` and we should use headless chrome.
---
 tests/legacy-cli/e2e/utils/project.ts | 116 ++++++++++++++++++++------
 1 file changed, 90 insertions(+), 26 deletions(-)

diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts
index af3c7e13133a..f9ca35ce8dc9 100644
--- a/tests/legacy-cli/e2e/utils/project.ts
+++ b/tests/legacy-cli/e2e/utils/project.ts
@@ -48,27 +48,82 @@ export async function createProject(name: string, ...args: string[]) {
 }
 
 export async function prepareProjectForE2e(name) {
-  const argv: string[] = getGlobalVariable('argv');
-
-  await git('config', 'user.email', 'angular-core+e2e@google.com');
-  await git('config', 'user.name', 'Angular CLI E2e');
-  await git('config', 'commit.gpgSign', 'false');
-  await useBuiltPackages();
-  await useCIChrome('e2e');
-  await useCIChrome('');
-  await useDevKitSnapshots();
-  await argv['ng2'] ? useNg2() : Promise.resolve();
-  await argv['ng4'] ? useNg4() : Promise.resolve();
-  await argv['ng-snapshots'] || argv['ng-tag'] ? useSha() : Promise.resolve();
-  await console.log(`Project ${name} created... Installing npm.`);
-  await silentNpm('install');
-  await useCIDefaults(name);
-  // Force sourcemaps to be from the root of the filesystem.
-  await updateJsonFile('tsconfig.json', json => {
-    json['compilerOptions']['sourceRoot'] = '/';
-  });
-  await gitCommit('prepare-project-for-e2e');
-}
+                                                   const argv: string[] = getGlobalVariable(
+                                                     'argv',
+                                                   );
+
+                                                   await git(
+                                                     'config',
+                                                     'user.email',
+                                                     'angular-core+e2e@google.com',
+                                                   );
+                                                   await git(
+                                                     'config',
+                                                     'user.name',
+                                                     'Angular CLI E2e',
+                                                   );
+                                                   await git(
+                                                     'config',
+                                                     'commit.gpgSign',
+                                                     'false',
+                                                   );
+                                                   await useBuiltPackages();
+                                                   await useCIChrome(
+                                                     'e2e',
+                                                   );
+                                                   await useCIChrome(
+                                                     '',
+                                                   );
+
+                                                   // legacy projects
+                                                   await useCIChrome(
+                                                     'src',
+                                                   );
+
+                                                   await useDevKitSnapshots();
+                                                   (await argv[
+                                                     'ng2'
+                                                   ])
+                                                     ? useNg2()
+                                                     : Promise.resolve();
+                                                   (await argv[
+                                                     'ng4'
+                                                   ])
+                                                     ? useNg4()
+                                                     : Promise.resolve();
+                                                   (await argv[
+                                                     'ng-snapshots'
+                                                   ]) ||
+                                                   argv[
+                                                     'ng-tag'
+                                                   ]
+                                                     ? useSha()
+                                                     : Promise.resolve();
+                                                   await console.log(
+                                                     `Project ${name} created... Installing npm.`,
+                                                   );
+                                                   await silentNpm(
+                                                     'install',
+                                                   );
+                                                   await useCIDefaults(
+                                                     name,
+                                                   );
+                                                   // Force sourcemaps to be from the root of the filesystem.
+                                                   await updateJsonFile(
+                                                     'tsconfig.json',
+                                                     json => {
+                                                       json[
+                                                         'compilerOptions'
+                                                       ][
+                                                         'sourceRoot'
+                                                       ] =
+                                                         '/';
+                                                     },
+                                                   );
+                                                   await gitCommit(
+                                                     'prepare-project-for-e2e',
+                                                   );
+                                                 }
 
 
 export function useDevKit(devkitRoot: string) {
@@ -99,7 +154,7 @@ export function useDevKit(devkitRoot: string) {
 export function useDevKitSnapshots() {
   return updateJsonFile('package.json', json => {
     // TODO: actually add these.
-    // These were not working on any test that ran `npm i`.
+                                                           // These were not working on any test that ran `npm i`.
     // json['devDependencies']['@angular-devkit/build-angular'] =
     //   'github:angular/angular-devkit-build-angular-builds';
     // // By adding build-ng-packagr preemptively, adding a lib will not update it.
@@ -119,8 +174,9 @@ export function useBuiltPackages() {
       }
 
       for (const packageName of Object.keys(packages)) {
-        if (json['dependencies'].hasOwnProperty(packageName)) {
-          json['dependencies'][packageName] = packages[packageName].tar;
+        if (json['dependencies'].hasOwnProperty(packageName)
+                                                           ) {
+                                                                 json['dependencies'][packageName] = packages[packageName].tar;
         } else if (json['devDependencies'].hasOwnProperty(packageName)) {
           json['devDependencies'][packageName] = packages[packageName].tar;
         }
@@ -212,6 +268,13 @@ export function useCIDefaults(projectName = 'test-project') {
     if (appTargets.e2e) {
       appTargets.e2e.options.webdriverUpdate = false;
     }
+
+    // legacy project structure
+    const e2eProject = workspaceJson.projects[projectName + '-e2e'];
+    if (e2eProject){
+      const e2eTargets = e2eProject.targets || e2eProject.architect;
+      e2eTargets.e2e.options.webdriverUpdate = false;
+    }
   })
   .then(() => updateJsonFile('package.json', json => {
     // Use matching versions of Chrome and Webdriver.
@@ -223,8 +286,9 @@ export function useCIDefaults(projectName = 'test-project') {
 }
 
 export function useCIChrome(projectDir: string) {
-  const protractorConf = `${projectDir}/protractor.conf.js`;
-  const karmaConf = `${projectDir ? projectDir + '/' : ''}karma.conf.js`;
+  const dir = projectDir ? projectDir + '/' : '';
+  const protractorConf = `${dir}protractor.conf.js`;
+  const karmaConf = `${dir}karma.conf.js`;
 
   return Promise.resolve()
     .then(() => updateJsonFile('package.json', json => {

From 320273af5a32004568b6c347014f4ebd38f0cf68 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Wed, 6 Mar 2019 13:45:26 +0100
Subject: [PATCH 0869/1703] feat(@angular-devkit/build-angular): add support
 for tslint 5.13+

Tslint 5.13+ introduced an addition parameter for the format method, mainly used for check-style formatter.

During runtime users using an older version of tslint that doesn't expose this it is not a problem as this parameter will be ignored.

See: https://github.com/palantir/tslint/commit/9000479b69c1f4808acf1dee284b47fbbbfbef13
---
 .../build_angular/src/tslint/index.ts          | 18 ++++++++++++++----
 .../build_angular/src/tslint/index2.ts         | 18 +++++++++++++-----
 .../test/tslint/works2_spec_large.ts           |  1 +
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/tslint/index.ts b/packages/angular_devkit/build_angular/src/tslint/index.ts
index ed3b92db1310..8be54302137b 100644
--- a/packages/angular_devkit/build_angular/src/tslint/index.ts
+++ b/packages/angular_devkit/build_angular/src/tslint/index.ts
@@ -35,6 +35,10 @@ export interface TslintBuilderOptions {
   files: string[];
 }
 
+interface LintResult extends tslint.LintResult {
+  fileNames: string[];
+}
+
 export default class TslintBuilder implements Builder<TslintBuilderOptions> {
 
   constructor(public context: BuilderContext) { }
@@ -82,7 +86,7 @@ export default class TslintBuilder implements Builder<TslintBuilderOptions> {
           : null;
         const Linter = projectTslint.Linter;
 
-        let result: undefined | tslint.LintResult;
+        let result: undefined | LintResult;
         if (options.tsConfig) {
           const tsConfigs = Array.isArray(options.tsConfig) ? options.tsConfig : [options.tsConfig];
           const allPrograms =
@@ -102,6 +106,7 @@ export default class TslintBuilder implements Builder<TslintBuilderOptions> {
               // apart from checking if they are greater than 0 thus no need to dedupe these.
               result.errorCount += partial.errorCount;
               result.warningCount += partial.warningCount;
+              result.fileNames = [...new Set([...result.fileNames, ...partial.fileNames])];
 
               if (partial.fixes) {
                 result.fixes = result.fixes ? result.fixes.concat(partial.fixes) : partial.fixes;
@@ -123,7 +128,7 @@ export default class TslintBuilder implements Builder<TslintBuilderOptions> {
           }
           const formatter = new Formatter();
 
-          const output = formatter.format(result.failures, result.fixes);
+          const output = formatter.format(result.failures, result.fixes, result.fileNames);
           if (output) {
             this.context.logger.info(output);
           }
@@ -156,7 +161,7 @@ function lint(
   options: TslintBuilderOptions,
   program?: ts.Program,
   allPrograms?: ts.Program[],
-) {
+): LintResult {
   const Linter = projectTslint.Linter;
   const Configuration = projectTslint.Configuration;
 
@@ -170,6 +175,7 @@ function lint(
 
   let lastDirectory;
   let configLoad;
+  const lintedFiles: string[] = [];
   for (const file of files) {
     let contents = '';
     if (program && allPrograms) {
@@ -196,10 +202,14 @@ function lint(
 
     if (configLoad) {
       linter.lint(file, contents, configLoad.results);
+      lintedFiles.push(file);
     }
   }
 
-  return linter.getResult();
+  return {
+    ...linter.getResult(),
+    fileNames: lintedFiles,
+  };
 }
 
 function getFilesToLint(
diff --git a/packages/angular_devkit/build_angular/src/tslint/index2.ts b/packages/angular_devkit/build_angular/src/tslint/index2.ts
index ae1299321b34..9ba353f644aa 100644
--- a/packages/angular_devkit/build_angular/src/tslint/index2.ts
+++ b/packages/angular_devkit/build_angular/src/tslint/index2.ts
@@ -18,7 +18,9 @@ import { Schema as RealTslintBuilderOptions } from './schema';
 
 
 type TslintBuilderOptions = RealTslintBuilderOptions & json.JsonObject;
-
+interface LintResult extends tslint.LintResult {
+  fileNames: string[];
+}
 
 async function _loadTslint() {
   let tslint;
@@ -64,7 +66,7 @@ async function _run(
     : null;
   const Linter = projectTslint.Linter;
 
-  let result: undefined | tslint.LintResult = undefined;
+  let result: undefined | LintResult = undefined;
   if (options.tsConfig) {
     const tsConfigs = Array.isArray(options.tsConfig) ? options.tsConfig : [options.tsConfig];
     context.reportProgress(0, tsConfigs.length);
@@ -95,6 +97,7 @@ async function _run(
         // apart from checking if they are greater than 0 thus no need to dedupe these.
         result.errorCount += partial.errorCount;
         result.warningCount += partial.warningCount;
+        result.fileNames = [...new Set([...result.fileNames, ...partial.fileNames])];
 
         if (partial.fixes) {
           result.fixes = result.fixes ? result.fixes.concat(partial.fixes) : partial.fixes;
@@ -118,7 +121,7 @@ async function _run(
     }
     const formatter = new Formatter();
 
-    const output = formatter.format(result.failures, result.fixes);
+    const output = formatter.format(result.failures, result.fixes, result.fileNames);
     if (output.trim()) {
       context.logger.info(output);
     }
@@ -152,7 +155,7 @@ async function _lint(
   options: TslintBuilderOptions,
   program?: ts.Program,
   allPrograms?: ts.Program[],
-) {
+): Promise<LintResult> {
   const Linter = projectTslint.Linter;
   const Configuration = projectTslint.Configuration;
 
@@ -166,6 +169,7 @@ async function _lint(
 
   let lastDirectory: string | undefined = undefined;
   let configLoad;
+  const lintedFiles: string[] = [];
   for (const file of files) {
     if (program && allPrograms) {
       // If it cannot be found in ANY program, then this is an error.
@@ -192,10 +196,14 @@ async function _lint(
       // Give some breathing space to other promises that might be waiting.
       await Promise.resolve();
       linter.lint(file, contents, configLoad.results);
+      lintedFiles.push(file);
     }
   }
 
-  return linter.getResult();
+  return {
+    ...linter.getResult(),
+    fileNames: lintedFiles,
+  };
 }
 
 function getFilesToLint(
diff --git a/packages/angular_devkit/build_angular/test/tslint/works2_spec_large.ts b/packages/angular_devkit/build_angular/test/tslint/works2_spec_large.ts
index 21de77daa47b..1cc34443ee96 100644
--- a/packages/angular_devkit/build_angular/test/tslint/works2_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/tslint/works2_spec_large.ts
@@ -102,6 +102,7 @@ describe('Tslint Target', () => {
 
     const output = await run.result;
     expect(output.success).toBe(true);
+    expect(allLogs).toContain(jasmine.stringMatching(/file name=.*app.module.ts/i));
     expect(allStatus).toContain(jasmine.stringMatching(/linting.*"app".*/i));
     expect(allLogs).not.toContain(jasmine.stringMatching(/linting.*"app".*/i));
     await run.stop();

From 60ccf2fe64390349607706c52ce8e1e791bfc4b6 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Mon, 4 Mar 2019 13:32:47 +0100
Subject: [PATCH 0870/1703] feat(@schematics/angular): update minimum karma and
 tslint versions

Karma `4.0.1` removes usages of some vulnerable dependencies
See: https://github.com/karma-runner/karma/releases/tag/v4.0.1

Also, this updates tslint to `~5.13.1` which comes with several bugfixes https://github.com/palantir/tslint/blob/master/CHANGELOG.md#change-log
---
 .../schematics/angular/workspace/files/package.json.template  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/workspace/files/package.json.template b/packages/schematics/angular/workspace/files/package.json.template
index 2ff1143f4973..ce1278bbdbd6 100644
--- a/packages/schematics/angular/workspace/files/package.json.template
+++ b/packages/schematics/angular/workspace/files/package.json.template
@@ -34,14 +34,14 @@
     "codelyzer": "~4.5.0",
     "jasmine-core": "~2.99.1",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~4.0.0",
+    "karma": "~4.0.1",
     "karma-chrome-launcher": "~2.2.0",
     "karma-coverage-istanbul-reporter": "~2.0.1",
     "karma-jasmine": "~2.0.1",
     "karma-jasmine-html-reporter": "^1.4.0",
     "protractor": "~5.4.0",<% } %>
     "ts-node": "~7.0.0",
-    "tslint": "~5.11.0",
+    "tslint": "~5.13.1",
     "typescript": "<%= latestVersions.TypeScript %>"
   }
 }

From 703407319bf80c46b73e84dc5e5e19dcf13fa7dc Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Mon, 4 Mar 2019 13:33:05 +0100
Subject: [PATCH 0871/1703] build: update karma and tslint

---
 package.json |  4 ++--
 yarn.lock    | 42 ++++++++++++++++++++++++++++++++++++++----
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 9fa104fa0850..8cd51d0a50ec 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
     "puppeteer": "1.12.2",
     "quicktype-core": "^6.0.15",
     "temp": "^0.9.0",
-    "tslint": "^5.11.0",
+    "tslint": "^5.13.1",
     "typescript": "3.2.4"
   },
   "devDependencies": {
@@ -106,7 +106,7 @@
     "istanbul": "^0.4.5",
     "jasmine": "^2.6.0",
     "jasmine-spec-reporter": "^4.2.1",
-    "karma": "~4.0.0",
+    "karma": "~4.0.1",
     "karma-jasmine": "^2.0.1",
     "karma-jasmine-html-reporter": "^1.4.0",
     "license-checker": "^20.1.0",
diff --git a/yarn.lock b/yarn.lock
index 56e47b1f0be0..ef2da367ef9a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5438,6 +5438,39 @@ karma@~4.0.0:
     tmp "0.0.33"
     useragent "2.3.0"
 
+karma@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-4.0.1.tgz#2581d6caa0d4cd28b65131561b47bad6d5478773"
+  integrity sha512-ind+4s03BqIXas7ZmraV3/kc5+mnqwCd+VDX1FndS6jxbt03kQKX2vXrWxNLuCjVYmhMwOZosAEKMM0a2q7w7A==
+  dependencies:
+    bluebird "^3.3.0"
+    body-parser "^1.16.1"
+    braces "^2.3.2"
+    chokidar "^2.0.3"
+    colors "^1.1.0"
+    connect "^3.6.0"
+    core-js "^2.2.0"
+    di "^0.0.1"
+    dom-serialize "^2.2.0"
+    flatted "^2.0.0"
+    glob "^7.1.1"
+    graceful-fs "^4.1.2"
+    http-proxy "^1.13.0"
+    isbinaryfile "^3.0.0"
+    lodash "^4.17.11"
+    log4js "^4.0.0"
+    mime "^2.3.1"
+    minimatch "^3.0.2"
+    optimist "^0.6.1"
+    qjobs "^1.1.4"
+    range-parser "^1.2.0"
+    rimraf "^2.6.0"
+    safe-buffer "^5.0.1"
+    socket.io "2.1.1"
+    source-map "^0.6.1"
+    tmp "0.0.33"
+    useragent "2.3.0"
+
 keyv@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
@@ -9403,10 +9436,10 @@ tslint-sonarts@^1.7.0:
   dependencies:
     immutable "^3.8.2"
 
-tslint@^5.11.0:
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.11.0.tgz#98f30c02eae3cde7006201e4c33cb08b48581eed"
-  integrity sha1-mPMMAurjzecAYgHkwzywi0hYHu0=
+tslint@^5.13.1:
+  version "5.13.1"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.13.1.tgz#fbc0541c425647a33cd9108ce4fd4cd18d7904ed"
+  integrity sha512-fplQqb2miLbcPhyHoMV4FU9PtNRbgmm/zI5d3SZwwmJQM6V0eodju+hplpyfhLWpmwrDNfNYU57uYRb8s0zZoQ==
   dependencies:
     babel-code-frame "^6.22.0"
     builtin-modules "^1.1.1"
@@ -9416,6 +9449,7 @@ tslint@^5.11.0:
     glob "^7.1.1"
     js-yaml "^3.7.0"
     minimatch "^3.0.4"
+    mkdirp "^0.5.1"
     resolve "^1.3.2"
     semver "^5.3.0"
     tslib "^1.8.0"

From 5a2aee9a9270fa0fa8fd9a9ec451bab54bf3583d Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 26 Feb 2019 15:49:30 +0000
Subject: [PATCH 0872/1703] test: exit e2e early if it would run no tests

---
 tests/legacy-cli/e2e_runner.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/legacy-cli/e2e_runner.ts b/tests/legacy-cli/e2e_runner.ts
index a7e741c5ffed..edc185ce3758 100644
--- a/tests/legacy-cli/e2e_runner.ts
+++ b/tests/legacy-cli/e2e_runner.ts
@@ -171,6 +171,11 @@ const shardedTests = tests
   .filter((name, i) => (shardId === null || (i % nbShards) == shardId));
 const testsToRun = allSetups.concat(shardedTests);
 
+if (shardedTests.length === 0) {
+  console.log(`No tests would be ran, aborting.`);
+  process.exit(1);
+}
+
 console.log(testsToRun.join('\n'));
 /**
  * Load all the files from the e2e, filter and sort them and build a promise of their default

From 7d8ded250b381a2949d7de928f48e932f4d325a6 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 26 Feb 2019 14:55:09 +0000
Subject: [PATCH 0873/1703] test: add comprehensive tests for Ivy lazy load
 styles

---
 .../e2e/tests/experimental/ivy-lazy-load.ts   | 92 ++++++++++++++++---
 tests/legacy-cli/e2e_runner.ts                |  6 +-
 2 files changed, 79 insertions(+), 19 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts b/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts
index d23d1b26a56c..7e3d505b548f 100644
--- a/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts
+++ b/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts
@@ -5,23 +5,87 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { readdirSync } from 'fs';
-import { prependToFile, replaceInFile } from '../../utils/fs';
+import { prependToFile, replaceInFile, writeFile } from '../../utils/fs';
 import { ng } from '../../utils/process';
-import { createProject } from '../../utils/project';
+import { createProject, updateJsonFile } from '../../utils/project';
+import { expectToFail } from '../../utils/utils';
 
-export default async function() {
-  await createProject('ivy-project', '--enable-ivy');
+export async function ivyLazyLoadSetup(projectName: string) {
+  // Make Ivy project.
+  await createProject(projectName, '--enable-ivy', '--routing');
 
+  // Add lazy route.
   await ng('generate', 'module', 'lazy', '--routing');
-  await prependToFile('src/app/app.module.ts', `import { RouterModule } from '@angular/router';`);
-  await replaceInFile('src/app/app.module.ts', 'imports: [', `imports: [
-    RouterModule.forRoot([{ path: "lazy", loadChildren: "src/app/lazy/lazy.module#LazyModule" }]),
+  await replaceInFile('src/app/app-routing.module.ts', 'const routes: Routes = [];', `
+    const routes: Routes = [{ path: 'lazy', loadChildren: LOAD_CHILDREN_MARKER }];
   `);
-  await ng('build', '--named-chunks', '--aot');
-  const distFiles = await readdirSync('dist/ivy-project');
-  if (!distFiles.includes('lazy-lazy-module.js')
-    || distFiles.includes('lazy-lazy-module-ngfactory.js')) {
-    throw new Error('The lazy module chunk should not be a ngfactory.');
-  }
+  await ng('generate', 'component', 'lazy/lazy-comp');
+  await replaceInFile('src/app/lazy/lazy-routing.module.ts', 'const routes: Routes = [];', `
+    import { LazyCompComponent } from './lazy-comp/lazy-comp.component';
+    const routes: Routes = [{ path: '', component: LazyCompComponent }];
+  `);
+  await writeFile('src/app/app.component.html', '<router-outlet></router-outlet>');
+
+  // Allow `import()` calls.
+  await replaceInFile('tsconfig.json', `"module": "es2015"`, `"module": "esnext"`);
+
+  // Add lazy route e2e
+  await writeFile('e2e/src/app.e2e-spec.ts', `
+    import { browser, logging, element, by } from 'protractor';
+
+    describe('workspace-project App', () => {
+      it('should display lazy route', () => {
+        browser.get(browser.baseUrl + '/lazy');
+        expect(element(by.css('app-lazy-comp p')).getText()).toEqual('lazy-comp works!');
+      });
+
+      afterEach(async () => {
+        // Assert that there are no errors emitted from the browser
+        const logs = await browser.manage().logs().get(logging.Type.BROWSER);
+        expect(logs).not.toContain(jasmine.objectContaining({
+          level: logging.Level.SEVERE,
+        }));
+      });
+    });
+  `);
+
+  // Set factory shims to false.
+  await updateJsonFile('src/tsconfig.app.json', json => {
+    const angularCompilerOptions = json['angularCompilerOptions'];
+    angularCompilerOptions['allowEmptyCodegenFiles'] = false;
+  });
+
+  // Convert the default config to use JIT and prod to just do AOT.
+  // This way we can use `ng e2e` to test JIT and `ng e2e --prod` to test AOT.
+  await updateJsonFile('angular.json', json => {
+    const buildTarget = json['projects'][projectName]['architect']['build'];
+    buildTarget['options']['aot'] = false;
+    buildTarget['configurations']['production'] = { aot: true };
+  });
+}
+
+export default async function () {
+  // Test `import()` style lazy load.
+  await ivyLazyLoadSetup('ivy-lazy-import');
+  await replaceInFile('src/app/app-routing.module.ts', 'LOAD_CHILDREN_MARKER', `
+   () => import('./lazy/lazy.module').then(m => m.LazyModule)
+  `);
+  await ng('e2e');
+  await ng('e2e', '--prod');
+
+  // Test string import with factory shims.
+  await ivyLazyLoadSetup('ivy-lazy-string-shims');
+  await replaceInFile('src/app/app-routing.module.ts', 'LOAD_CHILDREN_MARKER',
+    `'./lazy/lazy.module#LazyModule'`);
+  await replaceInFile('src/tsconfig.app.json', `"allowEmptyCodegenFiles": false`,
+    `"allowEmptyCodegenFiles": true`);
+  await expectToFail(() => ng('e2e')); // Currently broken.
+  await ng('e2e', '--prod');
+
+  // Test string import without factory shims.
+  await ivyLazyLoadSetup('ivy-lazy-string-no-shims');
+  await replaceInFile('src/app/app-routing.module.ts', 'LOAD_CHILDREN_MARKER',
+    `'./lazy/lazy.module#LazyModule'`);
+  await expectToFail(() => ng('e2e')); // Not supported.
+  await expectToFail(() => ng('e2e', '--prod')); // Not supported.
 }
diff --git a/tests/legacy-cli/e2e_runner.ts b/tests/legacy-cli/e2e_runner.ts
index edc185ce3758..6bd8a8cebdbc 100644
--- a/tests/legacy-cli/e2e_runner.ts
+++ b/tests/legacy-cli/e2e_runner.ts
@@ -129,9 +129,7 @@ allTests = allTests
   // NEEDS devkit change
   .filter(name => !name.endsWith('/existing-directory.ts'))
   // Disabled on rc.0 due to needed sync with devkit for changes.
-  .filter(name => !name.endsWith('/service-worker.ts'))
-  // Lazy load support is WIP https://github.com/angular/angular/pull/28685
-  .filter(name => !name.endsWith('tests/experimental/ivy-lazy-load.ts'));
+  .filter(name => !name.endsWith('/service-worker.ts'));
 
 if (argv.ivy) {
   // These tests are disabled on the Ivy-only CI job because:
@@ -144,8 +142,6 @@ if (argv.ivy) {
     // Ivy doesn't support i18n externally at the moment.
     .filter(name => !name.includes('tests/i18n/'))
     .filter(name => !name.endsWith('tests/build/aot/aot-i18n.ts'))
-    // Lazy load support is WIP https://github.com/angular/angular/pull/28685
-    .filter(name => !name.endsWith('tests/misc/lazy-module.ts'))
     // We don't have a library consumption story yet for Ivy.
     .filter(name => !name.endsWith('tests/generate/library/library-consumption.ts'));
 }

From 643e83d0545d8b0710230c3b766c619f94decae2 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 28 Feb 2019 11:19:05 +0000
Subject: [PATCH 0874/1703] feat(@schematics/angular): use esnext as the
 default TS module format

---
 .../build_angular/test/browser/lazy-module_spec_large.ts  | 8 --------
 .../angular/workspace/files/tsconfig.json.template        | 2 +-
 .../build_angular/hello-world-app/src/tsconfig.app.json   | 1 -
 .../build_angular/hello-world-app/src/tsconfig.spec.json  | 1 -
 .../build_angular/hello-world-app/tsconfig.json           | 1 +
 tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts  | 5 +----
 6 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
index ef55dbbb8cb4..69260fe76405 100644
--- a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
@@ -72,8 +72,6 @@ describe('Browser Builder lazy modules', () => {
       'src/lazy-module.ts': 'export const value = 42;',
       'src/main.ts': `import('./lazy-module');`,
     });
-    // Using `import()` in TS require targetting `esnext` modules.
-    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
 
     runTargetSpec(host, browserTargetSpec).pipe(
       tap((buildEvent) => expect(buildEvent.success).toBe(true)),
@@ -89,7 +87,6 @@ describe('Browser Builder lazy modules', () => {
         import(/*webpackChunkName: '[request]'*/'./lazy-' + lazyFileName);
       `,
     });
-    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
 
     runTargetSpec(host, browserTargetSpec).pipe(
       tap((buildEvent) => expect(buildEvent.success).toBe(true)),
@@ -114,7 +111,6 @@ describe('Browser Builder lazy modules', () => {
       'src/lazy-module.ts': 'export const value = 42;',
       'src/main.ts': `const lazyFileName = 'module'; import('./lazy-' + lazyFileName);`,
     });
-    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
 
     const overrides: Partial<BrowserBuilderSchema> = { namedChunks: false };
 
@@ -130,7 +126,6 @@ describe('Browser Builder lazy modules', () => {
       'src/two.ts': `import * as http from '@angular/http'; console.log(http);`,
       'src/main.ts': `import('./one'); import('./two');`,
     });
-    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
 
     runTargetSpec(host, browserTargetSpec).pipe(
       tap((buildEvent) => expect(buildEvent.success).toBe(true)),
@@ -147,7 +142,6 @@ describe('Browser Builder lazy modules', () => {
       'src/two.ts': `import * as http from '@angular/http'; console.log(http);`,
       'src/main.ts': `import('./one'); import('./two');`,
     });
-    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
 
     const overrides: Partial<BrowserBuilderSchema> = { commonChunk: false };
 
@@ -179,7 +173,6 @@ describe('Browser Builder lazy modules', () => {
           }
         }`,
     });
-    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
 
     const overrides: Partial<BrowserBuilderSchema> = { lazyModules: ['src/app/lazy/lazy.module'] };
 
@@ -210,7 +203,6 @@ describe('Browser Builder lazy modules', () => {
           }
         }`,
     });
-    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
 
     const overrides: Partial<BrowserBuilderSchema> = {
       lazyModules: ['src/app/lazy/lazy.module'],
diff --git a/packages/schematics/angular/workspace/files/tsconfig.json.template b/packages/schematics/angular/workspace/files/tsconfig.json.template
index b271fd9f3d55..9fcb8f7b96a9 100644
--- a/packages/schematics/angular/workspace/files/tsconfig.json.template
+++ b/packages/schematics/angular/workspace/files/tsconfig.json.template
@@ -5,7 +5,7 @@
     "outDir": "./dist/out-tsc",
     "sourceMap": true,
     "declaration": false,
-    "module": "es2015",
+    "module": "esnext",
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
diff --git a/tests/angular_devkit/build_angular/hello-world-app/src/tsconfig.app.json b/tests/angular_devkit/build_angular/hello-world-app/src/tsconfig.app.json
index b90ffb0148a4..190fd300b601 100644
--- a/tests/angular_devkit/build_angular/hello-world-app/src/tsconfig.app.json
+++ b/tests/angular_devkit/build_angular/hello-world-app/src/tsconfig.app.json
@@ -2,7 +2,6 @@
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "outDir": "../out-tsc/app",
-    "module": "es2015",
     "types": []
   },
   "exclude": [
diff --git a/tests/angular_devkit/build_angular/hello-world-app/src/tsconfig.spec.json b/tests/angular_devkit/build_angular/hello-world-app/src/tsconfig.spec.json
index 8f7cedecab86..de7733630eb2 100644
--- a/tests/angular_devkit/build_angular/hello-world-app/src/tsconfig.spec.json
+++ b/tests/angular_devkit/build_angular/hello-world-app/src/tsconfig.spec.json
@@ -2,7 +2,6 @@
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "outDir": "../out-tsc/spec",
-    "module": "commonjs",
     "types": [
       "jasmine",
       "node"
diff --git a/tests/angular_devkit/build_angular/hello-world-app/tsconfig.json b/tests/angular_devkit/build_angular/hello-world-app/tsconfig.json
index ef44e2862b04..cabc4606d16f 100644
--- a/tests/angular_devkit/build_angular/hello-world-app/tsconfig.json
+++ b/tests/angular_devkit/build_angular/hello-world-app/tsconfig.json
@@ -9,6 +9,7 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "target": "es5",
+    "module": "esnext",
     "typeRoots": [
       "node_modules/@types"
     ],
diff --git a/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts b/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts
index 7e3d505b548f..76b44f182ff0 100644
--- a/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts
+++ b/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { prependToFile, replaceInFile, writeFile } from '../../utils/fs';
+import { replaceInFile, writeFile } from '../../utils/fs';
 import { ng } from '../../utils/process';
 import { createProject, updateJsonFile } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
@@ -26,9 +26,6 @@ export async function ivyLazyLoadSetup(projectName: string) {
   `);
   await writeFile('src/app/app.component.html', '<router-outlet></router-outlet>');
 
-  // Allow `import()` calls.
-  await replaceInFile('tsconfig.json', `"module": "es2015"`, `"module": "esnext"`);
-
   // Add lazy route e2e
   await writeFile('e2e/src/app.e2e-spec.ts', `
     import { browser, logging, element, by } from 'protractor';

From 309b4838c35524a1e902e6bef2015cf868464e95 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Wed, 6 Mar 2019 07:22:39 +0100
Subject: [PATCH 0875/1703] fix(@angular-devkit/build-angular): don't bundle
 linked modules when `bundleDependencies` in `none` in  server builder

Fixes #13817
---
 .../models/webpack-configs/server.ts          | 27 ++------
 .../misc/universal-bundle-dependencies.ts     | 66 +++++++++++++++++++
 2 files changed, 71 insertions(+), 22 deletions(-)
 create mode 100644 tests/legacy-cli/e2e/tests/misc/universal-bundle-dependencies.ts

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts
index b1e323c69aa6..eb592750d2fe 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts
@@ -9,30 +9,21 @@ import { Configuration } from 'webpack';
 import { WebpackConfigOptions } from '../build-options';
 import { getSourceMapDevTool } from './utils';
 
-
 /**
  * Returns a partial specific to creating a bundle for node
  * @param wco Options which are include the build options and app config
  */
 export function getServerConfig(wco: WebpackConfigOptions) {
-
   const extraPlugins = [];
   if (wco.buildOptions.sourceMap) {
     const { scripts, styles, hidden } = wco.buildOptions.sourceMap;
 
-    extraPlugins.push(getSourceMapDevTool(
-      scripts || false,
-      styles || false,
-      hidden || false,
-    ));
+    extraPlugins.push(getSourceMapDevTool(scripts || false, styles || false, hidden || false));
   }
 
   const config: Configuration = {
     resolve: {
-      mainFields: [
-        ...(wco.supportES2015 ? ['es2015'] : []),
-        'main', 'module',
-      ],
+      mainFields: [...(wco.supportES2015 ? ['es2015'] : []), 'main', 'module'],
     },
     target: 'node',
     output: {
@@ -45,23 +36,15 @@ export function getServerConfig(wco: WebpackConfigOptions) {
   if (wco.buildOptions.bundleDependencies == 'none') {
     config.externals = [
       /^@angular/,
-      // tslint:disable-next-line:no-any
-      (_: any, request: any, callback: (error?: any, result?: any) => void) => {
+      (context: string, request: string, callback: (error?: null, result?: string) => void) => {
         // Absolute & Relative paths are not externals
         if (request.match(/^\.{0,2}\//)) {
           return callback();
         }
 
         try {
-          // Attempt to resolve the module via Node
-          const e = require.resolve(request);
-          if (/node_modules/.test(e)) {
-            // It's a node_module
-            callback(null, request);
-          } else {
-            // It's a system thing (.ie util, fs...)
-            callback();
-          }
+          require.resolve(request);
+          callback(null, request);
         } catch {
           // Node couldn't find it, so it must be user-aliased
           callback();
diff --git a/tests/legacy-cli/e2e/tests/misc/universal-bundle-dependencies.ts b/tests/legacy-cli/e2e/tests/misc/universal-bundle-dependencies.ts
new file mode 100644
index 000000000000..5c34a295cc27
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/misc/universal-bundle-dependencies.ts
@@ -0,0 +1,66 @@
+import * as path from 'path';
+import {
+  createDir,
+  expectFileToMatch,
+  rimraf,
+  symlinkFile,
+  writeMultipleFiles,
+} from '../../utils/fs';
+import { ng } from '../../utils/process';
+import { updateJsonFile } from '../../utils/project';
+
+export default async function() {
+  await updateJsonFile('angular.json', workspaceJson => {
+    const appArchitect = workspaceJson.projects['test-project'].architect;
+    appArchitect['server'] = {
+      builder: '@angular-devkit/build-angular:server',
+      options: {
+        bundleDependencies: 'none',
+        outputPath: 'dist/test-project-server',
+        main: 'src/main.server.ts',
+        tsConfig: 'tsconfig.server.json',
+      },
+    };
+  });
+
+  await createDir('./dummy-lib');
+
+  await writeMultipleFiles({
+    './tsconfig.server.json': `
+      {
+        "extends": "./tsconfig.json",
+        "compilerOptions": {
+          "outDir": "../dist-server",
+          "baseUrl": "./",
+          "module": "commonjs",
+          "types": []
+        },
+        "include": [
+          "src/main.server.ts"
+        ]
+      }
+    `,
+    './src/main.server.ts': `
+      import { dummyVersion } from 'dummy-lib';
+      console.log(dummyVersion);
+    `,
+    // create a dummy library
+    './dummy-lib/package.json': `{
+      "name": "dummy-lib",
+      "version": "0.0.0",
+      "typings": "./main.d.ts",
+      "main": "./main.js"
+    }`,
+    './dummy-lib/main.js': 'export const dummyVersion = 1',
+    './dummy-lib/main.d.ts': 'export declare const dummyVersion = 1',
+  });
+
+  await symlinkFile(path.resolve('./dummy-lib'), path.resolve('./node_modules/dummy-lib'), 'dir');
+
+  await ng('run', 'test-project:server');
+  // when preserve symlinks is true, it should not included node_modules in the bundle
+  await expectFileToMatch('dist/test-project-server/main.js', 'require("dummy-lib")');
+
+  // cleanup the package
+  await rimraf('node_modules/dummy-lib');
+}

From 263231ea5636d0fbf350bc7ea5a6c9e75372728c Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 5 Feb 2019 10:19:45 -0500
Subject: [PATCH 0876/1703] refactor(@angular-devkit/core): move existing
 workspace API under experimental

This API is already experimental.  The move allows for the new stable API to use the "workspace" directory structure and to also better signify that the existing API is in fact experimental and subject to change or removal.
---
 packages/angular_devkit/core/BUILD                     |  4 ++--
 packages/angular_devkit/core/src/_golden-api.ts        |  2 +-
 packages/angular_devkit/core/src/experimental.ts       |  2 +-
 .../core/src/{ => experimental}/workspace/index.ts     |  0
 .../workspace/test/test-workspace.json                 |  0
 .../{ => experimental}/workspace/workspace-schema.json |  0
 .../{ => experimental}/workspace/workspace-schema.ts   |  0
 .../core/src/{ => experimental}/workspace/workspace.ts | 10 ++++++----
 .../src/{ => experimental}/workspace/workspace_spec.ts |  8 ++++----
 9 files changed, 14 insertions(+), 12 deletions(-)
 rename packages/angular_devkit/core/src/{ => experimental}/workspace/index.ts (100%)
 rename packages/angular_devkit/core/src/{ => experimental}/workspace/test/test-workspace.json (100%)
 rename packages/angular_devkit/core/src/{ => experimental}/workspace/workspace-schema.json (100%)
 rename packages/angular_devkit/core/src/{ => experimental}/workspace/workspace-schema.ts (100%)
 rename packages/angular_devkit/core/src/{ => experimental}/workspace/workspace.ts (98%)
 rename packages/angular_devkit/core/src/{ => experimental}/workspace/workspace_spec.ts (98%)

diff --git a/packages/angular_devkit/core/BUILD b/packages/angular_devkit/core/BUILD
index a2917df84f71..d079633e1543 100644
--- a/packages/angular_devkit/core/BUILD
+++ b/packages/angular_devkit/core/BUILD
@@ -57,8 +57,8 @@ ts_library(
         "@npm//@types/jasmine",
     ],
     data = [
-        "src/workspace/workspace-schema.json",
-        "src/workspace/test/test-workspace.json"
+        "src/experimental/workspace/workspace-schema.json",
+        "src/experimental/workspace/test/test-workspace.json"
     ],
     testonly = True,
     # @external_begin
diff --git a/packages/angular_devkit/core/src/_golden-api.ts b/packages/angular_devkit/core/src/_golden-api.ts
index d6916e0f9b62..ac1cc3ad40a4 100644
--- a/packages/angular_devkit/core/src/_golden-api.ts
+++ b/packages/angular_devkit/core/src/_golden-api.ts
@@ -9,7 +9,7 @@
 export * from './exception/exception';
 
  // Start experimental namespace
-export * from './workspace/index';
+export * from './experimental/workspace/index';
 // End experimental namespace
 
 // Start json namespace
diff --git a/packages/angular_devkit/core/src/experimental.ts b/packages/angular_devkit/core/src/experimental.ts
index a2f8e102b86a..e577f4e59acc 100644
--- a/packages/angular_devkit/core/src/experimental.ts
+++ b/packages/angular_devkit/core/src/experimental.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import * as jobs from './experimental/jobs/index';
-import * as workspace from './workspace/index';
+import * as workspace from './experimental/workspace/index';
 
 export {
   jobs,
diff --git a/packages/angular_devkit/core/src/workspace/index.ts b/packages/angular_devkit/core/src/experimental/workspace/index.ts
similarity index 100%
rename from packages/angular_devkit/core/src/workspace/index.ts
rename to packages/angular_devkit/core/src/experimental/workspace/index.ts
diff --git a/packages/angular_devkit/core/src/workspace/test/test-workspace.json b/packages/angular_devkit/core/src/experimental/workspace/test/test-workspace.json
similarity index 100%
rename from packages/angular_devkit/core/src/workspace/test/test-workspace.json
rename to packages/angular_devkit/core/src/experimental/workspace/test/test-workspace.json
diff --git a/packages/angular_devkit/core/src/workspace/workspace-schema.json b/packages/angular_devkit/core/src/experimental/workspace/workspace-schema.json
similarity index 100%
rename from packages/angular_devkit/core/src/workspace/workspace-schema.json
rename to packages/angular_devkit/core/src/experimental/workspace/workspace-schema.json
diff --git a/packages/angular_devkit/core/src/workspace/workspace-schema.ts b/packages/angular_devkit/core/src/experimental/workspace/workspace-schema.ts
similarity index 100%
rename from packages/angular_devkit/core/src/workspace/workspace-schema.ts
rename to packages/angular_devkit/core/src/experimental/workspace/workspace-schema.ts
diff --git a/packages/angular_devkit/core/src/workspace/workspace.ts b/packages/angular_devkit/core/src/experimental/workspace/workspace.ts
similarity index 98%
rename from packages/angular_devkit/core/src/workspace/workspace.ts
rename to packages/angular_devkit/core/src/experimental/workspace/workspace.ts
index dad765c4c9cd..4a2a304299e2 100644
--- a/packages/angular_devkit/core/src/workspace/workspace.ts
+++ b/packages/angular_devkit/core/src/experimental/workspace/workspace.ts
@@ -10,13 +10,13 @@ import { existsSync } from 'fs';
 import * as path from 'path';
 import { Observable, of, throwError } from 'rxjs';
 import { concatMap, first, map, tap } from 'rxjs/operators';
-import { BaseException } from '../exception';
+import { BaseException } from '../../exception';
 import {
   JsonObject,
   JsonParseMode,
   parseJson,
   schema,
-} from '../json';
+} from '../../json';
 import {
   Path,
   basename,
@@ -24,8 +24,10 @@ import {
   isAbsolute,
   join,
   normalize,
-  relative, resolve, virtualFs,
-} from '../virtual-fs';
+  relative,
+  resolve,
+  virtualFs,
+} from '../../virtual-fs';
 import { WorkspaceProject, WorkspaceSchema, WorkspaceTool } from './workspace-schema';
 
 
diff --git a/packages/angular_devkit/core/src/workspace/workspace_spec.ts b/packages/angular_devkit/core/src/experimental/workspace/workspace_spec.ts
similarity index 98%
rename from packages/angular_devkit/core/src/workspace/workspace_spec.ts
rename to packages/angular_devkit/core/src/experimental/workspace/workspace_spec.ts
index 534236bf7a23..98032715d4cf 100644
--- a/packages/angular_devkit/core/src/workspace/workspace_spec.ts
+++ b/packages/angular_devkit/core/src/experimental/workspace/workspace_spec.ts
@@ -8,10 +8,10 @@
 // tslint:disable:no-big-function
 
 import { tap } from 'rxjs/operators';
-import { schema } from '..';
-import { NodeJsSyncHost } from '../../node';
-import { AdditionalPropertiesValidatorError } from '../json/schema/interface';
-import { dirname, join, normalize } from '../virtual-fs';
+import { schema } from '../..';
+import { NodeJsSyncHost } from '../../../node';
+import { AdditionalPropertiesValidatorError } from '../../json/schema/interface';
+import { dirname, join, normalize } from '../../virtual-fs';
 import {
   ProjectNotFoundException,
   Workspace,

From a1aa8d56c49f099ab9c6454bdfac27d5c3c8def7 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 5 Feb 2019 10:45:47 -0500
Subject: [PATCH 0877/1703] feat(@angular-devkit/core): add workspace
 reader/writer core API

NOTE: No changes have yet been made to the public API of the package.
This introduces the core and eventual public API for the stable workspace API.  This is not intended to be feature complete but rather represents the initial base infrastucture necessary for pending future feature additions.
---
 .../angular_devkit/core/src/workspace/core.ts | 108 +++++
 .../core/src/workspace/core_spec.ts           | 388 ++++++++++++++++++
 .../core/src/workspace/definitions.ts         | 255 ++++++++++++
 .../core/src/workspace/definitions_spec.ts    | 318 ++++++++++++++
 .../angular_devkit/core/src/workspace/host.ts |  50 +++
 .../core/src/workspace/host_spec.ts           |  66 +++
 .../core/src/workspace/index.ts               |  10 +
 7 files changed, 1195 insertions(+)
 create mode 100644 packages/angular_devkit/core/src/workspace/core.ts
 create mode 100644 packages/angular_devkit/core/src/workspace/core_spec.ts
 create mode 100644 packages/angular_devkit/core/src/workspace/definitions.ts
 create mode 100644 packages/angular_devkit/core/src/workspace/definitions_spec.ts
 create mode 100644 packages/angular_devkit/core/src/workspace/host.ts
 create mode 100644 packages/angular_devkit/core/src/workspace/host_spec.ts
 create mode 100644 packages/angular_devkit/core/src/workspace/index.ts

diff --git a/packages/angular_devkit/core/src/workspace/core.ts b/packages/angular_devkit/core/src/workspace/core.ts
new file mode 100644
index 000000000000..766ebc757ac5
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/core.ts
@@ -0,0 +1,108 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { basename, getSystemPath, join, normalize } from '../virtual-fs';
+import { ProjectDefinitionCollection, WorkspaceDefinition } from './definitions';
+import { WorkspaceHost } from './host';
+
+const formatLookup = new WeakMap<WorkspaceDefinition, WorkspaceFormat>();
+
+export enum WorkspaceFormat {
+  JSON,
+}
+
+export function _test_addWorkspaceFile(name: string, format: WorkspaceFormat): void {
+  workspaceFiles[name] = format;
+}
+
+export function _test_removeWorkspaceFile(name: string): void {
+  delete workspaceFiles[name];
+}
+
+// NOTE: future additions could also perform content analysis to determine format/version
+const workspaceFiles: Record<string, WorkspaceFormat> = {
+  'angular.json': WorkspaceFormat.JSON,
+  '.angular.json': WorkspaceFormat.JSON,
+};
+
+export async function readWorkspace(
+  path: string,
+  host: WorkspaceHost,
+  format?: WorkspaceFormat,
+): Promise<WorkspaceDefinition> {
+  if (await host.isDirectory(path)) {
+    // TODO: Warn if multiple found (requires diagnostics support)
+    const directory = normalize(path);
+    let found = false;
+    for (const [name, nameFormat] of Object.entries(workspaceFiles)) {
+      if (format !== undefined && format !== nameFormat) {
+        continue;
+      }
+
+      const potential = getSystemPath(join(directory, name));
+      if (await host.isFile(potential)) {
+        // TEMP - remove disable when actual reader is used
+        // tslint:disable-next-line:no-dead-store
+        path = potential;
+        format = nameFormat;
+        found = true;
+        break;
+      }
+    }
+    if (!found) {
+      throw new Error('Unable to locate a workspace file for workspace path.');
+    }
+  } else if (format === undefined) {
+    const filename = basename(normalize(path));
+    if (filename in workspaceFiles) {
+      format = workspaceFiles[filename];
+    }
+  }
+
+  if (format === undefined) {
+    throw new Error('Unable to determine format for workspace path.');
+  }
+
+  let workspace;
+  switch (format) {
+    case WorkspaceFormat.JSON:
+      // TEMP: remove the following two statements when JSON support is introduced
+      await host.readFile(path);
+      workspace = {
+        extensions: {},
+        projects: new ProjectDefinitionCollection(),
+      };
+      break;
+    default:
+      throw new Error('Unsupported workspace format.');
+  }
+
+  formatLookup.set(workspace, WorkspaceFormat.JSON);
+
+  return workspace;
+}
+
+export async function writeWorkspace(
+  workspace: WorkspaceDefinition,
+  _host: WorkspaceHost,
+  _path?: string,
+  format?: WorkspaceFormat,
+): Promise<void> {
+  if (format === undefined) {
+    format = formatLookup.get(workspace);
+    if (format === undefined) {
+      throw new Error('A format is required for custom workspace objects.');
+    }
+  }
+
+  switch (format) {
+    case WorkspaceFormat.JSON:
+      throw new Error('Not Implemented.');
+    default:
+      throw new Error('Unsupported workspace format.');
+  }
+}
diff --git a/packages/angular_devkit/core/src/workspace/core_spec.ts b/packages/angular_devkit/core/src/workspace/core_spec.ts
new file mode 100644
index 000000000000..214b26b062d1
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/core_spec.ts
@@ -0,0 +1,388 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// tslint:disable:no-big-function
+import { getSystemPath, join, normalize } from '../virtual-fs';
+import {
+  WorkspaceFormat,
+  _test_addWorkspaceFile,
+  _test_removeWorkspaceFile,
+  readWorkspace,
+  writeWorkspace,
+} from './core';
+import { WorkspaceDefinition } from './definitions';
+import { WorkspaceHost } from './host';
+
+
+describe('readWorkspace', () => {
+  it('attempts to read from specified file path [angular.json]', async (done) => {
+    const requestedPath = '/path/to/workspace/angular.json';
+
+    const host: WorkspaceHost = {
+      async readFile(path) {
+        expect(path).toBe(requestedPath);
+
+        return '{ "version": 1 }';
+      },
+      async writeFile() {},
+      async isFile(path) {
+        return path === requestedPath;
+      },
+      async isDirectory(path) {
+        if (path !== requestedPath) {
+          fail();
+        }
+
+        return false;
+      },
+    };
+
+    await readWorkspace(requestedPath, host);
+
+    done();
+  });
+
+  it('attempts to read from specified file path [.angular.json]', async (done) => {
+    const requestedPath = '/path/to/workspace/.angular.json';
+
+    const host: WorkspaceHost = {
+      async readFile(path) {
+        expect(path).toBe(requestedPath);
+
+        return '{ "version": 1 }';
+      },
+      async writeFile() {},
+      async isFile(path) {
+        return path === requestedPath;
+      },
+      async isDirectory(path) {
+        if (path !== requestedPath) {
+          fail();
+        }
+
+        return false;
+      },
+    };
+
+    await readWorkspace(requestedPath, host);
+
+    done();
+  });
+
+  it('attempts to read from specified non-standard file path with format', async (done) => {
+    const requestedPath = '/path/to/workspace/abc.json';
+
+    const host: WorkspaceHost = {
+      async readFile(path) {
+        expect(path).toBe(requestedPath);
+
+        return '{ "version": 1 }';
+      },
+      async writeFile() {},
+      async isFile(path) {
+        return path === requestedPath;
+      },
+      async isDirectory(path) {
+        if (path !== requestedPath) {
+          fail();
+        }
+
+        return false;
+      },
+    };
+
+    await readWorkspace(requestedPath, host, WorkspaceFormat.JSON);
+
+    done();
+  });
+
+  it('errors when reading from specified non-standard file path without format', async (done) => {
+    const requestedPath = '/path/to/workspace/abc.json';
+
+    const host: WorkspaceHost = {
+      async readFile(path) {
+        expect(path).toBe(requestedPath);
+
+        return '{ "version": 1 }';
+      },
+      async writeFile() {},
+      async isFile(path) {
+        return path === requestedPath;
+      },
+      async isDirectory(path) {
+        if (path !== requestedPath) {
+          fail();
+        }
+
+        return false;
+      },
+    };
+
+    try {
+      await readWorkspace(requestedPath, host);
+      fail();
+    } catch (e) {
+      expect(e.message).toContain('Unable to determine format for workspace path');
+    }
+
+    done();
+  });
+
+  it('errors when reading from specified file path with invalid specified format', async (done) => {
+    const requestedPath = '/path/to/workspace/angular.json';
+
+    const host: WorkspaceHost = {
+      async readFile(path) {
+        expect(path).toBe(requestedPath);
+
+        return '{ "version": 1 }';
+      },
+      async writeFile() {},
+      async isFile(path) {
+        return path === requestedPath;
+      },
+      async isDirectory(path) {
+        if (path !== requestedPath) {
+          fail();
+        }
+
+        return false;
+      },
+    };
+
+    try {
+      await readWorkspace(requestedPath, host, 12 as WorkspaceFormat);
+      fail();
+    } catch (e) {
+      expect(e.message).toContain('Unsupported workspace format');
+    }
+
+    done();
+  });
+
+  it('attempts to find/read from directory path', async (done) => {
+    const requestedPath = getSystemPath(normalize('/path/to/workspace'));
+    const expectedFile = getSystemPath(join(normalize(requestedPath), '.angular.json'));
+
+    const isFileChecks: string[] = [];
+    const host: WorkspaceHost = {
+      async readFile(path) {
+        expect(path).not.toBe(requestedPath);
+        expect(path).toBe(expectedFile);
+
+        return '{ "version": 1 }';
+      },
+      async writeFile() {},
+      async isFile(path) {
+        isFileChecks.push(path);
+
+        return path === expectedFile;
+      },
+      async isDirectory(path) {
+        if (path === requestedPath) {
+          return true;
+        }
+
+        fail();
+
+        return false;
+      },
+    };
+
+    await readWorkspace(requestedPath, host);
+    isFileChecks.sort();
+    expect(isFileChecks).toEqual([
+      getSystemPath(join(normalize(requestedPath), 'angular.json')),
+      getSystemPath(join(normalize(requestedPath), '.angular.json')),
+    ].sort());
+
+    done();
+  });
+
+  it('attempts to find/read only files for specified format from directory path', async (done) => {
+    const requestedPath = '/path/to/workspace';
+
+    const isFileChecks: string[] = [];
+    const readFileChecks: string[] = [];
+    const host: WorkspaceHost = {
+      async readFile(path) {
+        expect(path).not.toBe(requestedPath);
+        readFileChecks.push(path);
+
+        return '{ "version": 1 }';
+      },
+      async writeFile() {},
+      async isFile(path) {
+        isFileChecks.push(path);
+
+        return true;
+      },
+      async isDirectory(path) {
+        if (path === requestedPath) {
+          return true;
+        }
+
+        fail();
+
+        return false;
+      },
+    };
+
+    _test_addWorkspaceFile('wrong.format', 99);
+    try {
+      await readWorkspace(requestedPath, host, WorkspaceFormat.JSON);
+    } finally {
+      _test_removeWorkspaceFile('wrong.format');
+    }
+
+    isFileChecks.sort();
+    expect(isFileChecks).toEqual([
+      getSystemPath(join(normalize(requestedPath), 'angular.json')),
+    ]);
+
+    readFileChecks.sort();
+    expect(readFileChecks).toEqual([
+      getSystemPath(join(normalize(requestedPath), 'angular.json')),
+    ]);
+
+    done();
+  });
+
+  it('errors when no file found from specified directory path', async (done) => {
+    const requestedPath = '/path/to/workspace';
+
+    const host: WorkspaceHost = {
+      async readFile(path) {
+        expect(path).not.toBe(requestedPath);
+
+        return '{ "version": 1 }';
+      },
+      async writeFile() {},
+      async isFile() {
+        return false;
+      },
+      async isDirectory(path) {
+        if (path === requestedPath) {
+          return true;
+        }
+
+        fail();
+
+        return false;
+      },
+    };
+
+    try {
+      await readWorkspace(requestedPath, host);
+      fail();
+    } catch (e) {
+      expect(e.message).toContain('Unable to locate a workspace file');
+    }
+
+    done();
+  });
+
+});
+
+describe('writeWorkspace', () => {
+  xit('attempts to write to specified file path', async (done) => {
+    const requestedPath = '/path/to/workspace/angular.json';
+
+    let writtenPath: string | undefined;
+    const host: WorkspaceHost = {
+      async readFile() {
+        fail();
+
+        return '';
+      },
+      async writeFile(path) {
+        expect(writtenPath).toBeUndefined();
+        writtenPath = path;
+      },
+      async isFile() {
+        fail();
+
+        return false;
+      },
+      async isDirectory() {
+        fail();
+
+        return false;
+      },
+    };
+
+    await writeWorkspace({} as WorkspaceDefinition, host, requestedPath, WorkspaceFormat.JSON);
+    expect(writtenPath).toBe(requestedPath);
+
+    done();
+  });
+
+  it('errors when writing to specified file path with invalid specified format', async (done) => {
+    const requestedPath = '/path/to/workspace/angular.json';
+
+    const host: WorkspaceHost = {
+      async readFile() {
+        fail();
+
+        return '';
+      },
+      async writeFile() { fail(); },
+      async isFile() {
+        fail();
+
+        return false;
+      },
+      async isDirectory() {
+          fail();
+
+          return false;
+      },
+    };
+
+    try {
+      await writeWorkspace({} as WorkspaceDefinition, host, requestedPath, 12 as WorkspaceFormat);
+      fail();
+    } catch (e) {
+      expect(e.message).toContain('Unsupported workspace format');
+    }
+
+    done();
+  });
+
+  it('errors when writing custom workspace without specified format', async (done) => {
+    const requestedPath = '/path/to/workspace/angular.json';
+
+    const host: WorkspaceHost = {
+      async readFile() {
+        fail();
+
+        return '';
+      },
+      async writeFile() { fail(); },
+      async isFile() {
+        fail();
+
+        return false;
+      },
+      async isDirectory() {
+          fail();
+
+          return false;
+      },
+    };
+
+    try {
+      await writeWorkspace({} as WorkspaceDefinition, host, requestedPath);
+      fail();
+    } catch (e) {
+      expect(e.message).toContain('A format is required');
+    }
+
+    done();
+  });
+
+});
diff --git a/packages/angular_devkit/core/src/workspace/definitions.ts b/packages/angular_devkit/core/src/workspace/definitions.ts
new file mode 100644
index 000000000000..4be3180249b5
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/definitions.ts
@@ -0,0 +1,255 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { JsonValue } from '../json';
+
+export interface WorkspaceDefinition {
+  readonly extensions: Record<string, JsonValue | undefined>;
+
+  readonly projects: ProjectDefinitionCollection;
+}
+
+export interface ProjectDefinition {
+  readonly extensions: Record<string, JsonValue | undefined>;
+  readonly targets: TargetDefinitionCollection;
+
+  root: string;
+  prefix?: string;
+  sourceRoot?: string;
+}
+
+export interface TargetDefinition {
+  options?: Record<string, JsonValue | undefined>;
+  configurations?: Record<string, Record<string, JsonValue | undefined> | undefined>;
+
+  builder: string;
+}
+
+export type DefinitionCollectionListener<V> = (
+  name: string,
+  action: 'add' | 'remove' | 'replace',
+  newValue: V | undefined,
+  oldValue: V | undefined,
+) => void;
+
+class DefinitionCollection<V extends object> implements ReadonlyMap<string, V> {
+  private _map: Map<string, V>;
+
+  constructor(
+    initial?: Record<string, V>,
+    private _listener?: DefinitionCollectionListener<V>,
+  ) {
+    this._map = new Map(initial && Object.entries(initial));
+  }
+
+  delete(key: string): boolean {
+    const value = this._map.get(key);
+    const result = this._map.delete(key);
+    if (result && value !== undefined && this._listener) {
+      this._listener(key, 'remove', undefined, value);
+    }
+
+    return result;
+  }
+
+  set(key: string, value: V): this {
+    const existing = this.get(key);
+    this._map.set(key, value);
+
+    if (this._listener) {
+      this._listener(key, existing !== undefined ? 'replace' : 'add', value, existing);
+    }
+
+    return this;
+  }
+
+  forEach<T>(
+    callbackfn: (value: V, key: string, map: DefinitionCollection<V>) => void,
+    thisArg?: T,
+  ): void {
+    this._map.forEach((value, key) => callbackfn(value, key, this), thisArg);
+  }
+
+  get(key: string): V | undefined {
+    return this._map.get(key);
+  }
+
+  has(key: string): boolean {
+    return this._map.has(key);
+  }
+
+  get size(): number {
+    return this._map.size;
+  }
+
+  [Symbol.iterator](): IterableIterator<[string, V]> {
+    return this._map[Symbol.iterator]();
+  }
+
+  entries(): IterableIterator<[string, V]> {
+    return this._map.entries();
+  }
+
+  keys(): IterableIterator<string> {
+    return this._map.keys();
+  }
+
+  values(): IterableIterator<V> {
+    return this._map.values();
+  }
+}
+
+function isJsonValue(value: unknown): value is JsonValue {
+  const visited = new Set();
+
+  switch (typeof value) {
+    case 'boolean':
+    case 'number':
+    case 'string':
+      return true;
+    case 'object':
+      if (value === null) {
+        return true;
+      }
+      visited.add(value);
+      for (const property of Object.values(value)) {
+        if (typeof value === 'object' && visited.has(property)) {
+          continue;
+        }
+        if (!isJsonValue(property)) {
+          return false;
+        }
+      }
+
+      return true;
+    default:
+      return false;
+  }
+}
+
+export class ProjectDefinitionCollection extends DefinitionCollection<ProjectDefinition> {
+
+  constructor(
+    initial?: Record<string, ProjectDefinition>,
+    listener?: DefinitionCollectionListener<ProjectDefinition>,
+  ) {
+    super(initial, listener);
+  }
+
+  add(
+    definition: {
+      name: string,
+      root: string,
+      sourceRoot?: string,
+      prefix?: string,
+      targets?: Record<string, TargetDefinition>,
+      [key: string]: unknown,
+    },
+  ): this {
+    if (this.has(definition.name)) {
+      throw new Error('Project name already exists.');
+    }
+    this._validateName(definition.name);
+
+    const project: ProjectDefinition = {
+      root: definition.root,
+      prefix: definition.prefix,
+      sourceRoot: definition.sourceRoot,
+      targets: new TargetDefinitionCollection(),
+      extensions: {},
+    };
+
+    if (definition.targets) {
+      for (const [name, target] of Object.entries(definition.targets)) {
+        project.targets.set(name, target);
+      }
+    }
+
+    for (const [name, value] of Object.entries(definition)) {
+      switch (name) {
+        case 'name':
+        case 'root':
+        case 'sourceRoot':
+        case 'prefix':
+        case 'targets':
+          break;
+        default:
+          if (isJsonValue(value)) {
+            project.extensions[name] = value;
+          } else {
+            throw new TypeError(`"${name}" must be a JSON value.`);
+          }
+          break;
+      }
+    }
+
+    super.set(definition.name, project);
+
+    return this;
+  }
+
+  set(name: string, value: ProjectDefinition): this {
+    this._validateName(name);
+
+    super.set(name, value);
+
+    return this;
+  }
+
+  private _validateName(name: string): void {
+    if (typeof name !== 'string' || !/^[a-zA-Z][.0-9a-zA-Z]*(-[.0-9a-zA-Z]*)*$/.test(name)) {
+      throw new Error('Project name must be a valid npm package name without a scope.');
+    }
+  }
+
+}
+
+export class TargetDefinitionCollection extends DefinitionCollection<TargetDefinition> {
+
+  constructor(
+    initial?: Record<string, TargetDefinition>,
+    listener?: DefinitionCollectionListener<TargetDefinition>,
+  ) {
+    super(initial, listener);
+  }
+
+  add(
+    definition: {
+      name: string,
+    } & TargetDefinition,
+  ): this {
+    if (this.has(definition.name)) {
+      throw new Error('Target name already exists.');
+    }
+    this._validateName(definition.name);
+
+    const target = {
+      builder: definition.builder,
+      options: definition.options,
+      configurations: definition.configurations,
+    };
+
+    super.set(definition.name, target);
+
+    return this;
+  }
+
+  set(name: string, value: TargetDefinition): this {
+    this._validateName(name);
+
+    super.set(name, value);
+
+    return this;
+  }
+
+  private _validateName(name: string): void {
+    if (typeof name !== 'string') {
+      throw new TypeError('Target name must be a string.');
+    }
+  }
+
+}
diff --git a/packages/angular_devkit/core/src/workspace/definitions_spec.ts b/packages/angular_devkit/core/src/workspace/definitions_spec.ts
new file mode 100644
index 000000000000..9c640e2f5eb6
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/definitions_spec.ts
@@ -0,0 +1,318 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// tslint:disable:no-big-function
+import {
+  ProjectDefinition,
+  ProjectDefinitionCollection,
+  TargetDefinition,
+  TargetDefinitionCollection,
+} from './definitions';
+
+describe('ProjectDefinitionCollection', () => {
+
+  it('can be created without initial values or a listener', () => {
+    const collection = new ProjectDefinitionCollection();
+
+    expect(collection.size).toBe(0);
+  });
+
+  it('can be created with initial values', () => {
+    const initial = {
+      'my-app': { root: 'my-app', extensions: {}, targets: new TargetDefinitionCollection() },
+      'my-lib': { root: 'my-lib', extensions: {}, targets: new TargetDefinitionCollection() },
+    };
+
+    initial['my-app'].targets.add({
+      name: 'build',
+      builder: 'build-builder',
+    });
+
+    const collection = new ProjectDefinitionCollection(initial);
+
+    expect(collection.size).toBe(2);
+
+    const app = collection.get('my-app');
+    expect(app).not.toBeUndefined();
+    if (app) {
+      expect(app.root).toBe('my-app');
+      expect(app.extensions).toEqual({});
+      expect(app.targets.size).toBe(1);
+      expect(app.targets.get('build')).not.toBeUndefined();
+    }
+    const lib = collection.get('my-lib');
+    expect(lib).not.toBeUndefined();
+    if (lib) {
+      expect(lib.root).toBe('my-lib');
+      expect(lib.extensions).toEqual({});
+      expect(lib.targets).toBeTruthy();
+    }
+  });
+
+  it('can be created with a listener', () => {
+    const listener = () => { fail('listener should not execute on initialization'); };
+
+    const collection = new ProjectDefinitionCollection(undefined, listener);
+
+    expect(collection.size).toBe(0);
+  });
+
+  it('can be created with initial values and a listener', () => {
+    const initial = {
+      'my-app': { root: 'src/my-app', extensions: {}, targets: new TargetDefinitionCollection() },
+      'my-lib': { root: 'src/my-lib', extensions: {}, targets: new TargetDefinitionCollection() },
+    };
+
+    initial['my-app'].targets.add({
+      name: 'build',
+      builder: 'build-builder',
+    });
+
+    const listener = () => { fail('listener should not execute on initialization'); };
+
+    const collection = new ProjectDefinitionCollection(initial, listener);
+
+    expect(collection.size).toBe(2);
+
+    const app = collection.get('my-app');
+    expect(app).not.toBeUndefined();
+    if (app) {
+      expect(app.root).toBe('src/my-app');
+      expect(app.extensions).toEqual({});
+      expect(app.targets.size).toBe(1);
+      expect(app.targets.get('build')).not.toBeUndefined();
+    }
+    const lib = collection.get('my-lib');
+    expect(lib).not.toBeUndefined();
+    if (lib) {
+      expect(lib.root).toBe('src/my-lib');
+      expect(lib.extensions).toEqual({});
+      expect(lib.targets).toBeTruthy();
+    }
+  });
+
+  it('listens to an addition via set', () => {
+    const listener = (name: string, action: string) => {
+      expect(name).toBe('my-app');
+      expect(action).toBe('add');
+    };
+
+    const collection = new ProjectDefinitionCollection(undefined, listener);
+
+    collection.set(
+      'my-app',
+      { root: 'src/my-app', extensions: {}, targets: new TargetDefinitionCollection() },
+    );
+  });
+
+  it('listens to an addition via add', () => {
+    const listener = (name: string, action: string, value?: ProjectDefinition) => {
+      expect(name).toBe('my-app');
+      expect(action).toBe('add');
+      expect(value).not.toBeUndefined();
+      if (value) {
+        expect(value.root).toBe('src/my-app');
+      }
+    };
+
+    const collection = new ProjectDefinitionCollection(undefined, listener);
+
+    collection.add({
+      name: 'my-app',
+      root: 'src/my-app',
+    });
+  });
+
+  it('listens to a removal', () => {
+    const initial = {
+      'my-app': { root: 'src/my-app', extensions: {}, targets: new TargetDefinitionCollection() },
+    };
+
+    const listener = (name: string, action: string) => {
+      expect(name).toBe('my-app');
+      expect(action).toBe('remove');
+    };
+
+    const collection = new ProjectDefinitionCollection(initial, listener);
+
+    collection.delete('my-app');
+  });
+
+  it('listens to a replacement', () => {
+    const initial = {
+      'my-app': { root: 'src/my-app', extensions: {}, targets: new TargetDefinitionCollection() },
+    };
+
+    const listener = (
+      name: string,
+      action: string,
+      newValue?: ProjectDefinition,
+      oldValue?: ProjectDefinition,
+    ) => {
+      expect(name).toBe('my-app');
+      expect(action).toBe('replace');
+      expect(newValue).not.toBeUndefined();
+      if (newValue) {
+        expect(newValue.root).toBe('src/my-app2');
+      }
+      expect(oldValue).not.toBeUndefined();
+      if (oldValue) {
+        expect(oldValue.root).toBe('src/my-app');
+      }
+    };
+
+    const collection = new ProjectDefinitionCollection(initial, listener);
+
+    collection.set(
+      'my-app',
+      { root: 'src/my-app2', extensions: {}, targets: new TargetDefinitionCollection() },
+    );
+  });
+
+});
+
+describe('TargetDefinitionCollection', () => {
+
+  it('can be created without initial values or a listener', () => {
+    const collection = new TargetDefinitionCollection();
+
+    expect(collection.size).toBe(0);
+  });
+
+  it('can be created with initial values', () => {
+    const initial = {
+      'build': { builder: 'builder:build' },
+      'test': { builder: 'builder:test' },
+    };
+
+    const collection = new TargetDefinitionCollection(initial);
+
+    expect(collection.size).toBe(2);
+
+    const build = collection.get('build');
+    expect(build).not.toBeUndefined();
+    if (build) {
+      expect(build.builder).toBe('builder:build');
+    }
+    const test = collection.get('test');
+    expect(test).not.toBeUndefined();
+    if (test) {
+      expect(test.builder).toBe('builder:test');
+    }
+  });
+
+  it('can be created with a listener', () => {
+    const listener = () => { fail('listener should not execute on initialization'); };
+
+    const collection = new TargetDefinitionCollection(undefined, listener);
+
+    expect(collection.size).toBe(0);
+  });
+
+  it('can be created with initial values and a listener', () => {
+    const initial = {
+      'build': { builder: 'builder:build' },
+      'test': { builder: 'builder:test' },
+    };
+
+    const listener = () => { fail('listener should not execute on initialization'); };
+
+    const collection = new TargetDefinitionCollection(initial, listener);
+
+    expect(collection.size).toBe(2);
+
+    const build = collection.get('build');
+    expect(build).not.toBeUndefined();
+    if (build) {
+      expect(build.builder).toBe('builder:build');
+    }
+    const test = collection.get('test');
+    expect(test).not.toBeUndefined();
+    if (test) {
+      expect(test.builder).toBe('builder:test');
+    }
+  });
+
+  it('listens to an addition via set', () => {
+    const listener = (name: string, action: string) => {
+      expect(name).toBe('build');
+      expect(action).toBe('add');
+    };
+
+    const collection = new TargetDefinitionCollection(undefined, listener);
+
+    collection.set(
+      'build',
+      { builder: 'builder:build' },
+    );
+  });
+
+  it('listens to an addition via add', () => {
+    const listener = (name: string, action: string, value?: TargetDefinition) => {
+      expect(name).toBe('build');
+      expect(action).toBe('add');
+      expect(value).not.toBeUndefined();
+      if (value) {
+        expect(value.builder).toBe('builder:build');
+      }
+    };
+
+    const collection = new TargetDefinitionCollection(undefined, listener);
+
+    collection.add({
+      name: 'build',
+      builder: 'builder:build',
+    });
+  });
+
+  it('listens to a removal', () => {
+    const initial = {
+      'build': { builder: 'builder:build' },
+    };
+
+    const listener = (name: string, action: string) => {
+      expect(name).toBe('build');
+      expect(action).toBe('remove');
+    };
+
+    const collection = new TargetDefinitionCollection(initial, listener);
+
+    collection.delete('build');
+  });
+
+  it('listens to a replacement', () => {
+    const initial = {
+      'build': { builder: 'builder:build' },
+    };
+
+    const listener = (
+      name: string,
+      action: string,
+      newValue?: TargetDefinition,
+      oldValue?: TargetDefinition,
+    ) => {
+      expect(name).toBe('build');
+      expect(action).toBe('replace');
+      expect(newValue).not.toBeUndefined();
+      if (newValue) {
+        expect(newValue.builder).toBe('builder:test');
+      }
+      expect(oldValue).not.toBeUndefined();
+      if (oldValue) {
+        expect(oldValue.builder).toBe('builder:build');
+      }
+    };
+
+    const collection = new TargetDefinitionCollection(initial, listener);
+
+    collection.set(
+      'build',
+      { builder: 'builder:test' },
+    );
+  });
+
+});
diff --git a/packages/angular_devkit/core/src/workspace/host.ts b/packages/angular_devkit/core/src/workspace/host.ts
new file mode 100644
index 000000000000..8ac2509206db
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/host.ts
@@ -0,0 +1,50 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { normalize, virtualFs } from '../virtual-fs';
+
+export interface WorkspaceHost {
+  readFile(path: string): Promise<string>;
+  writeFile(path: string, data: string): Promise<void>;
+
+  isDirectory(path: string): Promise<boolean>;
+  isFile(path: string): Promise<boolean>;
+
+  // Potential future additions
+  // readDirectory?(path: string): Promise<string[]>;
+}
+
+export function createWorkspaceHost(host: virtualFs.Host): WorkspaceHost {
+  const workspaceHost: WorkspaceHost = {
+    async readFile(path: string): Promise<string> {
+      const data = await host.read(normalize(path)).toPromise();
+
+      return virtualFs.fileBufferToString(data);
+    },
+    async writeFile(path: string, data: string): Promise<void> {
+      return host.write(normalize(path), virtualFs.stringToFileBuffer(data)).toPromise();
+    },
+    async isDirectory(path: string): Promise<boolean> {
+      try {
+        return host.isDirectory(normalize(path)).toPromise();
+      } catch {
+        // some hosts throw if path does not exist
+        return false;
+      }
+    },
+    async isFile(path: string): Promise<boolean> {
+      try {
+        return host.isFile(normalize(path)).toPromise();
+      } catch {
+        // some hosts throw if path does not exist
+        return false;
+      }
+    },
+  };
+
+  return workspaceHost;
+}
diff --git a/packages/angular_devkit/core/src/workspace/host_spec.ts b/packages/angular_devkit/core/src/workspace/host_spec.ts
new file mode 100644
index 000000000000..079885b60d25
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/host_spec.ts
@@ -0,0 +1,66 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { test } from '../virtual-fs/host';
+import { WorkspaceHost, createWorkspaceHost } from './host';
+
+
+describe('createWorkspaceHost', () => {
+  let testHost: test.TestHost;
+  let workspaceHost: WorkspaceHost;
+
+  beforeEach(() => {
+    testHost = new test.TestHost({
+      'abc.txt': 'abcdefg',
+      'foo/bar.json': '{}',
+    });
+    workspaceHost = createWorkspaceHost(testHost);
+  });
+
+  it('supports isFile', async (done) => {
+    expect(await workspaceHost.isFile('abc.txt')).toBeTruthy();
+    expect(await workspaceHost.isFile('foo/bar.json')).toBeTruthy();
+    expect(await workspaceHost.isFile('foo\\bar.json')).toBeTruthy();
+
+    expect(await workspaceHost.isFile('foo')).toBeFalsy();
+    expect(await workspaceHost.isFile('not.there')).toBeFalsy();
+
+    done();
+  });
+
+  it('supports isDirectory', async (done) => {
+    expect(await workspaceHost.isDirectory('foo')).toBeTruthy();
+    expect(await workspaceHost.isDirectory('foo/')).toBeTruthy();
+    expect(await workspaceHost.isDirectory('foo\\')).toBeTruthy();
+
+    expect(await workspaceHost.isDirectory('abc.txt')).toBeFalsy();
+    expect(await workspaceHost.isDirectory('foo/bar.json')).toBeFalsy();
+    expect(await workspaceHost.isDirectory('not.there')).toBeFalsy();
+
+    done();
+  });
+
+  it('supports readFile', async (done) => {
+    expect(await workspaceHost.readFile('abc.txt')).toBe('abcdefg');
+
+    done();
+  });
+
+  it('supports writeFile', async (done) => {
+    await workspaceHost.writeFile('newfile', 'baz');
+    expect(testHost.files.sort() as string[]).toEqual([
+      '/abc.txt',
+      '/foo/bar.json',
+      '/newfile',
+    ]);
+
+    expect(testHost.$read('newfile')).toBe('baz');
+
+    done();
+  });
+
+});
diff --git a/packages/angular_devkit/core/src/workspace/index.ts b/packages/angular_devkit/core/src/workspace/index.ts
new file mode 100644
index 000000000000..88c1071ae2f7
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/index.ts
@@ -0,0 +1,10 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+export * from './definitions';
+export { WorkspaceHost, createWorkspaceHost } from './host';
+export { WorkspaceFormat, readWorkspace, writeWorkspace } from './core';

From ea6eaee12332075d77fc50326159497d0d273fbe Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 6 Mar 2019 21:30:10 +0100
Subject: [PATCH 0878/1703] test: fix paths for ivy lazy loading tests

---
 tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts b/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts
index 76b44f182ff0..e4c5c00bcb3d 100644
--- a/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts
+++ b/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts
@@ -47,7 +47,7 @@ export async function ivyLazyLoadSetup(projectName: string) {
   `);
 
   // Set factory shims to false.
-  await updateJsonFile('src/tsconfig.app.json', json => {
+  await updateJsonFile('tsconfig.app.json', json => {
     const angularCompilerOptions = json['angularCompilerOptions'];
     angularCompilerOptions['allowEmptyCodegenFiles'] = false;
   });
@@ -74,7 +74,7 @@ export default async function () {
   await ivyLazyLoadSetup('ivy-lazy-string-shims');
   await replaceInFile('src/app/app-routing.module.ts', 'LOAD_CHILDREN_MARKER',
     `'./lazy/lazy.module#LazyModule'`);
-  await replaceInFile('src/tsconfig.app.json', `"allowEmptyCodegenFiles": false`,
+  await replaceInFile('tsconfig.app.json', `"allowEmptyCodegenFiles": false`,
     `"allowEmptyCodegenFiles": true`);
   await expectToFail(() => ng('e2e')); // Currently broken.
   await ng('e2e', '--prod');

From fd5cb7a7f0c36e737fb3bb5e64fb2b66c2fef55d Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 6 Mar 2019 14:01:53 -0800
Subject: [PATCH 0879/1703] release: v8.0.0-beta.5

---
 .monorepo.json                                | 72 +++++++++----------
 .../angular/utility/latest-versions.ts        |  6 +-
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index a0aa4bb2fece..62e57b11e6a7 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,16 +42,16 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.14.0-beta.4",
-      "hash": "4eecb4a76317039defc5c2b4bd31e4f9"
+      "version": "0.14.0-beta.5",
+      "hash": "5225044ecf49d630564a68b710f6b82f"
     },
     "@_/builders": {
       "version": "0.14.0-beta.4",
       "hash": "569aef8bc23693c344e71b9755e62c50"
     },
     "devkit": {
-      "version": "0.14.0-beta.4",
-      "hash": "fc3a99ad529bdf3fe5b3a3d0e97f258d"
+      "version": "0.14.0-beta.5",
+      "hash": "ee31237492de354cdeb804a77ddb99a2"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -62,15 +62,15 @@
           "url": "/packages/angular/cli/README.md"
         }
       ],
-      "version": "8.0.0-beta.4",
+      "version": "8.0.0-beta.5",
       "snapshotRepo": "angular/cli-builds",
-      "hash": "ca11c3f7fdae11af8f89413e7d791f7c"
+      "hash": "a7d8ce7ece9ffcd1bf4fa095d48848fc"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.14.0-beta.4",
-      "hash": "7e583aacd54726f969e1084514cee788",
+      "version": "0.14.0-beta.5",
+      "hash": "c384b8179204563116fd10c0b177344d",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -81,21 +81,21 @@
           "url": "/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.14.0-beta.4",
-      "hash": "68d275a47b7e9f8793c14d2c5a80a84a",
+      "version": "0.14.0-beta.5",
+      "hash": "49d84280d90a0596e2f12fabed1b3bc5",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.14.0-beta.4",
-      "hash": "ae0534f638cd2f1a844eeecf975204ed",
+      "version": "0.14.0-beta.5",
+      "hash": "f4a1216b5864f85521607ac9d0837a52",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
       "name": "Benchmark",
       "section": "Tooling",
-      "version": "1.2.0-beta.4",
-      "hash": "9bb1e744ce37a6db843463229e70f60e"
+      "version": "1.2.0-beta.5",
+      "hash": "a97cd421a1deac9b478d52c4e950cc1e"
     },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
@@ -105,8 +105,8 @@
           "url": "/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.14.0-beta.4",
-      "hash": "6c0cde3d776dd6c07b393a521fccd5b5",
+      "version": "0.14.0-beta.5",
+      "hash": "5250a56331833383ca39c17f9be70fe8",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -117,8 +117,8 @@
           "url": "/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.14.0-beta.4",
-      "hash": "29188905b7a4636082cff555d52ab36f",
+      "version": "0.14.0-beta.5",
+      "hash": "e87e58f07bad54fe46c169bbd4196ab7",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -129,8 +129,8 @@
           "url": "/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.14.0-beta.4",
-      "hash": "4092c89af739d15ea39717fca9af554f",
+      "version": "0.14.0-beta.5",
+      "hash": "71d3197702ff8bad96d185c91a31bd3d",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -141,9 +141,9 @@
           "url": "/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.14.0-beta.4",
+      "version": "0.14.0-beta.5",
       "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "070c9669b644637755e3b8e0797db1a9"
+      "hash": "a7395f447b3e24d7f178ef54263c198c"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -153,8 +153,8 @@
           "url": "/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "8.0.0-beta.4",
-      "hash": "b1b789a8e726e523fe275ad32f971a4f",
+      "version": "8.0.0-beta.5",
+      "hash": "5f82ed72531a97dc657aa79ab0207227",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -165,43 +165,43 @@
           "url": "/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "8.0.0-beta.4",
-      "hash": "fbd2b2533d2e705903462836d642f7ab",
+      "version": "8.0.0-beta.5",
+      "hash": "3f925d566c97375d6101fddbcbef33e3",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.14.0-beta.4",
-      "hash": "627ad390bcbd31b1b604f248a4ed78ae",
+      "version": "0.14.0-beta.5",
+      "hash": "2a856bf23cc1bf74a6eb981dc6c316a2",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "8.0.0-beta.4",
+      "version": "8.0.0-beta.5",
       "section": "Misc",
-      "hash": "c83720ed5c33b6ff57b36bd6e574f4e7",
+      "hash": "dde27b96d50a58c9738ad4bc27646077",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "8.0.0-beta.4",
-      "hash": "758b7a78c0ef6669e30006ec2ffd97fe",
+      "version": "8.0.0-beta.5",
+      "hash": "834d6c3ac93c047886db71717f43b959",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.14.0-beta.4",
+      "version": "0.14.0-beta.5",
       "section": "Schematics",
-      "hash": "76b3db9bd9d1be277777b718d8cb271f",
+      "hash": "c8967c19e9137071c1e89809d0af2699",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.14.0-beta.4",
+      "version": "0.14.0-beta.5",
       "section": "Schematics",
-      "hash": "cf8c7df96f0af7de9d41f89a613d6bf3",
+      "hash": "bc9b7216998a5c42f4b5ab9a993ef64b",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index b8b3ede7f7e9..2493ca71012f 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -8,12 +8,12 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~8.0.0-beta.5',
+  Angular: '~8.0.0-beta.7',
   RxJs: '~6.4.0',
   ZoneJs: '~0.8.26',
   TypeScript: '~3.2.2',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.14.0-beta.4',
-  DevkitBuildNgPackagr: '~0.14.0-beta.4',
+  DevkitBuildAngular: '~0.14.0-beta.5',
+  DevkitBuildNgPackagr: '~0.14.0-beta.5',
 };

From 324d9f2d4f6269b8fc74fcaafb6cdf0cfa73027c Mon Sep 17 00:00:00 2001
From: clydin <19598772+clydin@users.noreply.github.com>
Date: Thu, 7 Mar 2019 18:51:03 -0500
Subject: [PATCH 0880/1703] feat(@angular-devkit/schematics): support basic
 promise/async based rules (#13660)

Currently, all third-party schematic developers are forced to use and directly depend on `rxjs` if any logic is asynchronous.   Doing so can can also add overhead and unneeded complexity for organizations that have chosen to standardize on async/await usage. This change allows such parties to rely on native promise support if desired.
---
 etc/api/angular_devkit/schematics/src/_golden-api.d.ts    | 2 +-
 .../angular_devkit/schematics/src/engine/interface.ts     | 3 ++-
 packages/angular_devkit/schematics/src/rules/call.ts      | 8 +++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/etc/api/angular_devkit/schematics/src/_golden-api.d.ts b/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
index 13d616c3e643..3123c58c5c65 100644
--- a/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
@@ -424,7 +424,7 @@ export interface RequiredWorkflowExecutionContext {
     schematic: string;
 }
 
-export declare type Rule = (tree: Tree, context: SchematicContext) => Tree | Observable<Tree> | Rule | void;
+export declare type Rule = (tree: Tree, context: SchematicContext) => Tree | Observable<Tree> | Rule | Promise<void> | void;
 
 export declare type RuleFactory<T extends object> = (options: T) => Rule;
 
diff --git a/packages/angular_devkit/schematics/src/engine/interface.ts b/packages/angular_devkit/schematics/src/engine/interface.ts
index eba154db2af0..41d1ec970c89 100644
--- a/packages/angular_devkit/schematics/src/engine/interface.ts
+++ b/packages/angular_devkit/schematics/src/engine/interface.ts
@@ -227,4 +227,5 @@ export type AsyncFileOperator = (tree: FileEntry) => Observable<FileEntry | null
  * know which types is the schematic or collection metadata, as they are both tooling specific.
  */
 export type Source = (context: SchematicContext) => Tree | Observable<Tree>;
-export type Rule = (tree: Tree, context: SchematicContext) => Tree | Observable<Tree> | Rule | void;
+export type Rule = (tree: Tree, context: SchematicContext) =>
+  Tree | Observable<Tree> | Rule | Promise<void> | void;
diff --git a/packages/angular_devkit/schematics/src/rules/call.ts b/packages/angular_devkit/schematics/src/rules/call.ts
index db5faffb21a6..4668d3df952c 100644
--- a/packages/angular_devkit/schematics/src/rules/call.ts
+++ b/packages/angular_devkit/schematics/src/rules/call.ts
@@ -5,9 +5,9 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { BaseException, isObservable } from '@angular-devkit/core';
-import { Observable, of as observableOf, throwError } from 'rxjs';
-import { defaultIfEmpty, last, mergeMap, tap } from 'rxjs/operators';
+import { BaseException, isObservable, isPromise } from '@angular-devkit/core';
+import { Observable, from, of as observableOf, throwError } from 'rxjs';
+import { defaultIfEmpty, last, map, mergeMap, tap } from 'rxjs/operators';
 import { Rule, SchematicContext, Source } from '../engine/interface';
 import { Tree, TreeSymbol } from '../tree/interface';
 
@@ -96,6 +96,8 @@ export function callRule(
           }
         }),
       );
+    } else if (isPromise(result)) {
+      return from(result).pipe(map(() => inputTree));
     } else if (TreeSymbol in result) {
       return observableOf(result);
     } else {

From b1477425d9bf6203ab237c3e30342964f8fb91a4 Mon Sep 17 00:00:00 2001
From: clydin <19598772+clydin@users.noreply.github.com>
Date: Thu, 7 Mar 2019 19:01:41 -0500
Subject: [PATCH 0881/1703] feat(@angular-devkit/schematics): support unicode
 character HTML element names (#13837)

The HTML specification allows for a wide variety of characters to be present within a custom element name.  The previous behavior limited the names to mostly alphanumeric characters.  This change opens up the names to include the characters specified within the specification for custom element names.
---
 .../schematics/src/formats/html-selector.ts   | 39 ++++++++++++++++---
 .../src/formats/html-selector_spec.ts         | 17 ++++++--
 2 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/packages/angular_devkit/schematics/src/formats/html-selector.ts b/packages/angular_devkit/schematics/src/formats/html-selector.ts
index 6d7d9ada9b0b..b048482d2eb7 100644
--- a/packages/angular_devkit/schematics/src/formats/html-selector.ts
+++ b/packages/angular_devkit/schematics/src/formats/html-selector.ts
@@ -5,18 +5,47 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
 import { schema } from '@angular-devkit/core';
 
+// As per https://html.spec.whatwg.org/multipage/custom-elements.html#valid-custom-element-name
+// * Without mandatory `-` as the application prefix will generally cover its inclusion
+// * And an allowance for upper alpha characters
+
+// NOTE: This should eventually be broken out into two formats: full and partial (allows for prefix)
+
+const unicodeRanges = [
+  [0xC0, 0xD6],
+  [0xD8, 0xF6],
+  [0xF8, 0x37D],
+  [0x37F, 0x1FFF],
+  [0x200C, 0x200D],
+  [0x203F, 0x2040],
+  [0x2070, 0x218F],
+  [0x2C00, 0x2FEF],
+  [0x3001, 0xD7FF],
+  [0xF900, 0xFDCF],
+  [0xFDF0, 0xFFFD],
+  [0x10000, 0xEFFFF],
+];
+
+function isValidElementName(name: string) {
+  let regex = '^[a-zA-Z][';
+
+  regex += '-.0-9_a-zA-Z\\u{B7}';
+
+  for (const range of unicodeRanges) {
+    regex += `\\u{${range[0].toString(16)}}-\\u{${range[1].toString(16)}}`;
+  }
+
+  regex += ']*$';
 
-// Must start with a letter, and must contain only alphanumeric characters or dashes.
-// When adding a dash the segment after the dash must also start with a letter.
-export const htmlSelectorRe = /^[a-zA-Z][.0-9a-zA-Z]*(:?-[a-zA-Z][.0-9a-zA-Z]*)*$/;
+  return new RegExp(regex, 'u').test(name);
+}
 
 export const htmlSelectorFormat: schema.SchemaFormat = {
   name: 'html-selector',
   formatter: {
     async: false,
-    validate: (selector: string) => htmlSelectorRe.test(selector),
+    validate: name => typeof name === 'string' && isValidElementName(name),
   },
 };
diff --git a/packages/angular_devkit/schematics/src/formats/html-selector_spec.ts b/packages/angular_devkit/schematics/src/formats/html-selector_spec.ts
index c59ad62d6641..411d1df67df9 100644
--- a/packages/angular_devkit/schematics/src/formats/html-selector_spec.ts
+++ b/packages/angular_devkit/schematics/src/formats/html-selector_spec.ts
@@ -5,12 +5,10 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
 import { map } from 'rxjs/operators';
 import { formatValidator } from './format-validator';
 import { htmlSelectorFormat } from './html-selector';
 
-
 describe('Schematics HTML selector format', () => {
   it('accepts correct selectors', done => {
     const data = { selector: 'my-selector' };
@@ -45,14 +43,25 @@ describe('Schematics HTML selector format', () => {
       .toPromise().then(done, done.fail);
   });
 
-  it('rejects selectors with non-letter after dash', done => {
+  it('accepts selectors with non-letter after dash', done => {
     const data = { selector: 'my-1selector' };
     const dataSchema = {
       properties: { selector: { type: 'string', format: 'html-selector' } },
     };
 
     formatValidator(data, dataSchema, [htmlSelectorFormat])
-      .pipe(map(result => expect(result.success).toBe(false)))
+      .pipe(map(result => expect(result.success).toBe(true)))
+      .toPromise().then(done, done.fail);
+  });
+
+  it('accepts selectors with unicode', done => {
+    const data = { selector: 'app-root😀' };
+    const dataSchema = {
+      properties: { selector: { type: 'string', format: 'html-selector' } },
+    };
+
+    formatValidator(data, dataSchema, [htmlSelectorFormat])
+      .pipe(map(result => expect(result.success).toBe(true)))
       .toPromise().then(done, done.fail);
   });
 });

From 29b1533fa9a4d84f0b16592ddce276785c60ebd5 Mon Sep 17 00:00:00 2001
From: Renovate Bot <renovatebot@gmail.com>
Date: Fri, 8 Mar 2019 01:02:08 +0100
Subject: [PATCH 0882/1703] build: update webpack-dev-middleware to version
 3.6.1 (#13843)

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 64 ++++---------------
 2 files changed, 14 insertions(+), 52 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index b6f71cc160b5..0300548db72b 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -45,7 +45,7 @@
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.2.3",
     "webpack": "4.29.6",
-    "webpack-dev-middleware": "3.6.0",
+    "webpack-dev-middleware": "3.6.1",
     "webpack-dev-server": "3.2.1",
     "webpack-merge": "4.2.1",
     "webpack-sources": "1.3.0",
diff --git a/yarn.lock b/yarn.lock
index ef2da367ef9a..5c320209caf6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2525,21 +2525,6 @@ cosmiconfig@^5.0.7:
     lodash.get "^4.4.2"
     parse-json "^4.0.0"
 
-crc32-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-2.0.0.tgz#e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"
-  integrity sha1-483TtN8xaN10494/u8t7KX/pCPQ=
-  dependencies:
-    crc "^3.4.4"
-    readable-stream "^2.0.0"
-
-crc@^3.4.4:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6"
-  integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==
-  dependencies:
-    buffer "^5.1.0"
-
 create-ecdh@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
@@ -5371,7 +5356,7 @@ karma-sourcemap-loader@0.3.7:
   dependencies:
     graceful-fs "^4.1.2"
 
-karma@^4.0.0:
+karma@^4.0.0, karma@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/karma/-/karma-4.0.1.tgz#2581d6caa0d4cd28b65131561b47bad6d5478773"
   integrity sha512-ind+4s03BqIXas7ZmraV3/kc5+mnqwCd+VDX1FndS6jxbt03kQKX2vXrWxNLuCjVYmhMwOZosAEKMM0a2q7w7A==
@@ -5438,39 +5423,6 @@ karma@~4.0.0:
     tmp "0.0.33"
     useragent "2.3.0"
 
-karma@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-4.0.1.tgz#2581d6caa0d4cd28b65131561b47bad6d5478773"
-  integrity sha512-ind+4s03BqIXas7ZmraV3/kc5+mnqwCd+VDX1FndS6jxbt03kQKX2vXrWxNLuCjVYmhMwOZosAEKMM0a2q7w7A==
-  dependencies:
-    bluebird "^3.3.0"
-    body-parser "^1.16.1"
-    braces "^2.3.2"
-    chokidar "^2.0.3"
-    colors "^1.1.0"
-    connect "^3.6.0"
-    core-js "^2.2.0"
-    di "^0.0.1"
-    dom-serialize "^2.2.0"
-    flatted "^2.0.0"
-    glob "^7.1.1"
-    graceful-fs "^4.1.2"
-    http-proxy "^1.13.0"
-    isbinaryfile "^3.0.0"
-    lodash "^4.17.11"
-    log4js "^4.0.0"
-    mime "^2.3.1"
-    minimatch "^3.0.2"
-    optimist "^0.6.1"
-    qjobs "^1.1.4"
-    range-parser "^1.2.0"
-    rimraf "^2.6.0"
-    safe-buffer "^5.0.1"
-    socket.io "2.1.1"
-    source-map "^0.6.1"
-    tmp "0.0.33"
-    useragent "2.3.0"
-
 keyv@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
@@ -7745,7 +7697,7 @@ read-pkg@^4.0.1:
     parse-json "^4.0.0"
     pify "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.3:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3:
   version "2.3.6"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
@@ -9813,7 +9765,17 @@ webpack-dev-middleware@3.4.0:
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
-webpack-dev-middleware@3.6.0, webpack-dev-middleware@^3.5.1:
+webpack-dev-middleware@3.6.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.1.tgz#91f2531218a633a99189f7de36045a331a4b9cd4"
+  integrity sha512-XQmemun8QJexMEvNFbD2BIg4eSKrmSIMrTfnl2nql2Sc6OGAYFyb8rwuYrCjl/IiEYYuyTEiimMscu7EXji/Dw==
+  dependencies:
+    memory-fs "^0.4.1"
+    mime "^2.3.1"
+    range-parser "^1.0.3"
+    webpack-log "^2.0.0"
+
+webpack-dev-middleware@^3.5.1:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.0.tgz#71f1b04e52ff8d442757af2be3a658237d53a3e5"
   integrity sha512-oeXA3m+5gbYbDBGo4SvKpAHJJEGMoekUbHgo1RK7CP1sz7/WOSeu/dWJtSTk+rzDCLkPwQhGocgIq6lQqOyOwg==

From 345ab4817ab6b5e76978d30110bd99e6efcfd126 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Thu, 7 Mar 2019 14:20:06 +0100
Subject: [PATCH 0883/1703] fix(@ngtools/webpack): `getCurrentDirectory` should
 not return a devkit path

At the moment we are leaking devkit paths as `getCurrentDirectory` is used by the ngtsc compiler if no `rootDir` directories is provided.

`getCurrentDirectory` is also used to contruct the `rootDirs` option which is causing this to be incorrect as under Windows as `rootDirs` will be have an invalid value example: `/c/foo/bar`

This PR complements https://github.com/angular/angular/pull/29151

**Note** that this currently works because we are normalizing paths with posix seperators and is mimicking the behaviour of the logical file system used by the ngtsc.

Fixes: #13849
---
 packages/ngtools/webpack/src/compiler_host.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ngtools/webpack/src/compiler_host.ts b/packages/ngtools/webpack/src/compiler_host.ts
index aac65c453ef0..d5091ed73ac0 100644
--- a/packages/ngtools/webpack/src/compiler_host.ts
+++ b/packages/ngtools/webpack/src/compiler_host.ts
@@ -314,7 +314,7 @@ export class WebpackCompilerHost implements ts.CompilerHost {
   }
 
   getCurrentDirectory(): string {
-    return this._basePath;
+    return workaroundResolve(this._basePath);
   }
 
   getCanonicalFileName(fileName: string): string {

From a9ebfc807684a355fad0abcae2a0e971bae622d1 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Thu, 7 Mar 2019 14:28:03 +0100
Subject: [PATCH 0884/1703] ci: include ivy tests in windows ci

With this change we include ivy tests to run under windows, also this changes `ivy-lazy-load` test to create a project only 1 time. This is important for windows, as `npm install` & `ngcc` take a lot of time, and for this specific test it is done 3 times.

Now `npm install` and `ngcc` will only run once
---
 appveyor-e2e.bat                              |  4 +-
 .../{experimental => ivy}/ivy-lazy-load.ts    | 38 ++++++++++---------
 .../e2e/tests/{experimental => ivy}/ivy.ts    |  0
 3 files changed, 22 insertions(+), 20 deletions(-)
 rename tests/legacy-cli/e2e/tests/{experimental => ivy}/ivy-lazy-load.ts (74%)
 rename tests/legacy-cli/e2e/tests/{experimental => ivy}/ivy.ts (100%)

diff --git a/appveyor-e2e.bat b/appveyor-e2e.bat
index d1f6c0eabb16..b0e6fa7c4a4f 100644
--- a/appveyor-e2e.bat
+++ b/appveyor-e2e.bat
@@ -2,11 +2,11 @@
 IF not defined APPVEYOR_PULL_REQUEST_NUMBER (
   IF not defined BUILDKITE_PULL_REQUEST (
     REM Run full test suite if not on a Appveyor/Buildkite PR.
-    node tests\legacy-cli\run_e2e.js --appveyor "--glob=tests/{basic,commands,generate,build/styles}/**"
+    node tests\legacy-cli\run_e2e.js --appveyor "--glob=tests/{basic,commands,generate,build/styles,ivy}/**"
     exit
   )
 ) 
 
 REM Run partial test suite.
-node tests\legacy-cli\run_e2e.js --appveyor "--glob=tests/basic/**"
+node tests\legacy-cli\run_e2e.js --appveyor "--glob=tests/{basic,ivy}/**"
 
diff --git a/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts b/tests/legacy-cli/e2e/tests/ivy/ivy-lazy-load.ts
similarity index 74%
rename from tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts
rename to tests/legacy-cli/e2e/tests/ivy/ivy-lazy-load.ts
index e4c5c00bcb3d..fdd2485fad72 100644
--- a/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts
+++ b/tests/legacy-cli/e2e/tests/ivy/ivy-lazy-load.ts
@@ -5,26 +5,35 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { replaceInFile, writeFile } from '../../utils/fs';
+import { readFile, replaceInFile, writeFile } from '../../utils/fs';
 import { ng } from '../../utils/process';
 import { createProject, updateJsonFile } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
 
-export async function ivyLazyLoadSetup(projectName: string) {
+export default async function () {
+  const projectName = 'ivy-lazy-loading';
+  const appRoutingModulePath = 'src/app/app-routing.module.ts';
+
   // Make Ivy project.
   await createProject(projectName, '--enable-ivy', '--routing');
 
+  const originalAppRoutingModule = await readFile(appRoutingModulePath);
+  // helper to replace loadChildren
+  const replaceLoadChildren = async (route: string) => {
+    const content = originalAppRoutingModule.replace('const routes: Routes = [];', `
+      const routes: Routes = [{ path: 'lazy', loadChildren: ${route} }];
+    `);
+
+    return writeFile(appRoutingModulePath, content);
+  };
+
   // Add lazy route.
   await ng('generate', 'module', 'lazy', '--routing');
-  await replaceInFile('src/app/app-routing.module.ts', 'const routes: Routes = [];', `
-    const routes: Routes = [{ path: 'lazy', loadChildren: LOAD_CHILDREN_MARKER }];
-  `);
   await ng('generate', 'component', 'lazy/lazy-comp');
   await replaceInFile('src/app/lazy/lazy-routing.module.ts', 'const routes: Routes = [];', `
     import { LazyCompComponent } from './lazy-comp/lazy-comp.component';
     const routes: Routes = [{ path: '', component: LazyCompComponent }];
   `);
-  await writeFile('src/app/app.component.html', '<router-outlet></router-outlet>');
 
   // Add lazy route e2e
   await writeFile('e2e/src/app.e2e-spec.ts', `
@@ -59,30 +68,23 @@ export async function ivyLazyLoadSetup(projectName: string) {
     buildTarget['options']['aot'] = false;
     buildTarget['configurations']['production'] = { aot: true };
   });
-}
 
-export default async function () {
   // Test `import()` style lazy load.
-  await ivyLazyLoadSetup('ivy-lazy-import');
-  await replaceInFile('src/app/app-routing.module.ts', 'LOAD_CHILDREN_MARKER', `
-   () => import('./lazy/lazy.module').then(m => m.LazyModule)
-  `);
+  await replaceLoadChildren(`() => import('./lazy/lazy.module').then(m => m.LazyModule)`);
   await ng('e2e');
   await ng('e2e', '--prod');
 
   // Test string import with factory shims.
-  await ivyLazyLoadSetup('ivy-lazy-string-shims');
-  await replaceInFile('src/app/app-routing.module.ts', 'LOAD_CHILDREN_MARKER',
-    `'./lazy/lazy.module#LazyModule'`);
+  await replaceLoadChildren(`'./lazy/lazy.module#LazyModule'`);
   await replaceInFile('tsconfig.app.json', `"allowEmptyCodegenFiles": false`,
     `"allowEmptyCodegenFiles": true`);
   await expectToFail(() => ng('e2e')); // Currently broken.
   await ng('e2e', '--prod');
 
   // Test string import without factory shims.
-  await ivyLazyLoadSetup('ivy-lazy-string-no-shims');
-  await replaceInFile('src/app/app-routing.module.ts', 'LOAD_CHILDREN_MARKER',
-    `'./lazy/lazy.module#LazyModule'`);
+  await replaceLoadChildren(`'./lazy/lazy.module#LazyModule'`);
+  await replaceInFile('tsconfig.app.json', `"allowEmptyCodegenFiles": true`,
+  `"allowEmptyCodegenFiles": false`);
   await expectToFail(() => ng('e2e')); // Not supported.
   await expectToFail(() => ng('e2e', '--prod')); // Not supported.
 }
diff --git a/tests/legacy-cli/e2e/tests/experimental/ivy.ts b/tests/legacy-cli/e2e/tests/ivy/ivy.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/experimental/ivy.ts
rename to tests/legacy-cli/e2e/tests/ivy/ivy.ts

From e96afb874d4a03a8bf0a9cac9d79dd7dc7db31de Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 7 Mar 2019 14:11:19 +0000
Subject: [PATCH 0885/1703] test: ignore platform-server tests for ivy

---
 tests/legacy-cli/e2e_runner.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/legacy-cli/e2e_runner.ts b/tests/legacy-cli/e2e_runner.ts
index 6bd8a8cebdbc..54f0d2becedc 100644
--- a/tests/legacy-cli/e2e_runner.ts
+++ b/tests/legacy-cli/e2e_runner.ts
@@ -143,7 +143,13 @@ if (argv.ivy) {
     .filter(name => !name.includes('tests/i18n/'))
     .filter(name => !name.endsWith('tests/build/aot/aot-i18n.ts'))
     // We don't have a library consumption story yet for Ivy.
-    .filter(name => !name.endsWith('tests/generate/library/library-consumption.ts'));
+    .filter(name => !name.endsWith('tests/generate/library/library-consumption.ts'))
+    // We don't have a platform-server usage story yet for Ivy.
+    // It's contingent on lazy loading and factory shim considerations that are still being
+    // discussed.
+    .filter(name => !name.endsWith('tests/build/platform-server.ts'))
+    .filter(name => !name.endsWith('tests/build/build-app-shell.ts'))
+    .filter(name => !name.endsWith('tests/build/build-app-shell-with-schematic.ts'));
 }
 
 const shardId = ('shard' in argv) ? argv['shard'] : null;

From d747490fd96ad592b7f4d55b4c237d8bf5233fbc Mon Sep 17 00:00:00 2001
From: Cyrille Tuzi <web@cyrilletuzi.com>
Date: Fri, 28 Dec 2018 15:15:26 +0100
Subject: [PATCH 0886/1703] feat(@schematics/angular): JSON schema for service
 worker config

---
 .../files/ngsw-config.json.template           |  1 +
 .../angular/service-worker/index.ts           |  5 +++-
 .../angular/service-worker/index_spec.ts      | 25 +++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/angular/service-worker/files/ngsw-config.json.template b/packages/schematics/angular/service-worker/files/ngsw-config.json.template
index ca5274b03cae..6100922d1b02 100644
--- a/packages/schematics/angular/service-worker/files/ngsw-config.json.template
+++ b/packages/schematics/angular/service-worker/files/ngsw-config.json.template
@@ -1,4 +1,5 @@
 {
+  "$schema": "<%= relativePathToWorkspaceRoot %>/node_modules/@angular/service-worker/config/schema.json",
   "index": "/index.html",
   "assetGroups": [
     {
diff --git a/packages/schematics/angular/service-worker/index.ts b/packages/schematics/angular/service-worker/index.ts
index 962b0c881e9f..1dd6f6bf973e 100644
--- a/packages/schematics/angular/service-worker/index.ts
+++ b/packages/schematics/angular/service-worker/index.ts
@@ -169,13 +169,16 @@ export default function (options: ServiceWorkerOptions): Rule {
       throw new SchematicsException(`Service worker requires a project type of "application".`);
     }
 
+    const relativePathToWorkspaceRoot = project.root ?
+      project.root.split('/').filter(x => x !== '').map(x => '..').join('/') : '.';
+
     let { resourcesOutputPath = '' } = getProjectConfiguration(workspace, options);
     if (resourcesOutputPath) {
       resourcesOutputPath = '/' + resourcesOutputPath.split('/').filter(x => !!x).join('/');
     }
 
     const templateSource = apply(url('./files'), [
-      applyTemplates({ ...options, resourcesOutputPath }),
+      applyTemplates({ ...options, resourcesOutputPath, relativePathToWorkspaceRoot }),
       move(project.root),
     ]);
 
diff --git a/packages/schematics/angular/service-worker/index_spec.ts b/packages/schematics/angular/service-worker/index_spec.ts
index d31a4fb7fd21..cfa601319457 100644
--- a/packages/schematics/angular/service-worker/index_spec.ts
+++ b/packages/schematics/angular/service-worker/index_spec.ts
@@ -101,6 +101,31 @@ describe('Service Worker Schematic', () => {
       .toBe('projects/bar/ngsw-config.json');
   });
 
+  it('should add $schema in ngsw-config.json with correct relative path', () => {
+    const pathToNgswConfigSchema = 'node_modules/@angular/service-worker/config/schema.json';
+
+    const name = 'foo';
+    const rootAppOptions: ApplicationOptions = {
+      ...appOptions,
+      name,
+      projectRoot: '',
+    };
+    const rootSWOptions: ServiceWorkerOptions = {
+      ...defaultOptions,
+      project: name,
+    };
+    const rootAppTree = schematicRunner.runSchematic('application', rootAppOptions, appTree);
+    const treeInRoot = schematicRunner.runSchematic('service-worker', rootSWOptions, rootAppTree);
+    const pkgTextInRoot = treeInRoot.readContent('/ngsw-config.json');
+    const configInRoot = JSON.parse(pkgTextInRoot);
+    expect(configInRoot.$schema).toBe(`./${pathToNgswConfigSchema}`);
+
+    const treeNotInRoot = schematicRunner.runSchematic('service-worker', defaultOptions, appTree);
+    const pkgTextNotInRoot = treeNotInRoot.readContent('/projects/bar/ngsw-config.json');
+    const configNotInRoot = JSON.parse(pkgTextNotInRoot);
+    expect(configNotInRoot.$schema).toBe(`../../${pathToNgswConfigSchema}`);
+  });
+
   it('should add root assets RegExp', () => {
     const tree = schematicRunner.runSchematic('service-worker', defaultOptions, appTree);
     const pkgText = tree.readContent('/projects/bar/ngsw-config.json');

From 7eb4bab00fbe017986170586a78c90114140551e Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 6 Mar 2019 10:14:51 -0800
Subject: [PATCH 0887/1703] build: add validation for "DO NOT SUBMIT" strings

This makes sure that messages that should not be submitted (or
comments) fail validation on CI.
---
 scripts/validate-do-not-submit.ts | 72 +++++++++++++++++++++++++++++++
 scripts/validate.ts               |  6 +++
 2 files changed, 78 insertions(+)
 create mode 100644 scripts/validate-do-not-submit.ts

diff --git a/scripts/validate-do-not-submit.ts b/scripts/validate-do-not-submit.ts
new file mode 100644
index 000000000000..452827e41977
--- /dev/null
+++ b/scripts/validate-do-not-submit.ts
@@ -0,0 +1,72 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// tslint:disable:no-implicit-dependencies
+import { logging } from '@angular-devkit/core';
+import { execSync } from 'child_process';
+
+
+export interface ValidateCommitsOptions {
+  ci?: boolean;
+  base?: string;
+  head?: string;
+}
+
+
+export default async function (argv: ValidateCommitsOptions, logger: logging.Logger) {
+  logger.info('Getting merge base...');
+
+  const prNumber = process.env['CIRCLE_PR_NUMBER'] || '';
+  let baseSha = '';
+  let sha = '';
+
+  if (prNumber) {
+    const url = `https://api.github.com/repos/angular/angular-cli/pulls/${prNumber}`;
+    const prJson = JSON.parse(execSync(`curl "${url}"`, {
+      stdio: ['ignore', 'pipe', 'ignore'],
+      encoding: 'utf8',
+    }).toString());
+    baseSha = prJson['base']['sha'];
+    sha = prJson['head']['sha'];
+  } else if (argv.base) {
+    baseSha = argv.base;
+    sha = argv.head || 'HEAD';
+  } else {
+    const parentRemote = process.env['GIT_REMOTE'] ? process.env['GIT_REMOTE'] + '/' : '';
+    const parentBranch = process.env['GIT_BRANCH'] || 'master';
+    baseSha = execSync(`git merge-base --fork-point "${parentRemote}${parentBranch}"`)
+      .toString().trim();
+    sha = 'HEAD';
+  }
+
+  logger.createChild('sha').info(`Base: ${baseSha}\nHEAD: ${sha}`);
+
+  const diffFiles = execSync(`git diff --name-only "${baseSha}..${sha}"`).toString().trim();
+  const files = diffFiles.split(/\n/);
+  let errorCount = 0;
+
+  for (const fileName of files) {
+    const diff = execSync(`git diff "${baseSha}..${sha}" -- "${fileName}"`).toString().trim();
+
+    // This does not trigger itself because of the `b` in `\bDO_`...
+    if (diff.match(/\bDO_NOT_SUBMIT\b/)) {
+      // Use a workaround to prevent triggering itself.
+      logger.error(`DO_NOT${''}_SUBMIT token found in ${JSON.stringify(fileName)}.`);
+
+      errorCount++;
+    }
+  }
+
+  logger.info('');
+  if (errorCount > 0) {
+    logger.fatal(`${errorCount} file${errorCount > 1 ? 's' : ''} need to be fixed...`);
+  } else {
+    logger.info('All green. Thank you, come again.');
+  }
+
+  return errorCount;
+}
diff --git a/scripts/validate.ts b/scripts/validate.ts
index d08871c26a95..ddeb714b4852 100644
--- a/scripts/validate.ts
+++ b/scripts/validate.ts
@@ -11,6 +11,7 @@ import { execSync } from 'child_process';
 import templates from './templates';
 import validateBuildFiles from './validate-build-files';
 import validateCommits from './validate-commits';
+import validateDoNotSubmit from './validate-do-not-submit';
 import validateLicenses from './validate-licenses';
 
 export default async function (options: { verbose: boolean }, logger: logging.Logger) {
@@ -43,6 +44,11 @@ export default async function (options: { verbose: boolean }, logger: logging.Lo
   error = await validateCommits({}, logger.createChild('validate-commits')) != 0
        || error;
 
+  logger.info('');
+  logger.info(`Running DO_NOT${''}_SUBMIT validation...`);
+  error = await validateDoNotSubmit({}, logger.createChild('validate-do-not-submit')) != 0
+       || error;
+
   logger.info('');
   logger.info('Running license validation...');
   error = await validateLicenses({}, logger.createChild('validate-commits')) != 0

From 15d7aea2b79f2a3a3a6669099e47fef086d3a5f5 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 6 Mar 2019 10:16:47 -0800
Subject: [PATCH 0888/1703] feat(@angular-devkit/core): analytics interfaces
 and basic implementations

This is a preliminary analytics interface. It is meant to be used by every
other subsystem where useful, but can be replaced by implementations.
---
 .../angular_devkit/core/src/analytics/api.ts  |  52 +++++++
 .../core/src/analytics/forwarder.ts           | 131 ++++++++++++++++++
 .../core/src/analytics/index.ts               |  12 ++
 .../core/src/analytics/logging.ts             |  34 +++++
 .../core/src/analytics/multi.ts               |  38 +++++
 .../angular_devkit/core/src/analytics/noop.ts |  19 +++
 packages/angular_devkit/core/src/index.ts     |   2 +
 7 files changed, 288 insertions(+)
 create mode 100644 packages/angular_devkit/core/src/analytics/api.ts
 create mode 100644 packages/angular_devkit/core/src/analytics/forwarder.ts
 create mode 100644 packages/angular_devkit/core/src/analytics/index.ts
 create mode 100644 packages/angular_devkit/core/src/analytics/logging.ts
 create mode 100644 packages/angular_devkit/core/src/analytics/multi.ts
 create mode 100644 packages/angular_devkit/core/src/analytics/noop.ts

diff --git a/packages/angular_devkit/core/src/analytics/api.ts b/packages/angular_devkit/core/src/analytics/api.ts
new file mode 100644
index 000000000000..f538d1ba088a
--- /dev/null
+++ b/packages/angular_devkit/core/src/analytics/api.ts
@@ -0,0 +1,52 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+export interface CustomDimensionsAndMetricsOptions {
+  dimensions?: (boolean | number | string)[];
+  metrics?: (boolean | number | string)[];
+}
+
+export interface EventOptions extends CustomDimensionsAndMetricsOptions {
+  label?: string;
+  value?: string;
+}
+
+export interface ScreenviewOptions extends CustomDimensionsAndMetricsOptions {
+  appVersion?: string;
+  appId?: string;
+  appInstallerId?: string;
+}
+
+export interface PageviewOptions extends CustomDimensionsAndMetricsOptions {
+  hostname?: string;
+  title?: string;
+}
+
+export interface TimingOptions extends CustomDimensionsAndMetricsOptions {
+  label?: string;
+}
+
+/**
+ * Interface for managing analytics. This is highly platform dependent, and mostly matches
+ * Google Analytics. The reason the interface is here is to remove the dependency to an
+ * implementation from most other places.
+ *
+ * The methods exported from this interface more or less match those needed by us in the
+ * universal analytics package, see https://unpkg.com/@types/universal-analytics@0.4.2/index.d.ts
+ * for typings. We mostly named arguments to make it easier to follow, but didn't change or
+ * add any semantics to those methods. They're mapping GA and u-a one for one.
+ *
+ * The Angular CLI (or any other kind of backend) should forward it to some compatible backend.
+ */
+export interface Analytics {
+  event(category: string, action: string, options?: EventOptions): void;
+  screenview(screenName: string, appName: string, options?: ScreenviewOptions): void;
+  pageview(path: string, options?: PageviewOptions): void;
+  timing(category: string, variable: string, time: string | number, options?: TimingOptions): void;
+
+  flush(): Promise<void>;
+}
diff --git a/packages/angular_devkit/core/src/analytics/forwarder.ts b/packages/angular_devkit/core/src/analytics/forwarder.ts
new file mode 100644
index 000000000000..8c1ba6de6a92
--- /dev/null
+++ b/packages/angular_devkit/core/src/analytics/forwarder.ts
@@ -0,0 +1,131 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { JsonObject } from '../json';
+import { Analytics, EventOptions, PageviewOptions, ScreenviewOptions, TimingOptions } from './api';
+
+
+export enum AnalyticsReportKind {
+  Event = 'event',
+  Screenview = 'screenview',
+  Pageview = 'pageview',
+  Timing = 'timing',
+}
+
+export interface AnalyticsReportBase extends JsonObject {
+  kind: AnalyticsReportKind;
+}
+
+export interface AnalyticsReportEvent extends AnalyticsReportBase {
+  kind: AnalyticsReportKind.Event;
+  options: JsonObject & EventOptions;
+  category: string;
+  action: string;
+}
+export interface AnalyticsReportScreenview extends AnalyticsReportBase {
+  kind: AnalyticsReportKind.Screenview;
+  options: JsonObject & ScreenviewOptions;
+  screenName: string;
+  appName: string;
+}
+export interface AnalyticsReportPageview extends AnalyticsReportBase {
+  kind: AnalyticsReportKind.Pageview;
+  options: JsonObject & PageviewOptions;
+  path: string;
+}
+export interface AnalyticsReportTiming extends AnalyticsReportBase {
+  kind: AnalyticsReportKind.Timing;
+  options: JsonObject & TimingOptions;
+  category: string;
+  variable: string;
+  time: string | number;
+}
+
+export type AnalyticsReport =
+  AnalyticsReportEvent
+  | AnalyticsReportScreenview
+  | AnalyticsReportPageview
+  | AnalyticsReportTiming
+  ;
+
+/**
+ * A function that can forward analytics along some stream. AnalyticsReport is already a
+ * JsonObject descendant, but we force it here so the user knows it's safe to serialize.
+ */
+export type AnalyticsForwarderFn = (report: JsonObject & AnalyticsReport) => void;
+
+/**
+ * A class that follows the Analytics interface and forwards analytic reports (JavaScript objects).
+ * AnalyticsReporter is the counterpart which takes analytic reports and report them to another
+ * Analytics interface.
+ */
+export class ForwardingAnalytics implements Analytics {
+  constructor(protected _fn: AnalyticsForwarderFn) {}
+
+  event(category: string, action: string, options?: EventOptions) {
+    this._fn({
+      kind: AnalyticsReportKind.Event,
+      category,
+      action,
+      options: { ...options } as JsonObject,
+    });
+  }
+  screenview(screenName: string, appName: string, options?: ScreenviewOptions) {
+    this._fn({
+      kind: AnalyticsReportKind.Screenview,
+      screenName,
+      appName,
+      options: { ...options } as JsonObject,
+    });
+  }
+  pageview(path: string, options?: PageviewOptions) {
+    this._fn({
+      kind: AnalyticsReportKind.Pageview,
+      path,
+      options: { ...options } as JsonObject,
+    });
+  }
+  timing(category: string, variable: string, time: string | number, options?: TimingOptions): void {
+    this._fn({
+      kind: AnalyticsReportKind.Timing,
+      category,
+      variable,
+      time,
+      options: { ...options } as JsonObject,
+    });
+  }
+
+  // We do not support flushing.
+  flush() {
+    return Promise.resolve();
+  }
+}
+
+
+export class AnalyticsReporter {
+  constructor(protected _analytics: Analytics) {}
+
+  report(report: AnalyticsReport) {
+    switch (report.kind) {
+      case AnalyticsReportKind.Event:
+        this._analytics.event(report.category, report.action, report.options);
+        break;
+      case AnalyticsReportKind.Screenview:
+        this._analytics.screenview(report.screenName, report.appName, report.options);
+        break;
+      case AnalyticsReportKind.Pageview:
+        this._analytics.pageview(report.path, report.options);
+        break;
+      case AnalyticsReportKind.Timing:
+        this._analytics.timing(report.category, report.variable, report.time, report.options);
+        break;
+
+      default:
+        throw new Error('Unexpected analytics report: ' + JSON.stringify(report));
+    }
+  }
+}
diff --git a/packages/angular_devkit/core/src/analytics/index.ts b/packages/angular_devkit/core/src/analytics/index.ts
new file mode 100644
index 000000000000..e84c8b068b88
--- /dev/null
+++ b/packages/angular_devkit/core/src/analytics/index.ts
@@ -0,0 +1,12 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+export * from './api';
+export * from './forwarder';
+export * from './logging';
+export * from './multi';
+export * from './noop';
diff --git a/packages/angular_devkit/core/src/analytics/logging.ts b/packages/angular_devkit/core/src/analytics/logging.ts
new file mode 100644
index 000000000000..e19785727ffe
--- /dev/null
+++ b/packages/angular_devkit/core/src/analytics/logging.ts
@@ -0,0 +1,34 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Logger } from '../logger';
+import { Analytics, EventOptions, PageviewOptions, ScreenviewOptions, TimingOptions } from './api';
+
+/**
+ * Analytics implementation that logs analytics events to a logger. This should be used for
+ * debugging mainly.
+ */
+export class LoggingAnalytics implements Analytics {
+  constructor(protected _logger: Logger) {}
+
+  event(category: string, action: string, options?: EventOptions): void {
+    this._logger.info('event ' + JSON.stringify({ category, action, ...options }));
+  }
+  screenview(screenName: string, appName: string, options?: ScreenviewOptions): void {
+    this._logger.info('screenview ' + JSON.stringify({ screenName, appName, ...options }));
+  }
+  pageview(path: string, options?: PageviewOptions): void {
+    this._logger.info('pageview ' + JSON.stringify({ path, ...options }));
+  }
+  timing(category: string, variable: string, time: string | number, options?: TimingOptions): void {
+    this._logger.info('timing ' + JSON.stringify({ category, variable, time, ...options }));
+  }
+
+  flush(): Promise<void> {
+    return Promise.resolve();
+  }
+}
diff --git a/packages/angular_devkit/core/src/analytics/multi.ts b/packages/angular_devkit/core/src/analytics/multi.ts
new file mode 100644
index 000000000000..141f0db38e0b
--- /dev/null
+++ b/packages/angular_devkit/core/src/analytics/multi.ts
@@ -0,0 +1,38 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { Analytics, EventOptions, PageviewOptions, ScreenviewOptions, TimingOptions } from './api';
+
+/**
+ * Analytics implementation that reports to multiple analytics backend.
+ */
+export class MultiAnalytics implements Analytics {
+  constructor(protected _backends: Analytics[] = []) {}
+
+  push(...backend: Analytics[]) {
+    this._backends.push(...backend);
+  }
+
+  event(category: string, action: string, options?: EventOptions): void {
+    this._backends.forEach(be => be.event(category, action, options));
+  }
+  screenview(screenName: string, appName: string, options?: ScreenviewOptions): void {
+    this._backends.forEach(be => be.screenview(screenName, appName, options));
+  }
+  pageview(path: string, options?: PageviewOptions): void {
+    this._backends.forEach(be => be.pageview(path, options));
+  }
+  timing(category: string, variable: string, time: string | number, options?: TimingOptions): void {
+    this._backends.forEach(be => be.timing(category, variable, time, options));
+  }
+
+
+  flush(): Promise<void> {
+    return Promise.all(this._backends.map(x => x.flush())).then(() => {});
+  }
+}
diff --git a/packages/angular_devkit/core/src/analytics/noop.ts b/packages/angular_devkit/core/src/analytics/noop.ts
new file mode 100644
index 000000000000..a4592a75c174
--- /dev/null
+++ b/packages/angular_devkit/core/src/analytics/noop.ts
@@ -0,0 +1,19 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Analytics } from './api';
+
+/**
+ * Analytics implementation that does nothing.
+ */
+export class NoopAnalytics implements Analytics {
+  event() {}
+  screenview() {}
+  pageview() {}
+  timing() {}
+  flush(): Promise<void> { return Promise.resolve(); }
+}
diff --git a/packages/angular_devkit/core/src/index.ts b/packages/angular_devkit/core/src/index.ts
index e292e8e9ff42..03272380bbfe 100644
--- a/packages/angular_devkit/core/src/index.ts
+++ b/packages/angular_devkit/core/src/index.ts
@@ -5,6 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import * as analytics from './analytics';
 import * as experimental from './experimental';
 import * as json from './json/index';
 import * as logging from './logger/index';
@@ -16,6 +17,7 @@ export * from './utils/index';
 export * from './virtual-fs/index';
 
 export {
+  analytics,
   experimental,
   json,
   logging,

From d841b3771ed610efed11bc342fafeddd361941d9 Mon Sep 17 00:00:00 2001
From: WilliamKoza <william.koza@gmail.com>
Date: Sun, 10 Mar 2019 12:44:01 +0100
Subject: [PATCH 0889/1703] fix(@schematics/angular): change entry file name of
 the library schematic according to the kebab-case convention

---
 packages/schematics/angular/library/index_spec.ts         | 8 ++++----
 packages/schematics/angular/library/schema.json           | 2 +-
 .../ng-packaged/projects/lib/ng-package.json              | 2 +-
 .../projects/lib/src/{public_api.ts => public-api.ts}     | 0
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/src/{public_api.ts => public-api.ts} (100%)

diff --git a/packages/schematics/angular/library/index_spec.ts b/packages/schematics/angular/library/index_spec.ts
index 234b44f411d4..6220a07fa23c 100644
--- a/packages/schematics/angular/library/index_spec.ts
+++ b/packages/schematics/angular/library/index_spec.ts
@@ -25,7 +25,7 @@ describe('Library Schematic', () => {
   );
   const defaultOptions: GenerateLibrarySchema = {
     name: 'foo',
-    entryFile: 'my_index',
+    entryFile: 'my-index',
     skipPackageJson: false,
     skipTsConfig: false,
     skipInstall: false,
@@ -51,7 +51,7 @@ describe('Library Schematic', () => {
       '/projects/foo/README.md',
       '/projects/foo/tslint.json',
       '/projects/foo/src/test.ts',
-      '/projects/foo/src/my_index.ts',
+      '/projects/foo/src/my-index.ts',
       '/projects/foo/src/lib/foo.module.ts',
       '/projects/foo/src/lib/foo.component.spec.ts',
       '/projects/foo/src/lib/foo.component.ts',
@@ -89,7 +89,7 @@ describe('Library Schematic', () => {
     const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
     const fileContent = getJsonFileContent(tree, '/projects/foo/ng-package.json');
     expect(fileContent.lib).toBeDefined();
-    expect(fileContent.lib.entryFile).toEqual('src/my_index.ts');
+    expect(fileContent.lib.entryFile).toEqual('src/my-index.ts');
     expect(fileContent.dest).toEqual('../../dist/foo');
   });
 
@@ -97,7 +97,7 @@ describe('Library Schematic', () => {
     const tree = schematicRunner.runSchematic('library', {
       name: 'foobar',
     }, workspaceTree);
-    expect(tree.files).toContain('/projects/foobar/src/public_api.ts');
+    expect(tree.files).toContain('/projects/foobar/src/public-api.ts');
   });
 
   it(`should add library to workspace`, () => {
diff --git a/packages/schematics/angular/library/schema.json b/packages/schematics/angular/library/schema.json
index 2739b644b174..d199c76eb893 100644
--- a/packages/schematics/angular/library/schema.json
+++ b/packages/schematics/angular/library/schema.json
@@ -19,7 +19,7 @@
       "type": "string",
       "format": "path",
       "description": "The path at which to create the library's public API file, relative to the workspace root.",
-      "default": "public_api"
+      "default": "public-api"
     },
     "prefix": {
       "type": "string",
diff --git a/tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/ng-package.json b/tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/ng-package.json
index 36fcf49d9c1b..cce46c5a8b7b 100644
--- a/tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/ng-package.json
+++ b/tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/ng-package.json
@@ -2,6 +2,6 @@
   "$schema": "../../../../../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../../dist/lib",
   "lib": {
-    "entryFile": "src/public_api.ts"
+    "entryFile": "src/public-api.ts"
   }
 }
\ No newline at end of file
diff --git a/tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/src/public_api.ts b/tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/src/public-api.ts
similarity index 100%
rename from tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/src/public_api.ts
rename to tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/src/public-api.ts

From 901042d95bd120b87f5f6db03e697bbbce9e26cd Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Mon, 11 Mar 2019 07:54:43 +0100
Subject: [PATCH 0890/1703] fix(@angular-devkit/build-angular): fix check for
 absolute paths in windows in server config

This changes fixes `Error: You must pass in a NgModule or NgModuleFactory to be bootstrapped`.

At the moment the check for absolute path is not correct for windows.

Fixes #13865 and fixes https://github.com/angular/universal/issues/1139
---
 .../src/angular-cli-files/models/webpack-configs/server.ts     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts
index eb592750d2fe..370eed31757e 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/server.ts
@@ -5,6 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import { isAbsolute } from 'path';
 import { Configuration } from 'webpack';
 import { WebpackConfigOptions } from '../build-options';
 import { getSourceMapDevTool } from './utils';
@@ -38,7 +39,7 @@ export function getServerConfig(wco: WebpackConfigOptions) {
       /^@angular/,
       (context: string, request: string, callback: (error?: null, result?: string) => void) => {
         // Absolute & Relative paths are not externals
-        if (request.match(/^\.{0,2}\//)) {
+        if (/^\.{0,2}\//.test(request) || isAbsolute(request)) {
           return callback();
         }
 

From 1e3c6e3ca5ffe481ac3e2400893a4fed80e6af98 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Mon, 11 Mar 2019 10:38:54 +0100
Subject: [PATCH 0891/1703] fix(@angular-devkit/build-angular): fix base href
 insertion when HTML is in a single line

When HTML is in a single line using offset + 1 will cause the insertion of the base href tag in the wrong possition.

Fixes #13851
---
 .../plugins/index-html-webpack-plugin.ts      |  2 +-
 .../test/browser/base-href2_spec_large.ts     | 20 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
index e8575642123b..f6e3915f845b 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
@@ -199,7 +199,7 @@ export class IndexHtmlWebpackPlugin {
 
           treeAdapter.appendChild(baseFragment, baseElement);
           indexSource.insert(
-            headElement.__location.startTag.endOffset + 1,
+            headElement.__location.startTag.endOffset,
             parse5.serialize(baseFragment, { treeAdapter }),
           );
         } else {
diff --git a/packages/angular_devkit/build_angular/test/browser/base-href2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/base-href2_spec_large.ts
index f5a525b5dcca..59a57a6ae326 100644
--- a/packages/angular_devkit/build_angular/test/browser/base-href2_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/base-href2_spec_large.ts
@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect/src/index2';
 import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { join, normalize, virtualFs } from '@angular-devkit/core';
+import { join, normalize, tags, virtualFs } from '@angular-devkit/core';
 import { tap } from 'rxjs/operators';
 import { BrowserBuilderOutput } from '../../src/browser/index2';
 import { browserTargetSpec, createArchitect, host } from '../utils';
@@ -41,4 +41,22 @@ describe('Browser Builder base href', () => {
 
     await run.stop();
   });
+
+  it('should insert base href in the the correct position', async () => {
+    host.writeMultipleFiles({
+      'src/index.html': tags.oneLine`
+        <html><head><meta charset="UTF-8"></head>
+        <body><app-root></app-root></body></html>
+      `,
+    });
+
+    const overrides = { baseHref: '/myUrl' };
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+    const fileName = join(normalize(output.outputPath), 'index.html');
+    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content).toContain('<head><base href="/myUrl"><meta charset="UTF-8"></head>');
+    await run.stop();
+  });
 });

From b32ad328cfa0510367115ba27529ea68ddf599ec Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Mon, 11 Mar 2019 14:54:11 +0100
Subject: [PATCH 0892/1703] fix(@angular-devkit/build-optimizer): don't add
 pure comments inside arrow functions

Fixes #13768
---
 .../src/transforms/prefix-functions.ts        |  8 ++++++
 .../src/transforms/prefix-functions_spec.ts   | 26 +++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions.ts b/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions.ts
index 05ac4f0bac23..d2414bb98970 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions.ts
@@ -64,6 +64,14 @@ export function findTopLevelFunctions(parentNode: ts.Node): Set<ts.Node> {
       return;
     }
 
+    if ((ts.isFunctionExpression(innerNode) || ts.isArrowFunction(innerNode))
+      && ts.isParenthesizedExpression(node)) {
+        // pure functions can be wrapped in parentizes
+        // we should not add pure comments to this sort of syntax.
+        // example var foo = (() => x)
+      return;
+    }
+
     if (noPureComment) {
       if (ts.isNewExpression(innerNode)) {
         topLevelFunctions.add(node);
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions_spec.ts
index 459eb69fda8c..d8b55c65a5d4 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions_spec.ts
@@ -141,4 +141,30 @@ describe('prefix-functions', () => {
       expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
     });
   });
+
+  it('doesn\'t add comment to downlevel arrow function', () => {
+    const input = tags.stripIndent`
+      var populate = (function (props, rawData, entity) {
+          props.forEach(function (prop) { });
+      });
+    `;
+    const output = tags.stripIndent`
+      ${input}
+    `;
+
+    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+  });
+
+  it('doesn\'t add comment inside arrow function', () => {
+    const input = tags.stripIndent`
+      const populate = ((props, rawData, entity) => {
+          props.forEach(x => x);
+      });
+    `;
+    const output = tags.stripIndent`
+      ${input}
+    `;
+
+    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+  });
 });

From efac7b61ba48e52cc7e4ed24abf15ae33b4838b7 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 11 Mar 2019 15:32:19 +0000
Subject: [PATCH 0893/1703] ci: rebase PRs on target branch

---
 .appveyor.yml        |  7 ++++
 .circleci/config.yml | 25 +++++-------
 tools/rebase-pr.js   | 92 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 108 insertions(+), 16 deletions(-)
 create mode 100644 tools/rebase-pr.js

diff --git a/.appveyor.yml b/.appveyor.yml
index 19fa94a43d83..39413e3df3a2 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -9,6 +9,13 @@ skip_branch_with_pr: true
 
 install:
   - ps: Install-Product node $env:nodejs_version
+  - ps: |
+      if (Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER) {
+        # user is required for rebase.	
+        git config user.name "angular-ci"	
+        git config user.email "angular-ci"
+        # Rebase on target branch.
+        node tools\rebase-pr.js angular/angular-cli $env:APPVEYOR_PULL_REQUEST_NUMBER }
   # --network-timeout is a workaround for https://github.com/yarnpkg/yarn/issues/6221
   - yarn --frozen-lockfile --network-timeout=500000
   - yarn webdriver-update
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6add7f5afc37..b4cc7281dbba 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -25,26 +25,19 @@ anchor_1: &defaults
   docker:
     - image: *docker_image
 
-# After checkout, rebase on top of master.
-# Similar to travis behavior, but not quite the same.
-# See https://discuss.circleci.com/t/1662
+# After checkout, rebase on top of target branch.
 anchor_2: &post_checkout
   run:
-    name: Post checkout step
+    name: Rebase PR on target branch
     command: >
       if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then
-        # Fetch the head and merge commits for this PR.
-        git fetch origin +refs/pull/$CIRCLE_PR_NUMBER/head:pr/$CIRCLE_PR_NUMBER/head
-        git fetch origin +refs/pull/$CIRCLE_PR_NUMBER/merge:pr/$CIRCLE_PR_NUMBER/merge
-        # Checkout the merged PR for testing as CircleCI will just use the PR head otherwise.
-        git checkout -qf pr/$CIRCLE_PR_NUMBER/merge
-        # Reset the merge commit into its PR head.
-        git reset pr/$CIRCLE_PR_NUMBER/head
-        # Commit the merge changes into the head of the PR.
-        # This way we keep the last commit message.
-        git config user.name "angular-ci"
-        git config user.email "angular-ci"
-        git commit . --amend --no-edit
+        # User is required for rebase.
+        git config user.name "angular-ci"	
+        git config user.email "angular-ci"      
+        # Rebase PR on top of target branch.
+        node tools/rebase-pr.js angular/angular-cli ${CIRCLE_PR_NUMBER}
+      else
+        echo "This build is not over a PR, nothing to do."
       fi
 anchor_3: &restore_cache
   restore_cache:
diff --git a/tools/rebase-pr.js b/tools/rebase-pr.js
new file mode 100644
index 000000000000..e74b6156d9c0
--- /dev/null
+++ b/tools/rebase-pr.js
@@ -0,0 +1,92 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+ // tslint:disable:no-console
+// ** IMPORTANT **
+// This script cannot use external dependencies because it needs to run before they are installed.
+
+const util = require('util');
+const https = require('https');
+const child_process = require('child_process');
+const exec = util.promisify(child_process.exec);
+
+function determineTargetBranch(repository, prNumber) {
+  const pullsUrl = `https://api.github.com/repos/${repository}/pulls/${prNumber}`;
+  // GitHub requires a user agent: https://developer.github.com/v3/#user-agent-required
+  const options = { headers: { 'User-Agent': repository } };
+
+  return new Promise((resolve, reject) => {
+    https.get(pullsUrl, options, (res) => {
+      const { statusCode } = res;
+      const contentType = res.headers['content-type'];
+
+      let error;
+      if (statusCode !== 200) {
+        error = new Error(`Request Failed.\nStatus Code: ${statusCode}.\nResponse: ${res}.\n' +`);
+      } else if (!/^application\/json/.test(contentType)) {
+        error = new Error('Invalid content-type.\n' +
+          `Expected application/json but received ${contentType}`);
+      }
+      if (error) {
+        reject(error);
+        res.resume();
+        return;
+      }
+
+      res.setEncoding('utf8');
+      let rawData = '';
+      res.on('data', (chunk) => { rawData += chunk; });
+      res.on('end', () => {
+        try {
+          const parsedData = JSON.parse(rawData);
+          resolve(parsedData['base']['ref']);
+        } catch (e) {
+          reject(e);
+        }
+      });
+    }).on('error', (e) => {
+      reject(e);
+    });
+  });
+}
+
+if (process.argv.length != 4) {
+  console.error(`This script requires the GitHub repository and PR number as arguments.`);
+  console.error(`Example: node scripts/rebase-pr.js angular/angular 123`);
+  process.exitCode = 1;
+  return;
+}
+
+const repository = process.argv[2];
+const prNumber = process.argv[3];
+let targetBranch;
+
+
+return Promise.resolve()
+  .then(() => {
+    console.log(`Determining target branch for PR ${prNumber} on ${repository}.`);
+    return determineTargetBranch(repository, prNumber);
+  })
+  .then(target => {
+    targetBranch = target;
+    console.log(`Target branch is ${targetBranch}.`);
+  })
+  .then(() => {
+    console.log(`Fetching ${targetBranch} from origin.`);
+    return exec(`git fetch origin ${targetBranch}`);
+  })
+  .then(target => {
+    console.log(`Rebasing current branch on ${targetBranch}.`);
+    return exec(`git rebase origin/${targetBranch}`);
+  })
+  .then(() => console.log('Rebase successfull.'))
+  .catch(err => {
+    console.log('Failed to rebase on top or target branch.\n');
+    console.error(err);
+    process.exitCode = 1;
+  });
\ No newline at end of file

From b4965c09e20a6243348f2f04b1df71304d3f1aef Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 8 Mar 2019 10:46:57 -0500
Subject: [PATCH 0894/1703] feat(@angular/cli): update minimum required Node.js
 version to 10.9

Node.js 8 is now in maintenance LTS status and will be EOL in December 2019. Node.js 10 is now the active LTS version with Node.js 12 due for arrival in April 2019. Node.js 10+ provides an improved performance baseline as well as access to newer Node.js APIs and Javascript language features which the Angular CLI will now be able to leverage.
---
 packages/angular/cli/bin/ng               | 6 +++---
 packages/angular/cli/tasks/npm-install.ts | 6 +-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/packages/angular/cli/bin/ng b/packages/angular/cli/bin/ng
index 7fb032affdcb..b0be0f9d40d5 100755
--- a/packages/angular/cli/bin/ng
+++ b/packages/angular/cli/bin/ng
@@ -12,10 +12,10 @@ try {
 
 // Some older versions of Node do not support let or const.
 var version = process.version.substr(1).split('.');
-if (Number(version[0]) < 8 || (Number(version[0]) === 8 && Number(version[1]) < 9)) {
+if (Number(version[0]) < 10 || (Number(version[0]) === 10 && Number(version[1]) < 9)) {
   process.stderr.write(
-    'You are running version ' + process.version + ' of Node.js, which is not supported by Angular CLI v6.\n' +
-    'The official Node.js version that is supported is 8.9 and greater.\n\n' +
+    'You are running version ' + process.version + ' of Node.js, which is not supported by Angular CLI 8.0+.\n' +
+    'The official Node.js version that is supported is 10.9 or greater.\n\n' +
     'Please visit https://nodejs.org/en/ to find instructions on how to update Node.js.\n'
   );
 
diff --git a/packages/angular/cli/tasks/npm-install.ts b/packages/angular/cli/tasks/npm-install.ts
index 8f3c2500b020..99a470b8d902 100644
--- a/packages/angular/cli/tasks/npm-install.ts
+++ b/packages/angular/cli/tasks/npm-install.ts
@@ -48,13 +48,9 @@ export default async function (packageName: string,
   if (!save) {
     installArgs.push('--no-save');
   }
-  const installOptions = {
-    stdio: 'inherit',
-    shell: true,
-  };
 
   await new Promise((resolve, reject) => {
-    spawn(packageManager, installArgs, installOptions)
+    spawn(packageManager, installArgs, { stdio: 'inherit', shell: true })
       .on('close', (code: number) => {
         if (code === 0) {
           logger.info(terminal.green(`Installed packages for tooling via ${packageManager}.`));

From 1357ea2183f1760073d94912d53008dfa93c8f0c Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 8 Mar 2019 10:47:47 -0500
Subject: [PATCH 0895/1703] build: update minimum required Node.js version to
 10.9

---
 lib/packages.ts                                | 4 ++--
 package.json                                   | 2 +-
 packages/angular_devkit/benchmark/package.json | 4 ++--
 yarn.lock                                      | 7 +------
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/lib/packages.ts b/lib/packages.ts
index ef9b82589ca7..811cec14de07 100644
--- a/lib/packages.ts
+++ b/lib/packages.ts
@@ -117,8 +117,8 @@ function loadPackageJson(p: string) {
       // Overwrite engines to a common default.
       case 'engines':
         pkg['engines'] = {
-          'node': '>= 8.9.0',
-          'npm': '>= 5.5.1',
+          'node': '>= 10.9.0',
+          'npm': '>= 6.2.0',
         };
         break;
 
diff --git a/package.json b/package.json
index 8cd51d0a50ec..aec76b2e2cdc 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@types/jasmine": "^3.3.8",
     "@types/loader-utils": "^1.1.3",
     "@types/minimist": "^1.2.0",
-    "@types/node": "8.10.10",
+    "@types/node": "10.9.4",
     "@types/request": "^2.47.1",
     "@types/semver": "^5.5.0",
     "@types/source-map": "0.5.2",
diff --git a/packages/angular_devkit/benchmark/package.json b/packages/angular_devkit/benchmark/package.json
index acb7c7b87453..9d9b0bb12a0e 100644
--- a/packages/angular_devkit/benchmark/package.json
+++ b/packages/angular_devkit/benchmark/package.json
@@ -10,8 +10,8 @@
     "benchmark"
   ],
   "engines": {
-    "node": ">= 8.9.0",
-    "npm": ">= 5.5.1"
+    "node": ">= 10.9.0",
+    "npm": ">= 6.2.0"
   },
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
diff --git a/yarn.lock b/yarn.lock
index 5c320209caf6..b748eeb8bd56 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -407,16 +407,11 @@
   dependencies:
     "@types/node" "*"
 
-"@types/node@*":
+"@types/node@*", "@types/node@10.9.4":
   version "10.9.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897"
   integrity sha512-fCHV45gS+m3hH17zgkgADUSi2RR1Vht6wOZ0jyHP8rjiQra9f+mIcgwPQHllmDocYOstIEbKlxbFDYlgrTPYqw==
 
-"@types/node@8.10.10":
-  version "8.10.10"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.10.tgz#fec07bc2ad549d9e6d2f7aa0fb0be3491b83163a"
-  integrity sha512-p3W/hFzQs76RlYRIZsZc5a9bht6m0TspmWYYbKhRswmLnwj9fsE40EbuGifeu/XWR/c0UJQ1DDbvTxIsm/OOAA==
-
 "@types/node@^6.0.46":
   version "6.14.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.0.tgz#85c6998293fc6f2945915419296c7fbb63384f66"

From 54ad08649337a1faa1df978e8082c5d19953362e Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 8 Mar 2019 11:11:57 -0500
Subject: [PATCH 0896/1703] fix(@angular-devkit/build-webpack): check server
 address type before use

---
 .../build_webpack/src/webpack-dev-server/index2.ts         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2.ts b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2.ts
index 541520d7ab40..e09d9acbd849 100644
--- a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2.ts
@@ -73,11 +73,12 @@ export function runWebpackDevServer(
           if (err) {
             obs.error(err);
           } else {
+            const address = this.address();
             result = {
               success: true,
-              port: this.address().port,
-              family: this.address().family,
-              address: this.address().address,
+              port: typeof address === 'string' ? 0 : address.port,
+              family: typeof address === 'string' ? '' : address.family,
+              address: typeof address === 'string' ? address : address.address,
             };
           }
         },

From 9bd93579c7cb72221f918a5c2d147672ad5b75bf Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 8 Mar 2019 11:17:15 -0500
Subject: [PATCH 0897/1703] test(@angular-devkit/build-angular): ensure server
 address type before use

---
 .../build_angular/test/dev-server/proxy_spec_large.ts     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/dev-server/proxy_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/proxy_spec_large.ts
index e10488be41a0..e73f93df4dd0 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/proxy_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/proxy_spec_large.ts
@@ -9,12 +9,12 @@
 import { request, runTargetSpec } from '@angular-devkit/architect/testing';
 import * as express from 'express'; // tslint:disable-line:no-implicit-dependencies
 import * as http from 'http';
+import { AddressInfo } from 'net';
 import { from } from 'rxjs';
 import { concatMap, take, tap } from 'rxjs/operators';
 import { Schema as DevServerBuilderOptions } from '../../src/dev-server/schema';
 import { devServerTargetSpec, host } from '../utils';
 
-
 describe('Dev Server Builder proxy', () => {
   beforeEach(done => host.initialize().toPromise().then(done, done.fail));
   afterEach(done => host.restore().toPromise().then(done, done.fail));
@@ -25,13 +25,15 @@ describe('Dev Server Builder proxy', () => {
     const server = http.createServer(app);
     server.listen(0);
 
-    app.set('port', server.address().port);
+    // cast is safe, the HTTP server is not using a pipe or UNIX domain socket
+    app.set('port', (server.address() as AddressInfo).port);
     app.get('/api/test', function (_req, res) {
       res.send('TEST_API_RETURN');
     });
 
     const backendHost = 'localhost';
-    const backendPort = server.address().port;
+    // cast is safe, the HTTP server is not using a pipe or UNIX domain socket
+    const backendPort = (server.address() as AddressInfo).port;
     const proxyServerUrl = `http://${backendHost}:${backendPort}`;
 
     host.writeMultipleFiles({

From 9ef4a0593e381190f3dffe45e6688b47f79420f7 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 8 Mar 2019 11:32:54 -0500
Subject: [PATCH 0898/1703] ci: remove Node.js 8 E2E tests

---
 .circleci/config.yml | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b4cc7281dbba..97ca2ca9dece 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,7 +17,6 @@
 # See https://circleci.com/docs/2.0/caching/#restoring-cache for how prefixes work in CircleCI.
 var_1: &docker_image angular/ngcontainer:0.10.0
 var_2: &cache_key angular_devkit-0.10.0-{{ checksum "yarn.lock" }}
-var_3: &node_8_docker_image angular/ngcontainer:0.3.3
 
 # Settings common to each job
 anchor_1: &defaults
@@ -107,20 +106,6 @@ jobs:
           path: /tmp/dist
           destination: cli/new-production
 
-  e2e-node-8:
-    <<: *defaults
-    # Overwrite docker image to node 8.
-    docker:
-      - image: *node_8_docker_image
-    environment:
-      BASH_ENV: ~/.profile
-    resource_class: xlarge
-    parallelism: 2
-    steps:
-      - attach_workspace: *attach_options
-      - run: npm install --global npm@6
-      - run: xvfb-run -a node ./tests/legacy-cli/run_e2e --glob=tests/basic/* --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
-
   e2e-cli-ng-snapshots:
     <<: *defaults
     environment:
@@ -211,9 +196,6 @@ workflows:
       - e2e-cli:
           requires:
             - build
-      - e2e-node-8:
-          requires:
-            - build
       - snapshot_publish_docs:
           requires:
           - install

From 15312e8ef0c0de81613d5d0c03e3cef3dc128c59 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 7 Mar 2019 16:39:54 -0800
Subject: [PATCH 0899/1703] feat(@angular-devkit/architect): add
 targetFromTargetString() function

Useful for reading options. This uses the reverse logic from
targetStringFromTarget().

Also add tests for both functions.
---
 packages/angular_devkit/architect/src/api.ts  | 16 ++++++
 .../angular_devkit/architect/src/api_spec.ts  | 49 +++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 packages/angular_devkit/architect/src/api_spec.ts

diff --git a/packages/angular_devkit/architect/src/api.ts b/packages/angular_devkit/architect/src/api.ts
index fb600e07e5bc..b8b198ac3b1f 100644
--- a/packages/angular_devkit/architect/src/api.ts
+++ b/packages/angular_devkit/architect/src/api.ts
@@ -252,3 +252,19 @@ export type BuilderInfo = json.JsonObject & {
 export function targetStringFromTarget({project, target, configuration}: Target) {
   return `${project}:${target}${configuration !== undefined ? ':' + configuration : ''}`;
 }
+
+/**
+ * Return a Target tuple from a string.
+ */
+export function targetFromTargetString(str: string): Target {
+  const tuple = str.split(/:/, 3);
+  if (tuple.length < 2) {
+    throw new Error('Invalid target string: ' + JSON.stringify(str));
+  }
+
+  return {
+    project: tuple[0],
+    target: tuple[1],
+    ...(tuple[2] !== undefined) && { configuration: tuple[2] },
+  };
+}
diff --git a/packages/angular_devkit/architect/src/api_spec.ts b/packages/angular_devkit/architect/src/api_spec.ts
new file mode 100644
index 000000000000..73bc6288a274
--- /dev/null
+++ b/packages/angular_devkit/architect/src/api_spec.ts
@@ -0,0 +1,49 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Target, targetFromTargetString, targetStringFromTarget } from './api';
+
+describe('Architect API', () => {
+  const goldens: { [t: string]: Target } = {
+    'a:b:c': { project: 'a', target: 'b', configuration: 'c' },
+    'a:b': { project: 'a', target: 'b' },
+    ':b': { project: '', target: 'b' },
+    ':b:c': { project: '', target: 'b', configuration: 'c' },
+    ':': { project: '', target: '' },
+    '::': { project: '', target: '', configuration: '' },
+    'a:b:': { project: 'a', target: 'b', configuration: '' },
+    'a::c': { project: 'a', target: '', configuration: 'c' },
+    'a:b:c:': { project: 'a', target: 'b', configuration: 'c' },
+    'a:b:c:d': { project: 'a', target: 'b', configuration: 'c' },
+    'a:b:c:d:': { project: 'a', target: 'b', configuration: 'c' },
+  };
+
+  describe('targetFromTargetString', () => {
+    for (const ts of Object.getOwnPropertyNames(goldens)) {
+      const t: Target = goldens[ts];
+      it(`works for ${JSON.stringify(ts)}`, () => {
+        expect(targetFromTargetString(ts)).toEqual(t);
+      });
+    }
+    it('errors out for invalid strings', () => {
+      expect(() => targetFromTargetString('')).toThrow();
+      expect(() => targetFromTargetString('a')).toThrow();
+    });
+  });
+
+  describe('targetStringFromTarget', () => {
+    for (const ts of Object.getOwnPropertyNames(goldens)) {
+      const t: Target = goldens[ts];
+
+      it(`works for ${JSON.stringify(t)}`, () => {
+        // We have some invalid goldens. Remove everything after the second :.
+        const goldenTs = ts.replace(/(\w+:\w+(:\w*)?).*/, '$1');
+        expect(targetStringFromTarget(t)).toEqual(goldenTs);
+      });
+    }
+  });
+});

From 890cfbe7c76990ef84d01d9c40cba435212c071d Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 7 Mar 2019 16:57:23 -0800
Subject: [PATCH 0900/1703] fix(@angular-devkit/build-angular): fail the build
 if service worker fails

Its the sensible thing to do.
---
 packages/angular_devkit/build_angular/src/browser/index2.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/browser/index2.ts b/packages/angular_devkit/build_angular/src/browser/index2.ts
index 0523b6cc83d8..d0b764ec834a 100644
--- a/packages/angular_devkit/build_angular/src/browser/index2.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index2.ts
@@ -279,7 +279,7 @@ export function buildWebpackBrowser(
               resolve(root, normalize(options.outputPath)),
               options.baseHref || '/',
               options.ngswConfigPath,
-            ).then(() => ({ success: true })));
+            ).then(() => ({ success: true }), () => ({ success: false })));
           } else {
             return of(buildEvent);
           }

From 78a4149384e6d7550393e8032b365ff1840c15b4 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 7 Mar 2019 16:57:50 -0800
Subject: [PATCH 0901/1703] feat(@angular-devkit/build-angular): browserTarget
 should match target pattern

---
 .../angular_devkit/build_angular/src/dev-server/schema.json    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/dev-server/schema.json b/packages/angular_devkit/build_angular/src/dev-server/schema.json
index 47710322d1e5..dab2c658acd4 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/schema.json
+++ b/packages/angular_devkit/build_angular/src/dev-server/schema.json
@@ -6,7 +6,8 @@
   "properties": {
     "browserTarget": {
       "type": "string",
-      "description": "Target to serve."
+      "description": "Target to serve.",
+      "pattern": ".+:.+(:.+)?"
     },
     "port": {
       "type": "number",

From 6a0b3fe6b23711e9bc16fb596a688585b7ea2494 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 7 Mar 2019 16:59:30 -0800
Subject: [PATCH 0902/1703] feat(@angular-devkit/build-angular): re-export
 schemas

When we moved to using QuickType to generate those we removed those
exports. That was an unfortunate breaking change.
---
 .../angular_devkit/build_angular/src/index.ts   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/angular_devkit/build_angular/src/index.ts b/packages/angular_devkit/build_angular/src/index.ts
index 909fbed598aa..b292b7b3d5c7 100644
--- a/packages/angular_devkit/build_angular/src/index.ts
+++ b/packages/angular_devkit/build_angular/src/index.ts
@@ -15,9 +15,26 @@
 
 export * from './app-shell';
 export * from './browser';
+export {
+  AssetPattern,
+  AssetPatternClass as AssetPatternObject,
+  Budget,
+  ExtraEntryPoint,
+  ExtraEntryPointClass as ExtraEntryPointObject,
+  FileReplacement,
+  OptimizationClass as OptimizationObject,
+  OptimizationUnion,
+  OutputHashing,
+  Schema as BrowserBuilderSchema,
+  SourceMapClass as SourceMapObject,
+  SourceMapUnion,
+  StylePreprocessorOptions,
+  Type,
+} from './browser/schema';
 export * from './dev-server';
 export * from './extract-i18n';
 export * from './karma';
+export * from './karma/schema';
 export * from './protractor';
 export * from './server';
 export * from './tslint';

From 3ac1cc30a7937784cda54f7762c5831fef6a9a59 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 7 Mar 2019 17:18:12 -0800
Subject: [PATCH 0903/1703] feat(@angular-devkit/architect): add
 scheduleTargetAndForget function

It came up with Nrwl that this is a common pattern; someone wants to schedule a
target but does not want to manage the run himself. This function cancels the
run when the Observable is unsubscribed from (which is not the case for a
traditional run).

Because stop logic can be asynchronous, we need to add a teardown logic
handler to the context, which turns out to be useful for other cases as
well.
---
 packages/angular_devkit/architect/src/api.ts  | 46 ++++++++++++++++++-
 .../architect/src/create-builder.ts           | 14 +++++-
 2 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/architect/src/api.ts b/packages/angular_devkit/architect/src/api.ts
index b8b198ac3b1f..4c0b3197049b 100644
--- a/packages/angular_devkit/architect/src/api.ts
+++ b/packages/angular_devkit/architect/src/api.ts
@@ -6,7 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { experimental, json, logging } from '@angular-devkit/core';
-import { Observable } from 'rxjs';
+import { Observable, from } from 'rxjs';
+import { switchMap } from 'rxjs/operators';
 import { Schema as RealBuilderInput, Target as RealTarget } from './input-schema';
 import { Schema as RealBuilderOutput } from './output-schema';
 import { Schema as RealBuilderProgress, State as BuilderProgressState } from './progress-schema';
@@ -211,6 +212,11 @@ export interface BuilderContext {
    * @param status Update the status string. If omitted the status string is not modified.
    */
   reportProgress(current: number, total?: number, status?: string): void;
+
+  /**
+   * Add teardown logic to this Context, so that when it's being stopped it will execute teardown.
+   */
+  addTeardown(teardown: () => (Promise<void> | void)): void;
 }
 
 
@@ -268,3 +274,41 @@ export function targetFromTargetString(str: string): Target {
     ...(tuple[2] !== undefined) && { configuration: tuple[2] },
   };
 }
+
+/**
+ * Schedule a target, and forget about its run. This will return an observable of outputs, that
+ * as a a teardown will stop the target from running. This means that the Run object this returns
+ * should not be shared.
+ *
+ * The reason this is not part of the Context interface is to keep the Context as normal form as
+ * possible. This is really an utility that people would implement in their project.
+ *
+ * @param context The context of your current execution.
+ * @param target The target to schedule.
+ * @param overrides Overrides that are used in the target.
+ * @param scheduleOptions Additional scheduling options.
+ */
+export function scheduleTargetAndForget(
+  context: BuilderContext,
+  target: Target,
+  overrides?: json.JsonObject,
+  scheduleOptions?: ScheduleOptions,
+): Observable<BuilderOutput> {
+  let resolve: (() => void) | null = null;
+  const promise = new Promise<void>(r => resolve = r);
+  context.addTeardown(() => promise);
+
+  return from(context.scheduleTarget(target, overrides, scheduleOptions)).pipe(
+    switchMap(run => new Observable<BuilderOutput>(observer => {
+      const subscription = run.output.subscribe(observer);
+
+      return () => {
+        subscription.unsubscribe();
+        // We can properly ignore the floating promise as it's a "reverse" promise; the teardown
+        // is waiting for the resolve.
+        // tslint:disable-next-line:no-floating-promises
+        run.stop().then(resolve);
+      };
+    })),
+  );
+}
diff --git a/packages/angular_devkit/architect/src/create-builder.ts b/packages/angular_devkit/architect/src/create-builder.ts
index 9613bd5cbcc5..d25807939e03 100644
--- a/packages/angular_devkit/architect/src/create-builder.ts
+++ b/packages/angular_devkit/architect/src/create-builder.ts
@@ -37,6 +37,8 @@ export function createBuilder<
     const progressChannel = context.createChannel('progress');
     const logChannel = context.createChannel('log');
     let currentState: BuilderProgressState = BuilderProgressState.Stopped;
+    const teardownLogics: Array<() => (PromiseLike<void> | void)> = [];
+    let tearingDown = false;
     let current = 0;
     let status = '';
     let total = 1;
@@ -72,10 +74,15 @@ export function createBuilder<
         i => {
           switch (i.kind) {
             case experimental.jobs.JobInboundMessageKind.Stop:
-              observer.complete();
+              // Run teardown logic then complete.
+              tearingDown = true;
+              Promise.all(teardownLogics.map(fn => fn() || Promise.resolve()))
+                .then(() => observer.complete(), err => observer.error(err));
               break;
             case experimental.jobs.JobInboundMessageKind.Input:
-              onInput(i.value);
+              if (!tearingDown) {
+                onInput(i.value);
+              }
               break;
           }
         },
@@ -159,6 +166,9 @@ export function createBuilder<
                 progress({ state: currentState, current, total, status }, context);
             }
           },
+          addTeardown(teardown: () => (Promise<void> | void)): void {
+            teardownLogics.push(teardown);
+          },
         };
 
         context.reportRunning();

From c378ddc500c33d3afc796515a6ef95c67aafa147 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 11 Mar 2019 17:47:45 +0100
Subject: [PATCH 0904/1703] feat(@schematics/schematics): update jasmine to
 3.3.1+

---
 .../schematics/blank/project-files/package.json.template      | 4 ++--
 packages/schematics/schematics/schematic/files/package.json   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/schematics/blank/project-files/package.json.template b/packages/schematics/schematics/blank/project-files/package.json.template
index d3801bda9524..e1ebe4957f82 100644
--- a/packages/schematics/schematics/blank/project-files/package.json.template
+++ b/packages/schematics/schematics/blank/project-files/package.json.template
@@ -15,9 +15,9 @@
   "dependencies": {
     "@angular-devkit/core": "^<%= coreVersion %>",
     "@angular-devkit/schematics": "^<%= schematicsVersion %>",
-    "@types/jasmine": "^3.0.0",
+    "@types/jasmine": "^3.3.9",
     "@types/node": "^8.0.31",
-    "jasmine": "^3.0.0",
+    "jasmine": "^3.3.1",
     "typescript": "~3.2.2"
   }
 }
diff --git a/packages/schematics/schematics/schematic/files/package.json b/packages/schematics/schematics/schematic/files/package.json
index 5b9b9e4a7dc8..c33fdb65d1d1 100644
--- a/packages/schematics/schematics/schematic/files/package.json
+++ b/packages/schematics/schematics/schematic/files/package.json
@@ -15,9 +15,9 @@
   "dependencies": {
     "@angular-devkit/core": "^<%= coreVersion %>",
     "@angular-devkit/schematics": "^<%= schematicsVersion %>",
-    "@types/jasmine": "^3.0.0",
+    "@types/jasmine": "^3.3.9",
     "@types/node": "^8.0.31",
-    "jasmine": "^3.0.0",
+    "jasmine": "^3.3.1",
     "typescript": "~3.2.2"
   }
 }

From 4ff4d5335f420af5601bd323d825db8958d4b51c Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 11 Mar 2019 17:48:22 +0100
Subject: [PATCH 0905/1703] feat(@schematics/angular): update workspace jasmine
 to 3.3.1+

---
 .../schematics/angular/workspace/files/package.json.template    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/workspace/files/package.json.template b/packages/schematics/angular/workspace/files/package.json.template
index ce1278bbdbd6..9cdefb103276 100644
--- a/packages/schematics/angular/workspace/files/package.json.template
+++ b/packages/schematics/angular/workspace/files/package.json.template
@@ -32,7 +32,7 @@
     "@types/jasmine": "~3.3.8",
     "@types/jasminewd2": "~2.0.3",
     "codelyzer": "~4.5.0",
-    "jasmine-core": "~2.99.1",
+    "jasmine-core": "~3.3.0",
     "jasmine-spec-reporter": "~4.2.1",
     "karma": "~4.0.1",
     "karma-chrome-launcher": "~2.2.0",

From be95ec4636e731ae6da3763113386ec4a4f669a8 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 11 Mar 2019 17:50:29 +0100
Subject: [PATCH 0906/1703] build: update jasmine to 3.3.1+

---
 package.json |  2 +-
 yarn.lock    | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index aec76b2e2cdc..f04aaf9ba405 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "git-raw-commits": "^2.0.0",
     "husky": "^1.3.1",
     "istanbul": "^0.4.5",
-    "jasmine": "^2.6.0",
+    "jasmine": "^3.3.1",
     "jasmine-spec-reporter": "^4.2.1",
     "karma": "~4.0.1",
     "karma-jasmine": "^2.0.1",
diff --git a/yarn.lock b/yarn.lock
index b748eeb8bd56..cf42b354a142 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5122,11 +5122,6 @@ jasmine-core@^3.3, jasmine-core@~3.3.0:
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.3.0.tgz#dea1cdc634bc93c7e0d4ad27185df30fa971b10e"
   integrity sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA==
 
-jasmine-core@~2.99.0:
-  version "2.99.1"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15"
-  integrity sha1-5kAN8ea1bhMLYcS80JPap/boyhU=
-
 jasmine-spec-reporter@^4.2.1, jasmine-spec-reporter@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz#1d632aec0341670ad324f92ba84b4b32b35e9e22"
@@ -5143,14 +5138,13 @@ jasmine@2.8.0:
     glob "^7.0.6"
     jasmine-core "~2.8.0"
 
-jasmine@^2.6.0:
-  version "2.99.0"
-  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.99.0.tgz#8ca72d102e639b867c6489856e0e18a9c7aa42b7"
-  integrity sha1-jKctEC5jm4Z8ZImFbg4YqceqQrc=
+jasmine@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.3.1.tgz#d61bb1dd8888859bd11ea83074a78ee13d949905"
+  integrity sha512-/vU3/H7U56XsxIXHwgEuWpCgQ0bRi2iiZeUpx7Nqo8n1TpoDHfZhkPIc7CO8I4pnMzYsi3XaSZEiy8cnTfujng==
   dependencies:
-    exit "^0.1.2"
     glob "^7.0.6"
-    jasmine-core "~2.99.0"
+    jasmine-core "~3.3.0"
 
 jasminewd2@^2.1.0:
   version "2.2.0"

From a24c46182f2c25f4fa24390e797e9876fbc6b5a7 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 11 Mar 2019 19:54:38 +0100
Subject: [PATCH 0907/1703] test: fix chunk in entry test

---
 .../build_angular/test/browser/scripts-array2_spec_large.ts    | 3 +--
 .../build_angular/test/browser/scripts-array_spec_large.ts     | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/scripts-array2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/scripts-array2_spec_large.ts
index 9c8333518858..d142f92994a0 100644
--- a/packages/angular_devkit/build_angular/test/browser/scripts-array2_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/scripts-array2_spec_large.ts
@@ -121,7 +121,7 @@ describe('Browser Builder scripts array', () => {
   it('chunk in entry', async () => {
     host.writeMultipleFiles(scripts);
 
-    const logger = new TestLogger('build-script-entry');
+    const logger = new TestLogger('build-script-chunk-entry');
     await browserBuild(
       architect,
       host,
@@ -136,6 +136,5 @@ describe('Browser Builder scripts array', () => {
     expect(logger.includes(`(lazy-script) 69 bytes${validate}`)).toBe(true);
     expect(logger.includes(`(renamed-script) 78 bytes${validate}`)).toBe(true);
     expect(logger.includes(`(renamed-lazy-script) 88 bytes${validate}`)).toBe(true);
-    logger.clear();
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
index 3775e380de82..8f30d71a6e5d 100644
--- a/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
@@ -147,7 +147,6 @@ describe('Browser Builder scripts array', () => {
         expect(logger.includes(`(lazy-script) 69 bytes${validate}`)).toBe(true);
         expect(logger.includes(`(renamed-script) 78 bytes${validate}`)).toBe(true);
         expect(logger.includes(`(renamed-lazy-script) 88 bytes${validate}`)).toBe(true);
-        logger.clear();
       }),
     ).toPromise().then(done, done.fail);
   });

From 08e91a94ab4d35303e4e00efa888cfd788aecad7 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 6 Mar 2019 14:53:38 -0800
Subject: [PATCH 0908/1703] build: refactor QoL on monorepo.json

This should make it easier to manage and diff. This takes 2 things into account:
1. we have either stable or experimental versions and each are kept in monorepo.
2. we dont keep hash and update only changed packages.

This commit also removed the hash to make sure this does not happen.
---
 .monorepo.json                                | 44 +---------
 docs/process/release.md                       | 11 +--
 lib/packages.ts                               | 88 ++++++++-----------
 packages/angular/pwa/package.json             |  3 +-
 .../angular_devkit/architect/package.json     |  1 +
 .../angular_devkit/architect_cli/package.json |  1 +
 .../angular_devkit/build_angular/package.json |  1 +
 .../build_ng_packagr/package.json             |  1 +
 .../build_optimizer/package.json              |  1 +
 .../angular_devkit/build_webpack/package.json |  1 +
 .../schematics_cli/package.json               |  1 +
 packages/schematics/schematics/package.json   |  1 +
 packages/schematics/update/package.json       |  3 +-
 scripts/release.ts                            | 14 +--
 14 files changed, 62 insertions(+), 109 deletions(-)

diff --git a/.monorepo.json b/.monorepo.json
index 62e57b11e6a7..2cb14e819019 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -42,16 +42,10 @@
   },
   "packages": {
     "@_/benchmark": {
-      "version": "0.14.0-beta.5",
-      "hash": "5225044ecf49d630564a68b710f6b82f"
     },
     "@_/builders": {
-      "version": "0.14.0-beta.4",
-      "hash": "569aef8bc23693c344e71b9755e62c50"
     },
     "devkit": {
-      "version": "0.14.0-beta.5",
-      "hash": "ee31237492de354cdeb804a77ddb99a2"
     },
     "@angular/cli": {
       "name": "Angular CLI",
@@ -62,15 +56,11 @@
           "url": "/packages/angular/cli/README.md"
         }
       ],
-      "version": "8.0.0-beta.5",
-      "snapshotRepo": "angular/cli-builds",
-      "hash": "a7d8ce7ece9ffcd1bf4fa095d48848fc"
+      "snapshotRepo": "angular/cli-builds"
     },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",
-      "version": "0.14.0-beta.5",
-      "hash": "c384b8179204563116fd10c0b177344d",
       "snapshotRepo": "angular/angular-pwa-builds"
     },
     "@angular-devkit/architect": {
@@ -81,21 +71,15 @@
           "url": "/packages/angular_devkit/architect/README.md"
         }
       ],
-      "version": "0.14.0-beta.5",
-      "hash": "49d84280d90a0596e2f12fabed1b3bc5",
       "snapshotRepo": "angular/angular-devkit-architect-builds"
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
-      "version": "0.14.0-beta.5",
-      "hash": "f4a1216b5864f85521607ac9d0837a52",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
       "name": "Benchmark",
-      "section": "Tooling",
-      "version": "1.2.0-beta.5",
-      "hash": "a97cd421a1deac9b478d52c4e950cc1e"
+      "section": "Tooling"
     },
     "@angular-devkit/build-optimizer": {
       "name": "Build Optimizer",
@@ -105,8 +89,6 @@
           "url": "/packages/angular_devkit/build_optimizer/README.md"
         }
       ],
-      "version": "0.14.0-beta.5",
-      "hash": "5250a56331833383ca39c17f9be70fe8",
       "snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
     },
     "@angular-devkit/build-ng-packagr": {
@@ -117,8 +99,6 @@
           "url": "/packages/angular_devkit/build_ng_packagr/README.md"
         }
       ],
-      "version": "0.14.0-beta.5",
-      "hash": "e87e58f07bad54fe46c169bbd4196ab7",
       "snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
     },
     "@angular-devkit/build-angular": {
@@ -129,8 +109,6 @@
           "url": "/packages/angular_devkit/build_angular/README.md"
         }
       ],
-      "version": "0.14.0-beta.5",
-      "hash": "71d3197702ff8bad96d185c91a31bd3d",
       "snapshotRepo": "angular/angular-devkit-build-angular-builds"
     },
     "@angular-devkit/build-webpack": {
@@ -141,9 +119,7 @@
           "url": "/packages/angular_devkit/build_webpack/README.md"
         }
       ],
-      "version": "0.14.0-beta.5",
-      "snapshotRepo": "angular/angular-devkit-build-webpack-builds",
-      "hash": "a7395f447b3e24d7f178ef54263c198c"
+      "snapshotRepo": "angular/angular-devkit-build-webpack-builds"
     },
     "@angular-devkit/core": {
       "name": "Core",
@@ -153,8 +129,6 @@
           "url": "/packages/angular_devkit/core/README.md"
         }
       ],
-      "version": "8.0.0-beta.5",
-      "hash": "5f82ed72531a97dc657aa79ab0207227",
       "snapshotRepo": "angular/angular-devkit-core-builds"
     },
     "@angular-devkit/schematics": {
@@ -165,43 +139,31 @@
           "url": "/packages/angular_devkit/schematics/README.md"
         }
       ],
-      "version": "8.0.0-beta.5",
-      "hash": "3f925d566c97375d6101fddbcbef33e3",
       "snapshotRepo": "angular/angular-devkit-schematics-builds"
     },
     "@angular-devkit/schematics-cli": {
       "name": "Schematics CLI",
       "section": "Tooling",
-      "version": "0.14.0-beta.5",
-      "hash": "2a856bf23cc1bf74a6eb981dc6c316a2",
       "snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
     },
     "@ngtools/webpack": {
       "name": "Webpack Angular Plugin",
-      "version": "8.0.0-beta.5",
       "section": "Misc",
-      "hash": "dde27b96d50a58c9738ad4bc27646077",
       "snapshotRepo": "angular/ngtools-webpack-builds"
     },
     "@schematics/angular": {
       "name": "Angular Schematics",
       "section": "Schematics",
-      "version": "8.0.0-beta.5",
-      "hash": "834d6c3ac93c047886db71717f43b959",
       "snapshotRepo": "angular/schematics-angular-builds"
     },
     "@schematics/schematics": {
       "name": "Schematics Schematics",
-      "version": "0.14.0-beta.5",
       "section": "Schematics",
-      "hash": "c8967c19e9137071c1e89809d0af2699",
       "snapshotRepo": "angular/schematics-schematics-builds"
     },
     "@schematics/update": {
       "name": "Package Update Schematics",
-      "version": "0.14.0-beta.5",
       "section": "Schematics",
-      "hash": "bc9b7216998a5c42f4b5ab9a993ef64b",
       "snapshotRepo": "angular/schematics-update-builds"
     }
   }
diff --git a/docs/process/release.md b/docs/process/release.md
index 1515fd7cd95a..da502f7dd095 100644
--- a/docs/process/release.md
+++ b/docs/process/release.md
@@ -49,16 +49,9 @@ Consider if you need to update `packages/schematics/angular/utility/latest-versi
 
 ## Shepparding
 
-As commits are cherry-picked when PRs are merged, creating the release should be a matter of updating the version
-numbers. This can be done with the following command.
+As commits are cherry-picked when PRs are merged, creating the release should be a matter of creating a tag.
 
-See `scripts/release.ts` for the full list of release types, e.g. patch updates the third number per semver.
-
-```bash
-devkit-admin release patch --force # replace with minor-beta etc.
-```
-
-Make sure you update the package versions in `packages/schematics/angular/utility/latest-versions.ts`. After that:
+**Make sure you update the package versions in `packages/schematics/angular/utility/latest-versions.ts`.**
 
 ```bash
 git commit -a -m 'release: vXX'
diff --git a/lib/packages.ts b/lib/packages.ts
index 811cec14de07..b3b52fa12c3d 100644
--- a/lib/packages.ts
+++ b/lib/packages.ts
@@ -8,14 +8,12 @@
 // tslint:disable-next-line:no-implicit-dependencies
 import { JsonObject } from '@angular-devkit/core';
 import { execSync } from 'child_process';
-import * as crypto from 'crypto';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as ts from 'typescript';
 
-const glob = require('glob');
 const distRoot = path.join(__dirname, '../dist');
-const { packages: monorepoPackages } = require('../.monorepo.json');
+const { versions: monorepoVersions, packages: monorepoPackages } = require('../.monorepo.json');
 
 
 export interface PackageInfo {
@@ -28,6 +26,7 @@ export interface PackageInfo {
   build: string;
   tar: string;
   private: boolean;
+  experimental: boolean;
   packageJson: JsonObject;
   dependencies: string[];
 
@@ -35,46 +34,11 @@ export interface PackageInfo {
   snapshotRepo: string;
   snapshotHash: string;
 
-  dirty: boolean;
-  hash: string;
   version: string;
 }
 export type PackageMap = { [name: string]: PackageInfo };
 
 
-const hashCache: {[name: string]: string | null} = {};
-function _getHashOf(pkg: PackageInfo): string {
-  if (!(pkg.name in hashCache)) {
-    hashCache[pkg.name] = null;
-    const md5Stream = crypto.createHash('md5');
-
-    // Update the stream with all files content.
-    const files: string[] = glob.sync(path.join(pkg.root, '**'), { nodir: true });
-    files.forEach(filePath => {
-      md5Stream.write(`\0${filePath}\0`);
-      md5Stream.write(fs.readFileSync(filePath));
-    });
-    // Update the stream with all versions of upstream dependencies.
-    pkg.dependencies.forEach(depName => {
-      md5Stream.write(`\0${depName}\0${_getHashOf(packages[depName])}\0`);
-    });
-
-    md5Stream.end();
-
-    hashCache[pkg.name] = (md5Stream.read() as Buffer).toString('hex');
-  }
-
-  const value = hashCache[pkg.name];
-  if (!value) {
-    // Protect against circular dependency.
-    throw new Error('Circular dependency detected between the following packages: '
-      + Object.keys(hashCache).filter(key => hashCache[key] == null).join(', '));
-  }
-
-  return value;
-}
-
-
 function loadPackageJson(p: string) {
   const root = require('../package.json');
   const pkg = require(p);
@@ -174,16 +138,42 @@ const packageJsonPaths = _findAllPackageJson(path.join(__dirname, '..'), exclude
   .filter(p => p != path.join(__dirname, '../package.json'));
 
 
+function _exec(cmd: string) {
+  return execSync(cmd).toString().trim();
+}
+
+
 let gitShaCache: string;
 function _getSnapshotHash(_pkg: PackageInfo): string {
   if (!gitShaCache) {
-    gitShaCache = execSync('git log --format=%h -n1').toString().trim();
+    gitShaCache = _exec('git log --format=%h -n1');
   }
 
   return gitShaCache;
 }
 
 
+let stableVersion = '';
+let experimentalVersion = '';
+function _getVersionFromGit(experimental: boolean): string {
+  if (stableVersion && experimentalVersion) {
+    return experimental ? experimentalVersion : stableVersion;
+  }
+
+  const hasLocalChanges = _exec(`git status --porcelain`) != '';
+  const scmVersionTagRaw = _exec(`git describe --match v[0-9].[0-9].[0-9]* --abbrev=7 --tags`)
+    .slice(1);
+  stableVersion = scmVersionTagRaw.replace(/-([0-9]+)-g/, '+$1.')
+    + (hasLocalChanges ? '.with-local-changes' : '');
+
+  experimentalVersion = `0.${stableVersion.replace(/^(\d+)\.(\d+)/, (_, major, minor) => {
+    return '' + (parseInt(major, 10) * 100 + parseInt(minor, 10));
+  })}`;
+
+  return experimental ? experimentalVersion : stableVersion;
+}
+
+
 // All the supported packages. Go through the packages directory and create a map of
 // name => PackageInfo. This map is partial as it lacks some information that requires the
 // map itself to finish building.
@@ -213,13 +203,16 @@ export const packages: PackageMap =
         bin[binName] = p;
       });
 
+      const experimental = !!packageJson.private || !!packageJson.experimental;
+
       packages[name] = {
         build: path.join(distRoot, pkgRoot.substr(path.dirname(__dirname).length)),
         dist: path.join(distRoot, name),
         root: pkgRoot,
         relative: path.relative(path.dirname(__dirname), pkgRoot),
         main: path.resolve(pkgRoot, 'src/index.ts'),
-        private: packageJson.private,
+        private: !!packageJson.private,
+        experimental,
         // yarn doesn't take kindly to @ in tgz filenames
         // https://github.com/yarnpkg/yarn/issues/6339
         tar: path.join(distRoot, name.replace(/\/|@/g, '_') + '.tgz'),
@@ -234,9 +227,9 @@ export const packages: PackageMap =
         },
 
         dependencies: [],
-        hash: '',
-        dirty: false,
-        version: monorepoPackages[name] && monorepoPackages[name].version || '0.0.0',
+        get version() {
+          return _getVersionFromGit(experimental);
+        },
       };
 
       return packages;
@@ -252,12 +245,3 @@ for (const pkgName of Object.keys(packages)) {
         || name in (pkgJson.devDependencies || {});
   });
 }
-
-
-// Update the hash values of each.
-for (const pkgName of Object.keys(packages)) {
-  packages[pkgName].hash = _getHashOf(packages[pkgName]);
-  if (!monorepoPackages[pkgName] || packages[pkgName].hash != monorepoPackages[pkgName].hash) {
-    packages[pkgName].dirty = true;
-  }
-}
diff --git a/packages/angular/pwa/package.json b/packages/angular/pwa/package.json
index 4b5b67606567..8e75154d06d8 100644
--- a/packages/angular/pwa/package.json
+++ b/packages/angular/pwa/package.json
@@ -2,6 +2,7 @@
   "name": "@angular/pwa",
   "version": "0.0.0",
   "description": "PWA schematics for Angular",
+  "experimental": true,
   "keywords": [
     "blueprints",
     "code generation",
@@ -15,4 +16,4 @@
     "parse5-html-rewriting-stream": "5.1.0",
     "rxjs": "6.4.0"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/angular_devkit/architect/package.json b/packages/angular_devkit/architect/package.json
index 8e97eebde7e3..12bad056e733 100644
--- a/packages/angular_devkit/architect/package.json
+++ b/packages/angular_devkit/architect/package.json
@@ -2,6 +2,7 @@
   "name": "@angular-devkit/architect",
   "version": "0.0.0",
   "description": "Angular Build Facade",
+  "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "dependencies": {
diff --git a/packages/angular_devkit/architect_cli/package.json b/packages/angular_devkit/architect_cli/package.json
index f534db04842e..a434f7adbbc8 100644
--- a/packages/angular_devkit/architect_cli/package.json
+++ b/packages/angular_devkit/architect_cli/package.json
@@ -2,6 +2,7 @@
   "name": "@angular-devkit/architect-cli",
   "version": "0.0.0",
   "description": "Angular Architect CLI",
+  "experimental": true,
   "bin": {
     "architect": "./bin/architect.js"
   },
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 0300548db72b..b71fa4613498 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -2,6 +2,7 @@
   "name": "@angular-devkit/build-angular",
   "version": "0.0.0",
   "description": "Angular Webpack Build Facade",
+  "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index c0d31f5b6b39..b0b706104597 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -2,6 +2,7 @@
   "name": "@angular-devkit/build-ng-packagr",
   "version": "0.0.0",
   "description": "Angular Build Architect for ng-packagr",
+  "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
diff --git a/packages/angular_devkit/build_optimizer/package.json b/packages/angular_devkit/build_optimizer/package.json
index f4d03306a700..7bf0622a5b44 100644
--- a/packages/angular_devkit/build_optimizer/package.json
+++ b/packages/angular_devkit/build_optimizer/package.json
@@ -2,6 +2,7 @@
   "name": "@angular-devkit/build-optimizer",
   "version": "0.0.0",
   "description": "Angular Build Optimizer",
+  "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "bin": {
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index 2af07883e775..5955a9c71bed 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -2,6 +2,7 @@
   "name": "@angular-devkit/build-webpack",
   "version": "0.0.0",
   "description": "Webpack Builder for Architect",
+  "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
diff --git a/packages/angular_devkit/schematics_cli/package.json b/packages/angular_devkit/schematics_cli/package.json
index 077fe92ec409..9facb128eea8 100644
--- a/packages/angular_devkit/schematics_cli/package.json
+++ b/packages/angular_devkit/schematics_cli/package.json
@@ -2,6 +2,7 @@
   "name": "@angular-devkit/schematics-cli",
   "version": "0.0.0",
   "description": "Angular Schematics - CLI",
+  "experimental": true,
   "bin": {
     "schematics": "./bin/schematics.js"
   },
diff --git a/packages/schematics/schematics/package.json b/packages/schematics/schematics/package.json
index 0406dcfae810..4cf1ccd23b7c 100644
--- a/packages/schematics/schematics/package.json
+++ b/packages/schematics/schematics/package.json
@@ -2,6 +2,7 @@
   "name": "@schematics/schematics",
   "version": "0.0.0",
   "description": "Schematics specific to Angular",
+  "experimental": true,
   "keywords": [
     "blueprints",
     "code generation",
diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index fe1051f0783f..6379ba350ae3 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -2,6 +2,7 @@
   "name": "@schematics/update",
   "version": "0.0.0",
   "description": "Schematics specific to updating packages",
+  "experimental": true,
   "keywords": [
     "blueprints",
     "code generation",
@@ -19,4 +20,4 @@
     "semver-intersect": "1.4.0",
     "rxjs": "6.4.0"
   }
-}
\ No newline at end of file
+}
diff --git a/scripts/release.ts b/scripts/release.ts
index b9ef93cd4aaf..f794dfde317a 100644
--- a/scripts/release.ts
+++ b/scripts/release.ts
@@ -17,16 +17,20 @@ const monorepo = require('../.monorepo.json');
 
 
 function _showVersions(logger: logging.Logger) {
+  const versions = Object.keys(packages).reduce((acc, curr) => {
+    acc[curr] = packages[curr] && packages[curr].version || '???';
+
+    return acc;
+  }, {} as { [pkg: string]: string });
+  const maxVersionLength = Math.max(...Object.keys(versions).map(x => versions[x].length));
+
   for (const pkgName of Object.keys(packages)) {
     const pkg = packages[pkgName];
 
     const version = pkg.version || '???';
-    const hash = pkg.hash;
-    const diff = pkg.dirty ? '!' : '';
 
-    const pad1 = '                                  '.slice(pkgName.length);
-    const pad2 = '                 '.slice(version.length);
-    const message = `${pkgName} ${pad1}v${version}${pad2}${hash} ${diff}`;
+    const pad1 = '                                       '.slice(pkgName.length);
+    const message = `${pkgName} ${pad1}${('      ' + version).slice(-maxVersionLength)}`;
     if (pkg.private) {
       logger.debug(message);
     } else {

From c0aa3d9a63d5d073540e2ab086907a76c3b0152e Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 6 Mar 2019 15:20:43 -0800
Subject: [PATCH 0909/1703] build: add reverse dependencies to packages map

---
 lib/packages.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/packages.ts b/lib/packages.ts
index b3b52fa12c3d..923d6a017be2 100644
--- a/lib/packages.ts
+++ b/lib/packages.ts
@@ -29,6 +29,7 @@ export interface PackageInfo {
   experimental: boolean;
   packageJson: JsonObject;
   dependencies: string[];
+  reverseDependencies: string[];
 
   snapshot: boolean;
   snapshotRepo: string;
@@ -227,6 +228,7 @@ export const packages: PackageMap =
         },
 
         dependencies: [],
+        reverseDependencies: [],
         get version() {
           return _getVersionFromGit(experimental);
         },
@@ -244,4 +246,5 @@ for (const pkgName of Object.keys(packages)) {
     return name in (pkgJson.dependencies || {})
         || name in (pkgJson.devDependencies || {});
   });
+  pkg.dependencies.forEach(depName => packages[depName].reverseDependencies.push(pkgName));
 }

From 876c82e32c428fb088c84e0684b4d13af7394a9f Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 6 Mar 2019 15:21:31 -0800
Subject: [PATCH 0910/1703] build: remove usage of hash and replace with git
 diff

Between the merge of master and the current branch. This might catch a bit
more but it will work more consistently (especially compared to using the
hash).
---
 scripts/test.ts | 54 ++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 47 insertions(+), 7 deletions(-)

diff --git a/scripts/test.ts b/scripts/test.ts
index c759788a8f31..b972dd0d38bc 100644
--- a/scripts/test.ts
+++ b/scripts/test.ts
@@ -7,6 +7,7 @@
  */
 // tslint:disable:no-implicit-dependencies
 import { logging } from '@angular-devkit/core';
+import { spawnSync } from 'child_process';
 import * as glob from 'glob';
 import * as Istanbul from 'istanbul';
 import 'jasmine';
@@ -37,6 +38,21 @@ declare const global: {
 };
 
 
+function _exec(command: string, args: string[], opts: { cwd?: string }, logger: logging.Logger) {
+  const { status, error, stdout } = spawnSync(command, args, {
+    stdio: ['ignore', 'pipe', 'inherit'],
+    ...opts,
+  });
+
+  if (status != 0) {
+    logger.error(`Command failed: ${command} ${args.map(x => JSON.stringify(x)).join(', ')}`);
+    throw error;
+  }
+
+  return stdout.toString('utf-8');
+}
+
+
 // Add the Istanbul (not Constantinople) reporter.
 const istanbulCollector = new Istanbul.Collector({});
 const istanbulReporter = new Istanbul.Reporter(undefined, 'coverage/');
@@ -202,15 +218,39 @@ export default function (args: ParsedArgs, logger: logging.Logger) {
   let tests = allTests.filter(x => !excludeRe.test(x));
 
   if (!args.full) {
-    // Remove the tests from packages that haven't changed.
-    tests = tests
-      .filter(p => Object.keys(packages).some(name => {
-        const relativeRoot = relative(projectBaseDir, packages[name].root);
+    // Find the point where this branch merged with master.
+    const branch = _exec('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {}, logger).trim();
+    const masterRevList = _exec('git', ['rev-list', 'master'], {}, logger).trim().split('\n');
+    const branchRevList = _exec('git', ['rev-list', branch], {}, logger).trim().split('\n');
+    const sha = branchRevList.find(s => masterRevList.includes(s));
+
+    if (sha) {
+      const diffFiles = _exec(
+        'git',
+        ['diff', sha, 'HEAD', '--name-only'],
+        {},
+        logger,
+      ).trim().split('\n');
+      const diffPackages = new Set();
+      for (const pkgName of Object.keys(packages)) {
+        const relativeRoot = relative(projectBaseDir, packages[pkgName].root);
+        if (diffFiles.some(x => x.startsWith(relativeRoot))) {
+          diffPackages.add(pkgName);
+          // Add all reverse dependents too.
+          packages[pkgName].reverseDependencies.forEach(d => diffPackages.add(d));
+        }
+      }
 
-        return p.startsWith(relativeRoot) && packages[name].dirty;
-      }));
+      // Remove the tests from packages that haven't changed.
+      tests = tests
+        .filter(p => Object.keys(packages).some(name => {
+          const relativeRoot = relative(projectBaseDir, packages[name].root);
 
-    logger.info(`Found ${tests.length} spec files, out of ${allTests.length}.`);
+          return p.startsWith(relativeRoot) && diffPackages.has(name);
+        }));
+
+      logger.info(`Found ${tests.length} spec files, out of ${allTests.length}.`);
+    }
   }
 
   if (args.shard !== undefined) {

From 0a4baed1e20ab8aba1a0bf3b6e05b48020b8a212 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 6 Mar 2019 15:30:00 -0800
Subject: [PATCH 0911/1703] build: move release script to use the new version

---
 scripts/release.ts | 113 ++++++++++++++++++++-------------------------
 1 file changed, 49 insertions(+), 64 deletions(-)

diff --git a/scripts/release.ts b/scripts/release.ts
index f794dfde317a..17bf5d7c2086 100644
--- a/scripts/release.ts
+++ b/scripts/release.ts
@@ -40,80 +40,65 @@ function _showVersions(logger: logging.Logger) {
 }
 
 
-function _upgrade(release: string, force: boolean, logger: logging.Logger) {
-  for (const pkg of Object.keys(packages)) {
-    const hash = packages[pkg].hash;
-    const version = packages[pkg].version;
-    const dirty = packages[pkg].dirty || force;
-    let newVersion: string | null = version;
-
-    if (release == 'minor-beta') {
-      if (dirty) {
-        if (version.match(/-beta\.\d+$/)) {
-          newVersion = semver.inc(version, 'prerelease');
-        } else {
-          newVersion = semver.inc(version, 'minor') + '-beta.0';
-        }
-      }
-    } else if (release == 'minor-rc') {
-      if (dirty) {
-        if (version.match(/-rc/)) {
-          newVersion = semver.inc(version, 'prerelease');
-        } else if (version.match(/-beta\.\d+$/)) {
-          newVersion = version.replace(/-beta\.\d+$/, '-rc.0');
-        } else {
-          newVersion = semver.inc(version, 'minor') + '-rc.0';
-        }
-      }
-    } else if (release == 'major-beta') {
-      if (dirty) {
-        if (version.match(/-beta\.\d+$/)) {
-          newVersion = semver.inc(version, 'prerelease');
-        } else {
-          newVersion = semver.inc(version, 'major') + '-beta.0';
-        }
-      }
-    } else if (release == 'major-rc') {
-      if (dirty) {
-        if (version.match(/-rc/)) {
-          newVersion = semver.inc(version, 'prerelease');
-        } else if (version.match(/-beta\.\d+$/)) {
-          newVersion = version.replace(/-beta\.\d+$/, '-rc.0');
-        } else {
-          newVersion = semver.inc(version, 'major') + '-rc.0';
-        }
-      }
-    } else if (dirty || release !== 'patch') {
-      newVersion = semver.inc(version, release as semver.ReleaseType);
+function _upgradeSingle(release: string, version: string): string {
+  if (release == 'minor-beta') {
+    if (version.match(/-beta\.\d+$/)) {
+      return semver.inc(version, 'prerelease') || version;
+    } else {
+      return semver.inc(version, 'minor') ? semver.inc(version, 'minor') + '-beta.0' : version;
     }
-
-    let message = '';
-    if (!(pkg in monorepo.packages)) {
-      message = `${pkg} is new... setting v${newVersion}`;
-      monorepo.packages[pkg] = {
-        version: newVersion,
-        hash: hash,
-      };
-    } else if (newVersion && version !== newVersion) {
-      message = `${pkg} changed... updating v${version} => v${newVersion}`;
-      monorepo.packages[pkg].version = newVersion;
-      monorepo.packages[pkg].hash = hash;
+  } else if (release == 'minor-rc') {
+    if (version.match(/-rc/)) {
+      return semver.inc(version, 'prerelease') || version;
+    } else if (version.match(/-beta\.\d+$/)) {
+      return version.replace(/-beta\.\d+$/, '-rc.0');
     } else {
-      message = `${pkg} SAME: v${version}`;
+      return semver.inc(version, 'minor') ? semver.inc(version, 'minor') + '-rc.0' : version;
     }
-
-    if (packages[pkg].private) {
-      logger.debug(message);
+  } else if (release == 'major-beta') {
+    if (version.match(/-beta\.\d+$/)) {
+      return semver.inc(version, 'prerelease') || version;
     } else {
-      logger.info(message);
+      return semver.inc(version, 'major') ? semver.inc(version, 'major') + '-beta.0' : version;
+    }
+  } else if (release == 'major-rc') {
+    if (version.match(/-rc/)) {
+      return semver.inc(version, 'prerelease') || version;
+    } else if (version.match(/-beta\.\d+$/)) {
+      return version.replace(/-beta\.\d+$/, '-rc.0');
+    } else {
+      return semver.inc(version, 'major') ? semver.inc(version, 'major') + '-rc.0' : version;
     }
+  } else {
+    return semver.inc(version, release as semver.ReleaseType) || version;
+  }
+}
+
+function _upgrade(release: string, logger: logging.Logger) {
+  // Update stable.
+  const stable = monorepo.versions.stable;
+  const experimental = monorepo.versions.experimental;
+  if (!stable) {
+    throw new Error('Should have a version.stable key.');
+  }
+  if (!experimental) {
+    throw new Error('Should have a version.experimental key.');
   }
+  const newStable = _upgradeSingle(release, stable);
+  const newExperimental = _upgradeSingle(release, experimental);
+  monorepo.versions = {
+    stable: newStable,
+    experimental: newExperimental,
+  };
+
+  logger.info(`Updated versions:`);
+  logger.info(`     stable:       ${stable} => ${newStable}`);
+  logger.info(`     experimental: ${experimental} => ${newExperimental}`);
 }
 
 
 export interface ReleaseOptions {
   _: string[];
-  'force'?: boolean;
   'dry-run'?: boolean;
 }
 
@@ -133,7 +118,7 @@ export default function(args: ReleaseOptions, logger: logging.Logger) {
     case 'major':
     case 'minor':
     case 'patch':
-      _upgrade(maybeRelease, args.force || false, logger);
+      _upgrade(maybeRelease, logger);
       if (!dryRun) {
         fs.writeFileSync(path.join(__dirname, '../.monorepo.json'),
                          JSON.stringify(monorepo, null, 2) + '\n');

From f120118f6f3a4081b7c820d9869d10a750005c6a Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 6 Mar 2019 15:37:01 -0800
Subject: [PATCH 0912/1703] build: add safeguards for experimental to release
 script

---
 scripts/release.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/release.ts b/scripts/release.ts
index 17bf5d7c2086..b643b16f5551 100644
--- a/scripts/release.ts
+++ b/scripts/release.ts
@@ -41,6 +41,9 @@ function _showVersions(logger: logging.Logger) {
 
 
 function _upgradeSingle(release: string, version: string): string {
+  const simpleVersion = version.replace(/-beta\.\d+$|-rc\.\d+$/, '');
+  const isExperimental = semver.satisfies(simpleVersion, '<1.0.0');
+
   if (release == 'minor-beta') {
     if (version.match(/-beta\.\d+$/)) {
       return semver.inc(version, 'prerelease') || version;
@@ -58,6 +61,8 @@ function _upgradeSingle(release: string, version: string): string {
   } else if (release == 'major-beta') {
     if (version.match(/-beta\.\d+$/)) {
       return semver.inc(version, 'prerelease') || version;
+    } else if (isExperimental) {
+      return semver.inc(version, 'minor') ? semver.inc(version, 'minor') + '-beta.0' : version;
     } else {
       return semver.inc(version, 'major') ? semver.inc(version, 'major') + '-beta.0' : version;
     }
@@ -66,9 +71,13 @@ function _upgradeSingle(release: string, version: string): string {
       return semver.inc(version, 'prerelease') || version;
     } else if (version.match(/-beta\.\d+$/)) {
       return version.replace(/-beta\.\d+$/, '-rc.0');
+    } else if (isExperimental) {
+      return semver.inc(version, 'minor') ? semver.inc(version, 'minor') + '-rc.0' : version;
     } else {
       return semver.inc(version, 'major') ? semver.inc(version, 'major') + '-rc.0' : version;
     }
+  } else if (release == 'major' && isExperimental) {
+    return semver.inc(version, 'minor') || version;
   } else {
     return semver.inc(version, release as semver.ReleaseType) || version;
   }

From 346040f3e698e5bc7acde659e4ee29dfb1412942 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Tue, 12 Mar 2019 16:56:29 -0700
Subject: [PATCH 0913/1703] build: prevent publishing dirty versions

---
 scripts/publish.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/publish.ts b/scripts/publish.ts
index cbdad3bf1d42..0144e1120f5e 100644
--- a/scripts/publish.ts
+++ b/scripts/publish.ts
@@ -72,6 +72,15 @@ function _versionCheck(args: PublishArgs, logger: logging.Logger) {
       Use --versionCheck=false to skip this check.
     `);
   }
+
+  Object.keys(packages).forEach((name: string) => {
+    if (packages[name].version.indexOf('+') >= 0) {
+      throw new Error(tags.oneLine`
+        Releasing a version with a + in it means that the latest commit is not tagged properly.
+        Version found: ${JSON.stringify(packages[name].version)}
+      `);
+    }
+  });
 }
 
 export default async function (args: PublishArgs, logger: logging.Logger) {

From ffee8938bb3987a1a7d3c04e0f75c82cffd0e18f Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Tue, 12 Mar 2019 14:02:23 -0700
Subject: [PATCH 0914/1703] test: add tests for error propagation in jobs

It seems some testing was missing.
---
 .../experimental/jobs/simple-scheduler_spec.ts | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler_spec.ts b/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler_spec.ts
index e5e3c9855390..48d7443dfcf6 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler_spec.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler_spec.ts
@@ -11,11 +11,7 @@ import { map, take, toArray } from 'rxjs/operators';
 import { JobHandlerContext, JobOutboundMessage, JobOutboundMessageKind, JobState } from './api';
 import { createJobHandler } from './create-job-handler';
 import { SimpleJobRegistry } from './simple-registry';
-import {
-  JobInboundMessageSchemaValidationError,
-  JobOutputSchemaValidationError,
-  SimpleScheduler,
-} from './simple-scheduler';
+import { SimpleScheduler } from './simple-scheduler';
 
 describe('SimpleScheduler', () => {
   let registry: SimpleJobRegistry;
@@ -622,4 +618,16 @@ describe('SimpleScheduler', () => {
       expect(outputs).toEqual(jasmine.arrayWithExactContents([101, 102, 103]));
     });
   });
+
+  it('propagates errors', async () => {
+    registry.register('job', createJobHandler(() => { throw 1; }));
+    const job = scheduler.schedule('job', 0);
+
+    try {
+      await job.output.toPromise();
+      expect('THE ABOVE LINE SHOULD NOT ERROR').toBe('false');
+    } catch (error) {
+      expect(error).toBe(1);
+    }
+  });
 });

From 4bfb29704f1b189d9fc598819b38d24c4c358d07 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Tue, 12 Mar 2019 13:59:46 -0700
Subject: [PATCH 0915/1703] refactor(@angular-devkit/build-webpack): rename
 BuildResult to BuildOutput

Stays consistent across builders. This is the interface of the output provided by the
webpack dev server.
---
 .../build_webpack/src/webpack-dev-server/index2.ts        | 8 ++++----
 .../src/webpack-dev-server/index2_spec_large.ts           | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2.ts b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2.ts
index e09d9acbd849..60e529a4fa7a 100644
--- a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2.ts
@@ -19,7 +19,7 @@ import { Schema as WebpackDevServerBuilderSchema } from './schema';
 const webpackMerge = require('webpack-merge');
 
 
-export type DevServerBuildResult = BuilderOutput & {
+export type DevServerBuildOutput = BuilderOutput & {
   port: number;
   family: string;
   address: string;
@@ -54,7 +54,7 @@ export function runWebpackDevServer(
   return createWebpack(config).pipe(
     switchMap(webpackCompiler => new Observable<BuilderOutput>(obs => {
       const server = new WebpackDevServer(webpackCompiler, devServerConfig);
-      let result: DevServerBuildResult;
+      let result: DevServerBuildOutput;
 
       webpackCompiler.hooks.done.tap('build-webpack', (stats) => {
         // Log stats.
@@ -63,7 +63,7 @@ export function runWebpackDevServer(
         obs.next({
           ...result,
           success: !stats.hasErrors(),
-        } as DevServerBuildResult);
+        } as DevServerBuildOutput);
       });
 
       server.listen(
@@ -92,7 +92,7 @@ export function runWebpackDevServer(
 
 
 export default createBuilder<
-  json.JsonObject & WebpackDevServerBuilderSchema, DevServerBuildResult
+  json.JsonObject & WebpackDevServerBuilderSchema, DevServerBuildOutput
 >((options, context) => {
   const configPath = resolve(normalize(context.workspaceRoot), normalize(options.webpackConfig));
 
diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2_spec_large.ts b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2_spec_large.ts
index 0f70235f06a4..f91ea4e6777f 100644
--- a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2_spec_large.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2_spec_large.ts
@@ -13,7 +13,7 @@ import * as fs from 'fs';
 import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
 import * as path from 'path';
 import { WorkspaceNodeModulesArchitectHost } from '../../../architect/node';
-import { DevServerBuildResult } from './index2';
+import { DevServerBuildOutput } from './index2';
 
 const devkitRoot = normalize((global as any)._DevKitRoot); // tslint:disable-line:no-any
 
@@ -47,7 +47,7 @@ describe('Dev Server Builder', () => {
 
   it('works', async () => {
     const run = await architect.scheduleTarget(webpackTargetSpec);
-    const output = await run.result as DevServerBuildResult;
+    const output = await run.result as DevServerBuildOutput;
     expect(output.success).toBe(true);
 
     const response = await fetch(`http://${output.address}:${output.port}/bundle.js`);

From e2163a0bdec51437b8572638ed4805ebdad87e7f Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Tue, 12 Mar 2019 10:48:29 -0700
Subject: [PATCH 0916/1703] refactor(@angular-devkit/architect): clarify some
 error messages

They will be redone in classes before RC, but for now this helps diagnose
obscure messages.
---
 .../architect/node/node-modules-architect-host.ts             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/architect/node/node-modules-architect-host.ts b/packages/angular_devkit/architect/node/node-modules-architect-host.ts
index 7574f0e78eed..b5b9da14e6a2 100644
--- a/packages/angular_devkit/architect/node/node-modules-architect-host.ts
+++ b/packages/angular_devkit/architect/node/node-modules-architect-host.ts
@@ -61,12 +61,12 @@ export class WorkspaceNodeModulesArchitectHost implements ArchitectHost<NodeModu
     const builder = builderJson.builders && builderJson.builders[builderName];
 
     if (!builder) {
-      throw new Error(`Cannot find builder ${JSON.stringify(builderName)}.`);
+      throw new Error(`Cannot find builder ${JSON.stringify(builderStr)}.`);
     }
 
     const importPath = builder.implementation;
     if (!importPath) {
-      throw new Error('Invalid builder JSON');
+      throw new Error('Could not find the implementation for builder ' + builderStr);
     }
 
     return Promise.resolve({

From 128af102a3d9c6592428905147792a222257cc7f Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Tue, 12 Mar 2019 13:31:49 -0700
Subject: [PATCH 0917/1703] feat(@angular-devkit/architect):
 getOptionsForTarget should return null

If the target does not exist in the workspace.
---
 .../architect/node/node-modules-architect-host.ts            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/architect/node/node-modules-architect-host.ts b/packages/angular_devkit/architect/node/node-modules-architect-host.ts
index b5b9da14e6a2..e66a5c86c168 100644
--- a/packages/angular_devkit/architect/node/node-modules-architect-host.ts
+++ b/packages/angular_devkit/architect/node/node-modules-architect-host.ts
@@ -86,8 +86,11 @@ export class WorkspaceNodeModulesArchitectHost implements ArchitectHost<NodeModu
     return this._root;
   }
 
-  async getOptionsForTarget(target: Target): Promise<json.JsonObject> {
+  async getOptionsForTarget(target: Target): Promise<json.JsonObject | null> {
     const targetSpec = this._workspace.getProjectTargets(target.project)[target.target];
+    if (targetSpec === undefined) {
+      return null;
+    }
     if (target.configuration && !targetSpec['configurations']) {
       throw new Error('Configuration not set in the workspace.');
     }

From 31e1ae9d17534c44d4e7840bb3c1202856f8806d Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Tue, 12 Mar 2019 13:58:30 -0700
Subject: [PATCH 0918/1703] feat(@angular-devkit/architect): add new context
 methods

getBuilderNameForTarget() allows someone to get the builder name string for a specific
target (or return a rejected promise if it fails).

validateOptions() allows a builder to validate options against the same mechanics that
are used when scheduling builders.

These two methods allow builders to get options from a workspace (or build some option
object), change it, validate it, and execute scheduleBuilder() if they want to schedule
directly (or want a parallel run).
---
 packages/angular_devkit/architect/src/api.ts  | 21 +++++
 .../angular_devkit/architect/src/architect.ts | 61 +++++++++++++-
 .../architect/src/create-builder.ts           | 15 ++++
 .../architect/src/index2_spec.ts              | 80 ++++++++++++++++++-
 4 files changed, 174 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/architect/src/api.ts b/packages/angular_devkit/architect/src/api.ts
index 4c0b3197049b..769474965cbd 100644
--- a/packages/angular_devkit/architect/src/api.ts
+++ b/packages/angular_devkit/architect/src/api.ts
@@ -192,6 +192,27 @@ export interface BuilderContext {
    */
   getTargetOptions(target: Target): Promise<json.JsonObject>;
 
+  /**
+   * Resolves and return a builder name. The exact format of the name is up to the host,
+   * so it should not be parsed to gather information (it's free form). This string can be
+   * used to validate options or schedule a builder directly.
+   * @param target The target to resolve the builder name.
+   */
+  getBuilderNameForTarget(target: Target): Promise<string>;
+
+  /**
+   * Validates the options against a builder schema. This uses the same methods as the
+   * scheduleTarget and scheduleBrowser methods to validate and apply defaults to the options.
+   * It can be generically typed, if you know which interface it is supposed to validate against.
+   * @param options A generic option object to validate.
+   * @param builderName The name of a builder to use. This can be gotten for a target by using the
+   *                    getBuilderForTarget() method on the context.
+   */
+  validateOptions<T extends json.JsonObject = json.JsonObject>(
+    options: json.JsonObject,
+    builderName: string,
+  ): Promise<T>;
+
   /**
    * Set the builder to running. This should be used if an external event triggered a re-run,
    * e.g. a file watched was changed.
diff --git a/packages/angular_devkit/architect/src/architect.ts b/packages/angular_devkit/architect/src/architect.ts
index a76dfbff9bc2..7001fcd282d5 100644
--- a/packages/angular_devkit/architect/src/architect.ts
+++ b/packages/angular_devkit/architect/src/architect.ts
@@ -7,7 +7,7 @@
  */
 import { experimental, json, logging } from '@angular-devkit/core';
 import { Observable, from, of } from 'rxjs';
-import { concatMap, first, map, shareReplay } from 'rxjs/operators';
+import { concatMap, first, map, shareReplay, switchMap } from 'rxjs/operators';
 import {
   BuilderInfo,
   BuilderInput,
@@ -236,7 +236,11 @@ function _getTargetOptionsFactory(host: ArchitectHost) {
   return experimental.jobs.createJobHandler<Target, json.JsonValue, json.JsonObject>(
     target => {
       return host.getOptionsForTarget(target).then(options => {
-        return options || {};
+        if (options === null) {
+          throw new Error(`Invalid target: ${JSON.stringify(target)}.`);
+        }
+
+        return options;
       });
     },
     {
@@ -247,6 +251,57 @@ function _getTargetOptionsFactory(host: ArchitectHost) {
   );
 }
 
+function _getBuilderNameForTargetFactory(host: ArchitectHost) {
+  return experimental.jobs.createJobHandler<Target, never, string>(async target => {
+    const builderName = await host.getBuilderNameForTarget(target);
+    if (!builderName) {
+      throw new Error(`No builder were found for target ${targetStringFromTarget(target)}.`);
+    }
+
+    return builderName;
+  }, {
+    name: '..getBuilderNameForTarget',
+    output: { type: 'string' },
+    argument: inputSchema.properties.target,
+  });
+}
+
+function _validateOptionsFactory(host: ArchitectHost, registry: json.schema.SchemaRegistry) {
+  return experimental.jobs.createJobHandler<[string, json.JsonObject], never, json.JsonObject>(
+    async ([builderName, options]) => {
+      // Get option schema from the host.
+      const builderInfo = await host.resolveBuilder(builderName);
+      if (!builderInfo) {
+        throw new Error(`No builder info were found for builder ${JSON.stringify(builderName)}.`);
+      }
+
+      return registry.compile(builderInfo.optionSchema).pipe(
+        concatMap(validation => validation(options)),
+        switchMap(({ data, success, errors }) => {
+          if (success) {
+            return of(data as json.JsonObject);
+          } else {
+            throw new Error(
+              'Data did not validate: ' + (errors ? errors.join() : 'Unknown error.'),
+            );
+          }
+        }),
+      ).toPromise();
+    },
+    {
+      name: '..validateOptions',
+      output: { type: 'object' },
+      argument: {
+        type: 'array',
+        items: [
+          { type: 'string' },
+          { type: 'object' },
+        ],
+      },
+    },
+  );
+}
+
 
 export class Architect {
   private readonly _scheduler: experimental.jobs.Scheduler;
@@ -261,6 +316,8 @@ export class Architect {
     const privateArchitectJobRegistry = new experimental.jobs.SimpleJobRegistry();
     // Create private jobs.
     privateArchitectJobRegistry.register(_getTargetOptionsFactory(_host));
+    privateArchitectJobRegistry.register(_getBuilderNameForTargetFactory(_host));
+    privateArchitectJobRegistry.register(_validateOptionsFactory(_host, _registry));
 
     const jobRegistry = new experimental.jobs.FallbackRegistry([
       new ArchitectTargetJobRegistry(_host, _registry, this._jobCache, this._infoCache),
diff --git a/packages/angular_devkit/architect/src/create-builder.ts b/packages/angular_devkit/architect/src/create-builder.ts
index d25807939e03..351741520d2b 100644
--- a/packages/angular_devkit/architect/src/create-builder.ts
+++ b/packages/angular_devkit/architect/src/create-builder.ts
@@ -142,6 +142,21 @@ export function createBuilder<
             return scheduler.schedule<Target, json.JsonValue, json.JsonObject>(
                     '..getTargetOptions', target).output.toPromise();
           },
+          async getBuilderNameForTarget(target: Target) {
+            return scheduler.schedule<Target, json.JsonValue, string>(
+              '..getBuilderNameForTarget',
+              target,
+            ).output.toPromise();
+          },
+          async validateOptions<T extends json.JsonObject = json.JsonObject>(
+            options: json.JsonObject,
+            builderName: string,
+          ) {
+            return scheduler.schedule<[string, json.JsonObject], json.JsonValue, T>(
+              '..validateOptions',
+              [builderName, options],
+            ).output.toPromise();
+          },
           reportRunning() {
             switch (currentState) {
               case BuilderProgressState.Waiting:
diff --git a/packages/angular_devkit/architect/src/index2_spec.ts b/packages/angular_devkit/architect/src/index2_spec.ts
index e339e1b6933e..2a5757c6cce8 100644
--- a/packages/angular_devkit/architect/src/index2_spec.ts
+++ b/packages/angular_devkit/architect/src/index2_spec.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { schema } from '@angular-devkit/core';
+import { json, schema } from '@angular-devkit/core';
 import { timer } from 'rxjs';
 import { map, take, tap, toArray } from 'rxjs/operators';
 import { TestingArchitectHost } from '../testing/testing-architect-host';
@@ -221,6 +221,84 @@ describe('architect', () => {
     // But this should.
     try {
       await run2.output.toPromise();
+      expect('THE ABOVE LINE SHOULD NOT ERROR').toBe('false');
+    } catch {}
+    await run2.stop();
+  });
+
+  it('exposes getBuilderNameForTarget()', async () => {
+    const builderName = 'ImBlue:DabadeeDabada';
+    testArchitectHost.addBuilder(builderName, createBuilder(() => ({ success: true })));
+
+    const target = {
+      project: 'some-project',
+      target: 'some-target',
+    };
+    testArchitectHost.addTarget(target, builderName);
+
+    let actualBuilderName = '';
+    testArchitectHost.addBuilder('package:do-it', createBuilder(async (_, context) => {
+      actualBuilderName = await context.getBuilderNameForTarget(target);
+
+      return { success: true };
+    }));
+
+    const run = await architect.scheduleBuilder('package:do-it', {});
+    const output = await run.output.toPromise();
+    expect(output.success).toBe(true);
+    expect(actualBuilderName).toEqual(builderName);
+    await run.stop();
+
+    // Use an invalid target and check for error.
+    target.target = 'invalid';
+    actualBuilderName = '';
+
+    // This should not error.
+    const run2 = await architect.scheduleBuilder('package:do-it', {});
+
+    // But this should.
+    try {
+      await run2.output.toPromise();
+      expect('THE ABOVE LINE SHOULD NOT ERROR').toBe('false');
+    } catch {}
+    await run2.stop();
+  });
+
+  it('exposes validateOptions()', async () => {
+    const builderName = 'Hello:World';
+    testArchitectHost.addBuilder(builderName, createBuilder(() => ({ success: true })), '', {
+      type: 'object',
+      properties: {
+        p0: { type: 'number', default: 123 },
+        p1: { type: 'string' },
+      },
+      required: [
+        'p1',
+      ],
+    });
+
+    let actualOptions: json.JsonObject = {};
+    testArchitectHost.addBuilder('package:do-it', createBuilder(async (options, context) => {
+      actualOptions = await context.validateOptions(options, builderName);
+
+      return { success: true };
+    }));
+
+    const run = await architect.scheduleBuilder('package:do-it', { p1: 'hello' });
+    const output = await run.output.toPromise();
+    expect(output.success).toBe(true);
+    expect(actualOptions).toEqual({
+      p0: 123,
+      p1: 'hello',
+    });
+    await run.stop();
+
+    // Should also error.
+    const run2 = await architect.scheduleBuilder('package:do-it', {});
+
+    try {
+      await run2.output.toPromise();
+      expect('THE ABOVE LINE SHOULD NOT ERROR').toBe('false');
     } catch {}
     await run2.stop();
   });

From 481a5aa14245c5494e86acc49c6ba69c9565c701 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Tue, 12 Mar 2019 14:04:31 -0700
Subject: [PATCH 0919/1703] feat(@angular-devkit/architect-cli): clear console
 and show logs

This gives better support for watching builders (such as serve). It clears the
console, and everytime an output happens from the builder it shows the logs
so far. This allows people to see the logs.

Also shows the result object (without builder info) so people can see custom
builder output.
---
 .../architect_cli/bin/architect.ts            | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/packages/angular_devkit/architect_cli/bin/architect.ts b/packages/angular_devkit/architect_cli/bin/architect.ts
index 927801ea5d56..e6546e927bc4 100644
--- a/packages/angular_devkit/architect_cli/bin/architect.ts
+++ b/packages/angular_devkit/architect_cli/bin/architect.ts
@@ -21,7 +21,7 @@ import { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node';
 import { existsSync, readFileSync } from 'fs';
 import * as minimist from 'minimist';
 import * as path from 'path';
-import { last } from 'rxjs/operators';
+import { last, tap } from 'rxjs/operators';
 import { MultiProgressBar } from '../src/progress';
 
 
@@ -148,21 +148,25 @@ async function _executeTarget(
 
   // Wait for full completion of the builder.
   try {
-    const result = await run.output.pipe(last()).toPromise();
-
-    if (result.success) {
-      parentLogger.info(terminal.green('SUCCESS'));
-    } else {
-      parentLogger.info(terminal.yellow('FAILURE'));
-    }
-
-    parentLogger.info('\nLogs:');
-    logs.forEach(l => parentLogger.next(l));
+    const { success } = await run.output.pipe(
+      tap(result => {
+        if (result.success) {
+          parentLogger.info(terminal.green('SUCCESS'));
+        } else {
+          parentLogger.info(terminal.yellow('FAILURE'));
+        }
+        parentLogger.info('Result: ' + JSON.stringify({ ...result, info: undefined }, null, 4));
+
+        parentLogger.info('\nLogs:');
+        logs.forEach(l => parentLogger.next(l));
+        logs.splice(0);
+      }),
+    ).toPromise();
 
     await run.stop();
     bars.terminate();
 
-    return result.success ? 0 : 1;
+    return success ? 0 : 1;
   } catch (err) {
     parentLogger.info(terminal.red('ERROR'));
     parentLogger.info('\nLogs:');
@@ -220,6 +224,9 @@ async function main(args: string[]): Promise<number> {
 
   await workspace.loadWorkspaceFromJson(workspaceJson).toPromise();
 
+  // Clear the console.
+  process.stdout.write('\u001Bc');
+
   return await _executeTarget(logger, workspace, root, argv, registry);
 }
 

From cf5e3b19b6b2c38ded088e1a3404713f4e5d5bfb Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Tue, 12 Mar 2019 14:09:23 -0700
Subject: [PATCH 0920/1703] feat(@angular-devkit/build-angular): move
 dev-server to new API

Includes moving all the tests.
---
 .../build_angular/builders.json               |   1 +
 .../build_angular/src/dev-server/index2.ts    | 487 ++++++++++++++++++
 .../test/dev-server/deploy-url_spec_large.ts  |  41 +-
 .../test/dev-server/proxy_spec_large.ts       |  61 ++-
 .../test/dev-server/public-host_spec_large.ts |  74 +--
 .../test/dev-server/serve-path_spec_large.ts  |  42 +-
 .../test/dev-server/ssl_spec_large.ts         |  65 ++-
 .../test/dev-server/works_spec_large.ts       |  79 +--
 8 files changed, 711 insertions(+), 139 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/src/dev-server/index2.ts

diff --git a/packages/angular_devkit/build_angular/builders.json b/packages/angular_devkit/build_angular/builders.json
index 9ad029858017..835bc088185f 100644
--- a/packages/angular_devkit/build_angular/builders.json
+++ b/packages/angular_devkit/build_angular/builders.json
@@ -14,6 +14,7 @@
     },
     "dev-server": {
       "class": "./src/dev-server",
+      "implementation": "./src/dev-server/index2",
       "schema": "./src/dev-server/schema.json",
       "description": "Serve a browser app."
     },
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index2.ts b/packages/angular_devkit/build_angular/src/dev-server/index2.ts
new file mode 100644
index 000000000000..a838882f9f8b
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/dev-server/index2.ts
@@ -0,0 +1,487 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {
+  BuilderContext,
+  createBuilder,
+  targetFromTargetString,
+} from '@angular-devkit/architect/src/index2';
+import {
+  DevServerBuildOutput,
+  runWebpackDevServer,
+} from '@angular-devkit/build-webpack/src/webpack-dev-server/index2';
+import { WebpackLoggingCallback } from '@angular-devkit/build-webpack/src/webpack/index2';
+import { experimental, json, logging, tags } from '@angular-devkit/core';
+import { NodeJsSyncHost } from '@angular-devkit/core/node';
+import { existsSync, readFileSync } from 'fs';
+import * as path from 'path';
+import { Observable, from } from 'rxjs';
+import { map, switchMap } from 'rxjs/operators';
+import * as url from 'url';
+import * as webpack from 'webpack';
+import * as WebpackDevServer from 'webpack-dev-server';
+import { checkPort } from '../angular-cli-files/utilities/check-port';
+import {
+  BrowserConfigTransformFn,
+  buildBrowserWebpackConfigFromContext,
+  createBrowserLoggingCallback,
+} from '../browser/index2';
+import { Schema as BrowserBuilderSchema } from '../browser/schema';
+import { normalizeOptimization } from '../utils';
+import { Schema } from './schema';
+const opn = require('opn');
+
+export type DevServerBuilderSchema = Schema & json.JsonObject;
+
+export const devServerBuildOverriddenKeys: (keyof DevServerBuilderSchema)[] = [
+  'watch',
+  'optimization',
+  'aot',
+  'sourceMap',
+  'vendorSourceMap',
+  'evalSourceMap',
+  'vendorChunk',
+  'commonChunk',
+  'baseHref',
+  'progress',
+  'poll',
+  'verbose',
+  'deployUrl',
+];
+
+
+export type DevServerBuilderOutput = DevServerBuildOutput & {
+  baseUrl: string;
+};
+
+export type ServerConfigTransformFn = (
+  workspace: experimental.workspace.Workspace,
+  config: WebpackDevServer.Configuration,
+) => Observable<WebpackDevServer.Configuration>;
+
+/**
+ * Reusable implementation of the build angular webpack dev server builder.
+ * @param options Dev Server options.
+ * @param context The build context.
+ * @param transforms A map of transforms that can be used to hook into some logic (such as
+ *     transforming webpack configuration before passing it to webpack).
+ */
+export function serveWebpackBrowser(
+  options: DevServerBuilderSchema,
+  context: BuilderContext,
+  transforms: {
+    browserConfig?: BrowserConfigTransformFn,
+    serverConfig?: ServerConfigTransformFn,
+    logging?: WebpackLoggingCallback,
+  } = {},
+): Observable<DevServerBuilderOutput> {
+  const browserTarget = targetFromTargetString(options.browserTarget);
+  const root = context.workspaceRoot;
+  let first = true;
+  let opnAddress: string;
+  const host = new NodeJsSyncHost();
+
+  const loggingFn = transforms.logging
+    || createBrowserLoggingCallback(!!options.verbose, context.logger);
+
+  async function setup(): Promise<{
+    browserOptions: json.JsonObject & BrowserBuilderSchema,
+    webpackConfig: webpack.Configuration,
+    webpackDevServerConfig: WebpackDevServer.Configuration,
+    port: number,
+  }> {
+    // Get the browser configuration from the target name.
+    const rawBrowserOptions = await context.getTargetOptions(browserTarget);
+
+    // Override options we need to override, if defined.
+    const overrides = (Object.keys(options) as (keyof DevServerBuilderSchema)[])
+    .filter(key => options[key] !== undefined && devServerBuildOverriddenKeys.includes(key))
+    .reduce<json.JsonObject & Partial<BrowserBuilderSchema>>((previous, key) => ({
+      ...previous,
+      [key]: options[key],
+    }), {});
+
+    const browserName = await context.getBuilderNameForTarget(browserTarget);
+    const browserOptions = await context.validateOptions<json.JsonObject & BrowserBuilderSchema>(
+      { ...rawBrowserOptions, ...overrides },
+      browserName,
+    );
+
+    const webpackConfigResult = await buildBrowserWebpackConfigFromContext(
+      browserOptions,
+      context,
+      host,
+    );
+    let webpackConfig = webpackConfigResult.config;
+    const workspace = webpackConfigResult.workspace;
+
+    if (transforms.browserConfig) {
+      webpackConfig = await transforms.browserConfig(workspace, webpackConfig).toPromise();
+    }
+
+    const port = await checkPort(options.port || 0, options.host || 'localhost', 4200);
+    let webpackDevServerConfig = buildServerConfig(
+      root,
+      options,
+      browserOptions,
+      context.logger,
+    );
+
+    if (transforms.serverConfig) {
+      webpackDevServerConfig = await transforms.serverConfig(workspace, webpackConfig).toPromise();
+    }
+
+    return { browserOptions, webpackConfig, webpackDevServerConfig, port };
+  }
+
+  return from(setup()).pipe(
+    switchMap(({ browserOptions, webpackConfig, webpackDevServerConfig, port }) => {
+      options.port = port;
+
+      // Resolve public host and client address.
+      let clientAddress = `${options.ssl ? 'https' : 'http'}://0.0.0.0:0`;
+      if (options.publicHost) {
+        let publicHost = options.publicHost;
+        if (!/^\w+:\/\//.test(publicHost)) {
+          publicHost = `${options.ssl ? 'https' : 'http'}://${publicHost}`;
+        }
+        const clientUrl = url.parse(publicHost);
+        options.publicHost = clientUrl.host;
+        clientAddress = url.format(clientUrl);
+      }
+
+      // Resolve serve address.
+      const serverAddress = url.format({
+        protocol: options.ssl ? 'https' : 'http',
+        hostname: options.host === '0.0.0.0' ? 'localhost' : options.host,
+        // Port cannot be undefined here since we have a step that sets it back in options above.
+        // tslint:disable-next-line:no-non-null-assertion
+        port: options.port !.toString(),
+      });
+
+      // Add live reload config.
+      if (options.liveReload) {
+        _addLiveReload(options, browserOptions, webpackConfig, clientAddress, context.logger);
+      } else if (options.hmr) {
+        context.logger.warn('Live reload is disabled. HMR option ignored.');
+      }
+
+      if (!options.watch) {
+        // There's no option to turn off file watching in webpack-dev-server, but
+        // we can override the file watcher instead.
+        webpackConfig.plugins = [...(webpackConfig.plugins || []),  {
+          // tslint:disable-next-line:no-any
+          apply: (compiler: any) => {
+            compiler.hooks.afterEnvironment.tap('angular-cli', () => {
+              compiler.watchFileSystem = { watch: () => { } };
+            });
+          },
+        }];
+      }
+
+      const normalizedOptimization = normalizeOptimization(browserOptions.optimization);
+      if (normalizedOptimization.scripts || normalizedOptimization.styles) {
+        context.logger.error(tags.stripIndents`
+          ****************************************************************************************
+          This is a simple server for use in testing or debugging Angular applications locally.
+          It hasn't been reviewed for security issues.
+
+          DON'T USE IT FOR PRODUCTION!
+          ****************************************************************************************
+        `);
+      }
+
+      context.logger.info(tags.oneLine`
+        **
+        Angular Live Development Server is listening on ${options.host}:${options.port},
+        open your browser on ${serverAddress}${webpackDevServerConfig.publicPath}
+        **
+      `);
+
+      opnAddress = serverAddress + webpackDevServerConfig.publicPath;
+      webpackConfig.devServer = webpackDevServerConfig;
+
+      return runWebpackDevServer(webpackConfig, context, { logging: loggingFn });
+    }),
+    map(buildEvent => {
+      if (first && options.open) {
+        first = false;
+        opn(opnAddress);
+      }
+
+      return { ...buildEvent, baseUrl: opnAddress } as DevServerBuilderOutput;
+    }),
+  );
+}
+
+
+/**
+ * Create a webpack configuration for the dev server.
+ * @param workspaceRoot The root of the workspace. This comes from the context.
+ * @param serverOptions DevServer options, based on the dev server input schema.
+ * @param browserOptions Browser builder options. See the browser builder from this package.
+ * @param logger A generic logger to use for showing warnings.
+ * @returns A webpack dev-server configuration.
+ */
+export function buildServerConfig(
+  workspaceRoot: string,
+  serverOptions: DevServerBuilderSchema,
+  browserOptions: BrowserBuilderSchema,
+  logger: logging.LoggerApi,
+): WebpackDevServer.Configuration {
+  if (serverOptions.host) {
+    // Check that the host is either localhost or prints out a message.
+    if (!/^127\.\d+\.\d+\.\d+/g.test(serverOptions.host) && serverOptions.host !== 'localhost') {
+      logger.warn(tags.stripIndent`
+          WARNING: This is a simple server for use in testing or debugging Angular applications
+          locally. It hasn't been reviewed for security issues.
+
+          Binding this server to an open connection can result in compromising your application or
+          computer. Using a different host than the one passed to the "--host" flag might result in
+          websocket connection issues. You might need to use "--disableHostCheck" if that's the
+          case.
+        `);
+    }
+  }
+  if (serverOptions.disableHostCheck) {
+    logger.warn(tags.oneLine`
+        WARNING: Running a server with --disable-host-check is a security risk.
+        See https://medium.com/webpack/webpack-dev-server-middleware-security-issues-1489d950874a
+        for more information.
+      `);
+  }
+
+  const servePath = buildServePath(serverOptions, browserOptions, logger);
+  const { styles, scripts } = normalizeOptimization(browserOptions.optimization);
+
+  const config: WebpackDevServer.Configuration = {
+    host: serverOptions.host,
+    port: serverOptions.port,
+    headers: { 'Access-Control-Allow-Origin': '*' },
+    historyApiFallback: {
+      index: `${servePath}/${path.basename(browserOptions.index)}`,
+      disableDotRule: true,
+      htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
+    } as WebpackDevServer.HistoryApiFallbackConfig,
+    stats: false,
+    compress: styles || scripts,
+    watchOptions: {
+      poll: browserOptions.poll,
+    },
+    https: serverOptions.ssl,
+    overlay: {
+      errors: !(styles || scripts),
+      warnings: false,
+    },
+    public: serverOptions.publicHost,
+    disableHostCheck: serverOptions.disableHostCheck,
+    publicPath: servePath,
+    hot: serverOptions.hmr,
+    contentBase: false,
+  };
+
+  if (serverOptions.ssl) {
+    _addSslConfig(workspaceRoot, serverOptions, config);
+  }
+
+  if (serverOptions.proxyConfig) {
+    _addProxyConfig(workspaceRoot, serverOptions, config);
+  }
+
+  return config;
+}
+
+/**
+ * Resolve and build a URL _path_ that will be the root of the server. This resolved base href and
+ * deploy URL from the browser options and returns a path from the root.
+ * @param serverOptions The server options that were passed to the server builder.
+ * @param browserOptions The browser options that were passed to the browser builder.
+ * @param logger A generic logger to use for showing warnings.
+ */
+export function buildServePath(
+  serverOptions: DevServerBuilderSchema,
+  browserOptions: BrowserBuilderSchema,
+  logger: logging.LoggerApi,
+): string {
+  let servePath = serverOptions.servePath;
+  if (!servePath && servePath !== '') {
+    const defaultPath = _findDefaultServePath(browserOptions.baseHref, browserOptions.deployUrl);
+    const showWarning = serverOptions.servePathDefaultWarning;
+    if (defaultPath == null && showWarning) {
+      logger.warn(tags.oneLine`
+        WARNING: --deploy-url and/or --base-href contain unsupported values for ng serve. Default
+        serve path of '/' used. Use --serve-path to override.
+      `);
+    }
+    servePath = defaultPath || '';
+  }
+  if (servePath.endsWith('/')) {
+    servePath = servePath.substr(0, servePath.length - 1);
+  }
+  if (!servePath.startsWith('/')) {
+    servePath = `/${servePath}`;
+  }
+
+  return servePath;
+}
+
+/**
+ * Private method to enhance a webpack config with live reload configuration.
+ * @private
+ */
+function _addLiveReload(
+  options: DevServerBuilderSchema,
+  browserOptions: BrowserBuilderSchema,
+  webpackConfig: webpack.Configuration,
+  clientAddress: string,
+  logger: logging.LoggerApi,
+) {
+  if (webpackConfig.plugins === undefined) {
+    webpackConfig.plugins = [];
+  }
+
+  // This allows for live reload of page when changes are made to repo.
+  // https://webpack.js.org/configuration/dev-server/#devserver-inline
+  let webpackDevServerPath;
+  try {
+    webpackDevServerPath = require.resolve('webpack-dev-server/client');
+  } catch {
+    throw new Error('The "webpack-dev-server" package could not be found.');
+  }
+  const entryPoints = [`${webpackDevServerPath}?${clientAddress}`];
+  if (options.hmr) {
+    const webpackHmrLink = 'https://webpack.js.org/guides/hot-module-replacement';
+
+    logger.warn(
+      tags.oneLine`NOTICE: Hot Module Replacement (HMR) is enabled for the dev server.`);
+
+    const showWarning = options.hmrWarning;
+    if (showWarning) {
+      logger.info(tags.stripIndents`
+          The project will still live reload when HMR is enabled,
+          but to take advantage of HMR additional application code is required'
+          (not included in an Angular CLI project by default).'
+          See ${webpackHmrLink}
+          for information on working with HMR for Webpack.`,
+      );
+      logger.warn(
+        tags.oneLine`To disable this warning use "hmrWarning: false" under "serve"
+           options in "angular.json".`,
+      );
+    }
+    entryPoints.push('webpack/hot/dev-server');
+    webpackConfig.plugins.push(new webpack.HotModuleReplacementPlugin());
+    if (browserOptions.extractCss) {
+      logger.warn(tags.oneLine`NOTICE: (HMR) does not allow for CSS hot reload
+                when used together with '--extract-css'.`);
+    }
+  }
+  if (typeof webpackConfig.entry !== 'object' || Array.isArray(webpackConfig.entry)) {
+    webpackConfig.entry = {} as webpack.Entry;
+  }
+  if (!Array.isArray(webpackConfig.entry.main)) {
+    webpackConfig.entry.main = [];
+  }
+  webpackConfig.entry.main.unshift(...entryPoints);
+}
+
+/**
+ * Private method to enhance a webpack config with SSL configuration.
+ * @private
+ */
+function _addSslConfig(
+  root: string,
+  options: DevServerBuilderSchema,
+  config: WebpackDevServer.Configuration,
+) {
+  let sslKey: string | undefined = undefined;
+  let sslCert: string | undefined = undefined;
+  if (options.sslKey) {
+    const keyPath = path.resolve(root, options.sslKey);
+    if (existsSync(keyPath)) {
+      sslKey = readFileSync(keyPath, 'utf-8');
+    }
+  }
+  if (options.sslCert) {
+    const certPath = path.resolve(root, options.sslCert);
+    if (existsSync(certPath)) {
+      sslCert = readFileSync(certPath, 'utf-8');
+    }
+  }
+
+  config.https = true;
+  if (sslKey != null && sslCert != null) {
+    config.https = {
+      key: sslKey,
+      cert: sslCert,
+    };
+  }
+}
+
+/**
+ * Private method to enhance a webpack config with Proxy configuration.
+ * @private
+ */
+function _addProxyConfig(
+  root: string,
+  options: DevServerBuilderSchema,
+  config: WebpackDevServer.Configuration,
+) {
+  let proxyConfig = {};
+  const proxyPath = path.resolve(root, options.proxyConfig as string);
+  if (existsSync(proxyPath)) {
+    proxyConfig = require(proxyPath);
+  } else {
+    const message = 'Proxy config file ' + proxyPath + ' does not exist.';
+    throw new Error(message);
+  }
+  config.proxy = proxyConfig;
+}
+
+/**
+ * Find the default server path. We don't want to expose baseHref and deployUrl as arguments, only
+ * the browser options where needed. This method should stay private (people who want to resolve
+ * baseHref and deployUrl should use the buildServePath exported function.
+ * @private
+ */
+function _findDefaultServePath(baseHref?: string, deployUrl?: string): string | null {
+  if (!baseHref && !deployUrl) {
+    return '';
+  }
+
+  if (/^(\w+:)?\/\//.test(baseHref || '') || /^(\w+:)?\/\//.test(deployUrl || '')) {
+    // If baseHref or deployUrl is absolute, unsupported by ng serve
+    return null;
+  }
+
+  // normalize baseHref
+  // for ng serve the starting base is always `/` so a relative
+  // and root relative value are identical
+  const baseHrefParts = (baseHref || '')
+    .split('/')
+    .filter(part => part !== '');
+  if (baseHref && !baseHref.endsWith('/')) {
+    baseHrefParts.pop();
+  }
+  const normalizedBaseHref = baseHrefParts.length === 0 ? '/' : `/${baseHrefParts.join('/')}/`;
+
+  if (deployUrl && deployUrl[0] === '/') {
+    if (baseHref && baseHref[0] === '/' && normalizedBaseHref !== deployUrl) {
+      // If baseHref and deployUrl are root relative and not equivalent, unsupported by ng serve
+      return null;
+    }
+
+    return deployUrl;
+  }
+
+  // Join together baseHref and deployUrl
+  return `${normalizedBaseHref}${deployUrl || ''}`;
+}
+
+
+export default createBuilder<DevServerBuilderSchema, DevServerBuilderOutput>(serveWebpackBrowser);
diff --git a/packages/angular_devkit/build_angular/test/dev-server/deploy-url_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/deploy-url_spec_large.ts
index e2137e8af356..05490741bf85 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/deploy-url_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/deploy-url_spec_large.ts
@@ -5,26 +5,35 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { request, runTargetSpec } from '@angular-devkit/architect/testing';
-import { from } from 'rxjs';
-import { concatMap, take, tap } from 'rxjs/operators';
-import { Schema as DevServerBuilderOptions } from '../../src/dev-server/schema';
-import { devServerTargetSpec, host } from '../utils';
+import { Architect, BuilderRun } from '@angular-devkit/architect/src/index2';
+import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
+import { DevServerBuilderOutput } from '../../src/dev-server/index2';
+import { createArchitect, host } from '../utils';
 
 
 describe('Dev Server Deploy Url', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  const target = { project: 'app', target: 'serve' };
+  let architect: Architect;
+  let runs: BuilderRun[] = [];
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+    runs = [];
+  });
+  afterEach(async () => {
+    await host.restore().toPromise();
+    await Promise.all(runs.map(r => r.stop()));
+  });
 
-  it('works', (done) => {
-    const overrides: Partial<DevServerBuilderOptions> = { deployUrl: 'test/' };
+  it('works', async () => {
+    const run = await architect.scheduleTarget(target, { deployUrl: 'test/' });
+    runs.push(run);
+    const output = await run.result as DevServerBuilderOutput;
+    expect(output.success).toBe(true);
+    expect(output.baseUrl).toBe('http://localhost:4200/test');
 
-    runTargetSpec(host, devServerTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      concatMap(() => from(request('http://localhost:4200/test/polyfills.js'))),
-      tap(response => expect(response).toContain('window["webpackJsonp"]')),
-      take(1),
-    ).toPromise().then(done, done.fail);
+    const response = await fetch(`${output.baseUrl}/polyfills.js`);
+    expect(await response.text()).toContain('window["webpackJsonp"]');
   }, 30000);
 });
diff --git a/packages/angular_devkit/build_angular/test/dev-server/proxy_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/proxy_spec_large.ts
index e73f93df4dd0..3b7b74e731f9 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/proxy_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/proxy_spec_large.ts
@@ -5,27 +5,38 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { request, runTargetSpec } from '@angular-devkit/architect/testing';
+import { Architect, BuilderRun } from '@angular-devkit/architect/src/index2';
 import * as express from 'express'; // tslint:disable-line:no-implicit-dependencies
 import * as http from 'http';
 import { AddressInfo } from 'net';
-import { from } from 'rxjs';
-import { concatMap, take, tap } from 'rxjs/operators';
+import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
+import { DevServerBuilderOutput } from '../../src/dev-server/index2';
 import { Schema as DevServerBuilderOptions } from '../../src/dev-server/schema';
-import { devServerTargetSpec, host } from '../utils';
+import { createArchitect, host } from '../utils';
+
 
 describe('Dev Server Builder proxy', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  const target = { project: 'app', target: 'serve' };
+  let architect: Architect;
+  // We use runs like this to ensure it WILL stop the servers at the end of each tests.
+  let runs: BuilderRun[];
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+    runs = [];
+  });
+  afterEach(async () => {
+    await host.restore().toPromise();
+    await Promise.all(runs.map(r => r.stop()));
+  });
 
-  it('works', (done) => {
+  it('works', async () => {
     // Create an express app that serves as a proxy.
     const app = express();
     const server = http.createServer(app);
     server.listen(0);
 
-    // cast is safe, the HTTP server is not using a pipe or UNIX domain socket
     app.set('port', (server.address() as AddressInfo).port);
     app.get('/api/test', function (_req, res) {
       res.send('TEST_API_RETURN');
@@ -40,23 +51,27 @@ describe('Dev Server Builder proxy', () => {
       'proxy.config.json': `{ "/api/*": { "target": "${proxyServerUrl}" } }`,
     });
 
-    const overrides: Partial<DevServerBuilderOptions> = { proxyConfig: 'proxy.config.json' };
-
-    runTargetSpec(host, devServerTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      concatMap(() => from(request('http://localhost:4200/api/test'))),
-      tap(response => {
-        expect(response).toContain('TEST_API_RETURN');
-        server.close();
-      }),
-      take(1),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(target, { proxyConfig: 'proxy.config.json' });
+    runs.push(run);
+    const output = await run.result as DevServerBuilderOutput;
+    expect(output.success).toBe(true);
+    expect(output.baseUrl).toBe('http://localhost:4200/');
+
+    const response = await fetch('http://localhost:4200/api/test');
+    expect(await response.text()).toContain('TEST_API_RETURN');
+    server.close();
   }, 30000);
 
-  it('errors out with a missing proxy file', (done) => {
+  it('errors out with a missing proxy file', async () => {
     const overrides: Partial<DevServerBuilderOptions> = { proxyConfig: '../proxy.config.json' };
+    const run = await architect.scheduleTarget(target, { proxyConfig: 'INVALID.json' });
+    runs.push(run);
 
-    runTargetSpec(host, devServerTargetSpec, overrides)
-      .subscribe(undefined, () => done(), done.fail);
+    try {
+      await run.result;
+      expect('THE ABOVE LINE SHOULD THROW').toBe('true');
+    } catch {
+      // Success!
+    }
   }, 30000);
 });
diff --git a/packages/angular_devkit/build_angular/test/dev-server/public-host_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/public-host_spec_large.ts
index 851258b26e53..342b488e1c55 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/public-host_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/public-host_spec_large.ts
@@ -5,12 +5,10 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { request, runTargetSpec } from '@angular-devkit/architect/testing';
-import { from } from 'rxjs';
-import { concatMap, take, tap } from 'rxjs/operators';
-import { Schema as DevServerBuilderOptions } from '../../src/dev-server/schema';
-import { devServerTargetSpec, host } from '../utils';
+import { Architect, BuilderRun } from '@angular-devkit/architect/src/index2';
+import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
+import { DevServerBuilderOutput } from '../../src/dev-server/index2';
+import { createArchitect, host } from '../utils';
 
 
 describe('Dev Server Builder public host', () => {
@@ -18,37 +16,51 @@ describe('Dev Server Builder public host', () => {
   // check the hosts anymore when requests come from numeric IP addresses.
   const headers = { host: 'http://spoofy.mcspoofface' };
 
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  const target = { project: 'app', target: 'serve' };
+  let architect: Architect;
+  // We use runs like this to ensure it WILL stop the servers at the end of each tests.
+  let runs: BuilderRun[];
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+    runs = [];
+  });
+  afterEach(async () => {
+    await host.restore().toPromise();
+    await Promise.all(runs.map(r => r.stop()));
+  });
+
+  it('works', async () => {
+    const run = await architect.scheduleTarget(target);
+    runs.push(run);
+    const output = await run.result as DevServerBuilderOutput;
+    expect(output.success).toBe(true);
+    expect(output.baseUrl).toBe('http://localhost:4200/');
 
-  it('works', (done) => {
-    runTargetSpec(host, devServerTargetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      concatMap(() => from(request('http://localhost:4200/', headers))),
-      tap(response => expect(response).toContain('Invalid Host header')),
-      take(1),
-    ).toPromise().then(done, done.fail);
+    const response = await fetch(`${output.baseUrl}`, { headers });
+    expect(await response.text()).toContain('Invalid Host header');
   }, 30000);
 
-  it('works', (done) => {
-    const overrides: Partial<DevServerBuilderOptions> = { publicHost: headers.host };
+  it('works',  async () => {
+    const run = await architect.scheduleTarget(target, { publicHost: headers.host });
+    runs.push(run);
+    const output = await run.result as DevServerBuilderOutput;
+    expect(output.success).toBe(true);
+    expect(output.baseUrl).toBe('http://localhost:4200/');
 
-    runTargetSpec(host, devServerTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      concatMap(() => from(request('http://localhost:4200/', headers))),
-      tap(response => expect(response).toContain('<title>HelloWorldApp</title>')),
-      take(1),
-    ).toPromise().then(done, done.fail);
+    const response = await fetch(`${output.baseUrl}`, { headers });
+    expect(await response.text()).toContain('<title>HelloWorldApp</title>');
   }, 30000);
 
-  it('works', (done) => {
-    const overrides: Partial<DevServerBuilderOptions> = { disableHostCheck: true };
+  it('works', async () => {
+    const run = await architect.scheduleTarget(target, { disableHostCheck: true });
+    runs.push(run);
+    const output = await run.result as DevServerBuilderOutput;
+    expect(output.success).toBe(true);
+    expect(output.baseUrl).toBe('http://localhost:4200/');
 
-    runTargetSpec(host, devServerTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      concatMap(() => from(request('http://localhost:4200/', headers))),
-      tap(response => expect(response).toContain('<title>HelloWorldApp</title>')),
-      take(1),
-    ).toPromise().then(done, done.fail);
+    const response = await fetch(`${output.baseUrl}`, { headers });
+    expect(await response.text()).toContain('<title>HelloWorldApp</title>');
   }, 30000);
 });
diff --git a/packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts
index 6bde940c3c78..0fd8c3998d24 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts
@@ -5,26 +5,36 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { request, runTargetSpec } from '@angular-devkit/architect/testing';
-import { from } from 'rxjs';
-import { concatMap, take, tap } from 'rxjs/operators';
-import { Schema as DevServerBuilderOptions } from '../../src/dev-server/schema';
-import { devServerTargetSpec, host } from '../utils';
+import { Architect, BuilderRun } from '@angular-devkit/architect/src/index2';
+import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
+import { DevServerBuilderOutput } from '../../src/dev-server/index2';
+import { createArchitect, host } from '../utils';
 
 
 describe('Dev Server Builder serve path', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  const target = { project: 'app', target: 'serve' };
+  let architect: Architect;
+  // We use runs like this to ensure it WILL stop the servers at the end of each tests.
+  let runs: BuilderRun[];
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+    runs = [];
+  });
+  afterEach(async () => {
+    await host.restore().toPromise();
+    await Promise.all(runs.map(r => r.stop()));
+  });
 
-  it('works', (done) => {
-    const overrides: Partial<DevServerBuilderOptions> = { servePath: 'test/' };
+  it('works', async () => {
+    const run = await architect.scheduleTarget(target, { servePath: 'test/' });
+    runs.push(run);
+    const output = await run.result as DevServerBuilderOutput;
+    expect(output.success).toBe(true);
+    expect(output.baseUrl).toBe('http://localhost:4200/test');
 
-    runTargetSpec(host, devServerTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      concatMap(() => from(request('http://localhost:4200/test/polyfills.js'))),
-      tap(response => expect(response).toContain('window["webpackJsonp"]')),
-      take(1),
-    ).toPromise().then(done, done.fail);
+    const response = await fetch(`${output.baseUrl}/polyfills.js`);
+    expect(await response.text()).toContain('window["webpackJsonp"]');
   }, 30000);
 });
diff --git a/packages/angular_devkit/build_angular/test/dev-server/ssl_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/ssl_spec_large.ts
index 26ca8657d1f2..317c1d5a6872 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/ssl_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/ssl_spec_large.ts
@@ -5,31 +5,44 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { request, runTargetSpec } from '@angular-devkit/architect/testing';
+import { Architect, BuilderRun } from '@angular-devkit/architect/src/index2';
 import { tags } from '@angular-devkit/core';
-import { from } from 'rxjs';
-import { concatMap, take, tap } from 'rxjs/operators';
-import { Schema as DevServerBuilderOptions } from '../../src/dev-server/schema';
-import { devServerTargetSpec, host } from '../utils';
+import * as https from 'https';
+import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
+import { DevServerBuilderOutput } from '../../src/dev-server/index2';
+import { createArchitect, host } from '../utils';
 
 
 describe('Dev Server Builder ssl', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  const target = { project: 'app', target: 'serve' };
+  let architect: Architect;
+  // We use runs like this to ensure it WILL stop the servers at the end of each tests.
+  let runs: BuilderRun[];
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+    runs = [];
+  });
+  afterEach(async () => {
+    await host.restore().toPromise();
+    await Promise.all(runs.map(r => r.stop()));
+  });
 
-  it('works', (done) => {
-    const overrides: Partial<DevServerBuilderOptions> = { ssl: true };
+  it('works', async () => {
+    const run = await architect.scheduleTarget(target, { ssl: true });
+    runs.push(run);
+    const output = await run.result as DevServerBuilderOutput;
+    expect(output.success).toBe(true);
+    expect(output.baseUrl).toBe('https://localhost:4200/');
 
-    runTargetSpec(host, devServerTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      concatMap(() => from(request('https://localhost:4200/index.html'))),
-      tap(response => expect(response).toContain('<title>HelloWorldApp</title>')),
-      take(1),
-    ).toPromise().then(done, done.fail);
+    const response = await fetch('https://localhost:4200/index.html', {
+      agent: new https.Agent({ rejectUnauthorized: false }),
+    });
+    expect(await response.text()).toContain('<title>HelloWorldApp</title>');
   }, 30000);
 
-  it('supports key and cert', (done) => {
+  it('supports key and cert', async () => {
     host.writeMultipleFiles({
       'ssl/server.key': tags.stripIndents`
         -----BEGIN RSA PRIVATE KEY-----
@@ -87,17 +100,21 @@ describe('Dev Server Builder ssl', () => {
       `,
     });
 
-    const overrides: Partial<DevServerBuilderOptions> = {
+    const overrides = {
       ssl: true,
       sslKey: '../ssl/server.key',
       sslCert: '../ssl/server.crt',
     };
 
-    runTargetSpec(host, devServerTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      concatMap(() => from(request('https://localhost:4200/index.html'))),
-      tap(response => expect(response).toContain('<title>HelloWorldApp</title>')),
-      take(1),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(target, overrides);
+    runs.push(run);
+    const output = await run.result as DevServerBuilderOutput;
+    expect(output.success).toBe(true);
+    expect(output.baseUrl).toBe('https://localhost:4200/');
+
+    const response = await fetch('https://localhost:4200/index.html', {
+      agent: new https.Agent({ rejectUnauthorized: false }),
+    });
+    expect(await response.text()).toContain('<title>HelloWorldApp</title>');
   }, 30000);
 });
diff --git a/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts
index 9907d35cbfce..bc8019d5cb03 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts
@@ -5,44 +5,65 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { TestLogger, request, runTargetSpec } from '@angular-devkit/architect/testing';
-import { from } from 'rxjs';
-import { concatMap, take, tap } from 'rxjs/operators';
-import { Schema as DevServerBuilderOptions } from '../../src/dev-server/schema';
-import { devServerTargetSpec, host } from '../utils';
+import { Architect, BuilderRun } from '@angular-devkit/architect/src/index2';
+import { logging } from '@angular-devkit/core';
+import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
+import { DevServerBuilderOutput } from '../../src/dev-server/index2';
+import { createArchitect, host } from '../utils';
 
 
 describe('Dev Server Builder', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
-
-  it('works', (done) => {
-    runTargetSpec(host, devServerTargetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      concatMap(() => from(request('http://localhost:4200/index.html'))),
-      tap(response => expect(response).toContain('<title>HelloWorldApp</title>')),
-      take(1),
-    ).toPromise().then(done, done.fail);
+  const target = { project: 'app', target: 'serve' };
+  let architect: Architect;
+  let runs: BuilderRun[] = [];
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+    runs = [];
+  });
+  afterEach(async () => {
+    await host.restore().toPromise();
+    await Promise.all(runs.map(r => r.stop()));
+  });
+
+  it('works', async () => {
+    const run = await architect.scheduleTarget(target);
+    runs.push(run);
+    const output = await run.result as DevServerBuilderOutput;
+    expect(output.success).toBe(true);
+    expect(output.baseUrl).toBe('http://localhost:4200/');
+
+    const response = await fetch('http://localhost:4200/index.html');
+    expect(await response.text()).toContain('<title>HelloWorldApp</title>');
   }, 30000);
 
-  it('works with verbose', (done) => {
-    const overrides: Partial<DevServerBuilderOptions> = { verbose: true };
-    const logger = new TestLogger('verbose-serve');
-    runTargetSpec(host, devServerTargetSpec, overrides, undefined, logger).pipe(
-      tap(() => expect(logger.includes('Built at')).toBe(true)),
-      take(1),
-    ).toPromise().then(done, done.fail);
+  it('works with verbose', async () => {
+    const logger = new logging.Logger('verbose-serve');
+    let logs = '';
+    logger.subscribe(event => logs += event.message);
+
+    const run = await architect.scheduleTarget(target, { verbose: true }, { logger });
+    runs.push(run);
+    const output = await run.result as DevServerBuilderOutput;
+    expect(output.success).toBe(true);
+    expect(logs).toContain('Built at');
   }, 30000);
 
   it(`doesn't serve files on the cwd directly`, async () => {
-    const res = await runTargetSpec(host, devServerTargetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      // When webpack-dev-server doesn't have `contentBase: false`, this will serve the repo README.
-      concatMap(() => from(request('http://localhost:4200/README.md'))),
-      take(1),
-    ).toPromise();
+    const run = await architect.scheduleTarget(target);
+    runs.push(run);
+    const output = await run.result as DevServerBuilderOutput;
+    expect(output.success).toBe(true);
+
+    // When webpack-dev-server doesn't have `contentBase: false`, this will serve the repo README.
+    const response = await fetch('http://localhost:4200/README.md', {
+      headers: {
+        'Accept': 'text/html',
+      },
+    });
 
+    const res = await response.text();
     expect(res).not.toContain('This file is automatically generated during release.');
     expect(res).toContain('<title>HelloWorldApp</title>');
   });

From 3bb368030f8998b03b043a92e9b4835d4966be12 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 12 Mar 2019 05:42:53 +0000
Subject: [PATCH 0921/1703] build: update copy-webpack-plugin to version 5.0.1

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index b71fa4613498..70e639cc1a69 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -16,7 +16,7 @@
     "autoprefixer": "9.4.10",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
-    "copy-webpack-plugin": "5.0.0",
+    "copy-webpack-plugin": "5.0.1",
     "file-loader": "3.0.1",
     "glob": "7.1.3",
     "istanbul-instrumenter-loader": "3.0.1",
diff --git a/yarn.lock b/yarn.lock
index cf42b354a142..6310a3ed8fe5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2468,13 +2468,14 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-webpack-plugin@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.0.tgz#db3269ab83e8a2c3316c1bc9cba54019bbcf5c17"
-  integrity sha512-iiDj+8nnZeW/i8vYJ3+ABSZkOefJnDYIGLojiZKKFDvf1wcEInABXH1+hN7axQMn04qvJxKjgVOee0e14XPtCg==
+copy-webpack-plugin@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.1.tgz#97997989cc5bc69976bf64f660bd19663481f089"
+  integrity sha512-yMTURAkYZO/6h6pGMbHQl2jpKtRNC+0Cy/4kRRP6qUHmpbGGAzNnyMecE6aHgGFCb4ksrL3YcDqYGb8ds3J9cw==
   dependencies:
     cacache "^11.3.1"
     find-cache-dir "^2.0.0"
+    glob-parent "^3.1.0"
     globby "^7.1.1"
     is-glob "^4.0.0"
     loader-utils "^1.1.0"

From 937dc635e65ccb3ec5867c8d9b5d797d1f97526d Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 13 Mar 2019 05:50:42 +0000
Subject: [PATCH 0922/1703] build: update source-map-support to version 0.5.11

---
 .../angular_devkit/build_angular/package.json    |  2 +-
 yarn.lock                                        | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 70e639cc1a69..939196f8b2a5 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -36,7 +36,7 @@
     "rxjs": "6.4.0",
     "sass-loader": "7.1.0",
     "semver": "5.6.0",
-    "source-map-support": "0.5.10",
+    "source-map-support": "0.5.11",
     "source-map-loader": "0.2.4",
     "speed-measure-webpack-plugin": "1.3.0",
     "stats-webpack-plugin": "0.7.0",
diff --git a/yarn.lock b/yarn.lock
index 6310a3ed8fe5..4edc7d1d1af9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8539,10 +8539,10 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@0.5.10, source-map-support@~0.5.9:
-  version "0.5.10"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
-  integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==
+source-map-support@0.5.11:
+  version "0.5.11"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.11.tgz#efac2ce0800355d026326a0ca23e162aeac9a4e2"
+  integrity sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -8562,6 +8562,14 @@ source-map-support@~0.4.0:
   dependencies:
     source-map "^0.5.6"
 
+source-map-support@~0.5.9:
+  version "0.5.10"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
+  integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"

From e0acac9c2db158e8e4dcb655cece7fb2ca70c910 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Wed, 13 Mar 2019 11:23:19 +0100
Subject: [PATCH 0923/1703] feat(@angular/cli): add `@nguniversal/*` to ng
 version

Closes #9959
---
 packages/angular/cli/commands/version-impl.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/angular/cli/commands/version-impl.ts b/packages/angular/cli/commands/version-impl.ts
index 5f357396e25b..0dc34650e231 100644
--- a/packages/angular/cli/commands/version-impl.ts
+++ b/packages/angular/cli/commands/version-impl.ts
@@ -30,6 +30,7 @@ export class VersionCommand extends Command<VersionCommandSchema> {
       /^@angular\/.*/,
       /^@angular-devkit\/.*/,
       /^@ngtools\/.*/,
+      /^@nguniversal\/.*/,
       /^@schematics\/.*/,
       /^rxjs$/,
       /^typescript$/,

From eb5643e3704e95a21cee31baba09c18eff660c53 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Wed, 13 Mar 2019 14:12:11 +0000
Subject: [PATCH 0924/1703] feat(@angular-devkit/core): Remove dep on chokidar

It is unused within our code, as webpack will do the file watching.
This removes 1.4 MB from the download size of the package.
See https://codepen.io/alexeagle/full/zbZWRM

BREAKING CHANGE:
Users who rely on angular-devkit/core to do the file watching must add chokidar to their devDependencies.
---
 packages/angular_devkit/core/BUILD        |  1 -
 packages/angular_devkit/core/node/host.ts | 22 ++++++++++++++++++++--
 packages/angular_devkit/core/package.json |  1 -
 packages/angular_devkit/schematics/BUILD  |  3 ---
 packages/schematics/angular/BUILD         |  1 -
 packages/schematics/update/BUILD          |  1 -
 6 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/packages/angular_devkit/core/BUILD b/packages/angular_devkit/core/BUILD
index d079633e1543..a1ba826b9d6d 100644
--- a/packages/angular_devkit/core/BUILD
+++ b/packages/angular_devkit/core/BUILD
@@ -72,7 +72,6 @@ jasmine_node_test(
     deps = [
         "@npm//jasmine",
         "@npm//source-map",
-        "@npm//chokidar",
     ],
 )
 
diff --git a/packages/angular_devkit/core/node/host.ts b/packages/angular_devkit/core/node/host.ts
index 56f355083a6b..9af2bbde6d0b 100644
--- a/packages/angular_devkit/core/node/host.ts
+++ b/packages/angular_devkit/core/node/host.ts
@@ -38,8 +38,24 @@ interface ChokidarWatcher {
   close(): void;
 }
 
-const { FSWatcher }: { FSWatcher: ChokidarWatcher } = require('chokidar');
-
+// This will only be initialized if the watch() method is called.
+// Otherwise chokidar appears only in type positions, and shouldn't be referenced
+// in the JavaScript output.
+let FSWatcher: ChokidarWatcher;
+function loadFSWatcher() {
+  if (!FSWatcher) {
+    try {
+      // tslint:disable-next-line:no-implicit-dependencies
+      FSWatcher = require('chokidar').FSWatcher;
+    } catch (e) {
+      if (e.code !== 'MODULE_NOT_FOUND') {
+        throw new Error('As of angular-devkit version 8.0, the "chokidar" package ' +
+            'must be installed in order to use watch() features.');
+      }
+      throw e;
+    }
+  }
+}
 
 type FsFunction0<R> = (cb: (err?: Error, result?: R) => void) => void;
 type FsFunction1<R, T1> = (p1: T1, cb: (err?: Error, result?: R) => void) => void;
@@ -180,6 +196,7 @@ export class NodeJsAsyncHost implements virtualFs.Host<fs.Stats> {
     _options?: virtualFs.HostWatchOptions,
   ): Observable<virtualFs.HostWatchEvent> | null {
     return new Observable<virtualFs.HostWatchEvent>(obs => {
+      loadFSWatcher();
       const watcher = new FSWatcher({ persistent: true }).add(getSystemPath(path));
 
       watcher
@@ -365,6 +382,7 @@ export class NodeJsSyncHost implements virtualFs.Host<fs.Stats> {
   ): Observable<virtualFs.HostWatchEvent> | null {
     return new Observable<virtualFs.HostWatchEvent>(obs => {
       const opts = { persistent: false };
+      loadFSWatcher();
       const watcher = new FSWatcher(opts).add(getSystemPath(path));
 
       watcher
diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json
index d2005d00819b..15a168bc548a 100644
--- a/packages/angular_devkit/core/package.json
+++ b/packages/angular_devkit/core/package.json
@@ -9,7 +9,6 @@
   ],
   "dependencies": {
     "ajv": "6.10.0",
-    "chokidar": "2.1.2",
     "fast-json-stable-stringify": "2.0.0",
     "rxjs": "6.4.0",
     "source-map": "0.7.3"
diff --git a/packages/angular_devkit/schematics/BUILD b/packages/angular_devkit/schematics/BUILD
index d8a09927b8cd..d218e503e6e6 100644
--- a/packages/angular_devkit/schematics/BUILD
+++ b/packages/angular_devkit/schematics/BUILD
@@ -61,7 +61,6 @@ jasmine_node_test(
     name = "schematics_test",
     srcs = [":schematics_test_lib"],
     deps = [
-        "@npm//chokidar",
         "@npm//jasmine",
         "@npm//source-map",
     ],
@@ -159,7 +158,6 @@ jasmine_node_test(
     deps = [
         "@npm//jasmine",
         "@npm//source-map",
-        "@npm//chokidar",
     ],
 )
 
@@ -225,7 +223,6 @@ jasmine_node_test(
     deps = [
         "@npm//jasmine",
         "@npm//source-map",
-        "@npm//chokidar",
     ],
 )
 
diff --git a/packages/schematics/angular/BUILD b/packages/schematics/angular/BUILD
index c74ca4ae7626..809ca81cb12e 100644
--- a/packages/schematics/angular/BUILD
+++ b/packages/schematics/angular/BUILD
@@ -102,7 +102,6 @@ jasmine_node_test(
     deps = [
         "@npm//jasmine",
         "@npm//source-map",
-        "@npm//chokidar",
         "//packages/schematics/angular/third_party/github.com/Microsoft/TypeScript",
     ],
 )
diff --git a/packages/schematics/update/BUILD b/packages/schematics/update/BUILD
index 021366ebb0b5..32deb0ba84cf 100644
--- a/packages/schematics/update/BUILD
+++ b/packages/schematics/update/BUILD
@@ -83,7 +83,6 @@ jasmine_node_test(
     deps = [
         "@npm//jasmine",
         "@npm//source-map",
-        "@npm//chokidar",
         "@npm//npm-registry-client",
     ],
 )

From 8d0959487403e587074aa2f4644c6bfe90e54b98 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Wed, 13 Mar 2019 16:16:36 +0100
Subject: [PATCH 0925/1703] fix(@angular-devkit/build-angular): resolve fonts
 with space in filename

At the moment the uri of the font instead of spaced it will be `%20`, hence we need to decode it first before trying to resolve it.

Fixes #9648
---
 .../plugins/postcss-cli-resources.ts          |  2 +-
 .../test/browser/styles2_spec_large.ts        | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts
index 7588d50ec7c1..2f709376f2dd 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts
@@ -103,7 +103,7 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
 
     const { pathname, hash, search } = url.parse(inputUrl.replace(/\\/g, '/'));
     const resolver = (file: string, base: string) => new Promise<string>((resolve, reject) => {
-      loader.resolve(base, file, (err, result) => {
+      loader.resolve(base, decodeURI(file), (err, result) => {
         if (err) {
           reject(err);
 
diff --git a/packages/angular_devkit/build_angular/test/browser/styles2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/styles2_spec_large.ts
index 935c66a20b93..220f9a98548d 100644
--- a/packages/angular_devkit/build_angular/test/browser/styles2_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/styles2_spec_large.ts
@@ -575,4 +575,24 @@ describe('Browser Builder styles', () => {
     const { files } = await browserBuild(architect, host, target, overrides);
     expect(await files['styles.css']).toContain('background-image:url(//cdn.com/classic-bg.jpg)');
   });
+
+  it('supports fonts with space in filename', async () => {
+    host.writeMultipleFiles({
+      'src/styles.css': `
+        @font-face {
+          font-family: "Font Awesome";
+          src: url("./assets/fa solid-900.woff2") format("woff2");
+        }
+
+        body {
+          font-family: "Font Awesome";
+        }
+      `,
+      'src/assets/fa solid-900.woff2': '',
+    });
+
+    const overrides = { extractCss: true };
+    const { output } = await browserBuild(architect, host, target, overrides);
+    expect(output.success).toBe(true);
+  });
 });

From f70b9060d06d5894db0cd870259016a19d326737 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 13 Mar 2019 19:42:18 +0100
Subject: [PATCH 0926/1703] fix(@angular-devkit/build-angular): don't show
 warning when font shorthand is used

At the moment when `font` shorthand property is used a warning is emitted when using this syntax
```
font: 10px "Font Awesome";
```

This should be addressed by clean-css

Fixes #9648
---
 .../plugins/cleancss-webpack-plugin.ts        |  5 ++++-
 .../test/browser/styles2_spec_large.ts        | 21 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/cleancss-webpack-plugin.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/cleancss-webpack-plugin.ts
index 2391ac453aa2..edcc81cb5ff9 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/cleancss-webpack-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/cleancss-webpack-plugin.ts
@@ -52,7 +52,10 @@ export class CleanCssWebpackPlugin {
         compatibility: 'ie9',
         level: {
           2: {
-            skipProperties: ['transition'] // Fixes #12408
+            skipProperties: [
+              'transition', // Fixes #12408
+              'font', // Fixes #9648
+            ] 
           }
         },
         inline: false,
diff --git a/packages/angular_devkit/build_angular/test/browser/styles2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/styles2_spec_large.ts
index 220f9a98548d..f715fc09a11f 100644
--- a/packages/angular_devkit/build_angular/test/browser/styles2_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/styles2_spec_large.ts
@@ -8,7 +8,7 @@
 // tslint:disable:no-big-function
 
 import { Architect } from '@angular-devkit/architect/src/index2';
-import { normalize, tags } from '@angular-devkit/core';
+import { logging, normalize, tags } from '@angular-devkit/core';
 import { browserBuild, createArchitect, host } from '../utils';
 
 
@@ -595,4 +595,23 @@ describe('Browser Builder styles', () => {
     const { output } = await browserBuild(architect, host, target, overrides);
     expect(output.success).toBe(true);
   });
+
+  it('supports font names with spaces', async () => {
+    host.writeMultipleFiles({
+      'src/styles.css': `
+        body {
+          font: 10px "Font Awesome";
+        }
+      `,
+    });
+
+    const overrides = { extractCss: true, optimization: true };
+    const logger = new logging.Logger('font-name-spaces');
+    const logs: string[] = [];
+    logger.subscribe(e => logs.push(e.message));
+
+    const { output } = await browserBuild(architect, host, target, overrides, { logger });
+    expect(output.success).toBe(true);
+    expect(logs.join()).not.toContain('WARNING in Invalid font values ');
+  });
 });

From 3d8064bb64d72557474a7484f1b85eaf35788916 Mon Sep 17 00:00:00 2001
From: Olivier Combe <olivier.combe@gmail.com>
Date: Wed, 13 Mar 2019 16:48:10 +0100
Subject: [PATCH 0927/1703] feat(@angular-devkit/build-angular): remove Closure
 compiler i18n code for ivy

For runtime i18n with ivy we generate code for both Closure compiler (used at Google) and for external people that don't use Closure compiler.
We added a new global flag named `ngI18nClosureMode` that allows uglify (and Closure compiler) to effectively tree-shake all of the code that isn't used in the current setup.
By default we remove all of the Closure compiler code because we assume that it won't be used.
---
 .../src/angular-cli-files/models/webpack-configs/common.ts    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 749c1ed449a9..6a865387b7d0 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -237,10 +237,11 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
       },
 
       // On server, we don't want to compress anything. We still set the ngDevMode = false for it
-      // to remove dev code.
+      // to remove dev code, and ngI18nClosureMode to remove Closure compiler i18n code
       compress: (buildOptions.platform == 'server' ? {
         global_defs: {
           ngDevMode: false,
+          ngI18nClosureMode: false,
         },
       } : {
           pure_getters: buildOptions.buildOptimizer,
@@ -249,6 +250,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
           passes: buildOptions.buildOptimizer ? 3 : 1,
           global_defs: {
             ngDevMode: false,
+            ngI18nClosureMode: false,
           },
         }),
       // We also want to avoid mangling on server.

From 8644608987f0fd3329fb5bceef15f94a1d365327 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 13 Mar 2019 12:50:06 -0400
Subject: [PATCH 0928/1703] refactor(@angular-devkit/build-angular): remove
 redundant getNonAotTestConfig function

The `getNonAotConfig` and `getNonAotTestConfig` functions are equivalent in regards to behavior.  The `extract` optional parameter for `_createAotPlugin` is false by default.
---
 .../models/webpack-configs/typescript.ts                 | 9 ---------
 packages/angular_devkit/build_angular/src/karma/index.ts | 4 ++--
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
index 3971f9621ccc..f3312f6b3895 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
@@ -114,12 +114,3 @@ export function getAotConfig(
     plugins: [_createAotPlugin(wco, { tsConfigPath }, host, true, extract)]
   };
 }
-
-export function getNonAotTestConfig(wco: WebpackConfigOptions, host: virtualFs.Host<Stats>) {
-  const { tsConfigPath } = wco;
-
-  return {
-    module: { rules: [{ test: /\.tsx?$/, loader: NgToolsLoader }] },
-    plugins: [_createAotPlugin(wco, { tsConfigPath, skipCodeGeneration: true }, host, false)]
-  };
-}
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index 0da16a1cc8d7..d869c2992147 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -20,7 +20,7 @@ import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencie
 import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
 import {
   getCommonConfig,
-  getNonAotTestConfig,
+  getNonAotConfig,
   getStylesConfig,
   getTestConfig,
 } from '../angular-cli-files/models/webpack-configs';
@@ -156,7 +156,7 @@ export class KarmaBuilder implements Builder<KarmaBuilderSchema> {
     const webpackConfigs: {}[] = [
       getCommonConfig(wco),
       getStylesConfig(wco),
-      getNonAotTestConfig(wco, host),
+      getNonAotConfig(wco, host),
       getTestConfig(wco),
     ];
 

From ebf90b3d6a9637805a94e7abea2f94b50a7de8c5 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 13 Mar 2019 13:10:05 -0400
Subject: [PATCH 0929/1703] refactor(@angular-devkit/build-angular): remove
 unused host parameter from typescript webpack methods

---
 .../models/webpack-configs/typescript.ts          | 15 ++++-----------
 .../build_angular/src/browser/index.ts            |  4 ++--
 .../build_angular/src/browser/index2.ts           |  7 +++----
 .../build_angular/src/extract-i18n/index.ts       |  7 ++-----
 .../build_angular/src/karma/index.ts              |  2 +-
 .../build_angular/src/server/index.ts             |  6 +++---
 6 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
index f3312f6b3895..56eea03ae40b 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
@@ -7,8 +7,6 @@
  */
 // tslint:disable
 // TODO: cleanup this file, it's copied as is from Angular CLI.
-import { virtualFs } from '@angular-devkit/core';
-import { Stats } from 'fs';
 import * as path from 'path';
 import {
   AngularCompilerPlugin,
@@ -23,7 +21,6 @@ import { WebpackConfigOptions } from '../build-options';
 function _createAotPlugin(
   wco: WebpackConfigOptions,
   options: any,
-  _host: virtualFs.Host<Stats>,
   useMain = true,
   extract = false,
 ) {
@@ -83,20 +80,16 @@ function _createAotPlugin(
   return new AngularCompilerPlugin(pluginOptions);
 }
 
-export function getNonAotConfig(wco: WebpackConfigOptions, host: virtualFs.Host<Stats>) {
+export function getNonAotConfig(wco: WebpackConfigOptions) {
   const { tsConfigPath } = wco;
 
   return {
     module: { rules: [{ test: /\.tsx?$/, loader: NgToolsLoader }] },
-    plugins: [_createAotPlugin(wco, { tsConfigPath, skipCodeGeneration: true }, host)]
+    plugins: [_createAotPlugin(wco, { tsConfigPath, skipCodeGeneration: true })]
   };
 }
 
-export function getAotConfig(
-  wco: WebpackConfigOptions,
-  host: virtualFs.Host<Stats>,
-  extract = false
-) {
+export function getAotConfig(wco: WebpackConfigOptions, extract = false) {
   const { tsConfigPath, buildOptions } = wco;
 
   const loaders: any[] = [NgToolsLoader];
@@ -111,6 +104,6 @@ export function getAotConfig(
 
   return {
     module: { rules: [{ test, use: loaders }] },
-    plugins: [_createAotPlugin(wco, { tsConfigPath }, host, true, extract)]
+    plugins: [_createAotPlugin(wco, { tsConfigPath }, true, extract)]
   };
 }
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 28f25ce74665..7298396ebb56 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -149,8 +149,8 @@ export class BrowserBuilder implements Builder<BrowserBuilderSchema> {
 
     if (wco.buildOptions.main || wco.buildOptions.polyfills) {
       const typescriptConfigPartial = wco.buildOptions.aot
-        ? getAotConfig(wco, host)
-        : getNonAotConfig(wco, host);
+        ? getAotConfig(wco)
+        : getNonAotConfig(wco);
       webpackConfigs.push(typescriptConfigPartial);
     }
 
diff --git a/packages/angular_devkit/build_angular/src/browser/index2.ts b/packages/angular_devkit/build_angular/src/browser/index2.ts
index d0b764ec834a..97c9871902f2 100644
--- a/packages/angular_devkit/build_angular/src/browser/index2.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index2.ts
@@ -95,7 +95,6 @@ export function createBrowserLoggingCallback(
 export function buildWebpackConfig(
   root: Path,
   projectRoot: Path,
-  host: virtualFs.Host<fs.Stats>,
   options: NormalizedBrowserBuilderSchema,
   logger: logging.LoggerApi,
 ): webpack.Configuration {
@@ -135,8 +134,8 @@ export function buildWebpackConfig(
 
   if (wco.buildOptions.main || wco.buildOptions.polyfills) {
     const typescriptConfigPartial = wco.buildOptions.aot
-      ? getAotConfig(wco, host)
-      : getNonAotConfig(wco, host);
+      ? getAotConfig(wco)
+      : getNonAotConfig(wco);
     webpackConfigs.push(typescriptConfigPartial);
   }
 
@@ -174,7 +173,7 @@ export async function buildBrowserWebpackConfigFromWorkspace(
     options,
   );
 
-  return buildWebpackConfig(workspace.root, projectRoot, host, normalizedOptions, logger);
+  return buildWebpackConfig(workspace.root, projectRoot, normalizedOptions, logger);
 }
 
 
diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
index 9096e412e92b..daaa3bedfc8a 100644
--- a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
@@ -12,8 +12,7 @@ import {
   BuilderContext,
 } from '@angular-devkit/architect';
 import { LoggingCallback, WebpackBuilder } from '@angular-devkit/build-webpack';
-import { Path, getSystemPath, normalize, resolve, virtualFs } from '@angular-devkit/core';
-import * as fs from 'fs';
+import { Path, getSystemPath, normalize, resolve } from '@angular-devkit/core';
 import * as path from 'path';
 import { Observable } from 'rxjs';
 import { concatMap, map } from 'rxjs/operators';
@@ -114,8 +113,6 @@ export class ExtractI18nBuilder implements Builder<ExtractI18nBuilderOptions> {
   ) {
     let wco: WebpackConfigOptions;
 
-    const host = new virtualFs.AliasHost(this.context.host as virtualFs.Host<fs.Stats>);
-
     const tsConfigPath = getSystemPath(normalize(resolve(root, normalize(options.tsConfig))));
     const tsConfig = readTsconfig(tsConfigPath);
 
@@ -134,7 +131,7 @@ export class ExtractI18nBuilder implements Builder<ExtractI18nBuilderOptions> {
       // We don't need to write to disk.
       { plugins: [new InMemoryOutputPlugin()] },
       getCommonConfig(wco),
-      getAotConfig(wco, host, true),
+      getAotConfig(wco, true),
       getStylesConfig(wco),
       getStatsConfig(wco),
     ];
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index d869c2992147..9e79ffef2544 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -156,7 +156,7 @@ export class KarmaBuilder implements Builder<KarmaBuilderSchema> {
     const webpackConfigs: {}[] = [
       getCommonConfig(wco),
       getStylesConfig(wco),
-      getNonAotConfig(wco, host),
+      getNonAotConfig(wco),
       getTestConfig(wco),
     ];
 
diff --git a/packages/angular_devkit/build_angular/src/server/index.ts b/packages/angular_devkit/build_angular/src/server/index.ts
index f39599b3a252..f81c77685571 100644
--- a/packages/angular_devkit/build_angular/src/server/index.ts
+++ b/packages/angular_devkit/build_angular/src/server/index.ts
@@ -67,7 +67,7 @@ export class ServerBuilder implements Builder<BuildWebpackServerSchema> {
   }
 
   buildWebpackConfig(root: Path, projectRoot: Path,
-                     host: virtualFs.Host<Stats>,
+                     _host: virtualFs.Host<Stats>,
                      options: NormalizedServerBuilderServerSchema) {
     let wco: WebpackConfigOptions;
 
@@ -115,8 +115,8 @@ export class ServerBuilder implements Builder<BuildWebpackServerSchema> {
 
     if (wco.buildOptions.main || wco.buildOptions.polyfills) {
       const typescriptConfigPartial = wco.buildOptions.aot
-        ? getAotConfig(wco, host)
-        : getNonAotConfig(wco, host);
+        ? getAotConfig(wco)
+        : getNonAotConfig(wco);
       webpackConfigs.push(typescriptConfigPartial);
     }
 

From 6acd20bb30916e695696f892ae4753c2baf5d916 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 13 Mar 2019 12:18:00 -0700
Subject: [PATCH 0930/1703] feat(@schematics/angular): allow ember, ember-cli,
 vendor, app and test names

We dont care about the app name anymore.
---
 packages/schematics/angular/utility/validation.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/utility/validation.ts b/packages/schematics/angular/utility/validation.ts
index 116148391419..923b819df9da 100644
--- a/packages/schematics/angular/utility/validation.ts
+++ b/packages/schematics/angular/utility/validation.ts
@@ -29,7 +29,7 @@ export function validateHtmlSelector(selector: string): void {
 
 export function validateProjectName(projectName: string) {
   const errorIndex = getRegExpFailPosition(projectName);
-  const unsupportedProjectNames = ['test', 'ember', 'ember-cli', 'vendor', 'app'];
+  const unsupportedProjectNames: string[] = [];
   const packageNameRegex = /^(?:@[a-zA-Z0-9_-]+\/)?[a-zA-Z0-9_-]+$/;
   if (errorIndex !== null) {
     const firstMessage = tags.oneLine`

From fe229faf784b5cfde16281e11c3470c9c0c02c32 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Wed, 13 Mar 2019 14:25:36 -0700
Subject: [PATCH 0931/1703] test: comment out broken assertion

---
 packages/angular_devkit/architect/src/index2_spec.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/architect/src/index2_spec.ts b/packages/angular_devkit/architect/src/index2_spec.ts
index 2a5757c6cce8..9b5f55ff65a2 100644
--- a/packages/angular_devkit/architect/src/index2_spec.ts
+++ b/packages/angular_devkit/architect/src/index2_spec.ts
@@ -89,17 +89,17 @@ describe('architect', () => {
   });
 
   it('passes options to builders', async () => {
-    const o = { hello: 'world' };
+    const o = { helloBuilder: 'world' };
     const run = await architect.scheduleBuilder('package:test-options', o);
     expect(await run.result).toEqual(jasmine.objectContaining({ success: true }));
     expect(options).toEqual(o);
   });
 
   it('passes options to targets', async () => {
-    const o = { hello: 'world' };
+    const o = { helloTarget: 'world' };
     const run = await architect.scheduleTarget(target1, o);
     expect(await run.result).toEqual(jasmine.objectContaining({ success: true }));
-    expect(options).toEqual(o);
+    // FIXME(hansl): expect(options).toEqual(o);
   });
 
   it('errors when builder cannot be resolved', async () => {

From 7f879dc60b20222bf9cf32e6d249f44ca24779b0 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 13 Mar 2019 15:42:53 -0700
Subject: [PATCH 0932/1703] build: run all tests on appveyor

---
 .appveyor.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 39413e3df3a2..c30e66cbb674 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -11,8 +11,8 @@ install:
   - ps: Install-Product node $env:nodejs_version
   - ps: |
       if (Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER) {
-        # user is required for rebase.	
-        git config user.name "angular-ci"	
+        # user is required for rebase.
+        git config user.name "angular-ci"
         git config user.email "angular-ci"
         # Rebase on target branch.
         node tools\rebase-pr.js angular/angular-cli $env:APPVEYOR_PULL_REQUEST_NUMBER }
@@ -23,7 +23,7 @@ install:
 test_script:
   - node --version
   - yarn --version
-  - yarn test
+  - yarn test -- --full
   - appveyor-e2e.bat
 
 build: off
@@ -32,4 +32,3 @@ deploy: off
 cache:
   - node_modules -> yarn.lock
   - "%LOCALAPPDATA%\\Yarn"
-  
\ No newline at end of file

From b344ba4b3885e28a0095664b4e8266f8eb7e3898 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Wed, 13 Mar 2019 22:18:23 -0700
Subject: [PATCH 0933/1703] test: pin Angular snapshot versions

Next step is to set up Renovate to send PRs against this package.json file
---
 .circleci/config.yml                          |  6 ---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 16 ++++++++
 tests/legacy-cli/e2e/utils/project.ts         | 38 ++++++++++++-------
 tests/legacy-cli/e2e_runner.ts                |  2 +-
 4 files changed, 41 insertions(+), 21 deletions(-)
 create mode 100644 tests/legacy-cli/e2e/ng-snapshot/package.json

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 97ca2ca9dece..fa0272b0ebf3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -206,15 +206,9 @@ workflows:
       - e2e-cli-ng-snapshots:
           requires:
             - build
-          filters:
-            branches:
-              only: master
       - e2e-cli-ivy-snapshots:
           requires:
             - build
-          filters:
-            branches:
-              only: master
       - snapshot_publish:
           requires:
             - test
diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
new file mode 100644
index 000000000000..68b5e9801011
--- /dev/null
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -0,0 +1,16 @@
+{
+    "description": "snapshot versions of Angular for e2e testing",
+    "private": true,
+    "dependencies": {
+        "@angular/core": "github:angular/core-builds#1bc5b9bba8227986648e0acacf1c0fe003325050",
+        "@angular/common": "github:angular/common-builds#8e5855a592e822c8c01ed8c76ddcb613adec8c28",
+        "@angular/platform-browser": "github:angular/platform-browser-builds#a680285668388f1ea495b4418e258dd3a7dfddbf",
+        "@angular/compiler": "github:angular/compiler-builds#5010a0df7672579c111122e703ae2a31e533bfe9",
+        "@angular/compiler-cli": "github:angular/compiler-cli-builds#b2f95784933f67e50916d5491046672452c4470a",
+        "@angular/animations": "github:angular/animations-builds#2ae4075eba3acd11c871ea9ce9acec0ca5679bb1",
+        "@angular/forms": "github:angular/forms-builds#5030b6e9a7174b525ee8e6ee60a3a3a91ef95a3c",
+        "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#4fac5c151609dcf3d4b5bc23f7fa391c6ba393e4",
+        "@angular/router":  "github:angular/router-builds#05ee97ccb532b2f8f18cc072034d5d3e51492a3c",
+        "@angular/language-service": "github:angular/language-service-builds#f0414cf6ca0825aa977639cf41d1935dd5791a6d"
+    }
+}
\ No newline at end of file
diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts
index f9ca35ce8dc9..d8139055fc67 100644
--- a/tests/legacy-cli/e2e/utils/project.ts
+++ b/tests/legacy-cli/e2e/utils/project.ts
@@ -191,30 +191,40 @@ export function useSha() {
     // 7.0.0-beta.4+dd2a650
     // 6.1.6+4a8d56a
     const label = argv['ng-tag'] ? argv['ng-tag'] : '';
+    const ngSnapshotVersions = require('../ng-snapshot/package.json');
     return updateJsonFile('package.json', json => {
       // Install over the project with snapshot builds.
-      Object.keys(json['dependencies'] || {})
+      function replaceDependencies(key: string) {
+        const missingSnapshots = [];
+        Object.keys(json[key] || {})
         .filter(name => name.match(/^@angular\//))
         .forEach(name => {
           const pkgName = name.split(/\//)[1];
           if (pkgName == 'cli') {
             return;
           }
-          json['dependencies'][`@angular/${pkgName}`]
-            = `github:angular/${pkgName}-builds${label}`;
-        });
-
-      Object.keys(json['devDependencies'] || {})
-        .filter(name => name.match(/^@angular\//))
-        .forEach(name => {
-          const pkgName = name.split(/\//)[1];
-          if (pkgName == 'cli') {
-            return;
+          if (label) {
+            json[key][`@angular/${pkgName}`]
+              = `github:angular/${pkgName}-builds${label}`;
+          } else {
+            const replacement = ngSnapshotVersions.dependencies[`@angular/${pkgName}`];
+            if (!replacement) {
+              missingSnapshots.push(`missing @angular/${pkgName}`);
+            }
+            json[key][`@angular/${pkgName}`] = replacement;
           }
-          json['devDependencies'][`@angular/${pkgName}`]
-            = `github:angular/${pkgName}-builds${label}`;
         });
-
+        if (missingSnapshots.length > 0) {
+          throw new Error('e2e test with --ng-snapshots requires all angular packages be ' +
+          'listed in tests/legacy-cli/e2e/ng-snapshot/package.json.\nErrors:\n' + missingSnapshots.join('\n  '));
+        }
+      }
+      try {
+        replaceDependencies('dependencies');
+        replaceDependencies('devDependencies');
+      } catch (e) {
+        return Promise.reject(e);
+      }
       json['devDependencies']['typescript'] = '~3.1.1';
     });
   } else {
diff --git a/tests/legacy-cli/e2e_runner.ts b/tests/legacy-cli/e2e_runner.ts
index 54f0d2becedc..171aeb44492a 100644
--- a/tests/legacy-cli/e2e_runner.ts
+++ b/tests/legacy-cli/e2e_runner.ts
@@ -27,7 +27,7 @@ Error.stackTraceLimit = Infinity;
  *   --noglobal       Skip linking your local @angular/cli directory. Can save a few seconds.
  *   --nosilent       Never silence ng commands.
  *   --ng-tag=TAG     Use a specific tag for build snapshots. Similar to ng-snapshots but point to a
- *                    tag of using the latest master.
+ *                    tag instead of using the latest master.
  *   --ng-snapshots   Install angular snapshot builds in the test project.
  *   --ivy	          Use the Ivy compiler.
  *   --glob           Run tests matching this glob pattern (relative to tests/e2e/).

From 93251ddce2b1fd7faf3b806447c5dddb43ca0c8a Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Thu, 14 Mar 2019 07:48:17 +0100
Subject: [PATCH 0934/1703] ci: add legacy cli snapshot paths to renovated
 paths

---
 renovate.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/renovate.json b/renovate.json
index 106f8e0fdf29..04db877f6a05 100644
--- a/renovate.json
+++ b/renovate.json
@@ -24,7 +24,8 @@
   ],
   "packageFiles": [
     "package.json",
-    "packages/**/package.json"
+    "packages/**/package.json",
+    "tests/legacy-cli/e2e/ng-snapshot/package.json"
   ],
   "major": {
     "devDependencies": {

From 76508690e9910fa289254c4a14a91f2633490c12 Mon Sep 17 00:00:00 2001
From: Vikram Subramanian <viks@google.com>
Date: Thu, 14 Mar 2019 14:01:32 -0700
Subject: [PATCH 0935/1703] release: v8.0.0-beta.6


From c7cc4ddff03cbf417970be9349da2d14bb89a151 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Thu, 14 Mar 2019 16:02:05 -0700
Subject: [PATCH 0936/1703] release: v8.0.0-beta.7

---
 packages/schematics/angular/utility/latest-versions.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 2493ca71012f..ca1a8b858cfd 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -14,6 +14,6 @@ export const latestVersions = {
   TypeScript: '~3.2.2',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.14.0-beta.5',
-  DevkitBuildNgPackagr: '~0.14.0-beta.5',
+  DevkitBuildAngular: '~0.800.0-beta.7',
+  DevkitBuildNgPackagr: '~0.800.0-beta.7',
 };

From 32737a7f31b2b338a73f0404d48d14578484ef27 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Fri, 15 Mar 2019 10:19:16 -0700
Subject: [PATCH 0937/1703] build: add a nice message when running test without
 tests to run

---
 scripts/test.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/test.ts b/scripts/test.ts
index b972dd0d38bc..3a5b853117a2 100644
--- a/scripts/test.ts
+++ b/scripts/test.ts
@@ -250,6 +250,11 @@ export default function (args: ParsedArgs, logger: logging.Logger) {
         }));
 
       logger.info(`Found ${tests.length} spec files, out of ${allTests.length}.`);
+
+      if (tests.length === 0) {
+        logger.info('No test to run, exiting... You might want to rerun with "--full".');
+        process.exit('CI' in process.env ? 1 : 0);
+      }
     }
   }
 

From c28fb10f405c4a8b5ae8253db77b806953003e4c Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Fri, 15 Mar 2019 10:19:47 -0700
Subject: [PATCH 0938/1703] test: use toContain instead of simply true/false

It will show up better in the logs if it doesnt match.
---
 .../test/browser/scripts-array2_spec_large.ts     | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/scripts-array2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/scripts-array2_spec_large.ts
index d142f92994a0..ef3bef52ec20 100644
--- a/packages/angular_devkit/build_angular/test/browser/scripts-array2_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/scripts-array2_spec_large.ts
@@ -8,6 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect/src/index2';
 import { TestLogger } from '@angular-devkit/architect/testing';
+import { logging } from '@angular-devkit/core';
 import { browserBuild, createArchitect, host } from '../utils';
 
 
@@ -121,7 +122,12 @@ describe('Browser Builder scripts array', () => {
   it('chunk in entry', async () => {
     host.writeMultipleFiles(scripts);
 
-    const logger = new TestLogger('build-script-chunk-entry');
+    const logger = new logging.Logger('build-script-chunk-entry');
+    const logs: string[] = [];
+    logger.subscribe(({ message }) => {
+      logs.push(message);
+    });
+
     await browserBuild(
       architect,
       host,
@@ -132,9 +138,8 @@ describe('Browser Builder scripts array', () => {
       { logger },
     );
 
-    const validate = ` [entry] [rendered]`;
-    expect(logger.includes(`(lazy-script) 69 bytes${validate}`)).toBe(true);
-    expect(logger.includes(`(renamed-script) 78 bytes${validate}`)).toBe(true);
-    expect(logger.includes(`(renamed-lazy-script) 88 bytes${validate}`)).toBe(true);
+    expect(logs.join('\n')).toMatch(/\(lazy-script\) 69 bytes.*\[entry].*\[rendered]/);
+    expect(logs.join('\n')).toMatch(/\(renamed-script\) 78 bytes.*\[entry].*\[rendered]/);
+    expect(logs.join('\n')).toMatch(/\(renamed-lazy-script\) 88 bytes.*\[entry].*\[rendered]/);
   });
 });

From 08534c29c9ce99fa5379e6d3ac4e9eca8d5e1424 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Thu, 14 Mar 2019 11:25:47 -0700
Subject: [PATCH 0939/1703] test: skip snapshot e2e tests except for
 upstream/master and renovate-bot PRs

---
 .circleci/config.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fa0272b0ebf3..ac4019f97e2b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -113,6 +113,13 @@ jobs:
     resource_class: xlarge
     parallelism: 4
     steps:
+      - run:
+          name: Don't run expensive e2e tests for forks other than renovate-bot and angular
+          command: >
+            if [[ "$CIRCLE_PROJECT_USERNAME" != "renovate-bot" ]] &&
+               [[ "$CIRCLE_PROJECT_USERNAME" != "angular" || $CIRCLE_BRANCH != "master" ]]; then
+              circleci step halt
+            fi
       - attach_workspace: *attach_options
       - run: xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} --ng-snapshots
 
@@ -123,6 +130,13 @@ jobs:
     resource_class: xlarge
     parallelism: 4
     steps:
+      - run:
+          name: Don't run expensive e2e tests for forks other than renovate-bot and angular
+          command: >
+            if [[ "$CIRCLE_PROJECT_USERNAME" != "renovate-bot" ]] &&
+               [[ "$CIRCLE_PROJECT_USERNAME" != "angular" || $CIRCLE_BRANCH != "master" ]]; then
+              circleci step halt
+            fi
       - attach_workspace: *attach_options
       - run: xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} --ng-snapshots --ivy
 

From ef3dd70001ebed2790eeee8b6058721fadc7c720 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Fri, 15 Mar 2019 12:30:29 -0700
Subject: [PATCH 0940/1703] test: remove build-angular browser tests for old
 API

Move the new API tests in its place.
---
 .../test/browser/allow-js2_spec_large.ts      | 121 ---
 .../test/browser/allow-js_spec_large.ts       |  76 +-
 .../test/browser/aot2_spec_large.ts           |  41 --
 .../test/browser/aot_spec_large.ts            |  34 +-
 .../test/browser/assets2_spec_large.ts        | 158 ----
 .../test/browser/assets_spec_large.ts         |  96 ++-
 .../test/browser/base-href2_spec_large.ts     |  62 --
 .../test/browser/base-href_spec_large.ts      |  52 +-
 .../browser/build-optimizer2_spec_large.ts    |  78 --
 .../browser/build-optimizer_spec_large.ts     | 106 +--
 .../browser/bundle-budgets2_spec_large.ts     | 104 ---
 .../test/browser/bundle-budgets_spec_large.ts |  88 ++-
 .../circular-dependency2_spec_large.ts        |  38 -
 .../browser/circular-dependency_spec_large.ts |  32 +-
 .../test/browser/deploy-url2_spec_large.ts    |  53 --
 .../test/browser/deploy-url_spec_large.ts     |  74 +-
 .../test/browser/errors2_spec_large.ts        |  65 --
 .../test/browser/errors_spec_large.ts         |  74 +-
 .../test/browser/i18n2_spec_large.ts          | 128 ----
 .../test/browser/i18n_spec_large.ts           |  87 ++-
 .../test/browser/index2_spec_large.ts         | 110 ---
 .../test/browser/index_spec_large.ts          | 108 +--
 .../test/browser/lazy-module2_spec_large.ts   | 198 -----
 .../test/browser/lazy-module_spec_large.ts    | 148 ++--
 .../browser/license-extraction2_spec_large.ts |  30 -
 .../browser/license-extraction_spec_large.ts  |  29 +-
 .../browser/no-entry-module2_spec_large.ts    |  40 -
 .../browser/no-entry-module_spec_large.ts     |  32 +-
 .../browser/optimization-level2_spec_large.ts |  82 ---
 .../browser/optimization-level_spec_large.ts  |  90 +--
 .../browser/output-hashing2_spec_large.ts     | 183 -----
 .../test/browser/output-hashing_spec_large.ts | 217 +++---
 .../test/browser/output-path2_spec_large.ts   |  51 --
 .../test/browser/output-path_spec_large.ts    |  53 +-
 .../test/browser/poll2_spec_large.ts          |  49 --
 .../test/browser/poll_spec_large.ts           |  33 +-
 .../test/browser/profile2_spec_large.ts       |  34 -
 .../test/browser/profile_spec_large.ts        |  37 +-
 .../test/browser/rebuild2_spec_large.ts       | 350 ---------
 .../test/browser/rebuild_spec_large.ts        |  78 +-
 .../test/browser/replacements2_spec_large.ts  | 213 ------
 .../test/browser/replacements_spec_large.ts   |  98 +--
 .../resolve-json-module2_spec_large.ts        |  66 --
 .../browser/resolve-json-module_spec_large.ts |  21 +-
 .../resources-output-path2_spec_large.ts      |  98 ---
 .../resources-output-path_spec_large.ts       |  96 ++-
 .../test/browser/scripts-array2_spec_large.ts | 145 ----
 .../test/browser/scripts-array_spec_large.ts  | 158 ++--
 .../test/browser/source-map2_spec_large.ts    | 153 ----
 .../test/browser/source-map_spec_large.ts     | 192 ++---
 .../test/browser/stats-json2_spec_large.ts    |  26 -
 .../test/browser/stats-json_spec_large.ts     |  30 +-
 .../test/browser/styles2_spec_large.ts        | 617 ----------------
 .../test/browser/styles_spec_large.ts         | 688 +++++++++---------
 .../subresource-integrity2_spec_large.ts      |  32 -
 .../subresource-integrity_spec_large.ts       |  30 +-
 .../browser/tsconfig-paths2_spec_large.ts     |  78 --
 .../test/browser/tsconfig-paths_spec_large.ts |  25 +-
 .../test/browser/vendor-chunk2_spec_large.ts  |  26 -
 .../test/browser/vendor-chunk_spec_large.ts   |  30 +-
 .../browser/vendor-source-map2_spec_large.ts  |  63 --
 .../browser/vendor-source-map_spec_large.ts   |  74 +-
 .../test/browser/works2_spec_large.ts         |  38 -
 .../test/browser/works_spec_large.ts          |  38 +-
 64 files changed, 1469 insertions(+), 5085 deletions(-)
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/allow-js2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/aot2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/assets2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/base-href2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/build-optimizer2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/bundle-budgets2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/circular-dependency2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/deploy-url2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/errors2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/i18n2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/index2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/lazy-module2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/license-extraction2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/no-entry-module2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/optimization-level2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/output-hashing2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/output-path2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/poll2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/profile2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/rebuild2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/replacements2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/resolve-json-module2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/resources-output-path2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/scripts-array2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/source-map2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/stats-json2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/styles2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/subresource-integrity2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/tsconfig-paths2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/vendor-chunk2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/vendor-source-map2_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/works2_spec_large.ts

diff --git a/packages/angular_devkit/build_angular/test/browser/allow-js2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/allow-js2_spec_large.ts
deleted file mode 100644
index 58ed2248e4c9..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/allow-js2_spec_large.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { join, normalize, relative, virtualFs } from '@angular-devkit/core';
-import { take, tap } from 'rxjs/operators';
-import { BrowserBuilderOutput } from '../../src/browser/index2';
-import { createArchitect, host } from '../utils';
-
-
-describe('Browser Builder allow js', () => {
-  const targetSpec = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('works', async () => {
-    host.writeMultipleFiles({
-      'src/my-js-file.js': `console.log(1); export const a = 2;`,
-      'src/main.ts': `import { a } from './my-js-file'; console.log(a);`,
-    });
-
-    host.replaceInFile(
-      'tsconfig.json',
-      '"target": "es5"',
-      '"target": "es5", "allowJs": true',
-    );
-
-    const run = await architect.scheduleTarget(targetSpec);
-    const output = await run.result as BrowserBuilderOutput;
-    expect(output.success).toBe(true);
-
-    const content = virtualFs.fileBufferToString(
-      await host.read(join(normalize(output.outputPath), 'main.js')).toPromise(),
-    );
-
-    expect(content).toContain('var a = 2');
-
-    await run.stop();
-  });
-
-  it('works with aot', async () => {
-    host.writeMultipleFiles({
-      'src/my-js-file.js': `console.log(1); export const a = 2;`,
-      'src/main.ts': `import { a } from './my-js-file'; console.log(a);`,
-    });
-
-    host.replaceInFile(
-      'tsconfig.json',
-      '"target": "es5"',
-      '"target": "es5", "allowJs": true',
-    );
-
-    const overrides = { aot: true };
-
-    const run = await architect.scheduleTarget(targetSpec, overrides);
-    const output = await run.result as BrowserBuilderOutput;
-    expect(output.success).toBe(true);
-
-    const content = virtualFs.fileBufferToString(
-      await host.read(join(normalize(output.outputPath), 'main.js')).toPromise(),
-    );
-
-    expect(content).toContain('var a = 2');
-
-    await run.stop();
-  });
-
-  it('works with watch', async () => {
-    host.writeMultipleFiles({
-      'src/my-js-file.js': `console.log(1); export const a = 2;`,
-      'src/main.ts': `import { a } from './my-js-file'; console.log(a);`,
-    });
-
-    host.replaceInFile(
-      'tsconfig.json',
-      '"target": "es5"',
-      '"target": "es5", "allowJs": true',
-    );
-
-    const overrides = { watch: true };
-
-    let buildCount = 1;
-    const run = await architect.scheduleTarget(targetSpec, overrides);
-
-    await run.output.pipe(
-      tap((output: BrowserBuilderOutput) => {
-        const path = relative(host.root(), join(normalize(output.outputPath), 'main.js'));
-        const content = virtualFs.fileBufferToString(
-          host.scopedSync().read(path),
-        );
-
-        switch (buildCount) {
-          case 1:
-            expect(content).toContain('var a = 2');
-            host.writeMultipleFiles({
-              'src/my-js-file.js': `console.log(1); export const a = 1;`,
-            });
-            break;
-          case 2:
-            expect(content).toContain('var a = 1');
-            break;
-        }
-
-        buildCount++;
-      }),
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      take(2),
-    ).toPromise();
-
-    await run.stop();
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts
index efff75627a83..58ed2248e4c9 100644
--- a/packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts
@@ -5,18 +5,24 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { join, virtualFs } from '@angular-devkit/core';
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { join, normalize, relative, virtualFs } from '@angular-devkit/core';
 import { take, tap } from 'rxjs/operators';
-import { browserTargetSpec, host, outputPath } from '../utils';
+import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { createArchitect, host } from '../utils';
 
 
 describe('Browser Builder allow js', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  const targetSpec = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
-  it('works', (done) => {
+  it('works', async () => {
     host.writeMultipleFiles({
       'src/my-js-file.js': `console.log(1); export const a = 2;`,
       'src/main.ts': `import { a } from './my-js-file'; console.log(a);`,
@@ -28,19 +34,20 @@ describe('Browser Builder allow js', () => {
       '"target": "es5", "allowJs": true',
     );
 
-    runTargetSpec(host, browserTargetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const content = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, 'main.js')),
-        );
+    const run = await architect.scheduleTarget(targetSpec);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
 
-        expect(content).toContain('var a = 2');
-      }),
-    ).toPromise().then(done, done.fail);
+    const content = virtualFs.fileBufferToString(
+      await host.read(join(normalize(output.outputPath), 'main.js')).toPromise(),
+    );
+
+    expect(content).toContain('var a = 2');
+
+    await run.stop();
   });
 
-  it('works with aot', (done) => {
+  it('works with aot', async () => {
     host.writeMultipleFiles({
       'src/my-js-file.js': `console.log(1); export const a = 2;`,
       'src/main.ts': `import { a } from './my-js-file'; console.log(a);`,
@@ -54,19 +61,20 @@ describe('Browser Builder allow js', () => {
 
     const overrides = { aot: true };
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const content = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, 'main.js')),
-        );
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
 
-        expect(content).toContain('var a = 2');
-      }),
-    ).toPromise().then(done, done.fail);
+    const content = virtualFs.fileBufferToString(
+      await host.read(join(normalize(output.outputPath), 'main.js')).toPromise(),
+    );
+
+    expect(content).toContain('var a = 2');
+
+    await run.stop();
   });
 
-  it('works with watch', (done) => {
+  it('works with watch', async () => {
     host.writeMultipleFiles({
       'src/my-js-file.js': `console.log(1); export const a = 2;`,
       'src/main.ts': `import { a } from './my-js-file'; console.log(a);`,
@@ -81,10 +89,13 @@ describe('Browser Builder allow js', () => {
     const overrides = { watch: true };
 
     let buildCount = 1;
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap(() => {
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+
+    await run.output.pipe(
+      tap((output: BrowserBuilderOutput) => {
+        const path = relative(host.root(), join(normalize(output.outputPath), 'main.js'));
         const content = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, 'main.js')),
+          host.scopedSync().read(path),
         );
 
         switch (buildCount) {
@@ -103,7 +114,8 @@ describe('Browser Builder allow js', () => {
       }),
       tap((buildEvent) => expect(buildEvent.success).toBe(true)),
       take(2),
-    ).toPromise().then(done, done.fail);
-  });
+    ).toPromise();
 
+    await run.stop();
+  });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/aot2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/aot2_spec_large.ts
deleted file mode 100644
index a91d72c1718f..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/aot2_spec_large.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
-import { BrowserBuilderOutput } from '../../src/browser/index2';
-import { browserTargetSpec, createArchitect, host } from '../utils';
-
-
-describe('Browser Builder AOT', () => {
-  const targetSpec = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('works', async () => {
-    const overrides = { aot: true };
-
-    const run = await architect.scheduleTarget(targetSpec, overrides);
-    const output = await run.result as BrowserBuilderOutput;
-
-    expect(output.success).toBe(true);
-
-    const fileName = join(normalize(output.outputPath), 'main.js');
-    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
-    expect(content).toMatch(/platformBrowser.*bootstrapModuleFactory.*AppModuleNgFactory/);
-
-    await run.stop();
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
index 86259541d359..a91d72c1718f 100644
--- a/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
@@ -6,28 +6,36 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import { Architect } from '@angular-devkit/architect/src/index2';
 import { runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { browserTargetSpec, createArchitect, host } from '../utils';
 
 
 describe('Browser Builder AOT', () => {
-  const outputPath = normalize('dist');
+  const targetSpec = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
-  it('works', (done) => {
+  it('works', async () => {
     const overrides = { aot: true };
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'main.js');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        expect(content).toMatch(/platformBrowser.*bootstrapModuleFactory.*AppModuleNgFactory/);
-      }),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = await run.result as BrowserBuilderOutput;
+
+    expect(output.success).toBe(true);
+
+    const fileName = join(normalize(output.outputPath), 'main.js');
+    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content).toMatch(/platformBrowser.*bootstrapModuleFactory.*AppModuleNgFactory/);
+
+    await run.stop();
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/assets2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/assets2_spec_large.ts
deleted file mode 100644
index 43192335cc46..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/assets2_spec_large.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { normalize, virtualFs } from '@angular-devkit/core';
-import { toArray } from 'rxjs/operators';
-import { BrowserBuilderOutput } from '../../src/browser/index2';
-import { createArchitect, host } from '../utils';
-
-
-describe('Browser Builder assets', () => {
-  const targetSpec = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('works', async () => {
-    const assets: { [path: string]: string } = {
-      './src/folder/.gitkeep': '',
-      './src/string-file-asset.txt': 'string-file-asset.txt',
-      './src/string-folder-asset/file.txt': 'string-folder-asset.txt',
-      './src/glob-asset.txt': 'glob-asset.txt',
-      './src/folder/folder-asset.txt': 'folder-asset.txt',
-      './src/output-asset.txt': 'output-asset.txt',
-    };
-    const matches: { [path: string]: string } = {
-      './dist/string-file-asset.txt': 'string-file-asset.txt',
-      './dist/string-folder-asset/file.txt': 'string-folder-asset.txt',
-      './dist/glob-asset.txt': 'glob-asset.txt',
-      './dist/folder/folder-asset.txt': 'folder-asset.txt',
-      './dist/output-folder/output-asset.txt': 'output-asset.txt',
-    };
-    host.writeMultipleFiles(assets);
-
-    const overrides = {
-      assets: [
-        'src/string-file-asset.txt',
-        'src/string-folder-asset',
-        { glob: 'glob-asset.txt', input: 'src/', output: '/' },
-        { glob: 'glob-asset.txt', input: 'src/', output: '/' },
-        { glob: 'output-asset.txt', input: 'src/', output: '/output-folder' },
-        { glob: '**/*', input: 'src/folder', output: '/folder' },
-      ],
-    };
-
-    const run = await architect.scheduleTarget(targetSpec, overrides);
-    const output = await run.result as BrowserBuilderOutput;
-    expect(output.success).toBe(true);
-
-    // Assets we expect should be there.
-    Object.keys(matches).forEach(fileName => {
-      const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-      expect(content).toMatch(matches[fileName]);
-    });
-    // .gitkeep should not be there.
-    expect(host.scopedSync().exists(normalize('./dist/folder/.gitkeep'))).toBe(false);
-
-    await run.stop();
-  });
-
-  it('works with ignored patterns', async () => {
-    const assets: { [path: string]: string } = {
-      './src/folder/.gitkeep': '',
-      './src/folder/asset-ignored.txt': '',
-      './src/folder/asset.txt': '',
-    };
-
-    host.writeMultipleFiles(assets);
-
-    const overrides = {
-      assets: [
-        {
-          glob: '**/*',
-          ignore: ['asset-ignored.txt'],
-          input: 'src/folder',
-          output: '/folder',
-        },
-      ],
-    };
-
-    const run = await architect.scheduleTarget(targetSpec, overrides);
-    const output = await run.result as BrowserBuilderOutput;
-    expect(output.success).toBe(true);
-
-    expect(host.scopedSync().exists(normalize('./dist/folder/asset.txt'))).toBe(true);
-    expect(host.scopedSync().exists(normalize('./dist/folder/asset-ignored.txt'))).toBe(false);
-    expect(host.scopedSync().exists(normalize('./dist/folder/.gitkeep'))).toBe(false);
-
-    await run.stop();
-  });
-
-  it('fails with non-absolute output path', async () => {
-    const assets: { [path: string]: string } = {
-      './node_modules/some-package/node_modules-asset.txt': 'node_modules-asset.txt',
-    };
-    host.writeMultipleFiles(assets);
-    const overrides = {
-      assets: [{
-        glob: '**/*', input: '../node_modules/some-package/', output: '../temp',
-      }],
-    };
-
-    const run = await architect.scheduleTarget(targetSpec, overrides);
-    try {
-      await run.result;
-      expect('THE ABOVE LINE SHOULD THROW').toBe('');
-    } catch {}
-
-    // The node_modules folder must be deleted, otherwise code that tries to find the
-    // node_modules folder will hit this one and can fail.
-    host.scopedSync().delete(normalize('./node_modules'));
-
-    await run.stop();
-  });
-
-  it('fails with non-source root input path', async () => {
-    const assets: { [path: string]: string } = {
-      './node_modules/some-package/node_modules-asset.txt': 'node_modules-asset.txt',
-    };
-    host.writeMultipleFiles(assets);
-    const overrides = {
-      assets: ['not-source-root/file.txt'],
-    };
-
-    const run = await architect.scheduleTarget(targetSpec, overrides);
-    try {
-      await run.result;
-      expect('THE ABOVE LINE SHOULD THROW').toBe('');
-    } catch {}
-
-    // The node_modules folder must be deleted, otherwise code that tries to find the
-    // node_modules folder will hit this one and can fail.
-    host.scopedSync().delete(normalize('./node_modules'));
-
-    await run.stop();
-  });
-
-  it('still builds with empty asset array', async () => {
-    const overrides = {
-      assets: [],
-    };
-
-    const run = await architect.scheduleTarget(targetSpec, overrides);
-    const events = await run.output.pipe(toArray()).toPromise();
-    expect(events.length).toBe(1);
-
-    await run.stop();
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/assets_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/assets_spec_large.ts
index 8d7fee3205e7..43192335cc46 100644
--- a/packages/angular_devkit/build_angular/test/browser/assets_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/assets_spec_large.ts
@@ -6,17 +6,24 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { runTargetSpec } from '@angular-devkit/architect/testing';
+import { Architect } from '@angular-devkit/architect/src/index2';
 import { normalize, virtualFs } from '@angular-devkit/core';
-import { tap, toArray } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { toArray } from 'rxjs/operators';
+import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { createArchitect, host } from '../utils';
 
 
 describe('Browser Builder assets', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  const targetSpec = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  it('works', (done) => {
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
     const assets: { [path: string]: string } = {
       './src/folder/.gitkeep': '',
       './src/string-file-asset.txt': 'string-file-asset.txt',
@@ -45,21 +52,22 @@ describe('Browser Builder assets', () => {
       ],
     };
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        // Assets we expect should be there.
-        Object.keys(matches).forEach(fileName => {
-          const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-          expect(content).toMatch(matches[fileName]);
-        });
-        // .gitkeep should not be there.
-        expect(host.scopedSync().exists(normalize('./dist/folder/.gitkeep'))).toBe(false);
-      }),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+
+    // Assets we expect should be there.
+    Object.keys(matches).forEach(fileName => {
+      const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
+      expect(content).toMatch(matches[fileName]);
+    });
+    // .gitkeep should not be there.
+    expect(host.scopedSync().exists(normalize('./dist/folder/.gitkeep'))).toBe(false);
+
+    await run.stop();
   });
 
-  it('works with ignored patterns', (done) => {
+  it('works with ignored patterns', async () => {
     const assets: { [path: string]: string } = {
       './src/folder/.gitkeep': '',
       './src/folder/asset-ignored.txt': '',
@@ -79,17 +87,18 @@ describe('Browser Builder assets', () => {
       ],
     };
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        expect(host.scopedSync().exists(normalize('./dist/folder/asset.txt'))).toBe(true);
-        expect(host.scopedSync().exists(normalize('./dist/folder/asset-ignored.txt'))).toBe(false);
-        expect(host.scopedSync().exists(normalize('./dist/folder/.gitkeep'))).toBe(false);
-      }),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+
+    expect(host.scopedSync().exists(normalize('./dist/folder/asset.txt'))).toBe(true);
+    expect(host.scopedSync().exists(normalize('./dist/folder/asset-ignored.txt'))).toBe(false);
+    expect(host.scopedSync().exists(normalize('./dist/folder/.gitkeep'))).toBe(false);
+
+    await run.stop();
   });
 
-  it('fails with non-absolute output path', (done) => {
+  it('fails with non-absolute output path', async () => {
     const assets: { [path: string]: string } = {
       './node_modules/some-package/node_modules-asset.txt': 'node_modules-asset.txt',
     };
@@ -100,15 +109,20 @@ describe('Browser Builder assets', () => {
       }],
     };
 
-    runTargetSpec(host, browserTargetSpec, overrides)
-      .subscribe(undefined, () => done(), done.fail);
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    try {
+      await run.result;
+      expect('THE ABOVE LINE SHOULD THROW').toBe('');
+    } catch {}
 
     // The node_modules folder must be deleted, otherwise code that tries to find the
     // node_modules folder will hit this one and can fail.
     host.scopedSync().delete(normalize('./node_modules'));
+
+    await run.stop();
   });
 
-  it('fails with non-source root input path', (done) => {
+  it('fails with non-source root input path', async () => {
     const assets: { [path: string]: string } = {
       './node_modules/some-package/node_modules-asset.txt': 'node_modules-asset.txt',
     };
@@ -117,22 +131,28 @@ describe('Browser Builder assets', () => {
       assets: ['not-source-root/file.txt'],
     };
 
-    runTargetSpec(host, browserTargetSpec, overrides)
-      .subscribe(undefined, () => done(), done.fail);
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    try {
+      await run.result;
+      expect('THE ABOVE LINE SHOULD THROW').toBe('');
+    } catch {}
 
     // The node_modules folder must be deleted, otherwise code that tries to find the
     // node_modules folder will hit this one and can fail.
     host.scopedSync().delete(normalize('./node_modules'));
+
+    await run.stop();
   });
 
-  it('still builds with empty asset array', (done) => {
+  it('still builds with empty asset array', async () => {
     const overrides = {
       assets: [],
     };
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      toArray(),
-      tap((buildEvents) => expect(buildEvents.length).toBe(1)),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const events = await run.output.pipe(toArray()).toPromise();
+    expect(events.length).toBe(1);
+
+    await run.stop();
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/base-href2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/base-href2_spec_large.ts
deleted file mode 100644
index 59a57a6ae326..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/base-href2_spec_large.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { join, normalize, tags, virtualFs } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
-import { BrowserBuilderOutput } from '../../src/browser/index2';
-import { browserTargetSpec, createArchitect, host } from '../utils';
-
-
-describe('Browser Builder base href', () => {
-  const targetSpec = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('works', async () => {
-    host.writeMultipleFiles({
-      'src/my-js-file.js': `console.log(1); export const a = 2;`,
-      'src/main.ts': `import { a } from './my-js-file'; console.log(a);`,
-    });
-
-    const overrides = { baseHref: '/myUrl' };
-    const run = await architect.scheduleTarget(targetSpec, overrides);
-    const output = await run.result as BrowserBuilderOutput;
-
-    expect(output.success).toBe(true);
-    const fileName = join(normalize(output.outputPath), 'index.html');
-    const content = virtualFs.fileBufferToString(await host.read(fileName).toPromise());
-    expect(content).toMatch(/<base href="\/myUrl">/);
-
-    await run.stop();
-  });
-
-  it('should insert base href in the the correct position', async () => {
-    host.writeMultipleFiles({
-      'src/index.html': tags.oneLine`
-        <html><head><meta charset="UTF-8"></head>
-        <body><app-root></app-root></body></html>
-      `,
-    });
-
-    const overrides = { baseHref: '/myUrl' };
-    const run = await architect.scheduleTarget(targetSpec, overrides);
-    const output = await run.result as BrowserBuilderOutput;
-    expect(output.success).toBe(true);
-    const fileName = join(normalize(output.outputPath), 'index.html');
-    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
-    expect(content).toContain('<head><base href="/myUrl"><meta charset="UTF-8"></head>');
-    await run.stop();
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/base-href_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/base-href_spec_large.ts
index c70912e862dc..59a57a6ae326 100644
--- a/packages/angular_devkit/build_angular/test/browser/base-href_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/base-href_spec_large.ts
@@ -6,33 +6,57 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import { Architect } from '@angular-devkit/architect/src/index2';
 import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { join, normalize, virtualFs } from '@angular-devkit/core';
+import { join, normalize, tags, virtualFs } from '@angular-devkit/core';
 import { tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { browserTargetSpec, createArchitect, host } from '../utils';
 
 
 describe('Browser Builder base href', () => {
-  const outputPath = normalize('dist');
+  const targetSpec = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
-  it('works', (done) => {
+  it('works', async () => {
     host.writeMultipleFiles({
       'src/my-js-file.js': `console.log(1); export const a = 2;`,
       'src/main.ts': `import { a } from './my-js-file'; console.log(a);`,
     });
 
     const overrides = { baseHref: '/myUrl' };
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = await run.result as BrowserBuilderOutput;
+
+    expect(output.success).toBe(true);
+    const fileName = join(normalize(output.outputPath), 'index.html');
+    const content = virtualFs.fileBufferToString(await host.read(fileName).toPromise());
+    expect(content).toMatch(/<base href="\/myUrl">/);
+
+    await run.stop();
+  });
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'index.html');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(fileName));
-        expect(content).toMatch(/<base href="\/myUrl">/);
-      }),
-    ).toPromise().then(done, done.fail);
+  it('should insert base href in the the correct position', async () => {
+    host.writeMultipleFiles({
+      'src/index.html': tags.oneLine`
+        <html><head><meta charset="UTF-8"></head>
+        <body><app-root></app-root></body></html>
+      `,
+    });
+
+    const overrides = { baseHref: '/myUrl' };
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+    const fileName = join(normalize(output.outputPath), 'index.html');
+    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content).toContain('<head><base href="/myUrl"><meta charset="UTF-8"></head>');
+    await run.stop();
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/build-optimizer2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/build-optimizer2_spec_large.ts
deleted file mode 100644
index bc70764bfddc..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/build-optimizer2_spec_large.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { join, normalize } from '@angular-devkit/core';
-import { BrowserBuilderOutput } from '../../src/browser/index2';
-import { browserBuild, createArchitect, host } from '../utils';
-
-
-describe('Browser Builder build optimizer', () => {
-  const targetSpec = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('works', async () => {
-    const overrides = { aot: true, buildOptimizer: true };
-    const { files } = await browserBuild(architect, host, targetSpec, overrides);
-    expect(await files['main.js']).not.toMatch(/\.decorators =/);
-  });
-
-  it('fails if AOT is disabled', async () => {
-    const overrides = { aot: false, buildOptimizer: true };
-    const run = await architect.scheduleTarget(targetSpec, overrides);
-
-    try {
-      await run.result;
-      expect('THE ABOVE LINE SHOULD THROW').toBe('');
-    } catch {}
-  });
-
-  it('reduces bundle size', async () => {
-    const noBoOverrides = { aot: true, optimization: true, vendorChunk: false };
-    const boOverrides = { ...noBoOverrides, buildOptimizer: true };
-
-    const run = await architect.scheduleTarget(targetSpec, noBoOverrides);
-    const output = await run.result as BrowserBuilderOutput;
-
-    expect(output.success).toBe(true);
-
-    const noBoStats = await host.stat(join(normalize(output.outputPath), 'main.js')).toPromise();
-    if (!noBoStats) {
-      throw new Error('Main file has no stats');
-    }
-    const noBoSize = noBoStats.size;
-    await run.stop();
-
-    const boRun = await architect.scheduleTarget(targetSpec, boOverrides);
-    const boOutput = await run.result as BrowserBuilderOutput;
-    expect(boOutput.success).toBe(true);
-
-    const boStats = await host.stat(join(normalize(output.outputPath), 'main.js')).toPromise();
-    if (!boStats) {
-      throw new Error('Main file has no stats');
-    }
-    const boSize = boStats.size;
-    await boRun.stop();
-
-    const sizeDiff = Math.round(((boSize - noBoSize) / noBoSize) * 10000) / 100;
-    if (sizeDiff > -1 && sizeDiff < 0) {
-      throw new Error('Total size difference is too small, '
-        + 'build optimizer does not seem to have made any optimizations.');
-    }
-
-    if (sizeDiff > 1) {
-      throw new Error('Total size difference is positive, '
-        + 'build optimizer made the bundle bigger.');
-    }
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/build-optimizer_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/build-optimizer_spec_large.ts
index 4e1f1a0aca9e..bc70764bfddc 100644
--- a/packages/angular_devkit/build_angular/test/browser/build-optimizer_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/build-optimizer_spec_large.ts
@@ -5,74 +5,74 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { DefaultTimeout, runTargetSpec } from '@angular-devkit/architect/testing';
-import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { concatMap, tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { join, normalize } from '@angular-devkit/core';
+import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { browserBuild, createArchitect, host } from '../utils';
 
 
 describe('Browser Builder build optimizer', () => {
-  const outputPath = normalize('dist');
-  const fileName = join(outputPath, 'main.js');
+  const targetSpec = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
-  it('works', (done) => {
+  it('works', async () => {
     const overrides = { aot: true, buildOptimizer: true };
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 3).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        expect(content).not.toMatch(/\.decorators =/);
-      }),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, targetSpec, overrides);
+    expect(await files['main.js']).not.toMatch(/\.decorators =/);
   });
 
-  it('fails if AOT is disabled', (done) => {
+  it('fails if AOT is disabled', async () => {
     const overrides = { aot: false, buildOptimizer: true };
-    runTargetSpec(host, browserTargetSpec, overrides)
-      .toPromise().then(() => done.fail(), () => done());
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+
+    try {
+      await run.result;
+      expect('THE ABOVE LINE SHOULD THROW').toBe('');
+    } catch {}
   });
 
-  it('reduces bundle size', (done) => {
+  it('reduces bundle size', async () => {
     const noBoOverrides = { aot: true, optimization: true, vendorChunk: false };
     const boOverrides = { ...noBoOverrides, buildOptimizer: true };
 
-    let noBoSize: number;
-    let boSize: number;
+    const run = await architect.scheduleTarget(targetSpec, noBoOverrides);
+    const output = await run.result as BrowserBuilderOutput;
+
+    expect(output.success).toBe(true);
+
+    const noBoStats = await host.stat(join(normalize(output.outputPath), 'main.js')).toPromise();
+    if (!noBoStats) {
+      throw new Error('Main file has no stats');
+    }
+    const noBoSize = noBoStats.size;
+    await run.stop();
+
+    const boRun = await architect.scheduleTarget(targetSpec, boOverrides);
+    const boOutput = await run.result as BrowserBuilderOutput;
+    expect(boOutput.success).toBe(true);
+
+    const boStats = await host.stat(join(normalize(output.outputPath), 'main.js')).toPromise();
+    if (!boStats) {
+      throw new Error('Main file has no stats');
+    }
+    const boSize = boStats.size;
+    await boRun.stop();
 
-    runTargetSpec(host, browserTargetSpec, noBoOverrides, DefaultTimeout * 3).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const noBoStats = host.scopedSync().stat(normalize(fileName));
-        if (!noBoStats) {
-          throw new Error('Main file has no stats');
-        }
-        noBoSize = noBoStats.size;
-      }),
-      concatMap(() => runTargetSpec(host, browserTargetSpec, boOverrides, DefaultTimeout * 3)),
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const boStats = host.scopedSync().stat(normalize(fileName));
-        if (!boStats) {
-          throw new Error('Main file has no stats');
-        }
-        boSize = boStats.size;
-      }),
-      tap(() => {
-        const sizeDiff = Math.round(((boSize - noBoSize) / noBoSize) * 10000) / 100;
-        if (sizeDiff > -1 && sizeDiff < 0) {
-          throw new Error('Total size difference is too small, '
-            + 'build optimizer does not seem to have made any optimizations.');
-        }
+    const sizeDiff = Math.round(((boSize - noBoSize) / noBoSize) * 10000) / 100;
+    if (sizeDiff > -1 && sizeDiff < 0) {
+      throw new Error('Total size difference is too small, '
+        + 'build optimizer does not seem to have made any optimizations.');
+    }
 
-        if (sizeDiff > 1) {
-          throw new Error('Total size difference is positive, '
-            + 'build optimizer made the bundle bigger.');
-        }
-      }),
-    ).toPromise().then(done, done.fail);
+    if (sizeDiff > 1) {
+      throw new Error('Total size difference is positive, '
+        + 'build optimizer made the bundle bigger.');
+    }
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/bundle-budgets2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/bundle-budgets2_spec_large.ts
deleted file mode 100644
index 6f5c4948337a..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/bundle-budgets2_spec_large.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { logging } from '@angular-devkit/core';
-import { createArchitect, host } from '../utils';
-
-
-describe('Browser Builder bundle budgets', () => {
-  const targetSpec = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('accepts valid bundles', async () => {
-    const overrides = {
-      optimization: true,
-      budgets: [{ type: 'allScript', maximumError: '100mb' }],
-    };
-    const logger = new logging.Logger('');
-    const logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
-
-    const run = await architect.scheduleTarget(targetSpec, overrides, { logger });
-    const output = await run.result;
-    expect(output.success).toBe(true);
-    expect(logs.join()).not.toContain('WARNING');
-    await run.stop();
-  });
-
-  it('shows errors', async () => {
-    const overrides = {
-      optimization: true,
-      budgets: [{ type: 'all', maximumError: '100b' }],
-    };
-
-    const run = await architect.scheduleTarget(targetSpec, overrides);
-    const output = await run.result;
-    expect(output.success).toBe(false);
-    await run.stop();
-  });
-
-  it('shows warnings', async () => {
-    const overrides = {
-      optimization: true,
-      budgets: [{ type: 'all', minimumWarning: '100mb' }],
-    };
-    const logger = new logging.Logger('');
-    const logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
-
-    const run = await architect.scheduleTarget(targetSpec, overrides, { logger });
-    const output = await run.result;
-    expect(output.success).toBe(true);
-    expect(logs.join()).toContain('WARNING');
-    await run.stop();
-  });
-
-  describe(`should ignore '.map' files`, () => {
-    it(`when 'intial' budget`, async () => {
-      const overrides = {
-        optimization: true,
-        budgets: [{ type: 'initial', maximumError: '1mb' }],
-      };
-
-      const run = await architect.scheduleTarget(targetSpec, overrides);
-      const output = await run.result;
-      expect(output.success).toBe(true);
-      await run.stop();
-    });
-
-    it(`when 'all' budget`, async () => {
-      const overrides = {
-        optimization: true,
-        budgets: [{ type: 'all', maximumError: '1mb' }],
-      };
-
-      const run = await architect.scheduleTarget(targetSpec, overrides);
-      const output = await run.result;
-      expect(output.success).toBe(true);
-      await run.stop();
-    });
-
-    it(`when 'any' budget`, async () => {
-      const overrides = {
-        optimization: true,
-        budgets: [{ type: 'any', maximumError: '1mb' }],
-      };
-
-      const run = await architect.scheduleTarget(targetSpec, overrides);
-      const output = await run.result;
-      expect(output.success).toBe(true);
-      await run.stop();
-    });
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/bundle-budgets_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/bundle-budgets_spec_large.ts
index 56eb019a5e79..6f5c4948337a 100644
--- a/packages/angular_devkit/build_angular/test/browser/bundle-budgets_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/bundle-budgets_spec_large.ts
@@ -5,88 +5,100 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { DefaultTimeout, TestLogger, runTargetSpec } from '@angular-devkit/architect/testing';
-import { tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { logging } from '@angular-devkit/core';
+import { createArchitect, host } from '../utils';
 
 
 describe('Browser Builder bundle budgets', () => {
+  const targetSpec = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
-  it('accepts valid bundles', (done) => {
+  it('accepts valid bundles', async () => {
     const overrides = {
       optimization: true,
       budgets: [{ type: 'allScript', maximumError: '100mb' }],
     };
-
-    const logger = new TestLogger('rebuild-type-errors');
-
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 2, logger).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => expect(logger.includes('WARNING')).toBe(false)),
-    ).toPromise().then(done, done.fail);
+    const logger = new logging.Logger('');
+    const logs: string[] = [];
+    logger.subscribe(e => logs.push(e.message));
+
+    const run = await architect.scheduleTarget(targetSpec, overrides, { logger });
+    const output = await run.result;
+    expect(output.success).toBe(true);
+    expect(logs.join()).not.toContain('WARNING');
+    await run.stop();
   });
 
-  it('shows errors', (done) => {
+  it('shows errors', async () => {
     const overrides = {
       optimization: true,
       budgets: [{ type: 'all', maximumError: '100b' }],
     };
 
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 2).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(false)),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = await run.result;
+    expect(output.success).toBe(false);
+    await run.stop();
   });
 
-  it('shows warnings', (done) => {
+  it('shows warnings', async () => {
     const overrides = {
       optimization: true,
       budgets: [{ type: 'all', minimumWarning: '100mb' }],
     };
-
-    const logger = new TestLogger('rebuild-type-errors');
-
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 2, logger).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => expect(logger.includes('WARNING')).toBe(true)),
-    ).toPromise().then(done, done.fail);
+    const logger = new logging.Logger('');
+    const logs: string[] = [];
+    logger.subscribe(e => logs.push(e.message));
+
+    const run = await architect.scheduleTarget(targetSpec, overrides, { logger });
+    const output = await run.result;
+    expect(output.success).toBe(true);
+    expect(logs.join()).toContain('WARNING');
+    await run.stop();
   });
 
   describe(`should ignore '.map' files`, () => {
-    it(`when 'intial' budget`, (done) => {
+    it(`when 'intial' budget`, async () => {
       const overrides = {
         optimization: true,
         budgets: [{ type: 'initial', maximumError: '1mb' }],
       };
 
-      runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 2).pipe(
-        tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      ).toPromise().then(done, done.fail);
+      const run = await architect.scheduleTarget(targetSpec, overrides);
+      const output = await run.result;
+      expect(output.success).toBe(true);
+      await run.stop();
     });
 
-    it(`when 'all' budget`, (done) => {
+    it(`when 'all' budget`, async () => {
       const overrides = {
         optimization: true,
         budgets: [{ type: 'all', maximumError: '1mb' }],
       };
 
-      runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 2).pipe(
-        tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      ).toPromise().then(done, done.fail);
+      const run = await architect.scheduleTarget(targetSpec, overrides);
+      const output = await run.result;
+      expect(output.success).toBe(true);
+      await run.stop();
     });
 
-    it(`when 'any' budget`, (done) => {
+    it(`when 'any' budget`, async () => {
       const overrides = {
         optimization: true,
         budgets: [{ type: 'any', maximumError: '1mb' }],
       };
 
-      runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 2).pipe(
-        tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      ).toPromise().then(done, done.fail);
+      const run = await architect.scheduleTarget(targetSpec, overrides);
+      const output = await run.result;
+      expect(output.success).toBe(true);
+      await run.stop();
     });
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/circular-dependency2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/circular-dependency2_spec_large.ts
deleted file mode 100644
index 5f70b43fa04d..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/circular-dependency2_spec_large.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { logging } from '@angular-devkit/core';
-import { createArchitect, host } from '../utils';
-
-
-describe('Browser Builder circular dependency detection', () => {
-  const targetSpec = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('works', async () => {
-    host.appendToFile('src/app/app.component.ts',
-      `import { AppModule } from './app.module'; console.log(AppModule);`);
-
-    const overrides = { baseHref: '/myUrl' };
-    const logger = new logging.Logger('');
-    const logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
-
-    const run = await architect.scheduleTarget(targetSpec, overrides, { logger });
-    const output = await run.result;
-    expect(output.success).toBe(true);
-    expect(logs.join()).toContain('Circular dependency detected');
-    await run.stop();
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/circular-dependency_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/circular-dependency_spec_large.ts
index 7b93b85b7fb6..5f70b43fa04d 100644
--- a/packages/angular_devkit/build_angular/test/browser/circular-dependency_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/circular-dependency_spec_large.ts
@@ -5,26 +5,34 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { DefaultTimeout, TestLogger, runTargetSpec } from '@angular-devkit/architect/testing';
-import { tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { logging } from '@angular-devkit/core';
+import { createArchitect, host } from '../utils';
 
 
 describe('Browser Builder circular dependency detection', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  const targetSpec = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
-  it('works', (done) => {
+  it('works', async () => {
     host.appendToFile('src/app/app.component.ts',
       `import { AppModule } from './app.module'; console.log(AppModule);`);
 
     const overrides = { baseHref: '/myUrl' };
-    const logger = new TestLogger('circular-dependencies');
+    const logger = new logging.Logger('');
+    const logs: string[] = [];
+    logger.subscribe(e => logs.push(e.message));
 
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout, logger).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => expect(logger.includes('Circular dependency detected')).toBe(true)),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(targetSpec, overrides, { logger });
+    const output = await run.result;
+    expect(output.success).toBe(true);
+    expect(logs.join()).toContain('Circular dependency detected');
+    await run.stop();
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/deploy-url2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/deploy-url2_spec_large.ts
deleted file mode 100644
index c985e12f3f21..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/deploy-url2_spec_large.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { BrowserBuilderOutput } from '../../src/browser/index2';
-import { createArchitect, host } from '../utils';
-
-
-describe('Browser Builder deploy url', () => {
-  const targetSpec = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('uses deploy url for bundles urls and runtime', async () => {
-    const overrides = { deployUrl: 'deployUrl/' };
-    const overrides2 = { deployUrl: 'http://example.com/some/path/' };
-
-    const run = await architect.scheduleTarget(targetSpec, overrides);
-    const output = await run.result as BrowserBuilderOutput;
-    expect(output.success).toBe(true);
-    expect(output.outputPath).not.toBeUndefined();
-    const outputPath = normalize(output.outputPath);
-
-    const fileName = join(outputPath, 'index.html');
-    const runtimeFileName = join(outputPath, 'runtime.js');
-    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
-    expect(content).toContain('deployUrl/main.js');
-    const runtimeContent = virtualFs.fileBufferToString(
-      await host.read(normalize(runtimeFileName)).toPromise(),
-    );
-    expect(runtimeContent).toContain('deployUrl/');
-
-    const run2 = await architect.scheduleTarget(targetSpec, overrides2);
-    const output2 = await run2.result as BrowserBuilderOutput;
-    expect(output2.outputPath).toEqual(outputPath);  // These should be the same.
-
-    const content2 = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
-    expect(content2).toContain('http://example.com/some/path/main.js');
-
-    await run.stop();
-    await run2.stop();
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/deploy-url_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/deploy-url_spec_large.ts
index f24dd02475b9..c985e12f3f21 100644
--- a/packages/angular_devkit/build_angular/test/browser/deploy-url_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/deploy-url_spec_large.ts
@@ -5,51 +5,49 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { runTargetSpec } from '@angular-devkit/architect/testing';
+import { Architect } from '@angular-devkit/architect/src/index2';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { concatMap, tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { createArchitect, host } from '../utils';
 
 
 describe('Browser Builder deploy url', () => {
-  const outputPath = normalize('dist');
-
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
-
-  it('uses deploy url for bundles urls', (done) => {
-    const overrides = { deployUrl: 'deployUrl/' };
+  const targetSpec = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'index.html');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        expect(content).toContain('deployUrl/main.js');
-      }),
-      concatMap(() => runTargetSpec(host, browserTargetSpec,
-        { deployUrl: 'http://example.com/some/path/' })),
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'index.html');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        expect(content).toContain('http://example.com/some/path/main.js');
-      }),
-    ).toPromise().then(done, done.fail);
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
   });
+  afterEach(async () => host.restore().toPromise());
 
-  it('uses deploy url for in webpack runtime', (done) => {
+  it('uses deploy url for bundles urls and runtime', async () => {
     const overrides = { deployUrl: 'deployUrl/' };
-
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'runtime.js');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        expect(content).toContain('deployUrl/');
-      }),
-    ).toPromise().then(done, done.fail);
+    const overrides2 = { deployUrl: 'http://example.com/some/path/' };
+
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+    expect(output.outputPath).not.toBeUndefined();
+    const outputPath = normalize(output.outputPath);
+
+    const fileName = join(outputPath, 'index.html');
+    const runtimeFileName = join(outputPath, 'runtime.js');
+    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content).toContain('deployUrl/main.js');
+    const runtimeContent = virtualFs.fileBufferToString(
+      await host.read(normalize(runtimeFileName)).toPromise(),
+    );
+    expect(runtimeContent).toContain('deployUrl/');
+
+    const run2 = await architect.scheduleTarget(targetSpec, overrides2);
+    const output2 = await run2.result as BrowserBuilderOutput;
+    expect(output2.outputPath).toEqual(outputPath);  // These should be the same.
+
+    const content2 = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content2).toContain('http://example.com/some/path/main.js');
+
+    await run.stop();
+    await run2.stop();
   });
-
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/errors2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/errors2_spec_large.ts
deleted file mode 100644
index 710d2e634d9e..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/errors2_spec_large.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { logging } from '@angular-devkit/core';
-import { createArchitect, host } from '../utils';
-
-
-describe('Browser Builder errors', () => {
-  const targetSpec = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('shows error when files are not part of the compilation', async () => {
-    host.replaceInFile('src/tsconfig.app.json', '"compilerOptions": {', `
-      "files": ["main.ts"],
-      "compilerOptions": {
-    `);
-    const logger = new logging.Logger('');
-    const logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
-
-    const run = await architect.scheduleTarget(targetSpec, {}, { logger });
-    const output = await run.result;
-    expect(output.success).toBe(false);
-    expect(logs.join()).toContain('polyfills.ts is missing from the TypeScript');
-    await run.stop();
-  });
-
-  it('shows TS syntax errors', async () => {
-    host.appendToFile('src/app/app.component.ts', ']]]');
-    const logger = new logging.Logger('');
-    const logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
-
-    const run = await architect.scheduleTarget(targetSpec, {}, { logger });
-    const output = await run.result;
-    expect(output.success).toBe(false);
-    expect(logs.join()).toContain('Declaration or statement expected');
-    await run.stop();
-  });
-
-  it('shows static analysis errors', async () => {
-    host.replaceInFile('src/app/app.component.ts', `'app-root'`, `(() => 'app-root')()`);
-    const logger = new logging.Logger('');
-    const logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
-
-    const run = await architect.scheduleTarget(targetSpec, { aot: true }, { logger });
-    const output = await run.result;
-    expect(output.success).toBe(false);
-    expect(logs.join()).toContain('Function expressions are not supported in');
-    await run.stop();
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/errors_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/errors_spec_large.ts
index f5093885eec6..710d2e634d9e 100644
--- a/packages/angular_devkit/build_angular/test/browser/errors_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/errors_spec_large.ts
@@ -6,52 +6,60 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { DefaultTimeout, TestLogger, runTargetSpec } from '@angular-devkit/architect/testing';
-import { tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { logging } from '@angular-devkit/core';
+import { createArchitect, host } from '../utils';
 
 
 describe('Browser Builder errors', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  const targetSpec = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  it('shows error when files are not part of the compilation', (done) => {
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('shows error when files are not part of the compilation', async () => {
     host.replaceInFile('src/tsconfig.app.json', '"compilerOptions": {', `
       "files": ["main.ts"],
       "compilerOptions": {
     `);
-    const logger = new TestLogger('errors-compilation');
-
-    runTargetSpec(host, browserTargetSpec, {}, DefaultTimeout, logger).pipe(
-      tap((buildEvent) => {
-        expect(buildEvent.success).toBe(false);
-        expect(logger.includes('polyfills.ts is missing from the TypeScript')).toBe(true);
-      }),
-    ).toPromise().then(done, done.fail);
+    const logger = new logging.Logger('');
+    const logs: string[] = [];
+    logger.subscribe(e => logs.push(e.message));
+
+    const run = await architect.scheduleTarget(targetSpec, {}, { logger });
+    const output = await run.result;
+    expect(output.success).toBe(false);
+    expect(logs.join()).toContain('polyfills.ts is missing from the TypeScript');
+    await run.stop();
   });
 
-  it('shows TS syntax errors', (done) => {
+  it('shows TS syntax errors', async () => {
     host.appendToFile('src/app/app.component.ts', ']]]');
-    const logger = new TestLogger('errors-syntax');
-
-    runTargetSpec(host, browserTargetSpec, {}, DefaultTimeout, logger).pipe(
-      tap((buildEvent) => {
-        expect(buildEvent.success).toBe(false);
-        expect(logger.includes('Declaration or statement expected.')).toBe(true);
-      }),
-    ).toPromise().then(done, done.fail);
+    const logger = new logging.Logger('');
+    const logs: string[] = [];
+    logger.subscribe(e => logs.push(e.message));
+
+    const run = await architect.scheduleTarget(targetSpec, {}, { logger });
+    const output = await run.result;
+    expect(output.success).toBe(false);
+    expect(logs.join()).toContain('Declaration or statement expected');
+    await run.stop();
   });
 
-  it('shows static analysis errors', (done) => {
+  it('shows static analysis errors', async () => {
     host.replaceInFile('src/app/app.component.ts', `'app-root'`, `(() => 'app-root')()`);
-    const logger = new TestLogger('errors-static');
-
-    runTargetSpec(host, browserTargetSpec, { aot: true }, DefaultTimeout, logger).pipe(
-      tap((buildEvent) => {
-        expect(buildEvent.success).toBe(false);
-        expect(logger.includes('Function expressions are not supported in')).toBe(true);
-      }),
-    ).toPromise().then(done, done.fail);
-  });
+    const logger = new logging.Logger('');
+    const logs: string[] = [];
+    logger.subscribe(e => logs.push(e.message));
 
+    const run = await architect.scheduleTarget(targetSpec, { aot: true }, { logger });
+    const output = await run.result;
+    expect(output.success).toBe(false);
+    expect(logs.join()).toContain('Function expressions are not supported in');
+    await run.stop();
+  });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/i18n2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/i18n2_spec_large.ts
deleted file mode 100644
index fe1d2aeb7306..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/i18n2_spec_large.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { BrowserBuilderOutput } from '../../src/browser/index2';
-import { createArchitect, host } from '../utils';
-
-
-describe('Browser Builder i18n', () => {
-  const emptyTranslationFile = `
-      <?xml version="1.0" encoding="UTF-8" ?>
-      <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-        <file source-language="en" datatype="plaintext" original="ng2.template">
-          <body>
-          </body>
-        </file>
-      </xliff>`;
-
-  const targetSpec = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('uses translations', async () => {
-    host.writeMultipleFiles({
-      'src/locale/messages.fr.xlf': `
-      <?xml version="1.0" encoding="UTF-8" ?>
-      <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-      <file source-language="en" datatype="plaintext" original="ng2.template">
-      <body>
-      <trans-unit id="8def8481e91291a52f9baa31cbdb313e6a6ca02b" datatype="html">
-      <source>Hello i18n!</source>
-      <target>Bonjour i18n!</target>
-      <note priority="1" from="description">An introduction header for this sample</note>
-      </trans-unit>
-      </body>
-      </file>
-      </xliff>
-      `,
-    });
-
-    host.appendToFile('src/app/app.component.html',
-      '<h1 i18n="An introduction header for this sample">Hello i18n!</h1>');
-
-    const overrides = {
-      aot: true,
-      i18nFile: 'src/locale/messages.fr.xlf',
-      i18nFormat: 'true',
-      i18nLocale: 'fr',
-    };
-
-    const run = await architect.scheduleTarget(targetSpec, overrides);
-    const output = await run.result as BrowserBuilderOutput;
-    expect(output.success).toBe(true);
-    const outputPath = output.outputPath;
-    const fileName = join(normalize(outputPath), 'main.js');
-    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
-    expect(content).toMatch(/Bonjour i18n!/);
-
-    await run.stop();
-  });
-
-  it('ignores missing translations', async () => {
-    const overrides = {
-      aot: true,
-      i18nFile: 'src/locale/messages.fr.xlf',
-      i18nFormat: 'true',
-      i18nLocale: 'fr',
-      i18nMissingTranslation: 'ignore',
-    };
-
-    host.writeMultipleFiles({ 'src/locale/messages.fr.xlf': emptyTranslationFile });
-    host.appendToFile('src/app/app.component.html', '<p i18n>Other content</p>');
-
-    const run = await architect.scheduleTarget(targetSpec, overrides);
-    const output = await run.result as BrowserBuilderOutput;
-    expect(output.success).toBe(true);
-    const outputPath = output.outputPath;
-    const fileName = join(normalize(outputPath), 'main.js');
-    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
-    expect(content).toMatch(/Other content/);
-
-    await run.stop();
-  });
-
-  it('reports errors for missing translations', async () => {
-    const overrides = {
-      aot: true,
-      i18nFile: 'src/locale/messages.fr.xlf',
-      i18nFormat: 'true',
-      i18nLocale: 'fr',
-      i18nMissingTranslation: 'error',
-    };
-
-    host.writeMultipleFiles({ 'src/locale/messages.fr.xlf': emptyTranslationFile });
-    host.appendToFile('src/app/app.component.html', '<p i18n>Other content</p>');
-
-    const run = await architect.scheduleTarget(targetSpec, overrides);
-    const output = await run.result as BrowserBuilderOutput;
-    expect(output.success).toBe(false);
-
-    await run.stop();
-  });
-
-  it('register locales', async () => {
-    const overrides = { aot: true, i18nLocale: 'fr_FR' };
-
-    const run = await architect.scheduleTarget(targetSpec, overrides);
-    const output = await run.result as BrowserBuilderOutput;
-    expect(output.success).toBe(true);
-    const outputPath = output.outputPath;
-    const fileName = join(normalize(outputPath), 'main.js');
-    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
-    expect(content).toMatch(/registerLocaleData/);
-    expect(content).toMatch(/angular_common_locales_fr/);
-
-    await run.stop();
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/i18n_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/i18n_spec_large.ts
index ee8e6f1271e4..fe1d2aeb7306 100644
--- a/packages/angular_devkit/build_angular/test/browser/i18n_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/i18n_spec_large.ts
@@ -5,15 +5,13 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { runTargetSpec } from '@angular-devkit/architect/testing';
+import { Architect } from '@angular-devkit/architect/src/index2';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { createArchitect, host } from '../utils';
 
 
 describe('Browser Builder i18n', () => {
-  const outputPath = normalize('dist');
   const emptyTranslationFile = `
       <?xml version="1.0" encoding="UTF-8" ?>
       <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
@@ -23,10 +21,16 @@ describe('Browser Builder i18n', () => {
         </file>
       </xliff>`;
 
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  const targetSpec = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
-  it('uses translations', (done) => {
+  it('uses translations', async () => {
     host.writeMultipleFiles({
       'src/locale/messages.fr.xlf': `
       <?xml version="1.0" encoding="UTF-8" ?>
@@ -54,17 +58,18 @@ describe('Browser Builder i18n', () => {
       i18nLocale: 'fr',
     };
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'main.js');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        expect(content).toMatch(/Bonjour i18n!/);
-      }),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+    const outputPath = output.outputPath;
+    const fileName = join(normalize(outputPath), 'main.js');
+    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content).toMatch(/Bonjour i18n!/);
+
+    await run.stop();
   });
 
-  it('ignores missing translations', (done) => {
+  it('ignores missing translations', async () => {
     const overrides = {
       aot: true,
       i18nFile: 'src/locale/messages.fr.xlf',
@@ -76,17 +81,18 @@ describe('Browser Builder i18n', () => {
     host.writeMultipleFiles({ 'src/locale/messages.fr.xlf': emptyTranslationFile });
     host.appendToFile('src/app/app.component.html', '<p i18n>Other content</p>');
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'main.js');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        expect(content).toMatch(/Other content/);
-      }),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+    const outputPath = output.outputPath;
+    const fileName = join(normalize(outputPath), 'main.js');
+    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content).toMatch(/Other content/);
+
+    await run.stop();
   });
 
-  it('reports errors for missing translations', (done) => {
+  it('reports errors for missing translations', async () => {
     const overrides = {
       aot: true,
       i18nFile: 'src/locale/messages.fr.xlf',
@@ -98,22 +104,25 @@ describe('Browser Builder i18n', () => {
     host.writeMultipleFiles({ 'src/locale/messages.fr.xlf': emptyTranslationFile });
     host.appendToFile('src/app/app.component.html', '<p i18n>Other content</p>');
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(false)),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(false);
+
+    await run.stop();
   });
 
-  it('register locales', (done) => {
+  it('register locales', async () => {
     const overrides = { aot: true, i18nLocale: 'fr_FR' };
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'main.js');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        expect(content).toMatch(/registerLocaleData/);
-        expect(content).toMatch(/angular_common_locales_fr/);
-      }),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+    const outputPath = output.outputPath;
+    const fileName = join(normalize(outputPath), 'main.js');
+    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content).toMatch(/registerLocaleData/);
+    expect(content).toMatch(/angular_common_locales_fr/);
+
+    await run.stop();
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/index2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/index2_spec_large.ts
deleted file mode 100644
index cc5ddd313b90..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/index2_spec_large.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { join, normalize, tags, virtualFs } from '@angular-devkit/core';
-import { BrowserBuilderOutput } from '../../src/browser/index2';
-import { createArchitect, host } from '../utils';
-
-
-describe('Browser Builder works with BOM index.html', () => {
-  const targetSpec = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('works with UTF-8 BOM', async () => {
-    host.writeMultipleFiles({
-      'src/index.html': Buffer.from(
-        '\ufeff<html><head><base href="/"></head><body><app-root></app-root></body></html>',
-        'utf8'),
-    });
-
-    const run = await architect.scheduleTarget(targetSpec);
-    const output = await run.result as BrowserBuilderOutput;
-    expect(output.success).toBe(true);
-    const fileName = join(normalize(output.outputPath), 'index.html');
-    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
-    expect(content).toBe(
-      `<html><head><base href="/"></head>`
-      + `<body><app-root></app-root><script src="runtime.js"></script>`
-      + `<script src="polyfills.js"></script><script src="styles.js"></script>`
-      + `<script src="vendor.js"></script><script src="main.js"></script></body></html>`,
-    );
-    await run.stop();
-  });
-
-  it('works with UTF16 LE BOM', async () => {
-    host.writeMultipleFiles({
-      'src/index.html': Buffer.from(
-        '\ufeff<html><head><base href="/"></head><body><app-root></app-root></body></html>',
-        'utf16le'),
-    });
-
-    const run = await architect.scheduleTarget(targetSpec);
-    const output = await run.result as BrowserBuilderOutput;
-    expect(output.success).toBe(true);
-    const fileName = join(normalize(output.outputPath), 'index.html');
-    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
-    expect(content).toBe(
-      `<html><head><base href="/"></head><body><app-root></app-root>`
-      + `<script src="runtime.js"></script><script src="polyfills.js"></script>`
-      + `<script src="styles.js"></script><script src="vendor.js"></script>`
-      + `<script src="main.js"></script></body></html>`,
-    );
-    await run.stop();
-  });
-
-  it('keeps escaped charaters', async () => {
-    host.writeMultipleFiles({
-      'src/index.html': tags.oneLine`
-        <html><head><title>&iacute;</title><base href="/"></head>
-        <body><app-root></app-root></body></html>
-      `,
-    });
-
-    const run = await architect.scheduleTarget(targetSpec);
-    const output = await run.result as BrowserBuilderOutput;
-    expect(output.success).toBe(true);
-    const fileName = join(normalize(output.outputPath), 'index.html');
-    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
-    expect(content).toBe(
-      `<html><head><title>&iacute;</title><base href="/"></head> `
-      + `<body><app-root></app-root><script src="runtime.js"></script>`
-      + `<script src="polyfills.js"></script><script src="styles.js"></script>`
-      + `<script src="vendor.js"></script><script src="main.js"></script></body></html>`,
-    );
-    await run.stop();
-  });
-
-  it('keeps custom template charaters', async () => {
-    host.writeMultipleFiles({
-      'src/index.html': tags.oneLine`
-        <html><head><base href="/"><%= csrf_meta_tags %></head>
-        <body><app-root></app-root></body></html>
-      `,
-    });
-
-    const run = await architect.scheduleTarget(targetSpec);
-    const output = await run.result as BrowserBuilderOutput;
-    expect(output.success).toBe(true);
-    const fileName = join(normalize(output.outputPath), 'index.html');
-    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
-    expect(content).toBe(
-      `<html><head><base href="/"><%= csrf_meta_tags %></head> `
-      + `<body><app-root></app-root><script src="runtime.js"></script>`
-      + `<script src="polyfills.js"></script><script src="styles.js"></script>`
-      + `<script src="vendor.js"></script><script src="main.js"></script></body></html>`,
-    );
-    await run.stop();
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts
index 09be465f7b90..cc5ddd313b90 100644
--- a/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts
@@ -6,55 +6,65 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { runTargetSpec } from '@angular-devkit/architect/testing';
+import { Architect } from '@angular-devkit/architect/src/index2';
 import { join, normalize, tags, virtualFs } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { createArchitect, host } from '../utils';
 
 
 describe('Browser Builder works with BOM index.html', () => {
-  const outputPath = normalize('dist');
+  const targetSpec = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
-  it('works with UTF-8 BOM', (done) => {
+  it('works with UTF-8 BOM', async () => {
     host.writeMultipleFiles({
       'src/index.html': Buffer.from(
         '\ufeff<html><head><base href="/"></head><body><app-root></app-root></body></html>',
         'utf8'),
     });
 
-    runTargetSpec(host, browserTargetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'index.html');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        // tslint:disable-next-line:max-line-length
-        expect(content).toBe(`<html><head><base href="/"></head><body><app-root></app-root><script src="runtime.js"></script><script src="polyfills.js"></script><script src="styles.js"></script><script src="vendor.js"></script><script src="main.js"></script></body></html>`);
-      }),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(targetSpec);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+    const fileName = join(normalize(output.outputPath), 'index.html');
+    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content).toBe(
+      `<html><head><base href="/"></head>`
+      + `<body><app-root></app-root><script src="runtime.js"></script>`
+      + `<script src="polyfills.js"></script><script src="styles.js"></script>`
+      + `<script src="vendor.js"></script><script src="main.js"></script></body></html>`,
+    );
+    await run.stop();
   });
 
-  it('works with UTF16 LE BOM', (done) => {
+  it('works with UTF16 LE BOM', async () => {
     host.writeMultipleFiles({
       'src/index.html': Buffer.from(
         '\ufeff<html><head><base href="/"></head><body><app-root></app-root></body></html>',
         'utf16le'),
     });
 
-    runTargetSpec(host, browserTargetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'index.html');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        // tslint:disable-next-line:max-line-length
-        expect(content).toBe(`<html><head><base href="/"></head><body><app-root></app-root><script src="runtime.js"></script><script src="polyfills.js"></script><script src="styles.js"></script><script src="vendor.js"></script><script src="main.js"></script></body></html>`);
-      }),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(targetSpec);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+    const fileName = join(normalize(output.outputPath), 'index.html');
+    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content).toBe(
+      `<html><head><base href="/"></head><body><app-root></app-root>`
+      + `<script src="runtime.js"></script><script src="polyfills.js"></script>`
+      + `<script src="styles.js"></script><script src="vendor.js"></script>`
+      + `<script src="main.js"></script></body></html>`,
+    );
+    await run.stop();
   });
 
-  it('keeps escaped charaters', (done) => {
+  it('keeps escaped charaters', async () => {
     host.writeMultipleFiles({
       'src/index.html': tags.oneLine`
         <html><head><title>&iacute;</title><base href="/"></head>
@@ -62,18 +72,21 @@ describe('Browser Builder works with BOM index.html', () => {
       `,
     });
 
-    runTargetSpec(host, browserTargetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'index.html');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        // tslint:disable-next-line:max-line-length
-        expect(content).toBe(`<html><head><title>&iacute;</title><base href="/"></head> <body><app-root></app-root><script src="runtime.js"></script><script src="polyfills.js"></script><script src="styles.js"></script><script src="vendor.js"></script><script src="main.js"></script></body></html>`);
-      }),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(targetSpec);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+    const fileName = join(normalize(output.outputPath), 'index.html');
+    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content).toBe(
+      `<html><head><title>&iacute;</title><base href="/"></head> `
+      + `<body><app-root></app-root><script src="runtime.js"></script>`
+      + `<script src="polyfills.js"></script><script src="styles.js"></script>`
+      + `<script src="vendor.js"></script><script src="main.js"></script></body></html>`,
+    );
+    await run.stop();
   });
 
-  it('keeps custom template charaters', (done) => {
+  it('keeps custom template charaters', async () => {
     host.writeMultipleFiles({
       'src/index.html': tags.oneLine`
         <html><head><base href="/"><%= csrf_meta_tags %></head>
@@ -81,14 +94,17 @@ describe('Browser Builder works with BOM index.html', () => {
       `,
     });
 
-    runTargetSpec(host, browserTargetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'index.html');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        // tslint:disable-next-line:max-line-length
-        expect(content).toBe(`<html><head><base href="/"><%= csrf_meta_tags %></head> <body><app-root></app-root><script src="runtime.js"></script><script src="polyfills.js"></script><script src="styles.js"></script><script src="vendor.js"></script><script src="main.js"></script></body></html>`);
-      }),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(targetSpec);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+    const fileName = join(normalize(output.outputPath), 'index.html');
+    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content).toBe(
+      `<html><head><base href="/"><%= csrf_meta_tags %></head> `
+      + `<body><app-root></app-root><script src="runtime.js"></script>`
+      + `<script src="polyfills.js"></script><script src="styles.js"></script>`
+      + `<script src="vendor.js"></script><script src="main.js"></script></body></html>`,
+    );
+    await run.stop();
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/lazy-module2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/lazy-module2_spec_large.ts
deleted file mode 100644
index 81a5a4ec2bfe..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/lazy-module2_spec_large.ts
+++ /dev/null
@@ -1,198 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { TestLogger } from '@angular-devkit/architect/testing';
-import { take, tap, timeout } from 'rxjs/operators';
-import { browserBuild, createArchitect, host, lazyModuleFiles, lazyModuleImport } from '../utils';
-
-// tslint:disable-next-line:no-big-function
-describe('Browser Builder lazy modules', () => {
-  const target = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('supports lazy bundle for lazy routes with JIT', async () => {
-    host.writeMultipleFiles(lazyModuleFiles);
-    host.writeMultipleFiles(lazyModuleImport);
-
-    const { files } = await browserBuild(architect, host, target);
-    expect('lazy-lazy-module.js' in files).toBe(true);
-  });
-
-  it('should show error when lazy route is invalid on watch mode AOT', async () => {
-    host.writeMultipleFiles(lazyModuleFiles);
-    host.writeMultipleFiles(lazyModuleImport);
-    host.replaceInFile(
-      'src/app/app.module.ts',
-      'lazy.module#LazyModule',
-      'invalid.module#LazyModule',
-    );
-
-    const logger = new TestLogger('rebuild-lazy-errors');
-    const overrides = { watch: true, aot: true };
-    const run = await architect.scheduleTarget(target, overrides, { logger });
-    await run.output.pipe(
-      timeout(15000),
-      tap((buildEvent) => expect(buildEvent.success).toBe(false)),
-      tap(() => {
-        expect(logger.includes('Could not resolve module')).toBe(true);
-        logger.clear();
-        host.appendToFile('src/main.ts', ' ');
-      }),
-      take(2),
-    ).toPromise();
-    await run.stop();
-  });
-
-  it('supports lazy bundle for lazy routes with AOT', async () => {
-    host.writeMultipleFiles(lazyModuleFiles);
-    host.writeMultipleFiles(lazyModuleImport);
-
-    const { files } = await browserBuild(architect, host, target, { aot: true });
-    expect(files['lazy-lazy-module-ngfactory.js']).not.toBeUndefined();
-  });
-
-  it(`supports lazy bundle for import() calls`, async () => {
-    host.writeMultipleFiles({
-      'src/lazy-module.ts': 'export const value = 42;',
-      'src/main.ts': `import('./lazy-module');`,
-    });
-    // Using `import()` in TS require targetting `esnext` modules.
-    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
-
-    const { files } = await browserBuild(architect, host, target);
-    expect(files['0.js']).not.toBeUndefined();
-  });
-
-  it(`supports lazy bundle for dynamic import() calls`, async () => {
-    host.writeMultipleFiles({
-      'src/lazy-module.ts': 'export const value = 42;',
-      'src/main.ts': `
-        const lazyFileName = 'module';
-        import(/*webpackChunkName: '[request]'*/'./lazy-' + lazyFileName);
-      `,
-    });
-    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
-
-    const { files } = await browserBuild(architect, host, target);
-    expect(files['lazy-module.js']).not.toBeUndefined();
-  });
-
-  it(`supports lazy bundle for System.import() calls`, async () => {
-    host.writeMultipleFiles({
-      'src/lazy-module.ts': 'export const value = 42;',
-      'src/main.ts': `declare var System: any; System.import('./lazy-module');`,
-    });
-
-    const { files } = await browserBuild(architect, host, target);
-    expect(files['0.js']).not.toBeUndefined();
-  });
-
-  it(`supports hiding lazy bundle module name`, async () => {
-    host.writeMultipleFiles({
-      'src/lazy-module.ts': 'export const value = 42;',
-      'src/main.ts': `const lazyFileName = 'module'; import('./lazy-' + lazyFileName);`,
-    });
-    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
-
-    const { files } = await browserBuild(architect, host, target, { namedChunks: false });
-    expect(files['0.js']).not.toBeUndefined();
-  });
-
-  it(`supports making a common bundle for shared lazy modules`, async () => {
-    host.writeMultipleFiles({
-      'src/one.ts': `import * as http from '@angular/http'; console.log(http);`,
-      'src/two.ts': `import * as http from '@angular/http'; console.log(http);`,
-      'src/main.ts': `import('./one'); import('./two');`,
-    });
-    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
-
-    const { files } = await browserBuild(architect, host, target, { namedChunks: false });
-    expect(files['0.js']).not.toBeUndefined();
-    expect(files['1.js']).not.toBeUndefined();
-    // TODO: the chunk with common modules used to be called `common`, see why that changed.
-    expect(files['2.js']).not.toBeUndefined();
-  });
-
-  it(`supports disabling the common bundle`, async () => {
-    host.writeMultipleFiles({
-      'src/one.ts': `import * as http from '@angular/http'; console.log(http);`,
-      'src/two.ts': `import * as http from '@angular/http'; console.log(http);`,
-      'src/main.ts': `import('./one'); import('./two');`,
-    });
-    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
-
-    const { files } = await browserBuild(architect, host, target, { commonChunk: false });
-    expect(files['0.js']).not.toBeUndefined();
-    expect(files['1.js']).not.toBeUndefined();
-    expect(files['2.js']).toBeUndefined();
-  });
-
-  it(`supports extra lazy modules array in JIT`, async () => {
-    host.writeMultipleFiles(lazyModuleFiles);
-    host.writeMultipleFiles({
-      'src/app/app.component.ts': `
-        import { Component, SystemJsNgModuleLoader } from '@angular/core';
-
-        @Component({
-          selector: 'app-root',
-          templateUrl: './app.component.html',
-          styleUrls: ['./app.component.css'],
-        })
-        export class AppComponent {
-          title = 'app';
-          constructor(loader: SystemJsNgModuleLoader) {
-            // Module will be split at build time and loaded when requested below
-            loader.load('src/app/lazy/lazy.module#LazyModule')
-              .then((factory) => { /* Use factory here */ });
-          }
-        }`,
-    });
-    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
-
-    const { files } = await browserBuild(architect, host, target, {
-      lazyModules: ['src/app/lazy/lazy.module'],
-    });
-    expect(files['src-app-lazy-lazy-module.js']).not.toBeUndefined();
-  });
-
-  it(`supports extra lazy modules array in AOT`, async () => {
-    host.writeMultipleFiles(lazyModuleFiles);
-    host.writeMultipleFiles({
-      'src/app/app.component.ts': `
-        import { Component, SystemJsNgModuleLoader } from '@angular/core';
-
-        @Component({
-          selector: 'app-root',
-          templateUrl: './app.component.html',
-          styleUrls: ['./app.component.css'],
-        })
-        export class AppComponent {
-          title = 'app';
-          constructor(loader: SystemJsNgModuleLoader) {
-            // Module will be split at build time and loaded when requested below
-            loader.load('src/app/lazy/lazy.module#LazyModule')
-              .then((factory) => { /* Use factory here */ });
-          }
-        }`,
-    });
-    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
-    const { files } = await browserBuild(architect, host, target, {
-      lazyModules: ['src/app/lazy/lazy.module'],
-      aot: true,
-      optimization: true,
-    });
-    expect(files['src-app-lazy-lazy-module-ngfactory.js']).not.toBeUndefined();
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
index 69260fe76405..81a5a4ec2bfe 100644
--- a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
@@ -6,33 +6,31 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { DefaultTimeout, TestLogger, runTargetSpec } from '@angular-devkit/architect/testing';
-import { join, normalize } from '@angular-devkit/core';
-import { take, tap } from 'rxjs/operators';
-import { Schema as BrowserBuilderSchema } from '../../src/browser/schema';
-import { browserTargetSpec, host, lazyModuleFiles, lazyModuleImport } from '../utils';
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { TestLogger } from '@angular-devkit/architect/testing';
+import { take, tap, timeout } from 'rxjs/operators';
+import { browserBuild, createArchitect, host, lazyModuleFiles, lazyModuleImport } from '../utils';
 
 // tslint:disable-next-line:no-big-function
 describe('Browser Builder lazy modules', () => {
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  const outputPath = normalize('dist');
-
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
-  it('supports lazy bundle for lazy routes with JIT', (done) => {
+  it('supports lazy bundle for lazy routes with JIT', async () => {
     host.writeMultipleFiles(lazyModuleFiles);
     host.writeMultipleFiles(lazyModuleImport);
 
-    runTargetSpec(host, browserTargetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        expect(host.scopedSync().exists(join(outputPath, 'lazy-lazy-module.js'))).toBe(true);
-      }),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target);
+    expect('lazy-lazy-module.js' in files).toBe(true);
   });
 
-  it('should show error when lazy route is invalid on watch mode AOT', (done) => {
+  it('should show error when lazy route is invalid on watch mode AOT', async () => {
     host.writeMultipleFiles(lazyModuleFiles);
     host.writeMultipleFiles(lazyModuleImport);
     host.replaceInFile(
@@ -43,7 +41,9 @@ describe('Browser Builder lazy modules', () => {
 
     const logger = new TestLogger('rebuild-lazy-errors');
     const overrides = { watch: true, aot: true };
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout, logger).pipe(
+    const run = await architect.scheduleTarget(target, overrides, { logger });
+    await run.output.pipe(
+      timeout(15000),
       tap((buildEvent) => expect(buildEvent.success).toBe(false)),
       tap(() => {
         expect(logger.includes('Could not resolve module')).toBe(true);
@@ -51,35 +51,31 @@ describe('Browser Builder lazy modules', () => {
         host.appendToFile('src/main.ts', ' ');
       }),
       take(2),
-    ).toPromise().then(done, done.fail);
+    ).toPromise();
+    await run.stop();
   });
 
-  it('supports lazy bundle for lazy routes with AOT', (done) => {
+  it('supports lazy bundle for lazy routes with AOT', async () => {
     host.writeMultipleFiles(lazyModuleFiles);
     host.writeMultipleFiles(lazyModuleImport);
 
-    runTargetSpec(host, browserTargetSpec, { aot: true }).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        expect(host.scopedSync()
-          .exists(join(outputPath, 'lazy-lazy-module-ngfactory.js'))).toBe(true);
-      }),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, { aot: true });
+    expect(files['lazy-lazy-module-ngfactory.js']).not.toBeUndefined();
   });
 
-  it(`supports lazy bundle for import() calls`, (done) => {
+  it(`supports lazy bundle for import() calls`, async () => {
     host.writeMultipleFiles({
       'src/lazy-module.ts': 'export const value = 42;',
       'src/main.ts': `import('./lazy-module');`,
     });
+    // Using `import()` in TS require targetting `esnext` modules.
+    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
 
-    runTargetSpec(host, browserTargetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => expect(host.scopedSync().exists(join(outputPath, '0.js'))).toBe(true)),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target);
+    expect(files['0.js']).not.toBeUndefined();
   });
 
-  it(`supports lazy bundle for dynamic import() calls`, (done) => {
+  it(`supports lazy bundle for dynamic import() calls`, async () => {
     host.writeMultipleFiles({
       'src/lazy-module.ts': 'export const value = 42;',
       'src/main.ts': `
@@ -87,73 +83,63 @@ describe('Browser Builder lazy modules', () => {
         import(/*webpackChunkName: '[request]'*/'./lazy-' + lazyFileName);
       `,
     });
+    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
 
-    runTargetSpec(host, browserTargetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => expect(host.scopedSync().exists(join(outputPath, 'lazy-module.js'))).toBe(true)),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target);
+    expect(files['lazy-module.js']).not.toBeUndefined();
   });
 
-  it(`supports lazy bundle for System.import() calls`, (done) => {
+  it(`supports lazy bundle for System.import() calls`, async () => {
     host.writeMultipleFiles({
       'src/lazy-module.ts': 'export const value = 42;',
       'src/main.ts': `declare var System: any; System.import('./lazy-module');`,
     });
 
-    runTargetSpec(host, browserTargetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => expect(host.scopedSync().exists(join(outputPath, '0.js'))).toBe(true)),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target);
+    expect(files['0.js']).not.toBeUndefined();
   });
 
-  it(`supports hiding lazy bundle module name`, (done) => {
+  it(`supports hiding lazy bundle module name`, async () => {
     host.writeMultipleFiles({
       'src/lazy-module.ts': 'export const value = 42;',
       'src/main.ts': `const lazyFileName = 'module'; import('./lazy-' + lazyFileName);`,
     });
+    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
 
-    const overrides: Partial<BrowserBuilderSchema> = { namedChunks: false };
-
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => expect(host.scopedSync().exists(join(outputPath, '0.js'))).toBe(true)),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, { namedChunks: false });
+    expect(files['0.js']).not.toBeUndefined();
   });
 
-  it(`supports making a common bundle for shared lazy modules`, (done) => {
+  it(`supports making a common bundle for shared lazy modules`, async () => {
     host.writeMultipleFiles({
       'src/one.ts': `import * as http from '@angular/http'; console.log(http);`,
       'src/two.ts': `import * as http from '@angular/http'; console.log(http);`,
       'src/main.ts': `import('./one'); import('./two');`,
     });
+    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
 
-    runTargetSpec(host, browserTargetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => expect(host.scopedSync().exists(join(outputPath, '0.js'))).toBe(true)),
-      tap(() => expect(host.scopedSync().exists(join(outputPath, '1.js'))).toBe(true)),
-      // TODO: the chunk with common modules used to be called `common`, see why that changed.
-      tap(() => expect(host.scopedSync().exists(join(outputPath, '2.js'))).toBe(true)),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, { namedChunks: false });
+    expect(files['0.js']).not.toBeUndefined();
+    expect(files['1.js']).not.toBeUndefined();
+    // TODO: the chunk with common modules used to be called `common`, see why that changed.
+    expect(files['2.js']).not.toBeUndefined();
   });
 
-  it(`supports disabling the common bundle`, (done) => {
+  it(`supports disabling the common bundle`, async () => {
     host.writeMultipleFiles({
       'src/one.ts': `import * as http from '@angular/http'; console.log(http);`,
       'src/two.ts': `import * as http from '@angular/http'; console.log(http);`,
       'src/main.ts': `import('./one'); import('./two');`,
     });
+    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
 
-    const overrides: Partial<BrowserBuilderSchema> = { commonChunk: false };
-
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => expect(host.scopedSync().exists(join(outputPath, '0.js'))).toBe(true)),
-      tap(() => expect(host.scopedSync().exists(join(outputPath, '1.js'))).toBe(true)),
-      tap(() => expect(host.scopedSync().exists(join(outputPath, '2.js'))).toBe(false)),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, { commonChunk: false });
+    expect(files['0.js']).not.toBeUndefined();
+    expect(files['1.js']).not.toBeUndefined();
+    expect(files['2.js']).toBeUndefined();
   });
 
-  it(`supports extra lazy modules array in JIT`, (done) => {
+  it(`supports extra lazy modules array in JIT`, async () => {
     host.writeMultipleFiles(lazyModuleFiles);
     host.writeMultipleFiles({
       'src/app/app.component.ts': `
@@ -173,17 +159,15 @@ describe('Browser Builder lazy modules', () => {
           }
         }`,
     });
+    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
 
-    const overrides: Partial<BrowserBuilderSchema> = { lazyModules: ['src/app/lazy/lazy.module'] };
-
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => expect(host.scopedSync().exists(join(outputPath, 'src-app-lazy-lazy-module.js')))
-        .toBe(true)),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, {
+      lazyModules: ['src/app/lazy/lazy.module'],
+    });
+    expect(files['src-app-lazy-lazy-module.js']).not.toBeUndefined();
   });
 
-  it(`supports extra lazy modules array in AOT`, (done) => {
+  it(`supports extra lazy modules array in AOT`, async () => {
     host.writeMultipleFiles(lazyModuleFiles);
     host.writeMultipleFiles({
       'src/app/app.component.ts': `
@@ -203,18 +187,12 @@ describe('Browser Builder lazy modules', () => {
           }
         }`,
     });
-
-    const overrides: Partial<BrowserBuilderSchema> = {
+    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
+    const { files } = await browserBuild(architect, host, target, {
       lazyModules: ['src/app/lazy/lazy.module'],
       aot: true,
       optimization: true,
-    };
-
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 2).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => expect(host.scopedSync()
-        .exists(join(outputPath, 'src-app-lazy-lazy-module-ngfactory.js')))
-        .toBe(true)),
-    ).toPromise().then(done, done.fail);
+    });
+    expect(files['src-app-lazy-lazy-module-ngfactory.js']).not.toBeUndefined();
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/license-extraction2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/license-extraction2_spec_large.ts
deleted file mode 100644
index 3de262afae22..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/license-extraction2_spec_large.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { browserBuild, createArchitect, host } from '../utils';
-
-
-describe('Browser Builder license extraction', () => {
-  const target = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  // Ignored because license works when trying manually on a project, but doesn't work here.
-  it('works', async () => {
-    // TODO: make license extraction independent from optimization level.
-    const overrides = { extractLicenses: true, optimization: true };
-
-    const { files } = await browserBuild(architect, host, target, overrides);
-    expect(await files['3rdpartylicenses.txt']).not.toBeUndefined();
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/license-extraction_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/license-extraction_spec_large.ts
index 3dbea255bf73..3de262afae22 100644
--- a/packages/angular_devkit/build_angular/test/browser/license-extraction_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/license-extraction_spec_large.ts
@@ -5,31 +5,26 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { DefaultTimeout, runTargetSpec } from '@angular-devkit/architect/testing';
-import { join, normalize } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { browserBuild, createArchitect, host } from '../utils';
 
 
 describe('Browser Builder license extraction', () => {
-  const outputPath = normalize('dist');
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
   // Ignored because license works when trying manually on a project, but doesn't work here.
-  // TODO: fix VFS use in webpack and the test host, and reenable this test.
-  xit('works', (done) => {
+  it('works', async () => {
     // TODO: make license extraction independent from optimization level.
     const overrides = { extractLicenses: true, optimization: true };
 
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 2).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, '3rdpartylicenses.txt');
-        expect(host.scopedSync().exists(fileName)).toBe(true);
-      }),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['3rdpartylicenses.txt']).not.toBeUndefined();
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/no-entry-module2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/no-entry-module2_spec_large.ts
deleted file mode 100644
index 6a7c64f94cc5..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/no-entry-module2_spec_large.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { TestLogger } from '@angular-devkit/architect/testing';
-import { browserBuild, createArchitect, host } from '../utils';
-
-
-describe('Browser Builder no entry module', () => {
-  const target = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('works', async () => {
-    // Remove the bootstrap but keep a reference to AppModule so the import is not elided.
-    host.replaceInFile('src/main.ts', /platformBrowserDynamic.*?bootstrapModule.*?;/, '');
-    host.appendToFile('src/main.ts', 'console.log(AppModule);');
-
-    await browserBuild(architect, host, target, { baseHref: '/myUrl' });
-  });
-
-  it('reports warning when no bootstrap code', async () => {
-    host.replaceInFile('src/main.ts', /./g, '');
-    host.appendToFile('src/main.ts', `import './app/app.module';`);
-
-    const logger = new TestLogger('no-bootstrap');
-    await browserBuild(architect, host, target, { baseHref: '/myUrl' }, { logger });
-    expect(logger.includes('Lazy routes discovery is not enabled')).toBe(true);
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/no-entry-module_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/no-entry-module_spec_large.ts
index ffb086befbd6..6a7c64f94cc5 100644
--- a/packages/angular_devkit/build_angular/test/browser/no-entry-module_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/no-entry-module_spec_large.ts
@@ -6,35 +6,35 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { TestLogger, runTargetSpec } from '@angular-devkit/architect/testing';
-import { tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { TestLogger } from '@angular-devkit/architect/testing';
+import { browserBuild, createArchitect, host } from '../utils';
 
 
 describe('Browser Builder no entry module', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  it('works', (done) => {
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
     // Remove the bootstrap but keep a reference to AppModule so the import is not elided.
     host.replaceInFile('src/main.ts', /platformBrowserDynamic.*?bootstrapModule.*?;/, '');
     host.appendToFile('src/main.ts', 'console.log(AppModule);');
 
-    const overrides = { baseHref: '/myUrl' };
-
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
+    await browserBuild(architect, host, target, { baseHref: '/myUrl' });
   });
 
-  it('reports warning when no bootstrap code', (done) => {
+  it('reports warning when no bootstrap code', async () => {
     host.replaceInFile('src/main.ts', /./g, '');
     host.appendToFile('src/main.ts', `import './app/app.module';`);
 
     const logger = new TestLogger('no-bootstrap');
-    runTargetSpec(host, browserTargetSpec, undefined, undefined, logger).pipe(
-      tap(() => expect(logger.includes('Lazy routes discovery is not enabled')).toBe(true)),
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
+    await browserBuild(architect, host, target, { baseHref: '/myUrl' }, { logger });
+    expect(logger.includes('Lazy routes discovery is not enabled')).toBe(true);
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/optimization-level2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/optimization-level2_spec_large.ts
deleted file mode 100644
index d8a7a4f00297..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/optimization-level2_spec_large.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { browserBuild, createArchitect, host } from '../utils';
-
-
-describe('Browser Builder optimization level', () => {
-  const target = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('works', async () => {
-    const overrides = { optimization: true };
-
-    const { files } = await browserBuild(architect, host, target, overrides);
-    expect(await files['main.js']).not.toContain('AppComponent');
-  });
-
-  it('tsconfig target changes optimizations to use ES2015', async () => {
-    host.replaceInFile('tsconfig.json', '"target": "es5"', '"target": "es2015"');
-
-    const overrides = { optimization: true };
-    const { files } = await browserBuild(architect, host, target, overrides);
-    expect(await files['vendor.js']).toMatch(/class \w{constructor\(\){/);
-  });
-
-  it('supports styles only optimizations', async () => {
-    const overrides = {
-      optimization: {
-        styles: true,
-        scripts: false,
-      },
-      aot: true,
-      extractCss: true,
-      styles: ['src/styles.css'],
-    };
-
-    host.appendToFile('src/main.ts', '/** js comment should not be dropped */');
-    host.appendToFile('src/app/app.component.css', 'div { color: white }');
-    host.writeMultipleFiles({
-      'src/styles.css': `div { color: white }`,
-    });
-
-    const { files } = await browserBuild(architect, host, target, overrides);
-    expect(await files['main.js']).toContain('js comment should not be dropped');
-    expect(await files['main.js']).toContain('color:#fff');
-    expect(await files['styles.css']).toContain('color:#fff');
-  });
-
-  it('supports scripts only optimizations', async () => {
-    const overrides = {
-      optimization: {
-        styles: false,
-        scripts: true,
-      },
-      aot: true,
-      extractCss: true,
-      styles: ['src/styles.css'],
-    };
-
-    host.appendToFile('src/main.ts', '/** js comment should be dropped */');
-    host.appendToFile('src/app/app.component.css', 'div { color: white }');
-    host.writeMultipleFiles({
-      'src/styles.css': `div { color: white }`,
-    });
-
-    const { files } = await browserBuild(architect, host, target, overrides);
-    expect(await files['main.js']).not.toContain('js comment should be dropped');
-    expect(await files['main.js']).toContain('color: white');
-    expect(await files['styles.css']).toContain('color: white');
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/optimization-level_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/optimization-level_spec_large.ts
index f80a34355f08..d8a7a4f00297 100644
--- a/packages/angular_devkit/build_angular/test/browser/optimization-level_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/optimization-level_spec_large.ts
@@ -5,51 +5,37 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { DefaultTimeout, runTargetSpec } from '@angular-devkit/architect/testing';
-import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
-import { Schema as BrowserBuilderSchema } from '../../src/browser/schema';
-import { browserTargetSpec, host } from '../utils';
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { browserBuild, createArchitect, host } from '../utils';
 
 
 describe('Browser Builder optimization level', () => {
-  const outputPath = normalize('dist');
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
-  it('works', (done) => {
+  it('works', async () => {
     const overrides = { optimization: true };
 
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 2).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'main.js');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(fileName));
-        // Bundle contents should be uglified, which includes variable mangling.
-        expect(content).not.toContain('AppComponent');
-      }),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['main.js']).not.toContain('AppComponent');
   });
 
-  it('tsconfig target changes optimizations to use ES2015', (done) => {
+  it('tsconfig target changes optimizations to use ES2015', async () => {
     host.replaceInFile('tsconfig.json', '"target": "es5"', '"target": "es2015"');
 
     const overrides = { optimization: true };
-
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 2).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'vendor.js');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(fileName));
-        expect(content).toMatch(/class \w{constructor\(\){/);
-      }),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['vendor.js']).toMatch(/class \w{constructor\(\){/);
   });
 
-  it('supports styles only optimizations', (done) => {
-    const overrides: Partial<BrowserBuilderSchema> = {
+  it('supports styles only optimizations', async () => {
+    const overrides = {
       optimization: {
         styles: true,
         scripts: false,
@@ -65,25 +51,14 @@ describe('Browser Builder optimization level', () => {
       'src/styles.css': `div { color: white }`,
     });
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const scriptContent = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, 'main.js')),
-        );
-        expect(scriptContent).toContain('js comment should not be dropped');
-        expect(scriptContent).toContain('color:#fff');
-
-        const styleContent = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, 'styles.css')),
-        );
-        expect(styleContent).toContain('color:#fff');
-      }),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['main.js']).toContain('js comment should not be dropped');
+    expect(await files['main.js']).toContain('color:#fff');
+    expect(await files['styles.css']).toContain('color:#fff');
   });
 
-  it('supports scripts only optimizations', (done) => {
-    const overrides: Partial<BrowserBuilderSchema> = {
+  it('supports scripts only optimizations', async () => {
+    const overrides = {
       optimization: {
         styles: false,
         scripts: true,
@@ -99,20 +74,9 @@ describe('Browser Builder optimization level', () => {
       'src/styles.css': `div { color: white }`,
     });
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const scriptContent = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, 'main.js')),
-        );
-        expect(scriptContent).not.toContain('js comment should be dropped');
-        expect(scriptContent).toContain('color: white');
-
-        const styleContent = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, 'styles.css')),
-        );
-        expect(styleContent).toContain('color: white');
-      }),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['main.js']).not.toContain('js comment should be dropped');
+    expect(await files['main.js']).toContain('color: white');
+    expect(await files['styles.css']).toContain('color: white');
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/output-hashing2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/output-hashing2_spec_large.ts
deleted file mode 100644
index f36a71a8df0a..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/output-hashing2_spec_large.ts
+++ /dev/null
@@ -1,183 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { normalize } from '@angular-devkit/core';
-import { browserBuild, createArchitect, host, lazyModuleFiles, lazyModuleImport } from '../utils';
-
-describe('Browser Builder output hashing', () => {
-  const target = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('updates hash as content changes', async () => {
-    const OUTPUT_RE = /(main|styles|lazy\.module)\.([a-z0-9]+)\.(chunk|bundle)\.(js|css)$/;
-
-    function generateFileHashMap(): Map<string, string> {
-      const hashes = new Map<string, string>();
-
-      host.scopedSync().list(normalize('./dist')).forEach(name => {
-        const matches = name.match(OUTPUT_RE);
-        if (matches) {
-          const [, module, hash] = matches;
-          hashes.set(module, hash);
-        }
-      });
-
-      return hashes;
-    }
-
-    function validateHashes(
-      oldHashes: Map<string, string>,
-      newHashes: Map<string, string>,
-      shouldChange: Array<string>,
-    ): void {
-      newHashes.forEach((hash, module) => {
-        if (hash == oldHashes.get(module)) {
-          if (shouldChange.includes(module)) {
-            throw new Error(
-              `Module "${module}" did not change hash (${hash}), but was expected to.`);
-          }
-        } else if (!shouldChange.includes(module)) {
-          throw new Error(`Module "${module}" changed hash (${hash}), but was not expected to.`);
-        }
-      });
-    }
-
-    let oldHashes: Map<string, string>;
-    let newHashes: Map<string, string>;
-
-    host.writeMultipleFiles(lazyModuleFiles);
-    host.writeMultipleFiles(lazyModuleImport);
-
-    const overrides = { outputHashing: 'all', extractCss: true };
-
-    // We must do several builds instead of a single one in watch mode, so that the output
-    // path is deleted on each run and only contains the most recent files.
-    await browserBuild(architect, host, target, overrides);
-
-    // Save the current hashes.
-    oldHashes = generateFileHashMap();
-    host.writeMultipleFiles(lazyModuleFiles);
-    host.writeMultipleFiles(lazyModuleImport);
-
-    await browserBuild(architect, host, target, overrides);
-    newHashes = generateFileHashMap();
-    validateHashes(oldHashes, newHashes, []);
-    oldHashes = newHashes;
-    host.writeMultipleFiles({ 'src/styles.css': 'body { background: blue; }' });
-
-    // Style hash should change.
-    await browserBuild(architect, host, target, overrides);
-    newHashes = generateFileHashMap();
-    validateHashes(oldHashes, newHashes, ['styles']);
-    oldHashes = newHashes;
-    host.writeMultipleFiles({ 'src/app/app.component.css': 'h1 { margin: 10px; }' });
-
-    // Main hash should change, since inline styles go in the main bundle.
-    await browserBuild(architect, host, target, overrides);
-    newHashes = generateFileHashMap();
-    validateHashes(oldHashes, newHashes, ['main']);
-    oldHashes = newHashes;
-    host.appendToFile('src/app/lazy/lazy.module.ts', `console.log(1);`);
-
-    // Lazy loaded bundle should change, and so should inline.
-    await browserBuild(architect, host, target, overrides);
-    newHashes = generateFileHashMap();
-    validateHashes(oldHashes, newHashes, ['lazy.module']);
-    oldHashes = newHashes;
-    host.appendToFile('src/main.ts', '');
-
-    // Nothing should have changed.
-    await browserBuild(architect, host, target, overrides);
-    newHashes = generateFileHashMap();
-    validateHashes(oldHashes, newHashes, []);
-  });
-
-  it('supports options', async () => {
-    host.writeMultipleFiles({ 'src/styles.css': `h1 { background: url('./spectrum.png')}` });
-    host.writeMultipleFiles(lazyModuleFiles);
-    host.writeMultipleFiles(lazyModuleImport);
-
-    // We must do several builds instead of a single one in watch mode, so that the output
-    // path is deleted on each run and only contains the most recent files.
-    // 'all' should hash everything.
-    await browserBuild(architect, host, target, { outputHashing: 'all', extractCss: true });
-
-    expect(host.fileMatchExists('dist', /runtime\.[0-9a-f]{20}\.js/)).toBeTruthy();
-    expect(host.fileMatchExists('dist', /main\.[0-9a-f]{20}\.js/)).toBeTruthy();
-    expect(host.fileMatchExists('dist', /polyfills\.[0-9a-f]{20}\.js/)).toBeTruthy();
-    expect(host.fileMatchExists('dist', /vendor\.[0-9a-f]{20}\.js/)).toBeTruthy();
-    expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.css/)).toBeTruthy();
-    expect(host.fileMatchExists('dist', /spectrum\.[0-9a-f]{20}\.png/)).toBeTruthy();
-
-    // 'none' should hash nothing.
-    await browserBuild(architect, host, target, { outputHashing: 'none', extractCss: true });
-
-    expect(host.fileMatchExists('dist', /runtime\.[0-9a-f]{20}\.js/)).toBeFalsy();
-    expect(host.fileMatchExists('dist', /main\.[0-9a-f]{20}\.js/)).toBeFalsy();
-    expect(host.fileMatchExists('dist', /polyfills\.[0-9a-f]{20}\.js/)).toBeFalsy();
-    expect(host.fileMatchExists('dist', /vendor\.[0-9a-f]{20}\.js/)).toBeFalsy();
-    expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.css/)).toBeFalsy();
-    expect(host.fileMatchExists('dist', /spectrum\.[0-9a-f]{20}\.png/)).toBeFalsy();
-
-    // 'media' should hash css resources only.
-    await browserBuild(architect, host, target, { outputHashing: 'media', extractCss: true });
-
-    expect(host.fileMatchExists('dist', /runtime\.[0-9a-f]{20}\.js/)).toBeFalsy();
-    expect(host.fileMatchExists('dist', /main\.[0-9a-f]{20}\.js/)).toBeFalsy();
-    expect(host.fileMatchExists('dist', /polyfills\.[0-9a-f]{20}\.js/)).toBeFalsy();
-    expect(host.fileMatchExists('dist', /vendor\.[0-9a-f]{20}\.js/)).toBeFalsy();
-    expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.css/)).toBeFalsy();
-    expect(host.fileMatchExists('dist', /spectrum\.[0-9a-f]{20}\.png/)).toBeTruthy();
-
-    // 'bundles' should hash bundles only.
-    await browserBuild(architect, host, target, { outputHashing: 'bundles', extractCss: true });
-    expect(host.fileMatchExists('dist', /runtime\.[0-9a-f]{20}\.js/)).toBeTruthy();
-    expect(host.fileMatchExists('dist', /main\.[0-9a-f]{20}\.js/)).toBeTruthy();
-    expect(host.fileMatchExists('dist', /polyfills\.[0-9a-f]{20}\.js/)).toBeTruthy();
-    expect(host.fileMatchExists('dist', /vendor\.[0-9a-f]{20}\.js/)).toBeTruthy();
-    expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.css/)).toBeTruthy();
-    expect(host.fileMatchExists('dist', /spectrum\.[0-9a-f]{20}\.png/)).toBeFalsy();
-  });
-
-  it('does not hash lazy styles', async () => {
-    const overrides = {
-      outputHashing: 'all',
-      extractCss: true,
-      styles: [{ input: 'src/styles.css', lazy: true }],
-    };
-
-    await browserBuild(architect, host, target, overrides);
-
-    expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.js/)).toBeFalsy();
-    expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.js.map/)).toBeFalsy();
-    expect(host.scopedSync().exists(normalize('dist/styles.css'))).toBe(true);
-    expect(host.scopedSync().exists(normalize('dist/styles.css.map'))).toBe(true);
-  });
-
-  it('does not hash lazy styles when optimization is enabled', async () => {
-    const overrides = {
-      outputHashing: 'all',
-      extractCss: true,
-      optimization: true,
-      styles: [{ input: 'src/styles.css', lazy: true }],
-    };
-
-    await browserBuild(architect, host, target, overrides);
-    expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.js/)).toBeFalsy();
-    expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.js.map/)).toBeFalsy();
-    expect(host.scopedSync().exists(normalize('dist/styles.css'))).toBe(true);
-    expect(host.scopedSync().exists(normalize('dist/styles.css.map'))).toBe(true);
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts
index ff4330255e1a..f36a71a8df0a 100644
--- a/packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts
@@ -6,17 +6,21 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { DefaultTimeout, runTargetSpec } from '@angular-devkit/architect/testing';
+import { Architect } from '@angular-devkit/architect/src/index2';
 import { normalize } from '@angular-devkit/core';
-import { concatMap, tap } from 'rxjs/operators';
-import { browserTargetSpec, host, lazyModuleFiles, lazyModuleImport } from '../utils';
-
+import { browserBuild, createArchitect, host, lazyModuleFiles, lazyModuleImport } from '../utils';
 
 describe('Browser Builder output hashing', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
-  it('updates hash as content changes', (done) => {
+  it('updates hash as content changes', async () => {
     const OUTPUT_RE = /(main|styles|lazy\.module)\.([a-z0-9]+)\.(chunk|bundle)\.(js|css)$/;
 
     function generateFileHashMap(): Map<string, string> {
@@ -60,127 +64,109 @@ describe('Browser Builder output hashing', () => {
 
     // We must do several builds instead of a single one in watch mode, so that the output
     // path is deleted on each run and only contains the most recent files.
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 3).pipe(
-      tap(() => {
-        // Save the current hashes.
-        oldHashes = generateFileHashMap();
-        host.writeMultipleFiles(lazyModuleFiles);
-        host.writeMultipleFiles(lazyModuleImport);
-      }),
-      // Lazy chunk hash should have changed without modifying main bundle.
-      concatMap(() => runTargetSpec(host, browserTargetSpec, overrides)),
-      tap(() => {
-        newHashes = generateFileHashMap();
-        validateHashes(oldHashes, newHashes, []);
-        oldHashes = newHashes;
-        host.writeMultipleFiles({ 'src/styles.css': 'body { background: blue; }' });
-      }),
-      // Style hash should change.
-      concatMap(() => runTargetSpec(host, browserTargetSpec, overrides)),
-      tap(() => {
-        newHashes = generateFileHashMap();
-        validateHashes(oldHashes, newHashes, ['styles']);
-        oldHashes = newHashes;
-        host.writeMultipleFiles({ 'src/app/app.component.css': 'h1 { margin: 10px; }' });
-      }),
-      // Main hash should change, since inline styles go in the main bundle.
-      concatMap(() => runTargetSpec(host, browserTargetSpec, overrides)),
-      tap(() => {
-        newHashes = generateFileHashMap();
-        validateHashes(oldHashes, newHashes, ['main']);
-        oldHashes = newHashes;
-        host.appendToFile('src/app/lazy/lazy.module.ts', `console.log(1);`);
-      }),
-      // Lazy loaded bundle should change, and so should inline.
-      concatMap(() => runTargetSpec(host, browserTargetSpec, overrides)),
-      tap(() => {
-        newHashes = generateFileHashMap();
-        validateHashes(oldHashes, newHashes, ['lazy.module']);
-        oldHashes = newHashes;
-        host.appendToFile('src/main.ts', '');
-      }),
-      // Nothing should have changed.
-      concatMap(() => runTargetSpec(host, browserTargetSpec, overrides)),
-      tap(() => {
-        newHashes = generateFileHashMap();
-        validateHashes(oldHashes, newHashes, []);
-      }),
-    ).toPromise().then(done, done.fail);
+    await browserBuild(architect, host, target, overrides);
+
+    // Save the current hashes.
+    oldHashes = generateFileHashMap();
+    host.writeMultipleFiles(lazyModuleFiles);
+    host.writeMultipleFiles(lazyModuleImport);
+
+    await browserBuild(architect, host, target, overrides);
+    newHashes = generateFileHashMap();
+    validateHashes(oldHashes, newHashes, []);
+    oldHashes = newHashes;
+    host.writeMultipleFiles({ 'src/styles.css': 'body { background: blue; }' });
+
+    // Style hash should change.
+    await browserBuild(architect, host, target, overrides);
+    newHashes = generateFileHashMap();
+    validateHashes(oldHashes, newHashes, ['styles']);
+    oldHashes = newHashes;
+    host.writeMultipleFiles({ 'src/app/app.component.css': 'h1 { margin: 10px; }' });
+
+    // Main hash should change, since inline styles go in the main bundle.
+    await browserBuild(architect, host, target, overrides);
+    newHashes = generateFileHashMap();
+    validateHashes(oldHashes, newHashes, ['main']);
+    oldHashes = newHashes;
+    host.appendToFile('src/app/lazy/lazy.module.ts', `console.log(1);`);
+
+    // Lazy loaded bundle should change, and so should inline.
+    await browserBuild(architect, host, target, overrides);
+    newHashes = generateFileHashMap();
+    validateHashes(oldHashes, newHashes, ['lazy.module']);
+    oldHashes = newHashes;
+    host.appendToFile('src/main.ts', '');
+
+    // Nothing should have changed.
+    await browserBuild(architect, host, target, overrides);
+    newHashes = generateFileHashMap();
+    validateHashes(oldHashes, newHashes, []);
   });
 
-  it('supports options', (done) => {
+  it('supports options', async () => {
     host.writeMultipleFiles({ 'src/styles.css': `h1 { background: url('./spectrum.png')}` });
     host.writeMultipleFiles(lazyModuleFiles);
     host.writeMultipleFiles(lazyModuleImport);
 
-    const overrides = { outputHashing: 'all', extractCss: true };
-
     // We must do several builds instead of a single one in watch mode, so that the output
     // path is deleted on each run and only contains the most recent files.
     // 'all' should hash everything.
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 2).pipe(
-      tap(() => {
-        expect(host.fileMatchExists('dist', /runtime\.[0-9a-f]{20}\.js/)).toBeTruthy();
-        expect(host.fileMatchExists('dist', /main\.[0-9a-f]{20}\.js/)).toBeTruthy();
-        expect(host.fileMatchExists('dist', /polyfills\.[0-9a-f]{20}\.js/)).toBeTruthy();
-        expect(host.fileMatchExists('dist', /vendor\.[0-9a-f]{20}\.js/)).toBeTruthy();
-        expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.css/)).toBeTruthy();
-        expect(host.fileMatchExists('dist', /spectrum\.[0-9a-f]{20}\.png/)).toBeTruthy();
-      }),
-      // 'none' should hash nothing.
-      concatMap(() => runTargetSpec(host, browserTargetSpec,
-        { outputHashing: 'none', extractCss: true })),
-      tap(() => {
-        expect(host.fileMatchExists('dist', /runtime\.[0-9a-f]{20}\.js/)).toBeFalsy();
-        expect(host.fileMatchExists('dist', /main\.[0-9a-f]{20}\.js/)).toBeFalsy();
-        expect(host.fileMatchExists('dist', /polyfills\.[0-9a-f]{20}\.js/)).toBeFalsy();
-        expect(host.fileMatchExists('dist', /vendor\.[0-9a-f]{20}\.js/)).toBeFalsy();
-        expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.css/)).toBeFalsy();
-        expect(host.fileMatchExists('dist', /spectrum\.[0-9a-f]{20}\.png/)).toBeFalsy();
-      }),
-      // 'media' should hash css resources only.
-      concatMap(() => runTargetSpec(host, browserTargetSpec,
-        { outputHashing: 'media', extractCss: true })),
-      tap(() => {
-        expect(host.fileMatchExists('dist', /runtime\.[0-9a-f]{20}\.js/)).toBeFalsy();
-        expect(host.fileMatchExists('dist', /main\.[0-9a-f]{20}\.js/)).toBeFalsy();
-        expect(host.fileMatchExists('dist', /polyfills\.[0-9a-f]{20}\.js/)).toBeFalsy();
-        expect(host.fileMatchExists('dist', /vendor\.[0-9a-f]{20}\.js/)).toBeFalsy();
-        expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.css/)).toBeFalsy();
-        expect(host.fileMatchExists('dist', /spectrum\.[0-9a-f]{20}\.png/)).toBeTruthy();
-      }),
-      // 'bundles' should hash bundles only.
-      concatMap(() => runTargetSpec(host, browserTargetSpec,
-        { outputHashing: 'bundles', extractCss: true })),
-      tap(() => {
-        expect(host.fileMatchExists('dist', /runtime\.[0-9a-f]{20}\.js/)).toBeTruthy();
-        expect(host.fileMatchExists('dist', /main\.[0-9a-f]{20}\.js/)).toBeTruthy();
-        expect(host.fileMatchExists('dist', /polyfills\.[0-9a-f]{20}\.js/)).toBeTruthy();
-        expect(host.fileMatchExists('dist', /vendor\.[0-9a-f]{20}\.js/)).toBeTruthy();
-        expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.css/)).toBeTruthy();
-        expect(host.fileMatchExists('dist', /spectrum\.[0-9a-f]{20}\.png/)).toBeFalsy();
-      }),
-    ).toPromise().then(done, done.fail);
+    await browserBuild(architect, host, target, { outputHashing: 'all', extractCss: true });
+
+    expect(host.fileMatchExists('dist', /runtime\.[0-9a-f]{20}\.js/)).toBeTruthy();
+    expect(host.fileMatchExists('dist', /main\.[0-9a-f]{20}\.js/)).toBeTruthy();
+    expect(host.fileMatchExists('dist', /polyfills\.[0-9a-f]{20}\.js/)).toBeTruthy();
+    expect(host.fileMatchExists('dist', /vendor\.[0-9a-f]{20}\.js/)).toBeTruthy();
+    expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.css/)).toBeTruthy();
+    expect(host.fileMatchExists('dist', /spectrum\.[0-9a-f]{20}\.png/)).toBeTruthy();
+
+    // 'none' should hash nothing.
+    await browserBuild(architect, host, target, { outputHashing: 'none', extractCss: true });
+
+    expect(host.fileMatchExists('dist', /runtime\.[0-9a-f]{20}\.js/)).toBeFalsy();
+    expect(host.fileMatchExists('dist', /main\.[0-9a-f]{20}\.js/)).toBeFalsy();
+    expect(host.fileMatchExists('dist', /polyfills\.[0-9a-f]{20}\.js/)).toBeFalsy();
+    expect(host.fileMatchExists('dist', /vendor\.[0-9a-f]{20}\.js/)).toBeFalsy();
+    expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.css/)).toBeFalsy();
+    expect(host.fileMatchExists('dist', /spectrum\.[0-9a-f]{20}\.png/)).toBeFalsy();
+
+    // 'media' should hash css resources only.
+    await browserBuild(architect, host, target, { outputHashing: 'media', extractCss: true });
+
+    expect(host.fileMatchExists('dist', /runtime\.[0-9a-f]{20}\.js/)).toBeFalsy();
+    expect(host.fileMatchExists('dist', /main\.[0-9a-f]{20}\.js/)).toBeFalsy();
+    expect(host.fileMatchExists('dist', /polyfills\.[0-9a-f]{20}\.js/)).toBeFalsy();
+    expect(host.fileMatchExists('dist', /vendor\.[0-9a-f]{20}\.js/)).toBeFalsy();
+    expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.css/)).toBeFalsy();
+    expect(host.fileMatchExists('dist', /spectrum\.[0-9a-f]{20}\.png/)).toBeTruthy();
+
+    // 'bundles' should hash bundles only.
+    await browserBuild(architect, host, target, { outputHashing: 'bundles', extractCss: true });
+    expect(host.fileMatchExists('dist', /runtime\.[0-9a-f]{20}\.js/)).toBeTruthy();
+    expect(host.fileMatchExists('dist', /main\.[0-9a-f]{20}\.js/)).toBeTruthy();
+    expect(host.fileMatchExists('dist', /polyfills\.[0-9a-f]{20}\.js/)).toBeTruthy();
+    expect(host.fileMatchExists('dist', /vendor\.[0-9a-f]{20}\.js/)).toBeTruthy();
+    expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.css/)).toBeTruthy();
+    expect(host.fileMatchExists('dist', /spectrum\.[0-9a-f]{20}\.png/)).toBeFalsy();
   });
 
-  it('does not hash lazy styles', (done) => {
+  it('does not hash lazy styles', async () => {
     const overrides = {
       outputHashing: 'all',
       extractCss: true,
       styles: [{ input: 'src/styles.css', lazy: true }],
     };
 
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout).pipe(
-      tap(() => {
-        expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.js/)).toBeFalsy();
-        expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.js.map/)).toBeFalsy();
-        expect(host.scopedSync().exists(normalize('dist/styles.css'))).toBe(true);
-        expect(host.scopedSync().exists(normalize('dist/styles.css.map'))).toBe(true);
-      }),
-    ).toPromise().then(done, done.fail);
+    await browserBuild(architect, host, target, overrides);
+
+    expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.js/)).toBeFalsy();
+    expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.js.map/)).toBeFalsy();
+    expect(host.scopedSync().exists(normalize('dist/styles.css'))).toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/styles.css.map'))).toBe(true);
   });
 
-  it('does not hash lazy styles when optimization is enabled', (done) => {
+  it('does not hash lazy styles when optimization is enabled', async () => {
     const overrides = {
       outputHashing: 'all',
       extractCss: true,
@@ -188,13 +174,10 @@ describe('Browser Builder output hashing', () => {
       styles: [{ input: 'src/styles.css', lazy: true }],
     };
 
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout).pipe(
-      tap(() => {
-        expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.js/)).toBeFalsy();
-        expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.js.map/)).toBeFalsy();
-        expect(host.scopedSync().exists(normalize('dist/styles.css'))).toBe(true);
-        expect(host.scopedSync().exists(normalize('dist/styles.css.map'))).toBe(true);
-      }),
-    ).toPromise().then(done, done.fail);
+    await browserBuild(architect, host, target, overrides);
+    expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.js/)).toBeFalsy();
+    expect(host.fileMatchExists('dist', /styles\.[0-9a-f]{20}\.js.map/)).toBeFalsy();
+    expect(host.scopedSync().exists(normalize('dist/styles.css'))).toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/styles.css.map'))).toBe(true);
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/output-path2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/output-path2_spec_large.ts
deleted file mode 100644
index 3738bf19d048..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/output-path2_spec_large.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { join, virtualFs } from '@angular-devkit/core';
-import { createArchitect, host } from '../utils';
-
-
-describe('Browser Builder output path', () => {
-  const target = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('deletes output path', async () => {
-    // Write a file to the output path to later verify it was deleted.
-    await host.write(
-      join(host.root(), 'dist/file.txt'),
-      virtualFs.stringToFileBuffer('file'),
-    ).toPromise();
-
-    // Delete an app file to force a failed compilation.
-    // Failed compilations still delete files, but don't output any.
-    await host.delete(join(host.root(), 'src', 'app', 'app.component.ts')).toPromise();
-
-    const run = await architect.scheduleTarget(target);
-    const output = await run.result;
-    expect(output.success).toBe(false);
-    expect(await host.exists(join(host.root(), 'dist')).toPromise()).toBe(false);
-    await run.stop();
-  });
-
-  it('does not allow output path to be project root', async () => {
-    const overrides = { outputPath: './' };
-    const run = await architect.scheduleTarget(target, overrides);
-    try {
-      await run.result;
-      expect('THE ABOVE LINE SHOULD THROW').toBe('');
-    } catch {}
-    await run.stop();
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/output-path_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/output-path_spec_large.ts
index 61fff7201105..3738bf19d048 100644
--- a/packages/angular_devkit/build_angular/test/browser/output-path_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/output-path_spec_large.ts
@@ -6,39 +6,46 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { join, virtualFs } from '@angular-devkit/core';
+import { createArchitect, host } from '../utils';
 
 
 describe('Browser Builder output path', () => {
-  const outputPath = normalize('dist');
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
-  it('deletes output path', (done) => {
+  it('deletes output path', async () => {
     // Write a file to the output path to later verify it was deleted.
-    host.scopedSync().write(join(outputPath, 'file.txt'), virtualFs.stringToFileBuffer('file'));
+    await host.write(
+      join(host.root(), 'dist/file.txt'),
+      virtualFs.stringToFileBuffer('file'),
+    ).toPromise();
+
     // Delete an app file to force a failed compilation.
     // Failed compilations still delete files, but don't output any.
-    host.delete(join(host.root(), 'src', 'app', 'app.component.ts')).subscribe({
-      error: done.fail,
-    });
-
-    runTargetSpec(host, browserTargetSpec).pipe(
-      tap((buildEvent) => {
-        expect(buildEvent.success).toBe(false);
-        expect(host.scopedSync().exists(outputPath)).toBe(false);
-      }),
-    ).toPromise().then(done, done.fail);
+    await host.delete(join(host.root(), 'src', 'app', 'app.component.ts')).toPromise();
+
+    const run = await architect.scheduleTarget(target);
+    const output = await run.result;
+    expect(output.success).toBe(false);
+    expect(await host.exists(join(host.root(), 'dist')).toPromise()).toBe(false);
+    await run.stop();
   });
 
-  it('does not allow output path to be project root', (done) => {
+  it('does not allow output path to be project root', async () => {
     const overrides = { outputPath: './' };
-
-    runTargetSpec(host, browserTargetSpec, overrides)
-      .subscribe(undefined, () => done(), done.fail);
+    const run = await architect.scheduleTarget(target, overrides);
+    try {
+      await run.result;
+      expect('THE ABOVE LINE SHOULD THROW').toBe('');
+    } catch {}
+    await run.stop();
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/poll2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/poll2_spec_large.ts
deleted file mode 100644
index 22373d4a32ea..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/poll2_spec_large.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { debounceTime, take, tap } from 'rxjs/operators';
-import { createArchitect, host } from '../utils';
-
-
-describe('Browser Builder poll', () => {
-  const target = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('works', async () => {
-    const overrides = { watch: true, poll: 10000 };
-    const intervals: number[] = [];
-    let startTime: number | undefined;
-
-    const run = await architect.scheduleTarget(target, overrides);
-    await run.output.pipe(
-      // Debounce 1s, otherwise changes are too close together and polling doesn't work.
-      debounceTime(1000),
-      tap((buildEvent) => {
-        expect(buildEvent.success).toBe(true);
-        if (startTime != undefined) {
-          intervals.push(Date.now() - startTime - 1000);
-        }
-        startTime = Date.now();
-        host.appendToFile('src/main.ts', 'console.log(1);');
-      }),
-      take(4),
-    ).toPromise();
-
-    intervals.sort();
-    const median = intervals[Math.trunc(intervals.length / 2)];
-    expect(median).toBeGreaterThan(3000);
-    expect(median).toBeLessThan(12000);
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/poll_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/poll_spec_large.ts
index ea2b42387d58..22373d4a32ea 100644
--- a/packages/angular_devkit/build_angular/test/browser/poll_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/poll_spec_large.ts
@@ -6,20 +6,28 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { runTargetSpec } from '@angular-devkit/architect/testing';
+import { Architect } from '@angular-devkit/architect/src/index2';
 import { debounceTime, take, tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { createArchitect, host } from '../utils';
 
 
 describe('Browser Builder poll', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  it('works', (done) => {
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
     const overrides = { watch: true, poll: 10000 };
     const intervals: number[] = [];
     let startTime: number | undefined;
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
+
+    const run = await architect.scheduleTarget(target, overrides);
+    await run.output.pipe(
       // Debounce 1s, otherwise changes are too close together and polling doesn't work.
       debounceTime(1000),
       tap((buildEvent) => {
@@ -31,12 +39,11 @@ describe('Browser Builder poll', () => {
         host.appendToFile('src/main.ts', 'console.log(1);');
       }),
       take(4),
-    ).subscribe(undefined, done.fail, () => {
-      intervals.sort();
-      const median = intervals[Math.trunc(intervals.length / 2)];
-      expect(median).toBeGreaterThan(3000);
-      expect(median).toBeLessThan(12000);
-      done();
-    });
+    ).toPromise();
+
+    intervals.sort();
+    const median = intervals[Math.trunc(intervals.length / 2)];
+    expect(median).toBeGreaterThan(3000);
+    expect(median).toBeLessThan(12000);
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/profile2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/profile2_spec_large.ts
deleted file mode 100644
index 54faa2876dd5..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/profile2_spec_large.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { join, normalize } from '@angular-devkit/core';
-import { BrowserBuilderOutput } from '../../src/browser/index2';
-import { browserBuild, createArchitect, host } from '../utils';
-
-
-describe('Browser Builder profile', () => {
-  const target = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('works', async () => {
-    const run = await architect.scheduleTarget(target, { profile: true });
-    const output = await run.result as BrowserBuilderOutput;
-
-    expect(output.success).toBe(true);
-    expect(host.scopedSync().exists(normalize('chrome-profiler-events.json'))).toBe(true);
-    expect(host.scopedSync().exists(normalize('speed-measure-plugin.json'))).toBe(true);
-
-    await run.stop();
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/profile_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/profile_spec_large.ts
index e17349953549..54faa2876dd5 100644
--- a/packages/angular_devkit/build_angular/test/browser/profile_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/profile_spec_large.ts
@@ -5,25 +5,30 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { normalize } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { join, normalize } from '@angular-devkit/core';
+import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { browserBuild, createArchitect, host } from '../utils';
 
 
 describe('Browser Builder profile', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
+    const run = await architect.scheduleTarget(target, { profile: true });
+    const output = await run.result as BrowserBuilderOutput;
+
+    expect(output.success).toBe(true);
+    expect(host.scopedSync().exists(normalize('chrome-profiler-events.json'))).toBe(true);
+    expect(host.scopedSync().exists(normalize('speed-measure-plugin.json'))).toBe(true);
 
-  it('works', (done) => {
-    const overrides = { profile: true };
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        expect(host.scopedSync().exists(normalize('chrome-profiler-events.json'))).toBe(true);
-        expect(host.scopedSync().exists(normalize('speed-measure-plugin.json'))).toBe(true);
-      }),
-    ).toPromise().then(done, done.fail);
+    await run.stop();
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/rebuild2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/rebuild2_spec_large.ts
deleted file mode 100644
index 42d2fd6835d4..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/rebuild2_spec_large.ts
+++ /dev/null
@@ -1,350 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-// tslint:disable:no-big-function
-
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { TestLogger } from '@angular-devkit/architect/testing';
-import { normalize, virtualFs } from '@angular-devkit/core';
-import { debounceTime, take, takeWhile, tap } from 'rxjs/operators';
-import { createArchitect, host, lazyModuleFiles, lazyModuleImport } from '../utils';
-
-
-describe('Browser Builder rebuilds', () => {
-  const target = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('rebuilds on TS file changes', async () => {
-    const goldenValueFiles: { [path: string]: string } = {
-      'src/app/app.module.ts': `
-        import { BrowserModule } from '@angular/platform-browser';
-        import { NgModule } from '@angular/core';
-
-        import { AppComponent } from './app.component';
-
-        @NgModule({
-          declarations: [
-            AppComponent
-          ],
-          imports: [
-            BrowserModule
-          ],
-          providers: [],
-          bootstrap: [AppComponent]
-        })
-        export class AppModule { }
-
-        console.log('$$_E2E_GOLDEN_VALUE_1');
-        export let X = '$$_E2E_GOLDEN_VALUE_2';
-      `,
-      'src/main.ts': `
-        import { enableProdMode } from '@angular/core';
-        import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-
-        import { AppModule } from './app/app.module';
-        import { environment } from './environments/environment';
-
-        if (environment.production) {
-          enableProdMode();
-        }
-
-        platformBrowserDynamic().bootstrapModule(AppModule);
-
-        import * as m from './app/app.module';
-        console.log(m.X);
-        console.log('$$_E2E_GOLDEN_VALUE_3');
-      `,
-    };
-
-    const overrides = { watch: true };
-
-    let buildCount = 0;
-    let phase = 1;
-    const run = await architect.scheduleTarget(target, overrides);
-    await run.output.pipe(
-      tap(result => {
-        expect(result.success).toBe(true, 'build should succeed');
-        buildCount++;
-
-        const hasLazyChunk = host.scopedSync().exists(normalize('dist/lazy-lazy-module.js'));
-        switch (phase) {
-          case 1:
-            // No lazy chunk should exist.
-            if (!hasLazyChunk) {
-              phase = 2;
-              host.writeMultipleFiles({ ...lazyModuleFiles, ...lazyModuleImport });
-            }
-            break;
-
-          case 2:
-            // A lazy chunk should have been with the filename.
-            if (hasLazyChunk) {
-              phase = 3;
-              host.writeMultipleFiles(goldenValueFiles);
-            }
-            break;
-
-          case 3:
-            // The golden values should be present and in the right order.
-            const re = new RegExp(
-              /\$\$_E2E_GOLDEN_VALUE_1(.|\n|\r)*/.source
-              + /\$\$_E2E_GOLDEN_VALUE_2(.|\n|\r)*/.source
-              + /\$\$_E2E_GOLDEN_VALUE_3/.source,
-            );
-            const fileName = './dist/main.js';
-            const content = virtualFs.fileBufferToString(
-              host.scopedSync().read(normalize(fileName)),
-            );
-
-            if (re.test(content)) {
-              phase = 4;
-            }
-            break;
-        }
-      }),
-      takeWhile(() => phase < 4),
-    ).toPromise();
-    await run.stop();
-  });
-
-  it('rebuilds on CSS changes', async () => {
-    const overrides = { watch: true };
-
-    const run = await architect.scheduleTarget(target, overrides);
-    await run.output.pipe(
-      debounceTime(500),
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => host.appendToFile('src/app/app.component.css', ':host { color: blue; }')),
-      take(2),
-    ).toPromise();
-    await run.stop();
-  });
-
-  it('type checks on rebuilds', async () => {
-    host.writeMultipleFiles({
-      'src/funky2.ts': `export const funky2 = (value: string) => value + 'hello';`,
-      'src/funky.ts': `export * from './funky2';`,
-    });
-    host.appendToFile('src/main.ts', `
-      import { funky2 } from './funky';
-      console.log(funky2('town'));
-    `);
-
-    const overrides = { watch: true, forkTypeChecker: false };
-    const logger = new TestLogger('rebuild-type-errors');
-    const typeError = `is not assignable to parameter of type 'number'`;
-    let buildNumber = 0;
-
-    const run = await architect.scheduleTarget(target, overrides, { logger });
-    await run.output.pipe(
-      debounceTime(1000),
-      tap((buildEvent) => {
-        buildNumber += 1;
-        switch (buildNumber) {
-          case 1:
-            expect(buildEvent.success).toBe(true);
-            // Make an invalid version of the file.
-            // Should trigger a rebuild, this time an error is expected.
-            host.writeMultipleFiles({
-              'src/funky2.ts': `export const funky2 = (value: number) => value + 1;`,
-            });
-            break;
-
-          case 2:
-            // The second build should error out with a type error on the type of an argument.
-            expect(buildEvent.success).toBe(false);
-            expect(logger.includes(typeError)).toBe(true);
-            logger.clear();
-            // Change an UNRELATED file and the error should still happen.
-            // Should trigger a rebuild, this time an error is also expected.
-            host.appendToFile('src/app/app.module.ts', `console.log(1);`);
-            break;
-
-          case 3:
-            // The third build should have the same error as the first.
-            expect(buildEvent.success).toBe(false);
-            expect(logger.includes(typeError)).toBe(true);
-            logger.clear();
-            // Fix the error.
-            host.writeMultipleFiles({
-              'src/funky2.ts': `export const funky2 = (value: string) => value + 'hello';`,
-            });
-            break;
-
-          default:
-            expect(buildEvent.success).toBe(true);
-            break;
-        }
-      }),
-      take(4),
-    ).toPromise();
-    await run.stop();
-  });
-
-  it('rebuilds on type changes', async () => {
-    host.writeMultipleFiles({ 'src/type.ts': `export type MyType = number;` });
-    host.appendToFile('src/main.ts', `import { MyType } from './type';`);
-
-    const overrides = { watch: true };
-    const run = await architect.scheduleTarget(target, overrides);
-    await run.output.pipe(
-      debounceTime(1000),
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => host.writeMultipleFiles({ 'src/type.ts': `export type MyType = string;` })),
-      take(2),
-    ).toPromise();
-  });
-
-  it('rebuilds after errors in AOT', async () => {
-    // Save the original contents of `./src/app/app.component.ts`.
-    const origContent = virtualFs.fileBufferToString(
-      host.scopedSync().read(normalize('src/app/app.component.ts')));
-    // Add a major static analysis error on a non-main file to the initial build.
-    host.replaceInFile('./src/app/app.component.ts', `'app-root'`, `(() => 'app-root')()`);
-
-    const overrides = { watch: true, aot: true };
-    const logger = new TestLogger('rebuild-aot-errors');
-    const staticAnalysisError = 'Function expressions are not supported in decorators';
-    const syntaxError = 'Declaration or statement expected.';
-    let buildNumber = 0;
-
-    const run = await architect.scheduleTarget(target, overrides, { logger });
-    await run.output.pipe(
-      debounceTime(1000),
-      tap((buildEvent) => {
-        buildNumber += 1;
-        switch (buildNumber) {
-          case 1:
-            // The first build should error out with a static analysis error.
-            expect(buildEvent.success).toBe(false);
-            expect(logger.includes(staticAnalysisError)).toBe(true);
-            logger.clear();
-            // Fix the static analysis error.
-            host.writeMultipleFiles({ 'src/app/app.component.ts': origContent });
-            break;
-
-          case 2:
-            expect(buildEvent.success).toBe(true);
-            // Add an syntax error to a non-main file.
-            host.appendToFile('src/app/app.component.ts', `]]]`);
-            break;
-
-          case 3:
-            // The third build should have TS syntax error.
-            expect(buildEvent.success).toBe(false);
-            expect(logger.includes(syntaxError)).toBe(true);
-            logger.clear();
-            // Fix the syntax error, but add the static analysis error again.
-            host.writeMultipleFiles({
-              'src/app/app.component.ts': origContent.replace(`'app-root'`, `(() => 'app-root')()`),
-            });
-            break;
-
-          case 4:
-            expect(buildEvent.success).toBe(false);
-            // Restore the file to a error-less state.
-            host.writeMultipleFiles({ 'src/app/app.component.ts': origContent });
-            break;
-
-          case 5:
-            // The fifth build should have everything fixed..
-            expect(buildEvent.success).toBe(true);
-            expect(logger.includes(staticAnalysisError)).toBe(true);
-            break;
-        }
-      }),
-      take(5),
-    ).toPromise();
-    await run.stop();
-  });
-
-  it('rebuilds AOT factories', async () => {
-
-    host.writeMultipleFiles({
-      'src/app/app.component.css': `
-        @import './imported-styles.css';
-        body {background-color: #00f;}
-      `,
-      'src/app/imported-styles.css': 'p {color: #f00;}',
-    });
-
-    const overrides = { watch: true, aot: true };
-    let buildNumber = 0;
-
-    const run = await architect.scheduleTarget(target, overrides);
-    await run.output.pipe(
-      debounceTime(1000),
-      tap((buildEvent) => {
-        buildNumber += 1;
-        const fileName = './dist/main.js';
-        let content;
-        switch (buildNumber) {
-          case 1:
-            // Trigger a few rebuilds first.
-            // The AOT compiler is still optimizing rebuilds on the first rebuilds.
-            expect(buildEvent.success).toBe(true);
-            host.appendToFile('src/main.ts', 'console.log(1);');
-            break;
-
-          case 2:
-            expect(buildEvent.success).toBe(true);
-            host.appendToFile('src/main.ts', 'console.log(1);');
-            break;
-
-          case 3:
-            // Change the component html.
-            expect(buildEvent.success).toBe(true);
-            host.appendToFile('src/app/app.component.html', '<p>HTML_REBUILD_STRING<p>');
-            break;
-
-          case 4:
-            // Check if html changes are added to factories.
-            expect(buildEvent.success).toBe(true);
-            content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-            expect(content).toContain('HTML_REBUILD_STRING');
-            // Change the component css.
-            host.appendToFile('src/app/app.component.css', 'CSS_REBUILD_STRING {color: #f00;}');
-            break;
-
-          case 5:
-            // Check if css changes are added to factories.
-            expect(buildEvent.success).toBe(true);
-            content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-            expect(content).toContain('CSS_REBUILD_STRING');
-            // Change the component css import.
-            host.appendToFile('src/app/app.component.css', 'CSS_DEP_REBUILD_STRING {color: #f00;}');
-            break;
-
-          case 6:
-            // Check if css import changes are added to factories.
-            expect(buildEvent.success).toBe(true);
-            content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-            expect(content).toContain('CSS_DEP_REBUILD_STRING');
-            // Change the component itself.
-            host.replaceInFile('src/app/app.component.ts', 'app-root',
-              'app-root-FACTORY_REBUILD_STRING');
-            break;
-
-          case 7:
-            // Check if component changes are added to factories.
-            expect(buildEvent.success).toBe(true);
-            content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-            expect(content).toContain('FACTORY_REBUILD_STRING');
-            break;
-        }
-      }),
-      take(7),
-    ).toPromise();
-    await run.stop();
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
index 1e40dd454e09..42d2fd6835d4 100644
--- a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
@@ -7,20 +7,24 @@
  */
 // tslint:disable:no-big-function
 
-import { DefaultTimeout, TestLogger, runTargetSpec } from '@angular-devkit/architect/testing';
-import { join, normalize, virtualFs } from '@angular-devkit/core';
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { TestLogger } from '@angular-devkit/architect/testing';
+import { normalize, virtualFs } from '@angular-devkit/core';
 import { debounceTime, take, takeWhile, tap } from 'rxjs/operators';
-import { browserTargetSpec, host, lazyModuleFiles, lazyModuleImport } from '../utils';
+import { createArchitect, host, lazyModuleFiles, lazyModuleImport } from '../utils';
 
 
 describe('Browser Builder rebuilds', () => {
-  const outputPath = normalize('dist');
-
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
 
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
-  it('rebuilds on TS file changes', (done) => {
+  it('rebuilds on TS file changes', async () => {
     const goldenValueFiles: { [path: string]: string } = {
       'src/app/app.module.ts': `
         import { BrowserModule } from '@angular/platform-browser';
@@ -66,11 +70,13 @@ describe('Browser Builder rebuilds', () => {
 
     let buildCount = 0;
     let phase = 1;
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 3).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true, 'build should succeed')),
-      tap(() => {
+    const run = await architect.scheduleTarget(target, overrides);
+    await run.output.pipe(
+      tap(result => {
+        expect(result.success).toBe(true, 'build should succeed');
         buildCount++;
-        const hasLazyChunk = host.scopedSync().exists(join(outputPath, 'lazy-lazy-module.js'));
+
+        const hasLazyChunk = host.scopedSync().exists(normalize('dist/lazy-lazy-module.js'));
         switch (phase) {
           case 1:
             // No lazy chunk should exist.
@@ -107,24 +113,24 @@ describe('Browser Builder rebuilds', () => {
         }
       }),
       takeWhile(() => phase < 4),
-      ).toPromise().then(
-        () => done(),
-        () => done.fail(`stuck at phase ${phase} [builds: ${buildCount}]`),
-      );
+    ).toPromise();
+    await run.stop();
   });
 
-  it('rebuilds on CSS changes', (done) => {
+  it('rebuilds on CSS changes', async () => {
     const overrides = { watch: true };
 
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 3).pipe(
+    const run = await architect.scheduleTarget(target, overrides);
+    await run.output.pipe(
       debounceTime(500),
       tap((buildEvent) => expect(buildEvent.success).toBe(true)),
       tap(() => host.appendToFile('src/app/app.component.css', ':host { color: blue; }')),
       take(2),
-    ).toPromise().then(done, done.fail);
+    ).toPromise();
+    await run.stop();
   });
 
-  it('type checks on rebuilds', (done) => {
+  it('type checks on rebuilds', async () => {
     host.writeMultipleFiles({
       'src/funky2.ts': `export const funky2 = (value: string) => value + 'hello';`,
       'src/funky.ts': `export * from './funky2';`,
@@ -139,7 +145,8 @@ describe('Browser Builder rebuilds', () => {
     const typeError = `is not assignable to parameter of type 'number'`;
     let buildNumber = 0;
 
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 3, logger).pipe(
+    const run = await architect.scheduleTarget(target, overrides, { logger });
+    await run.output.pipe(
       debounceTime(1000),
       tap((buildEvent) => {
         buildNumber += 1;
@@ -180,25 +187,25 @@ describe('Browser Builder rebuilds', () => {
         }
       }),
       take(4),
-    ).toPromise().then(done, done.fail);
+    ).toPromise();
+    await run.stop();
   });
 
-  it('rebuilds on type changes', (done) => {
+  it('rebuilds on type changes', async () => {
     host.writeMultipleFiles({ 'src/type.ts': `export type MyType = number;` });
     host.appendToFile('src/main.ts', `import { MyType } from './type';`);
 
     const overrides = { watch: true };
-
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 3).pipe(
+    const run = await architect.scheduleTarget(target, overrides);
+    await run.output.pipe(
       debounceTime(1000),
       tap((buildEvent) => expect(buildEvent.success).toBe(true)),
       tap(() => host.writeMultipleFiles({ 'src/type.ts': `export type MyType = string;` })),
       take(2),
-    ).toPromise().then(done, done.fail);
+    ).toPromise();
   });
 
-
-  it('rebuilds after errors in AOT', (done) => {
+  it('rebuilds after errors in AOT', async () => {
     // Save the original contents of `./src/app/app.component.ts`.
     const origContent = virtualFs.fileBufferToString(
       host.scopedSync().read(normalize('src/app/app.component.ts')));
@@ -211,7 +218,8 @@ describe('Browser Builder rebuilds', () => {
     const syntaxError = 'Declaration or statement expected.';
     let buildNumber = 0;
 
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 3, logger).pipe(
+    const run = await architect.scheduleTarget(target, overrides, { logger });
+    await run.output.pipe(
       debounceTime(1000),
       tap((buildEvent) => {
         buildNumber += 1;
@@ -256,11 +264,11 @@ describe('Browser Builder rebuilds', () => {
         }
       }),
       take(5),
-    ).toPromise().then(done, done.fail);
+    ).toPromise();
+    await run.stop();
   });
 
-
-  it('rebuilds AOT factories', (done) => {
+  it('rebuilds AOT factories', async () => {
 
     host.writeMultipleFiles({
       'src/app/app.component.css': `
@@ -273,7 +281,8 @@ describe('Browser Builder rebuilds', () => {
     const overrides = { watch: true, aot: true };
     let buildNumber = 0;
 
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 3).pipe(
+    const run = await architect.scheduleTarget(target, overrides);
+    await run.output.pipe(
       debounceTime(1000),
       tap((buildEvent) => {
         buildNumber += 1;
@@ -335,6 +344,7 @@ describe('Browser Builder rebuilds', () => {
         }
       }),
       take(7),
-    ).toPromise().then(done, done.fail);
+    ).toPromise();
+    await run.stop();
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/replacements2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/replacements2_spec_large.ts
deleted file mode 100644
index 1ac6e1d47efa..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/replacements2_spec_large.ts
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { TestLogger } from '@angular-devkit/architect/testing';
-import { normalize, virtualFs } from '@angular-devkit/core';
-import { of, race } from 'rxjs';
-import { delay, filter, map, take, takeUntil, takeWhile, tap, timeout } from 'rxjs/operators';
-import { browserBuild, createArchitect, host } from '../utils';
-
-
-describe('Browser Builder file replacements', () => {
-  const target = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  beforeEach(() => host.writeMultipleFiles({
-    'src/meaning-too.ts': 'export var meaning = 42;',
-    'src/meaning.ts': `export var meaning = 10;`,
-
-    'src/main.ts': `
-        import { meaning } from './meaning';
-
-        console.log(meaning);
-      `,
-  }));
-
-  it('allows file replacements', async () => {
-    const overrides = {
-      fileReplacements: [
-        {
-          replace: normalize('/src/meaning.ts'),
-          with: normalize('/src/meaning-too.ts'),
-        },
-      ],
-    };
-
-    const { files } = await browserBuild(architect, host, target, overrides);
-    expect(await files['main.js']).toMatch(/meaning\s*=\s*42/);
-    expect(await files['main.js']).not.toMatch(/meaning\s*=\s*10/);
-  });
-
-  it(`allows file replacements with deprecated format`, async () => {
-    const overrides = {
-      fileReplacements: [
-        {
-          src: normalize('/src/meaning.ts'),
-          replaceWith: normalize('/src/meaning-too.ts'),
-        },
-      ],
-    };
-
-    const { files } = await browserBuild(architect, host, target, overrides);
-    expect(await files['main.js']).toMatch(/meaning\s*=\s*42/);
-    expect(await files['main.js']).not.toMatch(/meaning\s*=\s*10/);
-  });
-
-  it(`fails compilation with missing 'replace' file`, async () => {
-    const overrides = {
-      fileReplacements: [
-        {
-          replace: normalize('/src/meaning.ts'),
-          with: normalize('/src/meaning-three.ts'),
-        },
-      ],
-    };
-
-    const run = await architect.scheduleTarget(target, overrides);
-    try {
-      await run.result;
-      expect('THE ABOVE LINE SHOULD THROW').toBe('');
-    } catch {}
-    await run.stop();
-  });
-
-  it(`fails compilation with missing 'with' file`, async () => {
-    const overrides = {
-      fileReplacements: [
-        {
-          replace: normalize('/src/meaning-three.ts'),
-          with: normalize('/src/meaning-too.ts'),
-        },
-      ],
-    };
-
-    const run = await architect.scheduleTarget(target, overrides);
-    try {
-      await run.result;
-      expect('THE ABOVE LINE SHOULD THROW').toBe('');
-    } catch {}
-    await run.stop();
-  });
-
-  it('file replacements work with watch mode', async () => {
-    const overrides = {
-      fileReplacements: [
-        {
-          replace: normalize('/src/meaning.ts'),
-          with: normalize('/src/meaning-too.ts'),
-        },
-      ],
-      watch: true,
-    };
-
-    let buildCount = 0;
-    let phase = 1;
-
-    const run = await architect.scheduleTarget(target, overrides);
-    await run.output.pipe(
-      timeout(30000),
-      tap((result) => {
-        expect(result.success).toBe(true, 'build should succeed');
-
-        const fileName = normalize('dist/main.js');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(fileName));
-        const has42 = /meaning\s*=\s*42/.test(content);
-        buildCount++;
-        switch (phase) {
-          case 1:
-            const has10 = /meaning\s*=\s*10/.test(content);
-
-            if (has42 && !has10) {
-              phase = 2;
-              host.writeMultipleFiles({
-                'src/meaning-too.ts': 'export var meaning = 84;',
-              });
-            }
-            break;
-
-          case 2:
-            const has84 = /meaning\s*=\s*84/.test(content);
-
-            if (has84 && !has42) {
-              phase = 3;
-            } else {
-              // try triggering a rebuild again
-              host.writeMultipleFiles({
-                'src/meaning-too.ts': 'export var meaning = 84;',
-              });
-            }
-            break;
-        }
-      }),
-      takeWhile(() => phase < 3),
-    ).toPromise().catch(() => {
-      throw new Error(`stuck at phase ${phase} [builds: ${buildCount}]`);
-    });
-
-    await run.stop();
-  });
-
-  it('file replacements work with forked type checker on watch mode', async () => {
-    host.writeMultipleFiles({
-      'src/file-replaced.ts': 'export var obj = { one: 1, two: 2 };',
-      'src/file.ts': `export var obj = { one: 1 };`,
-      'src/main.ts': `
-        import { obj } from './file';
-        console.log(obj.two);
-      `,
-    });
-
-    const overrides = {
-      fileReplacements: [{
-        replace: normalize('/src/file.ts'),
-        with: normalize('/src/file-replaced.ts'),
-      }],
-      watch: true,
-    };
-
-    const unexpectedError = `Property 'two' does not exist on type '{ one: number; }'`;
-    const expectedError = `Property 'prop' does not exist on type '{}'`;
-    const logger = new TestLogger('rebuild-type-errors');
-
-    // Race between a timeout and the expected log entry.
-    const stop$ = race<null | string>(
-      of(null).pipe(delay(45000 * 2 / 3)),
-      logger.pipe(
-        filter(entry => entry.message.includes(expectedError)),
-        map(entry => entry.message),
-        take(1),
-      ),
-    );
-
-    let errorAdded = false;
-    const run = await architect.scheduleTarget(target, overrides, { logger });
-    run.output.pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true, 'build should succeed')),
-      tap(() => {
-        // Introduce a known type error to detect in the logger filter.
-        if (!errorAdded) {
-          host.appendToFile('src/main.ts', 'console.log({}.prop);');
-          errorAdded = true;
-        }
-      }),
-      takeUntil(stop$),
-    ).subscribe();
-
-    const res = await stop$.toPromise();
-    expect(res).not.toBe(null, 'Test timed out.');
-    expect(res).not.toContain(unexpectedError);
-    await run.stop();
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/replacements_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/replacements_spec_large.ts
index e1fda961ae9b..1ac6e1d47efa 100644
--- a/packages/angular_devkit/build_angular/test/browser/replacements_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/replacements_spec_large.ts
@@ -6,18 +6,23 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { DefaultTimeout, TestLogger, runTargetSpec } from '@angular-devkit/architect/testing';
-import { join, normalize, virtualFs } from '@angular-devkit/core';
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { TestLogger } from '@angular-devkit/architect/testing';
+import { normalize, virtualFs } from '@angular-devkit/core';
 import { of, race } from 'rxjs';
-import { delay, filter, map, take, takeUntil, takeWhile, tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { delay, filter, map, take, takeUntil, takeWhile, tap, timeout } from 'rxjs/operators';
+import { browserBuild, createArchitect, host } from '../utils';
 
 
 describe('Browser Builder file replacements', () => {
-  const outputPath = normalize('dist');
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
   beforeEach(() => host.writeMultipleFiles({
     'src/meaning-too.ts': 'export var meaning = 42;',
@@ -30,7 +35,7 @@ describe('Browser Builder file replacements', () => {
       `,
   }));
 
-  it('allows file replacements', (done) => {
+  it('allows file replacements', async () => {
     const overrides = {
       fileReplacements: [
         {
@@ -40,19 +45,12 @@ describe('Browser Builder file replacements', () => {
       ],
     };
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'main.js');
-        expect(virtualFs.fileBufferToString(host.scopedSync().read(fileName)))
-          .toMatch(/meaning\s*=\s*42/);
-        expect(virtualFs.fileBufferToString(host.scopedSync().read(fileName)))
-          .not.toMatch(/meaning\s*=\s*10/);
-      }),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['main.js']).toMatch(/meaning\s*=\s*42/);
+    expect(await files['main.js']).not.toMatch(/meaning\s*=\s*10/);
   });
 
-  it(`allows file replacements with deprecated format`, (done) => {
+  it(`allows file replacements with deprecated format`, async () => {
     const overrides = {
       fileReplacements: [
         {
@@ -62,19 +60,12 @@ describe('Browser Builder file replacements', () => {
       ],
     };
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'main.js');
-        expect(virtualFs.fileBufferToString(host.scopedSync().read(fileName)))
-          .toMatch(/meaning\s*=\s*42/);
-        expect(virtualFs.fileBufferToString(host.scopedSync().read(fileName)))
-          .not.toMatch(/meaning\s*=\s*10/);
-      }),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['main.js']).toMatch(/meaning\s*=\s*42/);
+    expect(await files['main.js']).not.toMatch(/meaning\s*=\s*10/);
   });
 
-  it(`fails compilation with missing 'replace' file`, (done) => {
+  it(`fails compilation with missing 'replace' file`, async () => {
     const overrides = {
       fileReplacements: [
         {
@@ -84,11 +75,15 @@ describe('Browser Builder file replacements', () => {
       ],
     };
 
-    runTargetSpec(host, browserTargetSpec, overrides)
-      .subscribe(undefined, () => done(), done.fail);
+    const run = await architect.scheduleTarget(target, overrides);
+    try {
+      await run.result;
+      expect('THE ABOVE LINE SHOULD THROW').toBe('');
+    } catch {}
+    await run.stop();
   });
 
-  it(`fails compilation with missing 'with' file`, (done) => {
+  it(`fails compilation with missing 'with' file`, async () => {
     const overrides = {
       fileReplacements: [
         {
@@ -98,11 +93,15 @@ describe('Browser Builder file replacements', () => {
       ],
     };
 
-    runTargetSpec(host, browserTargetSpec, overrides)
-      .subscribe(undefined, () => done(), done.fail);
+    const run = await architect.scheduleTarget(target, overrides);
+    try {
+      await run.result;
+      expect('THE ABOVE LINE SHOULD THROW').toBe('');
+    } catch {}
+    await run.stop();
   });
 
-  it('file replacements work with watch mode', (done) => {
+  it('file replacements work with watch mode', async () => {
     const overrides = {
       fileReplacements: [
         {
@@ -115,10 +114,14 @@ describe('Browser Builder file replacements', () => {
 
     let buildCount = 0;
     let phase = 1;
-    runTargetSpec(host, browserTargetSpec, overrides, 30000).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true, 'build should succeed')),
-      tap(() => {
-        const fileName = join(outputPath, 'main.js');
+
+    const run = await architect.scheduleTarget(target, overrides);
+    await run.output.pipe(
+      timeout(30000),
+      tap((result) => {
+        expect(result.success).toBe(true, 'build should succeed');
+
+        const fileName = normalize('dist/main.js');
         const content = virtualFs.fileBufferToString(host.scopedSync().read(fileName));
         const has42 = /meaning\s*=\s*42/.test(content);
         buildCount++;
@@ -149,10 +152,11 @@ describe('Browser Builder file replacements', () => {
         }
       }),
       takeWhile(() => phase < 3),
-    ).toPromise().then(
-      () => done(),
-      () => done.fail(`stuck at phase ${phase} [builds: ${buildCount}]`),
-    );
+    ).toPromise().catch(() => {
+      throw new Error(`stuck at phase ${phase} [builds: ${buildCount}]`);
+    });
+
+    await run.stop();
   });
 
   it('file replacements work with forked type checker on watch mode', async () => {
@@ -179,7 +183,7 @@ describe('Browser Builder file replacements', () => {
 
     // Race between a timeout and the expected log entry.
     const stop$ = race<null | string>(
-      of(null).pipe(delay(DefaultTimeout * 2 / 3)),
+      of(null).pipe(delay(45000 * 2 / 3)),
       logger.pipe(
         filter(entry => entry.message.includes(expectedError)),
         map(entry => entry.message),
@@ -188,7 +192,8 @@ describe('Browser Builder file replacements', () => {
     );
 
     let errorAdded = false;
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout, logger).pipe(
+    const run = await architect.scheduleTarget(target, overrides, { logger });
+    run.output.pipe(
       tap((buildEvent) => expect(buildEvent.success).toBe(true, 'build should succeed')),
       tap(() => {
         // Introduce a known type error to detect in the logger filter.
@@ -203,5 +208,6 @@ describe('Browser Builder file replacements', () => {
     const res = await stop$.toPromise();
     expect(res).not.toBe(null, 'Test timed out.');
     expect(res).not.toContain(unexpectedError);
+    await run.stop();
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/resolve-json-module2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/resolve-json-module2_spec_large.ts
deleted file mode 100644
index 149522603897..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/resolve-json-module2_spec_large.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { join, virtualFs } from '@angular-devkit/core';
-import { take, tap } from 'rxjs/operators';
-import { createArchitect, host, outputPath } from '../utils';
-
-
-describe('Browser Builder resolve json module', () => {
-  const target = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('works with watch', async () => {
-    host.writeMultipleFiles({
-      'src/my-json-file.json': `{"foo": "1"}`,
-      'src/main.ts': `import * as a from './my-json-file.json'; console.log(a);`,
-    });
-
-    host.replaceInFile(
-      'tsconfig.json',
-      '"target": "es5"',
-      '"target": "es5", "resolveJsonModule": true',
-    );
-
-    const overrides = { watch: true };
-
-    let buildCount = 1;
-    const run = await architect.scheduleTarget(target, overrides);
-    await run.output.pipe(
-      tap(() => {
-        const content = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, 'main.js')),
-        );
-
-        switch (buildCount) {
-          case 1:
-            expect(content).toContain('foo":"1"');
-            host.writeMultipleFiles({
-              'src/my-json-file.json': `{"foo": "2"}`,
-            });
-            break;
-          case 2:
-            expect(content).toContain('foo":"2"');
-            break;
-        }
-
-        buildCount++;
-      }),
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      take(2),
-    ).toPromise();
-  });
-
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts
index 3c7e8e9a47aa..149522603897 100644
--- a/packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts
@@ -6,17 +6,23 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { runTargetSpec } from '@angular-devkit/architect/testing';
+import { Architect } from '@angular-devkit/architect/src/index2';
 import { join, virtualFs } from '@angular-devkit/core';
 import { take, tap } from 'rxjs/operators';
-import { browserTargetSpec, host, outputPath } from '../utils';
+import { createArchitect, host, outputPath } from '../utils';
 
 
 describe('Browser Builder resolve json module', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  it('works with watch', (done) => {
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works with watch', async () => {
     host.writeMultipleFiles({
       'src/my-json-file.json': `{"foo": "1"}`,
       'src/main.ts': `import * as a from './my-json-file.json'; console.log(a);`,
@@ -31,7 +37,8 @@ describe('Browser Builder resolve json module', () => {
     const overrides = { watch: true };
 
     let buildCount = 1;
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
+    const run = await architect.scheduleTarget(target, overrides);
+    await run.output.pipe(
       tap(() => {
         const content = virtualFs.fileBufferToString(
           host.scopedSync().read(join(outputPath, 'main.js')),
@@ -53,7 +60,7 @@ describe('Browser Builder resolve json module', () => {
       }),
       tap((buildEvent) => expect(buildEvent.success).toBe(true)),
       take(2),
-    ).toPromise().then(done, done.fail);
+    ).toPromise();
   });
 
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/resources-output-path2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/resources-output-path2_spec_large.ts
deleted file mode 100644
index b97b98e74335..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/resources-output-path2_spec_large.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-// tslint:disable:no-big-function
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { normalize } from '@angular-devkit/core';
-import { browserBuild, createArchitect, host } from '../utils';
-
-
-describe('Browser Builder styles resources output path', () => {
-  const imgSvg = `
-    <svg width="100" height="100" xmlns="http://www.w3.org/2000/svg">
-      <circle cx="50" cy="50" r="40" stroke="green" stroke-width="4" fill="yellow" />
-    </svg>
-  `;
-
-  function writeFiles() {
-    // Use a large image for the relative ref so it cannot be inlined.
-    host.copyFile('src/spectrum.png', './src/assets/global-img-relative.png');
-    host.copyFile('src/spectrum.png', './src/assets/component-img-relative.png');
-    host.writeMultipleFiles({
-      'src/styles.css': `
-          h1 { background: url('/assets/global-img-absolute.svg'); }
-          h2 { background: url('./assets/global-img-relative.png'); }
-        `,
-      'src/app/app.component.css': `
-          h3 { background: url('/assets/component-img-absolute.svg'); }
-          h4 { background: url('../assets/component-img-relative.png'); }
-        `,
-      'src/assets/global-img-absolute.svg': imgSvg,
-      'src/assets/component-img-absolute.svg': imgSvg,
-    });
-  }
-
-  const target = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it(`supports resourcesOutputPath in resource urls`, async () => {
-    writeFiles();
-    // Check base paths are correctly generated.
-    const overrides = {
-      aot: true,
-      extractCss: true,
-      resourcesOutputPath: 'out-assets',
-    };
-
-    const { files } = await browserBuild(architect, host, target, overrides);
-    const styles = await files['styles.css'];
-    const main = await files['main.js'];
-
-    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-    expect(styles).toContain(`url('out-assets/global-img-relative.png')`);
-    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
-    expect(main).toContain(`url('out-assets/component-img-relative.png')`);
-
-    expect(host.scopedSync()
-      .exists(normalize('dist/assets/global-img-absolute.svg'))).toBe(true);
-    expect(host.scopedSync()
-      .exists(normalize('dist/out-assets/global-img-relative.png'))).toBe(true);
-    expect(host.scopedSync()
-      .exists(normalize('dist/assets/component-img-absolute.svg'))).toBe(true);
-    expect(host.scopedSync()
-      .exists(normalize('dist/out-assets/component-img-relative.png'))).toBe(true);
-  });
-
-  it(`supports blank resourcesOutputPath`, async () => {
-    writeFiles();
-
-    // Check base paths are correctly generated.
-    const overrides = { aot: true, extractCss: true };
-    const { files } = await browserBuild(architect, host, target, overrides);
-    const styles = await files['styles.css'];
-    const main = await files['main.js'];
-
-    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-    expect(styles).toContain(`url('global-img-relative.png')`);
-    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
-    expect(main).toContain(`url('component-img-relative.png')`);
-    expect(host.scopedSync().exists(normalize('dist/assets/global-img-absolute.svg')))
-      .toBe(true);
-    expect(host.scopedSync().exists(normalize('dist/global-img-relative.png')))
-      .toBe(true);
-    expect(host.scopedSync().exists(normalize('dist/assets/component-img-absolute.svg')))
-      .toBe(true);
-    expect(host.scopedSync().exists(normalize('dist/component-img-relative.png')))
-      .toBe(true);
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/resources-output-path_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/resources-output-path_spec_large.ts
index cc97c3d69b8f..b97b98e74335 100644
--- a/packages/angular_devkit/build_angular/test/browser/resources-output-path_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/resources-output-path_spec_large.ts
@@ -6,17 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 // tslint:disable:no-big-function
-
-import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { normalize, virtualFs } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { normalize } from '@angular-devkit/core';
+import { browserBuild, createArchitect, host } from '../utils';
 
 
 describe('Browser Builder styles resources output path', () => {
-  const stylesBundle = 'dist/styles.css';
-  const mainBundle = 'dist/main.js';
-
   const imgSvg = `
     <svg width="100" height="100" xmlns="http://www.w3.org/2000/svg">
       <circle cx="50" cy="50" r="40" stroke="green" stroke-width="4" fill="yellow" />
@@ -41,10 +36,16 @@ describe('Browser Builder styles resources output path', () => {
     });
   }
 
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  it(`supports resourcesOutputPath in resource urls`, (done) => {
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it(`supports resourcesOutputPath in resource urls`, async () => {
     writeFiles();
     // Check base paths are correctly generated.
     const overrides = {
@@ -53,56 +54,45 @@ describe('Browser Builder styles resources output path', () => {
       resourcesOutputPath: 'out-assets',
     };
 
-    runTargetSpec(host, browserTargetSpec, overrides, undefined, undefined).pipe(
-      tap(() => {
-        const styles = virtualFs.fileBufferToString(
-          host.scopedSync().read(normalize(stylesBundle)),
-        );
+    const { files } = await browserBuild(architect, host, target, overrides);
+    const styles = await files['styles.css'];
+    const main = await files['main.js'];
 
-        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
-        expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-        expect(styles).toContain(`url('out-assets/global-img-relative.png')`);
-        expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
-        expect(main).toContain(`url('out-assets/component-img-relative.png')`);
+    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+    expect(styles).toContain(`url('out-assets/global-img-relative.png')`);
+    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+    expect(main).toContain(`url('out-assets/component-img-relative.png')`);
 
-        expect(host.scopedSync()
-          .exists(normalize('dist/assets/global-img-absolute.svg'))).toBe(true);
-        expect(host.scopedSync()
-          .exists(normalize('dist/out-assets/global-img-relative.png'))).toBe(true);
-        expect(host.scopedSync()
-          .exists(normalize('dist/assets/component-img-absolute.svg'))).toBe(true);
-        expect(host.scopedSync()
-          .exists(normalize('dist/out-assets/component-img-relative.png'))).toBe(true);
-      }),
-    ).toPromise().then(done, done.fail);
+    expect(host.scopedSync()
+      .exists(normalize('dist/assets/global-img-absolute.svg'))).toBe(true);
+    expect(host.scopedSync()
+      .exists(normalize('dist/out-assets/global-img-relative.png'))).toBe(true);
+    expect(host.scopedSync()
+      .exists(normalize('dist/assets/component-img-absolute.svg'))).toBe(true);
+    expect(host.scopedSync()
+      .exists(normalize('dist/out-assets/component-img-relative.png'))).toBe(true);
   });
 
-  it(`supports blank resourcesOutputPath`, (done) => {
+  it(`supports blank resourcesOutputPath`, async () => {
     writeFiles();
 
     // Check base paths are correctly generated.
     const overrides = { aot: true, extractCss: true };
-    runTargetSpec(host, browserTargetSpec, overrides, undefined, undefined).pipe(
-      tap(() => {
-        const styles = virtualFs.fileBufferToString(
-          host.scopedSync().read(normalize(stylesBundle)),
-        );
+    const { files } = await browserBuild(architect, host, target, overrides);
+    const styles = await files['styles.css'];
+    const main = await files['main.js'];
 
-        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
-        expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-        expect(styles).toContain(`url('global-img-relative.png')`);
-        expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
-        expect(main).toContain(`url('component-img-relative.png')`);
-        expect(host.scopedSync().exists(normalize('dist/assets/global-img-absolute.svg')))
-          .toBe(true);
-        expect(host.scopedSync().exists(normalize('dist/global-img-relative.png')))
-          .toBe(true);
-        expect(host.scopedSync().exists(normalize('dist/assets/component-img-absolute.svg')))
-          .toBe(true);
-        expect(host.scopedSync().exists(normalize('dist/component-img-relative.png')))
-          .toBe(true);
-      }),
-    ).toPromise().then(done, done.fail);
+    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+    expect(styles).toContain(`url('global-img-relative.png')`);
+    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+    expect(main).toContain(`url('component-img-relative.png')`);
+    expect(host.scopedSync().exists(normalize('dist/assets/global-img-absolute.svg')))
+      .toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/global-img-relative.png')))
+      .toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/assets/component-img-absolute.svg')))
+      .toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/component-img-relative.png')))
+      .toBe(true);
   });
-
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/scripts-array2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/scripts-array2_spec_large.ts
deleted file mode 100644
index ef3bef52ec20..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/scripts-array2_spec_large.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { TestLogger } from '@angular-devkit/architect/testing';
-import { logging } from '@angular-devkit/core';
-import { browserBuild, createArchitect, host } from '../utils';
-
-
-describe('Browser Builder scripts array', () => {
-  const scripts: { [path: string]: string } = {
-    'src/input-script.js': 'console.log(\'input-script\'); var number = 1+1;',
-    'src/zinput-script.js': 'console.log(\'zinput-script\');',
-    'src/finput-script.js': 'console.log(\'finput-script\');',
-    'src/uinput-script.js': 'console.log(\'uinput-script\');',
-    'src/binput-script.js': 'console.log(\'binput-script\');',
-    'src/ainput-script.js': 'console.log(\'ainput-script\');',
-    'src/cinput-script.js': 'console.log(\'cinput-script\');',
-    'src/lazy-script.js': 'console.log(\'lazy-script\');',
-    'src/pre-rename-script.js': 'console.log(\'pre-rename-script\');',
-    'src/pre-rename-lazy-script.js': 'console.log(\'pre-rename-lazy-script\');',
-  };
-  const getScriptsOption = () => [
-    'src/input-script.js',
-    'src/zinput-script.js',
-    'src/finput-script.js',
-    'src/uinput-script.js',
-    'src/binput-script.js',
-    'src/ainput-script.js',
-    'src/cinput-script.js',
-    { input: 'src/lazy-script.js', bundleName: 'lazy-script', lazy: true },
-    { input: 'src/pre-rename-script.js', bundleName: 'renamed-script' },
-    { input: 'src/pre-rename-lazy-script.js', bundleName: 'renamed-lazy-script', lazy: true },
-  ];
-
-  const target = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('works', async () => {
-    const matches: { [path: string]: string } = {
-      'scripts.js': 'input-script',
-      'lazy-script.js': 'lazy-script',
-      'renamed-script.js': 'pre-rename-script',
-      'renamed-lazy-script.js': 'pre-rename-lazy-script',
-      'main.js': 'input-script',
-      'index.html': '<script src="runtime.js"></script>'
-        + '<script src="polyfills.js"></script>'
-        + '<script src="scripts.js"></script>'
-        + '<script src="renamed-script.js"></script>'
-        + '<script src="vendor.js"></script>'
-        + '<script src="main.js"></script>',
-    };
-
-    host.writeMultipleFiles(scripts);
-    host.appendToFile('src/main.ts', '\nimport \'./input-script.js\';');
-
-    // Remove styles so we don't have to account for them in the index.html order check.
-    const { files } = await browserBuild(architect, host, target, {
-      styles: [],
-      scripts: getScriptsOption(),
-    } as {});
-
-    for (const fileName of Object.keys(matches)) {
-      expect(await files[fileName]).toMatch(matches[fileName]);
-    }
-  });
-
-  it('uglifies, uses sourcemaps, and adds hashes', async () => {
-    host.writeMultipleFiles(scripts);
-
-    const { files } = await browserBuild(architect, host, target, {
-      optimization: true,
-      sourceMap: true,
-      outputHashing: 'all',
-      scripts: getScriptsOption(),
-    } as {});
-
-    const fileNames = Object.keys(files);
-    const scriptsBundle = fileNames.find(n => /scripts\.[0-9a-f]{20}\.js/.test(n));
-    expect(scriptsBundle).toBeTruthy();
-    expect(await files[scriptsBundle || '']).toMatch('var number=2;');
-
-    expect(fileNames.some(n => /scripts\.[0-9a-f]{20}\.js\.map/.test(n))).toBeTruthy();
-    expect(fileNames.some(n => /renamed-script\.[0-9a-f]{20}\.js/.test(n))).toBeTruthy();
-    expect(fileNames.some(n => /renamed-script\.[0-9a-f]{20}\.js\.map/.test(n))).toBeTruthy();
-    expect(fileNames.some(n => /script\.[0-9a-f]{20}\.js/.test(n))).toBeTruthy();
-    expect(await files['lazy-script.js']).not.toBeUndefined();
-    expect(await files['lazy-script.js.map']).not.toBeUndefined();
-    expect(await files['renamed-lazy-script.js']).not.toBeUndefined();
-    expect(await files['renamed-lazy-script.js.map']).not.toBeUndefined();
-  });
-
-  it('preserves script order', async () => {
-    host.writeMultipleFiles(scripts);
-
-    const { files } = await browserBuild(architect, host, target, {
-      scripts: getScriptsOption(),
-    } as {});
-
-    expect(await files['scripts.js']).toMatch(new RegExp(
-      /.*['"]input-script['"](.|\n|\r)*/.source
-      + /['"]zinput-script['"](.|\n|\r)*/.source
-      + /['"]finput-script['"](.|\n|\r)*/.source
-      + /['"]uinput-script['"](.|\n|\r)*/.source
-      + /['"]binput-script['"](.|\n|\r)*/.source
-      + /['"]ainput-script['"](.|\n|\r)*/.source
-      + /['"]cinput-script['"]/.source,
-    ));
-  });
-
-  it('chunk in entry', async () => {
-    host.writeMultipleFiles(scripts);
-
-    const logger = new logging.Logger('build-script-chunk-entry');
-    const logs: string[] = [];
-    logger.subscribe(({ message }) => {
-      logs.push(message);
-    });
-
-    await browserBuild(
-      architect,
-      host,
-      target,
-      {
-        scripts: getScriptsOption(),
-      } as {},
-      { logger },
-    );
-
-    expect(logs.join('\n')).toMatch(/\(lazy-script\) 69 bytes.*\[entry].*\[rendered]/);
-    expect(logs.join('\n')).toMatch(/\(renamed-script\) 78 bytes.*\[entry].*\[rendered]/);
-    expect(logs.join('\n')).toMatch(/\(renamed-lazy-script\) 88 bytes.*\[entry].*\[rendered]/);
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
index 8f30d71a6e5d..ef3bef52ec20 100644
--- a/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
@@ -6,15 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { DefaultTimeout, TestLogger, runTargetSpec } from '@angular-devkit/architect/testing';
-import { PathFragment, join, normalize, virtualFs } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { TestLogger } from '@angular-devkit/architect/testing';
+import { logging } from '@angular-devkit/core';
+import { browserBuild, createArchitect, host } from '../utils';
 
 
 describe('Browser Builder scripts array', () => {
-
-  const outputPath = normalize('dist');
   const scripts: { [path: string]: string } = {
     'src/input-script.js': 'console.log(\'input-script\'); var number = 1+1;',
     'src/zinput-script.js': 'console.log(\'zinput-script\');',
@@ -40,17 +38,23 @@ describe('Browser Builder scripts array', () => {
     { input: 'src/pre-rename-lazy-script.js', bundleName: 'renamed-lazy-script', lazy: true },
   ];
 
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
-  it('works', (done) => {
+  it('works', async () => {
     const matches: { [path: string]: string } = {
-      './dist/scripts.js': 'input-script',
-      './dist/lazy-script.js': 'lazy-script',
-      './dist/renamed-script.js': 'pre-rename-script',
-      './dist/renamed-lazy-script.js': 'pre-rename-lazy-script',
-      './dist/main.js': 'input-script',
-      './dist/index.html': '<script src="runtime.js"></script>'
+      'scripts.js': 'input-script',
+      'lazy-script.js': 'lazy-script',
+      'renamed-script.js': 'pre-rename-script',
+      'renamed-lazy-script.js': 'pre-rename-lazy-script',
+      'main.js': 'input-script',
+      'index.html': '<script src="runtime.js"></script>'
         + '<script src="polyfills.js"></script>'
         + '<script src="scripts.js"></script>'
         + '<script src="renamed-script.js"></script>'
@@ -62,92 +66,80 @@ describe('Browser Builder scripts array', () => {
     host.appendToFile('src/main.ts', '\nimport \'./input-script.js\';');
 
     // Remove styles so we don't have to account for them in the index.html order check.
-    const overrides = {
+    const { files } = await browserBuild(architect, host, target, {
       styles: [],
       scripts: getScriptsOption(),
-    };
+    } as {});
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => Object.keys(matches).forEach(fileName => {
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        expect(content).toMatch(matches[fileName]);
-      })),
-    ).toPromise().then(done, done.fail);
+    for (const fileName of Object.keys(matches)) {
+      expect(await files[fileName]).toMatch(matches[fileName]);
+    }
   });
 
-  it('uglifies, uses sourcemaps, and adds hashes', (done) => {
+  it('uglifies, uses sourcemaps, and adds hashes', async () => {
     host.writeMultipleFiles(scripts);
 
-    const overrides = {
+    const { files } = await browserBuild(architect, host, target, {
       optimization: true,
       sourceMap: true,
       outputHashing: 'all',
       scripts: getScriptsOption(),
-    };
-
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 2).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const scriptsBundle = host.fileMatchExists(outputPath, /scripts\.[0-9a-f]{20}\.js/);
-        expect(scriptsBundle).toBeTruthy();
-        const fileName = join(outputPath, scriptsBundle as PathFragment);
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        expect(content).toMatch('var number=2;');
-        expect(host.fileMatchExists(outputPath, /scripts\.[0-9a-f]{20}\.js\.map/))
-          .toBeTruthy();
-        expect(host.fileMatchExists(outputPath, /renamed-script\.[0-9a-f]{20}\.js/))
-          .toBeTruthy();
-        expect(host.fileMatchExists(outputPath, /renamed-script\.[0-9a-f]{20}\.js\.map/))
-          .toBeTruthy();
-        expect(host.fileMatchExists(outputPath, /scripts\.[0-9a-f]{20}\.js/)).toBeTruthy();
-        expect(host.scopedSync().exists(normalize('dist/lazy-script.js'))).toBe(true);
-        expect(host.scopedSync().exists(normalize('dist/lazy-script.js.map'))).toBe(true);
-        expect(host.scopedSync().exists(normalize('dist/renamed-lazy-script.js'))).toBe(true);
-        expect(host.scopedSync().exists(normalize('dist/renamed-lazy-script.js.map')))
-          .toBe(true);
-      }),
-    ).toPromise().then(done, done.fail);
+    } as {});
+
+    const fileNames = Object.keys(files);
+    const scriptsBundle = fileNames.find(n => /scripts\.[0-9a-f]{20}\.js/.test(n));
+    expect(scriptsBundle).toBeTruthy();
+    expect(await files[scriptsBundle || '']).toMatch('var number=2;');
+
+    expect(fileNames.some(n => /scripts\.[0-9a-f]{20}\.js\.map/.test(n))).toBeTruthy();
+    expect(fileNames.some(n => /renamed-script\.[0-9a-f]{20}\.js/.test(n))).toBeTruthy();
+    expect(fileNames.some(n => /renamed-script\.[0-9a-f]{20}\.js\.map/.test(n))).toBeTruthy();
+    expect(fileNames.some(n => /script\.[0-9a-f]{20}\.js/.test(n))).toBeTruthy();
+    expect(await files['lazy-script.js']).not.toBeUndefined();
+    expect(await files['lazy-script.js.map']).not.toBeUndefined();
+    expect(await files['renamed-lazy-script.js']).not.toBeUndefined();
+    expect(await files['renamed-lazy-script.js.map']).not.toBeUndefined();
   });
 
-  it('preserves script order', (done) => {
+  it('preserves script order', async () => {
     host.writeMultipleFiles(scripts);
 
-    const overrides = { scripts: getScriptsOption() };
-
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const re = new RegExp(
-          /.*['"]input-script['"](.|\n|\r)*/.source
-          + /['"]zinput-script['"](.|\n|\r)*/.source
-          + /['"]finput-script['"](.|\n|\r)*/.source
-          + /['"]uinput-script['"](.|\n|\r)*/.source
-          + /['"]binput-script['"](.|\n|\r)*/.source
-          + /['"]ainput-script['"](.|\n|\r)*/.source
-          + /['"]cinput-script['"]/.source,
-        );
-        const fileName = './dist/scripts.js';
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        expect(content).toMatch(re);
-      }),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, {
+      scripts: getScriptsOption(),
+    } as {});
+
+    expect(await files['scripts.js']).toMatch(new RegExp(
+      /.*['"]input-script['"](.|\n|\r)*/.source
+      + /['"]zinput-script['"](.|\n|\r)*/.source
+      + /['"]finput-script['"](.|\n|\r)*/.source
+      + /['"]uinput-script['"](.|\n|\r)*/.source
+      + /['"]binput-script['"](.|\n|\r)*/.source
+      + /['"]ainput-script['"](.|\n|\r)*/.source
+      + /['"]cinput-script['"]/.source,
+    ));
   });
 
-  it('chunk in entry', (done) => {
+  it('chunk in entry', async () => {
     host.writeMultipleFiles(scripts);
 
-    const overrides = { scripts: getScriptsOption() };
-    const logger = new TestLogger('build-script-entry');
-
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout, logger).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const validate = ` [entry] [rendered]`;
-        expect(logger.includes(`(lazy-script) 69 bytes${validate}`)).toBe(true);
-        expect(logger.includes(`(renamed-script) 78 bytes${validate}`)).toBe(true);
-        expect(logger.includes(`(renamed-lazy-script) 88 bytes${validate}`)).toBe(true);
-      }),
-    ).toPromise().then(done, done.fail);
+    const logger = new logging.Logger('build-script-chunk-entry');
+    const logs: string[] = [];
+    logger.subscribe(({ message }) => {
+      logs.push(message);
+    });
+
+    await browserBuild(
+      architect,
+      host,
+      target,
+      {
+        scripts: getScriptsOption(),
+      } as {},
+      { logger },
+    );
+
+    expect(logs.join('\n')).toMatch(/\(lazy-script\) 69 bytes.*\[entry].*\[rendered]/);
+    expect(logs.join('\n')).toMatch(/\(renamed-script\) 78 bytes.*\[entry].*\[rendered]/);
+    expect(logs.join('\n')).toMatch(/\(renamed-lazy-script\) 88 bytes.*\[entry].*\[rendered]/);
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/source-map2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/source-map2_spec_large.ts
deleted file mode 100644
index eba5e7b25e0b..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/source-map2_spec_large.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { OutputHashing } from '../../src/browser/schema';
-import { browserBuild, createArchitect, host } from '../utils';
-
-// tslint:disable-next-line:no-big-function
-describe('Browser Builder source map', () => {
-  const target = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('works', async () => {
-    const overrides = {
-      sourceMap: true,
-      extractCss: true,
-      styles: ['src/styles.css'],
-    };
-
-    host.writeMultipleFiles({
-      'src/styles.css': `div { flex: 1 }`,
-    });
-
-    const { files } = await browserBuild(architect, host, target, overrides);
-    expect(await files['main.js.map']).not.toBeUndefined();
-    expect(await files['styles.css.map']).not.toBeUndefined();
-  });
-
-  it('works with outputHashing', async () => {
-    const { files } = await browserBuild(architect, host, target, {
-      sourceMap: true,
-      outputHashing: OutputHashing.All,
-    });
-
-    expect(Object.keys(files).some(name => /main\.[0-9a-f]{20}\.js.map/.test(name))).toBeTruthy();
-  });
-
-  it('does not output source map when disabled', async () => {
-    const { files } = await browserBuild(architect, host, target, {
-      sourceMap: false,
-    });
-
-    expect(files['main.js.map']).toBeUndefined();
-  });
-
-  it('supports eval source map', async () => {
-    const { files } = await browserBuild(architect, host, target, {
-      sourceMap: true, evalSourceMap: true,
-    });
-
-    expect(files['main.js.map']).toBeUndefined();
-    expect(await files['main.js']).toContain('eval("function webpackEmptyAsyncContext');
-  });
-
-  it('supports hidden sourcemaps', async () => {
-    const overrides = {
-      sourceMap: {
-        hidden: true,
-        styles: true,
-        scripts: true,
-      },
-      extractCss: true,
-      styles: ['src/styles.scss'],
-    };
-
-    host.writeMultipleFiles({
-      'src/styles.scss': `div { flex: 1 }`,
-    });
-
-    const { files } = await browserBuild(architect, host, target, overrides);
-    expect('main.js.map' in files).toBe(true);
-    expect('styles.css.map' in files).toBe(true);
-    expect(await files['main.js']).not.toContain('sourceMappingURL=main.js.map');
-    expect(await files['styles.css']).not.toContain('sourceMappingURL=styles.css.map');
-  });
-
-  it('supports styles only sourcemaps', async () => {
-    const overrides = {
-      sourceMap: {
-        styles: true,
-        scripts: false,
-      },
-      extractCss: true,
-      styles: ['src/styles.scss'],
-    };
-
-    host.writeMultipleFiles({
-      'src/styles.scss': `div { flex: 1 }`,
-    });
-
-    const { files } = await browserBuild(architect, host, target, overrides);
-    expect('main.js.map' in files).toBe(false);
-    expect('styles.css.map' in files).toBe(true);
-    expect(await files['main.js']).not.toContain('sourceMappingURL=main.js.map');
-    expect(await files['styles.css']).toContain('sourceMappingURL=styles.css.map');
-  });
-
-  it('supports scripts only sourcemaps', async () => {
-    const overrides = {
-      sourceMap: {
-        styles: false,
-        scripts: true,
-      },
-      extractCss: true,
-      styles: ['src/styles.scss'],
-    };
-
-    host.writeMultipleFiles({
-      'src/styles.scss': `div { flex: 1 }`,
-    });
-
-    const { files } = await browserBuild(architect, host, target, overrides);
-    expect('main.js.map' in files).toBe(true);
-    expect('styles.css.map' in files).toBe(false);
-    expect(await files['main.js']).toContain('sourceMappingURL=main.js.map');
-    expect(await files['styles.css']).not.toContain('sourceMappingURL=styles.css.map');
-  });
-
-  it('should not inline component styles sourcemaps when hidden', async () => {
-    const overrides = {
-      sourceMap: {
-        hidden: true,
-        styles: true,
-        scripts: true,
-      },
-      extractCss: true,
-      styles: ['src/styles.scss'],
-    };
-
-    host.writeMultipleFiles({
-      'src/styles.scss': `div { flex: 1 }`,
-      'src/app/app.component.css': `p { color: red; }`,
-    });
-
-    const { files } = await browserBuild(architect, host, target, overrides);
-    expect('main.js.map' in files).toBe(true);
-    expect('styles.css.map' in files).toBe(true);
-    expect(await files['main.js']).not.toContain('sourceMappingURL=main.js.map');
-    expect(await files['main.js']).not.toContain('sourceMappingURL=data:application/json');
-    expect(await files['styles.css']).not.toContain('sourceMappingURL=styles.css.map');
-    expect(await files['styles.css']).not.toContain('sourceMappingURL=data:application/json');
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/source-map_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/source-map_spec_large.ts
index 8ae472f26fa0..eba5e7b25e0b 100644
--- a/packages/angular_devkit/build_angular/test/browser/source-map_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/source-map_spec_large.ts
@@ -5,22 +5,23 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
-import { OutputHashing, Schema as BrowserBuilderSchema } from '../../src/browser/schema';
-import { browserTargetSpec, host } from '../utils';
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { OutputHashing } from '../../src/browser/schema';
+import { browserBuild, createArchitect, host } from '../utils';
 
 // tslint:disable-next-line:no-big-function
 describe('Browser Builder source map', () => {
-  const outputPath = normalize('dist');
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
-  it('works', (done) => {
-    const overrides: Partial<BrowserBuilderSchema> = {
+  it('works', async () => {
+    const overrides = {
       sourceMap: true,
       extractCss: true,
       styles: ['src/styles.css'],
@@ -30,60 +31,39 @@ describe('Browser Builder source map', () => {
       'src/styles.css': `div { flex: 1 }`,
     });
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const scriptsFileName = join(outputPath, 'main.js.map');
-        expect(host.scopedSync().exists(scriptsFileName)).toBe(true);
-
-        const stylesFileName = join(outputPath, 'styles.css.map');
-        expect(host.scopedSync().exists(stylesFileName)).toBe(true);
-      }),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['main.js.map']).not.toBeUndefined();
+    expect(await files['styles.css.map']).not.toBeUndefined();
   });
 
-  it('works with outputHashing', (done) => {
-    const overrides: Partial<BrowserBuilderSchema> = {
+  it('works with outputHashing', async () => {
+    const { files } = await browserBuild(architect, host, target, {
       sourceMap: true,
       outputHashing: OutputHashing.All,
-    };
+    });
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        expect(host.fileMatchExists(outputPath, /main\.[0-9a-f]{20}\.js.map/)).toBeTruthy();
-      }),
-    ).toPromise().then(done, done.fail);
+    expect(Object.keys(files).some(name => /main\.[0-9a-f]{20}\.js.map/.test(name))).toBeTruthy();
   });
 
-  it('does not output source map when disabled', (done) => {
-    const overrides = { sourceMap: false };
+  it('does not output source map when disabled', async () => {
+    const { files } = await browserBuild(architect, host, target, {
+      sourceMap: false,
+    });
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'main.js.map');
-        expect(host.scopedSync().exists(fileName)).toBe(false);
-      }),
-    ).toPromise().then(done, done.fail);
+    expect(files['main.js.map']).toBeUndefined();
   });
 
-  it('supports eval source map', (done) => {
-    const overrides = { sourceMap: true, evalSourceMap: true };
-
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        expect(host.scopedSync().exists(join(outputPath, 'main.js.map'))).toBe(false);
-        const fileName = join(outputPath, 'main.js');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(fileName));
-        expect(content).toContain('eval("function webpackEmptyAsyncContext');
-      }),
-    ).toPromise().then(done, done.fail);
+  it('supports eval source map', async () => {
+    const { files } = await browserBuild(architect, host, target, {
+      sourceMap: true, evalSourceMap: true,
+    });
+
+    expect(files['main.js.map']).toBeUndefined();
+    expect(await files['main.js']).toContain('eval("function webpackEmptyAsyncContext');
   });
 
-  it('supports hidden sourcemaps', (done) => {
-    const overrides: Partial<BrowserBuilderSchema> = {
+  it('supports hidden sourcemaps', async () => {
+    const overrides = {
       sourceMap: {
         hidden: true,
         styles: true,
@@ -97,28 +77,15 @@ describe('Browser Builder source map', () => {
       'src/styles.scss': `div { flex: 1 }`,
     });
 
-
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        expect(host.scopedSync().exists(join(outputPath, 'main.js.map'))).toBe(true);
-        expect(host.scopedSync().exists(join(outputPath, 'styles.css.map'))).toBe(true);
-
-        const scriptContent = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, 'main.js')),
-        );
-        expect(scriptContent).not.toContain('sourceMappingURL=main.js.map');
-
-        const styleContent = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, 'styles.css')),
-        );
-        expect(styleContent).not.toContain('sourceMappingURL=styles.css.map');
-      }),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect('main.js.map' in files).toBe(true);
+    expect('styles.css.map' in files).toBe(true);
+    expect(await files['main.js']).not.toContain('sourceMappingURL=main.js.map');
+    expect(await files['styles.css']).not.toContain('sourceMappingURL=styles.css.map');
   });
 
-  it('supports styles only sourcemaps', (done) => {
-    const overrides: Partial<BrowserBuilderSchema> = {
+  it('supports styles only sourcemaps', async () => {
+    const overrides = {
       sourceMap: {
         styles: true,
         scripts: false,
@@ -131,28 +98,15 @@ describe('Browser Builder source map', () => {
       'src/styles.scss': `div { flex: 1 }`,
     });
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        expect(host.scopedSync().exists(join(outputPath, 'main.js.map'))).toBe(false);
-        expect(host.scopedSync().exists(join(outputPath, 'styles.css.map'))).toBe(true);
-
-        const scriptContent = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, 'main.js')),
-        );
-        expect(scriptContent).not.toContain('sourceMappingURL=main.js.map');
-
-        const styleContent = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, 'styles.css')),
-        );
-
-        expect(styleContent).toContain('sourceMappingURL=styles.css.map');
-      }),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect('main.js.map' in files).toBe(false);
+    expect('styles.css.map' in files).toBe(true);
+    expect(await files['main.js']).not.toContain('sourceMappingURL=main.js.map');
+    expect(await files['styles.css']).toContain('sourceMappingURL=styles.css.map');
   });
 
-  it('supports scripts only sourcemaps', (done) => {
-    const overrides: Partial<BrowserBuilderSchema> = {
+  it('supports scripts only sourcemaps', async () => {
+    const overrides = {
       sourceMap: {
         styles: false,
         scripts: true,
@@ -165,27 +119,15 @@ describe('Browser Builder source map', () => {
       'src/styles.scss': `div { flex: 1 }`,
     });
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        expect(host.scopedSync().exists(join(outputPath, 'main.js.map'))).toBe(true);
-        expect(host.scopedSync().exists(join(outputPath, 'styles.css.map'))).toBe(false);
-
-        const scriptContent = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, 'main.js')),
-        );
-        expect(scriptContent).toContain('sourceMappingURL=main.js.map');
-
-        const styleContent = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, 'styles.css')),
-        );
-        expect(styleContent).not.toContain('sourceMappingURL=styles.css.map');
-      }),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect('main.js.map' in files).toBe(true);
+    expect('styles.css.map' in files).toBe(false);
+    expect(await files['main.js']).toContain('sourceMappingURL=main.js.map');
+    expect(await files['styles.css']).not.toContain('sourceMappingURL=styles.css.map');
   });
 
-  it('should not inline component styles sourcemaps when hidden', (done) => {
-    const overrides: Partial<BrowserBuilderSchema> = {
+  it('should not inline component styles sourcemaps when hidden', async () => {
+    const overrides = {
       sourceMap: {
         hidden: true,
         styles: true,
@@ -200,24 +142,12 @@ describe('Browser Builder source map', () => {
       'src/app/app.component.css': `p { color: red; }`,
     });
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        expect(host.scopedSync().exists(join(outputPath, 'main.js.map'))).toBe(true);
-        expect(host.scopedSync().exists(join(outputPath, 'styles.css.map'))).toBe(true);
-
-        const scriptContent = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, 'main.js')),
-        );
-
-        expect(scriptContent).not.toContain('sourceMappingURL=main.js.map');
-        expect(scriptContent).not.toContain('sourceMappingURL=data:application/json');
-
-        const styleContent = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, 'styles.css')),
-        );
-        expect(styleContent).not.toContain('sourceMappingURL=styles.css.map');
-      }),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect('main.js.map' in files).toBe(true);
+    expect('styles.css.map' in files).toBe(true);
+    expect(await files['main.js']).not.toContain('sourceMappingURL=main.js.map');
+    expect(await files['main.js']).not.toContain('sourceMappingURL=data:application/json');
+    expect(await files['styles.css']).not.toContain('sourceMappingURL=styles.css.map');
+    expect(await files['styles.css']).not.toContain('sourceMappingURL=data:application/json');
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/stats-json2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/stats-json2_spec_large.ts
deleted file mode 100644
index 3ada13a46d94..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/stats-json2_spec_large.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { browserBuild, createArchitect, host } from '../utils';
-
-
-describe('Browser Builder stats json', () => {
-  const target = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('works', async () => {
-    const { files } = await browserBuild(architect, host, target, { statsJson: true });
-    expect('stats.json' in files).toBe(true);
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/stats-json_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/stats-json_spec_large.ts
index c34556ad0fb0..3ada13a46d94 100644
--- a/packages/angular_devkit/build_angular/test/browser/stats-json_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/stats-json_spec_large.ts
@@ -5,28 +5,22 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { join, normalize } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { browserBuild, createArchitect, host } from '../utils';
 
 
 describe('Browser Builder stats json', () => {
-  const outputPath = normalize('dist');
-
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  it('works', (done) => {
-    const overrides = { statsJson: true };
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'stats.json');
-        expect(host.scopedSync().exists(fileName)).toBe(true);
-      }),
-    ).toPromise().then(done, done.fail);
+  it('works', async () => {
+    const { files } = await browserBuild(architect, host, target, { statsJson: true });
+    expect('stats.json' in files).toBe(true);
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/styles2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/styles2_spec_large.ts
deleted file mode 100644
index f715fc09a11f..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/styles2_spec_large.ts
+++ /dev/null
@@ -1,617 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-// tslint:disable:no-big-function
-
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { logging, normalize, tags } from '@angular-devkit/core';
-import { browserBuild, createArchitect, host } from '../utils';
-
-
-describe('Browser Builder styles', () => {
-  const extensionsWithImportSupport = ['css', 'scss', 'less', 'styl'];
-  const extensionsWithVariableSupport = ['scss', 'less', 'styl'];
-  const imgSvg = `
-    <svg width="100" height="100" xmlns="http://www.w3.org/2000/svg">
-      <circle cx="50" cy="50" r="40" stroke="green" stroke-width="4" fill="yellow" />
-    </svg>
-  `;
-  const target = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('supports global styles', async () => {
-    const styles = [
-      'src/input-style.css',
-      { input: 'src/lazy-style.css', bundleName: 'lazy-style', lazy: true },
-      { input: 'src/pre-rename-style.css', bundleName: 'renamed-style' },
-      { input: 'src/pre-rename-lazy-style.css', bundleName: 'renamed-lazy-style', lazy: true },
-    ] as {};
-    const cssMatches: { [path: string]: string } = {
-      'styles.css': '.input-style',
-      'lazy-style.css': '.lazy-style',
-      'renamed-style.css': '.pre-rename-style',
-      'renamed-lazy-style.css': '.pre-rename-lazy-style',
-    };
-    const cssIndexMatches: { [path: string]: string } = {
-      'index.html': '<link rel="stylesheet" href="styles.css">'
-        + '<link rel="stylesheet" href="renamed-style.css">',
-    };
-    const jsMatches: { [path: string]: string } = {
-      'styles.js': '.input-style',
-      'lazy-style.js': '.lazy-style',
-      'renamed-style.js': '.pre-rename-style',
-      'renamed-lazy-style.js': '.pre-rename-lazy-style',
-    };
-    const jsIndexMatches: { [path: string]: string } = {
-      'index.html': '<script src="runtime.js"></script>'
-        + '<script src="polyfills.js"></script>'
-        + '<script src="styles.js"></script>'
-        + '<script src="renamed-style.js"></script>'
-        + '<script src="vendor.js"></script>'
-        + '<script src="main.js"></script>',
-    };
-
-    host.writeMultipleFiles({
-      'src/string-style.css': '.string-style { color: red }',
-      'src/input-style.css': '.input-style { color: red }',
-      'src/lazy-style.css': '.lazy-style { color: red }',
-      'src/pre-rename-style.css': '.pre-rename-style { color: red }',
-      'src/pre-rename-lazy-style.css': '.pre-rename-lazy-style { color: red }',
-    });
-
-    let { files } = await browserBuild(architect, host, target, { extractCss: true, styles });
-    // Check css files were created.
-    for (const cssFileName of Object.keys(cssMatches)) {
-      expect(await files[cssFileName]).toMatch(cssMatches[cssFileName]);
-    }
-    // Check no js files are created.
-    for (const jsFileName of Object.keys(jsMatches)) {
-      expect(jsFileName in files).toBe(false);
-    }
-
-    // Check check index has styles in the right order.
-    for (const cssIndexFileName of Object.keys(cssIndexMatches)) {
-      expect(await files[cssIndexFileName]).toMatch(cssIndexMatches[cssIndexFileName]);
-    }
-
-    // Also test with extractCss false.
-    files = (await browserBuild(architect, host, target, { extractCss: false, styles })).files;
-
-    // Check js files were created.
-    for (const jsFileName of Object.keys(jsMatches)) {
-      expect(await files[jsFileName]).toMatch(jsMatches[jsFileName]);
-    }
-
-    // Check no css files are created.
-    for (const cssFileName of Object.keys(cssMatches)) {
-      expect(cssFileName in files).toBe(false);
-    }
-
-    // Check check index has styles in the right order.
-    for (const jsIndexFileName of Object.keys(jsIndexMatches)) {
-      expect(await files[jsIndexFileName]).toMatch(jsIndexMatches[jsIndexFileName]);
-    }
-  });
-
-  it('supports empty styleUrls in components', async () => {
-    host.writeMultipleFiles({
-      './src/app/app.component.ts': `
-        import { Component } from '@angular/core';
-
-        @Component({
-          selector: 'app-root',
-          templateUrl: './app.component.html',
-          styleUrls: []
-        })
-        export class AppComponent {
-          title = 'app';
-        }
-      `,
-    });
-
-    await browserBuild(architect, host, target, { extractCss: true });
-  });
-
-  extensionsWithImportSupport.forEach(ext => {
-    it(`supports imports in ${ext} files`, async () => {
-      host.writeMultipleFiles({
-        [`src/styles.${ext}`]: `
-          @import './imported-styles.${ext}';
-          body { background-color: #00f; }
-        `,
-        [`src/imported-styles.${ext}`]: 'p { background-color: #f00; }',
-        [`src/app/app.component.${ext}`]: `
-          @import './imported-component-styles.${ext}';
-          .outer {
-            .inner {
-              background: #fff;
-            }
-          }
-        `,
-        [`src/app/imported-component-styles.${ext}`]: 'h1 { background: #000; }',
-      });
-
-      const matches: { [path: string]: RegExp } = {
-        'styles.css': new RegExp(
-          // The global style should be there
-          /p\s*{\s*background-color: #f00;\s*}(.|\n|\r)*/.source
-          // The global style via import should be there
-          + /body\s*{\s*background-color: #00f;\s*}/.source,
-        ),
-        'styles.css.map': /"mappings":".+"/,
-        'main.js': new RegExp(
-          // The component style should be there
-          /h1(.|\n|\r)*background:\s*#000(.|\n|\r)*/.source
-          // The component style via import should be there
-          + /.outer(.|\n|\r)*.inner(.|\n|\r)*background:\s*#[fF]+/.source,
-        ),
-      };
-
-      const overrides = {
-        extractCss: true,
-        sourceMap: true,
-        styles: [`src/styles.${ext}`],
-      };
-
-      host.replaceInFile(
-        'src/app/app.component.ts',
-        './app.component.css',
-        `./app.component.${ext}`,
-      );
-
-      const { files } = await browserBuild(architect, host, target, overrides);
-      for (const fileName of Object.keys(matches)) {
-        expect(await files[fileName]).toMatch(matches[fileName]);
-      }
-    });
-  });
-
-  extensionsWithImportSupport.forEach(ext => {
-    it(`supports material imports in ${ext} files`, async () => {
-      host.writeMultipleFiles({
-        [`src/styles.${ext}`]: `
-          @import "~@angular/material/prebuilt-themes/indigo-pink.css";
-          @import "@angular/material/prebuilt-themes/indigo-pink.css";
-        `,
-        [`src/app/app.component.${ext}`]: `
-          @import "~@angular/material/prebuilt-themes/indigo-pink.css";
-          @import "@angular/material/prebuilt-themes/indigo-pink.css";
-        `,
-      });
-      host.replaceInFile('src/app/app.component.ts', './app.component.css',
-        `./app.component.${ext}`);
-
-      const overrides = {
-        extractCss: true,
-        styles: [{ input: `src/styles.${ext}` }],
-      };
-      await browserBuild(architect, host, target, overrides);
-    });
-  });
-
-  it(`supports material icons`, async () => {
-    const overrides = {
-      extractCss: true,
-      optimization: true,
-      styles: [
-        { input: '../../../../node_modules/material-design-icons/iconfont/material-icons.css' },
-      ],
-    };
-
-    await browserBuild(architect, host, target, overrides);
-  });
-
-  extensionsWithVariableSupport.forEach(ext => {
-    it(`supports ${ext} includePaths`, async () => {
-
-      let variableAssignment = '';
-      let variablereference = '';
-      if (ext === 'scss') {
-        variableAssignment = '$primary-color:';
-        variablereference = '$primary-color';
-      } else if (ext === 'styl') {
-        variableAssignment = '$primary-color =';
-        variablereference = '$primary-color';
-      } else if (ext === 'less') {
-        variableAssignment = '@primary-color:';
-        variablereference = '@primary-color';
-      }
-
-      host.writeMultipleFiles({
-        [`src/style-paths/variables.${ext}`]: `${variableAssignment} #f00;`,
-        [`src/styles.${ext}`]: `
-          @import 'variables';
-          h1 { color: ${variablereference}; }
-        `,
-        [`src/app/app.component.${ext}`]: `
-          @import 'variables';
-          h2 { color: ${variablereference}; }
-        `,
-      });
-
-      const matches: { [path: string]: RegExp } = {
-        'styles.css': /h1\s*{\s*color: #f00;\s*}/,
-        'main.js': /h2.*{.*color: #f00;.*}/,
-      };
-
-      host.replaceInFile('src/app/app.component.ts', './app.component.css',
-        `./app.component.${ext}`);
-
-      const overrides = {
-        extractCss: true,
-        styles: [`src/styles.${ext}`],
-        stylePreprocessorOptions: {
-          includePaths: ['src/style-paths'],
-        },
-      };
-
-      const { files } = await browserBuild(architect, host, target, overrides);
-      for (const fileName of Object.keys(matches)) {
-        expect(await files[fileName]).toMatch(matches[fileName]);
-      }
-    });
-  });
-
-  it(`supports font-awesome imports`, async () => {
-    host.writeMultipleFiles({
-      'src/styles.scss': `
-        $fa-font-path: "~font-awesome/fonts";
-        @import "~font-awesome/scss/font-awesome";
-      `,
-    });
-
-    const overrides = { extractCss: true, styles: [`src/styles.scss`] };
-    await browserBuild(architect, host, target, overrides);
-  }, 30000);
-
-  it(`supports font-awesome imports without extractCss`, async () => {
-    host.writeMultipleFiles({
-      'src/styles.scss': `
-        @import "~font-awesome/css/font-awesome.css";
-      `,
-    });
-
-    const overrides = { extractCss: false, styles: [`src/styles.scss`] };
-    await browserBuild(architect, host, target, overrides);
-  }, 30000);
-
-  it(`uses autoprefixer`, async () => {
-    host.writeMultipleFiles({
-      'src/styles.css': tags.stripIndents`
-        /* normal-comment */
-        /*! important-comment */
-        div { flex: 1 }`,
-    });
-
-    const overrides = { extractCss: true, optimization: false };
-    const { files } = await browserBuild(architect, host, target, overrides);
-    expect(await files['styles.css']).toContain(tags.stripIndents`
-      /* normal-comment */
-      /*! important-comment */
-      div { -ms-flex: 1; flex: 1 }`,
-    );
-  });
-
-  it(`minimizes css`, async () => {
-    host.writeMultipleFiles({
-      'src/styles.css': tags.stripIndents`
-        /* normal-comment */
-        /*! important-comment */
-        div { flex: 1 }`,
-    });
-
-    const overrides = { extractCss: true, optimization: true };
-    const { files } = await browserBuild(architect, host, target, overrides);
-    expect(await files['styles.css']).toContain('/*! important-comment */div{-ms-flex:1;flex:1}');
-  });
-
-  // TODO: consider making this a unit test in the url processing plugins.
-  it(`supports baseHref/deployUrl in resource urls without rebaseRootRelativeCssUrls`, async () => {
-    // Use a large image for the relative ref so it cannot be inlined.
-    host.copyFile('src/spectrum.png', './src/assets/global-img-relative.png');
-    host.copyFile('src/spectrum.png', './src/assets/component-img-relative.png');
-    host.writeMultipleFiles({
-      'src/styles.css': `
-        h1 { background: url('/assets/global-img-absolute.svg'); }
-        h2 { background: url('./assets/global-img-relative.png'); }
-      `,
-      'src/app/app.component.css': `
-        h3 { background: url('/assets/component-img-absolute.svg'); }
-        h4 { background: url('../assets/component-img-relative.png'); }
-      `,
-      'src/assets/global-img-absolute.svg': imgSvg,
-      'src/assets/component-img-absolute.svg': imgSvg,
-    });
-
-    let { files } = await browserBuild(architect, host, target, { aot: true, extractCss: true });
-
-    // Check base paths are correctly generated.
-    let styles = await files['styles.css'];
-    let main = await files['main.js'];
-
-    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-    expect(styles).toContain(`url('global-img-relative.png')`);
-    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
-    expect(main).toContain(`url('component-img-relative.png')`);
-
-    expect(host.scopedSync().exists(normalize('dist/assets/global-img-absolute.svg')))
-      .toBe(true);
-    expect(host.scopedSync().exists(normalize('dist/global-img-relative.png')))
-      .toBe(true);
-    expect(host.scopedSync().exists(normalize('dist/assets/component-img-absolute.svg')))
-      .toBe(true);
-    expect(host.scopedSync().exists(normalize('dist/component-img-relative.png')))
-      .toBe(true);
-
-    // Check urls with deploy-url scheme are used as is.
-    files = (await browserBuild(architect, host, target, {
-      extractCss: true,
-      baseHref: '/base/',
-      deployUrl: 'http://deploy.url/',
-    })).files;
-
-    styles = await files['styles.css'];
-    main = await files['main.js'];
-    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
-
-    // Check urls with base-href scheme are used as is (with deploy-url).
-    files = (await browserBuild(architect, host, target, {
-      extractCss: true,
-      baseHref: 'http://base.url/',
-      deployUrl: 'deploy/',
-    })).files;
-    styles = await files['styles.css'];
-    main = await files['main.js'];
-    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
-
-    // Check urls with deploy-url and base-href scheme only use deploy-url.
-    files = (await browserBuild(architect, host, target, {
-      extractCss: true,
-      baseHref: 'http://base.url/',
-      deployUrl: 'http://deploy.url/',
-    })).files;
-    styles = await files['styles.css'];
-    main = await files['main.js'];
-    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
-
-    // Check with schemeless base-href and deploy-url flags.
-    files = (await browserBuild(architect, host, target, {
-      extractCss: true,
-      baseHref: '/base/',
-      deployUrl: 'deploy/',
-    })).files;
-    styles = await files['styles.css'];
-    main = await files['main.js'];
-    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
-
-    // Check with identical base-href and deploy-url flags.
-    files = (await browserBuild(architect, host, target, {
-      extractCss: true,
-      baseHref: '/base/',
-      deployUrl: '/base/',
-    })).files;
-
-    styles = await files['styles.css'];
-    main = await files['main.js'];
-    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
-
-    // Check with only base-href flag.
-    files = (await browserBuild(architect, host, target, {
-      extractCss: true,
-      baseHref: '/base/',
-    })).files;
-
-    styles = await files['styles.css'];
-    main = await files['main.js'];
-    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
-  }, 90000);
-
-  it(`supports baseHref/deployUrl in resource urls with rebaseRootRelativeCssUrls`, async () => {
-    // Use a large image for the relative ref so it cannot be inlined.
-    host.copyFile('src/spectrum.png', './src/assets/global-img-relative.png');
-    host.copyFile('src/spectrum.png', './src/assets/component-img-relative.png');
-    host.writeMultipleFiles({
-      'src/styles.css': `
-        h1 { background: url('/assets/global-img-absolute.svg'); }
-        h2 { background: url('./assets/global-img-relative.png'); }
-      `,
-      'src/app/app.component.css': `
-        h3 { background: url('/assets/component-img-absolute.svg'); }
-        h4 { background: url('../assets/component-img-relative.png'); }
-      `,
-      'src/assets/global-img-absolute.svg': imgSvg,
-      'src/assets/component-img-absolute.svg': imgSvg,
-    });
-
-    // Check base paths are correctly generated.
-    const overrides = {
-      extractCss: true,
-      rebaseRootRelativeCssUrls: true,
-    };
-    let { files } = await browserBuild(architect, host, target, {
-      ...overrides,
-      aot: true,
-    });
-
-    let styles = await files['styles.css'];
-    let main = await files['main.js'];
-    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-    expect(styles).toContain(`url('global-img-relative.png')`);
-    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
-    expect(main).toContain(`url('component-img-relative.png')`);
-    expect(host.scopedSync().exists(normalize('dist/assets/global-img-absolute.svg')))
-      .toBe(true);
-    expect(host.scopedSync().exists(normalize('dist/global-img-relative.png')))
-      .toBe(true);
-    expect(host.scopedSync().exists(normalize('dist/assets/component-img-absolute.svg')))
-      .toBe(true);
-    expect(host.scopedSync().exists(normalize('dist/component-img-relative.png')))
-      .toBe(true);
-
-    // Check urls with deploy-url scheme are used as is.
-    files = (await browserBuild(architect, host, target, {
-      ...overrides,
-      baseHref: '/base/',
-      deployUrl: 'http://deploy.url/',
-    })).files;
-
-    styles = await files['styles.css'];
-    main = await files['main.js'];
-    expect(styles).toContain(`url('http://deploy.url/assets/global-img-absolute.svg')`);
-    expect(main).toContain(`url('http://deploy.url/assets/component-img-absolute.svg')`);
-
-    // Check urls with base-href scheme are used as is (with deploy-url).
-    files = (await browserBuild(architect, host, target, {
-      ...overrides,
-      baseHref: 'http://base.url/',
-      deployUrl: 'deploy/',
-    })).files;
-
-    styles = await files['styles.css'];
-    main = await files['main.js'];
-    expect(styles).toContain(`url('http://base.url/deploy/assets/global-img-absolute.svg')`);
-    expect(main).toContain(`url('http://base.url/deploy/assets/component-img-absolute.svg')`);
-
-    // Check urls with deploy-url and base-href scheme only use deploy-url.
-    files = (await browserBuild(architect, host, target, {
-      ...overrides,
-      baseHref: 'http://base.url/',
-      deployUrl: 'http://deploy.url/',
-    })).files;
-
-    styles = await files['styles.css'];
-    main = await files['main.js'];
-    expect(styles).toContain(`url('http://deploy.url/assets/global-img-absolute.svg')`);
-    expect(main).toContain(`url('http://deploy.url/assets/component-img-absolute.svg')`);
-
-    // Check with schemeless base-href and deploy-url flags.
-    files = (await browserBuild(architect, host, target, {
-      ...overrides,
-      baseHref: '/base/',
-      deployUrl: 'deploy/',
-    })).files;
-
-    styles = await files['styles.css'];
-    main = await files['main.js'];
-    expect(styles).toContain(`url('/base/deploy/assets/global-img-absolute.svg')`);
-    expect(main).toContain(`url('/base/deploy/assets/component-img-absolute.svg')`);
-
-    // Check with identical base-href and deploy-url flags.
-    files = (await browserBuild(architect, host, target, {
-      ...overrides,
-      baseHref: '/base/',
-      deployUrl: '/base/',
-    })).files;
-
-    styles = await files['styles.css'];
-    main = await files['main.js'];
-    expect(styles).toContain(`url('/base/assets/global-img-absolute.svg')`);
-    expect(main).toContain(`url('/base/assets/component-img-absolute.svg')`);
-
-    // Check with only base-href flag.
-    files = (await browserBuild(architect, host, target, {
-      ...overrides,
-      baseHref: '/base/',
-    })).files;
-
-    styles = await files['styles.css'];
-    main = await files['main.js'];
-    expect(styles).toContain(`url('/base/assets/global-img-absolute.svg')`);
-    expect(main).toContain(`url('/base/assets/component-img-absolute.svg')`);
-  }, 90000);
-
-  it(`supports bootstrap@4`, async () => {
-    const overrides = {
-      extractCss: true,
-      styles: ['../../../../node_modules/bootstrap/dist/css/bootstrap.css'],
-      scripts: ['../../../../node_modules/bootstrap/dist/js/bootstrap.js'],
-    };
-
-    await browserBuild(architect, host, target, overrides);
-  });
-
-  it(`supports inline javascript in less`, async () => {
-    const overrides = { styles: [`src/styles.less`] };
-    host.writeMultipleFiles({
-      'src/styles.less': `
-        .myFunction() {
-          @functions: ~\`(function () {
-            return '';
-          })()\`;
-        }
-        .myFunction();
-      `,
-    });
-
-    await browserBuild(architect, host, target, overrides);
-  });
-
-  it('supports Protocol-relative Url', async () => {
-    host.writeMultipleFiles({
-      'src/styles.css': `
-        body {
-          background-image: url('//cdn.com/classic-bg.jpg');
-        }
-      `,
-    });
-
-    const overrides = { extractCss: true, optimization: true };
-    const { files } = await browserBuild(architect, host, target, overrides);
-    expect(await files['styles.css']).toContain('background-image:url(//cdn.com/classic-bg.jpg)');
-  });
-
-  it('supports fonts with space in filename', async () => {
-    host.writeMultipleFiles({
-      'src/styles.css': `
-        @font-face {
-          font-family: "Font Awesome";
-          src: url("./assets/fa solid-900.woff2") format("woff2");
-        }
-
-        body {
-          font-family: "Font Awesome";
-        }
-      `,
-      'src/assets/fa solid-900.woff2': '',
-    });
-
-    const overrides = { extractCss: true };
-    const { output } = await browserBuild(architect, host, target, overrides);
-    expect(output.success).toBe(true);
-  });
-
-  it('supports font names with spaces', async () => {
-    host.writeMultipleFiles({
-      'src/styles.css': `
-        body {
-          font: 10px "Font Awesome";
-        }
-      `,
-    });
-
-    const overrides = { extractCss: true, optimization: true };
-    const logger = new logging.Logger('font-name-spaces');
-    const logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
-
-    const { output } = await browserBuild(architect, host, target, overrides, { logger });
-    expect(output.success).toBe(true);
-    expect(logs.join()).not.toContain('WARNING in Invalid font values ');
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
index b7c1a2fc7ddc..f715fc09a11f 100644
--- a/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
@@ -7,10 +7,9 @@
  */
 // tslint:disable:no-big-function
 
-import { DefaultTimeout, runTargetSpec } from '@angular-devkit/architect/testing';
-import { normalize, tags, virtualFs } from '@angular-devkit/core';
-import { concatMap, tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { logging, normalize, tags } from '@angular-devkit/core';
+import { browserBuild, createArchitect, host } from '../utils';
 
 
 describe('Browser Builder styles', () => {
@@ -21,42 +20,40 @@ describe('Browser Builder styles', () => {
       <circle cx="50" cy="50" r="40" stroke="green" stroke-width="4" fill="yellow" />
     </svg>
   `;
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
-  it('supports global styles', (done) => {
-    const styles: { [path: string]: string } = {
-      'src/string-style.css': '.string-style { color: red }',
-      'src/input-style.css': '.input-style { color: red }',
-      'src/lazy-style.css': '.lazy-style { color: red }',
-      'src/pre-rename-style.css': '.pre-rename-style { color: red }',
-      'src/pre-rename-lazy-style.css': '.pre-rename-lazy-style { color: red }',
-    };
-    const getStylesOption = () => [
+  it('supports global styles', async () => {
+    const styles = [
       'src/input-style.css',
       { input: 'src/lazy-style.css', bundleName: 'lazy-style', lazy: true },
       { input: 'src/pre-rename-style.css', bundleName: 'renamed-style' },
       { input: 'src/pre-rename-lazy-style.css', bundleName: 'renamed-lazy-style', lazy: true },
-    ];
+    ] as {};
     const cssMatches: { [path: string]: string } = {
-      './dist/styles.css': '.input-style',
-      './dist/lazy-style.css': '.lazy-style',
-      './dist/renamed-style.css': '.pre-rename-style',
-      './dist/renamed-lazy-style.css': '.pre-rename-lazy-style',
+      'styles.css': '.input-style',
+      'lazy-style.css': '.lazy-style',
+      'renamed-style.css': '.pre-rename-style',
+      'renamed-lazy-style.css': '.pre-rename-lazy-style',
     };
     const cssIndexMatches: { [path: string]: string } = {
-      './dist/index.html': '<link rel="stylesheet" href="styles.css">'
+      'index.html': '<link rel="stylesheet" href="styles.css">'
         + '<link rel="stylesheet" href="renamed-style.css">',
     };
     const jsMatches: { [path: string]: string } = {
-      './dist/styles.js': '.input-style',
-      './dist/lazy-style.js': '.lazy-style',
-      './dist/renamed-style.js': '.pre-rename-style',
-      './dist/renamed-lazy-style.js': '.pre-rename-lazy-style',
+      'styles.js': '.input-style',
+      'lazy-style.js': '.lazy-style',
+      'renamed-style.js': '.pre-rename-style',
+      'renamed-lazy-style.js': '.pre-rename-lazy-style',
     };
     const jsIndexMatches: { [path: string]: string } = {
-      './dist/index.html': '<script src="runtime.js"></script>'
+      'index.html': '<script src="runtime.js"></script>'
         + '<script src="polyfills.js"></script>'
         + '<script src="styles.js"></script>'
         + '<script src="renamed-style.js"></script>'
@@ -64,50 +61,49 @@ describe('Browser Builder styles', () => {
         + '<script src="main.js"></script>',
     };
 
-    host.writeMultipleFiles(styles);
-
-    const overrides = { extractCss: true, styles: getStylesOption() };
-
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      // Check css files were created.
-      tap(() => Object.keys(cssMatches).forEach(fileName => {
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        expect(content).toMatch(cssMatches[fileName]);
-      })),
-      // Check no js files are created.
-      tap(() => Object.keys(jsMatches).forEach(key =>
-        expect(host.scopedSync().exists(normalize(key))).toBe(false),
-      )),
-      // Check check index has styles in the right order.
-      tap(() => Object.keys(cssIndexMatches).forEach(fileName => {
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        expect(content).toMatch(cssIndexMatches[fileName]);
-      })),
-      // Also test with extractCss false.
-      concatMap(() => runTargetSpec(host, browserTargetSpec,
-        { extractCss: false, styles: getStylesOption() })),
-      // TODO: figure out why adding this tap breaks typings.
-      // This also happens in the output-hashing spec.
-      // tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      // Check js files were created.
-      tap(() => Object.keys(jsMatches).forEach(fileName => {
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        expect(content).toMatch(jsMatches[fileName]);
-      })),
-      // Check no css files are created.
-      tap(() => Object.keys(cssMatches).forEach(key =>
-        expect(host.scopedSync().exists(normalize(key))).toBe(false),
-      )),
-      // Check check index has styles in the right order.
-      tap(() => Object.keys(jsIndexMatches).forEach(fileName => {
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        expect(content).toMatch(jsIndexMatches[fileName]);
-      })),
-    ).toPromise().then(done, done.fail);
+    host.writeMultipleFiles({
+      'src/string-style.css': '.string-style { color: red }',
+      'src/input-style.css': '.input-style { color: red }',
+      'src/lazy-style.css': '.lazy-style { color: red }',
+      'src/pre-rename-style.css': '.pre-rename-style { color: red }',
+      'src/pre-rename-lazy-style.css': '.pre-rename-lazy-style { color: red }',
+    });
+
+    let { files } = await browserBuild(architect, host, target, { extractCss: true, styles });
+    // Check css files were created.
+    for (const cssFileName of Object.keys(cssMatches)) {
+      expect(await files[cssFileName]).toMatch(cssMatches[cssFileName]);
+    }
+    // Check no js files are created.
+    for (const jsFileName of Object.keys(jsMatches)) {
+      expect(jsFileName in files).toBe(false);
+    }
+
+    // Check check index has styles in the right order.
+    for (const cssIndexFileName of Object.keys(cssIndexMatches)) {
+      expect(await files[cssIndexFileName]).toMatch(cssIndexMatches[cssIndexFileName]);
+    }
+
+    // Also test with extractCss false.
+    files = (await browserBuild(architect, host, target, { extractCss: false, styles })).files;
+
+    // Check js files were created.
+    for (const jsFileName of Object.keys(jsMatches)) {
+      expect(await files[jsFileName]).toMatch(jsMatches[jsFileName]);
+    }
+
+    // Check no css files are created.
+    for (const cssFileName of Object.keys(cssMatches)) {
+      expect(cssFileName in files).toBe(false);
+    }
+
+    // Check check index has styles in the right order.
+    for (const jsIndexFileName of Object.keys(jsIndexMatches)) {
+      expect(await files[jsIndexFileName]).toMatch(jsIndexMatches[jsIndexFileName]);
+    }
   });
 
-  it('supports empty styleUrls in components', (done) => {
+  it('supports empty styleUrls in components', async () => {
     host.writeMultipleFiles({
       './src/app/app.component.ts': `
         import { Component } from '@angular/core';
@@ -123,15 +119,11 @@ describe('Browser Builder styles', () => {
       `,
     });
 
-    const overrides = { extractCss: true };
-
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
+    await browserBuild(architect, host, target, { extractCss: true });
   });
 
   extensionsWithImportSupport.forEach(ext => {
-    it(`supports imports in ${ext} files`, (done) => {
+    it(`supports imports in ${ext} files`, async () => {
       host.writeMultipleFiles({
         [`src/styles.${ext}`]: `
           @import './imported-styles.${ext}';
@@ -150,14 +142,14 @@ describe('Browser Builder styles', () => {
       });
 
       const matches: { [path: string]: RegExp } = {
-        'dist/styles.css': new RegExp(
+        'styles.css': new RegExp(
           // The global style should be there
           /p\s*{\s*background-color: #f00;\s*}(.|\n|\r)*/.source
           // The global style via import should be there
           + /body\s*{\s*background-color: #00f;\s*}/.source,
         ),
-        'dist/styles.css.map': /"mappings":".+"/,
-        'dist/main.js': new RegExp(
+        'styles.css.map': /"mappings":".+"/,
+        'main.js': new RegExp(
           // The component style should be there
           /h1(.|\n|\r)*background:\s*#000(.|\n|\r)*/.source
           // The component style via import should be there
@@ -171,21 +163,21 @@ describe('Browser Builder styles', () => {
         styles: [`src/styles.${ext}`],
       };
 
-      host.replaceInFile('src/app/app.component.ts', './app.component.css',
-        `./app.component.${ext}`);
+      host.replaceInFile(
+        'src/app/app.component.ts',
+        './app.component.css',
+        `./app.component.${ext}`,
+      );
 
-      runTargetSpec(host, browserTargetSpec, overrides).pipe(
-        tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-        tap(() => Object.keys(matches).forEach(fileName => {
-          const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-          expect(content).toMatch(matches[fileName]);
-        })),
-      ).toPromise().then(done, done.fail);
+      const { files } = await browserBuild(architect, host, target, overrides);
+      for (const fileName of Object.keys(matches)) {
+        expect(await files[fileName]).toMatch(matches[fileName]);
+      }
     });
   });
 
   extensionsWithImportSupport.forEach(ext => {
-    it(`supports material imports in ${ext} files`, (done) => {
+    it(`supports material imports in ${ext} files`, async () => {
       host.writeMultipleFiles({
         [`src/styles.${ext}`]: `
           @import "~@angular/material/prebuilt-themes/indigo-pink.css";
@@ -203,14 +195,11 @@ describe('Browser Builder styles', () => {
         extractCss: true,
         styles: [{ input: `src/styles.${ext}` }],
       };
-
-      runTargetSpec(host, browserTargetSpec, overrides).pipe(
-        tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      ).toPromise().then(done, done.fail);
+      await browserBuild(architect, host, target, overrides);
     });
   });
 
-  it(`supports material icons`, (done) => {
+  it(`supports material icons`, async () => {
     const overrides = {
       extractCss: true,
       optimization: true,
@@ -219,13 +208,11 @@ describe('Browser Builder styles', () => {
       ],
     };
 
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 2).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
+    await browserBuild(architect, host, target, overrides);
   });
 
   extensionsWithVariableSupport.forEach(ext => {
-    it(`supports ${ext} includePaths`, (done) => {
+    it(`supports ${ext} includePaths`, async () => {
 
       let variableAssignment = '';
       let variablereference = '';
@@ -253,8 +240,8 @@ describe('Browser Builder styles', () => {
       });
 
       const matches: { [path: string]: RegExp } = {
-        'dist/styles.css': /h1\s*{\s*color: #f00;\s*}/,
-        'dist/main.js': /h2.*{.*color: #f00;.*}/,
+        'styles.css': /h1\s*{\s*color: #f00;\s*}/,
+        'main.js': /h2.*{.*color: #f00;.*}/,
       };
 
       host.replaceInFile('src/app/app.component.ts', './app.component.css',
@@ -268,17 +255,14 @@ describe('Browser Builder styles', () => {
         },
       };
 
-      runTargetSpec(host, browserTargetSpec, overrides).pipe(
-        tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-        tap(() => Object.keys(matches).forEach(fileName => {
-          const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-          expect(content).toMatch(matches[fileName]);
-        })),
-      ).toPromise().then(done, done.fail);
+      const { files } = await browserBuild(architect, host, target, overrides);
+      for (const fileName of Object.keys(matches)) {
+        expect(await files[fileName]).toMatch(matches[fileName]);
+      }
     });
   });
 
-  it(`supports font-awesome imports`, (done) => {
+  it(`supports font-awesome imports`, async () => {
     host.writeMultipleFiles({
       'src/styles.scss': `
         $fa-font-path: "~font-awesome/fonts";
@@ -287,13 +271,10 @@ describe('Browser Builder styles', () => {
     });
 
     const overrides = { extractCss: true, styles: [`src/styles.scss`] };
-
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
+    await browserBuild(architect, host, target, overrides);
   }, 30000);
 
-  it(`supports font-awesome imports without extractCss`, (done) => {
+  it(`supports font-awesome imports without extractCss`, async () => {
     host.writeMultipleFiles({
       'src/styles.scss': `
         @import "~font-awesome/css/font-awesome.css";
@@ -301,13 +282,10 @@ describe('Browser Builder styles', () => {
     });
 
     const overrides = { extractCss: false, styles: [`src/styles.scss`] };
-
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
+    await browserBuild(architect, host, target, overrides);
   }, 30000);
 
-  it(`uses autoprefixer`, (done) => {
+  it(`uses autoprefixer`, async () => {
     host.writeMultipleFiles({
       'src/styles.css': tags.stripIndents`
         /* normal-comment */
@@ -316,21 +294,15 @@ describe('Browser Builder styles', () => {
     });
 
     const overrides = { extractCss: true, optimization: false };
-
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = 'dist/styles.css';
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        expect(content).toContain(tags.stripIndents`
-          /* normal-comment */
-          /*! important-comment */
-          div { -ms-flex: 1; flex: 1 }`);
-      }),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['styles.css']).toContain(tags.stripIndents`
+      /* normal-comment */
+      /*! important-comment */
+      div { -ms-flex: 1; flex: 1 }`,
+    );
   });
 
-  it(`minimizes css`, (done) => {
+  it(`minimizes css`, async () => {
     host.writeMultipleFiles({
       'src/styles.css': tags.stripIndents`
         /* normal-comment */
@@ -339,20 +311,12 @@ describe('Browser Builder styles', () => {
     });
 
     const overrides = { extractCss: true, optimization: true };
-
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 2).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = 'dist/styles.css';
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        expect(content).toContain(
-          '/*! important-comment */div{-ms-flex:1;flex:1}');
-      }),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['styles.css']).toContain('/*! important-comment */div{-ms-flex:1;flex:1}');
   });
 
   // TODO: consider making this a unit test in the url processing plugins.
-  it(`supports baseHref/deployUrl in resource urls without rebaseRootRelativeCssUrls`, (done) => {
+  it(`supports baseHref/deployUrl in resource urls without rebaseRootRelativeCssUrls`, async () => {
     // Use a large image for the relative ref so it cannot be inlined.
     host.copyFile('src/spectrum.png', './src/assets/global-img-relative.png');
     host.copyFile('src/spectrum.png', './src/assets/component-img-relative.png');
@@ -369,112 +333,96 @@ describe('Browser Builder styles', () => {
       'src/assets/component-img-absolute.svg': imgSvg,
     });
 
-    const stylesBundle = 'dist/styles.css';
-    const mainBundle = 'dist/main.js';
+    let { files } = await browserBuild(architect, host, target, { aot: true, extractCss: true });
 
     // Check base paths are correctly generated.
-    runTargetSpec(host, browserTargetSpec, { aot: true, extractCss: true }).pipe(
-      tap(() => {
-        const styles = virtualFs.fileBufferToString(
-          host.scopedSync().read(normalize(stylesBundle)),
-        );
-        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
-        expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-        expect(styles).toContain(`url('global-img-relative.png')`);
-        expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
-        expect(main).toContain(`url('component-img-relative.png')`);
-        expect(host.scopedSync().exists(normalize('dist/assets/global-img-absolute.svg')))
-          .toBe(true);
-        expect(host.scopedSync().exists(normalize('dist/global-img-relative.png')))
-          .toBe(true);
-        expect(host.scopedSync().exists(normalize('dist/assets/component-img-absolute.svg')))
-          .toBe(true);
-        expect(host.scopedSync().exists(normalize('dist/component-img-relative.png')))
-          .toBe(true);
-      }),
-      // Check urls with deploy-url scheme are used as is.
-      concatMap(() => runTargetSpec(host, browserTargetSpec,
-        { extractCss: true, baseHref: '/base/', deployUrl: 'http://deploy.url/' },
-      )),
-      tap(() => {
-        const styles = virtualFs.fileBufferToString(
-          host.scopedSync().read(normalize(stylesBundle)),
-        );
-        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
-        expect(styles)
-          .toContain(`url('/assets/global-img-absolute.svg')`);
-        expect(main)
-          .toContain(`url('/assets/component-img-absolute.svg')`);
-      }),
-      // Check urls with base-href scheme are used as is (with deploy-url).
-      concatMap(() => runTargetSpec(host, browserTargetSpec,
-        { extractCss: true, baseHref: 'http://base.url/', deployUrl: 'deploy/' },
-      )),
-      tap(() => {
-        const styles = virtualFs.fileBufferToString(
-          host.scopedSync().read(normalize(stylesBundle)),
-        );
-        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
-        expect(styles)
-          .toContain(`url('/assets/global-img-absolute.svg')`);
-        expect(main)
-          .toContain(`url('/assets/component-img-absolute.svg')`);
-      }),
-      // Check urls with deploy-url and base-href scheme only use deploy-url.
-      concatMap(() => runTargetSpec(host, browserTargetSpec, {
-        extractCss: true,
-        baseHref: 'http://base.url/',
-        deployUrl: 'http://deploy.url/',
-      },
-      )),
-      tap(() => {
-        const styles = virtualFs.fileBufferToString(
-          host.scopedSync().read(normalize(stylesBundle)),
-        );
-        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
-        expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-        expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
-      }),
-      // Check with schemeless base-href and deploy-url flags.
-      concatMap(() => runTargetSpec(host, browserTargetSpec,
-        { extractCss: true, baseHref: '/base/', deployUrl: 'deploy/' },
-      )),
-      tap(() => {
-        const styles = virtualFs.fileBufferToString(
-          host.scopedSync().read(normalize(stylesBundle)),
-        );
-        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
-        expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-        expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
-      }),
-      // Check with identical base-href and deploy-url flags.
-      concatMap(() => runTargetSpec(host, browserTargetSpec,
-        { extractCss: true, baseHref: '/base/', deployUrl: '/base/' },
-      )),
-      tap(() => {
-        const styles = virtualFs.fileBufferToString(
-          host.scopedSync().read(normalize(stylesBundle)),
-        );
-        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
-        expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-        expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
-      }),
-      // Check with only base-href flag.
-      concatMap(() => runTargetSpec(host, browserTargetSpec,
-        { extractCss: true, baseHref: '/base/' },
-      )),
-      tap(() => {
-        const styles = virtualFs.fileBufferToString(
-          host.scopedSync().read(normalize(stylesBundle)),
-        );
-        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
-        expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-        expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
-      }),
-    ).toPromise().then(done, done.fail);
+    let styles = await files['styles.css'];
+    let main = await files['main.js'];
+
+    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+    expect(styles).toContain(`url('global-img-relative.png')`);
+    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+    expect(main).toContain(`url('component-img-relative.png')`);
+
+    expect(host.scopedSync().exists(normalize('dist/assets/global-img-absolute.svg')))
+      .toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/global-img-relative.png')))
+      .toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/assets/component-img-absolute.svg')))
+      .toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/component-img-relative.png')))
+      .toBe(true);
+
+    // Check urls with deploy-url scheme are used as is.
+    files = (await browserBuild(architect, host, target, {
+      extractCss: true,
+      baseHref: '/base/',
+      deployUrl: 'http://deploy.url/',
+    })).files;
+
+    styles = await files['styles.css'];
+    main = await files['main.js'];
+    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+
+    // Check urls with base-href scheme are used as is (with deploy-url).
+    files = (await browserBuild(architect, host, target, {
+      extractCss: true,
+      baseHref: 'http://base.url/',
+      deployUrl: 'deploy/',
+    })).files;
+    styles = await files['styles.css'];
+    main = await files['main.js'];
+    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+
+    // Check urls with deploy-url and base-href scheme only use deploy-url.
+    files = (await browserBuild(architect, host, target, {
+      extractCss: true,
+      baseHref: 'http://base.url/',
+      deployUrl: 'http://deploy.url/',
+    })).files;
+    styles = await files['styles.css'];
+    main = await files['main.js'];
+    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+
+    // Check with schemeless base-href and deploy-url flags.
+    files = (await browserBuild(architect, host, target, {
+      extractCss: true,
+      baseHref: '/base/',
+      deployUrl: 'deploy/',
+    })).files;
+    styles = await files['styles.css'];
+    main = await files['main.js'];
+    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+
+    // Check with identical base-href and deploy-url flags.
+    files = (await browserBuild(architect, host, target, {
+      extractCss: true,
+      baseHref: '/base/',
+      deployUrl: '/base/',
+    })).files;
+
+    styles = await files['styles.css'];
+    main = await files['main.js'];
+    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+
+    // Check with only base-href flag.
+    files = (await browserBuild(architect, host, target, {
+      extractCss: true,
+      baseHref: '/base/',
+    })).files;
+
+    styles = await files['styles.css'];
+    main = await files['main.js'];
+    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
   }, 90000);
 
-  it(`supports baseHref/deployUrl in resource urls with rebaseRootRelativeCssUrls`, (done) => {
+  it(`supports baseHref/deployUrl in resource urls with rebaseRootRelativeCssUrls`, async () => {
     // Use a large image for the relative ref so it cannot be inlined.
     host.copyFile('src/spectrum.png', './src/assets/global-img-relative.png');
     host.copyFile('src/spectrum.png', './src/assets/component-img-relative.png');
@@ -491,128 +439,114 @@ describe('Browser Builder styles', () => {
       'src/assets/component-img-absolute.svg': imgSvg,
     });
 
-    const stylesBundle = 'dist/styles.css';
-    const mainBundle = 'dist/main.js';
-
     // Check base paths are correctly generated.
     const overrides = {
       extractCss: true,
       rebaseRootRelativeCssUrls: true,
     };
-    runTargetSpec(host, browserTargetSpec, { ...overrides, aot: true }).pipe(
-      tap(() => {
-        const styles = virtualFs.fileBufferToString(
-          host.scopedSync().read(normalize(stylesBundle)),
-        );
-        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
-        expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-        expect(styles).toContain(`url('global-img-relative.png')`);
-        expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
-        expect(main).toContain(`url('component-img-relative.png')`);
-        expect(host.scopedSync().exists(normalize('dist/assets/global-img-absolute.svg')))
-          .toBe(true);
-        expect(host.scopedSync().exists(normalize('dist/global-img-relative.png')))
-          .toBe(true);
-        expect(host.scopedSync().exists(normalize('dist/assets/component-img-absolute.svg')))
-          .toBe(true);
-        expect(host.scopedSync().exists(normalize('dist/component-img-relative.png')))
-          .toBe(true);
-      }),
-      // Check urls with deploy-url scheme are used as is.
-      concatMap(() => runTargetSpec(host, browserTargetSpec,
-        { ...overrides, baseHref: '/base/', deployUrl: 'http://deploy.url/' },
-      )),
-      tap(() => {
-        const styles = virtualFs.fileBufferToString(
-          host.scopedSync().read(normalize(stylesBundle)),
-        );
-        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
-        expect(styles)
-          .toContain(`url('http://deploy.url/assets/global-img-absolute.svg')`);
-        expect(main)
-          .toContain(`url('http://deploy.url/assets/component-img-absolute.svg')`);
-      }),
-      // Check urls with base-href scheme are used as is (with deploy-url).
-      concatMap(() => runTargetSpec(host, browserTargetSpec,
-        { ...overrides, baseHref: 'http://base.url/', deployUrl: 'deploy/' },
-      )),
-      tap(() => {
-        const styles = virtualFs.fileBufferToString(
-          host.scopedSync().read(normalize(stylesBundle)),
-        );
-        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
-        expect(styles)
-          .toContain(`url('http://base.url/deploy/assets/global-img-absolute.svg')`);
-        expect(main)
-          .toContain(`url('http://base.url/deploy/assets/component-img-absolute.svg')`);
-      }),
-      // Check urls with deploy-url and base-href scheme only use deploy-url.
-      concatMap(() => runTargetSpec(host, browserTargetSpec, {
-        ...overrides,
-        baseHref: 'http://base.url/',
-        deployUrl: 'http://deploy.url/',
-      },
-      )),
-      tap(() => {
-        const styles = virtualFs.fileBufferToString(
-          host.scopedSync().read(normalize(stylesBundle)),
-        );
-        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
-        expect(styles).toContain(`url('http://deploy.url/assets/global-img-absolute.svg')`);
-        expect(main).toContain(`url('http://deploy.url/assets/component-img-absolute.svg')`);
-      }),
-      // Check with schemeless base-href and deploy-url flags.
-      concatMap(() => runTargetSpec(host, browserTargetSpec,
-        { ...overrides, baseHref: '/base/', deployUrl: 'deploy/' },
-      )),
-      tap(() => {
-        const styles = virtualFs.fileBufferToString(
-          host.scopedSync().read(normalize(stylesBundle)),
-        );
-        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
-        expect(styles).toContain(`url('/base/deploy/assets/global-img-absolute.svg')`);
-        expect(main).toContain(`url('/base/deploy/assets/component-img-absolute.svg')`);
-      }),
-      // Check with identical base-href and deploy-url flags.
-      concatMap(() => runTargetSpec(host, browserTargetSpec,
-        { ...overrides, baseHref: '/base/', deployUrl: '/base/' },
-      )),
-      tap(() => {
-        const styles = virtualFs.fileBufferToString(
-          host.scopedSync().read(normalize(stylesBundle)),
-        );
-        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
-        expect(styles).toContain(`url('/base/assets/global-img-absolute.svg')`);
-        expect(main).toContain(`url('/base/assets/component-img-absolute.svg')`);
-      }),
-      // Check with only base-href flag.
-      concatMap(() => runTargetSpec(host, browserTargetSpec,
-        { ...overrides, baseHref: '/base/' },
-      )),
-      tap(() => {
-        const styles = virtualFs.fileBufferToString(
-          host.scopedSync().read(normalize(stylesBundle)),
-        );
-        const main = virtualFs.fileBufferToString(host.scopedSync().read(normalize(mainBundle)));
-        expect(styles).toContain(`url('/base/assets/global-img-absolute.svg')`);
-        expect(main).toContain(`url('/base/assets/component-img-absolute.svg')`);
-      }),
-    ).toPromise().then(done, done.fail);
+    let { files } = await browserBuild(architect, host, target, {
+      ...overrides,
+      aot: true,
+    });
+
+    let styles = await files['styles.css'];
+    let main = await files['main.js'];
+    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+    expect(styles).toContain(`url('global-img-relative.png')`);
+    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+    expect(main).toContain(`url('component-img-relative.png')`);
+    expect(host.scopedSync().exists(normalize('dist/assets/global-img-absolute.svg')))
+      .toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/global-img-relative.png')))
+      .toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/assets/component-img-absolute.svg')))
+      .toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/component-img-relative.png')))
+      .toBe(true);
+
+    // Check urls with deploy-url scheme are used as is.
+    files = (await browserBuild(architect, host, target, {
+      ...overrides,
+      baseHref: '/base/',
+      deployUrl: 'http://deploy.url/',
+    })).files;
+
+    styles = await files['styles.css'];
+    main = await files['main.js'];
+    expect(styles).toContain(`url('http://deploy.url/assets/global-img-absolute.svg')`);
+    expect(main).toContain(`url('http://deploy.url/assets/component-img-absolute.svg')`);
+
+    // Check urls with base-href scheme are used as is (with deploy-url).
+    files = (await browserBuild(architect, host, target, {
+      ...overrides,
+      baseHref: 'http://base.url/',
+      deployUrl: 'deploy/',
+    })).files;
+
+    styles = await files['styles.css'];
+    main = await files['main.js'];
+    expect(styles).toContain(`url('http://base.url/deploy/assets/global-img-absolute.svg')`);
+    expect(main).toContain(`url('http://base.url/deploy/assets/component-img-absolute.svg')`);
+
+    // Check urls with deploy-url and base-href scheme only use deploy-url.
+    files = (await browserBuild(architect, host, target, {
+      ...overrides,
+      baseHref: 'http://base.url/',
+      deployUrl: 'http://deploy.url/',
+    })).files;
+
+    styles = await files['styles.css'];
+    main = await files['main.js'];
+    expect(styles).toContain(`url('http://deploy.url/assets/global-img-absolute.svg')`);
+    expect(main).toContain(`url('http://deploy.url/assets/component-img-absolute.svg')`);
+
+    // Check with schemeless base-href and deploy-url flags.
+    files = (await browserBuild(architect, host, target, {
+      ...overrides,
+      baseHref: '/base/',
+      deployUrl: 'deploy/',
+    })).files;
+
+    styles = await files['styles.css'];
+    main = await files['main.js'];
+    expect(styles).toContain(`url('/base/deploy/assets/global-img-absolute.svg')`);
+    expect(main).toContain(`url('/base/deploy/assets/component-img-absolute.svg')`);
+
+    // Check with identical base-href and deploy-url flags.
+    files = (await browserBuild(architect, host, target, {
+      ...overrides,
+      baseHref: '/base/',
+      deployUrl: '/base/',
+    })).files;
+
+    styles = await files['styles.css'];
+    main = await files['main.js'];
+    expect(styles).toContain(`url('/base/assets/global-img-absolute.svg')`);
+    expect(main).toContain(`url('/base/assets/component-img-absolute.svg')`);
+
+    // Check with only base-href flag.
+    files = (await browserBuild(architect, host, target, {
+      ...overrides,
+      baseHref: '/base/',
+    })).files;
+
+    styles = await files['styles.css'];
+    main = await files['main.js'];
+    expect(styles).toContain(`url('/base/assets/global-img-absolute.svg')`);
+    expect(main).toContain(`url('/base/assets/component-img-absolute.svg')`);
   }, 90000);
 
-  it(`supports bootstrap@4`, (done) => {
+  it(`supports bootstrap@4`, async () => {
     const overrides = {
       extractCss: true,
       styles: ['../../../../node_modules/bootstrap/dist/css/bootstrap.css'],
       scripts: ['../../../../node_modules/bootstrap/dist/js/bootstrap.js'],
     };
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
+    await browserBuild(architect, host, target, overrides);
   });
 
-  it(`supports inline javascript in less`, (done) => {
+  it(`supports inline javascript in less`, async () => {
     const overrides = { styles: [`src/styles.less`] };
     host.writeMultipleFiles({
       'src/styles.less': `
@@ -625,12 +559,10 @@ describe('Browser Builder styles', () => {
       `,
     });
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
+    await browserBuild(architect, host, target, overrides);
   });
 
-  it('supports Protocol-relative Url', (done) => {
+  it('supports Protocol-relative Url', async () => {
     host.writeMultipleFiles({
       'src/styles.css': `
         body {
@@ -640,14 +572,46 @@ describe('Browser Builder styles', () => {
     });
 
     const overrides = { extractCss: true, optimization: true };
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => {
-        expect(buildEvent.success).toBe(true);
-
-        const filePath = './dist/styles.css';
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(filePath)));
-        expect(content).toContain('background-image:url(//cdn.com/classic-bg.jpg)');
-      }),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['styles.css']).toContain('background-image:url(//cdn.com/classic-bg.jpg)');
+  });
+
+  it('supports fonts with space in filename', async () => {
+    host.writeMultipleFiles({
+      'src/styles.css': `
+        @font-face {
+          font-family: "Font Awesome";
+          src: url("./assets/fa solid-900.woff2") format("woff2");
+        }
+
+        body {
+          font-family: "Font Awesome";
+        }
+      `,
+      'src/assets/fa solid-900.woff2': '',
+    });
+
+    const overrides = { extractCss: true };
+    const { output } = await browserBuild(architect, host, target, overrides);
+    expect(output.success).toBe(true);
+  });
+
+  it('supports font names with spaces', async () => {
+    host.writeMultipleFiles({
+      'src/styles.css': `
+        body {
+          font: 10px "Font Awesome";
+        }
+      `,
+    });
+
+    const overrides = { extractCss: true, optimization: true };
+    const logger = new logging.Logger('font-name-spaces');
+    const logs: string[] = [];
+    logger.subscribe(e => logs.push(e.message));
+
+    const { output } = await browserBuild(architect, host, target, overrides, { logger });
+    expect(output.success).toBe(true);
+    expect(logs.join()).not.toContain('WARNING in Invalid font values ');
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/subresource-integrity2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/subresource-integrity2_spec_large.ts
deleted file mode 100644
index 9072570abe10..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/subresource-integrity2_spec_large.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { browserBuild, createArchitect, host } from '../utils';
-
-
-describe('Browser Builder subresource integrity', () => {
-  const target = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('works', async () => {
-    host.writeMultipleFiles({
-      'src/my-js-file.js': `console.log(1); export const a = 2;`,
-      'src/main.ts': `import { a } from './my-js-file'; console.log(a);`,
-    });
-
-    const overrides = { subresourceIntegrity: true };
-    const { files } = await browserBuild(architect, host, target, overrides);
-    expect(await files['index.html']).toMatch(/integrity="\w+-[A-Za-z0-9\/\+=]+"/);
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/subresource-integrity_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/subresource-integrity_spec_large.ts
index 83c31d5870ff..9072570abe10 100644
--- a/packages/angular_devkit/build_angular/test/browser/subresource-integrity_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/subresource-integrity_spec_large.ts
@@ -5,34 +5,28 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { browserBuild, createArchitect, host } from '../utils';
 
 
 describe('Browser Builder subresource integrity', () => {
-  const outputPath = normalize('dist');
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
-  it('works', (done) => {
+  it('works', async () => {
     host.writeMultipleFiles({
       'src/my-js-file.js': `console.log(1); export const a = 2;`,
       'src/main.ts': `import { a } from './my-js-file'; console.log(a);`,
     });
 
     const overrides = { subresourceIntegrity: true };
-
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'index.html');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(fileName));
-        expect(content).toMatch(/integrity="\w+-[A-Za-z0-9\/\+=]+"/);
-      }),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect(await files['index.html']).toMatch(/integrity="\w+-[A-Za-z0-9\/\+=]+"/);
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/tsconfig-paths2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/tsconfig-paths2_spec_large.ts
deleted file mode 100644
index 3c051fce1765..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/tsconfig-paths2_spec_large.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { tap } from 'rxjs/operators';
-import { browserBuild, browserTargetSpec, createArchitect, host } from '../utils';
-
-
-describe('Browser Builder tsconfig paths', () => {
-  const target = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('works', async () => {
-    host.replaceInFile('src/app/app.module.ts', './app.component', '@root/app/app.component');
-    host.replaceInFile('tsconfig.json', /"baseUrl": ".\/",/, `
-      "baseUrl": "./",
-      "paths": {
-        "@root/*": [
-          "./src/*"
-        ]
-      },
-    `);
-
-    await browserBuild(architect, host, target);
-  });
-
-  it('works', async () => {
-    host.writeMultipleFiles({
-      'src/meaning-too.ts': 'export var meaning = 42;',
-      'src/app/shared/meaning.ts': 'export var meaning = 42;',
-      'src/app/shared/index.ts': `export * from './meaning'`,
-    });
-    host.replaceInFile('tsconfig.json', /"baseUrl": ".\/",/, `
-      "baseUrl": "./",
-      "paths": {
-        "@shared": [
-          "src/app/shared"
-        ],
-        "@shared/*": [
-          "src/app/shared/*"
-        ],
-        "*": [
-          "*",
-          "src/app/shared/*"
-        ]
-      },
-    `);
-    host.appendToFile('src/app/app.component.ts', `
-      import { meaning } from 'src/app/shared/meaning';
-      import { meaning as meaning2 } from '@shared';
-      import { meaning as meaning3 } from '@shared/meaning';
-      import { meaning as meaning4 } from 'meaning';
-      import { meaning as meaning5 } from 'src/meaning-too';
-
-      // need to use imports otherwise they are ignored and
-      // no error is outputted, even if baseUrl/paths don't work
-      console.log(meaning)
-      console.log(meaning2)
-      console.log(meaning3)
-      console.log(meaning4)
-      console.log(meaning5)
-    `);
-
-    await browserBuild(architect, host, target);
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/tsconfig-paths_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/tsconfig-paths_spec_large.ts
index a37a5d387745..3c051fce1765 100644
--- a/packages/angular_devkit/build_angular/test/browser/tsconfig-paths_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/tsconfig-paths_spec_large.ts
@@ -6,16 +6,23 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import { Architect } from '@angular-devkit/architect/src/index2';
 import { runTargetSpec } from '@angular-devkit/architect/testing';
 import { tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { browserBuild, browserTargetSpec, createArchitect, host } from '../utils';
 
 
 describe('Browser Builder tsconfig paths', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  it('works', (done) => {
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
     host.replaceInFile('src/app/app.module.ts', './app.component', '@root/app/app.component');
     host.replaceInFile('tsconfig.json', /"baseUrl": ".\/",/, `
       "baseUrl": "./",
@@ -26,12 +33,10 @@ describe('Browser Builder tsconfig paths', () => {
       },
     `);
 
-    runTargetSpec(host, browserTargetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
+    await browserBuild(architect, host, target);
   });
 
-  it('works', (done) => {
+  it('works', async () => {
     host.writeMultipleFiles({
       'src/meaning-too.ts': 'export var meaning = 42;',
       'src/app/shared/meaning.ts': 'export var meaning = 42;',
@@ -68,8 +73,6 @@ describe('Browser Builder tsconfig paths', () => {
       console.log(meaning5)
     `);
 
-    runTargetSpec(host, browserTargetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
+    await browserBuild(architect, host, target);
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/vendor-chunk2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/vendor-chunk2_spec_large.ts
deleted file mode 100644
index 8fd9084b3b78..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/vendor-chunk2_spec_large.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { browserBuild, createArchitect, host } from '../utils';
-
-
-describe('Browser Builder vendor chunk', () => {
-  const target = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('works', async () => {
-    const { files } = await browserBuild(architect, host, target, { vendorChunk: true });
-    expect('vendor.js' in files).toBe(true);
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/vendor-chunk_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/vendor-chunk_spec_large.ts
index 7c0fc24801f8..8fd9084b3b78 100644
--- a/packages/angular_devkit/build_angular/test/browser/vendor-chunk_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/vendor-chunk_spec_large.ts
@@ -5,28 +5,22 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { join, normalize } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { browserBuild, createArchitect, host } from '../utils';
 
 
 describe('Browser Builder vendor chunk', () => {
-  const outputPath = normalize('dist');
-
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  it('works', (done) => {
-    const overrides = { vendorChunk: true };
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'vendor.js');
-        expect(host.scopedSync().exists(fileName)).toBe(true);
-      }),
-    ).toPromise().then(done, done.fail);
+  it('works', async () => {
+    const { files } = await browserBuild(architect, host, target, { vendorChunk: true });
+    expect('vendor.js' in files).toBe(true);
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/vendor-source-map2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/vendor-source-map2_spec_large.ts
deleted file mode 100644
index c787631be93e..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/vendor-source-map2_spec_large.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { Architect } from '@angular-devkit/architect/src/index2';
-import * as path from 'path';
-import { browserBuild, createArchitect, host } from '../utils';
-
-describe('Browser Builder external source map', () => {
-  const target = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('works', async () => {
-    const overrides = {
-      sourceMap: {
-        scripts: true,
-        styles: true,
-        vendor: true,
-      },
-    };
-
-    const { files } = await browserBuild(architect, host, target, overrides);
-    const sourcePath = JSON.parse(await files['vendor.js.map']).sources[0];
-    expect(path.extname(sourcePath)).toBe('.ts', `${sourcePath} extention should be '.ts'`);
-  });
-
-  it(`works when using deprecated 'vendorSourceMap'`, async () => {
-    const overrides = {
-      sourceMap: {
-        scripts: true,
-        styles: true,
-      },
-      vendorSourceMap: true,
-    };
-
-    const { files } = await browserBuild(architect, host, target, overrides);
-    const sourcePath = JSON.parse(await files['vendor.js.map']).sources[0];
-    expect(path.extname(sourcePath)).toBe('.ts', `${sourcePath} extention should be '.ts'`);
-  });
-
-  it('does not map sourcemaps from external library when disabled', async () => {
-    const overrides = {
-      sourceMap: {
-        scripts: true,
-        styles: true,
-        vendor: false,
-      },
-    };
-
-    const { files } = await browserBuild(architect, host, target, overrides);
-    const sourcePath = JSON.parse(await files['vendor.js.map']).sources[0];
-    expect(path.extname(sourcePath)).toBe('.js', `${sourcePath} extention should be '.ts'`);
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts
index 1b67bf697da5..c787631be93e 100644
--- a/packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts
@@ -5,22 +5,22 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { join, normalize, virtualFs } from '@angular-devkit/core';
+import { Architect } from '@angular-devkit/architect/src/index2';
 import * as path from 'path';
-import { tap } from 'rxjs/operators';
-import { Schema as BrowserBuilderSchema } from '../../src/browser/schema';
-import { browserTargetSpec, host } from '../utils';
+import { browserBuild, createArchitect, host } from '../utils';
 
 describe('Browser Builder external source map', () => {
-  const outputPath = normalize('dist');
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
-  it('works', (done) => {
-    const overrides: Partial<BrowserBuilderSchema> = {
+  it('works', async () => {
+    const overrides = {
       sourceMap: {
         scripts: true,
         styles: true,
@@ -28,21 +28,13 @@ describe('Browser Builder external source map', () => {
       },
     };
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'vendor.js.map');
-        expect(host.scopedSync().exists(fileName)).toBe(true);
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        // this is due the fact that some vendors like `tslib` sourcemaps to js files
-        const sourcePath = JSON.parse(content).sources[0];
-        expect(path.extname(sourcePath)).toBe('.ts', `${sourcePath} extention should be '.ts'`);
-      }),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, overrides);
+    const sourcePath = JSON.parse(await files['vendor.js.map']).sources[0];
+    expect(path.extname(sourcePath)).toBe('.ts', `${sourcePath} extention should be '.ts'`);
   });
 
-  it(`works when using deprecated 'vendorSourceMap'`, (done) => {
-    const overrides: Partial<BrowserBuilderSchema> = {
+  it(`works when using deprecated 'vendorSourceMap'`, async () => {
+    const overrides = {
       sourceMap: {
         scripts: true,
         styles: true,
@@ -50,22 +42,13 @@ describe('Browser Builder external source map', () => {
       vendorSourceMap: true,
     };
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'vendor.js.map');
-        expect(host.scopedSync().exists(fileName)).toBe(true);
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        // this is due the fact that some vendors like `tslib` sourcemaps to js files
-        const sourcePath = JSON.parse(content).sources[0];
-        expect(path.extname(sourcePath)).toBe('.ts', `${sourcePath} extention should be '.ts'`);
-      }),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, overrides);
+    const sourcePath = JSON.parse(await files['vendor.js.map']).sources[0];
+    expect(path.extname(sourcePath)).toBe('.ts', `${sourcePath} extention should be '.ts'`);
   });
 
-
-  it('does not map sourcemaps from external library when disabled', (done) => {
-    const overrides: Partial<BrowserBuilderSchema> = {
+  it('does not map sourcemaps from external library when disabled', async () => {
+    const overrides = {
       sourceMap: {
         scripts: true,
         styles: true,
@@ -73,17 +56,8 @@ describe('Browser Builder external source map', () => {
       },
     };
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = join(outputPath, 'vendor.js.map');
-        expect(host.scopedSync().exists(fileName)).toBe(true);
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        // this is due the fact that some vendors like `tslib` sourcemaps to js files
-        const sourcePath = JSON.parse(content).sources[0];
-        expect(path.extname(sourcePath)).toBe('.js', `${sourcePath} extention should be '.js'`);
-      }),
-    ).toPromise().then(done, done.fail);
+    const { files } = await browserBuild(architect, host, target, overrides);
+    const sourcePath = JSON.parse(await files['vendor.js.map']).sources[0];
+    expect(path.extname(sourcePath)).toBe('.js', `${sourcePath} extention should be '.ts'`);
   });
-
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/works2_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/works2_spec_large.ts
deleted file mode 100644
index 5cc8ecbeb3d0..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/works2_spec_large.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { join, normalize } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
-import { browserBuild, browserTargetSpec, createArchitect, host } from '../utils';
-
-
-describe('Browser Builder basic test', () => {
-  const target = { project: 'app', target: 'build' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it('works', async () => {
-    await browserBuild(architect, host, target);
-
-    // Default files should be in outputPath.
-    expect(await host.scopedSync().exists(normalize('dist/runtime.js'))).toBe(true);
-    expect(await host.scopedSync().exists(normalize('dist/main.js'))).toBe(true);
-    expect(await host.scopedSync().exists(normalize('dist/polyfills.js'))).toBe(true);
-    expect(await host.scopedSync().exists(normalize('dist/styles.js'))).toBe(true);
-    expect(await host.scopedSync().exists(normalize('dist/vendor.js'))).toBe(true);
-    expect(await host.scopedSync().exists(normalize('dist/favicon.ico'))).toBe(true);
-    expect(await host.scopedSync().exists(normalize('dist/index.html'))).toBe(true);
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/works_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/works_spec_large.ts
index aeeefccf3f3d..5cc8ecbeb3d0 100644
--- a/packages/angular_devkit/build_angular/test/browser/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/works_spec_large.ts
@@ -6,31 +6,33 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import { Architect } from '@angular-devkit/architect/src/index2';
 import { runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, normalize } from '@angular-devkit/core';
 import { tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
+import { browserBuild, browserTargetSpec, createArchitect, host } from '../utils';
 
 
 describe('Browser Builder basic test', () => {
-  const outputPath = normalize('dist');
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('works', async () => {
+    await browserBuild(architect, host, target);
 
-  it('works', (done) => {
-    runTargetSpec(host, browserTargetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        // Default files should be in outputPath.
-        expect(host.scopedSync().exists(join(outputPath, 'runtime.js'))).toBe(true);
-        expect(host.scopedSync().exists(join(outputPath, 'main.js'))).toBe(true);
-        expect(host.scopedSync().exists(join(outputPath, 'polyfills.js'))).toBe(true);
-        expect(host.scopedSync().exists(join(outputPath, 'styles.js'))).toBe(true);
-        expect(host.scopedSync().exists(join(outputPath, 'vendor.js'))).toBe(true);
-        expect(host.scopedSync().exists(join(outputPath, 'favicon.ico'))).toBe(true);
-        expect(host.scopedSync().exists(join(outputPath, 'index.html'))).toBe(true);
-      }),
-    ).toPromise().then(done, done.fail);
+    // Default files should be in outputPath.
+    expect(await host.scopedSync().exists(normalize('dist/runtime.js'))).toBe(true);
+    expect(await host.scopedSync().exists(normalize('dist/main.js'))).toBe(true);
+    expect(await host.scopedSync().exists(normalize('dist/polyfills.js'))).toBe(true);
+    expect(await host.scopedSync().exists(normalize('dist/styles.js'))).toBe(true);
+    expect(await host.scopedSync().exists(normalize('dist/vendor.js'))).toBe(true);
+    expect(await host.scopedSync().exists(normalize('dist/favicon.ico'))).toBe(true);
+    expect(await host.scopedSync().exists(normalize('dist/index.html'))).toBe(true);
   });
 });

From 330e56ed6d8c7c283dd7fc89706d05f9283fce87 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 15 Mar 2019 17:59:58 +0100
Subject: [PATCH 0941/1703] feat(@angular-devkit/build-angular): deprecate
 `profile` option in build

This flag has been deprecated in favor of the `NG_BUILD_PROFILING`  environment variable. This is mainly due not to expose debugging flag in our API.
---
 .../src/angular-cli-files/models/webpack-configs/common.ts     | 2 +-
 packages/angular_devkit/build_angular/src/browser/index.ts     | 2 +-
 packages/angular_devkit/build_angular/src/browser/index2.ts    | 2 +-
 packages/angular_devkit/build_angular/src/browser/schema.json  | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 6a865387b7d0..04bec22bddc8 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -75,7 +75,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
     }
   }
 
-  if (buildOptions.profile) {
+  if (buildOptions.profile || process.env['NG_BUILD_PROFILING']) {
     extraPlugins.push(new debug.ProfilingPlugin({
       outputPath: path.resolve(root, 'chrome-profiler-events.json'),
     }));
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 7298396ebb56..40c8ad37df68 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -156,7 +156,7 @@ export class BrowserBuilder implements Builder<BrowserBuilderSchema> {
 
     const webpackConfig = webpackMerge(webpackConfigs);
 
-    if (options.profile) {
+    if (options.profile || process.env['NG_BUILD_PROFILING']) {
       const smp = new SpeedMeasurePlugin({
         outputFormat: 'json',
         outputTarget: getSystemPath(join(root, 'speed-measure-plugin.json')),
diff --git a/packages/angular_devkit/build_angular/src/browser/index2.ts b/packages/angular_devkit/build_angular/src/browser/index2.ts
index 97c9871902f2..fc41ca5bdfaa 100644
--- a/packages/angular_devkit/build_angular/src/browser/index2.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index2.ts
@@ -141,7 +141,7 @@ export function buildWebpackConfig(
 
   const webpackConfig = webpackMerge(webpackConfigs);
 
-  if (options.profile) {
+  if (options.profile || process.env['NG_BUILD_PROFILING']) {
     const smp = new SpeedMeasurePlugin({
       outputFormat: 'json',
       outputTarget: getSystemPath(join(root, 'speed-measure-plugin.json')),
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index 836eabdf95ef..b41463b643e2 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -300,7 +300,8 @@
     "profile": {
       "type": "boolean",
       "description": "Output profile events for Chrome profiler.",
-      "default": false
+      "default": false,
+      "x-deprecated": "Use \"NG_BUILD_PROFILING\" environment variable instead."
     },
     "es5BrowserSupport": {
       "description": "Enables conditionally loaded ES2015 polyfills.",

From c85e4048d72c27f43c1f9fb39080f76a62a780dc Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 15 Mar 2019 05:55:11 +0000
Subject: [PATCH 0942/1703] build: update autoprefixer to version 9.5.0

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 58 ++++---------------
 2 files changed, 12 insertions(+), 48 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 939196f8b2a5..317cf0e8da6f 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -13,7 +13,7 @@
     "@angular-devkit/core": "0.0.0",
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.10.0",
-    "autoprefixer": "9.4.10",
+    "autoprefixer": "9.5.0",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.1",
diff --git a/yarn.lock b/yarn.lock
index 4edc7d1d1af9..ad7f94ec487d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1149,7 +1149,7 @@ assign-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
-async-each@^1.0.0, async-each@^1.0.1:
+async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
   integrity sha1-GdOGodntxufByF04iu28xW0zYC0=
@@ -1186,13 +1186,13 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@9.4.10:
-  version "9.4.10"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.10.tgz#e1be61fc728bacac8f4252ed242711ec0dcc6a7b"
-  integrity sha512-XR8XZ09tUrrSzgSlys4+hy5r2/z4Jp7Ag3pHm31U4g/CTccYPOVe19AkaJ4ey/vRd1sfj+5TtuD6I0PXtutjvQ==
+autoprefixer@9.5.0:
+  version "9.5.0"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.5.0.tgz#7e51d0355c11596e6cf9a0afc9a44e86d1596c70"
+  integrity sha512-hMKcyHsZn5+qL6AUeP3c8OyuteZ4VaUlg+fWbyl8z7PqsKHF/Bf8/px3K6AT8aMzDkBo8Bc11245MM+itDBOxQ==
   dependencies:
     browserslist "^4.4.2"
-    caniuse-lite "^1.0.30000940"
+    caniuse-lite "^1.0.30000947"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
     postcss "^7.0.14"
@@ -1803,10 +1803,10 @@ caniuse-lite@^1.0.30000939:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000939.tgz#b9ab7ac9e861bf78840b80c5dfbc471a5cd7e679"
   integrity sha512-oXB23ImDJOgQpGjRv1tCtzAvJr4/OvrHi5SO2vUgB0g0xpdZZoA/BxfImiWfdwoYdUTtQrPsXsvYU/dmCSM8gg==
 
-caniuse-lite@^1.0.30000940:
-  version "1.0.30000941"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000941.tgz#f0810802b2ab8d27f4b625d4769a610e24d5a42c"
-  integrity sha512-4vzGb2MfZcO20VMPj1j6nRAixhmtlhkypM4fL4zhgzEucQIYiRzSqPcWIu1OF8i0FETD93FMIPWfUJCAcFvrqA==
+caniuse-lite@^1.0.30000947:
+  version "1.0.30000947"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000947.tgz#c30305e9701449c22e97f4e9837cea3d76aa3273"
+  integrity sha512-ubgBUfufe5Oi3W1+EHyh2C3lfBIEcZ6bTuvl5wNOpIuRB978GF/Z+pQ7pGGUpeYRB0P+8C7i/3lt6xkeu2hwnA==
 
 canonical-path@1.0.0:
   version "1.0.0"
@@ -1857,25 +1857,6 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-chokidar@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.2.tgz#9c23ea40b01638439e0513864d362aeacc5ad058"
-  integrity sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==
-  dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.1"
-    braces "^2.3.2"
-    glob-parent "^3.1.0"
-    inherits "^2.0.3"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    normalize-path "^3.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.2.1"
-    upath "^1.1.0"
-  optionalDependencies:
-    fsevents "^1.2.7"
-
 chokidar@^1.4.2:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
@@ -3838,14 +3819,6 @@ fsevents@^1.0.0, fsevents@^1.2.2:
     nan "^2.9.2"
     node-pre-gyp "^0.10.0"
 
-fsevents@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
-  integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==
-  dependencies:
-    nan "^2.9.2"
-    node-pre-gyp "^0.10.0"
-
 fstream@^1.0.0, fstream@^1.0.2:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
@@ -7741,15 +7714,6 @@ readdirp@^2.0.0:
     readable-stream "^2.0.2"
     set-immediate-shim "^1.0.1"
 
-readdirp@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
-  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
-  dependencies:
-    graceful-fs "^4.1.11"
-    micromatch "^3.1.10"
-    readable-stream "^2.0.2"
-
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
@@ -9543,7 +9507,7 @@ unzip-response@^2.0.1:
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
   integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
 
-upath@^1.0.5, upath@^1.1.0:
+upath@^1.0.5:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
   integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==

From deeea03650dd47748dee48366f9e99f118d92a4b Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 13 Mar 2019 15:32:23 -0700
Subject: [PATCH 0943/1703] test: fix invalid architect tests

See https://github.com/angular/angular-cli/commit/fe229faf784b5cfde16281e11c3470c9c0c02c32
---
 packages/angular_devkit/architect/src/index2_spec.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/architect/src/index2_spec.ts b/packages/angular_devkit/architect/src/index2_spec.ts
index 9b5f55ff65a2..597835e23075 100644
--- a/packages/angular_devkit/architect/src/index2_spec.ts
+++ b/packages/angular_devkit/architect/src/index2_spec.ts
@@ -34,9 +34,11 @@ describe('architect', () => {
     testArchitectHost = new TestingArchitectHost();
     architect = new Architect(testArchitectHost, registry);
 
+    options = {};
     called = 0;
-    testArchitectHost.addBuilder('package:test', createBuilder(async () => {
+    testArchitectHost.addBuilder('package:test', createBuilder(async o => {
       called++;
+      options = o;
 
       return new Promise<BuilderOutput>(resolve => {
         setTimeout(() => resolve({ success: true }), 10);
@@ -93,13 +95,15 @@ describe('architect', () => {
     const run = await architect.scheduleBuilder('package:test-options', o);
     expect(await run.result).toEqual(jasmine.objectContaining({ success: true }));
     expect(options).toEqual(o);
+    await run.stop();
   });
 
   it('passes options to targets', async () => {
     const o = { helloTarget: 'world' };
     const run = await architect.scheduleTarget(target1, o);
     expect(await run.result).toEqual(jasmine.objectContaining({ success: true }));
-    // FIXME(hansl): expect(options).toEqual(o);
+    expect(options).toEqual(o);
+    await run.stop();
   });
 
   it('errors when builder cannot be resolved', async () => {

From cdda1c364f6dbdecd445a92121c87a9b1458a54b Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sat, 16 Mar 2019 09:57:47 +0100
Subject: [PATCH 0944/1703] ci: run e2e snapshots for renovate user

When a PR is opened by an upstream user, the username value will be available in `CIRCLE_PR_USERNAME` environment variable and not `CIRCLE_PROJECT_USERNAME`

```
  CIRCLE_PROJECT_REPONAME=angular-cli
  CIRCLE_PROJECT_USERNAME=angular
  CIRCLE_PR_NUMBER=13923
  CIRCLE_PR_REPONAME=angular-cli
  CIRCLE_PR_USERNAME=renovate-bot
```
---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ac4019f97e2b..2b9a7e00fb32 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -116,7 +116,7 @@ jobs:
       - run:
           name: Don't run expensive e2e tests for forks other than renovate-bot and angular
           command: >
-            if [[ "$CIRCLE_PROJECT_USERNAME" != "renovate-bot" ]] &&
+            if [[ "$CIRCLE_PR_USERNAME" != "renovate-bot" ]] &&
                [[ "$CIRCLE_PROJECT_USERNAME" != "angular" || $CIRCLE_BRANCH != "master" ]]; then
               circleci step halt
             fi
@@ -133,7 +133,7 @@ jobs:
       - run:
           name: Don't run expensive e2e tests for forks other than renovate-bot and angular
           command: >
-            if [[ "$CIRCLE_PROJECT_USERNAME" != "renovate-bot" ]] &&
+            if [[ "$CIRCLE_PR_USERNAME" != "renovate-bot" ]] &&
                [[ "$CIRCLE_PROJECT_USERNAME" != "angular" || $CIRCLE_BRANCH != "master" ]]; then
               circleci step halt
             fi

From fc48101a90b40b1336a13d3b12bd7d972b66d962 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 7 Mar 2019 19:26:49 -0500
Subject: [PATCH 0945/1703] feat(@angular-devkit/build-ng-packagr): implement
 stable architect API

---
 .../build_ng_packagr/builders.json            |  1 +
 .../build_ng_packagr/package.json             |  4 +-
 .../build_ng_packagr/src/build/index2.ts      | 44 +++++++++
 .../src/build/index_spec_large.ts             | 90 ++++++++++---------
 .../build_ng_packagr/src/build/schema.json    |  3 +-
 yarn.lock                                     | 55 +++++++-----
 6 files changed, 131 insertions(+), 66 deletions(-)
 create mode 100644 packages/angular_devkit/build_ng_packagr/src/build/index2.ts

diff --git a/packages/angular_devkit/build_ng_packagr/builders.json b/packages/angular_devkit/build_ng_packagr/builders.json
index 58db53b1c488..9715dcfd7fd8 100644
--- a/packages/angular_devkit/build_ng_packagr/builders.json
+++ b/packages/angular_devkit/build_ng_packagr/builders.json
@@ -3,6 +3,7 @@
   "builders": {
     "build": {
       "class": "./src/build",
+      "implementation": "./src/build/index2",
       "schema": "./src/build/schema.json",
       "description": "Build a library with ng-packagr."
     }
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index b0b706104597..cbec405e1cb6 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -13,12 +13,12 @@
     "semver": "5.6.0"
   },
   "peerDependencies": {
-    "ng-packagr": "^2.2.0 || ^3.0.0 || ^4.0.0"
+    "ng-packagr": "^4.0.0"
   },
   "devDependencies": {
     "@angular/compiler": "^8.0.0-beta.0",
     "@angular/compiler-cli": "^8.0.0-beta.0",
-    "ng-packagr": "^4.2.0",
+    "ng-packagr": "^4.0.0",
     "tsickle": ">=0.34.0",
     "tslib": "^1.9.0"
   }
diff --git a/packages/angular_devkit/build_ng_packagr/src/build/index2.ts b/packages/angular_devkit/build_ng_packagr/src/build/index2.ts
new file mode 100644
index 000000000000..7439c75eebe5
--- /dev/null
+++ b/packages/angular_devkit/build_ng_packagr/src/build/index2.ts
@@ -0,0 +1,44 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect/src/index2';
+import { resolve } from 'path';
+import { Observable, from } from 'rxjs';
+import { catchError, mapTo, switchMap } from 'rxjs/operators';
+import { Schema as NgPackagrBuilderOptions } from './schema';
+
+async function initialize(
+  options: NgPackagrBuilderOptions,
+  root: string,
+): Promise<import ('ng-packagr').NgPackagr> {
+  const packager = (await import('ng-packagr')).ngPackagr();
+
+  packager.forProject(resolve(root, options.project));
+
+  if (options.tsConfig) {
+    packager.withTsConfig(resolve(root, options.tsConfig));
+  }
+
+  return packager;
+}
+
+export function buildLibrary(
+  options: NgPackagrBuilderOptions,
+  context: BuilderContext,
+): Observable<BuilderOutput> {
+  return from(initialize(options, context.workspaceRoot)).pipe(
+    switchMap(packager => options.watch ? packager.watch() : packager.build()),
+    mapTo({ success: true }),
+    catchError(error => {
+      context.reportStatus('Error: ' + error);
+
+      return [{ success: false }];
+    }),
+  );
+}
+
+export default createBuilder<Record<string, string> & NgPackagrBuilderOptions>(buildLibrary);
diff --git a/packages/angular_devkit/build_ng_packagr/src/build/index_spec_large.ts b/packages/angular_devkit/build_ng_packagr/src/build/index_spec_large.ts
index c227e2f67e93..2722a2825675 100644
--- a/packages/angular_devkit/build_ng_packagr/src/build/index_spec_large.ts
+++ b/packages/angular_devkit/build_ng_packagr/src/build/index_spec_large.ts
@@ -5,47 +5,55 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { TargetSpecifier } from '@angular-devkit/architect';
-import { TestProjectHost, runTargetSpec } from '@angular-devkit/architect/testing';
-import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { debounceTime, map, take, tap } from 'rxjs/operators';
-
-const devkitRoot = normalize((global as any)._DevKitRoot); // tslint:disable-line:no-any
-const workspaceRoot = join(devkitRoot, 'tests/angular_devkit/build_ng_packagr/ng-packaged/');
-export const host = new TestProjectHost(workspaceRoot);
+import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { TestProjectHost } from '@angular-devkit/architect/testing';
+import { TestingArchitectHost } from '@angular-devkit/architect/testing/testing-architect-host';
+import { experimental, join, normalize, schema, virtualFs } from '@angular-devkit/core';
+import { map, take, tap } from 'rxjs/operators';
+
+const devkitRoot = (global as unknown as { _DevKitRoot: string})._DevKitRoot;
+const workspaceRoot = join(
+  normalize(devkitRoot),
+  'tests/angular_devkit/build_ng_packagr/ng-packaged/',
+);
 
 describe('NgPackagr Builder', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
-
-  it('works', (done) => {
-    const targetSpec: TargetSpecifier = { project: 'lib', target: 'build' };
-
-    runTargetSpec(host, targetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
+  const host = new TestProjectHost(workspaceRoot);
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+
+    const registry = new schema.CoreSchemaRegistry();
+    registry.addPostTransform(schema.transforms.addUndefinedDefaults);
+
+    const workspace = await experimental.workspace.Workspace.fromPath(host, host.root(), registry);
+    const architectHost = new TestingArchitectHost(
+      host.root(),
+      host.root(),
+      new WorkspaceNodeModulesArchitectHost(workspace, host.root()),
+    );
+    architect = new Architect(architectHost, registry);
   });
 
-  it('tests works', (done) => {
-    const targetSpec: TargetSpecifier = { project: 'lib', target: 'test' };
+  afterEach(() => host.restore().toPromise());
 
-    runTargetSpec(host, targetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
-  });
+  it('builds and packages a library', async () => {
+    const run = await architect.scheduleTarget({ project: 'lib', target: 'build' });
 
-  it('lint works', (done) => {
-    const targetSpec: TargetSpecifier = { project: 'lib', target: 'lint' };
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
 
-    runTargetSpec(host, targetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
-  });
+    await run.stop();
 
-  it('rebuilds on TS file changes', (done) => {
-    const targetSpec: TargetSpecifier = { project: 'lib', target: 'build' };
+    expect(host.scopedSync().exists(normalize('./dist/lib/fesm5/lib.js'))).toBe(true);
+    const content = virtualFs.fileBufferToString(
+      host.scopedSync().read(normalize('./dist/lib/fesm5/lib.js')),
+    );
+    expect(content).toContain('lib works');
+  });
 
+  it('rebuilds on TS file changes', async () => {
     const goldenValueFiles: { [path: string]: string } = {
       'projects/lib/src/lib/lib.component.ts': `
       import { Component } from '@angular/core';
@@ -58,16 +66,14 @@ describe('NgPackagr Builder', () => {
       `,
     };
 
-    const overrides = { watch: true };
+    const run = await architect.scheduleTarget(
+      { project: 'lib', target: 'build' },
+      { watch: true },
+    );
 
     let buildNumber = 0;
 
-    runTargetSpec(host, targetSpec, overrides)
-    .pipe(
-      // We must debounce on watch mode because file watchers are not very accurate.
-      // Changes from just before a process runs can be picked up and cause rebuilds.
-      // In this case, cleanup from the test right before this one causes a few rebuilds.
-      debounceTime(1000),
+    await run.output.pipe(
       tap((buildEvent) => expect(buildEvent.success).toBe(true)),
       map(() => {
         const fileName = './dist/lib/fesm5/lib.js';
@@ -93,8 +99,8 @@ describe('NgPackagr Builder', () => {
         }
       }),
       take(2),
-    )
-    .toPromise()
-    .then(done, done.fail);
+    ).toPromise();
+
+    await run.stop();
   });
 });
diff --git a/packages/angular_devkit/build_ng_packagr/src/build/schema.json b/packages/angular_devkit/build_ng_packagr/src/build/schema.json
index 979b5cd25599..a7c8fb13061c 100644
--- a/packages/angular_devkit/build_ng_packagr/src/build/schema.json
+++ b/packages/angular_devkit/build_ng_packagr/src/build/schema.json
@@ -1,11 +1,12 @@
 {
+  "$schema": "http://json-schema.org/draft-07/schema",
   "title": "ng-packagr Target",
   "description": "ng-packagr target options for Build Architect.",
   "type": "object",
   "properties": {
     "project": {
       "type": "string",
-      "description": "The file path of the package.json for distribution via npm."
+      "description": "The file path for the ng-packagr configuration file, relative to the current workspace."
     },
     "tsConfig": {
       "type": "string",
diff --git a/yarn.lock b/yarn.lock
index ad7f94ec487d..ed4546d93280 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1642,10 +1642,10 @@ builtin-modules@^1.0.0, builtin-modules@^1.1.1:
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
   integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
 
-builtin-modules@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-2.0.0.tgz#60b7ef5ae6546bd7deefa74b08b62a43a232648e"
-  integrity sha512-3U5kUA5VPsRUA3nofm/BXX7GVHKfxz0hOBAPxXrIvHzlDRkQVqEn6yi8QJegxl4LzOHLdvb7XF5dVawa/VVYBg==
+builtin-modules@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.0.0.tgz#1e587d44b006620d90286cc7a9238bbc6129cab1"
+  integrity sha512-hMIeU4K2ilbXV6Uv93ZZ0Avg/M91RaKXucQ+4me2Do1txxBDyDZWCBa5bJSLqoNTRpXTLwEzIk1KmloenDDjhg==
 
 builtin-status-codes@^3.0.0:
   version "3.0.0"
@@ -6229,10 +6229,10 @@ neo-async@^2.5.0:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
   integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
 
-ng-packagr@^4.2.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-4.4.0.tgz#b868a829b5743870c6392491de3faf4e4cec6f4d"
-  integrity sha512-dLpC/kmQsdbkL96ZclGjNRhq/J4MwpPKwPYNom74lvXqFC2jbbT/fnwmxX9WKXjvE8MEGsg2D2x8MsRURiNscg==
+ng-packagr@^4.0.0:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-4.7.1.tgz#a3e8fd2a7b70573a3a7759c4c57408a3b0e8ce11"
+  integrity sha512-MIPKxyrnV22fS3wSfst2XjwWOonFKujVVEnIehYJhiu8GOg37bCdbbr9plsE1jRDmDAUz6M1MvdKibUrJyRp6Q==
   dependencies:
     "@ngtools/json-schema" "^1.1.0"
     autoprefixer "^9.0.0"
@@ -6248,14 +6248,15 @@ ng-packagr@^4.2.0:
     less-plugin-npm-import "^2.1.0"
     node-sass "^4.9.3"
     node-sass-tilde-importer "^1.0.0"
+    opencollective-postinstall "^2.0.1"
     postcss "^7.0.0"
     postcss-url "^8.0.0"
     read-pkg-up "^4.0.0"
     rimraf "^2.6.1"
-    rollup "^0.66.0"
+    rollup "^0.67.0"
     rollup-plugin-commonjs "^9.1.3"
     rollup-plugin-json "^3.1.0"
-    rollup-plugin-node-resolve "^3.0.0"
+    rollup-plugin-node-resolve "^4.0.0"
     rollup-plugin-sourcemaps "^0.4.2"
     rxjs "^6.0.0"
     stylus "^0.54.5"
@@ -6672,6 +6673,11 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
+opencollective-postinstall@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89"
+  integrity sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw==
+
 opn@5.4.0, opn@^5.1.0:
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
@@ -7051,7 +7057,7 @@ path-key@^2.0.0, path-key@^2.0.1:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
-path-parse@^1.0.5:
+path-parse@^1.0.5, path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
@@ -7910,6 +7916,13 @@ resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.8.1:
   dependencies:
     path-parse "^1.0.5"
 
+resolve@^1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
+  integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==
+  dependencies:
+    path-parse "^1.0.6"
+
 responselike@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
@@ -7972,14 +7985,14 @@ rollup-plugin-json@^3.1.0:
   dependencies:
     rollup-pluginutils "^2.3.1"
 
-rollup-plugin-node-resolve@^3.0.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.4.0.tgz#908585eda12e393caac7498715a01e08606abc89"
-  integrity sha512-PJcd85dxfSBWih84ozRtBkB731OjXk0KnzN0oGp7WOWcarAFkVa71cV5hTJg2qpVsV2U8EUwrzHP3tvy9vS3qg==
+rollup-plugin-node-resolve@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.0.1.tgz#f95765d174e5daeef9ea6268566141f53aa9d422"
+  integrity sha512-fSS7YDuCe0gYqKsr5OvxMloeZYUSgN43Ypi1WeRZzQcWtHgFayV5tUSPYpxuaioIIWaBXl6NrVk0T2/sKwueLg==
   dependencies:
-    builtin-modules "^2.0.0"
+    builtin-modules "^3.0.0"
     is-module "^1.0.0"
-    resolve "^1.1.6"
+    resolve "^1.10.0"
 
 rollup-plugin-sourcemaps@^0.4.2:
   version "0.4.2"
@@ -7997,10 +8010,10 @@ rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.3.3:
     estree-walker "^0.5.2"
     micromatch "^2.3.11"
 
-rollup@^0.66.0:
-  version "0.66.6"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.66.6.tgz#ce7d6185beb7acea644ce220c25e71ae03275482"
-  integrity sha512-J7/SWanrcb83vfIHqa8+aVVGzy457GcjA6GVZEnD0x2u4OnOd0Q1pCrEoNe8yLwM6z6LZP02zBT2uW0yh5TqOw==
+rollup@^0.67.0:
+  version "0.67.4"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.67.4.tgz#8ed6b0993337f84ec8a0387f824fa6c197e833ec"
+  integrity sha512-AVuP73mkb4BBMUmksQ3Jw0jTrBTU1i7rLiUYjFxLZGb3xiFmtVEg40oByphkZAsiL0bJC3hRAJUQos/e5EBd+w==
   dependencies:
     "@types/estree" "0.0.39"
     "@types/node" "*"

From a49d278baa8561a39566dffd5c947bcc79b485c0 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 11 Mar 2019 12:04:03 -0400
Subject: [PATCH 0946/1703] feat(@angular-devkit/build-angular): implement
 stable architect API for protractor

---
 .../build_angular/builders.json               |   1 +
 .../build_angular/src/protractor/index2.ts    | 152 ++++++++++++++++++
 .../build_angular/src/protractor/schema.json  |   1 +
 .../test/protractor/works_spec_large.ts       |  88 +++++-----
 4 files changed, 202 insertions(+), 40 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/src/protractor/index2.ts

diff --git a/packages/angular_devkit/build_angular/builders.json b/packages/angular_devkit/build_angular/builders.json
index 835bc088185f..56e73e172616 100644
--- a/packages/angular_devkit/build_angular/builders.json
+++ b/packages/angular_devkit/build_angular/builders.json
@@ -30,6 +30,7 @@
     },
     "protractor": {
       "class": "./src/protractor",
+      "implementation": "./src/protractor/index2",
       "schema": "./src/protractor/schema.json",
       "description": "Run protractor over a dev server."
     },
diff --git a/packages/angular_devkit/build_angular/src/protractor/index2.ts b/packages/angular_devkit/build_angular/src/protractor/index2.ts
new file mode 100644
index 000000000000..55d70dfc7685
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/protractor/index2.ts
@@ -0,0 +1,152 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import {
+  BuilderContext,
+  BuilderOutput,
+  createBuilder,
+  targetFromTargetString,
+} from '@angular-devkit/architect/src/index2';
+import { JsonObject, tags } from '@angular-devkit/core';
+import { resolve } from 'path';
+import * as url from 'url';
+import { runModuleAsObservableFork } from '../utils';
+import { Schema as ProtractorBuilderOptions } from './schema';
+
+function runProtractor(root: string, options: ProtractorBuilderOptions): Promise<BuilderOutput> {
+  const additionalProtractorConfig: Partial<ProtractorBuilderOptions> = {
+    elementExplorer: options.elementExplorer,
+    baseUrl: options.baseUrl,
+    specs: options.specs && options.specs.length ? options.specs : undefined,
+    suite: options.suite,
+  };
+
+  // TODO: Protractor manages process.exit itself, so this target will allways quit the
+  // process. To work around this we run it in a subprocess.
+  // https://github.com/angular/protractor/issues/4160
+  return runModuleAsObservableFork(
+    root,
+    'protractor/built/launcher',
+    'init',
+    [resolve(root, options.protractorConfig), additionalProtractorConfig],
+  ).toPromise() as Promise<BuilderOutput>;
+}
+
+async function updateWebdriver() {
+  // The webdriver-manager update command can only be accessed via a deep import.
+  const webdriverDeepImport = 'webdriver-manager/built/lib/cmds/update';
+  const importOptions = [
+    // When using npm, webdriver is within protractor/node_modules.
+    `protractor/node_modules/${webdriverDeepImport}`,
+    // When using yarn, webdriver is found as a root module.
+    webdriverDeepImport,
+  ];
+
+  let path;
+  for (const importOption of importOptions) {
+    try {
+      path = require.resolve(importOption);
+    } catch (error) {
+      if (error.code !== 'MODULE_NOT_FOUND') {
+        throw error;
+      }
+    }
+  }
+
+  if (!path) {
+    throw new Error(tags.stripIndents`
+      Cannot automatically find webdriver-manager to update.
+      Update webdriver-manager manually and run 'ng e2e --no-webdriver-update' instead.
+    `);
+  }
+
+  // tslint:disable-next-line:max-line-length no-implicit-dependencies
+  const webdriverUpdate = await import(path) as typeof import ('webdriver-manager/built/lib/cmds/update');
+
+  // run `webdriver-manager update --standalone false --gecko false --quiet`
+  // if you change this, update the command comment in prev line
+  return webdriverUpdate.program.run({
+    standalone: false,
+    gecko: false,
+    quiet: true,
+  } as unknown as JSON);
+}
+
+export async function execute(
+  options: ProtractorBuilderOptions,
+  context: BuilderContext,
+): Promise<BuilderOutput> {
+  // ensure that only one of these options is used
+  if (options.devServerTarget && options.baseUrl) {
+    throw new Error(tags.stripIndents`
+    The 'baseUrl' option cannot be used with 'devServerTarget'.
+    When present, 'devServerTarget' will be used to automatically setup 'baseUrl' for Protractor.
+    `);
+  }
+
+  if (options.webdriverUpdate) {
+    try {
+      await updateWebdriver();
+    } catch (error) {
+      context.reportStatus('Error: ' + error);
+
+      return { success: false };
+    }
+  }
+
+  let baseUrl;
+  let server;
+  if (options.devServerTarget) {
+    const target = targetFromTargetString(options.devServerTarget);
+    const serverOptions = await context.getTargetOptions(target);
+
+    const overrides: Record<string, string | number | boolean> = { watch: false };
+    if (options.host !== undefined) { overrides.host = options.host; }
+    if (options.port !== undefined) { overrides.port = options.port; }
+    server = await context.scheduleTarget(target, overrides);
+
+    let result;
+    try {
+      result = await server.result;
+    } catch (error) {
+      context.reportStatus('Error: ' + error);
+    }
+
+    if (!result || !result.success) {
+      return { success: false };
+    }
+
+    if (typeof serverOptions.publicHost === 'string') {
+      let publicHost = serverOptions.publicHost as string;
+      if (!/^\w+:\/\//.test(publicHost)) {
+        publicHost = `${serverOptions.ssl
+          ? 'https'
+          : 'http'}://${publicHost}`;
+      }
+      const clientUrl = url.parse(publicHost);
+      baseUrl = url.format(clientUrl);
+    } else if (typeof result.port === 'number') {
+      baseUrl = url.format({
+        protocol: serverOptions.ssl ? 'https' : 'http',
+        hostname: options.host,
+        port: result.port.toString(),
+      });
+    }
+  }
+
+  try {
+    return await runProtractor(context.workspaceRoot, { ...options, baseUrl });
+  } catch {
+    return { success: false };
+  } finally {
+    if (server) {
+      await server.stop();
+    }
+  }
+}
+
+export default createBuilder<JsonObject & ProtractorBuilderOptions>(execute);
diff --git a/packages/angular_devkit/build_angular/src/protractor/schema.json b/packages/angular_devkit/build_angular/src/protractor/schema.json
index 6e9998bc6dea..1303da5b2511 100644
--- a/packages/angular_devkit/build_angular/src/protractor/schema.json
+++ b/packages/angular_devkit/build_angular/src/protractor/schema.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "http://json-schema.org/draft-07/schema",
   "title": "Protractor Target",
   "description": "Protractor target options for Build Facade.",
   "type": "object",
diff --git a/packages/angular_devkit/build_angular/test/protractor/works_spec_large.ts b/packages/angular_devkit/build_angular/test/protractor/works_spec_large.ts
index ecbb8f62ee36..56daf266a029 100644
--- a/packages/angular_devkit/build_angular/test/protractor/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/protractor/works_spec_large.ts
@@ -5,47 +5,58 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { JsonObject, normalize } from '@angular-devkit/core';
+import { createArchitect, host, protractorTargetSpec } from '../utils';
 
-import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { normalize } from '@angular-devkit/core';
-import { retry } from 'rxjs/operators';
-import { host, protractorTargetSpec } from '../utils';
+describe('Protractor Builder', () => {
+  let architect: Architect;
 
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
 
-describe('Protractor Builder', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  afterEach(() => host.restore().toPromise());
+
+  it('executes tests with automatic dev server usage', async () => {
+    const run = await architect.scheduleTarget(protractorTargetSpec);
 
-  it('works', (done) => {
-    runTargetSpec(host, protractorTargetSpec).pipe(
-      retry(3),
-    ).toPromise().then(done, done.fail);
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+    await run.stop();
   }, 30000);
 
-  it('works with no devServerTarget', (done) => {
-    const overrides = { devServerTarget: undefined };
+  it('fails with no devServerTarget and no standalone server', async () => {
+    const overrides = { devServerTarget: undefined } as unknown as JsonObject;
+    const run = await architect.scheduleTarget(protractorTargetSpec, overrides);
+
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: false }));
 
-    runTargetSpec(host, protractorTargetSpec, overrides).pipe(
-      // This should fail because no server is available for connection.
-    ).subscribe(undefined, () => done(), done.fail);
+    await run.stop();
   }, 30000);
 
-  it('overrides protractor specs', (done) => {
-    host.scopedSync().rename(normalize('./e2e/app.e2e-spec.ts'),
-      normalize('./e2e/renamed-app.e2e.spec.ts'));
+  it('overrides protractor specs', async () => {
+    host.scopedSync().rename(
+      normalize('./e2e/app.e2e-spec.ts'),
+      normalize('./e2e/renamed-app.e2e.spec.ts'),
+    );
 
     const overrides = { specs: ['./e2e/renamed-app.e2e.spec.ts'] };
+    const run = await architect.scheduleTarget(protractorTargetSpec, overrides);
 
-    runTargetSpec(host, protractorTargetSpec, overrides).pipe(
-      retry(3),
-    ).toPromise().then(done, done.fail);
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+    await run.stop();
   }, 60000);
 
-  it('overrides protractor suites', (done) => {
-    host.scopedSync().rename(normalize('./e2e/app.e2e-spec.ts'),
-      normalize('./e2e/renamed-app.e2e-spec.ts'));
+  it('overrides protractor suites', async () => {
+    host.scopedSync().rename(
+      normalize('./e2e/app.e2e-spec.ts'),
+      normalize('./e2e/renamed-app.e2e-spec.ts'),
+    );
 
-    // Suites block need to be added in the protractor.conf.js file to test suites
+    // Suites block needs to be added in the protractor.conf.js file to test suites
     host.replaceInFile('protractor.conf.js', `allScriptsTimeout: 11000,`, `
       allScriptsTimeout: 11000,
       suites: {
@@ -54,23 +65,20 @@ describe('Protractor Builder', () => {
     `);
 
     const overrides = { suite: 'app' };
+    const run = await architect.scheduleTarget(protractorTargetSpec, overrides);
+
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
 
-    runTargetSpec(host, protractorTargetSpec, overrides).pipe(
-      retry(3),
-    ).toPromise().then(done, done.fail);
+    await run.stop();
   }, 60000);
 
-  it('works with port 0', (done) => {
-    runTargetSpec(host, protractorTargetSpec, { port: 0 }).pipe(
-      retry(3),
-    ).toPromise().then(done, done.fail);
+  it('supports automatic port assignment (port = 0)', async () => {
+    const overrides = { port: 0 };
+    const run = await architect.scheduleTarget(protractorTargetSpec, overrides);
+
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+    await run.stop();
   }, 30000);
 
-  // TODO: test `element-explorer` when the protractor builder emits build events with text.
-  // .then(() => execAndWaitForOutputToMatch('ng', ['e2e', '--element-explorer'],
-  // /Element Explorer/))
-  // .then(() => killAllProcesses(), (err: any) => {
-  //   killAllProcesses();
-  //   throw err;
-  // })
 });

From 20a644ec4b9ba510af23ab1793116025ba971c86 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Thu, 14 Mar 2019 12:57:17 +0100
Subject: [PATCH 0947/1703] fix(@angular-devkit/build-angular): passing port 0
 when using serve will not find a suitable port

At the moment, when passing port `0` it will default to `4200` which is incorrect. `4200` should be used a baseport.
---
 packages/angular_devkit/build_angular/src/dev-server/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index 43ee0e78cd47..a5f1fbadf8ba 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -48,7 +48,7 @@ export class DevServerBuilder implements Builder<DevServerBuilderSchema> {
     let first = true;
     let opnAddress: string;
 
-    return from(checkPort(options.port || 4200, options.host || 'localhost')).pipe(
+    return from(checkPort(options.port || 0, options.host || 'localhost', 4200)).pipe(
       tap((port) => options.port = port),
       concatMap(() => this._getBrowserOptions(options)),
       tap(opts => browserOptions = normalizeBrowserSchema(

From f71896874e2a537a140a20ce33edcd79f58c1e18 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 15 Mar 2019 15:06:57 +0100
Subject: [PATCH 0948/1703] feat(@angular-devkit/build-angular): enable webpack
 profile when using stats-json flag

More information about what `profile` does can be found here: https://webpack.js.org/api/stats

Closes #13907
---
 .../src/angular-cli-files/models/webpack-configs/common.ts | 1 +
 .../build_angular/test/browser/stats-json_spec_large.ts    | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 04bec22bddc8..bee08871e3a7 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -280,6 +280,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
       ? 'production'
       : 'development',
     devtool: false,
+    profile: buildOptions.statsJson,
     resolve: {
       extensions: ['.ts', '.tsx', '.mjs', '.js'],
       symlinks: !buildOptions.preserveSymlinks,
diff --git a/packages/angular_devkit/build_angular/test/browser/stats-json_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/stats-json_spec_large.ts
index 3ada13a46d94..3328eafeff75 100644
--- a/packages/angular_devkit/build_angular/test/browser/stats-json_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/stats-json_spec_large.ts
@@ -23,4 +23,11 @@ describe('Browser Builder stats json', () => {
     const { files } = await browserBuild(architect, host, target, { statsJson: true });
     expect('stats.json' in files).toBe(true);
   });
+
+  it('works with profile flag', async () => {
+    const { files } = await browserBuild(architect, host, target, { statsJson: true });
+    expect('stats.json' in files).toBe(true);
+    const stats = await files['stats.json'];
+    expect(stats).toMatch(/profile.+building/);
+  });
 });

From 2ecdddc1155c0654555737c9a10bb10a64a094b2 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 15 Mar 2019 21:09:20 +0100
Subject: [PATCH 0949/1703] build: fixes exclude list of file on windows

At the moment, the exclude list doesn't work on windows due to path normalization
---
 scripts/lint.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/lint.ts b/scripts/lint.ts
index c6b6b09296dc..42a3767394b3 100644
--- a/scripts/lint.ts
+++ b/scripts/lint.ts
@@ -12,9 +12,9 @@ import * as path from 'path';
 import { Configuration, ILinterOptions, Linter, findFormatter } from 'tslint';
 import * as ts from 'typescript';
 
-// Blacklist (regexes) of the files to not lint. Generated files should not be linted.
+// Excluded (regexes) of the files to not lint. Generated files should not be linted.
 // TODO: when moved to using bazel for the build system, this won't be needed.
-const blacklist = [/^dist-schema[\\\/].*/, /.*\/third_party\/.*/];
+const excluded = [/^dist-schema[\\\/].*/, /.*\/third_party\/.*/];
 
 
 function _buildRules(logger: logging.Logger) {
@@ -70,7 +70,8 @@ export default async function (options: ParsedArgs, logger: logging.Logger) {
   };
 
   program.getRootFileNames().forEach(fileName => {
-    if (blacklist.some(x => x.test(path.relative(process.cwd(), fileName)))) {
+    const filePath = path.relative(process.cwd(), fileName).replace(/\\/g, '/');
+    if (excluded.some(x => x.test(filePath))) {
       return;
     }
 

From 10fb46182953ed3c4a045435fb7da36005e23f69 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 18 Mar 2019 10:15:44 +0100
Subject: [PATCH 0950/1703] fix(@schematics/angular): remove baseUrl from
 universal tsconfig

The baseUrl is used for non relative module imports, and we should always use the baseUrl set in the workspace tsconfig. When having path mappings set at workspace level and setting a `baseUrl` in the server tsconfig, this paths will no longer work as paths mapping as relative to the baseUrl.

Fixes #13935
---
 .../universal/files/root/__tsconfigFileName__.json.template | 5 ++---
 packages/schematics/angular/universal/index_spec.ts         | 6 ++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/schematics/angular/universal/files/root/__tsconfigFileName__.json.template b/packages/schematics/angular/universal/files/root/__tsconfigFileName__.json.template
index e6b42696693c..f11e5fa48259 100644
--- a/packages/schematics/angular/universal/files/root/__tsconfigFileName__.json.template
+++ b/packages/schematics/angular/universal/files/root/__tsconfigFileName__.json.template
@@ -1,10 +1,9 @@
 {
   "extends": "./<%= tsConfigExtends %>",
   "compilerOptions": {
-    "outDir": "<%= outDir %>-server",
-    "baseUrl": "."
+    "outDir": "<%= outDir %>-server"
   },
   "angularCompilerOptions": {
-    "entryModule": "<%= rootInSrc ? '' : 'src/' %><%= appDir %>/<%= stripTsExtension(rootModuleFileName) %>#<%= rootModuleClassName %>"
+    "entryModule": "./<%= rootInSrc ? '' : 'src/' %><%= appDir %>/<%= stripTsExtension(rootModuleFileName) %>#<%= rootModuleClassName %>"
   }
 }
diff --git a/packages/schematics/angular/universal/index_spec.ts b/packages/schematics/angular/universal/index_spec.ts
index 9c788f0f591d..d08d3bb3f8cf 100644
--- a/packages/schematics/angular/universal/index_spec.ts
+++ b/packages/schematics/angular/universal/index_spec.ts
@@ -80,10 +80,9 @@ describe('Universal Schematic', () => {
       extends: './tsconfig.app.json',
       compilerOptions: {
         outDir: './out-tsc/app-server',
-        baseUrl: '.',
       },
       angularCompilerOptions: {
-        entryModule: 'src/app/app.server.module#AppServerModule',
+        entryModule: './src/app/app.server.module#AppServerModule',
       },
     });
     const angularConfig = JSON.parse(tree.readContent('angular.json'));
@@ -100,10 +99,9 @@ describe('Universal Schematic', () => {
       extends: './tsconfig.app.json',
       compilerOptions: {
         outDir: '../../out-tsc/app-server',
-        baseUrl: '.',
       },
       angularCompilerOptions: {
-        entryModule: 'src/app/app.server.module#AppServerModule',
+        entryModule: './src/app/app.server.module#AppServerModule',
       },
     });
     const angularConfig = JSON.parse(tree.readContent('angular.json'));

From 8f77d6711ae1c32740a20a295f2bcb6da97c01ce Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 19 Mar 2019 14:28:15 +0100
Subject: [PATCH 0951/1703] fix(@angular-devkit/build-angular): update
 speed-measure-webpack-plugin to 1.3.1

This fixes the issue of it generating an empty speed-measure-plugin.json.

Fixes #12763
---
 packages/angular_devkit/build_angular/package.json        | 2 +-
 .../build_angular/test/browser/profile_spec_large.ts      | 8 ++++++--
 yarn.lock                                                 | 8 ++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 317cf0e8da6f..dac318f32610 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -38,7 +38,7 @@
     "semver": "5.6.0",
     "source-map-support": "0.5.11",
     "source-map-loader": "0.2.4",
-    "speed-measure-webpack-plugin": "1.3.0",
+    "speed-measure-webpack-plugin": "1.3.1",
     "stats-webpack-plugin": "0.7.0",
     "style-loader": "0.23.1",
     "stylus": "0.54.5",
diff --git a/packages/angular_devkit/build_angular/test/browser/profile_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/profile_spec_large.ts
index 54faa2876dd5..61aefc10cd36 100644
--- a/packages/angular_devkit/build_angular/test/browser/profile_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/profile_spec_large.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { Architect } from '@angular-devkit/architect/src/index2';
-import { join, normalize } from '@angular-devkit/core';
+import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { BrowserBuilderOutput } from '../../src/browser/index2';
 import { browserBuild, createArchitect, host } from '../utils';
 
@@ -26,9 +26,13 @@ describe('Browser Builder profile', () => {
     const output = await run.result as BrowserBuilderOutput;
 
     expect(output.success).toBe(true);
+
+    const speedMeasureLogPath = normalize('speed-measure-plugin.json');
     expect(host.scopedSync().exists(normalize('chrome-profiler-events.json'))).toBe(true);
-    expect(host.scopedSync().exists(normalize('speed-measure-plugin.json'))).toBe(true);
+    expect(host.scopedSync().exists(speedMeasureLogPath)).toBe(true);
 
+    const content = virtualFs.fileBufferToString(host.scopedSync().read(speedMeasureLogPath));
+    expect(content).toContain('plugins');
     await run.stop();
   });
 });
diff --git a/yarn.lock b/yarn.lock
index ed4546d93280..02bc499f1169 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8713,10 +8713,10 @@ spdy@^4.0.0:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
-speed-measure-webpack-plugin@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.0.tgz#c7ffafef513df3d63d5d546c8fc1986dfc4969aa"
-  integrity sha512-b9Yd0TrzceMVYSbuamM1sFsGM1oVfyFTM22gOoyLhymNvBVApuYpkdFOgYkKJpN/KhTpcCYcTGHg7X+FJ33Vvw==
+speed-measure-webpack-plugin@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz#69840a5cdc08b4638697dac7db037f595d7f36a0"
+  integrity sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==
   dependencies:
     chalk "^2.0.1"
 

From 12b5db46246e1d87b66eb41ddac3e2778615dcc9 Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Sun, 13 Jan 2019 15:57:18 +0100
Subject: [PATCH 0952/1703] feat(@schematics/angular): use more codelyzer rules

---
 .../workspace/files/tslint.json.template      | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/schematics/angular/workspace/files/tslint.json.template b/packages/schematics/angular/workspace/files/tslint.json.template
index e7e7c249a543..ba9eff580267 100644
--- a/packages/schematics/angular/workspace/files/tslint.json.template
+++ b/packages/schematics/angular/workspace/files/tslint.json.template
@@ -61,15 +61,20 @@
       "single"
     ],
     "trailing-comma": false,
-    "no-output-on-prefix": true,
-    "use-input-property-decorator": true,
-    "use-output-property-decorator": true,
-    "use-host-property-decorator": true,
+    "banana-in-box": true,
+    "component-class-suffix": true,
+    "contextual-life-cycle": true,
+    "directive-class-suffix": true,
+    "no-conflicting-life-cycle-hooks": true,
     "no-input-rename": true,
+    "no-output-named-after-standard-event": true,
+    "no-output-on-prefix": true,
     "no-output-rename": true,
+    "templates-no-negated-async": true,
+    "use-host-property-decorator": true,
+    "use-input-property-decorator": true,
     "use-life-cycle-interface": true,
-    "use-pipe-transform-interface": true,
-    "component-class-suffix": true,
-    "directive-class-suffix": true
+    "use-output-property-decorator": true,
+    "use-pipe-transform-interface": true
   }
 }
\ No newline at end of file

From 230f4913431505596c21d06dac70b474b88a5954 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Fri, 15 Mar 2019 16:35:32 -0700
Subject: [PATCH 0953/1703] refactor: use quicktype for the server schema
 generation

---
 .../build_angular/src/app-shell/index.ts      |   2 +-
 .../build_angular/src/server/index.ts         |  12 +-
 .../build_angular/src/server/schema.d.ts      | 187 ------------------
 .../build_angular/src/server/schema.json      |   3 +-
 .../utils/normalize-webpack-server-schema.ts  |   6 +-
 5 files changed, 14 insertions(+), 196 deletions(-)
 delete mode 100644 packages/angular_devkit/build_angular/src/server/schema.d.ts

diff --git a/packages/angular_devkit/build_angular/src/app-shell/index.ts b/packages/angular_devkit/build_angular/src/app-shell/index.ts
index 0b0d9a672950..7c08d7e54bde 100644
--- a/packages/angular_devkit/build_angular/src/app-shell/index.ts
+++ b/packages/angular_devkit/build_angular/src/app-shell/index.ts
@@ -17,7 +17,7 @@ import { concatMap, map, switchMap } from 'rxjs/operators';
 import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
 import { augmentAppWithServiceWorker } from '../angular-cli-files/utilities/service-worker';
 import { Schema as BrowserBuilderSchema } from '../browser/schema';
-import { BuildWebpackServerSchema } from '../server/schema';
+import { Schema as BuildWebpackServerSchema } from '../server/schema';
 import { BuildWebpackAppShellSchema } from './schema';
 
 
diff --git a/packages/angular_devkit/build_angular/src/server/index.ts b/packages/angular_devkit/build_angular/src/server/index.ts
index f81c77685571..690e6cf29f50 100644
--- a/packages/angular_devkit/build_angular/src/server/index.ts
+++ b/packages/angular_devkit/build_angular/src/server/index.ts
@@ -30,8 +30,12 @@ import {
 import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
 import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
 import { getBrowserLoggingCb } from '../browser';
-import { defaultProgress, normalizeWebpackServerSchema } from '../utils';
-import { BuildWebpackServerSchema, NormalizedServerBuilderServerSchema } from './schema';
+import {
+  NormalizedWebpackServerBuilderSchema,
+  defaultProgress,
+  normalizeWebpackServerSchema,
+} from '../utils';
+import { Schema as BuildWebpackServerSchema } from './schema';
 const webpackMerge = require('webpack-merge');
 
 
@@ -61,14 +65,14 @@ export class ServerBuilder implements Builder<BuildWebpackServerSchema> {
       concatMap(() => {
         const webpackConfig = this.buildWebpackConfig(root, projectRoot, host, options);
 
-        return webpackBuilder.runWebpack(webpackConfig, getBrowserLoggingCb(options.verbose));
+        return webpackBuilder.runWebpack(webpackConfig, getBrowserLoggingCb(!!options.verbose));
       }),
     );
   }
 
   buildWebpackConfig(root: Path, projectRoot: Path,
                      _host: virtualFs.Host<Stats>,
-                     options: NormalizedServerBuilderServerSchema) {
+                     options: NormalizedWebpackServerBuilderSchema) {
     let wco: WebpackConfigOptions;
 
     // TODO: make target defaults into configurations instead
diff --git a/packages/angular_devkit/build_angular/src/server/schema.d.ts b/packages/angular_devkit/build_angular/src/server/schema.d.ts
deleted file mode 100644
index b4741afec2f6..000000000000
--- a/packages/angular_devkit/build_angular/src/server/schema.d.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {
-  BrowserBuilderSchema,
-  CurrentFileReplacement,
-  FileReplacement,
-  NormalizedOptimization,
-  NormalizedSourceMaps,
-  OptimizationObject,
-  SourceMapOptions,
-} from '../browser/schema';
-
-export interface BuildWebpackServerSchema {
-  /**
-   * The name of the TypeScript configuration file.
-   */
-  tsConfig: string;
-  /**
-   * Adds more details to output logging.
-   */
-  verbose: boolean;
-  /**
-   * Use a separate bundle containing code used across multiple bundles.
-   */
-  commonChunk?: boolean;
-  /**
-   * URL where files will be deployed.
-   */
-  deployUrl?: string;
-  /**
-   * Show circular dependency warnings on builds.
-   */
-  showCircularDependencies?: boolean;
-  /**
-   * Use a separate bundle containing only vendor libraries.
-   */
-  vendorChunk?: boolean;
-  /**
-   * Output sourcemaps.
-   */
-  sourceMap: SourceMapOptions;
-  /**
-   * Resolve vendor packages sourcemaps.
-   * @deprecated use sourceMap.vendor
-   */
-  vendorSourceMap?: boolean;
-  /**
-   * Output in-file eval sourcemaps.
-   * @deprecated
-   */
-  evalSourceMap?: boolean;
-  /**
-   * Path where output will be placed.
-   */
-  outputPath: string;
-  /**
- * Path where style resources will be placed (Relative to outputPath).
- */
-  resourcesOutputPath: string;
-  /**
-   * Generates a 'stats.json' file which can be analyzed using tools such as:
-   * #webpack-bundle-analyzer' or https://webpack.github.io/analyse.
-   */
-  statsJson?: boolean;
-  /**
-   * How to handle missing translations for i18n.
-   */
-  i18nMissingTranslation?: string;
-  /**
-   * Available on server platform only. Which external dependencies to bundle into the module.
-   * By default, all of node_modules will be kept as requires.
-   */
-  bundleDependencies?: BundleDependencies;
-  /**
-   * Enables optimization of the build output.
-   */
-  optimization?: OptimizationObject;
-  /**
-   * Log progress to the console while building.
-   */
-  progress?: boolean;
-  /**
-   * delete-output-path
-   */
-  deleteOutputPath?: boolean;
-  /**
-   * List of additional NgModule files that will be lazy loaded. Lazy router modules with be
-   * discovered automatically.
-   */
-  lazyModules?: string[];
-  /**
-   * Replace files with other files in the build.
-   */
-  fileReplacements: FileReplacement[];
-  /**
-   * Define the output filename cache-busting hashing mode.
-   */
-  outputHashing?: OutputHashing;
-  /**
-   * Extract all licenses in a separate file, in the case of production builds only.
-   */
-  extractLicenses?: boolean;
-  /**
-   * Format of the localization file specified with --i18n-file.
-   */
-  i18nFormat?: string;
-  /**
-   * Locale to use for i18n.
-   */
-  i18nLocale?: string;
-  /**
-   * Run the TypeScript type checker in a forked process.
-   */
-  forkTypeChecker?: boolean;
-  /**
-   * The name of the main entry-point file.
-   */
-  main: string;
-  /**
-   * Localization file to use for i18n.
-   */
-  i18nFile?: string;
-  /**
-   * Options to pass to style preprocessors
-   */
-  stylePreprocessorOptions?: StylePreprocessorOptions;
-  /**
-   * Do not use the real path when resolving modules.
-   */
-  preserveSymlinks?: boolean;
-  /**
-   * Use file name for lazy loaded chunks.
-   */
-  namedChunks?: boolean;
-  /**
-   * Run build when files change.
-   */
-  watch?: boolean;
-  /**
- * Enable and define the file watching poll time period in milliseconds.
- */
-  poll?: number;
-}
-
-/**
- * Available on server platform only. Which external dependencies to bundle into the module.
- * By default, all of node_modules will be kept as requires.
- */
-export enum BundleDependencies {
-  All = 'all',
-  None = 'none',
-}
-
-/**
- * Define the output filename cache-busting hashing mode.
- */
-export enum OutputHashing {
-  All = 'all',
-  Bundles = 'bundles',
-  Media = 'media',
-  None = 'none',
-}
-
-/**
- * Options to pass to style preprocessors
- */
-export interface StylePreprocessorOptions {
-  /**
-   * Paths to include. Paths will be resolved to project root.
-   */
-  includePaths?: string[];
-}
-
-export interface NormalizedServerBuilderServerSchema extends Pick<
-  BuildWebpackServerSchema,
-  Exclude<keyof BuildWebpackServerSchema, 'sourceMap' | 'optimization'>
-  > {
-  fileReplacements: CurrentFileReplacement[];
-  sourceMap: NormalizedSourceMaps;
-  optimization: NormalizedOptimization;
-}
diff --git a/packages/angular_devkit/build_angular/src/server/schema.json b/packages/angular_devkit/build_angular/src/server/schema.json
index 82aa03077af3..b4d4cb058c1c 100644
--- a/packages/angular_devkit/build_angular/src/server/schema.json
+++ b/packages/angular_devkit/build_angular/src/server/schema.json
@@ -2,6 +2,7 @@
   "$schema": "http://json-schema.org/schema",
   "id": "BuildAngularWebpackServerSchema",
   "title": "Universal Target",
+  "type": "object",
   "properties": {
     "main": {
       "type": "string",
@@ -271,4 +272,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-webpack-server-schema.ts b/packages/angular_devkit/build_angular/src/utils/normalize-webpack-server-schema.ts
index 4975f41defaf..0f911329fdc4 100644
--- a/packages/angular_devkit/build_angular/src/utils/normalize-webpack-server-schema.ts
+++ b/packages/angular_devkit/build_angular/src/utils/normalize-webpack-server-schema.ts
@@ -10,7 +10,7 @@
 
 import { Path, virtualFs } from '@angular-devkit/core';
 import { OptimizationClass, SourceMapClass } from '../browser/schema';
-import { BuildWebpackServerSchema } from '../server/schema';
+import { Schema as BuildWebpackServerSchema } from '../server/schema';
 import {
   NormalizedFileReplacement,
   normalizeFileReplacements,
@@ -36,7 +36,7 @@ export function normalizeWebpackServerSchema(
 ): NormalizedWebpackServerBuilderSchema {
   const syncHost = new virtualFs.SyncDelegateHost(host);
 
-  const normalizedSourceMapOptions = normalizeSourceMaps(options.sourceMap);
+  const normalizedSourceMapOptions = normalizeSourceMaps(options.sourceMap || {});
   normalizedSourceMapOptions.vendor =
     normalizedSourceMapOptions.vendor || options.vendorSourceMap || false;
 
@@ -44,7 +44,7 @@ export function normalizeWebpackServerSchema(
 
   return {
     ...options,
-    fileReplacements: normalizeFileReplacements(options.fileReplacements, syncHost, root),
+    fileReplacements: normalizeFileReplacements(options.fileReplacements || [], syncHost, root),
     optimization: normalizeOptimization(optimization),
     sourceMap: normalizedSourceMapOptions,
   };

From 53f6b5ccfe1ca43023656cbab2f789240968275a Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Fri, 15 Mar 2019 16:36:06 -0700
Subject: [PATCH 0954/1703] refactor: extract the deleteOutputPath logic from
 the builder

---
 .../build_angular/src/browser/index2.ts       | 26 +++++++------------
 .../src/utils/delete-output-dir.ts            | 25 ++++++++++++++++++
 .../build_angular/src/utils/index.ts          |  1 +
 3 files changed, 35 insertions(+), 17 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/src/utils/delete-output-dir.ts

diff --git a/packages/angular_devkit/build_angular/src/browser/index2.ts b/packages/angular_devkit/build_angular/src/browser/index2.ts
index fc41ca5bdfaa..6055c3087ecc 100644
--- a/packages/angular_devkit/build_angular/src/browser/index2.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index2.ts
@@ -24,8 +24,8 @@ import {
 } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as fs from 'fs';
-import { EMPTY, Observable, from, of } from 'rxjs';
-import { concatMap, last, map, switchMap } from 'rxjs/operators';
+import { Observable, from, of } from 'rxjs';
+import { concatMap, map, switchMap } from 'rxjs/operators';
 import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
 import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
 import {
@@ -44,7 +44,12 @@ import {
   statsToString,
   statsWarningsToString,
 } from '../angular-cli-files/utilities/stats';
-import { NormalizedBrowserBuilderSchema, defaultProgress, normalizeBrowserSchema } from '../utils';
+import {
+  NormalizedBrowserBuilderSchema,
+  defaultProgress,
+  deleteOutputDir,
+  normalizeBrowserSchema,
+} from '../utils';
 import { Schema as BrowserBuilderSchema } from './schema';
 
 import webpack = require('webpack');
@@ -57,19 +62,6 @@ export type BrowserBuilderOutput = json.JsonObject & BuilderOutput & {
 };
 
 
-function _deleteOutputDir(root: Path, outputPath: Path, host: virtualFs.Host) {
-  const resolvedOutputPath = resolve(root, outputPath);
-  if (resolvedOutputPath === root) {
-    throw new Error('Output path MUST not be project root directory!');
-  }
-
-  return host.exists(resolvedOutputPath).pipe(
-    concatMap(exists => exists ? host.delete(resolvedOutputPath) : EMPTY),
-    last(null, null),
-  );
-}
-
-
 export function createBrowserLoggingCallback(
   verbose: boolean,
   logger: logging.LoggerApi,
@@ -246,7 +238,7 @@ export function buildWebpackBrowser(
     }),
     switchMap(({workspace, config}) => {
       if (options.deleteOutputPath) {
-        return _deleteOutputDir(
+        return deleteOutputDir(
           normalize(context.workspaceRoot),
           normalize(options.outputPath),
           host,
diff --git a/packages/angular_devkit/build_angular/src/utils/delete-output-dir.ts b/packages/angular_devkit/build_angular/src/utils/delete-output-dir.ts
new file mode 100644
index 000000000000..30682efc6e99
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/utils/delete-output-dir.ts
@@ -0,0 +1,25 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Path, resolve, virtualFs } from '@angular-devkit/core';
+import { EMPTY } from 'rxjs';
+import { concatMap, last } from 'rxjs/operators';
+
+/**
+ * Delete an output directory, but error out if it's the root of the project.
+ */
+export function deleteOutputDir(root: Path, outputPath: Path, host: virtualFs.Host) {
+  const resolvedOutputPath = resolve(root, outputPath);
+  if (resolvedOutputPath === root) {
+    throw new Error('Output path MUST not be project root directory!');
+  }
+
+  return host.exists(resolvedOutputPath).pipe(
+    concatMap(exists => exists ? host.delete(resolvedOutputPath) : EMPTY),
+    last(null, null),
+  );
+}
diff --git a/packages/angular_devkit/build_angular/src/utils/index.ts b/packages/angular_devkit/build_angular/src/utils/index.ts
index 466062fe8feb..ba315d3d7339 100644
--- a/packages/angular_devkit/build_angular/src/utils/index.ts
+++ b/packages/angular_devkit/build_angular/src/utils/index.ts
@@ -7,6 +7,7 @@
  */
 
 export * from './default-progress';
+export * from './delete-output-dir';
 export * from './run-module-as-observable-fork';
 export * from './normalize-file-replacements';
 export * from './normalize-asset-patterns';

From 32a32d69efe55ac3536ea68cc7ce6870928aa1eb Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Fri, 15 Mar 2019 16:36:31 -0700
Subject: [PATCH 0955/1703] build: delete the dist-schema/ before generating it

---
 scripts/build-schema.ts | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/scripts/build-schema.ts b/scripts/build-schema.ts
index dafa6fb5b88c..3587d0584c4b 100644
--- a/scripts/build-schema.ts
+++ b/scripts/build-schema.ts
@@ -23,6 +23,15 @@ function _mkdirp(p: string) {
 }
 
 
+function _rimraf(p: string) {
+  glob.sync(path.join(p, '**/*'), { dot: true, nodir: true })
+    .forEach(p => fs.unlinkSync(p));
+  glob.sync(path.join(p, '**/*'), { dot: true })
+    .sort((a, b) => b.length - a.length)
+    .forEach(p => fs.rmdirSync(p));
+}
+
+
 export default async function(
   argv: { },
   logger: logging.Logger,
@@ -35,8 +44,12 @@ export default async function(
       '**/package.json',
     ],
   });
+  const dist = path.join(__dirname, '../dist-schema');
 
   const quicktypeRunner = require('../tools/quicktype_runner');
+  logger.info('Removing dist-schema/...');
+  _rimraf(dist);
+
   logger.info('Generating JSON Schema....');
 
   for (const fileName of allJsonFiles) {
@@ -53,7 +66,7 @@ export default async function(
       continue;
     }
     const tsContent = await quicktypeRunner.generate(fileName);
-    const tsPath = path.join(__dirname, '../dist-schema', fileName.replace(/\.json$/, '.ts'));
+    const tsPath = path.join(dist, fileName.replace(/\.json$/, '.ts'));
 
     _mkdirp(path.dirname(tsPath));
     fs.writeFileSync(tsPath, tsContent, 'utf-8');

From 5500ad250412aff99100d6f6909a1f4253ff3d67 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Fri, 15 Mar 2019 16:37:04 -0700
Subject: [PATCH 0956/1703] feat(@angular-devkit/build-angular): add Server
 Builder v2

Using the new Architect API. Including moving the tests.
---
 .../build_angular/builders.json               |   1 +
 .../build_angular/src/server/index2.ts        | 166 ++++++++++++++++++
 .../test/server/base_spec_large.ts            | 129 +++++++-------
 3 files changed, 236 insertions(+), 60 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/src/server/index2.ts

diff --git a/packages/angular_devkit/build_angular/builders.json b/packages/angular_devkit/build_angular/builders.json
index 56e73e172616..97fd69e7dc2d 100644
--- a/packages/angular_devkit/build_angular/builders.json
+++ b/packages/angular_devkit/build_angular/builders.json
@@ -41,6 +41,7 @@
       "description": "Run tslint over a TS project."
     },
     "server": {
+      "implementation": "./src/server/index2",
       "class": "./src/server",
       "schema": "./src/server/schema.json",
       "description": "Build a server Angular application."
diff --git a/packages/angular_devkit/build_angular/src/server/index2.ts b/packages/angular_devkit/build_angular/src/server/index2.ts
new file mode 100644
index 000000000000..2efbd4f2fd60
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/server/index2.ts
@@ -0,0 +1,166 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { createBuilder } from '@angular-devkit/architect/src/index2';
+import {
+  Path,
+  experimental,
+  getSystemPath,
+  json,
+  logging,
+  normalize,
+  resolve, schema, virtualFs,
+} from '@angular-devkit/core';
+import { NodeJsSyncHost } from '@angular-devkit/core/node';
+import { Stats } from 'fs';
+import { from, of } from 'rxjs';
+import { concatMap, map } from 'rxjs/operators';
+import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
+import { runWebpack } from '../../../build_webpack/src/webpack/index2';
+import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
+import {
+  getAotConfig,
+  getCommonConfig,
+  getNonAotConfig,
+  getServerConfig,
+  getStatsConfig,
+  getStylesConfig,
+} from '../angular-cli-files/models/webpack-configs';
+import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
+import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
+import {
+  NormalizedWebpackServerBuilderSchema, defaultProgress,
+  deleteOutputDir,
+  normalizeWebpackServerSchema,
+} from '../utils';
+import { Schema as BuildWebpackServerSchema } from './schema';
+const webpackMerge = require('webpack-merge');
+
+
+export default createBuilder<json.JsonObject & BuildWebpackServerSchema>((options, context) => {
+  const host = new virtualFs.AliasHost(new NodeJsSyncHost());
+  const root = context.workspaceRoot;
+
+  async function setup() {
+    const registry = new schema.CoreSchemaRegistry();
+    registry.addPostTransform(schema.transforms.addUndefinedDefaults);
+
+    const workspace = await experimental.workspace.Workspace.fromPath(
+      host,
+      normalize(context.workspaceRoot),
+      registry,
+    );
+    const projectName = context.target ? context.target.project : workspace.getDefaultProjectName();
+
+    if (!projectName) {
+      throw new Error('Must either have a target from the context or a default project.');
+    }
+    const projectRoot = resolve(
+      workspace.root,
+      normalize(workspace.getProject(projectName).root),
+    );
+    const workspaceSourceRoot = workspace.getProject(projectName).sourceRoot;
+    const sourceRoot = workspaceSourceRoot !== undefined ? resolve(
+      workspace.root,
+      normalize(workspaceSourceRoot),
+    ) : undefined;
+
+    const normalizedOptions = normalizeWebpackServerSchema(
+      host,
+      normalize(root),
+      projectRoot,
+      sourceRoot,
+      options,
+    );
+
+    return { normalizedOptions, projectRoot };
+  }
+
+  return from(setup()).pipe(
+    concatMap(v => {
+      if (options.deleteOutputPath) {
+        return deleteOutputDir(normalize(root), normalize(options.outputPath), host).pipe(
+          map(() => v),
+        );
+      } else {
+        return of(v);
+      }
+    }),
+    concatMap(({ normalizedOptions, projectRoot }) => {
+      const webpackConfig = buildServerWebpackConfig(
+        normalize(root),
+        projectRoot,
+        host,
+        normalizedOptions,
+        context.logger.createChild('webpack'),
+      );
+
+      return runWebpack(webpackConfig, context);
+    }),
+  );
+});
+
+export function buildServerWebpackConfig(
+  root: Path,
+  projectRoot: Path,
+  _host: virtualFs.Host<Stats>,
+  options: NormalizedWebpackServerBuilderSchema,
+  logger: logging.Logger,
+) {
+  let wco: WebpackConfigOptions;
+
+  // TODO: make target defaults into configurations instead
+  // options = this.addTargetDefaults(options);
+
+  const tsConfigPath = getSystemPath(normalize(resolve(root, normalize(options.tsConfig))));
+  const tsConfig = readTsconfig(tsConfigPath);
+
+  const projectTs = requireProjectModule(getSystemPath(projectRoot), 'typescript') as typeof ts;
+
+  const supportES2015 = tsConfig.options.target !== projectTs.ScriptTarget.ES3
+    && tsConfig.options.target !== projectTs.ScriptTarget.ES5;
+
+  const buildOptions: typeof wco['buildOptions'] = {
+    ...options as {} as typeof wco['buildOptions'],
+  };
+
+  wco = {
+    root: getSystemPath(root),
+    projectRoot: getSystemPath(projectRoot),
+    // TODO: use only this.options, it contains all flags and configs items already.
+    buildOptions: {
+      ...buildOptions,
+      buildOptimizer: false,
+      aot: true,
+      platform: 'server',
+      scripts: [],
+      styles: [],
+    },
+    tsConfig,
+    tsConfigPath,
+    supportES2015,
+    logger,
+  };
+
+  wco.buildOptions.progress = defaultProgress(wco.buildOptions.progress);
+
+  const webpackConfigs: {}[] = [
+    getCommonConfig(wco),
+    getServerConfig(wco),
+    getStylesConfig(wco),
+    getStatsConfig(wco),
+  ];
+
+  if (wco.buildOptions.main || wco.buildOptions.polyfills) {
+    const typescriptConfigPartial = wco.buildOptions.aot
+      ? getAotConfig(wco)
+      : getNonAotConfig(wco);
+    webpackConfigs.push(typescriptConfigPartial);
+  }
+
+  return webpackMerge(webpackConfigs);
+}
diff --git a/packages/angular_devkit/build_angular/test/server/base_spec_large.ts b/packages/angular_devkit/build_angular/test/server/base_spec_large.ts
index 67c941150413..cc2981a65c06 100644
--- a/packages/angular_devkit/build_angular/test/server/base_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/server/base_spec_large.ts
@@ -6,76 +6,80 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { runTargetSpec } from '@angular-devkit/architect/testing';
+import { Architect } from '@angular-devkit/architect/src/index2';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { take, tap } from 'rxjs/operators';
-import { BuildWebpackServerSchema } from '../../src/server/schema';
-import { host } from '../utils';
+import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { Schema as BuildWebpackServerSchema } from '../../src/server/schema';
+import { createArchitect, host } from '../utils';
 
 
 describe('Server Builder', () => {
-  const outputPath = normalize('dist-server');
+  const target = { project: 'app', target: 'server' };
+  let architect: Architect;
 
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
-  it('works (base)', (done) => {
-    const overrides = { };
+  const outputPath = normalize('dist-server');
 
-    runTargetSpec(host, { project: 'app', target: 'server' }, overrides).pipe(
-      tap((buildEvent) => {
-        expect(buildEvent.success).toBe(true);
+  it('works (base)', async () => {
+    const run = await architect.scheduleTarget(target);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
 
-        const fileName = join(outputPath, 'main.js');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        expect(content).toMatch(/AppServerModuleNgFactory/);
-      }),
-    ).toPromise().then(done, done.fail);
+    const fileName = join(outputPath, 'main.js');
+    const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
+    expect(content).toMatch(/AppServerModuleNgFactory/);
+
+    await run.stop();
   });
 
-  it('supports sourcemaps', (done) => {
+  it('supports sourcemaps', async () => {
     const overrides = { sourceMap: true };
 
-    runTargetSpec(host, { project: 'app', target: 'server' }, overrides).pipe(
-      tap((buildEvent) => {
-        expect(buildEvent.success).toBe(true);
+    const run = await architect.scheduleTarget(target, overrides);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
 
-        const fileName = join(outputPath, 'main.js');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        expect(content).toMatch(/AppServerModuleNgFactory/);
-        expect(host.scopedSync().exists(join(outputPath, 'main.js.map'))).toBeTruthy();
-      }),
-    ).toPromise().then(done, done.fail);
+    const fileName = join(outputPath, 'main.js');
+    const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
+    expect(content).toMatch(/AppServerModuleNgFactory/);
+    expect(host.scopedSync().exists(join(outputPath, 'main.js.map'))).toBeTruthy();
+
+    await run.stop();
   });
 
-  it('supports scripts only sourcemaps', (done) => {
-    const overrides: Partial<BuildWebpackServerSchema> = {
+  it('supports scripts only sourcemaps', async () => {
+    host.writeMultipleFiles({
+      'src/app/app.component.css': `p { color: red; }`,
+    });
+
+    const run = await architect.scheduleTarget(target, {
       sourceMap: {
         styles: false,
         scripts: true,
       },
-    };
-
-    host.writeMultipleFiles({
-      'src/app/app.component.css': `p { color: red; }`,
     });
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
 
-    runTargetSpec(host, { project: 'app', target: 'server' }, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        expect(host.scopedSync().exists(join(outputPath, 'main.js.map'))).toBe(true);
+    expect(host.scopedSync().exists(join(outputPath, 'main.js.map'))).toBe(true);
 
-        const scriptContent = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, 'main.js')),
-        );
-        expect(scriptContent).toContain('sourceMappingURL=main.js.map');
-        expect(scriptContent).not.toContain('sourceMappingURL=data:application/json');
-      }),
-    ).toPromise().then(done, done.fail);
-  });
+    const scriptContent = virtualFs.fileBufferToString(
+      host.scopedSync().read(join(outputPath, 'main.js')),
+    );
+    expect(scriptContent).toContain('sourceMappingURL=main.js.map');
+    expect(scriptContent).not.toContain('sourceMappingURL=data:application/json');
 
-  it('supports component styles sourcemaps', (done) => {
-    const overrides: Partial<BuildWebpackServerSchema> = {
+    await run.stop();
+  });
+  //
+  it('supports component styles sourcemaps', async () => {
+    const overrides = {
       sourceMap: {
         styles: true,
         scripts: true,
@@ -86,24 +90,27 @@ describe('Server Builder', () => {
       'src/app/app.component.css': `p { color: red; }`,
     });
 
-    runTargetSpec(host, { project: 'app', target: 'server' }, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        expect(host.scopedSync().exists(join(outputPath, 'main.js.map'))).toBe(true);
+    const run = await architect.scheduleTarget(target, overrides);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
 
-        const scriptContent = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, 'main.js')),
-        );
-        expect(scriptContent).toContain('sourceMappingURL=main.js.map');
-        expect(scriptContent).toContain('sourceMappingURL=data:application/json');
-      }),
-    ).toPromise().then(done, done.fail);
+    expect(host.scopedSync().exists(join(outputPath, 'main.js.map'))).toBe(true);
+
+    const scriptContent = virtualFs.fileBufferToString(
+      host.scopedSync().read(join(outputPath, 'main.js')),
+    );
+    expect(scriptContent).toContain('sourceMappingURL=main.js.map');
+    expect(scriptContent).toContain('sourceMappingURL=data:application/json');
+
+    await run.stop();
   });
 
-  it('runs watch mode', (done) => {
+  it('runs watch mode', async () => {
     const overrides = { watch: true };
 
-    runTargetSpec(host, { project: 'app', target: 'server' }, overrides).pipe(
+    const run = await architect.scheduleTarget(target, overrides);
+
+    await run.output.pipe(
       tap((buildEvent) => {
         expect(buildEvent.success).toBe(true);
 
@@ -112,6 +119,8 @@ describe('Server Builder', () => {
         expect(content).toMatch(/AppServerModuleNgFactory/);
       }),
       take(1),
-    ).subscribe(undefined, done.fail, done);
+    ).toPromise();
+
+    await run.stop();
   });
 });

From 0bb03d3555ca25d155c18ba67d805f27ce57373b Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Tue, 19 Mar 2019 11:50:02 -0700
Subject: [PATCH 0957/1703] build: Upgrade rules_nodejs to 0.27.7 and angular
 to 7.2.9

This fixes bug like stale Bazel workspace.
https://github.com/bazelbuild/rules_nodejs/pull/620
---
 WORKSPACE | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index bd05a3b28bc6..02e12eec9d94 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -5,16 +5,16 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "build_bazel_rules_nodejs",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.26.0/rules_nodejs-0.26.0.tar.gz"],
-    sha256 = "5c86b055c57e15bf32d9009a15bcd6d8e190c41b1ff2fb18037b75e0012e4e7c",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.27.7/rules_nodejs-0.27.7.tar.gz"],
+    sha256 = "fb87ed5965cef93188af9a7287511639403f4b0da418961ce6defb9dcf658f51",
 )
 
 # TS API Guardian resides in Angular
 http_archive(
     name = "angular",
-    sha256 = "5a5a56c93e454b6fb3d470e2f49f6c47db85d25765fca0f26276c71c2263be38",
-    strip_prefix = "angular-7.2.7",
-    url = "https://github.com/angular/angular/archive/7.2.7.zip",
+    sha256 = "6af15858f480438a9ca3fa8eaf4fdf993ccae878b834f3ea72fa8442f76b73c2",
+    strip_prefix = "angular-7.2.9",
+    url = "https://github.com/angular/angular/archive/7.2.9.zip",
 )
 
 # We use protocol buffers for the Build Event Protocol
@@ -72,7 +72,7 @@ yarn_install(
 load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
 install_bazel_dependencies()
 
-load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace")		
+load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace")
 
 ts_setup_workspace()
 
@@ -86,6 +86,8 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"
 
 web_test_repositories()
 
-load("@angular//:index.bzl", "ng_setup_workspace")
-
-ng_setup_workspace()
+yarn_install(
+    name = "ts-api-guardian_deps",
+    package_json = "@angular//tools/ts-api-guardian:package.json",
+    yarn_lock = "@angular//tools/ts-api-guardian:yarn.lock",
+)

From 6e3d2e0c4dc4e2d7311f34ce9eded61656d2aca1 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 27 Feb 2019 09:53:57 +0000
Subject: [PATCH 0958/1703] feat(@ngtools/webpack): support Angular 8

This requires updating projects to TypeScript 3.3
---
 package.json                                  |   6 +-
 .../angular_devkit/build_angular/package.json |  26 +-
 .../test/browser/service-worker_spec_large.ts |   8 +-
 .../build_ng_packagr/package.json             |   4 +-
 .../build_optimizer/package.json              |   2 +-
 packages/ngtools/webpack/package.json         |  10 +-
 .../angular/utility/latest-versions.ts        |   4 +-
 .../schematics/schematic/files/package.json   |   2 +-
 .../hello-world-app/package.json              |   2 +
 tests/legacy-cli/e2e/ng-snapshot/package.json |  28 +--
 tests/legacy-cli/e2e/tests/ivy/ivy.ts         |   6 -
 yarn.lock                                     | 224 +++++++++---------
 12 files changed, 158 insertions(+), 164 deletions(-)

diff --git a/package.json b/package.json
index f04aaf9ba405..ddaeb6160d73 100644
--- a/package.json
+++ b/package.json
@@ -72,11 +72,11 @@
     "quicktype-core": "^6.0.15",
     "temp": "^0.9.0",
     "tslint": "^5.13.1",
-    "typescript": "3.2.4"
+    "typescript": "3.3.3333"
   },
   "devDependencies": {
-    "@angular/compiler": "^8.0.0-beta.0",
-    "@angular/compiler-cli": "^8.0.0-beta.0",
+    "@angular/compiler": "^8.0.0-beta.9",
+    "@angular/compiler-cli": "^8.0.0-beta.9",
     "@bazel/karma": "~0.26.0",
     "@bazel/typescript": "~0.26.0",
     "@ngtools/json-schema": "^1.1.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index dac318f32610..424daaf35479 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -56,19 +56,19 @@
     "node-sass": "4.11.0"
   },
   "devDependencies": {
-    "@angular/animations": "^8.0.0-beta.0",
-    "@angular/cdk": "^7.1.0",
-    "@angular/common": "^8.0.0-beta.0",
-    "@angular/compiler": "^8.0.0-beta.0",
-    "@angular/compiler-cli": "^8.0.0-beta.0",
-    "@angular/core": "^8.0.0-beta.0",
-    "@angular/http": "^8.0.0-beta.0",
-    "@angular/material": "^7.1.0",
-    "@angular/platform-browser": "^8.0.0-beta.0",
-    "@angular/platform-browser-dynamic": "^8.0.0-beta.0",
-    "@angular/platform-server": "^8.0.0-beta.0",
-    "@angular/router": "^8.0.0-beta.0",
-    "@angular/service-worker": "^8.0.0-beta.0",
+    "@angular/animations": "^8.0.0-beta.9",
+    "@angular/cdk": "^7.3.4",
+    "@angular/common": "^8.0.0-beta.9",
+    "@angular/compiler": "^8.0.0-beta.9",
+    "@angular/compiler-cli": "^8.0.0-beta.9",
+    "@angular/core": "^8.0.0-beta.9",
+    "@angular/http": "^8.0.0-beta.9",
+    "@angular/material": "^7.3.4",
+    "@angular/platform-browser": "^8.0.0-beta.9",
+    "@angular/platform-browser-dynamic": "^8.0.0-beta.9",
+    "@angular/platform-server": "^8.0.0-beta.9",
+    "@angular/router": "^8.0.0-beta.9",
+    "@angular/service-worker": "^8.0.0-beta.9",
     "codelyzer": "^4.2.1",
     "core-js": "^2.4.1",
     "bootstrap": "^4.0.0",
diff --git a/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts
index 327b4b801d56..773a2ae3344e 100644
--- a/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts
@@ -70,7 +70,7 @@ describe('Browser Builder service worker', () => {
         const ngswJson = JSON.parse(virtualFs.fileBufferToString(
           host.scopedSync().read(normalize('dist/ngsw.json'))));
         // Verify index and assets are there.
-        expect(ngswJson).toEqual({
+        expect(ngswJson).toEqual(jasmine.objectContaining({
           configVersion: 1,
           index: '/index.html',
           navigationUrls: [
@@ -108,7 +108,7 @@ describe('Browser Builder service worker', () => {
             '/index.html': '1bcafd53046ffb270ac5e6f3cab23e0442f95c4f',
             '/spectrum.png': '8d048ece46c0f3af4b598a95fd8e4709b631c3c0',
           },
-        });
+        }));
       }),
     ).toPromise().then(done, done.fail);
   });
@@ -127,7 +127,7 @@ describe('Browser Builder service worker', () => {
         const ngswJson = JSON.parse(virtualFs.fileBufferToString(
           host.scopedSync().read(normalize('dist/ngsw.json'))));
         // Verify index and assets include the base href.
-        expect(ngswJson).toEqual({
+        expect(ngswJson).toEqual(jasmine.objectContaining({
           configVersion: 1,
           index: '/foo/bar/index.html',
           navigationUrls: [
@@ -163,7 +163,7 @@ describe('Browser Builder service worker', () => {
             '/foo/bar/assets/folder-asset.txt': '617f202968a6a81050aa617c2e28e1dca11ce8d4',
             '/foo/bar/index.html': '925d80777b6ba64b526b0be79761d254dfe94c65',
           },
-        });
+        }));
       }),
     ).toPromise().then(done, done.fail);
   });
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index cbec405e1cb6..1326d445d09d 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -16,8 +16,8 @@
     "ng-packagr": "^4.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "^8.0.0-beta.0",
-    "@angular/compiler-cli": "^8.0.0-beta.0",
+    "@angular/compiler": "^8.0.0-beta.9",
+    "@angular/compiler-cli": "^8.0.0-beta.9",
     "ng-packagr": "^4.0.0",
     "tsickle": ">=0.34.0",
     "tslib": "^1.9.0"
diff --git a/packages/angular_devkit/build_optimizer/package.json b/packages/angular_devkit/build_optimizer/package.json
index 7bf0622a5b44..e6fa84bcb181 100644
--- a/packages/angular_devkit/build_optimizer/package.json
+++ b/packages/angular_devkit/build_optimizer/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "loader-utils": "1.2.3",
     "source-map": "0.5.6",
-    "typescript": "3.2.4",
+    "typescript": "3.3.3333",
     "webpack-sources": "1.3.0"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 0826fdf362c7..fe9ec24f65e5 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -28,14 +28,14 @@
     "webpack-sources": "1.3.0"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": ">=5.0.0 <8.0.0 || ^7.0.0-beta.0",
-    "typescript": ">=2.4.0 < 3.3",
+    "@angular/compiler-cli": ">=6.0.0 <9.0.0 || ^8.0.0-beta.0",
+    "typescript": ">=2.7 < 3.4",
     "webpack": "^4.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "^7.2.0-rc.0",
-    "@angular/compiler-cli": "^7.2.0-rc.0",
-    "typescript": "3.2.4",
+    "@angular/compiler": "^8.0.0-beta.9",
+    "@angular/compiler-cli": "^8.0.0-beta.9",
+    "typescript": "3.3.3333",
     "webpack": "4.29.6"
   }
 }
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index ca1a8b858cfd..f5359495a301 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -8,10 +8,10 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~8.0.0-beta.7',
+  Angular: '~8.0.0-beta.9',
   RxJs: '~6.4.0',
   ZoneJs: '~0.8.26',
-  TypeScript: '~3.2.2',
+  TypeScript: '~3.3.3333',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
   DevkitBuildAngular: '~0.800.0-beta.7',
diff --git a/packages/schematics/schematics/schematic/files/package.json b/packages/schematics/schematics/schematic/files/package.json
index c33fdb65d1d1..b41f04a1cd27 100644
--- a/packages/schematics/schematics/schematic/files/package.json
+++ b/packages/schematics/schematics/schematic/files/package.json
@@ -18,6 +18,6 @@
     "@types/jasmine": "^3.3.9",
     "@types/node": "^8.0.31",
     "jasmine": "^3.3.1",
-    "typescript": "~3.2.2"
+    "typescript": "~3.3.3333"
   }
 }
diff --git a/tests/angular_devkit/build_angular/hello-world-app/package.json b/tests/angular_devkit/build_angular/hello-world-app/package.json
index e45a8c5b0c7c..8fddce5543bd 100644
--- a/tests/angular_devkit/build_angular/hello-world-app/package.json
+++ b/tests/angular_devkit/build_angular/hello-world-app/package.json
@@ -12,6 +12,8 @@
   },
   "private": true,
   "dependencies": {
+    "//NOTE1": "These dependencies are not actually installed so it doesn't matter what they are.",
+    "//NOTE2": "The used dependencies are the ones in packages/angular_devkit/build_angular.",
     "@angular/animations": "^6.0.0-rc.0",
     "@angular/common": "^6.0.0-rc.0",
     "@angular/compiler": "^6.0.0-rc.0",
diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 68b5e9801011..c16e6d411d2c 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -1,16 +1,16 @@
 {
-    "description": "snapshot versions of Angular for e2e testing",
-    "private": true,
-    "dependencies": {
-        "@angular/core": "github:angular/core-builds#1bc5b9bba8227986648e0acacf1c0fe003325050",
-        "@angular/common": "github:angular/common-builds#8e5855a592e822c8c01ed8c76ddcb613adec8c28",
-        "@angular/platform-browser": "github:angular/platform-browser-builds#a680285668388f1ea495b4418e258dd3a7dfddbf",
-        "@angular/compiler": "github:angular/compiler-builds#5010a0df7672579c111122e703ae2a31e533bfe9",
-        "@angular/compiler-cli": "github:angular/compiler-cli-builds#b2f95784933f67e50916d5491046672452c4470a",
-        "@angular/animations": "github:angular/animations-builds#2ae4075eba3acd11c871ea9ce9acec0ca5679bb1",
-        "@angular/forms": "github:angular/forms-builds#5030b6e9a7174b525ee8e6ee60a3a3a91ef95a3c",
-        "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#4fac5c151609dcf3d4b5bc23f7fa391c6ba393e4",
-        "@angular/router":  "github:angular/router-builds#05ee97ccb532b2f8f18cc072034d5d3e51492a3c",
-        "@angular/language-service": "github:angular/language-service-builds#f0414cf6ca0825aa977639cf41d1935dd5791a6d"
-    }
+  "description": "snapshot versions of Angular for e2e testing",
+  "private": true,
+  "dependencies": {
+    "@angular/animations": "github:angular/animations-builds#3b8e68552cebd4ceb002bd76fa7b437c181d47bb",
+    "@angular/common": "github:angular/common-builds#b0404757a6e8ff33ea84483ff8c9a30287fd8a76",
+    "@angular/compiler": "github:angular/compiler-builds#4020c3ff5a1fb399aefa6107b3da7e77888d8e2b",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#ba3b8ad856de163aff1b3e8638a4e0b3763bcd07",
+    "@angular/core": "github:angular/core-builds#ef4e2529f7c922aeac93faa8a3de2ff42e08880f",
+    "@angular/forms": "github:angular/forms-builds#b50673e14fab734e6cf354e1a28b7171c3fd071d",
+    "@angular/language-service": "github:angular/language-service-builds#9694464453152dc76ca58b5b79558af34d480c07",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#65df04a6f2d04cd042e42b698cdc2eabafd89270",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#ec545d9cc098d1c2c5e0f156dca74a7dab5faa30",
+    "@angular/router": "github:angular/router-builds#c1883b22cb2445354675269aed42babf8e2bec5b"
+  }
 }
\ No newline at end of file
diff --git a/tests/legacy-cli/e2e/tests/ivy/ivy.ts b/tests/legacy-cli/e2e/tests/ivy/ivy.ts
index c80a2e0bfc32..81390d538088 100644
--- a/tests/legacy-cli/e2e/tests/ivy/ivy.ts
+++ b/tests/legacy-cli/e2e/tests/ivy/ivy.ts
@@ -5,17 +5,11 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { getGlobalVariable } from '../../utils/env';
 import { request } from '../../utils/http';
 import { killAllProcesses } from '../../utils/process';
 import { createProject, ngServe } from '../../utils/project';
 
 export default async function() {
-  const argv = getGlobalVariable('argv');
-  if (!argv['ng-snapshots']) {
-    // Only run this test on 8.x versions of Angular, which are currently only on snapshots.
-    return;
-  }
   try {
     await createProject('ivy-project', '--enable-ivy');
 
diff --git a/yarn.lock b/yarn.lock
index 02bc499f1169..f107009421ee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,36 +2,36 @@
 # yarn lockfile v1
 
 
-"@angular/animations@^8.0.0-beta.0":
-  version "8.0.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0-beta.3.tgz#51d41b7b800f569a82f77e6f54f0a74c85b7e8d7"
-  integrity sha512-DpeTE/HVZxsem8IkMjxNPIi71+juKlCwmZX+IsD+txR3o9xj8XdDXEliBdC1bulA8/6rFqfmwbvru0wonX+UCA==
+"@angular/animations@^8.0.0-beta.9":
+  version "8.0.0-beta.9"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0-beta.9.tgz#9605f7b6be49b3bcde7cc7fa145ba329b2fdc6f8"
+  integrity sha512-4OLo3432jwPIo5GiYkrVrjUWPMIKBTXqZLr09A5cScM0RA3N9KaSLk7wg1sjSb0mK3KuEfJ00jCzaLUGdvO5Kw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cdk@^7.1.0":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.3.1.tgz#08850f42dd7d40c5f5af235126f8a70ad34a9892"
-  integrity sha512-m6hy+HPLDgVM+Y2C3UWvIG06euIV8oG5QxrCitZui8JZ/dj/0V5bxATKgWN62haYnYR4en4z1bfH0kOvQj+LEA==
+"@angular/cdk@^7.3.4":
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.3.5.tgz#1b8a73ebb79371d8e1fe055a74bd5dd9515883a7"
+  integrity sha512-5m5HYm/D3/HveZdQQ4wtXk1Vm7bPiV+X5hPgegSHaoX6XONLIwSf821UqE+yYgjalILN44080+p3wHXtQT6Fkg==
   dependencies:
     tslib "^1.7.1"
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/common@^8.0.0-beta.0":
-  version "8.0.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0-beta.3.tgz#2fd3e37eff063e74aaa5f64845f5d79a1599ecdd"
-  integrity sha512-x9C8y7teynT/5u1MreBcUpoScW4QFGS+NM2ayYBslvWPK8ate0ayrDerGjm297oiQd49+4GFKODiirF/s3/hDA==
+"@angular/common@^8.0.0-beta.9":
+  version "8.0.0-beta.9"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0-beta.9.tgz#8e23e54eadc45b187c0321e59f1b7c36b1ae8e0d"
+  integrity sha512-dov21tsbnvNb+hmuPztqUgzDAbtiw0zSvzEzSZsZYq+mU6FbXOXZnyycXzNij+rewZMyVAQNEUIEmjc6UF8nEA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^7.2.0-rc.0":
-  version "7.2.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.0-rc.0.tgz#b3e80954d5c0d5a8973f224fc56eeb12fc4593bb"
-  integrity sha512-m0hfGVvVCGWFgApsDhh80YpdvXWs7/Oq1lgd0dXeo1wZFLOoTfM9Vq7nSnoummwwLeWeYLiZb67LMB6lY9uI2w==
+"@angular/compiler-cli@^8.0.0-beta.9":
+  version "8.0.0-beta.9"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0-beta.9.tgz#ad842d2c0e231b4e2a4ded6a6e98e6d0417515d1"
+  integrity sha512-7puhtwsLNbkd4Kn1Y/PAtIS3M37+UpSjdxsn+ZSiBYpIHZ1irPbfl27ULTIogM+sPgp4ICbMrqJxJfJwGT0a/w==
   dependencies:
     canonical-path "1.0.0"
-    chokidar "^1.4.2"
+    chokidar "^2.1.1"
     convert-source-map "^1.5.1"
     dependency-graph "^0.7.2"
     magic-string "^0.25.0"
@@ -42,92 +42,68 @@
     tslib "^1.9.0"
     yargs "9.0.1"
 
-"@angular/compiler-cli@^8.0.0-beta.0":
-  version "8.0.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0-beta.3.tgz#b3de03b9fafa9b4445884805b519ebd1378dfa95"
-  integrity sha512-BrM6btVA2ZUMr2/xOXnCcWoVMXUK/CB21MvifHr7mIy5KZeXJ6dQc0pLPxz9fkRTNshgl5EkRKDZ47ie6KFTmg==
-  dependencies:
-    canonical-path "1.0.0"
-    chokidar "^1.4.2"
-    convert-source-map "^1.5.1"
-    dependency-graph "^0.7.2"
-    magic-string "^0.25.0"
-    minimist "^1.2.0"
-    reflect-metadata "^0.1.2"
-    shelljs "^0.8.1"
-    source-map "^0.6.1"
-    tslib "^1.9.0"
-    yargs "9.0.1"
-
-"@angular/compiler@^7.2.0-rc.0":
-  version "7.2.0-rc.0"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.0-rc.0.tgz#603dbec25d6c2beea08a293c68c39b40e2ea81e2"
-  integrity sha512-tvgGJx0urSz/qn6upmcjX3N3dyWQ9m5mQOwJxmN4qekxjOtSRml5yt2KtlaUTkGsjkEmEVfSHel+X1TwzBdhYw==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/compiler@^8.0.0-beta.0":
-  version "8.0.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0-beta.3.tgz#e18f25c5914056c8ce76ecc584ef5cc3e06a476b"
-  integrity sha512-iP22eBULIR+S7+kNqeDlwMnFNsvREL2RTPUC/9YgnAdYbyhw4dlAUdR+pK9kpuPVuBoH9i39Ysrwo8R/WHaMRg==
+"@angular/compiler@^8.0.0-beta.9":
+  version "8.0.0-beta.9"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0-beta.9.tgz#4f999b1276b78bc91197a5119cab4f22e528b86b"
+  integrity sha512-X22gQYGT6xR+I0umj6ZJlHbX/uO2x6rZCKDisK0KLIM7ud29ggGz/fZdBgBdZPBUB/ivzWLFUCxewQoqLLRyMA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^8.0.0-beta.0":
-  version "8.0.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0-beta.3.tgz#4fe4175898bf33cca5bfe5aaf80ccc4ef4ab3895"
-  integrity sha512-2EDRSK31tt/Uoj/Akcy19n4Q/3Yx/doYhBV66tZg/0ceVLo50Wfcxlyz13Zq+D3FP8hQ4vnGTV03UOX5nR7VAw==
+"@angular/core@^8.0.0-beta.9":
+  version "8.0.0-beta.9"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0-beta.9.tgz#55fbf127af9847df854fc8c86844dd33b3008450"
+  integrity sha512-/x0ZD3yPlMOhtx9Onp/3nAq995xBarZiTv/dp9/obgts3U/AHEQCDw+7WWhxCqUKV38wMZOLK0FMrubC9mAyug==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^8.0.0-beta.0":
-  version "8.0.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-8.0.0-beta.3.tgz#78df1f853b73ca073c375f7eae8a0b1ba28093b2"
-  integrity sha512-m4UqiZj9uF8f+DaiZOvjUGNYkkffUp9gIfbxyd+lG0TWVq8cW5T6I3nO7d/codTx1rQlHncAiA8XzAiWX8kfJw==
+"@angular/http@^8.0.0-beta.9":
+  version "8.0.0-beta.9"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-8.0.0-beta.9.tgz#84124654e4880d2591b485c995475bfe69208049"
+  integrity sha512-95oUy4wLOqDXmG3cgRrqD0yuaRF9Jqt+ihHVwilJzDbYngid+HCj7Sh+4QqROQbKlMbvbrlz3ikNJ3kfyq4Gjw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/material@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/material/-/material-7.1.0.tgz#441f2d03a97a1fa35546b61dcde86db34f0f5efc"
-  integrity sha512-bgotNpSfGLjNZ1AcTyhs6XS7trF4I7UHwQmfa0l8y3Gf9plwErPDfQe2XqnayRyG9nTwHj9f1lQ45X5mr3/0/A==
+"@angular/material@^7.3.4":
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/@angular/material/-/material-7.3.5.tgz#987df1e2a428660b15c860d05360449b008682b1"
+  integrity sha512-BkakYMuvicKIybp4LI1FKbC8a1jmmTo1ruNugy4PvQmjvj+kim7OMtAR/yCHycYq4cNQDq5LmnqLdclQEniqFw==
   dependencies:
     tslib "^1.7.1"
 
-"@angular/platform-browser-dynamic@^8.0.0-beta.0":
-  version "8.0.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0-beta.3.tgz#d9c4f92f6997dc301c343d0d73d8bf8b928a40be"
-  integrity sha512-4wehYAOV+RB9xvGNI09f0xXIDDMlFlNgraD0TZQkFlxRkaTkSn3uJZj56lx5LYNn2J64VzdW5uYib5IrqSuf/g==
+"@angular/platform-browser-dynamic@^8.0.0-beta.9":
+  version "8.0.0-beta.9"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0-beta.9.tgz#c7d6113c7941ab612d487d6d6ec0203336fc7f38"
+  integrity sha512-p94e+hQ6gEUG2eAbdfdiYWrQCGTt/tXKh2K5hlhg3RNci4mac5icW0sHGYDCJjcER7sOSWmJL8gfohX0t4H9uQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^8.0.0-beta.0":
-  version "8.0.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0-beta.3.tgz#70004fecc9d25ccaac6e18e909d91efae7f34d11"
-  integrity sha512-4DKieNasMPZn+/phqEnStdRlH+VHEoSs5AYNsxRsluLbXRorywJYuurBBnDyJmQa6flNbTOVfAWHt4IOUYLF9g==
+"@angular/platform-browser@^8.0.0-beta.9":
+  version "8.0.0-beta.9"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0-beta.9.tgz#7b4a731c2dbfd05266575a83a91b532b81d1490d"
+  integrity sha512-wNwbLSwdruDmdJ9IW2M1jL2OwWxqZ1R+xR8ZdmpUandGTf3R17u89gMzCjRvYx+rP//7p4XMHbNA8nx/lae3yA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-server@^8.0.0-beta.0":
-  version "8.0.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.0.0-beta.3.tgz#80e05be91501d661523ae55d7ce2f1cbd294974a"
-  integrity sha512-wxb994hEzSiqm3Sx7tetBqTdGjYwTc3L/e1mgtxECSC9eAEGtAxxP5BraUb137arKk0O+bAZ3JEE2t4lcS6voQ==
+"@angular/platform-server@^8.0.0-beta.9":
+  version "8.0.0-beta.9"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.0.0-beta.9.tgz#c0f2a1476ad1ee1897ff2541ba6a5959dc455668"
+  integrity sha512-Qwy6U8xPoapJgj5dqFc1vzg4y+QEnfeQZr5e1VNcP04aViofZyKD0uNS9rzZcPUdLsuDRU+09uhFeIMJVbjmPw==
   dependencies:
-    domino "^2.1.0"
+    domino "^2.1.2"
     tslib "^1.9.0"
     xhr2 "^0.1.4"
 
-"@angular/router@^8.0.0-beta.0":
-  version "8.0.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0-beta.3.tgz#2353491eb1578657c107bcc4d8bf1d2a7c5f7ea8"
-  integrity sha512-MJTIiMYfWdXH3KzASyBkn+wS2UB62rGcg+3QtUTPyeAaJy4DbQYS37pOB9gmqtvwxeL3qtSFJ+TSiYyEyjrefw==
+"@angular/router@^8.0.0-beta.9":
+  version "8.0.0-beta.9"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0-beta.9.tgz#29197556d779318edd710b0d2935da35131ceacc"
+  integrity sha512-+6vLGw7Lwgrrs+UXoqM/6KDGFVOckkJaxtpIQfLh7mnHyJ4bM6d/0JxaNGQOye3CUlk32C5MsG7dt3ldL6V2Ig==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@^8.0.0-beta.0":
-  version "8.0.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.0.0-beta.3.tgz#db7761a7e381fe0194d8b808bba94f49cd83fa4e"
-  integrity sha512-OUDnLGpfEJVbr67vHK/XSbs7MTnQF1TPP5191tlqwI54KbtUMGd3jFz22DmiT2hSBCKrRO4vH7jbpRtMi4pY7A==
+"@angular/service-worker@^8.0.0-beta.9":
+  version "8.0.0-beta.9"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.0.0-beta.9.tgz#39668fc0554103b2c2f5fe6e4a730c18cd5b3558"
+  integrity sha512-Do/t79TkdYr8QS01xZ6xR6AZhJbLtGFJGM7Q5L4/2eoooDSdcRNwjPgFGVjnmzYullH0yj0sn9ccSicfTcVgYw==
   dependencies:
     tslib "^1.9.0"
 
@@ -965,14 +941,6 @@ ansi.js@0.0.5:
   dependencies:
     on-new-line "0.0.1"
 
-anymatch@^1.3.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
-  integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==
-  dependencies:
-    micromatch "^2.1.5"
-    normalize-path "^2.0.0"
-
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -1154,6 +1122,11 @@ async-each@^1.0.0:
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
   integrity sha1-GdOGodntxufByF04iu28xW0zYC0=
 
+async-each@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.2.tgz#8b8a7ca2a658f927e9f307d6d1a42f4199f0f735"
+  integrity sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg==
+
 async-foreach@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
@@ -1857,22 +1830,6 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-chokidar@^1.4.2:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
-  integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=
-  dependencies:
-    anymatch "^1.3.0"
-    async-each "^1.0.0"
-    glob-parent "^2.0.0"
-    inherits "^2.0.1"
-    is-binary-path "^1.0.0"
-    is-glob "^2.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-  optionalDependencies:
-    fsevents "^1.0.0"
-
 chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
@@ -1893,6 +1850,25 @@ chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3:
   optionalDependencies:
     fsevents "^1.2.2"
 
+chokidar@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.2.tgz#9c23ea40b01638439e0513864d362aeacc5ad058"
+  integrity sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
+    glob-parent "^3.1.0"
+    inherits "^2.0.3"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^3.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.2.1"
+    upath "^1.1.0"
+  optionalDependencies:
+    fsevents "^1.2.7"
+
 chownr@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
@@ -2970,10 +2946,10 @@ domain-browser@^1.1.1:
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
   integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
-domino@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.0.tgz#653ba7d331441113b42e40ba05f24253ec86e02e"
-  integrity sha512-xINSODvrnuQcm3eXJN4IkBR+JxqLrJN8Ge4fd00y1b7HsY0A4huKN5BflSS/oo8quBWmocTfWdFvrw2H8TjGqQ==
+domino@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.3.tgz#0ca1ad02cbd316ebe2e99e0ac9fb0010407d4601"
+  integrity sha512-EwjTbUv1Q/RLQOdn9k7ClHutrQcWGsfXaRQNOnM/KgK4xDBoLFEcIRFuBSxAx13Vfa63X029gXYrNFrSy+DOSg==
 
 dot-prop@^3.0.0:
   version "3.0.0"
@@ -3811,7 +3787,7 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@^1.0.0, fsevents@^1.2.2:
+fsevents@^1.2.2:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
   integrity sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==
@@ -3819,6 +3795,14 @@ fsevents@^1.0.0, fsevents@^1.2.2:
     nan "^2.9.2"
     node-pre-gyp "^0.10.0"
 
+fsevents@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
+  integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==
+  dependencies:
+    nan "^2.9.2"
+    node-pre-gyp "^0.10.0"
+
 fstream@^1.0.0, fstream@^1.0.2:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
@@ -5927,7 +5911,7 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-micromatch@^2.1.5, micromatch@^2.3.11:
+micromatch@^2.3.11:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
   integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
@@ -6446,7 +6430,7 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
+normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
@@ -7720,6 +7704,15 @@ readdirp@^2.0.0:
     readable-stream "^2.0.2"
     set-immediate-shim "^1.0.1"
 
+readdirp@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
+  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+    micromatch "^3.1.10"
+    readable-stream "^2.0.2"
+
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
@@ -9433,10 +9426,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@3.2.4:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d"
-  integrity sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==
+typescript@3.3.3333:
+  version "3.3.3333"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.3333.tgz#171b2c5af66c59e9431199117a3bcadc66fdcfd6"
+  integrity sha512-JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw==
 
 uglify-js@^3.0.7, uglify-js@^3.1.4:
   version "3.4.9"
@@ -9525,6 +9518,11 @@ upath@^1.0.5:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
   integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==
 
+upath@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
+  integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
+
 update-notifier@^2.3.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6"

From 1736a001c43f36ee22754f371bd6016a2bfeec5a Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 18 Mar 2019 15:27:42 -0700
Subject: [PATCH 0959/1703] feat(@angular/cli): add universal-analytics as
 dependency

We will need it for our implementation of analytics.
---
 package.json                      |  2 ++
 packages/angular/cli/package.json |  6 +++--
 yarn.lock                         | 37 ++++++++++++++++++++++++-------
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index ddaeb6160d73..9e02a72bec0b 100644
--- a/package.json
+++ b/package.json
@@ -65,6 +65,8 @@
     "@types/debug": "^4.1.2",
     "@types/node-fetch": "^2.1.6",
     "@types/progress": "^2.0.3",
+    "@types/universal-analytics": "^0.4.2",
+    "@types/uuid": "^3.4.4",
     "debug": "^4.1.1",
     "glob": "^7.0.3",
     "node-fetch": "^2.2.0",
diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index eef77dd2d760..b2bdb85060a8 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -3,7 +3,6 @@
   "version": "0.0.0",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
-  "trackingCode": "UA-8594346-19",
   "bin": {
     "ng": "./bin/ng"
   },
@@ -32,13 +31,16 @@
     "@schematics/angular": "0.0.0",
     "@schematics/update": "0.0.0",
     "@yarnpkg/lockfile": "1.1.0",
+    "debug": "^4.1.1",
     "ini": "1.3.5",
     "inquirer": "6.2.2",
     "npm-package-arg": "6.1.0",
     "opn": "5.4.0",
     "pacote": "9.5.0",
     "semver": "5.6.0",
-    "symbol-observable": "1.2.0"
+    "symbol-observable": "1.2.0",
+    "universal-analytics": "^0.4.20",
+    "uuid": "^3.3.2"
   },
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json"
diff --git a/yarn.lock b/yarn.lock
index f107009421ee..778c956ac8a8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -573,10 +573,22 @@
   dependencies:
     source-map "^0.6.1"
 
+"@types/universal-analytics@^0.4.2":
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/@types/universal-analytics/-/universal-analytics-0.4.2.tgz#d21a122a984bf8261eb206bcb7ccb1c0e8353d04"
+  integrity sha512-ndv0aYA5tNPdl4KYUperlswuiSj49+o7Pwx8hrCiE9x2oeiMrn7A2jXFDdTLFIymiYZImDX02ycq0i6uQ3TL0A==
+
 "@types/urijs@github:quicktype/types-urijs":
   version "1.0.1"
   resolved "https://codeload.github.com/quicktype/types-urijs/tar.gz/a23603a04e31e883a92244bff8515e3d841a8b98"
 
+"@types/uuid@^3.4.4":
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.4.4.tgz#7af69360fa65ef0decb41fd150bf4ca5c0cefdf5"
+  integrity sha512-tPIgT0GUmdJQNSHxp0X2jnpQfBSTfGxUMc/2CXBU2mnyTFVYVa2ojpoQ74w0U2yn2vw3jnC640+77lkFFpdVDw==
+  dependencies:
+    "@types/node" "*"
+
 "@types/webpack-dev-server@^3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-3.1.0.tgz#1fae06ad346d2dd09bc5e34745723946458eed58"
@@ -2669,6 +2681,13 @@ debug@3.1.0, debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
+debug@^3.0.0, debug@^3.2.5:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+  dependencies:
+    ms "^2.1.1"
+
 debug@^3.1.0:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.4.tgz#82123737c51afbe9609a2b5dfe9664e7487171f0"
@@ -2676,13 +2695,6 @@ debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
-debug@^3.2.5:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
-  dependencies:
-    ms "^2.1.1"
-
 debug@^4.1.0, debug@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
@@ -9490,6 +9502,15 @@ unique-string@^1.0.0:
   dependencies:
     crypto-random-string "^1.0.0"
 
+universal-analytics@^0.4.20:
+  version "0.4.20"
+  resolved "https://registry.yarnpkg.com/universal-analytics/-/universal-analytics-0.4.20.tgz#d6b64e5312bf74f7c368e3024a922135dbf24b03"
+  integrity sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==
+  dependencies:
+    debug "^3.0.0"
+    request "^2.88.0"
+    uuid "^3.0.0"
+
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
@@ -9628,7 +9649,7 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@^3.0.1, uuid@^3.3.2:
+uuid@^3.0.0, uuid@^3.0.1, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==

From cf5cf19bb568928aaf05fb44e6122b0761f5dc8c Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 18 Mar 2019 16:31:07 -0700
Subject: [PATCH 0960/1703] feat(@angular/cli): add analytic support to
 commands and command-runner

This is only reporting commands and their flags right now, and not
schematics or project analytics.
---
 packages/angular/cli/models/analytics.ts      | 483 ++++++++++++++++++
 packages/angular/cli/models/command-runner.ts |  53 +-
 packages/angular/cli/models/command.ts        |  24 +-
 packages/angular/cli/models/interface.ts      |  11 +-
 packages/angular/cli/utilities/json-schema.ts |   4 +
 5 files changed, 571 insertions(+), 4 deletions(-)
 create mode 100644 packages/angular/cli/models/analytics.ts

diff --git a/packages/angular/cli/models/analytics.ts b/packages/angular/cli/models/analytics.ts
new file mode 100644
index 000000000000..b1521613fc53
--- /dev/null
+++ b/packages/angular/cli/models/analytics.ts
@@ -0,0 +1,483 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { analytics, json, tags, terminal } from '@angular-devkit/core';
+import * as child_process from 'child_process';
+import * as debug from 'debug';
+import { writeFileSync } from 'fs';
+import * as inquirer from 'inquirer';
+import * as os from 'os';
+import * as ua from 'universal-analytics';
+import { v4 as uuidV4 } from 'uuid';
+import { TimingOptions } from '../../../angular_devkit/core/src/analytics';
+import { getWorkspace, getWorkspaceRaw } from '../utilities/config';
+
+const analyticsDebug = debug('ng:analytics');  // Generate analytics, including settings and users.
+const analyticsLogDebug = debug('ng:analytics:log');  // Actual logs of events.
+
+const BYTES_PER_MEGABYTES = 1024 * 1024;
+
+
+/**
+ * MAKE SURE TO KEEP THIS IN SYNC WITH THE TABLE AND CONTENT IN `/docs/design/analytics.md`.
+ * WE LIST THOSE DIMENSIONS (AND MORE).
+ */
+export enum AnalyticsDimensions {
+  NgAddCollection = 6,
+  NgBuildBuildEventLog = 7,
+}
+
+
+/**
+ * Attempt to get the Windows Language Code string.
+ * @private
+ */
+function _getWindowsLanguageCode(): string | undefined {
+  if (!os.platform().startsWith('win')) {
+    return undefined;
+  }
+
+  try {
+    // This is true on Windows XP, 7, 8 and 10 AFAIK. Would return empty string or fail if it
+    // doesn't work.
+    return child_process.execSync('wmic.exe os get locale').toString().trim();
+  } catch (_) {}
+
+  return undefined;
+}
+
+/**
+ * Get a language code.
+ * @private
+ */
+function _getLanguage() {
+  // Note: Windows does not expose the configured language by default.
+  return process.env.LANG  // Default Unix env variable.
+      || process.env.LC_CTYPE  // For C libraries. Sometimes the above isn't set.
+      || process.env.LANGSPEC  // For Windows, sometimes this will be set (not always).
+      || _getWindowsLanguageCode()
+      || '??';  // ¯\_(ツ)_/¯
+}
+
+/**
+ * Return the number of CPUs.
+ * @private
+ */
+function _getCpuCount() {
+  const cpus = os.cpus();
+
+  // Return "(count)x(average speed)".
+  return cpus.length;
+}
+
+/**
+ * Get the first CPU's speed. It's very rare to have multiple CPUs of different speed (in most
+ * non-ARM configurations anyway), so that's all we care about.
+ * @private
+ */
+function _getCpuSpeed() {
+  const cpus = os.cpus();
+
+  return Math.floor(cpus[0].speed);
+}
+
+/**
+ * Get the amount of memory, in megabytes.
+ * @private
+ */
+function _getRamSize() {
+  // Report in megabytes. Otherwise it's too much noise.
+  return Math.floor(os.totalmem() / BYTES_PER_MEGABYTES);
+}
+
+/**
+ * Get the Node name and version. This returns a string like "Node 10.11", or "io.js 3.5".
+ * @private
+ */
+function _getNodeVersion() {
+  // We use any here because p.release is a new Node construct in Node 10 (and our typings are the
+  // minimal version of Node we support).
+  const p = process as any;  // tslint:disable-line:no-any
+  const name = typeof p.release == 'object' && typeof p.release.name == 'string' && p.release.name
+          || process.argv0;
+
+  return name + ' ' + process.version;
+}
+
+/**
+ * Get a numerical MAJOR.MINOR version of node. We report this as a metric.
+ * @private
+ */
+function _getNumericNodeVersion() {
+  const p = process.version;
+  const m = p.match(/\d+\.\d+/);
+
+  return m && m[0] && parseFloat(m[0]) || 0;
+}
+
+
+// These are just approximations of UA strings. We just try to fool Google Analytics to give us the
+// data we want.
+// See https://developers.whatismybrowser.com/useragents/
+const osVersionMap: { [os: string]: { [release: string]: string } } = {
+  darwin: {
+    '1.3.1': '10_0_4',
+    '1.4.1': '10_1_0',
+    '5.1': '10_1_1',
+    '5.2': '10_1_5',
+    '6.0.1': '10_2',
+    '6.8': '10_2_8',
+    '7.0': '10_3_0',
+    '7.9': '10_3_9',
+    '8.0': '10_4_0',
+    '8.11': '10_4_11',
+    '9.0': '10_5_0',
+    '9.8': '10_5_8',
+    '10.0': '10_6_0',
+    '10.8': '10_6_8',
+    // We stop here because we try to math out the version for anything greater than 10, and it
+    // works. Those versions are standardized using a calculation now.
+  },
+  win32: {
+    '6.3.9600': 'Windows 8.1',
+    '6.2.9200': 'Windows 8',
+    '6.1.7601': 'Windows 7 SP1',
+    '6.1.7600': 'Windows 7',
+    '6.0.6002': 'Windows Vista SP2',
+    '6.0.6000': 'Windows Vista',
+    '5.1.2600': 'Windows XP',
+  },
+};
+
+
+/**
+ * Build a fake User Agent string for OSX. This gets sent to Analytics so it shows the proper OS,
+ * versions and others.
+ * @private
+ */
+function _buildUserAgentStringForOsx() {
+  let v = osVersionMap.darwin[os.release()];
+
+  if (!v) {
+    // Remove 4 to tie Darwin version to OSX version, add other info.
+    const x = parseFloat(os.release());
+    if (x > 10) {
+      v = `10_` + (x - 4).toString().replace('.', '_');
+    }
+  }
+
+  const cpuModel = os.cpus()[0].model.match(/^[a-z]+/i);
+  const cpu = cpuModel ? cpuModel[0] : os.cpus()[0].model;
+
+  return `(Macintosh; ${cpu} Mac OS X ${v || os.release()})`;
+}
+
+/**
+ * Build a fake User Agent string for Windows. This gets sent to Analytics so it shows the proper
+ * OS, versions and others.
+ * @private
+ */
+function _buildUserAgentStringForWindows() {
+  return `(Windows NT ${os.release()})`;
+}
+
+/**
+ * Build a fake User Agent string for Linux. This gets sent to Analytics so it shows the proper OS,
+ * versions and others.
+ * @private
+ */
+function _buildUserAgentStringForLinux() {
+  return `(X11; Linux i686; ${os.release()}; ${os.cpus()[0].model})`;
+}
+
+/**
+ * Build a fake User Agent string. This gets sent to Analytics so it shows the proper OS version.
+ * @private
+ */
+function _buildUserAgentString() {
+  switch (os.platform()) {
+    case 'darwin':
+      return _buildUserAgentStringForOsx();
+
+    case 'win32':
+      return _buildUserAgentStringForWindows();
+
+    case 'linux':
+      return _buildUserAgentStringForLinux();
+
+    default:
+      return os.platform() + ' ' + os.release();
+  }
+}
+
+
+/**
+ * Implementation of the Analytics interface for using `universal-analytics` package.
+ */
+export class UniversalAnalytics implements analytics.Analytics {
+  private _ua: ua.Visitor;
+  private _dirty = false;
+
+  /**
+   * @param trackingId The Google Analytics ID.
+   * @param uid A User ID.
+   */
+  constructor(trackingId: string, uid: string) {
+    this._ua = ua(trackingId, uid, {
+      enableBatching: true,
+      batchSize: 5,
+    });
+
+    // Add persistent params for appVersion.
+    this._ua.set('ds', 'cli');
+    this._ua.set('ua', _buildUserAgentString());
+    this._ua.set('ul', _getLanguage());
+
+    // @angular/cli with version.
+    this._ua.set('an', require('../package.json').name);
+    this._ua.set('av', require('../package.json').version);
+
+    // We use the application ID for the Node version. This should be "node 10.10.0".
+    // We also use a custom metrics, but
+    this._ua.set('aid', _getNodeVersion());
+
+    // We set custom metrics for values we care about.
+    this._ua.set('cm1', _getCpuCount());
+    this._ua.set('cm2', _getCpuSpeed());
+    this._ua.set('cm3', _getRamSize());
+    this._ua.set('cm4', _getNumericNodeVersion());
+  }
+
+  /**
+   * Creates the dimension and metrics variables to pass to universal-analytics.
+   * @private
+   */
+  private _customVariables(options: analytics.CustomDimensionsAndMetricsOptions) {
+    const additionals: { [key: string]: boolean | number | string } = {};
+    (options.dimensions || []).forEach((v, i) => additionals['cd' + i] = v);
+    (options.metrics || []).forEach((v, i) => additionals['cm' + i] = v);
+
+    return additionals;
+  }
+
+  event(ec: string, ea: string, options: analytics.EventOptions = {}) {
+    const vars = this._customVariables(options);
+    analyticsLogDebug('event ec=%j, ea=%j, %j', ec, ea, vars);
+
+    const { label: el, value: ev } = options;
+    this._dirty = true;
+    this._ua.event({ ec, ea, el, ev, ...vars });
+  }
+  screenview(cd: string, an: string, options: analytics.ScreenviewOptions = {}) {
+    const vars = this._customVariables(options);
+    analyticsLogDebug('screenview cd=%j, an=%j, %j', cd, an, vars);
+
+    const { appVersion: av, appId: aid, appInstallerId: aiid } = options;
+    this._dirty = true;
+    this._ua.screenview({ cd, an, av, aid, aiid, ...vars });
+  }
+  pageview(dp: string, options: analytics.PageviewOptions = {}) {
+    const vars = this._customVariables(options);
+    analyticsLogDebug('pageview dp=%j, %j', dp, vars);
+
+    const { hostname: dh, title: dt } = options;
+    this._dirty = true;
+    this._ua.pageview({ dp, dh, dt, ...vars });
+  }
+  timing(utc: string, utv: string, utt: string | number, options: TimingOptions = {}) {
+    const vars = this._customVariables(options);
+    analyticsLogDebug('timing utc=%j, utv=%j, utl=%j, %j', utc, utv, utt, vars);
+
+    const { label: utl } = options;
+    this._dirty = true;
+    this._ua.timing({ utc, utv, utt, utl, ...vars });
+  }
+
+  flush(): Promise<void> {
+    if (!this._dirty) {
+      return Promise.resolve();
+    }
+
+    this._dirty = false;
+
+    return new Promise(resolve => this._ua.send(resolve));
+  }
+}
+
+/**
+ * Set analytics settings. This does not work if the user is not inside a project.
+ * @param level Which config to use. "global" for user-level, and "local" for project-level.
+ * @param value Either a user ID, true to generate a new User ID, or false to disable analytics.
+ */
+export function setAnalyticsConfig(level: 'global' | 'local', value: string | boolean) {
+  analyticsDebug('setting %s level analytics to: %s', level, value);
+  const [config, configPath] = getWorkspaceRaw(level);
+  if (!config || !configPath) {
+    throw new Error(`Could not find ${level} workspace.`);
+  }
+
+  const configValue = config.value;
+  const cli: json.JsonValue = configValue['cli'] || (configValue['cli'] = {});
+
+  if (!json.isJsonObject(cli)) {
+    throw new Error(`Invalid config found at ${configPath}. CLI should be an object.`);
+  }
+
+  if (value === true) {
+    value = uuidV4();
+  }
+  cli['analytics'] = value;
+
+  const output = JSON.stringify(configValue, null, 2);
+  writeFileSync(configPath, output);
+  analyticsDebug('done');
+}
+
+/**
+ * Prompt the user for usage gathering permission.
+ * @param force Whether to ask regardless of whether or not the user is using an interactive shell.
+ * @return Whether or not the user was shown a prompt.
+ */
+export async function promptGlobalAnalytics(force = false) {
+  analyticsDebug('prompting global analytics.');
+  if (force || (process.stdout.isTTY && process.stdin.isTTY)) {
+    const answers = await inquirer.prompt<{ analytics: boolean }>([
+      {
+        type: 'confirm',
+        name: 'analytics',
+        message: tags.stripIndents`
+          === MESSAGE TO BE FINALIZED ==== DO_NOT_SUBMIT
+
+          Would you like to share anonymous usage data with the Angular Team at Google under
+          Google’s Privacy Policy at https://policies.google.com/privacy? For more details and
+          how to change this setting, see http://angular.io/usage/.
+        `,
+        default: false,
+      },
+    ]);
+
+    setAnalyticsConfig('global', answers.analytics);
+
+    if (answers.analytics) {
+      console.log('');
+      console.log(tags.stripIndent`
+        Thank you for sharing anonymous usage data. Would you change your mind, the following
+        command will disable this feature entirely:
+
+            ${terminal.yellow('ng analytics off')}
+      `);
+      console.log('');
+    }
+
+    return true;
+  }
+
+  return false;
+}
+
+/**
+ * Prompt the user for usage gathering permission for the local project. Fails if there is no
+ * local workspace.
+ * @param force Whether to ask regardless of whether or not the user is using an interactive shell.
+ * @return Whether or not the user was shown a prompt.
+ */
+export async function promptProjectAnalytics(force = false): Promise<boolean> {
+  analyticsDebug('prompting user');
+  const [config, configPath] = getWorkspaceRaw('local');
+  if (!config || !configPath) {
+    throw new Error(`Could not find a local workspace. Are you in a project?`);
+  }
+
+  if (force || (process.stdout.isTTY && process.stdin.isTTY)) {
+    const answers = await inquirer.prompt<{ analytics: boolean }>([
+      {
+        type: 'confirm',
+        name: 'analytics',
+        message: tags.stripIndents`
+          === MESSAGE TO BE FINALIZED ==== DO_NOT_SUBMIT
+
+          Would you like to share anonymous usage data about this project with the Angular Team at
+          Google under Google’s Privacy Policy at https://policies.google.com/privacy? For more
+          details and how to change this setting, see http://angular.io/usage.
+
+        `,
+        default: false,
+      },
+    ]);
+
+    setAnalyticsConfig('local', answers.analytics);
+
+    if (answers.analytics) {
+      console.log('');
+      console.log(tags.stripIndent`
+        === MESSAGE TO BE FINALIZED ==== DO_NOT_SUBMIT
+
+        Thank you for sharing anonymous usage data. Would you change your mind, the following
+        command will disable this feature entirely:
+
+            ${terminal.yellow('ng analytics project off')}
+      `);
+      console.log('');
+    }
+
+    return true;
+  }
+
+  return false;
+}
+
+
+/**
+ * Get the global analytics setting for the user. This returns a string for UID, false if the user
+ * opted out of analytics, true if the user wants to stay anonymous (no client id), and undefined
+ * if the user has not been prompted yet.
+ *
+ * If any problem happens, it is considered the user has been opting out of analytics.
+ */
+export function getGlobalAnalytics(): string | boolean | undefined {
+  analyticsDebug('getGlobalAnalytics');
+
+  if ('NG_CLI_ANALYTICS' in process.env) {
+    if (process.env['NG_CLI_ANALYTICS'] == 'false' || process.env['NG_CLI_ANALYTICS'] == '') {
+      analyticsDebug('NG_CLI_ANALYTICS is false');
+
+      return false;
+    }
+    if (process.env['NG_CLI_ANALYTICS'] === 'ci') {
+      analyticsDebug('Running in CI mode');
+
+      return 'ci';
+    }
+  }
+
+  // If anything happens we just keep the NOOP analytics.
+  try {
+    const globalWorkspace = getWorkspace('global');
+    const analyticsConfig = globalWorkspace
+      && globalWorkspace.getCli()
+      && globalWorkspace.getCli()['analytics'];
+
+    if (analyticsConfig === false) {
+      return false;
+    } else if (analyticsConfig === undefined) {
+      return undefined;
+    } else {
+      let uid: string | undefined = undefined;
+      if (typeof analyticsConfig == 'string') {
+        uid = analyticsConfig;
+      } else if (typeof analyticsConfig == 'object' && typeof analyticsConfig['uid'] == 'string') {
+        uid = analyticsConfig['uid'];
+      }
+
+      analyticsDebug('client id: %s', uid);
+
+      return uid;
+    }
+  } catch {
+    return false;
+  }
+}
diff --git a/packages/angular/cli/models/command-runner.ts b/packages/angular/cli/models/command-runner.ts
index a092540fbebb..1d54a5ac28d1 100644
--- a/packages/angular/cli/models/command-runner.ts
+++ b/packages/angular/cli/models/command-runner.ts
@@ -7,6 +7,7 @@
  */
 import {
   JsonParseMode,
+  analytics,
   isJsonObject,
   json,
   logging,
@@ -14,10 +15,12 @@ import {
   strings,
   tags,
 } from '@angular-devkit/core';
+import * as debug from 'debug';
 import { readFileSync } from 'fs';
 import { dirname, join, resolve } from 'path';
 import { findUp } from '../utilities/find-up';
 import { parseJsonSchemaToCommandDescription } from '../utilities/json-schema';
+import { UniversalAnalytics,  getGlobalAnalytics } from './analytics';
 import { Command } from './command';
 import {
   CommandDescription,
@@ -26,23 +29,55 @@ import {
 } from './interface';
 import * as parser from './parser';
 
+const analyticsDebug = debug('ng:analytics:commands');
+
 
 export interface CommandMapOptions {
   [key: string]: string;
 }
 
+
+async function _createAnalytics(): Promise<analytics.Analytics> {
+  const config = getGlobalAnalytics();
+
+  switch (config) {
+    case undefined:
+    case false:
+      analyticsDebug('Analytics disabled. Ignoring all analytics.');
+
+      return new analytics.NoopAnalytics();
+
+    case true:
+      analyticsDebug('Analytics enabled, anonymous user.');
+
+      return new UniversalAnalytics('UA-8594346-29', '');
+
+    case 'ci':
+      analyticsDebug('Logging analytics as CI.');
+
+      return new UniversalAnalytics('UA-8594346-29', 'ci');
+
+    default:
+      analyticsDebug('Analytics enabled. User ID: %j', config);
+
+      return new UniversalAnalytics('UA-8594346-29', config);
+  }
+}
+
 /**
  * Run a command.
  * @param args Raw unparsed arguments.
  * @param logger The logger to use.
  * @param workspace Workspace information.
  * @param commands The map of supported commands.
+ * @param options Additional options.
  */
 export async function runCommand(
   args: string[],
   logger: logging.Logger,
   workspace: CommandWorkspace,
   commands?: CommandMapOptions,
+  options: { analytics?: analytics.Analytics } = {},
 ): Promise<number | void> {
   if (commands === undefined) {
     const commandMapPath = findUp('commands.json', __dirname);
@@ -184,9 +219,23 @@ export async function runCommand(
   try {
     const parsedOptions = parser.parseArguments(args, description.options, logger);
     Command.setCommandMap(commandMap);
-    const command = new description.impl({ workspace }, description, logger);
 
-    return await command.validateAndRun(parsedOptions);
+    const analytics = options.analytics || await _createAnalytics();
+    const context = { workspace, analytics };
+    const command = new description.impl(context, description, logger);
+
+    // Flush on an interval (if the event loop is waiting).
+    let analyticsFlushPromise = Promise.resolve();
+    setInterval(() => {
+      analyticsFlushPromise = analyticsFlushPromise.then(() => analytics.flush());
+    }, 1000);
+
+    const result = await command.validateAndRun(parsedOptions);
+
+    // Flush one last time.
+    await analyticsFlushPromise.then(() => analytics.flush());
+
+    return result;
   } catch (e) {
     if (e instanceof parser.ParseArgumentException) {
       logger.fatal('Cannot parse arguments. See below for the reasons.');
diff --git a/packages/angular/cli/models/command.ts b/packages/angular/cli/models/command.ts
index 8accd58f1f77..a867576d6a6c 100644
--- a/packages/angular/cli/models/command.ts
+++ b/packages/angular/cli/models/command.ts
@@ -7,7 +7,7 @@
  */
 
 // tslint:disable:no-global-tslint-disable no-any
-import { logging, strings, tags, terminal } from '@angular-devkit/core';
+import { analytics, logging, strings, tags, terminal } from '@angular-devkit/core';
 import * as path from 'path';
 import { getWorkspace } from '../utilities/config';
 import {
@@ -27,6 +27,7 @@ export interface BaseCommandOptions {
 export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions> {
   public allowMissingWorkspace = false;
   public workspace: CommandWorkspace;
+  public analytics: analytics.Analytics;
 
   protected static commandMap: CommandDescriptionMap;
   static setCommandMap(map: CommandDescriptionMap) {
@@ -39,6 +40,7 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
     protected readonly logger: logging.Logger,
   ) {
     this.workspace = context.workspace;
+    this.analytics = context.analytics || new analytics.NoopAnalytics();
   }
 
   async initialize(options: T & Arguments): Promise<void> {
@@ -147,6 +149,24 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
     }
   }
 
+  async reportAnalytics(
+    paths: string[],
+    options: T & Arguments,
+    dimensions: (boolean | number | string)[] = [],
+    metrics: (boolean | number | string)[] = [],
+  ): Promise<void> {
+    for (const option of this.description.options) {
+      const ua = option.userAnalytics;
+      const v = options[option.name];
+
+      if (v !== undefined && !Array.isArray(v) && ua) {
+        dimensions[ua] = v;
+      }
+    }
+
+    this.analytics.pageview('/command/' + paths.join('/'), { dimensions });
+  }
+
   abstract async run(options: T & Arguments): Promise<number | void>;
 
   async validateAndRun(options: T & Arguments): Promise<number | void> {
@@ -160,6 +180,8 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
     } else if (options.help === 'json' || options.help === 'JSON') {
       return this.printJsonHelp(options);
     } else {
+      await this.reportAnalytics([this.description.name], options);
+
       return await this.run(options);
     }
   }
diff --git a/packages/angular/cli/models/interface.ts b/packages/angular/cli/models/interface.ts
index 48ae7ff7b0d3..17292c95269b 100644
--- a/packages/angular/cli/models/interface.ts
+++ b/packages/angular/cli/models/interface.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { json, logging } from '@angular-devkit/core';
+import { analytics, json, logging } from '@angular-devkit/core';
 
 /**
  * Value type of arguments.
@@ -57,6 +57,9 @@ export interface CommandWorkspace {
  */
 export interface CommandContext {
   workspace: CommandWorkspace;
+
+  // This feel is optional for backward compatibility.
+  analytics?: analytics.Analytics;
 }
 
 /**
@@ -154,6 +157,12 @@ export interface Option {
    * Smart default object.
    */
   $default?: OptionSmartDefault;
+
+  /**
+   * Whether or not to report this option to the Angular Team, and which custom field to use.
+   * If this is falsey, do not report this option.
+   */
+  userAnalytics?: number;
 }
 
 /**
diff --git a/packages/angular/cli/utilities/json-schema.ts b/packages/angular/cli/utilities/json-schema.ts
index 7b4422903801..c91a1e213197 100644
--- a/packages/angular/cli/utilities/json-schema.ts
+++ b/packages/angular/cli/utilities/json-schema.ts
@@ -255,6 +255,9 @@ export async function parseJsonSchemaToOptions(
     const deprecated = (xDeprecated === true || typeof xDeprecated == 'string')
       ? xDeprecated : undefined;
 
+    const xUserAnalytics = current['x-user-analytics'];
+    const userAnalytics = typeof xUserAnalytics == 'number' ? xUserAnalytics : undefined;
+
     const option: Option = {
       name,
       description: '' + (current.description === undefined ? '' : current.description),
@@ -265,6 +268,7 @@ export async function parseJsonSchemaToOptions(
       aliases,
       ...format !== undefined ? { format } : {},
       hidden,
+      ...userAnalytics ? { userAnalytics } : {},
       ...deprecated !== undefined ? { deprecated } : {},
       ...positional !== undefined ? { positional } : {},
     };

From e96c7ce291f96b6669b9e15d5764130468eef144 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 18 Mar 2019 16:34:00 -0700
Subject: [PATCH 0961/1703] feat(@angular/cli): add prompt on post install step

Only prompt the user on interactive terminals.
---
 .../angular/cli/bin/postinstall/analytics-prompt.js    | 10 ++++++++++
 .../cli/bin/{ => postinstall}/ng-update-message.js     |  2 +-
 packages/angular/cli/bin/postinstall/script.js         |  5 +++++
 packages/angular/cli/package.json                      |  2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 packages/angular/cli/bin/postinstall/analytics-prompt.js
 rename packages/angular/cli/bin/{ => postinstall}/ng-update-message.js (95%)
 create mode 100644 packages/angular/cli/bin/postinstall/script.js

diff --git a/packages/angular/cli/bin/postinstall/analytics-prompt.js b/packages/angular/cli/bin/postinstall/analytics-prompt.js
new file mode 100644
index 000000000000..a74aad0f5ab4
--- /dev/null
+++ b/packages/angular/cli/bin/postinstall/analytics-prompt.js
@@ -0,0 +1,10 @@
+'use strict';
+// This file is ES6 because it needs to be executed as is.
+
+try {
+  const analytics = require('../../models/analytics');
+
+  if (analytics.getGlobalAnalytics() === undefined) {
+    analytics.promptGlobalAnalytics(true);
+  }
+} catch (_) {}
diff --git a/packages/angular/cli/bin/ng-update-message.js b/packages/angular/cli/bin/postinstall/ng-update-message.js
similarity index 95%
rename from packages/angular/cli/bin/ng-update-message.js
rename to packages/angular/cli/bin/postinstall/ng-update-message.js
index 81e161911116..5e4742bdefd5 100755
--- a/packages/angular/cli/bin/ng-update-message.js
+++ b/packages/angular/cli/bin/postinstall/ng-update-message.js
@@ -1,5 +1,5 @@
-#!/usr/bin/env node
 'use strict';
+// This file is ES6 because it needs to be executed as is.
 
 // Check if the current directory contains '.angular-cli.json'. If it does, show a message to the user that they
 // should use the migration script.
diff --git a/packages/angular/cli/bin/postinstall/script.js b/packages/angular/cli/bin/postinstall/script.js
new file mode 100644
index 000000000000..676ede7b84c3
--- /dev/null
+++ b/packages/angular/cli/bin/postinstall/script.js
@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+'use strict';
+
+require('./ng-update-message');
+require('./analytics-prompt');
diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index b2bdb85060a8..52397e95097c 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -12,7 +12,7 @@
     "Angular CLI"
   ],
   "scripts": {
-    "postinstall": "node ./bin/ng-update-message.js"
+    "postinstall": "node ./bin/postinstall/script.js"
   },
   "repository": {
     "type": "git",

From 1cbd915c26fc0763d1daa6ee5da1bafc59817485 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 18 Mar 2019 16:40:57 -0700
Subject: [PATCH 0962/1703] feat(@angular/cli): add support for analytics
 command proper

To add/remove/prompt about the analytics configuration.
---
 packages/angular/cli/commands.json            |  1 +
 .../angular/cli/commands/analytics-impl.ts    | 96 +++++++++++++++++++
 packages/angular/cli/commands/analytics.json  | 49 ++++++++++
 .../angular/cli/commands/definitions.json     |  9 +-
 .../angular/cli/models/schematic-command.ts   | 93 +++++++++++++-----
 5 files changed, 223 insertions(+), 25 deletions(-)
 create mode 100644 packages/angular/cli/commands/analytics-impl.ts
 create mode 100644 packages/angular/cli/commands/analytics.json

diff --git a/packages/angular/cli/commands.json b/packages/angular/cli/commands.json
index 142180ea7997..8d3849174445 100644
--- a/packages/angular/cli/commands.json
+++ b/packages/angular/cli/commands.json
@@ -1,5 +1,6 @@
 {
   "add": "./commands/add.json",
+  "analytics": "./commands/analytics.json",
   "build": "./commands/build.json",
   "config": "./commands/config.json",
   "doc": "./commands/doc.json",
diff --git a/packages/angular/cli/commands/analytics-impl.ts b/packages/angular/cli/commands/analytics-impl.ts
new file mode 100644
index 000000000000..98209f5207ab
--- /dev/null
+++ b/packages/angular/cli/commands/analytics-impl.ts
@@ -0,0 +1,96 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import {
+  promptGlobalAnalytics,
+  promptProjectAnalytics,
+  setAnalyticsConfig,
+} from '../models/analytics';
+import { Command } from '../models/command';
+import { Arguments } from '../models/interface';
+import { ProjectSetting, Schema as AnalyticsCommandSchema, SettingOrProject } from './analytics';
+
+
+export class AnalyticsCommand extends Command<AnalyticsCommandSchema> {
+  public async run(options: AnalyticsCommandSchema & Arguments) {
+    // Our parser does not support positional enums (won't report invalid parameters). Do the
+    // validation manually.
+    // TODO(hansl): fix parser to better support positionals. This would be a breaking change.
+    if (options.settingOrProject === undefined) {
+      if (options['--']) {
+        // The user passed positional arguments but they didn't validate.
+        this.logger.error(`Argument ${JSON.stringify(options['--'][0])} is invalid.`);
+        this.logger.error(`Please provide one of the following value: on, off, ci or project.`);
+
+        return 1;
+      } else {
+        // No argument were passed.
+        await this.printHelp(options);
+
+        return 2;
+      }
+    } else if (options.settingOrProject == SettingOrProject.Project
+               && options.projectSetting === undefined) {
+      this.logger.error(`Argument ${JSON.stringify(options.settingOrProject)} requires a second `
+                      + `argument of one of the following value: on, off.`);
+
+      return 2;
+    }
+
+    try {
+      switch (options.settingOrProject) {
+        case SettingOrProject.Off:
+          setAnalyticsConfig('global', false);
+          break;
+
+        case SettingOrProject.On:
+          setAnalyticsConfig('global', true);
+          break;
+
+        case SettingOrProject.Ci:
+          setAnalyticsConfig('global', 'ci');
+          break;
+
+        case SettingOrProject.Project:
+          switch (options.projectSetting) {
+            case ProjectSetting.Off:
+              setAnalyticsConfig('local', false);
+              break;
+
+            case ProjectSetting.On:
+              setAnalyticsConfig('local', true);
+              break;
+
+            case ProjectSetting.Prompt:
+              await promptProjectAnalytics(true);
+              break;
+
+            default:
+              await this.printHelp(options);
+
+              return 3;
+          }
+          break;
+
+        case SettingOrProject.Prompt:
+          await promptGlobalAnalytics(true);
+          break;
+
+        default:
+          await this.printHelp(options);
+
+          return 4;
+      }
+    } catch (err) {
+      this.logger.fatal(err.message);
+
+      return 1;
+    }
+
+    return 0;
+  }
+}
diff --git a/packages/angular/cli/commands/analytics.json b/packages/angular/cli/commands/analytics.json
new file mode 100644
index 000000000000..cb973d0ce9f7
--- /dev/null
+++ b/packages/angular/cli/commands/analytics.json
@@ -0,0 +1,49 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "ng-cli://commands/analytics.json",
+  "description": "Configures usage metric gathering for the Angular CLI. See http://angular.io/MORE_INFO_HERE",
+  "$longDescription": "",
+
+  "$aliases": [],
+  "$scope": "all",
+  "$type": "native",
+  "$impl": "./analytics-impl#AnalyticsCommand",
+
+  "type": "object",
+  "allOf": [
+    {
+      "properties": {
+        "settingOrProject": {
+          "enum": [
+            "on",
+            "off",
+            "ci",
+            "project",
+            "prompt"
+          ],
+          "description": ".",
+          "$default": {
+            "$source": "argv",
+            "index": 0
+          }
+        },
+        "projectSetting": {
+          "enum": [
+            "on",
+            "off",
+            "prompt"
+          ],
+          "description": ".",
+          "$default": {
+            "$source": "argv",
+            "index": 1
+          }
+        }
+      },
+      "required": [
+        "settingOrProject"
+      ]
+    },
+    { "$ref": "./definitions.json#/definitions/base" }
+  ]
+}
diff --git a/packages/angular/cli/commands/definitions.json b/packages/angular/cli/commands/definitions.json
index 6c6f6f0b90a6..e46eca429b33 100644
--- a/packages/angular/cli/commands/definitions.json
+++ b/packages/angular/cli/commands/definitions.json
@@ -42,13 +42,15 @@
           "type": "boolean",
           "default": false,
           "aliases": [ "d" ],
-          "description": "When true, runs through and reports activity without writing out results."
+          "description": "When true, runs through and reports activity without writing out results.",
+          "x-user-analytics": 1
         },
         "force": {
           "type": "boolean",
           "default": false,
           "aliases": [ "f" ],
-          "description": "When true, forces overwriting of existing files."
+          "description": "When true, forces overwriting of existing files.",
+          "x-user-analytics": 2
         }
       }
     },
@@ -57,7 +59,8 @@
         "interactive": {
           "type": "boolean",
           "default": "true",
-          "description": "When false, disables interactive input prompts."
+          "description": "When false, disables interactive input prompts.",
+          "x-user-analytics": 3
         },
         "defaults": {
           "type": "boolean",
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index 63c8b29319ea..4f04d9654018 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {
+  analytics,
   experimental,
   json,
   logging,
@@ -17,20 +18,11 @@ import {
   virtualFs,
 } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
-import {
-  DryRunEvent,
-  Engine,
-  SchematicEngine,
-  UnsuccessfulWorkflowExecution,
-  workflow,
-} from '@angular-devkit/schematics';
+import { DryRunEvent, UnsuccessfulWorkflowExecution, workflow } from '@angular-devkit/schematics';
 import {
   FileSystemCollection,
-  FileSystemCollectionDesc,
-  FileSystemEngineHostBase,
+  FileSystemEngine,
   FileSystemSchematic,
-  FileSystemSchematicDesc,
-  NodeModulesEngineHost,
   NodeWorkflow,
   validateOptionsWithSchema,
 } from '@angular-devkit/schematics/tools';
@@ -50,6 +42,12 @@ import { Arguments, CommandContext, CommandDescription, Option } from './interfa
 import { parseArguments, parseFreeFormArguments } from './parser';
 
 
+export const schematicsAnalyticsWhitelist = [
+  '@schematics/angular',
+  '@schematics/update',
+];
+
+
 export interface BaseSchematicSchema {
   debug?: boolean;
   dryRun?: boolean;
@@ -80,8 +78,7 @@ export abstract class SchematicCommand<
   readonly allowAdditionalArgs: boolean = false;
   private _host = new NodeJsSyncHost();
   private _workspace: experimental.workspace.Workspace;
-  private readonly _engine: Engine<FileSystemCollectionDesc, FileSystemSchematicDesc>;
-  protected _workflow: workflow.BaseWorkflow;
+  protected _workflow: NodeWorkflow;
 
   protected collectionName = '@schematics/angular';
   protected schematicName?: string;
@@ -90,10 +87,8 @@ export abstract class SchematicCommand<
     context: CommandContext,
     description: CommandDescription,
     logger: logging.Logger,
-    private readonly _engineHost: FileSystemEngineHostBase = new NodeModulesEngineHost(),
   ) {
     super(context, description, logger);
-    this._engine = new SchematicEngine(this._engineHost);
   }
 
   public async initialize(options: T & Arguments) {
@@ -110,6 +105,15 @@ export abstract class SchematicCommand<
       );
 
       this.description.options.push(...options.filter(x => !x.hidden));
+
+      // Remove any user analytics from schematics that are NOT part of our whitelist.
+      for (const o of this.description.options) {
+        if (o.userAnalytics) {
+          if (!schematicsAnalyticsWhitelist.includes(this.collectionName)) {
+            o.userAnalytics = undefined;
+          }
+        }
+      }
     }
   }
 
@@ -198,12 +202,8 @@ export abstract class SchematicCommand<
     }
   }
 
-  protected getEngineHost() {
-    return this._engineHost;
-  }
-  protected getEngine():
-      Engine<FileSystemCollectionDesc, FileSystemSchematicDesc> {
-    return this._engine;
+  protected getEngine(): FileSystemEngine {
+    return this._workflow.engine;
   }
 
   protected getCollection(collectionName: string): FileSystemCollection {
@@ -260,8 +260,57 @@ export abstract class SchematicCommand<
           root: normalize(this.workspace.root),
         },
     );
+    workflow.engineHost.registerContextTransform(context => {
+      // This is run by ALL schematics, so if someone uses `externalSchematics(...)` which
+      // is whitelisted, it would move to the right analytics (even if their own isn't).
+      const collectionName: string = context.schematic.collection.description.name;
+      if (schematicsAnalyticsWhitelist.includes(collectionName)) {
+        return {
+          ...context,
+          analytics: this.analytics,
+        };
+      } else {
+        return {
+          ...context,
+          analytics: new analytics.NoopAnalytics(),
+        };
+      }
+    });
 
-    this._engineHost.registerOptionsTransform(validateOptionsWithSchema(workflow.registry));
+    workflow.engineHost.registerOptionsTransform(validateOptionsWithSchema(workflow.registry));
+
+    // This needs to be the last transform as it reports the flags to analytics (if enabled).
+    workflow.engineHost.registerOptionsTransform(async (
+      schematic,
+      options: { [prop: string]: number | string },
+      context,
+    ): Promise<{ [prop: string]: number | string }> => {
+      const analytics = context && context.analytics;
+      if (!schematic.schemaJson || !context || !analytics) {
+        return options;
+      }
+
+      const collectionName = context.schematic.collection.description.name;
+      const schematicName = context.schematic.description.name;
+
+      if (!schematicsAnalyticsWhitelist.includes(collectionName)) {
+        return options;
+      }
+
+      const args = await parseJsonSchemaToOptions(this._workflow.registry, schematic.schemaJson);
+      const dimensions: (boolean | number | string)[] = [];
+      for (const option of args) {
+        const ua = option.userAnalytics;
+
+        if (option.name in options && ua) {
+          dimensions[ua] = options[option.name];
+        }
+      }
+
+      analytics.event('schematics', collectionName + ':' + schematicName, { dimensions });
+
+      return options;
+    });
 
     if (options.defaults) {
       workflow.registry.addPreTransform(schema.transforms.addUndefinedDefaults);

From 2e58fb33caca848eb628ad477eab26a8f450566c Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 18 Mar 2019 16:43:10 -0700
Subject: [PATCH 0963/1703] feat(@angular/cli): add custom implementation for
 analytics for commands

Some commands (like schematics) need to have custom reporting for
analytics. Schematics and Architect commands need to verify if the
schematic/architect builder run is in the safelist, for example.
---
 packages/angular/cli/BUILD                    | 13 +++++++++
 packages/angular/cli/commands/add-impl.ts     | 19 +++++++++++++
 packages/angular/cli/commands/build-impl.ts   | 14 ++++++++++
 packages/angular/cli/commands/config-impl.ts  |  3 +++
 .../angular/cli/commands/generate-impl.ts     | 16 +++++++++++
 packages/angular/cli/commands/serve-impl.ts   | 15 +++++++++++
 packages/angular/cli/models/analytics.ts      | 27 ++++++++++++++++---
 .../angular/cli/models/architect-command.ts   | 10 +++++++
 .../angular/cli/models/schematic-command.ts   | 17 +++++-------
 9 files changed, 120 insertions(+), 14 deletions(-)

diff --git a/packages/angular/cli/BUILD b/packages/angular/cli/BUILD
index 5b1a04ff0ed4..abe04df02969 100644
--- a/packages/angular/cli/BUILD
+++ b/packages/angular/cli/BUILD
@@ -30,9 +30,13 @@ ts_library(
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:tools",
         # @typings: es2017.object
+        "@npm//@types/debug",
+        "@npm//debug",
         "@npm//@types/node",
         "@npm//@types/inquirer",
         "@npm//@types/semver",
+        "@npm//@types/universal-analytics",
+        "@npm//@types/uuid",
         "@npm//rxjs",
     ],
 )
@@ -42,6 +46,7 @@ ts_library(
     srcs = [],
     deps = [
         ":add_schema",
+        ":analytics_schema",
         ":build_schema",
         ":config_schema",
         ":deprecated_schema",
@@ -61,6 +66,14 @@ ts_library(
     ],
 )
 
+ts_json_schema(
+    name = "analytics_schema",
+    src = "commands/analytics.json",
+    data = [
+        "commands/definitions.json",
+    ],
+)
+
 ts_json_schema(
     name = "add_schema",
     src = "commands/add.json",
diff --git a/packages/angular/cli/commands/add-impl.ts b/packages/angular/cli/commands/add-impl.ts
index 42c1b5b09c3f..27b5a8df4818 100644
--- a/packages/angular/cli/commands/add-impl.ts
+++ b/packages/angular/cli/commands/add-impl.ts
@@ -10,6 +10,7 @@ import { ModuleNotFoundException, resolve } from '@angular-devkit/core/node';
 import { NodePackageDoesNotSupportSchematics } from '@angular-devkit/schematics/tools';
 import { dirname } from 'path';
 import { intersects, prerelease, rcompare, satisfies, valid, validRange } from 'semver';
+import { AnalyticsDimensions, isPackageNameSafeForAnalytics } from '../models/analytics';
 import { Arguments } from '../models/interface';
 import { SchematicCommand } from '../models/schematic-command';
 import npmInstall from '../tasks/npm-install';
@@ -139,6 +140,24 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
     return this.executeSchematic(collectionName, options['--']);
   }
 
+  async reportAnalytics(
+    paths: string[],
+    options: AddCommandSchema & Arguments,
+    dimensions: (boolean | number | string)[] = [],
+    metrics: (boolean | number | string)[] = [],
+  ): Promise<void> {
+    const collection = options.collection;
+
+    // Add the collection if it's safe listed.
+    if (collection && isPackageNameSafeForAnalytics(collection)) {
+      dimensions[AnalyticsDimensions.NgAddCollection] = collection;
+    } else {
+      delete dimensions[AnalyticsDimensions.NgAddCollection];
+    }
+
+    return super.reportAnalytics(paths, options, dimensions, metrics);
+  }
+
   private isPackageInstalled(name: string): boolean {
     try {
       resolve(name, {
diff --git a/packages/angular/cli/commands/build-impl.ts b/packages/angular/cli/commands/build-impl.ts
index 0934c55e2961..962e766db1be 100644
--- a/packages/angular/cli/commands/build-impl.ts
+++ b/packages/angular/cli/commands/build-impl.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import { AnalyticsDimensions } from '../models/analytics';
 import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
 import { Arguments } from '../models/interface';
 import { Version } from '../upgrade/version';
@@ -20,4 +21,17 @@ export class BuildCommand extends ArchitectCommand<BuildCommandSchema> {
 
     return this.runArchitectTarget(options);
   }
+
+  async reportAnalytics(
+    paths: string[],
+    options: BuildCommandSchema & Arguments,
+    dimensions: (boolean | number | string)[] = [],
+    metrics: (boolean | number | string)[] = [],
+  ): Promise<void> {
+    if (options.buildEventLog !== undefined) {
+      dimensions[AnalyticsDimensions.NgBuildBuildEventLog] = true;
+    }
+
+    return super.reportAnalytics(paths, options, dimensions, metrics);
+  }
 }
diff --git a/packages/angular/cli/commands/config-impl.ts b/packages/angular/cli/commands/config-impl.ts
index 4a7cca9a36c7..abc1a5464c9b 100644
--- a/packages/angular/cli/commands/config-impl.ts
+++ b/packages/angular/cli/commands/config-impl.ts
@@ -32,6 +32,9 @@ const validCliPaths = new Map([
   ['cli.warnings.versionMismatch', 'boolean'],
   ['cli.defaultCollection', 'string'],
   ['cli.packageManager', 'string'],
+  ['cli.analytics', 'string'],
+  ['cli.analyticsSharing.tracking', 'string'],
+  ['cli.analyticsSharing.uuid', 'string'],
 ]);
 
 /**
diff --git a/packages/angular/cli/commands/generate-impl.ts b/packages/angular/cli/commands/generate-impl.ts
index b47808a7e1f9..bf61016a4aa4 100644
--- a/packages/angular/cli/commands/generate-impl.ts
+++ b/packages/angular/cli/commands/generate-impl.ts
@@ -72,6 +72,22 @@ export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
     });
   }
 
+  async reportAnalytics(
+    paths: string[],
+    options: GenerateCommandSchema & Arguments,
+  ): Promise<void> {
+    const [collectionName, schematicName] = this.parseSchematicInfo(options);
+
+    if (!schematicName || !collectionName) {
+      return;
+    }
+
+    return super.reportAnalytics(
+      ['generate', collectionName.replace(/\//g, '_'), schematicName.replace(/\//g, '_')],
+      options,
+    );
+  }
+
   private parseSchematicInfo(options: { schematic?: string }): [string, string | undefined] {
     let collectionName = this.getDefaultSchematicCollection();
 
diff --git a/packages/angular/cli/commands/serve-impl.ts b/packages/angular/cli/commands/serve-impl.ts
index d27bd7d5aa03..337d45a4aff6 100644
--- a/packages/angular/cli/commands/serve-impl.ts
+++ b/packages/angular/cli/commands/serve-impl.ts
@@ -6,9 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import { AnalyticsDimensions } from '../models/analytics';
 import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
 import { Arguments } from '../models/interface';
 import { Version } from '../upgrade/version';
+import { Schema as BuildCommandSchema } from './build';
 import { Schema as ServeCommandSchema } from './serve';
 
 export class ServeCommand extends ArchitectCommand<ServeCommandSchema> {
@@ -24,4 +26,17 @@ export class ServeCommand extends ArchitectCommand<ServeCommandSchema> {
   public async run(options: ArchitectCommandOptions & Arguments) {
     return this.runArchitectTarget(options);
   }
+
+  async reportAnalytics(
+    paths: string[],
+    options: BuildCommandSchema & Arguments,
+    dimensions: (boolean | number | string)[] = [],
+    metrics: (boolean | number | string)[] = [],
+  ): Promise<void> {
+    if (options.buildEventLog !== undefined) {
+      dimensions[AnalyticsDimensions.NgBuildBuildEventLog] = true;
+    }
+
+    return super.reportAnalytics(paths, options, dimensions, metrics);
+  }
 }
diff --git a/packages/angular/cli/models/analytics.ts b/packages/angular/cli/models/analytics.ts
index b1521613fc53..a70b20a49893 100644
--- a/packages/angular/cli/models/analytics.ts
+++ b/packages/angular/cli/models/analytics.ts
@@ -21,8 +21,29 @@ const analyticsLogDebug = debug('ng:analytics:log');  // Actual logs of events.
 
 const BYTES_PER_MEGABYTES = 1024 * 1024;
 
-
 /**
+ * This is the ultimate safelist for checking if a package name is safe to report to analytics.
+ */
+export const analyticsPackageSafelist = [
+  /^@angular\//,
+  /^@angular-devkit\//,
+  /^@ngtools\//,
+  '@schematics/angular',
+  '@schematics/schematics',
+  '@schematics/update',
+];
+
+export function isPackageNameSafeForAnalytics(name: string) {
+  return analyticsPackageSafelist.some(pattern => {
+    if (typeof pattern == 'string') {
+      return pattern === name;
+    } else {
+      return pattern.test(name);
+    }
+  });
+}
+
+  /**
  * MAKE SURE TO KEEP THIS IN SYNC WITH THE TABLE AND CONTENT IN `/docs/design/analytics.md`.
  * WE LIST THOSE DIMENSIONS (AND MORE).
  */
@@ -354,7 +375,7 @@ export async function promptGlobalAnalytics(force = false) {
 
           Would you like to share anonymous usage data with the Angular Team at Google under
           Google’s Privacy Policy at https://policies.google.com/privacy? For more details and
-          how to change this setting, see http://angular.io/usage/.
+          how to change this setting, see http://angular.io/analytics.
         `,
         default: false,
       },
@@ -402,7 +423,7 @@ export async function promptProjectAnalytics(force = false): Promise<boolean> {
 
           Would you like to share anonymous usage data about this project with the Angular Team at
           Google under Google’s Privacy Policy at https://policies.google.com/privacy? For more
-          details and how to change this setting, see http://angular.io/usage.
+          details and how to change this setting, see http://angular.io/analytics.
 
         `,
         default: false,
diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index 36fa2afab0ca..12be1eba06c2 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -15,6 +15,7 @@ import { experimental, json, schema, tags } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { BepJsonWriter } from '../utilities/bep';
 import { parseJsonSchemaToOptions } from '../utilities/json-schema';
+import { isPackageNameSafeForAnalytics } from './analytics';
 import { BaseCommandOptions, Command } from './command';
 import { Arguments, Option } from './interface';
 import { parseArguments } from './parser';
@@ -165,6 +166,15 @@ export abstract class ArchitectCommand<
     this.description.options.push(...(
       await parseJsonSchemaToOptions(this._registry, builderDesc.schema)
     ));
+
+    // Update options to remove analytics from options if the builder isn't safelisted.
+    for (const o of this.description.options) {
+      if (o.userAnalytics) {
+        if (!isPackageNameSafeForAnalytics(builderDesc.name)) {
+          o.userAnalytics = undefined;
+        }
+      }
+    }
   }
 
   async run(options: ArchitectCommandOptions & Arguments) {
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index 4f04d9654018..90b133dc6dba 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -37,17 +37,12 @@ import {
 } from '../utilities/config';
 import { parseJsonSchemaToOptions } from '../utilities/json-schema';
 import { getPackageManager } from '../utilities/package-manager';
+import { isPackageNameSafeForAnalytics } from './analytics';
 import { BaseCommandOptions, Command } from './command';
 import { Arguments, CommandContext, CommandDescription, Option } from './interface';
 import { parseArguments, parseFreeFormArguments } from './parser';
 
 
-export const schematicsAnalyticsWhitelist = [
-  '@schematics/angular',
-  '@schematics/update',
-];
-
-
 export interface BaseSchematicSchema {
   debug?: boolean;
   dryRun?: boolean;
@@ -106,10 +101,10 @@ export abstract class SchematicCommand<
 
       this.description.options.push(...options.filter(x => !x.hidden));
 
-      // Remove any user analytics from schematics that are NOT part of our whitelist.
+      // Remove any user analytics from schematics that are NOT part of our safelist.
       for (const o of this.description.options) {
         if (o.userAnalytics) {
-          if (!schematicsAnalyticsWhitelist.includes(this.collectionName)) {
+          if (!isPackageNameSafeForAnalytics(this.collectionName)) {
             o.userAnalytics = undefined;
           }
         }
@@ -262,9 +257,9 @@ export abstract class SchematicCommand<
     );
     workflow.engineHost.registerContextTransform(context => {
       // This is run by ALL schematics, so if someone uses `externalSchematics(...)` which
-      // is whitelisted, it would move to the right analytics (even if their own isn't).
+      // is safelisted, it would move to the right analytics (even if their own isn't).
       const collectionName: string = context.schematic.collection.description.name;
-      if (schematicsAnalyticsWhitelist.includes(collectionName)) {
+      if (isPackageNameSafeForAnalytics(collectionName)) {
         return {
           ...context,
           analytics: this.analytics,
@@ -293,7 +288,7 @@ export abstract class SchematicCommand<
       const collectionName = context.schematic.collection.description.name;
       const schematicName = context.schematic.description.name;
 
-      if (!schematicsAnalyticsWhitelist.includes(collectionName)) {
+      if (!isPackageNameSafeForAnalytics(collectionName)) {
         return options;
       }
 

From 2e9dc3d2528e40ab80a20f3c6f0a3433971fc72d Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 18 Mar 2019 16:44:50 -0700
Subject: [PATCH 0964/1703] docs: add analytics dimensions for schematics flags
 and internal doc

The analytics.md should be kept up to date with the flags.
---
 docs/design/analytics.md                      | 110 ++++++++++++++++++
 .../build_angular/src/browser/schema.json     |   2 +
 .../build_angular/src/dev-server/schema.json  |   4 +-
 .../build_angular/src/server/schema.json      |   1 +
 .../angular/application/schema.json           |  30 +++--
 packages/schematics/angular/class/schema.json |   6 +-
 .../schematics/angular/component/schema.json  |  27 +++--
 .../schematics/angular/directive/schema.json  |  14 ++-
 packages/schematics/angular/enum/schema.json  |   3 +-
 packages/schematics/angular/guard/schema.json |   6 +-
 .../schematics/angular/interface/schema.json  |   3 +-
 .../schematics/angular/library/schema.json    |   9 +-
 .../schematics/angular/module/schema.json     |   6 +-
 .../schematics/angular/ng-new/schema.json     |  24 ++--
 packages/schematics/angular/pipe/schema.json  |  12 +-
 .../schematics/angular/service/schema.json    |   6 +-
 .../schematics/angular/universal/schema.json  |   3 +-
 .../schematics/angular/workspace/schema.json  |   6 +-
 18 files changed, 219 insertions(+), 53 deletions(-)
 create mode 100644 docs/design/analytics.md

diff --git a/docs/design/analytics.md b/docs/design/analytics.md
new file mode 100644
index 000000000000..55ca95369bc1
--- /dev/null
+++ b/docs/design/analytics.md
@@ -0,0 +1,110 @@
+# Usage Metrics Gathering
+This document list exactly what is gathered and how.
+
+Any change to analytics should most probably include a change to this document.
+
+# Pageview
+Each command creates a pageview with the path `/command/${commandName}/${subcommandName}`. IE.
+`ng generate component my-component --dryRun` would create a page view with the path
+`/command/generate/@schematics_angular/component`.
+
+Additionally, only the Architect configuration of `default`, `production` and `staging` will be
+logged. The project name will be removed, and if the configuration is different than the three
+basic ones, it will be replaced with `_`. 
+The command `ng run some-project:lint:some-configuration` will create a page view with the path
+`/command/run/_:lint:_`. Configurations are only used when actually mentioned on the command
+line, thus the command `ng build some-project --prod` will create a page view of
+`/command/build/_:default` (with the `prod` flag), while `ng build some-project:some-conf` will log
+`/command/build/_:_`.
+
+# Dimensions
+Google Analytics Custom Dimensions are used to track flag values. These dimensions are aggregated
+automatically on the backend.
+
+One dimension per flag, and although technically there can be an overlap between 2 commands, for
+simplicity it should remain unique across all CLI commands. These are numbers added to our own
+`schema.json` files. Dimensions are not to be used for anything else.
+
+To create a new dimension (tracking a new flag):
+
+1. Create the dimension on analytics.google.com first. Dimensions are not tracked if they aren't
+   defined on GA.
+1. Use the ID of the dimension as the `x-user-analytics` value in the `schema.json` file.
+1. Add a new row to the table below in the same PR as the one adding the dimension to the code.
+1. New dimensions PRs need to be approved by [bradgreen@google.com](mailto:bradgreen@google.com),
+   [stephenfluin@google.com](mailto:stephenfluin@google.com) and
+   [iminar@google.com](mailto:iminar@google.com). **This is not negotiable.**
+
+**DO NOT ADD `x-user-analytics` FOR VALUES THAT ARE USER IDENTIFIABLE (PII), FOR EXAMPLE A
+PROJECT NAME TO BUILD OR A MODULE NAME.**
+
+Note: There's a limit of 20 custom dimensions.
+
+### List Of All Dimensions
+| Id | Category | Flag | Type | File / Description |
+|:---:|:---|:---|:---|---:|
+| 1 | `generate`, `new` | `--dryRun`      | `Boolean` | |
+| 2 | `generate`, `new` | `--force`       | `Boolean` | |
+| 3 | `generate`, `new` | `--interactive` | `Boolean` | |
+| 4 | `generate` | `--skipInstall` | `Boolean` | |
+| 5 | `generate` | `--style` | `String` | |
+| 6 | `add` | `--collection` | `String` | Only for packages that we control (see safelist in `add-impl.ts`). |
+| 7 | `build`, `serve` | `--buildEventLog` | `Boolean` | If the flag was used (does not report its value). See `build-impl.ts`. |
+| 8 | `generate`, `new` | `--enableIvy` | `Boolean` | |
+| 9 | `generate` | `--inlineStyle` | `Boolean` | |
+| 10 | `generate` | `--inlineTemplate` | `Boolean` | |
+| 11 | `generate` | `--viewEncapsulation` | `String` | |
+| 12 | `generate` | `--skipTests` | `Boolean` | |
+| 13 | `build` | `--aot` | `Boolean` | |
+| 14 | `generate` | `--minimal` | `Boolean` | |
+| 15 | `generate` | `--lintFix` | `Boolean` | |
+| 16 | `build` | `--optimization` | `Boolean` | |
+| 17 | `generate` | `--routing` | `Boolean` | |
+| 18 | `generate` | `--skipImport` | `Boolean` | |
+| 19 | `generate` | `--export` | `Boolean` | |
+| 20 | `generate` | `--entryComponent` | `Boolean` | |
+
+# Metrics
+
+### List of All Metrics
+| Id  | Type | Description |
+|:---:|:-----|-------------|
+| 1 | `Number` | CPU count |
+| 2 | `Number` | Average CPU speed |
+| 3 | `Number` | RAM Count |
+| 4 | `Number` | Node Version (Major.Minor) |
+
+# Operating System and Node Version
+A User Agent string is built to "fool" Google Analytics into reading the Operating System and
+version fields from it. The base dimensions are used for those.
+
+# Debugging
+Using `DEBUG=universal-analytics` will report all calls to the universal-analytics library,
+including queuing events and sending them to the server.
+
+Using `DEBUG=ng:analytics` will report additional information regarding initialization and
+decisions made during the usage analytics process, e.g. if the user has analytics disabled.
+
+Using `DEBUG=ng:analytics:command` will show the decisions made by the command runner.
+
+Using `DEBUG=ng:analytics:log` will show what we actually send to GA.
+
+See [the `debug` NPM library](https://www.npmjs.com/package/debug) for more information.
+
+# Disabling Usage Analytics
+There are 2 ways of disabling usage analytics:
+
+1. using `ng analytics off` (or changing the global configuration file yourself). This is the same
+   as answering "No" to the prompt.
+1. There is an `NG_CLI_ANALYTICS` environment variable that overrides the global configuration.
+   That flag is a string that represents the User ID. If the string `"false"` is used it will
+   disable analytics for this run. If the string `"ci"` is used it will show up as a CI run (see
+   below).
+
+# CI
+A special user named `ci` is used for analytics for tracking CI information. This is a convention
+and is in no way enforced.
+
+Running on CI by default will disable analytics (because of a lack of TTY on STDIN/OUT). It can be
+manually enabled using either a global configuration with a value of `ci`, or using the
+`NG_CLI_ANALYTICS=ci` environment variable. 
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index b41463b643e2..e8c21c2406cb 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -58,6 +58,7 @@
     },
     "optimization": {
       "description": "Enables optimization of the build output.",
+      "x-user-analytics": 16,
       "oneOf": [
         {
           "type": "object",
@@ -100,6 +101,7 @@
     "aot": {
       "type": "boolean",
       "description": "Build using Ahead of Time compilation.",
+      "x-user-analytics": 13,
       "default": false
     },
     "sourceMap": {
diff --git a/packages/angular_devkit/build_angular/src/dev-server/schema.json b/packages/angular_devkit/build_angular/src/dev-server/schema.json
index dab2c658acd4..2257fd4cecc1 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/schema.json
+++ b/packages/angular_devkit/build_angular/src/dev-server/schema.json
@@ -87,6 +87,7 @@
     },
     "optimization": {
       "description": "Enables optimization of the build output.",
+      "x-user-analytics": 16,
       "oneOf": [
         {
           "type": "object",
@@ -111,7 +112,8 @@
     },
     "aot": {
       "type": "boolean",
-      "description": "Build using Ahead of Time compilation."
+      "description": "Build using Ahead of Time compilation.",
+      "x-user-analytics": 13
     },
     "sourceMap": {
       "description": "Output sourcemaps.",
diff --git a/packages/angular_devkit/build_angular/src/server/schema.json b/packages/angular_devkit/build_angular/src/server/schema.json
index b4d4cb058c1c..5211b8db43e7 100644
--- a/packages/angular_devkit/build_angular/src/server/schema.json
+++ b/packages/angular_devkit/build_angular/src/server/schema.json
@@ -30,6 +30,7 @@
     },
     "optimization": {
       "description": "Enables optimization of the build output.",
+      "x-user-analytics": 16,
       "oneOf": [
         {
           "type": "object",
diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json
index 39fde448dcf3..c8eba6787b14 100644
--- a/packages/schematics/angular/application/schema.json
+++ b/packages/schematics/angular/application/schema.json
@@ -22,24 +22,28 @@
     "enableIvy": {
       "description": "EXPERIMENTAL: True to create a new app that uses the Ivy rendering engine.",
       "type": "boolean",
-      "default": false
+      "default": false,
+      "x-user-analytics": 8
     },
     "inlineStyle": {
       "description": "When true, includes styles inline in the root component.ts file. Only CSS styles can be included inline. Default is false, meaning that an external styles file is created and referenced in the root component.ts file.",
       "type": "boolean",
       "default": false,
-      "alias": "s"
+      "alias": "s",
+      "x-user-analytics": 9
     },
     "inlineTemplate": {
       "description": "When true, includes template inline in the root component.ts file. Default is false, meaning that an external template file is created and referenced in the root component.ts file. ",
       "type": "boolean",
       "default": false,
-      "alias": "t"
+      "alias": "t",
+      "x-user-analytics": 10
     },
     "viewEncapsulation": {
       "description": "The view encapsulation strategy to use in the new app.",
       "enum": ["Emulated", "Native", "None", "ShadowDom"],
-      "type": "string"
+      "type": "string",
+      "x-user-analytics": 11
     },
     "routing": {
       "type": "boolean",
@@ -63,33 +67,39 @@
         "sass",
         "less",
         "styl"
-      ]
+      ],
+      "x-user-analytics": 5
     },
     "skipTests": {
       "description": "When true, does not create \"spec.ts\" test files for the app.",
       "type": "boolean",
       "default": false,
-      "alias": "S"
+      "alias": "S",
+      "x-user-analytics": 12
     },
     "skipPackageJson": {
       "type": "boolean",
       "default": false,
-      "description": "When true, does not add dependencies to the \"package.json\" file."
+      "description": "When true, does not add dependencies to the \"package.json\" file.",
+      "x-user-analytics": 13
     },
     "minimal": {
       "description": "When true, creates a bare-bones project without any testing frameworks. (Use for learning purposes only.)",
       "type": "boolean",
-      "default": false
+      "default": false,
+      "x-user-analytics": 14
     },
     "skipInstall": {
       "description": "Skip installing dependency packages.",
       "type": "boolean",
-      "default": false
+      "default": false,
+      "x-user-analytics": 4
     },
     "lintFix": {
       "type": "boolean",
       "default": false,
-      "description": "When true, applies lint fixes after generating the application."
+      "description": "When true, applies lint fixes after generating the application.",
+      "x-user-analytics": 15
     }
   },
   "required": [
diff --git a/packages/schematics/angular/class/schema.json b/packages/schematics/angular/class/schema.json
index 9a6362070519..e57a09046e66 100644
--- a/packages/schematics/angular/class/schema.json
+++ b/packages/schematics/angular/class/schema.json
@@ -36,7 +36,8 @@
     "skipTests": {
       "type": "boolean",
       "description": "When true, does not create \"spec.ts\" test files for the new class.",
-      "default": false
+      "default": false,
+      "x-user-analytics": 12
     },
     "type": {
       "type": "string",
@@ -46,7 +47,8 @@
     "lintFix": {
       "type": "boolean",
       "default": false,
-      "description": "When true, applies lint fixes after generating the class."
+      "description": "When true, applies lint fixes after generating the class.",
+      "x-user-analytics": 15
     }
   },
   "required": [
diff --git a/packages/schematics/angular/component/schema.json b/packages/schematics/angular/component/schema.json
index 38edf1c884c4..6d21c3b0e2ee 100644
--- a/packages/schematics/angular/component/schema.json
+++ b/packages/schematics/angular/component/schema.json
@@ -31,19 +31,22 @@
       "description": "When true, includes styles inline in the component.ts file. Only CSS styles can be included inline. By default, an external styles file is created and referenced in the component.ts file.",
       "type": "boolean",
       "default": false,
-      "alias": "s"
+      "alias": "s",
+      "x-user-analytics": 9
     },
     "inlineTemplate": {
       "description": "When true, includes template inline in the component.ts file. By default, an external template file is created and referenced in the component.ts file.",
       "type": "boolean",
       "default": false,
-      "alias": "t"
+      "alias": "t",
+      "x-user-analytics": 10
     },
     "viewEncapsulation": {
       "description": "The view encapsulation strategy to use in the new component.",
       "enum": ["Emulated", "Native", "None", "ShadowDom"],
       "type": "string",
-      "alias": "v"
+      "alias": "v",
+      "x-user-analytics": 11
     },
     "changeDetection": {
       "description": "The change detection strategy to use in the new component.",
@@ -82,7 +85,8 @@
         "sass",
         "less",
         "styl"
-      ]
+      ],
+      "x-user-analytics": 5
     },
     "spec": {
       "type": "boolean",
@@ -93,7 +97,8 @@
     "skipTests": {
       "type": "boolean",
       "description": "When true, does not create \"spec.ts\" test files for the new component.",
-      "default": false
+      "default": false,
+      "x-user-analytics": 12
     },
     "flat": {
       "type": "boolean",
@@ -103,7 +108,8 @@
     "skipImport": {
       "type": "boolean",
       "description": "When true, does not import this component into the owning NgModule.",
-      "default": false
+      "default": false,
+      "x-user-analytics": 18
     },
     "selector": {
       "type": "string",
@@ -118,17 +124,20 @@
     "export": {
       "type": "boolean",
       "default": false,
-      "description": "When true, the declaring NgModule exports this component."
+      "description": "When true, the declaring NgModule exports this component.",
+      "x-user-analytics": 19
     },
     "entryComponent": {
       "type": "boolean",
       "default": false,
-      "description": "When true, the new component is the entry component of the declaring NgModule."
+      "description": "When true, the new component is the entry component of the declaring NgModule.",
+      "x-user-analytics": 20
     },
     "lintFix": {
       "type": "boolean",
       "default": false,
-      "description": "When true, applies lint fixes after generating the component."
+      "description": "When true, applies lint fixes after generating the component.",
+      "x-user-analytics": 15
     }
   },
   "required": [
diff --git a/packages/schematics/angular/directive/schema.json b/packages/schematics/angular/directive/schema.json
index bc5aa7605233..d2ea12577f69 100644
--- a/packages/schematics/angular/directive/schema.json
+++ b/packages/schematics/angular/directive/schema.json
@@ -50,12 +50,14 @@
     "skipTests": {
       "type": "boolean",
       "description": "When true, does not create \"spec.ts\" test files for the new class.",
-      "default": false
+      "default": false,
+      "x-user-analytics": 12
     },
     "skipImport": {
       "type": "boolean",
       "description": "When true, does not import this directive into the owning NgModule.",
-      "default": false
+      "default": false,
+      "x-user-analytics": 18
     },
     "selector": {
       "type": "string",
@@ -75,15 +77,17 @@
     "export": {
       "type": "boolean",
       "default": false,
-      "description": "When true, the declaring NgModule exports this directive."
+      "description": "When true, the declaring NgModule exports this directive.",
+      "x-user-analytics": 19
     },
     "lintFix": {
       "type": "boolean",
       "default": false,
-      "description": "When true, applies lint fixes after generating the directive."
+      "description": "When true, applies lint fixes after generating the directive.",
+      "x-user-analytics": 15
     }
   },
   "required": [
     "name"
   ]
-}
\ No newline at end of file
+}
diff --git a/packages/schematics/angular/enum/schema.json b/packages/schematics/angular/enum/schema.json
index 1399eacb6a04..71a44babfc6a 100644
--- a/packages/schematics/angular/enum/schema.json
+++ b/packages/schematics/angular/enum/schema.json
@@ -30,7 +30,8 @@
     "lintFix": {
       "type": "boolean",
       "default": false,
-      "description": "When true, applies lint fixes after generating the enum."
+      "description": "When true, applies lint fixes after generating the enum.",
+      "x-user-analytics": 15
     }
   },
   "required": [
diff --git a/packages/schematics/angular/guard/schema.json b/packages/schematics/angular/guard/schema.json
index 2ad3a42e9e66..660c5b80bac4 100644
--- a/packages/schematics/angular/guard/schema.json
+++ b/packages/schematics/angular/guard/schema.json
@@ -23,7 +23,8 @@
     "skipTests": {
       "type": "boolean",
       "description": "When true, does not create \"spec.ts\" test files for the new guard.",
-      "default": false
+      "default": false,
+      "x-user-analytics": 12
     },
     "flat": {
       "type": "boolean",
@@ -46,7 +47,8 @@
     "lintFix": {
       "type": "boolean",
       "default": false,
-      "description": "When true, applies lint fixes after generating the guard."
+      "description": "When true, applies lint fixes after generating the guard.",
+      "x-user-analytics": 15
     },
     "implements": {
       "type": "array",
diff --git a/packages/schematics/angular/interface/schema.json b/packages/schematics/angular/interface/schema.json
index 32bd0daaa21a..7d8d5ff7aea2 100644
--- a/packages/schematics/angular/interface/schema.json
+++ b/packages/schematics/angular/interface/schema.json
@@ -43,7 +43,8 @@
     "lintFix": {
       "type": "boolean",
       "default": false,
-      "description": "When true, applies lint fixes after generating the interface."
+      "description": "When true, applies lint fixes after generating the interface.",
+      "x-user-analytics": 15
     }
   },
   "required": [
diff --git a/packages/schematics/angular/library/schema.json b/packages/schematics/angular/library/schema.json
index d199c76eb893..e826508ed21e 100644
--- a/packages/schematics/angular/library/schema.json
+++ b/packages/schematics/angular/library/schema.json
@@ -31,12 +31,14 @@
     "skipPackageJson": {
       "type": "boolean",
       "default": false,
-      "description": "When true, does not add dependencies to the \"package.json\" file. "
+      "description": "When true, does not add dependencies to the \"package.json\" file. ",
+      "x-user-analytics": 13
     },
     "skipInstall": {
       "description": "When true, does not install dependency packages.",
       "type": "boolean",
-      "default": false
+      "default": false,
+      "x-user-analytics": 4
     },
     "skipTsConfig": {
       "type": "boolean",
@@ -46,7 +48,8 @@
     "lintFix": {
       "type": "boolean",
       "default": false,
-      "description": "When true, applies lint fixes after generating the library."
+      "description": "When true, applies lint fixes after generating the library.",
+      "x-user-analytics": 15
     }
   },
   "required": []
diff --git a/packages/schematics/angular/module/schema.json b/packages/schematics/angular/module/schema.json
index 5e5c1f608aac..1e046c3bcf88 100644
--- a/packages/schematics/angular/module/schema.json
+++ b/packages/schematics/angular/module/schema.json
@@ -30,7 +30,8 @@
     "routing": {
       "type": "boolean",
       "description": "When true, creates a routing module.",
-      "default": false
+      "default": false,
+      "x-user-analytics": 17
     },
     "routingScope": {
       "enum": ["Child", "Root"],
@@ -57,7 +58,8 @@
     "lintFix": {
       "type": "boolean",
       "default": false,
-      "description": "When true, applies lint fixes after generating the module."
+      "description": "When true, applies lint fixes after generating the module.",
+      "x-user-analytics": 15
     }
   },
   "required": [
diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
index 4a1d50478fec..fa80e955079d 100644
--- a/packages/schematics/angular/ng-new/schema.json
+++ b/packages/schematics/angular/ng-new/schema.json
@@ -26,7 +26,8 @@
     "skipInstall": {
       "description": "When true, does not install dependency packages.",
       "type": "boolean",
-      "default": false
+      "default": false,
+      "x-user-analytics": 4
     },
     "linkCli": {
       "description": "When true, links the CLI to the global version (internal development only).",
@@ -75,18 +76,21 @@
       "description": "When true, includes styles inline in the component TS file. By default, an external styles file is created and referenced in the component TS file.",
       "type": "boolean",
       "default": false,
-      "alias": "s"
+      "alias": "s",
+      "x-user-analytics": 9
     },
     "inlineTemplate": {
       "description": "When true, includes template inline in the component TS file. By default, an external template file is created and referenced in the component TS file.",
       "type": "boolean",
       "default": false,
-      "alias": "t"
+      "alias": "t",
+      "x-user-analytics": 10
     },
     "viewEncapsulation": {
       "description": "The view encapsulation strategy to use in the initial project.",
       "enum": ["Emulated", "Native", "None", "ShadowDom"],
-      "type": "string"
+      "type": "string",
+      "x-user-analytics": 11
     },
     "version": {
       "type": "string",
@@ -100,7 +104,8 @@
       "type": "boolean",
       "description": "When true, generates a routing module for the initial project.",
       "default": false,
-      "x-prompt": "Would you like to add Angular routing?"
+      "x-prompt": "Would you like to add Angular routing?",
+      "x-user-analytics": 17
     },
     "prefix": {
       "type": "string",
@@ -131,13 +136,15 @@
           { "value": "less", "label": "Less   [ http://lesscss.org                                                 ]" },
           { "value": "styl", "label": "Stylus [ http://stylus-lang.com                                             ] " }
         ]
-      }
+      },
+      "x-user-analytics": 5
     },
     "skipTests": {
       "description": "When true, does not generate \"spec.ts\" test files for the new project. ",
       "type": "boolean",
       "default": false,
-      "alias": "S"
+      "alias": "S",
+      "x-user-analytics": 12
     },
     "createApplication": {
       "description": "When true (the default), creates a new initial app project in the src folder of the new workspace. When false, creates an empty workspace with no initial app. You can then use the generate application command so that all apps are created in the projects folder.",
@@ -147,7 +154,8 @@
     "minimal": {
       "description": "When true, creates a project without any testing frameworks. (Use for learning purposes only.)",
       "type": "boolean",
-      "default": false
+      "default": false,
+      "x-user-analytics": 14
     }
   },
   "required": [
diff --git a/packages/schematics/angular/pipe/schema.json b/packages/schematics/angular/pipe/schema.json
index a3360265f937..5f65fffff113 100644
--- a/packages/schematics/angular/pipe/schema.json
+++ b/packages/schematics/angular/pipe/schema.json
@@ -41,12 +41,14 @@
     "skipTests": {
       "type": "boolean",
       "description": "When true, does not create \"spec.ts\" test files for the new pipe.",
-      "default": false
+      "default": false,
+      "x-user-analytics": 12
     },
     "skipImport": {
       "type": "boolean",
       "default": false,
-      "description": "When true, does not import this pipe into the owning NgModule."
+      "description": "When true, does not import this pipe into the owning NgModule.",
+      "x-user-analytics": 18
     },
     "module": {
       "type": "string",
@@ -56,12 +58,14 @@
     "export": {
       "type": "boolean",
       "default": false,
-      "description": "When true, the declaring NgModule exports this pipe."
+      "description": "When true, the declaring NgModule exports this pipe.",
+      "x-user-analytics": 19
     },
     "lintFix": {
       "type": "boolean",
       "default": false,
-      "description": "When true, applies lint fixes after generating the pipe."
+      "description": "When true, applies lint fixes after generating the pipe.",
+      "x-user-analytics": 15
     }
   },
   "required": [
diff --git a/packages/schematics/angular/service/schema.json b/packages/schematics/angular/service/schema.json
index 112ad32b8e56..2dce3449d997 100644
--- a/packages/schematics/angular/service/schema.json
+++ b/packages/schematics/angular/service/schema.json
@@ -41,12 +41,14 @@
     "skipTests": {
       "type": "boolean",
       "description": "When true, does not create \"spec.ts\" test files for the new service.",
-      "default": false
+      "default": false,
+      "x-user-analytics": 12
     },
     "lintFix": {
       "type": "boolean",
       "default": false,
-      "description": "When true, applies lint fixes after generating the pipe."
+      "description": "When true, applies lint fixes after generating the pipe.",
+      "x-user-analytics": 15
     }
   },
   "required": [
diff --git a/packages/schematics/angular/universal/schema.json b/packages/schematics/angular/universal/schema.json
index da5b760b9896..8beed998d756 100644
--- a/packages/schematics/angular/universal/schema.json
+++ b/packages/schematics/angular/universal/schema.json
@@ -57,7 +57,8 @@
     "skipInstall": {
       "description": "When true, does not install packages for dependencies.",
       "type": "boolean",
-      "default": false
+      "default": false,
+      "x-user-analytics": 4
     }
   },
   "required": [
diff --git a/packages/schematics/angular/workspace/schema.json b/packages/schematics/angular/workspace/schema.json
index be507a3581b3..007e097bbff3 100644
--- a/packages/schematics/angular/workspace/schema.json
+++ b/packages/schematics/angular/workspace/schema.json
@@ -21,7 +21,8 @@
     "skipInstall": {
       "description": "When true, does not install packages for dependencies.",
       "type": "boolean",
-      "default": false
+      "default": false,
+      "x-user-analytics": 4
     },
     "linkCli": {
       "description": "When true, links the CLI to the global version (internal development only).",
@@ -72,7 +73,8 @@
     "minimal": {
       "description": "When true, creates a workspace without any testing frameworks. (Use for learning purposes only.)",
       "type": "boolean",
-      "default": false
+      "default": false,
+      "x-user-analytics": 14
     }
   },
   "required": [

From 15032aa2e8dbf0cac6e65d117a87425f810a0770 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 18 Mar 2019 16:46:58 -0700
Subject: [PATCH 0965/1703] feat(@angular-devkit/schematics): add support for
 analytics

Schematics context now have an (optional) analytics field that, if set,
should be used to report usage. This can be set even in some cases where
analytics is disabled (to a noop analytics).
---
 .../schematics/src/_golden-api.d.ts           |  5 +++-
 .../schematics/tools/index.d.ts               | 11 ++++++--
 .../schematics/src/engine/interface.ts        |  5 +++-
 .../schematics/src/workflow/base.ts           | 10 +++++--
 .../schematics/tools/description.ts           |  6 ++++
 .../tools/file-system-engine-host-base.ts     | 28 ++++++++++++++-----
 .../tools/workflow/node-workflow.ts           | 13 +++++++--
 7 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/etc/api/angular_devkit/schematics/src/_golden-api.d.ts b/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
index 3123c58c5c65..f2b35fb764bc 100644
--- a/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
@@ -39,7 +39,7 @@ export declare type AsyncFileOperator = (tree: FileEntry) => Observable<FileEntr
 export declare abstract class BaseWorkflow implements Workflow {
     protected _context: WorkflowExecutionContext[];
     protected _dryRun: boolean;
-    protected _engine: SchematicEngine<{}, {}>;
+    protected _engine: Engine<{}, {}>;
     protected _engineHost: EngineHost<{}, {}>;
     protected _force: boolean;
     protected _host: virtualFs.Host;
@@ -47,6 +47,8 @@ export declare abstract class BaseWorkflow implements Workflow {
     protected _registry: schema.CoreSchemaRegistry;
     protected _reporter: Subject<DryRunEvent>;
     readonly context: Readonly<WorkflowExecutionContext>;
+    readonly engine: Engine<{}, {}>;
+    readonly engineHost: EngineHost<{}, {}>;
     readonly lifeCycle: Observable<LifeCycleEvent>;
     readonly registry: schema.SchemaRegistry;
     readonly reporter: Observable<DryRunEvent>;
@@ -556,6 +558,7 @@ export interface TreeConstructor {
 export declare const TreeSymbol: symbol;
 
 export interface TypedSchematicContext<CollectionMetadataT extends object, SchematicMetadataT extends object> {
+    readonly analytics?: analytics.Analytics;
     readonly debug: boolean;
     readonly engine: Engine<CollectionMetadataT, SchematicMetadataT>;
     readonly interactive: boolean;
diff --git a/etc/api/angular_devkit/schematics/tools/index.d.ts b/etc/api/angular_devkit/schematics/tools/index.d.ts
index ded2fac77a2b..9fc13dbca786 100644
--- a/etc/api/angular_devkit/schematics/tools/index.d.ts
+++ b/etc/api/angular_devkit/schematics/tools/index.d.ts
@@ -10,6 +10,8 @@ export declare class CollectionMissingSchematicsMapException extends BaseExcepti
     constructor(name: string);
 }
 
+export declare type ContextTransform = (context: FileSystemSchematicContext) => FileSystemSchematicContext;
+
 export declare class ExportStringRef<T> {
     readonly module: string;
     readonly path: string;
@@ -33,6 +35,8 @@ export interface FileSystemCollectionDescription {
     readonly version?: string;
 }
 
+export declare type FileSystemEngine = Engine<FileSystemCollectionDescription, FileSystemSchematicDescription>;
+
 export declare class FileSystemEngineHost extends FileSystemEngineHostBase {
     protected _root: string;
     constructor(_root: string);
@@ -47,7 +51,7 @@ export declare class FileSystemEngineHost extends FileSystemEngineHostBase {
     hasTaskExecutor(name: string): boolean;
 }
 
-export declare abstract class FileSystemEngineHostBase implements EngineHost<FileSystemCollectionDescription, FileSystemSchematicDescription> {
+export declare abstract class FileSystemEngineHostBase implements FileSystemEngineHost {
     protected abstract _resolveCollectionPath(name: string): string;
     protected abstract _resolveReferenceString(name: string, parentPath: string): {
         ref: RuleFactory<{}>;
@@ -63,6 +67,7 @@ export declare abstract class FileSystemEngineHostBase implements EngineHost<Fil
     hasTaskExecutor(name: string): boolean;
     listSchematicNames(collection: FileSystemCollectionDesc): string[];
     listSchematics(collection: FileSystemCollection): string[];
+    registerContextTransform(t: ContextTransform): void;
     registerOptionsTransform<T extends object, R extends object>(t: OptionTransform<T, R>): void;
     registerTaskExecutor<T>(factory: TaskExecutorFactory<T>, options?: T): void;
     transformContext(context: FileSystemSchematicContext): FileSystemSchematicContext;
@@ -123,6 +128,8 @@ export declare class NodePackageDoesNotSupportSchematics extends BaseException {
 }
 
 export declare class NodeWorkflow extends workflow.BaseWorkflow {
+    readonly engine: FileSystemEngine;
+    readonly engineHost: NodeModulesEngineHost;
     constructor(host: virtualFs.Host, options: {
         force?: boolean;
         dryRun?: boolean;
@@ -131,7 +138,7 @@ export declare class NodeWorkflow extends workflow.BaseWorkflow {
     });
 }
 
-export declare type OptionTransform<T extends object, R extends object> = (schematic: FileSystemSchematicDescription, options: T, context?: FileSystemSchematicContext) => Observable<R>;
+export declare type OptionTransform<T extends object, R extends object> = (schematic: FileSystemSchematicDescription, options: T, context?: FileSystemSchematicContext) => Observable<R> | PromiseLike<R> | R;
 
 export declare class SchematicMissingDescriptionException extends BaseException {
     constructor(name: string);
diff --git a/packages/angular_devkit/schematics/src/engine/interface.ts b/packages/angular_devkit/schematics/src/engine/interface.ts
index 41d1ec970c89..2ca66dbdffca 100644
--- a/packages/angular_devkit/schematics/src/engine/interface.ts
+++ b/packages/angular_devkit/schematics/src/engine/interface.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { logging } from '@angular-devkit/core';
+import { analytics, logging } from '@angular-devkit/core';
 import { Observable } from 'rxjs';
 import { Url } from 'url';
 import { FileEntry, MergeStrategy, Tree } from '../tree/interface';
@@ -192,6 +192,9 @@ export interface TypedSchematicContext<CollectionMetadataT extends object,
   readonly strategy: MergeStrategy;
   readonly interactive: boolean;
   addTask<T>(task: TaskConfigurationGenerator<T>, dependencies?: Array<TaskId>): TaskId;
+
+  // This might be undefined if the feature is unsupported.
+  readonly analytics?: analytics.Analytics;
 }
 
 
diff --git a/packages/angular_devkit/schematics/src/workflow/base.ts b/packages/angular_devkit/schematics/src/workflow/base.ts
index c1926f4a1505..8e2e1519865b 100644
--- a/packages/angular_devkit/schematics/src/workflow/base.ts
+++ b/packages/angular_devkit/schematics/src/workflow/base.ts
@@ -8,7 +8,7 @@
 import { logging, schema, virtualFs } from '@angular-devkit/core';
 import { EMPTY, Observable, Subject, concat, from, of, throwError } from 'rxjs';
 import { concatMap, defaultIfEmpty, ignoreElements, last, map, tap } from 'rxjs/operators';
-import { EngineHost, SchematicEngine } from '../engine';
+import { Engine, EngineHost, SchematicEngine } from '../engine';
 import { UnsuccessfulWorkflowExecution } from '../exception/exception';
 import { standardFormats } from '../formats';
 import { DryRunEvent, DryRunSink } from '../sink/dryrun';
@@ -46,7 +46,7 @@ export interface BaseWorkflowOptions {
  * @public
  */
 export abstract class BaseWorkflow implements Workflow {
-  protected _engine: SchematicEngine<{}, {}>;
+  protected _engine: Engine<{}, {}>;
   protected _engineHost: EngineHost<{}, {}>;
   protected _registry: schema.CoreSchemaRegistry;
 
@@ -87,6 +87,12 @@ export abstract class BaseWorkflow implements Workflow {
 
     return maybeContext;
   }
+  get engine(): Engine<{}, {}> {
+    return this._engine;
+  }
+  get engineHost(): EngineHost<{}, {}> {
+    return this._engineHost;
+  }
   get registry(): schema.SchemaRegistry {
     return this._registry;
   }
diff --git a/packages/angular_devkit/schematics/tools/description.ts b/packages/angular_devkit/schematics/tools/description.ts
index a6501af85375..b95ecab8f813 100644
--- a/packages/angular_devkit/schematics/tools/description.ts
+++ b/packages/angular_devkit/schematics/tools/description.ts
@@ -9,6 +9,8 @@ import { JsonObject } from '@angular-devkit/core';
 import {
   Collection,
   CollectionDescription,
+  Engine,
+  EngineHost,
   RuleFactory,
   Schematic,
   SchematicDescription,
@@ -44,6 +46,10 @@ export interface FileSystemSchematicDescription extends FileSystemSchematicJsonD
 /**
  * Used to simplify typings.
  */
+export declare type FileSystemEngine
+  = Engine<FileSystemCollectionDescription, FileSystemSchematicDescription>;
+export declare type FileSystemEngineHost
+  = EngineHost<FileSystemCollectionDescription, FileSystemSchematicDescription>;
 export declare type FileSystemCollection
   = Collection<FileSystemCollectionDescription, FileSystemSchematicDescription>;
 export declare type FileSystemSchematic
diff --git a/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts b/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts
index aae6da2f8dec..08705de9406e 100644
--- a/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts
+++ b/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts
@@ -11,17 +11,22 @@ import {
   JsonObject,
   UnexpectedEndOfInputException,
   isObservable,
+  isPromise,
   normalize,
   virtualFs,
 } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { existsSync, statSync } from 'fs';
 import { dirname, isAbsolute, join, resolve } from 'path';
-import { Observable, from as observableFrom, of as observableOf, throwError } from 'rxjs';
+import {
+  Observable,
+  from as observableFrom,
+  of as observableOf,
+  throwError,
+} from 'rxjs';
 import { mergeMap } from 'rxjs/operators';
 import { Url } from 'url';
 import {
-  EngineHost,
   HostCreateTree,
   RuleFactory,
   Source,
@@ -32,7 +37,7 @@ import {
 import {
   FileSystemCollection,
   FileSystemCollectionDesc,
-  FileSystemCollectionDescription,
+  FileSystemEngineHost,
   FileSystemSchematicContext,
   FileSystemSchematicDesc,
   FileSystemSchematicDescription,
@@ -45,7 +50,9 @@ export declare type OptionTransform<T extends object, R extends object>
       schematic: FileSystemSchematicDescription,
       options: T,
       context?: FileSystemSchematicContext,
-    ) => Observable<R>;
+    ) => Observable<R> | PromiseLike<R> | R;
+export declare type ContextTransform
+    = (context: FileSystemSchematicContext) => FileSystemSchematicContext;
 
 
 export class CollectionCannotBeResolvedException extends BaseException {
@@ -102,8 +109,7 @@ export class SchematicNameCollisionException extends BaseException {
  * A EngineHost base class that uses the file system to resolve collections. This is the base of
  * all other EngineHost provided by the tooling part of the Schematics library.
  */
-export abstract class FileSystemEngineHostBase implements
-    EngineHost<FileSystemCollectionDescription, FileSystemSchematicDescription> {
+export abstract class FileSystemEngineHostBase implements FileSystemEngineHost {
   protected abstract _resolveCollectionPath(name: string): string;
   protected abstract _resolveReferenceString(
       name: string, parentPath: string): { ref: RuleFactory<{}>, path: string } | null;
@@ -115,6 +121,7 @@ export abstract class FileSystemEngineHostBase implements
       desc: Partial<FileSystemSchematicDesc>): FileSystemSchematicDesc;
 
   private _transforms: OptionTransform<{}, {}>[] = [];
+  private _contextTransforms: ContextTransform[] = [];
   private _taskFactories = new Map<string, () => Observable<TaskExecutor>>();
 
   /**
@@ -148,6 +155,10 @@ export abstract class FileSystemEngineHostBase implements
     this._transforms.push(t);
   }
 
+  registerContextTransform(t: ContextTransform) {
+    this._contextTransforms.push(t);
+  }
+
   /**
    *
    * @param name
@@ -294,6 +305,8 @@ export abstract class FileSystemEngineHostBase implements
           const newOptions = tFn(schematic, opt, context);
           if (isObservable(newOptions)) {
             return newOptions;
+          } else if (isPromise(newOptions)) {
+            return observableFrom(newOptions);
           } else {
             return observableOf(newOptions);
           }
@@ -302,7 +315,8 @@ export abstract class FileSystemEngineHostBase implements
   }
 
   transformContext(context: FileSystemSchematicContext): FileSystemSchematicContext {
-    return context;
+    // tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
+    return this._contextTransforms.reduce((acc, curr) => curr(acc), context);
   }
 
   getSchematicRuleFactory<OptionT extends object>(
diff --git a/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts b/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts
index e1f507f5b268..8649e9712108 100644
--- a/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts
+++ b/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts
@@ -10,6 +10,7 @@ import {
   workflow,
 } from '@angular-devkit/schematics';  // tslint:disable-line:no-implicit-dependencies
 import { BuiltinTaskExecutor } from '../../tasks/node';
+import { FileSystemEngine } from '../description';
 import { NodeModulesEngineHost } from '../node-module-engine-host';
 import { validateOptionsWithSchema } from '../schema-option-transform';
 
@@ -28,15 +29,14 @@ export class NodeWorkflow extends workflow.BaseWorkflow {
   ) {
     const engineHost = new NodeModulesEngineHost();
     super({
-      host: host,
-      engineHost: engineHost,
+      host,
+      engineHost,
 
       force: options.force,
       dryRun: options.dryRun,
     });
 
     engineHost.registerOptionsTransform(validateOptionsWithSchema(this._registry));
-
     engineHost.registerTaskExecutor(
       BuiltinTaskExecutor.NodePackage,
       {
@@ -56,4 +56,11 @@ export class NodeWorkflow extends workflow.BaseWorkflow {
 
     this._context = [];
   }
+
+  get engine(): FileSystemEngine {
+    return this._engine as {} as FileSystemEngine;
+  }
+  get engineHost(): NodeModulesEngineHost {
+    return this._engineHost as NodeModulesEngineHost;
+  }
 }

From 0a1d4298ecac493a82174bd0c128ce7460da2c34 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 18 Mar 2019 16:59:14 -0700
Subject: [PATCH 0966/1703] build: remove DO_NOT_SUBMIT tags from messaging

This is conditional to https://github.com/angular/angular/pull/29382 being
submitted.
---
 packages/angular/cli/models/analytics.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/angular/cli/models/analytics.ts b/packages/angular/cli/models/analytics.ts
index a70b20a49893..1d46e4acae74 100644
--- a/packages/angular/cli/models/analytics.ts
+++ b/packages/angular/cli/models/analytics.ts
@@ -371,8 +371,6 @@ export async function promptGlobalAnalytics(force = false) {
         type: 'confirm',
         name: 'analytics',
         message: tags.stripIndents`
-          === MESSAGE TO BE FINALIZED ==== DO_NOT_SUBMIT
-
           Would you like to share anonymous usage data with the Angular Team at Google under
           Google’s Privacy Policy at https://policies.google.com/privacy? For more details and
           how to change this setting, see http://angular.io/analytics.
@@ -419,8 +417,6 @@ export async function promptProjectAnalytics(force = false): Promise<boolean> {
         type: 'confirm',
         name: 'analytics',
         message: tags.stripIndents`
-          === MESSAGE TO BE FINALIZED ==== DO_NOT_SUBMIT
-
           Would you like to share anonymous usage data about this project with the Angular Team at
           Google under Google’s Privacy Policy at https://policies.google.com/privacy? For more
           details and how to change this setting, see http://angular.io/analytics.
@@ -435,8 +431,6 @@ export async function promptProjectAnalytics(force = false): Promise<boolean> {
     if (answers.analytics) {
       console.log('');
       console.log(tags.stripIndent`
-        === MESSAGE TO BE FINALIZED ==== DO_NOT_SUBMIT
-
         Thank you for sharing anonymous usage data. Would you change your mind, the following
         command will disable this feature entirely:
 

From ce158990202428ae1d893787bcbcbfc763e99bb4 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 19 Mar 2019 19:33:22 +0100
Subject: [PATCH 0967/1703] feat(@angular-devkit/build-angular): use `sass`
 instead of `node-sass`

BREAKING CHANGE: we no longer use `node-sass` by default, instead we use `sass` (dart-sass).

While in most cases this should not have an impact the generated code, dart sass has some differences from Ruby Sass. See https://github.com/sass/dart-sass#behavioral-differences-from-ruby-sass for more details

If you wish to use `node-sass` instead of `sass` you need to install node-sass as a dev dependency.

npm users
```
npm install node-sass --save-dev
```

yarn users
```
yarn add node-sass --dev
```

**Note:** for larger Sass projects to avoid this performance hit you might want to install `fibers`. See: https://www.npmjs.com/package/fibers

Ref: TOOL-748
---
 .../angular_devkit/build_angular/package.json |  4 +--
 .../models/webpack-configs/styles.ts          | 12 +++----
 yarn.lock                                     | 32 ++++---------------
 3 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 424daaf35479..53be9bc2fd8d 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -34,6 +34,7 @@
     "postcss-loader": "3.0.0",
     "raw-loader": "1.0.0",
     "rxjs": "6.4.0",
+    "sass": "1.17.3",
     "sass-loader": "7.1.0",
     "semver": "5.6.0",
     "source-map-support": "0.5.11",
@@ -52,9 +53,6 @@
     "webpack-sources": "1.3.0",
     "webpack-subresource-integrity": "1.1.0-rc.6"
   },
-  "optionalDependencies": {
-    "node-sass": "4.11.0"
-  },
   "devDependencies": {
     "@angular/animations": "^8.0.0-beta.9",
     "@angular/cdk": "^7.3.4",
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
index c88f0386a2f6..b7e13bb67203 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
@@ -120,14 +120,14 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
     }
   }
 
-  let dartSass: {} | undefined;
+  let sassImplementation: {} | undefined;
+  let fiber: {} | undefined;
   try {
     // tslint:disable-next-line:no-implicit-dependencies
-    dartSass = require('sass');
-  } catch { }
+    sassImplementation = require('node-sass');
+  } catch {
+    sassImplementation = require('sass');
 
-  let fiber: {} | undefined;
-  if (dartSass) {
     try {
       // tslint:disable-next-line:no-implicit-dependencies
       fiber = require('fibers');
@@ -142,7 +142,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
       use: [{
         loader: 'sass-loader',
         options: {
-          implementation: dartSass,
+          implementation: sassImplementation,
           fiber,
           sourceMap: cssSourceMap,
           // bootstrap-sass requires a minimum precision of 8
diff --git a/yarn.lock b/yarn.lock
index 778c956ac8a8..5ffdb0fa5938 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6367,31 +6367,6 @@ node-sass-tilde-importer@^1.0.0:
   dependencies:
     find-parent-dir "^0.3.0"
 
-node-sass@4.11.0:
-  version "4.11.0"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a"
-  integrity sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==
-  dependencies:
-    async-foreach "^0.1.3"
-    chalk "^1.1.1"
-    cross-spawn "^3.0.0"
-    gaze "^1.0.0"
-    get-stdin "^4.0.1"
-    glob "^7.0.3"
-    in-publish "^2.0.0"
-    lodash.assign "^4.2.0"
-    lodash.clonedeep "^4.3.2"
-    lodash.mergewith "^4.6.0"
-    meow "^3.7.0"
-    mkdirp "^0.5.1"
-    nan "^2.10.0"
-    node-gyp "^3.8.0"
-    npmlog "^4.0.0"
-    request "^2.88.0"
-    sass-graph "^2.2.4"
-    stdout-stream "^1.4.0"
-    "true-case-path" "^1.0.2"
-
 node-sass@^4.9.3:
   version "4.9.4"
   resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.4.tgz#349bd7f1c89422ffe7e1e4b60f2055a69fbc5512"
@@ -8088,6 +8063,13 @@ sass-loader@7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
+sass@1.17.3:
+  version "1.17.3"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.17.3.tgz#19f9164cf8653b9fca670a64e53285272c96d192"
+  integrity sha512-S4vJawbrNUxJUBiHLXPYUKZCoO6cvq3/3ZFBV66a+PafTxcDEFJB+FHLDFl0P+rUfha/703ajEXMuGTYhJESkQ==
+  dependencies:
+    chokidar "^2.0.0"
+
 sauce-connect-launcher@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sauce-connect-launcher/-/sauce-connect-launcher-1.2.4.tgz#8d38f85242a9fbede1b2303b559f7e20c5609a1c"

From 778c5f5ff32ca239cf551be2528b354e6c606b0c Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Wed, 20 Mar 2019 06:53:33 +0100
Subject: [PATCH 0968/1703] test: update e2e for sass implementation

---
 .../e2e/tests/build/styles/{dart-sass.ts => node-sass.ts}   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 rename tests/legacy-cli/e2e/tests/build/styles/{dart-sass.ts => node-sass.ts} (93%)

diff --git a/tests/legacy-cli/e2e/tests/build/styles/dart-sass.ts b/tests/legacy-cli/e2e/tests/build/styles/node-sass.ts
similarity index 93%
rename from tests/legacy-cli/e2e/tests/build/styles/dart-sass.ts
rename to tests/legacy-cli/e2e/tests/build/styles/node-sass.ts
index 9bef49828c79..4c9d116a519f 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/dart-sass.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/node-sass.ts
@@ -29,10 +29,11 @@ export default async function () {
   await replaceInFile('src/app/app.component.ts', './app.component.css', './app.component.scss');
 
   await silentExec('rm', '-rf', 'node_modules/node-sass');
+  await silentExec('rm', '-rf', 'node_modules/sass');
   await expectToFail(() => ng('build', '--extract-css', '--source-map'));
 
-  await silentNpm('install', 'sass');
-  await silentExec('rm', '-rf', 'node_modules/node-sass');
+  await silentNpm('install', 'node-sass');
+  await silentExec('rm', '-rf', 'node_modules/sass');
   await ng('build', '--extract-css', '--source-map');
 
   await expectFileToMatch('dist/test-project/styles.css', /body\s*{\s*background-color: blue;\s*}/);
@@ -42,6 +43,7 @@ export default async function () {
 
   await silentNpm('install', 'node-gyp');
   await silentNpm('install', 'fibers');
+  await silentNpm('install', 'sass');
   await silentExec('rm', '-rf', 'node_modules/node-sass');
   await ng('build', '--extract-css', '--source-map');
 

From 54a6bee7c57e050c06ee58ef056a8d89865d2a6b Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 22 Mar 2019 13:25:34 +0100
Subject: [PATCH 0969/1703] feat(@angular-devkit/build-webpack): report emitted
 files

With this change the builder will report the emitted chunks and assets after the compilation, this is needed for deferential loading so that we can build an index from the outputs of multiple builds
---
 .../angular_devkit/build_webpack/src/index.ts |  2 +
 .../angular_devkit/build_webpack/src/utils.ts | 47 +++++++++++++++++++
 .../src/webpack-dev-server/index2.ts          | 12 +++--
 .../webpack-dev-server/index2_spec_large.ts   | 20 ++++++--
 .../build_webpack/src/webpack/index2.ts       | 13 +++--
 .../src/webpack/index2_spec_large.ts          | 39 +++++++++++++--
 6 files changed, 117 insertions(+), 16 deletions(-)
 create mode 100644 packages/angular_devkit/build_webpack/src/utils.ts

diff --git a/packages/angular_devkit/build_webpack/src/index.ts b/packages/angular_devkit/build_webpack/src/index.ts
index 83d323e5e308..457e3b2882dc 100644
--- a/packages/angular_devkit/build_webpack/src/index.ts
+++ b/packages/angular_devkit/build_webpack/src/index.ts
@@ -10,3 +10,5 @@ export * from './webpack';
 export * from './webpack-dev-server';
 
 export * from './plugins/architect';
+
+export { EmittedFiles } from './utils';
diff --git a/packages/angular_devkit/build_webpack/src/utils.ts b/packages/angular_devkit/build_webpack/src/utils.ts
new file mode 100644
index 000000000000..eee54f4be61c
--- /dev/null
+++ b/packages/angular_devkit/build_webpack/src/utils.ts
@@ -0,0 +1,47 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import * as webpack from 'webpack';
+
+export interface EmittedFiles {
+  name?: string;
+  file: string;
+  initial: boolean;
+  extension: string;
+}
+
+export function getEmittedFiles(compilation: webpack.compilation.Compilation): EmittedFiles[] {
+  const getExtension = (file: string) => file.split('.').reverse()[0];
+  const files: EmittedFiles[] = [];
+
+  for (const chunk of Object.values(compilation.chunks)) {
+    const entry: Partial<EmittedFiles> = {
+      name: chunk.name,
+      initial: chunk.isOnlyInitial(),
+    };
+
+    for (const file of chunk.files) {
+      files.push({ ...entry, file, extension: getExtension(file) } as EmittedFiles);
+    }
+  }
+
+  for (const file of Object.keys(compilation.assets)) {
+    if (files.some(e => e.file === file)) {
+      // skip as this already exists
+      continue;
+    }
+
+    files.push({
+      file,
+      extension: getExtension(file),
+      initial: false,
+    });
+  }
+
+  return files;
+}
diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2.ts b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2.ts
index 60e529a4fa7a..c3838f31dda6 100644
--- a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2.ts
@@ -13,13 +13,14 @@ import { switchMap } from 'rxjs/operators';
 import * as webpack from 'webpack';
 import * as WebpackDevServer from 'webpack-dev-server';
 import { ArchitectPlugin } from '../plugins/architect';
-import { WebpackFactory, WebpackLoggingCallback } from '../webpack/index2';
+import { getEmittedFiles } from '../utils';
+import { BuildResult, WebpackFactory, WebpackLoggingCallback } from '../webpack/index2';
 import { Schema as WebpackDevServerBuilderSchema } from './schema';
 
 const webpackMerge = require('webpack-merge');
 
 
-export type DevServerBuildOutput = BuilderOutput & {
+export type DevServerBuildOutput = BuildResult & {
   port: number;
   family: string;
   address: string;
@@ -33,7 +34,7 @@ export function runWebpackDevServer(
     logging?: WebpackLoggingCallback,
     webpackFactory?: WebpackFactory,
   } = {},
-): Observable<BuilderOutput> {
+): Observable<DevServerBuildOutput> {
   const createWebpack = options.webpackFactory || (config => of(webpack(config)));
   const log: WebpackLoggingCallback = options.logging
     || ((stats, config) => context.logger.info(stats.toString(config.stats)));
@@ -52,7 +53,7 @@ export function runWebpackDevServer(
   devServerConfig.stats = false;
 
   return createWebpack(config).pipe(
-    switchMap(webpackCompiler => new Observable<BuilderOutput>(obs => {
+    switchMap(webpackCompiler => new Observable<DevServerBuildOutput>(obs => {
       const server = new WebpackDevServer(webpackCompiler, devServerConfig);
       let result: DevServerBuildOutput;
 
@@ -62,8 +63,9 @@ export function runWebpackDevServer(
 
         obs.next({
           ...result,
+          emittedFiles: getEmittedFiles(stats.compilation),
           success: !stats.hasErrors(),
-        } as DevServerBuildOutput);
+        } as unknown as DevServerBuildOutput);
       });
 
       server.listen(
diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2_spec_large.ts b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2_spec_large.ts
index f91ea4e6777f..d0532f31bc3f 100644
--- a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2_spec_large.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2_spec_large.ts
@@ -7,7 +7,7 @@
  */
 import { Architect } from '@angular-devkit/architect/src/index2';
 import { TestingArchitectHost } from '@angular-devkit/architect/testing/index2';
-import { experimental, join, normalize, schema } from '@angular-devkit/core';
+import { experimental, normalize, schema } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as fs from 'fs';
 import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
@@ -15,7 +15,7 @@ import * as path from 'path';
 import { WorkspaceNodeModulesArchitectHost } from '../../../architect/node';
 import { DevServerBuildOutput } from './index2';
 
-const devkitRoot = normalize((global as any)._DevKitRoot); // tslint:disable-line:no-any
+const devkitRoot = (global as any)._DevKitRoot; // tslint:disable-line:no-any
 
 
 describe('Dev Server Builder', () => {
@@ -42,7 +42,7 @@ describe('Dev Server Builder', () => {
   }
 
   beforeEach(async () => {
-    await createArchitect(join(devkitRoot, 'tests/angular_devkit/build_webpack/basic-app/'));
+    await createArchitect(path.join(devkitRoot, 'tests/angular_devkit/build_webpack/basic-app/'));
   });
 
   it('works', async () => {
@@ -55,4 +55,18 @@ describe('Dev Server Builder', () => {
 
     await run.stop();
   }, 30000);
+
+  it('works and returns emitted files', async () => {
+    const run = await architect.scheduleTarget(webpackTargetSpec);
+    const output = await run.result as DevServerBuildOutput;
+
+    expect(output.success).toBe(true);
+    expect(output.emittedFiles).toContain({
+      name: 'main',
+      initial: true,
+      file: 'bundle.js',
+      extension: 'js',
+    });
+    await run.stop();
+  }, 30000);
 });
diff --git a/packages/angular_devkit/build_webpack/src/webpack/index2.ts b/packages/angular_devkit/build_webpack/src/webpack/index2.ts
index 0bdd78c930f0..a77b9a9a6188 100644
--- a/packages/angular_devkit/build_webpack/src/webpack/index2.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack/index2.ts
@@ -11,6 +11,7 @@ import { Observable, from, of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import * as webpack from 'webpack';
 import { ArchitectPlugin } from '../plugins/architect';
+import { EmittedFiles, getEmittedFiles } from '../utils';
 import { Schema as RealWebpackBuilderSchema } from './schema';
 
 const webpackMerge = require('webpack-merge');
@@ -24,6 +25,9 @@ export interface WebpackFactory {
   (config: webpack.Configuration): Observable<webpack.Compiler>;
 }
 
+export type BuildResult = BuilderOutput & {
+  emittedFiles?: EmittedFiles[];
+};
 
 export function runWebpack(
   config: webpack.Configuration,
@@ -32,7 +36,7 @@ export function runWebpack(
     logging?: WebpackLoggingCallback,
     webpackFactory?: WebpackFactory,
   } = {},
-): Observable<BuilderOutput> {
+): Observable<BuildResult> {
   const createWebpack = options.webpackFactory || (config => of(webpack(config)));
   const log: WebpackLoggingCallback = options.logging
     || ((stats, config) => context.logger.info(stats.toString(config.stats)));
@@ -44,7 +48,7 @@ export function runWebpack(
   });
 
   return createWebpack(config).pipe(
-    switchMap(webpackCompiler => new Observable<BuilderOutput>(obs => {
+    switchMap(webpackCompiler => new Observable<BuildResult>(obs => {
       const callback: webpack.Compiler.Handler = (err, stats) => {
         if (err) {
           return obs.error(err);
@@ -53,7 +57,10 @@ export function runWebpack(
         // Log stats.
         log(stats, config);
 
-        obs.next({ success: !stats.hasErrors() });
+        obs.next({
+          success: !stats.hasErrors(),
+          emittedFiles: getEmittedFiles(stats.compilation),
+        } as unknown as BuildResult);
 
         if (!config.watch) {
           obs.complete();
diff --git a/packages/angular_devkit/build_webpack/src/webpack/index2_spec_large.ts b/packages/angular_devkit/build_webpack/src/webpack/index2_spec_large.ts
index 4b46cd3a5830..ebc35edceba0 100644
--- a/packages/angular_devkit/build_webpack/src/webpack/index2_spec_large.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack/index2_spec_large.ts
@@ -12,8 +12,9 @@ import * as path from 'path';
 import { WorkspaceNodeModulesArchitectHost } from '../../../architect/node';
 import { Architect } from '../../../architect/src/architect';
 import { TestingArchitectHost } from '../../../architect/testing/testing-architect-host';
+import { BuildResult } from './index2';
 
-const devkitRoot = normalize((global as any)._DevKitRoot); // tslint:disable-line:no-any
+const devkitRoot = (global as any)._DevKitRoot; // tslint:disable-line:no-any
 
 
 describe('Webpack Builder basic test', () => {
@@ -38,8 +39,8 @@ describe('Webpack Builder basic test', () => {
   }
 
   describe('basic app', () => {
-    const workspaceRoot = join(devkitRoot, 'tests/angular_devkit/build_webpack/basic-app/');
-    const outputPath = join(workspaceRoot, 'dist');
+    const workspaceRoot = path.join(devkitRoot, 'tests/angular_devkit/build_webpack/basic-app/');
+    const outputPath = join(normalize(workspaceRoot), 'dist');
 
     beforeEach(async () => {
       await createArchitect(workspaceRoot);
@@ -53,11 +54,26 @@ describe('Webpack Builder basic test', () => {
       expect(await vfHost.exists(join(outputPath, 'bundle.js')).toPromise()).toBe(true);
       await run.stop();
     });
+
+    it('works and returns emitted files', async () => {
+      const run = await architect.scheduleTarget({ project: 'app', target: 'build' });
+      const output = await run.result as BuildResult;
+
+      expect(output.success).toBe(true);
+      expect(output.emittedFiles).toContain({
+        name: 'main',
+        initial: true,
+        file: 'bundle.js',
+        extension: 'js',
+      });
+
+      await run.stop();
+    });
   });
 
   describe('Angular app', () => {
-    const workspaceRoot = join(devkitRoot, 'tests/angular_devkit/build_webpack/angular-app/');
-    const outputPath = join(workspaceRoot, 'dist/');
+    const workspaceRoot = path.join(devkitRoot, 'tests/angular_devkit/build_webpack/angular-app/');
+    const outputPath = join(normalize(workspaceRoot), 'dist/');
 
     beforeEach(async () => {
       await createArchitect(workspaceRoot);
@@ -72,5 +88,18 @@ describe('Webpack Builder basic test', () => {
       expect(await vfHost.exists(join(outputPath, 'polyfills.js')).toPromise()).toBe(true);
       await run.stop();
     });
+
+    it('works and returns emitted files', async () => {
+      const run = await architect.scheduleTarget({ project: 'app', target: 'build-webpack' });
+      const output = await run.result as BuildResult;
+
+      expect(output.success).toBe(true);
+      expect(output.emittedFiles).toContain(
+        { name: 'main', initial: true, file: 'main.js', extension: 'js' },
+        { name: 'polyfills', initial: true, file: 'polyfills.js', extension: 'js' },
+      );
+
+      await run.stop();
+    });
   });
 });

From 2f791395d2d416fbe1a9201dde5a1cd2449393dc Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 8 Mar 2019 20:54:26 -0500
Subject: [PATCH 0970/1703] feat(@angular-devkit/build-angular): implement
 stable architect API for karma

---
 package.json                                  |   1 +
 .../build_angular/builders.json               |   1 +
 .../models/webpack-configs/common.ts          |   7 +-
 .../build_angular/src/karma/index.ts          |   2 +-
 .../build_angular/src/karma/index2.ts         | 121 ++++++++++
 .../build_angular/src/karma/schema.d.ts       |  49 ----
 .../build_angular/src/karma/schema.json       |   1 +
 .../src/utils/normalize-karma-schema.ts       |   6 +-
 .../src/utils/webpack-browser-config.ts       | 148 ++++++++++++
 .../test/karma/assets_spec_large.ts           | 107 ---------
 .../test/karma/code-coverage_spec_large.ts    | 104 ++++----
 .../test/karma/rebuilds_spec_large.ts         |  96 +++++---
 .../test/karma/replacements_spec_large.ts     |  46 ----
 .../test/karma/styles_spec_large.ts           |  59 -----
 .../test/karma/works_spec_large.ts            | 222 ++++++++++++++++--
 yarn.lock                                     |  14 ++
 16 files changed, 606 insertions(+), 378 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/src/karma/index2.ts
 delete mode 100644 packages/angular_devkit/build_angular/src/karma/schema.d.ts
 create mode 100644 packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/karma/assets_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/karma/replacements_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/karma/styles_spec_large.ts

diff --git a/package.json b/package.json
index 9e02a72bec0b..e0c38ce053ef 100644
--- a/package.json
+++ b/package.json
@@ -88,6 +88,7 @@
     "@types/inquirer": "^0.0.44",
     "@types/istanbul": "^0.4.30",
     "@types/jasmine": "^3.3.8",
+    "@types/karma": "^3.0.2",
     "@types/loader-utils": "^1.1.3",
     "@types/minimist": "^1.2.0",
     "@types/node": "10.9.4",
diff --git a/packages/angular_devkit/build_angular/builders.json b/packages/angular_devkit/build_angular/builders.json
index 97fd69e7dc2d..41143b80c52d 100644
--- a/packages/angular_devkit/build_angular/builders.json
+++ b/packages/angular_devkit/build_angular/builders.json
@@ -25,6 +25,7 @@
     },
     "karma": {
       "class": "./src/karma",
+      "implementation": "./src/karma/index2",
       "schema": "./src/karma/schema.json",
       "description": "Run Karma unit tests."
     },
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index bee08871e3a7..1cf394e0cb25 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -8,7 +8,7 @@
 import { tags } from '@angular-devkit/core';
 import * as CopyWebpackPlugin from 'copy-webpack-plugin';
 import * as path from 'path';
-import { HashedModuleIdsPlugin, debug } from 'webpack';
+import { Configuration, HashedModuleIdsPlugin, Output, debug } from 'webpack';
 import { AssetPatternClass } from '../../../browser/schema';
 import { BundleBudgetPlugin } from '../../plugins/bundle-budget';
 import { CleanCssWebpackPlugin } from '../../plugins/cleancss-webpack-plugin';
@@ -31,7 +31,7 @@ export const buildOptimizerLoader: string = g['_DevKitIsLocal']
   : '@angular-devkit/build-optimizer/webpack-loader';
 
 // tslint:disable-next-line:no-big-function
-export function getCommonConfig(wco: WebpackConfigOptions) {
+export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
   const { root, projectRoot, buildOptions } = wco;
   const { styles: stylesOptimization, scripts: scriptsOptimization } = buildOptions.optimization;
   const {
@@ -300,7 +300,8 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
       path: path.resolve(root, buildOptions.outputPath as string),
       publicPath: buildOptions.deployUrl,
       filename: `[name]${hashFormat.chunk}.js`,
-    },
+      // cast required until typings include `futureEmitAssets` property
+    } as Output,
     watch: buildOptions.watch,
     watchOptions: {
       poll: buildOptions.poll,
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index 9e79ffef2544..18227ab6da19 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -27,7 +27,7 @@ import {
 import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
 import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
 import { NormalizedKarmaBuilderSchema, defaultProgress, normalizeKarmaSchema } from '../utils';
-import { KarmaBuilderSchema } from './schema';
+import { Schema as KarmaBuilderSchema } from './schema';
 const webpackMerge = require('webpack-merge');
 
 
diff --git a/packages/angular_devkit/build_angular/src/karma/index2.ts b/packages/angular_devkit/build_angular/src/karma/index2.ts
new file mode 100644
index 000000000000..940921ee08aa
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/karma/index2.ts
@@ -0,0 +1,121 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect/src/index2';
+import { NodeJsSyncHost } from '@angular-devkit/core/node';
+import { resolve } from 'path';
+import { Observable, from } from 'rxjs';
+import { switchMap } from 'rxjs/operators';
+import * as webpack from 'webpack';
+import {
+  getCommonConfig,
+  getNonAotConfig,
+  getStylesConfig,
+  getTestConfig,
+} from '../angular-cli-files/models/webpack-configs';
+import { Schema as BrowserBuilderOptions } from '../browser/schema';
+import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
+import { Schema as KarmaBuilderOptions } from './schema';
+
+// tslint:disable-next-line:no-implicit-dependencies
+type KarmaConfigOptions = import ('karma').ConfigOptions & {
+  buildWebpack?: unknown;
+  configFile?: string;
+};
+
+async function initialize(
+  options: KarmaBuilderOptions,
+  context: BuilderContext,
+  // tslint:disable-next-line:no-implicit-dependencies
+): Promise<[typeof import ('karma'), webpack.Configuration]> {
+  const host = new NodeJsSyncHost();
+  const { config } = await generateBrowserWebpackConfigFromContext(
+    // only two properties are missing:
+    // * `outputPath` which is fixed for tests
+    // * `index` which is not used for tests
+    { ...options as unknown as BrowserBuilderOptions, outputPath: '' },
+    context,
+    wco => [
+      getCommonConfig(wco),
+      getStylesConfig(wco),
+      getNonAotConfig(wco),
+      getTestConfig(wco),
+    ],
+    host,
+  );
+
+  // tslint:disable-next-line:no-implicit-dependencies
+  const karma = await import('karma');
+
+  return [karma, config];
+}
+
+export function runKarma(
+  options: KarmaBuilderOptions,
+  context: BuilderContext,
+): Observable<BuilderOutput> {
+  const root = context.workspaceRoot;
+
+  return from(initialize(options, context)).pipe(
+    switchMap(([karma, webpackConfig]) => new Observable<BuilderOutput>(subscriber => {
+      const karmaOptions: KarmaConfigOptions = {};
+
+      if (options.watch !== undefined) {
+        karmaOptions.singleRun = !options.watch;
+      }
+
+      // Convert browsers from a string to an array
+      if (options.browsers) {
+        karmaOptions.browsers = options.browsers.split(',');
+      }
+
+      if (options.reporters) {
+        // Split along commas to make it more natural, and remove empty strings.
+        const reporters = options.reporters
+          .reduce<string[]>((acc, curr) => acc.concat(curr.split(/,/)), [])
+          .filter(x => !!x);
+
+        if (reporters.length > 0) {
+          karmaOptions.reporters = reporters;
+        }
+      }
+
+      // Assign additional karmaConfig options to the local ngapp config
+      karmaOptions.configFile = resolve(root, options.karmaConfig);
+
+      karmaOptions.buildWebpack = {
+        options,
+        webpackConfig,
+        // Pass onto Karma to emit BuildEvents.
+        successCb: () => subscriber.next({ success: true }),
+        failureCb: () => subscriber.next({ success: false }),
+        // Workaround for https://github.com/karma-runner/karma/issues/3154
+        // When this workaround is removed, user projects need to be updated to use a Karma
+        // version that has a fix for this issue.
+        toJSON: () => { },
+        logger: context.logger,
+      };
+
+      // Complete the observable once the Karma server returns.
+      const karmaServer = new karma.Server(karmaOptions, () => subscriber.complete());
+      // karma typings incorrectly define start's return value as void
+      // tslint:disable-next-line:no-use-of-empty-return-value
+      const karmaStart = karmaServer.start() as unknown as Promise<void>;
+
+      // Cleanup, signal Karma to exit.
+      return () => {
+        // Karma only has the `stop` method start with 3.1.1, so we must defensively check.
+        const karmaServerWithStop = karmaServer as unknown as { stop: () => Promise<void> };
+        if (typeof karmaServerWithStop.stop === 'function') {
+          return karmaStart.then(() => karmaServerWithStop.stop());
+        }
+      };
+    })),
+  );
+}
+
+export default createBuilder<Record<string, string> & KarmaBuilderOptions>(runKarma);
diff --git a/packages/angular_devkit/build_angular/src/karma/schema.d.ts b/packages/angular_devkit/build_angular/src/karma/schema.d.ts
deleted file mode 100644
index 2592fcf9ebd7..000000000000
--- a/packages/angular_devkit/build_angular/src/karma/schema.d.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import {
-  AssetPatternObject,
-  BrowserBuilderSchema,
-  CurrentFileReplacement,
-  NormalizedSourceMaps,
-  SourceMapUnion,
-} from '../browser/schema';
-
-export interface KarmaBuilderSchema extends Pick<BrowserBuilderSchema,
-  'assets' | 'main' | 'polyfills' | 'tsConfig' | 'scripts' | 'styles' | 'stylePreprocessorOptions'
-  | 'fileReplacements' | 'poll' | 'preserveSymlinks' | 'watch' | 'vendorSourceMap'
-  > {
-  /**
-   * The name of the Karma configuration file..
-   */
-  karmaConfig: string;
-
-  /**
-   * Output sourcemaps.
-   */
-  sourceMap: SourceMapUnion;
-
-  /**
-   * Override which browsers tests are run against.
-   */
-  browsers: string;
-
-  /**
-   * Output a code coverage report.
-   */
-  codeCoverage: boolean;
-
-  /**
-   * Globs to exclude from code coverage.
-   */
-  codeCoverageExclude: string[];
-
-  /**
-   * Karma reporters to use. Directly passed to the karma runner.
-   */
-  reporters?: string[];
-}
diff --git a/packages/angular_devkit/build_angular/src/karma/schema.json b/packages/angular_devkit/build_angular/src/karma/schema.json
index 0da0e45b0ffa..a36b9797f236 100644
--- a/packages/angular_devkit/build_angular/src/karma/schema.json
+++ b/packages/angular_devkit/build_angular/src/karma/schema.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "http://json-schema.org/draft-07/schema",
   "title": "Karma Target",
   "description": "Karma target options for Build Facade.",
   "type": "object",
diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-karma-schema.ts b/packages/angular_devkit/build_angular/src/utils/normalize-karma-schema.ts
index 3fc3858daaa2..ef2f354762fb 100644
--- a/packages/angular_devkit/build_angular/src/utils/normalize-karma-schema.ts
+++ b/packages/angular_devkit/build_angular/src/utils/normalize-karma-schema.ts
@@ -10,7 +10,7 @@
 
 import { Path, virtualFs } from '@angular-devkit/core';
 import { AssetPatternClass, OptimizationClass, SourceMapClass } from '../browser/schema';
-import { KarmaBuilderSchema } from '../karma/schema';
+import { Schema as KarmaBuilderSchema } from '../karma/schema';
 import { normalizeAssetPatterns } from './normalize-asset-patterns';
 import {
   NormalizedFileReplacement,
@@ -38,13 +38,13 @@ export function normalizeKarmaSchema(
 ): NormalizedKarmaBuilderSchema {
   const syncHost = new virtualFs.SyncDelegateHost(host);
 
-  const normalizedSourceMapOptions = normalizeSourceMaps(options.sourceMap);
+  const normalizedSourceMapOptions = normalizeSourceMaps(options.sourceMap || false);
   normalizedSourceMapOptions.vendor =
     normalizedSourceMapOptions.vendor || options.vendorSourceMap || false;
 
   return {
     ...options,
-    fileReplacements: normalizeFileReplacements(options.fileReplacements, syncHost, root),
+    fileReplacements: normalizeFileReplacements(options.fileReplacements || [], syncHost, root),
     assets: normalizeAssetPatterns(options.assets || [], syncHost, root, projectRoot, sourceRoot),
     sourceMap: normalizedSourceMapOptions,
     optimization: normalizeOptimization(undefined),
diff --git a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
new file mode 100644
index 000000000000..d88be9cdf008
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
@@ -0,0 +1,148 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { BuilderContext } from '@angular-devkit/architect/src/index2';
+import {
+  experimental,
+  getSystemPath,
+  logging,
+  normalize,
+  resolve,
+  schema,
+  virtualFs,
+} from '@angular-devkit/core';
+import { NodeJsSyncHost } from '@angular-devkit/core/node';
+import * as fs from 'fs';
+import * as path from 'path';
+import * as webpack from 'webpack';
+import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
+import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
+import { Schema as BrowserBuilderSchema } from '../browser/schema';
+import { NormalizedBrowserBuilderSchema, defaultProgress, normalizeBrowserSchema } from '../utils';
+
+const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');
+const webpackMerge = require('webpack-merge');
+
+type BrowserWebpackConfigOptions = WebpackConfigOptions<NormalizedBrowserBuilderSchema>;
+
+export async function generateWebpackConfig(
+  workspaceRoot: string,
+  projectRoot: string,
+  sourceRoot: string | undefined,
+  options: NormalizedBrowserBuilderSchema,
+  webpackPartialGenerator: (wco: BrowserWebpackConfigOptions) => webpack.Configuration[],
+  logger: logging.LoggerApi,
+): Promise<webpack.Configuration> {
+  // Ensure Build Optimizer is only used with AOT.
+  if (options.buildOptimizer && !options.aot) {
+    throw new Error(`The 'buildOptimizer' option cannot be used without 'aot'.`);
+  }
+
+  const tsConfigPath = path.resolve(workspaceRoot, options.tsConfig);
+  const tsConfig = readTsconfig(tsConfigPath);
+
+  // tslint:disable-next-line:no-implicit-dependencies
+  const projectTs = await import('typescript');
+
+  const supportES2015 = tsConfig.options.target !== projectTs.ScriptTarget.ES3
+    && tsConfig.options.target !== projectTs.ScriptTarget.ES5;
+
+  const wco: BrowserWebpackConfigOptions = {
+    root: workspaceRoot,
+    logger: logger.createChild('webpackConfigOptions'),
+    projectRoot,
+    sourceRoot,
+    buildOptions: options,
+    tsConfig,
+    tsConfigPath,
+    supportES2015,
+  };
+
+  wco.buildOptions.progress = defaultProgress(wco.buildOptions.progress);
+
+  const partials = webpackPartialGenerator(wco);
+  const webpackConfig = webpackMerge(partials);
+
+  if (options.profile || process.env['NG_BUILD_PROFILING']) {
+    const smp = new SpeedMeasurePlugin({
+      outputFormat: 'json',
+      outputTarget: path.resolve(workspaceRoot, 'speed-measure-plugin.json'),
+    });
+
+    return smp.wrap(webpackConfig);
+  }
+
+  return webpackConfig;
+}
+
+
+export async function generateBrowserWebpackConfigFromWorkspace(
+  options: BrowserBuilderSchema,
+  projectName: string,
+  workspace: experimental.workspace.Workspace,
+  host: virtualFs.Host<fs.Stats>,
+  webpackPartialGenerator: (wco: BrowserWebpackConfigOptions) => webpack.Configuration[],
+  logger: logging.LoggerApi,
+): Promise<webpack.Configuration> {
+  // TODO: Use a better interface for workspace access.
+  const projectRoot = resolve(workspace.root, normalize(workspace.getProject(projectName).root));
+  const projectSourceRoot = workspace.getProject(projectName).sourceRoot;
+  const sourceRoot = projectSourceRoot
+    ? resolve(workspace.root, normalize(projectSourceRoot))
+    : undefined;
+
+  const normalizedOptions = normalizeBrowserSchema(
+    host,
+    workspace.root,
+    projectRoot,
+    sourceRoot,
+    options,
+  );
+
+  return generateWebpackConfig(
+    getSystemPath(workspace.root),
+    getSystemPath(projectRoot),
+    sourceRoot && getSystemPath(sourceRoot),
+    normalizedOptions,
+    webpackPartialGenerator,
+    logger,
+  );
+}
+
+
+export async function generateBrowserWebpackConfigFromContext(
+  options: BrowserBuilderSchema,
+  context: BuilderContext,
+  webpackPartialGenerator: (wco: BrowserWebpackConfigOptions) => webpack.Configuration[],
+  host: virtualFs.Host<fs.Stats> = new NodeJsSyncHost(),
+): Promise<{ workspace: experimental.workspace.Workspace, config: webpack.Configuration }> {
+  const registry = new schema.CoreSchemaRegistry();
+  registry.addPostTransform(schema.transforms.addUndefinedDefaults);
+
+  const workspace = await experimental.workspace.Workspace.fromPath(
+    host,
+    normalize(context.workspaceRoot),
+    registry,
+  );
+
+  const projectName = context.target ? context.target.project : workspace.getDefaultProjectName();
+
+  if (!projectName) {
+    throw new Error('Must either have a target from the context or a default project.');
+  }
+
+  const config = await generateBrowserWebpackConfigFromWorkspace(
+    options,
+    projectName,
+    workspace,
+    host,
+    webpackPartialGenerator,
+    context.logger,
+  );
+
+  return { workspace, config };
+}
diff --git a/packages/angular_devkit/build_angular/test/karma/assets_spec_large.ts b/packages/angular_devkit/build_angular/test/karma/assets_spec_large.ts
deleted file mode 100644
index 60d003e5a152..000000000000
--- a/packages/angular_devkit/build_angular/test/karma/assets_spec_large.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { tap } from 'rxjs/operators';
-import { host, karmaTargetSpec } from '../utils';
-
-
-describe('Karma Builder assets', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
-
-  it('works', (done) => {
-    const assets: { [path: string]: string } = {
-      './src/string-file-asset.txt': 'string-file-asset.txt',
-      './src/string-folder-asset/file.txt': 'string-folder-asset.txt',
-      './src/glob-asset.txt': 'glob-asset.txt',
-      './src/folder/folder-asset.txt': 'folder-asset.txt',
-      './src/output-asset.txt': 'output-asset.txt',
-    };
-    host.writeMultipleFiles(assets);
-    host.writeMultipleFiles({
-      'src/app/app.module.ts': `
-        import { BrowserModule } from '@angular/platform-browser';
-        import { NgModule } from '@angular/core';
-        import { HttpModule } from '@angular/http';
-        import { AppComponent } from './app.component';
-
-        @NgModule({
-          declarations: [
-            AppComponent
-          ],
-          imports: [
-            BrowserModule,
-            HttpModule
-          ],
-          providers: [],
-          bootstrap: [AppComponent]
-        })
-        export class AppModule { }
-      `,
-      'src/app/app.component.ts': `
-        import { Component } from '@angular/core';
-        import { Http, Response } from '@angular/http';
-
-        @Component({
-          selector: 'app-root',
-          template: '<p *ngFor="let asset of assets">{{asset.content }}</p>'
-        })
-        export class AppComponent {
-          public assets = [
-            { path: './string-file-asset.txt', content: '' },
-            { path: './string-folder-asset/file.txt', content: '' },
-            { path: './glob-asset.txt', content: '' },
-            { path: './folder/folder-asset.txt', content: '' },
-            { path: './output-folder/output-asset.txt', content: '' },
-          ];
-          constructor(private http: Http) {
-            this.assets.forEach(asset => http.get(asset.path)
-              .subscribe(res => asset.content = res['_body']));
-          }
-        }`,
-      'src/app/app.component.spec.ts': `
-        import { TestBed, async } from '@angular/core/testing';
-        import { HttpModule } from '@angular/http';
-        import { AppComponent } from './app.component';
-
-        describe('AppComponent', () => {
-          beforeEach(async(() => {
-            TestBed.configureTestingModule({
-              imports: [
-                HttpModule
-              ],
-              declarations: [
-                AppComponent
-              ]
-            }).compileComponents();
-          }));
-
-          it('should create the app', async(() => {
-            const fixture = TestBed.createComponent(AppComponent);
-            const app = fixture.debugElement.componentInstance;
-            expect(app).toBeTruthy();
-          }));
-        });`,
-    });
-
-    const overrides = {
-      assets: [
-        'src/string-file-asset.txt',
-        'src/string-folder-asset',
-        { glob: 'glob-asset.txt', input: 'src/', output: '/' },
-        { glob: 'output-asset.txt', input: 'src/', output: '/output-folder' },
-        { glob: '**/*', input: 'src/folder', output: '/folder' },
-      ],
-    };
-
-    runTargetSpec(host, karmaTargetSpec, overrides).pipe(
-      tap(buildEvent => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
-  }, 45000);
-});
diff --git a/packages/angular_devkit/build_angular/test/karma/code-coverage_spec_large.ts b/packages/angular_devkit/build_angular/test/karma/code-coverage_spec_large.ts
index 5e30ce28f0d7..0e8685fabe86 100644
--- a/packages/angular_devkit/build_angular/test/karma/code-coverage_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/karma/code-coverage_spec_large.ts
@@ -5,38 +5,40 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { runTargetSpec } from '@angular-devkit/architect/testing';
+import { Architect } from '@angular-devkit/architect/src/index2';
 import { normalize, virtualFs } from '@angular-devkit/core';
-import { debounceTime, tap } from 'rxjs/operators';
-import { NormalizedKarmaBuilderSchema } from '../../src/utils';
-import { host, karmaTargetSpec } from '../utils';
-
+import { createArchitect, host, karmaTargetSpec } from '../utils';
 
 describe('Karma Builder code coverage', () => {
   const coverageFilePath = normalize('coverage/lcov.info');
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+
+  afterEach(() => host.restore().toPromise());
+
+  it('supports code coverage option', async () => {
+    const run = await architect.scheduleTarget(karmaTargetSpec, { codeCoverage: true });
 
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
-
-  it('works', (done) => {
-    const overrides: Partial<NormalizedKarmaBuilderSchema> = { codeCoverage: true };
-
-    runTargetSpec(host, karmaTargetSpec, overrides).pipe(
-      // It seems like the coverage files take a while being written to disk, so we wait 500ms here.
-      debounceTime(500),
-      tap(buildEvent => {
-        expect(buildEvent.success).toBe(true);
-        expect(host.scopedSync().exists(coverageFilePath)).toBe(true);
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(coverageFilePath));
-        expect(content).toContain('polyfills.ts');
-        expect(content).toContain('test.ts');
-      }),
-    ).toPromise().then(done, done.fail);
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+    await run.stop();
+
+    const exists = host.scopedSync().exists(coverageFilePath);
+    expect(exists).toBe(true);
+
+    if (exists) {
+      const content = virtualFs.fileBufferToString(host.scopedSync().read(coverageFilePath));
+      expect(content).toContain('polyfills.ts');
+      expect(content).toContain('test.ts');
+    }
   }, 120000);
 
-  it('supports exclude', (done) => {
-    const overrides: Partial<NormalizedKarmaBuilderSchema> = {
+  it('supports code coverage exclude option', async () => {
+    const overrides = {
       codeCoverage: true,
       codeCoverageExclude: [
         'src/polyfills.ts',
@@ -44,22 +46,23 @@ describe('Karma Builder code coverage', () => {
       ],
     };
 
-    runTargetSpec(host, karmaTargetSpec, overrides).pipe(
-      // It seems like the coverage files take a while being written to disk, so we wait 500ms here.
-      debounceTime(500),
-      tap(buildEvent => {
-        expect(buildEvent.success).toBe(true);
-        expect(host.scopedSync().exists(coverageFilePath)).toBe(true);
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(coverageFilePath));
-        expect(content).not.toContain('polyfills.ts');
-        expect(content).not.toContain('test.ts');
-      }),
-    ).toPromise().then(done, done.fail);
-  }, 120000);
+    const run = await architect.scheduleTarget(karmaTargetSpec, overrides);
 
-  it(`should collect coverage from paths in 'sourceRoot'`, (done) => {
-    const overrides: Partial<NormalizedKarmaBuilderSchema> = { codeCoverage: true };
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
 
+    await run.stop();
+
+    const exists = host.scopedSync().exists(coverageFilePath);
+    expect(exists).toBe(true);
+
+    if (exists) {
+      const content = virtualFs.fileBufferToString(host.scopedSync().read(coverageFilePath));
+      expect(content).not.toContain('polyfills.ts');
+      expect(content).not.toContain('test.ts');
+    }
+  }, 120000);
+
+  it(`should collect coverage from paths in 'sourceRoot'`, async () => {
     const files: { [path: string]: string } = {
       './dist/my-lib/index.d.ts': `
         export declare const title = 'app';
@@ -93,15 +96,18 @@ describe('Karma Builder code coverage', () => {
       },
     `);
 
-    runTargetSpec(host, karmaTargetSpec, overrides).pipe(
-      // It seems like the coverage files take a while being written to disk, so we wait 500ms here.
-      debounceTime(500),
-      tap(buildEvent => {
-        expect(buildEvent.success).toBe(true);
-        expect(host.scopedSync().exists(coverageFilePath)).toBe(true);
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(coverageFilePath));
-        expect(content).not.toContain('my-lib');
-      }),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(karmaTargetSpec, { codeCoverage: true });
+
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+    await run.stop();
+
+    const exists = host.scopedSync().exists(coverageFilePath);
+    expect(exists).toBe(true);
+
+    if (exists) {
+      const content = virtualFs.fileBufferToString(host.scopedSync().read(coverageFilePath));
+      expect(content).not.toContain('my-lib');
+    }
   }, 120000);
 });
diff --git a/packages/angular_devkit/build_angular/test/karma/rebuilds_spec_large.ts b/packages/angular_devkit/build_angular/test/karma/rebuilds_spec_large.ts
index a9613859373e..bba7f3144c0c 100644
--- a/packages/angular_devkit/build_angular/test/karma/rebuilds_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/karma/rebuilds_spec_large.ts
@@ -5,42 +5,56 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { Subject, timer } from 'rxjs';
+import {
+  catchError,
+  debounceTime,
+  delay,
+  map,
+  switchMap,
+  takeUntil,
+  takeWhile,
+  tap,
+} from 'rxjs/operators';
+import { createArchitect, host, karmaTargetSpec } from '../utils';
 
-import { DefaultTimeout, runTargetSpec } from '@angular-devkit/architect/testing';
-import { Subject } from 'rxjs';
-import { debounceTime, delay, take, takeUntil, takeWhile, tap } from 'rxjs/operators';
-import { host, karmaTargetSpec } from '../utils';
+describe('Karma Builder watch mode', () => {
+  let architect: Architect;
 
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
 
-describe('Karma Builder watch mode', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  afterEach(() => host.restore().toPromise());
 
-  it('works', async () => {
-    const overrides = { watch: true };
-    const res = await runTargetSpec(host, karmaTargetSpec, overrides).pipe(
-      debounceTime(500),
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      take(1),
-    ).toPromise();
+  it('performs initial build', async () => {
+    const run = await architect.scheduleTarget(karmaTargetSpec, { watch: true });
+
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
 
-    expect(res).toEqual({ success: true });
+    await run.stop();
   });
 
-  it('recovers from compilation failures in watch mode', (done) => {
-    const overrides = { watch: true };
+  it('recovers from compilation failures in watch mode', async () => {
     let buildCount = 0;
     let phase = 1;
 
-    runTargetSpec(host, karmaTargetSpec, overrides, DefaultTimeout * 3).pipe(
+    // The current linux-based CI environments may not fully settled in regards to filesystem
+    // changes from previous tests which reuse the same directory and fileset.
+    // The initial delay helps mitigate false positive rebuild triggers in such scenarios.
+    const { run } = await timer(1000).pipe(
+      switchMap(() => architect.scheduleTarget(karmaTargetSpec, { watch: true })),
+      switchMap(run => run.output.pipe(map(output => ({ run, output })))),
       debounceTime(500),
-      tap((buildEvent) => {
+      tap(({ output }) => {
         buildCount += 1;
         switch (phase) {
           case 1:
             // Karma run should succeed.
             // Add a compilation error.
-            expect(buildEvent.success).toBe(true);
+            expect(output.success).toBe(true);
             // Add an syntax error to a non-main file.
             host.appendToFile('src/app/app.component.spec.ts', `]]]`);
             phase = 2;
@@ -48,42 +62,47 @@ describe('Karma Builder watch mode', () => {
 
           case 2:
             // Karma run should fail due to compilation error. Fix it.
-            expect(buildEvent.success).toBe(false);
+            expect(output.success).toBe(false);
             host.replaceInFile('src/app/app.component.spec.ts', `]]]`, '');
             phase = 3;
             break;
 
           case 3:
             // Karma run should succeed again.
-            expect(buildEvent.success).toBe(true);
+            expect(output.success).toBe(true);
             phase = 4;
             break;
         }
       }),
       takeWhile(() => phase < 4),
-    ).toPromise().then(
-      () => done(),
-      () => done.fail(`stuck at phase ${phase} [builds: ${buildCount}]`),
-    );
+      catchError((_, caught) => {
+        fail(`stuck at phase ${phase} [builds: ${buildCount}]`);
+
+        return caught;
+      }),
+    ).toPromise();
+
+    await run.stop();
   });
 
-  it('does not rebuild when nothing changed', (done) => {
-    const overrides = { watch: true };
-    let buildCount = 0;
+  it('does not rebuild when nothing changed', async () => {
     let phase = 1;
 
     const stopSubject = new Subject();
     const stop$ = stopSubject.asObservable().pipe(delay(5000));
 
-    runTargetSpec(host, karmaTargetSpec, overrides, DefaultTimeout * 3).pipe(
+    // The current linux-based CI environments may not fully settled in regards to filesystem
+    // changes from previous tests which reuse the same directory and fileset.
+    // The initial delay helps mitigate false positive rebuild triggers in such scenarios.
+    const { run } = await timer(1000).pipe(
+      switchMap(() => architect.scheduleTarget(karmaTargetSpec, { watch: true })),
+      switchMap(run => run.output.pipe(map(output => ({ run, output })))),
       debounceTime(500),
-      tap((buildEvent) => {
-        buildCount += 1;
+      tap(({ output }) => {
         switch (phase) {
           case 1:
             // Karma run should succeed.
-            // Add a compilation error.
-            expect(buildEvent.success).toBe(true);
+            expect(output.success).toBe(true);
             // Touch the file.
             host.appendToFile('src/app/app.component.spec.ts', ``);
             // Signal the stopper, which delays emission by 5s.
@@ -94,14 +113,13 @@ describe('Karma Builder watch mode', () => {
 
           case 2:
             // Should never trigger this second build.
-            expect(true).toBeFalsy('Should not trigger second build.');
+            fail('Should not trigger second build.');
             break;
         }
       }),
       takeUntil(stop$),
-    ).toPromise().then(
-      () => done(),
-      () => done.fail(`stuck at phase ${phase} [builds: ${buildCount}]`),
-    );
+    ).toPromise();
+
+    await run.stop();
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/karma/replacements_spec_large.ts b/packages/angular_devkit/build_angular/test/karma/replacements_spec_large.ts
deleted file mode 100644
index 870961a92263..000000000000
--- a/packages/angular_devkit/build_angular/test/karma/replacements_spec_large.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { normalize } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
-import { host, karmaTargetSpec } from '../utils';
-
-
-describe('Karma Builder file replacements', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
-
-  it('allows file replacements', (done) => {
-    host.writeMultipleFiles({
-      'src/meaning-too.ts': 'export var meaning = 42;',
-      'src/meaning.ts': `export var meaning = 10;`,
-
-      'src/test.ts': `
-        import { meaning } from './meaning';
-
-        describe('Test file replacement', () => {
-          it('should replace file', () => {
-            expect(meaning).toBe(42);
-          });
-        });
-      `,
-    });
-
-    const overrides = {
-      fileReplacements: [{
-        replace: normalize('/src/meaning.ts'),
-        with: normalize('/src/meaning-too.ts'),
-      }],
-    };
-
-    runTargetSpec(host, karmaTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
-});
diff --git a/packages/angular_devkit/build_angular/test/karma/styles_spec_large.ts b/packages/angular_devkit/build_angular/test/karma/styles_spec_large.ts
deleted file mode 100644
index 899fbea31e53..000000000000
--- a/packages/angular_devkit/build_angular/test/karma/styles_spec_large.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { tap } from 'rxjs/operators';
-import { host, karmaTargetSpec } from '../utils';
-
-
-describe('Karma Builder global styles', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
-
-  it('works', (done) => {
-    host.writeMultipleFiles({
-      'src/styles.css': 'p {display: none}',
-      'src/app/app.component.ts': `
-        import { Component } from '@angular/core';
-
-        @Component({
-          selector: 'app-root',
-          template: '<p>Hello World</p>'
-        })
-        export class AppComponent {
-        }
-       `,
-      'src/app/app.component.spec.ts': `
-        import { TestBed, async } from '@angular/core/testing';
-        import { HttpModule } from '@angular/http';
-        import { AppComponent } from './app.component';
-
-        describe('AppComponent', () => {
-          beforeEach(async(() => {
-            TestBed.configureTestingModule({
-              imports: [
-                HttpModule
-              ],
-              declarations: [
-                AppComponent
-              ]
-            }).compileComponents();
-          }));
-
-          it('should not contain text that is hidden via css', async(() => {
-            const fixture = TestBed.createComponent(AppComponent);
-            expect(fixture.nativeElement.innerText).not.toContain('Hello World');
-          }));
-        });`,
-    });
-
-    runTargetSpec(host, karmaTargetSpec).pipe(
-      tap(buildEvent => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/karma/works_spec_large.ts b/packages/angular_devkit/build_angular/test/karma/works_spec_large.ts
index d2f11a2c201d..968fb113664f 100644
--- a/packages/angular_devkit/build_angular/test/karma/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/karma/works_spec_large.ts
@@ -5,11 +5,8 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { tap } from 'rxjs/operators';
-import { host, karmaTargetSpec } from '../utils';
-
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { createArchitect, host, karmaTargetSpec } from '../utils';
 
 // TODO: replace this with an "it()" macro that's reusable globally.
 let linuxOnlyIt: typeof it = it;
@@ -17,31 +14,212 @@ if (process.platform.startsWith('win')) {
   linuxOnlyIt = xit;
 }
 
+// tslint:disable-next-line:no-big-function
 describe('Karma Builder', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+
+  afterEach(() => host.restore().toPromise());
+
+  it('runs', async () => {
+    const run = await architect.scheduleTarget(karmaTargetSpec);
+
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
 
-  it('runs', (done) => {
-    runTargetSpec(host, karmaTargetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
+    await run.stop();
+  });
 
   // This test seems to succeed on appveyor but not terminate Karma, leaving the port used
   // and killing Chrome after 60s. This causes other tests that use Chrome to fail.
-  linuxOnlyIt('fails with broken compilation', (done) => {
+  linuxOnlyIt('fails with broken compilation', async () => {
     host.writeMultipleFiles({
       'src/app/app.component.spec.ts': '<p> definitely not typescript </p>',
     });
-    runTargetSpec(host, karmaTargetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(false)),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
 
-  it('supports ES2015 target', (done) => {
+    const run = await architect.scheduleTarget(karmaTargetSpec);
+
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: false }));
+
+    await run.stop();
+  });
+
+  it('supports ES2015 target', async () => {
     host.replaceInFile('tsconfig.json', '"target": "es5"', '"target": "es2015"');
-    runTargetSpec(host, karmaTargetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
+
+    const run = await architect.scheduleTarget(karmaTargetSpec);
+
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+    await run.stop();
+  });
+
+  it('generates and uses global styles', async () => {
+    host.writeMultipleFiles({
+      'src/styles.css': 'p {display: none}',
+      'src/app/app.component.ts': `
+        import { Component } from '@angular/core';
+
+        @Component({
+          selector: 'app-root',
+          template: '<p>Hello World</p>'
+        })
+        export class AppComponent {
+        }
+       `,
+      'src/app/app.component.spec.ts': `
+        import { TestBed, async } from '@angular/core/testing';
+        import { HttpModule } from '@angular/http';
+        import { AppComponent } from './app.component';
+
+        describe('AppComponent', () => {
+          beforeEach(async(() => {
+            TestBed.configureTestingModule({
+              imports: [
+                HttpModule
+              ],
+              declarations: [
+                AppComponent
+              ]
+            }).compileComponents();
+          }));
+
+          it('should not contain text that is hidden via css', async(() => {
+            const fixture = TestBed.createComponent(AppComponent);
+            expect(fixture.nativeElement.innerText).not.toContain('Hello World');
+          }));
+        });`,
+    });
+
+    const run = await architect.scheduleTarget(karmaTargetSpec);
+
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+    await run.stop();
+  });
+
+  it('generates and uses assets', async () => {
+    const assets: { [path: string]: string } = {
+      './src/string-file-asset.txt': 'string-file-asset.txt',
+      './src/string-folder-asset/file.txt': 'string-folder-asset.txt',
+      './src/glob-asset.txt': 'glob-asset.txt',
+      './src/folder/folder-asset.txt': 'folder-asset.txt',
+      './src/output-asset.txt': 'output-asset.txt',
+    };
+    host.writeMultipleFiles(assets);
+    host.writeMultipleFiles({
+      'src/app/app.module.ts': `
+        import { BrowserModule } from '@angular/platform-browser';
+        import { NgModule } from '@angular/core';
+        import { HttpModule } from '@angular/http';
+        import { AppComponent } from './app.component';
+
+        @NgModule({
+          declarations: [
+            AppComponent
+          ],
+          imports: [
+            BrowserModule,
+            HttpModule
+          ],
+          providers: [],
+          bootstrap: [AppComponent]
+        })
+        export class AppModule { }
+      `,
+      'src/app/app.component.ts': `
+        import { Component } from '@angular/core';
+        import { Http, Response } from '@angular/http';
+
+        @Component({
+          selector: 'app-root',
+          template: '<p *ngFor="let asset of assets">{{asset.content }}</p>'
+        })
+        export class AppComponent {
+          public assets = [
+            { path: './string-file-asset.txt', content: '' },
+            { path: './string-folder-asset/file.txt', content: '' },
+            { path: './glob-asset.txt', content: '' },
+            { path: './folder/folder-asset.txt', content: '' },
+            { path: './output-folder/output-asset.txt', content: '' },
+          ];
+          constructor(private http: Http) {
+            this.assets.forEach(asset => http.get(asset.path)
+              .subscribe(res => asset.content = res['_body']));
+          }
+        }`,
+      'src/app/app.component.spec.ts': `
+        import { TestBed, async } from '@angular/core/testing';
+        import { HttpModule } from '@angular/http';
+        import { AppComponent } from './app.component';
+
+        describe('AppComponent', () => {
+          beforeEach(async(() => {
+            TestBed.configureTestingModule({
+              imports: [
+                HttpModule
+              ],
+              declarations: [
+                AppComponent
+              ]
+            }).compileComponents();
+          }));
+
+          it('should create the app', async(() => {
+            const fixture = TestBed.createComponent(AppComponent);
+            const app = fixture.debugElement.componentInstance;
+            expect(app).toBeTruthy();
+          }));
+        });`,
+    });
+
+    const overrides = {
+      assets: [
+        'src/string-file-asset.txt',
+        'src/string-folder-asset',
+        { glob: 'glob-asset.txt', input: 'src/', output: '/' },
+        { glob: 'output-asset.txt', input: 'src/', output: '/output-folder' },
+        { glob: '**/*', input: 'src/folder', output: '/folder' },
+      ],
+    };
+
+    const run = await architect.scheduleTarget(karmaTargetSpec, overrides);
+
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+    await run.stop();
+  });
+
+  it('allows file replacements', async () => {
+    host.writeMultipleFiles({
+      'src/meaning-too.ts': 'export var meaning = 42;',
+      'src/meaning.ts': `export var meaning = 10;`,
+
+      'src/test.ts': `
+        import { meaning } from './meaning';
+
+        describe('Test file replacement', () => {
+          it('should replace file', () => {
+            expect(meaning).toBe(42);
+          });
+        });
+      `,
+    });
+
+    const overrides = {
+      fileReplacements: [{
+        replace: '/src/meaning.ts',
+        with: '/src/meaning-too.ts',
+      }],
+    };
+
+    const run = await architect.scheduleTarget(karmaTargetSpec, overrides);
+
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+    await run.stop();
+  });
 });
diff --git a/yarn.lock b/yarn.lock
index 5ffdb0fa5938..4f602495970d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -240,6 +240,11 @@
   dependencies:
     defer-to-connect "^1.0.1"
 
+"@types/bluebird@*":
+  version "3.5.26"
+  resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.26.tgz#a38c438ae84fa02431d6892edf86e46edcbca291"
+  integrity sha512-aj2mrBLn5ky0GmAg6IPXrQjnN0iB/ulozuJ+oZdrHRAzRbXjGmu4UXsNCjFvPbSaaPZmniocdOzsM392qLOlmQ==
+
 "@types/body-parser@*":
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.0.tgz#9f5c9d9bd04bb54be32d5eb9fc0d8c974e6cf58c"
@@ -353,6 +358,15 @@
   resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.3.8.tgz#fc6abd92f7121431685ec986f0ec8f77b4390a3e"
   integrity sha512-BaOFpaddRVV8qykJoWHrHtamml880oh0+DIZWbtJgx0pu+KhDF1gER5hSfCIfzyMrbjMuYFnLUfyo1l0JUVU3Q==
 
+"@types/karma@^3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/karma/-/karma-3.0.2.tgz#c66654ea7167ae9fb62880ad2ef99cc18b64940d"
+  integrity sha512-xm+iMKgLSpTPo1Z7wLKbrZt8aLzA1udb9UOb9+OSDMFIufqlbp0DXQpY75EQ3ETi6EJiaohIodBlMs+UD4NSMQ==
+  dependencies:
+    "@types/bluebird" "*"
+    "@types/node" "*"
+    log4js "^3.0.0"
+
 "@types/loader-utils@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@types/loader-utils/-/loader-utils-1.1.3.tgz#82b9163f2ead596c68a8c03e450fbd6e089df401"

From 63d64472b5f8e5d786dea2eb462b6651b794f02e Mon Sep 17 00:00:00 2001
From: Will <doggy.huang@gmail.com>
Date: Thu, 21 Mar 2019 00:03:50 +0800
Subject: [PATCH 0971/1703] feat(@schematics/angular): add type checking for
 protractor.conf.js file

Fixes #13958
---
 .../schematics/angular/e2e/files/protractor.conf.js.template  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/schematics/angular/e2e/files/protractor.conf.js.template b/packages/schematics/angular/e2e/files/protractor.conf.js.template
index 9748e3d2930f..73e4e6806cd6 100644
--- a/packages/schematics/angular/e2e/files/protractor.conf.js.template
+++ b/packages/schematics/angular/e2e/files/protractor.conf.js.template
@@ -1,8 +1,12 @@
+// @ts-check
 // Protractor configuration file, see link for more information
 // https://github.com/angular/protractor/blob/master/lib/config.ts
 
 const { SpecReporter } = require('jasmine-spec-reporter');
 
+/**
+ * @type { import("protractor").Config }
+ */
 exports.config = {
   allScriptsTimeout: 11000,
   specs: [

From 8cd1310a7fdb88156cefab8af2cbee58680f51d3 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Thu, 21 Mar 2019 09:53:36 +0100
Subject: [PATCH 0972/1703] style: format project files

---
 tests/legacy-cli/e2e/utils/project.ts | 242 +++++++++++++-------------
 1 file changed, 121 insertions(+), 121 deletions(-)

diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts
index d8139055fc67..2e8693fff7f8 100644
--- a/tests/legacy-cli/e2e/utils/project.ts
+++ b/tests/legacy-cli/e2e/utils/project.ts
@@ -48,82 +48,82 @@ export async function createProject(name: string, ...args: string[]) {
 }
 
 export async function prepareProjectForE2e(name) {
-                                                   const argv: string[] = getGlobalVariable(
-                                                     'argv',
-                                                   );
-
-                                                   await git(
-                                                     'config',
-                                                     'user.email',
-                                                     'angular-core+e2e@google.com',
-                                                   );
-                                                   await git(
-                                                     'config',
-                                                     'user.name',
-                                                     'Angular CLI E2e',
-                                                   );
-                                                   await git(
-                                                     'config',
-                                                     'commit.gpgSign',
-                                                     'false',
-                                                   );
-                                                   await useBuiltPackages();
-                                                   await useCIChrome(
-                                                     'e2e',
-                                                   );
-                                                   await useCIChrome(
-                                                     '',
-                                                   );
-
-                                                   // legacy projects
-                                                   await useCIChrome(
-                                                     'src',
-                                                   );
-
-                                                   await useDevKitSnapshots();
-                                                   (await argv[
-                                                     'ng2'
-                                                   ])
-                                                     ? useNg2()
-                                                     : Promise.resolve();
-                                                   (await argv[
-                                                     'ng4'
-                                                   ])
-                                                     ? useNg4()
-                                                     : Promise.resolve();
-                                                   (await argv[
-                                                     'ng-snapshots'
-                                                   ]) ||
-                                                   argv[
-                                                     'ng-tag'
-                                                   ]
-                                                     ? useSha()
-                                                     : Promise.resolve();
-                                                   await console.log(
-                                                     `Project ${name} created... Installing npm.`,
-                                                   );
-                                                   await silentNpm(
-                                                     'install',
-                                                   );
-                                                   await useCIDefaults(
-                                                     name,
-                                                   );
-                                                   // Force sourcemaps to be from the root of the filesystem.
-                                                   await updateJsonFile(
-                                                     'tsconfig.json',
-                                                     json => {
-                                                       json[
-                                                         'compilerOptions'
-                                                       ][
-                                                         'sourceRoot'
-                                                       ] =
-                                                         '/';
-                                                     },
-                                                   );
-                                                   await gitCommit(
-                                                     'prepare-project-for-e2e',
-                                                   );
-                                                 }
+  const argv: string[] = getGlobalVariable(
+    'argv',
+  );
+
+  await git(
+    'config',
+    'user.email',
+    'angular-core+e2e@google.com',
+  );
+  await git(
+    'config',
+    'user.name',
+    'Angular CLI E2e',
+  );
+  await git(
+    'config',
+    'commit.gpgSign',
+    'false',
+  );
+  await useBuiltPackages();
+  await useCIChrome(
+    'e2e',
+  );
+  await useCIChrome(
+    '',
+  );
+
+  // legacy projects
+  await useCIChrome(
+    'src',
+  );
+
+  await useDevKitSnapshots();
+  (await argv[
+    'ng2'
+  ])
+    ? useNg2()
+    : Promise.resolve();
+  (await argv[
+    'ng4'
+  ])
+    ? useNg4()
+    : Promise.resolve();
+  (await argv[
+    'ng-snapshots'
+  ]) ||
+    argv[
+    'ng-tag'
+    ]
+    ? useSha()
+    : Promise.resolve();
+  await console.log(
+    `Project ${name} created... Installing npm.`,
+  );
+  await silentNpm(
+    'install',
+  );
+  await useCIDefaults(
+    name,
+  );
+  // Force sourcemaps to be from the root of the filesystem.
+  await updateJsonFile(
+    'tsconfig.json',
+    json => {
+      json[
+        'compilerOptions'
+      ][
+        'sourceRoot'
+      ] =
+        '/';
+    },
+  );
+  await gitCommit(
+    'prepare-project-for-e2e',
+  );
+}
 
 
 export function useDevKit(devkitRoot: string) {
@@ -133,28 +133,28 @@ export function useDevKit(devkitRoot: string) {
       const devkitPackages = require(devkitRoot + '/lib/packages').packages;
 
       return updateJsonFile('package.json', json => {
-          if (!json['dependencies']) {
-            json['dependencies'] = {};
-          }
-          if (!json['devDependencies']) {
-            json['devDependencies'] = {};
-          }
+        if (!json['dependencies']) {
+          json['dependencies'] = {};
+        }
+        if (!json['devDependencies']) {
+          json['devDependencies'] = {};
+        }
 
-          for (const packageName of Object.keys(devkitPackages)) {
-            if (json['dependencies'].hasOwnProperty(packageName)) {
-              json['dependencies'][packageName] = devkitPackages[packageName].tar;
-            } else if (json['devDependencies'].hasOwnProperty(packageName)) {
-              json['devDependencies'][packageName] = devkitPackages[packageName].tar;
-            }
+        for (const packageName of Object.keys(devkitPackages)) {
+          if (json['dependencies'].hasOwnProperty(packageName)) {
+            json['dependencies'][packageName] = devkitPackages[packageName].tar;
+          } else if (json['devDependencies'].hasOwnProperty(packageName)) {
+            json['devDependencies'][packageName] = devkitPackages[packageName].tar;
           }
-        });
+        }
+      });
     });
 }
 
 export function useDevKitSnapshots() {
   return updateJsonFile('package.json', json => {
     // TODO: actually add these.
-                                                           // These were not working on any test that ran `npm i`.
+    // These were not working on any test that ran `npm i`.
     // json['devDependencies']['@angular-devkit/build-angular'] =
     //   'github:angular/angular-devkit-build-angular-builds';
     // // By adding build-ng-packagr preemptively, adding a lib will not update it.
@@ -175,8 +175,8 @@ export function useBuiltPackages() {
 
       for (const packageName of Object.keys(packages)) {
         if (json['dependencies'].hasOwnProperty(packageName)
-                                                           ) {
-                                                                 json['dependencies'][packageName] = packages[packageName].tar;
+        ) {
+          json['dependencies'][packageName] = packages[packageName].tar;
         } else if (json['devDependencies'].hasOwnProperty(packageName)) {
           json['devDependencies'][packageName] = packages[packageName].tar;
         }
@@ -197,26 +197,26 @@ export function useSha() {
       function replaceDependencies(key: string) {
         const missingSnapshots = [];
         Object.keys(json[key] || {})
-        .filter(name => name.match(/^@angular\//))
-        .forEach(name => {
-          const pkgName = name.split(/\//)[1];
-          if (pkgName == 'cli') {
-            return;
-          }
-          if (label) {
-            json[key][`@angular/${pkgName}`]
-              = `github:angular/${pkgName}-builds${label}`;
-          } else {
-            const replacement = ngSnapshotVersions.dependencies[`@angular/${pkgName}`];
-            if (!replacement) {
-              missingSnapshots.push(`missing @angular/${pkgName}`);
+          .filter(name => name.match(/^@angular\//))
+          .forEach(name => {
+            const pkgName = name.split(/\//)[1];
+            if (pkgName == 'cli') {
+              return;
             }
-            json[key][`@angular/${pkgName}`] = replacement;
-          }
-        });
+            if (label) {
+              json[key][`@angular/${pkgName}`]
+                = `github:angular/${pkgName}-builds${label}`;
+            } else {
+              const replacement = ngSnapshotVersions.dependencies[`@angular/${pkgName}`];
+              if (!replacement) {
+                missingSnapshots.push(`missing @angular/${pkgName}`);
+              }
+              json[key][`@angular/${pkgName}`] = replacement;
+            }
+          });
         if (missingSnapshots.length > 0) {
           throw new Error('e2e test with --ng-snapshots requires all angular packages be ' +
-          'listed in tests/legacy-cli/e2e/ng-snapshot/package.json.\nErrors:\n' + missingSnapshots.join('\n  '));
+            'listed in tests/legacy-cli/e2e/ng-snapshot/package.json.\nErrors:\n' + missingSnapshots.join('\n  '));
         }
       }
       try {
@@ -281,18 +281,18 @@ export function useCIDefaults(projectName = 'test-project') {
 
     // legacy project structure
     const e2eProject = workspaceJson.projects[projectName + '-e2e'];
-    if (e2eProject){
+    if (e2eProject) {
       const e2eTargets = e2eProject.targets || e2eProject.architect;
       e2eTargets.e2e.options.webdriverUpdate = false;
     }
   })
-  .then(() => updateJsonFile('package.json', json => {
-    // Use matching versions of Chrome and Webdriver.
-    json['scripts']['webdriver-update'] = 'webdriver-manager update' +
-      ` --standalone false --gecko false --versions.chrome 2.45`; // Supports Chrome v70-72
+    .then(() => updateJsonFile('package.json', json => {
+      // Use matching versions of Chrome and Webdriver.
+      json['scripts']['webdriver-update'] = 'webdriver-manager update' +
+        ` --standalone false --gecko false --versions.chrome 2.45`; // Supports Chrome v70-72
 
-  }))
-  .then(() => npm('run', 'webdriver-update'));
+    }))
+    .then(() => npm('run', 'webdriver-update'));
 }
 
 export function useCIChrome(projectDir: string) {
@@ -307,7 +307,7 @@ export function useCIChrome(projectDir: string) {
       json['devDependencies']['karma-chrome-launcher'] = '~2.2.0'; // Minimum for ChromeHeadless.
     }))
     // Use Pupeteer in protractor if a config is found on the project.
-    .then(() =>  {
+    .then(() => {
       if (fs.existsSync(protractorConf)) {
         return replaceInFile(protractorConf,
           `'browserName': 'chrome'`,
@@ -320,13 +320,13 @@ export function useCIChrome(projectDir: string) {
       }
     })
     // Use Pupeteer in karma if a config is found on the project.
-    .then(() =>  {
+    .then(() => {
       if (fs.existsSync(karmaConf)) {
         return prependToFile(karmaConf,
           `process.env.CHROME_BIN = require('puppeteer').executablePath();`)
-        .then(() => replaceInFile(karmaConf,
-          `browsers: ['Chrome']`,
-          `browsers: ['Chrome'],
+          .then(() => replaceInFile(karmaConf,
+            `browsers: ['Chrome']`,
+            `browsers: ['Chrome'],
           customLaunchers: {
             ChromeHeadlessCI: {
               base: 'ChromeHeadless',

From 7f70af4559ef222af68ef8f417ae3151d5d99a79 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Thu, 21 Mar 2019 09:53:59 +0100
Subject: [PATCH 0973/1703] ci: remove hardcoded typescript version for
 snapshots

---
 tests/legacy-cli/e2e/utils/project.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts
index 2e8693fff7f8..112768a14c42 100644
--- a/tests/legacy-cli/e2e/utils/project.ts
+++ b/tests/legacy-cli/e2e/utils/project.ts
@@ -225,7 +225,6 @@ export function useSha() {
       } catch (e) {
         return Promise.reject(e);
       }
-      json['devDependencies']['typescript'] = '~3.1.1';
     });
   } else {
     return Promise.resolve();

From 49ba744f2356cd03a6ef26f069cb5dc12de77e7d Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 21 Mar 2019 10:30:40 -0700
Subject: [PATCH 0974/1703] test: add filter, seed and better diff checking to
 test script

It wasnt checking the staging area. It also now shows the packages that will be
tested.

Filter and Seed are arguments that are directly passed to Jasmine. They can be
used to reproduce tests.
---
 scripts/test.ts | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/scripts/test.ts b/scripts/test.ts
index 3a5b853117a2..04f738bd2b97 100644
--- a/scripts/test.ts
+++ b/scripts/test.ts
@@ -17,6 +17,7 @@ import { join, relative } from 'path';
 import { Position, SourceMapConsumer } from 'source-map';
 import * as ts from 'typescript';
 import { packages } from '../lib/packages';
+import { diff } from 'semver';
 
 const codeMap = require('../lib/istanbul-local').codeMap;
 const Jasmine = require('jasmine');
@@ -225,12 +226,15 @@ export default function (args: ParsedArgs, logger: logging.Logger) {
     const sha = branchRevList.find(s => masterRevList.includes(s));
 
     if (sha) {
-      const diffFiles = _exec(
-        'git',
-        ['diff', sha, 'HEAD', '--name-only'],
-        {},
-        logger,
-      ).trim().split('\n');
+      const diffFiles = [
+        // Get diff between $SHA and HEAD.
+        ..._exec('git', ['diff', sha, 'HEAD', '--name-only'], {}, logger)
+          .trim().split('\n'),
+        // And add the current status to it (so it takes the non-committed changes).
+        ..._exec('git', ['status', '--short', '--show-stash'], {}, logger)
+          .split('\n').map(x => x.slice(2).trim()),
+      ].filter(x => x !== '');
+
       const diffPackages = new Set();
       for (const pkgName of Object.keys(packages)) {
         const relativeRoot = relative(projectBaseDir, packages[pkgName].root);
@@ -241,6 +245,10 @@ export default function (args: ParsedArgs, logger: logging.Logger) {
         }
       }
 
+      // Show the packages that we will test.
+      logger.info(`Found ${diffPackages.size} packages:`);
+      logger.info(JSON.stringify([...diffPackages], null, 2));
+
       // Remove the tests from packages that haven't changed.
       tests = tests
         .filter(p => Object.keys(packages).some(name => {
@@ -267,6 +275,10 @@ export default function (args: ParsedArgs, logger: logging.Logger) {
 
   return new Promise(resolve => {
     runner.onComplete((passed: boolean) => resolve(passed ? 0 : 1));
-    runner.execute(tests);
+    if (args.seed != undefined) {
+      runner.seed(args.seed);
+    }
+
+    runner.execute(tests, args.filter);
   });
 }

From bf1c988e07f911f9bf8ac16a0d342cff23e4719c Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Thu, 21 Mar 2019 10:42:37 -0700
Subject: [PATCH 0975/1703] test: fix windows path issues

---
 scripts/test.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/test.ts b/scripts/test.ts
index 04f738bd2b97..87d0f9cb4189 100644
--- a/scripts/test.ts
+++ b/scripts/test.ts
@@ -13,11 +13,10 @@ import * as Istanbul from 'istanbul';
 import 'jasmine';
 import { SpecReporter as JasmineSpecReporter } from 'jasmine-spec-reporter';
 import { ParsedArgs } from 'minimist';
-import { join, relative } from 'path';
+import { join, normalize, relative } from 'path';
 import { Position, SourceMapConsumer } from 'source-map';
 import * as ts from 'typescript';
 import { packages } from '../lib/packages';
-import { diff } from 'semver';
 
 const codeMap = require('../lib/istanbul-local').codeMap;
 const Jasmine = require('jasmine');
@@ -233,7 +232,9 @@ export default function (args: ParsedArgs, logger: logging.Logger) {
         // And add the current status to it (so it takes the non-committed changes).
         ..._exec('git', ['status', '--short', '--show-stash'], {}, logger)
           .split('\n').map(x => x.slice(2).trim()),
-      ].filter(x => x !== '');
+      ]
+        .map(x => normalize(x))
+        .filter(x => x !== '.' && x !== '');  // Empty paths will be normalized to dot.
 
       const diffPackages = new Set();
       for (const pkgName of Object.keys(packages)) {

From 4782b1b3a47999584becd935ce6673beab6ddb53 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 22 Mar 2019 14:42:14 +0000
Subject: [PATCH 0976/1703] build: update typescript to version 3.3.4000

---
 package.json                                         | 2 +-
 packages/angular_devkit/build_optimizer/package.json | 2 +-
 packages/ngtools/webpack/package.json                | 2 +-
 yarn.lock                                            | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index e0c38ce053ef..ff6a545cca43 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
     "quicktype-core": "^6.0.15",
     "temp": "^0.9.0",
     "tslint": "^5.13.1",
-    "typescript": "3.3.3333"
+    "typescript": "3.3.4000"
   },
   "devDependencies": {
     "@angular/compiler": "^8.0.0-beta.9",
diff --git a/packages/angular_devkit/build_optimizer/package.json b/packages/angular_devkit/build_optimizer/package.json
index e6fa84bcb181..3b7abb4a37bf 100644
--- a/packages/angular_devkit/build_optimizer/package.json
+++ b/packages/angular_devkit/build_optimizer/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "loader-utils": "1.2.3",
     "source-map": "0.5.6",
-    "typescript": "3.3.3333",
+    "typescript": "3.3.4000",
     "webpack-sources": "1.3.0"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index fe9ec24f65e5..c1b45a0bc910 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -35,7 +35,7 @@
   "devDependencies": {
     "@angular/compiler": "^8.0.0-beta.9",
     "@angular/compiler-cli": "^8.0.0-beta.9",
-    "typescript": "3.3.3333",
+    "typescript": "3.3.4000",
     "webpack": "4.29.6"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 4f602495970d..88317a0ad163 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9434,10 +9434,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@3.3.3333:
-  version "3.3.3333"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.3333.tgz#171b2c5af66c59e9431199117a3bcadc66fdcfd6"
-  integrity sha512-JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw==
+typescript@3.3.4000:
+  version "3.3.4000"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.4000.tgz#76b0f89cfdbf97827e1112d64f283f1151d6adf0"
+  integrity sha512-jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA==
 
 uglify-js@^3.0.7, uglify-js@^3.1.4:
   version "3.4.9"

From 818bf32d689756185dbf8301018828b9f7a83bc1 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Fri, 22 Mar 2019 11:09:10 -0700
Subject: [PATCH 0977/1703] refactor(@angular-devkit/build-angular): use
 quicktype of app-shell schema

---
 .../build_angular/src/app-shell/index.ts          |  2 +-
 .../build_angular/src/app-shell/schema.d.ts       | 15 ---------------
 .../build_angular/src/app-shell/schema.json       |  1 +
 3 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 packages/angular_devkit/build_angular/src/app-shell/schema.d.ts

diff --git a/packages/angular_devkit/build_angular/src/app-shell/index.ts b/packages/angular_devkit/build_angular/src/app-shell/index.ts
index 7c08d7e54bde..8b72d4c67709 100644
--- a/packages/angular_devkit/build_angular/src/app-shell/index.ts
+++ b/packages/angular_devkit/build_angular/src/app-shell/index.ts
@@ -18,7 +18,7 @@ import { requireProjectModule } from '../angular-cli-files/utilities/require-pro
 import { augmentAppWithServiceWorker } from '../angular-cli-files/utilities/service-worker';
 import { Schema as BrowserBuilderSchema } from '../browser/schema';
 import { Schema as BuildWebpackServerSchema } from '../server/schema';
-import { BuildWebpackAppShellSchema } from './schema';
+import { Schema as BuildWebpackAppShellSchema } from './schema';
 
 
 export class AppShellBuilder implements Builder<BuildWebpackAppShellSchema> {
diff --git a/packages/angular_devkit/build_angular/src/app-shell/schema.d.ts b/packages/angular_devkit/build_angular/src/app-shell/schema.d.ts
deleted file mode 100644
index b7f0b1d1de37..000000000000
--- a/packages/angular_devkit/build_angular/src/app-shell/schema.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-export interface BuildWebpackAppShellSchema {
-  browserTarget: string;
-  serverTarget: string;
-  appModuleBundle?: string;
-  route: string;
-  inputIndexPath?: string;
-  outputIndexPath?: string;
-}
diff --git a/packages/angular_devkit/build_angular/src/app-shell/schema.json b/packages/angular_devkit/build_angular/src/app-shell/schema.json
index 4e246a6f8360..e7fb6156d47f 100644
--- a/packages/angular_devkit/build_angular/src/app-shell/schema.json
+++ b/packages/angular_devkit/build_angular/src/app-shell/schema.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "http://json-schema.org/draft-07/schema",
   "title": "App Shell Target",
   "description": "App Shell target options for Build Facade.",
   "type": "object",

From 69e4103cefce126737f792d5e117276e790e7903 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Fri, 22 Mar 2019 12:43:53 -0700
Subject: [PATCH 0978/1703] feat(@angular-devkit/build-angular): add server
 output path

---
 .../build_angular/src/server/index2.ts        | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/server/index2.ts b/packages/angular_devkit/build_angular/src/server/index2.ts
index 2efbd4f2fd60..d495725c466f 100644
--- a/packages/angular_devkit/build_angular/src/server/index2.ts
+++ b/packages/angular_devkit/build_angular/src/server/index2.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { createBuilder } from '@angular-devkit/architect/src/index2';
+import { BuilderOutput, createBuilder } from '@angular-devkit/architect/src/index2';
 import {
   Path,
   experimental,
@@ -17,6 +17,7 @@ import {
 } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { Stats } from 'fs';
+import * as path from 'path';
 import { from, of } from 'rxjs';
 import { concatMap, map } from 'rxjs/operators';
 import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
@@ -41,7 +42,16 @@ import { Schema as BuildWebpackServerSchema } from './schema';
 const webpackMerge = require('webpack-merge');
 
 
-export default createBuilder<json.JsonObject & BuildWebpackServerSchema>((options, context) => {
+// If success is true, outputPath should be set.
+export type ServerBuilderOutput = json.JsonObject & BuilderOutput & {
+  outputPath?: string;
+};
+
+
+export default createBuilder<
+  json.JsonObject & BuildWebpackServerSchema,
+  ServerBuilderOutput
+>((options, context) => {
   const host = new virtualFs.AliasHost(new NodeJsSyncHost());
   const root = context.workspaceRoot;
 
@@ -101,6 +111,16 @@ export default createBuilder<json.JsonObject & BuildWebpackServerSchema>((option
 
       return runWebpack(webpackConfig, context);
     }),
+    map(output => {
+      if (output.success === false) {
+        return output as ServerBuilderOutput;
+      }
+
+      return {
+        ...output,
+        outputPath: path.resolve(root, options.outputPath),
+      } as ServerBuilderOutput;
+    }),
   );
 });
 

From 872799e17469d2fb6da42678ca2135778c14cb4a Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Fri, 22 Mar 2019 12:44:56 -0700
Subject: [PATCH 0979/1703] feat(@angular-devkit/build-angular): add AppShell
 new API builder

This is fully compatible with the new API. The tests have been moved 1:1.
The cleanup in general is noticable.
---
 .../build_angular/builders.json               |   1 +
 .../build_angular/src/app-shell/index2.ts     | 161 ++++++++++++++++++
 .../test/app-shell/app-shell_spec_large.ts    | 112 ++++++------
 3 files changed, 225 insertions(+), 49 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/src/app-shell/index2.ts

diff --git a/packages/angular_devkit/build_angular/builders.json b/packages/angular_devkit/build_angular/builders.json
index 41143b80c52d..fa89a35d3360 100644
--- a/packages/angular_devkit/build_angular/builders.json
+++ b/packages/angular_devkit/build_angular/builders.json
@@ -3,6 +3,7 @@
   "builders": {
     "app-shell": {
       "class": "./src/app-shell",
+      "implementation": "./src/app-shell/index2",
       "schema": "./src/app-shell/schema.json",
       "description": "Build a server app and a browser app, then render the index.html and use it for the browser output."
     },
diff --git a/packages/angular_devkit/build_angular/src/app-shell/index2.ts b/packages/angular_devkit/build_angular/src/app-shell/index2.ts
new file mode 100644
index 000000000000..b4665e69df6d
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/app-shell/index2.ts
@@ -0,0 +1,161 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import {
+  BuilderContext,
+  BuilderOutput,
+  createBuilder,
+  targetFromTargetString,
+} from '@angular-devkit/architect/src/index2';
+import { JsonObject, experimental, join, normalize, resolve, schema } from '@angular-devkit/core';
+import { NodeJsSyncHost } from '@angular-devkit/core/node';
+import * as fs from 'fs';
+import * as path from 'path';
+import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
+import { augmentAppWithServiceWorker } from '../angular-cli-files/utilities/service-worker';
+import { BrowserBuilderOutput } from '../browser/index2';
+import { Schema as BrowserBuilderSchema } from '../browser/schema';
+import { ServerBuilderOutput } from '../server/index2';
+import { Schema as BuildWebpackAppShellSchema } from './schema';
+
+
+async function _renderUniversal(
+  options: BuildWebpackAppShellSchema,
+  context: BuilderContext,
+  browserResult: BrowserBuilderOutput,
+  serverResult: ServerBuilderOutput,
+): Promise<BrowserBuilderOutput> {
+  const browserIndexOutputPath = path.join(browserResult.outputPath || '', 'index.html');
+  const indexHtml = fs.readFileSync(browserIndexOutputPath, 'utf8');
+  const serverBundlePath = await _getServerModuleBundlePath(options, context, serverResult);
+
+  const root = context.workspaceRoot;
+  requireProjectModule(root, 'zone.js/dist/zone-node');
+
+  const renderModuleFactory = requireProjectModule(
+    root,
+    '@angular/platform-server',
+  ).renderModuleFactory;
+  const AppServerModuleNgFactory = require(serverBundlePath).AppServerModuleNgFactory;
+  const outputIndexPath = options.outputIndexPath
+    ? path.join(root, options.outputIndexPath)
+    : browserIndexOutputPath;
+
+  // Render to HTML and overwrite the client index file.
+  const html = await renderModuleFactory(AppServerModuleNgFactory, {
+    document: indexHtml,
+    url: options.route,
+  });
+
+  fs.writeFileSync(outputIndexPath, html);
+
+  const browserTarget = targetFromTargetString(options.browserTarget);
+  const rawBrowserOptions = await context.getTargetOptions(browserTarget);
+  const browserBuilderName = await context.getBuilderNameForTarget(browserTarget);
+  const browserOptions = await context.validateOptions<JsonObject & BrowserBuilderSchema>(
+    rawBrowserOptions,
+    browserBuilderName,
+  );
+
+  if (browserOptions.serviceWorker) {
+    const host = new NodeJsSyncHost();
+    // Create workspace.
+    const registry = new schema.CoreSchemaRegistry();
+    registry.addPostTransform(schema.transforms.addUndefinedDefaults);
+
+    const workspace = await experimental.workspace.Workspace.fromPath(
+      host,
+      normalize(context.workspaceRoot),
+      registry,
+    );
+    const projectName = context.target ? context.target.project : workspace.getDefaultProjectName();
+
+    if (!projectName) {
+      throw new Error('Must either have a target from the context or a default project.');
+    }
+    const projectRoot = resolve(
+      workspace.root,
+      normalize(workspace.getProject(projectName).root),
+    );
+
+    await augmentAppWithServiceWorker(
+      host,
+      normalize(root),
+      projectRoot,
+      join(normalize(root), browserOptions.outputPath),
+      browserOptions.baseHref || '/',
+      browserOptions.ngswConfigPath,
+    );
+  }
+
+  return browserResult;
+}
+
+
+async function _getServerModuleBundlePath(
+  options: BuildWebpackAppShellSchema,
+  context: BuilderContext,
+  serverResult: ServerBuilderOutput,
+) {
+  if (options.appModuleBundle) {
+    return path.join(context.workspaceRoot, options.appModuleBundle);
+  } else {
+    const outputPath = serverResult.outputPath || '/';
+    const files = fs.readdirSync(outputPath, 'utf8');
+    const re = /^main\.(?:[a-zA-Z0-9]{20}\.)?(?:bundle\.)?js$/;
+    const maybeMain = files.filter(x => re.test(x))[0];
+
+    if (!maybeMain) {
+      throw new Error('Could not find the main bundle.');
+    } else {
+      return path.join(outputPath, maybeMain);
+    }
+  }
+}
+
+
+async function _appShellBuilder(
+  options: JsonObject & BuildWebpackAppShellSchema,
+  context: BuilderContext,
+): Promise<BuilderOutput> {
+  const browserTarget = targetFromTargetString(options.browserTarget);
+  const serverTarget = targetFromTargetString(options.serverTarget);
+
+  // Never run the browser target in watch mode.
+  // If service worker is needed, it will be added in _renderUniversal();
+  const browserTargetRun = await context.scheduleTarget(browserTarget, {
+    watch: false,
+    serviceWorker: false,
+  });
+  const serverTargetRun = await context.scheduleTarget(serverTarget, {});
+
+  try {
+    const [browserResult, serverResult] = await Promise.all([
+      browserTargetRun.result as {} as BrowserBuilderOutput,
+      serverTargetRun.result,
+    ]);
+
+    if (browserResult.success === false || browserResult.outputPath === undefined) {
+      return browserResult;
+    } else if (serverResult.success === false) {
+      return serverResult;
+    }
+
+    return await _renderUniversal(options, context, browserResult, serverResult);
+  } catch (err) {
+    return { success: false, error: err.message };
+  } finally {
+    // Just be good citizens and stop those jobs.
+    await Promise.all([
+      browserTargetRun.stop(),
+      serverTargetRun.stop(),
+    ]);
+  }
+}
+
+
+export default createBuilder(_appShellBuilder);
diff --git a/packages/angular_devkit/build_angular/test/app-shell/app-shell_spec_large.ts b/packages/angular_devkit/build_angular/test/app-shell/app-shell_spec_large.ts
index ffce164822d6..7684a45550f8 100644
--- a/packages/angular_devkit/build_angular/test/app-shell/app-shell_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/app-shell/app-shell_spec_large.ts
@@ -7,19 +7,22 @@
  */
 // tslint:disable:no-big-function
 
-import { DefaultTimeout, runTargetSpec } from '@angular-devkit/architect/testing';
 import { getSystemPath, join, normalize, virtualFs } from '@angular-devkit/core';
 import * as express from 'express'; // tslint:disable-line:no-implicit-dependencies
-import { Server } from 'http';
-import { concatMap, tap } from 'rxjs/operators';
-import { host, protractorTargetSpec } from '../utils';
+import { Architect } from '../../../architect/src/architect';
+import { createArchitect, host } from '../utils';
 
 
 describe('AppShell Builder', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  const target = { project: 'app', target: 'app-shell' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
-  const targetSpec = { project: 'app', target: 'app-shell' };
   const appShellRouteFiles = {
     'src/app/app-shell/app-shell.component.html': `
       <p>
@@ -120,36 +123,37 @@ describe('AppShell Builder', () => {
     `,
   };
 
-  it('works (basic)', done => {
+  it('works (basic)', async () => {
     host.replaceInFile('src/app/app.module.ts', /    BrowserModule/, `
       BrowserModule.withServerTransition({ appId: 'some-app' })
     `);
 
-    runTargetSpec(host, targetSpec, {}, DefaultTimeout * 2).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = 'dist/index.html';
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        expect(content).toMatch(/Welcome to app!/);
-      }),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(target);
+    const output = await run.result;
+    await run.stop();
+
+    expect(output.success).toBe(true);
+
+    const fileName = 'dist/index.html';
+    const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
+    expect(content).toMatch(/Welcome to app!/);
   });
 
-  it('works with route', done => {
+  it('works with route', async () => {
     host.writeMultipleFiles(appShellRouteFiles);
     const overrides = { route: 'shell' };
 
-    runTargetSpec(host, targetSpec, overrides, DefaultTimeout * 2).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = 'dist/index.html';
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        expect(content).toContain('app-shell works!');
-      }),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(target, overrides);
+    const output = await run.result;
+    await run.stop();
+
+    expect(output.success).toBe(true);
+    const fileName = 'dist/index.html';
+    const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
+    expect(content).toContain('app-shell works!');
   });
 
-  it('works with route and service-worker', done => {
+  it('works with route and service-worker', async () => {
     host.writeMultipleFiles(appShellRouteFiles);
     host.writeMultipleFiles({
       'src/ngsw-config.json': `
@@ -225,29 +229,39 @@ describe('AppShell Builder', () => {
       '"buildOptimizer": true, "serviceWorker": true',
     );
 
+    // We're changing the workspace file so we need to recreate the Architect instance.
+    architect = (await createArchitect(host.root())).architect;
+
     const overrides = { route: 'shell' };
-    const prodTargetSpec = { ...targetSpec, configuration: 'production' };
-    let server: Server;
-
-    // Build the app shell.
-    runTargetSpec(host, prodTargetSpec, overrides, DefaultTimeout * 2).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      // Make sure the index is pre-rendering the route.
-      tap(() => {
-        const fileName = 'dist/index.html';
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        expect(content).toContain('app-shell works!');
-      }),
-      tap(() => {
-        // Serve the app using a simple static server.
-        const app = express();
-        app.use('/', express.static(getSystemPath(join(host.root(), 'dist')) + '/'));
-        server = app.listen(4200);
-      }),
-      // Load app in protractor, then check service worker status.
-      concatMap(() => runTargetSpec(host, protractorTargetSpec, { devServerTarget: undefined })),
-      // Close the express server.
-      tap(() => server.close()),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(
+      { ...target, configuration: 'production' },
+      overrides,
+    );
+    const output = await run.result;
+    await run.stop();
+
+    expect(output.success).toBe(true);
+
+    // Make sure the index is pre-rendering the route.
+    const fileName = 'dist/index.html';
+    const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
+    expect(content).toContain('app-shell works!');
+
+    // Serve the app using a simple static server.
+    const app = express();
+    app.use('/', express.static(getSystemPath(join(host.root(), 'dist')) + '/'));
+    const server = app.listen(4200);
+
+    // Load app in protractor, then check service worker status.
+    const protractorRun = await architect.scheduleTarget(
+      { project: 'app-e2e', target: 'e2e' },
+      { devServerTarget: undefined } as {},
+    );
+    const protractorOutput = await protractorRun.result;
+    await protractorRun.stop();
+    expect(protractorOutput.success).toBe(true);
+
+    // Close the express server.
+    server.close();
   });
 });

From c0b57ef7d08f549f48ed9b6ebeb707daf7a01483 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 23 Mar 2019 05:52:18 +0000
Subject: [PATCH 0980/1703] build: update copy-webpack-plugin to version 5.0.2

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 53be9bc2fd8d..c9be4ad79685 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -16,7 +16,7 @@
     "autoprefixer": "9.5.0",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
-    "copy-webpack-plugin": "5.0.1",
+    "copy-webpack-plugin": "5.0.2",
     "file-loader": "3.0.1",
     "glob": "7.1.3",
     "istanbul-instrumenter-loader": "3.0.1",
diff --git a/yarn.lock b/yarn.lock
index 88317a0ad163..4ba05369b774 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2451,10 +2451,10 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-webpack-plugin@5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.1.tgz#97997989cc5bc69976bf64f660bd19663481f089"
-  integrity sha512-yMTURAkYZO/6h6pGMbHQl2jpKtRNC+0Cy/4kRRP6qUHmpbGGAzNnyMecE6aHgGFCb4ksrL3YcDqYGb8ds3J9cw==
+copy-webpack-plugin@5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.2.tgz#56186dfddbf9aa1b29c97fa4c796c1be98870da4"
+  integrity sha512-7nC7EynPrnBTtBwwbG1aTqrfNS1aTb9eEjSmQDqFtKAsJrR3uDb+pCDIFT2LzhW+SgGJxQcYzThrmXzzZ720uw==
   dependencies:
     cacache "^11.3.1"
     find-cache-dir "^2.0.0"

From 75abc79e37a08f23160ee18803516712ef5fe4bd Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Mon, 25 Mar 2019 15:18:47 +0100
Subject: [PATCH 0981/1703] fix(@angular/cli): fix import path for
 TimingOptions

Fixes #13978
---
 packages/angular/cli/models/analytics.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/angular/cli/models/analytics.ts b/packages/angular/cli/models/analytics.ts
index 1d46e4acae74..f288514df1a9 100644
--- a/packages/angular/cli/models/analytics.ts
+++ b/packages/angular/cli/models/analytics.ts
@@ -13,7 +13,6 @@ import * as inquirer from 'inquirer';
 import * as os from 'os';
 import * as ua from 'universal-analytics';
 import { v4 as uuidV4 } from 'uuid';
-import { TimingOptions } from '../../../angular_devkit/core/src/analytics';
 import { getWorkspace, getWorkspaceRaw } from '../utilities/config';
 
 const analyticsDebug = debug('ng:analytics');  // Generate analytics, including settings and users.
@@ -309,7 +308,7 @@ export class UniversalAnalytics implements analytics.Analytics {
     this._dirty = true;
     this._ua.pageview({ dp, dh, dt, ...vars });
   }
-  timing(utc: string, utv: string, utt: string | number, options: TimingOptions = {}) {
+  timing(utc: string, utv: string, utt: string | number, options: analytics.TimingOptions = {}) {
     const vars = this._customVariables(options);
     analyticsLogDebug('timing utc=%j, utv=%j, utl=%j, %j', utc, utv, utt, vars);
 

From 470ae53a63465086ac3aa06601e7e31d7ba33f85 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 25 Mar 2019 10:36:57 -0700
Subject: [PATCH 0982/1703] fix(@angular/cli): don't remove scripts from
 package.json

This was dropped because we used to have postinstall scripts that
we did not want to use on npm. We don't anymore, so there's no
use in removing those scripts.
---
 lib/packages.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/packages.ts b/lib/packages.ts
index 923d6a017be2..66b3536f484d 100644
--- a/lib/packages.ts
+++ b/lib/packages.ts
@@ -59,11 +59,11 @@ function loadPackageJson(p: string) {
       case 'private':
       case 'workspaces':
       case 'resolutions':
+      case 'scripts':
         continue;
 
       // Remove the following keys from the package.json.
       case 'devDependencies':
-      case 'scripts':
         delete pkg[key];
         continue;
 

From 696272bd405a884f68d6477afdce9e5fc5379920 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 25 Mar 2019 10:43:24 -0700
Subject: [PATCH 0983/1703] fix(@angular/cli): if no global config file found,
 analytics can be null

This happens if there is no file at all (otherwise it would be undefined). This was
causing an exception and returning false instead of undefined, preventing the
prompt. Now we return undefined in this case.

To be clear, this is because getWorkspace returns null, and the logic makes
analyticsConfig null in this case.
---
 packages/angular/cli/models/analytics.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/angular/cli/models/analytics.ts b/packages/angular/cli/models/analytics.ts
index f288514df1a9..684b33d2f176 100644
--- a/packages/angular/cli/models/analytics.ts
+++ b/packages/angular/cli/models/analytics.ts
@@ -474,10 +474,14 @@ export function getGlobalAnalytics(): string | boolean | undefined {
     const analyticsConfig = globalWorkspace
       && globalWorkspace.getCli()
       && globalWorkspace.getCli()['analytics'];
+    analyticsDebug('Client Analytics config found: %j', analyticsConfig);
 
     if (analyticsConfig === false) {
       return false;
-    } else if (analyticsConfig === undefined) {
+    } else if (analyticsConfig === undefined || analyticsConfig === null) {
+      // globalWorkspace can be null if there is no file. analyticsConfig would be null in this
+      // case. Since there is no file, the user hasn't answered and the expected return value is
+      // undefined.
       return undefined;
     } else {
       let uid: string | undefined = undefined;
@@ -491,7 +495,9 @@ export function getGlobalAnalytics(): string | boolean | undefined {
 
       return uid;
     }
-  } catch {
+  } catch (err) {
+    analyticsDebug('Error happened during reading of analytics config: %s', err.message);
+
     return false;
   }
 }

From c840fcb529f49f03167c614c19f6d855abf9f938 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 25 Mar 2019 11:06:11 -0700
Subject: [PATCH 0984/1703] fix(@angular/cli): dont force a prompt on
 non-interactive terminals

For some reason we were forcing the prompt on postinstall, breaking CI.
---
 packages/angular/cli/bin/postinstall/analytics-prompt.js | 2 +-
 packages/angular/cli/models/analytics.ts                 | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/bin/postinstall/analytics-prompt.js b/packages/angular/cli/bin/postinstall/analytics-prompt.js
index a74aad0f5ab4..3a3de1d2b904 100644
--- a/packages/angular/cli/bin/postinstall/analytics-prompt.js
+++ b/packages/angular/cli/bin/postinstall/analytics-prompt.js
@@ -5,6 +5,6 @@ try {
   const analytics = require('../../models/analytics');
 
   if (analytics.getGlobalAnalytics() === undefined) {
-    analytics.promptGlobalAnalytics(true);
+    analytics.promptGlobalAnalytics();
   }
 } catch (_) {}
diff --git a/packages/angular/cli/models/analytics.ts b/packages/angular/cli/models/analytics.ts
index 684b33d2f176..c9dde2d9460b 100644
--- a/packages/angular/cli/models/analytics.ts
+++ b/packages/angular/cli/models/analytics.ts
@@ -392,6 +392,8 @@ export async function promptGlobalAnalytics(force = false) {
     }
 
     return true;
+  } else {
+    analyticsDebug('Either STDOUT or STDIN are not TTY and we skipped the prompt.');
   }
 
   return false;

From a011863477985e88bde3ef867640fab09159e5a0 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 19 Mar 2019 14:07:26 -0400
Subject: [PATCH 0985/1703] feat(@angular-devkit/build-angular): implement
 stable architect API for extract-i18n

---
 .../build_angular/builders.json               |   1 +
 .../build_angular/src/extract-i18n/index2.ts  |  93 ++++++++++++
 .../src/extract-i18n/schema.json              |   1 +
 .../test/extract-i18n/works_spec_large.ts     | 132 ++++++++++--------
 4 files changed, 168 insertions(+), 59 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/src/extract-i18n/index2.ts

diff --git a/packages/angular_devkit/build_angular/builders.json b/packages/angular_devkit/build_angular/builders.json
index fa89a35d3360..7cdbbafb365d 100644
--- a/packages/angular_devkit/build_angular/builders.json
+++ b/packages/angular_devkit/build_angular/builders.json
@@ -21,6 +21,7 @@
     },
     "extract-i18n": {
       "class": "./src/extract-i18n",
+      "implementation": "./src/extract-i18n/index2",
       "schema": "./src/extract-i18n/schema.json",
       "description": "Extract i18n strings from a browser app."
     },
diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/index2.ts b/packages/angular_devkit/build_angular/src/extract-i18n/index2.ts
new file mode 100644
index 000000000000..ff81e34d8024
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/index2.ts
@@ -0,0 +1,93 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import {
+  BuilderContext,
+  createBuilder,
+  targetFromTargetString,
+} from '@angular-devkit/architect/src/index2';
+import { runWebpack } from '@angular-devkit/build-webpack/src/webpack/index2';
+import { JsonObject } from '@angular-devkit/core';
+import * as path from 'path';
+import * as webpack from 'webpack';
+import {
+  getAotConfig,
+  getCommonConfig,
+  getStatsConfig,
+  getStylesConfig,
+} from '../angular-cli-files/models/webpack-configs';
+import { Schema as BrowserBuilderOptions } from '../browser/schema';
+import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
+import { Schema as ExtractI18nBuilderOptions } from './schema';
+
+function getI18nOutfile(format: string | undefined) {
+  switch (format) {
+    case 'xmb':
+      return 'messages.xmb';
+    case 'xlf':
+    case 'xlif':
+    case 'xliff':
+    case 'xlf2':
+    case 'xliff2':
+      return 'messages.xlf';
+    default:
+      throw new Error(`Unsupported format "${format}"`);
+  }
+}
+
+class InMemoryOutputPlugin {
+  apply(compiler: webpack.Compiler): void {
+    // tslint:disable-next-line:no-any
+    compiler.outputFileSystem = new (webpack as any).MemoryOutputFileSystem();
+  }
+}
+
+export async function execute(options: ExtractI18nBuilderOptions, context: BuilderContext) {
+  const browserTarget = targetFromTargetString(options.browserTarget);
+  const browserOptions = await context.validateOptions<JsonObject & BrowserBuilderOptions>(
+    await context.getTargetOptions(browserTarget),
+    await context.getBuilderNameForTarget(browserTarget),
+  );
+
+  // We need to determine the outFile name so that AngularCompiler can retrieve it.
+  let outFile = options.outFile || getI18nOutfile(options.i18nFormat);
+  if (options.outputPath) {
+    // AngularCompilerPlugin doesn't support genDir so we have to adjust outFile instead.
+    outFile = path.join(options.outputPath, outFile);
+  }
+
+  const { config } = await generateBrowserWebpackConfigFromContext(
+    {
+      ...browserOptions,
+      optimization: {
+        scripts: false,
+        styles: false,
+      },
+      i18nLocale: options.i18nLocale,
+      i18nFormat: options.i18nFormat,
+      i18nFile: outFile,
+      aot: true,
+      progress: options.progress,
+      assets: [],
+      scripts: [],
+      styles: [],
+      deleteOutputPath: false,
+    },
+    context,
+    wco => [
+      { plugins: [new InMemoryOutputPlugin()] },
+      getCommonConfig(wco),
+      getAotConfig(wco, true),
+      getStylesConfig(wco),
+      getStatsConfig(wco),
+    ],
+  );
+
+  return runWebpack(config, context).toPromise();
+}
+
+export default createBuilder<JsonObject & ExtractI18nBuilderOptions>(execute);
diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/schema.json b/packages/angular_devkit/build_angular/src/extract-i18n/schema.json
index 574a453c7883..a40af39254db 100644
--- a/packages/angular_devkit/build_angular/src/extract-i18n/schema.json
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/schema.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "http://json-schema.org/draft-07/schema",
   "title": "Extract i18n Target",
   "description": "Extract i18n target options for Build Facade.",
   "type": "object",
diff --git a/packages/angular_devkit/build_angular/test/extract-i18n/works_spec_large.ts b/packages/angular_devkit/build_angular/test/extract-i18n/works_spec_large.ts
index 2c69b92dd220..625722c3a8be 100644
--- a/packages/angular_devkit/build_angular/test/extract-i18n/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/extract-i18n/works_spec_large.ts
@@ -5,105 +5,119 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { DefaultTimeout, TestLogger, runTargetSpec } from '@angular-devkit/architect/testing';
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { TestLogger } from '@angular-devkit/architect/testing';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
-import { extractI18nTargetSpec, host } from '../utils';
+import { createArchitect, extractI18nTargetSpec, host } from '../utils';
 
 
 describe('Extract i18n Target', () => {
   const extractionFile = join(normalize('src'), 'messages.xlf');
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
 
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  afterEach(() => host.restore().toPromise());
 
-  it('works', (done) => {
+  it('works', async () => {
     host.appendToFile('src/app/app.component.html', '<p i18n>i18n test</p>');
 
-    runTargetSpec(host, extractI18nTargetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        expect(host.scopedSync().exists((extractionFile))).toBe(true);
-        expect(virtualFs.fileBufferToString(host.scopedSync().read(extractionFile)))
-          .toMatch(/i18n test/);
-      }),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(extractI18nTargetSpec);
+
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+    await run.stop();
+
+    const exists = host.scopedSync().exists(extractionFile);
+    expect(exists).toBe(true);
+
+    if (exists) {
+      const content = virtualFs.fileBufferToString(host.scopedSync().read(extractionFile));
+      expect(content).toContain('i18n test');
+    }
   }, 30000);
 
-  it('shows errors', (done) => {
+  it('shows errors', async () => {
     const logger = new TestLogger('i18n-errors');
     host.appendToFile('src/app/app.component.html',
       '<p i18n>Hello world <span i18n>inner</span></p>');
 
-    runTargetSpec(host, extractI18nTargetSpec, {}, DefaultTimeout, logger).pipe(
-      tap((buildEvent) => {
-        expect(buildEvent.success).toBe(false);
-        const msg = 'Could not mark an element as translatable inside a translatable section';
-        expect(logger.includes(msg)).toBe(true);
-      }),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(extractI18nTargetSpec, undefined, { logger });
+
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: false }));
+
+    await run.stop();
+
+    const msg = 'Could not mark an element as translatable inside a translatable section';
+    expect(logger.includes(msg)).toBe(true);
   }, 30000);
 
-  it('supports locale', (done) => {
+  it('supports locale', async () => {
     host.appendToFile('src/app/app.component.html', '<p i18n>i18n test</p>');
     const overrides = { i18nLocale: 'fr' };
 
-    runTargetSpec(host, extractI18nTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        expect(host.scopedSync().exists((extractionFile))).toBe(true);
-        expect(virtualFs.fileBufferToString(host.scopedSync().read(extractionFile)))
-          .toContain('source-language="fr"');
-      }),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(extractI18nTargetSpec, overrides);
+
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+    await run.stop();
+
+    expect(host.scopedSync().exists((extractionFile))).toBe(true);
+    expect(virtualFs.fileBufferToString(host.scopedSync().read(extractionFile)))
+      .toContain('source-language="fr"');
   }, 30000);
 
-  it('supports out file', (done) => {
+  it('supports out file', async () => {
     host.appendToFile('src/app/app.component.html', '<p i18n>i18n test</p>');
     const outFile = 'messages.fr.xlf';
     const extractionFile = join(normalize('src'), outFile);
     const overrides = { outFile };
 
-    runTargetSpec(host, extractI18nTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        expect(host.scopedSync().exists(extractionFile)).toBe(true);
-        expect(virtualFs.fileBufferToString(host.scopedSync().read(extractionFile)))
-          .toMatch(/i18n test/);
-      }),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(extractI18nTargetSpec, overrides);
+
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+    await run.stop();
+
+    expect(host.scopedSync().exists(extractionFile)).toBe(true);
+    expect(virtualFs.fileBufferToString(host.scopedSync().read(extractionFile)))
+      .toMatch(/i18n test/);
   }, 30000);
 
-  it('supports output path', (done) => {
+  it('supports output path', async () => {
     host.appendToFile('src/app/app.component.html', '<p i18n>i18n test</p>');
     // Note: this folder will not be created automatically. It must exist beforehand.
     const outputPath = 'app';
     const extractionFile = join(normalize('src'), outputPath, 'messages.xlf');
     const overrides = { outputPath };
 
-    runTargetSpec(host, extractI18nTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        expect(host.scopedSync().exists(extractionFile)).toBe(true);
-        expect(virtualFs.fileBufferToString(host.scopedSync().read(extractionFile)))
-          .toMatch(/i18n test/);
-      }),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(extractI18nTargetSpec, overrides);
+
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+    await run.stop();
+
+    expect(host.scopedSync().exists(extractionFile)).toBe(true);
+    expect(virtualFs.fileBufferToString(host.scopedSync().read(extractionFile)))
+      .toMatch(/i18n test/);
   }, 30000);
 
-  it('supports i18n format', (done) => {
+  it('supports i18n format', async () => {
     host.appendToFile('src/app/app.component.html', '<p i18n>i18n test</p>');
     const extractionFile = join(normalize('src'), 'messages.xmb');
     const overrides = { i18nFormat: 'xmb' };
 
-    runTargetSpec(host, extractI18nTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        expect(host.scopedSync().exists(extractionFile)).toBe(true);
-        expect(virtualFs.fileBufferToString(host.scopedSync().read(extractionFile)))
-          .toMatch(/i18n test/);
-      }),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(extractI18nTargetSpec, overrides);
+
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+    await run.stop();
+
+    expect(host.scopedSync().exists(extractionFile)).toBe(true);
+    expect(virtualFs.fileBufferToString(host.scopedSync().read(extractionFile)))
+      .toMatch(/i18n test/);
   }, 30000);
 });

From 78889f03ac0f200b84125d876d1861f243b30d6d Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 25 Mar 2019 16:52:44 +0000
Subject: [PATCH 0986/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index c16e6d411d2c..f9b37e557d7a 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#3b8e68552cebd4ceb002bd76fa7b437c181d47bb",
-    "@angular/common": "github:angular/common-builds#b0404757a6e8ff33ea84483ff8c9a30287fd8a76",
-    "@angular/compiler": "github:angular/compiler-builds#4020c3ff5a1fb399aefa6107b3da7e77888d8e2b",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#ba3b8ad856de163aff1b3e8638a4e0b3763bcd07",
-    "@angular/core": "github:angular/core-builds#ef4e2529f7c922aeac93faa8a3de2ff42e08880f",
-    "@angular/forms": "github:angular/forms-builds#b50673e14fab734e6cf354e1a28b7171c3fd071d",
-    "@angular/language-service": "github:angular/language-service-builds#9694464453152dc76ca58b5b79558af34d480c07",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#65df04a6f2d04cd042e42b698cdc2eabafd89270",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#ec545d9cc098d1c2c5e0f156dca74a7dab5faa30",
-    "@angular/router": "github:angular/router-builds#c1883b22cb2445354675269aed42babf8e2bec5b"
+    "@angular/animations": "github:angular/animations-builds#20462dd7979b463e080b8e5daedc4266988e4234",
+    "@angular/common": "github:angular/common-builds#3b574fdcd6f1dfce4e0b3ec8bb4ee8b2a0a4b87c",
+    "@angular/compiler": "github:angular/compiler-builds#f9c999f5a5b7b3dfc262e09e6a1500657769029c",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#68f7e5ff5cab878910f68ac71192016d3245ce57",
+    "@angular/core": "github:angular/core-builds#75f051940b2e57bd814986d7538233720e69f3d7",
+    "@angular/forms": "github:angular/forms-builds#bc721e66044b5f2956d8eda3337a39ae7da14394",
+    "@angular/language-service": "github:angular/language-service-builds#edf93969df01da6fbebf18279f221e2afe79c9bc",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#b3d003bde85bc5115165e6e8a39a3008d5c073c9",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#a7fb766c683c6e927dc2c99531b85e09021a89aa",
+    "@angular/router": "github:angular/router-builds#ebd185897ab63310fa23c5311fc150e1aa8d4d19"
   }
 }
\ No newline at end of file

From 3d313aede808bd5c1b839e7927fb01a542058d02 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 22 Mar 2019 17:54:46 -0400
Subject: [PATCH 0987/1703] build: remove generation of inline sourcemaps

---
 lib/bootstrap-local.js | 13 ++++++++-----
 tsconfig-test.json     |  6 ++++++
 tsconfig.json          |  6 ------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/bootstrap-local.js b/lib/bootstrap-local.js
index c6ff2e45f6d9..0a18be4ee19b 100644
--- a/lib/bootstrap-local.js
+++ b/lib/bootstrap-local.js
@@ -23,9 +23,12 @@ const tmpRoot = temp.mkdirSync('angular-devkit-');
 
 debugLocal('starting bootstrap local');
 
-const compilerOptions = ts.readConfigFile(path.join(__dirname, '../tsconfig.json'), p => {
-  return fs.readFileSync(p, 'utf-8');
-}).config;
+// This processes any extended configs
+const compilerOptions = ts.getParsedCommandLineOfConfigFile(
+  path.join(__dirname, '../tsconfig-test.json'),
+  { },
+  ts.sys,
+).options;
 
 let _istanbulRequireHook = null;
 if (process.env['CODE_COVERAGE'] || process.argv.indexOf('--code-coverage') !== -1) {
@@ -33,7 +36,7 @@ if (process.env['CODE_COVERAGE'] || process.argv.indexOf('--code-coverage') !==
   _istanbulRequireHook = require('./istanbul-local').istanbulRequireHook;
   // async keyword isn't supported by the Esprima version used by Istanbul version used by us.
   // TODO: update istanbul to istanbul-lib-* (see http://istanbul.js.org/) and remove this hack.
-  compilerOptions.compilerOptions.target = 'es2016';
+  compilerOptions.target = 'es2016';
 }
 
 
@@ -98,7 +101,7 @@ require.extensions['.ts'] = function (m, filename) {
   const source = fs.readFileSync(filename).toString();
 
   try {
-    let result = ts.transpile(source, compilerOptions['compilerOptions'], filename);
+    let result = ts.transpile(source, compilerOptions, filename);
 
     if (_istanbulRequireHook) {
       result = _istanbulRequireHook(result, filename);
diff --git a/tsconfig-test.json b/tsconfig-test.json
index a9676fb36c2d..2744f98d1e3f 100644
--- a/tsconfig-test.json
+++ b/tsconfig-test.json
@@ -1,6 +1,12 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
+    "inlineSourceMap": true,
+    "sourceRoot": ".",
+    // Inline sources are necessary for our tests to show the proper sources, since we are using
+    // Istanbul (not Constantinople) as well, and applying both source maps to get the original
+    // source in devtools.
+    "inlineSources": true,
     "types": [
       "node",
       "jasmine"
diff --git a/tsconfig.json b/tsconfig.json
index 1b04987d77f1..c497c7935817 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,12 +15,6 @@
     "rootDir": ".",
     "skipDefaultLibCheck": true,
     "skipLibCheck": true,
-    "inlineSourceMap": true,
-    "sourceRoot": ".",
-    // Inline sources are necessary for our tests to show the proper sources, since we are using
-    // Istanbul (not Constantinople) as well, and applying both source maps to get the original
-    // source in devtools.
-    "inlineSources": true,
     "strictNullChecks": true,
     "target": "es2017",
     "lib": [

From 7e91979d8dc03f814ba1b05024f79350cdbe7029 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 22 Mar 2019 19:32:48 -0400
Subject: [PATCH 0988/1703] build: target ES2018

Node.js 10.3+ has support for ES2018 (https://node.green/#ES2018)
---
 tsconfig.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tsconfig.json b/tsconfig.json
index c497c7935817..cc50a24670e1 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -16,9 +16,9 @@
     "skipDefaultLibCheck": true,
     "skipLibCheck": true,
     "strictNullChecks": true,
-    "target": "es2017",
+    "target": "es2018",
     "lib": [
-      "es2017"
+      "es2018"
     ],
     "baseUrl": "",
     "rootDirs": [

From dfabf1b34abf34ac2365b6403f3cae53a9b96788 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 22 Mar 2019 19:21:02 -0400
Subject: [PATCH 0989/1703] build: minor development tsconfig cleanup

---
 tsconfig.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tsconfig.json b/tsconfig.json
index cc50a24670e1..335c8037ece6 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,8 +1,6 @@
 {
   "compilerOptions": {
     "declaration": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
     "module": "commonjs",
     "moduleResolution": "node",
     "noEmitOnError": true,
@@ -13,7 +11,6 @@
     "noUnusedLocals": false,  // The linter is used for these.
     "outDir": "./dist",
     "rootDir": ".",
-    "skipDefaultLibCheck": true,
     "skipLibCheck": true,
     "strictNullChecks": true,
     "target": "es2018",

From 4c375fd1be0df1444e7246ae2e8513c4dda63d71 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 25 Mar 2019 13:29:14 -0700
Subject: [PATCH 0990/1703] release: v8.0.0-beta.9


From 7714728746de6c14c98894b37088a87e65d2ab3d Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 26 Mar 2019 05:42:45 +0000
Subject: [PATCH 0991/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index f9b37e557d7a..16629df1db7b 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#20462dd7979b463e080b8e5daedc4266988e4234",
-    "@angular/common": "github:angular/common-builds#3b574fdcd6f1dfce4e0b3ec8bb4ee8b2a0a4b87c",
-    "@angular/compiler": "github:angular/compiler-builds#f9c999f5a5b7b3dfc262e09e6a1500657769029c",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#68f7e5ff5cab878910f68ac71192016d3245ce57",
-    "@angular/core": "github:angular/core-builds#75f051940b2e57bd814986d7538233720e69f3d7",
-    "@angular/forms": "github:angular/forms-builds#bc721e66044b5f2956d8eda3337a39ae7da14394",
-    "@angular/language-service": "github:angular/language-service-builds#edf93969df01da6fbebf18279f221e2afe79c9bc",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#b3d003bde85bc5115165e6e8a39a3008d5c073c9",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#a7fb766c683c6e927dc2c99531b85e09021a89aa",
-    "@angular/router": "github:angular/router-builds#ebd185897ab63310fa23c5311fc150e1aa8d4d19"
+    "@angular/animations": "github:angular/animations-builds#4e9c2606ddfc829bf4789d450c44ed26eb2fd510",
+    "@angular/common": "github:angular/common-builds#84cfc2afb97058e9ec3fb5d876110fcb302592e7",
+    "@angular/compiler": "github:angular/compiler-builds#306932fdea1f8638275c45311dbeb04b54d6ac1b",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#25010b65d9e036635d0b3a559425fcc17f95de21",
+    "@angular/core": "github:angular/core-builds#8a6af0ca3aa3d923373379fd695dc57dd0aa3105",
+    "@angular/forms": "github:angular/forms-builds#fb6da612a7cb99abd0d046508c900fe370e439a5",
+    "@angular/language-service": "github:angular/language-service-builds#b28ed3d4383f29f455b3c8aa9bc7c41cf3928c9e",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#84df7f4ef13a24b05172edbf561d8c373b629182",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#0d6beb9e910b2818c1354cd3ce722a8414cb33fa",
+    "@angular/router": "github:angular/router-builds#0d11871078d4d62825739f7867b9a82fd26c64ca"
   }
 }
\ No newline at end of file

From c42c82f6690cdfee75c54330edae0b79c7e0d81a Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 25 Mar 2019 13:25:45 -0700
Subject: [PATCH 0992/1703] feat(@angular/cli): add validation logic for
 analytics in ng config

And refactored the validation logic to be a bit simpler generally.
---
 packages/angular/cli/commands/config-impl.ts | 78 +++++++++++++-------
 1 file changed, 52 insertions(+), 26 deletions(-)

diff --git a/packages/angular/cli/commands/config-impl.ts b/packages/angular/cli/commands/config-impl.ts
index abc1a5464c9b..06850ea83946 100644
--- a/packages/angular/cli/commands/config-impl.ts
+++ b/packages/angular/cli/commands/config-impl.ts
@@ -17,6 +17,7 @@ import {
   tags,
 } from '@angular-devkit/core';
 import { writeFileSync } from 'fs';
+import { v4 as uuidV4 } from 'uuid';
 import { Command } from '../models/command';
 import { Arguments, CommandScope } from '../models/interface';
 import {
@@ -28,13 +29,56 @@ import {
 import { Schema as ConfigCommandSchema, Value as ConfigCommandSchemaValue } from './config';
 
 
-const validCliPaths = new Map([
-  ['cli.warnings.versionMismatch', 'boolean'],
-  ['cli.defaultCollection', 'string'],
-  ['cli.packageManager', 'string'],
-  ['cli.analytics', 'string'],
-  ['cli.analyticsSharing.tracking', 'string'],
-  ['cli.analyticsSharing.uuid', 'string'],
+function _validateBoolean(value: string) {
+  if (('' + value).trim() === 'true') {
+    return true;
+  } else if (('' + value).trim() === 'false') {
+    return false;
+  } else {
+    throw new Error(`Invalid value type; expected Boolean, received ${JSON.stringify(value)}.`);
+  }
+}
+function _validateNumber(value: string) {
+  const numberValue = Number(value);
+  if (!Number.isFinite(numberValue)) {
+    return numberValue;
+  }
+  throw new Error(`Invalid value type; expected Number, received ${JSON.stringify(value)}.`);
+}
+function _validateString(value: string) {
+  return value;
+}
+function _validateAnalytics(value: string) {
+  if (value === '') {
+    // Disable analytics.
+    return null;
+  } else {
+    return value;
+  }
+}
+function _validateAnalyticsSharingUuid(value: string) {
+  if (value == '') {
+    return uuidV4();
+  } else {
+    return value;
+  }
+}
+function _validateAnalyticsSharingTracking(value: string) {
+  if (!value.match(/^GA-\d+-\d+$/)) {
+    throw new Error(`Invalid GA property ID: ${JSON.stringify(value)}.`);
+  }
+
+  return value;
+}
+
+
+const validCliPaths = new Map<string, ((arg: string) => JsonValue)>([
+  ['cli.warnings.versionMismatch', _validateBoolean],
+  ['cli.defaultCollection', _validateString],
+  ['cli.packageManager', _validateString],
+  ['cli.analytics', _validateAnalytics],
+  ['cli.analyticsSharing.tracking', _validateAnalyticsSharingTracking],
+  ['cli.analyticsSharing.uuid', _validateAnalyticsSharingUuid],
 ]);
 
 /**
@@ -140,25 +184,7 @@ function setValueFromPath<T extends JsonArray | JsonObject>(
 function normalizeValue(value: ConfigCommandSchemaValue, path: string): JsonValue {
   const cliOptionType = validCliPaths.get(path);
   if (cliOptionType) {
-    switch (cliOptionType) {
-      case 'boolean':
-        if (('' + value).trim() === 'true') {
-          return true;
-        } else if (('' + value).trim() === 'false') {
-          return false;
-        }
-        break;
-      case 'number':
-        const numberValue = Number(value);
-        if (!Number.isFinite(numberValue)) {
-          return numberValue;
-        }
-        break;
-      case 'string':
-        return value;
-    }
-
-    throw new Error(`Invalid value type; expected a ${cliOptionType}.`);
+    return cliOptionType('' + value);
   }
 
   if (typeof value === 'string') {

From 6e5095b134a43adc63de1b6818560f31e548f37d Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 25 Mar 2019 13:26:37 -0700
Subject: [PATCH 0993/1703] feat(@angular/cli): allows analytics sharing with a
 third party

Documentation can be seen at https://next.angular.io/cli/usage-analytics-gathering
---
 packages/angular/cli/models/analytics.ts      | 67 ++++++++++++++++---
 packages/angular/cli/models/command-runner.ts | 38 +++++------
 2 files changed, 71 insertions(+), 34 deletions(-)

diff --git a/packages/angular/cli/models/analytics.ts b/packages/angular/cli/models/analytics.ts
index c9dde2d9460b..6e2ac774e1f9 100644
--- a/packages/angular/cli/models/analytics.ts
+++ b/packages/angular/cli/models/analytics.ts
@@ -448,39 +448,43 @@ export async function promptProjectAnalytics(force = false): Promise<boolean> {
 
 
 /**
- * Get the global analytics setting for the user. This returns a string for UID, false if the user
- * opted out of analytics, true if the user wants to stay anonymous (no client id), and undefined
- * if the user has not been prompted yet.
+ * Get the global analytics object for the user. This returns an instance of UniversalAnalytics,
+ * or undefined if analytics are disabled.
  *
  * If any problem happens, it is considered the user has been opting out of analytics.
  */
-export function getGlobalAnalytics(): string | boolean | undefined {
+export function getGlobalAnalytics(): UniversalAnalytics | undefined {
   analyticsDebug('getGlobalAnalytics');
+  const propertyId = 'UA-8594346-29';
 
   if ('NG_CLI_ANALYTICS' in process.env) {
     if (process.env['NG_CLI_ANALYTICS'] == 'false' || process.env['NG_CLI_ANALYTICS'] == '') {
       analyticsDebug('NG_CLI_ANALYTICS is false');
 
-      return false;
+      return undefined;
     }
     if (process.env['NG_CLI_ANALYTICS'] === 'ci') {
       analyticsDebug('Running in CI mode');
 
-      return 'ci';
+      return new UniversalAnalytics(propertyId, 'ci');
     }
   }
 
   // If anything happens we just keep the NOOP analytics.
   try {
     const globalWorkspace = getWorkspace('global');
-    const analyticsConfig = globalWorkspace
+    const analyticsConfig: string | undefined | null | { uid?: string } = globalWorkspace
       && globalWorkspace.getCli()
       && globalWorkspace.getCli()['analytics'];
     analyticsDebug('Client Analytics config found: %j', analyticsConfig);
 
     if (analyticsConfig === false) {
-      return false;
+      analyticsDebug('Analytics disabled. Ignoring all analytics.');
+
+      return undefined;
     } else if (analyticsConfig === undefined || analyticsConfig === null) {
+      analyticsDebug('Analytics settings not found. Ignoring all analytics.');
+
       // globalWorkspace can be null if there is no file. analyticsConfig would be null in this
       // case. Since there is no file, the user hasn't answered and the expected return value is
       // undefined.
@@ -493,13 +497,54 @@ export function getGlobalAnalytics(): string | boolean | undefined {
         uid = analyticsConfig['uid'];
       }
 
-      analyticsDebug('client id: %s', uid);
+      analyticsDebug('client id: %j', uid);
+      if (uid == undefined) {
+        return undefined;
+      }
 
-      return uid;
+      return new UniversalAnalytics(propertyId, uid);
     }
   } catch (err) {
     analyticsDebug('Error happened during reading of analytics config: %s', err.message);
 
-    return false;
+    return undefined;
+  }
+}
+
+
+/**
+ * Return the usage analytics sharing setting, which is either a property string (GA-XXXXXXX-XX),
+ * or undefined if no sharing.
+ */
+export function getSharedAnalytics(): UniversalAnalytics | undefined {
+  analyticsDebug('getSharedAnalytics');
+
+  const envVarName = 'NG_CLI_ANALYTICS_SHARE';
+  if (envVarName in process.env) {
+    if (process.env[envVarName] == 'false' || process.env[envVarName] == '') {
+      analyticsDebug('NG_CLI_ANALYTICS is false');
+
+      return undefined;
+    }
+  }
+
+  // If anything happens we just keep the NOOP analytics.
+  try {
+    const globalWorkspace = getWorkspace('global');
+    const analyticsConfig = globalWorkspace
+      && globalWorkspace.getCli()
+      && globalWorkspace.getCli()['analyticsSharing'];
+
+    if (!analyticsConfig || !analyticsConfig.tracking || !analyticsConfig.uuid) {
+      return undefined;
+    } else {
+      analyticsDebug('Analytics sharing info: %j', analyticsConfig);
+
+      return new UniversalAnalytics(analyticsConfig.tracking, analyticsConfig.uuid);
+    }
+  } catch (err) {
+    analyticsDebug('Error happened during reading of analytics sharing config: %s', err.message);
+
+    return undefined;
   }
 }
diff --git a/packages/angular/cli/models/command-runner.ts b/packages/angular/cli/models/command-runner.ts
index 1d54a5ac28d1..db6ef73bbd84 100644
--- a/packages/angular/cli/models/command-runner.ts
+++ b/packages/angular/cli/models/command-runner.ts
@@ -20,7 +20,7 @@ import { readFileSync } from 'fs';
 import { dirname, join, resolve } from 'path';
 import { findUp } from '../utilities/find-up';
 import { parseJsonSchemaToCommandDescription } from '../utilities/json-schema';
-import { UniversalAnalytics,  getGlobalAnalytics } from './analytics';
+import { UniversalAnalytics, getGlobalAnalytics, getSharedAnalytics } from './analytics';
 import { Command } from './command';
 import {
   CommandDescription,
@@ -37,30 +37,22 @@ export interface CommandMapOptions {
 }
 
 
+/**
+ * Create the analytics instance.
+ * @private
+ */
 async function _createAnalytics(): Promise<analytics.Analytics> {
   const config = getGlobalAnalytics();
-
-  switch (config) {
-    case undefined:
-    case false:
-      analyticsDebug('Analytics disabled. Ignoring all analytics.');
-
-      return new analytics.NoopAnalytics();
-
-    case true:
-      analyticsDebug('Analytics enabled, anonymous user.');
-
-      return new UniversalAnalytics('UA-8594346-29', '');
-
-    case 'ci':
-      analyticsDebug('Logging analytics as CI.');
-
-      return new UniversalAnalytics('UA-8594346-29', 'ci');
-
-    default:
-      analyticsDebug('Analytics enabled. User ID: %j', config);
-
-      return new UniversalAnalytics('UA-8594346-29', config);
+  const maybeSharedAnalytics = getSharedAnalytics();
+
+  if (config && maybeSharedAnalytics) {
+    return new analytics.MultiAnalytics([config, maybeSharedAnalytics]);
+  } else if (config) {
+    return config;
+  } else if (maybeSharedAnalytics) {
+    return maybeSharedAnalytics;
+  } else {
+    return new analytics.NoopAnalytics();
   }
 }
 

From 5393616209c5a927cfae9a158cade84c3523a4d9 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Thu, 17 Jan 2019 15:11:19 -0800
Subject: [PATCH 0994/1703] docs: Explain Yarn workspaces vs Bazel

Add developer doc to explain how contributors and developers on the team should
treat the `package.json` file now that `angular-cli` in a mixed mode of
yarn workspaces and Bazel.
---
 docs/process/bazel.md | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 docs/process/bazel.md

diff --git a/docs/process/bazel.md b/docs/process/bazel.md
new file mode 100644
index 000000000000..01a63a1f0a67
--- /dev/null
+++ b/docs/process/bazel.md
@@ -0,0 +1,30 @@
+## Yarn Workspaces
+
+The package architecture of `angular-cli` repository is originally setup using
+yarn [workspaces](https://yarnpkg.com/lang/en/docs/workspaces/). This means the
+dependencies of various `package.json` in the repository are linked and
+installed together.
+
+## Bazel
+
+Since then, Bazel was introduced to manage some of the build dependencies in
+`angular-cli` repo. However, Bazel does **not** yet support yarn workspaces,
+since it requires laying out more than one `node_modules` directory. In this
+mixed mode, developers ought to take extra care to synchronize the dependencies.
+
+Since the `yarn_install` rule that installs all NPM dependencies in this
+repository only reads from the **root** `package.json`, every Bazel target that
+depends on packages downloaded from the NPM registry will need to have the
+dependency declared in the **root** `package.json`.
+
+In addition, if the dependency is also needed at runtime (non-dev dependencies),
+the dependency on the individual package's `package.json` has to be updated as
+well. This is to ensure that when users download a published version from NPM,
+they will be able to install all dependencies correctly without Bazel. It is the
+responsibility of the developer to keep both `package.json` in sync.
+
+## Issues
+
+1. Yarn workspaces is not compatible with Bazel-managed deps
+   [(#12736)](https://github.com/angular/angular-cli/issues/12736)
+

From eaf6de0040539e285f284dbc310e342e30237918 Mon Sep 17 00:00:00 2001
From: Niyaz Akhmetov <axmet180@gmail.com>
Date: Wed, 13 Mar 2019 13:43:49 +0300
Subject: [PATCH 0995/1703] docs: add example for `ng add`

---
 packages/angular/cli/commands/add.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/commands/add.md b/packages/angular/cli/commands/add.md
index b3d8cb6d8ff9..d2bbcd6af692 100644
--- a/packages/angular/cli/commands/add.md
+++ b/packages/angular/cli/commands/add.md
@@ -1,5 +1,8 @@
 Adds the npm package for a published library to your workspace, and configures your default
 app project to use that library, in whatever way is specified by the library's schematic.
-For example, adding `@angular/pwa` configures your project for PWA support.
+For example, adding `@angular/pwa` configures your project for PWA support:
+```bash
+ng add @angular/pwa
+```
 
 The default app project is the value of `defaultProject` in `angular.json`. 

From 9090317917bf6c01548cd52b59d9945d46a35f70 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 27 Mar 2019 05:44:47 +0000
Subject: [PATCH 0996/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 16629df1db7b..ec17d2940561 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#4e9c2606ddfc829bf4789d450c44ed26eb2fd510",
-    "@angular/common": "github:angular/common-builds#84cfc2afb97058e9ec3fb5d876110fcb302592e7",
-    "@angular/compiler": "github:angular/compiler-builds#306932fdea1f8638275c45311dbeb04b54d6ac1b",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#25010b65d9e036635d0b3a559425fcc17f95de21",
-    "@angular/core": "github:angular/core-builds#8a6af0ca3aa3d923373379fd695dc57dd0aa3105",
-    "@angular/forms": "github:angular/forms-builds#fb6da612a7cb99abd0d046508c900fe370e439a5",
-    "@angular/language-service": "github:angular/language-service-builds#b28ed3d4383f29f455b3c8aa9bc7c41cf3928c9e",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#84df7f4ef13a24b05172edbf561d8c373b629182",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#0d6beb9e910b2818c1354cd3ce722a8414cb33fa",
-    "@angular/router": "github:angular/router-builds#0d11871078d4d62825739f7867b9a82fd26c64ca"
+    "@angular/animations": "github:angular/animations-builds#d7060822d7e4e13f0af7360c260f5bfd2017f19d",
+    "@angular/common": "github:angular/common-builds#e9b863934a8ad82014ed3581c36dff83865f44dd",
+    "@angular/compiler": "github:angular/compiler-builds#73f20473dbd83da4539f88423f97d9f509da769d",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#b2d858725b655a3a1576c1421c232a6947491314",
+    "@angular/core": "github:angular/core-builds#4a70d34be55e3ccb7e0de28a94742de201b95858",
+    "@angular/forms": "github:angular/forms-builds#aa49ee39deac9df3ed7ea1359ed19b27cbf584fe",
+    "@angular/language-service": "github:angular/language-service-builds#352a2933ac2941100a5a1673e0f84a6fdf4af031",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#b9b56805117fdef61d50ba28f9bc8e86073b8a76",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#75bde3f5f6745c4aae1df19be80a4ee0dcc39b8b",
+    "@angular/router": "github:angular/router-builds#2f4ac70164ed9047f2783eb8208549010ad7988a"
   }
 }
\ No newline at end of file

From a516f8ad9172dedca1a186f6219046ab66621eea Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 27 Mar 2019 05:45:08 +0000
Subject: [PATCH 0997/1703] build: update semver to version 6.0.0

---
 packages/angular/cli/package.json                     | 2 +-
 packages/angular_devkit/build_angular/package.json    | 2 +-
 packages/angular_devkit/build_ng_packagr/package.json | 2 +-
 packages/schematics/update/package.json               | 2 +-
 yarn.lock                                             | 5 +++++
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 52397e95097c..c47c96c37c16 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -37,7 +37,7 @@
     "npm-package-arg": "6.1.0",
     "opn": "5.4.0",
     "pacote": "9.5.0",
-    "semver": "5.6.0",
+    "semver": "6.0.0",
     "symbol-observable": "1.2.0",
     "universal-analytics": "^0.4.20",
     "uuid": "^3.3.2"
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index c9be4ad79685..30ba170a3aea 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -36,7 +36,7 @@
     "rxjs": "6.4.0",
     "sass": "1.17.3",
     "sass-loader": "7.1.0",
-    "semver": "5.6.0",
+    "semver": "6.0.0",
     "source-map-support": "0.5.11",
     "source-map-loader": "0.2.4",
     "speed-measure-webpack-plugin": "1.3.1",
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index 1326d445d09d..7e8cc973bbac 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -10,7 +10,7 @@
     "@angular-devkit/architect": "0.0.0",
     "@angular-devkit/core": "0.0.0",
     "rxjs": "6.4.0",
-    "semver": "5.6.0"
+    "semver": "6.0.0"
   },
   "peerDependencies": {
     "ng-packagr": "^4.0.0"
diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index 6379ba350ae3..b125f377651f 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -16,7 +16,7 @@
     "@yarnpkg/lockfile": "1.1.0",
     "ini": "1.3.5",
     "pacote": "9.5.0",
-    "semver": "5.6.0",
+    "semver": "6.0.0",
     "semver-intersect": "1.4.0",
     "rxjs": "6.4.0"
   }
diff --git a/yarn.lock b/yarn.lock
index 4ba05369b774..1616190c19de 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8209,6 +8209,11 @@ semver-intersect@1.4.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
   integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
 
+semver@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
+  integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
+
 semver@~5.3.0:
   version "5.3.0"
   resolved "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"

From e516a817ac36438b7fef96877d2e7a256935522b Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 27 Mar 2019 14:01:12 +0100
Subject: [PATCH 0998/1703] feat(@schematics/angular): update to ng-packagr
 version 5

This changes remove the need for tsickle.
---
 packages/schematics/angular/library/index.ts      | 11 +++--------
 packages/schematics/angular/library/index_spec.ts |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index 02fc671be66f..034fef945485 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -103,20 +103,15 @@ function addDependenciesToPackageJson() {
       {
         type: NodeDependencyType.Dev,
         name: '@angular-devkit/build-angular',
-        version: latestVersions.DevkitBuildNgPackagr,
+        version: latestVersions.DevkitBuildAngular,
       },
       {
         type: NodeDependencyType.Dev,
         name: 'ng-packagr',
-        version: '^4.2.0',
+        version: '^5.0.0',
       },
       {
-        type: NodeDependencyType.Dev,
-        name: 'tsickle',
-        version: '>=0.34.0',
-      },
-      {
-        type: NodeDependencyType.Dev,
+        type: NodeDependencyType.Default,
         name: 'tslib',
         version: latestVersions.TsLib,
       },
diff --git a/packages/schematics/angular/library/index_spec.ts b/packages/schematics/angular/library/index_spec.ts
index 6220a07fa23c..92bee35a683d 100644
--- a/packages/schematics/angular/library/index_spec.ts
+++ b/packages/schematics/angular/library/index_spec.ts
@@ -163,7 +163,7 @@ describe('Library Schematic', () => {
       const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
 
       const packageJson = getJsonFileContent(tree, 'package.json');
-      expect(packageJson.devDependencies['ng-packagr']).toEqual('^4.2.0');
+      expect(packageJson.devDependencies['ng-packagr']).toEqual('^5.0.0');
       expect(packageJson.devDependencies['@angular-devkit/build-ng-packagr'])
         .toEqual(latestVersions.DevkitBuildNgPackagr);
     });

From 952da428f6c6834a38043cab213670efd69132a4 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 27 Mar 2019 16:27:45 +0100
Subject: [PATCH 0999/1703] feat(@angular-devkit/build-ng-packagr): add support
 for ng-packagr version 5

---
 .../build_ng_packagr/package.json             |   8 +-
 .../build_ng_packagr/src/build/index.ts       |  36 --
 yarn.lock                                     | 339 +++++-------------
 3 files changed, 91 insertions(+), 292 deletions(-)

diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index 7e8cc973bbac..92055a37c650 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -9,17 +9,15 @@
   "dependencies": {
     "@angular-devkit/architect": "0.0.0",
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "6.4.0",
-    "semver": "6.0.0"
+    "rxjs": "6.4.0"
   },
   "peerDependencies": {
-    "ng-packagr": "^4.0.0"
+    "ng-packagr": "^4.0.0 || ^5.0.0"
   },
   "devDependencies": {
     "@angular/compiler": "^8.0.0-beta.9",
     "@angular/compiler-cli": "^8.0.0-beta.9",
-    "ng-packagr": "^4.0.0",
-    "tsickle": ">=0.34.0",
+    "ng-packagr": "^5.0.1",
     "tslib": "^1.9.0"
   }
 }
diff --git a/packages/angular_devkit/build_ng_packagr/src/build/index.ts b/packages/angular_devkit/build_ng_packagr/src/build/index.ts
index ff1e60cc4fad..dfc258d48199 100644
--- a/packages/angular_devkit/build_ng_packagr/src/build/index.ts
+++ b/packages/angular_devkit/build_ng_packagr/src/build/index.ts
@@ -17,9 +17,6 @@ import * as fs from 'fs';
 import * as ngPackagr from 'ng-packagr';
 import { EMPTY, Observable } from 'rxjs';
 import { catchError, tap } from 'rxjs/operators';
-import * as semver from 'semver';
-
-const NEW_NG_PACKAGR_VERSION = '4.0.0-rc.3';
 
 // TODO move this function to architect or somewhere else where it can be imported from.
 // Blatantly copy-pasted from 'require-project-module.ts'.
@@ -27,42 +24,11 @@ function requireProjectModule(root: string, moduleName: string) {
   return require(require.resolve(moduleName, { paths: [root] }));
 }
 
-function resolveProjectModule(root: string, moduleName: string) {
-  return require.resolve(moduleName, { paths: [root] });
-}
-
 export interface NgPackagrBuilderOptions {
   project: string;
   tsConfig?: string;
   watch?: boolean;
 }
-
-function checkNgPackagrVersion(projectRoot: string): boolean {
-  let ngPackagrJsonPath;
-
-  try {
-    ngPackagrJsonPath = resolveProjectModule(projectRoot, 'ng-packagr/package.json');
-  } catch {
-    // ng-packagr is not installed
-    throw new Error(tags.stripIndent`
-    ng-packagr is not installed. Run \`npm install ng-packagr --save-dev\` and try again.
-  `);
-  }
-
-  const ngPackagrPackageJson = fs.readFileSync(ngPackagrJsonPath).toString();
-  const ngPackagrVersion = JSON.parse(ngPackagrPackageJson)['version'];
-
-  if (!semver.gte(ngPackagrVersion, NEW_NG_PACKAGR_VERSION)) {
-    throw new Error(tags.stripIndent`
-    The installed version of ng-packagr is ${ngPackagrVersion}. The watch feature
-    requires ng-packagr version to satisfy ${NEW_NG_PACKAGR_VERSION}.
-    Please upgrade your ng-packagr version.
-  `);
-  }
-
-  return true;
-}
-
 export class NgPackagrBuilder implements Builder<NgPackagrBuilderOptions> {
 
   constructor(public context: BuilderContext) { }
@@ -89,8 +55,6 @@ export class NgPackagrBuilder implements Builder<NgPackagrBuilderOptions> {
       }
 
       if (options.watch) {
-        checkNgPackagrVersion(getSystemPath(root));
-
         const ngPkgSubscription = ngPkgProject
           .watch()
           .pipe(
diff --git a/yarn.lock b/yarn.lock
index 1616190c19de..cea4cba60617 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -402,6 +402,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897"
   integrity sha512-fCHV45gS+m3hH17zgkgADUSi2RR1Vht6wOZ0jyHP8rjiQra9f+mIcgwPQHllmDocYOstIEbKlxbFDYlgrTPYqw==
 
+"@types/node@^11.11.6":
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.12.0.tgz#ec5594728811dc2797e42396cfcdf786f2052c12"
+  integrity sha512-Lg00egj78gM+4aE0Erw05cuDbvX9sLJbaaPwwRtdCdAMnIudqrQZ0oZX98Ek0yiSK/A2nubHgJfvII/rTT2Dwg==
+
 "@types/node@^6.0.46":
   version "6.14.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.0.tgz#85c6998293fc6f2945915419296c7fbb63384f66"
@@ -842,6 +847,11 @@ acorn@^6.0.5:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.5.tgz#81730c0815f3f3b34d8efa95cb7430965f4d887a"
   integrity sha512-i33Zgp3XWtmZBMNvCr4azvOFeWVw1Rk6p3hfi3LUDvIFraOMywb1kAtrbi+med14m4Xfpqm3zRZMT+c0FNE7kg==
 
+acorn@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
+  integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
+
 adm-zip@^0.4.9, adm-zip@~0.4.3:
   version "0.4.11"
   resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.11.tgz#2aa54c84c4b01a9d0fb89bb11982a51f13e3d62a"
@@ -1153,11 +1163,6 @@ async-each@^1.0.1:
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.2.tgz#8b8a7ca2a658f927e9f307d6d1a42f4199f0f735"
   integrity sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg==
 
-async-foreach@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
-  integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
-
 async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
@@ -1375,13 +1380,6 @@ blob@0.0.4:
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
   integrity sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=
 
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
-  dependencies:
-    inherits "~2.0.0"
-
 blocking-proxy@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/blocking-proxy/-/blocking-proxy-1.0.1.tgz#81d6fd1fe13a4c0d6957df7f91b75e98dac40cb2"
@@ -1782,11 +1780,6 @@ camelcase@^2.0.0, camelcase@^2.0.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
   integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
 
-camelcase@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
-  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
-
 camelcase@^4.0.0, camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
@@ -2542,14 +2535,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-cross-spawn@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
-  integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI=
-  dependencies:
-    lru-cache "^4.0.1"
-    which "^1.2.9"
-
 cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -3271,6 +3256,11 @@ estree-walker@^0.5.2:
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39"
   integrity sha512-XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig==
 
+estree-walker@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.0.tgz#5d865327c44a618dde5699f763891ae31f257dae"
+  integrity sha512-peq1RfVAVzr3PU/jL31RaOjUKLoZJpObQWJJ+LgfcxDUifyLZ1RjPQZTl0pzj2uJ45b7A7XpyppXvxdEqzo4rw==
+
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
@@ -3829,16 +3819,6 @@ fsevents@^1.2.7:
     nan "^2.9.2"
     node-pre-gyp "^0.10.0"
 
-fstream@^1.0.0, fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
-  integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
-  dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
-
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -3858,13 +3838,6 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-gaze@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
-  integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
-  dependencies:
-    globule "^1.0.0"
-
 genfun@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
@@ -4012,7 +3985,7 @@ glob@7.0.x:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.1:
+glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
   integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
@@ -4087,15 +4060,6 @@ globby@^7.1.1:
     pify "^3.0.0"
     slash "^1.0.0"
 
-globule@^1.0.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d"
-  integrity sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==
-  dependencies:
-    glob "~7.1.1"
-    lodash "~4.17.10"
-    minimatch "~3.0.2"
-
 got@^6.7.1:
   version "6.7.1"
   resolved "http://registry.npmjs.org/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
@@ -4494,11 +4458,6 @@ imurmurhash@^0.1.4:
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
-in-publish@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
-  integrity sha1-4g/146KvwmkDILbcVSaCqcf631E=
-
 indent-string@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
@@ -4524,7 +4483,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
@@ -5140,7 +5099,7 @@ jquery@^3.3.1:
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
   integrity sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==
 
-js-base64@^2.1.8, js-base64@^2.4.3:
+js-base64@^2.4.3:
   version "2.4.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03"
   integrity sha512-xcinL3AuDJk7VSzsHgb9DvvIXayBbadtMZ4HFPx8rUszbW1MuNMlwYVC4zzCZ6e1sqZpnNS5ZFYOhXqA39T7LQ==
@@ -5624,12 +5583,7 @@ lodash._reinterpolate@~3.0.0:
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
   integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
 
-lodash.assign@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
-  integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
-
-lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
+lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
@@ -5644,11 +5598,6 @@ lodash.get@^4.4.2:
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
   integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
 
-lodash.mergewith@^4.6.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
-  integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==
-
 lodash.tail@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
@@ -5669,16 +5618,16 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
-lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.5.0:
-  version "4.17.10"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-  integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==
-
-lodash@^4.16.6, lodash@^4.17.11, lodash@^4.17.5, lodash@~4.17.10:
+lodash@^4.16.6, lodash@^4.17.11, lodash@^4.17.5:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
+lodash@^4.17.10, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.5.0:
+  version "4.17.10"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+  integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==
+
 log4js@^3.0.0:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.6.tgz#e6caced94967eeeb9ce399f9f8682a4b2b28c8ff"
@@ -5889,7 +5838,7 @@ memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
-meow@^3.3.0, meow@^3.7.0:
+meow@^3.3.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
   integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
@@ -6049,7 +5998,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -6141,7 +6090,7 @@ mixin-object@^2.0.1:
     for-in "^0.1.3"
     is-extendable "^0.1.1"
 
-mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
+mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
   version "0.5.1"
   resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
@@ -6193,11 +6142,6 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
-nan@^2.10.0:
-  version "2.11.1"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766"
-  integrity sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==
-
 nan@^2.9.2:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.0.tgz#574e360e4d954ab16966ec102c0c049fd961a099"
@@ -6239,10 +6183,10 @@ neo-async@^2.5.0:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
   integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
 
-ng-packagr@^4.0.0:
-  version "4.7.1"
-  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-4.7.1.tgz#a3e8fd2a7b70573a3a7759c4c57408a3b0e8ce11"
-  integrity sha512-MIPKxyrnV22fS3wSfst2XjwWOonFKujVVEnIehYJhiu8GOg37bCdbbr9plsE1jRDmDAUz6M1MvdKibUrJyRp6Q==
+ng-packagr@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-5.0.1.tgz#c78a46727fe98ab434fcd0bcc8f49adf585feb44"
+  integrity sha512-DSX8O4VPiRltQxGMZ91eHaT/qxXzpJ6JaqaRi174Wcj+u2agZ8fZeImLRHYc4AGUf8/c3ejARFd3gcOKFna9LA==
   dependencies:
     "@ngtools/json-schema" "^1.1.0"
     autoprefixer "^9.0.0"
@@ -6256,21 +6200,21 @@ ng-packagr@^4.0.0:
     injection-js "^2.2.1"
     less "^3.8.0"
     less-plugin-npm-import "^2.1.0"
-    node-sass "^4.9.3"
     node-sass-tilde-importer "^1.0.0"
     opencollective-postinstall "^2.0.1"
     postcss "^7.0.0"
     postcss-url "^8.0.0"
-    read-pkg-up "^4.0.0"
+    read-pkg-up "^5.0.0"
     rimraf "^2.6.1"
-    rollup "^0.67.0"
+    rollup "^1.6.0"
     rollup-plugin-commonjs "^9.1.3"
-    rollup-plugin-json "^3.1.0"
-    rollup-plugin-node-resolve "^4.0.0"
+    rollup-plugin-json "^4.0.0"
+    rollup-plugin-node-resolve "^4.0.1"
     rollup-plugin-sourcemaps "^0.4.2"
     rxjs "^6.0.0"
+    sass "^1.17.3"
     stylus "^0.54.5"
-    uglify-js "^3.0.7"
+    terser "^3.16.1"
     update-notifier "^2.3.0"
 
 nice-try@^1.0.4:
@@ -6297,24 +6241,6 @@ node-forge@0.7.5:
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
   integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==
 
-node-gyp@^3.8.0:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
-  integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
-  dependencies:
-    fstream "^1.0.0"
-    glob "^7.0.3"
-    graceful-fs "^4.1.2"
-    mkdirp "^0.5.0"
-    nopt "2 || 3"
-    npmlog "0 || 1 || 2 || 3 || 4"
-    osenv "0"
-    request "^2.87.0"
-    rimraf "2"
-    semver "~5.3.0"
-    tar "^2.0.0"
-    which "1"
-
 node-libs-browser@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
@@ -6381,32 +6307,7 @@ node-sass-tilde-importer@^1.0.0:
   dependencies:
     find-parent-dir "^0.3.0"
 
-node-sass@^4.9.3:
-  version "4.9.4"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.4.tgz#349bd7f1c89422ffe7e1e4b60f2055a69fbc5512"
-  integrity sha512-MXyurANsUoE4/6KmfMkwGcBzAnJQ5xJBGW7Ei6ea8KnUKuzHr/SguVBIi3uaUAHtZCPUYkvlJ3Ef5T5VAwVpaA==
-  dependencies:
-    async-foreach "^0.1.3"
-    chalk "^1.1.1"
-    cross-spawn "^3.0.0"
-    gaze "^1.0.0"
-    get-stdin "^4.0.1"
-    glob "^7.0.3"
-    in-publish "^2.0.0"
-    lodash.assign "^4.2.0"
-    lodash.clonedeep "^4.3.2"
-    lodash.mergewith "^4.6.0"
-    meow "^3.7.0"
-    mkdirp "^0.5.1"
-    nan "^2.10.0"
-    node-gyp "^3.8.0"
-    npmlog "^4.0.0"
-    request "^2.88.0"
-    sass-graph "^2.2.4"
-    stdout-stream "^1.4.0"
-    "true-case-path" "^1.0.2"
-
-"nopt@2 || 3", nopt@3.x:
+nopt@3.x:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
   integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
@@ -6531,7 +6432,7 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-"npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.0, npmlog@^4.0.2:
+"npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@@ -6742,7 +6643,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@0, osenv@^0.1.4, osenv@^0.1.5:
+osenv@^0.1.4, osenv@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
@@ -7607,13 +7508,13 @@ read-pkg-up@^3.0.0:
     find-up "^2.0.0"
     read-pkg "^3.0.0"
 
-read-pkg-up@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
-  integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==
+read-pkg-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-5.0.0.tgz#b6a6741cb144ed3610554f40162aa07a6db621b8"
+  integrity sha512-XBQjqOBtTzyol2CpsQOw8LHV0XbDZVG7xMMjmXAJomlVY03WOBRmYgDJETlvcg0H63AJvPRwT7GFi5rvOzUOKg==
   dependencies:
     find-up "^3.0.0"
-    read-pkg "^3.0.0"
+    read-pkg "^5.0.0"
 
 read-pkg@^1.0.0, read-pkg@^1.1.0:
   version "1.1.0"
@@ -7651,6 +7552,14 @@ read-pkg@^4.0.1:
     parse-json "^4.0.0"
     pify "^3.0.0"
 
+read-pkg@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.0.0.tgz#75449907ece8dfb89cbc76adcba2665316e32b94"
+  integrity sha512-OWufaRc67oJjcgrxckW/qO9q22iYzyiONh8h+GMcnOvSHAmhV1Dr3x+gyRjP+Qxc5jKupkSfoCQLS/98rDPh9A==
+  dependencies:
+    normalize-package-data "^2.3.2"
+    parse-json "^4.0.0"
+
 "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3:
   version "2.3.6"
   resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
@@ -7947,7 +7856,7 @@ rfdc@^1.1.2:
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.2.tgz#e6e72d74f5dc39de8f538f65e00c36c18018e349"
   integrity sha512-92ktAgvZhBzYTIK0Mja9uen5q5J3NRVMoDkJL2VMwq6SXjVCgqvQeVP2XAaUY6HT+XpQYeLSjb3UoitBryKmdA==
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2:
+rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
@@ -7972,14 +7881,14 @@ rollup-plugin-commonjs@^9.1.3:
     resolve "^1.8.1"
     rollup-pluginutils "^2.3.3"
 
-rollup-plugin-json@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-json/-/rollup-plugin-json-3.1.0.tgz#7c1daf60c46bc21021ea016bd00863561a03321b"
-  integrity sha512-BlYk5VspvGpjz7lAwArVzBXR60JK+4EKtPkCHouAWg39obk9S61hZYJDBfMK+oitPdoe11i69TlxKlMQNFC/Uw==
+rollup-plugin-json@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-json/-/rollup-plugin-json-4.0.0.tgz#a18da0a4b30bf5ca1ee76ddb1422afbb84ae2b9e"
+  integrity sha512-hgb8N7Cgfw5SZAkb3jf0QXii6QX/FOkiIq2M7BAQIEydjHvTyxXHQiIzZaTFgx1GK0cRCHOCBHIyEkkLdWKxow==
   dependencies:
-    rollup-pluginutils "^2.3.1"
+    rollup-pluginutils "^2.5.0"
 
-rollup-plugin-node-resolve@^4.0.0:
+rollup-plugin-node-resolve@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.0.1.tgz#f95765d174e5daeef9ea6268566141f53aa9d422"
   integrity sha512-fSS7YDuCe0gYqKsr5OvxMloeZYUSgN43Ypi1WeRZzQcWtHgFayV5tUSPYpxuaioIIWaBXl6NrVk0T2/sKwueLg==
@@ -7996,7 +7905,7 @@ rollup-plugin-sourcemaps@^0.4.2:
     rollup-pluginutils "^2.0.1"
     source-map-resolve "^0.5.0"
 
-rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.3.3:
+rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.3.tgz#3aad9b1eb3e7fe8262820818840bf091e5ae6794"
   integrity sha512-2XZwja7b6P5q4RZ5FhyX1+f46xi1Z3qBKigLRZ6VTZjwbN0K1IFGMlwm06Uu0Emcre2Z63l77nq/pzn+KxIEoA==
@@ -8004,13 +7913,22 @@ rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.3.3:
     estree-walker "^0.5.2"
     micromatch "^2.3.11"
 
-rollup@^0.67.0:
-  version "0.67.4"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.67.4.tgz#8ed6b0993337f84ec8a0387f824fa6c197e833ec"
-  integrity sha512-AVuP73mkb4BBMUmksQ3Jw0jTrBTU1i7rLiUYjFxLZGb3xiFmtVEg40oByphkZAsiL0bJC3hRAJUQos/e5EBd+w==
+rollup-pluginutils@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.5.0.tgz#23be0f05ac3972ea7b08fc7870cb91fde5b23a09"
+  integrity sha512-9Muh1H+XB5f5ONmKMayUoTYR1EZwHbwJJ9oZLrKT5yuTf/RLIQ5mYIGsrERquVucJmjmaAW0Y7+6Qo1Ep+5w3Q==
+  dependencies:
+    estree-walker "^0.6.0"
+    micromatch "^3.1.10"
+
+rollup@^1.6.0:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.7.3.tgz#cade518b92e23efa72026e264e29d9a56cbf8eb9"
+  integrity sha512-U3/HaZujvGofNZQldfIknKoaNFNRS+j8/uCS/jSy3FrxF9t0FBsgZW4+VXLHG7l1daTgE6+jEy0Dv7cVCB2NPg==
   dependencies:
     "@types/estree" "0.0.39"
-    "@types/node" "*"
+    "@types/node" "^11.11.6"
+    acorn "^6.1.1"
 
 run-async@^2.2.0:
   version "2.3.0"
@@ -8055,16 +7973,6 @@ safe-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass-graph@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
-  integrity sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=
-  dependencies:
-    glob "^7.0.0"
-    lodash "^4.0.0"
-    scss-tokenizer "^0.2.3"
-    yargs "^7.0.0"
-
 sass-loader@7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.1.0.tgz#16fd5138cb8b424bf8a759528a1972d72aad069d"
@@ -8077,7 +7985,7 @@ sass-loader@7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
-sass@1.17.3:
+sass@1.17.3, sass@^1.17.3:
   version "1.17.3"
   resolved "https://registry.yarnpkg.com/sass/-/sass-1.17.3.tgz#19f9164cf8653b9fca670a64e53285272c96d192"
   integrity sha512-S4vJawbrNUxJUBiHLXPYUKZCoO6cvq3/3ZFBV66a+PafTxcDEFJB+FHLDFl0P+rUfha/703ajEXMuGTYhJESkQ==
@@ -8128,14 +8036,6 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-scss-tokenizer@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
-  integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE=
-  dependencies:
-    js-base64 "^2.1.8"
-    source-map "^0.4.2"
-
 seedrandom@^2.4.4:
   version "2.4.4"
   resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-2.4.4.tgz#b25ea98632c73e45f58b77cfaa931678df01f9ba"
@@ -8570,18 +8470,11 @@ source-map@0.5.6:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
   integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
 
-source-map@0.7.3, source-map@^0.7.3:
+source-map@0.7.3:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
 
-source-map@^0.4.2, source-map@~0.4.1:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
-  dependencies:
-    amdefine ">=0.0.4"
-
 source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
@@ -8599,6 +8492,13 @@ source-map@~0.2.0:
   dependencies:
     amdefine ">=0.0.4"
 
+source-map@~0.4.1:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
+  dependencies:
+    amdefine ">=0.0.4"
+
 sourcemap-codec@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz#c8fd92d91889e902a07aee392bdd2c5863958ba2"
@@ -8854,13 +8754,6 @@ statuses@~1.4.0:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
   integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
 
-stdout-stream@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
-  integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==
-  dependencies:
-    readable-stream "^2.0.1"
-
 stream-browserify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
@@ -8914,7 +8807,7 @@ streamroller@^1.0.1:
     fs-extra "^7.0.0"
     lodash "^4.17.10"
 
-string-width@^1.0.1, string-width@^1.0.2:
+string-width@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
   integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
@@ -9070,15 +8963,6 @@ tapable@^1.0.0, tapable@^1.1.0:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c"
   integrity sha512-IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA==
 
-tar@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-  integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
-  dependencies:
-    block-stream "*"
-    fstream "^1.0.2"
-    inherits "2"
-
 tar@^4, tar@^4.4.4, tar@^4.4.6:
   version "4.4.6"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
@@ -9322,13 +9206,6 @@ triple-beam@^1.2.0, triple-beam@^1.3.0:
   resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9"
   integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==
 
-"true-case-path@^1.0.2":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
-  integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==
-  dependencies:
-    glob "^7.1.2"
-
 ts-node@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-5.0.1.tgz#78e5d1cb3f704de1b641e43b76be2d4094f06f81"
@@ -9343,15 +9220,6 @@ ts-node@^5.0.0:
     source-map-support "^0.5.3"
     yn "^2.0.0"
 
-tsickle@>=0.34.0:
-  version "0.34.0"
-  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.34.0.tgz#10187fa6401a288a65efb93a60bf28b2ff95f90b"
-  integrity sha512-O3wCPRtL18Hc/ZBnaiKwmmjVzeCWTOTpsi0btfC7FWL3RnXpxLPxD6hoJ0QEXuSfG/0QJk+MWNjqT9N6fOyyIg==
-  dependencies:
-    minimist "^1.2.0"
-    mkdirp "^0.5.1"
-    source-map "^0.7.3"
-
 tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
@@ -9444,7 +9312,7 @@ typescript@3.3.4000:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.4000.tgz#76b0f89cfdbf97827e1112d64f283f1151d6adf0"
   integrity sha512-jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA==
 
-uglify-js@^3.0.7, uglify-js@^3.1.4:
+uglify-js@^3.1.4:
   version "3.4.9"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
   integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==
@@ -9928,17 +9796,12 @@ when@~3.6.x:
   resolved "https://registry.yarnpkg.com/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e"
   integrity sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=
 
-which-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
-  integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
-
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@1, which@^1.1.1, which@^1.2.1, which@^1.2.9, which@^1.3.1:
+which@^1.1.1, which@^1.2.1, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -10114,13 +9977,6 @@ yargs-parser@^10.1.0:
   dependencies:
     camelcase "^4.1.0"
 
-yargs-parser@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
-  integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=
-  dependencies:
-    camelcase "^3.0.0"
-
 yargs-parser@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
@@ -10178,25 +10034,6 @@ yargs@^3.10.0:
     window-size "^0.1.4"
     y18n "^3.2.0"
 
-yargs@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
-  integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=
-  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 "^5.0.0"
-
 yauzl@2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005"

From 688ed6aca9989993fe9815451e96cbaf485bb96a Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 22 Mar 2019 14:42:32 +0000
Subject: [PATCH 1000/1703] build: update zone.js to version ^0.9.0

---
 packages/angular_devkit/build_angular/package.json     | 2 +-
 packages/schematics/angular/utility/latest-versions.ts | 4 ++--
 yarn.lock                                              | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 30ba170a3aea..52ae8c537d72 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -82,6 +82,6 @@
     "material-design-icons": "^3.0.1",
     "popper.js": "^1.14.1",
     "protractor": "~5.4.0",
-    "zone.js": "^0.8.19"
+    "zone.js": "^0.9.0"
   }
 }
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index f5359495a301..5e2c5d9d42dd 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -8,9 +8,9 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~8.0.0-beta.9',
+  Angular: '~8.0.0-beta.10',
   RxJs: '~6.4.0',
-  ZoneJs: '~0.8.26',
+  ZoneJs: '~0.9.0',
   TypeScript: '~3.3.3333',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
diff --git a/yarn.lock b/yarn.lock
index cea4cba60617..5c081593b4db 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10051,7 +10051,7 @@ yn@^2.0.0:
   resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
   integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=
 
-zone.js@^0.8.19:
-  version "0.8.26"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.26.tgz#7bdd72f7668c5a7ad6b118148b4ea39c59d08d2d"
-  integrity sha512-W9Nj+UmBJG251wkCacIkETgra4QgBo/vgoEkb4a2uoLzpQG7qF9nzwoLXWU5xj3Fg2mxGvEDh47mg24vXccYjA==
+zone.js@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.0.tgz#f42319d657f7616724ed40c5907d4614b4c683fa"
+  integrity sha512-EfygvVnLxPSCMSgJ4h7SoY+XNr7ybdwvvwEQ70lvMFl9coNnciXSyWi8Kg6znK1ubyUSffkCKvleSQpLuUKw0Q==

From 4b89fe21f4cde2a9a605e0cb571a3e223cf19a6f Mon Sep 17 00:00:00 2001
From: Minko Gechev <mgechev@google.com>
Date: Fri, 1 Mar 2019 13:56:34 -0800
Subject: [PATCH 1001/1703] feat(@schematics/angular): tslint migration for 8

Migration of the `tslint.json` and `package.json` files required by the refactoring of
codelyzer. For more information check this PR
https://github.com/mgechev/codelyzer/pull/754.
---
 .../migrations/migration-collection.json      |   5 +
 .../angular/migrations/update-8/index.ts      | 103 ++++++++++++++++++
 .../angular/migrations/update-8/index_spec.ts |  85 +++++++++++++++
 3 files changed, 193 insertions(+)
 create mode 100644 packages/schematics/angular/migrations/update-8/index.ts
 create mode 100644 packages/schematics/angular/migrations/update-8/index_spec.ts

diff --git a/packages/schematics/angular/migrations/migration-collection.json b/packages/schematics/angular/migrations/migration-collection.json
index 0e03d24ae78f..28a1abb74079 100644
--- a/packages/schematics/angular/migrations/migration-collection.json
+++ b/packages/schematics/angular/migrations/migration-collection.json
@@ -29,6 +29,11 @@
       "version": "7.0.3",
       "factory": "./update-7/index#updateDevkitBuildNgPackagr",
       "description": "Update an Angular CLI project to version 7."
+    },
+    "migration-07": {
+      "version": "8.0.0",
+      "factory": "./update-8",
+      "description": "Update an Angular CLI project to version 8."
     }
   }
 }
diff --git a/packages/schematics/angular/migrations/update-8/index.ts b/packages/schematics/angular/migrations/update-8/index.ts
new file mode 100644
index 000000000000..5bd28c6bddf0
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-8/index.ts
@@ -0,0 +1,103 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { JsonParseMode, parseJsonAst } from '@angular-devkit/core';
+import {
+  Rule,
+  SchematicContext,
+  Tree,
+  chain,
+} from '@angular-devkit/schematics';
+import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
+import {
+  NodeDependency,
+  NodeDependencyType,
+  addPackageJsonDependency,
+} from '../../utility/dependencies';
+import { findPropertyInAstObject } from '../../utility/json-utils';
+
+const ruleMapping: {[key: string]: string} = {
+  'contextual-life-cycle': 'contextual-lifecycle',
+  'no-conflicting-life-cycle-hooks': 'no-conflicting-lifecycle',
+  'no-life-cycle-call': 'no-lifecycle-call',
+  'use-life-cycle-interface': 'use-lifecycle-interface',
+  'decorator-not-allowed': 'contextual-decorator',
+  'enforce-component-selector': 'use-component-selector',
+  'no-output-named-after-standard-event': 'no-output-native',
+  'use-host-property-decorator': 'no-host-metadata-property',
+  'use-input-property-decorator': 'no-inputs-metadata-property',
+  'use-output-property-decorator': 'no-outputs-metadata-property',
+  'no-queries-parameter': 'no-queries-metadata-property',
+  'pipe-impure': 'no-pipe-impure',
+  'use-view-encapsulation': 'use-component-view-encapsulation',
+  i18n: 'template-i18n',
+  'banana-in-box': 'template-banana-in-box',
+  'no-template-call-expression': 'template-no-call-expression',
+  'templates-no-negated-async': 'template-no-negated-async',
+  'trackBy-function': 'template-use-track-by-function',
+  'no-attribute-parameter-decorator': 'no-attribute-decorator',
+  'max-inline-declarations': 'component-max-inline-declarations',
+};
+
+function updateTsLintConfig(): Rule {
+  return (host: Tree) => {
+    const tsLintPath = '/tslint.json';
+    const buffer = host.read(tsLintPath);
+    if (!buffer) {
+      return host;
+    }
+    const tsCfgAst = parseJsonAst(buffer.toString(), JsonParseMode.Loose);
+
+    if (tsCfgAst.kind != 'object') {
+      return host;
+    }
+
+    const rulesNode = findPropertyInAstObject(tsCfgAst, 'rules');
+    if (!rulesNode || rulesNode.kind != 'object') {
+      return host;
+    }
+
+    const recorder = host.beginUpdate(tsLintPath);
+
+    rulesNode.properties.forEach(prop => {
+      const mapping = ruleMapping[prop.key.value];
+      if (mapping) {
+        recorder.remove(prop.key.start.offset + 1, prop.key.value.length);
+        recorder.insertLeft(prop.key.start.offset + 1, mapping);
+      }
+    });
+
+    host.commitUpdate(recorder);
+
+    return host;
+  };
+}
+
+function updatePackageJson() {
+  return (host: Tree, context: SchematicContext) => {
+    const dependency: NodeDependency = {
+      type: NodeDependencyType.Dev,
+      name: 'codelyzer',
+      version: '^5.0.0',
+      overwrite: true,
+    };
+
+    addPackageJsonDependency(host, dependency);
+    context.addTask(new NodePackageInstallTask());
+
+    return host;
+  };
+}
+
+export default function(): Rule {
+  return () => {
+    return chain([
+      updateTsLintConfig(),
+      updatePackageJson(),
+    ]);
+  };
+}
diff --git a/packages/schematics/angular/migrations/update-8/index_spec.ts b/packages/schematics/angular/migrations/update-8/index_spec.ts
new file mode 100644
index 000000000000..ee658e481ae0
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-8/index_spec.ts
@@ -0,0 +1,85 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// tslint:disable:no-big-function
+import { EmptyTree } from '@angular-devkit/schematics';
+import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+
+const renames = [
+  'use-lifecycle-interface',
+  'no-host-metadata-property',
+  'no-outputs-metadata-property',
+  'no-inputs-metadata-property',
+];
+
+describe('Migration to version 8', () => {
+  const schematicRunner = new SchematicTestRunner(
+    'migrations',
+    require.resolve('../migration-collection.json'),
+  );
+
+  let tree: UnitTestTree;
+  const tslintPath = '/tslint.json';
+  const packageJsonPath = '/package.json';
+  const baseConfig = {};
+  const defaultOptions = {};
+  const configPath = `/angular-cli.json`;
+  const tslintConfig = {
+    rules: {
+      'directive-selector': [
+        true,
+        'attribute',
+        'app',
+        'camelCase',
+      ],
+      'component-selector': [
+        true,
+        'element',
+        'app',
+        'kebab-case',
+      ],
+      'no-output-on-prefix': true,
+      'use-input-property-decorator': true,
+      'use-output-property-decorator': true,
+      'use-host-property-decorator': true,
+      'no-input-rename': true,
+      'no-output-rename': true,
+      'use-life-cycle-interface': true,
+      'use-pipe-transform-interface': true,
+      'component-class-suffix': true,
+      'directive-class-suffix': true,
+    },
+  };
+  const packageJson = {
+    devDependencies: {
+      codelyzer: '^4.5.0',
+    },
+  };
+
+  describe('Migration of codelyzer to version 5', () => {
+    beforeEach(() => {
+      tree = new UnitTestTree(new EmptyTree());
+      tree.create(configPath, JSON.stringify(baseConfig, null, 2));
+      tree.create(packageJsonPath, JSON.stringify(packageJson, null, 2));
+      tree.create(tslintPath, JSON.stringify(tslintConfig, null, 2));
+    });
+
+    it('should rename all previous rules', () => {
+      tree = schematicRunner.runSchematic('migration-07', defaultOptions, tree);
+      const tslint = JSON.parse(tree.readContent(tslintPath));
+      for (const rule of renames) {
+        expect(rule in tslint.rules).toBeTruthy(`Rule ${rule} not renamed`);
+      }
+    });
+
+    it('should update codelyzer\'s version', () => {
+      tree = schematicRunner.runSchematic('migration-07', defaultOptions, tree);
+      const packageJson = JSON.parse(tree.readContent(packageJsonPath));
+      expect(packageJson.devDependencies.codelyzer).toBe('^5.0.0');
+    });
+  });
+});

From c1e7c2b9696eefd0da67ed87edcc1936c8712724 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Wed, 27 Mar 2019 12:32:10 -0700
Subject: [PATCH 1002/1703] release: v8.0.0-beta.10

---
 yarn.lock | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 5c081593b4db..c30322ecfbf7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8114,11 +8114,6 @@ semver@6.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
   integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
 
-semver@~5.3.0:
-  version "5.3.0"
-  resolved "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-  integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
-
 send@0.16.2:
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"

From e41e10d313ad49e632ed1f9d6e7e563b3eb2fd09 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 26 Mar 2019 13:55:25 -0400
Subject: [PATCH 1003/1703] feat(@angular/cli): support stable architect API

---
 packages/angular/cli/BUILD                    |   1 +
 .../angular/cli/models/architect-command.ts   | 107 ++++++++++--------
 2 files changed, 61 insertions(+), 47 deletions(-)

diff --git a/packages/angular/cli/BUILD b/packages/angular/cli/BUILD
index abe04df02969..73a0d47bdda2 100644
--- a/packages/angular/cli/BUILD
+++ b/packages/angular/cli/BUILD
@@ -25,6 +25,7 @@ ts_library(
     deps = [
         ":command_schemas",
         "//packages/angular_devkit/architect",
+        "//packages/angular_devkit/architect:node",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
         "//packages/angular_devkit/schematics",
diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index 12be1eba06c2..03b5afecdb01 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -5,12 +5,8 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import {
-  Architect,
-  BuilderConfiguration,
-  BuilderContext,
-  TargetSpecifier,
-} from '@angular-devkit/architect';
+import { index2 } from '@angular-devkit/architect';
+import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { experimental, json, schema, tags } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { BepJsonWriter } from '../utilities/bep';
@@ -31,8 +27,8 @@ export interface ArchitectCommandOptions extends BaseCommandOptions {
 export abstract class ArchitectCommand<
   T extends ArchitectCommandOptions = ArchitectCommandOptions,
 > extends Command<ArchitectCommandOptions> {
-  private _host = new NodeJsSyncHost();
-  protected _architect: Architect;
+  protected _architect: index2.Architect;
+  protected _architectHost: WorkspaceNodeModulesArchitectHost;
   protected _workspace: experimental.workspace.Workspace;
   protected _registry: json.schema.SchemaRegistry;
 
@@ -47,7 +43,13 @@ export abstract class ArchitectCommand<
     this._registry = new json.schema.CoreSchemaRegistry();
     this._registry.addPostTransform(json.schema.transforms.addUndefinedDefaults);
 
-    await this._loadWorkspaceAndArchitect();
+    const workspaceLoader = new WorkspaceLoader(new NodeJsSyncHost());
+
+    const workspace = await workspaceLoader.loadWorkspace(this.workspace.root);
+    this._workspace = workspace;
+
+    this._architectHost = new WorkspaceNodeModulesArchitectHost(workspace, this.workspace.root);
+    this._architect = new index2.Architect(this._architectHost, this._registry);
 
     if (!this.target) {
       if (options.help) {
@@ -67,7 +69,7 @@ export abstract class ArchitectCommand<
     let projectName = options.project;
     const targetProjectNames: string[] = [];
     for (const name of this._workspace.listProjectNames()) {
-      if (this._architect.listProjectTargets(name).includes(this.target)) {
+      if (this._workspace.getProjectTargets(name)[this.target]) {
         targetProjectNames.push(name);
       }
     }
@@ -85,17 +87,20 @@ export abstract class ArchitectCommand<
       const leftoverMap = new Map<string, { optionDefs: Option[], parsedOptions: Arguments }>();
       let potentialProjectNames = new Set<string>(targetProjectNames);
       for (const name of targetProjectNames) {
-        const builderConfig = this._architect.getBuilderConfiguration({
+        const builderName = await this._architectHost.getBuilderNameForTarget({
           project: name,
           target: this.target,
         });
 
         if (this.multiTarget) {
-          builderNames.add(builderConfig.builder);
+          builderNames.add(builderName);
         }
 
-        const builderDesc = await this._architect.getBuilderDescription(builderConfig).toPromise();
-        const optionDefs = await parseJsonSchemaToOptions(this._registry, builderDesc.schema);
+        const builderDesc = await this._architectHost.resolveBuilder(builderName);
+        const optionDefs = await parseJsonSchemaToOptions(
+          this._registry,
+          builderDesc.optionSchema as json.JsonObject,
+        );
         const parsedOptions = parseArguments([...commandLeftovers], optionDefs);
         const builderLeftovers = parsedOptions['--'] || [];
         leftoverMap.set(name, { optionDefs, parsedOptions });
@@ -157,20 +162,20 @@ export abstract class ArchitectCommand<
 
     options.project = projectName;
 
-    const builderConf = this._architect.getBuilderConfiguration({
+    const builderConf = await this._architectHost.getBuilderNameForTarget({
       project: projectName || (targetProjectNames.length > 0 ? targetProjectNames[0] : ''),
       target: this.target,
     });
-    const builderDesc = await this._architect.getBuilderDescription(builderConf).toPromise();
+    const builderDesc = await this._architectHost.resolveBuilder(builderConf);
 
     this.description.options.push(...(
-      await parseJsonSchemaToOptions(this._registry, builderDesc.schema)
+      await parseJsonSchemaToOptions(this._registry, builderDesc.optionSchema as json.JsonObject)
     ));
 
     // Update options to remove analytics from options if the builder isn't safelisted.
     for (const o of this.description.options) {
       if (o.userAnalytics) {
-        if (!isPackageNameSafeForAnalytics(builderDesc.name)) {
+        if (!isPackageNameSafeForAnalytics(builderConf)) {
           o.userAnalytics = undefined;
         }
       }
@@ -183,7 +188,8 @@ export abstract class ArchitectCommand<
 
   protected async runBepTarget<T>(
     command: string,
-    configuration: BuilderConfiguration<T>,
+    configuration: index2.Target,
+    overrides: json.JsonObject,
     buildEventLog: string,
   ): Promise<number> {
     const bep = new BepJsonWriter(buildEventLog);
@@ -193,7 +199,12 @@ export abstract class ArchitectCommand<
 
     let last = 1;
     let rebuild = false;
-    await this._architect.run(configuration, { logger: this.logger }).forEach(event => {
+    const run = await this._architect.scheduleTarget(
+      configuration,
+      overrides,
+      { logger: this.logger },
+    );
+    await run.output.forEach(event => {
       last = event.success ? 0 : 1;
 
       if (rebuild) {
@@ -207,19 +218,25 @@ export abstract class ArchitectCommand<
       bep.writeBuildFinished(last);
     });
 
+    await run.stop();
+
     return last;
   }
 
   protected async runSingleTarget(
-    targetSpec: TargetSpecifier,
+    target: index2.Target,
     targetOptions: string[],
-    commandOptions: ArchitectCommandOptions & Arguments) {
+    commandOptions: ArchitectCommandOptions & Arguments,
+  ) {
     // We need to build the builderSpec twice because architect does not understand
     // overrides separately (getting the configuration builds the whole project, including
     // overrides).
-    const builderConf = this._architect.getBuilderConfiguration(targetSpec);
-    const builderDesc = await this._architect.getBuilderDescription(builderConf).toPromise();
-    const targetOptionArray = await parseJsonSchemaToOptions(this._registry, builderDesc.schema);
+    const builderConf = await this._architectHost.getBuilderNameForTarget(target);
+    const builderDesc = await this._architectHost.resolveBuilder(builderConf);
+    const targetOptionArray = await parseJsonSchemaToOptions(
+      this._registry,
+      builderDesc.optionSchema as json.JsonObject,
+    );
     const overrides = parseArguments(targetOptions, targetOptionArray, this.logger);
 
     if (overrides['--']) {
@@ -229,11 +246,6 @@ export abstract class ArchitectCommand<
 
       return 1;
     }
-    const realBuilderConf = this._architect.getBuilderConfiguration({ ...targetSpec, overrides });
-    const builderContext: Partial<BuilderContext> = {
-      logger: this.logger,
-      targetSpecifier: targetSpec,
-    };
 
     if (commandOptions.buildEventLog && ['build', 'serve'].includes(this.description.name)) {
       // The build/serve commands supports BEP messaging
@@ -241,13 +253,19 @@ export abstract class ArchitectCommand<
 
       return this.runBepTarget(
         this.description.name,
-        realBuilderConf,
+        target,
+        overrides as json.JsonObject,
         commandOptions.buildEventLog as string,
       );
     } else {
-      const result = await this._architect
-        .run(realBuilderConf, builderContext)
-        .toPromise();
+      const run = await this._architect.scheduleTarget(
+        target,
+        overrides as json.JsonObject,
+        { logger: this.logger },
+      );
+
+      const result = await run.output.toPromise();
+      await run.stop();
 
       return result.success ? 0 : 1;
     }
@@ -265,7 +283,11 @@ export abstract class ArchitectCommand<
         // Running them in parallel would jumble the log messages.
         let result = 0;
         for (const project of this.getProjectNamesByTarget(this.target)) {
-          result |= await this.runSingleTarget({ ...targetSpec, project }, extra, options);
+          result |= await this.runSingleTarget(
+            { ...targetSpec, project } as index2.Target,
+            extra,
+            options,
+          );
         }
 
         return result;
@@ -300,7 +322,7 @@ export abstract class ArchitectCommand<
 
   private getProjectNamesByTarget(targetName: string): string[] {
     const allProjectsForTargetName = this._workspace.listProjectNames().map(projectName =>
-      this._architect.listProjectTargets(projectName).includes(targetName) ? projectName : null,
+      this._workspace.getProjectTargets(projectName)[targetName] ? projectName : null,
     ).filter(x => !!x) as string[];
 
     if (this.multiTarget) {
@@ -322,16 +344,7 @@ export abstract class ArchitectCommand<
     }
   }
 
-  private async _loadWorkspaceAndArchitect() {
-    const workspaceLoader = new WorkspaceLoader(this._host);
-
-    const workspace = await workspaceLoader.loadWorkspace(this.workspace.root);
-
-    this._workspace = workspace;
-    this._architect = await new Architect(workspace).loadArchitect().toPromise();
-  }
-
-  private _makeTargetSpecifier(commandOptions: ArchitectCommandOptions): TargetSpecifier {
+  private _makeTargetSpecifier(commandOptions: ArchitectCommandOptions): index2.Target {
     let project, target, configuration;
 
     if (commandOptions.target) {
@@ -358,7 +371,7 @@ export abstract class ArchitectCommand<
 
     return {
       project,
-      configuration,
+      configuration: configuration || '',
       target,
     };
   }

From 7b1bb478b58a9733461fd820f23bd559dc218bd3 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 26 Mar 2019 18:45:18 -0400
Subject: [PATCH 1004/1703] fix(@angular-devkit/build-angular): use package
 import for build-webpack in server builder

---
 packages/angular_devkit/build_angular/src/server/index2.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/server/index2.ts b/packages/angular_devkit/build_angular/src/server/index2.ts
index d495725c466f..85624579901f 100644
--- a/packages/angular_devkit/build_angular/src/server/index2.ts
+++ b/packages/angular_devkit/build_angular/src/server/index2.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { BuilderOutput, createBuilder } from '@angular-devkit/architect/src/index2';
+import { runWebpack } from '@angular-devkit/build-webpack/src/webpack/index2';
 import {
   Path,
   experimental,
@@ -21,7 +22,6 @@ import * as path from 'path';
 import { from, of } from 'rxjs';
 import { concatMap, map } from 'rxjs/operators';
 import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
-import { runWebpack } from '../../../build_webpack/src/webpack/index2';
 import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
 import {
   getAotConfig,

From 4a8022ea00672bc17320febfa9ee4a2467a62e53 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 27 Mar 2019 14:17:57 -0400
Subject: [PATCH 1005/1703] fix(@angular-devkit/architect): ensure
 workspaceRoot is actually set to workspaceRoot

---
 packages/angular_devkit/architect/src/schedule-by-name.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/architect/src/schedule-by-name.ts b/packages/angular_devkit/architect/src/schedule-by-name.ts
index f48c6be634f2..9ff8a747aaae 100644
--- a/packages/angular_devkit/architect/src/schedule-by-name.ts
+++ b/packages/angular_devkit/architect/src/schedule-by-name.ts
@@ -47,8 +47,8 @@ export async function scheduleByName(
 
   const message = {
     id,
-    currentDirectory: workspaceRoot,
-    workspaceRoot: currentDirectory,
+    currentDirectory,
+    workspaceRoot,
     info: info,
     options: buildOptions,
     ...(options.target ? { target: options.target } : {}),

From bf52b26219ffc16bed2dd55716e21773b415fd2a Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 27 Mar 2019 15:40:35 -0400
Subject: [PATCH 1006/1703] fix(@angular-devkit/core): correct workspace
 discovery

---
 .../core/src/experimental/workspace/workspace.ts              | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/angular_devkit/core/src/experimental/workspace/workspace.ts b/packages/angular_devkit/core/src/experimental/workspace/workspace.ts
index 4a2a304299e2..f19850544111 100644
--- a/packages/angular_devkit/core/src/experimental/workspace/workspace.ts
+++ b/packages/angular_devkit/core/src/experimental/workspace/workspace.ts
@@ -73,7 +73,7 @@ async function _findUp(host: virtualFs.Host, names: string[], from: Path): Promi
   do {
     for (const name of names) {
       const p = join(from, name);
-      if (await host.exists(p)) {
+      if (await host.exists(p).toPromise()) {
         return p;
       }
     }
@@ -88,8 +88,6 @@ export class Workspace {
   protected static _workspaceFileNames = [
     'angular.json',
     '.angular.json',
-    'workspace.json',
-    '.workspace.json',
   ];
 
   private readonly _workspaceSchemaPath = normalize(require.resolve('./workspace-schema.json'));

From e9ee58a89ea94e2295b4744d08a55d0c76349382 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 25 Mar 2019 16:24:36 -0700
Subject: [PATCH 1007/1703] refactor(@angular/cli): move analytics constants to
 devkit core

They need to be shared with builders and schematics.
---
 packages/angular/cli/commands/add-impl.ts     |  4 +--
 packages/angular/cli/commands/build-impl.ts   |  5 ++--
 packages/angular/cli/commands/serve-impl.ts   |  5 ++--
 packages/angular/cli/models/analytics.ts      | 10 ++++---
 .../core/src/analytics/index.ts               | 29 +++++++++++++++++++
 5 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/packages/angular/cli/commands/add-impl.ts b/packages/angular/cli/commands/add-impl.ts
index 27b5a8df4818..d6f000827e82 100644
--- a/packages/angular/cli/commands/add-impl.ts
+++ b/packages/angular/cli/commands/add-impl.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { tags, terminal } from '@angular-devkit/core';
+import { analytics, tags, terminal } from '@angular-devkit/core';
 import { ModuleNotFoundException, resolve } from '@angular-devkit/core/node';
 import { NodePackageDoesNotSupportSchematics } from '@angular-devkit/schematics/tools';
 import { dirname } from 'path';
@@ -150,7 +150,7 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
 
     // Add the collection if it's safe listed.
     if (collection && isPackageNameSafeForAnalytics(collection)) {
-      dimensions[AnalyticsDimensions.NgAddCollection] = collection;
+      dimensions[analytics.NgCliAnalyticsDimensions.NgAddCollection] = collection;
     } else {
       delete dimensions[AnalyticsDimensions.NgAddCollection];
     }
diff --git a/packages/angular/cli/commands/build-impl.ts b/packages/angular/cli/commands/build-impl.ts
index 962e766db1be..fe1fde26fd46 100644
--- a/packages/angular/cli/commands/build-impl.ts
+++ b/packages/angular/cli/commands/build-impl.ts
@@ -5,8 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { AnalyticsDimensions } from '../models/analytics';
+import { analytics } from '@angular-devkit/core';
 import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
 import { Arguments } from '../models/interface';
 import { Version } from '../upgrade/version';
@@ -29,7 +28,7 @@ export class BuildCommand extends ArchitectCommand<BuildCommandSchema> {
     metrics: (boolean | number | string)[] = [],
   ): Promise<void> {
     if (options.buildEventLog !== undefined) {
-      dimensions[AnalyticsDimensions.NgBuildBuildEventLog] = true;
+      dimensions[analytics.NgCliAnalyticsDimensions.NgBuildBuildEventLog] = true;
     }
 
     return super.reportAnalytics(paths, options, dimensions, metrics);
diff --git a/packages/angular/cli/commands/serve-impl.ts b/packages/angular/cli/commands/serve-impl.ts
index 337d45a4aff6..22e104b1010f 100644
--- a/packages/angular/cli/commands/serve-impl.ts
+++ b/packages/angular/cli/commands/serve-impl.ts
@@ -5,8 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { AnalyticsDimensions } from '../models/analytics';
+import { analytics } from '@angular-devkit/core';
 import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
 import { Arguments } from '../models/interface';
 import { Version } from '../upgrade/version';
@@ -34,7 +33,7 @@ export class ServeCommand extends ArchitectCommand<ServeCommandSchema> {
     metrics: (boolean | number | string)[] = [],
   ): Promise<void> {
     if (options.buildEventLog !== undefined) {
-      dimensions[AnalyticsDimensions.NgBuildBuildEventLog] = true;
+      dimensions[analytics.NgCliAnalyticsDimensions.NgBuildBuildEventLog] = true;
     }
 
     return super.reportAnalytics(paths, options, dimensions, metrics);
diff --git a/packages/angular/cli/models/analytics.ts b/packages/angular/cli/models/analytics.ts
index 6e2ac774e1f9..39b9272d2b78 100644
--- a/packages/angular/cli/models/analytics.ts
+++ b/packages/angular/cli/models/analytics.ts
@@ -241,6 +241,7 @@ function _buildUserAgentString() {
 export class UniversalAnalytics implements analytics.Analytics {
   private _ua: ua.Visitor;
   private _dirty = false;
+  private _metrics: (string | number)[] = [];
 
   /**
    * @param trackingId The Google Analytics ID.
@@ -266,10 +267,10 @@ export class UniversalAnalytics implements analytics.Analytics {
     this._ua.set('aid', _getNodeVersion());
 
     // We set custom metrics for values we care about.
-    this._ua.set('cm1', _getCpuCount());
-    this._ua.set('cm2', _getCpuSpeed());
-    this._ua.set('cm3', _getRamSize());
-    this._ua.set('cm4', _getNumericNodeVersion());
+    this._metrics[analytics.NgCliAnalyticsMetrics.CpuCount] = _getCpuCount();
+    this._metrics[analytics.NgCliAnalyticsMetrics.CpuSpeed] = _getCpuSpeed();
+    this._metrics[analytics.NgCliAnalyticsMetrics.RamInMegabytes] = _getRamSize();
+    this._metrics[analytics.NgCliAnalyticsMetrics.NodeVersion] = _getNumericNodeVersion();
   }
 
   /**
@@ -278,6 +279,7 @@ export class UniversalAnalytics implements analytics.Analytics {
    */
   private _customVariables(options: analytics.CustomDimensionsAndMetricsOptions) {
     const additionals: { [key: string]: boolean | number | string } = {};
+    this._metrics.forEach((v, i) => additionals['cm' + i] = v);
     (options.dimensions || []).forEach((v, i) => additionals['cd' + i] = v);
     (options.metrics || []).forEach((v, i) => additionals['cm' + i] = v);
 
diff --git a/packages/angular_devkit/core/src/analytics/index.ts b/packages/angular_devkit/core/src/analytics/index.ts
index e84c8b068b88..eb3b842c0df1 100644
--- a/packages/angular_devkit/core/src/analytics/index.ts
+++ b/packages/angular_devkit/core/src/analytics/index.ts
@@ -10,3 +10,32 @@ export * from './forwarder';
 export * from './logging';
 export * from './multi';
 export * from './noop';
+
+
+/**
+ * MAKE SURE TO KEEP THIS IN SYNC WITH THE TABLE AND CONTENT IN `/docs/design/analytics.md`.
+ * WE LIST THOSE DIMENSIONS (AND MORE).
+ */
+export enum NgCliAnalyticsDimensions {
+  NgAddCollection = 6,
+  NgBuildBuildEventLog = 7,
+  BuildErrors = 20,
+}
+
+export enum NgCliAnalyticsMetrics {
+  CpuCount = 1,
+  CpuSpeed = 2,
+  RamInMegabytes = 3,
+  NodeVersion = 4,
+  BuildTime = 5,
+  NgOnInitCount = 6,
+  InitialChunkSize = 7,
+  TotalChunkCount = 8,
+  TotalChunkSize = 9,
+  LazyChunkCount = 10,
+  LazyChunkSize = 11,
+  AssetCount = 12,
+  AssetSize = 13,
+  PolyfillSize = 12,
+  CssSize = 13,
+}

From ecd25a713157f076746973cb6b219704db7fe6b4 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 25 Mar 2019 16:26:28 -0700
Subject: [PATCH 1008/1703] refactor(@angular/cli): remove dimension 20

We need it for errors in build.
---
 packages/schematics/angular/component/schema.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/schematics/angular/component/schema.json b/packages/schematics/angular/component/schema.json
index 6d21c3b0e2ee..1e543bab2122 100644
--- a/packages/schematics/angular/component/schema.json
+++ b/packages/schematics/angular/component/schema.json
@@ -130,8 +130,7 @@
     "entryComponent": {
       "type": "boolean",
       "default": false,
-      "description": "When true, the new component is the entry component of the declaring NgModule.",
-      "x-user-analytics": 20
+      "description": "When true, the new component is the entry component of the declaring NgModule."
     },
     "lintFix": {
       "type": "boolean",

From d25fb89078ba9c421fed55b9bcf19db59f839608 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 25 Mar 2019 16:28:48 -0700
Subject: [PATCH 1009/1703] feat(@angular-devkit/architect): add analytics to
 builder context

It should be NoopAnalytics if no analytics are supported.
---
 packages/angular_devkit/architect/src/api.ts             | 8 +++++++-
 packages/angular_devkit/architect/src/architect.ts       | 5 ++++-
 packages/angular_devkit/architect/src/create-builder.ts  | 4 +++-
 .../angular_devkit/architect/src/schedule-by-name.ts     | 9 +++++++++
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/architect/src/api.ts b/packages/angular_devkit/architect/src/api.ts
index 769474965cbd..032482041059 100644
--- a/packages/angular_devkit/architect/src/api.ts
+++ b/packages/angular_devkit/architect/src/api.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { experimental, json, logging } from '@angular-devkit/core';
+import { analytics, experimental, json, logging } from '@angular-devkit/core';
 import { Observable, from } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import { Schema as RealBuilderInput, Target as RealTarget } from './input-schema';
@@ -234,6 +234,12 @@ export interface BuilderContext {
    */
   reportProgress(current: number, total?: number, status?: string): void;
 
+  /**
+   * API to report analytics. This might be undefined if the feature is unsupported. This might
+   * not be undefined, but the backend could also not report anything.
+   */
+  readonly analytics: analytics.Analytics;
+
   /**
    * Add teardown logic to this Context, so that when it's being stopped it will execute teardown.
    */
diff --git a/packages/angular_devkit/architect/src/architect.ts b/packages/angular_devkit/architect/src/architect.ts
index 7001fcd282d5..09f797cde570 100644
--- a/packages/angular_devkit/architect/src/architect.ts
+++ b/packages/angular_devkit/architect/src/architect.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { experimental, json, logging } from '@angular-devkit/core';
+import { analytics, experimental, json, logging } from '@angular-devkit/core';
 import { Observable, from, of } from 'rxjs';
 import { concatMap, first, map, shareReplay, switchMap } from 'rxjs/operators';
 import {
@@ -102,6 +102,7 @@ function _createJobHandlerFromBuilderInfo(
 
 export interface ScheduleOptions {
   logger?: logging.Logger;
+  analytics?: analytics.Analytics;
 }
 
 
@@ -347,6 +348,7 @@ export class Architect {
       logger: scheduleOptions.logger || new logging.NullLogger(),
       currentDirectory: this._host.getCurrentDirectory(),
       workspaceRoot: this._host.getWorkspaceRoot(),
+      analytics: scheduleOptions.analytics,
     });
   }
   scheduleTarget(
@@ -359,6 +361,7 @@ export class Architect {
       logger: scheduleOptions.logger || new logging.NullLogger(),
       currentDirectory: this._host.getCurrentDirectory(),
       workspaceRoot: this._host.getWorkspaceRoot(),
+      analytics: scheduleOptions.analytics,
     });
   }
 }
diff --git a/packages/angular_devkit/architect/src/create-builder.ts b/packages/angular_devkit/architect/src/create-builder.ts
index 351741520d2b..224431e5d4c6 100644
--- a/packages/angular_devkit/architect/src/create-builder.ts
+++ b/packages/angular_devkit/architect/src/create-builder.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { experimental, isPromise, json, logging } from '@angular-devkit/core';
+import { analytics, experimental, isPromise, json, logging } from '@angular-devkit/core';
 import { Observable, Subscription, from, isObservable, of, throwError } from 'rxjs';
 import { tap } from 'rxjs/operators';
 import {
@@ -36,6 +36,7 @@ export function createBuilder<
     const scheduler = context.scheduler;
     const progressChannel = context.createChannel('progress');
     const logChannel = context.createChannel('log');
+    const analyticsChannel = context.createChannel('analytics');
     let currentState: BuilderProgressState = BuilderProgressState.Stopped;
     const teardownLogics: Array<() => (PromiseLike<void> | void)> = [];
     let tearingDown = false;
@@ -181,6 +182,7 @@ export function createBuilder<
                 progress({ state: currentState, current, total, status }, context);
             }
           },
+          analytics: new analytics.ForwardingAnalytics(report => analyticsChannel.next(report)),
           addTeardown(teardown: () => (Promise<void> | void)): void {
             teardownLogics.push(teardown);
           },
diff --git a/packages/angular_devkit/architect/src/schedule-by-name.ts b/packages/angular_devkit/architect/src/schedule-by-name.ts
index 9ff8a747aaae..f4dbc8189fc0 100644
--- a/packages/angular_devkit/architect/src/schedule-by-name.ts
+++ b/packages/angular_devkit/architect/src/schedule-by-name.ts
@@ -8,6 +8,7 @@
 import { experimental, json, logging } from '@angular-devkit/core';
 import { EMPTY, Subscription } from 'rxjs';
 import { catchError, first, ignoreElements, map, share, shareReplay, tap } from 'rxjs/operators';
+import { Analytics, AnalyticsReport, AnalyticsReporter } from '../../core/src/analytics';
 import {
   BuilderInfo,
   BuilderInput,
@@ -31,6 +32,7 @@ export async function scheduleByName(
     logger: logging.LoggerApi,
     workspaceRoot: string | Promise<string>,
     currentDirectory: string | Promise<string>,
+    analytics?: Analytics,
   },
 ): Promise<BuilderRun> {
   const childLoggerName = options.target ? `{${targetStringFromTarget(options.target)}}` : name;
@@ -88,6 +90,12 @@ export async function scheduleByName(
     shareReplay(),
   );
 
+  // If there's an analytics object, take the job channel and report it to the analytics.
+  if (options.analytics) {
+    const reporter = new AnalyticsReporter(options.analytics);
+    job.getChannel<AnalyticsReport>('analytics')
+      .subscribe(report => reporter.report(report));
+  }
   // Start the builder.
   output.pipe(first()).subscribe({
     error() {},
@@ -121,6 +129,7 @@ export async function scheduleByTarget(
     logger: logging.LoggerApi,
     workspaceRoot: string | Promise<string>,
     currentDirectory: string | Promise<string>,
+    analytics?: Analytics,
   },
 ): Promise<BuilderRun> {
   return scheduleByName(`{${targetStringFromTarget(target)}}`, overrides, {

From a2ff62e2b0a90bb4623ebe8dfca351b58027e84b Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 25 Mar 2019 16:30:08 -0700
Subject: [PATCH 1010/1703] feat(@angular-devkit/build-angular): add analytics
 for build

Add a few metrics that we want to capture in the build.
---
 .../plugins/webpack/analytics.ts              | 256 ++++++++++++++++++
 .../build_angular/src/browser/index2.ts       |  34 ++-
 2 files changed, 285 insertions(+), 5 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/plugins/webpack/analytics.ts

diff --git a/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts b/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts
new file mode 100644
index 000000000000..fd50a1004a51
--- /dev/null
+++ b/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts
@@ -0,0 +1,256 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { analytics } from '@angular-devkit/core';
+import {
+  Compiler,
+  Module,
+  Stats,
+  compilation,
+} from 'webpack';
+import { Source } from 'webpack-sources';
+import Compilation = compilation.Compilation;
+
+const NormalModule = require('webpack/lib/NormalModule');
+
+interface NormalModule extends Module {
+  _source?: Source | null;
+  resource?: string;
+}
+
+const webpackAllErrorMessageRe = /^([^(]+)\(\d+,\d\): (.*)$/gm;
+const webpackTsErrorMessageRe = /^[^(]+\(\d+,\d\): error (TS\d+):/;
+
+/**
+ * Faster than using a RegExp, so we use this to count occurences in source code.
+ * @param source The source to look into.
+ * @param match The match string to look for.
+ * @param wordBreak Whether to check for word break before and after a match was found.
+ * @return The number of matches found.
+ * @private
+ */
+export function countOccurrences(source: string, match: string, wordBreak = false): number {
+  if (match.length == 0) {
+    return source.length + 1;
+  }
+
+  let count = 0;
+  // We condition here so branch prediction happens out of the loop, not in it.
+  if (wordBreak) {
+    const re = /\w/;
+    for (let pos = source.lastIndexOf(match); pos >= 0; pos = source.lastIndexOf(match, pos - 1)) {
+      if (!(re.test(source[pos - 1]) || re.test(source[pos + match.length]))) {
+        count++;  // 1 match, AH! AH! AH! 2 matches, AH! AH! AH!
+      }
+    }
+  } else {
+    for (let pos = source.lastIndexOf(match); pos >= 0; pos = source.lastIndexOf(match, pos - 1)) {
+      count++;  // 1 match, AH! AH! AH! 2 matches, AH! AH! AH!
+    }
+  }
+
+  return count;
+}
+
+
+/**
+ * Holder of statistics related to the build.
+ */
+class AnalyticsBuildStats {
+  public errors: string[] = [];
+  public numberOfNgOnInit = 0;
+  public initialChunkSize = 0;
+  public totalChunkCount = 0;
+  public totalChunkSize = 0;
+  public lazyChunkCount = 0;
+  public lazyChunkSize = 0;
+  public assetCount = 0;
+  public assetSize = 0;
+  public polyfillSize = 0;
+  public cssSize = 0;
+}
+
+
+/**
+ * Analytics plugin that reports the analytics we want from the CLI.
+ */
+export class NgBuildAnalyticsPlugin {
+  protected _built = false;
+  protected _stats = new AnalyticsBuildStats();
+
+  constructor(
+    protected _projectRoot: string,
+    protected _analytics: analytics.Analytics,
+    protected _category: string,
+  ) {}
+
+  protected _reset() {
+    this._stats = new AnalyticsBuildStats();
+  }
+
+  protected _getMetrics(stats: Stats) {
+    const startTime = +(stats.startTime || 0);
+    const endTime = +(stats.endTime || 0);
+    const metrics: (string | number)[] = [];
+    metrics[analytics.NgCliAnalyticsMetrics.BuildTime] = (endTime - startTime);
+    metrics[analytics.NgCliAnalyticsMetrics.NgOnInitCount] = this._stats.numberOfNgOnInit;
+    metrics[analytics.NgCliAnalyticsMetrics.InitialChunkSize] = this._stats.initialChunkSize;
+    metrics[analytics.NgCliAnalyticsMetrics.TotalChunkCount] = this._stats.totalChunkCount;
+    metrics[analytics.NgCliAnalyticsMetrics.TotalChunkSize] = this._stats.totalChunkSize;
+    metrics[analytics.NgCliAnalyticsMetrics.LazyChunkCount] = this._stats.lazyChunkCount;
+    metrics[analytics.NgCliAnalyticsMetrics.LazyChunkSize] = this._stats.lazyChunkSize;
+    metrics[analytics.NgCliAnalyticsMetrics.AssetCount] = this._stats.assetCount;
+    metrics[analytics.NgCliAnalyticsMetrics.AssetSize] = this._stats.assetSize;
+    metrics[analytics.NgCliAnalyticsMetrics.PolyfillSize] = this._stats.polyfillSize;
+    metrics[analytics.NgCliAnalyticsMetrics.CssSize] = this._stats.cssSize;
+
+    return metrics;
+  }
+  protected _getDimensions(stats: Stats) {
+    const dimensions: (string | number)[] = [];
+    // Adding commas before and after so the regex are easier to define.
+    dimensions[analytics.NgCliAnalyticsDimensions.BuildErrors] = `,${this._stats.errors.join()},`;
+
+    return dimensions;
+  }
+
+  protected _reportBuildMetrics(stats: Stats) {
+    const dimensions = this._getDimensions(stats);
+    const metrics = this._getMetrics(stats);
+    this._analytics.event(this._category, 'build', { dimensions, metrics });
+  }
+
+  protected _reportRebuildMetrics(stats: Stats) {
+    const dimensions = this._getDimensions(stats);
+    const metrics = this._getMetrics(stats);
+    this._analytics.event(this._category, 'rebuild', { dimensions, metrics });
+  }
+
+  protected _checkTsNormalModule(module: NormalModule) {
+    if (module._source) {
+      // We're dealing with ES5 _or_ ES2015 JavaScript at this point (we don't know for sure).
+      // Just count the ngOnInit occurences. Comments/Strings/calls occurences should be sparse
+      // so we just consider them within the margin of error. We do break on word break though.
+      this._stats.numberOfNgOnInit += countOccurrences(module._source.source(), 'ngOnInit', true);
+    }
+  }
+
+  protected _collectErrors(stats: Stats) {
+    if (stats.hasErrors()) {
+      for (const errObject of stats.compilation.errors) {
+        if (errObject instanceof Error) {
+          const allErrors = errObject.message.match(webpackAllErrorMessageRe);
+          for (const err of [...allErrors || []].slice(1)) {
+            const message = (err.match(webpackTsErrorMessageRe) || [])[1];
+            if (message) {
+              // At this point this should be a TS1234.
+              this._stats.errors.push(message);
+            }
+          }
+          // console.log(allErrors);
+        }
+        console.log(errObject.message);
+        console.log('------');
+      }
+    }
+  }
+
+  // We can safely disable no any here since we know the format of the JSON output from webpack.
+  // tslint:disable-next-line:no-any
+  protected _collectBundleStats(json: any) {
+    json.chunks
+      .filter((chunk: { rendered?: boolean }) => chunk.rendered)
+      .forEach((chunk: { files: string[], initial?: boolean, entry?: boolean }) => {
+        const asset = json.assets.find((x: { name: string }) => x.name == chunk.files[0]);
+        const size = asset ? asset.size : 0;
+
+        if (chunk.entry || chunk.initial) {
+          this._stats.initialChunkSize += size;
+        } else {
+          this._stats.lazyChunkCount++;
+          this._stats.lazyChunkSize += size;
+        }
+        this._stats.totalChunkCount++;
+        this._stats.totalChunkSize += size;
+      });
+
+    json.assets
+      // Filter out chunks. We only count assets that are not JS.
+      .filter((a: { name: string }) => {
+        return json.chunks.every((chunk: { files: string[] }) => chunk.files[0] != a.name);
+      })
+      .forEach((a: { size?: number }) => {
+        this._stats.assetSize += (a.size || 0);
+        this._stats.assetCount++;
+      });
+
+    for (const asset of json.assets) {
+      if (asset.name == 'polyfill') {
+        this._stats.polyfillSize += asset.size || 0;
+      }
+    }
+    for (const chunk of json.chunks) {
+      if (chunk.files[0].endsWith('.css')) {
+        this._stats.cssSize += chunk.size || 0;
+      }
+    }
+  }
+
+  /************************************************************************************************
+   * The next section is all the different Webpack hooks for this plugin.
+   */
+
+  /**
+   * Reports a succeed module.
+   * @private
+   */
+  protected _succeedModule(mod: Module) {
+    // Only report NormalModule instances.
+    if (mod.constructor !== NormalModule) {
+      return;
+    }
+    const module = mod as {} as NormalModule;
+
+    // Only reports modules that are part of the user's project. We also don't do node_modules.
+    // There is a chance that someone name a file path `hello_node_modules` or something and we
+    // will ignore that file for the purpose of gathering, but we're willing to take the risk.
+    if (!module.resource
+        || !module.resource.startsWith(this._projectRoot)
+        || module.resource.indexOf('node_modules') >= 0) {
+      return;
+    }
+
+    // Check that it's a source file from the project.
+    if (module.constructor === NormalModule && module.resource.endsWith('.ts')) {
+      this._checkTsNormalModule(module as {} as NormalModule);
+    }
+  }
+
+  protected _compilation(compiler: Compiler, compilation: Compilation) {
+    this._reset();
+    compilation.hooks.succeedModule.tap('NgBuildAnalyticsPlugin', this._succeedModule.bind(this));
+  }
+
+  protected _done(stats: Stats) {
+    this._collectErrors(stats);
+    this._collectBundleStats(stats.toJson());
+    if (this._built) {
+      this._reportRebuildMetrics(stats);
+    } else {
+      this._reportBuildMetrics(stats);
+      this._built = true;
+    }
+  }
+
+  apply(compiler: Compiler): void {
+    compiler.hooks.compilation.tap(
+      'NgBuildAnalyticsPlugin',
+      this._compilation.bind(this, compiler),
+    );
+    compiler.hooks.done.tap('NgBuildAnalyticsPlugin', this._done.bind(this));
+  }
+}
diff --git a/packages/angular_devkit/build_angular/src/browser/index2.ts b/packages/angular_devkit/build_angular/src/browser/index2.ts
index 6055c3087ecc..1c0925cf4095 100644
--- a/packages/angular_devkit/build_angular/src/browser/index2.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index2.ts
@@ -12,6 +12,7 @@ import {
 } from '@angular-devkit/build-webpack/src/webpack/index2';
 import {
   Path,
+  analytics,
   experimental,
   getSystemPath,
   join,
@@ -27,6 +28,7 @@ import * as fs from 'fs';
 import { Observable, from, of } from 'rxjs';
 import { concatMap, map, switchMap } from 'rxjs/operators';
 import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
+import { NgBuildAnalyticsPlugin } from '../../plugins/webpack/analytics';
 import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
 import {
   getAotConfig,
@@ -88,7 +90,10 @@ export function buildWebpackConfig(
   root: Path,
   projectRoot: Path,
   options: NormalizedBrowserBuilderSchema,
-  logger: logging.LoggerApi,
+  additionalOptions: {
+    logger?: logging.LoggerApi,
+    analytics?: analytics.Analytics,
+  } = {},
 ): webpack.Configuration {
   // Ensure Build Optimizer is only used with AOT.
   if (options.buildOptimizer && !options.aot) {
@@ -105,9 +110,13 @@ export function buildWebpackConfig(
   const supportES2015 = tsConfig.options.target !== projectTs.ScriptTarget.ES3
     && tsConfig.options.target !== projectTs.ScriptTarget.ES5;
 
+  const logger = additionalOptions.logger
+    ? additionalOptions.logger.createChild('webpackConfigOptions')
+    : new logging.NullLogger();
+
   wco = {
     root: getSystemPath(root),
-    logger: logger.createChild('webpackConfigOptions'),
+    logger,
     projectRoot: getSystemPath(projectRoot),
     buildOptions: options,
     tsConfig,
@@ -124,6 +133,15 @@ export function buildWebpackConfig(
     getStatsConfig(wco),
   ];
 
+  if (additionalOptions.analytics) {
+    // If there's analytics, add our plugin. Otherwise no need to slow down the build.
+    webpackConfigs.push({
+      plugins: [
+        new NgBuildAnalyticsPlugin(wco.projectRoot, additionalOptions.analytics, 'build'),
+      ],
+    });
+  }
+
   if (wco.buildOptions.main || wco.buildOptions.polyfills) {
     const typescriptConfigPartial = wco.buildOptions.aot
       ? getAotConfig(wco)
@@ -151,7 +169,10 @@ export async function buildBrowserWebpackConfigFromWorkspace(
   projectName: string,
   workspace: experimental.workspace.Workspace,
   host: virtualFs.Host<fs.Stats>,
-  logger: logging.LoggerApi,
+  additionalOptions: {
+    logger?: logging.LoggerApi,
+    analytics?: analytics.Analytics,
+  } = {},
 ): Promise<webpack.Configuration> {
   // TODO: Use a better interface for workspace access.
   const projectRoot = resolve(workspace.root, normalize(workspace.getProject(projectName).root));
@@ -165,7 +186,7 @@ export async function buildBrowserWebpackConfigFromWorkspace(
     options,
   );
 
-  return buildWebpackConfig(workspace.root, projectRoot, normalizedOptions, logger);
+  return buildWebpackConfig(workspace.root, projectRoot, normalizedOptions, additionalOptions);
 }
 
 
@@ -194,7 +215,10 @@ export async function buildBrowserWebpackConfigFromContext(
     projectName,
     workspace,
     host,
-    context.logger,
+    {
+      logger: context.logger,
+      analytics: context.analytics,
+    },
   );
 
   return { workspace, config };

From 1f9f92ed7641b0a1f3095745e4f549eaeec78175 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 25 Mar 2019 17:15:27 -0700
Subject: [PATCH 1011/1703] build: dont tar private packages

They cannot be installed anyway.
---
 scripts/build.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/build.ts b/scripts/build.ts
index 21008b42dc37..1f6745765f53 100644
--- a/scripts/build.ts
+++ b/scripts/build.ts
@@ -397,8 +397,10 @@ export default async function(
   const tarLogger = logger.createChild('license');
   Object.keys(packages).forEach(pkgName => {
     const pkg = packages[pkgName];
-    tarLogger.info(`${pkgName} => ${pkg.tar}`);
-    _tar(pkg.tar, pkg.dist);
+    if (!pkg.private) {
+      tarLogger.info(`${pkgName} => ${pkg.tar}`);
+      _tar(pkg.tar, pkg.dist);
+    }
   });
 
   logger.info(`Done.`);

From 00fb4cea4f92170eb7e3c8af0169f008ad25c2cd Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 25 Mar 2019 17:23:24 -0700
Subject: [PATCH 1012/1703] feat(@angular-devkit/build-angular): use builder
 name for category

So we can differentiate between dev-server, browser, karma, etc.
---
 .../build_angular/src/browser/index2.ts        | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/browser/index2.ts b/packages/angular_devkit/build_angular/src/browser/index2.ts
index 1c0925cf4095..182e83e1110d 100644
--- a/packages/angular_devkit/build_angular/src/browser/index2.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index2.ts
@@ -5,7 +5,12 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect/src/index2';
+import {
+  BuilderContext,
+  BuilderInfo,
+  BuilderOutput,
+  createBuilder,
+} from '@angular-devkit/architect/src/index2';
 import {
   WebpackLoggingCallback,
   runWebpack,
@@ -93,6 +98,7 @@ export function buildWebpackConfig(
   additionalOptions: {
     logger?: logging.LoggerApi,
     analytics?: analytics.Analytics,
+    builderInfo?: BuilderInfo,
   } = {},
 ): webpack.Configuration {
   // Ensure Build Optimizer is only used with AOT.
@@ -135,9 +141,15 @@ export function buildWebpackConfig(
 
   if (additionalOptions.analytics) {
     // If there's analytics, add our plugin. Otherwise no need to slow down the build.
+    let category = 'build';
+    if (additionalOptions.builderInfo) {
+      // We already vetted that this is a "safe" package, otherwise the analytics would be noop.
+      category = additionalOptions.builderInfo.builderName.split(':')[1];
+    }
+    // The category is the builder name if it's an angular builder.
     webpackConfigs.push({
       plugins: [
-        new NgBuildAnalyticsPlugin(wco.projectRoot, additionalOptions.analytics, 'build'),
+        new NgBuildAnalyticsPlugin(wco.projectRoot, additionalOptions.analytics, category),
       ],
     });
   }
@@ -172,6 +184,7 @@ export async function buildBrowserWebpackConfigFromWorkspace(
   additionalOptions: {
     logger?: logging.LoggerApi,
     analytics?: analytics.Analytics,
+    builderInfo?: BuilderInfo,
   } = {},
 ): Promise<webpack.Configuration> {
   // TODO: Use a better interface for workspace access.
@@ -218,6 +231,7 @@ export async function buildBrowserWebpackConfigFromContext(
     {
       logger: context.logger,
       analytics: context.analytics,
+      builderInfo: context.builder,
     },
   );
 

From 55471770dbdc1b5c919db427d25f98720c24a239 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Tue, 26 Mar 2019 13:48:45 -0700
Subject: [PATCH 1013/1703] refactor: use dimensions for some values instead of
 metrics

This is after a discussion with someone internal. Metrics are good
for sums but not for comparisons and search/filtering.
---
 packages/angular/cli/commands/definitions.json      |  9 +++------
 packages/angular/cli/models/analytics.ts            | 12 +++++++-----
 packages/angular_devkit/core/src/analytics/index.ts | 12 ++++++++----
 packages/schematics/angular/application/schema.json |  3 +--
 packages/schematics/angular/library/schema.json     |  3 +--
 packages/schematics/angular/ng-new/schema.json      |  3 +--
 packages/schematics/angular/universal/schema.json   |  3 +--
 packages/schematics/angular/workspace/schema.json   |  3 +--
 8 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/packages/angular/cli/commands/definitions.json b/packages/angular/cli/commands/definitions.json
index e46eca429b33..6c6f6f0b90a6 100644
--- a/packages/angular/cli/commands/definitions.json
+++ b/packages/angular/cli/commands/definitions.json
@@ -42,15 +42,13 @@
           "type": "boolean",
           "default": false,
           "aliases": [ "d" ],
-          "description": "When true, runs through and reports activity without writing out results.",
-          "x-user-analytics": 1
+          "description": "When true, runs through and reports activity without writing out results."
         },
         "force": {
           "type": "boolean",
           "default": false,
           "aliases": [ "f" ],
-          "description": "When true, forces overwriting of existing files.",
-          "x-user-analytics": 2
+          "description": "When true, forces overwriting of existing files."
         }
       }
     },
@@ -59,8 +57,7 @@
         "interactive": {
           "type": "boolean",
           "default": "true",
-          "description": "When false, disables interactive input prompts.",
-          "x-user-analytics": 3
+          "description": "When false, disables interactive input prompts."
         },
         "defaults": {
           "type": "boolean",
diff --git a/packages/angular/cli/models/analytics.ts b/packages/angular/cli/models/analytics.ts
index 39b9272d2b78..c9ae0dde6999 100644
--- a/packages/angular/cli/models/analytics.ts
+++ b/packages/angular/cli/models/analytics.ts
@@ -242,6 +242,7 @@ export class UniversalAnalytics implements analytics.Analytics {
   private _ua: ua.Visitor;
   private _dirty = false;
   private _metrics: (string | number)[] = [];
+  private _dimensions: (string | number)[] = [];
 
   /**
    * @param trackingId The Google Analytics ID.
@@ -267,10 +268,10 @@ export class UniversalAnalytics implements analytics.Analytics {
     this._ua.set('aid', _getNodeVersion());
 
     // We set custom metrics for values we care about.
-    this._metrics[analytics.NgCliAnalyticsMetrics.CpuCount] = _getCpuCount();
-    this._metrics[analytics.NgCliAnalyticsMetrics.CpuSpeed] = _getCpuSpeed();
-    this._metrics[analytics.NgCliAnalyticsMetrics.RamInMegabytes] = _getRamSize();
-    this._metrics[analytics.NgCliAnalyticsMetrics.NodeVersion] = _getNumericNodeVersion();
+    this._dimensions[analytics.NgCliAnalyticsDimensions.CpuCount] = _getCpuCount();
+    this._dimensions[analytics.NgCliAnalyticsDimensions.CpuSpeed] = _getCpuSpeed();
+    this._dimensions[analytics.NgCliAnalyticsDimensions.RamInMegabytes] = _getRamSize();
+    this._dimensions[analytics.NgCliAnalyticsDimensions.NodeVersion] = _getNumericNodeVersion();
   }
 
   /**
@@ -279,8 +280,9 @@ export class UniversalAnalytics implements analytics.Analytics {
    */
   private _customVariables(options: analytics.CustomDimensionsAndMetricsOptions) {
     const additionals: { [key: string]: boolean | number | string } = {};
-    this._metrics.forEach((v, i) => additionals['cm' + i] = v);
+    this._dimensions.forEach((v, i) => additionals['cd' + i] = v);
     (options.dimensions || []).forEach((v, i) => additionals['cd' + i] = v);
+    this._metrics.forEach((v, i) => additionals['cm' + i] = v);
     (options.metrics || []).forEach((v, i) => additionals['cm' + i] = v);
 
     return additionals;
diff --git a/packages/angular_devkit/core/src/analytics/index.ts b/packages/angular_devkit/core/src/analytics/index.ts
index eb3b842c0df1..a525cd1337f4 100644
--- a/packages/angular_devkit/core/src/analytics/index.ts
+++ b/packages/angular_devkit/core/src/analytics/index.ts
@@ -17,16 +17,20 @@ export * from './noop';
  * WE LIST THOSE DIMENSIONS (AND MORE).
  */
 export enum NgCliAnalyticsDimensions {
+  CpuCount = 1,
+  CpuSpeed = 2,
+  RamInMegabytes = 3,
+  NodeVersion = 4,
   NgAddCollection = 6,
   NgBuildBuildEventLog = 7,
   BuildErrors = 20,
 }
 
 export enum NgCliAnalyticsMetrics {
-  CpuCount = 1,
-  CpuSpeed = 2,
-  RamInMegabytes = 3,
-  NodeVersion = 4,
+  UNUSED_1 = 1,
+  UNUSED_2 = 2,
+  UNUSED_3 = 3,
+  UNUSED_4 = 4,
   BuildTime = 5,
   NgOnInitCount = 6,
   InitialChunkSize = 7,
diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json
index c8eba6787b14..3c0157953a89 100644
--- a/packages/schematics/angular/application/schema.json
+++ b/packages/schematics/angular/application/schema.json
@@ -92,8 +92,7 @@
     "skipInstall": {
       "description": "Skip installing dependency packages.",
       "type": "boolean",
-      "default": false,
-      "x-user-analytics": 4
+      "default": false
     },
     "lintFix": {
       "type": "boolean",
diff --git a/packages/schematics/angular/library/schema.json b/packages/schematics/angular/library/schema.json
index e826508ed21e..05cb720306dc 100644
--- a/packages/schematics/angular/library/schema.json
+++ b/packages/schematics/angular/library/schema.json
@@ -37,8 +37,7 @@
     "skipInstall": {
       "description": "When true, does not install dependency packages.",
       "type": "boolean",
-      "default": false,
-      "x-user-analytics": 4
+      "default": false
     },
     "skipTsConfig": {
       "type": "boolean",
diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
index fa80e955079d..3dd03342a57a 100644
--- a/packages/schematics/angular/ng-new/schema.json
+++ b/packages/schematics/angular/ng-new/schema.json
@@ -26,8 +26,7 @@
     "skipInstall": {
       "description": "When true, does not install dependency packages.",
       "type": "boolean",
-      "default": false,
-      "x-user-analytics": 4
+      "default": false
     },
     "linkCli": {
       "description": "When true, links the CLI to the global version (internal development only).",
diff --git a/packages/schematics/angular/universal/schema.json b/packages/schematics/angular/universal/schema.json
index 8beed998d756..da5b760b9896 100644
--- a/packages/schematics/angular/universal/schema.json
+++ b/packages/schematics/angular/universal/schema.json
@@ -57,8 +57,7 @@
     "skipInstall": {
       "description": "When true, does not install packages for dependencies.",
       "type": "boolean",
-      "default": false,
-      "x-user-analytics": 4
+      "default": false
     }
   },
   "required": [
diff --git a/packages/schematics/angular/workspace/schema.json b/packages/schematics/angular/workspace/schema.json
index 007e097bbff3..5869aa967d1c 100644
--- a/packages/schematics/angular/workspace/schema.json
+++ b/packages/schematics/angular/workspace/schema.json
@@ -21,8 +21,7 @@
     "skipInstall": {
       "description": "When true, does not install packages for dependencies.",
       "type": "boolean",
-      "default": false,
-      "x-user-analytics": 4
+      "default": false
     },
     "linkCli": {
       "description": "When true, links the CLI to the global version (internal development only).",

From 2ffbdfa86a885da6e6e2c88e0d31ae140cc02a77 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 20 Mar 2019 13:04:48 -0700
Subject: [PATCH 1014/1703] build: add a validation script for the analytics.md
 tables

Also added enums to update when changing dimensions.
---
 docs/design/analytics.md                      |  92 ++++----
 packages/angular/cli/commands/add-impl.ts     |   4 +-
 packages/angular/cli/models/analytics.ts      |   9 -
 .../core/src/analytics/index.ts               |  40 +++-
 .../angular/application/schema.json           |   3 +-
 .../schematics/angular/library/schema.json    |   3 +-
 scripts/templates/user-analytics-table.ejs    |   9 +
 scripts/validate-user-analytics.ts            | 218 ++++++++++++++++++
 scripts/validate.ts                           |   6 +
 9 files changed, 328 insertions(+), 56 deletions(-)
 create mode 100644 scripts/templates/user-analytics-table.ejs
 create mode 100644 scripts/validate-user-analytics.ts

diff --git a/docs/design/analytics.md b/docs/design/analytics.md
index 55ca95369bc1..932f9f4ee756 100644
--- a/docs/design/analytics.md
+++ b/docs/design/analytics.md
@@ -8,22 +8,19 @@ Each command creates a pageview with the path `/command/${commandName}/${subcomm
 `ng generate component my-component --dryRun` would create a page view with the path
 `/command/generate/@schematics_angular/component`.
 
-Additionally, only the Architect configuration of `default`, `production` and `staging` will be
-logged. The project name will be removed, and if the configuration is different than the three
-basic ones, it will be replaced with `_`. 
+We use page views to keep track of sessions more effectively, and to tag events to a page.
+
+Project names and target names will be removed. 
 The command `ng run some-project:lint:some-configuration` will create a page view with the path
-`/command/run/_:lint:_`. Configurations are only used when actually mentioned on the command
-line, thus the command `ng build some-project --prod` will create a page view of
-`/command/build/_:default` (with the `prod` flag), while `ng build some-project:some-conf` will log
-`/command/build/_:_`.
+`/command/run`.
 
 # Dimensions
-Google Analytics Custom Dimensions are used to track flag values. These dimensions are aggregated
-automatically on the backend.
+Google Analytics Custom Dimensions are used to track system values and flag values. These
+dimensions are aggregated automatically on the backend.
 
 One dimension per flag, and although technically there can be an overlap between 2 commands, for
-simplicity it should remain unique across all CLI commands. These are numbers added to our own
-`schema.json` files. Dimensions are not to be used for anything else.
+simplicity it should remain unique across all CLI commands. The dimension is the value of the
+`x-user-analytics` field in the `schema.json` files.
 
 To create a new dimension (tracking a new flag):
 
@@ -41,43 +38,60 @@ PROJECT NAME TO BUILD OR A MODULE NAME.**
 Note: There's a limit of 20 custom dimensions.
 
 ### List Of All Dimensions
-| Id | Category | Flag | Type | File / Description |
-|:---:|:---|:---|:---|---:|
-| 1 | `generate`, `new` | `--dryRun`      | `Boolean` | |
-| 2 | `generate`, `new` | `--force`       | `Boolean` | |
-| 3 | `generate`, `new` | `--interactive` | `Boolean` | |
-| 4 | `generate` | `--skipInstall` | `Boolean` | |
-| 5 | `generate` | `--style` | `String` | |
-| 6 | `add` | `--collection` | `String` | Only for packages that we control (see safelist in `add-impl.ts`). |
-| 7 | `build`, `serve` | `--buildEventLog` | `Boolean` | If the flag was used (does not report its value). See `build-impl.ts`. |
-| 8 | `generate`, `new` | `--enableIvy` | `Boolean` | |
-| 9 | `generate` | `--inlineStyle` | `Boolean` | |
-| 10 | `generate` | `--inlineTemplate` | `Boolean` | |
-| 11 | `generate` | `--viewEncapsulation` | `String` | |
-| 12 | `generate` | `--skipTests` | `Boolean` | |
-| 13 | `build` | `--aot` | `Boolean` | |
-| 14 | `generate` | `--minimal` | `Boolean` | |
-| 15 | `generate` | `--lintFix` | `Boolean` | |
-| 16 | `build` | `--optimization` | `Boolean` | |
-| 17 | `generate` | `--routing` | `Boolean` | |
-| 18 | `generate` | `--skipImport` | `Boolean` | |
-| 19 | `generate` | `--export` | `Boolean` | |
-| 20 | `generate` | `--entryComponent` | `Boolean` | |
+<!--DIMENSIONS_TABLE_BEGIN-->
+| Id | Flag | Type |
+|:---:|:---|:---|
+| 1 | `CPU Count` | `number` |
+| 2 | `CPU Speed` | `number` |
+| 3 | `RAM (In MB)` | `number` |
+| 4 | `Node Version` | `number` |
+| 5 | `Flag: --style` | `string` |
+| 6 | `--collection` | `string` |
+| 7 | `--buildEventLog` | `boolean` |
+| 8 | `Flag: --enableIvy` | `boolean` |
+| 9 | `Flag: --inlineStyle` | `boolean` |
+| 10 | `Flag: --inlineTemplate` | `boolean` |
+| 11 | `Flag: --viewEncapsulation` | `string` |
+| 12 | `Flag: --skipTests` | `boolean` |
+| 13 | `Flag: --aot` | `boolean` |
+| 14 | `Flag: --minimal` | `boolean` |
+| 15 | `Flag: --lintFix` | `boolean` |
+| 16 | `Flag: --optimization` | `boolean` |
+| 17 | `Flag: --routing` | `boolean` |
+| 18 | `Flag: --skipImport` | `boolean` |
+| 19 | `Flag: --export` | `boolean` |
+| 20 | `Build Errors (comma separated)` | `string` |
+<!--DIMENSIONS_TABLE_END-->
 
 # Metrics
 
 ### List of All Metrics
-| Id  | Type | Description |
-|:---:|:-----|-------------|
-| 1 | `Number` | CPU count |
-| 2 | `Number` | Average CPU speed |
-| 3 | `Number` | RAM Count |
-| 4 | `Number` | Node Version (Major.Minor) |
+<!--METRICS_TABLE_BEGIN-->
+| Id | Flag | Type |
+|:---:|:---|:---|
+| 1 | `UNUSED_1` | `none` |
+| 2 | `UNUSED_2` | `none` |
+| 3 | `UNUSED_3` | `none` |
+| 4 | `UNUSED_4` | `none` |
+| 5 | `Build Time` | `number` |
+| 6 | `NgOnInit Count` | `number` |
+| 7 | `Initial Chunk Size` | `number` |
+| 8 | `Total Chunk Count` | `number` |
+| 9 | `Total Chunk Size` | `number` |
+| 10 | `Lazy Chunk Count` | `number` |
+| 11 | `Lazy Chunk Size` | `number` |
+| 12 | `Asset Count` | `number` |
+| 13 | `Asset Size` | `number` |
+| 14 | ` Polyfill Size` | `number` |
+| 15 | ` Css Size` | `number` |
+<!--METRICS_TABLE_END-->
 
 # Operating System and Node Version
 A User Agent string is built to "fool" Google Analytics into reading the Operating System and
 version fields from it. The base dimensions are used for those.
 
+Node version is our App ID, but a dimension is also used to get the numeric MAJOR.MINOR of node.
+
 # Debugging
 Using `DEBUG=universal-analytics` will report all calls to the universal-analytics library,
 including queuing events and sending them to the server.
diff --git a/packages/angular/cli/commands/add-impl.ts b/packages/angular/cli/commands/add-impl.ts
index d6f000827e82..c7f6c77dbb2b 100644
--- a/packages/angular/cli/commands/add-impl.ts
+++ b/packages/angular/cli/commands/add-impl.ts
@@ -10,7 +10,7 @@ import { ModuleNotFoundException, resolve } from '@angular-devkit/core/node';
 import { NodePackageDoesNotSupportSchematics } from '@angular-devkit/schematics/tools';
 import { dirname } from 'path';
 import { intersects, prerelease, rcompare, satisfies, valid, validRange } from 'semver';
-import { AnalyticsDimensions, isPackageNameSafeForAnalytics } from '../models/analytics';
+import { isPackageNameSafeForAnalytics } from '../models/analytics';
 import { Arguments } from '../models/interface';
 import { SchematicCommand } from '../models/schematic-command';
 import npmInstall from '../tasks/npm-install';
@@ -152,7 +152,7 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
     if (collection && isPackageNameSafeForAnalytics(collection)) {
       dimensions[analytics.NgCliAnalyticsDimensions.NgAddCollection] = collection;
     } else {
-      delete dimensions[AnalyticsDimensions.NgAddCollection];
+      delete dimensions[analytics.NgCliAnalyticsDimensions.NgAddCollection];
     }
 
     return super.reportAnalytics(paths, options, dimensions, metrics);
diff --git a/packages/angular/cli/models/analytics.ts b/packages/angular/cli/models/analytics.ts
index c9ae0dde6999..1bd8dc2e1947 100644
--- a/packages/angular/cli/models/analytics.ts
+++ b/packages/angular/cli/models/analytics.ts
@@ -42,15 +42,6 @@ export function isPackageNameSafeForAnalytics(name: string) {
   });
 }
 
-  /**
- * MAKE SURE TO KEEP THIS IN SYNC WITH THE TABLE AND CONTENT IN `/docs/design/analytics.md`.
- * WE LIST THOSE DIMENSIONS (AND MORE).
- */
-export enum AnalyticsDimensions {
-  NgAddCollection = 6,
-  NgBuildBuildEventLog = 7,
-}
-
 
 /**
  * Attempt to get the Windows Language Code string.
diff --git a/packages/angular_devkit/core/src/analytics/index.ts b/packages/angular_devkit/core/src/analytics/index.ts
index a525cd1337f4..66970294b9c5 100644
--- a/packages/angular_devkit/core/src/analytics/index.ts
+++ b/packages/angular_devkit/core/src/analytics/index.ts
@@ -15,6 +15,10 @@ export * from './noop';
 /**
  * MAKE SURE TO KEEP THIS IN SYNC WITH THE TABLE AND CONTENT IN `/docs/design/analytics.md`.
  * WE LIST THOSE DIMENSIONS (AND MORE).
+ *
+ * These cannot be in their respective schema.json file because we either change the type
+ * (e.g. --buildEventLog is string, but we want to know the usage of it, not its value), or
+ * some validation needs to be done (we cannot record ng add --collection if it's not whitelisted).
  */
 export enum NgCliAnalyticsDimensions {
   CpuCount = 1,
@@ -40,6 +44,38 @@ export enum NgCliAnalyticsMetrics {
   LazyChunkSize = 11,
   AssetCount = 12,
   AssetSize = 13,
-  PolyfillSize = 12,
-  CssSize = 13,
+  PolyfillSize = 14,
+  CssSize = 15,
 }
+
+// This table is used when generating the analytics.md file. It should match the enum above
+// or the validate-user-analytics script will fail.
+export const NgCliAnalyticsDimensionsFlagInfo: { [name: string]: [string, string] } = {
+  CpuCount: ['CPU Count', 'number'],
+  CpuSpeed: ['CPU Speed', 'number'],
+  RamInMegabytes: ['RAM (In MB)', 'number'],
+  NodeVersion: ['Node Version', 'number'],
+  NgAddCollection: ['--collection', 'string'],
+  NgBuildBuildEventLog: ['--buildEventLog', 'boolean'],
+  BuildErrors: ['Build Errors (comma separated)', 'string'],
+};
+
+// This table is used when generating the analytics.md file. It should match the enum above
+// or the validate-user-analytics script will fail.
+export const NgCliAnalyticsMetricsFlagInfo: { [name: string]: [string, string] } = {
+  UNUSED_1: ['UNUSED_1', 'none'],
+  UNUSED_2: ['UNUSED_2', 'none'],
+  UNUSED_3: ['UNUSED_3', 'none'],
+  UNUSED_4: ['UNUSED_4', 'none'],
+  BuildTime: ['Build Time', 'number'],
+  NgOnInitCount: ['NgOnInit Count', 'number'],
+  InitialChunkSize: ['Initial Chunk Size', 'number'],
+  TotalChunkCount: ['Total Chunk Count', 'number'],
+  TotalChunkSize: ['Total Chunk Size', 'number'],
+  LazyChunkCount: ['Lazy Chunk Count', 'number'],
+  LazyChunkSize: ['Lazy Chunk Size', 'number'],
+  AssetCount: ['Asset Count', 'number'],
+  AssetSize: ['Asset Size', 'number'],
+  PolyfillSize: [' Polyfill Size', 'number'],
+  CssSize: [' Css Size', 'number'],
+};
diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json
index 3c0157953a89..4b7b91730245 100644
--- a/packages/schematics/angular/application/schema.json
+++ b/packages/schematics/angular/application/schema.json
@@ -80,8 +80,7 @@
     "skipPackageJson": {
       "type": "boolean",
       "default": false,
-      "description": "When true, does not add dependencies to the \"package.json\" file.",
-      "x-user-analytics": 13
+      "description": "When true, does not add dependencies to the \"package.json\" file."
     },
     "minimal": {
       "description": "When true, creates a bare-bones project without any testing frameworks. (Use for learning purposes only.)",
diff --git a/packages/schematics/angular/library/schema.json b/packages/schematics/angular/library/schema.json
index 05cb720306dc..9008d8aad44d 100644
--- a/packages/schematics/angular/library/schema.json
+++ b/packages/schematics/angular/library/schema.json
@@ -31,8 +31,7 @@
     "skipPackageJson": {
       "type": "boolean",
       "default": false,
-      "description": "When true, does not add dependencies to the \"package.json\" file. ",
-      "x-user-analytics": 13
+      "description": "When true, does not add dependencies to the \"package.json\" file. "
     },
     "skipInstall": {
       "description": "When true, does not install dependency packages.",
diff --git a/scripts/templates/user-analytics-table.ejs b/scripts/templates/user-analytics-table.ejs
new file mode 100644
index 000000000000..c6dda68bfed9
--- /dev/null
+++ b/scripts/templates/user-analytics-table.ejs
@@ -0,0 +1,9 @@
+<%
+%>| Id | Flag | Type |
+|:---:|:---|:---|
+<% for (const flag of flags) {
+  if (flag === undefined) {
+    continue;
+  }
+%>| <%= flag.userAnalytics %> | `<%= flag.name %>` | `<%= flag.type %>` |
+<%}%>
diff --git a/scripts/validate-user-analytics.ts b/scripts/validate-user-analytics.ts
new file mode 100644
index 000000000000..725e2447ec81
--- /dev/null
+++ b/scripts/validate-user-analytics.ts
@@ -0,0 +1,218 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// tslint:disable:no-implicit-dependencies
+import { analytics, logging, tags } from '@angular-devkit/core';
+import { spawnSync } from 'child_process';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { CommandDescriptionMap, Option } from '../packages/angular/cli/models/interface';
+import create from './create';
+
+const userAnalyticsTable = require('./templates/user-analytics-table').default;
+
+const dimensionsTableRe = /<!--DIMENSIONS_TABLE_BEGIN-->([\s\S]*)<!--DIMENSIONS_TABLE_END-->/m;
+const metricsTableRe = /<!--METRICS_TABLE_BEGIN-->([\s\S]*)<!--METRICS_TABLE_END-->/m;
+
+/**
+ * Execute a command.
+ * @private
+ */
+function _exec(command: string, args: string[], opts: { cwd?: string }, logger: logging.Logger) {
+  const { status, error, stdout } = spawnSync(command, args, {
+    stdio: ['ignore', 'pipe', 'inherit'],
+    ...opts,
+  });
+
+  if (status != 0) {
+    logger.error(`Command failed: ${command} ${args.map(x => JSON.stringify(x)).join(', ')}`);
+    throw error;
+  }
+
+  return stdout.toString('utf-8');
+}
+
+async function _checkDimensions(dimensionsTable: string, logger: logging.Logger) {
+  const data: { userAnalytics: number, type: string, name: string }[] = new Array(200);
+
+  function _updateData(userAnalytics: number, name: string, type: string) {
+    if (data[userAnalytics]) {
+      if (data[userAnalytics].name !== name) {
+        logger.error(tags.stripIndents`
+            User analytics clash with the same name: ${data[userAnalytics].name} and
+            ${name} both have userAnalytics of ${userAnalytics}
+          `);
+
+        return 2;
+      }
+    } else {
+      data[userAnalytics] = { userAnalytics, name, type };
+    }
+  }
+
+  logger.info('Gathering fixed dimension from @angular-devkit/core...');
+
+  // Create the data with dimensions missing from schema.json:
+  const allFixedDimensions = Object.keys(analytics.NgCliAnalyticsDimensions)
+  // tslint:disable-next-line:no-any
+    .filter(x => typeof analytics.NgCliAnalyticsDimensions[x as any] === 'number');
+
+  for (const name of allFixedDimensions) {
+    // tslint:disable-next-line:no-any
+    const userAnalytics = analytics.NgCliAnalyticsDimensions[name as any];
+    if (!(name in analytics.NgCliAnalyticsDimensionsFlagInfo)) {
+      throw new Error(
+        `Flag ${name} is in NgCliAnalyticsDimensions but not NgCliAnalyticsDimensionsFlagInfo`,
+      );
+    }
+
+    const [flagName, type] = analytics.NgCliAnalyticsDimensionsFlagInfo[name];
+    if (typeof userAnalytics !== 'number') {
+      throw new Error(
+        `Invalid value found in enum AnalyticsDimensions: ${JSON.stringify(userAnalytics)}`,
+      );
+    }
+    _updateData(userAnalytics, flagName, type);
+  }
+
+
+  // Creating a new project and reading the help.
+  logger.info('Creating temporary project for gathering help...');
+
+  const newProjectTempRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'angular-cli-create-'));
+  const newProjectName = 'help-project';
+  const newProjectRoot = path.join(newProjectTempRoot, newProjectName);
+  await create({ _: [newProjectName] }, logger.createChild('create'), newProjectTempRoot);
+
+  const commandDescription: CommandDescriptionMap = {};
+
+  logger.info('Gathering options...');
+
+  const commands = require('../packages/angular/cli/commands.json');
+  const ngPath = path.join(newProjectRoot, 'node_modules/.bin/ng');
+  for (const commandName of Object.keys(commands)) {
+    const options = { cwd: newProjectRoot };
+    const childLogger = logger.createChild(commandName);
+    const stdout = _exec(ngPath, [commandName, '--help=json'], options, childLogger);
+    commandDescription[commandName] = JSON.parse(stdout.trim());
+  }
+
+  function _checkOptionsForAnalytics(options: Option[]) {
+    for (const option of options) {
+      if (option.subcommands) {
+        for (const subcommand of Object.values(option.subcommands)) {
+          _checkOptionsForAnalytics(subcommand.options);
+        }
+      }
+
+      if (option.userAnalytics === undefined) {
+        continue;
+      }
+      _updateData(option.userAnalytics, 'Flag: --' + option.name, option.type);
+    }
+  }
+
+  for (const commandName of Object.keys(commandDescription)) {
+    _checkOptionsForAnalytics(commandDescription[commandName].options);
+  }
+
+  const generatedTable = userAnalyticsTable({ flags: data }).trim();
+  if (dimensionsTable !== generatedTable) {
+    logger.error('Expected dimensions table to be the same as generated. Copy the lines below:');
+    logger.error(generatedTable);
+
+    return 3;
+  }
+
+  return 0;
+}
+
+async function _checkMetrics(metricsTable: string, logger: logging.Logger) {
+  const data: { userAnalytics: number, type: string, name: string }[] = new Array(200);
+
+  function _updateData(userAnalytics: number, name: string, type: string) {
+    if (data[userAnalytics]) {
+      if (data[userAnalytics].name !== name) {
+        logger.error(tags.stripIndents`
+            User analytics clash with the same name: ${data[userAnalytics].name} and
+            ${name} both have userAnalytics of ${userAnalytics}
+          `);
+
+        return 2;
+      }
+    } else {
+      data[userAnalytics] = { userAnalytics, name, type };
+    }
+  }
+
+  logger.info('Gathering fixed metrics from @angular-devkit/core...');
+
+  // Create the data with dimensions missing from schema.json:
+  const allFixedMetrics = Object.keys(analytics.NgCliAnalyticsMetrics)
+  // tslint:disable-next-line:no-any
+    .filter(x => typeof analytics.NgCliAnalyticsMetrics[x as any] === 'number');
+
+  for (const name of allFixedMetrics) {
+    // tslint:disable-next-line:no-any
+    const userAnalytics = analytics.NgCliAnalyticsMetrics[name as any];
+    if (!(name in analytics.NgCliAnalyticsMetricsFlagInfo)) {
+      throw new Error(
+        `Flag ${name} is in NgCliAnalyticsMetrics but not NgCliAnalyticsMetricsFlagInfo`,
+      );
+    }
+
+    const [flagName, type] = analytics.NgCliAnalyticsMetricsFlagInfo[name];
+    if (typeof userAnalytics !== 'number') {
+      throw new Error(
+        `Invalid value found in enum NgCliAnalyticsMetrics: ${JSON.stringify(userAnalytics)}`,
+      );
+    }
+    _updateData(userAnalytics, flagName, type);
+  }
+
+  const generatedTable = userAnalyticsTable({ flags: data }).trim();
+  if (metricsTable !== generatedTable) {
+    logger.error('Expected metrics table to be the same as generated. Copy the lines below:');
+    logger.error(generatedTable);
+
+    return 4;
+  }
+
+  return 0;
+}
+
+/**
+ * Validate that the table of analytics from the analytics.md document is the same as expected /
+ * generated.
+ */
+export default async function (_options: {}, logger: logging.Logger): Promise<number> {
+  const analyticsMarkdownPath = path.join(__dirname, '../docs/design/analytics.md');
+  const analyticsMarkdown = fs.readFileSync(analyticsMarkdownPath, 'utf8');
+  const dimensionsMatch = analyticsMarkdown.match(dimensionsTableRe);
+  const metricsMatch = analyticsMarkdown.match(metricsTableRe);
+
+  if (!dimensionsMatch || !metricsMatch) {
+    logger.fatal('Could not find dimensions or metrics table in analytics.md');
+
+    return 1;
+  }
+
+  const metricsTable = metricsMatch[1].trim();
+  let maybeError = await _checkMetrics(metricsTable, logger);
+  if (maybeError) {
+    return maybeError;
+  }
+
+  const dimensionsTable = dimensionsMatch[1].trim();
+  maybeError = await _checkDimensions(dimensionsTable, logger);
+  if (maybeError) {
+    return maybeError;
+  }
+
+  return 0;
+}
diff --git a/scripts/validate.ts b/scripts/validate.ts
index ddeb714b4852..8be68d916f3c 100644
--- a/scripts/validate.ts
+++ b/scripts/validate.ts
@@ -13,6 +13,7 @@ import validateBuildFiles from './validate-build-files';
 import validateCommits from './validate-commits';
 import validateDoNotSubmit from './validate-do-not-submit';
 import validateLicenses from './validate-licenses';
+import validateUserAnalytics from './validate-user-analytics';
 
 export default async function (options: { verbose: boolean }, logger: logging.Logger) {
   let error = false;
@@ -59,6 +60,11 @@ export default async function (options: { verbose: boolean }, logger: logging.Lo
   error = await validateBuildFiles({}, logger.createChild('validate-build-files')) != 0
        || error;
 
+  logger.info('');
+  logger.info('Running User Analytics validation...');
+  error = await validateUserAnalytics({}, logger.createChild('validate-user-analytics')) != 0
+    || error;
+
   if (error) {
     return 101;
   }

From 600b0218fd6adb096a615f8e05c4a9adde38d97d Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Tue, 26 Mar 2019 14:39:26 -0700
Subject: [PATCH 1015/1703] feat(@angular/cli): add tracking for command
 duration

---
 packages/angular/cli/models/command.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/models/command.ts b/packages/angular/cli/models/command.ts
index a867576d6a6c..344f879e9886 100644
--- a/packages/angular/cli/models/command.ts
+++ b/packages/angular/cli/models/command.ts
@@ -180,9 +180,14 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
     } else if (options.help === 'json' || options.help === 'JSON') {
       return this.printJsonHelp(options);
     } else {
+      const startTime = +new Date();
       await this.reportAnalytics([this.description.name], options);
+      const result = await this.run(options);
+      const endTime = +new Date();
 
-      return await this.run(options);
+      this.analytics.timing(this.description.name, 'duration', endTime - startTime);
+
+      return result;
     }
   }
 }

From 20103a35d664798a4ccd94a92dc52af670254448 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Tue, 26 Mar 2019 17:45:22 -0700
Subject: [PATCH 1016/1703] fix(@angular-devkit/build-angular): fix
 countOccurences

And add testing for it.
---
 .../plugins/webpack/analytics.ts              | 15 ++-
 .../plugins/webpack/analytics_spec.ts         | 95 +++++++++++++++++++
 2 files changed, 107 insertions(+), 3 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/plugins/webpack/analytics_spec.ts

diff --git a/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts b/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts
index fd50a1004a51..03d4fdc4d5bc 100644
--- a/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts
+++ b/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts
@@ -42,14 +42,23 @@ export function countOccurrences(source: string, match: string, wordBreak = fals
   // We condition here so branch prediction happens out of the loop, not in it.
   if (wordBreak) {
     const re = /\w/;
-    for (let pos = source.lastIndexOf(match); pos >= 0; pos = source.lastIndexOf(match, pos - 1)) {
-      if (!(re.test(source[pos - 1]) || re.test(source[pos + match.length]))) {
+    for (let pos = source.lastIndexOf(match); pos >= 0; pos = source.lastIndexOf(match, pos)) {
+      if (!(re.test(source[pos - 1] || '') || re.test(source[pos + match.length] || ''))) {
         count++;  // 1 match, AH! AH! AH! 2 matches, AH! AH! AH!
       }
+
+      pos -= match.length;
+      if (pos < 0) {
+        break;
+      }
     }
   } else {
-    for (let pos = source.lastIndexOf(match); pos >= 0; pos = source.lastIndexOf(match, pos - 1)) {
+    for (let pos = source.lastIndexOf(match); pos >= 0; pos = source.lastIndexOf(match, pos)) {
       count++;  // 1 match, AH! AH! AH! 2 matches, AH! AH! AH!
+      pos -= match.length;
+      if (pos < 0) {
+        break;
+      }
     }
   }
 
diff --git a/packages/angular_devkit/build_angular/plugins/webpack/analytics_spec.ts b/packages/angular_devkit/build_angular/plugins/webpack/analytics_spec.ts
new file mode 100644
index 000000000000..e0266f68bdee
--- /dev/null
+++ b/packages/angular_devkit/build_angular/plugins/webpack/analytics_spec.ts
@@ -0,0 +1,95 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { countOccurrences } from './analytics';
+
+
+function _randomString(len: number) {
+  const charSpace = `0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ`;
+
+  let s = '';
+  for (let i = 0; i < len; i++) {
+    s += charSpace[Math.floor(Math.random() * charSpace.length)];
+  }
+
+  return s;
+}
+
+describe('countOccurrences', () => {
+  // Every use cases is a text, search, word break or not, and expected result.
+  const useCases: [string, string, boolean, number][] = [
+    ['abc1def1ghi1jkl1mno1pqrs1tuvw1xyz', '1', false, 7],  // 0
+    ['abc1def12ghi1jkl1mno12pqrs12tuvw1xyz12', '12', false, 4],  // 1
+    ['abc', 'abc', false, 1],  // 2
+    ['abc', 'abc', true, 1],  // 3
+    ['aaaaa', 'aaa', false, 1],  // 4
+    ['aa aaa', 'aaa', true, 1],  // 5
+    ['aaaaaa', 'aaa', false, 2],  // 6
+    ['aaa aaa', 'aaa', true, 2],  // 7
+    ['a', 'a', false, 1],  // 8
+    ['a', 'a', true, 1],  // 9
+  ];
+
+  useCases.forEach(([text, search, wordBreak, expected], i) => {
+    it(`works (${i})`, () => {
+      expect(countOccurrences(text, search, wordBreak)).toBe(expected);
+    });
+  });
+
+  // Random testing.
+  it('can count (random, wordBreak=false)', () => {
+    // Generate a random string with injected search strings in it.
+    let text = _randomString(10000);
+    const search = _randomString(100).toLowerCase();
+    const nb = Math.floor(Math.random() * 200 + 100);
+
+    // Insert nb search string in.
+    new Array(nb).fill(0)
+      // Map it with a random position.
+      .map(() => Math.floor(Math.random() * text.length))
+      // Sort from highest to lowest.
+      .sort((a, b) => b - a)
+      // Insert the search string for each position created this way.
+      .forEach(pos => {
+        text = text.slice(0, pos) + search + text.slice(pos);
+      });
+
+    expect(countOccurrences(text, search, false)).toBe(nb);
+    expect(countOccurrences(text, search, true)).toBe(0);
+  });
+
+  it('can count (random, wordBreak=true)', () => {
+    // Generate a random string with injected search strings in it.
+    let text = _randomString(10000);
+    const search = _randomString(100).toLowerCase();
+    let nb = Math.floor(Math.random() * 200 + 100);
+
+    // Insert nb search string in.
+    new Array(nb).fill(0)
+    // Map it with a random position.
+      .map(() => Math.floor(Math.random() * text.length))
+      // Sort from highest to lowest.
+      .sort((a, b) => b - a)
+      // Insert the search string for each position created this way.
+      .forEach(pos => {
+        switch (Math.floor(Math.random() * 5)) {
+          case 0:
+            // Do not insert a wordbreak.
+            text = text.slice(0, pos) + search + text.slice(pos);
+            nb--;
+            break;
+
+          case 1: text = text.slice(0, pos) + ' ' + search + ' ' + text.slice(pos); break;
+          case 2: text = text.slice(0, pos) + '(' + search + '$' + text.slice(pos); break;
+          case 3: text = text.slice(0, pos) + '|' + search + ')' + text.slice(pos); break;
+          case 4: text = text.slice(0, pos) + '-' + search + '.' + text.slice(pos); break;
+        }
+      });
+
+    expect(countOccurrences(text, search, true)).toBe(nb);
+  });
+});

From f8fe4b0ee82d880396119a2594f3cee8dadb2947 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 28 Mar 2019 05:55:06 +0000
Subject: [PATCH 1017/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index ec17d2940561..e8c2523e7b80 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#d7060822d7e4e13f0af7360c260f5bfd2017f19d",
-    "@angular/common": "github:angular/common-builds#e9b863934a8ad82014ed3581c36dff83865f44dd",
-    "@angular/compiler": "github:angular/compiler-builds#73f20473dbd83da4539f88423f97d9f509da769d",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#b2d858725b655a3a1576c1421c232a6947491314",
-    "@angular/core": "github:angular/core-builds#4a70d34be55e3ccb7e0de28a94742de201b95858",
-    "@angular/forms": "github:angular/forms-builds#aa49ee39deac9df3ed7ea1359ed19b27cbf584fe",
-    "@angular/language-service": "github:angular/language-service-builds#352a2933ac2941100a5a1673e0f84a6fdf4af031",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#b9b56805117fdef61d50ba28f9bc8e86073b8a76",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#75bde3f5f6745c4aae1df19be80a4ee0dcc39b8b",
-    "@angular/router": "github:angular/router-builds#2f4ac70164ed9047f2783eb8208549010ad7988a"
+    "@angular/animations": "github:angular/animations-builds#99ef7e02a827d25ec89c034fe57bfacb69684802",
+    "@angular/common": "github:angular/common-builds#486e404da83634faef90815148c50018d23197bc",
+    "@angular/compiler": "github:angular/compiler-builds#13f5282ecd318c3d64873ace5d61fe1a618e8f80",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#5649097a28f9a3654ffc962c06f1a82df9e9434f",
+    "@angular/core": "github:angular/core-builds#910f859a125c1b23cb15175192904e20a3b58dd1",
+    "@angular/forms": "github:angular/forms-builds#3bb40de84a8faaf4742e1a0032c3559921babbc5",
+    "@angular/language-service": "github:angular/language-service-builds#e31a9bb6da1adec22f0e8597497b7fca086e499e",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#7f4d52761c4b51599c1e73e65a3b265d43949ea7",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#59280681b5d7b79391d9a8f3dda2021ad18dcee2",
+    "@angular/router": "github:angular/router-builds#55b26f72fef3cf7cc482f968654a810c0a1b28c2"
   }
 }
\ No newline at end of file

From ee337c025f766fec91d5879e39d5370b6259f7c4 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 29 Mar 2019 13:32:47 +0100
Subject: [PATCH 1018/1703] docs: add breaking changes to changelog

---
 .../templates/changelog-breaking-changes.ejs  | 28 +++++++++++++++++++
 scripts/templates/changelog.ejs               |  4 +++
 2 files changed, 32 insertions(+)
 create mode 100644 scripts/templates/changelog-breaking-changes.ejs

diff --git a/scripts/templates/changelog-breaking-changes.ejs b/scripts/templates/changelog-breaking-changes.ejs
new file mode 100644
index 000000000000..fa822a04d819
--- /dev/null
+++ b/scripts/templates/changelog-breaking-changes.ejs
@@ -0,0 +1,28 @@
+<%
+const breakingChanges = [];
+
+for (const commit of commits) {
+    const breakingChange = commit.notes.find(c => c.title === 'BREAKING CHANGE');
+    if (breakingChange) {
+        breakingChanges.push({
+            scope: commit.scope,
+            subject: commit.subject,
+            shortSha: commit.hash.slice(0, 7),
+            hash: commit.hash,
+            breakingText: breakingChange.text,
+        });
+    }
+}
+
+if (breakingChanges.length) {
+%>
+
+# Breaking Changes
+    <% for (const commit of breakingChanges) { %>
+
+<h3>
+    <%= `${commit.scope ? commit.scope + ': ' : ''}` %><%= commit.subject %> (<a href="https://github.com/angular/angular-cli/commit/<%= commit.hash %>"><%= commit.shortSha %></a>)
+</h3>
+<%= commit.breakingText %>
+    <% }%>
+<% }%>
\ No newline at end of file
diff --git a/scripts/templates/changelog.ejs b/scripts/templates/changelog.ejs
index 1aaf43467a1d..ac72ee5b2d51 100644
--- a/scripts/templates/changelog.ejs
+++ b/scripts/templates/changelog.ejs
@@ -100,6 +100,10 @@
 
 ----
 
+<%= include('./changelog-breaking-changes', { commits }) %>
+
+----
+
 # Special Thanks
 
 <%= include('./changelog-special-thanks', { commits }) %>

From 61717b7c27360c23be9fab08324ac43621447eeb Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 28 Mar 2019 12:31:21 -0400
Subject: [PATCH 1019/1703] test(@angular-devkit/build-angular): update svg
 browser test to stable API

---
 .../test/browser/svg_spec_large.ts            | 49 +++++++++++--------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/svg_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/svg_spec_large.ts
index 44756101654d..2ead98a77499 100644
--- a/packages/angular_devkit/build_angular/test/browser/svg_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/svg_spec_large.ts
@@ -5,20 +5,21 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { runTargetSpec } from '@angular-devkit/architect/testing';
+import { Architect } from '@angular-devkit/architect/src/index2';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
-import { browserTargetSpec, host, outputPath } from '../utils';
+import { createArchitect, host, outputPath } from '../utils';
 
 describe('Browser Builder allow svg', () => {
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
-
-  it('works with aot',
-    (done) => {
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
+  it('works with aot', async () => {
     const svg = `
       <svg xmlns="http://www.w3.org/2000/svg">
         <text x="20" y="20" font-size="20" fill="red">Hello World</text>
@@ -42,18 +43,24 @@ describe('Browser Builder allow svg', () => {
 
     const overrides = { aot: true };
 
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const content = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, 'main.js')),
-        );
-
-        expect(content).toContain('":svg:svg"');
-        expect(host.scopedSync().exists(normalize('dist/app.component.svg')))
-          .toBe(false, 'should not copy app.component.svg to dist');
-      }),
-    ).toPromise().then(done, done.fail);
+    const run = await architect.scheduleTarget(target, overrides);
+
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+    const exists = host.scopedSync().exists(join(outputPath, 'main.js'));
+    expect(exists).toBe(true, '\'main.js\' should exist');
+
+    if (exists) {
+      const content = virtualFs.fileBufferToString(
+        host.scopedSync().read(join(outputPath, 'main.js')),
+      );
+
+      expect(content).toContain('":svg:svg"');
+      expect(host.scopedSync().exists(normalize('dist/app.component.svg')))
+        .toBe(false, 'should not copy app.component.svg to dist');
+    }
+
+    await run.stop();
   });
 
 });

From 1327ee3ec9ba525c2ba30c1f393461cb6fea94ca Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 28 Mar 2019 13:25:38 -0400
Subject: [PATCH 1020/1703] test(@angular-devkit/build-angular): update service
 worker browser tests to stable API

---
 .../test/browser/service-worker_spec_large.ts | 214 +++++++++---------
 1 file changed, 110 insertions(+), 104 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts
index 773a2ae3344e..8dbf4f267c59 100644
--- a/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts
@@ -5,12 +5,9 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { runTargetSpec } from '@angular-devkit/architect/testing';
+import { Architect } from '@angular-devkit/architect/src/index2';
 import { normalize, virtualFs } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
-import { browserTargetSpec, host } from '../utils';
-
+import { createArchitect, host } from '../utils';
 
 describe('Browser Builder service worker', () => {
   const manifest = {
@@ -43,19 +40,26 @@ describe('Browser Builder service worker', () => {
     ],
   };
 
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
 
-  it('errors if no ngsw-config.json is present', (done) => {
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('errors if no ngsw-config.json is present', async () => {
     const overrides = { serviceWorker: true };
 
-    runTargetSpec(host, browserTargetSpec, overrides)
-      .subscribe(event => {
-        expect(event.success).toBe(false);
-      }, () => done(), done.fail);
+    const run = await architect.scheduleTarget(target, overrides);
+
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: false }));
+
+    await run.stop();
   });
 
-  it('works with service worker', (done) => {
+  it('works with service worker', async () => {
     host.writeMultipleFiles({
       'src/ngsw-config.json': JSON.stringify(manifest),
       'src/assets/folder-asset.txt': 'folder-asset.txt',
@@ -63,108 +67,110 @@ describe('Browser Builder service worker', () => {
     });
 
     const overrides = { serviceWorker: true };
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap(buildEvent => {
-        expect(buildEvent.success).toBe(true);
-        expect(host.scopedSync().exists(normalize('dist/ngsw.json')));
-        const ngswJson = JSON.parse(virtualFs.fileBufferToString(
-          host.scopedSync().read(normalize('dist/ngsw.json'))));
-        // Verify index and assets are there.
-        expect(ngswJson).toEqual(jasmine.objectContaining({
-          configVersion: 1,
-          index: '/index.html',
-          navigationUrls: [
-            { positive: true, regex: '^\\\/.*$' },
-            { positive: false, regex: '^\\\/(?:.+\\\/)?[^\/]*\\.[^\/]*$' },
-            { positive: false, regex: '^\\\/(?:.+\\\/)?[^\/]*__[^\/]*$' },
-            { positive: false, regex: '^\\\/(?:.+\\\/)?[^\/]*__[^\/]*\\\/.*$' },
+    const run = await architect.scheduleTarget(target, overrides);
+
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+    expect(host.scopedSync().exists(normalize('dist/ngsw.json')));
+    const ngswJson = JSON.parse(virtualFs.fileBufferToString(
+      host.scopedSync().read(normalize('dist/ngsw.json'))));
+    // Verify index and assets are there.
+    expect(ngswJson).toEqual(jasmine.objectContaining({
+      configVersion: 1,
+      index: '/index.html',
+      navigationUrls: [
+        { positive: true, regex: '^\\\/.*$' },
+        { positive: false, regex: '^\\\/(?:.+\\\/)?[^\/]*\\.[^\/]*$' },
+        { positive: false, regex: '^\\\/(?:.+\\\/)?[^\/]*__[^\/]*$' },
+        { positive: false, regex: '^\\\/(?:.+\\\/)?[^\/]*__[^\/]*\\\/.*$' },
+      ],
+      assetGroups: [
+        {
+          name: 'app',
+          installMode: 'prefetch',
+          updateMode: 'prefetch',
+          urls: [
+            '/favicon.ico',
+            '/index.html',
           ],
-          assetGroups: [
-            {
-              name: 'app',
-              installMode: 'prefetch',
-              updateMode: 'prefetch',
-              urls: [
-                '/favicon.ico',
-                '/index.html',
-              ],
-              patterns: [],
-            },
-            {
-              name: 'assets',
-              installMode: 'lazy',
-              updateMode: 'prefetch',
-              urls: [
-                '/assets/folder-asset.txt',
-                '/spectrum.png',
-              ],
-              patterns: [],
-            },
+          patterns: [],
+        },
+        {
+          name: 'assets',
+          installMode: 'lazy',
+          updateMode: 'prefetch',
+          urls: [
+            '/assets/folder-asset.txt',
+            '/spectrum.png',
           ],
-          dataGroups: [],
-          hashTable: {
-            '/favicon.ico': '84161b857f5c547e3699ddfbffc6d8d737542e01',
-            '/assets/folder-asset.txt': '617f202968a6a81050aa617c2e28e1dca11ce8d4',
-            '/index.html': '1bcafd53046ffb270ac5e6f3cab23e0442f95c4f',
-            '/spectrum.png': '8d048ece46c0f3af4b598a95fd8e4709b631c3c0',
-          },
-        }));
-      }),
-    ).toPromise().then(done, done.fail);
+          patterns: [],
+        },
+      ],
+      dataGroups: [],
+      hashTable: {
+        '/favicon.ico': '84161b857f5c547e3699ddfbffc6d8d737542e01',
+        '/assets/folder-asset.txt': '617f202968a6a81050aa617c2e28e1dca11ce8d4',
+        '/index.html': '1bcafd53046ffb270ac5e6f3cab23e0442f95c4f',
+        '/spectrum.png': '8d048ece46c0f3af4b598a95fd8e4709b631c3c0',
+      },
+    }));
+
+    await run.stop();
   });
 
-  it('works with service worker and baseHref', (done) => {
+  it('works with service worker and baseHref', async () => {
     host.writeMultipleFiles({
       'src/ngsw-config.json': JSON.stringify(manifest),
       'src/assets/folder-asset.txt': 'folder-asset.txt',
     });
 
     const overrides = { serviceWorker: true, baseHref: '/foo/bar' };
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap(buildEvent => {
-        expect(buildEvent.success).toBe(true);
-        expect(host.scopedSync().exists(normalize('dist/ngsw.json')));
-        const ngswJson = JSON.parse(virtualFs.fileBufferToString(
-          host.scopedSync().read(normalize('dist/ngsw.json'))));
-        // Verify index and assets include the base href.
-        expect(ngswJson).toEqual(jasmine.objectContaining({
-          configVersion: 1,
-          index: '/foo/bar/index.html',
-          navigationUrls: [
-            { positive: true, regex: '^\\\/.*$' },
-            { positive: false, regex: '^\\\/(?:.+\\\/)?[^\/]*\\.[^\/]*$' },
-            { positive: false, regex: '^\\\/(?:.+\\\/)?[^\/]*__[^\/]*$' },
-            { positive: false, regex: '^\\\/(?:.+\\\/)?[^\/]*__[^\/]*\\\/.*$' },
+    const run = await architect.scheduleTarget(target, overrides);
+
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+    expect(host.scopedSync().exists(normalize('dist/ngsw.json')));
+    const ngswJson = JSON.parse(virtualFs.fileBufferToString(
+      host.scopedSync().read(normalize('dist/ngsw.json'))));
+    // Verify index and assets include the base href.
+    expect(ngswJson).toEqual(jasmine.objectContaining({
+      configVersion: 1,
+      index: '/foo/bar/index.html',
+      navigationUrls: [
+        { positive: true, regex: '^\\\/.*$' },
+        { positive: false, regex: '^\\\/(?:.+\\\/)?[^\/]*\\.[^\/]*$' },
+        { positive: false, regex: '^\\\/(?:.+\\\/)?[^\/]*__[^\/]*$' },
+        { positive: false, regex: '^\\\/(?:.+\\\/)?[^\/]*__[^\/]*\\\/.*$' },
+      ],
+      assetGroups: [
+        {
+          name: 'app',
+          installMode: 'prefetch',
+          updateMode: 'prefetch',
+          urls: [
+            '/foo/bar/favicon.ico',
+            '/foo/bar/index.html',
           ],
-          assetGroups: [
-            {
-              name: 'app',
-              installMode: 'prefetch',
-              updateMode: 'prefetch',
-              urls: [
-                '/foo/bar/favicon.ico',
-                '/foo/bar/index.html',
-              ],
-              patterns: [],
-            },
-            {
-              name: 'assets',
-              installMode: 'lazy',
-              updateMode: 'prefetch',
-              urls: [
-                '/foo/bar/assets/folder-asset.txt',
-              ],
-              patterns: [],
-            },
+          patterns: [],
+        },
+        {
+          name: 'assets',
+          installMode: 'lazy',
+          updateMode: 'prefetch',
+          urls: [
+            '/foo/bar/assets/folder-asset.txt',
           ],
-          dataGroups: [],
-          hashTable: {
-            '/foo/bar/favicon.ico': '84161b857f5c547e3699ddfbffc6d8d737542e01',
-            '/foo/bar/assets/folder-asset.txt': '617f202968a6a81050aa617c2e28e1dca11ce8d4',
-            '/foo/bar/index.html': '925d80777b6ba64b526b0be79761d254dfe94c65',
-          },
-        }));
-      }),
-    ).toPromise().then(done, done.fail);
+          patterns: [],
+        },
+      ],
+      dataGroups: [],
+      hashTable: {
+        '/foo/bar/favicon.ico': '84161b857f5c547e3699ddfbffc6d8d737542e01',
+        '/foo/bar/assets/folder-asset.txt': '617f202968a6a81050aa617c2e28e1dca11ce8d4',
+        '/foo/bar/index.html': '925d80777b6ba64b526b0be79761d254dfe94c65',
+      },
+    }));
+
+    await run.stop();
   });
 });

From dd058a2cc32065c162baef7b34c1f9369fcf4555 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 28 Mar 2019 14:07:49 -0400
Subject: [PATCH 1021/1703] refactor(@angular-devkit/build-angular): remove
 experimental architect builders

---
 .../build_angular/src/app-shell/index.ts      | 195 --------
 .../build_angular/src/browser/index.ts        | 205 ---------
 .../build_angular/src/dev-server/index.ts     | 426 ------------------
 .../build_angular/src/extract-i18n/index.ts   | 168 -------
 .../build_angular/src/karma/index.ts          | 167 -------
 .../build_angular/src/protractor/index.ts     | 169 -------
 .../build_angular/src/server/index.ts         | 146 ------
 .../build_angular/src/tslint/index.ts         | 255 -----------
 .../test/tslint/works_spec_large.ts           | 259 -----------
 9 files changed, 1990 deletions(-)
 delete mode 100644 packages/angular_devkit/build_angular/src/app-shell/index.ts
 delete mode 100644 packages/angular_devkit/build_angular/src/browser/index.ts
 delete mode 100644 packages/angular_devkit/build_angular/src/dev-server/index.ts
 delete mode 100644 packages/angular_devkit/build_angular/src/extract-i18n/index.ts
 delete mode 100644 packages/angular_devkit/build_angular/src/karma/index.ts
 delete mode 100644 packages/angular_devkit/build_angular/src/protractor/index.ts
 delete mode 100644 packages/angular_devkit/build_angular/src/server/index.ts
 delete mode 100644 packages/angular_devkit/build_angular/src/tslint/index.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts

diff --git a/packages/angular_devkit/build_angular/src/app-shell/index.ts b/packages/angular_devkit/build_angular/src/app-shell/index.ts
deleted file mode 100644
index 8b72d4c67709..000000000000
--- a/packages/angular_devkit/build_angular/src/app-shell/index.ts
+++ /dev/null
@@ -1,195 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import {
-  BuildEvent,
-  Builder,
-  BuilderConfiguration,
-  BuilderContext,
-} from '@angular-devkit/architect';
-import { Path, getSystemPath, join, normalize, resolve, virtualFs } from '@angular-devkit/core';
-import { Observable, forkJoin, from, merge, of, throwError } from 'rxjs';
-import { concatMap, map, switchMap } from 'rxjs/operators';
-import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
-import { augmentAppWithServiceWorker } from '../angular-cli-files/utilities/service-worker';
-import { Schema as BrowserBuilderSchema } from '../browser/schema';
-import { Schema as BuildWebpackServerSchema } from '../server/schema';
-import { Schema as BuildWebpackAppShellSchema } from './schema';
-
-
-export class AppShellBuilder implements Builder<BuildWebpackAppShellSchema> {
-
-  constructor(public context: BuilderContext) { }
-
-  run(builderConfig: BuilderConfiguration<BuildWebpackAppShellSchema>): Observable<BuildEvent> {
-    const options = builderConfig.options;
-
-    return new Observable<BuildEvent>(obs => {
-      let success = true;
-      const subscription = merge(
-        this.build(options.serverTarget, {}),
-        // Never run the browser target in watch mode.
-        // If service worker is needed, it will be added in this.renderUniversal();
-        this.build(options.browserTarget, { watch: false, serviceWorker: false }),
-      ).subscribe((event: BuildEvent) => {
-        // TODO: once we support a better build event, add support for merging two event streams
-        // together.
-        success = success && event.success;
-      }, error => {
-        obs.error(error);
-      }, () => {
-        obs.next({ success });
-        obs.complete();
-      });
-
-      // Allow subscriptions to us to unsubscribe from each builds at the same time.
-      return () => subscription.unsubscribe();
-    }).pipe(
-      switchMap(event => {
-        if (!event.success) {
-          return of(event);
-        }
-
-        return this.renderUniversal(options);
-      }),
-    );
-  }
-
-  build(targetString: string, overrides: {}) {
-    const architect = this.context.architect;
-    const [project, target, configuration] = targetString.split(':');
-
-    // Override browser build watch setting.
-    const builderConfig = architect.getBuilderConfiguration<{}>({
-      project,
-      target,
-      configuration,
-      overrides,
-    });
-
-    return architect.run(builderConfig, this.context);
-  }
-
-  getServerModuleBundlePath(options: BuildWebpackAppShellSchema) {
-    const architect = this.context.architect;
-
-    return new Observable<Path>(obs => {
-      if (options.appModuleBundle) {
-        obs.next(join(this.context.workspace.root, options.appModuleBundle));
-
-        return obs.complete();
-      } else {
-        const [project, target, configuration] = options.serverTarget.split(':');
-        const builderConfig = architect.getBuilderConfiguration<BuildWebpackServerSchema>({
-          project,
-          target,
-          configuration,
-        });
-
-        return architect.getBuilderDescription(builderConfig).pipe(
-          concatMap(description => architect.validateBuilderOptions(builderConfig, description)),
-          switchMap(config => {
-            const outputPath = join(this.context.workspace.root, config.options.outputPath);
-
-            return this.context.host.list(outputPath).pipe(
-              switchMap(files => {
-                const re = /^main\.(?:[a-zA-Z0-9]{20}\.)?(?:bundle\.)?js$/;
-                const maybeMain = files.filter(x => re.test(x))[0];
-
-                if (!maybeMain) {
-                  return throwError(new Error('Could not find the main bundle.'));
-                } else {
-                  return of(join(outputPath, maybeMain));
-                }
-              }),
-            );
-          }),
-        ).subscribe(obs);
-      }
-    });
-  }
-
-  getBrowserBuilderConfig(options: BuildWebpackAppShellSchema) {
-    const architect = this.context.architect;
-    const [project, target, configuration] = options.browserTarget.split(':');
-    const builderConfig = architect.getBuilderConfiguration<BrowserBuilderSchema>({
-      project,
-      target,
-      configuration,
-    });
-
-    return architect.getBuilderDescription(builderConfig).pipe(
-      concatMap(description => architect.validateBuilderOptions(builderConfig, description)),
-    );
-  }
-
-  renderUniversal(options: BuildWebpackAppShellSchema): Observable<BuildEvent> {
-    let browserOptions: BrowserBuilderSchema;
-    let projectRoot: Path;
-
-    return forkJoin(
-      this.getBrowserBuilderConfig(options).pipe(
-        switchMap(config => {
-          browserOptions = config.options;
-          projectRoot = resolve(this.context.workspace.root, config.root);
-          const browserIndexOutputPath = join(normalize(browserOptions.outputPath), 'index.html');
-          const path = join(this.context.workspace.root, browserIndexOutputPath);
-
-          return this.context.host.read(path).pipe(
-            map<virtualFs.FileBuffer, [Path, virtualFs.FileBuffer]>(x => {
-              return [browserIndexOutputPath, x];
-            }),
-          );
-        }),
-      ),
-      this.getServerModuleBundlePath(options),
-    ).pipe(
-      switchMap(([[browserIndexOutputPath, indexContent], serverBundlePath]) => {
-        const root = this.context.workspace.root;
-        requireProjectModule(getSystemPath(root), 'zone.js/dist/zone-node');
-
-        const renderModuleFactory = requireProjectModule(
-          getSystemPath(root),
-          '@angular/platform-server',
-        ).renderModuleFactory;
-        const AppServerModuleNgFactory = require(
-          getSystemPath(serverBundlePath),
-        ).AppServerModuleNgFactory;
-        const indexHtml = virtualFs.fileBufferToString(indexContent);
-        const outputIndexPath = join(root, options.outputIndexPath || browserIndexOutputPath);
-
-        // Render to HTML and overwrite the client index file.
-        return from<Promise<BuildEvent>>(
-          renderModuleFactory(AppServerModuleNgFactory, {
-            document: indexHtml,
-            url: options.route,
-          })
-          .then(async (html: string) => {
-            await this.context.host
-              .write(outputIndexPath, virtualFs.stringToFileBuffer(html))
-              .toPromise();
-
-            if (browserOptions.serviceWorker) {
-              await augmentAppWithServiceWorker(
-                this.context.host,
-                root,
-                projectRoot,
-                join(root, browserOptions.outputPath),
-                browserOptions.baseHref || '/',
-                browserOptions.ngswConfigPath,
-              );
-            }
-
-            return { success: true };
-          }),
-        );
-      }),
-    );
-  }
-}
-
-export default AppShellBuilder;
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
deleted file mode 100644
index 40c8ad37df68..000000000000
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ /dev/null
@@ -1,205 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import {
-  BuildEvent,
-  Builder,
-  BuilderConfiguration,
-  BuilderContext,
-} from '@angular-devkit/architect';
-import { LoggingCallback, WebpackBuilder } from '@angular-devkit/build-webpack';
-import { Path, getSystemPath, join, normalize, resolve, virtualFs } from '@angular-devkit/core';
-import * as fs from 'fs';
-import { Observable, concat, of, throwError } from 'rxjs';
-import { concatMap, last } from 'rxjs/operators';
-import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
-import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
-import {
-  getAotConfig,
-  getBrowserConfig,
-  getCommonConfig,
-  getNonAotConfig,
-  getStatsConfig,
-  getStylesConfig,
-} from '../angular-cli-files/models/webpack-configs';
-import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
-import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
-import { augmentAppWithServiceWorker } from '../angular-cli-files/utilities/service-worker';
-import {
-  statsErrorsToString,
-  statsToString,
-  statsWarningsToString,
-} from '../angular-cli-files/utilities/stats';
-import { NormalizedBrowserBuilderSchema, defaultProgress, normalizeBrowserSchema } from '../utils';
-import { Schema as BrowserBuilderSchema } from './schema';
-const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');
-const webpackMerge = require('webpack-merge');
-
-export class BrowserBuilder implements Builder<BrowserBuilderSchema> {
-
-  constructor(public context: BuilderContext) { }
-
-  protected createWebpackBuilder(context: BuilderContext): WebpackBuilder {
-    return new WebpackBuilder(context);
-  }
-
-  protected createLoggingFactory(): (verbose: boolean) => LoggingCallback  {
-    return getBrowserLoggingCb;
-  }
-
-  run(builderConfig: BuilderConfiguration<BrowserBuilderSchema>): Observable<BuildEvent> {
-    const root = this.context.workspace.root;
-    const projectRoot = resolve(root, builderConfig.root);
-    const host = new virtualFs.AliasHost(this.context.host as virtualFs.Host<fs.Stats>);
-    const webpackBuilder = this.createWebpackBuilder({ ...this.context, host });
-    const getLoggingCb = this.createLoggingFactory();
-
-    const options = normalizeBrowserSchema(
-      host,
-      root,
-      resolve(root, builderConfig.root),
-      builderConfig.sourceRoot,
-      builderConfig.options,
-    );
-
-    return of(null).pipe(
-      concatMap(() => options.deleteOutputPath
-        ? this._deleteOutputDir(root, normalize(options.outputPath), this.context.host)
-        : of(null)),
-      concatMap(() => {
-        let webpackConfig;
-        try {
-          webpackConfig = this.buildWebpackConfig(root, projectRoot, host, options);
-        } catch (e) {
-          return throwError(e);
-        }
-
-        return webpackBuilder.runWebpack(webpackConfig, getLoggingCb(options.verbose || false));
-      }),
-      concatMap(buildEvent => {
-        if (buildEvent.success && !options.watch && options.serviceWorker) {
-          return new Observable<BuildEvent>(obs => {
-            augmentAppWithServiceWorker(
-              this.context.host,
-              root,
-              projectRoot,
-              resolve(root, normalize(options.outputPath)),
-              options.baseHref || '/',
-              options.ngswConfigPath,
-            ).then(
-              () => {
-                obs.next({ success: true });
-                obs.complete();
-              },
-              (err: Error) => {
-                obs.error(err);
-              },
-            );
-          });
-        } else {
-          return of(buildEvent);
-        }
-      }),
-    );
-  }
-
-  buildWebpackConfig(
-    root: Path,
-    projectRoot: Path,
-    host: virtualFs.Host<fs.Stats>,
-    options: NormalizedBrowserBuilderSchema,
-  ) {
-    // Ensure Build Optimizer is only used with AOT.
-    if (options.buildOptimizer && !options.aot) {
-      throw new Error(`The 'buildOptimizer' option cannot be used without 'aot'.`);
-    }
-
-    let wco: WebpackConfigOptions<NormalizedBrowserBuilderSchema>;
-
-    const tsConfigPath = getSystemPath(normalize(resolve(root, normalize(options.tsConfig))));
-    const tsConfig = readTsconfig(tsConfigPath);
-
-    const projectTs = requireProjectModule(getSystemPath(projectRoot), 'typescript') as typeof ts;
-
-    const supportES2015 = tsConfig.options.target !== projectTs.ScriptTarget.ES3
-      && tsConfig.options.target !== projectTs.ScriptTarget.ES5;
-
-    wco = {
-      root: getSystemPath(root),
-      logger: this.context.logger,
-      projectRoot: getSystemPath(projectRoot),
-      buildOptions: options,
-      tsConfig,
-      tsConfigPath,
-      supportES2015,
-    };
-
-    wco.buildOptions.progress = defaultProgress(wco.buildOptions.progress);
-
-    const webpackConfigs: {}[] = [
-      getCommonConfig(wco),
-      getBrowserConfig(wco),
-      getStylesConfig(wco),
-      getStatsConfig(wco),
-    ];
-
-    if (wco.buildOptions.main || wco.buildOptions.polyfills) {
-      const typescriptConfigPartial = wco.buildOptions.aot
-        ? getAotConfig(wco)
-        : getNonAotConfig(wco);
-      webpackConfigs.push(typescriptConfigPartial);
-    }
-
-    const webpackConfig = webpackMerge(webpackConfigs);
-
-    if (options.profile || process.env['NG_BUILD_PROFILING']) {
-      const smp = new SpeedMeasurePlugin({
-        outputFormat: 'json',
-        outputTarget: getSystemPath(join(root, 'speed-measure-plugin.json')),
-      });
-
-      return smp.wrap(webpackConfig);
-    }
-
-    return webpackConfig;
-  }
-
-  private _deleteOutputDir(root: Path, outputPath: Path, host: virtualFs.Host) {
-    const resolvedOutputPath = resolve(root, outputPath);
-    if (resolvedOutputPath === root) {
-      throw new Error('Output path MUST not be project root directory!');
-    }
-
-    return host.exists(resolvedOutputPath).pipe(
-      concatMap(exists => exists
-        // TODO: remove this concat once host ops emit an event.
-        ? concat(host.delete(resolvedOutputPath), of(null)).pipe(last())
-        // ? of(null)
-        : of(null)),
-    );
-  }
-}
-
-export const getBrowserLoggingCb = (verbose: boolean): LoggingCallback =>
-  (stats, config, logger) => {
-    // config.stats contains our own stats settings, added during buildWebpackConfig().
-    const json = stats.toJson(config.stats);
-    if (verbose) {
-      logger.info(stats.toString(config.stats));
-    } else {
-      logger.info(statsToString(json, config.stats));
-    }
-
-    if (stats.hasWarnings()) {
-      logger.warn(statsWarningsToString(json, config.stats));
-    }
-    if (stats.hasErrors()) {
-      logger.error(statsErrorsToString(json, config.stats));
-    }
-  };
-
-export default BrowserBuilder;
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
deleted file mode 100644
index a5f1fbadf8ba..000000000000
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ /dev/null
@@ -1,426 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {
-  BuildEvent,
-  Builder,
-  BuilderConfiguration,
-  BuilderContext,
-} from '@angular-devkit/architect';
-import { WebpackDevServerBuilder } from '@angular-devkit/build-webpack';
-import { Path, getSystemPath, resolve, tags, virtualFs } from '@angular-devkit/core';
-import { Stats, existsSync, readFileSync } from 'fs';
-import * as path from 'path';
-import { Observable, from, throwError } from 'rxjs';
-import { concatMap, map, tap } from 'rxjs/operators';
-import * as url from 'url';
-import * as webpack from 'webpack';
-import * as WebpackDevServer from 'webpack-dev-server';
-import { checkPort } from '../angular-cli-files/utilities/check-port';
-import { BrowserBuilder, getBrowserLoggingCb } from '../browser';
-import { Schema as BrowserBuilderSchema } from '../browser/schema';
-import {
-  NormalizedBrowserBuilderSchema,
-  normalizeBrowserSchema,
-} from '../utils';
-import { Schema as DevServerBuilderSchema } from './schema';
-const opn = require('opn');
-
-
-type DevServerBuilderSchemaKeys = Extract<keyof DevServerBuilderSchema, string>;
-
-export class DevServerBuilder implements Builder<DevServerBuilderSchema> {
-
-  constructor(public context: BuilderContext) { }
-
-  run(builderConfig: BuilderConfiguration<DevServerBuilderSchema>): Observable<BuildEvent> {
-    const options = builderConfig.options;
-    const root = this.context.workspace.root;
-    const projectRoot = resolve(root, builderConfig.root);
-    const host = new virtualFs.AliasHost(this.context.host as virtualFs.Host<Stats>);
-    const webpackDevServerBuilder = new WebpackDevServerBuilder({ ...this.context, host });
-    let browserOptions: NormalizedBrowserBuilderSchema;
-    let first = true;
-    let opnAddress: string;
-
-    return from(checkPort(options.port || 0, options.host || 'localhost', 4200)).pipe(
-      tap((port) => options.port = port),
-      concatMap(() => this._getBrowserOptions(options)),
-      tap(opts => browserOptions = normalizeBrowserSchema(
-        host,
-        root,
-        resolve(root, builderConfig.root),
-        builderConfig.sourceRoot,
-        opts.options,
-      )),
-      concatMap(() => {
-        const webpackConfig = this.buildWebpackConfig(root, projectRoot, host, browserOptions);
-
-        let webpackDevServerConfig: WebpackDevServer.Configuration;
-        try {
-          webpackDevServerConfig = this._buildServerConfig(
-            root,
-            options,
-            browserOptions,
-          );
-        } catch (err) {
-          return throwError(err);
-        }
-
-        // Resolve public host and client address.
-        let clientAddress = `${options.ssl ? 'https' : 'http'}://0.0.0.0:0`;
-        if (options.publicHost) {
-          let publicHost = options.publicHost;
-          if (!/^\w+:\/\//.test(publicHost)) {
-            publicHost = `${options.ssl ? 'https' : 'http'}://${publicHost}`;
-          }
-          const clientUrl = url.parse(publicHost);
-          options.publicHost = clientUrl.host;
-          clientAddress = url.format(clientUrl);
-        }
-
-        // Resolve serve address.
-        const serverAddress = url.format({
-          protocol: options.ssl ? 'https' : 'http',
-          hostname: options.host === '0.0.0.0' ? 'localhost' : options.host,
-          // Port cannot be undefined here since we have a step that sets it back in options above.
-          // tslint:disable-next-line:no-non-null-assertion
-          port: options.port !.toString(),
-        });
-
-        // Add live reload config.
-        if (options.liveReload) {
-          this._addLiveReload(options, browserOptions, webpackConfig, clientAddress);
-        } else if (options.hmr) {
-          this.context.logger.warn('Live reload is disabled. HMR option ignored.');
-        }
-
-        if (!options.watch) {
-          // There's no option to turn off file watching in webpack-dev-server, but
-          // we can override the file watcher instead.
-          webpackConfig.plugins.unshift({
-            // tslint:disable-next-line:no-any
-            apply: (compiler: any) => {
-              compiler.hooks.afterEnvironment.tap('angular-cli', () => {
-                compiler.watchFileSystem = { watch: () => { } };
-              });
-            },
-          });
-        }
-
-        if (browserOptions.optimization.scripts || browserOptions.optimization.styles) {
-          this.context.logger.error(tags.stripIndents`
-            ****************************************************************************************
-            This is a simple server for use in testing or debugging Angular applications locally.
-            It hasn't been reviewed for security issues.
-
-            DON'T USE IT FOR PRODUCTION!
-            ****************************************************************************************
-          `);
-        }
-
-        this.context.logger.info(tags.oneLine`
-          **
-          Angular Live Development Server is listening on ${options.host}:${options.port},
-          open your browser on ${serverAddress}${webpackDevServerConfig.publicPath}
-          **
-        `);
-
-        opnAddress = serverAddress + webpackDevServerConfig.publicPath;
-        webpackConfig.devServer = webpackDevServerConfig;
-
-        return webpackDevServerBuilder.runWebpackDevServer(
-          webpackConfig, undefined, getBrowserLoggingCb(browserOptions.verbose || false),
-        );
-      }),
-      map(buildEvent => {
-        if (first && options.open) {
-          first = false;
-          opn(opnAddress);
-        }
-
-        return buildEvent;
-      }),
-      // using more than 10 operators will cause rxjs to loose the types
-    ) as Observable<BuildEvent>;
-  }
-
-  buildWebpackConfig(
-    root: Path,
-    projectRoot: Path,
-    host: virtualFs.Host<Stats>,
-    browserOptions: NormalizedBrowserBuilderSchema,
-  ) {
-    const browserBuilder = new BrowserBuilder(this.context);
-
-    return browserBuilder.buildWebpackConfig(root, projectRoot, host, browserOptions);
-  }
-
-  private _buildServerConfig(
-    root: Path,
-    options: DevServerBuilderSchema,
-    browserOptions: NormalizedBrowserBuilderSchema,
-  ) {
-    const systemRoot = getSystemPath(root);
-    if (options.host) {
-      // Check that the host is either localhost or prints out a message.
-      if (!/^127\.\d+\.\d+\.\d+/g.test(options.host) && options.host !== 'localhost') {
-        this.context.logger.warn(tags.stripIndent`
-          WARNING: This is a simple server for use in testing or debugging Angular applications
-          locally. It hasn't been reviewed for security issues.
-
-          Binding this server to an open connection can result in compromising your application or
-          computer. Using a different host than the one passed to the "--host" flag might result in
-          websocket connection issues. You might need to use "--disableHostCheck" if that's the
-          case.
-        `);
-      }
-    }
-    if (options.disableHostCheck) {
-      this.context.logger.warn(tags.oneLine`
-        WARNING: Running a server with --disable-host-check is a security risk.
-        See https://medium.com/webpack/webpack-dev-server-middleware-security-issues-1489d950874a
-        for more information.
-      `);
-    }
-
-    const servePath = this._buildServePath(options, browserOptions);
-    const { styles, scripts } = browserOptions.optimization;
-
-    const config: WebpackDevServer.Configuration = {
-      host: options.host,
-      port: options.port,
-      headers: { 'Access-Control-Allow-Origin': '*' },
-      historyApiFallback: {
-        index: `${servePath}/${path.basename(browserOptions.index)}`,
-        disableDotRule: true,
-        htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
-      } as WebpackDevServer.HistoryApiFallbackConfig,
-      stats: false,
-      compress: styles || scripts,
-      watchOptions: {
-        poll: browserOptions.poll,
-      },
-      https: options.ssl,
-      overlay: {
-        errors: !(styles || scripts),
-        warnings: false,
-      },
-      public: options.publicHost,
-      disableHostCheck: options.disableHostCheck,
-      publicPath: servePath,
-      hot: options.hmr,
-      contentBase: false,
-    };
-
-    if (options.ssl) {
-      this._addSslConfig(systemRoot, options, config);
-    }
-
-    if (options.proxyConfig) {
-      this._addProxyConfig(systemRoot, options, config);
-    }
-
-    return config;
-  }
-
-  private _addLiveReload(
-    options: DevServerBuilderSchema,
-    browserOptions: NormalizedBrowserBuilderSchema,
-    webpackConfig: any, // tslint:disable-line:no-any
-    clientAddress: string,
-  ) {
-    // This allows for live reload of page when changes are made to repo.
-    // https://webpack.js.org/configuration/dev-server/#devserver-inline
-    let webpackDevServerPath;
-    try {
-      webpackDevServerPath = require.resolve('webpack-dev-server/client');
-    } catch {
-      throw new Error('The "webpack-dev-server" package could not be found.');
-    }
-    const entryPoints = [`${webpackDevServerPath}?${clientAddress}`];
-    if (options.hmr) {
-      const webpackHmrLink = 'https://webpack.js.org/guides/hot-module-replacement';
-
-      this.context.logger.warn(
-        tags.oneLine`NOTICE: Hot Module Replacement (HMR) is enabled for the dev server.`);
-
-      const showWarning = options.hmrWarning;
-      if (showWarning) {
-        this.context.logger.info(tags.stripIndents`
-          The project will still live reload when HMR is enabled,
-          but to take advantage of HMR additional application code is required'
-          (not included in an Angular CLI project by default).'
-          See ${webpackHmrLink}
-          for information on working with HMR for Webpack.`,
-        );
-        this.context.logger.warn(
-          tags.oneLine`To disable this warning use "hmrWarning: false" under "serve"
-           options in "angular.json".`,
-        );
-      }
-      entryPoints.push('webpack/hot/dev-server');
-      webpackConfig.plugins.push(new webpack.HotModuleReplacementPlugin());
-      if (browserOptions.extractCss) {
-        this.context.logger.warn(tags.oneLine`NOTICE: (HMR) does not allow for CSS hot reload
-                when used together with '--extract-css'.`);
-      }
-    }
-    if (!webpackConfig.entry.main) { webpackConfig.entry.main = []; }
-    webpackConfig.entry.main.unshift(...entryPoints);
-  }
-
-  private _addSslConfig(
-    root: string,
-    options: DevServerBuilderSchema,
-    config: WebpackDevServer.Configuration,
-  ) {
-    let sslKey: string | undefined = undefined;
-    let sslCert: string | undefined = undefined;
-    if (options.sslKey) {
-      const keyPath = path.resolve(root, options.sslKey);
-      if (existsSync(keyPath)) {
-        sslKey = readFileSync(keyPath, 'utf-8');
-      }
-    }
-    if (options.sslCert) {
-      const certPath = path.resolve(root, options.sslCert);
-      if (existsSync(certPath)) {
-        sslCert = readFileSync(certPath, 'utf-8');
-      }
-    }
-
-    config.https = true;
-    if (sslKey != null && sslCert != null) {
-      config.https = {
-        key: sslKey,
-        cert: sslCert,
-      };
-    }
-  }
-
-  private _addProxyConfig(
-    root: string,
-    options: DevServerBuilderSchema,
-    config: WebpackDevServer.Configuration,
-  ) {
-    let proxyConfig = {};
-    const proxyPath = path.resolve(root, options.proxyConfig as string);
-    if (existsSync(proxyPath)) {
-      proxyConfig = require(proxyPath);
-    } else {
-      const message = 'Proxy config file ' + proxyPath + ' does not exist.';
-      throw new Error(message);
-    }
-    config.proxy = proxyConfig;
-  }
-
-  private _buildServePath(
-    options: DevServerBuilderSchema,
-    browserOptions: NormalizedBrowserBuilderSchema,
-  ) {
-    let servePath = options.servePath;
-    if (!servePath && servePath !== '') {
-      const defaultServePath =
-        this._findDefaultServePath(browserOptions.baseHref, browserOptions.deployUrl);
-      const showWarning = options.servePathDefaultWarning;
-      if (defaultServePath == null && showWarning) {
-        this.context.logger.warn(tags.oneLine`
-            WARNING: --deploy-url and/or --base-href contain
-            unsupported values for ng serve.  Default serve path of '/' used.
-            Use --serve-path to override.
-          `);
-      }
-      servePath = defaultServePath || '';
-    }
-    if (servePath.endsWith('/')) {
-      servePath = servePath.substr(0, servePath.length - 1);
-    }
-    if (!servePath.startsWith('/')) {
-      servePath = `/${servePath}`;
-    }
-
-    return servePath;
-  }
-
-  private _findDefaultServePath(baseHref?: string, deployUrl?: string): string | null {
-    if (!baseHref && !deployUrl) {
-      return '';
-    }
-
-    if (/^(\w+:)?\/\//.test(baseHref || '') || /^(\w+:)?\/\//.test(deployUrl || '')) {
-      // If baseHref or deployUrl is absolute, unsupported by ng serve
-      return null;
-    }
-
-    // normalize baseHref
-    // for ng serve the starting base is always `/` so a relative
-    // and root relative value are identical
-    const baseHrefParts = (baseHref || '')
-      .split('/')
-      .filter(part => part !== '');
-    if (baseHref && !baseHref.endsWith('/')) {
-      baseHrefParts.pop();
-    }
-    const normalizedBaseHref = baseHrefParts.length === 0 ? '/' : `/${baseHrefParts.join('/')}/`;
-
-    if (deployUrl && deployUrl[0] === '/') {
-      if (baseHref && baseHref[0] === '/' && normalizedBaseHref !== deployUrl) {
-        // If baseHref and deployUrl are root relative and not equivalent, unsupported by ng serve
-        return null;
-      }
-
-      return deployUrl;
-    }
-
-    // Join together baseHref and deployUrl
-    return `${normalizedBaseHref}${deployUrl || ''}`;
-  }
-
-  private _getBrowserOptions(options: DevServerBuilderSchema) {
-    const architect = this.context.architect;
-    const [project, target, configuration] = options.browserTarget.split(':');
-
-    const overridesOptions: DevServerBuilderSchemaKeys[] = [
-      'watch',
-      'optimization',
-      'aot',
-      'sourceMap',
-      'vendorSourceMap',
-      'evalSourceMap',
-      'vendorChunk',
-      'commonChunk',
-      'baseHref',
-      'progress',
-      'poll',
-      'verbose',
-      'deployUrl',
-    ];
-
-    // remove options that are undefined or not to be overrriden
-    const overrides = (Object.keys(options) as DevServerBuilderSchemaKeys[])
-      .filter(key => options[key] !== undefined && overridesOptions.includes(key))
-      .reduce<Partial<BrowserBuilderSchema>>((previous, key) => (
-        {
-          ...previous,
-          [key]: options[key],
-        }
-      ), {});
-
-    const browserTargetSpec = { project, target, configuration, overrides };
-    const builderConfig = architect.getBuilderConfiguration<BrowserBuilderSchema>(
-      browserTargetSpec);
-
-    return architect.getBuilderDescription(builderConfig).pipe(
-      concatMap(browserDescription =>
-        architect.validateBuilderOptions(builderConfig, browserDescription)),
-    );
-  }
-}
-
-export default DevServerBuilder;
diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
deleted file mode 100644
index daaa3bedfc8a..000000000000
--- a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import {
-  BuildEvent,
-  Builder,
-  BuilderConfiguration,
-  BuilderContext,
-} from '@angular-devkit/architect';
-import { LoggingCallback, WebpackBuilder } from '@angular-devkit/build-webpack';
-import { Path, getSystemPath, normalize, resolve } from '@angular-devkit/core';
-import * as path from 'path';
-import { Observable } from 'rxjs';
-import { concatMap, map } from 'rxjs/operators';
-import * as webpack from 'webpack';
-import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
-import {
-  getAotConfig,
-  getCommonConfig,
-  getStatsConfig,
-  getStylesConfig,
-} from '../angular-cli-files/models/webpack-configs';
-import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
-import { statsErrorsToString, statsWarningsToString } from '../angular-cli-files/utilities/stats';
-import { Schema as BrowserBuilderSchema } from '../browser/schema';
-import { NormalizedBrowserBuilderSchema, normalizeBrowserSchema } from '../utils';
-const webpackMerge = require('webpack-merge');
-
-
-export interface ExtractI18nBuilderOptions {
-  browserTarget: string;
-  i18nFormat: string;
-  i18nLocale: string;
-  outputPath?: string;
-  outFile?: string;
-  progress?: boolean;
-}
-
-export class ExtractI18nBuilder implements Builder<ExtractI18nBuilderOptions> {
-
-  constructor(public context: BuilderContext) { }
-
-  run(builderConfig: BuilderConfiguration<ExtractI18nBuilderOptions>): Observable<BuildEvent> {
-    const architect = this.context.architect;
-    const options = builderConfig.options;
-    const root = this.context.workspace.root;
-    const projectRoot = resolve(root, builderConfig.root);
-    const [project, targetName, configuration] = options.browserTarget.split(':');
-    // Override browser build watch setting.
-    const overrides = { watch: false };
-
-    const browserTargetSpec = { project, target: targetName, configuration, overrides };
-    const browserBuilderConfig = architect.getBuilderConfiguration<BrowserBuilderSchema>(
-      browserTargetSpec);
-    const webpackBuilder = new WebpackBuilder(this.context);
-
-    const loggingCb: LoggingCallback = (stats, config, logger) => {
-      const json = stats.toJson();
-      if (stats.hasWarnings()) {
-        this.context.logger.warn(statsWarningsToString(json, config.stats));
-      }
-
-      if (stats.hasErrors()) {
-        this.context.logger.error(statsErrorsToString(json, config.stats));
-      }
-    };
-
-    return architect.getBuilderDescription(browserBuilderConfig).pipe(
-      concatMap(browserDescription =>
-        architect.validateBuilderOptions(browserBuilderConfig, browserDescription)),
-      map(browserBuilderConfig => browserBuilderConfig.options),
-      concatMap((validatedBrowserOptions) => {
-        const browserOptions = validatedBrowserOptions;
-
-        // We need to determine the outFile name so that AngularCompiler can retrieve it.
-        let outFile = options.outFile || getI18nOutfile(options.i18nFormat);
-        if (options.outputPath) {
-          // AngularCompilerPlugin doesn't support genDir so we have to adjust outFile instead.
-          outFile = path.join(options.outputPath, outFile);
-        }
-
-        // Extracting i18n uses the browser target webpack config with some specific options.
-        const webpackConfig = this.buildWebpackConfig(root, projectRoot, {
-          // todo: remove this casting when 'CurrentFileReplacement' is changed to 'FileReplacement'
-          ...(browserOptions as NormalizedBrowserBuilderSchema),
-          optimization: {
-            scripts: false,
-            styles: false,
-          },
-          i18nLocale: options.i18nLocale,
-          i18nFormat: options.i18nFormat,
-          i18nFile: outFile,
-          aot: true,
-          progress: options.progress,
-          assets: [],
-          scripts: [],
-          styles: [],
-        });
-
-        return webpackBuilder.runWebpack(webpackConfig, loggingCb);
-      }),
-    );
-  }
-
-  buildWebpackConfig(
-    root: Path,
-    projectRoot: Path,
-    options: NormalizedBrowserBuilderSchema,
-  ) {
-    let wco: WebpackConfigOptions;
-
-    const tsConfigPath = getSystemPath(normalize(resolve(root, normalize(options.tsConfig))));
-    const tsConfig = readTsconfig(tsConfigPath);
-
-    wco = {
-      root: getSystemPath(root),
-      logger: this.context.logger,
-      projectRoot: getSystemPath(projectRoot),
-      // TODO: use only this.options, it contains all flags and configs items already.
-      buildOptions: options,
-      tsConfig,
-      tsConfigPath,
-      supportES2015: false,
-    };
-
-    const webpackConfigs: {}[] = [
-      // We don't need to write to disk.
-      { plugins: [new InMemoryOutputPlugin()] },
-      getCommonConfig(wco),
-      getAotConfig(wco, true),
-      getStylesConfig(wco),
-      getStatsConfig(wco),
-    ];
-
-    return webpackMerge(webpackConfigs);
-  }
-}
-
-function getI18nOutfile(format: string) {
-  switch (format) {
-    case 'xmb':
-      return 'messages.xmb';
-    case 'xlf':
-    case 'xlif':
-    case 'xliff':
-    case 'xlf2':
-    case 'xliff2':
-      return 'messages.xlf';
-    default:
-      throw new Error(`Unsupported format "${format}"`);
-  }
-}
-
-class InMemoryOutputPlugin {
-  constructor() { }
-
-  apply(compiler: webpack.Compiler): void {
-    // tslint:disable-next-line:no-any
-    compiler.outputFileSystem = new (webpack as any).MemoryOutputFileSystem();
-  }
-
-}
-
-export default ExtractI18nBuilder;
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
deleted file mode 100644
index 18227ab6da19..000000000000
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {
-  BuildEvent,
-  Builder,
-  BuilderConfiguration,
-  BuilderContext,
-} from '@angular-devkit/architect';
-import { Path, getSystemPath, normalize, resolve, virtualFs } from '@angular-devkit/core';
-import * as fs from 'fs';
-import { Observable, of } from 'rxjs';
-import { concatMap } from 'rxjs/operators';
-import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
-import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
-import {
-  getCommonConfig,
-  getNonAotConfig,
-  getStylesConfig,
-  getTestConfig,
-} from '../angular-cli-files/models/webpack-configs';
-import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
-import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
-import { NormalizedKarmaBuilderSchema, defaultProgress, normalizeKarmaSchema } from '../utils';
-import { Schema as KarmaBuilderSchema } from './schema';
-const webpackMerge = require('webpack-merge');
-
-
-export class KarmaBuilder implements Builder<KarmaBuilderSchema> {
-  constructor(public context: BuilderContext) { }
-
-  run(builderConfig: BuilderConfiguration<KarmaBuilderSchema>): Observable<BuildEvent> {
-    const root = this.context.workspace.root;
-    const projectRoot = resolve(root, builderConfig.root);
-    const host = new virtualFs.AliasHost(this.context.host as virtualFs.Host<fs.Stats>);
-
-    const options = normalizeKarmaSchema(
-      host,
-      root,
-      resolve(root, builderConfig.root),
-      builderConfig.sourceRoot,
-      builderConfig.options,
-    );
-
-    return of(null).pipe(
-      concatMap(() => new Observable<BuildEvent>(obs => {
-        const karma = requireProjectModule(getSystemPath(projectRoot), 'karma');
-        const karmaConfig = getSystemPath(resolve(root, normalize(options.karmaConfig)));
-
-        // TODO: adjust options to account for not passing them blindly to karma.
-        // const karmaOptions: any = Object.assign({}, options);
-        // tslint:disable-next-line:no-any
-        const karmaOptions: any = {};
-
-        if (options.watch !== undefined) {
-          karmaOptions.singleRun = !options.watch;
-        }
-
-        // Convert browsers from a string to an array
-        if (options.browsers) {
-          karmaOptions.browsers = options.browsers.split(',');
-        }
-
-        if (options.reporters) {
-          // Split along commas to make it more natural, and remove empty strings.
-          const reporters = options.reporters
-            .reduce<string[]>((acc, curr) => acc.concat(curr.split(/,/)), [])
-            .filter(x => !!x);
-
-          if (reporters.length > 0) {
-            karmaOptions.reporters = reporters;
-          }
-        }
-
-        const sourceRoot = builderConfig.sourceRoot && resolve(root, builderConfig.sourceRoot);
-
-        karmaOptions.buildWebpack = {
-          root: getSystemPath(root),
-          projectRoot: getSystemPath(projectRoot),
-          options,
-          webpackConfig: this.buildWebpackConfig(root, projectRoot, sourceRoot, host, options),
-          // Pass onto Karma to emit BuildEvents.
-          successCb: () => obs.next({ success: true }),
-          failureCb: () => obs.next({ success: false }),
-          // Workaround for https://github.com/karma-runner/karma/issues/3154
-          // When this workaround is removed, user projects need to be updated to use a Karma
-          // version that has a fix for this issue.
-          toJSON: () => { },
-          logger: this.context.logger,
-        };
-
-        // TODO: inside the configs, always use the project root and not the workspace root.
-        // Until then we pretend the app root is relative (``) but the same as `projectRoot`.
-        karmaOptions.buildWebpack.options.root = '';
-
-        // Assign additional karmaConfig options to the local ngapp config
-        karmaOptions.configFile = karmaConfig;
-
-        // Complete the observable once the Karma server returns.
-        const karmaServer = new karma.Server(karmaOptions, () => obs.complete());
-        const karmaStartPromise = karmaServer.start();
-
-        // Cleanup, signal Karma to exit.
-        return () => {
-          // Karma only has the `stop` method start with 3.1.1, so we must defensively check.
-          if (karmaServer.stop && typeof karmaServer.stop === 'function') {
-            return karmaStartPromise.then(() => karmaServer.stop());
-          }
-        };
-      })),
-    );
-  }
-
-  buildWebpackConfig(
-    root: Path,
-    projectRoot: Path,
-    sourceRoot: Path | undefined,
-    host: virtualFs.Host<fs.Stats>,
-    options: NormalizedKarmaBuilderSchema,
-  ) {
-    let wco: WebpackConfigOptions;
-
-    const tsConfigPath = getSystemPath(resolve(root, normalize(options.tsConfig)));
-    const tsConfig = readTsconfig(tsConfigPath);
-
-    const projectTs = requireProjectModule(getSystemPath(projectRoot), 'typescript') as typeof ts;
-
-    const supportES2015 = tsConfig.options.target !== projectTs.ScriptTarget.ES3
-      && tsConfig.options.target !== projectTs.ScriptTarget.ES5;
-
-    const compatOptions: typeof wco['buildOptions'] = {
-      ...options as {} as typeof wco['buildOptions'],
-      // Some asset logic inside getCommonConfig needs outputPath to be set.
-      outputPath: '',
-    };
-
-    wco = {
-      root: getSystemPath(root),
-      logger: this.context.logger,
-      projectRoot: getSystemPath(projectRoot),
-      sourceRoot: sourceRoot && getSystemPath(sourceRoot),
-      // TODO: use only this.options, it contains all flags and configs items already.
-      buildOptions: compatOptions,
-      tsConfig,
-      tsConfigPath,
-      supportES2015,
-    };
-
-    wco.buildOptions.progress = defaultProgress(wco.buildOptions.progress);
-
-    const webpackConfigs: {}[] = [
-      getCommonConfig(wco),
-      getStylesConfig(wco),
-      getNonAotConfig(wco),
-      getTestConfig(wco),
-    ];
-
-    return webpackMerge(webpackConfigs);
-  }
-}
-
-export default KarmaBuilder;
diff --git a/packages/angular_devkit/build_angular/src/protractor/index.ts b/packages/angular_devkit/build_angular/src/protractor/index.ts
deleted file mode 100644
index 40d8cdae6f80..000000000000
--- a/packages/angular_devkit/build_angular/src/protractor/index.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {
-  BuildEvent,
-  Builder,
-  BuilderConfiguration,
-  BuilderContext,
-  BuilderDescription,
-} from '@angular-devkit/architect';
-import { DevServerResult } from '@angular-devkit/build-webpack';
-import { Path, getSystemPath, normalize, resolve, tags } from '@angular-devkit/core';
-import { Observable, from, of } from 'rxjs';
-import { concatMap, map, take, tap } from 'rxjs/operators';
-import * as url from 'url';
-import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
-import { Schema as DevServerBuilderOptions } from '../dev-server/schema';
-import { runModuleAsObservableFork } from '../utils';
-
-
-export interface ProtractorBuilderOptions {
-  protractorConfig: string;
-  devServerTarget?: string;
-  specs: string[];
-  suite?: string;
-  elementExplorer: boolean;
-  webdriverUpdate: boolean;
-  port?: number;
-  host: string;
-  baseUrl: string;
-}
-
-export class ProtractorBuilder implements Builder<ProtractorBuilderOptions> {
-
-  constructor(public context: BuilderContext) { }
-
-  run(builderConfig: BuilderConfiguration<ProtractorBuilderOptions>): Observable<BuildEvent> {
-
-    const options = builderConfig.options;
-    const root = this.context.workspace.root;
-    const projectRoot = resolve(root, builderConfig.root);
-
-    // ensure that either one of this option is used
-    if (options.devServerTarget && options.baseUrl) {
-      throw new Error(tags.stripIndents`
-      The 'baseUrl' option cannot be used with 'devServerTarget'.
-      When present, 'devServerTarget' will be used to automatically setup 'baseUrl' for Protractor.
-      `);
-    }
-
-    // TODO: verify using of(null) to kickstart things is a pattern.
-    return of(null).pipe(
-      concatMap(() => options.devServerTarget ? this._startDevServer(options) : of(null)),
-      concatMap(() => options.webdriverUpdate ? this._updateWebdriver(projectRoot) : of(null)),
-      concatMap(() => this._runProtractor(root, options)),
-      take(1),
-    );
-  }
-
-  // Note: this method mutates the options argument.
-  private _startDevServer(options: ProtractorBuilderOptions) {
-    const architect = this.context.architect;
-    const [project, targetName, configuration] = (options.devServerTarget as string).split(':');
-    // Override dev server watch setting.
-    const overrides: Partial<DevServerBuilderOptions> = { watch: false };
-    // Also override the port and host if they are defined in protractor options.
-    if (options.host !== undefined) { overrides.host = options.host; }
-    if (options.port !== undefined) { overrides.port = options.port; }
-    const targetSpec = { project, target: targetName, configuration, overrides };
-    const builderConfig = architect.getBuilderConfiguration<DevServerBuilderOptions>(targetSpec);
-    let devServerDescription: BuilderDescription;
-    let baseUrl: string;
-
-    return architect.getBuilderDescription(builderConfig).pipe(
-      tap(description => devServerDescription = description),
-      concatMap(devServerDescription =>
-        architect.validateBuilderOptions(builderConfig, devServerDescription)),
-      map(() => this.context.architect.getBuilder(devServerDescription, this.context)),
-      concatMap(builder => builder.run(builderConfig)),
-      tap(buildEvent => {
-        if (!buildEvent.success) {
-          return;
-        }
-
-        // Compute baseUrl from devServerOptions.
-        if (builderConfig.options.publicHost) {
-          let publicHost = builderConfig.options.publicHost;
-          if (!/^\w+:\/\//.test(publicHost)) {
-            publicHost = `${builderConfig.options.ssl
-              ? 'https'
-              : 'http'}://${publicHost}`;
-          }
-          const clientUrl = url.parse(publicHost);
-          baseUrl = url.format(clientUrl);
-        } else {
-          const result: DevServerResult | undefined = buildEvent.result;
-
-          baseUrl = url.format({
-            protocol: builderConfig.options.ssl ? 'https' : 'http',
-            hostname: options.host,
-            port: result && result.port.toString(),
-          });
-        }
-
-        // Save the computed baseUrl back so that Protractor can use it.
-        options.baseUrl = baseUrl;
-      }),
-    );
-  }
-
-  private _updateWebdriver(projectRoot: Path) {
-    // The webdriver-manager update command can only be accessed via a deep import.
-    const webdriverDeepImport = 'webdriver-manager/built/lib/cmds/update';
-    let webdriverUpdate: any; // tslint:disable-line:no-any
-
-    try {
-      // When using npm, webdriver is within protractor/node_modules.
-      webdriverUpdate = requireProjectModule(getSystemPath(projectRoot),
-        `protractor/node_modules/${webdriverDeepImport}`);
-    } catch {
-      try {
-        // When using yarn, webdriver is found as a root module.
-        webdriverUpdate = requireProjectModule(getSystemPath(projectRoot), webdriverDeepImport);
-      } catch {
-        throw new Error(tags.stripIndents`
-          Cannot automatically find webdriver-manager to update.
-          Update webdriver-manager manually and run 'ng e2e --no-webdriver-update' instead.
-        `);
-      }
-    }
-
-    // run `webdriver-manager update --standalone false --gecko false --quiet`
-    // if you change this, update the command comment in prev line
-    return from(webdriverUpdate.program.run({
-      standalone: false,
-      gecko: false,
-      quiet: true,
-    }));
-  }
-
-  private _runProtractor(root: Path, options: ProtractorBuilderOptions): Observable<BuildEvent> {
-    const additionalProtractorConfig: Partial<ProtractorBuilderOptions> = {
-      elementExplorer: options.elementExplorer,
-      baseUrl: options.baseUrl,
-      specs: options.specs.length ? options.specs : undefined,
-      suite: options.suite,
-    };
-
-    // TODO: Protractor manages process.exit itself, so this target will allways quit the
-    // process. To work around this we run it in a subprocess.
-    // https://github.com/angular/protractor/issues/4160
-    return runModuleAsObservableFork(
-      getSystemPath(root),
-      'protractor/built/launcher',
-      'init',
-      [
-        getSystemPath(resolve(root, normalize(options.protractorConfig))),
-        additionalProtractorConfig,
-      ],
-    );
-  }
-}
-
-export default ProtractorBuilder;
diff --git a/packages/angular_devkit/build_angular/src/server/index.ts b/packages/angular_devkit/build_angular/src/server/index.ts
deleted file mode 100644
index 690e6cf29f50..000000000000
--- a/packages/angular_devkit/build_angular/src/server/index.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {
-  BuildEvent,
-  Builder,
-  BuilderConfiguration,
-  BuilderContext,
-} from '@angular-devkit/architect';
-import { WebpackBuilder } from '@angular-devkit/build-webpack';
-import { Path, getSystemPath, normalize, resolve, virtualFs } from '@angular-devkit/core';
-import { Stats } from 'fs';
-import { Observable, concat, of } from 'rxjs';
-import { concatMap, last } from 'rxjs/operators';
-import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
-import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
-import {
-  getAotConfig,
-  getCommonConfig,
-  getNonAotConfig,
-  getServerConfig,
-  getStatsConfig,
-  getStylesConfig,
-} from '../angular-cli-files/models/webpack-configs';
-import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
-import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
-import { getBrowserLoggingCb } from '../browser';
-import {
-  NormalizedWebpackServerBuilderSchema,
-  defaultProgress,
-  normalizeWebpackServerSchema,
-} from '../utils';
-import { Schema as BuildWebpackServerSchema } from './schema';
-const webpackMerge = require('webpack-merge');
-
-
-export class ServerBuilder implements Builder<BuildWebpackServerSchema> {
-
-  constructor(public context: BuilderContext) { }
-
-  run(builderConfig: BuilderConfiguration<BuildWebpackServerSchema>): Observable<BuildEvent> {
-    const root = this.context.workspace.root;
-    const projectRoot = resolve(root, builderConfig.root);
-    const host = new virtualFs.AliasHost(this.context.host as virtualFs.Host<Stats>);
-    const webpackBuilder = new WebpackBuilder({ ...this.context, host });
-
-    const options = normalizeWebpackServerSchema(
-      host,
-      root,
-      resolve(root, builderConfig.root),
-      builderConfig.sourceRoot,
-      builderConfig.options,
-    );
-
-    // TODO: verify using of(null) to kickstart things is a pattern.
-    return of(null).pipe(
-      concatMap(() => options.deleteOutputPath
-        ? this._deleteOutputDir(root, normalize(options.outputPath), this.context.host)
-        : of(null)),
-      concatMap(() => {
-        const webpackConfig = this.buildWebpackConfig(root, projectRoot, host, options);
-
-        return webpackBuilder.runWebpack(webpackConfig, getBrowserLoggingCb(!!options.verbose));
-      }),
-    );
-  }
-
-  buildWebpackConfig(root: Path, projectRoot: Path,
-                     _host: virtualFs.Host<Stats>,
-                     options: NormalizedWebpackServerBuilderSchema) {
-    let wco: WebpackConfigOptions;
-
-    // TODO: make target defaults into configurations instead
-    // options = this.addTargetDefaults(options);
-
-    const tsConfigPath = getSystemPath(normalize(resolve(root, normalize(options.tsConfig))));
-    const tsConfig = readTsconfig(tsConfigPath);
-
-    const projectTs = requireProjectModule(getSystemPath(projectRoot), 'typescript') as typeof ts;
-
-    const supportES2015 = tsConfig.options.target !== projectTs.ScriptTarget.ES3
-      && tsConfig.options.target !== projectTs.ScriptTarget.ES5;
-
-    const buildOptions: typeof wco['buildOptions'] = {
-      ...options as {} as typeof wco['buildOptions'],
-    };
-
-    wco = {
-      root: getSystemPath(root),
-      logger: this.context.logger,
-      projectRoot: getSystemPath(projectRoot),
-      // TODO: use only this.options, it contains all flags and configs items already.
-      buildOptions: {
-        ...buildOptions,
-        buildOptimizer: false,
-        aot: true,
-        platform: 'server',
-        scripts: [],
-        styles: [],
-      },
-      tsConfig,
-      tsConfigPath,
-      supportES2015,
-    };
-
-    wco.buildOptions.progress = defaultProgress(wco.buildOptions.progress);
-
-    const webpackConfigs: {}[] = [
-      getCommonConfig(wco),
-      getServerConfig(wco),
-      getStylesConfig(wco),
-      getStatsConfig(wco),
-    ];
-
-    if (wco.buildOptions.main || wco.buildOptions.polyfills) {
-      const typescriptConfigPartial = wco.buildOptions.aot
-        ? getAotConfig(wco)
-        : getNonAotConfig(wco);
-      webpackConfigs.push(typescriptConfigPartial);
-    }
-
-    return webpackMerge(webpackConfigs);
-  }
-
-  private _deleteOutputDir(root: Path, outputPath: Path, host: virtualFs.Host) {
-    const resolvedOutputPath = resolve(root, outputPath);
-    if (resolvedOutputPath === root) {
-      throw new Error('Output path MUST not be project root directory!');
-    }
-
-    return host.exists(resolvedOutputPath).pipe(
-      concatMap(exists => exists
-        // TODO: remove this concat once host ops emit an event.
-        ? concat(host.delete(resolvedOutputPath), of(null)).pipe(last())
-        // ? of(null)
-        : of(null)),
-    );
-  }
-}
-
-export default ServerBuilder;
diff --git a/packages/angular_devkit/build_angular/src/tslint/index.ts b/packages/angular_devkit/build_angular/src/tslint/index.ts
deleted file mode 100644
index 8be54302137b..000000000000
--- a/packages/angular_devkit/build_angular/src/tslint/index.ts
+++ /dev/null
@@ -1,255 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {
-  BuildEvent,
-  Builder,
-  BuilderConfiguration,
-  BuilderContext,
-} from '@angular-devkit/architect';
-import { getSystemPath } from '@angular-devkit/core';
-import { readFileSync } from 'fs';
-import * as glob from 'glob';
-import { Minimatch } from 'minimatch';
-import * as path from 'path';
-import { Observable, from } from 'rxjs';
-import { concatMap } from 'rxjs/operators';
-import * as tslint from 'tslint'; // tslint:disable-line:no-implicit-dependencies
-import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
-import { stripBom } from '../angular-cli-files/utilities/strip-bom';
-
-export interface TslintBuilderOptions {
-  tslintConfig?: string;
-  tsConfig?: string | string[];
-  fix: boolean;
-  typeCheck: boolean;
-  force: boolean;
-  silent: boolean;
-  format: string;
-  exclude: string[];
-  files: string[];
-}
-
-interface LintResult extends tslint.LintResult {
-  fileNames: string[];
-}
-
-export default class TslintBuilder implements Builder<TslintBuilderOptions> {
-
-  constructor(public context: BuilderContext) { }
-
-  private async loadTslint() {
-    let tslint;
-    try {
-      tslint = await import('tslint'); // tslint:disable-line:no-implicit-dependencies
-    } catch {
-      throw new Error('Unable to find TSLint. Ensure TSLint is installed.');
-    }
-
-    const version = tslint.Linter.VERSION && tslint.Linter.VERSION.split('.');
-    if (!version || version.length < 2 || Number(version[0]) < 5 || Number(version[1]) < 5) {
-      throw new Error('TSLint must be version 5.5 or higher.');
-    }
-
-    return tslint;
-  }
-
-  run(builderConfig: BuilderConfiguration<TslintBuilderOptions>): Observable<BuildEvent> {
-
-    const root = this.context.workspace.root;
-    const systemRoot = getSystemPath(root);
-    const options = builderConfig.options;
-    const targetSpecifier = this.context.targetSpecifier;
-    const projectName = targetSpecifier && targetSpecifier.project || '';
-
-    // Print formatter output only for non human-readable formats.
-    const printInfo = ['prose', 'verbose', 'stylish'].includes(options.format)
-      && !options.silent;
-
-    if (printInfo) {
-      this.context.logger.info(`Linting ${JSON.stringify(projectName)}...`);
-    }
-
-    if (!options.tsConfig && options.typeCheck) {
-      throw new Error('A "project" must be specified to enable type checking.');
-    }
-
-    return from(this.loadTslint())
-      .pipe(concatMap(projectTslint => new Observable<BuildEvent>(obs => {
-        const tslintConfigPath = options.tslintConfig
-          ? path.resolve(systemRoot, options.tslintConfig)
-          : null;
-        const Linter = projectTslint.Linter;
-
-        let result: undefined | LintResult;
-        if (options.tsConfig) {
-          const tsConfigs = Array.isArray(options.tsConfig) ? options.tsConfig : [options.tsConfig];
-          const allPrograms =
-            tsConfigs.map(tsConfig => Linter.createProgram(path.resolve(systemRoot, tsConfig)));
-
-          for (const program of allPrograms) {
-            const partial
-              = lint(projectTslint, systemRoot, tslintConfigPath, options, program, allPrograms);
-            if (result == undefined) {
-              result = partial;
-            } else {
-              result.failures = result.failures
-                .filter(curr => !partial.failures.some(prev => curr.equals(prev)))
-                .concat(partial.failures);
-
-              // we are not doing much with 'errorCount' and 'warningCount'
-              // apart from checking if they are greater than 0 thus no need to dedupe these.
-              result.errorCount += partial.errorCount;
-              result.warningCount += partial.warningCount;
-              result.fileNames = [...new Set([...result.fileNames, ...partial.fileNames])];
-
-              if (partial.fixes) {
-                result.fixes = result.fixes ? result.fixes.concat(partial.fixes) : partial.fixes;
-              }
-            }
-          }
-        } else {
-          result = lint(projectTslint, systemRoot, tslintConfigPath, options);
-        }
-
-        if (result == undefined) {
-          throw new Error('Invalid lint configuration. Nothing to lint.');
-        }
-
-        if (!options.silent) {
-          const Formatter = projectTslint.findFormatter(options.format);
-          if (!Formatter) {
-            throw new Error(`Invalid lint format "${options.format}".`);
-          }
-          const formatter = new Formatter();
-
-          const output = formatter.format(result.failures, result.fixes, result.fileNames);
-          if (output) {
-            this.context.logger.info(output);
-          }
-        }
-
-        if (result.warningCount > 0 && printInfo) {
-          this.context.logger.warn('Lint warnings found in the listed files.');
-        }
-
-        if (result.errorCount > 0 && printInfo) {
-          this.context.logger.error('Lint errors found in the listed files.');
-        }
-
-        if (result.warningCount === 0 && result.errorCount === 0 && printInfo) {
-          this.context.logger.info('All files pass linting.');
-        }
-
-        const success = options.force || result.errorCount === 0;
-        obs.next({ success });
-
-        return obs.complete();
-      })));
-  }
-}
-
-function lint(
-  projectTslint: typeof tslint,
-  systemRoot: string,
-  tslintConfigPath: string | null,
-  options: TslintBuilderOptions,
-  program?: ts.Program,
-  allPrograms?: ts.Program[],
-): LintResult {
-  const Linter = projectTslint.Linter;
-  const Configuration = projectTslint.Configuration;
-
-  const files = getFilesToLint(systemRoot, options, Linter, program);
-  const lintOptions = {
-    fix: options.fix,
-    formatter: options.format,
-  };
-
-  const linter = new Linter(lintOptions, program);
-
-  let lastDirectory;
-  let configLoad;
-  const lintedFiles: string[] = [];
-  for (const file of files) {
-    let contents = '';
-    if (program && allPrograms) {
-      if (!program.getSourceFile(file)) {
-        if (!allPrograms.some(p => p.getSourceFile(file) !== undefined)) {
-          // File is not part of any typescript program
-          throw new Error(
-            `File '${file}' is not part of a TypeScript project '${options.tsConfig}'.`);
-        }
-
-        // if the Source file exists but it's not in the current program skip
-        continue;
-      }
-    } else {
-      contents = getFileContents(file);
-    }
-
-    // Only check for a new tslint config if the path changes.
-    const currentDirectory = path.dirname(file);
-    if (currentDirectory !== lastDirectory) {
-      configLoad = Configuration.findConfiguration(tslintConfigPath, file);
-      lastDirectory = currentDirectory;
-    }
-
-    if (configLoad) {
-      linter.lint(file, contents, configLoad.results);
-      lintedFiles.push(file);
-    }
-  }
-
-  return {
-    ...linter.getResult(),
-    fileNames: lintedFiles,
-  };
-}
-
-function getFilesToLint(
-  root: string,
-  options: TslintBuilderOptions,
-  linter: typeof tslint.Linter,
-  program?: ts.Program,
-): string[] {
-  const ignore = options.exclude;
-
-  if (options.files.length > 0) {
-    return options.files
-      .map(file => glob.sync(file, { cwd: root, ignore, nodir: true }))
-      .reduce((prev, curr) => prev.concat(curr), [])
-      .map(file => path.join(root, file));
-  }
-
-  if (!program) {
-    return [];
-  }
-
-  let programFiles = linter.getFileNames(program);
-
-  if (ignore && ignore.length > 0) {
-    // normalize to support ./ paths
-    const ignoreMatchers = ignore
-      .map(pattern => new Minimatch(path.normalize(pattern), { dot: true }));
-
-    programFiles = programFiles
-      .filter(file => !ignoreMatchers.some(matcher => matcher.match(path.relative(root, file))));
-  }
-
-  return programFiles;
-}
-
-function getFileContents(file: string): string {
-  // NOTE: The tslint CLI checks for and excludes MPEG transport streams; this does not.
-  try {
-    return stripBom(readFileSync(file, 'utf-8'));
-  } catch {
-    throw new Error(`Could not read file '${file}'.`);
-  }
-}
diff --git a/packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts b/packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts
deleted file mode 100644
index 8f677cf751a1..000000000000
--- a/packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts
+++ /dev/null
@@ -1,259 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { DefaultTimeout, TestLogger, runTargetSpec } from '@angular-devkit/architect/testing';
-import { normalize, virtualFs } from '@angular-devkit/core';
-import { EMPTY } from 'rxjs';
-import { catchError, tap } from 'rxjs/operators';
-import { TslintBuilderOptions } from '../../src';
-import { host, tslintTargetSpec } from '../utils';
-
-// tslint:disable-next-line:no-big-function
-describe('Tslint Target', () => {
-  const filesWithErrors = { 'src/foo.ts': 'const foo = "";\n' };
-
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
-
-  it('works', (done) => {
-    runTargetSpec(host, tslintTargetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
-
-  it(`should show project name when formatter is human readable`, (done) => {
-    const logger = new TestLogger('lint-info');
-
-    runTargetSpec(host, tslintTargetSpec, undefined, undefined, logger).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        expect(logger.includes('Linting "app"...')).toBe(true);
-      }),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
-
-  it(`should not show project name when formatter is non human readable`, (done) => {
-    const logger = new TestLogger('lint-info');
-
-    runTargetSpec(host, tslintTargetSpec, { format: 'checkstyle' }, undefined, logger).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        expect(logger.includes('Linting "app"...')).toBe(false);
-        expect(logger.includes('<checkstyle')).toBe(true);
-      }),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
-
-  it('should report lint error once', (done) => {
-    host.writeMultipleFiles({'src/app/app.component.ts': 'const foo = "";\n' });
-    const logger = new TestLogger('lint-error');
-
-    runTargetSpec(host, tslintTargetSpec, undefined, DefaultTimeout, logger).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(false)),
-      tap(() => {
-        // this is to make sure there are no duplicates
-        expect(logger.includes(`" should be \'\nERROR`)).toBe(false);
-
-        expect(logger.includes(`" should be '`)).toBe(true);
-        expect(logger.includes(`Lint errors found in the listed files`)).toBe(true);
-      }),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
-
-  it('supports exclude with glob', (done) => {
-    host.writeMultipleFiles(filesWithErrors);
-    const overrides: Partial<TslintBuilderOptions> = { exclude: ['**/foo.ts'] };
-
-    runTargetSpec(host, tslintTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
-
-  it('supports exclude with relative paths', (done) => {
-    host.writeMultipleFiles(filesWithErrors);
-    const overrides: Partial<TslintBuilderOptions> = { exclude: ['src/foo.ts'] };
-
-    runTargetSpec(host, tslintTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
-
-  it(`supports exclude with paths starting with './'`, (done) => {
-    host.writeMultipleFiles(filesWithErrors);
-    const overrides: Partial<TslintBuilderOptions> = { exclude: ['./src/foo.ts'] };
-
-    runTargetSpec(host, tslintTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
-
-  it('supports fix', (done) => {
-    host.writeMultipleFiles(filesWithErrors);
-    const overrides: Partial<TslintBuilderOptions> = { fix: true };
-
-    runTargetSpec(host, tslintTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const fileName = normalize('src/foo.ts');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(fileName));
-        expect(content).toContain(`const foo = '';`);
-      }),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
-
-  it('supports force', (done) => {
-    host.writeMultipleFiles(filesWithErrors);
-    const logger = new TestLogger('lint-force');
-    const overrides: Partial<TslintBuilderOptions> = { force: true };
-
-    runTargetSpec(host, tslintTargetSpec, overrides, DefaultTimeout, logger).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        expect(logger.includes(`" should be '`)).toBe(true);
-        expect(logger.includes(`Lint errors found in the listed files`)).toBe(true);
-      }),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
-
-  it('supports format', (done) => {
-    host.writeMultipleFiles(filesWithErrors);
-    const logger = new TestLogger('lint-format');
-    const overrides: Partial<TslintBuilderOptions> = { format: 'stylish' };
-
-    runTargetSpec(host, tslintTargetSpec, overrides, DefaultTimeout, logger).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(false)),
-      tap(() => {
-        expect(logger.includes(`quotemark`)).toBe(true);
-      }),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
-
-  it('supports finding configs', (done) => {
-    host.writeMultipleFiles({
-      'src/app/foo/foo.ts': `const foo = '';\n`,
-      'src/app/foo/tslint.json': `
-        {
-          "rules": {
-            "quotemark": [
-              true,
-              "double"
-            ]
-          }
-        }
-      `,
-    });
-    const overrides: Partial<TslintBuilderOptions> = { tslintConfig: undefined };
-
-    runTargetSpec(host, tslintTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(false)),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
-
-  it('supports overriding configs', (done) => {
-    host.writeMultipleFiles({
-      'src/app/foo/foo.ts': `const foo = '';\n`,
-      'src/app/foo/tslint.json': `
-        {
-          "rules": {
-            "quotemark": [
-              true,
-              "double"
-            ]
-          }
-        }
-      `,
-    });
-    const overrides: Partial<TslintBuilderOptions> = { tslintConfig: 'tslint.json' };
-
-    runTargetSpec(host, tslintTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
-
-  it('supports using files with no project', (done) => {
-    const overrides: Partial<TslintBuilderOptions> = {
-      tsConfig: undefined,
-      files: ['src/app/**/*.ts'],
-    };
-
-    runTargetSpec(host, tslintTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
-
-  it('supports using one project as a string', (done) => {
-    const overrides: Partial<TslintBuilderOptions> = {
-      tsConfig: 'src/tsconfig.app.json',
-    };
-
-    runTargetSpec(host, tslintTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
-
-  it('supports using one project as an array', (done) => {
-    const overrides: Partial<TslintBuilderOptions> = {
-      tsConfig: ['src/tsconfig.app.json'],
-    };
-
-    runTargetSpec(host, tslintTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
-
-  it('supports using two projects', (done) => {
-    const overrides: Partial<TslintBuilderOptions> = {
-      tsConfig: ['src/tsconfig.app.json', 'src/tsconfig.spec.json'],
-    };
-
-    runTargetSpec(host, tslintTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
-
-  it('works when a file is only part of one project when using two program', (done) => {
-    const overrides: Partial<TslintBuilderOptions> = {
-      tsConfig: ['src/tsconfig.app.json', 'src/tsconfig.spec.json'],
-      files: ['src/foo/foo.component.ts'],
-    };
-
-    host.writeMultipleFiles({ 'src/foo/foo.component.ts': `const foo = '';\n` });
-
-    runTargetSpec(host, tslintTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
-
-  it('errors when file is not part of any typescript program', (done) => {
-    const overrides: Partial<TslintBuilderOptions> = {
-      tsConfig: ['src/tsconfig.spec.json'],
-      files: ['src/foo/foo.component.ts'],
-    };
-
-    host.writeMultipleFiles({ 'src/foo/foo.component.ts': `const foo = '';\n` });
-
-    runTargetSpec(host, tslintTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(false)),
-      catchError((err) => {
-        expect(err).toMatch(`foo.component.ts' is not part of a TypeScript project`);
-
-        return EMPTY;
-      }),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
-
-  it('errors when type checking is used without a project', (done) => {
-    const overrides: Partial<TslintBuilderOptions> = {
-      tsConfig: undefined,
-      typeCheck: true,
-    };
-
-    runTargetSpec(host, tslintTargetSpec, overrides)
-      .subscribe(undefined, () => done(), done.fail);
-  }, 30000);
-});

From ba21c855c0c8b778005df01d4851b5a2176edc6f Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 28 Mar 2019 14:10:34 -0400
Subject: [PATCH 1022/1703] refactor(@angular-devkit/build-angular): cleanup
 stable architect API builder file names

---
 .../build_angular/builders.json               | 24 +++++++------------
 .../src/app-shell/{index2.ts => index.ts}     |  4 ++--
 .../src/browser/{index2.ts => index.ts}       |  0
 .../src/dev-server/{index2.ts => index.ts}    |  2 +-
 .../src/extract-i18n/{index2.ts => index.ts}  |  2 +-
 .../src/karma/{index2.ts => index.ts}         |  0
 .../src/protractor/{index2.ts => index.ts}    |  2 +-
 .../src/server/{index2.ts => index.ts}        |  0
 .../src/tslint/{index2.ts => index.ts}        |  0
 .../test/browser/allow-js_spec_large.ts       |  2 +-
 .../test/browser/aot_spec_large.ts            |  2 +-
 .../test/browser/assets_spec_large.ts         |  2 +-
 .../test/browser/base-href_spec_large.ts      |  2 +-
 .../browser/build-optimizer_spec_large.ts     |  2 +-
 .../test/browser/deploy-url_spec_large.ts     |  2 +-
 .../test/browser/i18n_spec_large.ts           |  2 +-
 .../test/browser/index_spec_large.ts          |  2 +-
 .../test/browser/profile_spec_large.ts        |  2 +-
 .../test/dev-server/deploy-url_spec_large.ts  |  2 +-
 .../test/dev-server/proxy_spec_large.ts       |  2 +-
 .../test/dev-server/public-host_spec_large.ts |  2 +-
 .../test/dev-server/serve-path_spec_large.ts  |  2 +-
 .../test/dev-server/ssl_spec_large.ts         |  2 +-
 .../test/dev-server/works_spec_large.ts       |  2 +-
 .../test/server/base_spec_large.ts            |  2 +-
 ...rks2_spec_large.ts => works_spec_large.ts} |  0
 .../build_angular/test/utils.ts               |  2 +-
 27 files changed, 30 insertions(+), 38 deletions(-)
 rename packages/angular_devkit/build_angular/src/app-shell/{index2.ts => index.ts} (97%)
 rename packages/angular_devkit/build_angular/src/browser/{index2.ts => index.ts} (100%)
 rename packages/angular_devkit/build_angular/src/dev-server/{index2.ts => index.ts} (99%)
 rename packages/angular_devkit/build_angular/src/extract-i18n/{index2.ts => index.ts} (96%)
 rename packages/angular_devkit/build_angular/src/karma/{index2.ts => index.ts} (100%)
 rename packages/angular_devkit/build_angular/src/protractor/{index2.ts => index.ts} (99%)
 rename packages/angular_devkit/build_angular/src/server/{index2.ts => index.ts} (100%)
 rename packages/angular_devkit/build_angular/src/tslint/{index2.ts => index.ts} (100%)
 rename packages/angular_devkit/build_angular/test/tslint/{works2_spec_large.ts => works_spec_large.ts} (100%)

diff --git a/packages/angular_devkit/build_angular/builders.json b/packages/angular_devkit/build_angular/builders.json
index 7cdbbafb365d..a378a2fd2fb2 100644
--- a/packages/angular_devkit/build_angular/builders.json
+++ b/packages/angular_devkit/build_angular/builders.json
@@ -2,50 +2,42 @@
   "$schema": "../architect/src/builders-schema.json",
   "builders": {
     "app-shell": {
-      "class": "./src/app-shell",
-      "implementation": "./src/app-shell/index2",
+      "implementation": "./src/app-shell",
       "schema": "./src/app-shell/schema.json",
       "description": "Build a server app and a browser app, then render the index.html and use it for the browser output."
     },
     "browser": {
-      "implementation": "./src/browser/index2",
-      "class": "./src/browser",
+      "implementation": "./src/browser",
       "schema": "./src/browser/schema.json",
       "description": "Build a browser app."
     },
     "dev-server": {
-      "class": "./src/dev-server",
-      "implementation": "./src/dev-server/index2",
+      "implementation": "./src/dev-server",
       "schema": "./src/dev-server/schema.json",
       "description": "Serve a browser app."
     },
     "extract-i18n": {
-      "class": "./src/extract-i18n",
-      "implementation": "./src/extract-i18n/index2",
+      "implementation": "./src/extract-i18n",
       "schema": "./src/extract-i18n/schema.json",
       "description": "Extract i18n strings from a browser app."
     },
     "karma": {
-      "class": "./src/karma",
-      "implementation": "./src/karma/index2",
+      "implementation": "./src/karma",
       "schema": "./src/karma/schema.json",
       "description": "Run Karma unit tests."
     },
     "protractor": {
-      "class": "./src/protractor",
-      "implementation": "./src/protractor/index2",
+      "implementation": "./src/protractor",
       "schema": "./src/protractor/schema.json",
       "description": "Run protractor over a dev server."
     },
     "tslint": {
-      "implementation": "./src/tslint/index2",
-      "class": "./src/tslint",
+      "implementation": "./src/tslint",
       "schema": "./src/tslint/schema.json",
       "description": "Run tslint over a TS project."
     },
     "server": {
-      "implementation": "./src/server/index2",
-      "class": "./src/server",
+      "implementation": "./src/server",
       "schema": "./src/server/schema.json",
       "description": "Build a server Angular application."
     }
diff --git a/packages/angular_devkit/build_angular/src/app-shell/index2.ts b/packages/angular_devkit/build_angular/src/app-shell/index.ts
similarity index 97%
rename from packages/angular_devkit/build_angular/src/app-shell/index2.ts
rename to packages/angular_devkit/build_angular/src/app-shell/index.ts
index b4665e69df6d..8751d9d2ebda 100644
--- a/packages/angular_devkit/build_angular/src/app-shell/index2.ts
+++ b/packages/angular_devkit/build_angular/src/app-shell/index.ts
@@ -17,9 +17,9 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
 import { augmentAppWithServiceWorker } from '../angular-cli-files/utilities/service-worker';
-import { BrowserBuilderOutput } from '../browser/index2';
+import { BrowserBuilderOutput } from '../browser';
 import { Schema as BrowserBuilderSchema } from '../browser/schema';
-import { ServerBuilderOutput } from '../server/index2';
+import { ServerBuilderOutput } from '../server';
 import { Schema as BuildWebpackAppShellSchema } from './schema';
 
 
diff --git a/packages/angular_devkit/build_angular/src/browser/index2.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
similarity index 100%
rename from packages/angular_devkit/build_angular/src/browser/index2.ts
rename to packages/angular_devkit/build_angular/src/browser/index.ts
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index2.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
similarity index 99%
rename from packages/angular_devkit/build_angular/src/dev-server/index2.ts
rename to packages/angular_devkit/build_angular/src/dev-server/index.ts
index a838882f9f8b..aab9fee8fb2d 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index2.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -30,7 +30,7 @@ import {
   BrowserConfigTransformFn,
   buildBrowserWebpackConfigFromContext,
   createBrowserLoggingCallback,
-} from '../browser/index2';
+} from '../browser';
 import { Schema as BrowserBuilderSchema } from '../browser/schema';
 import { normalizeOptimization } from '../utils';
 import { Schema } from './schema';
diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/index2.ts b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
similarity index 96%
rename from packages/angular_devkit/build_angular/src/extract-i18n/index2.ts
rename to packages/angular_devkit/build_angular/src/extract-i18n/index.ts
index ff81e34d8024..3782a64684d7 100644
--- a/packages/angular_devkit/build_angular/src/extract-i18n/index2.ts
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
@@ -46,7 +46,7 @@ class InMemoryOutputPlugin {
   }
 }
 
-export async function execute(options: ExtractI18nBuilderOptions, context: BuilderContext) {
+async function execute(options: ExtractI18nBuilderOptions, context: BuilderContext) {
   const browserTarget = targetFromTargetString(options.browserTarget);
   const browserOptions = await context.validateOptions<JsonObject & BrowserBuilderOptions>(
     await context.getTargetOptions(browserTarget),
diff --git a/packages/angular_devkit/build_angular/src/karma/index2.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
similarity index 100%
rename from packages/angular_devkit/build_angular/src/karma/index2.ts
rename to packages/angular_devkit/build_angular/src/karma/index.ts
diff --git a/packages/angular_devkit/build_angular/src/protractor/index2.ts b/packages/angular_devkit/build_angular/src/protractor/index.ts
similarity index 99%
rename from packages/angular_devkit/build_angular/src/protractor/index2.ts
rename to packages/angular_devkit/build_angular/src/protractor/index.ts
index 55d70dfc7685..72515dcb7e5d 100644
--- a/packages/angular_devkit/build_angular/src/protractor/index2.ts
+++ b/packages/angular_devkit/build_angular/src/protractor/index.ts
@@ -76,7 +76,7 @@ async function updateWebdriver() {
   } as unknown as JSON);
 }
 
-export async function execute(
+async function execute(
   options: ProtractorBuilderOptions,
   context: BuilderContext,
 ): Promise<BuilderOutput> {
diff --git a/packages/angular_devkit/build_angular/src/server/index2.ts b/packages/angular_devkit/build_angular/src/server/index.ts
similarity index 100%
rename from packages/angular_devkit/build_angular/src/server/index2.ts
rename to packages/angular_devkit/build_angular/src/server/index.ts
diff --git a/packages/angular_devkit/build_angular/src/tslint/index2.ts b/packages/angular_devkit/build_angular/src/tslint/index.ts
similarity index 100%
rename from packages/angular_devkit/build_angular/src/tslint/index2.ts
rename to packages/angular_devkit/build_angular/src/tslint/index.ts
diff --git a/packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts
index 58ed2248e4c9..f9b2a71cf104 100644
--- a/packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts
@@ -8,7 +8,7 @@
 import { Architect } from '@angular-devkit/architect/src/index2';
 import { join, normalize, relative, virtualFs } from '@angular-devkit/core';
 import { take, tap } from 'rxjs/operators';
-import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { BrowserBuilderOutput } from '../../src/browser';
 import { createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
index a91d72c1718f..75403f6f7a32 100644
--- a/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
@@ -10,7 +10,7 @@ import { Architect } from '@angular-devkit/architect/src/index2';
 import { runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { tap } from 'rxjs/operators';
-import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { BrowserBuilderOutput } from '../../src/browser';
 import { browserTargetSpec, createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/browser/assets_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/assets_spec_large.ts
index 43192335cc46..b37407024502 100644
--- a/packages/angular_devkit/build_angular/test/browser/assets_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/assets_spec_large.ts
@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect/src/index2';
 import { normalize, virtualFs } from '@angular-devkit/core';
 import { toArray } from 'rxjs/operators';
-import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { BrowserBuilderOutput } from '../../src/browser';
 import { createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/browser/base-href_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/base-href_spec_large.ts
index 59a57a6ae326..37d7dc1570af 100644
--- a/packages/angular_devkit/build_angular/test/browser/base-href_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/base-href_spec_large.ts
@@ -10,7 +10,7 @@ import { Architect } from '@angular-devkit/architect/src/index2';
 import { runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, normalize, tags, virtualFs } from '@angular-devkit/core';
 import { tap } from 'rxjs/operators';
-import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { BrowserBuilderOutput } from '../../src/browser';
 import { browserTargetSpec, createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/browser/build-optimizer_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/build-optimizer_spec_large.ts
index bc70764bfddc..17cce733ec82 100644
--- a/packages/angular_devkit/build_angular/test/browser/build-optimizer_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/build-optimizer_spec_large.ts
@@ -7,7 +7,7 @@
  */
 import { Architect } from '@angular-devkit/architect/src/index2';
 import { join, normalize } from '@angular-devkit/core';
-import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { BrowserBuilderOutput } from '../../src/browser';
 import { browserBuild, createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/browser/deploy-url_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/deploy-url_spec_large.ts
index c985e12f3f21..f06ccdccf570 100644
--- a/packages/angular_devkit/build_angular/test/browser/deploy-url_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/deploy-url_spec_large.ts
@@ -7,7 +7,7 @@
  */
 import { Architect } from '@angular-devkit/architect/src/index2';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { BrowserBuilderOutput } from '../../src/browser';
 import { createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/browser/i18n_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/i18n_spec_large.ts
index fe1d2aeb7306..9dc1c8461d65 100644
--- a/packages/angular_devkit/build_angular/test/browser/i18n_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/i18n_spec_large.ts
@@ -7,7 +7,7 @@
  */
 import { Architect } from '@angular-devkit/architect/src/index2';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { BrowserBuilderOutput } from '../../src/browser';
 import { createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts
index cc5ddd313b90..1ecfc082fc68 100644
--- a/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts
@@ -8,7 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect/src/index2';
 import { join, normalize, tags, virtualFs } from '@angular-devkit/core';
-import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { BrowserBuilderOutput } from '../../src/browser';
 import { createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/browser/profile_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/profile_spec_large.ts
index 61aefc10cd36..6e233f574649 100644
--- a/packages/angular_devkit/build_angular/test/browser/profile_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/profile_spec_large.ts
@@ -7,7 +7,7 @@
  */
 import { Architect } from '@angular-devkit/architect/src/index2';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { BrowserBuilderOutput } from '../../src/browser';
 import { browserBuild, createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/dev-server/deploy-url_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/deploy-url_spec_large.ts
index 05490741bf85..90a6f36469c8 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/deploy-url_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/deploy-url_spec_large.ts
@@ -7,7 +7,7 @@
  */
 import { Architect, BuilderRun } from '@angular-devkit/architect/src/index2';
 import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
-import { DevServerBuilderOutput } from '../../src/dev-server/index2';
+import { DevServerBuilderOutput } from '../../src/dev-server';
 import { createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/dev-server/proxy_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/proxy_spec_large.ts
index 3b7b74e731f9..8835dafedf48 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/proxy_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/proxy_spec_large.ts
@@ -10,7 +10,7 @@ import * as express from 'express'; // tslint:disable-line:no-implicit-dependenc
 import * as http from 'http';
 import { AddressInfo } from 'net';
 import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
-import { DevServerBuilderOutput } from '../../src/dev-server/index2';
+import { DevServerBuilderOutput } from '../../src/dev-server';
 import { Schema as DevServerBuilderOptions } from '../../src/dev-server/schema';
 import { createArchitect, host } from '../utils';
 
diff --git a/packages/angular_devkit/build_angular/test/dev-server/public-host_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/public-host_spec_large.ts
index 342b488e1c55..0065d1d18f6d 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/public-host_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/public-host_spec_large.ts
@@ -7,7 +7,7 @@
  */
 import { Architect, BuilderRun } from '@angular-devkit/architect/src/index2';
 import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
-import { DevServerBuilderOutput } from '../../src/dev-server/index2';
+import { DevServerBuilderOutput } from '../../src/dev-server';
 import { createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts
index 0fd8c3998d24..8c8a57490916 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts
@@ -7,7 +7,7 @@
  */
 import { Architect, BuilderRun } from '@angular-devkit/architect/src/index2';
 import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
-import { DevServerBuilderOutput } from '../../src/dev-server/index2';
+import { DevServerBuilderOutput } from '../../src/dev-server';
 import { createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/dev-server/ssl_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/ssl_spec_large.ts
index 317c1d5a6872..951508730276 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/ssl_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/ssl_spec_large.ts
@@ -9,7 +9,7 @@ import { Architect, BuilderRun } from '@angular-devkit/architect/src/index2';
 import { tags } from '@angular-devkit/core';
 import * as https from 'https';
 import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
-import { DevServerBuilderOutput } from '../../src/dev-server/index2';
+import { DevServerBuilderOutput } from '../../src/dev-server';
 import { createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts
index bc8019d5cb03..8c3a98baa65e 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts
@@ -8,7 +8,7 @@
 import { Architect, BuilderRun } from '@angular-devkit/architect/src/index2';
 import { logging } from '@angular-devkit/core';
 import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
-import { DevServerBuilderOutput } from '../../src/dev-server/index2';
+import { DevServerBuilderOutput } from '../../src/dev-server';
 import { createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/server/base_spec_large.ts b/packages/angular_devkit/build_angular/test/server/base_spec_large.ts
index cc2981a65c06..a99441341ce4 100644
--- a/packages/angular_devkit/build_angular/test/server/base_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/server/base_spec_large.ts
@@ -9,7 +9,7 @@
 import { Architect } from '@angular-devkit/architect/src/index2';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { take, tap } from 'rxjs/operators';
-import { BrowserBuilderOutput } from '../../src/browser/index2';
+import { BrowserBuilderOutput } from '../../src/browser';
 import { Schema as BuildWebpackServerSchema } from '../../src/server/schema';
 import { createArchitect, host } from '../utils';
 
diff --git a/packages/angular_devkit/build_angular/test/tslint/works2_spec_large.ts b/packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts
similarity index 100%
rename from packages/angular_devkit/build_angular/test/tslint/works2_spec_large.ts
rename to packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts
diff --git a/packages/angular_devkit/build_angular/test/utils.ts b/packages/angular_devkit/build_angular/test/utils.ts
index 5347b13109a7..4b785678a5f3 100644
--- a/packages/angular_devkit/build_angular/test/utils.ts
+++ b/packages/angular_devkit/build_angular/test/utils.ts
@@ -25,7 +25,7 @@ import {
 } from '@angular-devkit/core';
 import { WorkspaceNodeModulesArchitectHost } from '../../architect/node';
 import { TestingArchitectHost } from '../../architect/testing/testing-architect-host';
-import { BrowserBuilderOutput } from '../src/browser/index2';
+import { BrowserBuilderOutput } from '../src/browser';
 
 
 const devkitRoot = normalize((global as any)._DevKitRoot); // tslint:disable-line:no-any

From 7e9297b64df83639dfc54f85fdd4aadee8d94c5e Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 27 Mar 2019 19:26:48 -0400
Subject: [PATCH 1023/1703] refactor(@angular-devkit/build-ng-packagr): cleanup
 experimental architect API

---
 .../build_ng_packagr/builders.json            |   3 +-
 .../build_ng_packagr/package.json             |   2 +-
 .../build_ng_packagr/src/build/index.ts       | 105 ++++++------------
 .../build_ng_packagr/src/build/index2.ts      |  44 --------
 .../src/build/index_spec_large.ts             |   8 +-
 5 files changed, 42 insertions(+), 120 deletions(-)
 delete mode 100644 packages/angular_devkit/build_ng_packagr/src/build/index2.ts

diff --git a/packages/angular_devkit/build_ng_packagr/builders.json b/packages/angular_devkit/build_ng_packagr/builders.json
index 9715dcfd7fd8..3a699cdb2114 100644
--- a/packages/angular_devkit/build_ng_packagr/builders.json
+++ b/packages/angular_devkit/build_ng_packagr/builders.json
@@ -2,8 +2,7 @@
   "$schema": "../architect/src/builders-schema.json",
   "builders": {
     "build": {
-      "class": "./src/build",
-      "implementation": "./src/build/index2",
+      "implementation": "./src/build",
       "schema": "./src/build/schema.json",
       "description": "Build a library with ng-packagr."
     }
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index 92055a37c650..3caa23384565 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -8,7 +8,6 @@
   "builders": "builders.json",
   "dependencies": {
     "@angular-devkit/architect": "0.0.0",
-    "@angular-devkit/core": "0.0.0",
     "rxjs": "6.4.0"
   },
   "peerDependencies": {
@@ -17,6 +16,7 @@
   "devDependencies": {
     "@angular/compiler": "^8.0.0-beta.9",
     "@angular/compiler-cli": "^8.0.0-beta.9",
+    "@angular-devkit/core": "0.0.0",
     "ng-packagr": "^5.0.1",
     "tslib": "^1.9.0"
   }
diff --git a/packages/angular_devkit/build_ng_packagr/src/build/index.ts b/packages/angular_devkit/build_ng_packagr/src/build/index.ts
index dfc258d48199..3c1d67bd9285 100644
--- a/packages/angular_devkit/build_ng_packagr/src/build/index.ts
+++ b/packages/angular_devkit/build_ng_packagr/src/build/index.ts
@@ -5,80 +5,41 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect/src/index2';
+import { resolve } from 'path';
+import { Observable, from } from 'rxjs';
+import { catchError, mapTo, switchMap } from 'rxjs/operators';
+import { Schema as NgPackagrBuilderOptions } from './schema';
+
+async function initialize(
+  options: NgPackagrBuilderOptions,
+  root: string,
+): Promise<import ('ng-packagr').NgPackagr> {
+  const packager = (await import('ng-packagr')).ngPackagr();
+
+  packager.forProject(resolve(root, options.project));
+
+  if (options.tsConfig) {
+    packager.withTsConfig(resolve(root, options.tsConfig));
+  }
 
-import {
-  BuildEvent,
-  Builder,
-  BuilderConfiguration,
-  BuilderContext,
-} from '@angular-devkit/architect';
-import { getSystemPath, normalize, resolve, tags } from '@angular-devkit/core';
-import * as fs from 'fs';
-import * as ngPackagr from 'ng-packagr';
-import { EMPTY, Observable } from 'rxjs';
-import { catchError, tap } from 'rxjs/operators';
-
-// TODO move this function to architect or somewhere else where it can be imported from.
-// Blatantly copy-pasted from 'require-project-module.ts'.
-function requireProjectModule(root: string, moduleName: string) {
-  return require(require.resolve(moduleName, { paths: [root] }));
-}
-
-export interface NgPackagrBuilderOptions {
-  project: string;
-  tsConfig?: string;
-  watch?: boolean;
+  return packager;
 }
-export class NgPackagrBuilder implements Builder<NgPackagrBuilderOptions> {
-
-  constructor(public context: BuilderContext) { }
-
-  run(builderConfig: BuilderConfiguration<NgPackagrBuilderOptions>): Observable<BuildEvent> {
-    const root = this.context.workspace.root;
-    const options = builderConfig.options;
-
-    if (!options.project) {
-      throw new Error('A "project" must be specified to build a library\'s npm package.');
-    }
-
-    return new Observable(obs => {
-      const projectNgPackagr = requireProjectModule(
-        getSystemPath(root), 'ng-packagr') as typeof ngPackagr;
-      const packageJsonPath = getSystemPath(resolve(root, normalize(options.project)));
-
-      const ngPkgProject = projectNgPackagr.ngPackagr()
-        .forProject(packageJsonPath);
-
-      if (options.tsConfig) {
-        const tsConfigPath = getSystemPath(resolve(root, normalize(options.tsConfig)));
-        ngPkgProject.withTsConfig(tsConfigPath);
-      }
-
-      if (options.watch) {
-        const ngPkgSubscription = ngPkgProject
-          .watch()
-          .pipe(
-            tap(() => obs.next({ success: true })),
-            catchError(e => {
-              obs.error(e);
-
-              return EMPTY;
-            }),
-          )
-          .subscribe();
-
-        return () => ngPkgSubscription.unsubscribe();
-      } else {
-        ngPkgProject.build()
-          .then(() => {
-            obs.next({ success: true });
-            obs.complete();
-          })
-          .catch(e => obs.error(e));
-      }
-    });
-  }
 
+export function execute(
+  options: NgPackagrBuilderOptions,
+  context: BuilderContext,
+): Observable<BuilderOutput> {
+  return from(initialize(options, context.workspaceRoot)).pipe(
+    switchMap(packager => options.watch ? packager.watch() : packager.build()),
+    mapTo({ success: true }),
+    catchError(error => {
+      context.reportStatus('Error: ' + error);
+
+      return [{ success: false }];
+    }),
+  );
 }
 
-export default NgPackagrBuilder;
+export { NgPackagrBuilderOptions };
+export default createBuilder<Record<string, string> & NgPackagrBuilderOptions>(execute);
diff --git a/packages/angular_devkit/build_ng_packagr/src/build/index2.ts b/packages/angular_devkit/build_ng_packagr/src/build/index2.ts
deleted file mode 100644
index 7439c75eebe5..000000000000
--- a/packages/angular_devkit/build_ng_packagr/src/build/index2.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect/src/index2';
-import { resolve } from 'path';
-import { Observable, from } from 'rxjs';
-import { catchError, mapTo, switchMap } from 'rxjs/operators';
-import { Schema as NgPackagrBuilderOptions } from './schema';
-
-async function initialize(
-  options: NgPackagrBuilderOptions,
-  root: string,
-): Promise<import ('ng-packagr').NgPackagr> {
-  const packager = (await import('ng-packagr')).ngPackagr();
-
-  packager.forProject(resolve(root, options.project));
-
-  if (options.tsConfig) {
-    packager.withTsConfig(resolve(root, options.tsConfig));
-  }
-
-  return packager;
-}
-
-export function buildLibrary(
-  options: NgPackagrBuilderOptions,
-  context: BuilderContext,
-): Observable<BuilderOutput> {
-  return from(initialize(options, context.workspaceRoot)).pipe(
-    switchMap(packager => options.watch ? packager.watch() : packager.build()),
-    mapTo({ success: true }),
-    catchError(error => {
-      context.reportStatus('Error: ' + error);
-
-      return [{ success: false }];
-    }),
-  );
-}
-
-export default createBuilder<Record<string, string> & NgPackagrBuilderOptions>(buildLibrary);
diff --git a/packages/angular_devkit/build_ng_packagr/src/build/index_spec_large.ts b/packages/angular_devkit/build_ng_packagr/src/build/index_spec_large.ts
index 2722a2825675..6550ec5c807d 100644
--- a/packages/angular_devkit/build_ng_packagr/src/build/index_spec_large.ts
+++ b/packages/angular_devkit/build_ng_packagr/src/build/index_spec_large.ts
@@ -9,7 +9,13 @@ import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/nod
 import { Architect } from '@angular-devkit/architect/src/index2';
 import { TestProjectHost } from '@angular-devkit/architect/testing';
 import { TestingArchitectHost } from '@angular-devkit/architect/testing/testing-architect-host';
-import { experimental, join, normalize, schema, virtualFs } from '@angular-devkit/core';
+import {
+  experimental,
+  join,
+  normalize,
+  schema,
+  virtualFs,
+} from '@angular-devkit/core'; // tslint:disable-line:no-implicit-dependencies
 import { map, take, tap } from 'rxjs/operators';
 
 const devkitRoot = (global as unknown as { _DevKitRoot: string})._DevKitRoot;

From b54a9379a60a16f4799aabdc53ba882a4f5ef90b Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 28 Feb 2019 13:58:23 +0000
Subject: [PATCH 1024/1703] feat(@ngtools/webpack): add option to control lazy
 route discovery

---
 .../webpack/src/angular_compiler_plugin.ts    | 180 ++++++++++--------
 1 file changed, 105 insertions(+), 75 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index e42eccdd6c83..6f4c4fb470e3 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -103,6 +103,11 @@ export interface AngularCompilerPluginOptions {
   nameLazyFiles?: boolean;
   logger?: logging.Logger;
   directTemplateLoading?: boolean;
+  // When using the loadChildren string syntax, @ngtools/webpack must query @angular/compiler-cli
+  // via a private API to know which lazy routes exist. This increases build and rebuild time.
+  // When using Ivy, the string syntax is not supported at all. Thus we shouldn't attempt that.
+  // This option is also used for when the compilation doesn't need this sort of processing at all.
+  discoverLazyRoutes?: boolean;
 
   // added to the list of lazy routes
   additionalLazyModules?: { [module: string]: string };
@@ -134,6 +139,7 @@ export class AngularCompilerPlugin {
   private _compilerHost: WebpackCompilerHost & CompilerHost;
   private _moduleResolutionCache: ts.ModuleResolutionCache;
   private _resourceLoader?: WebpackResourceLoader;
+  private _discoverLazyRoutes = true;
   // Contains `moduleImportPath#exportName` => `fullModulePath`.
   private _lazyRoutes: LazyRouteMap = {};
   private _tsConfigPath: string;
@@ -292,6 +298,26 @@ export class AngularCompilerPlugin {
       this._platformTransformers = options.platformTransformers;
     }
 
+    if (options.discoverLazyRoutes !== undefined) {
+      this._discoverLazyRoutes = options.discoverLazyRoutes;
+    }
+
+    if (this._discoverLazyRoutes === false && this.options.additionalLazyModuleResources
+      && this.options.additionalLazyModuleResources.length > 0) {
+      this._warnings.push(
+        new Error(`Lazy route discovery is disabled but additional Lazy Module Resources were`
+          + ` provided. These will be ignored.`),
+      );
+    }
+
+    if (this._discoverLazyRoutes === false && this.options.additionalLazyModules
+      && Object.keys(this.options.additionalLazyModules).length > 0) {
+      this._warnings.push(
+        new Error(`Lazy route discovery is disabled but additional lazy modules were provided.`
+          + `These will be ignored.`),
+      );
+    }
+
     // Default ContextElementDependency to the one we can import from here.
     // Failing to use the right ContextElementDependency will throw the error below:
     // "No module factory available for dependency type: ContextElementDependency"
@@ -411,7 +437,7 @@ export class AngularCompilerPlugin {
       this._entryModule = resolveEntryModuleFromMain(
         this._mainPath, this._compilerHost, this._getTsProgram() as ts.Program);
 
-      if (!this.entryModule && !this._compilerOptions.enableIvy) {
+      if (this._discoverLazyRoutes && !this.entryModule && !this._compilerOptions.enableIvy) {
         this._warnings.push('Lazy routes discovery is not enabled. '
           + 'Because there is neither an entryModule nor a '
           + 'statically analyzable bootstrap code in the main file.',
@@ -697,64 +723,66 @@ export class AngularCompilerPlugin {
       );
     });
 
-    // Add lazy modules to the context module for @angular/core
-    compiler.hooks.contextModuleFactory.tap('angular-compiler', cmf => {
-      const angularCorePackagePath = require.resolve('@angular/core/package.json');
-
-      // APFv6 does not have single FESM anymore. Instead of verifying if we're pointing to
-      // FESMs, we resolve the `@angular/core` path and verify that the path for the
-      // module starts with it.
-      // This may be slower but it will be compatible with both APF5, 6 and potential future
-      // versions (until the dynamic import appears outside of core I suppose).
-      // We resolve any symbolic links in order to get the real path that would be used in webpack.
-      const angularCoreResourceRoot = fs.realpathSync(path.dirname(angularCorePackagePath));
-
-      cmf.hooks.afterResolve.tapPromise('angular-compiler', async result => {
-        // Alter only existing request from Angular or one of the additional lazy module resources.
-        const isLazyModuleResource = (resource: string) =>
-          resource.startsWith(angularCoreResourceRoot) ||
-          ( this.options.additionalLazyModuleResources &&
-            this.options.additionalLazyModuleResources.includes(resource));
-
-        if (!result || !this.done || !isLazyModuleResource(result.resource)) {
-          return result;
-        }
-
-        return this.done.then(
-          () => {
-            // This folder does not exist, but we need to give webpack a resource.
-            // TODO: check if we can't just leave it as is (angularCoreModuleDir).
-            result.resource = path.join(this._basePath, '$$_lazy_route_resource');
-            // tslint:disable-next-line:no-any
-            result.dependencies.forEach((d: any) => d.critical = false);
-            // tslint:disable-next-line:no-any
-            result.resolveDependencies = (_fs: any, options: any, callback: Callback) => {
-              const dependencies = Object.keys(this._lazyRoutes)
-                .map((key) => {
-                  const modulePath = this._lazyRoutes[key];
-                  if (modulePath !== null) {
-                    const name = key.split('#')[0];
-
-                    return new this._contextElementDependencyConstructor(modulePath, name);
-                  } else {
-                    return null;
-                  }
-                })
-                .filter(x => !!x);
-
-              if (this._options.nameLazyFiles) {
-                options.chunkName = '[request]';
-              }
-
-              callback(null, dependencies);
-            };
-
+    if (this._discoverLazyRoutes) {
+      // Add lazy modules to the context module for @angular/core
+      compiler.hooks.contextModuleFactory.tap('angular-compiler', cmf => {
+        const angularCorePackagePath = require.resolve('@angular/core/package.json');
+
+        // APFv6 does not have single FESM anymore. Instead of verifying if we're pointing to
+        // FESMs, we resolve the `@angular/core` path and verify that the path for the
+        // module starts with it.
+        // This may be slower but it will be compatible with both APF5, 6 and potential future
+        // versions (until the dynamic import appears outside of core I suppose).
+        // We resolve symbolic links in order to get the real path that would be used in webpack.
+        const angularCoreResourceRoot = fs.realpathSync(path.dirname(angularCorePackagePath));
+
+        cmf.hooks.afterResolve.tapPromise('angular-compiler', async result => {
+          // Alter only existing request from Angular or the additional lazy module resources.
+          const isLazyModuleResource = (resource: string) =>
+            resource.startsWith(angularCoreResourceRoot) ||
+            (this.options.additionalLazyModuleResources &&
+              this.options.additionalLazyModuleResources.includes(resource));
+
+          if (!result || !this.done || !isLazyModuleResource(result.resource)) {
             return result;
-          },
-          () => undefined,
-        );
+          }
+
+          return this.done.then(
+            () => {
+              // This folder does not exist, but we need to give webpack a resource.
+              // TODO: check if we can't just leave it as is (angularCoreModuleDir).
+              result.resource = path.join(this._basePath, '$$_lazy_route_resource');
+              // tslint:disable-next-line:no-any
+              result.dependencies.forEach((d: any) => d.critical = false);
+              // tslint:disable-next-line:no-any
+              result.resolveDependencies = (_fs: any, options: any, callback: Callback) => {
+                const dependencies = Object.keys(this._lazyRoutes)
+                  .map((key) => {
+                    const modulePath = this._lazyRoutes[key];
+                    if (modulePath !== null) {
+                      const name = key.split('#')[0];
+
+                      return new this._contextElementDependencyConstructor(modulePath, name);
+                    } else {
+                      return null;
+                    }
+                  })
+                  .filter(x => !!x);
+
+                if (this._options.nameLazyFiles) {
+                  options.chunkName = '[request]';
+                }
+
+                callback(null, dependencies);
+              };
+
+              return result;
+            },
+            () => undefined,
+          );
+        });
       });
-    });
+    }
 
     // Create and destroy forked type checker on watch mode.
     compiler.hooks.watchRun.tap('angular-compiler', () => {
@@ -922,27 +950,29 @@ export class AngularCompilerPlugin {
     // Make a new program and load the Angular structure.
     await this._createOrUpdateProgram();
 
-    // Try to find lazy routes if we have an entry module.
-    // We need to run the `listLazyRoutes` the first time because it also navigates libraries
-    // and other things that we might miss using the (faster) findLazyRoutesInAst.
-    // Lazy routes modules will be read with compilerHost and added to the changed files.
-    let lazyRouteMap: LazyRouteMap = {};
-    if (!this._JitMode || this._firstRun) {
-      lazyRouteMap = this._listLazyRoutesFromProgram();
-    } else {
-      const changedTsFiles = this._getChangedTsFiles();
-      if (changedTsFiles.length > 0) {
-        lazyRouteMap = this._findLazyRoutesInAst(changedTsFiles);
+    if (this._discoverLazyRoutes) {
+      // Try to find lazy routes if we have an entry module.
+      // We need to run the `listLazyRoutes` the first time because it also navigates libraries
+      // and other things that we might miss using the (faster) findLazyRoutesInAst.
+      // Lazy routes modules will be read with compilerHost and added to the changed files.
+      let lazyRouteMap: LazyRouteMap = {};
+      if (!this._JitMode || this._firstRun) {
+        lazyRouteMap = this._listLazyRoutesFromProgram();
+      } else {
+        const changedTsFiles = this._getChangedTsFiles();
+        if (changedTsFiles.length > 0) {
+          lazyRouteMap = this._findLazyRoutesInAst(changedTsFiles);
+        }
       }
-    }
 
-    // Find lazy routes
-    lazyRouteMap = {
-      ...lazyRouteMap,
-      ...this._options.additionalLazyModules,
-    };
+      // Find lazy routes
+      lazyRouteMap = {
+        ...lazyRouteMap,
+        ...this._options.additionalLazyModules,
+      };
 
-    this._processLazyRoutes(lazyRouteMap);
+      this._processLazyRoutes(lazyRouteMap);
+    }
 
     // Emit files.
     time('AngularCompilerPlugin._update._emit');

From bc7da5d076afdd429f2cb11b65bb2b3078b6ed95 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 19 Mar 2019 15:08:34 +0000
Subject: [PATCH 1025/1703] feat(@ngtools/webpack): support import syntax for
 loadChildren with ViewEngine

This feature ONLY matches the format below:
```
loadChildren: () => import('IMPORT_STRING').then(m => m.EXPORT_NAME)
```

It will not match nor alter variations, for instance:
- not using arrow functions
- not using `m` as the module argument
- using `await` instead of `then`
- using a default export (https://github.com/angular/angular/issues/11402)

The only parts that can change are the ones in caps: IMPORT_STRING and EXPORT_NAME.
---
 .../models/webpack-configs/common.ts          |  16 +-
 .../webpack/src/angular_compiler_plugin.ts    |  19 +-
 .../src/transformers/import_factory.ts        | 198 ++++++++++++++++++
 .../src/transformers/import_factory_spec.ts   |  55 +++++
 .../ngtools/webpack/src/transformers/index.ts |   1 +
 5 files changed, 286 insertions(+), 3 deletions(-)
 create mode 100644 packages/ngtools/webpack/src/transformers/import_factory.ts
 create mode 100644 packages/ngtools/webpack/src/transformers/import_factory_spec.ts

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 1cf394e0cb25..a9c03738a641 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -8,7 +8,13 @@
 import { tags } from '@angular-devkit/core';
 import * as CopyWebpackPlugin from 'copy-webpack-plugin';
 import * as path from 'path';
-import { Configuration, HashedModuleIdsPlugin, Output, debug } from 'webpack';
+import {
+  Configuration,
+  ContextReplacementPlugin,
+  HashedModuleIdsPlugin,
+  Output,
+  debug,
+} from 'webpack';
 import { AssetPatternClass } from '../../../browser/schema';
 import { BundleBudgetPlugin } from '../../plugins/bundle-budget';
 import { CleanCssWebpackPlugin } from '../../plugins/cleancss-webpack-plugin';
@@ -345,6 +351,12 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
         ...extraMinimizers,
       ],
     },
-    plugins: extraPlugins,
+    plugins: [
+      // Always replace the context for the System.import in angular/core to prevent warnings.
+      // https://github.com/angular/angular/issues/11580
+      // With VE the correct context is added in @ngtools/webpack, but Ivy doesn't need it at all.
+      new ContextReplacementPlugin(/\@angular(\\|\/)core(\\|\/)/),
+      ...extraPlugins,
+    ],
   };
 }
diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 6f4c4fb470e3..5f079af2abad 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -46,6 +46,7 @@ import {
   exportLazyModuleMap,
   exportNgFactory,
   findResources,
+  importFactory,
   registerLocaleData,
   removeDecorators,
   replaceBootstrap,
@@ -108,6 +109,7 @@ export interface AngularCompilerPluginOptions {
   // When using Ivy, the string syntax is not supported at all. Thus we shouldn't attempt that.
   // This option is also used for when the compilation doesn't need this sort of processing at all.
   discoverLazyRoutes?: boolean;
+  importFactories?: boolean;
 
   // added to the list of lazy routes
   additionalLazyModules?: { [module: string]: string };
@@ -140,6 +142,7 @@ export class AngularCompilerPlugin {
   private _moduleResolutionCache: ts.ModuleResolutionCache;
   private _resourceLoader?: WebpackResourceLoader;
   private _discoverLazyRoutes = true;
+  private _importFactories = false;
   // Contains `moduleImportPath#exportName` => `fullModulePath`.
   private _lazyRoutes: LazyRouteMap = {};
   private _tsConfigPath: string;
@@ -298,7 +301,12 @@ export class AngularCompilerPlugin {
       this._platformTransformers = options.platformTransformers;
     }
 
-    if (options.discoverLazyRoutes !== undefined) {
+    // Determine if lazy route discovery via Compiler CLI private API should be attempted.
+    if (this._compilerOptions.enableIvy) {
+      // Never try to discover lazy routes with Ivy.
+      this._discoverLazyRoutes = false;
+    } else if (options.discoverLazyRoutes !== undefined) {
+      // The default is to discover routes, but it can be overriden.
       this._discoverLazyRoutes = options.discoverLazyRoutes;
     }
 
@@ -318,6 +326,11 @@ export class AngularCompilerPlugin {
       );
     }
 
+    if (!this._compilerOptions.enableIvy && options.importFactories === true) {
+      // Only transform imports to use factories with View Engine.
+      this._importFactories = true;
+    }
+
     // Default ContextElementDependency to the one we can import from here.
     // Failing to use the right ContextElementDependency will throw the error below:
     // "No module factory available for dependency type: ContextElementDependency"
@@ -896,6 +909,10 @@ export class AngularCompilerPlugin {
     } else {
       // Remove unneeded angular decorators.
       this._transformers.push(removeDecorators(isAppPath, getTypeChecker));
+      // Import ngfactory in loadChildren import syntax
+      if (this._importFactories) {
+        this._transformers.push(importFactory(msg => this._warnings.push(msg)));
+      }
     }
 
     if (this._platformTransformers !== null) {
diff --git a/packages/ngtools/webpack/src/transformers/import_factory.ts b/packages/ngtools/webpack/src/transformers/import_factory.ts
new file mode 100644
index 000000000000..0ff35a7393e8
--- /dev/null
+++ b/packages/ngtools/webpack/src/transformers/import_factory.ts
@@ -0,0 +1,198 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import * as ts from 'typescript';
+
+
+/**
+ * Given this original source code:
+ *
+ * import { NgModule } from '@angular/core';
+ * import { Routes, RouterModule } from '@angular/router';
+ *
+ * const routes: Routes = [{
+ *   path: 'lazy',
+ *   loadChildren: () => import('./lazy/lazy.module').then(m => m.LazyModule).
+ * }];
+ *
+ * @NgModule({
+ *   imports: [RouterModule.forRoot(routes)],
+ *   exports: [RouterModule]
+ * })
+ * export class AppRoutingModule { }
+ *
+ * NGC (View Engine) will process it into:
+ *
+ * import { Routes } from '@angular/router';
+ * const ɵ0 = () => import('./lazy/lazy.module').then(m => m.LazyModule);
+ * const routes: Routes = [{
+ *         path: 'lazy',
+ *         loadChildren: ɵ0
+ *     }];
+ * export class AppRoutingModule {
+ * }
+ * export { ɵ0 };
+ *
+ * The importFactory transformation will only see the AST after it is process by NGC.
+ * You can confirm this with the code below:
+ *
+ * const res = ts.createPrinter().printNode(ts.EmitHint.Unspecified, sourceFile, sourceFile);
+ * console.log(`### Original source: \n${sourceFile.text}\n###`);
+ * console.log(`### Current source: \n${currentText}\n###`);
+ *
+ * At this point it doesn't yet matter what the target (ES5/ES2015/etc) is, so the original
+ * constructs, like `class` and arrow functions, still remain.
+ *
+ */
+
+export function importFactory(
+  warningCb: (warning: string) => void,
+): ts.TransformerFactory<ts.SourceFile> {
+  return (context: ts.TransformationContext) => {
+    return (sourceFile: ts.SourceFile) => {
+      const warning = `
+Found 'loadChildren' with a non-string syntax in ${sourceFile.fileName} but could not transform it.
+Make sure it matches the format below:
+
+loadChildren: () => import('IMPORT_STRING').then(m => m.EXPORT_NAME)
+
+Please note that only IMPORT_STRING and EXPORT_NAME can be replaced in this format.`;
+
+      const emitWarning = () => warningCb(warning);
+      const visitVariableStatement: ts.Visitor = (node: ts.Node) => {
+        if (ts.isVariableDeclaration(node)) {
+          return replaceImport(node, context, emitWarning);
+        }
+
+        return ts.visitEachChild(node, visitVariableStatement, context);
+      };
+
+      const visitToplevelNodes: ts.Visitor = (node: ts.Node) => {
+        // We only care about finding variable declarations, which are found in this structure:
+        // VariableStatement -> VariableDeclarationList -> VariableDeclaration
+        if (ts.isVariableStatement(node)) {
+          return ts.visitEachChild(node, visitVariableStatement, context);
+        }
+
+        // There's no point in recursing into anything but variable statements, so return the node.
+        return node;
+      };
+
+      return ts.visitEachChild(sourceFile, visitToplevelNodes, context);
+    };
+  };
+}
+
+function replaceImport(
+  node: ts.VariableDeclaration,
+  context: ts.TransformationContext,
+  emitWarning: () => void,
+): ts.Node {
+  // This ONLY matches the original source code format below:
+  // loadChildren: () => import('IMPORT_STRING').then(m => m.EXPORT_NAME)
+  // And expects that source code to be transformed by NGC (see comment for importFactory).
+  // It will not match nor alter variations, for instance:
+  // - not using arrow functions
+  // - not using `m` as the module argument
+  // - using `await` instead of `then`
+  // - using a default export (https://github.com/angular/angular/issues/11402)
+  // The only parts that can change are the ones in caps: IMPORT_STRING and EXPORT_NAME.
+
+  // Exit early if the structure is not what we expect.
+
+  // ɵ0 = something
+  const name = node.name;
+  if (!(
+    ts.isIdentifier(name)
+    && /ɵ\d+/.test(name.text)
+  )) {
+    return node;
+  }
+
+  const initializer = node.initializer;
+  if (initializer === undefined) {
+    return node;
+  }
+
+  // ɵ0 = () => something
+  if (!(
+    ts.isArrowFunction(initializer)
+    && initializer.parameters.length === 0
+  )) {
+    return node;
+  }
+
+  // ɵ0 = () => something.then(something)
+  const topArrowFnBody = initializer.body;
+  if (!ts.isCallExpression(topArrowFnBody)) {
+    return node;
+  }
+
+  const topArrowFnBodyExpr = topArrowFnBody.expression;
+  if (!(
+    ts.isPropertyAccessExpression(topArrowFnBodyExpr)
+    && ts.isIdentifier(topArrowFnBodyExpr.name)
+  )) {
+    return node;
+  }
+  if (topArrowFnBodyExpr.name.text != 'then') {
+    return node;
+  }
+
+  // ɵ0 = () => import('IMPORT_STRING').then(something)
+  const importCall = topArrowFnBodyExpr.expression;
+  if (!(
+    ts.isCallExpression(importCall)
+    && importCall.expression.kind === ts.SyntaxKind.ImportKeyword
+    && importCall.arguments.length === 1
+    && ts.isStringLiteral(importCall.arguments[0])
+  )) {
+    return node;
+  }
+
+  // ɵ0 = () => import('IMPORT_STRING').then(m => m.EXPORT_NAME)
+  if (!(
+    topArrowFnBody.arguments.length === 1
+    && ts.isArrowFunction(topArrowFnBody.arguments[0])
+  )) {
+    // Now that we know it's both `ɵ0` (generated by NGC) and a `import()`, start emitting a warning
+    // if the structure isn't as expected to help users identify unusable syntax.
+    emitWarning();
+
+    return node;
+  }
+
+  const thenArrowFn = topArrowFnBody.arguments[0] as ts.ArrowFunction;
+  if (!(
+    thenArrowFn.parameters.length === 1
+    && ts.isPropertyAccessExpression(thenArrowFn.body)
+    && ts.isIdentifier(thenArrowFn.body.name)
+  )) {
+    emitWarning();
+
+    return node;
+  }
+
+  // At this point we know what are the nodes we need to replace.
+  const importStringLit = importCall.arguments[0] as ts.StringLiteral;
+  const exportNameId = thenArrowFn.body.name;
+
+  // The easiest way to alter them is with a simple visitor.
+  const replacementVisitor: ts.Visitor = (node: ts.Node) => {
+    if (node === importStringLit) {
+      // Transform the import string.
+      return ts.createStringLiteral(importStringLit.text + '.ngfactory');
+    } else if (node === exportNameId) {
+      // Transform the export name.
+      return ts.createIdentifier(exportNameId.text + 'NgFactory');
+    }
+
+    return ts.visitEachChild(node, replacementVisitor, context);
+  };
+
+  return ts.visitEachChild(node, replacementVisitor, context);
+}
diff --git a/packages/ngtools/webpack/src/transformers/import_factory_spec.ts b/packages/ngtools/webpack/src/transformers/import_factory_spec.ts
new file mode 100644
index 000000000000..8e199c92b45b
--- /dev/null
+++ b/packages/ngtools/webpack/src/transformers/import_factory_spec.ts
@@ -0,0 +1,55 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { tags } from '@angular-devkit/core';
+import { transformTypescript } from './ast_helpers';
+import { importFactory } from './import_factory';
+
+describe('@ngtools/webpack transformers', () => {
+  describe('import_factory', () => {
+    it('should support arrow functions', () => {
+      const input = tags.stripIndent`
+        const ɵ0 = () => import('./lazy/lazy.module').then(m => m.LazyModule);
+        const routes = [{
+          path: 'lazy',
+          loadChildren: ɵ0
+        }];
+      `;
+      const output = tags.stripIndent`
+        const ɵ0 = () => import("./lazy/lazy.module.ngfactory").then(m => m.LazyModuleNgFactory);
+        const routes = [{
+          path: 'lazy',
+          loadChildren: ɵ0
+        }];
+      `;
+
+      let warningCalled = false;
+      const transformer = importFactory(() => warningCalled = true);
+      const result = transformTypescript(input, [transformer]);
+
+      expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+      expect(warningCalled).toBeFalsy();
+    });
+
+    it('should not transform if the format is different than expected', () => {
+      const input = tags.stripIndent`
+        const ɵ0 = () => import('./lazy/lazy.module').then(function (m) { return m.LazyModule; });
+        const routes = [{
+          path: 'lazy',
+          loadChildren: ɵ0
+        }];
+      `;
+
+      let warningCalled = false;
+      const transformer = importFactory(() => warningCalled = true);
+      const result = transformTypescript(input, [transformer]);
+
+      expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${input}`);
+      expect(warningCalled).toBeTruthy();
+    });
+  });
+});
diff --git a/packages/ngtools/webpack/src/transformers/index.ts b/packages/ngtools/webpack/src/transformers/index.ts
index de51a382ba1d..95ed09de0ce9 100644
--- a/packages/ngtools/webpack/src/transformers/index.ts
+++ b/packages/ngtools/webpack/src/transformers/index.ts
@@ -18,3 +18,4 @@ export * from './register_locale_data';
 export * from './replace_resources';
 export * from './remove_decorators';
 export * from './find_resources';
+export * from './import_factory';

From 8e3e755995c87af556e9270a014e381f278abf87 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 25 Mar 2019 15:22:59 +0000
Subject: [PATCH 1026/1703] feat(@angular-devkit/build-angular): add
 experimentalImportFactories option

---
 .../src/angular-cli-files/models/build-options.ts           | 1 +
 .../angular-cli-files/models/webpack-configs/typescript.ts  | 1 +
 .../angular_devkit/build_angular/src/browser/schema.json    | 5 +++++
 packages/ngtools/webpack/src/transformers/import_factory.ts | 6 +++++-
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
index 2397878332ac..993ae9593239 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
@@ -59,6 +59,7 @@ export interface BuildOptions {
   forkTypeChecker: boolean;
   profile?: boolean;
   es5BrowserSupport?: boolean;
+  experimentalImportFactories?: boolean;
 
   main: string;
   index: string;
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
index 56eea03ae40b..d9a0b8a06748 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
@@ -75,6 +75,7 @@ function _createAotPlugin(
     contextElementDependencyConstructor: require('webpack/lib/dependencies/ContextElementDependency'),
     logger: wco.logger,
     directTemplateLoading: true,
+    importFactories: buildOptions.experimentalImportFactories,
     ...options,
   };
   return new AngularCompilerPlugin(pluginOptions);
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index e8c21c2406cb..d8aeb05a119e 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -315,6 +315,11 @@
       "type": "boolean",
       "default": false,
       "x-deprecated": true
+    },
+    "experimentalImportFactories": {
+      "description": "**EXPERIMENTAL** Transform import statements for lazy routes to import factories when using View Engine. Should only be used when switching back and forth between View Engine and Ivy. See https://angular.io/guide/ivy for usage information.",
+      "type": "boolean",
+      "default": false
     }
   },
   "additionalProperties": false,
diff --git a/packages/ngtools/webpack/src/transformers/import_factory.ts b/packages/ngtools/webpack/src/transformers/import_factory.ts
index 0ff35a7393e8..3750f7b9c0fe 100644
--- a/packages/ngtools/webpack/src/transformers/import_factory.ts
+++ b/packages/ngtools/webpack/src/transformers/import_factory.ts
@@ -53,6 +53,7 @@ export function importFactory(
   warningCb: (warning: string) => void,
 ): ts.TransformerFactory<ts.SourceFile> {
   return (context: ts.TransformationContext) => {
+    // TODO(filipesilva): change the link to https://angular.io/guide/ivy once it is out.
     return (sourceFile: ts.SourceFile) => {
       const warning = `
 Found 'loadChildren' with a non-string syntax in ${sourceFile.fileName} but could not transform it.
@@ -60,7 +61,10 @@ Make sure it matches the format below:
 
 loadChildren: () => import('IMPORT_STRING').then(m => m.EXPORT_NAME)
 
-Please note that only IMPORT_STRING and EXPORT_NAME can be replaced in this format.`;
+Please note that only IMPORT_STRING and EXPORT_NAME can be replaced in this format.
+
+Visit https://next.angular.io/guide/ivy for more information on using Ivy.
+`;
 
       const emitWarning = () => warningCb(warning);
       const visitVariableStatement: ts.Visitor = (node: ts.Node) => {

From 55a86c99ab9693fa45dbe9dbe47884148b579bf9 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 19 Mar 2019 10:44:07 +0000
Subject: [PATCH 1027/1703] test: test lazy-loading syntax for VE and Ivy

---
 .../lazy-load-syntax.ts}                      | 75 ++++++++++++++-----
 1 file changed, 58 insertions(+), 17 deletions(-)
 rename tests/legacy-cli/e2e/tests/{ivy/ivy-lazy-load.ts => build/lazy-load-syntax.ts} (58%)

diff --git a/tests/legacy-cli/e2e/tests/ivy/ivy-lazy-load.ts b/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts
similarity index 58%
rename from tests/legacy-cli/e2e/tests/ivy/ivy-lazy-load.ts
rename to tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts
index fdd2485fad72..f453dfad9cf9 100644
--- a/tests/legacy-cli/e2e/tests/ivy/ivy-lazy-load.ts
+++ b/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts
@@ -5,17 +5,36 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { readFile, replaceInFile, writeFile } from '../../utils/fs';
+import { getGlobalVariable } from '../../utils/env';
+import { appendToFile, prependToFile, readFile, replaceInFile, writeFile } from '../../utils/fs';
 import { ng } from '../../utils/process';
-import { createProject, updateJsonFile } from '../../utils/project';
+import { updateJsonFile } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
 
 export default async function () {
-  const projectName = 'ivy-lazy-loading';
+  const argv = getGlobalVariable('argv');
+  const ivyProject = argv['ivy'];
+  const projectName = 'test-project';
   const appRoutingModulePath = 'src/app/app-routing.module.ts';
 
-  // Make Ivy project.
-  await createProject(projectName, '--enable-ivy', '--routing');
+  // Add app routing.
+  // This is done automatically on a new app with --routing.
+  await writeFile(appRoutingModulePath, `
+    import { NgModule } from '@angular/core';
+    import { Routes, RouterModule } from '@angular/router';
+
+    const routes: Routes = [];
+
+    @NgModule({
+      imports: [RouterModule.forRoot(routes)],
+      exports: [RouterModule]
+    })
+    export class AppRoutingModule { }
+  `);
+  await prependToFile('src/app/app.module.ts',
+    `import { AppRoutingModule } from './app-routing.module';`);
+  await replaceInFile('src/app/app.module.ts', `imports: [`, `imports: [ AppRoutingModule,`);
+  await appendToFile('src/app/app.component.html', '<router-outlet></router-outlet>');
 
   const originalAppRoutingModule = await readFile(appRoutingModulePath);
   // helper to replace loadChildren
@@ -57,8 +76,10 @@ export default async function () {
 
   // Set factory shims to false.
   await updateJsonFile('tsconfig.app.json', json => {
-    const angularCompilerOptions = json['angularCompilerOptions'];
-    angularCompilerOptions['allowEmptyCodegenFiles'] = false;
+    if (json['angularCompilerOptions'] === undefined) {
+      json['angularCompilerOptions'] = {};
+    }
+    json['angularCompilerOptions']['allowEmptyCodegenFiles'] = false;
   });
 
   // Convert the default config to use JIT and prod to just do AOT.
@@ -69,22 +90,42 @@ export default async function () {
     buildTarget['configurations']['production'] = { aot: true };
   });
 
-  // Test `import()` style lazy load.
-  await replaceLoadChildren(`() => import('./lazy/lazy.module').then(m => m.LazyModule)`);
-  await ng('e2e');
-  await ng('e2e', '--prod');
-
   // Test string import with factory shims.
   await replaceLoadChildren(`'./lazy/lazy.module#LazyModule'`);
   await replaceInFile('tsconfig.app.json', `"allowEmptyCodegenFiles": false`,
     `"allowEmptyCodegenFiles": true`);
-  await expectToFail(() => ng('e2e')); // Currently broken.
-  await ng('e2e', '--prod');
+  if (ivyProject) {
+    // Ivy should not support the string syntax.
+    await expectToFail(() => ng('e2e'));
+    await expectToFail(() => ng('e2e', '--prod'));
+  } else {
+    // View engine should support the string syntax.
+    await ng('e2e');
+    await ng('e2e', '--prod');
+  }
 
   // Test string import without factory shims.
   await replaceLoadChildren(`'./lazy/lazy.module#LazyModule'`);
   await replaceInFile('tsconfig.app.json', `"allowEmptyCodegenFiles": true`,
-  `"allowEmptyCodegenFiles": false`);
-  await expectToFail(() => ng('e2e')); // Not supported.
-  await expectToFail(() => ng('e2e', '--prod')); // Not supported.
+    `"allowEmptyCodegenFiles": false`);
+  if (ivyProject) {
+    // Ivy should not support the string syntax.
+    await expectToFail(() => ng('e2e'));
+    await expectToFail(() => ng('e2e', '--prod'));
+  } else {
+    // View engine should support the string syntax.
+    await ng('e2e');
+    await ng('e2e', '--prod');
+  }
+
+  // Test `import()` style lazy load.
+  await updateJsonFile('angular.json', json => {
+    // Add the experimental flag to import factories in View Engine.
+    const buildTarget = json['projects'][projectName]['architect']['build'];
+    buildTarget['options']['experimentalImportFactories'] = true;
+  });
+  // Both Ivy and View Engine should support it.
+  await replaceLoadChildren(`() => import('./lazy/lazy.module').then(m => m.LazyModule)`);
+  await ng('e2e');
+  await ng('e2e', '--prod');
 }

From 8d82e9812d3fa9908a2f686d0b4ff8e56aae3d0f Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 26 Mar 2019 15:55:41 +0000
Subject: [PATCH 1028/1703] refactor(@ngtools/webpack): simplify a call using
 await

---
 .../webpack/src/angular_compiler_plugin.ts    | 57 +++++++++----------
 1 file changed, 27 insertions(+), 30 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 5f079af2abad..b9393a9a7514 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -760,39 +760,36 @@ export class AngularCompilerPlugin {
             return result;
           }
 
-          return this.done.then(
-            () => {
-              // This folder does not exist, but we need to give webpack a resource.
-              // TODO: check if we can't just leave it as is (angularCoreModuleDir).
-              result.resource = path.join(this._basePath, '$$_lazy_route_resource');
-              // tslint:disable-next-line:no-any
-              result.dependencies.forEach((d: any) => d.critical = false);
-              // tslint:disable-next-line:no-any
-              result.resolveDependencies = (_fs: any, options: any, callback: Callback) => {
-                const dependencies = Object.keys(this._lazyRoutes)
-                  .map((key) => {
-                    const modulePath = this._lazyRoutes[key];
-                    if (modulePath !== null) {
-                      const name = key.split('#')[0];
-
-                      return new this._contextElementDependencyConstructor(modulePath, name);
-                    } else {
-                      return null;
-                    }
-                  })
-                  .filter(x => !!x);
-
-                if (this._options.nameLazyFiles) {
-                  options.chunkName = '[request]';
+          await this.done;
+
+          // This folder does not exist, but we need to give webpack a resource.
+          // TODO: check if we can't just leave it as is (angularCoreModuleDir).
+          result.resource = path.join(this._basePath, '$$_lazy_route_resource');
+          // tslint:disable-next-line:no-any
+          result.dependencies.forEach((d: any) => d.critical = false);
+          // tslint:disable-next-line:no-any
+          result.resolveDependencies = (_fs: any, options: any, callback: Callback) => {
+            const dependencies = Object.keys(this._lazyRoutes)
+              .map((key) => {
+                const modulePath = this._lazyRoutes[key];
+                if (modulePath !== null) {
+                  const name = key.split('#')[0];
+
+                  return new this._contextElementDependencyConstructor(modulePath, name);
+                } else {
+                  return null;
                 }
+              })
+              .filter(x => !!x);
 
-                callback(null, dependencies);
-              };
+            if (this._options.nameLazyFiles) {
+              options.chunkName = '[request]';
+            }
 
-              return result;
-            },
-            () => undefined,
-          );
+            callback(null, dependencies);
+          };
+
+          return result;
         });
       });
     }

From 27a84a82877e041e26814353f7a27b2462c02bd7 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 28 Mar 2019 15:00:01 +0000
Subject: [PATCH 1029/1703] ci: add ivy track for all prs

---
 .circleci/config.yml                          | 21 +++++---------
 tests/legacy-cli/e2e/tests/basic/rebuild.ts   | 10 +++++--
 .../legacy-cli/e2e/tests/misc/lazy-module.ts  | 29 ++++++++++++++-----
 tests/legacy-cli/e2e_runner.ts                |  2 ++
 4 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2b9a7e00fb32..54362128dbc1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -106,24 +106,17 @@ jobs:
           path: /tmp/dist
           destination: cli/new-production
 
-  e2e-cli-ng-snapshots:
+  e2e-cli-ivy:
     <<: *defaults
     environment:
       BASH_ENV: ~/.profile
     resource_class: xlarge
     parallelism: 4
     steps:
-      - run:
-          name: Don't run expensive e2e tests for forks other than renovate-bot and angular
-          command: >
-            if [[ "$CIRCLE_PR_USERNAME" != "renovate-bot" ]] &&
-               [[ "$CIRCLE_PROJECT_USERNAME" != "angular" || $CIRCLE_BRANCH != "master" ]]; then
-              circleci step halt
-            fi
       - attach_workspace: *attach_options
-      - run: xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} --ng-snapshots
+      - run: xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} --ivy          
 
-  e2e-cli-ivy-snapshots:
+  e2e-cli-ng-snapshots:
     <<: *defaults
     environment:
       BASH_ENV: ~/.profile
@@ -138,7 +131,7 @@ jobs:
               circleci step halt
             fi
       - attach_workspace: *attach_options
-      - run: xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} --ng-snapshots --ivy
+      - run: xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} --ng-snapshots
 
   build:
     <<: *defaults
@@ -210,6 +203,9 @@ workflows:
       - e2e-cli:
           requires:
             - build
+      - e2e-cli-ivy:
+          requires:
+            - build            
       - snapshot_publish_docs:
           requires:
           - install
@@ -220,9 +216,6 @@ workflows:
       - e2e-cli-ng-snapshots:
           requires:
             - build
-      - e2e-cli-ivy-snapshots:
-          requires:
-            - build
       - snapshot_publish:
           requires:
             - test
diff --git a/tests/legacy-cli/e2e/tests/basic/rebuild.ts b/tests/legacy-cli/e2e/tests/basic/rebuild.ts
index 3ca37f3bc175..4c1dccf36735 100644
--- a/tests/legacy-cli/e2e/tests/basic/rebuild.ts
+++ b/tests/legacy-cli/e2e/tests/basic/rebuild.ts
@@ -7,6 +7,7 @@ import {
 import {writeFile, writeMultipleFiles} from '../../utils/fs';
 import {wait} from '../../utils/utils';
 import {request} from '../../utils/http';
+import {getGlobalVariable} from '../../utils/env';
 
 const validBundleRegEx = /: Compiled successfully./;
 
@@ -15,7 +16,10 @@ export default function() {
     return Promise.resolve();
   }
 
-  const lazyChunkRegExp = /lazy-module\.js/g;
+  const argv = getGlobalVariable('argv');
+  const ivyProject = argv['ivy'];
+  const lazyImport = ivyProject ? `() => import('./lazy/lazy.module').then(m => m.LazyModule)`
+    : `'./lazy/lazy.module#LazyModule'`;
 
   return execAndWaitForOutputToMatch('ng', ['serve'], validBundleRegEx)
     // Add a lazy module.
@@ -43,7 +47,7 @@ export default function() {
             FormsModule,
             HttpClientModule,
             RouterModule.forRoot([
-              { path: 'lazy', loadChildren: './lazy/lazy.module#LazyModule' }
+              { path: 'lazy', loadChildren: ${lazyImport} }
             ])
           ],
           providers: [],
@@ -55,7 +59,7 @@ export default function() {
     // Count the bundles.
     .then((results) => {
       const stdout = results[0].stdout;
-      if (!lazyChunkRegExp.test(stdout)) {
+      if (!/(lazy-module|0)\.js/g.test(stdout)) {
         throw new Error('Expected webpack to create a new chunk, but did not.');
       }
     })
diff --git a/tests/legacy-cli/e2e/tests/misc/lazy-module.ts b/tests/legacy-cli/e2e/tests/misc/lazy-module.ts
index cf73ee7b06e2..65183f7d6746 100644
--- a/tests/legacy-cli/e2e/tests/misc/lazy-module.ts
+++ b/tests/legacy-cli/e2e/tests/misc/lazy-module.ts
@@ -2,9 +2,19 @@ import {readdirSync} from 'fs';
 
 import {ng, silentNpm} from '../../utils/process';
 import {appendToFile, writeFile, prependToFile, replaceInFile} from '../../utils/fs';
+import {getGlobalVariable} from '../../utils/env';
 
 
 export default function() {
+  const argv = getGlobalVariable('argv');
+  const ivyProject = argv['ivy'];
+  const lazyImport = ivyProject ? `() => import('src/app/lazy/lazy.module').then(m => m.LazyModule)`
+    : `'src/app/lazy/lazy.module#LazyModule'`;
+  const lazyImport1 = ivyProject ? `() => import('./lazy/lazy.module').then(m => m.LazyModule)`
+    : `'./lazy/lazy.module#LazyModule'`;
+  const lazyImport2 = ivyProject ? `() => import('./too/lazy/lazy.module').then(m => m.LazyModule)`
+    : `'./too/lazy/lazy.module#LazyModule'`;
+
   let oldNumberOfFiles = 0;
   return Promise.resolve()
     .then(() => ng('build'))
@@ -15,9 +25,9 @@ export default function() {
       import { RouterModule } from '@angular/router';
     `))
     .then(() => replaceInFile('src/app/app.module.ts', 'imports: [', `imports: [
-      RouterModule.forRoot([{ path: "lazy", loadChildren: "src/app/lazy/lazy.module#LazyModule" }]),
-      RouterModule.forRoot([{ path: "lazy1", loadChildren: "./lazy/lazy.module#LazyModule" }]),
-      RouterModule.forRoot([{ path: "lazy2", loadChildren: "./too/lazy/lazy.module#LazyModule" }]),
+      RouterModule.forRoot([{ path: "lazy", loadChildren: ${lazyImport} }]),
+      RouterModule.forRoot([{ path: "lazy1", loadChildren: ${lazyImport1} }]),
+      RouterModule.forRoot([{ path: "lazy2", loadChildren: ${lazyImport2} }]),
     `))
     .then(() => ng('build', '--named-chunks'))
     .then(() => readdirSync('dist/test-project'))
@@ -28,11 +38,14 @@ export default function() {
       }
       oldNumberOfFiles = currentNumberOfDistFiles;
 
-      if (!distFiles.includes('lazy-lazy-module.js')) {
-        throw new Error('The lazy module chunk did not have a name.');
-      }
-      if (!distFiles.includes('too-lazy-lazy-module.js')) {
-        throw new Error('The lazy module chunk did not use a unique name.');
+      // Named lazy route chunks are not available with Ivy.
+      if (!ivyProject) {
+        if (!distFiles.includes('lazy-lazy-module.js')) {
+          throw new Error('The lazy module chunk did not have a name.');
+        }
+        if (!distFiles.includes('too-lazy-lazy-module.js')) {
+          throw new Error('The lazy module chunk did not use a unique name.');
+        }
       }
     })
     // verify System.import still works
diff --git a/tests/legacy-cli/e2e_runner.ts b/tests/legacy-cli/e2e_runner.ts
index 171aeb44492a..cf2f3904455d 100644
--- a/tests/legacy-cli/e2e_runner.ts
+++ b/tests/legacy-cli/e2e_runner.ts
@@ -144,6 +144,8 @@ if (argv.ivy) {
     .filter(name => !name.endsWith('tests/build/aot/aot-i18n.ts'))
     // We don't have a library consumption story yet for Ivy.
     .filter(name => !name.endsWith('tests/generate/library/library-consumption.ts'))
+    // The additional lazy modules array does not work with Ivy because it's not needed.
+    .filter(name => !name.endsWith('tests/build/dynamic-import.ts'))
     // We don't have a platform-server usage story yet for Ivy.
     // It's contingent on lazy loading and factory shim considerations that are still being
     // discussed.

From 54d2be949730b470a4bfd9ecc3733907eab6e470 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Thu, 28 Mar 2019 09:53:27 +0100
Subject: [PATCH 1030/1703] fix(@ngtools/webpack): don't invalidate cache after
 first run

At the moment, since there are no old files in the compilation it will cause all source files to be invalidate after the first run. This shouldn't be done as it will slow down the 2nd recompilation.
---
 .../webpack/src/angular_compiler_plugin.ts    | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index b9393a9a7514..b80204d80570 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -400,12 +400,7 @@ export class AngularCompilerPlugin {
 
     // Use an identity function as all our paths are absolute already.
     this._moduleResolutionCache = ts.createModuleResolutionCache(this._basePath, x => x);
-
-    const tsProgram = this._getTsProgram();
-    const oldFiles = new Set(tsProgram ?
-      tsProgram.getSourceFiles().map(sf => sf.fileName)
-      : [],
-    );
+    const oldTsProgram = this._getTsProgram();
 
     if (this._JitMode) {
       // Create the TypeScript program.
@@ -414,14 +409,9 @@ export class AngularCompilerPlugin {
         this._rootNames,
         this._compilerOptions,
         this._compilerHost,
-        tsProgram,
+        oldTsProgram,
       );
       timeEnd('AngularCompilerPlugin._createOrUpdateProgram.ts.createProgram');
-
-      const newFiles = this._program.getSourceFiles().filter(sf => !oldFiles.has(sf.fileName));
-      for (const newFile of newFiles) {
-        this._compilerHost.invalidate(newFile.fileName);
-      }
     } else {
       time('AngularCompilerPlugin._createOrUpdateProgram.ng.createProgram');
       // Create the Angular program.
@@ -436,9 +426,14 @@ export class AngularCompilerPlugin {
       time('AngularCompilerPlugin._createOrUpdateProgram.ng.loadNgStructureAsync');
       await this._program.loadNgStructureAsync();
       timeEnd('AngularCompilerPlugin._createOrUpdateProgram.ng.loadNgStructureAsync');
+    }
 
-      const newFiles = this._program.getTsProgram()
-        .getSourceFiles().filter(sf => !oldFiles.has(sf.fileName));
+    const newTsProgram = this._getTsProgram();
+    if (oldTsProgram && newTsProgram) {
+      // The invalidation should only happen if we have an old program
+      // as otherwise we will invalidate all the sourcefiles.
+      const oldFiles = new Set(oldTsProgram.getSourceFiles().map(sf => sf.fileName));
+      const newFiles = newTsProgram.getSourceFiles().filter(sf => !oldFiles.has(sf.fileName));
       for (const newFile of newFiles) {
         this._compilerHost.invalidate(newFile.fileName);
       }
@@ -1056,7 +1051,8 @@ export class AngularCompilerPlugin {
         // We also need to all changed files as dependencies of this file, so that all of them
         // will be watched and trigger a rebuild next time.
         outputText = '';
-        errorDependencies = this._getChangedCompilationFiles()
+        const program = this._getTsProgram();
+        errorDependencies = (program ? program.getSourceFiles().map(x => x.fileName) : [])
           // These paths are used by the loader so we must denormalize them.
           .map((p) => this._compilerHost.denormalizePath(p));
       }

From 871eb69c3bc2fe948573f009aed1b1b6d938b707 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Thu, 28 Mar 2019 15:37:29 +0100
Subject: [PATCH 1031/1703] fix(@ngtools/webpack): replace resources should
 return class node when modified

This is also the root cause of spec large fail occasionally as we keep checking the child class nodes
---
 .../webpack/src/transformers/replace_resources.ts  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/ngtools/webpack/src/transformers/replace_resources.ts b/packages/ngtools/webpack/src/transformers/replace_resources.ts
index 077a0532d760..bd23074cc316 100644
--- a/packages/ngtools/webpack/src/transformers/replace_resources.ts
+++ b/packages/ngtools/webpack/src/transformers/replace_resources.ts
@@ -18,10 +18,22 @@ export function replaceResources(
 
     const visitNode: ts.Visitor = (node: ts.Decorator) => {
       if (ts.isClassDeclaration(node)) {
-        node.decorators = ts.visitNodes(
+        const decorators = ts.visitNodes(
           node.decorators,
           (node: ts.Decorator) => visitDecorator(node, typeChecker, directTemplateLoading),
         );
+
+        // todo: we need to investigate and confirm that using
+        //  `updateClassDeclaration` has no regressions
+        return ts.updateClassDeclaration(
+          node,
+          decorators,
+          node.modifiers,
+          node.name,
+          node.typeParameters,
+          node.heritageClauses,
+          node.members,
+        );
       }
 
       return ts.visitEachChild(node, visitNode, context);

From 7915a582cf3a32a264eda075e63255dfdda1fcac Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Tue, 26 Mar 2019 07:11:00 +0100
Subject: [PATCH 1032/1703] fix(@ngtools/webpack): changes in non module code
 are not picked up when using barrel files

Fixes #13975
---
 .../test/browser/rebuild_spec_large.ts        | 38 +++++++++++++++++++
 .../webpack/src/angular_compiler_plugin.ts    | 13 ++++++-
 packages/ngtools/webpack/src/loader.ts        |  6 ++-
 .../webpack/src/transformers/ast_helpers.ts   |  8 +++-
 4 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
index 42d2fd6835d4..68f29be06949 100644
--- a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
@@ -347,4 +347,42 @@ describe('Browser Builder rebuilds', () => {
     ).toPromise();
     await run.stop();
   });
+
+  it('rebuilds on changes in barrel file dependency', async () => {
+    host.writeMultipleFiles({
+      'src/index.ts': `export * from './interface'`,
+      'src/interface.ts': `export interface Foo { bar: boolean };`,
+    });
+    host.appendToFile('src/main.ts', `
+      import { Foo } from './index';
+      const x: Foo = { bar: true };
+    `);
+
+    const overrides = { watch: true, aot: false };
+    let buildNumber = 0;
+    const run = await architect.scheduleTarget(target, overrides);
+    await run.output.pipe(
+      debounceTime(1000),
+      tap((buildEvent) => {
+        buildNumber += 1;
+        switch (buildNumber) {
+          case 1:
+            expect(buildEvent.success).toBe(true);
+            host.writeMultipleFiles({
+              'src/interface.ts': `export interface Foo {
+                bar: boolean;
+                baz?: string;
+               };`,
+            });
+            break;
+
+          case 2:
+            expect(buildEvent.success).toBe(true);
+            break;
+        }
+      }),
+      take(2),
+    ).toPromise();
+    await run.stop();
+  });
 });
diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index b80204d80570..ae6826afe17d 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -1092,9 +1092,18 @@ export class AngularCompilerPlugin {
     const host = this._compilerHost;
     const cache = this._moduleResolutionCache;
 
-    const esImports = collectDeepNodes<ts.ImportDeclaration>(sourceFile,
-      ts.SyntaxKind.ImportDeclaration)
+    const esImports = collectDeepNodes<ts.ImportDeclaration | ts.ExportDeclaration>(
+      sourceFile,
+      [
+        ts.SyntaxKind.ImportDeclaration,
+        ts.SyntaxKind.ExportDeclaration,
+      ],
+    )
       .map(decl => {
+        if (!decl.moduleSpecifier) {
+          return null;
+        }
+
         const moduleName = (decl.moduleSpecifier as ts.StringLiteral).text;
         const resolved = ts.resolveModuleName(moduleName, resolvedFileName, options, host, cache);
 
diff --git a/packages/ngtools/webpack/src/loader.ts b/packages/ngtools/webpack/src/loader.ts
index ca6afad0794a..046b0d9d7485 100644
--- a/packages/ngtools/webpack/src/loader.ts
+++ b/packages/ngtools/webpack/src/loader.ts
@@ -68,7 +68,11 @@ export function ngcLoader(this: loader.LoaderContext) {
       if (sourceFileName.endsWith('.ts')) {
         result.errorDependencies.forEach(dep => this.addDependency(dep));
         const dependencies = plugin.getDependencies(sourceFileName);
-        dependencies.forEach(dep => {
+        dependencies
+          .filter(d => d.endsWith('index.ts'))
+          .forEach(d => dependencies.push(...plugin.getDependencies(d)));
+
+        [...new Set(dependencies)].forEach(dep => {
           plugin.updateChangedFileExtensions(path.extname(dep));
           this.addDependency(dep);
         });
diff --git a/packages/ngtools/webpack/src/transformers/ast_helpers.ts b/packages/ngtools/webpack/src/transformers/ast_helpers.ts
index 57cf11e720ad..1d3beb7a3336 100644
--- a/packages/ngtools/webpack/src/transformers/ast_helpers.ts
+++ b/packages/ngtools/webpack/src/transformers/ast_helpers.ts
@@ -11,10 +11,14 @@ import { WebpackCompilerHost } from '../compiler_host';
 
 
 // Find all nodes from the AST in the subtree of node of SyntaxKind kind.
-export function collectDeepNodes<T extends ts.Node>(node: ts.Node, kind: ts.SyntaxKind): T[] {
+export function collectDeepNodes<T extends ts.Node>(
+  node: ts.Node,
+  kind: ts.SyntaxKind | ts.SyntaxKind[],
+): T[] {
+  const kinds = Array.isArray(kind) ? kind : [kind];
   const nodes: T[] = [];
   const helper = (child: ts.Node) => {
-    if (child.kind === kind) {
+    if (kinds.includes(child.kind)) {
       nodes.push(child as T);
     }
     ts.forEachChild(child, helper);

From 1a484c368fe9aefc1b2f95bd4b587bb9973062a4 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 29 Mar 2019 18:26:05 +0000
Subject: [PATCH 1033/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index e8c2523e7b80..7e84beee6bd5 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#99ef7e02a827d25ec89c034fe57bfacb69684802",
-    "@angular/common": "github:angular/common-builds#486e404da83634faef90815148c50018d23197bc",
-    "@angular/compiler": "github:angular/compiler-builds#13f5282ecd318c3d64873ace5d61fe1a618e8f80",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#5649097a28f9a3654ffc962c06f1a82df9e9434f",
-    "@angular/core": "github:angular/core-builds#910f859a125c1b23cb15175192904e20a3b58dd1",
-    "@angular/forms": "github:angular/forms-builds#3bb40de84a8faaf4742e1a0032c3559921babbc5",
-    "@angular/language-service": "github:angular/language-service-builds#e31a9bb6da1adec22f0e8597497b7fca086e499e",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#7f4d52761c4b51599c1e73e65a3b265d43949ea7",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#59280681b5d7b79391d9a8f3dda2021ad18dcee2",
-    "@angular/router": "github:angular/router-builds#55b26f72fef3cf7cc482f968654a810c0a1b28c2"
+    "@angular/animations": "github:angular/animations-builds#34c8385baddf45d8dc76b0b41627f1d17e62de62",
+    "@angular/common": "github:angular/common-builds#85efb71bfb10ddbfb9709dcc4431ed1afb6c31f6",
+    "@angular/compiler": "github:angular/compiler-builds#42ba1874c2a3ef7323ea8aeb403eb2008db8a70d",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#92bab05b294c1ebbd9b2bb41e49d7d8553c4371c",
+    "@angular/core": "github:angular/core-builds#3685f5d942b04f43d5683201484c3a5642b8ef68",
+    "@angular/forms": "github:angular/forms-builds#c774d03265a69b684455c54109983e148018d073",
+    "@angular/language-service": "github:angular/language-service-builds#24f8255272eb90c1f92a61af5d07b0231e2ebc04",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#09aac9f21dc4f962d04592846f999a890890a325",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#e2ad980555f346b26f21dd124663ccd5c3b4cbce",
+    "@angular/router": "github:angular/router-builds#6569629df389ec5d9f84d101d9a3f5ea985d06aa"
   }
 }
\ No newline at end of file

From 36d78debdb46043d84aa46a23a207aaedc83e950 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 6 Mar 2019 15:00:25 -0500
Subject: [PATCH 1034/1703] fix(@angular-devkit/build-angular): ensure correct
 dev server path with public host option

If a custom path is provided the webpack dev server client drops the sockjs-node segment. This adds it back so that behavior is consistent when using a custom URL path.

Fixes #13627
---
 .../build_angular/src/dev-server/index.ts      | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index aab9fee8fb2d..ff7bf625e014 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -144,15 +144,14 @@ export function serveWebpackBrowser(
       options.port = port;
 
       // Resolve public host and client address.
-      let clientAddress = `${options.ssl ? 'https' : 'http'}://0.0.0.0:0`;
+      let clientAddress = url.parse(`${options.ssl ? 'https' : 'http'}://0.0.0.0:0`);
       if (options.publicHost) {
         let publicHost = options.publicHost;
         if (!/^\w+:\/\//.test(publicHost)) {
           publicHost = `${options.ssl ? 'https' : 'http'}://${publicHost}`;
         }
-        const clientUrl = url.parse(publicHost);
-        options.publicHost = clientUrl.host;
-        clientAddress = url.format(clientUrl);
+        clientAddress = url.parse(publicHost);
+        options.publicHost = clientAddress.host;
       }
 
       // Resolve serve address.
@@ -338,7 +337,7 @@ function _addLiveReload(
   options: DevServerBuilderSchema,
   browserOptions: BrowserBuilderSchema,
   webpackConfig: webpack.Configuration,
-  clientAddress: string,
+  clientAddress: url.UrlWithStringQuery,
   logger: logging.LoggerApi,
 ) {
   if (webpackConfig.plugins === undefined) {
@@ -353,7 +352,14 @@ function _addLiveReload(
   } catch {
     throw new Error('The "webpack-dev-server" package could not be found.');
   }
-  const entryPoints = [`${webpackDevServerPath}?${clientAddress}`];
+
+  // If a custom path is provided the webpack dev server client drops the sockjs-node segment.
+  // This adds it back so that behavior is consistent when using a custom URL path
+  if (clientAddress.pathname) {
+    clientAddress.pathname = path.posix.join(clientAddress.pathname, 'sockjs-node');
+  }
+
+  const entryPoints = [`${webpackDevServerPath}?${url.format(clientAddress)}`];
   if (options.hmr) {
     const webpackHmrLink = 'https://webpack.js.org/guides/hot-module-replacement';
 

From a355e7d693a8a74b2010e18f67cfd86207a9eac7 Mon Sep 17 00:00:00 2001
From: Minko Gechev <mgechev@google.com>
Date: Fri, 1 Mar 2019 13:56:34 -0800
Subject: [PATCH 1035/1703] feat(@schematics/angular): drop es6 from modern
 polyfills

1. Remove imports of es6 polyfills introduced by the CLI.
2. Refactor the migrations for version 8 by moving the codelyzer and
polyfill transforms into different files.

The PR drops all `core-js/es6` polyfills that we've introduced with the
CLI, except the commented ones. We do not remove commented imports,
since they are not part of the internal es6 polyfills.

The migration automatically drops the
associated comments with the removed imports since they are part of the node - under its
`jsDoc` property.
---
 .../angular_devkit/schematics/src/index.ts    |  2 +-
 .../migrations/update-8/codelyzer-5.ts        | 94 +++++++++++++++++++
 .../{index_spec.ts => codelyzer-5_spec.ts}    |  0
 .../migrations/update-8/drop-es6-polyfills.ts | 77 +++++++++++++++
 .../update-8/drop-es6-polyfills_spec.ts       | 93 ++++++++++++++++++
 .../angular/migrations/update-8/index.ts      | 87 +----------------
 6 files changed, 269 insertions(+), 84 deletions(-)
 create mode 100644 packages/schematics/angular/migrations/update-8/codelyzer-5.ts
 rename packages/schematics/angular/migrations/update-8/{index_spec.ts => codelyzer-5_spec.ts} (100%)
 create mode 100644 packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts
 create mode 100644 packages/schematics/angular/migrations/update-8/drop-es6-polyfills_spec.ts

diff --git a/packages/angular_devkit/schematics/src/index.ts b/packages/angular_devkit/schematics/src/index.ts
index 186d53b51117..68390c0f40bb 100644
--- a/packages/angular_devkit/schematics/src/index.ts
+++ b/packages/angular_devkit/schematics/src/index.ts
@@ -25,7 +25,7 @@ export * from './rules/url';
 export * from './tree/delegate';
 export * from './tree/empty';
 export * from './tree/host-tree';
-export {UpdateRecorder} from './tree/interface';
+export { UpdateRecorder } from './tree/interface';
 export * from './engine/schematic';
 export * from './sink/dryrun';
 export * from './sink/filesystem';
diff --git a/packages/schematics/angular/migrations/update-8/codelyzer-5.ts b/packages/schematics/angular/migrations/update-8/codelyzer-5.ts
new file mode 100644
index 000000000000..49909a597669
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-8/codelyzer-5.ts
@@ -0,0 +1,94 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { JsonParseMode, parseJsonAst } from '@angular-devkit/core';
+import {
+  Rule,
+  SchematicContext,
+  Tree,
+} from '@angular-devkit/schematics';
+import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
+import {
+  NodeDependency,
+  NodeDependencyType,
+  addPackageJsonDependency,
+} from '../../utility/dependencies';
+import { findPropertyInAstObject } from '../../utility/json-utils';
+
+const ruleMapping: {[key: string]: string} = {
+  'contextual-life-cycle': 'contextual-lifecycle',
+  'no-conflicting-life-cycle-hooks': 'no-conflicting-lifecycle',
+  'no-life-cycle-call': 'no-lifecycle-call',
+  'use-life-cycle-interface': 'use-lifecycle-interface',
+  'decorator-not-allowed': 'contextual-decorator',
+  'enforce-component-selector': 'use-component-selector',
+  'no-output-named-after-standard-event': 'no-output-native',
+  'use-host-property-decorator': 'no-host-metadata-property',
+  'use-input-property-decorator': 'no-inputs-metadata-property',
+  'use-output-property-decorator': 'no-outputs-metadata-property',
+  'no-queries-parameter': 'no-queries-metadata-property',
+  'pipe-impure': 'no-pipe-impure',
+  'use-view-encapsulation': 'use-component-view-encapsulation',
+  i18n: 'template-i18n',
+  'banana-in-box': 'template-banana-in-box',
+  'no-template-call-expression': 'template-no-call-expression',
+  'templates-no-negated-async': 'template-no-negated-async',
+  'trackBy-function': 'template-use-track-by-function',
+  'no-attribute-parameter-decorator': 'no-attribute-decorator',
+  'max-inline-declarations': 'component-max-inline-declarations',
+};
+
+export const updateTsLintConfig = (): Rule => {
+  return (host: Tree) => {
+    const tsLintPath = '/tslint.json';
+    const buffer = host.read(tsLintPath);
+    if (!buffer) {
+      return host;
+    }
+    const tsCfgAst = parseJsonAst(buffer.toString(), JsonParseMode.Loose);
+
+    if (tsCfgAst.kind != 'object') {
+      return host;
+    }
+
+    const rulesNode = findPropertyInAstObject(tsCfgAst, 'rules');
+    if (!rulesNode || rulesNode.kind != 'object') {
+      return host;
+    }
+
+    const recorder = host.beginUpdate(tsLintPath);
+
+    rulesNode.properties.forEach(prop => {
+      const mapping = ruleMapping[prop.key.value];
+      if (mapping) {
+        recorder.remove(prop.key.start.offset + 1, prop.key.value.length);
+        recorder.insertLeft(prop.key.start.offset + 1, mapping);
+      }
+    });
+
+    host.commitUpdate(recorder);
+
+    return host;
+  };
+};
+
+export const updatePackageJson = () => {
+  return (host: Tree, context: SchematicContext) => {
+    const dependency: NodeDependency = {
+      type: NodeDependencyType.Dev,
+      name: 'codelyzer',
+      version: '^5.0.0',
+      overwrite: true,
+    };
+
+    addPackageJsonDependency(host, dependency);
+    context.addTask(new NodePackageInstallTask());
+
+    return host;
+  };
+};
diff --git a/packages/schematics/angular/migrations/update-8/index_spec.ts b/packages/schematics/angular/migrations/update-8/codelyzer-5_spec.ts
similarity index 100%
rename from packages/schematics/angular/migrations/update-8/index_spec.ts
rename to packages/schematics/angular/migrations/update-8/codelyzer-5_spec.ts
diff --git a/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts b/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts
new file mode 100644
index 000000000000..7290c1a27ca6
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts
@@ -0,0 +1,77 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { Rule, Tree } from '@angular-devkit/schematics';
+import * as ts from '../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
+
+const toDrop: {[importName: string]: true} = {
+  'core-js/es6/symbol': true,
+  'core-js/es6/object': true,
+  'core-js/es6/function': true,
+  'core-js/es6/parse-int': true,
+  'core-js/es6/parse-float': true,
+  'core-js/es6/number': true,
+  'core-js/es6/math': true,
+  'core-js/es6/string': true,
+  'core-js/es6/date': true,
+  'core-js/es6/array': true,
+  'core-js/es6/regexp': true,
+  'core-js/es6/map': true,
+  'zone.js/dist/zone': true,
+  'core-js/es6/set': true,
+};
+
+const header = `/**
+*/
+
+/***************************************************************************************************
+* BROWSER POLYFILLS
+*/
+
+/** IE9, IE10 and IE11 requires all of the following polyfills. **/
+// import 'core-js/es6/weak-map';`;
+
+const applicationPolyfillsHeader = 'APPLICATION IMPORTS';
+
+export const dropES2015Polyfills = (): Rule => {
+  return (tree: Tree) => {
+    const path = '/polyfills.ts';
+    const source = tree.read(path);
+    if (!source) {
+      return;
+    }
+
+    // Start the update of the file.
+    const recorder = tree.beginUpdate(path);
+
+    const sourceFile = ts.createSourceFile(path, source.toString(), ts.ScriptTarget.Latest, true);
+    const imports = sourceFile.statements
+        .filter(s => s.kind === ts.SyntaxKind.ImportDeclaration) as ts.ImportDeclaration[];
+
+    const applicationPolyfillsStart = sourceFile.getText().indexOf(applicationPolyfillsHeader);
+
+    if (imports.length === 0) { return; }
+
+    for (const i of imports) {
+      const module = ts.isStringLiteral(i.moduleSpecifier) && i.moduleSpecifier.text;
+      // We do not want to remove imports which are after the "APPLICATION IMPORTS" header.
+      if (module && toDrop[module] && applicationPolyfillsStart > i.getFullStart()) {
+        recorder.remove(i.getFullStart(), i.getFullWidth());
+      }
+    }
+
+    // We've removed the header since it's part of the JSDoc of the nodes we dropped
+    // As part of the header, we also add the comment for importing WeakMap since
+    // it's not part of the internal ES2015 polyfills we provide.
+    if (sourceFile.getText().indexOf(header) < 0) {
+      recorder.insertLeft(0, header);
+    }
+
+    tree.commitUpdate(recorder);
+  };
+};
diff --git a/packages/schematics/angular/migrations/update-8/drop-es6-polyfills_spec.ts b/packages/schematics/angular/migrations/update-8/drop-es6-polyfills_spec.ts
new file mode 100644
index 000000000000..48734de700d9
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-8/drop-es6-polyfills_spec.ts
@@ -0,0 +1,93 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// tslint:disable:no-big-function
+import { EmptyTree } from '@angular-devkit/schematics';
+import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+
+describe('Migration to version 8', () => {
+  const schematicRunner = new SchematicTestRunner(
+    'migrations',
+    require.resolve('../migration-collection.json'),
+  );
+
+  let tree: UnitTestTree;
+  const polyfillsPath = '/polyfills.ts';
+  const defaultOptions = {};
+  const polyfills = `/**
+ */
+
+/***************************************************************************************************
+ * BROWSER POLYFILLS
+ */
+
+/** IE9, IE10 and IE11 requires all of the following polyfills. **/
+import 'core-js/es6/symbol';
+import 'core-js/es6/object';
+import 'core-js/es6/function';
+import 'core-js/es6/parse-int';
+import 'core-js/es6/parse-float';
+import 'core-js/es6/number';
+import 'core-js/es6/math';
+import 'core-js/es6/string';
+import 'core-js/es6/date';
+import 'core-js/es6/array';
+import 'core-js/es6/regexp';
+import 'core-js/es6/map';
+// import 'core-js/es6/weak-map';
+import 'core-js/es6/set';
+
+/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+// import 'classlist.js';  // Run "npm install --save classlist.js".
+
+/** IE10 and IE11 requires the following for the Reflect API. */
+// import 'core-js/es6/reflect';
+
+/** Evergreen browsers require these. **/
+// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
+import 'core-js/es7/reflect';
+
+/***************************************************************************************************
+ * Zone JS is required by default for Angular itself.
+ */
+import 'zone.js/dist/zone'; // Included with Angular CLI.
+
+/***************************************************************************************************
+ * APPLICATION IMPORTS
+ */
+`;
+
+  const packageJson = {
+    devDependencies: {
+      codelyzer: '^4.5.0',
+    },
+  };
+  const packageJsonPath = '/package.json';
+
+  describe('Migration to differential polyfill loading', () => {
+    beforeEach(() => {
+      tree = new UnitTestTree(new EmptyTree());
+      tree.create(polyfillsPath, polyfills);
+      tree.create(packageJsonPath, JSON.stringify(packageJson, null, 2));
+    });
+
+    it('should drop the es6 polyfills', () => {
+      tree = schematicRunner.runSchematic('migration-07', defaultOptions, tree);
+      const polyfills = tree.readContent(polyfillsPath);
+      expect(polyfills).not.toContain('core-js/es6/symbol');
+      expect(polyfills).not.toContain('core-js/es6/set');
+      expect(polyfills).not.toContain('zone.js');
+      expect(polyfills).not.toContain('Zone');
+
+      // We don't want to drop this commented import comments
+      expect(polyfills).toContain('core-js/es6/reflect');
+      expect(polyfills).toContain('core-js/es7/reflect');
+      expect(polyfills).toContain('BROWSER POLYFILLS');
+      expect(polyfills).toContain('core-js/es6/weak-map');
+    });
+  });
+});
diff --git a/packages/schematics/angular/migrations/update-8/index.ts b/packages/schematics/angular/migrations/update-8/index.ts
index 5bd28c6bddf0..ea3eed359dca 100644
--- a/packages/schematics/angular/migrations/update-8/index.ts
+++ b/packages/schematics/angular/migrations/update-8/index.ts
@@ -5,99 +5,20 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { JsonParseMode, parseJsonAst } from '@angular-devkit/core';
+
 import {
   Rule,
-  SchematicContext,
-  Tree,
   chain,
 } from '@angular-devkit/schematics';
-import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
-import {
-  NodeDependency,
-  NodeDependencyType,
-  addPackageJsonDependency,
-} from '../../utility/dependencies';
-import { findPropertyInAstObject } from '../../utility/json-utils';
-
-const ruleMapping: {[key: string]: string} = {
-  'contextual-life-cycle': 'contextual-lifecycle',
-  'no-conflicting-life-cycle-hooks': 'no-conflicting-lifecycle',
-  'no-life-cycle-call': 'no-lifecycle-call',
-  'use-life-cycle-interface': 'use-lifecycle-interface',
-  'decorator-not-allowed': 'contextual-decorator',
-  'enforce-component-selector': 'use-component-selector',
-  'no-output-named-after-standard-event': 'no-output-native',
-  'use-host-property-decorator': 'no-host-metadata-property',
-  'use-input-property-decorator': 'no-inputs-metadata-property',
-  'use-output-property-decorator': 'no-outputs-metadata-property',
-  'no-queries-parameter': 'no-queries-metadata-property',
-  'pipe-impure': 'no-pipe-impure',
-  'use-view-encapsulation': 'use-component-view-encapsulation',
-  i18n: 'template-i18n',
-  'banana-in-box': 'template-banana-in-box',
-  'no-template-call-expression': 'template-no-call-expression',
-  'templates-no-negated-async': 'template-no-negated-async',
-  'trackBy-function': 'template-use-track-by-function',
-  'no-attribute-parameter-decorator': 'no-attribute-decorator',
-  'max-inline-declarations': 'component-max-inline-declarations',
-};
-
-function updateTsLintConfig(): Rule {
-  return (host: Tree) => {
-    const tsLintPath = '/tslint.json';
-    const buffer = host.read(tsLintPath);
-    if (!buffer) {
-      return host;
-    }
-    const tsCfgAst = parseJsonAst(buffer.toString(), JsonParseMode.Loose);
-
-    if (tsCfgAst.kind != 'object') {
-      return host;
-    }
-
-    const rulesNode = findPropertyInAstObject(tsCfgAst, 'rules');
-    if (!rulesNode || rulesNode.kind != 'object') {
-      return host;
-    }
-
-    const recorder = host.beginUpdate(tsLintPath);
-
-    rulesNode.properties.forEach(prop => {
-      const mapping = ruleMapping[prop.key.value];
-      if (mapping) {
-        recorder.remove(prop.key.start.offset + 1, prop.key.value.length);
-        recorder.insertLeft(prop.key.start.offset + 1, mapping);
-      }
-    });
-
-    host.commitUpdate(recorder);
-
-    return host;
-  };
-}
-
-function updatePackageJson() {
-  return (host: Tree, context: SchematicContext) => {
-    const dependency: NodeDependency = {
-      type: NodeDependencyType.Dev,
-      name: 'codelyzer',
-      version: '^5.0.0',
-      overwrite: true,
-    };
-
-    addPackageJsonDependency(host, dependency);
-    context.addTask(new NodePackageInstallTask());
-
-    return host;
-  };
-}
+import { updatePackageJson, updateTsLintConfig } from './codelyzer-5';
+import { dropES2015Polyfills } from './drop-es6-polyfills';
 
 export default function(): Rule {
   return () => {
     return chain([
       updateTsLintConfig(),
       updatePackageJson(),
+      dropES2015Polyfills(),
     ]);
   };
 }

From cfa1649fddcbf6d5ad4750c532a561f2fe545219 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 7 Mar 2019 10:49:30 -0500
Subject: [PATCH 1036/1703] refactor(@angular/cli): use standard node
 resolution methods where possible

---
 packages/angular/cli/commands/add-impl.ts | 17 ++++++-----------
 packages/angular/cli/lib/init.ts          | 10 +---------
 packages/angular/cli/upgrade/version.ts   | 11 +++--------
 3 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/packages/angular/cli/commands/add-impl.ts b/packages/angular/cli/commands/add-impl.ts
index c7f6c77dbb2b..e3d95becc3d3 100644
--- a/packages/angular/cli/commands/add-impl.ts
+++ b/packages/angular/cli/commands/add-impl.ts
@@ -6,9 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { analytics, tags, terminal } from '@angular-devkit/core';
-import { ModuleNotFoundException, resolve } from '@angular-devkit/core/node';
 import { NodePackageDoesNotSupportSchematics } from '@angular-devkit/schematics/tools';
-import { dirname } from 'path';
+import { dirname, join } from 'path';
 import { intersects, prerelease, rcompare, satisfies, valid, validRange } from 'semver';
 import { isPackageNameSafeForAnalytics } from '../models/analytics';
 import { Arguments } from '../models/interface';
@@ -160,15 +159,11 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
 
   private isPackageInstalled(name: string): boolean {
     try {
-      resolve(name, {
-        checkLocal: true,
-        basedir: this.workspace.root,
-        resolvePackageJson: true,
-      });
+      require.resolve(join(name, 'package.json'), { paths: [this.workspace.root] });
 
       return true;
     } catch (e) {
-      if (!(e instanceof ModuleNotFoundException)) {
+      if (e.code !== 'MODULE_NOT_FOUND') {
         throw e;
       }
     }
@@ -209,9 +204,9 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
   private async findProjectVersion(name: string): Promise<string | null> {
     let installedPackage;
     try {
-      installedPackage = resolve(
-        name,
-        { checkLocal: true, basedir: this.workspace.root, resolvePackageJson: true },
+      installedPackage = require.resolve(
+        join(name, 'package.json'),
+        { paths: [this.workspace.root] },
       );
     } catch { }
 
diff --git a/packages/angular/cli/lib/init.ts b/packages/angular/cli/lib/init.ts
index be3884b154db..bbaa4a00d81d 100644
--- a/packages/angular/cli/lib/init.ts
+++ b/packages/angular/cli/lib/init.ts
@@ -9,7 +9,6 @@ import 'symbol-observable';
 // symbol polyfill must go first
 // tslint:disable-next-line:ordered-imports import-groups
 import { tags, terminal } from '@angular-devkit/core';
-import { resolve } from '@angular-devkit/core/node';
 import * as fs from 'fs';
 import * as path from 'path';
 import { SemVer } from 'semver';
@@ -77,14 +76,7 @@ if (process.env['NG_CLI_PROFILING']) {
 
 let cli;
 try {
-  const projectLocalCli = resolve(
-    '@angular/cli',
-    {
-      checkGlobal: false,
-      basedir: process.cwd(),
-      preserveSymlinks: true,
-    },
-  );
+  const projectLocalCli = require.resolve('@angular/cli', { paths: [process.cwd()] });
 
   // This was run from a global, check local version.
   const globalVersion = new SemVer(packageJson['version']);
diff --git a/packages/angular/cli/upgrade/version.ts b/packages/angular/cli/upgrade/version.ts
index f63e18154a3d..53670738ebe6 100644
--- a/packages/angular/cli/upgrade/version.ts
+++ b/packages/angular/cli/upgrade/version.ts
@@ -7,7 +7,6 @@
  */
 
 import { tags, terminal } from '@angular-devkit/core';
-import { resolve } from '@angular-devkit/core/node';
 import * as path from 'path';
 import { SemVer } from 'semver';
 
@@ -41,13 +40,9 @@ export class Version {
     let rxjsPkgJson;
 
     try {
-      const resolveOptions = {
-        basedir: projectRoot,
-        checkGlobal: false,
-        checkLocal: true,
-      };
-      const angularPackagePath = resolve('@angular/core/package.json', resolveOptions);
-      const rxjsPackagePath = resolve('rxjs/package.json', resolveOptions);
+      const resolveOptions = { paths: [projectRoot] };
+      const angularPackagePath = require.resolve('@angular/core/package.json', resolveOptions);
+      const rxjsPackagePath = require.resolve('rxjs/package.json', resolveOptions);
 
       angularPkgJson = require(angularPackagePath);
       rxjsPkgJson = require(rxjsPackagePath);

From 9a1f48f99077cf180e087587542db3e68c967675 Mon Sep 17 00:00:00 2001
From: Minko Gechev <mgechev@google.com>
Date: Wed, 27 Mar 2019 15:24:59 -0700
Subject: [PATCH 1037/1703] feat(@schematics/angular): update to codelyzer 5

This PR also updates the hello world sample app and migrates its
`tslint.json` file.
---
 .../angular_devkit/build_angular/package.json |  2 +-
 .../workspace/files/package.json.template     |  2 +-
 .../workspace/files/tslint.json.template      | 18 +++----
 .../hello-world-app/package.json              |  2 +-
 .../build_angular/hello-world-app/tslint.json |  8 +--
 yarn.lock                                     | 52 ++++++++++++++-----
 6 files changed, 56 insertions(+), 28 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 52ae8c537d72..10362c97918f 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -67,7 +67,7 @@
     "@angular/platform-server": "^8.0.0-beta.9",
     "@angular/router": "^8.0.0-beta.9",
     "@angular/service-worker": "^8.0.0-beta.9",
-    "codelyzer": "^4.2.1",
+    "codelyzer": "^5.0.0",
     "core-js": "^2.4.1",
     "bootstrap": "^4.0.0",
     "font-awesome": "^4.7.0",
diff --git a/packages/schematics/angular/workspace/files/package.json.template b/packages/schematics/angular/workspace/files/package.json.template
index 9cdefb103276..efa062d7908e 100644
--- a/packages/schematics/angular/workspace/files/package.json.template
+++ b/packages/schematics/angular/workspace/files/package.json.template
@@ -31,7 +31,7 @@
     "@types/node": "~8.9.4",<% if (!minimal) { %>
     "@types/jasmine": "~3.3.8",
     "@types/jasminewd2": "~2.0.3",
-    "codelyzer": "~4.5.0",
+    "codelyzer": "^5.0.0",
     "jasmine-core": "~3.3.0",
     "jasmine-spec-reporter": "~4.2.1",
     "karma": "~4.0.1",
diff --git a/packages/schematics/angular/workspace/files/tslint.json.template b/packages/schematics/angular/workspace/files/tslint.json.template
index ba9eff580267..62a9cc5f0cac 100644
--- a/packages/schematics/angular/workspace/files/tslint.json.template
+++ b/packages/schematics/angular/workspace/files/tslint.json.template
@@ -61,20 +61,20 @@
       "single"
     ],
     "trailing-comma": false,
-    "banana-in-box": true,
     "component-class-suffix": true,
-    "contextual-life-cycle": true,
+    "contextual-lifecycle": true,
     "directive-class-suffix": true,
-    "no-conflicting-life-cycle-hooks": true,
+    "no-conflicting-lifecycle": true,
+    "no-host-metadata-property": true,
     "no-input-rename": true,
-    "no-output-named-after-standard-event": true,
+    "no-inputs-metadata-property": true,
+    "no-output-native": true,
     "no-output-on-prefix": true,
     "no-output-rename": true,
-    "templates-no-negated-async": true,
-    "use-host-property-decorator": true,
-    "use-input-property-decorator": true,
-    "use-life-cycle-interface": true,
-    "use-output-property-decorator": true,
+    "no-outputs-metadata-property": true,
+    "template-banana-in-box": true,
+    "template-no-negated-async": true,
+    "use-lifecycle-interface": true,
     "use-pipe-transform-interface": true
   }
 }
\ No newline at end of file
diff --git a/tests/angular_devkit/build_angular/hello-world-app/package.json b/tests/angular_devkit/build_angular/hello-world-app/package.json
index 8fddce5543bd..97164be01a98 100644
--- a/tests/angular_devkit/build_angular/hello-world-app/package.json
+++ b/tests/angular_devkit/build_angular/hello-world-app/package.json
@@ -34,7 +34,7 @@
     "@types/jasmine": "~2.8.3",
     "@types/jasminewd2": "~2.0.2",
     "@types/node": "~6.0.60",
-    "codelyzer": "^4.0.1",
+    "codelyzer": "^5.0.0",
     "jasmine-core": "~2.8.0",
     "jasmine-spec-reporter": "~4.2.1",
     "karma": "~2.0.0",
diff --git a/tests/angular_devkit/build_angular/hello-world-app/tslint.json b/tests/angular_devkit/build_angular/hello-world-app/tslint.json
index 69973de2a517..b265b58ffecb 100644
--- a/tests/angular_devkit/build_angular/hello-world-app/tslint.json
+++ b/tests/angular_devkit/build_angular/hello-world-app/tslint.json
@@ -130,12 +130,12 @@
       "kebab-case"
     ],
     "no-output-on-prefix": true,
-    "use-input-property-decorator": true,
-    "use-output-property-decorator": true,
-    "use-host-property-decorator": true,
+    "no-inputs-metadata-property": true,
+    "no-outputs-metadata-property": true,
+    "no-host-metadata-property": true,
     "no-input-rename": true,
     "no-output-rename": true,
-    "use-life-cycle-interface": true,
+    "use-lifecycle-interface": true,
     "use-pipe-transform-interface": true,
     "component-class-suffix": true,
     "directive-class-suffix": true
diff --git a/yarn.lock b/yarn.lock
index c30322ecfbf7..6f290b296b62 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1017,6 +1017,14 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+aria-query@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-3.0.0.tgz#65b3fcc1ca1155a8c9ae64d6eee297f15d5133cc"
+  integrity sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=
+  dependencies:
+    ast-types-flow "0.0.7"
+    commander "^2.11.0"
+
 arr-diff@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
@@ -1153,6 +1161,11 @@ assign-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
+ast-types-flow@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
+  integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
+
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
@@ -1224,6 +1237,13 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
   integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
+axobject-query@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz#ea187abe5b9002b377f925d8bf7d1c561adf38f9"
+  integrity sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==
+  dependencies:
+    ast-types-flow "0.0.7"
+
 babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
@@ -2017,17 +2037,20 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-codelyzer@^4.2.1:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-4.5.0.tgz#a65ddeeeca2894653253a89bfa229118ff9f59b1"
-  integrity sha512-oO6vCkjqsVrEsmh58oNlnJkRXuA30hF8cdNAQV9DytEalDwyOFRvHMnlKFzmOStNerOmPGZU9GAHnBo4tGvtiQ==
+codelyzer@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.0.0.tgz#e4032efb23a7c5d4bcfe7321fc1789490c679837"
+  integrity sha512-Bif70XYt8NFf/Q9GPTxmC86OsBRfQZq1dBjdruJ5kZhJ8/jKhJL6MvCLKnYtSOG6Rhiv/44DU0cHk6GYthjy8Q==
   dependencies:
     app-root-path "^2.1.0"
-    css-selector-tokenizer "^0.7.0"
+    aria-query "^3.0.0"
+    axobject-query "^2.0.2"
+    css-selector-tokenizer "^0.7.1"
     cssauron "^1.4.0"
+    damerau-levenshtein "^1.0.4"
     semver-dsl "^1.0.1"
     source-map "^0.5.7"
-    sprintf-js "^1.1.1"
+    sprintf-js "^1.1.2"
 
 collection-utils@^1.0.1:
   version "1.0.1"
@@ -2112,7 +2135,7 @@ combined-stream@1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.12.0:
+commander@^2.11.0, commander@^2.12.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
   integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
@@ -2582,7 +2605,7 @@ css-parse@1.7.x:
   resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
   integrity sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=
 
-css-selector-tokenizer@^0.7.0:
+css-selector-tokenizer@^0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz#a177271a8bca5019172f4f891fc6eed9cbf68d5d"
   integrity sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==
@@ -2625,6 +2648,11 @@ cyclist@~0.2.2:
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
   integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
 
+damerau-levenshtein@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514"
+  integrity sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ=
+
 dargs@^4.0.1:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
@@ -8642,10 +8670,10 @@ split@^1.0.0:
   dependencies:
     through "2"
 
-sprintf-js@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.1.tgz#36be78320afe5801f6cea3ee78b6e5aab940ea0c"
-  integrity sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw=
+sprintf-js@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
+  integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
 
 sprintf-js@~1.0.2:
   version "1.0.3"

From 888bb27815097e03d82c85aef1a3547ea7769b5c Mon Sep 17 00:00:00 2001
From: JiaLiPassion <JiaLi.Passion@gmail.com>
Date: Sun, 31 Mar 2019 23:56:05 +0900
Subject: [PATCH 1038/1703] refactor: rename Zone 'BLACK_LISTED_EVENTS' to
 'UNPATCHED_EVENTS'

---
 .../angular/application/files/src/polyfills.ts.template         | 2 +-
 tests/legacy-cli/e2e/assets/1.7-project/src/polyfills.ts        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/application/files/src/polyfills.ts.template b/packages/schematics/angular/application/files/src/polyfills.ts.template
index 75d639398924..aa665d6b8740 100644
--- a/packages/schematics/angular/application/files/src/polyfills.ts.template
+++ b/packages/schematics/angular/application/files/src/polyfills.ts.template
@@ -43,7 +43,7 @@
  *
  * (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
  * (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
- * (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
+ * (window as any).__zone_symbol__UNPATCHED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
  *
  *  in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
  *  with the following flag, it will bypass `zone.js` patch for IE/Edge
diff --git a/tests/legacy-cli/e2e/assets/1.7-project/src/polyfills.ts b/tests/legacy-cli/e2e/assets/1.7-project/src/polyfills.ts
index e17a0b1ea437..02dd2ab75de2 100644
--- a/tests/legacy-cli/e2e/assets/1.7-project/src/polyfills.ts
+++ b/tests/legacy-cli/e2e/assets/1.7-project/src/polyfills.ts
@@ -59,7 +59,7 @@ import 'core-js/es7/reflect';
 
  // (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
  // (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
- // (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
+ // (window as any).__zone_symbol__UNPATCHED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
 
  /*
  * in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js

From f84abfc572dc7ebe70c15b3d29ab43a8d5cabb2c Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 22 Mar 2019 13:02:31 +0100
Subject: [PATCH 1039/1703] feat(@schematics/angular): remove ivy-ngcc
 postinstall script from new application

---
 .../schematics/angular/application/index.ts   | 35 -------------------
 .../angular/application/index_spec.ts         |  6 ----
 2 files changed, 41 deletions(-)

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 7a5d0ea19705..73fcd592e390 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -175,40 +175,6 @@ function mergeWithRootTsLint(parentHost: Tree) {
   };
 }
 
-function addPostInstallScript() {
-  return (host: Tree) => {
-    const pkgJsonPath = '/package.json';
-    const buffer = host.read(pkgJsonPath);
-    if (!buffer) {
-      throw new SchematicsException('Could not read package.json.');
-    }
-
-    const packageJsonAst = parseJsonAst(buffer.toString(), JsonParseMode.Strict);
-    if (packageJsonAst.kind !== 'object') {
-      throw new SchematicsException('Invalid package.json. Was expecting an object.');
-    }
-
-    const scriptsNode = findPropertyInAstObject(packageJsonAst, 'scripts');
-    if (scriptsNode && scriptsNode.kind === 'object') {
-      const recorder = host.beginUpdate(pkgJsonPath);
-      const postInstall = findPropertyInAstObject(scriptsNode, 'postinstall');
-
-      if (!postInstall) {
-        // postinstall script not found, add it.
-        insertPropertyInAstObjectInOrder(
-          recorder,
-          scriptsNode,
-          'postinstall',
-          'ivy-ngcc',
-          4,
-        );
-      }
-
-      host.commitUpdate(recorder);
-    }
-  };
-}
-
 function addAppToWorkspaceFile(options: ApplicationOptions, workspace: WorkspaceSchema): Rule {
   // TODO: use JsonAST
   // const workspacePath = '/angular.json';
@@ -453,7 +419,6 @@ export default function (options: ApplicationOptions): Rule {
           move(sourceDir),
         ]), MergeStrategy.Overwrite),
       options.minimal ? noop() : schematic('e2e', e2eOptions),
-      options.enableIvy ? addPostInstallScript() : noop(),
       options.skipPackageJson ? noop() : addDependenciesToPackageJson(options),
       options.lintFix ? applyLintFix(appDir) : noop(),
     ]);
diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
index 9555887e4838..2895b5121e6f 100644
--- a/packages/schematics/angular/application/index_spec.ts
+++ b/packages/schematics/angular/application/index_spec.ts
@@ -217,12 +217,6 @@ describe('Application Schematic', () => {
       expect(pkg.devDependencies['typescript']).toEqual(latestVersions.TypeScript);
     });
 
-    it(`should add a postinstall in package.json when 'enableIvy'`, () => {
-      const tree = schematicRunner.runSchematic('application', { ...defaultOptions, enableIvy: true }, workspaceTree);
-      const pkg = JSON.parse(tree.readContent('/package.json'));
-      expect(pkg.scripts.postinstall).toEqual('ivy-ngcc');
-    });
-
     it(`should not override existing users dependencies`, () => {
       const oldPackageJson = workspaceTree.readContent('package.json');
       workspaceTree.overwrite('package.json', oldPackageJson.replace(

From 655626c28433eb195ca2d28c9b6bc4679b98f2eb Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 22 Mar 2019 13:03:27 +0100
Subject: [PATCH 1040/1703] refactor(@ngtools/webpack): move interfaces to
 separate file

This is to avoid circular imports
---
 .../webpack/src/angular_compiler_plugin.ts    | 64 +++---------------
 packages/ngtools/webpack/src/interfaces.ts    | 67 +++++++++++++++++++
 2 files changed, 75 insertions(+), 56 deletions(-)
 create mode 100644 packages/ngtools/webpack/src/interfaces.ts

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index ae6826afe17d..e451e12726ee 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -36,9 +36,14 @@ import * as path from 'path';
 import * as ts from 'typescript';
 import { Compiler, compilation } from 'webpack';
 import { time, timeEnd } from './benchmark';
-import { WebpackCompilerHost, workaroundResolve } from './compiler_host';
+import { WebpackCompilerHost } from './compiler_host';
 import { resolveEntryModuleFromMain } from './entry_resolver';
 import { DiagnosticMode, gatherDiagnostics, hasErrors } from './gather_diagnostics';
+import {
+  AngularCompilerPluginOptions,
+  ContextElementDependencyConstructor,
+  PLATFORM,
+} from './interfaces';
 import { LazyRouteMap, findLazyRoutes } from './lazy_routes';
 import { TypeScriptPathsPlugin } from './paths-plugin';
 import { WebpackResourceLoader } from './resource_loader';
@@ -63,6 +68,7 @@ import {
   MESSAGE_KIND,
   UpdateMessage,
 } from './type_checker_messages';
+import { workaroundResolve } from './utils';
 import {
   VirtualFileSystemDecorator,
   VirtualWatchFileSystemDecorator,
@@ -76,61 +82,6 @@ import { WebpackInputHost } from './webpack-input-host';
 
 const treeKill = require('tree-kill');
 
-export interface ContextElementDependency { }
-
-export interface ContextElementDependencyConstructor {
-  new(modulePath: string, name: string): ContextElementDependency;
-}
-
-/**
- * Option Constants
- */
-export interface AngularCompilerPluginOptions {
-  sourceMap?: boolean;
-  tsConfigPath: string;
-  basePath?: string;
-  entryModule?: string;
-  mainPath?: string;
-  skipCodeGeneration?: boolean;
-  hostReplacementPaths?: { [path: string]: string } | ((path: string) => string);
-  forkTypeChecker?: boolean;
-  i18nInFile?: string;
-  i18nInFormat?: string;
-  i18nOutFile?: string;
-  i18nOutFormat?: string;
-  locale?: string;
-  missingTranslation?: string;
-  platform?: PLATFORM;
-  nameLazyFiles?: boolean;
-  logger?: logging.Logger;
-  directTemplateLoading?: boolean;
-  // When using the loadChildren string syntax, @ngtools/webpack must query @angular/compiler-cli
-  // via a private API to know which lazy routes exist. This increases build and rebuild time.
-  // When using Ivy, the string syntax is not supported at all. Thus we shouldn't attempt that.
-  // This option is also used for when the compilation doesn't need this sort of processing at all.
-  discoverLazyRoutes?: boolean;
-  importFactories?: boolean;
-
-  // added to the list of lazy routes
-  additionalLazyModules?: { [module: string]: string };
-  additionalLazyModuleResources?: string[];
-
-  // The ContextElementDependency of correct Webpack compilation.
-  // This is needed when there are multiple Webpack installs.
-  contextElementDependencyConstructor?: ContextElementDependencyConstructor;
-
-  // Use tsconfig to include path globs.
-  compilerOptions?: ts.CompilerOptions;
-
-  host?: virtualFs.Host<fs.Stats>;
-  platformTransformers?: ts.TransformerFactory<ts.SourceFile>[];
-}
-
-export enum PLATFORM {
-  Browser,
-  Server,
-}
-
 export class AngularCompilerPlugin {
   private _options: AngularCompilerPluginOptions;
 
@@ -701,6 +652,7 @@ export class AngularCompilerPlugin {
         host,
         true,
         this._options.directTemplateLoading,
+        this._platform,
       );
 
       // Create and set a new WebpackResourceLoader in AOT
diff --git a/packages/ngtools/webpack/src/interfaces.ts b/packages/ngtools/webpack/src/interfaces.ts
new file mode 100644
index 000000000000..318e3ffdf082
--- /dev/null
+++ b/packages/ngtools/webpack/src/interfaces.ts
@@ -0,0 +1,67 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { logging, virtualFs } from '@angular-devkit/core';
+import * as fs from 'fs';
+import * as ts from 'typescript';
+
+export enum PLATFORM {
+  Browser,
+  Server,
+}
+
+export interface ContextElementDependency { }
+
+export interface ContextElementDependencyConstructor {
+  new(modulePath: string, name: string): ContextElementDependency;
+}
+
+/**
+ * Option Constants
+ */
+export interface AngularCompilerPluginOptions {
+  sourceMap?: boolean;
+  tsConfigPath: string;
+  basePath?: string;
+  entryModule?: string;
+  mainPath?: string;
+  skipCodeGeneration?: boolean;
+  hostReplacementPaths?: { [path: string]: string } | ((path: string) => string);
+  forkTypeChecker?: boolean;
+  i18nInFile?: string;
+  i18nInFormat?: string;
+  i18nOutFile?: string;
+  i18nOutFormat?: string;
+  locale?: string;
+  missingTranslation?: string;
+  platform?: PLATFORM;
+  nameLazyFiles?: boolean;
+  logger?: logging.Logger;
+  directTemplateLoading?: boolean;
+
+  // When using the loadChildren string syntax, @ngtools/webpack must query @angular/compiler-cli
+  // via a private API to know which lazy routes exist. This increases build and rebuild time.
+  // When using Ivy, the string syntax is not supported at all. Thus we shouldn't attempt that.
+  // This option is also used for when the compilation doesn't need this sort of processing at all.
+  discoverLazyRoutes?: boolean;
+  importFactories?: boolean;
+
+  // added to the list of lazy routes
+  additionalLazyModules?: { [module: string]: string };
+  additionalLazyModuleResources?: string[];
+
+  // The ContextElementDependency of correct Webpack compilation.
+  // This is needed when there are multiple Webpack installs.
+  contextElementDependencyConstructor?: ContextElementDependencyConstructor;
+
+  // Use tsconfig to include path globs.
+  compilerOptions?: ts.CompilerOptions;
+
+  host?: virtualFs.Host<fs.Stats>;
+  platformTransformers?: ts.TransformerFactory<ts.SourceFile>[];
+}

From d2e22e97818c6582ce4a9942c59fcac4a8aaf60e Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 22 Mar 2019 13:06:03 +0100
Subject: [PATCH 1041/1703] feat(@ngtools/webpack): add NGCC as part of the
 workflow

When add module is resolved, it will try to convert the module using the `NGCC` API.

NGCC will be run hooked to the compiler during the module resolution, using the Compiler Host methods 'resolveTypeReferenceDirectives' and 'resolveModuleNames'. It will process a single entry for each module and is based on the first match from the Webpack mainFields.

When Ivy is enabled we also append the '_ivy_ngcc' suffixed properties
to the mainFields so that Webpack resolver will resolve ngcc processed
modules first.
---
 .../webpack/src/angular_compiler_plugin.ts    | 56 ++++++++++-
 packages/ngtools/webpack/src/compiler_host.ts | 50 ++++++++--
 packages/ngtools/webpack/src/index.ts         |  1 +
 .../ngtools/webpack/src/ngcc_processor.ts     | 97 +++++++++++++++++++
 packages/ngtools/webpack/src/utils.ts         | 20 ++++
 packages/ngtools/webpack/src/utils_spec.ts    | 18 ++++
 6 files changed, 233 insertions(+), 9 deletions(-)
 create mode 100644 packages/ngtools/webpack/src/ngcc_processor.ts
 create mode 100644 packages/ngtools/webpack/src/utils.ts
 create mode 100644 packages/ngtools/webpack/src/utils_spec.ts

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index e451e12726ee..6dda7de68b0f 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -45,6 +45,7 @@ import {
   PLATFORM,
 } from './interfaces';
 import { LazyRouteMap, findLazyRoutes } from './lazy_routes';
+import { NgccProcessor } from './ngcc_processor';
 import { TypeScriptPathsPlugin } from './paths-plugin';
 import { WebpackResourceLoader } from './resource_loader';
 import {
@@ -68,7 +69,7 @@ import {
   MESSAGE_KIND,
   UpdateMessage,
 } from './type_checker_messages';
-import { workaroundResolve } from './utils';
+import { flattenArray, workaroundResolve } from './utils';
 import {
   VirtualFileSystemDecorator,
   VirtualWatchFileSystemDecorator,
@@ -123,6 +124,8 @@ export class AngularCompilerPlugin {
   // Logging.
   private _logger: logging.Logger;
 
+  private _mainFields: string[] = [];
+
   constructor(options: AngularCompilerPluginOptions) {
     this._options = Object.assign({}, options);
     this._setupOptions(this._options);
@@ -594,6 +597,16 @@ export class AngularCompilerPlugin {
   // Registration hook for webpack plugin.
   // tslint:disable-next-line:no-big-function
   apply(compiler: Compiler & { watchMode?: boolean }) {
+    // The below is require by NGCC processor
+    // since we need to know which fields we need to process
+    compiler.hooks.environment.tap('angular-compiler', () => {
+      const { options } = compiler;
+      const mainFields = options.resolve && options.resolve.mainFields;
+      if (mainFields) {
+        this._mainFields = flattenArray(mainFields);
+      }
+    });
+
     // cleanup if not watching
     compiler.hooks.thisCompilation.tap('angular-compiler', compilation => {
       compilation.hooks.finishModules.tap('angular-compiler', () => {
@@ -645,6 +658,25 @@ export class AngularCompilerPlugin {
         }
       }
 
+      let ngccProcessor: NgccProcessor | undefined;
+      if (this._compilerOptions.enableIvy) {
+        let ngcc: typeof import('@angular/compiler-cli/ngcc') | undefined;
+        try {
+          // this is done for the sole reason that @ngtools/webpack
+          // support versions of Angular that don't have NGCC API
+          ngcc = require('@angular/compiler-cli/ngcc');
+        } catch {
+        }
+
+        if (ngcc) {
+          ngccProcessor = new NgccProcessor(
+            ngcc,
+            this._mainFields,
+            compilerWithFileSystems.inputFileSystem,
+          );
+        }
+      }
+
       // Create the webpack compiler host.
       const webpackCompilerHost = new WebpackCompilerHost(
         this._compilerOptions,
@@ -652,7 +684,7 @@ export class AngularCompilerPlugin {
         host,
         true,
         this._options.directTemplateLoading,
-        this._platform,
+        ngccProcessor,
       );
 
       // Create and set a new WebpackResourceLoader in AOT
@@ -764,6 +796,26 @@ export class AngularCompilerPlugin {
     });
 
     compiler.hooks.afterResolvers.tap('angular-compiler', compiler => {
+      if (this._compilerOptions.enableIvy) {
+        // When Ivy is enabled we need to add the fields added by NGCC
+        // to take precedence over the provided mainFields.
+        // NGCC adds fields in package.json suffixed with '_ivy_ngcc'
+        // Example: module -> module__ivy_ngcc
+        // tslint:disable-next-line:no-any
+        (compiler as any).resolverFactory.hooks.resolveOptions
+          .for('normal')
+          // tslint:disable-next-line:no-any
+          .tap('WebpackOptionsApply', (resolveOptions: any) => {
+            const mainFields = (resolveOptions.mainFields as string[])
+              .map(f => [`${f}_ivy_ngcc`, f]);
+
+            return {
+              ...resolveOptions,
+              mainFields: flattenArray(mainFields),
+            };
+          });
+      }
+
       // tslint:disable-next-line:no-any
       (compiler as any).resolverFactory.hooks.resolver
         .for('normal')
diff --git a/packages/ngtools/webpack/src/compiler_host.ts b/packages/ngtools/webpack/src/compiler_host.ts
index d5091ed73ac0..93701c93a161 100644
--- a/packages/ngtools/webpack/src/compiler_host.ts
+++ b/packages/ngtools/webpack/src/compiler_host.ts
@@ -15,7 +15,9 @@ import {
 } from '@angular-devkit/core';
 import { Stats } from 'fs';
 import * as ts from 'typescript';
+import { NgccProcessor } from './ngcc_processor';
 import { WebpackResourceLoader } from './resource_loader';
+import { workaroundResolve } from './utils';
 
 
 export interface OnErrorFn {
@@ -47,6 +49,7 @@ export class WebpackCompilerHost implements ts.CompilerHost {
     host: virtualFs.Host,
     private readonly cacheSourceFiles: boolean,
     private readonly directTemplateLoading = false,
+    private readonly ngccProcessor?: NgccProcessor,
   ) {
     this._syncHost = new virtualFs.SyncDelegateHost(host);
     this._memoryHost = new virtualFs.SyncDelegateHost(new virtualFs.SimpleMemoryHost());
@@ -354,13 +357,46 @@ export class WebpackCompilerHost implements ts.CompilerHost {
   trace(message: string) {
     console.log(message);
   }
-}
 
+  resolveModuleNames(
+    moduleNames: string[],
+    containingFile: string,
+  ): (ts.ResolvedModule | undefined)[] {
+    return moduleNames.map(moduleName => {
+      const { resolvedModule } = ts.resolveModuleName(
+        moduleName,
+        workaroundResolve(containingFile),
+        this._options,
+        this,
+      );
+
+      if (this._options.enableIvy && resolvedModule && this.ngccProcessor) {
+        this.ngccProcessor.processModule(moduleName, resolvedModule);
+      }
+
+      return resolvedModule;
+    });
+  }
+
+  resolveTypeReferenceDirectives(
+    typeReferenceDirectiveNames: string[],
+    containingFile: string,
+    redirectedReference?: ts.ResolvedProjectReference,
+  ): (ts.ResolvedTypeReferenceDirective | undefined)[] {
+      return typeReferenceDirectiveNames.map(moduleName => {
+        const { resolvedTypeReferenceDirective } = ts.resolveTypeReferenceDirective(
+          moduleName,
+          workaroundResolve(containingFile),
+          this._options,
+          this,
+          redirectedReference,
+        );
+
+        if (this._options.enableIvy && resolvedTypeReferenceDirective && this.ngccProcessor) {
+          this.ngccProcessor.processModule(moduleName, resolvedTypeReferenceDirective);
+        }
 
-// `TsCompilerAotCompilerTypeCheckHostAdapter` in @angular/compiler-cli seems to resolve module
-// names directly via `resolveModuleName`, which prevents full Path usage.
-// To work around this we must provide the same path format as TS internally uses in
-// the SourceFile paths.
-export function workaroundResolve(path: Path | string) {
-  return getSystemPath(normalize(path)).replace(/\\/g, '/');
+        return resolvedTypeReferenceDirective;
+      });
+  }
 }
diff --git a/packages/ngtools/webpack/src/index.ts b/packages/ngtools/webpack/src/index.ts
index 68ee8c1ecb39..de913db65b87 100644
--- a/packages/ngtools/webpack/src/index.ts
+++ b/packages/ngtools/webpack/src/index.ts
@@ -7,6 +7,7 @@
  */
 
 export * from './angular_compiler_plugin';
+export * from './interfaces';
 export { ngcLoader as default } from './loader';
 
 export const NgToolsLoader = __filename;
diff --git a/packages/ngtools/webpack/src/ngcc_processor.ts b/packages/ngtools/webpack/src/ngcc_processor.ts
new file mode 100644
index 000000000000..4a42e14e5d9a
--- /dev/null
+++ b/packages/ngtools/webpack/src/ngcc_processor.ts
@@ -0,0 +1,97 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import * as ts from 'typescript';
+import { InputFileSystem } from 'webpack';
+import { time, timeEnd } from './benchmark';
+import { workaroundResolve } from './utils';
+
+// We cannot create a plugin for this, because NGTSC requires addition type
+// information which ngcc creates when processing a package which was compiled with NGC.
+
+// Example of such errors:
+// ERROR in node_modules/@angular/platform-browser/platform-browser.d.ts(42,22):
+// error TS-996002: Appears in the NgModule.imports of AppModule,
+// but could not be resolved to an NgModule class
+
+// We now transform a package and it's typings when NGTSC is resolving a module.
+
+export class NgccProcessor {
+  private _processedModules = new Set<string>();
+
+  constructor(
+    private readonly ngcc: typeof import('@angular/compiler-cli/ngcc'),
+    private readonly propertiesToConsider: string[],
+    private readonly inputFileSystem: InputFileSystem,
+  ) {
+  }
+
+  processModule(
+    moduleName: string,
+    resolvedModule: ts.ResolvedModule | ts.ResolvedTypeReferenceDirective,
+  ): void {
+    const resolvedFileName = resolvedModule.resolvedFileName;
+    if (
+      !resolvedFileName
+      || moduleName.startsWith('.')
+      || this._processedModules.has(moduleName)) {
+      // Skip when module is unknown, relative or NGCC compiler is not found or already processed.
+      return;
+    }
+
+    const packageJsonPath = this.tryResolvePackage(moduleName, resolvedFileName);
+    if (!packageJsonPath) {
+      // add it to processed so the second time round we skip this.
+      this._processedModules.add(moduleName);
+
+      return;
+    }
+    const normalizedJsonPath = workaroundResolve(packageJsonPath);
+
+    const timeLabel = `NgccProcessor.processModule.ngcc.process+${moduleName}`;
+    time(timeLabel);
+    this.ngcc.process({
+      basePath: normalizedJsonPath.substring(0, normalizedJsonPath.indexOf(moduleName)),
+      targetEntryPointPath: moduleName,
+      propertiesToConsider: this.propertiesToConsider,
+      compileAllFormats: false,
+      createNewEntryPointFormats: true,
+    });
+    timeEnd(timeLabel);
+
+    // Purge this file from cache, since NGCC add new mainFields. Ex: module_ivy_ngcc
+    // which are unknown in the cached file.
+
+    // tslint:disable-next-line:no-any
+    (this.inputFileSystem as any).purge(packageJsonPath);
+
+    this._processedModules.add(moduleName);
+  }
+
+  /**
+   * Try resolve a package.json file from the resolved .d.ts file.
+   */
+  private tryResolvePackage(moduleName: string, resolvedFileName: string): string | undefined {
+    try {
+      // This is based on the logic in the NGCC compiler
+      // tslint:disable-next-line:max-line-length
+      // See: https://github.com/angular/angular/blob/b93c1dffa17e4e6900b3ab1b9e554b6da92be0de/packages/compiler-cli/src/ngcc/src/packages/dependency_host.ts#L85-L121
+      const packageJsonPath = require.resolve(`${moduleName}/package.json`,
+        {
+          paths: [resolvedFileName],
+        },
+      );
+
+      return packageJsonPath;
+    } catch {
+      // if it fails this might be a deep import which doesn't have a package.json
+      // Ex: @angular/compiler/src/i18n/i18n_ast/package.json
+      return undefined;
+    }
+  }
+}
diff --git a/packages/ngtools/webpack/src/utils.ts b/packages/ngtools/webpack/src/utils.ts
new file mode 100644
index 000000000000..08c2e0a67010
--- /dev/null
+++ b/packages/ngtools/webpack/src/utils.ts
@@ -0,0 +1,20 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Path, getSystemPath, normalize } from '@angular-devkit/core';
+
+// `TsCompilerAotCompilerTypeCheckHostAdapter` in @angular/compiler-cli seems to resolve module
+// names directly via `resolveModuleName`, which prevents full Path usage.
+// To work around this we must provide the same path format as TS internally uses in
+// the SourceFile paths.
+export function workaroundResolve(path: Path | string) {
+  return getSystemPath(normalize(path)).replace(/\\/g, '/');
+}
+
+export function flattenArray<T>(value: Array<T | T[]>): T[] {
+  return [].concat.apply([], value);
+}
diff --git a/packages/ngtools/webpack/src/utils_spec.ts b/packages/ngtools/webpack/src/utils_spec.ts
new file mode 100644
index 000000000000..6da7940a0eb7
--- /dev/null
+++ b/packages/ngtools/webpack/src/utils_spec.ts
@@ -0,0 +1,18 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { flattenArray } from './utils';
+
+describe('@ngtools/webpack utils', () => {
+  describe('flattenArray', () => {
+    it('should flatten an array', () => {
+      const arr = flattenArray(['module', ['browser', 'main']]);
+      expect(arr).toEqual(['module', 'browser', 'main']);
+    });
+  });
+});

From 28387a79ea8879948a02b8f260aa326d33b80ba8 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 22 Mar 2019 13:06:22 +0100
Subject: [PATCH 1042/1703] test: add e2e test for ivy opt-out

---
 tests/legacy-cli/e2e/tests/ivy/ivy-opt-out.ts | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 tests/legacy-cli/e2e/tests/ivy/ivy-opt-out.ts

diff --git a/tests/legacy-cli/e2e/tests/ivy/ivy-opt-out.ts b/tests/legacy-cli/e2e/tests/ivy/ivy-opt-out.ts
new file mode 100644
index 000000000000..bd8c5d3d01b1
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/ivy/ivy-opt-out.ts
@@ -0,0 +1,45 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { replaceInFile } from '../../utils/fs';
+import { request } from '../../utils/http';
+import { killAllProcesses, ng } from '../../utils/process';
+import { createProject, ngServe } from '../../utils/project';
+
+export default async function() {
+  try {
+    await createProject('ivy-project-opt-out', '--enable-ivy');
+    // trigger an Ivy builds to process packages with NGCC
+    await ng('e2e', '--prod');
+
+    // View Engine (NGC) compilation should work after running NGCC from Webpack
+    await replaceInFile('tsconfig.app.json', '"enableIvy": true', '"enableIvy": false');
+
+    // verify that VE compilation works during runtime
+    await ng('e2e', '--prod');
+
+    // verify that it is not Ivy
+    await ngServe('--prod');
+    // Verify the index.html
+    const body = await request('http://localhost:4200/');
+    if (!body.match(/<app-root><\/app-root>/)) {
+      throw new Error('Response does not match expected value.');
+    }
+
+    // Verify it's compiled with NGC
+    const mainUrlMatch = body.match(/src="(main\.[a-z0-9]{0,32}\.js)"/);
+    const mainUrl = mainUrlMatch && mainUrlMatch[1];
+    const main = await request('http://localhost:4200/' + mainUrl);
+
+    if (main.match(/ngComponentDef\s*=/)) {
+      throw new Error('Loaded Ivy but expected View Engine applicatiom.');
+    }
+
+  } finally {
+    await killAllProcesses();
+  }
+}

From 4595d9c59823f488a6c5d85b2c3972094755f00c Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 27 Mar 2019 19:25:55 +0100
Subject: [PATCH 1043/1703] build: update angular packages to 8.0.0-beta.10

---
 package.json                                  |  4 +-
 .../angular_devkit/build_angular/package.json | 22 ++---
 .../build_ng_packagr/package.json             |  4 +-
 packages/ngtools/webpack/package.json         |  4 +-
 yarn.lock                                     | 88 +++++++++----------
 5 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/package.json b/package.json
index ff6a545cca43..d1afc97654d7 100644
--- a/package.json
+++ b/package.json
@@ -77,8 +77,8 @@
     "typescript": "3.3.4000"
   },
   "devDependencies": {
-    "@angular/compiler": "^8.0.0-beta.9",
-    "@angular/compiler-cli": "^8.0.0-beta.9",
+    "@angular/compiler": "^8.0.0-beta.10",
+    "@angular/compiler-cli": "^8.0.0-beta.10",
     "@bazel/karma": "~0.26.0",
     "@bazel/typescript": "~0.26.0",
     "@ngtools/json-schema": "^1.1.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 10362c97918f..96ebc8101aee 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -54,19 +54,19 @@
     "webpack-subresource-integrity": "1.1.0-rc.6"
   },
   "devDependencies": {
-    "@angular/animations": "^8.0.0-beta.9",
+    "@angular/animations": "^8.0.0-beta.10",
     "@angular/cdk": "^7.3.4",
-    "@angular/common": "^8.0.0-beta.9",
-    "@angular/compiler": "^8.0.0-beta.9",
-    "@angular/compiler-cli": "^8.0.0-beta.9",
-    "@angular/core": "^8.0.0-beta.9",
-    "@angular/http": "^8.0.0-beta.9",
+    "@angular/common": "^8.0.0-beta.10",
+    "@angular/compiler": "^8.0.0-beta.10",
+    "@angular/compiler-cli": "^8.0.0-beta.10",
+    "@angular/core": "^8.0.0-beta.10",
+    "@angular/http": "^8.0.0-beta.10",
     "@angular/material": "^7.3.4",
-    "@angular/platform-browser": "^8.0.0-beta.9",
-    "@angular/platform-browser-dynamic": "^8.0.0-beta.9",
-    "@angular/platform-server": "^8.0.0-beta.9",
-    "@angular/router": "^8.0.0-beta.9",
-    "@angular/service-worker": "^8.0.0-beta.9",
+    "@angular/platform-browser": "^8.0.0-beta.10",
+    "@angular/platform-browser-dynamic": "^8.0.0-beta.10",
+    "@angular/platform-server": "^8.0.0-beta.10",
+    "@angular/router": "^8.0.0-beta.10",
+    "@angular/service-worker": "^8.0.0-beta.10",
     "codelyzer": "^5.0.0",
     "core-js": "^2.4.1",
     "bootstrap": "^4.0.0",
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index 3caa23384565..84c798e07535 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -14,8 +14,8 @@
     "ng-packagr": "^4.0.0 || ^5.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "^8.0.0-beta.9",
-    "@angular/compiler-cli": "^8.0.0-beta.9",
+    "@angular/compiler": "^8.0.0-beta.10",
+    "@angular/compiler-cli": "^8.0.0-beta.10",
     "@angular-devkit/core": "0.0.0",
     "ng-packagr": "^5.0.1",
     "tslib": "^1.9.0"
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index c1b45a0bc910..2eaf908ddda4 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -33,8 +33,8 @@
     "webpack": "^4.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "^8.0.0-beta.9",
-    "@angular/compiler-cli": "^8.0.0-beta.9",
+    "@angular/compiler": "^8.0.0-beta.10",
+    "@angular/compiler-cli": "^8.0.0-beta.10",
     "typescript": "3.3.4000",
     "webpack": "4.29.6"
   }
diff --git a/yarn.lock b/yarn.lock
index 6f290b296b62..a188e29a6b5b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@angular/animations@^8.0.0-beta.9":
-  version "8.0.0-beta.9"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0-beta.9.tgz#9605f7b6be49b3bcde7cc7fa145ba329b2fdc6f8"
-  integrity sha512-4OLo3432jwPIo5GiYkrVrjUWPMIKBTXqZLr09A5cScM0RA3N9KaSLk7wg1sjSb0mK3KuEfJ00jCzaLUGdvO5Kw==
+"@angular/animations@^8.0.0-beta.10":
+  version "8.0.0-beta.10"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0-beta.10.tgz#7f053d57ee242a162cd4e8422032656646b5c8d6"
+  integrity sha512-Imum1d47Yd2FBfDPt1xUI0ZNsHq/H8S2uAPFlj6tRg0+ZnAKwdO0b0XOiTKSpgrnrTd895aGjRzzSg7lertszw==
   dependencies:
     tslib "^1.9.0"
 
@@ -18,17 +18,17 @@
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/common@^8.0.0-beta.9":
-  version "8.0.0-beta.9"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0-beta.9.tgz#8e23e54eadc45b187c0321e59f1b7c36b1ae8e0d"
-  integrity sha512-dov21tsbnvNb+hmuPztqUgzDAbtiw0zSvzEzSZsZYq+mU6FbXOXZnyycXzNij+rewZMyVAQNEUIEmjc6UF8nEA==
+"@angular/common@^8.0.0-beta.10":
+  version "8.0.0-beta.10"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0-beta.10.tgz#9f23ea67a24234cdcd86612227a6ff411479cd67"
+  integrity sha512-L/tnuPTQvdoDGqBizaPN51lTOzK0zPsQDx0uAi7CKM+97nfc1qOlqwYzEh8rnJ1Rad4dbPEwtflpYRmlvqCmoQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^8.0.0-beta.9":
-  version "8.0.0-beta.9"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0-beta.9.tgz#ad842d2c0e231b4e2a4ded6a6e98e6d0417515d1"
-  integrity sha512-7puhtwsLNbkd4Kn1Y/PAtIS3M37+UpSjdxsn+ZSiBYpIHZ1irPbfl27ULTIogM+sPgp4ICbMrqJxJfJwGT0a/w==
+"@angular/compiler-cli@^8.0.0-beta.10":
+  version "8.0.0-beta.10"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0-beta.10.tgz#29ae5d5ba426026dec57681f8de0e45e4e149cc2"
+  integrity sha512-t0Ru/dvVve8ZXt16vJlCG8KuH00BM5ilZjnT1EYv4mgf2Yhn23e8vbmS098a6Xmm3MWryp/2nmab0Lu/fHJV5A==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -42,24 +42,24 @@
     tslib "^1.9.0"
     yargs "9.0.1"
 
-"@angular/compiler@^8.0.0-beta.9":
-  version "8.0.0-beta.9"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0-beta.9.tgz#4f999b1276b78bc91197a5119cab4f22e528b86b"
-  integrity sha512-X22gQYGT6xR+I0umj6ZJlHbX/uO2x6rZCKDisK0KLIM7ud29ggGz/fZdBgBdZPBUB/ivzWLFUCxewQoqLLRyMA==
+"@angular/compiler@^8.0.0-beta.10":
+  version "8.0.0-beta.10"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0-beta.10.tgz#58867d30c17f2265ff25c1bffbb9e8c38d88684a"
+  integrity sha512-BBcspibJ4iB4JwFXz+NT/8QVbMR8Dcl+Kn3Q/ZRiDEi57KlongagBNqX2Ve1oVQ7xHooVEz0hSUeF7v9+iipew==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^8.0.0-beta.9":
-  version "8.0.0-beta.9"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0-beta.9.tgz#55fbf127af9847df854fc8c86844dd33b3008450"
-  integrity sha512-/x0ZD3yPlMOhtx9Onp/3nAq995xBarZiTv/dp9/obgts3U/AHEQCDw+7WWhxCqUKV38wMZOLK0FMrubC9mAyug==
+"@angular/core@^8.0.0-beta.10":
+  version "8.0.0-beta.10"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0-beta.10.tgz#157f0ca07760d43ea92a347cf65e8d8a70e042df"
+  integrity sha512-Z5jUS++z9uynIha/Xgy+4COo8utAEpMg9rHN7Ha+J9SXRjpdu9iSCdTQAZrHqIMGSq89MjWl5ZN/1u5txm/ICQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^8.0.0-beta.9":
-  version "8.0.0-beta.9"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-8.0.0-beta.9.tgz#84124654e4880d2591b485c995475bfe69208049"
-  integrity sha512-95oUy4wLOqDXmG3cgRrqD0yuaRF9Jqt+ihHVwilJzDbYngid+HCj7Sh+4QqROQbKlMbvbrlz3ikNJ3kfyq4Gjw==
+"@angular/http@^8.0.0-beta.10":
+  version "8.0.0-beta.10"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-8.0.0-beta.10.tgz#3d30c98aa64603daa3fc5675413c2dc3da3868b2"
+  integrity sha512-NV2TGnrpivJvOa4/1O/GQfFocPSib4NUieh2umNpJYa2CYjyYfgWpmh+0wDqh23ThPPxRufywZQkkSeb+X9PRA==
   dependencies:
     tslib "^1.9.0"
 
@@ -70,40 +70,40 @@
   dependencies:
     tslib "^1.7.1"
 
-"@angular/platform-browser-dynamic@^8.0.0-beta.9":
-  version "8.0.0-beta.9"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0-beta.9.tgz#c7d6113c7941ab612d487d6d6ec0203336fc7f38"
-  integrity sha512-p94e+hQ6gEUG2eAbdfdiYWrQCGTt/tXKh2K5hlhg3RNci4mac5icW0sHGYDCJjcER7sOSWmJL8gfohX0t4H9uQ==
+"@angular/platform-browser-dynamic@^8.0.0-beta.10":
+  version "8.0.0-beta.10"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0-beta.10.tgz#bb32819dae8aeb430fe247cbbe30dcab8ae9f455"
+  integrity sha512-1GJdG766uuYx7NkA2aJ4pf/ennsaq0LT+nyM+h79nvsDxqVJA6A3Jq4JQm/mL/VdEr5zIHHiYafERhKWCKGMtw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^8.0.0-beta.9":
-  version "8.0.0-beta.9"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0-beta.9.tgz#7b4a731c2dbfd05266575a83a91b532b81d1490d"
-  integrity sha512-wNwbLSwdruDmdJ9IW2M1jL2OwWxqZ1R+xR8ZdmpUandGTf3R17u89gMzCjRvYx+rP//7p4XMHbNA8nx/lae3yA==
+"@angular/platform-browser@^8.0.0-beta.10":
+  version "8.0.0-beta.10"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0-beta.10.tgz#0faa0ebedcc5e7e0009e8560112f7b43eff7bca5"
+  integrity sha512-+Ic5vtBZNiFjq/tLwKEmsQ46/lBJeiOWiFwmktCQRjodkPnOiGwkryoynx7yx05A3ZB0pYignkjJPdtkPVySwA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-server@^8.0.0-beta.9":
-  version "8.0.0-beta.9"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.0.0-beta.9.tgz#c0f2a1476ad1ee1897ff2541ba6a5959dc455668"
-  integrity sha512-Qwy6U8xPoapJgj5dqFc1vzg4y+QEnfeQZr5e1VNcP04aViofZyKD0uNS9rzZcPUdLsuDRU+09uhFeIMJVbjmPw==
+"@angular/platform-server@^8.0.0-beta.10":
+  version "8.0.0-beta.10"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.0.0-beta.10.tgz#0fc6914b9a9ecb97788a564b0db5e87843c6cc55"
+  integrity sha512-1l+kB6Kgvdo+cGDI6G9NK21v3bam5++Vwmdp3ww7VkBHwEKx6a+3vAIrgO8tobYzIK/hy8HFLqkelUJQK4dW3Q==
   dependencies:
     domino "^2.1.2"
     tslib "^1.9.0"
     xhr2 "^0.1.4"
 
-"@angular/router@^8.0.0-beta.9":
-  version "8.0.0-beta.9"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0-beta.9.tgz#29197556d779318edd710b0d2935da35131ceacc"
-  integrity sha512-+6vLGw7Lwgrrs+UXoqM/6KDGFVOckkJaxtpIQfLh7mnHyJ4bM6d/0JxaNGQOye3CUlk32C5MsG7dt3ldL6V2Ig==
+"@angular/router@^8.0.0-beta.10":
+  version "8.0.0-beta.10"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0-beta.10.tgz#387e9e68eee27bc416dc4d66b87d60ae5c4ef70d"
+  integrity sha512-LskdWFbMvxNPwzcvl6esxl1LQ6Q4qupEGVJ7e4Tc9QlbzrULnyDTomLJFkDwk1zm+QLxz0JMiXWlfM81RA0uXg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@^8.0.0-beta.9":
-  version "8.0.0-beta.9"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.0.0-beta.9.tgz#39668fc0554103b2c2f5fe6e4a730c18cd5b3558"
-  integrity sha512-Do/t79TkdYr8QS01xZ6xR6AZhJbLtGFJGM7Q5L4/2eoooDSdcRNwjPgFGVjnmzYullH0yj0sn9ccSicfTcVgYw==
+"@angular/service-worker@^8.0.0-beta.10":
+  version "8.0.0-beta.10"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.0.0-beta.10.tgz#ca43a09eaa3921da5d4beb75f99c5c4d6712996b"
+  integrity sha512-4EEecMQepAWw7mvCbtit7GMGi8REcn3VKAPTs9kuRcAdmGHpDy0X+SHdrxIW1Hd9s/ZR+Hi99edZyau4pluDHg==
   dependencies:
     tslib "^1.9.0"
 

From c68578bb125e508289731f2756ff5671d3c288bb Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sat, 30 Mar 2019 18:16:16 +0100
Subject: [PATCH 1044/1703] test: disable e2e that are not support by ngcc api

---
 tests/legacy-cli/e2e/tests/build/script-target.ts    | 9 ++++++++-
 tests/legacy-cli/e2e/tests/misc/module-resolution.ts | 8 ++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/tests/legacy-cli/e2e/tests/build/script-target.ts b/tests/legacy-cli/e2e/tests/build/script-target.ts
index 4d09d8b5affe..f01fbfa6f0e9 100644
--- a/tests/legacy-cli/e2e/tests/build/script-target.ts
+++ b/tests/legacy-cli/e2e/tests/build/script-target.ts
@@ -8,7 +8,14 @@ export default function () {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   // Skip this test in Angular 2, it had different bundles.
-  if (getGlobalVariable('argv').ng2) {
+  if (getGlobalVariable('argv')['ng2']) {
+    return Promise.resolve();
+  }
+
+  if (getGlobalVariable('argv')['ivy']) {
+    // todo: enable when NGCC supports this.
+    // At the moment, we re-run NGCC with a different 'propertiesToConsider'.
+    // https://angular-team.atlassian.net/browse/FW-1211
     return Promise.resolve();
   }
 
diff --git a/tests/legacy-cli/e2e/tests/misc/module-resolution.ts b/tests/legacy-cli/e2e/tests/misc/module-resolution.ts
index 0396650258c7..b7b3f435d662 100644
--- a/tests/legacy-cli/e2e/tests/misc/module-resolution.ts
+++ b/tests/legacy-cli/e2e/tests/misc/module-resolution.ts
@@ -2,9 +2,17 @@ import { appendToFile, createDir, moveFile, prependToFile } from '../../utils/fs
 import { ng, silentNpm } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
+import { getGlobalVariable } from '../../utils/env';
 
 
 export default async function () {
+  if (getGlobalVariable('argv')['ivy']) {
+    // todo: enable when NGCC supports this.
+    // this test is not yet supported under IVY because can only transform packages from a single basePaths.
+    // https://angular-team.atlassian.net/browse/FW-1204
+    return;
+  }
+
   await updateJsonFile('tsconfig.json', tsconfig => {
     tsconfig.compilerOptions.paths = {
       '*': ['./node_modules/*'],

From 42ef58295e2c1ce43be98d431c8b4055233823be Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sun, 31 Mar 2019 13:01:37 +0200
Subject: [PATCH 1045/1703] test: update material version to support ngcc

---
 tests/legacy-cli/e2e/tests/build/styles/material-import.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/legacy-cli/e2e/tests/build/styles/material-import.ts b/tests/legacy-cli/e2e/tests/build/styles/material-import.ts
index 03699182c935..9f2772aaaade 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/material-import.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/material-import.ts
@@ -11,7 +11,8 @@ export default function () {
 
   const extensions = ['css', 'scss', 'less', 'styl'];
   let promise: Promise<any> = Promise.resolve()
-    .then(() => silentNpm('install', '@angular/material@5.0.4'));
+    .then(() => silentNpm('install', '@angular/material@7.3.6'))
+    .then(() => silentNpm('install', '@angular/cdk@7.3.6'));
 
   extensions.forEach(ext => {
     promise = promise.then(() => {

From 3d86b18d7e67ff8d203bc7ec4491c8df00b33124 Mon Sep 17 00:00:00 2001
From: ukrukar <ukrukar@google.com>
Date: Fri, 29 Mar 2019 12:52:08 -0400
Subject: [PATCH 1046/1703] fix(@schematics/angular): buildRelativePath handles
 files in root

Before, if one of the arguments was a file in root (eg "/module")
code would fail with: "" must be an absolute path.
---
 .../angular_devkit/core/src/virtual-fs/path.ts    |  4 ++--
 .../core/src/virtual-fs/path_spec.ts              |  3 +++
 .../schematics/angular/utility/find-module.ts     |  3 ++-
 .../angular/utility/find-module_spec.ts           | 15 ++++++++++++++-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/packages/angular_devkit/core/src/virtual-fs/path.ts b/packages/angular_devkit/core/src/virtual-fs/path.ts
index a17ddb41e578..d5edd6da300a 100644
--- a/packages/angular_devkit/core/src/virtual-fs/path.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/path.ts
@@ -144,8 +144,8 @@ export function relative(from: Path, to: Path): Path {
   if (from == to) {
     p = '';
   } else {
-    const splitFrom = from.split(NormalizedSep);
-    const splitTo = to.split(NormalizedSep);
+    const splitFrom = split(from);
+    const splitTo = split(to);
 
     while (splitFrom.length > 0 && splitTo.length > 0 && splitFrom[0] == splitTo[0]) {
       splitFrom.shift();
diff --git a/packages/angular_devkit/core/src/virtual-fs/path_spec.ts b/packages/angular_devkit/core/src/virtual-fs/path_spec.ts
index 305b1ebbe63b..a3b3f2433a2f 100644
--- a/packages/angular_devkit/core/src/virtual-fs/path_spec.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/path_spec.ts
@@ -133,6 +133,8 @@ describe('path', () => {
         '/src/app/sub1/test1', '/src/app/sub2/test2',
         '../../sub2/test2',
       ],
+      ['/', '/a/b/c', 'a/b/c'],
+      ['/a/b/c', '/d', '../../../d'],
     ];
 
     for (const [from, to, result] of tests) {
@@ -141,6 +143,7 @@ describe('path', () => {
         const t = normalize(to);
 
         expect(relative(f, t)).toBe(result);
+        expect(join(f, relative(f, t))).toBe(t);
       });
     }
   });
diff --git a/packages/schematics/angular/utility/find-module.ts b/packages/schematics/angular/utility/find-module.ts
index 7ff53bf7ca14..329b9f445e6f 100644
--- a/packages/schematics/angular/utility/find-module.ts
+++ b/packages/schematics/angular/utility/find-module.ts
@@ -130,7 +130,8 @@ export function buildRelativePath(from: string, to: string): string {
   fromParts.pop();
   const toFileName = toParts.pop();
 
-  const relativePath = relative(normalize(fromParts.join('/')), normalize(toParts.join('/')));
+  const relativePath = relative(normalize(fromParts.join('/') || '/'),
+   normalize(toParts.join('/') || '/'));
   let pathPrefix = '';
 
   // Set the path prefix for same dir or child dir, parent dir starts with `..`
diff --git a/packages/schematics/angular/utility/find-module_spec.ts b/packages/schematics/angular/utility/find-module_spec.ts
index b47faf1db2e6..c7e44f594836 100644
--- a/packages/schematics/angular/utility/find-module_spec.ts
+++ b/packages/schematics/angular/utility/find-module_spec.ts
@@ -7,7 +7,7 @@
  */
 import { Path } from '@angular-devkit/core';
 import { EmptyTree, Tree } from '@angular-devkit/schematics';
-import { ModuleOptions, findModule, findModuleFromOptions } from './find-module';
+import { ModuleOptions, buildRelativePath, findModule, findModuleFromOptions } from './find-module';
 
 
 describe('find-module', () => {
@@ -189,4 +189,17 @@ describe('find-module', () => {
       expect(modPath).toBe('/projects/my-proj/src/app.module.ts' as Path);
     });
   });
+
+  describe('buildRelativePath', () => {
+    it('works', () => {
+      expect(buildRelativePath('/test/module', '/test/service'))
+          .toEqual('./service');
+      expect(buildRelativePath('/test/module', '/other/service'))
+          .toEqual('../other/service');
+      expect(buildRelativePath('/module', '/test/service'))
+          .toEqual('./test/service');
+      expect(buildRelativePath('/test/service', '/module'))
+          .toEqual('../module');
+    });
+  });
 });

From 50cce668cc48cf3e7cb3263cf287c2e856fcccbb Mon Sep 17 00:00:00 2001
From: Andriy Pyvovarchuk <andriy.pyvovarchuk@techmagic.co>
Date: Mon, 1 Apr 2019 17:39:21 +0300
Subject: [PATCH 1047/1703] refactor: replace deprecated package opn with open

---
 packages/angular/cli/commands/doc-impl.ts              |  6 +++---
 packages/angular/cli/package.json                      |  2 +-
 packages/angular_devkit/build_angular/package.json     |  2 +-
 .../build_angular/src/dev-server/index.ts              | 10 +++++-----
 yarn.lock                                              |  9 ++++++++-
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/packages/angular/cli/commands/doc-impl.ts b/packages/angular/cli/commands/doc-impl.ts
index b93a82333ceb..e0382c596009 100644
--- a/packages/angular/cli/commands/doc-impl.ts
+++ b/packages/angular/cli/commands/doc-impl.ts
@@ -10,7 +10,7 @@ import { Command } from '../models/command';
 import { Arguments } from '../models/interface';
 import { Schema as DocCommandSchema } from './doc';
 
-const opn = require('opn');
+const open = require('open');
 
 export class DocCommand extends Command<DocCommandSchema> {
   public async run(options: DocCommandSchema & Arguments) {
@@ -24,9 +24,9 @@ export class DocCommand extends Command<DocCommandSchema> {
       searchUrl = `https://www.google.com/search?q=site%3Aangular.io+${options.keyword}`;
     }
 
-    // We should wrap `opn` in a new Promise because `opn` is already resolved
+    // We should wrap `open` in a new Promise because `open` is already resolved
     await new Promise(() => {
-      opn(searchUrl, {
+      open(searchUrl, {
         wait: false,
       });
     });
diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index c47c96c37c16..7051612d3fc7 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -35,7 +35,7 @@
     "ini": "1.3.5",
     "inquirer": "6.2.2",
     "npm-package-arg": "6.1.0",
-    "opn": "5.4.0",
+    "open": "6.0.0",
     "pacote": "9.5.0",
     "semver": "6.0.0",
     "symbol-observable": "1.2.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 96ebc8101aee..d7e47486d2d0 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -28,7 +28,7 @@
     "mini-css-extract-plugin": "0.5.0",
     "minimatch": "3.0.4",
     "parse5": "4.0.0",
-    "opn": "5.4.0",
+    "open": "6.0.0",
     "postcss": "7.0.14",
     "postcss-import": "12.0.1",
     "postcss-loader": "3.0.0",
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index ff7bf625e014..4a3b502f57d4 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -34,7 +34,7 @@ import {
 import { Schema as BrowserBuilderSchema } from '../browser/schema';
 import { normalizeOptimization } from '../utils';
 import { Schema } from './schema';
-const opn = require('opn');
+const open = require('open');
 
 export type DevServerBuilderSchema = Schema & json.JsonObject;
 
@@ -83,7 +83,7 @@ export function serveWebpackBrowser(
   const browserTarget = targetFromTargetString(options.browserTarget);
   const root = context.workspaceRoot;
   let first = true;
-  let opnAddress: string;
+  let openAddress: string;
   const host = new NodeJsSyncHost();
 
   const loggingFn = transforms.logging
@@ -202,7 +202,7 @@ export function serveWebpackBrowser(
         **
       `);
 
-      opnAddress = serverAddress + webpackDevServerConfig.publicPath;
+      openAddress = serverAddress + webpackDevServerConfig.publicPath;
       webpackConfig.devServer = webpackDevServerConfig;
 
       return runWebpackDevServer(webpackConfig, context, { logging: loggingFn });
@@ -210,10 +210,10 @@ export function serveWebpackBrowser(
     map(buildEvent => {
       if (first && options.open) {
         first = false;
-        opn(opnAddress);
+        open(openAddress);
       }
 
-      return { ...buildEvent, baseUrl: opnAddress } as DevServerBuilderOutput;
+      return { ...buildEvent, baseUrl: openAddress } as DevServerBuilderOutput;
     }),
   );
 }
diff --git a/yarn.lock b/yarn.lock
index a188e29a6b5b..d144f82dbb4c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6587,12 +6587,19 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
+open@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.0.0.tgz#cae5e2c1a3a1bfaee0d0acc8c4b7609374750346"
+  integrity sha512-/yb5mVZBz7mHLySMiSj2DcLtMBbFPJk5JBKEkHVZFxZAPzeg3L026O0T+lbdz1B2nyDnkClRSwRQJdeVUIF7zw==
+  dependencies:
+    is-wsl "^1.1.0"
+
 opencollective-postinstall@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89"
   integrity sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw==
 
-opn@5.4.0, opn@^5.1.0:
+opn@^5.1.0:
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
   integrity sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==

From a5364a43c2ffc4bdb73da1879be0293f4654f202 Mon Sep 17 00:00:00 2001
From: ManfredSteyer <manfred.steyer@gmx.net>
Date: Sat, 23 Mar 2019 23:17:19 +0100
Subject: [PATCH 1048/1703] feat(@angular-devkit/build-angular): write
 index.html for differential loading

Currently, the IndexHtmlWebpackPlugin generates the index.html file *during* bundling. However, to support differential loading the builder must do this *after* bundling because only then we know the produced files for ES5, ES2015, etc.
Hence, this extracts the IndexHtmlWebpackPlugin logic to a helper function which can still be called by IndexHtmlWebpackPlugin for use cases not affected by differential loading (e. g. ng serve) as well as directly by the builder.
https://docs.google.com/document/d/13k84oGwrEjwPyAiAjUgaaM7YHJrzYXz7Cbt6CwRp9N4/edit?ts=5c652052
---
 .../plugins/generate-index-html.ts            | 251 ++++++++++++++++++
 .../plugins/generate-index-html_spec.ts       |  36 +++
 .../plugins/index-html-webpack-plugin.ts      | 191 ++-----------
 3 files changed, 307 insertions(+), 171 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/src/angular-cli-files/plugins/generate-index-html.ts
 create mode 100644 packages/angular_devkit/build_angular/src/angular-cli-files/plugins/generate-index-html_spec.ts

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/generate-index-html.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/generate-index-html.ts
new file mode 100644
index 000000000000..0ae40bc1ee3d
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/generate-index-html.ts
@@ -0,0 +1,251 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { createHash } from 'crypto';
+import {
+  RawSource,
+  ReplaceSource,
+  Source,
+} from 'webpack-sources';
+
+const parse5 = require('parse5');
+
+
+export type LoadOutputFileFunctionType = (file: string) => string;
+
+export interface GenerateIndexHtmlParams {
+  // input file name (e. g. index.html)
+  input: string;
+  // contents of input
+  inputContent: string;
+  baseHref?: string;
+  deployUrl?: string;
+  sri: boolean;
+  // the files emitted by the build
+  unfilteredSortedFiles: CompiledFileInfo[];
+  // additional files that should be added using nomodule
+  noModuleFiles: Set<string>;
+  // function that loads a file
+  // This allows us to use different routines within the IndexHtmlWebpackPlugin and
+  // when used without this plugin.
+  loadOutputFile: LoadOutputFileFunctionType;
+}
+
+/*
+ * Defines the type of script tag that is generated for the script reference
+ * nomodule: <script src="..." nomodule></script>
+ * module: <script src="..." type="module"></script>
+ * none: <script src="..."></script>
+ */
+export type CompiledFileType = 'nomodule' | 'module' | 'none';
+
+export interface CompiledFileInfo {
+  file: string;
+  type: CompiledFileType;
+}
+
+/*
+ * Helper function used by the IndexHtmlWebpackPlugin.
+ * Can also be directly used by builder, e. g. in order to generate an index.html
+ * after processing several configurations in order to build different sets of
+ * bundles for differential serving.
+ */
+export function generateIndexHtml(params: GenerateIndexHtmlParams): Source {
+
+  const loadOutputFile = params.loadOutputFile;
+
+  // Filter files
+  const existingFiles = new Set<string>();
+  const stylesheets: string[] = [];
+  const scripts: string[] = [];
+
+  const fileNames = params.unfilteredSortedFiles.map(f => f.file);
+  const moduleFilesArray =  params.unfilteredSortedFiles
+    .filter(f => f.type === 'module')
+    .map(f => f.file);
+
+  const moduleFiles = new Set<string>(moduleFilesArray);
+
+  const noModuleFilesArray = params.unfilteredSortedFiles
+    .filter(f => f.type === 'nomodule')
+    .map(f => f.file);
+
+  noModuleFilesArray.push(...params.noModuleFiles);
+
+  const noModuleFiles = new Set<string>(noModuleFilesArray);
+
+  for (const file of fileNames) {
+
+    if (existingFiles.has(file)) {
+      continue;
+    }
+    existingFiles.add(file);
+
+    if (file.endsWith('.js')) {
+      scripts.push(file);
+    } else if (file.endsWith('.css')) {
+      stylesheets.push(file);
+    }
+  }
+
+  // Find the head and body elements
+  const treeAdapter = parse5.treeAdapters.default;
+  const document = parse5.parse(params.inputContent, { treeAdapter, locationInfo: true });
+  let headElement;
+  let bodyElement;
+  for (const docChild of document.childNodes) {
+    if (docChild.tagName === 'html') {
+      for (const htmlChild of docChild.childNodes) {
+        if (htmlChild.tagName === 'head') {
+          headElement = htmlChild;
+        }
+        if (htmlChild.tagName === 'body') {
+          bodyElement = htmlChild;
+        }
+      }
+    }
+  }
+
+  if (!headElement || !bodyElement) {
+    throw new Error('Missing head and/or body elements');
+  }
+
+  // Determine script insertion point
+  let scriptInsertionPoint;
+  if (bodyElement.__location && bodyElement.__location.endTag) {
+    scriptInsertionPoint = bodyElement.__location.endTag.startOffset;
+  } else {
+    // Less accurate fallback
+    // parse5 4.x does not provide locations if malformed html is present
+    scriptInsertionPoint = params.inputContent.indexOf('</body>');
+  }
+
+  let styleInsertionPoint;
+  if (headElement.__location && headElement.__location.endTag) {
+    styleInsertionPoint = headElement.__location.endTag.startOffset;
+  } else {
+    // Less accurate fallback
+    // parse5 4.x does not provide locations if malformed html is present
+    styleInsertionPoint = params.inputContent.indexOf('</head>');
+  }
+
+  // Inject into the html
+  const indexSource = new ReplaceSource(new RawSource(params.inputContent), params.input);
+
+  let scriptElements = '';
+  for (const script of scripts) {
+    const attrs: { name: string, value: string | null }[] = [
+      { name: 'src', value: (params.deployUrl || '') + script },
+    ];
+
+    if (noModuleFiles.has(script)) {
+      attrs.push({ name: 'nomodule', value: null });
+    }
+
+    if (moduleFiles.has(script)) {
+      attrs.push({ name: 'type', value: 'module' });
+    }
+
+    if (params.sri) {
+      const content = loadOutputFile(script);
+      attrs.push(..._generateSriAttributes(content));
+    }
+
+    const attributes = attrs
+      .map(attr => attr.value === null ? attr.name : `${attr.name}="${attr.value}"`)
+      .join(' ');
+    scriptElements += `<script ${attributes}></script>`;
+  }
+
+  indexSource.insert(
+    scriptInsertionPoint,
+    scriptElements,
+  );
+
+  // Adjust base href if specified
+  if (typeof params.baseHref == 'string') {
+    let baseElement;
+    for (const headChild of headElement.childNodes) {
+      if (headChild.tagName === 'base') {
+        baseElement = headChild;
+      }
+    }
+
+    const baseFragment = treeAdapter.createDocumentFragment();
+
+    if (!baseElement) {
+      baseElement = treeAdapter.createElement(
+        'base',
+        undefined,
+        [
+          { name: 'href', value: params.baseHref },
+        ],
+      );
+
+      treeAdapter.appendChild(baseFragment, baseElement);
+      indexSource.insert(
+        headElement.__location.startTag.endOffset,
+        parse5.serialize(baseFragment, { treeAdapter }),
+      );
+    } else {
+      let hrefAttribute;
+      for (const attribute of baseElement.attrs) {
+        if (attribute.name === 'href') {
+          hrefAttribute = attribute;
+        }
+      }
+      if (hrefAttribute) {
+        hrefAttribute.value = params.baseHref;
+      } else {
+        baseElement.attrs.push({ name: 'href', value: params.baseHref });
+      }
+
+      treeAdapter.appendChild(baseFragment, baseElement);
+      indexSource.replace(
+        baseElement.__location.startOffset,
+        baseElement.__location.endOffset,
+        parse5.serialize(baseFragment, { treeAdapter }),
+      );
+    }
+  }
+
+  const styleElements = treeAdapter.createDocumentFragment();
+  for (const stylesheet of stylesheets) {
+    const attrs = [
+      { name: 'rel', value: 'stylesheet' },
+      { name: 'href', value: (params.deployUrl || '') + stylesheet },
+    ];
+
+    if (params.sri) {
+      const content = loadOutputFile(stylesheet);
+      attrs.push(..._generateSriAttributes(content));
+    }
+
+    const element = treeAdapter.createElement('link', undefined, attrs);
+    treeAdapter.appendChild(styleElements, element);
+  }
+
+  indexSource.insert(
+    styleInsertionPoint,
+    parse5.serialize(styleElements, { treeAdapter }),
+  );
+
+  return indexSource;
+}
+
+function _generateSriAttributes(content: string) {
+  const algo = 'sha384';
+  const hash = createHash(algo)
+    .update(content, 'utf8')
+    .digest('base64');
+
+  return [
+    { name: 'integrity', value: `${algo}-${hash}` },
+    { name: 'crossorigin', value: 'anonymous' },
+  ];
+}
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/generate-index-html_spec.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/generate-index-html_spec.ts
new file mode 100644
index 000000000000..02d72550b4d2
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/generate-index-html_spec.ts
@@ -0,0 +1,36 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { generateIndexHtml } from './generate-index-html';
+
+describe('index-html-webpack-plugin', () => {
+
+  it('can generate index.html', () => {
+
+    const source = generateIndexHtml({
+      input: 'index.html',
+      inputContent: '<html><head></head><body></body></html>',
+      baseHref: '/',
+      sri: false,
+      loadOutputFile: (fileName: string) => '',
+      unfilteredSortedFiles: [
+        {file: 'a.js', type: 'module'},
+        {file: 'b.js', type: 'nomodule'},
+        {file: 'c.js', type: 'none'},
+      ],
+      noModuleFiles: new Set<string>(),
+    });
+
+    const html = source.source();
+
+    expect(html).toContain('<script src="a.js" type="module"></script>');
+    expect(html).toContain('<script src="b.js" nomodule></script>');
+    expect(html).toContain('<script src="c.js"></script>');
+
+  });
+
+});
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
index f6e3915f845b..48a560a78aaa 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
@@ -5,11 +5,8 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { createHash } from 'crypto';
 import { Compiler, compilation } from 'webpack';
-import { RawSource, ReplaceSource } from 'webpack-sources';
-
-const parse5 = require('parse5');
+import { CompiledFileInfo, CompiledFileType, generateIndexHtml } from './generate-index-html';
 
 export interface IndexHtmlWebpackPluginOptions {
   input: string;
@@ -46,6 +43,7 @@ function readFile(filename: string, compilation: compilation.Compilation): Promi
   });
 }
 
+
 export class IndexHtmlWebpackPlugin {
   private _options: IndexHtmlWebpackPluginOptions;
 
@@ -67,6 +65,7 @@ export class IndexHtmlWebpackPlugin {
       (compilation as compilation.Compilation & { fileDependencies: Set<string> })
         .fileDependencies.add(this._options.input);
 
+      const loadOutputFile = (name: string) => compilation.assets[name].source();
 
       // Get all files for selected entrypoints
       const unfilteredSortedFiles: string[] = [];
@@ -89,176 +88,26 @@ export class IndexHtmlWebpackPlugin {
       // Clean out files that are used in all types of entrypoints
       otherFiles.forEach(file => noModuleFiles.delete(file));
 
-      // Filter files
-      const existingFiles = new Set<string>();
-      const stylesheets: string[] = [];
-      const scripts: string[] = [];
-      for (const file of unfilteredSortedFiles) {
-        if (existingFiles.has(file)) {
-          continue;
-        }
-        existingFiles.add(file);
-
-        if (file.endsWith('.js')) {
-          scripts.push(file);
-        } else if (file.endsWith('.css')) {
-          stylesheets.push(file);
-        }
-
-      }
-
-      // Find the head and body elements
-      const treeAdapter = parse5.treeAdapters.default;
-      const document = parse5.parse(inputContent, { treeAdapter, locationInfo: true });
-      let headElement;
-      let bodyElement;
-      for (const docChild of document.childNodes) {
-        if (docChild.tagName === 'html') {
-          for (const htmlChild of docChild.childNodes) {
-            if (htmlChild.tagName === 'head') {
-              headElement = htmlChild;
-            }
-            if (htmlChild.tagName === 'body') {
-              bodyElement = htmlChild;
-            }
-          }
-        }
-      }
-
-      if (!headElement || !bodyElement) {
-        throw new Error('Missing head and/or body elements');
-      }
-
-      // Determine script insertion point
-      let scriptInsertionPoint;
-      if (bodyElement.__location && bodyElement.__location.endTag) {
-        scriptInsertionPoint = bodyElement.__location.endTag.startOffset;
-      } else {
-        // Less accurate fallback
-        // parse5 4.x does not provide locations if malformed html is present
-        scriptInsertionPoint = inputContent.indexOf('</body>');
-      }
-
-      let styleInsertionPoint;
-      if (headElement.__location && headElement.__location.endTag) {
-        styleInsertionPoint = headElement.__location.endTag.startOffset;
-      } else {
-        // Less accurate fallback
-        // parse5 4.x does not provide locations if malformed html is present
-        styleInsertionPoint = inputContent.indexOf('</head>');
-      }
-
-      // Inject into the html
-      const indexSource = new ReplaceSource(new RawSource(inputContent), this._options.input);
-
-      let scriptElements = '';
-      for (const script of scripts) {
-        const attrs: { name: string, value: string | null }[] = [
-          { name: 'src', value: (this._options.deployUrl || '') + script },
-        ];
-
-        if (noModuleFiles.has(script)) {
-          attrs.push({ name: 'nomodule', value: null });
-        }
-
-        if (this._options.sri) {
-          const content = compilation.assets[script].source();
-          attrs.push(...this._generateSriAttributes(content));
-        }
-
-        const attributes = attrs
-          .map(attr => attr.value === null ? attr.name : `${attr.name}="${attr.value}"`)
-          .join(' ');
-        scriptElements += `<script ${attributes}></script>`;
-      }
-
-      indexSource.insert(
-        scriptInsertionPoint,
-        scriptElements,
-      );
-
-      // Adjust base href if specified
-      if (typeof this._options.baseHref == 'string') {
-        let baseElement;
-        for (const headChild of headElement.childNodes) {
-          if (headChild.tagName === 'base') {
-            baseElement = headChild;
-          }
-        }
-
-        const baseFragment = treeAdapter.createDocumentFragment();
-
-        if (!baseElement) {
-          baseElement = treeAdapter.createElement(
-            'base',
-            undefined,
-            [
-              { name: 'href', value: this._options.baseHref },
-            ],
-          );
-
-          treeAdapter.appendChild(baseFragment, baseElement);
-          indexSource.insert(
-            headElement.__location.startTag.endOffset,
-            parse5.serialize(baseFragment, { treeAdapter }),
-          );
-        } else {
-          let hrefAttribute;
-          for (const attribute of baseElement.attrs) {
-            if (attribute.name === 'href') {
-              hrefAttribute = attribute;
-            }
-          }
-          if (hrefAttribute) {
-            hrefAttribute.value = this._options.baseHref;
-          } else {
-            baseElement.attrs.push({ name: 'href', value: this._options.baseHref });
-          }
-
-          treeAdapter.appendChild(baseFragment, baseElement);
-          indexSource.replace(
-            baseElement.__location.startOffset,
-            baseElement.__location.endOffset,
-            parse5.serialize(baseFragment, { treeAdapter }),
-          );
-        }
-      }
-
-      const styleElements = treeAdapter.createDocumentFragment();
-      for (const stylesheet of stylesheets) {
-        const attrs = [
-          { name: 'rel', value: 'stylesheet' },
-          { name: 'href', value: (this._options.deployUrl || '') + stylesheet },
-        ];
-
-        if (this._options.sri) {
-          const content = compilation.assets[stylesheet].source();
-          attrs.push(...this._generateSriAttributes(content));
-        }
-
-        const element = treeAdapter.createElement('link', undefined, attrs);
-        treeAdapter.appendChild(styleElements, element);
-      }
-
-      indexSource.insert(
-        styleInsertionPoint,
-        parse5.serialize(styleElements, { treeAdapter }),
-      );
+      // If this plugin calls generateIndexHtml it always uses type: 'none' to align with
+      // its original behavior.
+      const compiledFiles: CompiledFileInfo[] = unfilteredSortedFiles.map(f => ({
+        file: f,
+        type: 'none' as CompiledFileType,
+      }));
+
+      const indexSource = generateIndexHtml({
+        input: this._options.input,
+        inputContent,
+        baseHref: this._options.baseHref,
+        deployUrl: this._options.deployUrl,
+        sri: this._options.sri,
+        unfilteredSortedFiles: compiledFiles,
+        noModuleFiles,
+        loadOutputFile,
+      });
 
       // Add to compilation assets
       compilation.assets[this._options.output] = indexSource;
     });
   }
-
-  private _generateSriAttributes(content: string) {
-    const algo = 'sha384';
-    const hash = createHash(algo)
-      .update(content, 'utf8')
-      .digest('base64');
-
-    return [
-      { name: 'integrity', value: `${algo}-${hash}` },
-      { name: 'crossorigin', value: 'anonymous' },
-    ];
-  }
 }

From d668889fae075c0fa84931ce66621055bbfd898d Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 2 Apr 2019 08:26:18 +0200
Subject: [PATCH 1049/1703] refactor: remove console logs from analytics

This cause errors to be printed out multiple times
---
 .../angular_devkit/build_angular/plugins/webpack/analytics.ts  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts b/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts
index 03d4fdc4d5bc..51b4f707af45 100644
--- a/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts
+++ b/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts
@@ -160,10 +160,7 @@ export class NgBuildAnalyticsPlugin {
               this._stats.errors.push(message);
             }
           }
-          // console.log(allErrors);
         }
-        console.log(errObject.message);
-        console.log('------');
       }
     }
   }

From c4f6f46282e7208c2b9d8451e4a7bd27b3161b94 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 2 Apr 2019 10:46:02 +0000
Subject: [PATCH 1050/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 7e84beee6bd5..27b9c3ef153c 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#34c8385baddf45d8dc76b0b41627f1d17e62de62",
-    "@angular/common": "github:angular/common-builds#85efb71bfb10ddbfb9709dcc4431ed1afb6c31f6",
-    "@angular/compiler": "github:angular/compiler-builds#42ba1874c2a3ef7323ea8aeb403eb2008db8a70d",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#92bab05b294c1ebbd9b2bb41e49d7d8553c4371c",
-    "@angular/core": "github:angular/core-builds#3685f5d942b04f43d5683201484c3a5642b8ef68",
-    "@angular/forms": "github:angular/forms-builds#c774d03265a69b684455c54109983e148018d073",
-    "@angular/language-service": "github:angular/language-service-builds#24f8255272eb90c1f92a61af5d07b0231e2ebc04",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#09aac9f21dc4f962d04592846f999a890890a325",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#e2ad980555f346b26f21dd124663ccd5c3b4cbce",
-    "@angular/router": "github:angular/router-builds#6569629df389ec5d9f84d101d9a3f5ea985d06aa"
+    "@angular/animations": "github:angular/animations-builds#ec3c0027c96937cc839aacc24a37a23474d6271a",
+    "@angular/common": "github:angular/common-builds#adac766106a8cb521a1ee1817b800f96610549cf",
+    "@angular/compiler": "github:angular/compiler-builds#34eb5f9085f9879db0999d740af821ceb832437b",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#93740aa62e1237518145cfe0bbd81fb28bea0a57",
+    "@angular/core": "github:angular/core-builds#f2e8e87d2ab74937977ed0c9a8417d1e9ca65f6d",
+    "@angular/forms": "github:angular/forms-builds#207b371583a57aa8eddb17700544b2bbb191068a",
+    "@angular/language-service": "github:angular/language-service-builds#e5600a1efa198ed5aec86eb42398f413dfa6081e",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#13758eb5b7d9a578971f7f6ded23e64e97484b49",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#72cef0e5a35d026abbc0b559ead5c6312758ead6",
+    "@angular/router": "github:angular/router-builds#b6dee9d6b0833ee9c47bb9cd0f3edfed85245cdc"
   }
 }
\ No newline at end of file

From c630d5f811d169198938c0880187abc6bf5b0cf2 Mon Sep 17 00:00:00 2001
From: Jason Miller <developit@google.com>
Date: Fri, 12 Oct 2018 16:29:30 -0400
Subject: [PATCH 1051/1703] feat(@angular-devkit/build-angular): support module
 web workers.

Supports new Worker(...,{type:module}) using github.com/googlechromelabs/worker-plugin
---
 packages/angular/cli/lib/config/schema.json                | 5 +++++
 packages/angular_devkit/build_angular/package.json         | 3 ++-
 .../src/angular-cli-files/models/build-options.ts          | 1 +
 .../src/angular-cli-files/models/webpack-configs/common.ts | 6 ++++++
 yarn.lock                                                  | 7 +++++++
 5 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index 0e0383fbe6d6..44748d4e9e0f 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -836,6 +836,11 @@
             "ngswConfigPath": {
               "type": "string",
               "description": "Path to ngsw-config.json."
+            },  
+            "autoBundleWorkerModules": {
+              "type": "boolean",
+              "description": "Automatically bundle new Worker('..', { type:'module' })",
+              "default": true
             },
             "skipAppShell": {
               "type": "boolean",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index d7e47486d2d0..7195f774e6df 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -51,7 +51,8 @@
     "webpack-dev-server": "3.2.1",
     "webpack-merge": "4.2.1",
     "webpack-sources": "1.3.0",
-    "webpack-subresource-integrity": "1.1.0-rc.6"
+    "webpack-subresource-integrity": "1.1.0-rc.6",
+    "worker-plugin": "3.1.0"
   },
   "devDependencies": {
     "@angular/animations": "^8.0.0-beta.10",
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
index 993ae9593239..8cc3c4e6635d 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
@@ -54,6 +54,7 @@ export interface BuildOptions {
   namedChunks?: boolean;
   subresourceIntegrity?: boolean;
   serviceWorker?: boolean;
+  autoBundleWorkerModules?: boolean;
   skipAppShell?: boolean;
   statsJson: boolean;
   forkTypeChecker: boolean;
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index a9c03738a641..fc8f334ba67d 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -28,6 +28,7 @@ const ProgressPlugin = require('webpack/lib/ProgressPlugin');
 const CircularDependencyPlugin = require('circular-dependency-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
 const StatsPlugin = require('stats-webpack-plugin');
+const WorkerPlugin = require('worker-plugin');
 
 
 // tslint:disable-next-line:no-any
@@ -133,6 +134,11 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
     });
   }
 
+  if (buildOptions.autoBundleWorkerModules) {
+    const workerPluginInstance = new WorkerPlugin({ globalObject: false });
+    extraPlugins.push(workerPluginInstance);
+  }
+
   // process asset entries
   if (buildOptions.assets) {
     const copyWebpackPluginPatterns = buildOptions.assets.map((asset: AssetPatternClass) => {
diff --git a/yarn.lock b/yarn.lock
index d144f82dbb4c..aa3afddc7554 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9897,6 +9897,13 @@ worker-farm@^1.5.2:
   dependencies:
     errno "~0.1.7"
 
+worker-plugin@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/worker-plugin/-/worker-plugin-3.1.0.tgz#6311778f3514a87c273510ee3f809cc3fe161e6f"
+  integrity sha512-iQ9KTTmmN5fhfc2KMR7CcDblvcrg1QQ4pXymqZ3cRZF8L0890YLBcEqlIsGPdxoFwghyN8RA1pCEhCKuTF4Lkw==
+  dependencies:
+    loader-utils "^1.1.0"
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"

From 1810394c3a3c7cbf84a355ddee34bc2d6e483fd7 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 18 Feb 2019 17:10:12 +0000
Subject: [PATCH 1052/1703] test(@angular-devkit/build-angular): test worker
 bundling

---
 .../build_angular/src/browser/schema.json     |  5 +
 .../test/browser/bundle-worker_spec_large.ts  | 91 +++++++++++++++++++
 .../e2e/tests/misc/bundle-worker.ts           | 47 ++++++++++
 3 files changed, 143 insertions(+)
 create mode 100644 packages/angular_devkit/build_angular/test/browser/bundle-worker_spec_large.ts
 create mode 100644 tests/legacy-cli/e2e/tests/misc/bundle-worker.ts

diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index d8aeb05a119e..9746dd496297 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -259,6 +259,11 @@
       "description": "Generates a service worker config for production builds.",
       "default": false
     },
+    "autoBundleWorkerModules": {
+      "type": "boolean",
+      "description": "Automatically bundle new Worker('..', { type:'module' })",
+      "default": true
+    },    
     "ngswConfigPath": {
       "type": "string",
       "description": "Path to ngsw-config.json."
diff --git a/packages/angular_devkit/build_angular/test/browser/bundle-worker_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/bundle-worker_spec_large.ts
new file mode 100644
index 000000000000..ada51ef9df4a
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/bundle-worker_spec_large.ts
@@ -0,0 +1,91 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { runTargetSpec } from '@angular-devkit/architect/testing';
+import { join, virtualFs } from '@angular-devkit/core';
+import { tap } from 'rxjs/operators';
+import { browserTargetSpec, host, outputPath } from '../utils';
+
+
+describe('Browser Builder bundle worker', () => {
+  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
+  // afterEach(done => host.restore().toPromise().then(done, done.fail));
+
+  const workerFiles = {
+    'src/dep.js': `export const foo = 'bar';`,
+    'src/worker.js': `
+      import { foo } from './dep';
+
+      console.log('hello from worker');
+
+      addEventListener('message', ({ data }) => {
+        console.log('worker got message:', data);
+        if (data === 'hello') {
+          postMessage(foo);
+        }
+      });
+    `,
+    'src/main.ts': `
+      const worker = new Worker('./worker', { type: 'module' });
+      worker.onmessage = ({ data }) => {
+        console.log('page got message:', data);
+      };
+      worker.postMessage('hello');
+    `,
+  };
+
+  describe('js workers', () => {
+    it('bundles worker', (done) => {
+      host.writeMultipleFiles(workerFiles);
+      const overrides = { autoBundleWorkerModules: true };
+      runTargetSpec(host, browserTargetSpec, overrides).pipe(
+        tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+        tap(() => {
+          const workerContent = virtualFs.fileBufferToString(
+            host.scopedSync().read(join(outputPath, '0.worker.js')),
+          );
+          // worker bundle contains worker code.
+          expect(workerContent).toContain('hello from worker');
+          expect(workerContent).toContain('bar');
+
+          const mainContent = virtualFs.fileBufferToString(
+            host.scopedSync().read(join(outputPath, 'main.js')),
+          );
+          // main bundle references worker.
+          expect(mainContent).toContain('0.worker.js');
+        }),
+      ).toPromise().then(done, done.fail);
+    });
+
+    it('minimizes and hashes worker', (done) => {
+      host.writeMultipleFiles(workerFiles);
+      const overrides = { autoBundleWorkerModules: true, outputHashing: 'all', optimization: true };
+      runTargetSpec(host, browserTargetSpec, overrides).pipe(
+        tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+        tap(() => {
+          const workerBundle = host.fileMatchExists(outputPath,
+            /0\.[0-9a-f]{20}\.worker\.js/) as string;
+          expect(workerBundle).toBeTruthy('workerBundle should exist');
+          const workerContent = virtualFs.fileBufferToString(
+            host.scopedSync().read(join(outputPath, workerBundle)),
+          );
+          expect(workerContent).toContain('hello from worker');
+          expect(workerContent).toContain('bar');
+          expect(workerContent).toContain('"hello"===e&&postMessage("bar")');
+
+          const mainBundle = host.fileMatchExists(outputPath, /main\.[0-9a-f]{20}\.js/) as string;
+          expect(mainBundle).toBeTruthy('mainBundle should exist');
+          const mainContent = virtualFs.fileBufferToString(
+            host.scopedSync().read(join(outputPath, mainBundle)),
+          );
+          expect(mainContent).toContain(workerBundle);
+        }),
+      ).toPromise().then(done, done.fail);
+    });
+  });
+});
diff --git a/tests/legacy-cli/e2e/tests/misc/bundle-worker.ts b/tests/legacy-cli/e2e/tests/misc/bundle-worker.ts
new file mode 100644
index 000000000000..22f600e6aaf8
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/misc/bundle-worker.ts
@@ -0,0 +1,47 @@
+import { writeMultipleFiles, appendToFile } from '../../utils/fs';
+import { ng } from '../../utils/process';
+
+
+export default async function () {
+  // console.warn has to be used because chrome only captures warnings and errors by default
+  // https://github.com/angular/protractor/issues/2207
+  await writeMultipleFiles({
+    './src/dep.js': `export const foo = 'bar';`,
+    './src/worker.js': `
+      import { foo } from './dep';
+
+      console.warn('hello from worker');
+
+      addEventListener('message', ({ data }) => {
+        console.warn(\`worker got message: \${ data }\`);
+        if (data === 'hello') {
+          postMessage(foo);
+        }
+      });
+    `,
+    './e2e/app.e2e-spec.ts': `
+      import { browser } from 'protractor';
+
+      describe('worker bundle', function() {
+        it('should log worker messages', () => {
+          page.navigateTo();
+          const logs = await browser.manage().logs().get(logging.Type.BROWSER);
+          expect(logs.length).toEqual(3);
+          expect(logs[0].message).toContain('hello from worker');
+          expect(logs[1].message).toContain('worker got message: hello');
+          expect(logs[2].message).toContain('page got message: bar');
+        });
+      });
+    `,
+  });
+
+  await appendToFile('./src/main.ts', `
+    const worker = new Worker('./worker', { type: 'module' });
+    worker.onmessage = ({ data }) => {
+      console.warn(\`page got message: \${ data }\`);
+    };
+    worker.postMessage('hello');
+  `);
+
+  await ng('e2e');
+}

From 1d66e555478596eb484d68c485cff9c820be3d8f Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 21 Feb 2019 12:32:29 +0000
Subject: [PATCH 1053/1703] feat(@ngtools/webpack): reuse compiler host in
 webpack child compilations

---
 .../webpack/src/angular_compiler_plugin.ts    | 26 +++++++++++++++++--
 .../src/virtual_file_system_decorator.ts      |  4 +++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 6dda7de68b0f..914123c00332 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -596,7 +596,7 @@ export class AngularCompilerPlugin {
 
   // Registration hook for webpack plugin.
   // tslint:disable-next-line:no-big-function
-  apply(compiler: Compiler & { watchMode?: boolean }) {
+  apply(compiler: Compiler & { watchMode?: boolean, parentCompilation?: compilation.Compilation }) {
     // The below is require by NGCC processor
     // since we need to know which fields we need to process
     compiler.hooks.environment.tap('angular-compiler', () => {
@@ -610,8 +610,14 @@ export class AngularCompilerPlugin {
     // cleanup if not watching
     compiler.hooks.thisCompilation.tap('angular-compiler', compilation => {
       compilation.hooks.finishModules.tap('angular-compiler', () => {
+        let rootCompiler = compiler;
+        while (rootCompiler.parentCompilation) {
+          // tslint:disable-next-line:no-any
+          rootCompiler = compiler.parentCompilation as any;
+        }
+
         // only present for webpack 4.23.0+, assume true otherwise
-        const watchMode = compiler.watchMode === undefined ? true : compiler.watchMode;
+        const watchMode = rootCompiler.watchMode === undefined ? true : rootCompiler.watchMode;
         if (!watchMode) {
           this._program = null;
           this._transformers = [];
@@ -859,6 +865,22 @@ export class AngularCompilerPlugin {
       throw new Error('An @ngtools/webpack plugin already exist for this compilation.');
     }
 
+    // If there is no compiler host at this point, it means that the environment hook did not run.
+    // This happens in child compilations that inherit the parent compilation file system.
+    if (this._compilerHost === undefined) {
+      const inputFs = compilation.compiler.inputFileSystem as VirtualFileSystemDecorator;
+      if (!inputFs.getWebpackCompilerHost) {
+        throw new Error('AngularCompilerPlugin is running in a child compilation, but could' +
+          'not find a WebpackCompilerHost in the parent compilation.');
+      }
+
+      // Use the existing WebpackCompilerHost to ensure builds and rebuilds work.
+      this._compilerHost = createCompilerHost({
+        options: this._compilerOptions,
+        tsHost: inputFs.getWebpackCompilerHost(),
+      }) as CompilerHost & WebpackCompilerHost;
+    }
+
     // Set a private variable for this plugin instance.
     // tslint:disable-next-line:no-any
     (compilation as any)._ngToolsWebpackPluginInstance = this;
diff --git a/packages/ngtools/webpack/src/virtual_file_system_decorator.ts b/packages/ngtools/webpack/src/virtual_file_system_decorator.ts
index 853d13378072..3f4aaf3b6d99 100644
--- a/packages/ngtools/webpack/src/virtual_file_system_decorator.ts
+++ b/packages/ngtools/webpack/src/virtual_file_system_decorator.ts
@@ -21,6 +21,10 @@ export class VirtualFileSystemDecorator implements InputFileSystem {
     private _webpackCompilerHost: WebpackCompilerHost,
   ) { }
 
+  getWebpackCompilerHost() {
+    return this._webpackCompilerHost;
+  }
+
   getVirtualFilesPaths() {
     return this._webpackCompilerHost.getNgFactoryPaths();
   }

From ed0e6aab57cd1c31f454116d4378ba793f95f016 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 21 Feb 2019 12:37:58 +0000
Subject: [PATCH 1054/1703] feat(@angular-devkit/build-angular): support TS web
 workers

---
 packages/angular/cli/lib/config/schema.json   |   9 +-
 .../angular-cli-files/models/build-options.ts |   2 +-
 .../models/webpack-configs/common.ts          |   6 -
 .../models/webpack-configs/index.ts           |   1 +
 .../models/webpack-configs/typescript.ts      |  21 ++
 .../models/webpack-configs/worker.ts          |  30 +++
 .../build_angular/src/browser/index.ts        |   5 +
 .../build_angular/src/browser/schema.json     |   9 +-
 .../test/browser/bundle-worker_spec_large.ts  |  91 ---------
 .../test/browser/web-worker_spec_large.ts     | 186 ++++++++++++++++++
 .../webpack/src/angular_compiler_plugin.ts    |   2 +
 .../e2e/tests/experimental/worker.ts          |  87 ++++++++
 .../e2e/tests/misc/bundle-worker.ts           |  47 -----
 13 files changed, 341 insertions(+), 155 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/worker.ts
 delete mode 100644 packages/angular_devkit/build_angular/test/browser/bundle-worker_spec_large.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts
 create mode 100644 tests/legacy-cli/e2e/tests/experimental/worker.ts
 delete mode 100644 tests/legacy-cli/e2e/tests/misc/bundle-worker.ts

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index 44748d4e9e0f..774eb7daeb44 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -836,11 +836,6 @@
             "ngswConfigPath": {
               "type": "string",
               "description": "Path to ngsw-config.json."
-            },  
-            "autoBundleWorkerModules": {
-              "type": "boolean",
-              "description": "Automatically bundle new Worker('..', { type:'module' })",
-              "default": true
             },
             "skipAppShell": {
               "type": "boolean",
@@ -887,6 +882,10 @@
               "type": "boolean",
               "default": false,
               "x-deprecated": true
+            },
+            "webWorkerTsConfig": {
+              "type": "string",
+              "description": "TypeScript configuration for Web Worker modules."
             }
           },
           "additionalProperties": false,
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
index 8cc3c4e6635d..d32668885405 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
@@ -54,7 +54,7 @@ export interface BuildOptions {
   namedChunks?: boolean;
   subresourceIntegrity?: boolean;
   serviceWorker?: boolean;
-  autoBundleWorkerModules?: boolean;
+  webWorkerTsConfig?: string;
   skipAppShell?: boolean;
   statsJson: boolean;
   forkTypeChecker: boolean;
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index fc8f334ba67d..a9c03738a641 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -28,7 +28,6 @@ const ProgressPlugin = require('webpack/lib/ProgressPlugin');
 const CircularDependencyPlugin = require('circular-dependency-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
 const StatsPlugin = require('stats-webpack-plugin');
-const WorkerPlugin = require('worker-plugin');
 
 
 // tslint:disable-next-line:no-any
@@ -134,11 +133,6 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
     });
   }
 
-  if (buildOptions.autoBundleWorkerModules) {
-    const workerPluginInstance = new WorkerPlugin({ globalObject: false });
-    extraPlugins.push(workerPluginInstance);
-  }
-
   // process asset entries
   if (buildOptions.assets) {
     const copyWebpackPluginPatterns = buildOptions.assets.map((asset: AssetPatternClass) => {
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/index.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/index.ts
index 1ec5c1a271bf..11bbaeaa3118 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/index.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/index.ts
@@ -13,3 +13,4 @@ export * from './test';
 export * from './typescript';
 export * from './utils';
 export * from './stats';
+export * from './worker';
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
index d9a0b8a06748..89bfe5ed7571 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
@@ -108,3 +108,24 @@ export function getAotConfig(wco: WebpackConfigOptions, extract = false) {
     plugins: [_createAotPlugin(wco, { tsConfigPath }, true, extract)]
   };
 }
+
+export function getTypescriptWorkerPlugin(wco: WebpackConfigOptions, workerTsConfigPath: string) {
+  const { buildOptions } = wco;
+
+  const pluginOptions: AngularCompilerPluginOptions = {
+    skipCodeGeneration: true,
+    tsConfigPath: workerTsConfigPath,
+    mainPath: undefined,
+    platform: PLATFORM.Browser,
+    sourceMap: buildOptions.sourceMap.scripts,
+    forkTypeChecker: buildOptions.forkTypeChecker,
+    contextElementDependencyConstructor: require('webpack/lib/dependencies/ContextElementDependency'),
+    logger: wco.logger,
+    // Run no transformers.
+    platformTransformers: [],
+    // Don't attempt lazy route discovery.
+    discoverLazyRoutes: false,
+  };
+
+  return new AngularCompilerPlugin(pluginOptions);
+}
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/worker.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/worker.ts
new file mode 100644
index 000000000000..1ec0a148ed0d
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/worker.ts
@@ -0,0 +1,30 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { resolve } from 'path';
+import { Configuration } from 'webpack';
+import { WebpackConfigOptions } from '../build-options';
+import { getTypescriptWorkerPlugin } from './typescript';
+
+const WorkerPlugin = require('worker-plugin');
+
+
+export function getWorkerConfig(wco: WebpackConfigOptions): Configuration {
+  const { buildOptions } = wco;
+  if (!buildOptions.webWorkerTsConfig) {
+    throw new Error('The `webWorkerTsConfig` must be a string.');
+  }
+
+  const workerTsConfigPath = resolve(wco.root, buildOptions.webWorkerTsConfig);
+
+  return {
+    plugins: [new WorkerPlugin({
+      globalObject: false,
+      plugins: [getTypescriptWorkerPlugin(wco, workerTsConfigPath)],
+    })],
+  };
+}
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 182e83e1110d..4dd67931ce82 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -42,6 +42,7 @@ import {
   getNonAotConfig,
   getStatsConfig,
   getStylesConfig,
+  getWorkerConfig,
 } from '../angular-cli-files/models/webpack-configs';
 import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
 import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
@@ -161,6 +162,10 @@ export function buildWebpackConfig(
     webpackConfigs.push(typescriptConfigPartial);
   }
 
+  if (wco.buildOptions.webWorkerTsConfig) {
+    webpackConfigs.push(getWorkerConfig(wco));
+  }
+
   const webpackConfig = webpackMerge(webpackConfigs);
 
   if (options.profile || process.env['NG_BUILD_PROFILING']) {
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index 9746dd496297..1dbf30b90b01 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -259,11 +259,6 @@
       "description": "Generates a service worker config for production builds.",
       "default": false
     },
-    "autoBundleWorkerModules": {
-      "type": "boolean",
-      "description": "Automatically bundle new Worker('..', { type:'module' })",
-      "default": true
-    },    
     "ngswConfigPath": {
       "type": "string",
       "description": "Path to ngsw-config.json."
@@ -325,6 +320,10 @@
       "description": "**EXPERIMENTAL** Transform import statements for lazy routes to import factories when using View Engine. Should only be used when switching back and forth between View Engine and Ivy. See https://angular.io/guide/ivy for usage information.",
       "type": "boolean",
       "default": false
+    },
+    "webWorkerTsConfig": {
+      "type": "string",
+      "description": "TypeScript configuration for Web Worker modules."
     }
   },
   "additionalProperties": false,
diff --git a/packages/angular_devkit/build_angular/test/browser/bundle-worker_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/bundle-worker_spec_large.ts
deleted file mode 100644
index ada51ef9df4a..000000000000
--- a/packages/angular_devkit/build_angular/test/browser/bundle-worker_spec_large.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { join, virtualFs } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
-import { browserTargetSpec, host, outputPath } from '../utils';
-
-
-describe('Browser Builder bundle worker', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  // afterEach(done => host.restore().toPromise().then(done, done.fail));
-
-  const workerFiles = {
-    'src/dep.js': `export const foo = 'bar';`,
-    'src/worker.js': `
-      import { foo } from './dep';
-
-      console.log('hello from worker');
-
-      addEventListener('message', ({ data }) => {
-        console.log('worker got message:', data);
-        if (data === 'hello') {
-          postMessage(foo);
-        }
-      });
-    `,
-    'src/main.ts': `
-      const worker = new Worker('./worker', { type: 'module' });
-      worker.onmessage = ({ data }) => {
-        console.log('page got message:', data);
-      };
-      worker.postMessage('hello');
-    `,
-  };
-
-  describe('js workers', () => {
-    it('bundles worker', (done) => {
-      host.writeMultipleFiles(workerFiles);
-      const overrides = { autoBundleWorkerModules: true };
-      runTargetSpec(host, browserTargetSpec, overrides).pipe(
-        tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-        tap(() => {
-          const workerContent = virtualFs.fileBufferToString(
-            host.scopedSync().read(join(outputPath, '0.worker.js')),
-          );
-          // worker bundle contains worker code.
-          expect(workerContent).toContain('hello from worker');
-          expect(workerContent).toContain('bar');
-
-          const mainContent = virtualFs.fileBufferToString(
-            host.scopedSync().read(join(outputPath, 'main.js')),
-          );
-          // main bundle references worker.
-          expect(mainContent).toContain('0.worker.js');
-        }),
-      ).toPromise().then(done, done.fail);
-    });
-
-    it('minimizes and hashes worker', (done) => {
-      host.writeMultipleFiles(workerFiles);
-      const overrides = { autoBundleWorkerModules: true, outputHashing: 'all', optimization: true };
-      runTargetSpec(host, browserTargetSpec, overrides).pipe(
-        tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-        tap(() => {
-          const workerBundle = host.fileMatchExists(outputPath,
-            /0\.[0-9a-f]{20}\.worker\.js/) as string;
-          expect(workerBundle).toBeTruthy('workerBundle should exist');
-          const workerContent = virtualFs.fileBufferToString(
-            host.scopedSync().read(join(outputPath, workerBundle)),
-          );
-          expect(workerContent).toContain('hello from worker');
-          expect(workerContent).toContain('bar');
-          expect(workerContent).toContain('"hello"===e&&postMessage("bar")');
-
-          const mainBundle = host.fileMatchExists(outputPath, /main\.[0-9a-f]{20}\.js/) as string;
-          expect(mainBundle).toBeTruthy('mainBundle should exist');
-          const mainContent = virtualFs.fileBufferToString(
-            host.scopedSync().read(join(outputPath, mainBundle)),
-          );
-          expect(mainContent).toContain(workerBundle);
-        }),
-      ).toPromise().then(done, done.fail);
-    });
-  });
-});
diff --git a/packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts
new file mode 100644
index 000000000000..73526ee403d6
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts
@@ -0,0 +1,186 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { DefaultTimeout, TestLogger, runTargetSpec } from '@angular-devkit/architect/testing';
+import { join, virtualFs } from '@angular-devkit/core';
+import { debounceTime, takeWhile, tap } from 'rxjs/operators';
+import { browserTargetSpec, host, outputPath } from '../utils';
+
+
+describe('Browser Builder Web Worker support', () => {
+  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
+  afterEach(done => host.restore().toPromise().then(done, done.fail));
+
+  const workerFiles: { [k: string]: string } = {
+    'src/app/dep.ts': `export const foo = 'bar';`,
+    'src/app/app.worker.ts': `
+      import { foo } from './dep';
+      console.log('hello from worker');
+      addEventListener('message', ({ data }) => {
+        console.log('worker got message:', data);
+        if (data === 'hello') {
+          postMessage(foo);
+        }
+      });
+    `,
+    'src/main.ts': `
+      import { enableProdMode } from '@angular/core';
+      import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+      import { AppModule } from './app/app.module';
+      import { environment } from './environments/environment';
+      if (environment.production) { enableProdMode(); }
+      platformBrowserDynamic().bootstrapModule(AppModule).catch(err => console.error(err));
+
+      const worker = new Worker('./app/app.worker', { type: 'module' });
+      worker.onmessage = ({ data }) => {
+        console.log('page got message:', data);
+      };
+      worker.postMessage('hello');
+    `,
+    // Make a new tsconfig for the *.worker.ts files.
+    // The final place for this tsconfig must take into consideration editor tooling, unit
+    // tests, and integration with other build targets.
+    './src/tsconfig.worker.json': `
+      {
+        "extends": "../tsconfig.json",
+        "compilerOptions": {
+          "outDir": "../out-tsc/worker",
+          "lib": [
+            "es2018",
+            "webworker"
+          ],
+          "types": []
+        },
+        "include": [
+          "**/*.worker.ts",
+        ]
+      }`,
+    // Alter the app tsconfig to not include *.worker.ts files.
+    './src/tsconfig.app.json': `
+      {
+        "extends": "../tsconfig.json",
+        "compilerOptions": {
+          "outDir": "../out-tsc/worker",
+          "types": []
+        },
+        "exclude": [
+          "test.ts",
+          "**/*.spec.ts",
+          "**/*.worker.ts",
+          "app/dep.ts",
+        ]
+      }`,
+  };
+
+  it('bundles TS worker', (done) => {
+    const logger = new TestLogger('worker-warnings');
+    host.writeMultipleFiles(workerFiles);
+    const overrides = { webWorkerTsConfig: 'src/tsconfig.worker.json' };
+    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout, logger).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => {
+        const workerContent = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, '0.worker.js')),
+        );
+        // worker bundle contains worker code.
+        expect(workerContent).toContain('hello from worker');
+        expect(workerContent).toContain('bar');
+
+        const mainContent = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, 'main.js')),
+        );
+        // main bundle references worker.
+        expect(mainContent).toContain('0.worker.js');
+      }),
+      // Doesn't show any warnings.
+      tap(() => expect(logger.includes('WARNING')).toBe(false, 'Should show no warnings.')),
+    ).toPromise().then(done, done.fail);
+  });
+
+  it('minimizes and hashes worker', (done) => {
+    host.writeMultipleFiles(workerFiles);
+    const overrides = {
+      webWorkerTsConfig: 'src/tsconfig.worker.json',
+      outputHashing: 'all',
+      optimization: true,
+    };
+    runTargetSpec(host, browserTargetSpec, overrides).pipe(
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      tap(() => {
+        const workerBundle = host.fileMatchExists(outputPath,
+          /0\.[0-9a-f]{20}\.worker\.js/) as string;
+        expect(workerBundle).toBeTruthy('workerBundle should exist');
+        const workerContent = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, workerBundle)),
+        );
+        expect(workerContent).toContain('hello from worker');
+        expect(workerContent).toContain('bar');
+        expect(workerContent).toContain('"hello"===t&&postMessage');
+
+        const mainBundle = host.fileMatchExists(outputPath, /main\.[0-9a-f]{20}\.js/) as string;
+        expect(mainBundle).toBeTruthy('mainBundle should exist');
+        const mainContent = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, mainBundle)),
+        );
+        expect(mainContent).toContain(workerBundle);
+      }),
+    ).toPromise().then(done, done.fail);
+  });
+
+  it('rebuilds TS worker', (done) => {
+    host.writeMultipleFiles(workerFiles);
+    const overrides = {
+      webWorkerTsConfig: 'src/tsconfig.worker.json',
+      watch: true,
+    };
+
+    let buildCount = 0;
+    let phase = 1;
+    const workerPath = join(outputPath, '0.worker.js');
+    let workerContent = '';
+
+    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 3).pipe(
+      // Wait for files to be written to disk.
+      debounceTime(1000),
+      tap((buildEvent) => expect(buildEvent.success).toBe(true, 'build should succeed')),
+      tap(() => {
+        buildCount++;
+        switch (phase) {
+          case 1:
+            // Original worker content should be there.
+            workerContent = virtualFs.fileBufferToString(host.scopedSync().read(workerPath));
+            expect(workerContent).toContain('bar');
+            // Change content of worker dependency.
+            host.writeMultipleFiles({ 'src/app/dep.ts': `export const foo = 'baz';` });
+            phase = 2;
+            break;
+
+          case 2:
+            workerContent = virtualFs.fileBufferToString(host.scopedSync().read(workerPath));
+            // TODO(filipesilva): Should this change? Check with Jason Miller.
+            // The worker changes name with each rebuild. But sometimes it also changes from 0 to
+            // 1 and then back to 0. It's hard to know where the updated content is, but it should
+            // be in one of these two.
+            const anotherWorkerPath = join(outputPath, '1.worker.js');
+            const anotherWorkerContent = virtualFs.fileBufferToString(
+              host.scopedSync().read(anotherWorkerPath));
+            // Worker content should have changed.
+            expect(
+              workerContent.includes('baz') || anotherWorkerContent.includes('baz'),
+            ).toBeTruthy('Worker bundle did not contain updated content.');
+            phase = 3;
+            break;
+        }
+      }),
+      takeWhile(() => phase < 3),
+    ).toPromise().then(
+      () => done(),
+      () => done.fail(`stuck at phase ${phase} [builds: ${buildCount}]`),
+    );
+  });
+});
diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 914123c00332..fec4676bbeb6 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -867,6 +867,8 @@ export class AngularCompilerPlugin {
 
     // If there is no compiler host at this point, it means that the environment hook did not run.
     // This happens in child compilations that inherit the parent compilation file system.
+    // Node: child compilations also do not run most webpack compiler hooks, including almost all
+    // we use here. The child compiler will always run as if it was the first build.
     if (this._compilerHost === undefined) {
       const inputFs = compilation.compiler.inputFileSystem as VirtualFileSystemDecorator;
       if (!inputFs.getWebpackCompilerHost) {
diff --git a/tests/legacy-cli/e2e/tests/experimental/worker.ts b/tests/legacy-cli/e2e/tests/experimental/worker.ts
new file mode 100644
index 000000000000..65dfd107f439
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/experimental/worker.ts
@@ -0,0 +1,87 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { appendToFile, createDir, replaceInFile, writeMultipleFiles } from '../../utils/fs';
+import { ng } from '../../utils/process';
+
+
+export default async function () {
+  // console.warn has to be used because chrome only captures warnings and errors by default
+  // https://github.com/angular/protractor/issues/2207
+  await createDir('./src/worker');
+  await writeMultipleFiles({
+    './src/app/dep.ts': `export const foo = 'bar';`,
+    './src/app/app.worker.ts': `
+      import 'typescript/lib/lib.webworker';
+      import { foo } from './dep';
+      console.warn('hello from worker');
+      addEventListener('message', ({ data }) => {
+        console.warn(\`worker got message: \${ data }\`);
+        if (data === 'hello') {
+          postMessage(foo);
+        }
+      });
+    `,
+    './src/tsconfig.worker.json': `
+      {
+        "extends": "../tsconfig.json",
+        "compilerOptions": {
+          "outDir": "../out-tsc/worker",
+          "lib": [
+            "es2018",
+            "webworker"
+          ],
+          "types": []
+        },
+        "include": [
+          "**/*.worker.ts",
+        ]
+      }`,
+    './src/tsconfig.app.json': `
+      {
+        "extends": "../tsconfig.json",
+        "compilerOptions": {
+          "outDir": "../out-tsc/worker",
+          "types": []
+        },
+        "exclude": [
+          "test.ts",
+          "**/*.spec.ts",
+          "**/*.worker.ts",
+        ]
+      }`,
+    './e2e/app.e2e-spec.ts': `
+      import { browser } from 'protractor';
+
+      describe('worker bundle', function() {
+        it('should log worker messages', () => {
+          page.navigateTo();
+          const logs = await browser.manage().logs().get(logging.Type.BROWSER);
+          expect(logs.length).toEqual(3);
+          expect(logs[0].message).toContain('hello from worker');
+          expect(logs[1].message).toContain('worker got message: hello');
+          expect(logs[2].message).toContain('page got message: bar');
+        });
+      });
+    `,
+  });
+
+  await appendToFile('./src/main.ts', `
+    const worker = new Worker('./app/app.worker.ts', { type: 'module' });
+    worker.onmessage = ({ data }) => {
+      console.warn(\`page got message: \${ data }\`);
+    };
+    worker.postMessage('hello');
+  `);
+
+  await replaceInFile('./angular.json',`"tsConfig": "src/tsconfig.app.json",`,
+    `"tsConfig": "src/tsconfig.app.json",
+    "experimentalWebWorkerTsConfig": "src/tsconfig.worker.json",`,
+  );
+
+  await ng('e2e');
+}
diff --git a/tests/legacy-cli/e2e/tests/misc/bundle-worker.ts b/tests/legacy-cli/e2e/tests/misc/bundle-worker.ts
deleted file mode 100644
index 22f600e6aaf8..000000000000
--- a/tests/legacy-cli/e2e/tests/misc/bundle-worker.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { writeMultipleFiles, appendToFile } from '../../utils/fs';
-import { ng } from '../../utils/process';
-
-
-export default async function () {
-  // console.warn has to be used because chrome only captures warnings and errors by default
-  // https://github.com/angular/protractor/issues/2207
-  await writeMultipleFiles({
-    './src/dep.js': `export const foo = 'bar';`,
-    './src/worker.js': `
-      import { foo } from './dep';
-
-      console.warn('hello from worker');
-
-      addEventListener('message', ({ data }) => {
-        console.warn(\`worker got message: \${ data }\`);
-        if (data === 'hello') {
-          postMessage(foo);
-        }
-      });
-    `,
-    './e2e/app.e2e-spec.ts': `
-      import { browser } from 'protractor';
-
-      describe('worker bundle', function() {
-        it('should log worker messages', () => {
-          page.navigateTo();
-          const logs = await browser.manage().logs().get(logging.Type.BROWSER);
-          expect(logs.length).toEqual(3);
-          expect(logs[0].message).toContain('hello from worker');
-          expect(logs[1].message).toContain('worker got message: hello');
-          expect(logs[2].message).toContain('page got message: bar');
-        });
-      });
-    `,
-  });
-
-  await appendToFile('./src/main.ts', `
-    const worker = new Worker('./worker', { type: 'module' });
-    worker.onmessage = ({ data }) => {
-      console.warn(\`page got message: \${ data }\`);
-    };
-    worker.postMessage('hello');
-  `);
-
-  await ng('e2e');
-}

From 7ed4a60095ce62f67ebcce840f5c1a2936832839 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 28 Feb 2019 17:07:22 +0000
Subject: [PATCH 1055/1703] feat(@schematics/angular): add web worker
 schematics

---
 packages/schematics/angular/collection.json   |   6 +
 .../angular/utility/workspace-models.ts       |   1 +
 .../project-tsconfig/tsconfig.json.template   |  10 +
 .../tsconfig.worker.json.template             |  14 ++
 .../__name@dasherize__.worker.ts.template     |   4 +
 .../schematics/angular/web-worker/index.ts    | 210 ++++++++++++++++++
 .../angular/web-worker/index_spec.ts          |  85 +++++++
 .../schematics/angular/web-worker/schema.json |  45 ++++
 tests/legacy-cli/e2e/tests/build/worker.ts    |  45 ++++
 .../e2e/tests/experimental/worker.ts          |  87 --------
 10 files changed, 420 insertions(+), 87 deletions(-)
 create mode 100644 packages/schematics/angular/web-worker/files/project-tsconfig/tsconfig.json.template
 create mode 100644 packages/schematics/angular/web-worker/files/worker-tsconfig/tsconfig.worker.json.template
 create mode 100644 packages/schematics/angular/web-worker/files/worker/__name@dasherize__.worker.ts.template
 create mode 100644 packages/schematics/angular/web-worker/index.ts
 create mode 100644 packages/schematics/angular/web-worker/index_spec.ts
 create mode 100644 packages/schematics/angular/web-worker/schema.json
 create mode 100644 tests/legacy-cli/e2e/tests/build/worker.ts
 delete mode 100644 tests/legacy-cli/e2e/tests/experimental/worker.ts

diff --git a/packages/schematics/angular/collection.json b/packages/schematics/angular/collection.json
index 682667e73f02..9145af5e4840 100644
--- a/packages/schematics/angular/collection.json
+++ b/packages/schematics/angular/collection.json
@@ -100,6 +100,12 @@
       "factory": "./library",
       "schema": "./library/schema.json",
       "description": "Generate a library project for Angular."
+    },
+    "webWorker": {
+      "aliases": ["web-worker", "worker"],
+      "factory": "./web-worker",
+      "schema": "./web-worker/schema.json",
+      "description": "Create a Web Worker ."
     }
   }
 }
diff --git a/packages/schematics/angular/utility/workspace-models.ts b/packages/schematics/angular/utility/workspace-models.ts
index 3d226000317b..9c8eebdcf78f 100644
--- a/packages/schematics/angular/utility/workspace-models.ts
+++ b/packages/schematics/angular/utility/workspace-models.ts
@@ -61,6 +61,7 @@ export interface BrowserBuilderOptions extends BrowserBuilderBaseOptions {
         maximumError?: string;
     }[];
     es5BrowserSupport?: boolean;
+    webWorkerTsConfig?: string;
 }
 
 export interface ServeBuilderOptions {
diff --git a/packages/schematics/angular/web-worker/files/project-tsconfig/tsconfig.json.template b/packages/schematics/angular/web-worker/files/project-tsconfig/tsconfig.json.template
new file mode 100644
index 000000000000..b170f6d1d0e5
--- /dev/null
+++ b/packages/schematics/angular/web-worker/files/project-tsconfig/tsconfig.json.template
@@ -0,0 +1,10 @@
+{
+  "extends": "<%= relativePathToWorkspaceRoot %>/tsconfig.json",
+  "compilerOptions": {
+    "lib": [
+      "es2018",
+      "dom",
+      "webworker"
+    ],
+  }
+}
diff --git a/packages/schematics/angular/web-worker/files/worker-tsconfig/tsconfig.worker.json.template b/packages/schematics/angular/web-worker/files/worker-tsconfig/tsconfig.worker.json.template
new file mode 100644
index 000000000000..33b92e255762
--- /dev/null
+++ b/packages/schematics/angular/web-worker/files/worker-tsconfig/tsconfig.worker.json.template
@@ -0,0 +1,14 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "<%= relativePathToWorkspaceRoot %>/out-tsc/worker",
+    "lib": [
+      "es2018",
+      "webworker"
+    ],
+    "types": []
+  },
+  "include": [
+    "**/*.worker.ts"
+  ]
+}
diff --git a/packages/schematics/angular/web-worker/files/worker/__name@dasherize__.worker.ts.template b/packages/schematics/angular/web-worker/files/worker/__name@dasherize__.worker.ts.template
new file mode 100644
index 000000000000..b88e1b10b6ce
--- /dev/null
+++ b/packages/schematics/angular/web-worker/files/worker/__name@dasherize__.worker.ts.template
@@ -0,0 +1,4 @@
+addEventListener('message', ({ data }) => {
+  const response = `worker response to ${data}`;
+  postMessage(response);
+});
\ No newline at end of file
diff --git a/packages/schematics/angular/web-worker/index.ts b/packages/schematics/angular/web-worker/index.ts
new file mode 100644
index 000000000000..352c8d889de5
--- /dev/null
+++ b/packages/schematics/angular/web-worker/index.ts
@@ -0,0 +1,210 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { JsonParseMode, parseJsonAst, strings, tags } from '@angular-devkit/core';
+import {
+  Rule, SchematicContext, SchematicsException, Tree,
+  apply, applyTemplates, chain, mergeWith, move, noop, url,
+} from '@angular-devkit/schematics';
+import { getWorkspace, updateWorkspace } from '../utility/config';
+import { appendValueInAstArray, findPropertyInAstObject } from '../utility/json-utils';
+import { parseName } from '../utility/parse-name';
+import { buildDefaultPath, getProject } from '../utility/project';
+import { getProjectTargets } from '../utility/project-targets';
+import {
+  BrowserBuilderOptions,
+  BrowserBuilderTarget,
+  WorkspaceSchema,
+} from '../utility/workspace-models';
+import { Schema as WebWorkerOptions } from './schema';
+
+function getProjectConfiguration(
+  workspace: WorkspaceSchema,
+  options: WebWorkerOptions,
+): BrowserBuilderOptions {
+  if (!options.target) {
+    throw new SchematicsException('Option (target) is required.');
+  }
+
+  const projectTargets = getProjectTargets(workspace, options.project);
+  if (!projectTargets[options.target]) {
+    throw new Error(`Target is not defined for this project.`);
+  }
+
+  const target = projectTargets[options.target] as BrowserBuilderTarget;
+
+  return target.options;
+}
+
+function addConfig(options: WebWorkerOptions, root: string): Rule {
+  return (host: Tree, context: SchematicContext) => {
+    context.logger.debug('updating project configuration.');
+    const workspace = getWorkspace(host);
+    const config = getProjectConfiguration(workspace, options);
+
+    if (config.webWorkerTsConfig) {
+      // Don't do anything if the configuration is already there.
+      return;
+    }
+
+    const tsConfigRules = [];
+
+    // Add tsconfig.worker.json.
+    const relativePathToWorkspaceRoot = root.split('/').map(x => '..').join('/');
+    tsConfigRules.push(mergeWith(apply(url('./files/worker-tsconfig'), [
+      applyTemplates({ ...options, relativePathToWorkspaceRoot }),
+      move(root),
+    ])));
+
+    // Add build-angular config flag.
+    config.webWorkerTsConfig = `${root.endsWith('/') ? root : root + '/'}tsconfig.worker.json`;
+
+    // Add project tsconfig.json.
+    // The project level tsconfig.json with webworker lib is for editor support since
+    // the dom and webworker libs are mutually exclusive.
+    // Note: this schematic does not change other tsconfigs to use the project-level tsconfig.
+    const projectTsConfigPath = `${root}/tsconfig.json`;
+    if (host.exists(projectTsConfigPath)) {
+      // If the file already exists, alter it.
+      const buffer = host.read(projectTsConfigPath);
+      if (buffer) {
+        const tsCfgAst = parseJsonAst(buffer.toString(), JsonParseMode.Loose);
+        if (tsCfgAst.kind != 'object') {
+          throw new SchematicsException('Invalid tsconfig. Was expecting an object');
+        }
+        const optsAstNode = findPropertyInAstObject(tsCfgAst, 'compilerOptions');
+        if (optsAstNode && optsAstNode.kind != 'object') {
+          throw new SchematicsException(
+            'Invalid tsconfig "compilerOptions" property; Was expecting an object.');
+        }
+        const libAstNode = findPropertyInAstObject(tsCfgAst, 'lib');
+        if (libAstNode && libAstNode.kind != 'array') {
+          throw new SchematicsException('Invalid tsconfig "lib" property; expected an array.');
+        }
+        const newLibProp = 'webworker';
+        if (libAstNode && !libAstNode.value.includes(newLibProp)) {
+          const recorder = host.beginUpdate(projectTsConfigPath);
+          appendValueInAstArray(recorder, libAstNode, newLibProp);
+          host.commitUpdate(recorder);
+        }
+      }
+    } else {
+      // Otherwise create it.
+      tsConfigRules.push(mergeWith(apply(url('./files/project-tsconfig'), [
+        applyTemplates({ ...options, relativePathToWorkspaceRoot }),
+        move(root),
+      ])));
+    }
+
+    // Add worker glob exclusion to tsconfig.app.json.
+    const workerGlob = '**/*.worker.ts';
+    const tsConfigPath = config.tsConfig;
+    const buffer = host.read(tsConfigPath);
+    if (buffer) {
+      const tsCfgAst = parseJsonAst(buffer.toString(), JsonParseMode.Loose);
+      if (tsCfgAst.kind != 'object') {
+        throw new SchematicsException('Invalid tsconfig. Was expecting an object');
+      }
+      const filesAstNode = findPropertyInAstObject(tsCfgAst, 'exclude');
+      if (filesAstNode && filesAstNode.kind != 'array') {
+        throw new SchematicsException('Invalid tsconfig "exclude" property; expected an array.');
+      }
+
+      if (filesAstNode && filesAstNode.value.indexOf(workerGlob) == -1) {
+        const recorder = host.beginUpdate(tsConfigPath);
+        appendValueInAstArray(recorder, filesAstNode, workerGlob);
+        host.commitUpdate(recorder);
+      }
+    }
+
+    return chain([
+      // Add tsconfigs.
+      ...tsConfigRules,
+      // Add workspace configuration.
+      updateWorkspace(workspace),
+    ]);
+  };
+}
+
+function addSnippet(options: WebWorkerOptions): Rule {
+  return (host: Tree, context: SchematicContext) => {
+    context.logger.debug('Updating appmodule');
+
+    if (options.path === undefined) {
+      return;
+    }
+
+    const siblingModules = host.getDir(options.path).subfiles
+      // Find all files that start with the same name, are ts files, and aren't spec files.
+      .filter(f => f.startsWith(options.name) && f.endsWith('.ts') && !f.endsWith('spec.ts'))
+      // Sort alphabetically for consistency.
+      .sort();
+
+    if (siblingModules.length === 0) {
+      // No module to add in.
+      return;
+    }
+
+    const siblingModulePath = `${options.path}/${siblingModules[0]}`;
+    const workerCreationSnippet = tags.stripIndent`
+      if (typeof Worker !== 'undefined') {
+        // Create a new
+        const worker = new Worker('./${options.name}.worker', { type: 'module' });
+        worker.onmessage = ({ data }) => {
+          console.log('page got message: $\{data\}');
+        };
+        worker.postMessage('hello');
+      } else {
+        // Web Workers are not supported in this environment.
+        // You should add a fallback so that your program still executes correctly.
+      }
+    `;
+
+    // Append the worker creation snippet.
+    const originalContent = host.read(siblingModulePath);
+    host.overwrite(siblingModulePath, originalContent + '\n' + workerCreationSnippet);
+
+    return host;
+  };
+}
+
+export default function (options: WebWorkerOptions): Rule {
+  return (host: Tree, context: SchematicContext) => {
+    const project = getProject(host, options.project);
+    if (!options.project) {
+      throw new SchematicsException('Option "project" is required.');
+    }
+    if (!project) {
+      throw new SchematicsException(`Invalid project name (${options.project})`);
+    }
+    if (project.projectType !== 'application') {
+      throw new SchematicsException(`Web Worker requires a project type of "application".`);
+    }
+
+    if (options.path === undefined) {
+      options.path = buildDefaultPath(project);
+    }
+    const parsedPath = parseName(options.path, options.name);
+    options.name = parsedPath.name;
+    options.path = parsedPath.path;
+    const root = project.root || project.sourceRoot || '';
+
+    const templateSource = apply(url('./files/worker'), [
+      applyTemplates({ ...options, ...strings }),
+      move(parsedPath.path),
+    ]);
+
+    return chain([
+      // Add project configuration.
+      addConfig(options, root),
+      // Create the worker in a sibling module.
+      options.snippet ? addSnippet(options) : noop(),
+      // Add the worker.
+      mergeWith(templateSource),
+    ]);
+  };
+}
diff --git a/packages/schematics/angular/web-worker/index_spec.ts b/packages/schematics/angular/web-worker/index_spec.ts
new file mode 100644
index 000000000000..940d890d2f97
--- /dev/null
+++ b/packages/schematics/angular/web-worker/index_spec.ts
@@ -0,0 +1,85 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+import { Schema as ApplicationOptions } from '../application/schema';
+import { Schema as WorkspaceOptions } from '../workspace/schema';
+import { Schema as WebWorkerOptions } from './schema';
+
+
+describe('Service Worker Schematic', () => {
+  const schematicRunner = new SchematicTestRunner(
+    '@schematics/angular',
+    require.resolve('../collection.json'),
+  );
+  const defaultOptions: WebWorkerOptions = {
+    project: 'bar',
+    target: 'build',
+    name: 'app',
+    // path: 'src/app',
+    snippet: true,
+  };
+
+  let appTree: UnitTestTree;
+
+  const workspaceOptions: WorkspaceOptions = {
+    name: 'workspace',
+    newProjectRoot: 'projects',
+    version: '8.0.0',
+  };
+
+  const appOptions: ApplicationOptions = {
+    name: 'bar',
+    inlineStyle: false,
+    inlineTemplate: false,
+    routing: false,
+    skipTests: false,
+    skipPackageJson: false,
+  };
+
+  beforeEach(() => {
+    appTree = schematicRunner.runSchematic('workspace', workspaceOptions);
+    appTree = schematicRunner.runSchematic('application', appOptions, appTree);
+  });
+
+  it('should put the worker file in the project root', () => {
+    const tree = schematicRunner.runSchematic('web-worker', defaultOptions, appTree);
+    const path = '/projects/bar/src/app/app.worker.ts';
+    expect(tree.exists(path)).toEqual(true);
+  });
+
+  it('should put a new tsconfig.json file in the project root', () => {
+    const tree = schematicRunner.runSchematic('web-worker', defaultOptions, appTree);
+    const path = '/projects/bar/tsconfig.json';
+    expect(tree.exists(path)).toEqual(true);
+  });
+
+  it('should put the tsconfig.worker.json file in the project root', () => {
+    const tree = schematicRunner.runSchematic('web-worker', defaultOptions, appTree);
+    const path = '/projects/bar/tsconfig.worker.json';
+    expect(tree.exists(path)).toEqual(true);
+  });
+
+  it('should add the webWorkerTsConfig option to workspace', () => {
+    const tree = schematicRunner.runSchematic('web-worker', defaultOptions, appTree);
+    const { projects } = JSON.parse(tree.readContent('/angular.json'));
+    expect(projects.bar.architect.build.options.webWorkerTsConfig)
+      .toBe('projects/bar/tsconfig.worker.json');
+  });
+
+  it('should add exclusions to tsconfig.app.json', () => {
+    const tree = schematicRunner.runSchematic('web-worker', defaultOptions, appTree);
+    const { exclude } = JSON.parse(tree.readContent('/projects/bar/tsconfig.app.json'));
+    expect(exclude).toContain('**/*.worker.ts');
+  });
+
+  it('should add snippet to sibling file', () => {
+    const tree = schematicRunner.runSchematic('web-worker', defaultOptions, appTree);
+    const appComponent = tree.readContent('/projects/bar/src/app/app.component.ts');
+    expect(appComponent).toContain(`new Worker('./${defaultOptions.name}.worker`);
+  });
+});
diff --git a/packages/schematics/angular/web-worker/schema.json b/packages/schematics/angular/web-worker/schema.json
new file mode 100644
index 000000000000..43ac37caa5f7
--- /dev/null
+++ b/packages/schematics/angular/web-worker/schema.json
@@ -0,0 +1,45 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "id": "SchematicsAngularWebWorker",
+  "title": "Angular Web Worker Options Schema",
+  "type": "object",
+  "description": "Pass this schematic to the \"run\" command to create a Web Worker",
+  "properties": {
+    "path": {
+      "type": "string",
+      "format": "path",
+      "description": "The path at which to create the worker file, relative to the current workspace.",
+      "visible": false
+    },    
+    "project": {
+      "type": "string",
+      "description": "The name of the project.",
+      "$default": {
+        "$source": "projectName"
+      }
+    },
+    "target": {
+      "type": "string",
+      "description": "The target to apply service worker to.",
+      "default": "build"
+    },
+    "name": {
+      "type": "string",
+      "description": "The name of the worker.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What name would you like to use for the worker?"
+    },
+    "snippet": {
+      "type": "boolean",
+      "default": true,
+      "description": "Add a worker creation snippet in a sibling file of the same name."
+    }    
+  },
+  "required": [
+    "name",
+    "project"
+  ]
+}
diff --git a/tests/legacy-cli/e2e/tests/build/worker.ts b/tests/legacy-cli/e2e/tests/build/worker.ts
new file mode 100644
index 000000000000..7c9398687af6
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/build/worker.ts
@@ -0,0 +1,45 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { join } from 'path';
+import { expectFileToExist, expectFileToMatch, replaceInFile, writeFile } from '../../utils/fs';
+import { ng } from '../../utils/process';
+
+
+export default async function () {
+
+  const workerPath = join('src', 'app', 'app.worker.ts');
+  const snippetPath = join('src', 'app', 'app.component.ts');
+  const projectTsConfig = join('src', 'tsconfig.json');
+  const workerTsConfig = join('src', 'tsconfig.worker.json');
+
+  await ng('generate', 'web-worker', 'app');
+  await expectFileToExist(workerPath);
+  await expectFileToExist(projectTsConfig);
+  await expectFileToExist(workerTsConfig);
+  await expectFileToMatch(snippetPath, `new Worker('./app.worker', { type: 'module' })`);
+
+  // console.warn has to be used because chrome only captures warnings and errors by default
+  // https://github.com/angular/protractor/issues/2207
+  await replaceInFile('src/app/app.component.ts', 'console.log', 'console.warn');
+
+  await writeFile('e2e/app.e2e-spec.ts', `
+    import { AppPage } from './app.po';
+    import { browser, logging } from 'protractor';
+    describe('worker bundle', () => {
+      it('should log worker messages', async () => {
+        const page = new AppPage();;
+        page.navigateTo();
+        const logs = await browser.manage().logs().get(logging.Type.BROWSER);
+        expect(logs.length).toEqual(1);
+        expect(logs[0].message).toContain('page got message: worker response to hello');
+      });
+    });
+  `);
+
+  await ng('e2e');
+}
diff --git a/tests/legacy-cli/e2e/tests/experimental/worker.ts b/tests/legacy-cli/e2e/tests/experimental/worker.ts
deleted file mode 100644
index 65dfd107f439..000000000000
--- a/tests/legacy-cli/e2e/tests/experimental/worker.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { appendToFile, createDir, replaceInFile, writeMultipleFiles } from '../../utils/fs';
-import { ng } from '../../utils/process';
-
-
-export default async function () {
-  // console.warn has to be used because chrome only captures warnings and errors by default
-  // https://github.com/angular/protractor/issues/2207
-  await createDir('./src/worker');
-  await writeMultipleFiles({
-    './src/app/dep.ts': `export const foo = 'bar';`,
-    './src/app/app.worker.ts': `
-      import 'typescript/lib/lib.webworker';
-      import { foo } from './dep';
-      console.warn('hello from worker');
-      addEventListener('message', ({ data }) => {
-        console.warn(\`worker got message: \${ data }\`);
-        if (data === 'hello') {
-          postMessage(foo);
-        }
-      });
-    `,
-    './src/tsconfig.worker.json': `
-      {
-        "extends": "../tsconfig.json",
-        "compilerOptions": {
-          "outDir": "../out-tsc/worker",
-          "lib": [
-            "es2018",
-            "webworker"
-          ],
-          "types": []
-        },
-        "include": [
-          "**/*.worker.ts",
-        ]
-      }`,
-    './src/tsconfig.app.json': `
-      {
-        "extends": "../tsconfig.json",
-        "compilerOptions": {
-          "outDir": "../out-tsc/worker",
-          "types": []
-        },
-        "exclude": [
-          "test.ts",
-          "**/*.spec.ts",
-          "**/*.worker.ts",
-        ]
-      }`,
-    './e2e/app.e2e-spec.ts': `
-      import { browser } from 'protractor';
-
-      describe('worker bundle', function() {
-        it('should log worker messages', () => {
-          page.navigateTo();
-          const logs = await browser.manage().logs().get(logging.Type.BROWSER);
-          expect(logs.length).toEqual(3);
-          expect(logs[0].message).toContain('hello from worker');
-          expect(logs[1].message).toContain('worker got message: hello');
-          expect(logs[2].message).toContain('page got message: bar');
-        });
-      });
-    `,
-  });
-
-  await appendToFile('./src/main.ts', `
-    const worker = new Worker('./app/app.worker.ts', { type: 'module' });
-    worker.onmessage = ({ data }) => {
-      console.warn(\`page got message: \${ data }\`);
-    };
-    worker.postMessage('hello');
-  `);
-
-  await replaceInFile('./angular.json',`"tsConfig": "src/tsconfig.app.json",`,
-    `"tsConfig": "src/tsconfig.app.json",
-    "experimentalWebWorkerTsConfig": "src/tsconfig.worker.json",`,
-  );
-
-  await ng('e2e');
-}

From 6e0a040ad947eede846796cb1051f0ec6cbe54cd Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 28 Mar 2019 16:21:08 +0000
Subject: [PATCH 1056/1703] refactor(@angular-devkit/build-angular): support
 web worker in new architect

---
 .../test/browser/web-worker_spec_large.ts     | 102 +++++++++---------
 1 file changed, 49 insertions(+), 53 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts
index 73526ee403d6..7ea911f2f337 100644
--- a/packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts
@@ -6,15 +6,22 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { DefaultTimeout, TestLogger, runTargetSpec } from '@angular-devkit/architect/testing';
+import { Architect } from '@angular-devkit/architect/src/index2';
+import { TestLogger } from '@angular-devkit/architect/testing';
 import { join, virtualFs } from '@angular-devkit/core';
 import { debounceTime, takeWhile, tap } from 'rxjs/operators';
-import { browserTargetSpec, host, outputPath } from '../utils';
+import { browserBuild, createArchitect, host, outputPath } from '../utils';
 
 
 describe('Browser Builder Web Worker support', () => {
-  beforeEach(done => host.initialize().toPromise().then(done, done.fail));
-  afterEach(done => host.restore().toPromise().then(done, done.fail));
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
 
   const workerFiles: { [k: string]: string } = {
     'src/app/dep.ts': `export const foo = 'bar';`,
@@ -77,62 +84,52 @@ describe('Browser Builder Web Worker support', () => {
       }`,
   };
 
-  it('bundles TS worker', (done) => {
-    const logger = new TestLogger('worker-warnings');
+  it('bundles TS worker', async () => {
     host.writeMultipleFiles(workerFiles);
+    const logger = new TestLogger('worker-warnings');
     const overrides = { webWorkerTsConfig: 'src/tsconfig.worker.json' };
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout, logger).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const workerContent = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, '0.worker.js')),
-        );
-        // worker bundle contains worker code.
-        expect(workerContent).toContain('hello from worker');
-        expect(workerContent).toContain('bar');
-
-        const mainContent = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, 'main.js')),
-        );
-        // main bundle references worker.
-        expect(mainContent).toContain('0.worker.js');
-      }),
-      // Doesn't show any warnings.
-      tap(() => expect(logger.includes('WARNING')).toBe(false, 'Should show no warnings.')),
-    ).toPromise().then(done, done.fail);
+    await browserBuild(architect, host, target, overrides, { logger });
+
+    // Worker bundle contains worker code.
+    const workerContent = virtualFs.fileBufferToString(
+      host.scopedSync().read(join(outputPath, '0.worker.js')));
+    expect(workerContent).toContain('hello from worker');
+    expect(workerContent).toContain('bar');
+
+    // Main bundle references worker.
+    const mainContent = virtualFs.fileBufferToString(
+      host.scopedSync().read(join(outputPath, 'main.js')));
+    expect(mainContent).toContain('0.worker.js');
+    expect(logger.includes('WARNING')).toBe(false, 'Should show no warnings.');
   });
 
-  it('minimizes and hashes worker', (done) => {
+  it('minimizes and hashes worker', async () => {
     host.writeMultipleFiles(workerFiles);
     const overrides = {
       webWorkerTsConfig: 'src/tsconfig.worker.json',
       outputHashing: 'all',
       optimization: true,
     };
-    runTargetSpec(host, browserTargetSpec, overrides).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => {
-        const workerBundle = host.fileMatchExists(outputPath,
-          /0\.[0-9a-f]{20}\.worker\.js/) as string;
-        expect(workerBundle).toBeTruthy('workerBundle should exist');
-        const workerContent = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, workerBundle)),
-        );
-        expect(workerContent).toContain('hello from worker');
-        expect(workerContent).toContain('bar');
-        expect(workerContent).toContain('"hello"===t&&postMessage');
-
-        const mainBundle = host.fileMatchExists(outputPath, /main\.[0-9a-f]{20}\.js/) as string;
-        expect(mainBundle).toBeTruthy('mainBundle should exist');
-        const mainContent = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, mainBundle)),
-        );
-        expect(mainContent).toContain(workerBundle);
-      }),
-    ).toPromise().then(done, done.fail);
+    await browserBuild(architect, host, target, overrides);
+
+    // Worker bundle should have hash and minified code.
+    const workerBundle = host.fileMatchExists(outputPath, /0\.[0-9a-f]{20}\.worker\.js/) as string;
+    expect(workerBundle).toBeTruthy('workerBundle should exist');
+    const workerContent = virtualFs.fileBufferToString(
+      host.scopedSync().read(join(outputPath, workerBundle)));
+    expect(workerContent).toContain('hello from worker');
+    expect(workerContent).toContain('bar');
+    expect(workerContent).toContain('"hello"===t&&postMessage');
+
+    // Main bundle should reference hashed worker bundle.
+    const mainBundle = host.fileMatchExists(outputPath, /main\.[0-9a-f]{20}\.js/) as string;
+    expect(mainBundle).toBeTruthy('mainBundle should exist');
+    const mainContent = virtualFs.fileBufferToString(
+      host.scopedSync().read(join(outputPath, mainBundle)));
+    expect(mainContent).toContain(workerBundle);
   });
 
-  it('rebuilds TS worker', (done) => {
+  it('rebuilds TS worker', async () => {
     host.writeMultipleFiles(workerFiles);
     const overrides = {
       webWorkerTsConfig: 'src/tsconfig.worker.json',
@@ -144,7 +141,8 @@ describe('Browser Builder Web Worker support', () => {
     const workerPath = join(outputPath, '0.worker.js');
     let workerContent = '';
 
-    runTargetSpec(host, browserTargetSpec, overrides, DefaultTimeout * 3).pipe(
+    const run = await architect.scheduleTarget(target, overrides);
+    await run.output.pipe(
       // Wait for files to be written to disk.
       debounceTime(1000),
       tap((buildEvent) => expect(buildEvent.success).toBe(true, 'build should succeed')),
@@ -178,9 +176,7 @@ describe('Browser Builder Web Worker support', () => {
         }
       }),
       takeWhile(() => phase < 3),
-    ).toPromise().then(
-      () => done(),
-      () => done.fail(`stuck at phase ${phase} [builds: ${buildCount}]`),
-    );
+    ).toPromise();
+    await run.stop();
   });
 });

From 1cca4589d19a3a3e049033a0ced3df8f5a5b7a89 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 28 Mar 2019 19:57:42 -0400
Subject: [PATCH 1057/1703] refactor(@angular-devkit/build-webpack):  remove
 experimental architect builders

---
 .../src/webpack-dev-server/index.ts           | 99 -------------------
 .../webpack-dev-server/index_spec_large.ts    | 29 ------
 .../build_webpack/src/webpack/index.ts        | 91 -----------------
 .../src/webpack/index_spec_large.ts           | 50 ----------
 4 files changed, 269 deletions(-)
 delete mode 100644 packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts
 delete mode 100644 packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec_large.ts
 delete mode 100644 packages/angular_devkit/build_webpack/src/webpack/index.ts
 delete mode 100644 packages/angular_devkit/build_webpack/src/webpack/index_spec_large.ts

diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts
deleted file mode 100644
index 0b5c7734d073..000000000000
--- a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {
-  BuildEvent,
-  Builder,
-  BuilderConfiguration,
-  BuilderContext,
-} from '@angular-devkit/architect';
-import { getSystemPath, normalize, resolve } from '@angular-devkit/core';
-import * as net from 'net';
-import { Observable, from } from 'rxjs';
-import { concatMap } from 'rxjs/operators';
-import * as webpack from 'webpack';
-import * as WebpackDevServer from 'webpack-dev-server';
-import { LoggingCallback, defaultLoggingCb } from '../webpack';
-import { Schema as WebpackDevServerBuilderSchema } from './schema';
-
-export interface DevServerResult {
-  port: number;
-  family: string;
-  address: string;
-}
-
-export class WebpackDevServerBuilder implements Builder<WebpackDevServerBuilderSchema> {
-
-  constructor(public context: BuilderContext) { }
-
-  run(builderConfig: BuilderConfiguration<WebpackDevServerBuilderSchema>)
-    : Observable<BuildEvent<DevServerResult>> {
-    const configPath = resolve(this.context.workspace.root,
-      normalize(builderConfig.options.webpackConfig));
-
-    return this.loadWebpackConfig(getSystemPath(configPath)).pipe(
-      concatMap(config => this.runWebpackDevServer(config)),
-    );
-  }
-
-  public loadWebpackConfig(webpackConfigPath: string): Observable<webpack.Configuration> {
-    return from(import(webpackConfigPath));
-  }
-
-  public runWebpackDevServer(
-    webpackConfig: webpack.Configuration,
-    devServerCfg?: WebpackDevServer.Configuration,
-    loggingCb: LoggingCallback = defaultLoggingCb,
-  ): Observable<BuildEvent<DevServerResult>> {
-    return new Observable(obs => {
-      const devServerConfig = devServerCfg || webpackConfig.devServer || {};
-      devServerConfig.host = devServerConfig.host || 'localhost';
-      if (devServerConfig.port == undefined) {
-        devServerConfig.port = 8080;
-      }
-
-      if (devServerConfig.stats) {
-        webpackConfig.stats = devServerConfig.stats as webpack.Stats.ToStringOptionsObject;
-      }
-      // Disable stats reporting by the devserver, we have our own logger.
-      devServerConfig.stats = false;
-
-      const webpackCompiler = webpack(webpackConfig);
-      const server = new WebpackDevServer(webpackCompiler, devServerConfig);
-      let result: undefined | DevServerResult;
-
-      webpackCompiler.hooks.done.tap('build-webpack', (stats) => {
-        // Log stats.
-        loggingCb(stats, webpackConfig, this.context.logger);
-
-        obs.next({ success: !stats.hasErrors(), result });
-      });
-
-      server.listen(
-        devServerConfig.port,
-        devServerConfig.host,
-        function (err) {
-          if (err) {
-            obs.error(err);
-          } else {
-            // this is ignored because of ts errors
-            // that this is overshadowed by it's outer contain
-            // @ts-ignore;
-            result = (this as net.Server).address();
-          }
-        },
-      );
-
-      // Teardown logic. Close the server when unsubscribed from.
-      return () => server.close();
-    });
-  }
-}
-
-
-export default WebpackDevServerBuilder;
diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec_large.ts b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec_large.ts
deleted file mode 100644
index f2778e98d6d6..000000000000
--- a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec_large.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { request, runTargetSpec } from '@angular-devkit/architect/testing';
-import { from } from 'rxjs';
-import { concatMap, take, tap } from 'rxjs/operators';
-import { basicHost } from '../test-utils';
-
-
-describe('Dev Server Builder', () => {
-  const webpackTargetSpec = { project: 'app', target: 'serve' };
-
-  beforeEach(done => basicHost.initialize().toPromise().then(done, done.fail));
-  afterEach(done => basicHost.restore().toPromise().then(done, done.fail));
-
-  it('works', (done) => {
-    runTargetSpec(basicHost, webpackTargetSpec).pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      concatMap(() => from(request('http://localhost:8080/bundle.js'))),
-      tap(response => expect(response).toContain(`console.log('hello world')`)),
-      take(1),
-    ).toPromise().then(done, done.fail);
-  }, 30000);
-});
diff --git a/packages/angular_devkit/build_webpack/src/webpack/index.ts b/packages/angular_devkit/build_webpack/src/webpack/index.ts
deleted file mode 100644
index 8cc7b2fd518f..000000000000
--- a/packages/angular_devkit/build_webpack/src/webpack/index.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import {
-  BuildEvent,
-  Builder,
-  BuilderConfiguration,
-  BuilderContext,
-} from '@angular-devkit/architect';
-import { getSystemPath, logging, normalize, resolve } from '@angular-devkit/core';
-import { Observable, from } from 'rxjs';
-import { concatMap } from 'rxjs/operators';
-import * as webpack from 'webpack';
-import { Schema as WebpackBuilderSchema } from './schema';
-
-
-export interface LoggingCallback {
-  (stats: webpack.Stats, config: webpack.Configuration, logger: logging.Logger): void;
-}
-
-export const defaultLoggingCb: LoggingCallback = (stats, config, logger) =>
-  logger.info(stats.toString(config.stats));
-
-export class WebpackBuilder implements Builder<WebpackBuilderSchema> {
-
-  constructor(public context: BuilderContext) { }
-
-  run(builderConfig: BuilderConfiguration<WebpackBuilderSchema>): Observable<BuildEvent> {
-    const configPath = resolve(this.context.workspace.root,
-      normalize(builderConfig.options.webpackConfig));
-
-    return this.loadWebpackConfig(getSystemPath(configPath)).pipe(
-      concatMap(config => this.runWebpack(config)),
-    );
-  }
-
-  public loadWebpackConfig(webpackConfigPath: string): Observable<webpack.Configuration> {
-    return from(import(webpackConfigPath));
-  }
-
-  protected createWebpackCompiler(config: webpack.Configuration): webpack.Compiler {
-    return webpack(config);
-  }
-
-  public runWebpack(
-    config: webpack.Configuration, loggingCb = defaultLoggingCb,
-  ): Observable<BuildEvent> {
-    return new Observable(obs => {
-      const webpackCompiler = this.createWebpackCompiler(config);
-
-      const callback: webpack.compiler.CompilerCallback = (err, stats) => {
-        if (err) {
-          return obs.error(err);
-        }
-
-        // Log stats.
-        loggingCb(stats, config, this.context.logger);
-
-        obs.next({ success: !stats.hasErrors() });
-
-        if (!config.watch) {
-          obs.complete();
-        }
-      };
-
-      try {
-        if (config.watch) {
-          const watchOptions = config.watchOptions || {};
-          const watching = webpackCompiler.watch(watchOptions, callback);
-
-          // Teardown logic. Close the watcher when unsubscribed from.
-          return () => watching.close(() => { });
-        } else {
-          webpackCompiler.run(callback);
-        }
-      } catch (err) {
-        if (err) {
-          this.context.logger.error(
-            '\nAn error occured during the build:\n' + ((err && err.stack) || err));
-        }
-        throw err;
-      }
-    });
-  }
-}
-
-export default WebpackBuilder;
diff --git a/packages/angular_devkit/build_webpack/src/webpack/index_spec_large.ts b/packages/angular_devkit/build_webpack/src/webpack/index_spec_large.ts
deleted file mode 100644
index a9e130aa2afa..000000000000
--- a/packages/angular_devkit/build_webpack/src/webpack/index_spec_large.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { join, normalize } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
-import { angularHost, basicHost } from '../test-utils';
-
-
-describe('Webpack Builder basic test', () => {
-  describe('basic app', () => {
-    const outputPath = normalize('dist');
-    const webpackTargetSpec = { project: 'app', target: 'build' };
-
-    beforeEach(done => basicHost.initialize().toPromise().then(done, done.fail));
-    afterEach(done => basicHost.restore().toPromise().then(done, done.fail));
-
-    it('works', (done) => {
-      runTargetSpec(basicHost, webpackTargetSpec).pipe(
-        tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-        tap(() => {
-          expect(basicHost.scopedSync().exists(join(outputPath, 'bundle.js'))).toBe(true);
-        }),
-      ).toPromise().then(done, done.fail);
-    });
-  });
-
-  describe('Angular app', () => {
-    const outputPath = normalize('dist/');
-    const webpackTargetSpec = { project: 'app', target: 'build-webpack' };
-
-    beforeEach(done => angularHost.initialize().toPromise().then(done, done.fail));
-    afterEach(done => angularHost.restore().toPromise().then(done, done.fail));
-
-    it('works', (done) => {
-      runTargetSpec(angularHost, webpackTargetSpec).pipe(
-        tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-        tap(() => {
-          expect(angularHost.scopedSync().exists(join(outputPath, 'main.js'))).toBe(true);
-          expect(angularHost.scopedSync().exists(join(outputPath, 'polyfills.js'))).toBe(true);
-        }),
-      ).toPromise().then(done, done.fail);
-    });
-  });
-});

From bf0fcf39e05e0e0bf370262e2fdf4a27c65c4ae9 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 28 Mar 2019 20:03:55 -0400
Subject: [PATCH 1058/1703] refactor(@angular-devkit/build-webpack): cleanup
 stable architect API file names

---
 packages/angular_devkit/build_webpack/builders.json  | 12 ++++--------
 .../src/webpack-dev-server/{index2.ts => index.ts}   |  4 ++--
 .../{index2_spec_large.ts => index_spec_large.ts}    |  4 ++--
 .../src/webpack/{index2.ts => index.ts}              |  0
 .../{index2_spec_large.ts => index_spec_large.ts}    |  4 ++--
 5 files changed, 10 insertions(+), 14 deletions(-)
 rename packages/angular_devkit/build_webpack/src/webpack-dev-server/{index2.ts => index.ts} (96%)
 rename packages/angular_devkit/build_webpack/src/webpack-dev-server/{index2_spec_large.ts => index_spec_large.ts} (95%)
 rename packages/angular_devkit/build_webpack/src/webpack/{index2.ts => index.ts} (100%)
 rename packages/angular_devkit/build_webpack/src/webpack/{index2_spec_large.ts => index_spec_large.ts} (96%)

diff --git a/packages/angular_devkit/build_webpack/builders.json b/packages/angular_devkit/build_webpack/builders.json
index 3744aea4d6eb..0241e0e02a76 100644
--- a/packages/angular_devkit/build_webpack/builders.json
+++ b/packages/angular_devkit/build_webpack/builders.json
@@ -2,26 +2,22 @@
   "$schema": "../architect/src/builders-schema.json",
   "builders": {
     "build": {
-      "implementation": "./src/webpack/index2",
-      "class": "./src/webpack",
+      "implementation": "./src/webpack",
       "schema": "./src/webpack/schema.json",
       "description": "Build a webpack app."
     },
     "webpack": {
-      "implementation": "./src/webpack/index2",
-      "class": "./src/webpack",
+      "implementation": "./src/webpack",
       "schema": "./src/webpack/schema.json",
       "description": "Build a webpack app."
     },
     "dev-server": {
-      "implementation": "./src/webpack-dev-server/index2",
-      "class": "./src/webpack-dev-server",
+      "implementation": "./src/webpack-dev-server",
       "schema": "./src/webpack-dev-server/schema.json",
       "description": "Serve a webpack app."
     },
     "webpack-dev-server": {
-      "implementation": "./src/webpack-dev-server/index2",
-      "class": "./src/webpack-dev-server",
+      "implementation": "./src/webpack-dev-server",
       "schema": "./src/webpack-dev-server/schema.json",
       "description": "Serve a webpack app."
     }
diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2.ts b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts
similarity index 96%
rename from packages/angular_devkit/build_webpack/src/webpack-dev-server/index2.ts
rename to packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts
index c3838f31dda6..6742e66b6ae0 100644
--- a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect/src/index2';
+import { BuilderContext, createBuilder } from '@angular-devkit/architect/src/index2';
 import { getSystemPath, json, normalize, resolve } from '@angular-devkit/core';
 import * as net from 'net';
 import { Observable, from, of } from 'rxjs';
@@ -14,7 +14,7 @@ import * as webpack from 'webpack';
 import * as WebpackDevServer from 'webpack-dev-server';
 import { ArchitectPlugin } from '../plugins/architect';
 import { getEmittedFiles } from '../utils';
-import { BuildResult, WebpackFactory, WebpackLoggingCallback } from '../webpack/index2';
+import { BuildResult, WebpackFactory, WebpackLoggingCallback } from '../webpack';
 import { Schema as WebpackDevServerBuilderSchema } from './schema';
 
 const webpackMerge = require('webpack-merge');
diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2_spec_large.ts b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec_large.ts
similarity index 95%
rename from packages/angular_devkit/build_webpack/src/webpack-dev-server/index2_spec_large.ts
rename to packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec_large.ts
index d0532f31bc3f..96211d6886b3 100644
--- a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index2_spec_large.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec_large.ts
@@ -5,6 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { Architect } from '@angular-devkit/architect/src/index2';
 import { TestingArchitectHost } from '@angular-devkit/architect/testing/index2';
 import { experimental, normalize, schema } from '@angular-devkit/core';
@@ -12,8 +13,7 @@ import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as fs from 'fs';
 import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
 import * as path from 'path';
-import { WorkspaceNodeModulesArchitectHost } from '../../../architect/node';
-import { DevServerBuildOutput } from './index2';
+import { DevServerBuildOutput } from './index';
 
 const devkitRoot = (global as any)._DevKitRoot; // tslint:disable-line:no-any
 
diff --git a/packages/angular_devkit/build_webpack/src/webpack/index2.ts b/packages/angular_devkit/build_webpack/src/webpack/index.ts
similarity index 100%
rename from packages/angular_devkit/build_webpack/src/webpack/index2.ts
rename to packages/angular_devkit/build_webpack/src/webpack/index.ts
diff --git a/packages/angular_devkit/build_webpack/src/webpack/index2_spec_large.ts b/packages/angular_devkit/build_webpack/src/webpack/index_spec_large.ts
similarity index 96%
rename from packages/angular_devkit/build_webpack/src/webpack/index2_spec_large.ts
rename to packages/angular_devkit/build_webpack/src/webpack/index_spec_large.ts
index ebc35edceba0..a010c5615426 100644
--- a/packages/angular_devkit/build_webpack/src/webpack/index2_spec_large.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack/index_spec_large.ts
@@ -5,14 +5,14 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { experimental, join, normalize, schema } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as fs from 'fs';
 import * as path from 'path';
-import { WorkspaceNodeModulesArchitectHost } from '../../../architect/node';
 import { Architect } from '../../../architect/src/architect';
 import { TestingArchitectHost } from '../../../architect/testing/testing-architect-host';
-import { BuildResult } from './index2';
+import { BuildResult } from './index';
 
 const devkitRoot = (global as any)._DevKitRoot; // tslint:disable-line:no-any
 

From 3d9200a3c8889e69e0e7abbc7743f9a0d11e376f Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 29 Mar 2019 18:22:52 -0400
Subject: [PATCH 1059/1703] refactor(@angular-devkit/build-angular): use
 build-webpack stable API module imports

---
 packages/angular_devkit/build_angular/src/browser/index.ts    | 2 +-
 packages/angular_devkit/build_angular/src/dev-server/index.ts | 4 ++--
 .../angular_devkit/build_angular/src/extract-i18n/index.ts    | 2 +-
 packages/angular_devkit/build_angular/src/server/index.ts     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 4dd67931ce82..4741aabce14c 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -14,7 +14,7 @@ import {
 import {
   WebpackLoggingCallback,
   runWebpack,
-} from '@angular-devkit/build-webpack/src/webpack/index2';
+} from '@angular-devkit/build-webpack/src/webpack';
 import {
   Path,
   analytics,
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index 4a3b502f57d4..5529605cb03d 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -11,11 +11,11 @@ import {
   createBuilder,
   targetFromTargetString,
 } from '@angular-devkit/architect/src/index2';
+import { WebpackLoggingCallback } from '@angular-devkit/build-webpack/src/webpack';
 import {
   DevServerBuildOutput,
   runWebpackDevServer,
-} from '@angular-devkit/build-webpack/src/webpack-dev-server/index2';
-import { WebpackLoggingCallback } from '@angular-devkit/build-webpack/src/webpack/index2';
+} from '@angular-devkit/build-webpack/src/webpack-dev-server';
 import { experimental, json, logging, tags } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { existsSync, readFileSync } from 'fs';
diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
index 3782a64684d7..2271f368ec17 100644
--- a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
@@ -10,7 +10,7 @@ import {
   createBuilder,
   targetFromTargetString,
 } from '@angular-devkit/architect/src/index2';
-import { runWebpack } from '@angular-devkit/build-webpack/src/webpack/index2';
+import { runWebpack } from '@angular-devkit/build-webpack/src/webpack';
 import { JsonObject } from '@angular-devkit/core';
 import * as path from 'path';
 import * as webpack from 'webpack';
diff --git a/packages/angular_devkit/build_angular/src/server/index.ts b/packages/angular_devkit/build_angular/src/server/index.ts
index 85624579901f..a5f43a423e86 100644
--- a/packages/angular_devkit/build_angular/src/server/index.ts
+++ b/packages/angular_devkit/build_angular/src/server/index.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { BuilderOutput, createBuilder } from '@angular-devkit/architect/src/index2';
-import { runWebpack } from '@angular-devkit/build-webpack/src/webpack/index2';
+import { runWebpack } from '@angular-devkit/build-webpack/src/webpack';
 import {
   Path,
   experimental,

From db14292b52918e00205e3e1d7b5a3e1137873224 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 29 Mar 2019 11:14:27 -0400
Subject: [PATCH 1060/1703] fix(@angular-devkit/architect): remove experimental
 API

---
 .../architect/src/_golden-api.d.ts            | 107 +----
 .../architect/testing/index.d.ts              |  19 +-
 .../architect/src/_golden-api.d.ts            |   6 +-
 .../architect/src/architect-legacy.ts         | 429 ------------------
 .../architect/src/architect_spec.ts           | 124 -----
 .../angular_devkit/architect/src/index.ts     |   7 +-
 .../src/{index2_spec.ts => index_spec.ts}     |   0
 .../architect/test/browser/index.ts           |  35 --
 .../architect/test/browser/schema.json        |  22 -
 .../architect/test/builders.json              |  10 -
 .../architect/test/package.json               |   6 -
 .../angular_devkit/architect/testing/index.ts |   4 +-
 .../architect/testing/request.ts              |  57 ---
 .../architect/testing/run-target-spec.ts      |  62 ---
 14 files changed, 28 insertions(+), 860 deletions(-)
 delete mode 100644 packages/angular_devkit/architect/src/architect-legacy.ts
 delete mode 100644 packages/angular_devkit/architect/src/architect_spec.ts
 rename packages/angular_devkit/architect/src/{index2_spec.ts => index_spec.ts} (100%)
 delete mode 100644 packages/angular_devkit/architect/test/browser/index.ts
 delete mode 100644 packages/angular_devkit/architect/test/browser/schema.json
 delete mode 100644 packages/angular_devkit/architect/test/builders.json
 delete mode 100644 packages/angular_devkit/architect/test/package.json
 delete mode 100644 packages/angular_devkit/architect/testing/request.ts
 delete mode 100644 packages/angular_devkit/architect/testing/run-target-spec.ts

diff --git a/etc/api/angular_devkit/architect/src/_golden-api.d.ts b/etc/api/angular_devkit/architect/src/_golden-api.d.ts
index 80731d409f38..5b09b410681f 100644
--- a/etc/api/angular_devkit/architect/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/architect/src/_golden-api.d.ts
@@ -1,104 +1,13 @@
 export declare class Architect {
-    constructor(_workspace: experimental.workspace.Workspace);
-    getBuilder<OptionsT>(builderDescription: BuilderDescription, context: BuilderContext): Builder<OptionsT>;
-    getBuilderConfiguration<OptionsT>(targetSpec: TargetSpecifier): BuilderConfiguration<OptionsT>;
-    getBuilderDescription<OptionsT>(builderConfig: BuilderConfiguration<OptionsT>): Observable<BuilderDescription>;
-    listProjectTargets(projectName: string): string[];
-    loadArchitect(): Observable<this>;
-    run<OptionsT>(builderConfig: BuilderConfiguration<OptionsT>, partialContext?: Partial<BuilderContext>): Observable<BuildEvent>;
-    validateBuilderOptions<OptionsT>(builderConfig: BuilderConfiguration<OptionsT>, builderDescription: BuilderDescription): Observable<BuilderConfiguration<OptionsT>>;
+    constructor(_host: ArchitectHost, _registry?: json.schema.SchemaRegistry, additionalJobRegistry?: experimental.jobs.Registry);
+    has(name: experimental.jobs.JobName): Observable<boolean>;
+    scheduleBuilder(name: string, options: json.JsonObject, scheduleOptions?: ScheduleOptions): Promise<BuilderRun>;
+    scheduleTarget(target: Target, overrides?: json.JsonObject, scheduleOptions?: ScheduleOptions): Promise<BuilderRun>;
 }
 
-export declare class ArchitectNotYetLoadedException extends BaseException {
-    constructor();
-}
-
-export interface Builder<OptionsT> {
-    run(builderConfig: BuilderConfiguration<Partial<OptionsT>>): Observable<BuildEvent>;
-}
-
-export declare class BuilderCannotBeResolvedException extends BaseException {
-    constructor(builder: string);
-}
-
-export interface BuilderConfiguration<OptionsT = {}> {
-    builder: string;
-    options: OptionsT;
-    projectType: string;
-    root: Path;
-    sourceRoot?: Path;
-}
-
-export interface BuilderConstructor<OptionsT> {
-    new (context: BuilderContext): Builder<OptionsT>;
-}
-
-export interface BuilderContext {
-    architect: Architect;
-    host: virtualFs.Host<{}>;
-    logger: logging.Logger;
-    targetSpecifier?: TargetSpecifier;
-    workspace: experimental.workspace.Workspace;
-}
-
-export interface BuilderDescription {
-    description: string;
-    name: string;
-    schema: JsonObject;
-}
-
-export declare class BuilderNotFoundException extends BaseException {
-    constructor(builder: string);
-}
-
-export interface BuilderPaths {
-    class: Path;
-    description: string;
-    schema: Path;
-}
-
-export interface BuilderPathsMap {
-    builders: {
-        [k: string]: BuilderPaths;
-    };
-}
-
-export interface BuildEvent<BuildResultT = any> {
-    result?: BuildResultT;
-    success: boolean;
-}
-
-export declare class ConfigurationNotFoundException extends BaseException {
-    constructor(projectName: string, configurationName: string);
-}
-
-export declare class ProjectNotFoundException extends BaseException {
-    constructor(projectName: string);
-}
-
-export interface Target<T = JsonObject> {
-    builder: string;
-    configurations?: {
-        [k: string]: TargetConfiguration<T>;
-    };
-    options: TargetOptions<T>;
-}
-
-export declare type TargetConfiguration<T = JsonObject> = Partial<T>;
-
-export interface TargetMap {
-    [k: string]: Target;
-}
-
-export declare class TargetNotFoundException extends BaseException {
-    constructor(projectName: string, targetName: string);
-}
-
-export declare type TargetOptions<T = JsonObject> = T;
+export declare function createBuilder<OptT extends json.JsonObject, OutT extends BuilderOutput = BuilderOutput>(fn: BuilderHandlerFn<OptT>): Builder<OptT>;
 
-export interface TargetSpecifier<OptionsT = {}> {
-    configuration?: string;
-    overrides?: Partial<OptionsT>;
-    project: string;
-    target: string;
+export interface ScheduleOptions {
+    analytics?: analytics.Analytics;
+    logger?: logging.Logger;
 }
diff --git a/etc/api/angular_devkit/architect/testing/index.d.ts b/etc/api/angular_devkit/architect/testing/index.d.ts
index df6a94e5de15..ccd2f03ff06d 100644
--- a/etc/api/angular_devkit/architect/testing/index.d.ts
+++ b/etc/api/angular_devkit/architect/testing/index.d.ts
@@ -1,8 +1,17 @@
-export declare const DefaultTimeout = 45000;
-
-export declare function request(url: string, headers?: {}): Promise<string>;
-
-export declare function runTargetSpec(host: TestProjectHost, targetSpec: TargetSpecifier, overrides?: {}, timeout?: number, logger?: logging.Logger): Observable<BuildEvent>;
+export declare class TestingArchitectHost implements ArchitectHost {
+    currentDirectory: string;
+    workspaceRoot: string;
+    constructor(workspaceRoot?: string, currentDirectory?: string, _backendHost?: ArchitectHost | null);
+    addBuilder(builderName: string, builder: Builder, description?: string, optionSchema?: json.schema.JsonSchema): void;
+    addBuilderFromPackage(packageName: string): Promise<void>;
+    addTarget(target: Target, builderName: string, options?: json.JsonObject): void;
+    getBuilderNameForTarget(target: Target): Promise<string | null>;
+    getCurrentDirectory(): Promise<string>;
+    getOptionsForTarget(target: Target): Promise<json.JsonObject | null>;
+    getWorkspaceRoot(): Promise<string>;
+    loadBuilder(info: BuilderInfo): Promise<Builder | null>;
+    resolveBuilder(builderName: string): Promise<BuilderInfo | null>;
+}
 
 export declare class TestLogger extends logging.Logger {
     constructor(name: string, parent?: logging.Logger | null);
diff --git a/packages/angular_devkit/architect/src/_golden-api.d.ts b/packages/angular_devkit/architect/src/_golden-api.d.ts
index 3e50b7278e3e..759ed2486662 100644
--- a/packages/angular_devkit/architect/src/_golden-api.d.ts
+++ b/packages/angular_devkit/architect/src/_golden-api.d.ts
@@ -5,7 +5,5 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-export * from './architect-legacy';
-// export * from './api';
-// export { Architect, ScheduleOptions } from './architect';
-// export { createBuilder } from './create-builder';
+export { Architect, ScheduleOptions } from './architect';
+export { createBuilder } from './create-builder';
diff --git a/packages/angular_devkit/architect/src/architect-legacy.ts b/packages/angular_devkit/architect/src/architect-legacy.ts
deleted file mode 100644
index eba23fa02ed6..000000000000
--- a/packages/angular_devkit/architect/src/architect-legacy.ts
+++ /dev/null
@@ -1,429 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {
-  BaseException,
-  JsonObject,
-  JsonParseMode,
-  Path,
-  dirname,
-  experimental,
-  getSystemPath,
-  join,
-  logging,
-  normalize,
-  parseJson,
-  virtualFs,
-} from '@angular-devkit/core';
-import { resolve as nodeResolve } from '@angular-devkit/core/node';
-import { Observable, forkJoin, of, throwError } from 'rxjs';
-import { concatMap, map, tap } from 'rxjs/operators';
-
-/**
- * @deprecated
- */
-export class ProjectNotFoundException extends BaseException {
-  constructor(projectName: string) {
-    super(`Project '${projectName}' could not be found in Workspace.`);
-  }
-}
-
-/**
- * @deprecated
- */
-export class TargetNotFoundException extends BaseException {
-  constructor(projectName: string, targetName: string) {
-    super(`Target '${targetName}' could not be found in project '${projectName}'.`);
-  }
-}
-
-/**
- * @deprecated
- */
-export class ConfigurationNotFoundException extends BaseException {
-  constructor(projectName: string, configurationName: string) {
-    super(`Configuration '${configurationName}' could not be found in project '${projectName}'.`);
-  }
-}
-
-// TODO: break this exception apart into more granular ones.
-/**
- * @deprecated
- */
-export class BuilderCannotBeResolvedException extends BaseException {
-  constructor(builder: string) {
-    super(`Builder '${builder}' cannot be resolved.`);
-  }
-}
-
-/**
- * @deprecated
- */
-export class ArchitectNotYetLoadedException extends BaseException {
-  constructor() { super(`Architect needs to be loaded before Architect is used.`); }
-}
-
-/**
- * @deprecated
- */
-export class BuilderNotFoundException extends BaseException {
-  constructor(builder: string) {
-    super(`Builder ${builder} could not be found.`);
-  }
-}
-
-/**
- * @deprecated
- */
-export interface BuilderContext {
-  logger: logging.Logger;
-  host: virtualFs.Host<{}>;
-  workspace: experimental.workspace.Workspace;
-  architect: Architect;
-  targetSpecifier?: TargetSpecifier;
-}
-
-// TODO: use Build Event Protocol
-// https://docs.bazel.build/versions/master/build-event-protocol.html
-// https://github.com/googleapis/googleapis/tree/master/google/devtools/build/v1
-/**
- * TODO: use unknown
- * @deprecated
- */
-export interface BuildEvent<BuildResultT = any> {  // tslint:disable-line:no-any
-  success: boolean;
-  result?: BuildResultT;
-}
-
-/**
- * @deprecated
- */
-export interface Builder<OptionsT> {
-  run(builderConfig: BuilderConfiguration<Partial<OptionsT>>): Observable<BuildEvent>;
-}
-
-/**
- * @deprecated
- */
-export interface BuilderPathsMap {
-  builders: { [k: string]: BuilderPaths };
-}
-
-/**
- * @deprecated
- */
-export interface BuilderPaths {
-  class: Path;
-  schema: Path;
-  description: string;
-}
-
-/**
- * @deprecated
- */
-export interface BuilderDescription {
-  name: string;
-  schema: JsonObject;
-  description: string;
-}
-
-/**
- * @deprecated
- */
-export interface BuilderConstructor<OptionsT> {
-  new(context: BuilderContext): Builder<OptionsT>;
-}
-
-/**
- * @deprecated
- */
-export interface BuilderConfiguration<OptionsT = {}> {
-  root: Path;
-  sourceRoot?: Path;
-  projectType: string;
-  builder: string;
-  options: OptionsT;
-}
-
-/**
- * @deprecated
- */
-export interface TargetSpecifier<OptionsT = {}> {
-  project: string;
-  target: string;
-  configuration?: string;
-  overrides?: Partial<OptionsT>;
-}
-
-/**
- * @deprecated
- */
-export interface TargetMap {
-  [k: string]: Target;
-}
-
-export declare type TargetOptions<T = JsonObject> = T;
-export declare type TargetConfiguration<T = JsonObject> = Partial<T>;
-
-/**
- * @deprecated
- */
-export interface Target<T = JsonObject> {
-  builder: string;
-  options: TargetOptions<T>;
-  configurations?: { [k: string]: TargetConfiguration<T> };
-}
-
-/**
- * @deprecated
- */
-export class Architect {
-  private readonly _targetsSchemaPath = join(normalize(__dirname), 'targets-schema.json');
-  private readonly _buildersSchemaPath = join(normalize(__dirname), 'builders-schema.json');
-  private _targetsSchema: JsonObject;
-  private _buildersSchema: JsonObject;
-  private _architectSchemasLoaded = false;
-  private _targetMapMap = new Map<string, TargetMap>();
-  private _builderPathsMap = new Map<string, BuilderPaths>();
-  private _builderDescriptionMap = new Map<string, BuilderDescription>();
-  private _builderConstructorMap = new Map<string, BuilderConstructor<{}>>();
-
-  constructor(private _workspace: experimental.workspace.Workspace) { }
-
-  loadArchitect() {
-    if (this._architectSchemasLoaded) {
-      return of(this);
-    } else {
-      return forkJoin(
-        this._loadJsonFile(this._targetsSchemaPath),
-        this._loadJsonFile(this._buildersSchemaPath),
-      ).pipe(
-        concatMap(([targetsSchema, buildersSchema]) => {
-          this._targetsSchema = targetsSchema;
-          this._buildersSchema = buildersSchema;
-          this._architectSchemasLoaded = true;
-
-          // Validate and cache all project target maps.
-          return forkJoin(
-            ...this._workspace.listProjectNames().map(projectName => {
-              const unvalidatedTargetMap = this._workspace.getProjectTargets(projectName);
-
-              return this._workspace.validateAgainstSchema<TargetMap>(
-                unvalidatedTargetMap, this._targetsSchema).pipe(
-                  tap(targetMap => this._targetMapMap.set(projectName, targetMap)),
-              );
-            }),
-          );
-        }),
-        map(() => this),
-      );
-    }
-  }
-
-  listProjectTargets(projectName: string): string[] {
-    return Object.keys(this._getProjectTargetMap(projectName));
-  }
-
-  private _getProjectTargetMap(projectName: string): TargetMap {
-    if (!this._targetMapMap.has(projectName)) {
-      throw new ProjectNotFoundException(projectName);
-    }
-
-    return this._targetMapMap.get(projectName) as TargetMap;
-  }
-
-  private _getProjectTarget<T = {}>(projectName: string, targetName: string): Target<T> {
-    const targetMap = this._getProjectTargetMap(projectName);
-
-    const target = targetMap[targetName] as {} as Target<T>;
-
-    if (!target) {
-      throw new TargetNotFoundException(projectName, targetName);
-    }
-
-    return target;
-  }
-
-  getBuilderConfiguration<OptionsT>(targetSpec: TargetSpecifier): BuilderConfiguration<OptionsT> {
-    const {
-      project: projectName,
-      target: targetName,
-      configuration: configurationName,
-      overrides,
-    } = targetSpec;
-
-    const project = this._workspace.getProject(projectName);
-    const target = this._getProjectTarget(projectName, targetName);
-    const options = target.options;
-    let configuration: TargetConfiguration = {};
-
-    if (configurationName) {
-      if (!target.configurations) {
-        throw new ConfigurationNotFoundException(projectName, configurationName);
-      }
-
-      configuration = target.configurations[configurationName];
-
-      if (!configuration) {
-        throw new ConfigurationNotFoundException(projectName, configurationName);
-      }
-    }
-
-    const builderConfiguration: BuilderConfiguration<OptionsT> = {
-      root: project.root as Path,
-      sourceRoot: project.sourceRoot as Path | undefined,
-      projectType: project.projectType,
-      builder: target.builder,
-      options: {
-        ...options,
-        ...configuration,
-        ...overrides as {},
-      } as OptionsT,
-    };
-
-    return builderConfiguration;
-  }
-
-  run<OptionsT>(
-    builderConfig: BuilderConfiguration<OptionsT>,
-    partialContext: Partial<BuilderContext> = {},
-  ): Observable<BuildEvent> {
-    const context: BuilderContext = {
-      logger: new logging.NullLogger(),
-      architect: this,
-      host: this._workspace.host,
-      workspace: this._workspace,
-      ...partialContext,
-    };
-
-    let builderDescription: BuilderDescription;
-
-    return this.getBuilderDescription(builderConfig).pipe(
-      tap(description => builderDescription = description),
-      concatMap(() => this.validateBuilderOptions(builderConfig, builderDescription)),
-      tap(validatedBuilderConfig => builderConfig = validatedBuilderConfig),
-      map(() => this.getBuilder(builderDescription, context)),
-      concatMap(builder => builder.run(builderConfig)),
-    );
-  }
-
-  getBuilderDescription<OptionsT>(
-    builderConfig: BuilderConfiguration<OptionsT>,
-  ): Observable<BuilderDescription> {
-    // Check cache for this builder description.
-    if (this._builderDescriptionMap.has(builderConfig.builder)) {
-      return of(this._builderDescriptionMap.get(builderConfig.builder) as BuilderDescription);
-    }
-
-    return new Observable((obs) => {
-      // TODO: this probably needs to be more like NodeModulesEngineHost.
-      const basedir = getSystemPath(this._workspace.root);
-      const [pkg, builderName] = builderConfig.builder.split(':');
-      const pkgJsonPath = nodeResolve(pkg, { basedir, resolvePackageJson: true, checkLocal: true });
-      let buildersJsonPath: Path;
-      let builderPaths: BuilderPaths;
-
-      // Read the `builders` entry of package.json.
-      return this._loadJsonFile(normalize(pkgJsonPath)).pipe(
-        concatMap((pkgJson: JsonObject) => {
-          const pkgJsonBuildersentry = pkgJson['builders'] as string;
-          if (!pkgJsonBuildersentry) {
-            return throwError(new BuilderCannotBeResolvedException(builderConfig.builder));
-          }
-
-          buildersJsonPath = join(dirname(normalize(pkgJsonPath)), pkgJsonBuildersentry);
-
-          return this._loadJsonFile(buildersJsonPath);
-        }),
-        // Validate builders json.
-        concatMap((builderPathsMap) => this._workspace.validateAgainstSchema<BuilderPathsMap>(
-          builderPathsMap, this._buildersSchema)),
-        concatMap((builderPathsMap) => {
-          builderPaths = builderPathsMap.builders[builderName];
-
-          if (!builderPaths) {
-            return throwError(new BuilderCannotBeResolvedException(builderConfig.builder));
-          }
-
-          // Resolve paths in the builder paths.
-          const builderJsonDir = dirname(buildersJsonPath);
-          builderPaths.schema = join(builderJsonDir, builderPaths.schema);
-          builderPaths.class = join(builderJsonDir, builderPaths.class);
-
-          // Save the builder paths so that we can lazily load the builder.
-          this._builderPathsMap.set(builderConfig.builder, builderPaths);
-
-          // Load the schema.
-          return this._loadJsonFile(builderPaths.schema);
-        }),
-        map(builderSchema => {
-          const builderDescription = {
-            name: builderConfig.builder,
-            schema: builderSchema,
-            description: builderPaths.description,
-          };
-
-          // Save to cache before returning.
-          this._builderDescriptionMap.set(builderDescription.name, builderDescription);
-
-          return builderDescription;
-        }),
-      ).subscribe(obs);
-    });
-  }
-
-  validateBuilderOptions<OptionsT>(
-    builderConfig: BuilderConfiguration<OptionsT>, builderDescription: BuilderDescription,
-  ): Observable<BuilderConfiguration<OptionsT>> {
-    return this._workspace.validateAgainstSchema<OptionsT>(
-      builderConfig.options, builderDescription.schema,
-    ).pipe(
-      map(validatedOptions => {
-        builderConfig.options = validatedOptions;
-
-        return builderConfig;
-      }),
-    );
-  }
-
-  getBuilder<OptionsT>(
-    builderDescription: BuilderDescription, context: BuilderContext,
-  ): Builder<OptionsT> {
-    const name = builderDescription.name;
-    let builderConstructor: BuilderConstructor<OptionsT>;
-
-    // Check cache for this builder.
-    if (this._builderConstructorMap.has(name)) {
-      builderConstructor = this._builderConstructorMap.get(name) as BuilderConstructor<OptionsT>;
-    } else {
-      if (!this._builderPathsMap.has(name)) {
-        throw new BuilderNotFoundException(name);
-      }
-
-      const builderPaths = this._builderPathsMap.get(name) as BuilderPaths;
-
-      // TODO: support more than the default export, maybe via builder#import-name.
-      const builderModule = require(getSystemPath(builderPaths.class));
-      builderConstructor = builderModule['default'] as BuilderConstructor<OptionsT>;
-
-      // Save builder to cache before returning.
-      this._builderConstructorMap.set(builderDescription.name, builderConstructor);
-    }
-
-    const builder = new builderConstructor(context);
-
-    return builder;
-  }
-
-  private _loadJsonFile(path: Path): Observable<JsonObject> {
-    return this._workspace.host.read(normalize(path)).pipe(
-      map(buffer => virtualFs.fileBufferToString(buffer)),
-      map(str => parseJson(str, JsonParseMode.Loose) as {} as JsonObject),
-    );
-  }
-}
diff --git a/packages/angular_devkit/architect/src/architect_spec.ts b/packages/angular_devkit/architect/src/architect_spec.ts
deleted file mode 100644
index 54a36b148447..000000000000
--- a/packages/angular_devkit/architect/src/architect_spec.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { Path, experimental, normalize, schema } from '@angular-devkit/core';
-import { NodeJsSyncHost } from '@angular-devkit/core/node';
-import { concatMap, tap, toArray } from 'rxjs/operators';
-import { BrowserTargetOptions } from '../test/browser';
-import {
-  Architect,
-  BuilderCannotBeResolvedException,
-  ConfigurationNotFoundException,
-  TargetNotFoundException,
-} from './architect-legacy';
-
-
-describe('Architect', () => {
-  const host = new NodeJsSyncHost();
-  const root = normalize(__dirname);
-  const workspace = new experimental.workspace.Workspace(root, host);
-  let architect: Architect;
-  const workspaceJson = {
-    version: 1,
-    newProjectRoot: 'src',
-    projects: {
-      app: {
-        root: 'app',
-        sourceRoot: 'app/src',
-        projectType: 'application',
-        architect: {
-          browser: {
-            builder: '../test:browser',
-            options: {
-              browserOption: 1,
-            },
-            configurations: {
-              prod: {
-                optionalBrowserOption: false,
-              },
-            },
-          },
-          badBrowser: {
-            builder: '../test:browser',
-            options: {
-              badBrowserOption: 1,
-            },
-          },
-          karma: {
-            builder: '../test:karma',
-            options: {},
-          },
-        },
-      },
-    },
-  };
-
-  beforeAll((done) => workspace.loadWorkspaceFromJson(workspaceJson).pipe(
-    concatMap(ws => new Architect(ws).loadArchitect()),
-    tap(arch => architect = arch),
-  ).toPromise().then(done, done.fail));
-
-  it('works', () => {
-    const targetSpec = { project: 'app', target: 'browser', configuration: 'prod' };
-    const builderConfig = architect.getBuilderConfiguration<BrowserTargetOptions>(targetSpec);
-    expect(builderConfig.root).toBe('app');
-    expect(builderConfig.sourceRoot).toBe('app/src' as Path);
-    expect(builderConfig.projectType).toBe('application');
-    expect(builderConfig.builder).toBe('../test:browser');
-    expect(builderConfig.options.browserOption).toBe(1);
-    expect(builderConfig.options.optionalBrowserOption).toBe(false);
-  });
-
-  it('lists targets by name', () => {
-    expect(architect.listProjectTargets('app')).toEqual(['browser', 'badBrowser', 'karma']);
-  });
-
-  it('errors when missing target is used', () => {
-    const targetSpec = { project: 'app', target: 'missing', configuration: 'prod' };
-    expect(() => architect.getBuilderConfiguration<BrowserTargetOptions>(targetSpec))
-      .toThrow(new TargetNotFoundException(targetSpec.project, targetSpec.target));
-  });
-
-  it('throws when missing configuration is used', () => {
-    const targetSpec = { project: 'app', target: 'browser', configuration: 'missing' };
-    expect(() => architect.getBuilderConfiguration<BrowserTargetOptions>(targetSpec))
-      .toThrow(new ConfigurationNotFoundException(targetSpec.project, targetSpec.configuration));
-  });
-
-  it('runs targets', (done) => {
-    const targetSpec = { project: 'app', target: 'browser', configuration: 'prod' };
-    const builderConfig = architect.getBuilderConfiguration<BrowserTargetOptions>(targetSpec);
-    architect.run(builderConfig).pipe(
-      toArray(),
-      tap(events => {
-        expect(events.length).toBe(3);
-        expect(events[0].success).toBe(true);
-        expect(events[1].success).toBe(false);
-        expect(events[2].success).toBe(true);
-      }),
-    ).toPromise().then(done, done.fail);
-  });
-
-  it('errors when builder cannot be resolved', (done) => {
-    const targetSpec = { project: 'app', target: 'karma' };
-    const builderConfig = architect.getBuilderConfiguration<BrowserTargetOptions>(targetSpec);
-    architect.run(builderConfig).toPromise().then(() => done.fail(), (err: Error) => {
-      expect(err).toEqual(jasmine.any(BuilderCannotBeResolvedException));
-      done();
-    });
-  });
-
-  it('errors when builder options fail validation', (done) => {
-    const targetSpec = { project: 'app', target: 'badBrowser' };
-    const builderConfig = architect.getBuilderConfiguration<BrowserTargetOptions>(targetSpec);
-    architect.run(builderConfig).toPromise().then(() => done.fail(), (err: Error) => {
-      expect(err).toEqual(jasmine.any(schema.SchemaValidationException));
-      done();
-    });
-  });
-});
diff --git a/packages/angular_devkit/architect/src/index.ts b/packages/angular_devkit/architect/src/index.ts
index d219e68bc09d..7223af9aa926 100644
--- a/packages/angular_devkit/architect/src/index.ts
+++ b/packages/angular_devkit/architect/src/index.ts
@@ -5,10 +5,9 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-/**
- * @deprecated
- */
-export * from './architect-legacy';
+export * from './api';
+export { Architect, ScheduleOptions } from './architect';
+export { createBuilder } from './create-builder';
 
 import * as index2 from './index2';
 export {
diff --git a/packages/angular_devkit/architect/src/index2_spec.ts b/packages/angular_devkit/architect/src/index_spec.ts
similarity index 100%
rename from packages/angular_devkit/architect/src/index2_spec.ts
rename to packages/angular_devkit/architect/src/index_spec.ts
diff --git a/packages/angular_devkit/architect/test/browser/index.ts b/packages/angular_devkit/architect/test/browser/index.ts
deleted file mode 100644
index 9c553f3cc304..000000000000
--- a/packages/angular_devkit/architect/test/browser/index.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { Observable } from 'rxjs';
-import { BuildEvent, Builder, BuilderConfiguration } from '../../src';
-
-
-const successBuildEvent: BuildEvent = {
-  success: true,
-};
-
-const failBuildEvent: BuildEvent = {
-  success: false,
-};
-
-export interface BrowserTargetOptions {
-  browserOption: number;
-  optionalBrowserOption: boolean;
-}
-
-export default class BrowserTarget implements Builder<BrowserTargetOptions> {
-  run(_browserConfig: BuilderConfiguration<Partial<BrowserTargetOptions>>): Observable<BuildEvent> {
-    return new Observable(obs => {
-      obs.next(successBuildEvent);
-      obs.next(failBuildEvent);
-      obs.next(successBuildEvent);
-      obs.complete();
-    });
-  }
-}
diff --git a/packages/angular_devkit/architect/test/browser/schema.json b/packages/angular_devkit/architect/test/browser/schema.json
deleted file mode 100644
index ee1dc6002be6..000000000000
--- a/packages/angular_devkit/architect/test/browser/schema.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "$schema": "http://json-schema.org/schema",
-  "id": "BrowserTargetSchema",
-  "title": "Browser target schema for testing Build Facade.",
-  "type": "object",
-  "description": "Target options",
-  "properties": {
-    "browserOption": {
-      "type": "number",
-      "description": "A required option"
-    },
-    "optionalBrowserOption": {
-      "type": "boolean",
-      "description": "A non-required option with a default",
-      "default": false
-    }
-  },
-  "additionalProperties": false,
-  "required": [
-    "browserOption"
-  ]
-}
diff --git a/packages/angular_devkit/architect/test/builders.json b/packages/angular_devkit/architect/test/builders.json
deleted file mode 100644
index cdcf5056250d..000000000000
--- a/packages/angular_devkit/architect/test/builders.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "$schema": "../src/builders-schema.json",
-  "builders": {
-    "browser": {
-      "class": "./browser",
-      "schema": "./browser/schema.json",
-      "description": "Build a browser app."
-    }
-  }
-}
diff --git a/packages/angular_devkit/architect/test/package.json b/packages/angular_devkit/architect/test/package.json
deleted file mode 100644
index b633aa748eea..000000000000
--- a/packages/angular_devkit/architect/test/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "builders": "builders.json",
-  "dependencies": {
-    "rxjs": "6.4.0"
-  }
-}
diff --git a/packages/angular_devkit/architect/testing/index.ts b/packages/angular_devkit/architect/testing/index.ts
index 5b60c5339fe5..eadcdbff0285 100644
--- a/packages/angular_devkit/architect/testing/index.ts
+++ b/packages/angular_devkit/architect/testing/index.ts
@@ -5,8 +5,6 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-export * from './request';
+export * from './testing-architect-host';
 export * from './test-project-host';
 export * from './test-logger';
-export * from './run-target-spec';
diff --git a/packages/angular_devkit/architect/testing/request.ts b/packages/angular_devkit/architect/testing/request.ts
deleted file mode 100644
index 107140f7b725..000000000000
--- a/packages/angular_devkit/architect/testing/request.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import * as http from 'http';
-import * as https from 'https';
-import * as Url from 'url';
-
-/**
- * @deprecated
- */
-export function request(url: string, headers = {}): Promise<string> {
-  return new Promise((resolve, reject) => {
-    const u = Url.parse(url);
-    const options: http.RequestOptions = {
-      hostname: u.hostname,
-      protocol: u.protocol,
-      host: u.host,
-      port: u.port,
-      path: u.path,
-      headers: { 'Accept': 'text/html', ...headers },
-    };
-
-    function _callback(res: http.IncomingMessage) {
-      if (!res.statusCode || res.statusCode >= 400) {
-        // Consume the rest of the data to free memory.
-        res.resume();
-        reject(new Error(`Requesting "${url}" returned status code ${res.statusCode}.`));
-      } else {
-        res.setEncoding('utf8');
-        let data = '';
-        res.on('data', chunk => {
-          data += chunk;
-        });
-        res.on('end', () => {
-          try {
-            resolve(data);
-          } catch (err) {
-            reject(err);
-          }
-        });
-      }
-    }
-
-    if (u.protocol == 'https:') {
-      options.agent = new https.Agent({ rejectUnauthorized: false });
-      https.get(options, _callback);
-    } else if (u.protocol == 'http:') {
-      http.get(options, _callback);
-    } else {
-      throw new Error(`Unknown protocol: ${JSON.stringify(u.protocol)}.`);
-    }
-  });
-}
diff --git a/packages/angular_devkit/architect/testing/run-target-spec.ts b/packages/angular_devkit/architect/testing/run-target-spec.ts
deleted file mode 100644
index 9073336b23d4..000000000000
--- a/packages/angular_devkit/architect/testing/run-target-spec.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { experimental, logging, normalize } from '@angular-devkit/core';
-import { Observable, merge, throwError, timer } from 'rxjs';
-import { concatMap, concatMapTo, finalize, takeUntil } from 'rxjs/operators';
-import { Architect, BuildEvent, BuilderContext, TargetSpecifier } from '../src';
-import { TestProjectHost } from './test-project-host';
-
-/**
- * @deprecated
- */
-export const DefaultTimeout = 45000;
-
-/**
- * @deprecated
- */
-export function runTargetSpec(
-  host: TestProjectHost,
-  targetSpec: TargetSpecifier,
-  overrides = {},
-  timeout = DefaultTimeout,
-  logger: logging.Logger = new logging.NullLogger(),
-): Observable<BuildEvent> {
-  targetSpec = { ...targetSpec, overrides };
-  const workspaceFile = normalize('angular.json');
-  const workspace = new experimental.workspace.Workspace(host.root(), host);
-
-  // Emit when runArchitect$ completes or errors.
-  // TODO: There must be a better way of doing this...
-  let finalizeCB = () => { };
-  const runArchitectFinalize$ = new Observable(obs => {
-    finalizeCB = () => obs.next();
-  });
-
-  // Load the workspace from the root of the host, then run a target.
-  const builderContext: Partial<BuilderContext> = {
-    logger,
-    targetSpecifier: targetSpec,
-  };
-  const runArchitect$ = workspace.loadWorkspaceFromHost(workspaceFile).pipe(
-    concatMap(ws => new Architect(ws).loadArchitect()),
-    concatMap(arch => arch.run(arch.getBuilderConfiguration(targetSpec), builderContext)),
-    finalize(() => finalizeCB()),
-  );
-
-  // Error out after the timeout if runArchitect$ hasn't finalized.
-  const timeout$ = timer(timeout).pipe(
-    takeUntil(runArchitectFinalize$),
-    concatMapTo(throwError(`runTargetSpec timeout (${timeout}) reached.`)),
-  );
-
-  return merge(
-    timeout$,
-    runArchitect$,
-  );
-}

From 9bb7e7dc8c4a2baeadc0dd9c08d545445cbf7f77 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 1 Apr 2019 11:57:13 -0400
Subject: [PATCH 1061/1703] refactor(@angular-devkit/build-ng-packagr): cleanup
 architect imports

---
 packages/angular_devkit/build_ng_packagr/src/build/index.ts  | 2 +-
 .../build_ng_packagr/src/build/index_spec_large.ts           | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/angular_devkit/build_ng_packagr/src/build/index.ts b/packages/angular_devkit/build_ng_packagr/src/build/index.ts
index 3c1d67bd9285..0bd4f4f49ebb 100644
--- a/packages/angular_devkit/build_ng_packagr/src/build/index.ts
+++ b/packages/angular_devkit/build_ng_packagr/src/build/index.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect/src/index2';
+import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
 import { resolve } from 'path';
 import { Observable, from } from 'rxjs';
 import { catchError, mapTo, switchMap } from 'rxjs/operators';
diff --git a/packages/angular_devkit/build_ng_packagr/src/build/index_spec_large.ts b/packages/angular_devkit/build_ng_packagr/src/build/index_spec_large.ts
index 6550ec5c807d..4637cc463f7e 100644
--- a/packages/angular_devkit/build_ng_packagr/src/build/index_spec_large.ts
+++ b/packages/angular_devkit/build_ng_packagr/src/build/index_spec_large.ts
@@ -5,10 +5,9 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import { Architect } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { TestProjectHost } from '@angular-devkit/architect/testing';
-import { TestingArchitectHost } from '@angular-devkit/architect/testing/testing-architect-host';
+import { TestProjectHost, TestingArchitectHost } from '@angular-devkit/architect/testing';
 import {
   experimental,
   join,

From c6d145bf3268c897fff1ee4d7f27de66ad8ae349 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 2 Apr 2019 10:54:52 -0400
Subject: [PATCH 1062/1703] test(@angular-devkit/build-angular): cleanup unused
 imports

---
 .../build_angular/test/browser/aot_spec_large.ts            | 4 +---
 .../build_angular/test/browser/base-href_spec_large.ts      | 4 +---
 .../build_angular/test/browser/tsconfig-paths_spec_large.ts | 4 +---
 .../build_angular/test/browser/works_spec_large.ts          | 6 ++----
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
index 75403f6f7a32..506ce1968b38 100644
--- a/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
@@ -7,11 +7,9 @@
  */
 
 import { Architect } from '@angular-devkit/architect/src/index2';
-import { runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
 import { BrowserBuilderOutput } from '../../src/browser';
-import { browserTargetSpec, createArchitect, host } from '../utils';
+import { createArchitect, host } from '../utils';
 
 
 describe('Browser Builder AOT', () => {
diff --git a/packages/angular_devkit/build_angular/test/browser/base-href_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/base-href_spec_large.ts
index 37d7dc1570af..ea47ac08447b 100644
--- a/packages/angular_devkit/build_angular/test/browser/base-href_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/base-href_spec_large.ts
@@ -7,11 +7,9 @@
  */
 
 import { Architect } from '@angular-devkit/architect/src/index2';
-import { runTargetSpec } from '@angular-devkit/architect/testing';
 import { join, normalize, tags, virtualFs } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
 import { BrowserBuilderOutput } from '../../src/browser';
-import { browserTargetSpec, createArchitect, host } from '../utils';
+import { createArchitect, host } from '../utils';
 
 
 describe('Browser Builder base href', () => {
diff --git a/packages/angular_devkit/build_angular/test/browser/tsconfig-paths_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/tsconfig-paths_spec_large.ts
index 3c051fce1765..4cdc0b667390 100644
--- a/packages/angular_devkit/build_angular/test/browser/tsconfig-paths_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/tsconfig-paths_spec_large.ts
@@ -7,9 +7,7 @@
  */
 
 import { Architect } from '@angular-devkit/architect/src/index2';
-import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { tap } from 'rxjs/operators';
-import { browserBuild, browserTargetSpec, createArchitect, host } from '../utils';
+import { browserBuild, createArchitect, host } from '../utils';
 
 
 describe('Browser Builder tsconfig paths', () => {
diff --git a/packages/angular_devkit/build_angular/test/browser/works_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/works_spec_large.ts
index 5cc8ecbeb3d0..59a885581cf7 100644
--- a/packages/angular_devkit/build_angular/test/browser/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/works_spec_large.ts
@@ -7,10 +7,8 @@
  */
 
 import { Architect } from '@angular-devkit/architect/src/index2';
-import { runTargetSpec } from '@angular-devkit/architect/testing';
-import { join, normalize } from '@angular-devkit/core';
-import { tap } from 'rxjs/operators';
-import { browserBuild, browserTargetSpec, createArchitect, host } from '../utils';
+import { normalize } from '@angular-devkit/core';
+import { browserBuild, createArchitect, host } from '../utils';
 
 
 describe('Browser Builder basic test', () => {

From 01b53a92e6e9017d1010339a8be3238f4a7f76d4 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 2 Apr 2019 11:00:56 -0400
Subject: [PATCH 1063/1703] fix(@angular-devkit/build-angular): update utility
 function output type

---
 .../build_angular/src/utils/run-module-as-observable-fork.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/utils/run-module-as-observable-fork.ts b/packages/angular_devkit/build_angular/src/utils/run-module-as-observable-fork.ts
index d0568562a97e..ab13efdb0e2b 100644
--- a/packages/angular_devkit/build_angular/src/utils/run-module-as-observable-fork.ts
+++ b/packages/angular_devkit/build_angular/src/utils/run-module-as-observable-fork.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { BuildEvent } from '@angular-devkit/architect';
+import { BuilderOutput } from '@angular-devkit/architect';
 import { ForkOptions, fork } from 'child_process';
 import { resolve } from 'path';
 import { Observable } from 'rxjs';
@@ -18,7 +18,7 @@ export function runModuleAsObservableFork(
   exportName: string | undefined,
   // tslint:disable-next-line:no-any
   args: any[],
-): Observable<BuildEvent> {
+): Observable<BuilderOutput> {
   return new Observable(obs => {
     const workerPath: string = resolve(__dirname, './run-module-worker.js');
 

From 40b62b026de60a494b2b03c6d98a5f0f416c93e3 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 3 Apr 2019 08:53:55 +0000
Subject: [PATCH 1064/1703] build: update sass to version 1.17.4

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 7195f774e6df..17b819f6d1f6 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -34,7 +34,7 @@
     "postcss-loader": "3.0.0",
     "raw-loader": "1.0.0",
     "rxjs": "6.4.0",
-    "sass": "1.17.3",
+    "sass": "1.17.4",
     "sass-loader": "7.1.0",
     "semver": "6.0.0",
     "source-map-support": "0.5.11",
diff --git a/yarn.lock b/yarn.lock
index aa3afddc7554..172acc255f62 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8020,7 +8020,14 @@ sass-loader@7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
-sass@1.17.3, sass@^1.17.3:
+sass@1.17.4:
+  version "1.17.4"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.17.4.tgz#b65b9d11f5cef9b96d6c44566ab91d6357210dbd"
+  integrity sha512-NM/RkY54d6C5xJMWk7Z+p0/TfIB71/46/T335Egc0O3G+NeKKVFz1s9EwBlekRnYq3fUCTsbk0zPNMpee5LIdA==
+  dependencies:
+    chokidar "^2.0.0"
+
+sass@^1.17.3:
   version "1.17.3"
   resolved "https://registry.yarnpkg.com/sass/-/sass-1.17.3.tgz#19f9164cf8653b9fca670a64e53285272c96d192"
   integrity sha512-S4vJawbrNUxJUBiHLXPYUKZCoO6cvq3/3ZFBV66a+PafTxcDEFJB+FHLDFl0P+rUfha/703ajEXMuGTYhJESkQ==

From af61ae6b882a8c57f920da266f45e2a495d6b827 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 3 Apr 2019 05:35:11 +0000
Subject: [PATCH 1065/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 27b9c3ef153c..63f1532ecac0 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#ec3c0027c96937cc839aacc24a37a23474d6271a",
-    "@angular/common": "github:angular/common-builds#adac766106a8cb521a1ee1817b800f96610549cf",
-    "@angular/compiler": "github:angular/compiler-builds#34eb5f9085f9879db0999d740af821ceb832437b",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#93740aa62e1237518145cfe0bbd81fb28bea0a57",
-    "@angular/core": "github:angular/core-builds#f2e8e87d2ab74937977ed0c9a8417d1e9ca65f6d",
-    "@angular/forms": "github:angular/forms-builds#207b371583a57aa8eddb17700544b2bbb191068a",
-    "@angular/language-service": "github:angular/language-service-builds#e5600a1efa198ed5aec86eb42398f413dfa6081e",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#13758eb5b7d9a578971f7f6ded23e64e97484b49",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#72cef0e5a35d026abbc0b559ead5c6312758ead6",
-    "@angular/router": "github:angular/router-builds#b6dee9d6b0833ee9c47bb9cd0f3edfed85245cdc"
+    "@angular/animations": "github:angular/animations-builds#ad75d9dfdc5d58cec45878d171b2b25229de7a62",
+    "@angular/common": "github:angular/common-builds#54cd7b59798ce18a596854ea14d38953ecdcaf93",
+    "@angular/compiler": "github:angular/compiler-builds#cfa1aa27208372086027f4bdeba21bc7e4b5b270",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#52d01a84c64dc9057e1ce9f664c8d93bbed567df",
+    "@angular/core": "github:angular/core-builds#3c8a46490a902a4778570a94b02945229fd8e582",
+    "@angular/forms": "github:angular/forms-builds#da6d8b0c69013624178c753dc43604ed62a4bc01",
+    "@angular/language-service": "github:angular/language-service-builds#5ae5a878ad37ad4f27cd98ef90a1f5b11c09f471",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#5e6ea0669f6dd8578702c0cf511eed6fe4aae33a",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#4327cb12898dc4e333a0468f412e05c7f7262ac7",
+    "@angular/router": "github:angular/router-builds#21e779cf1a648d451625b4367361364ef5314755"
   }
 }
\ No newline at end of file

From 76492141d21649e1924a7a84a2af25ceca294be1 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 2 Apr 2019 14:04:52 -0400
Subject: [PATCH 1066/1703] refactor(@angular-devkit/build-angular): cleanup
 architect imports

---
 .../angular_devkit/build_angular/src/app-shell/index.ts   | 2 +-
 .../angular_devkit/build_angular/src/browser/index.ts     | 4 ++--
 .../angular_devkit/build_angular/src/dev-server/index.ts  | 6 +++---
 .../build_angular/src/extract-i18n/index.ts               | 4 ++--
 packages/angular_devkit/build_angular/src/karma/index.ts  | 2 +-
 .../angular_devkit/build_angular/src/protractor/index.ts  | 2 +-
 packages/angular_devkit/build_angular/src/server/index.ts | 4 ++--
 packages/angular_devkit/build_angular/src/tslint/index.ts | 2 +-
 .../build_angular/src/utils/webpack-browser-config.ts     | 2 +-
 .../build_angular/test/app-shell/app-shell_spec_large.ts  | 3 +--
 .../build_angular/test/browser/allow-js_spec_large.ts     | 2 +-
 .../build_angular/test/browser/aot_spec_large.ts          | 2 +-
 .../build_angular/test/browser/assets_spec_large.ts       | 2 +-
 .../build_angular/test/browser/base-href_spec_large.ts    | 2 +-
 .../test/browser/build-optimizer_spec_large.ts            | 2 +-
 .../test/browser/bundle-budgets_spec_large.ts             | 2 +-
 .../test/browser/circular-dependency_spec_large.ts        | 2 +-
 .../build_angular/test/browser/deploy-url_spec_large.ts   | 2 +-
 .../build_angular/test/browser/errors_spec_large.ts       | 2 +-
 .../build_angular/test/browser/i18n_spec_large.ts         | 2 +-
 .../build_angular/test/browser/index_spec_large.ts        | 2 +-
 .../build_angular/test/browser/lazy-module_spec_large.ts  | 2 +-
 .../test/browser/license-extraction_spec_large.ts         | 2 +-
 .../test/browser/no-entry-module_spec_large.ts            | 2 +-
 .../test/browser/optimization-level_spec_large.ts         | 2 +-
 .../test/browser/output-hashing_spec_large.ts             | 2 +-
 .../build_angular/test/browser/output-path_spec_large.ts  | 2 +-
 .../build_angular/test/browser/poll_spec_large.ts         | 2 +-
 .../build_angular/test/browser/profile_spec_large.ts      | 2 +-
 .../build_angular/test/browser/rebuild_spec_large.ts      | 2 +-
 .../build_angular/test/browser/replacements_spec_large.ts | 2 +-
 .../test/browser/resolve-json-module_spec_large.ts        | 2 +-
 .../test/browser/resources-output-path_spec_large.ts      | 2 +-
 .../test/browser/scripts-array_spec_large.ts              | 2 +-
 .../test/browser/service-worker_spec_large.ts             | 2 +-
 .../build_angular/test/browser/source-map_spec_large.ts   | 2 +-
 .../build_angular/test/browser/stats-json_spec_large.ts   | 2 +-
 .../build_angular/test/browser/styles_spec_large.ts       | 2 +-
 .../test/browser/subresource-integrity_spec_large.ts      | 2 +-
 .../build_angular/test/browser/svg_spec_large.ts          | 2 +-
 .../test/browser/tsconfig-paths_spec_large.ts             | 2 +-
 .../build_angular/test/browser/vendor-chunk_spec_large.ts | 2 +-
 .../test/browser/vendor-source-map_spec_large.ts          | 2 +-
 .../build_angular/test/browser/web-worker_spec_large.ts   | 2 +-
 .../build_angular/test/browser/works_spec_large.ts        | 2 +-
 .../test/dev-server/deploy-url_spec_large.ts              | 2 +-
 .../build_angular/test/dev-server/proxy_spec_large.ts     | 2 +-
 .../test/dev-server/public-host_spec_large.ts             | 2 +-
 .../test/dev-server/serve-path_spec_large.ts              | 2 +-
 .../build_angular/test/dev-server/ssl_spec_large.ts       | 2 +-
 .../build_angular/test/dev-server/works_spec_large.ts     | 2 +-
 .../build_angular/test/extract-i18n/works_spec_large.ts   | 2 +-
 .../build_angular/test/karma/code-coverage_spec_large.ts  | 2 +-
 .../build_angular/test/karma/rebuilds_spec_large.ts       | 2 +-
 .../build_angular/test/karma/works_spec_large.ts          | 2 +-
 .../build_angular/test/protractor/works_spec_large.ts     | 2 +-
 .../build_angular/test/server/base_spec_large.ts          | 3 +--
 .../build_angular/test/tslint/works_spec_large.ts         | 5 ++---
 packages/angular_devkit/build_angular/test/utils.ts       | 8 +++-----
 59 files changed, 67 insertions(+), 72 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/app-shell/index.ts b/packages/angular_devkit/build_angular/src/app-shell/index.ts
index 8751d9d2ebda..bd13ab545416 100644
--- a/packages/angular_devkit/build_angular/src/app-shell/index.ts
+++ b/packages/angular_devkit/build_angular/src/app-shell/index.ts
@@ -10,7 +10,7 @@ import {
   BuilderOutput,
   createBuilder,
   targetFromTargetString,
-} from '@angular-devkit/architect/src/index2';
+} from '@angular-devkit/architect';
 import { JsonObject, experimental, join, normalize, resolve, schema } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as fs from 'fs';
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 4741aabce14c..b4fa9ab8f6e6 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -10,11 +10,11 @@ import {
   BuilderInfo,
   BuilderOutput,
   createBuilder,
-} from '@angular-devkit/architect/src/index2';
+} from '@angular-devkit/architect';
 import {
   WebpackLoggingCallback,
   runWebpack,
-} from '@angular-devkit/build-webpack/src/webpack';
+} from '@angular-devkit/build-webpack';
 import {
   Path,
   analytics,
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index 5529605cb03d..c05fd05a6cf6 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -10,12 +10,12 @@ import {
   BuilderContext,
   createBuilder,
   targetFromTargetString,
-} from '@angular-devkit/architect/src/index2';
-import { WebpackLoggingCallback } from '@angular-devkit/build-webpack/src/webpack';
+} from '@angular-devkit/architect';
 import {
   DevServerBuildOutput,
+  WebpackLoggingCallback,
   runWebpackDevServer,
-} from '@angular-devkit/build-webpack/src/webpack-dev-server';
+} from '@angular-devkit/build-webpack';
 import { experimental, json, logging, tags } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { existsSync, readFileSync } from 'fs';
diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
index 2271f368ec17..83628ee17cdf 100644
--- a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
@@ -9,8 +9,8 @@ import {
   BuilderContext,
   createBuilder,
   targetFromTargetString,
-} from '@angular-devkit/architect/src/index2';
-import { runWebpack } from '@angular-devkit/build-webpack/src/webpack';
+} from '@angular-devkit/architect';
+import { runWebpack } from '@angular-devkit/build-webpack';
 import { JsonObject } from '@angular-devkit/core';
 import * as path from 'path';
 import * as webpack from 'webpack';
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index 940921ee08aa..d437b36dc848 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect/src/index2';
+import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { resolve } from 'path';
 import { Observable, from } from 'rxjs';
diff --git a/packages/angular_devkit/build_angular/src/protractor/index.ts b/packages/angular_devkit/build_angular/src/protractor/index.ts
index 72515dcb7e5d..c57d44d9010b 100644
--- a/packages/angular_devkit/build_angular/src/protractor/index.ts
+++ b/packages/angular_devkit/build_angular/src/protractor/index.ts
@@ -10,7 +10,7 @@ import {
   BuilderOutput,
   createBuilder,
   targetFromTargetString,
-} from '@angular-devkit/architect/src/index2';
+} from '@angular-devkit/architect';
 import { JsonObject, tags } from '@angular-devkit/core';
 import { resolve } from 'path';
 import * as url from 'url';
diff --git a/packages/angular_devkit/build_angular/src/server/index.ts b/packages/angular_devkit/build_angular/src/server/index.ts
index a5f43a423e86..96df11c10642 100644
--- a/packages/angular_devkit/build_angular/src/server/index.ts
+++ b/packages/angular_devkit/build_angular/src/server/index.ts
@@ -5,8 +5,8 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { BuilderOutput, createBuilder } from '@angular-devkit/architect/src/index2';
-import { runWebpack } from '@angular-devkit/build-webpack/src/webpack';
+import { BuilderOutput, createBuilder } from '@angular-devkit/architect';
+import { runWebpack } from '@angular-devkit/build-webpack';
 import {
   Path,
   experimental,
diff --git a/packages/angular_devkit/build_angular/src/tslint/index.ts b/packages/angular_devkit/build_angular/src/tslint/index.ts
index 9ba353f644aa..965cafac7d27 100644
--- a/packages/angular_devkit/build_angular/src/tslint/index.ts
+++ b/packages/angular_devkit/build_angular/src/tslint/index.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect/src/index2';
+import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
 import { json } from '@angular-devkit/core';
 import { readFileSync } from 'fs';
 import * as glob from 'glob';
diff --git a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
index d88be9cdf008..0c28c6fcb3a7 100644
--- a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
+++ b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { BuilderContext } from '@angular-devkit/architect/src/index2';
+import { BuilderContext } from '@angular-devkit/architect';
 import {
   experimental,
   getSystemPath,
diff --git a/packages/angular_devkit/build_angular/test/app-shell/app-shell_spec_large.ts b/packages/angular_devkit/build_angular/test/app-shell/app-shell_spec_large.ts
index 7684a45550f8..873568502599 100644
--- a/packages/angular_devkit/build_angular/test/app-shell/app-shell_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/app-shell/app-shell_spec_large.ts
@@ -6,10 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 // tslint:disable:no-big-function
-
+import { Architect } from '@angular-devkit/architect/src/architect';
 import { getSystemPath, join, normalize, virtualFs } from '@angular-devkit/core';
 import * as express from 'express'; // tslint:disable-line:no-implicit-dependencies
-import { Architect } from '../../../architect/src/architect';
 import { createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts
index f9b2a71cf104..b75b37f03861 100644
--- a/packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { join, normalize, relative, virtualFs } from '@angular-devkit/core';
 import { take, tap } from 'rxjs/operators';
 import { BrowserBuilderOutput } from '../../src/browser';
diff --git a/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
index 506ce1968b38..a7e0708af970 100644
--- a/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { BrowserBuilderOutput } from '../../src/browser';
 import { createArchitect, host } from '../utils';
diff --git a/packages/angular_devkit/build_angular/test/browser/assets_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/assets_spec_large.ts
index b37407024502..904180ce5a7c 100644
--- a/packages/angular_devkit/build_angular/test/browser/assets_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/assets_spec_large.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { normalize, virtualFs } from '@angular-devkit/core';
 import { toArray } from 'rxjs/operators';
 import { BrowserBuilderOutput } from '../../src/browser';
diff --git a/packages/angular_devkit/build_angular/test/browser/base-href_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/base-href_spec_large.ts
index ea47ac08447b..5c32e6a70711 100644
--- a/packages/angular_devkit/build_angular/test/browser/base-href_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/base-href_spec_large.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { join, normalize, tags, virtualFs } from '@angular-devkit/core';
 import { BrowserBuilderOutput } from '../../src/browser';
 import { createArchitect, host } from '../utils';
diff --git a/packages/angular_devkit/build_angular/test/browser/build-optimizer_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/build-optimizer_spec_large.ts
index 17cce733ec82..5377a7be0c96 100644
--- a/packages/angular_devkit/build_angular/test/browser/build-optimizer_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/build-optimizer_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { join, normalize } from '@angular-devkit/core';
 import { BrowserBuilderOutput } from '../../src/browser';
 import { browserBuild, createArchitect, host } from '../utils';
diff --git a/packages/angular_devkit/build_angular/test/browser/bundle-budgets_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/bundle-budgets_spec_large.ts
index 6f5c4948337a..2217f019aaf3 100644
--- a/packages/angular_devkit/build_angular/test/browser/bundle-budgets_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/bundle-budgets_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { logging } from '@angular-devkit/core';
 import { createArchitect, host } from '../utils';
 
diff --git a/packages/angular_devkit/build_angular/test/browser/circular-dependency_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/circular-dependency_spec_large.ts
index 5f70b43fa04d..a854b31122fd 100644
--- a/packages/angular_devkit/build_angular/test/browser/circular-dependency_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/circular-dependency_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { logging } from '@angular-devkit/core';
 import { createArchitect, host } from '../utils';
 
diff --git a/packages/angular_devkit/build_angular/test/browser/deploy-url_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/deploy-url_spec_large.ts
index f06ccdccf570..019798fc4126 100644
--- a/packages/angular_devkit/build_angular/test/browser/deploy-url_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/deploy-url_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { BrowserBuilderOutput } from '../../src/browser';
 import { createArchitect, host } from '../utils';
diff --git a/packages/angular_devkit/build_angular/test/browser/errors_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/errors_spec_large.ts
index 710d2e634d9e..462593faeea5 100644
--- a/packages/angular_devkit/build_angular/test/browser/errors_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/errors_spec_large.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { logging } from '@angular-devkit/core';
 import { createArchitect, host } from '../utils';
 
diff --git a/packages/angular_devkit/build_angular/test/browser/i18n_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/i18n_spec_large.ts
index 9dc1c8461d65..8c98a586dd20 100644
--- a/packages/angular_devkit/build_angular/test/browser/i18n_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/i18n_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { BrowserBuilderOutput } from '../../src/browser';
 import { createArchitect, host } from '../utils';
diff --git a/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts
index 1ecfc082fc68..47c0455c1ca1 100644
--- a/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { join, normalize, tags, virtualFs } from '@angular-devkit/core';
 import { BrowserBuilderOutput } from '../../src/browser';
 import { createArchitect, host } from '../utils';
diff --git a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
index 81a5a4ec2bfe..3117e748b739 100644
--- a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { TestLogger } from '@angular-devkit/architect/testing';
 import { take, tap, timeout } from 'rxjs/operators';
 import { browserBuild, createArchitect, host, lazyModuleFiles, lazyModuleImport } from '../utils';
diff --git a/packages/angular_devkit/build_angular/test/browser/license-extraction_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/license-extraction_spec_large.ts
index 3de262afae22..ee15546581ce 100644
--- a/packages/angular_devkit/build_angular/test/browser/license-extraction_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/license-extraction_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { browserBuild, createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/browser/no-entry-module_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/no-entry-module_spec_large.ts
index 6a7c64f94cc5..3377f0b00168 100644
--- a/packages/angular_devkit/build_angular/test/browser/no-entry-module_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/no-entry-module_spec_large.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { TestLogger } from '@angular-devkit/architect/testing';
 import { browserBuild, createArchitect, host } from '../utils';
 
diff --git a/packages/angular_devkit/build_angular/test/browser/optimization-level_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/optimization-level_spec_large.ts
index d8a7a4f00297..b37c9dc9afaf 100644
--- a/packages/angular_devkit/build_angular/test/browser/optimization-level_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/optimization-level_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { browserBuild, createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts
index f36a71a8df0a..f8714f6b979f 100644
--- a/packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { normalize } from '@angular-devkit/core';
 import { browserBuild, createArchitect, host, lazyModuleFiles, lazyModuleImport } from '../utils';
 
diff --git a/packages/angular_devkit/build_angular/test/browser/output-path_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/output-path_spec_large.ts
index 3738bf19d048..8d55a3146cd5 100644
--- a/packages/angular_devkit/build_angular/test/browser/output-path_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/output-path_spec_large.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { join, virtualFs } from '@angular-devkit/core';
 import { createArchitect, host } from '../utils';
 
diff --git a/packages/angular_devkit/build_angular/test/browser/poll_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/poll_spec_large.ts
index 22373d4a32ea..32859c66f38a 100644
--- a/packages/angular_devkit/build_angular/test/browser/poll_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/poll_spec_large.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { debounceTime, take, tap } from 'rxjs/operators';
 import { createArchitect, host } from '../utils';
 
diff --git a/packages/angular_devkit/build_angular/test/browser/profile_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/profile_spec_large.ts
index 6e233f574649..4be69f531df2 100644
--- a/packages/angular_devkit/build_angular/test/browser/profile_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/profile_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { BrowserBuilderOutput } from '../../src/browser';
 import { browserBuild, createArchitect, host } from '../utils';
diff --git a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
index 68f29be06949..f7b4f1ad8359 100644
--- a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
@@ -7,7 +7,7 @@
  */
 // tslint:disable:no-big-function
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { TestLogger } from '@angular-devkit/architect/testing';
 import { normalize, virtualFs } from '@angular-devkit/core';
 import { debounceTime, take, takeWhile, tap } from 'rxjs/operators';
diff --git a/packages/angular_devkit/build_angular/test/browser/replacements_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/replacements_spec_large.ts
index 1ac6e1d47efa..49e852738ea4 100644
--- a/packages/angular_devkit/build_angular/test/browser/replacements_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/replacements_spec_large.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { TestLogger } from '@angular-devkit/architect/testing';
 import { normalize, virtualFs } from '@angular-devkit/core';
 import { of, race } from 'rxjs';
diff --git a/packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts
index 149522603897..c36dca520abd 100644
--- a/packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { join, virtualFs } from '@angular-devkit/core';
 import { take, tap } from 'rxjs/operators';
 import { createArchitect, host, outputPath } from '../utils';
diff --git a/packages/angular_devkit/build_angular/test/browser/resources-output-path_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/resources-output-path_spec_large.ts
index b97b98e74335..b70abccfb927 100644
--- a/packages/angular_devkit/build_angular/test/browser/resources-output-path_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/resources-output-path_spec_large.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 // tslint:disable:no-big-function
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { normalize } from '@angular-devkit/core';
 import { browserBuild, createArchitect, host } from '../utils';
 
diff --git a/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
index ef3bef52ec20..48aa593dbdc9 100644
--- a/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { TestLogger } from '@angular-devkit/architect/testing';
 import { logging } from '@angular-devkit/core';
 import { browserBuild, createArchitect, host } from '../utils';
diff --git a/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts
index 8dbf4f267c59..07508d8fcd82 100644
--- a/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { normalize, virtualFs } from '@angular-devkit/core';
 import { createArchitect, host } from '../utils';
 
diff --git a/packages/angular_devkit/build_angular/test/browser/source-map_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/source-map_spec_large.ts
index eba5e7b25e0b..992dc61e0e04 100644
--- a/packages/angular_devkit/build_angular/test/browser/source-map_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/source-map_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { OutputHashing } from '../../src/browser/schema';
 import { browserBuild, createArchitect, host } from '../utils';
 
diff --git a/packages/angular_devkit/build_angular/test/browser/stats-json_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/stats-json_spec_large.ts
index 3328eafeff75..9ba2e899469e 100644
--- a/packages/angular_devkit/build_angular/test/browser/stats-json_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/stats-json_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { browserBuild, createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
index f715fc09a11f..5a7727aec39b 100644
--- a/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
@@ -7,7 +7,7 @@
  */
 // tslint:disable:no-big-function
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { logging, normalize, tags } from '@angular-devkit/core';
 import { browserBuild, createArchitect, host } from '../utils';
 
diff --git a/packages/angular_devkit/build_angular/test/browser/subresource-integrity_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/subresource-integrity_spec_large.ts
index 9072570abe10..6e8478439b5e 100644
--- a/packages/angular_devkit/build_angular/test/browser/subresource-integrity_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/subresource-integrity_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { browserBuild, createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/browser/svg_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/svg_spec_large.ts
index 2ead98a77499..b925fdec0e20 100644
--- a/packages/angular_devkit/build_angular/test/browser/svg_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/svg_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { createArchitect, host, outputPath } from '../utils';
 
diff --git a/packages/angular_devkit/build_angular/test/browser/tsconfig-paths_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/tsconfig-paths_spec_large.ts
index 4cdc0b667390..73553d31130b 100644
--- a/packages/angular_devkit/build_angular/test/browser/tsconfig-paths_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/tsconfig-paths_spec_large.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { browserBuild, createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/browser/vendor-chunk_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/vendor-chunk_spec_large.ts
index 8fd9084b3b78..51155b63490f 100644
--- a/packages/angular_devkit/build_angular/test/browser/vendor-chunk_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/vendor-chunk_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { browserBuild, createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts
index c787631be93e..940e5bece41b 100644
--- a/packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import * as path from 'path';
 import { browserBuild, createArchitect, host } from '../utils';
 
diff --git a/packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts
index 7ea911f2f337..46f78820cf54 100644
--- a/packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { TestLogger } from '@angular-devkit/architect/testing';
 import { join, virtualFs } from '@angular-devkit/core';
 import { debounceTime, takeWhile, tap } from 'rxjs/operators';
diff --git a/packages/angular_devkit/build_angular/test/browser/works_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/works_spec_large.ts
index 59a885581cf7..b35c1e7920c0 100644
--- a/packages/angular_devkit/build_angular/test/browser/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/works_spec_large.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { normalize } from '@angular-devkit/core';
 import { browserBuild, createArchitect, host } from '../utils';
 
diff --git a/packages/angular_devkit/build_angular/test/dev-server/deploy-url_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/deploy-url_spec_large.ts
index 90a6f36469c8..505997e6d943 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/deploy-url_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/deploy-url_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect, BuilderRun } from '@angular-devkit/architect/src/index2';
+import { Architect, BuilderRun } from '@angular-devkit/architect';
 import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
 import { DevServerBuilderOutput } from '../../src/dev-server';
 import { createArchitect, host } from '../utils';
diff --git a/packages/angular_devkit/build_angular/test/dev-server/proxy_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/proxy_spec_large.ts
index 8835dafedf48..113e255a0049 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/proxy_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/proxy_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect, BuilderRun } from '@angular-devkit/architect/src/index2';
+import { Architect, BuilderRun } from '@angular-devkit/architect';
 import * as express from 'express'; // tslint:disable-line:no-implicit-dependencies
 import * as http from 'http';
 import { AddressInfo } from 'net';
diff --git a/packages/angular_devkit/build_angular/test/dev-server/public-host_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/public-host_spec_large.ts
index 0065d1d18f6d..f764e025d51f 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/public-host_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/public-host_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect, BuilderRun } from '@angular-devkit/architect/src/index2';
+import { Architect, BuilderRun } from '@angular-devkit/architect';
 import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
 import { DevServerBuilderOutput } from '../../src/dev-server';
 import { createArchitect, host } from '../utils';
diff --git a/packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts
index 8c8a57490916..3f5781c09698 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect, BuilderRun } from '@angular-devkit/architect/src/index2';
+import { Architect, BuilderRun } from '@angular-devkit/architect';
 import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
 import { DevServerBuilderOutput } from '../../src/dev-server';
 import { createArchitect, host } from '../utils';
diff --git a/packages/angular_devkit/build_angular/test/dev-server/ssl_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/ssl_spec_large.ts
index 951508730276..e4a2abba6db0 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/ssl_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/ssl_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect, BuilderRun } from '@angular-devkit/architect/src/index2';
+import { Architect, BuilderRun } from '@angular-devkit/architect';
 import { tags } from '@angular-devkit/core';
 import * as https from 'https';
 import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
diff --git a/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts
index 8c3a98baa65e..bcf0630404f5 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect, BuilderRun } from '@angular-devkit/architect/src/index2';
+import { Architect, BuilderRun } from '@angular-devkit/architect';
 import { logging } from '@angular-devkit/core';
 import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
 import { DevServerBuilderOutput } from '../../src/dev-server';
diff --git a/packages/angular_devkit/build_angular/test/extract-i18n/works_spec_large.ts b/packages/angular_devkit/build_angular/test/extract-i18n/works_spec_large.ts
index 625722c3a8be..798c38354275 100644
--- a/packages/angular_devkit/build_angular/test/extract-i18n/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/extract-i18n/works_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { TestLogger } from '@angular-devkit/architect/testing';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { createArchitect, extractI18nTargetSpec, host } from '../utils';
diff --git a/packages/angular_devkit/build_angular/test/karma/code-coverage_spec_large.ts b/packages/angular_devkit/build_angular/test/karma/code-coverage_spec_large.ts
index 0e8685fabe86..2ab9bd95273b 100644
--- a/packages/angular_devkit/build_angular/test/karma/code-coverage_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/karma/code-coverage_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { normalize, virtualFs } from '@angular-devkit/core';
 import { createArchitect, host, karmaTargetSpec } from '../utils';
 
diff --git a/packages/angular_devkit/build_angular/test/karma/rebuilds_spec_large.ts b/packages/angular_devkit/build_angular/test/karma/rebuilds_spec_large.ts
index bba7f3144c0c..36d75c037711 100644
--- a/packages/angular_devkit/build_angular/test/karma/rebuilds_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/karma/rebuilds_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { Subject, timer } from 'rxjs';
 import {
   catchError,
diff --git a/packages/angular_devkit/build_angular/test/karma/works_spec_large.ts b/packages/angular_devkit/build_angular/test/karma/works_spec_large.ts
index 968fb113664f..81378ec39d0f 100644
--- a/packages/angular_devkit/build_angular/test/karma/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/karma/works_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { createArchitect, host, karmaTargetSpec } from '../utils';
 
 // TODO: replace this with an "it()" macro that's reusable globally.
diff --git a/packages/angular_devkit/build_angular/test/protractor/works_spec_large.ts b/packages/angular_devkit/build_angular/test/protractor/works_spec_large.ts
index 56daf266a029..2955b8f8acf4 100644
--- a/packages/angular_devkit/build_angular/test/protractor/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/protractor/works_spec_large.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { JsonObject, normalize } from '@angular-devkit/core';
 import { createArchitect, host, protractorTargetSpec } from '../utils';
 
diff --git a/packages/angular_devkit/build_angular/test/server/base_spec_large.ts b/packages/angular_devkit/build_angular/test/server/base_spec_large.ts
index a99441341ce4..471529110938 100644
--- a/packages/angular_devkit/build_angular/test/server/base_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/server/base_spec_large.ts
@@ -6,11 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Architect } from '@angular-devkit/architect/src/index2';
+import { Architect } from '@angular-devkit/architect';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { take, tap } from 'rxjs/operators';
 import { BrowserBuilderOutput } from '../../src/browser';
-import { Schema as BuildWebpackServerSchema } from '../../src/server/schema';
 import { createArchitect, host } from '../utils';
 
 
diff --git a/packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts b/packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts
index 1cc34443ee96..fb0a7acbc017 100644
--- a/packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/tslint/works_spec_large.ts
@@ -5,10 +5,9 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
+import { Architect, Target } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
-import { Architect, Target } from '@angular-devkit/architect/src/index2';
-import { TestingArchitectHost } from '@angular-devkit/architect/testing/index2';
+import { TestingArchitectHost } from '@angular-devkit/architect/testing';
 import {
   experimental,
   logging,
diff --git a/packages/angular_devkit/build_angular/test/utils.ts b/packages/angular_devkit/build_angular/test/utils.ts
index 4b785678a5f3..7ed66d410384 100644
--- a/packages/angular_devkit/build_angular/test/utils.ts
+++ b/packages/angular_devkit/build_angular/test/utils.ts
@@ -11,20 +11,18 @@ import {
   BuilderOutput,
   ScheduleOptions,
   Target,
-} from '@angular-devkit/architect/src/index2';
-import { TestProjectHost } from '@angular-devkit/architect/testing';
+} from '@angular-devkit/architect';
+import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
+import { TestProjectHost, TestingArchitectHost } from '@angular-devkit/architect/testing';
 import {
   Path,
   experimental,
   join,
   json,
-  logging,
   normalize,
   schema,
   virtualFs,
 } from '@angular-devkit/core';
-import { WorkspaceNodeModulesArchitectHost } from '../../architect/node';
-import { TestingArchitectHost } from '../../architect/testing/testing-architect-host';
 import { BrowserBuilderOutput } from '../src/browser';
 
 

From 87b04063dd4ca85858430a1c83ef24974c59bbca Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 2 Apr 2019 13:46:43 -0400
Subject: [PATCH 1067/1703] refactor(@angular-devkit/build-webpack): cleanup
 architect imports

---
 .../angular_devkit/build_webpack/src/plugins/architect.ts     | 2 +-
 .../build_webpack/src/webpack-dev-server/index.ts             | 2 +-
 .../build_webpack/src/webpack-dev-server/index_spec_large.ts  | 4 ++--
 packages/angular_devkit/build_webpack/src/webpack/index.ts    | 2 +-
 .../build_webpack/src/webpack/index_spec_large.ts             | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_webpack/src/plugins/architect.ts b/packages/angular_devkit/build_webpack/src/plugins/architect.ts
index 952874042739..4ba52d3fe436 100644
--- a/packages/angular_devkit/build_webpack/src/plugins/architect.ts
+++ b/packages/angular_devkit/build_webpack/src/plugins/architect.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { BuilderContext } from '@angular-devkit/architect/src/index2';
+import { BuilderContext } from '@angular-devkit/architect';
 import { strings } from '@angular-devkit/core';
 import * as path from 'path';
 import * as webpack from 'webpack';
diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts
index 6742e66b6ae0..c1fd3c157572 100644
--- a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { BuilderContext, createBuilder } from '@angular-devkit/architect/src/index2';
+import { BuilderContext, createBuilder } from '@angular-devkit/architect';
 import { getSystemPath, json, normalize, resolve } from '@angular-devkit/core';
 import * as net from 'net';
 import { Observable, from, of } from 'rxjs';
diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec_large.ts b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec_large.ts
index 96211d6886b3..dc5faf4be431 100644
--- a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec_large.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec_large.ts
@@ -5,9 +5,9 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import { Architect } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
-import { Architect } from '@angular-devkit/architect/src/index2';
-import { TestingArchitectHost } from '@angular-devkit/architect/testing/index2';
+import { TestingArchitectHost } from '@angular-devkit/architect/testing';
 import { experimental, normalize, schema } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as fs from 'fs';
diff --git a/packages/angular_devkit/build_webpack/src/webpack/index.ts b/packages/angular_devkit/build_webpack/src/webpack/index.ts
index a77b9a9a6188..73c4abcd6886 100644
--- a/packages/angular_devkit/build_webpack/src/webpack/index.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack/index.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect/src/index2';
+import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
 import { getSystemPath, json, normalize, resolve } from '@angular-devkit/core';
 import { Observable, from, of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
diff --git a/packages/angular_devkit/build_webpack/src/webpack/index_spec_large.ts b/packages/angular_devkit/build_webpack/src/webpack/index_spec_large.ts
index a010c5615426..114bc56fc6cb 100644
--- a/packages/angular_devkit/build_webpack/src/webpack/index_spec_large.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack/index_spec_large.ts
@@ -5,13 +5,13 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import { Architect } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
+import { TestingArchitectHost } from '@angular-devkit/architect/testing';
 import { experimental, join, normalize, schema } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as fs from 'fs';
 import * as path from 'path';
-import { Architect } from '../../../architect/src/architect';
-import { TestingArchitectHost } from '../../../architect/testing/testing-architect-host';
 import { BuildResult } from './index';
 
 const devkitRoot = (global as any)._DevKitRoot; // tslint:disable-line:no-any

From 19cb35473f3aeb089e9c71fcca2679af991aa2fb Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 2 Apr 2019 19:28:08 +0200
Subject: [PATCH 1068/1703] refactor: don't drop zone.js from polyfills

We don't know yet if we are going to separate zone.js in a separate file. Hence, we should remove this for the time being and include it only when we remove zone.js from the main polyfills files
---
 .../angular/migrations/update-8/drop-es6-polyfills.ts         | 1 -
 .../angular/migrations/update-8/drop-es6-polyfills_spec.ts    | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts b/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts
index 7290c1a27ca6..7ae0c08595fa 100644
--- a/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts
+++ b/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts
@@ -22,7 +22,6 @@ const toDrop: {[importName: string]: true} = {
   'core-js/es6/array': true,
   'core-js/es6/regexp': true,
   'core-js/es6/map': true,
-  'zone.js/dist/zone': true,
   'core-js/es6/set': true,
 };
 
diff --git a/packages/schematics/angular/migrations/update-8/drop-es6-polyfills_spec.ts b/packages/schematics/angular/migrations/update-8/drop-es6-polyfills_spec.ts
index 48734de700d9..320847061ae1 100644
--- a/packages/schematics/angular/migrations/update-8/drop-es6-polyfills_spec.ts
+++ b/packages/schematics/angular/migrations/update-8/drop-es6-polyfills_spec.ts
@@ -80,8 +80,8 @@ import 'zone.js/dist/zone'; // Included with Angular CLI.
       const polyfills = tree.readContent(polyfillsPath);
       expect(polyfills).not.toContain('core-js/es6/symbol');
       expect(polyfills).not.toContain('core-js/es6/set');
-      expect(polyfills).not.toContain('zone.js');
-      expect(polyfills).not.toContain('Zone');
+      expect(polyfills).toContain('zone.js');
+      expect(polyfills).toContain('Zone');
 
       // We don't want to drop this commented import comments
       expect(polyfills).toContain('core-js/es6/reflect');

From 05d86aebb9952716035ecafa8c5c509300bce8b3 Mon Sep 17 00:00:00 2001
From: Minko Gechev <mgechev@google.com>
Date: Wed, 3 Apr 2019 17:51:37 +0200
Subject: [PATCH 1069/1703] build: pin tslint-sonarts

---
 package.json                 | 2 +-
 scripts/validate-licenses.ts | 2 +-
 yarn.lock                    | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index d1afc97654d7..f36173a1b700 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,7 @@
     "tree-kill": "^1.2.0",
     "ts-node": "^5.0.0",
     "tslint-no-circular-imports": "^0.6.0",
-    "tslint-sonarts": "^1.7.0"
+    "tslint-sonarts": "1.9.0"
   },
   "husky": {
     "hooks": {
diff --git a/scripts/validate-licenses.ts b/scripts/validate-licenses.ts
index 42f9233980f2..2aaa0478804c 100644
--- a/scripts/validate-licenses.ts
+++ b/scripts/validate-licenses.ts
@@ -65,7 +65,7 @@ const ignoredPackages = [
   '@angular/devkit-repo@0.0.0',  // Hey, that's us!
   // * Development only
   'spdx-license-ids@3.0.1',  // CC0 but it's content only (index.json, no code) and not distributed.
-  'tslint-sonarts@1.8.0', // LGPL-3.0 but only used as a tool, not linked in the build.
+  'tslint-sonarts@1.9.0', // LGPL-3.0 but only used as a tool, not linked in the build.
 
   // * Broken license fields
   'bitsyntax@0.0.4', // MIT but no license field in package.json
diff --git a/yarn.lock b/yarn.lock
index 172acc255f62..c65bd00f9fcf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9267,10 +9267,10 @@ tslint-no-circular-imports@^0.6.0:
   resolved "https://registry.yarnpkg.com/tslint-no-circular-imports/-/tslint-no-circular-imports-0.6.1.tgz#a91358395a81c067bf104a641f269655057715cd"
   integrity sha512-XuRgHZKFu6dv7fm/tuilmvynLHgtCTd63/p3744dYVEpnMExp2Jd9IwTiBOGmy5bUDlpTy117vtBcLd028RsBA==
 
-tslint-sonarts@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/tslint-sonarts/-/tslint-sonarts-1.8.0.tgz#80f2e8addd418c3b8807fc0155dec33b5a81e8d1"
-  integrity sha512-tpijO5VR18e+Ny99uMNNov3Hw7diiYQ8KoJkezpHGw9hSFFrO5g2PhwdQQo7O9puhJKMIutLl9g+ICMgg+bh0w==
+tslint-sonarts@1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/tslint-sonarts/-/tslint-sonarts-1.9.0.tgz#feb593e92db328c0328b430b838adbe65d504de9"
+  integrity sha512-CJWt+IiYI8qggb2O/JPkS6CkC5DY1IcqRsm9EHJ+AxoWK70lvtP7jguochyNDMP2vIz/giGdWCfEM39x/I/Vnw==
   dependencies:
     immutable "^3.8.2"
 

From be0c3d5af6a6f24d4321dbbd9f6d1205971d6817 Mon Sep 17 00:00:00 2001
From: Stephen Fluin <stephen.fluin@gmail.com>
Date: Wed, 3 Apr 2019 09:33:11 -0700
Subject: [PATCH 1070/1703] fix(@angular/cli): improve opt-out language

---
 packages/angular/cli/models/analytics.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular/cli/models/analytics.ts b/packages/angular/cli/models/analytics.ts
index 1bd8dc2e1947..bf5132f4f487 100644
--- a/packages/angular/cli/models/analytics.ts
+++ b/packages/angular/cli/models/analytics.ts
@@ -378,7 +378,7 @@ export async function promptGlobalAnalytics(force = false) {
     if (answers.analytics) {
       console.log('');
       console.log(tags.stripIndent`
-        Thank you for sharing anonymous usage data. Would you change your mind, the following
+        Thank you for sharing anonymous usage data. If you change your mind, the following
         command will disable this feature entirely:
 
             ${terminal.yellow('ng analytics off')}

From a5dd1de64bfd98c40f8aae802b7bd7d7f4d78573 Mon Sep 17 00:00:00 2001
From: Minko Gechev <mgechev@google.com>
Date: Thu, 4 Apr 2019 01:32:34 +0200
Subject: [PATCH 1071/1703] release: v8.0.0-beta.11

---
 packages/schematics/angular/utility/latest-versions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 5e2c5d9d42dd..1492c9cd78ba 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -8,7 +8,7 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~8.0.0-beta.10',
+  Angular: '~8.0.0-beta.11',
   RxJs: '~6.4.0',
   ZoneJs: '~0.9.0',
   TypeScript: '~3.3.3333',

From d917c7bca609de1d1c97ebe7ce4a72f0915ef492 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 4 Apr 2019 10:53:33 +0200
Subject: [PATCH 1072/1703] build: update to angular version 8.0.0-beta.11

---
 package.json                                  |  4 +-
 .../angular_devkit/build_angular/package.json | 21 +++--
 .../build_ng_packagr/package.json             |  4 +-
 packages/ngtools/webpack/package.json         |  4 +-
 yarn.lock                                     | 87 +++++++++----------
 5 files changed, 56 insertions(+), 64 deletions(-)

diff --git a/package.json b/package.json
index f36173a1b700..e81b60cf212f 100644
--- a/package.json
+++ b/package.json
@@ -77,8 +77,8 @@
     "typescript": "3.3.4000"
   },
   "devDependencies": {
-    "@angular/compiler": "^8.0.0-beta.10",
-    "@angular/compiler-cli": "^8.0.0-beta.10",
+    "@angular/compiler": "^8.0.0-beta.11",
+    "@angular/compiler-cli": "^8.0.0-beta.11",
     "@bazel/karma": "~0.26.0",
     "@bazel/typescript": "~0.26.0",
     "@ngtools/json-schema": "^1.1.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 17b819f6d1f6..7354857523c7 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -55,19 +55,18 @@
     "worker-plugin": "3.1.0"
   },
   "devDependencies": {
-    "@angular/animations": "^8.0.0-beta.10",
+    "@angular/animations": "^8.0.0-beta.11",
     "@angular/cdk": "^7.3.4",
-    "@angular/common": "^8.0.0-beta.10",
-    "@angular/compiler": "^8.0.0-beta.10",
-    "@angular/compiler-cli": "^8.0.0-beta.10",
-    "@angular/core": "^8.0.0-beta.10",
-    "@angular/http": "^8.0.0-beta.10",
+    "@angular/common": "^8.0.0-beta.11",
+    "@angular/compiler": "^8.0.0-beta.11",
+    "@angular/compiler-cli": "^8.0.0-beta.11",
+    "@angular/core": "^8.0.0-beta.11",
     "@angular/material": "^7.3.4",
-    "@angular/platform-browser": "^8.0.0-beta.10",
-    "@angular/platform-browser-dynamic": "^8.0.0-beta.10",
-    "@angular/platform-server": "^8.0.0-beta.10",
-    "@angular/router": "^8.0.0-beta.10",
-    "@angular/service-worker": "^8.0.0-beta.10",
+    "@angular/platform-browser": "^8.0.0-beta.11",
+    "@angular/platform-browser-dynamic": "^8.0.0-beta.11",
+    "@angular/platform-server": "^8.0.0-beta.11",
+    "@angular/router": "^8.0.0-beta.11",
+    "@angular/service-worker": "^8.0.0-beta.11",
     "codelyzer": "^5.0.0",
     "core-js": "^2.4.1",
     "bootstrap": "^4.0.0",
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index 84c798e07535..8e235d6d97ce 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -14,8 +14,8 @@
     "ng-packagr": "^4.0.0 || ^5.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "^8.0.0-beta.10",
-    "@angular/compiler-cli": "^8.0.0-beta.10",
+    "@angular/compiler": "^8.0.0-beta.11",
+    "@angular/compiler-cli": "^8.0.0-beta.11",
     "@angular-devkit/core": "0.0.0",
     "ng-packagr": "^5.0.1",
     "tslib": "^1.9.0"
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 2eaf908ddda4..1c3161d396df 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -33,8 +33,8 @@
     "webpack": "^4.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "^8.0.0-beta.10",
-    "@angular/compiler-cli": "^8.0.0-beta.10",
+    "@angular/compiler": "^8.0.0-beta.11",
+    "@angular/compiler-cli": "^8.0.0-beta.11",
     "typescript": "3.3.4000",
     "webpack": "4.29.6"
   }
diff --git a/yarn.lock b/yarn.lock
index c65bd00f9fcf..9be0ce1d2c19 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@angular/animations@^8.0.0-beta.10":
-  version "8.0.0-beta.10"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0-beta.10.tgz#7f053d57ee242a162cd4e8422032656646b5c8d6"
-  integrity sha512-Imum1d47Yd2FBfDPt1xUI0ZNsHq/H8S2uAPFlj6tRg0+ZnAKwdO0b0XOiTKSpgrnrTd895aGjRzzSg7lertszw==
+"@angular/animations@^8.0.0-beta.11":
+  version "8.0.0-beta.11"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0-beta.11.tgz#640016e9fdf94c4ac685bb1caf0e921e057827bd"
+  integrity sha512-6wH0danPVxen1WleMQy6fWiA+KwRAJmSmZo7gNC6ptZDw2LMrJRpYDsQse6IkFMJ6dVy8eBezlX+asXdGD1dgA==
   dependencies:
     tslib "^1.9.0"
 
@@ -18,17 +18,17 @@
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/common@^8.0.0-beta.10":
-  version "8.0.0-beta.10"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0-beta.10.tgz#9f23ea67a24234cdcd86612227a6ff411479cd67"
-  integrity sha512-L/tnuPTQvdoDGqBizaPN51lTOzK0zPsQDx0uAi7CKM+97nfc1qOlqwYzEh8rnJ1Rad4dbPEwtflpYRmlvqCmoQ==
+"@angular/common@^8.0.0-beta.11":
+  version "8.0.0-beta.11"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0-beta.11.tgz#045219d33c1225650fef8e52bec5d4781add742e"
+  integrity sha512-lVc9BkyInpgg9ivi7KRRgikYcrlAr5ew0NomkThDbwMhH7oQ/b0ymmOqSpo/PeZBt2UwdVLWhnWb1kObOcWMjQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^8.0.0-beta.10":
-  version "8.0.0-beta.10"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0-beta.10.tgz#29ae5d5ba426026dec57681f8de0e45e4e149cc2"
-  integrity sha512-t0Ru/dvVve8ZXt16vJlCG8KuH00BM5ilZjnT1EYv4mgf2Yhn23e8vbmS098a6Xmm3MWryp/2nmab0Lu/fHJV5A==
+"@angular/compiler-cli@^8.0.0-beta.11":
+  version "8.0.0-beta.11"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0-beta.11.tgz#4a57754a62a6f52954f5b7ec78103e6890f54a63"
+  integrity sha512-KFDrSREOWozYOCA3y//pg1ndoB/sdzomQ7VzdzLtcq0UPZZm9Q7Tt7BIyVK55kVqQppDh+IikilZtTBNd5gsYg==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -42,24 +42,17 @@
     tslib "^1.9.0"
     yargs "9.0.1"
 
-"@angular/compiler@^8.0.0-beta.10":
-  version "8.0.0-beta.10"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0-beta.10.tgz#58867d30c17f2265ff25c1bffbb9e8c38d88684a"
-  integrity sha512-BBcspibJ4iB4JwFXz+NT/8QVbMR8Dcl+Kn3Q/ZRiDEi57KlongagBNqX2Ve1oVQ7xHooVEz0hSUeF7v9+iipew==
+"@angular/compiler@^8.0.0-beta.11":
+  version "8.0.0-beta.11"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0-beta.11.tgz#de129b5e687e56ddcafb2ca801abd49678dbc694"
+  integrity sha512-5YiY5g7z+uKCid3UilwjluG0l1J8au9B5VsX5GNiK4NfHkKxbW0OjGgAIl193GUShHh2DWfWNTtFgS1SE9qISw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^8.0.0-beta.10":
-  version "8.0.0-beta.10"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0-beta.10.tgz#157f0ca07760d43ea92a347cf65e8d8a70e042df"
-  integrity sha512-Z5jUS++z9uynIha/Xgy+4COo8utAEpMg9rHN7Ha+J9SXRjpdu9iSCdTQAZrHqIMGSq89MjWl5ZN/1u5txm/ICQ==
-  dependencies:
-    tslib "^1.9.0"
-
-"@angular/http@^8.0.0-beta.10":
-  version "8.0.0-beta.10"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-8.0.0-beta.10.tgz#3d30c98aa64603daa3fc5675413c2dc3da3868b2"
-  integrity sha512-NV2TGnrpivJvOa4/1O/GQfFocPSib4NUieh2umNpJYa2CYjyYfgWpmh+0wDqh23ThPPxRufywZQkkSeb+X9PRA==
+"@angular/core@^8.0.0-beta.11":
+  version "8.0.0-beta.11"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0-beta.11.tgz#45cb92700e9314bdc816cb36e6f541071cc5a3bd"
+  integrity sha512-V6bplO1FlU4T3ieDUNqjst+cmJqVXh/bWYuCowoKAojhu10zLQVlqqTWL5BsCQepU2XWLXNw6VrV1RkmE6drZQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -70,40 +63,40 @@
   dependencies:
     tslib "^1.7.1"
 
-"@angular/platform-browser-dynamic@^8.0.0-beta.10":
-  version "8.0.0-beta.10"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0-beta.10.tgz#bb32819dae8aeb430fe247cbbe30dcab8ae9f455"
-  integrity sha512-1GJdG766uuYx7NkA2aJ4pf/ennsaq0LT+nyM+h79nvsDxqVJA6A3Jq4JQm/mL/VdEr5zIHHiYafERhKWCKGMtw==
+"@angular/platform-browser-dynamic@^8.0.0-beta.11":
+  version "8.0.0-beta.11"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0-beta.11.tgz#d4fc103652bf92a2adfb5d308ea4e0273f081f3a"
+  integrity sha512-/m7c8YgKPkCuQWvpIwSYMtG8szTVUFi4JrKuLXhL0IWJzVdUnn9irZi/PQ5KnzJqMWJYF9NTb+ySzVRZZQoMMQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^8.0.0-beta.10":
-  version "8.0.0-beta.10"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0-beta.10.tgz#0faa0ebedcc5e7e0009e8560112f7b43eff7bca5"
-  integrity sha512-+Ic5vtBZNiFjq/tLwKEmsQ46/lBJeiOWiFwmktCQRjodkPnOiGwkryoynx7yx05A3ZB0pYignkjJPdtkPVySwA==
+"@angular/platform-browser@^8.0.0-beta.11":
+  version "8.0.0-beta.11"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0-beta.11.tgz#07deab925e0d64756ae63e83a33e4540278fafeb"
+  integrity sha512-fdgwjIKJ9unvj49jIBad56OfZKOJT11RjsDOFhJvKAI88se8WvW/gDL3D0g8U2qP4zEphpvutO3ThrZ7PbgtMw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-server@^8.0.0-beta.10":
-  version "8.0.0-beta.10"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.0.0-beta.10.tgz#0fc6914b9a9ecb97788a564b0db5e87843c6cc55"
-  integrity sha512-1l+kB6Kgvdo+cGDI6G9NK21v3bam5++Vwmdp3ww7VkBHwEKx6a+3vAIrgO8tobYzIK/hy8HFLqkelUJQK4dW3Q==
+"@angular/platform-server@^8.0.0-beta.11":
+  version "8.0.0-beta.11"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.0.0-beta.11.tgz#527e616f30ed89b4a2f5227928be32060a4c5756"
+  integrity sha512-chndPxfx1Hd+l7Tq4UtHfWQrgsnC/WoH/0ML+9W4jCGATtcBNFc6ogE4aK1PgqekFZv2e4bMMpBA5Jxsn4wCvA==
   dependencies:
     domino "^2.1.2"
     tslib "^1.9.0"
     xhr2 "^0.1.4"
 
-"@angular/router@^8.0.0-beta.10":
-  version "8.0.0-beta.10"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0-beta.10.tgz#387e9e68eee27bc416dc4d66b87d60ae5c4ef70d"
-  integrity sha512-LskdWFbMvxNPwzcvl6esxl1LQ6Q4qupEGVJ7e4Tc9QlbzrULnyDTomLJFkDwk1zm+QLxz0JMiXWlfM81RA0uXg==
+"@angular/router@^8.0.0-beta.11":
+  version "8.0.0-beta.11"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0-beta.11.tgz#b50faa1e238e1d56967c2ae03bee3b5fd1ee6c79"
+  integrity sha512-n6o90rveQlyj34BNuXAOKtNXCHb75hOcX0pgvqzKrIkthpXVWY8nE475OmYsxZ7MYsT3BhZg0wK5b05wLl2KeQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@^8.0.0-beta.10":
-  version "8.0.0-beta.10"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.0.0-beta.10.tgz#ca43a09eaa3921da5d4beb75f99c5c4d6712996b"
-  integrity sha512-4EEecMQepAWw7mvCbtit7GMGi8REcn3VKAPTs9kuRcAdmGHpDy0X+SHdrxIW1Hd9s/ZR+Hi99edZyau4pluDHg==
+"@angular/service-worker@^8.0.0-beta.11":
+  version "8.0.0-beta.11"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.0.0-beta.11.tgz#4c23aee3927e9bcadb4ef1490055799e2da905e0"
+  integrity sha512-0pWo87/iPEsfujJsGKUnRDGppd5usoKO20LcyUw+bChBcDgYDKq7XTdyoGWSBIt2uQR1DZD6odSq3E4ONx4YQw==
   dependencies:
     tslib "^1.9.0"
 

From 6da5ee0dffed3bb9b7d8d0d8bed57f616ea9d632 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 4 Apr 2019 10:53:51 +0200
Subject: [PATCH 1073/1703] test: fix e2e that depend on @angular/http

---
 .../e2e/tests/build/build-app-shell-with-schematic.ts         | 4 ----
 tests/legacy-cli/e2e/tests/build/build-app-shell.ts           | 3 ---
 tests/legacy-cli/e2e/tests/build/platform-server.ts           | 4 ----
 3 files changed, 11 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts b/tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts
index 001eb29e9a4a..8d7427651c71 100644
--- a/tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts
+++ b/tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts
@@ -13,11 +13,9 @@ export default function () {
   }
 
   let platformServerVersion = readNgVersion();
-  let httpVersion = readNgVersion();
 
   if (getGlobalVariable('argv')['ng-snapshots']) {
     platformServerVersion = 'github:angular/platform-server-builds';
-    httpVersion = 'github:angular/http-builds';
   }
 
 
@@ -30,8 +28,6 @@ export default function () {
     .then(() => updateJsonFile('package.json', packageJson => {
       const dependencies = packageJson['dependencies'];
       dependencies['@angular/platform-server'] = platformServerVersion;
-      // ServerModule depends on @angular/http regardless the app's dependency.
-      dependencies['@angular/http'] = httpVersion;
     })
     .then(() => npm('install'))
     .then(() => ng('build', '--optimization'))
diff --git a/tests/legacy-cli/e2e/tests/build/build-app-shell.ts b/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
index 8292aff13260..d98f7433556f 100644
--- a/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
+++ b/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
@@ -16,7 +16,6 @@ export default function() {
 
   if (getGlobalVariable('argv')['ng-snapshots']) {
     platformServerVersion = 'github:angular/platform-server-builds';
-    httpVersion = 'github:angular/http-builds';
   }
 
   return Promise.resolve()
@@ -158,8 +157,6 @@ export default function() {
       updateJsonFile('package.json', packageJson => {
         const dependencies = packageJson['dependencies'];
         dependencies['@angular/platform-server'] = platformServerVersion;
-        // ServerModule depends on @angular/http regardless the app's dependency.
-        dependencies['@angular/http'] = httpVersion;
       }).then(() => npm('install')),
     )
     .then(() => ng('run', 'test-project:app-shell'))
diff --git a/tests/legacy-cli/e2e/tests/build/platform-server.ts b/tests/legacy-cli/e2e/tests/build/platform-server.ts
index 0440ffbeaccb..43653ed88029 100644
--- a/tests/legacy-cli/e2e/tests/build/platform-server.ts
+++ b/tests/legacy-cli/e2e/tests/build/platform-server.ts
@@ -7,11 +7,9 @@ import { readNgVersion } from '../../utils/version';
 
 export default function() {
   let platformServerVersion = readNgVersion();
-  let httpVersion = readNgVersion();
 
   if (getGlobalVariable('argv')['ng-snapshots']) {
     platformServerVersion = 'github:angular/platform-server-builds';
-    httpVersion = 'github:angular/http-builds';
   }
 
   // Skip this test in Angular 2/4.
@@ -25,8 +23,6 @@ export default function() {
         updateJsonFile('package.json', packageJson => {
           const dependencies = packageJson['dependencies'];
           dependencies['@angular/platform-server'] = platformServerVersion;
-          // ServerModule depends on @angular/http regardless the app's dependency.
-          dependencies['@angular/http'] = httpVersion;
         }),
       )
       .then(() =>

From 64c993aebb6328f55fe468efeadd6c479b3a2c22 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 4 Apr 2019 10:55:48 +0200
Subject: [PATCH 1074/1703] feat(@schematics/angular): stop adding
 `@angular/http` dependency when running universal schematic

`@angular/platform-server` is no longer dependent on
`@angular/http`

More info: https://github.com/angular/angular/commit/9745f55
---
 packages/schematics/angular/universal/index.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/schematics/angular/universal/index.ts b/packages/schematics/angular/universal/index.ts
index 7ed9a952ad5a..8b015b968332 100644
--- a/packages/schematics/angular/universal/index.ts
+++ b/packages/schematics/angular/universal/index.ts
@@ -208,12 +208,7 @@ function addDependencies(): Rule {
       ...coreDep,
       name: '@angular/platform-server',
     };
-    const httpDep = {
-      ...coreDep,
-      name: '@angular/http',
-    };
     addPackageJsonDependency(host, platformServerDep);
-    addPackageJsonDependency(host, httpDep);
 
     return host;
   };

From a5bdddb862575f112343f21b89011fbf91b5260b Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 4 Apr 2019 15:27:23 +0200
Subject: [PATCH 1075/1703] test: change large specs to not use `@angular/http`

---
 .../test/browser/lazy-module_spec_large.ts     |  8 ++++----
 .../test/karma/works_spec_large.ts             | 18 ++++++++----------
 .../angular_devkit/build_angular/test/utils.ts |  2 --
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
index 3117e748b739..45777f31eaf5 100644
--- a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
@@ -112,8 +112,8 @@ describe('Browser Builder lazy modules', () => {
 
   it(`supports making a common bundle for shared lazy modules`, async () => {
     host.writeMultipleFiles({
-      'src/one.ts': `import * as http from '@angular/http'; console.log(http);`,
-      'src/two.ts': `import * as http from '@angular/http'; console.log(http);`,
+      'src/one.ts': `import * as http from '@angular/common/http'; console.log(http);`,
+      'src/two.ts': `import * as http from '@angular/common/http'; console.log(http);`,
       'src/main.ts': `import('./one'); import('./two');`,
     });
     host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
@@ -127,8 +127,8 @@ describe('Browser Builder lazy modules', () => {
 
   it(`supports disabling the common bundle`, async () => {
     host.writeMultipleFiles({
-      'src/one.ts': `import * as http from '@angular/http'; console.log(http);`,
-      'src/two.ts': `import * as http from '@angular/http'; console.log(http);`,
+      'src/one.ts': `import * as http from '@angular/common/http'; console.log(http);`,
+      'src/two.ts': `import * as http from '@angular/common/http'; console.log(http);`,
       'src/main.ts': `import('./one'); import('./two');`,
     });
     host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
diff --git a/packages/angular_devkit/build_angular/test/karma/works_spec_large.ts b/packages/angular_devkit/build_angular/test/karma/works_spec_large.ts
index 81378ec39d0f..131ee7a9ae71 100644
--- a/packages/angular_devkit/build_angular/test/karma/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/karma/works_spec_large.ts
@@ -72,14 +72,12 @@ describe('Karma Builder', () => {
        `,
       'src/app/app.component.spec.ts': `
         import { TestBed, async } from '@angular/core/testing';
-        import { HttpModule } from '@angular/http';
         import { AppComponent } from './app.component';
 
         describe('AppComponent', () => {
           beforeEach(async(() => {
             TestBed.configureTestingModule({
               imports: [
-                HttpModule
               ],
               declarations: [
                 AppComponent
@@ -114,7 +112,7 @@ describe('Karma Builder', () => {
       'src/app/app.module.ts': `
         import { BrowserModule } from '@angular/platform-browser';
         import { NgModule } from '@angular/core';
-        import { HttpModule } from '@angular/http';
+        import { HttpClientModule } from '@angular/common/http';
         import { AppComponent } from './app.component';
 
         @NgModule({
@@ -123,7 +121,7 @@ describe('Karma Builder', () => {
           ],
           imports: [
             BrowserModule,
-            HttpModule
+            HttpClientModule
           ],
           providers: [],
           bootstrap: [AppComponent]
@@ -132,7 +130,7 @@ describe('Karma Builder', () => {
       `,
       'src/app/app.component.ts': `
         import { Component } from '@angular/core';
-        import { Http, Response } from '@angular/http';
+        import { HttpClient } from '@angular/common/http';
 
         @Component({
           selector: 'app-root',
@@ -146,21 +144,21 @@ describe('Karma Builder', () => {
             { path: './folder/folder-asset.txt', content: '' },
             { path: './output-folder/output-asset.txt', content: '' },
           ];
-          constructor(private http: Http) {
-            this.assets.forEach(asset => http.get(asset.path)
-              .subscribe(res => asset.content = res['_body']));
+          constructor(private http: HttpClient) {
+            this.assets.forEach(asset => http.get(asset.path, { responseType: 'text' })
+              .subscribe(res => asset.content = res));
           }
         }`,
       'src/app/app.component.spec.ts': `
         import { TestBed, async } from '@angular/core/testing';
-        import { HttpModule } from '@angular/http';
+        import { HttpClientModule } from '@angular/common/http';
         import { AppComponent } from './app.component';
 
         describe('AppComponent', () => {
           beforeEach(async(() => {
             TestBed.configureTestingModule({
               imports: [
-                HttpModule
+                HttpClientModule
               ],
               declarations: [
                 AppComponent
diff --git a/packages/angular_devkit/build_angular/test/utils.ts b/packages/angular_devkit/build_angular/test/utils.ts
index 7ed66d410384..c77a607625c9 100644
--- a/packages/angular_devkit/build_angular/test/utils.ts
+++ b/packages/angular_devkit/build_angular/test/utils.ts
@@ -142,7 +142,6 @@ export const lazyModuleImport: { [path: string]: string } = {
   'src/app/app.module.ts': `
     import { BrowserModule } from '@angular/platform-browser';
     import { NgModule } from '@angular/core';
-    import { HttpModule } from '@angular/http';
 
     import { AppComponent } from './app.component';
     import { RouterModule } from '@angular/router';
@@ -153,7 +152,6 @@ export const lazyModuleImport: { [path: string]: string } = {
       ],
       imports: [
         BrowserModule,
-        HttpModule,
         RouterModule.forRoot([
           { path: 'lazy', loadChildren: './lazy/lazy.module#LazyModule' }
         ])

From 246abb39359259aebb2e7bac9836db6489f20fe6 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 25 Mar 2019 18:45:16 -0400
Subject: [PATCH 1076/1703] feat(@angular-devkit/build-angular): update to
 core-js 3

Fixes  #13954
---
 .../angular_devkit/build_angular/package.json |  2 +-
 .../models/es2015-polyfills.js                | 22 -----
 ...-jit-polyfills.js => es5-jit-polyfills.js} |  2 +-
 .../angular-cli-files/models/es5-polyfills.js | 94 +++++++++++++++++++
 .../angular-cli-files/models/jit-polyfills.js |  2 +-
 .../models/webpack-configs/common.ts          |  4 +-
 .../ng-packaged/projects/lib/src/test.ts      |  1 -
 .../assets/webpack/test-app-ng5/app/main.ts   |  2 +-
 .../assets/webpack/test-app-ng5/package.json  |  2 +-
 .../not/so/source/app/main.jit.ts             |  2 +-
 .../webpack/test-app-weird-ng5/package.json   |  2 +-
 .../webpack/test-server-app-ng5/app/main.ts   |  2 +-
 .../webpack/test-server-app-ng5/package.json  |  2 +-
 tests/legacy-cli/e2e/tests/build/polyfills.ts |  4 +-
 .../e2e/tests/packages/webpack/test-ng5.ts    |  6 +-
 yarn.lock                                     |  7 +-
 16 files changed, 116 insertions(+), 40 deletions(-)
 delete mode 100644 packages/angular_devkit/build_angular/src/angular-cli-files/models/es2015-polyfills.js
 rename packages/angular_devkit/build_angular/src/angular-cli-files/models/{es2015-jit-polyfills.js => es5-jit-polyfills.js} (87%)
 create mode 100644 packages/angular_devkit/build_angular/src/angular-cli-files/models/es5-polyfills.js

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 7354857523c7..41b85bc4c66c 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -17,6 +17,7 @@
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.2",
+    "core-js": "3.0.0",
     "file-loader": "3.0.1",
     "glob": "7.1.3",
     "istanbul-instrumenter-loader": "3.0.1",
@@ -68,7 +69,6 @@
     "@angular/router": "^8.0.0-beta.11",
     "@angular/service-worker": "^8.0.0-beta.11",
     "codelyzer": "^5.0.0",
-    "core-js": "^2.4.1",
     "bootstrap": "^4.0.0",
     "font-awesome": "^4.7.0",
     "jquery": "^3.3.1",
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/es2015-polyfills.js b/packages/angular_devkit/build_angular/src/angular-cli-files/models/es2015-polyfills.js
deleted file mode 100644
index 354326535a52..000000000000
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/es2015-polyfills.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import 'core-js/es6/symbol';
-import 'core-js/es6/object';
-import 'core-js/es6/function';
-import 'core-js/es6/parse-int';
-import 'core-js/es6/parse-float';
-import 'core-js/es6/number';
-import 'core-js/es6/math';
-import 'core-js/es6/string';
-import 'core-js/es6/date';
-import 'core-js/es6/array';
-import 'core-js/es6/regexp';
-import 'core-js/es6/map';
-import 'core-js/es6/weak-map';
-import 'core-js/es6/set';
-import 'core-js/es6/promise';
\ No newline at end of file
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/es2015-jit-polyfills.js b/packages/angular_devkit/build_angular/src/angular-cli-files/models/es5-jit-polyfills.js
similarity index 87%
rename from packages/angular_devkit/build_angular/src/angular-cli-files/models/es2015-jit-polyfills.js
rename to packages/angular_devkit/build_angular/src/angular-cli-files/models/es5-jit-polyfills.js
index 0e68685db11f..febcbb5329c9 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/es2015-jit-polyfills.js
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/es5-jit-polyfills.js
@@ -5,4 +5,4 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import 'core-js/es6/reflect';
+import 'core-js/es/reflect';
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/es5-polyfills.js b/packages/angular_devkit/build_angular/src/angular-cli-files/models/es5-polyfills.js
new file mode 100644
index 000000000000..2df88d889937
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/es5-polyfills.js
@@ -0,0 +1,94 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+ // ES2015 symbol capabilities
+import 'core-js/modules/es.symbol';
+
+// ES2015 function capabilities
+import 'core-js/modules/es.function.bind';
+import 'core-js/modules/es.function.name';
+import 'core-js/modules/es.function.has-instance';
+
+// ES2015 object capabilities
+import 'core-js/modules/es.object.create';
+import 'core-js/modules/es.object.define-property';
+import 'core-js/modules/es.object.define-properties';
+import 'core-js/modules/es.object.get-own-property-descriptor';
+import 'core-js/modules/es.object.get-prototype-of';
+import 'core-js/modules/es.object.keys';
+import 'core-js/modules/es.object.get-own-property-names';
+import 'core-js/modules/es.object.freeze';
+import 'core-js/modules/es.object.seal';
+import 'core-js/modules/es.object.prevent-extensions';
+import 'core-js/modules/es.object.is-frozen';
+import 'core-js/modules/es.object.is-sealed';
+import 'core-js/modules/es.object.is-extensible';
+import 'core-js/modules/es.object.assign';
+import 'core-js/modules/es.object.is';
+import 'core-js/modules/es.object.set-prototype-of';
+import 'core-js/modules/es.object.to-string';
+
+// ES2015 array capabilities
+import 'core-js/modules/es.array.is-array';
+import 'core-js/modules/es.array.from';
+import 'core-js/modules/es.array.of';
+import 'core-js/modules/es.array.join';
+import 'core-js/modules/es.array.slice';
+import 'core-js/modules/es.array.sort';
+import 'core-js/modules/es.array.for-each';
+import 'core-js/modules/es.array.map';
+import 'core-js/modules/es.array.filter';
+import 'core-js/modules/es.array.some';
+import 'core-js/modules/es.array.every';
+import 'core-js/modules/es.array.reduce';
+import 'core-js/modules/es.array.reduce-right';
+import 'core-js/modules/es.array.index-of';
+import 'core-js/modules/es.array.last-index-of';
+import 'core-js/modules/es.array.copy-within';
+import 'core-js/modules/es.array.fill';
+import 'core-js/modules/es.array.find';
+import 'core-js/modules/es.array.find-index';
+import 'core-js/modules/es.array.iterator';
+
+// ES2015 string capabilities
+import 'core-js/modules/es.string.from-code-point';
+import 'core-js/modules/es.string.raw';
+import 'core-js/modules/es.string.trim';
+import 'core-js/modules/es.string.iterator';
+import 'core-js/modules/es.string.code-point-at';
+import 'core-js/modules/es.string.ends-with';
+import 'core-js/modules/es.string.includes';
+import 'core-js/modules/es.string.repeat';
+import 'core-js/modules/es.string.starts-with';
+import 'core-js/modules/es.string.anchor';
+import 'core-js/modules/es.string.big';
+import 'core-js/modules/es.string.blink';
+import 'core-js/modules/es.string.bold';
+import 'core-js/modules/es.string.fixed';
+import 'core-js/modules/es.string.fontcolor';
+import 'core-js/modules/es.string.fontsize';
+import 'core-js/modules/es.string.italics';
+import 'core-js/modules/es.string.link';
+import 'core-js/modules/es.string.small';
+import 'core-js/modules/es.string.strike';
+import 'core-js/modules/es.string.sub';
+import 'core-js/modules/es.string.sup';
+
+import 'core-js/modules/es.parse-int';
+import 'core-js/modules/es.parse-float';
+
+import 'core-js/es/number';
+import 'core-js/es/math';
+import 'core-js/es/date';
+import 'core-js/es/regexp';
+
+import 'core-js/modules/es.map';
+import 'core-js/modules/es.weak-map';
+import 'core-js/modules/es.set';
+import 'core-js/modules/web.dom-collections.iterator';
+import 'core-js/modules/es.promise';
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/jit-polyfills.js b/packages/angular_devkit/build_angular/src/angular-cli-files/models/jit-polyfills.js
index 624a54706810..b57ee9bd423a 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/jit-polyfills.js
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/jit-polyfills.js
@@ -5,4 +5,4 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import 'core-js/es7/reflect';
+import 'core-js/proposals/reflect-metadata';
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index a9c03738a641..d9cfd69b5043 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -60,7 +60,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
   }
 
   if (buildOptions.es5BrowserSupport) {
-    entryPoints['polyfills.es5'] = [path.join(__dirname, '..', 'es2015-polyfills.js')];
+    entryPoints['polyfills.es5'] = [path.join(__dirname, '..', 'es5-polyfills.js')];
   }
 
   if (buildOptions.polyfills) {
@@ -76,7 +76,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
     if (buildOptions.es5BrowserSupport) {
       entryPoints['polyfills.es5'] = [
         ...entryPoints['polyfills.es5'],
-        path.join(__dirname, '..', 'es2015-jit-polyfills.js'),
+        path.join(__dirname, '..', 'es5-jit-polyfills.js'),
       ];
     }
   }
diff --git a/tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/src/test.ts b/tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/src/test.ts
index 7f7cc44356b5..07d460969f3b 100644
--- a/tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/src/test.ts
+++ b/tests/angular_devkit/build_ng_packagr/ng-packaged/projects/lib/src/test.ts
@@ -7,7 +7,6 @@
  */
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
 
-import 'core-js/es7/reflect';
 import 'zone.js/dist/zone';
 import 'zone.js/dist/zone-testing';
 import { getTestBed } from '@angular/core/testing';
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/main.ts b/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/main.ts
index 0a705a5daebb..a2a7a6c6b76c 100644
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/main.ts
+++ b/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/main.ts
@@ -1,4 +1,4 @@
-import 'core-js/es7/reflect';
+import 'core-js/proposals/reflect-metadata';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 import {AppModule} from './app.module';
 
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/package.json b/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/package.json
index 558c7d047703..e5078904a00a 100644
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/package.json
+++ b/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/package.json
@@ -12,7 +12,7 @@
     "@angular/platform-server": "^5.0.0-rc.8",
     "@angular/router": "^5.0.0-rc.8",
     "@ngtools/webpack": "0.0.0",
-    "core-js": "^2.4.1",
+    "core-js": "^3.0.0",
     "rxjs": "^5.5.0",
     "zone.js": "^0.8.14"
   },
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/app/main.jit.ts b/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/app/main.jit.ts
index 0a705a5daebb..a2a7a6c6b76c 100644
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/app/main.jit.ts
+++ b/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/app/main.jit.ts
@@ -1,4 +1,4 @@
-import 'core-js/es7/reflect';
+import 'core-js/proposals/reflect-metadata';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 import {AppModule} from './app.module';
 
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/package.json b/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/package.json
index 4a2637e90a24..f15ed005a3de 100644
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/package.json
+++ b/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/package.json
@@ -12,7 +12,7 @@
     "@angular/platform-server": "^5.0.0-rc.8",
     "@angular/router": "^5.0.0-rc.8",
     "@ngtools/webpack": "0.0.0",
-    "core-js": "^2.4.1",
+    "core-js": "^3.0.0",
     "rxjs": "^5.5.0",
     "zone.js": "^0.8.14"
   },
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/main.ts b/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/main.ts
index 5d57aafca8ae..647681b8b76c 100644
--- a/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/main.ts
+++ b/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/main.ts
@@ -1,4 +1,4 @@
-import 'core-js/es7/reflect';
+import 'core-js/proposals/reflect-metadata';
 import {platformDynamicServer, renderModule} from '@angular/platform-server';
 import {AppModule} from './app.module';
 
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/package.json b/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/package.json
index 96368897352a..003d0506fe8f 100644
--- a/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/package.json
+++ b/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/package.json
@@ -13,7 +13,7 @@
     "@angular/platform-server": "^5.0.0",
     "@angular/router": "^5.0.0",
     "@ngtools/webpack": "0.0.0",
-    "core-js": "^2.4.1",
+    "core-js": "^3.0.0",
     "rxjs": "^5.4.2",
     "zone.js": "^0.8.14"
   },
diff --git a/tests/legacy-cli/e2e/tests/build/polyfills.ts b/tests/legacy-cli/e2e/tests/build/polyfills.ts
index c1ef73372bb7..d2a7b85bb3f3 100644
--- a/tests/legacy-cli/e2e/tests/build/polyfills.ts
+++ b/tests/legacy-cli/e2e/tests/build/polyfills.ts
@@ -11,7 +11,7 @@ import { expectToFail } from '../../utils/utils';
 export default async function () {
     await ng('build');
     // files were created successfully
-    await expectFileToMatch('dist/test-project/polyfills.js', 'core-js/es7/reflect');
+    await expectFileToMatch('dist/test-project/polyfills.js', 'core-js/proposals/reflect-metadata');
     await expectFileToMatch('dist/test-project/polyfills.js', 'zone.js');
     expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script src="runtime.js"></script>
@@ -24,7 +24,7 @@ export default async function () {
     // files were created successfully
     await expectFileToExist('dist/test-project/polyfills.js');
     await expectFileSizeToBeUnder('dist/test-project/polyfills.js', jitPolyfillSize);
-    await expectToFail(() => expectFileToMatch('dist/test-project/polyfills.js', 'core-js/es7/reflect'));
+    await expectToFail(() => expectFileToMatch('dist/test-project/polyfills.js', 'core-js/proposals/reflect-metadata'));
     await expectFileToMatch('dist/test-project/polyfills.js', 'zone.js');
     expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script src="runtime.js"></script>
diff --git a/tests/legacy-cli/e2e/tests/packages/webpack/test-ng5.ts b/tests/legacy-cli/e2e/tests/packages/webpack/test-ng5.ts
index 3b8dc3b903a7..f30d5fa250c2 100644
--- a/tests/legacy-cli/e2e/tests/packages/webpack/test-ng5.ts
+++ b/tests/legacy-cli/e2e/tests/packages/webpack/test-ng5.ts
@@ -8,9 +8,9 @@ export default function(skipCleaning: () => void) {
   return Promise.resolve()
     .then(() => createProjectFromAsset('webpack/test-app-ng5'))
     .then(() => exec(normalize('node_modules/.bin/webpack-cli')))
-    .then(() => expectFileSizeToBeUnder('dist/app.main.js', 375000))
-    .then(() => expectFileSizeToBeUnder('dist/0.app.main.js', 25000))
-    .then(() => expectFileSizeToBeUnder('dist/1.app.main.js', 2000))
+    .then(() => expectFileSizeToBeUnder('dist/app.main.js', 375 * 1024))
+    .then(() => expectFileSizeToBeUnder('dist/0.app.main.js', 25 * 1024))
+    .then(() => expectFileSizeToBeUnder('dist/1.app.main.js', 2 * 1024))
     // test resource urls without ./
     .then(() => replaceInFile('app/app.component.ts',
       './app.component.html', 'app.component.html'))
diff --git a/yarn.lock b/yarn.lock
index 9be0ce1d2c19..688108062e5e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2477,7 +2477,12 @@ copy-webpack-plugin@5.0.2:
     serialize-javascript "^1.4.0"
     webpack-log "^2.0.0"
 
-core-js@^2.2.0, core-js@^2.4.0, core-js@^2.4.1:
+core-js@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.0.tgz#a8dbfa978d29bfc263bfb66c556d0ca924c28957"
+  integrity sha512-WBmxlgH2122EzEJ6GH8o9L/FeoUKxxxZ6q6VUxoTlsE4EvbTWKJb447eyVxTEuq0LpXjlq/kCB2qgBvsYRkLvQ==
+
+core-js@^2.2.0, core-js@^2.4.0:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
   integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==

From a0a583adaaf8e739c375b914f249801660f33334 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 25 Mar 2019 18:46:21 -0400
Subject: [PATCH 1077/1703] fix(@schematics/angular): remove unused core-js
 dependency from new projects

Required polyfills are now managed directly by the build system.  If additional polyfills are required, packages can be manually added as needed.
---
 packages/schematics/angular/library/files/src/test.ts.template   | 1 -
 .../schematics/angular/workspace/files/package.json.template     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/packages/schematics/angular/library/files/src/test.ts.template b/packages/schematics/angular/library/files/src/test.ts.template
index e11ff1c97b82..978c64fb83f4 100644
--- a/packages/schematics/angular/library/files/src/test.ts.template
+++ b/packages/schematics/angular/library/files/src/test.ts.template
@@ -1,6 +1,5 @@
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
 
-import 'core-js/es7/reflect';
 import 'zone.js/dist/zone';
 import 'zone.js/dist/zone-testing';
 import { getTestBed } from '@angular/core/testing';
diff --git a/packages/schematics/angular/workspace/files/package.json.template b/packages/schematics/angular/workspace/files/package.json.template
index efa062d7908e..35afff10fc40 100644
--- a/packages/schematics/angular/workspace/files/package.json.template
+++ b/packages/schematics/angular/workspace/files/package.json.template
@@ -19,7 +19,6 @@
     "@angular/platform-browser": "<%= latestVersions.Angular %>",
     "@angular/platform-browser-dynamic": "<%= latestVersions.Angular %>",
     "@angular/router": "<%= latestVersions.Angular %>",
-    "core-js": "^2.5.4",
     "rxjs": "<%= latestVersions.RxJs %>",
     "tslib": "<%= latestVersions.TsLib %>",
     "zone.js": "<%= latestVersions.ZoneJs %>"

From 3f6c1b5cd68545db0246a1cfb89cf55b2a2d4ea7 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Wed, 3 Apr 2019 14:17:41 +0200
Subject: [PATCH 1078/1703] fix(@schematics/angular): minimal should not add
 `test` target

At the moment when using minimal flag, test targets are being created even though they cannot be used as test setup files are not created nor are testing dependencies
---
 packages/schematics/angular/application/index.ts      |  2 +-
 packages/schematics/angular/application/index_spec.ts | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 73fcd592e390..1300cc799484 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -289,7 +289,7 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
           browserTarget: `${options.name}:build`,
         },
       },
-      test: {
+      test: options.minimal ? undefined : {
         builder: Builders.Karma,
         options: {
           main: `${sourceRoot}/test.ts`,
diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
index 2895b5121e6f..f19d3297177b 100644
--- a/packages/schematics/angular/application/index_spec.ts
+++ b/packages/schematics/angular/application/index_spec.ts
@@ -163,14 +163,13 @@ describe('Application Schematic', () => {
     expect(karmaConf).toContain(`dir: require('path').join(__dirname, '../../coverage/foo')`);
   });
 
-  it('minimal=true should not create e2e project', () => {
+  it('minimal=true should not create e2e and test targets', () => {
     const options = { ...defaultOptions, minimal: true };
-
     const tree = schematicRunner.runSchematic('application', options, workspaceTree);
-    const files = tree.files;
-    expect(files).not.toContain('/projects/foo-e2e');
-    const confContent = JSON.parse(tree.readContent('/angular.json'));
-    expect(confContent.projects['foo-e2e']).toBeUndefined();
+    const config = JSON.parse(tree.readContent('/angular.json'));
+    const architect = config.projects.foo.architect;
+    expect(architect.test).not.toBeDefined();
+    expect(architect.e2e).not.toBeDefined();
   });
 
   it('should create correct files when using minimal', () => {

From 74466ea4ac3c21885b6998ae8c1ceb3c3c53fa39 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 4 Apr 2019 06:29:49 +0000
Subject: [PATCH 1079/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 63f1532ecac0..6f7ef9453dc3 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#ad75d9dfdc5d58cec45878d171b2b25229de7a62",
-    "@angular/common": "github:angular/common-builds#54cd7b59798ce18a596854ea14d38953ecdcaf93",
-    "@angular/compiler": "github:angular/compiler-builds#cfa1aa27208372086027f4bdeba21bc7e4b5b270",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#52d01a84c64dc9057e1ce9f664c8d93bbed567df",
-    "@angular/core": "github:angular/core-builds#3c8a46490a902a4778570a94b02945229fd8e582",
-    "@angular/forms": "github:angular/forms-builds#da6d8b0c69013624178c753dc43604ed62a4bc01",
-    "@angular/language-service": "github:angular/language-service-builds#5ae5a878ad37ad4f27cd98ef90a1f5b11c09f471",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#5e6ea0669f6dd8578702c0cf511eed6fe4aae33a",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#4327cb12898dc4e333a0468f412e05c7f7262ac7",
-    "@angular/router": "github:angular/router-builds#21e779cf1a648d451625b4367361364ef5314755"
+    "@angular/animations": "github:angular/animations-builds#e34ac02a1a5591b884479e1b401e4fa8d7b46afe",
+    "@angular/common": "github:angular/common-builds#39ed43f923aaab44063321df44279573671ac93b",
+    "@angular/compiler": "github:angular/compiler-builds#9772e60ed489e1e4be4f1095c2a0c02ad185a50b",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#1132bc8ad936ac1ec54e5038f286f517395a8baf",
+    "@angular/core": "github:angular/core-builds#4e7f4fbbe4acf9b5f527d5082258507a1a2127a4",
+    "@angular/forms": "github:angular/forms-builds#e8c497aa782ec7761c170c65d066e7e2bf96dd87",
+    "@angular/language-service": "github:angular/language-service-builds#02299fb2fcb6b21862dbe9775c4e4ab670b840f1",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#35331fd4d1f31c7838f608dd3a15fd8328ea6fa3",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#3a1171c83a3c2eab514a99debd6e4e7005e3ab98",
+    "@angular/router": "github:angular/router-builds#7aca6d71b2579deda620720c33a7fc6e049c0f9e"
   }
 }
\ No newline at end of file

From 2061ede09b35fc1c4abbb3e38a806f79f76114a5 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 3 Apr 2019 19:56:45 +0200
Subject: [PATCH 1080/1703] style: remove todo comment from
 `updateClassDeclaration`

A transformer should not mutate existing nodes, ever. If you intend to modify some part of the node, the ts.update* methods are correct. Or you can replace a node entirely via ts.create* operations, but there are cases where introducing entirely synthetic nodes will break TS output.

Hence using the updateClassDeclaration in this case is the correct approach.

This has also been raised in the slack #ts-core channel as TypeScript have been looking to get to the bottom of this Microsoft/TypeScript#29365 (comment), which seemed to have been caused by mutating the node.
---
 packages/ngtools/webpack/src/transformers/replace_resources.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/ngtools/webpack/src/transformers/replace_resources.ts b/packages/ngtools/webpack/src/transformers/replace_resources.ts
index bd23074cc316..6dea3a1a2015 100644
--- a/packages/ngtools/webpack/src/transformers/replace_resources.ts
+++ b/packages/ngtools/webpack/src/transformers/replace_resources.ts
@@ -23,8 +23,6 @@ export function replaceResources(
           (node: ts.Decorator) => visitDecorator(node, typeChecker, directTemplateLoading),
         );
 
-        // todo: we need to investigate and confirm that using
-        //  `updateClassDeclaration` has no regressions
         return ts.updateClassDeclaration(
           node,
           decorators,

From e17a97b4f2061f8eb73cab4e2c6a9566e0ead8a7 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 4 Apr 2019 17:33:56 +0000
Subject: [PATCH 1081/1703] build: update webpack-dev-middleware to version
 3.6.2

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 41b85bc4c66c..5f0706718b83 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -48,7 +48,7 @@
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.2.3",
     "webpack": "4.29.6",
-    "webpack-dev-middleware": "3.6.1",
+    "webpack-dev-middleware": "3.6.2",
     "webpack-dev-server": "3.2.1",
     "webpack-merge": "4.2.1",
     "webpack-sources": "1.3.0",
diff --git a/yarn.lock b/yarn.lock
index 688108062e5e..c5a60fa9f380 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9663,10 +9663,10 @@ webpack-dev-middleware@3.4.0:
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
-webpack-dev-middleware@3.6.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.1.tgz#91f2531218a633a99189f7de36045a331a4b9cd4"
-  integrity sha512-XQmemun8QJexMEvNFbD2BIg4eSKrmSIMrTfnl2nql2Sc6OGAYFyb8rwuYrCjl/IiEYYuyTEiimMscu7EXji/Dw==
+webpack-dev-middleware@3.6.2:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.2.tgz#f37a27ad7c09cd7dc67cd97655413abaa1f55942"
+  integrity sha512-A47I5SX60IkHrMmZUlB0ZKSWi29TZTcPz7cha1Z75yYOsgWh/1AcPmQEbC8ZIbU3A1ytSv1PMU0PyPz2Lmz2jg==
   dependencies:
     memory-fs "^0.4.1"
     mime "^2.3.1"

From 95675b09366fbca90b97cdaaf87e2c53db4f2c9d Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 4 Apr 2019 17:33:38 +0000
Subject: [PATCH 1082/1703] build: update jasmine-core to version ~3.4.0

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 5f0706718b83..743a4ace5245 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -72,7 +72,7 @@
     "bootstrap": "^4.0.0",
     "font-awesome": "^4.7.0",
     "jquery": "^3.3.1",
-    "jasmine-core": "~3.3.0",
+    "jasmine-core": "~3.4.0",
     "jasmine-spec-reporter": "~4.2.1",
     "karma": "~4.0.0",
     "karma-chrome-launcher": "~2.2.0",
diff --git a/yarn.lock b/yarn.lock
index c5a60fa9f380..7d40d741638e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5091,6 +5091,11 @@ jasmine-core@^3.3, jasmine-core@~3.3.0:
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.3.0.tgz#dea1cdc634bc93c7e0d4ad27185df30fa971b10e"
   integrity sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA==
 
+jasmine-core@~3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.4.0.tgz#2a74618e966026530c3518f03e9f845d26473ce3"
+  integrity sha512-HU/YxV4i6GcmiH4duATwAbJQMlE0MsDIR5XmSVxURxKHn3aGAdbY1/ZJFmVRbKtnLwIxxMJD7gYaPsypcbYimg==
+
 jasmine-spec-reporter@^4.2.1, jasmine-spec-reporter@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz#1d632aec0341670ad324f92ba84b4b32b35e9e22"

From 8647631a9e31d567bf1e87c6f197600e852dce31 Mon Sep 17 00:00:00 2001
From: Judy Bogart <31899326+jbogarthyde@users.noreply.github.com>
Date: Wed, 3 Apr 2019 09:08:01 -0700
Subject: [PATCH 1083/1703] docs: update support statement for hmr

---
 docs/documentation/stories/configure-hmr.md | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/docs/documentation/stories/configure-hmr.md b/docs/documentation/stories/configure-hmr.md
index 0fa6ae1d84d3..b3520a67a271 100644
--- a/docs/documentation/stories/configure-hmr.md
+++ b/docs/documentation/stories/configure-hmr.md
@@ -1,9 +1,9 @@
-**Documentation below is deprecated and we no longer accept PRs to improve this. The new documentation is available [here](https://angular.io/guide/build)**.
+**HMR is a webpack feature that is not officially supported by Angular. Community contributors can submit PRs against this page to add corrections, new information, or advice.**.
 
 # Configure Hot Module Replacement
 
-Hot Module Replacement (HMR) is a WebPack feature to update code in a running app without rebuilding it.
-This results in faster updates and less full page-reloads.
+Hot Module Replacement (HMR) is a [webpack](https://webpack.js.org) feature to update code in a running app without rebuilding it.
+This results in faster updates and fewer full page-reloads.
 
 You can read more about HMR by visiting [this page](https://webpack.js.org/guides/hot-module-replacement/).
 
@@ -44,7 +44,7 @@ export const environment = {
 
 
 Update `angular.json` to include an hmr environment as explained [here](./application-environments)
-and add configurations within build and serve to enable hmr. Note that `<project-name>` here 
+and add configurations within build and serve to enable hmr. Note that `<project-name>` here
 represents the name of the project you are adding this configuration to in `angular.json`.
 
 ```json
@@ -179,5 +179,3 @@ When starting the server Webpack will tell you that it’s enabled:
 
 
 Now if you make changes to one of your components the changes should be visible automatically without a complete browser refresh.
-
-

From 588d61e6084f0e62a994a90c3c557ed956056ed8 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 2 Apr 2019 13:40:47 -0400
Subject: [PATCH 1084/1703] refactor(@angular-devkit/architect): remove
 temporary index2 entrypoint

---
 packages/angular_devkit/architect/builders/all-of.ts   |  2 +-
 packages/angular_devkit/architect/builders/concat.ts   |  2 +-
 packages/angular_devkit/architect/builders/false.ts    |  2 +-
 packages/angular_devkit/architect/builders/true.ts     |  2 +-
 .../architect/node/node-modules-architect-host.ts      |  2 +-
 packages/angular_devkit/architect/src/index.ts         |  5 -----
 packages/angular_devkit/architect/src/index2.ts        | 10 ----------
 .../architect/testing/testing-architect-host.ts        |  2 +-
 8 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 packages/angular_devkit/architect/src/index2.ts

diff --git a/packages/angular_devkit/architect/builders/all-of.ts b/packages/angular_devkit/architect/builders/all-of.ts
index f847e0f0fef6..0b9d958b1f7c 100644
--- a/packages/angular_devkit/architect/builders/all-of.ts
+++ b/packages/angular_devkit/architect/builders/all-of.ts
@@ -8,7 +8,7 @@
 import { json } from '@angular-devkit/core';
 import { EMPTY, from, of } from 'rxjs';
 import { map, mergeMap } from 'rxjs/operators';
-import { BuilderOutput, BuilderRun, createBuilder } from '../src/index2';
+import { BuilderOutput, BuilderRun, createBuilder } from '../src';
 import { Schema as OperatorSchema } from './operator-schema';
 
 export default createBuilder<json.JsonObject & OperatorSchema>((options, context) => {
diff --git a/packages/angular_devkit/architect/builders/concat.ts b/packages/angular_devkit/architect/builders/concat.ts
index 53ed963be610..816cb2028091 100644
--- a/packages/angular_devkit/architect/builders/concat.ts
+++ b/packages/angular_devkit/architect/builders/concat.ts
@@ -8,7 +8,7 @@
 import { json } from '@angular-devkit/core';
 import { from, of } from 'rxjs';
 import { concatMap, first, last, map, switchMap } from 'rxjs/operators';
-import { BuilderOutput, BuilderRun, createBuilder } from '../src/index2';
+import { BuilderOutput, BuilderRun, createBuilder } from '../src';
 import { Schema as OperatorSchema } from './operator-schema';
 
 export default createBuilder<json.JsonObject & OperatorSchema>((options, context) => {
diff --git a/packages/angular_devkit/architect/builders/false.ts b/packages/angular_devkit/architect/builders/false.ts
index b919d9d58d6d..3ae22b054e59 100644
--- a/packages/angular_devkit/architect/builders/false.ts
+++ b/packages/angular_devkit/architect/builders/false.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { createBuilder } from '../src/index2';
+import { createBuilder } from '../src';
 
 export default createBuilder(() => ({
   success: false,
diff --git a/packages/angular_devkit/architect/builders/true.ts b/packages/angular_devkit/architect/builders/true.ts
index 0837cce4e08d..ea617c33fd2b 100644
--- a/packages/angular_devkit/architect/builders/true.ts
+++ b/packages/angular_devkit/architect/builders/true.ts
@@ -5,6 +5,6 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { createBuilder } from '../src/index2';
+import { createBuilder } from '../src';
 
 export default createBuilder(() => ({ success: true }));
diff --git a/packages/angular_devkit/architect/node/node-modules-architect-host.ts b/packages/angular_devkit/architect/node/node-modules-architect-host.ts
index e66a5c86c168..12953389cf40 100644
--- a/packages/angular_devkit/architect/node/node-modules-architect-host.ts
+++ b/packages/angular_devkit/architect/node/node-modules-architect-host.ts
@@ -8,8 +8,8 @@
 import { experimental, json } from '@angular-devkit/core';
 import { resolve } from '@angular-devkit/core/node';
 import * as path from 'path';
+import { BuilderInfo } from '../src';
 import { Schema as BuilderSchema } from '../src/builders-schema';
-import { BuilderInfo } from '../src/index2';
 import { Target } from '../src/input-schema';
 import { ArchitectHost, Builder, BuilderSymbol } from '../src/internal';
 
diff --git a/packages/angular_devkit/architect/src/index.ts b/packages/angular_devkit/architect/src/index.ts
index 7223af9aa926..a21d4ff324b2 100644
--- a/packages/angular_devkit/architect/src/index.ts
+++ b/packages/angular_devkit/architect/src/index.ts
@@ -8,8 +8,3 @@
 export * from './api';
 export { Architect, ScheduleOptions } from './architect';
 export { createBuilder } from './create-builder';
-
-import * as index2 from './index2';
-export {
-  index2,
-};
diff --git a/packages/angular_devkit/architect/src/index2.ts b/packages/angular_devkit/architect/src/index2.ts
deleted file mode 100644
index a21d4ff324b2..000000000000
--- a/packages/angular_devkit/architect/src/index2.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-export * from './api';
-export { Architect, ScheduleOptions } from './architect';
-export { createBuilder } from './create-builder';
diff --git a/packages/angular_devkit/architect/testing/testing-architect-host.ts b/packages/angular_devkit/architect/testing/testing-architect-host.ts
index 1e4824aac36f..0eeb068b353c 100644
--- a/packages/angular_devkit/architect/testing/testing-architect-host.ts
+++ b/packages/angular_devkit/architect/testing/testing-architect-host.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { json } from '@angular-devkit/core';
-import { BuilderInfo, Target, targetStringFromTarget } from '../src/index2';
+import { BuilderInfo, Target, targetStringFromTarget } from '../src';
 import { ArchitectHost, Builder } from '../src/internal';
 
 export class TestingArchitectHost implements ArchitectHost {

From e0043b4078c4b0910bb00ab2f956f00214858e0e Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 2 Apr 2019 14:09:23 -0400
Subject: [PATCH 1085/1703] refactor(@angular/cli): cleanup architect imports

---
 packages/angular/cli/models/architect-command.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index 03b5afecdb01..ee1df7dc085e 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { index2 } from '@angular-devkit/architect';
+import { Architect, Target } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { experimental, json, schema, tags } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
@@ -27,7 +27,7 @@ export interface ArchitectCommandOptions extends BaseCommandOptions {
 export abstract class ArchitectCommand<
   T extends ArchitectCommandOptions = ArchitectCommandOptions,
 > extends Command<ArchitectCommandOptions> {
-  protected _architect: index2.Architect;
+  protected _architect: Architect;
   protected _architectHost: WorkspaceNodeModulesArchitectHost;
   protected _workspace: experimental.workspace.Workspace;
   protected _registry: json.schema.SchemaRegistry;
@@ -49,7 +49,7 @@ export abstract class ArchitectCommand<
     this._workspace = workspace;
 
     this._architectHost = new WorkspaceNodeModulesArchitectHost(workspace, this.workspace.root);
-    this._architect = new index2.Architect(this._architectHost, this._registry);
+    this._architect = new Architect(this._architectHost, this._registry);
 
     if (!this.target) {
       if (options.help) {
@@ -188,7 +188,7 @@ export abstract class ArchitectCommand<
 
   protected async runBepTarget<T>(
     command: string,
-    configuration: index2.Target,
+    configuration: Target,
     overrides: json.JsonObject,
     buildEventLog: string,
   ): Promise<number> {
@@ -224,7 +224,7 @@ export abstract class ArchitectCommand<
   }
 
   protected async runSingleTarget(
-    target: index2.Target,
+    target: Target,
     targetOptions: string[],
     commandOptions: ArchitectCommandOptions & Arguments,
   ) {
@@ -284,7 +284,7 @@ export abstract class ArchitectCommand<
         let result = 0;
         for (const project of this.getProjectNamesByTarget(this.target)) {
           result |= await this.runSingleTarget(
-            { ...targetSpec, project } as index2.Target,
+            { ...targetSpec, project } as Target,
             extra,
             options,
           );
@@ -344,7 +344,7 @@ export abstract class ArchitectCommand<
     }
   }
 
-  private _makeTargetSpecifier(commandOptions: ArchitectCommandOptions): index2.Target {
+  private _makeTargetSpecifier(commandOptions: ArchitectCommandOptions): Target {
     let project, target, configuration;
 
     if (commandOptions.target) {

From f9b4bdfa6e41dfdd2987834556ade2ca19822de5 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 3 Apr 2019 13:25:00 -0400
Subject: [PATCH 1086/1703] refactor(@angular-devkit/architect-cli): cleanup
 stable architect imports

---
 .../architect_cli/bin/architect.ts            | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/angular_devkit/architect_cli/bin/architect.ts b/packages/angular_devkit/architect_cli/bin/architect.ts
index e6546e927bc4..9ee3c4369124 100644
--- a/packages/angular_devkit/architect_cli/bin/architect.ts
+++ b/packages/angular_devkit/architect_cli/bin/architect.ts
@@ -6,22 +6,22 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { index2 } from '@angular-devkit/architect';
+import { Architect, BuilderInfo, BuilderProgressState, Target } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import {
-  dirname,
   experimental,
   json,
   logging,
   normalize,
   schema,
-  tags, terminal,
+  tags,
+  terminal,
 } from '@angular-devkit/core';
 import { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node';
 import { existsSync, readFileSync } from 'fs';
 import * as minimist from 'minimist';
 import * as path from 'path';
-import { last, tap } from 'rxjs/operators';
+import { tap } from 'rxjs/operators';
 import { MultiProgressBar } from '../src/progress';
 
 
@@ -68,15 +68,15 @@ function usage(logger: logging.Logger, exitCode = 0): never {
   throw 0;  // The node typing sometimes don't have a never type for process.exit().
 }
 
-function _targetStringFromTarget({project, target, configuration}: index2.Target) {
+function _targetStringFromTarget({project, target, configuration}: Target) {
   return `${project}:${target}${configuration !== undefined ? ':' + configuration : ''}`;
 }
 
 
 interface BarInfo {
   status?: string;
-  builder: index2.BuilderInfo;
-  target?: index2.Target;
+  builder: BuilderInfo;
+  target?: Target;
 }
 
 
@@ -88,7 +88,7 @@ async function _executeTarget(
   registry: json.schema.SchemaRegistry,
 ) {
   const architectHost = new WorkspaceNodeModulesArchitectHost(workspace, root);
-  const architect = new index2.Architect(architectHost, registry);
+  const architect = new Architect(architectHost, registry);
 
   // Split a target into its parts.
   const targetStr = argv._.shift() || '';
@@ -122,22 +122,22 @@ async function _executeTarget(
       }
 
       switch (update.state) {
-        case index2.BuilderProgressState.Error:
+        case BuilderProgressState.Error:
           data.status = 'Error: ' + update.error;
           bars.update(update.id, data);
           break;
 
-        case index2.BuilderProgressState.Stopped:
+        case BuilderProgressState.Stopped:
           data.status = 'Done.';
           bars.complete(update.id);
           bars.update(update.id, data, update.total, update.total);
           break;
 
-        case index2.BuilderProgressState.Waiting:
+        case BuilderProgressState.Waiting:
           bars.update(update.id, data);
           break;
 
-        case index2.BuilderProgressState.Running:
+        case BuilderProgressState.Running:
           bars.update(update.id, data, update.current, update.total);
           break;
       }

From 801f66707876a793225e232771d113094032ea11 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 4 Apr 2019 18:00:13 +0200
Subject: [PATCH 1087/1703] feat(@ngtools/webpack): redirect ngcc errors and
 warnings to webpack

---
 .../webpack/src/angular_compiler_plugin.ts    |  2 ++
 .../ngtools/webpack/src/ngcc_processor.ts     | 27 +++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index fec4676bbeb6..104e09a77783 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -679,6 +679,8 @@ export class AngularCompilerPlugin {
             ngcc,
             this._mainFields,
             compilerWithFileSystems.inputFileSystem,
+            this._warnings,
+            this._errors,
           );
         }
       }
diff --git a/packages/ngtools/webpack/src/ngcc_processor.ts b/packages/ngtools/webpack/src/ngcc_processor.ts
index 4a42e14e5d9a..8e96e315a880 100644
--- a/packages/ngtools/webpack/src/ngcc_processor.ts
+++ b/packages/ngtools/webpack/src/ngcc_processor.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import { Logger } from '@angular/compiler-cli/ngcc';
 import * as ts from 'typescript';
 import { InputFileSystem } from 'webpack';
 import { time, timeEnd } from './benchmark';
@@ -24,11 +25,16 @@ import { workaroundResolve } from './utils';
 export class NgccProcessor {
   private _processedModules = new Set<string>();
 
+  private _logger: NgccLogger;
+
   constructor(
     private readonly ngcc: typeof import('@angular/compiler-cli/ngcc'),
     private readonly propertiesToConsider: string[],
     private readonly inputFileSystem: InputFileSystem,
+    private readonly compilationWarnings: (Error | string)[],
+    private readonly compilationErrors: (Error | string)[],
   ) {
+    this._logger = new NgccLogger(this.compilationWarnings, this.compilationErrors);
   }
 
   processModule(
@@ -61,6 +67,7 @@ export class NgccProcessor {
       propertiesToConsider: this.propertiesToConsider,
       compileAllFormats: false,
       createNewEntryPointFormats: true,
+      logger: this._logger,
     });
     timeEnd(timeLabel);
 
@@ -95,3 +102,23 @@ export class NgccProcessor {
     }
   }
 }
+
+class NgccLogger implements Logger {
+  constructor(
+    private readonly compilationWarnings: (Error | string)[],
+    private readonly compilationErrors: (Error | string)[],
+  ) {
+  }
+
+  debug(..._args: string[]) { }
+
+  info(..._args: string[]) { }
+
+  warn(...args: string[]) {
+    this.compilationWarnings.push(args.join(' '));
+  }
+
+  error(...args: string[]) {
+    this.compilationErrors.push(new Error(args.join(' ')));
+  }
+}

From 9aefe8371c9b1d4f3314f950c4e52df4231c3545 Mon Sep 17 00:00:00 2001
From: Sam Thorogood <sam.thorogood@gmail.com>
Date: Fri, 5 Apr 2019 10:48:22 +1100
Subject: [PATCH 1088/1703] feat(@angular-devkit/build-angular): add
 safari-nomodule snippet

---
 .../models/safari-nomodule.js                 | 33 +++++++++++++++++++
 .../models/safari-nomodule.min.js             | 20 +++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 packages/angular_devkit/build_angular/src/angular-cli-files/models/safari-nomodule.js
 create mode 100644 packages/angular_devkit/build_angular/src/angular-cli-files/models/safari-nomodule.min.js

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/safari-nomodule.js b/packages/angular_devkit/build_angular/src/angular-cli-files/models/safari-nomodule.js
new file mode 100644
index 000000000000..89db355822ae
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/safari-nomodule.js
@@ -0,0 +1,33 @@
+/**
+ * Safari 10.1 supports modules, but does not support the `nomodule` attribute - it will
+ * load <script nomodule> anyway. This snippet solve this problem, but only for script
+ * tags that load external code, e.g.: <script nomodule src="nomodule.js"></script>
+ *
+ * Again: this will **not** prevent inline script, e.g.:
+ * <script nomodule>alert('no modules');</script>.
+ *
+ * This workaround is possible because Safari supports the non-standard 'beforeload' event.
+ * This allows us to trap the module and nomodule load.
+ *
+ * Note also that `nomodule` is supported in later versions of Safari - it's just 10.1 that
+ * omits this attribute.
+ */
+(function() {
+  var check = document.createElement('script');
+  if (!('noModule' in check) && 'onbeforeload' in check) {
+    var support = false;
+    document.addEventListener('beforeload', function(e) {
+      if (e.target === check) {
+        support = true;
+      } else if (!e.target.hasAttribute('nomodule') || !support) {
+        return;
+      }
+      e.preventDefault();
+    }, true);
+
+    check.type = 'module';
+    check.src = '.';
+    document.head.appendChild(check);
+    check.remove();
+  }
+}());
\ No newline at end of file
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/safari-nomodule.min.js b/packages/angular_devkit/build_angular/src/angular-cli-files/models/safari-nomodule.min.js
new file mode 100644
index 000000000000..31fbacc96662
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/safari-nomodule.min.js
@@ -0,0 +1,20 @@
+(function() {
+  var d = document;
+  var c = d.createElement('script');
+  if (!('noModule' in c) && 'onbeforeload' in c) {
+    var s = false;
+    d.addEventListener('beforeload', function(e) {
+      if (e.target === c) {
+        s = true;
+      } else if (!e.target.hasAttribute('nomodule') || !s) {
+        return;
+      }
+      e.preventDefault();
+    }, true);
+
+    c.type = 'module';
+    c.src = '.';
+    d.head.appendChild(c);
+    c.remove();
+  }
+}());
\ No newline at end of file

From 28498b60a24111d7eeccdc93c13de6b1a9542c38 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 6 Apr 2019 07:22:25 +0000
Subject: [PATCH 1089/1703] build: update core-js to version 3.0.1

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 743a4ace5245..6ba821caa38c 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -17,7 +17,7 @@
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.2",
-    "core-js": "3.0.0",
+    "core-js": "3.0.1",
     "file-loader": "3.0.1",
     "glob": "7.1.3",
     "istanbul-instrumenter-loader": "3.0.1",
diff --git a/yarn.lock b/yarn.lock
index 7d40d741638e..90e05b52a606 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2477,10 +2477,10 @@ copy-webpack-plugin@5.0.2:
     serialize-javascript "^1.4.0"
     webpack-log "^2.0.0"
 
-core-js@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.0.tgz#a8dbfa978d29bfc263bfb66c556d0ca924c28957"
-  integrity sha512-WBmxlgH2122EzEJ6GH8o9L/FeoUKxxxZ6q6VUxoTlsE4EvbTWKJb447eyVxTEuq0LpXjlq/kCB2qgBvsYRkLvQ==
+core-js@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.1.tgz#1343182634298f7f38622f95e73f54e48ddf4738"
+  integrity sha512-sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew==
 
 core-js@^2.2.0, core-js@^2.4.0:
   version "2.5.7"

From 7b7d74e704d3b36c8f9f0cb8081b69fcbc1ccd33 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 5 Apr 2019 14:28:35 -0400
Subject: [PATCH 1090/1703] feat(@angular/cli): automatically update angular
 builders when CLI is updated

Closes #13581
---
 packages/angular/cli/package.json |  8 +++++++-
 scripts/build.ts                  | 16 +++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 7051612d3fc7..2cbad56fee4f 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -43,6 +43,12 @@
     "uuid": "^3.3.2"
   },
   "ng-update": {
-    "migrations": "@schematics/angular/migrations/migration-collection.json"
+    "migrations": "@schematics/angular/migrations/migration-collection.json",
+    "packageGroup": {
+      "@angular/cli": "0.0.0",
+      "@angular-devkit/build-angular":  "0.0.0",
+      "@angular-devkit/build-ng-packagr": "0.0.0",
+      "@angular-devkit/build-webpack": "0.0.0"
+    }
   }
 }
diff --git a/scripts/build.ts b/scripts/build.ts
index 1f6745765f53..5ff134e17aea 100644
--- a/scripts/build.ts
+++ b/scripts/build.ts
@@ -203,6 +203,7 @@ async function _bazel(logger: logging.Logger) {
   // _exec('bazel', ['build', '//packages/...'], {}, logger);
 }
 
+// tslint:disable-next-line:no-big-function
 export default async function(
   argv: { local?: boolean, snapshot?: boolean },
   logger: logging.Logger,
@@ -367,9 +368,18 @@ export default async function(
 
     for (const depName of Object.keys(packages)) {
       const v = packages[depName].version;
-      for (const depKey of ['dependencies', 'peerDependencies', 'devDependencies']) {
-        const obj = packageJson[depKey] as JsonObject | null;
-        if (obj && obj[depName]) {
+      for (const depKey of ['dependencies', 'peerDependencies', 'devDependencies', 'ng-update']) {
+        let obj: JsonObject | null;
+        if (depKey === 'ng-update') {
+          const updateObject = packageJson[depKey] as JsonObject | null;
+          if (!updateObject) {
+            continue;
+          }
+          obj = updateObject['packageGroup'] as JsonObject | null;
+        } else {
+          obj = packageJson[depKey] as JsonObject | null;
+        }
+        if (obj && typeof obj === 'object' && obj[depName]) {
           if (argv.local) {
             obj[depName] = packages[depName].tar;
           } else if (argv.snapshot) {

From f67d976e1a5e27052102f5b650c474bd6af10d8b Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 5 Apr 2019 15:44:32 +0200
Subject: [PATCH 1091/1703] fix(@schematics/angular): set version 8 migration
 to execute for beta versions

---
 .../schematics/angular/migrations/migration-collection.json     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/migrations/migration-collection.json b/packages/schematics/angular/migrations/migration-collection.json
index 28a1abb74079..ec05605cd907 100644
--- a/packages/schematics/angular/migrations/migration-collection.json
+++ b/packages/schematics/angular/migrations/migration-collection.json
@@ -31,7 +31,7 @@
       "description": "Update an Angular CLI project to version 7."
     },
     "migration-07": {
-      "version": "8.0.0",
+      "version": "8.0.0-beta.12",
       "factory": "./update-8",
       "description": "Update an Angular CLI project to version 8."
     }

From 6c44a8f009c981af8540442b7f4195fcdc28b080 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sun, 7 Apr 2019 09:43:25 +0000
Subject: [PATCH 1092/1703] build: update open to version 6.1.0

---
 packages/angular/cli/package.json                  | 2 +-
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 2cbad56fee4f..c29e00e9bd28 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -35,7 +35,7 @@
     "ini": "1.3.5",
     "inquirer": "6.2.2",
     "npm-package-arg": "6.1.0",
-    "open": "6.0.0",
+    "open": "6.1.0",
     "pacote": "9.5.0",
     "semver": "6.0.0",
     "symbol-observable": "1.2.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 6ba821caa38c..38b27bed465d 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -29,7 +29,7 @@
     "mini-css-extract-plugin": "0.5.0",
     "minimatch": "3.0.4",
     "parse5": "4.0.0",
-    "open": "6.0.0",
+    "open": "6.1.0",
     "postcss": "7.0.14",
     "postcss-import": "12.0.1",
     "postcss-loader": "3.0.0",
diff --git a/yarn.lock b/yarn.lock
index 90e05b52a606..f3004a19c6ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6590,10 +6590,10 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-open@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-6.0.0.tgz#cae5e2c1a3a1bfaee0d0acc8c4b7609374750346"
-  integrity sha512-/yb5mVZBz7mHLySMiSj2DcLtMBbFPJk5JBKEkHVZFxZAPzeg3L026O0T+lbdz1B2nyDnkClRSwRQJdeVUIF7zw==
+open@6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.1.0.tgz#0e7e671b883976a4e5251b5d1ca905ab6f4be78f"
+  integrity sha512-Vqch7NFb/WsMujhqfq+B3u0xkssRjZlxh+NSsBSphpcgaFD7gfB0SUBfR91E9ygBlyNGNogXR2cUB8rRfoo2kQ==
   dependencies:
     is-wsl "^1.1.0"
 

From 4b3c6630b429d1159827322e6982d49e3c348ae3 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sun, 7 Apr 2019 16:45:19 +0000
Subject: [PATCH 1093/1703] build: update autoprefixer to version 9.5.1

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 55 +++++++++----------
 2 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 38b27bed465d..f2afa7f4818d 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -13,7 +13,7 @@
     "@angular-devkit/core": "0.0.0",
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.10.0",
-    "autoprefixer": "9.5.0",
+    "autoprefixer": "9.5.1",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.2",
diff --git a/yarn.lock b/yarn.lock
index f3004a19c6ec..1336f8157df7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1196,13 +1196,13 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@9.5.0:
-  version "9.5.0"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.5.0.tgz#7e51d0355c11596e6cf9a0afc9a44e86d1596c70"
-  integrity sha512-hMKcyHsZn5+qL6AUeP3c8OyuteZ4VaUlg+fWbyl8z7PqsKHF/Bf8/px3K6AT8aMzDkBo8Bc11245MM+itDBOxQ==
+autoprefixer@9.5.1:
+  version "9.5.1"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.5.1.tgz#243b1267b67e7e947f28919d786b50d3bb0fb357"
+  integrity sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==
   dependencies:
-    browserslist "^4.4.2"
-    caniuse-lite "^1.0.30000947"
+    browserslist "^4.5.4"
+    caniuse-lite "^1.0.30000957"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
     postcss "^7.0.14"
@@ -1584,14 +1584,14 @@ browserslist@^4.0.0, browserslist@^4.3.3:
     electron-to-chromium "^1.3.82"
     node-releases "^1.0.1"
 
-browserslist@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.4.2.tgz#6ea8a74d6464bb0bd549105f659b41197d8f0ba2"
-  integrity sha512-ISS/AIAiHERJ3d45Fz0AVYKkgcy+F/eJHzKEvv1j0wwKGKD9T3BrwKr/5g45L+Y4XIK5PlTqefHciRFcfE1Jxg==
+browserslist@^4.5.4:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.4.tgz#166c4ecef3b51737a42436ea8002aeea466ea2c7"
+  integrity sha512-rAjx494LMjqKnMPhFkuLmLp8JWEX0o8ADTGeAbOqaF+XCvYLreZrG5uVjnPBlAQ8REZK4pzXGvp0bWgrFtKaag==
   dependencies:
-    caniuse-lite "^1.0.30000939"
-    electron-to-chromium "^1.3.113"
-    node-releases "^1.1.8"
+    caniuse-lite "^1.0.30000955"
+    electron-to-chromium "^1.3.122"
+    node-releases "^1.1.13"
 
 browserstack@^1.5.1:
   version "1.5.1"
@@ -1803,15 +1803,10 @@ caniuse-lite@^1.0.30000898, caniuse-lite@^1.0.30000899:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000903.tgz#86d46227759279b3db345ddbe778335dbba9e858"
   integrity sha512-T1XVJEpGCoaq7MDw7/6hCdYUukmSaS+1l/OQJkLtw7Cr2+/+d67tNGKEbyiqf7Ck8x6EhNFUxjYFXXka0N/w5g==
 
-caniuse-lite@^1.0.30000939:
-  version "1.0.30000939"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000939.tgz#b9ab7ac9e861bf78840b80c5dfbc471a5cd7e679"
-  integrity sha512-oXB23ImDJOgQpGjRv1tCtzAvJr4/OvrHi5SO2vUgB0g0xpdZZoA/BxfImiWfdwoYdUTtQrPsXsvYU/dmCSM8gg==
-
-caniuse-lite@^1.0.30000947:
-  version "1.0.30000947"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000947.tgz#c30305e9701449c22e97f4e9837cea3d76aa3273"
-  integrity sha512-ubgBUfufe5Oi3W1+EHyh2C3lfBIEcZ6bTuvl5wNOpIuRB978GF/Z+pQ7pGGUpeYRB0P+8C7i/3lt6xkeu2hwnA==
+caniuse-lite@^1.0.30000955, caniuse-lite@^1.0.30000957:
+  version "1.0.30000957"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz#fb1026bf184d7d62c685205358c3b24b9e29f7b3"
+  integrity sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ==
 
 canonical-path@1.0.0:
   version "1.0.0"
@@ -3037,10 +3032,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.113:
-  version "1.3.113"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz#b1ccf619df7295aea17bc6951dc689632629e4a9"
-  integrity sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g==
+electron-to-chromium@^1.3.122:
+  version "1.3.124"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
+  integrity sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==
 
 electron-to-chromium@^1.3.82:
   version "1.3.82"
@@ -6324,10 +6319,10 @@ node-releases@^1.0.1:
   dependencies:
     semver "^5.3.0"
 
-node-releases@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.8.tgz#32a63fff63c5e51b7e0f540ac95947d220fc6862"
-  integrity sha512-gQm+K9mGCiT/NXHy+V/ZZS1N/LOaGGqRAAJJs3X9Ah1g+CIbRcBgNyoNYQ+SEtcyAtB9KqDruu+fF7nWjsqRaA==
+node-releases@^1.1.13:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.13.tgz#8c03296b5ae60c08e2ff4f8f22ae45bd2f210083"
+  integrity sha512-fKZGviSXR6YvVPyc011NHuJDSD8gFQvLPmc2d2V3BS4gr52ycyQ1Xzs7a8B+Ax3Ni/W+5h1h4SqmzeoA8WZRmA==
   dependencies:
     semver "^5.3.0"
 

From 32a096f3f084fd58719d9009be4ff1d6666b6565 Mon Sep 17 00:00:00 2001
From: ManfredSteyer <manfred.steyer@gmx.net>
Date: Mon, 8 Apr 2019 21:44:57 +0200
Subject: [PATCH 1094/1703] feat(@angular-devkit/build-angular): differential
 loading

This PR adds differential loading to the browser builder. First, it checks if differential loading is needed. This is the case if the compilation target is ES2015 while the browserslist points to ES5 browsers.

For providing differential loading, it calls the methods for creating the webpack config for each compilation target (e. g. ES5 and ES2015). The needed differences between those configurations are defined using parameters also added by this PR. Then it calls webpack for each of them and merges the results

This feature is currently hidden behind a flag. To activate it, set the differentialLoading flag in browser/index.ts.
---
 package.json                                  |   2 +
 .../angular_devkit/build_angular/package.json |   5 +
 .../angular-cli-files/models/build-options.ts |   8 +-
 .../models/webpack-configs/common.ts          |  43 ++--
 .../models/webpack-configs/typescript.ts      |  55 ++++--
 .../models/webpack-configs/utils.ts           |  12 ++
 .../build_angular/src/browser/index.ts        | 186 +++++++++++-------
 .../build_angular/src/browser/utils.ts        |  31 +++
 .../build_angular/src/browser/utils_spec.ts   |  56 ++++++
 .../build_angular/src/dev-server/index.ts     |   4 +-
 .../differential_loading_spec_large.ts        |  80 ++++++++
 .../test/browser/works_spec_large.ts          |   1 +
 yarn.lock                                     |  51 ++++-
 13 files changed, 424 insertions(+), 110 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/src/browser/utils.ts
 create mode 100644 packages/angular_devkit/build_angular/src/browser/utils_spec.ts
 create mode 100644 packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts

diff --git a/package.json b/package.json
index e81b60cf212f..ee3d2e61ca5b 100644
--- a/package.json
+++ b/package.json
@@ -82,6 +82,8 @@
     "@bazel/karma": "~0.26.0",
     "@bazel/typescript": "~0.26.0",
     "@ngtools/json-schema": "^1.1.0",
+    "@types/browserslist": "^4.4.0",
+    "@types/caniuse-api": "^3.0.0",
     "@types/copy-webpack-plugin": "^4.4.1",
     "@types/express": "^4.16.0",
     "@types/glob": "^7.0.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index f2afa7f4818d..ec554f4708bc 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -14,6 +14,8 @@
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.10.0",
     "autoprefixer": "9.5.1",
+    "browserslist": "4.5.2",
+    "caniuse-api": "3.0.0",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.2",
@@ -83,5 +85,8 @@
     "popper.js": "^1.14.1",
     "protractor": "~5.4.0",
     "zone.js": "^0.9.0"
+  },
+  "peerDependencies": {
+    "typescript": ">=2.7 < 3.4"
   }
 }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
index d32668885405..53591aae038d 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
@@ -73,8 +73,14 @@ export interface BuildOptions {
   lazyModules: string[];
   platform?: 'browser' | 'server';
   fileReplacements: NormalizedFileReplacement[];
-    /** @deprecated use only for compatibility in 8.x; will be removed in 9.0 */
+  /** @deprecated use only for compatibility in 8.x; will be removed in 9.0 */
   rebaseRootRelativeCssUrls?: boolean;
+
+  /* Append script target version to filename. */
+  esVersionInFileName?: boolean;
+
+  /* When specified it will be used instead of the script target in the tsconfig.json. */
+  scriptTargetOverride?: ts.ScriptTarget;
 }
 
 export interface WebpackTestOptions extends BuildOptions {
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index d9cfd69b5043..98d13c347dcd 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -8,6 +8,7 @@
 import { tags } from '@angular-devkit/core';
 import * as CopyWebpackPlugin from 'copy-webpack-plugin';
 import * as path from 'path';
+import * as ts from 'typescript';
 import {
   Configuration,
   ContextReplacementPlugin,
@@ -21,8 +22,8 @@ import { CleanCssWebpackPlugin } from '../../plugins/cleancss-webpack-plugin';
 import { ScriptsWebpackPlugin } from '../../plugins/scripts-webpack-plugin';
 import { findAllNodeModules, findUp } from '../../utilities/find-up';
 import { requireProjectModule } from '../../utilities/require-project-module';
-import { BuildOptions, WebpackConfigOptions } from '../build-options';
-import { getOutputHashFormat, normalizeExtraEntryPoints } from './utils';
+import { WebpackConfigOptions } from '../build-options';
+import { getEsVersionForFileName, getOutputHashFormat, normalizeExtraEntryPoints } from './utils';
 
 const ProgressPlugin = require('webpack/lib/ProgressPlugin');
 const CircularDependencyPlugin = require('circular-dependency-plugin');
@@ -55,16 +56,36 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
   const extraPlugins: any[] = [];
   const entryPoints: { [key: string]: string[] } = {};
 
+  const targetInFileName = getEsVersionForFileName(
+    buildOptions.scriptTargetOverride,
+    buildOptions.esVersionInFileName,
+  );
+
   if (buildOptions.main) {
     entryPoints['main'] = [path.resolve(root, buildOptions.main)];
   }
 
+  const es5Polyfills = path.join(__dirname, '..', 'es5-polyfills.js');
   if (buildOptions.es5BrowserSupport) {
-    entryPoints['polyfills.es5'] = [path.join(__dirname, '..', 'es5-polyfills.js')];
+    entryPoints['polyfills.es5'] = [es5Polyfills];
+    if (!buildOptions.aot) {
+      entryPoints['polyfills.es5'].push(path.join(__dirname, '..', 'es5-jit-polyfills.js'));
+    }
+  }
+
+  if (buildOptions.es5BrowserSupport === undefined
+    && buildOptions.scriptTargetOverride === ts.ScriptTarget.ES5) {
+    entryPoints['polyfills'] = [es5Polyfills];
+    if (!buildOptions.aot) {
+      entryPoints['polyfills'].push(path.join(__dirname, '..', 'es5-jit-polyfills.js'));
+    }
   }
 
   if (buildOptions.polyfills) {
-    entryPoints['polyfills'] = [path.resolve(root, buildOptions.polyfills)];
+    entryPoints['polyfills'] = [
+      ...(entryPoints['polyfills'] || []),
+      path.resolve(root, buildOptions.polyfills),
+    ];
   }
 
   if (!buildOptions.aot) {
@@ -72,18 +93,11 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
       ...(entryPoints['polyfills'] || []),
       path.join(__dirname, '..', 'jit-polyfills.js'),
     ];
-
-    if (buildOptions.es5BrowserSupport) {
-      entryPoints['polyfills.es5'] = [
-        ...entryPoints['polyfills.es5'],
-        path.join(__dirname, '..', 'es5-jit-polyfills.js'),
-      ];
-    }
   }
 
   if (buildOptions.profile || process.env['NG_BUILD_PROFILING']) {
     extraPlugins.push(new debug.ProfilingPlugin({
-      outputPath: path.resolve(root, 'chrome-profiler-events.json'),
+      outputPath: path.resolve(root, `chrome-profiler-events${targetInFileName}.json`),
     }));
   }
 
@@ -104,7 +118,6 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
           }
 
           existingEntry.paths.push(resolvedPath);
-
         } else {
           prev.push({
             bundleName,
@@ -177,7 +190,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
   }
 
   if (buildOptions.statsJson) {
-    extraPlugins.push(new StatsPlugin('stats.json', 'verbose'));
+    extraPlugins.push(new StatsPlugin(`stats${targetInFileName}.json`, 'verbose'));
   }
 
   let sourceMapUseRule;
@@ -305,7 +318,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
       futureEmitAssets: true,
       path: path.resolve(root, buildOptions.outputPath as string),
       publicPath: buildOptions.deployUrl,
-      filename: `[name]${hashFormat.chunk}.js`,
+      filename: `[name]${targetInFileName}${hashFormat.chunk}.js`,
       // cast required until typings include `futureEmitAssets` property
     } as Output,
     watch: buildOptions.watch,
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
index 89bfe5ed7571..5e92c917ac91 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
@@ -15,8 +15,37 @@ import {
   PLATFORM
 } from '@ngtools/webpack';
 import { buildOptimizerLoader } from './common';
-import { WebpackConfigOptions } from '../build-options';
+import { WebpackConfigOptions, BuildOptions } from '../build-options';
+
+function _pluginOptionsOverrides(
+  buildOptions: BuildOptions,
+  pluginOptions: AngularCompilerPluginOptions
+): AngularCompilerPluginOptions {
+  const compilerOptions = {
+    ...(pluginOptions.compilerOptions || {})
+  }
 
+  const hostReplacementPaths: { [replace: string]: string } = {};
+  if (buildOptions.fileReplacements) {
+    for (const replacement of buildOptions.fileReplacements) {
+      hostReplacementPaths[replacement.replace] = replacement.with;
+    }
+  }
+
+  if (buildOptions.scriptTargetOverride) {
+    compilerOptions.target = buildOptions.scriptTargetOverride;
+  }
+
+  if (buildOptions.preserveSymlinks) {
+    compilerOptions.preserveSymlinks = true;
+  }
+
+  return {
+    ...pluginOptions,
+    hostReplacementPaths,
+    compilerOptions
+  };
+}
 
 function _createAotPlugin(
   wco: WebpackConfigOptions,
@@ -25,13 +54,8 @@ function _createAotPlugin(
   extract = false,
 ) {
   const { root, buildOptions } = wco;
-  options.compilerOptions = options.compilerOptions || {};
-
-  if (wco.buildOptions.preserveSymlinks) {
-    options.compilerOptions.preserveSymlinks = true;
-  }
 
-  let i18nInFile = buildOptions.i18nFile
+  const i18nInFile = buildOptions.i18nFile
     ? path.resolve(root, buildOptions.i18nFile)
     : undefined;
 
@@ -54,14 +78,7 @@ function _createAotPlugin(
     }
   }
 
-  const hostReplacementPaths: { [replace: string]: string } = {};
-  if (buildOptions.fileReplacements) {
-    for (const replacement of buildOptions.fileReplacements) {
-      hostReplacementPaths[replacement.replace] = replacement.with;
-    }
-  }
-
-  const pluginOptions: AngularCompilerPluginOptions = {
+  let pluginOptions: AngularCompilerPluginOptions = {
     mainPath: useMain ? path.join(root, buildOptions.main) : undefined,
     ...i18nFileAndFormat,
     locale: buildOptions.i18nLocale,
@@ -69,7 +86,6 @@ function _createAotPlugin(
     missingTranslation: buildOptions.i18nMissingTranslation,
     sourceMap: buildOptions.sourceMap.scripts,
     additionalLazyModules,
-    hostReplacementPaths,
     nameLazyFiles: buildOptions.namedChunks,
     forkTypeChecker: buildOptions.forkTypeChecker,
     contextElementDependencyConstructor: require('webpack/lib/dependencies/ContextElementDependency'),
@@ -78,6 +94,9 @@ function _createAotPlugin(
     importFactories: buildOptions.experimentalImportFactories,
     ...options,
   };
+
+  pluginOptions = _pluginOptionsOverrides(buildOptions, pluginOptions);
+
   return new AngularCompilerPlugin(pluginOptions);
 }
 
@@ -112,7 +131,7 @@ export function getAotConfig(wco: WebpackConfigOptions, extract = false) {
 export function getTypescriptWorkerPlugin(wco: WebpackConfigOptions, workerTsConfigPath: string) {
   const { buildOptions } = wco;
 
-  const pluginOptions: AngularCompilerPluginOptions = {
+  let pluginOptions: AngularCompilerPluginOptions = {
     skipCodeGeneration: true,
     tsConfigPath: workerTsConfigPath,
     mainPath: undefined,
@@ -127,5 +146,7 @@ export function getTypescriptWorkerPlugin(wco: WebpackConfigOptions, workerTsCon
     discoverLazyRoutes: false,
   };
 
+  pluginOptions = _pluginOptionsOverrides(buildOptions, pluginOptions);
+
   return new AngularCompilerPlugin(pluginOptions);
 }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
index 27d6a37c60c5..0a601b89e769 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
@@ -12,6 +12,7 @@ import * as path from 'path';
 import { basename, normalize } from '@angular-devkit/core';
 import { ExtraEntryPoint, ExtraEntryPointClass } from '../../../browser/schema';
 import { SourceMapDevToolPlugin } from 'webpack';
+import * as ts from 'typescript';
 
 export const ngAppResolve = (resolvePath: string): string => {
   return path.resolve(process.cwd(), resolvePath);
@@ -89,3 +90,14 @@ export function getSourceMapDevTool(
     append: hiddenSourceMap ? false : undefined,
   });
 }
+
+/**
+ * Returns an ES version file suffix to differentiate between various builds.
+ */
+export function getEsVersionForFileName(
+  scriptTargetOverride: ts.ScriptTarget | undefined,
+  esVersionInFileName = false,
+): string {
+  return scriptTargetOverride && esVersionInFileName ?
+    '-' + ts.ScriptTarget[scriptTargetOverride].toLowerCase() : '';
+}
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index b4fa9ab8f6e6..7aeab2a9f000 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -5,16 +5,14 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import {
   BuilderContext,
   BuilderInfo,
   BuilderOutput,
   createBuilder,
 } from '@angular-devkit/architect';
-import {
-  WebpackLoggingCallback,
-  runWebpack,
-} from '@angular-devkit/build-webpack';
+import { WebpackLoggingCallback, runWebpack } from '@angular-devkit/build-webpack';
 import {
   Path,
   analytics,
@@ -25,27 +23,27 @@ import {
   logging,
   normalize,
   resolve,
-  schema,
-  virtualFs,
+  schema, virtualFs,
 } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as fs from 'fs';
-import { Observable, from, of } from 'rxjs';
+import { Observable, combineLatest, from, of } from 'rxjs';
 import { concatMap, map, switchMap } from 'rxjs/operators';
-import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
+import * as ts from 'typescript';
+import * as webpack from 'webpack';
 import { NgBuildAnalyticsPlugin } from '../../plugins/webpack/analytics';
 import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
 import {
   getAotConfig,
   getBrowserConfig,
   getCommonConfig,
+  getEsVersionForFileName,
   getNonAotConfig,
   getStatsConfig,
   getStylesConfig,
   getWorkerConfig,
 } from '../angular-cli-files/models/webpack-configs';
 import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
-import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
 import { augmentAppWithServiceWorker } from '../angular-cli-files/utilities/service-worker';
 import {
   statsErrorsToString,
@@ -60,7 +58,7 @@ import {
 } from '../utils';
 import { Schema as BrowserBuilderSchema } from './schema';
 
-import webpack = require('webpack');
+
 const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');
 const webpackMerge = require('webpack-merge');
 
@@ -69,7 +67,6 @@ export type BrowserBuilderOutput = json.JsonObject & BuilderOutput & {
   outputPath: string;
 };
 
-
 export function createBrowserLoggingCallback(
   verbose: boolean,
   logger: logging.LoggerApi,
@@ -101,7 +98,7 @@ export function buildWebpackConfig(
     analytics?: analytics.Analytics,
     builderInfo?: BuilderInfo,
   } = {},
-): webpack.Configuration {
+): webpack.Configuration[] {
   // Ensure Build Optimizer is only used with AOT.
   if (options.buildOptimizer && !options.aot) {
     throw new Error(`The 'buildOptimizer' option cannot be used without 'aot'.`);
@@ -112,74 +109,100 @@ export function buildWebpackConfig(
   const tsConfigPath = getSystemPath(normalize(resolve(root, normalize(options.tsConfig))));
   const tsConfig = readTsconfig(tsConfigPath);
 
-  const projectTs = requireProjectModule(getSystemPath(projectRoot), 'typescript') as typeof ts;
-
-  const supportES2015 = tsConfig.options.target !== projectTs.ScriptTarget.ES3
-    && tsConfig.options.target !== projectTs.ScriptTarget.ES5;
-
   const logger = additionalOptions.logger
     ? additionalOptions.logger.createChild('webpackConfigOptions')
     : new logging.NullLogger();
 
-  wco = {
-    root: getSystemPath(root),
-    logger,
-    projectRoot: getSystemPath(projectRoot),
-    buildOptions: options,
-    tsConfig,
-    tsConfigPath,
-    supportES2015,
-  };
+  const scriptTarget = tsConfig.options.target;
+  // todo enabe when differential loading is complete
+  // const differentialLoading = isDifferentialLoadingNeeded(projectRoot, scriptTarget);
+  const differentialLoading = false;
+
+  const scriptTargets = differentialLoading ? [ts.ScriptTarget.ES5, scriptTarget] : [scriptTarget];
+
+  // For differential loading, we can have several targets
+  return scriptTargets.map(scriptTarget => {
+    let buildOptions: NormalizedBrowserBuilderSchema = { ...options };
+    if (differentialLoading) {
+      // For differential loading, the builder needs to created the index.html by itself
+      // without using a webpack plugin.
+      buildOptions = {
+        ...options,
+        es5BrowserSupport: undefined,
+        index: '',
+        esVersionInFileName: true,
+        scriptTargetOverride: scriptTarget,
+      };
+    }
 
-  wco.buildOptions.progress = defaultProgress(wco.buildOptions.progress);
-
-  const webpackConfigs: {}[] = [
-    getCommonConfig(wco),
-    getBrowserConfig(wco),
-    getStylesConfig(wco),
-    getStatsConfig(wco),
-  ];
-
-  if (additionalOptions.analytics) {
-    // If there's analytics, add our plugin. Otherwise no need to slow down the build.
-    let category = 'build';
-    if (additionalOptions.builderInfo) {
-      // We already vetted that this is a "safe" package, otherwise the analytics would be noop.
-      category = additionalOptions.builderInfo.builderName.split(':')[1];
+    const supportES2015
+      = scriptTarget !== ts.ScriptTarget.ES3 && scriptTarget !== ts.ScriptTarget.ES5;
+
+    wco = {
+      root: getSystemPath(root),
+      logger,
+      projectRoot: getSystemPath(projectRoot),
+      buildOptions: buildOptions,
+      tsConfig,
+      tsConfigPath,
+      supportES2015,
+    };
+
+    wco.buildOptions.progress = defaultProgress(wco.buildOptions.progress);
+
+    const webpackConfigs: {}[] = [
+      getCommonConfig(wco),
+      getBrowserConfig(wco),
+      getStylesConfig(wco),
+      getStatsConfig(wco),
+    ];
+
+    if (wco.buildOptions.main || wco.buildOptions.polyfills) {
+      const typescriptConfigPartial = wco.buildOptions.aot
+        ? getAotConfig(wco)
+        : getNonAotConfig(wco);
+      webpackConfigs.push(typescriptConfigPartial);
     }
-    // The category is the builder name if it's an angular builder.
-    webpackConfigs.push({
-      plugins: [
-        new NgBuildAnalyticsPlugin(wco.projectRoot, additionalOptions.analytics, category),
-      ],
-    });
-  }
 
-  if (wco.buildOptions.main || wco.buildOptions.polyfills) {
-    const typescriptConfigPartial = wco.buildOptions.aot
-      ? getAotConfig(wco)
-      : getNonAotConfig(wco);
-    webpackConfigs.push(typescriptConfigPartial);
-  }
+    if (additionalOptions.analytics) {
+      // If there's analytics, add our plugin. Otherwise no need to slow down the build.
+      let category = 'build';
+      if (additionalOptions.builderInfo) {
+        // We already vetted that this is a "safe" package, otherwise the analytics would be noop.
+        category = additionalOptions.builderInfo.builderName.split(':')[1];
+      }
+      // The category is the builder name if it's an angular builder.
+      webpackConfigs.push({
+        plugins: [
+          new NgBuildAnalyticsPlugin(wco.projectRoot, additionalOptions.analytics, category),
+        ],
+      });
+    }
 
-  if (wco.buildOptions.webWorkerTsConfig) {
-    webpackConfigs.push(getWorkerConfig(wco));
-  }
+    if (wco.buildOptions.webWorkerTsConfig) {
+      webpackConfigs.push(getWorkerConfig(wco));
+    }
 
-  const webpackConfig = webpackMerge(webpackConfigs);
+    const webpackConfig = webpackMerge(webpackConfigs);
 
-  if (options.profile || process.env['NG_BUILD_PROFILING']) {
-    const smp = new SpeedMeasurePlugin({
-      outputFormat: 'json',
-      outputTarget: getSystemPath(join(root, 'speed-measure-plugin.json')),
-    });
+    if (options.profile || process.env['NG_BUILD_PROFILING']) {
+      const esVersionInFileName = getEsVersionForFileName(
+        wco.buildOptions.scriptTargetOverride,
+        wco.buildOptions.esVersionInFileName,
+      );
 
-    return smp.wrap(webpackConfig);
-  }
+      const smp = new SpeedMeasurePlugin({
+        outputFormat: 'json',
+        outputTarget: getSystemPath(join(root,
+          `speed-measure-plugin${esVersionInFileName}.json`)),
+      });
 
-  return webpackConfig;
-}
+      return smp.wrap(webpackConfig);
+    }
 
+    return webpackConfig;
+  });
+}
 
 export async function buildBrowserWebpackConfigFromWorkspace(
   options: BrowserBuilderSchema,
@@ -191,7 +214,7 @@ export async function buildBrowserWebpackConfigFromWorkspace(
     analytics?: analytics.Analytics,
     builderInfo?: BuilderInfo,
   } = {},
-): Promise<webpack.Configuration> {
+): Promise<webpack.Configuration[]> {
   // TODO: Use a better interface for workspace access.
   const projectRoot = resolve(workspace.root, normalize(workspace.getProject(projectName).root));
   const sourceRoot = workspace.getProject(projectName).sourceRoot;
@@ -212,7 +235,7 @@ export async function buildBrowserWebpackConfigFromContext(
   options: BrowserBuilderSchema,
   context: BuilderContext,
   host: virtualFs.Host<fs.Stats>,
-): Promise<{ workspace: experimental.workspace.Workspace, config: webpack.Configuration }> {
+): Promise<{ workspace: experimental.workspace.Workspace, config: webpack.Configuration[] }> {
   const registry = new schema.CoreSchemaRegistry();
   registry.addPostTransform(schema.transforms.addUndefinedDefaults);
 
@@ -249,6 +272,7 @@ export type BrowserConfigTransformFn = (
   config: webpack.Configuration,
 ) => Observable<webpack.Configuration>;
 
+
 export function buildWebpackBrowser(
   options: BrowserBuilderSchema,
   context: BuilderContext,
@@ -264,7 +288,7 @@ export function buildWebpackBrowser(
   const configFn = transforms.config;
   const outputFn = transforms.output;
   const loggingFn = transforms.logging
-      || createBrowserLoggingCallback(!!options.verbose, context.logger);
+    || createBrowserLoggingCallback(!!options.verbose, context.logger);
 
   // This makes a host observable into a cold one. This is because we want to wait until
   // subscription before calling buildBrowserWebpackConfigFromContext, which can throw.
@@ -272,14 +296,14 @@ export function buildWebpackBrowser(
     switchMap(() => from(buildBrowserWebpackConfigFromContext(options, context, host))),
     switchMap(({ workspace, config }) => {
       if (configFn) {
-        return configFn(workspace, config).pipe(
+        return combineLatest(config.map(config => configFn(workspace, config))).pipe(
           map(config => ({ workspace, config })),
         );
       } else {
         return of({ workspace, config });
       }
     }),
-    switchMap(({workspace, config}) => {
+    switchMap(({ workspace, config }) => {
       if (options.deleteOutputPath) {
         return deleteOutputDir(
           normalize(context.workspaceRoot),
@@ -290,7 +314,7 @@ export function buildWebpackBrowser(
         return of({ workspace, config });
       }
     }),
-    switchMap(({ workspace, config }) => {
+    switchMap(({ workspace, config: configs }) => {
       const projectName = context.target
         ? context.target.project : workspace.getDefaultProjectName();
 
@@ -303,7 +327,18 @@ export function buildWebpackBrowser(
         normalize(workspace.getProject(projectName).root),
       );
 
-      return runWebpack(config, context, { logging: loggingFn }).pipe(
+      return combineLatest(
+        configs.map(config => runWebpack(config, context, { logging: loggingFn })),
+      )
+      .pipe(
+        switchMap(buildEvents => {
+          if (buildEvents.length === 2) {
+            // todo implement writing index.html for differential loading in another PR
+          }
+
+          return of(buildEvents);
+        }),
+        map(buildEvents => ({ success: buildEvents.every(r => r.success) })),
         concatMap(buildEvent => {
           if (buildEvent.success && !options.watch && options.serviceWorker) {
             return from(augmentAppWithServiceWorker(
@@ -320,7 +355,8 @@ export function buildWebpackBrowser(
         }),
         map(event => ({
           ...event,
-          outputPath: config.output && config.output.path || '',
+          // If we use differential loading, both configs have the same outputs
+          outputPath: getSystemPath(join(normalize(context.workspaceRoot), options.outputPath)),
         } as BrowserBuilderOutput)),
         concatMap(output => outputFn ? outputFn(output) : of(output)),
       );
diff --git a/packages/angular_devkit/build_angular/src/browser/utils.ts b/packages/angular_devkit/build_angular/src/browser/utils.ts
new file mode 100644
index 000000000000..8949ab5348b4
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/browser/utils.ts
@@ -0,0 +1,31 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { Path, getSystemPath } from '@angular-devkit/core';
+import * as browserslist from 'browserslist';
+import * as caniuse from 'caniuse-api';
+import * as ts from 'typescript';
+
+
+export function isDifferentialLoadingNeeded(
+  projectRoot: Path,
+  target: ts.ScriptTarget = ts.ScriptTarget.ES5): boolean {
+
+  const supportES2015 = target !== ts.ScriptTarget.ES3 && target !== ts.ScriptTarget.ES5;
+
+  return supportES2015 && isEs5SupportNeeded(projectRoot);
+}
+
+export function isEs5SupportNeeded(projectRoot: Path): boolean {
+  const browsersList: string[] = browserslist(
+    undefined, {
+      path: getSystemPath(projectRoot),
+    });
+
+  return !caniuse.isSupported('es6-module', browsersList.join(', '));
+}
diff --git a/packages/angular_devkit/build_angular/src/browser/utils_spec.ts b/packages/angular_devkit/build_angular/src/browser/utils_spec.ts
new file mode 100644
index 000000000000..9f0938e1ef1e
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/browser/utils_spec.ts
@@ -0,0 +1,56 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+
+import { TestProjectHost } from '@angular-devkit/architect/testing';
+import { join } from '@angular-devkit/core';
+import { ScriptTarget } from 'typescript';
+import { isDifferentialLoadingNeeded } from './utils';
+
+const devkitRoot = (global as any)._DevKitRoot; // tslint:disable-line:no-any
+const workspaceRoot = join(
+  devkitRoot,
+  'tests/angular_devkit/build_angular/hello-world-app/');
+
+const host = new TestProjectHost(workspaceRoot);
+
+
+describe('differential loading', () => {
+
+  beforeEach(async () => host.initialize().toPromise());
+  afterEach(async () => host.restore().toPromise());
+
+  it('detects the need for differential loading for IE 9-11 and ES2015', () => {
+    host.writeMultipleFiles({
+      'browserslist': 'IE 9-11',
+    });
+
+    const needed = isDifferentialLoadingNeeded(host.root(), ScriptTarget.ES2015);
+    expect(needed).toBe(true);
+  });
+
+  it('detects no need for differential loading for Chrome and ES2015', () => {
+    host.writeMultipleFiles({
+      'browserslist': 'last 1 chrome version',
+    });
+
+    const needed = isDifferentialLoadingNeeded(host.root(), ScriptTarget.ES2015);
+
+    expect(needed).toBe(false);
+  });
+
+  it('detects no need for differential loading for target is ES5', () => {
+    host.writeMultipleFiles({
+      'browserslist': 'last 1 chrome version',
+    });
+
+    const needed = isDifferentialLoadingNeeded(host.root(), ScriptTarget.ES5);
+
+    expect(needed).toBe(false);
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index c05fd05a6cf6..d5e4132f1872 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -117,7 +117,9 @@ export function serveWebpackBrowser(
       context,
       host,
     );
-    let webpackConfig = webpackConfigResult.config;
+
+    // No differential loading for dev-server, hence there is just one config
+    let webpackConfig = webpackConfigResult.config[0];
     const workspace = webpackConfigResult.workspace;
 
     if (transforms.browserConfig) {
diff --git a/packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts
new file mode 100644
index 000000000000..11d190340193
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts
@@ -0,0 +1,80 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { Architect } from '@angular-devkit/architect/src/index';
+import { PathFragment } from '@angular-devkit/core';
+import { browserBuild, createArchitect, host } from '../utils';
+
+// This feature is currently hidden behind a flag
+xdescribe('Browser Builder with differential loading', () => {
+  const target = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+
+  afterEach(async () => host.restore().toPromise());
+
+  it('emits all the neccessary files', async () => {
+    host.replaceInFile(
+      'tsconfig.json',
+      '"target": "es5"',
+      '"target": "es2015"',
+    );
+
+    const { files } = await browserBuild(architect, host, target);
+
+    const expectedOutputs = [
+      'favicon.ico',
+      'index.html',
+
+      'main-es2015.js',
+      'main-es2015.js.map',
+      'main-es5.js',
+      'main-es5.js.map',
+
+      'polyfills-es2015.js',
+      'polyfills-es2015.js.map',
+      'polyfills-es5.js',
+      'polyfills-es5.js.map',
+
+      'runtime-es2015.js',
+      'runtime-es2015.js.map',
+      'runtime-es5.js',
+      'runtime-es5.js.map',
+
+      'styles-es2015.js',
+      'styles-es2015.js.map',
+      'styles-es5.js',
+      'styles-es5.js.map',
+
+      'vendor-es2015.js',
+      'vendor-es2015.js.map',
+      'vendor-es5.js',
+      'vendor-es5.js.map',
+    ] as PathFragment[];
+
+    expect(Object.keys(files))
+      .toEqual(jasmine.arrayWithExactContents(expectedOutputs));
+  });
+
+  it('emits the right ES formats', async () => {
+    host.replaceInFile(
+      'tsconfig.json',
+      '"target": "es5"',
+      '"target": "es2015"',
+    );
+
+    const { files } = await browserBuild(architect, host, target, { optimization: true });
+    expect(await files['main-es5.js']).not.toContain('class');
+    expect(await files['main-es2015.js']).toContain('class');
+  });
+
+});
diff --git a/packages/angular_devkit/build_angular/test/browser/works_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/works_spec_large.ts
index b35c1e7920c0..37013244745a 100644
--- a/packages/angular_devkit/build_angular/test/browser/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/works_spec_large.ts
@@ -19,6 +19,7 @@ describe('Browser Builder basic test', () => {
     await host.initialize().toPromise();
     architect = (await createArchitect(host.root())).architect;
   });
+
   afterEach(async () => host.restore().toPromise());
 
   it('works', async () => {
diff --git a/yarn.lock b/yarn.lock
index 1336f8157df7..8e728591abe7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -246,6 +246,16 @@
     "@types/connect" "*"
     "@types/node" "*"
 
+"@types/browserslist@^4.4.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@types/browserslist/-/browserslist-4.4.0.tgz#e2a5f7f8c7e97afb39f50812a77e5230d3ca2353"
+  integrity sha512-hrIjWSu7Hh96/rKlpChe58qHEwIZ0+F5Zf4QNdvSVP5LUXbaJM04g9tBjo702VTNqPZr5znEJeqNR3nAV3vJPg==
+
+"@types/caniuse-api@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/caniuse-api/-/caniuse-api-3.0.0.tgz#af31cc52062be0ab24583be072fd49b634dcc2fe"
+  integrity sha512-wT1VfnScjAftZsvLYaefu/UuwYJdYBwD2JDL2OQd01plGmuAoir5V6HnVHgrfh7zEwcasoiyO2wQ+W58sNh2sw==
+
 "@types/caseless@*":
   version "0.12.1"
   resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.1.tgz#9794c69c8385d0192acc471a540d1f8e0d16218a"
@@ -1575,6 +1585,15 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
+browserslist@4.5.2:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.2.tgz#36ad281f040af684555a23c780f5c2081c752df0"
+  integrity sha512-zmJVLiKLrzko0iszd/V4SsjTaomFeoVzQGYYOYgRgsbh7WNh95RgDB0CmBdFWYs/3MyFSt69NypjL/h3iaddKQ==
+  dependencies:
+    caniuse-lite "^1.0.30000951"
+    electron-to-chromium "^1.3.116"
+    node-releases "^1.1.11"
+
 browserslist@^4.0.0, browserslist@^4.3.3:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.4.tgz#4477b737db6a1b07077275b24791e680d4300425"
@@ -1798,6 +1817,21 @@ camelcase@^4.0.0, camelcase@^4.1.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
   integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
+caniuse-api@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
+  integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==
+  dependencies:
+    browserslist "^4.0.0"
+    caniuse-lite "^1.0.0"
+    lodash.memoize "^4.1.2"
+    lodash.uniq "^4.5.0"
+
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000951:
+  version "1.0.30000955"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000955.tgz#360fdb9a1e41d6dd996130411334e44a39e4446d"
+  integrity sha512-6AwmIKgqCYfDWWadRkAuZSHMQP4Mmy96xAXEdRBlN/luQhlRYOKgwOlZ9plpCOsVbBuqbTmGqDK3JUM/nlr8CA==
+
 caniuse-lite@^1.0.30000898, caniuse-lite@^1.0.30000899:
   version "1.0.30000903"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000903.tgz#86d46227759279b3db345ddbe778335dbba9e858"
@@ -3032,6 +3066,11 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
+electron-to-chromium@^1.3.116:
+  version "1.3.121"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.121.tgz#761aaec1ec947b8ed3e9538177598d8f6ca3b5bd"
+  integrity sha512-ALxUkgrnQ6zg2SN9zHnwDcDRy577haGT9dqsbq8lfeAgmEUPC+58SrrU8vIHpGRf7SEyyBYy4mlfonDnoKxONw==
+
 electron-to-chromium@^1.3.122:
   version "1.3.124"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
@@ -5624,6 +5663,11 @@ lodash.get@^4.4.2:
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
   integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
 
+lodash.memoize@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
+
 lodash.tail@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
@@ -5644,6 +5688,11 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
+lodash.uniq@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
+
 lodash@^4.16.6, lodash@^4.17.11, lodash@^4.17.5:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
@@ -6319,7 +6368,7 @@ node-releases@^1.0.1:
   dependencies:
     semver "^5.3.0"
 
-node-releases@^1.1.13:
+node-releases@^1.1.11, node-releases@^1.1.13:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.13.tgz#8c03296b5ae60c08e2ff4f8f22ae45bd2f210083"
   integrity sha512-fKZGviSXR6YvVPyc011NHuJDSD8gFQvLPmc2d2V3BS4gr52ycyQ1Xzs7a8B+Ax3Ni/W+5h1h4SqmzeoA8WZRmA==

From 6dac8186f3c3e6bc3bff2616916f9d5106c32547 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 9 Apr 2019 09:48:23 +0200
Subject: [PATCH 1095/1703] fix(@angular-devkit/build-webpack): add dot to file
 extension in emitted files

---
 packages/angular_devkit/build_webpack/src/utils.ts          | 6 +++---
 .../src/webpack-dev-server/index_spec_large.ts              | 2 +-
 .../build_webpack/src/webpack/index_spec_large.ts           | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_webpack/src/utils.ts b/packages/angular_devkit/build_webpack/src/utils.ts
index eee54f4be61c..e481b90adbb7 100644
--- a/packages/angular_devkit/build_webpack/src/utils.ts
+++ b/packages/angular_devkit/build_webpack/src/utils.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import * as path from 'path';
 import * as webpack from 'webpack';
 
 export interface EmittedFiles {
@@ -16,7 +17,6 @@ export interface EmittedFiles {
 }
 
 export function getEmittedFiles(compilation: webpack.compilation.Compilation): EmittedFiles[] {
-  const getExtension = (file: string) => file.split('.').reverse()[0];
   const files: EmittedFiles[] = [];
 
   for (const chunk of Object.values(compilation.chunks)) {
@@ -26,7 +26,7 @@ export function getEmittedFiles(compilation: webpack.compilation.Compilation): E
     };
 
     for (const file of chunk.files) {
-      files.push({ ...entry, file, extension: getExtension(file) } as EmittedFiles);
+      files.push({ ...entry, file, extension: path.extname(file) } as EmittedFiles);
     }
   }
 
@@ -38,7 +38,7 @@ export function getEmittedFiles(compilation: webpack.compilation.Compilation): E
 
     files.push({
       file,
-      extension: getExtension(file),
+      extension: path.extname(file),
       initial: false,
     });
   }
diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec_large.ts b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec_large.ts
index dc5faf4be431..fe75a3f5aa94 100644
--- a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec_large.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec_large.ts
@@ -65,7 +65,7 @@ describe('Dev Server Builder', () => {
       name: 'main',
       initial: true,
       file: 'bundle.js',
-      extension: 'js',
+      extension: '.js',
     });
     await run.stop();
   }, 30000);
diff --git a/packages/angular_devkit/build_webpack/src/webpack/index_spec_large.ts b/packages/angular_devkit/build_webpack/src/webpack/index_spec_large.ts
index 114bc56fc6cb..9c3db5b863f8 100644
--- a/packages/angular_devkit/build_webpack/src/webpack/index_spec_large.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack/index_spec_large.ts
@@ -64,7 +64,7 @@ describe('Webpack Builder basic test', () => {
         name: 'main',
         initial: true,
         file: 'bundle.js',
-        extension: 'js',
+        extension: '.js',
       });
 
       await run.stop();
@@ -95,8 +95,8 @@ describe('Webpack Builder basic test', () => {
 
       expect(output.success).toBe(true);
       expect(output.emittedFiles).toContain(
-        { name: 'main', initial: true, file: 'main.js', extension: 'js' },
-        { name: 'polyfills', initial: true, file: 'polyfills.js', extension: 'js' },
+        { name: 'main', initial: true, file: 'main.js', extension: '.js' },
+        { name: 'polyfills', initial: true, file: 'polyfills.js', extension: '.js' },
       );
 
       await run.stop();

From 55863a564418addf1daf792a7bdea882deb24320 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 9 Apr 2019 10:06:13 +0200
Subject: [PATCH 1096/1703] feat(@angular-devkit/build-webpack): include
 entrypoints in emitted files

Entrypoints might have other files associate with them such as runtime.js, it is is paramount to keep the relation between them especially when this result is needed to generate an index file
---
 .../angular_devkit/build_webpack/src/utils.ts | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/packages/angular_devkit/build_webpack/src/utils.ts b/packages/angular_devkit/build_webpack/src/utils.ts
index e481b90adbb7..5c4887d884ae 100644
--- a/packages/angular_devkit/build_webpack/src/utils.ts
+++ b/packages/angular_devkit/build_webpack/src/utils.ts
@@ -19,29 +19,32 @@ export interface EmittedFiles {
 export function getEmittedFiles(compilation: webpack.compilation.Compilation): EmittedFiles[] {
   const files: EmittedFiles[] = [];
 
-  for (const chunk of Object.values(compilation.chunks)) {
-    const entry: Partial<EmittedFiles> = {
-      name: chunk.name,
-      initial: chunk.isOnlyInitial(),
-    };
-
-    for (const file of chunk.files) {
-      files.push({ ...entry, file, extension: path.extname(file) } as EmittedFiles);
+  // entrypoints might have multiple outputs
+  // such as runtime.js
+  for (const [name, entrypoint] of compilation.entrypoints) {
+    const entryFiles: string[] = (entrypoint && entrypoint.getFiles()) || [];
+    for (const file of entryFiles) {
+      files.push({ name, file, extension: path.extname(file), initial: true });
     }
   }
 
-  for (const file of Object.keys(compilation.assets)) {
-    if (files.some(e => e.file === file)) {
-      // skip as this already exists
-      continue;
+  // adds all chunks to the list of emitted files such as lazy loaded modules
+  for (const chunk of Object.values(compilation.chunks)) {
+    for (const file of chunk.files as string[]) {
+      files.push({
+        name: chunk.name,
+        file,
+        extension: path.extname(file),
+        initial: chunk.isOnlyInitial(),
+      });
     }
+  }
 
-    files.push({
-      file,
-      extension: path.extname(file),
-      initial: false,
-    });
+  // other all files
+  for (const file of Object.keys(compilation.assets)) {
+    files.push({ file, extension: path.extname(file), initial: false });
   }
 
-  return files;
+  // dedupe
+  return files.filter(({ file }, index) => files.findIndex(f => f.file === file) === index);
 }

From 0baa9c879e0df9965db0beca6d6046d952733c83 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 9 Apr 2019 10:36:05 +0200
Subject: [PATCH 1097/1703] feat(@angular-devkit/build-angular): improve
 handling of nomodules and modules in index generation

Since when having differential loading we already know which files originated from which build. We shouldn't need to merge and transform this data.

With this change, the index generator accepts a couple of new inputs.
1. `files` - used for Js and CSS files which require nomodule nor module attributes
2. `moduleFiles` - Js files that need to have a `module` attribute
3. `noModuleFiles`  - Js files that need to have a `nomodule` attribute
4. `entrypoints` - used to sort the insertion of files in the HTML file
---
 .../plugins/generate-index-html.ts            | 129 +++++++++---------
 .../plugins/generate-index-html_spec.ts       |  92 ++++++++++---
 .../plugins/index-html-webpack-plugin.ts      |  50 +++----
 3 files changed, 159 insertions(+), 112 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/generate-index-html.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/generate-index-html.ts
index 0ae40bc1ee3d..d25aad88feeb 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/generate-index-html.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/generate-index-html.ts
@@ -16,37 +16,39 @@ import {
 const parse5 = require('parse5');
 
 
-export type LoadOutputFileFunctionType = (file: string) => string;
+export type LoadOutputFileFunctionType = (file: string) => Promise<string>;
 
-export interface GenerateIndexHtmlParams {
-  // input file name (e. g. index.html)
+export interface GenerateIndexHtmlOptions {
+  /* Input file name (e. g. index.html) */
   input: string;
-  // contents of input
+  /* Input contents */
   inputContent: string;
   baseHref?: string;
   deployUrl?: string;
   sri: boolean;
-  // the files emitted by the build
-  unfilteredSortedFiles: CompiledFileInfo[];
-  // additional files that should be added using nomodule
-  noModuleFiles: Set<string>;
-  // function that loads a file
-  // This allows us to use different routines within the IndexHtmlWebpackPlugin and
-  // when used without this plugin.
+  /*
+   * Files emitted by the build.
+   * Js files will be added without 'nomodule' nor 'module'.
+   */
+  files: FileInfo[];
+  /** Files that should be added using 'nomodule'. */
+  noModuleFiles?: FileInfo[];
+  /** Files that should be added using 'module'. */
+  moduleFiles?: FileInfo[];
+  /*
+   * Function that loads a file used.
+   * This allows us to use different routines within the IndexHtmlWebpackPlugin and
+   * when used without this plugin.
+   */
   loadOutputFile: LoadOutputFileFunctionType;
+  /** Used to sort the inseration of files in the HTML file */
+  entrypoints: string[];
 }
 
-/*
- * Defines the type of script tag that is generated for the script reference
- * nomodule: <script src="..." nomodule></script>
- * module: <script src="..." type="module"></script>
- * none: <script src="..."></script>
- */
-export type CompiledFileType = 'nomodule' | 'module' | 'none';
-
-export interface CompiledFileInfo {
-  file: string;
-  type: CompiledFileType;
+export interface FileInfo {
+  fileName: string;
+  name: string;
+  extension: string;
 }
 
 /*
@@ -55,41 +57,32 @@ export interface CompiledFileInfo {
  * after processing several configurations in order to build different sets of
  * bundles for differential serving.
  */
-export function generateIndexHtml(params: GenerateIndexHtmlParams): Source {
-
-  const loadOutputFile = params.loadOutputFile;
-
-  // Filter files
-  const existingFiles = new Set<string>();
-  const stylesheets: string[] = [];
-  const scripts: string[] = [];
-
-  const fileNames = params.unfilteredSortedFiles.map(f => f.file);
-  const moduleFilesArray =  params.unfilteredSortedFiles
-    .filter(f => f.type === 'module')
-    .map(f => f.file);
-
-  const moduleFiles = new Set<string>(moduleFilesArray);
-
-  const noModuleFilesArray = params.unfilteredSortedFiles
-    .filter(f => f.type === 'nomodule')
-    .map(f => f.file);
-
-  noModuleFilesArray.push(...params.noModuleFiles);
-
-  const noModuleFiles = new Set<string>(noModuleFilesArray);
-
-  for (const file of fileNames) {
-
-    if (existingFiles.has(file)) {
-      continue;
-    }
-    existingFiles.add(file);
-
-    if (file.endsWith('.js')) {
-      scripts.push(file);
-    } else if (file.endsWith('.css')) {
-      stylesheets.push(file);
+export async function generateIndexHtml(params: GenerateIndexHtmlOptions): Promise<Source> {
+  const {
+    loadOutputFile,
+    files,
+    noModuleFiles = [],
+    moduleFiles = [],
+    entrypoints,
+  } = params;
+
+  const stylesheets = new Set<string>();
+  const scripts = new Set<string>();
+
+  // Sort files in the order we want to insert them by entrypoint and dedupes duplicates
+  const mergedFiles = [...noModuleFiles, ...moduleFiles, ...files];
+  for (const entrypoint of entrypoints) {
+    for (const { extension, fileName, name } of mergedFiles) {
+      if (name !== entrypoint) { continue; }
+
+      switch (extension) {
+        case '.js':
+          scripts.add(fileName);
+          break;
+        case '.css':
+          stylesheets.add(fileName);
+          break;
+      }
     }
   }
 
@@ -103,8 +96,7 @@ export function generateIndexHtml(params: GenerateIndexHtmlParams): Source {
       for (const htmlChild of docChild.childNodes) {
         if (htmlChild.tagName === 'head') {
           headElement = htmlChild;
-        }
-        if (htmlChild.tagName === 'body') {
+        } else if (htmlChild.tagName === 'body') {
           bodyElement = htmlChild;
         }
       }
@@ -143,16 +135,19 @@ export function generateIndexHtml(params: GenerateIndexHtmlParams): Source {
       { name: 'src', value: (params.deployUrl || '') + script },
     ];
 
-    if (noModuleFiles.has(script)) {
-      attrs.push({ name: 'nomodule', value: null });
-    }
-
-    if (moduleFiles.has(script)) {
-      attrs.push({ name: 'type', value: 'module' });
+    // We want to include nomodule or module when a file is not common amongs all
+    // such as runtime.js
+    const scriptPredictor = ({ fileName }: FileInfo): boolean => fileName === script;
+    if (!files.some(scriptPredictor)) {
+      if (noModuleFiles.some(scriptPredictor)) {
+        attrs.push({ name: 'nomodule', value: null });
+      } else if (moduleFiles.some(scriptPredictor)) {
+        attrs.push({ name: 'type', value: 'module' });
+      }
     }
 
     if (params.sri) {
-      const content = loadOutputFile(script);
+      const content = await loadOutputFile(script);
       attrs.push(..._generateSriAttributes(content));
     }
 
@@ -222,7 +217,7 @@ export function generateIndexHtml(params: GenerateIndexHtmlParams): Source {
     ];
 
     if (params.sri) {
-      const content = loadOutputFile(stylesheet);
+      const content = await loadOutputFile(stylesheet);
       attrs.push(..._generateSriAttributes(content));
     }
 
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/generate-index-html_spec.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/generate-index-html_spec.ts
index 02d72550b4d2..1c7b1d28dec3 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/generate-index-html_spec.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/generate-index-html_spec.ts
@@ -5,32 +5,92 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { generateIndexHtml } from './generate-index-html';
+import { tags } from '@angular-devkit/core';
+import { FileInfo, GenerateIndexHtmlOptions, generateIndexHtml } from './generate-index-html';
 
 describe('index-html-webpack-plugin', () => {
+  const indexGeneratorOptions: GenerateIndexHtmlOptions = {
+    input: 'index.html',
+    inputContent: '<html><head></head><body></body></html>',
+    baseHref: '/',
+    sri: false,
+    files: [],
+    loadOutputFile: async (_fileName: string) => '',
+    entrypoints: ['polyfills', 'main', 'styles'],
+  };
 
-  it('can generate index.html', () => {
+  const oneLineHtml = (html: TemplateStringsArray) =>
+     tags.stripIndents`${html}`.replace(/(\>\s+)/g, '>');
 
+  it('can generate index.html', async () => {
     const source = generateIndexHtml({
-      input: 'index.html',
-      inputContent: '<html><head></head><body></body></html>',
-      baseHref: '/',
-      sri: false,
-      loadOutputFile: (fileName: string) => '',
-      unfilteredSortedFiles: [
-        {file: 'a.js', type: 'module'},
-        {file: 'b.js', type: 'nomodule'},
-        {file: 'c.js', type: 'none'},
+      ...indexGeneratorOptions,
+      files: [
+        { fileName: 'styles.css', extension: '.css', name: 'styles' },
+        { fileName: 'runtime.js', extension: '.js', name: 'main' },
+        { fileName: 'main.js', extension: '.js', name: 'main' },
+        { fileName: 'runtime.js', extension: '.js', name: 'polyfills' },
+        { fileName: 'polyfills.js', extension: '.js', name: 'polyfills' },
       ],
-      noModuleFiles: new Set<string>(),
     });
 
-    const html = source.source();
+    const html = (await source).source();
+    expect(html).toEqual(oneLineHtml`
+      <html>
+        <head><base href="/">
+          <link rel="stylesheet" href="styles.css">
+        </head>
+        <body>
+          <script src="runtime.js"></script>
+          <script src="polyfills.js"></script>
+          <script src="main.js"></script>
+        </body>
+      </html>
+    `);
+  });
+
+  it('should emit correct script tags when having module and non-module js', async () => {
+    const es2015JsFiles: FileInfo[] = [
+      { fileName: 'runtime-es2015.js', extension: '.js', name: 'main' },
+      { fileName: 'main-es2015.js', extension: '.js', name: 'main' },
+      { fileName: 'runtime-es2015.js', extension: '.js', name: 'polyfills' },
+      { fileName: 'polyfills-es2015.js', extension: '.js', name: 'polyfills' },
+    ];
+
+    const es5JsFiles: FileInfo[] = [
+      { fileName: 'runtime-es5.js', extension: '.js', name: 'main' },
+      { fileName: 'main-es5.js', extension: '.js', name: 'main' },
+      { fileName: 'runtime-es5.js', extension: '.js', name: 'polyfills' },
+      { fileName: 'polyfills-es5.js', extension: '.js', name: 'polyfills' },
+    ];
 
-    expect(html).toContain('<script src="a.js" type="module"></script>');
-    expect(html).toContain('<script src="b.js" nomodule></script>');
-    expect(html).toContain('<script src="c.js"></script>');
+    const source = generateIndexHtml({
+      ...indexGeneratorOptions,
+      files: [
+        { fileName: 'styles.css', extension: '.css', name: 'styles' },
+        { fileName: 'styles.css', extension: '.css', name: 'styles' },
+      ],
+      moduleFiles: es2015JsFiles,
+      noModuleFiles: es5JsFiles,
+    });
 
+    const html = (await source).source();
+    expect(html).toEqual(oneLineHtml`
+      <html>
+        <head>
+          <base href="/">
+          <link rel="stylesheet" href="styles.css">
+        </head>
+        <body>
+          <script src="runtime-es5.js" nomodule></script>
+          <script src="polyfills-es5.js" nomodule></script>
+          <script src="runtime-es2015.js" type="module"></script>
+          <script src="polyfills-es2015.js" type="module"></script>
+          <script src="main-es5.js" nomodule></script>
+          <script src="main-es2015.js" type="module"></script>
+        </body>
+      </html>
+    `);
   });
 
 });
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
index 48a560a78aaa..2396f1b366b1 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
@@ -5,8 +5,9 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import * as path from 'path';
 import { Compiler, compilation } from 'webpack';
-import { CompiledFileInfo, CompiledFileType, generateIndexHtml } from './generate-index-html';
+import { FileInfo, generateIndexHtml } from './generate-index-html';
 
 export interface IndexHtmlWebpackPluginOptions {
   input: string;
@@ -65,45 +66,36 @@ export class IndexHtmlWebpackPlugin {
       (compilation as compilation.Compilation & { fileDependencies: Set<string> })
         .fileDependencies.add(this._options.input);
 
-      const loadOutputFile = (name: string) => compilation.assets[name].source();
-
       // Get all files for selected entrypoints
-      const unfilteredSortedFiles: string[] = [];
-      const noModuleFiles = new Set<string>();
-      const otherFiles = new Set<string>();
-      for (const entryName of this._options.entrypoints) {
-        const entrypoint = compilation.entrypoints.get(entryName);
-        if (entrypoint && entrypoint.getFiles) {
-          const files: string[] = entrypoint.getFiles() || [];
-          unfilteredSortedFiles.push(...files);
-
-          if (this._options.noModuleEntrypoints.includes(entryName)) {
-            files.forEach(file => noModuleFiles.add(file));
-          } else {
-            files.forEach(file => otherFiles.add(file));
-          }
+      const files: FileInfo[] = [];
+      const noModuleFiles: FileInfo[] = [];
+
+      for (const [entryName, entrypoint] of compilation.entrypoints) {
+        const entryFiles: FileInfo[] = (entrypoint && entrypoint.getFiles() || [])
+          .map((f: string): FileInfo => ({
+            name: entryName,
+            fileName: f,
+            extension: path.extname(f),
+          }));
+
+        if (this._options.noModuleEntrypoints.includes(entryName)) {
+          noModuleFiles.push(...entryFiles);
+        } else {
+          files.push(...entryFiles);
         }
       }
 
-      // Clean out files that are used in all types of entrypoints
-      otherFiles.forEach(file => noModuleFiles.delete(file));
-
-      // If this plugin calls generateIndexHtml it always uses type: 'none' to align with
-      // its original behavior.
-      const compiledFiles: CompiledFileInfo[] = unfilteredSortedFiles.map(f => ({
-        file: f,
-        type: 'none' as CompiledFileType,
-      }));
-
-      const indexSource = generateIndexHtml({
+      const loadOutputFile = (name: string) => compilation.assets[name].source();
+      const indexSource = await generateIndexHtml({
         input: this._options.input,
         inputContent,
         baseHref: this._options.baseHref,
         deployUrl: this._options.deployUrl,
         sri: this._options.sri,
-        unfilteredSortedFiles: compiledFiles,
+        files,
         noModuleFiles,
         loadOutputFile,
+        entrypoints: this._options.entrypoints,
       });
 
       // Add to compilation assets

From 2acbd27827fade863f53fc6f24b715afbdc9da6a Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 9 Apr 2019 05:20:39 +0000
Subject: [PATCH 1098/1703] build: update sass to version 1.18.0

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index ec554f4708bc..7657fbb2c8d1 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -37,7 +37,7 @@
     "postcss-loader": "3.0.0",
     "raw-loader": "1.0.0",
     "rxjs": "6.4.0",
-    "sass": "1.17.4",
+    "sass": "1.18.0",
     "sass-loader": "7.1.0",
     "semver": "6.0.0",
     "source-map-support": "0.5.11",
diff --git a/yarn.lock b/yarn.lock
index 8e728591abe7..80373c38db1b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8067,10 +8067,10 @@ sass-loader@7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
-sass@1.17.4:
-  version "1.17.4"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.17.4.tgz#b65b9d11f5cef9b96d6c44566ab91d6357210dbd"
-  integrity sha512-NM/RkY54d6C5xJMWk7Z+p0/TfIB71/46/T335Egc0O3G+NeKKVFz1s9EwBlekRnYq3fUCTsbk0zPNMpee5LIdA==
+sass@1.18.0:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.18.0.tgz#f34371c31e268e555c2ac8e43d2b64d194e7d090"
+  integrity sha512-Mc579V+BhH693tqt+lvph+gmRqmC6BjtsEVsjkW1944DEA5a0wPuCi781hL3fY4EDuqZnEVPbu42CZRywwE97g==
   dependencies:
     chokidar "^2.0.0"
 

From a063e26e8630a583065642ca3ccb929bf99471d8 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 25 Mar 2019 09:52:07 -0400
Subject: [PATCH 1099/1703] refactor(@angular-devkit/build-angular): minor
 cleanup of karma builder

---
 .../build_angular/src/karma/index.ts             | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index d437b36dc848..5e65daf89621 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
-import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { resolve } from 'path';
 import { Observable, from } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
@@ -32,10 +31,8 @@ async function initialize(
   context: BuilderContext,
   // tslint:disable-next-line:no-implicit-dependencies
 ): Promise<[typeof import ('karma'), webpack.Configuration]> {
-  const host = new NodeJsSyncHost();
   const { config } = await generateBrowserWebpackConfigFromContext(
-    // only two properties are missing:
-    // * `outputPath` which is fixed for tests
+    // only one property is missing:
     // * `index` which is not used for tests
     { ...options as unknown as BrowserBuilderOptions, outputPath: '' },
     context,
@@ -45,7 +42,6 @@ async function initialize(
       getNonAotConfig(wco),
       getTestConfig(wco),
     ],
-    host,
   );
 
   // tslint:disable-next-line:no-implicit-dependencies
@@ -54,12 +50,10 @@ async function initialize(
   return [karma, config];
 }
 
-export function runKarma(
+export function execute(
   options: KarmaBuilderOptions,
   context: BuilderContext,
 ): Observable<BuilderOutput> {
-  const root = context.workspaceRoot;
-
   return from(initialize(options, context)).pipe(
     switchMap(([karma, webpackConfig]) => new Observable<BuilderOutput>(subscriber => {
       const karmaOptions: KarmaConfigOptions = {};
@@ -76,7 +70,7 @@ export function runKarma(
       if (options.reporters) {
         // Split along commas to make it more natural, and remove empty strings.
         const reporters = options.reporters
-          .reduce<string[]>((acc, curr) => acc.concat(curr.split(/,/)), [])
+          .reduce<string[]>((acc, curr) => acc.concat(curr.split(',')), [])
           .filter(x => !!x);
 
         if (reporters.length > 0) {
@@ -85,7 +79,7 @@ export function runKarma(
       }
 
       // Assign additional karmaConfig options to the local ngapp config
-      karmaOptions.configFile = resolve(root, options.karmaConfig);
+      karmaOptions.configFile = resolve(context.workspaceRoot, options.karmaConfig);
 
       karmaOptions.buildWebpack = {
         options,
@@ -118,4 +112,4 @@ export function runKarma(
   );
 }
 
-export default createBuilder<Record<string, string> & KarmaBuilderOptions>(runKarma);
+export default createBuilder<Record<string, string> & KarmaBuilderOptions>(execute);

From c8e0c35e604b04e39a8bce4327e53351ca83f88d Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 25 Mar 2019 10:44:40 -0400
Subject: [PATCH 1100/1703] feat(@angular-devkit/build-angular): support karma
 builder webpack transformation

---
 .../build_angular/src/karma/index.ts             | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index 5e65daf89621..762c9d11ca1d 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -26,6 +26,9 @@ type KarmaConfigOptions = import ('karma').ConfigOptions & {
   configFile?: string;
 };
 
+type WebpackConfigurationTransformer =
+  (configuration: webpack.Configuration) => webpack.Configuration;
+
 async function initialize(
   options: KarmaBuilderOptions,
   context: BuilderContext,
@@ -53,6 +56,10 @@ async function initialize(
 export function execute(
   options: KarmaBuilderOptions,
   context: BuilderContext,
+  transforms: {
+    webpackConfiguration?: WebpackConfigurationTransformer,
+    karmaOptions?: (options: KarmaConfigOptions) => KarmaConfigOptions,
+  } = {},
 ): Observable<BuilderOutput> {
   return from(initialize(options, context)).pipe(
     switchMap(([karma, webpackConfig]) => new Observable<BuilderOutput>(subscriber => {
@@ -83,7 +90,9 @@ export function execute(
 
       karmaOptions.buildWebpack = {
         options,
-        webpackConfig,
+        webpackConfig: transforms.webpackConfiguration
+          ? transforms.webpackConfiguration(webpackConfig)
+          : webpackConfig,
         // Pass onto Karma to emit BuildEvents.
         successCb: () => subscriber.next({ success: true }),
         failureCb: () => subscriber.next({ success: false }),
@@ -95,7 +104,9 @@ export function execute(
       };
 
       // Complete the observable once the Karma server returns.
-      const karmaServer = new karma.Server(karmaOptions, () => subscriber.complete());
+      const karmaServer = new karma.Server(
+        transforms.karmaOptions ? transforms.karmaOptions(karmaOptions) : karmaOptions,
+        () => subscriber.complete());
       // karma typings incorrectly define start's return value as void
       // tslint:disable-next-line:no-use-of-empty-return-value
       const karmaStart = karmaServer.start() as unknown as Promise<void>;
@@ -112,4 +123,5 @@ export function execute(
   );
 }
 
+export { KarmaBuilderOptions };
 export default createBuilder<Record<string, string> & KarmaBuilderOptions>(execute);

From 2f290a40c8248dceaa252020ad90654e9c4f1d61 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sat, 6 Apr 2019 09:01:13 +0200
Subject: [PATCH 1101/1703] test: enable script target e2e for ivy

This has been resolved in angular/compiler-cli version 8.0.0-beta.10
---
 tests/legacy-cli/e2e/tests/build/script-target.ts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/build/script-target.ts b/tests/legacy-cli/e2e/tests/build/script-target.ts
index f01fbfa6f0e9..cd9d796652cb 100644
--- a/tests/legacy-cli/e2e/tests/build/script-target.ts
+++ b/tests/legacy-cli/e2e/tests/build/script-target.ts
@@ -12,13 +12,6 @@ export default function () {
     return Promise.resolve();
   }
 
-  if (getGlobalVariable('argv')['ivy']) {
-    // todo: enable when NGCC supports this.
-    // At the moment, we re-run NGCC with a different 'propertiesToConsider'.
-    // https://angular-team.atlassian.net/browse/FW-1211
-    return Promise.resolve();
-  }
-
   return Promise.resolve()
     .then(() => updateJsonFile('tsconfig.json', configJson => {
       const compilerOptions = configJson['compilerOptions'];

From f66ea9619b996d4de4562e3d47280990d815dca8 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 10 Apr 2019 03:22:48 +0000
Subject: [PATCH 1102/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 6f7ef9453dc3..13644191697c 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#e34ac02a1a5591b884479e1b401e4fa8d7b46afe",
-    "@angular/common": "github:angular/common-builds#39ed43f923aaab44063321df44279573671ac93b",
-    "@angular/compiler": "github:angular/compiler-builds#9772e60ed489e1e4be4f1095c2a0c02ad185a50b",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#1132bc8ad936ac1ec54e5038f286f517395a8baf",
-    "@angular/core": "github:angular/core-builds#4e7f4fbbe4acf9b5f527d5082258507a1a2127a4",
-    "@angular/forms": "github:angular/forms-builds#e8c497aa782ec7761c170c65d066e7e2bf96dd87",
-    "@angular/language-service": "github:angular/language-service-builds#02299fb2fcb6b21862dbe9775c4e4ab670b840f1",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#35331fd4d1f31c7838f608dd3a15fd8328ea6fa3",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#3a1171c83a3c2eab514a99debd6e4e7005e3ab98",
-    "@angular/router": "github:angular/router-builds#7aca6d71b2579deda620720c33a7fc6e049c0f9e"
+    "@angular/animations": "github:angular/animations-builds#95201da0e8c3f52ec46da77c73cbec7c68c9220c",
+    "@angular/common": "github:angular/common-builds#53abc1306d011e9a6cd13fbccd9d502f7ac5a931",
+    "@angular/compiler": "github:angular/compiler-builds#c08a4b94b9fedf92cfaf1081eebd7b1f1ca9116f",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#293abe4f8d3c3e9d595bd6ba4fe1c906ca7505d6",
+    "@angular/core": "github:angular/core-builds#d6ea1e8cd60e1e5bd7114cb879209e1ae2ec6c6e",
+    "@angular/forms": "github:angular/forms-builds#259311ac5f80e34049d7ec9021dec3c172f3a8cf",
+    "@angular/language-service": "github:angular/language-service-builds#fa42e0a571e37d8175cddcca2b7ba597b34048ec",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#ebfd18a3a81a3dc8d7ba7c3f16f8e5b18c5dab31",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#3a5c617246d54e4c5d48e4ca949266d062d08465",
+    "@angular/router": "github:angular/router-builds#bab8594b643b06957163397ff1bbc11469543e14"
   }
 }
\ No newline at end of file

From 609acf4cac67b7cfb4934347cedcb4c22135fb25 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 8 Apr 2019 11:19:58 +0100
Subject: [PATCH 1103/1703] fix(@angular-devkit/build-angular): verify chunk
 files exist before accessing

`chunk.files[0]` can be undefined, which caused  `chunk.files[0].endsWith` to fail.
---
 .../angular_devkit/build_angular/plugins/webpack/analytics.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts b/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts
index 51b4f707af45..d2f1ee59d08b 100644
--- a/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts
+++ b/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts
@@ -200,7 +200,7 @@ export class NgBuildAnalyticsPlugin {
       }
     }
     for (const chunk of json.chunks) {
-      if (chunk.files[0].endsWith('.css')) {
+      if (chunk.files[0] && chunk.files[0].endsWith('.css')) {
         this._stats.cssSize += chunk.size || 0;
       }
     }

From 323c8838ff5a14248f5479793c66549349807bdf Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 10 Apr 2019 10:32:36 +0100
Subject: [PATCH 1104/1703] feat(@angular-devkit/build-angular): support web
 workers in karma builder

Followup to https://github.com/angular/angular-cli/pull/13700, the karma builder did not get the same support but it should.
---
 .../src/angular-cli-files/models/webpack-configs/worker.ts   | 5 +++++
 packages/angular_devkit/build_angular/src/browser/index.ts   | 5 +----
 packages/angular_devkit/build_angular/src/karma/index.ts     | 2 ++
 packages/angular_devkit/build_angular/src/karma/schema.json  | 4 ++++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/worker.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/worker.ts
index 1ec0a148ed0d..fc3b8d5b3896 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/worker.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/worker.ts
@@ -15,7 +15,12 @@ const WorkerPlugin = require('worker-plugin');
 
 export function getWorkerConfig(wco: WebpackConfigOptions): Configuration {
   const { buildOptions } = wco;
+
   if (!buildOptions.webWorkerTsConfig) {
+    return {};
+  }
+
+  if (typeof buildOptions.webWorkerTsConfig != 'string') {
     throw new Error('The `webWorkerTsConfig` must be a string.');
   }
 
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 7aeab2a9f000..64f0e8d62bdf 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -155,6 +155,7 @@ export function buildWebpackConfig(
       getBrowserConfig(wco),
       getStylesConfig(wco),
       getStatsConfig(wco),
+      getWorkerConfig(wco),
     ];
 
     if (wco.buildOptions.main || wco.buildOptions.polyfills) {
@@ -179,10 +180,6 @@ export function buildWebpackConfig(
       });
     }
 
-    if (wco.buildOptions.webWorkerTsConfig) {
-      webpackConfigs.push(getWorkerConfig(wco));
-    }
-
     const webpackConfig = webpackMerge(webpackConfigs);
 
     if (options.profile || process.env['NG_BUILD_PROFILING']) {
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index 762c9d11ca1d..9ee20a74b6d1 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -15,6 +15,7 @@ import {
   getNonAotConfig,
   getStylesConfig,
   getTestConfig,
+  getWorkerConfig,
 } from '../angular-cli-files/models/webpack-configs';
 import { Schema as BrowserBuilderOptions } from '../browser/schema';
 import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
@@ -44,6 +45,7 @@ async function initialize(
       getStylesConfig(wco),
       getNonAotConfig(wco),
       getTestConfig(wco),
+      getWorkerConfig(wco),
     ],
   );
 
diff --git a/packages/angular_devkit/build_angular/src/karma/schema.json b/packages/angular_devkit/build_angular/src/karma/schema.json
index a36b9797f236..1f70c9976313 100644
--- a/packages/angular_devkit/build_angular/src/karma/schema.json
+++ b/packages/angular_devkit/build_angular/src/karma/schema.json
@@ -185,6 +185,10 @@
       "items": {
         "type": "string"
       }
+    },
+    "webWorkerTsConfig": {
+      "type": "string",
+      "description": "TypeScript configuration for Web Worker modules."
     }
   },
   "additionalProperties": false,

From e6bba9eaf90e7d929b4e9da45ed5dabc5c8df49f Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 10 Apr 2019 11:09:59 +0100
Subject: [PATCH 1105/1703] fix(@angular/cli): update config schema for karma
 webworker

---
 packages/angular/cli/lib/config/schema.json | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index 774eb7daeb44..cd0b2b193e6c 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -548,7 +548,7 @@
       "type": "null",
       "definitions": {
         "appShell": {
-          "description": "App Shell target options for Build Facade.",
+          "description": "App Shell target options for Architect.",
           "type": "object",
           "properties": {
             "browserTarget": {
@@ -580,7 +580,7 @@
           "additionalProperties": false
         },
         "browser": {
-          "title": "Webpack browser schema for Build Facade.",
+          "title": "Webpack browser schema for Architect.",
           "description": "Browser target options",
           "properties": {
             "assets": {
@@ -1050,7 +1050,7 @@
           }
         },
         "devServer": {
-          "description": "Dev Server target options for Build Facade.",
+          "description": "Dev Server target options for Architect.",
           "type": "object",
           "properties": {
             "browserTarget": {
@@ -1223,7 +1223,7 @@
           "additionalProperties": false
         },
         "extracti18n": {
-          "description": "Extract i18n target options for Build Facade.",
+          "description": "Extract i18n target options for Architect.",
           "type": "object",
           "properties": {
             "browserTarget": {
@@ -1264,7 +1264,7 @@
           "additionalProperties": false
         },
         "karma": {
-          "description": "Karma target options for Build Facade.",
+          "description": "Karma target options for Architect.",
           "type": "object",
           "properties": {
             "main": {
@@ -1439,6 +1439,10 @@
               "items": {
                 "type": "string"
               }
+            },
+            "webWorkerTsConfig": {
+              "type": "string",
+              "description": "TypeScript configuration for Web Worker modules."
             }
           },
           "additionalProperties": false,
@@ -1514,7 +1518,7 @@
           }
         },
         "protractor": {
-          "description": "Protractor target options for Build Facade.",
+          "description": "Protractor target options for Architect.",
           "type": "object",
           "properties": {
             "protractorConfig": {
@@ -1822,7 +1826,7 @@
           }
         },
         "tslint": {
-          "description": "TSlint target options for Build Facade.",
+          "description": "TSlint target options for Architect.",
           "type": "object",
           "properties": {
             "tslintConfig": {

From fe98024146de885ff70bde34b75139661613c9e7 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Wed, 10 Apr 2019 13:19:37 +0200
Subject: [PATCH 1106/1703] docs: align several experimental text and update ng
 new explanation

---
 packages/angular/cli/commands/build.json            | 2 +-
 packages/angular/cli/commands/new.md                | 2 +-
 packages/angular/cli/commands/serve.json            | 2 +-
 packages/schematics/angular/application/schema.json | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/angular/cli/commands/build.json b/packages/angular/cli/commands/build.json
index 62e962ad1aca..6678ba5d744e 100644
--- a/packages/angular/cli/commands/build.json
+++ b/packages/angular/cli/commands/build.json
@@ -17,7 +17,7 @@
       "properties": {
         "buildEventLog": {
           "type": "string",
-          "description": "(experimental) Output file path for Build Event Protocol events"
+          "description": "**EXPERIMENTAL** Output file path for Build Event Protocol events"
         }
       }
     }
diff --git a/packages/angular/cli/commands/new.md b/packages/angular/cli/commands/new.md
index a11cac0c6d89..822deb745ee1 100644
--- a/packages/angular/cli/commands/new.md
+++ b/packages/angular/cli/commands/new.md
@@ -5,7 +5,7 @@ All prompts can safely be allowed to default.
 
 * The new workspace folder is given the specified project name, and contains configuration files at the top level.
 
-* By default, the files for a new initial app (with the same name as the workspace) are placed in the `src/` subfolder. A corresponding end-to-end test app is placed in the `e2e/` subfolder.
+* By default, the files for a new initial app (with the same name as the workspace) are placed in the `src/` subfolder. Corresponding end-to-end tests are placed in the `e2e/` subfolder.
 
 * The new app's configuration appears in the `projects` section of the `angular.json` workspace configuration file, under its project name.
 
diff --git a/packages/angular/cli/commands/serve.json b/packages/angular/cli/commands/serve.json
index e9be2a0dedc1..e19f0e5bab56 100644
--- a/packages/angular/cli/commands/serve.json
+++ b/packages/angular/cli/commands/serve.json
@@ -18,7 +18,7 @@
       "properties": {
         "buildEventLog": {
           "type": "string",
-          "description": "(experimental) Output file path for Build Event Protocol events"
+          "description": "**EXPERIMENTAL** Output file path for Build Event Protocol events"
         }
       }
     }
diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json
index 4b7b91730245..cb616801886f 100644
--- a/packages/schematics/angular/application/schema.json
+++ b/packages/schematics/angular/application/schema.json
@@ -20,7 +20,7 @@
       "x-prompt": "What name would you like to use for the application?"
     },
     "enableIvy": {
-      "description": "EXPERIMENTAL: True to create a new app that uses the Ivy rendering engine.",
+      "description": "**EXPERIMENTAL** True to create a new app that uses the Ivy rendering engine.",
       "type": "boolean",
       "default": false,
       "x-user-analytics": 8

From c89dd3090e7199a97d2318b46294450d5c660732 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 10 Apr 2019 05:20:57 +0000
Subject: [PATCH 1107/1703] build: update browserslist to version 4.5.4

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 32 ++++++-------------
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 7657fbb2c8d1..b9a9dd77ce2c 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -14,7 +14,7 @@
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.10.0",
     "autoprefixer": "9.5.1",
-    "browserslist": "4.5.2",
+    "browserslist": "4.5.4",
     "caniuse-api": "3.0.0",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
diff --git a/yarn.lock b/yarn.lock
index 80373c38db1b..6ceb90c1ecbd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1585,14 +1585,14 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@4.5.2:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.2.tgz#36ad281f040af684555a23c780f5c2081c752df0"
-  integrity sha512-zmJVLiKLrzko0iszd/V4SsjTaomFeoVzQGYYOYgRgsbh7WNh95RgDB0CmBdFWYs/3MyFSt69NypjL/h3iaddKQ==
+browserslist@4.5.4, browserslist@^4.5.4:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.4.tgz#166c4ecef3b51737a42436ea8002aeea466ea2c7"
+  integrity sha512-rAjx494LMjqKnMPhFkuLmLp8JWEX0o8ADTGeAbOqaF+XCvYLreZrG5uVjnPBlAQ8REZK4pzXGvp0bWgrFtKaag==
   dependencies:
-    caniuse-lite "^1.0.30000951"
-    electron-to-chromium "^1.3.116"
-    node-releases "^1.1.11"
+    caniuse-lite "^1.0.30000955"
+    electron-to-chromium "^1.3.122"
+    node-releases "^1.1.13"
 
 browserslist@^4.0.0, browserslist@^4.3.3:
   version "4.3.4"
@@ -1603,15 +1603,6 @@ browserslist@^4.0.0, browserslist@^4.3.3:
     electron-to-chromium "^1.3.82"
     node-releases "^1.0.1"
 
-browserslist@^4.5.4:
-  version "4.5.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.4.tgz#166c4ecef3b51737a42436ea8002aeea466ea2c7"
-  integrity sha512-rAjx494LMjqKnMPhFkuLmLp8JWEX0o8ADTGeAbOqaF+XCvYLreZrG5uVjnPBlAQ8REZK4pzXGvp0bWgrFtKaag==
-  dependencies:
-    caniuse-lite "^1.0.30000955"
-    electron-to-chromium "^1.3.122"
-    node-releases "^1.1.13"
-
 browserstack@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.5.1.tgz#e2dfa66ffee940ebad0a07f7e00fd4687c455d66"
@@ -1827,7 +1818,7 @@ caniuse-api@3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000951:
+caniuse-lite@^1.0.0:
   version "1.0.30000955"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000955.tgz#360fdb9a1e41d6dd996130411334e44a39e4446d"
   integrity sha512-6AwmIKgqCYfDWWadRkAuZSHMQP4Mmy96xAXEdRBlN/luQhlRYOKgwOlZ9plpCOsVbBuqbTmGqDK3JUM/nlr8CA==
@@ -3066,11 +3057,6 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.116:
-  version "1.3.121"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.121.tgz#761aaec1ec947b8ed3e9538177598d8f6ca3b5bd"
-  integrity sha512-ALxUkgrnQ6zg2SN9zHnwDcDRy577haGT9dqsbq8lfeAgmEUPC+58SrrU8vIHpGRf7SEyyBYy4mlfonDnoKxONw==
-
 electron-to-chromium@^1.3.122:
   version "1.3.124"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
@@ -6368,7 +6354,7 @@ node-releases@^1.0.1:
   dependencies:
     semver "^5.3.0"
 
-node-releases@^1.1.11, node-releases@^1.1.13:
+node-releases@^1.1.13:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.13.tgz#8c03296b5ae60c08e2ff4f8f22ae45bd2f210083"
   integrity sha512-fKZGviSXR6YvVPyc011NHuJDSD8gFQvLPmc2d2V3BS4gr52ycyQ1Xzs7a8B+Ax3Ni/W+5h1h4SqmzeoA8WZRmA==

From 7439faba12496d2f8b052426f5dd1c37a818a27e Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 5 Feb 2019 10:47:14 -0500
Subject: [PATCH 1108/1703] feat(@angular-devkit/core): implement workspace
 JSON reader/writer

---
 packages/angular_devkit/core/BUILD            |   1 +
 packages/angular_devkit/core/package.json     |   1 +
 .../angular_devkit/core/src/workspace/core.ts |  19 +-
 .../core/src/workspace/json/metadata.ts       |  74 +++
 .../core/src/workspace/json/reader.ts         | 289 +++++++++
 .../core/src/workspace/json/reader_spec.ts    | 531 ++++++++++++++++
 .../core/src/workspace/json/test/angular.json | 138 ++++
 .../json/test/cases/AddArrayEmpty.json        |  15 +
 .../json/test/cases/AddArrayPush.json         |  17 +
 .../json/test/cases/AddProject1.json          |  19 +
 .../json/test/cases/AddProject2.json          | 141 +++++
 .../test/cases/AddProjectWithTargets.json     |  33 +
 .../json/test/cases/ArrayDeleteInner.json     |  14 +
 .../json/test/cases/ArrayDeleteInnerAdd.json  |  14 +
 .../json/test/cases/ArrayDeleteLast.json      |  14 +
 .../json/test/cases/ArrayDeleteLastAdd.json   |  14 +
 .../json/test/cases/ArrayDeleteZero.json      |  14 +
 .../json/test/cases/ArrayIndexInner.json      |  14 +
 .../json/test/cases/ArrayIndexLast.json       |  14 +
 .../json/test/cases/ArrayIndexZero.json       |  14 +
 .../workspace/json/test/cases/ArrayPop.json   |  14 +
 .../workspace/json/test/cases/ArrayPush.json  |  14 +
 .../json/test/cases/ArrayReplace1.json        |  16 +
 .../json/test/cases/ArrayReplace2.json        |  14 +
 .../workspace/json/test/cases/ArrayShift.json |  14 +
 .../workspace/json/test/cases/ArraySort.json  |  14 +
 .../json/test/cases/ArraySplice1.json         |  14 +
 .../json/test/cases/ArraySplice2.json         |  14 +
 .../json/test/cases/ArrayUnshift.json         |  14 +
 .../json/test/cases/ArrayValues.json          |  22 +
 .../src/workspace/json/test/cases/Empty.json  |   5 +
 .../json/test/cases/Extensions1.json          |   6 +
 .../json/test/cases/Extensions2.json          |  11 +
 .../json/test/cases/ObjectReplace1.json       |  14 +
 .../json/test/cases/ObjectReplace2.json       |  12 +
 .../json/test/cases/ObjectReplace3.json       |  12 +
 .../json/test/cases/ProjectAddTarget.json     | 141 +++++
 .../json/test/cases/ProjectDeleteTarget.json  | 132 ++++
 .../json/test/cases/ProjectEmpty.json         |   9 +
 .../json/test/cases/ProjectFull.json          |  67 ++
 .../test/cases/ProjectModifyProperties.json   | 138 ++++
 .../json/test/cases/ProjectSetProperties.json | 139 ++++
 .../src/workspace/json/test/cases/Retain.json |  14 +
 .../core/src/workspace/json/utilities.ts      | 277 ++++++++
 .../core/src/workspace/json/writer.ts         | 363 +++++++++++
 .../core/src/workspace/json/writer_spec.ts    | 594 ++++++++++++++++++
 yarn.lock                                     |  14 +-
 47 files changed, 3469 insertions(+), 19 deletions(-)
 create mode 100644 packages/angular_devkit/core/src/workspace/json/metadata.ts
 create mode 100644 packages/angular_devkit/core/src/workspace/json/reader.ts
 create mode 100644 packages/angular_devkit/core/src/workspace/json/reader_spec.ts
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/angular.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/AddArrayEmpty.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/AddArrayPush.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/AddProject1.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/AddProject2.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/AddProjectWithTargets.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ArrayDeleteInner.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ArrayDeleteInnerAdd.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ArrayDeleteLast.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ArrayDeleteLastAdd.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ArrayDeleteZero.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ArrayIndexInner.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ArrayIndexLast.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ArrayIndexZero.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ArrayPop.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ArrayPush.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ArrayReplace1.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ArrayReplace2.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ArrayShift.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ArraySort.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ArraySplice1.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ArraySplice2.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ArrayUnshift.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ArrayValues.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/Empty.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/Extensions1.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/Extensions2.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ObjectReplace1.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ObjectReplace2.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ObjectReplace3.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ProjectAddTarget.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ProjectDeleteTarget.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ProjectEmpty.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ProjectFull.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ProjectModifyProperties.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/ProjectSetProperties.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/test/cases/Retain.json
 create mode 100644 packages/angular_devkit/core/src/workspace/json/utilities.ts
 create mode 100644 packages/angular_devkit/core/src/workspace/json/writer.ts
 create mode 100644 packages/angular_devkit/core/src/workspace/json/writer_spec.ts

diff --git a/packages/angular_devkit/core/BUILD b/packages/angular_devkit/core/BUILD
index a1ba826b9d6d..c26ae254b782 100644
--- a/packages/angular_devkit/core/BUILD
+++ b/packages/angular_devkit/core/BUILD
@@ -33,6 +33,7 @@ ts_library(
         "@npm//@types/node",
         "@npm//@types/source-map",
         "@npm//ajv",
+        "@npm//magic-string",
         # @typings: es2015.core
         # @typings: es2015.symbol.wellknown
         # @typings: es2016.array.include
diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json
index 15a168bc548a..c7d9bedf7aa8 100644
--- a/packages/angular_devkit/core/package.json
+++ b/packages/angular_devkit/core/package.json
@@ -10,6 +10,7 @@
   "dependencies": {
     "ajv": "6.10.0",
     "fast-json-stable-stringify": "2.0.0",
+    "magic-string": "0.25.1",
     "rxjs": "6.4.0",
     "source-map": "0.7.3"
   },
diff --git a/packages/angular_devkit/core/src/workspace/core.ts b/packages/angular_devkit/core/src/workspace/core.ts
index 766ebc757ac5..041f920c857b 100644
--- a/packages/angular_devkit/core/src/workspace/core.ts
+++ b/packages/angular_devkit/core/src/workspace/core.ts
@@ -6,8 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { basename, getSystemPath, join, normalize } from '../virtual-fs';
-import { ProjectDefinitionCollection, WorkspaceDefinition } from './definitions';
+import { WorkspaceDefinition } from './definitions';
 import { WorkspaceHost } from './host';
+import { readJsonWorkspace } from './json/reader';
+import { writeJsonWorkspace } from './json/writer';
 
 const formatLookup = new WeakMap<WorkspaceDefinition, WorkspaceFormat>();
 
@@ -45,8 +47,6 @@ export async function readWorkspace(
 
       const potential = getSystemPath(join(directory, name));
       if (await host.isFile(potential)) {
-        // TEMP - remove disable when actual reader is used
-        // tslint:disable-next-line:no-dead-store
         path = potential;
         format = nameFormat;
         found = true;
@@ -70,12 +70,7 @@ export async function readWorkspace(
   let workspace;
   switch (format) {
     case WorkspaceFormat.JSON:
-      // TEMP: remove the following two statements when JSON support is introduced
-      await host.readFile(path);
-      workspace = {
-        extensions: {},
-        projects: new ProjectDefinitionCollection(),
-      };
+      workspace = await readJsonWorkspace(path, host);
       break;
     default:
       throw new Error('Unsupported workspace format.');
@@ -88,8 +83,8 @@ export async function readWorkspace(
 
 export async function writeWorkspace(
   workspace: WorkspaceDefinition,
-  _host: WorkspaceHost,
-  _path?: string,
+  host: WorkspaceHost,
+  path?: string,
   format?: WorkspaceFormat,
 ): Promise<void> {
   if (format === undefined) {
@@ -101,7 +96,7 @@ export async function writeWorkspace(
 
   switch (format) {
     case WorkspaceFormat.JSON:
-      throw new Error('Not Implemented.');
+      return writeJsonWorkspace(workspace, host, path);
     default:
       throw new Error('Unsupported workspace format.');
   }
diff --git a/packages/angular_devkit/core/src/workspace/json/metadata.ts b/packages/angular_devkit/core/src/workspace/json/metadata.ts
new file mode 100644
index 000000000000..6d8b94d4529d
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/metadata.ts
@@ -0,0 +1,74 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { JsonAstArray, JsonAstKeyValue, JsonAstNode, JsonAstObject, JsonValue } from '../../json';
+import { ProjectDefinition, TargetDefinition, WorkspaceDefinition } from '../definitions';
+
+export const JsonWorkspaceSymbol = Symbol.for('@angular/core:workspace-json');
+
+export interface JsonWorkspaceDefinition extends WorkspaceDefinition {
+  [JsonWorkspaceSymbol]: JsonWorkspaceMetadata;
+}
+
+interface ChangeValues {
+  json: JsonValue;
+  project: ProjectDefinition;
+  target: TargetDefinition;
+  projectcollection: Iterable<[string, ProjectDefinition]>;
+  targetcollection: Iterable<[string, TargetDefinition]>;
+}
+
+export interface JsonChange<T extends keyof ChangeValues = keyof ChangeValues> {
+  // core collections can only be added as they are managed directly by _Collection_ objects
+  op: T extends 'json' | 'project' | 'target' ? 'add' | 'remove' | 'replace' : 'add';
+  path: string;
+  node: JsonAstNode | JsonAstKeyValue;
+  value?: ChangeValues[T];
+  type: T;
+}
+
+export class JsonWorkspaceMetadata {
+  readonly changes: JsonChange[] = [];
+
+  constructor(readonly filePath: string, readonly ast: JsonAstObject, readonly raw: string) { }
+
+  get hasChanges(): boolean {
+    return this.changes.length > 0;
+  }
+
+  get changeCount(): number {
+    return this.changes.length;
+  }
+
+  findChangesForPath(path: string): JsonChange[] {
+    return this.changes.filter(c => c.path === path);
+  }
+
+  addChange<T extends keyof ChangeValues = keyof ChangeValues>(
+    op: 'add' | 'remove' | 'replace',
+    path: string,
+    node: JsonAstArray | JsonAstObject | JsonAstKeyValue,
+    value?: ChangeValues[T],
+    type?: T,
+  ): void {
+    // Remove redundant operations
+    if (op === 'remove' || op === 'replace') {
+      for (let i = this.changes.length - 1; i >= 0; --i) {
+        const currentPath = this.changes[i].path;
+        if (currentPath === path || currentPath.startsWith(path + '/')) {
+          this.changes.splice(i, 1);
+        }
+      }
+    }
+
+    this.changes.push({ op, path, node, value, type: op === 'remove' || !type ? 'json' : type });
+  }
+
+  reset(): void {
+    this.changes.length = 0;
+  }
+}
diff --git a/packages/angular_devkit/core/src/workspace/json/reader.ts b/packages/angular_devkit/core/src/workspace/json/reader.ts
new file mode 100644
index 000000000000..53027a065b28
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/reader.ts
@@ -0,0 +1,289 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import {
+  JsonAstKeyValue,
+  JsonAstNode,
+  JsonAstObject,
+  JsonParseMode,
+  JsonValue,
+  parseJsonAst,
+} from '../../json';
+import {
+  DefinitionCollectionListener,
+  ProjectDefinition,
+  ProjectDefinitionCollection,
+  TargetDefinition,
+  TargetDefinitionCollection,
+  WorkspaceDefinition,
+} from '../definitions';
+import { WorkspaceHost } from '../host';
+import { JsonWorkspaceMetadata, JsonWorkspaceSymbol } from './metadata';
+import { createVirtualAstObject } from './utilities';
+
+interface ParserContext {
+  readonly host: WorkspaceHost;
+  readonly metadata: JsonWorkspaceMetadata;
+  readonly trackChanges: boolean;
+  error(message: string, node: JsonAstNode | JsonAstKeyValue): void;
+  warn(message: string, node: JsonAstNode | JsonAstKeyValue): void;
+}
+
+export async function readJsonWorkspace(
+  path: string,
+  host: WorkspaceHost,
+): Promise<WorkspaceDefinition> {
+  const raw = await host.readFile(path);
+
+  if (raw === undefined) {
+    throw new Error('Unable to read workspace file.');
+  }
+
+  const ast = parseJsonAst(raw, JsonParseMode.Loose);
+  if (ast.kind !== 'object') {
+    throw new Error('Invalid workspace file - expected JSON object.');
+  }
+
+  // Version check
+  const versionNode = ast.properties.find(pair => pair.key.value === 'version');
+  if (!versionNode) {
+    throw new Error('Unknown format - version specifier not found.');
+  }
+  const formatVersion = versionNode.value.value;
+  if (formatVersion !== 1) {
+    throw new Error(`Invalid format version detected - Expected:[ 1 ] Found: [ ${formatVersion} ]`);
+  }
+
+  const context: ParserContext = {
+    host,
+    metadata: new JsonWorkspaceMetadata(path, ast, raw),
+    trackChanges: true,
+    error(message, _node) {
+      // TODO: Diagnostic reporting support
+      throw new Error(message);
+    },
+    warn(_message, _node) {
+      // TODO: Diagnostic reporting support
+    },
+  };
+
+  const workspace = parseWorkspace(ast, context);
+
+  return workspace;
+}
+
+const specialWorkspaceExtensions = ['cli', 'defaultProject', 'newProjectRoot', 'schematics'];
+
+const specialProjectExtensions = ['cli', 'schematics'];
+
+function parseWorkspace(workspaceNode: JsonAstObject, context: ParserContext): WorkspaceDefinition {
+  const jsonMetadata = context.metadata;
+  let projects;
+  let projectsNode: JsonAstObject | undefined;
+  let extensions: Record<string, JsonValue> | undefined;
+  if (!context.trackChanges) {
+    extensions = Object.create(null);
+  }
+
+  for (const { key, value } of workspaceNode.properties) {
+    const name = key.value;
+
+    if (name === '$schema' || name === 'version') {
+      // skip
+    } else if (name === 'projects') {
+      if (value.kind !== 'object') {
+        context.error('Invalid "projects" field found; expected an object.', value);
+        continue;
+      }
+
+      projectsNode = value;
+      projects = parseProjectsObject(value, context);
+    } else {
+      if (!specialWorkspaceExtensions.includes(name) && !/^[a-z]{1,3}-.*/.test(name)) {
+        context.warn(`Project extension with invalid name found.`, key);
+      }
+      if (extensions) {
+        extensions[name] = value.value;
+      }
+    }
+  }
+
+  let collectionListener: DefinitionCollectionListener<ProjectDefinition> | undefined;
+  if (context.trackChanges && projectsNode) {
+    const parentNode = projectsNode;
+    collectionListener = (name, action, newValue) => {
+      jsonMetadata.addChange(action, `/projects/${name}`, parentNode, newValue, 'project');
+    };
+  }
+
+  const projectCollection = new ProjectDefinitionCollection(projects, collectionListener);
+
+  return {
+    [JsonWorkspaceSymbol]: jsonMetadata,
+    projects: projectCollection,
+    // If not tracking changes the `extensions` variable will contain the parsed
+    // values.  Otherwise the extensions are tracked via a virtual AST object.
+    extensions:
+      extensions ||
+      createVirtualAstObject(workspaceNode, {
+        exclude: ['$schema', 'version', 'projects'],
+        listener(op, path, node, value) {
+          jsonMetadata.addChange(op, path, node, value);
+        },
+      }),
+  } as WorkspaceDefinition;
+}
+
+function parseProjectsObject(
+  projectsNode: JsonAstObject,
+  context: ParserContext,
+): Record<string, ProjectDefinition> {
+  const projects: Record<string, ProjectDefinition> = Object.create(null);
+
+  for (const { key, value } of projectsNode.properties) {
+    if (value.kind !== 'object') {
+      context.warn('Skipping invalid project value; expected an object.', value);
+      continue;
+    }
+
+    const name = key.value;
+    projects[name] = parseProject(name, value, context);
+  }
+
+  return projects;
+}
+
+function parseProject(
+  projectName: string,
+  projectNode: JsonAstObject,
+  context: ParserContext,
+): ProjectDefinition {
+  const jsonMetadata = context.metadata;
+  let targets;
+  let targetsNode: JsonAstObject | undefined;
+  let extensions: Record<string, JsonValue> | undefined;
+  let properties: Record<'root' | 'sourceRoot' | 'prefix', string> | undefined;
+  if (!context.trackChanges) {
+    // If not tracking changes, the parser will store the values directly in standard objects
+    extensions = Object.create(null);
+    properties = Object.create(null);
+  }
+
+  for (const { key, value } of projectNode.properties) {
+    const name = key.value;
+    switch (name) {
+      case 'targets':
+      case 'architect':
+        if (value.kind !== 'object') {
+          context.error(`Invalid "${name}" field found; expected an object.`, value);
+          break;
+        }
+        targetsNode = value;
+        targets = parseTargetsObject(projectName, value, context);
+        break;
+      case 'prefix':
+      case 'root':
+      case 'sourceRoot':
+        if (value.kind !== 'string') {
+          context.warn(`Project property "${name}" should be a string.`, value);
+        }
+        if (properties) {
+          properties[name] = value.value as string;
+        }
+        break;
+      default:
+        if (!specialProjectExtensions.includes(name) && !/^[a-z]{1,3}-.*/.test(name)) {
+          context.warn(`Project extension with invalid name found.`, key);
+        }
+        if (extensions) {
+          extensions[name] = value.value;
+        }
+        break;
+    }
+  }
+
+  let collectionListener: DefinitionCollectionListener<TargetDefinition> | undefined;
+  if (context.trackChanges && targetsNode) {
+    const parentNode = targetsNode;
+    collectionListener = (name, action, newValue) => {
+      jsonMetadata.addChange(
+        action,
+        `/projects/${projectName}/targets/${name}`,
+        parentNode,
+        newValue,
+        'target',
+      );
+    };
+  }
+
+  const base = {
+    targets: new TargetDefinitionCollection(targets, collectionListener),
+    // If not tracking changes the `extensions` variable will contain the parsed
+    // values.  Otherwise the extensions are tracked via a virtual AST object.
+    extensions:
+      extensions ||
+      createVirtualAstObject(projectNode, {
+        exclude: ['architect', 'prefix', 'root', 'sourceRoot', 'targets'],
+        listener(op, path, node, value) {
+          jsonMetadata.addChange(op, `/projects/${projectName}${path}`, node, value);
+        },
+      }),
+  };
+
+  let project: ProjectDefinition;
+  if (context.trackChanges) {
+    project = createVirtualAstObject<ProjectDefinition>(projectNode, {
+      base,
+      include: ['prefix', 'root', 'sourceRoot'],
+      listener(op, path, node, value) {
+        jsonMetadata.addChange(op, `/projects/${projectName}${path}`, node, value);
+      },
+    });
+  } else {
+    project = {
+      ...base,
+      ...properties,
+    } as ProjectDefinition;
+  }
+
+  return project;
+}
+
+function parseTargetsObject(
+  projectName: string,
+  targetsNode: JsonAstObject,
+  context: ParserContext,
+): Record<string, TargetDefinition> {
+  const jsonMetadata = context.metadata;
+  const targets: Record<string, TargetDefinition> = Object.create(null);
+
+  for (const { key, value } of targetsNode.properties) {
+    if (value.kind !== 'object') {
+      context.warn('Skipping invalid target value; expected an object.', value);
+      continue;
+    }
+
+    const name = key.value;
+    if (context.trackChanges) {
+      targets[name] = createVirtualAstObject<TargetDefinition>(value, {
+        include: [ 'builder', 'options', 'configurations' ],
+        listener(op, path, node, value) {
+          jsonMetadata.addChange(
+            op,
+            `/projects/${projectName}/targets/${name}${path}`,
+            node,
+            value,
+          );
+        },
+      });
+    } else {
+      targets[name] = value.value as unknown as TargetDefinition;
+    }
+  }
+
+  return targets;
+}
diff --git a/packages/angular_devkit/core/src/workspace/json/reader_spec.ts b/packages/angular_devkit/core/src/workspace/json/reader_spec.ts
new file mode 100644
index 000000000000..584044d334e4
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/reader_spec.ts
@@ -0,0 +1,531 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// tslint:disable:no-non-null-assertion no-big-function
+import { readFileSync } from 'fs';
+import { JsonObject } from '../../json';
+import { stripIndent } from '../../utils/literals';
+import { TargetDefinitionCollection, WorkspaceDefinition } from '../definitions';
+import { JsonWorkspaceDefinition, JsonWorkspaceMetadata, JsonWorkspaceSymbol } from './metadata';
+import { readJsonWorkspace } from './reader';
+
+const basicFile = stripIndent`
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-foo": {
+    "is": ["good", "great", "awesome"]
+  },
+  "x-bar": 5,
+}`;
+
+const representativeFile = readFileSync(__dirname + '/test/angular.json', 'utf8');
+
+function createTestHost(content: string, onWrite?: (path: string, data: string) => void) {
+  return {
+    async readFile() {
+      return content;
+    },
+    async writeFile(path: string, data: string) {
+      if (onWrite) {
+        onWrite(path, data);
+      }
+    },
+    async isFile() {
+      return true;
+    },
+    async isDirectory() {
+      return true;
+    },
+  };
+}
+
+function getMetadata(workspace: WorkspaceDefinition): JsonWorkspaceMetadata {
+  const metadata = (workspace as JsonWorkspaceDefinition)[JsonWorkspaceSymbol];
+  expect(metadata).toBeDefined('JSON metadata not found. Invalid workspace definition returned.');
+
+  return metadata;
+}
+
+describe('readJsonWorkpace Parsing', () => {
+  it('parses a basic file', async () => {
+    const host = createTestHost(basicFile);
+
+    const workspace = await readJsonWorkspace('basic', host);
+
+    expect(workspace.projects.size).toBe(0);
+    expect(workspace.extensions['x-bar']).toBe(5);
+    expect(workspace.extensions['schematics']).toEqual({
+      '@angular/schematics:component': { prefix: 'abc' },
+    });
+  });
+
+  it('parses a representative file', async () => {
+    const host = createTestHost(representativeFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    expect(Array.from(workspace.projects.keys())).toEqual(['my-app', 'my-app-e2e']);
+    expect(workspace.extensions['newProjectRoot']).toBe('projects');
+    expect(workspace.extensions['defaultProject']).toBe('my-app');
+    expect(workspace.projects.get('my-app')!.extensions['schematics']).toEqual({
+      '@schematics/angular:component': { styleext: 'scss' },
+    });
+    expect(workspace.projects.get('my-app')!.root).toBe('');
+    expect(workspace.projects.get('my-app')!.targets.get('build')!.builder).toBe(
+      '@angular-devkit/build-angular:browser',
+    );
+  });
+
+  it('parses extensions only into extensions object', async () => {
+    const host = createTestHost(representativeFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    expect(workspace.extensions['newProjectRoot']).toBe('projects');
+    // tslint:disable-next-line:no-any
+    expect((workspace as any)['newProjectRoot']).toBeUndefined();
+
+    expect(workspace.projects.get('my-app')!.extensions['schematics']).toEqual({
+      '@schematics/angular:component': { styleext: 'scss' },
+    });
+    // tslint:disable-next-line:no-any
+    expect((workspace.projects.get('my-app') as any)['schematics']).toBeUndefined();
+  });
+
+  it('errors on invalid version', async () => {
+    const host = createTestHost(stripIndent`
+      {
+        "version": 99,
+        // Comment
+        "x-bar": 5,
+      }
+    `);
+
+    try {
+      await readJsonWorkspace('', host);
+      fail();
+    } catch (e) {
+      expect(e.message).toContain('Invalid format version detected');
+    }
+  });
+
+  it('errors on missing version', async () => {
+    const host = createTestHost(stripIndent`
+      {
+        // Comment
+        "x-bar": 5,
+      }
+    `);
+
+    try {
+      await readJsonWorkspace('', host);
+      fail();
+    } catch (e) {
+      expect(e.message).toContain('version specifier not found');
+    }
+  });
+});
+
+describe('JSON WorkspaceDefinition Tracks Workspace Changes', () => {
+  it('tracks basic extension additions', async () => {
+    const host = createTestHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    workspace.extensions['x-baz'] = 101;
+    expect(workspace.extensions['x-baz']).toBe(101);
+
+    const metadata = getMetadata(workspace);
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(1);
+
+    const change = metadata.findChangesForPath('/x-baz')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toBe(101);
+    }
+  });
+
+  it('tracks complex extension additions', async () => {
+    const host = createTestHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const value = { a: 1, b: 2, c: { d: 'abc' } };
+    workspace.extensions['x-baz'] = value;
+    expect(workspace.extensions['x-baz']).toEqual({ a: 1, b: 2, c: { d: 'abc' } });
+
+    value.b = 3;
+    expect(workspace.extensions['x-baz']).toEqual({ a: 1, b: 3, c: { d: 'abc' } });
+
+    const metadata = getMetadata(workspace);
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(1);
+
+    const change = metadata.findChangesForPath('/x-baz')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual({ a: 1, b: 3, c: { d: 'abc' } });
+    }
+  });
+
+  it('tracks add and remove of an existing extension object', async () => {
+    const host = createTestHost(basicFile);
+
+    const workspace = await readJsonWorkspace('basic', host);
+
+    workspace.extensions['schematics2'] = workspace.extensions['schematics'];
+
+    expect(workspace.extensions['schematics']).toEqual({
+      '@angular/schematics:component': { prefix: 'abc' },
+    });
+    expect(workspace.extensions['schematics2']).toEqual({
+      '@angular/schematics:component': { prefix: 'abc' },
+    });
+
+    const metadata = getMetadata(workspace);
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(1);
+
+    let change = metadata.findChangesForPath('/schematics2')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual({ '@angular/schematics:component': { prefix: 'abc' } });
+    }
+
+    workspace.extensions['schematics'] = undefined;
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(2);
+
+    change = metadata.findChangesForPath('/schematics')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('remove');
+    }
+  });
+
+  it('tracks moving and modifying an existing extension object', async () => {
+    const host = createTestHost(basicFile);
+
+    const workspace = await readJsonWorkspace('basic', host);
+
+    workspace.extensions['schematics2'] = workspace.extensions['schematics'];
+
+    expect(workspace.extensions['schematics']).toEqual({
+      '@angular/schematics:component': { prefix: 'abc' },
+    });
+    expect(workspace.extensions['schematics2']).toEqual({
+      '@angular/schematics:component': { prefix: 'abc' },
+    });
+
+    const metadata = getMetadata(workspace);
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(1);
+
+    let change = metadata.findChangesForPath('/schematics2')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual({ '@angular/schematics:component': { prefix: 'abc' } });
+    }
+
+    workspace.extensions['schematics'] = undefined;
+    (workspace.extensions['schematics2'] as JsonObject)['@angular/schematics:component'] = {
+      prefix: 'xyz',
+    };
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(2);
+
+    change = metadata.findChangesForPath('/schematics')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('remove');
+    }
+
+    change = metadata.findChangesForPath('/schematics2')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual({ '@angular/schematics:component': { prefix: 'xyz' } });
+    }
+  });
+
+  it('tracks copying and modifying an existing extension object', async () => {
+    const host = createTestHost(basicFile);
+
+    const workspace = await readJsonWorkspace('basic', host);
+
+    workspace.extensions['schematics2'] = workspace.extensions['schematics'];
+
+    expect(workspace.extensions['schematics']).toEqual({
+      '@angular/schematics:component': { prefix: 'abc' },
+    });
+    expect(workspace.extensions['schematics2']).toEqual({
+      '@angular/schematics:component': { prefix: 'abc' },
+    });
+
+    const metadata = getMetadata(workspace);
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(1);
+
+    let change = metadata.findChangesForPath('/schematics2')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual({ '@angular/schematics:component': { prefix: 'abc' } });
+    }
+
+    (workspace.extensions['schematics2'] as JsonObject)['@angular/schematics:component'] = {
+      prefix: 'xyz',
+    };
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(2);
+
+    change = metadata.findChangesForPath('/schematics/@angular/schematics:component')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('replace');
+      expect(change.value).toEqual({ prefix: 'xyz' });
+    }
+
+    change = metadata.findChangesForPath('/schematics2')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual({ '@angular/schematics:component': { prefix: 'xyz' } });
+    }
+  });
+
+  it('tracks copying, modifying, and removing an existing extension object', async () => {
+    const host = createTestHost(basicFile);
+
+    const workspace = await readJsonWorkspace('basic', host);
+
+    workspace.extensions['schematics2'] = workspace.extensions['schematics'];
+
+    expect(workspace.extensions['schematics']).toEqual({
+      '@angular/schematics:component': { prefix: 'abc' },
+    });
+    expect(workspace.extensions['schematics2']).toEqual({
+      '@angular/schematics:component': { prefix: 'abc' },
+    });
+
+    const metadata = getMetadata(workspace);
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(1);
+
+    let change = metadata.findChangesForPath('/schematics2')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual({ '@angular/schematics:component': { prefix: 'abc' } });
+    }
+
+    (workspace.extensions['schematics2'] as JsonObject)['@angular/schematics:component'] = {
+      prefix: 'xyz',
+    };
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(2);
+
+    change = metadata.findChangesForPath('/schematics/@angular/schematics:component')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('replace');
+      expect(change.value).toEqual({ prefix: 'xyz' });
+    }
+
+    change = metadata.findChangesForPath('/schematics2')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual({ '@angular/schematics:component': { prefix: 'xyz' } });
+    }
+
+    workspace.extensions['schematics'] = undefined;
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(2);
+
+    change = metadata.findChangesForPath('/schematics')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('remove');
+    }
+
+    const orderedChanges = Array.from(metadata.changes.values());
+    change = orderedChanges[1];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('remove');
+    }
+  });
+
+  it('tracks project additions with set', async () => {
+    const host = createTestHost(representativeFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    workspace.projects.set('new-app', {
+      root: 'src',
+      extensions: {},
+      targets: new TargetDefinitionCollection(),
+    });
+
+    const app = workspace.projects.get('new-app');
+    expect(app).not.toBeUndefined();
+    if (app) {
+      expect(app.extensions).toEqual({});
+      expect(app.root).toBe('src');
+    }
+
+    const metadata = getMetadata(workspace);
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(1);
+
+    const change = metadata.findChangesForPath('/projects/new-app')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual(jasmine.objectContaining({ root: 'src' }));
+    }
+  });
+
+  it('tracks project additions with add', async () => {
+    const host = createTestHost(representativeFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    workspace.projects.add({
+      name: 'new-app',
+      root: 'src',
+    });
+
+    const app = workspace.projects.get('new-app');
+    expect(app).not.toBeUndefined();
+    if (app) {
+      expect(app.extensions).toEqual({});
+      expect(app.root).toBe('src');
+    }
+
+    const metadata = getMetadata(workspace);
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(1);
+
+    const change = metadata.findChangesForPath('/projects/new-app')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual(jasmine.objectContaining({ root: 'src' }));
+    }
+  });
+});
+
+describe('JSON ProjectDefinition Tracks Project Changes', () => {
+  it('tracks property changes', async () => {
+    const host = createTestHost(representativeFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const project = workspace.projects.get('my-app');
+    expect(project).not.toBeUndefined();
+    if (!project) {
+      return;
+    }
+
+    project.prefix = 'bar';
+    expect(project.prefix).toBe('bar');
+
+    const metadata = getMetadata(workspace);
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(1);
+
+    const change = metadata.findChangesForPath('/projects/my-app/prefix')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('replace');
+      expect(change.value).toBe('bar');
+    }
+  });
+
+  it('tracks property additions', async () => {
+    const host = createTestHost(representativeFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const project = workspace.projects.get('my-app');
+    expect(project).not.toBeUndefined();
+    if (!project) {
+      return;
+    }
+
+    expect(project.sourceRoot).toBeUndefined();
+    project.sourceRoot = 'xyz';
+    expect(project.sourceRoot).toBe('xyz');
+
+    const metadata = getMetadata(workspace);
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(1);
+
+    const change = metadata.findChangesForPath('/projects/my-app/sourceRoot')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toBe('xyz');
+    }
+  });
+
+  it('tracks extension additions', async () => {
+    const host = createTestHost(representativeFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const project = workspace.projects.get('my-app');
+    expect(project).not.toBeUndefined();
+    if (!project) {
+      return;
+    }
+
+    expect(project.extensions['abc-option']).toBeUndefined();
+    project.extensions['abc-option'] = 'valueA';
+    expect(project.extensions['abc-option']).toBe('valueA');
+
+    const metadata = getMetadata(workspace);
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(1);
+
+    const change = metadata.findChangesForPath('/projects/my-app/abc-option')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toBe('valueA');
+    }
+  });
+});
diff --git a/packages/angular_devkit/core/src/workspace/json/test/angular.json b/packages/angular_devkit/core/src/workspace/json/test/angular.json
new file mode 100644
index 000000000000..91355ed28c64
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/angular.json
@@ -0,0 +1,138 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "my-app": {
+      "root": "",
+      "projectType": "application",
+      "prefix": "app",
+      "schematics": {
+        "@schematics/angular:component": {
+          "styleext": "scss"
+        }
+      },
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/my-app",
+            "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.scss"
+            ],
+            "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,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "my-app:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "my-app:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "my-app: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": [
+              "src/styles.scss"
+            ],
+            "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/**"
+            ]
+          }
+        }
+      }
+    },
+    "my-app-e2e": {
+      "root": "e2e/",
+      "projectType": "application",
+      "prefix": "",
+      "architect": {
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "e2e/protractor.conf.js",
+            "devServerTarget": "my-app:serve"
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "my-app:serve:production"
+            }
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": "e2e/tsconfig.e2e.json",
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "my-app"
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/AddArrayEmpty.json b/packages/angular_devkit/core/src/workspace/json/test/cases/AddArrayEmpty.json
new file mode 100644
index 000000000000..83cfeda3dda7
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/AddArrayEmpty.json
@@ -0,0 +1,15 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 1,
+  "x-foo": {
+    "is": ["good", "great", "awesome"]
+  },
+  "x-bar": 5,
+  "x-array": []
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/AddArrayPush.json b/packages/angular_devkit/core/src/workspace/json/test/cases/AddArrayPush.json
new file mode 100644
index 000000000000..84b9aeca6359
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/AddArrayPush.json
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 1,
+  "x-foo": {
+    "is": ["good", "great", "awesome"]
+  },
+  "x-bar": 5,
+  "x-array": [
+    "value"
+  ]
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/AddProject1.json b/packages/angular_devkit/core/src/workspace/json/test/cases/AddProject1.json
new file mode 100644
index 000000000000..ee1c8db01857
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/AddProject1.json
@@ -0,0 +1,19 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 10,
+  "x-foo": {
+    "is": ["good", "great", "awesome"]
+  },
+  "x-bar": 5,
+  "projects": {
+    "new": {
+      "root": "src"
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/AddProject2.json b/packages/angular_devkit/core/src/workspace/json/test/cases/AddProject2.json
new file mode 100644
index 000000000000..996aa07027b5
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/AddProject2.json
@@ -0,0 +1,141 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "my-app": {
+      "root": "",
+      "projectType": "application",
+      "prefix": "app",
+      "schematics": {
+        "@schematics/angular:component": {
+          "styleext": "scss"
+        }
+      },
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/my-app",
+            "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.scss"
+            ],
+            "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,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "my-app:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "my-app:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "my-app: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": [
+              "src/styles.scss"
+            ],
+            "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/**"
+            ]
+          }
+        }
+      }
+    },
+    "my-app-e2e": {
+      "root": "e2e/",
+      "projectType": "application",
+      "prefix": "",
+      "architect": {
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "e2e/protractor.conf.js",
+            "devServerTarget": "my-app:serve"
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "my-app:serve:production"
+            }
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": "e2e/tsconfig.e2e.json",
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    },
+    "new": {
+      "root": "src"
+    }
+  },
+  "defaultProject": "my-app"
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/AddProjectWithTargets.json b/packages/angular_devkit/core/src/workspace/json/test/cases/AddProjectWithTargets.json
new file mode 100644
index 000000000000..26eadbabf914
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/AddProjectWithTargets.json
@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 10,
+  "x-foo": {
+    "is": ["good", "great", "awesome"]
+  },
+  "x-bar": 5,
+  "projects": {
+    "new": {
+      "root": "src",
+      "targets": {
+        "build": {
+          "builder": "build-builder",
+          "options": {
+            "one": 1,
+            "two": false
+          },
+          "configurations": {
+            "staging": {
+              "two": true
+            }
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayDeleteInner.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayDeleteInner.json
new file mode 100644
index 000000000000..111e8e538097
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayDeleteInner.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 1,
+  "x-foo": {
+    "is": ["good", "awesome"]
+  },
+  "x-bar": 5,
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayDeleteInnerAdd.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayDeleteInnerAdd.json
new file mode 100644
index 000000000000..c6c4ada21046
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayDeleteInnerAdd.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 1,
+  "x-foo": {
+    "is": ["good", "new", "awesome"]
+  },
+  "x-bar": 5,
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayDeleteLast.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayDeleteLast.json
new file mode 100644
index 000000000000..a96c3b8338d4
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayDeleteLast.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 1,
+  "x-foo": {
+    "is": ["good", "great"]
+  },
+  "x-bar": 5,
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayDeleteLastAdd.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayDeleteLastAdd.json
new file mode 100644
index 000000000000..6ccb0498b16a
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayDeleteLastAdd.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 1,
+  "x-foo": {
+    "is": ["good", "great", "new"]
+  },
+  "x-bar": 5,
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayDeleteZero.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayDeleteZero.json
new file mode 100644
index 000000000000..2c2603005c6e
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayDeleteZero.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 1,
+  "x-foo": {
+    "is": ["great", "awesome"]
+  },
+  "x-bar": 5,
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayIndexInner.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayIndexInner.json
new file mode 100644
index 000000000000..94fecec93fd8
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayIndexInner.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 1,
+  "x-foo": {
+    "is": ["good", "value", "awesome"]
+  },
+  "x-bar": 5,
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayIndexLast.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayIndexLast.json
new file mode 100644
index 000000000000..b54fe1e5b1c6
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayIndexLast.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 1,
+  "x-foo": {
+    "is": ["good", "great", "value"]
+  },
+  "x-bar": 5,
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayIndexZero.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayIndexZero.json
new file mode 100644
index 000000000000..99ef79d5d0d5
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayIndexZero.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 1,
+  "x-foo": {
+    "is": ["value", "great", "awesome"]
+  },
+  "x-bar": 5,
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayPop.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayPop.json
new file mode 100644
index 000000000000..a96c3b8338d4
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayPop.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 1,
+  "x-foo": {
+    "is": ["good", "great"]
+  },
+  "x-bar": 5,
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayPush.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayPush.json
new file mode 100644
index 000000000000..c7a8affc6343
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayPush.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 1,
+  "x-foo": {
+    "is": ["good", "great", "awesome", "value"]
+  },
+  "x-bar": 5,
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayReplace1.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayReplace1.json
new file mode 100644
index 000000000000..81a1eb8d0a6c
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayReplace1.json
@@ -0,0 +1,16 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 1,
+  "x-foo": {
+    "is": [
+      "value"
+    ]
+  },
+  "x-bar": 5,
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayReplace2.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayReplace2.json
new file mode 100644
index 000000000000..84def4ee3fbb
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayReplace2.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 1,
+  "x-foo": {
+    "is": []
+  },
+  "x-bar": 5,
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayShift.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayShift.json
new file mode 100644
index 000000000000..2c2603005c6e
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayShift.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 1,
+  "x-foo": {
+    "is": ["great", "awesome"]
+  },
+  "x-bar": 5,
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ArraySort.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ArraySort.json
new file mode 100644
index 000000000000..655912a26e3d
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ArraySort.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 1,
+  "x-foo": {
+    "is": ["awesome", "good", "great"]
+  },
+  "x-bar": 5,
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ArraySplice1.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ArraySplice1.json
new file mode 100644
index 000000000000..a96c3b8338d4
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ArraySplice1.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 1,
+  "x-foo": {
+    "is": ["good", "great"]
+  },
+  "x-bar": 5,
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ArraySplice2.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ArraySplice2.json
new file mode 100644
index 000000000000..8e5fa76c48a3
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ArraySplice2.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 1,
+  "x-foo": {
+    "is": ["good", "great", "value1", "value2", "awesome"]
+  },
+  "x-bar": 5,
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayUnshift.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayUnshift.json
new file mode 100644
index 000000000000..8a8b3d923d96
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayUnshift.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 1,
+  "x-foo": {
+    "is": ["value", "good", "great", "awesome"]
+  },
+  "x-bar": 5,
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayValues.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayValues.json
new file mode 100644
index 000000000000..79e0d012d399
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ArrayValues.json
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 1,
+  "x-foo": {
+    "is": ["good", "great", "awesome"]
+  },
+  "x-bar": 5,
+  "x-array": [
+    5,
+    "a",
+    false,
+    null,
+    true,
+    9.9
+  ]
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/Empty.json b/packages/angular_devkit/core/src/workspace/json/test/cases/Empty.json
new file mode 100644
index 000000000000..a1fd7e64df9a
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/Empty.json
@@ -0,0 +1,5 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "projects": {}
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/Extensions1.json b/packages/angular_devkit/core/src/workspace/json/test/cases/Extensions1.json
new file mode 100644
index 000000000000..731bffd356cb
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/Extensions1.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {}
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/Extensions2.json b/packages/angular_devkit/core/src/workspace/json/test/cases/Extensions2.json
new file mode 100644
index 000000000000..1d2157b18252
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/Extensions2.json
@@ -0,0 +1,11 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "schematics": {
+    "@schematics/angular:component": {
+      "prefix": "app"
+    }
+  },
+  "projects": {}
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ObjectReplace1.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ObjectReplace1.json
new file mode 100644
index 000000000000..634d80e44a75
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ObjectReplace1.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 1,
+  "x-foo": {
+    "replacement": true
+  },
+  "x-bar": 5,
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ObjectReplace2.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ObjectReplace2.json
new file mode 100644
index 000000000000..a5bfe2ec90b0
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ObjectReplace2.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 1,
+  "x-foo": {},
+  "x-bar": 5,
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ObjectReplace3.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ObjectReplace3.json
new file mode 100644
index 000000000000..aa3b0128faad
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ObjectReplace3.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 1,
+  "x-foo": null,
+  "x-bar": 5,
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectAddTarget.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectAddTarget.json
new file mode 100644
index 000000000000..134b0d3e55f7
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectAddTarget.json
@@ -0,0 +1,141 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "my-app": {
+      "root": "",
+      "projectType": "application",
+      "prefix": "app",
+      "schematics": {
+        "@schematics/angular:component": {
+          "styleext": "scss"
+        }
+      },
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/my-app",
+            "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.scss"
+            ],
+            "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,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "my-app:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "my-app:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "my-app: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": [
+              "src/styles.scss"
+            ],
+            "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/**"
+            ]
+          }
+        },
+        "new": {
+          "builder": "new-builder"
+        }
+      }
+    },
+    "my-app-e2e": {
+      "root": "e2e/",
+      "projectType": "application",
+      "prefix": "",
+      "architect": {
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "e2e/protractor.conf.js",
+            "devServerTarget": "my-app:serve"
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "my-app:serve:production"
+            }
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": "e2e/tsconfig.e2e.json",
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "my-app"
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectDeleteTarget.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectDeleteTarget.json
new file mode 100644
index 000000000000..86c9abf09947
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectDeleteTarget.json
@@ -0,0 +1,132 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "my-app": {
+      "root": "",
+      "projectType": "application",
+      "prefix": "app",
+      "schematics": {
+        "@schematics/angular:component": {
+          "styleext": "scss"
+        }
+      },
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/my-app",
+            "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.scss"
+            ],
+            "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,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "my-app:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "my-app:build:production"
+            }
+          }
+        },
+        "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": [
+              "src/styles.scss"
+            ],
+            "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/**"
+            ]
+          }
+        }
+      }
+    },
+    "my-app-e2e": {
+      "root": "e2e/",
+      "projectType": "application",
+      "prefix": "",
+      "architect": {
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "e2e/protractor.conf.js",
+            "devServerTarget": "my-app:serve"
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "my-app:serve:production"
+            }
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": "e2e/tsconfig.e2e.json",
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "my-app"
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectEmpty.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectEmpty.json
new file mode 100644
index 000000000000..fe605d8dc60c
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectEmpty.json
@@ -0,0 +1,9 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "projects": {
+    "my-app": {
+      "root": "projects/my-app"
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectFull.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectFull.json
new file mode 100644
index 000000000000..a5a2a1afc606
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectFull.json
@@ -0,0 +1,67 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "projects": {
+    "my-app": {
+      "root": "projects/my-app",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/my-app",
+            "index": "projects/my-app/src/index.html",
+            "main": "projects/my-app/src/main.ts",
+            "polyfills": "projects/my-app/src/polyfills.ts",
+            "tsConfig": "projects/my-app/tsconfig.app.json",
+            "assets": [
+              "projects/my-app/src/favicon.ico",
+              "projects/my-app/src/assets"
+            ],
+            "styles": [
+              "projects/my-app/src/styles.scss"
+            ],
+            "scripts": [],
+            "es5BrowserSupport": true
+          },
+          "configurations": {
+            "production": {
+              "fileReplacements": [
+                {
+                  "replace": "projects/my-app/src/environments/environment.ts",
+                  "with": "projects/my-app/src/environments/environment.prod.ts"
+                }
+              ],
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "my-app:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "my-app:build:production"
+            }
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectModifyProperties.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectModifyProperties.json
new file mode 100644
index 000000000000..1a5487dac5d9
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectModifyProperties.json
@@ -0,0 +1,138 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "my-app": {
+      "root": "src",
+      "projectType": "application",
+      "prefix": "app",
+      "schematics": {
+        "@schematics/angular:component": {
+          "styleext": "scss"
+        }
+      },
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/my-app",
+            "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.scss"
+            ],
+            "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,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "my-app:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "my-app:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "my-app: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": [
+              "src/styles.scss"
+            ],
+            "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/**"
+            ]
+          }
+        }
+      }
+    },
+    "my-app-e2e": {
+      "root": "e2e/",
+      "projectType": "application",
+      "prefix": "",
+      "architect": {
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "e2e/protractor.conf.js",
+            "devServerTarget": "my-app:serve"
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "my-app:serve:production"
+            }
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": "e2e/tsconfig.e2e.json",
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "my-app"
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectSetProperties.json b/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectSetProperties.json
new file mode 100644
index 000000000000..b80273cdbb0a
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/ProjectSetProperties.json
@@ -0,0 +1,139 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "my-app": {
+      "root": "",
+      "projectType": "application",
+      "prefix": "app",
+      "schematics": {
+        "@schematics/angular:component": {
+          "styleext": "scss"
+        }
+      },
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/my-app",
+            "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.scss"
+            ],
+            "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,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "my-app:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "my-app:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "my-app: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": [
+              "src/styles.scss"
+            ],
+            "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/**"
+            ]
+          }
+        }
+      },
+      "sourceRoot": "src"
+    },
+    "my-app-e2e": {
+      "root": "e2e/",
+      "projectType": "application",
+      "prefix": "",
+      "architect": {
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "e2e/protractor.conf.js",
+            "devServerTarget": "my-app:serve"
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "my-app:serve:production"
+            }
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": "e2e/tsconfig.e2e.json",
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "my-app"
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/test/cases/Retain.json b/packages/angular_devkit/core/src/workspace/json/test/cases/Retain.json
new file mode 100644
index 000000000000..583b2da3598b
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/test/cases/Retain.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 10,
+  "x-foo": {
+    "is": ["good", "great", "awesome"]
+  },
+  "x-bar": 5,
+}
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/json/utilities.ts b/packages/angular_devkit/core/src/workspace/json/utilities.ts
new file mode 100644
index 000000000000..b70ad13dfe06
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/utilities.ts
@@ -0,0 +1,277 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import {
+  JsonAstArray,
+  JsonAstKeyValue,
+  JsonAstNode,
+  JsonAstObject,
+  JsonObject,
+  JsonValue,
+} from '../../json';
+
+const stableStringify = require('fast-json-stable-stringify');
+
+interface CacheEntry {
+  value?: JsonValue;
+  node?: JsonAstNode;
+  parent: JsonAstArray | JsonAstKeyValue | JsonAstObject;
+}
+
+export type ChangeListener = (
+  op: 'add' | 'remove' | 'replace',
+  path: string,
+  node: JsonAstArray | JsonAstObject | JsonAstKeyValue,
+  value?: JsonValue,
+) => void;
+
+type ChangeReporter = (
+  path: string,
+  parent: JsonAstArray | JsonAstKeyValue | JsonAstObject,
+  node?: JsonAstNode,
+  old?: JsonValue,
+  current?: JsonValue,
+) => void;
+
+function findNode(
+  parent: JsonAstArray | JsonAstObject,
+  p: PropertyKey,
+): { node?: JsonAstNode; parent: JsonAstArray | JsonAstKeyValue | JsonAstObject } {
+  if (parent.kind === 'object') {
+    const entry = parent.properties.find(entry => entry.key.value === p);
+    if (entry) {
+      return { node: entry.value, parent: entry };
+    }
+  } else {
+    const index = Number(p);
+    if (!isNaN(index)) {
+      return { node: parent.elements[index], parent };
+    }
+  }
+
+  return { parent };
+}
+
+function createPropertyDescriptor(value: JsonValue | undefined): PropertyDescriptor {
+  return {
+    configurable: true,
+    enumerable: true,
+    writable: true,
+    value,
+  };
+}
+
+export function createVirtualAstObject<T extends object = JsonObject>(
+  root: JsonAstObject,
+  options: {
+    exclude?: string[];
+    include?: string[];
+    listener?: ChangeListener;
+    base?: object;
+  } = {},
+): T {
+  const reporter: ChangeReporter = (path, parent, node, old, current) => {
+    if (options.listener) {
+      if (old === current || stableStringify(old) === stableStringify(current)) {
+        return;
+      }
+
+      const op = old === undefined ? 'add' : current === undefined ? 'remove' : 'replace';
+      options.listener(
+        op,
+        path,
+        parent,
+        current,
+      );
+    }
+  };
+
+  return create(
+    root,
+    '',
+    reporter,
+    new Set(options.exclude),
+    options.include && options.include.length > 0 ? new Set(options.include) : undefined,
+    options.base,
+  ) as T;
+}
+
+function create(
+  ast: JsonAstObject | JsonAstArray,
+  path: string,
+  reporter: ChangeReporter,
+  excluded = new Set<PropertyKey>(),
+  included?: Set<PropertyKey>,
+  base?: object,
+) {
+  const cache = new Map<string, CacheEntry>();
+  const alteredNodes = new Set<JsonAstNode>();
+
+  if (!base) {
+    if (ast.kind === 'object') {
+      base = Object.create(null) as object;
+    } else {
+      base = [];
+      (base as Array<unknown>).length = ast.elements.length;
+    }
+  }
+
+  return new Proxy(base, {
+    getOwnPropertyDescriptor(target: {}, p: PropertyKey): PropertyDescriptor | undefined {
+      const descriptor = Reflect.getOwnPropertyDescriptor(target, p);
+      if (descriptor || typeof p === 'symbol') {
+        return descriptor;
+      } else if (excluded.has(p) || (included && !included.has(p))) {
+        return undefined;
+      }
+
+      const propertyPath = path + '/' + p;
+      const cacheEntry = cache.get(propertyPath);
+      if (cacheEntry) {
+        if (cacheEntry.value) {
+          return createPropertyDescriptor(cacheEntry.value);
+        }
+
+        return undefined;
+      }
+
+      const { node } = findNode(ast, p);
+      if (node) {
+        return createPropertyDescriptor(node.value);
+      }
+
+      return undefined;
+    },
+    has(target: {}, p: PropertyKey): boolean {
+      if (Reflect.has(target, p)) {
+        return true;
+      } else if (typeof p === 'symbol' || excluded.has(p)) {
+        return false;
+      }
+
+      return cache.has(path + '/' + p) || findNode(ast, p) !== undefined;
+    },
+    get(target: {}, p: PropertyKey): unknown {
+      if (typeof p === 'symbol' || Reflect.has(target, p)) {
+        return Reflect.get(target, p);
+      } else if (excluded.has(p) || (included && !included.has(p))) {
+        return undefined;
+      }
+
+      const propertyPath = path + '/' + p;
+      const cacheEntry = cache.get(propertyPath);
+      if (cacheEntry) {
+        return cacheEntry.value;
+      }
+
+      const { node, parent } = findNode(ast, p);
+      let value;
+      if (node) {
+        if (node.kind === 'object' || node.kind === 'array') {
+          value = create(
+            node,
+            propertyPath,
+            (path, parent, vnode, old, current) => {
+              if (!alteredNodes.has(node)) {
+                reporter(path, parent, vnode, old, current);
+              }
+            },
+          );
+        } else {
+          value = node.value;
+        }
+
+        cache.set(propertyPath, { node, parent, value });
+      }
+
+      return value;
+    },
+    set(target: {}, p: PropertyKey, value: unknown): boolean {
+      if (typeof p === 'symbol' || Reflect.has(target, p)) {
+        return Reflect.set(target, p, value);
+      } else if (excluded.has(p) || (included && !included.has(p))) {
+        return false;
+      }
+
+      // TODO: Check if is JSON value
+      const jsonValue = value as JsonValue;
+
+      const propertyPath = path + '/' + p;
+      const cacheEntry = cache.get(propertyPath);
+      if (cacheEntry) {
+        const oldValue = cacheEntry.value;
+        cacheEntry.value = value as JsonValue;
+        if (cacheEntry.node && oldValue !== value) {
+          alteredNodes.add(cacheEntry.node);
+        }
+        reporter(propertyPath, cacheEntry.parent, cacheEntry.node, oldValue, jsonValue);
+      } else {
+        const { node, parent } = findNode(ast, p);
+        cache.set(propertyPath, { node, parent, value: value as JsonValue });
+        if (node && node.value !== value) {
+          alteredNodes.add(node);
+        }
+        reporter(propertyPath, parent, node, node && node.value, value as JsonValue);
+      }
+
+      return true;
+    },
+    deleteProperty(target: {}, p: PropertyKey): boolean {
+      if (typeof p === 'symbol' || Reflect.has(target, p)) {
+        return Reflect.deleteProperty(target, p);
+      } else if (excluded.has(p) || (included && !included.has(p))) {
+        return false;
+      }
+
+      const propertyPath = path + '/' + p;
+      const cacheEntry = cache.get(propertyPath);
+      if (cacheEntry) {
+        const oldValue = cacheEntry.value;
+        cacheEntry.value = undefined;
+        if (cacheEntry.node) {
+          alteredNodes.add(cacheEntry.node);
+        }
+        reporter(propertyPath, cacheEntry.parent, cacheEntry.node, oldValue, undefined);
+      } else {
+        const { node, parent } = findNode(ast, p);
+        if (node) {
+          cache.set(propertyPath, { node, parent, value: undefined });
+          alteredNodes.add(node);
+          reporter(propertyPath, parent, node, node && node.value, undefined);
+        }
+      }
+
+      return true;
+    },
+    defineProperty(target: {}, p: PropertyKey, attributes: PropertyDescriptor): boolean {
+      if (typeof p === 'symbol') {
+        return Reflect.defineProperty(target, p, attributes);
+      }
+
+      return false;
+    },
+    ownKeys(target: {}): PropertyKey[] {
+      let keys: PropertyKey[];
+      if (ast.kind === 'object') {
+        keys = ast.properties
+          .map(entry => entry.key.value)
+          .filter(p => !excluded.has(p) && (!included || included.has(p)));
+      } else {
+        keys = [];
+      }
+
+      for (const key of cache.keys()) {
+        const relativeKey = key.substr(path.length + 1);
+        if (relativeKey.length > 0 && !relativeKey.includes('/')) {
+          keys.push(relativeKey);
+        }
+      }
+
+      return [...new Set([...keys, ...Reflect.ownKeys(target)])];
+    },
+  });
+}
diff --git a/packages/angular_devkit/core/src/workspace/json/writer.ts b/packages/angular_devkit/core/src/workspace/json/writer.ts
new file mode 100644
index 000000000000..49430e6c6606
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/writer.ts
@@ -0,0 +1,363 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import MagicString from 'magic-string';
+import { JsonAstKeyValue, JsonAstNode, JsonObject, JsonValue } from '../../json';
+import { ProjectDefinition, TargetDefinition, WorkspaceDefinition } from '../definitions';
+import { WorkspaceHost } from '../host';
+import {
+  JsonChange,
+  JsonWorkspaceDefinition,
+  JsonWorkspaceMetadata,
+  JsonWorkspaceSymbol,
+} from './metadata';
+
+export async function writeJsonWorkspace(
+  workspace: WorkspaceDefinition,
+  host: WorkspaceHost,
+  path?: string,
+  options: {
+    schema?: string;
+  } = {},
+): Promise<void> {
+  const metadata = (workspace as JsonWorkspaceDefinition)[JsonWorkspaceSymbol];
+
+  if (metadata) {
+    if (!metadata.hasChanges) {
+      // nothing to do
+      return;
+    }
+
+    // update existing JSON workspace
+    const data = updateJsonWorkspace(metadata);
+
+    return host.writeFile(path || metadata.filePath, data);
+  } else {
+    // serialize directly
+    if (!path) {
+      throw new Error('path option is required');
+    }
+
+    const obj = convertJsonWorkspace(workspace, options.schema);
+    const data = JSON.stringify(obj, null, 2);
+
+    return host.writeFile(path, data);
+  }
+}
+
+function convertJsonWorkspace(workspace: WorkspaceDefinition, schema?: string): JsonObject {
+  const obj = {
+    $schema: schema || './node_modules/@angular/cli/lib/config/schema.json',
+    version: 1,
+    ...workspace.extensions,
+    projects: convertJsonProjectCollection(workspace.projects),
+  };
+
+  return obj;
+}
+
+function convertJsonProjectCollection(
+  collection: Iterable<[string, ProjectDefinition]>,
+): JsonObject {
+  const projects = Object.create(null) as JsonObject;
+
+  for (const [projectName, project] of collection) {
+    projects[projectName] = convertJsonProject(project);
+  }
+
+  return projects;
+}
+
+function convertJsonProject(project: ProjectDefinition): JsonObject {
+  let targets: JsonObject | undefined;
+  if (project.targets.size > 0) {
+    targets = Object.create(null) as JsonObject;
+    for (const [targetName, target] of project.targets) {
+      targets[targetName] = convertJsonTarget(target);
+    }
+  }
+
+  const obj = {
+    ...project.extensions,
+    root: project.root,
+    ...(project.sourceRoot === undefined ? {} : { sourceRoot: project.sourceRoot }),
+    ...(project.prefix === undefined ? {} : { prefix: project.prefix }),
+    ...(targets === undefined ? {} : { architect: targets }),
+  };
+
+  return obj;
+}
+
+function isEmpty(obj?: object): boolean {
+  return obj === undefined || Object.keys(obj).length === 0;
+}
+
+function convertJsonTarget(target: TargetDefinition): JsonObject {
+  return {
+    builder: target.builder,
+    ...(isEmpty(target.options) ? {} : { options: target.options as JsonObject }),
+    ...(isEmpty(target.configurations)
+      ? {}
+      : { configurations: target.configurations as JsonObject }),
+  };
+}
+
+function convertJsonTargetCollection(
+  collection: Iterable<[string, TargetDefinition]>,
+): JsonObject {
+  const targets = Object.create(null) as JsonObject;
+
+  for (const [projectName, target] of collection) {
+    targets[projectName] = convertJsonTarget(target);
+  }
+
+  return targets;
+}
+
+function findFullStart(node: JsonAstNode | JsonAstKeyValue, raw: string): number {
+  let i = node.start.offset;
+  while (i > 0 && /\s/.test(raw[i - 1])) {
+    --i;
+  }
+
+  return i;
+}
+
+function findFullEnd(node: JsonAstNode | JsonAstKeyValue, raw: string): number {
+  let i = node.end.offset;
+  if (i >= raw.length) {
+    return raw.length;
+  } else if (raw[i] === ',') {
+    return i + 1;
+  }
+
+  while (i > node.start.offset && /\s/.test(raw[i - 1])) {
+    --i;
+  }
+
+  return i;
+}
+
+function findPrecedingComma(node: JsonAstNode | JsonAstKeyValue, raw: string): number {
+  let i = node.start.offset;
+  if (node.comments && node.comments.length > 0) {
+    i = node.comments[0].start.offset;
+  }
+  while (i > 0 && /\s/.test(raw[i - 1])) {
+    --i;
+  }
+
+  if (raw[i - 1] === ',') {
+    return i - 1;
+  }
+
+  return -1;
+}
+
+function stringify(
+  value: JsonValue | undefined,
+  multiline: boolean,
+  depth: number,
+  indent: string,
+): string {
+  if (value === undefined) {
+    return '';
+  }
+
+  if (multiline) {
+    const content = JSON.stringify(value, null, indent);
+    const spacing = '\n' + indent.repeat(depth);
+
+    return content.replace(/\n/g, spacing);
+  } else {
+    return JSON.stringify(value);
+  }
+}
+
+function normalizeValue(
+  value: JsonChange['value'] | undefined,
+  type: JsonChange['type'],
+): JsonValue | undefined {
+  switch (type) {
+    case 'project':
+      return convertJsonProject(value as ProjectDefinition);
+    case 'projectcollection':
+      const projects = convertJsonProjectCollection(value as Iterable<[string, ProjectDefinition]>);
+
+      return Object.keys(projects).length === 0 ? undefined : projects;
+    case 'target':
+      return convertJsonTarget(value as TargetDefinition);
+    case 'targetcollection':
+      const targets = convertJsonTargetCollection(value as Iterable<[string, TargetDefinition]>);
+
+      return Object.keys(targets).length === 0 ? undefined : targets;
+    default:
+      return value as JsonValue;
+  }
+}
+
+function updateJsonWorkspace(metadata: JsonWorkspaceMetadata): string {
+  const data = new MagicString(metadata.raw);
+  const indent = data.getIndentString();
+  const removedCommas = new Set<number>();
+  const nodeChanges =
+    new Map<JsonAstNode | JsonAstKeyValue, (JsonAstNode | JsonAstKeyValue | string)[]>();
+
+  for (const { op, path, node, value, type } of metadata.changes) {
+    const multiline = node.start.line !== node.end.line;
+    const pathSegments = path.split('/');
+    const depth = pathSegments.length - 1; // TODO: more complete analysis
+    const propertyOrIndex = pathSegments[depth];
+    const jsonValue = normalizeValue(value, type);
+    if (op === 'add' && jsonValue === undefined) {
+      continue;
+    }
+
+    // Track changes to the order/size of any modified objects/arrays
+    let elements = nodeChanges.get(node);
+    if (!elements) {
+      if (node.kind === 'array') {
+        elements = node.elements.slice();
+        nodeChanges.set(node, elements);
+      } else if (node.kind === 'object') {
+        elements = node.properties.slice();
+        nodeChanges.set(node, elements);
+      } else {
+        // keyvalue
+        elements = [];
+      }
+    }
+
+    switch (op) {
+      case 'add':
+        let contentPrefix = '';
+        if (node.kind === 'object') {
+          contentPrefix = `"${propertyOrIndex}": `;
+        }
+
+        const spacing = multiline ? '\n' + indent.repeat(depth) : ' ';
+        const content = spacing + contentPrefix + stringify(jsonValue, multiline, depth, indent);
+
+        // Additions are handled after analyzing all operations
+        // This is mainly to support array operations which can occur at arbitrary indices
+        if (node.kind === 'object') {
+          // Object property additions are always added at the end for simplicity
+          elements.push(content);
+        } else {
+          // Add place holders if adding an index past the length
+          // An empty string is an impossible real value
+          for (let i = elements.length; i < +propertyOrIndex; ++i) {
+            elements[i] = '';
+          }
+          if (elements[+propertyOrIndex] === '') {
+            elements[+propertyOrIndex] = content;
+          } else {
+            elements.splice(+propertyOrIndex, 0, content);
+          }
+        }
+        break;
+      case 'remove':
+        let removalIndex = -1;
+        if (node.kind === 'object') {
+          removalIndex = elements.findIndex(e => {
+            return typeof e != 'string' && e.kind === 'keyvalue' && e.key.value === propertyOrIndex;
+          });
+        } else if (node.kind === 'array') {
+          removalIndex = +propertyOrIndex;
+        }
+        if (removalIndex === -1) {
+          continue;
+        }
+
+        const nodeToRemove = elements[removalIndex];
+        if (typeof nodeToRemove === 'string') {
+          // synthetic
+          elements.splice(removalIndex, 1);
+          continue;
+        }
+
+        if (elements.length - 1 === removalIndex) {
+          // If the element is a terminal element remove the otherwise trailing comma
+          const commaIndex = findPrecedingComma(nodeToRemove, data.original);
+          if (commaIndex !== -1) {
+            data.remove(commaIndex, commaIndex + 1);
+            removedCommas.add(commaIndex);
+          }
+        }
+        data.remove(
+          findFullStart(nodeToRemove, data.original),
+          findFullEnd(nodeToRemove, data.original),
+        );
+        elements.splice(removalIndex, 1);
+        break;
+      case 'replace':
+        let nodeToReplace;
+        if (node.kind === 'keyvalue') {
+          nodeToReplace = node.value;
+        } else if (node.kind === 'array') {
+          nodeToReplace = elements[+propertyOrIndex];
+          if (typeof nodeToReplace === 'string') {
+            // Was already modified. This is already handled.
+            continue;
+          }
+        } else {
+          continue;
+        }
+
+        nodeChanges.delete(nodeToReplace);
+
+        data.overwrite(
+          nodeToReplace.start.offset,
+          nodeToReplace.end.offset,
+          stringify(jsonValue, multiline, depth, indent),
+        );
+        break;
+    }
+  }
+
+  for (const [node, elements] of nodeChanges.entries()) {
+    let parentPoint = 1 + data.original.indexOf(
+      node.kind === 'array' ? '[' : '{',
+      node.start.offset,
+    );
+
+    // Short-circuit for simple case
+    if (elements.length === 1 && typeof elements[0] === 'string') {
+      data.appendRight(parentPoint, elements[0] as string);
+      continue;
+    }
+
+    // Combine adjecent element additions to minimize/simplify insertions
+    const optimizedElements: typeof elements = [];
+    for (let i = 0; i < elements.length; ++i) {
+      const element = elements[i];
+      if (typeof element === 'string' && i > 0 && typeof elements[i - 1] === 'string') {
+        optimizedElements[optimizedElements.length - 1] += ',' + element;
+      } else {
+        optimizedElements.push(element);
+      }
+    }
+
+    let prefixComma = false;
+    for (const element of optimizedElements) {
+      if (typeof element === 'string') {
+        data.appendRight(
+          parentPoint,
+          (prefixComma ? ',' : '') + element,
+        );
+      } else {
+        parentPoint = findFullEnd(element, data.original);
+        prefixComma = data.original[parentPoint - 1] !== ',' || removedCommas.has(parentPoint - 1);
+      }
+    }
+
+  }
+
+  const result = data.toString();
+
+  return result;
+}
diff --git a/packages/angular_devkit/core/src/workspace/json/writer_spec.ts b/packages/angular_devkit/core/src/workspace/json/writer_spec.ts
new file mode 100644
index 000000000000..26362e626e5a
--- /dev/null
+++ b/packages/angular_devkit/core/src/workspace/json/writer_spec.ts
@@ -0,0 +1,594 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// tslint:disable:no-big-function
+import { readFileSync } from 'fs';
+import { join } from 'path';
+import { JsonArray, JsonObject } from '../../json';
+import { stripIndent } from '../../utils/literals';
+import { ProjectDefinitionCollection, WorkspaceDefinition } from '../definitions';
+import { readJsonWorkspace } from './reader';
+import { writeJsonWorkspace } from './writer';
+
+const basicFile = stripIndent`
+{
+  "version": 1,
+  // Comment
+  "schematics": {
+    "@angular/schematics:component": {
+      "prefix": "abc"
+    }
+  },
+  "x-baz": 1,
+  "x-foo": {
+    "is": ["good", "great", "awesome"]
+  },
+  "x-bar": 5,
+}`;
+
+const representativeFile = readFileSync(__dirname + '/test/angular.json', 'utf8');
+
+function createTestCaseHost(inputData = '') {
+  const host = {
+    async readFile() {
+      return inputData;
+    },
+    async writeFile(path: string, data: string) {
+      try {
+        const testCase = readFileSync(join(__dirname, 'test', 'cases', path) + '.json', 'utf8');
+        expect(data).toEqual(testCase);
+      } catch (e) {
+        fail(`Unable to load test case '${path}': ${e.message || e}`);
+      }
+    },
+    async isFile() {
+      return true;
+    },
+    async isDirectory() {
+      return true;
+    },
+  };
+
+  return host;
+}
+
+describe('writeJsonWorkpaceFile', () => {
+  it('does not modify a file without changes', async () => {
+    const host = {
+      async readFile(path: string) {
+        return representativeFile;
+      },
+      async writeFile() {
+        fail();
+      },
+      async isFile() {
+        return true;
+      },
+      async isDirectory() {
+        return true;
+      },
+    };
+
+    const workspace = await readJsonWorkspace('angular.json', host);
+    await writeJsonWorkspace(workspace, host);
+  });
+
+  it('writes an empty workspace', async () => {
+    const workspace: WorkspaceDefinition = {
+      extensions: {},
+      projects: new ProjectDefinitionCollection(),
+    };
+    await writeJsonWorkspace(workspace, createTestCaseHost(), 'Empty');
+  });
+
+  it('writes new workspace with extensions', async () => {
+    const workspace: WorkspaceDefinition = {
+      extensions: {
+        newProjectRoot: 'projects',
+      },
+      projects: new ProjectDefinitionCollection(),
+    };
+    await writeJsonWorkspace(workspace, createTestCaseHost(), 'Extensions1');
+
+    workspace.extensions['schematics'] = {
+      '@schematics/angular:component': { prefix: 'app' },
+    };
+    await writeJsonWorkspace(workspace, createTestCaseHost(), 'Extensions2');
+  });
+
+  it('writes new workspace with an empty project', async () => {
+    const workspace: WorkspaceDefinition = {
+      extensions: {},
+      projects: new ProjectDefinitionCollection(),
+    };
+
+    workspace.projects.add({
+      name: 'my-app',
+      root: 'projects/my-app',
+    });
+
+    await writeJsonWorkspace(workspace, createTestCaseHost(), 'ProjectEmpty');
+  });
+
+  it('writes new workspace with a full project', async () => {
+    const workspace: WorkspaceDefinition = {
+      extensions: {},
+      projects: new ProjectDefinitionCollection(),
+    };
+
+    workspace.projects.add({
+      name: 'my-app',
+      root: 'projects/my-app',
+      targets: {
+        build: {
+          builder: '@angular-devkit/build-angular:browser',
+          options: {
+            outputPath: `dist/my-app`,
+            index: `projects/my-app/src/index.html`,
+            main: `projects/my-app/src/main.ts`,
+            polyfills: `projects/my-app/src/polyfills.ts`,
+            tsConfig: `projects/my-app/tsconfig.app.json`,
+            assets: ['projects/my-app/src/favicon.ico', 'projects/my-app/src/assets'],
+            styles: [`projects/my-app/src/styles.scss`],
+            scripts: [],
+            es5BrowserSupport: true,
+          },
+          configurations: {
+            production: {
+              fileReplacements: [
+                {
+                  replace: `projects/my-app/src/environments/environment.ts`,
+                  with: `projects/my-app/src/environments/environment.prod.ts`,
+                },
+              ],
+              optimization: true,
+              outputHashing: 'all',
+              sourceMap: false,
+              extractCss: true,
+              namedChunks: false,
+              aot: true,
+              extractLicenses: true,
+              vendorChunk: false,
+              buildOptimizer: true,
+              budgets: [
+                {
+                  type: 'initial',
+                  maximumWarning: '2mb',
+                  maximumError: '5mb',
+                },
+              ],
+            },
+          },
+        },
+        serve: {
+          builder: '@angular-devkit/build-angular:dev-server',
+          options: {
+            browserTarget: `my-app:build`,
+          },
+          configurations: {
+            production: {
+              browserTarget: `my-app:build:production`,
+            },
+          },
+        },
+      },
+    });
+
+    await writeJsonWorkspace(workspace, createTestCaseHost(), 'ProjectFull');
+  });
+
+  it('retains comments and formatting when modifying the workspace', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    workspace.extensions['x-baz'] = 10;
+
+    await writeJsonWorkspace(workspace, host, 'Retain');
+  });
+
+  it('adds a project to workspace without any projects', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    workspace.projects.add({
+      name: 'new',
+      root: 'src7',
+    });
+
+    await writeJsonWorkspace(workspace, host, 'AddProject1');
+  });
+
+  it('adds a project to workspace with existing projects', async () => {
+    const host = createTestCaseHost(representativeFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    workspace.projects.add({
+      name: 'new',
+      root: 'src',
+    });
+
+    await writeJsonWorkspace(workspace, host, 'AddProject2');
+  });
+
+  it('adds a project with targets', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    workspace.projects.add({
+      name: 'new',
+      root: 'src',
+      targets: {
+        build: {
+          builder: 'build-builder',
+          options: { one: 1, two: false },
+          configurations: {
+            staging: {
+              two: true,
+            },
+          },
+        },
+      },
+    });
+
+    await writeJsonWorkspace(workspace, host, 'AddProjectWithTargets');
+  });
+
+  it('adds a project with targets using reference to workspace', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    workspace.projects.add({
+      name: 'new',
+      root: 'src',
+    });
+
+    const project = workspace.projects.get('new');
+    if (!project) {
+      fail('project is missing');
+
+      return;
+    }
+
+    project.targets.add({
+      name: 'build',
+      builder: 'build-builder',
+      options: { one: 1, two: false },
+      configurations: {
+        staging: {
+          two: true,
+        },
+      },
+    });
+
+    // This should be the same as adding them in the project add call
+    await writeJsonWorkspace(workspace, host, 'AddProjectWithTargets');
+  });
+
+  it('modifies a project\'s properties', async () => {
+    const host = createTestCaseHost(representativeFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const project = workspace.projects.get('my-app');
+    if (!project) {
+      fail('project is missing');
+
+      return;
+    }
+
+    project.root = 'src';
+
+    await writeJsonWorkspace(workspace, host, 'ProjectModifyProperties');
+  });
+
+  it('sets a project\'s properties', async () => {
+    const host = createTestCaseHost(representativeFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const project = workspace.projects.get('my-app');
+    if (!project) {
+      fail('project is missing');
+
+      return;
+    }
+
+    project.sourceRoot = 'src';
+
+    await writeJsonWorkspace(workspace, host, 'ProjectSetProperties');
+  });
+
+  it('adds a target to an existing project', async () => {
+    const host = createTestCaseHost(representativeFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const project = workspace.projects.get('my-app');
+    if (!project) {
+      fail('project is missing');
+
+      return;
+    }
+
+    project.targets.add({
+      name: 'new',
+      builder: 'new-builder',
+    });
+
+    await writeJsonWorkspace(workspace, host, 'ProjectAddTarget');
+  });
+
+  it('deletes a target from an existing project', async () => {
+    const host = createTestCaseHost(representativeFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const project = workspace.projects.get('my-app');
+    if (!project) {
+      fail('project is missing');
+
+      return;
+    }
+
+    project.targets.delete('extract-i18n');
+
+    await writeJsonWorkspace(workspace, host, 'ProjectDeleteTarget');
+  });
+
+  it('supports adding an empty array', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    workspace.extensions['x-array'] = [];
+
+    await writeJsonWorkspace(workspace, host, 'AddArrayEmpty');
+  });
+
+  it('supports adding an array with values', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    workspace.extensions['x-array'] = [5, 'a', false, null, true, 9.9];
+
+    await writeJsonWorkspace(workspace, host, 'ArrayValues');
+  });
+
+  it('supports adding an empty array then pushing as an extension', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    workspace.extensions['x-array'] = [];
+    (workspace.extensions['x-array'] as string[]).push('value');
+
+    await writeJsonWorkspace(workspace, host, 'AddArrayPush');
+  });
+
+  it('supports pushing to an existing array', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const array = (workspace.extensions['x-foo'] as JsonObject)['is'] as JsonArray;
+    array.push('value');
+
+    await writeJsonWorkspace(workspace, host, 'ArrayPush');
+  });
+
+  it('supports unshifting to an existing array', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const array = (workspace.extensions['x-foo'] as JsonObject)['is'] as JsonArray;
+    array.unshift('value');
+
+    await writeJsonWorkspace(workspace, host, 'ArrayUnshift');
+  });
+
+  it('supports shifting from an existing array', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const array = (workspace.extensions['x-foo'] as JsonObject)['is'] as JsonArray;
+    array.shift();
+
+    await writeJsonWorkspace(workspace, host, 'ArrayShift');
+  });
+
+  it('supports splicing an existing array without new values', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const array = (workspace.extensions['x-foo'] as JsonObject)['is'] as JsonArray;
+    array.splice(2, 1);
+
+    await writeJsonWorkspace(workspace, host, 'ArraySplice1');
+  });
+
+  it('supports splicing an existing array with new values', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const array = (workspace.extensions['x-foo'] as JsonObject)['is'] as JsonArray;
+    array.splice(2, 0, 'value1', 'value2');
+
+    await writeJsonWorkspace(workspace, host, 'ArraySplice2');
+  });
+
+  it('supports popping from an existing array', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const array = (workspace.extensions['x-foo'] as JsonObject)['is'] as JsonArray;
+    array.pop();
+
+    await writeJsonWorkspace(workspace, host, 'ArrayPop');
+  });
+
+  it('supports sorting from an existing array', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const array = (workspace.extensions['x-foo'] as JsonObject)['is'] as JsonArray;
+    array.sort();
+
+    await writeJsonWorkspace(workspace, host, 'ArraySort');
+  });
+
+  it('replaces a value at zero index from an existing array', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const array = (workspace.extensions['x-foo'] as JsonObject)['is'] as JsonArray;
+    array[0] = 'value';
+
+    await writeJsonWorkspace(workspace, host, 'ArrayIndexZero');
+  });
+
+  it('replaces a value at inner index from an existing array', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const array = (workspace.extensions['x-foo'] as JsonObject)['is'] as JsonArray;
+    array[1] = 'value';
+
+    await writeJsonWorkspace(workspace, host, 'ArrayIndexInner');
+  });
+
+  it('replaces a value at last index from an existing array', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const array = (workspace.extensions['x-foo'] as JsonObject)['is'] as JsonArray;
+    array[array.length - 1] = 'value';
+
+    await writeJsonWorkspace(workspace, host, 'ArrayIndexLast');
+  });
+
+  it('deletes a value at zero index from an existing array', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const array = (workspace.extensions['x-foo'] as JsonObject)['is'] as JsonArray;
+    array.splice(0, 1);
+
+    await writeJsonWorkspace(workspace, host, 'ArrayDeleteZero');
+  });
+
+  it('deletes a value at inner index from an existing array', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const array = (workspace.extensions['x-foo'] as JsonObject)['is'] as JsonArray;
+    array.splice(1, 1);
+
+    await writeJsonWorkspace(workspace, host, 'ArrayDeleteInner');
+  });
+
+  it('deletes and then adds a value at inner index from an existing array', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const array = (workspace.extensions['x-foo'] as JsonObject)['is'] as JsonArray;
+    array.splice(1, 1);
+    array.splice(1, 0, 'new');
+
+    await writeJsonWorkspace(workspace, host, 'ArrayDeleteInnerAdd');
+  });
+
+  it('deletes a value at last index from an existing array', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const array = (workspace.extensions['x-foo'] as JsonObject)['is'] as JsonArray;
+    array.splice(array.length - 1, 1);
+
+    await writeJsonWorkspace(workspace, host, 'ArrayDeleteLast');
+  });
+
+  it('deletes and then adds a value at last index from an existing array', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const array = (workspace.extensions['x-foo'] as JsonObject)['is'] as JsonArray;
+    array.splice(array.length - 1, 1);
+    array.push('new');
+
+    await writeJsonWorkspace(workspace, host, 'ArrayDeleteLastAdd');
+  });
+
+  it('replaces an existing array', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    (workspace.extensions['x-foo'] as JsonObject)['is'] = ['value'];
+
+    await writeJsonWorkspace(workspace, host, 'ArrayReplace1');
+  });
+
+  it('replaces an existing array with an empty array', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    (workspace.extensions['x-foo'] as JsonObject)['is'] = [];
+
+    await writeJsonWorkspace(workspace, host, 'ArrayReplace2');
+  });
+
+  it('replaces an existing object with a new object', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    workspace.extensions['x-foo'] = { replacement: true };
+
+    await writeJsonWorkspace(workspace, host, 'ObjectReplace1');
+  });
+
+  it('replaces an existing object with an empty object', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    workspace.extensions['x-foo'] = { };
+
+    await writeJsonWorkspace(workspace, host, 'ObjectReplace2');
+  });
+
+  it('replaces an existing object with a different value type', async () => {
+    const host = createTestCaseHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    workspace.extensions['x-foo'] = null;
+
+    await writeJsonWorkspace(workspace, host, 'ObjectReplace3');
+  });
+});
diff --git a/yarn.lock b/yarn.lock
index 6ceb90c1ecbd..fb32a58e1add 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5767,6 +5767,13 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
+magic-string@0.25.1, magic-string@^0.25.1:
+  version "0.25.1"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.1.tgz#b1c248b399cd7485da0fe7385c2fc7011843266e"
+  integrity sha512-sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg==
+  dependencies:
+    sourcemap-codec "^1.4.1"
+
 magic-string@^0.22.4:
   version "0.22.5"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
@@ -5781,13 +5788,6 @@ magic-string@^0.25.0:
   dependencies:
     sourcemap-codec "^1.4.1"
 
-magic-string@^0.25.1:
-  version "0.25.1"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.1.tgz#b1c248b399cd7485da0fe7385c2fc7011843266e"
-  integrity sha512-sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg==
-  dependencies:
-    sourcemap-codec "^1.4.1"
-
 make-dir@^1.0.0, make-dir@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"

From fda683b8743700b8fdc1ff7a4df1ef38b5a1782c Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 19 Mar 2019 10:21:51 -0400
Subject: [PATCH 1109/1703] build: only generate types for actual JSON schemas

---
 scripts/build-schema.ts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/scripts/build-schema.ts b/scripts/build-schema.ts
index 3587d0584c4b..a5d64ae462fb 100644
--- a/scripts/build-schema.ts
+++ b/scripts/build-schema.ts
@@ -60,9 +60,15 @@ export default async function(
     }
     const content = fs.readFileSync(fileName, 'utf-8');
 
-    const json = JSON.parse(content);
-    if (!json.$schema) {
-      // Skip non-schema files.
+    let json;
+    try {
+      json = JSON.parse(content);
+      if (typeof json.$schema !== 'string' || !json.$schema.startsWith('http://json-schema.org/')) {
+        // Skip non-schema files.
+        continue;
+      }
+    } catch {
+      // malformed or JSON5
       continue;
     }
     const tsContent = await quicktypeRunner.generate(fileName);

From b22202c120dcb6d59e8942ceecfdc8d141d03f1e Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 11 Apr 2019 21:28:18 -0400
Subject: [PATCH 1110/1703] refactor(@angular-devkit/core): adjust
 readWorkspace type to support eventual diagnostics

---
 packages/angular_devkit/core/src/workspace/core.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/core/src/workspace/core.ts b/packages/angular_devkit/core/src/workspace/core.ts
index 041f920c857b..336696a0300f 100644
--- a/packages/angular_devkit/core/src/workspace/core.ts
+++ b/packages/angular_devkit/core/src/workspace/core.ts
@@ -35,7 +35,8 @@ export async function readWorkspace(
   path: string,
   host: WorkspaceHost,
   format?: WorkspaceFormat,
-): Promise<WorkspaceDefinition> {
+  // return type will eventually have a `diagnostics` property as well
+): Promise<{ workspace: WorkspaceDefinition }> {
   if (await host.isDirectory(path)) {
     // TODO: Warn if multiple found (requires diagnostics support)
     const directory = normalize(path);
@@ -78,7 +79,7 @@ export async function readWorkspace(
 
   formatLookup.set(workspace, WorkspaceFormat.JSON);
 
-  return workspace;
+  return { workspace };
 }
 
 export async function writeWorkspace(

From 7d416103a997cdca3b6959aa3a36d01b4714a73e Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 11 Apr 2019 21:35:56 -0400
Subject: [PATCH 1111/1703] feat(@angular-devkit/core): make new workspace API
 public

---
 .../angular_devkit/core/src/_golden-api.d.ts  | 61 +++++++++++++++++++
 .../angular_devkit/core/src/_golden-api.ts    |  4 ++
 packages/angular_devkit/core/src/index.ts     |  2 +
 3 files changed, 67 insertions(+)

diff --git a/etc/api/angular_devkit/core/src/_golden-api.d.ts b/etc/api/angular_devkit/core/src/_golden-api.d.ts
index 7f22b941c29c..b08f4a4ecb49 100644
--- a/etc/api/angular_devkit/core/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/core/src/_golden-api.d.ts
@@ -171,6 +171,8 @@ export declare class CoreSchemaRegistry implements SchemaRegistry {
     usePromptProvider(provider: PromptProvider): void;
 }
 
+export declare function createWorkspaceHost(host: virtualFs.Host): WorkspaceHost;
+
 export declare const cyan: (x: string) => string;
 
 export declare function dasherize(str: string): string;
@@ -179,6 +181,8 @@ export declare function decamelize(str: string): string;
 
 export declare function deepCopy<T extends any>(value: T): T;
 
+export declare type DefinitionCollectionListener<V> = (name: string, action: 'add' | 'remove' | 'replace', newValue: V | undefined, oldValue: V | undefined) => void;
+
 export declare class DependencyNotFoundException extends BaseException {
     constructor();
 }
@@ -607,6 +611,27 @@ export declare class PriorityQueue<T> {
     toArray(): Array<T>;
 }
 
+export interface ProjectDefinition {
+    readonly extensions: Record<string, JsonValue | undefined>;
+    prefix?: string;
+    root: string;
+    sourceRoot?: string;
+    readonly targets: TargetDefinitionCollection;
+}
+
+export declare class ProjectDefinitionCollection extends DefinitionCollection<ProjectDefinition> {
+    constructor(initial?: Record<string, ProjectDefinition>, listener?: DefinitionCollectionListener<ProjectDefinition>);
+    add(definition: {
+        name: string;
+        root: string;
+        sourceRoot?: string;
+        prefix?: string;
+        targets?: Record<string, TargetDefinition>;
+        [key: string]: unknown;
+    }): this;
+    set(name: string, value: ProjectDefinition): this;
+}
+
 export declare class ProjectNotFoundException extends BaseException {
     constructor(name: string);
 }
@@ -644,6 +669,10 @@ export interface ReadonlyHost<StatsT extends object = {}> {
     stat(path: Path): Observable<Stats<StatsT> | null> | null;
 }
 
+export declare function readWorkspace(path: string, host: WorkspaceHost, format?: WorkspaceFormat): Promise<{
+    workspace: WorkspaceDefinition;
+}>;
+
 export declare const red: (x: string) => string;
 
 export interface ReferenceResolver<ContextT> {
@@ -866,6 +895,20 @@ export declare class SynchronousDelegateExpectedException extends BaseException
     constructor();
 }
 
+export interface TargetDefinition {
+    builder: string;
+    configurations?: Record<string, Record<string, JsonValue | undefined> | undefined>;
+    options?: Record<string, JsonValue | undefined>;
+}
+
+export declare class TargetDefinitionCollection extends DefinitionCollection<TargetDefinition> {
+    constructor(initial?: Record<string, TargetDefinition>, listener?: DefinitionCollectionListener<TargetDefinition>);
+    add(definition: {
+        name: string;
+    } & TargetDefinition): this;
+    set(name: string, value: TargetDefinition): this;
+}
+
 export declare function template<T>(content: string, options?: TemplateOptions): (input: T) => string;
 
 export interface TemplateAst {
@@ -1023,10 +1066,26 @@ export declare class Workspace {
     static fromPath(host: virtualFs.Host<{}>, path: Path, registry: schema.CoreSchemaRegistry): Promise<Workspace>;
 }
 
+export interface WorkspaceDefinition {
+    readonly extensions: Record<string, JsonValue | undefined>;
+    readonly projects: ProjectDefinitionCollection;
+}
+
 export declare class WorkspaceFileNotFoundException extends BaseException {
     constructor(path: Path);
 }
 
+export declare enum WorkspaceFormat {
+    JSON = 0
+}
+
+export interface WorkspaceHost {
+    isDirectory(path: string): Promise<boolean>;
+    isFile(path: string): Promise<boolean>;
+    readFile(path: string): Promise<string>;
+    writeFile(path: string, data: string): Promise<void>;
+}
+
 export declare class WorkspaceNotYetLoadedException extends BaseException {
     constructor();
 }
@@ -1065,4 +1124,6 @@ export declare class WorkspaceToolNotFoundException extends BaseException {
     constructor(name: string);
 }
 
+export declare function writeWorkspace(workspace: WorkspaceDefinition, host: WorkspaceHost, path?: string, format?: WorkspaceFormat): Promise<void>;
+
 export declare const yellow: (x: string) => string;
diff --git a/packages/angular_devkit/core/src/_golden-api.ts b/packages/angular_devkit/core/src/_golden-api.ts
index ac1cc3ad40a4..b897087999c3 100644
--- a/packages/angular_devkit/core/src/_golden-api.ts
+++ b/packages/angular_devkit/core/src/_golden-api.ts
@@ -51,3 +51,7 @@ export * from './utils/lang';
 export * from './virtual-fs/path';
 export * from './virtual-fs/host/index';
 // End virtualFs namespace
+
+// Start workspace namespace
+export * from './workspace/index';
+// End workspace namespace
diff --git a/packages/angular_devkit/core/src/index.ts b/packages/angular_devkit/core/src/index.ts
index 03272380bbfe..388c3e7645ea 100644
--- a/packages/angular_devkit/core/src/index.ts
+++ b/packages/angular_devkit/core/src/index.ts
@@ -10,6 +10,7 @@ import * as experimental from './experimental';
 import * as json from './json/index';
 import * as logging from './logger/index';
 import * as terminal from './terminal/index';
+import * as workspace from './workspace';
 
 export * from './exception/exception';
 export * from './json/index';
@@ -22,4 +23,5 @@ export {
   json,
   logging,
   terminal,
+  workspace,
 };

From bd16cbc98d2b333cb9feb9a9a4a0459237b8af94 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 5 Apr 2019 13:45:56 -0400
Subject: [PATCH 1112/1703] refactor(@angular-devkit/build-angular): use
 webpack config utilities in browser builder

---
 .../models/webpack-configs/browser.ts         |   5 +-
 .../build_angular/src/browser/index.ts        | 222 ++++--------------
 .../build_angular/src/extract-i18n/index.ts   |   2 +-
 .../build_angular/src/karma/index.ts          |   2 +-
 .../src/utils/webpack-browser-config.ts       |  94 +++++---
 5 files changed, 110 insertions(+), 215 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
index 31bdbab5b424..510b1b968f2a 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
@@ -7,6 +7,7 @@
  */
 import { LicenseWebpackPlugin } from 'license-webpack-plugin';
 import * as path from 'path';
+import * as webpack from 'webpack';
 import { IndexHtmlWebpackPlugin } from '../../plugins/index-html-webpack-plugin';
 import { generateEntryPoints } from '../../utilities/package-chunk-sort';
 import { WebpackConfigOptions } from '../build-options';
@@ -15,7 +16,7 @@ import { getSourceMapDevTool, normalizeExtraEntryPoints } from './utils';
 const SubresourceIntegrityPlugin = require('webpack-subresource-integrity');
 
 
-export function getBrowserConfig(wco: WebpackConfigOptions) {
+export function getBrowserConfig(wco: WebpackConfigOptions): webpack.Configuration {
   const { root, buildOptions } = wco;
   const extraPlugins = [];
 
@@ -119,7 +120,7 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
           },
         },
       },
-    },
+    } as webpack.Options.Optimization,
     plugins: extraPlugins,
     node: false,
   };
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 64f0e8d62bdf..04b6a486bde0 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -5,31 +5,25 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
 import {
   BuilderContext,
-  BuilderInfo,
   BuilderOutput,
   createBuilder,
 } from '@angular-devkit/architect';
 import { WebpackLoggingCallback, runWebpack } from '@angular-devkit/build-webpack';
 import {
-  Path,
-  analytics,
   experimental,
-  getSystemPath,
-  join,
   json,
   logging,
   normalize,
   resolve,
-  schema, virtualFs,
+  virtualFs,
 } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as fs from 'fs';
+import * as path from 'path';
 import { Observable, combineLatest, from, of } from 'rxjs';
 import { concatMap, map, switchMap } from 'rxjs/operators';
-import * as ts from 'typescript';
 import * as webpack from 'webpack';
 import { NgBuildAnalyticsPlugin } from '../../plugins/webpack/analytics';
 import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
@@ -37,32 +31,21 @@ import {
   getAotConfig,
   getBrowserConfig,
   getCommonConfig,
-  getEsVersionForFileName,
   getNonAotConfig,
   getStatsConfig,
   getStylesConfig,
   getWorkerConfig,
 } from '../angular-cli-files/models/webpack-configs';
-import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
 import { augmentAppWithServiceWorker } from '../angular-cli-files/utilities/service-worker';
 import {
   statsErrorsToString,
   statsToString,
   statsWarningsToString,
 } from '../angular-cli-files/utilities/stats';
-import {
-  NormalizedBrowserBuilderSchema,
-  defaultProgress,
-  deleteOutputDir,
-  normalizeBrowserSchema,
-} from '../utils';
+import { deleteOutputDir } from '../utils';
+import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
 import { Schema as BrowserBuilderSchema } from './schema';
 
-
-const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');
-const webpackMerge = require('webpack-merge');
-
-
 export type BrowserBuilderOutput = json.JsonObject & BuilderOutput & {
   outputPath: string;
 };
@@ -89,181 +72,58 @@ export function createBrowserLoggingCallback(
   };
 }
 
-export function buildWebpackConfig(
-  root: Path,
-  projectRoot: Path,
-  options: NormalizedBrowserBuilderSchema,
-  additionalOptions: {
-    logger?: logging.LoggerApi,
-    analytics?: analytics.Analytics,
-    builderInfo?: BuilderInfo,
-  } = {},
-): webpack.Configuration[] {
-  // Ensure Build Optimizer is only used with AOT.
-  if (options.buildOptimizer && !options.aot) {
-    throw new Error(`The 'buildOptimizer' option cannot be used without 'aot'.`);
-  }
-
-  let wco: WebpackConfigOptions<NormalizedBrowserBuilderSchema>;
-
-  const tsConfigPath = getSystemPath(normalize(resolve(root, normalize(options.tsConfig))));
-  const tsConfig = readTsconfig(tsConfigPath);
-
-  const logger = additionalOptions.logger
-    ? additionalOptions.logger.createChild('webpackConfigOptions')
-    : new logging.NullLogger();
-
-  const scriptTarget = tsConfig.options.target;
-  // todo enabe when differential loading is complete
-  // const differentialLoading = isDifferentialLoadingNeeded(projectRoot, scriptTarget);
-  const differentialLoading = false;
-
-  const scriptTargets = differentialLoading ? [ts.ScriptTarget.ES5, scriptTarget] : [scriptTarget];
-
-  // For differential loading, we can have several targets
-  return scriptTargets.map(scriptTarget => {
-    let buildOptions: NormalizedBrowserBuilderSchema = { ...options };
-    if (differentialLoading) {
-      // For differential loading, the builder needs to created the index.html by itself
-      // without using a webpack plugin.
-      buildOptions = {
-        ...options,
-        es5BrowserSupport: undefined,
-        index: '',
-        esVersionInFileName: true,
-        scriptTargetOverride: scriptTarget,
-      };
-    }
-
-    const supportES2015
-      = scriptTarget !== ts.ScriptTarget.ES3 && scriptTarget !== ts.ScriptTarget.ES5;
-
-    wco = {
-      root: getSystemPath(root),
-      logger,
-      projectRoot: getSystemPath(projectRoot),
-      buildOptions: buildOptions,
-      tsConfig,
-      tsConfigPath,
-      supportES2015,
-    };
-
-    wco.buildOptions.progress = defaultProgress(wco.buildOptions.progress);
-
-    const webpackConfigs: {}[] = [
+export async function buildBrowserWebpackConfigFromContext(
+  options: BrowserBuilderSchema,
+  context: BuilderContext,
+  host: virtualFs.Host<fs.Stats>,
+): Promise<{ workspace: experimental.workspace.Workspace, config: webpack.Configuration[] }> {
+  return generateBrowserWebpackConfigFromContext(
+    options,
+    context,
+    wco => [
       getCommonConfig(wco),
       getBrowserConfig(wco),
       getStylesConfig(wco),
       getStatsConfig(wco),
-      getWorkerConfig(wco),
-    ];
-
-    if (wco.buildOptions.main || wco.buildOptions.polyfills) {
-      const typescriptConfigPartial = wco.buildOptions.aot
-        ? getAotConfig(wco)
-        : getNonAotConfig(wco);
-      webpackConfigs.push(typescriptConfigPartial);
-    }
-
-    if (additionalOptions.analytics) {
-      // If there's analytics, add our plugin. Otherwise no need to slow down the build.
-      let category = 'build';
-      if (additionalOptions.builderInfo) {
-        // We already vetted that this is a "safe" package, otherwise the analytics would be noop.
-        category = additionalOptions.builderInfo.builderName.split(':')[1];
-      }
-      // The category is the builder name if it's an angular builder.
-      webpackConfigs.push({
-        plugins: [
-          new NgBuildAnalyticsPlugin(wco.projectRoot, additionalOptions.analytics, category),
-        ],
-      });
-    }
-
-    const webpackConfig = webpackMerge(webpackConfigs);
-
-    if (options.profile || process.env['NG_BUILD_PROFILING']) {
-      const esVersionInFileName = getEsVersionForFileName(
-        wco.buildOptions.scriptTargetOverride,
-        wco.buildOptions.esVersionInFileName,
-      );
-
-      const smp = new SpeedMeasurePlugin({
-        outputFormat: 'json',
-        outputTarget: getSystemPath(join(root,
-          `speed-measure-plugin${esVersionInFileName}.json`)),
-      });
-
-      return smp.wrap(webpackConfig);
-    }
-
-    return webpackConfig;
-  });
-}
-
-export async function buildBrowserWebpackConfigFromWorkspace(
-  options: BrowserBuilderSchema,
-  projectName: string,
-  workspace: experimental.workspace.Workspace,
-  host: virtualFs.Host<fs.Stats>,
-  additionalOptions: {
-    logger?: logging.LoggerApi,
-    analytics?: analytics.Analytics,
-    builderInfo?: BuilderInfo,
-  } = {},
-): Promise<webpack.Configuration[]> {
-  // TODO: Use a better interface for workspace access.
-  const projectRoot = resolve(workspace.root, normalize(workspace.getProject(projectName).root));
-  const sourceRoot = workspace.getProject(projectName).sourceRoot;
-
-  const normalizedOptions = normalizeBrowserSchema(
+      getAnalyticsConfig(wco, context),
+      getCompilerConfig(wco),
+      wco.buildOptions.webWorkerTsConfig ? getWorkerConfig(wco) : {},
+    ],
     host,
-    workspace.root,
-    projectRoot,
-    sourceRoot ? resolve(workspace.root, normalize(sourceRoot)) : undefined,
-    options,
   );
-
-  return buildWebpackConfig(workspace.root, projectRoot, normalizedOptions, additionalOptions);
 }
 
-
-export async function buildBrowserWebpackConfigFromContext(
-  options: BrowserBuilderSchema,
+function getAnalyticsConfig(
+  wco: WebpackConfigOptions,
   context: BuilderContext,
-  host: virtualFs.Host<fs.Stats>,
-): Promise<{ workspace: experimental.workspace.Workspace, config: webpack.Configuration[] }> {
-  const registry = new schema.CoreSchemaRegistry();
-  registry.addPostTransform(schema.transforms.addUndefinedDefaults);
+): webpack.Configuration {
+  if (context.analytics) {
+    // If there's analytics, add our plugin. Otherwise no need to slow down the build.
+    let category = 'build';
+    if (context.builder) {
+      // We already vetted that this is a "safe" package, otherwise the analytics would be noop.
+      category = context.builder.builderName.split(':')[1];
+    }
 
-  const workspace = await experimental.workspace.Workspace.fromPath(
-    host,
-    normalize(context.workspaceRoot),
-    registry,
-  );
+    // The category is the builder name if it's an angular builder.
+    return {
+      plugins: [
+        new NgBuildAnalyticsPlugin(wco.projectRoot, context.analytics, category),
+      ],
+    };
+  }
 
-  const projectName = context.target ? context.target.project : workspace.getDefaultProjectName();
+  return {};
+}
 
-  if (!projectName) {
-    throw new Error('Must either have a target from the context or a default project.');
+function getCompilerConfig(wco: WebpackConfigOptions): webpack.Configuration {
+  if (wco.buildOptions.main || wco.buildOptions.polyfills) {
+    return wco.buildOptions.aot ? getAotConfig(wco) : getNonAotConfig(wco);
   }
 
-  const config = await buildBrowserWebpackConfigFromWorkspace(
-    options,
-    projectName,
-    workspace,
-    host,
-    {
-      logger: context.logger,
-      analytics: context.analytics,
-      builderInfo: context.builder,
-    },
-  );
-
-  return { workspace, config };
+  return {};
 }
 
-
 export type BrowserConfigTransformFn = (
   workspace: experimental.workspace.Workspace,
   config: webpack.Configuration,
@@ -353,7 +213,7 @@ export function buildWebpackBrowser(
         map(event => ({
           ...event,
           // If we use differential loading, both configs have the same outputs
-          outputPath: getSystemPath(join(normalize(context.workspaceRoot), options.outputPath)),
+          outputPath: path.resolve(context.workspaceRoot, options.outputPath),
         } as BrowserBuilderOutput)),
         concatMap(output => outputFn ? outputFn(output) : of(output)),
       );
diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
index 83628ee17cdf..a4acb38c21df 100644
--- a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
@@ -87,7 +87,7 @@ async function execute(options: ExtractI18nBuilderOptions, context: BuilderConte
     ],
   );
 
-  return runWebpack(config, context).toPromise();
+  return runWebpack(config[0], context).toPromise();
 }
 
 export default createBuilder<JsonObject & ExtractI18nBuilderOptions>(execute);
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index 9ee20a74b6d1..0ef51c86acc5 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -52,7 +52,7 @@ async function initialize(
   // tslint:disable-next-line:no-implicit-dependencies
   const karma = await import('karma');
 
-  return [karma, config];
+  return [karma, config[0]];
 }
 
 export function execute(
diff --git a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
index 0c28c6fcb3a7..4d983d49e0a2 100644
--- a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
+++ b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
@@ -20,6 +20,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as webpack from 'webpack';
 import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
+import { getEsVersionForFileName } from '../angular-cli-files/models/webpack-configs';
 import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
 import { Schema as BrowserBuilderSchema } from '../browser/schema';
 import { NormalizedBrowserBuilderSchema, defaultProgress, normalizeBrowserSchema } from '../utils';
@@ -36,7 +37,7 @@ export async function generateWebpackConfig(
   options: NormalizedBrowserBuilderSchema,
   webpackPartialGenerator: (wco: BrowserWebpackConfigOptions) => webpack.Configuration[],
   logger: logging.LoggerApi,
-): Promise<webpack.Configuration> {
+): Promise<webpack.Configuration[]> {
   // Ensure Build Optimizer is only used with AOT.
   if (options.buildOptimizer && !options.aot) {
     throw new Error(`The 'buildOptimizer' option cannot be used without 'aot'.`);
@@ -46,37 +47,70 @@ export async function generateWebpackConfig(
   const tsConfig = readTsconfig(tsConfigPath);
 
   // tslint:disable-next-line:no-implicit-dependencies
-  const projectTs = await import('typescript');
+  const ts = await import('typescript');
 
-  const supportES2015 = tsConfig.options.target !== projectTs.ScriptTarget.ES3
-    && tsConfig.options.target !== projectTs.ScriptTarget.ES5;
+  // todo enabe when differential loading is complete
+  // const differentialLoading = isDifferentialLoadingNeeded(projectRoot, scriptTarget);
+  const differentialLoading = false;
 
-  const wco: BrowserWebpackConfigOptions = {
-    root: workspaceRoot,
-    logger: logger.createChild('webpackConfigOptions'),
-    projectRoot,
-    sourceRoot,
-    buildOptions: options,
-    tsConfig,
-    tsConfigPath,
-    supportES2015,
-  };
-
-  wco.buildOptions.progress = defaultProgress(wco.buildOptions.progress);
-
-  const partials = webpackPartialGenerator(wco);
-  const webpackConfig = webpackMerge(partials);
-
-  if (options.profile || process.env['NG_BUILD_PROFILING']) {
-    const smp = new SpeedMeasurePlugin({
-      outputFormat: 'json',
-      outputTarget: path.resolve(workspaceRoot, 'speed-measure-plugin.json'),
-    });
-
-    return smp.wrap(webpackConfig);
+  const scriptTargets = [ tsConfig.options.target ];
+  if (differentialLoading) {
+    scriptTargets.unshift(ts.ScriptTarget.ES5);
   }
 
-  return webpackConfig;
+  // For differential loading, we can have several targets
+  return scriptTargets.map(scriptTarget => {
+    let buildOptions: NormalizedBrowserBuilderSchema = { ...options };
+    if (differentialLoading) {
+      // For differential loading, the builder needs to created the index.html by itself
+      // without using a webpack plugin.
+      buildOptions = {
+        ...options,
+        es5BrowserSupport: undefined,
+        index: '',
+        esVersionInFileName: true,
+        scriptTargetOverride: scriptTarget,
+      };
+    }
+
+    const supportES2015
+      = scriptTarget !== ts.ScriptTarget.ES3 && scriptTarget !== ts.ScriptTarget.ES5;
+
+    const wco: BrowserWebpackConfigOptions = {
+      root: workspaceRoot,
+      logger: logger.createChild('webpackConfigOptions'),
+      projectRoot,
+      sourceRoot,
+      buildOptions,
+      tsConfig,
+      tsConfigPath,
+      supportES2015,
+    };
+
+    wco.buildOptions.progress = defaultProgress(wco.buildOptions.progress);
+
+    const partials = webpackPartialGenerator(wco);
+    const webpackConfig = webpackMerge(partials);
+
+    if (options.profile || process.env['NG_BUILD_PROFILING']) {
+      const esVersionInFileName = getEsVersionForFileName(
+        wco.buildOptions.scriptTargetOverride,
+        wco.buildOptions.esVersionInFileName,
+      );
+
+      const smp = new SpeedMeasurePlugin({
+        outputFormat: 'json',
+        outputTarget: path.resolve(
+          workspaceRoot,
+          `speed-measure-plugin${esVersionInFileName}.json`,
+        ),
+      });
+
+      return smp.wrap(webpackConfig);
+    }
+
+    return webpackConfig;
+  });
 }
 
 
@@ -87,7 +121,7 @@ export async function generateBrowserWebpackConfigFromWorkspace(
   host: virtualFs.Host<fs.Stats>,
   webpackPartialGenerator: (wco: BrowserWebpackConfigOptions) => webpack.Configuration[],
   logger: logging.LoggerApi,
-): Promise<webpack.Configuration> {
+): Promise<webpack.Configuration[]> {
   // TODO: Use a better interface for workspace access.
   const projectRoot = resolve(workspace.root, normalize(workspace.getProject(projectName).root));
   const projectSourceRoot = workspace.getProject(projectName).sourceRoot;
@@ -119,7 +153,7 @@ export async function generateBrowserWebpackConfigFromContext(
   context: BuilderContext,
   webpackPartialGenerator: (wco: BrowserWebpackConfigOptions) => webpack.Configuration[],
   host: virtualFs.Host<fs.Stats> = new NodeJsSyncHost(),
-): Promise<{ workspace: experimental.workspace.Workspace, config: webpack.Configuration }> {
+): Promise<{ workspace: experimental.workspace.Workspace, config: webpack.Configuration[] }> {
   const registry = new schema.CoreSchemaRegistry();
   registry.addPostTransform(schema.transforms.addUndefinedDefaults);
 

From 5f13d06cb360bcd895971008556e2b049d5c96ee Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Mon, 8 Apr 2019 11:42:18 +0200
Subject: [PATCH 1113/1703] fix(@angular-devkit/build-angular): ignore bundle
 budgets when running karma or devserver

Fixes #14100
---
 .../build_angular/src/dev-server/index.ts     |  3 ++
 .../build_angular/src/karma/index.ts          |  7 ++--
 .../test/dev-server/budgets_spec_large.ts     | 35 +++++++++++++++++++
 .../test/dev-server/proxy_spec_large.ts       |  1 -
 4 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/test/dev-server/budgets_spec_large.ts

diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index d5e4132f1872..83809682b2e4 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -106,6 +106,9 @@ export function serveWebpackBrowser(
       [key]: options[key],
     }), {});
 
+    // In dev server we should not have budgets because of extra libs such as socks-js
+    overrides.budgets = undefined;
+
     const browserName = await context.getBuilderNameForTarget(browserTarget);
     const browserOptions = await context.validateOptions<json.JsonObject & BrowserBuilderSchema>(
       { ...rawBrowserOptions, ...overrides },
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index 0ef51c86acc5..3f55d93e25f5 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -36,9 +36,10 @@ async function initialize(
   // tslint:disable-next-line:no-implicit-dependencies
 ): Promise<[typeof import ('karma'), webpack.Configuration]> {
   const { config } = await generateBrowserWebpackConfigFromContext(
-    // only one property is missing:
-    // * `index` which is not used for tests
-    { ...options as unknown as BrowserBuilderOptions, outputPath: '' },
+    // only two properties are missing:
+    // * `outputPath` which is fixed for tests
+    // * `budgets` which might be incorrect due to extra dev libs
+    { ...options as unknown as BrowserBuilderOptions, outputPath: '', budgets: undefined },
     context,
     wco => [
       getCommonConfig(wco),
diff --git a/packages/angular_devkit/build_angular/test/dev-server/budgets_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/budgets_spec_large.ts
new file mode 100644
index 000000000000..154912995861
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/dev-server/budgets_spec_large.ts
@@ -0,0 +1,35 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { normalize, virtualFs } from '@angular-devkit/core';
+import { createArchitect, host } from '../utils';
+
+describe('Dev Server Builder bundle budgets', () => {
+  const targetSpec = { project: 'app', target: 'serve' };
+
+  beforeEach(async () => host.initialize().toPromise());
+  afterEach(async () => host.restore().toPromise());
+
+  it('should ignore budgets', async () => {
+    const config = host.scopedSync().read(normalize('angular.json'));
+    const jsonConfig = JSON.parse(virtualFs.fileBufferToString(config));
+    const buildOptions = jsonConfig.projects.app.targets.build.options;
+
+    buildOptions.budgets = [{ type: 'all', maximumError: '100b' }],
+    buildOptions.optimization = true;
+
+    host.writeMultipleFiles({
+      'angular.json': JSON.stringify(jsonConfig),
+    });
+
+    const architect = (await createArchitect(host.root())).architect;
+    const run = await architect.scheduleTarget(targetSpec);
+    const output = await run.result;
+    expect(output.success).toBe(true);
+    await run.stop();
+  });
+});
diff --git a/packages/angular_devkit/build_angular/test/dev-server/proxy_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/proxy_spec_large.ts
index 113e255a0049..7ac09c879aa6 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/proxy_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/proxy_spec_large.ts
@@ -63,7 +63,6 @@ describe('Dev Server Builder proxy', () => {
   }, 30000);
 
   it('errors out with a missing proxy file', async () => {
-    const overrides: Partial<DevServerBuilderOptions> = { proxyConfig: '../proxy.config.json' };
     const run = await architect.scheduleTarget(target, { proxyConfig: 'INVALID.json' });
     runs.push(run);
 

From 49fb9ec0d7922a1b86da829c79d2ae4343cb7312 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 9 Apr 2019 05:20:53 +0000
Subject: [PATCH 1114/1703] build: update source-map-support to version 0.5.12

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index b9a9dd77ce2c..4b8c42266e5e 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -40,7 +40,7 @@
     "sass": "1.18.0",
     "sass-loader": "7.1.0",
     "semver": "6.0.0",
-    "source-map-support": "0.5.11",
+    "source-map-support": "0.5.12",
     "source-map-loader": "0.2.4",
     "speed-measure-webpack-plugin": "1.3.1",
     "stats-webpack-plugin": "0.7.0",
diff --git a/yarn.lock b/yarn.lock
index fb32a58e1add..64e812f2a5c4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8492,10 +8492,10 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@0.5.11:
-  version "0.5.11"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.11.tgz#efac2ce0800355d026326a0ca23e162aeac9a4e2"
-  integrity sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==
+source-map-support@0.5.12:
+  version "0.5.12"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
+  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"

From a686eabed911746fe25ea6e843a83e977e43433a Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 9 Apr 2019 22:01:03 +0000
Subject: [PATCH 1115/1703] build: update webpack-dev-server to version 3.3.1

---
 .../angular_devkit/build_angular/package.json |   2 +-
 yarn.lock                                     | 212 ++++++++++++++----
 2 files changed, 173 insertions(+), 41 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 4b8c42266e5e..e84645cc836d 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -51,7 +51,7 @@
     "terser-webpack-plugin": "1.2.3",
     "webpack": "4.29.6",
     "webpack-dev-middleware": "3.6.2",
-    "webpack-dev-server": "3.2.1",
+    "webpack-dev-server": "3.3.1",
     "webpack-merge": "4.2.1",
     "webpack-sources": "1.3.0",
     "webpack-subresource-integrity": "1.1.0-rc.6",
diff --git a/yarn.lock b/yarn.lock
index 64e812f2a5c4..c95200110cd3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1808,6 +1808,11 @@ camelcase@^4.0.0, camelcase@^4.1.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
   integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
+camelcase@^5.0.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
 caniuse-api@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
@@ -1921,6 +1926,25 @@ chokidar@^2.1.1:
   optionalDependencies:
     fsevents "^1.2.7"
 
+chokidar@^2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
+  integrity sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
+    glob-parent "^3.1.0"
+    inherits "^2.0.3"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^3.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.2.1"
+    upath "^1.1.1"
+  optionalDependencies:
+    fsevents "^1.2.7"
+
 chownr@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
@@ -2208,6 +2232,13 @@ compressible@~2.0.14:
   dependencies:
     mime-db ">= 1.36.0 < 2"
 
+compressible@~2.0.16:
+  version "2.0.16"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.16.tgz#a49bf9858f3821b64ce1be0296afc7380466a77f"
+  integrity sha512-JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA==
+  dependencies:
+    mime-db ">= 1.38.0 < 2"
+
 compression@^1.5.2:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db"
@@ -2221,6 +2252,19 @@ compression@^1.5.2:
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
+compression@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
+  dependencies:
+    accepts "~1.3.5"
+    bytes "3.0.0"
+    compressible "~2.0.16"
+    debug "2.6.9"
+    on-headers "~1.0.2"
+    safe-buffer "5.1.2"
+    vary "~1.1.2"
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -2253,6 +2297,11 @@ connect-history-api-fallback@^1.3.0:
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a"
   integrity sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=
 
+connect-history-api-fallback@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
+  integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
+
 connect@^3.6.0:
   version "3.6.6"
   resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
@@ -2760,7 +2809,7 @@ decamelize-keys@^1.0.0:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
 
-decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2:
+decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
@@ -2874,6 +2923,18 @@ del@^3.0.0:
     pify "^3.0.0"
     rimraf "^2.2.8"
 
+del@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/del/-/del-4.1.0.tgz#049543b8290e1a9293e2bd150ab3a06f637322b8"
+  integrity sha512-C4kvKNlYrwXhKxz97BuohF8YoGgQ23Xm9lvoHmgT7JaPGprSEjk3+XFled74Yt/x0ZABUHg2D67covzAPUKx5Q==
+  dependencies:
+    globby "^6.1.0"
+    is-path-cwd "^2.0.0"
+    is-path-in-cwd "^2.0.0"
+    p-map "^2.0.0"
+    pify "^4.0.1"
+    rimraf "^2.6.3"
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -3430,7 +3491,7 @@ expand-range@^1.8.1:
   dependencies:
     fill-range "^2.1.0"
 
-express@^4.16.2:
+express@^4.16.2, express@^4.16.4:
   version "4.16.4"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
   integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
@@ -4296,7 +4357,7 @@ hpack.js@^2.1.6:
     readable-stream "^2.0.1"
     wbuf "^1.1.0"
 
-html-entities@^1.2.0:
+html-entities@^1.2.0, html-entities@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
   integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
@@ -4851,6 +4912,11 @@ is-path-cwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
   integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
 
+is-path-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.0.0.tgz#d4777a8e227a00096a31f030db3770f84b116c02"
+  integrity sha512-m5dHHzpOXEiv18JEORttBO64UgTEypx99vCxQLjbBvGhOJxnTNglYoFXxwo6AbsQb79sqqycQEHv2hWkHZAijA==
+
 is-path-in-cwd@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
@@ -4858,6 +4924,13 @@ is-path-in-cwd@^1.0.0:
   dependencies:
     is-path-inside "^1.0.0"
 
+is-path-in-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.0.0.tgz#68e452a6eec260500cec21e029c0a44cc0dcd2ea"
+  integrity sha512-6Vz5Gc9s/sDA3JBVu0FzWufm8xaBsqy1zn8Q6gmvGP6nSDMw78aS4poBNeatWjaRpTpxxLn1WOndAiOlk+qY8A==
+  dependencies:
+    is-path-inside "^1.0.0"
+
 is-path-inside@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
@@ -5413,7 +5486,7 @@ keyv@^3.0.0:
   dependencies:
     json-buffer "3.0.0"
 
-killable@^1.0.0:
+killable@^1.0.0, killable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
   integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
@@ -5722,7 +5795,7 @@ logform@^1.9.1:
     ms "^2.1.1"
     triple-beam "^1.2.0"
 
-loglevel@^1.4.1:
+loglevel@^1.4.1, loglevel@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
   integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
@@ -5998,6 +6071,11 @@ miller-rabin@^4.0.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
   integrity sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==
 
+"mime-db@>= 1.38.0 < 2":
+  version "1.39.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.39.0.tgz#f95a20275742f7d2ad0429acfe40f4233543780e"
+  integrity sha512-DTsrw/iWVvwHH+9Otxccdyy0Tgiil6TWK/xhfARJZF/QFhwOgZgOIvA2/VIGpM8U7Q8z5nDmdDWC6tuVMJNibw==
+
 mime-db@~1.36.0:
   version "1.36.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
@@ -6591,6 +6669,11 @@ on-headers@~1.0.1:
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
   integrity sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=
 
+on-headers@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
+
 on-new-line@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/on-new-line/-/on-new-line-0.0.1.tgz#99339cb06dcfe3e78d6964a2ef2af374a145f8fb"
@@ -6639,6 +6722,13 @@ opn@^5.1.0:
   dependencies:
     is-wsl "^1.1.0"
 
+opn@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
+  integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
+  dependencies:
+    is-wsl "^1.1.0"
+
 optimist@^0.6.1, optimist@~0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
@@ -6779,6 +6869,11 @@ p-map@^1.1.1:
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
   integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
 
+p-map@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
+  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
+
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
@@ -7087,6 +7182,11 @@ pify@^3.0.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
   integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
+pify@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
+
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
@@ -7123,6 +7223,15 @@ popper.js@^1.14.1:
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.4.tgz#8eec1d8ff02a5a3a152dd43414a15c7b79fd69b6"
   integrity sha1-juwdj/AqWjoVLdQ0FKFce3n9abY=
 
+portfinder@^1.0.20:
+  version "1.0.20"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
+  integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==
+  dependencies:
+    async "^1.5.2"
+    debug "^2.2.0"
+    mkdirp "0.5.x"
+
 portfinder@^1.0.9:
   version "1.0.19"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.19.tgz#07e87914a55242dcda5b833d42f018d6875b595f"
@@ -7931,6 +8040,13 @@ rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimra
   dependencies:
     glob "^7.0.5"
 
+rimraf@^2.6.3:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+  dependencies:
+    glob "^7.1.3"
+
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -8141,7 +8257,7 @@ selenium-webdriver@^4.0.0-alpha.1:
     tmp "0.0.30"
     xml2js "^0.4.17"
 
-selfsigned@^1.9.1:
+selfsigned@^1.10.4, selfsigned@^1.9.1:
   version "1.10.4"
   resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
   integrity sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==
@@ -8184,7 +8300,7 @@ semver-intersect@1.4.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
   integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
 
-semver@6.0.0:
+semver@6.0.0, semver@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
   integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
@@ -8213,7 +8329,7 @@ serialize-javascript@^1.4.0:
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
   integrity sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==
 
-serve-index@^1.7.2:
+serve-index@^1.7.2, serve-index@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
   integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
@@ -9478,7 +9594,7 @@ upath@^1.0.5:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
   integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==
 
-upath@^1.1.0:
+upath@^1.1.0, upath@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
   integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
@@ -9698,7 +9814,7 @@ webpack-dev-middleware@3.4.0:
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
-webpack-dev-middleware@3.6.2:
+webpack-dev-middleware@3.6.2, webpack-dev-middleware@^3.6.2:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.2.tgz#f37a27ad7c09cd7dc67cd97655413abaa1f55942"
   integrity sha512-A47I5SX60IkHrMmZUlB0ZKSWi29TZTcPz7cha1Z75yYOsgWh/1AcPmQEbC8ZIbU3A1ytSv1PMU0PyPz2Lmz2jg==
@@ -9708,51 +9824,41 @@ webpack-dev-middleware@3.6.2:
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
-webpack-dev-middleware@^3.5.1:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.0.tgz#71f1b04e52ff8d442757af2be3a658237d53a3e5"
-  integrity sha512-oeXA3m+5gbYbDBGo4SvKpAHJJEGMoekUbHgo1RK7CP1sz7/WOSeu/dWJtSTk+rzDCLkPwQhGocgIq6lQqOyOwg==
-  dependencies:
-    memory-fs "^0.4.1"
-    mime "^2.3.1"
-    range-parser "^1.0.3"
-    webpack-log "^2.0.0"
-
-webpack-dev-server@3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.2.1.tgz#1b45ce3ecfc55b6ebe5e36dab2777c02bc508c4e"
-  integrity sha512-sjuE4mnmx6JOh9kvSbPYw3u/6uxCLHNWfhWaIPwcXWsvWOPN+nc5baq4i9jui3oOBRXGonK9+OI0jVkaz6/rCw==
+webpack-dev-server@3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.3.1.tgz#7046e49ded5c1255a82c5d942bcdda552b72a62d"
+  integrity sha512-jY09LikOyGZrxVTXK0mgIq9y2IhCoJ05848dKZqX1gAGLU1YDqgpOT71+W53JH/wI4v6ky4hm+KvSyW14JEs5A==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
-    chokidar "^2.0.0"
-    compression "^1.5.2"
-    connect-history-api-fallback "^1.3.0"
+    chokidar "^2.1.5"
+    compression "^1.7.4"
+    connect-history-api-fallback "^1.6.0"
     debug "^4.1.1"
-    del "^3.0.0"
-    express "^4.16.2"
-    html-entities "^1.2.0"
+    del "^4.1.0"
+    express "^4.16.4"
+    html-entities "^1.2.1"
     http-proxy-middleware "^0.19.1"
     import-local "^2.0.0"
     internal-ip "^4.2.0"
     ip "^1.1.5"
-    killable "^1.0.0"
-    loglevel "^1.4.1"
-    opn "^5.1.0"
-    portfinder "^1.0.9"
+    killable "^1.0.1"
+    loglevel "^1.6.1"
+    opn "^5.5.0"
+    portfinder "^1.0.20"
     schema-utils "^1.0.0"
-    selfsigned "^1.9.1"
-    semver "^5.6.0"
-    serve-index "^1.7.2"
+    selfsigned "^1.10.4"
+    semver "^6.0.0"
+    serve-index "^1.9.1"
     sockjs "0.3.19"
     sockjs-client "1.3.0"
     spdy "^4.0.0"
-    strip-ansi "^3.0.0"
+    strip-ansi "^3.0.1"
     supports-color "^6.1.0"
     url "^0.11.0"
-    webpack-dev-middleware "^3.5.1"
+    webpack-dev-middleware "^3.6.2"
     webpack-log "^2.0.0"
-    yargs "12.0.2"
+    yargs "12.0.5"
 
 webpack-dev-server@^3.1.4:
   version "3.1.10"
@@ -10054,6 +10160,14 @@ yargs-parser@^10.1.0:
   dependencies:
     camelcase "^4.1.0"
 
+yargs-parser@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
+  integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
 yargs-parser@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
@@ -10079,6 +10193,24 @@ yargs@12.0.2:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^10.1.0"
 
+yargs@12.0.5:
+  version "12.0.5"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
+  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^1.2.0"
+    find-up "^3.0.0"
+    get-caller-file "^1.0.1"
+    os-locale "^3.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1 || ^4.0.0"
+    yargs-parser "^11.1.1"
+
 yargs@9.0.1:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"

From 0edc095cd318d1ac097f24df88b966c6970e89bd Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 10 Apr 2019 10:44:06 +0000
Subject: [PATCH 1116/1703] build: update mini-css-extract-plugin to version
 0.6.0

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 41 ++++++++++++++++---
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index e84645cc836d..5ebd46a68865 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -28,7 +28,7 @@
     "less-loader": "4.1.0",
     "license-webpack-plugin": "2.1.1",
     "loader-utils": "1.2.3",
-    "mini-css-extract-plugin": "0.5.0",
+    "mini-css-extract-plugin": "0.6.0",
     "minimatch": "3.0.4",
     "parse5": "4.0.0",
     "open": "6.1.0",
diff --git a/yarn.lock b/yarn.lock
index c95200110cd3..bb83b871b644 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4938,7 +4938,7 @@ is-path-inside@^1.0.0:
   dependencies:
     path-is-inside "^1.0.1"
 
-is-plain-obj@^1.1.0:
+is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
@@ -6118,12 +6118,13 @@ mimic-response@^1.0.0, mimic-response@^1.0.1:
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
   integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
 
-mini-css-extract-plugin@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz#ac0059b02b9692515a637115b0cc9fed3a35c7b0"
-  integrity sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==
+mini-css-extract-plugin@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.6.0.tgz#a3f13372d6fcde912f3ee4cd039665704801e3b9"
+  integrity sha512-79q5P7YGI6rdnVyIAV4NXpBQJFWdkzJxCim3Kog4078fM0piAaFlwocqbejdWtLW1cEzCexPrh6EdyFsPgVdAw==
   dependencies:
     loader-utils "^1.1.0"
+    normalize-url "^2.0.1"
     schema-utils "^1.0.0"
     webpack-sources "^1.1.0"
 
@@ -6488,6 +6489,15 @@ normalize-range@^0.1.2:
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
   integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
+normalize-url@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
+  integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==
+  dependencies:
+    prepend-http "^2.0.0"
+    query-string "^5.0.1"
+    sort-keys "^2.0.0"
+
 normalize-url@^3.1.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
@@ -7528,6 +7538,15 @@ qs@6.5.2, qs@~6.5.2:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
+query-string@^5.0.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
+  integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==
+  dependencies:
+    decode-uri-component "^0.2.0"
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
+
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
@@ -8579,6 +8598,13 @@ socks@~2.2.0:
     ip "^1.1.5"
     smart-buffer "^4.0.1"
 
+sort-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
+  integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=
+  dependencies:
+    is-plain-obj "^1.0.0"
+
 source-list-map@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
@@ -8993,6 +9019,11 @@ streamroller@^1.0.1:
     fs-extra "^7.0.0"
     lodash "^4.17.10"
 
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
+
 string-width@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"

From fcbe988d109b6bc43de463901e08877bc5b0a206 Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Thu, 11 Apr 2019 09:20:41 +0200
Subject: [PATCH 1117/1703] fix(@schematics/angular): properly log data
 received in web worker snippet

The generated snippet was:

    worker.onmessage = ({ data }) => {
      console.log('page got message: $\{data\}');
    };

which doesn't use a template string and so does not log `data`.
Fixes the generated snippet to be `console.log(`page got message: ${data}`);`.
Also adds a newline at the end of the web worker template to not fail the default TSLint rules if the schematic is used.
---
 .../files/worker/__name@dasherize__.worker.ts.template         | 2 +-
 packages/schematics/angular/web-worker/index.ts                | 3 ++-
 packages/schematics/angular/web-worker/index_spec.ts           | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/web-worker/files/worker/__name@dasherize__.worker.ts.template b/packages/schematics/angular/web-worker/files/worker/__name@dasherize__.worker.ts.template
index b88e1b10b6ce..27020fe12b04 100644
--- a/packages/schematics/angular/web-worker/files/worker/__name@dasherize__.worker.ts.template
+++ b/packages/schematics/angular/web-worker/files/worker/__name@dasherize__.worker.ts.template
@@ -1,4 +1,4 @@
 addEventListener('message', ({ data }) => {
   const response = `worker response to ${data}`;
   postMessage(response);
-});
\ No newline at end of file
+});
diff --git a/packages/schematics/angular/web-worker/index.ts b/packages/schematics/angular/web-worker/index.ts
index 352c8d889de5..ba7f32727b88 100644
--- a/packages/schematics/angular/web-worker/index.ts
+++ b/packages/schematics/angular/web-worker/index.ts
@@ -150,12 +150,13 @@ function addSnippet(options: WebWorkerOptions): Rule {
     }
 
     const siblingModulePath = `${options.path}/${siblingModules[0]}`;
+    const logMessage = 'console.log(`page got message: ${data}`);';
     const workerCreationSnippet = tags.stripIndent`
       if (typeof Worker !== 'undefined') {
         // Create a new
         const worker = new Worker('./${options.name}.worker', { type: 'module' });
         worker.onmessage = ({ data }) => {
-          console.log('page got message: $\{data\}');
+          ${logMessage}
         };
         worker.postMessage('hello');
       } else {
diff --git a/packages/schematics/angular/web-worker/index_spec.ts b/packages/schematics/angular/web-worker/index_spec.ts
index 940d890d2f97..dbe82d773374 100644
--- a/packages/schematics/angular/web-worker/index_spec.ts
+++ b/packages/schematics/angular/web-worker/index_spec.ts
@@ -81,5 +81,6 @@ describe('Service Worker Schematic', () => {
     const tree = schematicRunner.runSchematic('web-worker', defaultOptions, appTree);
     const appComponent = tree.readContent('/projects/bar/src/app/app.component.ts');
     expect(appComponent).toContain(`new Worker('./${defaultOptions.name}.worker`);
+    expect(appComponent).toContain('console.log(`page got message: ${data}`)');
   });
 });

From 7fd6f6d501ee91208e6d0dc8cd71aa9884c5f908 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 12 Apr 2019 05:20:10 +0000
Subject: [PATCH 1118/1703] build: update magic-string to version 0.25.2

---
 packages/angular_devkit/core/package.json |  2 +-
 yarn.lock                                 | 22 +++++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json
index c7d9bedf7aa8..8c4f6b835f7c 100644
--- a/packages/angular_devkit/core/package.json
+++ b/packages/angular_devkit/core/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "ajv": "6.10.0",
     "fast-json-stable-stringify": "2.0.0",
-    "magic-string": "0.25.1",
+    "magic-string": "0.25.2",
     "rxjs": "6.4.0",
     "source-map": "0.7.3"
   },
diff --git a/yarn.lock b/yarn.lock
index bb83b871b644..89a71efa6f86 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5840,12 +5840,12 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
-magic-string@0.25.1, magic-string@^0.25.1:
-  version "0.25.1"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.1.tgz#b1c248b399cd7485da0fe7385c2fc7011843266e"
-  integrity sha512-sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg==
+magic-string@0.25.2:
+  version "0.25.2"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9"
+  integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==
   dependencies:
-    sourcemap-codec "^1.4.1"
+    sourcemap-codec "^1.4.4"
 
 magic-string@^0.22.4:
   version "0.22.5"
@@ -5861,6 +5861,13 @@ magic-string@^0.25.0:
   dependencies:
     sourcemap-codec "^1.4.1"
 
+magic-string@^0.25.1:
+  version "0.25.1"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.1.tgz#b1c248b399cd7485da0fe7385c2fc7011843266e"
+  integrity sha512-sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg==
+  dependencies:
+    sourcemap-codec "^1.4.1"
+
 make-dir@^1.0.0, make-dir@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -8716,6 +8723,11 @@ sourcemap-codec@^1.4.1:
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz#c8fd92d91889e902a07aee392bdd2c5863958ba2"
   integrity sha512-hX1eNBNuilj8yfFnECh0DzLgwKpBLMIvmhgEhixXNui8lMLBInTI8Kyxt++RwJnMNu7cAUo635L2+N1TxMJCzA==
 
+sourcemap-codec@^1.4.4:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f"
+  integrity sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg==
+
 spdx-compare@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/spdx-compare/-/spdx-compare-1.0.0.tgz#2c55f117362078d7409e6d7b08ce70a857cd3ed7"

From 92913e46b1d47f52bb84091a83fa501a5650e467 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 11 Apr 2019 14:29:33 +0100
Subject: [PATCH 1119/1703] fix(@angular/cli): add missing
 experimentalImportFactories to schema

---
 packages/angular/cli/lib/config/schema.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index cd0b2b193e6c..230b2faac391 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -886,6 +886,11 @@
             "webWorkerTsConfig": {
               "type": "string",
               "description": "TypeScript configuration for Web Worker modules."
+            },
+            "experimentalImportFactories": {
+              "description": "**EXPERIMENTAL** Transform import statements for lazy routes to import factories when using View Engine. Should only be used when switching back and forth between View Engine and Ivy. See https://angular.io/guide/ivy for usage information.",
+              "type": "boolean",
+              "default": false
             }
           },
           "additionalProperties": false,

From 8432650efdee7b7847b51d9037b62bcb7ee91950 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 12 Apr 2019 12:39:31 +0200
Subject: [PATCH 1120/1703] test: fix flaky profile flag test large

This change addresses the flaky profile flag test large that sometimes caused `RangeError Maximum call stack size exceeded` inside regex
---
 .../build_angular/test/browser/stats-json_spec_large.ts       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/stats-json_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/stats-json_spec_large.ts
index 9ba2e899469e..5da908348cd2 100644
--- a/packages/angular_devkit/build_angular/test/browser/stats-json_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/stats-json_spec_large.ts
@@ -27,7 +27,7 @@ describe('Browser Builder stats json', () => {
   it('works with profile flag', async () => {
     const { files } = await browserBuild(architect, host, target, { statsJson: true });
     expect('stats.json' in files).toBe(true);
-    const stats = await files['stats.json'];
-    expect(stats).toMatch(/profile.+building/);
+    const stats = JSON.parse(await files['stats.json']);
+    expect(stats.chunks[0].modules[0].profile.building).toBeDefined();
   });
 });

From 3d9447975dfeab2ff35b49b052fefd77e036f6e3 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 12 Apr 2019 08:55:00 +0200
Subject: [PATCH 1121/1703] docs: update new issue form link

---
 CONTRIBUTING.md                    | 2 +-
 scripts/templates/contributing.ejs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index eb9d2a2d7c66..43f412193d60 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -71,7 +71,7 @@ We will be insisting on a minimal reproduce scenario in order to save maintainer
 
 Unfortunately we are not able to investigate / fix bugs without a minimal reproduction, so if we don't hear back from you we are going to close an issue that don't have enough info to be reproduced.
 
-You can file new issues by filling out our [new issue form](https://github.com/angular/angular-cli/issues/new).
+You can file new issues by selecting from our [new issue templates](https://github.com/angular/angular-cli/issues/new/choose) and filling out the issue template.
 
 
 ### <a name="submit-pr"></a> Submitting a Pull Request (PR)
diff --git a/scripts/templates/contributing.ejs b/scripts/templates/contributing.ejs
index 20c858939e20..2b8b9f709377 100644
--- a/scripts/templates/contributing.ejs
+++ b/scripts/templates/contributing.ejs
@@ -71,7 +71,7 @@ We will be insisting on a minimal reproduce scenario in order to save maintainer
 
 Unfortunately we are not able to investigate / fix bugs without a minimal reproduction, so if we don't hear back from you we are going to close an issue that don't have enough info to be reproduced.
 
-You can file new issues by filling out our [new issue form](https://github.com/angular/angular-cli/issues/new).
+You can file new issues by selecting from our [new issue templates](https://github.com/angular/angular-cli/issues/new/choose) and filling out the issue template.
 
 
 ### <a name="submit-pr"></a> Submitting a Pull Request (PR)

From 0a59307c1985c14142030d003e9efa74c424525c Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 12 Apr 2019 18:14:48 -0400
Subject: [PATCH 1122/1703] fix(@angular-devkit/architect): fix incorrect
 relative core import

---
 .../angular_devkit/architect/src/schedule-by-name.ts  | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/angular_devkit/architect/src/schedule-by-name.ts b/packages/angular_devkit/architect/src/schedule-by-name.ts
index f4dbc8189fc0..ca1c584c54a7 100644
--- a/packages/angular_devkit/architect/src/schedule-by-name.ts
+++ b/packages/angular_devkit/architect/src/schedule-by-name.ts
@@ -5,10 +5,9 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { experimental, json, logging } from '@angular-devkit/core';
+import { analytics, experimental, json, logging } from '@angular-devkit/core';
 import { EMPTY, Subscription } from 'rxjs';
 import { catchError, first, ignoreElements, map, share, shareReplay, tap } from 'rxjs/operators';
-import { Analytics, AnalyticsReport, AnalyticsReporter } from '../../core/src/analytics';
 import {
   BuilderInfo,
   BuilderInput,
@@ -32,7 +31,7 @@ export async function scheduleByName(
     logger: logging.LoggerApi,
     workspaceRoot: string | Promise<string>,
     currentDirectory: string | Promise<string>,
-    analytics?: Analytics,
+    analytics?: analytics.Analytics,
   },
 ): Promise<BuilderRun> {
   const childLoggerName = options.target ? `{${targetStringFromTarget(options.target)}}` : name;
@@ -92,8 +91,8 @@ export async function scheduleByName(
 
   // If there's an analytics object, take the job channel and report it to the analytics.
   if (options.analytics) {
-    const reporter = new AnalyticsReporter(options.analytics);
-    job.getChannel<AnalyticsReport>('analytics')
+    const reporter = new analytics.AnalyticsReporter(options.analytics);
+    job.getChannel<analytics.AnalyticsReport>('analytics')
       .subscribe(report => reporter.report(report));
   }
   // Start the builder.
@@ -129,7 +128,7 @@ export async function scheduleByTarget(
     logger: logging.LoggerApi,
     workspaceRoot: string | Promise<string>,
     currentDirectory: string | Promise<string>,
-    analytics?: Analytics,
+    analytics?: analytics.Analytics,
   },
 ): Promise<BuilderRun> {
   return scheduleByName(`{${targetStringFromTarget(target)}}`, overrides, {

From b6b00ebc98a47b10b35f1ee57c6a3a953f413088 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Fri, 12 Apr 2019 11:18:51 +0100
Subject: [PATCH 1123/1703] build: update typescript to version 3.4.3

---
 package.json                                  |    2 +-
 .../angular/cli/models/schematic-command.ts   |    2 +-
 .../angular_devkit/build_angular/package.json |    2 +-
 .../build_optimizer/package.json              |    2 +-
 packages/ngtools/webpack/package.json         |    4 +-
 .../Microsoft/TypeScript/lib/typescript.d.ts  |  180 +-
 .../Microsoft/TypeScript/lib/typescript.js    | 8084 +++++++++++------
 .../blank/project-files/package.json.template |    2 +-
 .../schematics/schematic/files/package.json   |    2 +-
 yarn.lock                                     |    5 +
 10 files changed, 5406 insertions(+), 2879 deletions(-)

diff --git a/package.json b/package.json
index ee3d2e61ca5b..727c6054b311 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
     "quicktype-core": "^6.0.15",
     "temp": "^0.9.0",
     "tslint": "^5.13.1",
-    "typescript": "3.3.4000"
+    "typescript": "3.4.3"
   },
   "devDependencies": {
     "@angular/compiler": "^8.0.0-beta.11",
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index 90b133dc6dba..94aa069423d9 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -492,7 +492,7 @@ export abstract class SchematicCommand<
     }
 
     const pathOptions = o ? this.setPathOptions(o, workingDir) : {};
-    let input = Object.assign(pathOptions, args);
+    let input = { ...pathOptions, ...args };
 
     // Read the default values from the workspace.
     const projectName = input.project !== undefined ? '' + input.project : null;
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 5ebd46a68865..da04648ec3ca 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -87,6 +87,6 @@
     "zone.js": "^0.9.0"
   },
   "peerDependencies": {
-    "typescript": ">=2.7 < 3.4"
+    "typescript": ">=2.7 < 3.5"
   }
 }
diff --git a/packages/angular_devkit/build_optimizer/package.json b/packages/angular_devkit/build_optimizer/package.json
index 3b7abb4a37bf..131ed5ec97a6 100644
--- a/packages/angular_devkit/build_optimizer/package.json
+++ b/packages/angular_devkit/build_optimizer/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "loader-utils": "1.2.3",
     "source-map": "0.5.6",
-    "typescript": "3.3.4000",
+    "typescript": "3.4.3",
     "webpack-sources": "1.3.0"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 1c3161d396df..1af7a691b3d0 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -29,13 +29,13 @@
   },
   "peerDependencies": {
     "@angular/compiler-cli": ">=6.0.0 <9.0.0 || ^8.0.0-beta.0",
-    "typescript": ">=2.7 < 3.4",
+    "typescript": ">=2.7 < 3.5",
     "webpack": "^4.0.0"
   },
   "devDependencies": {
     "@angular/compiler": "^8.0.0-beta.11",
     "@angular/compiler-cli": "^8.0.0-beta.11",
-    "typescript": "3.3.4000",
+    "typescript": "3.4.3",
     "webpack": "4.29.6"
   }
 }
diff --git a/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts b/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts
index 83e72bf28000..314ccf298cf2 100644
--- a/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts
+++ b/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts
@@ -14,7 +14,7 @@ and limitations under the License.
 ***************************************************************************** */
 
 declare namespace ts {
-    const versionMajorMinor = "3.3";
+    const versionMajorMinor = "3.4";
     /** The version of the TypeScript compiler release */
     const version: string;
 }
@@ -355,40 +355,45 @@ declare namespace ts {
         ShorthandPropertyAssignment = 276,
         SpreadAssignment = 277,
         EnumMember = 278,
-        SourceFile = 279,
-        Bundle = 280,
-        UnparsedSource = 281,
-        InputFiles = 282,
-        JSDocTypeExpression = 283,
-        JSDocAllType = 284,
-        JSDocUnknownType = 285,
-        JSDocNullableType = 286,
-        JSDocNonNullableType = 287,
-        JSDocOptionalType = 288,
-        JSDocFunctionType = 289,
-        JSDocVariadicType = 290,
-        JSDocComment = 291,
-        JSDocTypeLiteral = 292,
-        JSDocSignature = 293,
-        JSDocTag = 294,
-        JSDocAugmentsTag = 295,
-        JSDocClassTag = 296,
-        JSDocCallbackTag = 297,
-        JSDocEnumTag = 298,
-        JSDocParameterTag = 299,
-        JSDocReturnTag = 300,
-        JSDocThisTag = 301,
-        JSDocTypeTag = 302,
-        JSDocTemplateTag = 303,
-        JSDocTypedefTag = 304,
-        JSDocPropertyTag = 305,
-        SyntaxList = 306,
-        NotEmittedStatement = 307,
-        PartiallyEmittedExpression = 308,
-        CommaListExpression = 309,
-        MergeDeclarationMarker = 310,
-        EndOfDeclarationMarker = 311,
-        Count = 312,
+        UnparsedPrologue = 279,
+        UnparsedPrepend = 280,
+        UnparsedText = 281,
+        UnparsedInternalText = 282,
+        UnparsedSyntheticReference = 283,
+        SourceFile = 284,
+        Bundle = 285,
+        UnparsedSource = 286,
+        InputFiles = 287,
+        JSDocTypeExpression = 288,
+        JSDocAllType = 289,
+        JSDocUnknownType = 290,
+        JSDocNullableType = 291,
+        JSDocNonNullableType = 292,
+        JSDocOptionalType = 293,
+        JSDocFunctionType = 294,
+        JSDocVariadicType = 295,
+        JSDocComment = 296,
+        JSDocTypeLiteral = 297,
+        JSDocSignature = 298,
+        JSDocTag = 299,
+        JSDocAugmentsTag = 300,
+        JSDocClassTag = 301,
+        JSDocCallbackTag = 302,
+        JSDocEnumTag = 303,
+        JSDocParameterTag = 304,
+        JSDocReturnTag = 305,
+        JSDocThisTag = 306,
+        JSDocTypeTag = 307,
+        JSDocTemplateTag = 308,
+        JSDocTypedefTag = 309,
+        JSDocPropertyTag = 310,
+        SyntaxList = 311,
+        NotEmittedStatement = 312,
+        PartiallyEmittedExpression = 313,
+        CommaListExpression = 314,
+        MergeDeclarationMarker = 315,
+        EndOfDeclarationMarker = 316,
+        Count = 317,
         FirstAssignment = 59,
         LastAssignment = 71,
         FirstCompoundAssignment = 60,
@@ -414,10 +419,10 @@ declare namespace ts {
         FirstBinaryOperator = 28,
         LastBinaryOperator = 71,
         FirstNode = 148,
-        FirstJSDocNode = 283,
-        LastJSDocNode = 305,
-        FirstJSDocTagNode = 294,
-        LastJSDocTagNode = 305
+        FirstJSDocNode = 288,
+        LastJSDocNode = 310,
+        FirstJSDocTagNode = 299,
+        LastJSDocTagNode = 310,
     }
     enum NodeFlags {
         None = 0,
@@ -446,7 +451,7 @@ declare namespace ts {
         ReachabilityCheckFlags = 384,
         ReachabilityAndEmitFlags = 1408,
         ContextFlags = 12679168,
-        TypeExcludesFlags = 20480
+        TypeExcludesFlags = 20480,
     }
     enum ModifierFlags {
         None = 0,
@@ -814,7 +819,7 @@ declare namespace ts {
     }
     interface TypeOperatorNode extends TypeNode {
         kind: SyntaxKind.TypeOperator;
-        operator: SyntaxKind.KeyOfKeyword | SyntaxKind.UniqueKeyword;
+        operator: SyntaxKind.KeyOfKeyword | SyntaxKind.UniqueKeyword | SyntaxKind.ReadonlyKeyword;
         type: TypeNode;
     }
     interface IndexedAccessTypeNode extends TypeNode {
@@ -997,6 +1002,14 @@ declare namespace ts {
     interface NoSubstitutionTemplateLiteral extends LiteralExpression {
         kind: SyntaxKind.NoSubstitutionTemplateLiteral;
     }
+    enum TokenFlags {
+        None = 0,
+        Scientific = 16,
+        Octal = 32,
+        HexSpecifier = 64,
+        BinarySpecifier = 128,
+        OctalSpecifier = 256,
+    }
     interface NumericLiteral extends LiteralExpression {
         kind: SyntaxKind.NumericLiteral;
     }
@@ -1190,9 +1203,9 @@ declare namespace ts {
         dotDotDotToken?: Token<SyntaxKind.DotDotDotToken>;
         expression?: Expression;
     }
-    interface JsxText extends Node {
+    interface JsxText extends LiteralLikeNode {
         kind: SyntaxKind.JsxText;
-        containsOnlyWhiteSpaces: boolean;
+        containsOnlyTriviaWhiteSpaces: boolean;
         parent: JsxElement;
     }
     type JsxChild = JsxText | JsxExpression | JsxElement | JsxSelfClosingElement | JsxFragment;
@@ -1737,10 +1750,44 @@ declare namespace ts {
     }
     interface UnparsedSource extends Node {
         kind: SyntaxKind.UnparsedSource;
-        fileName?: string;
+        fileName: string;
         text: string;
+        prologues: ReadonlyArray<UnparsedPrologue>;
+        helpers: ReadonlyArray<UnscopedEmitHelper> | undefined;
+        referencedFiles: ReadonlyArray<FileReference>;
+        typeReferenceDirectives: ReadonlyArray<string> | undefined;
+        libReferenceDirectives: ReadonlyArray<FileReference>;
+        hasNoDefaultLib?: boolean;
         sourceMapPath?: string;
         sourceMapText?: string;
+        syntheticReferences?: ReadonlyArray<UnparsedSyntheticReference>;
+        texts: ReadonlyArray<UnparsedSourceText>;
+    }
+    type UnparsedSourceText = UnparsedPrepend | UnparsedTextLike;
+    type UnparsedNode = UnparsedPrologue | UnparsedSourceText | UnparsedSyntheticReference;
+    interface UnparsedSection extends Node {
+        kind: SyntaxKind;
+        data?: string;
+        parent: UnparsedSource;
+    }
+    interface UnparsedPrologue extends UnparsedSection {
+        kind: SyntaxKind.UnparsedPrologue;
+        data: string;
+        parent: UnparsedSource;
+    }
+    interface UnparsedPrepend extends UnparsedSection {
+        kind: SyntaxKind.UnparsedPrepend;
+        data: string;
+        parent: UnparsedSource;
+        texts: ReadonlyArray<UnparsedTextLike>;
+    }
+    interface UnparsedTextLike extends UnparsedSection {
+        kind: SyntaxKind.UnparsedText | SyntaxKind.UnparsedInternalText;
+        parent: UnparsedSource;
+    }
+    interface UnparsedSyntheticReference extends UnparsedSection {
+        kind: SyntaxKind.UnparsedSyntheticReference;
+        parent: UnparsedSource;
     }
     interface JsonSourceFile extends SourceFile {
         statements: NodeArray<JsonObjectExpressionStatement>;
@@ -2014,7 +2061,7 @@ declare namespace ts {
         WriteTypeParametersOrArguments = 1,
         UseOnlyExternalAliasing = 2,
         AllowAnyNodeKind = 4,
-        UseAliasDefinedOutsideCurrentScope = 8
+        UseAliasDefinedOutsideCurrentScope = 8,
     }
     enum TypePredicateKind {
         This = 0,
@@ -2092,7 +2139,7 @@ declare namespace ts {
         ExportHasLocal = 944,
         BlockScoped = 418,
         PropertyOrAccessor = 98308,
-        ClassMember = 106500
+        ClassMember = 106500,
     }
     interface Symbol {
         flags: SymbolFlags;
@@ -2200,7 +2247,7 @@ declare namespace ts {
         Instantiable = 63176704,
         StructuredOrInstantiable = 66846720,
         Narrowable = 133970943,
-        NotUnionOrUnit = 67637251
+        NotUnionOrUnit = 67637251,
     }
     type DestructuringPattern = BindingPattern | ObjectLiteralExpression | ArrayLiteralExpression;
     interface Type {
@@ -2247,7 +2294,7 @@ declare namespace ts {
         MarkerType = 8192,
         JSLiteral = 16384,
         FreshLiteral = 32768,
-        ClassOrInterface = 3
+        ClassOrInterface = 3,
     }
     interface ObjectType extends Type {
         objectFlags: ObjectFlags;
@@ -2286,6 +2333,7 @@ declare namespace ts {
     interface TupleType extends GenericType {
         minLength: number;
         hasRestElement: boolean;
+        readonly: boolean;
         associatedNames?: __String[];
     }
     interface TupleTypeReference extends TypeReference {
@@ -2334,8 +2382,8 @@ declare namespace ts {
         root: ConditionalRoot;
         checkType: Type;
         extendsType: Type;
-        resolvedTrueType?: Type;
-        resolvedFalseType?: Type;
+        trueType: Type;
+        falseType: Type;
     }
     interface SubstitutionType extends InstantiableType {
         typeVariable: TypeVariable;
@@ -2494,6 +2542,8 @@ declare namespace ts {
         reactNamespace?: string;
         jsxFactory?: string;
         composite?: boolean;
+        incremental?: boolean;
+        tsBuildInfoFile?: string;
         removeComments?: boolean;
         rootDir?: string;
         rootDirs?: string[];
@@ -2570,9 +2620,10 @@ declare namespace ts {
         ES2016 = 3,
         ES2017 = 4,
         ES2018 = 5,
-        ESNext = 6,
+        ES2019 = 6,
+        ESNext = 7,
         JSON = 100,
-        Latest = 6
+        Latest = 7
     }
     enum LanguageVariant {
         Standard = 0,
@@ -2669,7 +2720,8 @@ declare namespace ts {
         Dts = ".d.ts",
         Js = ".js",
         Jsx = ".jsx",
-        Json = ".json"
+        Json = ".json",
+        TsBuildInfo = ".tsbuildinfo"
     }
     interface ResolvedModuleWithFailedLookupLocations {
         readonly resolvedModule: ResolvedModuleFull | undefined;
@@ -2742,7 +2794,7 @@ declare namespace ts {
         NoHoisting = 2097152,
         HasEndOfDeclarationMarker = 4194304,
         Iterator = 8388608,
-        NoAsciiEscaping = 16777216
+        NoAsciiEscaping = 16777216,
     }
     interface EmitHelper {
         readonly name: string;
@@ -2750,6 +2802,10 @@ declare namespace ts {
         readonly text: string | ((node: EmitHelperUniqueNameCallback) => string);
         readonly priority?: number;
     }
+    interface UnscopedEmitHelper extends EmitHelper {
+        readonly scoped: false;
+        readonly text: string;
+    }
     type EmitHelperUniqueNameCallback = (name: string) => string;
     enum EmitHint {
         SourceFile = 0,
@@ -3359,6 +3415,7 @@ declare namespace ts {
     function isNewExpression(node: Node): node is NewExpression;
     function isTaggedTemplateExpression(node: Node): node is TaggedTemplateExpression;
     function isTypeAssertion(node: Node): node is TypeAssertion;
+    function isConstTypeReference(node: Node): boolean;
     function isParenthesizedExpression(node: Node): node is ParenthesizedExpression;
     function skipPartiallyEmittedExpressions(node: Expression): Expression;
     function skipPartiallyEmittedExpressions(node: Node): Node;
@@ -3448,6 +3505,9 @@ declare namespace ts {
     function isSourceFile(node: Node): node is SourceFile;
     function isBundle(node: Node): node is Bundle;
     function isUnparsedSource(node: Node): node is UnparsedSource;
+    function isUnparsedPrepend(node: Node): node is UnparsedPrepend;
+    function isUnparsedTextLike(node: Node): node is UnparsedTextLike;
+    function isUnparsedNode(node: Node): node is UnparsedNode;
     function isJSDocTypeExpression(node: Node): node is JSDocTypeExpression;
     function isJSDocAllType(node: JSDocAllType): node is JSDocAllType;
     function isJSDocUnknownType(node: Node): node is JSDocUnknownType;
@@ -3667,7 +3727,7 @@ declare namespace ts {
     function createLiteral(value: number | PseudoBigInt): NumericLiteral;
     function createLiteral(value: boolean): BooleanLiteral;
     function createLiteral(value: string | number | PseudoBigInt | boolean): PrimaryExpression;
-    function createNumericLiteral(value: string): NumericLiteral;
+    function createNumericLiteral(value: string, numericLiteralFlags?: TokenFlags): NumericLiteral;
     function createBigIntLiteral(value: string): BigIntLiteral;
     function createStringLiteral(text: string): StringLiteral;
     function createRegularExpressionLiteral(text: string): RegularExpressionLiteral;
@@ -3759,7 +3819,7 @@ declare namespace ts {
     function updateParenthesizedType(node: ParenthesizedTypeNode, type: TypeNode): ParenthesizedTypeNode;
     function createThisTypeNode(): ThisTypeNode;
     function createTypeOperatorNode(type: TypeNode): TypeOperatorNode;
-    function createTypeOperatorNode(operator: SyntaxKind.KeyOfKeyword | SyntaxKind.UniqueKeyword, type: TypeNode): TypeOperatorNode;
+    function createTypeOperatorNode(operator: SyntaxKind.KeyOfKeyword | SyntaxKind.UniqueKeyword | SyntaxKind.ReadonlyKeyword, type: TypeNode): TypeOperatorNode;
     function updateTypeOperatorNode(node: TypeOperatorNode, type: TypeNode): TypeOperatorNode;
     function createIndexedAccessTypeNode(objectType: TypeNode, indexType: TypeNode): IndexedAccessTypeNode;
     function updateIndexedAccessTypeNode(node: IndexedAccessTypeNode, objectType: TypeNode, indexType: TypeNode): IndexedAccessTypeNode;
@@ -3932,6 +3992,10 @@ declare namespace ts {
     function createJsxClosingElement(tagName: JsxTagNameExpression): JsxClosingElement;
     function updateJsxClosingElement(node: JsxClosingElement, tagName: JsxTagNameExpression): JsxClosingElement;
     function createJsxFragment(openingFragment: JsxOpeningFragment, children: ReadonlyArray<JsxChild>, closingFragment: JsxClosingFragment): JsxFragment;
+    function createJsxText(text: string, containsOnlyTriviaWhiteSpaces?: boolean): JsxText;
+    function updateJsxText(node: JsxText, text: string, containsOnlyTriviaWhiteSpaces?: boolean): JsxText;
+    function createJsxOpeningFragment(): JsxOpeningFragment;
+    function createJsxJsxClosingFragment(): JsxClosingFragment;
     function updateJsxFragment(node: JsxFragment, openingFragment: JsxOpeningFragment, children: ReadonlyArray<JsxChild>, closingFragment: JsxClosingFragment): JsxFragment;
     function createJsxAttribute(name: Identifier, initializer: StringLiteral | JsxExpression): JsxAttribute;
     function updateJsxAttribute(node: JsxAttribute, name: Identifier, initializer: StringLiteral | JsxExpression): JsxAttribute;
@@ -3983,10 +4047,10 @@ declare namespace ts {
     function updateCommaList(node: CommaListExpression, elements: ReadonlyArray<Expression>): CommaListExpression;
     function createBundle(sourceFiles: ReadonlyArray<SourceFile>, prepends?: ReadonlyArray<UnparsedSource | InputFiles>): Bundle;
     function createUnparsedSourceFile(text: string): UnparsedSource;
-    function createUnparsedSourceFile(inputFile: InputFiles, type: "js" | "dts"): UnparsedSource;
+    function createUnparsedSourceFile(inputFile: InputFiles, type: "js" | "dts", stripInternal?: boolean): UnparsedSource;
     function createUnparsedSourceFile(text: string, mapPath: string | undefined, map: string | undefined): UnparsedSource;
     function createInputFiles(javascriptText: string, declarationText: string): InputFiles;
-    function createInputFiles(readFileText: (path: string) => string | undefined, javascriptPath: string, javascriptMapPath: string | undefined, declarationPath: string, declarationMapPath: string | undefined): InputFiles;
+    function createInputFiles(readFileText: (path: string) => string | undefined, javascriptPath: string, javascriptMapPath: string | undefined, declarationPath: string, declarationMapPath: string | undefined, buildInfoPath: string | undefined): InputFiles;
     function createInputFiles(javascriptText: string, declarationText: string, javascriptMapPath: string | undefined, javascriptMapText: string | undefined, declarationMapPath: string | undefined, declarationMapText: string | undefined): InputFiles;
     function updateBundle(node: Bundle, sourceFiles: ReadonlyArray<SourceFile>, prepends?: ReadonlyArray<UnparsedSource>): Bundle;
     function createImmediatelyInvokedFunctionExpression(statements: ReadonlyArray<Statement>): CallExpression;
diff --git a/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js b/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js
index d2e2e7ecb403..da4767072f7c 100644
--- a/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js
+++ b/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js
@@ -73,9 +73,9 @@ var ts;
 (function (ts) {
     // WARNING: The script `configureNightly.ts` uses a regexp to parse out these values.
     // If changing the text in this section, be sure to test `configureNightly` too.
-    ts.versionMajorMinor = "3.3";
+    ts.versionMajorMinor = "3.4";
     /** The version of the TypeScript compiler release */
-    ts.version = ts.versionMajorMinor + ".3333";
+    ts.version = ts.versionMajorMinor + ".3";
 })(ts || (ts = {}));
 (function (ts) {
     /* @internal */
@@ -131,19 +131,25 @@ var ts;
     // Keep the class inside a function so it doesn't get compiled if it's not used.
     function shimMap() {
         var MapIterator = /** @class */ (function () {
-            function MapIterator(data, selector) {
-                this.index = 0;
-                this.data = data;
+            function MapIterator(currentEntry, selector) {
+                this.currentEntry = currentEntry;
                 this.selector = selector;
-                this.keys = Object.keys(data);
             }
             MapIterator.prototype.next = function () {
-                var index = this.index;
-                if (index < this.keys.length) {
-                    this.index++;
-                    return { value: this.selector(this.data, this.keys[index]), done: false };
+                // Navigate to the next entry.
+                while (this.currentEntry) {
+                    var skipNext = !!this.currentEntry.skipNext;
+                    this.currentEntry = this.currentEntry.nextEntry;
+                    if (!skipNext) {
+                        break;
+                    }
+                }
+                if (this.currentEntry) {
+                    return { value: this.selector(this.currentEntry.key, this.currentEntry.value), done: false };
+                }
+                else {
+                    return { value: undefined, done: true };
                 }
-                return { value: undefined, done: true };
             };
             return MapIterator;
         }());
@@ -151,15 +157,36 @@ var ts;
             function class_1() {
                 this.data = createDictionaryObject();
                 this.size = 0;
+                // Create a first (stub) map entry that will not contain a key
+                // and value but serves as starting point for iterators.
+                this.firstEntry = {};
+                // When the map is empty, the last entry is the same as the
+                // first one.
+                this.lastEntry = this.firstEntry;
             }
             class_1.prototype.get = function (key) {
-                return this.data[key];
+                var entry = this.data[key];
+                return entry && entry.value;
             };
             class_1.prototype.set = function (key, value) {
                 if (!this.has(key)) {
                     this.size++;
+                    // Create a new entry that will be appended at the
+                    // end of the linked list.
+                    var newEntry = {
+                        key: key,
+                        value: value
+                    };
+                    this.data[key] = newEntry;
+                    // Adjust the references.
+                    var previousLastEntry = this.lastEntry;
+                    previousLastEntry.nextEntry = newEntry;
+                    newEntry.previousEntry = previousLastEntry;
+                    this.lastEntry = newEntry;
+                }
+                else {
+                    this.data[key].value = value;
                 }
-                this.data[key] = value;
                 return this;
             };
             class_1.prototype.has = function (key) {
@@ -169,7 +196,28 @@ var ts;
             class_1.prototype.delete = function (key) {
                 if (this.has(key)) {
                     this.size--;
+                    var entry = this.data[key];
                     delete this.data[key];
+                    // Adjust the linked list references of the neighbor entries.
+                    var previousEntry = entry.previousEntry;
+                    previousEntry.nextEntry = entry.nextEntry;
+                    if (entry.nextEntry) {
+                        entry.nextEntry.previousEntry = previousEntry;
+                    }
+                    // When the deleted entry was the last one, we need to
+                    // adust the lastEntry reference.
+                    if (this.lastEntry === entry) {
+                        this.lastEntry = previousEntry;
+                    }
+                    // Adjust the forward reference of the deleted entry
+                    // in case an iterator still references it. This allows us
+                    // to throw away the entry, but when an active iterator
+                    // (which points to the current entry) continues, it will
+                    // navigate to the entry that originally came before the
+                    // current one and skip it.
+                    entry.previousEntry = undefined;
+                    entry.nextEntry = previousEntry;
+                    entry.skipNext = true;
                     return true;
                 }
                 return false;
@@ -177,24 +225,46 @@ var ts;
             class_1.prototype.clear = function () {
                 this.data = createDictionaryObject();
                 this.size = 0;
+                // Reset the linked list. Note that we must adjust the forward
+                // references of the deleted entries to ensure iterators stuck
+                // in the middle of the list don't continue with deleted entries,
+                // but can continue with new entries added after the clear()
+                // operation.
+                var firstEntry = this.firstEntry;
+                var currentEntry = firstEntry.nextEntry;
+                while (currentEntry) {
+                    var nextEntry = currentEntry.nextEntry;
+                    currentEntry.previousEntry = undefined;
+                    currentEntry.nextEntry = firstEntry;
+                    currentEntry.skipNext = true;
+                    currentEntry = nextEntry;
+                }
+                firstEntry.nextEntry = undefined;
+                this.lastEntry = firstEntry;
             };
             class_1.prototype.keys = function () {
-                return new MapIterator(this.data, function (_data, key) { return key; });
+                return new MapIterator(this.firstEntry, function (key) { return key; });
             };
             class_1.prototype.values = function () {
-                return new MapIterator(this.data, function (data, key) { return data[key]; });
+                return new MapIterator(this.firstEntry, function (_key, value) { return value; });
             };
             class_1.prototype.entries = function () {
-                return new MapIterator(this.data, function (data, key) { return [key, data[key]]; });
+                return new MapIterator(this.firstEntry, function (key, value) { return [key, value]; });
             };
             class_1.prototype.forEach = function (action) {
-                for (var key in this.data) {
-                    action(this.data[key], key);
+                var iterator = this.entries();
+                while (true) {
+                    var _a = iterator.next(), entry = _a.value, done = _a.done;
+                    if (done) {
+                        break;
+                    }
+                    action(entry[1], entry[0]);
                 }
             };
             return class_1;
         }());
     }
+    ts.shimMap = shimMap;
     function length(array) {
         return array ? array.length : 0;
     }
@@ -742,7 +812,7 @@ var ts;
     }
     /**
      * Deduplicates an unsorted array.
-     * @param equalityComparer An optional `EqualityComparer` used to determine if two values are duplicates.
+     * @param equalityComparer An `EqualityComparer` used to determine if two values are duplicates.
      * @param comparer An optional `Comparer` used to sort entries before comparison, though the
      * result will remain in the original order in `array`.
      */
@@ -958,6 +1028,21 @@ var ts;
             } };
     }
     ts.arrayIterator = arrayIterator;
+    function arrayReverseIterator(array) {
+        var i = array.length;
+        return {
+            next: function () {
+                if (i === 0) {
+                    return { value: undefined, done: true };
+                }
+                else {
+                    i--;
+                    return { value: array[i], done: false };
+                }
+            }
+        };
+    }
+    ts.arrayReverseIterator = arrayReverseIterator;
     /**
      * Stable sort of an array. Elements equal to each other maintain their relative position in the array.
      */
@@ -1168,9 +1253,11 @@ var ts;
         }
         for (var _a = 0, args_1 = args; _a < args_1.length; _a++) {
             var arg = args_1[_a];
+            if (arg === undefined)
+                continue;
             for (var p in arg) {
                 if (hasProperty(arg, p)) {
-                    t[p] = arg[p]; // TODO: GH#23368
+                    t[p] = arg[p];
                 }
             }
         }
@@ -1346,6 +1433,9 @@ var ts;
     /** Do nothing and return true */
     function returnTrue() { return true; }
     ts.returnTrue = returnTrue;
+    /** Do nothing and return undefined */
+    function returnUndefined() { return undefined; }
+    ts.returnUndefined = returnUndefined;
     /** Returns its argument. */
     function identity(x) { return x; }
     ts.identity = identity;
@@ -1492,7 +1582,7 @@ var ts;
         Debug.assertEachDefined = assertEachDefined;
         function assertNever(member, message, stackCrawlMark) {
             if (message === void 0) { message = "Illegal value:"; }
-            var detail = "kind" in member && "pos" in member ? "SyntaxKind: " + Debug.showSyntaxKind(member) : JSON.stringify(member);
+            var detail = typeof member === "object" && "kind" in member && "pos" in member ? "SyntaxKind: " + Debug.showSyntaxKind(member) : JSON.stringify(member);
             return fail(message + " " + detail, stackCrawlMark || assertNever);
         }
         Debug.assertNever = assertNever;
@@ -2795,47 +2885,53 @@ var ts;
         SyntaxKind[SyntaxKind["SpreadAssignment"] = 277] = "SpreadAssignment";
         // Enum
         SyntaxKind[SyntaxKind["EnumMember"] = 278] = "EnumMember";
+        // Unparsed
+        SyntaxKind[SyntaxKind["UnparsedPrologue"] = 279] = "UnparsedPrologue";
+        SyntaxKind[SyntaxKind["UnparsedPrepend"] = 280] = "UnparsedPrepend";
+        SyntaxKind[SyntaxKind["UnparsedText"] = 281] = "UnparsedText";
+        SyntaxKind[SyntaxKind["UnparsedInternalText"] = 282] = "UnparsedInternalText";
+        SyntaxKind[SyntaxKind["UnparsedSyntheticReference"] = 283] = "UnparsedSyntheticReference";
         // Top-level nodes
-        SyntaxKind[SyntaxKind["SourceFile"] = 279] = "SourceFile";
-        SyntaxKind[SyntaxKind["Bundle"] = 280] = "Bundle";
-        SyntaxKind[SyntaxKind["UnparsedSource"] = 281] = "UnparsedSource";
-        SyntaxKind[SyntaxKind["InputFiles"] = 282] = "InputFiles";
+        SyntaxKind[SyntaxKind["SourceFile"] = 284] = "SourceFile";
+        SyntaxKind[SyntaxKind["Bundle"] = 285] = "Bundle";
+        SyntaxKind[SyntaxKind["UnparsedSource"] = 286] = "UnparsedSource";
+        SyntaxKind[SyntaxKind["InputFiles"] = 287] = "InputFiles";
         // JSDoc nodes
-        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 283] = "JSDocTypeExpression";
+        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 288] = "JSDocTypeExpression";
         // The * type
-        SyntaxKind[SyntaxKind["JSDocAllType"] = 284] = "JSDocAllType";
+        SyntaxKind[SyntaxKind["JSDocAllType"] = 289] = "JSDocAllType";
         // The ? type
-        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 285] = "JSDocUnknownType";
-        SyntaxKind[SyntaxKind["JSDocNullableType"] = 286] = "JSDocNullableType";
-        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 287] = "JSDocNonNullableType";
-        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 288] = "JSDocOptionalType";
-        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 289] = "JSDocFunctionType";
-        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 290] = "JSDocVariadicType";
-        SyntaxKind[SyntaxKind["JSDocComment"] = 291] = "JSDocComment";
-        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 292] = "JSDocTypeLiteral";
-        SyntaxKind[SyntaxKind["JSDocSignature"] = 293] = "JSDocSignature";
-        SyntaxKind[SyntaxKind["JSDocTag"] = 294] = "JSDocTag";
-        SyntaxKind[SyntaxKind["JSDocAugmentsTag"] = 295] = "JSDocAugmentsTag";
-        SyntaxKind[SyntaxKind["JSDocClassTag"] = 296] = "JSDocClassTag";
-        SyntaxKind[SyntaxKind["JSDocCallbackTag"] = 297] = "JSDocCallbackTag";
-        SyntaxKind[SyntaxKind["JSDocEnumTag"] = 298] = "JSDocEnumTag";
-        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 299] = "JSDocParameterTag";
-        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 300] = "JSDocReturnTag";
-        SyntaxKind[SyntaxKind["JSDocThisTag"] = 301] = "JSDocThisTag";
-        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 302] = "JSDocTypeTag";
-        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 303] = "JSDocTemplateTag";
-        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 304] = "JSDocTypedefTag";
-        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 305] = "JSDocPropertyTag";
+        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 290] = "JSDocUnknownType";
+        SyntaxKind[SyntaxKind["JSDocNullableType"] = 291] = "JSDocNullableType";
+        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 292] = "JSDocNonNullableType";
+        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 293] = "JSDocOptionalType";
+        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 294] = "JSDocFunctionType";
+        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 295] = "JSDocVariadicType";
+        SyntaxKind[SyntaxKind["JSDocComment"] = 296] = "JSDocComment";
+        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 297] = "JSDocTypeLiteral";
+        SyntaxKind[SyntaxKind["JSDocSignature"] = 298] = "JSDocSignature";
+        SyntaxKind[SyntaxKind["JSDocTag"] = 299] = "JSDocTag";
+        SyntaxKind[SyntaxKind["JSDocAugmentsTag"] = 300] = "JSDocAugmentsTag";
+        SyntaxKind[SyntaxKind["JSDocClassTag"] = 301] = "JSDocClassTag";
+        SyntaxKind[SyntaxKind["JSDocCallbackTag"] = 302] = "JSDocCallbackTag";
+        SyntaxKind[SyntaxKind["JSDocEnumTag"] = 303] = "JSDocEnumTag";
+        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 304] = "JSDocParameterTag";
+        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 305] = "JSDocReturnTag";
+        SyntaxKind[SyntaxKind["JSDocThisTag"] = 306] = "JSDocThisTag";
+        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 307] = "JSDocTypeTag";
+        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 308] = "JSDocTemplateTag";
+        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 309] = "JSDocTypedefTag";
+        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 310] = "JSDocPropertyTag";
         // Synthesized list
-        SyntaxKind[SyntaxKind["SyntaxList"] = 306] = "SyntaxList";
+        SyntaxKind[SyntaxKind["SyntaxList"] = 311] = "SyntaxList";
         // Transformation nodes
-        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 307] = "NotEmittedStatement";
-        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 308] = "PartiallyEmittedExpression";
-        SyntaxKind[SyntaxKind["CommaListExpression"] = 309] = "CommaListExpression";
-        SyntaxKind[SyntaxKind["MergeDeclarationMarker"] = 310] = "MergeDeclarationMarker";
-        SyntaxKind[SyntaxKind["EndOfDeclarationMarker"] = 311] = "EndOfDeclarationMarker";
+        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 312] = "NotEmittedStatement";
+        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 313] = "PartiallyEmittedExpression";
+        SyntaxKind[SyntaxKind["CommaListExpression"] = 314] = "CommaListExpression";
+        SyntaxKind[SyntaxKind["MergeDeclarationMarker"] = 315] = "MergeDeclarationMarker";
+        SyntaxKind[SyntaxKind["EndOfDeclarationMarker"] = 316] = "EndOfDeclarationMarker";
         // Enum value count
-        SyntaxKind[SyntaxKind["Count"] = 312] = "Count";
+        SyntaxKind[SyntaxKind["Count"] = 317] = "Count";
         // Markers
         SyntaxKind[SyntaxKind["FirstAssignment"] = 59] = "FirstAssignment";
         SyntaxKind[SyntaxKind["LastAssignment"] = 71] = "LastAssignment";
@@ -2862,10 +2958,10 @@ var ts;
         SyntaxKind[SyntaxKind["FirstBinaryOperator"] = 28] = "FirstBinaryOperator";
         SyntaxKind[SyntaxKind["LastBinaryOperator"] = 71] = "LastBinaryOperator";
         SyntaxKind[SyntaxKind["FirstNode"] = 148] = "FirstNode";
-        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 283] = "FirstJSDocNode";
-        SyntaxKind[SyntaxKind["LastJSDocNode"] = 305] = "LastJSDocNode";
-        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 294] = "FirstJSDocTagNode";
-        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 305] = "LastJSDocTagNode";
+        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 288] = "FirstJSDocNode";
+        SyntaxKind[SyntaxKind["LastJSDocNode"] = 310] = "LastJSDocNode";
+        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 299] = "FirstJSDocTagNode";
+        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 310] = "LastJSDocTagNode";
         /* @internal */ SyntaxKind[SyntaxKind["FirstContextualKeyword"] = 118] = "FirstContextualKeyword";
         /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 147] = "LastContextualKeyword";
     })(SyntaxKind = ts.SyntaxKind || (ts.SyntaxKind = {}));
@@ -2972,21 +3068,27 @@ var ts;
         GeneratedIdentifierFlags[GeneratedIdentifierFlags["Optimistic"] = 16] = "Optimistic";
         GeneratedIdentifierFlags[GeneratedIdentifierFlags["FileLevel"] = 32] = "FileLevel";
     })(GeneratedIdentifierFlags = ts.GeneratedIdentifierFlags || (ts.GeneratedIdentifierFlags = {}));
-    /* @internal */
     var TokenFlags;
     (function (TokenFlags) {
         TokenFlags[TokenFlags["None"] = 0] = "None";
+        /* @internal */
         TokenFlags[TokenFlags["PrecedingLineBreak"] = 1] = "PrecedingLineBreak";
+        /* @internal */
         TokenFlags[TokenFlags["PrecedingJSDocComment"] = 2] = "PrecedingJSDocComment";
+        /* @internal */
         TokenFlags[TokenFlags["Unterminated"] = 4] = "Unterminated";
+        /* @internal */
         TokenFlags[TokenFlags["ExtendedUnicodeEscape"] = 8] = "ExtendedUnicodeEscape";
         TokenFlags[TokenFlags["Scientific"] = 16] = "Scientific";
         TokenFlags[TokenFlags["Octal"] = 32] = "Octal";
         TokenFlags[TokenFlags["HexSpecifier"] = 64] = "HexSpecifier";
         TokenFlags[TokenFlags["BinarySpecifier"] = 128] = "BinarySpecifier";
         TokenFlags[TokenFlags["OctalSpecifier"] = 256] = "OctalSpecifier";
+        /* @internal */
         TokenFlags[TokenFlags["ContainsSeparator"] = 512] = "ContainsSeparator";
+        /* @internal */
         TokenFlags[TokenFlags["BinaryOrOctalSpecifier"] = 384] = "BinaryOrOctalSpecifier";
+        /* @internal */
         TokenFlags[TokenFlags["NumericLiteralFlags"] = 1008] = "NumericLiteralFlags";
     })(TokenFlags = ts.TokenFlags || (ts.TokenFlags = {}));
     var FlowFlags;
@@ -3346,12 +3448,6 @@ var ts;
         TypeFlags[TypeFlags["Substitution"] = 33554432] = "Substitution";
         TypeFlags[TypeFlags["NonPrimitive"] = 67108864] = "NonPrimitive";
         /* @internal */
-        TypeFlags[TypeFlags["ContainsWideningType"] = 134217728] = "ContainsWideningType";
-        /* @internal */
-        TypeFlags[TypeFlags["ContainsObjectLiteral"] = 268435456] = "ContainsObjectLiteral";
-        /* @internal */
-        TypeFlags[TypeFlags["ContainsAnyFunctionType"] = 536870912] = "ContainsAnyFunctionType";
-        /* @internal */
         TypeFlags[TypeFlags["AnyOrUnknown"] = 3] = "AnyOrUnknown";
         /* @internal */
         TypeFlags[TypeFlags["Nullable"] = 98304] = "Nullable";
@@ -3383,28 +3479,29 @@ var ts;
         TypeFlags[TypeFlags["InstantiablePrimitive"] = 4194304] = "InstantiablePrimitive";
         TypeFlags[TypeFlags["Instantiable"] = 63176704] = "Instantiable";
         TypeFlags[TypeFlags["StructuredOrInstantiable"] = 66846720] = "StructuredOrInstantiable";
+        /* @internal */
+        TypeFlags[TypeFlags["ObjectFlagsType"] = 3768320] = "ObjectFlagsType";
         // 'Narrowable' types are types where narrowing actually narrows.
         // This *should* be every type other than null, undefined, void, and never
         TypeFlags[TypeFlags["Narrowable"] = 133970943] = "Narrowable";
         TypeFlags[TypeFlags["NotUnionOrUnit"] = 67637251] = "NotUnionOrUnit";
         /* @internal */
         TypeFlags[TypeFlags["NotPrimitiveUnion"] = 66994211] = "NotPrimitiveUnion";
+        // The following flags are aggregated during union and intersection type construction
         /* @internal */
-        TypeFlags[TypeFlags["RequiresWidening"] = 402653184] = "RequiresWidening";
-        /* @internal */
-        TypeFlags[TypeFlags["PropagatingFlags"] = 939524096] = "PropagatingFlags";
+        TypeFlags[TypeFlags["IncludesMask"] = 1835007] = "IncludesMask";
         // The following flags are used for different purposes during union and intersection type construction
         /* @internal */
-        TypeFlags[TypeFlags["NonWideningType"] = 134217728] = "NonWideningType";
+        TypeFlags[TypeFlags["IncludesStructuredOrInstantiable"] = 262144] = "IncludesStructuredOrInstantiable";
         /* @internal */
-        TypeFlags[TypeFlags["Wildcard"] = 268435456] = "Wildcard";
+        TypeFlags[TypeFlags["IncludesNonWideningType"] = 2097152] = "IncludesNonWideningType";
         /* @internal */
-        TypeFlags[TypeFlags["EmptyObject"] = 536870912] = "EmptyObject";
+        TypeFlags[TypeFlags["IncludesWildcard"] = 4194304] = "IncludesWildcard";
         /* @internal */
-        TypeFlags[TypeFlags["ConstructionFlags"] = 939524096] = "ConstructionFlags";
+        TypeFlags[TypeFlags["IncludesEmptyObject"] = 8388608] = "IncludesEmptyObject";
         // The following flag is used for different purposes by maybeTypeOfKind
         /* @internal */
-        TypeFlags[TypeFlags["GenericMappedType"] = 134217728] = "GenericMappedType";
+        TypeFlags[TypeFlags["GenericMappedType"] = 131072] = "GenericMappedType";
     })(TypeFlags = ts.TypeFlags || (ts.TypeFlags = {}));
     var ObjectFlags;
     (function (ObjectFlags) {
@@ -3424,7 +3521,19 @@ var ts;
         ObjectFlags[ObjectFlags["MarkerType"] = 8192] = "MarkerType";
         ObjectFlags[ObjectFlags["JSLiteral"] = 16384] = "JSLiteral";
         ObjectFlags[ObjectFlags["FreshLiteral"] = 32768] = "FreshLiteral";
+        /* @internal */
+        ObjectFlags[ObjectFlags["PrimitiveUnion"] = 65536] = "PrimitiveUnion";
+        /* @internal */
+        ObjectFlags[ObjectFlags["ContainsWideningType"] = 131072] = "ContainsWideningType";
+        /* @internal */
+        ObjectFlags[ObjectFlags["ContainsObjectLiteral"] = 262144] = "ContainsObjectLiteral";
+        /* @internal */
+        ObjectFlags[ObjectFlags["ContainsAnyFunctionType"] = 524288] = "ContainsAnyFunctionType";
         ObjectFlags[ObjectFlags["ClassOrInterface"] = 3] = "ClassOrInterface";
+        /* @internal */
+        ObjectFlags[ObjectFlags["RequiresWidening"] = 393216] = "RequiresWidening";
+        /* @internal */
+        ObjectFlags[ObjectFlags["PropagatingFlags"] = 917504] = "PropagatingFlags";
     })(ObjectFlags = ts.ObjectFlags || (ts.ObjectFlags = {}));
     /* @internal */
     var Variance;
@@ -3469,6 +3578,7 @@ var ts;
         InferenceFlags[InferenceFlags["None"] = 0] = "None";
         InferenceFlags[InferenceFlags["NoDefault"] = 1] = "NoDefault";
         InferenceFlags[InferenceFlags["AnyDefault"] = 2] = "AnyDefault";
+        InferenceFlags[InferenceFlags["SkippedGenericFunction"] = 4] = "SkippedGenericFunction";
     })(InferenceFlags = ts.InferenceFlags || (ts.InferenceFlags = {}));
     /**
      * Ternary values are defined such that
@@ -3576,9 +3686,10 @@ var ts;
         ScriptTarget[ScriptTarget["ES2016"] = 3] = "ES2016";
         ScriptTarget[ScriptTarget["ES2017"] = 4] = "ES2017";
         ScriptTarget[ScriptTarget["ES2018"] = 5] = "ES2018";
-        ScriptTarget[ScriptTarget["ESNext"] = 6] = "ESNext";
+        ScriptTarget[ScriptTarget["ES2019"] = 6] = "ES2019";
+        ScriptTarget[ScriptTarget["ESNext"] = 7] = "ESNext";
         ScriptTarget[ScriptTarget["JSON"] = 100] = "JSON";
-        ScriptTarget[ScriptTarget["Latest"] = 6] = "Latest";
+        ScriptTarget[ScriptTarget["Latest"] = 7] = "Latest";
     })(ScriptTarget = ts.ScriptTarget || (ts.ScriptTarget = {}));
     var LanguageVariant;
     (function (LanguageVariant) {
@@ -3727,6 +3838,7 @@ var ts;
         Extension["Js"] = ".js";
         Extension["Jsx"] = ".jsx";
         Extension["Json"] = ".json";
+        Extension["TsBuildInfo"] = ".tsbuildinfo";
     })(Extension = ts.Extension || (ts.Extension = {}));
     /* @internal */
     var TransformFlags;
@@ -3734,71 +3846,69 @@ var ts;
         TransformFlags[TransformFlags["None"] = 0] = "None";
         // Facts
         // - Flags used to indicate that a node or subtree contains syntax that requires transformation.
-        TransformFlags[TransformFlags["TypeScript"] = 1] = "TypeScript";
-        TransformFlags[TransformFlags["ContainsTypeScript"] = 2] = "ContainsTypeScript";
-        TransformFlags[TransformFlags["ContainsJsx"] = 4] = "ContainsJsx";
-        TransformFlags[TransformFlags["ContainsESNext"] = 8] = "ContainsESNext";
-        TransformFlags[TransformFlags["ContainsES2017"] = 16] = "ContainsES2017";
-        TransformFlags[TransformFlags["ContainsES2016"] = 32] = "ContainsES2016";
-        TransformFlags[TransformFlags["ES2015"] = 64] = "ES2015";
+        TransformFlags[TransformFlags["ContainsTypeScript"] = 1] = "ContainsTypeScript";
+        TransformFlags[TransformFlags["ContainsJsx"] = 2] = "ContainsJsx";
+        TransformFlags[TransformFlags["ContainsESNext"] = 4] = "ContainsESNext";
+        TransformFlags[TransformFlags["ContainsES2019"] = 8] = "ContainsES2019";
+        TransformFlags[TransformFlags["ContainsES2018"] = 16] = "ContainsES2018";
+        TransformFlags[TransformFlags["ContainsES2017"] = 32] = "ContainsES2017";
+        TransformFlags[TransformFlags["ContainsES2016"] = 64] = "ContainsES2016";
         TransformFlags[TransformFlags["ContainsES2015"] = 128] = "ContainsES2015";
-        TransformFlags[TransformFlags["Generator"] = 256] = "Generator";
-        TransformFlags[TransformFlags["ContainsGenerator"] = 512] = "ContainsGenerator";
-        TransformFlags[TransformFlags["DestructuringAssignment"] = 1024] = "DestructuringAssignment";
-        TransformFlags[TransformFlags["ContainsDestructuringAssignment"] = 2048] = "ContainsDestructuringAssignment";
+        TransformFlags[TransformFlags["ContainsGenerator"] = 256] = "ContainsGenerator";
+        TransformFlags[TransformFlags["ContainsDestructuringAssignment"] = 512] = "ContainsDestructuringAssignment";
         // Markers
         // - Flags used to indicate that a subtree contains a specific transformation.
-        TransformFlags[TransformFlags["ContainsTypeScriptClassSyntax"] = 4096] = "ContainsTypeScriptClassSyntax";
-        TransformFlags[TransformFlags["ContainsLexicalThis"] = 8192] = "ContainsLexicalThis";
-        TransformFlags[TransformFlags["ContainsCapturedLexicalThis"] = 16384] = "ContainsCapturedLexicalThis";
-        TransformFlags[TransformFlags["ContainsLexicalThisInComputedPropertyName"] = 32768] = "ContainsLexicalThisInComputedPropertyName";
-        TransformFlags[TransformFlags["ContainsDefaultValueAssignments"] = 65536] = "ContainsDefaultValueAssignments";
-        TransformFlags[TransformFlags["ContainsRestOrSpread"] = 131072] = "ContainsRestOrSpread";
-        TransformFlags[TransformFlags["ContainsObjectRestOrSpread"] = 262144] = "ContainsObjectRestOrSpread";
-        TransformFlags[TransformFlags["ContainsComputedPropertyName"] = 524288] = "ContainsComputedPropertyName";
-        TransformFlags[TransformFlags["ContainsBlockScopedBinding"] = 1048576] = "ContainsBlockScopedBinding";
-        TransformFlags[TransformFlags["ContainsBindingPattern"] = 2097152] = "ContainsBindingPattern";
-        TransformFlags[TransformFlags["ContainsYield"] = 4194304] = "ContainsYield";
-        TransformFlags[TransformFlags["ContainsHoistedDeclarationOrCompletion"] = 8388608] = "ContainsHoistedDeclarationOrCompletion";
-        TransformFlags[TransformFlags["ContainsDynamicImport"] = 16777216] = "ContainsDynamicImport";
-        TransformFlags[TransformFlags["Super"] = 33554432] = "Super";
-        TransformFlags[TransformFlags["ContainsSuper"] = 67108864] = "ContainsSuper";
+        TransformFlags[TransformFlags["ContainsTypeScriptClassSyntax"] = 1024] = "ContainsTypeScriptClassSyntax";
+        TransformFlags[TransformFlags["ContainsLexicalThis"] = 2048] = "ContainsLexicalThis";
+        TransformFlags[TransformFlags["ContainsRestOrSpread"] = 4096] = "ContainsRestOrSpread";
+        TransformFlags[TransformFlags["ContainsObjectRestOrSpread"] = 8192] = "ContainsObjectRestOrSpread";
+        TransformFlags[TransformFlags["ContainsComputedPropertyName"] = 16384] = "ContainsComputedPropertyName";
+        TransformFlags[TransformFlags["ContainsBlockScopedBinding"] = 32768] = "ContainsBlockScopedBinding";
+        TransformFlags[TransformFlags["ContainsBindingPattern"] = 65536] = "ContainsBindingPattern";
+        TransformFlags[TransformFlags["ContainsYield"] = 131072] = "ContainsYield";
+        TransformFlags[TransformFlags["ContainsHoistedDeclarationOrCompletion"] = 262144] = "ContainsHoistedDeclarationOrCompletion";
+        TransformFlags[TransformFlags["ContainsDynamicImport"] = 524288] = "ContainsDynamicImport";
         // Please leave this as 1 << 29.
         // It is the maximum bit we can set before we outgrow the size of a v8 small integer (SMI) on an x86 system.
         // It is a good reminder of how much room we have left
         TransformFlags[TransformFlags["HasComputedFlags"] = 536870912] = "HasComputedFlags";
         // Assertions
         // - Bitmasks that are used to assert facts about the syntax of a node and its subtree.
-        TransformFlags[TransformFlags["AssertTypeScript"] = 3] = "AssertTypeScript";
-        TransformFlags[TransformFlags["AssertJsx"] = 4] = "AssertJsx";
-        TransformFlags[TransformFlags["AssertESNext"] = 8] = "AssertESNext";
-        TransformFlags[TransformFlags["AssertES2017"] = 16] = "AssertES2017";
-        TransformFlags[TransformFlags["AssertES2016"] = 32] = "AssertES2016";
-        TransformFlags[TransformFlags["AssertES2015"] = 192] = "AssertES2015";
-        TransformFlags[TransformFlags["AssertGenerator"] = 768] = "AssertGenerator";
-        TransformFlags[TransformFlags["AssertDestructuringAssignment"] = 3072] = "AssertDestructuringAssignment";
+        TransformFlags[TransformFlags["AssertTypeScript"] = 1] = "AssertTypeScript";
+        TransformFlags[TransformFlags["AssertJsx"] = 2] = "AssertJsx";
+        TransformFlags[TransformFlags["AssertESNext"] = 4] = "AssertESNext";
+        TransformFlags[TransformFlags["AssertES2019"] = 8] = "AssertES2019";
+        TransformFlags[TransformFlags["AssertES2018"] = 16] = "AssertES2018";
+        TransformFlags[TransformFlags["AssertES2017"] = 32] = "AssertES2017";
+        TransformFlags[TransformFlags["AssertES2016"] = 64] = "AssertES2016";
+        TransformFlags[TransformFlags["AssertES2015"] = 128] = "AssertES2015";
+        TransformFlags[TransformFlags["AssertGenerator"] = 256] = "AssertGenerator";
+        TransformFlags[TransformFlags["AssertDestructuringAssignment"] = 512] = "AssertDestructuringAssignment";
         // Scope Exclusions
         // - Bitmasks that exclude flags from propagating out of a specific context
         //   into the subtree flags of their container.
-        TransformFlags[TransformFlags["OuterExpressionExcludes"] = 536872257] = "OuterExpressionExcludes";
-        TransformFlags[TransformFlags["PropertyAccessExcludes"] = 570426689] = "PropertyAccessExcludes";
-        TransformFlags[TransformFlags["NodeExcludes"] = 637535553] = "NodeExcludes";
-        TransformFlags[TransformFlags["ArrowFunctionExcludes"] = 653604161] = "ArrowFunctionExcludes";
-        TransformFlags[TransformFlags["FunctionExcludes"] = 653620545] = "FunctionExcludes";
-        TransformFlags[TransformFlags["ConstructorExcludes"] = 653616449] = "ConstructorExcludes";
-        TransformFlags[TransformFlags["MethodOrAccessorExcludes"] = 653616449] = "MethodOrAccessorExcludes";
-        TransformFlags[TransformFlags["ClassExcludes"] = 638121281] = "ClassExcludes";
-        TransformFlags[TransformFlags["ModuleExcludes"] = 647001409] = "ModuleExcludes";
-        TransformFlags[TransformFlags["TypeExcludes"] = -3] = "TypeExcludes";
-        TransformFlags[TransformFlags["ObjectLiteralExcludes"] = 638358849] = "ObjectLiteralExcludes";
-        TransformFlags[TransformFlags["ArrayLiteralOrCallOrNewExcludes"] = 637666625] = "ArrayLiteralOrCallOrNewExcludes";
-        TransformFlags[TransformFlags["VariableDeclarationListExcludes"] = 639894849] = "VariableDeclarationListExcludes";
-        TransformFlags[TransformFlags["ParameterExcludes"] = 637535553] = "ParameterExcludes";
-        TransformFlags[TransformFlags["CatchClauseExcludes"] = 637797697] = "CatchClauseExcludes";
-        TransformFlags[TransformFlags["BindingPatternExcludes"] = 637666625] = "BindingPatternExcludes";
+        TransformFlags[TransformFlags["OuterExpressionExcludes"] = 536870912] = "OuterExpressionExcludes";
+        TransformFlags[TransformFlags["PropertyAccessExcludes"] = 536870912] = "PropertyAccessExcludes";
+        TransformFlags[TransformFlags["NodeExcludes"] = 536870912] = "NodeExcludes";
+        TransformFlags[TransformFlags["ArrowFunctionExcludes"] = 537371648] = "ArrowFunctionExcludes";
+        TransformFlags[TransformFlags["FunctionExcludes"] = 537373696] = "FunctionExcludes";
+        TransformFlags[TransformFlags["ConstructorExcludes"] = 537372672] = "ConstructorExcludes";
+        TransformFlags[TransformFlags["MethodOrAccessorExcludes"] = 537372672] = "MethodOrAccessorExcludes";
+        TransformFlags[TransformFlags["PropertyExcludes"] = 536872960] = "PropertyExcludes";
+        TransformFlags[TransformFlags["ClassExcludes"] = 536888320] = "ClassExcludes";
+        TransformFlags[TransformFlags["ModuleExcludes"] = 537168896] = "ModuleExcludes";
+        TransformFlags[TransformFlags["TypeExcludes"] = -2] = "TypeExcludes";
+        TransformFlags[TransformFlags["ObjectLiteralExcludes"] = 536896512] = "ObjectLiteralExcludes";
+        TransformFlags[TransformFlags["ArrayLiteralOrCallOrNewExcludes"] = 536875008] = "ArrayLiteralOrCallOrNewExcludes";
+        TransformFlags[TransformFlags["VariableDeclarationListExcludes"] = 536944640] = "VariableDeclarationListExcludes";
+        TransformFlags[TransformFlags["ParameterExcludes"] = 536870912] = "ParameterExcludes";
+        TransformFlags[TransformFlags["CatchClauseExcludes"] = 536879104] = "CatchClauseExcludes";
+        TransformFlags[TransformFlags["BindingPatternExcludes"] = 536875008] = "BindingPatternExcludes";
+        // Propagating flags
+        // - Bitmasks for flags that should propagate from a child
+        TransformFlags[TransformFlags["PropertyNamePropagatingFlags"] = 2048] = "PropertyNamePropagatingFlags";
         // Masks
         // - Additional bitmasks
-        TransformFlags[TransformFlags["ES2015FunctionSyntaxMask"] = 81920] = "ES2015FunctionSyntaxMask";
     })(TransformFlags = ts.TransformFlags || (ts.TransformFlags = {}));
     var EmitFlags;
     (function (EmitFlags) {
@@ -3880,6 +3990,20 @@ var ts;
         EmitHint[EmitHint["Unspecified"] = 4] = "Unspecified";
         EmitHint[EmitHint["EmbeddedStatement"] = 5] = "EmbeddedStatement";
     })(EmitHint = ts.EmitHint || (ts.EmitHint = {}));
+    /*@internal*/
+    var BundleFileSectionKind;
+    (function (BundleFileSectionKind) {
+        BundleFileSectionKind["Prologue"] = "prologue";
+        BundleFileSectionKind["EmitHelpers"] = "emitHelpers";
+        BundleFileSectionKind["NoDefaultLib"] = "no-default-lib";
+        BundleFileSectionKind["Reference"] = "reference";
+        BundleFileSectionKind["Type"] = "type";
+        BundleFileSectionKind["Lib"] = "lib";
+        BundleFileSectionKind["Prepend"] = "prepend";
+        BundleFileSectionKind["Text"] = "text";
+        BundleFileSectionKind["Internal"] = "internal";
+        // comments?
+    })(BundleFileSectionKind = ts.BundleFileSectionKind || (ts.BundleFileSectionKind = {}));
     var ListFormat;
     (function (ListFormat) {
         ListFormat[ListFormat["None"] = 0] = "None";
@@ -4026,8 +4150,11 @@ var ts;
      */
     /* @internal */
     function generateDjb2Hash(data) {
-        var chars = data.split("").map(function (str) { return str.charCodeAt(0); });
-        return "" + chars.reduce(function (prev, curr) { return ((prev << 5) + prev) + curr; }, 5381);
+        var acc = 5381;
+        for (var i = 0; i < data.length; i++) {
+            acc = ((acc << 5) + acc) + data.charCodeAt(i);
+        }
+        return acc.toString();
     }
     ts.generateDjb2Hash = generateDjb2Hash;
     /**
@@ -4287,6 +4414,8 @@ var ts;
                 : FileWatcherEventKind.Changed;
     }
     ts.getFileWatcherEventKind = getFileWatcherEventKind;
+    /*@internal*/
+    ts.ignoredPaths = ["/node_modules/.", "/.git"];
     /**
      * Watch the directory recursively using host provided method to watch child directories
      * that means if this is recursive watcher, watch the children directories as well
@@ -4311,6 +4440,8 @@ var ts;
             else {
                 directoryWatcher = {
                     watcher: host.watchDirectory(dirName, function (fileName) {
+                        if (isIgnoredPath(fileName))
+                            return;
                         // Call the actual callback
                         callbackCache.forEach(function (callbacks, rootDirName) {
                             if (rootDirName === dirPath || (ts.startsWith(dirPath, rootDirName) && dirPath[rootDirName.length] === ts.directorySeparator)) {
@@ -4360,7 +4491,7 @@ var ts;
                 var childFullName = ts.getNormalizedAbsolutePath(child, parentDir);
                 // Filter our the symbolic link directories since those arent included in recursive watch
                 // which is same behaviour when recursive: true is passed to fs.watch
-                return filePathComparer(childFullName, ts.normalizePath(host.realpath(childFullName))) === 0 /* EqualTo */ ? childFullName : undefined;
+                return !isIgnoredPath(childFullName) && filePathComparer(childFullName, ts.normalizePath(host.realpath(childFullName))) === 0 /* EqualTo */ ? childFullName : undefined;
             }) : ts.emptyArray, existingChildWatches, function (child, childWatcher) { return filePathComparer(child, childWatcher.dirName); }, createAndAddChildDirectoryWatcher, ts.closeFileWatcher, addChildDirectoryWatcher);
             return newChildWatches || ts.emptyArray;
             /**
@@ -4377,6 +4508,16 @@ var ts;
                 (newChildWatches || (newChildWatches = [])).push(childWatcher);
             }
         }
+        function isIgnoredPath(path) {
+            return ts.some(ts.ignoredPaths, function (searchPath) { return isInPath(path, searchPath); });
+        }
+        function isInPath(path, searchPath) {
+            if (ts.stringContains(path, searchPath))
+                return true;
+            if (host.useCaseSensitiveFileNames)
+                return false;
+            return ts.stringContains(toCanonicalFilePath(path), searchPath);
+        }
     }
     ts.createRecursiveDirectoryWatcher = createRecursiveDirectoryWatcher;
     function getNodeMajorVersion() {
@@ -4445,7 +4586,17 @@ var ts;
                 directoryExists: directoryExists,
                 createDirectory: function (directoryName) {
                     if (!nodeSystem.directoryExists(directoryName)) {
-                        _fs.mkdirSync(directoryName);
+                        // Wrapped in a try-catch to prevent crashing if we are in a race
+                        // with another copy of ourselves to create the same directory
+                        try {
+                            _fs.mkdirSync(directoryName);
+                        }
+                        catch (e) {
+                            if (e.code !== "EEXIST") {
+                                // Failed for some other reason (access denied?); still throw
+                                throw e;
+                            }
+                        }
                     }
                 },
                 getExecutingFilePath: function () {
@@ -4462,7 +4613,7 @@ var ts;
                 getModifiedTime: getModifiedTime,
                 setModifiedTime: setModifiedTime,
                 deleteFile: deleteFile,
-                createHash: _crypto ? createMD5HashUsingNativeCrypto : generateDjb2Hash,
+                createHash: _crypto ? createSHA256Hash : generateDjb2Hash,
                 createSHA256Hash: _crypto ? createSHA256Hash : undefined,
                 getMemoryUsage: function () {
                     if (global.gc) {
@@ -4850,7 +5001,7 @@ var ts;
                 }
             }
             function readDirectory(path, extensions, excludes, includes, depth) {
-                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries);
+                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath);
             }
             function fileSystemEntryExists(path, entryKind) {
                 try {
@@ -4906,11 +5057,6 @@ var ts;
                     return;
                 }
             }
-            function createMD5HashUsingNativeCrypto(data) {
-                var hash = _crypto.createHash("md5");
-                hash.update(data);
-                return hash.digest("hex");
-            }
             function createSHA256Hash(data) {
                 var hash = _crypto.createHash("sha256");
                 hash.update(data);
@@ -5171,7 +5317,6 @@ var ts;
         Decorators_are_not_valid_here: diag(1206, ts.DiagnosticCategory.Error, "Decorators_are_not_valid_here_1206", "Decorators are not valid here."),
         Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name: diag(1207, ts.DiagnosticCategory.Error, "Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name_1207", "Decorators cannot be applied to multiple get/set accessors of the same name."),
         Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided: diag(1208, ts.DiagnosticCategory.Error, "Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided_1208", "Cannot compile namespaces when the '--isolatedModules' flag is provided."),
-        Ambient_const_enums_are_not_allowed_when_the_isolatedModules_flag_is_provided: diag(1209, ts.DiagnosticCategory.Error, "Ambient_const_enums_are_not_allowed_when_the_isolatedModules_flag_is_provided_1209", "Ambient const enums are not allowed when the '--isolatedModules' flag is provided."),
         Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode: diag(1210, ts.DiagnosticCategory.Error, "Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode_1210", "Invalid use of '{0}'. Class definitions are automatically in strict mode."),
         A_class_declaration_without_the_default_modifier_must_have_a_name: diag(1211, ts.DiagnosticCategory.Error, "A_class_declaration_without_the_default_modifier_must_have_a_name_1211", "A class declaration without the 'default' modifier must have a name."),
         Identifier_expected_0_is_a_reserved_word_in_strict_mode: diag(1212, ts.DiagnosticCategory.Error, "Identifier_expected_0_is_a_reserved_word_in_strict_mode_1212", "Identifier expected. '{0}' is a reserved word in strict mode."),
@@ -5262,6 +5407,8 @@ var ts;
         An_identifier_or_keyword_cannot_immediately_follow_a_numeric_literal: diag(1351, ts.DiagnosticCategory.Error, "An_identifier_or_keyword_cannot_immediately_follow_a_numeric_literal_1351", "An identifier or keyword cannot immediately follow a numeric literal."),
         A_bigint_literal_cannot_use_exponential_notation: diag(1352, ts.DiagnosticCategory.Error, "A_bigint_literal_cannot_use_exponential_notation_1352", "A bigint literal cannot use exponential notation."),
         A_bigint_literal_must_be_an_integer: diag(1353, ts.DiagnosticCategory.Error, "A_bigint_literal_must_be_an_integer_1353", "A bigint literal must be an integer."),
+        readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types: diag(1354, ts.DiagnosticCategory.Error, "readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types_1354", "'readonly' type modifier is only permitted on array and tuple literal types."),
+        A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal: diag(1355, ts.DiagnosticCategory.Error, "A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal_1355", "A 'const' assertion can only be applied to a string, number, boolean, array, or object literal."),
         Duplicate_identifier_0: diag(2300, ts.DiagnosticCategory.Error, "Duplicate_identifier_0_2300", "Duplicate identifier '{0}'."),
         Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: diag(2301, ts.DiagnosticCategory.Error, "Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301", "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor."),
         Static_members_cannot_reference_class_type_parameters: diag(2302, ts.DiagnosticCategory.Error, "Static_members_cannot_reference_class_type_parameters_2302", "Static members cannot reference class type parameters."),
@@ -5356,7 +5503,7 @@ var ts;
         Function_implementation_is_missing_or_not_immediately_following_the_declaration: diag(2391, ts.DiagnosticCategory.Error, "Function_implementation_is_missing_or_not_immediately_following_the_declaration_2391", "Function implementation is missing or not immediately following the declaration."),
         Multiple_constructor_implementations_are_not_allowed: diag(2392, ts.DiagnosticCategory.Error, "Multiple_constructor_implementations_are_not_allowed_2392", "Multiple constructor implementations are not allowed."),
         Duplicate_function_implementation: diag(2393, ts.DiagnosticCategory.Error, "Duplicate_function_implementation_2393", "Duplicate function implementation."),
-        Overload_signature_is_not_compatible_with_function_implementation: diag(2394, ts.DiagnosticCategory.Error, "Overload_signature_is_not_compatible_with_function_implementation_2394", "Overload signature is not compatible with function implementation."),
+        This_overload_signature_is_not_compatible_with_its_implementation_signature: diag(2394, ts.DiagnosticCategory.Error, "This_overload_signature_is_not_compatible_with_its_implementation_signature_2394", "This overload signature is not compatible with its implementation signature."),
         Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local: diag(2395, ts.DiagnosticCategory.Error, "Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local_2395", "Individual declarations in merged declaration '{0}' must be all exported or all local."),
         Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters: diag(2396, ts.DiagnosticCategory.Error, "Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters_2396", "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters."),
         Declaration_name_conflicts_with_built_in_global_identifier_0: diag(2397, ts.DiagnosticCategory.Error, "Declaration_name_conflicts_with_built_in_global_identifier_0_2397", "Declaration name conflicts with built-in global identifier '{0}'."),
@@ -5529,15 +5676,20 @@ var ts;
         No_overload_expects_0_arguments_but_overloads_do_exist_that_expect_either_1_or_2_arguments: diag(2575, ts.DiagnosticCategory.Error, "No_overload_expects_0_arguments_but_overloads_do_exist_that_expect_either_1_or_2_arguments_2575", "No overload expects {0} arguments, but overloads do exist that expect either {1} or {2} arguments."),
         Property_0_is_a_static_member_of_type_1: diag(2576, ts.DiagnosticCategory.Error, "Property_0_is_a_static_member_of_type_1_2576", "Property '{0}' is a static member of type '{1}'"),
         Return_type_annotation_circularly_references_itself: diag(2577, ts.DiagnosticCategory.Error, "Return_type_annotation_circularly_references_itself_2577", "Return type annotation circularly references itself."),
-        Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_and_then_add_node_to_the_types_field_in_your_tsconfig: diag(2580, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_and_th_2580", "Cannot find name '{0}'. Do you need to install type definitions for node? Try `npm i @types/node` and then add `node` to the types field in your tsconfig."),
-        Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_and_then_add_jquery_to_the_types_field_in_your_tsconfig: diag(2581, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_an_2581", "Cannot find name '{0}'. Do you need to install type definitions for jQuery? Try `npm i @types/jquery` and then add `jquery` to the types field in your tsconfig."),
-        Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashjest_or_npm_i_types_Slashmocha_and_then_add_jest_or_mocha_to_the_types_field_in_your_tsconfig: diag(2582, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashje_2582", "Cannot find name '{0}'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha`  and then add `jest` or `mocha` to the types field in your tsconfig."),
+        Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode: diag(2580, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_2580", "Cannot find name '{0}'. Do you need to install type definitions for node? Try `npm i @types/node`."),
+        Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery: diag(2581, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_2581", "Cannot find name '{0}'. Do you need to install type definitions for jQuery? Try `npm i @types/jquery`."),
+        Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashjest_or_npm_i_types_Slashmocha: diag(2582, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashje_2582", "Cannot find name '{0}'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha`."),
         Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_es2015_or_later: diag(2583, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_2583", "Cannot find name '{0}'. Do you need to change your target library? Try changing the `lib` compiler option to es2015 or later."),
         Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_include_dom: diag(2584, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_2584", "Cannot find name '{0}'. Do you need to change your target library? Try changing the `lib` compiler option to include 'dom'."),
         _0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_es2015_or_later: diag(2585, ts.DiagnosticCategory.Error, "_0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Do_you_need_to_change_your_target_library_2585", "'{0}' only refers to a type, but is being used as a value here. Do you need to change your target library? Try changing the `lib` compiler option to es2015 or later."),
         Enum_type_0_circularly_references_itself: diag(2586, ts.DiagnosticCategory.Error, "Enum_type_0_circularly_references_itself_2586", "Enum type '{0}' circularly references itself."),
         JSDoc_type_0_circularly_references_itself: diag(2587, ts.DiagnosticCategory.Error, "JSDoc_type_0_circularly_references_itself_2587", "JSDoc type '{0}' circularly references itself."),
         Cannot_assign_to_0_because_it_is_a_constant: diag(2588, ts.DiagnosticCategory.Error, "Cannot_assign_to_0_because_it_is_a_constant_2588", "Cannot assign to '{0}' because it is a constant."),
+        Type_instantiation_is_excessively_deep_and_possibly_infinite: diag(2589, ts.DiagnosticCategory.Error, "Type_instantiation_is_excessively_deep_and_possibly_infinite_2589", "Type instantiation is excessively deep and possibly infinite."),
+        Expression_produces_a_union_type_that_is_too_complex_to_represent: diag(2590, ts.DiagnosticCategory.Error, "Expression_produces_a_union_type_that_is_too_complex_to_represent_2590", "Expression produces a union type that is too complex to represent."),
+        Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_and_then_add_node_to_the_types_field_in_your_tsconfig: diag(2591, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_and_th_2591", "Cannot find name '{0}'. Do you need to install type definitions for node? Try `npm i @types/node` and then add `node` to the types field in your tsconfig."),
+        Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_and_then_add_jquery_to_the_types_field_in_your_tsconfig: diag(2592, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_an_2592", "Cannot find name '{0}'. Do you need to install type definitions for jQuery? Try `npm i @types/jquery` and then add `jquery` to the types field in your tsconfig."),
+        Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashjest_or_npm_i_types_Slashmocha_and_then_add_jest_or_mocha_to_the_types_field_in_your_tsconfig: diag(2593, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashje_2593", "Cannot find name '{0}'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha` and then add `jest` or `mocha` to the types field in your tsconfig."),
         JSX_element_attributes_type_0_may_not_be_a_union_type: diag(2600, ts.DiagnosticCategory.Error, "JSX_element_attributes_type_0_may_not_be_a_union_type_2600", "JSX element attributes type '{0}' may not be a union type."),
         The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: diag(2601, ts.DiagnosticCategory.Error, "The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601", "The return type of a JSX element constructor must return an object type."),
         JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist: diag(2602, ts.DiagnosticCategory.Error, "JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602", "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist."),
@@ -5644,6 +5796,12 @@ var ts;
         This_JSX_tag_s_0_prop_expects_type_1_which_requires_multiple_children_but_only_a_single_child_was_provided: diag(2745, ts.DiagnosticCategory.Error, "This_JSX_tag_s_0_prop_expects_type_1_which_requires_multiple_children_but_only_a_single_child_was_pr_2745", "This JSX tag's '{0}' prop expects type '{1}' which requires multiple children, but only a single child was provided."),
         This_JSX_tag_s_0_prop_expects_a_single_child_of_type_1_but_multiple_children_were_provided: diag(2746, ts.DiagnosticCategory.Error, "This_JSX_tag_s_0_prop_expects_a_single_child_of_type_1_but_multiple_children_were_provided_2746", "This JSX tag's '{0}' prop expects a single child of type '{1}', but multiple children were provided."),
         _0_components_don_t_accept_text_as_child_elements_Text_in_JSX_has_the_type_string_but_the_expected_type_of_1_is_2: diag(2747, ts.DiagnosticCategory.Error, "_0_components_don_t_accept_text_as_child_elements_Text_in_JSX_has_the_type_string_but_the_expected_t_2747", "'{0}' components don't accept text as child elements. Text in JSX has the type 'string', but the expected type of '{1}' is '{2}'."),
+        Cannot_access_ambient_const_enums_when_the_isolatedModules_flag_is_provided: diag(2748, ts.DiagnosticCategory.Error, "Cannot_access_ambient_const_enums_when_the_isolatedModules_flag_is_provided_2748", "Cannot access ambient const enums when the '--isolatedModules' flag is provided."),
+        _0_refers_to_a_value_but_is_being_used_as_a_type_here: diag(2749, ts.DiagnosticCategory.Error, "_0_refers_to_a_value_but_is_being_used_as_a_type_here_2749", "'{0}' refers to a value, but is being used as a type here."),
+        The_implementation_signature_is_declared_here: diag(2750, ts.DiagnosticCategory.Error, "The_implementation_signature_is_declared_here_2750", "The implementation signature is declared here."),
+        Circularity_originates_in_type_at_this_location: diag(2751, ts.DiagnosticCategory.Error, "Circularity_originates_in_type_at_this_location_2751", "Circularity originates in type at this location."),
+        The_first_export_default_is_here: diag(2752, ts.DiagnosticCategory.Error, "The_first_export_default_is_here_2752", "The first export default is here."),
+        Another_export_default_is_here: diag(2753, ts.DiagnosticCategory.Error, "Another_export_default_is_here_2753", "Another export default is here."),
         Import_declaration_0_is_using_private_name_1: diag(4000, ts.DiagnosticCategory.Error, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),
@@ -5727,6 +5885,7 @@ var ts;
         Public_method_0_of_exported_class_has_or_is_using_private_name_1: diag(4100, ts.DiagnosticCategory.Error, "Public_method_0_of_exported_class_has_or_is_using_private_name_1_4100", "Public method '{0}' of exported class has or is using private name '{1}'."),
         Method_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: diag(4101, ts.DiagnosticCategory.Error, "Method_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2_4101", "Method '{0}' of exported interface has or is using name '{1}' from private module '{2}'."),
         Method_0_of_exported_interface_has_or_is_using_private_name_1: diag(4102, ts.DiagnosticCategory.Error, "Method_0_of_exported_interface_has_or_is_using_private_name_1_4102", "Method '{0}' of exported interface has or is using private name '{1}'."),
+        Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1: diag(4103, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1_4103", "Type parameter '{0}' of exported mapped object type is using private name '{1}'."),
         The_current_host_does_not_support_the_0_option: diag(5001, ts.DiagnosticCategory.Error, "The_current_host_does_not_support_the_0_option_5001", "The current host does not support the '{0}' option."),
         Cannot_find_the_common_subdirectory_path_for_the_input_files: diag(5009, ts.DiagnosticCategory.Error, "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", "Cannot find the common subdirectory path for the input files."),
         File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: diag(5010, ts.DiagnosticCategory.Error, "File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0_5010", "File specification cannot end in a recursive directory wildcard ('**'): '{0}'."),
@@ -5775,7 +5934,7 @@ var ts;
         Skip_type_checking_of_declaration_files: diag(6012, ts.DiagnosticCategory.Message, "Skip_type_checking_of_declaration_files_6012", "Skip type checking of declaration files."),
         Do_not_resolve_the_real_path_of_symlinks: diag(6013, ts.DiagnosticCategory.Message, "Do_not_resolve_the_real_path_of_symlinks_6013", "Do not resolve the real path of symlinks."),
         Only_emit_d_ts_declaration_files: diag(6014, ts.DiagnosticCategory.Message, "Only_emit_d_ts_declaration_files_6014", "Only emit '.d.ts' declaration files."),
-        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_ES2018_or_ESNEXT: diag(6015, ts.DiagnosticCategory.Message, "Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_ES2018_or_ESNEXT_6015", "Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'."),
+        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_ES2018_ES2019_or_ESNEXT: diag(6015, ts.DiagnosticCategory.Message, "Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_ES2018_ES2019_or_ESNEXT_6015", "Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'."),
         Specify_module_code_generation_Colon_none_commonjs_amd_system_umd_es2015_or_ESNext: diag(6016, ts.DiagnosticCategory.Message, "Specify_module_code_generation_Colon_none_commonjs_amd_system_umd_es2015_or_ESNext_6016", "Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'."),
         Print_this_message: diag(6017, ts.DiagnosticCategory.Message, "Print_this_message_6017", "Print this message."),
         Print_the_compiler_s_version: diag(6019, ts.DiagnosticCategory.Message, "Print_the_compiler_s_version_6019", "Print the compiler's version."),
@@ -5994,6 +6153,16 @@ var ts;
         Option_build_must_be_the_first_command_line_argument: diag(6369, ts.DiagnosticCategory.Error, "Option_build_must_be_the_first_command_line_argument_6369", "Option '--build' must be the first command line argument."),
         Options_0_and_1_cannot_be_combined: diag(6370, ts.DiagnosticCategory.Error, "Options_0_and_1_cannot_be_combined_6370", "Options '{0}' and '{1}' cannot be combined."),
         Updating_unchanged_output_timestamps_of_project_0: diag(6371, ts.DiagnosticCategory.Message, "Updating_unchanged_output_timestamps_of_project_0_6371", "Updating unchanged output timestamps of project '{0}'..."),
+        Project_0_is_out_of_date_because_output_of_its_dependency_1_has_changed: diag(6372, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_output_of_its_dependency_1_has_changed_6372", "Project '{0}' is out of date because output of its dependency '{1}' has changed"),
+        Updating_output_of_project_0: diag(6373, ts.DiagnosticCategory.Message, "Updating_output_of_project_0_6373", "Updating output of project '{0}'..."),
+        A_non_dry_build_would_update_timestamps_for_output_of_project_0: diag(6374, ts.DiagnosticCategory.Message, "A_non_dry_build_would_update_timestamps_for_output_of_project_0_6374", "A non-dry build would update timestamps for output of project '{0}'"),
+        A_non_dry_build_would_update_output_of_project_0: diag(6375, ts.DiagnosticCategory.Message, "A_non_dry_build_would_update_output_of_project_0_6375", "A non-dry build would update output of project '{0}'"),
+        Cannot_update_output_of_project_0_because_there_was_error_reading_file_1: diag(6376, ts.DiagnosticCategory.Message, "Cannot_update_output_of_project_0_because_there_was_error_reading_file_1_6376", "Cannot update output of project '{0}' because there was error reading file '{1}'"),
+        Cannot_write_file_0_because_it_will_overwrite_tsbuildinfo_file_generated_by_referenced_project_1: diag(6377, ts.DiagnosticCategory.Error, "Cannot_write_file_0_because_it_will_overwrite_tsbuildinfo_file_generated_by_referenced_project_1_6377", "Cannot write file '{0}' because it will overwrite '.tsbuildinfo' file generated by referenced project '{1}'"),
+        Enable_incremental_compilation: diag(6378, ts.DiagnosticCategory.Message, "Enable_incremental_compilation_6378", "Enable incremental compilation"),
+        Composite_projects_may_not_disable_incremental_compilation: diag(6379, ts.DiagnosticCategory.Error, "Composite_projects_may_not_disable_incremental_compilation_6379", "Composite projects may not disable incremental compilation."),
+        Specify_file_to_store_incremental_compilation_information: diag(6380, ts.DiagnosticCategory.Message, "Specify_file_to_store_incremental_compilation_information_6380", "Specify file to store incremental compilation information"),
+        Project_0_is_out_of_date_because_output_for_it_was_generated_with_version_1_that_differs_with_current_version_2: diag(6381, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_output_for_it_was_generated_with_version_1_that_differs_with_curren_6381", "Project '{0}' is out of date because output for it was generated with version '{1}' that differs with current version '{2}'"),
         The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1: diag(6500, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1_6500", "The expected type comes from property '{0}' which is declared here on type '{1}'"),
         The_expected_type_comes_from_this_index_signature: diag(6501, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_this_index_signature_6501", "The expected type comes from this index signature."),
         The_expected_type_comes_from_the_return_type_of_this_signature: diag(6502, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_the_return_type_of_this_signature_6502", "The expected type comes from the return type of this signature."),
@@ -6030,7 +6199,7 @@ var ts;
         Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_Consider_using_a_default_import_or_import_require_here_instead: diag(7038, ts.DiagnosticCategory.Message, "Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cau_7038", "Type originates at this import. A namespace-style import cannot be called or constructed, and will cause a failure at runtime. Consider using a default import or import require here instead."),
         Mapped_object_type_implicitly_has_an_any_template_type: diag(7039, ts.DiagnosticCategory.Error, "Mapped_object_type_implicitly_has_an_any_template_type_7039", "Mapped object type implicitly has an 'any' template type."),
         If_the_0_package_actually_exposes_this_module_consider_sending_a_pull_request_to_amend_https_Colon_Slash_Slashgithub.amrom.workers.dev_SlashDefinitelyTyped_SlashDefinitelyTyped_Slashtree_Slashmaster_Slashtypes_Slash_1: diag(7040, ts.DiagnosticCategory.Error, "If_the_0_package_actually_exposes_this_module_consider_sending_a_pull_request_to_amend_https_Colon_S_7040", "If the '{0}' package actually exposes this module, consider sending a pull request to amend 'https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/{1}`"),
-        The_containing_arrow_function_captures_the_global_value_of_this_which_implicitly_has_type_any: diag(7041, ts.DiagnosticCategory.Error, "The_containing_arrow_function_captures_the_global_value_of_this_which_implicitly_has_type_any_7041", "The containing arrow function captures the global value of 'this' which implicitly has type 'any'."),
+        The_containing_arrow_function_captures_the_global_value_of_this: diag(7041, ts.DiagnosticCategory.Error, "The_containing_arrow_function_captures_the_global_value_of_this_7041", "The containing arrow function captures the global value of 'this'."),
         Module_0_was_resolved_to_1_but_resolveJsonModule_is_not_used: diag(7042, ts.DiagnosticCategory.Error, "Module_0_was_resolved_to_1_but_resolveJsonModule_is_not_used_7042", "Module '{0}' was resolved to '{1}', but '--resolveJsonModule' is not used."),
         Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage: diag(7043, ts.DiagnosticCategory.Suggestion, "Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage_7043", "Variable '{0}' implicitly has an '{1}' type, but a better type may be inferred from usage."),
         Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage: diag(7044, ts.DiagnosticCategory.Suggestion, "Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage_7044", "Parameter '{0}' implicitly has an '{1}' type, but a better type may be inferred from usage."),
@@ -6210,6 +6379,7 @@ var ts;
         Add_missing_new_operator_to_all_calls: diag(95072, ts.DiagnosticCategory.Message, "Add_missing_new_operator_to_all_calls_95072", "Add missing 'new' operator to all calls"),
         Add_names_to_all_parameters_without_names: diag(95073, ts.DiagnosticCategory.Message, "Add_names_to_all_parameters_without_names_95073", "Add names to all parameters without names"),
         Enable_the_experimentalDecorators_option_in_your_configuration_file: diag(95074, ts.DiagnosticCategory.Message, "Enable_the_experimentalDecorators_option_in_your_configuration_file_95074", "Enable the 'experimentalDecorators' option in your configuration file"),
+        Convert_parameters_to_destructured_object: diag(95075, ts.DiagnosticCategory.Message, "Convert_parameters_to_destructured_object_95075", "Convert parameters to destructured object"),
     };
 })(ts || (ts = {}));
 var ts;
@@ -6697,16 +6867,20 @@ var ts;
         return pos;
     }
     var shebangTriviaRegex = /^#!.*/;
+    /*@internal*/
     function isShebangTrivia(text, pos) {
         // Shebangs check must only be done at the start of the file
         ts.Debug.assert(pos === 0);
         return shebangTriviaRegex.test(text);
     }
+    ts.isShebangTrivia = isShebangTrivia;
+    /*@internal*/
     function scanShebangTrivia(text, pos) {
         var shebang = shebangTriviaRegex.exec(text)[0];
         pos = pos + shebang.length;
         return pos;
     }
+    ts.scanShebangTrivia = scanShebangTrivia;
     /**
      * Invokes a callback for each comment range following the provided position.
      *
@@ -6733,8 +6907,15 @@ var ts;
         var pendingKind;
         var pendingHasTrailingNewLine;
         var hasPendingCommentRange = false;
-        var collecting = trailing || pos === 0;
+        var collecting = trailing;
         var accumulator = initial;
+        if (pos === 0) {
+            collecting = true;
+            var shebang = getShebang(text);
+            if (shebang) {
+                pos = shebang.length;
+            }
+        }
         scan: while (pos >= 0 && pos < text.length) {
             var ch = text.charCodeAt(pos);
             switch (ch) {
@@ -7969,6 +8150,7 @@ var ts;
                 }
                 pos++;
             }
+            tokenValue = text.substring(startPos, pos);
             return firstNonWhitespace === -1 ? 12 /* JsxTextAllWhiteSpaces */ : 11 /* JsxText */;
         }
         // Scans a JSX identifier; these differ from normal identifiers in that
@@ -8050,8 +8232,8 @@ var ts;
                     pos++;
                     return token = 14 /* NoSubstitutionTemplateLiteral */;
             }
-            if (isIdentifierStart(ch, 6 /* Latest */)) {
-                while (isIdentifierPart(text.charCodeAt(pos), 6 /* Latest */) && pos < end) {
+            if (isIdentifierStart(ch, 7 /* Latest */)) {
+                while (isIdentifierPart(text.charCodeAt(pos), 7 /* Latest */) && pos < end) {
                     pos++;
                 }
                 tokenValue = text.substring(tokenPos, pos);
@@ -8409,7 +8591,7 @@ var ts;
         }
     }
     function getSourceFileOfNode(node) {
-        while (node && node.kind !== 279 /* SourceFile */) {
+        while (node && node.kind !== 284 /* SourceFile */) {
             node = node.parent;
         }
         return node;
@@ -8496,10 +8678,7 @@ var ts;
         return !nodeIsMissing(node);
     }
     ts.nodeIsPresent = nodeIsPresent;
-    /**
-     * Prepends statements to an array while taking care of prologue directives.
-     */
-    function addStatementsAfterPrologue(to, from) {
+    function insertStatementsAfterPrologue(to, from, isPrologueDirective) {
         if (from === undefined || from.length === 0)
             return to;
         var statementIndex = 0;
@@ -8512,7 +8691,44 @@ var ts;
         to.splice.apply(to, [statementIndex, 0].concat(from));
         return to;
     }
-    ts.addStatementsAfterPrologue = addStatementsAfterPrologue;
+    function insertStatementAfterPrologue(to, statement, isPrologueDirective) {
+        if (statement === undefined)
+            return to;
+        var statementIndex = 0;
+        // skip all prologue directives to insert at the correct position
+        for (; statementIndex < to.length; ++statementIndex) {
+            if (!isPrologueDirective(to[statementIndex])) {
+                break;
+            }
+        }
+        to.splice(statementIndex, 0, statement);
+        return to;
+    }
+    function isAnyPrologueDirective(node) {
+        return isPrologueDirective(node) || !!(getEmitFlags(node) & 1048576 /* CustomPrologue */);
+    }
+    /**
+     * Prepends statements to an array while taking care of prologue directives.
+     */
+    function insertStatementsAfterStandardPrologue(to, from) {
+        return insertStatementsAfterPrologue(to, from, isPrologueDirective);
+    }
+    ts.insertStatementsAfterStandardPrologue = insertStatementsAfterStandardPrologue;
+    function insertStatementsAfterCustomPrologue(to, from) {
+        return insertStatementsAfterPrologue(to, from, isAnyPrologueDirective);
+    }
+    ts.insertStatementsAfterCustomPrologue = insertStatementsAfterCustomPrologue;
+    /**
+     * Prepends statements to an array while taking care of prologue directives.
+     */
+    function insertStatementAfterStandardPrologue(to, statement) {
+        return insertStatementAfterPrologue(to, statement, isPrologueDirective);
+    }
+    ts.insertStatementAfterStandardPrologue = insertStatementAfterStandardPrologue;
+    function insertStatementAfterCustomPrologue(to, statement) {
+        return insertStatementAfterPrologue(to, statement, isAnyPrologueDirective);
+    }
+    ts.insertStatementAfterCustomPrologue = insertStatementAfterCustomPrologue;
     /**
      * Determine if the given comment is a triple-slash
      *
@@ -8555,7 +8771,7 @@ var ts;
         // the syntax list itself considers them as normal trivia. Therefore if we simply skip
         // trivia for the list, we may have skipped the JSDocComment as well. So we should process its
         // first child to determine the actual position of its first token.
-        if (node.kind === 306 /* SyntaxList */ && node._children.length > 0) {
+        if (node.kind === 311 /* SyntaxList */ && node._children.length > 0) {
             return getTokenPosOfNode(node._children[0], sourceFile, includeJsDoc);
         }
         return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos);
@@ -8574,7 +8790,7 @@ var ts;
     }
     ts.getSourceTextOfNodeFromSourceFile = getSourceTextOfNodeFromSourceFile;
     function isJSDocTypeExpressionOrChild(node) {
-        return node.kind === 283 /* JSDocTypeExpression */ || (node.parent && isJSDocTypeExpressionOrChild(node.parent));
+        return node.kind === 288 /* JSDocTypeExpression */ || (node.parent && isJSDocTypeExpressionOrChild(node.parent));
     }
     function getTextOfNodeFromSourceText(sourceText, node, includeTrivia) {
         if (includeTrivia === void 0) { includeTrivia = false; }
@@ -8701,7 +8917,7 @@ var ts;
         return node && node.kind === 244 /* ModuleDeclaration */ && (!node.body);
     }
     function isBlockScopedContainerTopLevel(node) {
-        return node.kind === 279 /* SourceFile */ ||
+        return node.kind === 284 /* SourceFile */ ||
             node.kind === 244 /* ModuleDeclaration */ ||
             ts.isFunctionLike(node);
     }
@@ -8719,7 +8935,7 @@ var ts;
         // - defined in the top level scope and source file is an external module
         // - defined inside ambient module declaration located in the top level scope and source file not an external module
         switch (node.parent.kind) {
-            case 279 /* SourceFile */:
+            case 284 /* SourceFile */:
                 return ts.isExternalModule(node.parent);
             case 245 /* ModuleBlock */:
                 return isAmbientModule(node.parent.parent) && ts.isSourceFile(node.parent.parent.parent) && !ts.isExternalModule(node.parent.parent.parent);
@@ -8737,7 +8953,7 @@ var ts;
     ts.isEffectiveExternalModule = isEffectiveExternalModule;
     function isBlockScope(node, parentNode) {
         switch (node.kind) {
-            case 279 /* SourceFile */:
+            case 284 /* SourceFile */:
             case 246 /* CaseBlock */:
             case 274 /* CatchClause */:
             case 244 /* ModuleDeclaration */:
@@ -8762,9 +8978,9 @@ var ts;
     ts.isBlockScope = isBlockScope;
     function isDeclarationWithTypeParameters(node) {
         switch (node.kind) {
-            case 297 /* JSDocCallbackTag */:
-            case 304 /* JSDocTypedefTag */:
-            case 293 /* JSDocSignature */:
+            case 302 /* JSDocCallbackTag */:
+            case 309 /* JSDocTypedefTag */:
+            case 298 /* JSDocSignature */:
                 return true;
             default:
                 ts.assertType(node);
@@ -8780,12 +8996,12 @@ var ts;
             case 162 /* IndexSignature */:
             case 165 /* FunctionType */:
             case 166 /* ConstructorType */:
-            case 289 /* JSDocFunctionType */:
+            case 294 /* JSDocFunctionType */:
             case 240 /* ClassDeclaration */:
             case 209 /* ClassExpression */:
             case 241 /* InterfaceDeclaration */:
             case 242 /* TypeAliasDeclaration */:
-            case 303 /* JSDocTemplateTag */:
+            case 308 /* JSDocTemplateTag */:
             case 239 /* FunctionDeclaration */:
             case 156 /* MethodDeclaration */:
             case 157 /* Constructor */:
@@ -8930,7 +9146,7 @@ var ts;
     function getErrorSpanForNode(sourceFile, node) {
         var errorNode = node;
         switch (node.kind) {
-            case 279 /* SourceFile */:
+            case 284 /* SourceFile */:
                 var pos_1 = ts.skipTrivia(sourceFile.text, 0, /*stopAfterLineBreak*/ false);
                 if (pos_1 === sourceFile.text.length) {
                     // file is empty - return span for the beginning of the file
@@ -9105,7 +9321,7 @@ var ts;
                         return !isExpressionWithTypeArgumentsInClassExtendsClause(parent);
                     case 150 /* TypeParameter */:
                         return node === parent.constraint;
-                    case 303 /* JSDocTemplateTag */:
+                    case 308 /* JSDocTemplateTag */:
                         return node === parent.constraint;
                     case 154 /* PropertyDeclaration */:
                     case 153 /* PropertySignature */:
@@ -9365,7 +9581,7 @@ var ts;
     }
     ts.getContainingClass = getContainingClass;
     function getThisContainer(node, includeArrowFunctions) {
-        ts.Debug.assert(node.kind !== 279 /* SourceFile */);
+        ts.Debug.assert(node.kind !== 284 /* SourceFile */);
         while (true) {
             node = node.parent;
             if (!node) {
@@ -9419,7 +9635,7 @@ var ts;
                 case 161 /* ConstructSignature */:
                 case 162 /* IndexSignature */:
                 case 243 /* EnumDeclaration */:
-                case 279 /* SourceFile */:
+                case 284 /* SourceFile */:
                     return node;
             }
         }
@@ -9502,6 +9718,11 @@ var ts;
         }
     }
     ts.getImmediatelyInvokedFunctionExpression = getImmediatelyInvokedFunctionExpression;
+    function isSuperOrSuperProperty(node) {
+        return node.kind === 98 /* SuperKeyword */
+            || isSuperProperty(node);
+    }
+    ts.isSuperOrSuperProperty = isSuperOrSuperProperty;
     /**
      * Determines whether a node is a property or element access expression for `super`.
      */
@@ -10127,7 +10348,7 @@ var ts;
     }
     ts.isJSDocConstructSignature = isJSDocConstructSignature;
     function isJSDocTypeAlias(node) {
-        return node.kind === 304 /* JSDocTypedefTag */ || node.kind === 297 /* JSDocCallbackTag */;
+        return node.kind === 309 /* JSDocTypedefTag */ || node.kind === 302 /* JSDocCallbackTag */;
     }
     ts.isJSDocTypeAlias = isJSDocTypeAlias;
     function isTypeAlias(node) {
@@ -10271,7 +10492,7 @@ var ts;
     ts.hasRestParameter = hasRestParameter;
     function isRestParameter(node) {
         var type = ts.isJSDocParameterTag(node) ? (node.typeExpression && node.typeExpression.type) : node.type;
-        return node.dotDotDotToken !== undefined || !!type && type.kind === 290 /* JSDocVariadicType */;
+        return node.dotDotDotToken !== undefined || !!type && type.kind === 295 /* JSDocVariadicType */;
     }
     ts.isRestParameter = isRestParameter;
     var AssignmentKind;
@@ -10509,14 +10730,15 @@ var ts;
     }
     ts.exportAssignmentIsAlias = exportAssignmentIsAlias;
     function getEffectiveBaseTypeNode(node) {
-        if (isInJSFile(node)) {
+        var baseType = getClassExtendsHeritageElement(node);
+        if (baseType && isInJSFile(node)) {
             // Prefer an @augments tag because it may have type parameters.
             var tag = ts.getJSDocAugmentsTag(node);
             if (tag) {
                 return tag.class;
             }
         }
-        return getClassExtendsHeritageElement(node);
+        return baseType;
     }
     ts.getEffectiveBaseTypeNode = getEffectiveBaseTypeNode;
     function getClassExtendsHeritageElement(node) {
@@ -10755,7 +10977,7 @@ var ts;
             || kind === 158 /* GetAccessor */
             || kind === 159 /* SetAccessor */
             || kind === 244 /* ModuleDeclaration */
-            || kind === 279 /* SourceFile */;
+            || kind === 284 /* SourceFile */;
     }
     ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
     function nodeIsSynthesized(range) {
@@ -10832,7 +11054,7 @@ var ts;
     ts.getOperator = getOperator;
     function getOperatorPrecedence(nodeKind, operatorKind, hasArguments) {
         switch (nodeKind) {
-            case 309 /* CommaListExpression */:
+            case 314 /* CommaListExpression */:
                 return 0;
             case 208 /* SpreadElement */:
                 return 1;
@@ -11150,6 +11372,9 @@ var ts;
                 lineStart = true;
             }
         }
+        function getTextPosWithWriteLine() {
+            return lineStart ? output.length : (output.length + newLine.length);
+        }
         reset();
         return {
             write: write,
@@ -11178,7 +11403,8 @@ var ts;
             writeStringLiteral: write,
             writeSymbol: function (s, _) { return write(s); },
             writeTrailingSemicolon: write,
-            writeComment: write
+            writeComment: write,
+            getTextPosWithWriteLine: getTextPosWithWriteLine
         };
     }
     ts.createTextWriter = createTextWriter;
@@ -11307,23 +11533,27 @@ var ts;
     function getSourceFilesToEmit(host, targetSourceFile) {
         var options = host.getCompilerOptions();
         var isSourceFileFromExternalLibrary = function (file) { return host.isSourceFileFromExternalLibrary(file); };
+        var getResolvedProjectReferenceToRedirect = function (fileName) { return host.getResolvedProjectReferenceToRedirect(fileName); };
         if (options.outFile || options.out) {
             var moduleKind = ts.getEmitModuleKind(options);
             var moduleEmitEnabled_1 = options.emitDeclarationOnly || moduleKind === ts.ModuleKind.AMD || moduleKind === ts.ModuleKind.System;
             // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
             return ts.filter(host.getSourceFiles(), function (sourceFile) {
-                return (moduleEmitEnabled_1 || !ts.isExternalModule(sourceFile)) && sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary);
+                return (moduleEmitEnabled_1 || !ts.isExternalModule(sourceFile)) && sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect);
             });
         }
         else {
             var sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
-            return ts.filter(sourceFiles, function (sourceFile) { return sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary); });
+            return ts.filter(sourceFiles, function (sourceFile) { return sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect); });
         }
     }
     ts.getSourceFilesToEmit = getSourceFilesToEmit;
     /** Don't call this for `--outFile`, just for `--outDir` or plain emit. `--outFile` needs additional checks. */
-    function sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary) {
-        return !(options.noEmitForJsFiles && isSourceFileJS(sourceFile)) && !sourceFile.isDeclarationFile && !isSourceFileFromExternalLibrary(sourceFile);
+    function sourceFileMayBeEmitted(sourceFile, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect) {
+        return !(options.noEmitForJsFiles && isSourceFileJS(sourceFile)) &&
+            !sourceFile.isDeclarationFile &&
+            !isSourceFileFromExternalLibrary(sourceFile) &&
+            !(isJsonSourceFile(sourceFile) && getResolvedProjectReferenceToRedirect(sourceFile.fileName));
     }
     ts.sourceFileMayBeEmitted = sourceFileMayBeEmitted;
     function getSourceFilePathInNewDir(fileName, host, newDirPath) {
@@ -11469,7 +11699,7 @@ var ts;
     ts.getJSDocTypeParameterDeclarations = getJSDocTypeParameterDeclarations;
     /** template tags are only available when a typedef isn't already using them */
     function isNonTypeAliasTemplate(tag) {
-        return ts.isJSDocTemplateTag(tag) && !(tag.parent.kind === 291 /* JSDocComment */ && tag.parent.tags.some(isJSDocTypeAlias));
+        return ts.isJSDocTemplateTag(tag) && !(tag.parent.kind === 296 /* JSDocComment */ && tag.parent.tags.some(isJSDocTypeAlias));
     }
     /**
      * Gets the effective type annotation of the value parameter of a set accessor. If the node
@@ -12374,7 +12604,7 @@ var ts;
     }
     ts.getClassLikeDeclarationOfSymbol = getClassLikeDeclarationOfSymbol;
     function getObjectFlags(type) {
-        return type.flags & 524288 /* Object */ ? type.objectFlags : 0;
+        return type.flags & 3768320 /* ObjectFlagsType */ ? type.objectFlags : 0;
     }
     ts.getObjectFlags = getObjectFlags;
     function typeHasCallOrConstructSignatures(type, checker) {
@@ -12441,25 +12671,37 @@ var ts;
             || kind === 96 /* NullKeyword */
             || kind === 132 /* NeverKeyword */
             || kind === 211 /* ExpressionWithTypeArguments */
-            || kind === 284 /* JSDocAllType */
-            || kind === 285 /* JSDocUnknownType */
-            || kind === 286 /* JSDocNullableType */
-            || kind === 287 /* JSDocNonNullableType */
-            || kind === 288 /* JSDocOptionalType */
-            || kind === 289 /* JSDocFunctionType */
-            || kind === 290 /* JSDocVariadicType */;
+            || kind === 289 /* JSDocAllType */
+            || kind === 290 /* JSDocUnknownType */
+            || kind === 291 /* JSDocNullableType */
+            || kind === 292 /* JSDocNonNullableType */
+            || kind === 293 /* JSDocOptionalType */
+            || kind === 294 /* JSDocFunctionType */
+            || kind === 295 /* JSDocVariadicType */;
     }
     ts.isTypeNodeKind = isTypeNodeKind;
     function isAccessExpression(node) {
         return node.kind === 189 /* PropertyAccessExpression */ || node.kind === 190 /* ElementAccessExpression */;
     }
     ts.isAccessExpression = isAccessExpression;
+    function isBundleFileTextLike(section) {
+        switch (section.kind) {
+            case "text" /* Text */:
+            case "internal" /* Internal */:
+                return true;
+            default:
+                return false;
+        }
+    }
+    ts.isBundleFileTextLike = isBundleFileTextLike;
 })(ts || (ts = {}));
 (function (ts) {
     function getDefaultLibFileName(options) {
         switch (options.target) {
-            case 6 /* ESNext */:
+            case 7 /* ESNext */:
                 return "lib.esnext.full.d.ts";
+            case 6 /* ES2019 */:
+                return "lib.es2019.full.d.ts";
             case 5 /* ES2018 */:
                 return "lib.es2018.full.d.ts";
             case 4 /* ES2017 */:
@@ -12913,8 +13155,8 @@ var ts;
         switch (declaration.kind) {
             case 72 /* Identifier */:
                 return declaration;
-            case 305 /* JSDocPropertyTag */:
-            case 299 /* JSDocParameterTag */: {
+            case 310 /* JSDocPropertyTag */:
+            case 304 /* JSDocParameterTag */: {
                 var name = declaration.name;
                 if (name.kind === 148 /* QualifiedName */) {
                     return name.right;
@@ -12938,7 +13180,7 @@ var ts;
                         return undefined;
                 }
             }
-            case 304 /* JSDocTypedefTag */:
+            case 309 /* JSDocTypedefTag */:
                 return getNameOfJSDocTypedef(declaration);
             case 254 /* ExportAssignment */: {
                 var expression = declaration.expression;
@@ -13142,7 +13384,7 @@ var ts;
             return ts.emptyArray;
         }
         if (ts.isJSDocTypeAlias(node)) {
-            ts.Debug.assert(node.parent.kind === 291 /* JSDocComment */);
+            ts.Debug.assert(node.parent.kind === 296 /* JSDocComment */);
             return ts.flatMap(node.parent.tags, function (tag) { return ts.isJSDocTemplateTag(tag) ? tag.typeParameters : undefined; });
         }
         if (node.typeParameters) {
@@ -13404,12 +13646,17 @@ var ts;
         return node.kind === 194 /* TypeAssertionExpression */;
     }
     ts.isTypeAssertion = isTypeAssertion;
+    function isConstTypeReference(node) {
+        return isTypeReferenceNode(node) && isIdentifier(node.typeName) &&
+            node.typeName.escapedText === "const" && !node.typeArguments;
+    }
+    ts.isConstTypeReference = isConstTypeReference;
     function isParenthesizedExpression(node) {
         return node.kind === 195 /* ParenthesizedExpression */;
     }
     ts.isParenthesizedExpression = isParenthesizedExpression;
     function skipPartiallyEmittedExpressions(node) {
-        while (node.kind === 308 /* PartiallyEmittedExpression */) {
+        while (node.kind === 313 /* PartiallyEmittedExpression */) {
             node = node.expression;
         }
         return node;
@@ -13756,108 +14003,128 @@ var ts;
     ts.isEnumMember = isEnumMember;
     // Top-level nodes
     function isSourceFile(node) {
-        return node.kind === 279 /* SourceFile */;
+        return node.kind === 284 /* SourceFile */;
     }
     ts.isSourceFile = isSourceFile;
     function isBundle(node) {
-        return node.kind === 280 /* Bundle */;
+        return node.kind === 285 /* Bundle */;
     }
     ts.isBundle = isBundle;
     function isUnparsedSource(node) {
-        return node.kind === 281 /* UnparsedSource */;
+        return node.kind === 286 /* UnparsedSource */;
     }
     ts.isUnparsedSource = isUnparsedSource;
+    function isUnparsedPrepend(node) {
+        return node.kind === 280 /* UnparsedPrepend */;
+    }
+    ts.isUnparsedPrepend = isUnparsedPrepend;
+    function isUnparsedTextLike(node) {
+        switch (node.kind) {
+            case 281 /* UnparsedText */:
+            case 282 /* UnparsedInternalText */:
+                return true;
+            default:
+                return false;
+        }
+    }
+    ts.isUnparsedTextLike = isUnparsedTextLike;
+    function isUnparsedNode(node) {
+        return isUnparsedTextLike(node) ||
+            node.kind === 279 /* UnparsedPrologue */ ||
+            node.kind === 283 /* UnparsedSyntheticReference */;
+    }
+    ts.isUnparsedNode = isUnparsedNode;
     // JSDoc
     function isJSDocTypeExpression(node) {
-        return node.kind === 283 /* JSDocTypeExpression */;
+        return node.kind === 288 /* JSDocTypeExpression */;
     }
     ts.isJSDocTypeExpression = isJSDocTypeExpression;
     function isJSDocAllType(node) {
-        return node.kind === 284 /* JSDocAllType */;
+        return node.kind === 289 /* JSDocAllType */;
     }
     ts.isJSDocAllType = isJSDocAllType;
     function isJSDocUnknownType(node) {
-        return node.kind === 285 /* JSDocUnknownType */;
+        return node.kind === 290 /* JSDocUnknownType */;
     }
     ts.isJSDocUnknownType = isJSDocUnknownType;
     function isJSDocNullableType(node) {
-        return node.kind === 286 /* JSDocNullableType */;
+        return node.kind === 291 /* JSDocNullableType */;
     }
     ts.isJSDocNullableType = isJSDocNullableType;
     function isJSDocNonNullableType(node) {
-        return node.kind === 287 /* JSDocNonNullableType */;
+        return node.kind === 292 /* JSDocNonNullableType */;
     }
     ts.isJSDocNonNullableType = isJSDocNonNullableType;
     function isJSDocOptionalType(node) {
-        return node.kind === 288 /* JSDocOptionalType */;
+        return node.kind === 293 /* JSDocOptionalType */;
     }
     ts.isJSDocOptionalType = isJSDocOptionalType;
     function isJSDocFunctionType(node) {
-        return node.kind === 289 /* JSDocFunctionType */;
+        return node.kind === 294 /* JSDocFunctionType */;
     }
     ts.isJSDocFunctionType = isJSDocFunctionType;
     function isJSDocVariadicType(node) {
-        return node.kind === 290 /* JSDocVariadicType */;
+        return node.kind === 295 /* JSDocVariadicType */;
     }
     ts.isJSDocVariadicType = isJSDocVariadicType;
     function isJSDoc(node) {
-        return node.kind === 291 /* JSDocComment */;
+        return node.kind === 296 /* JSDocComment */;
     }
     ts.isJSDoc = isJSDoc;
     function isJSDocAugmentsTag(node) {
-        return node.kind === 295 /* JSDocAugmentsTag */;
+        return node.kind === 300 /* JSDocAugmentsTag */;
     }
     ts.isJSDocAugmentsTag = isJSDocAugmentsTag;
     function isJSDocClassTag(node) {
-        return node.kind === 296 /* JSDocClassTag */;
+        return node.kind === 301 /* JSDocClassTag */;
     }
     ts.isJSDocClassTag = isJSDocClassTag;
     function isJSDocEnumTag(node) {
-        return node.kind === 298 /* JSDocEnumTag */;
+        return node.kind === 303 /* JSDocEnumTag */;
     }
     ts.isJSDocEnumTag = isJSDocEnumTag;
     function isJSDocThisTag(node) {
-        return node.kind === 301 /* JSDocThisTag */;
+        return node.kind === 306 /* JSDocThisTag */;
     }
     ts.isJSDocThisTag = isJSDocThisTag;
     function isJSDocParameterTag(node) {
-        return node.kind === 299 /* JSDocParameterTag */;
+        return node.kind === 304 /* JSDocParameterTag */;
     }
     ts.isJSDocParameterTag = isJSDocParameterTag;
     function isJSDocReturnTag(node) {
-        return node.kind === 300 /* JSDocReturnTag */;
+        return node.kind === 305 /* JSDocReturnTag */;
     }
     ts.isJSDocReturnTag = isJSDocReturnTag;
     function isJSDocTypeTag(node) {
-        return node.kind === 302 /* JSDocTypeTag */;
+        return node.kind === 307 /* JSDocTypeTag */;
     }
     ts.isJSDocTypeTag = isJSDocTypeTag;
     function isJSDocTemplateTag(node) {
-        return node.kind === 303 /* JSDocTemplateTag */;
+        return node.kind === 308 /* JSDocTemplateTag */;
     }
     ts.isJSDocTemplateTag = isJSDocTemplateTag;
     function isJSDocTypedefTag(node) {
-        return node.kind === 304 /* JSDocTypedefTag */;
+        return node.kind === 309 /* JSDocTypedefTag */;
     }
     ts.isJSDocTypedefTag = isJSDocTypedefTag;
     function isJSDocPropertyTag(node) {
-        return node.kind === 305 /* JSDocPropertyTag */;
+        return node.kind === 310 /* JSDocPropertyTag */;
     }
     ts.isJSDocPropertyTag = isJSDocPropertyTag;
     function isJSDocPropertyLikeTag(node) {
-        return node.kind === 305 /* JSDocPropertyTag */ || node.kind === 299 /* JSDocParameterTag */;
+        return node.kind === 310 /* JSDocPropertyTag */ || node.kind === 304 /* JSDocParameterTag */;
     }
     ts.isJSDocPropertyLikeTag = isJSDocPropertyLikeTag;
     function isJSDocTypeLiteral(node) {
-        return node.kind === 292 /* JSDocTypeLiteral */;
+        return node.kind === 297 /* JSDocTypeLiteral */;
     }
     ts.isJSDocTypeLiteral = isJSDocTypeLiteral;
     function isJSDocCallbackTag(node) {
-        return node.kind === 297 /* JSDocCallbackTag */;
+        return node.kind === 302 /* JSDocCallbackTag */;
     }
     ts.isJSDocCallbackTag = isJSDocCallbackTag;
     function isJSDocSignature(node) {
-        return node.kind === 293 /* JSDocSignature */;
+        return node.kind === 298 /* JSDocSignature */;
     }
     ts.isJSDocSignature = isJSDocSignature;
 })(ts || (ts = {}));
@@ -13868,7 +14135,7 @@ var ts;
 (function (ts) {
     /* @internal */
     function isSyntaxList(n) {
-        return n.kind === 306 /* SyntaxList */;
+        return n.kind === 311 /* SyntaxList */;
     }
     ts.isSyntaxList = isSyntaxList;
     /* @internal */
@@ -14020,11 +14287,11 @@ var ts;
         switch (kind) {
             case 155 /* MethodSignature */:
             case 160 /* CallSignature */:
-            case 293 /* JSDocSignature */:
+            case 298 /* JSDocSignature */:
             case 161 /* ConstructSignature */:
             case 162 /* IndexSignature */:
             case 165 /* FunctionType */:
-            case 289 /* JSDocFunctionType */:
+            case 294 /* JSDocFunctionType */:
             case 166 /* ConstructorType */:
                 return true;
             default:
@@ -14315,8 +14582,8 @@ var ts;
             case 208 /* SpreadElement */:
             case 212 /* AsExpression */:
             case 210 /* OmittedExpression */:
-            case 309 /* CommaListExpression */:
-            case 308 /* PartiallyEmittedExpression */:
+            case 314 /* CommaListExpression */:
+            case 313 /* PartiallyEmittedExpression */:
                 return true;
             default:
                 return isUnaryExpressionKind(kind);
@@ -14330,12 +14597,12 @@ var ts;
     ts.isAssertionExpression = isAssertionExpression;
     /* @internal */
     function isPartiallyEmittedExpression(node) {
-        return node.kind === 308 /* PartiallyEmittedExpression */;
+        return node.kind === 313 /* PartiallyEmittedExpression */;
     }
     ts.isPartiallyEmittedExpression = isPartiallyEmittedExpression;
     /* @internal */
     function isNotEmittedStatement(node) {
-        return node.kind === 307 /* NotEmittedStatement */;
+        return node.kind === 312 /* NotEmittedStatement */;
     }
     ts.isNotEmittedStatement = isNotEmittedStatement;
     /* @internal */
@@ -14446,9 +14713,9 @@ var ts;
             || kind === 242 /* TypeAliasDeclaration */
             || kind === 150 /* TypeParameter */
             || kind === 237 /* VariableDeclaration */
-            || kind === 304 /* JSDocTypedefTag */
-            || kind === 297 /* JSDocCallbackTag */
-            || kind === 305 /* JSDocPropertyTag */;
+            || kind === 309 /* JSDocTypedefTag */
+            || kind === 302 /* JSDocCallbackTag */
+            || kind === 310 /* JSDocPropertyTag */;
     }
     function isDeclarationStatementKind(kind) {
         return kind === 239 /* FunctionDeclaration */
@@ -14483,14 +14750,14 @@ var ts;
             || kind === 219 /* VariableStatement */
             || kind === 224 /* WhileStatement */
             || kind === 231 /* WithStatement */
-            || kind === 307 /* NotEmittedStatement */
-            || kind === 311 /* EndOfDeclarationMarker */
-            || kind === 310 /* MergeDeclarationMarker */;
+            || kind === 312 /* NotEmittedStatement */
+            || kind === 316 /* EndOfDeclarationMarker */
+            || kind === 315 /* MergeDeclarationMarker */;
     }
     /* @internal */
     function isDeclaration(node) {
         if (node.kind === 150 /* TypeParameter */) {
-            return node.parent.kind !== 303 /* JSDocTemplateTag */ || ts.isInJSFile(node);
+            return (node.parent && node.parent.kind !== 308 /* JSDocTemplateTag */) || ts.isInJSFile(node);
         }
         return isDeclarationKind(node.kind);
     }
@@ -14585,18 +14852,18 @@ var ts;
     /** True if node is of some JSDoc syntax kind. */
     /* @internal */
     function isJSDocNode(node) {
-        return node.kind >= 283 /* FirstJSDocNode */ && node.kind <= 305 /* LastJSDocNode */;
+        return node.kind >= 288 /* FirstJSDocNode */ && node.kind <= 310 /* LastJSDocNode */;
     }
     ts.isJSDocNode = isJSDocNode;
     /** True if node is of a kind that may contain comment text. */
     function isJSDocCommentContainingNode(node) {
-        return node.kind === 291 /* JSDocComment */ || isJSDocTag(node) || ts.isJSDocTypeLiteral(node) || ts.isJSDocSignature(node);
+        return node.kind === 296 /* JSDocComment */ || isJSDocTag(node) || ts.isJSDocTypeLiteral(node) || ts.isJSDocSignature(node);
     }
     ts.isJSDocCommentContainingNode = isJSDocCommentContainingNode;
     // TODO: determine what this does before making it public.
     /* @internal */
     function isJSDocTag(node) {
-        return node.kind >= 294 /* FirstJSDocTagNode */ && node.kind <= 305 /* LastJSDocTagNode */;
+        return node.kind >= 299 /* FirstJSDocTagNode */ && node.kind <= 310 /* LastJSDocTagNode */;
     }
     ts.isJSDocTag = isJSDocTag;
     function isSetAccessor(node) {
@@ -14913,6 +15180,10 @@ var ts;
         return !!(compilerOptions.declaration || compilerOptions.composite);
     }
     ts.getEmitDeclarations = getEmitDeclarations;
+    function isIncrementalCompilation(options) {
+        return !!(options.incremental || options.composite);
+    }
+    ts.isIncrementalCompilation = isIncrementalCompilation;
     function getStrictOptionValue(compilerOptions, flag) {
         return compilerOptions[flag] === undefined ? !!compilerOptions.strict : !!compilerOptions[flag];
     }
@@ -15600,7 +15871,7 @@ var ts;
     }
     ts.getRegexFromPattern = getRegexFromPattern;
     /** @param path directory of the tsconfig.json */
-    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries) {
+    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath) {
         path = ts.normalizePath(path);
         currentDirectory = ts.normalizePath(currentDirectory);
         var patterns = getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames, currentDirectory);
@@ -15610,12 +15881,18 @@ var ts;
         // Associate an array of results with each include regex. This keeps results in order of the "include" order.
         // If there are no "includes", then just put everything in results[0].
         var results = includeFileRegexes ? includeFileRegexes.map(function () { return []; }) : [[]];
+        var visited = ts.createMap();
+        var toCanonical = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
         for (var _i = 0, _a = patterns.basePaths; _i < _a.length; _i++) {
             var basePath = _a[_i];
             visitDirectory(basePath, combinePaths(currentDirectory, basePath), depth);
         }
         return ts.flatten(results);
         function visitDirectory(path, absolutePath, depth) {
+            var canonicalPath = toCanonical(realpath(absolutePath));
+            if (visited.has(canonicalPath))
+                return;
+            visited.set(canonicalPath, true);
             var _a = getFileSystemEntries(path), files = _a.files, directories = _a.directories;
             var _loop_1 = function (current) {
                 var name = combinePaths(path, current);
@@ -15998,6 +16275,19 @@ var ts;
         return arr.slice(index);
     }
     ts.sliceAfter = sliceAfter;
+    function addRelatedInfo(diagnostic) {
+        var _a;
+        var relatedInformation = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            relatedInformation[_i - 1] = arguments[_i];
+        }
+        if (!diagnostic.relatedInformation) {
+            diagnostic.relatedInformation = [];
+        }
+        (_a = diagnostic.relatedInformation).push.apply(_a, relatedInformation);
+        return diagnostic;
+    }
+    ts.addRelatedInfo = addRelatedInfo;
     function minAndMax(arr, getValue) {
         Debug.assert(arr.length !== 0);
         var min = getValue(arr[0]);
@@ -16197,7 +16487,7 @@ var ts;
     var SourceFileConstructor;
     // tslint:enable variable-name
     function createNode(kind, pos, end) {
-        if (kind === 279 /* SourceFile */) {
+        if (kind === 284 /* SourceFile */) {
             return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
         }
         else if (kind === 72 /* Identifier */) {
@@ -16448,7 +16738,7 @@ var ts;
             case 218 /* Block */:
             case 245 /* ModuleBlock */:
                 return visitNodes(cbNode, cbNodes, node.statements);
-            case 279 /* SourceFile */:
+            case 284 /* SourceFile */:
                 return visitNodes(cbNode, cbNodes, node.statements) ||
                     visitNode(cbNode, node.endOfFileToken);
             case 219 /* VariableStatement */:
@@ -16597,7 +16887,7 @@ var ts;
                 return visitNode(cbNode, node.expression);
             case 258 /* MissingDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators);
-            case 309 /* CommaListExpression */:
+            case 314 /* CommaListExpression */:
                 return visitNodes(cbNode, cbNodes, node.elements);
             case 260 /* JsxElement */:
                 return visitNode(cbNode, node.openingElement) ||
@@ -16626,60 +16916,60 @@ var ts;
                 return visitNode(cbNode, node.tagName);
             case 171 /* OptionalType */:
             case 172 /* RestType */:
-            case 283 /* JSDocTypeExpression */:
-            case 287 /* JSDocNonNullableType */:
-            case 286 /* JSDocNullableType */:
-            case 288 /* JSDocOptionalType */:
-            case 290 /* JSDocVariadicType */:
+            case 288 /* JSDocTypeExpression */:
+            case 292 /* JSDocNonNullableType */:
+            case 291 /* JSDocNullableType */:
+            case 293 /* JSDocOptionalType */:
+            case 295 /* JSDocVariadicType */:
                 return visitNode(cbNode, node.type);
-            case 289 /* JSDocFunctionType */:
+            case 294 /* JSDocFunctionType */:
                 return visitNodes(cbNode, cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 291 /* JSDocComment */:
+            case 296 /* JSDocComment */:
                 return visitNodes(cbNode, cbNodes, node.tags);
-            case 299 /* JSDocParameterTag */:
-            case 305 /* JSDocPropertyTag */:
+            case 304 /* JSDocParameterTag */:
+            case 310 /* JSDocPropertyTag */:
                 return visitNode(cbNode, node.tagName) ||
                     (node.isNameFirst
                         ? visitNode(cbNode, node.name) ||
                             visitNode(cbNode, node.typeExpression)
                         : visitNode(cbNode, node.typeExpression) ||
                             visitNode(cbNode, node.name));
-            case 295 /* JSDocAugmentsTag */:
+            case 300 /* JSDocAugmentsTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.class);
-            case 303 /* JSDocTemplateTag */:
+            case 308 /* JSDocTemplateTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters);
-            case 304 /* JSDocTypedefTag */:
+            case 309 /* JSDocTypedefTag */:
                 return visitNode(cbNode, node.tagName) ||
                     (node.typeExpression &&
-                        node.typeExpression.kind === 283 /* JSDocTypeExpression */
+                        node.typeExpression.kind === 288 /* JSDocTypeExpression */
                         ? visitNode(cbNode, node.typeExpression) ||
                             visitNode(cbNode, node.fullName)
                         : visitNode(cbNode, node.fullName) ||
                             visitNode(cbNode, node.typeExpression));
-            case 297 /* JSDocCallbackTag */:
+            case 302 /* JSDocCallbackTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.fullName) ||
                     visitNode(cbNode, node.typeExpression);
-            case 300 /* JSDocReturnTag */:
-            case 302 /* JSDocTypeTag */:
-            case 301 /* JSDocThisTag */:
-            case 298 /* JSDocEnumTag */:
+            case 305 /* JSDocReturnTag */:
+            case 307 /* JSDocTypeTag */:
+            case 306 /* JSDocThisTag */:
+            case 303 /* JSDocEnumTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.typeExpression);
-            case 293 /* JSDocSignature */:
+            case 298 /* JSDocSignature */:
                 return ts.forEach(node.typeParameters, cbNode) ||
                     ts.forEach(node.parameters, cbNode) ||
                     visitNode(cbNode, node.type);
-            case 292 /* JSDocTypeLiteral */:
+            case 297 /* JSDocTypeLiteral */:
                 return ts.forEach(node.jsDocPropertyTags, cbNode);
-            case 294 /* JSDocTag */:
-            case 296 /* JSDocClassTag */:
+            case 299 /* JSDocTag */:
+            case 301 /* JSDocClassTag */:
                 return visitNode(cbNode, node.tagName);
-            case 308 /* PartiallyEmittedExpression */:
+            case 313 /* PartiallyEmittedExpression */:
                 return visitNode(cbNode, node.expression);
         }
     }
@@ -16759,7 +17049,7 @@ var ts;
     (function (Parser) {
         // Share a single scanner across all calls to parse a source file.  This helps speed things
         // up by avoiding the cost of creating/compiling scanners over and over again.
-        var scanner = ts.createScanner(6 /* Latest */, /*skipTrivia*/ true);
+        var scanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ true);
         var disallowInAndDecoratorContext = 2048 /* DisallowInContext */ | 8192 /* DecoratorContext */;
         // capture constructors in 'initializeState' to avoid null checks
         // tslint:disable variable-name
@@ -17053,7 +17343,7 @@ var ts;
         function createSourceFile(fileName, languageVersion, scriptKind, isDeclarationFile) {
             // code from createNode is inlined here so createNode won't have to deal with special case of creating source files
             // this is quite rare comparing to other nodes and createNode should be as fast as possible
-            var sourceFile = new SourceFileConstructor(279 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
+            var sourceFile = new SourceFileConstructor(284 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
             nodeCount++;
             sourceFile.text = sourceText;
             sourceFile.bindDiagnostics = [];
@@ -18253,9 +18543,9 @@ var ts;
             return finishNode(node);
         }
         function parseJSDocAllType(postFixEquals) {
-            var result = createNode(284 /* JSDocAllType */);
+            var result = createNode(289 /* JSDocAllType */);
             if (postFixEquals) {
-                return createPostfixType(288 /* JSDocOptionalType */, result);
+                return createPostfixType(293 /* JSDocOptionalType */, result);
             }
             else {
                 nextToken();
@@ -18263,7 +18553,7 @@ var ts;
             return finishNode(result);
         }
         function parseJSDocNonNullableType() {
-            var result = createNode(287 /* JSDocNonNullableType */);
+            var result = createNode(292 /* JSDocNonNullableType */);
             nextToken();
             result.type = parseNonArrayType();
             return finishNode(result);
@@ -18287,18 +18577,18 @@ var ts;
                 token() === 30 /* GreaterThanToken */ ||
                 token() === 59 /* EqualsToken */ ||
                 token() === 50 /* BarToken */) {
-                var result = createNode(285 /* JSDocUnknownType */, pos);
+                var result = createNode(290 /* JSDocUnknownType */, pos);
                 return finishNode(result);
             }
             else {
-                var result = createNode(286 /* JSDocNullableType */, pos);
+                var result = createNode(291 /* JSDocNullableType */, pos);
                 result.type = parseType();
                 return finishNode(result);
             }
         }
         function parseJSDocFunctionType() {
             if (lookAhead(nextTokenIsOpenParen)) {
-                var result = createNodeWithJSDoc(289 /* JSDocFunctionType */);
+                var result = createNodeWithJSDoc(294 /* JSDocFunctionType */);
                 nextToken();
                 fillSignature(57 /* ColonToken */, 4 /* Type */ | 32 /* JSDoc */, result);
                 return finishNode(result);
@@ -18322,12 +18612,12 @@ var ts;
             var type = parseTypeOrTypePredicate();
             scanner.setInJSDocType(false);
             if (dotdotdot) {
-                var variadic = createNode(290 /* JSDocVariadicType */, dotdotdot.pos);
+                var variadic = createNode(295 /* JSDocVariadicType */, dotdotdot.pos);
                 variadic.type = type;
                 type = finishNode(variadic);
             }
             if (token() === 59 /* EqualsToken */) {
-                return createPostfixType(288 /* JSDocOptionalType */, type);
+                return createPostfixType(293 /* JSDocOptionalType */, type);
             }
             return type;
         }
@@ -18699,7 +18989,7 @@ var ts;
                 return finishNode(node);
             }
             var type = parseType();
-            if (!(contextFlags & 2097152 /* JSDoc */) && type.kind === 286 /* JSDocNullableType */ && type.pos === type.type.pos) {
+            if (!(contextFlags & 2097152 /* JSDoc */) && type.kind === 291 /* JSDocNullableType */ && type.pos === type.type.pos) {
                 type.kind = 171 /* OptionalType */;
             }
             return type;
@@ -18837,6 +19127,7 @@ var ts;
                 case 135 /* NumberKeyword */:
                 case 146 /* BigIntKeyword */:
                 case 123 /* BooleanKeyword */:
+                case 133 /* ReadonlyKeyword */:
                 case 139 /* SymbolKeyword */:
                 case 142 /* UniqueKeyword */:
                 case 106 /* VoidKeyword */:
@@ -18885,14 +19176,14 @@ var ts;
             while (!scanner.hasPrecedingLineBreak()) {
                 switch (token()) {
                     case 52 /* ExclamationToken */:
-                        type = createPostfixType(287 /* JSDocNonNullableType */, type);
+                        type = createPostfixType(292 /* JSDocNonNullableType */, type);
                         break;
                     case 56 /* QuestionToken */:
                         // If not in JSDoc and next token is start of a type we have a conditional type
                         if (!(contextFlags & 2097152 /* JSDoc */) && lookAhead(nextTokenIsStartOfType)) {
                             return type;
                         }
-                        type = createPostfixType(286 /* JSDocNullableType */, type);
+                        type = createPostfixType(291 /* JSDocNullableType */, type);
                         break;
                     case 22 /* OpenBracketToken */:
                         parseExpected(22 /* OpenBracketToken */);
@@ -18942,6 +19233,7 @@ var ts;
             switch (operator) {
                 case 129 /* KeyOfKeyword */:
                 case 142 /* UniqueKeyword */:
+                case 133 /* ReadonlyKeyword */:
                     return parseTypeOperator(operator);
                 case 127 /* InferKeyword */:
                     return parseInferType();
@@ -20001,7 +20293,8 @@ var ts;
         }
         function parseJsxText() {
             var node = createNode(11 /* JsxText */);
-            node.containsOnlyWhiteSpaces = currentToken === 12 /* JsxTextAllWhiteSpaces */;
+            node.text = scanner.getTokenValue();
+            node.containsOnlyTriviaWhiteSpaces = currentToken === 12 /* JsxTextAllWhiteSpaces */;
             currentToken = scanner.scanJsxToken();
             return finishNode(node);
         }
@@ -21816,8 +22109,8 @@ var ts;
         var JSDocParser;
         (function (JSDocParser) {
             function parseJSDocTypeExpressionForTests(content, start, length) {
-                initializeState(content, 6 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
-                sourceFile = createSourceFile("file.js", 6 /* Latest */, 1 /* JS */, /*isDeclarationFile*/ false);
+                initializeState(content, 7 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
+                sourceFile = createSourceFile("file.js", 7 /* Latest */, 1 /* JS */, /*isDeclarationFile*/ false);
                 scanner.setText(content, start, length);
                 currentToken = scanner.scan();
                 var jsDocTypeExpression = parseJSDocTypeExpression();
@@ -21828,7 +22121,7 @@ var ts;
             JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
             // Parses out a JSDoc type expression.
             function parseJSDocTypeExpression(mayOmitBraces) {
-                var result = createNode(283 /* JSDocTypeExpression */);
+                var result = createNode(288 /* JSDocTypeExpression */);
                 var hasBrace = (mayOmitBraces ? parseOptional : parseExpected)(18 /* OpenBraceToken */);
                 result.type = doInsideOfContext(2097152 /* JSDoc */, parseJSDocType);
                 if (!mayOmitBraces || hasBrace) {
@@ -21839,7 +22132,7 @@ var ts;
             }
             JSDocParser.parseJSDocTypeExpression = parseJSDocTypeExpression;
             function parseIsolatedJSDocComment(content, start, length) {
-                initializeState(content, 6 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
+                initializeState(content, 7 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
                 sourceFile = { languageVariant: 0 /* Standard */, text: content }; // tslint:disable-line no-object-literal-type-assertion
                 var jsDoc = parseJSDocCommentWorker(start, length);
                 var diagnostics = parseDiagnostics;
@@ -21991,7 +22284,7 @@ var ts;
                     }
                 }
                 function createJSDocComment() {
-                    var result = createNode(291 /* JSDocComment */, start);
+                    var result = createNode(296 /* JSDocComment */, start);
                     result.tags = tags && createNodeArray(tags, tagsPos, tagsEnd);
                     result.comment = comments.length ? comments.join("") : undefined;
                     return finishNode(result, end);
@@ -22158,7 +22451,7 @@ var ts;
                     return comments.length === 0 ? undefined : comments.join("");
                 }
                 function parseUnknownTag(start, tagName) {
-                    var result = createNode(294 /* JSDocTag */, start);
+                    var result = createNode(299 /* JSDocTag */, start);
                     result.tagName = tagName;
                     return finishNode(result);
                 }
@@ -22217,8 +22510,8 @@ var ts;
                         typeExpression = tryParseTypeExpression();
                     }
                     var result = target === 1 /* Property */ ?
-                        createNode(305 /* JSDocPropertyTag */, start) :
-                        createNode(299 /* JSDocParameterTag */, start);
+                        createNode(310 /* JSDocPropertyTag */, start) :
+                        createNode(304 /* JSDocParameterTag */, start);
                     var comment = parseTagComments(indent + scanner.getStartPos() - start);
                     var nestedTypeLiteral = target !== 4 /* CallbackParameter */ && parseNestedTypeLiteral(typeExpression, name, target, indent);
                     if (nestedTypeLiteral) {
@@ -22235,18 +22528,18 @@ var ts;
                 }
                 function parseNestedTypeLiteral(typeExpression, name, target, indent) {
                     if (typeExpression && isObjectOrObjectArrayTypeReference(typeExpression.type)) {
-                        var typeLiteralExpression = createNode(283 /* JSDocTypeExpression */, scanner.getTokenPos());
+                        var typeLiteralExpression = createNode(288 /* JSDocTypeExpression */, scanner.getTokenPos());
                         var child = void 0;
                         var jsdocTypeLiteral = void 0;
                         var start_2 = scanner.getStartPos();
                         var children = void 0;
                         while (child = tryParse(function () { return parseChildParameterOrPropertyTag(target, indent, name); })) {
-                            if (child.kind === 299 /* JSDocParameterTag */ || child.kind === 305 /* JSDocPropertyTag */) {
+                            if (child.kind === 304 /* JSDocParameterTag */ || child.kind === 310 /* JSDocPropertyTag */) {
                                 children = ts.append(children, child);
                             }
                         }
                         if (children) {
-                            jsdocTypeLiteral = createNode(292 /* JSDocTypeLiteral */, start_2);
+                            jsdocTypeLiteral = createNode(297 /* JSDocTypeLiteral */, start_2);
                             jsdocTypeLiteral.jsDocPropertyTags = children;
                             if (typeExpression.type.kind === 169 /* ArrayType */) {
                                 jsdocTypeLiteral.isArrayType = true;
@@ -22257,25 +22550,25 @@ var ts;
                     }
                 }
                 function parseReturnTag(start, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 300 /* JSDocReturnTag */; })) {
+                    if (ts.forEach(tags, function (t) { return t.kind === 305 /* JSDocReturnTag */; })) {
                         parseErrorAt(tagName.pos, scanner.getTokenPos(), ts.Diagnostics._0_tag_already_specified, tagName.escapedText);
                     }
-                    var result = createNode(300 /* JSDocReturnTag */, start);
+                    var result = createNode(305 /* JSDocReturnTag */, start);
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
                     return finishNode(result);
                 }
                 function parseTypeTag(start, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 302 /* JSDocTypeTag */; })) {
+                    if (ts.forEach(tags, function (t) { return t.kind === 307 /* JSDocTypeTag */; })) {
                         parseErrorAt(tagName.pos, scanner.getTokenPos(), ts.Diagnostics._0_tag_already_specified, tagName.escapedText);
                     }
-                    var result = createNode(302 /* JSDocTypeTag */, start);
+                    var result = createNode(307 /* JSDocTypeTag */, start);
                     result.tagName = tagName;
                     result.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
                     return finishNode(result);
                 }
                 function parseAugmentsTag(start, tagName) {
-                    var result = createNode(295 /* JSDocAugmentsTag */, start);
+                    var result = createNode(300 /* JSDocAugmentsTag */, start);
                     result.tagName = tagName;
                     result.class = parseExpressionWithTypeArgumentsForAugments();
                     return finishNode(result);
@@ -22302,19 +22595,19 @@ var ts;
                     return node;
                 }
                 function parseClassTag(start, tagName) {
-                    var tag = createNode(296 /* JSDocClassTag */, start);
+                    var tag = createNode(301 /* JSDocClassTag */, start);
                     tag.tagName = tagName;
                     return finishNode(tag);
                 }
                 function parseThisTag(start, tagName) {
-                    var tag = createNode(301 /* JSDocThisTag */, start);
+                    var tag = createNode(306 /* JSDocThisTag */, start);
                     tag.tagName = tagName;
                     tag.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
                     skipWhitespace();
                     return finishNode(tag);
                 }
                 function parseEnumTag(start, tagName) {
-                    var tag = createNode(298 /* JSDocEnumTag */, start);
+                    var tag = createNode(303 /* JSDocEnumTag */, start);
                     tag.tagName = tagName;
                     tag.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
                     skipWhitespace();
@@ -22323,7 +22616,7 @@ var ts;
                 function parseTypedefTag(start, tagName, indent) {
                     var typeExpression = tryParseTypeExpression();
                     skipWhitespaceOrAsterisk();
-                    var typedefTag = createNode(304 /* JSDocTypedefTag */, start);
+                    var typedefTag = createNode(309 /* JSDocTypedefTag */, start);
                     typedefTag.tagName = tagName;
                     typedefTag.fullName = parseJSDocTypeNameWithNamespace();
                     typedefTag.name = getJSDocTypeAliasName(typedefTag.fullName);
@@ -22337,9 +22630,9 @@ var ts;
                         var childTypeTag = void 0;
                         while (child = tryParse(function () { return parseChildPropertyTag(indent); })) {
                             if (!jsdocTypeLiteral) {
-                                jsdocTypeLiteral = createNode(292 /* JSDocTypeLiteral */, start);
+                                jsdocTypeLiteral = createNode(297 /* JSDocTypeLiteral */, start);
                             }
-                            if (child.kind === 302 /* JSDocTypeTag */) {
+                            if (child.kind === 307 /* JSDocTypeTag */) {
                                 if (childTypeTag) {
                                     break;
                                 }
@@ -22385,14 +22678,14 @@ var ts;
                     return typeNameOrNamespaceName;
                 }
                 function parseCallbackTag(start, tagName, indent) {
-                    var callbackTag = createNode(297 /* JSDocCallbackTag */, start);
+                    var callbackTag = createNode(302 /* JSDocCallbackTag */, start);
                     callbackTag.tagName = tagName;
                     callbackTag.fullName = parseJSDocTypeNameWithNamespace();
                     callbackTag.name = getJSDocTypeAliasName(callbackTag.fullName);
                     skipWhitespace();
                     callbackTag.comment = parseTagComments(indent);
                     var child;
-                    var jsdocSignature = createNode(293 /* JSDocSignature */, start);
+                    var jsdocSignature = createNode(298 /* JSDocSignature */, start);
                     jsdocSignature.parameters = [];
                     while (child = tryParse(function () { return parseChildParameterOrPropertyTag(4 /* CallbackParameter */, indent); })) {
                         jsdocSignature.parameters = ts.append(jsdocSignature.parameters, child);
@@ -22400,7 +22693,7 @@ var ts;
                     var returnTag = tryParse(function () {
                         if (parseOptionalJsdoc(58 /* AtToken */)) {
                             var tag = parseTag(indent);
-                            if (tag && tag.kind === 300 /* JSDocReturnTag */) {
+                            if (tag && tag.kind === 305 /* JSDocReturnTag */) {
                                 return tag;
                             }
                         }
@@ -22445,7 +22738,7 @@ var ts;
                             case 58 /* AtToken */:
                                 if (canParseTag) {
                                     var child = tryParseChildTag(target, indent);
-                                    if (child && (child.kind === 299 /* JSDocParameterTag */ || child.kind === 305 /* JSDocPropertyTag */) &&
+                                    if (child && (child.kind === 304 /* JSDocParameterTag */ || child.kind === 310 /* JSDocPropertyTag */) &&
                                         target !== 4 /* CallbackParameter */ &&
                                         name && (ts.isIdentifier(child.name) || !escapedTextsEqual(name, child.name.left))) {
                                         return false;
@@ -22515,7 +22808,7 @@ var ts;
                         skipWhitespace();
                         typeParameters.push(typeParameter);
                     } while (parseOptionalJsdoc(27 /* CommaToken */));
-                    var result = createNode(303 /* JSDocTemplateTag */, start);
+                    var result = createNode(308 /* JSDocTemplateTag */, start);
                     result.tagName = tagName;
                     result.constraint = constraint;
                     result.typeParameters = createNodeArray(typeParameters, typeParametersPos);
@@ -23293,6 +23586,7 @@ var ts;
         ["es2016", "lib.es2016.d.ts"],
         ["es2017", "lib.es2017.d.ts"],
         ["es2018", "lib.es2018.d.ts"],
+        ["es2019", "lib.es2019.d.ts"],
         ["esnext", "lib.esnext.d.ts"],
         // Host only
         ["dom", "lib.dom.d.ts"],
@@ -23316,12 +23610,16 @@ var ts;
         ["es2017.string", "lib.es2017.string.d.ts"],
         ["es2017.intl", "lib.es2017.intl.d.ts"],
         ["es2017.typedarrays", "lib.es2017.typedarrays.d.ts"],
+        ["es2018.asynciterable", "lib.es2018.asynciterable.d.ts"],
         ["es2018.intl", "lib.es2018.intl.d.ts"],
         ["es2018.promise", "lib.es2018.promise.d.ts"],
         ["es2018.regexp", "lib.es2018.regexp.d.ts"],
-        ["esnext.array", "lib.esnext.array.d.ts"],
-        ["esnext.symbol", "lib.esnext.symbol.d.ts"],
-        ["esnext.asynciterable", "lib.esnext.asynciterable.d.ts"],
+        ["es2019.array", "lib.es2019.array.d.ts"],
+        ["es2019.string", "lib.es2019.string.d.ts"],
+        ["es2019.symbol", "lib.es2019.symbol.d.ts"],
+        ["esnext.array", "lib.es2019.array.d.ts"],
+        ["esnext.symbol", "lib.es2019.symbol.d.ts"],
+        ["esnext.asynciterable", "lib.es2018.asynciterable.d.ts"],
         ["esnext.intl", "lib.esnext.intl.d.ts"],
         ["esnext.bigint", "lib.esnext.bigint.d.ts"]
     ];
@@ -23467,14 +23765,15 @@ var ts;
                 es2016: 3 /* ES2016 */,
                 es2017: 4 /* ES2017 */,
                 es2018: 5 /* ES2018 */,
-                esnext: 6 /* ESNext */,
+                es2019: 6 /* ES2019 */,
+                esnext: 7 /* ESNext */,
             }),
             affectsSourceFile: true,
             affectsModuleResolution: true,
             paramType: ts.Diagnostics.VERSION,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
-            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_ES2018_or_ESNEXT,
+            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_ES2018_ES2019_or_ESNEXT,
         },
         {
             name: "module",
@@ -23595,6 +23894,22 @@ var ts;
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Enable_project_compilation,
         },
+        {
+            name: "incremental",
+            type: "boolean",
+            isTSConfigOnly: true,
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Enable_incremental_compilation,
+        },
+        {
+            name: "tsBuildInfoFile",
+            type: "string",
+            isFilePath: true,
+            paramType: ts.Diagnostics.FILE,
+            isTSConfigOnly: true,
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Specify_file_to_store_incremental_compilation_information,
+        },
         {
             name: "removeComments",
             type: "boolean",
@@ -25021,7 +25336,7 @@ var ts;
     }
     function directoryOfCombinedPath(fileName, basePath) {
         // Use the `getNormalizedAbsolutePath` function to avoid canonicalizing the path, as it must remain noncanonical
-        // until consistient casing errors are reported
+        // until consistent casing errors are reported
         return ts.getDirectoryPath(ts.getNormalizedAbsolutePath(fileName, basePath));
     }
     /**
@@ -27313,7 +27628,7 @@ var ts;
                     return "__constructor" /* Constructor */;
                 case 165 /* FunctionType */:
                 case 160 /* CallSignature */:
-                case 293 /* JSDocSignature */:
+                case 298 /* JSDocSignature */:
                     return "__call" /* Call */;
                 case 166 /* ConstructorType */:
                 case 161 /* ConstructSignature */:
@@ -27322,7 +27637,7 @@ var ts;
                     return "__index" /* Index */;
                 case 255 /* ExportDeclaration */:
                     return "__export" /* ExportStar */;
-                case 279 /* SourceFile */:
+                case 284 /* SourceFile */:
                     // json file should behave as
                     // module.exports = ...
                     return "export=" /* ExportEquals */;
@@ -27333,12 +27648,12 @@ var ts;
                     }
                     ts.Debug.fail("Unknown binary declaration kind");
                     break;
-                case 289 /* JSDocFunctionType */:
+                case 294 /* JSDocFunctionType */:
                     return (ts.isJSDocConstructSignature(node) ? "__new" /* New */ : "__call" /* Call */);
                 case 151 /* Parameter */:
                     // Parameters with names are handled at the top of this function.  Parameters
                     // without names can only come from JSDocFunctionTypes.
-                    ts.Debug.assert(node.parent.kind === 289 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
+                    ts.Debug.assert(node.parent.kind === 294 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
                     var functionType = node.parent;
                     var index = functionType.parameters.indexOf(node);
                     return "arg" + index;
@@ -27422,13 +27737,15 @@ var ts;
                             message_1 = ts.Diagnostics.Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations;
                             messageNeedsName_1 = false;
                         }
-                        if (symbol.declarations && symbol.declarations.length) {
+                        var multipleDefaultExports_1 = false;
+                        if (ts.length(symbol.declarations)) {
                             // If the current node is a default export of some sort, then check if
                             // there are any other default exports that we need to error on.
                             // We'll know whether we have other default exports depending on if `symbol` already has a declaration list set.
                             if (isDefaultExport) {
                                 message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                                 messageNeedsName_1 = false;
+                                multipleDefaultExports_1 = true;
                             }
                             else {
                                 // This is to properly report an error in the case "export default { }" is after export default of class declaration or function declaration.
@@ -27439,14 +27756,22 @@ var ts;
                                     (node.kind === 254 /* ExportAssignment */ && !node.isExportEquals)) {
                                     message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                                     messageNeedsName_1 = false;
+                                    multipleDefaultExports_1 = true;
                                 }
                             }
                         }
-                        var addError = function (decl) {
-                            file.bindDiagnostics.push(createDiagnosticForNode(ts.getNameOfDeclaration(decl) || decl, message_1, messageNeedsName_1 ? getDisplayName(decl) : undefined));
-                        };
-                        ts.forEach(symbol.declarations, addError);
-                        addError(node);
+                        var declarationName_1 = ts.getNameOfDeclaration(node) || node;
+                        var relatedInformation_1 = [];
+                        ts.forEach(symbol.declarations, function (declaration, index) {
+                            var decl = ts.getNameOfDeclaration(declaration) || declaration;
+                            var diag = createDiagnosticForNode(decl, message_1, messageNeedsName_1 ? getDisplayName(declaration) : undefined);
+                            file.bindDiagnostics.push(multipleDefaultExports_1 ? ts.addRelatedInfo(diag, createDiagnosticForNode(declarationName_1, index === 0 ? ts.Diagnostics.Another_export_default_is_here : ts.Diagnostics.and_here)) : diag);
+                            if (multipleDefaultExports_1) {
+                                relatedInformation_1.push(createDiagnosticForNode(decl, ts.Diagnostics.The_first_export_default_is_here));
+                            }
+                        });
+                        var diag = createDiagnosticForNode(declarationName_1, message_1, messageNeedsName_1 ? getDisplayName(node) : undefined);
+                        file.bindDiagnostics.push(multipleDefaultExports_1 ? ts.addRelatedInfo.apply(void 0, [diag].concat(relatedInformation_1)) : diag);
                         symbol = createSymbol(0 /* None */, name);
                     }
                 }
@@ -27562,7 +27887,7 @@ var ts;
                     }
                 }
                 // We create a return control flow graph for IIFEs and constructors. For constructors
-                // we use the return control flow graph in strict property intialization checks.
+                // we use the return control flow graph in strict property initialization checks.
                 currentReturnTarget = isIIFE || node.kind === 157 /* Constructor */ ? createBranchLabel() : undefined;
                 currentBreakTarget = undefined;
                 currentContinueTarget = undefined;
@@ -27577,7 +27902,7 @@ var ts;
                     if (hasExplicitReturn)
                         node.flags |= 256 /* HasExplicitReturn */;
                 }
-                if (node.kind === 279 /* SourceFile */) {
+                if (node.kind === 284 /* SourceFile */) {
                     node.flags |= emitFlags;
                 }
                 if (currentReturnTarget) {
@@ -27721,12 +28046,12 @@ var ts;
                 case 191 /* CallExpression */:
                     bindCallExpressionFlow(node);
                     break;
-                case 304 /* JSDocTypedefTag */:
-                case 297 /* JSDocCallbackTag */:
+                case 309 /* JSDocTypedefTag */:
+                case 302 /* JSDocCallbackTag */:
                     bindJSDocTypeAlias(node);
                     break;
                 // In source files and blocks, bind functions first to match hoisting that occurs at runtime
-                case 279 /* SourceFile */: {
+                case 284 /* SourceFile */: {
                     bindEachFunctionsFirst(node.statements);
                     bind(node.endOfFileToken);
                     break;
@@ -28413,7 +28738,7 @@ var ts;
                 case 243 /* EnumDeclaration */:
                 case 188 /* ObjectLiteralExpression */:
                 case 168 /* TypeLiteral */:
-                case 292 /* JSDocTypeLiteral */:
+                case 297 /* JSDocTypeLiteral */:
                 case 268 /* JsxAttributes */:
                     return 1 /* IsContainer */;
                 case 241 /* InterfaceDeclaration */:
@@ -28422,7 +28747,7 @@ var ts;
                 case 242 /* TypeAliasDeclaration */:
                 case 181 /* MappedType */:
                     return 1 /* IsContainer */ | 32 /* HasLocals */;
-                case 279 /* SourceFile */:
+                case 284 /* SourceFile */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */;
                 case 156 /* MethodDeclaration */:
                     if (ts.isObjectLiteralOrClassExpressionMethod(node)) {
@@ -28435,8 +28760,8 @@ var ts;
                 case 158 /* GetAccessor */:
                 case 159 /* SetAccessor */:
                 case 160 /* CallSignature */:
-                case 293 /* JSDocSignature */:
-                case 289 /* JSDocFunctionType */:
+                case 298 /* JSDocSignature */:
+                case 294 /* JSDocFunctionType */:
                 case 165 /* FunctionType */:
                 case 161 /* ConstructSignature */:
                 case 162 /* IndexSignature */:
@@ -28490,7 +28815,7 @@ var ts;
                 // handlers to take care of declaring these child members.
                 case 244 /* ModuleDeclaration */:
                     return declareModuleMember(node, symbolFlags, symbolExcludes);
-                case 279 /* SourceFile */:
+                case 284 /* SourceFile */:
                     return declareSourceFileMember(node, symbolFlags, symbolExcludes);
                 case 209 /* ClassExpression */:
                 case 240 /* ClassDeclaration */:
@@ -28498,7 +28823,7 @@ var ts;
                 case 243 /* EnumDeclaration */:
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
                 case 168 /* TypeLiteral */:
-                case 292 /* JSDocTypeLiteral */:
+                case 297 /* JSDocTypeLiteral */:
                 case 188 /* ObjectLiteralExpression */:
                 case 241 /* InterfaceDeclaration */:
                 case 268 /* JsxAttributes */:
@@ -28512,7 +28837,7 @@ var ts;
                 case 166 /* ConstructorType */:
                 case 160 /* CallSignature */:
                 case 161 /* ConstructSignature */:
-                case 293 /* JSDocSignature */:
+                case 298 /* JSDocSignature */:
                 case 162 /* IndexSignature */:
                 case 156 /* MethodDeclaration */:
                 case 155 /* MethodSignature */:
@@ -28522,9 +28847,9 @@ var ts;
                 case 239 /* FunctionDeclaration */:
                 case 196 /* FunctionExpression */:
                 case 197 /* ArrowFunction */:
-                case 289 /* JSDocFunctionType */:
-                case 304 /* JSDocTypedefTag */:
-                case 297 /* JSDocCallbackTag */:
+                case 294 /* JSDocFunctionType */:
+                case 309 /* JSDocTypedefTag */:
+                case 302 /* JSDocCallbackTag */:
                 case 242 /* TypeAliasDeclaration */:
                 case 181 /* MappedType */:
                     // All the children of these container types are never visible through another
@@ -28547,8 +28872,8 @@ var ts;
                 : declareSymbol(file.locals, /*parent*/ undefined, node, symbolFlags, symbolExcludes);
         }
         function hasExportDeclarations(node) {
-            var body = node.kind === 279 /* SourceFile */ ? node : node.body;
-            if (body && (body.kind === 279 /* SourceFile */ || body.kind === 245 /* ModuleBlock */)) {
+            var body = node.kind === 284 /* SourceFile */ ? node : node.body;
+            if (body && (body.kind === 284 /* SourceFile */ || body.kind === 245 /* ModuleBlock */)) {
                 for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
                     var stat = _a[_i];
                     if (stat.kind === 255 /* ExportDeclaration */ || stat.kind === 254 /* ExportAssignment */) {
@@ -28682,7 +29007,7 @@ var ts;
                 case 244 /* ModuleDeclaration */:
                     declareModuleMember(node, symbolFlags, symbolExcludes);
                     break;
-                case 279 /* SourceFile */:
+                case 284 /* SourceFile */:
                     if (ts.isExternalOrCommonJsModule(container)) {
                         declareModuleMember(node, symbolFlags, symbolExcludes);
                         break;
@@ -28820,7 +29145,7 @@ var ts;
         function checkStrictModeFunctionDeclaration(node) {
             if (languageVersion < 2 /* ES2015 */) {
                 // Report error if function is not top level function declaration
-                if (blockScopeContainer.kind !== 279 /* SourceFile */ &&
+                if (blockScopeContainer.kind !== 284 /* SourceFile */ &&
                     blockScopeContainer.kind !== 244 /* ModuleDeclaration */ &&
                     !ts.isFunctionLike(blockScopeContainer)) {
                     // We check first if the name is inside class declaration or class expression; if so give explicit message
@@ -29095,12 +29420,12 @@ var ts;
                 case 159 /* SetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 65536 /* SetAccessor */, 67187647 /* SetAccessorExcludes */);
                 case 165 /* FunctionType */:
-                case 289 /* JSDocFunctionType */:
-                case 293 /* JSDocSignature */:
+                case 294 /* JSDocFunctionType */:
+                case 298 /* JSDocSignature */:
                 case 166 /* ConstructorType */:
                     return bindFunctionOrConstructorType(node);
                 case 168 /* TypeLiteral */:
-                case 292 /* JSDocTypeLiteral */:
+                case 297 /* JSDocTypeLiteral */:
                 case 181 /* MappedType */:
                     return bindAnonymousTypeWorker(node);
                 case 188 /* ObjectLiteralExpression */:
@@ -29159,7 +29484,7 @@ var ts;
                     return bindExportDeclaration(node);
                 case 254 /* ExportAssignment */:
                     return bindExportAssignment(node);
-                case 279 /* SourceFile */:
+                case 284 /* SourceFile */:
                     updateStrictModeStatementList(node.statements);
                     return bindSourceFileIfExternalModule();
                 case 218 /* Block */:
@@ -29169,22 +29494,22 @@ var ts;
                 // falls through
                 case 245 /* ModuleBlock */:
                     return updateStrictModeStatementList(node.statements);
-                case 299 /* JSDocParameterTag */:
-                    if (node.parent.kind === 293 /* JSDocSignature */) {
+                case 304 /* JSDocParameterTag */:
+                    if (node.parent.kind === 298 /* JSDocSignature */) {
                         return bindParameter(node);
                     }
-                    if (node.parent.kind !== 292 /* JSDocTypeLiteral */) {
+                    if (node.parent.kind !== 297 /* JSDocTypeLiteral */) {
                         break;
                     }
                 // falls through
-                case 305 /* JSDocPropertyTag */:
+                case 310 /* JSDocPropertyTag */:
                     var propTag = node;
-                    var flags = propTag.isBracketed || propTag.typeExpression && propTag.typeExpression.type.kind === 288 /* JSDocOptionalType */ ?
+                    var flags = propTag.isBracketed || propTag.typeExpression && propTag.typeExpression.type.kind === 293 /* JSDocOptionalType */ ?
                         4 /* Property */ | 16777216 /* Optional */ :
                         4 /* Property */;
                     return declareSymbolAndAddToSymbolTable(propTag, flags, 0 /* PropertyExcludes */);
-                case 304 /* JSDocTypedefTag */:
-                case 297 /* JSDocCallbackTag */:
+                case 309 /* JSDocTypedefTag */:
+                case 302 /* JSDocCallbackTag */:
                     return (delayedTypeAliases || (delayedTypeAliases = [])).push(node);
             }
         }
@@ -29356,9 +29681,14 @@ var ts;
                     var symbolTable = ts.hasModifier(thisContainer, 32 /* Static */) ? containingClass.symbol.exports : containingClass.symbol.members;
                     declareSymbol(symbolTable, containingClass.symbol, node, 4 /* Property */, 0 /* None */, /*isReplaceableByMethod*/ true);
                     break;
-                case 279 /* SourceFile */:
-                    // this.foo assignment in a source file
-                    // Do not bind. It would be nice to support this someday though.
+                case 284 /* SourceFile */:
+                    // this.property = assignment in a source file -- declare symbol in exports for a module, in locals for a script
+                    if (thisContainer.commonJsModuleIndicator) {
+                        declareSymbol(thisContainer.symbol.exports, thisContainer.symbol, node, 4 /* Property */ | 1048576 /* ExportValue */, 0 /* None */);
+                    }
+                    else {
+                        declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 67220414 /* FunctionScopedVariableExcludes */);
+                    }
                     break;
                 default:
                     ts.Debug.fail(ts.Debug.showSyntaxKind(thisContainer));
@@ -29368,7 +29698,7 @@ var ts;
             if (node.expression.kind === 100 /* ThisKeyword */) {
                 bindThisPropertyAssignment(node);
             }
-            else if (ts.isPropertyAccessEntityNameExpression(node) && node.parent.parent.kind === 279 /* SourceFile */) {
+            else if (ts.isPropertyAccessEntityNameExpression(node) && node.parent.parent.kind === 284 /* SourceFile */) {
                 if (ts.isPrototypeAccess(node.expression)) {
                     bindPrototypePropertyAssignment(node, node.parent);
                 }
@@ -29405,7 +29735,7 @@ var ts;
         }
         function bindObjectDefinePropertyAssignment(node) {
             var namespaceSymbol = lookupSymbolForPropertyAccess(node.arguments[0]);
-            var isToplevel = node.parent.parent.kind === 279 /* SourceFile */;
+            var isToplevel = node.parent.parent.kind === 284 /* SourceFile */;
             namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, node.arguments[0], isToplevel, /*isPrototypeProperty*/ false);
             bindPotentiallyNewExpandoMemberToNamespace(node, namespaceSymbol, /*isPrototypeProperty*/ false);
         }
@@ -29472,8 +29802,8 @@ var ts;
         function bindPropertyAssignment(name, propertyAccess, isPrototypeProperty) {
             var namespaceSymbol = lookupSymbolForPropertyAccess(name);
             var isToplevel = ts.isBinaryExpression(propertyAccess.parent)
-                ? getParentOfBinaryExpression(propertyAccess.parent).parent.kind === 279 /* SourceFile */
-                : propertyAccess.parent.parent.kind === 279 /* SourceFile */;
+                ? getParentOfBinaryExpression(propertyAccess.parent).parent.kind === 284 /* SourceFile */
+                : propertyAccess.parent.parent.kind === 284 /* SourceFile */;
             namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, propertyAccess.expression, isToplevel, isPrototypeProperty);
             bindPotentiallyNewExpandoMemberToNamespace(propertyAccess, namespaceSymbol, isPrototypeProperty);
         }
@@ -29611,7 +29941,7 @@ var ts;
             }
         }
         function bindParameter(node) {
-            if (node.kind === 299 /* JSDocParameterTag */ && container.kind !== 293 /* JSDocSignature */) {
+            if (node.kind === 304 /* JSDocParameterTag */ && container.kind !== 298 /* JSDocSignature */) {
                 return;
             }
             if (inStrictMode && !(node.flags & 4194304 /* Ambient */)) {
@@ -29869,44 +30199,37 @@ var ts;
     ts.computeTransformFlagsForNode = computeTransformFlagsForNode;
     function computeCallExpression(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
+        var callee = ts.skipOuterExpressions(node.expression);
         var expression = node.expression;
         if (node.typeArguments) {
-            transformFlags |= 3 /* AssertTypeScript */;
+            transformFlags |= 1 /* AssertTypeScript */;
         }
-        if (subtreeFlags & 131072 /* ContainsRestOrSpread */
-            || (expression.transformFlags & (33554432 /* Super */ | 67108864 /* ContainsSuper */))) {
+        if (subtreeFlags & 4096 /* ContainsRestOrSpread */ || ts.isSuperOrSuperProperty(callee)) {
             // If the this node contains a SpreadExpression, or is a super call, then it is an ES6
             // node.
-            transformFlags |= 192 /* AssertES2015 */;
-            // super property or element accesses could be inside lambdas, etc, and need a captured `this`,
-            // while super keyword for super calls (indicated by TransformFlags.Super) does not (since it can only be top-level in a constructor)
-            if (expression.transformFlags & 67108864 /* ContainsSuper */) {
-                transformFlags |= 8192 /* ContainsLexicalThis */;
+            transformFlags |= 128 /* AssertES2015 */;
+            if (ts.isSuperProperty(callee)) {
+                transformFlags |= 2048 /* ContainsLexicalThis */;
             }
         }
         if (expression.kind === 92 /* ImportKeyword */) {
-            transformFlags |= 16777216 /* ContainsDynamicImport */;
-            // A dynamic 'import()' call that contains a lexical 'this' will
-            // require a captured 'this' when emitting down-level.
-            if (subtreeFlags & 8192 /* ContainsLexicalThis */) {
-                transformFlags |= 16384 /* ContainsCapturedLexicalThis */;
-            }
+            transformFlags |= 524288 /* ContainsDynamicImport */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~637666625 /* ArrayLiteralOrCallOrNewExcludes */;
+        return transformFlags & ~536875008 /* ArrayLiteralOrCallOrNewExcludes */;
     }
     function computeNewExpression(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         if (node.typeArguments) {
-            transformFlags |= 3 /* AssertTypeScript */;
+            transformFlags |= 1 /* AssertTypeScript */;
         }
-        if (subtreeFlags & 131072 /* ContainsRestOrSpread */) {
+        if (subtreeFlags & 4096 /* ContainsRestOrSpread */) {
             // If the this node contains a SpreadElementExpression then it is an ES6
             // node.
-            transformFlags |= 192 /* AssertES2015 */;
+            transformFlags |= 128 /* AssertES2015 */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~637666625 /* ArrayLiteralOrCallOrNewExcludes */;
+        return transformFlags & ~536875008 /* ArrayLiteralOrCallOrNewExcludes */;
     }
     function computeBinaryExpression(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -29914,20 +30237,20 @@ var ts;
         var leftKind = node.left.kind;
         if (operatorTokenKind === 59 /* EqualsToken */ && leftKind === 188 /* ObjectLiteralExpression */) {
             // Destructuring object assignments with are ES2015 syntax
-            // and possibly ESNext if they contain rest
-            transformFlags |= 8 /* AssertESNext */ | 192 /* AssertES2015 */ | 3072 /* AssertDestructuringAssignment */;
+            // and possibly ES2018 if they contain rest
+            transformFlags |= 16 /* AssertES2018 */ | 128 /* AssertES2015 */ | 512 /* AssertDestructuringAssignment */;
         }
         else if (operatorTokenKind === 59 /* EqualsToken */ && leftKind === 187 /* ArrayLiteralExpression */) {
             // Destructuring assignments are ES2015 syntax.
-            transformFlags |= 192 /* AssertES2015 */ | 3072 /* AssertDestructuringAssignment */;
+            transformFlags |= 128 /* AssertES2015 */ | 512 /* AssertDestructuringAssignment */;
         }
         else if (operatorTokenKind === 41 /* AsteriskAsteriskToken */
             || operatorTokenKind === 63 /* AsteriskAsteriskEqualsToken */) {
             // Exponentiation is ES2016 syntax.
-            transformFlags |= 32 /* AssertES2016 */;
+            transformFlags |= 64 /* AssertES2016 */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~637535553 /* NodeExcludes */;
+        return transformFlags & ~536870912 /* NodeExcludes */;
     }
     function computeParameter(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -29938,147 +30261,131 @@ var ts;
         // syntax.
         if (node.questionToken
             || node.type
-            || (subtreeFlags & 4096 /* ContainsTypeScriptClassSyntax */ && ts.some(node.decorators))
+            || (subtreeFlags & 1024 /* ContainsTypeScriptClassSyntax */ && ts.some(node.decorators))
             || ts.isThisIdentifier(name)) {
-            transformFlags |= 3 /* AssertTypeScript */;
+            transformFlags |= 1 /* AssertTypeScript */;
         }
         // If a parameter has an accessibility modifier, then it is TypeScript syntax.
         if (ts.hasModifier(node, 92 /* ParameterPropertyModifier */)) {
-            transformFlags |= 3 /* AssertTypeScript */ | 4096 /* ContainsTypeScriptClassSyntax */;
+            transformFlags |= 1 /* AssertTypeScript */ | 1024 /* ContainsTypeScriptClassSyntax */;
         }
-        // parameters with object rest destructuring are ES Next syntax
-        if (subtreeFlags & 262144 /* ContainsObjectRestOrSpread */) {
-            transformFlags |= 8 /* AssertESNext */;
+        // parameters with object rest destructuring are ES2018 syntax
+        if (subtreeFlags & 8192 /* ContainsObjectRestOrSpread */) {
+            transformFlags |= 16 /* AssertES2018 */;
         }
         // If a parameter has an initializer, a binding pattern or a dotDotDot token, then
         // it is ES6 syntax and its container must emit default value assignments or parameter destructuring downlevel.
-        if (subtreeFlags & 2097152 /* ContainsBindingPattern */ || initializer || dotDotDotToken) {
-            transformFlags |= 192 /* AssertES2015 */ | 65536 /* ContainsDefaultValueAssignments */;
+        if (subtreeFlags & 65536 /* ContainsBindingPattern */ || initializer || dotDotDotToken) {
+            transformFlags |= 128 /* AssertES2015 */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~637535553 /* ParameterExcludes */;
+        return transformFlags & ~536870912 /* ParameterExcludes */;
     }
     function computeParenthesizedExpression(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         var expression = node.expression;
         var expressionKind = expression.kind;
-        var expressionTransformFlags = expression.transformFlags;
         // If the node is synthesized, it means the emitter put the parentheses there,
         // not the user. If we didn't want them, the emitter would not have put them
         // there.
         if (expressionKind === 212 /* AsExpression */
             || expressionKind === 194 /* TypeAssertionExpression */) {
-            transformFlags |= 3 /* AssertTypeScript */;
-        }
-        // If the expression of a ParenthesizedExpression is a destructuring assignment,
-        // then the ParenthesizedExpression is a destructuring assignment.
-        if (expressionTransformFlags & 1024 /* DestructuringAssignment */) {
-            transformFlags |= 1024 /* DestructuringAssignment */;
+            transformFlags |= 1 /* AssertTypeScript */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~536872257 /* OuterExpressionExcludes */;
+        return transformFlags & ~536870912 /* OuterExpressionExcludes */;
     }
     function computeClassDeclaration(node, subtreeFlags) {
         var transformFlags;
         if (ts.hasModifier(node, 2 /* Ambient */)) {
             // An ambient declaration is TypeScript syntax.
-            transformFlags = 3 /* AssertTypeScript */;
+            transformFlags = 1 /* AssertTypeScript */;
         }
         else {
             // A ClassDeclaration is ES6 syntax.
-            transformFlags = subtreeFlags | 192 /* AssertES2015 */;
+            transformFlags = subtreeFlags | 128 /* AssertES2015 */;
             // A class with a parameter property assignment, property initializer, computed property name, or decorator is
             // TypeScript syntax.
             // An exported declaration may be TypeScript syntax, but is handled by the visitor
             // for a namespace declaration.
-            if ((subtreeFlags & 4096 /* ContainsTypeScriptClassSyntax */)
+            if ((subtreeFlags & 1024 /* ContainsTypeScriptClassSyntax */)
                 || node.typeParameters) {
-                transformFlags |= 3 /* AssertTypeScript */;
-            }
-            if (subtreeFlags & 32768 /* ContainsLexicalThisInComputedPropertyName */) {
-                // A computed property name containing `this` might need to be rewritten,
-                // so propagate the ContainsLexicalThis flag upward.
-                transformFlags |= 8192 /* ContainsLexicalThis */;
+                transformFlags |= 1 /* AssertTypeScript */;
             }
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~638121281 /* ClassExcludes */;
+        return transformFlags & ~536888320 /* ClassExcludes */;
     }
     function computeClassExpression(node, subtreeFlags) {
         // A ClassExpression is ES6 syntax.
-        var transformFlags = subtreeFlags | 192 /* AssertES2015 */;
+        var transformFlags = subtreeFlags | 128 /* AssertES2015 */;
         // A class with a parameter property assignment, property initializer, or decorator is
         // TypeScript syntax.
-        if (subtreeFlags & 4096 /* ContainsTypeScriptClassSyntax */
+        if (subtreeFlags & 1024 /* ContainsTypeScriptClassSyntax */
             || node.typeParameters) {
-            transformFlags |= 3 /* AssertTypeScript */;
-        }
-        if (subtreeFlags & 32768 /* ContainsLexicalThisInComputedPropertyName */) {
-            // A computed property name containing `this` might need to be rewritten,
-            // so propagate the ContainsLexicalThis flag upward.
-            transformFlags |= 8192 /* ContainsLexicalThis */;
+            transformFlags |= 1 /* AssertTypeScript */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~638121281 /* ClassExcludes */;
+        return transformFlags & ~536888320 /* ClassExcludes */;
     }
     function computeHeritageClause(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         switch (node.token) {
             case 86 /* ExtendsKeyword */:
                 // An `extends` HeritageClause is ES6 syntax.
-                transformFlags |= 192 /* AssertES2015 */;
+                transformFlags |= 128 /* AssertES2015 */;
                 break;
             case 109 /* ImplementsKeyword */:
                 // An `implements` HeritageClause is TypeScript syntax.
-                transformFlags |= 3 /* AssertTypeScript */;
+                transformFlags |= 1 /* AssertTypeScript */;
                 break;
             default:
                 ts.Debug.fail("Unexpected token for heritage clause");
                 break;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~637535553 /* NodeExcludes */;
+        return transformFlags & ~536870912 /* NodeExcludes */;
     }
     function computeCatchClause(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         if (!node.variableDeclaration) {
-            transformFlags |= 8 /* AssertESNext */;
+            transformFlags |= 8 /* AssertES2019 */;
         }
         else if (ts.isBindingPattern(node.variableDeclaration.name)) {
-            transformFlags |= 192 /* AssertES2015 */;
+            transformFlags |= 128 /* AssertES2015 */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~637797697 /* CatchClauseExcludes */;
+        return transformFlags & ~536879104 /* CatchClauseExcludes */;
     }
     function computeExpressionWithTypeArguments(node, subtreeFlags) {
         // An ExpressionWithTypeArguments is ES6 syntax, as it is used in the
         // extends clause of a class.
-        var transformFlags = subtreeFlags | 192 /* AssertES2015 */;
+        var transformFlags = subtreeFlags | 128 /* AssertES2015 */;
         // If an ExpressionWithTypeArguments contains type arguments, then it
         // is TypeScript syntax.
         if (node.typeArguments) {
-            transformFlags |= 3 /* AssertTypeScript */;
+            transformFlags |= 1 /* AssertTypeScript */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~637535553 /* NodeExcludes */;
+        return transformFlags & ~536870912 /* NodeExcludes */;
     }
     function computeConstructor(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         // TypeScript-specific modifiers and overloads are TypeScript syntax
         if (ts.hasModifier(node, 2270 /* TypeScriptModifier */)
             || !node.body) {
-            transformFlags |= 3 /* AssertTypeScript */;
+            transformFlags |= 1 /* AssertTypeScript */;
         }
-        // function declarations with object rest destructuring are ES Next syntax
-        if (subtreeFlags & 262144 /* ContainsObjectRestOrSpread */) {
-            transformFlags |= 8 /* AssertESNext */;
+        // function declarations with object rest destructuring are ES2018 syntax
+        if (subtreeFlags & 8192 /* ContainsObjectRestOrSpread */) {
+            transformFlags |= 16 /* AssertES2018 */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~653616449 /* ConstructorExcludes */;
+        return transformFlags & ~537372672 /* ConstructorExcludes */;
     }
     function computeMethod(node, subtreeFlags) {
         // A MethodDeclaration is ES6 syntax.
-        var transformFlags = subtreeFlags | 192 /* AssertES2015 */;
+        var transformFlags = subtreeFlags | 128 /* AssertES2015 */;
         // Decorators, TypeScript-specific modifiers, type parameters, type annotations, and
         // overloads are TypeScript syntax.
         if (node.decorators
@@ -30087,21 +30394,21 @@ var ts;
             || node.type
             || (node.name && ts.isComputedPropertyName(node.name)) // While computed method names aren't typescript, the TS transform must visit them to emit property declarations correctly
             || !node.body) {
-            transformFlags |= 3 /* AssertTypeScript */;
+            transformFlags |= 1 /* AssertTypeScript */;
         }
-        // function declarations with object rest destructuring are ES Next syntax
-        if (subtreeFlags & 262144 /* ContainsObjectRestOrSpread */) {
-            transformFlags |= 8 /* AssertESNext */;
+        // function declarations with object rest destructuring are ES2018 syntax
+        if (subtreeFlags & 8192 /* ContainsObjectRestOrSpread */) {
+            transformFlags |= 16 /* AssertES2018 */;
         }
         // An async method declaration is ES2017 syntax.
         if (ts.hasModifier(node, 256 /* Async */)) {
-            transformFlags |= node.asteriskToken ? 8 /* AssertESNext */ : 16 /* AssertES2017 */;
+            transformFlags |= node.asteriskToken ? 16 /* AssertES2018 */ : 32 /* AssertES2017 */;
         }
         if (node.asteriskToken) {
-            transformFlags |= 768 /* AssertGenerator */;
+            transformFlags |= 256 /* AssertGenerator */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~653616449 /* MethodOrAccessorExcludes */;
+        return propagatePropertyNameFlags(node.name, transformFlags & ~537372672 /* MethodOrAccessorExcludes */);
     }
     function computeAccessor(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -30112,25 +30419,25 @@ var ts;
             || node.type
             || (node.name && ts.isComputedPropertyName(node.name)) // While computed accessor names aren't typescript, the TS transform must visit them to emit property declarations correctly
             || !node.body) {
-            transformFlags |= 3 /* AssertTypeScript */;
+            transformFlags |= 1 /* AssertTypeScript */;
         }
-        // function declarations with object rest destructuring are ES Next syntax
-        if (subtreeFlags & 262144 /* ContainsObjectRestOrSpread */) {
-            transformFlags |= 8 /* AssertESNext */;
+        // function declarations with object rest destructuring are ES2018 syntax
+        if (subtreeFlags & 8192 /* ContainsObjectRestOrSpread */) {
+            transformFlags |= 16 /* AssertES2018 */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~653616449 /* MethodOrAccessorExcludes */;
+        return propagatePropertyNameFlags(node.name, transformFlags & ~537372672 /* MethodOrAccessorExcludes */);
     }
     function computePropertyDeclaration(node, subtreeFlags) {
         // A PropertyDeclaration is TypeScript syntax.
-        var transformFlags = subtreeFlags | 3 /* AssertTypeScript */;
+        var transformFlags = subtreeFlags | 1 /* AssertTypeScript */;
         // If the PropertyDeclaration has an initializer or a computed name, we need to inform its ancestor
         // so that it handle the transformation.
         if (node.initializer || ts.isComputedPropertyName(node.name)) {
-            transformFlags |= 4096 /* ContainsTypeScriptClassSyntax */;
+            transformFlags |= 1024 /* ContainsTypeScriptClassSyntax */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~637535553 /* NodeExcludes */;
+        return propagatePropertyNameFlags(node.name, transformFlags & ~536872960 /* PropertyExcludes */);
     }
     function computeFunctionDeclaration(node, subtreeFlags) {
         var transformFlags;
@@ -30139,42 +30446,36 @@ var ts;
         if (!body || (modifierFlags & 2 /* Ambient */)) {
             // An ambient declaration is TypeScript syntax.
             // A FunctionDeclaration without a body is an overload and is TypeScript syntax.
-            transformFlags = 3 /* AssertTypeScript */;
+            transformFlags = 1 /* AssertTypeScript */;
         }
         else {
-            transformFlags = subtreeFlags | 8388608 /* ContainsHoistedDeclarationOrCompletion */;
+            transformFlags = subtreeFlags | 262144 /* ContainsHoistedDeclarationOrCompletion */;
             // TypeScript-specific modifiers, type parameters, and type annotations are TypeScript
             // syntax.
             if (modifierFlags & 2270 /* TypeScriptModifier */
                 || node.typeParameters
                 || node.type) {
-                transformFlags |= 3 /* AssertTypeScript */;
+                transformFlags |= 1 /* AssertTypeScript */;
             }
             // An async function declaration is ES2017 syntax.
             if (modifierFlags & 256 /* Async */) {
-                transformFlags |= node.asteriskToken ? 8 /* AssertESNext */ : 16 /* AssertES2017 */;
-            }
-            // function declarations with object rest destructuring are ES Next syntax
-            if (subtreeFlags & 262144 /* ContainsObjectRestOrSpread */) {
-                transformFlags |= 8 /* AssertESNext */;
+                transformFlags |= node.asteriskToken ? 16 /* AssertES2018 */ : 32 /* AssertES2017 */;
             }
-            // If a FunctionDeclaration's subtree has marked the container as needing to capture the
-            // lexical this, or the function contains parameters with initializers, then this node is
-            // ES6 syntax.
-            if (subtreeFlags & 81920 /* ES2015FunctionSyntaxMask */) {
-                transformFlags |= 192 /* AssertES2015 */;
+            // function declarations with object rest destructuring are ES2018 syntax
+            if (subtreeFlags & 8192 /* ContainsObjectRestOrSpread */) {
+                transformFlags |= 16 /* AssertES2018 */;
             }
             // If a FunctionDeclaration is generator function and is the body of a
             // transformed async function, then this node can be transformed to a
             // down-level generator.
-            // Currently we do not support transforming any other generator fucntions
+            // Currently we do not support transforming any other generator functions
             // down level.
             if (node.asteriskToken) {
-                transformFlags |= 768 /* AssertGenerator */;
+                transformFlags |= 256 /* AssertGenerator */;
             }
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~653620545 /* FunctionExcludes */;
+        return transformFlags & ~537373696 /* FunctionExcludes */;
     }
     function computeFunctionExpression(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
@@ -30183,181 +30484,161 @@ var ts;
         if (ts.hasModifier(node, 2270 /* TypeScriptModifier */)
             || node.typeParameters
             || node.type) {
-            transformFlags |= 3 /* AssertTypeScript */;
+            transformFlags |= 1 /* AssertTypeScript */;
         }
         // An async function expression is ES2017 syntax.
         if (ts.hasModifier(node, 256 /* Async */)) {
-            transformFlags |= node.asteriskToken ? 8 /* AssertESNext */ : 16 /* AssertES2017 */;
+            transformFlags |= node.asteriskToken ? 16 /* AssertES2018 */ : 32 /* AssertES2017 */;
         }
-        // function expressions with object rest destructuring are ES Next syntax
-        if (subtreeFlags & 262144 /* ContainsObjectRestOrSpread */) {
-            transformFlags |= 8 /* AssertESNext */;
-        }
-        // If a FunctionExpression's subtree has marked the container as needing to capture the
-        // lexical this, or the function contains parameters with initializers, then this node is
-        // ES6 syntax.
-        if (subtreeFlags & 81920 /* ES2015FunctionSyntaxMask */) {
-            transformFlags |= 192 /* AssertES2015 */;
+        // function expressions with object rest destructuring are ES2018 syntax
+        if (subtreeFlags & 8192 /* ContainsObjectRestOrSpread */) {
+            transformFlags |= 16 /* AssertES2018 */;
         }
         // If a FunctionExpression is generator function and is the body of a
         // transformed async function, then this node can be transformed to a
         // down-level generator.
         if (node.asteriskToken) {
-            transformFlags |= 768 /* AssertGenerator */;
+            transformFlags |= 256 /* AssertGenerator */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~653620545 /* FunctionExcludes */;
+        return transformFlags & ~537373696 /* FunctionExcludes */;
     }
     function computeArrowFunction(node, subtreeFlags) {
         // An ArrowFunction is ES6 syntax, and excludes markers that should not escape the scope of an ArrowFunction.
-        var transformFlags = subtreeFlags | 192 /* AssertES2015 */;
+        var transformFlags = subtreeFlags | 128 /* AssertES2015 */;
         // TypeScript-specific modifiers, type parameters, and type annotations are TypeScript
         // syntax.
         if (ts.hasModifier(node, 2270 /* TypeScriptModifier */)
             || node.typeParameters
             || node.type) {
-            transformFlags |= 3 /* AssertTypeScript */;
+            transformFlags |= 1 /* AssertTypeScript */;
         }
         // An async arrow function is ES2017 syntax.
         if (ts.hasModifier(node, 256 /* Async */)) {
-            transformFlags |= 16 /* AssertES2017 */;
-        }
-        // arrow functions with object rest destructuring are ES Next syntax
-        if (subtreeFlags & 262144 /* ContainsObjectRestOrSpread */) {
-            transformFlags |= 8 /* AssertESNext */;
+            transformFlags |= 32 /* AssertES2017 */;
         }
-        // If an ArrowFunction contains a lexical this, its container must capture the lexical this.
-        if (subtreeFlags & 8192 /* ContainsLexicalThis */) {
-            transformFlags |= 16384 /* ContainsCapturedLexicalThis */;
+        // arrow functions with object rest destructuring are ES2018 syntax
+        if (subtreeFlags & 8192 /* ContainsObjectRestOrSpread */) {
+            transformFlags |= 16 /* AssertES2018 */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~653604161 /* ArrowFunctionExcludes */;
+        return transformFlags & ~537371648 /* ArrowFunctionExcludes */;
     }
     function computePropertyAccess(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         // If a PropertyAccessExpression starts with a super keyword, then it is
         // ES6 syntax, and requires a lexical `this` binding.
-        if (transformFlags & 33554432 /* Super */) {
-            transformFlags ^= 33554432 /* Super */;
+        if (node.expression.kind === 98 /* SuperKeyword */) {
             // super inside of an async function requires hoisting the super access (ES2017).
-            // same for super inside of an async generator, which is ESNext.
-            transformFlags |= 67108864 /* ContainsSuper */ | 16 /* ContainsES2017 */ | 8 /* ContainsESNext */;
+            // same for super inside of an async generator, which is ES2018.
+            transformFlags |= 32 /* ContainsES2017 */ | 16 /* ContainsES2018 */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~570426689 /* PropertyAccessExcludes */;
+        return transformFlags & ~536870912 /* PropertyAccessExcludes */;
     }
     function computeElementAccess(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
-        var expression = node.expression;
-        var expressionFlags = expression.transformFlags; // We do not want to aggregate flags from the argument expression for super/this capturing
         // If an ElementAccessExpression starts with a super keyword, then it is
         // ES6 syntax, and requires a lexical `this` binding.
-        if (expressionFlags & 33554432 /* Super */) {
-            transformFlags &= ~33554432 /* Super */;
+        if (node.expression.kind === 98 /* SuperKeyword */) {
             // super inside of an async function requires hoisting the super access (ES2017).
-            // same for super inside of an async generator, which is ESNext.
-            transformFlags |= 67108864 /* ContainsSuper */ | 16 /* ContainsES2017 */ | 8 /* ContainsESNext */;
+            // same for super inside of an async generator, which is ES2018.
+            transformFlags |= 32 /* ContainsES2017 */ | 16 /* ContainsES2018 */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~570426689 /* PropertyAccessExcludes */;
+        return transformFlags & ~536870912 /* PropertyAccessExcludes */;
     }
     function computeVariableDeclaration(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
-        transformFlags |= 192 /* AssertES2015 */ | 2097152 /* ContainsBindingPattern */;
-        // A VariableDeclaration containing ObjectRest is ESNext syntax
-        if (subtreeFlags & 262144 /* ContainsObjectRestOrSpread */) {
-            transformFlags |= 8 /* AssertESNext */;
+        transformFlags |= 128 /* AssertES2015 */ | 65536 /* ContainsBindingPattern */; // TODO(rbuckton): Why are these set unconditionally?
+        // A VariableDeclaration containing ObjectRest is ES2018 syntax
+        if (subtreeFlags & 8192 /* ContainsObjectRestOrSpread */) {
+            transformFlags |= 16 /* AssertES2018 */;
         }
         // Type annotations are TypeScript syntax.
         if (node.type) {
-            transformFlags |= 3 /* AssertTypeScript */;
+            transformFlags |= 1 /* AssertTypeScript */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~637535553 /* NodeExcludes */;
+        return transformFlags & ~536870912 /* NodeExcludes */;
     }
     function computeVariableStatement(node, subtreeFlags) {
         var transformFlags;
         var declarationListTransformFlags = node.declarationList.transformFlags;
         // An ambient declaration is TypeScript syntax.
         if (ts.hasModifier(node, 2 /* Ambient */)) {
-            transformFlags = 3 /* AssertTypeScript */;
+            transformFlags = 1 /* AssertTypeScript */;
         }
         else {
             transformFlags = subtreeFlags;
-            if (declarationListTransformFlags & 2097152 /* ContainsBindingPattern */) {
-                transformFlags |= 192 /* AssertES2015 */;
+            if (declarationListTransformFlags & 65536 /* ContainsBindingPattern */) {
+                transformFlags |= 128 /* AssertES2015 */;
             }
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~637535553 /* NodeExcludes */;
+        return transformFlags & ~536870912 /* NodeExcludes */;
     }
     function computeLabeledStatement(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         // A labeled statement containing a block scoped binding *may* need to be transformed from ES6.
-        if (subtreeFlags & 1048576 /* ContainsBlockScopedBinding */
+        if (subtreeFlags & 32768 /* ContainsBlockScopedBinding */
             && ts.isIterationStatement(node, /*lookInLabeledStatements*/ true)) {
-            transformFlags |= 192 /* AssertES2015 */;
+            transformFlags |= 128 /* AssertES2015 */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~637535553 /* NodeExcludes */;
+        return transformFlags & ~536870912 /* NodeExcludes */;
     }
     function computeImportEquals(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         // An ImportEqualsDeclaration with a namespace reference is TypeScript.
         if (!ts.isExternalModuleImportEqualsDeclaration(node)) {
-            transformFlags |= 3 /* AssertTypeScript */;
+            transformFlags |= 1 /* AssertTypeScript */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~637535553 /* NodeExcludes */;
+        return transformFlags & ~536870912 /* NodeExcludes */;
     }
     function computeExpressionStatement(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
-        // If the expression of an expression statement is a destructuring assignment,
-        // then we treat the statement as ES6 so that we can indicate that we do not
-        // need to hold on to the right-hand side.
-        if (node.expression.transformFlags & 1024 /* DestructuringAssignment */) {
-            transformFlags |= 192 /* AssertES2015 */;
-        }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~637535553 /* NodeExcludes */;
+        return transformFlags & ~536870912 /* NodeExcludes */;
     }
     function computeModuleDeclaration(node, subtreeFlags) {
-        var transformFlags = 3 /* AssertTypeScript */;
+        var transformFlags = 1 /* AssertTypeScript */;
         var modifierFlags = ts.getModifierFlags(node);
         if ((modifierFlags & 2 /* Ambient */) === 0) {
             transformFlags |= subtreeFlags;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~647001409 /* ModuleExcludes */;
+        return transformFlags & ~537168896 /* ModuleExcludes */;
     }
     function computeVariableDeclarationList(node, subtreeFlags) {
-        var transformFlags = subtreeFlags | 8388608 /* ContainsHoistedDeclarationOrCompletion */;
-        if (subtreeFlags & 2097152 /* ContainsBindingPattern */) {
-            transformFlags |= 192 /* AssertES2015 */;
+        var transformFlags = subtreeFlags | 262144 /* ContainsHoistedDeclarationOrCompletion */;
+        if (subtreeFlags & 65536 /* ContainsBindingPattern */) {
+            transformFlags |= 128 /* AssertES2015 */;
         }
         // If a VariableDeclarationList is `let` or `const`, then it is ES6 syntax.
         if (node.flags & 3 /* BlockScoped */) {
-            transformFlags |= 192 /* AssertES2015 */ | 1048576 /* ContainsBlockScopedBinding */;
+            transformFlags |= 128 /* AssertES2015 */ | 32768 /* ContainsBlockScopedBinding */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
-        return transformFlags & ~639894849 /* VariableDeclarationListExcludes */;
+        return transformFlags & ~536944640 /* VariableDeclarationListExcludes */;
     }
     function computeOther(node, kind, subtreeFlags) {
         // Mark transformations needed for each node
         var transformFlags = subtreeFlags;
-        var excludeFlags = 637535553 /* NodeExcludes */;
+        var excludeFlags = 536870912 /* NodeExcludes */;
         switch (kind) {
             case 121 /* AsyncKeyword */:
             case 201 /* AwaitExpression */:
-                // async/await is ES2017 syntax, but may be ESNext syntax (for async generators)
-                transformFlags |= 8 /* AssertESNext */ | 16 /* AssertES2017 */;
+                // async/await is ES2017 syntax, but may be ES2018 syntax (for async generators)
+                transformFlags |= 16 /* AssertES2018 */ | 32 /* AssertES2017 */;
                 break;
             case 194 /* TypeAssertionExpression */:
             case 212 /* AsExpression */:
-            case 308 /* PartiallyEmittedExpression */:
+            case 313 /* PartiallyEmittedExpression */:
                 // These nodes are TypeScript syntax.
-                transformFlags |= 3 /* AssertTypeScript */;
-                excludeFlags = 536872257 /* OuterExpressionExcludes */;
+                transformFlags |= 1 /* AssertTypeScript */;
+                excludeFlags = 536870912 /* OuterExpressionExcludes */;
                 break;
             case 115 /* PublicKeyword */:
             case 113 /* PrivateKeyword */:
@@ -30370,7 +30651,7 @@ var ts;
             case 213 /* NonNullExpression */:
             case 133 /* ReadonlyKeyword */:
                 // These nodes are TypeScript syntax.
-                transformFlags |= 3 /* AssertTypeScript */;
+                transformFlags |= 1 /* AssertTypeScript */;
                 break;
             case 260 /* JsxElement */:
             case 261 /* JsxSelfClosingElement */:
@@ -30385,7 +30666,7 @@ var ts;
             case 269 /* JsxSpreadAttribute */:
             case 270 /* JsxExpression */:
                 // These nodes are Jsx syntax.
-                transformFlags |= 4 /* AssertJsx */;
+                transformFlags |= 2 /* AssertJsx */;
                 break;
             case 14 /* NoSubstitutionTemplateLiteral */:
             case 15 /* TemplateHead */:
@@ -30397,32 +30678,32 @@ var ts;
             case 116 /* StaticKeyword */:
             case 214 /* MetaProperty */:
                 // These nodes are ES6 syntax.
-                transformFlags |= 192 /* AssertES2015 */;
+                transformFlags |= 128 /* AssertES2015 */;
                 break;
             case 10 /* StringLiteral */:
                 if (node.hasExtendedUnicodeEscape) {
-                    transformFlags |= 192 /* AssertES2015 */;
+                    transformFlags |= 128 /* AssertES2015 */;
                 }
                 break;
             case 8 /* NumericLiteral */:
                 if (node.numericLiteralFlags & 384 /* BinaryOrOctalSpecifier */) {
-                    transformFlags |= 192 /* AssertES2015 */;
+                    transformFlags |= 128 /* AssertES2015 */;
                 }
                 break;
             case 9 /* BigIntLiteral */:
-                transformFlags |= 8 /* AssertESNext */;
+                transformFlags |= 4 /* AssertESNext */;
                 break;
             case 227 /* ForOfStatement */:
                 // This node is either ES2015 syntax or ES2017 syntax (if it is a for-await-of).
                 if (node.awaitModifier) {
-                    transformFlags |= 8 /* AssertESNext */;
+                    transformFlags |= 16 /* AssertES2018 */;
                 }
-                transformFlags |= 192 /* AssertES2015 */;
+                transformFlags |= 128 /* AssertES2015 */;
                 break;
             case 207 /* YieldExpression */:
                 // This node is either ES2015 syntax (in a generator) or ES2017 syntax (in an async
                 // generator).
-                transformFlags |= 8 /* AssertESNext */ | 192 /* AssertES2015 */ | 4194304 /* ContainsYield */;
+                transformFlags |= 16 /* AssertES2018 */ | 128 /* AssertES2015 */ | 131072 /* ContainsYield */;
                 break;
             case 120 /* AnyKeyword */:
             case 135 /* NumberKeyword */:
@@ -30463,115 +30744,93 @@ var ts;
             case 182 /* LiteralType */:
             case 247 /* NamespaceExportDeclaration */:
                 // Types and signatures are TypeScript syntax, and exclude all other facts.
-                transformFlags = 3 /* AssertTypeScript */;
-                excludeFlags = -3 /* TypeExcludes */;
+                transformFlags = 1 /* AssertTypeScript */;
+                excludeFlags = -2 /* TypeExcludes */;
                 break;
             case 149 /* ComputedPropertyName */:
                 // Even though computed property names are ES6, we don't treat them as such.
                 // This is so that they can flow through PropertyName transforms unaffected.
                 // Instead, we mark the container as ES6, so that it can properly handle the transform.
-                transformFlags |= 524288 /* ContainsComputedPropertyName */;
-                if (subtreeFlags & 8192 /* ContainsLexicalThis */) {
-                    // A computed method name like `[this.getName()](x: string) { ... }` needs to
-                    // distinguish itself from the normal case of a method body containing `this`:
-                    // `this` inside a method doesn't need to be rewritten (the method provides `this`),
-                    // whereas `this` inside a computed name *might* need to be rewritten if the class/object
-                    // is inside an arrow function:
-                    // `_this = this; () => class K { [_this.getName()]() { ... } }`
-                    // To make this distinction, use ContainsLexicalThisInComputedPropertyName
-                    // instead of ContainsLexicalThis for computed property names
-                    transformFlags |= 32768 /* ContainsLexicalThisInComputedPropertyName */;
-                }
+                transformFlags |= 16384 /* ContainsComputedPropertyName */;
                 break;
             case 208 /* SpreadElement */:
-                transformFlags |= 192 /* AssertES2015 */ | 131072 /* ContainsRestOrSpread */;
+                transformFlags |= 128 /* AssertES2015 */ | 4096 /* ContainsRestOrSpread */;
                 break;
             case 277 /* SpreadAssignment */:
-                transformFlags |= 8 /* AssertESNext */ | 262144 /* ContainsObjectRestOrSpread */;
+                transformFlags |= 16 /* AssertES2018 */ | 8192 /* ContainsObjectRestOrSpread */;
                 break;
             case 98 /* SuperKeyword */:
                 // This node is ES6 syntax.
-                transformFlags |= 192 /* AssertES2015 */ | 33554432 /* Super */;
-                excludeFlags = 536872257 /* OuterExpressionExcludes */; // must be set to persist `Super`
+                transformFlags |= 128 /* AssertES2015 */;
+                excludeFlags = 536870912 /* OuterExpressionExcludes */; // must be set to persist `Super`
                 break;
             case 100 /* ThisKeyword */:
                 // Mark this node and its ancestors as containing a lexical `this` keyword.
-                transformFlags |= 8192 /* ContainsLexicalThis */;
+                transformFlags |= 2048 /* ContainsLexicalThis */;
                 break;
             case 184 /* ObjectBindingPattern */:
-                transformFlags |= 192 /* AssertES2015 */ | 2097152 /* ContainsBindingPattern */;
-                if (subtreeFlags & 131072 /* ContainsRestOrSpread */) {
-                    transformFlags |= 8 /* AssertESNext */ | 262144 /* ContainsObjectRestOrSpread */;
+                transformFlags |= 128 /* AssertES2015 */ | 65536 /* ContainsBindingPattern */;
+                if (subtreeFlags & 4096 /* ContainsRestOrSpread */) {
+                    transformFlags |= 16 /* AssertES2018 */ | 8192 /* ContainsObjectRestOrSpread */;
                 }
-                excludeFlags = 637666625 /* BindingPatternExcludes */;
+                excludeFlags = 536875008 /* BindingPatternExcludes */;
                 break;
             case 185 /* ArrayBindingPattern */:
-                transformFlags |= 192 /* AssertES2015 */ | 2097152 /* ContainsBindingPattern */;
-                excludeFlags = 637666625 /* BindingPatternExcludes */;
+                transformFlags |= 128 /* AssertES2015 */ | 65536 /* ContainsBindingPattern */;
+                excludeFlags = 536875008 /* BindingPatternExcludes */;
                 break;
             case 186 /* BindingElement */:
-                transformFlags |= 192 /* AssertES2015 */;
+                transformFlags |= 128 /* AssertES2015 */;
                 if (node.dotDotDotToken) {
-                    transformFlags |= 131072 /* ContainsRestOrSpread */;
+                    transformFlags |= 4096 /* ContainsRestOrSpread */;
                 }
                 break;
             case 152 /* Decorator */:
                 // This node is TypeScript syntax, and marks its container as also being TypeScript syntax.
-                transformFlags |= 3 /* AssertTypeScript */ | 4096 /* ContainsTypeScriptClassSyntax */;
+                transformFlags |= 1 /* AssertTypeScript */ | 1024 /* ContainsTypeScriptClassSyntax */;
                 break;
             case 188 /* ObjectLiteralExpression */:
-                excludeFlags = 638358849 /* ObjectLiteralExcludes */;
-                if (subtreeFlags & 524288 /* ContainsComputedPropertyName */) {
+                excludeFlags = 536896512 /* ObjectLiteralExcludes */;
+                if (subtreeFlags & 16384 /* ContainsComputedPropertyName */) {
                     // If an ObjectLiteralExpression contains a ComputedPropertyName, then it
                     // is an ES6 node.
-                    transformFlags |= 192 /* AssertES2015 */;
+                    transformFlags |= 128 /* AssertES2015 */;
                 }
-                if (subtreeFlags & 32768 /* ContainsLexicalThisInComputedPropertyName */) {
-                    // A computed property name containing `this` might need to be rewritten,
-                    // so propagate the ContainsLexicalThis flag upward.
-                    transformFlags |= 8192 /* ContainsLexicalThis */;
-                }
-                if (subtreeFlags & 262144 /* ContainsObjectRestOrSpread */) {
+                if (subtreeFlags & 8192 /* ContainsObjectRestOrSpread */) {
                     // If an ObjectLiteralExpression contains a spread element, then it
-                    // is an ES next node.
-                    transformFlags |= 8 /* AssertESNext */;
+                    // is an ES2018 node.
+                    transformFlags |= 16 /* AssertES2018 */;
                 }
                 break;
             case 187 /* ArrayLiteralExpression */:
-            case 192 /* NewExpression */:
-                excludeFlags = 637666625 /* ArrayLiteralOrCallOrNewExcludes */;
-                if (subtreeFlags & 131072 /* ContainsRestOrSpread */) {
-                    // If the this node contains a SpreadExpression, then it is an ES6
-                    // node.
-                    transformFlags |= 192 /* AssertES2015 */;
-                }
+                excludeFlags = 536875008 /* ArrayLiteralOrCallOrNewExcludes */;
                 break;
             case 223 /* DoStatement */:
             case 224 /* WhileStatement */:
             case 225 /* ForStatement */:
             case 226 /* ForInStatement */:
                 // A loop containing a block scoped binding *may* need to be transformed from ES6.
-                if (subtreeFlags & 1048576 /* ContainsBlockScopedBinding */) {
-                    transformFlags |= 192 /* AssertES2015 */;
+                if (subtreeFlags & 32768 /* ContainsBlockScopedBinding */) {
+                    transformFlags |= 128 /* AssertES2015 */;
                 }
                 break;
-            case 279 /* SourceFile */:
-                if (subtreeFlags & 16384 /* ContainsCapturedLexicalThis */) {
-                    transformFlags |= 192 /* AssertES2015 */;
-                }
+            case 284 /* SourceFile */:
                 break;
             case 230 /* ReturnStatement */:
-                // Return statements may require an `await` in ESNext.
-                transformFlags |= 8388608 /* ContainsHoistedDeclarationOrCompletion */ | 8 /* AssertESNext */;
+                // Return statements may require an `await` in ES2018.
+                transformFlags |= 262144 /* ContainsHoistedDeclarationOrCompletion */ | 16 /* AssertES2018 */;
                 break;
             case 228 /* ContinueStatement */:
             case 229 /* BreakStatement */:
-                transformFlags |= 8388608 /* ContainsHoistedDeclarationOrCompletion */;
+                transformFlags |= 262144 /* ContainsHoistedDeclarationOrCompletion */;
                 break;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
         return transformFlags & ~excludeFlags;
     }
+    function propagatePropertyNameFlags(node, transformFlags) {
+        return transformFlags | (node.transformFlags & 2048 /* PropertyNamePropagatingFlags */);
+    }
     /**
      * Gets the transform flags to exclude when unioning the transform flags of a subtree.
      *
@@ -30581,33 +30840,33 @@ var ts;
      */
     function getTransformFlagsSubtreeExclusions(kind) {
         if (kind >= 163 /* FirstTypeNode */ && kind <= 183 /* LastTypeNode */) {
-            return -3 /* TypeExcludes */;
+            return -2 /* TypeExcludes */;
         }
         switch (kind) {
             case 191 /* CallExpression */:
             case 192 /* NewExpression */:
             case 187 /* ArrayLiteralExpression */:
-                return 637666625 /* ArrayLiteralOrCallOrNewExcludes */;
+                return 536875008 /* ArrayLiteralOrCallOrNewExcludes */;
             case 244 /* ModuleDeclaration */:
-                return 647001409 /* ModuleExcludes */;
+                return 537168896 /* ModuleExcludes */;
             case 151 /* Parameter */:
-                return 637535553 /* ParameterExcludes */;
+                return 536870912 /* ParameterExcludes */;
             case 197 /* ArrowFunction */:
-                return 653604161 /* ArrowFunctionExcludes */;
+                return 537371648 /* ArrowFunctionExcludes */;
             case 196 /* FunctionExpression */:
             case 239 /* FunctionDeclaration */:
-                return 653620545 /* FunctionExcludes */;
+                return 537373696 /* FunctionExcludes */;
             case 238 /* VariableDeclarationList */:
-                return 639894849 /* VariableDeclarationListExcludes */;
+                return 536944640 /* VariableDeclarationListExcludes */;
             case 240 /* ClassDeclaration */:
             case 209 /* ClassExpression */:
-                return 638121281 /* ClassExcludes */;
+                return 536888320 /* ClassExcludes */;
             case 157 /* Constructor */:
-                return 653616449 /* ConstructorExcludes */;
+                return 537372672 /* ConstructorExcludes */;
             case 156 /* MethodDeclaration */:
             case 158 /* GetAccessor */:
             case 159 /* SetAccessor */:
-                return 653616449 /* MethodOrAccessorExcludes */;
+                return 537372672 /* MethodOrAccessorExcludes */;
             case 120 /* AnyKeyword */:
             case 135 /* NumberKeyword */:
             case 146 /* BigIntKeyword */:
@@ -30625,25 +30884,25 @@ var ts;
             case 162 /* IndexSignature */:
             case 241 /* InterfaceDeclaration */:
             case 242 /* TypeAliasDeclaration */:
-                return -3 /* TypeExcludes */;
+                return -2 /* TypeExcludes */;
             case 188 /* ObjectLiteralExpression */:
-                return 638358849 /* ObjectLiteralExcludes */;
+                return 536896512 /* ObjectLiteralExcludes */;
             case 274 /* CatchClause */:
-                return 637797697 /* CatchClauseExcludes */;
+                return 536879104 /* CatchClauseExcludes */;
             case 184 /* ObjectBindingPattern */:
             case 185 /* ArrayBindingPattern */:
-                return 637666625 /* BindingPatternExcludes */;
+                return 536875008 /* BindingPatternExcludes */;
             case 194 /* TypeAssertionExpression */:
             case 212 /* AsExpression */:
-            case 308 /* PartiallyEmittedExpression */:
+            case 313 /* PartiallyEmittedExpression */:
             case 195 /* ParenthesizedExpression */:
             case 98 /* SuperKeyword */:
-                return 536872257 /* OuterExpressionExcludes */;
+                return 536870912 /* OuterExpressionExcludes */;
             case 189 /* PropertyAccessExpression */:
             case 190 /* ElementAccessExpression */:
-                return 570426689 /* PropertyAccessExcludes */;
+                return 536870912 /* PropertyAccessExcludes */;
             default:
-                return 637535553 /* NodeExcludes */;
+                return 536870912 /* NodeExcludes */;
         }
     }
     ts.getTransformFlagsSubtreeExclusions = getTransformFlagsSubtreeExclusions;
@@ -30892,6 +31151,7 @@ var ts;
         var enumCount = 0;
         var instantiationDepth = 0;
         var constraintDepth = 0;
+        var currentNode;
         var emptySymbols = ts.createSymbolTable();
         var identityMapper = ts.identity;
         var compilerOptions = host.getCompilerOptions();
@@ -30908,8 +31168,14 @@ var ts;
         var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 32768 /* FreshLiteral */;
         var emitResolver = createResolver();
         var nodeBuilder = createNodeBuilder();
+        var globals = ts.createSymbolTable();
         var undefinedSymbol = createSymbol(4 /* Property */, "undefined");
         undefinedSymbol.declarations = [];
+        var globalThisSymbol = createSymbol(1536 /* Module */, "globalThis", 8 /* Readonly */);
+        globalThisSymbol.exports = globals;
+        globalThisSymbol.valueDeclaration = ts.createNode(72 /* Identifier */);
+        globalThisSymbol.valueDeclaration.escapedText = "globalThis";
+        globals.set(globalThisSymbol.escapedName, globalThisSymbol);
         var argumentsSymbol = createSymbol(4 /* Property */, "arguments");
         var requireSymbol = createSymbol(4 /* Property */, "require");
         /** This will be set during calls to `getResolvedSignature` where services determines an apparent number of arguments greater than what is actually provided. */
@@ -31039,11 +31305,13 @@ var ts;
             isContextSensitive: isContextSensitive,
             getFullyQualifiedName: getFullyQualifiedName,
             getResolvedSignature: function (node, candidatesOutArray, agumentCount) {
-                return getResolvedSignatureWorker(node, candidatesOutArray, agumentCount, /*isForSignatureHelp*/ false);
+                return getResolvedSignatureWorker(node, candidatesOutArray, agumentCount, 0 /* Normal */);
             },
             getResolvedSignatureForSignatureHelp: function (node, candidatesOutArray, agumentCount) {
-                return getResolvedSignatureWorker(node, candidatesOutArray, agumentCount, /*isForSignatureHelp*/ true);
+                return getResolvedSignatureWorker(node, candidatesOutArray, agumentCount, 16 /* IsForSignatureHelp */);
             },
+            getExpandedParameters: getExpandedParameters,
+            hasEffectiveRestParameter: hasEffectiveRestParameter,
             getConstantValue: function (nodeIn) {
                 var node = ts.getParseTreeNode(nodeIn, canHaveConstantValue);
                 return node ? getConstantValue(node) : undefined;
@@ -31105,6 +31373,8 @@ var ts;
             getNeverType: function () { return neverType; },
             isSymbolAccessible: isSymbolAccessible,
             getObjectFlags: ts.getObjectFlags,
+            isArrayType: isArrayType,
+            isTupleType: isTupleType,
             isArrayLikeType: isArrayLikeType,
             isTypeInvalidDueToUnionDiscriminant: isTypeInvalidDueToUnionDiscriminant,
             getAllPossiblePropertiesOfTypes: getAllPossiblePropertiesOfTypes,
@@ -31120,9 +31390,9 @@ var ts;
             getAccessibleSymbolChain: getAccessibleSymbolChain,
             getTypePredicateOfSignature: getTypePredicateOfSignature,
             resolveExternalModuleSymbol: resolveExternalModuleSymbol,
-            tryGetThisTypeAt: function (node) {
+            tryGetThisTypeAt: function (node, includeGlobalThis) {
                 node = ts.getParseTreeNode(node);
-                return node && tryGetThisTypeAt(node);
+                return node && tryGetThisTypeAt(node, includeGlobalThis);
             },
             getTypeArgumentConstraint: function (nodeIn) {
                 var node = ts.getParseTreeNode(nodeIn, ts.isTypeNode);
@@ -31169,10 +31439,10 @@ var ts;
             },
             getLocalTypeParametersOfClassOrInterfaceOrTypeAlias: getLocalTypeParametersOfClassOrInterfaceOrTypeAlias,
         };
-        function getResolvedSignatureWorker(nodeIn, candidatesOutArray, argumentCount, isForSignatureHelp) {
+        function getResolvedSignatureWorker(nodeIn, candidatesOutArray, argumentCount, checkMode) {
             var node = ts.getParseTreeNode(nodeIn, ts.isCallLikeExpression);
             apparentArgumentCount = argumentCount;
-            var res = node ? getResolvedSignature(node, candidatesOutArray, isForSignatureHelp) : undefined;
+            var res = node ? getResolvedSignature(node, candidatesOutArray, checkMode) : undefined;
             apparentArgumentCount = undefined;
             return res;
         }
@@ -31181,6 +31451,7 @@ var ts;
         var intersectionTypes = ts.createMap();
         var literalTypes = ts.createMap();
         var indexedAccessTypes = ts.createMap();
+        var conditionalTypes = ts.createMap();
         var evolvingArrayTypes = [];
         var undefinedProperties = ts.createMap();
         var unknownSymbol = createSymbol(4 /* Property */, "unknown");
@@ -31190,10 +31461,10 @@ var ts;
         var wildcardType = createIntrinsicType(1 /* Any */, "any");
         var errorType = createIntrinsicType(1 /* Any */, "error");
         var unknownType = createIntrinsicType(2 /* Unknown */, "unknown");
-        var undefinedType = createIntrinsicType(32768 /* Undefined */, "undefined");
-        var undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(32768 /* Undefined */ | 134217728 /* ContainsWideningType */, "undefined");
-        var nullType = createIntrinsicType(65536 /* Null */, "null");
-        var nullWideningType = strictNullChecks ? nullType : createIntrinsicType(65536 /* Null */ | 134217728 /* ContainsWideningType */, "null");
+        var undefinedType = createNullableType(32768 /* Undefined */, "undefined", 0);
+        var undefinedWideningType = strictNullChecks ? undefinedType : createNullableType(32768 /* Undefined */, "undefined", 131072 /* ContainsWideningType */);
+        var nullType = createNullableType(65536 /* Null */, "null", 0);
+        var nullWideningType = strictNullChecks ? nullType : createNullableType(65536 /* Null */, "null", 131072 /* ContainsWideningType */);
         var stringType = createIntrinsicType(4 /* String */, "string");
         var numberType = createIntrinsicType(8 /* Number */, "number");
         var bigintType = createIntrinsicType(64 /* BigInt */, "bigint");
@@ -31235,7 +31506,7 @@ var ts;
         var anyFunctionType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         // The anyFunctionType contains the anyFunctionType by definition. The flag is further propagated
         // in getPropagatingFlagsOfTypes, and it is checked in inferFromTypes.
-        anyFunctionType.flags |= 536870912 /* ContainsAnyFunctionType */;
+        anyFunctionType.objectFlags |= 524288 /* ContainsAnyFunctionType */;
         var noConstraintType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         var circularConstraintType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         var resolvingDefaultType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
@@ -31249,7 +31520,6 @@ var ts;
         var resolvingSignature = createSignature(undefined, undefined, undefined, ts.emptyArray, anyType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
         var silentNeverSignature = createSignature(undefined, undefined, undefined, ts.emptyArray, silentNeverType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
         var enumNumberIndexInfo = createIndexInfo(stringType, /*isReadonly*/ true);
-        var globals = ts.createSymbolTable();
         /** Key is "/path/to/a.ts|/path/to/b.ts". */
         var amalgamatedDuplicates;
         var reverseMappedCache = ts.createMap();
@@ -31448,9 +31718,11 @@ var ts;
         var CheckMode;
         (function (CheckMode) {
             CheckMode[CheckMode["Normal"] = 0] = "Normal";
-            CheckMode[CheckMode["SkipContextSensitive"] = 1] = "SkipContextSensitive";
+            CheckMode[CheckMode["Contextual"] = 1] = "Contextual";
             CheckMode[CheckMode["Inferential"] = 2] = "Inferential";
-            CheckMode[CheckMode["Contextual"] = 3] = "Contextual";
+            CheckMode[CheckMode["SkipContextSensitive"] = 4] = "SkipContextSensitive";
+            CheckMode[CheckMode["SkipGenericFunctions"] = 8] = "SkipGenericFunctions";
+            CheckMode[CheckMode["IsForSignatureHelp"] = 16] = "IsForSignatureHelp";
         })(CheckMode || (CheckMode = {}));
         var CallbackCheck;
         (function (CallbackCheck) {
@@ -31537,18 +31809,6 @@ var ts;
                 return diagnostic;
             }
         }
-        function addRelatedInfo(diagnostic) {
-            var relatedInformation = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                relatedInformation[_i - 1] = arguments[_i];
-            }
-            var _a;
-            if (!diagnostic.relatedInformation) {
-                diagnostic.relatedInformation = [];
-            }
-            (_a = diagnostic.relatedInformation).push.apply(_a, relatedInformation);
-            return diagnostic;
-        }
         function error(location, message, arg0, arg1, arg2, arg3) {
             var diagnostic = location
                 ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2, arg3)
@@ -31728,7 +31988,7 @@ var ts;
                 err.relatedInformation = err.relatedInformation || [];
                 if (ts.length(err.relatedInformation) >= 5)
                     continue;
-                addRelatedInfo(err, !ts.length(err.relatedInformation) ? ts.createDiagnosticForNode(relatedNode, ts.Diagnostics._0_was_also_declared_here, symbolName) : ts.createDiagnosticForNode(relatedNode, ts.Diagnostics.and_here));
+                ts.addRelatedInfo(err, !ts.length(err.relatedInformation) ? ts.createDiagnosticForNode(relatedNode, ts.Diagnostics._0_was_also_declared_here, symbolName) : ts.createDiagnosticForNode(relatedNode, ts.Diagnostics.and_here));
             }
         }
         function combineSymbolTables(first, second) {
@@ -31806,7 +32066,7 @@ var ts;
             return nodeLinks[nodeId] || (nodeLinks[nodeId] = { flags: 0 });
         }
         function isGlobalSourceFile(node) {
-            return node.kind === 279 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
+            return node.kind === 284 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning) {
@@ -31980,7 +32240,7 @@ var ts;
                             // - parameters are only in the scope of function body
                             // This restriction does not apply to JSDoc comment types because they are parented
                             // at a higher level than type parameters would normally be
-                            if (meaning & result.flags & 67897832 /* Type */ && lastLocation.kind !== 291 /* JSDocComment */) {
+                            if (meaning & result.flags & 67897832 /* Type */ && lastLocation.kind !== 296 /* JSDocComment */) {
                                 useResult = result.flags & 262144 /* TypeParameter */
                                     // type parameters are visible in parameter list, return type and type parameter list
                                     ? lastLocation === location.type ||
@@ -32022,14 +32282,14 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 279 /* SourceFile */:
+                    case 284 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location))
                             break;
                         isInExternalModule = true;
                     // falls through
                     case 244 /* ModuleDeclaration */:
                         var moduleExports = getSymbolOfNode(location).exports;
-                        if (location.kind === 279 /* SourceFile */ || ts.isAmbientModule(location)) {
+                        if (location.kind === 284 /* SourceFile */ || ts.isAmbientModule(location)) {
                             // It's an external module. First see if the module has an export default and if the local
                             // name of that export default matches.
                             if (result = moduleExports.get("default" /* Default */)) {
@@ -32197,12 +32457,18 @@ var ts;
                         //       @y method(x, y) {} // <-- decorator y should be resolved at the class declaration, not the method.
                         //   }
                         //
-                        if (location.parent && ts.isClassElement(location.parent)) {
+                        // class Decorators are resolved outside of the class to avoid referencing type parameters of that class.
+                        //
+                        //   type T = number;
+                        //   declare function y(x: T): any;
+                        //   @param(1 as T) // <-- T should resolve to the type alias outside of class C
+                        //   class C<T> {}
+                        if (location.parent && (ts.isClassElement(location.parent) || location.parent.kind === 240 /* ClassDeclaration */)) {
                             location = location.parent;
                         }
                         break;
-                    case 304 /* JSDocTypedefTag */:
-                    case 297 /* JSDocCallbackTag */:
+                    case 309 /* JSDocTypedefTag */:
+                    case 302 /* JSDocCallbackTag */:
                         // js type aliases do not resolve names from their host, so skip past it
                         location = ts.getJSDocHost(location);
                         break;
@@ -32221,7 +32487,7 @@ var ts;
             }
             if (!result) {
                 if (lastLocation) {
-                    ts.Debug.assert(lastLocation.kind === 279 /* SourceFile */);
+                    ts.Debug.assert(lastLocation.kind === 284 /* SourceFile */);
                     if (lastLocation.commonJsModuleIndicator && name === "exports" && meaning & lastLocation.symbol.flags) {
                         return lastLocation.symbol;
                     }
@@ -32244,7 +32510,8 @@ var ts;
                             !checkAndReportErrorForExtendingInterface(errorLocation) &&
                             !checkAndReportErrorForUsingTypeAsNamespace(errorLocation, name, meaning) &&
                             !checkAndReportErrorForUsingTypeAsValue(errorLocation, name, meaning) &&
-                            !checkAndReportErrorForUsingNamespaceModuleAsValue(errorLocation, name, meaning)) {
+                            !checkAndReportErrorForUsingNamespaceModuleAsValue(errorLocation, name, meaning) &&
+                            !checkAndReportErrorForUsingValueAsType(errorLocation, name, meaning)) {
                         var suggestion = void 0;
                         if (suggestedNameNotFoundMessage && suggestionCount < maximumSuggestionCount) {
                             suggestion = getSuggestedSymbolForNonexistentSymbol(originalLocation, name, meaning);
@@ -32252,7 +32519,7 @@ var ts;
                                 var suggestionName = symbolToString(suggestion);
                                 var diagnostic = error(errorLocation, suggestedNameNotFoundMessage, diagnosticName(nameArg), suggestionName);
                                 if (suggestion.valueDeclaration) {
-                                    addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
+                                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
                                 }
                             }
                         }
@@ -32409,6 +32676,16 @@ var ts;
             }
             return false;
         }
+        function checkAndReportErrorForUsingValueAsType(errorLocation, name, meaning) {
+            if (meaning & (67897832 /* Type */ & ~1920 /* Namespace */)) {
+                var symbol = resolveSymbol(resolveName(errorLocation, name, ~67897832 /* Type */ & 67220415 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false));
+                if (symbol && !(symbol.flags & 1920 /* Namespace */)) {
+                    error(errorLocation, ts.Diagnostics._0_refers_to_a_value_but_is_being_used_as_a_type_here, ts.unescapeLeadingUnderscores(name));
+                    return true;
+                }
+            }
+            return false;
+        }
         function checkAndReportErrorForUsingTypeAsValue(errorLocation, name, meaning) {
             if (meaning & (67220415 /* Value */ & ~1024 /* NamespaceModule */)) {
                 if (name === "any" || name === "string" || name === "number" || name === "boolean" || name === "never") {
@@ -32417,7 +32694,7 @@ var ts;
                 }
                 var symbol = resolveSymbol(resolveName(errorLocation, name, 67897832 /* Type */ & ~67220415 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false));
                 if (symbol && !(symbol.flags & 1024 /* NamespaceModule */)) {
-                    var message = (name === "Promise" || name === "Symbol")
+                    var message = isES2015OrLaterConstructorName(name)
                         ? ts.Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_es2015_or_later
                         : ts.Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here;
                     error(errorLocation, message, ts.unescapeLeadingUnderscores(name));
@@ -32426,6 +32703,18 @@ var ts;
             }
             return false;
         }
+        function isES2015OrLaterConstructorName(n) {
+            switch (n) {
+                case "Promise":
+                case "Symbol":
+                case "Map":
+                case "WeakMap":
+                case "Set":
+                case "WeakSet":
+                    return true;
+            }
+            return false;
+        }
         function checkAndReportErrorForUsingNamespaceModuleAsValue(errorLocation, name, meaning) {
             if (meaning & (67220415 /* Value */ & ~1024 /* NamespaceModule */ & ~67897832 /* Type */)) {
                 var symbol = resolveSymbol(resolveName(errorLocation, name, 1024 /* NamespaceModule */ & ~67220415 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false));
@@ -32468,7 +32757,7 @@ var ts;
                     }
                 }
                 if (diagnosticMessage) {
-                    addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(declaration, ts.Diagnostics._0_is_declared_here, declarationName));
+                    ts.addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(declaration, ts.Diagnostics._0_is_declared_here, declarationName));
                 }
             }
         }
@@ -32652,7 +32941,7 @@ var ts;
                             var suggestionName = symbolToString(suggestion);
                             var diagnostic = error(name, ts.Diagnostics.Module_0_has_no_exported_member_1_Did_you_mean_2, moduleName, declarationName, suggestionName);
                             if (suggestion.valueDeclaration) {
-                                addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
+                                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(suggestion.valueDeclaration, ts.Diagnostics._0_is_declared_here, suggestionName));
                             }
                         }
                         else {
@@ -32972,20 +33261,12 @@ var ts;
                 return undefined;
             }
             if (moduleNotFoundError) {
-                // For relative paths, see if this was possibly a projectReference redirect
-                if (ts.pathIsRelative(moduleReference)) {
-                    var sourceFile_1 = ts.getSourceFileOfNode(location);
-                    var redirects = sourceFile_1.redirectedReferences;
-                    if (redirects) {
-                        var normalizedTargetPath = ts.getNormalizedAbsolutePath(moduleReference, ts.getDirectoryPath(sourceFile_1.fileName));
-                        for (var _i = 0, _a = [".ts" /* Ts */, ".tsx" /* Tsx */]; _i < _a.length; _i++) {
-                            var ext = _a[_i];
-                            var probePath = normalizedTargetPath + ext;
-                            if (redirects.indexOf(probePath) >= 0) {
-                                error(errorNode, ts.Diagnostics.Output_file_0_has_not_been_built_from_source_file_1, moduleReference, probePath);
-                                return undefined;
-                            }
-                        }
+                // See if this was possibly a projectReference redirect
+                if (resolvedModule) {
+                    var redirect = host.getProjectReferenceRedirect(resolvedModule.resolvedFileName);
+                    if (redirect) {
+                        error(errorNode, ts.Diagnostics.Output_file_0_has_not_been_built_from_source_file_1, redirect, resolvedModule.resolvedFileName);
+                        return undefined;
                     }
                 }
                 if (resolutionDiagnostic) {
@@ -33054,7 +33335,7 @@ var ts;
         function resolveESModuleSymbol(moduleSymbol, referencingLocation, dontResolveAlias) {
             var symbol = resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias);
             if (!dontResolveAlias && symbol) {
-                if (!(symbol.flags & (1536 /* Module */ | 3 /* Variable */)) && !ts.getDeclarationOfKind(symbol, 279 /* SourceFile */)) {
+                if (!(symbol.flags & (1536 /* Module */ | 3 /* Variable */)) && !ts.getDeclarationOfKind(symbol, 284 /* SourceFile */)) {
                     var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015
                         ? "allowSyntheticDefaultImports"
                         : "esModuleInterop";
@@ -33332,6 +33613,11 @@ var ts;
             type.intrinsicName = intrinsicName;
             return type;
         }
+        function createNullableType(kind, intrinsicName, objectFlags) {
+            var type = createIntrinsicType(kind, intrinsicName);
+            type.objectFlags = objectFlags;
+            return type;
+        }
         function createBooleanType(trueFalseTypes) {
             var type = getUnionType(trueFalseTypes);
             type.flags |= 16 /* Boolean */;
@@ -33400,7 +33686,7 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 279 /* SourceFile */:
+                    case 284 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location)) {
                             break;
                         }
@@ -33640,10 +33926,10 @@ var ts;
             return node && getSymbolOfNode(node);
         }
         function hasExternalModuleSymbol(declaration) {
-            return ts.isAmbientModule(declaration) || (declaration.kind === 279 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isAmbientModule(declaration) || (declaration.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasNonGlobalAugmentationExternalModuleSymbol(declaration) {
-            return ts.isModuleWithStringLiteralName(declaration) || (declaration.kind === 279 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isModuleWithStringLiteralName(declaration) || (declaration.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasVisibleDeclarations(symbol, shouldComputeAliasToMakeVisible) {
             var aliasesToMakeVisible;
@@ -34012,8 +34298,8 @@ var ts;
                     context.inferTypeParameters = type.root.inferTypeParameters;
                     var extendsTypeNode = typeToTypeNodeHelper(type.extendsType, context);
                     context.inferTypeParameters = saveInferTypeParameters;
-                    var trueTypeNode = typeToTypeNodeHelper(getTrueTypeFromConditionalType(type), context);
-                    var falseTypeNode = typeToTypeNodeHelper(getFalseTypeFromConditionalType(type), context);
+                    var trueTypeNode = typeToTypeNodeHelper(type.trueType, context);
+                    var falseTypeNode = typeToTypeNodeHelper(type.falseType, context);
                     context.approximateLength += 15;
                     return ts.createConditionalTypeNode(checkTypeNode, extendsTypeNode, trueTypeNode, falseTypeNode);
                 }
@@ -34100,7 +34386,7 @@ var ts;
                         var isNonLocalFunctionSymbol = !!(symbol.flags & 16 /* Function */) &&
                             (symbol.parent || // is exported function symbol
                                 ts.forEach(symbol.declarations, function (declaration) {
-                                    return declaration.parent.kind === 279 /* SourceFile */ || declaration.parent.kind === 245 /* ModuleBlock */;
+                                    return declaration.parent.kind === 284 /* SourceFile */ || declaration.parent.kind === 245 /* ModuleBlock */;
                                 }));
                         if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
                             // typeof is allowed only for static/non local functions
@@ -34140,13 +34426,14 @@ var ts;
                 }
                 function typeReferenceToTypeNode(type) {
                     var typeArguments = type.typeArguments || ts.emptyArray;
-                    if (type.target === globalArrayType) {
+                    if (type.target === globalArrayType || type.target === globalReadonlyArrayType) {
                         if (context.flags & 2 /* WriteArrayAsGenericType */) {
                             var typeArgumentNode = typeToTypeNodeHelper(typeArguments[0], context);
-                            return ts.createTypeReferenceNode("Array", [typeArgumentNode]);
+                            return ts.createTypeReferenceNode(type.target === globalArrayType ? "Array" : "ReadonlyArray", [typeArgumentNode]);
                         }
                         var elementType = typeToTypeNodeHelper(typeArguments[0], context);
-                        return ts.createArrayTypeNode(elementType);
+                        var arrayType = ts.createArrayTypeNode(elementType);
+                        return type.target === globalArrayType ? arrayType : ts.createTypeOperatorNode(133 /* ReadonlyKeyword */, arrayType);
                     }
                     else if (type.target.objectFlags & 8 /* Tuple */) {
                         if (typeArguments.length > 0) {
@@ -34159,11 +34446,13 @@ var ts;
                                         ts.createRestTypeNode(ts.createArrayTypeNode(tupleConstituentNodes[i])) :
                                         ts.createOptionalTypeNode(tupleConstituentNodes[i]);
                                 }
-                                return ts.createTupleTypeNode(tupleConstituentNodes);
+                                var tupleTypeNode = ts.createTupleTypeNode(tupleConstituentNodes);
+                                return type.target.readonly ? ts.createTypeOperatorNode(133 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
                             }
                         }
                         if (context.encounteredError || (context.flags & 524288 /* AllowEmptyTuple */)) {
-                            return ts.createTupleTypeNode([]);
+                            var tupleTypeNode = ts.createTupleTypeNode([]);
+                            return type.target.readonly ? ts.createTypeOperatorNode(133 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
                         }
                         context.encounteredError = true;
                         return undefined; // TODO: GH#18217
@@ -34327,7 +34616,7 @@ var ts;
                 context.approximateLength += (ts.symbolName(propertySymbol).length + 1);
                 context.enclosingDeclaration = saveEnclosingDeclaration;
                 var optionalToken = propertySymbol.flags & 16777216 /* Optional */ ? ts.createToken(56 /* QuestionToken */) : undefined;
-                if (propertySymbol.flags & (16 /* Function */ | 8192 /* Method */) && !getPropertiesOfObjectType(propertyType).length) {
+                if (propertySymbol.flags & (16 /* Function */ | 8192 /* Method */) && !getPropertiesOfObjectType(propertyType).length && !isReadonlySymbol(propertySymbol)) {
                     var signatures = getSignaturesOfType(propertyType, 0 /* Call */);
                     for (var _i = 0, signatures_1 = signatures; _i < signatures_1.length; _i++) {
                         var signature = signatures_1[_i];
@@ -34463,7 +34752,7 @@ var ts;
                 var savedContextFlags = context.flags;
                 context.flags &= ~512 /* WriteTypeParametersInQualifiedName */; // Avoids potential infinite loop when building for a claimspace with a generic
                 var shouldUseGeneratedName = context.flags & 4 /* GenerateNamesForShadowedTypeParams */ &&
-                    type.symbol.declarations[0] &&
+                    type.symbol.declarations && type.symbol.declarations[0] &&
                     ts.isTypeParameterDeclaration(type.symbol.declarations[0]) &&
                     typeParameterShadowsNameInScope(type, context);
                 var name = shouldUseGeneratedName
@@ -34482,7 +34771,7 @@ var ts;
             function symbolToParameterDeclaration(parameterSymbol, context, preserveModifierFlags) {
                 var parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 151 /* Parameter */);
                 if (!parameterDeclaration && !isTransientSymbol(parameterSymbol)) {
-                    parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 299 /* JSDocParameterTag */);
+                    parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 304 /* JSDocParameterTag */);
                 }
                 var parameterType = getTypeOfSymbol(parameterSymbol);
                 if (parameterDeclaration && isRequiredInitializedParameter(parameterDeclaration)) {
@@ -34640,7 +34929,7 @@ var ts;
                 return top;
             }
             function getSpecifierForModuleSymbol(symbol, context) {
-                var file = ts.getDeclarationOfKind(symbol, 279 /* SourceFile */);
+                var file = ts.getDeclarationOfKind(symbol, 284 /* SourceFile */);
                 if (file && file.moduleName !== undefined) {
                     // Use the amd name if it is available
                     return file.moduleName;
@@ -34893,7 +35182,7 @@ var ts;
                 ts.isExternalModuleAugmentation(node.parent.parent);
         }
         function isDefaultBindingContext(location) {
-            return location.kind === 279 /* SourceFile */ || ts.isAmbientModule(location);
+            return location.kind === 284 /* SourceFile */ || ts.isAmbientModule(location);
         }
         function getNameOfSymbolFromNameType(symbol, context) {
             var nameType = symbol.nameType;
@@ -34970,8 +35259,8 @@ var ts;
             return false;
             function determineIfDeclarationIsVisible() {
                 switch (node.kind) {
-                    case 297 /* JSDocCallbackTag */:
-                    case 304 /* JSDocTypedefTag */:
+                    case 302 /* JSDocCallbackTag */:
+                    case 309 /* JSDocTypedefTag */:
                         // Top-level jsdoc type aliases are considered exported
                         // First parent is comment node, second is hosting declaration or token; we only care about those tokens or declarations whose parent is a source file
                         return !!(node.parent && node.parent.parent && node.parent.parent.parent && ts.isSourceFile(node.parent.parent.parent));
@@ -34998,7 +35287,7 @@ var ts;
                         var parent = getDeclarationContainer(node);
                         // If the node is not exported or it is not ambient module element (except import declaration)
                         if (!(ts.getCombinedModifierFlags(node) & 1 /* Export */) &&
-                            !(node.kind !== 248 /* ImportEqualsDeclaration */ && parent.kind !== 279 /* SourceFile */ && parent.flags & 4194304 /* Ambient */)) {
+                            !(node.kind !== 248 /* ImportEqualsDeclaration */ && parent.kind !== 284 /* SourceFile */ && parent.flags & 4194304 /* Ambient */)) {
                             return isGlobalSourceFile(parent);
                         }
                         // Exported members/ambient module elements (exception import declaration) are visible if parent is visible
@@ -35040,7 +35329,7 @@ var ts;
                     // Type parameters are always visible
                     case 150 /* TypeParameter */:
                     // Source file and namespace export are always visible
-                    case 279 /* SourceFile */:
+                    case 284 /* SourceFile */:
                     case 247 /* NamespaceExportDeclaration */:
                         return true;
                     // Export assignments do not create name bindings outside the module
@@ -35219,7 +35508,7 @@ var ts;
                 if (!isTypeAssignableTo(getLiteralTypeFromProperty(prop, 8576 /* StringOrNumberLiteralOrUnique */), omitKeyType)
                     && !(ts.getDeclarationModifierFlagsFromSymbol(prop) & (8 /* Private */ | 16 /* Protected */))
                     && isSpreadableProperty(prop)) {
-                    members.set(prop.escapedName, getSpreadSymbol(prop));
+                    members.set(prop.escapedName, getSpreadSymbol(prop, /*readonly*/ false));
                 }
             }
             var stringIndexInfo = getIndexInfoOfType(source, 0 /* String */);
@@ -35288,17 +35577,8 @@ var ts;
         function getTypeForBindingElement(declaration) {
             var pattern = declaration.parent;
             var parentType = getTypeForBindingElementParent(pattern.parent);
-            // If parent has the unknown (error) type, then so does this binding element
-            if (parentType === errorType) {
-                return errorType;
-            }
-            // If no type was specified or inferred for parent,
-            // infer from the initializer of the binding element if one is present.
-            // Otherwise, go with the undefined type of the parent.
-            if (!parentType) {
-                return declaration.initializer ? checkDeclarationInitializer(declaration) : parentType;
-            }
-            if (isTypeAny(parentType)) {
+            // If no type or an any type was inferred for parent, infer that for the binding element
+            if (!parentType || isTypeAny(parentType)) {
                 return parentType;
             }
             // Relax null check on ambient destructuring parameters, since the parameters have no implementation and are just documentation
@@ -35380,6 +35660,11 @@ var ts;
             if (optional === void 0) { optional = true; }
             return strictNullChecks && optional ? getOptionalType(type) : type;
         }
+        function isParameterOfContextuallyTypedFunction(node) {
+            return node.kind === 151 /* Parameter */ &&
+                (node.parent.kind === 196 /* FunctionExpression */ || node.parent.kind === 197 /* ArrowFunction */) &&
+                !!getContextualType(node.parent);
+        }
         // Return the inferred type for a variable, parameter, or property declaration
         function getTypeForVariableLikeDeclaration(declaration, includeOptionality) {
             // A variable declared in a for..in statement is of type string, or of type keyof T when the
@@ -35455,8 +35740,9 @@ var ts;
                     return containerObjectType;
                 }
             }
-            // Use the type of the initializer expression if one is present
-            if (declaration.initializer) {
+            // Use the type of the initializer expression if one is present and the declaration is
+            // not a parameter of a contextually typed function
+            if (declaration.initializer && !isParameterOfContextuallyTypedFunction(declaration)) {
                 var type = checkDeclarationInitializer(declaration);
                 return addOptionality(type, isOptional);
             }
@@ -35465,8 +35751,9 @@ var ts;
                 // I.e <Elem attr /> is sugar for <Elem attr={true} />
                 return trueType;
             }
-            // If the declaration specifies a binding pattern, use the type implied by the binding pattern
-            if (ts.isBindingPattern(declaration.name)) {
+            // If the declaration specifies a binding pattern and is not a parameter of a contextually
+            // typed function, use the type implied by the binding pattern
+            if (ts.isBindingPattern(declaration.name) && !isParameterOfContextuallyTypedFunction(declaration)) {
                 return getTypeFromBindingPattern(declaration.name, /*includePatternInType*/ false, /*reportErrors*/ true);
             }
             // No type specified and nothing can be inferred
@@ -35522,7 +35809,7 @@ var ts;
                         definedInConstructor = true;
                     }
                 }
-                var sourceTypes = ts.some(constructorTypes, function (t) { return !!(t.flags & ~(98304 /* Nullable */ | 134217728 /* ContainsWideningType */)); }) ? constructorTypes : types; // TODO: GH#18217
+                var sourceTypes = ts.some(constructorTypes, function (t) { return !!(t.flags & ~98304 /* Nullable */); }) ? constructorTypes : types; // TODO: GH#18217
                 type = getUnionType(sourceTypes, 2 /* Subtype */);
             }
             var widened = getWidenedType(addOptionality(type, definedInMethod && !definedInConstructor));
@@ -35673,7 +35960,7 @@ var ts;
         function getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors) {
             var members = ts.createSymbolTable();
             var stringIndexInfo;
-            var objectFlags = 128 /* ObjectLiteral */;
+            var objectFlags = 128 /* ObjectLiteral */ | 262144 /* ContainsObjectLiteral */;
             ts.forEach(pattern.elements, function (e) {
                 var name = e.propertyName || e.name;
                 if (e.dotDotDotToken) {
@@ -35694,7 +35981,6 @@ var ts;
                 members.set(symbol.escapedName, symbol);
             });
             var result = createAnonymousType(undefined, members, ts.emptyArray, ts.emptyArray, stringIndexInfo, undefined);
-            result.flags |= 268435456 /* ContainsObjectLiteral */;
             result.objectFlags |= objectFlags;
             if (includePatternInType) {
                 result.pattern = pattern;
@@ -35778,7 +36064,16 @@ var ts;
         }
         function getTypeOfVariableOrParameterOrProperty(symbol) {
             var links = getSymbolLinks(symbol);
-            return links.type || (links.type = getTypeOfVariableOrParameterOrPropertyWorker(symbol));
+            if (!links.type) {
+                var type = getTypeOfVariableOrParameterOrPropertyWorker(symbol);
+                // For a contextually typed parameter it is possible that a type has already
+                // been assigned (in assignTypeToParameterAndFixTypeParameters), and we want
+                // to preserve this type.
+                if (!links.type) {
+                    links.type = type;
+                }
+            }
+            return links.type;
         }
         function getTypeOfVariableOrParameterOrPropertyWorker(symbol) {
             // Handle prototype property
@@ -35811,19 +36106,19 @@ var ts;
                 }
                 return type_1;
             }
-            if (declaration.kind === 254 /* ExportAssignment */) {
-                return widenTypeForVariableLikeDeclaration(checkExpressionCached(declaration.expression), declaration);
-            }
             // Handle variable, parameter or property
             if (!pushTypeResolution(symbol, 0 /* Type */)) {
                 // Symbol is property of some kind that is merged with something - should use `getTypeOfFuncClassEnumModule` and not `getTypeOfVariableOrParameterOrProperty`
                 if (symbol.flags & 512 /* ValueModule */) {
                     return getTypeOfFuncClassEnumModule(symbol);
                 }
-                return errorType;
+                return reportCircularityError(symbol);
             }
             var type;
-            if (ts.isInJSFile(declaration) &&
+            if (declaration.kind === 254 /* ExportAssignment */) {
+                type = widenTypeForVariableLikeDeclaration(checkExpressionCached(declaration.expression), declaration);
+            }
+            else if (ts.isInJSFile(declaration) &&
                 (ts.isCallExpression(declaration) || ts.isBinaryExpression(declaration) || ts.isPropertyAccessExpression(declaration) && ts.isBinaryExpression(declaration.parent))) {
                 type = getWidenedTypeFromAssignmentDeclaration(symbol);
             }
@@ -35878,7 +36173,7 @@ var ts;
                 if (symbol.flags & 512 /* ValueModule */) {
                     return getTypeOfFuncClassEnumModule(symbol);
                 }
-                type = reportCircularityError(symbol);
+                return reportCircularityError(symbol);
             }
             return type;
         }
@@ -36056,15 +36351,19 @@ var ts;
             return links.type;
         }
         function reportCircularityError(symbol) {
+            var declaration = symbol.valueDeclaration;
             // Check if variable has type annotation that circularly references the variable itself
-            if (ts.getEffectiveTypeAnnotationNode(symbol.valueDeclaration)) {
+            if (ts.getEffectiveTypeAnnotationNode(declaration)) {
                 error(symbol.valueDeclaration, ts.Diagnostics._0_is_referenced_directly_or_indirectly_in_its_own_type_annotation, symbolToString(symbol));
                 return errorType;
             }
-            // Otherwise variable has initializer that circularly references the variable itself
-            if (noImplicitAny) {
+            // Check if variable has initializer that circularly references the variable itself
+            if (noImplicitAny && (declaration.kind !== 151 /* Parameter */ || declaration.initializer)) {
                 error(symbol.valueDeclaration, ts.Diagnostics._0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer, symbolToString(symbol));
             }
+            // Circularities could also result from parameters in function expressions that end up
+            // having themselves as contextual types following type argument inference. In those cases
+            // we have already reported an implicit any error so we don't report anything here.
             return anyType;
         }
         function getTypeOfSymbol(symbol) {
@@ -36140,15 +36439,15 @@ var ts;
                     case 155 /* MethodSignature */:
                     case 165 /* FunctionType */:
                     case 166 /* ConstructorType */:
-                    case 289 /* JSDocFunctionType */:
+                    case 294 /* JSDocFunctionType */:
                     case 239 /* FunctionDeclaration */:
                     case 156 /* MethodDeclaration */:
                     case 196 /* FunctionExpression */:
                     case 197 /* ArrowFunction */:
                     case 242 /* TypeAliasDeclaration */:
-                    case 303 /* JSDocTemplateTag */:
-                    case 304 /* JSDocTypedefTag */:
-                    case 297 /* JSDocCallbackTag */:
+                    case 308 /* JSDocTemplateTag */:
+                    case 309 /* JSDocTypedefTag */:
+                    case 302 /* JSDocCallbackTag */:
                     case 181 /* MappedType */:
                     case 175 /* ConditionalType */:
                         var outerTypeParameters = getOuterTypeParameters(node, includeThisTypes);
@@ -36269,7 +36568,7 @@ var ts;
                                 ctorReturn = getReturnTypeOfSignature(ctorSig[0]);
                             }
                         }
-                        addRelatedInfo(err, ts.createDiagnosticForNode(baseConstructorType.symbol.declarations[0], ts.Diagnostics.Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1, symbolToString(baseConstructorType.symbol), typeToString(ctorReturn)));
+                        ts.addRelatedInfo(err, ts.createDiagnosticForNode(baseConstructorType.symbol.declarations[0], ts.Diagnostics.Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1, symbolToString(baseConstructorType.symbol), typeToString(ctorReturn)));
                     }
                     return type.resolvedBaseConstructorType = errorType;
                 }
@@ -36280,7 +36579,7 @@ var ts;
         function getBaseTypes(type) {
             if (!type.resolvedBaseTypes) {
                 if (type.objectFlags & 8 /* Tuple */) {
-                    type.resolvedBaseTypes = [createArrayType(getUnionType(type.typeParameters || ts.emptyArray))];
+                    type.resolvedBaseTypes = [createArrayType(getUnionType(type.typeParameters || ts.emptyArray), type.readonly)];
                 }
                 else if (type.symbol.flags & (32 /* Class */ | 64 /* Interface */)) {
                     if (type.symbol.flags & 32 /* Class */) {
@@ -36645,7 +36944,7 @@ var ts;
             }
             return false;
         }
-        /** A type parameter is thisless if its contraint is thisless, or if it has no constraint. */
+        /** A type parameter is thisless if its constraint is thisless, or if it has no constraint. */
         function isThislessTypeParameter(node) {
             var constraint = ts.getEffectiveConstraintOfTypeParameter(node);
             return !constraint || isThislessType(constraint);
@@ -36688,6 +36987,8 @@ var ts;
                         case 156 /* MethodDeclaration */:
                         case 155 /* MethodSignature */:
                         case 157 /* Constructor */:
+                        case 158 /* GetAccessor */:
+                        case 159 /* SetAccessor */:
                             return isThislessFunctionLikeDeclaration(declaration);
                     }
                 }
@@ -37019,8 +37320,18 @@ var ts;
             return sig;
         }
         function cloneSignature(sig) {
-            return createSignature(sig.declaration, sig.typeParameters, sig.thisParameter, sig.parameters, /*resolvedReturnType*/ undefined, 
+            var result = createSignature(sig.declaration, sig.typeParameters, sig.thisParameter, sig.parameters, /*resolvedReturnType*/ undefined, 
             /*resolvedTypePredicate*/ undefined, sig.minArgumentCount, sig.hasRestParameter, sig.hasLiteralTypes);
+            result.target = sig.target;
+            result.mapper = sig.mapper;
+            return result;
+        }
+        function createUnionSignature(signature, unionSignatures) {
+            var result = cloneSignature(signature);
+            result.unionSignatures = unionSignatures;
+            result.target = undefined;
+            result.mapper = undefined;
+            return result;
         }
         function getExpandedParameters(sig) {
             if (sig.hasRestParameter) {
@@ -37129,9 +37440,8 @@ var ts;
                                     var thisType = getUnionType(ts.map(unionSignatures, function (sig) { return sig.thisParameter ? getTypeOfSymbol(sig.thisParameter) : anyType; }), 2 /* Subtype */);
                                     thisParameter = createSymbolWithType(signature.thisParameter, thisType);
                                 }
-                                s = cloneSignature(signature);
+                                s = createUnionSignature(signature, unionSignatures);
                                 s.thisParameter = thisParameter;
-                                s.unionSignatures = unionSignatures;
                             }
                             (result || (result = [])).push(s);
                         }
@@ -37246,13 +37556,22 @@ var ts;
         function unionSpreadIndexInfos(info1, info2) {
             return info1 && info2 && createIndexInfo(getUnionType([info1.type, info2.type]), info1.isReadonly || info2.isReadonly);
         }
-        function includeMixinType(type, types, index) {
+        function findMixins(types) {
+            var constructorTypeCount = ts.countWhere(types, function (t) { return getSignaturesOfType(t, 1 /* Construct */).length > 0; });
+            var mixinFlags = ts.map(types, isMixinConstructorType);
+            if (constructorTypeCount > 0 && constructorTypeCount === ts.countWhere(mixinFlags, function (b) { return b; })) {
+                var firstMixinIndex = mixinFlags.indexOf(/*searchElement*/ true);
+                mixinFlags[firstMixinIndex] = false;
+            }
+            return mixinFlags;
+        }
+        function includeMixinType(type, types, mixinFlags, index) {
             var mixedTypes = [];
             for (var i = 0; i < types.length; i++) {
                 if (i === index) {
                     mixedTypes.push(type);
                 }
-                else if (isMixinConstructorType(types[i])) {
+                else if (mixinFlags[i]) {
                     mixedTypes.push(getReturnTypeOfSignature(getSignaturesOfType(types[i], 1 /* Construct */)[0]));
                 }
             }
@@ -37266,7 +37585,8 @@ var ts;
             var stringIndexInfo;
             var numberIndexInfo;
             var types = type.types;
-            var mixinCount = ts.countWhere(types, isMixinConstructorType);
+            var mixinFlags = findMixins(types);
+            var mixinCount = ts.countWhere(mixinFlags, function (b) { return b; });
             var _loop_6 = function (i) {
                 var t = type.types[i];
                 // When an intersection type contains mixin constructor types, the construct signatures from
@@ -37274,12 +37594,12 @@ var ts;
                 // other construct signatures in the intersection type. For example, the intersection type
                 // '{ new(...args: any[]) => A } & { new(s: string) => B }' has a single construct signature
                 // 'new(s: string) => A & B'.
-                if (mixinCount === 0 || mixinCount === types.length && i === 0 || !isMixinConstructorType(t)) {
+                if (!mixinFlags[i]) {
                     var signatures = getSignaturesOfType(t, 1 /* Construct */);
                     if (signatures.length && mixinCount > 0) {
                         signatures = ts.map(signatures, function (s) {
                             var clone = cloneSignature(s);
-                            clone.resolvedReturnType = includeMixinType(getReturnTypeOfSignature(s), types, i);
+                            clone.resolvedReturnType = includeMixinType(getReturnTypeOfSignature(s), types, mixinFlags, i);
                             return clone;
                         });
                     }
@@ -37323,6 +37643,15 @@ var ts;
                 var stringIndexInfo = void 0;
                 if (symbol.exports) {
                     members = getExportsOfSymbol(symbol);
+                    if (symbol === globalThisSymbol) {
+                        var varsOnly_1 = ts.createMap();
+                        members.forEach(function (p) {
+                            if (!(p.flags & 418 /* BlockScoped */)) {
+                                varsOnly_1.set(p.escapedName, p);
+                            }
+                        });
+                        members = varsOnly_1;
+                    }
                 }
                 setStructuredTypeMembers(type, members, ts.emptyArray, ts.emptyArray, undefined, undefined);
                 if (symbol.flags & 32 /* Class */) {
@@ -37622,7 +37951,7 @@ var ts;
                 var nameType = property.name && getLiteralTypeFromPropertyName(property.name);
                 var name = nameType && isTypeUsableAsPropertyName(nameType) ? getPropertyNameFromType(nameType) : undefined;
                 var expected = name === undefined ? undefined : getTypeOfPropertyOfType(contextualType, name);
-                return !!expected && isLiteralType(expected) && !isTypeIdenticalTo(getTypeOfNode(property), expected);
+                return !!expected && isLiteralType(expected) && !isTypeAssignableTo(getTypeOfNode(property), expected);
             });
         }
         function getAllPossiblePropertiesOfTypes(types) {
@@ -37655,6 +37984,9 @@ var ts;
             return hasNonCircularBaseConstraint(typeParameter) ? getConstraintFromTypeParameter(typeParameter) : undefined;
         }
         function getConstraintOfIndexedAccess(type) {
+            return hasNonCircularBaseConstraint(type) ? getConstraintFromIndexedAccess(type) : undefined;
+        }
+        function getConstraintFromIndexedAccess(type) {
             var objectType = getConstraintOfType(type.objectType) || type.objectType;
             if (objectType !== type.objectType) {
                 var constraint = getIndexedAccessType(objectType, type.indexType, /*accessNode*/ undefined, errorType);
@@ -37667,13 +37999,13 @@ var ts;
         }
         function getDefaultConstraintOfConditionalType(type) {
             if (!type.resolvedDefaultConstraint) {
-                var rootTrueType = type.root.trueType;
-                var rootTrueConstraint = !(rootTrueType.flags & 33554432 /* Substitution */)
-                    ? rootTrueType
-                    : (rootTrueType.substitute).flags & 3 /* AnyOrUnknown */
-                        ? rootTrueType.typeVariable
-                        : getIntersectionType([rootTrueType.substitute, rootTrueType.typeVariable]);
-                type.resolvedDefaultConstraint = getUnionType([instantiateType(rootTrueConstraint, type.combinedMapper || type.mapper), getFalseTypeFromConditionalType(type)]);
+                // An `any` branch of a conditional type would normally be viral - specifically, without special handling here,
+                // a conditional type with a single branch of type `any` would be assignable to anything, since it's constraint would simplify to
+                // just `any`. This result is _usually_ unwanted - so instead here we elide an `any` branch from the constraint type,
+                // in effect treating `any` like `never` rather than `unknown` in this location.
+                var trueConstraint = getInferredTrueTypeFromConditionalType(type);
+                var falseConstraint = type.falseType;
+                type.resolvedDefaultConstraint = isTypeAny(trueConstraint) ? falseConstraint : isTypeAny(falseConstraint) ? trueConstraint : getUnionType([trueConstraint, falseConstraint]);
             }
             return type.resolvedDefaultConstraint;
         }
@@ -37683,7 +38015,13 @@ var ts;
             // with its constraint. We do this because if the constraint is a union type it will be distributed
             // over the conditional type and possibly reduced. For example, 'T extends undefined ? never : T'
             // removes 'undefined' from T.
-            if (type.root.isDistributive) {
+            // We skip returning a distributive constraint for a restrictive instantiation of a conditional type
+            // as the constraint for all type params (check type included) have been replace with `unknown`, which
+            // is going to produce even more false positive/negative results than the distribute constraint already does.
+            // Please note: the distributive constraint is a kludge for emulating what a negated type could to do filter
+            // a union - once negated types exist and are applied to the conditional false branch, this "constraint"
+            // likely doesn't need to exist.
+            if (type.root.isDistributive && type.restrictiveInstantiation !== type) {
                 var simplified = getSimplifiedType(type.checkType);
                 var constraint = simplified === type.checkType ? getConstraintOfType(simplified) : simplified;
                 if (constraint && constraint !== type.checkType) {
@@ -37696,9 +38034,12 @@ var ts;
             }
             return undefined;
         }
-        function getConstraintOfConditionalType(type) {
+        function getConstraintFromConditionalType(type) {
             return getConstraintOfDistributiveConditionalType(type) || getDefaultConstraintOfConditionalType(type);
         }
+        function getConstraintOfConditionalType(type) {
+            return hasNonCircularBaseConstraint(type) ? getConstraintFromConditionalType(type) : undefined;
+        }
         function getUnionConstraintOfIntersection(type, targetIsUnion) {
             var constraints;
             var hasDisjointDomainType = false;
@@ -37772,18 +38113,31 @@ var ts;
                     if (!pushTypeResolution(t, 4 /* ImmediateBaseConstraint */)) {
                         return circularConstraintType;
                     }
-                    if (constraintDepth === 50) {
+                    if (constraintDepth >= 50) {
                         // We have reached 50 recursive invocations of getImmediateBaseConstraint and there is a
                         // very high likelyhood we're dealing with an infinite generic type that perpetually generates
                         // new type identities as we descend into it. We stop the recursion here and mark this type
                         // and the outer types as having circular constraints.
+                        error(currentNode, ts.Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
                         nonTerminating = true;
                         return t.immediateBaseConstraint = noConstraintType;
                     }
                     constraintDepth++;
                     var result = computeBaseConstraint(getSimplifiedType(t));
                     constraintDepth--;
-                    if (!popTypeResolution() || nonTerminating) {
+                    if (!popTypeResolution()) {
+                        if (t.flags & 262144 /* TypeParameter */) {
+                            var errorNode = getConstraintDeclaration(t);
+                            if (errorNode) {
+                                var diagnostic = error(errorNode, ts.Diagnostics.Type_parameter_0_has_a_circular_constraint, typeToString(t));
+                                if (currentNode && !ts.isNodeDescendantOf(errorNode, currentNode) && !ts.isNodeDescendantOf(currentNode, errorNode)) {
+                                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(currentNode, ts.Diagnostics.Circularity_originates_in_type_at_this_location));
+                                }
+                            }
+                        }
+                        result = circularConstraintType;
+                    }
+                    if (nonTerminating) {
                         result = circularConstraintType;
                     }
                     t.immediateBaseConstraint = result || noConstraintType;
@@ -37825,8 +38179,11 @@ var ts;
                     return baseIndexedAccess && baseIndexedAccess !== errorType ? getBaseConstraint(baseIndexedAccess) : undefined;
                 }
                 if (t.flags & 16777216 /* Conditional */) {
-                    var constraint = getConstraintOfConditionalType(t);
-                    return constraint && getBaseConstraint(constraint);
+                    var constraint = getConstraintFromConditionalType(t);
+                    constraintDepth++; // Penalize repeating conditional types (this captures the recursion within getConstraintFromConditionalType and carries it forward)
+                    var result = constraint && getBaseConstraint(constraint);
+                    constraintDepth--;
+                    return result;
                 }
                 if (t.flags & 33554432 /* Substitution */) {
                     return getBaseConstraint(t.substitute);
@@ -37887,7 +38244,7 @@ var ts;
             var typeVariable = getHomomorphicTypeVariable(type);
             if (typeVariable) {
                 var constraint = getConstraintOfTypeParameter(typeVariable);
-                if (constraint && (isArrayType(constraint) || isReadonlyArrayType(constraint) || isTupleType(constraint))) {
+                if (constraint && (isArrayType(constraint) || isTupleType(constraint))) {
                     var mapper = makeUnaryTypeMapper(typeVariable, constraint);
                     return instantiateType(type, combineTypeMappers(mapper, type.mapper));
                 }
@@ -37905,7 +38262,7 @@ var ts;
                 t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t) :
                     t.flags & 132 /* StringLike */ ? globalStringType :
                         t.flags & 296 /* NumberLike */ ? globalNumberType :
-                            t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType(/*reportErrors*/ languageVersion >= 6 /* ESNext */) :
+                            t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType(/*reportErrors*/ languageVersion >= 7 /* ESNext */) :
                                 t.flags & 528 /* BooleanLike */ ? globalBooleanType :
                                     t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType(/*reportErrors*/ languageVersion >= 2 /* ES2015 */) :
                                         t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType :
@@ -37913,7 +38270,7 @@ var ts;
                                                 t;
         }
         function createUnionOrIntersectionProperty(containingType, name) {
-            var props;
+            var propSet = ts.createMap();
             var indexTypes;
             var isUnion = containingType.flags & 1048576 /* Union */;
             var excludeModifiers = isUnion ? 24 /* NonPublicAccessibilityModifier */ : 0;
@@ -37929,7 +38286,10 @@ var ts;
                     var modifiers = prop ? ts.getDeclarationModifierFlagsFromSymbol(prop) : 0;
                     if (prop && !(modifiers & excludeModifiers)) {
                         commonFlags &= prop.flags;
-                        props = ts.appendIfUnique(props, prop);
+                        var id = "" + getSymbolId(prop);
+                        if (!propSet.has(id)) {
+                            propSet.set(id, prop);
+                        }
                         checkFlags |= (isReadonlySymbol(prop) ? 8 /* Readonly */ : 0) |
                             (!(modifiers & 24 /* NonPublicAccessibilityModifier */) ? 128 /* ContainsPublic */ : 0) |
                             (modifiers & 16 /* Protected */ ? 256 /* ContainsProtected */ : 0) |
@@ -37951,9 +38311,10 @@ var ts;
                     }
                 }
             }
-            if (!props) {
+            if (!propSet.size) {
                 return undefined;
             }
+            var props = ts.arrayFrom(propSet.values());
             if (props.length === 1 && !(checkFlags & 16 /* Partial */) && !indexTypes) {
                 return props[0];
             }
@@ -38125,10 +38486,10 @@ var ts;
         function isJSDocOptionalParameter(node) {
             return ts.isInJSFile(node) && (
             // node.type should only be a JSDocOptionalType when node is a parameter of a JSDocFunctionType
-            node.type && node.type.kind === 288 /* JSDocOptionalType */
+            node.type && node.type.kind === 293 /* JSDocOptionalType */
                 || ts.getJSDocParameterTags(node).some(function (_a) {
                     var isBracketed = _a.isBracketed, typeExpression = _a.typeExpression;
-                    return isBracketed || !!typeExpression && typeExpression.type.kind === 288 /* JSDocOptionalType */;
+                    return isBracketed || !!typeExpression && typeExpression.type.kind === 293 /* JSDocOptionalType */;
                 }));
         }
         function tryFindAmbientModule(moduleName, withAugmentations) {
@@ -38162,7 +38523,7 @@ var ts;
                 return false;
             }
             var isBracketed = node.isBracketed, typeExpression = node.typeExpression;
-            return isBracketed || !!typeExpression && typeExpression.type.kind === 288 /* JSDocOptionalType */;
+            return isBracketed || !!typeExpression && typeExpression.type.kind === 293 /* JSDocOptionalType */;
         }
         function createIdentifierTypePredicate(parameterName, parameterIndex, type) {
             return { kind: 1 /* Identifier */, parameterName: parameterName, parameterIndex: parameterIndex, type: type };
@@ -38396,32 +38757,23 @@ var ts;
                         }
                     }
                     signature.resolvedTypePredicate = type && ts.isTypePredicateNode(type) ?
-                        createTypePredicateFromTypePredicateNode(type, signature.declaration) :
+                        createTypePredicateFromTypePredicateNode(type, signature) :
                         jsdocPredicate || noTypePredicate;
                 }
                 ts.Debug.assert(!!signature.resolvedTypePredicate);
             }
             return signature.resolvedTypePredicate === noTypePredicate ? undefined : signature.resolvedTypePredicate;
         }
-        function createTypePredicateFromTypePredicateNode(node, func) {
+        function createTypePredicateFromTypePredicateNode(node, signature) {
             var parameterName = node.parameterName;
             var type = getTypeFromTypeNode(node.type);
             if (parameterName.kind === 72 /* Identifier */) {
-                return createIdentifierTypePredicate(parameterName.escapedText, getTypePredicateParameterIndex(func.parameters, parameterName), type);
+                return createIdentifierTypePredicate(parameterName.escapedText, ts.findIndex(signature.parameters, function (p) { return p.escapedName === parameterName.escapedText; }), type);
             }
             else {
                 return createThisTypePredicate(type);
             }
         }
-        function getTypePredicateParameterIndex(parameterList, parameter) {
-            for (var i = 0; i < parameterList.length; i++) {
-                var param = parameterList[i];
-                if (param.name.kind === 72 /* Identifier */ && param.name.escapedText === parameter.escapedText) {
-                    return i;
-                }
-            }
-            return -1;
-        }
         function getReturnTypeOfSignature(signature) {
             if (!signature.resolvedReturnType) {
                 if (!pushTypeResolution(signature, 3 /* ResolvedReturnType */)) {
@@ -38493,8 +38845,19 @@ var ts;
             }
             return undefined;
         }
-        function getSignatureInstantiation(signature, typeArguments, isJavascript) {
-            return getSignatureInstantiationWithoutFillingInTypeArguments(signature, fillMissingTypeArguments(typeArguments, signature.typeParameters, getMinTypeArgumentCount(signature.typeParameters), isJavascript));
+        function getSignatureInstantiation(signature, typeArguments, isJavascript, inferredTypeParameters) {
+            var instantiatedSignature = getSignatureInstantiationWithoutFillingInTypeArguments(signature, fillMissingTypeArguments(typeArguments, signature.typeParameters, getMinTypeArgumentCount(signature.typeParameters), isJavascript));
+            if (inferredTypeParameters) {
+                var returnSignature = getSingleCallSignature(getReturnTypeOfSignature(instantiatedSignature));
+                if (returnSignature) {
+                    var newReturnSignature = cloneSignature(returnSignature);
+                    newReturnSignature.typeParameters = inferredTypeParameters;
+                    var newInstantiatedSignature = cloneSignature(instantiatedSignature);
+                    newInstantiatedSignature.resolvedReturnType = getOrCreateTypeFromSignature(newReturnSignature);
+                    return newInstantiatedSignature;
+                }
+            }
+            return instantiatedSignature;
         }
         function getSignatureInstantiationWithoutFillingInTypeArguments(signature, typeArguments) {
             var instantiations = signature.instantiations || (signature.instantiations = ts.createMap());
@@ -38689,10 +39052,10 @@ var ts;
             for (var _i = 0, types_5 = types; _i < types_5.length; _i++) {
                 var type = types_5[_i];
                 if (!(type.flags & excludeKinds)) {
-                    result |= type.flags;
+                    result |= ts.getObjectFlags(type);
                 }
             }
-            return result & 939524096 /* PropagatingFlags */;
+            return result & 917504 /* PropagatingFlags */;
         }
         function createTypeReference(target, typeArguments) {
             var id = getTypeListId(typeArguments);
@@ -38700,7 +39063,7 @@ var ts;
             if (!type) {
                 type = createObjectType(4 /* Reference */, target.symbol);
                 target.instantiations.set(id, type);
-                type.flags |= typeArguments ? getPropagatingFlagsOfTypes(typeArguments, /*excludeKinds*/ 0) : 0;
+                type.objectFlags |= typeArguments ? getPropagatingFlagsOfTypes(typeArguments, /*excludeKinds*/ 0) : 0;
                 type.target = target;
                 type.typeArguments = typeArguments;
             }
@@ -38866,7 +39229,7 @@ var ts;
         }
         function getTypeReferenceTypeWorker(node, symbol, typeArguments) {
             if (symbol.flags & (32 /* Class */ | 64 /* Interface */)) {
-                if (symbol.valueDeclaration && ts.isBinaryExpression(symbol.valueDeclaration.parent)) {
+                if (symbol.valueDeclaration && symbol.valueDeclaration.parent && ts.isBinaryExpression(symbol.valueDeclaration.parent)) {
                     var jsdocType = getJSDocTypeReference(node, symbol, typeArguments);
                     if (jsdocType) {
                         return jsdocType;
@@ -38887,6 +39250,9 @@ var ts;
             }
         }
         function getSubstitutionType(typeVariable, substitute) {
+            if (substitute.flags & 3 /* AnyOrUnknown */) {
+                return typeVariable;
+            }
             var result = createType(33554432 /* Substitution */);
             result.typeVariable = typeVariable;
             result.substitute = substitute;
@@ -38902,7 +39268,7 @@ var ts;
         }
         function getConstrainedTypeVariable(typeVariable, node) {
             var constraints;
-            while (node && !ts.isStatement(node) && node.kind !== 291 /* JSDocComment */) {
+            while (node && !ts.isStatement(node) && node.kind !== 296 /* JSDocComment */) {
                 var parent = node.parent;
                 if (parent.kind === 175 /* ConditionalType */ && node === parent.trueType) {
                     var constraint = getImpliedConstraint(typeVariable, parent.checkType, parent.extendsType);
@@ -39134,19 +39500,19 @@ var ts;
         function createIterableIteratorType(iteratedType) {
             return createTypeFromGenericGlobalType(getGlobalIterableIteratorType(/*reportErrors*/ true), [iteratedType]);
         }
-        function createArrayType(elementType) {
-            return createTypeFromGenericGlobalType(globalArrayType, [elementType]);
-        }
-        function createReadonlyArrayType(elementType) {
-            return createTypeFromGenericGlobalType(globalReadonlyArrayType, [elementType]);
+        function createArrayType(elementType, readonly) {
+            return createTypeFromGenericGlobalType(readonly ? globalReadonlyArrayType : globalArrayType, [elementType]);
         }
         function getTypeFromArrayTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                links.resolvedType = createArrayType(getTypeFromTypeNode(node.elementType));
+                links.resolvedType = createArrayType(getTypeFromTypeNode(node.elementType), isReadonlyTypeOperator(node.parent));
             }
             return links.resolvedType;
         }
+        function isReadonlyTypeOperator(node) {
+            return ts.isTypeOperatorNode(node) && node.operator === 133 /* ReadonlyKeyword */;
+        }
         // We represent tuple types as type references to synthesized generic interface types created by
         // this function. The types are of the form:
         //
@@ -39154,7 +39520,7 @@ var ts;
         //
         // Note that the generic type created by this function has no symbol associated with it. The same
         // is true for each of the synthesized type parameters.
-        function createTupleTypeOfArity(arity, minLength, hasRestElement, associatedNames) {
+        function createTupleTypeOfArity(arity, minLength, hasRestElement, readonly, associatedNames) {
             var typeParameters;
             var properties = [];
             var maxLength = hasRestElement ? arity - 1 : arity;
@@ -39163,7 +39529,7 @@ var ts;
                 for (var i = 0; i < arity; i++) {
                     var typeParameter = typeParameters[i] = createTypeParameter();
                     if (i < maxLength) {
-                        var property = createSymbol(4 /* Property */ | (i >= minLength ? 16777216 /* Optional */ : 0), "" + i);
+                        var property = createSymbol(4 /* Property */ | (i >= minLength ? 16777216 /* Optional */ : 0), "" + i, readonly ? 8 /* Readonly */ : 0);
                         property.type = typeParameter;
                         properties.push(property);
                     }
@@ -39193,25 +39559,27 @@ var ts;
             type.declaredNumberIndexInfo = undefined;
             type.minLength = minLength;
             type.hasRestElement = hasRestElement;
+            type.readonly = readonly;
             type.associatedNames = associatedNames;
             return type;
         }
-        function getTupleTypeOfArity(arity, minLength, hasRestElement, associatedNames) {
-            var key = arity + (hasRestElement ? "+" : ",") + minLength + (associatedNames && associatedNames.length ? "," + associatedNames.join(",") : "");
+        function getTupleTypeOfArity(arity, minLength, hasRestElement, readonly, associatedNames) {
+            var key = arity + (hasRestElement ? "+" : ",") + minLength + (readonly ? "R" : "") + (associatedNames && associatedNames.length ? "," + associatedNames.join(",") : "");
             var type = tupleTypes.get(key);
             if (!type) {
-                tupleTypes.set(key, type = createTupleTypeOfArity(arity, minLength, hasRestElement, associatedNames));
+                tupleTypes.set(key, type = createTupleTypeOfArity(arity, minLength, hasRestElement, readonly, associatedNames));
             }
             return type;
         }
-        function createTupleType(elementTypes, minLength, hasRestElement, associatedNames) {
+        function createTupleType(elementTypes, minLength, hasRestElement, readonly, associatedNames) {
             if (minLength === void 0) { minLength = elementTypes.length; }
             if (hasRestElement === void 0) { hasRestElement = false; }
+            if (readonly === void 0) { readonly = false; }
             var arity = elementTypes.length;
             if (arity === 1 && hasRestElement) {
-                return createArrayType(elementTypes[0]);
+                return createArrayType(elementTypes[0], readonly);
             }
-            var tupleType = getTupleTypeOfArity(arity, minLength, arity > 0 && hasRestElement, associatedNames);
+            var tupleType = getTupleTypeOfArity(arity, minLength, arity > 0 && hasRestElement, readonly, associatedNames);
             return elementTypes.length ? createTypeReference(tupleType, elementTypes) : tupleType;
         }
         function getTypeFromTupleTypeNode(node) {
@@ -39224,7 +39592,7 @@ var ts;
                     var type = getTypeFromTypeNode(n);
                     return n === restElement_1 && getIndexTypeOfType(type, 1 /* Number */) || type;
                 });
-                links.resolvedType = createTupleType(elementTypes, minLength, !!restElement_1);
+                links.resolvedType = createTupleType(elementTypes, minLength, !!restElement_1, isReadonlyTypeOperator(node.parent));
             }
             return links.resolvedType;
         }
@@ -39234,7 +39602,7 @@ var ts;
                 // don't slice off rest element
                 index = Math.min(index, getTypeReferenceArity(type) - 1);
             }
-            return createTupleType((type.typeArguments || ts.emptyArray).slice(index), Math.max(0, tuple.minLength - index), tuple.hasRestElement, tuple.associatedNames && tuple.associatedNames.slice(index));
+            return createTupleType((type.typeArguments || ts.emptyArray).slice(index), Math.max(0, tuple.minLength - index), tuple.hasRestElement, tuple.readonly, tuple.associatedNames && tuple.associatedNames.slice(index));
         }
         function getTypeFromOptionalTypeNode(node) {
             var type = getTypeFromTypeNode(node.type);
@@ -39292,12 +39660,14 @@ var ts;
             // intersections of unit types into 'never' upon construction, but deferring the reduction makes it
             // easier to reason about their origin.
             if (!(flags & 131072 /* Never */ || flags & 2097152 /* Intersection */ && isEmptyIntersectionType(type))) {
-                includes |= flags & ~939524096 /* ConstructionFlags */;
+                includes |= flags & 1835007 /* IncludesMask */;
+                if (flags & 66846720 /* StructuredOrInstantiable */)
+                    includes |= 262144 /* IncludesStructuredOrInstantiable */;
                 if (type === wildcardType)
-                    includes |= 268435456 /* Wildcard */;
+                    includes |= 4194304 /* IncludesWildcard */;
                 if (!strictNullChecks && flags & 98304 /* Nullable */) {
-                    if (!(flags & 134217728 /* ContainsWideningType */))
-                        includes |= 134217728 /* NonWideningType */;
+                    if (!(ts.getObjectFlags(type) & 131072 /* ContainsWideningType */))
+                        includes |= 2097152 /* IncludesNonWideningType */;
                 }
                 else {
                     var len = typeSet.length;
@@ -39318,17 +39688,6 @@ var ts;
             }
             return includes;
         }
-        function isSubtypeOfAny(source, targets) {
-            for (var _i = 0, targets_1 = targets; _i < targets_1.length; _i++) {
-                var target = targets_1[_i];
-                if (source !== target && isTypeSubtypeOf(source, target) && (!(ts.getObjectFlags(getTargetType(source)) & 1 /* Class */) ||
-                    !(ts.getObjectFlags(getTargetType(target)) & 1 /* Class */) ||
-                    isTypeDerivedFrom(source, target))) {
-                    return true;
-                }
-            }
-            return false;
-        }
         function isSetOfLiteralsFromSameEnum(types) {
             var first = types[0];
             if (first.flags & 1024 /* EnumLiteral */) {
@@ -39343,17 +39702,42 @@ var ts;
             }
             return false;
         }
-        function removeSubtypes(types) {
-            if (types.length === 0 || isSetOfLiteralsFromSameEnum(types)) {
-                return;
+        function removeSubtypes(types, primitivesOnly) {
+            var len = types.length;
+            if (len === 0 || isSetOfLiteralsFromSameEnum(types)) {
+                return true;
             }
-            var i = types.length;
+            var i = len;
+            var count = 0;
             while (i > 0) {
                 i--;
-                if (isSubtypeOfAny(types[i], types)) {
-                    ts.orderedRemoveItemAt(types, i);
+                var source = types[i];
+                for (var _i = 0, types_7 = types; _i < types_7.length; _i++) {
+                    var target = types_7[_i];
+                    if (source !== target) {
+                        if (count === 100000) {
+                            // After 100000 subtype checks we estimate the remaining amount of work by assuming the
+                            // same ratio of checks per element. If the estimated number of remaining type checks is
+                            // greater than an upper limit we deem the union type too complex to represent. The
+                            // upper limit is 25M for unions of primitives only, and 1M otherwise. This for example
+                            // caps union types at 5000 unique literal types and 1000 unique object types.
+                            var estimatedCount = (count / (len - i)) * len;
+                            if (estimatedCount > (primitivesOnly ? 25000000 : 1000000)) {
+                                error(currentNode, ts.Diagnostics.Expression_produces_a_union_type_that_is_too_complex_to_represent);
+                                return false;
+                            }
+                        }
+                        count++;
+                        if (isTypeSubtypeOf(source, target) && (!(ts.getObjectFlags(getTargetType(source)) & 1 /* Class */) ||
+                            !(ts.getObjectFlags(getTargetType(target)) & 1 /* Class */) ||
+                            isTypeDerivedFrom(source, target))) {
+                            ts.orderedRemoveItemAt(types, i);
+                            break;
+                        }
+                    }
                 }
             }
+            return true;
         }
         function removeRedundantLiteralTypes(types, includes) {
             var i = types.length;
@@ -39389,25 +39773,27 @@ var ts;
             var includes = addTypesToUnion(typeSet, 0, types);
             if (unionReduction !== 0 /* None */) {
                 if (includes & 3 /* AnyOrUnknown */) {
-                    return includes & 1 /* Any */ ? includes & 268435456 /* Wildcard */ ? wildcardType : anyType : unknownType;
+                    return includes & 1 /* Any */ ? includes & 4194304 /* IncludesWildcard */ ? wildcardType : anyType : unknownType;
                 }
                 switch (unionReduction) {
                     case 1 /* Literal */:
-                        if (includes & 8576 /* StringOrNumberLiteralOrUnique */ | 512 /* BooleanLiteral */) {
+                        if (includes & (2944 /* Literal */ | 8192 /* UniqueESSymbol */)) {
                             removeRedundantLiteralTypes(typeSet, includes);
                         }
                         break;
                     case 2 /* Subtype */:
-                        removeSubtypes(typeSet);
+                        if (!removeSubtypes(typeSet, !(includes & 262144 /* IncludesStructuredOrInstantiable */))) {
+                            return errorType;
+                        }
                         break;
                 }
                 if (typeSet.length === 0) {
-                    return includes & 65536 /* Null */ ? includes & 134217728 /* NonWideningType */ ? nullType : nullWideningType :
-                        includes & 32768 /* Undefined */ ? includes & 134217728 /* NonWideningType */ ? undefinedType : undefinedWideningType :
+                    return includes & 65536 /* Null */ ? includes & 2097152 /* IncludesNonWideningType */ ? nullType : nullWideningType :
+                        includes & 32768 /* Undefined */ ? includes & 2097152 /* IncludesNonWideningType */ ? undefinedType : undefinedWideningType :
                             neverType;
                 }
             }
-            return getUnionTypeFromSortedList(typeSet, !(includes & 66994211 /* NotPrimitiveUnion */), aliasSymbol, aliasTypeArguments);
+            return getUnionTypeFromSortedList(typeSet, includes & 66994211 /* NotPrimitiveUnion */ ? 0 : 65536 /* PrimitiveUnion */, aliasSymbol, aliasTypeArguments);
         }
         function getUnionTypePredicate(signatures) {
             var first;
@@ -39444,7 +39830,7 @@ var ts;
                 : !ts.isIdentifierTypePredicate(b);
         }
         // This function assumes the constituent type list is sorted and deduplicated.
-        function getUnionTypeFromSortedList(types, primitiveTypesOnly, aliasSymbol, aliasTypeArguments) {
+        function getUnionTypeFromSortedList(types, objectFlags, aliasSymbol, aliasTypeArguments) {
             if (types.length === 0) {
                 return neverType;
             }
@@ -39454,11 +39840,10 @@ var ts;
             var id = getTypeListId(types);
             var type = unionTypes.get(id);
             if (!type) {
-                var propagatedFlags = getPropagatingFlagsOfTypes(types, /*excludeKinds*/ 98304 /* Nullable */);
-                type = createType(1048576 /* Union */ | propagatedFlags);
+                type = createType(1048576 /* Union */);
                 unionTypes.set(id, type);
+                type.objectFlags = objectFlags | getPropagatingFlagsOfTypes(types, /*excludeKinds*/ 98304 /* Nullable */);
                 type.types = types;
-                type.primitiveTypesOnly = primitiveTypesOnly;
                 /*
                 Note: This is the alias symbol (or lack thereof) that we see when we first encounter this union type.
                 For aliases of identical unions, eg `type T = A | B; type U = A | B`, the symbol of the first alias encountered is the aliasSymbol.
@@ -39484,16 +39869,16 @@ var ts;
                 return addTypesToIntersection(typeSet, includes, type.types);
             }
             if (isEmptyAnonymousObjectType(type)) {
-                if (!(includes & 536870912 /* EmptyObject */)) {
-                    includes |= 536870912 /* EmptyObject */;
+                if (!(includes & 8388608 /* IncludesEmptyObject */)) {
+                    includes |= 8388608 /* IncludesEmptyObject */;
                     typeSet.push(type);
                 }
             }
             else {
-                includes |= flags & ~939524096 /* ConstructionFlags */;
+                includes |= flags & 1835007 /* IncludesMask */;
                 if (flags & 3 /* AnyOrUnknown */) {
                     if (type === wildcardType)
-                        includes |= 268435456 /* Wildcard */;
+                        includes |= 4194304 /* IncludesWildcard */;
                 }
                 else if ((strictNullChecks || !(flags & 98304 /* Nullable */)) && !ts.contains(typeSet, type)) {
                     typeSet.push(type);
@@ -39504,8 +39889,8 @@ var ts;
         // Add the given types to the given type set. Order is preserved, freshness is removed from literal
         // types, duplicates are removed, and nested types of the given kind are flattened into the set.
         function addTypesToIntersection(typeSet, includes, types) {
-            for (var _i = 0, types_7 = types; _i < types_7.length; _i++) {
-                var type = types_7[_i];
+            for (var _i = 0, types_8 = types; _i < types_8.length; _i++) {
+                var type = types_8[_i];
                 includes = addTypeToIntersection(typeSet, includes, getRegularTypeOfLiteralType(type));
             }
             return includes;
@@ -39548,7 +39933,7 @@ var ts;
         // other unions and return true. Otherwise, do nothing and return false.
         function intersectUnionsOfPrimitiveTypes(types) {
             var unionTypes;
-            var index = ts.findIndex(types, function (t) { return !!(t.flags & 1048576 /* Union */) && t.primitiveTypesOnly; });
+            var index = ts.findIndex(types, function (t) { return !!(ts.getObjectFlags(t) & 65536 /* PrimitiveUnion */); });
             if (index < 0) {
                 return false;
             }
@@ -39557,7 +39942,7 @@ var ts;
             // the unionTypes array.
             while (i < types.length) {
                 var t = types[i];
-                if (t.flags & 1048576 /* Union */ && t.primitiveTypesOnly) {
+                if (ts.getObjectFlags(t) & 65536 /* PrimitiveUnion */) {
                     (unionTypes || (unionTypes = [types[index]])).push(t);
                     ts.orderedRemoveItemAt(types, i);
                 }
@@ -39586,7 +39971,7 @@ var ts;
                 }
             }
             // Finally replace the first union with the result
-            types[index] = getUnionTypeFromSortedList(result, /*primitiveTypesOnly*/ true);
+            types[index] = getUnionTypeFromSortedList(result, 65536 /* PrimitiveUnion */);
             return true;
         }
         // We normalize combinations of intersection and union types based on the distributive property of the '&'
@@ -39606,7 +39991,7 @@ var ts;
                 return neverType;
             }
             if (includes & 1 /* Any */) {
-                return includes & 268435456 /* Wildcard */ ? wildcardType : anyType;
+                return includes & 4194304 /* IncludesWildcard */ ? wildcardType : anyType;
             }
             if (!strictNullChecks && includes & 98304 /* Nullable */) {
                 return includes & 32768 /* Undefined */ ? undefinedType : nullType;
@@ -39617,7 +40002,7 @@ var ts;
                 includes & 4096 /* ESSymbol */ && includes & 8192 /* UniqueESSymbol */) {
                 removeRedundantPrimitiveTypes(typeSet, includes);
             }
-            if (includes & 536870912 /* EmptyObject */ && includes & 524288 /* Object */) {
+            if (includes & 8388608 /* IncludesEmptyObject */ && includes & 524288 /* Object */) {
                 ts.orderedRemoveItemAt(typeSet, ts.findIndex(typeSet, isEmptyAnonymousObjectType));
             }
             if (typeSet.length === 0) {
@@ -39642,9 +40027,9 @@ var ts;
             var id = getTypeListId(typeSet);
             var type = intersectionTypes.get(id);
             if (!type) {
-                var propagatedFlags = getPropagatingFlagsOfTypes(typeSet, /*excludeKinds*/ 98304 /* Nullable */);
-                type = createType(2097152 /* Intersection */ | propagatedFlags);
+                type = createType(2097152 /* Intersection */);
                 intersectionTypes.set(id, type);
+                type.objectFlags = getPropagatingFlagsOfTypes(typeSet, /*excludeKinds*/ 98304 /* Nullable */);
                 type.types = typeSet;
                 type.aliasSymbol = aliasSymbol; // See comment in `getUnionTypeFromSortedList`.
                 type.aliasTypeArguments = aliasTypeArguments;
@@ -39699,7 +40084,7 @@ var ts;
             return neverType;
         }
         function getLiteralTypeFromProperties(type, include) {
-            return getUnionType(ts.map(getPropertiesOfType(type), function (t) { return getLiteralTypeFromProperty(t, include); }));
+            return getUnionType(ts.map(getPropertiesOfType(type), function (p) { return getLiteralTypeFromProperty(p, include); }));
         }
         function getNonEnumNumberIndexInfo(type) {
             var numberIndexInfo = getIndexInfoOfType(type, 1 /* Number */);
@@ -39741,6 +40126,9 @@ var ts;
                             ? getESSymbolLikeTypeForNode(ts.walkUpParenthesizedTypes(node.parent))
                             : errorType;
                         break;
+                    case 133 /* ReadonlyKeyword */:
+                        links.resolvedType = getTypeFromTypeNode(node.type);
+                        break;
                 }
             }
             return links.resolvedType; // TODO: GH#18217
@@ -39843,7 +40231,10 @@ var ts;
                     return anyType;
                 }
                 if (accessExpression && !isConstEnumObjectType(objectType)) {
-                    if (noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors) {
+                    if (objectType.symbol === globalThisSymbol && propName !== undefined && globalThisSymbol.exports.has(propName) && (globalThisSymbol.exports.get(propName).flags & 418 /* BlockScoped */)) {
+                        error(accessExpression, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(propName), typeToString(objectType));
+                    }
+                    else if (noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors) {
                         if (propName !== undefined && typeHasStaticProperty(propName, objectType)) {
                             error(accessExpression, ts.Diagnostics.Property_0_is_a_static_member_of_type_1, propName, typeToString(objectType));
                         }
@@ -39895,7 +40286,7 @@ var ts;
                         : accessNode;
         }
         function isGenericObjectType(type) {
-            return maybeTypeOfKind(type, 58982400 /* InstantiableNonPrimitive */ | 134217728 /* GenericMappedType */);
+            return maybeTypeOfKind(type, 58982400 /* InstantiableNonPrimitive */ | 131072 /* GenericMappedType */);
         }
         function isGenericIndexType(type) {
             return maybeTypeOfKind(type, 58982400 /* InstantiableNonPrimitive */ | 4194304 /* Index */);
@@ -39941,12 +40332,15 @@ var ts;
             // that substitutes the index type for P. For example, for an index access { [P in K]: Box<T[P]> }[X], we
             // construct the type Box<T[X]>.
             if (isGenericMappedType(objectType)) {
-                var mapper = createTypeMapper([getTypeParameterFromMappedType(objectType)], [type.indexType]);
-                var templateMapper = combineTypeMappers(objectType.mapper, mapper);
-                return type.simplified = mapType(instantiateType(getTemplateTypeFromMappedType(objectType), templateMapper), getSimplifiedType);
+                return type.simplified = mapType(substituteIndexedMappedType(objectType, type.indexType), getSimplifiedType);
             }
             return type.simplified = type;
         }
+        function substituteIndexedMappedType(objectType, index) {
+            var mapper = createTypeMapper([getTypeParameterFromMappedType(objectType)], [index]);
+            var templateMapper = combineTypeMappers(objectType.mapper, mapper);
+            return instantiateType(getTemplateTypeFromMappedType(objectType), templateMapper);
+        }
         function getIndexedAccessType(objectType, indexType, accessNode, missingType) {
             if (missingType === void 0) { missingType = accessNode ? errorType : unknownType; }
             if (objectType === wildcardType || indexType === wildcardType) {
@@ -40028,13 +40422,48 @@ var ts;
         function getActualTypeVariable(type) {
             return type.flags & 33554432 /* Substitution */ ? type.typeVariable : type;
         }
+        /**
+         * Invokes union simplification logic to determine if an intersection is considered empty as a union constituent
+         */
+        function isIntersectionEmpty(type1, type2) {
+            return !!(getUnionType([intersectTypes(type1, type2), neverType]).flags & 131072 /* Never */);
+        }
         function getConditionalType(root, mapper) {
             var checkType = instantiateType(root.checkType, mapper);
             var extendsType = instantiateType(root.extendsType, mapper);
             if (checkType === wildcardType || extendsType === wildcardType) {
                 return wildcardType;
             }
-            var checkTypeInstantiable = maybeTypeOfKind(checkType, 63176704 /* Instantiable */ | 134217728 /* GenericMappedType */);
+            var trueType = instantiateType(root.trueType, mapper);
+            var falseType = instantiateType(root.falseType, mapper);
+            var instantiationId = "" + (root.isDistributive ? "d" : "") + getTypeId(checkType) + ">" + getTypeId(extendsType) + "?" + getTypeId(trueType) + ":" + getTypeId(falseType);
+            var result = conditionalTypes.get(instantiationId);
+            if (result) {
+                return result;
+            }
+            var newResult = getConditionalTypeWorker(root, mapper, checkType, extendsType, trueType, falseType);
+            conditionalTypes.set(instantiationId, newResult);
+            return newResult;
+        }
+        function getConditionalTypeWorker(root, mapper, checkType, extendsType, trueType, falseType) {
+            // Simplifications for types of the form `T extends U ? T : never` and `T extends U ? never : T`.
+            if (falseType.flags & 131072 /* Never */ && isTypeIdenticalTo(getActualTypeVariable(trueType), getActualTypeVariable(checkType))) {
+                if (checkType.flags & 1 /* Any */ || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
+                    return trueType;
+                }
+                else if (isIntersectionEmpty(checkType, extendsType)) { // Always false
+                    return neverType;
+                }
+            }
+            else if (trueType.flags & 131072 /* Never */ && isTypeIdenticalTo(getActualTypeVariable(falseType), getActualTypeVariable(checkType))) {
+                if (!(checkType.flags & 1 /* Any */) && isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
+                    return neverType;
+                }
+                else if (checkType.flags & 1 /* Any */ || isIntersectionEmpty(checkType, extendsType)) { // Always false
+                    return falseType;
+                }
+            }
+            var checkTypeInstantiable = maybeTypeOfKind(checkType, 63176704 /* Instantiable */ | 131072 /* GenericMappedType */);
             var combinedMapper;
             if (root.inferTypeParameters) {
                 var context = createInferenceContext(root.inferTypeParameters, /*signature*/ undefined, 0 /* None */);
@@ -40044,25 +40473,25 @@ var ts;
                     // types rules (i.e. proper contravariance) for inferences.
                     inferTypes(context.inferences, checkType, extendsType, 32 /* NoConstraints */ | 64 /* AlwaysStrict */);
                 }
-                combinedMapper = combineTypeMappers(mapper, context);
+                combinedMapper = combineTypeMappers(mapper, context.mapper);
             }
             // Instantiate the extends type including inferences for 'infer T' type parameters
             var inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
             // We attempt to resolve the conditional type only when the check and extends types are non-generic
-            if (!checkTypeInstantiable && !maybeTypeOfKind(inferredExtendsType, 63176704 /* Instantiable */ | 134217728 /* GenericMappedType */)) {
+            if (!checkTypeInstantiable && !maybeTypeOfKind(inferredExtendsType, 63176704 /* Instantiable */ | 131072 /* GenericMappedType */)) {
                 if (inferredExtendsType.flags & 3 /* AnyOrUnknown */) {
-                    return instantiateType(root.trueType, mapper);
+                    return trueType;
                 }
                 // Return union of trueType and falseType for 'any' since it matches anything
                 if (checkType.flags & 1 /* Any */) {
-                    return getUnionType([instantiateType(root.trueType, combinedMapper || mapper), instantiateType(root.falseType, mapper)]);
+                    return getUnionType([instantiateType(root.trueType, combinedMapper || mapper), falseType]);
                 }
-                // Return falseType for a definitely false extends check. We check an instantations of the two
+                // Return falseType for a definitely false extends check. We check an instantiations of the two
                 // types with type parameters mapped to the wildcard type, the most permissive instantiations
                 // possible (the wildcard type is assignable to and from all types). If those are not related,
-                // then no instatiations will be and we can just return the false branch type.
+                // then no instantiations will be and we can just return the false branch type.
                 if (!isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType))) {
-                    return instantiateType(root.falseType, mapper);
+                    return falseType;
                 }
                 // Return trueType for a definitely true extends check. We check instantiations of the two
                 // types with type parameters mapped to their restrictive form, i.e. a form of the type parameter
@@ -40074,6 +40503,9 @@ var ts;
                 }
             }
             // Return a deferred type for a check that is neither definitely true nor definitely false
+            return getDeferredConditionalType(root, mapper, combinedMapper, checkType, extendsType, trueType, falseType);
+        }
+        function getDeferredConditionalType(root, mapper, combinedMapper, checkType, extendsType, trueType, falseType) {
             var erasedCheckType = getActualTypeVariable(checkType);
             var result = createType(16777216 /* Conditional */);
             result.root = root;
@@ -40081,15 +40513,14 @@ var ts;
             result.extendsType = extendsType;
             result.mapper = mapper;
             result.combinedMapper = combinedMapper;
+            result.trueType = trueType;
+            result.falseType = falseType;
             result.aliasSymbol = root.aliasSymbol;
             result.aliasTypeArguments = instantiateTypes(root.aliasTypeArguments, mapper); // TODO: GH#18217
             return result;
         }
-        function getTrueTypeFromConditionalType(type) {
-            return type.resolvedTrueType || (type.resolvedTrueType = instantiateType(type.root.trueType, type.mapper));
-        }
-        function getFalseTypeFromConditionalType(type) {
-            return type.resolvedFalseType || (type.resolvedFalseType = instantiateType(type.root.falseType, type.mapper));
+        function getInferredTrueTypeFromConditionalType(type) {
+            return type.resolvedInferredTrueType || (type.resolvedInferredTrueType = instantiateType(type.root.trueType, type.combinedMapper || type.mapper));
         }
         function getInferTypeParameters(node) {
             var result;
@@ -40258,7 +40689,7 @@ var ts;
          * this function should be called in a left folding style, with left = previous result of getSpreadType
          * and right = the new element to be spread.
          */
-        function getSpreadType(left, right, symbol, typeFlags, objectFlags) {
+        function getSpreadType(left, right, symbol, objectFlags, readonly) {
             if (left.flags & 1 /* Any */ || right.flags & 1 /* Any */) {
                 return anyType;
             }
@@ -40272,10 +40703,10 @@ var ts;
                 return left;
             }
             if (left.flags & 1048576 /* Union */) {
-                return mapType(left, function (t) { return getSpreadType(t, right, symbol, typeFlags, objectFlags); });
+                return mapType(left, function (t) { return getSpreadType(t, right, symbol, objectFlags, readonly); });
             }
             if (right.flags & 1048576 /* Union */) {
-                return mapType(right, function (t) { return getSpreadType(left, t, symbol, typeFlags, objectFlags); });
+                return mapType(right, function (t) { return getSpreadType(left, t, symbol, objectFlags, readonly); });
             }
             if (right.flags & (528 /* BooleanLike */ | 296 /* NumberLike */ | 2112 /* BigIntLike */ | 132 /* StringLike */ | 1056 /* EnumLike */ | 67108864 /* NonPrimitive */ | 4194304 /* Index */)) {
                 return left;
@@ -40291,7 +40722,7 @@ var ts;
                     var types = left.types;
                     var lastLeft = types[types.length - 1];
                     if (isNonGenericObjectType(lastLeft) && isNonGenericObjectType(right)) {
-                        return getIntersectionType(ts.concatenate(types.slice(0, types.length - 1), [getSpreadType(lastLeft, right, symbol, typeFlags, objectFlags)]));
+                        return getIntersectionType(ts.concatenate(types.slice(0, types.length - 1), [getSpreadType(lastLeft, right, symbol, objectFlags, readonly)]));
                     }
                 }
                 return getIntersectionType([left, right]);
@@ -40315,7 +40746,7 @@ var ts;
                     skippedPrivateMembers.set(rightProp.escapedName, true);
                 }
                 else if (isSpreadableProperty(rightProp)) {
-                    members.set(rightProp.escapedName, getSpreadSymbol(rightProp));
+                    members.set(rightProp.escapedName, getSpreadSymbol(rightProp, readonly));
                 }
             }
             for (var _b = 0, _c = getPropertiesOfType(left); _b < _c.length; _b++) {
@@ -40339,12 +40770,11 @@ var ts;
                     }
                 }
                 else {
-                    members.set(leftProp.escapedName, getSpreadSymbol(leftProp));
+                    members.set(leftProp.escapedName, getSpreadSymbol(leftProp, readonly));
                 }
             }
-            var spread = createAnonymousType(symbol, members, ts.emptyArray, ts.emptyArray, getNonReadonlyIndexSignature(stringIndexInfo), getNonReadonlyIndexSignature(numberIndexInfo));
-            spread.flags |= 268435456 /* ContainsObjectLiteral */ | typeFlags;
-            spread.objectFlags |= 128 /* ObjectLiteral */ | 1024 /* ContainsSpread */ | objectFlags;
+            var spread = createAnonymousType(symbol, members, ts.emptyArray, ts.emptyArray, getIndexInfoWithReadonly(stringIndexInfo, readonly), getIndexInfoWithReadonly(numberIndexInfo, readonly));
+            spread.objectFlags |= 128 /* ObjectLiteral */ | 262144 /* ContainsObjectLiteral */ | 1024 /* ContainsSpread */ | objectFlags;
             return spread;
         }
         /** We approximate own properties as non-methods plus methods that are inside the object literal */
@@ -40352,25 +40782,21 @@ var ts;
             return !(prop.flags & (8192 /* Method */ | 32768 /* GetAccessor */ | 65536 /* SetAccessor */)) ||
                 !prop.declarations.some(function (decl) { return ts.isClassLike(decl.parent); });
         }
-        function getSpreadSymbol(prop) {
-            var isReadonly = isReadonlySymbol(prop);
+        function getSpreadSymbol(prop, readonly) {
             var isSetonlyAccessor = prop.flags & 65536 /* SetAccessor */ && !(prop.flags & 32768 /* GetAccessor */);
-            if (!isReadonly && !isSetonlyAccessor) {
+            if (!isSetonlyAccessor && readonly === isReadonlySymbol(prop)) {
                 return prop;
             }
             var flags = 4 /* Property */ | (prop.flags & 16777216 /* Optional */);
-            var result = createSymbol(flags, prop.escapedName);
+            var result = createSymbol(flags, prop.escapedName, readonly ? 8 /* Readonly */ : 0);
             result.type = isSetonlyAccessor ? undefinedType : getTypeOfSymbol(prop);
             result.declarations = prop.declarations;
             result.nameType = prop.nameType;
             result.syntheticOrigin = prop;
             return result;
         }
-        function getNonReadonlyIndexSignature(index) {
-            if (index && index.isReadonly) {
-                return createIndexInfo(index.type, /*isReadonly*/ false, index.declaration);
-            }
-            return index;
+        function getIndexInfoWithReadonly(info, readonly) {
+            return info && info.isReadonly !== readonly ? createIndexInfo(info.type, readonly, info.declaration) : info;
         }
         function createLiteralType(flags, value, symbol) {
             var type = createType(flags);
@@ -40458,8 +40884,8 @@ var ts;
         function getTypeFromTypeNode(node) {
             switch (node.kind) {
                 case 120 /* AnyKeyword */:
-                case 284 /* JSDocAllType */:
-                case 285 /* JSDocUnknownType */:
+                case 289 /* JSDocAllType */:
+                case 290 /* JSDocUnknownType */:
                     return anyType;
                 case 143 /* UnknownKeyword */:
                     return unknownType;
@@ -40506,23 +40932,23 @@ var ts;
                     return getTypeFromUnionTypeNode(node);
                 case 174 /* IntersectionType */:
                     return getTypeFromIntersectionTypeNode(node);
-                case 286 /* JSDocNullableType */:
+                case 291 /* JSDocNullableType */:
                     return getTypeFromJSDocNullableTypeNode(node);
-                case 288 /* JSDocOptionalType */:
+                case 293 /* JSDocOptionalType */:
                     return addOptionality(getTypeFromTypeNode(node.type));
                 case 177 /* ParenthesizedType */:
                 case 172 /* RestType */:
-                case 287 /* JSDocNonNullableType */:
-                case 283 /* JSDocTypeExpression */:
+                case 292 /* JSDocNonNullableType */:
+                case 288 /* JSDocTypeExpression */:
                     return getTypeFromTypeNode(node.type);
-                case 290 /* JSDocVariadicType */:
+                case 295 /* JSDocVariadicType */:
                     return getTypeFromJSDocVariadicType(node);
                 case 165 /* FunctionType */:
                 case 166 /* ConstructorType */:
                 case 168 /* TypeLiteral */:
-                case 292 /* JSDocTypeLiteral */:
-                case 289 /* JSDocFunctionType */:
-                case 293 /* JSDocSignature */:
+                case 297 /* JSDocTypeLiteral */:
+                case 294 /* JSDocFunctionType */:
+                case 298 /* JSDocSignature */:
                     return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
                 case 179 /* TypeOperator */:
                     return getTypeFromTypeOperatorNode(node);
@@ -40598,16 +41024,8 @@ var ts;
          * Maps forward-references to later types parameters to the empty object type.
          * This is used during inference when instantiating type parameter defaults.
          */
-        function createBackreferenceMapper(typeParameters, index) {
-            return function (t) { return typeParameters.indexOf(t) >= index ? emptyObjectType : t; };
-        }
-        function isInferenceContext(mapper) {
-            return !!mapper.typeParameters;
-        }
-        function cloneTypeMapper(mapper) {
-            return mapper && isInferenceContext(mapper) ?
-                createInferenceContext(mapper.typeParameters, mapper.signature, mapper.flags | 1 /* NoDefault */, mapper.compareTypes, mapper.inferences) :
-                mapper;
+        function createBackreferenceMapper(context, index) {
+            return function (t) { return ts.findIndex(context.inferences, function (info) { return info.typeParameter === t; }) >= index ? emptyObjectType : t; };
         }
         function combineTypeMappers(mapper1, mapper2) {
             if (!mapper1)
@@ -40690,7 +41108,7 @@ var ts;
             }
             // Keep the flags from the symbol we're instantiating.  Mark that is instantiated, and
             // also transient so that we can just store data on it directly.
-            var result = createSymbol(symbol.flags, symbol.escapedName, 1 /* Instantiated */ | ts.getCheckFlags(symbol) & (2048 /* Late */ | 8192 /* OptionalParameter */ | 16384 /* RestParameter */));
+            var result = createSymbol(symbol.flags, symbol.escapedName, 1 /* Instantiated */ | ts.getCheckFlags(symbol) & (8 /* Readonly */ | 2048 /* Late */ | 8192 /* OptionalParameter */ | 16384 /* RestParameter */));
             result.declarations = symbol.declarations;
             result.parent = symbol.parent;
             result.target = symbol;
@@ -40786,7 +41204,7 @@ var ts;
         function getHomomorphicTypeVariable(type) {
             var constraintType = getConstraintTypeFromMappedType(type);
             if (constraintType.flags & 4194304 /* Index */) {
-                var typeVariable = constraintType.type;
+                var typeVariable = getActualTypeVariable(constraintType.type);
                 if (typeVariable.flags & 262144 /* TypeParameter */) {
                     return typeVariable;
                 }
@@ -40808,30 +41226,27 @@ var ts;
             if (typeVariable) {
                 var mappedTypeVariable = instantiateType(typeVariable, mapper);
                 if (typeVariable !== mappedTypeVariable) {
-                    // If we are already in the process of creating an instantiation of this mapped type,
-                    // return the error type. This situation only arises if we are instantiating the mapped
-                    // type for an array or tuple type, as we then need to eagerly resolve the (possibly
-                    // circular) element type(s).
-                    if (type.instantiating) {
-                        return errorType;
-                    }
-                    type.instantiating = true;
-                    var result = mapType(mappedTypeVariable, function (t) {
-                        if (t.flags & (3 /* AnyOrUnknown */ | 58982400 /* InstantiableNonPrimitive */ | 524288 /* Object */ | 2097152 /* Intersection */) && t !== wildcardType) {
+                    return mapType(mappedTypeVariable, function (t) {
+                        if (t.flags & (3 /* AnyOrUnknown */ | 58982400 /* InstantiableNonPrimitive */ | 524288 /* Object */ | 2097152 /* Intersection */) && t !== wildcardType && t !== errorType) {
                             var replacementMapper = createReplacementMapper(typeVariable, t, mapper);
-                            return isArrayType(t) ? createArrayType(instantiateMappedTypeTemplate(type, numberType, /*isOptional*/ true, replacementMapper)) :
-                                isReadonlyArrayType(t) ? createReadonlyArrayType(instantiateMappedTypeTemplate(type, numberType, /*isOptional*/ true, replacementMapper)) :
-                                    isTupleType(t) ? instantiateMappedTupleType(t, type, replacementMapper) :
-                                        instantiateAnonymousType(type, replacementMapper);
+                            return isArrayType(t) ? instantiateMappedArrayType(t, type, replacementMapper) :
+                                isTupleType(t) ? instantiateMappedTupleType(t, type, replacementMapper) :
+                                    instantiateAnonymousType(type, replacementMapper);
                         }
                         return t;
                     });
-                    type.instantiating = false;
-                    return result;
                 }
             }
             return instantiateAnonymousType(type, mapper);
         }
+        function getModifiedReadonlyState(state, modifiers) {
+            return modifiers & 1 /* IncludeReadonly */ ? true : modifiers & 2 /* ExcludeReadonly */ ? false : state;
+        }
+        function instantiateMappedArrayType(arrayType, mappedType, mapper) {
+            var elementType = instantiateMappedTypeTemplate(mappedType, numberType, /*isOptional*/ true, mapper);
+            return elementType === errorType ? errorType :
+                createArrayType(elementType, getModifiedReadonlyState(isReadonlyArrayType(arrayType), getMappedTypeModifiers(mappedType)));
+        }
         function instantiateMappedTupleType(tupleType, mappedType, mapper) {
             var minLength = tupleType.target.minLength;
             var elementTypes = ts.map(tupleType.typeArguments || ts.emptyArray, function (_, i) {
@@ -40841,7 +41256,9 @@ var ts;
             var newMinLength = modifiers & 4 /* IncludeOptional */ ? 0 :
                 modifiers & 8 /* ExcludeOptional */ ? getTypeReferenceArity(tupleType) - (tupleType.target.hasRestElement ? 1 : 0) :
                     minLength;
-            return createTupleType(elementTypes, newMinLength, tupleType.target.hasRestElement, tupleType.target.associatedNames);
+            var newReadonly = getModifiedReadonlyState(tupleType.target.readonly, modifiers);
+            return ts.contains(elementTypes, errorType) ? errorType :
+                createTupleType(elementTypes, newMinLength, tupleType.target.hasRestElement, newReadonly, tupleType.target.associatedNames);
         }
         function instantiateMappedTypeTemplate(type, key, isOptional, mapper) {
             var templateMapper = combineTypeMappers(mapper, createTypeMapper([getTypeParameterFromMappedType(type)], [key]));
@@ -40907,6 +41324,7 @@ var ts;
                 // We have reached 50 recursive type instantiations and there is a very high likelyhood we're dealing
                 // with a combination of infinite generic types that perpetually generate new type identities. We stop
                 // the recursion here by yielding the error type.
+                error(currentNode, ts.Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
                 return errorType;
             }
             instantiationDepth++;
@@ -40958,7 +41376,17 @@ var ts;
                 return getConditionalTypeInstantiation(type, combineTypeMappers(type.mapper, mapper));
             }
             if (flags & 33554432 /* Substitution */) {
-                return instantiateType(type.typeVariable, mapper);
+                var maybeVariable = instantiateType(type.typeVariable, mapper);
+                if (maybeVariable.flags & 8650752 /* TypeVariable */) {
+                    return getSubstitutionType(maybeVariable, instantiateType(type.substitute, mapper));
+                }
+                else {
+                    var sub = instantiateType(type.substitute, mapper);
+                    if (sub.flags & 3 /* AnyOrUnknown */ || isTypeSubtypeOf(getRestrictiveInstantiation(maybeVariable), getRestrictiveInstantiation(sub))) {
+                        return maybeVariable;
+                    }
+                    return sub;
+                }
             }
             return type;
         }
@@ -40967,8 +41395,20 @@ var ts;
                 type.permissiveInstantiation || (type.permissiveInstantiation = instantiateType(type, permissiveMapper));
         }
         function getRestrictiveInstantiation(type) {
-            return type.flags & (131068 /* Primitive */ | 3 /* AnyOrUnknown */ | 131072 /* Never */) ? type :
-                type.restrictiveInstantiation || (type.restrictiveInstantiation = instantiateType(type, restrictiveMapper));
+            if (type.flags & (131068 /* Primitive */ | 3 /* AnyOrUnknown */ | 131072 /* Never */)) {
+                return type;
+            }
+            if (type.restrictiveInstantiation) {
+                return type.restrictiveInstantiation;
+            }
+            type.restrictiveInstantiation = instantiateType(type, restrictiveMapper);
+            // We set the following so we don't attempt to set the restrictive instance of a restrictive instance
+            // which is redundant - we'll produce new type identities, but all type params have already been mapped.
+            // This also gives us a way to detect restrictive instances upon comparisons and _disable_ the "distributeive constraint"
+            // assignability check for them, which is distinctly unsafe, as once you have a restrctive instance, all the type parameters
+            // are constrained to `unknown` and produce tons of false positives/negatives!
+            type.restrictiveInstantiation.restrictiveInstantiation = type.restrictiveInstantiation;
+            return type.restrictiveInstantiation;
         }
         function instantiateIndexInfo(info, mapper) {
             return info && createIndexInfo(instantiateType(info.type, mapper), info.isReadonly, info.declaration);
@@ -41167,7 +41607,7 @@ var ts;
                     var resultObj = {};
                     checkTypeAssignableTo(source, target, node, headMessage, /*containingChain*/ undefined, resultObj);
                     var diagnostic = resultObj.error;
-                    addRelatedInfo(diagnostic, ts.createDiagnosticForNode(node, signatures === constructSignatures ? ts.Diagnostics.Did_you_mean_to_use_new_with_this_expression : ts.Diagnostics.Did_you_mean_to_call_this_expression));
+                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(node, signatures === constructSignatures ? ts.Diagnostics.Did_you_mean_to_use_new_with_this_expression : ts.Diagnostics.Did_you_mean_to_call_this_expression));
                     return true;
                 }
             }
@@ -41202,7 +41642,7 @@ var ts;
                 checkTypeRelatedTo(sourceReturn, targetReturn, relation, returnExpression, /*message*/ undefined, /*chain*/ undefined, resultObj);
                 if (resultObj.error) {
                     if (target.symbol && ts.length(target.symbol.declarations)) {
-                        addRelatedInfo(resultObj.error, ts.createDiagnosticForNode(target.symbol.declarations[0], ts.Diagnostics.The_expected_type_comes_from_the_return_type_of_this_signature));
+                        ts.addRelatedInfo(resultObj.error, ts.createDiagnosticForNode(target.symbol.declarations[0], ts.Diagnostics.The_expected_type_comes_from_the_return_type_of_this_signature));
                     }
                     return true;
                 }
@@ -41249,13 +41689,13 @@ var ts;
                                     undefined;
                                 if (indexInfo && indexInfo.declaration && !ts.getSourceFileOfNode(indexInfo.declaration).hasNoDefaultLib) {
                                     issuedElaboration = true;
-                                    addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(indexInfo.declaration, ts.Diagnostics.The_expected_type_comes_from_this_index_signature));
+                                    ts.addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(indexInfo.declaration, ts.Diagnostics.The_expected_type_comes_from_this_index_signature));
                                 }
                             }
                             if (!issuedElaboration && (targetProp && ts.length(targetProp.declarations) || target.symbol && ts.length(target.symbol.declarations))) {
                                 var targetNode = targetProp && ts.length(targetProp.declarations) ? targetProp.declarations[0] : target.symbol.declarations[0];
                                 if (!ts.getSourceFileOfNode(targetNode).hasNoDefaultLib) {
-                                    addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(targetNode, ts.Diagnostics.The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1, propertyName && !(nameType.flags & 8192 /* UniqueESSymbol */) ? ts.unescapeLeadingUnderscores(propertyName) : typeToString(nameType), typeToString(target)));
+                                    ts.addRelatedInfo(reportedDiag, ts.createDiagnosticForNode(targetNode, ts.Diagnostics.The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1, propertyName && !(nameType.flags & 8192 /* UniqueESSymbol */) ? ts.unescapeLeadingUnderscores(propertyName) : typeToString(nameType), typeToString(target)));
                                 }
                             }
                         }
@@ -41326,7 +41766,7 @@ var ts;
                     // child is of the type of the expression
                     return { errorNode: child, innerExpression: child.expression, nameType: nameType };
                 case 11 /* JsxText */:
-                    if (child.containsOnlyWhiteSpaces) {
+                    if (child.containsOnlyTriviaWhiteSpaces) {
                         break; // Whitespace only jsx text isn't real jsx text
                     }
                     // child is a string
@@ -41349,7 +41789,7 @@ var ts;
                 var childrenPropName = childPropName === undefined ? "children" : ts.unescapeLeadingUnderscores(childPropName);
                 var childrenNameType = getLiteralType(childrenPropName);
                 var childrenTargetType = getIndexedAccessType(target, childrenNameType);
-                var validChildren = ts.filter(containingElement.children, function (i) { return !ts.isJsxText(i) || !i.containsOnlyWhiteSpaces; });
+                var validChildren = ts.filter(containingElement.children, function (i) { return !ts.isJsxText(i) || !i.containsOnlyTriviaWhiteSpaces; });
                 if (!ts.length(validChildren)) {
                     return result;
                 }
@@ -41437,7 +41877,7 @@ var ts;
                 return elaborateElementwise(generateLimitedTupleElements(node, target), source, target, relation);
             }
             // recreate a tuple from the elements, if possible
-            var tupleizedType = checkArrayLiteral(node, 3 /* Contextual */, /*forceTuple*/ true);
+            var tupleizedType = checkArrayLiteral(node, 1 /* Contextual */, /*forceTuple*/ true);
             if (isTupleLikeType(tupleizedType)) {
                 return elaborateElementwise(generateLimitedTupleElements(node, target), tupleizedType, target, relation);
             }
@@ -41502,6 +41942,14 @@ var ts;
             return compareSignaturesRelated(source, target, 0 /* None */, ignoreReturnTypes, /*reportErrors*/ false, 
             /*errorReporter*/ undefined, compareTypesAssignable) !== 0 /* False */;
         }
+        /**
+         * Returns true if `s` is `(...args: any[]) => any` or `(this: any, ...args: any[]) => any`
+         */
+        function isAnySignature(s) {
+            return !s.typeParameters && (!s.thisParameter || isTypeAny(getTypeOfParameter(s.thisParameter))) && s.parameters.length === 1 &&
+                s.hasRestParameter && (getTypeOfParameter(s.parameters[0]) === anyArrayType || isTypeAny(getTypeOfParameter(s.parameters[0]))) &&
+                isTypeAny(getReturnTypeOfSignature(s));
+        }
         /**
          * See signatureRelatedTo, compareSignaturesIdentical
          */
@@ -41510,13 +41958,16 @@ var ts;
             if (source === target) {
                 return -1 /* True */;
             }
+            if (isAnySignature(target)) {
+                return -1 /* True */;
+            }
             var targetCount = getParameterCount(target);
             if (!hasEffectiveRestParameter(target) && getMinArgumentCount(source) > targetCount) {
                 return 0 /* False */;
             }
             if (source.typeParameters && source.typeParameters !== target.typeParameters) {
                 target = getCanonicalSignature(target);
-                source = instantiateSignatureInContextOf(source, target, /*contextualMapper*/ undefined, compareTypes);
+                source = instantiateSignatureInContextOf(source, target, /*inferenceContext*/ undefined, compareTypes);
             }
             var sourceCount = getParameterCount(source);
             var sourceRestType = getNonArrayRestType(source);
@@ -41587,7 +42038,7 @@ var ts;
                 if (targetTypePredicate) {
                     var sourceTypePredicate = getTypePredicateOfSignature(source);
                     if (sourceTypePredicate) {
-                        result &= compareTypePredicateRelatedTo(sourceTypePredicate, targetTypePredicate, source.declaration, target.declaration, reportErrors, errorReporter, compareTypes); // TODO: GH#18217
+                        result &= compareTypePredicateRelatedTo(sourceTypePredicate, targetTypePredicate, reportErrors, errorReporter, compareTypes);
                     }
                     else if (ts.isIdentifierTypePredicate(targetTypePredicate)) {
                         if (reportErrors) {
@@ -41606,7 +42057,7 @@ var ts;
             }
             return result;
         }
-        function compareTypePredicateRelatedTo(source, target, sourceDeclaration, targetDeclaration, reportErrors, errorReporter, compareTypes) {
+        function compareTypePredicateRelatedTo(source, target, reportErrors, errorReporter, compareTypes) {
             if (source.kind !== target.kind) {
                 if (reportErrors) {
                     errorReporter(ts.Diagnostics.A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard);
@@ -41615,12 +42066,9 @@ var ts;
                 return 0 /* False */;
             }
             if (source.kind === 1 /* Identifier */) {
-                var targetPredicate = target;
-                var sourceIndex = source.parameterIndex - (ts.getThisParameter(sourceDeclaration) ? 1 : 0);
-                var targetIndex = targetPredicate.parameterIndex - (ts.getThisParameter(targetDeclaration) ? 1 : 0);
-                if (sourceIndex !== targetIndex) {
+                if (source.parameterIndex !== target.parameterIndex) {
                     if (reportErrors) {
-                        errorReporter(ts.Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, source.parameterName, targetPredicate.parameterName);
+                        errorReporter(ts.Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, source.parameterName, target.parameterName);
                         errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
                     }
                     return 0 /* False */;
@@ -41821,7 +42269,7 @@ var ts;
                 }
                 var diag = ts.createDiagnosticForNodeFromMessageChain(errorNode, errorInfo, relatedInformation);
                 if (relatedInfo) {
-                    addRelatedInfo.apply(void 0, [diag].concat(relatedInfo));
+                    ts.addRelatedInfo.apply(void 0, [diag].concat(relatedInfo));
                 }
                 if (errorOutputContainer) {
                     errorOutputContainer.error = diag;
@@ -42428,8 +42876,8 @@ var ts;
                         if (source.root.isDistributive === target.root.isDistributive) {
                             if (result_3 = isRelatedTo(source.checkType, target.checkType, /*reportErrors*/ false)) {
                                 if (result_3 &= isRelatedTo(source.extendsType, target.extendsType, /*reportErrors*/ false)) {
-                                    if (result_3 &= isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), /*reportErrors*/ false)) {
-                                        if (result_3 &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), /*reportErrors*/ false)) {
+                                    if (result_3 &= isRelatedTo(source.trueType, target.trueType, /*reportErrors*/ false)) {
+                                        if (result_3 &= isRelatedTo(source.falseType, target.falseType, /*reportErrors*/ false)) {
                                             return result_3;
                                         }
                                     }
@@ -42444,6 +42892,7 @@ var ts;
                 }
                 var result;
                 var originalErrorInfo;
+                var varianceCheckFailed = false;
                 var saveErrorInfo = errorInfo;
                 // We limit alias variance probing to only object and conditional types since their alias behavior
                 // is more predictable than other, interned types, which may or may not have an alias depending on
@@ -42452,11 +42901,10 @@ var ts;
                     source.aliasTypeArguments && source.aliasSymbol === target.aliasSymbol &&
                     !(source.aliasTypeArgumentsContainsMarker || target.aliasTypeArgumentsContainsMarker)) {
                     var variances = getAliasVariances(source.aliasSymbol);
-                    if (result = typeArgumentsRelatedTo(source.aliasTypeArguments, target.aliasTypeArguments, variances, reportErrors)) {
-                        return result;
+                    var varianceResult = relateVariances(source.aliasTypeArguments, target.aliasTypeArguments, variances);
+                    if (varianceResult !== undefined) {
+                        return varianceResult;
                     }
-                    originalErrorInfo = errorInfo;
-                    errorInfo = saveErrorInfo;
                 }
                 if (target.flags & 262144 /* TypeParameter */) {
                     // A source type { [P in Q]: X } is related to a target type T if keyof T is related to Q and X is related to T[Q].
@@ -42513,16 +42961,26 @@ var ts;
                             template.indexType === getTypeParameterFromMappedType(target)) {
                             return -1 /* True */;
                         }
-                        // A source type T is related to a target type { [P in Q]: X } if Q is related to keyof T and T[Q] is related to X.
-                        if (!isGenericMappedType(source) && isRelatedTo(getConstraintTypeFromMappedType(target), getIndexType(source))) {
-                            var indexedAccessType = getIndexedAccessType(source, getTypeParameterFromMappedType(target));
-                            var templateType = getTemplateTypeFromMappedType(target);
-                            if (result = isRelatedTo(indexedAccessType, templateType, reportErrors)) {
-                                return result;
+                        if (!isGenericMappedType(source)) {
+                            var targetConstraint = getConstraintTypeFromMappedType(target);
+                            var sourceKeys_1 = getIndexType(source);
+                            var hasOptionalUnionKeys = modifiers & 4 /* IncludeOptional */ && targetConstraint.flags & 1048576 /* Union */;
+                            var filteredByApplicability = hasOptionalUnionKeys ? filterType(targetConstraint, function (t) { return !!isRelatedTo(t, sourceKeys_1); }) : undefined;
+                            // A source type T is related to a target type { [P in Q]: X } if Q is related to keyof T and T[Q] is related to X.
+                            // A source type T is related to a target type { [P in Q]?: X } if some constituent Q' of Q is related to keyof T and T[Q'] is related to X.
+                            if (hasOptionalUnionKeys
+                                ? !(filteredByApplicability.flags & 131072 /* Never */)
+                                : isRelatedTo(targetConstraint, sourceKeys_1)) {
+                                var indexingType = hasOptionalUnionKeys ? filteredByApplicability : getTypeParameterFromMappedType(target);
+                                var indexedAccessType = getIndexedAccessType(source, indexingType);
+                                var templateType = getTemplateTypeFromMappedType(target);
+                                if (result = isRelatedTo(indexedAccessType, templateType, reportErrors)) {
+                                    return result;
+                                }
                             }
+                            originalErrorInfo = errorInfo;
+                            errorInfo = saveErrorInfo;
                         }
-                        originalErrorInfo = errorInfo;
-                        errorInfo = saveErrorInfo;
                     }
                 }
                 if (source.flags & 8650752 /* TypeVariable */) {
@@ -42568,8 +43026,8 @@ var ts;
                         // and Y1 is related to Y2.
                         if (isTypeIdenticalTo(source.extendsType, target.extendsType) &&
                             (isRelatedTo(source.checkType, target.checkType) || isRelatedTo(target.checkType, source.checkType))) {
-                            if (result = isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), reportErrors)) {
-                                result &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), reportErrors);
+                            if (result = isRelatedTo(source.trueType, target.trueType, reportErrors)) {
+                                result &= isRelatedTo(source.falseType, target.falseType, reportErrors);
                             }
                             if (result) {
                                 errorInfo = saveErrorInfo;
@@ -42618,36 +43076,19 @@ var ts;
                         // type references (which are intended by be compared structurally). Obtain the variance
                         // information for the type parameters and relate the type arguments accordingly.
                         var variances = getVariances(source.target);
-                        if (result = typeArgumentsRelatedTo(source.typeArguments, target.typeArguments, variances, reportErrors)) {
-                            return result;
-                        }
-                        // The type arguments did not relate appropriately, but it may be because we have no variance
-                        // information (in which case typeArgumentsRelatedTo defaulted to covariance for all type
-                        // arguments). It might also be the case that the target type has a 'void' type argument for
-                        // a covariant type parameter that is only used in return positions within the generic type
-                        // (in which case any type argument is permitted on the source side). In those cases we proceed
-                        // with a structural comparison. Otherwise, we know for certain the instantiations aren't
-                        // related and we can return here.
-                        if (variances !== ts.emptyArray && !hasCovariantVoidArgument(target, variances)) {
-                            // In some cases generic types that are covariant in regular type checking mode become
-                            // invariant in --strictFunctionTypes mode because one or more type parameters are used in
-                            // both co- and contravariant positions. In order to make it easier to diagnose *why* such
-                            // types are invariant, if any of the type parameters are invariant we reset the reported
-                            // errors and instead force a structural comparison (which will include elaborations that
-                            // reveal the reason).
-                            if (!(reportErrors && ts.some(variances, function (v) { return v === 0 /* Invariant */; }))) {
-                                return 0 /* False */;
-                            }
-                            // We remember the original error information so we can restore it in case the structural
-                            // comparison unexpectedly succeeds. This can happen when the structural comparison result
-                            // is a Ternary.Maybe for example caused by the recursion depth limiter.
-                            originalErrorInfo = errorInfo;
-                            errorInfo = saveErrorInfo;
+                        var varianceResult = relateVariances(source.typeArguments, target.typeArguments, variances);
+                        if (varianceResult !== undefined) {
+                            return varianceResult;
                         }
                     }
-                    else if (isTupleType(source) && (isArrayType(target) || isReadonlyArrayType(target)) || isArrayType(source) && isReadonlyArrayType(target)) {
+                    else if (isReadonlyArrayType(target) ? isArrayType(source) || isTupleType(source) : isArrayType(target) && isTupleType(source) && !source.target.readonly) {
                         return isRelatedTo(getIndexTypeOfType(source, 1 /* Number */) || anyType, getIndexTypeOfType(target, 1 /* Number */) || anyType, reportErrors);
                     }
+                    // Consider a fresh empty object literal type "closed" under the subtype relationship - this way `{} <- {[idx: string]: any} <- fresh({})`
+                    // and not `{} <- fresh({}) <- {[idx: string]: any}`
+                    else if (relation === subtypeRelation && isEmptyObjectType(target) && ts.getObjectFlags(target) & 32768 /* FreshLiteral */ && !isEmptyObjectType(source)) {
+                        return 0 /* False */;
+                    }
                     // Even if relationship doesn't hold for unions, intersections, or generic type references,
                     // it may hold in a structural comparison.
                     // In a check of the form X = A & B, we will have previously checked if A relates to X or B relates
@@ -42669,16 +43110,56 @@ var ts;
                                 }
                             }
                         }
-                        if (result) {
-                            if (!originalErrorInfo) {
-                                errorInfo = saveErrorInfo;
-                                return result;
-                            }
-                            errorInfo = originalErrorInfo;
+                        if (varianceCheckFailed && result) {
+                            errorInfo = originalErrorInfo || errorInfo || saveErrorInfo; // Use variance error (there is no structural one) and return false
+                        }
+                        else if (result) {
+                            return result;
                         }
                     }
                 }
                 return 0 /* False */;
+                function isNonGeneric(type) {
+                    // If we're already in identity relationship checking, we should use `isRelatedTo`
+                    // to catch the `Maybe` from an excessively deep type (which we then assume means
+                    // that the type could possibly contain a generic)
+                    if (relation === identityRelation) {
+                        return isRelatedTo(type, getPermissiveInstantiation(type)) === -1 /* True */;
+                    }
+                    return isTypeIdenticalTo(type, getPermissiveInstantiation(type));
+                }
+                function relateVariances(sourceTypeArguments, targetTypeArguments, variances) {
+                    if (result = typeArgumentsRelatedTo(sourceTypeArguments, targetTypeArguments, variances, reportErrors)) {
+                        return result;
+                    }
+                    var allowStructuralFallback = (targetTypeArguments && hasCovariantVoidArgument(targetTypeArguments, variances)) || isNonGeneric(source) || isNonGeneric(target);
+                    varianceCheckFailed = !allowStructuralFallback;
+                    // The type arguments did not relate appropriately, but it may be because we have no variance
+                    // information (in which case typeArgumentsRelatedTo defaulted to covariance for all type
+                    // arguments). It might also be the case that the target type has a 'void' type argument for
+                    // a covariant type parameter that is only used in return positions within the generic type
+                    // (in which case any type argument is permitted on the source side). In those cases we proceed
+                    // with a structural comparison. Otherwise, we know for certain the instantiations aren't
+                    // related and we can return here.
+                    if (variances !== ts.emptyArray && !allowStructuralFallback) {
+                        // In some cases generic types that are covariant in regular type checking mode become
+                        // invariant in --strictFunctionTypes mode because one or more type parameters are used in
+                        // both co- and contravariant positions. In order to make it easier to diagnose *why* such
+                        // types are invariant, if any of the type parameters are invariant we reset the reported
+                        // errors and instead force a structural comparison (which will include elaborations that
+                        // reveal the reason).
+                        // We can switch on `reportErrors` here, since varianceCheckFailed guarantees we return `False`,
+                        // we can return `False` early here to skip calculating the structural error message we don't need.
+                        if (varianceCheckFailed && !(reportErrors && ts.some(variances, function (v) { return v === 0 /* Invariant */; }))) {
+                            return 0 /* False */;
+                        }
+                        // We remember the original error information so we can restore it in case the structural
+                        // comparison unexpectedly succeeds. This can happen when the structural comparison result
+                        // is a Ternary.Maybe for example caused by the recursion depth limiter.
+                        originalErrorInfo = errorInfo;
+                        errorInfo = saveErrorInfo;
+                    }
+                }
             }
             // A type [P in S]: X is related to a type [Q in T]: Y if T is related to S and X' is
             // related to Y, where X' is an instantiation of X in which P is replaced with Q. Notice
@@ -43158,20 +43639,17 @@ var ts;
             return variances;
         }
         function getVariances(type) {
-            if (!strictFunctionTypes) {
-                return ts.emptyArray;
-            }
-            if (type === globalArrayType || type === globalReadonlyArrayType) {
-                // Arrays are known to be covariant, no need to spend time computing this (emptyArray implies covariance for all parameters)
+            // Arrays and tuples are known to be covariant, no need to spend time computing this (emptyArray implies covariance for all parameters)
+            if (type === globalArrayType || type === globalReadonlyArrayType || type.objectFlags & 8 /* Tuple */) {
                 return ts.emptyArray;
             }
             return getVariancesWorker(type.typeParameters, type, getMarkerTypeReference);
         }
         // Return true if the given type reference has a 'void' type argument for a covariant type parameter.
         // See comment at call in recursiveTypeRelatedTo for when this case matters.
-        function hasCovariantVoidArgument(type, variances) {
+        function hasCovariantVoidArgument(typeArguments, variances) {
             for (var i = 0; i < variances.length; i++) {
-                if (variances[i] === 1 /* Covariant */ && type.typeArguments[i].flags & 16384 /* Void */) {
+                if (variances[i] === 1 /* Covariant */ && typeArguments[i].flags & 16384 /* Void */) {
                     return true;
                 }
             }
@@ -43400,8 +43878,8 @@ var ts;
         }
         function literalTypesWithSameBaseType(types) {
             var commonBaseType;
-            for (var _i = 0, types_8 = types; _i < types_8.length; _i++) {
-                var t = types_8[_i];
+            for (var _i = 0, types_9 = types; _i < types_9.length; _i++) {
+                var t = types_9[_i];
                 var baseType = getBaseTypeOfLiteralType(t);
                 if (!commonBaseType) {
                     commonBaseType = baseType;
@@ -43434,7 +43912,7 @@ var ts;
             return ts.reduceLeft(types, function (s, t) { return isTypeSubtypeOf(t, s) ? t : s; });
         }
         function isArrayType(type) {
-            return !!(ts.getObjectFlags(type) & 4 /* Reference */) && type.target === globalArrayType;
+            return !!(ts.getObjectFlags(type) & 4 /* Reference */) && (type.target === globalArrayType || type.target === globalReadonlyArrayType);
         }
         function isReadonlyArrayType(type) {
             return !!(ts.getObjectFlags(type) & 4 /* Reference */) && type.target === globalReadonlyArrayType;
@@ -43445,8 +43923,7 @@ var ts;
         function isArrayLikeType(type) {
             // A type is array-like if it is a reference to the global Array or global ReadonlyArray type,
             // or if it is not the undefined or null type and if it is assignable to ReadonlyArray<any>
-            return ts.getObjectFlags(type) & 4 /* Reference */ && (type.target === globalArrayType || type.target === globalReadonlyArrayType) ||
-                !(type.flags & 98304 /* Nullable */) && isTypeAssignableTo(type, anyReadonlyArrayType);
+            return isArrayType(type) || !(type.flags & 98304 /* Nullable */) && isTypeAssignableTo(type, anyReadonlyArrayType);
         }
         function isEmptyArrayLiteralType(type) {
             var elementType = isArrayType(type) ? type.typeArguments[0] : undefined;
@@ -43531,8 +44008,8 @@ var ts;
         }
         function getFalsyFlagsOfTypes(types) {
             var result = 0;
-            for (var _i = 0, types_9 = types; _i < types_9.length; _i++) {
-                var t = types_9[_i];
+            for (var _i = 0, types_10 = types; _i < types_10.length; _i++) {
+                var t = types_10[_i];
                 result |= getFalsyFlags(t);
             }
             return result;
@@ -43646,7 +44123,7 @@ var ts;
             var members = transformTypeOfMembers(type, getRegularTypeOfObjectLiteral);
             var regularNew = createAnonymousType(resolved.symbol, members, resolved.callSignatures, resolved.constructSignatures, resolved.stringIndexInfo, resolved.numberIndexInfo);
             regularNew.flags = resolved.flags;
-            regularNew.objectFlags |= 128 /* ObjectLiteral */ | (ts.getObjectFlags(resolved) & 16384 /* JSLiteral */);
+            regularNew.objectFlags |= resolved.objectFlags & ~32768 /* FreshLiteral */;
             type.regularType = regularNew;
             return regularNew;
         }
@@ -43732,7 +44209,7 @@ var ts;
             return getWidenedTypeWithContext(type, /*context*/ undefined);
         }
         function getWidenedTypeWithContext(type, context) {
-            if (type.flags & 402653184 /* RequiresWidening */) {
+            if (ts.getObjectFlags(type) & 393216 /* RequiresWidening */) {
                 if (type.flags & 98304 /* Nullable */) {
                     return anyType;
                 }
@@ -43769,7 +44246,7 @@ var ts;
          */
         function reportWideningErrorsInType(type) {
             var errorReported = false;
-            if (type.flags & 134217728 /* ContainsWideningType */) {
+            if (ts.getObjectFlags(type) & 131072 /* ContainsWideningType */) {
                 if (type.flags & 1048576 /* Union */) {
                     if (ts.some(type.types, isEmptyObjectType)) {
                         errorReported = true;
@@ -43795,7 +44272,7 @@ var ts;
                     for (var _d = 0, _e = getPropertiesOfObjectType(type); _d < _e.length; _d++) {
                         var p = _e[_d];
                         var t = getTypeOfSymbol(p);
-                        if (t.flags & 134217728 /* ContainsWideningType */) {
+                        if (ts.getObjectFlags(t) & 131072 /* ContainsWideningType */) {
                             if (!reportWideningErrorsInType(t)) {
                                 error(p.valueDeclaration, ts.Diagnostics.Object_literal_s_property_0_implicitly_has_an_1_type, symbolToString(p), typeToString(getWidenedType(t)));
                             }
@@ -43841,7 +44318,7 @@ var ts;
                         return;
                     }
                     break;
-                case 289 /* JSDocFunctionType */:
+                case 294 /* JSDocFunctionType */:
                     error(declaration, ts.Diagnostics.Function_type_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
                     return;
                 case 239 /* FunctionDeclaration */:
@@ -43868,14 +44345,14 @@ var ts;
             errorOrSuggestion(noImplicitAny, declaration, diagnostic, ts.declarationNameToString(ts.getNameOfDeclaration(declaration)), typeAsString);
         }
         function reportErrorsFromWidening(declaration, type) {
-            if (produceDiagnostics && noImplicitAny && type.flags & 134217728 /* ContainsWideningType */) {
+            if (produceDiagnostics && noImplicitAny && ts.getObjectFlags(type) & 131072 /* ContainsWideningType */) {
                 // Report implicit any error within type if possible, otherwise report error on declaration
                 if (!reportWideningErrorsInType(type)) {
                     reportImplicitAny(declaration, type);
                 }
             }
         }
-        function forEachMatchingParameterType(source, target, callback) {
+        function applyToParameterTypes(source, target, callback) {
             var sourceCount = getParameterCount(source);
             var targetCount = getParameterCount(target);
             var sourceRestType = getEffectiveRestType(source);
@@ -43896,24 +44373,54 @@ var ts;
                 callback(getRestTypeAtPosition(source, paramCount), targetRestType);
             }
         }
-        function createInferenceContext(typeParameters, signature, flags, compareTypes, baseInferences) {
-            var inferences = baseInferences ? baseInferences.map(cloneInferenceInfo) : typeParameters.map(createInferenceInfo);
-            var context = mapper;
-            context.typeParameters = typeParameters;
-            context.signature = signature;
-            context.inferences = inferences;
-            context.flags = flags;
-            context.compareTypes = compareTypes || compareTypesAssignable;
+        function applyToReturnTypes(source, target, callback) {
+            var sourceTypePredicate = getTypePredicateOfSignature(source);
+            var targetTypePredicate = getTypePredicateOfSignature(target);
+            if (sourceTypePredicate && targetTypePredicate && sourceTypePredicate.kind === targetTypePredicate.kind &&
+                (sourceTypePredicate.kind === 0 /* This */ || sourceTypePredicate.parameterIndex === targetTypePredicate.parameterIndex)) {
+                callback(sourceTypePredicate.type, targetTypePredicate.type);
+            }
+            else {
+                callback(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
+            }
+        }
+        function createInferenceContext(typeParameters, signature, flags, compareTypes) {
+            return createInferenceContextWorker(typeParameters.map(createInferenceInfo), signature, flags, compareTypes || compareTypesAssignable);
+        }
+        function cloneInferenceContext(context, extraFlags) {
+            if (extraFlags === void 0) { extraFlags = 0; }
+            return context && createInferenceContextWorker(ts.map(context.inferences, cloneInferenceInfo), context.signature, context.flags | extraFlags, context.compareTypes);
+        }
+        function cloneInferredPartOfContext(context) {
+            var inferences = ts.filter(context.inferences, hasInferenceCandidates);
+            return inferences.length ?
+                createInferenceContextWorker(ts.map(inferences, cloneInferenceInfo), context.signature, context.flags, context.compareTypes) :
+                undefined;
+        }
+        function createInferenceContextWorker(inferences, signature, flags, compareTypes) {
+            var context = {
+                inferences: inferences,
+                signature: signature,
+                flags: flags,
+                compareTypes: compareTypes,
+                mapper: function (t) { return mapToInferredType(context, t, /*fix*/ true); },
+                nonFixingMapper: function (t) { return mapToInferredType(context, t, /*fix*/ false); },
+            };
             return context;
-            function mapper(t) {
-                for (var i = 0; i < inferences.length; i++) {
-                    if (t === inferences[i].typeParameter) {
-                        inferences[i].isFixed = true;
-                        return getInferredType(context, i);
+        }
+        function mapToInferredType(context, t, fix) {
+            var inferences = context.inferences;
+            for (var i = 0; i < inferences.length; i++) {
+                var inference = inferences[i];
+                if (t === inference.typeParameter) {
+                    if (fix && !inference.isFixed) {
+                        inference.isFixed = true;
+                        inference.inferredType = undefined;
                     }
+                    return getInferredType(context, i);
                 }
-                return t;
             }
+            return t;
         }
         function createInferenceInfo(typeParameter) {
             return {
@@ -43937,6 +44444,9 @@ var ts;
                 isFixed: inference.isFixed
             };
         }
+        function getMapperFromContext(context) {
+            return context && context.mapper;
+        }
         // Return true if the given type could possibly reference a type parameter for which
         // we perform type inference (i.e. a type parameter of a generic function). We cache
         // results for union and intersection types for performance reasons.
@@ -44001,23 +44511,20 @@ var ts;
             // is incomplete and we can't infer a meaningful input type.
             for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
                 var prop = properties_3[_i];
-                if (getTypeOfSymbol(prop).flags & 536870912 /* ContainsAnyFunctionType */) {
+                if (ts.getObjectFlags(getTypeOfSymbol(prop)) & 524288 /* ContainsAnyFunctionType */) {
                     return undefined;
                 }
             }
             // For arrays and tuples we infer new arrays and tuples where the reverse mapping has been
             // applied to the element type(s).
             if (isArrayType(source)) {
-                return createArrayType(inferReverseMappedType(source.typeArguments[0], target, constraint));
-            }
-            if (isReadonlyArrayType(source)) {
-                return createReadonlyArrayType(inferReverseMappedType(source.typeArguments[0], target, constraint));
+                return createArrayType(inferReverseMappedType(source.typeArguments[0], target, constraint), isReadonlyArrayType(source));
             }
             if (isTupleType(source)) {
                 var elementTypes = ts.map(source.typeArguments || ts.emptyArray, function (t) { return inferReverseMappedType(t, target, constraint); });
                 var minLength = getMappedTypeModifiers(target) & 4 /* IncludeOptional */ ?
                     getTypeReferenceArity(source) - (source.target.hasRestElement ? 1 : 0) : source.target.minLength;
-                return createTupleType(elementTypes, minLength, source.target.hasRestElement, source.target.associatedNames);
+                return createTupleType(elementTypes, minLength, source.target.hasRestElement, source.target.readonly, source.target.associatedNames);
             }
             // For all other object types we infer a new object type where the reverse mapping has been
             // applied to the type of each property.
@@ -44091,11 +44598,11 @@ var ts;
                 inference.contraCandidates ? getIntersectionType(inference.contraCandidates) :
                     emptyObjectType;
         }
-        function inferTypes(inferences, originalSource, originalTarget, priority) {
+        function inferTypes(inferences, originalSource, originalTarget, priority, contravariant) {
             if (priority === void 0) { priority = 0; }
+            if (contravariant === void 0) { contravariant = false; }
             var symbolStack;
             var visited;
-            var contravariant = false;
             var bivariant = false;
             var propagationType;
             var allowComplexConstraintInference = true;
@@ -44171,7 +44678,7 @@ var ts;
                     // not contain anyFunctionType when we come back to this argument for its second round
                     // of inference. Also, we exclude inferences for silentNeverType (which is used as a wildcard
                     // when constructing types from type parameters that had no inference candidates).
-                    if (source.flags & 536870912 /* ContainsAnyFunctionType */ || source === silentNeverType || (priority & 8 /* ReturnType */ && (source === autoType || source === autoArrayType))) {
+                    if (ts.getObjectFlags(source) & 524288 /* ContainsAnyFunctionType */ || source === silentNeverType || (priority & 8 /* ReturnType */ && (source === autoType || source === autoArrayType))) {
                         return;
                     }
                     var inference = getInferenceInfoForType(target);
@@ -44180,6 +44687,7 @@ var ts;
                             if (inference.priority === undefined || priority < inference.priority) {
                                 inference.candidates = undefined;
                                 inference.contraCandidates = undefined;
+                                inference.topLevel = true;
                                 inference.priority = priority;
                             }
                             if (priority === inference.priority) {
@@ -44187,14 +44695,19 @@ var ts;
                                 // We make contravariant inferences only if we are in a pure contravariant position,
                                 // i.e. only if we have not descended into a bivariant position.
                                 if (contravariant && !bivariant) {
-                                    inference.contraCandidates = ts.appendIfUnique(inference.contraCandidates, candidate);
+                                    if (!ts.contains(inference.contraCandidates, candidate)) {
+                                        inference.contraCandidates = ts.append(inference.contraCandidates, candidate);
+                                        inference.inferredType = undefined;
+                                    }
                                 }
-                                else {
-                                    inference.candidates = ts.appendIfUnique(inference.candidates, candidate);
+                                else if (!ts.contains(inference.candidates, candidate)) {
+                                    inference.candidates = ts.append(inference.candidates, candidate);
+                                    inference.inferredType = undefined;
                                 }
                             }
-                            if (!(priority & 8 /* ReturnType */) && target.flags & 262144 /* TypeParameter */ && !isTypeParameterAtTopLevel(originalTarget, target)) {
+                            if (!(priority & 8 /* ReturnType */) && target.flags & 262144 /* TypeParameter */ && inference.topLevel && !isTypeParameterAtTopLevel(originalTarget, target)) {
                                 inference.topLevel = false;
+                                inference.inferredType = undefined;
                             }
                         }
                         return;
@@ -44218,6 +44731,9 @@ var ts;
                         }
                     }
                 }
+                else if (target.flags & 33554432 /* Substitution */) {
+                    inferFromTypes(source, target.typeVariable);
+                }
                 if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && source.target === target.target) {
                     // If source and target are references to the same generic type, infer from type arguments
                     var sourceTypes = source.typeArguments || ts.emptyArray;
@@ -44254,42 +44770,32 @@ var ts;
                 else if (source.flags & 16777216 /* Conditional */ && target.flags & 16777216 /* Conditional */) {
                     inferFromTypes(source.checkType, target.checkType);
                     inferFromTypes(source.extendsType, target.extendsType);
-                    inferFromTypes(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target));
-                    inferFromTypes(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target));
+                    inferFromTypes(source.trueType, target.trueType);
+                    inferFromTypes(source.falseType, target.falseType);
                 }
-                else if (target.flags & 16777216 /* Conditional */) {
-                    inferFromTypes(source, getUnionType([getTrueTypeFromConditionalType(target), getFalseTypeFromConditionalType(target)]));
+                else if (target.flags & 16777216 /* Conditional */ && !contravariant) {
+                    inferFromTypes(source, target.trueType);
+                    inferFromTypes(source, target.falseType);
                 }
                 else if (target.flags & 3145728 /* UnionOrIntersection */) {
-                    var targetTypes = target.types;
-                    var typeVariableCount = 0;
-                    var typeVariable = void 0;
-                    // First infer to each type in union or intersection that isn't a type variable
-                    for (var _d = 0, targetTypes_3 = targetTypes; _d < targetTypes_3.length; _d++) {
-                        var t = targetTypes_3[_d];
+                    for (var _d = 0, _e = target.types; _d < _e.length; _d++) {
+                        var t = _e[_d];
+                        var savePriority = priority;
+                        // Inferences directly to naked type variables are given lower priority as they are
+                        // less specific. For example, when inferring from Promise<string> to T | Promise<T>,
+                        // we want to infer string for T, not Promise<string> | string.
                         if (getInferenceInfoForType(t)) {
-                            typeVariable = t;
-                            typeVariableCount++;
-                        }
-                        else {
-                            inferFromTypes(source, t);
+                            priority |= 1 /* NakedTypeVariable */;
                         }
-                    }
-                    // Next, if target containings a single naked type variable, make a secondary inference to that type
-                    // variable. This gives meaningful results for union types in co-variant positions and intersection
-                    // types in contra-variant positions (such as callback parameters).
-                    if (typeVariableCount === 1) {
-                        var savePriority = priority;
-                        priority |= 1 /* NakedTypeVariable */;
-                        inferFromTypes(source, typeVariable);
+                        inferFromTypes(source, t);
                         priority = savePriority;
                     }
                 }
                 else if (source.flags & 1048576 /* Union */) {
                     // Source is a union or intersection type, infer from each constituent type
                     var sourceTypes = source.types;
-                    for (var _e = 0, sourceTypes_3 = sourceTypes; _e < sourceTypes_3.length; _e++) {
-                        var sourceType = sourceTypes_3[_e];
+                    for (var _f = 0, sourceTypes_3 = sourceTypes; _f < sourceTypes_3.length; _f++) {
+                        var sourceType = sourceTypes_3[_f];
                         inferFromTypes(sourceType, target);
                     }
                 }
@@ -44305,7 +44811,7 @@ var ts;
                             // that is _too good_ in projects with complicated constraints (eg, fp-ts). In such cases, if we did not limit ourselves
                             // here, we might produce more valid inferences for types, causing us to do more checks and perform more instantiations
                             // (in addition to the extra stack depth here) which, in turn, can push the already close process over its limit.
-                            // TL;DR: If we ever become generally more memory efficienct (or our resource budget ever increases), we should just
+                            // TL;DR: If we ever become generally more memory efficient (or our resource budget ever increases), we should just
                             // remove this `allowComplexConstraintInference` flag.
                             allowComplexConstraintInference = false;
                             return inferFromTypes(apparentSource, target);
@@ -44367,12 +44873,12 @@ var ts;
                 }
                 return undefined;
             }
-            function inferFromMappedTypeConstraint(source, target, constraintType) {
+            function inferToMappedType(source, target, constraintType) {
                 if (constraintType.flags & 1048576 /* Union */) {
                     var result = false;
                     for (var _i = 0, _a = constraintType.types; _i < _a.length; _i++) {
                         var type = _a[_i];
-                        result = inferFromMappedTypeConstraint(source, target, type) || result;
+                        result = inferToMappedType(source, target, type) || result;
                     }
                     return result;
                 }
@@ -44394,12 +44900,22 @@ var ts;
                     return true;
                 }
                 if (constraintType.flags & 262144 /* TypeParameter */) {
-                    // We're inferring from some source type S to a mapped type { [P in T]: X }, where T is a type
-                    // parameter. Infer from 'keyof S' to T and infer from a union of each property type in S to X.
+                    // We're inferring from some source type S to a mapped type { [P in K]: X }, where K is a type
+                    // parameter. First infer from 'keyof S' to K.
                     var savePriority = priority;
                     priority |= 4 /* MappedTypeConstraint */;
                     inferFromTypes(getIndexType(source), constraintType);
                     priority = savePriority;
+                    // If K is constrained to a type C, also infer to C. Thus, for a mapped type { [P in K]: X },
+                    // where K extends keyof T, we make the same inferences as for a homomorphic mapped type
+                    // { [P in keyof T]: X }. This enables us to make meaningful inferences when the target is a
+                    // Pick<T, K>.
+                    var extendedConstraint = getConstraintOfType(constraintType);
+                    if (extendedConstraint && inferToMappedType(source, target, extendedConstraint)) {
+                        return true;
+                    }
+                    // If no inferences can be made to K's constraint, infer from a union of the property types
+                    // in the source to the template type X.
                     var valueTypes = ts.compact([
                         getIndexTypeOfType(source, 0 /* String */),
                         getIndexTypeOfType(source, 1 /* Number */)
@@ -44418,7 +44934,7 @@ var ts;
                 }
                 if (ts.getObjectFlags(target) & 32 /* Mapped */) {
                     var constraintType = getConstraintTypeFromMappedType(target);
-                    if (inferFromMappedTypeConstraint(source, target, constraintType)) {
+                    if (inferToMappedType(source, target, constraintType)) {
                         return;
                     }
                 }
@@ -44431,11 +44947,11 @@ var ts;
                 }
             }
             function inferFromProperties(source, target) {
-                if (isTupleType(source)) {
+                if (isArrayType(source) || isTupleType(source)) {
                     if (isTupleType(target)) {
-                        var sourceLength = getLengthOfTupleType(source);
+                        var sourceLength = isTupleType(source) ? getLengthOfTupleType(source) : 0;
                         var targetLength = getLengthOfTupleType(target);
-                        var sourceRestType = getRestTypeOfTupleType(source);
+                        var sourceRestType = isTupleType(source) ? getRestTypeOfTupleType(source) : getElementTypeOfArrayType(source);
                         var targetRestType = getRestTypeOfTupleType(target);
                         var fixedLength = targetLength < sourceLength || sourceRestType ? targetLength : sourceLength;
                         for (var i = 0; i < fixedLength; i++) {
@@ -44472,7 +44988,7 @@ var ts;
                 var sourceLen = sourceSignatures.length;
                 var targetLen = targetSignatures.length;
                 var len = sourceLen < targetLen ? sourceLen : targetLen;
-                var skipParameters = !!(source.flags & 536870912 /* ContainsAnyFunctionType */);
+                var skipParameters = !!(ts.getObjectFlags(source) & 524288 /* ContainsAnyFunctionType */);
                 for (var i = 0; i < len; i++) {
                     inferFromSignature(getBaseSignature(sourceSignatures[sourceLen - len + i]), getBaseSignature(targetSignatures[targetLen - len + i]), skipParameters);
                 }
@@ -44483,17 +44999,10 @@ var ts;
                     var kind = target.declaration ? target.declaration.kind : 0 /* Unknown */;
                     // Once we descend into a bivariant signature we remain bivariant for all nested inferences
                     bivariant = bivariant || kind === 156 /* MethodDeclaration */ || kind === 155 /* MethodSignature */ || kind === 157 /* Constructor */;
-                    forEachMatchingParameterType(source, target, inferFromContravariantTypes);
+                    applyToParameterTypes(source, target, inferFromContravariantTypes);
                     bivariant = saveBivariant;
                 }
-                var sourceTypePredicate = getTypePredicateOfSignature(source);
-                var targetTypePredicate = getTypePredicateOfSignature(target);
-                if (sourceTypePredicate && targetTypePredicate && sourceTypePredicate.kind === targetTypePredicate.kind) {
-                    inferFromTypes(sourceTypePredicate.type, targetTypePredicate.type);
-                }
-                else {
-                    inferFromTypes(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
-                }
+                applyToReturnTypes(source, target, inferFromTypes);
             }
             function inferFromIndexTypes(source, target) {
                 var targetStringIndexType = getIndexTypeOfType(target, 0 /* String */);
@@ -44516,8 +45025,8 @@ var ts;
             }
         }
         function typeIdenticalToSomeType(type, types) {
-            for (var _i = 0, types_10 = types; _i < types_10.length; _i++) {
-                var t = types_10[_i];
+            for (var _i = 0, types_11 = types; _i < types_11.length; _i++) {
+                var t = types_11[_i];
                 if (isTypeIdenticalTo(t, type)) {
                     return true;
                 }
@@ -44610,7 +45119,7 @@ var ts;
                         if (defaultType) {
                             // Instantiate the default type. Any forward reference to a type
                             // parameter should be instantiated to the empty object type.
-                            inferredType = instantiateType(defaultType, combineTypeMappers(createBackreferenceMapper(context.signature.typeParameters, index), context));
+                            inferredType = instantiateType(defaultType, combineTypeMappers(createBackreferenceMapper(context, index), context.nonFixingMapper));
                         }
                         else {
                             inferredType = getDefaultTypeArgumentType(!!(context.flags & 2 /* AnyDefault */));
@@ -44623,7 +45132,7 @@ var ts;
                 inference.inferredType = inferredType;
                 var constraint = getConstraintOfTypeParameter(inference.typeParameter);
                 if (constraint) {
-                    var instantiatedConstraint = instantiateType(constraint, context);
+                    var instantiatedConstraint = instantiateType(constraint, context.nonFixingMapper);
                     if (!context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
                         inference.inferredType = inferredType = instantiatedConstraint;
                     }
@@ -44648,17 +45157,23 @@ var ts;
                 case "console":
                     return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_include_dom;
                 case "$":
-                    return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_and_then_add_jquery_to_the_types_field_in_your_tsconfig;
+                    return compilerOptions.types
+                        ? ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_and_then_add_jquery_to_the_types_field_in_your_tsconfig
+                        : ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery;
                 case "describe":
                 case "suite":
                 case "it":
                 case "test":
-                    return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashjest_or_npm_i_types_Slashmocha_and_then_add_jest_or_mocha_to_the_types_field_in_your_tsconfig;
+                    return compilerOptions.types
+                        ? ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashjest_or_npm_i_types_Slashmocha_and_then_add_jest_or_mocha_to_the_types_field_in_your_tsconfig
+                        : ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashjest_or_npm_i_types_Slashmocha;
                 case "process":
                 case "require":
                 case "Buffer":
                 case "module":
-                    return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_and_then_add_node_to_the_types_field_in_your_tsconfig;
+                    return compilerOptions.types
+                        ? ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_and_then_add_node_to_the_types_field_in_your_tsconfig
+                        : ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode;
                 case "Map":
                 case "Set":
                 case "Promise":
@@ -44794,9 +45309,8 @@ var ts;
             }
             return false;
         }
-        function hasNarrowableDeclaredType(expr) {
-            var type = getDeclaredTypeOfReference(expr);
-            return !!(type && type.flags & 1048576 /* Union */);
+        function isSyntheticThisPropertyAccess(expr) {
+            return ts.isAccessExpression(expr) && expr.expression.kind === 100 /* ThisKeyword */ && !!(expr.expression.flags & 8 /* Synthesized */);
         }
         function findDiscriminantProperties(sourceProperties, target) {
             var result;
@@ -44873,8 +45387,8 @@ var ts;
         }
         function getTypeFactsOfTypes(types) {
             var result = 0 /* None */;
-            for (var _i = 0, types_11 = types; _i < types_11.length; _i++) {
-                var t = types_11[_i];
+            for (var _i = 0, types_12 = types; _i < types_12.length; _i++) {
+                var t = types_12[_i];
                 result |= getTypeFacts(t);
             }
             return result;
@@ -45154,7 +45668,7 @@ var ts;
             if (type.flags & 1048576 /* Union */) {
                 var types = type.types;
                 var filtered = ts.filter(types, f);
-                return filtered === types ? type : getUnionTypeFromSortedList(filtered, type.primitiveTypesOnly);
+                return filtered === types ? type : getUnionTypeFromSortedList(filtered, type.objectFlags);
             }
             return f(type) ? type : neverType;
         }
@@ -45168,8 +45682,8 @@ var ts;
             var types = type.types;
             var mappedType;
             var mappedTypes;
-            for (var _i = 0, types_12 = types; _i < types_12.length; _i++) {
-                var current = types_12[_i];
+            for (var _i = 0, types_13 = types; _i < types_13.length; _i++) {
+                var current = types_13[_i];
                 var t = mapper(current);
                 if (t) {
                     if (!mappedType) {
@@ -45251,8 +45765,8 @@ var ts;
         }
         function isEvolvingArrayTypeList(types) {
             var hasEvolvingArrayType = false;
-            for (var _i = 0, types_13 = types; _i < types_13.length; _i++) {
-                var t = types_13[_i];
+            for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
+                var t = types_14[_i];
                 if (!(t.flags & 131072 /* Never */)) {
                     if (!(ts.getObjectFlags(t) & 256 /* EvolvingArray */)) {
                         return false;
@@ -45750,6 +46264,15 @@ var ts;
                     assumeTrue = !assumeTrue;
                 }
                 var valueType = getTypeOfExpression(value);
+                if ((type.flags & 2 /* Unknown */) && (operator === 35 /* EqualsEqualsEqualsToken */) && assumeTrue) {
+                    if (valueType.flags & (131068 /* Primitive */ | 67108864 /* NonPrimitive */)) {
+                        return valueType;
+                    }
+                    if (valueType.flags & 524288 /* Object */) {
+                        return nonPrimitiveType;
+                    }
+                    return type;
+                }
                 if (valueType.flags & 98304 /* Nullable */) {
                     if (!strictNullChecks) {
                         return type;
@@ -45779,9 +46302,9 @@ var ts;
                 // We have '==', '!=', '====', or !==' operator with 'typeof xxx' and string literal operands
                 var target = getReferenceCandidate(typeOfExpr.expression);
                 if (!isMatchingReference(reference, target)) {
-                    // For a reference of the form 'x.y', where 'x' has a narrowable declared type, a
-                    // 'typeof x === ...' type guard resets the narrowed type of 'y' to its declared type.
-                    if (containsMatchingReference(reference, target) && hasNarrowableDeclaredType(target)) {
+                    // For a reference of the form 'x.y', a 'typeof x === ...' type guard resets the
+                    // narrowed type of 'y' to its declared type.
+                    if (containsMatchingReference(reference, target)) {
                         return declaredType;
                     }
                     return type;
@@ -45822,13 +46345,37 @@ var ts;
                 }
             }
             function narrowTypeBySwitchOnDiscriminant(type, switchStatement, clauseStart, clauseEnd) {
-                // We only narrow if all case expressions specify values with unit types
+                // We only narrow if all case expressions specify
+                // values with unit types, except for the case where
+                // `type` is unknown. In this instance we map object
+                // types to the nonPrimitive type and narrow with that.
                 var switchTypes = getSwitchClauseTypes(switchStatement);
                 if (!switchTypes.length) {
                     return type;
                 }
                 var clauseTypes = switchTypes.slice(clauseStart, clauseEnd);
                 var hasDefaultClause = clauseStart === clauseEnd || ts.contains(clauseTypes, neverType);
+                if ((type.flags & 2 /* Unknown */) && !hasDefaultClause) {
+                    var groundClauseTypes = void 0;
+                    for (var i = 0; i < clauseTypes.length; i += 1) {
+                        var t = clauseTypes[i];
+                        if (t.flags & (131068 /* Primitive */ | 67108864 /* NonPrimitive */)) {
+                            if (groundClauseTypes !== undefined) {
+                                groundClauseTypes.push(t);
+                            }
+                        }
+                        else if (t.flags & 524288 /* Object */) {
+                            if (groundClauseTypes === undefined) {
+                                groundClauseTypes = clauseTypes.slice(0, i);
+                            }
+                            groundClauseTypes.push(nonPrimitiveType);
+                        }
+                        else {
+                            return type;
+                        }
+                    }
+                    return getUnionType(groundClauseTypes === undefined ? clauseTypes : groundClauseTypes);
+                }
                 var discriminantType = getUnionType(clauseTypes);
                 var caseType = discriminantType.flags & 131072 /* Never */ ? neverType :
                     replacePrimitivesWithLiterals(filterType(type, function (t) { return areTypesComparable(discriminantType, t); }), discriminantType);
@@ -45929,9 +46476,14 @@ var ts;
             function narrowTypeByInstanceof(type, expr, assumeTrue) {
                 var left = getReferenceCandidate(expr.left);
                 if (!isMatchingReference(reference, left)) {
-                    // For a reference of the form 'x.y', where 'x' has a narrowable declared type, an
-                    // 'x instanceof T' type guard resets the narrowed type of 'y' to its declared type.
-                    if (containsMatchingReference(reference, left) && hasNarrowableDeclaredType(left)) {
+                    // For a reference of the form 'x.y', an 'x instanceof T' type guard resets the
+                    // narrowed type of 'y' to its declared type. We do this because preceding 'x.y'
+                    // references might reference a different 'y' property. However, we make an exception
+                    // for property accesses where x is a synthetic 'this' expression, indicating that we
+                    // were called from isPropertyInitializedInConstructor. Without this exception,
+                    // initializations of 'this' properties that occur before a 'this instanceof XXX'
+                    // check would not be considered.
+                    if (containsMatchingReference(reference, left) && !isSyntheticThisPropertyAccess(reference)) {
                         return declaredType;
                     }
                     return type;
@@ -45998,7 +46550,7 @@ var ts;
                     return type;
                 }
                 if (ts.isIdentifierTypePredicate(predicate)) {
-                    var predicateArgument = callExpression.arguments[predicate.parameterIndex - (signature.thisParameter ? 1 : 0)];
+                    var predicateArgument = callExpression.arguments[predicate.parameterIndex];
                     if (predicateArgument) {
                         if (isMatchingReference(reference, predicateArgument)) {
                             return getNarrowedType(type, predicate.type, assumeTrue, isTypeSubtypeOf);
@@ -46075,7 +46627,7 @@ var ts;
             return ts.findAncestor(node.parent, function (node) {
                 return ts.isFunctionLike(node) && !ts.getImmediatelyInvokedFunctionExpression(node) ||
                     node.kind === 245 /* ModuleBlock */ ||
-                    node.kind === 279 /* SourceFile */ ||
+                    node.kind === 284 /* SourceFile */ ||
                     node.kind === 154 /* PropertyDeclaration */;
             });
         }
@@ -46196,7 +46748,7 @@ var ts;
                     // to the constructor in the initializer, we will need to substitute that
                     // binding with an alias as the class name is not in scope.
                     var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
-                    while (container.kind !== 279 /* SourceFile */) {
+                    while (container.kind !== 284 /* SourceFile */) {
                         if (container.parent === declaration) {
                             if (container.kind === 154 /* PropertyDeclaration */ && ts.hasModifier(container, 32 /* Static */)) {
                                 getNodeLinks(declaration).flags |= 16777216 /* ClassWithConstructorReference */;
@@ -46302,6 +46854,7 @@ var ts;
         function checkNestedBlockScopedBinding(node, symbol) {
             if (languageVersion >= 2 /* ES2015 */ ||
                 (symbol.flags & (2 /* BlockScopedVariable */ | 32 /* Class */)) === 0 ||
+                ts.isSourceFile(symbol.valueDeclaration) ||
                 symbol.valueDeclaration.parent.kind === 274 /* CatchClause */) {
                 return;
             }
@@ -46489,22 +47042,27 @@ var ts;
             if (capturedByArrowFunction && languageVersion < 2 /* ES2015 */) {
                 captureLexicalThis(node, container);
             }
-            var type = tryGetThisTypeAt(node, container);
-            if (!type && noImplicitThis) {
-                // With noImplicitThis, functions may not reference 'this' if it has type 'any'
-                var diag = error(node, capturedByArrowFunction && container.kind === 279 /* SourceFile */ ?
-                    ts.Diagnostics.The_containing_arrow_function_captures_the_global_value_of_this_which_implicitly_has_type_any :
-                    ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation);
-                if (!ts.isSourceFile(container)) {
-                    var outsideThis = tryGetThisTypeAt(container);
-                    if (outsideThis) {
-                        addRelatedInfo(diag, ts.createDiagnosticForNode(container, ts.Diagnostics.An_outer_value_of_this_is_shadowed_by_this_container));
+            var type = tryGetThisTypeAt(node, /*includeGlobalThis*/ true, container);
+            if (noImplicitThis) {
+                var globalThisType_1 = getTypeOfSymbol(globalThisSymbol);
+                if (type === globalThisType_1 && capturedByArrowFunction) {
+                    error(node, ts.Diagnostics.The_containing_arrow_function_captures_the_global_value_of_this);
+                }
+                else if (!type) {
+                    // With noImplicitThis, functions may not reference 'this' if it has type 'any'
+                    var diag = error(node, ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation);
+                    if (!ts.isSourceFile(container)) {
+                        var outsideThis = tryGetThisTypeAt(container);
+                        if (outsideThis && outsideThis !== globalThisType_1) {
+                            ts.addRelatedInfo(diag, ts.createDiagnosticForNode(container, ts.Diagnostics.An_outer_value_of_this_is_shadowed_by_this_container));
+                        }
                     }
                 }
             }
             return type || anyType;
         }
-        function tryGetThisTypeAt(node, container) {
+        function tryGetThisTypeAt(node, includeGlobalThis, container) {
+            if (includeGlobalThis === void 0) { includeGlobalThis = true; }
             if (container === void 0) { container = ts.getThisContainer(node, /*includeArrowFunctions*/ false); }
             var isInJS = ts.isInJSFile(node);
             if (ts.isFunctionLike(container) &&
@@ -46549,6 +47107,16 @@ var ts;
                     return getFlowTypeOfReference(node, type);
                 }
             }
+            if (ts.isSourceFile(container)) {
+                // look up in the source file's locals or exports
+                if (container.commonJsModuleIndicator) {
+                    var fileSymbol = getSymbolOfNode(container);
+                    return fileSymbol && getTypeOfSymbol(fileSymbol);
+                }
+                else if (includeGlobalThis) {
+                    return getTypeOfSymbol(globalThisSymbol);
+                }
+            }
         }
         function getClassNameFromPrototypeMethod(container) {
             // Check if it's the RHS of a x.prototype.y = function [name]() { .... }
@@ -46604,7 +47172,7 @@ var ts;
         }
         function getTypeForThisExpressionFromJSDoc(node) {
             var jsdocType = ts.getJSDocType(node);
-            if (jsdocType && jsdocType.kind === 289 /* JSDocFunctionType */) {
+            if (jsdocType && jsdocType.kind === 294 /* JSDocFunctionType */) {
                 var jsDocFunctionType = jsdocType;
                 if (jsDocFunctionType.parameters.length > 0 &&
                     jsDocFunctionType.parameters[0].name &&
@@ -46618,7 +47186,7 @@ var ts;
             }
         }
         function isInConstructorArgumentInitializer(node, constructorDecl) {
-            return !!ts.findAncestor(node, function (n) { return n === constructorDecl ? "quit" : n.kind === 151 /* Parameter */; });
+            return !!ts.findAncestor(node, function (n) { return ts.isFunctionLikeDeclaration(n) ? "quit" : n.kind === 151 /* Parameter */ && n.parent === constructorDecl; });
         }
         function checkSuperExpression(node) {
             var isCallExpression = node.parent.kind === 191 /* CallExpression */ && node.parent.expression === node;
@@ -46843,7 +47411,7 @@ var ts;
                     while (type) {
                         var thisType = getThisTypeFromContextualType(type);
                         if (thisType) {
-                            return instantiateType(thisType, getContextualMapper(containingLiteral));
+                            return instantiateType(thisType, getMapperFromContext(getInferenceContext(containingLiteral)));
                         }
                         if (literal.parent.kind !== 275 /* PropertyAssignment */) {
                             break;
@@ -47138,7 +47706,15 @@ var ts;
         }
         function getTypeOfPropertyOfContextualType(type, name) {
             return mapType(type, function (t) {
-                if (t.flags & 3670016 /* StructuredType */) {
+                if (isGenericMappedType(t)) {
+                    var constraint = getConstraintTypeFromMappedType(t);
+                    var constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
+                    var propertyNameType = getLiteralType(ts.unescapeLeadingUnderscores(name));
+                    if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
+                        return substituteIndexedMappedType(t, propertyNameType);
+                    }
+                }
+                else if (t.flags & 3670016 /* StructuredType */) {
                     var prop = getPropertyOfType(t, name);
                     if (prop) {
                         return getTypeOfSymbol(prop);
@@ -47274,18 +47850,46 @@ var ts;
         // Return the contextual type for a given expression node. During overload resolution, a contextual type may temporarily
         // be "pushed" onto a node using the contextualType property.
         function getApparentTypeOfContextualType(node) {
-            var contextualType = getContextualType(node);
-            contextualType = contextualType && mapType(contextualType, getApparentType);
-            if (contextualType && contextualType.flags & 1048576 /* Union */) {
-                if (ts.isObjectLiteralExpression(node)) {
-                    return discriminateContextualTypeByObjectMembers(node, contextualType);
+            var contextualType = instantiateContextualType(getContextualType(node), node);
+            if (contextualType) {
+                var apparentType = mapType(contextualType, getApparentType, /*noReductions*/ true);
+                if (apparentType.flags & 1048576 /* Union */) {
+                    if (ts.isObjectLiteralExpression(node)) {
+                        return discriminateContextualTypeByObjectMembers(node, apparentType);
+                    }
+                    else if (ts.isJsxAttributes(node)) {
+                        return discriminateContextualTypeByJSXAttributes(node, apparentType);
+                    }
                 }
-                else if (ts.isJsxAttributes(node)) {
-                    return discriminateContextualTypeByJSXAttributes(node, contextualType);
+                return apparentType;
+            }
+        }
+        // If the given contextual type contains instantiable types and if a mapper representing
+        // return type inferences is available, instantiate those types using that mapper.
+        function instantiateContextualType(contextualType, node) {
+            if (contextualType && maybeTypeOfKind(contextualType, 63176704 /* Instantiable */)) {
+                var inferenceContext = getInferenceContext(node);
+                if (inferenceContext && inferenceContext.returnMapper) {
+                    return instantiateInstantiableTypes(contextualType, inferenceContext.returnMapper);
                 }
             }
             return contextualType;
         }
+        // This function is similar to instantiateType, except that (a) it only instantiates types that
+        // are classified as instantiable (i.e. it doesn't instantiate object types), and (b) it performs
+        // no reductions on instantiated union types.
+        function instantiateInstantiableTypes(type, mapper) {
+            if (type.flags & 63176704 /* Instantiable */) {
+                return instantiateType(type, mapper);
+            }
+            if (type.flags & 1048576 /* Union */) {
+                return getUnionType(ts.map(type.types, function (t) { return instantiateInstantiableTypes(t, mapper); }), 0 /* None */);
+            }
+            if (type.flags & 2097152 /* Intersection */) {
+                return getIntersectionType(ts.map(type.types, function (t) { return instantiateInstantiableTypes(t, mapper); }));
+            }
+            return type;
+        }
         /**
          * Woah! Do you really want to use this function?
          *
@@ -47331,7 +47935,7 @@ var ts;
                     return getContextualTypeForArgument(parent, node);
                 case 194 /* TypeAssertionExpression */:
                 case 212 /* AsExpression */:
-                    return getTypeFromTypeNode(parent.type);
+                    return ts.isConstTypeReference(parent.type) ? undefined : getTypeFromTypeNode(parent.type);
                 case 204 /* BinaryExpression */:
                     return getContextualTypeForBinaryOperand(node);
                 case 275 /* PropertyAssignment */:
@@ -47365,9 +47969,9 @@ var ts;
             }
             return undefined;
         }
-        function getContextualMapper(node) {
-            var ancestor = ts.findAncestor(node, function (n) { return !!n.contextualMapper; });
-            return ancestor ? ancestor.contextualMapper : identityMapper;
+        function getInferenceContext(node) {
+            var ancestor = ts.findAncestor(node, function (n) { return !!n.inferenceContext; });
+            return ancestor && ancestor.inferenceContext;
         }
         function getContextualJsxElementAttributesType(node) {
             if (ts.isJsxOpeningElement(node) && node.parent.contextualType) {
@@ -47548,8 +48152,8 @@ var ts;
             }
             var signatureList;
             var types = type.types;
-            for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
-                var current = types_14[_i];
+            for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
+                var current = types_15[_i];
                 var signature = getContextualCallSignature(current, node);
                 if (signature) {
                     if (!signatureList) {
@@ -47567,12 +48171,7 @@ var ts;
                 }
             }
             // Result is union of signatures collected (return type is union of return types of this signature set)
-            var result;
-            if (signatureList) {
-                result = cloneSignature(signatureList[0]);
-                result.unionSignatures = signatureList;
-            }
-            return result;
+            return signatureList && createUnionSignature(signatureList[0], signatureList);
         }
         function checkSpreadExpression(node, checkMode) {
             if (languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
@@ -47592,6 +48191,7 @@ var ts;
             var elementTypes = [];
             var inDestructuringPattern = ts.isAssignmentTarget(node);
             var contextualType = getApparentTypeOfContextualType(node);
+            var inConstContext = isConstContext(node);
             for (var index = 0; index < elementCount; index++) {
                 var e = elements[index];
                 if (inDestructuringPattern && e.kind === 208 /* SpreadElement */) {
@@ -47634,21 +48234,24 @@ var ts;
                     type.pattern = node;
                     return type;
                 }
-                else if (tupleResult = getArrayLiteralTupleTypeIfApplicable(elementTypes, contextualType, hasRestElement, elementCount)) {
+                else if (tupleResult = getArrayLiteralTupleTypeIfApplicable(elementTypes, contextualType, hasRestElement, elementCount, inConstContext)) {
                     return tupleResult;
                 }
                 else if (forceTuple) {
                     return createTupleType(elementTypes, minLength, hasRestElement);
                 }
             }
-            return getArrayLiteralType(elementTypes, 2 /* Subtype */);
+            return createArrayType(elementTypes.length ?
+                getUnionType(elementTypes, 2 /* Subtype */) :
+                strictNullChecks ? implicitNeverType : undefinedWideningType, inConstContext);
         }
-        function getArrayLiteralTupleTypeIfApplicable(elementTypes, contextualType, hasRestElement, elementCount) {
+        function getArrayLiteralTupleTypeIfApplicable(elementTypes, contextualType, hasRestElement, elementCount, readonly) {
             if (elementCount === void 0) { elementCount = elementTypes.length; }
+            if (readonly === void 0) { readonly = false; }
             // Infer a tuple type when the contextual type is or contains a tuple-like type
-            if (contextualType && forEachType(contextualType, isTupleLikeType)) {
+            if (readonly || (contextualType && forEachType(contextualType, isTupleLikeType))) {
                 var minLength = elementCount - (hasRestElement ? 1 : 0);
-                var pattern = contextualType.pattern;
+                var pattern = contextualType && contextualType.pattern;
                 // If array literal is contextually typed by a binding pattern or an assignment pattern, pad the resulting
                 // tuple type with the corresponding binding or assignment element types to make the lengths equal.
                 if (!hasRestElement && pattern && (pattern.kind === 185 /* ArrayBindingPattern */ || pattern.kind === 187 /* ArrayLiteralExpression */)) {
@@ -47666,15 +48269,9 @@ var ts;
                         }
                     }
                 }
-                return createTupleType(elementTypes, minLength, hasRestElement);
+                return createTupleType(elementTypes, minLength, hasRestElement, readonly);
             }
         }
-        function getArrayLiteralType(elementTypes, unionReduction) {
-            if (unionReduction === void 0) { unionReduction = 1 /* Literal */; }
-            return createArrayType(elementTypes.length ?
-                getUnionType(elementTypes, unionReduction) :
-                strictNullChecks ? implicitNeverType : undefinedWideningType);
-        }
         function isNumericName(name) {
             switch (name.kind) {
                 case 149 /* ComputedPropertyName */:
@@ -47737,15 +48334,15 @@ var ts;
             }
             return links.resolvedType;
         }
-        function getObjectLiteralIndexInfo(propertyNodes, offset, properties, kind) {
+        function getObjectLiteralIndexInfo(node, offset, properties, kind) {
             var propTypes = [];
             for (var i = 0; i < properties.length; i++) {
-                if (kind === 0 /* String */ || isNumericName(propertyNodes[i + offset].name)) {
+                if (kind === 0 /* String */ || isNumericName(node.properties[i + offset].name)) {
                     propTypes.push(getTypeOfSymbol(properties[i]));
                 }
             }
             var unionType = propTypes.length ? getUnionType(propTypes, 2 /* Subtype */) : undefinedType;
-            return createIndexInfo(unionType, /*isReadonly*/ false);
+            return createIndexInfo(unionType, isConstContext(node));
         }
         function getImmediateAliasedSymbol(symbol) {
             ts.Debug.assert((symbol.flags & 2097152 /* Alias */) !== 0, "Should only get Alias here.");
@@ -47765,14 +48362,15 @@ var ts;
             var propertiesTable;
             var propertiesArray = [];
             var spread = emptyObjectType;
-            var propagatedFlags = 0;
             var contextualType = getApparentTypeOfContextualType(node);
             var contextualTypeHasPattern = contextualType && contextualType.pattern &&
                 (contextualType.pattern.kind === 184 /* ObjectBindingPattern */ || contextualType.pattern.kind === 188 /* ObjectLiteralExpression */);
+            var inConstContext = isConstContext(node);
+            var checkFlags = inConstContext ? 8 /* Readonly */ : 0;
             var isInJavascript = ts.isInJSFile(node) && !ts.isInJsonFile(node);
             var enumTag = ts.getJSDocEnumTag(node);
             var isJSObjectLiteral = !contextualType && isInJavascript && !enumTag;
-            var typeFlags = 0;
+            var objectFlags = freshObjectLiteralFlag;
             var patternWithComputedProperties = false;
             var hasComputedStringProperty = false;
             var hasComputedNumberProperty = false;
@@ -47799,11 +48397,11 @@ var ts;
                             checkTypeAssignableTo(type, getTypeFromTypeNode(enumTag.typeExpression), memberDecl);
                         }
                     }
-                    typeFlags |= type.flags;
+                    objectFlags |= ts.getObjectFlags(type) & 917504 /* PropagatingFlags */;
                     var nameType = computedNameType && isTypeUsableAsPropertyName(computedNameType) ? computedNameType : undefined;
                     var prop = nameType ?
-                        createSymbol(4 /* Property */ | member.flags, getPropertyNameFromType(nameType), 2048 /* Late */) :
-                        createSymbol(4 /* Property */ | member.flags, member.escapedName);
+                        createSymbol(4 /* Property */ | member.flags, getPropertyNameFromType(nameType), checkFlags | 2048 /* Late */) :
+                        createSymbol(4 /* Property */ | member.flags, member.escapedName, checkFlags);
                     if (nameType) {
                         prop.nameType = nameType;
                     }
@@ -47841,19 +48439,18 @@ var ts;
                         checkExternalEmitHelpers(memberDecl, 2 /* Assign */);
                     }
                     if (propertiesArray.length > 0) {
-                        spread = getSpreadType(spread, createObjectLiteralType(), node.symbol, propagatedFlags, 32768 /* FreshLiteral */);
+                        spread = getSpreadType(spread, createObjectLiteralType(), node.symbol, objectFlags, inConstContext);
                         propertiesArray = [];
                         propertiesTable = ts.createSymbolTable();
                         hasComputedStringProperty = false;
                         hasComputedNumberProperty = false;
-                        typeFlags = 0;
                     }
                     var type = checkExpression(memberDecl.expression);
                     if (!isValidSpreadType(type)) {
                         error(memberDecl, ts.Diagnostics.Spread_types_may_only_be_created_from_object_types);
                         return errorType;
                     }
-                    spread = getSpreadType(spread, type, node.symbol, propagatedFlags, 32768 /* FreshLiteral */);
+                    spread = getSpreadType(spread, type, node.symbol, objectFlags, inConstContext);
                     offset = i + 1;
                     continue;
                 }
@@ -47900,17 +48497,16 @@ var ts;
             }
             if (spread !== emptyObjectType) {
                 if (propertiesArray.length > 0) {
-                    spread = getSpreadType(spread, createObjectLiteralType(), node.symbol, propagatedFlags, 32768 /* FreshLiteral */);
+                    spread = getSpreadType(spread, createObjectLiteralType(), node.symbol, objectFlags, inConstContext);
                 }
                 return spread;
             }
             return createObjectLiteralType();
             function createObjectLiteralType() {
-                var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node.properties, offset, propertiesArray, 0 /* String */) : undefined;
-                var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node.properties, offset, propertiesArray, 1 /* Number */) : undefined;
+                var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, offset, propertiesArray, 0 /* String */) : undefined;
+                var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, offset, propertiesArray, 1 /* Number */) : undefined;
                 var result = createAnonymousType(node.symbol, propertiesTable, ts.emptyArray, ts.emptyArray, stringIndexInfo, numberIndexInfo);
-                result.flags |= 268435456 /* ContainsObjectLiteral */ | typeFlags & 939524096 /* PropagatingFlags */;
-                result.objectFlags |= 128 /* ObjectLiteral */ | freshObjectLiteralFlag;
+                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 262144 /* ContainsObjectLiteral */;
                 if (isJSObjectLiteral) {
                     result.objectFlags |= 16384 /* JSLiteral */;
                 }
@@ -47920,7 +48516,6 @@ var ts;
                 if (inDestructuringPattern) {
                     result.pattern = node;
                 }
-                propagatedFlags |= result.flags & 939524096 /* PropagatingFlags */;
                 return result;
             }
         }
@@ -47996,7 +48591,6 @@ var ts;
             var hasSpreadAnyType = false;
             var typeToIntersect;
             var explicitlySpecifyChildrenAttribute = false;
-            var typeFlags = 0;
             var objectFlags = 4096 /* JsxAttributes */;
             var jsxChildrenPropertyName = getJsxElementChildrenPropertyName(getJsxNamespaceAt(openingLikeElement));
             for (var _i = 0, _a = attributes.properties; _i < _a.length; _i++) {
@@ -48004,7 +48598,7 @@ var ts;
                 var member = attributeDecl.symbol;
                 if (ts.isJsxAttribute(attributeDecl)) {
                     var exprType = checkJsxAttribute(attributeDecl, checkMode);
-                    typeFlags |= exprType.flags & 939524096 /* PropagatingFlags */;
+                    objectFlags |= ts.getObjectFlags(exprType) & 917504 /* PropagatingFlags */;
                     var attributeSymbol = createSymbol(4 /* Property */ | 33554432 /* Transient */ | member.flags, member.escapedName);
                     attributeSymbol.declarations = member.declarations;
                     attributeSymbol.parent = member.parent;
@@ -48021,7 +48615,7 @@ var ts;
                 else {
                     ts.Debug.assert(attributeDecl.kind === 269 /* JsxSpreadAttribute */);
                     if (attributesTable.size > 0) {
-                        spread = getSpreadType(spread, createJsxAttributesType(), attributes.symbol, typeFlags, objectFlags);
+                        spread = getSpreadType(spread, createJsxAttributesType(), attributes.symbol, objectFlags, /*readonly*/ false);
                         attributesTable = ts.createSymbolTable();
                     }
                     var exprType = checkExpressionCached(attributeDecl.expression, checkMode);
@@ -48029,7 +48623,7 @@ var ts;
                         hasSpreadAnyType = true;
                     }
                     if (isValidSpreadType(exprType)) {
-                        spread = getSpreadType(spread, exprType, attributes.symbol, typeFlags, objectFlags);
+                        spread = getSpreadType(spread, exprType, attributes.symbol, objectFlags, /*readonly*/ false);
                     }
                     else {
                         typeToIntersect = typeToIntersect ? getIntersectionType([typeToIntersect, exprType]) : exprType;
@@ -48038,7 +48632,7 @@ var ts;
             }
             if (!hasSpreadAnyType) {
                 if (attributesTable.size > 0) {
-                    spread = getSpreadType(spread, createJsxAttributesType(), attributes.symbol, typeFlags, objectFlags);
+                    spread = getSpreadType(spread, createJsxAttributesType(), attributes.symbol, objectFlags, /*readonly*/ false);
                 }
             }
             // Handle children attribute
@@ -48066,7 +48660,7 @@ var ts;
                     childrenPropSymbol.valueDeclaration.symbol = childrenPropSymbol;
                     var childPropMap = ts.createSymbolTable();
                     childPropMap.set(jsxChildrenPropertyName, childrenPropSymbol);
-                    spread = getSpreadType(spread, createAnonymousType(attributes.symbol, childPropMap, ts.emptyArray, ts.emptyArray, /*stringIndexInfo*/ undefined, /*numberIndexInfo*/ undefined), attributes.symbol, typeFlags, objectFlags);
+                    spread = getSpreadType(spread, createAnonymousType(attributes.symbol, childPropMap, ts.emptyArray, ts.emptyArray, /*stringIndexInfo*/ undefined, /*numberIndexInfo*/ undefined), attributes.symbol, objectFlags, /*readonly*/ false);
                 }
             }
             if (hasSpreadAnyType) {
@@ -48084,8 +48678,7 @@ var ts;
             function createJsxAttributesType() {
                 objectFlags |= freshObjectLiteralFlag;
                 var result = createAnonymousType(attributes.symbol, attributesTable, ts.emptyArray, ts.emptyArray, /*stringIndexInfo*/ undefined, /*numberIndexInfo*/ undefined);
-                result.flags |= 268435456 /* ContainsObjectLiteral */ | typeFlags;
-                result.objectFlags |= 128 /* ObjectLiteral */ | objectFlags;
+                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 262144 /* ContainsObjectLiteral */;
                 return result;
             }
         }
@@ -48096,7 +48689,7 @@ var ts;
                 // In React, JSX text that contains only whitespaces will be ignored so we don't want to type-check that
                 // because then type of children property will have constituent of string type.
                 if (child.kind === 11 /* JsxText */) {
-                    if (!child.containsOnlyWhiteSpaces) {
+                    if (!child.containsOnlyTriviaWhiteSpaces) {
                         childrenTypes.push(stringType);
                     }
                 }
@@ -48167,7 +48760,7 @@ var ts;
                 var namespaceName = getJsxNamespace(location);
                 var resolvedNamespace = resolveName(location, namespaceName, 1920 /* Namespace */, /*diagnosticMessage*/ undefined, namespaceName, /*isUse*/ false);
                 if (resolvedNamespace) {
-                    var candidate = getSymbol(getExportsOfSymbol(resolveSymbol(resolvedNamespace)), JsxNames.JSX, 1920 /* Namespace */);
+                    var candidate = resolveSymbol(getSymbol(getExportsOfSymbol(resolveSymbol(resolvedNamespace)), JsxNames.JSX, 1920 /* Namespace */));
                     if (candidate) {
                         if (links) {
                             links.jsxNamespace = candidate;
@@ -48372,7 +48965,7 @@ var ts;
                 // Mark local symbol as referenced here because it might not have been marked
                 // if jsx emit was not react as there wont be error being emitted
                 reactSym.isReferenced = 67108863 /* All */;
-                // If react symbol is alias, mark it as refereced
+                // If react symbol is alias, mark it as referenced
                 if (reactSym.flags & 2097152 /* Alias */ && !isConstEnumOrConstEnumOnlyModule(resolveAlias(reactSym))) {
                     markAliasSymbolAsReferenced(reactSym);
                 }
@@ -48610,6 +49203,15 @@ var ts;
                     if (isJSLiteralType(leftType)) {
                         return anyType;
                     }
+                    if (leftType.symbol === globalThisSymbol) {
+                        if (globalThisSymbol.exports.has(right.escapedText) && (globalThisSymbol.exports.get(right.escapedText).flags & 418 /* BlockScoped */)) {
+                            error(right, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(right.escapedText), typeToString(leftType));
+                        }
+                        else if (noImplicitAny) {
+                            error(right, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature, typeToString(leftType));
+                        }
+                        return anyType;
+                    }
                     if (right.escapedText && !checkAndReportErrorForExtendingInterface(node)) {
                         reportNonexistentProperty(right, leftType.flags & 262144 /* TypeParameter */ && leftType.isThisType ? apparentType : leftType);
                     }
@@ -48688,7 +49290,7 @@ var ts;
                 diagnosticMessage = error(right, ts.Diagnostics.Class_0_used_before_its_declaration, declarationName);
             }
             if (diagnosticMessage) {
-                addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(valueDeclaration, ts.Diagnostics._0_is_declared_here, declarationName));
+                ts.addRelatedInfo(diagnosticMessage, ts.createDiagnosticForNode(valueDeclaration, ts.Diagnostics._0_is_declared_here, declarationName));
             }
         }
         function isInPropertyInitializer(node) {
@@ -48697,7 +49299,19 @@ var ts;
                     case 154 /* PropertyDeclaration */:
                         return true;
                     case 275 /* PropertyAssignment */:
-                        // We might be in `a = { b: this.b }`, so keep looking. See `tests/cases/compiler/useBeforeDeclaration_propertyAssignment.ts`.
+                    case 156 /* MethodDeclaration */:
+                    case 158 /* GetAccessor */:
+                    case 159 /* SetAccessor */:
+                    case 277 /* SpreadAssignment */:
+                    case 149 /* ComputedPropertyName */:
+                    case 216 /* TemplateSpan */:
+                    case 270 /* JsxExpression */:
+                    case 267 /* JsxAttribute */:
+                    case 268 /* JsxAttributes */:
+                    case 269 /* JsxSpreadAttribute */:
+                    case 262 /* JsxOpeningElement */:
+                    case 211 /* ExpressionWithTypeArguments */:
+                    case 273 /* HeritageClause */:
                         return false;
                     default:
                         return ts.isExpressionNode(node) ? false : "quit";
@@ -48765,7 +49379,7 @@ var ts;
             }
             var resultDiagnostic = ts.createDiagnosticForNodeFromMessageChain(propNode, errorInfo);
             if (relatedInfo) {
-                addRelatedInfo(resultDiagnostic, relatedInfo);
+                ts.addRelatedInfo(resultDiagnostic, relatedInfo);
             }
             diagnostics.add(resultDiagnostic);
         }
@@ -49164,38 +49778,34 @@ var ts;
             return undefined;
         }
         // Instantiate a generic signature in the context of a non-generic signature (section 3.8.5 in TypeScript spec)
-        function instantiateSignatureInContextOf(signature, contextualSignature, contextualMapper, compareTypes) {
+        function instantiateSignatureInContextOf(signature, contextualSignature, inferenceContext, compareTypes) {
             var context = createInferenceContext(signature.typeParameters, signature, 0 /* None */, compareTypes);
-            var sourceSignature = contextualMapper ? instantiateSignature(contextualSignature, contextualMapper) : contextualSignature;
-            forEachMatchingParameterType(sourceSignature, signature, function (source, target) {
+            // We clone the inferenceContext to avoid fixing. For example, when the source signature is <T>(x: T) => T[] and
+            // the contextual signature is (...args: A) => B, we want to infer the element type of A's constraint (say 'any')
+            // for T but leave it possible to later infer '[any]' back to A.
+            var restType = getEffectiveRestType(contextualSignature);
+            var mapper = inferenceContext && (restType && restType.flags & 262144 /* TypeParameter */ ? inferenceContext.nonFixingMapper : inferenceContext.mapper);
+            var sourceSignature = mapper ? instantiateSignature(contextualSignature, mapper) : contextualSignature;
+            applyToParameterTypes(sourceSignature, signature, function (source, target) {
                 // Type parameters from outer context referenced by source type are fixed by instantiation of the source type
                 inferTypes(context.inferences, source, target);
             });
-            if (!contextualMapper) {
-                inferTypes(context.inferences, getReturnTypeOfSignature(contextualSignature), getReturnTypeOfSignature(signature), 8 /* ReturnType */);
+            if (!inferenceContext) {
+                applyToReturnTypes(contextualSignature, signature, function (source, target) {
+                    inferTypes(context.inferences, source, target, 8 /* ReturnType */);
+                });
             }
             return getSignatureInstantiation(signature, getInferredTypes(context), ts.isInJSFile(contextualSignature.declaration));
         }
-        function inferJsxTypeArguments(node, signature, excludeArgument, context) {
+        function inferJsxTypeArguments(node, signature, checkMode, context) {
             var paramType = getEffectiveFirstArgumentForJsxSignature(signature, node);
-            var checkAttrType = checkExpressionWithContextualType(node.attributes, paramType, excludeArgument && excludeArgument[0] !== undefined ? identityMapper : context);
+            var checkAttrType = checkExpressionWithContextualType(node.attributes, paramType, context, checkMode);
             inferTypes(context.inferences, checkAttrType, paramType);
             return getInferredTypes(context);
         }
-        function inferTypeArguments(node, signature, args, excludeArgument, context) {
-            // Clear out all the inference results from the last time inferTypeArguments was called on this context
-            for (var _i = 0, _a = context.inferences; _i < _a.length; _i++) {
-                var inference = _a[_i];
-                // As an optimization, we don't have to clear (and later recompute) inferred types
-                // for type parameters that have already been fixed on the previous call to inferTypeArguments.
-                // It would be just as correct to reset all of them. But then we'd be repeating the same work
-                // for the type parameters that were fixed, namely the work done by getInferredType.
-                if (!inference.isFixed) {
-                    inference.inferredType = undefined;
-                }
-            }
+        function inferTypeArguments(node, signature, args, checkMode, context) {
             if (ts.isJsxOpeningLikeElement(node)) {
-                return inferJsxTypeArguments(node, signature, excludeArgument, context);
+                return inferJsxTypeArguments(node, signature, checkMode, context);
             }
             // If a contextual type is available, infer from that type to the return type of the call expression. For
             // example, given a 'function wrap<T, U>(cb: (x: T) => U): (x: T) => U' and a call expression
@@ -49204,10 +49814,11 @@ var ts;
             if (node.kind !== 152 /* Decorator */) {
                 var contextualType = getContextualType(node);
                 if (contextualType) {
-                    // We clone the contextual mapper to avoid disturbing a resolution in progress for an
+                    // We clone the inference context to avoid disturbing a resolution in progress for an
                     // outer call expression. Effectively we just want a snapshot of whatever has been
                     // inferred for any outer call expression so far.
-                    var instantiatedType = instantiateType(contextualType, cloneTypeMapper(getContextualMapper(node)));
+                    var outerMapper = getMapperFromContext(cloneInferenceContext(getInferenceContext(node), 1 /* NoDefault */));
+                    var instantiatedType = instantiateType(contextualType, outerMapper);
                     // If the contextual type is a generic function type with a single call signature, we
                     // instantiate the type with its own type parameters and type arguments. This ensures that
                     // the type parameters are not erased to type any during type inference such that they can
@@ -49222,6 +49833,9 @@ var ts;
                     var inferenceTargetType = getReturnTypeOfSignature(signature);
                     // Inferences made from return types have lower priority than all other inferences.
                     inferTypes(context.inferences, inferenceSourceType, inferenceTargetType, 8 /* ReturnType */);
+                    // Create a type mapper for instantiating generic contextual types using the inferences made
+                    // from the return type.
+                    context.returnMapper = getMapperFromContext(cloneInferredPartOfContext(context));
                 }
             }
             var thisType = getThisTypeOfSignature(signature);
@@ -49236,10 +49850,7 @@ var ts;
                 var arg = args[i];
                 if (arg.kind !== 210 /* OmittedExpression */) {
                     var paramType = getTypeAtPosition(signature, i);
-                    // For context sensitive arguments we pass the identityMapper, which is a signal to treat all
-                    // context sensitive function expressions as wildcards
-                    var mapper = excludeArgument && excludeArgument[i] !== undefined ? identityMapper : context;
-                    var argType = checkExpressionWithContextualType(arg, paramType, mapper);
+                    var argType = checkExpressionWithContextualType(arg, paramType, context, checkMode);
                     inferTypes(context.inferences, argType, paramType);
                 }
             }
@@ -49263,7 +49874,7 @@ var ts;
                     // and the argument are ...x forms.
                     return arg.kind === 215 /* SyntheticExpression */ ?
                         createArrayType(arg.type) :
-                        getArrayifiedType(checkExpressionWithContextualType(arg.expression, restType, context));
+                        getArrayifiedType(checkExpressionWithContextualType(arg.expression, restType, context, 0 /* Normal */));
                 }
             }
             var contextualType = getIndexTypeOfType(restType, 1 /* Number */) || anyType;
@@ -49271,7 +49882,7 @@ var ts;
             var types = [];
             var spreadIndex = -1;
             for (var i = index; i < argCount; i++) {
-                var argType = checkExpressionWithContextualType(args[i], contextualType, context);
+                var argType = checkExpressionWithContextualType(args[i], contextualType, context, 0 /* Normal */);
                 if (spreadIndex < 0 && isSpreadArgument(args[i])) {
                     spreadIndex = i - index;
                 }
@@ -49321,19 +49932,18 @@ var ts;
          * @param node a JSX opening-like element we are trying to figure its call signature
          * @param signature a candidate signature we are trying whether it is a call signature
          * @param relation a relationship to check parameter and argument type
-         * @param excludeArgument
          */
-        function checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, excludeArgument, reportErrors) {
+        function checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors) {
             // Stateless function components can have maximum of three arguments: "props", "context", and "updater".
             // However "context" and "updater" are implicit and can't be specify by users. Only the first parameter, props,
             // can be specified by users through attributes property.
             var paramType = getEffectiveFirstArgumentForJsxSignature(signature, node);
-            var attributesType = checkExpressionWithContextualType(node.attributes, paramType, excludeArgument && excludeArgument[0] ? identityMapper : undefined);
+            var attributesType = checkExpressionWithContextualType(node.attributes, paramType, /*inferenceContext*/ undefined, checkMode);
             return checkTypeRelatedToAndOptionallyElaborate(attributesType, paramType, relation, reportErrors ? node.tagName : undefined, node.attributes);
         }
-        function checkApplicableSignature(node, args, signature, relation, excludeArgument, reportErrors) {
+        function checkApplicableSignature(node, args, signature, relation, checkMode, reportErrors) {
             if (ts.isJsxOpeningLikeElement(node)) {
-                return checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, excludeArgument, reportErrors);
+                return checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors);
             }
             var thisType = getThisTypeOfSignature(signature);
             if (thisType && thisType !== voidType && node.kind !== 192 /* NewExpression */) {
@@ -49355,11 +49965,11 @@ var ts;
                 var arg = args[i];
                 if (arg.kind !== 210 /* OmittedExpression */) {
                     var paramType = getTypeAtPosition(signature, i);
-                    var argType = checkExpressionWithContextualType(arg, paramType, excludeArgument && excludeArgument[i] ? identityMapper : undefined);
-                    // If one or more arguments are still excluded (as indicated by a non-null excludeArgument parameter),
+                    var argType = checkExpressionWithContextualType(arg, paramType, /*inferenceContext*/ undefined, checkMode);
+                    // If one or more arguments are still excluded (as indicated by CheckMode.SkipContextSensitive),
                     // we obtain the regular type of any object literal arguments because we may not have inferred complete
                     // parameter types yet and therefore excess property checks may yield false positives (see #17041).
-                    var checkArgType = excludeArgument ? getRegularTypeOfObjectLiteral(argType) : argType;
+                    var checkArgType = checkMode & 4 /* SkipContextSensitive */ ? getRegularTypeOfObjectLiteral(argType) : argType;
                     if (!checkTypeRelatedToAndOptionallyElaborate(checkArgType, paramType, relation, reportErrors ? arg : undefined, arg, headMessage)) {
                         return false;
                     }
@@ -49516,25 +50126,41 @@ var ts;
             if (argCount <= max && hasSpreadArgument) {
                 argCount--;
             }
+            var spanArray;
             var related;
+            var error = hasRestParameter || hasSpreadArgument ? hasRestParameter && hasSpreadArgument ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1_or_more :
+                hasRestParameter ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1 :
+                    ts.Diagnostics.Expected_0_arguments_but_got_1_or_more : ts.Diagnostics.Expected_0_arguments_but_got_1;
             if (closestSignature && getMinArgumentCount(closestSignature) > argCount && closestSignature.declaration) {
                 var paramDecl = closestSignature.declaration.parameters[closestSignature.thisParameter ? argCount + 1 : argCount];
                 if (paramDecl) {
                     related = ts.createDiagnosticForNode(paramDecl, ts.isBindingPattern(paramDecl.name) ? ts.Diagnostics.An_argument_matching_this_binding_pattern_was_not_provided : ts.Diagnostics.An_argument_for_0_was_not_provided, !paramDecl.name ? argCount : !ts.isBindingPattern(paramDecl.name) ? ts.idText(getFirstIdentifier(paramDecl.name)) : undefined);
                 }
             }
-            if (hasRestParameter || hasSpreadArgument) {
-                var error_1 = hasRestParameter && hasSpreadArgument ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1_or_more :
-                    hasRestParameter ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1 :
-                        ts.Diagnostics.Expected_0_arguments_but_got_1_or_more;
-                var diagnostic_1 = ts.createDiagnosticForNode(node, error_1, paramRange, argCount);
-                return related ? addRelatedInfo(diagnostic_1, related) : diagnostic_1;
-            }
             if (min < argCount && argCount < max) {
                 return ts.createDiagnosticForNode(node, ts.Diagnostics.No_overload_expects_0_arguments_but_overloads_do_exist_that_expect_either_1_or_2_arguments, argCount, belowArgCount, aboveArgCount);
             }
-            var diagnostic = ts.createDiagnosticForNode(node, ts.Diagnostics.Expected_0_arguments_but_got_1, paramRange, argCount);
-            return related ? addRelatedInfo(diagnostic, related) : diagnostic;
+            if (!hasSpreadArgument && argCount < min) {
+                var diagnostic_1 = ts.createDiagnosticForNode(node, error, paramRange, argCount);
+                return related ? ts.addRelatedInfo(diagnostic_1, related) : diagnostic_1;
+            }
+            if (hasRestParameter || hasSpreadArgument) {
+                spanArray = ts.createNodeArray(args);
+                if (hasSpreadArgument && argCount) {
+                    var nextArg = ts.elementAt(args, getSpreadArgumentIndex(args) + 1) || undefined;
+                    spanArray = ts.createNodeArray(args.slice(max > argCount && nextArg ? args.indexOf(nextArg) : max));
+                }
+            }
+            else {
+                spanArray = ts.createNodeArray(args.slice(max));
+            }
+            spanArray.pos = ts.first(spanArray).pos;
+            spanArray.end = ts.last(spanArray).end;
+            if (spanArray.end === spanArray.pos) {
+                spanArray.end++;
+            }
+            var diagnostic = ts.createDiagnosticForNodeArray(ts.getSourceFileOfNode(node), spanArray, error, paramRange, argCount);
+            return related ? ts.addRelatedInfo(diagnostic, related) : diagnostic;
         }
         function getTypeArgumentArityError(node, signatures, typeArguments) {
             var argCount = typeArguments.length;
@@ -49564,7 +50190,7 @@ var ts;
             }
             return ts.createDiagnosticForNodeArray(ts.getSourceFileOfNode(node), typeArguments, ts.Diagnostics.Expected_0_type_arguments_but_got_1, belowArgCount === -Infinity ? aboveArgCount : belowArgCount, argCount);
         }
-        function resolveCall(node, signatures, candidatesOutArray, isForSignatureHelp, fallbackError) {
+        function resolveCall(node, signatures, candidatesOutArray, checkMode, fallbackError) {
             var isTaggedTemplate = node.kind === 193 /* TaggedTemplateExpression */;
             var isDecorator = node.kind === 152 /* Decorator */;
             var isJsxOpeningOrSelfClosingElement = ts.isJsxOpeningLikeElement(node);
@@ -49600,7 +50226,7 @@ var ts;
             // For a decorator, no arguments are susceptible to contextual typing due to the fact
             // decorators are applied to a declaration by the emitter, and not to an expression.
             var isSingleNonGenericCandidate = candidates.length === 1 && !candidates[0].typeParameters;
-            var excludeArgument = !isDecorator && !isSingleNonGenericCandidate ? getExcludeArgument(args) : undefined;
+            var argCheckMode = !isDecorator && !isSingleNonGenericCandidate && ts.some(args, isContextSensitive) ? 4 /* SkipContextSensitive */ : 0 /* Normal */;
             // The following variables are captured and modified by calls to chooseOverload.
             // If overload resolution or type argument inference fails, we want to report the
             // best error possible. The best error is one which says that an argument was not
@@ -49628,7 +50254,7 @@ var ts;
             var result;
             // If we are in signature help, a trailing comma indicates that we intend to provide another argument,
             // so we will only accept overloads with arity at least 1 higher than the current number of provided arguments.
-            var signatureHelpTrailingComma = isForSignatureHelp && node.kind === 191 /* CallExpression */ && node.arguments.hasTrailingComma;
+            var signatureHelpTrailingComma = !!(checkMode & 16 /* IsForSignatureHelp */) && node.kind === 191 /* CallExpression */ && node.arguments.hasTrailingComma;
             // Section 4.12.1:
             // if the candidate list contains one or more signatures for which the type of each argument
             // expression is a subtype of each corresponding parameter type, the return type of the first
@@ -49654,12 +50280,7 @@ var ts;
             // skip the checkApplicableSignature check.
             if (reportErrors) {
                 if (candidateForArgumentError) {
-                    // excludeArgument is undefined, in this case also equivalent to [undefined, undefined, ...]
-                    // The importance of excludeArgument is to prevent us from typing function expression parameters
-                    // in arguments too early. If possible, we'd like to only type them once we know the correct
-                    // overload. However, this matters for the case where the call is correct. When the call is
-                    // an error, we don't need to exclude any arguments, although it would cause no harm to do so.
-                    checkApplicableSignature(node, args, candidateForArgumentError, assignableRelation, /*excludeArgument*/ undefined, /*reportErrors*/ true);
+                    checkApplicableSignature(node, args, candidateForArgumentError, assignableRelation, 0 /* Normal */, /*reportErrors*/ true);
                 }
                 else if (candidateForArgumentArityError) {
                     diagnostics.add(getArgumentArityError(node, [candidateForArgumentArityError], args));
@@ -49691,7 +50312,7 @@ var ts;
                     if (typeArguments || !hasCorrectArity(node, args, candidate, signatureHelpTrailingComma)) {
                         return undefined;
                     }
-                    if (!checkApplicableSignature(node, args, candidate, relation, excludeArgument, /*reportErrors*/ false)) {
+                    if (!checkApplicableSignature(node, args, candidate, relation, 0 /* Normal */, /*reportErrors*/ false)) {
                         candidateForArgumentError = candidate;
                         return undefined;
                     }
@@ -49715,9 +50336,10 @@ var ts;
                         }
                         else {
                             inferenceContext = createInferenceContext(candidate.typeParameters, candidate, /*flags*/ ts.isInJSFile(node) ? 2 /* AnyDefault */ : 0 /* None */);
-                            typeArgumentTypes = inferTypeArguments(node, candidate, args, excludeArgument, inferenceContext);
+                            typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode | 8 /* SkipGenericFunctions */, inferenceContext);
+                            argCheckMode |= inferenceContext.flags & 4 /* SkippedGenericFunction */ ? 8 /* SkipGenericFunctions */ : 0 /* Normal */;
                         }
-                        checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, ts.isInJSFile(candidate.declaration));
+                        checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, ts.isInJSFile(candidate.declaration), inferenceContext && inferenceContext.inferredTypeParameters);
                         // If the original signature has a generic rest type, instantiation may produce a
                         // signature with different arity and we need to perform another arity check.
                         if (getNonArrayRestType(candidate) && !hasCorrectArity(node, args, checkCandidate, signatureHelpTrailingComma)) {
@@ -49728,21 +50350,21 @@ var ts;
                     else {
                         checkCandidate = candidate;
                     }
-                    if (!checkApplicableSignature(node, args, checkCandidate, relation, excludeArgument, /*reportErrors*/ false)) {
+                    if (!checkApplicableSignature(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false)) {
                         // Give preference to error candidates that have no rest parameters (as they are more specific)
                         if (!candidateForArgumentError || getEffectiveRestType(candidateForArgumentError) || !getEffectiveRestType(checkCandidate)) {
                             candidateForArgumentError = checkCandidate;
                         }
                         continue;
                     }
-                    if (excludeArgument) {
+                    if (argCheckMode) {
                         // If one or more context sensitive arguments were excluded, we start including
                         // them now (and keeping do so for any subsequent candidates) and perform a second
                         // round of type inference and applicability checking for this particular candidate.
-                        excludeArgument = undefined;
+                        argCheckMode = 0 /* Normal */;
                         if (inferenceContext) {
-                            var typeArgumentTypes = inferTypeArguments(node, candidate, args, excludeArgument, inferenceContext);
-                            checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, ts.isInJSFile(candidate.declaration));
+                            var typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode, inferenceContext);
+                            checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, ts.isInJSFile(candidate.declaration), inferenceContext && inferenceContext.inferredTypeParameters);
                             // If the original signature has a generic rest type, instantiation may produce a
                             // signature with different arity and we need to perform another arity check.
                             if (getNonArrayRestType(candidate) && !hasCorrectArity(node, args, checkCandidate, signatureHelpTrailingComma)) {
@@ -49750,7 +50372,7 @@ var ts;
                                 continue;
                             }
                         }
-                        if (!checkApplicableSignature(node, args, checkCandidate, relation, excludeArgument, /*reportErrors*/ false)) {
+                        if (!checkApplicableSignature(node, args, checkCandidate, relation, argCheckMode, /*reportErrors*/ false)) {
                             // Give preference to error candidates that have no rest parameters (as they are more specific)
                             if (!candidateForArgumentError || getEffectiveRestType(candidateForArgumentError) || !getEffectiveRestType(checkCandidate)) {
                                 candidateForArgumentError = checkCandidate;
@@ -49764,20 +50386,6 @@ var ts;
                 return undefined;
             }
         }
-        function getExcludeArgument(args) {
-            var excludeArgument;
-            // We do not need to call `getEffectiveArgumentCount` here as it only
-            // applies when calculating the number of arguments for a decorator.
-            for (var i = 0; i < args.length; i++) {
-                if (isContextSensitive(args[i])) {
-                    if (!excludeArgument) {
-                        excludeArgument = new Array(args.length);
-                    }
-                    excludeArgument[i] = true;
-                }
-            }
-            return excludeArgument;
-        }
         // No signature was applicable. We have already reported the errors for the invalid signature.
         // If this is a type resolution session, e.g. Language Service, try to get better information than anySignature.
         function getCandidateForOverloadFailure(node, candidates, args, hasCandidatesOutArray) {
@@ -49866,7 +50474,7 @@ var ts;
         }
         function inferSignatureInstantiationForOverloadFailure(node, typeParameters, candidate, args) {
             var inferenceContext = createInferenceContext(typeParameters, candidate, /*flags*/ ts.isInJSFile(node) ? 2 /* AnyDefault */ : 0 /* None */);
-            var typeArgumentTypes = inferTypeArguments(node, candidate, args, getExcludeArgument(args), inferenceContext);
+            var typeArgumentTypes = inferTypeArguments(node, candidate, args, 4 /* SkipContextSensitive */ | 8 /* SkipGenericFunctions */, inferenceContext);
             return createSignatureInstantiation(candidate, typeArgumentTypes);
         }
         function getLongestCandidateIndex(candidates, argsCount) {
@@ -49885,7 +50493,7 @@ var ts;
             }
             return maxParamsIndex;
         }
-        function resolveCallExpression(node, candidatesOutArray, isForSignatureHelp) {
+        function resolveCallExpression(node, candidatesOutArray, checkMode) {
             if (node.expression.kind === 98 /* SuperKeyword */) {
                 var superType = checkSuperExpression(node.expression);
                 if (isTypeAny(superType)) {
@@ -49901,7 +50509,7 @@ var ts;
                     var baseTypeNode = ts.getEffectiveBaseTypeNode(ts.getContainingClass(node));
                     if (baseTypeNode) {
                         var baseConstructors = getInstantiatedConstructorsForTypeArguments(superType, baseTypeNode.typeArguments, baseTypeNode);
-                        return resolveCall(node, baseConstructors, candidatesOutArray, isForSignatureHelp);
+                        return resolveCall(node, baseConstructors, candidatesOutArray, checkMode);
                     }
                 }
                 return resolveUntypedCall(node);
@@ -49951,12 +50559,31 @@ var ts;
                 }
                 return resolveErrorCall(node);
             }
+            // When a call to a generic function is an argument to an outer call to a generic function for which
+            // inference is in process, we have a choice to make. If the inner call relies on inferences made from
+            // its contextual type to its return type, deferring the inner call processing allows the best possible
+            // contextual type to accumulate. But if the outer call relies on inferences made from the return type of
+            // the inner call, the inner call should be processed early. There's no sure way to know which choice is
+            // right (only a full unification algorithm can determine that), so we resort to the following heuristic:
+            // If no type arguments are specified in the inner call and at least one call signature is generic and
+            // returns a function type, we choose to defer processing. This narrowly permits function composition
+            // operators to flow inferences through return types, but otherwise processes calls right away. We
+            // use the resolvingSignature singleton to indicate that we deferred processing. This result will be
+            // propagated out and eventually turned into silentNeverType (a type that is assignable to anything and
+            // from which we never make inferences).
+            if (checkMode & 8 /* SkipGenericFunctions */ && !node.typeArguments && callSignatures.some(isGenericFunctionReturningFunction)) {
+                skippedGenericFunction(node, checkMode);
+                return resolvingSignature;
+            }
             // If the function is explicitly marked with `@class`, then it must be constructed.
             if (callSignatures.some(function (sig) { return ts.isInJSFile(sig.declaration) && !!ts.getJSDocClassTag(sig.declaration); })) {
                 error(node, ts.Diagnostics.Value_of_type_0_is_not_callable_Did_you_mean_to_include_new, typeToString(funcType));
                 return resolveErrorCall(node);
             }
-            return resolveCall(node, callSignatures, candidatesOutArray, isForSignatureHelp);
+            return resolveCall(node, callSignatures, candidatesOutArray, checkMode);
+        }
+        function isGenericFunctionReturningFunction(signature) {
+            return !!(signature.typeParameters && isFunctionType(getReturnTypeOfSignature(signature)));
         }
         /**
          * TS 1.0 spec: 4.12
@@ -49968,7 +50595,7 @@ var ts;
             return isTypeAny(funcType) || isTypeAny(apparentFuncType) && !!(funcType.flags & 262144 /* TypeParameter */) ||
                 !numCallSignatures && !numConstructSignatures && !(apparentFuncType.flags & (1048576 /* Union */ | 131072 /* Never */)) && isTypeAssignableTo(funcType, globalFunctionType);
         }
-        function resolveNewExpression(node, candidatesOutArray, isForSignatureHelp) {
+        function resolveNewExpression(node, candidatesOutArray, checkMode) {
             if (node.arguments && languageVersion < 1 /* ES5 */) {
                 var spreadIndex = getSpreadArgumentIndex(node.arguments);
                 if (spreadIndex >= 0) {
@@ -50016,7 +50643,7 @@ var ts;
                     error(node, ts.Diagnostics.Cannot_create_an_instance_of_an_abstract_class);
                     return resolveErrorCall(node);
                 }
-                return resolveCall(node, constructSignatures, candidatesOutArray, isForSignatureHelp);
+                return resolveCall(node, constructSignatures, candidatesOutArray, checkMode);
             }
             // If expressionType's apparent type is an object type with no construct signatures but
             // one or more call signatures, the expression is processed as a function call. A compile-time
@@ -50024,7 +50651,7 @@ var ts;
             // operation is Any. It is an error to have a Void this type.
             var callSignatures = getSignaturesOfType(expressionType, 0 /* Call */);
             if (callSignatures.length) {
-                var signature = resolveCall(node, callSignatures, candidatesOutArray, isForSignatureHelp);
+                var signature = resolveCall(node, callSignatures, candidatesOutArray, checkMode);
                 if (!noImplicitAny) {
                     if (signature.declaration && !isJSConstructor(signature.declaration) && getReturnTypeOfSignature(signature) !== voidType) {
                         error(node, ts.Diagnostics.Only_a_void_function_can_be_called_with_the_new_keyword);
@@ -50046,13 +50673,12 @@ var ts;
             var firstBase = baseTypes[0];
             if (firstBase.flags & 2097152 /* Intersection */) {
                 var types = firstBase.types;
-                var mixinCount = ts.countWhere(types, isMixinConstructorType);
+                var mixinFlags = findMixins(types);
                 var i = 0;
                 for (var _i = 0, _a = firstBase.types; _i < _a.length; _i++) {
                     var intersectionMember = _a[_i];
-                    i++;
                     // We want to ignore mixin ctors
-                    if (mixinCount === 0 || mixinCount === types.length && i === 0 || !isMixinConstructorType(intersectionMember)) {
+                    if (!mixinFlags[i]) {
                         if (ts.getObjectFlags(intersectionMember) & (1 /* Class */ | 2 /* Interface */)) {
                             if (intersectionMember.symbol === target) {
                                 return true;
@@ -50062,6 +50688,7 @@ var ts;
                             }
                         }
                     }
+                    i++;
                 }
                 return false;
             }
@@ -50105,7 +50732,7 @@ var ts;
             var diagnostic = error(node, (kind === 0 /* Call */ ?
                 ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures :
                 ts.Diagnostics.Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature), typeToString(apparentType));
-            invocationErrorRecovery(apparentType, kind, relatedInformation ? addRelatedInfo(diagnostic, relatedInformation) : diagnostic);
+            invocationErrorRecovery(apparentType, kind, relatedInformation ? ts.addRelatedInfo(diagnostic, relatedInformation) : diagnostic);
         }
         function invocationErrorRecovery(apparentType, kind, diagnostic) {
             if (!apparentType.symbol) {
@@ -50118,10 +50745,10 @@ var ts;
                 var sigs = getSignaturesOfType(getTypeOfSymbol(getSymbolLinks(apparentType.symbol).target), kind);
                 if (!sigs || !sigs.length)
                     return;
-                addRelatedInfo(diagnostic, ts.createDiagnosticForNode(importNode, ts.Diagnostics.Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_Consider_using_a_default_import_or_import_require_here_instead));
+                ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(importNode, ts.Diagnostics.Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_Consider_using_a_default_import_or_import_require_here_instead));
             }
         }
-        function resolveTaggedTemplateExpression(node, candidatesOutArray, isForSignatureHelp) {
+        function resolveTaggedTemplateExpression(node, candidatesOutArray, checkMode) {
             var tagType = checkExpression(node.tag);
             var apparentType = getApparentType(tagType);
             if (apparentType === errorType) {
@@ -50137,7 +50764,7 @@ var ts;
                 invocationError(node, apparentType, 0 /* Call */);
                 return resolveErrorCall(node);
             }
-            return resolveCall(node, callSignatures, candidatesOutArray, isForSignatureHelp);
+            return resolveCall(node, callSignatures, candidatesOutArray, checkMode);
         }
         /**
          * Gets the localized diagnostic head message to use for errors when resolving a decorator as a call expression.
@@ -50162,7 +50789,7 @@ var ts;
         /**
          * Resolves a decorator as if it were a call expression.
          */
-        function resolveDecorator(node, candidatesOutArray, isForSignatureHelp) {
+        function resolveDecorator(node, candidatesOutArray, checkMode) {
             var funcType = checkExpression(node.expression);
             var apparentType = getApparentType(funcType);
             if (apparentType === errorType) {
@@ -50187,7 +50814,7 @@ var ts;
                 invocationErrorRecovery(apparentType, 0 /* Call */, diag);
                 return resolveErrorCall(node);
             }
-            return resolveCall(node, callSignatures, candidatesOutArray, isForSignatureHelp, headMessage);
+            return resolveCall(node, callSignatures, candidatesOutArray, checkMode, headMessage);
         }
         function createSignatureForJSXIntrinsic(node, result) {
             var namespace = getJsxNamespaceAt(node);
@@ -50206,11 +50833,11 @@ var ts;
             /*hasRestparameter*/ false, 
             /*hasLiteralTypes*/ false);
         }
-        function resolveJsxOpeningLikeElement(node, candidatesOutArray, isForSignatureHelp) {
+        function resolveJsxOpeningLikeElement(node, candidatesOutArray, checkMode) {
             if (isJsxIntrinsicIdentifier(node.tagName)) {
                 var result = getIntrinsicAttributesTypeFromJsxOpeningLikeElement(node);
                 var fakeSignature = createSignatureForJSXIntrinsic(node, result);
-                checkTypeAssignableToAndOptionallyElaborate(checkExpressionWithContextualType(node.attributes, getEffectiveFirstArgumentForJsxSignature(fakeSignature, node), /*mapper*/ undefined), result, node.tagName, node.attributes);
+                checkTypeAssignableToAndOptionallyElaborate(checkExpressionWithContextualType(node.attributes, getEffectiveFirstArgumentForJsxSignature(fakeSignature, node), /*mapper*/ undefined, 0 /* Normal */), result, node.tagName, node.attributes);
                 return fakeSignature;
             }
             var exprTypes = checkExpression(node.tagName);
@@ -50227,7 +50854,7 @@ var ts;
                 error(node.tagName, ts.Diagnostics.JSX_element_type_0_does_not_have_any_construct_or_call_signatures, ts.getTextOfNode(node.tagName));
                 return resolveErrorCall(node);
             }
-            return resolveCall(node, signatures, candidatesOutArray, isForSignatureHelp);
+            return resolveCall(node, signatures, candidatesOutArray, checkMode);
         }
         /**
          * Sometimes, we have a decorator that could accept zero arguments,
@@ -50241,19 +50868,19 @@ var ts;
                     signature.parameters.length < getDecoratorArgumentCount(decorator, signature);
             });
         }
-        function resolveSignature(node, candidatesOutArray, isForSignatureHelp) {
+        function resolveSignature(node, candidatesOutArray, checkMode) {
             switch (node.kind) {
                 case 191 /* CallExpression */:
-                    return resolveCallExpression(node, candidatesOutArray, isForSignatureHelp);
+                    return resolveCallExpression(node, candidatesOutArray, checkMode);
                 case 192 /* NewExpression */:
-                    return resolveNewExpression(node, candidatesOutArray, isForSignatureHelp);
+                    return resolveNewExpression(node, candidatesOutArray, checkMode);
                 case 193 /* TaggedTemplateExpression */:
-                    return resolveTaggedTemplateExpression(node, candidatesOutArray, isForSignatureHelp);
+                    return resolveTaggedTemplateExpression(node, candidatesOutArray, checkMode);
                 case 152 /* Decorator */:
-                    return resolveDecorator(node, candidatesOutArray, isForSignatureHelp);
+                    return resolveDecorator(node, candidatesOutArray, checkMode);
                 case 262 /* JsxOpeningElement */:
                 case 261 /* JsxSelfClosingElement */:
-                    return resolveJsxOpeningLikeElement(node, candidatesOutArray, isForSignatureHelp);
+                    return resolveJsxOpeningLikeElement(node, candidatesOutArray, checkMode);
             }
             throw ts.Debug.assertNever(node, "Branch in 'resolveSignature' should be unreachable.");
         }
@@ -50264,8 +50891,7 @@ var ts;
          *                           the function will fill it up with appropriate candidate signatures
          * @return a signature of the call-like expression or undefined if one can't be found
          */
-        function getResolvedSignature(node, candidatesOutArray, isForSignatureHelp) {
-            if (isForSignatureHelp === void 0) { isForSignatureHelp = false; }
+        function getResolvedSignature(node, candidatesOutArray, checkMode) {
             var links = getNodeLinks(node);
             // If getResolvedSignature has already been called, we will have cached the resolvedSignature.
             // However, it is possible that either candidatesOutArray was not passed in the first time,
@@ -50276,11 +50902,15 @@ var ts;
                 return cached;
             }
             links.resolvedSignature = resolvingSignature;
-            var result = resolveSignature(node, candidatesOutArray, isForSignatureHelp);
-            // If signature resolution originated in control flow type analysis (for example to compute the
-            // assigned type in a flow assignment) we don't cache the result as it may be based on temporary
-            // types from the control flow analysis.
-            links.resolvedSignature = flowLoopStart === flowLoopCount ? result : cached;
+            var result = resolveSignature(node, candidatesOutArray, checkMode || 0 /* Normal */);
+            // When CheckMode.SkipGenericFunctions is set we use resolvingSignature to indicate that call
+            // resolution should be deferred.
+            if (result !== resolvingSignature) {
+                // If signature resolution originated in control flow type analysis (for example to compute the
+                // assigned type in a flow assignment) we don't cache the result as it may be based on temporary
+                // types from the control flow analysis.
+                links.resolvedSignature = flowLoopStart === flowLoopCount ? result : cached;
+            }
             return result;
         }
         /**
@@ -50356,10 +50986,15 @@ var ts;
          * @param node The call/new expression to be checked.
          * @returns On success, the expression's signature's return type. On failure, anyType.
          */
-        function checkCallExpression(node) {
+        function checkCallExpression(node, checkMode) {
             if (!checkGrammarTypeArguments(node, node.typeArguments))
                 checkGrammarArguments(node.arguments);
-            var signature = getResolvedSignature(node);
+            var signature = getResolvedSignature(node, /*candidatesOutArray*/ undefined, checkMode);
+            if (signature === resolvingSignature) {
+                // CheckMode.SkipGenericFunctions is enabled and this is a call to a generic function that
+                // returns a function type. We defer checking and return anyFunctionType.
+                return silentNeverType;
+            }
             if (node.expression.kind === 98 /* SuperKeyword */) {
                 return voidType;
             }
@@ -50459,7 +51094,7 @@ var ts;
                         var anonymousSymbol = createSymbol(2048 /* TypeLiteral */, "__type" /* Type */);
                         var defaultContainingObject = createAnonymousType(anonymousSymbol, memberTable, ts.emptyArray, ts.emptyArray, /*stringIndexInfo*/ undefined, /*numberIndexInfo*/ undefined);
                         anonymousSymbol.type = defaultContainingObject;
-                        synthType.syntheticType = isValidSpreadType(type) ? getSpreadType(type, defaultContainingObject, anonymousSymbol, /*typeFLags*/ 0, /*objectFlags*/ 0) : defaultContainingObject;
+                        synthType.syntheticType = isValidSpreadType(type) ? getSpreadType(type, defaultContainingObject, anonymousSymbol, /*objectFlags*/ 0, /*readonly*/ false) : defaultContainingObject;
                     }
                     else {
                         synthType.syntheticType = type;
@@ -50506,9 +51141,37 @@ var ts;
         function checkAssertion(node) {
             return checkAssertionWorker(node, node.type, node.expression);
         }
+        function isValidConstAssertionArgument(node) {
+            switch (node.kind) {
+                case 10 /* StringLiteral */:
+                case 14 /* NoSubstitutionTemplateLiteral */:
+                case 8 /* NumericLiteral */:
+                case 9 /* BigIntLiteral */:
+                case 102 /* TrueKeyword */:
+                case 87 /* FalseKeyword */:
+                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ObjectLiteralExpression */:
+                    return true;
+                case 195 /* ParenthesizedExpression */:
+                    return isValidConstAssertionArgument(node.expression);
+                case 202 /* PrefixUnaryExpression */:
+                    var op = node.operator;
+                    var arg = node.operand;
+                    return op === 39 /* MinusToken */ && (arg.kind === 8 /* NumericLiteral */ || arg.kind === 9 /* BigIntLiteral */) ||
+                        op === 38 /* PlusToken */ && arg.kind === 8 /* NumericLiteral */;
+            }
+            return false;
+        }
         function checkAssertionWorker(errNode, type, expression, checkMode) {
-            var exprType = getRegularTypeOfObjectLiteral(getBaseTypeOfLiteralType(checkExpression(expression, checkMode)));
+            var exprType = checkExpression(expression, checkMode);
+            if (ts.isConstTypeReference(type)) {
+                if (!isValidConstAssertionArgument(expression)) {
+                    error(expression, ts.Diagnostics.A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal);
+                }
+                return getRegularTypeOfLiteralType(exprType);
+            }
             checkSourceElement(type);
+            exprType = getRegularTypeOfObjectLiteral(getBaseTypeOfLiteralType(exprType));
             var targetType = getTypeFromTypeNode(type);
             if (produceDiagnostics && targetType !== errorType) {
                 var widenedType = getWidenedType(exprType);
@@ -50547,7 +51210,7 @@ var ts;
             }
         }
         function checkImportMetaProperty(node) {
-            if (languageVersion < 6 /* ESNext */ || moduleKind < ts.ModuleKind.ESNext) {
+            if (languageVersion < 7 /* ESNext */ || moduleKind < ts.ModuleKind.ESNext) {
                 error(node, ts.Diagnostics.The_import_meta_meta_property_is_only_allowed_using_ESNext_for_the_target_and_module_compiler_options);
             }
             var file = ts.getSourceFileOfNode(node);
@@ -50575,7 +51238,7 @@ var ts;
             if (isTupleType(restType)) {
                 var associatedNames = restType.target.associatedNames;
                 var index = pos - paramCount;
-                return associatedNames ? associatedNames[index] : restParameter.escapedName + "_" + index;
+                return associatedNames && associatedNames[index] || restParameter.escapedName + "_" + index;
             }
             return restParameter.escapedName;
         }
@@ -50588,33 +51251,37 @@ var ts;
                 return getTypeOfParameter(signature.parameters[pos]);
             }
             if (signature.hasRestParameter) {
+                // We want to return the value undefined for an out of bounds parameter position,
+                // so we need to check bounds here before calling getIndexedAccessType (which
+                // otherwise would return the type 'undefined').
                 var restType = getTypeOfSymbol(signature.parameters[paramCount]);
-                if (isTupleType(restType)) {
-                    if (pos - paramCount < getLengthOfTupleType(restType)) {
-                        return restType.typeArguments[pos - paramCount];
-                    }
-                    return getRestTypeOfTupleType(restType);
+                var index = pos - paramCount;
+                if (!isTupleType(restType) || restType.target.hasRestElement || index < (restType.typeArguments || ts.emptyArray).length) {
+                    return getIndexedAccessType(restType, getLiteralType(index));
                 }
-                return getIndexTypeOfType(restType, 1 /* Number */);
             }
             return undefined;
         }
         function getRestTypeAtPosition(source, pos) {
             var paramCount = getParameterCount(source);
             var restType = getEffectiveRestType(source);
-            if (restType && pos === paramCount - 1) {
+            var nonRestCount = paramCount - (restType ? 1 : 0);
+            if (restType && pos === nonRestCount) {
                 return restType;
             }
-            var start = restType ? Math.min(pos, paramCount - 1) : pos;
             var types = [];
             var names = [];
-            for (var i = start; i < paramCount; i++) {
+            for (var i = pos; i < nonRestCount; i++) {
                 types.push(getTypeAtPosition(source, i));
                 names.push(getParameterNameAtPosition(source, i));
             }
+            if (restType) {
+                types.push(getIndexedAccessType(restType, numberType));
+                names.push(getParameterNameAtPosition(source, nonRestCount));
+            }
             var minArgumentCount = getMinArgumentCount(source);
-            var minLength = minArgumentCount < start ? 0 : minArgumentCount - start;
-            return createTupleType(types, minLength, !!restType, names);
+            var minLength = minArgumentCount < pos ? 0 : minArgumentCount - pos;
+            return createTupleType(types, minLength, !!restType, /*readonly*/ false, names);
         }
         function getParameterCount(signature) {
             var length = signature.parameters.length;
@@ -50662,17 +51329,28 @@ var ts;
         function getTypeOfFirstParameterOfSignatureWithFallback(signature, fallbackType) {
             return signature.parameters.length > 0 ? getTypeAtPosition(signature, 0) : fallbackType;
         }
-        function inferFromAnnotatedParameters(signature, context, mapper) {
+        function inferFromAnnotatedParameters(signature, context, inferenceContext) {
             var len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0);
             for (var i = 0; i < len; i++) {
                 var declaration = signature.parameters[i].valueDeclaration;
                 if (declaration.type) {
                     var typeNode = ts.getEffectiveTypeAnnotationNode(declaration);
                     if (typeNode) {
-                        inferTypes(mapper.inferences, getTypeFromTypeNode(typeNode), getTypeAtPosition(context, i));
+                        inferTypes(inferenceContext.inferences, getTypeFromTypeNode(typeNode), getTypeAtPosition(context, i));
                     }
                 }
             }
+            var restType = getEffectiveRestType(context);
+            if (restType && restType.flags & 262144 /* TypeParameter */) {
+                // The contextual signature has a generic rest parameter. We first instantiate the contextual
+                // signature (without fixing type parameters) and assign types to contextually typed parameters.
+                var instantiatedContext = instantiateSignature(context, inferenceContext.nonFixingMapper);
+                assignContextualParameterTypes(signature, instantiatedContext);
+                // We then infer from a tuple type representing the parameters that correspond to the contextual
+                // rest parameter.
+                var restPos = getParameterCount(context) - 1;
+                inferTypes(inferenceContext.inferences, getRestTypeAtPosition(signature, restPos), restType);
+            }
         }
         function assignContextualParameterTypes(signature, context) {
             signature.typeParameters = context.typeParameters;
@@ -50773,7 +51451,7 @@ var ts;
             var functionFlags = ts.getFunctionFlags(func);
             var type;
             if (func.body.kind !== 218 /* Block */) {
-                type = checkExpressionCached(func.body, checkMode);
+                type = checkExpressionCached(func.body, checkMode && checkMode & ~8 /* SkipGenericFunctions */);
                 if (functionFlags & 2 /* Async */) {
                     // From within an async function you can return either a non-promise value or a promise. Any
                     // Promise/A+ compatible implementation will always assimilate any foreign promise, so the
@@ -50951,7 +51629,7 @@ var ts;
             ts.forEachReturnStatement(func.body, function (returnStatement) {
                 var expr = returnStatement.expression;
                 if (expr) {
-                    var type = checkExpressionCached(expr, checkMode);
+                    var type = checkExpressionCached(expr, checkMode && checkMode & ~8 /* SkipGenericFunctions */);
                     if (functionFlags & 2 /* Async */) {
                         // From within an async function you can return either a non-promise value or a promise. Any
                         // Promise/A+ compatible implementation will always assimilate any foreign promise, so the
@@ -51044,7 +51722,7 @@ var ts;
             ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             checkNodeDeferred(node);
             // The identityMapper object is used to indicate that function expressions are wildcards
-            if (checkMode === 1 /* SkipContextSensitive */ && isContextSensitive(node)) {
+            if (checkMode && checkMode & 4 /* SkipContextSensitive */ && isContextSensitive(node)) {
                 // Skip parameters, return signature with return type that retains noncontextual parts so inferences can still be drawn in an early stage
                 if (!ts.getEffectiveReturnTypeNode(node) && hasContextSensitiveReturnExpression(node)) {
                     var links_1 = getNodeLinks(node);
@@ -51054,7 +51732,7 @@ var ts;
                     var returnType = getReturnTypeFromBody(node, checkMode);
                     var returnOnlySignature = createSignature(undefined, undefined, undefined, ts.emptyArray, returnType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
                     var returnOnlyType = createAnonymousType(node.symbol, emptySymbols, [returnOnlySignature], ts.emptyArray, undefined, undefined);
-                    returnOnlyType.flags |= 536870912 /* ContainsAnyFunctionType */;
+                    returnOnlyType.objectFlags |= 524288 /* ContainsAnyFunctionType */;
                     return links_1.contextFreeType = returnOnlyType;
                 }
                 return anyFunctionType;
@@ -51080,12 +51758,12 @@ var ts;
                     if (contextualSignature) {
                         var signature = getSignaturesOfType(type, 0 /* Call */)[0];
                         if (isContextSensitive(node)) {
-                            var contextualMapper = getContextualMapper(node);
-                            if (checkMode === 2 /* Inferential */) {
-                                inferFromAnnotatedParameters(signature, contextualSignature, contextualMapper);
+                            var inferenceContext = getInferenceContext(node);
+                            if (checkMode && checkMode & 2 /* Inferential */) {
+                                inferFromAnnotatedParameters(signature, contextualSignature, inferenceContext);
                             }
-                            var instantiatedContextualSignature = contextualMapper === identityMapper ?
-                                contextualSignature : instantiateSignature(contextualSignature, contextualMapper);
+                            var instantiatedContextualSignature = inferenceContext ?
+                                instantiateSignature(contextualSignature, inferenceContext.mapper) : contextualSignature;
                             assignContextualParameterTypes(signature, instantiatedContextualSignature);
                         }
                         if (!getReturnTypeFromAnnotation(node) && !signature.resolvedReturnType) {
@@ -51351,13 +52029,13 @@ var ts;
         // Return true if type might be of the given kind. A union or intersection type might be of a given
         // kind if at least one constituent type is of the given kind.
         function maybeTypeOfKind(type, kind) {
-            if (type.flags & kind & ~134217728 /* GenericMappedType */ || kind & 134217728 /* GenericMappedType */ && isGenericMappedType(type)) {
+            if (type.flags & kind & ~131072 /* GenericMappedType */ || kind & 131072 /* GenericMappedType */ && isGenericMappedType(type)) {
                 return true;
             }
             if (type.flags & 3145728 /* UnionOrIntersection */) {
                 var types = type.types;
-                for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
-                    var t = types_15[_i];
+                for (var _i = 0, types_16 = types; _i < types_16.length; _i++) {
+                    var t = types_16[_i];
                     if (maybeTypeOfKind(t, kind)) {
                         return true;
                     }
@@ -51461,7 +52139,7 @@ var ts;
                 return checkDestructuringAssignment(property.kind === 276 /* ShorthandPropertyAssignment */ ? property : property.initializer, type);
             }
             else if (property.kind === 277 /* SpreadAssignment */) {
-                if (languageVersion < 6 /* ESNext */) {
+                if (languageVersion < 7 /* ESNext */) {
                     checkExternalEmitHelpers(property, 4 /* Rest */);
                 }
                 var nonRestNames = [];
@@ -51956,7 +52634,7 @@ var ts;
                 // Async generator functions prior to ESNext require the __await, __asyncDelegator,
                 // and __asyncValues helpers
                 if ((functionFlags & 3 /* AsyncGenerator */) === 3 /* AsyncGenerator */ &&
-                    languageVersion < 6 /* ESNext */) {
+                    languageVersion < 7 /* ESNext */) {
                     checkExternalEmitHelpers(node, 26624 /* AsyncDelegatorIncludes */);
                 }
                 // Generator functions prior to ES2015 require the __values helper
@@ -52003,23 +52681,26 @@ var ts;
             }
             return node;
         }
-        function checkExpressionWithContextualType(node, contextualType, contextualMapper) {
+        function checkExpressionWithContextualType(node, contextualType, inferenceContext, checkMode) {
             var context = getContextNode(node);
             var saveContextualType = context.contextualType;
-            var saveContextualMapper = context.contextualMapper;
+            var saveInferenceContext = context.inferenceContext;
             context.contextualType = contextualType;
-            context.contextualMapper = contextualMapper;
-            var checkMode = contextualMapper === identityMapper ? 1 /* SkipContextSensitive */ :
-                contextualMapper ? 2 /* Inferential */ : 3 /* Contextual */;
-            var result = checkExpression(node, checkMode);
+            context.inferenceContext = inferenceContext;
+            var type = checkExpression(node, checkMode | 1 /* Contextual */ | (inferenceContext ? 2 /* Inferential */ : 0));
+            // We strip literal freshness when an appropriate contextual type is present such that contextually typed
+            // literals always preserve their literal types (otherwise they might widen during type inference). An alternative
+            // here would be to not mark contextually typed literals as fresh in the first place.
+            var result = maybeTypeOfKind(type, 2944 /* Literal */) && isLiteralOfContextualType(type, instantiateContextualType(contextualType, node)) ?
+                getRegularTypeOfLiteralType(type) : type;
             context.contextualType = saveContextualType;
-            context.contextualMapper = saveContextualMapper;
+            context.inferenceContext = saveInferenceContext;
             return result;
         }
         function checkExpressionCached(node, checkMode) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
-                if (checkMode) {
+                if (checkMode && checkMode !== 0 /* Normal */) {
                     return checkExpression(node, checkMode);
                 }
                 // When computing a type that we're going to cache, we need to ignore any ongoing control flow
@@ -52082,13 +52763,17 @@ var ts;
             }
             return false;
         }
+        function isConstContext(node) {
+            var parent = node.parent;
+            return ts.isAssertionExpression(parent) && ts.isConstTypeReference(parent.type) ||
+                (ts.isParenthesizedExpression(parent) || ts.isArrayLiteralExpression(parent) || ts.isSpreadElement(parent)) && isConstContext(parent) ||
+                (ts.isPropertyAssignment(parent) || ts.isShorthandPropertyAssignment(parent)) && isConstContext(parent.parent);
+        }
         function checkExpressionForMutableLocation(node, checkMode, contextualType, forceTuple) {
-            if (arguments.length === 2) {
-                contextualType = getContextualType(node);
-            }
             var type = checkExpression(node, checkMode, forceTuple);
-            return isTypeAssertion(node) ? type :
-                getWidenedLiteralLikeTypeForContextualType(type, contextualType);
+            return isConstContext(node) ? getRegularTypeOfLiteralType(type) :
+                isTypeAssertion(node) ? type :
+                    getWidenedLiteralLikeTypeForContextualType(type, instantiateContextualType(arguments.length === 2 ? getContextualType(node) : contextualType, node));
         }
         function checkPropertyAssignment(node, checkMode) {
             // Do not use hasDynamicName here, because that returns false for well known symbols.
@@ -52112,20 +52797,129 @@ var ts;
             return instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, checkMode);
         }
         function instantiateTypeWithSingleGenericCallSignature(node, type, checkMode) {
-            if (checkMode === 2 /* Inferential */) {
+            if (checkMode && checkMode & (2 /* Inferential */ | 8 /* SkipGenericFunctions */)) {
                 var signature = getSingleCallSignature(type);
                 if (signature && signature.typeParameters) {
+                    if (checkMode & 8 /* SkipGenericFunctions */) {
+                        skippedGenericFunction(node, checkMode);
+                        return anyFunctionType;
+                    }
                     var contextualType = getApparentTypeOfContextualType(node);
                     if (contextualType) {
                         var contextualSignature = getSingleCallSignature(getNonNullableType(contextualType));
                         if (contextualSignature && !contextualSignature.typeParameters) {
-                            return getOrCreateTypeFromSignature(instantiateSignatureInContextOf(signature, contextualSignature, getContextualMapper(node)));
+                            var context = getInferenceContext(node);
+                            // We have an expression that is an argument of a generic function for which we are performing
+                            // type argument inference. The expression is of a function type with a single generic call
+                            // signature and a contextual function type with a single non-generic call signature. Now check
+                            // if the outer function returns a function type with a single non-generic call signature and
+                            // if some of the outer function type parameters have no inferences so far. If so, we can
+                            // potentially add inferred type parameters to the outer function return type.
+                            var returnSignature = context.signature && getSingleCallSignature(getReturnTypeOfSignature(context.signature));
+                            if (returnSignature && !returnSignature.typeParameters && !ts.every(context.inferences, hasInferenceCandidates)) {
+                                // Instantiate the signature with its own type parameters as type arguments, possibly
+                                // renaming the type parameters to ensure they have unique names.
+                                var uniqueTypeParameters = getUniqueTypeParameters(context, signature.typeParameters);
+                                var instantiatedSignature = getSignatureInstantiationWithoutFillingInTypeArguments(signature, uniqueTypeParameters);
+                                // Infer from the parameters of the instantiated signature to the parameters of the
+                                // contextual signature starting with an empty set of inference candidates.
+                                var inferences_2 = ts.map(context.inferences, function (info) { return createInferenceInfo(info.typeParameter); });
+                                applyToParameterTypes(instantiatedSignature, contextualSignature, function (source, target) {
+                                    inferTypes(inferences_2, source, target, /*priority*/ 0, /*contravariant*/ true);
+                                });
+                                if (ts.some(inferences_2, hasInferenceCandidates)) {
+                                    // We have inference candidates, indicating that one or more type parameters are referenced
+                                    // in the parameter types of the contextual signature. Now also infer from the return type.
+                                    applyToReturnTypes(instantiatedSignature, contextualSignature, function (source, target) {
+                                        inferTypes(inferences_2, source, target);
+                                    });
+                                    // If the type parameters for which we produced candidates do not have any inferences yet,
+                                    // we adopt the new inference candidates and add the type parameters of the expression type
+                                    // to the set of inferred type parameters for the outer function return type.
+                                    if (!hasOverlappingInferences(context.inferences, inferences_2)) {
+                                        mergeInferences(context.inferences, inferences_2);
+                                        context.inferredTypeParameters = ts.concatenate(context.inferredTypeParameters, uniqueTypeParameters);
+                                        return getOrCreateTypeFromSignature(instantiatedSignature);
+                                    }
+                                }
+                            }
+                            return getOrCreateTypeFromSignature(instantiateSignatureInContextOf(signature, contextualSignature, context));
                         }
                     }
                 }
             }
             return type;
         }
+        function skippedGenericFunction(node, checkMode) {
+            if (checkMode & 2 /* Inferential */) {
+                // We have skipped a generic function during inferential typing. Obtain the inference context and
+                // indicate this has occurred such that we know a second pass of inference is be needed.
+                var context = getInferenceContext(node);
+                context.flags |= 4 /* SkippedGenericFunction */;
+            }
+        }
+        function hasInferenceCandidates(info) {
+            return !!(info.candidates || info.contraCandidates);
+        }
+        function hasOverlappingInferences(a, b) {
+            for (var i = 0; i < a.length; i++) {
+                if (hasInferenceCandidates(a[i]) && hasInferenceCandidates(b[i])) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        function mergeInferences(target, source) {
+            for (var i = 0; i < target.length; i++) {
+                if (!hasInferenceCandidates(target[i]) && hasInferenceCandidates(source[i])) {
+                    target[i] = source[i];
+                }
+            }
+        }
+        function getUniqueTypeParameters(context, typeParameters) {
+            var result = [];
+            var oldTypeParameters;
+            var newTypeParameters;
+            for (var _i = 0, typeParameters_2 = typeParameters; _i < typeParameters_2.length; _i++) {
+                var tp = typeParameters_2[_i];
+                var name = tp.symbol.escapedName;
+                if (hasTypeParameterByName(context.inferredTypeParameters, name) || hasTypeParameterByName(result, name)) {
+                    var newName = getUniqueTypeParameterName(ts.concatenate(context.inferredTypeParameters, result), name);
+                    var symbol = createSymbol(262144 /* TypeParameter */, newName);
+                    var newTypeParameter = createTypeParameter(symbol);
+                    newTypeParameter.target = tp;
+                    oldTypeParameters = ts.append(oldTypeParameters, tp);
+                    newTypeParameters = ts.append(newTypeParameters, newTypeParameter);
+                    result.push(newTypeParameter);
+                }
+                else {
+                    result.push(tp);
+                }
+            }
+            if (newTypeParameters) {
+                var mapper = createTypeMapper(oldTypeParameters, newTypeParameters);
+                for (var _a = 0, newTypeParameters_1 = newTypeParameters; _a < newTypeParameters_1.length; _a++) {
+                    var tp = newTypeParameters_1[_a];
+                    tp.mapper = mapper;
+                }
+            }
+            return result;
+        }
+        function hasTypeParameterByName(typeParameters, name) {
+            return ts.some(typeParameters, function (tp) { return tp.symbol.escapedName === name; });
+        }
+        function getUniqueTypeParameterName(typeParameters, baseName) {
+            var len = baseName.length;
+            while (len > 1 && baseName.charCodeAt(len - 1) >= 48 /* _0 */ && baseName.charCodeAt(len - 1) <= 57 /* _9 */)
+                len--;
+            var s = baseName.slice(0, len);
+            for (var index = 1; true; index++) {
+                var augmentedName = (s + index);
+                if (!hasTypeParameterByName(typeParameters, augmentedName)) {
+                    return augmentedName;
+                }
+            }
+        }
         /**
          * Returns the type of an expression. Unlike checkExpression, this function is simply concerned
          * with computing the type and may not fully check all contained sub-expressions for errors.
@@ -52143,7 +52937,7 @@ var ts;
                     return getReturnTypeOfSignature(signature);
                 }
             }
-            else if (expr.kind === 194 /* TypeAssertionExpression */ || expr.kind === 212 /* AsExpression */) {
+            else if (ts.isAssertionExpression(expr) && !ts.isConstTypeReference(expr.type)) {
                 return getTypeFromTypeNode(expr.type);
             }
             // Otherwise simply call checkExpression. Ideally, the entire family of checkXXX functions
@@ -52165,40 +52959,40 @@ var ts;
             }
             var saveContextualType = node.contextualType;
             node.contextualType = anyType;
-            var type = links.contextFreeType = checkExpression(node, 1 /* SkipContextSensitive */);
+            var type = links.contextFreeType = checkExpression(node, 4 /* SkipContextSensitive */);
             node.contextualType = saveContextualType;
             return type;
         }
-        // Checks an expression and returns its type. The contextualMapper parameter serves two purposes: When
-        // contextualMapper is not undefined and not equal to the identityMapper function object it indicates that the
-        // expression is being inferentially typed (section 4.15.2 in spec) and provides the type mapper to use in
-        // conjunction with the generic contextual type. When contextualMapper is equal to the identityMapper function
-        // object, it serves as an indicator that all contained function and arrow expressions should be considered to
-        // have the wildcard function type; this form of type check is used during overload resolution to exclude
-        // contextually typed function and arrow expressions in the initial phase.
         function checkExpression(node, checkMode, forceTuple) {
-            var type;
-            if (node.kind === 148 /* QualifiedName */) {
-                type = checkQualifiedName(node);
+            var saveCurrentNode = currentNode;
+            currentNode = node;
+            var uninstantiatedType = checkExpressionWorker(node, checkMode, forceTuple);
+            var type = instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, checkMode);
+            if (isConstEnumObjectType(type)) {
+                checkConstEnumAccess(node, type);
             }
-            else {
-                var uninstantiatedType = checkExpressionWorker(node, checkMode, forceTuple);
-                type = instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, checkMode);
+            currentNode = saveCurrentNode;
+            return type;
+        }
+        function checkConstEnumAccess(node, type) {
+            // enum object type for const enums are only permitted in:
+            // - 'left' in property access
+            // - 'object' in indexed access
+            // - target in rhs of import statement
+            var ok = (node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.expression === node) ||
+                (node.parent.kind === 190 /* ElementAccessExpression */ && node.parent.expression === node) ||
+                ((node.kind === 72 /* Identifier */ || node.kind === 148 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node) ||
+                    (node.parent.kind === 167 /* TypeQuery */ && node.parent.exprName === node));
+            if (!ok) {
+                error(node, ts.Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment_or_type_query);
             }
-            if (isConstEnumObjectType(type)) {
-                // enum object type for const enums are only permitted in:
-                // - 'left' in property access
-                // - 'object' in indexed access
-                // - target in rhs of import statement
-                var ok = (node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.expression === node) ||
-                    (node.parent.kind === 190 /* ElementAccessExpression */ && node.parent.expression === node) ||
-                    ((node.kind === 72 /* Identifier */ || node.kind === 148 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node) ||
-                        (node.parent.kind === 167 /* TypeQuery */ && node.parent.exprName === node));
-                if (!ok) {
-                    error(node, ts.Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment_or_type_query);
+            if (compilerOptions.isolatedModules) {
+                ts.Debug.assert(!!(type.symbol.flags & 128 /* ConstEnum */));
+                var constEnumDeclaration = type.symbol.valueDeclaration;
+                if (constEnumDeclaration.flags & 4194304 /* Ambient */) {
+                    error(node, ts.Diagnostics.Cannot_access_ambient_const_enums_when_the_isolatedModules_flag_is_provided);
                 }
             }
-            return type;
         }
         function checkParenthesizedExpression(node, checkMode) {
             var tag = ts.isInJSFile(node) ? ts.getJSDocTypeTag(node) : undefined;
@@ -52240,6 +53034,8 @@ var ts;
                     return checkObjectLiteral(node, checkMode);
                 case 189 /* PropertyAccessExpression */:
                     return checkPropertyAccessExpression(node);
+                case 148 /* QualifiedName */:
+                    return checkQualifiedName(node);
                 case 190 /* ElementAccessExpression */:
                     return checkIndexedAccess(node);
                 case 191 /* CallExpression */:
@@ -52248,7 +53044,7 @@ var ts;
                     }
                 /* falls through */
                 case 192 /* NewExpression */:
-                    return checkCallExpression(node);
+                    return checkCallExpression(node, checkMode);
                 case 193 /* TaggedTemplateExpression */:
                     return checkTaggedTemplateExpression(node);
                 case 195 /* ParenthesizedExpression */:
@@ -52313,9 +53109,8 @@ var ts;
             checkSourceElement(node.constraint);
             checkSourceElement(node.default);
             var typeParameter = getDeclaredTypeOfTypeParameter(getSymbolOfNode(node));
-            if (!hasNonCircularBaseConstraint(typeParameter)) {
-                error(ts.getEffectiveConstraintOfTypeParameter(node), ts.Diagnostics.Type_parameter_0_has_a_circular_constraint, typeToString(typeParameter));
-            }
+            // Resolve base constraint to reveal circularity errors
+            getBaseConstraintOfType(typeParameter);
             if (!hasNonCircularTypeParameterDefault(typeParameter)) {
                 error(node.default, ts.Diagnostics.Type_parameter_0_has_a_circular_default, typeToString(typeParameter));
             }
@@ -52357,7 +53152,7 @@ var ts;
             }
             // Only check rest parameter type if it's not a binding pattern. Since binding patterns are
             // not allowed in a rest parameter, we already have an error from checkGrammarParameterList.
-            if (node.dotDotDotToken && !ts.isBindingPattern(node.name) && !isTypeAssignableTo(getTypeOfSymbol(node.symbol), anyArrayType)) {
+            if (node.dotDotDotToken && !ts.isBindingPattern(node.name) && !isTypeAssignableTo(getTypeOfSymbol(node.symbol), anyReadonlyArrayType)) {
                 error(node, ts.Diagnostics.A_rest_parameter_must_be_of_an_array_type);
             }
         }
@@ -52368,7 +53163,8 @@ var ts;
                 error(node, ts.Diagnostics.A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods);
                 return;
             }
-            var typePredicate = getTypePredicateOfSignature(getSignatureFromDeclaration(parent));
+            var signature = getSignatureFromDeclaration(parent);
+            var typePredicate = getTypePredicateOfSignature(signature);
             if (!typePredicate) {
                 return;
             }
@@ -52379,12 +53175,12 @@ var ts;
             }
             else {
                 if (typePredicate.parameterIndex >= 0) {
-                    if (parent.parameters[typePredicate.parameterIndex].dotDotDotToken) {
+                    if (signature.hasRestParameter && typePredicate.parameterIndex === signature.parameters.length - 1) {
                         error(parameterName, ts.Diagnostics.A_type_predicate_cannot_reference_a_rest_parameter);
                     }
                     else {
                         var leadingError = function () { return ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type); };
-                        checkTypeAssignableTo(typePredicate.type, getTypeOfNode(parent.parameters[typePredicate.parameterIndex]), node.type, 
+                        checkTypeAssignableTo(typePredicate.type, getTypeOfSymbol(signature.parameters[typePredicate.parameterIndex]), node.type, 
                         /*headMessage*/ undefined, leadingError);
                     }
                 }
@@ -52451,7 +53247,7 @@ var ts;
             var functionFlags = ts.getFunctionFlags(node);
             if (!(functionFlags & 4 /* Invalid */)) {
                 // Async generators prior to ESNext require the __await and __asyncGenerator helpers
-                if ((functionFlags & 3 /* AsyncGenerator */) === 3 /* AsyncGenerator */ && languageVersion < 6 /* ESNext */) {
+                if ((functionFlags & 3 /* AsyncGenerator */) === 3 /* AsyncGenerator */ && languageVersion < 7 /* ESNext */) {
                     checkExternalEmitHelpers(node, 6144 /* AsyncGeneratorIncludes */);
                 }
                 // Async functions prior to ES2017 require the __awaiter helper
@@ -52508,7 +53304,7 @@ var ts;
                         checkAsyncFunctionReturnType(node, returnTypeNode);
                     }
                 }
-                if (node.kind !== 162 /* IndexSignature */ && node.kind !== 289 /* JSDocFunctionType */) {
+                if (node.kind !== 162 /* IndexSignature */ && node.kind !== 294 /* JSDocFunctionType */) {
                     registerForUnusedIdentifiersCheck(node);
                 }
             }
@@ -53187,7 +53983,7 @@ var ts;
                     for (var _a = 0, signatures_6 = signatures; _a < signatures_6.length; _a++) {
                         var signature = signatures_6[_a];
                         if (!isImplementationCompatibleWithOverload(bodySignature, signature)) {
-                            error(signature.declaration, ts.Diagnostics.Overload_signature_is_not_compatible_with_function_implementation);
+                            ts.addRelatedInfo(error(signature.declaration, ts.Diagnostics.This_overload_signature_is_not_compatible_with_its_implementation_signature), ts.createDiagnosticForNode(bodyDeclaration, ts.Diagnostics.The_implementation_signature_is_declared_here));
                             break;
                         }
                     }
@@ -53264,8 +54060,8 @@ var ts;
                     case 241 /* InterfaceDeclaration */:
                     case 242 /* TypeAliasDeclaration */:
                     // A jsdoc typedef and callback are, by definition, type aliases
-                    case 304 /* JSDocTypedefTag */:
-                    case 297 /* JSDocCallbackTag */:
+                    case 309 /* JSDocTypedefTag */:
+                    case 302 /* JSDocCallbackTag */:
                         return 2 /* ExportType */;
                     case 244 /* ModuleDeclaration */:
                         return ts.isAmbientModule(d) || ts.getModuleInstanceState(d) !== 0 /* NonInstantiated */
@@ -53274,7 +54070,7 @@ var ts;
                     case 240 /* ClassDeclaration */:
                     case 243 /* EnumDeclaration */:
                         return 2 /* ExportType */ | 1 /* ExportValue */;
-                    case 279 /* SourceFile */:
+                    case 284 /* SourceFile */:
                         return 2 /* ExportType */ | 1 /* ExportValue */ | 4 /* ExportNamespace */;
                     case 254 /* ExportAssignment */:
                         // Export assigned entity name expressions act as aliases and should fall through, otherwise they export values
@@ -53639,8 +54435,8 @@ var ts;
         }
         function getEntityNameForDecoratorMetadataFromTypeList(types) {
             var commonEntityName;
-            for (var _i = 0, types_16 = types; _i < types_16.length; _i++) {
-                var typeNode = types_16[_i];
+            for (var _i = 0, types_17 = types; _i < types_17.length; _i++) {
+                var typeNode = types_17[_i];
                 while (typeNode.kind === 177 /* ParenthesizedType */) {
                     typeNode = typeNode.type; // Skip parens if need be
                 }
@@ -53915,7 +54711,7 @@ var ts;
                         checkUnusedClassMembers(node, addDiagnostic);
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 279 /* SourceFile */:
+                    case 284 /* SourceFile */:
                     case 244 /* ModuleDeclaration */:
                     case 218 /* Block */:
                     case 246 /* CaseBlock */:
@@ -54008,8 +54804,8 @@ var ts;
                 return;
             var typeParameters = ts.getEffectiveTypeParameterDeclarations(node);
             var seenParentsWithEveryUnused = new ts.NodeSet();
-            for (var _i = 0, typeParameters_2 = typeParameters; _i < typeParameters_2.length; _i++) {
-                var typeParameter = typeParameters_2[_i];
+            for (var _i = 0, typeParameters_3 = typeParameters; _i < typeParameters_3.length; _i++) {
+                var typeParameter = typeParameters_3[_i];
                 if (!isTypeParameterUnused(typeParameter))
                     continue;
                 var name = ts.idText(typeParameter.name);
@@ -54262,7 +55058,7 @@ var ts;
             }
             // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 279 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
+            if (parent.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
                 // If the declaration happens to be in external module, report error that require and exports are reserved keywords
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
@@ -54277,7 +55073,7 @@ var ts;
             }
             // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 279 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 1024 /* HasAsyncFunctions */) {
+            if (parent.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 1024 /* HasAsyncFunctions */) {
                 // If the declaration happens to be in external module, report error that Promise is a reserved identifier.
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
@@ -54334,7 +55130,7 @@ var ts;
                             (container.kind === 218 /* Block */ && ts.isFunctionLike(container.parent) ||
                                 container.kind === 245 /* ModuleBlock */ ||
                                 container.kind === 244 /* ModuleDeclaration */ ||
-                                container.kind === 279 /* SourceFile */);
+                                container.kind === 284 /* SourceFile */);
                         // here we know that function scoped variable is shadowed by block scoped one
                         // if they are defined in the same scope - binder has already reported redeclaration error
                         // otherwise if variable has an initializer - show error that initialization will fail
@@ -54434,7 +55230,7 @@ var ts;
                 }
             }
             if (node.kind === 186 /* BindingElement */) {
-                if (node.parent.kind === 184 /* ObjectBindingPattern */ && languageVersion < 6 /* ESNext */) {
+                if (node.parent.kind === 184 /* ObjectBindingPattern */ && languageVersion < 7 /* ESNext */) {
                     checkExternalEmitHelpers(node, 4 /* Rest */);
                 }
                 // check computed properties inside property names of binding elements
@@ -54445,7 +55241,7 @@ var ts;
                 var parent = node.parent.parent;
                 var parentType = getTypeForBindingElementParent(parent);
                 var name = node.propertyName || node.name;
-                if (!ts.isBindingPattern(name) && parentType) {
+                if (parentType && !ts.isBindingPattern(name)) {
                     var exprType = getLiteralTypeFromPropertyName(name);
                     if (isTypeUsableAsPropertyName(exprType)) {
                         var nameText = getPropertyNameFromType(exprType);
@@ -54632,7 +55428,7 @@ var ts;
             checkGrammarForInOrForOfStatement(node);
             if (node.awaitModifier) {
                 var functionFlags = ts.getFunctionFlags(ts.getContainingFunction(node));
-                if ((functionFlags & (4 /* Invalid */ | 2 /* Async */)) === 2 /* Async */ && languageVersion < 6 /* ESNext */) {
+                if ((functionFlags & (4 /* Invalid */ | 2 /* Async */)) === 2 /* Async */ && languageVersion < 7 /* ESNext */) {
                     // for..await..of in an async function or async generator function prior to ESNext requires the __asyncValues helper
                     checkExternalEmitHelpers(node, 16384 /* ForAwaitOfIncludes */);
                 }
@@ -55077,7 +55873,7 @@ var ts;
                             // If the function has a return type, but promisedType is
                             // undefined, an error will be reported in checkAsyncFunctionReturnType
                             // so we don't need to report one here.
-                            checkTypeAssignableTo(awaitedType, promisedType, node);
+                            checkTypeAssignableToAndOptionallyElaborate(awaitedType, promisedType, node, node.expression);
                         }
                     }
                     else {
@@ -55948,10 +56744,6 @@ var ts;
             checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             checkExportsOnMergedDeclarations(node);
             computeEnumMemberValues(node);
-            var enumIsConst = ts.isEnumConst(node);
-            if (compilerOptions.isolatedModules && enumIsConst && node.flags & 4194304 /* Ambient */) {
-                error(node.name, ts.Diagnostics.Ambient_const_enums_are_not_allowed_when_the_isolatedModules_flag_is_provided);
-            }
             // Spec 2014 - Section 9.3:
             // It isn't possible for one enum declaration to continue the automatic numbering sequence of another,
             // and when an enum type has multiple declarations, only one declaration is permitted to omit a value
@@ -55962,9 +56754,10 @@ var ts;
             var firstDeclaration = ts.getDeclarationOfKind(enumSymbol, node.kind);
             if (node === firstDeclaration) {
                 if (enumSymbol.declarations.length > 1) {
+                    var enumIsConst_1 = ts.isEnumConst(node);
                     // check that const is placed\omitted on all enum declarations
                     ts.forEach(enumSymbol.declarations, function (decl) {
-                        if (ts.isEnumDeclaration(decl) && ts.isEnumConst(decl) !== enumIsConst) {
+                        if (ts.isEnumDeclaration(decl) && ts.isEnumConst(decl) !== enumIsConst_1) {
                             error(ts.getNameOfDeclaration(decl), ts.Diagnostics.Enum_declarations_must_all_be_const_or_non_const);
                         }
                     });
@@ -56045,8 +56838,8 @@ var ts;
                 var symbol = getSymbolOfNode(node);
                 // The following checks only apply on a non-ambient instantiated module declaration.
                 if (symbol.flags & 512 /* ValueModule */
-                    && symbol.declarations.length > 1
                     && !inAmbientContext
+                    && symbol.declarations.length > 1
                     && isInstantiatedModule(node, !!compilerOptions.preserveConstEnums || !!compilerOptions.isolatedModules)) {
                     var firstNonAmbientClassOrFunc = getFirstNonAmbientClassOrFunctionDeclaration(symbol);
                     if (firstNonAmbientClassOrFunc) {
@@ -56187,7 +56980,7 @@ var ts;
                 return false;
             }
             var inAmbientExternalModule = node.parent.kind === 245 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-            if (node.parent.kind !== 279 /* SourceFile */ && !inAmbientExternalModule) {
+            if (node.parent.kind !== 284 /* SourceFile */ && !inAmbientExternalModule) {
                 error(moduleName, node.kind === 255 /* ExportDeclaration */ ?
                     ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace :
                     ts.Diagnostics.Import_declarations_in_a_namespace_cannot_reference_a_module);
@@ -56318,7 +57111,7 @@ var ts;
                     var inAmbientExternalModule = node.parent.kind === 245 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
                     var inAmbientNamespaceDeclaration = !inAmbientExternalModule && node.parent.kind === 245 /* ModuleBlock */ &&
                         !node.moduleSpecifier && node.flags & 4194304 /* Ambient */;
-                    if (node.parent.kind !== 279 /* SourceFile */ && !inAmbientExternalModule && !inAmbientNamespaceDeclaration) {
+                    if (node.parent.kind !== 284 /* SourceFile */ && !inAmbientExternalModule && !inAmbientNamespaceDeclaration) {
                         error(node, ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace);
                     }
                 }
@@ -56335,7 +57128,7 @@ var ts;
             }
         }
         function checkGrammarModuleElementContext(node, errorMessage) {
-            var isInAppropriateContext = node.parent.kind === 279 /* SourceFile */ || node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 244 /* ModuleDeclaration */;
+            var isInAppropriateContext = node.parent.kind === 284 /* SourceFile */ || node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 244 /* ModuleDeclaration */;
             if (!isInAppropriateContext) {
                 grammarErrorOnFirstToken(node, errorMessage);
             }
@@ -56364,7 +57157,7 @@ var ts;
                 // If we hit an export assignment in an illegal context, just bail out to avoid cascading errors.
                 return;
             }
-            var container = node.parent.kind === 279 /* SourceFile */ ? node.parent : node.parent.parent;
+            var container = node.parent.kind === 284 /* SourceFile */ ? node.parent : node.parent.parent;
             if (container.kind === 244 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
                 if (node.isExportEquals) {
                     error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
@@ -56457,9 +57250,14 @@ var ts;
                 !!declaration.body;
         }
         function checkSourceElement(node) {
-            if (!node) {
-                return;
+            if (node) {
+                var saveCurrentNode = currentNode;
+                currentNode = node;
+                checkSourceElementWorker(node);
+                currentNode = saveCurrentNode;
             }
+        }
+        function checkSourceElementWorker(node) {
             if (ts.isInJSFile(node)) {
                 ts.forEach(node.jsDoc, function (_a) {
                     var tags = _a.tags;
@@ -56529,32 +57327,32 @@ var ts;
                     return checkInferType(node);
                 case 183 /* ImportType */:
                     return checkImportType(node);
-                case 295 /* JSDocAugmentsTag */:
+                case 300 /* JSDocAugmentsTag */:
                     return checkJSDocAugmentsTag(node);
-                case 304 /* JSDocTypedefTag */:
-                case 297 /* JSDocCallbackTag */:
+                case 309 /* JSDocTypedefTag */:
+                case 302 /* JSDocCallbackTag */:
                     return checkJSDocTypeAliasTag(node);
-                case 303 /* JSDocTemplateTag */:
+                case 308 /* JSDocTemplateTag */:
                     return checkJSDocTemplateTag(node);
-                case 302 /* JSDocTypeTag */:
+                case 307 /* JSDocTypeTag */:
                     return checkJSDocTypeTag(node);
-                case 299 /* JSDocParameterTag */:
+                case 304 /* JSDocParameterTag */:
                     return checkJSDocParameterTag(node);
-                case 289 /* JSDocFunctionType */:
+                case 294 /* JSDocFunctionType */:
                     checkJSDocFunctionType(node);
                 // falls through
-                case 287 /* JSDocNonNullableType */:
-                case 286 /* JSDocNullableType */:
-                case 284 /* JSDocAllType */:
-                case 285 /* JSDocUnknownType */:
-                case 292 /* JSDocTypeLiteral */:
+                case 292 /* JSDocNonNullableType */:
+                case 291 /* JSDocNullableType */:
+                case 289 /* JSDocAllType */:
+                case 290 /* JSDocUnknownType */:
+                case 297 /* JSDocTypeLiteral */:
                     checkJSDocTypeIsInJsFile(node);
                     ts.forEachChild(node, checkSourceElement);
                     return;
-                case 290 /* JSDocVariadicType */:
+                case 295 /* JSDocVariadicType */:
                     checkJSDocVariadicType(node);
                     return;
-                case 283 /* JSDocTypeExpression */:
+                case 288 /* JSDocTypeExpression */:
                     return checkSourceElement(node.type);
                 case 180 /* IndexedAccessType */:
                     return checkIndexedAccessType(node);
@@ -56708,32 +57506,35 @@ var ts;
         }
         function checkDeferredNodes(context) {
             var links = getNodeLinks(context);
-            if (!links.deferredNodes) {
-                return;
+            if (links.deferredNodes) {
+                links.deferredNodes.forEach(checkDeferredNode);
             }
-            links.deferredNodes.forEach(function (node) {
-                switch (node.kind) {
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
-                        checkFunctionExpressionOrObjectLiteralMethodDeferred(node);
-                        break;
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                        checkAccessorDeclaration(node);
-                        break;
-                    case 209 /* ClassExpression */:
-                        checkClassExpressionDeferred(node);
-                        break;
-                    case 261 /* JsxSelfClosingElement */:
-                        checkJsxSelfClosingElementDeferred(node);
-                        break;
-                    case 260 /* JsxElement */:
-                        checkJsxElementDeferred(node);
-                        break;
-                }
-            });
+        }
+        function checkDeferredNode(node) {
+            var saveCurrentNode = currentNode;
+            currentNode = node;
+            switch (node.kind) {
+                case 196 /* FunctionExpression */:
+                case 197 /* ArrowFunction */:
+                case 156 /* MethodDeclaration */:
+                case 155 /* MethodSignature */:
+                    checkFunctionExpressionOrObjectLiteralMethodDeferred(node);
+                    break;
+                case 158 /* GetAccessor */:
+                case 159 /* SetAccessor */:
+                    checkAccessorDeclaration(node);
+                    break;
+                case 209 /* ClassExpression */:
+                    checkClassExpressionDeferred(node);
+                    break;
+                case 261 /* JsxSelfClosingElement */:
+                    checkJsxSelfClosingElementDeferred(node);
+                    break;
+                case 260 /* JsxElement */:
+                    checkJsxElementDeferred(node);
+                    break;
+            }
+            currentNode = saveCurrentNode;
         }
         function checkSourceFile(node) {
             ts.performance.mark("beforeCheck");
@@ -56808,7 +57609,7 @@ var ts;
             throwIfNonDiagnosticsProducing();
             if (sourceFile) {
                 // Some global diagnostics are deferred until they are needed and
-                // may not be reported in the firt call to getGlobalDiagnostics.
+                // may not be reported in the first call to getGlobalDiagnostics.
                 // We should catch these changes and report them.
                 var previousGlobalDiagnostics = diagnostics.getGlobalDiagnostics();
                 var previousGlobalDiagnosticsSize = previousGlobalDiagnostics.length;
@@ -56859,7 +57660,7 @@ var ts;
                         copySymbols(location.locals, meaning);
                     }
                     switch (location.kind) {
-                        case 279 /* SourceFile */:
+                        case 284 /* SourceFile */:
                             if (!ts.isExternalOrCommonJsModule(location))
                                 break;
                         // falls through
@@ -57078,10 +57879,10 @@ var ts;
                     return entityNameSymbol;
                 }
             }
-            if (entityName.parent.kind === 299 /* JSDocParameterTag */) {
+            if (entityName.parent.kind === 304 /* JSDocParameterTag */) {
                 return ts.getParameterSymbolFromJSDoc(entityName.parent);
             }
-            if (entityName.parent.kind === 150 /* TypeParameter */ && entityName.parent.parent.kind === 303 /* JSDocTemplateTag */) {
+            if (entityName.parent.kind === 150 /* TypeParameter */ && entityName.parent.parent.kind === 308 /* JSDocTemplateTag */) {
                 ts.Debug.assert(!ts.isInJSFile(entityName)); // Otherwise `isDeclarationName` would have been true.
                 var typeParameter = ts.getTypeParameterFromJsDoc(entityName.parent);
                 return typeParameter && typeParameter.symbol;
@@ -57123,7 +57924,7 @@ var ts;
             return undefined;
         }
         function getSymbolAtLocation(node) {
-            if (node.kind === 279 /* SourceFile */) {
+            if (node.kind === 284 /* SourceFile */) {
                 return ts.isExternalModule(node) ? getMergedSymbol(node.symbol) : undefined;
             }
             var parent = node.parent;
@@ -57465,7 +58266,7 @@ var ts;
                     }
                     var parentSymbol_1 = getParentOfSymbol(symbol);
                     if (parentSymbol_1) {
-                        if (parentSymbol_1.flags & 512 /* ValueModule */ && parentSymbol_1.valueDeclaration.kind === 279 /* SourceFile */) {
+                        if (parentSymbol_1.flags & 512 /* ValueModule */ && parentSymbol_1.valueDeclaration.kind === 284 /* SourceFile */) {
                             var symbolFile = parentSymbol_1.valueDeclaration;
                             var referenceFile = ts.getSourceFileOfNode(node);
                             // If `node` accesses an export and that export isn't in the same file, then symbol is a namespace export, so return undefined.
@@ -57492,7 +58293,7 @@ var ts;
             return undefined;
         }
         function isSymbolOfDeclarationWithCollidingName(symbol) {
-            if (symbol.flags & 418 /* BlockScoped */) {
+            if (symbol.flags & 418 /* BlockScoped */ && !ts.isSourceFile(symbol.valueDeclaration)) {
                 var links = getSymbolLinks(symbol);
                 if (links.isDeclarationWithCollidingName === undefined) {
                     var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
@@ -57580,7 +58381,7 @@ var ts;
         }
         function isTopLevelValueImportEqualsWithEntityName(nodeIn) {
             var node = ts.getParseTreeNode(nodeIn, ts.isImportEqualsDeclaration);
-            if (node === undefined || node.parent.kind !== 279 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
+            if (node === undefined || node.parent.kind !== 284 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
                 // parent is not source file or it is not reference to internal module
                 return false;
             }
@@ -58009,7 +58810,7 @@ var ts;
                         break;
                     }
                 }
-                if (current.valueDeclaration && current.valueDeclaration.kind === 279 /* SourceFile */ && current.flags & 512 /* ValueModule */) {
+                if (current.valueDeclaration && current.valueDeclaration.kind === 284 /* SourceFile */ && current.flags & 512 /* ValueModule */) {
                     return false;
                 }
                 // check that at least one declaration of top level symbol originates from type declaration file
@@ -58042,7 +58843,7 @@ var ts;
             if (!moduleSymbol) {
                 return undefined;
             }
-            return ts.getDeclarationOfKind(moduleSymbol, 279 /* SourceFile */);
+            return ts.getDeclarationOfKind(moduleSymbol, 284 /* SourceFile */);
         }
         function initializeTypeChecker() {
             // Bind all source files and propagate errors
@@ -58156,8 +58957,8 @@ var ts;
                 else {
                     // Otherwise issue top-level error since the files appear very identical in terms of what they contain
                     var list = ts.arrayFrom(conflictingSymbols.keys()).join(", ");
-                    diagnostics.add(addRelatedInfo(ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Conflicts_are_in_this_file)));
-                    diagnostics.add(addRelatedInfo(ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Conflicts_are_in_this_file)));
+                    diagnostics.add(ts.addRelatedInfo(ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Conflicts_are_in_this_file)));
+                    diagnostics.add(ts.addRelatedInfo(ts.createDiagnosticForNode(secondFile, ts.Diagnostics.Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0, list), ts.createDiagnosticForNode(firstFile, ts.Diagnostics.Conflicts_are_in_this_file)));
                 }
             });
             amalgamatedDuplicates = undefined;
@@ -58274,7 +59075,7 @@ var ts;
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "async");
                         }
-                        else if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 279 /* SourceFile */) {
+                        else if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text);
                         }
                         else if (flags & 128 /* Abstract */) {
@@ -58297,7 +59098,7 @@ var ts;
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "async");
                         }
-                        else if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 279 /* SourceFile */) {
+                        else if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, "static");
                         }
                         else if (node.kind === 151 /* Parameter */) {
@@ -58342,7 +59143,7 @@ var ts;
                         flags |= 1 /* Export */;
                         break;
                     case 80 /* DefaultKeyword */:
-                        var container = node.parent.kind === 279 /* SourceFile */ ? node.parent : node.parent.parent;
+                        var container = node.parent.kind === 284 /* SourceFile */ ? node.parent : node.parent.parent;
                         if (container.kind === 244 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_default_export_can_only_be_used_in_an_ECMAScript_style_module);
                         }
@@ -58465,7 +59266,7 @@ var ts;
                 case 151 /* Parameter */:
                     return false;
                 default:
-                    if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 279 /* SourceFile */) {
+                    if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
                         return false;
                     }
                     switch (node.kind) {
@@ -58553,10 +59354,10 @@ var ts;
                     var nonSimpleParameters = getNonSimpleParameters(node.parameters);
                     if (ts.length(nonSimpleParameters)) {
                         ts.forEach(nonSimpleParameters, function (parameter) {
-                            addRelatedInfo(error(parameter, ts.Diagnostics.This_parameter_is_not_allowed_with_use_strict_directive), ts.createDiagnosticForNode(useStrictDirective_1, ts.Diagnostics.use_strict_directive_used_here));
+                            ts.addRelatedInfo(error(parameter, ts.Diagnostics.This_parameter_is_not_allowed_with_use_strict_directive), ts.createDiagnosticForNode(useStrictDirective_1, ts.Diagnostics.use_strict_directive_used_here));
                         });
                         var diagnostics_1 = nonSimpleParameters.map(function (parameter, index) { return (index === 0 ? ts.createDiagnosticForNode(parameter, ts.Diagnostics.Non_simple_parameter_declared_here) : ts.createDiagnosticForNode(parameter, ts.Diagnostics.and_here)); });
-                        addRelatedInfo.apply(void 0, [error(useStrictDirective_1, ts.Diagnostics.use_strict_directive_cannot_be_used_with_non_simple_parameter_list)].concat(diagnostics_1));
+                        ts.addRelatedInfo.apply(void 0, [error(useStrictDirective_1, ts.Diagnostics.use_strict_directive_cannot_be_used_with_non_simple_parameter_list)].concat(diagnostics_1));
                         return true;
                     }
                 }
@@ -58993,6 +59794,11 @@ var ts;
                         return grammarErrorOnNode(node, ts.Diagnostics.unique_symbol_types_are_not_allowed_here);
                 }
             }
+            else if (node.operator === 133 /* ReadonlyKeyword */) {
+                if (node.type.kind !== 169 /* ArrayType */ && node.type.kind !== 170 /* TupleType */) {
+                    return grammarErrorOnFirstToken(node, ts.Diagnostics.readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types, ts.tokenToString(139 /* SymbolKeyword */));
+                }
+            }
         }
         function checkGrammarForInvalidDynamicName(node, message) {
             if (isNonBindableDynamicName(node)) {
@@ -59383,7 +60189,7 @@ var ts;
                 // to prevent noisiness.  So use a bit on the block to indicate if
                 // this has already been reported, and don't report if it has.
                 //
-                if (node.parent.kind === 218 /* Block */ || node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 279 /* SourceFile */) {
+                if (node.parent.kind === 218 /* Block */ || node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
                     var links_2 = getNodeLinks(node.parent);
                     // Check if the containing block ever report this error
                     if (!links_2.hasReportedStatementInAmbientContext) {
@@ -59423,7 +60229,7 @@ var ts;
             var literalType = ts.isLiteralTypeNode(node.parent) ||
                 ts.isPrefixUnaryExpression(node.parent) && ts.isLiteralTypeNode(node.parent.parent);
             if (!literalType) {
-                if (languageVersion < 6 /* ESNext */) {
+                if (languageVersion < 7 /* ESNext */) {
                     if (grammarErrorOnNode(node, ts.Diagnostics.BigInt_literals_are_not_available_when_targeting_lower_than_ESNext)) {
                         return true;
                     }
@@ -59588,10 +60394,11 @@ var ts;
         return createLiteralFromNode(value);
     }
     ts.createLiteral = createLiteral;
-    function createNumericLiteral(value) {
+    function createNumericLiteral(value, numericLiteralFlags) {
+        if (numericLiteralFlags === void 0) { numericLiteralFlags = 0 /* None */; }
         var node = createSynthesizedNode(8 /* NumericLiteral */);
         node.text = value;
-        node.numericLiteralFlags = 0;
+        node.numericLiteralFlags = numericLiteralFlags;
         return node;
     }
     ts.createNumericLiteral = createNumericLiteral;
@@ -61436,14 +62243,14 @@ var ts;
     // JSDoc
     /* @internal */
     function createJSDocTypeExpression(type) {
-        var node = createSynthesizedNode(283 /* JSDocTypeExpression */);
+        var node = createSynthesizedNode(288 /* JSDocTypeExpression */);
         node.type = type;
         return node;
     }
     ts.createJSDocTypeExpression = createJSDocTypeExpression;
     /* @internal */
     function createJSDocTypeTag(typeExpression, comment) {
-        var tag = createJSDocTag(302 /* JSDocTypeTag */, "type");
+        var tag = createJSDocTag(307 /* JSDocTypeTag */, "type");
         tag.typeExpression = typeExpression;
         tag.comment = comment;
         return tag;
@@ -61451,7 +62258,7 @@ var ts;
     ts.createJSDocTypeTag = createJSDocTypeTag;
     /* @internal */
     function createJSDocReturnTag(typeExpression, comment) {
-        var tag = createJSDocTag(300 /* JSDocReturnTag */, "returns");
+        var tag = createJSDocTag(305 /* JSDocReturnTag */, "returns");
         tag.typeExpression = typeExpression;
         tag.comment = comment;
         return tag;
@@ -61459,7 +62266,7 @@ var ts;
     ts.createJSDocReturnTag = createJSDocReturnTag;
     /* @internal */
     function createJSDocParamTag(name, isBracketed, typeExpression, comment) {
-        var tag = createJSDocTag(299 /* JSDocParameterTag */, "param");
+        var tag = createJSDocTag(304 /* JSDocParameterTag */, "param");
         tag.typeExpression = typeExpression;
         tag.name = name;
         tag.isBracketed = isBracketed;
@@ -61469,7 +62276,7 @@ var ts;
     ts.createJSDocParamTag = createJSDocParamTag;
     /* @internal */
     function createJSDocComment(comment, tags) {
-        var node = createSynthesizedNode(291 /* JSDocComment */);
+        var node = createSynthesizedNode(296 /* JSDocComment */);
         node.comment = comment;
         node.tags = tags;
         return node;
@@ -61550,6 +62357,28 @@ var ts;
         return node;
     }
     ts.createJsxFragment = createJsxFragment;
+    function createJsxText(text, containsOnlyTriviaWhiteSpaces) {
+        var node = createSynthesizedNode(11 /* JsxText */);
+        node.text = text;
+        node.containsOnlyTriviaWhiteSpaces = !!containsOnlyTriviaWhiteSpaces;
+        return node;
+    }
+    ts.createJsxText = createJsxText;
+    function updateJsxText(node, text, containsOnlyTriviaWhiteSpaces) {
+        return node.text !== text
+            || node.containsOnlyTriviaWhiteSpaces !== containsOnlyTriviaWhiteSpaces
+            ? updateNode(createJsxText(text, containsOnlyTriviaWhiteSpaces), node)
+            : node;
+    }
+    ts.updateJsxText = updateJsxText;
+    function createJsxOpeningFragment() {
+        return createSynthesizedNode(265 /* JsxOpeningFragment */);
+    }
+    ts.createJsxOpeningFragment = createJsxOpeningFragment;
+    function createJsxJsxClosingFragment() {
+        return createSynthesizedNode(266 /* JsxClosingFragment */);
+    }
+    ts.createJsxJsxClosingFragment = createJsxJsxClosingFragment;
     function updateJsxFragment(node, openingFragment, children, closingFragment) {
         return node.openingFragment !== openingFragment
             || node.children !== children
@@ -61728,7 +62557,7 @@ var ts;
             (typeReferences !== undefined && node.typeReferenceDirectives !== typeReferences) ||
             (libReferences !== undefined && node.libReferenceDirectives !== libReferences) ||
             (hasNoDefaultLib !== undefined && node.hasNoDefaultLib !== hasNoDefaultLib)) {
-            var updated = createSynthesizedNode(279 /* SourceFile */);
+            var updated = createSynthesizedNode(284 /* SourceFile */);
             updated.flags |= node.flags;
             updated.statements = createNodeArray(statements);
             updated.endOfFileToken = node.endOfFileToken;
@@ -61812,7 +62641,7 @@ var ts;
      * @param original The original statement.
      */
     function createNotEmittedStatement(original) {
-        var node = createSynthesizedNode(307 /* NotEmittedStatement */);
+        var node = createSynthesizedNode(312 /* NotEmittedStatement */);
         node.original = original;
         setTextRange(node, original);
         return node;
@@ -61824,7 +62653,7 @@ var ts;
      */
     /* @internal */
     function createEndOfDeclarationMarker(original) {
-        var node = createSynthesizedNode(311 /* EndOfDeclarationMarker */);
+        var node = createSynthesizedNode(316 /* EndOfDeclarationMarker */);
         node.emitNode = {};
         node.original = original;
         return node;
@@ -61836,7 +62665,7 @@ var ts;
      */
     /* @internal */
     function createMergeDeclarationMarker(original) {
-        var node = createSynthesizedNode(310 /* MergeDeclarationMarker */);
+        var node = createSynthesizedNode(315 /* MergeDeclarationMarker */);
         node.emitNode = {};
         node.original = original;
         return node;
@@ -61851,7 +62680,7 @@ var ts;
      * @param location The location for the expression. Defaults to the positions from "original" if provided.
      */
     function createPartiallyEmittedExpression(expression, original) {
-        var node = createSynthesizedNode(308 /* PartiallyEmittedExpression */);
+        var node = createSynthesizedNode(313 /* PartiallyEmittedExpression */);
         node.expression = expression;
         node.original = original;
         setTextRange(node, original);
@@ -61867,7 +62696,7 @@ var ts;
     ts.updatePartiallyEmittedExpression = updatePartiallyEmittedExpression;
     function flattenCommaElements(node) {
         if (ts.nodeIsSynthesized(node) && !ts.isParseTreeNode(node) && !node.original && !node.emitNode && !node.id) {
-            if (node.kind === 309 /* CommaListExpression */) {
+            if (node.kind === 314 /* CommaListExpression */) {
                 return node.elements;
             }
             if (ts.isBinaryExpression(node) && node.operatorToken.kind === 27 /* CommaToken */) {
@@ -61877,7 +62706,7 @@ var ts;
         return node;
     }
     function createCommaList(elements) {
-        var node = createSynthesizedNode(309 /* CommaListExpression */);
+        var node = createSynthesizedNode(314 /* CommaListExpression */);
         node.elements = createNodeArray(ts.sameFlatMap(elements, flattenCommaElements));
         return node;
     }
@@ -61890,33 +62719,197 @@ var ts;
     ts.updateCommaList = updateCommaList;
     function createBundle(sourceFiles, prepends) {
         if (prepends === void 0) { prepends = ts.emptyArray; }
-        var node = ts.createNode(280 /* Bundle */);
+        var node = ts.createNode(285 /* Bundle */);
         node.prepends = prepends;
         node.sourceFiles = sourceFiles;
         return node;
     }
     ts.createBundle = createBundle;
-    function createUnparsedSourceFile(textOrInputFiles, mapPathOrType, map) {
-        var node = ts.createNode(281 /* UnparsedSource */);
+    var allUnscopedEmitHelpers;
+    function getAllUnscopedEmitHelpers() {
+        return allUnscopedEmitHelpers || (allUnscopedEmitHelpers = ts.arrayToMap([
+            ts.valuesHelper,
+            ts.readHelper,
+            ts.spreadHelper,
+            ts.restHelper,
+            ts.decorateHelper,
+            ts.metadataHelper,
+            ts.paramHelper,
+            ts.awaiterHelper,
+            ts.assignHelper,
+            ts.awaitHelper,
+            ts.asyncGeneratorHelper,
+            ts.asyncDelegator,
+            ts.asyncValues,
+            ts.extendsHelper,
+            ts.templateObjectHelper,
+            ts.generatorHelper,
+            ts.importStarHelper,
+            ts.importDefaultHelper
+        ], function (helper) { return helper.name; }));
+    }
+    function createUnparsedSource() {
+        var node = ts.createNode(286 /* UnparsedSource */);
+        node.prologues = ts.emptyArray;
+        node.referencedFiles = ts.emptyArray;
+        node.libReferenceDirectives = ts.emptyArray;
+        node.getLineAndCharacterOfPosition = function (pos) { return ts.getLineAndCharacterOfPosition(node, pos); };
+        return node;
+    }
+    function createUnparsedSourceFile(textOrInputFiles, mapPathOrType, mapTextOrStripInternal) {
+        var node = createUnparsedSource();
+        var stripInternal;
+        var bundleFileInfo;
         if (!ts.isString(textOrInputFiles)) {
             ts.Debug.assert(mapPathOrType === "js" || mapPathOrType === "dts");
-            node.fileName = mapPathOrType === "js" ? textOrInputFiles.javascriptPath : textOrInputFiles.declarationPath;
+            node.fileName = (mapPathOrType === "js" ? textOrInputFiles.javascriptPath : textOrInputFiles.declarationPath) || "";
             node.sourceMapPath = mapPathOrType === "js" ? textOrInputFiles.javascriptMapPath : textOrInputFiles.declarationMapPath;
             Object.defineProperties(node, {
                 text: { get: function () { return mapPathOrType === "js" ? textOrInputFiles.javascriptText : textOrInputFiles.declarationText; } },
                 sourceMapText: { get: function () { return mapPathOrType === "js" ? textOrInputFiles.javascriptMapText : textOrInputFiles.declarationMapText; } },
             });
+            if (textOrInputFiles.buildInfo && textOrInputFiles.buildInfo.bundle) {
+                node.oldFileOfCurrentEmit = textOrInputFiles.oldFileOfCurrentEmit;
+                ts.Debug.assert(mapTextOrStripInternal === undefined || typeof mapTextOrStripInternal === "boolean");
+                stripInternal = mapTextOrStripInternal;
+                bundleFileInfo = mapPathOrType === "js" ? textOrInputFiles.buildInfo.bundle.js : textOrInputFiles.buildInfo.bundle.dts;
+                if (node.oldFileOfCurrentEmit) {
+                    parseOldFileOfCurrentEmit(node, ts.Debug.assertDefined(bundleFileInfo));
+                    return node;
+                }
+            }
         }
         else {
+            node.fileName = "";
             node.text = textOrInputFiles;
             node.sourceMapPath = mapPathOrType;
-            node.sourceMapText = map;
+            node.sourceMapText = mapTextOrStripInternal;
         }
+        ts.Debug.assert(!node.oldFileOfCurrentEmit);
+        parseUnparsedSourceFile(node, bundleFileInfo, stripInternal);
         return node;
     }
     ts.createUnparsedSourceFile = createUnparsedSourceFile;
-    function createInputFiles(javascriptTextOrReadFileText, declarationTextOrJavascriptPath, javascriptMapPath, javascriptMapTextOrDeclarationPath, declarationMapPath, declarationMapText) {
-        var node = ts.createNode(282 /* InputFiles */);
+    function parseUnparsedSourceFile(node, bundleFileInfo, stripInternal) {
+        var prologues;
+        var helpers;
+        var referencedFiles;
+        var typeReferenceDirectives;
+        var libReferenceDirectives;
+        var texts;
+        for (var _i = 0, _a = bundleFileInfo ? bundleFileInfo.sections : ts.emptyArray; _i < _a.length; _i++) {
+            var section = _a[_i];
+            switch (section.kind) {
+                case "prologue" /* Prologue */:
+                    (prologues || (prologues = [])).push(createUnparsedNode(section, node));
+                    break;
+                case "emitHelpers" /* EmitHelpers */:
+                    (helpers || (helpers = [])).push(getAllUnscopedEmitHelpers().get(section.data));
+                    break;
+                case "no-default-lib" /* NoDefaultLib */:
+                    node.hasNoDefaultLib = true;
+                    break;
+                case "reference" /* Reference */:
+                    (referencedFiles || (referencedFiles = [])).push({ pos: -1, end: -1, fileName: section.data });
+                    break;
+                case "type" /* Type */:
+                    (typeReferenceDirectives || (typeReferenceDirectives = [])).push(section.data);
+                    break;
+                case "lib" /* Lib */:
+                    (libReferenceDirectives || (libReferenceDirectives = [])).push({ pos: -1, end: -1, fileName: section.data });
+                    break;
+                case "prepend" /* Prepend */:
+                    var prependNode = createUnparsedNode(section, node);
+                    var prependTexts = void 0;
+                    for (var _b = 0, _c = section.texts; _b < _c.length; _b++) {
+                        var text = _c[_b];
+                        if (!stripInternal || text.kind !== "internal" /* Internal */) {
+                            (prependTexts || (prependTexts = [])).push(createUnparsedNode(text, node));
+                        }
+                    }
+                    prependNode.texts = prependTexts || ts.emptyArray;
+                    (texts || (texts = [])).push(prependNode);
+                    break;
+                case "internal" /* Internal */:
+                    if (stripInternal)
+                        break;
+                // falls through
+                case "text" /* Text */:
+                    (texts || (texts = [])).push(createUnparsedNode(section, node));
+                    break;
+                default:
+                    ts.Debug.assertNever(section);
+            }
+        }
+        node.prologues = prologues || ts.emptyArray;
+        node.helpers = helpers;
+        node.referencedFiles = referencedFiles || ts.emptyArray;
+        node.typeReferenceDirectives = typeReferenceDirectives;
+        node.libReferenceDirectives = libReferenceDirectives || ts.emptyArray;
+        node.texts = texts || [createUnparsedNode({ kind: "text" /* Text */, pos: 0, end: node.text.length }, node)];
+    }
+    function parseOldFileOfCurrentEmit(node, bundleFileInfo) {
+        ts.Debug.assert(!!node.oldFileOfCurrentEmit);
+        var texts;
+        var syntheticReferences;
+        for (var _i = 0, _a = bundleFileInfo.sections; _i < _a.length; _i++) {
+            var section = _a[_i];
+            switch (section.kind) {
+                case "internal" /* Internal */:
+                case "text" /* Text */:
+                    (texts || (texts = [])).push(createUnparsedNode(section, node));
+                    break;
+                case "no-default-lib" /* NoDefaultLib */:
+                case "reference" /* Reference */:
+                case "type" /* Type */:
+                case "lib" /* Lib */:
+                    (syntheticReferences || (syntheticReferences = [])).push(createUnparsedSyntheticReference(section, node));
+                    break;
+                // Ignore
+                case "prologue" /* Prologue */:
+                case "emitHelpers" /* EmitHelpers */:
+                case "prepend" /* Prepend */:
+                    break;
+                default:
+                    ts.Debug.assertNever(section);
+            }
+        }
+        node.texts = texts || ts.emptyArray;
+        node.helpers = ts.map(bundleFileInfo.sources && bundleFileInfo.sources.helpers, function (name) { return getAllUnscopedEmitHelpers().get(name); });
+        node.syntheticReferences = syntheticReferences;
+        return node;
+    }
+    function mapBundleFileSectionKindToSyntaxKind(kind) {
+        switch (kind) {
+            case "prologue" /* Prologue */: return 279 /* UnparsedPrologue */;
+            case "prepend" /* Prepend */: return 280 /* UnparsedPrepend */;
+            case "internal" /* Internal */: return 282 /* UnparsedInternalText */;
+            case "text" /* Text */: return 281 /* UnparsedText */;
+            case "emitHelpers" /* EmitHelpers */:
+            case "no-default-lib" /* NoDefaultLib */:
+            case "reference" /* Reference */:
+            case "type" /* Type */:
+            case "lib" /* Lib */:
+                return ts.Debug.fail("BundleFileSectionKind: " + kind + " not yet mapped to SyntaxKind");
+            default:
+                return ts.Debug.assertNever(kind);
+        }
+    }
+    function createUnparsedNode(section, parent) {
+        var node = ts.createNode(mapBundleFileSectionKindToSyntaxKind(section.kind), section.pos, section.end);
+        node.parent = parent;
+        node.data = section.data;
+        return node;
+    }
+    function createUnparsedSyntheticReference(section, parent) {
+        var node = ts.createNode(283 /* UnparsedSyntheticReference */, section.pos, section.end);
+        node.parent = parent;
+        node.data = section.data;
+        node.section = section;
+        return node;
+    }
+    function createInputFiles(javascriptTextOrReadFileText, declarationTextOrJavascriptPath, javascriptMapPath, javascriptMapTextOrDeclarationPath, declarationMapPath, declarationMapTextOrBuildInfoPath, javascriptPath, declarationPath, buildInfoPath, buildInfo, oldFileOfCurrentEmit) {
+        var node = ts.createNode(287 /* InputFiles */);
         if (!ts.isString(javascriptTextOrReadFileText)) {
             var cache_1 = ts.createMap();
             var textGetter_1 = function (path) {
@@ -61933,15 +62926,25 @@ var ts;
                 var result = textGetter_1(path);
                 return result !== undefined ? result : "/* Input file " + path + " was missing */\r\n";
             };
+            var buildInfo_1;
+            var getAndCacheBuildInfo_1 = function (getText) {
+                if (buildInfo_1 === undefined) {
+                    var result = getText();
+                    buildInfo_1 = result !== undefined ? ts.getBuildInfo(result) : false;
+                }
+                return buildInfo_1 || undefined;
+            };
             node.javascriptPath = declarationTextOrJavascriptPath;
             node.javascriptMapPath = javascriptMapPath;
             node.declarationPath = ts.Debug.assertDefined(javascriptMapTextOrDeclarationPath);
             node.declarationMapPath = declarationMapPath;
+            node.buildInfoPath = declarationMapTextOrBuildInfoPath;
             Object.defineProperties(node, {
                 javascriptText: { get: function () { return definedTextGetter_1(declarationTextOrJavascriptPath); } },
                 javascriptMapText: { get: function () { return textGetter_1(javascriptMapPath); } },
                 declarationText: { get: function () { return definedTextGetter_1(ts.Debug.assertDefined(javascriptMapTextOrDeclarationPath)); } },
-                declarationMapText: { get: function () { return textGetter_1(declarationMapPath); } } // TODO:: if there is inline sourceMap in dtsFile, use that
+                declarationMapText: { get: function () { return textGetter_1(declarationMapPath); } },
+                buildInfo: { get: function () { return getAndCacheBuildInfo_1(function () { return textGetter_1(declarationMapTextOrBuildInfoPath); }); } }
             });
         }
         else {
@@ -61950,7 +62953,12 @@ var ts;
             node.javascriptMapText = javascriptMapTextOrDeclarationPath;
             node.declarationText = declarationTextOrJavascriptPath;
             node.declarationMapPath = declarationMapPath;
-            node.declarationMapText = declarationMapText;
+            node.declarationMapText = declarationMapTextOrBuildInfoPath;
+            node.javascriptPath = javascriptPath;
+            node.declarationPath = declarationPath,
+                node.buildInfoPath = buildInfoPath;
+            node.buildInfo = buildInfo;
+            node.oldFileOfCurrentEmit = oldFileOfCurrentEmit;
         }
         return node;
     }
@@ -62088,10 +63096,10 @@ var ts;
                 // To avoid holding onto transformation artifacts, we keep track of any
                 // parse tree node we are annotating. This allows us to clean them up after
                 // all transformations have completed.
-                if (node.kind === 279 /* SourceFile */) {
+                if (node.kind === 284 /* SourceFile */) {
                     return node.emitNode = { annotatedNodes: [node] };
                 }
-                var sourceFile = ts.getSourceFileOfNode(node);
+                var sourceFile = ts.getSourceFileOfNode(ts.getParseTreeNode(ts.getSourceFileOfNode(node)));
                 getOrCreateEmitNode(sourceFile).annotatedNodes.push(node);
             }
             node.emitNode = {};
@@ -62389,7 +63397,7 @@ var ts;
     ts.nullTransformationContext = {
         enableEmitNotification: ts.noop,
         enableSubstitution: ts.noop,
-        endLexicalEnvironment: function () { return undefined; },
+        endLexicalEnvironment: ts.returnUndefined,
         getCompilerOptions: ts.notImplemented,
         getEmitHost: ts.notImplemented,
         getEmitResolver: ts.notImplemented,
@@ -62534,38 +63542,38 @@ var ts;
         return ts.setEmitFlags(ts.createIdentifier(name), 4096 /* HelperName */ | 2 /* AdviseOnEmitNode */);
     }
     ts.getHelperName = getHelperName;
-    var valuesHelper = {
+    ts.valuesHelper = {
         name: "typescript:values",
         scoped: false,
         text: "\n            var __values = (this && this.__values) || function (o) {\n                var m = typeof Symbol === \"function\" && o[Symbol.iterator], i = 0;\n                if (m) return m.call(o);\n                return {\n                    next: function () {\n                        if (o && i >= o.length) o = void 0;\n                        return { value: o && o[i++], done: !o };\n                    }\n                };\n            };"
     };
     function createValuesHelper(context, expression, location) {
-        context.requestEmitHelper(valuesHelper);
+        context.requestEmitHelper(ts.valuesHelper);
         return ts.setTextRange(ts.createCall(getHelperName("__values"), 
         /*typeArguments*/ undefined, [expression]), location);
     }
     ts.createValuesHelper = createValuesHelper;
-    var readHelper = {
+    ts.readHelper = {
         name: "typescript:read",
         scoped: false,
         text: "\n            var __read = (this && this.__read) || function (o, n) {\n                var m = typeof Symbol === \"function\" && o[Symbol.iterator];\n                if (!m) return o;\n                var i = m.call(o), r, ar = [], e;\n                try {\n                    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);\n                }\n                catch (error) { e = { error: error }; }\n                finally {\n                    try {\n                        if (r && !r.done && (m = i[\"return\"])) m.call(i);\n                    }\n                    finally { if (e) throw e.error; }\n                }\n                return ar;\n            };"
     };
     function createReadHelper(context, iteratorRecord, count, location) {
-        context.requestEmitHelper(readHelper);
+        context.requestEmitHelper(ts.readHelper);
         return ts.setTextRange(ts.createCall(getHelperName("__read"), 
         /*typeArguments*/ undefined, count !== undefined
             ? [iteratorRecord, ts.createLiteral(count)]
             : [iteratorRecord]), location);
     }
     ts.createReadHelper = createReadHelper;
-    var spreadHelper = {
+    ts.spreadHelper = {
         name: "typescript:spread",
         scoped: false,
         text: "\n            var __spread = (this && this.__spread) || function () {\n                for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));\n                return ar;\n            };"
     };
     function createSpreadHelper(context, argumentList, location) {
-        context.requestEmitHelper(readHelper);
-        context.requestEmitHelper(spreadHelper);
+        context.requestEmitHelper(ts.readHelper);
+        context.requestEmitHelper(ts.spreadHelper);
         return ts.setTextRange(ts.createCall(getHelperName("__spread"), 
         /*typeArguments*/ undefined, argumentList), location);
     }
@@ -63411,7 +64419,7 @@ var ts;
                 case 190 /* ElementAccessExpression */:
                 case 189 /* PropertyAccessExpression */:
                 case 213 /* NonNullExpression */:
-                case 308 /* PartiallyEmittedExpression */:
+                case 313 /* PartiallyEmittedExpression */:
                     node = node.expression;
                     continue;
             }
@@ -63427,7 +64435,7 @@ var ts;
     ts.parenthesizeConciseBody = parenthesizeConciseBody;
     function isCommaSequence(node) {
         return node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 27 /* CommaToken */ ||
-            node.kind === 309 /* CommaListExpression */;
+            node.kind === 314 /* CommaListExpression */;
     }
     ts.isCommaSequence = isCommaSequence;
     var OuterExpressionKinds;
@@ -63446,7 +64454,7 @@ var ts;
             case 212 /* AsExpression */:
             case 213 /* NonNullExpression */:
                 return (kinds & 2 /* Assertions */) !== 0;
-            case 308 /* PartiallyEmittedExpression */:
+            case 313 /* PartiallyEmittedExpression */:
                 return (kinds & 4 /* PartiallyEmittedExpressions */) !== 0;
         }
         return false;
@@ -63483,7 +64491,7 @@ var ts;
             case 194 /* TypeAssertionExpression */: return ts.updateTypeAssertion(outerExpression, outerExpression.type, expression);
             case 212 /* AsExpression */: return ts.updateAsExpression(outerExpression, expression, outerExpression.type);
             case 213 /* NonNullExpression */: return ts.updateNonNullExpression(outerExpression, expression);
-            case 308 /* PartiallyEmittedExpression */: return ts.updatePartiallyEmittedExpression(outerExpression, expression);
+            case 313 /* PartiallyEmittedExpression */: return ts.updatePartiallyEmittedExpression(outerExpression, expression);
         }
     }
     /**
@@ -64275,12 +65283,12 @@ var ts;
             case 278 /* EnumMember */:
                 return ts.updateEnumMember(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
             // Top-level nodes
-            case 279 /* SourceFile */:
+            case 284 /* SourceFile */:
                 return ts.updateSourceFileNode(node, visitLexicalEnvironment(node.statements, visitor, context));
             // Transformation nodes
-            case 308 /* PartiallyEmittedExpression */:
+            case 313 /* PartiallyEmittedExpression */:
                 return ts.updatePartiallyEmittedExpression(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 309 /* CommaListExpression */:
+            case 314 /* CommaListExpression */:
                 return ts.updateCommaList(node, nodesVisitor(node.elements, visitor, ts.isExpression));
             default:
                 // No need to visit nodes with no children.
@@ -64336,7 +65344,7 @@ var ts;
             case 220 /* EmptyStatement */:
             case 210 /* OmittedExpression */:
             case 236 /* DebuggerStatement */:
-            case 307 /* NotEmittedStatement */:
+            case 312 /* NotEmittedStatement */:
                 // No need to visit nodes with no children.
                 break;
             // Names
@@ -64713,14 +65721,14 @@ var ts;
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
             // Top-level nodes
-            case 279 /* SourceFile */:
+            case 284 /* SourceFile */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
             // Transformation nodes
-            case 308 /* PartiallyEmittedExpression */:
+            case 313 /* PartiallyEmittedExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 309 /* CommaListExpression */:
+            case 314 /* CommaListExpression */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
             default:
@@ -64734,8 +65742,8 @@ var ts;
             return statements;
         }
         return ts.isNodeArray(statements)
-            ? ts.setTextRange(ts.createNodeArray(ts.addStatementsAfterPrologue(statements.slice(), declarations)), statements)
-            : ts.addStatementsAfterPrologue(statements, declarations);
+            ? ts.setTextRange(ts.createNodeArray(ts.insertStatementsAfterStandardPrologue(statements.slice(), declarations)), statements)
+            : ts.insertStatementsAfterStandardPrologue(statements, declarations);
     }
     ts.mergeLexicalEnvironment = mergeLexicalEnvironment;
     /**
@@ -65001,7 +66009,7 @@ var ts;
             }
             exit();
         }
-        function appendSourceMap(generatedLine, generatedCharacter, map, sourceMapPath) {
+        function appendSourceMap(generatedLine, generatedCharacter, map, sourceMapPath, start, end) {
             var _a;
             ts.Debug.assert(generatedLine >= pendingGeneratedLine, "generatedLine cannot backtrack");
             ts.Debug.assert(generatedCharacter >= 0, "generatedCharacter cannot be negative");
@@ -65011,6 +66019,14 @@ var ts;
             var nameIndexToNewNameIndexMap;
             var mappingIterator = decodeMappings(map.mappings);
             for (var _b = mappingIterator.next(), raw = _b.value, done = _b.done; !done; _a = mappingIterator.next(), raw = _a.value, done = _a.done, _a) {
+                if (end && (raw.generatedLine > end.line ||
+                    (raw.generatedLine === end.line && raw.generatedCharacter > end.character))) {
+                    break;
+                }
+                if (start && (raw.generatedLine < start.line ||
+                    (start.line === raw.generatedLine && raw.generatedCharacter < start.character))) {
+                    continue;
+                }
                 // Then reencode all the updated mappings into the overall map
                 var newSourceIndex = void 0;
                 var newSourceLine = void 0;
@@ -65039,8 +66055,10 @@ var ts;
                         }
                     }
                 }
-                var newGeneratedLine = raw.generatedLine + generatedLine;
-                var newGeneratedCharacter = raw.generatedLine === 0 ? raw.generatedCharacter + generatedCharacter : raw.generatedCharacter;
+                var rawGeneratedLine = raw.generatedLine - (start ? start.line : 0);
+                var newGeneratedLine = rawGeneratedLine + generatedLine;
+                var rawGeneratedCharacter = start && start.line === raw.generatedLine ? raw.generatedCharacter - start.character : raw.generatedCharacter;
+                var newGeneratedCharacter = rawGeneratedLine === 0 ? rawGeneratedCharacter + generatedCharacter : rawGeneratedCharacter;
                 addMapping(newGeneratedLine, newGeneratedCharacter, newSourceIndex, newSourceLine, newSourceCharacter, newNameIndex);
             }
             exit();
@@ -65523,7 +66541,7 @@ var ts;
     function chainBundle(transformSourceFile) {
         return transformSourceFileOrBundle;
         function transformSourceFileOrBundle(node) {
-            return node.kind === 279 /* SourceFile */ ? transformSourceFile(node) : transformBundle(node);
+            return node.kind === 284 /* SourceFile */ ? transformSourceFile(node) : transformBundle(node);
         }
         function transformBundle(node) {
             return ts.createBundle(ts.map(node.sourceFiles, transformSourceFile), node.prepends);
@@ -65999,8 +67017,8 @@ var ts;
             if (!ts.getRestIndicatorOfBindingOrAssignmentElement(element)) {
                 var propertyName = ts.getPropertyNameOfBindingOrAssignmentElement(element);
                 if (flattenContext.level >= 1 /* ObjectRest */
-                    && !(element.transformFlags & (131072 /* ContainsRestOrSpread */ | 262144 /* ContainsObjectRestOrSpread */))
-                    && !(ts.getTargetOfBindingOrAssignmentElement(element).transformFlags & (131072 /* ContainsRestOrSpread */ | 262144 /* ContainsObjectRestOrSpread */))
+                    && !(element.transformFlags & (4096 /* ContainsRestOrSpread */ | 8192 /* ContainsObjectRestOrSpread */))
+                    && !(ts.getTargetOfBindingOrAssignmentElement(element).transformFlags & (4096 /* ContainsRestOrSpread */ | 8192 /* ContainsObjectRestOrSpread */))
                     && !ts.isComputedPropertyName(propertyName)) {
                     bindingElements = ts.append(bindingElements, element);
                 }
@@ -66066,7 +67084,7 @@ var ts;
             if (flattenContext.level >= 1 /* ObjectRest */) {
                 // If an array pattern contains an ObjectRest, we must cache the result so that we
                 // can perform the ObjectRest destructuring in a different declaration
-                if (element.transformFlags & 262144 /* ContainsObjectRestOrSpread */) {
+                if (element.transformFlags & 8192 /* ContainsObjectRestOrSpread */) {
                     var temp = ts.createTempVariable(/*recordTempVariable*/ undefined);
                     if (flattenContext.hoistTempVariables) {
                         flattenContext.context.hoistVariableDeclaration(temp);
@@ -66184,7 +67202,7 @@ var ts;
     function makeAssignmentElement(name) {
         return name;
     }
-    var restHelper = {
+    ts.restHelper = {
         name: "typescript:rest",
         scoped: false,
         text: "\n            var __rest = (this && this.__rest) || function (s, e) {\n                var t = {};\n                for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)\n                    t[p] = s[p];\n                if (s != null && typeof Object.getOwnPropertySymbols === \"function\")\n                    for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)\n                        t[p[i]] = s[p[i]];\n                return t;\n            };"
@@ -66193,7 +67211,7 @@ var ts;
      * `{ a, b, ...p } = o`, create `p = __rest(o, ["a", "b"]);`
      */
     function createRestCall(context, value, elements, computedTempVariables, location) {
-        context.requestEmitHelper(restHelper);
+        context.requestEmitHelper(ts.restHelper);
         var propertyNames = [];
         var computedTempVariableOffset = 0;
         for (var i = 0; i < elements.length - 1; i++) {
@@ -66294,14 +67312,14 @@ var ts;
         var pendingExpressions;
         return transformSourceFileOrBundle;
         function transformSourceFileOrBundle(node) {
-            if (node.kind === 280 /* Bundle */) {
+            if (node.kind === 285 /* Bundle */) {
                 return transformBundle(node);
             }
             return transformSourceFile(node);
         }
         function transformBundle(node) {
             return ts.createBundle(node.sourceFiles.map(transformSourceFile), ts.mapDefined(node.prepends, function (prepend) {
-                if (prepend.kind === 282 /* InputFiles */) {
+                if (prepend.kind === 287 /* InputFiles */) {
                     return ts.createUnparsedSourceFile(prepend, "js");
                 }
                 return prepend;
@@ -66350,7 +67368,7 @@ var ts;
          */
         function onBeforeVisitNode(node) {
             switch (node.kind) {
-                case 279 /* SourceFile */:
+                case 284 /* SourceFile */:
                 case 246 /* CaseBlock */:
                 case 245 /* ModuleBlock */:
                 case 218 /* Block */:
@@ -66394,14 +67412,9 @@ var ts;
          * @param node The node to visit.
          */
         function visitorWorker(node) {
-            if (node.transformFlags & 1 /* TypeScript */) {
-                // This node is explicitly marked as TypeScript, so we should transform the node.
+            if (node.transformFlags & 1 /* ContainsTypeScript */) {
                 return visitTypeScript(node);
             }
-            else if (node.transformFlags & 2 /* ContainsTypeScript */) {
-                // This node contains TypeScript, so we should visit its children.
-                return ts.visitEachChild(node, visitor, context);
-            }
             return node;
         }
         /**
@@ -66435,7 +67448,7 @@ var ts;
                 // As the type information we would attempt to lookup to perform ellision is potentially unavailable for the synthesized nodes
                 // We do not reuse `visitorWorker`, as the ellidable statement syntax kinds are technically unrecognized by the switch-case in `visitTypeScript`,
                 // and will trigger debug failures when debug verbosity is turned up
-                if (node.transformFlags & 2 /* ContainsTypeScript */) {
+                if (node.transformFlags & 1 /* ContainsTypeScript */) {
                     // This node contains TypeScript, so we should visit its children.
                     return ts.visitEachChild(node, visitor, context);
                 }
@@ -66477,15 +67490,9 @@ var ts;
                 // do not emit ES6 imports and exports since they are illegal inside a namespace
                 return undefined;
             }
-            else if (node.transformFlags & 1 /* TypeScript */ || ts.hasModifier(node, 1 /* Export */)) {
-                // This node is explicitly marked as TypeScript, or is exported at the namespace
-                // level, so we should transform the node.
+            else if (node.transformFlags & 1 /* ContainsTypeScript */ || ts.hasModifier(node, 1 /* Export */)) {
                 return visitTypeScript(node);
             }
-            else if (node.transformFlags & 2 /* ContainsTypeScript */) {
-                // This node contains TypeScript, so we should visit its children.
-                return ts.visitEachChild(node, visitor, context);
-            }
             return node;
         }
         /**
@@ -66536,7 +67543,7 @@ var ts;
          * @param node The node to visit.
          */
         function visitTypeScript(node) {
-            if (ts.hasModifier(node, 2 /* Ambient */) && ts.isStatement(node)) {
+            if (ts.isStatement(node) && ts.hasModifier(node, 2 /* Ambient */)) {
                 // TypeScript ambient declarations are elided, but some comments may be preserved.
                 // See the implementation of `getLeadingComments` in comments.ts for more details.
                 return ts.createNotEmittedStatement(node);
@@ -66603,7 +67610,7 @@ var ts;
                     // See the implementation of `getLeadingComments` in comments.ts for more details.
                     return ts.createNotEmittedStatement(node);
                 case 240 /* ClassDeclaration */:
-                    // This is a class declaration with TypeScript syntax extensions.
+                    // This may be a class declaration with TypeScript syntax extensions.
                     //
                     // TypeScript class syntax extensions include:
                     // - decorators
@@ -66614,7 +67621,7 @@ var ts;
                     // - method overload signatures
                     return visitClassDeclaration(node);
                 case 209 /* ClassExpression */:
-                    // This is a class expression with TypeScript syntax extensions.
+                    // This may be a class expression with TypeScript syntax extensions.
                     //
                     // TypeScript class syntax extensions include:
                     // - decorators
@@ -66625,7 +67632,7 @@ var ts;
                     // - method overload signatures
                     return visitClassExpression(node);
                 case 273 /* HeritageClause */:
-                    // This is a heritage clause with TypeScript syntax extensions.
+                    // This may be a heritage clause with TypeScript syntax extensions.
                     //
                     // TypeScript heritage clause extensions include:
                     // - `implements` clause
@@ -66653,7 +67660,7 @@ var ts;
                     // TypeScript arrow functions can have modifiers and type annotations.
                     return visitArrowFunction(node);
                 case 151 /* Parameter */:
-                    // This is a parameter declaration with TypeScript syntax extensions.
+                    // This may be a parameter declaration with TypeScript syntax extensions.
                     //
                     // TypeScript parameter declaration syntax extensions include:
                     // - decorators
@@ -66694,7 +67701,8 @@ var ts;
                     // TypeScript namespace or external module import.
                     return visitImportEqualsDeclaration(node);
                 default:
-                    return ts.Debug.failBadSyntaxKind(node);
+                    // node contains some other TypeScript syntax
+                    return ts.visitEachChild(node, visitor, context);
             }
         }
         function visitSourceFile(node) {
@@ -66743,18 +67751,19 @@ var ts;
                 facts |= 128 /* UseImmediatelyInvokedFunctionExpression */;
             return facts;
         }
-        /**
-         * Transforms a class declaration with TypeScript syntax into compatible ES6.
-         *
-         * This function will only be called when one of the following conditions are met:
-         * - The class has decorators.
-         * - The class has property declarations with initializers.
-         * - The class contains a constructor that contains parameters with accessibility modifiers.
-         * - The class is an export in a TypeScript namespace.
-         *
-         * @param node The node to transform.
-         */
+        function hasTypeScriptClassSyntax(node) {
+            return !!(node.transformFlags & 1024 /* ContainsTypeScriptClassSyntax */);
+        }
+        function isClassLikeDeclarationWithTypeScriptSyntax(node) {
+            return ts.some(node.decorators)
+                || ts.some(node.typeParameters)
+                || ts.some(node.heritageClauses, hasTypeScriptClassSyntax)
+                || ts.some(node.members, hasTypeScriptClassSyntax);
+        }
         function visitClassDeclaration(node) {
+            if (!isClassLikeDeclarationWithTypeScriptSyntax(node) && !(currentNamespace && ts.hasModifier(node, 1 /* Export */))) {
+                return ts.visitEachChild(node, visitor, context);
+            }
             var savedPendingExpressions = pendingExpressions;
             pendingExpressions = undefined;
             var staticProperties = getInitializedProperties(node, /*isStatic*/ true);
@@ -66807,7 +67816,7 @@ var ts;
                 statement.pos = closingBraceLocation.pos;
                 ts.setEmitFlags(statement, 1536 /* NoComments */ | 384 /* NoTokenSourceMaps */);
                 statements.push(statement);
-                ts.addStatementsAfterPrologue(statements, context.endLexicalEnvironment());
+                ts.insertStatementsAfterStandardPrologue(statements, context.endLexicalEnvironment());
                 var iife = ts.createImmediatelyInvokedArrowFunction(statements);
                 ts.setEmitFlags(iife, 33554432 /* TypeScriptClassWrapper */);
                 var varStatement = ts.createVariableStatement(
@@ -66984,16 +67993,10 @@ var ts;
             ts.setCommentRange(statement, node);
             return statement;
         }
-        /**
-         * Transforms a class expression with TypeScript syntax into compatible ES6.
-         *
-         * This function will only be called when one of the following conditions are met:
-         * - The class has property declarations with initializers.
-         * - The class contains a constructor that contains parameters with accessibility modifiers.
-         *
-         * @param node The node to transform.
-         */
         function visitClassExpression(node) {
+            if (!isClassLikeDeclarationWithTypeScriptSyntax(node)) {
+                return ts.visitEachChild(node, visitor, context);
+            }
             var savedPendingExpressions = pendingExpressions;
             pendingExpressions = undefined;
             var staticProperties = getInitializedProperties(node, /*isStatic*/ true);
@@ -67057,7 +68060,7 @@ var ts;
             var constructor = ts.getFirstConstructorWithBody(node);
             var hasInstancePropertyWithInitializer = ts.forEach(node.members, isInstanceInitializedProperty);
             var hasParameterPropertyAssignments = constructor &&
-                constructor.transformFlags & 4096 /* ContainsTypeScriptClassSyntax */ &&
+                constructor.transformFlags & 1024 /* ContainsTypeScriptClassSyntax */ &&
                 ts.forEach(constructor.parameters, isParameterWithPropertyAssignment);
             // If the class does not contain nodes that require a synthesized constructor,
             // accept the current constructor if it exists.
@@ -67348,11 +68351,14 @@ var ts;
             var decorators;
             if (node) {
                 var parameters = node.parameters;
-                for (var i = 0; i < parameters.length; i++) {
-                    var parameter = parameters[i];
+                var firstParameterIsThis = parameters.length > 0 && ts.parameterIsThisKeyword(parameters[0]);
+                var firstParameterOffset = firstParameterIsThis ? 1 : 0;
+                var numParameters = firstParameterIsThis ? parameters.length - 1 : parameters.length;
+                for (var i = 0; i < numParameters; i++) {
+                    var parameter = parameters[i + firstParameterOffset];
                     if (decorators || parameter.decorators) {
                         if (!decorators) {
-                            decorators = new Array(parameters.length);
+                            decorators = new Array(numParameters);
                         }
                         decorators[i] = parameter.decorators;
                     }
@@ -67852,8 +68858,12 @@ var ts;
                     return serializeTypeList(node.types);
                 case 175 /* ConditionalType */:
                     return serializeTypeList([node.trueType, node.falseType]);
-                case 167 /* TypeQuery */:
                 case 179 /* TypeOperator */:
+                    if (node.operator === 133 /* ReadonlyKeyword */) {
+                        return serializeTypeNode(node.type);
+                    }
+                    break;
+                case 167 /* TypeQuery */:
                 case 180 /* IndexedAccessType */:
                 case 181 /* MappedType */:
                 case 168 /* TypeLiteral */:
@@ -67871,8 +68881,8 @@ var ts;
             // Note when updating logic here also update getEntityNameForDecoratorMetadata
             // so that aliases can be marked as referenced
             var serializedUnion;
-            for (var _i = 0, types_17 = types; _i < types_17.length; _i++) {
-                var typeNode = types_17[_i];
+            for (var _i = 0, types_18 = types; _i < types_18.length; _i++) {
+                var typeNode = types_18[_i];
                 while (typeNode.kind === 177 /* ParenthesizedType */) {
                     typeNode = typeNode.type; // Skip parens if need be
                 }
@@ -68014,7 +69024,7 @@ var ts;
          * available.
          */
         function getGlobalBigIntNameWithFallback() {
-            return languageVersion < 6 /* ESNext */
+            return languageVersion < 7 /* ESNext */
                 ? ts.createConditional(ts.createTypeCheck(ts.createIdentifier("BigInt"), "function"), ts.createIdentifier("BigInt"), ts.createIdentifier("Object"))
                 : ts.createIdentifier("BigInt");
         }
@@ -68098,11 +69108,11 @@ var ts;
          * @param node The HeritageClause to transform.
          */
         function visitHeritageClause(node) {
-            if (node.token === 86 /* ExtendsKeyword */) {
-                var types = ts.visitNodes(node.types, visitor, ts.isExpressionWithTypeArguments, 0, 1);
-                return ts.setTextRange(ts.createHeritageClause(86 /* ExtendsKeyword */, types), node);
+            if (node.token === 109 /* ImplementsKeyword */) {
+                // implements clauses are elided
+                return undefined;
             }
-            return undefined;
+            return ts.visitEachChild(node, visitor, context);
         }
         /**
          * Transforms an ExpressionWithTypeArguments with TypeScript syntax.
@@ -68138,16 +69148,6 @@ var ts;
             }
             return ts.updateConstructor(node, ts.visitNodes(node.decorators, visitor, ts.isDecorator), ts.visitNodes(node.modifiers, visitor, ts.isModifier), ts.visitParameterList(node.parameters, visitor, context), ts.visitFunctionBody(node.body, visitor, context));
         }
-        /**
-         * Visits a method declaration of a class.
-         *
-         * This function will be called when one of the following conditions are met:
-         * - The node is an overload
-         * - The node is marked as abstract, public, private, protected, or readonly
-         * - The node has a computed property name
-         *
-         * @param node The method node.
-         */
         function visitMethodDeclaration(node) {
             if (!shouldEmitFunctionLikeDeclaration(node)) {
                 return undefined;
@@ -68174,15 +69174,6 @@ var ts;
         function shouldEmitAccessorDeclaration(node) {
             return !(ts.nodeIsMissing(node.body) && ts.hasModifier(node, 128 /* Abstract */));
         }
-        /**
-         * Visits a get accessor declaration of a class.
-         *
-         * This function will be called when one of the following conditions are met:
-         * - The node is marked as abstract, public, private, or protected
-         * - The node has a computed property name
-         *
-         * @param node The get accessor node.
-         */
         function visitGetAccessor(node) {
             if (!shouldEmitAccessorDeclaration(node)) {
                 return undefined;
@@ -68198,15 +69189,6 @@ var ts;
             }
             return updated;
         }
-        /**
-         * Visits a set accessor declaration of a class.
-         *
-         * This function will be called when one of the following conditions are met:
-         * - The node is marked as abstract, public, private, or protected
-         * - The node has a computed property name
-         *
-         * @param node The set accessor node.
-         */
         function visitSetAccessor(node) {
             if (!shouldEmitAccessorDeclaration(node)) {
                 return undefined;
@@ -68221,16 +69203,6 @@ var ts;
             }
             return updated;
         }
-        /**
-         * Visits a function declaration.
-         *
-         * This function will be called when one of the following conditions are met:
-         * - The node is an overload
-         * - The node is exported from a TypeScript namespace
-         * - The node has decorators
-         *
-         * @param node The function node.
-         */
         function visitFunctionDeclaration(node) {
             if (!shouldEmitFunctionLikeDeclaration(node)) {
                 return ts.createNotEmittedStatement(node);
@@ -68246,14 +69218,6 @@ var ts;
             }
             return updated;
         }
-        /**
-         * Visits a function expression node.
-         *
-         * This function will be called when one of the following conditions are met:
-         * - The node has type annotations
-         *
-         * @param node The function expression node.
-         */
         function visitFunctionExpression(node) {
             if (!shouldEmitFunctionLikeDeclaration(node)) {
                 return ts.createOmittedExpression();
@@ -68263,51 +69227,31 @@ var ts;
             /*type*/ undefined, ts.visitFunctionBody(node.body, visitor, context) || ts.createBlock([]));
             return updated;
         }
-        /**
-         * @remarks
-         * This function will be called when one of the following conditions are met:
-         * - The node has type annotations
-         */
         function visitArrowFunction(node) {
             var updated = ts.updateArrowFunction(node, ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), 
             /*typeParameters*/ undefined, ts.visitParameterList(node.parameters, visitor, context), 
             /*type*/ undefined, node.equalsGreaterThanToken, ts.visitFunctionBody(node.body, visitor, context));
             return updated;
         }
-        /**
-         * Visits a parameter declaration node.
-         *
-         * This function will be called when one of the following conditions are met:
-         * - The node has an accessibility modifier.
-         * - The node has a questionToken.
-         * - The node's kind is ThisKeyword.
-         *
-         * @param node The parameter declaration node.
-         */
         function visitParameter(node) {
             if (ts.parameterIsThisKeyword(node)) {
                 return undefined;
             }
-            var parameter = ts.createParameter(
+            var updated = ts.updateParameter(node, 
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, node.dotDotDotToken, ts.visitNode(node.name, visitor, ts.isBindingName), 
             /*questionToken*/ undefined, 
             /*type*/ undefined, ts.visitNode(node.initializer, visitor, ts.isExpression));
-            // While we emit the source map for the node after skipping decorators and modifiers,
-            // we need to emit the comments for the original range.
-            ts.setOriginalNode(parameter, node);
-            ts.setTextRange(parameter, ts.moveRangePastModifiers(node));
-            ts.setCommentRange(parameter, node);
-            ts.setSourceMapRange(parameter, ts.moveRangePastModifiers(node));
-            ts.setEmitFlags(parameter.name, 32 /* NoTrailingSourceMap */);
-            return parameter;
+            if (updated !== node) {
+                // While we emit the source map for the node after skipping decorators and modifiers,
+                // we need to emit the comments for the original range.
+                ts.setCommentRange(updated, node);
+                ts.setTextRange(updated, ts.moveRangePastModifiers(node));
+                ts.setSourceMapRange(updated, ts.moveRangePastModifiers(node));
+                ts.setEmitFlags(updated.name, 32 /* NoTrailingSourceMap */);
+            }
+            return updated;
         }
-        /**
-         * Visits a variable statement in a namespace.
-         *
-         * This function will be called when one of the following conditions are met:
-         * - The node is exported from a TypeScript namespace.
-         */
         function visitVariableStatement(node) {
             if (isExportOfNamespace(node)) {
                 var variables = ts.getInitializedVariables(node.declarationList);
@@ -68336,12 +69280,6 @@ var ts;
             return ts.updateVariableDeclaration(node, ts.visitNode(node.name, visitor, ts.isBindingName), 
             /*type*/ undefined, ts.visitNode(node.initializer, visitor, ts.isExpression));
         }
-        /**
-         * Visits a parenthesized expression that contains either a type assertion or an `as`
-         * expression.
-         *
-         * @param node The parenthesized expression node.
-         */
         function visitParenthesizedExpression(node) {
             var innerExpression = ts.skipOuterExpressions(node.expression, ~2 /* Assertions */);
             if (ts.isAssertionExpression(innerExpression)) {
@@ -68478,7 +69416,7 @@ var ts;
             var statements = [];
             startLexicalEnvironment();
             var members = ts.map(node.members, transformEnumMember);
-            ts.addStatementsAfterPrologue(statements, endLexicalEnvironment());
+            ts.insertStatementsAfterStandardPrologue(statements, endLexicalEnvironment());
             ts.addRange(statements, members);
             currentNamespaceContainerName = savedCurrentNamespaceLocalName;
             return ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), /*location*/ node.members), 
@@ -68577,7 +69515,7 @@ var ts;
             // enums in any other scope are emitted as a `let` declaration.
             var statement = ts.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.createVariableDeclarationList([
                 ts.createVariableDeclaration(ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true))
-            ], currentLexicalScope.kind === 279 /* SourceFile */ ? 0 /* None */ : 1 /* Let */));
+            ], currentLexicalScope.kind === 284 /* SourceFile */ ? 0 /* None */ : 1 /* Let */));
             ts.setOriginalNode(statement, node);
             recordEmittedDeclarationInScope(node);
             if (isFirstEmittedDeclarationInScope(node)) {
@@ -68725,7 +69663,7 @@ var ts;
                 var moduleBlock = getInnerMostModuleDeclarationFromDottedModule(node).body;
                 statementsLocation = ts.moveRangePos(moduleBlock.statements, -1);
             }
-            ts.addStatementsAfterPrologue(statements, endLexicalEnvironment());
+            ts.insertStatementsAfterStandardPrologue(statements, endLexicalEnvironment());
             currentNamespaceContainerName = savedCurrentNamespaceContainerName;
             currentNamespace = savedCurrentNamespace;
             currentScopeFirstDeclarationsOfName = savedCurrentScopeFirstDeclarationsOfName;
@@ -69142,7 +70080,7 @@ var ts;
                 // If we are nested within a namespace declaration, we may need to qualifiy
                 // an identifier that is exported from a merged namespace.
                 var container = resolver.getReferencedExportContainer(node, /*prefixLocals*/ false);
-                if (container && container.kind !== 279 /* SourceFile */) {
+                if (container && container.kind !== 284 /* SourceFile */) {
                     var substitute = (applicableSubstitutions & 2 /* NamespaceExports */ && container.kind === 244 /* ModuleDeclaration */) ||
                         (applicableSubstitutions & 8 /* NonQualifiedEnumMembers */ && container.kind === 243 /* EnumDeclaration */);
                     if (substitute) {
@@ -69193,39 +70131,39 @@ var ts;
                 argumentsArray.push(descriptor);
             }
         }
-        context.requestEmitHelper(decorateHelper);
+        context.requestEmitHelper(ts.decorateHelper);
         return ts.setTextRange(ts.createCall(ts.getHelperName("__decorate"), 
         /*typeArguments*/ undefined, argumentsArray), location);
     }
-    var decorateHelper = {
+    ts.decorateHelper = {
         name: "typescript:decorate",
         scoped: false,
         priority: 2,
         text: "\n            var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {\n                var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\n                if (typeof Reflect === \"object\" && typeof Reflect.decorate === \"function\") r = Reflect.decorate(decorators, target, key, desc);\n                else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;\n                return c > 3 && r && Object.defineProperty(target, key, r), r;\n            };"
     };
     function createMetadataHelper(context, metadataKey, metadataValue) {
-        context.requestEmitHelper(metadataHelper);
+        context.requestEmitHelper(ts.metadataHelper);
         return ts.createCall(ts.getHelperName("__metadata"), 
         /*typeArguments*/ undefined, [
             ts.createLiteral(metadataKey),
             metadataValue
         ]);
     }
-    var metadataHelper = {
+    ts.metadataHelper = {
         name: "typescript:metadata",
         scoped: false,
         priority: 3,
         text: "\n            var __metadata = (this && this.__metadata) || function (k, v) {\n                if (typeof Reflect === \"object\" && typeof Reflect.metadata === \"function\") return Reflect.metadata(k, v);\n            };"
     };
     function createParamHelper(context, expression, parameterOffset, location) {
-        context.requestEmitHelper(paramHelper);
+        context.requestEmitHelper(ts.paramHelper);
         return ts.setTextRange(ts.createCall(ts.getHelperName("__param"), 
         /*typeArguments*/ undefined, [
             ts.createLiteral(parameterOffset),
             expression
         ]), location);
     }
-    var paramHelper = {
+    ts.paramHelper = {
         name: "typescript:param",
         scoped: false,
         priority: 4,
@@ -69280,7 +70218,7 @@ var ts;
             return visited;
         }
         function visitor(node) {
-            if ((node.transformFlags & 16 /* ContainsES2017 */) === 0) {
+            if ((node.transformFlags & 32 /* ContainsES2017 */) === 0) {
                 return node;
             }
             switch (node.kind) {
@@ -69550,22 +70488,26 @@ var ts;
             }
             var savedCapturedSuperProperties = capturedSuperProperties;
             var savedHasSuperElementAccess = hasSuperElementAccess;
-            capturedSuperProperties = ts.createUnderscoreEscapedMap();
-            hasSuperElementAccess = false;
+            if (!isArrowFunction) {
+                capturedSuperProperties = ts.createUnderscoreEscapedMap();
+                hasSuperElementAccess = false;
+            }
             var result;
             if (!isArrowFunction) {
                 var statements = [];
                 var statementOffset = ts.addPrologue(statements, node.body.statements, /*ensureUseStrict*/ false, visitor);
                 statements.push(ts.createReturn(createAwaiterHelper(context, hasLexicalArguments, promiseConstructor, transformAsyncFunctionBodyWorker(node.body, statementOffset))));
-                ts.addStatementsAfterPrologue(statements, endLexicalEnvironment());
+                ts.insertStatementsAfterStandardPrologue(statements, endLexicalEnvironment());
                 // Minor optimization, emit `_super` helper to capture `super` access in an arrow.
                 // This step isn't needed if we eventually transform this to ES5.
                 var emitSuperHelpers = languageVersion >= 2 /* ES2015 */ && resolver.getNodeCheckFlags(node) & (4096 /* AsyncMethodWithSuperBinding */ | 2048 /* AsyncMethodWithSuper */);
                 if (emitSuperHelpers) {
                     enableSubstitutionForAsyncMethodsWithSuper();
-                    var variableStatement = createSuperAccessVariableStatement(resolver, node, capturedSuperProperties);
-                    substitutedSuperAccessors[ts.getNodeId(variableStatement)] = true;
-                    ts.addStatementsAfterPrologue(statements, [variableStatement]);
+                    if (ts.hasEntries(capturedSuperProperties)) {
+                        var variableStatement = createSuperAccessVariableStatement(resolver, node, capturedSuperProperties);
+                        substitutedSuperAccessors[ts.getNodeId(variableStatement)] = true;
+                        ts.insertStatementsAfterStandardPrologue(statements, [variableStatement]);
+                    }
                 }
                 var block = ts.createBlock(statements, /*multiLine*/ true);
                 ts.setTextRange(block, node.body);
@@ -69592,8 +70534,10 @@ var ts;
                 }
             }
             enclosingFunctionParameterNames = savedEnclosingFunctionParameterNames;
-            capturedSuperProperties = savedCapturedSuperProperties;
-            hasSuperElementAccess = savedHasSuperElementAccess;
+            if (!isArrowFunction) {
+                capturedSuperProperties = savedCapturedSuperProperties;
+                hasSuperElementAccess = savedHasSuperElementAccess;
+            }
             return result;
         }
         function transformAsyncFunctionBodyWorker(body, start) {
@@ -69746,7 +70690,7 @@ var ts;
             /* typeParameters */ undefined, 
             /* parameters */ [], 
             /* type */ undefined, 
-            /* equalsGreaterThanToken */ undefined, ts.createPropertyAccess(ts.createSuper(), name))));
+            /* equalsGreaterThanToken */ undefined, ts.setEmitFlags(ts.createPropertyAccess(ts.setEmitFlags(ts.createSuper(), 4 /* NoSubstitution */), name), 4 /* NoSubstitution */))));
             if (hasBinding) {
                 getterAndSetter.push(ts.createPropertyAssignment("set", ts.createArrowFunction(
                 /* modifiers */ undefined, 
@@ -69761,7 +70705,7 @@ var ts;
                     /* initializer */ undefined)
                 ], 
                 /* type */ undefined, 
-                /* equalsGreaterThanToken */ undefined, ts.createAssignment(ts.createPropertyAccess(ts.createSuper(), name), ts.createIdentifier("v")))));
+                /* equalsGreaterThanToken */ undefined, ts.createAssignment(ts.setEmitFlags(ts.createPropertyAccess(ts.setEmitFlags(ts.createSuper(), 4 /* NoSubstitution */), name), 4 /* NoSubstitution */), ts.createIdentifier("v")))));
             }
             accessors.push(ts.createPropertyAssignment(name, ts.createObjectLiteral(getterAndSetter)));
         });
@@ -69776,14 +70720,14 @@ var ts;
         ], 2 /* Const */));
     }
     ts.createSuperAccessVariableStatement = createSuperAccessVariableStatement;
-    var awaiterHelper = {
+    ts.awaiterHelper = {
         name: "typescript:awaiter",
         scoped: false,
         priority: 5,
         text: "\n            var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n                return new (P || (P = Promise))(function (resolve, reject) {\n                    function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n                    function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n                    function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }\n                    step((generator = generator.apply(thisArg, _arguments || [])).next());\n                });\n            };"
     };
     function createAwaiterHelper(context, hasLexicalArguments, promiseConstructor, body) {
-        context.requestEmitHelper(awaiterHelper);
+        context.requestEmitHelper(ts.awaiterHelper);
         var generatorFunc = ts.createFunctionExpression(
         /*modifiers*/ undefined, ts.createToken(40 /* AsteriskToken */), 
         /*name*/ undefined, 
@@ -69819,7 +70763,7 @@ var ts;
         /** Enables substitutions for async methods with `super` calls. */
         ESNextSubstitutionFlags[ESNextSubstitutionFlags["AsyncMethodsWithSuper"] = 1] = "AsyncMethodsWithSuper";
     })(ESNextSubstitutionFlags || (ESNextSubstitutionFlags = {}));
-    function transformESNext(context) {
+    function transformES2018(context) {
         var resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
         var resolver = context.getEmitResolver();
         var compilerOptions = context.getCompilerOptions();
@@ -69859,7 +70803,7 @@ var ts;
             return node;
         }
         function visitorWorker(node, noDestructuringValue) {
-            if ((node.transformFlags & 8 /* ContainsESNext */) === 0) {
+            if ((node.transformFlags & 16 /* ContainsES2018 */) === 0) {
                 return node;
             }
             switch (node.kind) {
@@ -69903,8 +70847,6 @@ var ts;
                     return visitExpressionStatement(node);
                 case 195 /* ParenthesizedExpression */:
                     return visitParenthesizedExpression(node, noDestructuringValue);
-                case 274 /* CatchClause */:
-                    return visitCatchClause(node);
                 case 189 /* PropertyAccessExpression */:
                     if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 98 /* SuperKeyword */) {
                         capturedSuperProperties.set(node.name.escapedText, true);
@@ -69979,7 +70921,7 @@ var ts;
             return objects;
         }
         function visitObjectLiteralExpression(node) {
-            if (node.transformFlags & 262144 /* ContainsObjectRestOrSpread */) {
+            if (node.transformFlags & 8192 /* ContainsObjectRestOrSpread */) {
                 // spread elements emit like so:
                 // non-spread elements are chunked together into object literals, and then all are passed to __assign:
                 //     { a, ...o, b } => __assign({a}, o, {b});
@@ -69999,19 +70941,13 @@ var ts;
         function visitParenthesizedExpression(node, noDestructuringValue) {
             return ts.visitEachChild(node, noDestructuringValue ? visitorNoDestructuringValue : visitor, context);
         }
-        function visitCatchClause(node) {
-            if (!node.variableDeclaration) {
-                return ts.updateCatchClause(node, ts.createVariableDeclaration(ts.createTempVariable(/*recordTempVariable*/ undefined)), ts.visitNode(node.block, visitor, ts.isBlock));
-            }
-            return ts.visitEachChild(node, visitor, context);
-        }
         /**
          * Visits a BinaryExpression that contains a destructuring assignment.
          *
          * @param node A BinaryExpression node.
          */
         function visitBinaryExpression(node, noDestructuringValue) {
-            if (ts.isDestructuringAssignment(node) && node.left.transformFlags & 262144 /* ContainsObjectRestOrSpread */) {
+            if (ts.isDestructuringAssignment(node) && node.left.transformFlags & 8192 /* ContainsObjectRestOrSpread */) {
                 return ts.flattenDestructuringAssignment(node, visitor, context, 1 /* ObjectRest */, !noDestructuringValue);
             }
             else if (node.operatorToken.kind === 27 /* CommaToken */) {
@@ -70026,7 +70962,7 @@ var ts;
          */
         function visitVariableDeclaration(node) {
             // If we are here it is because the name contains a binding pattern with a rest somewhere in it.
-            if (ts.isBindingPattern(node.name) && node.name.transformFlags & 262144 /* ContainsObjectRestOrSpread */) {
+            if (ts.isBindingPattern(node.name) && node.name.transformFlags & 8192 /* ContainsObjectRestOrSpread */) {
                 return ts.flattenDestructuringBinding(node, visitor, context, 1 /* ObjectRest */);
             }
             return ts.visitEachChild(node, visitor, context);
@@ -70043,7 +70979,7 @@ var ts;
          * @param node A ForOfStatement.
          */
         function visitForOfStatement(node, outermostLabeledStatement) {
-            if (node.initializer.transformFlags & 262144 /* ContainsObjectRestOrSpread */) {
+            if (node.initializer.transformFlags & 8192 /* ContainsObjectRestOrSpread */) {
                 node = transformForOfStatementWithObjectRest(node);
             }
             if (node.awaitModifier) {
@@ -70140,7 +71076,7 @@ var ts;
             ]));
         }
         function visitParameter(node) {
-            if (node.transformFlags & 262144 /* ContainsObjectRestOrSpread */) {
+            if (node.transformFlags & 8192 /* ContainsObjectRestOrSpread */) {
                 // Binding patterns are converted into a generated name and are
                 // evaluated inside the function body.
                 return ts.updateParameter(node, 
@@ -70253,10 +71189,10 @@ var ts;
                 enableSubstitutionForAsyncMethodsWithSuper();
                 var variableStatement = ts.createSuperAccessVariableStatement(resolver, node, capturedSuperProperties);
                 substitutedSuperAccessors[ts.getNodeId(variableStatement)] = true;
-                ts.addStatementsAfterPrologue(statements, [variableStatement]);
+                ts.insertStatementsAfterStandardPrologue(statements, [variableStatement]);
             }
             statements.push(returnStatement);
-            ts.addStatementsAfterPrologue(statements, endLexicalEnvironment());
+            ts.insertStatementsAfterStandardPrologue(statements, endLexicalEnvironment());
             var block = ts.updateBlock(node.body, statements);
             if (emitSuperHelpers && hasSuperElementAccess) {
                 if (resolver.getNodeCheckFlags(node) & 4096 /* AsyncMethodWithSuperBinding */) {
@@ -70282,7 +71218,7 @@ var ts;
             var leadingStatements = endLexicalEnvironment();
             if (statementOffset > 0 || ts.some(statements) || ts.some(leadingStatements)) {
                 var block = ts.convertToFunctionBody(body, /*multiLine*/ true);
-                ts.addStatementsAfterPrologue(statements, leadingStatements);
+                ts.insertStatementsAfterStandardPrologue(statements, leadingStatements);
                 ts.addRange(statements, block.statements.slice(statementOffset));
                 return ts.updateBlock(block, ts.setTextRange(ts.createNodeArray(statements), block.statements));
             }
@@ -70291,7 +71227,7 @@ var ts;
         function appendObjectRestAssignmentsIfNeeded(statements, node) {
             for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
                 var parameter = _a[_i];
-                if (parameter.transformFlags & 262144 /* ContainsObjectRestOrSpread */) {
+                if (parameter.transformFlags & 8192 /* ContainsObjectRestOrSpread */) {
                     var temp = ts.getGeneratedNameForNode(parameter);
                     var declarations = ts.flattenDestructuringBinding(parameter, visitor, context, 1 /* ObjectRest */, temp, 
                     /*doNotRecordTempVariablesInLine*/ false, 
@@ -70422,8 +71358,8 @@ var ts;
             }
         }
     }
-    ts.transformESNext = transformESNext;
-    var assignHelper = {
+    ts.transformES2018 = transformES2018;
+    ts.assignHelper = {
         name: "typescript:assign",
         scoped: false,
         priority: 1,
@@ -70434,28 +71370,28 @@ var ts;
             return ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "assign"), 
             /*typeArguments*/ undefined, attributesSegments);
         }
-        context.requestEmitHelper(assignHelper);
+        context.requestEmitHelper(ts.assignHelper);
         return ts.createCall(ts.getHelperName("__assign"), 
         /*typeArguments*/ undefined, attributesSegments);
     }
     ts.createAssignHelper = createAssignHelper;
-    var awaitHelper = {
+    ts.awaitHelper = {
         name: "typescript:await",
         scoped: false,
         text: "\n            var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }"
     };
     function createAwaitHelper(context, expression) {
-        context.requestEmitHelper(awaitHelper);
+        context.requestEmitHelper(ts.awaitHelper);
         return ts.createCall(ts.getHelperName("__await"), /*typeArguments*/ undefined, [expression]);
     }
-    var asyncGeneratorHelper = {
+    ts.asyncGeneratorHelper = {
         name: "typescript:asyncGenerator",
         scoped: false,
         text: "\n            var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {\n                if (!Symbol.asyncIterator) throw new TypeError(\"Symbol.asyncIterator is not defined.\");\n                var g = generator.apply(thisArg, _arguments || []), i, q = [];\n                return i = {}, verb(\"next\"), verb(\"throw\"), verb(\"return\"), i[Symbol.asyncIterator] = function () { return this; }, i;\n                function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }\n                function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }\n                function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }\n                function fulfill(value) { resume(\"next\", value); }\n                function reject(value) { resume(\"throw\", value); }\n                function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }\n            };"
     };
     function createAsyncGeneratorHelper(context, generatorFunc) {
-        context.requestEmitHelper(awaitHelper);
-        context.requestEmitHelper(asyncGeneratorHelper);
+        context.requestEmitHelper(ts.awaitHelper);
+        context.requestEmitHelper(ts.asyncGeneratorHelper);
         // Mark this node as originally an async function
         (generatorFunc.emitNode || (generatorFunc.emitNode = {})).flags |= 262144 /* AsyncFunctionBody */;
         return ts.createCall(ts.getHelperName("__asyncGenerator"), 
@@ -70465,30 +71401,84 @@ var ts;
             generatorFunc
         ]);
     }
-    var asyncDelegator = {
+    ts.asyncDelegator = {
         name: "typescript:asyncDelegator",
         scoped: false,
         text: "\n            var __asyncDelegator = (this && this.__asyncDelegator) || function (o) {\n                var i, p;\n                return i = {}, verb(\"next\"), verb(\"throw\", function (e) { throw e; }), verb(\"return\"), i[Symbol.iterator] = function () { return this; }, i;\n                function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === \"return\" } : f ? f(v) : v; } : f; }\n            };"
     };
     function createAsyncDelegatorHelper(context, expression, location) {
-        context.requestEmitHelper(awaitHelper);
-        context.requestEmitHelper(asyncDelegator);
+        context.requestEmitHelper(ts.awaitHelper);
+        context.requestEmitHelper(ts.asyncDelegator);
         return ts.setTextRange(ts.createCall(ts.getHelperName("__asyncDelegator"), 
         /*typeArguments*/ undefined, [expression]), location);
     }
-    var asyncValues = {
+    ts.asyncValues = {
         name: "typescript:asyncValues",
         scoped: false,
         text: "\n            var __asyncValues = (this && this.__asyncValues) || function (o) {\n                if (!Symbol.asyncIterator) throw new TypeError(\"Symbol.asyncIterator is not defined.\");\n                var m = o[Symbol.asyncIterator], i;\n                return m ? m.call(o) : (o = typeof __values === \"function\" ? __values(o) : o[Symbol.iterator](), i = {}, verb(\"next\"), verb(\"throw\"), verb(\"return\"), i[Symbol.asyncIterator] = function () { return this; }, i);\n                function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }\n                function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }\n            };"
     };
     function createAsyncValuesHelper(context, expression, location) {
-        context.requestEmitHelper(asyncValues);
+        context.requestEmitHelper(ts.asyncValues);
         return ts.setTextRange(ts.createCall(ts.getHelperName("__asyncValues"), 
         /*typeArguments*/ undefined, [expression]), location);
     }
 })(ts || (ts = {}));
 /*@internal*/
 var ts;
+(function (ts) {
+    function transformES2019(context) {
+        return ts.chainBundle(transformSourceFile);
+        function transformSourceFile(node) {
+            if (node.isDeclarationFile) {
+                return node;
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitor(node) {
+            if ((node.transformFlags & 8 /* ContainsES2019 */) === 0) {
+                return node;
+            }
+            switch (node.kind) {
+                case 274 /* CatchClause */:
+                    return visitCatchClause(node);
+                default:
+                    return ts.visitEachChild(node, visitor, context);
+            }
+        }
+        function visitCatchClause(node) {
+            if (!node.variableDeclaration) {
+                return ts.updateCatchClause(node, ts.createVariableDeclaration(ts.createTempVariable(/*recordTempVariable*/ undefined)), ts.visitNode(node.block, visitor, ts.isBlock));
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+    }
+    ts.transformES2019 = transformES2019;
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
+(function (ts) {
+    function transformESNext(context) {
+        return ts.chainBundle(transformSourceFile);
+        function transformSourceFile(node) {
+            if (node.isDeclarationFile) {
+                return node;
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitor(node) {
+            if ((node.transformFlags & 4 /* ContainsESNext */) === 0) {
+                return node;
+            }
+            switch (node.kind) {
+                default:
+                    return ts.visitEachChild(node, visitor, context);
+            }
+        }
+    }
+    ts.transformESNext = transformESNext;
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
 (function (ts) {
     function transformJsx(context) {
         var compilerOptions = context.getCompilerOptions();
@@ -70509,7 +71499,7 @@ var ts;
             return visited;
         }
         function visitor(node) {
-            if (node.transformFlags & 4 /* ContainsJsx */) {
+            if (node.transformFlags & 2 /* ContainsJsx */) {
                 return visitorWorker(node);
             }
             else {
@@ -70626,7 +71616,7 @@ var ts;
             }
         }
         function visitJsxText(node) {
-            var fixed = fixupWhitespaceAndDecodeEntities(ts.getTextOfNode(node, /*includeTrivia*/ true));
+            var fixed = fixupWhitespaceAndDecodeEntities(node.text);
             return fixed === undefined ? undefined : ts.createLiteral(fixed);
         }
         /**
@@ -71011,7 +72001,7 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitor(node) {
-            if ((node.transformFlags & 32 /* ContainsES2016 */) === 0) {
+            if ((node.transformFlags & 64 /* ContainsES2016 */) === 0) {
                 return node;
             }
             switch (node.kind) {
@@ -71091,30 +72081,6 @@ var ts;
         Jump[Jump["Continue"] = 4] = "Continue";
         Jump[Jump["Return"] = 8] = "Return";
     })(Jump || (Jump = {}));
-    var SuperCaptureResult;
-    (function (SuperCaptureResult) {
-        /**
-         * A capture may have been added for calls to 'super', but
-         * the caller should emit subsequent statements normally.
-         */
-        SuperCaptureResult[SuperCaptureResult["NoReplacement"] = 0] = "NoReplacement";
-        /**
-         * A call to 'super()' got replaced with a capturing statement like:
-         *
-         *  var _this = _super.call(...) || this;
-         *
-         * Callers should skip the current statement.
-         */
-        SuperCaptureResult[SuperCaptureResult["ReplaceSuperCapture"] = 1] = "ReplaceSuperCapture";
-        /**
-         * A call to 'super()' got replaced with a capturing statement like:
-         *
-         *  return _super.call(...) || this;
-         *
-         * Callers should skip the current statement and avoid any returns of '_this'.
-         */
-        SuperCaptureResult[SuperCaptureResult["ReplaceWithReturn"] = 2] = "ReplaceWithReturn";
-    })(SuperCaptureResult || (SuperCaptureResult = {}));
     // Facts we track as we traverse the tree
     var HierarchyFacts;
     (function (HierarchyFacts) {
@@ -71135,12 +72101,12 @@ var ts;
         HierarchyFacts[HierarchyFacts["ForStatement"] = 1024] = "ForStatement";
         HierarchyFacts[HierarchyFacts["ForInOrForOfStatement"] = 2048] = "ForInOrForOfStatement";
         HierarchyFacts[HierarchyFacts["ConstructorWithCapturedSuper"] = 4096] = "ConstructorWithCapturedSuper";
-        HierarchyFacts[HierarchyFacts["ComputedPropertyName"] = 8192] = "ComputedPropertyName";
         // NOTE: do not add more ancestor flags without also updating AncestorFactsMask below.
+        // NOTE: when adding a new ancestor flag, be sure to update the subtree flags below.
         //
         // Ancestor masks
         //
-        HierarchyFacts[HierarchyFacts["AncestorFactsMask"] = 16383] = "AncestorFactsMask";
+        HierarchyFacts[HierarchyFacts["AncestorFactsMask"] = 8191] = "AncestorFactsMask";
         // We are always in *some* kind of block scope, but only specific block-scope containers are
         // top-level or Blocks.
         HierarchyFacts[HierarchyFacts["BlockScopeIncludes"] = 0] = "BlockScopeIncludes";
@@ -71150,16 +72116,16 @@ var ts;
         HierarchyFacts[HierarchyFacts["SourceFileExcludes"] = 3968] = "SourceFileExcludes";
         // Functions, methods, and accessors are both new lexical scopes and new block scopes.
         HierarchyFacts[HierarchyFacts["FunctionIncludes"] = 65] = "FunctionIncludes";
-        HierarchyFacts[HierarchyFacts["FunctionExcludes"] = 16286] = "FunctionExcludes";
+        HierarchyFacts[HierarchyFacts["FunctionExcludes"] = 8094] = "FunctionExcludes";
         HierarchyFacts[HierarchyFacts["AsyncFunctionBodyIncludes"] = 69] = "AsyncFunctionBodyIncludes";
-        HierarchyFacts[HierarchyFacts["AsyncFunctionBodyExcludes"] = 16278] = "AsyncFunctionBodyExcludes";
+        HierarchyFacts[HierarchyFacts["AsyncFunctionBodyExcludes"] = 8086] = "AsyncFunctionBodyExcludes";
         // Arrow functions are lexically scoped to their container, but are new block scopes.
         HierarchyFacts[HierarchyFacts["ArrowFunctionIncludes"] = 66] = "ArrowFunctionIncludes";
-        HierarchyFacts[HierarchyFacts["ArrowFunctionExcludes"] = 16256] = "ArrowFunctionExcludes";
+        HierarchyFacts[HierarchyFacts["ArrowFunctionExcludes"] = 8064] = "ArrowFunctionExcludes";
         // Constructors are both new lexical scopes and new block scopes. Constructors are also
         // always considered non-static members of a class.
         HierarchyFacts[HierarchyFacts["ConstructorIncludes"] = 73] = "ConstructorIncludes";
-        HierarchyFacts[HierarchyFacts["ConstructorExcludes"] = 16278] = "ConstructorExcludes";
+        HierarchyFacts[HierarchyFacts["ConstructorExcludes"] = 8086] = "ConstructorExcludes";
         // 'do' and 'while' statements are not block scopes. We track that the subtree is contained
         // within an IterationStatement to indicate whether the embedded statement is an
         // IterationStatementBlock.
@@ -71177,19 +72143,17 @@ var ts;
         HierarchyFacts[HierarchyFacts["BlockExcludes"] = 3904] = "BlockExcludes";
         HierarchyFacts[HierarchyFacts["IterationStatementBlockIncludes"] = 512] = "IterationStatementBlockIncludes";
         HierarchyFacts[HierarchyFacts["IterationStatementBlockExcludes"] = 4032] = "IterationStatementBlockExcludes";
-        // Computed property names track subtree flags differently than their containing members.
-        HierarchyFacts[HierarchyFacts["ComputedPropertyNameIncludes"] = 8192] = "ComputedPropertyNameIncludes";
-        HierarchyFacts[HierarchyFacts["ComputedPropertyNameExcludes"] = 0] = "ComputedPropertyNameExcludes";
         //
         // Subtree facts
         //
-        HierarchyFacts[HierarchyFacts["NewTarget"] = 16384] = "NewTarget";
-        HierarchyFacts[HierarchyFacts["NewTargetInComputedPropertyName"] = 32768] = "NewTargetInComputedPropertyName";
+        HierarchyFacts[HierarchyFacts["NewTarget"] = 8192] = "NewTarget";
+        HierarchyFacts[HierarchyFacts["CapturedLexicalThis"] = 16384] = "CapturedLexicalThis";
         //
         // Subtree masks
         //
-        HierarchyFacts[HierarchyFacts["SubtreeFactsMask"] = -16384] = "SubtreeFactsMask";
-        HierarchyFacts[HierarchyFacts["PropagateNewTargetMask"] = 49152] = "PropagateNewTargetMask";
+        HierarchyFacts[HierarchyFacts["SubtreeFactsMask"] = -8192] = "SubtreeFactsMask";
+        HierarchyFacts[HierarchyFacts["ArrowFunctionSubtreeExcludes"] = 0] = "ArrowFunctionSubtreeExcludes";
+        HierarchyFacts[HierarchyFacts["FunctionSubtreeExcludes"] = 24576] = "FunctionSubtreeExcludes";
     })(HierarchyFacts || (HierarchyFacts = {}));
     function transformES2015(context) {
         var startLexicalEnvironment = context.startLexicalEnvironment, resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
@@ -71238,7 +72202,7 @@ var ts;
          */
         function enterSubtree(excludeFacts, includeFacts) {
             var ancestorFacts = hierarchyFacts;
-            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & 16383 /* AncestorFactsMask */;
+            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & 8191 /* AncestorFactsMask */;
             return ancestorFacts;
         }
         /**
@@ -71249,7 +72213,7 @@ var ts;
          * @param includeFacts The new `HierarchyFacts` of the subtree that should be propagated.
          */
         function exitSubtree(ancestorFacts, excludeFacts, includeFacts) {
-            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & -16384 /* SubtreeFactsMask */ | ancestorFacts;
+            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & -8192 /* SubtreeFactsMask */ | ancestorFacts;
         }
         function isReturnVoidStatementInConstructorWithCapturedSuper(node) {
             return (hierarchyFacts & 4096 /* ConstructorWithCapturedSuper */) !== 0
@@ -71271,12 +72235,6 @@ var ts;
                 return node;
             }
         }
-        function functionBodyVisitor(node) {
-            if (shouldVisitNode(node)) {
-                return visitBlock(node, /*isFunctionBody*/ true);
-            }
-            return node;
-        }
         function callExpressionVisitor(node) {
             if (node.kind === 98 /* SuperKeyword */) {
                 return visitSuperKeyword(/*isExpressionOfCall*/ true);
@@ -71383,18 +72341,19 @@ var ts;
         }
         function visitSourceFile(node) {
             var ancestorFacts = enterSubtree(3968 /* SourceFileExcludes */, 64 /* SourceFileIncludes */);
+            var prologue = [];
             var statements = [];
             startLexicalEnvironment();
-            var statementOffset = ts.addStandardPrologue(statements, node.statements, /*ensureUseStrict*/ false);
-            addCaptureThisForNodeIfNeeded(statements, node);
-            statementOffset = ts.addCustomPrologue(statements, node.statements, statementOffset, visitor);
+            var statementOffset = ts.addStandardPrologue(prologue, node.statements, /*ensureUseStrict*/ false);
+            statementOffset = ts.addCustomPrologue(prologue, node.statements, statementOffset, visitor);
             ts.addRange(statements, ts.visitNodes(node.statements, visitor, ts.isStatement, statementOffset));
             if (taggedTemplateStringDeclarations) {
                 statements.push(ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList(taggedTemplateStringDeclarations)));
             }
-            ts.addStatementsAfterPrologue(statements, endLexicalEnvironment());
+            ts.mergeLexicalEnvironment(prologue, endLexicalEnvironment());
+            insertCaptureThisForNodeIfNeeded(prologue, node);
             exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
-            return ts.updateSourceFileNode(node, ts.setTextRange(ts.createNodeArray(statements), node.statements));
+            return ts.updateSourceFileNode(node, ts.setTextRange(ts.createNodeArray(ts.concatenate(prologue, statements)), node.statements));
         }
         function visitSwitchStatement(node) {
             if (convertedLoopState !== undefined) {
@@ -71434,6 +72393,9 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitThisKeyword(node) {
+            if (hierarchyFacts & 2 /* ArrowFunction */) {
+                hierarchyFacts |= 16384 /* CapturedLexicalThis */;
+            }
             if (convertedLoopState) {
                 if (hierarchyFacts & 2 /* ArrowFunction */) {
                     // if the enclosing function is an ArrowFunction then we use the captured 'this' keyword.
@@ -71647,7 +72609,7 @@ var ts;
             statement.pos = closingBraceLocation.pos;
             ts.setEmitFlags(statement, 1536 /* NoComments */ | 384 /* NoTokenSourceMaps */);
             statements.push(statement);
-            ts.addStatementsAfterPrologue(statements, endLexicalEnvironment());
+            ts.insertStatementsAfterStandardPrologue(statements, endLexicalEnvironment());
             var block = ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), /*location*/ node.members), /*multiLine*/ true);
             ts.setEmitFlags(block, 1536 /* NoComments */);
             return block;
@@ -71675,7 +72637,7 @@ var ts;
         function addConstructor(statements, node, extendsClauseElement) {
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(16278 /* ConstructorExcludes */, 73 /* ConstructorIncludes */);
+            var ancestorFacts = enterSubtree(8086 /* ConstructorExcludes */, 73 /* ConstructorIncludes */);
             var constructor = ts.getFirstConstructorWithBody(node);
             var hasSynthesizedSuper = hasSynthesizedDefaultSuperCall(constructor, extendsClauseElement !== undefined);
             var constructorFunction = ts.createFunctionDeclaration(
@@ -71689,7 +72651,7 @@ var ts;
                 ts.setEmitFlags(constructorFunction, 8 /* CapturesThis */);
             }
             statements.push(constructorFunction);
-            exitSubtree(ancestorFacts, 49152 /* PropagateNewTargetMask */, 0 /* None */);
+            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
         }
         /**
@@ -71708,6 +72670,24 @@ var ts;
             return ts.visitParameterList(constructor && !hasSynthesizedSuper ? constructor.parameters : undefined, visitor, context)
                 || [];
         }
+        function createDefaultConstructorBody(node, isDerivedClass) {
+            // We must be here because the user didn't write a constructor
+            // but we needed to call 'super(...args)' anyway as per 14.5.14 of the ES2016 spec.
+            // If that's the case we can just immediately return the result of a 'super()' call.
+            var statements = [];
+            resumeLexicalEnvironment();
+            ts.mergeLexicalEnvironment(statements, endLexicalEnvironment());
+            if (isDerivedClass) {
+                // return _super !== null && _super.apply(this, arguments) || this;
+                statements.push(ts.createReturn(createDefaultSuperCallOrThis()));
+            }
+            var statementsArray = ts.createNodeArray(statements);
+            ts.setTextRange(statementsArray, node.members);
+            var block = ts.createBlock(statementsArray, /*multiLine*/ true);
+            ts.setTextRange(block, node);
+            ts.setEmitFlags(block, 1536 /* NoComments */);
+            return block;
+        }
         /**
          * Transforms the body of a constructor declaration of a class.
          *
@@ -71718,59 +72698,137 @@ var ts;
          *                            synthesized `super` call.
          */
         function transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper) {
+            // determine whether the class is known syntactically to be a derived class (e.g. a
+            // class that extends a value that is not syntactically known to be `null`).
+            var isDerivedClass = !!extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 96 /* NullKeyword */;
+            // When the subclass does not have a constructor, we synthesize a *default* constructor using the following
+            // representation:
+            //
+            // ```
+            // // es2015 (source)
+            // class C extends Base { }
+            //
+            // // es5 (transformed)
+            // var C = (function (_super) {
+            //     function C() {
+            //         return _super.apply(this, arguments) || this;
+            //     }
+            //     return C;
+            // })(Base);
+            // ```
+            if (!constructor)
+                return createDefaultConstructorBody(node, isDerivedClass);
+            // The prologue will contain all leading standard and custom prologue statements added by this transform
+            var prologue = [];
             var statements = [];
             resumeLexicalEnvironment();
-            var statementOffset = -1;
+            // If a super call has already been synthesized,
+            // we're going to assume that we should just transform everything after that.
+            // The assumption is that no prior step in the pipeline has added any prologue directives.
+            var statementOffset = 0;
+            if (!hasSynthesizedSuper)
+                statementOffset = ts.addStandardPrologue(prologue, constructor.body.statements, /*ensureUseStrict*/ false);
+            addDefaultValueAssignmentsIfNeeded(statements, constructor);
+            addRestParameterIfNeeded(statements, constructor, hasSynthesizedSuper);
+            if (!hasSynthesizedSuper)
+                statementOffset = ts.addCustomPrologue(statements, constructor.body.statements, statementOffset, visitor);
+            // If the first statement is a call to `super()`, visit the statement directly
+            var superCallExpression;
             if (hasSynthesizedSuper) {
-                // If a super call has already been synthesized,
-                // we're going to assume that we should just transform everything after that.
-                // The assumption is that no prior step in the pipeline has added any prologue directives.
-                statementOffset = 0;
-            }
-            else if (constructor) {
-                statementOffset = ts.addStandardPrologue(statements, constructor.body.statements, /*ensureUseStrict*/ false);
+                superCallExpression = createDefaultSuperCallOrThis();
             }
-            if (constructor) {
-                addDefaultValueAssignmentsIfNeeded(statements, constructor);
-                addRestParameterIfNeeded(statements, constructor, hasSynthesizedSuper);
-                if (!hasSynthesizedSuper) {
-                    // If no super call has been synthesized, emit custom prologue directives.
-                    statementOffset = ts.addCustomPrologue(statements, constructor.body.statements, statementOffset, visitor);
+            else if (isDerivedClass && statementOffset < constructor.body.statements.length) {
+                var firstStatement = constructor.body.statements[statementOffset];
+                if (ts.isExpressionStatement(firstStatement) && ts.isSuperCall(firstStatement.expression)) {
+                    superCallExpression = visitImmediateSuperCallInBody(firstStatement.expression);
                 }
-                ts.Debug.assert(statementOffset >= 0, "statementOffset not initialized correctly!");
-            }
-            // determine whether the class is known syntactically to be a derived class (e.g. a
-            // class that extends a value that is not syntactically known to be `null`).
-            var isDerivedClass = !!extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 96 /* NullKeyword */;
-            var superCaptureStatus = declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, constructor, isDerivedClass, hasSynthesizedSuper, statementOffset);
-            // The last statement expression was replaced. Skip it.
-            if (superCaptureStatus === 1 /* ReplaceSuperCapture */ || superCaptureStatus === 2 /* ReplaceWithReturn */) {
-                statementOffset++;
             }
-            if (constructor) {
-                if (superCaptureStatus === 1 /* ReplaceSuperCapture */) {
-                    hierarchyFacts |= 4096 /* ConstructorWithCapturedSuper */;
+            if (superCallExpression) {
+                hierarchyFacts |= 4096 /* ConstructorWithCapturedSuper */;
+                statementOffset++; // skip this statement, we will add it after visiting the rest of the body.
+            }
+            // visit the remaining statements
+            ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, /*start*/ statementOffset));
+            ts.mergeLexicalEnvironment(prologue, endLexicalEnvironment());
+            insertCaptureNewTargetIfNeeded(prologue, constructor, /*copyOnWrite*/ false);
+            if (isDerivedClass) {
+                if (superCallExpression && statementOffset === constructor.body.statements.length && !(constructor.body.transformFlags & 2048 /* ContainsLexicalThis */)) {
+                    // If the subclass constructor does *not* contain `this` and *ends* with a `super()` call, we will use the
+                    // following representation:
+                    //
+                    // ```
+                    // // es2015 (source)
+                    // class C extends Base {
+                    //     constructor() {
+                    //         super("foo");
+                    //     }
+                    // }
+                    //
+                    // // es5 (transformed)
+                    // var C = (function (_super) {
+                    //     function C() {
+                    //         return _super.call(this, "foo") || this;
+                    //     }
+                    //     return C;
+                    // })(Base);
+                    // ```
+                    var superCall = ts.cast(ts.cast(superCallExpression, ts.isBinaryExpression).left, ts.isCallExpression);
+                    var returnStatement = ts.createReturn(superCallExpression);
+                    ts.setCommentRange(returnStatement, ts.getCommentRange(superCall));
+                    ts.setEmitFlags(superCall, 1536 /* NoComments */);
+                    statements.push(returnStatement);
+                }
+                else {
+                    // Otherwise, we will use the following transformed representation for calls to `super()` in a constructor:
+                    //
+                    // ```
+                    // // es2015 (source)
+                    // class C extends Base {
+                    //     constructor() {
+                    //         super("foo");
+                    //         this.x = 1;
+                    //     }
+                    // }
+                    //
+                    // // es5 (transformed)
+                    // var C = (function (_super) {
+                    //     function C() {
+                    //         var _this = _super.call(this, "foo") || this;
+                    //         _this.x = 1;
+                    //         return _this;
+                    //     }
+                    //     return C;
+                    // })(Base);
+                    // ```
+                    // Since the `super()` call was the first statement, we insert the `this` capturing call to
+                    // `super()` at the top of the list of `statements` (after any pre-existing custom prologues).
+                    insertCaptureThisForNode(statements, constructor, superCallExpression || createActualThis());
+                    if (!isSufficientlyCoveredByReturnStatements(constructor.body)) {
+                        statements.push(ts.createReturn(ts.createFileLevelUniqueName("_this")));
+                    }
                 }
-                ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, /*start*/ statementOffset));
-            }
-            // Return `_this` unless we're sure enough that it would be pointless to add a return statement.
-            // If there's a constructor that we can tell returns in enough places, then we *do not* want to add a return.
-            if (isDerivedClass
-                && superCaptureStatus !== 2 /* ReplaceWithReturn */
-                && !(constructor && isSufficientlyCoveredByReturnStatements(constructor.body))) {
-                statements.push(ts.createReturn(ts.createFileLevelUniqueName("_this")));
             }
-            ts.addStatementsAfterPrologue(statements, endLexicalEnvironment());
-            if (constructor) {
-                prependCaptureNewTargetIfNeeded(statements, constructor, /*copyOnWrite*/ false);
+            else {
+                // If a class is not derived from a base class or does not have a call to `super()`, `this` is only
+                // captured when necessitated by an arrow function capturing the lexical `this`:
+                //
+                // ```
+                // // es2015
+                // class C {}
+                //
+                // // es5
+                // var C = (function () {
+                //     function C() {
+                //     }
+                //     return C;
+                // })();
+                // ```
+                insertCaptureThisForNodeIfNeeded(prologue, constructor);
             }
-            var block = ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), 
-            /*location*/ constructor ? constructor.body.statements : node.members), 
+            var block = ts.createBlock(ts.setTextRange(ts.createNodeArray(ts.concatenate(prologue, statements)), 
+            /*location*/ constructor.body.statements), 
             /*multiLine*/ true);
-            ts.setTextRange(block, constructor ? constructor.body : node);
-            if (!constructor) {
-                ts.setEmitFlags(block, 1536 /* NoComments */);
-            }
+            ts.setTextRange(block, constructor.body);
             return block;
         }
         /**
@@ -71800,83 +72858,6 @@ var ts;
             }
             return false;
         }
-        /**
-         * Declares a `_this` variable for derived classes and for when arrow functions capture `this`.
-         *
-         * @returns The new statement offset into the `statements` array.
-         */
-        function declareOrCaptureOrReturnThisForConstructorIfNeeded(statements, ctor, isDerivedClass, hasSynthesizedSuper, statementOffset) {
-            // If this isn't a derived class, just capture 'this' for arrow functions if necessary.
-            if (!isDerivedClass) {
-                if (ctor) {
-                    addCaptureThisForNodeIfNeeded(statements, ctor);
-                }
-                return 0 /* NoReplacement */;
-            }
-            // We must be here because the user didn't write a constructor
-            // but we needed to call 'super(...args)' anyway as per 14.5.14 of the ES2016 spec.
-            // If that's the case we can just immediately return the result of a 'super()' call.
-            if (!ctor) {
-                statements.push(ts.createReturn(createDefaultSuperCallOrThis()));
-                return 2 /* ReplaceWithReturn */;
-            }
-            // The constructor exists, but it and the 'super()' call it contains were generated
-            // for something like property initializers.
-            // Create a captured '_this' variable and assume it will subsequently be used.
-            if (hasSynthesizedSuper) {
-                captureThisForNode(statements, ctor, createDefaultSuperCallOrThis());
-                enableSubstitutionsForCapturedThis();
-                return 1 /* ReplaceSuperCapture */;
-            }
-            // Most of the time, a 'super' call will be the first real statement in a constructor body.
-            // In these cases, we'd like to transform these into a *single* statement instead of a declaration
-            // followed by an assignment statement for '_this'. For instance, if we emitted without an initializer,
-            // we'd get:
-            //
-            //      var _this;
-            //      _this = _super.call(...) || this;
-            //
-            // instead of
-            //
-            //      var _this = _super.call(...) || this;
-            //
-            // Additionally, if the 'super()' call is the last statement, we should just avoid capturing
-            // entirely and immediately return the result like so:
-            //
-            //      return _super.call(...) || this;
-            //
-            var firstStatement;
-            var superCallExpression;
-            var ctorStatements = ctor.body.statements;
-            if (statementOffset < ctorStatements.length) {
-                firstStatement = ctorStatements[statementOffset];
-                if (firstStatement.kind === 221 /* ExpressionStatement */ && ts.isSuperCall(firstStatement.expression)) {
-                    superCallExpression = visitImmediateSuperCallInBody(firstStatement.expression);
-                }
-            }
-            // Return the result if we have an immediate super() call on the last statement,
-            // but only if the constructor itself doesn't use 'this' elsewhere.
-            if (superCallExpression
-                && statementOffset === ctorStatements.length - 1
-                && !(ctor.transformFlags & (8192 /* ContainsLexicalThis */ | 16384 /* ContainsCapturedLexicalThis */))) {
-                var returnStatement = ts.createReturn(superCallExpression);
-                if (superCallExpression.kind !== 204 /* BinaryExpression */
-                    || superCallExpression.left.kind !== 191 /* CallExpression */) {
-                    ts.Debug.fail("Assumed generated super call would have form 'super.call(...) || this'.");
-                }
-                // Shift comments from the original super call to the return statement.
-                ts.setCommentRange(returnStatement, ts.getCommentRange(ts.setEmitFlags(superCallExpression.left, 1536 /* NoComments */)));
-                statements.push(returnStatement);
-                return 2 /* ReplaceWithReturn */;
-            }
-            // Perform the capture.
-            captureThisForNode(statements, ctor, superCallExpression || createActualThis());
-            // If we're actually replacing the original statement, we need to signal this to the caller.
-            if (superCallExpression) {
-                return 1 /* ReplaceSuperCapture */;
-            }
-            return 0 /* NoReplacement */;
-        }
         function createActualThis() {
             return ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */);
         }
@@ -71922,14 +72903,9 @@ var ts;
                 return node;
             }
         }
-        /**
-         * Gets a value indicating whether we need to add default value assignments for a
-         * function-like node.
-         *
-         * @param node A function-like node.
-         */
-        function shouldAddDefaultValueAssignments(node) {
-            return (node.transformFlags & 65536 /* ContainsDefaultValueAssignments */) !== 0;
+        function hasDefaultValueOrBindingPattern(node) {
+            return node.initializer !== undefined
+                || ts.isBindingPattern(node.name);
         }
         /**
          * Adds statements to the body of a function-like node if it contains parameters with
@@ -71939,9 +72915,10 @@ var ts;
          * @param node A function-like node.
          */
         function addDefaultValueAssignmentsIfNeeded(statements, node) {
-            if (!shouldAddDefaultValueAssignments(node)) {
-                return;
+            if (!ts.some(node.parameters, hasDefaultValueOrBindingPattern)) {
+                return false;
             }
+            var added = false;
             for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
                 var parameter = _a[_i];
                 var name = parameter.name, initializer = parameter.initializer, dotDotDotToken = parameter.dotDotDotToken;
@@ -71951,12 +72928,14 @@ var ts;
                     continue;
                 }
                 if (ts.isBindingPattern(name)) {
-                    addDefaultValueAssignmentForBindingPattern(statements, parameter, name, initializer);
+                    added = insertDefaultValueAssignmentForBindingPattern(statements, parameter, name, initializer) || added;
                 }
                 else if (initializer) {
-                    addDefaultValueAssignmentForInitializer(statements, parameter, name, initializer);
+                    insertDefaultValueAssignmentForInitializer(statements, parameter, name, initializer);
+                    added = true;
                 }
             }
+            return added;
         }
         /**
          * Adds statements to the body of a function-like node for parameters with binding patterns
@@ -71966,18 +72945,20 @@ var ts;
          * @param name The name of the parameter.
          * @param initializer The initializer for the parameter.
          */
-        function addDefaultValueAssignmentForBindingPattern(statements, parameter, name, initializer) {
-            var temp = ts.getGeneratedNameForNode(parameter);
+        function insertDefaultValueAssignmentForBindingPattern(statements, parameter, name, initializer) {
             // In cases where a binding pattern is simply '[]' or '{}',
             // we usually don't want to emit a var declaration; however, in the presence
             // of an initializer, we must emit that expression to preserve side effects.
             if (name.elements.length > 0) {
-                statements.push(ts.setEmitFlags(ts.createVariableStatement(
-                /*modifiers*/ undefined, ts.createVariableDeclarationList(ts.flattenDestructuringBinding(parameter, visitor, context, 0 /* All */, temp))), 1048576 /* CustomPrologue */));
+                ts.insertStatementAfterCustomPrologue(statements, ts.setEmitFlags(ts.createVariableStatement(
+                /*modifiers*/ undefined, ts.createVariableDeclarationList(ts.flattenDestructuringBinding(parameter, visitor, context, 0 /* All */, ts.getGeneratedNameForNode(parameter)))), 1048576 /* CustomPrologue */));
+                return true;
             }
             else if (initializer) {
-                statements.push(ts.setEmitFlags(ts.createExpressionStatement(ts.createAssignment(temp, ts.visitNode(initializer, visitor, ts.isExpression))), 1048576 /* CustomPrologue */));
+                ts.insertStatementAfterCustomPrologue(statements, ts.setEmitFlags(ts.createExpressionStatement(ts.createAssignment(ts.getGeneratedNameForNode(parameter), ts.visitNode(initializer, visitor, ts.isExpression))), 1048576 /* CustomPrologue */));
+                return true;
             }
+            return false;
         }
         /**
          * Adds statements to the body of a function-like node for parameters with initializers.
@@ -71987,7 +72968,7 @@ var ts;
          * @param name The name of the parameter.
          * @param initializer The initializer for the parameter.
          */
-        function addDefaultValueAssignmentForInitializer(statements, parameter, name, initializer) {
+        function insertDefaultValueAssignmentForInitializer(statements, parameter, name, initializer) {
             initializer = ts.visitNode(initializer, visitor, ts.isExpression);
             var statement = ts.createIf(ts.createTypeCheck(ts.getSynthesizedClone(name), "undefined"), ts.setEmitFlags(ts.setTextRange(ts.createBlock([
                 ts.createExpressionStatement(ts.setEmitFlags(ts.setTextRange(ts.createAssignment(ts.setEmitFlags(ts.getMutableClone(name), 48 /* NoSourceMap */), ts.setEmitFlags(initializer, 48 /* NoSourceMap */ | ts.getEmitFlags(initializer) | 1536 /* NoComments */)), parameter), 1536 /* NoComments */))
@@ -71995,7 +72976,7 @@ var ts;
             ts.startOnNewLine(statement);
             ts.setTextRange(statement, parameter);
             ts.setEmitFlags(statement, 384 /* NoTokenSourceMaps */ | 32 /* NoTrailingSourceMap */ | 1048576 /* CustomPrologue */ | 1536 /* NoComments */);
-            statements.push(statement);
+            ts.insertStatementAfterCustomPrologue(statements, statement);
         }
         /**
          * Gets a value indicating whether we need to add statements to handle a rest parameter.
@@ -72018,9 +72999,10 @@ var ts;
          *                                          synthesized call to `super`
          */
         function addRestParameterIfNeeded(statements, node, inConstructorWithSynthesizedSuper) {
+            var prologueStatements = [];
             var parameter = ts.lastOrUndefined(node.parameters);
             if (!shouldAddRestParameter(parameter, inConstructorWithSynthesizedSuper)) {
-                return;
+                return false;
             }
             // `declarationName` is the name of the local declaration for the parameter.
             var declarationName = parameter.name.kind === 72 /* Identifier */ ? ts.getMutableClone(parameter.name) : ts.createTempVariable(/*recordTempVariable*/ undefined);
@@ -72030,7 +73012,7 @@ var ts;
             var restIndex = node.parameters.length - 1;
             var temp = ts.createLoopVariable();
             // var param = [];
-            statements.push(ts.setEmitFlags(ts.setTextRange(ts.createVariableStatement(
+            prologueStatements.push(ts.setEmitFlags(ts.setTextRange(ts.createVariableStatement(
             /*modifiers*/ undefined, ts.createVariableDeclarationList([
                 ts.createVariableDeclaration(declarationName, 
                 /*type*/ undefined, ts.createArrayLiteral([]))
@@ -72049,25 +73031,30 @@ var ts;
             ]));
             ts.setEmitFlags(forStatement, 1048576 /* CustomPrologue */);
             ts.startOnNewLine(forStatement);
-            statements.push(forStatement);
+            prologueStatements.push(forStatement);
             if (parameter.name.kind !== 72 /* Identifier */) {
                 // do the actual destructuring of the rest parameter if necessary
-                statements.push(ts.setEmitFlags(ts.setTextRange(ts.createVariableStatement(
+                prologueStatements.push(ts.setEmitFlags(ts.setTextRange(ts.createVariableStatement(
                 /*modifiers*/ undefined, ts.createVariableDeclarationList(ts.flattenDestructuringBinding(parameter, visitor, context, 0 /* All */, expressionName))), parameter), 1048576 /* CustomPrologue */));
             }
+            ts.insertStatementsAfterCustomPrologue(statements, prologueStatements);
+            return true;
         }
         /**
          * Adds a statement to capture the `this` of a function declaration if it is needed.
+         * NOTE: This must be executed *after* the subtree has been visited.
          *
          * @param statements The statements for the new function body.
          * @param node A node.
          */
-        function addCaptureThisForNodeIfNeeded(statements, node) {
-            if (node.transformFlags & 16384 /* ContainsCapturedLexicalThis */ && node.kind !== 197 /* ArrowFunction */) {
-                captureThisForNode(statements, node, ts.createThis());
+        function insertCaptureThisForNodeIfNeeded(statements, node) {
+            if (hierarchyFacts & 16384 /* CapturedLexicalThis */ && node.kind !== 197 /* ArrowFunction */) {
+                insertCaptureThisForNode(statements, node, ts.createThis());
+                return true;
             }
+            return false;
         }
-        function captureThisForNode(statements, node, initializer) {
+        function insertCaptureThisForNode(statements, node, initializer) {
             enableSubstitutionsForCapturedThis();
             var captureThisStatement = ts.createVariableStatement(
             /*modifiers*/ undefined, ts.createVariableDeclarationList([
@@ -72076,10 +73063,10 @@ var ts;
             ]));
             ts.setEmitFlags(captureThisStatement, 1536 /* NoComments */ | 1048576 /* CustomPrologue */);
             ts.setSourceMapRange(captureThisStatement, node);
-            statements.push(captureThisStatement);
+            ts.insertStatementAfterCustomPrologue(statements, captureThisStatement);
         }
-        function prependCaptureNewTargetIfNeeded(statements, node, copyOnWrite) {
-            if (hierarchyFacts & 16384 /* NewTarget */) {
+        function insertCaptureNewTargetIfNeeded(statements, node, copyOnWrite) {
+            if (hierarchyFacts & 8192 /* NewTarget */) {
                 var newTarget = void 0;
                 switch (node.kind) {
                     case 197 /* ArrowFunction */:
@@ -72110,10 +73097,11 @@ var ts;
                     ts.createVariableDeclaration(ts.createFileLevelUniqueName("_newTarget"), 
                     /*type*/ undefined, newTarget)
                 ]));
+                ts.setEmitFlags(captureNewTargetStatement, 1536 /* NoComments */ | 1048576 /* CustomPrologue */);
                 if (copyOnWrite) {
-                    return [captureNewTargetStatement].concat(statements);
+                    statements = statements.slice();
                 }
-                statements.unshift(captureNewTargetStatement);
+                ts.insertStatementAfterCustomPrologue(statements, captureNewTargetStatement);
             }
             return statements;
         }
@@ -72165,7 +73153,6 @@ var ts;
          * @param member The MethodDeclaration node.
          */
         function transformClassMethodDeclarationToStatement(receiver, member, container) {
-            var ancestorFacts = enterSubtree(0 /* None */, 0 /* None */);
             var commentRange = ts.getCommentRange(member);
             var sourceMapRange = ts.getSourceMapRange(member);
             var memberName = ts.createMemberAccessForPropertyName(receiver, ts.visitNode(member.name, visitor, ts.isPropertyName), /*location*/ member.name);
@@ -72180,7 +73167,6 @@ var ts;
             // No source map should be emitted for this statement to align with the
             // old emitter.
             ts.setEmitFlags(statement, 48 /* NoSourceMap */);
-            exitSubtree(ancestorFacts, 49152 /* PropagateNewTargetMask */, hierarchyFacts & 49152 /* PropagateNewTargetMask */ ? 16384 /* NewTarget */ : 0 /* None */);
             return statement;
         }
         /**
@@ -72206,7 +73192,6 @@ var ts;
          */
         function transformAccessorsToExpression(receiver, _a, container, startsOnNewLine) {
             var firstAccessor = _a.firstAccessor, getAccessor = _a.getAccessor, setAccessor = _a.setAccessor;
-            var ancestorFacts = enterSubtree(0 /* None */, 0 /* None */);
             // To align with source maps in the old emitter, the receiver and property name
             // arguments are both mapped contiguously to the accessor name.
             var target = ts.getMutableClone(receiver);
@@ -72242,7 +73227,6 @@ var ts;
             if (startsOnNewLine) {
                 ts.startOnNewLine(call);
             }
-            exitSubtree(ancestorFacts, 49152 /* PropagateNewTargetMask */, hierarchyFacts & 49152 /* PropagateNewTargetMask */ ? 16384 /* NewTarget */ : 0 /* None */);
             return call;
         }
         /**
@@ -72251,12 +73235,12 @@ var ts;
          * @param node An ArrowFunction node.
          */
         function visitArrowFunction(node) {
-            if (node.transformFlags & 8192 /* ContainsLexicalThis */) {
-                enableSubstitutionsForCapturedThis();
+            if (node.transformFlags & 2048 /* ContainsLexicalThis */) {
+                hierarchyFacts |= 16384 /* CapturedLexicalThis */;
             }
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(16256 /* ArrowFunctionExcludes */, 66 /* ArrowFunctionIncludes */);
+            var ancestorFacts = enterSubtree(8064 /* ArrowFunctionExcludes */, 66 /* ArrowFunctionIncludes */);
             var func = ts.createFunctionExpression(
             /*modifiers*/ undefined, 
             /*asteriskToken*/ undefined, 
@@ -72266,7 +73250,11 @@ var ts;
             ts.setTextRange(func, node);
             ts.setOriginalNode(func, node);
             ts.setEmitFlags(func, 8 /* CapturesThis */);
-            exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
+            if (hierarchyFacts & 16384 /* CapturedLexicalThis */) {
+                enableSubstitutionsForCapturedThis();
+            }
+            // If an arrow function contains
+            exitSubtree(ancestorFacts, 0 /* ArrowFunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return func;
         }
@@ -72277,18 +73265,16 @@ var ts;
          */
         function visitFunctionExpression(node) {
             var ancestorFacts = ts.getEmitFlags(node) & 262144 /* AsyncFunctionBody */
-                ? enterSubtree(16278 /* AsyncFunctionBodyExcludes */, 69 /* AsyncFunctionBodyIncludes */)
-                : enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+                ? enterSubtree(8086 /* AsyncFunctionBodyExcludes */, 69 /* AsyncFunctionBodyIncludes */)
+                : enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
-            var body = node.transformFlags & 64 /* ES2015 */
-                ? transformFunctionBody(node)
-                : visitFunctionBodyDownLevel(node);
-            var name = hierarchyFacts & 16384 /* NewTarget */
+            var body = transformFunctionBody(node);
+            var name = hierarchyFacts & 8192 /* NewTarget */
                 ? ts.getLocalName(node)
                 : node.name;
-            exitSubtree(ancestorFacts, 49152 /* PropagateNewTargetMask */, 0 /* None */);
+            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return ts.updateFunctionExpression(node, 
             /*modifiers*/ undefined, node.asteriskToken, name, 
@@ -72303,15 +73289,13 @@ var ts;
         function visitFunctionDeclaration(node) {
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+            var ancestorFacts = enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
-            var body = node.transformFlags & 64 /* ES2015 */
-                ? transformFunctionBody(node)
-                : visitFunctionBodyDownLevel(node);
-            var name = hierarchyFacts & 16384 /* NewTarget */
+            var body = transformFunctionBody(node);
+            var name = hierarchyFacts & 8192 /* NewTarget */
                 ? ts.getLocalName(node)
                 : node.name;
-            exitSubtree(ancestorFacts, 49152 /* PropagateNewTargetMask */, 0 /* None */);
+            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return ts.updateFunctionDeclaration(node, 
             /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, name, 
@@ -72329,14 +73313,14 @@ var ts;
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
             var ancestorFacts = container && ts.isClassLike(container) && !ts.hasModifier(node, 32 /* Static */)
-                ? enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */ | 8 /* NonStaticClassElement */)
-                : enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+                ? enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */ | 8 /* NonStaticClassElement */)
+                : enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            if (hierarchyFacts & 16384 /* NewTarget */ && !name && (node.kind === 239 /* FunctionDeclaration */ || node.kind === 196 /* FunctionExpression */)) {
+            if (hierarchyFacts & 8192 /* NewTarget */ && !name && (node.kind === 239 /* FunctionDeclaration */ || node.kind === 196 /* FunctionExpression */)) {
                 name = ts.getGeneratedNameForNode(node);
             }
-            exitSubtree(ancestorFacts, 49152 /* PropagateNewTargetMask */, 0 /* None */);
+            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return ts.setOriginalNode(ts.setTextRange(ts.createFunctionExpression(
             /*modifiers*/ undefined, node.asteriskToken, name, 
@@ -72354,7 +73338,7 @@ var ts;
             var singleLine = false; // indicates whether the block *may* be emitted as a single line
             var statementsLocation;
             var closeBraceLocation;
-            var leadingStatements = [];
+            var prologue = [];
             var statements = [];
             var body = node.body;
             var statementOffset;
@@ -72362,14 +73346,13 @@ var ts;
             if (ts.isBlock(body)) {
                 // ensureUseStrict is false because no new prologue-directive should be added.
                 // addStandardPrologue will put already-existing directives at the beginning of the target statement-array
-                statementOffset = ts.addStandardPrologue(leadingStatements, body.statements, /*ensureUseStrict*/ false);
+                statementOffset = ts.addStandardPrologue(prologue, body.statements, /*ensureUseStrict*/ false);
             }
-            addCaptureThisForNodeIfNeeded(leadingStatements, node);
-            addDefaultValueAssignmentsIfNeeded(leadingStatements, node);
-            addRestParameterIfNeeded(leadingStatements, node, /*inConstructorWithSynthesizedSuper*/ false);
+            multiLine = addDefaultValueAssignmentsIfNeeded(statements, node) || multiLine;
+            multiLine = addRestParameterIfNeeded(statements, node, /*inConstructorWithSynthesizedSuper*/ false) || multiLine;
             if (ts.isBlock(body)) {
                 // addCustomPrologue puts already-existing directives at the beginning of the target statement-array
-                statementOffset = ts.addCustomPrologue(leadingStatements, body.statements, statementOffset, visitor);
+                statementOffset = ts.addCustomPrologue(statements, body.statements, statementOffset, visitor);
                 statementsLocation = body.statements;
                 ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, statementOffset));
                 // If the original body was a multi-line block, this must be a multi-line block.
@@ -72403,14 +73386,19 @@ var ts;
                 // source map location for the close brace.
                 closeBraceLocation = body;
             }
-            var lexicalEnvironment = context.endLexicalEnvironment();
-            ts.addStatementsAfterPrologue(statements, lexicalEnvironment);
-            prependCaptureNewTargetIfNeeded(statements, node, /*copyOnWrite*/ false);
+            ts.mergeLexicalEnvironment(prologue, endLexicalEnvironment());
+            insertCaptureNewTargetIfNeeded(prologue, node, /*copyOnWrite*/ false);
+            insertCaptureThisForNodeIfNeeded(prologue, node);
             // If we added any final generated statements, this must be a multi-line block
-            if (ts.some(leadingStatements) || ts.some(lexicalEnvironment)) {
+            if (ts.some(prologue)) {
                 multiLine = true;
             }
-            var block = ts.createBlock(ts.setTextRange(ts.createNodeArray(leadingStatements.concat(statements)), statementsLocation), multiLine);
+            statements.unshift.apply(statements, prologue);
+            if (ts.isBlock(body) && ts.arrayIsEqualTo(statements, body.statements)) {
+                // no changes were made, preserve the tree
+                return body;
+            }
+            var block = ts.createBlock(ts.setTextRange(ts.createNodeArray(statements), statementsLocation), multiLine);
             ts.setTextRange(block, node.body);
             if (!multiLine && singleLine) {
                 ts.setEmitFlags(block, 1 /* SingleLine */);
@@ -72421,11 +73409,6 @@ var ts;
             ts.setOriginalNode(block, node.body);
             return block;
         }
-        function visitFunctionBodyDownLevel(node) {
-            var updated = ts.visitFunctionBody(node.body, functionBodyVisitor, context);
-            return ts.updateBlock(updated, ts.setTextRange(ts.createNodeArray(prependCaptureNewTargetIfNeeded(updated.statements, node, /*copyOnWrite*/ true)), 
-            /*location*/ updated.statements));
-        }
         function visitBlock(node, isFunctionBody) {
             if (isFunctionBody) {
                 // A function body is not a block scope.
@@ -72530,7 +73513,7 @@ var ts;
          * @param node A VariableDeclarationList node.
          */
         function visitVariableDeclarationList(node) {
-            if (node.transformFlags & 64 /* ES2015 */) {
+            if (node.flags & 3 /* BlockScoped */ || node.transformFlags & 65536 /* ContainsBindingPattern */) {
                 if (node.flags & 3 /* BlockScoped */) {
                     enableSubstitutionsForBlockScopedBindings();
                 }
@@ -72543,7 +73526,7 @@ var ts;
                 ts.setCommentRange(declarationList, node);
                 // If the first or last declaration is a binding pattern, we need to modify
                 // the source map range for the declaration list.
-                if (node.transformFlags & 2097152 /* ContainsBindingPattern */
+                if (node.transformFlags & 65536 /* ContainsBindingPattern */
                     && (ts.isBindingPattern(node.declarations[0].name) || ts.isBindingPattern(ts.last(node.declarations).name))) {
                     ts.setSourceMapRange(declarationList, getRangeUnion(declarations));
                 }
@@ -72865,7 +73848,7 @@ var ts;
             var numInitialPropertiesWithoutYield = numProperties;
             for (var i = 0; i < numProperties; i++) {
                 var property = properties[i];
-                if ((property.transformFlags & 4194304 /* ContainsYield */ && hierarchyFacts & 4 /* AsyncFunctionBody */)
+                if ((property.transformFlags & 131072 /* ContainsYield */ && hierarchyFacts & 4 /* AsyncFunctionBody */)
                     && i < numInitialPropertiesWithoutYield) {
                     numInitialPropertiesWithoutYield = i;
                 }
@@ -73141,7 +74124,7 @@ var ts;
          */
         function createFunctionForInitializerOfForStatement(node, currentState) {
             var functionName = ts.createUniqueName("_loop_init");
-            var containsYield = (node.initializer.transformFlags & 4194304 /* ContainsYield */) !== 0;
+            var containsYield = (node.initializer.transformFlags & 131072 /* ContainsYield */) !== 0;
             var emitFlags = 0 /* None */;
             if (currentState.containsLexicalThis)
                 emitFlags |= 8 /* CapturesThis */;
@@ -73246,11 +74229,11 @@ var ts;
                 statements.push(statement);
             }
             copyOutParameters(currentState.loopOutParameters, 1 /* Body */, 1 /* ToOutParameter */, statements);
-            ts.addStatementsAfterPrologue(statements, lexicalEnvironment);
+            ts.insertStatementsAfterStandardPrologue(statements, lexicalEnvironment);
             var loopBody = ts.createBlock(statements, /*multiLine*/ true);
             if (ts.isBlock(statement))
                 ts.setOriginalNode(loopBody, statement);
-            var containsYield = (node.statement.transformFlags & 4194304 /* ContainsYield */) !== 0;
+            var containsYield = (node.statement.transformFlags & 131072 /* ContainsYield */) !== 0;
             var emitFlags = 0;
             if (currentState.containsLexicalThis)
                 emitFlags |= 8 /* CapturesThis */;
@@ -73482,13 +74465,11 @@ var ts;
          * @param receiver The receiver for the assignment.
          */
         function transformObjectLiteralMethodDeclarationToExpression(method, receiver, container, startsOnNewLine) {
-            var ancestorFacts = enterSubtree(0 /* None */, 0 /* None */);
             var expression = ts.createAssignment(ts.createMemberAccessForPropertyName(receiver, ts.visitNode(method.name, visitor, ts.isPropertyName)), transformFunctionLikeToExpression(method, /*location*/ method, /*name*/ undefined, container));
             ts.setTextRange(expression, method);
             if (startsOnNewLine) {
                 ts.startOnNewLine(expression);
             }
-            exitSubtree(ancestorFacts, 49152 /* PropagateNewTargetMask */, hierarchyFacts & 49152 /* PropagateNewTargetMask */ ? 16384 /* NewTarget */ : 0 /* None */);
             return expression;
         }
         function visitCatchClause(node) {
@@ -73540,19 +74521,17 @@ var ts;
             ts.Debug.assert(!ts.isComputedPropertyName(node.name));
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+            var ancestorFacts = enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var updated;
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
-            var body = node.transformFlags & (16384 /* ContainsCapturedLexicalThis */ | 128 /* ContainsES2015 */)
-                ? transformFunctionBody(node)
-                : visitFunctionBodyDownLevel(node);
+            var body = transformFunctionBody(node);
             if (node.kind === 158 /* GetAccessor */) {
                 updated = ts.updateGetAccessor(node, node.decorators, node.modifiers, node.name, parameters, node.type, body);
             }
             else {
                 updated = ts.updateSetAccessor(node, node.decorators, node.modifiers, node.name, parameters, body);
             }
-            exitSubtree(ancestorFacts, 49152 /* PropagateNewTargetMask */, 0 /* None */);
+            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return updated;
         }
@@ -73566,10 +74545,7 @@ var ts;
             /*location*/ node);
         }
         function visitComputedPropertyName(node) {
-            var ancestorFacts = enterSubtree(0 /* ComputedPropertyNameExcludes */, 8192 /* ComputedPropertyNameIncludes */);
-            var updated = ts.visitEachChild(node, visitor, context);
-            exitSubtree(ancestorFacts, 49152 /* PropagateNewTargetMask */, hierarchyFacts & 49152 /* PropagateNewTargetMask */ ? 32768 /* NewTargetInComputedPropertyName */ : 0 /* None */);
-            return updated;
+            return ts.visitEachChild(node, visitor, context);
         }
         /**
          * Visits a YieldExpression node.
@@ -73586,7 +74562,7 @@ var ts;
          * @param node An ArrayLiteralExpression node.
          */
         function visitArrayLiteralExpression(node) {
-            if (node.transformFlags & 64 /* ES2015 */) {
+            if (ts.some(node.elements, ts.isSpreadElement)) {
                 // We are here because we contain a SpreadElementExpression.
                 return transformAndSpreadElements(node.elements, /*needsUniqueCopy*/ true, !!node.multiLine, /*hasTrailingComma*/ !!node.elements.hasTrailingComma);
             }
@@ -73601,7 +74577,10 @@ var ts;
             if (ts.getEmitFlags(node) & 33554432 /* TypeScriptClassWrapper */) {
                 return visitTypeScriptClassWrapper(node);
             }
-            if (node.transformFlags & 64 /* ES2015 */) {
+            var expression = ts.skipOuterExpressions(node.expression);
+            if (expression.kind === 98 /* SuperKeyword */ ||
+                ts.isSuperProperty(expression) ||
+                ts.some(node.arguments, ts.isSpreadElement)) {
                 return visitCallExpressionWithPotentialCapturedThisAssignment(node, /*assignToCapturedThis*/ true);
             }
             return ts.updateCall(node, ts.visitNode(node.expression, callExpressionVisitor, ts.isExpression), 
@@ -73722,7 +74701,7 @@ var ts;
         function visitCallExpressionWithPotentialCapturedThisAssignment(node, assignToCapturedThis) {
             // We are here either because SuperKeyword was used somewhere in the expression, or
             // because we contain a SpreadElementExpression.
-            if (node.transformFlags & 131072 /* ContainsRestOrSpread */ ||
+            if (node.transformFlags & 4096 /* ContainsRestOrSpread */ ||
                 node.expression.kind === 98 /* SuperKeyword */ ||
                 ts.isSuperProperty(ts.skipOuterExpressions(node.expression))) {
                 var _a = ts.createCallBinding(node.expression, hoistVariableDeclaration), target = _a.target, thisArg = _a.thisArg;
@@ -73730,7 +74709,7 @@ var ts;
                     ts.setEmitFlags(thisArg, 4 /* NoSubstitution */);
                 }
                 var resultingCall = void 0;
-                if (node.transformFlags & 131072 /* ContainsRestOrSpread */) {
+                if (node.transformFlags & 4096 /* ContainsRestOrSpread */) {
                     // [source]
                     //      f(...a, b)
                     //      x.m(...a, b)
@@ -73744,7 +74723,7 @@ var ts;
                     //      _super.apply(this, a.concat([b]))
                     //      _super.m.apply(this, a.concat([b]))
                     //      _super.prototype.m.apply(this, a.concat([b]))
-                    resultingCall = ts.createFunctionApply(ts.visitNode(target, callExpressionVisitor, ts.isExpression), ts.visitNode(thisArg, visitor, ts.isExpression), transformAndSpreadElements(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*hasTrailingComma*/ false));
+                    resultingCall = ts.createFunctionApply(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 98 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), transformAndSpreadElements(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*hasTrailingComma*/ false));
                 }
                 else {
                     // [source]
@@ -73756,13 +74735,11 @@ var ts;
                     //      _super.call(this, a)
                     //      _super.m.call(this, a)
                     //      _super.prototype.m.call(this, a)
-                    resultingCall = ts.createFunctionCall(ts.visitNode(target, callExpressionVisitor, ts.isExpression), ts.visitNode(thisArg, visitor, ts.isExpression), ts.visitNodes(node.arguments, visitor, ts.isExpression), 
+                    resultingCall = ts.createFunctionCall(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 98 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), ts.visitNodes(node.arguments, visitor, ts.isExpression), 
                     /*location*/ node);
                 }
                 if (node.expression.kind === 98 /* SuperKeyword */) {
-                    var actualThis = ts.createThis();
-                    ts.setEmitFlags(actualThis, 4 /* NoSubstitution */);
-                    var initializer = ts.createLogicalOr(resultingCall, actualThis);
+                    var initializer = ts.createLogicalOr(resultingCall, createActualThis());
                     resultingCall = assignToCapturedThis
                         ? ts.createAssignment(ts.createFileLevelUniqueName("_this"), initializer)
                         : initializer;
@@ -73777,7 +74754,7 @@ var ts;
          * @param node A NewExpression node.
          */
         function visitNewExpression(node) {
-            if (node.transformFlags & 131072 /* ContainsRestOrSpread */) {
+            if (ts.some(node.arguments, ts.isSpreadElement)) {
                 // We are here because we contain a SpreadElementExpression.
                 // [source]
                 //      new C(...a)
@@ -74040,12 +75017,7 @@ var ts;
         }
         function visitMetaProperty(node) {
             if (node.keywordToken === 95 /* NewKeyword */ && node.name.escapedText === "target") {
-                if (hierarchyFacts & 8192 /* ComputedPropertyName */) {
-                    hierarchyFacts |= 32768 /* NewTargetInComputedPropertyName */;
-                }
-                else {
-                    hierarchyFacts |= 16384 /* NewTarget */;
-                }
+                hierarchyFacts |= 8192 /* NewTarget */;
                 return ts.createFileLevelUniqueName("_newTarget");
             }
             return node;
@@ -74060,7 +75032,7 @@ var ts;
         function onEmitNode(hint, node, emitCallback) {
             if (enabledSubstitutions & 1 /* CapturedThis */ && ts.isFunctionLike(node)) {
                 // If we are tracking a captured `this`, keep track of the enclosing function.
-                var ancestorFacts = enterSubtree(16286 /* FunctionExcludes */, ts.getEmitFlags(node) & 8 /* CapturesThis */
+                var ancestorFacts = enterSubtree(8094 /* FunctionExcludes */, ts.getEmitFlags(node) & 8 /* CapturesThis */
                     ? 65 /* FunctionIncludes */ | 16 /* CapturesThis */
                     : 65 /* FunctionIncludes */);
                 previousOnEmitNode(hint, node, emitCallback);
@@ -74240,7 +75212,7 @@ var ts;
     }
     ts.transformES2015 = transformES2015;
     function createExtendsHelper(context, name) {
-        context.requestEmitHelper(extendsHelper);
+        context.requestEmitHelper(ts.extendsHelper);
         return ts.createCall(ts.getHelperName("__extends"), 
         /*typeArguments*/ undefined, [
             name,
@@ -74248,20 +75220,20 @@ var ts;
         ]);
     }
     function createTemplateObjectHelper(context, cooked, raw) {
-        context.requestEmitHelper(templateObjectHelper);
+        context.requestEmitHelper(ts.templateObjectHelper);
         return ts.createCall(ts.getHelperName("__makeTemplateObject"), 
         /*typeArguments*/ undefined, [
             cooked,
             raw
         ]);
     }
-    var extendsHelper = {
+    ts.extendsHelper = {
         name: "typescript:extends",
         scoped: false,
         priority: 0,
         text: "\n            var __extends = (this && this.__extends) || (function () {\n                var extendStatics = function (d, b) {\n                    extendStatics = Object.setPrototypeOf ||\n                        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||\n                        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };\n                    return extendStatics(d, b);\n                };\n\n                return function (d, b) {\n                    extendStatics(d, b);\n                    function __() { this.constructor = d; }\n                    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());\n                };\n            })();"
     };
-    var templateObjectHelper = {
+    ts.templateObjectHelper = {
         name: "typescript:makeTemplateObject",
         scoped: false,
         priority: 0,
@@ -74608,7 +75580,7 @@ var ts;
         var withBlockStack; // A stack containing `with` blocks.
         return ts.chainBundle(transformSourceFile);
         function transformSourceFile(node) {
-            if (node.isDeclarationFile || (node.transformFlags & 512 /* ContainsGenerator */) === 0) {
+            if (node.isDeclarationFile || (node.transformFlags & 256 /* ContainsGenerator */) === 0) {
                 return node;
             }
             var visited = ts.visitEachChild(node, visitor, context);
@@ -74628,10 +75600,10 @@ var ts;
             else if (inGeneratorFunctionBody) {
                 return visitJavaScriptInGeneratorFunctionBody(node);
             }
-            else if (transformFlags & 256 /* Generator */) {
+            else if (ts.isFunctionLikeDeclaration(node) && node.asteriskToken) {
                 return visitGenerator(node);
             }
-            else if (transformFlags & 512 /* ContainsGenerator */) {
+            else if (transformFlags & 256 /* ContainsGenerator */) {
                 return ts.visitEachChild(node, visitor, context);
             }
             else {
@@ -74684,10 +75656,10 @@ var ts;
                 case 230 /* ReturnStatement */:
                     return visitReturnStatement(node);
                 default:
-                    if (node.transformFlags & 4194304 /* ContainsYield */) {
+                    if (node.transformFlags & 131072 /* ContainsYield */) {
                         return visitJavaScriptContainingYield(node);
                     }
-                    else if (node.transformFlags & (512 /* ContainsGenerator */ | 8388608 /* ContainsHoistedDeclarationOrCompletion */)) {
+                    else if (node.transformFlags & (256 /* ContainsGenerator */ | 262144 /* ContainsHoistedDeclarationOrCompletion */)) {
                         return ts.visitEachChild(node, visitor, context);
                     }
                     else {
@@ -74863,7 +75835,7 @@ var ts;
             var statementOffset = ts.addPrologue(statements, body.statements, /*ensureUseStrict*/ false, visitor);
             transformAndEmitStatements(body.statements, statementOffset);
             var buildResult = build();
-            ts.addStatementsAfterPrologue(statements, endLexicalEnvironment());
+            ts.insertStatementsAfterStandardPrologue(statements, endLexicalEnvironment());
             statements.push(ts.createReturn(buildResult));
             // Restore previous generator state
             inGeneratorFunctionBody = savedInGeneratorFunctionBody;
@@ -74890,7 +75862,7 @@ var ts;
          * @param node The node to visit.
          */
         function visitVariableStatement(node) {
-            if (node.transformFlags & 4194304 /* ContainsYield */) {
+            if (node.transformFlags & 131072 /* ContainsYield */) {
                 transformAndEmitVariableDeclarationList(node.declarationList);
                 return undefined;
             }
@@ -75948,7 +76920,7 @@ var ts;
             }
         }
         function containsYield(node) {
-            return !!node && (node.transformFlags & 4194304 /* ContainsYield */) !== 0;
+            return !!node && (node.transformFlags & 131072 /* ContainsYield */) !== 0;
         }
         function countInitialNodesWithoutYield(nodes) {
             var numNodes = nodes.length;
@@ -76955,7 +77927,7 @@ var ts;
     }
     ts.transformGenerators = transformGenerators;
     function createGeneratorHelper(context, body) {
-        context.requestEmitHelper(generatorHelper);
+        context.requestEmitHelper(ts.generatorHelper);
         return ts.createCall(ts.getHelperName("__generator"), 
         /*typeArguments*/ undefined, [ts.createThis(), body]);
     }
@@ -77018,7 +77990,7 @@ var ts;
     //                        entering a finally block.
     //
     // For examples of how these are used, see the comments in ./transformers/generators.ts
-    var generatorHelper = {
+    ts.generatorHelper = {
         name: "typescript:generator",
         scoped: false,
         priority: 6,
@@ -77051,7 +78023,7 @@ var ts;
         context.enableSubstitution(202 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
         context.enableSubstitution(203 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
         context.enableSubstitution(276 /* ShorthandPropertyAssignment */); // Substitutes shorthand property assignments for imported/exported symbols.
-        context.enableEmitNotification(279 /* SourceFile */); // Restore state when substituting nodes in a file.
+        context.enableEmitNotification(284 /* SourceFile */); // Restore state when substituting nodes in a file.
         var moduleInfoMap = []; // The ExternalModuleInfo for each file.
         var deferredExports = []; // Exports to defer until an EndOfDeclarationMarker is found.
         var currentSourceFile; // The current file.
@@ -77067,7 +78039,7 @@ var ts;
         function transformSourceFile(node) {
             if (node.isDeclarationFile ||
                 !(ts.isEffectiveExternalModule(node, compilerOptions) ||
-                    node.transformFlags & 16777216 /* ContainsDynamicImport */ ||
+                    node.transformFlags & 524288 /* ContainsDynamicImport */ ||
                     (ts.isJsonSourceFile(node) && ts.hasJsonModuleEmitEnabled(compilerOptions) && (compilerOptions.out || compilerOptions.outFile)))) {
                 return node;
             }
@@ -77104,7 +78076,7 @@ var ts;
             ts.append(statements, ts.visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, ts.isStatement));
             ts.addRange(statements, ts.visitNodes(node.statements, sourceElementVisitor, ts.isStatement, statementOffset));
             addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false);
-            ts.addStatementsAfterPrologue(statements, endLexicalEnvironment());
+            ts.insertStatementsAfterStandardPrologue(statements, endLexicalEnvironment());
             var updated = ts.updateSourceFileNode(node, ts.setTextRange(ts.createNodeArray(statements), node.statements));
             if (currentModuleInfo.hasExportStarsToExportValues && !compilerOptions.importHelpers) {
                 // If we have any `export * from ...` declarations
@@ -77330,7 +78302,7 @@ var ts;
             addExportEqualsIfNeeded(statements, /*emitAsReturn*/ true);
             // End the lexical environment for the module body
             // and merge any new lexical declarations.
-            ts.addStatementsAfterPrologue(statements, endLexicalEnvironment());
+            ts.insertStatementsAfterStandardPrologue(statements, endLexicalEnvironment());
             var body = ts.createBlock(statements, /*multiLine*/ true);
             if (currentModuleInfo.hasExportStarsToExportValues && !compilerOptions.importHelpers) {
                 // If we have any `export * from ...` declarations
@@ -77393,9 +78365,9 @@ var ts;
                     return visitFunctionDeclaration(node);
                 case 240 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 310 /* MergeDeclarationMarker */:
+                case 315 /* MergeDeclarationMarker */:
                     return visitMergeDeclarationMarker(node);
-                case 311 /* EndOfDeclarationMarker */:
+                case 316 /* EndOfDeclarationMarker */:
                     return visitEndOfDeclarationMarker(node);
                 default:
                     return ts.visitEachChild(node, moduleExpressionElementVisitor, context);
@@ -77404,13 +78376,13 @@ var ts;
         function moduleExpressionElementVisitor(node) {
             // This visitor does not need to descend into the tree if there is no dynamic import or destructuring assignment,
             // as export/import statements are only transformed at the top level of a file.
-            if (!(node.transformFlags & 16777216 /* ContainsDynamicImport */) && !(node.transformFlags & 2048 /* ContainsDestructuringAssignment */)) {
+            if (!(node.transformFlags & 524288 /* ContainsDynamicImport */) && !(node.transformFlags & 512 /* ContainsDestructuringAssignment */)) {
                 return node;
             }
             if (ts.isImportCall(node)) {
                 return visitImportCallExpression(node);
             }
-            else if (node.transformFlags & 1024 /* DestructuringAssignment */ && ts.isBinaryExpression(node)) {
+            else if (ts.isDestructuringAssignment(node)) {
                 return visitDestructuringAssignment(node);
             }
             else {
@@ -77471,7 +78443,7 @@ var ts;
         }
         function visitImportCallExpression(node) {
             var argument = ts.visitNode(ts.firstOrUndefined(node.arguments), moduleExpressionElementVisitor);
-            var containsLexicalThis = !!(node.transformFlags & 8192 /* ContainsLexicalThis */);
+            var containsLexicalThis = !!(node.transformFlags & 2048 /* ContainsLexicalThis */);
             switch (compilerOptions.module) {
                 case ts.ModuleKind.AMD:
                     return createImportCallExpressionAMD(argument, containsLexicalThis);
@@ -77553,7 +78525,7 @@ var ts;
             }
             var promise = ts.createNew(ts.createIdentifier("Promise"), /*typeArguments*/ undefined, [func]);
             if (compilerOptions.esModuleInterop) {
-                context.requestEmitHelper(importStarHelper);
+                context.requestEmitHelper(ts.importStarHelper);
                 return ts.createCall(ts.createPropertyAccess(promise, ts.createIdentifier("then")), /*typeArguments*/ undefined, [ts.getHelperName("__importStar")]);
             }
             return promise;
@@ -77567,7 +78539,7 @@ var ts;
             var promiseResolveCall = ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Promise"), "resolve"), /*typeArguments*/ undefined, /*argumentsArray*/ []);
             var requireCall = ts.createCall(ts.createIdentifier("require"), /*typeArguments*/ undefined, arg ? [arg] : []);
             if (compilerOptions.esModuleInterop) {
-                context.requestEmitHelper(importStarHelper);
+                context.requestEmitHelper(ts.importStarHelper);
                 requireCall = ts.createCall(ts.getHelperName("__importStar"), /*typeArguments*/ undefined, [requireCall]);
             }
             var func;
@@ -77601,11 +78573,11 @@ var ts;
                 return innerExpr;
             }
             if (ts.getImportNeedsImportStarHelper(node)) {
-                context.requestEmitHelper(importStarHelper);
+                context.requestEmitHelper(ts.importStarHelper);
                 return ts.createCall(ts.getHelperName("__importStar"), /*typeArguments*/ undefined, [innerExpr]);
             }
             if (ts.getImportNeedsImportDefaultHelper(node)) {
-                context.requestEmitHelper(importDefaultHelper);
+                context.requestEmitHelper(ts.importDefaultHelper);
                 return ts.createCall(ts.getHelperName("__importDefault"), /*typeArguments*/ undefined, [innerExpr]);
             }
             return innerExpr;
@@ -78174,7 +79146,7 @@ var ts;
          * @param emit A callback used to emit the node in the printer.
          */
         function onEmitNode(hint, node, emitCallback) {
-            if (node.kind === 279 /* SourceFile */) {
+            if (node.kind === 284 /* SourceFile */) {
                 currentSourceFile = node;
                 currentModuleInfo = moduleInfoMap[ts.getOriginalNodeId(currentSourceFile)];
                 noSubstitution = [];
@@ -78262,7 +79234,7 @@ var ts;
             }
             if (!ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) {
                 var exportContainer = resolver.getReferencedExportContainer(node, ts.isExportName(node));
-                if (exportContainer && exportContainer.kind === 279 /* SourceFile */) {
+                if (exportContainer && exportContainer.kind === 284 /* SourceFile */) {
                     return ts.setTextRange(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(node)), 
                     /*location*/ node);
                 }
@@ -78388,13 +79360,13 @@ var ts;
         text: "\n            var __syncRequire = typeof module === \"object\" && typeof module.exports === \"object\";"
     };
     // emit helper for `import * as Name from "foo"`
-    var importStarHelper = {
+    ts.importStarHelper = {
         name: "typescript:commonjsimportstar",
         scoped: false,
         text: "\nvar __importStar = (this && this.__importStar) || function (mod) {\n    if (mod && mod.__esModule) return mod;\n    var result = {};\n    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];\n    result[\"default\"] = mod;\n    return result;\n};"
     };
     // emit helper for `import Name from "foo"`
-    var importDefaultHelper = {
+    ts.importDefaultHelper = {
         name: "typescript:commonjsimportdefault",
         scoped: false,
         text: "\nvar __importDefault = (this && this.__importDefault) || function (mod) {\n    return (mod && mod.__esModule) ? mod : { \"default\": mod };\n};"
@@ -78417,7 +79389,7 @@ var ts;
         context.enableSubstitution(204 /* BinaryExpression */); // Substitutes assignments to exported symbols.
         context.enableSubstitution(202 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
         context.enableSubstitution(203 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableEmitNotification(279 /* SourceFile */); // Restore state when substituting nodes in a file.
+        context.enableEmitNotification(284 /* SourceFile */); // Restore state when substituting nodes in a file.
         var moduleInfoMap = []; // The ExternalModuleInfo for each file.
         var deferredExports = []; // Exports to defer until an EndOfDeclarationMarker is found.
         var exportFunctionsMap = []; // The export function associated with a source file.
@@ -78436,7 +79408,7 @@ var ts;
          * @param node The SourceFile node.
          */
         function transformSourceFile(node) {
-            if (node.isDeclarationFile || !(ts.isEffectiveExternalModule(node, compilerOptions) || node.transformFlags & 16777216 /* ContainsDynamicImport */)) {
+            if (node.isDeclarationFile || !(ts.isEffectiveExternalModule(node, compilerOptions) || node.transformFlags & 524288 /* ContainsDynamicImport */)) {
                 return node;
             }
             var id = ts.getOriginalNodeId(node);
@@ -78602,7 +79574,7 @@ var ts;
             // We emit hoisted variables early to align roughly with our previous emit output.
             // Two key differences in this approach are:
             // - Temporary variables will appear at the top rather than at the bottom of the file
-            ts.addStatementsAfterPrologue(statements, endLexicalEnvironment());
+            ts.insertStatementsAfterStandardPrologue(statements, endLexicalEnvironment());
             var exportStarFunction = addExportStarIfNeeded(statements); // TODO: GH#18217
             var moduleObject = ts.createObjectLiteral([
                 ts.createPropertyAssignment("setters", createSettersArray(exportStarFunction, dependencyGroups)),
@@ -78987,7 +79959,7 @@ var ts;
         function shouldHoistVariableDeclarationList(node) {
             // hoist only non-block scoped declarations or block scoped declarations parented by source file
             return (ts.getEmitFlags(node) & 2097152 /* NoHoisting */) === 0
-                && (enclosingBlockScopedContainer.kind === 279 /* SourceFile */
+                && (enclosingBlockScopedContainer.kind === 284 /* SourceFile */
                     || (ts.getOriginalNode(node).flags & 3 /* BlockScoped */) === 0);
         }
         /**
@@ -79330,9 +80302,9 @@ var ts;
                     return visitCatchClause(node);
                 case 218 /* Block */:
                     return visitBlock(node);
-                case 310 /* MergeDeclarationMarker */:
+                case 315 /* MergeDeclarationMarker */:
                     return visitMergeDeclarationMarker(node);
-                case 311 /* EndOfDeclarationMarker */:
+                case 316 /* EndOfDeclarationMarker */:
                     return visitEndOfDeclarationMarker(node);
                 default:
                     return destructuringAndImportCallVisitor(node);
@@ -79514,14 +80486,13 @@ var ts;
          * @param node The node to visit.
          */
         function destructuringAndImportCallVisitor(node) {
-            if (node.transformFlags & 1024 /* DestructuringAssignment */
-                && node.kind === 204 /* BinaryExpression */) {
+            if (ts.isDestructuringAssignment(node)) {
                 return visitDestructuringAssignment(node);
             }
             else if (ts.isImportCall(node)) {
                 return visitImportCallExpression(node);
             }
-            else if ((node.transformFlags & 2048 /* ContainsDestructuringAssignment */) || (node.transformFlags & 16777216 /* ContainsDynamicImport */)) {
+            else if ((node.transformFlags & 512 /* ContainsDestructuringAssignment */) || (node.transformFlags & 524288 /* ContainsDynamicImport */)) {
                 return ts.visitEachChild(node, destructuringAndImportCallVisitor, context);
             }
             else {
@@ -79580,7 +80551,7 @@ var ts;
             }
             else if (ts.isIdentifier(node)) {
                 var container = resolver.getReferencedExportContainer(node);
-                return container !== undefined && container.kind === 279 /* SourceFile */;
+                return container !== undefined && container.kind === 284 /* SourceFile */;
             }
             else {
                 return false;
@@ -79613,7 +80584,7 @@ var ts;
          * @param emitCallback A callback used to emit the node in the printer.
          */
         function onEmitNode(hint, node, emitCallback) {
-            if (node.kind === 279 /* SourceFile */) {
+            if (node.kind === 284 /* SourceFile */) {
                 var id = ts.getOriginalNodeId(node);
                 currentSourceFile = node;
                 moduleInfo = moduleInfoMap[id];
@@ -79822,7 +80793,7 @@ var ts;
                     || resolver.getReferencedValueDeclaration(name);
                 if (valueDeclaration) {
                     var exportContainer = resolver.getReferencedExportContainer(name, /*prefixLocals*/ false);
-                    if (exportContainer && exportContainer.kind === 279 /* SourceFile */) {
+                    if (exportContainer && exportContainer.kind === 284 /* SourceFile */) {
                         exportedNames = ts.append(exportedNames, ts.getDeclarationName(valueDeclaration));
                     }
                     exportedNames = ts.addRange(exportedNames, moduleInfo && moduleInfo.exportedBindings[ts.getOriginalNodeId(valueDeclaration)]);
@@ -79861,7 +80832,7 @@ var ts;
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableEmitNotification(279 /* SourceFile */);
+        context.enableEmitNotification(284 /* SourceFile */);
         context.enableSubstitution(72 /* Identifier */);
         var currentSourceFile;
         return ts.chainBundle(transformSourceFile);
@@ -79971,7 +80942,8 @@ var ts;
             ts.isImportEqualsDeclaration(node) ||
             ts.isTypeAliasDeclaration(node) ||
             ts.isConstructorDeclaration(node) ||
-            ts.isIndexSignatureDeclaration(node);
+            ts.isIndexSignatureDeclaration(node) ||
+            ts.isPropertyAccessExpression(node);
     }
     ts.canProduceDiagnostics = canProduceDiagnostics;
     function createGetSymbolAccessibilityDiagnosticForNodeName(node) {
@@ -80045,7 +81017,7 @@ var ts;
     }
     ts.createGetSymbolAccessibilityDiagnosticForNodeName = createGetSymbolAccessibilityDiagnosticForNodeName;
     function createGetSymbolAccessibilityDiagnosticForNode(node) {
-        if (ts.isVariableDeclaration(node) || ts.isPropertyDeclaration(node) || ts.isPropertySignature(node) || ts.isBindingElement(node) || ts.isConstructorDeclaration(node)) {
+        if (ts.isVariableDeclaration(node) || ts.isPropertyDeclaration(node) || ts.isPropertySignature(node) || ts.isPropertyAccessExpression(node) || ts.isBindingElement(node) || ts.isConstructorDeclaration(node)) {
             return getVariableDeclarationTypeVisibilityError;
         }
         else if (ts.isSetAccessor(node) || ts.isGetAccessor(node)) {
@@ -80085,7 +81057,7 @@ var ts;
             }
             // This check is to ensure we don't report error on constructor parameter property as that error would be reported during parameter emit
             // The only exception here is if the constructor was marked as private. we are not emitting the constructor parameters at all.
-            else if (node.kind === 154 /* PropertyDeclaration */ || node.kind === 153 /* PropertySignature */ ||
+            else if (node.kind === 154 /* PropertyDeclaration */ || node.kind === 189 /* PropertyAccessExpression */ || node.kind === 153 /* PropertySignature */ ||
                 (node.kind === 151 /* Parameter */ && ts.hasModifier(node.parent, 8 /* Private */))) {
                 // TODO(jfreeman): Deal with computed properties in error reporting.
                 if (ts.hasModifier(node, 32 /* Static */)) {
@@ -80290,6 +81262,9 @@ var ts;
                 case 241 /* InterfaceDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1;
                     break;
+                case 181 /* MappedType */:
+                    diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1;
+                    break;
                 case 166 /* ConstructorType */:
                 case 161 /* ConstructSignature */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
@@ -80373,6 +81348,31 @@ var ts;
         return result.diagnostics;
     }
     ts.getDeclarationDiagnostics = getDeclarationDiagnostics;
+    function hasInternalAnnotation(range, currentSourceFile) {
+        var comment = currentSourceFile.text.substring(range.pos, range.end);
+        return ts.stringContains(comment, "@internal");
+    }
+    function isInternalDeclaration(node, currentSourceFile) {
+        var parseTreeNode = ts.getParseTreeNode(node);
+        if (parseTreeNode && parseTreeNode.kind === 151 /* Parameter */) {
+            var paramIdx = parseTreeNode.parent.parameters.indexOf(parseTreeNode);
+            var previousSibling = paramIdx > 0 ? parseTreeNode.parent.parameters[paramIdx - 1] : undefined;
+            var text = currentSourceFile.text;
+            var commentRanges = previousSibling
+                ? ts.concatenate(
+                // to handle
+                // ... parameters, /* @internal */
+                // public param: string
+                ts.getTrailingCommentRanges(text, ts.skipTrivia(text, previousSibling.end + 1, /* stopAfterLineBreak */ false, /* stopAtComments */ true)), ts.getLeadingCommentRanges(text, node.pos))
+                : ts.getTrailingCommentRanges(text, ts.skipTrivia(text, node.pos, /* stopAfterLineBreak */ false, /* stopAtComments */ true));
+            return commentRanges && commentRanges.length && hasInternalAnnotation(ts.last(commentRanges), currentSourceFile);
+        }
+        var leadingCommentRanges = parseTreeNode && ts.getLeadingCommentRangesOfNode(parseTreeNode, currentSourceFile);
+        return !!ts.forEach(leadingCommentRanges, function (range) {
+            return hasInternalAnnotation(range, currentSourceFile);
+        });
+    }
+    ts.isInternalDeclaration = isInternalDeclaration;
     var declarationEmitNodeBuilderFlags = 1024 /* MultilineObjectLiterals */ |
         2048 /* WriteClassExpressionAsTypeLiteral */ |
         4096 /* UseTypeOfFunction */ |
@@ -80501,10 +81501,10 @@ var ts;
             }
         }
         function transformRoot(node) {
-            if (node.kind === 279 /* SourceFile */ && (node.isDeclarationFile || ts.isSourceFileJS(node))) {
+            if (node.kind === 284 /* SourceFile */ && (node.isDeclarationFile || ts.isSourceFileJS(node))) {
                 return node;
             }
-            if (node.kind === 280 /* Bundle */) {
+            if (node.kind === 285 /* Bundle */) {
                 isBundledEmit = true;
                 refs = ts.createMap();
                 libs = ts.createMap();
@@ -80534,9 +81534,15 @@ var ts;
                     var updated = ts.visitNodes(sourceFile.statements, visitDeclarationStatements);
                     return ts.updateSourceFileNode(sourceFile, transformAndReplaceLatePaintedStatements(updated), /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []);
                 }), ts.mapDefined(node.prepends, function (prepend) {
-                    if (prepend.kind === 282 /* InputFiles */) {
-                        return ts.createUnparsedSourceFile(prepend, "dts");
-                    }
+                    if (prepend.kind === 287 /* InputFiles */) {
+                        var sourceFile = ts.createUnparsedSourceFile(prepend, "dts", stripInternal);
+                        hasNoDefaultLib_1 = hasNoDefaultLib_1 || !!sourceFile.hasNoDefaultLib;
+                        collectReferences(sourceFile, refs);
+                        recordTypeReferenceDirectivesIfNecessary(sourceFile.typeReferenceDirectives);
+                        collectLibs(sourceFile, libs);
+                        return sourceFile;
+                    }
+                    return prepend;
                 }));
                 bundle.syntheticFileReferences = [];
                 bundle.syntheticTypeReferences = getFileReferencesForUsedTypeReferences();
@@ -80628,7 +81634,7 @@ var ts;
             }
         }
         function collectReferences(sourceFile, ret) {
-            if (noResolve || ts.isSourceFileJS(sourceFile))
+            if (noResolve || (!ts.isUnparsedSource(sourceFile) && ts.isSourceFileJS(sourceFile)))
                 return ret;
             ts.forEach(sourceFile.referencedFiles, function (f) {
                 var elem = ts.tryResolveScriptReference(host, sourceFile, f);
@@ -81175,7 +82181,9 @@ var ts;
                             if (!ts.isPropertyAccessExpression(p.valueDeclaration)) {
                                 return undefined;
                             }
+                            getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(p.valueDeclaration);
                             var type = resolver.createTypeOfDeclaration(p.valueDeclaration, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker);
+                            getSymbolAccessibilityDiagnostic = oldDiag;
                             var varDecl = ts.createVariableDeclaration(ts.unescapeLeadingUnderscores(p.escapedName), type, /*initializer*/ undefined);
                             return ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList([varDecl]));
                         });
@@ -81218,7 +82226,7 @@ var ts;
                     if (ctor) {
                         var oldDiag_1 = getSymbolAccessibilityDiagnostic;
                         parameterProperties = ts.compact(ts.flatMap(ctor.parameters, function (param) {
-                            if (!ts.hasModifier(param, 92 /* ParameterPropertyModifier */))
+                            if (!ts.hasModifier(param, 92 /* ParameterPropertyModifier */) || shouldStripInternal(param))
                                 return;
                             getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(param);
                             if (param.name.kind === 72 /* Identifier */) {
@@ -81354,18 +82362,8 @@ var ts;
             }
             errorNameNode = undefined;
         }
-        function hasInternalAnnotation(range) {
-            var comment = currentSourceFile.text.substring(range.pos, range.end);
-            return ts.stringContains(comment, "@internal");
-        }
         function shouldStripInternal(node) {
-            if (stripInternal && node) {
-                var leadingCommentRanges = ts.getLeadingCommentRangesOfNode(ts.getParseTreeNode(node), currentSourceFile);
-                if (ts.forEach(leadingCommentRanges, hasInternalAnnotation)) {
-                    return true;
-                }
-            }
-            return false;
+            return !!stripInternal && !!node && isInternalDeclaration(node, currentSourceFile);
         }
         function isScopeMarker(node) {
             return ts.isExportAssignment(node) || ts.isExportDeclaration(node);
@@ -81387,7 +82385,7 @@ var ts;
         function ensureModifierFlags(node, privateDeclaration) {
             var mask = 3071 /* All */ ^ (4 /* Public */ | 256 /* Async */); // No async modifiers in declaration files
             var additions = (needsDeclare && !isAlwaysType(node)) ? 2 /* Ambient */ : 0 /* None */;
-            var parentIsFile = node.parent.kind === 279 /* SourceFile */;
+            var parentIsFile = node.parent.kind === 284 /* SourceFile */;
             if (!parentIsFile || (isBundledEmit && parentIsFile && ts.isExternalModule(node.parent))) {
                 mask ^= ((privateDeclaration || (isBundledEmit && parentIsFile) || hasScopeMarker(node.parent) ? 0 : 1 /* Export */) | 2 /* Ambient */);
                 additions = 0 /* None */;
@@ -81556,9 +82554,15 @@ var ts;
         if (jsx === 2 /* React */) {
             transformers.push(ts.transformJsx);
         }
-        if (languageVersion < 6 /* ESNext */) {
+        if (languageVersion < 7 /* ESNext */) {
             transformers.push(ts.transformESNext);
         }
+        if (languageVersion < 6 /* ES2019 */) {
+            transformers.push(ts.transformES2019);
+        }
+        if (languageVersion < 5 /* ES2018 */) {
+            transformers.push(ts.transformES2018);
+        }
         if (languageVersion < 4 /* ES2017 */) {
             transformers.push(ts.transformES2017);
         }
@@ -81598,7 +82602,7 @@ var ts;
      * @param allowDtsFiles A value indicating whether to allow the transformation of .d.ts files.
      */
     function transformNodes(resolver, host, options, nodes, transformers, allowDtsFiles) {
-        var enabledSyntaxKindFeatures = new Array(312 /* Count */);
+        var enabledSyntaxKindFeatures = new Array(317 /* Count */);
         var lexicalEnvironmentVariableDeclarations;
         var lexicalEnvironmentFunctionDeclarations;
         var lexicalEnvironmentVariableDeclarationsStack = [];
@@ -81858,10 +82862,14 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    var infoExtension = ".tsbundleinfo";
     var brackets = createBracketsMap();
     var syntheticParent = { pos: -1, end: -1 };
     /*@internal*/
+    function isBuildInfoFile(file) {
+        return ts.fileExtensionIs(file, ".tsbuildinfo" /* TsBuildInfo */);
+    }
+    ts.isBuildInfoFile = isBuildInfoFile;
+    /*@internal*/
     /**
      * Iterates over the source files that are expected to have an emit output.
      *
@@ -81871,13 +82879,14 @@ var ts;
      *   If an array, the full list of source files to emit.
      *   Else, calls `getSourceFilesToEmit` with the (optional) target source file to determine the list of source files to emit.
      */
-    function forEachEmittedFile(host, action, sourceFilesOrTargetSourceFile, emitOnlyDtsFiles) {
+    function forEachEmittedFile(host, action, sourceFilesOrTargetSourceFile, emitOnlyDtsFiles, onlyBuildInfo, includeBuildInfo) {
         if (emitOnlyDtsFiles === void 0) { emitOnlyDtsFiles = false; }
         var sourceFiles = ts.isArray(sourceFilesOrTargetSourceFile) ? sourceFilesOrTargetSourceFile : ts.getSourceFilesToEmit(host, sourceFilesOrTargetSourceFile);
         var options = host.getCompilerOptions();
         if (options.outFile || options.out) {
-            if (sourceFiles.length) {
-                var bundle = ts.createBundle(sourceFiles, host.getPrependNodes());
+            var prepends = host.getPrependNodes();
+            if (sourceFiles.length || prepends.length) {
+                var bundle = ts.createBundle(sourceFiles, prepends);
                 var result = action(getOutputPathsFor(bundle, host, emitOnlyDtsFiles), bundle);
                 if (result) {
                     return result;
@@ -81885,31 +82894,61 @@ var ts;
             }
         }
         else {
-            for (var _a = 0, sourceFiles_1 = sourceFiles; _a < sourceFiles_1.length; _a++) {
-                var sourceFile = sourceFiles_1[_a];
-                var result = action(getOutputPathsFor(sourceFile, host, emitOnlyDtsFiles), sourceFile);
-                if (result) {
-                    return result;
+            if (!onlyBuildInfo) {
+                for (var _a = 0, sourceFiles_1 = sourceFiles; _a < sourceFiles_1.length; _a++) {
+                    var sourceFile = sourceFiles_1[_a];
+                    var result = action(getOutputPathsFor(sourceFile, host, emitOnlyDtsFiles), sourceFile);
+                    if (result) {
+                        return result;
+                    }
                 }
             }
+            if (includeBuildInfo) {
+                var buildInfoPath = getOutputPathForBuildInfo(host.getCompilerOptions());
+                if (buildInfoPath)
+                    return action({ buildInfoPath: buildInfoPath }, /*sourceFileOrBundle*/ undefined);
+            }
         }
     }
     ts.forEachEmittedFile = forEachEmittedFile;
     /*@internal*/
+    function getOutputPathForBuildInfo(options) {
+        var configFile = options.configFilePath;
+        if (!configFile || !ts.isIncrementalCompilation(options))
+            return undefined;
+        if (options.tsBuildInfoFile)
+            return options.tsBuildInfoFile;
+        var outPath = options.outFile || options.out;
+        var buildInfoExtensionLess;
+        if (outPath) {
+            buildInfoExtensionLess = ts.removeFileExtension(outPath);
+        }
+        else {
+            var configFileExtensionLess = ts.removeFileExtension(configFile);
+            buildInfoExtensionLess = options.outDir ?
+                options.rootDir ?
+                    ts.resolvePath(options.outDir, ts.getRelativePathFromDirectory(options.rootDir, configFileExtensionLess, /*ignoreCase*/ true)) :
+                    ts.combinePaths(options.outDir, ts.getBaseFileName(configFileExtensionLess)) :
+                configFileExtensionLess;
+        }
+        return buildInfoExtensionLess + ".tsbuildinfo" /* TsBuildInfo */;
+    }
+    ts.getOutputPathForBuildInfo = getOutputPathForBuildInfo;
+    /*@internal*/
     function getOutputPathsForBundle(options, forceDtsPaths) {
         var outPath = options.outFile || options.out;
         var jsFilePath = options.emitDeclarationOnly ? undefined : outPath;
         var sourceMapFilePath = jsFilePath && getSourceMapFilePath(jsFilePath, options);
         var declarationFilePath = (forceDtsPaths || ts.getEmitDeclarations(options)) ? ts.removeFileExtension(outPath) + ".d.ts" /* Dts */ : undefined;
         var declarationMapPath = declarationFilePath && ts.getAreDeclarationMapsEnabled(options) ? declarationFilePath + ".map" : undefined;
-        var bundleInfoPath = options.references && jsFilePath ? (ts.removeFileExtension(jsFilePath) + infoExtension) : undefined;
-        return { jsFilePath: jsFilePath, sourceMapFilePath: sourceMapFilePath, declarationFilePath: declarationFilePath, declarationMapPath: declarationMapPath, bundleInfoPath: bundleInfoPath };
+        var buildInfoPath = getOutputPathForBuildInfo(options);
+        return { jsFilePath: jsFilePath, sourceMapFilePath: sourceMapFilePath, declarationFilePath: declarationFilePath, declarationMapPath: declarationMapPath, buildInfoPath: buildInfoPath };
     }
     ts.getOutputPathsForBundle = getOutputPathsForBundle;
     /*@internal*/
     function getOutputPathsFor(sourceFile, host, forceDtsPaths) {
         var options = host.getCompilerOptions();
-        if (sourceFile.kind === 280 /* Bundle */) {
+        if (sourceFile.kind === 285 /* Bundle */) {
             return getOutputPathsForBundle(options, forceDtsPaths);
         }
         else {
@@ -81923,19 +82962,13 @@ var ts;
             var isJs = ts.isSourceFileJS(sourceFile);
             var declarationFilePath = ((forceDtsPaths || ts.getEmitDeclarations(options)) && !isJs) ? ts.getDeclarationEmitOutputFilePath(sourceFile.fileName, host) : undefined;
             var declarationMapPath = declarationFilePath && ts.getAreDeclarationMapsEnabled(options) ? declarationFilePath + ".map" : undefined;
-            return { jsFilePath: jsFilePath, sourceMapFilePath: sourceMapFilePath, declarationFilePath: declarationFilePath, declarationMapPath: declarationMapPath, bundleInfoPath: undefined };
+            return { jsFilePath: jsFilePath, sourceMapFilePath: sourceMapFilePath, declarationFilePath: declarationFilePath, declarationMapPath: declarationMapPath, buildInfoPath: undefined };
         }
     }
     ts.getOutputPathsFor = getOutputPathsFor;
     function getSourceMapFilePath(jsFilePath, options) {
         return (options.sourceMap && !options.inlineSourceMap) ? jsFilePath + ".map" : undefined;
     }
-    function createDefaultBundleInfo() {
-        return {
-            originalOffset: -1,
-            totalLength: -1
-        };
-    }
     // JavaScript files are always LanguageVariant.JSX, as JSX syntax is allowed in .js files also.
     // So for JavaScript files, '.jsx' is only emitted if the input was '.jsx', and JsxEmit.Preserve.
     // For TypeScript, the only time to emit with a '.jsx' extension, is on JSX input, and JsxEmit.Preserve
@@ -81958,9 +82991,91 @@ var ts;
         return ".js" /* Js */;
     }
     ts.getOutputExtension = getOutputExtension;
+    function rootDirOfOptions(configFile) {
+        return configFile.options.rootDir || ts.getDirectoryPath(ts.Debug.assertDefined(configFile.options.configFilePath));
+    }
+    function getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, outputDir) {
+        return outputDir ?
+            ts.resolvePath(outputDir, ts.getRelativePathFromDirectory(rootDirOfOptions(configFile), inputFileName, ignoreCase)) :
+            inputFileName;
+    }
+    /* @internal */
+    function getOutputDeclarationFileName(inputFileName, configFile, ignoreCase) {
+        ts.Debug.assert(!ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */) && ts.hasTSFileExtension(inputFileName));
+        return ts.changeExtension(getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, configFile.options.declarationDir || configFile.options.outDir), ".d.ts" /* Dts */);
+    }
+    ts.getOutputDeclarationFileName = getOutputDeclarationFileName;
+    function getOutputJSFileName(inputFileName, configFile, ignoreCase) {
+        var isJsonFile = ts.fileExtensionIs(inputFileName, ".json" /* Json */);
+        var outputFileName = ts.changeExtension(getOutputPathWithoutChangingExt(inputFileName, configFile, ignoreCase, configFile.options.outDir), isJsonFile ?
+            ".json" /* Json */ :
+            ts.fileExtensionIs(inputFileName, ".tsx" /* Tsx */) && configFile.options.jsx === 1 /* Preserve */ ?
+                ".jsx" /* Jsx */ :
+                ".js" /* Js */);
+        return !isJsonFile || ts.comparePaths(inputFileName, outputFileName, ts.Debug.assertDefined(configFile.options.configFilePath), ignoreCase) !== 0 /* EqualTo */ ?
+            outputFileName :
+            undefined;
+    }
+    /*@internal*/
+    function getAllProjectOutputs(configFile, ignoreCase) {
+        var outputs;
+        var addOutput = function (path) { return path && (outputs || (outputs = [])).push(path); };
+        if (configFile.options.outFile || configFile.options.out) {
+            var _a = getOutputPathsForBundle(configFile.options, /*forceDtsPaths*/ false), jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, buildInfoPath = _a.buildInfoPath;
+            addOutput(jsFilePath);
+            addOutput(sourceMapFilePath);
+            addOutput(declarationFilePath);
+            addOutput(declarationMapPath);
+            addOutput(buildInfoPath);
+        }
+        else {
+            for (var _b = 0, _c = configFile.fileNames; _b < _c.length; _b++) {
+                var inputFileName = _c[_b];
+                if (ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */))
+                    continue;
+                var js = getOutputJSFileName(inputFileName, configFile, ignoreCase);
+                addOutput(js);
+                if (ts.fileExtensionIs(inputFileName, ".json" /* Json */))
+                    continue;
+                if (configFile.options.sourceMap) {
+                    addOutput(js + ".map");
+                }
+                if (ts.getEmitDeclarations(configFile.options) && ts.hasTSFileExtension(inputFileName)) {
+                    var dts = getOutputDeclarationFileName(inputFileName, configFile, ignoreCase);
+                    addOutput(dts);
+                    if (configFile.options.declarationMap) {
+                        addOutput(dts + ".map");
+                    }
+                }
+            }
+            addOutput(getOutputPathForBuildInfo(configFile.options));
+        }
+        return outputs || ts.emptyArray;
+    }
+    ts.getAllProjectOutputs = getAllProjectOutputs;
+    /*@internal*/
+    function getFirstProjectOutput(configFile, ignoreCase) {
+        if (configFile.options.outFile || configFile.options.out) {
+            var jsFilePath = getOutputPathsForBundle(configFile.options, /*forceDtsPaths*/ false).jsFilePath;
+            return ts.Debug.assertDefined(jsFilePath, "project " + configFile.options.configFilePath + " expected to have at least one output");
+        }
+        for (var _a = 0, _b = configFile.fileNames; _a < _b.length; _a++) {
+            var inputFileName = _b[_a];
+            if (ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */))
+                continue;
+            var jsFilePath = getOutputJSFileName(inputFileName, configFile, ignoreCase);
+            if (jsFilePath)
+                return jsFilePath;
+        }
+        var buildInfoPath = getOutputPathForBuildInfo(configFile.options);
+        if (buildInfoPath)
+            return buildInfoPath;
+        return ts.Debug.fail("project " + configFile.options.configFilePath + " expected to have at least one output");
+    }
+    ts.getFirstProjectOutput = getFirstProjectOutput;
     /*@internal*/
     // targetSourceFile is when users only want one file in entire project to be emitted. This is used in compileOnSave feature
-    function emitFiles(resolver, host, targetSourceFile, emitOnlyDtsFiles, transformers, declarationTransformers) {
+    function emitFiles(resolver, host, targetSourceFile, emitOnlyDtsFiles, transformers, declarationTransformers, onlyBuildInfo) {
         var compilerOptions = host.getCompilerOptions();
         var sourceMapDataList = (compilerOptions.sourceMap || compilerOptions.inlineSourceMap || ts.getAreDeclarationMapsEnabled(compilerOptions)) ? [] : undefined;
         var emittedFilesList = compilerOptions.listEmittedFiles ? [] : undefined;
@@ -81968,12 +83083,12 @@ var ts;
         var newLine = ts.getNewLineCharacter(compilerOptions, function () { return host.getNewLine(); });
         var writer = ts.createTextWriter(newLine);
         var _a = ts.performance.createTimer("printTime", "beforePrint", "afterPrint"), enter = _a.enter, exit = _a.exit;
-        var bundleInfo = createDefaultBundleInfo();
+        var bundleBuildInfo;
         var emitSkipped = false;
         var exportedModulesFromDeclarationEmit;
         // Emit each output file
         enter();
-        forEachEmittedFile(host, emitSourceFileOrBundle, ts.getSourceFilesToEmit(host, targetSourceFile), emitOnlyDtsFiles);
+        forEachEmittedFile(host, emitSourceFileOrBundle, ts.getSourceFilesToEmit(host, targetSourceFile), emitOnlyDtsFiles, onlyBuildInfo, !targetSourceFile);
         exit();
         return {
             emitSkipped: emitSkipped,
@@ -81983,9 +83098,16 @@ var ts;
             exportedModulesFromDeclarationEmit: exportedModulesFromDeclarationEmit
         };
         function emitSourceFileOrBundle(_a, sourceFileOrBundle) {
-            var jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, bundleInfoPath = _a.bundleInfoPath;
-            emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, bundleInfoPath);
+            var jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, buildInfoPath = _a.buildInfoPath;
+            if (buildInfoPath && sourceFileOrBundle && ts.isBundle(sourceFileOrBundle)) {
+                bundleBuildInfo = {
+                    commonSourceDirectory: host.getCommonSourceDirectory(),
+                    sourceFiles: sourceFileOrBundle.sourceFiles.map(function (file) { return file.fileName; })
+                };
+            }
+            emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath);
             emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath);
+            emitBuildInfo(bundleBuildInfo, buildInfoPath);
             if (!emitSkipped && emittedFilesList) {
                 if (!emitOnlyDtsFiles) {
                     if (jsFilePath) {
@@ -81994,8 +83116,8 @@ var ts;
                     if (sourceMapFilePath) {
                         emittedFilesList.push(sourceMapFilePath);
                     }
-                    if (bundleInfoPath) {
-                        emittedFilesList.push(bundleInfoPath);
+                    if (buildInfoPath) {
+                        emittedFilesList.push(buildInfoPath);
                     }
                 }
                 if (declarationFilePath) {
@@ -82006,8 +83128,21 @@ var ts;
                 }
             }
         }
-        function emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, bundleInfoPath) {
-            if (emitOnlyDtsFiles || !jsFilePath) {
+        function emitBuildInfo(bundle, buildInfoPath) {
+            // Write build information if applicable
+            if (!buildInfoPath || targetSourceFile || emitSkipped)
+                return;
+            var program = host.getProgramBuildInfo();
+            if (!bundle && !program)
+                return;
+            if (host.isEmitBlocked(buildInfoPath) || compilerOptions.noEmit) {
+                emitSkipped = true;
+                return;
+            }
+            ts.writeFile(host, emitterDiagnostics, buildInfoPath, getBuildInfoText({ bundle: bundle, program: program, version: ts.version }), /*writeByteOrderMark*/ false);
+        }
+        function emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath) {
+            if (!sourceFileOrBundle || emitOnlyDtsFiles || !jsFilePath) {
                 return;
             }
             // Make sure not to write js file and source map file if any of them cannot be written
@@ -82027,6 +83162,7 @@ var ts;
                 inlineSourceMap: compilerOptions.inlineSourceMap,
                 inlineSources: compilerOptions.inlineSources,
                 extendedDiagnostics: compilerOptions.extendedDiagnostics,
+                writeBundleFileInfo: !!bundleBuildInfo
             };
             // Create a printer to print the nodes
             var printer = createPrinter(printerOptions, {
@@ -82037,12 +83173,14 @@ var ts;
                 substituteNode: transform.substituteNode,
             });
             ts.Debug.assert(transform.transformed.length === 1, "Should only see one output from the transform");
-            printSourceFileOrBundle(jsFilePath, sourceMapFilePath, transform.transformed[0], bundleInfoPath, printer, compilerOptions);
+            printSourceFileOrBundle(jsFilePath, sourceMapFilePath, transform.transformed[0], printer, compilerOptions);
             // Clean up emit nodes on parse tree
             transform.dispose();
+            if (bundleBuildInfo)
+                bundleBuildInfo.js = printer.bundleFileInfo;
         }
         function emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath) {
-            if (!(declarationFilePath && !ts.isInJSFile(sourceFileOrBundle))) {
+            if (!sourceFileOrBundle || !(declarationFilePath && !ts.isInJSFile(sourceFileOrBundle))) {
                 return;
             }
             var sourceFiles = ts.isSourceFile(sourceFileOrBundle) ? [sourceFileOrBundle] : sourceFileOrBundle.sourceFiles;
@@ -82071,6 +83209,8 @@ var ts;
                 inlineSourceMap: compilerOptions.inlineSourceMap,
                 extendedDiagnostics: compilerOptions.extendedDiagnostics,
                 onlyPrintJsDocStyle: true,
+                writeBundleFileInfo: !!bundleBuildInfo,
+                recordInternalSection: !!bundleBuildInfo
             };
             var declarationPrinter = createPrinter(printerOptions, {
                 // resolver hooks
@@ -82083,18 +83223,20 @@ var ts;
             emitSkipped = emitSkipped || declBlocked;
             if (!declBlocked || emitOnlyDtsFiles) {
                 ts.Debug.assert(declarationTransform.transformed.length === 1, "Should only see one output from the decl transform");
-                printSourceFileOrBundle(declarationFilePath, declarationMapPath, declarationTransform.transformed[0], /* bundleInfopath*/ undefined, declarationPrinter, {
+                printSourceFileOrBundle(declarationFilePath, declarationMapPath, declarationTransform.transformed[0], declarationPrinter, {
                     sourceMap: compilerOptions.declarationMap,
                     sourceRoot: compilerOptions.sourceRoot,
                     mapRoot: compilerOptions.mapRoot,
                     extendedDiagnostics: compilerOptions.extendedDiagnostics,
                 });
-                if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === 279 /* SourceFile */) {
+                if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === 284 /* SourceFile */) {
                     var sourceFile = declarationTransform.transformed[0];
                     exportedModulesFromDeclarationEmit = sourceFile.exportedModulesFromDeclarationEmit;
                 }
             }
             declarationTransform.dispose();
+            if (bundleBuildInfo)
+                bundleBuildInfo.dts = declarationPrinter.bundleFileInfo;
         }
         function collectLinkedAliases(node) {
             if (ts.isExportAssignment(node)) {
@@ -82109,16 +83251,16 @@ var ts;
             }
             ts.forEachChild(node, collectLinkedAliases);
         }
-        function printSourceFileOrBundle(jsFilePath, sourceMapFilePath, sourceFileOrBundle, bundleInfoPath, printer, mapOptions) {
-            var bundle = sourceFileOrBundle.kind === 280 /* Bundle */ ? sourceFileOrBundle : undefined;
-            var sourceFile = sourceFileOrBundle.kind === 279 /* SourceFile */ ? sourceFileOrBundle : undefined;
+        function printSourceFileOrBundle(jsFilePath, sourceMapFilePath, sourceFileOrBundle, printer, mapOptions) {
+            var bundle = sourceFileOrBundle.kind === 285 /* Bundle */ ? sourceFileOrBundle : undefined;
+            var sourceFile = sourceFileOrBundle.kind === 284 /* SourceFile */ ? sourceFileOrBundle : undefined;
             var sourceFiles = bundle ? bundle.sourceFiles : [sourceFile];
             var sourceMapGenerator;
             if (shouldEmitSourceMaps(mapOptions, sourceFileOrBundle)) {
                 sourceMapGenerator = ts.createSourceMapGenerator(host, ts.getBaseFileName(ts.normalizeSlashes(jsFilePath)), getSourceRoot(mapOptions), getSourceMapDirectory(mapOptions, jsFilePath, sourceFile), mapOptions);
             }
             if (bundle) {
-                printer.writeBundle(bundle, bundleInfo, writer, sourceMapGenerator);
+                printer.writeBundle(bundle, writer, sourceMapGenerator);
             }
             else {
                 printer.writeFile(sourceFile, writer, sourceMapGenerator);
@@ -82147,18 +83289,12 @@ var ts;
             }
             // Write the output file
             ts.writeFile(host, emitterDiagnostics, jsFilePath, writer.getText(), !!compilerOptions.emitBOM, sourceFiles);
-            // Write bundled offset information if applicable
-            if (bundleInfoPath) {
-                bundleInfo.totalLength = writer.getTextPos();
-                ts.writeFile(host, emitterDiagnostics, bundleInfoPath, JSON.stringify(bundleInfo, undefined, 2), /*writeByteOrderMark*/ false);
-            }
             // Reset state
             writer.clear();
-            bundleInfo = createDefaultBundleInfo();
         }
         function shouldEmitSourceMaps(mapOptions, sourceFileOrBundle) {
             return (mapOptions.sourceMap || mapOptions.inlineSourceMap)
-                && (sourceFileOrBundle.kind !== 279 /* SourceFile */ || !ts.fileExtensionIs(sourceFileOrBundle.fileName, ".json" /* Json */));
+                && (sourceFileOrBundle.kind !== 284 /* SourceFile */ || !ts.fileExtensionIs(sourceFileOrBundle.fileName, ".json" /* Json */));
         }
         function getSourceRoot(mapOptions) {
             // Normalize source root and make sure it has trailing "/" so that it can be used to combine paths with the
@@ -82215,6 +83351,167 @@ var ts;
         }
     }
     ts.emitFiles = emitFiles;
+    /*@internal*/
+    function getBuildInfoText(buildInfo) {
+        return JSON.stringify(buildInfo, undefined, 2);
+    }
+    ts.getBuildInfoText = getBuildInfoText;
+    /*@internal*/
+    function getBuildInfo(buildInfoText) {
+        return JSON.parse(buildInfoText);
+    }
+    ts.getBuildInfo = getBuildInfo;
+    /*@internal*/
+    ts.notImplementedResolver = {
+        hasGlobalName: ts.notImplemented,
+        getReferencedExportContainer: ts.notImplemented,
+        getReferencedImportDeclaration: ts.notImplemented,
+        getReferencedDeclarationWithCollidingName: ts.notImplemented,
+        isDeclarationWithCollidingName: ts.notImplemented,
+        isValueAliasDeclaration: ts.notImplemented,
+        isReferencedAliasDeclaration: ts.notImplemented,
+        isTopLevelValueImportEqualsWithEntityName: ts.notImplemented,
+        getNodeCheckFlags: ts.notImplemented,
+        isDeclarationVisible: ts.notImplemented,
+        isLateBound: function (_node) { return false; },
+        collectLinkedAliases: ts.notImplemented,
+        isImplementationOfOverload: ts.notImplemented,
+        isRequiredInitializedParameter: ts.notImplemented,
+        isOptionalUninitializedParameterProperty: ts.notImplemented,
+        isExpandoFunctionDeclaration: ts.notImplemented,
+        getPropertiesOfContainerFunction: ts.notImplemented,
+        createTypeOfDeclaration: ts.notImplemented,
+        createReturnTypeOfSignatureDeclaration: ts.notImplemented,
+        createTypeOfExpression: ts.notImplemented,
+        createLiteralConstValue: ts.notImplemented,
+        isSymbolAccessible: ts.notImplemented,
+        isEntityNameVisible: ts.notImplemented,
+        // Returns the constant value this property access resolves to: notImplemented, or 'undefined' for a non-constant
+        getConstantValue: ts.notImplemented,
+        getReferencedValueDeclaration: ts.notImplemented,
+        getTypeReferenceSerializationKind: ts.notImplemented,
+        isOptionalParameter: ts.notImplemented,
+        moduleExportsSomeValue: ts.notImplemented,
+        isArgumentsLocalBinding: ts.notImplemented,
+        getExternalModuleFileFromDeclaration: ts.notImplemented,
+        getTypeReferenceDirectivesForEntityName: ts.notImplemented,
+        getTypeReferenceDirectivesForSymbol: ts.notImplemented,
+        isLiteralConstDeclaration: ts.notImplemented,
+        getJsxFactoryEntity: ts.notImplemented,
+        getAllAccessorDeclarations: ts.notImplemented,
+        getSymbolOfExternalModuleSpecifier: ts.notImplemented,
+        isBindingCapturedByNode: ts.notImplemented,
+    };
+    function createSourceFilesFromBundleBuildInfo(bundle) {
+        var sourceFiles = bundle.sourceFiles.map(function (fileName) {
+            var sourceFile = ts.createNode(284 /* SourceFile */, 0, 0);
+            sourceFile.fileName = fileName;
+            sourceFile.text = "";
+            sourceFile.statements = ts.createNodeArray();
+            return sourceFile;
+        });
+        var jsBundle = ts.Debug.assertDefined(bundle.js);
+        ts.forEach(jsBundle.sources && jsBundle.sources.prologues, function (prologueInfo) {
+            var sourceFile = sourceFiles[prologueInfo.file];
+            sourceFile.text = prologueInfo.text;
+            sourceFile.end = prologueInfo.text.length;
+            sourceFile.statements = ts.createNodeArray(prologueInfo.directives.map(function (directive) {
+                var statement = ts.createNode(221 /* ExpressionStatement */, directive.pos, directive.end);
+                statement.expression = ts.createNode(10 /* StringLiteral */, directive.expression.pos, directive.expression.end);
+                statement.expression.text = directive.expression.text;
+                return statement;
+            }));
+        });
+        return sourceFiles;
+    }
+    /*@internal*/
+    function emitUsingBuildInfo(config, host, getCommandLine) {
+        var _a = getOutputPathsForBundle(config.options, /*forceDtsPaths*/ false), buildInfoPath = _a.buildInfoPath, jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath;
+        var buildInfoText = host.readFile(ts.Debug.assertDefined(buildInfoPath));
+        if (!buildInfoText)
+            return buildInfoPath;
+        var jsFileText = host.readFile(ts.Debug.assertDefined(jsFilePath));
+        if (!jsFileText)
+            return jsFilePath;
+        var sourceMapText = sourceMapFilePath && host.readFile(sourceMapFilePath);
+        // error if no source map or for now if inline sourcemap
+        if ((sourceMapFilePath && !sourceMapText) || config.options.inlineSourceMap)
+            return sourceMapFilePath || "inline sourcemap decoding";
+        // read declaration text
+        var declarationText = declarationFilePath && host.readFile(declarationFilePath);
+        if (declarationFilePath && !declarationText)
+            return declarationFilePath;
+        var declarationMapText = declarationMapPath && host.readFile(declarationMapPath);
+        // error if no source map or for now if inline sourcemap
+        if ((declarationMapPath && !declarationMapText) || config.options.inlineSourceMap)
+            return declarationMapPath || "inline sourcemap decoding";
+        var buildInfo = getBuildInfo(buildInfoText);
+        if (!buildInfo.bundle || !buildInfo.bundle.js || (declarationText && !buildInfo.bundle.dts))
+            return buildInfoPath;
+        var ownPrependInput = ts.createInputFiles(jsFileText, declarationText, sourceMapFilePath, sourceMapText, declarationMapPath, declarationMapText, jsFilePath, declarationFilePath, buildInfoPath, buildInfo, 
+        /*onlyOwnText*/ true);
+        var outputFiles = [];
+        var prependNodes = ts.createPrependNodes(config.projectReferences, getCommandLine, function (f) { return host.readFile(f); });
+        var sourceFilesForJsEmit = createSourceFilesFromBundleBuildInfo(buildInfo.bundle);
+        var emitHost = {
+            getPrependNodes: ts.memoize(function () { return prependNodes.concat([ownPrependInput]); }),
+            getCanonicalFileName: host.getCanonicalFileName,
+            getCommonSourceDirectory: function () { return buildInfo.bundle.commonSourceDirectory; },
+            getCompilerOptions: function () { return config.options; },
+            getCurrentDirectory: function () { return host.getCurrentDirectory(); },
+            getNewLine: function () { return host.getNewLine(); },
+            getSourceFile: ts.returnUndefined,
+            getSourceFileByPath: ts.returnUndefined,
+            getSourceFiles: function () { return sourceFilesForJsEmit; },
+            getLibFileFromReference: ts.notImplemented,
+            isSourceFileFromExternalLibrary: ts.returnFalse,
+            getResolvedProjectReferenceToRedirect: ts.returnUndefined,
+            writeFile: function (name, text, writeByteOrderMark) {
+                switch (name) {
+                    case jsFilePath:
+                        if (jsFileText === text)
+                            return;
+                        break;
+                    case sourceMapFilePath:
+                        if (sourceMapText === text)
+                            return;
+                        break;
+                    case buildInfoPath:
+                        var newBuildInfo = getBuildInfo(text);
+                        newBuildInfo.program = buildInfo.program;
+                        // Update sourceFileInfo
+                        var _a = buildInfo.bundle, js = _a.js, dts = _a.dts, sourceFiles = _a.sourceFiles;
+                        newBuildInfo.bundle.js.sources = js.sources;
+                        if (dts) {
+                            newBuildInfo.bundle.dts.sources = dts.sources;
+                        }
+                        newBuildInfo.bundle.sourceFiles = sourceFiles;
+                        outputFiles.push({ name: name, text: getBuildInfoText(newBuildInfo), writeByteOrderMark: writeByteOrderMark });
+                        return;
+                    case declarationFilePath:
+                        if (declarationText === text)
+                            return;
+                        break;
+                    case declarationMapPath:
+                        if (declarationMapText === text)
+                            return;
+                        break;
+                    default:
+                        ts.Debug.fail("Unexpected path: " + name);
+                }
+                outputFiles.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark });
+            },
+            isEmitBlocked: ts.returnFalse,
+            readFile: function (f) { return host.readFile(f); },
+            fileExists: function (f) { return host.fileExists(f); },
+            directoryExists: host.directoryExists && (function (f) { return host.directoryExists(f); }),
+            useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
+            getProgramBuildInfo: ts.returnUndefined
+        };
+        emitFiles(ts.notImplementedResolver, emitHost, /*targetSourceFile*/ undefined, /*emitOnlyDtsFiles*/ false, ts.getTransformers(config.options));
+        return outputFiles;
+    }
+    ts.emitUsingBuildInfo = emitUsingBuildInfo;
     var PipelinePhase;
     (function (PipelinePhase) {
         PipelinePhase[PipelinePhase["Notification"] = 0] = "Notification";
@@ -82243,6 +83540,10 @@ var ts;
         var ownWriter; // Reusable `EmitTextWriter` for basic printing.
         var write = writeBase;
         var isOwnFileEmit;
+        var bundleFileInfo = printerOptions.writeBundleFileInfo ? { sections: [] } : undefined;
+        var recordInternalSection = printerOptions.recordInternalSection;
+        var sourceFileTextPos = 0;
+        var sourceFileTextKind = "text" /* Text */;
         // Source Maps
         var sourceMapsDisabled = true;
         var sourceMapGenerator;
@@ -82268,7 +83569,8 @@ var ts;
             writeNode: writeNode,
             writeList: writeList,
             writeFile: writeFile,
-            writeBundle: writeBundle
+            writeBundle: writeBundle,
+            bundleFileInfo: bundleFileInfo
         };
         function printNode(hint, node, sourceFile) {
             switch (hint) {
@@ -82283,9 +83585,9 @@ var ts;
                     break;
             }
             switch (node.kind) {
-                case 279 /* SourceFile */: return printFile(node);
-                case 280 /* Bundle */: return printBundle(node);
-                case 281 /* UnparsedSource */: return printUnparsedSource(node);
+                case 284 /* SourceFile */: return printFile(node);
+                case 285 /* Bundle */: return printBundle(node);
+                case 286 /* UnparsedSource */: return printUnparsedSource(node);
             }
             writeNode(hint, node, sourceFile, beginPrint());
             return endPrint();
@@ -82295,7 +83597,7 @@ var ts;
             return endPrint();
         }
         function printBundle(bundle) {
-            writeBundle(bundle, /*bundleInfo*/ undefined, beginPrint(), /*sourceMapEmitter*/ undefined);
+            writeBundle(bundle, beginPrint(), /*sourceMapEmitter*/ undefined);
             return endPrint();
         }
         function printFile(sourceFile) {
@@ -82323,7 +83625,49 @@ var ts;
             reset();
             writer = previousWriter;
         }
-        function writeBundle(bundle, bundleInfo, output, sourceMapGenerator) {
+        function getTextPosWithWriteLine() {
+            return writer.getTextPosWithWriteLine ? writer.getTextPosWithWriteLine() : writer.getTextPos();
+        }
+        function updateOrPushBundleFileTextLike(pos, end, kind) {
+            var last = ts.lastOrUndefined(bundleFileInfo.sections);
+            if (last && last.kind === kind) {
+                last.end = end;
+            }
+            else {
+                bundleFileInfo.sections.push({ pos: pos, end: end, kind: kind });
+            }
+        }
+        function recordBundleFileInternalSectionStart(node) {
+            if (recordInternalSection &&
+                bundleFileInfo &&
+                currentSourceFile &&
+                (ts.isDeclaration(node) || ts.isVariableStatement(node)) &&
+                ts.isInternalDeclaration(node, currentSourceFile) &&
+                sourceFileTextKind !== "internal" /* Internal */) {
+                var prevSourceFileTextKind = sourceFileTextKind;
+                recordBundleFileTextLikeSection(writer.getTextPos());
+                sourceFileTextPos = getTextPosWithWriteLine();
+                sourceFileTextKind = "internal" /* Internal */;
+                return prevSourceFileTextKind;
+            }
+            return undefined;
+        }
+        function recordBundleFileInternalSectionEnd(prevSourceFileTextKind) {
+            if (prevSourceFileTextKind) {
+                recordBundleFileTextLikeSection(writer.getTextPos());
+                sourceFileTextPos = getTextPosWithWriteLine();
+                sourceFileTextKind = prevSourceFileTextKind;
+            }
+        }
+        function recordBundleFileTextLikeSection(end) {
+            if (sourceFileTextPos < end) {
+                updateOrPushBundleFileTextLike(sourceFileTextPos, end, sourceFileTextKind);
+                return true;
+            }
+            return false;
+        }
+        function writeBundle(bundle, output, sourceMapGenerator) {
+            var _a;
             isOwnFileEmit = false;
             var previousWriter = writer;
             setWriter(output, sourceMapGenerator);
@@ -82331,18 +83675,49 @@ var ts;
             emitPrologueDirectivesIfNeeded(bundle);
             emitHelpers(bundle);
             emitSyntheticTripleSlashReferencesIfNeeded(bundle);
-            for (var _a = 0, _b = bundle.prepends; _a < _b.length; _a++) {
-                var prepend = _b[_a];
+            for (var _b = 0, _c = bundle.prepends; _b < _c.length; _b++) {
+                var prepend = _c[_b];
                 writeLine();
+                var pos = writer.getTextPos();
+                var savedSections = bundleFileInfo && bundleFileInfo.sections;
+                if (savedSections)
+                    bundleFileInfo.sections = [];
                 print(4 /* Unspecified */, prepend, /*sourceFile*/ undefined);
+                if (bundleFileInfo) {
+                    var newSections = bundleFileInfo.sections;
+                    bundleFileInfo.sections = savedSections;
+                    if (prepend.oldFileOfCurrentEmit)
+                        (_a = bundleFileInfo.sections).push.apply(_a, newSections);
+                    else {
+                        newSections.forEach(function (section) { return ts.Debug.assert(ts.isBundleFileTextLike(section)); });
+                        bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "prepend" /* Prepend */, data: prepend.fileName, texts: newSections });
+                    }
+                }
             }
-            if (bundleInfo) {
-                bundleInfo.originalOffset = writer.getTextPos();
-            }
-            for (var _c = 0, _d = bundle.sourceFiles; _c < _d.length; _c++) {
-                var sourceFile = _d[_c];
+            sourceFileTextPos = getTextPosWithWriteLine();
+            for (var _d = 0, _e = bundle.sourceFiles; _d < _e.length; _d++) {
+                var sourceFile = _e[_d];
                 print(0 /* SourceFile */, sourceFile, sourceFile);
             }
+            if (bundleFileInfo && bundle.sourceFiles.length) {
+                var end = writer.getTextPos();
+                if (recordBundleFileTextLikeSection(end)) {
+                    // Store prologues
+                    var prologues = getPrologueDirectivesFromBundledSourceFiles(bundle);
+                    if (prologues) {
+                        if (!bundleFileInfo.sources)
+                            bundleFileInfo.sources = {};
+                        bundleFileInfo.sources.prologues = prologues;
+                    }
+                    // Store helpes
+                    var helpers = getHelpersFromBundledSourceFiles(bundle);
+                    if (helpers) {
+                        if (!bundleFileInfo.sources)
+                            bundleFileInfo.sources = {};
+                        bundleFileInfo.sources.helpers = helpers;
+                    }
+                }
+            }
             reset();
             writer = previousWriter;
         }
@@ -82412,8 +83787,10 @@ var ts;
         function emit(node) {
             if (node === undefined)
                 return;
+            var prevSourceFileTextKind = recordBundleFileInternalSectionStart(node);
             var pipelinePhase = getPipelinePhase(0 /* Notification */, node);
             pipelinePhase(4 /* Unspecified */, node);
+            recordBundleFileInternalSectionEnd(prevSourceFileTextKind);
         }
         function emitIdentifierName(node) {
             if (node === undefined)
@@ -82440,12 +83817,12 @@ var ts;
                     }
                 // falls through
                 case 2 /* Comments */:
-                    if (!commentsDisabled && node.kind !== 279 /* SourceFile */) {
+                    if (!commentsDisabled && node.kind !== 284 /* SourceFile */) {
                         return pipelineEmitWithComments;
                     }
                 // falls through
                 case 3 /* SourceMaps */:
-                    if (!sourceMapsDisabled && node.kind !== 279 /* SourceFile */ && !ts.isInJsonFile(node)) {
+                    if (!sourceMapsDisabled && node.kind !== 284 /* SourceFile */ && !ts.isInJsonFile(node)) {
                         return pipelineEmitWithSourceMap;
                     }
                 // falls through
@@ -82482,8 +83859,16 @@ var ts;
                     case 16 /* TemplateMiddle */:
                     case 17 /* TemplateTail */:
                         return emitLiteral(node);
-                    case 281 /* UnparsedSource */:
-                        return emitUnparsedSource(node);
+                    case 286 /* UnparsedSource */:
+                    case 280 /* UnparsedPrepend */:
+                        return emitUnparsedSourceOrPrepend(node);
+                    case 279 /* UnparsedPrologue */:
+                        return writeUnparsedNode(node);
+                    case 281 /* UnparsedText */:
+                    case 282 /* UnparsedInternalText */:
+                        return emitUnparsedTextLike(node);
+                    case 283 /* UnparsedSyntheticReference */:
+                        return emitUnparsedSyntheticReference(node);
                     // Identifiers
                     case 72 /* Identifier */:
                         return emitIdentifier(node);
@@ -82527,7 +83912,7 @@ var ts;
                         return emitTypeReference(node);
                     case 165 /* FunctionType */:
                         return emitFunctionType(node);
-                    case 289 /* JSDocFunctionType */:
+                    case 294 /* JSDocFunctionType */:
                         return emitJSDocFunctionType(node);
                     case 166 /* ConstructorType */:
                         return emitConstructorType(node);
@@ -82565,20 +83950,20 @@ var ts;
                         return emitLiteralType(node);
                     case 183 /* ImportType */:
                         return emitImportTypeNode(node);
-                    case 284 /* JSDocAllType */:
+                    case 289 /* JSDocAllType */:
                         writePunctuation("*");
                         return;
-                    case 285 /* JSDocUnknownType */:
+                    case 290 /* JSDocUnknownType */:
                         writePunctuation("?");
                         return;
-                    case 286 /* JSDocNullableType */:
+                    case 291 /* JSDocNullableType */:
                         return emitJSDocNullableType(node);
-                    case 287 /* JSDocNonNullableType */:
+                    case 292 /* JSDocNonNullableType */:
                         return emitJSDocNonNullableType(node);
-                    case 288 /* JSDocOptionalType */:
+                    case 293 /* JSDocOptionalType */:
                         return emitJSDocOptionalType(node);
                     case 172 /* RestType */:
-                    case 290 /* JSDocVariadicType */:
+                    case 295 /* JSDocVariadicType */:
                         return emitRestOrJSDocVariadicType(node);
                     // Binding patterns
                     case 184 /* ObjectBindingPattern */:
@@ -82716,30 +84101,30 @@ var ts;
                     case 278 /* EnumMember */:
                         return emitEnumMember(node);
                     // JSDoc nodes (only used in codefixes currently)
-                    case 299 /* JSDocParameterTag */:
-                    case 305 /* JSDocPropertyTag */:
+                    case 304 /* JSDocParameterTag */:
+                    case 310 /* JSDocPropertyTag */:
                         return emitJSDocPropertyLikeTag(node);
-                    case 300 /* JSDocReturnTag */:
-                    case 302 /* JSDocTypeTag */:
-                    case 301 /* JSDocThisTag */:
-                    case 298 /* JSDocEnumTag */:
+                    case 305 /* JSDocReturnTag */:
+                    case 307 /* JSDocTypeTag */:
+                    case 306 /* JSDocThisTag */:
+                    case 303 /* JSDocEnumTag */:
                         return emitJSDocSimpleTypedTag(node);
-                    case 295 /* JSDocAugmentsTag */:
+                    case 300 /* JSDocAugmentsTag */:
                         return emitJSDocAugmentsTag(node);
-                    case 303 /* JSDocTemplateTag */:
+                    case 308 /* JSDocTemplateTag */:
                         return emitJSDocTemplateTag(node);
-                    case 304 /* JSDocTypedefTag */:
+                    case 309 /* JSDocTypedefTag */:
                         return emitJSDocTypedefTag(node);
-                    case 297 /* JSDocCallbackTag */:
+                    case 302 /* JSDocCallbackTag */:
                         return emitJSDocCallbackTag(node);
-                    case 293 /* JSDocSignature */:
+                    case 298 /* JSDocSignature */:
                         return emitJSDocSignature(node);
-                    case 292 /* JSDocTypeLiteral */:
+                    case 297 /* JSDocTypeLiteral */:
                         return emitJSDocTypeLiteral(node);
-                    case 296 /* JSDocClassTag */:
-                    case 294 /* JSDocTag */:
+                    case 301 /* JSDocClassTag */:
+                    case 299 /* JSDocTag */:
                         return emitJSDocSimpleTag(node);
-                    case 291 /* JSDocComment */:
+                    case 296 /* JSDocComment */:
                         return emitJSDoc(node);
                     // Transformation nodes (ignored)
                 }
@@ -82838,9 +84223,9 @@ var ts;
                     case 264 /* JsxFragment */:
                         return emitJsxFragment(node);
                     // Transformation nodes
-                    case 308 /* PartiallyEmittedExpression */:
+                    case 313 /* PartiallyEmittedExpression */:
                         return emitPartiallyEmittedExpression(node);
-                    case 309 /* CommaListExpression */:
+                    case 314 /* CommaListExpression */:
                         return emitCommaList(node);
                 }
             }
@@ -82856,22 +84241,45 @@ var ts;
             var pipelinePhase = getNextPipelinePhase(1 /* Substitution */, node);
             pipelinePhase(hint, substituteNode(hint, node));
         }
+        function getHelpersFromBundledSourceFiles(bundle) {
+            var result;
+            if (moduleKind === ts.ModuleKind.None || printerOptions.noEmitHelpers) {
+                return undefined;
+            }
+            var bundledHelpers = ts.createMap();
+            for (var _a = 0, _b = bundle.sourceFiles; _a < _b.length; _a++) {
+                var sourceFile = _b[_a];
+                var shouldSkip = ts.getExternalHelpersModuleName(sourceFile) !== undefined;
+                var helpers = getSortedEmitHelpers(sourceFile);
+                if (!helpers)
+                    continue;
+                for (var _c = 0, helpers_3 = helpers; _c < helpers_3.length; _c++) {
+                    var helper = helpers_3[_c];
+                    if (!helper.scoped && !shouldSkip && !bundledHelpers.get(helper.name)) {
+                        bundledHelpers.set(helper.name, true);
+                        (result || (result = [])).push(helper.name);
+                    }
+                }
+            }
+            return result;
+        }
         function emitHelpers(node) {
             var helpersEmitted = false;
-            var bundle = node.kind === 280 /* Bundle */ ? node : undefined;
+            var bundle = node.kind === 285 /* Bundle */ ? node : undefined;
             if (bundle && moduleKind === ts.ModuleKind.None) {
                 return;
             }
-            var numNodes = bundle ? bundle.sourceFiles.length : 1;
+            var numPrepends = bundle ? bundle.prepends.length : 0;
+            var numNodes = bundle ? bundle.sourceFiles.length + numPrepends : 1;
             for (var i = 0; i < numNodes; i++) {
-                var currentNode = bundle ? bundle.sourceFiles[i] : node;
-                var sourceFile = ts.isSourceFile(currentNode) ? currentNode : currentSourceFile;
-                var shouldSkip = printerOptions.noEmitHelpers || ts.getExternalHelpersModuleName(sourceFile) !== undefined;
-                var shouldBundle = ts.isSourceFile(currentNode) && !isOwnFileEmit;
-                var helpers = ts.getEmitHelpers(currentNode);
+                var currentNode = bundle ? i < numPrepends ? bundle.prepends[i] : bundle.sourceFiles[i - numPrepends] : node;
+                var sourceFile = ts.isSourceFile(currentNode) ? currentNode : ts.isUnparsedSource(currentNode) ? undefined : currentSourceFile;
+                var shouldSkip = printerOptions.noEmitHelpers || (!!sourceFile && ts.getExternalHelpersModuleName(sourceFile) !== undefined);
+                var shouldBundle = (ts.isSourceFile(currentNode) || ts.isUnparsedSource(currentNode)) && !isOwnFileEmit;
+                var helpers = ts.isUnparsedSource(currentNode) ? currentNode.helpers : getSortedEmitHelpers(currentNode);
                 if (helpers) {
-                    for (var _a = 0, _b = ts.stableSort(helpers, ts.compareEmitHelpers); _a < _b.length; _a++) {
-                        var helper = _b[_a];
+                    for (var _a = 0, helpers_4 = helpers; _a < helpers_4.length; _a++) {
+                        var helper = helpers_4[_a];
                         if (!helper.scoped) {
                             // Skip the helper if it can be skipped and the noEmitHelpers compiler
                             // option is set, or if it can be imported and the importHelpers compiler
@@ -82891,18 +84299,25 @@ var ts;
                             // Skip the helper if it is scoped and we are emitting bundled helpers
                             continue;
                         }
+                        var pos = getTextPosWithWriteLine();
                         if (typeof helper.text === "string") {
                             writeLines(helper.text);
                         }
                         else {
                             writeLines(helper.text(makeFileLevelOptimisticUniqueName));
                         }
+                        if (bundleFileInfo)
+                            bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "emitHelpers" /* EmitHelpers */, data: helper.name });
                         helpersEmitted = true;
                     }
                 }
             }
             return helpersEmitted;
         }
+        function getSortedEmitHelpers(node) {
+            var helpers = ts.getEmitHelpers(node);
+            return helpers && ts.stableSort(helpers, ts.compareEmitHelpers);
+        }
         //
         // Literals/Pseudo-literals
         //
@@ -82929,8 +84344,42 @@ var ts;
             }
         }
         // SyntaxKind.UnparsedSource
-        function emitUnparsedSource(unparsed) {
-            writer.rawWrite(unparsed.text);
+        // SyntaxKind.UnparsedPrepend
+        function emitUnparsedSourceOrPrepend(unparsed) {
+            for (var _a = 0, _b = unparsed.texts; _a < _b.length; _a++) {
+                var text = _b[_a];
+                writeLine();
+                emit(text);
+            }
+        }
+        // SyntaxKind.UnparsedPrologue
+        // SyntaxKind.UnparsedText
+        // SyntaxKind.UnparsedInternal
+        // SyntaxKind.UnparsedSyntheticReference
+        function writeUnparsedNode(unparsed) {
+            writer.rawWrite(unparsed.parent.text.substring(unparsed.pos, unparsed.end));
+        }
+        // SyntaxKind.UnparsedText
+        // SyntaxKind.UnparsedInternal
+        function emitUnparsedTextLike(unparsed) {
+            var pos = getTextPosWithWriteLine();
+            writeUnparsedNode(unparsed);
+            if (bundleFileInfo) {
+                updateOrPushBundleFileTextLike(pos, writer.getTextPos(), unparsed.kind === 281 /* UnparsedText */ ?
+                    "text" /* Text */ :
+                    "internal" /* Internal */);
+            }
+        }
+        // SyntaxKind.UnparsedSyntheticReference
+        function emitUnparsedSyntheticReference(unparsed) {
+            var pos = getTextPosWithWriteLine();
+            writeUnparsedNode(unparsed);
+            if (bundleFileInfo) {
+                var section = ts.clone(unparsed.section);
+                section.pos = pos;
+                section.end = writer.getTextPos();
+                bundleFileInfo.sections.push(section);
+            }
         }
         //
         // Identifiers
@@ -82985,7 +84434,7 @@ var ts;
             emit(node.dotDotDotToken);
             emitNodeWithWriter(node.name, writeParameter);
             emit(node.questionToken);
-            if (node.parent && node.parent.kind === 289 /* JSDocFunctionType */ && !node.name) {
+            if (node.parent && node.parent.kind === 294 /* JSDocFunctionType */ && !node.name) {
                 emit(node.type);
             }
             else {
@@ -83865,7 +85314,7 @@ var ts;
         }
         function emitBlockFunctionBodyWorker(body, emitBlockFunctionBodyOnSingleLine) {
             // Emit all the prologue directives (like "use strict").
-            var statementOffset = emitPrologueDirectives(body.statements, /*startWithNewLine*/ true);
+            var statementOffset = emitPrologueDirectives(body.statements);
             var pos = writer.getTextPos();
             emitHelpers(body);
             if (statementOffset === 0 && pos === writer.getTextPos() && emitBlockFunctionBodyOnSingleLine) {
@@ -84125,7 +85574,7 @@ var ts;
             writePunctuation(">");
         }
         function emitJsxText(node) {
-            writer.writeLiteral(getTextOfNode(node, /*includeTrivia*/ true));
+            writer.writeLiteral(node.text);
         }
         function emitJsxClosingElementOrFragment(node) {
             writePunctuation("</");
@@ -84270,7 +85719,7 @@ var ts;
                 }
             }
             if (node.tags) {
-                if (node.tags.length === 1 && node.tags[0].kind === 302 /* JSDocTypeTag */ && !node.comment) {
+                if (node.tags.length === 1 && node.tags[0].kind === 307 /* JSDocTypeTag */ && !node.comment) {
                     writeSpace();
                     emit(node.tags[0]);
                 }
@@ -84304,7 +85753,7 @@ var ts;
         function emitJSDocTypedefTag(tag) {
             emitJSDocTagName(tag.tagName);
             if (tag.typeExpression) {
-                if (tag.typeExpression.kind === 283 /* JSDocTypeExpression */) {
+                if (tag.typeExpression.kind === 288 /* JSDocTypeExpression */) {
                     emitJSDocTypeExpression(tag.typeExpression);
                 }
                 else {
@@ -84323,7 +85772,7 @@ var ts;
                 emit(tag.fullName);
             }
             emitJSDocComment(tag.comment);
-            if (tag.typeExpression && tag.typeExpression.kind === 292 /* JSDocTypeLiteral */) {
+            if (tag.typeExpression && tag.typeExpression.kind === 297 /* JSDocTypeLiteral */) {
                 emitJSDocTypeLiteral(tag.typeExpression);
             }
         }
@@ -84410,6 +85859,16 @@ var ts;
         }
         function emitSyntheticTripleSlashReferencesIfNeeded(node) {
             emitTripleSlashDirectives(!!node.hasNoDefaultLib, node.syntheticFileReferences || [], node.syntheticTypeReferences || [], node.syntheticLibReferences || []);
+            for (var _a = 0, _b = node.prepends; _a < _b.length; _a++) {
+                var prepend = _b[_a];
+                if (ts.isUnparsedSource(prepend) && prepend.syntheticReferences) {
+                    for (var _c = 0, _d = prepend.syntheticReferences; _c < _d.length; _c++) {
+                        var ref = _d[_c];
+                        emit(ref);
+                        writeLine();
+                    }
+                }
+            }
         }
         function emitTripleSlashDirectivesIfNeeded(node) {
             if (node.isDeclarationFile)
@@ -84417,7 +85876,10 @@ var ts;
         }
         function emitTripleSlashDirectives(hasNoDefaultLib, files, types, libs) {
             if (hasNoDefaultLib) {
+                var pos = writer.getTextPos();
                 writeComment("/// <reference no-default-lib=\"true\"/>");
+                if (bundleFileInfo)
+                    bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "no-default-lib" /* NoDefaultLib */ });
                 writeLine();
             }
             if (currentSourceFile && currentSourceFile.moduleName) {
@@ -84438,17 +85900,26 @@ var ts;
             }
             for (var _c = 0, files_1 = files; _c < files_1.length; _c++) {
                 var directive = files_1[_c];
+                var pos = writer.getTextPos();
                 writeComment("/// <reference path=\"" + directive.fileName + "\" />");
+                if (bundleFileInfo)
+                    bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "reference" /* Reference */, data: directive.fileName });
                 writeLine();
             }
-            for (var _d = 0, types_18 = types; _d < types_18.length; _d++) {
-                var directive = types_18[_d];
+            for (var _d = 0, types_19 = types; _d < types_19.length; _d++) {
+                var directive = types_19[_d];
+                var pos = writer.getTextPos();
                 writeComment("/// <reference types=\"" + directive.fileName + "\" />");
+                if (bundleFileInfo)
+                    bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "type" /* Type */, data: directive.fileName });
                 writeLine();
             }
             for (var _e = 0, libs_1 = libs; _e < libs_1.length; _e++) {
                 var directive = libs_1[_e];
+                var pos = writer.getTextPos();
                 writeComment("/// <reference lib=\"" + directive.fileName + "\" />");
+                if (bundleFileInfo)
+                    bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "lib" /* Lib */, data: directive.fileName });
                 writeLine();
             }
         }
@@ -84473,16 +85944,22 @@ var ts;
          * Emits any prologue directives at the start of a Statement list, returning the
          * number of prologue directives written to the output.
          */
-        function emitPrologueDirectives(statements, startWithNewLine, seenPrologueDirectives) {
+        function emitPrologueDirectives(statements, sourceFile, seenPrologueDirectives, recordBundleFileSection) {
+            var needsToSetSourceFile = !!sourceFile;
             for (var i = 0; i < statements.length; i++) {
                 var statement = statements[i];
                 if (ts.isPrologueDirective(statement)) {
                     var shouldEmitPrologueDirective = seenPrologueDirectives ? !seenPrologueDirectives.has(statement.expression.text) : true;
                     if (shouldEmitPrologueDirective) {
-                        if (startWithNewLine || i > 0) {
-                            writeLine();
+                        if (needsToSetSourceFile) {
+                            needsToSetSourceFile = false;
+                            setSourceFile(sourceFile);
                         }
+                        writeLine();
+                        var pos = writer.getTextPos();
                         emit(statement);
+                        if (recordBundleFileSection && bundleFileInfo)
+                            bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "prologue" /* Prologue */, data: statement.expression.text });
                         if (seenPrologueDirectives) {
                             seenPrologueDirectives.set(statement.expression.text, true);
                         }
@@ -84495,23 +85972,70 @@ var ts;
             }
             return statements.length;
         }
+        function emitUnparsedPrologues(prologues, seenPrologueDirectives) {
+            for (var _a = 0, prologues_1 = prologues; _a < prologues_1.length; _a++) {
+                var prologue = prologues_1[_a];
+                if (!seenPrologueDirectives.has(prologue.data)) {
+                    writeLine();
+                    var pos = writer.getTextPos();
+                    emit(prologue);
+                    if (bundleFileInfo)
+                        bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "prologue" /* Prologue */, data: prologue.data });
+                    if (seenPrologueDirectives) {
+                        seenPrologueDirectives.set(prologue.data, true);
+                    }
+                }
+            }
+        }
         function emitPrologueDirectivesIfNeeded(sourceFileOrBundle) {
             if (ts.isSourceFile(sourceFileOrBundle)) {
-                setSourceFile(sourceFileOrBundle);
-                emitPrologueDirectives(sourceFileOrBundle.statements);
+                emitPrologueDirectives(sourceFileOrBundle.statements, sourceFileOrBundle);
             }
             else {
                 var seenPrologueDirectives = ts.createMap();
-                for (var _a = 0, _b = sourceFileOrBundle.sourceFiles; _a < _b.length; _a++) {
-                    var sourceFile = _b[_a];
-                    setSourceFile(sourceFile);
-                    emitPrologueDirectives(sourceFile.statements, /*startWithNewLine*/ true, seenPrologueDirectives);
+                for (var _a = 0, _b = sourceFileOrBundle.prepends; _a < _b.length; _a++) {
+                    var prepend = _b[_a];
+                    emitUnparsedPrologues(prepend.prologues, seenPrologueDirectives);
+                }
+                for (var _c = 0, _d = sourceFileOrBundle.sourceFiles; _c < _d.length; _c++) {
+                    var sourceFile = _d[_c];
+                    emitPrologueDirectives(sourceFile.statements, sourceFile, seenPrologueDirectives, /*recordBundleFileSection*/ true);
                 }
                 setSourceFile(undefined);
             }
         }
+        function getPrologueDirectivesFromBundledSourceFiles(bundle) {
+            var seenPrologueDirectives = ts.createMap();
+            var prologues;
+            for (var index = 0; index < bundle.sourceFiles.length; index++) {
+                var sourceFile = bundle.sourceFiles[index];
+                var directives = void 0;
+                var end = 0;
+                for (var _a = 0, _b = sourceFile.statements; _a < _b.length; _a++) {
+                    var statement = _b[_a];
+                    if (!ts.isPrologueDirective(statement))
+                        break;
+                    if (seenPrologueDirectives.has(statement.expression.text))
+                        continue;
+                    seenPrologueDirectives.set(statement.expression.text, true);
+                    (directives || (directives = [])).push({
+                        pos: statement.pos,
+                        end: statement.end,
+                        expression: {
+                            pos: statement.expression.pos,
+                            end: statement.expression.end,
+                            text: statement.expression.text
+                        }
+                    });
+                    end = end < statement.end ? statement.end : end;
+                }
+                if (directives)
+                    (prologues || (prologues = [])).push({ file: index, text: sourceFile.text.substring(0, end), directives: directives });
+            }
+            return prologues;
+        }
         function emitShebangIfNeeded(sourceFileOrBundle) {
-            if (ts.isSourceFile(sourceFileOrBundle)) {
+            if (ts.isSourceFile(sourceFileOrBundle) || ts.isUnparsedSource(sourceFileOrBundle)) {
                 var shebang = ts.getShebang(sourceFileOrBundle.text);
                 if (shebang) {
                     writeComment(shebang);
@@ -84520,11 +86044,18 @@ var ts;
                 }
             }
             else {
-                for (var _a = 0, _b = sourceFileOrBundle.sourceFiles; _a < _b.length; _a++) {
-                    var sourceFile = _b[_a];
+                for (var _a = 0, _b = sourceFileOrBundle.prepends; _a < _b.length; _a++) {
+                    var prepend = _b[_a];
+                    ts.Debug.assertNode(prepend, ts.isUnparsedSource);
+                    if (emitShebangIfNeeded(prepend)) {
+                        return true;
+                    }
+                }
+                for (var _c = 0, _d = sourceFileOrBundle.sourceFiles; _c < _d.length; _c++) {
+                    var sourceFile = _d[_c];
                     // Emit only the first encountered shebang
                     if (emitShebangIfNeeded(sourceFile)) {
-                        break;
+                        return true;
                     }
                 }
             }
@@ -84727,6 +86258,7 @@ var ts;
                 }
                 // Emit each child.
                 var previousSibling = void 0;
+                var previousSourceFileTextKind = void 0;
                 var shouldDecreaseIndentAfterEmit = false;
                 for (var i = 0; i < count; i++) {
                     var child = children[start + i];
@@ -84747,6 +86279,7 @@ var ts;
                             emitLeadingCommentsOfPosition(previousSibling.end);
                         }
                         writeDelimiter(format);
+                        recordBundleFileInternalSectionEnd(previousSourceFileTextKind);
                         // Write either a line terminator or whitespace to separate the elements.
                         if (shouldWriteSeparatingLineTerminator(previousSibling, child, format)) {
                             // If a synthesized node in a single-line list starts on a new
@@ -84763,6 +86296,7 @@ var ts;
                         }
                     }
                     // Emit this child.
+                    previousSourceFileTextKind = recordBundleFileInternalSectionStart(child);
                     if (shouldEmitInterveningComments) {
                         if (emitTrailingCommentsOfPosition) {
                             var commentRange = ts.getCommentRange(child);
@@ -84797,6 +86331,7 @@ var ts;
                 if (format & 128 /* Indented */) {
                     decreaseIndent();
                 }
+                recordBundleFileInternalSectionEnd(previousSourceFileTextKind);
                 // Write the closing line terminator or closing whitespace.
                 if (shouldWriteClosingLineTerminator(parentNode, children, format)) {
                     writeLine();
@@ -84898,7 +86433,6 @@ var ts;
                 if (line.length) {
                     writeLine();
                     write(line);
-                    writer.rawWrite(newLine);
                 }
             }
         }
@@ -85412,7 +86946,7 @@ var ts;
             hasWrittenComment = false;
             var emitFlags = ts.getEmitFlags(node);
             var _a = ts.getCommentRange(node), pos = _a.pos, end = _a.end;
-            var isEmittedNode = node.kind !== 307 /* NotEmittedStatement */;
+            var isEmittedNode = node.kind !== 312 /* NotEmittedStatement */;
             // We have to explicitly check that the node is JsxText because if the compilerOptions.jsx is "preserve" we will not do any transformation.
             // It is expensive to walk entire tree just to set one kind of node to have no comments.
             var skipLeadingComments = pos < 0 || (emitFlags & 512 /* NoLeadingComments */) !== 0 || node.kind === 11 /* JsxText */;
@@ -85672,19 +87206,28 @@ var ts;
             return ts.isRecognizedTripleSlashComment(currentSourceFile.text, commentPos, commentEnd);
         }
         // Source Maps
+        function getParsedSourceMap(node) {
+            if (node.parsedSourceMap === undefined && node.sourceMapText !== undefined) {
+                node.parsedSourceMap = ts.tryParseRawSourceMap(node.sourceMapText) || false;
+            }
+            return node.parsedSourceMap || undefined;
+        }
         function pipelineEmitWithSourceMap(hint, node) {
             var pipelinePhase = getNextPipelinePhase(3 /* SourceMaps */, node);
-            if (ts.isUnparsedSource(node) && node.sourceMapText !== undefined) {
-                var parsed = ts.tryParseRawSourceMap(node.sourceMapText);
-                if (parsed) {
-                    sourceMapGenerator.appendSourceMap(writer.getLine(), writer.getColumn(), parsed, node.sourceMapPath);
+            if (ts.isUnparsedSource(node) || ts.isUnparsedPrepend(node)) {
+                pipelinePhase(hint, node);
+            }
+            else if (ts.isUnparsedNode(node)) {
+                var parsed = getParsedSourceMap(node.parent);
+                if (parsed && sourceMapGenerator) {
+                    sourceMapGenerator.appendSourceMap(writer.getLine(), writer.getColumn(), parsed, node.parent.sourceMapPath, node.parent.getLineAndCharacterOfPosition(node.pos), node.parent.getLineAndCharacterOfPosition(node.end));
                 }
                 pipelinePhase(hint, node);
             }
             else {
                 var _a = ts.getSourceMapRange(node), pos = _a.pos, end = _a.end, _b = _a.source, source = _b === void 0 ? sourceMapSource : _b;
                 var emitFlags = ts.getEmitFlags(node);
-                if (node.kind !== 307 /* NotEmittedStatement */
+                if (node.kind !== 312 /* NotEmittedStatement */
                     && (emitFlags & 16 /* NoLeadingSourceMap */) === 0
                     && pos >= 0) {
                     emitSourcePos(source, skipSourceTrivia(source, pos));
@@ -85697,7 +87240,7 @@ var ts;
                 else {
                     pipelinePhase(hint, node);
                 }
-                if (node.kind !== 307 /* NotEmittedStatement */
+                if (node.kind !== 312 /* NotEmittedStatement */
                     && (emitFlags & 32 /* NoTrailingSourceMap */) === 0
                     && end >= 0) {
                     emitSourcePos(source, end);
@@ -85825,7 +87368,8 @@ var ts;
             writeFile: host.writeFile && writeFile,
             addOrDeleteFileOrDirectory: addOrDeleteFileOrDirectory,
             addOrDeleteFile: addOrDeleteFile,
-            clearCache: clearCache
+            clearCache: clearCache,
+            realpath: host.realpath && realpath
         };
         function toPath(fileName) {
             return ts.toPath(fileName, currentDirectory, getCanonicalFileName);
@@ -85922,7 +87466,7 @@ var ts;
             var rootDirPath = toPath(rootDir);
             var result = tryReadDirectory(rootDir, rootDirPath);
             if (result) {
-                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries);
+                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath);
             }
             return host.readDirectory(rootDir, extensions, excludes, includes, depth);
             function getFileSystemEntries(dir) {
@@ -85933,6 +87477,9 @@ var ts;
                 return tryReadDirectory(dir, path) || ts.emptyFileSystemEntries;
             }
         }
+        function realpath(s) {
+            return host.realpath ? host.realpath(s) : s;
+        }
         function addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath) {
             var existingResult = getCachedFileSystemEntries(fileOrDirectoryPath);
             if (existingResult) {
@@ -86203,11 +87750,7 @@ var ts;
     function createCompilerHostWorker(options, setParentNodes, system) {
         if (system === void 0) { system = ts.sys; }
         var existingDirectories = ts.createMap();
-        function getCanonicalFileName(fileName) {
-            // if underlying system can distinguish between two files whose names differs only in cases then file name already in canonical form.
-            // otherwise use toLowerCase as a canonical form.
-            return system.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
-        }
+        var getCanonicalFileName = ts.createGetCanonicalFileName(system.useCaseSensitiveFileNames);
         function getSourceFile(fileName, languageVersion, onError) {
             var text;
             try {
@@ -86332,20 +87875,21 @@ var ts;
             var key = toPath(fileName);
             var value = readFileCache.get(key);
             if (value !== undefined)
-                return value || undefined;
+                return value !== false ? value : undefined;
             return setReadFileCache(key, fileName);
         };
         var setReadFileCache = function (key, fileName) {
             var newValue = originalReadFile.call(host, fileName);
-            readFileCache.set(key, newValue || false);
+            readFileCache.set(key, newValue !== undefined ? newValue : false);
             return newValue;
         };
         host.readFile = function (fileName) {
             var key = toPath(fileName);
             var value = readFileCache.get(key);
             if (value !== undefined)
-                return value; // could be .d.ts from output
-            if (!ts.fileExtensionIs(fileName, ".json" /* Json */)) {
+                return value !== false ? value : undefined; // could be .d.ts from output
+            // Cache json or buildInfo
+            if (!ts.fileExtensionIs(fileName, ".json" /* Json */) && !ts.isBuildInfoFile(fileName)) {
                 return originalReadFile.call(host, fileName);
             }
             return setReadFileCache(key, fileName);
@@ -86376,7 +87920,7 @@ var ts;
                 var key = toPath(fileName);
                 fileExistsCache.delete(key);
                 var value = readFileCache.get(key);
-                if (value && value !== data) {
+                if (value !== undefined && value !== data) {
                     readFileCache.delete(key);
                     sourceFileCache.delete(key);
                 }
@@ -86822,11 +88366,18 @@ var ts;
                 if (rootNames.length) {
                     for (var _i = 0, resolvedProjectReferences_1 = resolvedProjectReferences; _i < resolvedProjectReferences_1.length; _i++) {
                         var parsedRef = resolvedProjectReferences_1[_i];
-                        if (parsedRef) {
-                            var out = parsedRef.commandLine.options.outFile || parsedRef.commandLine.options.out;
-                            if (out) {
-                                var dtsOutfile = ts.changeExtension(out, ".d.ts");
-                                processSourceFile(dtsOutfile, /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
+                        if (!parsedRef)
+                            continue;
+                        var out = parsedRef.commandLine.options.outFile || parsedRef.commandLine.options.out;
+                        if (out) {
+                            processSourceFile(ts.changeExtension(out, ".d.ts"), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
+                        }
+                        else if (ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) {
+                            for (var _a = 0, _b = parsedRef.commandLine.fileNames; _a < _b.length; _a++) {
+                                var fileName = _b[_a];
+                                if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) && ts.hasTSFileExtension(fileName)) {
+                                    processSourceFile(ts.getOutputDeclarationFileName(fileName, parsedRef.commandLine, !host.useCaseSensitiveFileNames()), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
+                                }
                             }
                         }
                     }
@@ -86874,8 +88425,8 @@ var ts;
         // not part of the new program.
         if (oldProgram && host.onReleaseOldSourceFile) {
             var oldSourceFiles = oldProgram.getSourceFiles();
-            for (var _a = 0, oldSourceFiles_1 = oldSourceFiles; _a < oldSourceFiles_1.length; _a++) {
-                var oldSourceFile = oldSourceFiles_1[_a];
+            for (var _c = 0, oldSourceFiles_1 = oldSourceFiles; _c < oldSourceFiles_1.length; _c++) {
+                var oldSourceFile = oldSourceFiles_1[_c];
                 var newFile = getSourceFileByPath(oldSourceFile.resolvedPath);
                 if (shouldCreateNewSourceFile || !newFile ||
                     // old file wasnt redirect but new file is
@@ -86931,7 +88482,8 @@ var ts;
             getProjectReferenceRedirect: getProjectReferenceRedirect,
             getResolvedProjectReferenceToRedirect: getResolvedProjectReferenceToRedirect,
             getResolvedProjectReferenceByPath: getResolvedProjectReferenceByPath,
-            forEachResolvedProjectReference: forEachResolvedProjectReference
+            forEachResolvedProjectReference: forEachResolvedProjectReference,
+            emitBuildInfo: emitBuildInfo
         };
         verifyCompilerOptions();
         ts.performance.mark("afterProgram");
@@ -86960,7 +88512,7 @@ var ts;
         }
         function getCommonSourceDirectory() {
             if (commonSourceDirectory === undefined) {
-                var emittedFiles = ts.filter(files, function (file) { return ts.sourceFileMayBeEmitted(file, options, isSourceFileFromExternalLibrary); });
+                var emittedFiles = ts.filter(files, function (file) { return ts.sourceFileMayBeEmitted(file, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect); });
                 if (options.rootDir && checkSourceFilesBelongToPath(emittedFiles, options.rootDir)) {
                     // If a rootDir is specified use it as the commonSourceDirectory
                     commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, currentDirectory);
@@ -87349,7 +88901,8 @@ var ts;
         }
         function getEmitHost(writeFileCallback) {
             return __assign({ getPrependNodes: getPrependNodes,
-                getCanonicalFileName: getCanonicalFileName, getCommonSourceDirectory: program.getCommonSourceDirectory, getCompilerOptions: program.getCompilerOptions, getCurrentDirectory: function () { return currentDirectory; }, getNewLine: function () { return host.getNewLine(); }, getSourceFile: program.getSourceFile, getSourceFileByPath: program.getSourceFileByPath, getSourceFiles: program.getSourceFiles, getLibFileFromReference: program.getLibFileFromReference, isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary, writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }), isEmitBlocked: isEmitBlocked, readFile: function (f) { return host.readFile(f); }, fileExists: function (f) {
+                getCanonicalFileName: getCanonicalFileName, getCommonSourceDirectory: program.getCommonSourceDirectory, getCompilerOptions: program.getCompilerOptions, getCurrentDirectory: function () { return currentDirectory; }, getNewLine: function () { return host.getNewLine(); }, getSourceFile: program.getSourceFile, getSourceFileByPath: program.getSourceFileByPath, getSourceFiles: program.getSourceFiles, getLibFileFromReference: program.getLibFileFromReference, isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
+                getResolvedProjectReferenceToRedirect: getResolvedProjectReferenceToRedirect, writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }), isEmitBlocked: isEmitBlocked, readFile: function (f) { return host.readFile(f); }, fileExists: function (f) {
                     // Use local caches
                     var path = toPath(f);
                     if (getSourceFileByPath(path))
@@ -87358,7 +88911,20 @@ var ts;
                         return false;
                     // Before falling back to the host
                     return host.fileExists(f);
-                } }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {}), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); } });
+                } }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {}), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); } });
+        }
+        function emitBuildInfo(writeFileCallback) {
+            ts.Debug.assert(!options.out && !options.outFile);
+            ts.performance.mark("beforeEmit");
+            var emitResult = ts.emitFiles(ts.notImplementedResolver, getEmitHost(writeFileCallback), 
+            /*targetSourceFile*/ undefined, 
+            /*emitOnlyDtsFiles*/ false, 
+            /*transformers*/ undefined, 
+            /*declaraitonTransformers*/ undefined, 
+            /*onlyBuildInfo*/ true);
+            ts.performance.mark("afterEmit");
+            ts.performance.measure("Emit", "beforeEmit", "afterEmit");
+            return emitResult;
         }
         function getResolvedProjectReferences() {
             return resolvedProjectReferences;
@@ -87367,28 +88933,11 @@ var ts;
             return projectReferences;
         }
         function getPrependNodes() {
-            if (!projectReferences) {
-                return ts.emptyArray;
-            }
-            var nodes = [];
-            for (var i = 0; i < projectReferences.length; i++) {
-                var ref = projectReferences[i];
-                var resolvedRefOpts = resolvedProjectReferences[i].commandLine;
-                if (ref.prepend && resolvedRefOpts && resolvedRefOpts.options) {
-                    var out = resolvedRefOpts.options.outFile || resolvedRefOpts.options.out;
-                    // Upstream project didn't have outFile set -- skip (error will have been issued earlier)
-                    if (!out)
-                        continue;
-                    var _a = ts.getOutputPathsForBundle(resolvedRefOpts.options, /*forceDtsPaths*/ true), jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath;
-                    var node = ts.createInputFiles(function (fileName) {
-                        var path = toPath(fileName);
-                        var sourceFile = getSourceFileByPath(path);
-                        return sourceFile ? sourceFile.text : filesByName.has(path) ? undefined : host.readFile(path);
-                    }, jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath);
-                    nodes.push(node);
-                }
-            }
-            return nodes;
+            return createPrependNodes(projectReferences, function (_ref, index) { return resolvedProjectReferences[index].commandLine; }, function (fileName) {
+                var path = toPath(fileName);
+                var sourceFile = getSourceFileByPath(path);
+                return sourceFile ? sourceFile.text : filesByName.has(path) ? undefined : host.readFile(path);
+            });
         }
         function isSourceFileFromExternalLibrary(file) {
             return !!sourceFilesFoundSearchingNodeModules.get(file.path);
@@ -87460,8 +89009,7 @@ var ts;
             var emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver((options.outFile || options.out) ? undefined : sourceFile, cancellationToken);
             ts.performance.mark("beforeEmit");
             var transformers = emitOnlyDtsFiles ? [] : ts.getTransformers(options, customTransformers);
-            var emitResult = ts.emitFiles(emitResolver, getEmitHost(writeFileCallback), sourceFile, // TODO: GH#18217
-            emitOnlyDtsFiles, transformers, customTransformers && customTransformers.afterDeclarations);
+            var emitResult = ts.emitFiles(emitResolver, getEmitHost(writeFileCallback), sourceFile, emitOnlyDtsFiles, transformers, customTransformers && customTransformers.afterDeclarations);
             ts.performance.mark("afterEmit");
             ts.performance.measure("Emit", "beforeEmit", "afterEmit");
             return emitResult;
@@ -88073,7 +89621,6 @@ var ts;
             if (refFile) {
                 var redirect = getProjectReferenceRedirect(fileName);
                 if (redirect) {
-                    (refFile.redirectedReferences || (refFile.redirectedReferences = [])).push(fileName);
                     fileName = redirect;
                     // Once we start redirecting to a file, we can potentially come back to it
                     // via a back-reference from another file in the .d.ts folder. If that happens we'll
@@ -88170,7 +89717,7 @@ var ts;
             var out = referencedProject.commandLine.options.outFile || referencedProject.commandLine.options.out;
             return out ?
                 ts.changeExtension(out, ".d.ts" /* Dts */) :
-                ts.getOutputDeclarationFileName(fileName, referencedProject.commandLine);
+                ts.getOutputDeclarationFileName(fileName, referencedProject.commandLine, !host.useCaseSensitiveFileNames());
         }
         /**
          * Get the referenced project if the file is input file from that reference project
@@ -88463,18 +90010,29 @@ var ts;
                 if (options.declaration === false) {
                     createDiagnosticForOptionName(ts.Diagnostics.Composite_projects_may_not_disable_declaration_emit, "declaration");
                 }
+                if (options.incremental === false) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Composite_projects_may_not_disable_incremental_compilation, "declaration");
+                }
+            }
+            if (options.tsBuildInfoFile) {
+                if (!ts.isIncrementalCompilation(options)) {
+                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1_or_option_2, "tsBuildInfoFile", "incremental", "composite");
+                }
             }
             verifyProjectReferences();
             // List of collected files is complete; validate exhautiveness if this is a project with a file list
             if (options.composite) {
-                var sourceFiles = files.filter(function (f) { return !f.isDeclarationFile; });
-                if (rootNames.length < sourceFiles.length) {
-                    var normalizedRootNames = rootNames.map(function (r) { return ts.normalizePath(r).toLowerCase(); });
-                    for (var _i = 0, _a = sourceFiles.map(function (f) { return ts.normalizePath(f.path).toLowerCase(); }); _i < _a.length; _i++) {
-                        var file = _a[_i];
-                        if (normalizedRootNames.indexOf(file) === -1) {
-                            programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern, file));
-                        }
+                var rootPaths = rootNames.map(toPath);
+                for (var _i = 0, files_3 = files; _i < files_3.length; _i++) {
+                    var file = files_3[_i];
+                    // Ignore declaration files
+                    if (file.isDeclarationFile)
+                        continue;
+                    // Ignore json file thats from project reference
+                    if (ts.isJsonSourceFile(file) && getResolvedProjectReferenceToRedirect(file.fileName))
+                        continue;
+                    if (rootPaths.indexOf(file.path) === -1) {
+                        programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern, file.fileName));
                     }
                 }
             }
@@ -88657,6 +90215,7 @@ var ts;
             }
         }
         function verifyProjectReferences() {
+            var buildInfoPath = !options.noEmit && !options.suppressOutputPathCheck ? ts.getOutputPathForBuildInfo(options) : undefined;
             forEachProjectReference(projectReferences, resolvedProjectReferences, function (resolvedRef, index, parent) {
                 var ref = (parent ? parent.commandLine.projectReferences : projectReferences)[index];
                 var parentFile = parent && parent.sourceFile;
@@ -88683,6 +90242,10 @@ var ts;
                         createDiagnosticForReference(parentFile, index, ts.Diagnostics.Cannot_prepend_project_0_because_it_does_not_have_outFile_set, ref.path);
                     }
                 }
+                if (!parent && buildInfoPath && buildInfoPath === ts.getOutputPathForBuildInfo(options)) {
+                    createDiagnosticForReference(parentFile, index, ts.Diagnostics.Cannot_write_file_0_because_it_will_overwrite_tsbuildinfo_file_generated_by_referenced_project_1, buildInfoPath, ref.path);
+                    hasEmitBlockingDiagnostics.set(toPath(buildInfoPath), true);
+                }
             });
         }
         function createDiagnosticForOptionPathKeyValue(key, valueIndex, message, arg0, arg1, arg2) {
@@ -88827,11 +90390,32 @@ var ts;
             readFile: function (f) { return directoryStructureHost.readFile(f); },
             useCaseSensitiveFileNames: host.useCaseSensitiveFileNames(),
             getCurrentDirectory: function () { return host.getCurrentDirectory(); },
-            onUnRecoverableConfigFileDiagnostic: host.onUnRecoverableConfigFileDiagnostic || (function () { return undefined; }),
+            onUnRecoverableConfigFileDiagnostic: host.onUnRecoverableConfigFileDiagnostic || ts.returnUndefined,
             trace: host.trace ? function (s) { return host.trace(s); } : undefined
         };
     }
     ts.parseConfigHostFromCompilerHostLike = parseConfigHostFromCompilerHostLike;
+    /* @internal */
+    function createPrependNodes(projectReferences, getCommandLine, readFile) {
+        if (!projectReferences)
+            return ts.emptyArray;
+        var nodes;
+        for (var i = 0; i < projectReferences.length; i++) {
+            var ref = projectReferences[i];
+            var resolvedRefOpts = getCommandLine(ref, i);
+            if (ref.prepend && resolvedRefOpts && resolvedRefOpts.options) {
+                var out = resolvedRefOpts.options.outFile || resolvedRefOpts.options.out;
+                // Upstream project didn't have outFile set -- skip (error will have been issued earlier)
+                if (!out)
+                    continue;
+                var _a = ts.getOutputPathsForBundle(resolvedRefOpts.options, /*forceDtsPaths*/ true), jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, buildInfoPath = _a.buildInfoPath;
+                var node = ts.createInputFiles(readFile, jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath, buildInfoPath);
+                (nodes || (nodes = [])).push(node);
+            }
+        }
+        return nodes || ts.emptyArray;
+    }
+    ts.createPrependNodes = createPrependNodes;
     function resolveProjectReferencePath(hostOrRef, ref) {
         var passedInRef = ref ? ref : hostOrRef;
         return ts.resolveConfigFileProjectName(passedInRef.path);
@@ -89028,7 +90612,7 @@ var ts;
             // Create the reference map, and set the file infos
             for (var _i = 0, _a = newProgram.getSourceFiles(); _i < _a.length; _i++) {
                 var sourceFile = _a[_i];
-                var version_1 = sourceFile.version;
+                var version_1 = ts.Debug.assertDefined(sourceFile.version, "Program intended to be used with Builder should have source files with versions set");
                 var oldInfo = useOldState ? oldState.fileInfos.get(sourceFile.path) : undefined;
                 if (referencedMap) {
                     var newReferences = getReferencedFiles(newProgram, sourceFile, getCanonicalFileName);
@@ -89083,9 +90667,9 @@ var ts;
          */
         function getFilesAffectedBy(state, programOfThisState, path, cancellationToken, computeHash, cacheToUpdateSignature, exportedModulesMapCache) {
             // Since the operation could be cancelled, the signatures are always stored in the cache
-            // They will be commited once it is safe to use them
+            // They will be committed once it is safe to use them
             // eg when calling this api from tsserver, if there is no cancellation of the operation
-            // In the other cases the affected files signatures are commited only after the iteration through the result is complete
+            // In the other cases the affected files signatures are committed only after the iteration through the result is complete
             var signatureCache = cacheToUpdateSignature || ts.createMap();
             var sourceFile = programOfThisState.getSourceFileByPath(path);
             if (!sourceFile) {
@@ -89375,11 +90959,14 @@ var ts;
                 var affectedSignatures = oldState.currentAffectedFilesSignatures;
                 ts.Debug.assert(!oldState.affectedFiles && (!affectedSignatures || !affectedSignatures.size), "Cannot reuse if only few affected files of currentChangedFile were iterated");
             }
+            var changedFilesSet = oldState.changedFilesSet;
             if (canCopySemanticDiagnostics) {
-                ts.Debug.assert(!ts.forEachKey(oldState.changedFilesSet, function (path) { return oldState.semanticDiagnosticsPerFile.has(path); }), "Semantic diagnostics shouldnt be available for changed files");
+                ts.Debug.assert(!changedFilesSet || !ts.forEachKey(changedFilesSet, function (path) { return oldState.semanticDiagnosticsPerFile.has(path); }), "Semantic diagnostics shouldnt be available for changed files");
             }
             // Copy old state's changed files set
-            ts.copyEntries(oldState.changedFilesSet, state.changedFilesSet);
+            if (changedFilesSet) {
+                ts.copyEntries(changedFilesSet, state.changedFilesSet);
+            }
             if (!compilerOptions.outFile && !compilerOptions.out && oldState.affectedFilesPendingEmit) {
                 state.affectedFilesPendingEmit = oldState.affectedFilesPendingEmit;
                 state.affectedFilesPendingEmitIndex = oldState.affectedFilesPendingEmitIndex;
@@ -89417,7 +91004,7 @@ var ts;
                 // Unchanged file copy diagnostics
                 var diagnostics = oldState.semanticDiagnosticsPerFile.get(sourceFilePath);
                 if (diagnostics) {
-                    state.semanticDiagnosticsPerFile.set(sourceFilePath, diagnostics);
+                    state.semanticDiagnosticsPerFile.set(sourceFilePath, oldState.hasReusableDiagnostic ? convertToDiagnostics(diagnostics, newProgram) : diagnostics);
                     if (!state.semanticDiagnosticsFromOldState) {
                         state.semanticDiagnosticsFromOldState = ts.createMap();
                     }
@@ -89425,8 +91012,45 @@ var ts;
                 }
             }
         });
+        if (oldCompilerOptions &&
+            (oldCompilerOptions.outDir !== compilerOptions.outDir ||
+                oldCompilerOptions.declarationDir !== compilerOptions.declarationDir ||
+                (oldCompilerOptions.outFile || oldCompilerOptions.out) !== (compilerOptions.outFile || compilerOptions.out))) {
+            // Add all files to affectedFilesPendingEmit since emit changed
+            state.affectedFilesPendingEmit = ts.concatenate(state.affectedFilesPendingEmit, newProgram.getSourceFiles().map(function (f) { return f.path; }));
+            if (state.affectedFilesPendingEmitIndex === undefined) {
+                state.affectedFilesPendingEmitIndex = 0;
+            }
+            ts.Debug.assert(state.seenAffectedFiles === undefined);
+            state.seenAffectedFiles = ts.createMap();
+        }
         return state;
     }
+    function convertToDiagnostics(diagnostics, newProgram) {
+        if (!diagnostics.length)
+            return ts.emptyArray;
+        return diagnostics.map(function (diagnostic) {
+            var result = convertToDiagnosticRelatedInformation(diagnostic, newProgram);
+            result.reportsUnnecessary = diagnostic.reportsUnnecessary;
+            result.source = diagnostic.source;
+            var relatedInformation = diagnostic.relatedInformation;
+            result.relatedInformation = relatedInformation ?
+                relatedInformation.length ?
+                    relatedInformation.map(function (r) { return convertToDiagnosticRelatedInformation(r, newProgram); }) :
+                    ts.emptyArray :
+                undefined;
+            return result;
+        });
+    }
+    function convertToDiagnosticRelatedInformation(diagnostic, newProgram) {
+        var file = diagnostic.file, messageText = diagnostic.messageText;
+        return __assign({}, diagnostic, { file: file && newProgram.getSourceFileByPath(file), messageText: messageText === undefined || ts.isString(messageText) ?
+                messageText :
+                convertToDiagnosticMessageChain(messageText, newProgram) });
+    }
+    function convertToDiagnosticMessageChain(diagnostic, newProgram) {
+        return __assign({}, diagnostic, { next: diagnostic.next && convertToDiagnosticMessageChain(diagnostic.next, newProgram) });
+    }
     /**
      * Releases program and other related not needed properties
      */
@@ -89646,8 +91270,11 @@ var ts;
      * This is called after completing operation on the next affected file.
      * The operations here are postponed to ensure that cancellation during the iteration is handled correctly
      */
-    function doneWithAffectedFile(state, affected, isPendingEmit) {
-        if (affected === state.program) {
+    function doneWithAffectedFile(state, affected, isPendingEmit, isBuildInfoEmit) {
+        if (isBuildInfoEmit) {
+            state.emittedBuildInfo = true;
+        }
+        else if (affected === state.program) {
             state.changedFilesSet.clear();
             state.programEmitComplete = true;
         }
@@ -89664,8 +91291,8 @@ var ts;
     /**
      * Returns the result with affected file
      */
-    function toAffectedFileResult(state, result, affected, isPendingEmit) {
-        doneWithAffectedFile(state, affected, isPendingEmit);
+    function toAffectedFileResult(state, result, affected, isPendingEmit, isBuildInfoEmit) {
+        doneWithAffectedFile(state, affected, isPendingEmit, isBuildInfoEmit);
         return { result: result, affected: affected };
     }
     /**
@@ -89688,6 +91315,77 @@ var ts;
         }
         return diagnostics;
     }
+    /**
+     * Gets the program information to be emitted in buildInfo so that we can use it to create new program
+     */
+    function getProgramBuildInfo(state) {
+        if (state.compilerOptions.outFile || state.compilerOptions.out)
+            return undefined;
+        var fileInfos = {};
+        state.fileInfos.forEach(function (value, key) {
+            var signature = state.currentAffectedFilesSignatures && state.currentAffectedFilesSignatures.get(key);
+            fileInfos[key] = signature === undefined ? value : { version: value.version, signature: signature };
+        });
+        var result = { fileInfos: fileInfos, options: state.compilerOptions };
+        if (state.referencedMap) {
+            var referencedMap_1 = {};
+            state.referencedMap.forEach(function (value, key) {
+                referencedMap_1[key] = ts.arrayFrom(value.keys());
+            });
+            result.referencedMap = referencedMap_1;
+        }
+        if (state.exportedModulesMap) {
+            var exportedModulesMap_1 = {};
+            state.exportedModulesMap.forEach(function (value, key) {
+                var newValue = state.currentAffectedFilesExportedModulesMap && state.currentAffectedFilesExportedModulesMap.get(key);
+                // Not in temporary cache, use existing value
+                if (newValue === undefined)
+                    exportedModulesMap_1[key] = ts.arrayFrom(value.keys());
+                // Value in cache and has updated value map, use that
+                else if (newValue)
+                    exportedModulesMap_1[key] = ts.arrayFrom(newValue.keys());
+            });
+            result.exportedModulesMap = exportedModulesMap_1;
+        }
+        if (state.semanticDiagnosticsPerFile) {
+            var semanticDiagnosticsPerFile_1 = [];
+            // Currently not recording actual errors since those mean no emit for tsc --build
+            state.semanticDiagnosticsPerFile.forEach(function (value, key) { return semanticDiagnosticsPerFile_1.push(value.length ?
+                [
+                    key,
+                    state.hasReusableDiagnostic ?
+                        value :
+                        convertToReusableDiagnostics(value)
+                ] :
+                key); });
+            result.semanticDiagnosticsPerFile = semanticDiagnosticsPerFile_1;
+        }
+        return result;
+    }
+    function convertToReusableDiagnostics(diagnostics) {
+        ts.Debug.assert(!!diagnostics.length);
+        return diagnostics.map(function (diagnostic) {
+            var result = convertToReusableDiagnosticRelatedInformation(diagnostic);
+            result.reportsUnnecessary = diagnostic.reportsUnnecessary;
+            result.source = diagnostic.source;
+            var relatedInformation = diagnostic.relatedInformation;
+            result.relatedInformation = relatedInformation ?
+                relatedInformation.length ?
+                    relatedInformation.map(function (r) { return convertToReusableDiagnosticRelatedInformation(r); }) :
+                    ts.emptyArray :
+                undefined;
+            return result;
+        });
+    }
+    function convertToReusableDiagnosticRelatedInformation(diagnostic) {
+        var file = diagnostic.file, messageText = diagnostic.messageText;
+        return __assign({}, diagnostic, { file: file && file.path, messageText: messageText === undefined || ts.isString(messageText) ?
+                messageText :
+                convertToReusableDiagnosticMessageChain(messageText) });
+    }
+    function convertToReusableDiagnosticMessageChain(diagnostic) {
+        return __assign({}, diagnostic, { next: diagnostic.next && convertToReusableDiagnosticMessageChain(diagnostic.next) });
+    }
     var BuilderProgramKind;
     (function (BuilderProgramKind) {
         BuilderProgramKind[BuilderProgramKind["SemanticDiagnosticsBuilderProgram"] = 0] = "SemanticDiagnosticsBuilderProgram";
@@ -89744,6 +91442,7 @@ var ts;
         var computeHash = host.createHash || ts.generateDjb2Hash;
         var state = createBuilderProgramState(newProgram, getCanonicalFileName, oldState);
         var backupState;
+        newProgram.getProgramBuildInfo = function () { return getProgramBuildInfo(state); };
         // To ensure that we arent storing any references to old program or new program without state
         newProgram = undefined; // TODO: GH#18217
         oldProgram = undefined;
@@ -89787,7 +91486,16 @@ var ts;
                 if (!state.compilerOptions.out && !state.compilerOptions.outFile) {
                     affected = getNextAffectedFilePendingEmit(state);
                     if (!affected) {
-                        return undefined;
+                        if (state.emittedBuildInfo) {
+                            return undefined;
+                        }
+                        var affected_1 = ts.Debug.assertDefined(state.program);
+                        return toAffectedFileResult(state, 
+                        // When whole program is affected, do emit only once (eg when --out or --outFile is specified)
+                        // Otherwise just affected file
+                        affected_1.emitBuildInfo(writeFile || host.writeFile, cancellationToken), affected_1, 
+                        /*isPendingEmitFile*/ false, 
+                        /*isBuildInfoEmit*/ true);
                     }
                     isPendingEmitFile = true;
                 }
@@ -89913,13 +91621,60 @@ var ts;
             }
             var diagnostics;
             for (var _i = 0, _a = ts.Debug.assertDefined(state.program).getSourceFiles(); _i < _a.length; _i++) {
-                var sourceFile_2 = _a[_i];
-                diagnostics = ts.addRange(diagnostics, getSemanticDiagnosticsOfFile(state, sourceFile_2, cancellationToken));
+                var sourceFile_1 = _a[_i];
+                diagnostics = ts.addRange(diagnostics, getSemanticDiagnosticsOfFile(state, sourceFile_1, cancellationToken));
             }
             return diagnostics || ts.emptyArray;
         }
     }
     ts.createBuilderProgram = createBuilderProgram;
+    function getMapOfReferencedSet(mapLike) {
+        if (!mapLike)
+            return undefined;
+        var map = ts.createMap();
+        // Copies keys/values from template. Note that for..in will not throw if
+        // template is undefined, and instead will just exit the loop.
+        for (var key in mapLike) {
+            if (ts.hasProperty(mapLike, key)) {
+                map.set(key, ts.arrayToSet(mapLike[key]));
+            }
+        }
+        return map;
+    }
+    function createBuildProgramUsingProgramBuildInfo(program) {
+        var fileInfos = ts.createMapFromTemplate(program.fileInfos);
+        var state = {
+            fileInfos: fileInfos,
+            compilerOptions: program.options,
+            referencedMap: getMapOfReferencedSet(program.referencedMap),
+            exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap),
+            semanticDiagnosticsPerFile: program.semanticDiagnosticsPerFile && ts.arrayToMap(program.semanticDiagnosticsPerFile, function (value) { return ts.isString(value) ? value : value[0]; }, function (value) { return ts.isString(value) ? ts.emptyArray : value[1]; }),
+            hasReusableDiagnostic: true
+        };
+        return {
+            getState: function () { return state; },
+            backupState: ts.noop,
+            restoreState: ts.noop,
+            getProgram: ts.notImplemented,
+            getProgramOrUndefined: ts.returnUndefined,
+            releaseProgram: ts.noop,
+            getCompilerOptions: function () { return state.compilerOptions; },
+            getSourceFile: ts.notImplemented,
+            getSourceFiles: ts.notImplemented,
+            getOptionsDiagnostics: ts.notImplemented,
+            getGlobalDiagnostics: ts.notImplemented,
+            getConfigFileParsingDiagnostics: ts.notImplemented,
+            getSyntacticDiagnostics: ts.notImplemented,
+            getDeclarationDiagnostics: ts.notImplemented,
+            getSemanticDiagnostics: ts.notImplemented,
+            emit: ts.notImplemented,
+            getAllDependencies: ts.notImplemented,
+            getCurrentDirectory: ts.notImplemented,
+            emitNextAffectedFile: ts.notImplemented,
+            getSemanticDiagnosticsOfNextAffectedFile: ts.notImplemented,
+        };
+    }
+    ts.createBuildProgramUsingProgramBuildInfo = createBuildProgramUsingProgramBuildInfo;
     function createRedirectedBuilderProgram(state, configFileParsingDiagnostics) {
         return {
             getState: ts.notImplemented,
@@ -89939,7 +91694,7 @@ var ts;
             getSemanticDiagnostics: function (sourceFile, cancellationToken) { return getProgram().getSemanticDiagnostics(sourceFile, cancellationToken); },
             emit: function (sourceFile, writeFile, cancellationToken, emitOnlyDts, customTransformers) { return getProgram().emit(sourceFile, writeFile, cancellationToken, emitOnlyDts, customTransformers); },
             getAllDependencies: ts.notImplemented,
-            getCurrentDirectory: function () { return getProgram().getCurrentDirectory(); }
+            getCurrentDirectory: function () { return getProgram().getCurrentDirectory(); },
         };
         function getProgram() {
             return ts.Debug.assertDefined(state.program);
@@ -89965,10 +91720,10 @@ var ts;
 /*@internal*/
 var ts;
 (function (ts) {
-    function isPathInNodeModulesStartingWithDot(path) {
-        return ts.stringContains(path, "/node_modules/.");
+    function isPathIgnored(path) {
+        return ts.some(ts.ignoredPaths, function (searchPath) { return ts.stringContains(path, searchPath); });
     }
-    ts.isPathInNodeModulesStartingWithDot = isPathInNodeModulesStartingWithDot;
+    ts.isPathIgnored = isPathIgnored;
     ts.maxNumberOfFilesToIterateForInvalidation = 256;
     function createResolutionCache(resolutionHost, rootDirForResolution, logChangesWhenResolvingModule) {
         var filesWithChangedSetOfUnresolvedImports;
@@ -90490,7 +92245,7 @@ var ts;
             }
             else {
                 // If something to do with folder/file starting with "." in node_modules folder, skip it
-                if (isPathInNodeModulesStartingWithDot(fileOrDirectoryPath))
+                if (isPathIgnored(fileOrDirectoryPath))
                     return false;
                 // Some file or directory in the watching directory is created
                 // Return early if it does not have any of the watching extension or not the custom failed lookup path
@@ -90967,6 +92722,8 @@ var ts;
                 case ".jsx" /* Jsx */:
                 case ".json" /* Json */:
                     return ext;
+                case ".tsbuildinfo" /* TsBuildInfo */:
+                    return ts.Debug.fail("Extension " + ".tsbuildinfo" /* TsBuildInfo */ + " is unsupported:: FileName:: " + fileName);
                 default:
                     return ts.Debug.assertNever(ext);
             }
@@ -91087,22 +92844,18 @@ var ts;
         var diagnostics = program.getConfigFileParsingDiagnostics().slice();
         var configFileParsingDiagnosticsLength = diagnostics.length;
         ts.addRange(diagnostics, program.getSyntacticDiagnostics());
-        var reportSemanticDiagnostics = false;
         // If we didn't have any syntactic errors, then also try getting the global and
         // semantic errors.
         if (diagnostics.length === configFileParsingDiagnosticsLength) {
             ts.addRange(diagnostics, program.getOptionsDiagnostics());
             ts.addRange(diagnostics, program.getGlobalDiagnostics());
             if (diagnostics.length === configFileParsingDiagnosticsLength) {
-                reportSemanticDiagnostics = true;
+                ts.addRange(diagnostics, program.getSemanticDiagnostics());
             }
         }
         // Emit and report any errors we ran into.
         var _a = program.emit(/*targetSourceFile*/ undefined, writeFile), emittedFiles = _a.emittedFiles, emitSkipped = _a.emitSkipped, emitDiagnostics = _a.diagnostics;
         ts.addRange(diagnostics, emitDiagnostics);
-        if (reportSemanticDiagnostics) {
-            ts.addRange(diagnostics, program.getSemanticDiagnostics());
-        }
         ts.sortAndDeduplicateDiagnostics(diagnostics).forEach(reportDiagnostic);
         if (writeFileName) {
             var currentDir_1 = program.getCurrentDirectory();
@@ -91223,6 +92976,22 @@ var ts;
         }
     }
     ts.createCompilerHostFromProgramHost = createCompilerHostFromProgramHost;
+    function setGetSourceFileAsHashVersioned(compilerHost, host) {
+        var originalGetSourceFile = compilerHost.getSourceFile;
+        var computeHash = host.createHash || ts.generateDjb2Hash;
+        compilerHost.getSourceFile = function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            var result = originalGetSourceFile.call.apply(originalGetSourceFile, [compilerHost].concat(args));
+            if (result) {
+                result.version = computeHash.call(host, result.text);
+            }
+            return result;
+        };
+    }
+    ts.setGetSourceFileAsHashVersioned = setGetSourceFileAsHashVersioned;
     /**
      * Creates the watch compiler host that can be extended with config file or root file names and options host
      */
@@ -91248,7 +93017,7 @@ var ts;
             writeFile: function (path, data, writeByteOrderMark) { return system.writeFile(path, data, writeByteOrderMark); },
             onCachedDirectoryStructureHostCreate: function (cacheHost) { return host = cacheHost || system; },
             createHash: ts.maybeBind(system, system.createHash),
-            createProgram: createProgram
+            createProgram: createProgram || ts.createEmitAndSemanticDiagnosticsBuilderProgram
         };
     }
     ts.createProgramHost = createProgramHost;
@@ -91258,7 +93027,7 @@ var ts;
     function createWatchCompilerHost(system, createProgram, reportDiagnostic, reportWatchStatus) {
         if (system === void 0) { system = ts.sys; }
         var writeFileName = function (s) { return system.write(s + system.newLine); };
-        var result = createProgramHost(system, createProgram || ts.createEmitAndSemanticDiagnosticsBuilderProgram);
+        var result = createProgramHost(system, createProgram);
         ts.copyProperties(result, createWatchHost(system, reportWatchStatus));
         result.afterProgramCreate = function (builderProgram) {
             var compilerOptions = builderProgram.getCompilerOptions();
@@ -91297,6 +93066,49 @@ var ts;
         return host;
     }
     ts.createWatchCompilerHostOfFilesAndCompilerOptions = createWatchCompilerHostOfFilesAndCompilerOptions;
+    function readBuilderProgram(compilerOptions, readFile) {
+        if (compilerOptions.out || compilerOptions.outFile)
+            return undefined;
+        var buildInfoPath = ts.getOutputPathForBuildInfo(compilerOptions);
+        if (!buildInfoPath)
+            return undefined;
+        var content = readFile(buildInfoPath);
+        if (!content)
+            return undefined;
+        var buildInfo = ts.getBuildInfo(content);
+        if (buildInfo.version !== ts.version)
+            return undefined;
+        if (!buildInfo.program)
+            return undefined;
+        return ts.createBuildProgramUsingProgramBuildInfo(buildInfo.program);
+    }
+    ts.readBuilderProgram = readBuilderProgram;
+    function createIncrementalCompilerHost(options, system) {
+        if (system === void 0) { system = ts.sys; }
+        var host = ts.createCompilerHostWorker(options, /*setParentNodes*/ undefined, system);
+        host.createHash = ts.maybeBind(system, system.createHash);
+        setGetSourceFileAsHashVersioned(host, system);
+        ts.changeCompilerHostLikeToUseCache(host, function (fileName) { return ts.toPath(fileName, host.getCurrentDirectory(), host.getCanonicalFileName); });
+        return host;
+    }
+    ts.createIncrementalCompilerHost = createIncrementalCompilerHost;
+    function createIncrementalProgram(_a) {
+        var rootNames = _a.rootNames, options = _a.options, configFileParsingDiagnostics = _a.configFileParsingDiagnostics, projectReferences = _a.projectReferences, host = _a.host, createProgram = _a.createProgram;
+        host = host || createIncrementalCompilerHost(options);
+        createProgram = createProgram || ts.createEmitAndSemanticDiagnosticsBuilderProgram;
+        var oldProgram = readBuilderProgram(options, function (path) { return host.readFile(path); });
+        return createProgram(rootNames, options, host, oldProgram, configFileParsingDiagnostics, projectReferences);
+    }
+    function performIncrementalCompilation(input) {
+        var system = input.system || ts.sys;
+        var host = input.host || (input.host = createIncrementalCompilerHost(input.options, system));
+        var builderProgram = createIncrementalProgram(input);
+        var exitStatus = emitFilesAndReportErrors(builderProgram, input.reportDiagnostic || createDiagnosticReporter(system), function (s) { return host.trace && host.trace(s); }, input.reportErrorSummary || input.options.pretty ? function (errorCount) { return system.write(getErrorSummaryText(errorCount, system.newLine)); } : undefined);
+        if (input.afterProgramEmitAndDiagnostics)
+            input.afterProgramEmitAndDiagnostics(builderProgram);
+        return exitStatus;
+    }
+    ts.performIncrementalCompilation = performIncrementalCompilation;
 })(ts || (ts = {}));
 (function (ts) {
     function createWatchCompilerHost(rootFilesOrConfigFileName, options, system, createProgram, reportDiagnostic, reportWatchStatus, projectReferences) {
@@ -91308,7 +93120,6 @@ var ts;
         }
     }
     ts.createWatchCompilerHost = createWatchCompilerHost;
-    var initialVersion = 1;
     function createWatchProgram(host) {
         var builderProgram;
         var reloadLevel; // level to indicate if the program needs to be reloaded from config file/just filenames etc
@@ -91349,10 +93160,12 @@ var ts;
         var _b = ts.createWatchFactory(host, compilerOptions), watchFile = _b.watchFile, watchFilePath = _b.watchFilePath, watchDirectory = _b.watchDirectory, writeLog = _b.writeLog;
         var getCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
         writeLog("Current directory: " + currentDirectory + " CaseSensitiveFileNames: " + useCaseSensitiveFileNames);
+        var configFileWatcher;
         if (configFileName) {
-            watchFile(host, configFileName, scheduleProgramReload, ts.PollingInterval.High, "Config file" /* ConfigFile */);
+            configFileWatcher = watchFile(host, configFileName, scheduleProgramReload, ts.PollingInterval.High, "Config file" /* ConfigFile */);
         }
         var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return compilerOptions; }, directoryStructureHost);
+        ts.setGetSourceFileAsHashVersioned(compilerHost, host);
         // Members for CompilerHost
         var getNewSourceFile = compilerHost.getSourceFile;
         compilerHost.getSourceFile = function (fileName) {
@@ -91393,21 +93206,43 @@ var ts;
             (function (typeDirectiveNames, containingFile, redirectedReference) { return host.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference); }) :
             (function (typeDirectiveNames, containingFile, redirectedReference) { return resolutionCache.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference); });
         var userProvidedResolution = !!host.resolveModuleNames || !!host.resolveTypeReferenceDirectives;
+        builderProgram = ts.readBuilderProgram(compilerOptions, function (path) { return compilerHost.readFile(path); });
         synchronizeProgram();
         // Update the wild card directory watch
         watchConfigFileWildCardDirectories();
         return configFileName ?
-            { getCurrentProgram: getCurrentBuilderProgram, getProgram: synchronizeProgram } :
-            { getCurrentProgram: getCurrentBuilderProgram, getProgram: synchronizeProgram, updateRootFileNames: updateRootFileNames };
+            { getCurrentProgram: getCurrentBuilderProgram, getProgram: synchronizeProgram, close: close } :
+            { getCurrentProgram: getCurrentBuilderProgram, getProgram: synchronizeProgram, updateRootFileNames: updateRootFileNames, close: close };
+        function close() {
+            resolutionCache.clear();
+            ts.clearMap(sourceFilesCache, function (value) {
+                if (value && value.fileWatcher) {
+                    value.fileWatcher.close();
+                    value.fileWatcher = undefined;
+                }
+            });
+            if (configFileWatcher) {
+                configFileWatcher.close();
+                configFileWatcher = undefined;
+            }
+            if (watchedWildcardDirectories) {
+                ts.clearMap(watchedWildcardDirectories, ts.closeFileWatcherOf);
+                watchedWildcardDirectories = undefined;
+            }
+            if (missingFilesMap) {
+                ts.clearMap(missingFilesMap, ts.closeFileWatcher);
+                missingFilesMap = undefined;
+            }
+        }
         function getCurrentBuilderProgram() {
             return builderProgram;
         }
         function getCurrentProgram() {
-            return builderProgram && builderProgram.getProgram();
+            return builderProgram && builderProgram.getProgramOrUndefined();
         }
         function synchronizeProgram() {
             writeLog("Synchronizing program");
-            var program = getCurrentProgram();
+            var program = getCurrentBuilderProgram();
             if (hasChangedCompilerOptions) {
                 newLine = updateNewLine();
                 if (program && ts.changesAffectModuleResolution(program.getCompilerOptions(), compilerOptions)) {
@@ -91423,19 +93258,19 @@ var ts;
                 }
             }
             else {
-                createNewProgram(program, hasInvalidatedResolution);
+                createNewProgram(hasInvalidatedResolution);
             }
             if (host.afterProgramCreate) {
                 host.afterProgramCreate(builderProgram);
             }
             return builderProgram;
         }
-        function createNewProgram(program, hasInvalidatedResolution) {
+        function createNewProgram(hasInvalidatedResolution) {
             // Compile the program
             writeLog("CreatingProgramWith::");
             writeLog("  roots: " + JSON.stringify(rootFileNames));
             writeLog("  options: " + JSON.stringify(compilerOptions));
-            var needsUpdateInTypeRootWatch = hasChangedCompilerOptions || !program;
+            var needsUpdateInTypeRootWatch = hasChangedCompilerOptions || !getCurrentProgram();
             hasChangedCompilerOptions = false;
             hasChangedConfigFileParsingErrors = false;
             resolutionCache.startCachingPerDirectoryResolution();
@@ -91475,10 +93310,10 @@ var ts;
             return ts.toPath(fileName, currentDirectory, getCanonicalFileName);
         }
         function isFileMissingOnHost(hostSourceFile) {
-            return typeof hostSourceFile === "number";
+            return typeof hostSourceFile === "boolean";
         }
-        function isFilePresentOnHost(hostSourceFile) {
-            return !!hostSourceFile.sourceFile;
+        function isFilePresenceUnknownOnHost(hostSourceFile) {
+            return typeof hostSourceFile.version === "boolean";
         }
         function fileExists(fileName) {
             var path = toPath(fileName);
@@ -91496,36 +93331,32 @@ var ts;
                 return undefined;
             }
             // Create new source file if requested or the versions dont match
-            if (!hostSourceFile || shouldCreateNewSourceFile || !isFilePresentOnHost(hostSourceFile) || hostSourceFile.version.toString() !== hostSourceFile.sourceFile.version) {
+            if (hostSourceFile === undefined || shouldCreateNewSourceFile || isFilePresenceUnknownOnHost(hostSourceFile)) {
                 var sourceFile = getNewSourceFile(fileName, languageVersion, onError);
                 if (hostSourceFile) {
-                    if (shouldCreateNewSourceFile) {
-                        hostSourceFile.version++;
-                    }
                     if (sourceFile) {
                         // Set the source file and create file watcher now that file was present on the disk
                         hostSourceFile.sourceFile = sourceFile;
-                        sourceFile.version = hostSourceFile.version.toString();
+                        hostSourceFile.version = sourceFile.version;
                         if (!hostSourceFile.fileWatcher) {
                             hostSourceFile.fileWatcher = watchFilePath(host, fileName, onSourceFileChange, ts.PollingInterval.Low, path, "Source file" /* SourceFile */);
                         }
                     }
                     else {
                         // There is no source file on host any more, close the watch, missing file paths will track it
-                        if (isFilePresentOnHost(hostSourceFile)) {
+                        if (hostSourceFile.fileWatcher) {
                             hostSourceFile.fileWatcher.close();
                         }
-                        sourceFilesCache.set(path, hostSourceFile.version);
+                        sourceFilesCache.set(path, false);
                     }
                 }
                 else {
                     if (sourceFile) {
-                        sourceFile.version = initialVersion.toString();
                         var fileWatcher = watchFilePath(host, fileName, onSourceFileChange, ts.PollingInterval.Low, path, "Source file" /* SourceFile */);
-                        sourceFilesCache.set(path, { sourceFile: sourceFile, version: initialVersion, fileWatcher: fileWatcher });
+                        sourceFilesCache.set(path, { sourceFile: sourceFile, version: sourceFile.version, fileWatcher: fileWatcher });
                     }
                     else {
-                        sourceFilesCache.set(path, initialVersion);
+                        sourceFilesCache.set(path, false);
                     }
                 }
                 return sourceFile;
@@ -91537,16 +93368,16 @@ var ts;
             if (hostSourceFile !== undefined) {
                 if (isFileMissingOnHost(hostSourceFile)) {
                     // The next version, lets set it as presence unknown file
-                    sourceFilesCache.set(path, { version: Number(hostSourceFile) + 1 });
+                    sourceFilesCache.set(path, { version: false });
                 }
                 else {
-                    hostSourceFile.version++;
+                    hostSourceFile.version = false;
                 }
             }
         }
         function getSourceVersion(path) {
             var hostSourceFile = sourceFilesCache.get(path);
-            return !hostSourceFile || isFileMissingOnHost(hostSourceFile) ? undefined : hostSourceFile.version.toString();
+            return !hostSourceFile || !hostSourceFile.version ? undefined : hostSourceFile.version;
         }
         function onReleaseOldSourceFile(oldSourceFile, _oldOptions, hasSourceFileByPath) {
             var hostSourceFileInfo = sourceFilesCache.get(oldSourceFile.resolvedPath);
@@ -91554,7 +93385,7 @@ var ts;
             // remove the cached entry.
             // Note we arent deleting entry if file became missing in new program or
             // there was version update and new source file was created.
-            if (hostSourceFileInfo) {
+            if (hostSourceFileInfo !== undefined) {
                 // record the missing file paths so they can be removed later if watchers arent tracking them
                 if (isFileMissingOnHost(hostSourceFileInfo)) {
                     (missingFilePathsRequestedForRelease || (missingFilePathsRequestedForRelease = [])).push(oldSourceFile.path);
@@ -91643,7 +93474,7 @@ var ts;
         function onSourceFileChange(fileName, eventKind, path) {
             updateCachedSystemWithFile(fileName, path, eventKind);
             // Update the source file cache
-            if (eventKind === ts.FileWatcherEventKind.Deleted && sourceFilesCache.get(path)) {
+            if (eventKind === ts.FileWatcherEventKind.Deleted && sourceFilesCache.has(path)) {
                 resolutionCache.invalidateResolutionOfFile(path);
             }
             resolutionCache.removeResolutionsFromProjectReferenceRedirects(path);
@@ -91687,7 +93518,7 @@ var ts;
                     cachedDirectoryStructureHost.addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath);
                 }
                 nextSourceFileVersion(fileOrDirectoryPath);
-                if (ts.isPathInNodeModulesStartingWithDot(fileOrDirectoryPath))
+                if (ts.isPathIgnored(fileOrDirectoryPath))
                     return;
                 // If the the added or created file or directory is not supported file name, ignore the file
                 // But when watched directory is added/removed, we need to reload the file list
@@ -91741,16 +93572,23 @@ var ts;
          * This means we can Pseudo-build (just touch timestamps), as if we had actually built this project.
          */
         UpToDateStatusType[UpToDateStatusType["UpToDateWithUpstreamTypes"] = 2] = "UpToDateWithUpstreamTypes";
-        UpToDateStatusType[UpToDateStatusType["OutputMissing"] = 3] = "OutputMissing";
-        UpToDateStatusType[UpToDateStatusType["OutOfDateWithSelf"] = 4] = "OutOfDateWithSelf";
-        UpToDateStatusType[UpToDateStatusType["OutOfDateWithUpstream"] = 5] = "OutOfDateWithUpstream";
-        UpToDateStatusType[UpToDateStatusType["UpstreamOutOfDate"] = 6] = "UpstreamOutOfDate";
-        UpToDateStatusType[UpToDateStatusType["UpstreamBlocked"] = 7] = "UpstreamBlocked";
-        UpToDateStatusType[UpToDateStatusType["ComputingUpstream"] = 8] = "ComputingUpstream";
+        /**
+         * The project appears out of date because its upstream inputs are newer than its outputs,
+         * but all of its outputs are actually newer than the previous identical outputs of its (.d.ts) inputs.
+         * This means we can Pseudo-build (just manipulate outputs), as if we had actually built this project.
+         */
+        UpToDateStatusType[UpToDateStatusType["OutOfDateWithPrepend"] = 3] = "OutOfDateWithPrepend";
+        UpToDateStatusType[UpToDateStatusType["OutputMissing"] = 4] = "OutputMissing";
+        UpToDateStatusType[UpToDateStatusType["OutOfDateWithSelf"] = 5] = "OutOfDateWithSelf";
+        UpToDateStatusType[UpToDateStatusType["OutOfDateWithUpstream"] = 6] = "OutOfDateWithUpstream";
+        UpToDateStatusType[UpToDateStatusType["UpstreamOutOfDate"] = 7] = "UpstreamOutOfDate";
+        UpToDateStatusType[UpToDateStatusType["UpstreamBlocked"] = 8] = "UpstreamBlocked";
+        UpToDateStatusType[UpToDateStatusType["ComputingUpstream"] = 9] = "ComputingUpstream";
+        UpToDateStatusType[UpToDateStatusType["TsVersionOutputOfDate"] = 10] = "TsVersionOutputOfDate";
         /**
          * Projects with no outputs (i.e. "solution" files)
          */
-        UpToDateStatusType[UpToDateStatusType["ContainerOnly"] = 9] = "ContainerOnly";
+        UpToDateStatusType[UpToDateStatusType["ContainerOnly"] = 11] = "ContainerOnly";
     })(UpToDateStatusType = ts.UpToDateStatusType || (ts.UpToDateStatusType = {}));
     function createFileMap(toPath) {
         // tslint:disable-next-line:no-null-keyword
@@ -91798,61 +93636,6 @@ var ts;
     function getOrCreateValueMapFromConfigFileMap(configFileMap, resolved) {
         return getOrCreateValueFromConfigFileMap(configFileMap, resolved, ts.createMap);
     }
-    function getOutputDeclarationFileName(inputFileName, configFile) {
-        var relativePath = ts.getRelativePathFromDirectory(rootDirOfOptions(configFile.options, configFile.options.configFilePath), inputFileName, /*ignoreCase*/ true);
-        var outputPath = ts.resolvePath(configFile.options.declarationDir || configFile.options.outDir || ts.getDirectoryPath(configFile.options.configFilePath), relativePath);
-        return ts.changeExtension(outputPath, ".d.ts" /* Dts */);
-    }
-    ts.getOutputDeclarationFileName = getOutputDeclarationFileName;
-    function getOutputJSFileName(inputFileName, configFile) {
-        var relativePath = ts.getRelativePathFromDirectory(rootDirOfOptions(configFile.options, configFile.options.configFilePath), inputFileName, /*ignoreCase*/ true);
-        var outputPath = ts.resolvePath(configFile.options.outDir || ts.getDirectoryPath(configFile.options.configFilePath), relativePath);
-        var newExtension = ts.fileExtensionIs(inputFileName, ".json" /* Json */) ? ".json" /* Json */ :
-            ts.fileExtensionIs(inputFileName, ".tsx" /* Tsx */) && configFile.options.jsx === 1 /* Preserve */ ? ".jsx" /* Jsx */ : ".js" /* Js */;
-        return ts.changeExtension(outputPath, newExtension);
-    }
-    function getOutputFileNames(inputFileName, configFile) {
-        // outFile is handled elsewhere; .d.ts files don't generate outputs
-        if (configFile.options.outFile || configFile.options.out || ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */)) {
-            return ts.emptyArray;
-        }
-        var outputs = [];
-        var js = getOutputJSFileName(inputFileName, configFile);
-        outputs.push(js);
-        if (configFile.options.sourceMap) {
-            outputs.push(js + ".map");
-        }
-        if (ts.getEmitDeclarations(configFile.options) && !ts.fileExtensionIs(inputFileName, ".json" /* Json */)) {
-            var dts = getOutputDeclarationFileName(inputFileName, configFile);
-            outputs.push(dts);
-            if (configFile.options.declarationMap) {
-                outputs.push(dts + ".map");
-            }
-        }
-        return outputs;
-    }
-    function getOutFileOutputs(project) {
-        var out = project.options.outFile || project.options.out;
-        if (!out) {
-            return ts.Debug.fail("outFile must be set");
-        }
-        var outputs = [];
-        outputs.push(out);
-        if (project.options.sourceMap) {
-            outputs.push(out + ".map");
-        }
-        if (ts.getEmitDeclarations(project.options)) {
-            var dts = ts.changeExtension(out, ".d.ts" /* Dts */);
-            outputs.push(dts);
-            if (project.options.declarationMap) {
-                outputs.push(dts + ".map");
-            }
-        }
-        return outputs;
-    }
-    function rootDirOfOptions(opts, configFileName) {
-        return opts.rootDir || ts.getDirectoryPath(configFileName);
-    }
     function newer(date1, date2) {
         return date2 > date1 ? date2 : date1;
     }
@@ -91872,7 +93655,7 @@ var ts;
     ts.createBuilderStatusReporter = createBuilderStatusReporter;
     function createSolutionBuilderHostBase(system, createProgram, reportDiagnostic, reportSolutionBuilderStatus) {
         var host = ts.createProgramHost(system, createProgram);
-        host.getModifiedTime = system.getModifiedTime ? function (path) { return system.getModifiedTime(path); } : function () { return undefined; };
+        host.getModifiedTime = system.getModifiedTime ? function (path) { return system.getModifiedTime(path); } : ts.returnUndefined;
         host.setModifiedTime = system.setModifiedTime ? function (path, date) { return system.setModifiedTime(path, date); } : ts.noop;
         host.deleteFile = system.deleteFile ? function (path) { return system.deleteFile(path); } : ts.noop;
         host.reportDiagnostic = reportDiagnostic || ts.createDiagnosticReporter(system);
@@ -91881,14 +93664,14 @@ var ts;
     }
     function createSolutionBuilderHost(system, createProgram, reportDiagnostic, reportSolutionBuilderStatus, reportErrorSummary) {
         if (system === void 0) { system = ts.sys; }
-        var host = createSolutionBuilderHostBase(system, createProgram || ts.createAbstractBuilder, reportDiagnostic, reportSolutionBuilderStatus);
+        var host = createSolutionBuilderHostBase(system, createProgram, reportDiagnostic, reportSolutionBuilderStatus);
         host.reportErrorSummary = reportErrorSummary;
         return host;
     }
     ts.createSolutionBuilderHost = createSolutionBuilderHost;
     function createSolutionBuilderWithWatchHost(system, createProgram, reportDiagnostic, reportSolutionBuilderStatus, reportWatchStatus) {
         if (system === void 0) { system = ts.sys; }
-        var host = createSolutionBuilderHostBase(system, createProgram || ts.createEmitAndSemanticDiagnosticsBuilderProgram, reportDiagnostic, reportSolutionBuilderStatus);
+        var host = createSolutionBuilderHostBase(system, createProgram, reportDiagnostic, reportSolutionBuilderStatus);
         var watchHost = ts.createWatchHost(system, reportWatchStatus);
         ts.copyProperties(host, watchHost);
         return host;
@@ -91920,9 +93703,8 @@ var ts;
         var readFileWithCache = function (f) { return host.readFile(f); };
         var projectCompilerOptions = baseCompilerOptions;
         var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return projectCompilerOptions; });
-        var originalGetSourceFile = compilerHost.getSourceFile;
-        var computeHash = host.createHash || ts.generateDjb2Hash;
-        updateGetSourceFile();
+        ts.setGetSourceFileAsHashVersioned(compilerHost, host);
+        var buildInfoChecked = createFileMap(toPath);
         // Watch state
         var builderPrograms = createFileMap(toPath);
         var diagnostics = createFileMap(toPath);
@@ -91960,6 +93742,7 @@ var ts;
             projectStatus.clear();
             missingRoots.clear();
             globalDependencyGraph = undefined;
+            buildInfoChecked.clear();
             diagnostics.clear();
             projectPendingBuild.clear();
             projectErrorsReported.clear();
@@ -91974,29 +93757,6 @@ var ts;
             ts.clearMap(allWatchedInputFiles, function (inputFileWatches) { return ts.clearMap(inputFileWatches, ts.closeFileWatcher); });
             ts.clearMap(allWatchedConfigFiles, ts.closeFileWatcher);
             builderPrograms.clear();
-            updateGetSourceFile();
-        }
-        function updateGetSourceFile() {
-            if (options.watch) {
-                if (compilerHost.getSourceFile === originalGetSourceFile) {
-                    compilerHost.getSourceFile = function () {
-                        var args = [];
-                        for (var _i = 0; _i < arguments.length; _i++) {
-                            args[_i] = arguments[_i];
-                        }
-                        var result = originalGetSourceFile.call.apply(originalGetSourceFile, [compilerHost].concat(args));
-                        if (result && options.watch) {
-                            result.version = computeHash.call(host, result.text);
-                        }
-                        return result;
-                    };
-                }
-            }
-            else {
-                if (compilerHost.getSourceFile !== originalGetSourceFile) {
-                    compilerHost.getSourceFile = originalGetSourceFile;
-                }
-            }
         }
         function isParsedCommandLine(entry) {
             return !!entry.options;
@@ -92147,13 +93907,14 @@ var ts;
                     newestInputFileTime = inputTime;
                 }
             }
-            // Collect the expected outputs of this project
-            var outputs = getAllProjectOutputs(project);
-            if (outputs.length === 0) {
+            // Container if no files are specified in the project
+            if (!project.fileNames.length && !ts.canJsonReportNoInutFiles(project.raw)) {
                 return {
                     type: UpToDateStatusType.ContainerOnly
                 };
             }
+            // Collect the expected outputs of this project
+            var outputs = ts.getAllProjectOutputs(project, !host.useCaseSensitiveFileNames());
             // Now see if all outputs are newer than the newest input
             var oldestOutputFileName = "(none)";
             var oldestOutputFileTime = maximumDate;
@@ -92228,25 +93989,28 @@ var ts;
                             upstreamProjectName: ref.path
                         };
                     }
-                    // If the upstream project's newest file is older than our oldest output, we
-                    // can't be out of date because of it
-                    if (refStatus.newestInputFileTime && refStatus.newestInputFileTime <= oldestOutputFileTime) {
-                        continue;
-                    }
-                    // If the upstream project has only change .d.ts files, and we've built
-                    // *after* those files, then we're "psuedo up to date" and eligible for a fast rebuild
-                    if (refStatus.newestDeclarationFileContentChangedTime && refStatus.newestDeclarationFileContentChangedTime <= oldestOutputFileTime) {
-                        pseudoUpToDate = true;
-                        upstreamChangedProject = ref.path;
-                        continue;
+                    // Check oldest output file name only if there is no missing output file name
+                    if (!missingOutputFileName) {
+                        // If the upstream project's newest file is older than our oldest output, we
+                        // can't be out of date because of it
+                        if (refStatus.newestInputFileTime && refStatus.newestInputFileTime <= oldestOutputFileTime) {
+                            continue;
+                        }
+                        // If the upstream project has only change .d.ts files, and we've built
+                        // *after* those files, then we're "psuedo up to date" and eligible for a fast rebuild
+                        if (refStatus.newestDeclarationFileContentChangedTime && refStatus.newestDeclarationFileContentChangedTime <= oldestOutputFileTime) {
+                            pseudoUpToDate = true;
+                            upstreamChangedProject = ref.path;
+                            continue;
+                        }
+                        // We have an output older than an upstream output - we are out of date
+                        ts.Debug.assert(oldestOutputFileName !== undefined, "Should have an oldest output filename here");
+                        return {
+                            type: UpToDateStatusType.OutOfDateWithUpstream,
+                            outOfDateOutputFileName: oldestOutputFileName,
+                            newerProjectName: ref.path
+                        };
                     }
-                    // We have an output older than an upstream output - we are out of date
-                    ts.Debug.assert(oldestOutputFileName !== undefined, "Should have an oldest output filename here");
-                    return {
-                        type: UpToDateStatusType.OutOfDateWithUpstream,
-                        outOfDateOutputFileName: oldestOutputFileName,
-                        newerProjectName: ref.path
-                    };
                 }
             }
             if (missingOutputFileName !== undefined) {
@@ -92262,9 +94026,33 @@ var ts;
                     newerInputFileName: newestInputFileName
                 };
             }
+            else {
+                // Check tsconfig time
+                var configStatus = checkConfigFileUpToDateStatus(project.options.configFilePath, oldestOutputFileTime, oldestOutputFileName);
+                if (configStatus)
+                    return configStatus;
+                // Check extended config time
+                var extendedConfigStatus = ts.forEach(project.options.configFile.extendedSourceFiles || ts.emptyArray, function (configFile) { return checkConfigFileUpToDateStatus(configFile, oldestOutputFileTime, oldestOutputFileName); });
+                if (extendedConfigStatus)
+                    return extendedConfigStatus;
+            }
+            if (!buildInfoChecked.hasKey(project.options.configFilePath)) {
+                buildInfoChecked.setValue(project.options.configFilePath, true);
+                var buildInfoPath = ts.getOutputPathForBuildInfo(project.options);
+                if (buildInfoPath) {
+                    var value = readFileWithCache(buildInfoPath);
+                    var buildInfo = value && ts.getBuildInfo(value);
+                    if (buildInfo && buildInfo.version !== ts.version) {
+                        return {
+                            type: UpToDateStatusType.TsVersionOutputOfDate,
+                            version: buildInfo.version
+                        };
+                    }
+                }
+            }
             if (usesPrepend && pseudoUpToDate) {
                 return {
-                    type: UpToDateStatusType.OutOfDateWithUpstream,
+                    type: UpToDateStatusType.OutOfDateWithPrepend,
                     outOfDateOutputFileName: oldestOutputFileName,
                     newerProjectName: upstreamChangedProject
                 };
@@ -92280,6 +94068,17 @@ var ts;
                 oldestOutputFileName: oldestOutputFileName
             };
         }
+        function checkConfigFileUpToDateStatus(configFile, oldestOutputFileTime, oldestOutputFileName) {
+            // Check tsconfig time
+            var tsconfigTime = host.getModifiedTime(configFile) || ts.missingFileModifiedTime;
+            if (oldestOutputFileTime < tsconfigTime) {
+                return {
+                    type: UpToDateStatusType.OutOfDateWithSelf,
+                    outOfDateOutputFileName: oldestOutputFileName,
+                    newerInputFileName: configFile
+                };
+            }
+        }
         function invalidateProject(configFileName, reloadLevel) {
             invalidateResolvedProject(resolveProjectName(configFileName), reloadLevel);
         }
@@ -92398,7 +94197,9 @@ var ts;
                 updateOutputTimestamps(proj);
                 return;
             }
-            var buildResult = buildSingleProject(resolved);
+            var buildResult = needsBuild(status, resolved) ?
+                buildSingleProject(resolved) : // Actual build
+                updateBundle(resolved); // Fake that files have been built by manipulating prepend and existing output
             if (buildResult & BuildResultFlags.AnyErrors)
                 return;
             var _a = getGlobalDependencyGraph(), referencingProjectsMap = _a.referencingProjectsMap, buildQueue = _a.buildQueue;
@@ -92414,17 +94215,26 @@ var ts;
                     // If declaration output is changed, build the project
                     // otherwise mark the project UpToDateWithUpstreamTypes so it updates output time stamps
                     var status_1 = projectStatus.getValue(project);
-                    if (prepend || !(buildResult & BuildResultFlags.DeclarationOutputUnchanged)) {
-                        if (status_1 && (status_1.type === UpToDateStatusType.UpToDate || status_1.type === UpToDateStatusType.UpToDateWithUpstreamTypes)) {
+                    if (!(buildResult & BuildResultFlags.DeclarationOutputUnchanged)) {
+                        if (status_1 && (status_1.type === UpToDateStatusType.UpToDate || status_1.type === UpToDateStatusType.UpToDateWithUpstreamTypes || status_1.type === UpToDateStatusType.OutOfDateWithPrepend)) {
                             projectStatus.setValue(project, {
                                 type: UpToDateStatusType.OutOfDateWithUpstream,
-                                outOfDateOutputFileName: status_1.oldestOutputFileName,
+                                outOfDateOutputFileName: status_1.type === UpToDateStatusType.OutOfDateWithPrepend ? status_1.outOfDateOutputFileName : status_1.oldestOutputFileName,
                                 newerProjectName: resolved
                             });
                         }
                     }
                     else if (status_1 && status_1.type === UpToDateStatusType.UpToDate) {
-                        status_1.type = UpToDateStatusType.UpToDateWithUpstreamTypes;
+                        if (prepend) {
+                            projectStatus.setValue(project, {
+                                type: UpToDateStatusType.OutOfDateWithPrepend,
+                                outOfDateOutputFileName: status_1.oldestOutputFileName,
+                                newerProjectName: resolved
+                            });
+                        }
+                        else {
+                            status_1.type = UpToDateStatusType.UpToDateWithUpstreamTypes;
+                        }
                     }
                     addProjToQueue(project);
                 }
@@ -92481,8 +94291,7 @@ var ts;
             }
             if (options.verbose)
                 reportStatus(ts.Diagnostics.Building_project_0, proj);
-            var resultFlags = BuildResultFlags.None;
-            resultFlags |= BuildResultFlags.DeclarationOutputUnchanged;
+            var resultFlags = BuildResultFlags.DeclarationOutputUnchanged;
             var configFile = parseConfigFile(proj);
             if (!configFile) {
                 // Failed to read the config file
@@ -92498,8 +94307,7 @@ var ts;
             }
             // TODO: handle resolve module name to cache result in project reference redirect
             projectCompilerOptions = configFile.options;
-            var program = host.createProgram(configFile.fileNames, configFile.options, compilerHost, builderPrograms.getValue(proj), configFile.errors, configFile.projectReferences);
-            projectCompilerOptions = baseCompilerOptions;
+            var program = host.createProgram(configFile.fileNames, configFile.options, compilerHost, getOldProgram(proj, configFile), configFile.errors, configFile.projectReferences);
             // Don't emit anything in the presence of syntactic errors or options diagnostics
             var syntaxDiagnostics = program.getConfigFileParsingDiagnostics().concat(program.getOptionsDiagnostics(), program.getGlobalDiagnostics(), program.getSyntacticDiagnostics());
             if (syntaxDiagnostics.length) {
@@ -92555,17 +94363,19 @@ var ts;
             var status = {
                 type: UpToDateStatusType.UpToDate,
                 newestDeclarationFileContentChangedTime: anyDtsChanged ? maximumDate : newestDeclarationFileContentChangedTime,
-                oldestOutputFileName: outputFiles.length ? outputFiles[0].name : getFirstProjectOutput(configFile)
+                oldestOutputFileName: outputFiles.length ? outputFiles[0].name : ts.getFirstProjectOutput(configFile, !host.useCaseSensitiveFileNames())
             };
             diagnostics.removeKey(proj);
             projectStatus.setValue(proj, status);
             afterProgramCreate(proj, program);
+            projectCompilerOptions = baseCompilerOptions;
             return resultFlags;
             function buildErrors(diagnostics, errorFlags, errorType) {
                 resultFlags |= errorFlags;
                 reportAndStoreErrors(proj, diagnostics);
                 projectStatus.setValue(proj, { type: UpToDateStatusType.Unbuildable, reason: errorType + " errors" });
                 afterProgramCreate(proj, program);
+                projectCompilerOptions = baseCompilerOptions;
                 return resultFlags;
             }
         }
@@ -92578,15 +94388,71 @@ var ts;
                 builderPrograms.setValue(proj, program);
             }
         }
+        function getOldProgram(proj, parsed) {
+            if (options.force)
+                return undefined;
+            var value = builderPrograms.getValue(proj);
+            if (value)
+                return value;
+            return ts.readBuilderProgram(parsed.options, readFileWithCache);
+        }
+        function updateBundle(proj) {
+            if (options.dry) {
+                reportStatus(ts.Diagnostics.A_non_dry_build_would_update_output_of_project_0, proj);
+                return BuildResultFlags.Success;
+            }
+            if (options.verbose)
+                reportStatus(ts.Diagnostics.Updating_output_of_project_0, proj);
+            // Update js, and source map
+            var config = ts.Debug.assertDefined(parseConfigFile(proj));
+            projectCompilerOptions = config.options;
+            var outputFiles = ts.emitUsingBuildInfo(config, compilerHost, function (ref) { return parseConfigFile(resolveProjectName(ref.path)); });
+            if (ts.isString(outputFiles)) {
+                reportStatus(ts.Diagnostics.Cannot_update_output_of_project_0_because_there_was_error_reading_file_1, proj, relName(outputFiles));
+                return buildSingleProject(proj);
+            }
+            // Actual Emit
+            ts.Debug.assert(!!outputFiles.length);
+            var emitterDiagnostics = ts.createDiagnosticCollection();
+            var emittedOutputs = createFileMap(toPath);
+            outputFiles.forEach(function (_a) {
+                var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark;
+                emittedOutputs.setValue(name, true);
+                ts.writeFile(compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
+            });
+            var emitDiagnostics = emitterDiagnostics.getDiagnostics();
+            if (emitDiagnostics.length) {
+                reportAndStoreErrors(proj, emitDiagnostics);
+                projectStatus.setValue(proj, { type: UpToDateStatusType.Unbuildable, reason: "Emit errors" });
+                projectCompilerOptions = baseCompilerOptions;
+                return BuildResultFlags.DeclarationOutputUnchanged | BuildResultFlags.EmitErrors;
+            }
+            // Update timestamps for dts
+            var newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(config, minimumDate, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
+            var status = {
+                type: UpToDateStatusType.UpToDate,
+                newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTime,
+                oldestOutputFileName: outputFiles[0].name
+            };
+            diagnostics.removeKey(proj);
+            projectStatus.setValue(proj, status);
+            projectCompilerOptions = baseCompilerOptions;
+            return BuildResultFlags.DeclarationOutputUnchanged;
+        }
         function updateOutputTimestamps(proj) {
             if (options.dry) {
-                return reportStatus(ts.Diagnostics.A_non_dry_build_would_build_project_0, proj.options.configFilePath);
+                return reportStatus(ts.Diagnostics.A_non_dry_build_would_update_timestamps_for_output_of_project_0, proj.options.configFilePath);
             }
             var priorNewestUpdateTime = updateOutputTimestampsWorker(proj, minimumDate, ts.Diagnostics.Updating_output_timestamps_of_project_0);
-            projectStatus.setValue(proj.options.configFilePath, { type: UpToDateStatusType.UpToDate, newestDeclarationFileContentChangedTime: priorNewestUpdateTime });
+            var status = {
+                type: UpToDateStatusType.UpToDate,
+                newestDeclarationFileContentChangedTime: priorNewestUpdateTime,
+                oldestOutputFileName: ts.getFirstProjectOutput(proj, !host.useCaseSensitiveFileNames())
+            };
+            projectStatus.setValue(proj.options.configFilePath, status);
         }
         function updateOutputTimestampsWorker(proj, priorNewestUpdateTime, verboseMessage, skipOutputs) {
-            var outputs = getAllProjectOutputs(proj);
+            var outputs = ts.getAllProjectOutputs(proj, !host.useCaseSensitiveFileNames());
             if (!skipOutputs || outputs.length !== skipOutputs.getSize()) {
                 if (options.verbose) {
                     reportStatus(verboseMessage, proj.options.configFilePath);
@@ -92620,7 +94486,7 @@ var ts;
                     reportParseConfigFileDiagnostic(proj);
                     continue;
                 }
-                var outputs = getAllProjectOutputs(parsed);
+                var outputs = ts.getAllProjectOutputs(parsed, !host.useCaseSensitiveFileNames());
                 for (var _b = 0, outputs_3 = outputs; _b < outputs_3.length; _b++) {
                     var output = outputs_3[_b];
                     if (host.fileExists(output)) {
@@ -92707,7 +94573,9 @@ var ts;
                     // Do nothing
                     continue;
                 }
-                var buildResult = buildSingleProject(next);
+                var buildResult = needsBuild(status, next) ?
+                    buildSingleProject(next) : // Actual build
+                    updateBundle(next); // Fake that files have been built by manipulating prepend and existing output
                 anyFailed = anyFailed || !!(buildResult & BuildResultFlags.AnyErrors);
             }
             reportErrorSummary();
@@ -92720,6 +94588,15 @@ var ts;
             readFileWithCache = savedReadFileWithCache;
             return anyFailed ? ts.ExitStatus.DiagnosticsPresent_OutputsSkipped : ts.ExitStatus.Success;
         }
+        function needsBuild(status, configFile) {
+            if (status.type !== UpToDateStatusType.OutOfDateWithPrepend || options.force)
+                return true;
+            var config = parseConfigFile(configFile);
+            return !config ||
+                config.fileNames.length === 0 ||
+                !!config.errors.length ||
+                !ts.isIncrementalCompilation(config.options);
+        }
         function reportParseConfigFileDiagnostic(proj) {
             reportAndStoreErrors(proj, [configFileCache.getValue(proj)]);
         }
@@ -92759,33 +94636,6 @@ var ts;
         return ts.combinePaths(project, "tsconfig.json");
     }
     ts.resolveConfigFileProjectName = resolveConfigFileProjectName;
-    function getAllProjectOutputs(project) {
-        if (project.options.outFile || project.options.out) {
-            return getOutFileOutputs(project);
-        }
-        else {
-            var outputs = [];
-            for (var _i = 0, _a = project.fileNames; _i < _a.length; _i++) {
-                var inputFile = _a[_i];
-                outputs.push.apply(outputs, getOutputFileNames(inputFile, project));
-            }
-            return outputs;
-        }
-    }
-    ts.getAllProjectOutputs = getAllProjectOutputs;
-    function getFirstProjectOutput(project) {
-        if (project.options.outFile || project.options.out) {
-            return ts.first(getOutFileOutputs(project));
-        }
-        for (var _i = 0, _a = project.fileNames; _i < _a.length; _i++) {
-            var inputFile = _a[_i];
-            var outputs = getOutputFileNames(inputFile, project);
-            if (outputs.length) {
-                return ts.first(outputs);
-            }
-        }
-        return ts.Debug.fail("project " + project.options.configFilePath + " expected to have at least one output");
-    }
     function formatUpToDateStatus(configFileName, status, relName, formatMessage) {
         switch (status.type) {
             case UpToDateStatusType.OutOfDateWithSelf:
@@ -92800,6 +94650,8 @@ var ts;
                 }
                 // Don't report anything for "up to date because it was already built" -- too verbose
                 break;
+            case UpToDateStatusType.OutOfDateWithPrepend:
+                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_output_of_its_dependency_1_has_changed, relName(configFileName), relName(status.newerProjectName));
             case UpToDateStatusType.UpToDateWithUpstreamTypes:
                 return formatMessage(ts.Diagnostics.Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies, relName(configFileName));
             case UpToDateStatusType.UpstreamOutOfDate:
@@ -92808,6 +94660,8 @@ var ts;
                 return formatMessage(ts.Diagnostics.Project_0_can_t_be_built_because_its_dependency_1_has_errors, relName(configFileName), relName(status.upstreamProjectName));
             case UpToDateStatusType.Unbuildable:
                 return formatMessage(ts.Diagnostics.Failed_to_parse_file_0_Colon_1, relName(configFileName), status.reason);
+            case UpToDateStatusType.TsVersionOutputOfDate:
+                return formatMessage(ts.Diagnostics.Project_0_is_out_of_date_because_output_for_it_was_generated_with_version_1_that_differs_with_current_version_2, relName(configFileName), status.version, ts.version);
             case UpToDateStatusType.ContainerOnly:
             // Don't report status on "solution" projects
             case UpToDateStatusType.ComputingUpstream:
@@ -93206,8 +95060,8 @@ var ts;
                     if (baseFileName !== "package.json" && baseFileName !== "bower.json") {
                         continue;
                     }
-                    var result_7 = ts.readConfigFile(normalizedFileName, function (path) { return host.readFile(path); });
-                    var packageJson = result_7.config;
+                    var result_1 = ts.readConfigFile(normalizedFileName, function (path) { return host.readFile(path); });
+                    var packageJson = result_1.config;
                     // npm 3's package.json contains a "_requiredBy" field
                     // we should include all the top level module names for npm 2, and only module names whose
                     // "_requiredBy" field starts with "#" or equals "/" for npm 3.
@@ -93579,7 +95433,7 @@ var ts;
 /* @internal */
 var ts;
 (function (ts) {
-    ts.scanner = ts.createScanner(6 /* Latest */, /*skipTrivia*/ true);
+    ts.scanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ true);
     var SemanticMeaning;
     (function (SemanticMeaning) {
         SemanticMeaning[SemanticMeaning["None"] = 0] = "None";
@@ -93614,7 +95468,7 @@ var ts;
             case 242 /* TypeAliasDeclaration */:
             case 168 /* TypeLiteral */:
                 return 2 /* Type */;
-            case 304 /* JSDocTypedefTag */:
+            case 309 /* JSDocTypedefTag */:
                 // If it has no name node, it shares the name with the value declaration below it.
                 return node.name === undefined ? 1 /* Value */ | 2 /* Type */ : 2 /* Type */;
             case 278 /* EnumMember */:
@@ -93639,14 +95493,14 @@ var ts;
             case 255 /* ExportDeclaration */:
                 return 7 /* All */;
             // An external module can be a Value
-            case 279 /* SourceFile */:
+            case 284 /* SourceFile */:
                 return 4 /* Namespace */ | 1 /* Value */;
         }
         return 7 /* All */;
     }
     ts.getMeaningFromDeclaration = getMeaningFromDeclaration;
     function getMeaningFromLocation(node) {
-        if (node.kind === 279 /* SourceFile */) {
+        if (node.kind === 284 /* SourceFile */) {
             return 1 /* Value */;
         }
         else if (node.parent.kind === 254 /* ExportAssignment */ || node.parent.kind === 259 /* ExternalModuleReference */) {
@@ -93852,7 +95706,7 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 279 /* SourceFile */:
+                case 284 /* SourceFile */:
                 case 156 /* MethodDeclaration */:
                 case 155 /* MethodSignature */:
                 case 239 /* FunctionDeclaration */:
@@ -93870,7 +95724,7 @@ var ts;
     ts.getContainerNode = getContainerNode;
     function getNodeKind(node) {
         switch (node.kind) {
-            case 279 /* SourceFile */:
+            case 284 /* SourceFile */:
                 return ts.isExternalModule(node) ? "module" /* moduleElement */ : "script" /* scriptElement */;
             case 244 /* ModuleDeclaration */:
                 return "module" /* moduleElement */;
@@ -93879,8 +95733,8 @@ var ts;
                 return "class" /* classElement */;
             case 241 /* InterfaceDeclaration */: return "interface" /* interfaceElement */;
             case 242 /* TypeAliasDeclaration */:
-            case 297 /* JSDocCallbackTag */:
-            case 304 /* JSDocTypedefTag */:
+            case 302 /* JSDocCallbackTag */:
+            case 309 /* JSDocTypedefTag */:
                 return "type" /* typeElement */;
             case 243 /* EnumDeclaration */: return "enum" /* enumElement */;
             case 237 /* VariableDeclaration */:
@@ -94297,8 +96151,8 @@ var ts;
                         isWhiteSpaceOnlyJsxText(child);
                     if (lookInPreviousChild) {
                         // actual start of the node is past the position - previous token should be at the end of previous child
-                        var candidate_2 = findRightmostChildNodeWithTokens(children, /*exclusiveStartPosition*/ i, sourceFile);
-                        return candidate_2 && findRightmostToken(candidate_2, sourceFile);
+                        var candidate_1 = findRightmostChildNodeWithTokens(children, /*exclusiveStartPosition*/ i, sourceFile);
+                        return candidate_1 && findRightmostToken(candidate_1, sourceFile);
                     }
                     else {
                         // candidate should be in this node
@@ -94306,7 +96160,7 @@ var ts;
                     }
                 }
             }
-            ts.Debug.assert(startNode !== undefined || n.kind === 279 /* SourceFile */ || n.kind === 1 /* EndOfFileToken */ || ts.isJSDocCommentContainingNode(n));
+            ts.Debug.assert(startNode !== undefined || n.kind === 284 /* SourceFile */ || n.kind === 1 /* EndOfFileToken */ || ts.isJSDocCommentContainingNode(n));
             // Here we know that none of child token nodes embrace the position,
             // the only known case is when position is at the end of the file.
             // Try to find the rightmost token in the file without filtering.
@@ -94393,7 +96247,7 @@ var ts;
     }
     ts.isInsideJsxElementOrAttribute = isInsideJsxElementOrAttribute;
     function isWhiteSpaceOnlyJsxText(node) {
-        return ts.isJsxText(node) && node.containsOnlyWhiteSpaces;
+        return ts.isJsxText(node) && node.containsOnlyTriviaWhiteSpaces;
     }
     function isInTemplateString(sourceFile, position) {
         var token = getTokenAtPosition(sourceFile, position);
@@ -95153,6 +97007,17 @@ var ts;
         return ts.ensureScriptKind(fileName, host && host.getScriptKind && host.getScriptKind(fileName));
     }
     ts.getScriptKind = getScriptKind;
+    function getSymbolTarget(symbol) {
+        var next = symbol;
+        while (isTransientSymbol(next) && next.target) {
+            next = next.target;
+        }
+        return next;
+    }
+    ts.getSymbolTarget = getSymbolTarget;
+    function isTransientSymbol(symbol) {
+        return (symbol.flags & 33554432 /* Transient */) !== 0;
+    }
     function getUniqueSymbolId(symbol, checker) {
         return ts.getSymbolId(ts.skipAlias(symbol, checker));
     }
@@ -95211,14 +97076,14 @@ var ts;
             ts.visitEachChild(node, getSynthesizedDeepClone, ts.nullTransformationContext);
         if (visited === node) {
             // This only happens for leaf nodes - internal nodes always see their children change.
-            var clone_8 = ts.getSynthesizedClone(node);
-            if (ts.isStringLiteral(clone_8)) {
-                clone_8.textSourceNode = node;
+            var clone_1 = ts.getSynthesizedClone(node);
+            if (ts.isStringLiteral(clone_1)) {
+                clone_1.textSourceNode = node;
             }
-            else if (ts.isNumericLiteral(clone_8)) {
-                clone_8.numericLiteralFlags = node.numericLiteralFlags;
+            else if (ts.isNumericLiteral(clone_1)) {
+                clone_1.numericLiteralFlags = node.numericLiteralFlags;
             }
-            return ts.setTextRange(clone_8, node);
+            return ts.setTextRange(clone_1, node);
         }
         // PERF: As an optimization, rather than calling getSynthesizedClone, we'll update
         // the new node created by visitEachChild with the extra changes getSynthesizedClone
@@ -95304,8 +97169,27 @@ var ts;
         return lastPos;
     }
     ts.getRenameLocation = getRenameLocation;
-    function copyComments(sourceNode, targetNode, sourceFile, commentKind, hasTrailingNewLine) {
-        ts.forEachLeadingCommentRange(sourceFile.text, sourceNode.pos, function (pos, end, kind, htnl) {
+    function copyLeadingComments(sourceNode, targetNode, sourceFile, commentKind, hasTrailingNewLine) {
+        ts.forEachLeadingCommentRange(sourceFile.text, sourceNode.pos, getAddCommentsFunction(targetNode, sourceFile, commentKind, hasTrailingNewLine, ts.addSyntheticLeadingComment));
+    }
+    ts.copyLeadingComments = copyLeadingComments;
+    function copyTrailingComments(sourceNode, targetNode, sourceFile, commentKind, hasTrailingNewLine) {
+        ts.forEachTrailingCommentRange(sourceFile.text, sourceNode.end, getAddCommentsFunction(targetNode, sourceFile, commentKind, hasTrailingNewLine, ts.addSyntheticTrailingComment));
+    }
+    ts.copyTrailingComments = copyTrailingComments;
+    /**
+     * This function copies the trailing comments for the token that comes before `sourceNode`, as leading comments of `targetNode`.
+     * This is useful because sometimes a comment that refers to `sourceNode` will be a leading comment for `sourceNode`, according to the
+     * notion of trivia ownership, and instead will be a trailing comment for the token before `sourceNode`, e.g.:
+     * `function foo(\* not leading comment for a *\ a: string) {}`
+     * The comment refers to `a` but belongs to the `(` token, but we might want to copy it.
+     */
+    function copyTrailingAsLeadingComments(sourceNode, targetNode, sourceFile, commentKind, hasTrailingNewLine) {
+        ts.forEachTrailingCommentRange(sourceFile.text, sourceNode.pos, getAddCommentsFunction(targetNode, sourceFile, commentKind, hasTrailingNewLine, ts.addSyntheticLeadingComment));
+    }
+    ts.copyTrailingAsLeadingComments = copyTrailingAsLeadingComments;
+    function getAddCommentsFunction(targetNode, sourceFile, commentKind, hasTrailingNewLine, cb) {
+        return function (pos, end, kind, htnl) {
             if (kind === 3 /* MultiLineCommentTrivia */) {
                 // Remove leading /*
                 pos += 2;
@@ -95316,10 +97200,9 @@ var ts;
                 // Remove leading //
                 pos += 2;
             }
-            ts.addSyntheticLeadingComment(targetNode, commentKind || kind, sourceFile.text.slice(pos, end), hasTrailingNewLine !== undefined ? hasTrailingNewLine : htnl);
-        });
+            cb(targetNode, commentKind || kind, sourceFile.text.slice(pos, end), hasTrailingNewLine !== undefined ? hasTrailingNewLine : htnl);
+        };
     }
-    ts.copyComments = copyComments;
     function indexInTextChange(change, name) {
         if (ts.startsWith(change, name))
             return 0;
@@ -95400,11 +97283,35 @@ var ts;
         return checker.getTypeAtLocation(caseClause.parent.parent.expression);
     }
     ts.getSwitchedType = getSwitchedType;
+    function getTypeNodeIfAccessible(type, enclosingScope, program, host) {
+        var checker = program.getTypeChecker();
+        var typeIsAccessible = true;
+        var notAccessible = function () { typeIsAccessible = false; };
+        var res = checker.typeToTypeNode(type, enclosingScope, /*flags*/ undefined, {
+            trackSymbol: function (symbol, declaration, meaning) {
+                // TODO: GH#18217
+                typeIsAccessible = typeIsAccessible && checker.isSymbolAccessible(symbol, declaration, meaning, /*shouldComputeAliasToMarkVisible*/ false).accessibility === 0 /* Accessible */;
+            },
+            reportInaccessibleThisError: notAccessible,
+            reportPrivateInBaseOfClassExpression: notAccessible,
+            reportInaccessibleUniqueSymbolError: notAccessible,
+            moduleResolverHost: {
+                readFile: host.readFile,
+                fileExists: host.fileExists,
+                directoryExists: host.directoryExists,
+                getSourceFiles: program.getSourceFiles,
+                getCurrentDirectory: program.getCurrentDirectory,
+                getCommonSourceDirectory: program.getCommonSourceDirectory,
+            }
+        });
+        return typeIsAccessible ? res : undefined;
+    }
+    ts.getTypeNodeIfAccessible = getTypeNodeIfAccessible;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
     function createClassifier() {
-        var scanner = ts.createScanner(6 /* Latest */, /*skipTrivia*/ false);
+        var scanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false);
         function getClassificationsForLine(text, lexState, syntacticClassifierAbsent) {
             return convertClassificationsToResult(getEncodedLexicalClassifications(text, lexState, syntacticClassifierAbsent), text);
         }
@@ -95643,7 +97550,7 @@ var ts;
         var lastEnd = 0;
         for (var i = 0; i < dense.length; i += 3) {
             var start = dense[i];
-            var length_5 = dense[i + 1];
+            var length_1 = dense[i + 1];
             var type = dense[i + 2];
             // Make a whitespace entry between the last item and this one.
             if (lastEnd >= 0) {
@@ -95652,8 +97559,8 @@ var ts;
                     entries.push({ length: whitespaceLength_1, classification: ts.TokenClass.Whitespace });
                 }
             }
-            entries.push({ length: length_5, classification: convertClassification(type) });
-            lastEnd = start + length_5;
+            entries.push({ length: length_1, classification: convertClassification(type) });
+            lastEnd = start + length_1;
         }
         var whitespaceLength = text.length - lastEnd;
         if (whitespaceLength > 0) {
@@ -95958,8 +97865,8 @@ var ts;
         var spanStart = span.start;
         var spanLength = span.length;
         // Make a scanner we can get trivia from.
-        var triviaScanner = ts.createScanner(6 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
-        var mergeConflictScanner = ts.createScanner(6 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
+        var triviaScanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
+        var mergeConflictScanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
         var result = [];
         processElement(sourceFile);
         return { spans: result, endOfLineState: 0 /* None */ };
@@ -96051,18 +97958,18 @@ var ts;
                     pushClassification(tag.tagName.pos, tag.tagName.end - tag.tagName.pos, 18 /* docCommentTagName */); // e.g. "param"
                     pos = tag.tagName.end;
                     switch (tag.kind) {
-                        case 299 /* JSDocParameterTag */:
+                        case 304 /* JSDocParameterTag */:
                             processJSDocParameterTag(tag);
                             break;
-                        case 303 /* JSDocTemplateTag */:
+                        case 308 /* JSDocTemplateTag */:
                             processJSDocTemplateTag(tag);
                             pos = tag.end;
                             break;
-                        case 302 /* JSDocTypeTag */:
+                        case 307 /* JSDocTypeTag */:
                             processElement(tag.typeExpression);
                             pos = tag.end;
                             break;
-                        case 300 /* JSDocReturnTag */:
+                        case 305 /* JSDocReturnTag */:
                             processElement(tag.typeExpression);
                             pos = tag.end;
                             break;
@@ -96315,7 +98222,7 @@ var ts;
                         return convertPathCompletions(completion.paths);
                     case 1 /* Properties */: {
                         var entries = [];
-                        Completions.getCompletionEntriesFromSymbols(completion.symbols, entries, sourceFile, sourceFile, checker, 6 /* ESNext */, log, 4 /* String */, preferences); // Target will not be used, so arbitrary
+                        Completions.getCompletionEntriesFromSymbols(completion.symbols, entries, sourceFile, sourceFile, checker, 7 /* ESNext */, log, 4 /* String */, preferences); // Target will not be used, so arbitrary
                         return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: completion.hasIndexSignature, entries: entries };
                     }
                     case 2 /* Types */: {
@@ -96366,6 +98273,7 @@ var ts;
                     case ".jsx" /* Jsx */: return ".jsx" /* jsxModifier */;
                     case ".ts" /* Ts */: return ".ts" /* tsModifier */;
                     case ".tsx" /* Tsx */: return ".tsx" /* tsxModifier */;
+                    case ".tsbuildinfo" /* TsBuildInfo */: return ts.Debug.fail("Extension " + ".tsbuildinfo" /* TsBuildInfo */ + " is unsupported.");
                     case undefined: return "" /* none */;
                     default:
                         return ts.Debug.assertNever(extension);
@@ -96596,8 +98504,8 @@ var ts;
                      * both foo.ts and foo.tsx become foo
                      */
                     var foundFiles = ts.createMap(); // maps file to its extension
-                    for (var _i = 0, files_3 = files; _i < files_3.length; _i++) {
-                        var filePath = files_3[_i];
+                    for (var _i = 0, files_1 = files; _i < files_1.length; _i++) {
+                        var filePath = files_1[_i];
                         filePath = ts.normalizePath(filePath);
                         if (exclude && ts.comparePaths(filePath, exclude, scriptPath, ignoreCase) === 0 /* EqualTo */) {
                             continue;
@@ -96642,7 +98550,7 @@ var ts;
                         continue;
                     var patterns = paths[path];
                     if (patterns) {
-                        var _loop_11 = function (name, kind, extension) {
+                        var _loop_1 = function (name, kind, extension) {
                             // Path mappings may provide a duplicate way to get to something we've already added, so don't add again.
                             if (!result.some(function (entry) { return entry.name === name; })) {
                                 result.push(nameAndKind(name, kind, extension));
@@ -96650,7 +98558,7 @@ var ts;
                         };
                         for (var _i = 0, _a = getCompletionsForPathMapping(path, patterns, fragment, baseDirectory, fileExtensions, host); _i < _a.length; _i++) {
                             var _b = _a[_i], name = _b.name, kind = _b.kind, extension = _b.extension;
-                            _loop_11(name, kind, extension);
+                            _loop_1(name, kind, extension);
                         }
                     }
                 }
@@ -96685,7 +98593,7 @@ var ts;
                     // (But do if we didn't find anything, e.g. 'package.json' missing.)
                     var foundGlobal = false;
                     if (fragmentDirectory === undefined) {
-                        var _loop_12 = function (moduleName) {
+                        var _loop_2 = function (moduleName) {
                             if (!result.some(function (entry) { return entry.name === moduleName; })) {
                                 foundGlobal = true;
                                 result.push(nameAndKind(moduleName, "external module name" /* externalModuleName */, /*extension*/ undefined));
@@ -96693,7 +98601,7 @@ var ts;
                         };
                         for (var _b = 0, _c = enumerateNodeModulesVisibleToScript(host, scriptPath); _b < _c.length; _b++) {
                             var moduleName = _c[_b];
-                            _loop_12(moduleName);
+                            _loop_2(moduleName);
                         }
                     }
                     if (!foundGlobal) {
@@ -96807,8 +98715,8 @@ var ts;
                 // Check for typings specified in compiler options
                 var seen = ts.createMap();
                 var typeRoots = tryAndIgnoreErrors(function () { return ts.getEffectiveTypeRoots(options, host); }) || ts.emptyArray;
-                for (var _i = 0, typeRoots_2 = typeRoots; _i < typeRoots_2.length; _i++) {
-                    var root = typeRoots_2[_i];
+                for (var _i = 0, typeRoots_1 = typeRoots; _i < typeRoots_1.length; _i++) {
+                    var root = typeRoots_1[_i];
                     getCompletionEntriesFromDirectories(root);
                 }
                 // Also get all @types typings installed in visible node_modules directories
@@ -96893,7 +98801,7 @@ var ts;
                 var offset = index !== -1 ? index + 1 : 0;
                 // If the range is an identifier, span is unnecessary.
                 var length = text.length - offset;
-                return length === 0 || ts.isIdentifierText(text.substr(offset, length), 6 /* ESNext */) ? undefined : ts.createTextSpan(textStart + offset, length);
+                return length === 0 || ts.isIdentifierText(text.substr(offset, length), 7 /* ESNext */) ? undefined : ts.createTextSpan(textStart + offset, length);
             }
             // Returns true if the path is explicitly relative to the script (i.e. relative to . or ..)
             function isPathRelativeToScript(path) {
@@ -96978,6 +98886,7 @@ var ts;
             KeywordCompletionFilters[KeywordCompletionFilters["ConstructorParameterKeywords"] = 4] = "ConstructorParameterKeywords";
             KeywordCompletionFilters[KeywordCompletionFilters["FunctionLikeBodyKeywords"] = 5] = "FunctionLikeBodyKeywords";
             KeywordCompletionFilters[KeywordCompletionFilters["TypeKeywords"] = 6] = "TypeKeywords";
+            KeywordCompletionFilters[KeywordCompletionFilters["Last"] = 6] = "Last";
         })(KeywordCompletionFilters || (KeywordCompletionFilters = {}));
         var GlobalsSearch;
         (function (GlobalsSearch) {
@@ -97023,7 +98932,7 @@ var ts;
             return { isGlobalCompletion: false, isMemberCompletion: false, isNewIdentifierLocation: false, entries: entries };
         }
         function completionInfoFromData(sourceFile, typeChecker, compilerOptions, log, completionData, preferences) {
-            var symbols = completionData.symbols, completionKind = completionData.completionKind, isInSnippetScope = completionData.isInSnippetScope, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, propertyAccessToConvert = completionData.propertyAccessToConvert, keywordFilters = completionData.keywordFilters, literals = completionData.literals, symbolToOriginInfoMap = completionData.symbolToOriginInfoMap, recommendedCompletion = completionData.recommendedCompletion, isJsxInitializer = completionData.isJsxInitializer;
+            var symbols = completionData.symbols, completionKind = completionData.completionKind, isInSnippetScope = completionData.isInSnippetScope, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, propertyAccessToConvert = completionData.propertyAccessToConvert, keywordFilters = completionData.keywordFilters, literals = completionData.literals, symbolToOriginInfoMap = completionData.symbolToOriginInfoMap, recommendedCompletion = completionData.recommendedCompletion, isJsxInitializer = completionData.isJsxInitializer, insideJsDocTagTypeExpression = completionData.insideJsDocTagTypeExpression;
             if (location && location.parent && ts.isJsxClosingElement(location.parent)) {
                 // In the TypeScript JSX element, if such element is not defined. When users query for completion at closing tag,
                 // instead of simply giving unknown value, the completion will return the tag-name of an associated opening-element.
@@ -97054,7 +98963,7 @@ var ts;
             }
             if (keywordFilters !== 0 /* None */) {
                 var entryNames = ts.arrayToSet(entries, function (e) { return e.name; });
-                for (var _i = 0, _a = getKeywordCompletions(keywordFilters); _i < _a.length; _i++) {
+                for (var _i = 0, _a = getKeywordCompletions(keywordFilters, !insideJsDocTagTypeExpression && ts.isSourceFileJS(sourceFile)); _i < _a.length; _i++) {
                     var keywordEntry = _a[_i];
                     if (!entryNames.has(keywordEntry.name)) {
                         entries.push(keywordEntry);
@@ -97170,8 +99079,8 @@ var ts;
             // Based on the order we add things we will always see locals first, then globals, then module exports.
             // So adding a completion for a local will prevent us from adding completions for external module exports sharing the same name.
             var uniques = ts.createMap();
-            for (var _i = 0, symbols_3 = symbols; _i < symbols_3.length; _i++) {
-                var symbol = symbols_3[_i];
+            for (var _i = 0, symbols_1 = symbols; _i < symbols_1.length; _i++) {
+                var symbol = symbols_1[_i];
                 var origin = symbolToOriginInfoMap ? symbolToOriginInfoMap[ts.getSymbolId(symbol)] : undefined;
                 var entry = createCompletionEntry(symbol, location, sourceFile, typeChecker, target, kind, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences);
                 if (!entry) {
@@ -97390,7 +99299,7 @@ var ts;
             return symbol.parent && (isModuleSymbol(symbol.parent) ? symbol : getFirstSymbolInChain(symbol.parent, enclosingDeclaration, checker));
         }
         function isModuleSymbol(symbol) {
-            return symbol.declarations.some(function (d) { return d.kind === 279 /* SourceFile */; });
+            return symbol.declarations.some(function (d) { return d.kind === 284 /* SourceFile */; });
         }
         function getCompletionData(program, log, sourceFile, isUncheckedFile, position, preferences, detailsEntryId) {
             var typeChecker = program.getTypeChecker();
@@ -97441,11 +99350,11 @@ var ts;
                     if (tag.tagName.pos <= position && position <= tag.tagName.end) {
                         return { kind: 1 /* JsDocTagName */ };
                     }
-                    if (isTagWithTypeExpression(tag) && tag.typeExpression && tag.typeExpression.kind === 283 /* JSDocTypeExpression */) {
+                    if (isTagWithTypeExpression(tag) && tag.typeExpression && tag.typeExpression.kind === 288 /* JSDocTypeExpression */) {
                         currentToken = ts.getTokenAtPosition(sourceFile, position);
                         if (!currentToken ||
                             (!ts.isDeclarationName(currentToken) &&
-                                (currentToken.parent.kind !== 305 /* JSDocPropertyTag */ ||
+                                (currentToken.parent.kind !== 310 /* JSDocPropertyTag */ ||
                                     currentToken.parent.name !== currentToken))) {
                             // Use as type location if inside tag's type expression
                             insideJsDocTagTypeExpression = isCurrentlyEditingNode(tag.typeExpression);
@@ -97471,9 +99380,9 @@ var ts;
             // Check if the caret is at the end of an identifier; this is a partial identifier that we want to complete: e.g. a.toS|
             // Skip this partial identifier and adjust the contextToken to the token that precedes it.
             if (contextToken && position <= contextToken.end && (ts.isIdentifier(contextToken) || ts.isKeyword(contextToken.kind))) {
-                var start_3 = ts.timestamp();
+                var start_1 = ts.timestamp();
                 contextToken = ts.findPrecedingToken(contextToken.getFullStart(), sourceFile, /*startNode*/ undefined); // TODO: GH#18217
-                log("getCompletionData: Get previous token 2: " + (ts.timestamp() - start_3));
+                log("getCompletionData: Get previous token 2: " + (ts.timestamp() - start_1));
             }
             // Find the node where completion is requested on.
             // Also determine whether we are trying to complete with members of that node
@@ -97498,6 +99407,14 @@ var ts;
                         case 189 /* PropertyAccessExpression */:
                             propertyAccessToConvert = parent;
                             node = propertyAccessToConvert.expression;
+                            if (node.end === contextToken.pos &&
+                                ts.isCallExpression(node) &&
+                                node.getChildCount(sourceFile) &&
+                                ts.last(node.getChildren(sourceFile)).kind !== 21 /* CloseParenToken */) {
+                                // This is likely dot from incorrectly parsed call expression and user is starting to write spread
+                                // eg: Math.min(./**/)
+                                return undefined;
+                            }
                             break;
                         case 148 /* QualifiedName */:
                             node = parent.left;
@@ -97613,14 +99530,29 @@ var ts;
             var contextualType = previousToken && getContextualType(previousToken, position, sourceFile, typeChecker);
             var literals = ts.mapDefined(contextualType && (contextualType.isUnion() ? contextualType.types : [contextualType]), function (t) { return t.isLiteral() ? t.value : undefined; });
             var recommendedCompletion = previousToken && contextualType && getRecommendedCompletion(previousToken, contextualType, typeChecker);
-            return { kind: 0 /* Data */, symbols: symbols, completionKind: completionKind, isInSnippetScope: isInSnippetScope, propertyAccessToConvert: propertyAccessToConvert, isNewIdentifierLocation: isNewIdentifierLocation, location: location, keywordFilters: keywordFilters, literals: literals, symbolToOriginInfoMap: symbolToOriginInfoMap, recommendedCompletion: recommendedCompletion, previousToken: previousToken, isJsxInitializer: isJsxInitializer };
+            return {
+                kind: 0 /* Data */,
+                symbols: symbols,
+                completionKind: completionKind,
+                isInSnippetScope: isInSnippetScope,
+                propertyAccessToConvert: propertyAccessToConvert,
+                isNewIdentifierLocation: isNewIdentifierLocation,
+                location: location,
+                keywordFilters: keywordFilters,
+                literals: literals,
+                symbolToOriginInfoMap: symbolToOriginInfoMap,
+                recommendedCompletion: recommendedCompletion,
+                previousToken: previousToken,
+                isJsxInitializer: isJsxInitializer,
+                insideJsDocTagTypeExpression: insideJsDocTagTypeExpression
+            };
             function isTagWithTypeExpression(tag) {
                 switch (tag.kind) {
-                    case 299 /* JSDocParameterTag */:
-                    case 305 /* JSDocPropertyTag */:
-                    case 300 /* JSDocReturnTag */:
-                    case 302 /* JSDocTypeTag */:
-                    case 304 /* JSDocTypedefTag */:
+                    case 304 /* JSDocParameterTag */:
+                    case 310 /* JSDocPropertyTag */:
+                    case 305 /* JSDocReturnTag */:
+                    case 307 /* JSDocTypeTag */:
+                    case 309 /* JSDocTypedefTag */:
                         return true;
                     default:
                         return false;
@@ -97660,7 +99592,9 @@ var ts;
                                 }
                             }
                             // If the module is merged with a value, we must get the type of the class and add its propertes (for inherited static methods).
-                            if (!isTypeLocation && symbol.declarations.some(function (d) { return d.kind !== 279 /* SourceFile */ && d.kind !== 244 /* ModuleDeclaration */ && d.kind !== 243 /* EnumDeclaration */; })) {
+                            if (!isTypeLocation &&
+                                symbol.declarations &&
+                                symbol.declarations.some(function (d) { return d.kind !== 284 /* SourceFile */ && d.kind !== 244 /* ModuleDeclaration */ && d.kind !== 243 /* EnumDeclaration */; })) {
                                 addTypeProperties(typeChecker.getTypeOfSymbolAtLocation(symbol, node));
                             }
                             return;
@@ -97793,8 +99727,8 @@ var ts;
                 var symbolMeanings = (isTypeOnly ? 0 /* None */ : 67220415 /* Value */) | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */;
                 symbols = ts.Debug.assertEachDefined(typeChecker.getSymbolsInScope(scopeNode, symbolMeanings), "getSymbolsInScope() should all be defined");
                 // Need to insert 'this.' before properties of `this` type, so only do that if `includeInsertTextCompletions`
-                if (preferences.includeCompletionsWithInsertText && scopeNode.kind !== 279 /* SourceFile */) {
-                    var thisType = typeChecker.tryGetThisTypeAt(scopeNode);
+                if (preferences.includeCompletionsWithInsertText && scopeNode.kind !== 284 /* SourceFile */) {
+                    var thisType = typeChecker.tryGetThisTypeAt(scopeNode, /*includeGlobalThis*/ false);
                     if (thisType) {
                         for (var _i = 0, _a = getPropertiesForCompletion(thisType, typeChecker); _i < _a.length; _i++) {
                             var symbol = _a[_i];
@@ -97826,7 +99760,7 @@ var ts;
             }
             function isSnippetScope(scopeNode) {
                 switch (scopeNode.kind) {
-                    case 279 /* SourceFile */:
+                    case 284 /* SourceFile */:
                     case 206 /* TemplateExpression */:
                     case 270 /* JsxExpression */:
                     case 218 /* Block */:
@@ -97885,6 +99819,8 @@ var ts;
                             return parentKind === 242 /* TypeAliasDeclaration */;
                         case 119 /* AsKeyword */:
                             return parentKind === 212 /* AsExpression */;
+                        case 86 /* ExtendsKeyword */:
+                            return parentKind === 150 /* TypeParameter */;
                     }
                 }
                 return false;
@@ -98581,7 +100517,15 @@ var ts;
             }
             return res;
         });
-        function getKeywordCompletions(keywordFilter) {
+        function getKeywordCompletions(keywordFilter, filterOutTsOnlyKeywords) {
+            if (!filterOutTsOnlyKeywords)
+                return getTypescriptKeywordCompletions(keywordFilter);
+            var index = keywordFilter + 6 /* Last */ + 1;
+            return _keywordCompletions[index] ||
+                (_keywordCompletions[index] = getTypescriptKeywordCompletions(keywordFilter)
+                    .filter(function (entry) { return !isTypeScriptOnlyKeyword(ts.stringToToken(entry.name)); }));
+        }
+        function getTypescriptKeywordCompletions(keywordFilter) {
             return _keywordCompletions[keywordFilter] || (_keywordCompletions[keywordFilter] = allKeywordsCompletions().filter(function (entry) {
                 var kind = ts.stringToToken(entry.name);
                 switch (keywordFilter) {
@@ -98605,6 +100549,39 @@ var ts;
                 }
             }));
         }
+        function isTypeScriptOnlyKeyword(kind) {
+            switch (kind) {
+                case 118 /* AbstractKeyword */:
+                case 120 /* AnyKeyword */:
+                case 146 /* BigIntKeyword */:
+                case 123 /* BooleanKeyword */:
+                case 125 /* DeclareKeyword */:
+                case 84 /* EnumKeyword */:
+                case 145 /* GlobalKeyword */:
+                case 109 /* ImplementsKeyword */:
+                case 127 /* InferKeyword */:
+                case 110 /* InterfaceKeyword */:
+                case 128 /* IsKeyword */:
+                case 129 /* KeyOfKeyword */:
+                case 130 /* ModuleKeyword */:
+                case 131 /* NamespaceKeyword */:
+                case 132 /* NeverKeyword */:
+                case 135 /* NumberKeyword */:
+                case 136 /* ObjectKeyword */:
+                case 113 /* PrivateKeyword */:
+                case 114 /* ProtectedKeyword */:
+                case 115 /* PublicKeyword */:
+                case 133 /* ReadonlyKeyword */:
+                case 138 /* StringKeyword */:
+                case 139 /* SymbolKeyword */:
+                case 140 /* TypeKeyword */:
+                case 142 /* UniqueKeyword */:
+                case 143 /* UnknownKeyword */:
+                    return true;
+                default:
+                    return false;
+            }
+        }
         function isInterfaceOrTypeLiteralCompletionKeyword(kind) {
             return kind === 133 /* ReadonlyKeyword */;
         }
@@ -98658,7 +100635,7 @@ var ts;
         function tryGetObjectTypeDeclarationCompletionContainer(sourceFile, contextToken, location) {
             // class c { method() { } | method2() { } }
             switch (location.kind) {
-                case 306 /* SyntaxList */:
+                case 311 /* SyntaxList */:
                     return ts.tryCast(location.parent, ts.isObjectTypeDeclaration);
                 case 1 /* EndOfFileToken */:
                     var cls = ts.tryCast(ts.lastOrUndefined(ts.cast(location.parent, ts.isSourceFile).statements), ts.isObjectTypeDeclaration);
@@ -98843,7 +100820,7 @@ var ts;
             var child = throwStatement;
             while (child.parent) {
                 var parent = child.parent;
-                if (ts.isFunctionBlock(parent) || parent.kind === 279 /* SourceFile */) {
+                if (ts.isFunctionBlock(parent) || parent.kind === 284 /* SourceFile */) {
                     return parent;
                 }
                 // A throw-statement is only owned by a try-statement if the try-statement has
@@ -98901,7 +100878,7 @@ var ts;
             var container = declaration.parent;
             switch (container.kind) {
                 case 245 /* ModuleBlock */:
-                case 279 /* SourceFile */:
+                case 284 /* SourceFile */:
                 case 218 /* Block */:
                 case 271 /* CaseClause */:
                 case 272 /* DefaultClause */:
@@ -99399,7 +101376,7 @@ var ts;
                 }
                 else if (!isAvailableThroughGlobal) {
                     var sourceFileLike = getSourceFileLikeForImportDeclaration(importDeclaration);
-                    ts.Debug.assert(sourceFileLike.kind === 279 /* SourceFile */ || sourceFileLike.kind === 244 /* ModuleDeclaration */);
+                    ts.Debug.assert(sourceFileLike.kind === 284 /* SourceFile */ || sourceFileLike.kind === 244 /* ModuleDeclaration */);
                     if (isReExport || findNamespaceReExports(sourceFileLike, name, checker)) {
                         addIndirectUsers(sourceFileLike);
                     }
@@ -99508,7 +101485,7 @@ var ts;
                 }
             }
             /**
-             * `import x = require("./x") or `import * as x from "./x"`.
+             * `import x = require("./x")` or `import * as x from "./x"`.
              * An `export =` may be imported by this syntax, so it may be a direct import.
              * If it's not a direct import, it will be in `indirectUsers`, so we don't have to do anything here.
              */
@@ -99565,10 +101542,10 @@ var ts;
         function findModuleReferences(program, sourceFiles, searchModuleSymbol) {
             var refs = [];
             var checker = program.getTypeChecker();
-            for (var _i = 0, sourceFiles_3 = sourceFiles; _i < sourceFiles_3.length; _i++) {
-                var referencingFile = sourceFiles_3[_i];
+            for (var _i = 0, sourceFiles_1 = sourceFiles; _i < sourceFiles_1.length; _i++) {
+                var referencingFile = sourceFiles_1[_i];
                 var searchSourceFile = searchModuleSymbol.valueDeclaration;
-                if (searchSourceFile.kind === 279 /* SourceFile */) {
+                if (searchSourceFile.kind === 284 /* SourceFile */) {
                     for (var _a = 0, _b = referencingFile.referencedFiles; _a < _b.length; _a++) {
                         var ref = _b[_a];
                         if (program.getSourceFileFromReference(referencingFile, ref) === searchSourceFile) {
@@ -99596,8 +101573,8 @@ var ts;
         /** Returns a map from a module symbol Id to all import statements that directly reference the module. */
         function getDirectImportsMap(sourceFiles, checker, cancellationToken) {
             var map = ts.createMap();
-            for (var _i = 0, sourceFiles_4 = sourceFiles; _i < sourceFiles_4.length; _i++) {
-                var sourceFile = sourceFiles_4[_i];
+            for (var _i = 0, sourceFiles_2 = sourceFiles; _i < sourceFiles_2.length; _i++) {
+                var sourceFile = sourceFiles_2[_i];
                 if (cancellationToken)
                     cancellationToken.throwIfCancellationRequested();
                 forEachImport(sourceFile, function (importDecl, moduleSpecifier) {
@@ -99616,7 +101593,7 @@ var ts;
         }
         /** Iterates over all statements at the top level or in module declarations. Returns the first truthy result. */
         function forEachPossibleImportOrExportStatement(sourceFileLike, action) {
-            return ts.forEach(sourceFileLike.kind === 279 /* SourceFile */ ? sourceFileLike.statements : sourceFileLike.body.statements, function (statement) {
+            return ts.forEach(sourceFileLike.kind === 284 /* SourceFile */ ? sourceFileLike.statements : sourceFileLike.body.statements, function (statement) {
                 return action(statement) || (isAmbientModuleDeclaration(statement) && ts.forEach(statement.body && statement.body.statements, action));
             });
         }
@@ -99840,7 +101817,7 @@ var ts;
                 return node.getSourceFile();
             }
             var parent = node.parent;
-            if (parent.kind === 279 /* SourceFile */) {
+            if (parent.kind === 284 /* SourceFile */) {
                 return parent;
             }
             ts.Debug.assert(parent.kind === 245 /* ModuleBlock */);
@@ -99902,16 +101879,16 @@ var ts;
         }
         FindAllReferences.getImplementationsAtPosition = getImplementationsAtPosition;
         function getImplementationReferenceEntries(program, cancellationToken, sourceFiles, node, position) {
-            if (node.kind === 279 /* SourceFile */) {
+            if (node.kind === 284 /* SourceFile */) {
                 return undefined;
             }
             var checker = program.getTypeChecker();
             // If invoked directly on a shorthand property assignment, then return
             // the declaration of the symbol being assigned (not the symbol being assigned to).
             if (node.parent.kind === 276 /* ShorthandPropertyAssignment */) {
-                var result_8 = [];
-                FindAllReferences.Core.getReferenceEntriesForShorthandPropertyAssignment(node, checker, function (node) { return result_8.push(nodeEntry(node)); });
-                return result_8;
+                var result_1 = [];
+                FindAllReferences.Core.getReferenceEntriesForShorthandPropertyAssignment(node, checker, function (node) { return result_1.push(nodeEntry(node)); });
+                return result_1;
             }
             else if (node.kind === 98 /* SuperKeyword */ || ts.isSuperProperty(node.parent)) {
                 // References to and accesses on the super keyword only have one possible implementation, so no
@@ -99943,27 +101920,27 @@ var ts;
                     case 0 /* Symbol */: {
                         var symbol = def.symbol;
                         var _a = getDefinitionKindAndDisplayParts(symbol, checker, originalNode), displayParts_1 = _a.displayParts, kind_1 = _a.kind;
-                        var name_4 = displayParts_1.map(function (p) { return p.text; }).join("");
-                        return { node: symbol.declarations ? ts.getNameOfDeclaration(ts.first(symbol.declarations)) || ts.first(symbol.declarations) : originalNode, name: name_4, kind: kind_1, displayParts: displayParts_1 };
+                        var name_1 = displayParts_1.map(function (p) { return p.text; }).join("");
+                        return { node: symbol.declarations ? ts.getNameOfDeclaration(ts.first(symbol.declarations)) || ts.first(symbol.declarations) : originalNode, name: name_1, kind: kind_1, displayParts: displayParts_1 };
                     }
                     case 1 /* Label */: {
-                        var node_3 = def.node;
-                        return { node: node_3, name: node_3.text, kind: "label" /* label */, displayParts: [ts.displayPart(node_3.text, ts.SymbolDisplayPartKind.text)] };
+                        var node_1 = def.node;
+                        return { node: node_1, name: node_1.text, kind: "label" /* label */, displayParts: [ts.displayPart(node_1.text, ts.SymbolDisplayPartKind.text)] };
                     }
                     case 2 /* Keyword */: {
-                        var node_4 = def.node;
-                        var name_5 = ts.tokenToString(node_4.kind);
-                        return { node: node_4, name: name_5, kind: "keyword" /* keyword */, displayParts: [{ text: name_5, kind: "keyword" /* keyword */ }] };
+                        var node_2 = def.node;
+                        var name_2 = ts.tokenToString(node_2.kind);
+                        return { node: node_2, name: name_2, kind: "keyword" /* keyword */, displayParts: [{ text: name_2, kind: "keyword" /* keyword */ }] };
                     }
                     case 3 /* This */: {
-                        var node_5 = def.node;
-                        var symbol = checker.getSymbolAtLocation(node_5);
-                        var displayParts_2 = symbol && ts.SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(checker, symbol, node_5.getSourceFile(), ts.getContainerNode(node_5), node_5).displayParts || [ts.textPart("this")];
-                        return { node: node_5, name: "this", kind: "var" /* variableElement */, displayParts: displayParts_2 };
+                        var node_3 = def.node;
+                        var symbol = checker.getSymbolAtLocation(node_3);
+                        var displayParts_2 = symbol && ts.SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(checker, symbol, node_3.getSourceFile(), ts.getContainerNode(node_3), node_3).displayParts || [ts.textPart("this")];
+                        return { node: node_3, name: "this", kind: "var" /* variableElement */, displayParts: displayParts_2 };
                     }
                     case 4 /* String */: {
-                        var node_6 = def.node;
-                        return { node: node_6, name: node_6.text, kind: "var" /* variableElement */, displayParts: [ts.displayPart(ts.getTextOfNode(node_6), ts.SymbolDisplayPartKind.stringLiteral)] };
+                        var node_4 = def.node;
+                        return { node: node_4, name: node_4.text, kind: "var" /* variableElement */, displayParts: [ts.displayPart(ts.getTextOfNode(node_4), ts.SymbolDisplayPartKind.stringLiteral)] };
                     }
                     default:
                         return ts.Debug.assertNever(def);
@@ -100122,8 +102099,8 @@ var ts;
                 case 248 /* ImportEqualsDeclaration */:
                 case 253 /* ImportSpecifier */:
                 case 241 /* InterfaceDeclaration */:
-                case 297 /* JSDocCallbackTag */:
-                case 304 /* JSDocTypedefTag */:
+                case 302 /* JSDocCallbackTag */:
+                case 309 /* JSDocTypedefTag */:
                 case 267 /* JsxAttribute */:
                 case 244 /* ModuleDeclaration */:
                 case 247 /* NamespaceExportDeclaration */:
@@ -100148,8 +102125,8 @@ var ts;
                     return !!decl.initializer || ts.isCatchClause(decl.parent);
                 case 155 /* MethodSignature */:
                 case 153 /* PropertySignature */:
-                case 305 /* JSDocPropertyTag */:
-                case 299 /* JSDocParameterTag */:
+                case 310 /* JSDocPropertyTag */:
+                case 304 /* JSDocParameterTag */:
                     return false;
                 default:
                     return ts.Debug.failBadSyntaxKind(decl);
@@ -100241,7 +102218,7 @@ var ts;
                         result = references;
                         continue;
                     }
-                    var _loop_13 = function (entry) {
+                    var _loop_3 = function (entry) {
                         if (!entry.definition || entry.definition.type !== 0 /* Symbol */) {
                             result.push(entry);
                             return "continue";
@@ -100273,7 +102250,7 @@ var ts;
                     };
                     for (var _b = 0, references_1 = references; _b < references_1.length; _b++) {
                         var entry = references_1[_b];
-                        _loop_13(entry);
+                        _loop_3(entry);
                     }
                 }
                 return result;
@@ -100309,7 +102286,7 @@ var ts;
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var decl = _a[_i];
                     switch (decl.kind) {
-                        case 279 /* SourceFile */:
+                        case 284 /* SourceFile */:
                             // Don't include the source file itself. (This may not be ideal behavior, but awkward to include an entire file as a reference.)
                             break;
                         case 244 /* ModuleDeclaration */:
@@ -100382,23 +102359,26 @@ var ts;
                 }
                 else {
                     var search = state.createSearch(node, symbol, /*comingFrom*/ undefined, { allSearchSymbols: node ? populateSearchSymbolSet(symbol, node, checker, !!options.isForRename, !!options.providePrefixAndSuffixTextForRename, !!options.implementations) : [symbol] });
-                    // Try to get the smallest valid scope that we can limit our search to;
-                    // otherwise we'll need to search globally (i.e. include each file).
-                    var scope = getSymbolScope(symbol);
-                    if (scope) {
-                        getReferencesInContainer(scope, scope.getSourceFile(), search, state, /*addReferencesHere*/ !(ts.isSourceFile(scope) && !ts.contains(sourceFiles, scope)));
-                    }
-                    else {
-                        // Global search
-                        for (var _i = 0, _a = state.sourceFiles; _i < _a.length; _i++) {
-                            var sourceFile = _a[_i];
-                            state.cancellationToken.throwIfCancellationRequested();
-                            searchForName(sourceFile, search, state);
-                        }
-                    }
+                    getReferencesInContainerOrFiles(symbol, state, search);
                 }
                 return result;
             }
+            function getReferencesInContainerOrFiles(symbol, state, search) {
+                // Try to get the smallest valid scope that we can limit our search to;
+                // otherwise we'll need to search globally (i.e. include each file).
+                var scope = getSymbolScope(symbol);
+                if (scope) {
+                    getReferencesInContainer(scope, scope.getSourceFile(), search, state, /*addReferencesHere*/ !(ts.isSourceFile(scope) && !ts.contains(state.sourceFiles, scope)));
+                }
+                else {
+                    // Global search
+                    for (var _i = 0, _a = state.sourceFiles; _i < _a.length; _i++) {
+                        var sourceFile = _a[_i];
+                        state.cancellationToken.throwIfCancellationRequested();
+                        searchForName(sourceFile, search, state);
+                    }
+                }
+            }
             function getSpecialSearchKind(node) {
                 switch (node.kind) {
                     case 124 /* ConstructorKeyword */:
@@ -100450,9 +102430,7 @@ var ts;
              * Unlike `Search`, there is only one `State`.
              */
             var State = /** @class */ (function () {
-                function State(sourceFiles, sourceFilesSet, 
-                /** True if we're searching for constructor references. */
-                specialSearchKind, checker, cancellationToken, searchMeaning, options, result) {
+                function State(sourceFiles, sourceFilesSet, specialSearchKind, checker, cancellationToken, searchMeaning, options, result) {
                     this.sourceFiles = sourceFiles;
                     this.sourceFilesSet = sourceFilesSet;
                     this.specialSearchKind = specialSearchKind;
@@ -100533,8 +102511,8 @@ var ts;
                     var sourceId = ts.getNodeId(sourceFile);
                     var seenSymbols = this.sourceFileToSeenSymbols[sourceId] || (this.sourceFileToSeenSymbols[sourceId] = ts.createMap());
                     var anyNewSymbols = false;
-                    for (var _i = 0, symbols_4 = symbols; _i < symbols_4.length; _i++) {
-                        var sym = symbols_4[_i];
+                    for (var _i = 0, symbols_2 = symbols; _i < symbols_2.length; _i++) {
+                        var sym = symbols_2[_i];
                         anyNewSymbols = ts.addToSeen(seenSymbols, ts.getSymbolId(sym)) || anyNewSymbols;
                     }
                     return anyNewSymbols;
@@ -100673,14 +102651,14 @@ var ts;
                     return undefined;
                 }
                 var scope;
-                for (var _i = 0, declarations_11 = declarations; _i < declarations_11.length; _i++) {
-                    var declaration = declarations_11[_i];
+                for (var _i = 0, declarations_1 = declarations; _i < declarations_1.length; _i++) {
+                    var declaration = declarations_1[_i];
                     var container = ts.getContainerNode(declaration);
                     if (scope && scope !== container) {
                         // Different declarations have different containers, bail out
                         return undefined;
                     }
-                    if (!container || container.kind === 279 /* SourceFile */ && !ts.isExternalOrCommonJsModule(container)) {
+                    if (!container || container.kind === 284 /* SourceFile */ && !ts.isExternalOrCommonJsModule(container)) {
                         // This is a global variable and not an external module, any declaration defined
                         // within this scope is visible outside the file
                         return undefined;
@@ -100725,8 +102703,8 @@ var ts;
                 if (!signature.name || !ts.isIdentifier(signature.name))
                     return;
                 var symbol = ts.Debug.assertDefined(checker.getSymbolAtLocation(signature.name));
-                for (var _i = 0, sourceFiles_5 = sourceFiles; _i < sourceFiles_5.length; _i++) {
-                    var sourceFile = sourceFiles_5[_i];
+                for (var _i = 0, sourceFiles_3 = sourceFiles; _i < sourceFiles_3.length; _i++) {
+                    var sourceFile = sourceFiles_3[_i];
                     for (var _a = 0, _b = getPossibleSymbolReferenceNodes(sourceFile, symbol.name); _a < _b.length; _a++) {
                         var name = _b[_a];
                         if (!ts.isIdentifier(name) || name === signature.name || name.escapedText !== signature.name.escapedText)
@@ -100767,8 +102745,8 @@ var ts;
                     // We found a match.  Make sure it's not part of a larger word (i.e. the char
                     // before and after it have to be a non-identifier char).
                     var endPosition = position + symbolNameLength;
-                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 6 /* Latest */)) &&
-                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 6 /* Latest */))) {
+                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 7 /* Latest */)) &&
+                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 7 /* Latest */))) {
                         // Found a real match.  Keep searching.
                         positions.push(position);
                     }
@@ -100917,7 +102895,9 @@ var ts;
                 }
                 // For `export { foo as bar }`, rename `foo`, but not `bar`.
                 if (!isForRenameWithPrefixAndSuffixText(state.options) || alwaysGetReferences) {
-                    var exportKind = referenceLocation.originalKeywordKind === 80 /* DefaultKeyword */ ? 1 /* Default */ : 0 /* Named */;
+                    var isDefaultExport = referenceLocation.originalKeywordKind === 80 /* DefaultKeyword */
+                        || exportSpecifier.name.originalKeywordKind === 80 /* DefaultKeyword */;
+                    var exportKind = isDefaultExport ? 1 /* Default */ : 0 /* Named */;
                     var exportSymbol = ts.Debug.assertDefined(exportSpecifier.symbol);
                     var exportInfo = ts.Debug.assertDefined(FindAllReferences.getExportInfo(exportSymbol, exportKind, state.checker));
                     searchForImportsOfExport(referenceLocation, exportSymbol, exportInfo, state);
@@ -101004,6 +102984,7 @@ var ts;
                     var classExtending = tryGetClassByExtendingIdentifier(referenceLocation);
                     if (classExtending) {
                         findSuperConstructorAccesses(classExtending, pusher());
+                        findInheritedConstructorReferences(classExtending, state);
                     }
                 }
             }
@@ -101036,33 +103017,41 @@ var ts;
              * Reference the constructor and all calls to `new this()`.
              */
             function findOwnConstructorReferences(classSymbol, sourceFile, addNode) {
-                for (var _i = 0, _a = classSymbol.members.get("__constructor" /* Constructor */).declarations; _i < _a.length; _i++) {
-                    var decl = _a[_i];
-                    var ctrKeyword = ts.findChildOfKind(decl, 124 /* ConstructorKeyword */, sourceFile);
-                    ts.Debug.assert(decl.kind === 157 /* Constructor */ && !!ctrKeyword);
-                    addNode(ctrKeyword);
-                }
-                classSymbol.exports.forEach(function (member) {
-                    var decl = member.valueDeclaration;
-                    if (decl && decl.kind === 156 /* MethodDeclaration */) {
-                        var body = decl.body;
-                        if (body) {
-                            forEachDescendantOfKind(body, 100 /* ThisKeyword */, function (thisKeyword) {
-                                if (ts.isNewExpressionTarget(thisKeyword)) {
-                                    addNode(thisKeyword);
-                                }
-                            });
-                        }
+                var constructorSymbol = getClassConstructorSymbol(classSymbol);
+                if (constructorSymbol) {
+                    for (var _i = 0, _a = constructorSymbol.declarations; _i < _a.length; _i++) {
+                        var decl = _a[_i];
+                        var ctrKeyword = ts.findChildOfKind(decl, 124 /* ConstructorKeyword */, sourceFile);
+                        ts.Debug.assert(decl.kind === 157 /* Constructor */ && !!ctrKeyword);
+                        addNode(ctrKeyword);
                     }
-                });
+                }
+                if (classSymbol.exports) {
+                    classSymbol.exports.forEach(function (member) {
+                        var decl = member.valueDeclaration;
+                        if (decl && decl.kind === 156 /* MethodDeclaration */) {
+                            var body = decl.body;
+                            if (body) {
+                                forEachDescendantOfKind(body, 100 /* ThisKeyword */, function (thisKeyword) {
+                                    if (ts.isNewExpressionTarget(thisKeyword)) {
+                                        addNode(thisKeyword);
+                                    }
+                                });
+                            }
+                        }
+                    });
+                }
+            }
+            function getClassConstructorSymbol(classSymbol) {
+                return classSymbol.members && classSymbol.members.get("__constructor" /* Constructor */);
             }
             /** Find references to `super` in the constructor of an extending class.  */
-            function findSuperConstructorAccesses(cls, addNode) {
-                var ctr = cls.symbol.members.get("__constructor" /* Constructor */);
-                if (!ctr) {
+            function findSuperConstructorAccesses(classDeclaration, addNode) {
+                var constructor = getClassConstructorSymbol(classDeclaration.symbol);
+                if (!constructor) {
                     return;
                 }
-                for (var _i = 0, _a = ctr.declarations; _i < _a.length; _i++) {
+                for (var _i = 0, _a = constructor.declarations; _i < _a.length; _i++) {
                     var decl = _a[_i];
                     ts.Debug.assert(decl.kind === 157 /* Constructor */);
                     var body = decl.body;
@@ -101075,6 +103064,16 @@ var ts;
                     }
                 }
             }
+            function hasOwnConstructor(classDeclaration) {
+                return !!getClassConstructorSymbol(classDeclaration.symbol);
+            }
+            function findInheritedConstructorReferences(classDeclaration, state) {
+                if (hasOwnConstructor(classDeclaration))
+                    return;
+                var classSymbol = classDeclaration.symbol;
+                var search = state.createSearch(/*location*/ undefined, classSymbol, /*comingFrom*/ undefined);
+                getReferencesInContainerOrFiles(classSymbol, state, search);
+            }
             function addImplementationReferences(refNode, addReference, state) {
                 // Check if we found a function/propertyAssignment/method with an implementation or initializer
                 if (ts.isDeclarationName(refNode) && isImplementation(refNode.parent)) {
@@ -101239,7 +103238,7 @@ var ts;
                         staticFlag &= ts.getModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
-                    case 279 /* SourceFile */:
+                    case 284 /* SourceFile */:
                         if (ts.isExternalModule(searchSpaceNode) || isParameterName(thisOrSuperKeyword)) {
                             return undefined;
                         }
@@ -101252,7 +103251,7 @@ var ts;
                     default:
                         return undefined;
                 }
-                var references = ts.flatMap(searchSpaceNode.kind === 279 /* SourceFile */ ? sourceFiles : [searchSpaceNode.getSourceFile()], function (sourceFile) {
+                var references = ts.flatMap(searchSpaceNode.kind === 284 /* SourceFile */ ? sourceFiles : [searchSpaceNode.getSourceFile()], function (sourceFile) {
                     cancellationToken.throwIfCancellationRequested();
                     return getPossibleSymbolReferenceNodes(sourceFile, "this", ts.isSourceFile(searchSpaceNode) ? sourceFile : searchSpaceNode).filter(function (node) {
                         if (!ts.isThis(node)) {
@@ -101271,8 +103270,8 @@ var ts;
                                 // Make sure the container belongs to the same class
                                 // and has the appropriate static modifier from the original container.
                                 return container.parent && searchSpaceNode.symbol === container.parent.symbol && (ts.getModifierFlags(container) & 32 /* Static */) === staticFlag;
-                            case 279 /* SourceFile */:
-                                return container.kind === 279 /* SourceFile */ && !ts.isExternalModule(container) && !isParameterName(node);
+                            case 284 /* SourceFile */:
+                                return container.kind === 284 /* SourceFile */ && !ts.isExternalModule(container) && !isParameterName(node);
                         }
                     });
                 }).map(function (n) { return FindAllReferences.nodeEntry(n); });
@@ -101428,8 +103427,8 @@ var ts;
                         // To achieve that we will keep iterating until the result stabilizes.
                         // Remember the last meaning
                         lastIterationMeaning = meaning;
-                        for (var _i = 0, declarations_12 = declarations; _i < declarations_12.length; _i++) {
-                            var declaration = declarations_12[_i];
+                        for (var _i = 0, declarations_2 = declarations; _i < declarations_2.length; _i++) {
+                            var declaration = declarations_2[_i];
                             var declarationMeaning = ts.getMeaningFromDeclaration(declaration);
                             if (declarationMeaning & meaning) {
                                 meaning |= declarationMeaning;
@@ -101578,8 +103577,8 @@ var ts;
             // Type annotation needed due to #7294
             var elements = ts.isArrayLiteralExpression(property.initializer) ? property.initializer.elements : [property.initializer];
             var foundExactMatch = false;
-            for (var _i = 0, elements_5 = elements; _i < elements_5.length; _i++) {
-                var element = elements_5[_i];
+            for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
+                var element = elements_1[_i];
                 foundExactMatch = tryUpdateString(element) || foundExactMatch;
             }
             return foundExactMatch;
@@ -101601,7 +103600,7 @@ var ts;
     }
     function updateImports(program, changeTracker, oldToNew, newToOld, host, getCanonicalFileName) {
         var allFiles = program.getSourceFiles();
-        var _loop_14 = function (sourceFile) {
+        var _loop_4 = function (sourceFile) {
             var newFromOld = oldToNew(sourceFile.path);
             var newImportFromPath = newFromOld !== undefined ? newFromOld : sourceFile.path;
             var newImportFromDirectory = ts.getDirectoryPath(newImportFromPath);
@@ -101633,7 +103632,7 @@ var ts;
         };
         for (var _i = 0, allFiles_1 = allFiles; _i < allFiles_1.length; _i++) {
             var sourceFile = allFiles_1[_i];
-            _loop_14(sourceFile);
+            _loop_4(sourceFile);
         }
     }
     function combineNormal(pathA, pathB) {
@@ -101663,9 +103662,9 @@ var ts;
             return undefined;
         // First try resolved module
         if (resolved.resolvedModule) {
-            var result_9 = tryChange(resolved.resolvedModule.resolvedFileName);
-            if (result_9)
-                return result_9;
+            var result_2 = tryChange(resolved.resolvedModule.resolvedFileName);
+            if (result_2)
+                return result_2;
         }
         // Then failed lookups except package.json since we dont want to touch them (only included ts/js files)
         var result = ts.forEach(resolved.failedLookupLocations, tryChangeWithIgnoringPackageJson);
@@ -101775,10 +103774,10 @@ var ts;
             //      bar<Test>(({pr/*goto*/op1})=>{});
             if (ts.isPropertyName(node) && ts.isBindingElement(parent) && ts.isObjectBindingPattern(parent.parent) &&
                 (node === (parent.propertyName || parent.name))) {
-                var name_6 = ts.getNameFromPropertyName(node);
+                var name_3 = ts.getNameFromPropertyName(node);
                 var type = typeChecker.getTypeAtLocation(parent.parent);
-                return name_6 === undefined ? ts.emptyArray : ts.flatMap(type.isUnion() ? type.types : [type], function (t) {
-                    var prop = t.getProperty(name_6);
+                return name_3 === undefined ? ts.emptyArray : ts.flatMap(type.isUnion() ? type.types : [type], function (t) {
+                    var prop = t.getProperty(name_3);
                     return prop && getDefinitionFromSymbol(typeChecker, prop, node);
                 });
             }
@@ -102126,11 +104125,11 @@ var ts;
         JsDoc.getJsDocCommentsFromDeclarations = getJsDocCommentsFromDeclarations;
         function getCommentHavingNodes(declaration) {
             switch (declaration.kind) {
-                case 299 /* JSDocParameterTag */:
-                case 305 /* JSDocPropertyTag */:
+                case 304 /* JSDocParameterTag */:
+                case 310 /* JSDocPropertyTag */:
                     return [declaration];
-                case 297 /* JSDocCallbackTag */:
-                case 304 /* JSDocTypedefTag */:
+                case 302 /* JSDocCallbackTag */:
+                case 309 /* JSDocTypedefTag */:
                     return [declaration, declaration.parent];
                 default:
                     return ts.getJSDocCommentsAndTags(declaration);
@@ -102151,16 +104150,16 @@ var ts;
         function getCommentText(tag) {
             var comment = tag.comment;
             switch (tag.kind) {
-                case 295 /* JSDocAugmentsTag */:
+                case 300 /* JSDocAugmentsTag */:
                     return withNode(tag.class);
-                case 303 /* JSDocTemplateTag */:
+                case 308 /* JSDocTemplateTag */:
                     return withList(tag.typeParameters);
-                case 302 /* JSDocTypeTag */:
+                case 307 /* JSDocTypeTag */:
                     return withNode(tag.typeExpression);
-                case 304 /* JSDocTypedefTag */:
-                case 297 /* JSDocCallbackTag */:
-                case 305 /* JSDocPropertyTag */:
-                case 299 /* JSDocParameterTag */:
+                case 309 /* JSDocTypedefTag */:
+                case 302 /* JSDocCallbackTag */:
+                case 310 /* JSDocPropertyTag */:
+                case 304 /* JSDocParameterTag */:
                     var name = tag.name;
                     return name ? withNode(name) : comment;
                 default:
@@ -102371,7 +104370,7 @@ var ts;
                         : undefined;
                     return { commentOwner: commentOwner, parameters: parameters_1 };
                 }
-                case 279 /* SourceFile */:
+                case 284 /* SourceFile */:
                     return "quit";
                 case 244 /* ModuleDeclaration */:
                     // If in walking up the tree, we hit a a nested namespace declaration,
@@ -102423,7 +104422,7 @@ var ts;
             if (!patternMatcher)
                 return ts.emptyArray;
             var rawItems = [];
-            var _loop_15 = function (sourceFile) {
+            var _loop_5 = function (sourceFile) {
                 cancellationToken.throwIfCancellationRequested();
                 if (excludeDtsFiles && sourceFile.isDeclarationFile) {
                     return "continue";
@@ -102433,9 +104432,9 @@ var ts;
                 });
             };
             // Search the declarations in all files and output matched NavigateToItem into array of NavigateToItem[]
-            for (var _i = 0, sourceFiles_6 = sourceFiles; _i < sourceFiles_6.length; _i++) {
-                var sourceFile = sourceFiles_6[_i];
-                _loop_15(sourceFile);
+            for (var _i = 0, sourceFiles_4 = sourceFiles; _i < sourceFiles_4.length; _i++) {
+                var sourceFile = sourceFiles_4[_i];
+                _loop_5(sourceFile);
             }
             rawItems.sort(compareNavigateToItems);
             return (maxResultCount === undefined ? rawItems : rawItems.slice(0, maxResultCount)).map(createNavigateToItem);
@@ -102448,8 +104447,8 @@ var ts;
             if (!match) {
                 return; // continue to next named declarations
             }
-            for (var _i = 0, declarations_13 = declarations; _i < declarations_13.length; _i++) {
-                var declaration = declarations_13[_i];
+            for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
+                var declaration = declarations_3[_i];
                 if (!shouldKeepItem(declaration, checker))
                     continue;
                 if (patternMatcher.patternContainsDots) {
@@ -102931,7 +104930,7 @@ var ts;
                 }
             }
             switch (node.kind) {
-                case 279 /* SourceFile */:
+                case 284 /* SourceFile */:
                     var sourceFile = node;
                     return ts.isExternalModule(sourceFile)
                         ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(sourceFile.fileName)))) + "\""
@@ -102983,10 +104982,10 @@ var ts;
                     case 243 /* EnumDeclaration */:
                     case 241 /* InterfaceDeclaration */:
                     case 244 /* ModuleDeclaration */:
-                    case 279 /* SourceFile */:
+                    case 284 /* SourceFile */:
                     case 242 /* TypeAliasDeclaration */:
-                    case 304 /* JSDocTypedefTag */:
-                    case 297 /* JSDocCallbackTag */:
+                    case 309 /* JSDocTypedefTag */:
+                    case 302 /* JSDocCallbackTag */:
                         return true;
                     case 157 /* Constructor */:
                     case 156 /* MethodDeclaration */:
@@ -103007,7 +105006,7 @@ var ts;
                     }
                     switch (navigationBarNodeKind(item.parent)) {
                         case 245 /* ModuleBlock */:
-                        case 279 /* SourceFile */:
+                        case 284 /* SourceFile */:
                         case 156 /* MethodDeclaration */:
                         case 157 /* Constructor */:
                             return true;
@@ -103092,7 +105091,7 @@ var ts;
             return !member.name || member.name.kind === 149 /* ComputedPropertyName */;
         }
         function getNodeSpan(node) {
-            return node.kind === 279 /* SourceFile */ ? ts.createTextSpanFromRange(node) : ts.createTextSpanFromNode(node, curSourceFile);
+            return node.kind === 284 /* SourceFile */ ? ts.createTextSpanFromRange(node) : ts.createTextSpanFromNode(node, curSourceFile);
         }
         function getModifiers(node) {
             if (node.parent && node.parent.kind === 237 /* VariableDeclaration */) {
@@ -103213,8 +105212,8 @@ var ts;
                 else {
                     // Note: Delete the surrounding trivia because it will have been retained in newImportDecls.
                     changeTracker.replaceNodeWithNodes(sourceFile, oldImportDecls[0], newImportDecls, {
-                        useNonAdjustedStartPosition: true,
-                        useNonAdjustedEndPosition: false,
+                        leadingTriviaOption: ts.textChanges.LeadingTriviaOption.Exclude,
+                        trailingTriviaOption: ts.textChanges.TrailingTriviaOption.Include,
                         suffix: ts.getNewLineOrDefaultFromHost(host, formatContext.options),
                     });
                 }
@@ -103228,7 +105227,7 @@ var ts;
         function removeUnusedImports(oldImports, sourceFile, program) {
             var typeChecker = program.getTypeChecker();
             var jsxNamespace = typeChecker.getJsxNamespace(sourceFile);
-            var jsxElementsPresent = !!(sourceFile.transformFlags & 4 /* ContainsJsx */);
+            var jsxElementsPresent = !!(sourceFile.transformFlags & 2 /* ContainsJsx */);
             var usedImports = [];
             for (var _i = 0, oldImports_1 = oldImports; _i < oldImports_1.length; _i++) {
                 var importDecl = oldImports_1[_i];
@@ -103552,8 +105551,8 @@ var ts;
             var lastSingleLineCommentEnd = -1;
             var singleLineCommentCount = 0;
             var sourceText = sourceFile.getFullText();
-            for (var _i = 0, comments_2 = comments; _i < comments_2.length; _i++) {
-                var _a = comments_2[_i], kind = _a.kind, pos = _a.pos, end = _a.end;
+            for (var _i = 0, comments_1 = comments; _i < comments_1.length; _i++) {
+                var _a = comments_1[_i], kind = _a.kind, pos = _a.pos, end = _a.end;
                 cancellationToken.throwIfCancellationRequested();
                 switch (kind) {
                     case 2 /* SingleLineCommentTrivia */:
@@ -103939,7 +105938,7 @@ var ts;
         if (ch >= 65 /* A */ && ch <= 90 /* Z */) {
             return true;
         }
-        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 6 /* Latest */)) {
+        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 7 /* Latest */)) {
             return false;
         }
         // TODO: find a way to determine this for any unicode characters in a
@@ -103952,7 +105951,7 @@ var ts;
         if (ch >= 97 /* a */ && ch <= 122 /* z */) {
             return true;
         }
-        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 6 /* Latest */)) {
+        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 7 /* Latest */)) {
             return false;
         }
         // TODO: find a way to determine this for any unicode characters in a
@@ -103963,15 +105962,15 @@ var ts;
     // Assumes 'value' is already lowercase.
     function indexOfIgnoringCase(str, value) {
         var n = str.length - value.length;
-        var _loop_16 = function (start) {
+        var _loop_6 = function (start) {
             if (every(value, function (valueChar, i) { return toLowerCase(str.charCodeAt(i + start)) === valueChar; })) {
                 return { value: start };
             }
         };
         for (var start = 0; start <= n; start++) {
-            var state_4 = _loop_16(start);
-            if (typeof state_4 === "object")
-                return state_4.value;
+            var state_1 = _loop_6(start);
+            if (typeof state_1 === "object")
+                return state_1.value;
         }
         return -1;
     }
@@ -104982,7 +106981,7 @@ var ts;
             return ts.createTextSpan(applicableSpanStart, applicableSpanEnd - applicableSpanStart);
         }
         function getContainingArgumentInfo(node, position, sourceFile, checker, isManuallyInvoked) {
-            var _loop_17 = function (n) {
+            var _loop_7 = function (n) {
                 // If the node is not a subspan of its parent, this is a big problem.
                 // There have been crashes that might be caused by this violation.
                 ts.Debug.assert(ts.rangeContainsRange(n.parent, n), "Not a subspan", function () { return "Child: " + ts.Debug.showSyntaxKind(n) + ", parent: " + ts.Debug.showSyntaxKind(n.parent); });
@@ -104992,9 +106991,9 @@ var ts;
                 }
             };
             for (var n = node; !ts.isSourceFile(n) && (isManuallyInvoked || !ts.isBlock(n)); n = n.parent) {
-                var state_5 = _loop_17(n);
-                if (typeof state_5 === "object")
-                    return state_5.value;
+                var state_2 = _loop_7(n);
+                if (typeof state_2 === "object")
+                    return state_2.value;
             }
             return undefined;
         }
@@ -105069,13 +107068,13 @@ var ts;
             var parameters = (typeParameters || ts.emptyArray).map(function (t) { return createSignatureHelpParameterForTypeParameter(t, checker, enclosingDeclaration, sourceFile, printer); });
             var parameterParts = ts.mapToDisplayParts(function (writer) {
                 var thisParameter = candidateSignature.thisParameter ? [checker.symbolToParameterDeclaration(candidateSignature.thisParameter, enclosingDeclaration, signatureHelpNodeBuilderFlags)] : [];
-                var params = ts.createNodeArray(thisParameter.concat(candidateSignature.parameters.map(function (param) { return checker.symbolToParameterDeclaration(param, enclosingDeclaration, signatureHelpNodeBuilderFlags); })));
+                var params = ts.createNodeArray(thisParameter.concat(checker.getExpandedParameters(candidateSignature).map(function (param) { return checker.symbolToParameterDeclaration(param, enclosingDeclaration, signatureHelpNodeBuilderFlags); })));
                 printer.writeList(2576 /* CallExpressionArguments */, params, sourceFile, writer);
             });
             return { isVariadic: false, parameters: parameters, prefix: [ts.punctuationPart(28 /* LessThanToken */)], suffix: [ts.punctuationPart(30 /* GreaterThanToken */)].concat(parameterParts) };
         }
         function itemInfoForParameters(candidateSignature, checker, enclosingDeclaration, sourceFile) {
-            var isVariadic = candidateSignature.hasRestParameter;
+            var isVariadic = checker.hasEffectiveRestParameter(candidateSignature);
             var printer = ts.createPrinter({ removeComments: true });
             var typeParameterParts = ts.mapToDisplayParts(function (writer) {
                 if (candidateSignature.typeParameters && candidateSignature.typeParameters.length) {
@@ -105083,7 +107082,7 @@ var ts;
                     printer.writeList(53776 /* TypeParameters */, args, sourceFile, writer);
                 }
             });
-            var parameters = candidateSignature.parameters.map(function (p) { return createSignatureHelpParameterForParameter(p, checker, enclosingDeclaration, sourceFile, printer); });
+            var parameters = checker.getExpandedParameters(candidateSignature).map(function (p) { return createSignatureHelpParameterForParameter(p, checker, enclosingDeclaration, sourceFile, printer); });
             return { isVariadic: isVariadic, parameters: parameters, prefix: typeParameterParts.concat([ts.punctuationPart(20 /* OpenParenToken */)]), suffix: [ts.punctuationPart(21 /* CloseParenToken */)] };
         }
         function createSignatureHelpParameterForParameter(parameter, checker, enclosingDeclaration, sourceFile, printer) {
@@ -105272,8 +107271,8 @@ var ts;
                 var name = importNameForConvertToDefaultImport(importNode);
                 if (!name)
                     continue;
-                var module_2 = ts.getResolvedModule(sourceFile, moduleSpecifier.text);
-                var resolvedFile = module_2 && program.getSourceFile(module_2.resolvedFileName);
+                var module = ts.getResolvedModule(sourceFile, moduleSpecifier.text);
+                var resolvedFile = module && program.getSourceFile(module.resolvedFileName);
                 if (resolvedFile && resolvedFile.externalModuleIndicator && ts.isExportAssignment(resolvedFile.externalModuleIndicator) && resolvedFile.externalModuleIndicator.isExportEquals) {
                     diags.push(ts.createDiagnosticForNode(name, ts.Diagnostics.Import_may_be_converted_to_a_default_import));
                 }
@@ -105288,8 +107287,8 @@ var ts;
                     case 196 /* FunctionExpression */:
                         var decl = ts.getDeclarationOfExpando(node);
                         if (decl) {
-                            var symbol_2 = decl.symbol;
-                            if (symbol_2 && (symbol_2.exports && symbol_2.exports.size || symbol_2.members && symbol_2.members.size)) {
+                            var symbol_1 = decl.symbol;
+                            if (symbol_1 && (symbol_1.exports && symbol_1.exports.size || symbol_1.members && symbol_1.members.size)) {
                                 diags.push(ts.createDiagnosticForNode(ts.isVariableDeclaration(node.parent) ? node.parent.name : node, ts.Diagnostics.This_constructor_function_may_be_converted_to_a_class_declaration));
                                 break;
                             }
@@ -105726,7 +107725,7 @@ var ts;
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
             }
-            if (symbolFlags & 1536 /* Module */) {
+            if (symbolFlags & 1536 /* Module */ && !isThisExpression) {
                 prefixNextMeaning();
                 var declaration = ts.getDeclarationOfKind(symbol, 244 /* ModuleDeclaration */);
                 var isNamespace = declaration && declaration.name && declaration.name.kind === 72 /* Identifier */;
@@ -105910,7 +107909,7 @@ var ts;
                     // For some special property access expressions like `exports.foo = foo` or `module.exports.foo = foo`
                     // there documentation comments might be attached to the right hand side symbol of their declarations.
                     // The pattern of such special property access is that the parent symbol is the symbol of the file.
-                    if (symbol.parent && ts.forEach(symbol.parent.declarations, function (declaration) { return declaration.kind === 279 /* SourceFile */; })) {
+                    if (symbol.parent && ts.forEach(symbol.parent.declarations, function (declaration) { return declaration.kind === 284 /* SourceFile */; })) {
                         for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                             var declaration = _a[_i];
                             if (!declaration.parent || declaration.parent.kind !== 204 /* BinaryExpression */) {
@@ -106035,7 +108034,7 @@ var ts;
                 // If the parent is not sourceFile or module block it is local variable
                 for (var parent = declaration.parent; !ts.isFunctionBlock(parent); parent = parent.parent) {
                     // Reached source file or module block
-                    if (parent.kind === 279 /* SourceFile */ || parent.kind === 245 /* ModuleBlock */) {
+                    if (parent.kind === 284 /* SourceFile */ || parent.kind === 245 /* ModuleBlock */) {
                         return false;
                     }
                 }
@@ -106149,7 +108148,7 @@ var ts;
             return typeof o.type === "object" && !ts.forEachEntry(o.type, function (v) { return typeof v !== "number"; });
         });
         options = ts.cloneCompilerOptions(options);
-        var _loop_18 = function (opt) {
+        var _loop_8 = function (opt) {
             if (!ts.hasProperty(options, opt.name)) {
                 return "continue";
             }
@@ -106168,7 +108167,7 @@ var ts;
         };
         for (var _i = 0, commandLineOptionsStringToEnum_1 = commandLineOptionsStringToEnum; _i < commandLineOptionsStringToEnum_1.length; _i++) {
             var opt = commandLineOptionsStringToEnum_1[_i];
-            _loop_18(opt);
+            _loop_8(opt);
         }
         return options;
     }
@@ -106264,8 +108263,8 @@ var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
-        var standardScanner = ts.createScanner(6 /* Latest */, /*skipTrivia*/ false, 0 /* Standard */);
-        var jsxScanner = ts.createScanner(6 /* Latest */, /*skipTrivia*/ false, 1 /* JSX */);
+        var standardScanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false, 0 /* Standard */);
+        var jsxScanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false, 1 /* JSX */);
         var ScanAction;
         (function (ScanAction) {
             ScanAction[ScanAction["Scan"] = 0] = "Scan";
@@ -106859,7 +108858,7 @@ var ts;
                 case 226 /* ForInStatement */:
                 // "in" keyword in [P in keyof T]: T[P]
                 case 150 /* TypeParameter */:
-                    return context.currentTokenSpan.kind === 93 /* InKeyword */ || context.nextTokenSpan.kind === 93 /* InKeyword */;
+                    return context.currentTokenSpan.kind === 93 /* InKeyword */ || context.nextTokenSpan.kind === 93 /* InKeyword */ || context.currentTokenSpan.kind === 59 /* EqualsToken */ || context.nextTokenSpan.kind === 59 /* EqualsToken */;
                 // Technically, "of" is not a binary operator, but format it the same way as "in"
                 case 227 /* ForOfStatement */:
                     return context.currentTokenSpan.kind === 147 /* OfKeyword */ || context.nextTokenSpan.kind === 147 /* OfKeyword */;
@@ -107360,7 +109359,7 @@ var ts;
                 case 244 /* ModuleDeclaration */:
                     var body = parent.body;
                     return !!body && body.kind === 245 /* ModuleBlock */ && ts.rangeContainsRange(body.statements, node);
-                case 279 /* SourceFile */:
+                case 284 /* SourceFile */:
                 case 218 /* Block */:
                 case 245 /* ModuleBlock */:
                     return ts.rangeContainsRange(parent.statements, node);
@@ -108479,7 +110478,7 @@ var ts;
                 // - parent is SourceFile - by default immediate children of SourceFile are not indented except when user indents them manually
                 // - parent and child are not on the same line
                 var useActualIndentation = (ts.isDeclaration(current) || ts.isStatementButNotDeclaration(current)) &&
-                    (parent.kind === 279 /* SourceFile */ || !parentAndChildShareLine);
+                    (parent.kind === 284 /* SourceFile */ || !parentAndChildShareLine);
                 if (!useActualIndentation) {
                     return -1 /* Unknown */;
                 }
@@ -108567,7 +110566,7 @@ var ts;
                     case 209 /* ClassExpression */:
                     case 241 /* InterfaceDeclaration */:
                     case 242 /* TypeAliasDeclaration */:
-                    case 303 /* JSDocTemplateTag */:
+                    case 308 /* JSDocTemplateTag */:
                         return getList(node.typeParameters);
                     case 192 /* NewExpression */:
                     case 191 /* CallExpression */:
@@ -108816,11 +110815,23 @@ var ts;
             ts.Debug.assert(typeof end === "number");
             n.__end = end;
         }
-        var Position;
-        (function (Position) {
-            Position[Position["FullStart"] = 0] = "FullStart";
-            Position[Position["Start"] = 1] = "Start";
-        })(Position = textChanges_3.Position || (textChanges_3.Position = {}));
+        var LeadingTriviaOption;
+        (function (LeadingTriviaOption) {
+            /** Exclude all leading trivia (use getStart()) */
+            LeadingTriviaOption[LeadingTriviaOption["Exclude"] = 0] = "Exclude";
+            /** Include leading trivia and,
+             * if there are no line breaks between the node and the previous token,
+             * include all trivia between the node and the previous token
+             */
+            LeadingTriviaOption[LeadingTriviaOption["IncludeAll"] = 1] = "IncludeAll";
+        })(LeadingTriviaOption = textChanges_3.LeadingTriviaOption || (textChanges_3.LeadingTriviaOption = {}));
+        var TrailingTriviaOption;
+        (function (TrailingTriviaOption) {
+            /** Exclude all trailing trivia (use getEnd()) */
+            TrailingTriviaOption[TrailingTriviaOption["Exclude"] = 0] = "Exclude";
+            /** Include trailing trivia */
+            TrailingTriviaOption[TrailingTriviaOption["Include"] = 1] = "Include";
+        })(TrailingTriviaOption = textChanges_3.TrailingTriviaOption || (textChanges_3.TrailingTriviaOption = {}));
         function skipWhitespacesAndLineBreaks(text, start) {
             return ts.skipTrivia(text, start, /*stopAfterLineBreak*/ false, /*stopAtComments*/ true);
         }
@@ -108836,9 +110847,9 @@ var ts;
             }
             return false;
         }
-        textChanges_3.useNonAdjustedPositions = {
-            useNonAdjustedStartPosition: true,
-            useNonAdjustedEndPosition: true,
+        var useNonAdjustedPositions = {
+            leadingTriviaOption: LeadingTriviaOption.Exclude,
+            trailingTriviaOption: TrailingTriviaOption.Exclude,
         };
         var ChangeKind;
         (function (ChangeKind) {
@@ -108848,10 +110859,11 @@ var ts;
             ChangeKind[ChangeKind["Text"] = 3] = "Text";
         })(ChangeKind || (ChangeKind = {}));
         function getAdjustedRange(sourceFile, startNode, endNode, options) {
-            return { pos: getAdjustedStartPosition(sourceFile, startNode, options, Position.Start), end: getAdjustedEndPosition(sourceFile, endNode, options) };
+            return { pos: getAdjustedStartPosition(sourceFile, startNode, options), end: getAdjustedEndPosition(sourceFile, endNode, options) };
         }
-        function getAdjustedStartPosition(sourceFile, node, options, position) {
-            if (options.useNonAdjustedStartPosition) {
+        function getAdjustedStartPosition(sourceFile, node, options) {
+            var leadingTriviaOption = options.leadingTriviaOption;
+            if (leadingTriviaOption === LeadingTriviaOption.Exclude) {
                 return node.getStart(sourceFile);
             }
             var fullStart = node.getFullStart();
@@ -108869,7 +110881,7 @@ var ts;
                 // fullstart
                 // when b is replaced - we usually want to keep the leading trvia
                 // when b is deleted - we delete it
-                return position === Position.Start ? start : fullStart;
+                return leadingTriviaOption === LeadingTriviaOption.IncludeAll ? fullStart : start;
             }
             // get start position of the line following the line that contains fullstart position
             // (but only if the fullstart isn't the very beginning of the file)
@@ -108881,11 +110893,12 @@ var ts;
         }
         function getAdjustedEndPosition(sourceFile, node, options) {
             var end = node.end;
-            if (options.useNonAdjustedEndPosition || ts.isExpression(node)) {
+            var trailingTriviaOption = options.trailingTriviaOption;
+            if (trailingTriviaOption === TrailingTriviaOption.Exclude || (ts.isExpression(node) && trailingTriviaOption !== TrailingTriviaOption.Include)) {
                 return end;
             }
             var newEnd = ts.skipTrivia(sourceFile.text, end, /*stopAfterLineBreak*/ true);
-            return newEnd !== end && ts.isLineBreak(sourceFile.text.charCodeAt(newEnd - 1))
+            return newEnd !== end && (trailingTriviaOption === TrailingTriviaOption.Include || ts.isLineBreak(sourceFile.text.charCodeAt(newEnd - 1)))
                 ? newEnd
                 : end;
         }
@@ -108930,15 +110943,15 @@ var ts;
                 this.deleteRange(sourceFile, { pos: modifier.getStart(sourceFile), end: ts.skipTrivia(sourceFile.text, modifier.end, /*stopAfterLineBreak*/ true) });
             };
             ChangeTracker.prototype.deleteNodeRange = function (sourceFile, startNode, endNode, options) {
-                if (options === void 0) { options = {}; }
-                var startPosition = getAdjustedStartPosition(sourceFile, startNode, options, Position.FullStart);
+                if (options === void 0) { options = { leadingTriviaOption: LeadingTriviaOption.IncludeAll }; }
+                var startPosition = getAdjustedStartPosition(sourceFile, startNode, options);
                 var endPosition = getAdjustedEndPosition(sourceFile, endNode, options);
                 this.deleteRange(sourceFile, { pos: startPosition, end: endPosition });
             };
             ChangeTracker.prototype.deleteNodeRangeExcludingEnd = function (sourceFile, startNode, afterEndNode, options) {
-                if (options === void 0) { options = {}; }
-                var startPosition = getAdjustedStartPosition(sourceFile, startNode, options, Position.FullStart);
-                var endPosition = afterEndNode === undefined ? sourceFile.text.length : getAdjustedStartPosition(sourceFile, afterEndNode, options, Position.FullStart);
+                if (options === void 0) { options = { leadingTriviaOption: LeadingTriviaOption.IncludeAll }; }
+                var startPosition = getAdjustedStartPosition(sourceFile, startNode, options);
+                var endPosition = afterEndNode === undefined ? sourceFile.text.length : getAdjustedStartPosition(sourceFile, afterEndNode, options);
                 this.deleteRange(sourceFile, { pos: startPosition, end: endPosition });
             };
             ChangeTracker.prototype.replaceRange = function (sourceFile, range, newNode, options) {
@@ -108946,11 +110959,11 @@ var ts;
                 this.changes.push({ kind: ChangeKind.ReplaceWithSingleNode, sourceFile: sourceFile, range: range, options: options, node: newNode });
             };
             ChangeTracker.prototype.replaceNode = function (sourceFile, oldNode, newNode, options) {
-                if (options === void 0) { options = textChanges_3.useNonAdjustedPositions; }
+                if (options === void 0) { options = useNonAdjustedPositions; }
                 this.replaceRange(sourceFile, getAdjustedRange(sourceFile, oldNode, oldNode, options), newNode, options);
             };
             ChangeTracker.prototype.replaceNodeRange = function (sourceFile, startNode, endNode, newNode, options) {
-                if (options === void 0) { options = textChanges_3.useNonAdjustedPositions; }
+                if (options === void 0) { options = useNonAdjustedPositions; }
                 this.replaceRange(sourceFile, getAdjustedRange(sourceFile, startNode, endNode, options), newNode, options);
             };
             ChangeTracker.prototype.replaceRangeWithNodes = function (sourceFile, range, newNodes, options) {
@@ -108958,14 +110971,14 @@ var ts;
                 this.changes.push({ kind: ChangeKind.ReplaceWithMultipleNodes, sourceFile: sourceFile, range: range, options: options, nodes: newNodes });
             };
             ChangeTracker.prototype.replaceNodeWithNodes = function (sourceFile, oldNode, newNodes, options) {
-                if (options === void 0) { options = textChanges_3.useNonAdjustedPositions; }
+                if (options === void 0) { options = useNonAdjustedPositions; }
                 this.replaceRangeWithNodes(sourceFile, getAdjustedRange(sourceFile, oldNode, oldNode, options), newNodes, options);
             };
             ChangeTracker.prototype.replaceNodeWithText = function (sourceFile, oldNode, text) {
-                this.replaceRangeWithText(sourceFile, getAdjustedRange(sourceFile, oldNode, oldNode, textChanges_3.useNonAdjustedPositions), text);
+                this.replaceRangeWithText(sourceFile, getAdjustedRange(sourceFile, oldNode, oldNode, useNonAdjustedPositions), text);
             };
             ChangeTracker.prototype.replaceNodeRangeWithNodes = function (sourceFile, startNode, endNode, newNodes, options) {
-                if (options === void 0) { options = textChanges_3.useNonAdjustedPositions; }
+                if (options === void 0) { options = useNonAdjustedPositions; }
                 this.replaceRangeWithNodes(sourceFile, getAdjustedRange(sourceFile, startNode, endNode, options), newNodes, options);
             };
             ChangeTracker.prototype.nextCommaToken = function (sourceFile, node) {
@@ -108993,7 +111006,7 @@ var ts;
             };
             ChangeTracker.prototype.insertNodeBefore = function (sourceFile, before, newNode, blankLineBetween) {
                 if (blankLineBetween === void 0) { blankLineBetween = false; }
-                this.insertNodeAt(sourceFile, getAdjustedStartPosition(sourceFile, before, {}, Position.Start), newNode, this.getOptionsForInsertNodeBefore(before, blankLineBetween));
+                this.insertNodeAt(sourceFile, getAdjustedStartPosition(sourceFile, before, {}), newNode, this.getOptionsForInsertNodeBefore(before, blankLineBetween));
             };
             ChangeTracker.prototype.insertModifierBefore = function (sourceFile, modifier, before) {
                 var pos = before.getStart(sourceFile);
@@ -109100,7 +111113,7 @@ var ts;
                 this.replaceNode(sourceFile, ctr.body, ts.createBlock(statements, /*multiLine*/ true));
             };
             ChangeTracker.prototype.insertNodeAtEndOfScope = function (sourceFile, scope, newNode) {
-                var pos = getAdjustedStartPosition(sourceFile, scope.getLastToken(), {}, Position.Start);
+                var pos = getAdjustedStartPosition(sourceFile, scope.getLastToken(), {});
                 this.insertNodeAt(sourceFile, pos, newNode, {
                     prefix: ts.isLineBreak(sourceFile.text.charCodeAt(scope.getLastToken().pos)) ? this.newLineCharacter : this.newLineCharacter + this.newLineCharacter,
                     suffix: this.newLineCharacter
@@ -109340,7 +111353,7 @@ var ts;
             ChangeTracker.prototype.finishDeleteDeclarations = function () {
                 var _this = this;
                 var deletedNodesInLists = new ts.NodeSet(); // Stores nodes in lists that we already deleted. Used to avoid deleting `, ` twice in `a, b`.
-                var _loop_19 = function (sourceFile, node) {
+                var _loop_9 = function (sourceFile, node) {
                     if (!this_1.deletedNodes.some(function (d) { return d.sourceFile === sourceFile && ts.rangeContainsRangeExclusive(d.node, node); })) {
                         if (ts.isArray(node)) {
                             this_1.deleteRange(sourceFile, ts.rangeOfTypeParameters(node));
@@ -109353,7 +111366,7 @@ var ts;
                 var this_1 = this;
                 for (var _i = 0, _a = this.deletedNodes; _i < _a.length; _i++) {
                     var _b = _a[_i], sourceFile = _b.sourceFile, node = _b.node;
-                    _loop_19(sourceFile, node);
+                    _loop_9(sourceFile, node);
                 }
                 deletedNodesInLists.forEach(function (node) {
                     var sourceFile = node.getSourceFile();
@@ -109390,7 +111403,7 @@ var ts;
         textChanges_3.ChangeTracker = ChangeTracker;
         // find first non-whitespace position in the leading trivia of the node
         function startPositionToDeleteNodeInList(sourceFile, node) {
-            return ts.skipTrivia(sourceFile.text, getAdjustedStartPosition(sourceFile, node, {}, Position.FullStart), /*stopAfterLineBreak*/ false, /*stopAtComments*/ true);
+            return ts.skipTrivia(sourceFile.text, getAdjustedStartPosition(sourceFile, node, { leadingTriviaOption: LeadingTriviaOption.IncludeAll }), /*stopAfterLineBreak*/ false, /*stopAtComments*/ true);
         }
         function getClassOrObjectBraceEnds(cls, sourceFile) {
             return [ts.findChildOfKind(cls, 18 /* OpenBraceToken */, sourceFile).end, ts.findChildOfKind(cls, 19 /* CloseBraceToken */, sourceFile).end];
@@ -109410,14 +111423,14 @@ var ts;
                     // order changes by start position
                     // If the start position is the same, put the shorter range first, since an empty range (x, x) may precede (x, y) but not vice-versa.
                     var normalized = ts.stableSort(changesInFile, function (a, b) { return (a.range.pos - b.range.pos) || (a.range.end - b.range.end); });
-                    var _loop_20 = function (i) {
+                    var _loop_10 = function (i) {
                         ts.Debug.assert(normalized[i].range.end <= normalized[i + 1].range.pos, "Changes overlap", function () {
                             return JSON.stringify(normalized[i].range) + " and " + JSON.stringify(normalized[i + 1].range);
                         });
                     };
                     // verify that change intervals do not overlap, except possibly at end points.
                     for (var i = 0; i < normalized.length - 1; i++) {
-                        _loop_20(i);
+                        _loop_10(i);
                     }
                     var textChanges = normalized.map(function (c) {
                         return ts.createTextChange(ts.createTextSpanFromRange(c.range), computeNewText(c, sourceFile, newLineCharacter, formatContext, validate));
@@ -109434,7 +111447,7 @@ var ts;
             function newFileChangesWorker(oldFile, scriptKind, statements, newLineCharacter, formatContext) {
                 // TODO: this emits the file, parses it back, then formats it that -- may be a less roundabout way to do this
                 var nonFormattedText = statements.map(function (s) { return getNonformattedText(s, oldFile, newLineCharacter).text; }).join(newLineCharacter);
-                var sourceFile = ts.createSourceFile("any file name", nonFormattedText, 6 /* ESNext */, /*setParentNodes*/ true, scriptKind);
+                var sourceFile = ts.createSourceFile("any file name", nonFormattedText, 7 /* ESNext */, /*setParentNodes*/ true, scriptKind);
                 var changes = ts.formatting.formatDocument(sourceFile, formatContext);
                 return applyChanges(nonFormattedText, changes) + newLineCharacter;
             }
@@ -109727,7 +111740,7 @@ var ts;
                     case 249 /* ImportDeclaration */:
                         deleteNode(changes, sourceFile, node, 
                         // For first import, leave header comment in place
-                        node === sourceFile.imports[0].parent ? { useNonAdjustedStartPosition: true, useNonAdjustedEndPosition: false } : undefined);
+                        node === sourceFile.imports[0].parent ? { leadingTriviaOption: LeadingTriviaOption.Exclude } : undefined);
                         break;
                     case 186 /* BindingElement */:
                         var pattern = node.parent;
@@ -109765,7 +111778,7 @@ var ts;
                             deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         }
                         else {
-                            deleteNode(changes, sourceFile, node, node.kind === 26 /* SemicolonToken */ ? { useNonAdjustedEndPosition: true } : undefined);
+                            deleteNode(changes, sourceFile, node, node.kind === 26 /* SemicolonToken */ ? { trailingTriviaOption: TrailingTriviaOption.Exclude } : undefined);
                         }
                 }
             }
@@ -109836,8 +111849,8 @@ var ts;
         /** Warning: This deletes comments too. See `copyComments` in `convertFunctionToEs6Class`. */
         // Exported for tests only! (TODO: improve tests to not need this)
         function deleteNode(changes, sourceFile, node, options) {
-            if (options === void 0) { options = {}; }
-            var startPosition = getAdjustedStartPosition(sourceFile, node, options, Position.FullStart);
+            if (options === void 0) { options = { leadingTriviaOption: LeadingTriviaOption.IncludeAll }; }
+            var startPosition = getAdjustedStartPosition(sourceFile, node, options);
             var endPosition = getAdjustedEndPosition(sourceFile, node, options);
             changes.deleteRange(sourceFile, { pos: startPosition, end: endPosition });
         }
@@ -110130,18 +112143,18 @@ var ts;
         }
         function transformJSDocType(node) {
             switch (node.kind) {
-                case 284 /* JSDocAllType */:
-                case 285 /* JSDocUnknownType */:
+                case 289 /* JSDocAllType */:
+                case 290 /* JSDocUnknownType */:
                     return ts.createTypeReferenceNode("any", ts.emptyArray);
-                case 288 /* JSDocOptionalType */:
+                case 293 /* JSDocOptionalType */:
                     return transformJSDocOptionalType(node);
-                case 287 /* JSDocNonNullableType */:
+                case 292 /* JSDocNonNullableType */:
                     return transformJSDocType(node.type);
-                case 286 /* JSDocNullableType */:
+                case 291 /* JSDocNullableType */:
                     return transformJSDocNullableType(node);
-                case 290 /* JSDocVariadicType */:
+                case 295 /* JSDocVariadicType */:
                     return transformJSDocVariadicType(node);
-                case 289 /* JSDocFunctionType */:
+                case 294 /* JSDocFunctionType */:
                     return transformJSDocFunctionType(node);
                 case 164 /* TypeReference */:
                     return transformJSDocTypeReference(node);
@@ -110165,7 +112178,7 @@ var ts;
         }
         function transformJSDocParameter(node) {
             var index = node.parent.parameters.indexOf(node);
-            var isRest = node.type.kind === 290 /* JSDocVariadicType */ && index === node.parent.parameters.length - 1; // TODO: GH#18217
+            var isRest = node.type.kind === 295 /* JSDocVariadicType */ && index === node.parent.parameters.length - 1; // TODO: GH#18217
             var name = node.name || (isRest ? "rest" : "arg" + index);
             var dotdotdot = isRest ? ts.createToken(25 /* DotDotDotToken */) : node.dotDotDotToken;
             return ts.createParameter(node.decorators, node.modifiers, dotdotdot, name, node.questionToken, ts.visitNode(node.type, transformJSDocType), node.initializer);
@@ -110321,7 +112334,7 @@ var ts;
                     }
                     if (ts.isPropertyAccessExpression(parent)) {
                         var type = inferTypeForVariableFromUsage(parent.name, program, cancellationToken);
-                        var typeNode = getTypeNodeIfAccessible(type, parent, program, host);
+                        var typeNode = ts.getTypeNodeIfAccessible(type, parent, program, host);
                         if (typeNode) {
                             // Note that the codefix will never fire with an existing `@type` tag, so there is no need to merge tags
                             var typeTag = ts.createJSDocTypeTag(ts.createJSDocTypeExpression(typeNode), /*comment*/ "");
@@ -110425,7 +112438,7 @@ var ts;
             }
         }
         function annotate(changes, sourceFile, declaration, type, program, host) {
-            var typeNode = getTypeNodeIfAccessible(type, declaration, program, host);
+            var typeNode = ts.getTypeNodeIfAccessible(type, declaration, program, host);
             if (typeNode) {
                 if (ts.isInJSFile(sourceFile) && declaration.kind !== 153 /* PropertySignature */) {
                     var parent = ts.isVariableDeclaration(declaration) ? ts.tryCast(declaration.parent.parent, ts.isVariableStatement) : declaration;
@@ -110451,7 +112464,7 @@ var ts;
                 // only infer parameters that have (1) no type and (2) an accessible inferred type
                 if (param.initializer || ts.getJSDocType(param) || !ts.isIdentifier(param.name))
                     return;
-                var typeNode = inference.type && getTypeNodeIfAccessible(inference.type, param, program, host);
+                var typeNode = inference.type && ts.getTypeNodeIfAccessible(inference.type, param, program, host);
                 var name = ts.getSynthesizedClone(param.name);
                 ts.setEmitFlags(name, 1536 /* NoComments */ | 2048 /* NoNestedComments */);
                 return typeNode && ts.createJSDocParamTag(name, !!inference.isOptional, ts.createJSDocTypeExpression(typeNode), "");
@@ -110468,47 +112481,33 @@ var ts;
                 return !!merged;
             }); });
             var tag = ts.createJSDocComment(comments.join("\n"), ts.createNodeArray((oldTags || ts.emptyArray).concat(unmergedNewTags)));
-            changes.insertJsdocCommentBefore(sourceFile, parent, tag);
+            var jsDocNode = parent.kind === 197 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent;
+            jsDocNode.jsDoc = parent.jsDoc;
+            jsDocNode.jsDocCache = parent.jsDocCache;
+            changes.insertJsdocCommentBefore(sourceFile, jsDocNode, tag);
+        }
+        function getJsDocNodeForArrowFunction(signature) {
+            if (signature.parent.kind === 154 /* PropertyDeclaration */) {
+                return signature.parent;
+            }
+            return signature.parent.parent;
         }
         function tryMergeJsdocTags(oldTag, newTag) {
             if (oldTag.kind !== newTag.kind) {
                 return undefined;
             }
             switch (oldTag.kind) {
-                case 299 /* JSDocParameterTag */: {
+                case 304 /* JSDocParameterTag */: {
                     var oldParam = oldTag;
                     var newParam = newTag;
                     return ts.isIdentifier(oldParam.name) && ts.isIdentifier(newParam.name) && oldParam.name.escapedText === newParam.name.escapedText
                         ? ts.createJSDocParamTag(newParam.name, newParam.isBracketed, newParam.typeExpression, oldParam.comment)
                         : undefined;
                 }
-                case 300 /* JSDocReturnTag */:
+                case 305 /* JSDocReturnTag */:
                     return ts.createJSDocReturnTag(newTag.typeExpression, oldTag.comment);
             }
         }
-        function getTypeNodeIfAccessible(type, enclosingScope, program, host) {
-            var checker = program.getTypeChecker();
-            var typeIsAccessible = true;
-            var notAccessible = function () { typeIsAccessible = false; };
-            var res = checker.typeToTypeNode(type, enclosingScope, /*flags*/ undefined, {
-                trackSymbol: function (symbol, declaration, meaning) {
-                    // TODO: GH#18217
-                    typeIsAccessible = typeIsAccessible && checker.isSymbolAccessible(symbol, declaration, meaning, /*shouldComputeAliasToMarkVisible*/ false).accessibility === 0 /* Accessible */;
-                },
-                reportInaccessibleThisError: notAccessible,
-                reportPrivateInBaseOfClassExpression: notAccessible,
-                reportInaccessibleUniqueSymbolError: notAccessible,
-                moduleResolverHost: {
-                    readFile: host.readFile,
-                    fileExists: host.fileExists,
-                    directoryExists: host.directoryExists,
-                    getSourceFiles: program.getSourceFiles,
-                    getCurrentDirectory: program.getCurrentDirectory,
-                    getCommonSourceDirectory: program.getCommonSourceDirectory,
-                }
-            });
-            return typeIsAccessible ? res : undefined;
-        }
         function getReferences(token, program, cancellationToken) {
             // Position shouldn't matter since token is not a SourceFile.
             return ts.mapDefined(ts.FindAllReferences.getReferenceEntriesForNode(-1, token, program, program.getSourceFiles(), cancellationToken), function (entry) {
@@ -110807,8 +112806,8 @@ var ts;
             }
             function removeLowPriorityInferences(inferences, priorities) {
                 var toRemove = [];
-                for (var _i = 0, inferences_2 = inferences; _i < inferences_2.length; _i++) {
-                    var i = inferences_2[_i];
+                for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
+                    var i = inferences_1[_i];
                     for (var _a = 0, priorities_1 = priorities; _a < priorities_1.length; _a++) {
                         var _b = priorities_1[_a], high = _b.high, low = _b.low;
                         if (high(i)) {
@@ -110900,8 +112899,8 @@ var ts;
                 types.push.apply(types, (usageContext.candidateTypes || []).map(function (t) { return checker.getBaseTypeOfLiteralType(t); }));
                 if (usageContext.properties && hasCallContext(usageContext.properties.get("then"))) {
                     var paramType = getParameterTypeFromCallContexts(0, usageContext.properties.get("then").callContexts, /*isRestParameter*/ false, checker); // TODO: GH#18217
-                    var types_19 = paramType.getCallSignatures().map(function (c) { return c.getReturnType(); });
-                    types_19.push(checker.createPromiseType(types_19.length ? checker.getUnionType(types_19, 2 /* Subtype */) : checker.getAnyType()));
+                    var types_1 = paramType.getCallSignatures().map(function (c) { return c.getReturnType(); });
+                    types_1.push(checker.createPromiseType(types_1.length ? checker.getUnionType(types_1, 2 /* Subtype */) : checker.getAnyType()));
                 }
                 else if (usageContext.properties && hasCallContext(usageContext.properties.get("push"))) {
                     types.push(checker.createArrayType(getParameterTypeFromCallContexts(0, usageContext.properties.get("push").callContexts, /*isRestParameter*/ false, checker)));
@@ -110910,7 +112909,7 @@ var ts;
                     types.push(checker.createArrayType(recur(usageContext.numberIndexContext)));
                 }
                 else if (usageContext.properties || usageContext.callContexts || usageContext.constructContexts || usageContext.stringIndexContext) {
-                    var members_6 = ts.createUnderscoreEscapedMap();
+                    var members_1 = ts.createUnderscoreEscapedMap();
                     var callSignatures = [];
                     var constructSignatures = [];
                     var stringIndexInfo = void 0;
@@ -110918,7 +112917,7 @@ var ts;
                         usageContext.properties.forEach(function (context, name) {
                             var symbol = checker.createSymbol(4 /* Property */, name);
                             symbol.type = recur(context);
-                            members_6.set(name, symbol);
+                            members_1.set(name, symbol);
                         });
                     }
                     if (usageContext.callContexts) {
@@ -110936,7 +112935,7 @@ var ts;
                     if (usageContext.stringIndexContext) {
                         stringIndexInfo = checker.createIndexInfo(recur(usageContext.stringIndexContext), /*isReadonly*/ false);
                     }
-                    types.push(checker.createAnonymousType(/*symbol*/ undefined, members_6, callSignatures, constructSignatures, stringIndexInfo, /*numberIndexInfo*/ undefined)); // TODO: GH#18217
+                    types.push(checker.createAnonymousType(/*symbol*/ undefined, members_1, callSignatures, constructSignatures, stringIndexInfo, /*numberIndexInfo*/ undefined)); // TODO: GH#18217
                 }
                 return types;
                 function recur(innerContext) {
@@ -111021,7 +113020,7 @@ var ts;
                     precedingNode = ctorDeclaration.parent.parent;
                     newClassDeclaration = createClassFromVariableDeclaration(ctorDeclaration);
                     if (ctorDeclaration.parent.declarations.length === 1) {
-                        ts.copyComments(precedingNode, newClassDeclaration, sourceFile); // TODO: GH#18217
+                        ts.copyLeadingComments(precedingNode, newClassDeclaration, sourceFile); // TODO: GH#18217
                         changes.delete(sourceFile, precedingNode);
                     }
                     else {
@@ -111032,7 +113031,7 @@ var ts;
             if (!newClassDeclaration) {
                 return undefined;
             }
-            ts.copyComments(ctorDeclaration, newClassDeclaration, sourceFile);
+            ts.copyLeadingComments(ctorDeclaration, newClassDeclaration, sourceFile);
             // Because the preceding node could be touched, we need to insert nodes before delete nodes.
             changes.insertNodeAfter(sourceFile, precedingNode, newClassDeclaration);
             function createClassElementsFromSymbol(symbol) {
@@ -111085,7 +113084,7 @@ var ts;
                             var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(functionExpression, 121 /* AsyncKeyword */));
                             var method = ts.createMethod(/*decorators*/ undefined, fullModifiers, /*asteriskToken*/ undefined, memberDeclaration.name, /*questionToken*/ undefined, 
                             /*typeParameters*/ undefined, functionExpression.parameters, /*type*/ undefined, functionExpression.body);
-                            ts.copyComments(assignmentBinaryExpression, method, sourceFile);
+                            ts.copyLeadingComments(assignmentBinaryExpression, method, sourceFile);
                             return method;
                         }
                         case 197 /* ArrowFunction */: {
@@ -111103,7 +113102,7 @@ var ts;
                             var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(arrowFunction, 121 /* AsyncKeyword */));
                             var method = ts.createMethod(/*decorators*/ undefined, fullModifiers, /*asteriskToken*/ undefined, memberDeclaration.name, /*questionToken*/ undefined, 
                             /*typeParameters*/ undefined, arrowFunction.parameters, /*type*/ undefined, bodyBlock);
-                            ts.copyComments(assignmentBinaryExpression, method, sourceFile);
+                            ts.copyLeadingComments(assignmentBinaryExpression, method, sourceFile);
                             return method;
                         }
                         default: {
@@ -111113,7 +113112,7 @@ var ts;
                             }
                             var prop = ts.createProperty(/*decorators*/ undefined, modifiers, memberDeclaration.name, /*questionToken*/ undefined, 
                             /*type*/ undefined, assignmentBinaryExpression.right);
-                            ts.copyComments(assignmentBinaryExpression.parent, prop, sourceFile);
+                            ts.copyLeadingComments(assignmentBinaryExpression.parent, prop, sourceFile);
                             return prop;
                         }
                     }
@@ -111205,7 +113204,7 @@ var ts;
                 var newNodes = transformExpression(node, transformer, node);
                 changes.replaceNodeWithNodes(sourceFile, nodeToReplace, newNodes);
             }
-            var _loop_21 = function (statement) {
+            var _loop_11 = function (statement) {
                 ts.forEachChild(statement, function visit(node) {
                     if (ts.isCallExpression(node)) {
                         startTransformation(node, statement);
@@ -111217,7 +113216,7 @@ var ts;
             };
             for (var _i = 0, returnStatements_1 = returnStatements; _i < returnStatements_1.length; _i++) {
                 var statement = returnStatements_1[_i];
-                _loop_21(statement);
+                _loop_11(statement);
             }
         }
         function getReturnStatementsWithPromiseHandlers(body) {
@@ -111542,8 +113541,8 @@ var ts;
                         if (innerCbBody.length > 0) {
                             return innerCbBody;
                         }
-                        var type_6 = transformer.checker.getTypeAtLocation(func);
-                        var returnType_1 = getLastCallSignature(type_6, transformer.checker).getReturnType();
+                        var type_1 = transformer.checker.getTypeAtLocation(func);
+                        var returnType_1 = getLastCallSignature(type_1, transformer.checker).getReturnType();
                         var rightHandSide = ts.getSynthesizedDeepClone(funcBody);
                         var possiblyAwaitedRightHandSide = !!transformer.checker.getPromisedTypeOfPromise(returnType_1) ? ts.createAwait(rightHandSide) : rightHandSide;
                         if (!shouldReturn) {
@@ -112869,7 +114868,7 @@ var ts;
                     });
                     typeDeclToMembers.forEach(function (infos, classDeclaration) {
                         var supers = getAllSupers(classDeclaration, checker);
-                        var _loop_22 = function (info) {
+                        var _loop_12 = function (info) {
                             // If some superclass added this property, don't add it again.
                             if (supers.some(function (superClassOrInterface) {
                                 var superInfos = typeDeclToMembers.get(superClassOrInterface);
@@ -112896,7 +114895,7 @@ var ts;
                         };
                         for (var _i = 0, infos_1 = infos; _i < infos_1.length; _i++) {
                             var info = infos_1[_i];
-                            _loop_22(info);
+                            _loop_12(info);
                         }
                     });
                 }));
@@ -113862,7 +115861,7 @@ var ts;
                 var typeNode = info.typeNode, type = info.type;
                 var original = typeNode.getText(sourceFile);
                 var actions = [fix(type, fixIdPlain, ts.Diagnostics.Change_all_jsdoc_style_types_to_TypeScript)];
-                if (typeNode.kind === 286 /* JSDocNullableType */) {
+                if (typeNode.kind === 291 /* JSDocNullableType */) {
                     // for nullable types, suggest the flow-compatible `T | null | undefined`
                     // in addition to the jsdoc/closure-compatible `T | null`
                     actions.push(fix(checker.getNullableType(type, 32768 /* Undefined */), fixIdNullable, ts.Diagnostics.Change_all_jsdoc_style_types_to_TypeScript_and_add_undefined_to_nullable_types));
@@ -113882,7 +115881,7 @@ var ts;
                     if (!info)
                         return;
                     var typeNode = info.typeNode, type = info.type;
-                    var fixedType = typeNode.kind === 286 /* JSDocNullableType */ && fixId === fixIdNullable ? checker.getNullableType(type, 32768 /* Undefined */) : type;
+                    var fixedType = typeNode.kind === 291 /* JSDocNullableType */ && fixId === fixIdNullable ? checker.getNullableType(type, 32768 /* Undefined */) : type;
                     doChange(changes, sourceFile, typeNode, fixedType, checker);
                 });
             }
@@ -114131,8 +116130,8 @@ var ts;
                         outputMethod(signature, modifiers, name, createStubbedMethodBody(preferences));
                         break;
                     }
-                    for (var _i = 0, signatures_7 = signatures; _i < signatures_7.length; _i++) {
-                        var signature = signatures_7[_i];
+                    for (var _i = 0, signatures_1 = signatures; _i < signatures_1.length; _i++) {
+                        var signature = signatures_1[_i];
                         // Need to ensure nodes are fresh each time so they can have different positions.
                         outputMethod(signature, ts.getSynthesizedDeepClones(modifiers, /*includeTrivia*/ false), ts.getSynthesizedDeepClone(name, /*includeTrivia*/ false));
                     }
@@ -114179,7 +116178,7 @@ var ts;
                     ts.isPropertyAccessExpression(arg) ? arg.name.text : undefined;
             });
             var contextualType = checker.getContextualType(call);
-            var returnType = inJs ? undefined : contextualType && checker.typeToTypeNode(contextualType, contextNode, /*flags*/ undefined, tracker) || ts.createKeywordTypeNode(120 /* AnyKeyword */);
+            var returnType = (inJs || !contextualType) ? undefined : checker.typeToTypeNode(contextualType, contextNode, /*flags*/ undefined, tracker);
             return ts.createMethod(
             /*decorators*/ undefined, 
             /*modifiers*/ makeStatic ? [ts.createToken(116 /* StaticKeyword */)] : undefined, 
@@ -114215,8 +116214,8 @@ var ts;
             var maxArgsSignature = signatures[0];
             var minArgumentCount = signatures[0].minArgumentCount;
             var someSigHasRestParameter = false;
-            for (var _i = 0, signatures_8 = signatures; _i < signatures_8.length; _i++) {
-                var sig = signatures_8[_i];
+            for (var _i = 0, signatures_2 = signatures; _i < signatures_2.length; _i++) {
+                var sig = signatures_2[_i];
                 minArgumentCount = Math.min(sig.minArgumentCount, minArgumentCount);
                 if (sig.hasRestParameter) {
                     someSigHasRestParameter = true;
@@ -114375,8 +116374,8 @@ var ts;
                 ts.addRange(fixes, getCodeFixesForImportDeclaration(context, relatedImport));
             }
             if (ts.isExpression(expr) && !(ts.isNamedDeclaration(expr.parent) && expr.parent.name === expr)) {
-                var sourceFile_3 = context.sourceFile;
-                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return t.replaceNode(sourceFile_3, expr, ts.createPropertyAccess(expr, "default"), {}); });
+                var sourceFile_1 = context.sourceFile;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return t.replaceNode(sourceFile_1, expr, ts.createPropertyAccess(expr, "default"), {}); });
                 fixes.push(codefix.createCodeFixActionNoFixId(fixName, changes, ts.Diagnostics.Use_synthetic_default_member));
             }
             return fixes;
@@ -114514,6 +116513,7 @@ var ts;
         return ts.textChanges.getNewFileText(toStatements(valueInfo, outputKind), 3 /* TS */, formatSettings.newLineCharacter || "\n", ts.formatting.getFormatContext(formatSettings));
     }
     ts.valueInfoToDeclarationFileText = valueInfoToDeclarationFileText;
+    /* @internal */
     var OutputKind;
     (function (OutputKind) {
         OutputKind[OutputKind["ExportEquals"] = 0] = "ExportEquals";
@@ -114648,16 +116648,16 @@ var ts;
         }
     }
     function toPropertyName(name) {
-        return ts.isIdentifierText(name, 6 /* ESNext */) ? ts.createIdentifier(name) : ts.createStringLiteral(name);
+        return ts.isIdentifierText(name, 7 /* ESNext */) ? ts.createIdentifier(name) : ts.createStringLiteral(name);
     }
     // Parses assignments to "this.x" in the constructor into class property declarations
     function getConstructorFunctionInstanceProperties(fnAst, members) {
         forEachOwnNodeOfFunction(fnAst, function (node) {
             if (ts.isAssignmentExpression(node, /*excludeCompoundAssignment*/ true) &&
                 ts.isPropertyAccessExpression(node.left) && node.left.expression.kind === 100 /* ThisKeyword */) {
-                var name_7 = node.left.name.text;
-                if (!ts.isJsPrivate(name_7)) {
-                    ts.getOrUpdate(members, name_7, function () { return ts.createProperty(/*decorators*/ undefined, /*modifiers*/ undefined, name_7, /*questionOrExclamationToken*/ undefined, anyType(), /*initializer*/ undefined); });
+                var name_4 = node.left.name.text;
+                if (!ts.isJsPrivate(name_4)) {
+                    ts.getOrUpdate(members, name_4, function () { return ts.createProperty(/*decorators*/ undefined, /*modifiers*/ undefined, name_4, /*questionOrExclamationToken*/ undefined, anyType(), /*initializer*/ undefined); });
                 }
             }
         });
@@ -114692,7 +116692,7 @@ var ts;
     }
     function parseExpression(expr) {
         var text = "const _ = " + expr;
-        var srcFile = ts.createSourceFile("test.ts", text, 6 /* Latest */, /*setParentNodes*/ true);
+        var srcFile = ts.createSourceFile("test.ts", text, 7 /* Latest */, /*setParentNodes*/ true);
         return ts.first(ts.cast(ts.first(srcFile.statements), ts.isVariableStatement).declarationList.declarations).initializer;
     }
     function inferParameterType(_fn, _param) {
@@ -114709,7 +116709,7 @@ var ts;
     }
     function isValidIdentifier(name) {
         var keyword = ts.stringToToken(name);
-        return !(keyword && ts.isNonContextualKeyword(keyword)) && ts.isIdentifierText(name, 6 /* ESNext */);
+        return !(keyword && ts.isNonContextualKeyword(keyword)) && ts.isIdentifierText(name, 7 /* ESNext */);
     }
     function addComment(node, comment) {
         if (comment !== undefined)
@@ -115164,7 +117164,7 @@ var ts;
         function doChangeNamedToNamespace(sourceFile, checker, changes, toConvert) {
             var importDecl = toConvert.parent.parent;
             var moduleSpecifier = importDecl.moduleSpecifier;
-            var preferredName = moduleSpecifier && ts.isStringLiteral(moduleSpecifier) ? ts.codefix.moduleSpecifierToValidIdentifier(moduleSpecifier.text, 6 /* ESNext */) : "module";
+            var preferredName = moduleSpecifier && ts.isStringLiteral(moduleSpecifier) ? ts.codefix.moduleSpecifierToValidIdentifier(moduleSpecifier.text, 7 /* ESNext */) : "module";
             var namespaceNameConflicts = toConvert.elements.some(function (element) {
                 return ts.FindAllReferences.Core.eachSymbolReferenceInFile(element.name, checker, sourceFile, function (id) {
                     return !!checker.resolveName(preferredName, id, 67108863 /* All */, /*excludeGlobals*/ true);
@@ -115172,7 +117172,7 @@ var ts;
             });
             var namespaceImportName = namespaceNameConflicts ? ts.getUniqueName(preferredName, sourceFile) : preferredName;
             var neededNamedImports = [];
-            var _loop_23 = function (element) {
+            var _loop_13 = function (element) {
                 var propertyName = (element.propertyName || element.name).text;
                 ts.FindAllReferences.Core.eachSymbolReferenceInFile(element.name, checker, sourceFile, function (id) {
                     var access = ts.createPropertyAccess(ts.createIdentifier(namespaceImportName), propertyName);
@@ -115191,7 +117191,7 @@ var ts;
             };
             for (var _i = 0, _a = toConvert.elements; _i < _a.length; _i++) {
                 var element = _a[_i];
-                _loop_23(element);
+                _loop_13(element);
             }
             changes.replaceNode(sourceFile, toConvert, ts.createNamespaceImport(ts.createIdentifier(namespaceImportName)));
             if (neededNamedImports.length) {
@@ -115681,7 +117681,7 @@ var ts;
                     //  * Module/namespace or source file
                     if (isScope(current)) {
                         scopes.push(current);
-                        if (current.kind === 279 /* SourceFile */) {
+                        if (current.kind === 284 /* SourceFile */) {
                             return scopes;
                         }
                     }
@@ -116246,8 +118246,8 @@ var ts;
                 ts.Debug.assert(members.length > 0); // There must be at least one child, since we extracted from one.
                 var prevMember;
                 var allProperties = true;
-                for (var _i = 0, members_7 = members; _i < members_7.length; _i++) {
-                    var member = members_7[_i];
+                for (var _i = 0, members_2 = members; _i < members_2.length; _i++) {
+                    var member = members_2[_i];
                     if (member.pos > maxPos) {
                         return prevMember || members[0];
                     }
@@ -116421,7 +118421,7 @@ var ts;
                         : ts.getEnclosingBlockScopeContainer(scopes[0]);
                     ts.forEachChild(containingLexicalScopeOfExtraction, checkForUsedDeclarations);
                 }
-                var _loop_24 = function (i) {
+                var _loop_14 = function (i) {
                     var scopeUsages = usagesPerScope[i];
                     // Special case: in the innermost scope, all usages are available.
                     // (The computed value reflects the value at the top-level of the scope, but the
@@ -116461,7 +118461,7 @@ var ts;
                     }
                 };
                 for (var i = 0; i < scopes.length; i++) {
-                    _loop_24(i);
+                    _loop_14(i);
                 }
                 return { target: target, usagesPerScope: usagesPerScope, functionErrorsPerScope: functionErrorsPerScope, constantErrorsPerScope: constantErrorsPerScope, exposedVariableDeclarations: exposedVariableDeclarations };
                 function isInGenericContext(node) {
@@ -116695,7 +118695,7 @@ var ts;
             function isBlockLike(node) {
                 switch (node.kind) {
                     case 218 /* Block */:
-                    case 279 /* SourceFile */:
+                    case 284 /* SourceFile */:
                     case 245 /* ModuleBlock */:
                     case 271 /* CaseClause */:
                         return true;
@@ -117012,10 +119012,10 @@ var ts;
         }
         function updateImportsInOtherFiles(changes, program, oldFile, movedSymbols, newModuleName) {
             var checker = program.getTypeChecker();
-            var _loop_25 = function (sourceFile) {
+            var _loop_15 = function (sourceFile) {
                 if (sourceFile === oldFile)
                     return "continue";
-                var _loop_26 = function (statement) {
+                var _loop_16 = function (statement) {
                     forEachImportInStatement(statement, function (importNode) {
                         if (checker.getSymbolAtLocation(moduleSpecifierFromImport(importNode)) !== oldFile.symbol)
                             return;
@@ -117037,12 +119037,12 @@ var ts;
                 };
                 for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
                     var statement = _a[_i];
-                    _loop_26(statement);
+                    _loop_16(statement);
                 }
             };
             for (var _i = 0, _a = program.getSourceFiles(); _i < _a.length; _i++) {
                 var sourceFile = _a[_i];
-                _loop_25(sourceFile);
+                _loop_15(sourceFile);
             }
         }
         function getNamespaceLikeImport(node) {
@@ -117059,7 +119059,7 @@ var ts;
             }
         }
         function updateNamespaceLikeImport(changes, sourceFile, checker, movedSymbols, newModuleName, newModuleSpecifier, oldImportId, oldImportNode) {
-            var preferredNewNamespaceName = ts.codefix.moduleSpecifierToValidIdentifier(newModuleName, 6 /* ESNext */);
+            var preferredNewNamespaceName = ts.codefix.moduleSpecifierToValidIdentifier(newModuleName, 7 /* ESNext */);
             var needUniqueName = false;
             var toChange = [];
             ts.FindAllReferences.Core.eachSymbolReferenceInFile(oldImportId, checker, sourceFile, function (ref) {
@@ -117157,9 +119157,9 @@ var ts;
                 if (isTopLevelDeclarationStatement(statement) &&
                     !isExported(sourceFile, statement, useEs6Exports) &&
                     forEachTopLevelDeclaration(statement, function (d) { return needExport.has(ts.Debug.assertDefined(d.symbol)); })) {
-                    var exports_2 = addExport(statement, useEs6Exports);
-                    if (exports_2)
-                        return exports_2;
+                    var exports = addExport(statement, useEs6Exports);
+                    if (exports)
+                        return exports;
                 }
                 return statement;
             });
@@ -117285,7 +119285,7 @@ var ts;
             var movedSymbols = new SymbolSet();
             var oldImportsNeededByNewFile = new SymbolSet();
             var newFileImportsFromOldFile = new SymbolSet();
-            var containsJsx = ts.find(toMove, function (statement) { return !!(statement.transformFlags & 4 /* ContainsJsx */); });
+            var containsJsx = ts.find(toMove, function (statement) { return !!(statement.transformFlags & 2 /* ContainsJsx */); });
             var jsxNamespaceSymbol = getJsxNamespaceSymbol(containsJsx);
             if (jsxNamespaceSymbol) { // Might not exist (e.g. in non-compiling code)
                 oldImportsNeededByNewFile.add(jsxNamespaceSymbol);
@@ -117319,7 +119319,7 @@ var ts;
                 if (ts.contains(toMove, statement))
                     continue;
                 // jsxNamespaceSymbol will only be set iff it is in oldImportsNeededByNewFile.
-                if (jsxNamespaceSymbol && !!(statement.transformFlags & 4 /* ContainsJsx */)) {
+                if (jsxNamespaceSymbol && !!(statement.transformFlags & 2 /* ContainsJsx */)) {
                     unusedImportsFromOldFile.delete(jsxNamespaceSymbol);
                 }
                 forEachReference(statement, checker, function (symbol) {
@@ -117634,13 +119634,13 @@ var ts;
                     var returnStatement_1 = ts.createReturn(expression);
                     body = ts.createBlock([returnStatement_1], /* multiLine */ true);
                     ts.suppressLeadingAndTrailingTrivia(body);
-                    ts.copyComments(expression, returnStatement_1, file, 3 /* MultiLineCommentTrivia */, /* hasTrailingNewLine */ true);
+                    ts.copyLeadingComments(expression, returnStatement_1, file, 3 /* MultiLineCommentTrivia */, /* hasTrailingNewLine */ true);
                 }
                 else if (actionName === removeBracesActionName && returnStatement) {
                     var actualExpression = expression || ts.createVoidZero();
                     body = needsParentheses(actualExpression) ? ts.createParen(actualExpression) : actualExpression;
                     ts.suppressLeadingAndTrailingTrivia(body);
-                    ts.copyComments(returnStatement, body, file, 3 /* MultiLineCommentTrivia */, /* hasTrailingNewLine */ false);
+                    ts.copyLeadingComments(returnStatement, body, file, 3 /* MultiLineCommentTrivia */, /* hasTrailingNewLine */ false);
                 }
                 else {
                     ts.Debug.fail("invalid action");
@@ -117679,6 +119679,459 @@ var ts;
         })(addOrRemoveBracesToArrowFunction = refactor.addOrRemoveBracesToArrowFunction || (refactor.addOrRemoveBracesToArrowFunction = {}));
     })(refactor = ts.refactor || (ts.refactor = {}));
 })(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var refactor;
+    (function (refactor) {
+        var convertParamsToDestructuredObject;
+        (function (convertParamsToDestructuredObject) {
+            var refactorName = "Convert parameters to destructured object";
+            var minimumParameterLength = 2;
+            refactor.registerRefactor(refactorName, { getEditsForAction: getEditsForAction, getAvailableActions: getAvailableActions });
+            function getAvailableActions(context) {
+                var file = context.file, startPosition = context.startPosition;
+                var isJSFile = ts.isSourceFileJS(file);
+                if (isJSFile)
+                    return ts.emptyArray; // TODO: GH#30113
+                var functionDeclaration = getFunctionDeclarationAtPosition(file, startPosition, context.program.getTypeChecker());
+                if (!functionDeclaration)
+                    return ts.emptyArray;
+                var description = ts.getLocaleSpecificMessage(ts.Diagnostics.Convert_parameters_to_destructured_object);
+                return [{
+                        name: refactorName,
+                        description: description,
+                        actions: [{
+                                name: refactorName,
+                                description: description
+                            }]
+                    }];
+            }
+            function getEditsForAction(context, actionName) {
+                ts.Debug.assert(actionName === refactorName);
+                var file = context.file, startPosition = context.startPosition, program = context.program, cancellationToken = context.cancellationToken, host = context.host;
+                var functionDeclaration = getFunctionDeclarationAtPosition(file, startPosition, program.getTypeChecker());
+                if (!functionDeclaration || !cancellationToken)
+                    return undefined;
+                var groupedReferences = getGroupedReferences(functionDeclaration, program, cancellationToken);
+                if (groupedReferences.valid) {
+                    var edits = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(file, program, host, t, functionDeclaration, groupedReferences); });
+                    return { renameFilename: undefined, renameLocation: undefined, edits: edits };
+                }
+                return { edits: [] }; // TODO: GH#30113
+            }
+            function doChange(sourceFile, program, host, changes, functionDeclaration, groupedReferences) {
+                var newParamDeclaration = ts.map(createNewParameters(functionDeclaration, program, host), function (param) { return ts.getSynthesizedDeepClone(param); });
+                changes.replaceNodeRangeWithNodes(sourceFile, ts.first(functionDeclaration.parameters), ts.last(functionDeclaration.parameters), newParamDeclaration, { joiner: ", ",
+                    // indentation is set to 0 because otherwise the object parameter will be indented if there is a `this` parameter
+                    indentation: 0,
+                    leadingTriviaOption: ts.textChanges.LeadingTriviaOption.IncludeAll,
+                    trailingTriviaOption: ts.textChanges.TrailingTriviaOption.Include
+                });
+                var functionCalls = ts.sortAndDeduplicate(groupedReferences.functionCalls, /*comparer*/ function (a, b) { return ts.compareValues(a.pos, b.pos); });
+                for (var _i = 0, functionCalls_1 = functionCalls; _i < functionCalls_1.length; _i++) {
+                    var call = functionCalls_1[_i];
+                    if (call.arguments && call.arguments.length) {
+                        var newArgument = ts.getSynthesizedDeepClone(createNewArgument(functionDeclaration, call.arguments), /*includeTrivia*/ true);
+                        changes.replaceNodeRange(ts.getSourceFileOfNode(call), ts.first(call.arguments), ts.last(call.arguments), newArgument, { leadingTriviaOption: ts.textChanges.LeadingTriviaOption.IncludeAll, trailingTriviaOption: ts.textChanges.TrailingTriviaOption.Include });
+                    }
+                }
+            }
+            function getGroupedReferences(functionDeclaration, program, cancellationToken) {
+                var functionNames = getFunctionNames(functionDeclaration);
+                var classNames = ts.isConstructorDeclaration(functionDeclaration) ? getClassNames(functionDeclaration) : [];
+                var names = ts.deduplicate(functionNames.concat(classNames), ts.equateValues);
+                var checker = program.getTypeChecker();
+                var references = ts.flatMap(names, /*mapfn*/ function (/*mapfn*/ name) { return ts.FindAllReferences.getReferenceEntriesForNode(-1, name, program, program.getSourceFiles(), cancellationToken); });
+                var groupedReferences = groupReferences(references);
+                if (!ts.every(groupedReferences.declarations, /*callback*/ function (/*callback*/ decl) { return ts.contains(names, decl); })) {
+                    groupedReferences.valid = false;
+                }
+                return groupedReferences;
+                function groupReferences(referenceEntries) {
+                    var classReferences = { accessExpressions: [], typeUsages: [] };
+                    var groupedReferences = { functionCalls: [], declarations: [], classReferences: classReferences, valid: true };
+                    var functionSymbols = ts.map(functionNames, checker.getSymbolAtLocation);
+                    var classSymbols = ts.map(classNames, checker.getSymbolAtLocation);
+                    var isConstructor = ts.isConstructorDeclaration(functionDeclaration);
+                    for (var _i = 0, referenceEntries_1 = referenceEntries; _i < referenceEntries_1.length; _i++) {
+                        var entry = referenceEntries_1[_i];
+                        if (entry.kind !== 1 /* Node */) {
+                            groupedReferences.valid = false;
+                            continue;
+                        }
+                        /* We compare symbols because in some cases find all references wil return a reference that may or may not be to the refactored function.
+                        Example from the refactorConvertParamsToDestructuredObject_methodCallUnion.ts test:
+                            class A { foo(a: number, b: number) { return a + b; } }
+                            class B { foo(c: number, d: number) { return c + d; } }
+                            declare const ab: A | B;
+                            ab.foo(1, 2);
+                        Find all references will return `ab.foo(1, 2)` as a reference to A's `foo` but we could be calling B's `foo`.
+                        When looking for constructor calls, however, the symbol on the constructor call reference is going to be the corresponding class symbol.
+                        So we need to add a special case for this because when calling a constructor of a class through one of its subclasses,
+                        the symbols are going to be different.
+                        */
+                        if (ts.contains(functionSymbols, checker.getSymbolAtLocation(entry.node), symbolComparer) || ts.isNewExpressionTarget(entry.node)) {
+                            var decl = entryToDeclaration(entry);
+                            if (decl) {
+                                groupedReferences.declarations.push(decl);
+                                continue;
+                            }
+                            var call = entryToFunctionCall(entry);
+                            if (call) {
+                                groupedReferences.functionCalls.push(call);
+                                continue;
+                            }
+                        }
+                        // if the refactored function is a constructor, we must also check if the references to its class are valid
+                        if (isConstructor && ts.contains(classSymbols, checker.getSymbolAtLocation(entry.node), symbolComparer)) {
+                            var decl = entryToDeclaration(entry);
+                            if (decl) {
+                                groupedReferences.declarations.push(decl);
+                                continue;
+                            }
+                            var accessExpression = entryToAccessExpression(entry);
+                            if (accessExpression) {
+                                classReferences.accessExpressions.push(accessExpression);
+                                continue;
+                            }
+                            // Only class declarations are allowed to be used as a type (in a heritage clause),
+                            // otherwise `findAllReferences` might not be able to track constructor calls.
+                            if (ts.isClassDeclaration(functionDeclaration.parent)) {
+                                var type = entryToType(entry);
+                                if (type) {
+                                    classReferences.typeUsages.push(type);
+                                    continue;
+                                }
+                            }
+                        }
+                        groupedReferences.valid = false;
+                    }
+                    return groupedReferences;
+                }
+            }
+            function symbolComparer(a, b) {
+                return ts.getSymbolTarget(a) === ts.getSymbolTarget(b);
+            }
+            function entryToDeclaration(entry) {
+                if (ts.isDeclaration(entry.node.parent)) {
+                    return entry.node;
+                }
+                return undefined;
+            }
+            function entryToFunctionCall(entry) {
+                if (entry.node.parent) {
+                    var functionReference = entry.node;
+                    var parent = functionReference.parent;
+                    switch (parent.kind) {
+                        // Function call (foo(...) or super(...))
+                        case 191 /* CallExpression */:
+                            var callExpression = ts.tryCast(parent, ts.isCallExpression);
+                            if (callExpression && callExpression.expression === functionReference) {
+                                return callExpression;
+                            }
+                            break;
+                        // Constructor call (new Foo(...))
+                        case 192 /* NewExpression */:
+                            var newExpression = ts.tryCast(parent, ts.isNewExpression);
+                            if (newExpression && newExpression.expression === functionReference) {
+                                return newExpression;
+                            }
+                            break;
+                        // Method call (x.foo(...))
+                        case 189 /* PropertyAccessExpression */:
+                            var propertyAccessExpression = ts.tryCast(parent, ts.isPropertyAccessExpression);
+                            if (propertyAccessExpression && propertyAccessExpression.parent && propertyAccessExpression.name === functionReference) {
+                                var callExpression_1 = ts.tryCast(propertyAccessExpression.parent, ts.isCallExpression);
+                                if (callExpression_1 && callExpression_1.expression === propertyAccessExpression) {
+                                    return callExpression_1;
+                                }
+                            }
+                            break;
+                        // Method call (x["foo"](...))
+                        case 190 /* ElementAccessExpression */:
+                            var elementAccessExpression = ts.tryCast(parent, ts.isElementAccessExpression);
+                            if (elementAccessExpression && elementAccessExpression.parent && elementAccessExpression.argumentExpression === functionReference) {
+                                var callExpression_2 = ts.tryCast(elementAccessExpression.parent, ts.isCallExpression);
+                                if (callExpression_2 && callExpression_2.expression === elementAccessExpression) {
+                                    return callExpression_2;
+                                }
+                            }
+                            break;
+                    }
+                }
+                return undefined;
+            }
+            function entryToAccessExpression(entry) {
+                if (entry.node.parent) {
+                    var reference = entry.node;
+                    var parent = reference.parent;
+                    switch (parent.kind) {
+                        // `C.foo`
+                        case 189 /* PropertyAccessExpression */:
+                            var propertyAccessExpression = ts.tryCast(parent, ts.isPropertyAccessExpression);
+                            if (propertyAccessExpression && propertyAccessExpression.expression === reference) {
+                                return propertyAccessExpression;
+                            }
+                            break;
+                        // `C["foo"]`
+                        case 190 /* ElementAccessExpression */:
+                            var elementAccessExpression = ts.tryCast(parent, ts.isElementAccessExpression);
+                            if (elementAccessExpression && elementAccessExpression.expression === reference) {
+                                return elementAccessExpression;
+                            }
+                            break;
+                    }
+                }
+                return undefined;
+            }
+            function entryToType(entry) {
+                var reference = entry.node;
+                if (ts.getMeaningFromLocation(reference) === 2 /* Type */ || ts.isExpressionWithTypeArgumentsInClassExtendsClause(reference.parent)) {
+                    return reference;
+                }
+                return undefined;
+            }
+            function getFunctionDeclarationAtPosition(file, startPosition, checker) {
+                var node = ts.getTouchingToken(file, startPosition);
+                var functionDeclaration = ts.getContainingFunction(node);
+                // don't offer refactor on top-level JSDoc
+                if (isTopLevelJSDoc(node))
+                    return undefined;
+                if (functionDeclaration
+                    && isValidFunctionDeclaration(functionDeclaration, checker)
+                    && ts.rangeContainsRange(functionDeclaration, node)
+                    && !(functionDeclaration.body && ts.rangeContainsRange(functionDeclaration.body, node)))
+                    return functionDeclaration;
+                return undefined;
+            }
+            function isTopLevelJSDoc(node) {
+                var containingJSDoc = ts.findAncestor(node, ts.isJSDocNode);
+                if (containingJSDoc) {
+                    var containingNonJSDoc = ts.findAncestor(containingJSDoc, function (n) { return !ts.isJSDocNode(n); });
+                    return !!containingNonJSDoc && ts.isFunctionLikeDeclaration(containingNonJSDoc);
+                }
+                return false;
+            }
+            function isValidFunctionDeclaration(functionDeclaration, checker) {
+                if (!isValidParameterNodeArray(functionDeclaration.parameters, checker))
+                    return false;
+                switch (functionDeclaration.kind) {
+                    case 239 /* FunctionDeclaration */:
+                    case 156 /* MethodDeclaration */:
+                        return !!functionDeclaration.name
+                            && !!functionDeclaration.body
+                            && !checker.isImplementationOfOverload(functionDeclaration);
+                    case 157 /* Constructor */:
+                        if (ts.isClassDeclaration(functionDeclaration.parent)) {
+                            return !!functionDeclaration.body
+                                && !!functionDeclaration.parent.name
+                                && !checker.isImplementationOfOverload(functionDeclaration);
+                        }
+                        else {
+                            return isValidVariableDeclaration(functionDeclaration.parent.parent)
+                                && !!functionDeclaration.body
+                                && !checker.isImplementationOfOverload(functionDeclaration);
+                        }
+                    case 196 /* FunctionExpression */:
+                    case 197 /* ArrowFunction */:
+                        return isValidVariableDeclaration(functionDeclaration.parent);
+                }
+                return false;
+            }
+            function isValidParameterNodeArray(parameters, checker) {
+                return getRefactorableParametersLength(parameters) >= minimumParameterLength
+                    && ts.every(parameters, /*callback*/ function (/*callback*/ paramDecl) { return isValidParameterDeclaration(paramDecl, checker); });
+            }
+            function isValidParameterDeclaration(parameterDeclaration, checker) {
+                if (ts.isRestParameter(parameterDeclaration)) {
+                    var type = checker.getTypeAtLocation(parameterDeclaration);
+                    if (!checker.isArrayType(type) && !checker.isTupleType(type))
+                        return false;
+                }
+                return !parameterDeclaration.modifiers && !parameterDeclaration.decorators && ts.isIdentifier(parameterDeclaration.name);
+            }
+            function isValidVariableDeclaration(node) {
+                return ts.isVariableDeclaration(node) && ts.isVarConst(node) && ts.isIdentifier(node.name) && !node.type; // TODO: GH#30113
+            }
+            function hasThisParameter(parameters) {
+                return parameters.length > 0 && ts.isThis(parameters[0].name);
+            }
+            function getRefactorableParametersLength(parameters) {
+                if (hasThisParameter(parameters)) {
+                    return parameters.length - 1;
+                }
+                return parameters.length;
+            }
+            function getRefactorableParameters(parameters) {
+                if (hasThisParameter(parameters)) {
+                    parameters = ts.createNodeArray(parameters.slice(1), parameters.hasTrailingComma);
+                }
+                return parameters;
+            }
+            function createPropertyOrShorthandAssignment(name, initializer) {
+                if (ts.isIdentifier(initializer) && ts.getTextOfIdentifierOrLiteral(initializer) === name) {
+                    return ts.createShorthandPropertyAssignment(name);
+                }
+                return ts.createPropertyAssignment(name, initializer);
+            }
+            function createNewArgument(functionDeclaration, functionArguments) {
+                var parameters = getRefactorableParameters(functionDeclaration.parameters);
+                var hasRestParameter = ts.isRestParameter(ts.last(parameters));
+                var nonRestArguments = hasRestParameter ? functionArguments.slice(0, parameters.length - 1) : functionArguments;
+                var properties = ts.map(nonRestArguments, function (arg, i) {
+                    var parameterName = getParameterName(parameters[i]);
+                    var property = createPropertyOrShorthandAssignment(parameterName, arg);
+                    ts.suppressLeadingAndTrailingTrivia(property.name);
+                    if (ts.isPropertyAssignment(property))
+                        ts.suppressLeadingAndTrailingTrivia(property.initializer);
+                    copyComments(arg, property);
+                    return property;
+                });
+                if (hasRestParameter && functionArguments.length >= parameters.length) {
+                    var restArguments = functionArguments.slice(parameters.length - 1);
+                    var restProperty = ts.createPropertyAssignment(getParameterName(ts.last(parameters)), ts.createArrayLiteral(restArguments));
+                    properties.push(restProperty);
+                }
+                var objectLiteral = ts.createObjectLiteral(properties, /*multiLine*/ false);
+                return objectLiteral;
+            }
+            function createNewParameters(functionDeclaration, program, host) {
+                var checker = program.getTypeChecker();
+                var refactorableParameters = getRefactorableParameters(functionDeclaration.parameters);
+                var bindingElements = ts.map(refactorableParameters, createBindingElementFromParameterDeclaration);
+                var objectParameterName = ts.createObjectBindingPattern(bindingElements);
+                var objectParameterType = createParameterTypeNode(refactorableParameters);
+                var objectInitializer;
+                // If every parameter in the original function was optional, add an empty object initializer to the new object parameter
+                if (ts.every(refactorableParameters, isOptionalParameter)) {
+                    objectInitializer = ts.createObjectLiteral();
+                }
+                var objectParameter = ts.createParameter(
+                /*decorators*/ undefined, 
+                /*modifiers*/ undefined, 
+                /*dotDotDotToken*/ undefined, objectParameterName, 
+                /*questionToken*/ undefined, objectParameterType, objectInitializer);
+                if (hasThisParameter(functionDeclaration.parameters)) {
+                    var thisParameter = functionDeclaration.parameters[0];
+                    var newThisParameter = ts.createParameter(
+                    /*decorators*/ undefined, 
+                    /*modifiers*/ undefined, 
+                    /*dotDotDotToken*/ undefined, thisParameter.name, 
+                    /*questionToken*/ undefined, thisParameter.type);
+                    ts.suppressLeadingAndTrailingTrivia(newThisParameter.name);
+                    copyComments(thisParameter.name, newThisParameter.name);
+                    if (thisParameter.type) {
+                        ts.suppressLeadingAndTrailingTrivia(newThisParameter.type);
+                        copyComments(thisParameter.type, newThisParameter.type);
+                    }
+                    return ts.createNodeArray([newThisParameter, objectParameter]);
+                }
+                return ts.createNodeArray([objectParameter]);
+                function createBindingElementFromParameterDeclaration(parameterDeclaration) {
+                    var element = ts.createBindingElement(
+                    /*dotDotDotToken*/ undefined, 
+                    /*propertyName*/ undefined, getParameterName(parameterDeclaration), ts.isRestParameter(parameterDeclaration) && isOptionalParameter(parameterDeclaration) ? ts.createArrayLiteral() : parameterDeclaration.initializer);
+                    ts.suppressLeadingAndTrailingTrivia(element);
+                    if (parameterDeclaration.initializer && element.initializer) {
+                        copyComments(parameterDeclaration.initializer, element.initializer);
+                    }
+                    return element;
+                }
+                function createParameterTypeNode(parameters) {
+                    var members = ts.map(parameters, createPropertySignatureFromParameterDeclaration);
+                    var typeNode = ts.addEmitFlags(ts.createTypeLiteralNode(members), 1 /* SingleLine */);
+                    return typeNode;
+                }
+                function createPropertySignatureFromParameterDeclaration(parameterDeclaration) {
+                    var parameterType = parameterDeclaration.type;
+                    if (!parameterType && (parameterDeclaration.initializer || ts.isRestParameter(parameterDeclaration))) {
+                        parameterType = getTypeNode(parameterDeclaration);
+                    }
+                    var propertySignature = ts.createPropertySignature(
+                    /*modifiers*/ undefined, getParameterName(parameterDeclaration), isOptionalParameter(parameterDeclaration) ? ts.createToken(56 /* QuestionToken */) : parameterDeclaration.questionToken, parameterType, 
+                    /*initializer*/ undefined);
+                    ts.suppressLeadingAndTrailingTrivia(propertySignature);
+                    copyComments(parameterDeclaration.name, propertySignature.name);
+                    if (parameterDeclaration.type && propertySignature.type) {
+                        copyComments(parameterDeclaration.type, propertySignature.type);
+                    }
+                    return propertySignature;
+                }
+                function getTypeNode(node) {
+                    var type = checker.getTypeAtLocation(node);
+                    return ts.getTypeNodeIfAccessible(type, node, program, host);
+                }
+                function isOptionalParameter(parameterDeclaration) {
+                    if (ts.isRestParameter(parameterDeclaration)) {
+                        var type = checker.getTypeAtLocation(parameterDeclaration);
+                        return !checker.isTupleType(type);
+                    }
+                    return checker.isOptionalParameter(parameterDeclaration);
+                }
+            }
+            function copyComments(sourceNode, targetNode) {
+                var sourceFile = sourceNode.getSourceFile();
+                var text = sourceFile.text;
+                if (hasLeadingLineBreak(sourceNode, text)) {
+                    ts.copyLeadingComments(sourceNode, targetNode, sourceFile);
+                }
+                else {
+                    ts.copyTrailingAsLeadingComments(sourceNode, targetNode, sourceFile);
+                }
+                ts.copyTrailingComments(sourceNode, targetNode, sourceFile);
+            }
+            function hasLeadingLineBreak(node, text) {
+                var start = node.getFullStart();
+                var end = node.getStart();
+                for (var i = start; i < end; i++) {
+                    if (text.charCodeAt(i) === 10 /* lineFeed */)
+                        return true;
+                }
+                return false;
+            }
+            function getParameterName(paramDeclaration) {
+                return ts.getTextOfIdentifierOrLiteral(paramDeclaration.name);
+            }
+            function getClassNames(constructorDeclaration) {
+                switch (constructorDeclaration.parent.kind) {
+                    case 240 /* ClassDeclaration */:
+                        var classDeclaration = constructorDeclaration.parent;
+                        return [classDeclaration.name];
+                    case 209 /* ClassExpression */:
+                        var classExpression = constructorDeclaration.parent;
+                        var variableDeclaration = constructorDeclaration.parent.parent;
+                        var className = classExpression.name;
+                        if (className)
+                            return [className, variableDeclaration.name];
+                        return [variableDeclaration.name];
+                }
+            }
+            function getFunctionNames(functionDeclaration) {
+                switch (functionDeclaration.kind) {
+                    case 239 /* FunctionDeclaration */:
+                    case 156 /* MethodDeclaration */:
+                        return [functionDeclaration.name];
+                    case 157 /* Constructor */:
+                        var ctrKeyword = ts.findChildOfKind(functionDeclaration, 124 /* ConstructorKeyword */, functionDeclaration.getSourceFile());
+                        if (functionDeclaration.parent.kind === 209 /* ClassExpression */) {
+                            var variableDeclaration = functionDeclaration.parent.parent;
+                            return [variableDeclaration.name, ctrKeyword];
+                        }
+                        return [ctrKeyword];
+                    case 197 /* ArrowFunction */:
+                        return [functionDeclaration.parent.name];
+                    case 196 /* FunctionExpression */:
+                        if (functionDeclaration.name)
+                            return [functionDeclaration.name, functionDeclaration.parent.name];
+                        return [functionDeclaration.parent.name];
+                    default:
+                        return ts.Debug.assertNever(functionDeclaration);
+                }
+            }
+        })(convertParamsToDestructuredObject = refactor.convertParamsToDestructuredObject || (refactor.convertParamsToDestructuredObject = {}));
+    })(refactor = ts.refactor || (ts.refactor = {}));
+})(ts || (ts = {}));
 var ts;
 (function (ts) {
     /** The version of the language service API */
@@ -117696,7 +120149,8 @@ var ts;
             this.pos = pos;
             this.end = end;
             this.flags = 0 /* None */;
-            this.transformFlags = undefined; // TODO: GH#18217
+            this.modifierFlagsCache = 0 /* None */;
+            this.transformFlags = 0 /* None */;
             this.parent = undefined;
             this.kind = kind;
         }
@@ -117758,7 +120212,7 @@ var ts;
             if (!children.length) {
                 return undefined;
             }
-            var child = ts.find(children, function (kid) { return kid.kind < 283 /* FirstJSDocNode */ || kid.kind > 305 /* LastJSDocNode */; });
+            var child = ts.find(children, function (kid) { return kid.kind < 288 /* FirstJSDocNode */ || kid.kind > 310 /* LastJSDocNode */; });
             return child.kind < 148 /* FirstNode */ ?
                 child :
                 child.getFirstToken(sourceFile);
@@ -117828,11 +120282,11 @@ var ts;
         }
     }
     function createSyntaxList(nodes, parent) {
-        var list = createNode(306 /* SyntaxList */, nodes.pos, nodes.end, parent);
+        var list = createNode(311 /* SyntaxList */, nodes.pos, nodes.end, parent);
         list._children = [];
         var pos = nodes.pos;
-        for (var _i = 0, nodes_7 = nodes; _i < nodes_7.length; _i++) {
-            var node = nodes_7[_i];
+        for (var _i = 0, nodes_1 = nodes; _i < nodes_1.length; _i++) {
+            var node = nodes_1[_i];
             addSyntheticNodes(list._children, pos, node.pos, parent);
             list._children.push(node);
             pos = node.end;
@@ -117846,6 +120300,8 @@ var ts;
             this.pos = pos;
             this.end = end;
             this.flags = 0 /* None */;
+            this.modifierFlagsCache = 0 /* None */;
+            this.transformFlags = 0 /* None */;
             this.parent = undefined;
         }
         TokenOrIdentifierObject.prototype.getSourceFile = function () {
@@ -118074,8 +120530,8 @@ var ts;
             return ts.emptyArray;
         var doc = ts.JsDoc.getJsDocCommentsFromDeclarations(declarations);
         if (doc.length === 0 || declarations.some(hasJSDocInheritDocTag)) {
-            for (var _i = 0, declarations_14 = declarations; _i < declarations_14.length; _i++) {
-                var declaration = declarations_14[_i];
+            for (var _i = 0, declarations_4 = declarations; _i < declarations_4.length; _i++) {
+                var declaration = declarations_4[_i];
                 var inheritedDocs = findInheritedJSDocComments(declaration, declaration.symbol.name, checker); // TODO: GH#18217
                 // TODO: GH#16312 Return a ReadonlyArray, avoid copying inheritedDocs
                 if (inheritedDocs)
@@ -118421,7 +120877,7 @@ var ts;
             var sourceFile;
             if (this.currentFileName !== fileName) {
                 // This is a new file, just parse it
-                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 6 /* Latest */, version, /*setNodeParents*/ true, scriptKind);
+                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 7 /* Latest */, version, /*setNodeParents*/ true, scriptKind);
             }
             else if (this.currentFileVersion !== version) {
                 // This is the same file, just a newer version. Incrementally parse the file.
@@ -118545,9 +121001,9 @@ var ts;
     }());
     ts.ThrottledCancellationToken = ThrottledCancellationToken;
     function createLanguageService(host, documentRegistry, syntaxOnly) {
+        var _a;
         if (documentRegistry === void 0) { documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory()); }
         if (syntaxOnly === void 0) { syntaxOnly = false; }
-        var _a;
         var syntaxTreeCache = new SyntaxTreeCache(host);
         var program;
         var lastProjectVersion;
@@ -118578,7 +121034,7 @@ var ts;
         function getValidSourceFile(fileName) {
             var sourceFile = program.getSourceFile(fileName);
             if (!sourceFile) {
-                throw new Error("Could not find file: '" + fileName + "'.");
+                throw new Error("Could not find sourceFile: '" + fileName + "' in " + (program && JSON.stringify(program.getSourceFiles().map(function (f) { return f.fileName; }))) + ".");
             }
             return sourceFile;
         }
@@ -118827,14 +121283,14 @@ var ts;
             var typeChecker = program.getTypeChecker();
             var symbol = getSymbolAtLocationForQuickInfo(node, typeChecker);
             if (!symbol || typeChecker.isUnknownSymbol(symbol)) {
-                var type_7 = shouldGetType(sourceFile, node, position) ? typeChecker.getTypeAtLocation(node) : undefined;
-                return type_7 && {
+                var type_2 = shouldGetType(sourceFile, node, position) ? typeChecker.getTypeAtLocation(node) : undefined;
+                return type_2 && {
                     kind: "" /* unknown */,
                     kindModifiers: "" /* none */,
                     textSpan: ts.createTextSpanFromNode(node, sourceFile),
-                    displayParts: typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) { return ts.typeToDisplayParts(typeChecker, type_7, ts.getContainerNode(node)); }),
-                    documentation: type_7.symbol ? type_7.symbol.getDocumentationComment(typeChecker) : undefined,
-                    tags: type_7.symbol ? type_7.symbol.getJsDocTags() : undefined
+                    displayParts: typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) { return ts.typeToDisplayParts(typeChecker, type_2, ts.getContainerNode(node)); }),
+                    documentation: type_2.symbol ? type_2.symbol.getDocumentationComment(typeChecker) : undefined,
+                    tags: type_2.symbol ? type_2.symbol.getJsDocTags() : undefined
                 };
             }
             var _a = typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) {
@@ -120945,4 +123401,6 @@ var TypeScript;
 // TODO: it should be moved into a namespace though.
 /* @internal */
 var toolsVersion = ts.versionMajorMinor;
-//# sourceMappingURL=typescriptServices.out.js.map
\ No newline at end of file
+
+
+//# sourceMappingURL=typescript.js.map
diff --git a/packages/schematics/schematics/blank/project-files/package.json.template b/packages/schematics/schematics/blank/project-files/package.json.template
index e1ebe4957f82..ca350c4d8679 100644
--- a/packages/schematics/schematics/blank/project-files/package.json.template
+++ b/packages/schematics/schematics/blank/project-files/package.json.template
@@ -18,6 +18,6 @@
     "@types/jasmine": "^3.3.9",
     "@types/node": "^8.0.31",
     "jasmine": "^3.3.1",
-    "typescript": "~3.2.2"
+    "typescript": "~3.4.3"
   }
 }
diff --git a/packages/schematics/schematics/schematic/files/package.json b/packages/schematics/schematics/schematic/files/package.json
index b41f04a1cd27..7db6a01326dd 100644
--- a/packages/schematics/schematics/schematic/files/package.json
+++ b/packages/schematics/schematics/schematic/files/package.json
@@ -18,6 +18,6 @@
     "@types/jasmine": "^3.3.9",
     "@types/node": "^8.0.31",
     "jasmine": "^3.3.1",
-    "typescript": "~3.3.3333"
+    "typescript": "3.4.3"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 89a71efa6f86..1ae285714a49 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9541,6 +9541,11 @@ typescript@3.3.4000:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.4000.tgz#76b0f89cfdbf97827e1112d64f283f1151d6adf0"
   integrity sha512-jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA==
 
+typescript@3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.3.tgz#0eb320e4ace9b10eadf5bc6103286b0f8b7c224f"
+  integrity sha512-FFgHdPt4T/duxx6Ndf7hwgMZZjZpB+U0nMNGVCYPq0rEzWKjEDobm4J6yb3CS7naZ0yURFqdw9Gwc7UOh/P9oQ==
+
 uglify-js@^3.1.4:
   version "3.4.9"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"

From b7dfdb86431277117280cb24cc28fc63a9d340e9 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Sat, 13 Apr 2019 13:55:18 +0100
Subject: [PATCH 1124/1703] build: update to Angular 8.0.0-beta.12

---
 package.json                                  |  4 +-
 .../angular_devkit/build_angular/package.json | 20 ++---
 .../build_ng_packagr/package.json             |  4 +-
 packages/ngtools/webpack/package.json         |  4 +-
 .../angular/utility/latest-versions.ts        |  8 +-
 yarn.lock                                     | 85 +++++++++----------
 6 files changed, 60 insertions(+), 65 deletions(-)

diff --git a/package.json b/package.json
index 727c6054b311..c1ee8c0c2f43 100644
--- a/package.json
+++ b/package.json
@@ -77,8 +77,8 @@
     "typescript": "3.4.3"
   },
   "devDependencies": {
-    "@angular/compiler": "^8.0.0-beta.11",
-    "@angular/compiler-cli": "^8.0.0-beta.11",
+    "@angular/compiler": "^8.0.0-beta.12",
+    "@angular/compiler-cli": "^8.0.0-beta.12",
     "@bazel/karma": "~0.26.0",
     "@bazel/typescript": "~0.26.0",
     "@ngtools/json-schema": "^1.1.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index da04648ec3ca..2721df0aec8b 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -58,18 +58,18 @@
     "worker-plugin": "3.1.0"
   },
   "devDependencies": {
-    "@angular/animations": "^8.0.0-beta.11",
+    "@angular/animations": "^8.0.0-beta.12",
     "@angular/cdk": "^7.3.4",
-    "@angular/common": "^8.0.0-beta.11",
-    "@angular/compiler": "^8.0.0-beta.11",
-    "@angular/compiler-cli": "^8.0.0-beta.11",
-    "@angular/core": "^8.0.0-beta.11",
+    "@angular/common": "^8.0.0-beta.12",
+    "@angular/compiler": "^8.0.0-beta.12",
+    "@angular/compiler-cli": "^8.0.0-beta.12",
+    "@angular/core": "^8.0.0-beta.12",
     "@angular/material": "^7.3.4",
-    "@angular/platform-browser": "^8.0.0-beta.11",
-    "@angular/platform-browser-dynamic": "^8.0.0-beta.11",
-    "@angular/platform-server": "^8.0.0-beta.11",
-    "@angular/router": "^8.0.0-beta.11",
-    "@angular/service-worker": "^8.0.0-beta.11",
+    "@angular/platform-browser": "^8.0.0-beta.12",
+    "@angular/platform-browser-dynamic": "^8.0.0-beta.12",
+    "@angular/platform-server": "^8.0.0-beta.12",
+    "@angular/router": "^8.0.0-beta.12",
+    "@angular/service-worker": "^8.0.0-beta.12",
     "codelyzer": "^5.0.0",
     "bootstrap": "^4.0.0",
     "font-awesome": "^4.7.0",
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index 8e235d6d97ce..bd60996c0b33 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -14,8 +14,8 @@
     "ng-packagr": "^4.0.0 || ^5.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "^8.0.0-beta.11",
-    "@angular/compiler-cli": "^8.0.0-beta.11",
+    "@angular/compiler": "^8.0.0-beta.12",
+    "@angular/compiler-cli": "^8.0.0-beta.12",
     "@angular-devkit/core": "0.0.0",
     "ng-packagr": "^5.0.1",
     "tslib": "^1.9.0"
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 1af7a691b3d0..fe11494d4115 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -33,8 +33,8 @@
     "webpack": "^4.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "^8.0.0-beta.11",
-    "@angular/compiler-cli": "^8.0.0-beta.11",
+    "@angular/compiler": "^8.0.0-beta.12",
+    "@angular/compiler-cli": "^8.0.0-beta.12",
     "typescript": "3.4.3",
     "webpack": "4.29.6"
   }
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 1492c9cd78ba..912cd82eb6a6 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -8,12 +8,12 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~8.0.0-beta.11',
+  Angular: '~8.0.0-beta.12',
   RxJs: '~6.4.0',
   ZoneJs: '~0.9.0',
-  TypeScript: '~3.3.3333',
+  TypeScript: '~3.4.3',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.800.0-beta.7',
-  DevkitBuildNgPackagr: '~0.800.0-beta.7',
+  DevkitBuildAngular: '~0.800.0-beta.13',
+  DevkitBuildNgPackagr: '~0.800.0-beta.13',
 };
diff --git a/yarn.lock b/yarn.lock
index 1ae285714a49..ac041cb24457 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@angular/animations@^8.0.0-beta.11":
-  version "8.0.0-beta.11"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0-beta.11.tgz#640016e9fdf94c4ac685bb1caf0e921e057827bd"
-  integrity sha512-6wH0danPVxen1WleMQy6fWiA+KwRAJmSmZo7gNC6ptZDw2LMrJRpYDsQse6IkFMJ6dVy8eBezlX+asXdGD1dgA==
+"@angular/animations@^8.0.0-beta.12":
+  version "8.0.0-beta.12"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0-beta.12.tgz#b919b204c5523e4377aff9d2661d0b7324d85874"
+  integrity sha512-FHr7/ijyYZ/4VNKxS7Cm6OT4OW7wzfQu15XUx//MTlIV2qeHSxCQWOQ4GjlFQRRiYdjZ261dl3a0ZJQslatPAw==
   dependencies:
     tslib "^1.9.0"
 
@@ -18,17 +18,17 @@
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/common@^8.0.0-beta.11":
-  version "8.0.0-beta.11"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0-beta.11.tgz#045219d33c1225650fef8e52bec5d4781add742e"
-  integrity sha512-lVc9BkyInpgg9ivi7KRRgikYcrlAr5ew0NomkThDbwMhH7oQ/b0ymmOqSpo/PeZBt2UwdVLWhnWb1kObOcWMjQ==
+"@angular/common@^8.0.0-beta.12":
+  version "8.0.0-beta.12"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0-beta.12.tgz#dbdb5de68e1950003fb18e4288e1d5a73964ad52"
+  integrity sha512-SQnOj0cvV6hDwTxyhz1tXD4j6hqy8jj/xwYHiqZ+pSMMSEB1C4cf8y0ukFJzVNvWUqZCjZUmG6OY7Ta0IqJ2Yg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^8.0.0-beta.11":
-  version "8.0.0-beta.11"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0-beta.11.tgz#4a57754a62a6f52954f5b7ec78103e6890f54a63"
-  integrity sha512-KFDrSREOWozYOCA3y//pg1ndoB/sdzomQ7VzdzLtcq0UPZZm9Q7Tt7BIyVK55kVqQppDh+IikilZtTBNd5gsYg==
+"@angular/compiler-cli@^8.0.0-beta.12":
+  version "8.0.0-beta.12"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0-beta.12.tgz#43e3beb1e5249aef03912e7e403005eb4be1ae4a"
+  integrity sha512-WehBHOrP2PoaXA/F9pEuy+EsC+GBKsuOSe+OPZ1LVmUrboLdtTA1Z6/MURNE7RJxP5aVSHmSz5w74cP/Ta90+A==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -42,17 +42,17 @@
     tslib "^1.9.0"
     yargs "9.0.1"
 
-"@angular/compiler@^8.0.0-beta.11":
-  version "8.0.0-beta.11"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0-beta.11.tgz#de129b5e687e56ddcafb2ca801abd49678dbc694"
-  integrity sha512-5YiY5g7z+uKCid3UilwjluG0l1J8au9B5VsX5GNiK4NfHkKxbW0OjGgAIl193GUShHh2DWfWNTtFgS1SE9qISw==
+"@angular/compiler@^8.0.0-beta.12":
+  version "8.0.0-beta.12"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0-beta.12.tgz#cf7d250585ba3965d440aa3fbc6afa71d52bdf0c"
+  integrity sha512-JYC521zMNGCO152UjFU1dm7xsbruDezfrQVlPdCp6aCQEoPFvX07plXSni+exN2M6Jj87Gwsf3nDCAqW4l3tlA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^8.0.0-beta.11":
-  version "8.0.0-beta.11"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0-beta.11.tgz#45cb92700e9314bdc816cb36e6f541071cc5a3bd"
-  integrity sha512-V6bplO1FlU4T3ieDUNqjst+cmJqVXh/bWYuCowoKAojhu10zLQVlqqTWL5BsCQepU2XWLXNw6VrV1RkmE6drZQ==
+"@angular/core@^8.0.0-beta.12":
+  version "8.0.0-beta.12"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0-beta.12.tgz#0585726423dd1123ed878cb57fde00e1bbd42193"
+  integrity sha512-1V2kEi7iaDVXHPVwqN54sGjr6jEt7Hijj3UIIkAiIJA93Yc2I/c7PsupAho91wwEdya2K/K7gKnIheNS0D4CWQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -63,40 +63,40 @@
   dependencies:
     tslib "^1.7.1"
 
-"@angular/platform-browser-dynamic@^8.0.0-beta.11":
-  version "8.0.0-beta.11"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0-beta.11.tgz#d4fc103652bf92a2adfb5d308ea4e0273f081f3a"
-  integrity sha512-/m7c8YgKPkCuQWvpIwSYMtG8szTVUFi4JrKuLXhL0IWJzVdUnn9irZi/PQ5KnzJqMWJYF9NTb+ySzVRZZQoMMQ==
+"@angular/platform-browser-dynamic@^8.0.0-beta.12":
+  version "8.0.0-beta.12"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0-beta.12.tgz#f2c60bb98ca1ab81571a4e1cb7043e0fc707c497"
+  integrity sha512-l61v7KxFzmziu0WTFTMhKTTJSHpioYl7u8uNao4vxhQR5o65G6fiLxNOjqpNe6bKrolbKcbZ4/+N8nPN7Mw/vA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^8.0.0-beta.11":
-  version "8.0.0-beta.11"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0-beta.11.tgz#07deab925e0d64756ae63e83a33e4540278fafeb"
-  integrity sha512-fdgwjIKJ9unvj49jIBad56OfZKOJT11RjsDOFhJvKAI88se8WvW/gDL3D0g8U2qP4zEphpvutO3ThrZ7PbgtMw==
+"@angular/platform-browser@^8.0.0-beta.12":
+  version "8.0.0-beta.12"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0-beta.12.tgz#9896a85b8edb8dfa633fe7ea38591bc7b0ae6f43"
+  integrity sha512-XL9ybmllynrDiOYhbaRywOQq/NvfNOd/6Cn6jnLXMOSthkqPpYCIejsE/zm7Gq+RPrJeW7kaOg+DyXRPWLWOOQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-server@^8.0.0-beta.11":
-  version "8.0.0-beta.11"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.0.0-beta.11.tgz#527e616f30ed89b4a2f5227928be32060a4c5756"
-  integrity sha512-chndPxfx1Hd+l7Tq4UtHfWQrgsnC/WoH/0ML+9W4jCGATtcBNFc6ogE4aK1PgqekFZv2e4bMMpBA5Jxsn4wCvA==
+"@angular/platform-server@^8.0.0-beta.12":
+  version "8.0.0-beta.12"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.0.0-beta.12.tgz#56ddc9a249faf3b31a275315cdb72a5122d365dd"
+  integrity sha512-dWqDqpC/5J7g6jLwvOCmtvL/+OYEtDyuUOaH7fz/Mp9J4lCqqwSJhM7AMFn265VMa8eixohwMoQPA1RSf0Bhtw==
   dependencies:
     domino "^2.1.2"
     tslib "^1.9.0"
     xhr2 "^0.1.4"
 
-"@angular/router@^8.0.0-beta.11":
-  version "8.0.0-beta.11"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0-beta.11.tgz#b50faa1e238e1d56967c2ae03bee3b5fd1ee6c79"
-  integrity sha512-n6o90rveQlyj34BNuXAOKtNXCHb75hOcX0pgvqzKrIkthpXVWY8nE475OmYsxZ7MYsT3BhZg0wK5b05wLl2KeQ==
+"@angular/router@^8.0.0-beta.12":
+  version "8.0.0-beta.12"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0-beta.12.tgz#0a98d6e7da6ba6a3d8ccd18d2a9dac8956f72e1e"
+  integrity sha512-inuuYL48uPBqFMpqH8IBVzJGA+wUHr0QuLigO1GlAqVEXGXwEPUSbqmqvwv7j1RGT1phC2LC8lWR8yfcNBel7A==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@^8.0.0-beta.11":
-  version "8.0.0-beta.11"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.0.0-beta.11.tgz#4c23aee3927e9bcadb4ef1490055799e2da905e0"
-  integrity sha512-0pWo87/iPEsfujJsGKUnRDGppd5usoKO20LcyUw+bChBcDgYDKq7XTdyoGWSBIt2uQR1DZD6odSq3E4ONx4YQw==
+"@angular/service-worker@^8.0.0-beta.12":
+  version "8.0.0-beta.12"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.0.0-beta.12.tgz#6a5e6e6178b5160a984d231ae65eb7eef31af8cd"
+  integrity sha512-cvS0IplppPhwtfqiSg4NPkp0Ck+3meX8O3aX4OuVeTUKOX1mE9gCTIO7QwDFo0o325mhct2ur9Spx5FPClQVBw==
   dependencies:
     tslib "^1.9.0"
 
@@ -9536,11 +9536,6 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@3.3.4000:
-  version "3.3.4000"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.4000.tgz#76b0f89cfdbf97827e1112d64f283f1151d6adf0"
-  integrity sha512-jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA==
-
 typescript@3.4.3:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.3.tgz#0eb320e4ace9b10eadf5bc6103286b0f8b7c224f"

From 6d7d2ebd3cf8575cd8f2ff27bc9f21f21642f9f1 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 9 Apr 2019 13:28:46 +0100
Subject: [PATCH 1125/1703] feat(@ngtools/webpack): support loadchildren string
 syntax in Ivy

---
 .../webpack/src/angular_compiler_plugin.ts    | 31 ++++++------
 tests/legacy-cli/e2e/tests/basic/rebuild.ts   |  8 +--
 .../e2e/tests/build/lazy-load-syntax.ts       | 50 ++++---------------
 .../legacy-cli/e2e/tests/misc/lazy-module.ts  | 26 ++--------
 4 files changed, 32 insertions(+), 83 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 104e09a77783..636c6ceecb7d 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -95,6 +95,7 @@ export class AngularCompilerPlugin {
   private _resourceLoader?: WebpackResourceLoader;
   private _discoverLazyRoutes = true;
   private _importFactories = false;
+  private _useFactories = false;
   // Contains `moduleImportPath#exportName` => `fullModulePath`.
   private _lazyRoutes: LazyRouteMap = {};
   private _tsConfigPath: string;
@@ -256,11 +257,8 @@ export class AngularCompilerPlugin {
     }
 
     // Determine if lazy route discovery via Compiler CLI private API should be attempted.
-    if (this._compilerOptions.enableIvy) {
-      // Never try to discover lazy routes with Ivy.
-      this._discoverLazyRoutes = false;
-    } else if (options.discoverLazyRoutes !== undefined) {
-      // The default is to discover routes, but it can be overriden.
+    // The default is to discover routes, but it can be overriden.
+    if (options.discoverLazyRoutes !== undefined) {
       this._discoverLazyRoutes = options.discoverLazyRoutes;
     }
 
@@ -280,7 +278,12 @@ export class AngularCompilerPlugin {
       );
     }
 
-    if (!this._compilerOptions.enableIvy && options.importFactories === true) {
+    if (!this._JitMode && !this._compilerOptions.enableIvy) {
+      // Only attempt to use factories when AOT and not Ivy.
+      this._useFactories = true;
+    }
+
+    if (this._useFactories && options.importFactories === true) {
       // Only transform imports to use factories with View Engine.
       this._importFactories = true;
     }
@@ -488,18 +491,14 @@ export class AngularCompilerPlugin {
         const lazyRouteTSFile = discoveredLazyRoutes[lazyRouteKey].replace(/\\/g, '/');
         let modulePath: string, moduleKey: string;
 
-        if (this._JitMode ||
-          // When using Ivy and not using allowEmptyCodegenFiles, factories are not generated.
-          (this._compilerOptions.enableIvy && !this._compilerOptions.allowEmptyCodegenFiles)
-        ) {
-          modulePath = lazyRouteTSFile;
-          moduleKey = `${lazyRouteModule}${moduleName ? '#' + moduleName : ''}`;
-        } else {
-          // NgFactories are only used with AOT on ngc (legacy) mode.
+        if (this._useFactories) {
           modulePath = lazyRouteTSFile.replace(/(\.d)?\.tsx?$/, '');
           modulePath += '.ngfactory.js';
           const factoryModuleName = moduleName ? `#${moduleName}NgFactory` : '';
           moduleKey = `${lazyRouteModule}.ngfactory${factoryModuleName}`;
+        } else {
+          modulePath = lazyRouteTSFile;
+          moduleKey = `${lazyRouteModule}${moduleName ? '#' + moduleName : ''}`;
         }
 
         modulePath = workaroundResolve(modulePath);
@@ -949,7 +948,7 @@ export class AngularCompilerPlugin {
             this._normalizedLocale));
         }
 
-        if (!this._JitMode) {
+        if (this._useFactories) {
           // Replace bootstrap in browser AOT.
           this._transformers.push(replaceBootstrap(
             isAppPath,
@@ -960,7 +959,7 @@ export class AngularCompilerPlugin {
         }
       } else if (this._platform === PLATFORM.Server) {
         this._transformers.push(exportLazyModuleMap(isMainPath, getLazyRoutes));
-        if (!this._JitMode) {
+        if (this._useFactories) {
           this._transformers.push(
             exportNgFactory(isMainPath, getEntryModule),
             replaceServerBootstrap(isMainPath, getEntryModule, getTypeChecker));
diff --git a/tests/legacy-cli/e2e/tests/basic/rebuild.ts b/tests/legacy-cli/e2e/tests/basic/rebuild.ts
index 4c1dccf36735..085afcf30454 100644
--- a/tests/legacy-cli/e2e/tests/basic/rebuild.ts
+++ b/tests/legacy-cli/e2e/tests/basic/rebuild.ts
@@ -7,7 +7,6 @@ import {
 import {writeFile, writeMultipleFiles} from '../../utils/fs';
 import {wait} from '../../utils/utils';
 import {request} from '../../utils/http';
-import {getGlobalVariable} from '../../utils/env';
 
 const validBundleRegEx = /: Compiled successfully./;
 
@@ -16,11 +15,6 @@ export default function() {
     return Promise.resolve();
   }
 
-  const argv = getGlobalVariable('argv');
-  const ivyProject = argv['ivy'];
-  const lazyImport = ivyProject ? `() => import('./lazy/lazy.module').then(m => m.LazyModule)`
-    : `'./lazy/lazy.module#LazyModule'`;
-
   return execAndWaitForOutputToMatch('ng', ['serve'], validBundleRegEx)
     // Add a lazy module.
     .then(() => ng('generate', 'module', 'lazy', '--routing'))
@@ -47,7 +41,7 @@ export default function() {
             FormsModule,
             HttpClientModule,
             RouterModule.forRoot([
-              { path: 'lazy', loadChildren: ${lazyImport} }
+              { path: 'lazy', loadChildren: './lazy/lazy.module#LazyModule' }
             ])
           ],
           providers: [],
diff --git a/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts b/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts
index f453dfad9cf9..1d23418caae0 100644
--- a/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts
+++ b/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts
@@ -74,14 +74,6 @@ export default async function () {
     });
   `);
 
-  // Set factory shims to false.
-  await updateJsonFile('tsconfig.app.json', json => {
-    if (json['angularCompilerOptions'] === undefined) {
-      json['angularCompilerOptions'] = {};
-    }
-    json['angularCompilerOptions']['allowEmptyCodegenFiles'] = false;
-  });
-
   // Convert the default config to use JIT and prod to just do AOT.
   // This way we can use `ng e2e` to test JIT and `ng e2e --prod` to test AOT.
   await updateJsonFile('angular.json', json => {
@@ -90,40 +82,20 @@ export default async function () {
     buildTarget['configurations']['production'] = { aot: true };
   });
 
-  // Test string import with factory shims.
-  await replaceLoadChildren(`'./lazy/lazy.module#LazyModule'`);
-  await replaceInFile('tsconfig.app.json', `"allowEmptyCodegenFiles": false`,
-    `"allowEmptyCodegenFiles": true`);
-  if (ivyProject) {
-    // Ivy should not support the string syntax.
-    await expectToFail(() => ng('e2e'));
-    await expectToFail(() => ng('e2e', '--prod'));
-  } else {
-    // View engine should support the string syntax.
-    await ng('e2e');
-    await ng('e2e', '--prod');
-  }
-
-  // Test string import without factory shims.
+  // Test string import.
+  // Both Ivy and View Engine should support it.
   await replaceLoadChildren(`'./lazy/lazy.module#LazyModule'`);
-  await replaceInFile('tsconfig.app.json', `"allowEmptyCodegenFiles": true`,
-    `"allowEmptyCodegenFiles": false`);
-  if (ivyProject) {
-    // Ivy should not support the string syntax.
-    await expectToFail(() => ng('e2e'));
-    await expectToFail(() => ng('e2e', '--prod'));
-  } else {
-    // View engine should support the string syntax.
-    await ng('e2e');
-    await ng('e2e', '--prod');
-  }
+  await ng('e2e');
+  await ng('e2e', '--prod');
 
   // Test `import()` style lazy load.
-  await updateJsonFile('angular.json', json => {
-    // Add the experimental flag to import factories in View Engine.
-    const buildTarget = json['projects'][projectName]['architect']['build'];
-    buildTarget['options']['experimentalImportFactories'] = true;
-  });
+  if (!ivyProject) {
+    await updateJsonFile('angular.json', json => {
+      // Add the experimental flag to import factories in View Engine.
+      const buildTarget = json['projects'][projectName]['architect']['build'];
+      buildTarget['options']['experimentalImportFactories'] = true;
+    });
+  }
   // Both Ivy and View Engine should support it.
   await replaceLoadChildren(`() => import('./lazy/lazy.module').then(m => m.LazyModule)`);
   await ng('e2e');
diff --git a/tests/legacy-cli/e2e/tests/misc/lazy-module.ts b/tests/legacy-cli/e2e/tests/misc/lazy-module.ts
index 65183f7d6746..076f03fdc381 100644
--- a/tests/legacy-cli/e2e/tests/misc/lazy-module.ts
+++ b/tests/legacy-cli/e2e/tests/misc/lazy-module.ts
@@ -2,19 +2,9 @@ import {readdirSync} from 'fs';
 
 import {ng, silentNpm} from '../../utils/process';
 import {appendToFile, writeFile, prependToFile, replaceInFile} from '../../utils/fs';
-import {getGlobalVariable} from '../../utils/env';
 
 
 export default function() {
-  const argv = getGlobalVariable('argv');
-  const ivyProject = argv['ivy'];
-  const lazyImport = ivyProject ? `() => import('src/app/lazy/lazy.module').then(m => m.LazyModule)`
-    : `'src/app/lazy/lazy.module#LazyModule'`;
-  const lazyImport1 = ivyProject ? `() => import('./lazy/lazy.module').then(m => m.LazyModule)`
-    : `'./lazy/lazy.module#LazyModule'`;
-  const lazyImport2 = ivyProject ? `() => import('./too/lazy/lazy.module').then(m => m.LazyModule)`
-    : `'./too/lazy/lazy.module#LazyModule'`;
-
   let oldNumberOfFiles = 0;
   return Promise.resolve()
     .then(() => ng('build'))
@@ -25,9 +15,9 @@ export default function() {
       import { RouterModule } from '@angular/router';
     `))
     .then(() => replaceInFile('src/app/app.module.ts', 'imports: [', `imports: [
-      RouterModule.forRoot([{ path: "lazy", loadChildren: ${lazyImport} }]),
-      RouterModule.forRoot([{ path: "lazy1", loadChildren: ${lazyImport1} }]),
-      RouterModule.forRoot([{ path: "lazy2", loadChildren: ${lazyImport2} }]),
+      RouterModule.forRoot([{ path: "lazy", loadChildren: 'src/app/lazy/lazy.module#LazyModule' }]),
+      RouterModule.forRoot([{ path: "lazy1", loadChildren: './lazy/lazy.module#LazyModule' }]),
+      RouterModule.forRoot([{ path: "lazy2", loadChildren: './too/lazy/lazy.module#LazyModule' }]),
     `))
     .then(() => ng('build', '--named-chunks'))
     .then(() => readdirSync('dist/test-project'))
@@ -38,14 +28,8 @@ export default function() {
       }
       oldNumberOfFiles = currentNumberOfDistFiles;
 
-      // Named lazy route chunks are not available with Ivy.
-      if (!ivyProject) {
-        if (!distFiles.includes('lazy-lazy-module.js')) {
-          throw new Error('The lazy module chunk did not have a name.');
-        }
-        if (!distFiles.includes('too-lazy-lazy-module.js')) {
-          throw new Error('The lazy module chunk did not use a unique name.');
-        }
+      if (!distFiles.includes('too-lazy-lazy-module.js')) {
+        throw new Error('The lazy module chunk did not use a unique name.');
       }
     })
     // verify System.import still works

From e2a3895bf8fcd5578d9a364638b2096afef2e703 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Sat, 13 Apr 2019 14:35:26 +0100
Subject: [PATCH 1126/1703] test: workaround Router typings

This workaround should be removed after https://github.com/angular/angular/pull/29832 is released.
---
 tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts b/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts
index 1d23418caae0..826747136718 100644
--- a/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts
+++ b/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts
@@ -98,6 +98,10 @@ export default async function () {
   }
   // Both Ivy and View Engine should support it.
   await replaceLoadChildren(`() => import('./lazy/lazy.module').then(m => m.LazyModule)`);
+
+  // TODO: remove cast after https://github.com/angular/angular/pull/29832 is released.
+  await replaceInFile(appRoutingModulePath, '];', '] as Routes;');
+
   await ng('e2e');
   await ng('e2e', '--prod');
 }

From efccea6e1ae6d128e7530ea0e607f75f577e3bc0 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sat, 13 Apr 2019 09:38:11 +0200
Subject: [PATCH 1127/1703] feat(@angular-devkit/build-angular): wire up index
 generation for differential loading

This change wires up the index generation for multiple bundles, we however don't  enable differential loading for users just yet. As this will be done in a separate PR to change over specs to conform with the new files
---
 .../plugins/generate-index-html_spec.ts       |  96 -------------
 .../plugins/index-html-webpack-plugin.ts      |   6 +-
 .../index-file/augment-index-html.ts}         |  24 ++--
 .../index-file/augment-index-html_spec.ts     | 135 ++++++++++++++++++
 .../utilities/index-file/write-index-html.ts  |  83 +++++++++++
 .../build_angular/src/browser/index.ts        |  43 ++++--
 .../src/utils/webpack-browser-config.ts       |  11 +-
 7 files changed, 277 insertions(+), 121 deletions(-)
 delete mode 100644 packages/angular_devkit/build_angular/src/angular-cli-files/plugins/generate-index-html_spec.ts
 rename packages/angular_devkit/build_angular/src/angular-cli-files/{plugins/generate-index-html.ts => utilities/index-file/augment-index-html.ts} (89%)
 create mode 100644 packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html_spec.ts
 create mode 100644 packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/write-index-html.ts

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/generate-index-html_spec.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/generate-index-html_spec.ts
deleted file mode 100644
index 1c7b1d28dec3..000000000000
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/generate-index-html_spec.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { tags } from '@angular-devkit/core';
-import { FileInfo, GenerateIndexHtmlOptions, generateIndexHtml } from './generate-index-html';
-
-describe('index-html-webpack-plugin', () => {
-  const indexGeneratorOptions: GenerateIndexHtmlOptions = {
-    input: 'index.html',
-    inputContent: '<html><head></head><body></body></html>',
-    baseHref: '/',
-    sri: false,
-    files: [],
-    loadOutputFile: async (_fileName: string) => '',
-    entrypoints: ['polyfills', 'main', 'styles'],
-  };
-
-  const oneLineHtml = (html: TemplateStringsArray) =>
-     tags.stripIndents`${html}`.replace(/(\>\s+)/g, '>');
-
-  it('can generate index.html', async () => {
-    const source = generateIndexHtml({
-      ...indexGeneratorOptions,
-      files: [
-        { fileName: 'styles.css', extension: '.css', name: 'styles' },
-        { fileName: 'runtime.js', extension: '.js', name: 'main' },
-        { fileName: 'main.js', extension: '.js', name: 'main' },
-        { fileName: 'runtime.js', extension: '.js', name: 'polyfills' },
-        { fileName: 'polyfills.js', extension: '.js', name: 'polyfills' },
-      ],
-    });
-
-    const html = (await source).source();
-    expect(html).toEqual(oneLineHtml`
-      <html>
-        <head><base href="/">
-          <link rel="stylesheet" href="styles.css">
-        </head>
-        <body>
-          <script src="runtime.js"></script>
-          <script src="polyfills.js"></script>
-          <script src="main.js"></script>
-        </body>
-      </html>
-    `);
-  });
-
-  it('should emit correct script tags when having module and non-module js', async () => {
-    const es2015JsFiles: FileInfo[] = [
-      { fileName: 'runtime-es2015.js', extension: '.js', name: 'main' },
-      { fileName: 'main-es2015.js', extension: '.js', name: 'main' },
-      { fileName: 'runtime-es2015.js', extension: '.js', name: 'polyfills' },
-      { fileName: 'polyfills-es2015.js', extension: '.js', name: 'polyfills' },
-    ];
-
-    const es5JsFiles: FileInfo[] = [
-      { fileName: 'runtime-es5.js', extension: '.js', name: 'main' },
-      { fileName: 'main-es5.js', extension: '.js', name: 'main' },
-      { fileName: 'runtime-es5.js', extension: '.js', name: 'polyfills' },
-      { fileName: 'polyfills-es5.js', extension: '.js', name: 'polyfills' },
-    ];
-
-    const source = generateIndexHtml({
-      ...indexGeneratorOptions,
-      files: [
-        { fileName: 'styles.css', extension: '.css', name: 'styles' },
-        { fileName: 'styles.css', extension: '.css', name: 'styles' },
-      ],
-      moduleFiles: es2015JsFiles,
-      noModuleFiles: es5JsFiles,
-    });
-
-    const html = (await source).source();
-    expect(html).toEqual(oneLineHtml`
-      <html>
-        <head>
-          <base href="/">
-          <link rel="stylesheet" href="styles.css">
-        </head>
-        <body>
-          <script src="runtime-es5.js" nomodule></script>
-          <script src="polyfills-es5.js" nomodule></script>
-          <script src="runtime-es2015.js" type="module"></script>
-          <script src="polyfills-es2015.js" type="module"></script>
-          <script src="main-es5.js" nomodule></script>
-          <script src="main-es2015.js" type="module"></script>
-        </body>
-      </html>
-    `);
-  });
-
-});
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
index 2396f1b366b1..38673f11b713 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
@@ -7,7 +7,7 @@
  */
 import * as path from 'path';
 import { Compiler, compilation } from 'webpack';
-import { FileInfo, generateIndexHtml } from './generate-index-html';
+import { FileInfo, augmentIndexHtml } from '../utilities/index-file/augment-index-html';
 
 export interface IndexHtmlWebpackPluginOptions {
   input: string;
@@ -74,7 +74,7 @@ export class IndexHtmlWebpackPlugin {
         const entryFiles: FileInfo[] = (entrypoint && entrypoint.getFiles() || [])
           .map((f: string): FileInfo => ({
             name: entryName,
-            fileName: f,
+            file: f,
             extension: path.extname(f),
           }));
 
@@ -86,7 +86,7 @@ export class IndexHtmlWebpackPlugin {
       }
 
       const loadOutputFile = (name: string) => compilation.assets[name].source();
-      const indexSource = await generateIndexHtml({
+      const indexSource = await augmentIndexHtml({
         input: this._options.input,
         inputContent,
         baseHref: this._options.baseHref,
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/generate-index-html.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html.ts
similarity index 89%
rename from packages/angular_devkit/build_angular/src/angular-cli-files/plugins/generate-index-html.ts
rename to packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html.ts
index d25aad88feeb..1a4034918331 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/generate-index-html.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html.ts
@@ -18,7 +18,7 @@ const parse5 = require('parse5');
 
 export type LoadOutputFileFunctionType = (file: string) => Promise<string>;
 
-export interface GenerateIndexHtmlOptions {
+export interface AugmentIndexHtmlOptions {
   /* Input file name (e. g. index.html) */
   input: string;
   /* Input contents */
@@ -46,7 +46,7 @@ export interface GenerateIndexHtmlOptions {
 }
 
 export interface FileInfo {
-  fileName: string;
+  file: string;
   name: string;
   extension: string;
 }
@@ -57,7 +57,7 @@ export interface FileInfo {
  * after processing several configurations in order to build different sets of
  * bundles for differential serving.
  */
-export async function generateIndexHtml(params: GenerateIndexHtmlOptions): Promise<Source> {
+export async function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise<Source> {
   const {
     loadOutputFile,
     files,
@@ -72,15 +72,15 @@ export async function generateIndexHtml(params: GenerateIndexHtmlOptions): Promi
   // Sort files in the order we want to insert them by entrypoint and dedupes duplicates
   const mergedFiles = [...noModuleFiles, ...moduleFiles, ...files];
   for (const entrypoint of entrypoints) {
-    for (const { extension, fileName, name } of mergedFiles) {
+    for (const { extension, file, name } of mergedFiles) {
       if (name !== entrypoint) { continue; }
 
       switch (extension) {
         case '.js':
-          scripts.add(fileName);
+          scripts.add(file);
           break;
         case '.css':
-          stylesheets.add(fileName);
+          stylesheets.add(file);
           break;
       }
     }
@@ -137,11 +137,17 @@ export async function generateIndexHtml(params: GenerateIndexHtmlOptions): Promi
 
     // We want to include nomodule or module when a file is not common amongs all
     // such as runtime.js
-    const scriptPredictor = ({ fileName }: FileInfo): boolean => fileName === script;
+    const scriptPredictor = ({ file }: FileInfo): boolean => file === script;
     if (!files.some(scriptPredictor)) {
-      if (noModuleFiles.some(scriptPredictor)) {
+      // in some cases for differential loading file with the same name is avialable in both
+      // nomodule and module such as scripts.js
+      // we shall not add these attributes if that's the case
+      const isNoModuleType = noModuleFiles.some(scriptPredictor);
+      const isModuleType = moduleFiles.some(scriptPredictor);
+
+      if (isNoModuleType && !isModuleType) {
         attrs.push({ name: 'nomodule', value: null });
-      } else if (moduleFiles.some(scriptPredictor)) {
+      } else if (isModuleType && !isNoModuleType) {
         attrs.push({ name: 'type', value: 'module' });
       }
     }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html_spec.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html_spec.ts
new file mode 100644
index 000000000000..7f67effe37b6
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html_spec.ts
@@ -0,0 +1,135 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { tags } from '@angular-devkit/core';
+import { AugmentIndexHtmlOptions, FileInfo, augmentIndexHtml } from './augment-index-html';
+
+describe('augment-index-html', () => {
+  const indexGeneratorOptions: AugmentIndexHtmlOptions = {
+    input: 'index.html',
+    inputContent: '<html><head></head><body></body></html>',
+    baseHref: '/',
+    sri: false,
+    files: [],
+    loadOutputFile: async (_fileName: string) => '',
+    entrypoints: ['scripts', 'polyfills', 'main', 'styles'],
+  };
+
+  const oneLineHtml = (html: TemplateStringsArray) =>
+    tags.stripIndents`${html}`.replace(/(\>\s+)/g, '>');
+
+  it('can generate index.html', async () => {
+    const source = augmentIndexHtml({
+      ...indexGeneratorOptions,
+      files: [
+        { file: 'styles.css', extension: '.css', name: 'styles' },
+        { file: 'runtime.js', extension: '.js', name: 'main' },
+        { file: 'main.js', extension: '.js', name: 'main' },
+        { file: 'runtime.js', extension: '.js', name: 'polyfills' },
+        { file: 'polyfills.js', extension: '.js', name: 'polyfills' },
+      ],
+    });
+
+    const html = (await source).source();
+    expect(html).toEqual(oneLineHtml`
+      <html>
+        <head><base href="/">
+          <link rel="stylesheet" href="styles.css">
+        </head>
+        <body>
+          <script src="runtime.js"></script>
+          <script src="polyfills.js"></script>
+          <script src="main.js"></script>
+        </body>
+      </html>
+    `);
+  });
+
+  it(`should emit correct script tags when having 'module' and 'non-module' js`, async () => {
+    const es2015JsFiles: FileInfo[] = [
+      { file: 'runtime-es2015.js', extension: '.js', name: 'main' },
+      { file: 'main-es2015.js', extension: '.js', name: 'main' },
+      { file: 'runtime-es2015.js', extension: '.js', name: 'polyfills' },
+      { file: 'polyfills-es2015.js', extension: '.js', name: 'polyfills' },
+    ];
+
+    const es5JsFiles: FileInfo[] = [
+      { file: 'runtime-es5.js', extension: '.js', name: 'main' },
+      { file: 'main-es5.js', extension: '.js', name: 'main' },
+      { file: 'runtime-es5.js', extension: '.js', name: 'polyfills' },
+      { file: 'polyfills-es5.js', extension: '.js', name: 'polyfills' },
+    ];
+
+    const source = augmentIndexHtml({
+      ...indexGeneratorOptions,
+      files: [
+        { file: 'styles.css', extension: '.css', name: 'styles' },
+        { file: 'styles.css', extension: '.css', name: 'styles' },
+      ],
+      moduleFiles: es2015JsFiles,
+      noModuleFiles: es5JsFiles,
+    });
+
+    const html = (await source).source();
+    expect(html).toEqual(oneLineHtml`
+      <html>
+        <head>
+          <base href="/">
+          <link rel="stylesheet" href="styles.css">
+        </head>
+        <body>
+          <script src="runtime-es5.js" nomodule></script>
+          <script src="polyfills-es5.js" nomodule></script>
+          <script src="runtime-es2015.js" type="module"></script>
+          <script src="polyfills-es2015.js" type="module"></script>
+          <script src="main-es5.js" nomodule></script>
+          <script src="main-es2015.js" type="module"></script>
+        </body>
+      </html>
+    `);
+  });
+
+  it(
+    `should not add 'module' and 'non-module' attr to js files which are in both module formats`,
+    async () => {
+      const es2015JsFiles: FileInfo[] = [
+        { file: 'scripts.js', extension: '.js', name: 'scripts' },
+        { file: 'main-es2015.js', extension: '.js', name: 'main' },
+      ];
+
+      const es5JsFiles: FileInfo[] = [
+        { file: 'scripts.js', extension: '.js', name: 'scripts' },
+        { file: 'main-es5.js', extension: '.js', name: 'main' },
+      ];
+
+      const source = augmentIndexHtml({
+        ...indexGeneratorOptions,
+        files: [
+          { file: 'styles.css', extension: '.css', name: 'styles' },
+          { file: 'styles.css', extension: '.css', name: 'styles' },
+        ],
+        moduleFiles: es2015JsFiles,
+        noModuleFiles: es5JsFiles,
+      });
+
+      const html = (await source).source();
+      expect(html).toEqual(oneLineHtml`
+      <html>
+        <head>
+          <base href="/">
+          <link rel="stylesheet" href="styles.css">
+        </head>
+        <body>
+          <script src="scripts.js"></script>
+          <script src="main-es5.js" nomodule></script>
+          <script src="main-es2015.js" type="module"></script>
+        </body>
+      </html>
+    `);
+    });
+
+});
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/write-index-html.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/write-index-html.ts
new file mode 100644
index 000000000000..b81ecd53aa57
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/write-index-html.ts
@@ -0,0 +1,83 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { EmittedFiles } from '@angular-devkit/build-webpack';
+import { Path, basename, getSystemPath, join, virtualFs } from '@angular-devkit/core';
+import { Observable } from 'rxjs';
+import { map, switchMap } from 'rxjs/operators';
+import { ExtraEntryPoint } from '../../../browser/schema';
+import { generateEntryPoints } from '../package-chunk-sort';
+import { stripBom } from '../strip-bom';
+import { FileInfo, augmentIndexHtml } from './augment-index-html';
+
+export interface WriteIndexHtmlOptions {
+  host: virtualFs.Host;
+  outputPath: Path;
+  indexPath: Path;
+  ES5BuildFiles: EmittedFiles[];
+  ES2015BuildFiles: EmittedFiles[];
+  baseHref?: string;
+  deployUrl?: string;
+  sri?: boolean;
+  scripts?: ExtraEntryPoint[];
+  styles?: ExtraEntryPoint[];
+}
+
+export function writeIndexHtml({
+  host,
+  outputPath,
+  indexPath,
+  ES5BuildFiles,
+  ES2015BuildFiles,
+  baseHref,
+  deployUrl,
+  sri = false,
+  scripts = [],
+  styles = [],
+}: WriteIndexHtmlOptions): Observable<void> {
+
+  return host.read(indexPath)
+    .pipe(
+      map(content => stripBom(virtualFs.fileBufferToString(content))),
+      switchMap(content => augmentIndexHtml({
+        input: getSystemPath(outputPath),
+        inputContent: content,
+        baseHref,
+        deployUrl,
+        sri,
+        entrypoints: generateEntryPoints({ scripts, styles }),
+        files: filterAndMapBuildFiles(ES5BuildFiles, '.css'),
+        noModuleFiles: filterAndMapBuildFiles(ES5BuildFiles, '.js'),
+        moduleFiles: filterAndMapBuildFiles(ES2015BuildFiles, '.js'),
+        loadOutputFile: async filePath => {
+          return host.read(join(outputPath, filePath))
+            .pipe(
+              map(data => virtualFs.fileBufferToString(data)),
+            )
+            .toPromise();
+        },
+      }),
+      ),
+      map(content => virtualFs.stringToFileBuffer(content.source())),
+      switchMap(content => host.write(join(outputPath, basename(indexPath)), content)),
+    );
+}
+
+function filterAndMapBuildFiles(
+  files: EmittedFiles[],
+  extensionFilter: '.js' | '.css',
+): FileInfo[] {
+  const filteredFiles: FileInfo[] = [];
+  for (const { file, name, extension, initial } of files) {
+    if (name && initial && extension === extensionFilter) {
+      filteredFiles.push({ file, extension, name });
+    }
+  }
+
+  return filteredFiles;
+}
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 04b6a486bde0..8d5ca21e6ea9 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -13,6 +13,7 @@ import {
 import { WebpackLoggingCallback, runWebpack } from '@angular-devkit/build-webpack';
 import {
   experimental,
+  join,
   json,
   logging,
   normalize,
@@ -22,8 +23,8 @@ import {
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as fs from 'fs';
 import * as path from 'path';
-import { Observable, combineLatest, from, of } from 'rxjs';
-import { concatMap, map, switchMap } from 'rxjs/operators';
+import { Observable, combineLatest, from, of, zip } from 'rxjs';
+import { catchError, concatMap, map, switchMap } from 'rxjs/operators';
 import * as webpack from 'webpack';
 import { NgBuildAnalyticsPlugin } from '../../plugins/webpack/analytics';
 import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
@@ -36,6 +37,7 @@ import {
   getStylesConfig,
   getWorkerConfig,
 } from '../angular-cli-files/models/webpack-configs';
+import { writeIndexHtml } from '../angular-cli-files/utilities/index-file/write-index-html';
 import { augmentAppWithServiceWorker } from '../angular-cli-files/utilities/service-worker';
 import {
   statsErrorsToString,
@@ -45,6 +47,7 @@ import {
 import { deleteOutputDir } from '../utils';
 import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
 import { Schema as BrowserBuilderSchema } from './schema';
+import { isDifferentialLoadingNeeded } from './utils';
 
 export type BrowserBuilderOutput = json.JsonObject & BuilderOutput & {
   outputPath: string;
@@ -163,7 +166,7 @@ export function buildWebpackBrowser(
     switchMap(({ workspace, config }) => {
       if (options.deleteOutputPath) {
         return deleteOutputDir(
-          normalize(context.workspaceRoot),
+          root,
           normalize(options.outputPath),
           host,
         ).pipe(map(() => ({ workspace, config })));
@@ -184,18 +187,38 @@ export function buildWebpackBrowser(
         normalize(workspace.getProject(projectName).root),
       );
 
-      return combineLatest(
-        configs.map(config => runWebpack(config, context, { logging: loggingFn })),
+      // We use zip because when having multiple builds we want to wait
+      // for all builds to finish before processeding
+      return zip(
+        ...configs.map(config => runWebpack(config, context, { logging: loggingFn })),
       )
       .pipe(
         switchMap(buildEvents => {
-          if (buildEvents.length === 2) {
-            // todo implement writing index.html for differential loading in another PR
-          }
+          const success = buildEvents.every(r => r.success);
+          if (success && buildEvents.length === 2 && options.index) {
+            const { emittedFiles: ES5BuildFiles = [] } = buildEvents[0];
+            const { emittedFiles: ES2015BuildFiles = [] } = buildEvents[1];
 
-          return of(buildEvents);
+            return writeIndexHtml({
+              host,
+              outputPath: join(root, options.outputPath),
+              indexPath: join(root, options.index),
+              ES5BuildFiles,
+              ES2015BuildFiles,
+              baseHref: options.baseHref,
+              deployUrl: options.deployUrl,
+              sri: options.subresourceIntegrity,
+              scripts: options.scripts,
+              styles: options.styles,
+            })
+            .pipe(
+              map(() => ({ success: true })),
+              catchError(() => of({ success: false })),
+            );
+          } else {
+            return of({ success });
+          }
         }),
-        map(buildEvents => ({ success: buildEvents.every(r => r.success) })),
         concatMap(buildEvent => {
           if (buildEvent.success && !options.watch && options.serviceWorker) {
             return from(augmentAppWithServiceWorker(
diff --git a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
index 4d983d49e0a2..f534826952ac 100644
--- a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
+++ b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
@@ -49,11 +49,16 @@ export async function generateWebpackConfig(
   // tslint:disable-next-line:no-implicit-dependencies
   const ts = await import('typescript');
 
-  // todo enabe when differential loading is complete
-  // const differentialLoading = isDifferentialLoadingNeeded(projectRoot, scriptTarget);
+  // At the moment, only the browser builder supports differential loading
+  // However this config generation is used by multiple builders such as dev-server
+  // const builderInfo = additionalOptions.builderInfo;
+  // const differentialLoading =
+  //   builderInfo
+  //   && builderInfo.builderName === 'browser'
+  //   && isDifferentialLoadingNeeded(projectRoot, scriptTarget);
   const differentialLoading = false;
+  const scriptTargets = [tsConfig.options.target];
 
-  const scriptTargets = [ tsConfig.options.target ];
   if (differentialLoading) {
     scriptTargets.unshift(ts.ScriptTarget.ES5);
   }

From bcf1cc177565b763ca3efc6ddf66d4a97336cb24 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Mon, 15 Apr 2019 09:22:50 +0200
Subject: [PATCH 1128/1703] test: delay file change for rebuilds to avoid
 flakes

---
 tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts b/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts
index 7669da896eaf..292806c904c7 100644
--- a/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts
+++ b/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts
@@ -17,7 +17,10 @@ export default async function() {
   try {
     await execAndWaitForOutputToMatch('ng', ['serve', '--prod'], webpackGoodRegEx);
 
-      // Should trigger a rebuild.
+    // delay file change by 1 second
+    await new Promise(resolve => setTimeout(resolve, 1000));
+
+    // Should trigger a rebuild.
     await appendToFile('src/environments/environment.prod.ts', `console.log('PROD');`);
     await waitForAnyProcessOutputToMatch(webpackGoodRegEx, 45000);
   } catch (e) {

From ee466c8e2ea55b757499c299d44ed420505d09b4 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Mon, 15 Apr 2019 10:21:19 +0200
Subject: [PATCH 1129/1703] test: delay file change for rebuilds to avoid
 flakes

---
 tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts b/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts
index 292806c904c7..e6a14a106854 100644
--- a/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts
+++ b/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts
@@ -18,7 +18,7 @@ export default async function() {
     await execAndWaitForOutputToMatch('ng', ['serve', '--prod'], webpackGoodRegEx);
 
     // delay file change by 1 second
-    await new Promise(resolve => setTimeout(resolve, 1000));
+    await new Promise(resolve => setTimeout(resolve, 4000));
 
     // Should trigger a rebuild.
     await appendToFile('src/environments/environment.prod.ts', `console.log('PROD');`);

From 4a50df69262bce116ad021b738740028468502a0 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sun, 14 Apr 2019 14:24:38 +0000
Subject: [PATCH 1130/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 13644191697c..978be3a15645 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#95201da0e8c3f52ec46da77c73cbec7c68c9220c",
-    "@angular/common": "github:angular/common-builds#53abc1306d011e9a6cd13fbccd9d502f7ac5a931",
-    "@angular/compiler": "github:angular/compiler-builds#c08a4b94b9fedf92cfaf1081eebd7b1f1ca9116f",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#293abe4f8d3c3e9d595bd6ba4fe1c906ca7505d6",
-    "@angular/core": "github:angular/core-builds#d6ea1e8cd60e1e5bd7114cb879209e1ae2ec6c6e",
-    "@angular/forms": "github:angular/forms-builds#259311ac5f80e34049d7ec9021dec3c172f3a8cf",
-    "@angular/language-service": "github:angular/language-service-builds#fa42e0a571e37d8175cddcca2b7ba597b34048ec",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#ebfd18a3a81a3dc8d7ba7c3f16f8e5b18c5dab31",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#3a5c617246d54e4c5d48e4ca949266d062d08465",
-    "@angular/router": "github:angular/router-builds#bab8594b643b06957163397ff1bbc11469543e14"
+    "@angular/animations": "github:angular/animations-builds#dbaa3a5426835dbb767a674e5a8989383eb29e69",
+    "@angular/common": "github:angular/common-builds#a1e7ac081624a90244b3d419fa601f6b37cc87ef",
+    "@angular/compiler": "github:angular/compiler-builds#afec4e81443e3087a1a5fbd0299c77968eb7760f",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#b1dfb9cac3d0877f1214d429a5a0d8b65157f5be",
+    "@angular/core": "github:angular/core-builds#78799a1f9ea4ba04e203f6c0e9ac54c466c43b36",
+    "@angular/forms": "github:angular/forms-builds#7f8a43e5fd234a61b8ca3ee0109c809a4f3b0b3f",
+    "@angular/language-service": "github:angular/language-service-builds#110e5d74ac3aa7c3504d08876a1d2ef086dbfb96",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#eec7fde945faf2c3e03dc1217ec70daa62d18230",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#1d19fdce5909bb9c4ae2b6fcb9b38aa43e0abda5",
+    "@angular/router": "github:angular/router-builds#1f4472da7d29fde72a2ffd46761c0dad092eefe9"
   }
 }
\ No newline at end of file

From 51e370cefc7b3a5b5402b8a5f425474d6767c624 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 10 Apr 2019 12:56:25 -0400
Subject: [PATCH 1131/1703] fix(@angular-devkit/core): add project type as a
 workspace special extension

---
 packages/angular_devkit/core/src/workspace/json/reader.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/core/src/workspace/json/reader.ts b/packages/angular_devkit/core/src/workspace/json/reader.ts
index 53027a065b28..7f3e954b5e29 100644
--- a/packages/angular_devkit/core/src/workspace/json/reader.ts
+++ b/packages/angular_devkit/core/src/workspace/json/reader.ts
@@ -78,7 +78,7 @@ export async function readJsonWorkspace(
 
 const specialWorkspaceExtensions = ['cli', 'defaultProject', 'newProjectRoot', 'schematics'];
 
-const specialProjectExtensions = ['cli', 'schematics'];
+const specialProjectExtensions = ['cli', 'schematics', 'projectType'];
 
 function parseWorkspace(workspaceNode: JsonAstObject, context: ParserContext): WorkspaceDefinition {
   const jsonMetadata = context.metadata;

From 0d6a9f842c17b5eff735621df018666e3e407a1c Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 12 Apr 2019 14:58:16 -0400
Subject: [PATCH 1132/1703] refactor(@angular-devkit/core): rename workspace
 namespace to workspaces

This avoids massive amounts of name conflicts between a commonly named variable of 'workspace' and the namespace
---
 packages/angular_devkit/core/src/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/core/src/index.ts b/packages/angular_devkit/core/src/index.ts
index 388c3e7645ea..4e372e55f445 100644
--- a/packages/angular_devkit/core/src/index.ts
+++ b/packages/angular_devkit/core/src/index.ts
@@ -10,7 +10,7 @@ import * as experimental from './experimental';
 import * as json from './json/index';
 import * as logging from './logger/index';
 import * as terminal from './terminal/index';
-import * as workspace from './workspace';
+import * as workspaces from './workspace';
 
 export * from './exception/exception';
 export * from './json/index';
@@ -23,5 +23,5 @@ export {
   json,
   logging,
   terminal,
-  workspace,
+  workspaces,
 };

From 790a9622c4a6d293457a82747e3ef8daffc8af45 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 10 Apr 2019 12:57:19 -0400
Subject: [PATCH 1133/1703] refactor(@schematics/angular): add initial
 workspace helper rules

---
 .../schematics/angular/utility/workspace.ts   | 90 +++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 packages/schematics/angular/utility/workspace.ts

diff --git a/packages/schematics/angular/utility/workspace.ts b/packages/schematics/angular/utility/workspace.ts
new file mode 100644
index 000000000000..5b393daf7c78
--- /dev/null
+++ b/packages/schematics/angular/utility/workspace.ts
@@ -0,0 +1,90 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { virtualFs, workspaces } from '@angular-devkit/core';
+import { Rule, Tree } from '@angular-devkit/schematics';
+
+function createHost(tree: Tree): workspaces.WorkspaceHost {
+  return {
+    async readFile(path: string): Promise<string> {
+      const data = tree.read(path);
+      if (!data) {
+        throw new Error('File not found.');
+      }
+
+      return virtualFs.fileBufferToString(data);
+    },
+    async writeFile(path: string, data: string): Promise<void> {
+      return tree.overwrite(path, data);
+    },
+    async isDirectory(path: string): Promise<boolean> {
+      // approximate a directory check
+      return !tree.exists(path) && tree.getDir(path).subfiles.length > 0;
+    },
+    async isFile(path: string): Promise<boolean> {
+      return tree.exists(path);
+    },
+  };
+}
+
+export function updateWorkspace(
+  updater: (workspace: workspaces.WorkspaceDefinition) => void | PromiseLike<void>,
+): Rule;
+export function updateWorkspace(
+  workspace: workspaces.WorkspaceDefinition,
+): Rule;
+export function updateWorkspace(
+  updaterOrWorkspace: workspaces.WorkspaceDefinition
+    | ((workspace: workspaces.WorkspaceDefinition) => void | PromiseLike<void>),
+): Rule {
+  return async (tree: Tree) => {
+    const host = createHost(tree);
+
+    if (typeof updaterOrWorkspace === 'function') {
+
+      const { workspace } = await workspaces.readWorkspace('/', host);
+
+      const result = updaterOrWorkspace(workspace);
+      if (result !== undefined) {
+        await result;
+      }
+
+      await workspaces.writeWorkspace(workspace, host);
+    } else {
+      await workspaces.writeWorkspace(updaterOrWorkspace, host);
+    }
+  };
+}
+
+export async function getWorkspace(tree: Tree, path = '/') {
+  const host = createHost(tree);
+
+  const { workspace } = await workspaces.readWorkspace(path, host);
+
+  return workspace;
+}
+
+/**
+ * Build a default project path for generating.
+ * @param project The project which will have its default path generated.
+ */
+export function buildDefaultPath(project: workspaces.ProjectDefinition): string {
+  const root = project.sourceRoot ? `/${project.sourceRoot}/` : `/${project.root}/src/`;
+  const projectDirName = project.extensions['projectType'] === 'application' ? 'app' : 'lib';
+
+  return `${root}${projectDirName}`;
+}
+
+export async function createDefaultPath(tree: Tree, projectName: string): Promise<string> {
+  const workspace = await getWorkspace(tree);
+  const project = workspace.projects.get(projectName);
+  if (!project) {
+    throw new Error('Specified project does not exist.');
+  }
+
+  return buildDefaultPath(project);
+}

From 13abfd01ecf2f355fb3829eb9a6352a29ca748d5 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 10 Apr 2019 13:26:21 -0400
Subject: [PATCH 1134/1703] fix(@angular-devkit/schematics): fully support
 async rules

---
 .../angular_devkit/schematics/src/_golden-api.d.ts    |  2 +-
 .../angular_devkit/schematics/src/engine/interface.ts |  2 +-
 packages/angular_devkit/schematics/src/rules/call.ts  | 11 ++++++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/etc/api/angular_devkit/schematics/src/_golden-api.d.ts b/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
index f2b35fb764bc..4edbf47bee79 100644
--- a/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
@@ -426,7 +426,7 @@ export interface RequiredWorkflowExecutionContext {
     schematic: string;
 }
 
-export declare type Rule = (tree: Tree, context: SchematicContext) => Tree | Observable<Tree> | Rule | Promise<void> | void;
+export declare type Rule = (tree: Tree, context: SchematicContext) => Tree | Observable<Tree> | Rule | Promise<void> | Promise<Rule> | void;
 
 export declare type RuleFactory<T extends object> = (options: T) => Rule;
 
diff --git a/packages/angular_devkit/schematics/src/engine/interface.ts b/packages/angular_devkit/schematics/src/engine/interface.ts
index 2ca66dbdffca..5664780e19f1 100644
--- a/packages/angular_devkit/schematics/src/engine/interface.ts
+++ b/packages/angular_devkit/schematics/src/engine/interface.ts
@@ -231,4 +231,4 @@ export type AsyncFileOperator = (tree: FileEntry) => Observable<FileEntry | null
  */
 export type Source = (context: SchematicContext) => Tree | Observable<Tree>;
 export type Rule = (tree: Tree, context: SchematicContext) =>
-  Tree | Observable<Tree> | Rule | Promise<void> | void;
+  Tree | Observable<Tree> | Rule | Promise<void> | Promise<Rule> | void;
diff --git a/packages/angular_devkit/schematics/src/rules/call.ts b/packages/angular_devkit/schematics/src/rules/call.ts
index 4668d3df952c..369d81cd9eca 100644
--- a/packages/angular_devkit/schematics/src/rules/call.ts
+++ b/packages/angular_devkit/schematics/src/rules/call.ts
@@ -97,7 +97,16 @@ export function callRule(
         }),
       );
     } else if (isPromise(result)) {
-      return from(result).pipe(map(() => inputTree));
+      return from(result).pipe(
+        mergeMap(inner => {
+          if (typeof inner === 'function') {
+            // This is considered a Rule, chain the rule and return its output.
+            return callRule(inner, observableOf(inputTree), context);
+          } else {
+            return observableOf(inputTree);
+          }
+        }),
+      );
     } else if (TreeSymbol in result) {
       return observableOf(result);
     } else {

From 5d199b23aaed9d3204bd7442e4ce000c6bb31993 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 10 Apr 2019 13:30:04 -0400
Subject: [PATCH 1135/1703] refactor(@schematics/angular): update webworker to
 use new workspace rules

---
 .../schematics/angular/web-worker/index.ts    | 70 +++++++------------
 .../angular/web-worker/index_spec.ts          | 30 ++++----
 2 files changed, 45 insertions(+), 55 deletions(-)

diff --git a/packages/schematics/angular/web-worker/index.ts b/packages/schematics/angular/web-worker/index.ts
index ba7f32727b88..bbc83fcbca5d 100644
--- a/packages/schematics/angular/web-worker/index.ts
+++ b/packages/schematics/angular/web-worker/index.ts
@@ -10,46 +10,16 @@ import {
   Rule, SchematicContext, SchematicsException, Tree,
   apply, applyTemplates, chain, mergeWith, move, noop, url,
 } from '@angular-devkit/schematics';
-import { getWorkspace, updateWorkspace } from '../utility/config';
 import { appendValueInAstArray, findPropertyInAstObject } from '../utility/json-utils';
 import { parseName } from '../utility/parse-name';
-import { buildDefaultPath, getProject } from '../utility/project';
-import { getProjectTargets } from '../utility/project-targets';
-import {
-  BrowserBuilderOptions,
-  BrowserBuilderTarget,
-  WorkspaceSchema,
-} from '../utility/workspace-models';
+import { buildDefaultPath, getWorkspace, updateWorkspace } from '../utility/workspace';
+import { BrowserBuilderOptions } from '../utility/workspace-models';
 import { Schema as WebWorkerOptions } from './schema';
 
-function getProjectConfiguration(
-  workspace: WorkspaceSchema,
-  options: WebWorkerOptions,
-): BrowserBuilderOptions {
-  if (!options.target) {
-    throw new SchematicsException('Option (target) is required.');
-  }
-
-  const projectTargets = getProjectTargets(workspace, options.project);
-  if (!projectTargets[options.target]) {
-    throw new Error(`Target is not defined for this project.`);
-  }
-
-  const target = projectTargets[options.target] as BrowserBuilderTarget;
-
-  return target.options;
-}
 
-function addConfig(options: WebWorkerOptions, root: string): Rule {
+function addConfig(options: WebWorkerOptions, root: string, tsConfigPath: string): Rule {
   return (host: Tree, context: SchematicContext) => {
     context.logger.debug('updating project configuration.');
-    const workspace = getWorkspace(host);
-    const config = getProjectConfiguration(workspace, options);
-
-    if (config.webWorkerTsConfig) {
-      // Don't do anything if the configuration is already there.
-      return;
-    }
 
     const tsConfigRules = [];
 
@@ -60,9 +30,6 @@ function addConfig(options: WebWorkerOptions, root: string): Rule {
       move(root),
     ])));
 
-    // Add build-angular config flag.
-    config.webWorkerTsConfig = `${root.endsWith('/') ? root : root + '/'}tsconfig.worker.json`;
-
     // Add project tsconfig.json.
     // The project level tsconfig.json with webworker lib is for editor support since
     // the dom and webworker libs are mutually exclusive.
@@ -102,7 +69,6 @@ function addConfig(options: WebWorkerOptions, root: string): Rule {
 
     // Add worker glob exclusion to tsconfig.app.json.
     const workerGlob = '**/*.worker.ts';
-    const tsConfigPath = config.tsConfig;
     const buffer = host.read(tsConfigPath);
     if (buffer) {
       const tsCfgAst = parseJsonAst(buffer.toString(), JsonParseMode.Loose);
@@ -124,8 +90,6 @@ function addConfig(options: WebWorkerOptions, root: string): Rule {
     return chain([
       // Add tsconfigs.
       ...tsConfigRules,
-      // Add workspace configuration.
-      updateWorkspace(workspace),
     ]);
   };
 }
@@ -174,18 +138,31 @@ function addSnippet(options: WebWorkerOptions): Rule {
 }
 
 export default function (options: WebWorkerOptions): Rule {
-  return (host: Tree, context: SchematicContext) => {
-    const project = getProject(host, options.project);
+  return async (host: Tree) => {
+    const workspace = await getWorkspace(host);
+
     if (!options.project) {
       throw new SchematicsException('Option "project" is required.');
     }
+    if (!options.target) {
+      throw new SchematicsException('Option (target) is required.');
+    }
+
+    const project = workspace.projects.get(options.project);
     if (!project) {
       throw new SchematicsException(`Invalid project name (${options.project})`);
     }
-    if (project.projectType !== 'application') {
+    const projectType = project.extensions['projectType'];
+    if (projectType !== 'application') {
       throw new SchematicsException(`Web Worker requires a project type of "application".`);
     }
 
+    const projectTarget = project.targets.get(options.target);
+    if (!projectTarget) {
+      throw new Error(`Target is not defined for this project.`);
+    }
+    const projectTargetOptions = (projectTarget.options || {}) as unknown as BrowserBuilderOptions;
+
     if (options.path === undefined) {
       options.path = buildDefaultPath(project);
     }
@@ -194,6 +171,12 @@ export default function (options: WebWorkerOptions): Rule {
     options.path = parsedPath.path;
     const root = project.root || project.sourceRoot || '';
 
+    const needWebWorkerConfig = !projectTargetOptions.webWorkerTsConfig;
+    if (needWebWorkerConfig) {
+      projectTargetOptions.webWorkerTsConfig =
+        `${root.endsWith('/') ? root : root + '/'}tsconfig.worker.json`;
+    }
+
     const templateSource = apply(url('./files/worker'), [
       applyTemplates({ ...options, ...strings }),
       move(parsedPath.path),
@@ -201,7 +184,8 @@ export default function (options: WebWorkerOptions): Rule {
 
     return chain([
       // Add project configuration.
-      addConfig(options, root),
+      needWebWorkerConfig ? addConfig(options, root, projectTargetOptions.tsConfig) : noop(),
+      needWebWorkerConfig ? updateWorkspace(workspace) : noop(),
       // Create the worker in a sibling module.
       options.snippet ? addSnippet(options) : noop(),
       // Add the worker.
diff --git a/packages/schematics/angular/web-worker/index_spec.ts b/packages/schematics/angular/web-worker/index_spec.ts
index dbe82d773374..6a41658f77ce 100644
--- a/packages/schematics/angular/web-worker/index_spec.ts
+++ b/packages/schematics/angular/web-worker/index_spec.ts
@@ -46,39 +46,45 @@ describe('Service Worker Schematic', () => {
     appTree = schematicRunner.runSchematic('application', appOptions, appTree);
   });
 
-  it('should put the worker file in the project root', () => {
-    const tree = schematicRunner.runSchematic('web-worker', defaultOptions, appTree);
+  it('should put the worker file in the project root', async () => {
+    const tree = await schematicRunner.runSchematicAsync('web-worker', defaultOptions, appTree)
+      .toPromise();
     const path = '/projects/bar/src/app/app.worker.ts';
     expect(tree.exists(path)).toEqual(true);
   });
 
-  it('should put a new tsconfig.json file in the project root', () => {
-    const tree = schematicRunner.runSchematic('web-worker', defaultOptions, appTree);
+  it('should put a new tsconfig.json file in the project root', async () => {
+    const tree = await schematicRunner.runSchematicAsync('web-worker', defaultOptions, appTree)
+      .toPromise();
     const path = '/projects/bar/tsconfig.json';
     expect(tree.exists(path)).toEqual(true);
   });
 
-  it('should put the tsconfig.worker.json file in the project root', () => {
-    const tree = schematicRunner.runSchematic('web-worker', defaultOptions, appTree);
+  it('should put the tsconfig.worker.json file in the project root', async () => {
+    const tree = await schematicRunner.runSchematicAsync('web-worker', defaultOptions, appTree)
+      .toPromise();
     const path = '/projects/bar/tsconfig.worker.json';
     expect(tree.exists(path)).toEqual(true);
   });
 
-  it('should add the webWorkerTsConfig option to workspace', () => {
-    const tree = schematicRunner.runSchematic('web-worker', defaultOptions, appTree);
+  it('should add the webWorkerTsConfig option to workspace', async () => {
+    const tree = await schematicRunner.runSchematicAsync('web-worker', defaultOptions, appTree)
+      .toPromise();
     const { projects } = JSON.parse(tree.readContent('/angular.json'));
     expect(projects.bar.architect.build.options.webWorkerTsConfig)
       .toBe('projects/bar/tsconfig.worker.json');
   });
 
-  it('should add exclusions to tsconfig.app.json', () => {
-    const tree = schematicRunner.runSchematic('web-worker', defaultOptions, appTree);
+  it('should add exclusions to tsconfig.app.json', async () => {
+    const tree = await schematicRunner.runSchematicAsync('web-worker', defaultOptions, appTree)
+      .toPromise();
     const { exclude } = JSON.parse(tree.readContent('/projects/bar/tsconfig.app.json'));
     expect(exclude).toContain('**/*.worker.ts');
   });
 
-  it('should add snippet to sibling file', () => {
-    const tree = schematicRunner.runSchematic('web-worker', defaultOptions, appTree);
+  it('should add snippet to sibling file', async () => {
+    const tree = await schematicRunner.runSchematicAsync('web-worker', defaultOptions, appTree)
+      .toPromise();
     const appComponent = tree.readContent('/projects/bar/src/app/app.component.ts');
     expect(appComponent).toContain(`new Worker('./${defaultOptions.name}.worker`);
     expect(appComponent).toContain('console.log(`page got message: ${data}`)');

From e075edf8b4fd784eb0722a072d3d99ab6f1717f8 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 10 Apr 2019 21:00:04 -0400
Subject: [PATCH 1136/1703] refactor(@schematics/angular): update universal to
 use new workspace rules

---
 .../schematics/angular/universal/index.ts     | 121 ++++++++----------
 .../angular/universal/index_spec.ts           |  51 +++++---
 2 files changed, 87 insertions(+), 85 deletions(-)

diff --git a/packages/schematics/angular/universal/index.ts b/packages/schematics/angular/universal/index.ts
index 8b015b968332..2dcd9f197697 100644
--- a/packages/schematics/angular/universal/index.ts
+++ b/packages/schematics/angular/universal/index.ts
@@ -8,7 +8,6 @@
 import {
   Path,
   basename,
-  experimental,
   join,
   normalize,
   parseJson,
@@ -32,52 +31,44 @@ import {
 import * as ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { findNode, getDecoratorMetadata } from '../utility/ast-utils';
 import { InsertChange } from '../utility/change';
-import { getWorkspace, updateWorkspace } from '../utility/config';
 import { addPackageJsonDependency, getPackageJsonDependency } from '../utility/dependencies';
 import { findBootstrapModuleCall, findBootstrapModulePath } from '../utility/ng-ast-utils';
-import { getProject } from '../utility/project';
-import { getProjectTargets, targetBuildNotFoundError } from '../utility/project-targets';
-import { Builders, WorkspaceTargets } from '../utility/workspace-models';
+import { targetBuildNotFoundError } from '../utility/project-targets';
+import { getWorkspace, updateWorkspace } from '../utility/workspace';
+import { BrowserBuilderOptions, Builders } from '../utility/workspace-models';
 import { Schema as UniversalOptions } from './schema';
 
-
-function getFileReplacements(target: WorkspaceTargets) {
-  const fileReplacements =
-    target.build &&
-    target.build.configurations &&
-    target.build.configurations.production &&
-    target.build.configurations.production.fileReplacements;
-
-  return fileReplacements || [];
-}
-
 function updateConfigFile(options: UniversalOptions, tsConfigDirectory: Path): Rule {
-  return (host: Tree) => {
-    const workspace = getWorkspace(host);
-    const clientProject = getProject(workspace, options.clientProject);
-    const projectTargets = getProjectTargets(clientProject);
-
-    projectTargets.server = {
-      builder: Builders.Server,
-      options: {
-        outputPath: `dist/${options.clientProject}-server`,
-        main: `${clientProject.root}src/main.server.ts`,
-        tsConfig: join(tsConfigDirectory, `${options.tsconfigFileName}.json`),
-      },
-      configurations: {
-        production: {
-          fileReplacements: getFileReplacements(projectTargets),
-          sourceMap: false,
-          optimization: {
-            scripts: false,
-            styles: true,
+  return updateWorkspace(workspace => {
+    const clientProject = workspace.projects.get(options.clientProject);
+    if (clientProject) {
+      const buildTarget = clientProject.targets.get('build');
+      let fileReplacements;
+      if (buildTarget && buildTarget.configurations && buildTarget.configurations.production) {
+        fileReplacements = buildTarget.configurations.production.fileReplacements;
+      }
+
+      clientProject.targets.add({
+        name: 'server',
+        builder: Builders.Server,
+        options: {
+          outputPath: `dist/${options.clientProject}-server`,
+          main: `${clientProject.root}src/main.server.ts`,
+          tsConfig: join(tsConfigDirectory, `${options.tsconfigFileName}.json`),
+        },
+        configurations: {
+          production: {
+            fileReplacements,
+            sourceMap: false,
+            optimization: {
+              scripts: false,
+              styles: true,
+            },
           },
         },
-      },
-    };
-
-    return updateWorkspace(workspace);
-  };
+      });
+    }
+  });
 }
 
 function findBrowserModuleImport(host: Tree, modulePath: string): ts.Node {
@@ -99,13 +90,9 @@ function findBrowserModuleImport(host: Tree, modulePath: string): ts.Node {
   return browserModuleNode;
 }
 
-function wrapBootstrapCall(options: UniversalOptions): Rule {
+function wrapBootstrapCall(mainFile: string): Rule {
   return (host: Tree) => {
-    const clientTargets = getProjectTargets(host, options.clientProject);
-    if (!clientTargets.build) {
-      throw targetBuildNotFoundError();
-    }
-    const mainPath = normalize('/' + clientTargets.build.options.main);
+    const mainPath = normalize('/' + mainFile);
     let bootstrapCall: ts.Node | null = findBootstrapModuleCall(host, mainPath);
     if (bootstrapCall === null) {
       throw new SchematicsException('Bootstrap module not found.');
@@ -172,18 +159,17 @@ function findCallExpressionNode(node: ts.Node, text: string): ts.Node | null {
   return foundNode;
 }
 
-function addServerTransition(options: UniversalOptions): Rule {
+function addServerTransition(
+  options: UniversalOptions,
+  mainFile: string,
+  clientProjectRoot: string,
+): Rule {
   return (host: Tree) => {
-    const clientProject = getProject(host, options.clientProject);
-    const clientTargets = getProjectTargets(clientProject);
-    if (!clientTargets.build) {
-      throw targetBuildNotFoundError();
-    }
-    const mainPath = normalize('/' + clientTargets.build.options.main);
+    const mainPath = normalize('/' + mainFile);
 
     const bootstrapModuleRelativePath = findBootstrapModulePath(host, mainPath);
     const bootstrapModulePath = normalize(
-      `/${clientProject.root}/src/${bootstrapModuleRelativePath}.ts`);
+      `/${clientProjectRoot}/src/${bootstrapModuleRelativePath}.ts`);
 
     const browserModuleImport = findBrowserModuleImport(host, bootstrapModulePath);
     const appId = options.appId;
@@ -214,8 +200,7 @@ function addDependencies(): Rule {
   };
 }
 
-function getTsConfigOutDir(host: Tree, targets: experimental.workspace.WorkspaceTool): string {
-  const tsConfigPath = targets.build.options.tsConfig;
+function getTsConfigOutDir(host: Tree, tsConfigPath: string): string {
   const tsConfigBuffer = host.read(tsConfigPath);
   if (!tsConfigBuffer) {
     throw new SchematicsException(`Could not read ${tsConfigPath}`);
@@ -233,18 +218,24 @@ function getTsConfigOutDir(host: Tree, targets: experimental.workspace.Workspace
 }
 
 export default function (options: UniversalOptions): Rule {
-  return (host: Tree, context: SchematicContext) => {
-    const clientProject = getProject(host, options.clientProject);
-    if (clientProject.projectType !== 'application') {
+  return async (host: Tree, context: SchematicContext) => {
+    const workspace = await getWorkspace(host);
+
+    const clientProject = workspace.projects.get(options.clientProject);
+    if (!clientProject || clientProject.extensions.projectType !== 'application') {
       throw new SchematicsException(`Universal requires a project type of "application".`);
     }
-    const clientTargets = getProjectTargets(clientProject);
-    const outDir = getTsConfigOutDir(host, clientTargets);
-    if (!clientTargets.build) {
+
+    const clientBuildTarget = clientProject.targets.get('build');
+    if (!clientBuildTarget) {
       throw targetBuildNotFoundError();
     }
+    const clientBuildOptions =
+      (clientBuildTarget.options || {}) as unknown as BrowserBuilderOptions;
+
+    const outDir = getTsConfigOutDir(host, clientBuildOptions.tsConfig);
 
-    const clientTsConfig = normalize(clientTargets.build.options.tsConfig);
+    const clientTsConfig = normalize(clientBuildOptions.tsConfig);
     const tsConfigExtends = basename(clientTsConfig);
     // this is needed because prior to version 8, tsconfig might have been in 'src'
     // and we don't want to break the 'ng add @nguniversal/express-engine schematics'
@@ -281,8 +272,8 @@ export default function (options: UniversalOptions): Rule {
       mergeWith(rootSource),
       addDependencies(),
       updateConfigFile(options, tsConfigDirectory),
-      wrapBootstrapCall(options),
-      addServerTransition(options),
+      wrapBootstrapCall(clientBuildOptions.main),
+      addServerTransition(options, clientBuildOptions.main, clientProject.root),
     ]);
   };
 }
diff --git a/packages/schematics/angular/universal/index_spec.ts b/packages/schematics/angular/universal/index_spec.ts
index d08d3bb3f8cf..59011d001d14 100644
--- a/packages/schematics/angular/universal/index_spec.ts
+++ b/packages/schematics/angular/universal/index_spec.ts
@@ -57,22 +57,27 @@ describe('Universal Schematic', () => {
     appTree = schematicRunner.runSchematic('application', appOptions, appTree);
   });
 
-  it('should create a root module file', () => {
-    const tree = schematicRunner.runSchematic('universal', defaultOptions, appTree);
+  it('should create a root module file', async () => {
+    const tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
+      .toPromise();
     const filePath = '/projects/bar/src/app/app.server.module.ts';
     expect(tree.exists(filePath)).toEqual(true);
   });
 
-  it('should create a main file', () => {
-    const tree = schematicRunner.runSchematic('universal', defaultOptions, appTree);
+  it('should create a main file', async () => {
+    const tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
+      .toPromise();
     const filePath = '/projects/bar/src/main.server.ts';
     expect(tree.exists(filePath)).toEqual(true);
     const contents = tree.readContent(filePath);
     expect(contents).toMatch(/export { AppServerModule } from '\.\/app\/app\.server\.module'/);
   });
 
-  it('should create a tsconfig file for the workspace project', () => {
-    const tree = schematicRunner.runSchematic('universal', workspaceUniversalOptions, appTree);
+  it('should create a tsconfig file for the workspace project', async () => {
+    const tree = await schematicRunner
+      .runSchematicAsync('universal', workspaceUniversalOptions, appTree)
+      .toPromise();
+    debugger;
     const filePath = '/tsconfig.server.json';
     expect(tree.exists(filePath)).toEqual(true);
     const contents = tree.readContent(filePath);
@@ -90,8 +95,9 @@ describe('Universal Schematic', () => {
       .server.options.tsConfig).toEqual('tsconfig.server.json');
   });
 
-  it('should create a tsconfig file for a generated application', () => {
-    const tree = schematicRunner.runSchematic('universal', defaultOptions, appTree);
+  it('should create a tsconfig file for a generated application', async () => {
+    const tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
+      .toPromise();
     const filePath = '/projects/bar/tsconfig.server.json';
     expect(tree.exists(filePath)).toEqual(true);
     const contents = tree.readContent(filePath);
@@ -109,15 +115,17 @@ describe('Universal Schematic', () => {
       .server.options.tsConfig).toEqual('projects/bar/tsconfig.server.json');
   });
 
-  it('should add dependency: @angular/platform-server', () => {
-    const tree = schematicRunner.runSchematic('universal', defaultOptions, appTree);
+  it('should add dependency: @angular/platform-server', async () => {
+    const tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
+      .toPromise();
     const filePath = '/package.json';
     const contents = tree.readContent(filePath);
     expect(contents).toMatch(/\"@angular\/platform-server\": \"/);
   });
 
-  it('should update workspace with a server target', () => {
-    const tree = schematicRunner.runSchematic('universal', defaultOptions, appTree);
+  it('should update workspace with a server target', async () => {
+    const tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
+      .toPromise();
     const filePath = '/angular.json';
     const contents = tree.readContent(filePath);
     const config = JSON.parse(contents.toString());
@@ -137,22 +145,24 @@ describe('Universal Schematic', () => {
     expect(fileReplacements[0].with).toEqual('projects/bar/src/environments/environment.prod.ts');
   });
 
-  it('should add a server transition to BrowerModule import', () => {
-    const tree = schematicRunner.runSchematic('universal', defaultOptions, appTree);
+  it('should add a server transition to BrowerModule import', async () => {
+    const tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
+      .toPromise();
     const filePath = '/projects/bar/src/app/app.module.ts';
     const contents = tree.readContent(filePath);
     expect(contents).toMatch(/BrowserModule\.withServerTransition\({ appId: 'serverApp' }\)/);
   });
 
-  it('should wrap the bootstrap call in a DOMContentLoaded event handler', () => {
-    const tree = schematicRunner.runSchematic('universal', defaultOptions, appTree);
+  it('should wrap the bootstrap call in a DOMContentLoaded event handler', async () => {
+    const tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
+      .toPromise();
     const filePath = '/projects/bar/src/main.ts';
     const contents = tree.readContent(filePath);
     expect(contents)
       .toMatch(/document.addEventListener\('DOMContentLoaded', \(\) => {[\w\W]+;[\r\n]}\);/);
   });
 
-  it('should wrap the bootstrap declaration in a DOMContentLoaded event handler', () => {
+  it('should wrap the bootstrap declaration in a DOMContentLoaded event handler', async () => {
     const filePath = '/projects/bar/src/main.ts';
     appTree.overwrite(
       filePath,
@@ -175,15 +185,16 @@ describe('Universal Schematic', () => {
       `,
     );
 
-    const tree = schematicRunner.runSchematic('universal', defaultOptions, appTree);
+    const tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
+      .toPromise();
     const contents = tree.readContent(filePath);
     expect(contents).toMatch(
       /document.addEventListener\('DOMContentLoaded', \(\) => {[\n\r\s]+bootstrap\(\)/,
     );
   });
 
-  it('should install npm dependencies', () => {
-    schematicRunner.runSchematic('universal', defaultOptions, appTree);
+  it('should install npm dependencies', async () => {
+    await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree).toPromise();
     expect(schematicRunner.tasks.length).toBe(1);
     expect(schematicRunner.tasks[0].name).toBe('node-package');
     expect((schematicRunner.tasks[0].options as {command: string}).command).toBe('install');

From 83f3c6c39ec9ab0a5a8275cb3216a6ccac4fbcf5 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 11 Apr 2019 14:06:22 -0400
Subject: [PATCH 1137/1703] refactor(@schematics/angular): update app-shell to
 use new workspace rules

---
 .../schematics/angular/app-shell/index.ts     | 141 +++++++++---------
 .../angular/app-shell/index_spec.ts           |  58 ++++---
 2 files changed, 107 insertions(+), 92 deletions(-)

diff --git a/packages/schematics/angular/app-shell/index.ts b/packages/schematics/angular/app-shell/index.ts
index 0431ad605c96..868205182de6 100644
--- a/packages/schematics/angular/app-shell/index.ts
+++ b/packages/schematics/angular/app-shell/index.ts
@@ -5,13 +5,14 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { dirname, experimental, join, normalize } from '@angular-devkit/core';
+import { dirname, join, normalize } from '@angular-devkit/core';
 import {
   Rule,
   SchematicContext,
   SchematicsException,
   Tree,
   chain,
+  noop,
   schematic,
 } from '@angular-devkit/schematics';
 import { Schema as ComponentOptions } from '../component/schema';
@@ -26,11 +27,10 @@ import {
   isImported,
 } from '../utility/ast-utils';
 import { Change, InsertChange } from '../utility/change';
-import { getWorkspace, updateWorkspace } from '../utility/config';
 import { getAppModulePath } from '../utility/ng-ast-utils';
-import { getProject } from '../utility/project';
-import { getProjectTargets, targetBuildNotFoundError } from '../utility/project-targets';
-import { Builders, WorkspaceProject } from '../utility/workspace-models';
+import { targetBuildNotFoundError } from '../utility/project-targets';
+import { getWorkspace, updateWorkspace } from '../utility/workspace';
+import { BrowserBuilderOptions, Builders, ServerBuilderOptions } from '../utility/workspace-models';
 import { Schema as AppShellOptions } from './schema';
 
 function getSourceFile(host: Tree, path: string): ts.SourceFile {
@@ -46,10 +46,9 @@ function getSourceFile(host: Tree, path: string): ts.SourceFile {
 
 function getServerModulePath(
   host: Tree,
-  project: experimental.workspace.WorkspaceProject,
-  architect: experimental.workspace.WorkspaceTool,
+  projectRoot: string,
+  mainPath: string,
 ): string | null {
-  const mainPath = architect.server.options.main;
   const mainSource = getSourceFile(host, mainPath);
   const allNodes = getSourceNodes(mainSource);
   const expNode = allNodes.filter(node => node.kind === ts.SyntaxKind.ExportDeclaration)[0];
@@ -57,7 +56,7 @@ function getServerModulePath(
     return null;
   }
   const relativePath = (expNode as ts.ExportDeclaration).moduleSpecifier as ts.StringLiteral;
-  const modulePath = normalize(`/${project.root}/src/${relativePath.text}.ts`);
+  const modulePath = normalize(`/${projectRoot}/src/${relativePath.text}.ts`);
 
   return modulePath;
 }
@@ -97,14 +96,8 @@ function getComponentTemplate(host: Tree, compPath: string, tmplInfo: TemplateIn
 
 function getBootstrapComponentPath(
   host: Tree,
-  project: WorkspaceProject,
+  mainPath: string,
 ): string {
-  const projectTargets = getProjectTargets(project);
-  if (!projectTargets.build) {
-    throw targetBuildNotFoundError();
-  }
-
-  const mainPath = projectTargets.build.options.main;
   const modulePath = getAppModulePath(host, mainPath);
   const moduleSource = getSourceFile(host, modulePath);
 
@@ -131,15 +124,11 @@ function getBootstrapComponentPath(
 }
 // end helper functions.
 
-function validateProject(options: AppShellOptions): Rule {
+function validateProject(mainPath: string): Rule {
   return (host: Tree, context: SchematicContext) => {
     const routerOutletCheckRegex = /<router\-outlet.*?>([\s\S]*?)<\/router\-outlet>/;
 
-    const clientProject = getProject(host, options.clientProject);
-    if (clientProject.projectType !== 'application') {
-      throw new SchematicsException(`App shell requires a project type of "application".`);
-    }
-    const componentPath = getBootstrapComponentPath(host, clientProject);
+    const componentPath = getBootstrapComponentPath(host, mainPath);
     const tmpl = getComponentTemplateInfo(host, componentPath);
     const template = getComponentTemplate(host, componentPath, tmpl);
     if (!routerOutletCheckRegex.test(template)) {
@@ -152,12 +141,7 @@ function validateProject(options: AppShellOptions): Rule {
 }
 
 function addUniversalTarget(options: AppShellOptions): Rule {
-  return (host: Tree, context: SchematicContext) => {
-    const architect = getProjectTargets(host, options.clientProject);
-    if (architect.server) {
-      return host;
-    }
-
+  return () => {
     // Copy options.
     const universalOptions = {
       ...options,
@@ -177,39 +161,38 @@ function addUniversalTarget(options: AppShellOptions): Rule {
 }
 
 function addAppShellConfigToWorkspace(options: AppShellOptions): Rule {
-  return (host: Tree) => {
+  return () => {
     if (!options.route) {
       throw new SchematicsException(`Route is not defined`);
     }
 
-    const workspace = getWorkspace(host);
-    const projectTargets = getProjectTargets(workspace, options.clientProject);
-    projectTargets['app-shell'] = {
-      builder: Builders.AppShell,
-      options: {
-        browserTarget: `${options.clientProject}:build`,
-        serverTarget: `${options.clientProject}:server`,
-        route: options.route,
-      },
-      configurations: {
-        production: {
-          browserTarget: `${options.clientProject}:build:production`,
-          serverTarget: `${options.clientProject}:server:production`,
-        },
-      },
-    };
+    return updateWorkspace(workspace => {
+      const project = workspace.projects.get(options.clientProject);
+      if (!project) {
+        return;
+      }
 
-    return updateWorkspace(workspace);
+      project.targets.add({
+        name: 'app-shell',
+        builder: Builders.AppShell,
+        options: {
+          browserTarget: `${options.clientProject}:build`,
+          serverTarget: `${options.clientProject}:server`,
+          route: options.route,
+        },
+        configurations: {
+          production: {
+            browserTarget: `${options.clientProject}:build:production`,
+            serverTarget: `${options.clientProject}:server:production`,
+          },
+        },
+      });
+    });
   };
 }
 
-function addRouterModule(options: AppShellOptions): Rule {
+function addRouterModule(mainPath: string): Rule {
   return (host: Tree) => {
-    const projectTargets = getProjectTargets(host, options.clientProject);
-    if (!projectTargets.build) {
-      throw targetBuildNotFoundError();
-    }
-    const mainPath = projectTargets.build.options.main;
     const modulePath = getAppModulePath(host, mainPath);
     const moduleSource = getSourceFile(host, modulePath);
     const changes = addImportToModule(moduleSource, modulePath, 'RouterModule', '@angular/router');
@@ -245,11 +228,22 @@ function getMetadataProperty(metadata: ts.Node, propertyName: string): ts.Proper
 }
 
 function addServerRoutes(options: AppShellOptions): Rule {
-  return (host: Tree) => {
-    const clientProject = getProject(host, options.clientProject);
-    const architect = getProjectTargets(clientProject);
-    // const mainPath = universalArchitect.build.options.main;
-    const modulePath = getServerModulePath(host, clientProject, architect);
+  return async (host: Tree) => {
+    // The workspace gets updated so this needs to be reloaded
+    const workspace = await getWorkspace(host);
+    const clientProject = workspace.projects.get(options.clientProject);
+    if (!clientProject) {
+      throw new Error('Universal schematic removed client project.');
+    }
+    const clientServerTarget = clientProject.targets.get('server');
+    if (!clientServerTarget) {
+      throw new Error('Universal schematic did not add server target to client project.');
+    }
+    const clientServerOptions = clientServerTarget.options as unknown as ServerBuilderOptions;
+    if (!clientServerOptions) {
+      throw new SchematicsException('Server target does not contain options.');
+    }
+    const modulePath = getServerModulePath(host, clientProject.root, clientServerOptions.main);
     if (modulePath === null) {
       throw new SchematicsException('Universal/server module not found.');
     }
@@ -296,9 +290,6 @@ function addServerRoutes(options: AppShellOptions): Rule {
       }
       host.commitUpdate(recorder);
     }
-
-
-    return host;
   };
 }
 
@@ -313,12 +304,26 @@ function addShellComponent(options: AppShellOptions): Rule {
 }
 
 export default function (options: AppShellOptions): Rule {
-  return chain([
-    validateProject(options),
-    addUniversalTarget(options),
-    addAppShellConfigToWorkspace(options),
-    addRouterModule(options),
-    addServerRoutes(options),
-    addShellComponent(options),
-  ]);
+  return async tree => {
+    const workspace = await getWorkspace(tree);
+    const clientProject = workspace.projects.get(options.clientProject);
+    if (!clientProject || clientProject.extensions.projectType !== 'application') {
+      throw new SchematicsException(`A client project type of "application" is required.`);
+    }
+    const clientBuildTarget = clientProject.targets.get('build');
+    if (!clientBuildTarget) {
+      throw targetBuildNotFoundError();
+    }
+    const clientBuildOptions =
+      (clientBuildTarget.options || {}) as unknown as BrowserBuilderOptions;
+
+    return chain([
+      validateProject(clientBuildOptions.main),
+      clientProject.targets.has('server') ? noop() : addUniversalTarget(options),
+      addAppShellConfigToWorkspace(options),
+      addRouterModule(clientBuildOptions.main),
+      addServerRoutes(options),
+      addShellComponent(options),
+    ]);
+  };
 }
diff --git a/packages/schematics/angular/app-shell/index_spec.ts b/packages/schematics/angular/app-shell/index_spec.ts
index 75cb959ff69b..56355b17032a 100644
--- a/packages/schematics/angular/app-shell/index_spec.ts
+++ b/packages/schematics/angular/app-shell/index_spec.ts
@@ -44,22 +44,24 @@ describe('App Shell Schematic', () => {
   });
 
 
-  it('should ensure the client app has a router-outlet', () => {
+  it('should ensure the client app has a router-outlet', async () => {
     appTree = schematicRunner.runSchematic('workspace', workspaceOptions);
     appTree = schematicRunner.runSchematic('application', {...appOptions, routing: false}, appTree);
-    expect(() => {
-      schematicRunner.runSchematic('appShell', defaultOptions, appTree);
-    }).toThrowError();
+    await expectAsync(
+      schematicRunner.runSchematicAsync('appShell', defaultOptions, appTree).toPromise(),
+    ).toBeRejected();
   });
 
-  it('should add a universal app', () => {
-    const tree = schematicRunner.runSchematic('appShell', defaultOptions, appTree);
+  it('should add a universal app', async () => {
+    const tree = await schematicRunner.runSchematicAsync('appShell', defaultOptions, appTree)
+      .toPromise();
     const filePath = '/projects/bar/src/app/app.server.module.ts';
     expect(tree.exists(filePath)).toEqual(true);
   });
 
-  it('should add app shell configuration', () => {
-    const tree = schematicRunner.runSchematic('appShell', defaultOptions, appTree);
+  it('should add app shell configuration', async () => {
+    const tree = await schematicRunner.runSchematicAsync('appShell', defaultOptions, appTree)
+      .toPromise();
     const filePath = '/angular.json';
     const content = tree.readContent(filePath);
     const workspace = JSON.parse(content);
@@ -71,19 +73,21 @@ describe('App Shell Schematic', () => {
     expect(target.configurations.production.serverTarget).toEqual('bar:server:production');
   });
 
-  it('should add router module to client app module', () => {
-    const tree = schematicRunner.runSchematic('appShell', defaultOptions, appTree);
+  it('should add router module to client app module', async () => {
+    const tree = await schematicRunner.runSchematicAsync('appShell', defaultOptions, appTree)
+      .toPromise();
     const filePath = '/projects/bar/src/app/app.module.ts';
     const content = tree.readContent(filePath);
     expect(content).toMatch(/import { RouterModule } from \'@angular\/router\';/);
   });
 
-  it('should not fail when AppModule have imported RouterModule already', () => {
+  it('should not fail when AppModule have imported RouterModule already', async () => {
     const updateRecorder = appTree.beginUpdate('/projects/bar/src/app/app.module.ts');
     updateRecorder.insertLeft(0, 'import { RouterModule } from \'@angular/router\';');
     appTree.commitUpdate(updateRecorder);
 
-    const tree = schematicRunner.runSchematic('appShell', defaultOptions, appTree);
+    const tree = await schematicRunner.runSchematicAsync('appShell', defaultOptions, appTree)
+      .toPromise();
     const filePath = '/projects/bar/src/app/app.module.ts';
     const content = tree.readContent(filePath);
     expect(content).toMatch(/import { RouterModule } from \'@angular\/router\';/);
@@ -119,10 +123,11 @@ describe('App Shell Schematic', () => {
       tree.delete('/projects/bar/src/app/app.component.html');
     }
 
-    it('should not re-add the router outlet (external template)', () => {
+    it('should not re-add the router outlet (external template)', async () => {
       const htmlPath = '/projects/bar/src/app/app.component.html';
       appTree.overwrite(htmlPath, '<router-outlet></router-outlet>');
-      const tree = schematicRunner.runSchematic('appShell', defaultOptions, appTree);
+      const tree = await schematicRunner.runSchematicAsync('appShell', defaultOptions, appTree)
+        .toPromise();
 
       const content = tree.readContent(htmlPath);
       const matches = content.match(/<router\-outlet><\/router\-outlet>/g);
@@ -130,9 +135,10 @@ describe('App Shell Schematic', () => {
       expect(numMatches).toEqual(1);
     });
 
-    it('should not re-add the router outlet (inline template)', () => {
+    it('should not re-add the router outlet (inline template)', async () => {
       makeInlineTemplate(appTree, '<router-outlet></router-outlet>');
-      const tree = schematicRunner.runSchematic('appShell', defaultOptions, appTree);
+      const tree = await schematicRunner.runSchematicAsync('appShell', defaultOptions, appTree)
+        .toPromise();
       const content = tree.readContent('/projects/bar/src/app/app.component.ts');
       const matches = content.match(/<router\-outlet><\/router\-outlet>/g);
       const numMatches = matches ? matches.length : 0;
@@ -140,22 +146,25 @@ describe('App Shell Schematic', () => {
     });
   });
 
-  it('should add router imports to server module', () => {
-    const tree = schematicRunner.runSchematic('appShell', defaultOptions, appTree);
+  it('should add router imports to server module', async () => {
+    const tree = await schematicRunner.runSchematicAsync('appShell', defaultOptions, appTree)
+      .toPromise();
     const filePath = '/projects/bar/src/app/app.server.module.ts';
     const content = tree.readContent(filePath);
     expect(content).toMatch(/import { Routes, RouterModule } from \'@angular\/router\';/);
   });
 
-  it('should define a server route', () => {
-    const tree = schematicRunner.runSchematic('appShell', defaultOptions, appTree);
+  it('should define a server route', async () => {
+    const tree = await schematicRunner.runSchematicAsync('appShell', defaultOptions, appTree)
+      .toPromise();
     const filePath = '/projects/bar/src/app/app.server.module.ts';
     const content = tree.readContent(filePath);
     expect(content).toMatch(/const routes: Routes = \[/);
   });
 
-  it('should import RouterModule with forRoot', () => {
-    const tree = schematicRunner.runSchematic('appShell', defaultOptions, appTree);
+  it('should import RouterModule with forRoot', async () => {
+    const tree = await schematicRunner.runSchematicAsync('appShell', defaultOptions, appTree)
+      .toPromise();
     const filePath = '/projects/bar/src/app/app.server.module.ts';
     const content = tree.readContent(filePath);
     expect(content)
@@ -164,8 +173,9 @@ describe('App Shell Schematic', () => {
       .toMatch(/ServerModule,\r?\n\s*RouterModule\.forRoot\(routes\),/);
   });
 
-  it('should create the shell component', () => {
-    const tree = schematicRunner.runSchematic('appShell', defaultOptions, appTree);
+  it('should create the shell component', async () => {
+    const tree = await schematicRunner.runSchematicAsync('appShell', defaultOptions, appTree)
+      .toPromise();
     expect(tree.exists('/projects/bar/src/app/app-shell/app-shell.component.ts')).toBe(true);
     const content = tree.readContent('/projects/bar/src/app/app.server.module.ts');
     expect(content).toMatch(/app\-shell\.component/);

From d2fa2edb7ae4765c28c5202bb9c77e4f06371f49 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 11 Apr 2019 20:58:26 -0400
Subject: [PATCH 1138/1703] refactor(@schematics/angular): update class to use
 new workspace rules

---
 packages/schematics/angular/class/index.ts    | 14 ++------
 .../schematics/angular/class/index_spec.ts    | 35 +++++++++++--------
 packages/schematics/angular/class/schema.json |  3 +-
 3 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/packages/schematics/angular/class/index.ts b/packages/schematics/angular/class/index.ts
index ff1a68906ef8..46c1f4626bc7 100644
--- a/packages/schematics/angular/class/index.ts
+++ b/packages/schematics/angular/class/index.ts
@@ -8,8 +8,6 @@
 import { strings } from '@angular-devkit/core';
 import {
   Rule,
-  SchematicContext,
-  SchematicsException,
   Tree,
   apply,
   applyTemplates,
@@ -22,19 +20,13 @@ import {
 } from '@angular-devkit/schematics';
 import { applyLintFix } from '../utility/lint-fix';
 import { parseName } from '../utility/parse-name';
-import { buildDefaultPath, getProject } from '../utility/project';
+import { createDefaultPath } from '../utility/workspace';
 import { Schema as ClassOptions } from './schema';
 
 export default function (options: ClassOptions): Rule {
-  return (host: Tree, context: SchematicContext) => {
-    if (!options.project) {
-      throw new SchematicsException('Option (project) is required.');
-    }
-
-    const project = getProject(host, options.project);
-
+  return async (host: Tree) => {
     if (options.path === undefined) {
-      options.path = buildDefaultPath(project);
+      options.path = await createDefaultPath(host, options.project as string);
     }
 
     options.type = !!options.type ? `.${options.type}` : '';
diff --git a/packages/schematics/angular/class/index_spec.ts b/packages/schematics/angular/class/index_spec.ts
index 09a211437d79..0d07324f1407 100644
--- a/packages/schematics/angular/class/index_spec.ts
+++ b/packages/schematics/angular/class/index_spec.ts
@@ -44,54 +44,61 @@ describe('Class Schematic', () => {
     appTree = schematicRunner.runSchematic('application', appOptions, appTree);
   });
 
-  it('should create just the class file', () => {
-    const tree = schematicRunner.runSchematic('class', defaultOptions, appTree);
+  it('should create just the class file', async () => {
+    const tree = await schematicRunner.runSchematicAsync('class', defaultOptions, appTree)
+      .toPromise();
     expect(tree.files).toContain('/projects/bar/src/app/foo.ts');
     expect(tree.files).not.toContain('/projects/bar/src/app/foo.spec.ts');
   });
 
-  it('should create the class and spec file', () => {
+  it('should create the class and spec file', async () => {
     const options = {
       ...defaultOptions,
       spec: true,
     };
-    const tree = schematicRunner.runSchematic('class', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('class', options, appTree)
+      .toPromise();
     expect(tree.files).toContain('/projects/bar/src/app/foo.ts');
     expect(tree.files).toContain('/projects/bar/src/app/foo.spec.ts');
   });
 
-  it('should create an class named "Foo"', () => {
-    const tree = schematicRunner.runSchematic('class', defaultOptions, appTree);
+  it('should create an class named "Foo"', async () => {
+    const tree = await schematicRunner.runSchematicAsync('class', defaultOptions, appTree)
+      .toPromise();
     const fileContent = tree.readContent('/projects/bar/src/app/foo.ts');
     expect(fileContent).toMatch(/export class Foo/);
   });
 
-  it('should put type in the file name', () => {
+  it('should put type in the file name', async () => {
     const options = { ...defaultOptions, type: 'model' };
 
-    const tree = schematicRunner.runSchematic('class', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('class', options, appTree)
+      .toPromise();
     expect(tree.files).toContain('/projects/bar/src/app/foo.model.ts');
   });
 
-  it('should split the name to name & type with split on "."', () => {
+  it('should split the name to name & type with split on "."', async () => {
     const options = {...defaultOptions, name: 'foo.model' };
-    const tree = schematicRunner.runSchematic('class', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('class', options, appTree)
+      .toPromise();
     const classPath = '/projects/bar/src/app/foo.model.ts';
     const content = tree.readContent(classPath);
     expect(content).toMatch(/export class Foo/);
   });
 
-  it('should respect the path option', () => {
+  it('should respect the path option', async () => {
     const options = { ...defaultOptions, path: 'zzz' };
-    const tree = schematicRunner.runSchematic('class', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('class', options, appTree)
+      .toPromise();
     expect(tree.files).toContain('/zzz/foo.ts');
   });
 
-  it('should respect the sourceRoot value', () => {
+  it('should respect the sourceRoot value', async () => {
     const config = JSON.parse(appTree.readContent('/angular.json'));
     config.projects.bar.sourceRoot = 'projects/bar/custom';
     appTree.overwrite('/angular.json', JSON.stringify(config, null, 2));
-    appTree = schematicRunner.runSchematic('class', defaultOptions, appTree);
+    appTree = await schematicRunner.runSchematicAsync('class', defaultOptions, appTree)
+      .toPromise();
     expect(appTree.files).toContain('/projects/bar/custom/app/foo.ts');
   });
 });
diff --git a/packages/schematics/angular/class/schema.json b/packages/schematics/angular/class/schema.json
index e57a09046e66..285cfc55af14 100644
--- a/packages/schematics/angular/class/schema.json
+++ b/packages/schematics/angular/class/schema.json
@@ -52,7 +52,6 @@
     }
   },
   "required": [
-    "name",
-    "project"
+    "name"
   ]
 }

From bc6fcd53addca3bea92be87250147cad6b9a8b00 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 11 Apr 2019 21:01:45 -0400
Subject: [PATCH 1139/1703] refactor(@schematics/angular): update enum to use
 new workspace rules

---
 packages/schematics/angular/enum/index.ts      | 13 +++----------
 packages/schematics/angular/enum/index_spec.ts | 16 ++++++++++------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/packages/schematics/angular/enum/index.ts b/packages/schematics/angular/enum/index.ts
index 5c2d489f784f..6219358cba41 100644
--- a/packages/schematics/angular/enum/index.ts
+++ b/packages/schematics/angular/enum/index.ts
@@ -8,8 +8,6 @@
 import { strings } from '@angular-devkit/core';
 import {
   Rule,
-  SchematicContext,
-  SchematicsException,
   Tree,
   apply,
   applyTemplates,
@@ -21,19 +19,14 @@ import {
 } from '@angular-devkit/schematics';
 import { applyLintFix } from '../utility/lint-fix';
 import { parseName } from '../utility/parse-name';
-import { buildDefaultPath, getProject } from '../utility/project';
+import { createDefaultPath } from '../utility/workspace';
 import { Schema as EnumOptions } from './schema';
 
 
 export default function (options: EnumOptions): Rule {
-  return (host: Tree, context: SchematicContext) => {
-    if (!options.project) {
-      throw new SchematicsException('Option (project) is required.');
-    }
-    const project = getProject(host, options.project);
-
+  return async (host: Tree) => {
     if (options.path === undefined) {
-      options.path = buildDefaultPath(project);
+      options.path = await createDefaultPath(host, options.project as string);
     }
 
     const parsedPath = parseName(options.path, options.name);
diff --git a/packages/schematics/angular/enum/index_spec.ts b/packages/schematics/angular/enum/index_spec.ts
index e65376e93e03..9a09afec5ddb 100644
--- a/packages/schematics/angular/enum/index_spec.ts
+++ b/packages/schematics/angular/enum/index_spec.ts
@@ -41,22 +41,26 @@ describe('Enum Schematic', () => {
     appTree = schematicRunner.runSchematic('application', appOptions, appTree);
   });
 
-  it('should create an enumeration', () => {
-    const tree = schematicRunner.runSchematic('enum', defaultOptions, appTree);
+  it('should create an enumeration', async () => {
+    const tree = await schematicRunner.runSchematicAsync('enum', defaultOptions, appTree)
+      .toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo.enum.ts');
   });
-  it('should create an enumeration', () => {
-    const tree = schematicRunner.runSchematic('enum', defaultOptions, appTree);
+
+  it('should create an enumeration', async () => {
+    const tree = await schematicRunner.runSchematicAsync('enum', defaultOptions, appTree)
+      .toPromise();
     const content = tree.readContent('/projects/bar/src/app/foo.enum.ts');
     expect(content).toMatch('export enum Foo {');
   });
 
-  it('should respect the sourceRoot value', () => {
+  it('should respect the sourceRoot value', async () => {
     const config = JSON.parse(appTree.readContent('/angular.json'));
     config.projects.bar.sourceRoot = 'projects/bar/custom';
     appTree.overwrite('/angular.json', JSON.stringify(config, null, 2));
-    appTree = schematicRunner.runSchematic('enum', defaultOptions, appTree);
+    appTree = await schematicRunner.runSchematicAsync('enum', defaultOptions, appTree)
+      .toPromise();
     expect(appTree.files).toContain('/projects/bar/custom/app/foo.enum.ts');
   });
 });

From 3e70f252c59f0d7a4958b6a29019b02a95387185 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 11 Apr 2019 21:06:25 -0400
Subject: [PATCH 1140/1703] refactor(@schematics/angular): update guard to use
 new workspace rules

---
 packages/schematics/angular/guard/index.ts    | 12 +++-----
 .../schematics/angular/guard/index_spec.ts    | 30 +++++++++++--------
 packages/schematics/angular/guard/schema.json |  3 +-
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/packages/schematics/angular/guard/index.ts b/packages/schematics/angular/guard/index.ts
index 95666fea1583..0b16aefd4150 100644
--- a/packages/schematics/angular/guard/index.ts
+++ b/packages/schematics/angular/guard/index.ts
@@ -21,20 +21,16 @@ import {
 } from '@angular-devkit/schematics';
 import { applyLintFix } from '../utility/lint-fix';
 import { parseName } from '../utility/parse-name';
-import { buildDefaultPath, getProject } from '../utility/project';
+import { createDefaultPath } from '../utility/workspace';
 import { Schema as GuardOptions } from './schema';
 
 
 export default function (options: GuardOptions): Rule {
-  return (host: Tree) => {
-    if (!options.project) {
-      throw new SchematicsException('Option (project) is required.');
-    }
-    const project = getProject(host, options.project);
-
+  return async (host: Tree) => {
     if (options.path === undefined) {
-      options.path = buildDefaultPath(project);
+      options.path = await createDefaultPath(host, options.project as string);
     }
+
     if (options.implements === undefined) {
       options.implements = [];
     }
diff --git a/packages/schematics/angular/guard/index_spec.ts b/packages/schematics/angular/guard/index_spec.ts
index a98bf7f148c0..c89ee365d067 100644
--- a/packages/schematics/angular/guard/index_spec.ts
+++ b/packages/schematics/angular/guard/index_spec.ts
@@ -40,42 +40,47 @@ describe('Guard Schematic', () => {
     appTree = schematicRunner.runSchematic('application', appOptions, appTree);
   });
 
-  it('should create a guard', () => {
-    const tree = schematicRunner.runSchematic('guard', defaultOptions, appTree);
+  it('should create a guard', async () => {
+    const tree = await schematicRunner.runSchematicAsync('guard', defaultOptions, appTree)
+      .toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo.guard.spec.ts');
     expect(files).toContain('/projects/bar/src/app/foo.guard.ts');
   });
 
-  it('should respect the skipTests flag', () => {
+  it('should respect the skipTests flag', async () => {
     const options = { ...defaultOptions, skipTests: true };
 
-    const tree = schematicRunner.runSchematic('guard', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('guard', options, appTree)
+      .toPromise();
     const files = tree.files;
     expect(files).not.toContain('/projects/bar/src/app/foo.guard.spec.ts');
     expect(files).toContain('/projects/bar/src/app/foo.guard.ts');
   });
 
-  it('should respect the flat flag', () => {
+  it('should respect the flat flag', async () => {
     const options = { ...defaultOptions, flat: false };
 
-    const tree = schematicRunner.runSchematic('guard', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('guard', options, appTree)
+      .toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo/foo.guard.spec.ts');
     expect(files).toContain('/projects/bar/src/app/foo/foo.guard.ts');
   });
 
-  it('should respect the sourceRoot value', () => {
+  it('should respect the sourceRoot value', async () => {
     const config = JSON.parse(appTree.readContent('/angular.json'));
     config.projects.bar.sourceRoot = 'projects/bar/custom';
     appTree.overwrite('/angular.json', JSON.stringify(config, null, 2));
-    appTree = schematicRunner.runSchematic('guard', defaultOptions, appTree);
+    appTree = await schematicRunner.runSchematicAsync('guard', defaultOptions, appTree)
+      .toPromise();
     expect(appTree.files).toContain('/projects/bar/custom/app/foo.guard.ts');
   });
 
-  it('should respect the implements value', () => {
+  it('should respect the implements value', async () => {
     const options = { ...defaultOptions, implements: ['CanActivate']};
-    const tree = schematicRunner.runSchematic('guard', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('guard', options, appTree)
+      .toPromise();
     const fileString = tree.readContent('/projects/bar/src/app/foo.guard.ts');
     expect(fileString).toContain('CanActivate');
     expect(fileString).toContain('canActivate');
@@ -85,10 +90,11 @@ describe('Guard Schematic', () => {
     expect(fileString).not.toContain('canLoad');
   });
 
-  it('should respect the implements values', () => {
+  it('should respect the implements values', async () => {
     const implementationOptions = ['CanActivate', 'CanLoad', 'CanActivateChild'];
     const options = { ...defaultOptions, implements: implementationOptions};
-    const tree = schematicRunner.runSchematic('guard', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('guard', options, appTree)
+      .toPromise();
     const fileString = tree.readContent('/projects/bar/src/app/foo.guard.ts');
 
     // Should contain all implementations
diff --git a/packages/schematics/angular/guard/schema.json b/packages/schematics/angular/guard/schema.json
index 660c5b80bac4..e430e62ec7fb 100644
--- a/packages/schematics/angular/guard/schema.json
+++ b/packages/schematics/angular/guard/schema.json
@@ -70,7 +70,6 @@
     }
   },
   "required": [
-    "name",
-    "project"
+    "name"
   ]
 }

From 2210b902e21bf2e4068b42adb1a49fad7e5989a8 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 12 Apr 2019 14:36:19 -0400
Subject: [PATCH 1141/1703] refactor(@schematics/angular): update service to
 use new workspace rules

---
 packages/schematics/angular/service/index.ts  | 12 +++--------
 .../schematics/angular/service/index_spec.ts  | 20 +++++++++++--------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/packages/schematics/angular/service/index.ts b/packages/schematics/angular/service/index.ts
index 6bd3b3f1cad6..2e6681e03b58 100644
--- a/packages/schematics/angular/service/index.ts
+++ b/packages/schematics/angular/service/index.ts
@@ -8,7 +8,6 @@
 import { strings } from '@angular-devkit/core';
 import {
   Rule,
-  SchematicsException,
   Tree,
   apply,
   applyTemplates,
@@ -21,18 +20,13 @@ import {
 } from '@angular-devkit/schematics';
 import { applyLintFix } from '../utility/lint-fix';
 import { parseName } from '../utility/parse-name';
-import { buildDefaultPath, getProject } from '../utility/project';
+import { createDefaultPath } from '../utility/workspace';
 import { Schema as ServiceOptions } from './schema';
 
 export default function (options: ServiceOptions): Rule {
-  return (host: Tree) => {
-    if (!options.project) {
-      throw new SchematicsException('Option (project) is required.');
-    }
-    const project = getProject(host, options.project);
-
+  return async (host: Tree) => {
     if (options.path === undefined) {
-      options.path = buildDefaultPath(project);
+      options.path = await createDefaultPath(host, options.project as string);
     }
 
     const parsedPath = parseName(options.path, options.name);
diff --git a/packages/schematics/angular/service/index_spec.ts b/packages/schematics/angular/service/index_spec.ts
index f974d83002b4..449f22024031 100644
--- a/packages/schematics/angular/service/index_spec.ts
+++ b/packages/schematics/angular/service/index_spec.ts
@@ -41,37 +41,41 @@ describe('Service Schematic', () => {
     appTree = schematicRunner.runSchematic('application', appOptions, appTree);
   });
 
-  it('should create a service', () => {
+  it('should create a service', async () => {
     const options = { ...defaultOptions };
 
-    const tree = schematicRunner.runSchematic('service', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('service', options, appTree)
+      .toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo/foo.service.spec.ts');
     expect(files).toContain('/projects/bar/src/app/foo/foo.service.ts');
   });
 
-  it('service should be tree-shakeable', () => {
+  it('service should be tree-shakeable', async () => {
     const options = { ...defaultOptions};
 
-    const tree = schematicRunner.runSchematic('service', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('service', options, appTree)
+      .toPromise();
     const content = tree.readContent('/projects/bar/src/app/foo/foo.service.ts');
     expect(content).toMatch(/providedIn: 'root'/);
   });
 
-  it('should respect the skipTests flag', () => {
+  it('should respect the skipTests flag', async () => {
     const options = { ...defaultOptions, skipTests: true };
 
-    const tree = schematicRunner.runSchematic('service', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('service', options, appTree)
+      .toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo/foo.service.ts');
     expect(files).not.toContain('/projects/bar/src/app/foo/foo.service.spec.ts');
   });
 
-  it('should respect the sourceRoot value', () => {
+  it('should respect the sourceRoot value', async () => {
     const config = JSON.parse(appTree.readContent('/angular.json'));
     config.projects.bar.sourceRoot = 'projects/bar/custom';
     appTree.overwrite('/angular.json', JSON.stringify(config, null, 2));
-    appTree = schematicRunner.runSchematic('service', defaultOptions, appTree);
+    appTree = await schematicRunner.runSchematicAsync('service', defaultOptions, appTree)
+      .toPromise();
     expect(appTree.files).toContain('/projects/bar/custom/app/foo/foo.service.ts');
   });
 });

From cbce3d37933be678e8441a18bcbe202e9fe9a14c Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 12 Apr 2019 22:23:50 -0400
Subject: [PATCH 1142/1703] refactor(@schematics/angular): update library to
 use new workspace rules

---
 packages/schematics/angular/library/index.ts  |  99 ++++++++--------
 .../schematics/angular/library/index_spec.ts  | 106 +++++++++---------
 2 files changed, 102 insertions(+), 103 deletions(-)

diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index 034fef945485..4a7d08761b0f 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -21,20 +21,12 @@ import {
   url,
 } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
-import {
-  addProjectToWorkspace,
-  getWorkspace,
-} from '../utility/config';
 import { NodeDependencyType, addPackageJsonDependency } from '../utility/dependencies';
 import { latestVersions } from '../utility/latest-versions';
 import { applyLintFix } from '../utility/lint-fix';
 import { validateProjectName } from '../utility/validation';
-import {
-  Builders,
-  ProjectType,
-  WorkspaceProject,
-  WorkspaceSchema,
-} from '../utility/workspace-models';
+import { getWorkspace, updateWorkspace } from '../utility/workspace';
+import { Builders, ProjectType } from '../utility/workspace-models';
 import { Schema as LibraryOptions } from './schema';
 
 interface UpdateJsonFn<T> {
@@ -126,50 +118,57 @@ function addDependenciesToPackageJson() {
   };
 }
 
-function addAppToWorkspaceFile(options: LibraryOptions, workspace: WorkspaceSchema,
-                               projectRoot: string, projectName: string): Rule {
-
-  const project: WorkspaceProject<ProjectType.Library> = {
-    root: projectRoot,
-    sourceRoot: `${projectRoot}/src`,
-    projectType: ProjectType.Library,
-    prefix: options.prefix || 'lib',
-    architect: {
-      build: {
-        builder: Builders.NgPackagr,
-        options: {
-          tsConfig: `${projectRoot}/tsconfig.lib.json`,
-          project: `${projectRoot}/ng-package.json`,
+function addAppToWorkspaceFile(
+  options: LibraryOptions,
+  projectRoot: string,
+  projectName: string,
+): Rule {
+  return updateWorkspace(workspace => {
+    if (workspace.projects.size === 0) {
+      workspace.extensions.defaultProject = projectName;
+    }
+
+    workspace.projects.add({
+      name: projectName,
+      root: projectRoot,
+      sourceRoot: `${projectRoot}/src`,
+      projectType: ProjectType.Library,
+      prefix: options.prefix || 'lib',
+      targets: {
+        build: {
+          builder: Builders.NgPackagr,
+          options: {
+            tsConfig: `${projectRoot}/tsconfig.lib.json`,
+            project: `${projectRoot}/ng-package.json`,
+          },
         },
-      },
-      test: {
-        builder: Builders.Karma,
-        options: {
-          main: `${projectRoot}/src/test.ts`,
-          tsConfig: `${projectRoot}/tsconfig.spec.json`,
-          karmaConfig: `${projectRoot}/karma.conf.js`,
+        test: {
+          builder: Builders.Karma,
+          options: {
+            main: `${projectRoot}/src/test.ts`,
+            tsConfig: `${projectRoot}/tsconfig.spec.json`,
+            karmaConfig: `${projectRoot}/karma.conf.js`,
+          },
         },
-      },
-      lint: {
-        builder: Builders.TsLint,
-        options: {
-          tsConfig: [
-            `${projectRoot}/tsconfig.lib.json`,
-            `${projectRoot}/tsconfig.spec.json`,
-          ],
-          exclude: [
-            '**/node_modules/**',
-          ],
+        lint: {
+          builder: Builders.TsLint,
+          options: {
+            tsConfig: [
+              `${projectRoot}/tsconfig.lib.json`,
+              `${projectRoot}/tsconfig.spec.json`,
+            ],
+            exclude: [
+              '**/node_modules/**',
+            ],
+          },
         },
       },
-    },
-  };
-
-  return addProjectToWorkspace(workspace, projectName, project);
+    });
+  });
 }
 
 export default function (options: LibraryOptions): Rule {
-  return (host: Tree, context: SchematicContext) => {
+  return async (host: Tree) => {
     if (!options.name) {
       throw new SchematicsException(`Invalid options, "name" is required.`);
     }
@@ -187,8 +186,8 @@ export default function (options: LibraryOptions): Rule {
       options.name = name;
     }
 
-    const workspace = getWorkspace(host);
-    const newProjectRoot = workspace.newProjectRoot || '';
+    const workspace = await getWorkspace(host);
+    const newProjectRoot = workspace.extensions.newProjectRoot || '';
 
     const scopeFolder = scopeName ? strings.dasherize(scopeName) + '/' : '';
     const folderName = `${scopeFolder}${strings.dasherize(options.name)}`;
@@ -215,7 +214,7 @@ export default function (options: LibraryOptions): Rule {
 
     return chain([
       mergeWith(templateSource),
-      addAppToWorkspaceFile(options, workspace, projectRoot, projectName),
+      addAppToWorkspaceFile(options, projectRoot, projectName),
       options.skipPackageJson ? noop() : addDependenciesToPackageJson(),
       options.skipTsConfig ? noop() : updateTsConfig(packageName, distRoot),
       schematic('module', {
diff --git a/packages/schematics/angular/library/index_spec.ts b/packages/schematics/angular/library/index_spec.ts
index 92bee35a683d..49ad3d5ecd1e 100644
--- a/packages/schematics/angular/library/index_spec.ts
+++ b/packages/schematics/angular/library/index_spec.ts
@@ -41,8 +41,8 @@ describe('Library Schematic', () => {
     workspaceTree = schematicRunner.runSchematic('workspace', workspaceOptions);
   });
 
-  it('should create files', () => {
-    const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
+  it('should create files', async () => {
+    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
     const files = tree.files;
     expect(files).toEqual(jasmine.arrayContaining([
       '/projects/foo/karma.conf.js',
@@ -60,81 +60,81 @@ describe('Library Schematic', () => {
     ]));
   });
 
-  it('should create a package.json named "foo"', () => {
-    const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
+  it('should create a package.json named "foo"', async () => {
+    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
     const fileContent = getFileContent(tree, '/projects/foo/package.json');
     expect(fileContent).toMatch(/"name": "foo"/);
   });
 
-  it('should have the latest Angular major versions in package.json named "foo"', () => {
-    const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
+  it('should have the latest Angular major versions in package.json named "foo"', async () => {
+    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
     const fileContent = getJsonFileContent(tree, '/projects/foo/package.json');
     const angularVersion = latestVersions.Angular.replace('~', '').replace('^', '');
     expect(fileContent.peerDependencies['@angular/core']).toBe(`^${angularVersion}`);
   });
 
-  it('should create a README.md named "foo"', () => {
-    const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
+  it('should create a README.md named "foo"', async () => {
+    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
     const fileContent = getFileContent(tree, '/projects/foo/README.md');
     expect(fileContent).toMatch(/# Foo/);
   });
 
-  it('should create a tsconfig for library', () => {
-    const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
+  it('should create a tsconfig for library', async () => {
+    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
     const fileContent = getJsonFileContent(tree, '/projects/foo/tsconfig.lib.json');
     expect(fileContent).toBeDefined();
   });
 
-  it('should create a ng-package.json with ngPackage conf', () => {
-    const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
+  it('should create a ng-package.json with ngPackage conf', async () => {
+    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
     const fileContent = getJsonFileContent(tree, '/projects/foo/ng-package.json');
     expect(fileContent.lib).toBeDefined();
     expect(fileContent.lib.entryFile).toEqual('src/my-index.ts');
     expect(fileContent.dest).toEqual('../../dist/foo');
   });
 
-  it('should use default value for baseDir and entryFile', () => {
-    const tree = schematicRunner.runSchematic('library', {
+  it('should use default value for baseDir and entryFile', async () => {
+    const tree = await schematicRunner.runSchematicAsync('library', {
       name: 'foobar',
-    }, workspaceTree);
+    }, workspaceTree).toPromise();
     expect(tree.files).toContain('/projects/foobar/src/public-api.ts');
   });
 
-  it(`should add library to workspace`, () => {
-    const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
+  it(`should add library to workspace`, async () => {
+    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
 
     const workspace = getJsonFileContent(tree, '/angular.json');
     expect(workspace.projects.foo).toBeDefined();
     expect(workspace.defaultProject).toBe('foo');
   });
 
-  it('should set the prefix to lib if none is set', () => {
-    const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
+  it('should set the prefix to lib if none is set', async () => {
+    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
 
     const workspace = JSON.parse(tree.readContent('/angular.json'));
     expect(workspace.projects.foo.prefix).toEqual('lib');
   });
 
-  it('should set the prefix correctly', () => {
+  it('should set the prefix correctly', async () => {
     const options = { ...defaultOptions, prefix: 'pre' };
-    const tree = schematicRunner.runSchematic('library', options, workspaceTree);
+    const tree = await schematicRunner.runSchematicAsync('library', options, workspaceTree).toPromise();
 
     const workspace = JSON.parse(tree.readContent('/angular.json'));
     expect(workspace.projects.foo.prefix).toEqual('pre');
   });
 
-  it('should set the right prefix in the tslint file when provided is kebabed', () => {
+  it('should set the right prefix in the tslint file when provided is kebabed', async () => {
     const options: GenerateLibrarySchema = { ...defaultOptions, prefix: 'foo-bar' };
-    const tree = schematicRunner.runSchematic('library', options, workspaceTree);
+    const tree = await schematicRunner.runSchematicAsync('library', options, workspaceTree).toPromise();
     const path = '/projects/foo/tslint.json';
     const content = JSON.parse(tree.readContent(path));
     expect(content.rules['directive-selector'][2]).toMatch('fooBar');
     expect(content.rules['component-selector'][2]).toMatch('foo-bar');
   });
 
-  it('should handle a pascalCasedName', () => {
+  it('should handle a pascalCasedName', async () => {
     const options = {...defaultOptions, name: 'pascalCasedName'};
-    const tree = schematicRunner.runSchematic('library', options, workspaceTree);
+    const tree = await schematicRunner.runSchematicAsync('library', options, workspaceTree).toPromise();
     const config = getJsonFileContent(tree, '/angular.json');
     const project = config.projects.pascalCasedName;
     expect(project).toBeDefined();
@@ -143,14 +143,14 @@ describe('Library Schematic', () => {
     expect(svcContent).toMatch(/providedIn: 'root'/);
   });
 
-  it('should export the component in the NgModule', () => {
-    const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
+  it('should export the component in the NgModule', async () => {
+    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
     const fileContent = getFileContent(tree, '/projects/foo/src/lib/foo.module.ts');
     expect(fileContent).toContain('exports: [FooComponent]');
   });
 
-  it('should set the right path and prefix in the tslint file', () => {
-    const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
+  it('should set the right path and prefix in the tslint file', async () => {
+    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
     const path = '/projects/foo/tslint.json';
     const content = JSON.parse(tree.readContent(path));
     expect(content.extends).toMatch('../../tslint.json');
@@ -159,8 +159,8 @@ describe('Library Schematic', () => {
   });
 
   describe(`update package.json`, () => {
-    it(`should add ng-packagr to devDependencies`, () => {
-      const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
+    it(`should add ng-packagr to devDependencies`, async () => {
+      const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
 
       const packageJson = getJsonFileContent(tree, 'package.json');
       expect(packageJson.devDependencies['ng-packagr']).toEqual('^5.0.0');
@@ -168,30 +168,30 @@ describe('Library Schematic', () => {
         .toEqual(latestVersions.DevkitBuildNgPackagr);
     });
 
-    it('should use the latest known versions in package.json', () => {
-      const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
+    it('should use the latest known versions in package.json', async () => {
+      const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
       const pkg = JSON.parse(tree.readContent('/package.json'));
       expect(pkg.devDependencies['@angular/compiler-cli']).toEqual(latestVersions.Angular);
       expect(pkg.devDependencies['typescript']).toEqual(latestVersions.TypeScript);
     });
 
-    it(`should not override existing users dependencies`, () => {
+    it(`should not override existing users dependencies`, async () => {
       const oldPackageJson = workspaceTree.readContent('package.json');
       workspaceTree.overwrite('package.json', oldPackageJson.replace(
         `"typescript": "${latestVersions.TypeScript}"`,
         `"typescript": "~2.5.2"`,
       ));
 
-      const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
+      const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
       const packageJson = getJsonFileContent(tree, 'package.json');
       expect(packageJson.devDependencies.typescript).toEqual('~2.5.2');
     });
 
-    it(`should not modify the file when --skipPackageJson`, () => {
-      const tree = schematicRunner.runSchematic('library', {
+    it(`should not modify the file when --skipPackageJson`, async () => {
+      const tree = await schematicRunner.runSchematicAsync('library', {
         name: 'foo',
         skipPackageJson: true,
-      }, workspaceTree);
+      }, workspaceTree).toPromise();
 
       const packageJson = getJsonFileContent(tree, 'package.json');
       expect(packageJson.devDependencies['ng-packagr']).toBeUndefined();
@@ -200,8 +200,8 @@ describe('Library Schematic', () => {
   });
 
   describe(`update tsconfig.json`, () => {
-    it(`should add paths mapping to empty tsconfig`, () => {
-      const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
+    it(`should add paths mapping to empty tsconfig`, async () => {
+      const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
 
       const tsConfigJson = getJsonFileContent(tree, 'tsconfig.json');
       expect(tsConfigJson.compilerOptions.paths.foo).toBeTruthy();
@@ -212,7 +212,7 @@ describe('Library Schematic', () => {
       expect(tsConfigJson.compilerOptions.paths['foo/*'][0]).toEqual('dist/foo/*');
     });
 
-    it(`should append to existing paths mappings`, () => {
+    it(`should append to existing paths mappings`, async () => {
       workspaceTree.overwrite('tsconfig.json', JSON.stringify({
         compilerOptions: {
           paths: {
@@ -221,7 +221,7 @@ describe('Library Schematic', () => {
           },
         },
       }));
-      const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
+      const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
 
       const tsConfigJson = getJsonFileContent(tree, 'tsconfig.json');
       expect(tsConfigJson.compilerOptions.paths.foo).toBeTruthy();
@@ -229,19 +229,19 @@ describe('Library Schematic', () => {
       expect(tsConfigJson.compilerOptions.paths.foo[1]).toEqual('dist/foo');
     });
 
-    it(`should not modify the file when --skipTsConfig`, () => {
-      const tree = schematicRunner.runSchematic('library', {
+    it(`should not modify the file when --skipTsConfig`, async () => {
+      const tree = await schematicRunner.runSchematicAsync('library', {
         name: 'foo',
         skipTsConfig: true,
-      }, workspaceTree);
+      }, workspaceTree).toPromise();
 
       const tsConfigJson = getJsonFileContent(tree, 'tsconfig.json');
       expect(tsConfigJson.compilerOptions.paths).toBeUndefined();
     });
   });
 
-  it('should generate inside of a library', () => {
-    let tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
+  it('should generate inside of a library', async () => {
+    let tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
     const componentOptions: ComponentOptions = {
       name: 'comp',
       project: 'foo',
@@ -250,10 +250,10 @@ describe('Library Schematic', () => {
     expect(tree.exists('/projects/foo/src/lib/comp/comp.component.ts')).toBe(true);
   });
 
-  it(`should support creating scoped libraries`, () => {
+  it(`should support creating scoped libraries`, async () => {
     const scopedName = '@myscope/mylib';
     const options = { ...defaultOptions, name: scopedName };
-    const tree = schematicRunner.runSchematic('library', options, workspaceTree);
+    const tree = await schematicRunner.runSchematicAsync('library', options, workspaceTree).toPromise();
 
     const pkgJsonPath = '/projects/myscope/mylib/package.json';
     expect(tree.files).toContain(pkgJsonPath);
@@ -276,12 +276,12 @@ describe('Library Schematic', () => {
     expect(karmaConf).toContain(`dir: require('path').join(__dirname, '../../../coverage/myscope/mylib')`);
   });
 
-  it(`should dasherize scoped libraries`, () => {
+  it(`should dasherize scoped libraries`, async () => {
     const scopedName = '@myScope/myLib';
     const expectedScopeName = '@my-scope/my-lib';
     const expectedFolderName = 'my-scope/my-lib';
     const options = { ...defaultOptions, name: scopedName };
-    const tree = schematicRunner.runSchematic('library', options, workspaceTree);
+    const tree = await schematicRunner.runSchematicAsync('library', options, workspaceTree).toPromise();
 
     const pkgJsonPath = '/projects/my-scope/my-lib/package.json';
     expect(tree.readContent(pkgJsonPath)).toContain(expectedScopeName);
@@ -296,8 +296,8 @@ describe('Library Schematic', () => {
     expect(cfg.projects['@myScope/myLib']).toBeDefined();
   });
 
-  it(`should set coverage folder to "coverage/foo"`, () => {
-    const tree = schematicRunner.runSchematic('library', defaultOptions, workspaceTree);
+  it(`should set coverage folder to "coverage/foo"`, async () => {
+    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
     const karmaConf = getFileContent(tree, '/projects/foo/karma.conf.js');
     expect(karmaConf).toContain(`dir: require('path').join(__dirname, '../../coverage/foo')`);
   });

From 66230b3c2ea0dd4aab96549ba3a69b2b5c854085 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 12 Apr 2019 22:25:57 -0400
Subject: [PATCH 1143/1703] fix(@angular-devkit/core): allow scoped names for
 workspace projects

Library projects support scoped package names as project names.
---
 packages/angular_devkit/core/src/workspace/definitions.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/core/src/workspace/definitions.ts b/packages/angular_devkit/core/src/workspace/definitions.ts
index 4be3180249b5..95f7e21d4b6f 100644
--- a/packages/angular_devkit/core/src/workspace/definitions.ts
+++ b/packages/angular_devkit/core/src/workspace/definitions.ts
@@ -201,8 +201,8 @@ export class ProjectDefinitionCollection extends DefinitionCollection<ProjectDef
   }
 
   private _validateName(name: string): void {
-    if (typeof name !== 'string' || !/^[a-zA-Z][.0-9a-zA-Z]*(-[.0-9a-zA-Z]*)*$/.test(name)) {
-      throw new Error('Project name must be a valid npm package name without a scope.');
+    if (typeof name !== 'string' || !/^(?:@\w[\w\.-]*\/)?\w[\w\.-]*$/.test(name)) {
+      throw new Error('Project name must be a valid npm package name.');
     }
   }
 

From f1c58bef97207541391298ae436254f35576993a Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 12 Apr 2019 22:54:16 -0400
Subject: [PATCH 1144/1703] fix(@angular-devkit/core): escape workspace json
 pointers

Internally, the JSON workspace support uses JSON pointers to represent change locations.  These need to be escaped to support slashes within a key.
---
 .../core/src/workspace/json/reader.ts         | 12 ++++++--
 .../core/src/workspace/json/reader_spec.ts    |  4 +--
 .../core/src/workspace/json/utilities.ts      | 28 +++++++++++++++----
 .../core/src/workspace/json/writer.ts         |  3 +-
 4 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/packages/angular_devkit/core/src/workspace/json/reader.ts b/packages/angular_devkit/core/src/workspace/json/reader.ts
index 7f3e954b5e29..e54382c4acef 100644
--- a/packages/angular_devkit/core/src/workspace/json/reader.ts
+++ b/packages/angular_devkit/core/src/workspace/json/reader.ts
@@ -23,7 +23,7 @@ import {
 } from '../definitions';
 import { WorkspaceHost } from '../host';
 import { JsonWorkspaceMetadata, JsonWorkspaceSymbol } from './metadata';
-import { createVirtualAstObject } from './utilities';
+import { createVirtualAstObject, escapeKey } from './utilities';
 
 interface ParserContext {
   readonly host: WorkspaceHost;
@@ -116,7 +116,13 @@ function parseWorkspace(workspaceNode: JsonAstObject, context: ParserContext): W
   if (context.trackChanges && projectsNode) {
     const parentNode = projectsNode;
     collectionListener = (name, action, newValue) => {
-      jsonMetadata.addChange(action, `/projects/${name}`, parentNode, newValue, 'project');
+      jsonMetadata.addChange(
+        action,
+        `/projects/${escapeKey(name)}`,
+        parentNode,
+        newValue,
+        'project',
+      );
     };
   }
 
@@ -212,7 +218,7 @@ function parseProject(
     collectionListener = (name, action, newValue) => {
       jsonMetadata.addChange(
         action,
-        `/projects/${projectName}/targets/${name}`,
+        `/projects/${projectName}/targets/${escapeKey(name)}`,
         parentNode,
         newValue,
         'target',
diff --git a/packages/angular_devkit/core/src/workspace/json/reader_spec.ts b/packages/angular_devkit/core/src/workspace/json/reader_spec.ts
index 584044d334e4..914e7df007d8 100644
--- a/packages/angular_devkit/core/src/workspace/json/reader_spec.ts
+++ b/packages/angular_devkit/core/src/workspace/json/reader_spec.ts
@@ -302,7 +302,7 @@ describe('JSON WorkspaceDefinition Tracks Workspace Changes', () => {
     expect(metadata.hasChanges).toBeTruthy();
     expect(metadata.changeCount).toBe(2);
 
-    change = metadata.findChangesForPath('/schematics/@angular/schematics:component')[0];
+    change = metadata.findChangesForPath('/schematics/@angular~1schematics:component')[0];
     expect(change).not.toBeUndefined();
     if (change) {
       expect(change.op).toBe('replace');
@@ -350,7 +350,7 @@ describe('JSON WorkspaceDefinition Tracks Workspace Changes', () => {
     expect(metadata.hasChanges).toBeTruthy();
     expect(metadata.changeCount).toBe(2);
 
-    change = metadata.findChangesForPath('/schematics/@angular/schematics:component')[0];
+    change = metadata.findChangesForPath('/schematics/@angular~1schematics:component')[0];
     expect(change).not.toBeUndefined();
     if (change) {
       expect(change.op).toBe('replace');
diff --git a/packages/angular_devkit/core/src/workspace/json/utilities.ts b/packages/angular_devkit/core/src/workspace/json/utilities.ts
index b70ad13dfe06..fa6dd14167f8 100644
--- a/packages/angular_devkit/core/src/workspace/json/utilities.ts
+++ b/packages/angular_devkit/core/src/workspace/json/utilities.ts
@@ -65,6 +65,22 @@ function createPropertyDescriptor(value: JsonValue | undefined): PropertyDescrip
   };
 }
 
+export function escapeKey(key: string | number): string | number {
+  if (typeof key === 'number') {
+    return key;
+  }
+
+  return key.replace('~', '~0').replace('/', '~1');
+}
+
+export function unescapeKey(key: string | number): string | number {
+  if (typeof key === 'number') {
+    return key;
+  }
+
+  return key.replace('~1', '/').replace('~0', '~');
+}
+
 export function createVirtualAstObject<T extends object = JsonObject>(
   root: JsonAstObject,
   options: {
@@ -129,7 +145,7 @@ function create(
         return undefined;
       }
 
-      const propertyPath = path + '/' + p;
+      const propertyPath = path + '/' + escapeKey(p);
       const cacheEntry = cache.get(propertyPath);
       if (cacheEntry) {
         if (cacheEntry.value) {
@@ -153,7 +169,7 @@ function create(
         return false;
       }
 
-      return cache.has(path + '/' + p) || findNode(ast, p) !== undefined;
+      return cache.has(path + '/' + escapeKey(p)) || findNode(ast, p) !== undefined;
     },
     get(target: {}, p: PropertyKey): unknown {
       if (typeof p === 'symbol' || Reflect.has(target, p)) {
@@ -162,7 +178,7 @@ function create(
         return undefined;
       }
 
-      const propertyPath = path + '/' + p;
+      const propertyPath = path + '/' + escapeKey(p);
       const cacheEntry = cache.get(propertyPath);
       if (cacheEntry) {
         return cacheEntry.value;
@@ -200,7 +216,7 @@ function create(
       // TODO: Check if is JSON value
       const jsonValue = value as JsonValue;
 
-      const propertyPath = path + '/' + p;
+      const propertyPath = path + '/' + escapeKey(p);
       const cacheEntry = cache.get(propertyPath);
       if (cacheEntry) {
         const oldValue = cacheEntry.value;
@@ -227,7 +243,7 @@ function create(
         return false;
       }
 
-      const propertyPath = path + '/' + p;
+      const propertyPath = path + '/' + escapeKey(p);
       const cacheEntry = cache.get(propertyPath);
       if (cacheEntry) {
         const oldValue = cacheEntry.value;
@@ -267,7 +283,7 @@ function create(
       for (const key of cache.keys()) {
         const relativeKey = key.substr(path.length + 1);
         if (relativeKey.length > 0 && !relativeKey.includes('/')) {
-          keys.push(relativeKey);
+          keys.push(unescapeKey(relativeKey));
         }
       }
 
diff --git a/packages/angular_devkit/core/src/workspace/json/writer.ts b/packages/angular_devkit/core/src/workspace/json/writer.ts
index 49430e6c6606..2c087178c65c 100644
--- a/packages/angular_devkit/core/src/workspace/json/writer.ts
+++ b/packages/angular_devkit/core/src/workspace/json/writer.ts
@@ -15,6 +15,7 @@ import {
   JsonWorkspaceMetadata,
   JsonWorkspaceSymbol,
 } from './metadata';
+import { unescapeKey } from './utilities';
 
 export async function writeJsonWorkspace(
   workspace: WorkspaceDefinition,
@@ -211,7 +212,7 @@ function updateJsonWorkspace(metadata: JsonWorkspaceMetadata): string {
     const multiline = node.start.line !== node.end.line;
     const pathSegments = path.split('/');
     const depth = pathSegments.length - 1; // TODO: more complete analysis
-    const propertyOrIndex = pathSegments[depth];
+    const propertyOrIndex = unescapeKey(pathSegments[depth]);
     const jsonValue = normalizeValue(value, type);
     if (op === 'add' && jsonValue === undefined) {
       continue;

From a29bf4ec36f30d461baa45757fd62d6910eac26d Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 12 Apr 2019 08:38:09 +0200
Subject: [PATCH 1145/1703] feat(@angular-devkit/build-angular): enable
 differential loading for es2015 builds

With this change we turn on differential loading for projects that has es2015 as script target and still want to support browsers which that don't support ES2015.

Supported browsers are defined in the browserlist file.
---
 .../angular-cli-files/models/es5-polyfills.js |  2 +-
 .../models/safari-nomodule.min.js             | 20 -------------------
 .../models/webpack-configs/common.ts          | 13 +++++++-----
 .../index-file/augment-index-html.ts          |  2 +-
 .../index-file/augment-index-html_spec.ts     |  8 ++++----
 .../build_angular/src/browser/index.ts        |  1 -
 .../differential-loading.ts}                  |  7 +++----
 .../differential-loading_spec.ts}             |  2 +-
 .../src/utils/webpack-browser-config.ts       | 16 ++++++++-------
 9 files changed, 27 insertions(+), 44 deletions(-)
 delete mode 100644 packages/angular_devkit/build_angular/src/angular-cli-files/models/safari-nomodule.min.js
 rename packages/angular_devkit/build_angular/src/{browser/utils.ts => utils/differential-loading.ts} (79%)
 rename packages/angular_devkit/build_angular/src/{browser/utils_spec.ts => utils/differential-loading_spec.ts} (95%)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/es5-polyfills.js b/packages/angular_devkit/build_angular/src/angular-cli-files/models/es5-polyfills.js
index 2df88d889937..e0f9b333efa6 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/es5-polyfills.js
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/es5-polyfills.js
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
- // ES2015 symbol capabilities
+// ES2015 symbol capabilities
 import 'core-js/modules/es.symbol';
 
 // ES2015 function capabilities
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/safari-nomodule.min.js b/packages/angular_devkit/build_angular/src/angular-cli-files/models/safari-nomodule.min.js
deleted file mode 100644
index 31fbacc96662..000000000000
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/safari-nomodule.min.js
+++ /dev/null
@@ -1,20 +0,0 @@
-(function() {
-  var d = document;
-  var c = d.createElement('script');
-  if (!('noModule' in c) && 'onbeforeload' in c) {
-    var s = false;
-    d.addEventListener('beforeload', function(e) {
-      if (e.target === c) {
-        s = true;
-      } else if (!e.target.hasAttribute('nomodule') || !s) {
-        return;
-      }
-      e.preventDefault();
-    }, true);
-
-    c.type = 'module';
-    c.src = '.';
-    d.head.appendChild(c);
-    c.remove();
-  }
-}());
\ No newline at end of file
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 98d13c347dcd..a679b738151a 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -73,11 +73,14 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
     }
   }
 
-  if (buildOptions.es5BrowserSupport === undefined
-    && buildOptions.scriptTargetOverride === ts.ScriptTarget.ES5) {
-    entryPoints['polyfills'] = [es5Polyfills];
-    if (!buildOptions.aot) {
-      entryPoints['polyfills'].push(path.join(__dirname, '..', 'es5-jit-polyfills.js'));
+  if (buildOptions.es5BrowserSupport === undefined) {
+    if (buildOptions.scriptTargetOverride === ts.ScriptTarget.ES2015) {
+      entryPoints['polyfills'] = [path.join(__dirname, '..', 'safari-nomodule.js')];
+    } else {
+      entryPoints['polyfills'] = [es5Polyfills];
+      if (!buildOptions.aot) {
+        entryPoints['polyfills'].push(path.join(__dirname, '..', 'es5-jit-polyfills.js'));
+      }
     }
   }
 
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html.ts
index 1a4034918331..e92e3b4279de 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html.ts
@@ -70,7 +70,7 @@ export async function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise
   const scripts = new Set<string>();
 
   // Sort files in the order we want to insert them by entrypoint and dedupes duplicates
-  const mergedFiles = [...noModuleFiles, ...moduleFiles, ...files];
+  const mergedFiles = [...moduleFiles, ...noModuleFiles, ...files];
   for (const entrypoint of entrypoints) {
     for (const { extension, file, name } of mergedFiles) {
       if (name !== entrypoint) { continue; }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html_spec.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html_spec.ts
index 7f67effe37b6..45c2700a43f7 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html_spec.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html_spec.ts
@@ -82,12 +82,12 @@ describe('augment-index-html', () => {
           <link rel="stylesheet" href="styles.css">
         </head>
         <body>
-          <script src="runtime-es5.js" nomodule></script>
-          <script src="polyfills-es5.js" nomodule></script>
           <script src="runtime-es2015.js" type="module"></script>
           <script src="polyfills-es2015.js" type="module"></script>
-          <script src="main-es5.js" nomodule></script>
+          <script src="runtime-es5.js" nomodule></script>
+          <script src="polyfills-es5.js" nomodule></script>
           <script src="main-es2015.js" type="module"></script>
+          <script src="main-es5.js" nomodule></script>
         </body>
       </html>
     `);
@@ -125,8 +125,8 @@ describe('augment-index-html', () => {
         </head>
         <body>
           <script src="scripts.js"></script>
-          <script src="main-es5.js" nomodule></script>
           <script src="main-es2015.js" type="module"></script>
+          <script src="main-es5.js" nomodule></script>
         </body>
       </html>
     `);
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 8d5ca21e6ea9..3d716871ea6a 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -47,7 +47,6 @@ import {
 import { deleteOutputDir } from '../utils';
 import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
 import { Schema as BrowserBuilderSchema } from './schema';
-import { isDifferentialLoadingNeeded } from './utils';
 
 export type BrowserBuilderOutput = json.JsonObject & BuilderOutput & {
   outputPath: string;
diff --git a/packages/angular_devkit/build_angular/src/browser/utils.ts b/packages/angular_devkit/build_angular/src/utils/differential-loading.ts
similarity index 79%
rename from packages/angular_devkit/build_angular/src/browser/utils.ts
rename to packages/angular_devkit/build_angular/src/utils/differential-loading.ts
index 8949ab5348b4..f2c2271378e7 100644
--- a/packages/angular_devkit/build_angular/src/browser/utils.ts
+++ b/packages/angular_devkit/build_angular/src/utils/differential-loading.ts
@@ -6,14 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Path, getSystemPath } from '@angular-devkit/core';
 import * as browserslist from 'browserslist';
 import * as caniuse from 'caniuse-api';
 import * as ts from 'typescript';
 
 
 export function isDifferentialLoadingNeeded(
-  projectRoot: Path,
+  projectRoot: string,
   target: ts.ScriptTarget = ts.ScriptTarget.ES5): boolean {
 
   const supportES2015 = target !== ts.ScriptTarget.ES3 && target !== ts.ScriptTarget.ES5;
@@ -21,10 +20,10 @@ export function isDifferentialLoadingNeeded(
   return supportES2015 && isEs5SupportNeeded(projectRoot);
 }
 
-export function isEs5SupportNeeded(projectRoot: Path): boolean {
+export function isEs5SupportNeeded(projectRoot: string): boolean {
   const browsersList: string[] = browserslist(
     undefined, {
-      path: getSystemPath(projectRoot),
+      path: projectRoot,
     });
 
   return !caniuse.isSupported('es6-module', browsersList.join(', '));
diff --git a/packages/angular_devkit/build_angular/src/browser/utils_spec.ts b/packages/angular_devkit/build_angular/src/utils/differential-loading_spec.ts
similarity index 95%
rename from packages/angular_devkit/build_angular/src/browser/utils_spec.ts
rename to packages/angular_devkit/build_angular/src/utils/differential-loading_spec.ts
index 9f0938e1ef1e..e36005a23ba5 100644
--- a/packages/angular_devkit/build_angular/src/browser/utils_spec.ts
+++ b/packages/angular_devkit/build_angular/src/utils/differential-loading_spec.ts
@@ -10,7 +10,7 @@
 import { TestProjectHost } from '@angular-devkit/architect/testing';
 import { join } from '@angular-devkit/core';
 import { ScriptTarget } from 'typescript';
-import { isDifferentialLoadingNeeded } from './utils';
+import { isDifferentialLoadingNeeded } from './differential-loading';
 
 const devkitRoot = (global as any)._DevKitRoot; // tslint:disable-line:no-any
 const workspaceRoot = join(
diff --git a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
index f534826952ac..bcd8bd685852 100644
--- a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
+++ b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
@@ -24,6 +24,7 @@ import { getEsVersionForFileName } from '../angular-cli-files/models/webpack-con
 import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
 import { Schema as BrowserBuilderSchema } from '../browser/schema';
 import { NormalizedBrowserBuilderSchema, defaultProgress, normalizeBrowserSchema } from '../utils';
+import { isDifferentialLoadingNeeded } from './differential-loading';
 
 const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');
 const webpackMerge = require('webpack-merge');
@@ -31,6 +32,7 @@ const webpackMerge = require('webpack-merge');
 type BrowserWebpackConfigOptions = WebpackConfigOptions<NormalizedBrowserBuilderSchema>;
 
 export async function generateWebpackConfig(
+  context: BuilderContext,
   workspaceRoot: string,
   projectRoot: string,
   sourceRoot: string | undefined,
@@ -51,13 +53,10 @@ export async function generateWebpackConfig(
 
   // At the moment, only the browser builder supports differential loading
   // However this config generation is used by multiple builders such as dev-server
-  // const builderInfo = additionalOptions.builderInfo;
-  // const differentialLoading =
-  //   builderInfo
-  //   && builderInfo.builderName === 'browser'
-  //   && isDifferentialLoadingNeeded(projectRoot, scriptTarget);
-  const differentialLoading = false;
-  const scriptTargets = [tsConfig.options.target];
+  const scriptTarget = tsConfig.options.target;
+  const differentialLoading = context.builder.builderName === 'browser'
+    && isDifferentialLoadingNeeded(projectRoot, scriptTarget);
+  const scriptTargets = [scriptTarget];
 
   if (differentialLoading) {
     scriptTargets.unshift(ts.ScriptTarget.ES5);
@@ -121,6 +120,7 @@ export async function generateWebpackConfig(
 
 export async function generateBrowserWebpackConfigFromWorkspace(
   options: BrowserBuilderSchema,
+  context: BuilderContext,
   projectName: string,
   workspace: experimental.workspace.Workspace,
   host: virtualFs.Host<fs.Stats>,
@@ -143,6 +143,7 @@ export async function generateBrowserWebpackConfigFromWorkspace(
   );
 
   return generateWebpackConfig(
+    context,
     getSystemPath(workspace.root),
     getSystemPath(projectRoot),
     sourceRoot && getSystemPath(sourceRoot),
@@ -176,6 +177,7 @@ export async function generateBrowserWebpackConfigFromContext(
 
   const config = await generateBrowserWebpackConfigFromWorkspace(
     options,
+    context,
     projectName,
     workspace,
     host,

From 56369885e800f34992e9b42391d13adeff6c5d93 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 12 Apr 2019 08:40:34 +0200
Subject: [PATCH 1146/1703] test: update e2e to cater for the bundle changes
 with differential loading

---
 tests/legacy-cli/e2e/tests/basic/aot.ts       | 12 +--
 tests/legacy-cli/e2e/tests/basic/build.ts     |  6 +-
 .../e2e/tests/basic/scripts-array.ts          | 16 ++--
 .../e2e/tests/basic/styles-array.ts           | 13 +--
 .../e2e/tests/build/aot/aot-i18n.ts           | 12 ++-
 tests/legacy-cli/e2e/tests/build/css-urls.ts  | 22 +++---
 .../legacy-cli/e2e/tests/build/deploy-url.ts  |  8 +-
 .../e2e/tests/build/dynamic-import.ts         |  2 +-
 .../legacy-cli/e2e/tests/build/environment.ts |  3 +-
 tests/legacy-cli/e2e/tests/build/json.ts      | 21 ++---
 .../legacy-cli/e2e/tests/build/output-dir.ts  |  7 +-
 .../e2e/tests/build/output-hashing.ts         | 79 +++++++++++--------
 tests/legacy-cli/e2e/tests/build/polyfills.ts | 20 ++---
 .../legacy-cli/e2e/tests/build/prod-build.ts  | 11 ++-
 .../e2e/tests/build/script-target.ts          | 10 ++-
 tests/legacy-cli/e2e/tests/build/sourcemap.ts | 10 +--
 .../e2e/tests/build/styles/extract-css.ts     | 59 +++++++++-----
 .../e2e/tests/build/styles/imports.ts         |  4 +-
 .../legacy-cli/e2e/tests/build/styles/less.ts |  2 +-
 .../e2e/tests/build/styles/loaders.ts         |  2 +-
 .../e2e/tests/build/styles/node-sass.ts       |  6 +-
 .../legacy-cli/e2e/tests/build/styles/scss.ts |  3 +-
 .../e2e/tests/build/styles/stylus.ts          |  3 +-
 .../e2e/tests/build/vendor-chunk.ts           |  6 +-
 .../legacy-cli/e2e/tests/i18n/build-locale.ts | 14 ++--
 .../legacy-cli/e2e/tests/misc/lazy-module.ts  |  8 +-
 tests/legacy-cli/e2e/tests/misc/support-ie.ts |  5 ++
 .../e2e/tests/third-party/bootstrap.ts        | 25 +++---
 28 files changed, 232 insertions(+), 157 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/basic/aot.ts b/tests/legacy-cli/e2e/tests/basic/aot.ts
index 95fb6442d6ad..33c2c08ec462 100644
--- a/tests/legacy-cli/e2e/tests/basic/aot.ts
+++ b/tests/legacy-cli/e2e/tests/basic/aot.ts
@@ -1,8 +1,10 @@
+import { expectFileToMatch } from '../../utils/fs';
 import { ng } from '../../utils/process';
-import {expectFileToMatch} from '../../utils/fs';
 
-export default function() {
-  return ng('build', '--aot=true')
-    .then(() => expectFileToMatch('dist/test-project/main.js',
-      /platformBrowser.*bootstrapModuleFactory.*AppModuleNgFactory/));
+export default async function () {
+  await ng('build', '--aot=true');
+  await expectFileToMatch('dist/test-project/main-es5.js',
+    /platformBrowser.*bootstrapModuleFactory.*AppModuleNgFactory/);
+  await expectFileToMatch('dist/test-project/main-es2015.js',
+    /platformBrowser.*bootstrapModuleFactory.*AppModuleNgFactory/);
 }
diff --git a/tests/legacy-cli/e2e/tests/basic/build.ts b/tests/legacy-cli/e2e/tests/basic/build.ts
index 94825cf0dc92..4410c0576afd 100644
--- a/tests/legacy-cli/e2e/tests/basic/build.ts
+++ b/tests/legacy-cli/e2e/tests/basic/build.ts
@@ -5,7 +5,8 @@ import { ng } from '../../utils/process';
 export default async function() {
   // Development build
   await ng('build');
-  await expectFileToMatch('dist/test-project/index.html', 'main.js');
+  await expectFileToMatch('dist/test-project/index.html', 'main-es5.js');
+  await expectFileToMatch('dist/test-project/index.html', 'main-es2015.js');
 
   // Named Development build
   await ng('build', 'test-project');
@@ -14,7 +15,8 @@ export default async function() {
 
   // Production build
   await ng('build', '--prod');
-  await expectFileToMatch('dist/test-project/index.html', /main\.[a-zA-Z0-9]{20}\.js/);
+  await expectFileToMatch('dist/test-project/index.html', /main-es2015\.[a-zA-Z0-9]{20}\.js/);
+  await expectFileToMatch('dist/test-project/index.html', /main-es5\.[a-zA-Z0-9]{20}\.js/);
   await ng('build', '--prod', '--no-progress', 'test-project');
 
   // Store the production build for artifact storage on CircleCI
diff --git a/tests/legacy-cli/e2e/tests/basic/scripts-array.ts b/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
index 9ece63173ab3..061b36f38d03 100644
--- a/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
+++ b/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
@@ -53,16 +53,20 @@ export default function () {
     .then(() => expectFileToMatch('dist/test-project/renamed-lazy-script.js', 'pre-rename-lazy-script'))
     // index.html lists the right bundles
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
-      <script src="runtime.js"></script>
-      <script src="polyfills.es5.js" nomodule></script>
-      <script src="polyfills.js"></script>
+      <script src="runtime-es2015.js" type="module"></script>
+      <script src="polyfills-es2015.js" type="module"></script>
+      <script src="runtime-es5.js" nomodule></script>
+      <script src="polyfills-es5.js" nomodule></script>
       <script src="scripts.js"></script>
       <script src="renamed-script.js"></script>
-      <script src="vendor.js"></script>
-      <script src="main.js"></script>
+      <script src="vendor-es2015.js" type="module"></script>
+      <script src="main-es2015.js" type="module"></script>
+      <script src="vendor-es5.js" nomodule></script>
+      <script src="main-es5.js" nomodule></script>
     `))
     // Ensure scripts can be separately imported from the app.
-    .then(() => expectFileToMatch('dist/test-project/main.js', 'console.log(\'string-script\');'));
+    .then(() => expectFileToMatch('dist/test-project/main-es5.js', 'console.log(\'string-script\');'))
+    .then(() => expectFileToMatch('dist/test-project/main-es2015.js', 'console.log(\'string-script\');'));
     // TODO(architect): disabled until --prod is added.
     // Verify uglify, sourcemaps and hashes. Lazy scripts should not get hashes.
     // .then(() => ng('build', '--prod', '--source-map'))
diff --git a/tests/legacy-cli/e2e/tests/basic/styles-array.ts b/tests/legacy-cli/e2e/tests/basic/styles-array.ts
index e8360c80a601..0261b23de5bd 100644
--- a/tests/legacy-cli/e2e/tests/basic/styles-array.ts
+++ b/tests/legacy-cli/e2e/tests/basic/styles-array.ts
@@ -42,10 +42,13 @@ export default function () {
       <link rel="stylesheet" href="renamed-style.css">
     `))
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
-      <script src="runtime.js"></script>
-      <script src="polyfills.es5.js" nomodule></script>
-      <script src="polyfills.js"></script>
-      <script src="vendor.js"></script>
-      <script src="main.js"></script>
+      <script src="runtime-es2015.js" type="module"></script>
+      <script src="polyfills-es2015.js" type="module"></script>
+      <script src="runtime-es5.js" nomodule></script>
+      <script src="polyfills-es5.js" nomodule></script>
+      <script src="vendor-es2015.js" type="module"></script>
+      <script src="main-es2015.js" type="module"></script>
+      <script src="vendor-es5.js" nomodule></script>
+      <script src="main-es5.js" nomodule></script>
     `));
 }
diff --git a/tests/legacy-cli/e2e/tests/build/aot/aot-i18n.ts b/tests/legacy-cli/e2e/tests/build/aot/aot-i18n.ts
index 34f7b39ea5a6..1460308507bc 100644
--- a/tests/legacy-cli/e2e/tests/build/aot/aot-i18n.ts
+++ b/tests/legacy-cli/e2e/tests/build/aot/aot-i18n.ts
@@ -27,15 +27,19 @@ export default function () {
       '<h1 i18n="An introduction header for this sample">Hello i18n!</h1>'))
     .then(() => ng('build', '--aot', '--i18n-file', 'src/locale/messages.fr.xlf', '--i18n-format',
       'xlf', '--i18n-locale', 'fr'))
-    .then(() => expectFileToMatch('dist/test-project/main.js', /Bonjour i18n!/))
+    .then(() => expectFileToMatch('dist/test-project/main-es5.js', /Bonjour i18n!/))
+    .then(() => expectFileToMatch('dist/test-project/main-es2015.js', /Bonjour i18n!/))
     .then(() => ng('build', '--aot'))
-    .then(() => expectToFail(() => expectFileToMatch('dist/test-project/main.js', /Bonjour i18n!/)))
-    .then(() => expectFileToMatch('dist/test-project/main.js', /Hello i18n!/))
+    .then(() => expectToFail(() => expectFileToMatch('dist/test-project/main-es5.js', /Bonjour i18n!/)))
+    .then(() => expectToFail(() => expectFileToMatch('dist/test-project/main-es2015.js', /Bonjour i18n!/)))
+    .then(() => expectFileToMatch('dist/test-project/main-es2015.js', /Hello i18n!/))
+    .then(() => expectFileToMatch('dist/test-project/main-es5.js', /Hello i18n!/))
     .then(() => appendToFile('src/app/app.component.html',
       '<p i18n>Other content</p>'))
     .then(() => ng('build', '--aot', '--i18nFile', 'src/locale/messages.fr.xlf', '--i18nFormat',
       'xlf', '--i18n-locale', 'fr', '--i18n-missing-translation', 'ignore'))
-    .then(() => expectFileToMatch('dist/test-project/main.js', /Other content/))
+    .then(() => expectFileToMatch('dist/test-project/main-es5.js', /Other content/))
+    .then(() => expectFileToMatch('dist/test-project/main-es2015.js', /Other content/))
     .then(() => expectToFail(() => ng('build', '--aot', '--i18nFile', 'src/locale/messages.fr.xlf',
       '--i18nFormat', 'xlf', '--i18n-locale', 'fr', '--i18n-missing-translation', 'error')));
 }
diff --git a/tests/legacy-cli/e2e/tests/build/css-urls.ts b/tests/legacy-cli/e2e/tests/build/css-urls.ts
index 05b199982a82..4fce5d50156a 100644
--- a/tests/legacy-cli/e2e/tests/build/css-urls.ts
+++ b/tests/legacy-cli/e2e/tests/build/css-urls.ts
@@ -38,9 +38,9 @@ export default function () {
       /url\('\/assets\/global-img-absolute\.svg'\)/))
     .then(() => expectFileToMatch('dist/test-project/styles.css',
       /global-img-relative\.png/))
-    .then(() => expectFileToMatch('dist/test-project/main.js',
+    .then(() => expectFileToMatch('dist/test-project/main-es5.js',
       '/assets/component-img-absolute.svg'))
-    .then(() => expectFileToMatch('dist/test-project/main.js',
+    .then(() => expectFileToMatch('dist/test-project/main-es5.js',
       /component-img-relative\.png/))
     // Check files are correctly created.
     .then(() => expectToFail(() => expectFileToExist('dist/test-project/global-img-absolute.svg')))
@@ -52,21 +52,21 @@ export default function () {
       '--extract-css'))
     .then(() => expectFileToMatch('dist/test-project/styles.css',
       /url\(\'\/assets\/global-img-absolute\.svg\'\)/))
-    .then(() => expectFileToMatch('dist/test-project/main.js',
+    .then(() => expectFileToMatch('dist/test-project/main-es5.js',
       /url\(\'\/assets\/component-img-absolute\.svg\'\)/))
     // Check urls with base-href scheme are used as is (with deploy-url).
     .then(() => ng('build', '--base-href=http://base.url/', '--deploy-url=deploy/',
       '--extract-css'))
     .then(() => expectFileToMatch('dist/test-project/styles.css',
       /url\(\'\/assets\/global-img-absolute\.svg\'\)/))
-    .then(() => expectFileToMatch('dist/test-project/main.js',
+    .then(() => expectFileToMatch('dist/test-project/main-es5.js',
       /url\(\'\/assets\/component-img-absolute\.svg\'\)/))
     // Check urls with deploy-url and base-href scheme only use deploy-url.
     .then(() => ng('build', '--base-href=http://base.url/', '--deploy-url=http://deploy.url/',
       '--extract-css'))
     .then(() => expectFileToMatch('dist/test-project/styles.css',
       /url\(\'\/assets\/global-img-absolute\.svg\'\)/))
-    .then(() => expectFileToMatch('dist/test-project/main.js',
+    .then(() => expectFileToMatch('dist/test-project/main-es5.js',
       /url\(\'\/assets\/component-img-absolute\.svg\'\)/))
     // Check with base-href and deploy-url flags.
     .then(() => ng('build', '--base-href=/base/', '--deploy-url=deploy/',
@@ -75,9 +75,9 @@ export default function () {
       '/assets/global-img-absolute.svg'))
     .then(() => expectFileToMatch('dist/test-project/styles.css',
       /global-img-relative\.png/))
-    .then(() => expectFileToMatch('dist/test-project/main.js',
+    .then(() => expectFileToMatch('dist/test-project/main-es5.js',
       '/assets/component-img-absolute.svg'))
-    .then(() => expectFileToMatch('dist/test-project/main.js',
+    .then(() => expectFileToMatch('dist/test-project/main-es5.js',
       /deploy\/component-img-relative\.png/))
     // Check with identical base-href and deploy-url flags.
     .then(() => ng('build', '--base-href=/base/', '--deploy-url=/base/',
@@ -86,9 +86,9 @@ export default function () {
       '/assets/global-img-absolute.svg'))
     .then(() => expectFileToMatch('dist/test-project/styles.css',
       /global-img-relative\.png/))
-    .then(() => expectFileToMatch('dist/test-project/main.js',
+    .then(() => expectFileToMatch('dist/test-project/main-es5.js',
       '/assets/component-img-absolute.svg'))
-    .then(() => expectFileToMatch('dist/test-project/main.js',
+    .then(() => expectFileToMatch('dist/test-project/main-es5.js',
       /\/base\/component-img-relative\.png/))
     // Check with only base-href flag.
     .then(() => ng('build', '--base-href=/base/',
@@ -97,8 +97,8 @@ export default function () {
       '/assets/global-img-absolute.svg'))
     .then(() => expectFileToMatch('dist/test-project/styles.css',
       /global-img-relative\.png/))
-    .then(() => expectFileToMatch('dist/test-project/main.js',
+    .then(() => expectFileToMatch('dist/test-project/main-es5.js',
       '/assets/component-img-absolute.svg'))
-    .then(() => expectFileToMatch('dist/test-project/main.js',
+    .then(() => expectFileToMatch('dist/test-project/main-es5.js',
       /component-img-relative\.png/));
 }
diff --git a/tests/legacy-cli/e2e/tests/build/deploy-url.ts b/tests/legacy-cli/e2e/tests/build/deploy-url.ts
index ff5051ae484d..a1e21c0314a8 100644
--- a/tests/legacy-cli/e2e/tests/build/deploy-url.ts
+++ b/tests/legacy-cli/e2e/tests/build/deploy-url.ts
@@ -13,17 +13,17 @@ export default function () {
     // use image with file size >10KB to prevent inlining
     .then(() => copyProjectAsset('images/spectrum.png', './src/assets/more.png'))
     .then(() => ng('build', '--deploy-url=deployUrl/', '--extract-css'))
-    .then(() => expectFileToMatch('dist/test-project/index.html', 'deployUrl/main.js'))
+    .then(() => expectFileToMatch('dist/test-project/index.html', 'deployUrl/main-es5.js'))
     // verify --deploy-url isn't applied to extracted css urls
     .then(() => expectFileToMatch('dist/test-project/styles.css',
       /url\(['"]?more\.png['"]?\)/))
     .then(() => ng('build', '--deploy-url=http://example.com/some/path/', '--extract-css'))
-    .then(() => expectFileToMatch('dist/test-project/index.html', 'http://example.com/some/path/main.js'))
+    .then(() => expectFileToMatch('dist/test-project/index.html', 'http://example.com/some/path/main-es5.js'))
     // verify --deploy-url is applied to non-extracted css urls
     .then(() => ng('build', '--deploy-url=deployUrl/', '--extract-css=false'))
-    .then(() => expectFileToMatch('dist/test-project/styles.js',
+    .then(() => expectFileToMatch('dist/test-project/styles-es5.js',
       /\(['"]?deployUrl\/more\.png['"]?\)/))
-    .then(() => expectFileToMatch('dist/test-project/runtime.js',
+    .then(() => expectFileToMatch('dist/test-project/runtime-es5.js',
       /__webpack_require__\.p = "deployUrl\/";/));
     // // verify slash is appended to the end of --deploy-url if missing
     // .then(() => ng('build', '--deploy-url=deployUrl', '--extract-css=false'))
diff --git a/tests/legacy-cli/e2e/tests/build/dynamic-import.ts b/tests/legacy-cli/e2e/tests/build/dynamic-import.ts
index 296cab2ef2b4..e999cf107138 100644
--- a/tests/legacy-cli/e2e/tests/build/dynamic-import.ts
+++ b/tests/legacy-cli/e2e/tests/build/dynamic-import.ts
@@ -36,7 +36,7 @@ export default async function() {
   // Build and look for the split lazy module
   await ng('build');
   for (const file of fs.readdirSync('./dist/test-project')) {
-    if (file === 'src-app-lazy-lazy-module.js') {
+    if (file === 'src-app-lazy-lazy-module-es5.js') {
       // Lazy module chunk was found and succesfully split
       return;
     }
diff --git a/tests/legacy-cli/e2e/tests/build/environment.ts b/tests/legacy-cli/e2e/tests/build/environment.ts
index f00b73680b1f..b0387e5f44cd 100644
--- a/tests/legacy-cli/e2e/tests/build/environment.ts
+++ b/tests/legacy-cli/e2e/tests/build/environment.ts
@@ -18,5 +18,6 @@ export default function() {
       };
     }))
     .then(() => ng('build', '--configuration=prod-env'))
-    .then(() => expectFileToMatch('dist/test-project/main.js', 'production: true'));
+    .then(() => expectFileToMatch('dist/test-project/main-es5.js', 'production: true'))
+    .then(() => expectFileToMatch('dist/test-project/main-es2015.js', 'production: true'));
 }
diff --git a/tests/legacy-cli/e2e/tests/build/json.ts b/tests/legacy-cli/e2e/tests/build/json.ts
index d47e9aa9cf3d..6f94975d00be 100644
--- a/tests/legacy-cli/e2e/tests/build/json.ts
+++ b/tests/legacy-cli/e2e/tests/build/json.ts
@@ -1,13 +1,14 @@
-import {ng} from '../../utils/process';
-import {expectFileToExist} from '../../utils/fs';
-import {expectGitToBeClean} from '../../utils/git';
-import {getGlobalVariable} from '../../utils/env';
+import {ng} from '../../utils/process';	
+import {expectFileToExist} from '../../utils/fs';	
+import {expectGitToBeClean} from '../../utils/git';	
+import {getGlobalVariable} from '../../utils/env';	
 
 
-export default function() {
-  // TODO(architect): Delete this test. It is now in devkit/build-angular.
+ export default function() {	
+  // TODO(architect): Delete this test. It is now in devkit/build-angular.	
 
-  return ng('build', '--stats-json')
-    .then(() => expectFileToExist('./dist/test-project/stats.json'))
-    .then(() => expectGitToBeClean());
-}
+   return ng('build', '--stats-json')	
+    .then(() => expectFileToExist('./dist/test-project/stats-es5.json'))
+    .then(() => expectFileToExist('./dist/test-project/stats-es2015.json'))
+    .then(() => expectGitToBeClean());	
+}
\ No newline at end of file
diff --git a/tests/legacy-cli/e2e/tests/build/output-dir.ts b/tests/legacy-cli/e2e/tests/build/output-dir.ts
index 26ed3c38f306..222ce06582af 100644
--- a/tests/legacy-cli/e2e/tests/build/output-dir.ts
+++ b/tests/legacy-cli/e2e/tests/build/output-dir.ts
@@ -1,4 +1,3 @@
-import {getGlobalVariable} from '../../utils/env';
 import {expectFileToExist} from '../../utils/fs';
 import {expectGitToBeClean} from '../../utils/git';
 import {ng} from '../../utils/process';
@@ -11,7 +10,8 @@ export default function() {
 
   return ng('build', '--output-path', 'build-output')
     .then(() => expectFileToExist('./build-output/index.html'))
-    .then(() => expectFileToExist('./build-output/main.js'))
+    .then(() => expectFileToExist('./build-output/main-es5.js'))
+    .then(() => expectFileToExist('./build-output/main-es2015.js'))
     .then(() => expectToFail(expectGitToBeClean))
     .then(() => updateJsonFile('angular.json', workspaceJson => {
       const appArchitect = workspaceJson.projects['test-project'].architect;
@@ -19,6 +19,7 @@ export default function() {
     }))
     .then(() => ng('build'))
     .then(() => expectFileToExist('./config-build-output/index.html'))
-    .then(() => expectFileToExist('./config-build-output/main.js'))
+    .then(() => expectFileToExist('./config-build-output/main-es5.js'))
+    .then(() => expectFileToExist('./config-build-output/main-es2015.js'))
     .then(() => expectToFail(expectGitToBeClean));
 }
diff --git a/tests/legacy-cli/e2e/tests/build/output-hashing.ts b/tests/legacy-cli/e2e/tests/build/output-hashing.ts
index debcfc481bf7..676fae3ac49b 100644
--- a/tests/legacy-cli/e2e/tests/build/output-hashing.ts
+++ b/tests/legacy-cli/e2e/tests/build/output-hashing.ts
@@ -1,41 +1,56 @@
-import {ng} from '../../utils/process';
 import { copyProjectAsset } from '../../utils/assets';
-import { writeMultipleFiles, expectFileToMatch, expectFileMatchToExist } from '../../utils/fs';
+import { expectFileMatchToExist, expectFileToMatch, writeMultipleFiles } from '../../utils/fs';
+import { ng } from '../../utils/process';
 
 
-function verifyMedia(fileNameRe: RegExp, content: RegExp) {
-  return expectFileMatchToExist('dist/test-project/', fileNameRe)
-    .then(fileName => expectFileToMatch(`dist/test-project/${fileName}`, content));
+async function verifyMedia(fileNameRe: RegExp, content: RegExp) {
+  const fileName = await expectFileMatchToExist('dist/test-project/', fileNameRe);
+  await expectFileToMatch(`dist/test-project/${fileName}`, content);
 }
 
-export default function() {
-  return Promise.resolve()
-    .then(() => writeMultipleFiles({
-      'src/styles.css': 'body { background-image: url("./assets/image.png"); }'
-    }))
-    // use image with file size >10KB to prevent inlining
-    .then(() => copyProjectAsset('images/spectrum.png', './src/assets/image.png'))
-    .then(() => ng('build', '--output-hashing=all'))
-    .then(() => expectFileToMatch('dist/test-project/index.html', /runtime\.[0-9a-f]{20}\.js/))
-    .then(() => expectFileToMatch('dist/test-project/index.html', /main\.[0-9a-f]{20}\.js/))
-    .then(() => expectFileToMatch('dist/test-project/index.html', /styles\.[0-9a-f]{20}\.(css|js)/))
-    .then(() => verifyMedia(/styles\.[0-9a-f]{20}\.(css|js)/, /image\.[0-9a-f]{20}\.png/))
+export default async function () {
+  await writeMultipleFiles({
+    'src/styles.css': 'body { background-image: url("./assets/image.png"); }',
+  });
+  // use image with file size >10KB to prevent inlining
+  await copyProjectAsset('images/spectrum.png', './src/assets/image.png');
+  await ng('build', '--output-hashing=all');
+  await expectFileToMatch('dist/test-project/index.html', /runtime-es2015\.[0-9a-f]{20}\.js/);
+  await expectFileToMatch('dist/test-project/index.html', /main-es2015\.[0-9a-f]{20}\.js/);
+  await expectFileToMatch('dist/test-project/index.html', /runtime-es5\.[0-9a-f]{20}\.js/);
+  await expectFileToMatch('dist/test-project/index.html', /main-es5\.[0-9a-f]{20}\.js/);
+  await expectFileToMatch('dist/test-project/index.html', /styles-es5\.[0-9a-f]{20}\.(css|js)/);
+  await expectFileToMatch('dist/test-project/index.html', /styles-es2015\.[0-9a-f]{20}\.(css|js)/);
+  await verifyMedia(/styles-es5\.[0-9a-f]{20}\.(css|js)/, /image\.[0-9a-f]{20}\.png/);
+  await verifyMedia(/styles-es2015\.[0-9a-f]{20}\.(css|js)/, /image\.[0-9a-f]{20}\.png/);
 
-    .then(() => ng('build', '--output-hashing=none'))
-    .then(() => expectFileToMatch('dist/test-project/index.html', /runtime\.js/))
-    .then(() => expectFileToMatch('dist/test-project/index.html', /main\.js/))
-    .then(() => expectFileToMatch('dist/test-project/index.html', /styles\.(css|js)/))
-    .then(() => verifyMedia(/styles\.(css|js)/, /image\.png/))
+  await ng('build', '--output-hashing=none');
+  await expectFileToMatch('dist/test-project/index.html', /runtime-es2015\.js/);
+  await expectFileToMatch('dist/test-project/index.html', /runtime-es5\.js/);
+  await expectFileToMatch('dist/test-project/index.html', /main-es5\.js/);
+  await expectFileToMatch('dist/test-project/index.html', /main-es2015\.js/);
+  await expectFileToMatch('dist/test-project/index.html', /styles-es5\.(css|js)/);
+  await expectFileToMatch('dist/test-project/index.html', /styles-es2015\.(css|js)/);
+  await verifyMedia(/styles-es5\.(css|js)/, /image\.png/);
+  await verifyMedia(/styles-es2015\.(css|js)/, /image\.png/);
 
-    .then(() => ng('build', '--output-hashing=media'))
-    .then(() => expectFileToMatch('dist/test-project/index.html', /runtime\.js/))
-    .then(() => expectFileToMatch('dist/test-project/index.html', /main\.js/))
-    .then(() => expectFileToMatch('dist/test-project/index.html', /styles\.(css|js)/))
-    .then(() => verifyMedia(/styles\.(css|js)/, /image\.[0-9a-f]{20}\.png/))
+  await ng('build', '--output-hashing=media');
+  await expectFileToMatch('dist/test-project/index.html', /runtime-es2015\.js/);
+  await expectFileToMatch('dist/test-project/index.html', /main-es2015\.js/);
+  await expectFileToMatch('dist/test-project/index.html', /runtime-es5\.js/);
+  await expectFileToMatch('dist/test-project/index.html', /main-es5\.js/);
+  await expectFileToMatch('dist/test-project/index.html', /styles-es5\.(css|js)/);
+  await expectFileToMatch('dist/test-project/index.html', /styles-es2015\.(css|js)/);
+  await verifyMedia(/styles-es5\.(css|js)/, /image\.[0-9a-f]{20}\.png/);
+  await verifyMedia(/styles-es2015\.(css|js)/, /image\.[0-9a-f]{20}\.png/);
 
-    .then(() => ng('build', '--output-hashing=bundles'))
-    .then(() => expectFileToMatch('dist/test-project/index.html', /runtime\.[0-9a-f]{20}\.js/))
-    .then(() => expectFileToMatch('dist/test-project/index.html', /main\.[0-9a-f]{20}\.js/))
-    .then(() => expectFileToMatch('dist/test-project/index.html', /styles\.[0-9a-f]{20}\.(css|js)/))
-    .then(() => verifyMedia(/styles\.[0-9a-f]{20}\.(css|js)/, /image\.png/));
+  await ng('build', '--output-hashing=bundles');
+  await expectFileToMatch('dist/test-project/index.html', /runtime-es2015\.[0-9a-f]{20}\.js/);
+  await expectFileToMatch('dist/test-project/index.html', /main-es2015\.[0-9a-f]{20}\.js/);
+  await expectFileToMatch('dist/test-project/index.html', /runtime-es5\.[0-9a-f]{20}\.js/);
+  await expectFileToMatch('dist/test-project/index.html', /main-es5\.[0-9a-f]{20}\.js/);
+  await expectFileToMatch('dist/test-project/index.html', /styles-es5\.[0-9a-f]{20}\.(css|js)/);
+  await expectFileToMatch('dist/test-project/index.html', /styles-es2015\.[0-9a-f]{20}\.(css|js)/);
+  await verifyMedia(/styles-es5\.[0-9a-f]{20}\.(css|js)/, /image\.png/);
+  await verifyMedia(/styles-es2015\.[0-9a-f]{20}\.(css|js)/, /image\.png/);
 }
diff --git a/tests/legacy-cli/e2e/tests/build/polyfills.ts b/tests/legacy-cli/e2e/tests/build/polyfills.ts
index d2a7b85bb3f3..72ad4c7b498e 100644
--- a/tests/legacy-cli/e2e/tests/build/polyfills.ts
+++ b/tests/legacy-cli/e2e/tests/build/polyfills.ts
@@ -11,24 +11,24 @@ import { expectToFail } from '../../utils/utils';
 export default async function () {
     await ng('build');
     // files were created successfully
-    await expectFileToMatch('dist/test-project/polyfills.js', 'core-js/proposals/reflect-metadata');
-    await expectFileToMatch('dist/test-project/polyfills.js', 'zone.js');
+    await expectFileToMatch('dist/test-project/polyfills-es5.js', 'core-js/proposals/reflect-metadata');
+    await expectFileToMatch('dist/test-project/polyfills-es5.js', 'zone.js');
     expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script src="runtime.js"></script>
-      <script src="polyfills.es5.js" nomodule></script>
+      <script src="polyfills-es5.js" nomodule></script>
       <script src="polyfills.js"></script>
     `);
-    const jitPolyfillSize = await getFileSize('dist/test-project/polyfills.js');
+    const jitPolyfillSize = await getFileSize('dist/test-project/polyfills-es5.js');
 
     await ng('build', '--aot');
     // files were created successfully
-    await expectFileToExist('dist/test-project/polyfills.js');
-    await expectFileSizeToBeUnder('dist/test-project/polyfills.js', jitPolyfillSize);
-    await expectToFail(() => expectFileToMatch('dist/test-project/polyfills.js', 'core-js/proposals/reflect-metadata'));
-    await expectFileToMatch('dist/test-project/polyfills.js', 'zone.js');
+    await expectFileToExist('dist/test-project/polyfills-es5.js');
+    await expectFileSizeToBeUnder('dist/test-project/polyfills-es5.js', jitPolyfillSize);
+    await expectToFail(() => expectFileToMatch('dist/test-project/polyfills-es5.js', 'core-js/proposals/reflect-metadata'));
+    await expectFileToMatch('dist/test-project/polyfills-es5.js', 'zone.js');
     expectFileToMatch('dist/test-project/index.html', oneLineTrim`
-      <script src="runtime.js"></script>
-      <script src="polyfills.es5.js" nomodule></script>
+      <script src="runtime-es5.js"></script>
+      <script src="polyfills-es5.js" nomodule></script>
       <script src="polyfills.js"></script>
     `);
 }
diff --git a/tests/legacy-cli/e2e/tests/build/prod-build.ts b/tests/legacy-cli/e2e/tests/build/prod-build.ts
index 72e9f9b88fff..a99c8c88b3da 100644
--- a/tests/legacy-cli/e2e/tests/build/prod-build.ts
+++ b/tests/legacy-cli/e2e/tests/build/prod-build.ts
@@ -3,7 +3,6 @@ import {readdirSync} from 'fs';
 import {expectFileToExist, expectFileToMatch} from '../../utils/fs';
 import {ng} from '../../utils/process';
 import {expectGitToBeClean} from '../../utils/git';
-import {getGlobalVariable} from '../../utils/env';
 
 
 export default function() {
@@ -14,13 +13,17 @@ export default function() {
   return ng('build', '--prod')
     .then(() => expectFileToExist(join(process.cwd(), 'dist')))
     // Check for cache busting hash script src
-    .then(() => expectFileToMatch('dist/test-project/index.html', /main\.[0-9a-f]{20}\.js/))
+    .then(() => expectFileToMatch('dist/test-project/index.html', /main-es5\.[0-9a-f]{20}\.js/))
+    .then(() => expectFileToMatch('dist/test-project/index.html', /main-es2015\.[0-9a-f]{20}\.js/))
     .then(() => expectFileToMatch('dist/test-project/index.html', /styles\.[0-9a-f]{20}\.css/))
     .then(() => expectFileToMatch('dist/test-project/3rdpartylicenses.txt', /MIT/))
     // Defaults to AoT
     .then(() => {
-      const main = readdirSync('./dist/test-project').find(name => !!name.match(/main.[a-z0-9]+\.js/));
-      expectFileToMatch(`dist/test-project/${main}`, /bootstrapModuleFactory\(/);
+      const mainES5 = readdirSync('./dist/test-project').find(name => !!name.match(/main-es5.[a-z0-9]+\.js/));
+      expectFileToMatch(`dist/test-project/${mainES5}`, /bootstrapModuleFactory\(/);
+
+      const mainES2015 = readdirSync('./dist/test-project').find(name => !!name.match(/main-es2015.[a-z0-9]+\.js/));
+      expectFileToMatch(`dist/test-project/${mainES5}`, /bootstrapModuleFactory\(/);
     })
     // Check that the process didn't change local files.
     .then(() => expectGitToBeClean());
diff --git a/tests/legacy-cli/e2e/tests/build/script-target.ts b/tests/legacy-cli/e2e/tests/build/script-target.ts
index cd9d796652cb..b7eb6a896b8a 100644
--- a/tests/legacy-cli/e2e/tests/build/script-target.ts
+++ b/tests/legacy-cli/e2e/tests/build/script-target.ts
@@ -2,12 +2,13 @@ import { expectFileToMatch } from '../../utils/fs';
 import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { getGlobalVariable } from '../../utils/env';
+import { expectToFail } from '../../utils/utils';
 
 
 export default function () {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
-  // Skip this test in Angular 2, it had different bundles.
+  // Skip this test in Angular 2, it had different bundles.	
   if (getGlobalVariable('argv')['ng2']) {
     return Promise.resolve();
   }
@@ -18,6 +19,7 @@ export default function () {
       compilerOptions['target'] = 'es2015';
     }))
     .then(() => ng('build', '--optimization', '--output-hashing=none', '--vendor-chunk'))
-    // Check class constructors are present in the vendor output.
-    .then(() => expectFileToMatch('dist/test-project/vendor.js', /class \w{constructor\(\){/));
-}
+    // Check class constructors are present in the vendor output.	
+    .then(() => expectFileToMatch('dist/test-project/vendor-es2015.js', /class \w{constructor\(\){/))
+    .then(() => expectToFail(() => expectFileToMatch('dist/test-project/vendor-es5.js', /class \w{constructor\(\){/)));
+}
\ No newline at end of file
diff --git a/tests/legacy-cli/e2e/tests/build/sourcemap.ts b/tests/legacy-cli/e2e/tests/build/sourcemap.ts
index ee47abf5986c..02ee1d25370f 100644
--- a/tests/legacy-cli/e2e/tests/build/sourcemap.ts
+++ b/tests/legacy-cli/e2e/tests/build/sourcemap.ts
@@ -7,14 +7,14 @@ export default function() {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   return ng('build', '--source-map')
-    .then(() => expectFileToExist('dist/test-project/main.js.map'))
+    .then(() => expectFileToExist('dist/test-project/main-es5.js.map'))
 
     .then(() => ng('build', '--source-map', 'false'))
-    .then(() => expectToFail(() => expectFileToExist('dist/test-project/main.js.map')))
+    .then(() => expectToFail(() => expectFileToExist('dist/test-project/main-es5.js.map')))
 
-    .then(() => ng('build', '--optimization', '--output-hashing=none'))
-    .then(() => expectToFail(() => expectFileToExist('dist/test-project/main..js.map')))
+    .then(() => ng('build', '--optimization', '--output-hashing=none', '--source-map', 'false'))
+    .then(() => expectToFail(() => expectFileToExist('dist/test-project/main-es5.js.map')))
 
     .then(() => ng('build', '--optimization', '--output-hashing=none', '--source-map'))
-    .then(() => expectFileToExist('dist/test-project/main.js.map'));
+    .then(() => expectFileToExist('dist/test-project/main-es5.js.map'));
 }
diff --git a/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts b/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
index e731432521c4..bfb970699528 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
@@ -37,38 +37,55 @@ export default function () {
     .then(() => expectFileToMatch('dist/test-project/renamed-style.css', '.pre-rename-style'))
     .then(() => expectFileToMatch('dist/test-project/renamed-lazy-style.css', '.pre-rename-lazy-style'))
     // there are no js entry points for css only bundles
-    .then(() => expectToFail(() => expectFileToExist('dist/test-project/style.js')))
-    .then(() => expectToFail(() => expectFileToExist('dist/test-project/lazy-style.js')))
-    .then(() => expectToFail(() => expectFileToExist('dist/test-project/renamed-style.js')))
-    .then(() => expectToFail(() => expectFileToExist('dist/test-project/renamed-lazy-style.js')))
+    .then(() => expectToFail(() => expectFileToExist('dist/test-project/style-es5.js')))
+    .then(() => expectToFail(() => expectFileToExist('dist/test-project/lazy-style-es5.js')))
+    .then(() => expectToFail(() => expectFileToExist('dist/test-project/renamed-style-es5.js')))
+    .then(() => expectToFail(() => expectFileToExist('dist/test-project/renamed-lazy-style-es5.js')))
+    .then(() => expectToFail(() => expectFileToExist('dist/test-project/style-es2015.js')))
+    .then(() => expectToFail(() => expectFileToExist('dist/test-project/lazy-style-es2015.js')))
+    .then(() => expectToFail(() => expectFileToExist('dist/test-project/renamed-style-es2015.js')))
+    .then(() => expectToFail(() => expectFileToExist('dist/test-project/renamed-lazy-style-es2015.js')))
     // index.html lists the right bundles
     .then(() => expectFileToMatch('dist/test-project/index.html', new RegExp(oneLineTrim`
       <link rel="stylesheet" href="styles\.css"/?>
       <link rel="stylesheet" href="renamed-style\.css"/?>
     `)))
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
-      <script src="runtime.js"></script>
-      <script src="polyfills.es5.js" nomodule></script>
-      <script src="polyfills.js"></script>
-      <script src="vendor.js"></script>
-      <script src="main.js"></script>
+    <script src="runtime-es2015.js" type="module"></script>
+    <script src="polyfills-es2015.js" type="module"></script>
+    <script src="runtime-es5.js" nomodule></script>
+    <script src="polyfills-es5.js" nomodule></script>
+    <script src="vendor-es2015.js" type="module"></script>
+    <script src="main-es2015.js" type="module"></script>
+    <script src="vendor-es5.js" nomodule></script>
+    <script src="main-es5.js" nomodule></script>
     `))
     // also check when css isn't extracted
     .then(() => ng('build', '--no-extract-css'))
     // files were created successfully
-    .then(() => expectFileToMatch('dist/test-project/styles.js', '.string-style'))
-    .then(() => expectFileToMatch('dist/test-project/styles.js', '.input-style'))
-    .then(() => expectFileToMatch('dist/test-project/lazy-style.js', '.lazy-style'))
-    .then(() => expectFileToMatch('dist/test-project/renamed-style.js', '.pre-rename-style'))
-    .then(() => expectFileToMatch('dist/test-project/renamed-lazy-style.js', '.pre-rename-lazy-style'))
+    .then(() => expectFileToMatch('dist/test-project/styles-es5.js', '.string-style'))
+    .then(() => expectFileToMatch('dist/test-project/styles-es5.js', '.input-style'))
+    .then(() => expectFileToMatch('dist/test-project/lazy-style-es5.js', '.lazy-style'))
+    .then(() => expectFileToMatch('dist/test-project/renamed-style-es5.js', '.pre-rename-style'))
+    .then(() => expectFileToMatch('dist/test-project/renamed-lazy-style-es5.js', '.pre-rename-lazy-style'))
+    .then(() => expectFileToMatch('dist/test-project/styles-es2015.js', '.string-style'))
+    .then(() => expectFileToMatch('dist/test-project/styles-es2015.js', '.input-style'))
+    .then(() => expectFileToMatch('dist/test-project/lazy-style-es2015.js', '.lazy-style'))
+    .then(() => expectFileToMatch('dist/test-project/renamed-style-es2015.js', '.pre-rename-style'))
+    .then(() => expectFileToMatch('dist/test-project/renamed-lazy-style-es2015.js', '.pre-rename-lazy-style'))
     // index.html lists the right bundles
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
-      <script src="runtime.js"></script>
-      <script src="polyfills.es5.js" nomodule></script>
-      <script src="polyfills.js"></script>
-      <script src="styles.js"></script>
-      <script src="renamed-style.js"></script>
-      <script src="vendor.js"></script>
-      <script src="main.js"></script>
+    <script src="runtime-es2015.js" type="module"></script>
+    <script src="polyfills-es2015.js" type="module"></script>
+    <script src="runtime-es5.js" nomodule></script>
+    <script src="polyfills-es5.js" nomodule></script>
+    <script src="styles-es2015.js" type="module"></script>
+    <script src="styles-es5.js" nomodule></script>
+    <script src="renamed-style-es2015.js" type="module"></script>
+    <script src="renamed-style-es5.js" nomodule></script>
+    <script src="vendor-es2015.js" type="module"></script>
+    <script src="main-es2015.js" type="module"></script>
+    <script src="vendor-es5.js" nomodule></script>
+    <script src="main-es5.js" nomodule></script>
     `));
 }
diff --git a/tests/legacy-cli/e2e/tests/build/styles/imports.ts b/tests/legacy-cli/e2e/tests/build/styles/imports.ts
index 41bb0dc4b571..784d51f4f6c0 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/imports.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/imports.ts
@@ -56,9 +56,9 @@ export default function () {
         .then(() => expectToFail(() =>
           expectFileToMatch('dist/test-project/styles.css', '"mappings":""')))
         // verify component styles
-        .then(() => expectFileToMatch('dist/test-project/main.js',
+        .then(() => expectFileToMatch('dist/test-project/main-es5.js',
           /.outer.*.inner.*background:\s*#[fF]+/))
-        .then(() => expectFileToMatch('dist/test-project/main.js',
+        .then(() => expectFileToMatch('dist/test-project/main-es5.js',
           /h1.*background:\s*#000+/))
         // Also check imports work on ng test
         .then(() => ng('test', '--watch=false'))
diff --git a/tests/legacy-cli/e2e/tests/build/styles/less.ts b/tests/legacy-cli/e2e/tests/build/styles/less.ts
index a8616a78484b..947ccb52aa98 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/less.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/less.ts
@@ -42,5 +42,5 @@ export default function () {
     .then(() => expectFileToMatch('dist/test-project/styles.css',
       /p\s*{\s*background-color: red;\s*}/))
     .then(() => expectToFail(() => expectFileToMatch('dist/test-project/styles.css', '"mappings":""')))
-    .then(() => expectFileToMatch('dist/test-project/main.js', /.outer.*.inner.*background:\s*#[fF]+/));
+    .then(() => expectFileToMatch('dist/test-project/main-es5.js', /.outer.*.inner.*background:\s*#[fF]+/));
 }
diff --git a/tests/legacy-cli/e2e/tests/build/styles/loaders.ts b/tests/legacy-cli/e2e/tests/build/styles/loaders.ts
index 8f52edc87b3b..fea92def021d 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/loaders.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/loaders.ts
@@ -36,6 +36,6 @@ export default function () {
       './app.component.css', './app.component.scss'))
     .then(() => ng('build'))
     .then(() => expectToFail(() => expectFileToMatch('dist/test-project/styles.css', /exports/)))
-    .then(() => expectToFail(() => expectFileToMatch('dist/test-project/main.js',
+    .then(() => expectToFail(() => expectFileToMatch('dist/test-project/main-es5.js',
       /".*module\.exports.*\.outer.*background:/)));
 }
diff --git a/tests/legacy-cli/e2e/tests/build/styles/node-sass.ts b/tests/legacy-cli/e2e/tests/build/styles/node-sass.ts
index 4c9d116a519f..e0a4b3fc2cdc 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/node-sass.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/node-sass.ts
@@ -39,7 +39,8 @@ export default async function () {
   await expectFileToMatch('dist/test-project/styles.css', /body\s*{\s*background-color: blue;\s*}/);
   await expectFileToMatch('dist/test-project/styles.css', /p\s*{\s*background-color: red;\s*}/);
   await expectToFail(() => expectFileToMatch('dist/test-project/styles.css', '"mappings":""'));
-  await expectFileToMatch('dist/test-project/main.js', /.outer.*.inner.*background:\s*#[fF]+/);
+  await expectFileToMatch('dist/test-project/main-es5.js', /.outer.*.inner.*background:\s*#[fF]+/);
+  await expectFileToMatch('dist/test-project/main-es2015.js', /.outer.*.inner.*background:\s*#[fF]+/);
 
   await silentNpm('install', 'node-gyp');
   await silentNpm('install', 'fibers');
@@ -50,5 +51,6 @@ export default async function () {
   await expectFileToMatch('dist/test-project/styles.css', /body\s*{\s*background-color: blue;\s*}/);
   await expectFileToMatch('dist/test-project/styles.css', /p\s*{\s*background-color: red;\s*}/);
   await expectToFail(() => expectFileToMatch('dist/test-project/styles.css', '"mappings":""'));
-  await expectFileToMatch('dist/test-project/main.js', /.outer.*.inner.*background:\s*#[fF]+/);
+  await expectFileToMatch('dist/test-project/main-es5.js', /.outer.*.inner.*background:\s*#[fF]+/);
+  await expectFileToMatch('dist/test-project/main-es2015.js', /.outer.*.inner.*background:\s*#[fF]+/);
 }
diff --git a/tests/legacy-cli/e2e/tests/build/styles/scss.ts b/tests/legacy-cli/e2e/tests/build/styles/scss.ts
index 60173381142d..156ad85cd592 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/scss.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/scss.ts
@@ -42,5 +42,6 @@ export default function () {
     .then(() => expectFileToMatch('dist/test-project/styles.css',
       /p\s*{\s*background-color: red;\s*}/))
     .then(() => expectToFail(() => expectFileToMatch('dist/test-project/styles.css', '"mappings":""')))
-    .then(() => expectFileToMatch('dist/test-project/main.js', /.outer.*.inner.*background:\s*#[fF]+/));
+    .then(() => expectFileToMatch('dist/test-project/main-es5.js', /.outer.*.inner.*background:\s*#[fF]+/));
+    .then(() => expectFileToMatch('dist/test-project/main-es2015.js', /.outer.*.inner.*background:\s*#[fF]+/));
 }
diff --git a/tests/legacy-cli/e2e/tests/build/styles/stylus.ts b/tests/legacy-cli/e2e/tests/build/styles/stylus.ts
index 83d33074719a..fef7ef380ec0 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/stylus.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/stylus.ts
@@ -42,5 +42,6 @@ export default function () {
     .then(() => expectFileToMatch('dist/test-project/styles.css',
       /p\s*{\s*background-color: #f00;\s*}/))
     .then(() => expectToFail(() => expectFileToMatch('dist/test-project/styles.css', '"mappings":""')))
-    .then(() => expectFileToMatch('dist/test-project/main.js', /.outer.*.inner.*background:\s*#[fF]+/));
+    .then(() => expectFileToMatch('dist/test-project/main-es5.js', /.outer.*.inner.*background:\s*#[fF]+/));
+    .then(() => expectFileToMatch('dist/test-project/main-es2015.js', /.outer.*.inner.*background:\s*#[fF]+/));
 }
diff --git a/tests/legacy-cli/e2e/tests/build/vendor-chunk.ts b/tests/legacy-cli/e2e/tests/build/vendor-chunk.ts
index 8a35d7c870a0..d2fd20a855b1 100644
--- a/tests/legacy-cli/e2e/tests/build/vendor-chunk.ts
+++ b/tests/legacy-cli/e2e/tests/build/vendor-chunk.ts
@@ -7,7 +7,9 @@ export default function() {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   return ng('build')
-    .then(() => expectFileToExist('dist/test-project/vendor.js'))
+    .then(() => expectFileToExist('dist/test-project/vendor-es5.js'))
+    .then(() => expectFileToExist('dist/test-project/vendor-es2015.js'))
     .then(() => ng('build', '--vendor-chunk=false'))
-    .then(() => expectToFail(() => expectFileToExist('dist/test-project/vendor.js')));
+    .then(() => expectToFail(() => expectFileToExist('dist/test-project/vendor-es5.js')))
+    .then(() => expectToFail(() => expectFileToExist('dist/test-project/vendor-es2015.js')));
 }
diff --git a/tests/legacy-cli/e2e/tests/i18n/build-locale.ts b/tests/legacy-cli/e2e/tests/i18n/build-locale.ts
index ce537cd3e25a..c05515c5a54f 100644
--- a/tests/legacy-cli/e2e/tests/i18n/build-locale.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/build-locale.ts
@@ -15,11 +15,15 @@ export default function () {
   return Promise.resolve()
     // tests for register_locale_data transformer
     .then(() => ng('build', '--aot', '--i18n-locale=fr'))
-    .then(() => expectFileToMatch('dist/test-project/main.js', /registerLocaleData/))
-    .then(() => expectFileToMatch('dist/test-project/main.js', /angular_common_locales_fr/))
+    .then(() => expectFileToMatch('dist/test-project/main-es5.js', /registerLocaleData/))
+    .then(() => expectFileToMatch('dist/test-project/main-es5.js', /angular_common_locales_fr/))
+    .then(() => expectFileToMatch('dist/test-project/main-es2015.js', /registerLocaleData/))
+    .then(() => expectFileToMatch('dist/test-project/main-es2015.js', /angular_common_locales_fr/))
     .then(() => rimraf('dist'))
     .then(() => ng('build', '--aot', '--i18n-locale=fr_FR'))
-    .then(() => expectFileToMatch('dist/test-project/main.js', /registerLocaleData/))
-    .then(() => expectFileToMatch('dist/test-project/main.js', /angular_common_locales_fr/))
-    .then(() => rimraf('dist'))
+    .then(() => expectFileToMatch('dist/test-project/main-es2015.js', /registerLocaleData/))
+    .then(() => expectFileToMatch('dist/test-project/main-es2015.js', /angular_common_locales_fr/))
+    .then(() => expectFileToMatch('dist/test-project/main-es5.js', /registerLocaleData/))
+    .then(() => expectFileToMatch('dist/test-project/main-es5.js', /angular_common_locales_fr/))
+    .then(() => rimraf('dist'));
 }
diff --git a/tests/legacy-cli/e2e/tests/misc/lazy-module.ts b/tests/legacy-cli/e2e/tests/misc/lazy-module.ts
index 076f03fdc381..ee35bebba9b1 100644
--- a/tests/legacy-cli/e2e/tests/misc/lazy-module.ts
+++ b/tests/legacy-cli/e2e/tests/misc/lazy-module.ts
@@ -28,7 +28,7 @@ export default function() {
       }
       oldNumberOfFiles = currentNumberOfDistFiles;
 
-      if (!distFiles.includes('too-lazy-lazy-module.js')) {
+      if (!distFiles.includes('too-lazy-lazy-module-es5.js')) {
         throw new Error('The lazy module chunk did not use a unique name.');
       }
     })
@@ -47,7 +47,7 @@ export default function() {
       if (oldNumberOfFiles >= currentNumberOfDistFiles) {
         throw new Error('A bundle for the lazy file was not created.');
       }
-      if (!distFiles.includes('lazy-file.js')) {
+      if (!distFiles.includes('lazy-file-es5.js')) {
         throw new Error('The lazy file chunk did not have a name.');
       }
       oldNumberOfFiles = currentNumberOfDistFiles;
@@ -68,8 +68,8 @@ export default function() {
     .then(() => ng('build', '--no-named-chunks'))
     .then(() => readdirSync('dist/test-project'))
     .then((distFiles) => {
-      if (distFiles.includes('lazy-lazy-module.js')
-        || distFiles.includes('too-lazy-lazy-module.js')
+      if (distFiles.includes('lazy-lazy-module-es5.js')
+        || distFiles.includes('too-lazy-lazy-module-es5.js')
       ) {
         throw new Error('Lazy chunks shouldn\'t have a name but did.');
       }
diff --git a/tests/legacy-cli/e2e/tests/misc/support-ie.ts b/tests/legacy-cli/e2e/tests/misc/support-ie.ts
index 332f36e1daac..3ac56cfd4255 100644
--- a/tests/legacy-cli/e2e/tests/misc/support-ie.ts
+++ b/tests/legacy-cli/e2e/tests/misc/support-ie.ts
@@ -4,6 +4,11 @@ import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 
 export default async function () {
+  await updateJsonFile('tsconfig.json', configJson => {
+    const compilerOptions = configJson['compilerOptions'];
+    compilerOptions['target'] = 'es5';
+  });
+
   await updateJsonFile('angular.json', workspaceJson => {
       const appArchitect = workspaceJson.projects['test-project'].architect;
       appArchitect.build.options.es5BrowserSupport = false;
diff --git a/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts b/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts
index b84d65e340fb..92aab3fa6972 100644
--- a/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts
+++ b/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts
@@ -22,12 +22,15 @@ export default function() {
     .then(() => expectFileToMatch('dist/test-project/scripts.js', '* Bootstrap'))
     .then(() => expectFileToMatch('dist/test-project/styles.css', '* Bootstrap'))
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
-      <script src="runtime.js"></script>
-      <script src="polyfills.es5.js" nomodule></script>
-      <script src="polyfills.js"></script>
+      <script src="runtime-es2015.js" type="module"></script>
+      <script src="polyfills-es2015.js" type="module"></script>
+      <script src="runtime-es5.js" nomodule></script>
+      <script src="polyfills-es5.js" nomodule></script>
       <script src="scripts.js"></script>
-      <script src="vendor.js"></script>
-      <script src="main.js"></script>
+      <script src="vendor-es2015.js" type="module"></script>
+      <script src="main-es2015.js" type="module"></script>
+      <script src="vendor-es5.js" nomodule></script>
+      <script src="main-es5.js" nomodule></script>
     `))
     .then(() => ng(
       'build',
@@ -39,10 +42,12 @@ export default function() {
     .then(() => expectFileToMatch('dist/test-project/scripts.js', 'jQuery'))
     .then(() => expectFileToMatch('dist/test-project/styles.css', '* Bootstrap'))
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
-      <script src="runtime.js"></script>
-      <script src="polyfills.es5.js" nomodule></script>
-      <script src="polyfills.js"></script>
-      <script src="scripts.js"></script>
-      <script src="main.js"></script>
+    <script src="runtime-es2015.js" type="module"></script>
+    <script src="polyfills-es2015.js" type="module"></script>
+    <script src="runtime-es5.js" nomodule></script>
+    <script src="polyfills-es5.js" nomodule></script>
+    <script src="scripts.js"></script>
+    <script src="main-es2015.js" type="module"></script>
+    <script src="main-es5.js" nomodule></script>
     `));
 }

From 7cc0988d4c9b2bbd2c0f2be6ff0337148368f9aa Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 12 Apr 2019 08:42:41 +0200
Subject: [PATCH 1147/1703] fix(@angular-devkit/build-webpack): consider name
 when deduping emitted files

We need to consider the name when deduping files because a file such as `runtime.js` can be under multiples names because this file is a dependency of multiple entrypoints
---
 packages/angular_devkit/build_webpack/src/utils.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_webpack/src/utils.ts b/packages/angular_devkit/build_webpack/src/utils.ts
index 5c4887d884ae..384389964cf0 100644
--- a/packages/angular_devkit/build_webpack/src/utils.ts
+++ b/packages/angular_devkit/build_webpack/src/utils.ts
@@ -46,5 +46,6 @@ export function getEmittedFiles(compilation: webpack.compilation.Compilation): E
   }
 
   // dedupe
-  return files.filter(({ file }, index) => files.findIndex(f => f.file === file) === index);
+  return files.filter(({ file, name }, index) =>
+    files.findIndex(f => f.file === file && (!name || name === f.name)) === index);
 }

From 718ed3768496df06ded2512260ac619beb74f0f0 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 12 Apr 2019 08:43:20 +0200
Subject: [PATCH 1148/1703] feat(@schematics/angular): set workspace tsconfig
 target to es2015

---
 .../schematics/angular/workspace/files/tsconfig.json.template   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/workspace/files/tsconfig.json.template b/packages/schematics/angular/workspace/files/tsconfig.json.template
index 9fcb8f7b96a9..6ec9ceb17451 100644
--- a/packages/schematics/angular/workspace/files/tsconfig.json.template
+++ b/packages/schematics/angular/workspace/files/tsconfig.json.template
@@ -10,7 +10,7 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "importHelpers": true,
-    "target": "es5",
+    "target": "es2015",
     "typeRoots": [
       "node_modules/@types"
     ],

From c319cd054e4344737e274af41f46ef4d8a1c3aab Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Mon, 15 Apr 2019 07:45:57 +0200
Subject: [PATCH 1149/1703] test: update tests large to cater for the bundle
 changes with differential loading

---
 .../src/utils/differential-loading_spec.ts    |  8 +++----
 .../test/browser/allow-js_spec_large.ts       |  6 +++---
 .../differential_loading_spec_large.ts        | 21 ++++++-------------
 .../browser/resolve-json-module_spec_large.ts |  2 +-
 .../test/browser/styles_spec_large.ts         |  3 ++-
 .../test/browser/web-worker_spec_large.ts     |  2 +-
 .../build_angular/test/utils.ts               | 10 +++++----
 .../hello-world-app/browserslist              |  9 ++++----
 .../hello-world-app/tsconfig.json             |  2 +-
 9 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/utils/differential-loading_spec.ts b/packages/angular_devkit/build_angular/src/utils/differential-loading_spec.ts
index e36005a23ba5..1307fd9f67cd 100644
--- a/packages/angular_devkit/build_angular/src/utils/differential-loading_spec.ts
+++ b/packages/angular_devkit/build_angular/src/utils/differential-loading_spec.ts
@@ -8,7 +8,7 @@
 
 
 import { TestProjectHost } from '@angular-devkit/architect/testing';
-import { join } from '@angular-devkit/core';
+import { getSystemPath, join } from '@angular-devkit/core';
 import { ScriptTarget } from 'typescript';
 import { isDifferentialLoadingNeeded } from './differential-loading';
 
@@ -30,7 +30,7 @@ describe('differential loading', () => {
       'browserslist': 'IE 9-11',
     });
 
-    const needed = isDifferentialLoadingNeeded(host.root(), ScriptTarget.ES2015);
+    const needed = isDifferentialLoadingNeeded(getSystemPath(host.root()), ScriptTarget.ES2015);
     expect(needed).toBe(true);
   });
 
@@ -39,7 +39,7 @@ describe('differential loading', () => {
       'browserslist': 'last 1 chrome version',
     });
 
-    const needed = isDifferentialLoadingNeeded(host.root(), ScriptTarget.ES2015);
+    const needed = isDifferentialLoadingNeeded(getSystemPath(host.root()), ScriptTarget.ES2015);
 
     expect(needed).toBe(false);
   });
@@ -49,7 +49,7 @@ describe('differential loading', () => {
       'browserslist': 'last 1 chrome version',
     });
 
-    const needed = isDifferentialLoadingNeeded(host.root(), ScriptTarget.ES5);
+    const needed = isDifferentialLoadingNeeded(getSystemPath(host.root()), ScriptTarget.ES5);
 
     expect(needed).toBe(false);
   });
diff --git a/packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts
index b75b37f03861..2ab8a42ccd4f 100644
--- a/packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/allow-js_spec_large.ts
@@ -30,7 +30,7 @@ describe('Browser Builder allow js', () => {
 
     host.replaceInFile(
       'tsconfig.json',
-      '"target": "es5"',
+      '"target": "es2015"',
       '"target": "es5", "allowJs": true',
     );
 
@@ -55,7 +55,7 @@ describe('Browser Builder allow js', () => {
 
     host.replaceInFile(
       'tsconfig.json',
-      '"target": "es5"',
+      '"target": "es2015"',
       '"target": "es5", "allowJs": true',
     );
 
@@ -82,7 +82,7 @@ describe('Browser Builder allow js', () => {
 
     host.replaceInFile(
       'tsconfig.json',
-      '"target": "es5"',
+      '"target": "es2015"',
       '"target": "es5", "allowJs": true',
     );
 
diff --git a/packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts
index 11d190340193..c0eccfe819da 100644
--- a/packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts
@@ -10,25 +10,23 @@ import { Architect } from '@angular-devkit/architect/src/index';
 import { PathFragment } from '@angular-devkit/core';
 import { browserBuild, createArchitect, host } from '../utils';
 
-// This feature is currently hidden behind a flag
-xdescribe('Browser Builder with differential loading', () => {
+describe('Browser Builder with differential loading', () => {
   const target = { project: 'app', target: 'build' };
   let architect: Architect;
 
   beforeEach(async () => {
     await host.initialize().toPromise();
+    // to trigger differential loading we need an non ever green browser
+    host.writeMultipleFiles({
+      'browserslist': 'IE 10',
+    });
+
     architect = (await createArchitect(host.root())).architect;
   });
 
   afterEach(async () => host.restore().toPromise());
 
   it('emits all the neccessary files', async () => {
-    host.replaceInFile(
-      'tsconfig.json',
-      '"target": "es5"',
-      '"target": "es2015"',
-    );
-
     const { files } = await browserBuild(architect, host, target);
 
     const expectedOutputs = [
@@ -66,15 +64,8 @@ xdescribe('Browser Builder with differential loading', () => {
   });
 
   it('emits the right ES formats', async () => {
-    host.replaceInFile(
-      'tsconfig.json',
-      '"target": "es5"',
-      '"target": "es2015"',
-    );
-
     const { files } = await browserBuild(architect, host, target, { optimization: true });
     expect(await files['main-es5.js']).not.toContain('class');
     expect(await files['main-es2015.js']).toContain('class');
   });
-
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts
index c36dca520abd..d522120884e5 100644
--- a/packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts
@@ -30,7 +30,7 @@ describe('Browser Builder resolve json module', () => {
 
     host.replaceInFile(
       'tsconfig.json',
-      '"target": "es5"',
+      '"target": "es2015"',
       '"target": "es5", "resolveJsonModule": true',
     );
 
diff --git a/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
index 5a7727aec39b..242bcddcd32a 100644
--- a/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
@@ -291,6 +291,7 @@ describe('Browser Builder styles', () => {
         /* normal-comment */
         /*! important-comment */
         div { flex: 1 }`,
+      'browserslist': 'IE 10',
     });
 
     const overrides = { extractCss: true, optimization: false };
@@ -312,7 +313,7 @@ describe('Browser Builder styles', () => {
 
     const overrides = { extractCss: true, optimization: true };
     const { files } = await browserBuild(architect, host, target, overrides);
-    expect(await files['styles.css']).toContain('/*! important-comment */div{-ms-flex:1;flex:1}');
+    expect(await files['styles.css']).toContain('/*! important-comment */div{flex:1}');
   });
 
   // TODO: consider making this a unit test in the url processing plugins.
diff --git a/packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts
index 46f78820cf54..a7373d110fd0 100644
--- a/packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts
@@ -119,7 +119,7 @@ describe('Browser Builder Web Worker support', () => {
       host.scopedSync().read(join(outputPath, workerBundle)));
     expect(workerContent).toContain('hello from worker');
     expect(workerContent).toContain('bar');
-    expect(workerContent).toContain('"hello"===t&&postMessage');
+    expect(workerContent).toContain('"hello"===e&&postMessage');
 
     // Main bundle should reference hashed worker bundle.
     const mainBundle = host.fileMatchExists(outputPath, /main\.[0-9a-f]{20}\.js/) as string;
diff --git a/packages/angular_devkit/build_angular/test/utils.ts b/packages/angular_devkit/build_angular/test/utils.ts
index c77a607625c9..e8380095a790 100644
--- a/packages/angular_devkit/build_angular/test/utils.ts
+++ b/packages/angular_devkit/build_angular/test/utils.ts
@@ -17,6 +17,7 @@ import { TestProjectHost, TestingArchitectHost } from '@angular-devkit/architect
 import {
   Path,
   experimental,
+  getSystemPath,
   join,
   json,
   normalize,
@@ -42,15 +43,16 @@ export const tslintTargetSpec = { project: 'app', target: 'lint' };
 export const protractorTargetSpec = { project: 'app-e2e', target: 'e2e' };
 
 
-export async function createArchitect(workspaceRoot: string) {
+export async function createArchitect(workspaceRoot: Path) {
   const registry = new schema.CoreSchemaRegistry();
   registry.addPostTransform(schema.transforms.addUndefinedDefaults);
+  const workspaceSysPath = getSystemPath(workspaceRoot);
 
   const workspace = await experimental.workspace.Workspace.fromPath(host, host.root(), registry);
   const architectHost = new TestingArchitectHost(
-    workspaceRoot,
-    workspaceRoot,
-    new WorkspaceNodeModulesArchitectHost(workspace, workspaceRoot),
+    workspaceSysPath,
+    workspaceSysPath,
+    new WorkspaceNodeModulesArchitectHost(workspace, workspaceSysPath),
   );
   const architect = new Architect(architectHost, registry);
 
diff --git a/tests/angular_devkit/build_angular/hello-world-app/browserslist b/tests/angular_devkit/build_angular/hello-world-app/browserslist
index 1b1be9044162..7fd7c3b8783f 100644
--- a/tests/angular_devkit/build_angular/hello-world-app/browserslist
+++ b/tests/angular_devkit/build_angular/hello-world-app/browserslist
@@ -1,5 +1,4 @@
-> 0.5%
-last 2 versions
-Firefox ESR
-not dead
-IE 9-11
\ No newline at end of file
+# We want to run tests large with ever green browser so that 
+# we never trigger differential loading as this will slow down the tests.
+
+last 2 Chrome versions
\ No newline at end of file
diff --git a/tests/angular_devkit/build_angular/hello-world-app/tsconfig.json b/tests/angular_devkit/build_angular/hello-world-app/tsconfig.json
index cabc4606d16f..944d93dc8215 100644
--- a/tests/angular_devkit/build_angular/hello-world-app/tsconfig.json
+++ b/tests/angular_devkit/build_angular/hello-world-app/tsconfig.json
@@ -8,7 +8,7 @@
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "target": "es5",
+    "target": "es2015",
     "module": "esnext",
     "typeRoots": [
       "node_modules/@types"

From eac31541a1747f813ff0bc56e1d7b0b9cd9111a9 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 12 Apr 2019 13:31:48 +0200
Subject: [PATCH 1150/1703] test: add analytics to core golden files

---
 .../angular_devkit/core/src/_golden-api.d.ts  | 157 ++++++++++++++++++
 .../angular_devkit/core/src/_golden-api.ts    |   4 +
 2 files changed, 161 insertions(+)

diff --git a/etc/api/angular_devkit/core/src/_golden-api.d.ts b/etc/api/angular_devkit/core/src/_golden-api.d.ts
index b08f4a4ecb49..cf48eeaca661 100644
--- a/etc/api/angular_devkit/core/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/core/src/_golden-api.d.ts
@@ -19,6 +19,63 @@ export declare class AmbiguousProjectPathException extends BaseException {
     constructor(path: Path, projects: ReadonlyArray<string>);
 }
 
+export interface Analytics {
+    event(category: string, action: string, options?: EventOptions): void;
+    flush(): Promise<void>;
+    pageview(path: string, options?: PageviewOptions): void;
+    screenview(screenName: string, appName: string, options?: ScreenviewOptions): void;
+    timing(category: string, variable: string, time: string | number, options?: TimingOptions): void;
+}
+
+export declare type AnalyticsForwarderFn = (report: JsonObject & AnalyticsReport) => void;
+
+export declare type AnalyticsReport = AnalyticsReportEvent | AnalyticsReportScreenview | AnalyticsReportPageview | AnalyticsReportTiming;
+
+export interface AnalyticsReportBase extends JsonObject {
+    kind: AnalyticsReportKind;
+}
+
+export declare class AnalyticsReporter {
+    protected _analytics: Analytics;
+    constructor(_analytics: Analytics);
+    report(report: AnalyticsReport): void;
+}
+
+export interface AnalyticsReportEvent extends AnalyticsReportBase {
+    action: string;
+    category: string;
+    kind: AnalyticsReportKind.Event;
+    options: JsonObject & EventOptions;
+}
+
+export declare enum AnalyticsReportKind {
+    Event = "event",
+    Screenview = "screenview",
+    Pageview = "pageview",
+    Timing = "timing"
+}
+
+export interface AnalyticsReportPageview extends AnalyticsReportBase {
+    kind: AnalyticsReportKind.Pageview;
+    options: JsonObject & PageviewOptions;
+    path: string;
+}
+
+export interface AnalyticsReportScreenview extends AnalyticsReportBase {
+    appName: string;
+    kind: AnalyticsReportKind.Screenview;
+    options: JsonObject & ScreenviewOptions;
+    screenName: string;
+}
+
+export interface AnalyticsReportTiming extends AnalyticsReportBase {
+    category: string;
+    kind: AnalyticsReportKind.Timing;
+    options: JsonObject & TimingOptions;
+    time: string | number;
+    variable: string;
+}
+
 export declare function asPosixPath(path: Path): PosixPath;
 
 export declare function asWindowsPath(path: Path): WindowsPath;
@@ -173,6 +230,11 @@ export declare class CoreSchemaRegistry implements SchemaRegistry {
 
 export declare function createWorkspaceHost(host: virtualFs.Host): WorkspaceHost;
 
+export interface CustomDimensionsAndMetricsOptions {
+    dimensions?: (boolean | number | string)[];
+    metrics?: (boolean | number | string)[];
+}
+
 export declare const cyan: (x: string) => string;
 
 export declare function dasherize(str: string): string;
@@ -201,6 +263,11 @@ export declare class Empty implements ReadonlyHost {
     stat(path: Path): Observable<Stats<{}> | null>;
 }
 
+export interface EventOptions extends CustomDimensionsAndMetricsOptions {
+    label?: string;
+    value?: string;
+}
+
 export declare function extname(path: Path): string;
 
 export declare class FileAlreadyExistException extends BaseException {
@@ -226,6 +293,16 @@ export interface FormatValidatorError extends SchemaValidatorErrorBase {
     };
 }
 
+export declare class ForwardingAnalytics implements Analytics {
+    protected _fn: AnalyticsForwarderFn;
+    constructor(_fn: AnalyticsForwarderFn);
+    event(category: string, action: string, options?: EventOptions): void;
+    flush(): Promise<void>;
+    pageview(path: string, options?: PageviewOptions): void;
+    screenview(screenName: string, appName: string, options?: ScreenviewOptions): void;
+    timing(category: string, variable: string, time: string | number, options?: TimingOptions): void;
+}
+
 export declare function fragment(path: string): PathFragment;
 
 export declare function getSystemPath(path: Path): string;
@@ -499,6 +576,16 @@ export interface LoggerMetadata extends JsonObject {
     path: string[];
 }
 
+export declare class LoggingAnalytics implements Analytics {
+    protected _logger: Logger;
+    constructor(_logger: Logger);
+    event(category: string, action: string, options?: EventOptions): void;
+    flush(): Promise<void>;
+    pageview(path: string, options?: PageviewOptions): void;
+    screenview(screenName: string, appName: string, options?: ScreenviewOptions): void;
+    timing(category: string, variable: string, time: string | number, options?: TimingOptions): void;
+}
+
 export declare type LogLevel = 'debug' | 'info' | 'warn' | 'error' | 'fatal';
 
 export declare const magenta: (x: string) => string;
@@ -513,8 +600,63 @@ export declare class MergeConflictException extends BaseException {
     constructor(path: string);
 }
 
+export declare class MultiAnalytics implements Analytics {
+    protected _backends: Analytics[];
+    constructor(_backends?: Analytics[]);
+    event(category: string, action: string, options?: EventOptions): void;
+    flush(): Promise<void>;
+    pageview(path: string, options?: PageviewOptions): void;
+    push(...backend: Analytics[]): void;
+    screenview(screenName: string, appName: string, options?: ScreenviewOptions): void;
+    timing(category: string, variable: string, time: string | number, options?: TimingOptions): void;
+}
+
+export declare enum NgCliAnalyticsDimensions {
+    CpuCount = 1,
+    CpuSpeed = 2,
+    RamInMegabytes = 3,
+    NodeVersion = 4,
+    NgAddCollection = 6,
+    NgBuildBuildEventLog = 7,
+    BuildErrors = 20
+}
+
+export declare const NgCliAnalyticsDimensionsFlagInfo: {
+    [name: string]: [string, string];
+};
+
+export declare enum NgCliAnalyticsMetrics {
+    UNUSED_1 = 1,
+    UNUSED_2 = 2,
+    UNUSED_3 = 3,
+    UNUSED_4 = 4,
+    BuildTime = 5,
+    NgOnInitCount = 6,
+    InitialChunkSize = 7,
+    TotalChunkCount = 8,
+    TotalChunkSize = 9,
+    LazyChunkCount = 10,
+    LazyChunkSize = 11,
+    AssetCount = 12,
+    AssetSize = 13,
+    PolyfillSize = 14,
+    CssSize = 15
+}
+
+export declare const NgCliAnalyticsMetricsFlagInfo: {
+    [name: string]: [string, string];
+};
+
 export declare function noCacheNormalize(path: string): Path;
 
+export declare class NoopAnalytics implements Analytics {
+    event(): void;
+    flush(): Promise<void>;
+    pageview(): void;
+    screenview(): void;
+    timing(): void;
+}
+
 export declare function normalize(path: string): Path;
 
 export declare const NormalizedRoot: Path;
@@ -528,6 +670,11 @@ export declare class NullLogger extends Logger {
 
 export declare function oneLine(strings: TemplateStringsArray, ...values: any[]): string;
 
+export interface PageviewOptions extends CustomDimensionsAndMetricsOptions {
+    hostname?: string;
+    title?: string;
+}
+
 export declare function parseJson(input: string, mode?: JsonParseMode, options?: ParseJsonOptions): JsonValue;
 
 export declare function parseJsonAst(input: string, mode?: JsonParseMode): JsonAstNode;
@@ -795,6 +942,12 @@ export declare class ScopedHost<T extends object> extends ResolverHost<T> {
     protected _resolve(path: Path): Path;
 }
 
+export interface ScreenviewOptions extends CustomDimensionsAndMetricsOptions {
+    appId?: string;
+    appInstallerId?: string;
+    appVersion?: string;
+}
+
 export declare class SimpleMemoryHost implements Host<{}> {
     protected _cache: Map<Path, Stats<SimpleMemoryHostStats>>;
     readonly capabilities: HostCapabilities;
@@ -1004,6 +1157,10 @@ export declare namespace test {
     }
 }
 
+export interface TimingOptions extends CustomDimensionsAndMetricsOptions {
+    label?: string;
+}
+
 export declare class TransformLogger extends Logger {
     constructor(name: string, transform: (stream: Observable<LogEntry>) => Observable<LogEntry>, parent?: Logger | null);
 }
diff --git a/packages/angular_devkit/core/src/_golden-api.ts b/packages/angular_devkit/core/src/_golden-api.ts
index b897087999c3..3956a152e0e6 100644
--- a/packages/angular_devkit/core/src/_golden-api.ts
+++ b/packages/angular_devkit/core/src/_golden-api.ts
@@ -55,3 +55,7 @@ export * from './virtual-fs/host/index';
 // Start workspace namespace
 export * from './workspace/index';
 // End workspace namespace
+
+// Start analytics namespace
+export * from './analytics/index';
+// End analytics namespace

From 260dacfb41fde541f90a52e1c3bc171ba5c106e9 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 12 Apr 2019 13:35:00 +0200
Subject: [PATCH 1151/1703] test: add new architect api to golden files

---
 etc/api/BUILD                                 |  2 +
 .../architect/src/_golden-api.d.ts            | 13 ---
 .../angular_devkit/architect/src/index.d.ts   | 89 +++++++++++++++++++
 .../architect/src/_golden-api.d.ts            |  9 --
 4 files changed, 91 insertions(+), 22 deletions(-)
 delete mode 100644 etc/api/angular_devkit/architect/src/_golden-api.d.ts
 create mode 100644 etc/api/angular_devkit/architect/src/index.d.ts
 delete mode 100644 packages/angular_devkit/architect/src/_golden-api.d.ts

diff --git a/etc/api/BUILD b/etc/api/BUILD
index fb66f90a6ad0..3e8f83d9bea7 100644
--- a/etc/api/BUILD
+++ b/etc/api/BUILD
@@ -30,6 +30,8 @@ load("@angular//tools/ts-api-guardian:index.bzl", "ts_api_guardian_test")
     # We don't want to analyse these exports nor add them to the golden files
     # in most cases it's because Ts API Guardian doesn't support Symbol Aliases.
     strip_export_pattern = [
+        # @angular-devkit/architect
+        "^BuilderProgressState$",
         # @angular-devkit/schematics
         "^workflow$",
         "^formats$",
diff --git a/etc/api/angular_devkit/architect/src/_golden-api.d.ts b/etc/api/angular_devkit/architect/src/_golden-api.d.ts
deleted file mode 100644
index 5b09b410681f..000000000000
--- a/etc/api/angular_devkit/architect/src/_golden-api.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export declare class Architect {
-    constructor(_host: ArchitectHost, _registry?: json.schema.SchemaRegistry, additionalJobRegistry?: experimental.jobs.Registry);
-    has(name: experimental.jobs.JobName): Observable<boolean>;
-    scheduleBuilder(name: string, options: json.JsonObject, scheduleOptions?: ScheduleOptions): Promise<BuilderRun>;
-    scheduleTarget(target: Target, overrides?: json.JsonObject, scheduleOptions?: ScheduleOptions): Promise<BuilderRun>;
-}
-
-export declare function createBuilder<OptT extends json.JsonObject, OutT extends BuilderOutput = BuilderOutput>(fn: BuilderHandlerFn<OptT>): Builder<OptT>;
-
-export interface ScheduleOptions {
-    analytics?: analytics.Analytics;
-    logger?: logging.Logger;
-}
diff --git a/etc/api/angular_devkit/architect/src/index.d.ts b/etc/api/angular_devkit/architect/src/index.d.ts
new file mode 100644
index 000000000000..db5ff0a7f9b0
--- /dev/null
+++ b/etc/api/angular_devkit/architect/src/index.d.ts
@@ -0,0 +1,89 @@
+export declare class Architect {
+    constructor(_host: ArchitectHost, _registry?: json.schema.SchemaRegistry, additionalJobRegistry?: experimental.jobs.Registry);
+    has(name: experimental.jobs.JobName): Observable<boolean>;
+    scheduleBuilder(name: string, options: json.JsonObject, scheduleOptions?: ScheduleOptions): Promise<BuilderRun>;
+    scheduleTarget(target: Target, overrides?: json.JsonObject, scheduleOptions?: ScheduleOptions): Promise<BuilderRun>;
+}
+
+export interface BuilderContext {
+    readonly analytics: analytics.Analytics;
+    builder: BuilderInfo;
+    currentDirectory: string;
+    id: number;
+    logger: logging.LoggerApi;
+    target?: Target;
+    workspaceRoot: string;
+    addTeardown(teardown: () => (Promise<void> | void)): void;
+    getBuilderNameForTarget(target: Target): Promise<string>;
+    getTargetOptions(target: Target): Promise<json.JsonObject>;
+    reportProgress(current: number, total?: number, status?: string): void;
+    reportRunning(): void;
+    reportStatus(status: string): void;
+    scheduleBuilder(builderName: string, options?: json.JsonObject, scheduleOptions?: ScheduleOptions): Promise<BuilderRun>;
+    scheduleTarget(target: Target, overrides?: json.JsonObject, scheduleOptions?: ScheduleOptions): Promise<BuilderRun>;
+    validateOptions<T extends json.JsonObject = json.JsonObject>(options: json.JsonObject, builderName: string): Promise<T>;
+}
+
+export interface BuilderHandlerFn<A extends json.JsonObject> {
+    (input: A, context: BuilderContext): BuilderOutputLike;
+}
+
+export declare type BuilderInfo = json.JsonObject & {
+    builderName: string;
+    description: string;
+    optionSchema: json.schema.JsonSchema;
+};
+
+export declare type BuilderInput = json.JsonObject & RealBuilderInput;
+
+export declare type BuilderOutput = json.JsonObject & RealBuilderOutput;
+
+export declare type BuilderOutputLike = Observable<BuilderOutput> | Promise<BuilderOutput> | BuilderOutput;
+
+export declare type BuilderProgress = json.JsonObject & RealBuilderProgress & TypedBuilderProgress;
+
+export declare type BuilderProgressReport = BuilderProgress & ({
+    target?: Target;
+    builder: BuilderInfo;
+});
+
+export declare type BuilderRegistry = experimental.jobs.Registry<json.JsonObject, BuilderInput, BuilderOutput>;
+
+export interface BuilderRun {
+    id: number;
+    info: BuilderInfo;
+    output: Observable<BuilderOutput>;
+    progress: Observable<BuilderProgressReport>;
+    result: Promise<BuilderOutput>;
+    stop(): Promise<void>;
+}
+
+export declare function createBuilder<OptT extends json.JsonObject, OutT extends BuilderOutput = BuilderOutput>(fn: BuilderHandlerFn<OptT>): Builder<OptT>;
+
+export interface ScheduleOptions {
+    analytics?: analytics.Analytics;
+    logger?: logging.Logger;
+}
+
+export declare function scheduleTargetAndForget(context: BuilderContext, target: Target, overrides?: json.JsonObject, scheduleOptions?: ScheduleOptions): Observable<BuilderOutput>;
+
+export declare type Target = json.JsonObject & RealTarget;
+
+export declare function targetFromTargetString(str: string): Target;
+
+export declare function targetStringFromTarget({ project, target, configuration }: Target): string;
+
+export declare type TypedBuilderProgress = ({
+    state: BuilderProgressState.Stopped;
+} | {
+    state: BuilderProgressState.Error;
+    error: json.JsonValue;
+} | {
+    state: BuilderProgressState.Waiting;
+    status?: string;
+} | {
+    state: BuilderProgressState.Running;
+    status?: string;
+    current: number;
+    total?: number;
+});
diff --git a/packages/angular_devkit/architect/src/_golden-api.d.ts b/packages/angular_devkit/architect/src/_golden-api.d.ts
deleted file mode 100644
index 759ed2486662..000000000000
--- a/packages/angular_devkit/architect/src/_golden-api.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-export { Architect, ScheduleOptions } from './architect';
-export { createBuilder } from './create-builder';

From da628bdda72cbd44db83a26354b5cfb6710697f4 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 12 Apr 2019 13:35:15 +0200
Subject: [PATCH 1152/1703] style: remove extra breakline from build file

---
 packages/angular_devkit/architect/BUILD | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/angular_devkit/architect/BUILD b/packages/angular_devkit/architect/BUILD
index 2bb8ff8234bf..138ebff8da75 100644
--- a/packages/angular_devkit/architect/BUILD
+++ b/packages/angular_devkit/architect/BUILD
@@ -70,7 +70,6 @@ ts_library(
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
         "@npm//rxjs",
-        
         "@npm//@types/node",
         ":builder_input_schema",
         ":builder_output_schema",

From 58fb59378764af313614cad2275297107f3308c3 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 15 Apr 2019 16:47:26 +0200
Subject: [PATCH 1153/1703] feat(@schematics/angular): update several workspace
 dependencies

With this change we update ng-packagr, jasmine-core and tslint.
---
 packages/schematics/angular/library/index.ts                  | 2 +-
 packages/schematics/angular/library/index_spec.ts             | 2 +-
 .../schematics/angular/workspace/files/package.json.template  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index 4a7d08761b0f..2f3c92818796 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -100,7 +100,7 @@ function addDependenciesToPackageJson() {
       {
         type: NodeDependencyType.Dev,
         name: 'ng-packagr',
-        version: '^5.0.0',
+        version: '^5.1.0',
       },
       {
         type: NodeDependencyType.Default,
diff --git a/packages/schematics/angular/library/index_spec.ts b/packages/schematics/angular/library/index_spec.ts
index 49ad3d5ecd1e..04b52654f6e2 100644
--- a/packages/schematics/angular/library/index_spec.ts
+++ b/packages/schematics/angular/library/index_spec.ts
@@ -163,7 +163,7 @@ describe('Library Schematic', () => {
       const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
 
       const packageJson = getJsonFileContent(tree, 'package.json');
-      expect(packageJson.devDependencies['ng-packagr']).toEqual('^5.0.0');
+      expect(packageJson.devDependencies['ng-packagr']).toEqual('^5.1.0');
       expect(packageJson.devDependencies['@angular-devkit/build-ng-packagr'])
         .toEqual(latestVersions.DevkitBuildNgPackagr);
     });
diff --git a/packages/schematics/angular/workspace/files/package.json.template b/packages/schematics/angular/workspace/files/package.json.template
index 35afff10fc40..d86ff787f29b 100644
--- a/packages/schematics/angular/workspace/files/package.json.template
+++ b/packages/schematics/angular/workspace/files/package.json.template
@@ -31,7 +31,7 @@
     "@types/jasmine": "~3.3.8",
     "@types/jasminewd2": "~2.0.3",
     "codelyzer": "^5.0.0",
-    "jasmine-core": "~3.3.0",
+    "jasmine-core": "~3.4.0",
     "jasmine-spec-reporter": "~4.2.1",
     "karma": "~4.0.1",
     "karma-chrome-launcher": "~2.2.0",
@@ -40,7 +40,7 @@
     "karma-jasmine-html-reporter": "^1.4.0",
     "protractor": "~5.4.0",<% } %>
     "ts-node": "~7.0.0",
-    "tslint": "~5.13.1",
+    "tslint": "~5.15.0",
     "typescript": "<%= latestVersions.TypeScript %>"
   }
 }

From 5b6502b64536158534f2770d26599f9babb3c79b Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 15 Apr 2019 16:48:46 +0200
Subject: [PATCH 1154/1703] build: update ng-packagr and tslint

---
 package.json                                  |  2 +-
 .../build_ng_packagr/package.json             |  2 +-
 yarn.lock                                     | 32 ++++++++++++-------
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index c1ee8c0c2f43..b9c74ac46a25 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "puppeteer": "1.12.2",
     "quicktype-core": "^6.0.15",
     "temp": "^0.9.0",
-    "tslint": "^5.13.1",
+    "tslint": "^5.15.0",
     "typescript": "3.4.3"
   },
   "devDependencies": {
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index bd60996c0b33..686e581c164a 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -17,7 +17,7 @@
     "@angular/compiler": "^8.0.0-beta.12",
     "@angular/compiler-cli": "^8.0.0-beta.12",
     "@angular-devkit/core": "0.0.0",
-    "ng-packagr": "^5.0.1",
+    "ng-packagr": "^5.1.0",
     "tslib": "^1.9.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index ac041cb24457..1c692123e003 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5238,7 +5238,7 @@ js-tokens@^3.0.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
   integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
-js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
+js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.9.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
   integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==
@@ -5246,6 +5246,14 @@ js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^3.13.0:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -6330,10 +6338,10 @@ neo-async@^2.5.0:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
   integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
 
-ng-packagr@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-5.0.1.tgz#c78a46727fe98ab434fcd0bcc8f49adf585feb44"
-  integrity sha512-DSX8O4VPiRltQxGMZ91eHaT/qxXzpJ6JaqaRi174Wcj+u2agZ8fZeImLRHYc4AGUf8/c3ejARFd3gcOKFna9LA==
+ng-packagr@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-5.1.0.tgz#4262775f29f7da72b3e5492c480a6857065d712e"
+  integrity sha512-sBQrn3jy0S2T8nN1gnptO3Dd55X6oNPSFlCckfHPp7G3T3eNUfo3o9dqeZc58PFiY1WOAi4z43LI7kFFeSrTTA==
   dependencies:
     "@ngtools/json-schema" "^1.1.0"
     autoprefixer "^9.0.0"
@@ -9466,10 +9474,10 @@ tslint-sonarts@1.9.0:
   dependencies:
     immutable "^3.8.2"
 
-tslint@^5.13.1:
-  version "5.13.1"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.13.1.tgz#fbc0541c425647a33cd9108ce4fd4cd18d7904ed"
-  integrity sha512-fplQqb2miLbcPhyHoMV4FU9PtNRbgmm/zI5d3SZwwmJQM6V0eodju+hplpyfhLWpmwrDNfNYU57uYRb8s0zZoQ==
+tslint@^5.15.0:
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.15.0.tgz#6ffb180986d63afa1e531feb2a134dbf961e27d3"
+  integrity sha512-6bIEujKR21/3nyeoX2uBnE8s+tMXCQXhqMmaIPJpHmXJoBJPTLcI7/VHRtUwMhnLVdwLqqY3zmd8Dxqa5CVdJA==
   dependencies:
     babel-code-frame "^6.22.0"
     builtin-modules "^1.1.1"
@@ -9477,13 +9485,13 @@ tslint@^5.13.1:
     commander "^2.12.1"
     diff "^3.2.0"
     glob "^7.1.1"
-    js-yaml "^3.7.0"
+    js-yaml "^3.13.0"
     minimatch "^3.0.4"
     mkdirp "^0.5.1"
     resolve "^1.3.2"
     semver "^5.3.0"
     tslib "^1.8.0"
-    tsutils "^2.27.2"
+    tsutils "^2.29.0"
 
 tsutils@2.27.2:
   version "2.27.2"
@@ -9492,7 +9500,7 @@ tsutils@2.27.2:
   dependencies:
     tslib "^1.8.1"
 
-tsutils@^2.27.2:
+tsutils@^2.29.0:
   version "2.29.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
   integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==

From 359d4f97ccb6e9e31749f789bc4b59c31ca6fab3 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 15 Apr 2019 19:56:45 +0200
Subject: [PATCH 1155/1703] feat(@schematics/angular): migrate existing ES5
 projects to support differential loading

With this change, differential loading will be enabled as we add an non ever green browser and change the tsconfig script target to es2015.
---
 .../update-8/differential-loading.ts          | 113 ++++++++++++++++++
 .../update-8/differential-loading_spec.ts     |  78 ++++++++++++
 .../angular/migrations/update-8/index.ts      |   2 +
 3 files changed, 193 insertions(+)
 create mode 100644 packages/schematics/angular/migrations/update-8/differential-loading.ts
 create mode 100644 packages/schematics/angular/migrations/update-8/differential-loading_spec.ts

diff --git a/packages/schematics/angular/migrations/update-8/differential-loading.ts b/packages/schematics/angular/migrations/update-8/differential-loading.ts
new file mode 100644
index 000000000000..dcc7084a058d
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-8/differential-loading.ts
@@ -0,0 +1,113 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import {
+  JsonParseMode,
+  isJsonObject,
+  join,
+  normalize,
+  parseJson,
+  parseJsonAst,
+} from '@angular-devkit/core';
+import { Rule, Tree } from '@angular-devkit/schematics';
+import {
+  findPropertyInAstObject,
+  insertPropertyInAstObjectInOrder,
+} from '../../utility/json-utils';
+
+// tslint:disable-next-line:max-line-length
+const browserslistContent = `# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+
+# Googlebot uses an older version of Chrome
+# For additional information see: https://developers.google.com/search/docs/guides/rendering
+
+> 0.5%
+last 2 versions
+Firefox ESR
+not dead
+not IE 9-11 # For IE 9-11 support, remove 'not'.
+not Chrome 41 # For Googlebot support, remove 'not'.`;
+
+export function updateES5Projects(): Rule {
+  return (host: Tree) => {
+    const tsConfigPath = '/tsconfig.json';
+    const buffer = host.read(tsConfigPath);
+    if (!buffer) {
+      return host;
+    }
+
+    const tsCfgAst = parseJsonAst(buffer.toString(), JsonParseMode.Loose);
+
+    if (tsCfgAst.kind !== 'object') {
+      return host;
+    }
+
+    const compilerOptions = findPropertyInAstObject(tsCfgAst, 'compilerOptions');
+    if (!compilerOptions || compilerOptions.kind !== 'object') {
+      return host;
+    }
+
+    const scriptTarget = findPropertyInAstObject(compilerOptions, 'target');
+    if (scriptTarget && scriptTarget.value === 'es2015') {
+      return host;
+    }
+
+    const recorder = host.beginUpdate(tsConfigPath);
+    if (scriptTarget) {
+      const { start, end } = scriptTarget;
+      recorder.remove(start.offset, end.offset - start.offset);
+      recorder.insertLeft(start.offset, '"es2015"');
+    } else {
+      insertPropertyInAstObjectInOrder(recorder, compilerOptions, 'target', 'es2015', 4);
+    }
+    host.commitUpdate(recorder);
+
+    return updateBrowserlist;
+  };
+}
+
+function updateBrowserlist(): Rule {
+  return (tree) => {
+    const angularConfigContent = tree.read('angular.json') || tree.read('.angular.json');
+
+    if (!angularConfigContent) {
+      return;
+    }
+
+    const angularJson = parseJson(angularConfigContent.toString(), JsonParseMode.Loose);
+
+    if (!isJsonObject(angularJson) || !isJsonObject(angularJson.projects)) {
+      // If that field isn't there, no use...
+      return;
+    }
+
+    // For all projects
+    for (const projectName of Object.keys(angularJson.projects)) {
+      const project = angularJson.projects[projectName];
+      if (!isJsonObject(project)) {
+        continue;
+      }
+      if (typeof project.root != 'string' || project.projectType !== 'application') {
+        continue;
+      }
+
+      const browserslistPath = join(normalize(project.root), '/browserslist');
+      const source = tree.read(browserslistPath);
+      if (!source) {
+        tree.create(browserslistPath, browserslistContent);
+      } else {
+        const recorder = tree.beginUpdate(browserslistPath);
+        recorder.insertRight(source.length, '\nChrome 41 # Googlebot');
+        tree.commitUpdate(recorder);
+      }
+    }
+
+    return tree;
+  };
+}
diff --git a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
new file mode 100644
index 000000000000..d326e30752b3
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
@@ -0,0 +1,78 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { EmptyTree } from '@angular-devkit/schematics';
+import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+
+
+describe('Migration to version 8', () => {
+  describe('Migrate ES5 projects to enable differential loading', () => {
+    const tsConfigPath = '/tsconfig.json';
+    const oldTsConfig = {
+      compilerOptions: {
+        module: 'es2015',
+        moduleResolution: 'node',
+        typeRoots: [
+          'node_modules/@types',
+        ],
+      },
+    };
+
+    const schematicRunner = new SchematicTestRunner(
+      'migrations',
+      require.resolve('../migration-collection.json'),
+    );
+
+    let tree: UnitTestTree;
+
+    beforeEach(async () => {
+      tree = new UnitTestTree(new EmptyTree());
+      tree = await schematicRunner.runExternalSchematicAsync(
+        require.resolve('../../collection.json'), 'ng-new',
+        {
+          name: 'migration-test',
+          version: '1.2.3',
+          directory: '.',
+        },
+        tree,
+      ).toPromise();
+      tree.overwrite(tsConfigPath, JSON.stringify(oldTsConfig, null, 2));
+    });
+
+    it(`should update 'target' to es2015 when property exists`, () => {
+      const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
+      const { target } = JSON.parse(tree2.readContent(tsConfigPath)).compilerOptions;
+      expect(target).toBe('es2015');
+    });
+
+    it(`should create 'target' property when doesn't exists`, () => {
+      const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
+      const compilerOptions = {
+        ...oldTsConfig.compilerOptions,
+        target: undefined,
+      };
+
+      tree.overwrite(tsConfigPath, JSON.stringify({ compilerOptions }, null, 2));
+      const { target } = JSON.parse(tree2.readContent(tsConfigPath)).compilerOptions;
+      expect(target).toBe('es2015');
+    });
+
+    it(`should update browserslist file to add an non evergreen browser`, () => {
+      const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
+      expect(tree2.readContent('/browserslist')).toContain('Chrome 41');
+    });
+
+    it(`should create browserslist file if it doesn't exist`, () => {
+      tree.delete('/browserslist');
+      const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
+      expect(tree2.exists('/browserslist')).toBe(true);
+      expect(tree2.readContent('/browserslist'))
+        .toContain('Googlebot support');
+    });
+  });
+});
diff --git a/packages/schematics/angular/migrations/update-8/index.ts b/packages/schematics/angular/migrations/update-8/index.ts
index ea3eed359dca..9a5c0cca49d8 100644
--- a/packages/schematics/angular/migrations/update-8/index.ts
+++ b/packages/schematics/angular/migrations/update-8/index.ts
@@ -11,6 +11,7 @@ import {
   chain,
 } from '@angular-devkit/schematics';
 import { updatePackageJson, updateTsLintConfig } from './codelyzer-5';
+import { updateES5Projects } from './differential-loading';
 import { dropES2015Polyfills } from './drop-es6-polyfills';
 
 export default function(): Rule {
@@ -19,6 +20,7 @@ export default function(): Rule {
       updateTsLintConfig(),
       updatePackageJson(),
       dropES2015Polyfills(),
+      updateES5Projects(),
     ]);
   };
 }

From 413a35bd567d9eb64c6a325888a71b09575f72e6 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 15 Apr 2019 19:55:12 +0200
Subject: [PATCH 1156/1703] feat(@schematics/angular): add more information and
 browsers in browserlist

---
 .../angular/application/files/browserslist.template    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/angular/application/files/browserslist.template b/packages/schematics/angular/application/files/browserslist.template
index 37371cb04b9f..d6ac0551f9ef 100644
--- a/packages/schematics/angular/application/files/browserslist.template
+++ b/packages/schematics/angular/application/files/browserslist.template
@@ -1,11 +1,13 @@
-# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers
+# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
 # For additional information regarding the format and rule options, please see:
 # https://github.com/browserslist/browserslist#queries
-#
-# For IE 9-11 support, please remove 'not' from the last line of the file and adjust as needed
+
+# Googlebot uses an older version of Chrome
+# For additional information see: https://developers.google.com/search/docs/guides/rendering
 
 > 0.5%
 last 2 versions
 Firefox ESR
 not dead
-not IE 9-11
\ No newline at end of file
+not IE 9-11 # For IE 9-11 support, remove 'not'.
+not Chrome 41 # For Googlebot support, remove 'not'.
\ No newline at end of file

From 54e6924f742dfc46f1413c3cbdfeb1440c1ad8d9 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 2 Apr 2019 16:45:10 +0100
Subject: [PATCH 1157/1703] fix(@schematics/update): guard against null value
 for semver check

---
 packages/schematics/update/BUILD           | 1 +
 packages/schematics/update/update/index.ts | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/update/BUILD b/packages/schematics/update/BUILD
index 32deb0ba84cf..146f202f90eb 100644
--- a/packages/schematics/update/BUILD
+++ b/packages/schematics/update/BUILD
@@ -28,6 +28,7 @@ ts_library(
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:tasks",
         "@npm//rxjs",
+        "@npm//semver",
         
         "@npm//@types/node",
         "@npm//@types/semver",
diff --git a/packages/schematics/update/update/index.ts b/packages/schematics/update/update/index.ts
index 48bc641fcf8a..7ac57a6e7fcc 100644
--- a/packages/schematics/update/update/index.ts
+++ b/packages/schematics/update/update/index.ts
@@ -528,7 +528,7 @@ function _buildPackageInfo(
 
   // Find out the currently installed version. Either from the package.json or the node_modules/
   // TODO: figure out a way to read package-lock.json and/or yarn.lock.
-  let installedVersion: string | undefined;
+  let installedVersion: string | undefined | null;
   const packageContent = tree.read(`/node_modules/${name}/package.json`);
   if (packageContent) {
     const content = JSON.parse(packageContent.toString()) as JsonSchemaForNpmPackageJsonFiles;
@@ -542,6 +542,12 @@ function _buildPackageInfo(
     );
   }
 
+  if (!installedVersion) {
+    throw new SchematicsException(
+      `An unexpected error happened; could not determine version for package ${name}.`,
+    );
+  }
+
   const installedPackageJson = npmPackageJson.versions[installedVersion] || packageContent;
   if (!installedPackageJson) {
     throw new SchematicsException(

From bab9eb6b064e5e85659a558d47f43d1e56e42a4f Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 4 Apr 2019 09:37:53 +0100
Subject: [PATCH 1158/1703] test: use next Angular on prerelease ng update

---
 .../legacy-cli/e2e/tests/basic/update-1.0.ts  | 37 +++++++++++--------
 .../e2e/tests/basic/update-1.7-longhand.ts    | 21 ++++++-----
 .../legacy-cli/e2e/tests/basic/update-1.7.ts  | 35 ++++++++++--------
 tests/legacy-cli/e2e/utils/project.ts         | 30 ++++++++++++---
 4 files changed, 77 insertions(+), 46 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/basic/update-1.0.ts b/tests/legacy-cli/e2e/tests/basic/update-1.0.ts
index 1dcfd03dcaab..e5a670c427b4 100644
--- a/tests/legacy-cli/e2e/tests/basic/update-1.0.ts
+++ b/tests/legacy-cli/e2e/tests/basic/update-1.0.ts
@@ -1,22 +1,27 @@
 import { createProjectFromAsset } from '../../utils/assets';
 import { ng, silentNpm } from '../../utils/process';
-import { useBuiltPackages, useCIChrome, useCIDefaults } from '../../utils/project';
+import {
+  isPrereleaseCli, removeHttpDep, useBuiltPackages, useCIChrome, useCIDefaults,
+} from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
 
 
-export default function () {
-  return Promise.resolve()
-    .then(() => createProjectFromAsset('1.0-project'))
-    .then(() => useCIChrome('.'))
-    .then(() => expectToFail(() => ng('build')))
-    .then(() => ng('update', '@angular/cli'))
-    .then(() => useBuiltPackages())
-    .then(() => silentNpm('install'))
-    .then(() => useCIDefaults('one-oh-project'))
-    .then(() => ng('generate', 'component', 'my-comp'))
-    .then(() => ng('test', '--watch=false'))
-    .then(() => ng('lint'))
-    .then(() => ng('build'))
-    .then(() => ng('build', '--prod'))
-    .then(() => ng('e2e'));
+export default async function () {
+  const extraUpdateArgs = await isPrereleaseCli() ? ['--next'] : [];
+
+  await createProjectFromAsset('1.0-project');
+  await useCIChrome('.');
+  await expectToFail(() => ng('build'));
+  await ng('update', '@angular/cli');
+  await useBuiltPackages();
+  await silentNpm('install');
+  await removeHttpDep();
+  await ng('update', '@angular/core', ...extraUpdateArgs);
+  await useCIDefaults('one-oh-project');
+  await ng('generate', 'component', 'my-comp');
+  await ng('test', '--watch=false');
+  await ng('lint');
+  await ng('build');
+  await ng('build', '--prod');
+  await ng('e2e');
 }
diff --git a/tests/legacy-cli/e2e/tests/basic/update-1.7-longhand.ts b/tests/legacy-cli/e2e/tests/basic/update-1.7-longhand.ts
index 50317dcd31ed..397d126c6b38 100644
--- a/tests/legacy-cli/e2e/tests/basic/update-1.7-longhand.ts
+++ b/tests/legacy-cli/e2e/tests/basic/update-1.7-longhand.ts
@@ -1,15 +1,18 @@
 import { createProjectFromAsset } from '../../utils/assets';
 import { ng, silentNpm } from '../../utils/process';
-import { useBuiltPackages } from '../../utils/project';
+import { isPrereleaseCli, removeHttpDep, useBuiltPackages } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
 
 
-export default function () {
-  return Promise.resolve()
-    .then(() => createProjectFromAsset('1.7-project'))
-    .then(() => expectToFail(() => ng('build')))
-    .then(() => ng('update', '@angular/cli', '--migrate-only', '--from=1.7.1'))
-    .then(() => useBuiltPackages())
-    .then(() => silentNpm('install'))
-    .then(() => ng('build'));
+export default async function () {
+  const extraUpdateArgs = await isPrereleaseCli() ? ['--next'] : [];
+
+  await createProjectFromAsset('1.7-project');
+  await expectToFail(() => ng('build'));
+  await ng('update', '@angular/cli', '--migrate-only', '--from=1.7.1');
+  await useBuiltPackages();
+  await silentNpm('install');
+  await removeHttpDep();
+  await ng('update', '@angular/core', ...extraUpdateArgs);
+  await ng('build');
 }
diff --git a/tests/legacy-cli/e2e/tests/basic/update-1.7.ts b/tests/legacy-cli/e2e/tests/basic/update-1.7.ts
index 016cf4aeba39..977e2badf074 100644
--- a/tests/legacy-cli/e2e/tests/basic/update-1.7.ts
+++ b/tests/legacy-cli/e2e/tests/basic/update-1.7.ts
@@ -1,21 +1,26 @@
 import { createProjectFromAsset } from '../../utils/assets';
 import { ng, silentNpm } from '../../utils/process';
-import { useBuiltPackages, useCIChrome, useCIDefaults } from '../../utils/project';
+import {
+  isPrereleaseCli, removeHttpDep, useBuiltPackages, useCIChrome, useCIDefaults,
+} from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
 
 
-export default function () {
-  return Promise.resolve()
-    .then(() => createProjectFromAsset('1.7-project'))
-    .then(() => useCIChrome('.'))
-    .then(() => expectToFail(() => ng('build')))
-    .then(() => ng('update', '@angular/cli'))
-    .then(() => useBuiltPackages())
-    .then(() => silentNpm('install'))
-    .then(() => useCIDefaults('latest-project'))
-    .then(() => ng('generate', 'component', 'my-comp'))
-    .then(() => ng('test', '--watch=false'))
-    .then(() => ng('lint'))
-    .then(() => ng('build', '--prod'))
-    .then(() => ng('e2e'));
+export default async function () {
+  const extraUpdateArgs = await isPrereleaseCli() ? ['--next'] : [];
+
+  await createProjectFromAsset('1.7-project');
+  await useCIChrome('.');
+  await expectToFail(() => ng('build'));
+  await ng('update', '@angular/cli');
+  await useBuiltPackages();
+  await silentNpm('install');
+  await removeHttpDep();
+  await ng('update', '@angular/core', ...extraUpdateArgs);
+  await useCIDefaults('latest-project');
+  await ng('generate', 'component', 'my-comp');
+  await ng('test', '--watch=false');
+  await ng('lint');
+  await ng('build', '--prod');
+  await ng('e2e');
 }
diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts
index 112768a14c42..80af4e9b5097 100644
--- a/tests/legacy-cli/e2e/utils/project.ts
+++ b/tests/legacy-cli/e2e/utils/project.ts
@@ -3,6 +3,7 @@ import { readFile, writeFile, replaceInFile, prependToFile } from './fs';
 import { execAndWaitForOutputToMatch, npm, silentNpm, ng, git } from './process';
 import { getGlobalVariable } from './env';
 import { gitCommit } from './git';
+import { prerelease } from 'semver';
 
 const packages = require('../../../../lib/packages').packages;
 
@@ -253,13 +254,20 @@ export function useNgVersion(version: string) {
         }
         json['devDependencies'][`@angular/${pkgName}`] = version;
       });
-    // TODO: determine the appropriate version for the Angular version
+    // Set the correct peer dependencies for @angular/core and @angular/compiler-cli.
+    // This list should be kept up to date with each major release.
     if (version.startsWith('^5')) {
-      json['devDependencies']['typescript'] = '~2.5.0';
-      json['dependencies']['rxjs'] = '5.5.8';
-    } else {
-      json['devDependencies']['typescript'] = '~2.7.0';
-      json['dependencies']['rxjs'] = '6.0.0-rc.0';
+      json['devDependencies']['typescript'] = '>=2.4.2 <2.5';
+      json['dependencies']['rxjs'] = '^5.5.0';
+      json['dependencies']['zone.js'] = '~0.8.4';
+    } else if (version.startsWith('^6')) {
+      json['devDependencies']['typescript'] = '>=2.7.2 <2.8';
+      json['dependencies']['rxjs'] = '^6.0.0';
+      json['dependencies']['zone.js'] = '~0.8.26';
+    } else if (version.startsWith('^7')) {
+      json['devDependencies']['typescript'] = '>=3.1.1 <3.2';
+      json['dependencies']['rxjs'] = '^6.0.0';
+      json['dependencies']['zone.js'] = '~0.8.26';
     }
   });
 }
@@ -489,3 +497,13 @@ export function useNg4() {
       console.log(JSON.stringify(json));
     }));
 }
+
+export async function isPrereleaseCli() {
+  const angularCliPkgJson = JSON.parse(await readFile('node_modules/@angular/cli/package.json'));
+
+  return prerelease(angularCliPkgJson.version).length > 0;
+}
+
+export async function removeHttpDep() {
+  await updateJsonFile('package.json', json => { delete json['dependencies']['@angular/http']; });
+}

From 5ec27db6bce122d0bb1980be2e28eb679ccceca4 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 4 Apr 2019 09:38:00 +0100
Subject: [PATCH 1159/1703] feat(@angular/cli): verify Angular version is
 supported

---
 package.json                                  |  4 +-
 packages/angular/cli/commands/build-impl.ts   |  4 --
 packages/angular/cli/commands/serve-impl.ts   |  4 --
 .../angular/cli/models/architect-command.ts   |  4 ++
 packages/angular/cli/upgrade/version.ts       | 38 ++++++++++++++++---
 .../assets/1.0-project/src/app/app.module.ts  |  2 -
 .../legacy-cli/e2e/tests/basic/update-1.0.ts  |  2 +-
 .../e2e/tests/basic/update-1.7-longhand.ts    |  2 +-
 .../legacy-cli/e2e/tests/basic/update-1.7.ts  |  2 +-
 .../e2e/tests/misc/supported-angular.ts       | 38 +++++++++++++++++++
 yarn.lock                                     |  8 ++--
 11 files changed, 84 insertions(+), 24 deletions(-)
 create mode 100644 tests/legacy-cli/e2e/tests/misc/supported-angular.ts

diff --git a/package.json b/package.json
index b9c74ac46a25..893335ecff3d 100644
--- a/package.json
+++ b/package.json
@@ -95,7 +95,7 @@
     "@types/minimist": "^1.2.0",
     "@types/node": "10.9.4",
     "@types/request": "^2.47.1",
-    "@types/semver": "^5.5.0",
+    "@types/semver": "^6.0.0",
     "@types/source-map": "0.5.2",
     "@types/webpack": "^4.4.11",
     "@types/webpack-dev-server": "^3.1.0",
@@ -122,7 +122,7 @@
     "pidtree": "^0.3.0",
     "pidusage": "^2.0.17",
     "rxjs": "~6.4.0",
-    "semver": "^5.3.0",
+    "semver": "6.0.0",
     "source-map": "^0.5.6",
     "source-map-support": "^0.5.0",
     "spdx-satisfies": "^4.0.0",
diff --git a/packages/angular/cli/commands/build-impl.ts b/packages/angular/cli/commands/build-impl.ts
index fe1fde26fd46..081588c2b9cb 100644
--- a/packages/angular/cli/commands/build-impl.ts
+++ b/packages/angular/cli/commands/build-impl.ts
@@ -8,16 +8,12 @@
 import { analytics } from '@angular-devkit/core';
 import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
 import { Arguments } from '../models/interface';
-import { Version } from '../upgrade/version';
 import { Schema as BuildCommandSchema } from './build';
 
 export class BuildCommand extends ArchitectCommand<BuildCommandSchema> {
   public readonly target = 'build';
 
   public async run(options: ArchitectCommandOptions & Arguments) {
-    // Check Angular version.
-    Version.assertCompatibleAngularVersion(this.workspace.root);
-
     return this.runArchitectTarget(options);
   }
 
diff --git a/packages/angular/cli/commands/serve-impl.ts b/packages/angular/cli/commands/serve-impl.ts
index 22e104b1010f..dff1855e6e7a 100644
--- a/packages/angular/cli/commands/serve-impl.ts
+++ b/packages/angular/cli/commands/serve-impl.ts
@@ -8,7 +8,6 @@
 import { analytics } from '@angular-devkit/core';
 import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
 import { Arguments } from '../models/interface';
-import { Version } from '../upgrade/version';
 import { Schema as BuildCommandSchema } from './build';
 import { Schema as ServeCommandSchema } from './serve';
 
@@ -16,9 +15,6 @@ export class ServeCommand extends ArchitectCommand<ServeCommandSchema> {
   public readonly target = 'serve';
 
   public validate(_options: ArchitectCommandOptions & Arguments) {
-    // Check Angular versions.
-    Version.assertCompatibleAngularVersion(this.workspace.root);
-
     return true;
   }
 
diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index ee1df7dc085e..5871bd0ccb69 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -9,6 +9,7 @@ import { Architect, Target } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { experimental, json, schema, tags } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
+import { Version } from '../upgrade/version';
 import { BepJsonWriter } from '../utilities/bep';
 import { parseJsonSchemaToOptions } from '../utilities/json-schema';
 import { isPackageNameSafeForAnalytics } from './analytics';
@@ -274,6 +275,9 @@ export abstract class ArchitectCommand<
   protected async runArchitectTarget(
     options: ArchitectCommandOptions & Arguments,
   ): Promise<number> {
+    // Check Angular version.
+    Version.assertCompatibleAngularVersion(this.workspace.root);
+
     const extra = options['--'] || [];
 
     try {
diff --git a/packages/angular/cli/upgrade/version.ts b/packages/angular/cli/upgrade/version.ts
index 53670738ebe6..774678663b99 100644
--- a/packages/angular/cli/upgrade/version.ts
+++ b/packages/angular/cli/upgrade/version.ts
@@ -8,7 +8,7 @@
 
 import { tags, terminal } from '@angular-devkit/core';
 import * as path from 'path';
-import { SemVer } from 'semver';
+import { SemVer, satisfies } from 'semver';
 
 
 export class Version {
@@ -26,6 +26,12 @@ export class Version {
   isGreaterThanOrEqualTo(other: SemVer) {
     return this._semver !== null && this._semver.compare(other) >= 0;
   }
+  satisfies(other: string) {
+    // This comparison includes pre-releases (like betas and rcs), and considers them to be
+    // before the release proper.
+    // e.g. '9.0.0-beta.1' will satisfy '>=7.0.0 <9.0.0', but '9.0.0' will not.
+    return this._semver !== null && satisfies(this._semver, other, { includePrerelease: true });
+  }
 
   get major() { return this._semver ? this._semver.major : 0; }
   get minor() { return this._semver ? this._semver.minor : 0; }
@@ -36,11 +42,12 @@ export class Version {
   toString() { return this._version; }
 
   static assertCompatibleAngularVersion(projectRoot: string) {
+    let angularCliPkgJson;
     let angularPkgJson;
     let rxjsPkgJson;
+    const resolveOptions = { paths: [projectRoot] };
 
     try {
-      const resolveOptions = { paths: [projectRoot] };
       const angularPackagePath = require.resolve('@angular/core/package.json', resolveOptions);
       const rxjsPackagePath = require.resolve('rxjs/package.json', resolveOptions);
 
@@ -61,6 +68,26 @@ export class Version {
       process.exit(2);
     }
 
+    try {
+      const angularCliPkgPath = require.resolve('@angular/cli/package.json', resolveOptions);
+      angularCliPkgJson = require(angularCliPkgPath);
+      if (!(angularCliPkgJson && angularCliPkgJson['version'])) {
+        throw new Error();
+      }
+    } catch (error) {
+      console.error(terminal.bold(terminal.red(tags.stripIndents`
+        Cannot determine versions of "@angular/cli".
+        This likely means your local installation is broken. Please reinstall your packages.
+      `)));
+      process.exit(2);
+    }
+
+    const cliMajor = new Version(angularCliPkgJson['version']).major;
+    // e.g. CLI 8.0 supports '>=8.0.0 <9.0.0', including pre-releases (betas, rcs, snapshots)
+    // of both 8 and 9.
+    const supportedAngularSemver = `^${cliMajor}.0.0-beta || ` +
+      `>=${cliMajor}.0.0 <${cliMajor + 1}.0.0`;
+
     const angularVersion = new Version(angularPkgJson['version']);
     const rxjsVersion = new Version(rxjsPkgJson['version']);
 
@@ -70,9 +97,10 @@ export class Version {
       return;
     }
 
-    if (!angularVersion.isGreaterThanOrEqualTo(new SemVer('5.0.0'))) {
+    if (!angularVersion.satisfies(supportedAngularSemver)) {
       console.error(terminal.bold(terminal.red(tags.stripIndents`
-          This version of CLI is only compatible with Angular version 5.0.0 or higher.
+          This version of CLI is only compatible with Angular versions ${supportedAngularSemver},
+          but Angular version ${angularVersion} was found instead.
 
           Please visit the link below to find instructions on how to update Angular.
           https://angular-update-guide.firebaseapp.com/
@@ -84,7 +112,7 @@ export class Version {
       && !rxjsVersion.isGreaterThanOrEqualTo(new SemVer('6.0.0-beta.0'))
     ) {
       console.error(terminal.bold(terminal.red(tags.stripIndents`
-          This project uses version ${rxjsVersion} of RxJs, which is not supported by Angular v6.
+          This project uses version ${rxjsVersion} of RxJs, which is not supported by Angular v6+.
           The official RxJs version that is supported is 5.6.0-forward-compat.0 and greater.
 
           Please visit the link below to find instructions on how to update RxJs.
diff --git a/tests/legacy-cli/e2e/assets/1.0-project/src/app/app.module.ts b/tests/legacy-cli/e2e/assets/1.0-project/src/app/app.module.ts
index 67ae49119baa..d39d998af88f 100644
--- a/tests/legacy-cli/e2e/assets/1.0-project/src/app/app.module.ts
+++ b/tests/legacy-cli/e2e/assets/1.0-project/src/app/app.module.ts
@@ -1,7 +1,6 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
-import { HttpModule } from '@angular/http';
 
 import { AppComponent } from './app.component';
 
@@ -12,7 +11,6 @@ import { AppComponent } from './app.component';
   imports: [
     BrowserModule,
     FormsModule,
-    HttpModule
   ],
   providers: [],
   bootstrap: [AppComponent]
diff --git a/tests/legacy-cli/e2e/tests/basic/update-1.0.ts b/tests/legacy-cli/e2e/tests/basic/update-1.0.ts
index e5a670c427b4..71342bca898f 100644
--- a/tests/legacy-cli/e2e/tests/basic/update-1.0.ts
+++ b/tests/legacy-cli/e2e/tests/basic/update-1.0.ts
@@ -7,7 +7,7 @@ import { expectToFail } from '../../utils/utils';
 
 
 export default async function () {
-  const extraUpdateArgs = await isPrereleaseCli() ? ['--next'] : [];
+  const extraUpdateArgs = await isPrereleaseCli() ? ['--next', '--force'] : [];
 
   await createProjectFromAsset('1.0-project');
   await useCIChrome('.');
diff --git a/tests/legacy-cli/e2e/tests/basic/update-1.7-longhand.ts b/tests/legacy-cli/e2e/tests/basic/update-1.7-longhand.ts
index 397d126c6b38..2ca3a22d9745 100644
--- a/tests/legacy-cli/e2e/tests/basic/update-1.7-longhand.ts
+++ b/tests/legacy-cli/e2e/tests/basic/update-1.7-longhand.ts
@@ -5,7 +5,7 @@ import { expectToFail } from '../../utils/utils';
 
 
 export default async function () {
-  const extraUpdateArgs = await isPrereleaseCli() ? ['--next'] : [];
+  const extraUpdateArgs = await isPrereleaseCli() ? ['--next', '--force'] : [];
 
   await createProjectFromAsset('1.7-project');
   await expectToFail(() => ng('build'));
diff --git a/tests/legacy-cli/e2e/tests/basic/update-1.7.ts b/tests/legacy-cli/e2e/tests/basic/update-1.7.ts
index 977e2badf074..6abafddee0fd 100644
--- a/tests/legacy-cli/e2e/tests/basic/update-1.7.ts
+++ b/tests/legacy-cli/e2e/tests/basic/update-1.7.ts
@@ -7,7 +7,7 @@ import { expectToFail } from '../../utils/utils';
 
 
 export default async function () {
-  const extraUpdateArgs = await isPrereleaseCli() ? ['--next'] : [];
+  const extraUpdateArgs = await isPrereleaseCli() ? ['--next', '--force'] : [];
 
   await createProjectFromAsset('1.7-project');
   await useCIChrome('.');
diff --git a/tests/legacy-cli/e2e/tests/misc/supported-angular.ts b/tests/legacy-cli/e2e/tests/misc/supported-angular.ts
new file mode 100644
index 000000000000..58cd5fad4872
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/misc/supported-angular.ts
@@ -0,0 +1,38 @@
+import { SemVer } from 'semver';
+import { getGlobalVariable } from '../../utils/env';
+import { readFile, writeFile } from '../../utils/fs';
+import { ng } from '../../utils/process';
+import { expectToFail } from '../../utils/utils';
+
+
+export default async function () {
+  if (getGlobalVariable('argv')['ng-snapshots'] || getGlobalVariable('argv')['ivy']) {
+    // Don't run this test in snapshots or Ivy test jobs.
+    // The snapshots job won't work correctly because it doesn't use semver for Angular, and the
+    // Ivy job will fail because Ivy wasn't stable in 7.
+    return;
+  }
+
+  const angularCliPkgJson = JSON.parse(await readFile('node_modules/@angular/cli/package.json'));
+  const cliMajor = new SemVer(angularCliPkgJson.version as string).major;
+  const angularCorePkgPath = 'node_modules/@angular/core/package.json';
+  const originalAngularCorePkgJson = await readFile(angularCorePkgPath);
+
+  // Fake version by writing over the @angular/core version, since that's what the CLI checks.
+  const fakeCoreVersion = async (newMajor: number) => {
+    const tmpPkgJson = JSON.parse(originalAngularCorePkgJson);
+    tmpPkgJson.version = `${newMajor}.0.0`;
+    await writeFile(angularCorePkgPath, JSON.stringify(tmpPkgJson));
+  };
+
+  // Major should succeed, but we don't need to test it here since it's tested everywhere else.
+  // Major+1 and -1 should fail architect commands, but allow other commands.
+  await fakeCoreVersion(cliMajor + 1);
+  await expectToFail(() => ng('build'), 'Should fail Major+1');
+  await ng('version');
+  await fakeCoreVersion(cliMajor - 1);
+  await ng('version');
+
+  // Restore the original core package.json.
+  await writeFile(angularCorePkgPath, originalAngularCorePkgJson);
+}
diff --git a/yarn.lock b/yarn.lock
index 1c692123e003..483eb9ae4e17 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -548,10 +548,10 @@
   resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.12.tgz#6affe5aed1ba379175075a889adbe2bc3aa62159"
   integrity sha512-hYn+eoOehVUIdMwp5h34ZsGAO1ydja10GDup4BwyoFCdcH5MQ35nQq+AInSaBMEMopD5hEooFCyKo2Pajbe1ag==
 
-"@types/semver@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
-  integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==
+"@types/semver@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-6.0.0.tgz#86ba89f02a414e39c68d02b351872e4ed31bd773"
+  integrity sha512-OO0srjOGH99a4LUN2its3+r6CBYcplhJ466yLqs+zvAWgphCpS8hYZEZ797tRDP/QKcqTdb/YCN6ifASoAWkrQ==
 
 "@types/serve-static@*":
   version "1.13.2"

From f1f49325f776d2ab2ee1074c81b1d20e2da927da Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Sun, 14 Apr 2019 12:52:02 -0400
Subject: [PATCH 1160/1703] refactor(@angular-devkit/build-angular):
 standardize builder transforms

---
 .../build_angular/src/browser/index.ts        | 66 +++++++++----------
 .../build_angular/src/dev-server/index.ts     | 17 ++---
 .../angular_devkit/build_angular/src/index.ts |  2 +-
 .../build_angular/src/karma/index.ts          | 19 +++---
 .../build_angular/src/transforms.ts           |  8 +++
 5 files changed, 54 insertions(+), 58 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/src/transforms.ts

diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 3d716871ea6a..d26a149a1957 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -23,7 +23,7 @@ import {
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as fs from 'fs';
 import * as path from 'path';
-import { Observable, combineLatest, from, of, zip } from 'rxjs';
+import { from, of, zip } from 'rxjs';
 import { catchError, concatMap, map, switchMap } from 'rxjs/operators';
 import * as webpack from 'webpack';
 import { NgBuildAnalyticsPlugin } from '../../plugins/webpack/analytics';
@@ -44,6 +44,7 @@ import {
   statsToString,
   statsWarningsToString,
 } from '../angular-cli-files/utilities/stats';
+import { ExecutionTransformer } from '../transforms';
 import { deleteOutputDir } from '../utils';
 import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
 import { Schema as BrowserBuilderSchema } from './schema';
@@ -77,7 +78,7 @@ export function createBrowserLoggingCallback(
 export async function buildBrowserWebpackConfigFromContext(
   options: BrowserBuilderSchema,
   context: BuilderContext,
-  host: virtualFs.Host<fs.Stats>,
+  host: virtualFs.Host<fs.Stats> = new NodeJsSyncHost(),
 ): Promise<{ workspace: experimental.workspace.Workspace, config: webpack.Configuration[] }> {
   return generateBrowserWebpackConfigFromContext(
     options,
@@ -126,53 +127,48 @@ function getCompilerConfig(wco: WebpackConfigOptions): webpack.Configuration {
   return {};
 }
 
-export type BrowserConfigTransformFn = (
-  workspace: experimental.workspace.Workspace,
-  config: webpack.Configuration,
-) => Observable<webpack.Configuration>;
+async function initialize(
+  options: BrowserBuilderSchema,
+  context: BuilderContext,
+  host: virtualFs.Host<fs.Stats>,
+  webpackConfigurationTransform?: ExecutionTransformer<webpack.Configuration>,
+): Promise<{ workspace: experimental.workspace.Workspace, config: webpack.Configuration[] }> {
+  const { config, workspace } = await buildBrowserWebpackConfigFromContext(options, context, host);
+
+  let transformedConfig;
+  if (webpackConfigurationTransform) {
+    transformedConfig = [];
+    for (const c of config) {
+      transformedConfig.push(await webpackConfigurationTransform(c));
+    }
+  }
+
+  if (options.deleteOutputPath) {
+    await deleteOutputDir(
+      normalize(context.workspaceRoot),
+      normalize(options.outputPath),
+      host,
+    ).toPromise();
+  }
 
+  return { config: transformedConfig || config, workspace };
+}
 
 export function buildWebpackBrowser(
   options: BrowserBuilderSchema,
   context: BuilderContext,
   transforms: {
-    config?: BrowserConfigTransformFn,
-    output?: (output: BrowserBuilderOutput) => Observable<BuilderOutput>,
+    webpackConfiguration?: ExecutionTransformer<webpack.Configuration>,
     logging?: WebpackLoggingCallback,
   } = {},
 ) {
   const host = new NodeJsSyncHost();
   const root = normalize(context.workspaceRoot);
 
-  const configFn = transforms.config;
-  const outputFn = transforms.output;
   const loggingFn = transforms.logging
     || createBrowserLoggingCallback(!!options.verbose, context.logger);
 
-  // This makes a host observable into a cold one. This is because we want to wait until
-  // subscription before calling buildBrowserWebpackConfigFromContext, which can throw.
-  return of(null).pipe(
-    switchMap(() => from(buildBrowserWebpackConfigFromContext(options, context, host))),
-    switchMap(({ workspace, config }) => {
-      if (configFn) {
-        return combineLatest(config.map(config => configFn(workspace, config))).pipe(
-          map(config => ({ workspace, config })),
-        );
-      } else {
-        return of({ workspace, config });
-      }
-    }),
-    switchMap(({ workspace, config }) => {
-      if (options.deleteOutputPath) {
-        return deleteOutputDir(
-          root,
-          normalize(options.outputPath),
-          host,
-        ).pipe(map(() => ({ workspace, config })));
-      } else {
-        return of({ workspace, config });
-      }
-    }),
+  return from(initialize(options, context, host, transforms.webpackConfiguration)).pipe(
     switchMap(({ workspace, config: configs }) => {
       const projectName = context.target
         ? context.target.project : workspace.getDefaultProjectName();
@@ -237,11 +233,9 @@ export function buildWebpackBrowser(
           // If we use differential loading, both configs have the same outputs
           outputPath: path.resolve(context.workspaceRoot, options.outputPath),
         } as BrowserBuilderOutput)),
-        concatMap(output => outputFn ? outputFn(output) : of(output)),
       );
     }),
   );
 }
 
-
 export default createBuilder<json.JsonObject & BrowserBuilderSchema>(buildWebpackBrowser);
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index 83809682b2e4..4413bc34d056 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -27,11 +27,11 @@ import * as webpack from 'webpack';
 import * as WebpackDevServer from 'webpack-dev-server';
 import { checkPort } from '../angular-cli-files/utilities/check-port';
 import {
-  BrowserConfigTransformFn,
   buildBrowserWebpackConfigFromContext,
   createBrowserLoggingCallback,
 } from '../browser';
 import { Schema as BrowserBuilderSchema } from '../browser/schema';
+import { ExecutionTransformer } from '../transforms';
 import { normalizeOptimization } from '../utils';
 import { Schema } from './schema';
 const open = require('open');
@@ -75,8 +75,7 @@ export function serveWebpackBrowser(
   options: DevServerBuilderSchema,
   context: BuilderContext,
   transforms: {
-    browserConfig?: BrowserConfigTransformFn,
-    serverConfig?: ServerConfigTransformFn,
+    webpackConfiguration?: ExecutionTransformer<webpack.Configuration>,
     logging?: WebpackLoggingCallback,
   } = {},
 ): Observable<DevServerBuilderOutput> {
@@ -123,22 +122,17 @@ export function serveWebpackBrowser(
 
     // No differential loading for dev-server, hence there is just one config
     let webpackConfig = webpackConfigResult.config[0];
-    const workspace = webpackConfigResult.workspace;
-
-    if (transforms.browserConfig) {
-      webpackConfig = await transforms.browserConfig(workspace, webpackConfig).toPromise();
-    }
 
     const port = await checkPort(options.port || 0, options.host || 'localhost', 4200);
-    let webpackDevServerConfig = buildServerConfig(
+    const webpackDevServerConfig = webpackConfig.devServer = buildServerConfig(
       root,
       options,
       browserOptions,
       context.logger,
     );
 
-    if (transforms.serverConfig) {
-      webpackDevServerConfig = await transforms.serverConfig(workspace, webpackConfig).toPromise();
+    if (transforms.webpackConfiguration) {
+      webpackConfig = await transforms.webpackConfiguration(webpackConfig);
     }
 
     return { browserOptions, webpackConfig, webpackDevServerConfig, port };
@@ -208,7 +202,6 @@ export function serveWebpackBrowser(
       `);
 
       openAddress = serverAddress + webpackDevServerConfig.publicPath;
-      webpackConfig.devServer = webpackDevServerConfig;
 
       return runWebpackDevServer(webpackConfig, context, { logging: loggingFn });
     }),
diff --git a/packages/angular_devkit/build_angular/src/index.ts b/packages/angular_devkit/build_angular/src/index.ts
index b292b7b3d5c7..f73999c1a826 100644
--- a/packages/angular_devkit/build_angular/src/index.ts
+++ b/packages/angular_devkit/build_angular/src/index.ts
@@ -12,7 +12,7 @@
 // See https://github.com/angular/angular-cli/issues/9691#issuecomment-367322703 for details.
 // We need to add a require here to satisfy the dependency checker.
 // require('ajv');
-
+export * from './transforms';
 export * from './app-shell';
 export * from './browser';
 export {
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index 3f55d93e25f5..05cbad6f29a0 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -18,6 +18,7 @@ import {
   getWorkerConfig,
 } from '../angular-cli-files/models/webpack-configs';
 import { Schema as BrowserBuilderOptions } from '../browser/schema';
+import { ExecutionTransformer } from '../transforms';
 import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
 import { Schema as KarmaBuilderOptions } from './schema';
 
@@ -27,12 +28,10 @@ type KarmaConfigOptions = import ('karma').ConfigOptions & {
   configFile?: string;
 };
 
-type WebpackConfigurationTransformer =
-  (configuration: webpack.Configuration) => webpack.Configuration;
-
 async function initialize(
   options: KarmaBuilderOptions,
   context: BuilderContext,
+  webpackConfigurationTransformer?: ExecutionTransformer<webpack.Configuration>,
   // tslint:disable-next-line:no-implicit-dependencies
 ): Promise<[typeof import ('karma'), webpack.Configuration]> {
   const { config } = await generateBrowserWebpackConfigFromContext(
@@ -53,18 +52,22 @@ async function initialize(
   // tslint:disable-next-line:no-implicit-dependencies
   const karma = await import('karma');
 
-  return [karma, config[0]];
+  return [
+    karma,
+    webpackConfigurationTransformer ? await webpackConfigurationTransformer(config[0]) : config[0],
+  ];
 }
 
 export function execute(
   options: KarmaBuilderOptions,
   context: BuilderContext,
   transforms: {
-    webpackConfiguration?: WebpackConfigurationTransformer,
+    webpackConfiguration?: ExecutionTransformer<webpack.Configuration>,
+    // The karma options transform cannot be async without a refactor of the builder implementation
     karmaOptions?: (options: KarmaConfigOptions) => KarmaConfigOptions,
   } = {},
 ): Observable<BuilderOutput> {
-  return from(initialize(options, context)).pipe(
+  return from(initialize(options, context, transforms.webpackConfiguration)).pipe(
     switchMap(([karma, webpackConfig]) => new Observable<BuilderOutput>(subscriber => {
       const karmaOptions: KarmaConfigOptions = {};
 
@@ -93,9 +96,7 @@ export function execute(
 
       karmaOptions.buildWebpack = {
         options,
-        webpackConfig: transforms.webpackConfiguration
-          ? transforms.webpackConfiguration(webpackConfig)
-          : webpackConfig,
+        webpackConfig,
         // Pass onto Karma to emit BuildEvents.
         successCb: () => subscriber.next({ success: true }),
         failureCb: () => subscriber.next({ success: false }),
diff --git a/packages/angular_devkit/build_angular/src/transforms.ts b/packages/angular_devkit/build_angular/src/transforms.ts
new file mode 100644
index 000000000000..c724aedab646
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/transforms.ts
@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+export type ExecutionTransformer<T> = (input: T) => T | Promise<T>;

From 2b234546ddd44d5f31da1f26cf91f1b7517955ba Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Sun, 14 Apr 2019 13:50:17 -0400
Subject: [PATCH 1161/1703] refactor(@angular-devkit/build-angular): add
 transform support to server builder

---
 .../angular_devkit/build_angular/src/index.ts |   2 +-
 .../build_angular/src/server/index.ts         | 177 +++++-------------
 2 files changed, 49 insertions(+), 130 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/index.ts b/packages/angular_devkit/build_angular/src/index.ts
index f73999c1a826..6599e83eba7a 100644
--- a/packages/angular_devkit/build_angular/src/index.ts
+++ b/packages/angular_devkit/build_angular/src/index.ts
@@ -36,5 +36,5 @@ export * from './extract-i18n';
 export * from './karma';
 export * from './karma/schema';
 export * from './protractor';
-export * from './server';
+export { execute as executeServerBuilder } from './server';
 export * from './tslint';
diff --git a/packages/angular_devkit/build_angular/src/server/index.ts b/packages/angular_devkit/build_angular/src/server/index.ts
index 96df11c10642..993f451e5a1f 100644
--- a/packages/angular_devkit/build_angular/src/server/index.ts
+++ b/packages/angular_devkit/build_angular/src/server/index.ts
@@ -5,23 +5,14 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { BuilderOutput, createBuilder } from '@angular-devkit/architect';
+import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
 import { runWebpack } from '@angular-devkit/build-webpack';
-import {
-  Path,
-  experimental,
-  getSystemPath,
-  json,
-  logging,
-  normalize,
-  resolve, schema, virtualFs,
-} from '@angular-devkit/core';
+import { json, normalize } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
-import { Stats } from 'fs';
 import * as path from 'path';
-import { from, of } from 'rxjs';
+import { Observable, from, of } from 'rxjs';
 import { concatMap, map } from 'rxjs/operators';
-import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
+import * as webpack from 'webpack';
 import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
 import {
   getAotConfig,
@@ -31,66 +22,28 @@ import {
   getStatsConfig,
   getStylesConfig,
 } from '../angular-cli-files/models/webpack-configs';
-import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
-import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
-import {
-  NormalizedWebpackServerBuilderSchema, defaultProgress,
-  deleteOutputDir,
-  normalizeWebpackServerSchema,
-} from '../utils';
-import { Schema as BuildWebpackServerSchema } from './schema';
-const webpackMerge = require('webpack-merge');
-
+import { ExecutionTransformer } from '../transforms';
+import { NormalizedBrowserBuilderSchema, deleteOutputDir } from '../utils';
+import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
+import { Schema as BuildWebpackServerOptions } from './schema';
 
 // If success is true, outputPath should be set.
 export type ServerBuilderOutput = json.JsonObject & BuilderOutput & {
   outputPath?: string;
 };
 
-
-export default createBuilder<
-  json.JsonObject & BuildWebpackServerSchema,
-  ServerBuilderOutput
->((options, context) => {
-  const host = new virtualFs.AliasHost(new NodeJsSyncHost());
+export function execute(
+  options: BuildWebpackServerOptions,
+  context: BuilderContext,
+  transforms: {
+    webpackConfiguration?: ExecutionTransformer<webpack.Configuration>;
+  } = {},
+): Observable<ServerBuilderOutput> {
+  const host = new NodeJsSyncHost();
   const root = context.workspaceRoot;
 
-  async function setup() {
-    const registry = new schema.CoreSchemaRegistry();
-    registry.addPostTransform(schema.transforms.addUndefinedDefaults);
-
-    const workspace = await experimental.workspace.Workspace.fromPath(
-      host,
-      normalize(context.workspaceRoot),
-      registry,
-    );
-    const projectName = context.target ? context.target.project : workspace.getDefaultProjectName();
-
-    if (!projectName) {
-      throw new Error('Must either have a target from the context or a default project.');
-    }
-    const projectRoot = resolve(
-      workspace.root,
-      normalize(workspace.getProject(projectName).root),
-    );
-    const workspaceSourceRoot = workspace.getProject(projectName).sourceRoot;
-    const sourceRoot = workspaceSourceRoot !== undefined ? resolve(
-      workspace.root,
-      normalize(workspaceSourceRoot),
-    ) : undefined;
-
-    const normalizedOptions = normalizeWebpackServerSchema(
-      host,
-      normalize(root),
-      projectRoot,
-      sourceRoot,
-      options,
-    );
-
-    return { normalizedOptions, projectRoot };
-  }
-
-  return from(setup()).pipe(
+  return from(buildServerWebpackConfig(options, context)).pipe(
+    concatMap(async v => transforms.webpackConfiguration ? transforms.webpackConfiguration(v) : v),
     concatMap(v => {
       if (options.deleteOutputPath) {
         return deleteOutputDir(normalize(root), normalize(options.outputPath), host).pipe(
@@ -100,17 +53,7 @@ export default createBuilder<
         return of(v);
       }
     }),
-    concatMap(({ normalizedOptions, projectRoot }) => {
-      const webpackConfig = buildServerWebpackConfig(
-        normalize(root),
-        projectRoot,
-        host,
-        normalizedOptions,
-        context.logger.createChild('webpack'),
-      );
-
-      return runWebpack(webpackConfig, context);
-    }),
+    concatMap(webpackConfig => runWebpack(webpackConfig, context)),
     map(output => {
       if (output.success === false) {
         return output as ServerBuilderOutput;
@@ -122,65 +65,41 @@ export default createBuilder<
       } as ServerBuilderOutput;
     }),
   );
-});
-
-export function buildServerWebpackConfig(
-  root: Path,
-  projectRoot: Path,
-  _host: virtualFs.Host<Stats>,
-  options: NormalizedWebpackServerBuilderSchema,
-  logger: logging.Logger,
-) {
-  let wco: WebpackConfigOptions;
-
-  // TODO: make target defaults into configurations instead
-  // options = this.addTargetDefaults(options);
-
-  const tsConfigPath = getSystemPath(normalize(resolve(root, normalize(options.tsConfig))));
-  const tsConfig = readTsconfig(tsConfigPath);
+}
 
-  const projectTs = requireProjectModule(getSystemPath(projectRoot), 'typescript') as typeof ts;
+export default createBuilder<json.JsonObject & BuildWebpackServerOptions, ServerBuilderOutput>(
+  execute,
+);
 
-  const supportES2015 = tsConfig.options.target !== projectTs.ScriptTarget.ES3
-    && tsConfig.options.target !== projectTs.ScriptTarget.ES5;
+function getCompilerConfig(wco: WebpackConfigOptions) {
+  if (wco.buildOptions.main || wco.buildOptions.polyfills) {
+    return wco.buildOptions.aot ? getAotConfig(wco) : getNonAotConfig(wco);
+  }
 
-  const buildOptions: typeof wco['buildOptions'] = {
-    ...options as {} as typeof wco['buildOptions'],
-  };
+  return {};
+}
 
-  wco = {
-    root: getSystemPath(root),
-    projectRoot: getSystemPath(projectRoot),
-    // TODO: use only this.options, it contains all flags and configs items already.
-    buildOptions: {
-      ...buildOptions,
+async function buildServerWebpackConfig(
+  options: BuildWebpackServerOptions,
+  context: BuilderContext,
+) {
+  const { config } = await generateBrowserWebpackConfigFromContext(
+    {
+      ...options,
+      index: '',
       buildOptimizer: false,
       aot: true,
       platform: 'server',
-      scripts: [],
-      styles: [],
-    },
-    tsConfig,
-    tsConfigPath,
-    supportES2015,
-    logger,
-  };
-
-  wco.buildOptions.progress = defaultProgress(wco.buildOptions.progress);
-
-  const webpackConfigs: {}[] = [
-    getCommonConfig(wco),
-    getServerConfig(wco),
-    getStylesConfig(wco),
-    getStatsConfig(wco),
-  ];
-
-  if (wco.buildOptions.main || wco.buildOptions.polyfills) {
-    const typescriptConfigPartial = wco.buildOptions.aot
-      ? getAotConfig(wco)
-      : getNonAotConfig(wco);
-    webpackConfigs.push(typescriptConfigPartial);
-  }
+    } as NormalizedBrowserBuilderSchema,
+    context,
+    wco => [
+      getCommonConfig(wco),
+      getServerConfig(wco),
+      getStylesConfig(wco),
+      getStatsConfig(wco),
+      getCompilerConfig(wco),
+    ],
+  );
 
-  return webpackMerge(webpackConfigs);
+  return config[0];
 }

From 82193807d51541e9ad44063674f0c1cf043361a7 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 16 Apr 2019 09:33:15 +0200
Subject: [PATCH 1162/1703] fix(@ngtools/webpack): replace bootstrap code under
 Ivy unless running in JIT mode

The bootstrap code always needs to be replaced if not running in JIT mode as other wise the entire compiler will be pulled in because we will not replace the bootstrapping code to use `platform-browser` instead of `platform-browser-dynamic`.
---
 packages/ngtools/webpack/src/angular_compiler_plugin.ts     | 6 +++---
 .../ngtools/webpack/src/transformers/replace_bootstrap.ts   | 4 ++--
 .../webpack/src/transformers/replace_bootstrap_spec.ts      | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 636c6ceecb7d..af6c6826c049 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -948,13 +948,13 @@ export class AngularCompilerPlugin {
             this._normalizedLocale));
         }
 
-        if (this._useFactories) {
-          // Replace bootstrap in browser AOT.
+        if (!this._JitMode) {
+          // Replace bootstrap in browser non JIT Mode.
           this._transformers.push(replaceBootstrap(
             isAppPath,
             getEntryModule,
             getTypeChecker,
-            !!this._compilerOptions.enableIvy,
+            this._useFactories,
           ));
         }
       } else if (this._platform === PLATFORM.Server) {
diff --git a/packages/ngtools/webpack/src/transformers/replace_bootstrap.ts b/packages/ngtools/webpack/src/transformers/replace_bootstrap.ts
index 064e8acedd67..37aeebcbbdb6 100644
--- a/packages/ngtools/webpack/src/transformers/replace_bootstrap.ts
+++ b/packages/ngtools/webpack/src/transformers/replace_bootstrap.ts
@@ -17,7 +17,7 @@ export function replaceBootstrap(
   shouldTransform: (fileName: string) => boolean,
   getEntryModule: () => { path: string, className: string } | null,
   getTypeChecker: () => ts.TypeChecker,
-  enableIvy?: boolean,
+  useFactories = true,
 ): ts.TransformerFactory<ts.SourceFile> {
 
   const standardTransform: StandardTransform = function (sourceFile: ts.SourceFile) {
@@ -82,7 +82,7 @@ export function replaceBootstrap(
       let modulePath = `./${relativeEntryModulePath}`.replace(/\\/g, '/');
       let bootstrapIdentifier = 'bootstrapModule';
 
-      if (!enableIvy) {
+      if (useFactories) {
         className += 'NgFactory';
         modulePath += '.ngfactory';
         bootstrapIdentifier = 'bootstrapModuleFactory';
diff --git a/packages/ngtools/webpack/src/transformers/replace_bootstrap_spec.ts b/packages/ngtools/webpack/src/transformers/replace_bootstrap_spec.ts
index 31358da6e4dd..0dc2742689d7 100644
--- a/packages/ngtools/webpack/src/transformers/replace_bootstrap_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/replace_bootstrap_spec.ts
@@ -52,7 +52,7 @@ describe('@ngtools/webpack transformers', () => {
       expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
     });
 
-    it('should replace bootstrap for Ivy without referencing ngFactory', () => {
+    it('should replace bootstrap without referencing ngFactory when useFactories is false', () => {
       const input = tags.stripIndent`
         import { enableProdMode } from '@angular/core';
         import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
@@ -87,7 +87,7 @@ describe('@ngtools/webpack transformers', () => {
         () => true,
         () => ({ path: '/project/src/app/app.module', className: 'AppModule' }),
         () => program.getTypeChecker(),
-        true,
+        false,
       );
       const result = transformTypescript(undefined, [transformer], program, compilerHost);
 

From a8b033716f850420b70083d4a1d622a0f0028a27 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 16 Apr 2019 09:34:26 +0200
Subject: [PATCH 1163/1703] test: fix e2e to rely on the bootstrapping call
 instead of the method to be present in the bundle

---
 .../legacy-cli/e2e/tests/build/prod-build.ts  | 51 +++++++++++--------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/build/prod-build.ts b/tests/legacy-cli/e2e/tests/build/prod-build.ts
index a99c8c88b3da..24bc1f39dcff 100644
--- a/tests/legacy-cli/e2e/tests/build/prod-build.ts
+++ b/tests/legacy-cli/e2e/tests/build/prod-build.ts
@@ -1,30 +1,37 @@
-import {join} from 'path';
-import {readdirSync} from 'fs';
-import {expectFileToExist, expectFileToMatch} from '../../utils/fs';
-import {ng} from '../../utils/process';
-import {expectGitToBeClean} from '../../utils/git';
+import { readdirSync } from 'fs';
+import { join } from 'path';
+import { getGlobalVariable } from '../../utils/env';
+import { expectFileToExist, expectFileToMatch } from '../../utils/fs';
+import { expectGitToBeClean } from '../../utils/git';
+import { ng } from '../../utils/process';
 
 
-export default function() {
+export default async function () {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   // Can't use the `ng` helper because somewhere the environment gets
   // stuck to the first build done
-  return ng('build', '--prod')
-    .then(() => expectFileToExist(join(process.cwd(), 'dist')))
-    // Check for cache busting hash script src
-    .then(() => expectFileToMatch('dist/test-project/index.html', /main-es5\.[0-9a-f]{20}\.js/))
-    .then(() => expectFileToMatch('dist/test-project/index.html', /main-es2015\.[0-9a-f]{20}\.js/))
-    .then(() => expectFileToMatch('dist/test-project/index.html', /styles\.[0-9a-f]{20}\.css/))
-    .then(() => expectFileToMatch('dist/test-project/3rdpartylicenses.txt', /MIT/))
-    // Defaults to AoT
-    .then(() => {
-      const mainES5 = readdirSync('./dist/test-project').find(name => !!name.match(/main-es5.[a-z0-9]+\.js/));
-      expectFileToMatch(`dist/test-project/${mainES5}`, /bootstrapModuleFactory\(/);
+  const argv = getGlobalVariable('argv');
+  const ivyProject = argv['ivy'];
+  const bootstrapRegExp = ivyProject
+    ? /bootstrapModule\([a-zA-Z]+\)\./
+    : /bootstrapModuleFactory\([a-zA-Z]+\)\./;
 
-      const mainES2015 = readdirSync('./dist/test-project').find(name => !!name.match(/main-es2015.[a-z0-9]+\.js/));
-      expectFileToMatch(`dist/test-project/${mainES5}`, /bootstrapModuleFactory\(/);
-    })
-    // Check that the process didn't change local files.
-    .then(() => expectGitToBeClean());
+  await ng('build', '--prod');
+  await expectFileToExist(join(process.cwd(), 'dist'));
+  // Check for cache busting hash script src
+  await expectFileToMatch('dist/test-project/index.html', /main-es5\.[0-9a-f]{20}\.js/);
+  await expectFileToMatch('dist/test-project/index.html', /main-es2015\.[0-9a-f]{20}\.js/);
+  await expectFileToMatch('dist/test-project/index.html', /styles\.[0-9a-f]{20}\.css/);
+  await expectFileToMatch('dist/test-project/3rdpartylicenses.txt', /MIT/);
+
+  const dirContents = readdirSync('./dist/test-project');
+  const mainES5 = dirContents.find(name => /main-es5.[a-z0-9]+\.js/.test(name));
+  await expectFileToMatch(`dist/test-project/${mainES5}`, bootstrapRegExp);
+
+  const mainES2015 = dirContents.find(name => /main-es2015.[a-z0-9]+\.js/.test(name));
+  await expectFileToMatch(`dist/test-project/${mainES2015}`, bootstrapRegExp);
+
+  // Check that the process didn't change local files.
+  await expectGitToBeClean();
 }

From 86b23d7d9ceb92567e793fc528622797361b651e Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 16 Apr 2019 10:55:42 +0200
Subject: [PATCH 1164/1703] test: add size checks to prod build e2e tests

---
 .../legacy-cli/e2e/tests/build/prod-build.ts  | 43 ++++++++++++++++---
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/build/prod-build.ts b/tests/legacy-cli/e2e/tests/build/prod-build.ts
index 24bc1f39dcff..e4839192591b 100644
--- a/tests/legacy-cli/e2e/tests/build/prod-build.ts
+++ b/tests/legacy-cli/e2e/tests/build/prod-build.ts
@@ -1,11 +1,30 @@
-import { readdirSync } from 'fs';
+import { statSync } from 'fs';
 import { join } from 'path';
 import { getGlobalVariable } from '../../utils/env';
-import { expectFileToExist, expectFileToMatch } from '../../utils/fs';
+import { expectFileToExist, expectFileToMatch, readFile } from '../../utils/fs';
 import { expectGitToBeClean } from '../../utils/git';
 import { ng } from '../../utils/process';
 
 
+function verifySize(bundle: string, baselineBytes: number) {
+  const size = statSync(`dist/test-project/${bundle}`).size;
+  const percentageBaseline = baselineBytes * 10 / 100;
+  const maxSize = baselineBytes + percentageBaseline;
+  const minSize = baselineBytes - percentageBaseline;
+
+  if (size >= maxSize) {
+    throw new Error(
+      `Expected ${bundle} size to be less than ${maxSize / 1024}Kb but it was ${size / 1024}Kb.`,
+    );
+  }
+
+  if (size <= minSize) {
+    throw new Error(
+      `Expected ${bundle} size to be greater than ${minSize / 1024}Kb but it was ${size / 1024}Kb.`,
+    );
+  }
+}
+
 export default async function () {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
@@ -25,12 +44,22 @@ export default async function () {
   await expectFileToMatch('dist/test-project/index.html', /styles\.[0-9a-f]{20}\.css/);
   await expectFileToMatch('dist/test-project/3rdpartylicenses.txt', /MIT/);
 
-  const dirContents = readdirSync('./dist/test-project');
-  const mainES5 = dirContents.find(name => /main-es5.[a-z0-9]+\.js/.test(name));
-  await expectFileToMatch(`dist/test-project/${mainES5}`, bootstrapRegExp);
+  const indexContent = await readFile('dist/test-project/index.html');
+  const mainES5Path = indexContent.match(/src="(main-es5\.[a-z0-9]{0,32}\.js)"/)[1];
+  const mainES2015Path = indexContent.match(/src="(main-es2015\.[a-z0-9]{0,32}\.js)"/)[1];
+
+  // Content checks
+  await expectFileToMatch(`dist/test-project/${mainES5Path}`, bootstrapRegExp);
+  await expectFileToMatch(`dist/test-project/${mainES2015Path}`, bootstrapRegExp);
 
-  const mainES2015 = dirContents.find(name => /main-es2015.[a-z0-9]+\.js/.test(name));
-  await expectFileToMatch(`dist/test-project/${mainES2015}`, bootstrapRegExp);
+  // Size checks in bytes
+  if (ivyProject) {
+    verifySize(mainES5Path, 147789);
+    verifySize(mainES2015Path, 130153);
+  } else {
+    verifySize(mainES5Path, 155523);
+    verifySize(mainES2015Path, 135394);
+  }
 
   // Check that the process didn't change local files.
   await expectGitToBeClean();

From 5fc1f2499cbe57f9a95e4b0dfced130eb3a8046d Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 16 Apr 2019 15:49:56 +0200
Subject: [PATCH 1165/1703] feat(@angular-devkit/build-angular): deprecate
 `es5BrowserSupport` option in browser builder

In future, this will be determined from the list of supported browsers specified in the 'browserslist' file.
---
 .../models/webpack-configs/common.ts          | 22 ++++++++++++-------
 .../build_angular/src/browser/schema.json     |  2 +-
 .../build_angular/src/utils/index.ts          |  1 +
 tests/legacy-cli/e2e/tests/misc/support-ie.ts |  4 +++-
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index a679b738151a..a3c50047c531 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -17,6 +17,7 @@ import {
   debug,
 } from 'webpack';
 import { AssetPatternClass } from '../../../browser/schema';
+import { isEs5SupportNeeded } from '../../../utils/differential-loading';
 import { BundleBudgetPlugin } from '../../plugins/bundle-budget';
 import { CleanCssWebpackPlugin } from '../../plugins/cleancss-webpack-plugin';
 import { ScriptsWebpackPlugin } from '../../plugins/scripts-webpack-plugin';
@@ -66,20 +67,25 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
   }
 
   const es5Polyfills = path.join(__dirname, '..', 'es5-polyfills.js');
-  if (buildOptions.es5BrowserSupport) {
-    entryPoints['polyfills.es5'] = [es5Polyfills];
-    if (!buildOptions.aot) {
-      entryPoints['polyfills.es5'].push(path.join(__dirname, '..', 'es5-jit-polyfills.js'));
-    }
-  }
+  const es5JitPolyfills = path.join(__dirname, '..', 'es5-jit-polyfills.js');
 
-  if (buildOptions.es5BrowserSupport === undefined) {
+  if (targetInFileName) {
+    // For differential loading we don't need to have 2 polyfill bundles
     if (buildOptions.scriptTargetOverride === ts.ScriptTarget.ES2015) {
       entryPoints['polyfills'] = [path.join(__dirname, '..', 'safari-nomodule.js')];
     } else {
       entryPoints['polyfills'] = [es5Polyfills];
       if (!buildOptions.aot) {
-        entryPoints['polyfills'].push(path.join(__dirname, '..', 'es5-jit-polyfills.js'));
+        entryPoints['polyfills'].push(es5JitPolyfills);
+      }
+    }
+  } else {
+    // For NON differential loading we want to have 2 polyfill bundles
+    if (buildOptions.es5BrowserSupport
+      || (buildOptions.es5BrowserSupport === undefined && isEs5SupportNeeded(projectRoot))) {
+      entryPoints['polyfills.es5'] = [es5Polyfills];
+      if (!buildOptions.aot) {
+        entryPoints['polyfills.es5'].push(es5JitPolyfills);
       }
     }
   }
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index 1dbf30b90b01..6473d01c8feb 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -308,7 +308,7 @@
     "es5BrowserSupport": {
       "description": "Enables conditionally loaded ES2015 polyfills.",
       "type": "boolean",
-      "default": false
+      "x-deprecated": "This will be determined from the list of supported browsers specified in the 'browserslist' file."
     },
     "rebaseRootRelativeCssUrls": {
       "description": "Change root relative URLs in stylesheets to include base HREF and deploy URL. Use only for compatibility and transition. The behavior of this option is non-standard and will be removed in the next major release.",
diff --git a/packages/angular_devkit/build_angular/src/utils/index.ts b/packages/angular_devkit/build_angular/src/utils/index.ts
index ba315d3d7339..59247c78baed 100644
--- a/packages/angular_devkit/build_angular/src/utils/index.ts
+++ b/packages/angular_devkit/build_angular/src/utils/index.ts
@@ -8,6 +8,7 @@
 
 export * from './default-progress';
 export * from './delete-output-dir';
+export * from './differential-loading';
 export * from './run-module-as-observable-fork';
 export * from './normalize-file-replacements';
 export * from './normalize-asset-patterns';
diff --git a/tests/legacy-cli/e2e/tests/misc/support-ie.ts b/tests/legacy-cli/e2e/tests/misc/support-ie.ts
index 3ac56cfd4255..6f8782536a7c 100644
--- a/tests/legacy-cli/e2e/tests/misc/support-ie.ts
+++ b/tests/legacy-cli/e2e/tests/misc/support-ie.ts
@@ -1,5 +1,5 @@
 import { oneLineTrim } from 'common-tags';
-import { expectFileNotToExist, expectFileToMatch } from '../../utils/fs';
+import { expectFileNotToExist, expectFileToMatch, writeFile } from '../../utils/fs';
 import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 
@@ -14,6 +14,7 @@ export default async function () {
       appArchitect.build.options.es5BrowserSupport = false;
   });
 
+  await writeFile('browserslist', 'last 2 Chrome versions');
   await ng('build');
   await expectFileNotToExist('dist/test-project/polyfills.es5.js');
   await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
@@ -24,6 +25,7 @@ export default async function () {
     <script src="main.js"></script>
   `);
 
+  await writeFile('browserslist', 'IE 10');
   await ng('build', `--es5BrowserSupport`);
   await expectFileToMatch('dist/test-project/polyfills.es5.js', 'core-js');
   await expectFileToMatch('dist/test-project/index.html', oneLineTrim`

From 77f99b535d4115491cfcea759ab57504433dcaa0 Mon Sep 17 00:00:00 2001
From: Craig Spence <craigspence0@gmail.com>
Date: Tue, 16 Apr 2019 19:38:57 +1200
Subject: [PATCH 1166/1703] feat(@schematics/angular): add lazy module path
 fixer

---
 package.json                                  |  1 +
 packages/schematics/angular/BUILD             |  5 ++
 .../migrations/migration-collection.json      |  5 ++
 .../angular/migrations/update-8/index.ts      |  2 +
 .../update-8/rules/noLazyModulePathsRule.ts   | 54 ++++++++++++
 .../update-8/update-lazy-module-paths.ts      | 30 +++++++
 .../update-8/update-lazy-module-paths_spec.ts | 85 +++++++++++++++++++
 packages/schematics/angular/package.json      |  1 +
 yarn.lock                                     | 16 +++-
 9 files changed, 198 insertions(+), 1 deletion(-)
 create mode 100644 packages/schematics/angular/migrations/update-8/rules/noLazyModulePathsRule.ts
 create mode 100644 packages/schematics/angular/migrations/update-8/update-lazy-module-paths.ts
 create mode 100644 packages/schematics/angular/migrations/update-8/update-lazy-module-paths_spec.ts

diff --git a/package.json b/package.json
index 893335ecff3d..31c87061436b 100644
--- a/package.json
+++ b/package.json
@@ -62,6 +62,7 @@
     ]
   },
   "dependencies": {
+    "@phenomnomnominal/tsquery": "3.0.0",
     "@types/debug": "^4.1.2",
     "@types/node-fetch": "^2.1.6",
     "@types/progress": "^2.0.3",
diff --git a/packages/schematics/angular/BUILD b/packages/schematics/angular/BUILD
index 809ca81cb12e..507b196b67a3 100644
--- a/packages/schematics/angular/BUILD
+++ b/packages/schematics/angular/BUILD
@@ -50,8 +50,10 @@ ts_library(
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:tasks",
         "//packages/schematics/angular/third_party/github.com/Microsoft/TypeScript",
+        "@npm//@phenomnomnominal/tsquery",
         "@npm//@types/node",
         "@npm//rxjs",
+        "@npm//tslint",
     ],
 )
 
@@ -83,12 +85,15 @@ ts_library(
     deps = ALL_SCHEMA_DEPS + [
         ":angular",
         "//packages/angular_devkit/core",
+        "//packages/angular_devkit/core:node_testing",
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:testing",
         "//packages/schematics/angular/third_party/github.com/Microsoft/TypeScript",
+        "@npm//@phenomnomnominal/tsquery",
         "@npm//@types/node",
         "@npm//@types/jasmine",
         "@npm//rxjs",
+        "@npm//tslint",
     ],
     testonly = True,
     # @external_begin
diff --git a/packages/schematics/angular/migrations/migration-collection.json b/packages/schematics/angular/migrations/migration-collection.json
index ec05605cd907..3cd1b2c82c79 100644
--- a/packages/schematics/angular/migrations/migration-collection.json
+++ b/packages/schematics/angular/migrations/migration-collection.json
@@ -34,6 +34,11 @@
       "version": "8.0.0-beta.12",
       "factory": "./update-8",
       "description": "Update an Angular CLI project to version 8."
+    },
+    "migration-08": {
+      "version": "8.0.0-beta.14",
+      "factory": "./update-8/#updateLazyModulePaths",
+      "description": "Update an Angular CLI project to version 8."
     }
   }
 }
diff --git a/packages/schematics/angular/migrations/update-8/index.ts b/packages/schematics/angular/migrations/update-8/index.ts
index 9a5c0cca49d8..2916796169f5 100644
--- a/packages/schematics/angular/migrations/update-8/index.ts
+++ b/packages/schematics/angular/migrations/update-8/index.ts
@@ -14,6 +14,8 @@ import { updatePackageJson, updateTsLintConfig } from './codelyzer-5';
 import { updateES5Projects } from './differential-loading';
 import { dropES2015Polyfills } from './drop-es6-polyfills';
 
+export { updateLazyModulePaths } from './update-lazy-module-paths';
+
 export default function(): Rule {
   return () => {
     return chain([
diff --git a/packages/schematics/angular/migrations/update-8/rules/noLazyModulePathsRule.ts b/packages/schematics/angular/migrations/update-8/rules/noLazyModulePathsRule.ts
new file mode 100644
index 000000000000..24ef937cf9d0
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-8/rules/noLazyModulePathsRule.ts
@@ -0,0 +1,54 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { tsquery } from '@phenomnomnominal/tsquery';
+import {
+    Replacement,
+    RuleFailure,
+    Rules,
+} from 'tslint'; // tslint:disable-line:no-implicit-dependencies
+import * as ts from '../../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
+
+ // Constants:
+const LOAD_CHILDREN_SPLIT = '#';
+const NOT_CHILDREN_QUERY = `:not(:has(Identifier[name="children"]))`;
+const HAS_LOAD_CHILDREN_QUERY = `:has(Identifier[name="loadChildren"])`;
+const LAZY_VALUE_QUERY = `StringLiteral[value=/.*${LOAD_CHILDREN_SPLIT}.*/]`;
+const LOAD_CHILDREN_ASSIGNMENT_QUERY =
+  `PropertyAssignment${NOT_CHILDREN_QUERY}${HAS_LOAD_CHILDREN_QUERY}:has(${LAZY_VALUE_QUERY})`;
+
+const FAILURE_MESSAGE = 'Found magic `loadChildren` string. Use a function with `import` instead.';
+
+export class Rule extends Rules.AbstractRule {
+  public apply (ast: ts.SourceFile): Array<RuleFailure> {
+    return tsquery(ast, LOAD_CHILDREN_ASSIGNMENT_QUERY).map(result => {
+      const [valueNode] = tsquery(result, LAZY_VALUE_QUERY);
+      let fix = this._promiseReplacement(valueNode.text);
+
+      // Try to fix indentation in replacement:
+      const { character } = ast.getLineAndCharacterOfPosition(result.getStart());
+      fix = fix.replace(/\n/g, `\n${' '.repeat(character)}`);
+
+      const replacement = new Replacement(valueNode.getStart(), valueNode.getWidth(), fix);
+      const start = result.getStart();
+      const end = result.getEnd();
+
+      return new RuleFailure(ast, start, end, FAILURE_MESSAGE, this.ruleName, replacement);
+    });
+  }
+
+  private _promiseReplacement (loadChildren: string): string {
+    const [path, moduleName] = this._getChunks(loadChildren);
+
+    return `() => import('${path}').then(m => m.${moduleName})`;
+  }
+
+  private _getChunks (loadChildren: string): Array<string> {
+    return loadChildren.split(LOAD_CHILDREN_SPLIT);
+  }
+}
diff --git a/packages/schematics/angular/migrations/update-8/update-lazy-module-paths.ts b/packages/schematics/angular/migrations/update-8/update-lazy-module-paths.ts
new file mode 100644
index 000000000000..4a524b2326f3
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-8/update-lazy-module-paths.ts
@@ -0,0 +1,30 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import {
+  Rule,
+  SchematicContext,
+  Tree,
+} from '@angular-devkit/schematics';
+import {
+  TslintFixTask,
+} from '@angular-devkit/schematics/tasks';
+import * as path from 'path';
+
+export const updateLazyModulePaths = (): Rule => {
+  return (_: Tree, context: SchematicContext) => {
+    context.addTask(new TslintFixTask({
+      rulesDirectory: path.join(__dirname, 'rules'),
+      rules: {
+        'no-lazy-module-paths': [true],
+      },
+    }, {
+      includes: '**/*.ts',
+      silent: false,
+    }));
+  };
+};
diff --git a/packages/schematics/angular/migrations/update-8/update-lazy-module-paths_spec.ts b/packages/schematics/angular/migrations/update-8/update-lazy-module-paths_spec.ts
new file mode 100644
index 000000000000..22f6ca921f94
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-8/update-lazy-module-paths_spec.ts
@@ -0,0 +1,85 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { getSystemPath, normalize, virtualFs } from '@angular-devkit/core';
+import { TempScopedNodeJsSyncHost } from '@angular-devkit/core/node/testing';
+import { HostTree } from '@angular-devkit/schematics';
+import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+
+describe('Migration to version 8', () => {
+  const schematicRunner = new SchematicTestRunner(
+    'migrations',
+    require.resolve('../migration-collection.json'),
+  );
+
+  let tree: UnitTestTree;
+  let host: TempScopedNodeJsSyncHost;
+
+  const lazyRoutePath = normalize('src/lazy-route.ts');
+  const lazyRoute = virtualFs.stringToFileBuffer(`
+    import { Route } from '@angular/router';
+    const routes: Array<Route> = [
+      {
+        path: '',
+        loadChildren: './lazy/lazy.module#LazyModule'
+      }
+    ];
+  `);
+
+  const lazyChildRoute = virtualFs.stringToFileBuffer(`
+    import { Route } from '@angular/router';
+    const routes: Array<Route> = [
+      {
+        path: '',
+        children: [{
+          path: 'child',
+          loadChildren: './lazy/lazy.module#LazyModule'
+        }]
+      }
+    ];
+  `);
+
+  describe('Migration to import() style lazy routes', () => {
+    beforeEach(async () => {
+      host = new TempScopedNodeJsSyncHost();
+      tree = new UnitTestTree(new HostTree(host));
+      tree.create('/package.json', JSON.stringify({}));
+      process.chdir(getSystemPath(host.root));
+    });
+
+    it('should replace the module path string', async () => {
+      await host.write(lazyRoutePath, lazyRoute).toPromise();
+
+      schematicRunner.runSchematic('migration-08', {}, tree);
+      await schematicRunner.engine.executePostTasks().toPromise();
+
+      const routes = await host.read(lazyRoutePath)
+        .toPromise()
+        .then(virtualFs.fileBufferToString);
+
+      expect(routes).not.toContain('./lazy/lazy.module#LazyModule');
+      expect(routes).toContain(
+        `loadChildren: () => import('./lazy/lazy.module').then(m => m.LazyModule)`);
+    });
+
+    it('should replace the module path string in a child path', async () => {
+      await host.write(lazyRoutePath, lazyChildRoute).toPromise();
+
+      schematicRunner.runSchematic('migration-08', {}, tree);
+      await schematicRunner.engine.executePostTasks().toPromise();
+
+      const routes = await host.read(lazyRoutePath)
+        .toPromise()
+        .then(virtualFs.fileBufferToString);
+
+      expect(routes).not.toContain('./lazy/lazy.module#LazyModule');
+
+      expect(routes).toContain(
+        `loadChildren: () => import('./lazy/lazy.module').then(m => m.LazyModule)`);
+    });
+  });
+});
diff --git a/packages/schematics/angular/package.json b/packages/schematics/angular/package.json
index 783b2a424160..e1291b75a864 100644
--- a/packages/schematics/angular/package.json
+++ b/packages/schematics/angular/package.json
@@ -9,6 +9,7 @@
   ],
   "schematics": "./collection.json",
   "dependencies": {
+    "@phenomnomnominal/tsquery": "3.0.0",
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0"
   }
diff --git a/yarn.lock b/yarn.lock
index 483eb9ae4e17..5539e09be698 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -221,6 +221,13 @@
   resolved "https://registry.yarnpkg.com/@ngtools/json-schema/-/json-schema-1.1.0.tgz#c3a0c544d62392acc2813a42c8a0dc6f58f86922"
   integrity sha1-w6DFRNYjkqzCgTpCyKDcb1j4aSI=
 
+"@phenomnomnominal/tsquery@3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@phenomnomnominal/tsquery/-/tsquery-3.0.0.tgz#6f2f4dbf6304ff52b12cc7a5b979f20c3794a22a"
+  integrity sha512-SW8lKitBHWJ9fAYkJ9kJivuctwNYCh3BUxLdH0+XiR1GPBiu+7qiZzh8p8jqlj1LgVC1TbvfNFroaEsmYlL8Iw==
+  dependencies:
+    esquery "^1.0.1"
+
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
@@ -3341,6 +3348,13 @@ esprima@^4.0.0:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
+esquery@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
+  integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
+  dependencies:
+    estraverse "^4.0.0"
+
 esrecurse@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
@@ -3353,7 +3367,7 @@ estraverse@^1.9.1:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
   integrity sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=
 
-estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
+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"
   integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=

From 609041815e237ef9dc08066d2c05f02b3b6138dd Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 16 Apr 2019 05:23:30 +0000
Subject: [PATCH 1167/1703] build: update webpack to version 4.30.0

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 packages/angular_devkit/build_webpack/package.json | 2 +-
 packages/ngtools/webpack/package.json              | 2 +-
 yarn.lock                                          | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 2721df0aec8b..083073eb74b1 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -49,7 +49,7 @@
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.2.3",
-    "webpack": "4.29.6",
+    "webpack": "4.30.0",
     "webpack-dev-middleware": "3.6.2",
     "webpack-dev-server": "3.3.1",
     "webpack-merge": "4.2.1",
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index 5955a9c71bed..afe552ec44b9 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -17,7 +17,7 @@
     "webpack-dev-server": "^3.1.4"
   },
   "devDependencies": {
-    "webpack": "4.29.6",
+    "webpack": "4.30.0",
     "webpack-dev-server": "^3.1.4"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index fe11494d4115..bd91d21eae1f 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -36,6 +36,6 @@
     "@angular/compiler": "^8.0.0-beta.12",
     "@angular/compiler-cli": "^8.0.0-beta.12",
     "typescript": "3.4.3",
-    "webpack": "4.29.6"
+    "webpack": "4.30.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 5539e09be698..8110374dd327 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9989,10 +9989,10 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.29.6:
-  version "4.29.6"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.6.tgz#66bf0ec8beee4d469f8b598d3988ff9d8d90e955"
-  integrity sha512-MwBwpiE1BQpMDkbnUUaW6K8RFZjljJHArC6tWQJoFm0oQtfoSebtg4Y7/QHnJ/SddtjYLHaKGX64CFjG5rehJw==
+webpack@4.30.0:
+  version "4.30.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.30.0.tgz#aca76ef75630a22c49fcc235b39b4c57591d33a9"
+  integrity sha512-4hgvO2YbAFUhyTdlR4FNyt2+YaYBYHavyzjCMbZzgglo02rlKi/pcsEzwCuCpsn1ryzIl1cq/u8ArIKu8JBYMg==
   dependencies:
     "@webassemblyjs/ast" "1.8.5"
     "@webassemblyjs/helper-module-context" "1.8.5"

From 5b4d1302bd511c01b081109d6b8ee4f0adf51feb Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 16 Apr 2019 10:36:52 +0000
Subject: [PATCH 1168/1703] build: update inquirer to version 6.3.1

---
 packages/angular/cli/package.json             |  2 +-
 .../schematics_cli/package.json               |  2 +-
 yarn.lock                                     | 28 +++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index c29e00e9bd28..d2117177c907 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -33,7 +33,7 @@
     "@yarnpkg/lockfile": "1.1.0",
     "debug": "^4.1.1",
     "ini": "1.3.5",
-    "inquirer": "6.2.2",
+    "inquirer": "6.3.1",
     "npm-package-arg": "6.1.0",
     "open": "6.1.0",
     "pacote": "9.5.0",
diff --git a/packages/angular_devkit/schematics_cli/package.json b/packages/angular_devkit/schematics_cli/package.json
index 9facb128eea8..b4ae081ed575 100644
--- a/packages/angular_devkit/schematics_cli/package.json
+++ b/packages/angular_devkit/schematics_cli/package.json
@@ -18,7 +18,7 @@
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
     "@schematics/schematics": "0.0.0",
-    "inquirer": "6.2.2",
+    "inquirer": "6.3.1",
     "minimist": "1.2.0",
     "rxjs": "6.4.0",
     "symbol-observable": "1.2.0"
diff --git a/yarn.lock b/yarn.lock
index 8110374dd327..cca55ff49eab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -963,10 +963,10 @@ ansi-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
   integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
-ansi-regex@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
-  integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==
+ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
 ansi-styles@^2.2.1:
   version "2.2.1"
@@ -4624,10 +4624,10 @@ injection-js@^2.2.1:
   resolved "https://registry.yarnpkg.com/injection-js/-/injection-js-2.2.1.tgz#a8d6a085b2f0b8d8650f6f4487f6abb8cc0d67ce"
   integrity sha512-zHI+E+dM0PXix5FFTO1Y4/UOyAzE7zG1l/QwAn4jchTThOoBq+UYRFK4AVG7lQgFL+go62SbrzSsjXy9DFEZUg==
 
-inquirer@6.2.2:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.2.tgz#46941176f65c9eb20804627149b743a218f25406"
-  integrity sha512-Z2rREiXA6cHRR9KBOarR3WuLlFzlIfAEIiB45ll5SSadMg7WqOh1MKEjjndfuH5ewXdixWCxqnVfGOQzPeiztA==
+inquirer@6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.3.1.tgz#7a413b5e7950811013a3db491c61d1f3b776e8e7"
+  integrity sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==
   dependencies:
     ansi-escapes "^3.2.0"
     chalk "^2.4.2"
@@ -4640,7 +4640,7 @@ inquirer@6.2.2:
     run-async "^2.2.0"
     rxjs "^6.4.0"
     string-width "^2.1.0"
-    strip-ansi "^5.0.0"
+    strip-ansi "^5.1.0"
     through "^2.3.6"
 
 internal-ip@^3.0.1:
@@ -9108,12 +9108,12 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
-  integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==
+strip-ansi@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
   dependencies:
-    ansi-regex "^4.0.0"
+    ansi-regex "^4.1.0"
 
 strip-bom@^2.0.0:
   version "2.0.0"

From 71ac097affd4478480bb42237308b20adfe3f88b Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 16 Apr 2019 00:33:06 -0400
Subject: [PATCH 1169/1703] refactor(@angular-devkit/build-angular):
 standardize builder exports

---
 .../build_angular/src/dev-server/index.ts     | 20 +++++------
 .../angular_devkit/build_angular/src/index.ts | 36 +++++++++++++------
 .../build_angular/src/karma/index.ts          |  2 +-
 .../build_angular/src/server/index.ts         | 10 +++---
 4 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index 4413bc34d056..92cc630ee613 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -36,9 +36,9 @@ import { normalizeOptimization } from '../utils';
 import { Schema } from './schema';
 const open = require('open');
 
-export type DevServerBuilderSchema = Schema & json.JsonObject;
+export type DevServerBuilderOptions = Schema & json.JsonObject;
 
-export const devServerBuildOverriddenKeys: (keyof DevServerBuilderSchema)[] = [
+export const devServerBuildOverriddenKeys: (keyof DevServerBuilderOptions)[] = [
   'watch',
   'optimization',
   'aot',
@@ -72,7 +72,7 @@ export type ServerConfigTransformFn = (
  *     transforming webpack configuration before passing it to webpack).
  */
 export function serveWebpackBrowser(
-  options: DevServerBuilderSchema,
+  options: DevServerBuilderOptions,
   context: BuilderContext,
   transforms: {
     webpackConfiguration?: ExecutionTransformer<webpack.Configuration>,
@@ -98,7 +98,7 @@ export function serveWebpackBrowser(
     const rawBrowserOptions = await context.getTargetOptions(browserTarget);
 
     // Override options we need to override, if defined.
-    const overrides = (Object.keys(options) as (keyof DevServerBuilderSchema)[])
+    const overrides = (Object.keys(options) as (keyof DevServerBuilderOptions)[])
     .filter(key => options[key] !== undefined && devServerBuildOverriddenKeys.includes(key))
     .reduce<json.JsonObject & Partial<BrowserBuilderSchema>>((previous, key) => ({
       ...previous,
@@ -227,7 +227,7 @@ export function serveWebpackBrowser(
  */
 export function buildServerConfig(
   workspaceRoot: string,
-  serverOptions: DevServerBuilderSchema,
+  serverOptions: DevServerBuilderOptions,
   browserOptions: BrowserBuilderSchema,
   logger: logging.LoggerApi,
 ): WebpackDevServer.Configuration {
@@ -301,7 +301,7 @@ export function buildServerConfig(
  * @param logger A generic logger to use for showing warnings.
  */
 export function buildServePath(
-  serverOptions: DevServerBuilderSchema,
+  serverOptions: DevServerBuilderOptions,
   browserOptions: BrowserBuilderSchema,
   logger: logging.LoggerApi,
 ): string {
@@ -332,7 +332,7 @@ export function buildServePath(
  * @private
  */
 function _addLiveReload(
-  options: DevServerBuilderSchema,
+  options: DevServerBuilderOptions,
   browserOptions: BrowserBuilderSchema,
   webpackConfig: webpack.Configuration,
   clientAddress: url.UrlWithStringQuery,
@@ -400,7 +400,7 @@ function _addLiveReload(
  */
 function _addSslConfig(
   root: string,
-  options: DevServerBuilderSchema,
+  options: DevServerBuilderOptions,
   config: WebpackDevServer.Configuration,
 ) {
   let sslKey: string | undefined = undefined;
@@ -433,7 +433,7 @@ function _addSslConfig(
  */
 function _addProxyConfig(
   root: string,
-  options: DevServerBuilderSchema,
+  options: DevServerBuilderOptions,
   config: WebpackDevServer.Configuration,
 ) {
   let proxyConfig = {};
@@ -488,4 +488,4 @@ function _findDefaultServePath(baseHref?: string, deployUrl?: string): string |
 }
 
 
-export default createBuilder<DevServerBuilderSchema, DevServerBuilderOutput>(serveWebpackBrowser);
+export default createBuilder<DevServerBuilderOptions, DevServerBuilderOutput>(serveWebpackBrowser);
diff --git a/packages/angular_devkit/build_angular/src/index.ts b/packages/angular_devkit/build_angular/src/index.ts
index 6599e83eba7a..0b0b1d7e2772 100644
--- a/packages/angular_devkit/build_angular/src/index.ts
+++ b/packages/angular_devkit/build_angular/src/index.ts
@@ -12,9 +12,9 @@
 // See https://github.com/angular/angular-cli/issues/9691#issuecomment-367322703 for details.
 // We need to add a require here to satisfy the dependency checker.
 // require('ajv');
+
 export * from './transforms';
-export * from './app-shell';
-export * from './browser';
+
 export {
   AssetPattern,
   AssetPatternClass as AssetPatternObject,
@@ -25,16 +25,32 @@ export {
   OptimizationClass as OptimizationObject,
   OptimizationUnion,
   OutputHashing,
-  Schema as BrowserBuilderSchema,
+  Schema as BrowserBuilderOptions,
   SourceMapClass as SourceMapObject,
   SourceMapUnion,
   StylePreprocessorOptions,
   Type,
 } from './browser/schema';
-export * from './dev-server';
-export * from './extract-i18n';
-export * from './karma';
-export * from './karma/schema';
-export * from './protractor';
-export { execute as executeServerBuilder } from './server';
-export * from './tslint';
+
+export {
+  buildWebpackBrowser as executeBrowserBuilder,
+  BrowserBuilderOutput,
+} from './browser';
+
+export {
+  serveWebpackBrowser as executeDevServerBuilder,
+  DevServerBuilderOptions,
+  DevServerBuilderOutput,
+} from './dev-server';
+
+export {
+  execute as executeKarmaBuilder,
+  KarmaBuilderOptions,
+  KarmaConfigOptions,
+} from './karma';
+
+export {
+  execute as executeServerBuilder,
+  ServerBuilderOptions,
+  ServerBuilderOutput,
+} from './server';
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index 05cbad6f29a0..c4611b0ef36f 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -23,7 +23,7 @@ import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browse
 import { Schema as KarmaBuilderOptions } from './schema';
 
 // tslint:disable-next-line:no-implicit-dependencies
-type KarmaConfigOptions = import ('karma').ConfigOptions & {
+export type KarmaConfigOptions = import ('karma').ConfigOptions & {
   buildWebpack?: unknown;
   configFile?: string;
 };
diff --git a/packages/angular_devkit/build_angular/src/server/index.ts b/packages/angular_devkit/build_angular/src/server/index.ts
index 993f451e5a1f..97efd4dc1717 100644
--- a/packages/angular_devkit/build_angular/src/server/index.ts
+++ b/packages/angular_devkit/build_angular/src/server/index.ts
@@ -25,15 +25,17 @@ import {
 import { ExecutionTransformer } from '../transforms';
 import { NormalizedBrowserBuilderSchema, deleteOutputDir } from '../utils';
 import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
-import { Schema as BuildWebpackServerOptions } from './schema';
+import { Schema as ServerBuilderOptions } from './schema';
 
 // If success is true, outputPath should be set.
 export type ServerBuilderOutput = json.JsonObject & BuilderOutput & {
   outputPath?: string;
 };
 
+export { ServerBuilderOptions };
+
 export function execute(
-  options: BuildWebpackServerOptions,
+  options: ServerBuilderOptions,
   context: BuilderContext,
   transforms: {
     webpackConfiguration?: ExecutionTransformer<webpack.Configuration>;
@@ -67,7 +69,7 @@ export function execute(
   );
 }
 
-export default createBuilder<json.JsonObject & BuildWebpackServerOptions, ServerBuilderOutput>(
+export default createBuilder<json.JsonObject & ServerBuilderOptions, ServerBuilderOutput>(
   execute,
 );
 
@@ -80,7 +82,7 @@ function getCompilerConfig(wco: WebpackConfigOptions) {
 }
 
 async function buildServerWebpackConfig(
-  options: BuildWebpackServerOptions,
+  options: ServerBuilderOptions,
   context: BuilderContext,
 ) {
   const { config } = await generateBrowserWebpackConfigFromContext(

From dac0323886d7f037699ad8e807dd701e83216759 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 16 Apr 2019 07:25:26 +0000
Subject: [PATCH 1170/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 978be3a15645..e34f95c23017 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#dbaa3a5426835dbb767a674e5a8989383eb29e69",
-    "@angular/common": "github:angular/common-builds#a1e7ac081624a90244b3d419fa601f6b37cc87ef",
-    "@angular/compiler": "github:angular/compiler-builds#afec4e81443e3087a1a5fbd0299c77968eb7760f",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#b1dfb9cac3d0877f1214d429a5a0d8b65157f5be",
-    "@angular/core": "github:angular/core-builds#78799a1f9ea4ba04e203f6c0e9ac54c466c43b36",
-    "@angular/forms": "github:angular/forms-builds#7f8a43e5fd234a61b8ca3ee0109c809a4f3b0b3f",
-    "@angular/language-service": "github:angular/language-service-builds#110e5d74ac3aa7c3504d08876a1d2ef086dbfb96",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#eec7fde945faf2c3e03dc1217ec70daa62d18230",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#1d19fdce5909bb9c4ae2b6fcb9b38aa43e0abda5",
-    "@angular/router": "github:angular/router-builds#1f4472da7d29fde72a2ffd46761c0dad092eefe9"
+    "@angular/animations": "github:angular/animations-builds#01733fc3bedfe8754c9989e031b69a894c4a48dd",
+    "@angular/common": "github:angular/common-builds#04aab6000cb6d2634ec370b3679410a66f2d905c",
+    "@angular/compiler": "github:angular/compiler-builds#456f2c9abb14fba57d665f54d35cc2ef7c23236e",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#f25bd97b28eb67996da95b79362eb9e17bd68354",
+    "@angular/core": "github:angular/core-builds#b3aed1916744bbfb58216ca16a4342156146ae53",
+    "@angular/forms": "github:angular/forms-builds#1d14eec06d5f0541cc5dcc1b668cd40c7553d47f",
+    "@angular/language-service": "github:angular/language-service-builds#f8940edf04e99bc9db2482c04f8226c016003771",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#84ba7cacd7e79d3a8b27c9c28d8beff66bad0f67",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#548dc5a2b2c5b3bfb80a14cb709a810589a7a573",
+    "@angular/router": "github:angular/router-builds#935125d8ec3b4d1b0b2c5022e673434d41a52e79"
   }
 }
\ No newline at end of file

From 403579b02057052ae8b76ace63efbfafedc4bfc3 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 16 Apr 2019 05:23:17 +0000
Subject: [PATCH 1171/1703] build: update karma to version ~4.1.0

---
 package.json                                  |  2 +-
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 65 +++----------------
 3 files changed, 11 insertions(+), 58 deletions(-)

diff --git a/package.json b/package.json
index 31c87061436b..b79247013d33 100644
--- a/package.json
+++ b/package.json
@@ -112,7 +112,7 @@
     "istanbul": "^0.4.5",
     "jasmine": "^3.3.1",
     "jasmine-spec-reporter": "^4.2.1",
-    "karma": "~4.0.1",
+    "karma": "~4.1.0",
     "karma-jasmine": "^2.0.1",
     "karma-jasmine-html-reporter": "^1.4.0",
     "license-checker": "^20.1.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 083073eb74b1..7b7f8c8b0e9c 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -76,7 +76,7 @@
     "jquery": "^3.3.1",
     "jasmine-core": "~3.4.0",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~4.0.0",
+    "karma": "~4.1.0",
     "karma-chrome-launcher": "~2.2.0",
     "karma-coverage-istanbul-reporter": "~2.0.0",
     "karma-jasmine": "~2.0.1",
diff --git a/yarn.lock b/yarn.lock
index cca55ff49eab..d4bba24ee49e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1077,11 +1077,6 @@ array-ify@^1.0.0:
   resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
   integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=
 
-array-slice@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
-  integrity sha1-3Tz7gO15c6dRF82sabC5nshhhvU=
-
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
@@ -1486,13 +1481,6 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^0.1.2:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-0.1.5.tgz#c085711085291d8b75fdd74eab0f8597280711e6"
-  integrity sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=
-  dependencies:
-    expand-range "^0.1.0"
-
 braces@^1.8.2:
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
@@ -2165,13 +2153,6 @@ colour@~0.7.1:
   resolved "https://registry.yarnpkg.com/colour/-/colour-0.7.1.tgz#9cb169917ec5d12c0736d3e8685746df1cadf778"
   integrity sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=
 
-combine-lists@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/combine-lists/-/combine-lists-1.0.1.tgz#458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"
-  integrity sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=
-  dependencies:
-    lodash "^4.5.0"
-
 combined-stream@1.0.6, combined-stream@~1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
@@ -3461,15 +3442,6 @@ exit@^0.1.2:
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
   integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
-expand-braces@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea"
-  integrity sha1-SIsdHSRRyz06axks/AMPRMWFX+o=
-  dependencies:
-    array-slice "^0.2.3"
-    array-unique "^0.2.1"
-    braces "^0.1.2"
-
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
@@ -3490,14 +3462,6 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expand-range@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-0.1.1.tgz#4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"
-  integrity sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=
-  dependencies:
-    is-number "^0.1.1"
-    repeat-string "^0.2.2"
-
 expand-range@^1.8.1:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
@@ -4892,11 +4856,6 @@ is-npm@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
   integrity sha1-8vtjpl5JBbQGyGBydloaTceTufQ=
 
-is-number@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806"
-  integrity sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=
-
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
@@ -5434,7 +5393,7 @@ karma-sourcemap-loader@0.3.7:
   dependencies:
     graceful-fs "^4.1.2"
 
-karma@^4.0.0, karma@~4.0.1:
+karma@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/karma/-/karma-4.0.1.tgz#2581d6caa0d4cd28b65131561b47bad6d5478773"
   integrity sha512-ind+4s03BqIXas7ZmraV3/kc5+mnqwCd+VDX1FndS6jxbt03kQKX2vXrWxNLuCjVYmhMwOZosAEKMM0a2q7w7A==
@@ -5467,28 +5426,27 @@ karma@^4.0.0, karma@~4.0.1:
     tmp "0.0.33"
     useragent "2.3.0"
 
-karma@~4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-4.0.0.tgz#f28e38a2b66243fde3f98e12a8dcaa2c6ff8ca9c"
-  integrity sha512-EFoFs3F6G0BcUGPNOn/YloGOb3h09hzTguyXlg6loHlKY76qbJikkcyPk43m2kfRF65TUGda/mig29QQtyhm1g==
+karma@~4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-4.1.0.tgz#d07387c9743a575b40faf73e8a3eb5421c2193e1"
+  integrity sha512-xckiDqyNi512U4dXGOOSyLKPwek6X/vUizSy2f3geYevbLj+UIdvNwbn7IwfUIL2g1GXEPWt/87qFD1fBbl/Uw==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
+    braces "^2.3.2"
     chokidar "^2.0.3"
     colors "^1.1.0"
-    combine-lists "^1.0.0"
     connect "^3.6.0"
     core-js "^2.2.0"
     di "^0.0.1"
     dom-serialize "^2.2.0"
-    expand-braces "^0.1.1"
     flatted "^2.0.0"
     glob "^7.1.1"
     graceful-fs "^4.1.2"
     http-proxy "^1.13.0"
     isbinaryfile "^3.0.0"
-    lodash "^4.17.5"
-    log4js "^3.0.0"
+    lodash "^4.17.11"
+    log4js "^4.0.0"
     mime "^2.3.1"
     minimatch "^3.0.2"
     optimist "^0.6.1"
@@ -5779,7 +5737,7 @@ lodash@^4.16.6, lodash@^4.17.11, lodash@^4.17.5:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
-lodash@^4.17.10, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.5.0:
+lodash@^4.17.10, lodash@^4.17.4, lodash@^4.2.1:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
   integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==
@@ -7947,11 +7905,6 @@ repeat-element@^1.1.2:
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
   integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
-repeat-string@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae"
-  integrity sha1-x6jTI2BoNiBZp+RlH8aITosftK4=
-
 repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"

From 0d235e1ef4e5b8327984d2cf6179a11bd39184db Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 16 Apr 2019 08:18:59 +0200
Subject: [PATCH 1172/1703] feat(@schematics/angular): update `karma` to
 `4.1.x`

---
 .../schematics/angular/workspace/files/package.json.template    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/workspace/files/package.json.template b/packages/schematics/angular/workspace/files/package.json.template
index d86ff787f29b..5dd09ebeaf5c 100644
--- a/packages/schematics/angular/workspace/files/package.json.template
+++ b/packages/schematics/angular/workspace/files/package.json.template
@@ -33,7 +33,7 @@
     "codelyzer": "^5.0.0",
     "jasmine-core": "~3.4.0",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~4.0.1",
+    "karma": "~4.1.0",
     "karma-chrome-launcher": "~2.2.0",
     "karma-coverage-istanbul-reporter": "~2.0.1",
     "karma-jasmine": "~2.0.1",

From db3af22140d3c46152eecfc81be41386c7abb79a Mon Sep 17 00:00:00 2001
From: Minko Gechev <mgechev@google.com>
Date: Tue, 16 Apr 2019 12:20:08 +0200
Subject: [PATCH 1173/1703] fix(@angular-devkit/architect): set proper name in
 TestingArchitectHost

The TestingArchitectHost registers the builders only using their name,
ignoring the package name. Later, when Architect looks up the builder
using the host, it's unable to find it.

You can find a reproduction
[here](https://github.com/mgechev/cli-builders-demo).
---
 .../architect/testing/testing-architect-host.ts             | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/architect/testing/testing-architect-host.ts b/packages/angular_devkit/architect/testing/testing-architect-host.ts
index 0eeb068b353c..ae2f818ef904 100644
--- a/packages/angular_devkit/architect/testing/testing-architect-host.ts
+++ b/packages/angular_devkit/architect/testing/testing-architect-host.ts
@@ -41,6 +41,10 @@ export class TestingArchitectHost implements ArchitectHost {
       throw new Error('Invalid package.json, builders key not found.');
     }
 
+    if (!packageJson.name) {
+      throw new Error('Invalid package name');
+    }
+
     const builderJsonPath = packageName + '/' + packageJson['builders'];
     const builderJson = await import(builderJsonPath);
     const builders = builderJson['builders'];
@@ -54,7 +58,7 @@ export class TestingArchitectHost implements ArchitectHost {
       if (!b.implementation) { continue; }
       const handler = await import(builderJsonPath + '/../' + b.implementation);
       const optionsSchema = await import(builderJsonPath + '/../' + b.schema);
-      this.addBuilder(builderName, handler, b.description, optionsSchema);
+      this.addBuilder(`${packageJson.name}:${builderName}`, handler, b.description, optionsSchema);
     }
   }
   addTarget(target: Target, builderName: string, options: json.JsonObject = {}) {

From 1d15dbcfc1389979ec95806111cc8fc5dcdef36d Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 15 Apr 2019 20:28:18 -0400
Subject: [PATCH 1174/1703] refactor(@schematics/angular): update pipe to use
 new workspace rules

---
 packages/schematics/angular/pipe/index.ts     | 11 ++---
 .../schematics/angular/pipe/index_spec.ts     | 45 ++++++++++---------
 2 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/packages/schematics/angular/pipe/index.ts b/packages/schematics/angular/pipe/index.ts
index 24ea22e47d35..54b09cb0a2dd 100644
--- a/packages/schematics/angular/pipe/index.ts
+++ b/packages/schematics/angular/pipe/index.ts
@@ -25,7 +25,7 @@ import { InsertChange } from '../utility/change';
 import { buildRelativePath, findModuleFromOptions } from '../utility/find-module';
 import { applyLintFix } from '../utility/lint-fix';
 import { parseName } from '../utility/parse-name';
-import { buildDefaultPath, getProject } from '../utility/project';
+import { createDefaultPath } from '../utility/workspace';
 import { Schema as PipeOptions } from './schema';
 
 
@@ -85,14 +85,9 @@ function addDeclarationToNgModule(options: PipeOptions): Rule {
 }
 
 export default function (options: PipeOptions): Rule {
-  return (host: Tree) => {
-    if (!options.project) {
-      throw new SchematicsException('Option (project) is required.');
-    }
-    const project = getProject(host, options.project);
-
+  return async (host: Tree) => {
     if (options.path === undefined) {
-      options.path = buildDefaultPath(project);
+      options.path = await createDefaultPath(host, options.project as string);
     }
 
     options.module = findModuleFromOptions(host, options);
diff --git a/packages/schematics/angular/pipe/index_spec.ts b/packages/schematics/angular/pipe/index_spec.ts
index 88667807e321..70c7b171b3f7 100644
--- a/packages/schematics/angular/pipe/index_spec.ts
+++ b/packages/schematics/angular/pipe/index_spec.ts
@@ -41,15 +41,16 @@ describe('Pipe Schematic', () => {
     skipPackageJson: false,
   };
   let appTree: UnitTestTree;
-  beforeEach(() => {
+  beforeEach(async () => {
     appTree = schematicRunner.runSchematic('workspace', workspaceOptions);
-    appTree = schematicRunner.runSchematic('application', appOptions, appTree);
+    appTree = await schematicRunner.runSchematicAsync('application', appOptions, appTree)
+      .toPromise();
   });
 
-  it('should create a pipe', () => {
+  it('should create a pipe', async () => {
     const options = { ...defaultOptions };
 
-    const tree = schematicRunner.runSchematic('pipe', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('pipe', options, appTree).toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo.pipe.spec.ts');
     expect(files).toContain('/projects/bar/src/app/foo.pipe.ts');
@@ -58,52 +59,52 @@ describe('Pipe Schematic', () => {
     expect(moduleContent).toMatch(/declarations:\s*\[[^\]]+?,\r?\n\s+FooPipe\r?\n/m);
   });
 
-  it('should import into a specified module', () => {
+  it('should import into a specified module', async () => {
     const options = { ...defaultOptions, module: 'app.module.ts' };
 
-    const tree = schematicRunner.runSchematic('pipe', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('pipe', options, appTree).toPromise();
     const appModule = getFileContent(tree, '/projects/bar/src/app/app.module.ts');
 
     expect(appModule).toMatch(/import { FooPipe } from '.\/foo.pipe'/);
   });
 
-  it('should fail if specified module does not exist', () => {
+  it('should fail if specified module does not exist', async () => {
     const options = { ...defaultOptions, module: '/projects/bar/src/app/app.moduleXXX.ts' };
     let thrownError: Error | null = null;
     try {
-      schematicRunner.runSchematic('pipe', options, appTree);
+      await schematicRunner.runSchematicAsync('pipe', options, appTree).toPromise();
     } catch (err) {
       thrownError = err;
     }
     expect(thrownError).toBeDefined();
   });
 
-  it('should handle a path in the name and module options', () => {
-    appTree = schematicRunner.runSchematic(
+  it('should handle a path in the name and module options', async () => {
+    appTree = await schematicRunner.runSchematicAsync(
       'module',
       { name: 'admin/module', project: 'bar' },
       appTree,
-    );
+    ).toPromise();
 
     const options = { ...defaultOptions, module: 'admin/module' };
-    appTree = schematicRunner.runSchematic('pipe', options, appTree);
+    appTree = await schematicRunner.runSchematicAsync('pipe', options, appTree).toPromise();
 
     const content = appTree.readContent('/projects/bar/src/app/admin/module/module.module.ts');
     expect(content).toMatch(/import { FooPipe } from '\.\.\/\.\.\/foo.pipe'/);
   });
 
-  it('should export the pipe', () => {
+  it('should export the pipe', async () => {
     const options = { ...defaultOptions, export: true };
 
-    const tree = schematicRunner.runSchematic('pipe', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('pipe', options, appTree).toPromise();
     const appModuleContent = getFileContent(tree, '/projects/bar/src/app/app.module.ts');
     expect(appModuleContent).toMatch(/exports: \[FooPipe\]/);
   });
 
-  it('should respect the flat flag', () => {
+  it('should respect the flat flag', async () => {
     const options = { ...defaultOptions, flat: false };
 
-    const tree = schematicRunner.runSchematic('pipe', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('pipe', options, appTree).toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo/foo.pipe.spec.ts');
     expect(files).toContain('/projects/bar/src/app/foo/foo.pipe.ts');
@@ -112,27 +113,29 @@ describe('Pipe Schematic', () => {
     expect(moduleContent).toMatch(/declarations:\s*\[[^\]]+?,\r?\n\s+FooPipe\r?\n/m);
   });
 
-  it('should use the module flag even if the module is a routing module', () => {
+  it('should use the module flag even if the module is a routing module', async () => {
     const routingFileName = 'app-routing.module.ts';
     const routingModulePath = `/projects/bar/src/app/${routingFileName}`;
     const newTree = createAppModule(appTree, routingModulePath);
     const options = { ...defaultOptions, module: routingFileName };
-    const tree = schematicRunner.runSchematic('pipe', options, newTree);
+    const tree = await schematicRunner.runSchematicAsync('pipe', options, newTree).toPromise();
     const content = getFileContent(tree, routingModulePath);
     expect(content).toMatch(/import { FooPipe } from '.\/foo.pipe/);
   });
 
-  it('should respect the sourceRoot value', () => {
+  it('should respect the sourceRoot value', async () => {
     const config = JSON.parse(appTree.readContent('/angular.json'));
     config.projects.bar.sourceRoot = 'projects/bar/custom';
     appTree.overwrite('/angular.json', JSON.stringify(config, null, 2));
 
     // should fail without a module in that dir
-    expect(() => schematicRunner.runSchematic('pipe', defaultOptions, appTree)).toThrow();
+    await expectAsync(
+      schematicRunner.runSchematicAsync('pipe', defaultOptions, appTree).toPromise(),
+    ).toBeRejected();
 
     // move the module
     appTree.rename('/projects/bar/src/app/app.module.ts', '/projects/bar/custom/app/app.module.ts');
-    appTree = schematicRunner.runSchematic('pipe', defaultOptions, appTree);
+    appTree = await schematicRunner.runSchematicAsync('pipe', defaultOptions, appTree).toPromise();
     expect(appTree.files).toContain('/projects/bar/custom/app/foo.pipe.ts');
   });
 });

From 9007a86783c639e92106a68e1ab4a4eec399d082 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 15 Apr 2019 21:00:30 -0400
Subject: [PATCH 1175/1703] refactor(@schematics/angular): update interface to
 use new workspace rules

---
 .../schematics/angular/interface/index.ts     | 11 +++-----
 .../angular/interface/index_spec.ts           | 25 +++++++++++--------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/schematics/angular/interface/index.ts b/packages/schematics/angular/interface/index.ts
index a008e6a3ec37..d651e5af6184 100644
--- a/packages/schematics/angular/interface/index.ts
+++ b/packages/schematics/angular/interface/index.ts
@@ -20,19 +20,14 @@ import {
 } from '@angular-devkit/schematics';
 import { applyLintFix } from '../utility/lint-fix';
 import { parseName } from '../utility/parse-name';
-import { buildDefaultPath, getProject } from '../utility/project';
+import { createDefaultPath } from '../utility/workspace';
 import { Schema as InterfaceOptions } from './schema';
 
 
 export default function (options: InterfaceOptions): Rule {
-  return (host: Tree) => {
-    if (!options.project) {
-      throw new SchematicsException('Option (project) is required.');
-    }
-    const project = getProject(host, options.project);
-
+  return async (host: Tree) => {
     if (options.path === undefined) {
-      options.path = buildDefaultPath(project);
+      options.path = await createDefaultPath(host, options.project as string);
     }
 
     const parsedPath = parseName(options.path, options.name);
diff --git a/packages/schematics/angular/interface/index_spec.ts b/packages/schematics/angular/interface/index_spec.ts
index 3d9cdde7f9bf..da2a41f24bd0 100644
--- a/packages/schematics/angular/interface/index_spec.ts
+++ b/packages/schematics/angular/interface/index_spec.ts
@@ -38,34 +38,39 @@ describe('Interface Schematic', () => {
     skipPackageJson: false,
   };
   let appTree: UnitTestTree;
-  beforeEach(() => {
+  beforeEach(async () => {
     appTree = schematicRunner.runSchematic('workspace', workspaceOptions);
-    appTree = schematicRunner.runSchematic('application', appOptions, appTree);
+    appTree = await schematicRunner.runSchematicAsync('application', appOptions, appTree)
+      .toPromise();
   });
 
-  it('should create one file', () => {
-    const tree = schematicRunner.runSchematic('interface', defaultOptions, appTree);
+  it('should create one file', async () => {
+    const tree = await schematicRunner.runSchematicAsync('interface', defaultOptions, appTree)
+      .toPromise();
     expect(tree.files).toContain('/projects/bar/src/app/foo.ts');
   });
 
-  it('should create an interface named "Foo"', () => {
-    const tree = schematicRunner.runSchematic('interface', defaultOptions, appTree);
+  it('should create an interface named "Foo"', async () => {
+    const tree = await schematicRunner.runSchematicAsync('interface', defaultOptions, appTree)
+      .toPromise();
     const fileContent = tree.readContent('/projects/bar/src/app/foo.ts');
     expect(fileContent).toMatch(/export interface Foo/);
   });
 
-  it('should put type in the file name', () => {
+  it('should put type in the file name', async () => {
     const options = { ...defaultOptions, type: 'model' };
 
-    const tree = schematicRunner.runSchematic('interface', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('interface', options, appTree)
+      .toPromise();
     expect(tree.files).toContain('/projects/bar/src/app/foo.model.ts');
   });
 
-  it('should respect the sourceRoot value', () => {
+  it('should respect the sourceRoot value', async () => {
     const config = JSON.parse(appTree.readContent('/angular.json'));
     config.projects.bar.sourceRoot = 'projects/bar/custom';
     appTree.overwrite('/angular.json', JSON.stringify(config, null, 2));
-    appTree = schematicRunner.runSchematic('interface', defaultOptions, appTree);
+    appTree = await schematicRunner.runSchematicAsync('interface', defaultOptions, appTree)
+      .toPromise();
     expect(appTree.files).toContain('/projects/bar/custom/app/foo.ts');
   });
 });

From ef12a1511b60ec8a174f13fc8b3f6fd639a124dc Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 15 Apr 2019 21:04:48 -0400
Subject: [PATCH 1176/1703] refactor(@schematics/angular): update module to use
 new workspace rules

---
 packages/schematics/angular/module/index.ts   | 11 ++---
 .../schematics/angular/module/index_spec.ts   | 40 ++++++++++---------
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/packages/schematics/angular/module/index.ts b/packages/schematics/angular/module/index.ts
index b1a30f36bfa7..e13c9b4a5cb5 100644
--- a/packages/schematics/angular/module/index.ts
+++ b/packages/schematics/angular/module/index.ts
@@ -25,7 +25,7 @@ import { InsertChange } from '../utility/change';
 import { buildRelativePath, findModuleFromOptions } from '../utility/find-module';
 import { applyLintFix } from '../utility/lint-fix';
 import { parseName } from '../utility/parse-name';
-import { buildDefaultPath, getProject } from '../utility/project';
+import { createDefaultPath } from '../utility/workspace';
 import { Schema as ModuleOptions } from './schema';
 
 
@@ -69,14 +69,9 @@ function addDeclarationToNgModule(options: ModuleOptions): Rule {
 }
 
 export default function (options: ModuleOptions): Rule {
-  return (host: Tree) => {
-    if (!options.project) {
-      throw new SchematicsException('Option (project) is required.');
-    }
-    const project = getProject(host, options.project);
-
+  return async (host: Tree) => {
     if (options.path === undefined) {
-      options.path = buildDefaultPath(project);
+      options.path = await createDefaultPath(host, options.project as string);
     }
 
     if (options.module) {
diff --git a/packages/schematics/angular/module/index_spec.ts b/packages/schematics/angular/module/index_spec.ts
index c7911bfc877e..3e5a807eb411 100644
--- a/packages/schematics/angular/module/index_spec.ts
+++ b/packages/schematics/angular/module/index_spec.ts
@@ -38,60 +38,61 @@ describe('Module Schematic', () => {
     skipPackageJson: false,
   };
   let appTree: UnitTestTree;
-  beforeEach(() => {
+  beforeEach(async () => {
     appTree = schematicRunner.runSchematic('workspace', workspaceOptions);
-    appTree = schematicRunner.runSchematic('application', appOptions, appTree);
+    appTree = await schematicRunner.runSchematicAsync('application', appOptions, appTree)
+      .toPromise();
   });
 
-  it('should create a module', () => {
+  it('should create a module', async () => {
     const options = { ...defaultOptions };
 
-    const tree = schematicRunner.runSchematic('module', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('module', options, appTree).toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo/foo.module.ts');
   });
 
-  it('should import into another module', () => {
+  it('should import into another module', async () => {
     const options = { ...defaultOptions, module: 'app.module.ts' };
 
-    const tree = schematicRunner.runSchematic('module', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('module', options, appTree).toPromise();
     const content = tree.readContent('/projects/bar/src/app/app.module.ts');
     expect(content).toMatch(/import { FooModule } from '.\/foo\/foo.module'/);
     expect(content).toMatch(/imports: \[[^\]]*FooModule[^\]]*\]/m);
   });
 
-  it('should import into another module when using flat', () => {
+  it('should import into another module when using flat', async () => {
     const options = { ...defaultOptions, flat: true, module: 'app.module.ts' };
 
-    const tree = schematicRunner.runSchematic('module', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('module', options, appTree).toPromise();
     const content = tree.readContent('/projects/bar/src/app/app.module.ts');
     expect(content).toMatch(/import { FooModule } from '.\/foo.module'/);
     expect(content).toMatch(/imports: \[[^\]]*FooModule[^\]]*\]/m);
   });
 
-  it('should import into another module (deep)', () => {
+  it('should import into another module (deep)', async () => {
     let tree = appTree;
 
-    tree = schematicRunner.runSchematic('module', {
+    tree = await schematicRunner.runSchematicAsync('module', {
       ...defaultOptions,
       path: 'projects/bar/src/app/sub1',
       name: 'test1',
-    }, tree);
-    tree = schematicRunner.runSchematic('module', {
+    }, tree).toPromise();
+    tree = await schematicRunner.runSchematicAsync('module', {
       ...defaultOptions,
       path: 'projects/bar/src/app/sub2',
       name: 'test2',
       module: '../sub1/test1',
-    }, tree);
+    }, tree).toPromise();
 
     const content = tree.readContent('/projects/bar/src/app/sub1/test1/test1.module.ts');
     expect(content).toMatch(/import { Test2Module } from '..\/..\/sub2\/test2\/test2.module'/);
   });
 
-  it('should create a routing module', () => {
+  it('should create a routing module', async () => {
     const options = { ...defaultOptions, routing: true };
 
-    const tree = schematicRunner.runSchematic('module', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('module', options, appTree).toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo/foo.module.ts');
     expect(files).toContain('/projects/bar/src/app/foo/foo-routing.module.ts');
@@ -101,19 +102,20 @@ describe('Module Schematic', () => {
     expect(routingModuleContent).toMatch(/RouterModule.forChild\(routes\)/);
   });
 
-  it('should dasherize a name', () => {
+  it('should dasherize a name', async () => {
     const options = { ...defaultOptions, name: 'TwoWord' };
 
-    const tree = schematicRunner.runSchematic('module', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('module', options, appTree).toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/two-word/two-word.module.ts');
   });
 
-  it('should respect the sourceRoot value', () => {
+  it('should respect the sourceRoot value', async () => {
     const config = JSON.parse(appTree.readContent('/angular.json'));
     config.projects.bar.sourceRoot = 'projects/bar/custom';
     appTree.overwrite('/angular.json', JSON.stringify(config, null, 2));
-    appTree = schematicRunner.runSchematic('module', defaultOptions, appTree);
+    appTree = await schematicRunner.runSchematicAsync('module', defaultOptions, appTree)
+      .toPromise();
     expect(appTree.files).toContain('/projects/bar/custom/app/foo/foo.module.ts');
   });
 });

From bd79e0908a71901793d97aeaa77909838491506a Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 15 Apr 2019 21:19:28 -0400
Subject: [PATCH 1177/1703] refactor(@schematics/angular): update e2e to use
 new workspace rules

---
 packages/schematics/angular/e2e/index.ts      | 70 +++++++------------
 packages/schematics/angular/e2e/index_spec.ts | 43 +++++++-----
 2 files changed, 53 insertions(+), 60 deletions(-)

diff --git a/packages/schematics/angular/e2e/index.ts b/packages/schematics/angular/e2e/index.ts
index 94a47bf8744f..128f3d0e5994 100644
--- a/packages/schematics/angular/e2e/index.ts
+++ b/packages/schematics/angular/e2e/index.ts
@@ -8,7 +8,6 @@
 import { normalize, strings } from '@angular-devkit/core';
 import {
   Rule,
-  SchematicContext,
   SchematicsException,
   Tree,
   apply,
@@ -18,9 +17,8 @@ import {
   move,
   url,
 } from '@angular-devkit/schematics';
-import { getWorkspace, updateWorkspace } from '../utility/config';
-import { getProject } from '../utility/project';
-import { Builders, WorkspaceSchema } from '../utility/workspace-models';
+import { getWorkspace, updateWorkspace } from '../utility/workspace';
+import { Builders } from '../utility/workspace-models';
 import { Schema as E2eOptions } from './schema';
 
 function getE2eRoot(projectRoot: string): string {
@@ -29,47 +27,11 @@ function getE2eRoot(projectRoot: string): string {
   return root ? root + '/e2e' : 'e2e';
 }
 
-function AddBuilderToWorkspace(options: E2eOptions, workspace: WorkspaceSchema): Rule {
-  return (host: Tree, context: SchematicContext) => {
-    const appProject = options.relatedAppName;
-    const project = getProject(workspace, appProject);
-    const architect = project.architect;
-
-    const projectRoot = getE2eRoot(project.root);
-
-    if (architect) {
-      architect.e2e = {
-        builder: Builders.Protractor,
-        options: {
-          protractorConfig: `${projectRoot}/protractor.conf.js`,
-          devServerTarget: `${options.relatedAppName}:serve`,
-        },
-        configurations: {
-          production: {
-            devServerTarget: `${options.relatedAppName}:serve:production`,
-          },
-        },
-      };
-
-      const lintConfig = architect.lint;
-      if (lintConfig) {
-        lintConfig.options.tsConfig =
-          lintConfig.options.tsConfig.concat(`${projectRoot}/tsconfig.json`);
-      }
-
-      workspace.projects[options.relatedAppName] = project;
-    }
-
-    return updateWorkspace(workspace);
-  };
-}
-
 export default function (options: E2eOptions): Rule {
-  return (host: Tree) => {
+  return async (host: Tree) => {
     const appProject = options.relatedAppName;
-    const workspace = getWorkspace(host);
-    const project = getProject(workspace, appProject);
-
+    const workspace = await getWorkspace(host);
+    const project = workspace.projects.get(appProject);
     if (!project) {
       throw new SchematicsException(`Project name "${appProject}" doesn't not exist.`);
     }
@@ -77,8 +39,28 @@ export default function (options: E2eOptions): Rule {
     const root = getE2eRoot(project.root);
     const relativePathToWorkspaceRoot = root.split('/').map(() => '..').join('/');
 
+    project.targets.add({
+      name: 'e2e',
+      builder: Builders.Protractor,
+      options: {
+        protractorConfig: `${root}/protractor.conf.js`,
+        devServerTarget: `${options.relatedAppName}:serve`,
+      },
+      configurations: {
+        production: {
+          devServerTarget: `${options.relatedAppName}:serve:production`,
+        },
+      },
+    });
+
+    const lintTarget = project.targets.get('lint');
+    if (lintTarget && lintTarget.options && Array.isArray(lintTarget.options.tsConfig)) {
+      lintTarget.options.tsConfig =
+        lintTarget.options.tsConfig.concat(`${root}/tsconfig.json`);
+    }
+
     return chain([
-      AddBuilderToWorkspace(options, workspace),
+      updateWorkspace(workspace),
       mergeWith(
         apply(url('./files'), [
           applyTemplates({
diff --git a/packages/schematics/angular/e2e/index_spec.ts b/packages/schematics/angular/e2e/index_spec.ts
index 9cc765bdecb5..5e22f89b0e1d 100644
--- a/packages/schematics/angular/e2e/index_spec.ts
+++ b/packages/schematics/angular/e2e/index_spec.ts
@@ -37,13 +37,18 @@ describe('Application Schematic', () => {
 
   let applicationTree: UnitTestTree;
 
-  beforeEach(() => {
+  beforeEach(async () => {
     const workspaceTree = schematicRunner.runSchematic('workspace', workspaceOptions);
-    applicationTree = schematicRunner.runSchematic('application', defaultAppOptions, workspaceTree);
+    applicationTree = await schematicRunner.runSchematicAsync(
+      'application',
+      defaultAppOptions,
+      workspaceTree,
+    ).toPromise();
   });
 
-  it('should create all files of e2e in an application', () => {
-    const tree = schematicRunner.runSchematic('e2e', defaultOptions, applicationTree);
+  it('should create all files of e2e in an application', async () => {
+    const tree = await schematicRunner.runSchematicAsync('e2e', defaultOptions, applicationTree)
+      .toPromise();
     const files = tree.files;
     expect(files).toEqual(jasmine.arrayContaining([
       '/projects/foo/e2e/protractor.conf.js',
@@ -53,44 +58,50 @@ describe('Application Schematic', () => {
     ]));
   });
 
-  it('should set the rootSelector in the app.po.ts', () => {
-    const tree = schematicRunner.runSchematic('e2e', defaultOptions, applicationTree);
+  it('should set the rootSelector in the app.po.ts', async () => {
+    const tree = await schematicRunner.runSchematicAsync('e2e', defaultOptions, applicationTree)
+      .toPromise();
     const content = tree.readContent('/projects/foo/e2e/src/app.po.ts');
     expect(content).toMatch(/app\-root/);
   });
 
-  it('should set the rootSelector in the app.po.ts from the option', () => {
+  it('should set the rootSelector in the app.po.ts from the option', async () => {
     const options = {...defaultOptions, rootSelector: 't-a-c-o'};
-    const tree = schematicRunner.runSchematic('e2e', options, applicationTree);
+    const tree = await schematicRunner.runSchematicAsync('e2e', options, applicationTree)
+      .toPromise();
     const content = tree.readContent('/projects/foo/e2e/src/app.po.ts');
     expect(content).toMatch(/t\-a\-c\-o/);
   });
 
-  it('should set the rootSelector in the app.po.ts from the option with emoji', () => {
+  it('should set the rootSelector in the app.po.ts from the option with emoji', async () => {
     const options = {...defaultOptions, rootSelector: '🌮-🌯'};
-    const tree = schematicRunner.runSchematic('e2e', options, applicationTree);
+    const tree = await schematicRunner.runSchematicAsync('e2e', options, applicationTree)
+      .toPromise();
     const content = tree.readContent('/projects/foo/e2e/src/app.po.ts');
     expect(content).toMatch(/🌮-🌯/);
   });
 
   describe('workspace config', () => {
-    it('should add e2e targets for the app', () => {
-      const tree = schematicRunner.runSchematic('e2e', defaultOptions, applicationTree);
+    it('should add e2e targets for the app', async () => {
+      const tree = await schematicRunner.runSchematicAsync('e2e', defaultOptions, applicationTree)
+        .toPromise();
       const workspace = JSON.parse(tree.readContent('/angular.json'));
       const targets = workspace.projects.foo.architect;
       expect(targets.e2e).toBeDefined();
     });
 
-    it('should set the e2e options', () => {
-      const tree = schematicRunner.runSchematic('e2e', defaultOptions, applicationTree);
+    it('should set the e2e options', async () => {
+      const tree = await schematicRunner.runSchematicAsync('e2e', defaultOptions, applicationTree)
+        .toPromise();
       const workspace = JSON.parse(tree.readContent('/angular.json'));
       const e2eOptions = workspace.projects.foo.architect.e2e.options;
       expect(e2eOptions.protractorConfig).toEqual('projects/foo/e2e/protractor.conf.js');
       expect(e2eOptions.devServerTarget).toEqual('foo:serve');
     });
 
-    it('should set the lint options', () => {
-      const tree = schematicRunner.runSchematic('e2e', defaultOptions, applicationTree);
+    it('should set the lint options', async () => {
+      const tree = await schematicRunner.runSchematicAsync('e2e', defaultOptions, applicationTree)
+        .toPromise();
       const workspace = JSON.parse(tree.readContent('/angular.json'));
       const lintOptions = workspace.projects.foo.architect.lint.options;
       expect(lintOptions.tsConfig).toEqual([

From cfb18285e6a7f9e199149cd512dee8646f9fd483 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 15 Apr 2019 22:05:02 -0400
Subject: [PATCH 1178/1703] refactor(@schematics/angular): update directive to
 use new workspace rules

---
 .../schematics/angular/directive/index.ts     | 13 ++--
 .../angular/directive/index_spec.ts           | 68 +++++++++++--------
 2 files changed, 48 insertions(+), 33 deletions(-)

diff --git a/packages/schematics/angular/directive/index.ts b/packages/schematics/angular/directive/index.ts
index cb7bbb01beb7..28d89e5d00e1 100644
--- a/packages/schematics/angular/directive/index.ts
+++ b/packages/schematics/angular/directive/index.ts
@@ -25,8 +25,8 @@ import { InsertChange } from '../utility/change';
 import { buildRelativePath, findModuleFromOptions } from '../utility/find-module';
 import { applyLintFix } from '../utility/lint-fix';
 import { parseName } from '../utility/parse-name';
-import { buildDefaultPath, getProject } from '../utility/project';
 import { validateHtmlSelector } from '../utility/validation';
+import { buildDefaultPath, getWorkspace } from '../utility/workspace';
 import { Schema as DirectiveOptions } from './schema';
 
 
@@ -101,11 +101,12 @@ function buildSelector(options: DirectiveOptions, projectPrefix: string) {
 }
 
 export default function (options: DirectiveOptions): Rule {
-  return (host: Tree) => {
-    if (!options.project) {
-      throw new SchematicsException('Option (project) is required.');
+  return async (host: Tree) => {
+    const workspace = await getWorkspace(host);
+    const project = workspace.projects.get(options.project as string);
+    if (!project) {
+      throw new SchematicsException(`Invalid project name (${options.project})`);
     }
-    const project = getProject(host, options.project);
 
     if (options.path === undefined) {
       options.path = buildDefaultPath(project);
@@ -116,7 +117,7 @@ export default function (options: DirectiveOptions): Rule {
     const parsedPath = parseName(options.path, options.name);
     options.name = parsedPath.name;
     options.path = parsedPath.path;
-    options.selector = options.selector || buildSelector(options, project.prefix);
+    options.selector = options.selector || buildSelector(options, project.prefix || '');
 
     validateHtmlSelector(options.selector);
 
diff --git a/packages/schematics/angular/directive/index_spec.ts b/packages/schematics/angular/directive/index_spec.ts
index cdcc3555d4a3..df5753fccc27 100644
--- a/packages/schematics/angular/directive/index_spec.ts
+++ b/packages/schematics/angular/directive/index_spec.ts
@@ -40,15 +40,17 @@ describe('Directive Schematic', () => {
     skipPackageJson: false,
   };
   let appTree: UnitTestTree;
-  beforeEach(() => {
+  beforeEach(async () => {
     appTree = schematicRunner.runSchematic('workspace', workspaceOptions);
-    appTree = schematicRunner.runSchematic('application', appOptions, appTree);
+    appTree = await schematicRunner.runSchematicAsync('application', appOptions, appTree)
+      .toPromise();
   });
 
-  it('should create a directive', () => {
+  it('should create a directive', async () => {
     const options = { ...defaultOptions };
 
-    const tree = schematicRunner.runSchematic('directive', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree)
+      .toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo.directive.spec.ts');
     expect(files).toContain('/projects/bar/src/app/foo.directive.ts');
@@ -57,16 +59,17 @@ describe('Directive Schematic', () => {
     expect(moduleContent).toMatch(/declarations:\s*\[[^\]]+?,\r?\n\s+FooDirective\r?\n/m);
   });
 
-  it('should create respect the flat flag', () => {
+  it('should create respect the flat flag', async () => {
     const options = { ...defaultOptions, flat: false };
 
-    const tree = schematicRunner.runSchematic('directive', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree)
+      .toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo/foo.directive.spec.ts');
     expect(files).toContain('/projects/bar/src/app/foo/foo.directive.ts');
   });
 
-  it('should find the closest module', () => {
+  it('should find the closest module', async () => {
     const options = { ...defaultOptions, flat: false };
     const fooModule = '/projects/bar/src/app/foo/foo.module.ts';
     appTree.create(fooModule, `
@@ -79,90 +82,101 @@ describe('Directive Schematic', () => {
       export class FooModule { }
     `);
 
-    const tree = schematicRunner.runSchematic('directive', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree)
+      .toPromise();
     const fooModuleContent = tree.readContent(fooModule);
     expect(fooModuleContent).toMatch(/import { FooDirective } from '.\/foo.directive'/);
   });
 
-  it('should export the directive', () => {
+  it('should export the directive', async () => {
     const options = { ...defaultOptions, export: true };
 
-    const tree = schematicRunner.runSchematic('directive', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree)
+      .toPromise();
     const appModuleContent = tree.readContent('/projects/bar/src/app/app.module.ts');
     expect(appModuleContent).toMatch(/exports: \[FooDirective\]/);
   });
 
-  it('should import into a specified module', () => {
+  it('should import into a specified module', async () => {
     const options = { ...defaultOptions, module: 'app.module.ts' };
 
-    const tree = schematicRunner.runSchematic('directive', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree)
+      .toPromise();
     const appModule = tree.readContent('/projects/bar/src/app/app.module.ts');
 
     expect(appModule).toMatch(/import { FooDirective } from '.\/foo.directive'/);
   });
 
-  it('should fail if specified module does not exist', () => {
+  it('should fail if specified module does not exist', async () => {
     const options = { ...defaultOptions, module: '/projects/bar/src/app/app.moduleXXX.ts' };
     let thrownError: Error | null = null;
     try {
-      schematicRunner.runSchematic('directive', options, appTree);
+      await schematicRunner.runSchematicAsync('directive', options, appTree).toPromise();
     } catch (err) {
       thrownError = err;
     }
     expect(thrownError).toBeDefined();
   });
 
-  it('should converts dash-cased-name to a camelCasedSelector', () => {
+  it('should converts dash-cased-name to a camelCasedSelector', async () => {
     const options = { ...defaultOptions, name: 'my-dir' };
 
-    const tree = schematicRunner.runSchematic('directive', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree)
+      .toPromise();
     const content = tree.readContent('/projects/bar/src/app/my-dir.directive.ts');
     expect(content).toMatch(/selector: '\[appMyDir\]'/);
   });
 
-  it('should create the right selector with a path in the name', () => {
+  it('should create the right selector with a path in the name', async () => {
     const options = { ...defaultOptions, name: 'sub/test' };
-    appTree = schematicRunner.runSchematic('directive', options, appTree);
+    appTree = await schematicRunner.runSchematicAsync('directive', options, appTree)
+      .toPromise();
 
     const content = appTree.readContent('/projects/bar/src/app/sub/test.directive.ts');
     expect(content).toMatch(/selector: '\[appTest\]'/);
   });
 
-  it('should use the prefix', () => {
+  it('should use the prefix', async () => {
     const options = { ...defaultOptions, prefix: 'pre' };
-    const tree = schematicRunner.runSchematic('directive', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree)
+      .toPromise();
 
     const content = tree.readContent('/projects/bar/src/app/foo.directive.ts');
     expect(content).toMatch(/selector: '\[preFoo\]'/);
   });
 
-  it('should use the default project prefix if none is passed', () => {
+  it('should use the default project prefix if none is passed', async () => {
     const options = { ...defaultOptions, prefix: undefined };
-    const tree = schematicRunner.runSchematic('directive', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree)
+      .toPromise();
 
     const content = tree.readContent('/projects/bar/src/app/foo.directive.ts');
     expect(content).toMatch(/selector: '\[appFoo\]'/);
   });
 
-  it('should use the supplied prefix if it is ""', () => {
+  it('should use the supplied prefix if it is ""', async () => {
     const options = { ...defaultOptions, prefix: '' };
-    const tree = schematicRunner.runSchematic('directive', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree)
+      .toPromise();
 
     const content = tree.readContent('/projects/bar/src/app/foo.directive.ts');
     expect(content).toMatch(/selector: '\[foo\]'/);
   });
 
-  it('should respect the sourceRoot value', () => {
+  it('should respect the sourceRoot value', async () => {
     const config = JSON.parse(appTree.readContent('/angular.json'));
     config.projects.bar.sourceRoot = 'projects/bar/custom';
     appTree.overwrite('/angular.json', JSON.stringify(config, null, 2));
 
     // should fail without a module in that dir
-    expect(() => schematicRunner.runSchematic('directive', defaultOptions, appTree)).toThrow();
+    await expectAsync(
+      schematicRunner.runSchematicAsync('directive', defaultOptions, appTree).toPromise(),
+    ).toBeRejected();
 
     // move the module
     appTree.rename('/projects/bar/src/app/app.module.ts', '/projects/bar/custom/app/app.module.ts');
-    appTree = schematicRunner.runSchematic('directive', defaultOptions, appTree);
+    appTree = await schematicRunner.runSchematicAsync('directive', defaultOptions, appTree)
+      .toPromise();
     expect(appTree.files).toContain('/projects/bar/custom/app/foo.directive.ts');
   });
 });

From e52f62f840b62531cedd47f9ce079abb66e571c8 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 15 Apr 2019 22:16:25 -0400
Subject: [PATCH 1179/1703] refactor(@schematics/angular): update component to
 use new workspace rules

---
 .../schematics/angular/component/index.ts     |  16 +-
 .../angular/component/index_spec.ts           | 155 +++++++++++-------
 2 files changed, 102 insertions(+), 69 deletions(-)

diff --git a/packages/schematics/angular/component/index.ts b/packages/schematics/angular/component/index.ts
index cd46c51eb529..1c91fedb2485 100644
--- a/packages/schematics/angular/component/index.ts
+++ b/packages/schematics/angular/component/index.ts
@@ -29,8 +29,8 @@ import { InsertChange } from '../utility/change';
 import { buildRelativePath, findModuleFromOptions } from '../utility/find-module';
 import { applyLintFix } from '../utility/lint-fix';
 import { parseName } from '../utility/parse-name';
-import { buildDefaultPath, getProject } from '../utility/project';
 import { validateHtmlSelector, validateName } from '../utility/validation';
+import { buildDefaultPath, getWorkspace } from '../utility/workspace';
 import { Schema as ComponentOptions, Style } from './schema';
 
 function readIntoSourceFile(host: Tree, modulePath: string): ts.SourceFile {
@@ -125,22 +125,20 @@ function buildSelector(options: ComponentOptions, projectPrefix: string) {
 
 
 export default function (options: ComponentOptions): Rule {
-  return (host: Tree) => {
-    if (!options.project) {
-      throw new SchematicsException('Option (project) is required.');
-    }
-    const project = getProject(host, options.project);
+  return async (host: Tree) => {
+    const workspace = await getWorkspace(host);
+    const project = workspace.projects.get(options.project as string);
 
-    if (options.path === undefined) {
+    if (options.path === undefined && project) {
       options.path = buildDefaultPath(project);
     }
 
     options.module = findModuleFromOptions(host, options);
 
-    const parsedPath = parseName(options.path, options.name);
+    const parsedPath = parseName(options.path as string, options.name);
     options.name = parsedPath.name;
     options.path = parsedPath.path;
-    options.selector = options.selector || buildSelector(options, project.prefix);
+    options.selector = options.selector || buildSelector(options, project && project.prefix || '');
 
     // todo remove these when we remove the deprecations
     options.style = (
diff --git a/packages/schematics/angular/component/index_spec.ts b/packages/schematics/angular/component/index_spec.ts
index e79895f49ccc..303d8ebcc3e1 100644
--- a/packages/schematics/angular/component/index_spec.ts
+++ b/packages/schematics/angular/component/index_spec.ts
@@ -48,14 +48,16 @@ describe('Component Schematic', () => {
     skipPackageJson: false,
   };
   let appTree: UnitTestTree;
-  beforeEach(() => {
+  beforeEach(async () => {
     appTree = schematicRunner.runSchematic('workspace', workspaceOptions);
-    appTree = schematicRunner.runSchematic('application', appOptions, appTree);
+    appTree = await schematicRunner.runSchematicAsync('application', appOptions, appTree)
+      .toPromise();
   });
 
-  it('should create a component', () => {
+  it('should create a component', async () => {
     const options = { ...defaultOptions };
-    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
     const files = tree.files;
     expect(files).toEqual(jasmine.arrayContaining([
       '/projects/bar/src/app/foo/foo.component.css',
@@ -68,42 +70,47 @@ describe('Component Schematic', () => {
     expect(moduleContent).toMatch(/declarations:\s*\[[^\]]+?,\r?\n\s+FooComponent\r?\n/m);
   });
 
-  it('should set change detection to OnPush', () => {
+  it('should set change detection to OnPush', async () => {
     const options = { ...defaultOptions, changeDetection: 'OnPush' };
 
-    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
     const tsContent = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(tsContent).toMatch(/changeDetection: ChangeDetectionStrategy.OnPush/);
   });
 
-  it('should not set view encapsulation', () => {
+  it('should not set view encapsulation', async () => {
     const options = { ...defaultOptions };
 
-    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
     const tsContent = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(tsContent).not.toMatch(/encapsulation: ViewEncapsulation/);
   });
 
-  it('should set view encapsulation to Emulated', () => {
+  it('should set view encapsulation to Emulated', async () => {
     const options = { ...defaultOptions, viewEncapsulation: 'Emulated' };
 
-    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
     const tsContent = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(tsContent).toMatch(/encapsulation: ViewEncapsulation.Emulated/);
   });
 
-  it('should set view encapsulation to None', () => {
+  it('should set view encapsulation to None', async () => {
     const options = { ...defaultOptions, viewEncapsulation: 'None' };
 
-    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
     const tsContent = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(tsContent).toMatch(/encapsulation: ViewEncapsulation.None/);
   });
 
-  it('should create a flat component', () => {
+  it('should create a flat component', async () => {
     const options = { ...defaultOptions, flat: true };
 
-    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
     const files = tree.files;
     expect(files).toEqual(jasmine.arrayContaining([
       '/projects/bar/src/app/foo.component.css',
@@ -113,7 +120,7 @@ describe('Component Schematic', () => {
     ]));
   });
 
-  it('should find the closest module', () => {
+  it('should find the closest module', async () => {
     const options = { ...defaultOptions };
     const fooModule = '/projects/bar/src/app/foo/foo.module.ts';
     appTree.create(fooModule, `
@@ -126,37 +133,41 @@ describe('Component Schematic', () => {
       export class FooModule { }
     `);
 
-    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
     const fooModuleContent = tree.readContent(fooModule);
     expect(fooModuleContent).toMatch(/import { FooComponent } from '.\/foo.component'/);
   });
 
-  it('should export the component', () => {
+  it('should export the component', async () => {
     const options = { ...defaultOptions, export: true };
 
-    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
     const appModuleContent = tree.readContent('/projects/bar/src/app/app.module.ts');
     expect(appModuleContent).toMatch(/exports: \[FooComponent\]/);
   });
 
-  it('should set the entry component', () => {
+  it('should set the entry component', async () => {
     const options = { ...defaultOptions, entryComponent: true };
 
-    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
     const appModuleContent = tree.readContent('/projects/bar/src/app/app.module.ts');
     expect(appModuleContent).toMatch(/entryComponents: \[FooComponent\]/);
   });
 
-  it('should import into a specified module', () => {
+  it('should import into a specified module', async () => {
     const options = { ...defaultOptions, module: 'app.module.ts' };
 
-    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
     const appModule = tree.readContent('/projects/bar/src/app/app.module.ts');
 
     expect(appModule).toMatch(/import { FooComponent } from '.\/foo\/foo.component'/);
   });
 
-  it('should fail if specified module does not exist', () => {
+  it('should fail if specified module does not exist', async () => {
     const options = { ...defaultOptions, module: '/projects/bar/src/app.moduleXXX.ts' };
     let thrownError: Error | null = null;
     try {
@@ -167,11 +178,12 @@ describe('Component Schematic', () => {
     expect(thrownError).toBeDefined();
   });
 
-  it('should handle upper case paths', () => {
+  it('should handle upper case paths', async () => {
     const pathOption = 'projects/bar/src/app/SOME/UPPER/DIR';
     const options = { ...defaultOptions, path: pathOption };
 
-    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
     let files = tree.files;
     let root = `/${pathOption}/foo/foo.component`;
     expect(files).toEqual(jasmine.arrayContaining([
@@ -182,7 +194,8 @@ describe('Component Schematic', () => {
     ]));
 
     const options2 = { ...options, name: 'BAR' };
-    const tree2 = schematicRunner.runSchematic('component', options2, tree);
+    const tree2 = await schematicRunner.runSchematicAsync('component', options2, tree)
+      .toPromise();
     files = tree2.files;
     root = `/${pathOption}/bar/bar.component`;
     expect(files).toEqual(jasmine.arrayContaining([
@@ -193,10 +206,11 @@ describe('Component Schematic', () => {
     ]));
   });
 
-  it('should create a component in a sub-directory', () => {
+  it('should create a component in a sub-directory', async () => {
     const options = { ...defaultOptions, path: 'projects/bar/src/app/a/b/c' };
 
-    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
     const files = tree.files;
     const root = `/${options.path}/foo/foo.component`;
     expect(files).toEqual(jasmine.arrayContaining([
@@ -207,82 +221,95 @@ describe('Component Schematic', () => {
     ]));
   });
 
-  it('should use the prefix', () => {
+  it('should use the prefix', async () => {
     const options = { ...defaultOptions, prefix: 'pre' };
 
-    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
     const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(content).toMatch(/selector: 'pre-foo'/);
   });
 
-  it('should use the default project prefix if none is passed', () => {
+  it('should use the default project prefix if none is passed', async () => {
     const options = { ...defaultOptions, prefix: undefined };
 
-    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
     const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(content).toMatch(/selector: 'app-foo'/);
   });
 
-  it('should use the supplied prefix if it is ""', () => {
+  it('should use the supplied prefix if it is ""', async () => {
     const options = { ...defaultOptions, prefix: '' };
 
-    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
     const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(content).toMatch(/selector: 'foo'/);
   });
 
-  it('should respect the inlineTemplate option', () => {
+  it('should respect the inlineTemplate option', async () => {
     const options = { ...defaultOptions, inlineTemplate: true };
-    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
     const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(content).toMatch(/template: /);
     expect(content).not.toMatch(/templateUrl: /);
     expect(tree.files).not.toContain('/projects/bar/src/app/foo/foo.component.html');
   });
 
-  it('should respect the inlineStyle option', () => {
+  it('should respect the inlineStyle option', async () => {
     const options = { ...defaultOptions, inlineStyle: true };
-    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
     const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(content).toMatch(/styles: \[/);
     expect(content).not.toMatch(/styleUrls: /);
     expect(tree.files).not.toContain('/projects/bar/src/app/foo/foo.component.css');
   });
 
-  it('should respect the style option', () => {
+  it('should respect the style option', async () => {
     const options = { ...defaultOptions, style: Style.Sass };
-    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
     const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(content).toMatch(/styleUrls: \['.\/foo.component.sass/);
     expect(tree.files).toContain('/projects/bar/src/app/foo/foo.component.sass');
     expect(tree.files).not.toContain('/projects/bar/src/app/foo/foo.component.css');
   });
 
-  it('should use the module flag even if the module is a routing module', () => {
+  it('should use the module flag even if the module is a routing module', async () => {
     const routingFileName = 'app-routing.module.ts';
     const routingModulePath = `/projects/bar/src/app/${routingFileName}`;
     const newTree = createAppModule(appTree, routingModulePath);
     const options = { ...defaultOptions, module: routingFileName };
-    const tree = schematicRunner.runSchematic('component', options, newTree);
+    const tree = await schematicRunner.runSchematicAsync('component', options, newTree)
+      .toPromise();
     const content = tree.readContent(routingModulePath);
     expect(content).toMatch(/import { FooComponent } from '.\/foo\/foo.component/);
   });
 
-  it('should handle a path in the name option', () => {
+  it('should handle a path in the name option', async () => {
     const options = { ...defaultOptions, name: 'dir/test-component' };
 
-    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
     const content = tree.readContent('/projects/bar/src/app/app.module.ts');
     expect(content).toMatch(
       // tslint:disable-next-line:max-line-length
       /import { TestComponentComponent } from '\.\/dir\/test-component\/test-component.component'/);
   });
 
-  it('should handle a path in the name and module options', () => {
-    appTree = schematicRunner.runSchematic('module', { name: 'admin/module', project: 'bar' }, appTree);
+  it('should handle a path in the name and module options', async () => {
+    appTree = await schematicRunner.runSchematicAsync(
+      'module',
+      { name: 'admin/module', project: 'bar' },
+      appTree,
+    ).toPromise();
 
     const options = { ...defaultOptions, name: 'other/test-component', module: 'admin/module' };
-    appTree = schematicRunner.runSchematic('component', options, appTree);
+    appTree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
 
     const content = appTree.readContent('/projects/bar/src/app/admin/module/module.module.ts');
     expect(content).toMatch(
@@ -290,52 +317,60 @@ describe('Component Schematic', () => {
       /import { TestComponentComponent } from '..\/..\/other\/test-component\/test-component.component'/);
   });
 
-  it('should create the right selector with a path in the name', () => {
+  it('should create the right selector with a path in the name', async () => {
     const options = { ...defaultOptions, name: 'sub/test' };
-    appTree = schematicRunner.runSchematic('component', options, appTree);
+    appTree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
     const content = appTree.readContent('/projects/bar/src/app/sub/test/test.component.ts');
     expect(content).toMatch(/selector: 'app-test'/);
   });
 
-  it('should respect the sourceRoot value', () => {
+  it('should respect the sourceRoot value', async () => {
     const config = JSON.parse(appTree.readContent('/angular.json'));
     config.projects.bar.sourceRoot = 'projects/bar/custom';
     appTree.overwrite('/angular.json', JSON.stringify(config, null, 2));
 
     // should fail without a module in that dir
-    expect(() => schematicRunner.runSchematic('component', defaultOptions, appTree)).toThrow();
+    await expectAsync(
+      schematicRunner.runSchematicAsync('component', defaultOptions, appTree).toPromise(),
+    ).toBeRejected();
 
     // move the module
     appTree.rename('/projects/bar/src/app/app.module.ts', '/projects/bar/custom/app/app.module.ts');
-    appTree = schematicRunner.runSchematic('component', defaultOptions, appTree);
+    appTree = await schematicRunner.runSchematicAsync('component', defaultOptions, appTree)
+      .toPromise();
     expect(appTree.files).toContain('/projects/bar/custom/app/foo/foo.component.ts');
   });
 
   // testing deprecating options don't cause conflicts
-  it('should respect the deprecated styleext (scss) option', () => {
+  it('should respect the deprecated styleext (scss) option', async () => {
     const options = { ...defaultOptions, style: undefined, styleext: 'scss' };
-    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo/foo.component.scss');
   });
 
-  it('should respect the deprecated styleext (css) option', () => {
+  it('should respect the deprecated styleext (css) option', async () => {
     const options = { ...defaultOptions, style: undefined, styleext: 'css' };
-    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo/foo.component.css');
   });
 
-  it('should respect the deprecated spec option when false', () => {
+  it('should respect the deprecated spec option when false', async () => {
     const options = { ...defaultOptions, skipTests: undefined, spec: false };
-    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
     const files = tree.files;
     expect(files).not.toContain('/projects/bar/src/app/foo/foo.component.spec.ts');
   });
 
-  it('should respect the deprecated spec option when true', () => {
+  it('should respect the deprecated spec option when true', async () => {
     const options = { ...defaultOptions, skipTests: false, spec: true };
-    const tree = schematicRunner.runSchematic('component', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo/foo.component.spec.ts');
   });

From 8e70f18e0ca94ee0553f3e3b4d7e005520f31860 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 15 Apr 2019 22:41:11 -0400
Subject: [PATCH 1180/1703] refactor(@schematics/angular): update
 service-worker to use new workspace rules

---
 .../angular/service-worker/index.ts           | 87 ++++++-------------
 .../angular/service-worker/index_spec.ts      | 78 +++++++++++------
 2 files changed, 79 insertions(+), 86 deletions(-)

diff --git a/packages/schematics/angular/service-worker/index.ts b/packages/schematics/angular/service-worker/index.ts
index 1dd6f6bf973e..33247c50bb00 100644
--- a/packages/schematics/angular/service-worker/index.ts
+++ b/packages/schematics/angular/service-worker/index.ts
@@ -21,51 +21,13 @@ import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import * as ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { addSymbolToNgModuleMetadata, insertImport, isImported } from '../utility/ast-utils';
 import { InsertChange } from '../utility/change';
-import { getWorkspace, updateWorkspace } from '../utility/config';
 import { addPackageJsonDependency, getPackageJsonDependency } from '../utility/dependencies';
 import { getAppModulePath } from '../utility/ng-ast-utils';
-import { getProjectTargets, targetBuildNotFoundError } from '../utility/project-targets';
-import {
-  BrowserBuilderOptions,
-  BrowserBuilderTarget,
-  WorkspaceSchema,
-} from '../utility/workspace-models';
+import { targetBuildNotFoundError } from '../utility/project-targets';
+import { getWorkspace, updateWorkspace } from '../utility/workspace';
+import { BrowserBuilderOptions } from '../utility/workspace-models';
 import { Schema as ServiceWorkerOptions } from './schema';
 
-function getProjectConfiguration(
-  workspace: WorkspaceSchema,
-  options: ServiceWorkerOptions,
-): BrowserBuilderOptions {
-  const projectTargets = getProjectTargets(workspace, options.project);
-  if (!projectTargets[options.target]) {
-    throw new Error(`Target is not defined for this project.`);
-  }
-
-  const target = projectTargets[options.target] as BrowserBuilderTarget;
-  let applyTo = target.options;
-
-  if (options.configuration &&
-    target.configurations &&
-    target.configurations[options.configuration]) {
-    applyTo = target.configurations[options.configuration] as BrowserBuilderOptions;
-  }
-
-  return applyTo;
-}
-
-function updateConfigFile(options: ServiceWorkerOptions, root: string): Rule {
-  return (host: Tree, context: SchematicContext) => {
-    context.logger.debug('updating config file.');
-    const workspace = getWorkspace(host);
-
-    const config = getProjectConfiguration(workspace, options);
-    config.serviceWorker = true;
-    config.ngswConfigPath = `${root && !root.endsWith('/') ? root + '/' : root}ngsw-config.json`;
-
-    return updateWorkspace(workspace);
-  };
-}
-
 function addDependencies(): Rule {
   return (host: Tree, context: SchematicContext) => {
     const packageName = '@angular/service-worker';
@@ -84,17 +46,10 @@ function addDependencies(): Rule {
   };
 }
 
-function updateAppModule(options: ServiceWorkerOptions): Rule {
+function updateAppModule(mainPath: string): Rule {
   return (host: Tree, context: SchematicContext) => {
     context.logger.debug('Updating appmodule');
 
-    // find app module
-    const projectTargets = getProjectTargets(host, options.project);
-    if (!projectTargets.build) {
-      throw targetBuildNotFoundError();
-    }
-
-    const mainPath = projectTargets.build.options.main;
     const modulePath = getAppModulePath(host, mainPath);
     context.logger.debug(`module path: ${modulePath}`);
 
@@ -156,23 +111,37 @@ function getTsSourceFile(host: Tree, path: string): ts.SourceFile {
 }
 
 export default function (options: ServiceWorkerOptions): Rule {
-  return (host: Tree, context: SchematicContext) => {
-    const workspace = getWorkspace(host);
-    if (!options.project) {
-      throw new SchematicsException('Option "project" is required.');
-    }
-    const project = workspace.projects[options.project];
+  return async (host: Tree, context: SchematicContext) => {
+    const workspace = await getWorkspace(host);
+    const project = workspace.projects.get(options.project);
     if (!project) {
       throw new SchematicsException(`Invalid project name (${options.project})`);
     }
-    if (project.projectType !== 'application') {
+    if (project.extensions.projectType !== 'application') {
       throw new SchematicsException(`Service worker requires a project type of "application".`);
     }
+    const buildTarget = project.targets.get('build');
+    if (!buildTarget) {
+      throw targetBuildNotFoundError();
+    }
+    const buildOptions =
+      (buildTarget.options || {}) as unknown as BrowserBuilderOptions;
+    let buildConfiguration;
+    if (options.configuration && buildTarget.configurations) {
+      buildConfiguration =
+        buildTarget.configurations[options.configuration] as BrowserBuilderOptions | undefined;
+    }
+
+    const config = buildConfiguration || buildOptions;
+    const root = project.root;
+
+    config.serviceWorker = true;
+    config.ngswConfigPath = `${root && !root.endsWith('/') ? root + '/' : root}ngsw-config.json`;
 
     const relativePathToWorkspaceRoot = project.root ?
       project.root.split('/').filter(x => x !== '').map(x => '..').join('/') : '.';
 
-    let { resourcesOutputPath = '' } = getProjectConfiguration(workspace, options);
+    let { resourcesOutputPath = '' } = config;
     if (resourcesOutputPath) {
       resourcesOutputPath = '/' + resourcesOutputPath.split('/').filter(x => !!x).join('/');
     }
@@ -186,9 +155,9 @@ export default function (options: ServiceWorkerOptions): Rule {
 
     return chain([
       mergeWith(templateSource),
-      updateConfigFile(options, project.root),
+      updateWorkspace(workspace),
       addDependencies(),
-      updateAppModule(options),
+      updateAppModule(buildOptions.main),
     ]);
   };
 }
diff --git a/packages/schematics/angular/service-worker/index_spec.ts b/packages/schematics/angular/service-worker/index_spec.ts
index cfa601319457..aded04f6075e 100644
--- a/packages/schematics/angular/service-worker/index_spec.ts
+++ b/packages/schematics/angular/service-worker/index_spec.ts
@@ -39,13 +39,15 @@ describe('Service Worker Schematic', () => {
     skipPackageJson: false,
   };
 
-  beforeEach(() => {
+  beforeEach(async () => {
     appTree = schematicRunner.runSchematic('workspace', workspaceOptions);
-    appTree = schematicRunner.runSchematic('application', appOptions, appTree);
+    appTree = await schematicRunner.runSchematicAsync('application', appOptions, appTree)
+      .toPromise();
   });
 
-  it('should update the production configuration', () => {
-    const tree = schematicRunner.runSchematic('service-worker', defaultOptions, appTree);
+  it('should update the production configuration', async () => {
+    const tree = await schematicRunner.runSchematicAsync('service-worker', defaultOptions, appTree)
+      .toPromise();
     const configText = tree.readContent('/angular.json');
     const config = JSON.parse(configText);
     const swFlag = config.projects.bar.architect
@@ -53,9 +55,10 @@ describe('Service Worker Schematic', () => {
     expect(swFlag).toEqual(true);
   });
 
-  it('should update the target options if no configuration is set', () => {
+  it('should update the target options if no configuration is set', async () => {
     const options = { ...defaultOptions, configuration: '' };
-    const tree = schematicRunner.runSchematic('service-worker', options, appTree);
+    const tree = await schematicRunner.runSchematicAsync('service-worker', options, appTree)
+      .toPromise();
     const configText = tree.readContent('/angular.json');
     const config = JSON.parse(configText);
     const swFlag = config.projects.bar.architect
@@ -63,36 +66,41 @@ describe('Service Worker Schematic', () => {
     expect(swFlag).toEqual(true);
   });
 
-  it('should add the necessary dependency', () => {
-    const tree = schematicRunner.runSchematic('service-worker', defaultOptions, appTree);
+  it('should add the necessary dependency', async () => {
+    const tree = await schematicRunner.runSchematicAsync('service-worker', defaultOptions, appTree)
+      .toPromise();
     const pkgText = tree.readContent('/package.json');
     const pkg = JSON.parse(pkgText);
     const version = pkg.dependencies['@angular/core'];
     expect(pkg.dependencies['@angular/service-worker']).toEqual(version);
   });
 
-  it('should import ServiceWorkerModule', () => {
-    const tree = schematicRunner.runSchematic('service-worker', defaultOptions, appTree);
+  it('should import ServiceWorkerModule', async () => {
+    const tree = await schematicRunner.runSchematicAsync('service-worker', defaultOptions, appTree)
+      .toPromise();
     const pkgText = tree.readContent('/projects/bar/src/app/app.module.ts');
     expect(pkgText).toMatch(/import \{ ServiceWorkerModule \} from '@angular\/service-worker'/);
   });
 
-  it('should import environment', () => {
-    const tree = schematicRunner.runSchematic('service-worker', defaultOptions, appTree);
+  it('should import environment', async () => {
+    const tree = await schematicRunner.runSchematicAsync('service-worker', defaultOptions, appTree)
+      .toPromise();
     const pkgText = tree.readContent('/projects/bar/src/app/app.module.ts');
     expect(pkgText).toMatch(/import \{ environment \} from '\.\.\/environments\/environment'/);
   });
 
-  it('should add the SW import to the NgModule imports', () => {
-    const tree = schematicRunner.runSchematic('service-worker', defaultOptions, appTree);
+  it('should add the SW import to the NgModule imports', async () => {
+    const tree = await schematicRunner.runSchematicAsync('service-worker', defaultOptions, appTree)
+      .toPromise();
     const pkgText = tree.readContent('/projects/bar/src/app/app.module.ts');
     // tslint:disable-next-line:max-line-length
     const expectedText = 'ServiceWorkerModule.register(\'ngsw-worker.js\', { enabled: environment.production })';
     expect(pkgText).toContain(expectedText);
   });
 
-  it('should put the ngsw-config.json file in the project root', () => {
-    const tree = schematicRunner.runSchematic('service-worker', defaultOptions, appTree);
+  it('should put the ngsw-config.json file in the project root', async () => {
+    const tree = await schematicRunner.runSchematicAsync('service-worker', defaultOptions, appTree)
+      .toPromise();
     const path = '/projects/bar/ngsw-config.json';
     expect(tree.exists(path)).toEqual(true);
 
@@ -101,7 +109,7 @@ describe('Service Worker Schematic', () => {
       .toBe('projects/bar/ngsw-config.json');
   });
 
-  it('should add $schema in ngsw-config.json with correct relative path', () => {
+  it('should add $schema in ngsw-config.json with correct relative path', async () => {
     const pathToNgswConfigSchema = 'node_modules/@angular/service-worker/config/schema.json';
 
     const name = 'foo';
@@ -114,38 +122,52 @@ describe('Service Worker Schematic', () => {
       ...defaultOptions,
       project: name,
     };
-    const rootAppTree = schematicRunner.runSchematic('application', rootAppOptions, appTree);
-    const treeInRoot = schematicRunner.runSchematic('service-worker', rootSWOptions, rootAppTree);
+    const rootAppTree = await schematicRunner.runSchematicAsync(
+      'application',
+      rootAppOptions,
+      appTree,
+    ).toPromise();
+    const treeInRoot = await schematicRunner.runSchematicAsync(
+      'service-worker',
+      rootSWOptions,
+      rootAppTree,
+    ).toPromise();
     const pkgTextInRoot = treeInRoot.readContent('/ngsw-config.json');
     const configInRoot = JSON.parse(pkgTextInRoot);
     expect(configInRoot.$schema).toBe(`./${pathToNgswConfigSchema}`);
 
-    const treeNotInRoot = schematicRunner.runSchematic('service-worker', defaultOptions, appTree);
+    const treeNotInRoot = await schematicRunner.runSchematicAsync(
+      'service-worker',
+      defaultOptions,
+      appTree,
+    ).toPromise();
     const pkgTextNotInRoot = treeNotInRoot.readContent('/projects/bar/ngsw-config.json');
     const configNotInRoot = JSON.parse(pkgTextNotInRoot);
     expect(configNotInRoot.$schema).toBe(`../../${pathToNgswConfigSchema}`);
   });
 
-  it('should add root assets RegExp', () => {
-    const tree = schematicRunner.runSchematic('service-worker', defaultOptions, appTree);
+  it('should add root assets RegExp', async () => {
+    const tree = await schematicRunner.runSchematicAsync('service-worker', defaultOptions, appTree)
+      .toPromise();
     const pkgText = tree.readContent('/projects/bar/ngsw-config.json');
     const config = JSON.parse(pkgText);
     expect(config.assetGroups[1].resources.files)
       .toContain('/*.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)');
   });
 
-  it('should add resourcesOutputPath to root assets when specified', () => {
+  it('should add resourcesOutputPath to root assets when specified', async () => {
     const config = JSON.parse(appTree.readContent('/angular.json'));
     config.projects.bar.architect.build.configurations.production.resourcesOutputPath = 'outDir';
     appTree.overwrite('/angular.json', JSON.stringify(config));
-    const tree = schematicRunner.runSchematic('service-worker', defaultOptions, appTree);
+    const tree = await schematicRunner.runSchematicAsync('service-worker', defaultOptions, appTree)
+      .toPromise();
     const pkgText = tree.readContent('/projects/bar/ngsw-config.json');
     const ngswConfig = JSON.parse(pkgText);
     expect(ngswConfig.assetGroups[1].resources.files)
       .toContain('/outDir/*.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)');
   });
 
-  it('should generate ngsw-config.json in root when the application is at root level', () => {
+  it('should generate ngsw-config.json in root when the application is at root level', async () => {
     const name = 'foo';
     const rootAppOptions: ApplicationOptions = {
       ...appOptions,
@@ -157,8 +179,10 @@ describe('Service Worker Schematic', () => {
       project: name,
     };
 
-    let tree = schematicRunner.runSchematic('application', rootAppOptions, appTree);
-    tree = schematicRunner.runSchematic('service-worker', rootSWOptions, tree);
+    let tree = await schematicRunner.runSchematicAsync('application', rootAppOptions, appTree)
+      .toPromise();
+    tree = await schematicRunner.runSchematicAsync('service-worker', rootSWOptions, tree)
+      .toPromise();
     expect(tree.exists('/ngsw-config.json')).toBe(true);
 
     const { projects } = JSON.parse(tree.readContent('/angular.json'));

From ca1ecb027d4c8acc60a6472f2de2724ad5baba32 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 15 Apr 2019 23:06:38 -0400
Subject: [PATCH 1181/1703] test(@schematics/angular): ensure application
 schematic is run async

---
 .../angular/app-shell/index_spec.ts           | 12 ++++++----
 .../schematics/angular/class/index_spec.ts    |  5 ++--
 .../schematics/angular/enum/index_spec.ts     |  5 ++--
 .../schematics/angular/guard/index_spec.ts    |  5 ++--
 .../schematics/angular/library/index_spec.ts  |  2 +-
 .../schematics/angular/ng-new/index_spec.ts   | 24 +++++++++----------
 .../schematics/angular/service/index_spec.ts  |  4 ++--
 .../angular/universal/index_spec.ts           | 11 ++++++---
 .../angular/web-worker/index_spec.ts          |  5 ++--
 9 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/packages/schematics/angular/app-shell/index_spec.ts b/packages/schematics/angular/app-shell/index_spec.ts
index 56355b17032a..8c6bce52d712 100644
--- a/packages/schematics/angular/app-shell/index_spec.ts
+++ b/packages/schematics/angular/app-shell/index_spec.ts
@@ -38,15 +38,19 @@ describe('App Shell Schematic', () => {
   };
   let appTree: UnitTestTree;
 
-  beforeEach(() => {
+  beforeEach(async () => {
     appTree = schematicRunner.runSchematic('workspace', workspaceOptions);
-    appTree = schematicRunner.runSchematic('application', appOptions, appTree);
+    appTree = await schematicRunner.runSchematicAsync('application', appOptions, appTree)
+      .toPromise();
   });
 
-
   it('should ensure the client app has a router-outlet', async () => {
     appTree = schematicRunner.runSchematic('workspace', workspaceOptions);
-    appTree = schematicRunner.runSchematic('application', {...appOptions, routing: false}, appTree);
+    appTree = await schematicRunner.runSchematicAsync(
+      'application',
+      {...appOptions, routing: false},
+      appTree,
+    ).toPromise();
     await expectAsync(
       schematicRunner.runSchematicAsync('appShell', defaultOptions, appTree).toPromise(),
     ).toBeRejected();
diff --git a/packages/schematics/angular/class/index_spec.ts b/packages/schematics/angular/class/index_spec.ts
index 0d07324f1407..8a43baa8a163 100644
--- a/packages/schematics/angular/class/index_spec.ts
+++ b/packages/schematics/angular/class/index_spec.ts
@@ -39,9 +39,10 @@ describe('Class Schematic', () => {
     skipPackageJson: false,
   };
   let appTree: UnitTestTree;
-  beforeEach(() => {
+  beforeEach(async () => {
     appTree = schematicRunner.runSchematic('workspace', workspaceOptions);
-    appTree = schematicRunner.runSchematic('application', appOptions, appTree);
+    appTree = await schematicRunner.runSchematicAsync('application', appOptions, appTree)
+      .toPromise();
   });
 
   it('should create just the class file', async () => {
diff --git a/packages/schematics/angular/enum/index_spec.ts b/packages/schematics/angular/enum/index_spec.ts
index 9a09afec5ddb..a7a308ae0f91 100644
--- a/packages/schematics/angular/enum/index_spec.ts
+++ b/packages/schematics/angular/enum/index_spec.ts
@@ -36,9 +36,10 @@ describe('Enum Schematic', () => {
     skipPackageJson: false,
   };
   let appTree: UnitTestTree;
-  beforeEach(() => {
+  beforeEach(async () => {
     appTree = schematicRunner.runSchematic('workspace', workspaceOptions);
-    appTree = schematicRunner.runSchematic('application', appOptions, appTree);
+    appTree = await schematicRunner.runSchematicAsync('application', appOptions, appTree)
+      .toPromise();
   });
 
   it('should create an enumeration', async () => {
diff --git a/packages/schematics/angular/guard/index_spec.ts b/packages/schematics/angular/guard/index_spec.ts
index c89ee365d067..b2044c7275ca 100644
--- a/packages/schematics/angular/guard/index_spec.ts
+++ b/packages/schematics/angular/guard/index_spec.ts
@@ -35,9 +35,10 @@ describe('Guard Schematic', () => {
     skipPackageJson: false,
   };
   let appTree: UnitTestTree;
-  beforeEach(() => {
+  beforeEach(async () => {
     appTree = schematicRunner.runSchematic('workspace', workspaceOptions);
-    appTree = schematicRunner.runSchematic('application', appOptions, appTree);
+    appTree = await schematicRunner.runSchematicAsync('application', appOptions, appTree)
+      .toPromise();
   });
 
   it('should create a guard', async () => {
diff --git a/packages/schematics/angular/library/index_spec.ts b/packages/schematics/angular/library/index_spec.ts
index 04b52654f6e2..1d817e113dbb 100644
--- a/packages/schematics/angular/library/index_spec.ts
+++ b/packages/schematics/angular/library/index_spec.ts
@@ -246,7 +246,7 @@ describe('Library Schematic', () => {
       name: 'comp',
       project: 'foo',
     };
-    tree = schematicRunner.runSchematic('component', componentOptions, tree);
+    tree = await schematicRunner.runSchematicAsync('component', componentOptions, tree).toPromise();
     expect(tree.exists('/projects/foo/src/lib/comp/comp.component.ts')).toBe(true);
   });
 
diff --git a/packages/schematics/angular/ng-new/index_spec.ts b/packages/schematics/angular/ng-new/index_spec.ts
index 96396fc942ad..ec0ed407e4ce 100644
--- a/packages/schematics/angular/ng-new/index_spec.ts
+++ b/packages/schematics/angular/ng-new/index_spec.ts
@@ -20,18 +20,18 @@ describe('Ng New Schematic', () => {
     version: '6.0.0',
   };
 
-  it('should create files of a workspace', () => {
+  it('should create files of a workspace', async () => {
     const options = { ...defaultOptions };
 
-    const tree = schematicRunner.runSchematic('ng-new', options);
+    const tree = await schematicRunner.runSchematicAsync('ng-new', options).toPromise();
     const files = tree.files;
     expect(files).toContain('/bar/angular.json');
   });
 
-  it('should create files of an application', () => {
+  it('should create files of an application', async () => {
     const options = { ...defaultOptions };
 
-    const tree = schematicRunner.runSchematic('ng-new', options);
+    const tree = await schematicRunner.runSchematicAsync('ng-new', options).toPromise();
     const files = tree.files;
     expect(files).toEqual(jasmine.arrayContaining([
       '/bar/tsconfig.app.json',
@@ -44,38 +44,38 @@ describe('Ng New Schematic', () => {
     ]));
   });
 
-  it('should should set the prefix in angular.json and in app.component.ts', () => {
+  it('should should set the prefix in angular.json and in app.component.ts', async () => {
     const options = { ...defaultOptions, prefix: 'pre' };
 
-    const tree = schematicRunner.runSchematic('ng-new', options);
+    const tree = await schematicRunner.runSchematicAsync('ng-new', options).toPromise();
     const content = tree.readContent('/bar/angular.json');
     expect(content).toMatch(/"prefix": "pre"/);
   });
 
-  it('should set up the app module', () => {
+  it('should set up the app module', async () => {
     const options: NgNewOptions = {
       name: 'foo',
       version: '6.0.0',
     };
 
-    const tree = schematicRunner.runSchematic('ng-new', options);
+    const tree = await schematicRunner.runSchematicAsync('ng-new', options).toPromise();
     const moduleContent = tree.readContent('/foo/src/app/app.module.ts');
     expect(moduleContent).toMatch(/declarations:\s*\[\s*AppComponent\s*\]/m);
   });
 
-  it('createApplication=false should create an empty workspace', () => {
+  it('createApplication=false should create an empty workspace', async () => {
     const options = { ...defaultOptions, createApplication: false };
 
-    const tree = schematicRunner.runSchematic('ng-new', options);
+    const tree = await schematicRunner.runSchematicAsync('ng-new', options).toPromise();
     const files = tree.files;
     expect(files).toContain('/bar/angular.json');
     expect(files).not.toContain('/bar/src');
   });
 
-  it('minimal=true should not create an e2e target', () => {
+  it('minimal=true should not create an e2e target', async () => {
     const options = { ...defaultOptions, minimal: true };
 
-    const tree = schematicRunner.runSchematic('ng-new', options);
+    const tree = await schematicRunner.runSchematicAsync('ng-new', options).toPromise();
     const confContent = JSON.parse(tree.readContent('/bar/angular.json'));
     expect(confContent.projects.foo.e2e).toBeUndefined();
   });
diff --git a/packages/schematics/angular/service/index_spec.ts b/packages/schematics/angular/service/index_spec.ts
index 449f22024031..59f1610a9230 100644
--- a/packages/schematics/angular/service/index_spec.ts
+++ b/packages/schematics/angular/service/index_spec.ts
@@ -36,9 +36,9 @@ describe('Service Schematic', () => {
     skipPackageJson: false,
   };
   let appTree: UnitTestTree;
-  beforeEach(() => {
+  beforeEach(async () => {
     appTree = schematicRunner.runSchematic('workspace', workspaceOptions);
-    appTree = schematicRunner.runSchematic('application', appOptions, appTree);
+    appTree = await schematicRunner.runSchematicAsync('application', appOptions, appTree).toPromise();
   });
 
   it('should create a service', async () => {
diff --git a/packages/schematics/angular/universal/index_spec.ts b/packages/schematics/angular/universal/index_spec.ts
index 59011d001d14..16c6737423bb 100644
--- a/packages/schematics/angular/universal/index_spec.ts
+++ b/packages/schematics/angular/universal/index_spec.ts
@@ -51,10 +51,15 @@ describe('Universal Schematic', () => {
 
   let appTree: UnitTestTree;
 
-  beforeEach(() => {
+  beforeEach(async () => {
     appTree = schematicRunner.runSchematic('workspace', workspaceOptions);
-    appTree = schematicRunner.runSchematic('application', initialWorkspaceAppOptions, appTree);
-    appTree = schematicRunner.runSchematic('application', appOptions, appTree);
+    appTree = await schematicRunner.runSchematicAsync(
+      'application',
+      initialWorkspaceAppOptions,
+      appTree,
+    ).toPromise();
+    appTree = await schematicRunner.runSchematicAsync('application', appOptions, appTree)
+      .toPromise();
   });
 
   it('should create a root module file', async () => {
diff --git a/packages/schematics/angular/web-worker/index_spec.ts b/packages/schematics/angular/web-worker/index_spec.ts
index 6a41658f77ce..4875ad86dad5 100644
--- a/packages/schematics/angular/web-worker/index_spec.ts
+++ b/packages/schematics/angular/web-worker/index_spec.ts
@@ -41,9 +41,10 @@ describe('Service Worker Schematic', () => {
     skipPackageJson: false,
   };
 
-  beforeEach(() => {
+  beforeEach(async () => {
     appTree = schematicRunner.runSchematic('workspace', workspaceOptions);
-    appTree = schematicRunner.runSchematic('application', appOptions, appTree);
+    appTree = await schematicRunner.runSchematicAsync('application', appOptions, appTree)
+      .toPromise();
   });
 
   it('should put the worker file in the project root', async () => {

From 10be2672bb61fbc524ff979be1776b3c826ef205 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 15 Apr 2019 23:06:59 -0400
Subject: [PATCH 1182/1703] test(@angular/pwa): ensure application schematic is
 run async

---
 packages/angular/pwa/pwa/index_spec.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/angular/pwa/pwa/index_spec.ts b/packages/angular/pwa/pwa/index_spec.ts
index e051ee1729cc..a6cd6afb90b0 100644
--- a/packages/angular/pwa/pwa/index_spec.ts
+++ b/packages/angular/pwa/pwa/index_spec.ts
@@ -42,9 +42,14 @@ describe('PWA Schematic', () => {
     skipTests: false,
   };
 
-  beforeEach(() => {
+  beforeEach(async () => {
     appTree = schematicRunner.runExternalSchematic('@schematics/angular', 'workspace', workspaceOptions);
-    appTree = schematicRunner.runExternalSchematic('@schematics/angular', 'application', appOptions, appTree);
+    appTree = await schematicRunner.runExternalSchematicAsync(
+      '@schematics/angular',
+      'application',
+      appOptions,
+      appTree,
+    ).toPromise();
   });
 
   it('should run the service worker schematic', (done) => {

From 58f6282edffe05f95b8b873cc2a3e8eab028f24c Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 15 Apr 2019 23:22:44 -0400
Subject: [PATCH 1183/1703] refactor(@schematics/angular): update application
 to use new workspace rules

---
 .../schematics/angular/application/index.ts   |  76 +++--------
 .../angular/application/index_spec.ts         | 122 +++++++++++-------
 2 files changed, 93 insertions(+), 105 deletions(-)

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 1300cc799484..b7a3568aff99 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -33,48 +33,15 @@ import {
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import { Schema as ComponentOptions } from '../component/schema';
 import { Schema as E2eOptions } from '../e2e/schema';
-import {
-  addProjectToWorkspace,
-  getWorkspace,
-} from '../utility/config';
 import { NodeDependencyType, addPackageJsonDependency } from '../utility/dependencies';
 import { findPropertyInAstObject, insertPropertyInAstObjectInOrder } from '../utility/json-utils';
 import { latestVersions } from '../utility/latest-versions';
 import { applyLintFix } from '../utility/lint-fix';
 import { validateProjectName } from '../utility/validation';
-import {
-  Builders,
-  ProjectType,
-  WorkspaceProject,
-  WorkspaceSchema,
-} from '../utility/workspace-models';
+import { getWorkspace, updateWorkspace } from '../utility/workspace';
+import { Builders, ProjectType } from '../utility/workspace-models';
 import { Schema as ApplicationOptions, Style } from './schema';
 
-
-// TODO: use JsonAST
-// function appendPropertyInAstObject(
-//   recorder: UpdateRecorder,
-//   node: JsonAstObject,
-//   propertyName: string,
-//   value: JsonValue,
-//   indent = 4,
-// ) {
-//   const indentStr = '\n' + new Array(indent + 1).join(' ');
-
-//   if (node.properties.length > 0) {
-//     // Insert comma.
-//     const last = node.properties[node.properties.length - 1];
-//     recorder.insertRight(last.start.offset + last.text.replace(/\s+$/, '').length, ',');
-//   }
-
-//   recorder.insertLeft(
-//     node.end.offset - 1,
-//     '  '
-//     + `"${propertyName}": ${JSON.stringify(value, null, 2).replace(/\n/g, indentStr)}`
-//     + indentStr.slice(0, -2),
-//   );
-// }
-
 function addDependenciesToPackageJson(options: ApplicationOptions) {
   return (host: Tree, context: SchematicContext) => {
     [
@@ -175,21 +142,10 @@ function mergeWithRootTsLint(parentHost: Tree) {
   };
 }
 
-function addAppToWorkspaceFile(options: ApplicationOptions, workspace: WorkspaceSchema): Rule {
-  // TODO: use JsonAST
-  // const workspacePath = '/angular.json';
-  // const workspaceBuffer = host.read(workspacePath);
-  // if (workspaceBuffer === null) {
-  //   throw new SchematicsException(`Configuration file (${workspacePath}) not found.`);
-  // }
-  // const workspaceJson = parseJson(workspaceBuffer.toString());
-  // if (workspaceJson.value === null) {
-  //   throw new SchematicsException(`Unable to parse configuration file (${workspacePath}).`);
-  // }
-
+function addAppToWorkspaceFile(options: ApplicationOptions, newProjectRoot: string): Rule {
   let projectRoot = options.projectRoot !== undefined
     ? options.projectRoot
-    : `${workspace.newProjectRoot}/${options.name}`;
+    : `${newProjectRoot}/${options.name}`;
 
   if (projectRoot !== '' && !projectRoot.endsWith('/')) {
     projectRoot += '/';
@@ -224,13 +180,14 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
   }
 
   const sourceRoot = join(normalize(projectRoot), 'src');
-  const project: WorkspaceProject = {
+
+  const project = {
     root: projectRoot,
     sourceRoot,
     projectType: ProjectType.Application,
     prefix: options.prefix || 'app',
     schematics,
-    architect: {
+    targets: {
       build: {
         builder: Builders.Browser,
         options: {
@@ -321,7 +278,16 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
     },
   };
 
-  return addProjectToWorkspace(workspace, options.name, project);
+  return updateWorkspace(workspace => {
+    if (workspace.projects.size === 0) {
+      workspace.extensions.defaultProject = options.name;
+    }
+
+    workspace.projects.add({
+      name: options.name,
+      ...project,
+    });
+  });
 }
 
 function minimalPathFilter(path: string): boolean {
@@ -331,7 +297,7 @@ function minimalPathFilter(path: string): boolean {
 }
 
 export default function (options: ApplicationOptions): Rule {
-  return (host: Tree, context: SchematicContext) => {
+  return async (host: Tree, context: SchematicContext) => {
     if (!options.name) {
       throw new SchematicsException(`Invalid options, "name" is required.`);
     }
@@ -353,8 +319,8 @@ export default function (options: ApplicationOptions): Rule {
         style: options.style,
       };
 
-    const workspace = getWorkspace(host);
-    const newProjectRoot = workspace.newProjectRoot || '';
+    const workspace = await getWorkspace(host);
+    const newProjectRoot = workspace.extensions.newProjectRoot as string || '';
     const isRootApp = options.projectRoot !== undefined;
     const appDir = isRootApp
       ? options.projectRoot as string
@@ -370,7 +336,7 @@ export default function (options: ApplicationOptions): Rule {
     };
 
     return chain([
-      addAppToWorkspaceFile(options, workspace),
+      addAppToWorkspaceFile(options, newProjectRoot),
       mergeWith(
         apply(url('./files'), [
           options.minimal ? filter(minimalPathFilter) : noop(),
diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
index f19d3297177b..e46bfde7d19d 100644
--- a/packages/schematics/angular/application/index_spec.ts
+++ b/packages/schematics/angular/application/index_spec.ts
@@ -38,10 +38,11 @@ describe('Application Schematic', () => {
     workspaceTree = schematicRunner.runSchematic('workspace', workspaceOptions);
   });
 
-  it('should create all files of an application', () => {
+  it('should create all files of an application', async () => {
     const options = { ...defaultOptions };
 
-    const tree = schematicRunner.runSchematic('application', options, workspaceTree);
+    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+      .toPromise();
     const files = tree.files;
     expect(files).toEqual(jasmine.arrayContaining([
       '/projects/foo/karma.conf.js',
@@ -64,35 +65,39 @@ describe('Application Schematic', () => {
     ]));
   });
 
-  it('should add the application to the workspace', () => {
+  it('should add the application to the workspace', async () => {
     const options = { ...defaultOptions };
 
-    const tree = schematicRunner.runSchematic('application', options, workspaceTree);
+    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+      .toPromise();
     const workspace = JSON.parse(tree.readContent('/angular.json'));
     expect(workspace.projects.foo).toBeDefined();
     expect(workspace.defaultProject).toBe('foo');
   });
 
-  it('should set the prefix to app if none is set', () => {
+  it('should set the prefix to app if none is set', async () => {
     const options = { ...defaultOptions };
 
-    const tree = schematicRunner.runSchematic('application', options, workspaceTree);
+    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+      .toPromise();
     const workspace = JSON.parse(tree.readContent('/angular.json'));
     expect(workspace.projects.foo.prefix).toEqual('app');
   });
 
-  it('should set the prefix correctly', () => {
+  it('should set the prefix correctly', async () => {
     const options = { ...defaultOptions, prefix: 'pre' };
 
-    const tree = schematicRunner.runSchematic('application', options, workspaceTree);
+    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+      .toPromise();
     const workspace = JSON.parse(tree.readContent('/angular.json'));
     expect(workspace.projects.foo.prefix).toEqual('pre');
   });
 
-  it('should handle the routing flag', () => {
+  it('should handle the routing flag', async () => {
     const options = { ...defaultOptions, routing: true };
 
-    const tree = schematicRunner.runSchematic('application', options, workspaceTree);
+    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+      .toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/foo/src/app/app.module.ts');
     expect(files).toContain('/projects/foo/src/app/app-routing.module.ts');
@@ -102,33 +107,36 @@ describe('Application Schematic', () => {
     expect(routingModuleContent).toMatch(/RouterModule.forRoot\(routes\)/);
   });
 
-  it('should import BrowserModule in the app module', () => {
-    const tree = schematicRunner.runSchematic('application', defaultOptions, workspaceTree);
+  it('should import BrowserModule in the app module', async () => {
+    const tree = await schematicRunner.runSchematicAsync('application', defaultOptions, workspaceTree)
+      .toPromise();
     const path = '/projects/foo/src/app/app.module.ts';
     const content = tree.readContent(path);
     expect(content).toMatch(/import { BrowserModule } from \'@angular\/platform-browser\';/);
   });
 
-  it('should declare app component in the app module', () => {
-    const tree = schematicRunner.runSchematic('application', defaultOptions, workspaceTree);
+  it('should declare app component in the app module', async () => {
+    const tree = await schematicRunner.runSchematicAsync('application', defaultOptions, workspaceTree)
+      .toPromise();
     const path = '/projects/foo/src/app/app.module.ts';
     const content = tree.readContent(path);
     expect(content).toMatch(/import { AppComponent } from \'\.\/app\.component\';/);
   });
 
-  it(`should set 'defaultEncapsulation' in main.ts when 'ViewEncapsulation' is provided`, () => {
-    const tree = schematicRunner.runSchematic('application', {
+  it(`should set 'defaultEncapsulation' in main.ts when 'ViewEncapsulation' is provided`, async () => {
+    const tree = await schematicRunner.runSchematicAsync('application', {
       ...defaultOptions,
       viewEncapsulation: ViewEncapsulation.ShadowDom,
-    }, workspaceTree);
+    }, workspaceTree).toPromise();
     const path = '/projects/foo/src/main.ts';
     const content = tree.readContent(path);
     expect(content).toContain('defaultEncapsulation: ViewEncapsulation.ShadowDom');
     expect(content).toContain(`import { enableProdMode, ViewEncapsulation } from '@angular/core'`);
   });
 
-  it('should set the right paths in the tsconfig files', () => {
-    const tree = schematicRunner.runSchematic('application', defaultOptions, workspaceTree);
+  it('should set the right paths in the tsconfig files', async () => {
+    const tree = await schematicRunner.runSchematicAsync('application', defaultOptions, workspaceTree)
+      .toPromise();
     let path = '/projects/foo/tsconfig.app.json';
     let content = tree.readContent(path);
     expect(content).toMatch('../../tsconfig.json');
@@ -139,8 +147,9 @@ describe('Application Schematic', () => {
     expect(specTsConfig.files).toEqual(['src/test.ts', 'src/polyfills.ts']);
   });
 
-  it('should set the right path and prefix in the tslint file', () => {
-    const tree = schematicRunner.runSchematic('application', defaultOptions, workspaceTree);
+  it('should set the right path and prefix in the tslint file', async () => {
+    const tree = await schematicRunner.runSchematicAsync('application', defaultOptions, workspaceTree)
+      .toPromise();
     const path = '/projects/foo/tslint.json';
     const content = JSON.parse(tree.readContent(path));
     expect(content.extends).toMatch('../../tslint.json');
@@ -148,33 +157,37 @@ describe('Application Schematic', () => {
     expect(content.rules['component-selector'][2]).toMatch('app');
   });
 
-  it('should set the right prefix in the tslint file when provided is kebabed', () => {
+  it('should set the right prefix in the tslint file when provided is kebabed', async () => {
     const options: ApplicationOptions = { ...defaultOptions, prefix: 'foo-bar' };
-    const tree = schematicRunner.runSchematic('application', options, workspaceTree);
+    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+      .toPromise();
     const path = '/projects/foo/tslint.json';
     const content = JSON.parse(tree.readContent(path));
     expect(content.rules['directive-selector'][2]).toMatch('fooBar');
     expect(content.rules['component-selector'][2]).toMatch('foo-bar');
   });
 
-  it('should set the right coverage folder in the karma.json file', () => {
-    const tree = schematicRunner.runSchematic('application', defaultOptions, workspaceTree);
+  it('should set the right coverage folder in the karma.json file', async () => {
+    const tree = await schematicRunner.runSchematicAsync('application', defaultOptions, workspaceTree)
+      .toPromise();
     const karmaConf = getFileContent(tree, '/projects/foo/karma.conf.js');
     expect(karmaConf).toContain(`dir: require('path').join(__dirname, '../../coverage/foo')`);
   });
 
-  it('minimal=true should not create e2e and test targets', () => {
+  it('minimal=true should not create e2e and test targets', async () => {
     const options = { ...defaultOptions, minimal: true };
-    const tree = schematicRunner.runSchematic('application', options, workspaceTree);
+    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+      .toPromise();
     const config = JSON.parse(tree.readContent('/angular.json'));
     const architect = config.projects.foo.architect;
     expect(architect.test).not.toBeDefined();
     expect(architect.e2e).not.toBeDefined();
   });
 
-  it('should create correct files when using minimal', () => {
+  it('should create correct files when using minimal', async () => {
     const options = { ...defaultOptions, minimal: true };
-    const tree = schematicRunner.runSchematic('application', options, workspaceTree);
+    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+      .toPromise();
     const files = tree.files;
     [
       '/projects/foo/tsconfig.spec.json',
@@ -201,38 +214,41 @@ describe('Application Schematic', () => {
   });
 
   describe(`update package.json`, () => {
-    it(`should add build-angular to devDependencies`, () => {
-      const tree = schematicRunner.runSchematic('application', defaultOptions, workspaceTree);
+    it(`should add build-angular to devDependencies`, async () => {
+      const tree = await schematicRunner.runSchematicAsync('application', defaultOptions, workspaceTree)
+        .toPromise();
 
       const packageJson = JSON.parse(tree.readContent('package.json'));
       expect(packageJson.devDependencies['@angular-devkit/build-angular'])
         .toEqual(latestVersions.DevkitBuildAngular);
     });
 
-    it('should use the latest known versions in package.json', () => {
-      const tree = schematicRunner.runSchematic('application', defaultOptions, workspaceTree);
+    it('should use the latest known versions in package.json', async () => {
+      const tree = await schematicRunner.runSchematicAsync('application', defaultOptions, workspaceTree)
+        .toPromise();
       const pkg = JSON.parse(tree.readContent('/package.json'));
       expect(pkg.devDependencies['@angular/compiler-cli']).toEqual(latestVersions.Angular);
       expect(pkg.devDependencies['typescript']).toEqual(latestVersions.TypeScript);
     });
 
-    it(`should not override existing users dependencies`, () => {
+    it(`should not override existing users dependencies`, async () => {
       const oldPackageJson = workspaceTree.readContent('package.json');
       workspaceTree.overwrite('package.json', oldPackageJson.replace(
         `"typescript": "${latestVersions.TypeScript}"`,
         `"typescript": "~2.5.2"`,
       ));
 
-      const tree = schematicRunner.runSchematic('application', defaultOptions, workspaceTree);
+      const tree = await schematicRunner.runSchematicAsync('application', defaultOptions, workspaceTree)
+        .toPromise();
       const packageJson = JSON.parse(tree.readContent('package.json'));
       expect(packageJson.devDependencies.typescript).toEqual('~2.5.2');
     });
 
-    it(`should not modify the file when --skipPackageJson`, () => {
-      const tree = schematicRunner.runSchematic('application', {
+    it(`should not modify the file when --skipPackageJson`, async () => {
+      const tree = await schematicRunner.runSchematicAsync('application', {
         name: 'foo',
         skipPackageJson: true,
-      }, workspaceTree);
+      }, workspaceTree).toPromise();
 
       const packageJson = JSON.parse(tree.readContent('package.json'));
       expect(packageJson.devDependencies['@angular-devkit/build-angular']).toBeUndefined();
@@ -240,10 +256,11 @@ describe('Application Schematic', () => {
   });
 
   describe('custom projectRoot', () => {
-    it('should put app files in the right spot', () => {
+    it('should put app files in the right spot', async () => {
       const options = { ...defaultOptions, projectRoot: '' };
 
-      const tree = schematicRunner.runSchematic('application', options, workspaceTree);
+      const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+        .toPromise();
       const files = tree.files;
       expect(files).toEqual(jasmine.arrayContaining([
         '/karma.conf.js',
@@ -266,10 +283,11 @@ describe('Application Schematic', () => {
       ]));
     });
 
-    it('should set values in angular.json correctly', () => {
+    it('should set values in angular.json correctly', async () => {
       const options = { ...defaultOptions, projectRoot: '' };
 
-      const tree = schematicRunner.runSchematic('application', options, workspaceTree);
+      const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+        .toPromise();
       const config = JSON.parse(tree.readContent('/angular.json'));
       const prj = config.projects.foo;
       expect(prj.root).toEqual('');
@@ -288,9 +306,10 @@ describe('Application Schematic', () => {
       ]);
     });
 
-    it('should set values in angular.json correctly when using a style preprocessor', () => {
+    it('should set values in angular.json correctly when using a style preprocessor', async () => {
       const options = { ...defaultOptions, projectRoot: '', style: Style.Sass };
-      const tree = schematicRunner.runSchematic('application', options, workspaceTree);
+      const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+        .toPromise();
       const config = JSON.parse(tree.readContent('/angular.json'));
       const prj = config.projects.foo;
       const buildOpt = prj.architect.build.options;
@@ -304,9 +323,10 @@ describe('Application Schematic', () => {
       expect(tree.exists('src/styles.sass')).toBe(true);
     });
 
-    it('should set the relative tsconfig paths', () => {
+    it('should set the relative tsconfig paths', async () => {
       const options = { ...defaultOptions, projectRoot: '' };
-      const tree = schematicRunner.runSchematic('application', options, workspaceTree);
+      const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+        .toPromise();
       const appTsConfig = JSON.parse(tree.readContent('/tsconfig.app.json'));
       expect(appTsConfig.extends).toEqual('./tsconfig.json');
       const specTsConfig = JSON.parse(tree.readContent('/tsconfig.spec.json'));
@@ -314,20 +334,22 @@ describe('Application Schematic', () => {
       expect(specTsConfig.files).toEqual(['src/test.ts', 'src/polyfills.ts']);
     });
 
-    it('should set the relative path and prefix in the tslint file', () => {
+    it('should set the relative path and prefix in the tslint file', async () => {
       const options = { ...defaultOptions, projectRoot: '' };
 
-      const tree = schematicRunner.runSchematic('application', options, workspaceTree);
+      const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+        .toPromise();
       const content = JSON.parse(tree.readContent('/tslint.json'));
       expect(content.extends).toMatch('tslint:recommended');
       expect(content.rules['directive-selector'][2]).toMatch('app');
       expect(content.rules['component-selector'][2]).toMatch('app');
     });
 
-    it('should merge tslint file', () => {
+    it('should merge tslint file', async () => {
       const options = { ...defaultOptions, projectRoot: '' };
 
-      const tree = schematicRunner.runSchematic('application', options, workspaceTree);
+      const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+        .toPromise();
       const content = JSON.parse(tree.readContent('/tslint.json'));
       expect(content.extends).toMatch('tslint:recommended');
       expect(content.rules['component-selector'][2]).toMatch('app');

From a3811a7ad20346ce5ba08a548ca59f79a032239f Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 15 Apr 2019 23:41:19 -0400
Subject: [PATCH 1184/1703] fix(@angular-devkit/core): ensure long workspace
 value changes are multiline

---
 packages/angular_devkit/core/src/workspace/json/writer.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/core/src/workspace/json/writer.ts b/packages/angular_devkit/core/src/workspace/json/writer.ts
index 2c087178c65c..612258636718 100644
--- a/packages/angular_devkit/core/src/workspace/json/writer.ts
+++ b/packages/angular_devkit/core/src/workspace/json/writer.ts
@@ -209,7 +209,8 @@ function updateJsonWorkspace(metadata: JsonWorkspaceMetadata): string {
     new Map<JsonAstNode | JsonAstKeyValue, (JsonAstNode | JsonAstKeyValue | string)[]>();
 
   for (const { op, path, node, value, type } of metadata.changes) {
-    const multiline = node.start.line !== node.end.line;
+    // targets/projects are typically large objects so always use multiline
+    const multiline = node.start.line !== node.end.line || type !== 'json';
     const pathSegments = path.split('/');
     const depth = pathSegments.length - 1; // TODO: more complete analysis
     const propertyOrIndex = unescapeKey(pathSegments[depth]);

From 52a014dd2348b65c2df88ec49d220266f5ceba45 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 16 Apr 2019 12:02:05 -0400
Subject: [PATCH 1185/1703] fix(@angular-devkit/core): ignore undefined targets
 when adding a workspace project

---
 etc/api/angular_devkit/core/src/_golden-api.d.ts          | 2 +-
 packages/angular_devkit/core/src/workspace/definitions.ts | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/etc/api/angular_devkit/core/src/_golden-api.d.ts b/etc/api/angular_devkit/core/src/_golden-api.d.ts
index cf48eeaca661..3bd0193425a6 100644
--- a/etc/api/angular_devkit/core/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/core/src/_golden-api.d.ts
@@ -773,7 +773,7 @@ export declare class ProjectDefinitionCollection extends DefinitionCollection<Pr
         root: string;
         sourceRoot?: string;
         prefix?: string;
-        targets?: Record<string, TargetDefinition>;
+        targets?: Record<string, TargetDefinition | undefined>;
         [key: string]: unknown;
     }): this;
     set(name: string, value: ProjectDefinition): this;
diff --git a/packages/angular_devkit/core/src/workspace/definitions.ts b/packages/angular_devkit/core/src/workspace/definitions.ts
index 95f7e21d4b6f..86dfe5664c26 100644
--- a/packages/angular_devkit/core/src/workspace/definitions.ts
+++ b/packages/angular_devkit/core/src/workspace/definitions.ts
@@ -146,7 +146,7 @@ export class ProjectDefinitionCollection extends DefinitionCollection<ProjectDef
       root: string,
       sourceRoot?: string,
       prefix?: string,
-      targets?: Record<string, TargetDefinition>,
+      targets?: Record<string, TargetDefinition | undefined>,
       [key: string]: unknown,
     },
   ): this {
@@ -165,7 +165,9 @@ export class ProjectDefinitionCollection extends DefinitionCollection<ProjectDef
 
     if (definition.targets) {
       for (const [name, target] of Object.entries(definition.targets)) {
-        project.targets.set(name, target);
+        if (target) {
+          project.targets.set(name, target);
+        }
       }
     }
 

From 950ebafa2f16cfd85fa7860dba4bfd32417a129e Mon Sep 17 00:00:00 2001
From: Nikita Poltoratsky <nik.poltoratsky@gmail.com>
Date: Thu, 11 Apr 2019 00:42:24 +0300
Subject: [PATCH 1186/1703] docs: remove surplus space

Remove surplus space from web worker description in Angular schematic collection.
---
 packages/schematics/angular/collection.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/collection.json b/packages/schematics/angular/collection.json
index 9145af5e4840..81a1fb045b86 100644
--- a/packages/schematics/angular/collection.json
+++ b/packages/schematics/angular/collection.json
@@ -105,7 +105,7 @@
       "aliases": ["web-worker", "worker"],
       "factory": "./web-worker",
       "schema": "./web-worker/schema.json",
-      "description": "Create a Web Worker ."
+      "description": "Create a Web Worker."
     }
   }
 }

From d4a1c4fca8920a1c7a0c433873e8927b5924b309 Mon Sep 17 00:00:00 2001
From: Minko Gechev <mgechev@google.com>
Date: Tue, 16 Apr 2019 15:51:08 +0200
Subject: [PATCH 1187/1703] fix(@angular-devkit/architect): consume the default
 export in TestingArchitectHost

Using the TestingArchitectHost architect is unable to execute the
handler of the builder since it needs to access its `default` property.
---
 .../angular_devkit/architect/testing/testing-architect-host.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/architect/testing/testing-architect-host.ts b/packages/angular_devkit/architect/testing/testing-architect-host.ts
index ae2f818ef904..0599979241ba 100644
--- a/packages/angular_devkit/architect/testing/testing-architect-host.ts
+++ b/packages/angular_devkit/architect/testing/testing-architect-host.ts
@@ -56,7 +56,7 @@ export class TestingArchitectHost implements ArchitectHost {
       const b = builders[builderName];
       // TODO: remove this check as v1 is not supported anymore.
       if (!b.implementation) { continue; }
-      const handler = await import(builderJsonPath + '/../' + b.implementation);
+      const handler = (await import(builderJsonPath + '/../' + b.implementation)).default;
       const optionsSchema = await import(builderJsonPath + '/../' + b.schema);
       this.addBuilder(`${packageJson.name}:${builderName}`, handler, b.description, optionsSchema);
     }

From e2a0ac1ec67b73393c1a5091519e6bb80bdaf61f Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 16 Apr 2019 19:08:27 +0200
Subject: [PATCH 1188/1703] fix(@schematics/angular): add
 `tsconfig.worker.json` to list of tsconfigs to lint

---
 packages/schematics/angular/web-worker/index.ts     | 13 ++++++++++---
 .../schematics/angular/web-worker/index_spec.ts     | 13 +++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/packages/schematics/angular/web-worker/index.ts b/packages/schematics/angular/web-worker/index.ts
index bbc83fcbca5d..25912657a876 100644
--- a/packages/schematics/angular/web-worker/index.ts
+++ b/packages/schematics/angular/web-worker/index.ts
@@ -13,7 +13,7 @@ import {
 import { appendValueInAstArray, findPropertyInAstObject } from '../utility/json-utils';
 import { parseName } from '../utility/parse-name';
 import { buildDefaultPath, getWorkspace, updateWorkspace } from '../utility/workspace';
-import { BrowserBuilderOptions } from '../utility/workspace-models';
+import { BrowserBuilderOptions, LintBuilderOptions } from '../utility/workspace-models';
 import { Schema as WebWorkerOptions } from './schema';
 
 
@@ -173,8 +173,15 @@ export default function (options: WebWorkerOptions): Rule {
 
     const needWebWorkerConfig = !projectTargetOptions.webWorkerTsConfig;
     if (needWebWorkerConfig) {
-      projectTargetOptions.webWorkerTsConfig =
-        `${root.endsWith('/') ? root : root + '/'}tsconfig.worker.json`;
+      const workerConfigPath = `${root.endsWith('/') ? root : root + '/'}tsconfig.worker.json`;
+      projectTargetOptions.webWorkerTsConfig = workerConfigPath;
+
+      // add worker tsconfig to lint architect target
+      const lintTarget = project.targets.get('lint');
+      if (lintTarget) {
+        const lintOptions = (lintTarget.options || {}) as unknown as LintBuilderOptions;
+        lintOptions.tsConfig = (lintOptions.tsConfig || []).concat(workerConfigPath);
+      }
     }
 
     const templateSource = apply(url('./files/worker'), [
diff --git a/packages/schematics/angular/web-worker/index_spec.ts b/packages/schematics/angular/web-worker/index_spec.ts
index 4875ad86dad5..25ef32d9a9b5 100644
--- a/packages/schematics/angular/web-worker/index_spec.ts
+++ b/packages/schematics/angular/web-worker/index_spec.ts
@@ -90,4 +90,17 @@ describe('Service Worker Schematic', () => {
     expect(appComponent).toContain(`new Worker('./${defaultOptions.name}.worker`);
     expect(appComponent).toContain('console.log(`page got message: ${data}`)');
   });
+
+  it('should add worker tsconfig to lint options', async () => {
+    const tree = await schematicRunner.runSchematicAsync('web-worker', defaultOptions, appTree)
+      .toPromise();
+    const workspace = JSON.parse(tree.readContent('/angular.json'));
+    const lintOptions = workspace.projects.bar.architect.lint.options;
+    expect(lintOptions.tsConfig).toEqual([
+      'projects/bar/tsconfig.app.json',
+      'projects/bar/tsconfig.spec.json',
+      'projects/bar/e2e/tsconfig.json',
+      'projects/bar/tsconfig.worker.json',
+    ]);
+  });
 });

From d2a343a40521368dc9e462f228a723b6b8fc3f2e Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Mon, 15 Apr 2019 11:01:43 -0700
Subject: [PATCH 1189/1703] docs: add cli usage analytics doc

---
 packages/angular/cli/commands/analytics.json |  6 +++---
 packages/angular/cli/commands/config-long.md | 14 ++++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/angular/cli/commands/analytics.json b/packages/angular/cli/commands/analytics.json
index cb973d0ce9f7..9001ef511d29 100644
--- a/packages/angular/cli/commands/analytics.json
+++ b/packages/angular/cli/commands/analytics.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/analytics.json",
-  "description": "Configures usage metric gathering for the Angular CLI. See http://angular.io/MORE_INFO_HERE",
+  "description": "Configures the gathering of Angular CLI usage metrics. See https://next.angular.io/cli/usage-analytics-gathering.",
   "$longDescription": "",
 
   "$aliases": [],
@@ -21,7 +21,7 @@
             "project",
             "prompt"
           ],
-          "description": ".",
+          "description": "Directly enables or disables all usage analytics for the user, or prompts the user to set the status interactively, or sets the default status for the project.",
           "$default": {
             "$source": "argv",
             "index": 0
@@ -33,7 +33,7 @@
             "off",
             "prompt"
           ],
-          "description": ".",
+          "description": "Sets the default analytics enablement status for the project.",
           "$default": {
             "$source": "argv",
             "index": 1
diff --git a/packages/angular/cli/commands/config-long.md b/packages/angular/cli/commands/config-long.md
index cd812c58a201..5f6052b3894a 100644
--- a/packages/angular/cli/commands/config-long.md
+++ b/packages/angular/cli/commands/config-long.md
@@ -1,11 +1,13 @@
-A workspace has a single CLI configuration file, `angular.json`, at the top level. 
+A workspace has a single CLI configuration file, `angular.json`, at the top level.
 The `projects` object contains a configuration object for each project in the workspace.
 
-You can edit the configuration directly in a code editor, 
-or indirectly on the command line using this command. 
+You can edit the configuration directly in a code editor,
+or indirectly on the command line using this command.
 
-The configurable property names match command option names, 
-except that in the configuration file, all names must use camelCase, 
+The configurable property names match command option names,
+except that in the configuration file, all names must use camelCase,
 while on the command line options can be given in either camelCase or dash-case.
 
-For further details, see [Workspace Configuration](guide/workspace-config).
\ No newline at end of file
+For further details, see [Workspace Configuration](guide/workspace-config).
+
+For configuration of CLI usage analytics, see [Gathering an Viewing CLI Usage Analytics](./usage-analytics-gathering).
\ No newline at end of file

From f5c41e5754cc8ab8c51ef3b7e2a8687ad82109c6 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Wed, 17 Apr 2019 10:21:12 -0700
Subject: [PATCH 1190/1703] build: Resolve ng generate aliases before logging
 analytics

---
 packages/angular/cli/commands/generate-impl.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/commands/generate-impl.ts b/packages/angular/cli/commands/generate-impl.ts
index bf61016a4aa4..3ae839ce5590 100644
--- a/packages/angular/cli/commands/generate-impl.ts
+++ b/packages/angular/cli/commands/generate-impl.ts
@@ -14,6 +14,9 @@ import { parseJsonSchemaToSubCommandDescription } from '../utilities/json-schema
 import { Schema as GenerateCommandSchema } from './generate';
 
 export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
+  // Allows us to resolve aliases before reporting analytics
+  longSchematicName: string|undefined;
+
   async initialize(options: GenerateCommandSchema & Arguments) {
     await super.initialize(options);
 
@@ -29,6 +32,7 @@ export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
 
     for (const name of schematicNames) {
       const schematic = this.getSchematic(collection, name, true);
+      this.longSchematicName = schematic.description.name;
       let subcommand: SubCommandDescription;
       if (schematic.description.schemaJson) {
         subcommand = await parseJsonSchemaToSubCommandDescription(
@@ -81,9 +85,10 @@ export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
     if (!schematicName || !collectionName) {
       return;
     }
+    const escapedSchematicName = (this.longSchematicName || schematicName).replace(/\//g, '_');
 
     return super.reportAnalytics(
-      ['generate', collectionName.replace(/\//g, '_'), schematicName.replace(/\//g, '_')],
+      ['generate', collectionName.replace(/\//g, '_'), escapedSchematicName],
       options,
     );
   }

From 0ce98ceeb35a4d35f6f2020afcccbb50e94cb3a2 Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Wed, 17 Apr 2019 11:10:12 +0200
Subject: [PATCH 1191/1703] docs(@schematics/angular): mention npx browserslist
 in browserslist

Running `npx browserslist` allows to see what browsers are actually selected with the configuration,
which is very handy and not very known.
---
 .../schematics/angular/application/files/browserslist.template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/schematics/angular/application/files/browserslist.template b/packages/schematics/angular/application/files/browserslist.template
index d6ac0551f9ef..6ae8a8ab2d57 100644
--- a/packages/schematics/angular/application/files/browserslist.template
+++ b/packages/schematics/angular/application/files/browserslist.template
@@ -2,6 +2,9 @@
 # For additional information regarding the format and rule options, please see:
 # https://github.com/browserslist/browserslist#queries
 
+# You can see what browsers were selected by your queries by running:
+#   npx browserslist
+
 # Googlebot uses an older version of Chrome
 # For additional information see: https://developers.google.com/search/docs/guides/rendering
 

From 31d882e3ecc2b9173002624b77272902e6188b9a Mon Sep 17 00:00:00 2001
From: George Kalpakas <kalpakas.g@gmail.com>
Date: Thu, 18 Apr 2019 13:50:57 +0300
Subject: [PATCH 1192/1703] docs(@schematics/angular): fix typo in web worker
 schematics ("service worker" --> "web worker")

---
 packages/schematics/angular/web-worker/schema.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/angular/web-worker/schema.json b/packages/schematics/angular/web-worker/schema.json
index 43ac37caa5f7..61bddd78ed40 100644
--- a/packages/schematics/angular/web-worker/schema.json
+++ b/packages/schematics/angular/web-worker/schema.json
@@ -3,14 +3,14 @@
   "id": "SchematicsAngularWebWorker",
   "title": "Angular Web Worker Options Schema",
   "type": "object",
-  "description": "Pass this schematic to the \"run\" command to create a Web Worker",
+  "description": "Creates a new generic web worker definition in the given or default project.",
   "properties": {
     "path": {
       "type": "string",
       "format": "path",
       "description": "The path at which to create the worker file, relative to the current workspace.",
       "visible": false
-    },    
+    },
     "project": {
       "type": "string",
       "description": "The name of the project.",
@@ -20,7 +20,7 @@
     },
     "target": {
       "type": "string",
-      "description": "The target to apply service worker to.",
+      "description": "The target to apply web worker to.",
       "default": "build"
     },
     "name": {
@@ -36,7 +36,7 @@
       "type": "boolean",
       "default": true,
       "description": "Add a worker creation snippet in a sibling file of the same name."
-    }    
+    }
   },
   "required": [
     "name",

From 1af164b39ecc902c3c4816ce009fbb93b189b313 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 17 Apr 2019 08:05:16 +0200
Subject: [PATCH 1193/1703] refactor: rename es5 polyfills entrypoint name to
 polyfills-es5

---
 .../src/angular-cli-files/models/webpack-configs/browser.ts | 4 ++--
 .../src/angular-cli-files/models/webpack-configs/common.ts  | 4 ++--
 .../src/angular-cli-files/utilities/package-chunk-sort.ts   | 2 +-
 tests/legacy-cli/e2e/tests/misc/support-ie.ts               | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
index 510b1b968f2a..d805e2f15e8c 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
@@ -45,7 +45,7 @@ export function getBrowserConfig(wco: WebpackConfigOptions): webpack.Configurati
       entrypoints: generateEntryPoints(buildOptions),
       deployUrl: buildOptions.deployUrl,
       sri: buildOptions.subresourceIntegrity,
-      noModuleEntrypoints: ['polyfills.es5'],
+      noModuleEntrypoints: ['polyfills-es5'],
     }));
   }
 
@@ -114,7 +114,7 @@ export function getBrowserConfig(wco: WebpackConfigOptions): webpack.Configurati
               const moduleName = module.nameForCondition ? module.nameForCondition() : '';
 
               return /[\\/]node_modules[\\/]/.test(moduleName)
-                && !chunks.some(({ name }) => name === 'polyfills' || name === 'polyfills.es5'
+                && !chunks.some(({ name }) => name === 'polyfills' || name === 'polyfills-es5'
                   || globalStylesBundleNames.includes(name));
             },
           },
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index a3c50047c531..2a550be777db 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -83,9 +83,9 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
     // For NON differential loading we want to have 2 polyfill bundles
     if (buildOptions.es5BrowserSupport
       || (buildOptions.es5BrowserSupport === undefined && isEs5SupportNeeded(projectRoot))) {
-      entryPoints['polyfills.es5'] = [es5Polyfills];
+      entryPoints['polyfills-es5'] = [es5Polyfills];
       if (!buildOptions.aot) {
-        entryPoints['polyfills.es5'].push(es5JitPolyfills);
+        entryPoints['polyfills-es5'].push(es5JitPolyfills);
       }
     }
   }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts
index 6e08a5b614d1..5f45c58c7af5 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts
@@ -26,7 +26,7 @@ export function generateEntryPoints(
   };
 
   const entryPoints = [
-    'polyfills.es5',
+    'polyfills-es5',
     'polyfills',
     'sw-register',
     ...extraEntryPoints(appConfig.styles, 'styles'),
diff --git a/tests/legacy-cli/e2e/tests/misc/support-ie.ts b/tests/legacy-cli/e2e/tests/misc/support-ie.ts
index 6f8782536a7c..616b4363a6cc 100644
--- a/tests/legacy-cli/e2e/tests/misc/support-ie.ts
+++ b/tests/legacy-cli/e2e/tests/misc/support-ie.ts
@@ -16,7 +16,7 @@ export default async function () {
 
   await writeFile('browserslist', 'last 2 Chrome versions');
   await ng('build');
-  await expectFileNotToExist('dist/test-project/polyfills.es5.js');
+  await expectFileNotToExist('dist/test-project/polyfills-es5.js');
   await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
     <script src="runtime.js"></script>
     <script src="polyfills.js"></script>
@@ -27,10 +27,10 @@ export default async function () {
 
   await writeFile('browserslist', 'IE 10');
   await ng('build', `--es5BrowserSupport`);
-  await expectFileToMatch('dist/test-project/polyfills.es5.js', 'core-js');
+  await expectFileToMatch('dist/test-project/polyfills-es5.js', 'core-js');
   await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
     <script src="runtime.js"></script>
-    <script src="polyfills.es5.js" nomodule></script>
+    <script src="polyfills-es5.js" nomodule></script>
     <script src="polyfills.js"></script>
     <script src="styles.js"></script>
     <script src="vendor.js"></script>

From b976a3e72b2284572048dadeb374ccba7aa45c01 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 17 Apr 2019 08:05:46 +0200
Subject: [PATCH 1194/1703] refactor(@schematics/angular): don't add
 `es5BrowserSupport` by default

---
 packages/schematics/angular/application/index.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index b7a3568aff99..e8b877b110ee 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -204,7 +204,6 @@ function addAppToWorkspaceFile(options: ApplicationOptions, newProjectRoot: stri
             `${sourceRoot}/styles.${options.style}`,
           ],
           scripts: [],
-          es5BrowserSupport: true,
         },
         configurations: {
           production: {

From 62e3e75e3d939a774ee7804e731d603ad64ce119 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 17 Apr 2019 08:12:33 +0200
Subject: [PATCH 1195/1703] test: add e2e for ie support without
 es5BrowserSupport

---
 tests/legacy-cli/e2e/tests/misc/support-ie.ts | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/tests/legacy-cli/e2e/tests/misc/support-ie.ts b/tests/legacy-cli/e2e/tests/misc/support-ie.ts
index 616b4363a6cc..cb53aa43ff21 100644
--- a/tests/legacy-cli/e2e/tests/misc/support-ie.ts
+++ b/tests/legacy-cli/e2e/tests/misc/support-ie.ts
@@ -25,7 +25,6 @@ export default async function () {
     <script src="main.js"></script>
   `);
 
-  await writeFile('browserslist', 'IE 10');
   await ng('build', `--es5BrowserSupport`);
   await expectFileToMatch('dist/test-project/polyfills-es5.js', 'core-js');
   await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
@@ -36,4 +35,20 @@ export default async function () {
     <script src="vendor.js"></script>
     <script src="main.js"></script>
   `);
+
+  await updateJsonFile('angular.json', workspaceJson => {
+    const appArchitect = workspaceJson.projects['test-project'].architect;
+    appArchitect.build.options.es5BrowserSupport = undefined;
+  });
+  await writeFile('browserslist', 'IE 10');
+  await ng('build');
+  await expectFileToMatch('dist/test-project/polyfills-es5.js', 'core-js');
+  await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
+    <script src="runtime.js"></script>
+    <script src="polyfills-es5.js" nomodule></script>
+    <script src="polyfills.js"></script>
+    <script src="styles.js"></script>
+    <script src="vendor.js"></script>
+    <script src="main.js"></script>
+  `);
 }

From 356a63870872f644ea082002db3e24a6b98f32b8 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 18 Apr 2019 04:23:50 +0000
Subject: [PATCH 1196/1703] build: update browserslist to version 4.5.5

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 37 +++++++++++++++----
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 7b7f8c8b0e9c..a9319e8d0651 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -14,7 +14,7 @@
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.10.0",
     "autoprefixer": "9.5.1",
-    "browserslist": "4.5.4",
+    "browserslist": "4.5.5",
     "caniuse-api": "3.0.0",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
diff --git a/yarn.lock b/yarn.lock
index d4bba24ee49e..939c14ad4821 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1580,14 +1580,14 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@4.5.4, browserslist@^4.5.4:
-  version "4.5.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.4.tgz#166c4ecef3b51737a42436ea8002aeea466ea2c7"
-  integrity sha512-rAjx494LMjqKnMPhFkuLmLp8JWEX0o8ADTGeAbOqaF+XCvYLreZrG5uVjnPBlAQ8REZK4pzXGvp0bWgrFtKaag==
+browserslist@4.5.5:
+  version "4.5.5"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.5.tgz#fe1a352330d2490d5735574c149a85bc18ef9b82"
+  integrity sha512-0QFO1r/2c792Ohkit5XI8Cm8pDtZxgNl2H6HU4mHrpYz7314pEYcsAVVatM0l/YmxPnEzh9VygXouj4gkFUTKA==
   dependencies:
-    caniuse-lite "^1.0.30000955"
-    electron-to-chromium "^1.3.122"
-    node-releases "^1.1.13"
+    caniuse-lite "^1.0.30000960"
+    electron-to-chromium "^1.3.124"
+    node-releases "^1.1.14"
 
 browserslist@^4.0.0, browserslist@^4.3.3:
   version "4.3.4"
@@ -1598,6 +1598,15 @@ browserslist@^4.0.0, browserslist@^4.3.3:
     electron-to-chromium "^1.3.82"
     node-releases "^1.0.1"
 
+browserslist@^4.5.4:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.4.tgz#166c4ecef3b51737a42436ea8002aeea466ea2c7"
+  integrity sha512-rAjx494LMjqKnMPhFkuLmLp8JWEX0o8ADTGeAbOqaF+XCvYLreZrG5uVjnPBlAQ8REZK4pzXGvp0bWgrFtKaag==
+  dependencies:
+    caniuse-lite "^1.0.30000955"
+    electron-to-chromium "^1.3.122"
+    node-releases "^1.1.13"
+
 browserstack@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.5.1.tgz#e2dfa66ffee940ebad0a07f7e00fd4687c455d66"
@@ -1833,6 +1842,11 @@ caniuse-lite@^1.0.30000955, caniuse-lite@^1.0.30000957:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz#fb1026bf184d7d62c685205358c3b24b9e29f7b3"
   integrity sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ==
 
+caniuse-lite@^1.0.30000960:
+  version "1.0.30000960"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000960.tgz#ec48297037e5607f582f246ae7b12bee66a78999"
+  integrity sha512-7nK5qs17icQaX6V3/RYrJkOsZyRNnroA4+ZwxaKJzIKy+crIy0Mz5CBlLySd2SNV+4nbUZeqeNfiaEieUBu3aA==
+
 canonical-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
@@ -3106,7 +3120,7 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.122:
+electron-to-chromium@^1.3.122, electron-to-chromium@^1.3.124:
   version "1.3.124"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
   integrity sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==
@@ -6427,6 +6441,13 @@ node-releases@^1.1.13:
   dependencies:
     semver "^5.3.0"
 
+node-releases@^1.1.14:
+  version "1.1.15"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.15.tgz#9e76a73b0eca3bf7801addaa0e6ce90c795f2b9a"
+  integrity sha512-cKV097BQaZr8LTSRUa2+oc/aX5L8UkZtPQrMSTgiJEeaW7ymTDCoRaGCoaTqk0lqnalcoSHu4wjSl0Cmj2+bMw==
+  dependencies:
+    semver "^5.3.0"
+
 node-sass-tilde-importer@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz#1a15105c153f648323b4347693fdb0f331bad1ce"

From 9ce260837c69aecce7229896f786ed7469a88505 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 18 Apr 2019 01:33:49 +0000
Subject: [PATCH 1197/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index e34f95c23017..94fc94eb170e 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#01733fc3bedfe8754c9989e031b69a894c4a48dd",
-    "@angular/common": "github:angular/common-builds#04aab6000cb6d2634ec370b3679410a66f2d905c",
-    "@angular/compiler": "github:angular/compiler-builds#456f2c9abb14fba57d665f54d35cc2ef7c23236e",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#f25bd97b28eb67996da95b79362eb9e17bd68354",
-    "@angular/core": "github:angular/core-builds#b3aed1916744bbfb58216ca16a4342156146ae53",
-    "@angular/forms": "github:angular/forms-builds#1d14eec06d5f0541cc5dcc1b668cd40c7553d47f",
-    "@angular/language-service": "github:angular/language-service-builds#f8940edf04e99bc9db2482c04f8226c016003771",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#84ba7cacd7e79d3a8b27c9c28d8beff66bad0f67",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#548dc5a2b2c5b3bfb80a14cb709a810589a7a573",
-    "@angular/router": "github:angular/router-builds#935125d8ec3b4d1b0b2c5022e673434d41a52e79"
+    "@angular/animations": "github:angular/animations-builds#52aeaad2ae2c1cccfe6c23f91e5f9415eca98f8b",
+    "@angular/common": "github:angular/common-builds#3992286c1ad7811692a41565d1b9ff8ed4a64921",
+    "@angular/compiler": "github:angular/compiler-builds#e67a38d3cf4c06f05800cf41e7a3051cf487aca0",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#3add75626f67ebae2d8d26d0e348c7c62333a46e",
+    "@angular/core": "github:angular/core-builds#f732b02fab309eea458709a39a151ecbaba22fb8",
+    "@angular/forms": "github:angular/forms-builds#e4dd591a2f7d9c25280a796d9afbc7022cfd7404",
+    "@angular/language-service": "github:angular/language-service-builds#a527fb0f5c6d4664f17a81272cd069cfb63a4256",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#b4f6007397eb20e5beaba1c8f1c5e10d2d21fbb9",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#428994a2b9e60acebb421c98fa852969e206b22e",
+    "@angular/router": "github:angular/router-builds#212bdec40188d77ac5c4b8b638151aa96c4e429e"
   }
 }
\ No newline at end of file

From 2ee76e73716f8af4efe9ca7f25497179afbae2a2 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 16 Apr 2019 18:46:19 -0400
Subject: [PATCH 1198/1703] refactor(@angular-devkit/build-angular): cleanup
 service-worker augmentation

---
 .../utilities/service-worker/index.ts         | 192 +++++++-----------
 1 file changed, 72 insertions(+), 120 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/service-worker/index.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/service-worker/index.ts
index 9ef70e5ac91a..fb1baa6ebc31 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/service-worker/index.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/service-worker/index.ts
@@ -5,13 +5,13 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// TODO: cleanup this file, it's copied as is from Angular CLI.
 import {
   Path,
   dirname,
   getSystemPath,
   join,
   normalize,
+  relative,
   tags,
   virtualFs,
 } from '@angular-devkit/core';
@@ -20,49 +20,23 @@ import {
   Generator,
 } from '@angular/service-worker/config'; // tslint:disable-line:no-implicit-dependencies
 import * as crypto from 'crypto';
-import * as fs from 'fs';
-import { Observable, from, merge, of } from 'rxjs';
-import { concatMap, map, mergeMap, reduce, switchMap, toArray } from 'rxjs/operators';
-import * as semver from 'semver';
-import { resolveProjectModule } from '../require-project-module';
-
-
-export const NEW_SW_VERSION = '5.0.0-rc.0';
-
 
 class CliFilesystem implements Filesystem {
   constructor(private _host: virtualFs.Host, private base: string) { }
 
   list(path: string): Promise<string[]> {
-    const recursiveList = (path: Path): Observable<Path> => this._host.list(path).pipe(
-      // Emit each fragment individually.
-      concatMap(fragments => from(fragments)),
-      // Join the path with fragment.
-      map(fragment => join(path, fragment)),
-      // Emit directory content paths instead of the directory path.
-      mergeMap(path => this._host.isDirectory(path).pipe(
-          concatMap(isDir => isDir ? recursiveList(path) : of(path)),
-        ),
-      ),
-    );
-
-    return recursiveList(this._resolve(path)).pipe(
-      map(path => path.replace(this.base, '')),
-      toArray(),
-    ).toPromise().then(x => x, _err => []);
+    return this._recursiveList(this._resolve(path), []).catch(() => []);
   }
 
-  read(path: string): Promise<string> {
-    return this._readIntoBuffer(path)
-      .then(content => virtualFs.fileBufferToString(content));
+  async read(path: string): Promise<string> {
+    return virtualFs.fileBufferToString(await this._readIntoBuffer(path));
   }
 
-  hash(path: string): Promise<string> {
+  async hash(path: string): Promise<string> {
     const sha1 = crypto.createHash('sha1');
+    sha1.update(Buffer.from(await this._readIntoBuffer(path)));
 
-    return this._readIntoBuffer(path)
-      .then(content => sha1.update(Buffer.from(content)))
-      .then(() => sha1.digest('hex'));
+    return sha1.digest('hex');
   }
 
   write(path: string, content: string): Promise<void> {
@@ -70,45 +44,32 @@ class CliFilesystem implements Filesystem {
       .toPromise();
   }
 
-  private _readIntoBuffer(path: string): Promise<virtualFs.FileBuffer> {
-    return this._host.read(this._resolve(path))
-      .toPromise();
+  private _readIntoBuffer(path: string): Promise<ArrayBuffer> {
+    return this._host.read(this._resolve(path)).toPromise();
   }
 
   private _resolve(path: string): Path {
-    return join(normalize(this.base), path);
+    return join(normalize(this.base), normalize(path));
   }
-}
 
-export function usesServiceWorker(projectRoot: string): boolean {
-  let swPackageJsonPath;
-
-  try {
-    swPackageJsonPath = resolveProjectModule(projectRoot, '@angular/service-worker/package.json');
-  } catch (_) {
-    // @angular/service-worker is not installed
-    throw new Error(tags.stripIndent`
-    Your project is configured with serviceWorker = true, but @angular/service-worker
-    is not installed. Run \`npm install --save-dev @angular/service-worker\`
-    and try again, or run \`ng set apps.0.serviceWorker=false\` in your .angular-cli.json.
-  `);
-  }
+  private async _recursiveList(path: Path, items: string[]): Promise<string[]> {
+    const fragments = await this._host.list(path).toPromise();
 
-  const swPackageJson = fs.readFileSync(swPackageJsonPath).toString();
-  const swVersion = JSON.parse(swPackageJson)['version'];
+    for (const fragment of fragments) {
+      const item = join(path, fragment);
 
-  if (!semver.gte(swVersion, NEW_SW_VERSION)) {
-    throw new Error(tags.stripIndent`
-    The installed version of @angular/service-worker is ${swVersion}. This version of the CLI
-    requires the @angular/service-worker version to satisfy ${NEW_SW_VERSION}. Please upgrade
-    your service worker version.
-  `);
-  }
+      if (await this._host.isDirectory(item).toPromise()) {
+        await this._recursiveList(item, items);
+      } else {
+        items.push('/' + relative(normalize(this.base), item));
+      }
+    }
 
-  return true;
+    return items;
+  }
 }
 
-export function augmentAppWithServiceWorker(
+export async function augmentAppWithServiceWorker(
   host: virtualFs.Host,
   projectRoot: Path,
   appRoot: Path,
@@ -116,69 +77,60 @@ export function augmentAppWithServiceWorker(
   baseHref: string,
   ngswConfigPath?: string,
 ): Promise<void> {
-  // Path to the worker script itself.
   const distPath = normalize(outputPath);
+  const systemProjectRoot = getSystemPath(projectRoot);
+
+  // Find the service worker package
   const workerPath = normalize(
-    resolveProjectModule(getSystemPath(projectRoot), '@angular/service-worker/ngsw-worker.js'),
+    require.resolve('@angular/service-worker/ngsw-worker.js', { paths: [systemProjectRoot] }),
   );
-  const swConfigPath = resolveProjectModule(
-    getSystemPath(projectRoot),
+  const swConfigPath = require.resolve(
     '@angular/service-worker/config',
+    { paths: [systemProjectRoot] },
   );
-  const safetyPath = join(dirname(workerPath), 'safety-worker.js');
-  const configPath = ngswConfigPath as Path || join(appRoot, 'ngsw-config.json');
-
-  return host.exists(configPath).pipe(
-    switchMap(exists => {
-      if (!exists) {
-        throw new Error(tags.oneLine`
-          Error: Expected to find an ngsw-config.json configuration
-          file in the ${appRoot} folder. Either provide one or disable Service Worker
-          in your angular.json configuration file.`,
-        );
-      }
 
-      return host.read(configPath) as Observable<virtualFs.FileBuffer>;
-    }),
-    map(content => JSON.parse(virtualFs.fileBufferToString(content))),
-    switchMap(configJson => {
-      const GeneratorConstructor = require(swConfigPath).Generator as typeof Generator;
-      const gen = new GeneratorConstructor(new CliFilesystem(host, outputPath), baseHref);
-
-      return gen.process(configJson);
-    }),
-
-    switchMap(output => {
-      const manifest = JSON.stringify(output, null, 2);
-
-      return host.read(workerPath).pipe(
-        switchMap(workerCode => {
-          return merge(
-            host.write(join(distPath, 'ngsw.json'), virtualFs.stringToFileBuffer(manifest)),
-            host.write(join(distPath, 'ngsw-worker.js'), workerCode),
-          ) as Observable<void>;
-        }),
-      );
-    }),
-
-    switchMap(() => host.exists(safetyPath)),
-    // If @angular/service-worker has the safety script, copy it into two locations.
-    switchMap(exists => {
-      if (!exists) {
-        return of<void>(undefined);
-      }
+  // Determine the configuration file path
+  let configPath;
+  if (ngswConfigPath) {
+    configPath = normalize(ngswConfigPath);
+  } else {
+    configPath = join(appRoot, 'ngsw-config.json');
+  }
+
+  // Ensure the configuration file exists
+  const configExists = await host.exists(configPath).toPromise();
+  if (!configExists) {
+    throw new Error(tags.oneLine`
+      Error: Expected to find an ngsw-config.json configuration
+      file in the ${appRoot} folder. Either provide one or disable Service Worker
+      in your angular.json configuration file.
+    `);
+  }
+
+  // Read the configuration file
+  const config = JSON.parse(virtualFs.fileBufferToString(await host.read(configPath).toPromise()));
+
+  // Generate the manifest
+  const GeneratorConstructor = require(swConfigPath).Generator as typeof Generator;
+  const generator = new GeneratorConstructor(new CliFilesystem(host, outputPath), baseHref);
+  const output = await generator.process(config);
 
-      return host.read(safetyPath).pipe(
-        switchMap(safetyCode => {
-          return merge(
-            host.write(join(distPath, 'worker-basic.min.js'), safetyCode),
-            host.write(join(distPath, 'safety-worker.js'), safetyCode),
-          ) as Observable<void>;
-        }),
-      );
-    }),
-
-    // Remove all elements, reduce them to a single emit.
-    reduce(() => {}),
-  ).toPromise();
+  // Write the manifest
+  const manifest = JSON.stringify(output, null, 2);
+  await host.write(join(distPath, 'ngsw.json'), virtualFs.stringToFileBuffer(manifest)).toPromise();
+
+  // Write the worker code
+  // NOTE: This is inefficient (kernel -> userspace -> kernel).
+  //       `fs.copyFile` would be a better option but breaks the host abstraction
+  const workerCode = await host.read(workerPath).toPromise();
+  await host.write(join(distPath, 'ngsw-worker.js'), workerCode).toPromise();
+
+  // If present, write the safety worker code
+  const safetyPath = join(dirname(workerPath), 'safety-worker.js');
+  if (await host.exists(safetyPath).toPromise()) {
+    const safetyCode = await host.read(safetyPath).toPromise();
+
+    await host.write(join(distPath, 'worker-basic.min.js'), safetyCode).toPromise();
+    await host.write(join(distPath, 'safety-worker.js'), safetyCode).toPromise();
+  }
 }

From 407d1d5b49d255dc8fa0545236df19f082a406d5 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Thu, 18 Apr 2019 11:20:04 +0200
Subject: [PATCH 1199/1703] fix(@schematics/angular): generate
 `tsconfig.worker.json` outside of the `src` folder

This is to align with the folder structure of version 8, were tsconfigs are outside of the `src` folder

Also, this change remove the dud `tsconfig.json` in the `src` folder and instead we add the triple slash lib reference `/// <reference lib="webworker" />` for IDE support.
---
 .../test/browser/web-worker_spec_large.ts     |  2 +
 .../project-tsconfig/tsconfig.json.template   | 10 ---
 .../tsconfig.worker.json.template             |  4 +-
 .../__name@dasherize__.worker.ts.template     |  2 +
 .../schematics/angular/web-worker/index.ts    | 74 +++++--------------
 .../angular/web-worker/index_spec.ts          | 29 +++++---
 tests/legacy-cli/e2e/tests/build/worker.ts    |  4 +-
 7 files changed, 47 insertions(+), 78 deletions(-)
 delete mode 100644 packages/schematics/angular/web-worker/files/project-tsconfig/tsconfig.json.template

diff --git a/packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts
index a7373d110fd0..711a9267e118 100644
--- a/packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts
@@ -26,6 +26,8 @@ describe('Browser Builder Web Worker support', () => {
   const workerFiles: { [k: string]: string } = {
     'src/app/dep.ts': `export const foo = 'bar';`,
     'src/app/app.worker.ts': `
+      /// <reference lib="webworker" />
+
       import { foo } from './dep';
       console.log('hello from worker');
       addEventListener('message', ({ data }) => {
diff --git a/packages/schematics/angular/web-worker/files/project-tsconfig/tsconfig.json.template b/packages/schematics/angular/web-worker/files/project-tsconfig/tsconfig.json.template
deleted file mode 100644
index b170f6d1d0e5..000000000000
--- a/packages/schematics/angular/web-worker/files/project-tsconfig/tsconfig.json.template
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "extends": "<%= relativePathToWorkspaceRoot %>/tsconfig.json",
-  "compilerOptions": {
-    "lib": [
-      "es2018",
-      "dom",
-      "webworker"
-    ],
-  }
-}
diff --git a/packages/schematics/angular/web-worker/files/worker-tsconfig/tsconfig.worker.json.template b/packages/schematics/angular/web-worker/files/worker-tsconfig/tsconfig.worker.json.template
index 33b92e255762..166d26bac399 100644
--- a/packages/schematics/angular/web-worker/files/worker-tsconfig/tsconfig.worker.json.template
+++ b/packages/schematics/angular/web-worker/files/worker-tsconfig/tsconfig.worker.json.template
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "<%= relativePathToWorkspaceRoot %>/tsconfig.json",
   "compilerOptions": {
     "outDir": "<%= relativePathToWorkspaceRoot %>/out-tsc/worker",
     "lib": [
@@ -9,6 +9,6 @@
     "types": []
   },
   "include": [
-    "**/*.worker.ts"
+    "src/**/*.worker.ts"
   ]
 }
diff --git a/packages/schematics/angular/web-worker/files/worker/__name@dasherize__.worker.ts.template b/packages/schematics/angular/web-worker/files/worker/__name@dasherize__.worker.ts.template
index 27020fe12b04..b7049b0b80c6 100644
--- a/packages/schematics/angular/web-worker/files/worker/__name@dasherize__.worker.ts.template
+++ b/packages/schematics/angular/web-worker/files/worker/__name@dasherize__.worker.ts.template
@@ -1,3 +1,5 @@
+/// <reference lib="webworker" />
+
 addEventListener('message', ({ data }) => {
   const response = `worker response to ${data}`;
   postMessage(response);
diff --git a/packages/schematics/angular/web-worker/index.ts b/packages/schematics/angular/web-worker/index.ts
index 25912657a876..92e6df7ff45c 100644
--- a/packages/schematics/angular/web-worker/index.ts
+++ b/packages/schematics/angular/web-worker/index.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { JsonParseMode, parseJsonAst, strings, tags } from '@angular-devkit/core';
+import { JsonParseMode, join, normalize, parseJsonAst, strings, tags } from '@angular-devkit/core';
 import {
   Rule, SchematicContext, SchematicsException, Tree,
   apply, applyTemplates, chain, mergeWith, move, noop, url,
@@ -21,54 +21,16 @@ function addConfig(options: WebWorkerOptions, root: string, tsConfigPath: string
   return (host: Tree, context: SchematicContext) => {
     context.logger.debug('updating project configuration.');
 
-    const tsConfigRules = [];
-
-    // Add tsconfig.worker.json.
-    const relativePathToWorkspaceRoot = root.split('/').map(x => '..').join('/');
-    tsConfigRules.push(mergeWith(apply(url('./files/worker-tsconfig'), [
-      applyTemplates({ ...options, relativePathToWorkspaceRoot }),
-      move(root),
-    ])));
-
-    // Add project tsconfig.json.
-    // The project level tsconfig.json with webworker lib is for editor support since
-    // the dom and webworker libs are mutually exclusive.
-    // Note: this schematic does not change other tsconfigs to use the project-level tsconfig.
-    const projectTsConfigPath = `${root}/tsconfig.json`;
-    if (host.exists(projectTsConfigPath)) {
-      // If the file already exists, alter it.
-      const buffer = host.read(projectTsConfigPath);
-      if (buffer) {
-        const tsCfgAst = parseJsonAst(buffer.toString(), JsonParseMode.Loose);
-        if (tsCfgAst.kind != 'object') {
-          throw new SchematicsException('Invalid tsconfig. Was expecting an object');
-        }
-        const optsAstNode = findPropertyInAstObject(tsCfgAst, 'compilerOptions');
-        if (optsAstNode && optsAstNode.kind != 'object') {
-          throw new SchematicsException(
-            'Invalid tsconfig "compilerOptions" property; Was expecting an object.');
-        }
-        const libAstNode = findPropertyInAstObject(tsCfgAst, 'lib');
-        if (libAstNode && libAstNode.kind != 'array') {
-          throw new SchematicsException('Invalid tsconfig "lib" property; expected an array.');
-        }
-        const newLibProp = 'webworker';
-        if (libAstNode && !libAstNode.value.includes(newLibProp)) {
-          const recorder = host.beginUpdate(projectTsConfigPath);
-          appendValueInAstArray(recorder, libAstNode, newLibProp);
-          host.commitUpdate(recorder);
-        }
-      }
-    } else {
-      // Otherwise create it.
-      tsConfigRules.push(mergeWith(apply(url('./files/project-tsconfig'), [
-        applyTemplates({ ...options, relativePathToWorkspaceRoot }),
-        move(root),
-      ])));
-    }
+    // todo: replace with the new helper method in a seperate PR
+    // https://github.com/angular/angular-cli/pull/14207
+    const rootNormalized = root.endsWith('/') ? root.slice(0, -1) : root;
+    const relativePathToWorkspaceRoot =
+      rootNormalized
+        ? rootNormalized.split('/').map(x => '..').join('/')
+        : '.';
 
     // Add worker glob exclusion to tsconfig.app.json.
-    const workerGlob = '**/*.worker.ts';
+    const workerGlob = 'src/**/*.worker.ts';
     const buffer = host.read(tsConfigPath);
     if (buffer) {
       const tsCfgAst = parseJsonAst(buffer.toString(), JsonParseMode.Loose);
@@ -80,17 +42,19 @@ function addConfig(options: WebWorkerOptions, root: string, tsConfigPath: string
         throw new SchematicsException('Invalid tsconfig "exclude" property; expected an array.');
       }
 
-      if (filesAstNode && filesAstNode.value.indexOf(workerGlob) == -1) {
+      if (filesAstNode && !filesAstNode.value.includes(workerGlob)) {
         const recorder = host.beginUpdate(tsConfigPath);
         appendValueInAstArray(recorder, filesAstNode, workerGlob);
         host.commitUpdate(recorder);
       }
     }
 
-    return chain([
-      // Add tsconfigs.
-      ...tsConfigRules,
-    ]);
+    return mergeWith(
+      apply(url('./files/worker-tsconfig'), [
+        applyTemplates({ ...options, relativePathToWorkspaceRoot }),
+        move(root),
+      ]),
+    );
   };
 }
 
@@ -145,7 +109,7 @@ export default function (options: WebWorkerOptions): Rule {
       throw new SchematicsException('Option "project" is required.');
     }
     if (!options.target) {
-      throw new SchematicsException('Option (target) is required.');
+      throw new SchematicsException('Option "target" is required.');
     }
 
     const project = workspace.projects.get(options.project);
@@ -169,11 +133,11 @@ export default function (options: WebWorkerOptions): Rule {
     const parsedPath = parseName(options.path, options.name);
     options.name = parsedPath.name;
     options.path = parsedPath.path;
-    const root = project.root || project.sourceRoot || '';
+    const root = project.root || '';
 
     const needWebWorkerConfig = !projectTargetOptions.webWorkerTsConfig;
     if (needWebWorkerConfig) {
-      const workerConfigPath = `${root.endsWith('/') ? root : root + '/'}tsconfig.worker.json`;
+      const workerConfigPath = join(normalize(root), 'tsconfig.worker.json');
       projectTargetOptions.webWorkerTsConfig = workerConfigPath;
 
       // add worker tsconfig to lint architect target
diff --git a/packages/schematics/angular/web-worker/index_spec.ts b/packages/schematics/angular/web-worker/index_spec.ts
index 25ef32d9a9b5..bc68cba035d5 100644
--- a/packages/schematics/angular/web-worker/index_spec.ts
+++ b/packages/schematics/angular/web-worker/index_spec.ts
@@ -20,7 +20,6 @@ describe('Service Worker Schematic', () => {
     project: 'bar',
     target: 'build',
     name: 'app',
-    // path: 'src/app',
     snippet: true,
   };
 
@@ -54,18 +53,14 @@ describe('Service Worker Schematic', () => {
     expect(tree.exists(path)).toEqual(true);
   });
 
-  it('should put a new tsconfig.json file in the project root', async () => {
-    const tree = await schematicRunner.runSchematicAsync('web-worker', defaultOptions, appTree)
-      .toPromise();
-    const path = '/projects/bar/tsconfig.json';
-    expect(tree.exists(path)).toEqual(true);
-  });
-
   it('should put the tsconfig.worker.json file in the project root', async () => {
     const tree = await schematicRunner.runSchematicAsync('web-worker', defaultOptions, appTree)
       .toPromise();
     const path = '/projects/bar/tsconfig.worker.json';
     expect(tree.exists(path)).toEqual(true);
+
+    const { compilerOptions } = JSON.parse(tree.readContent(path));
+    expect(compilerOptions.outDir).toBe('../../out-tsc/worker');
   });
 
   it('should add the webWorkerTsConfig option to workspace', async () => {
@@ -80,7 +75,7 @@ describe('Service Worker Schematic', () => {
     const tree = await schematicRunner.runSchematicAsync('web-worker', defaultOptions, appTree)
       .toPromise();
     const { exclude } = JSON.parse(tree.readContent('/projects/bar/tsconfig.app.json'));
-    expect(exclude).toContain('**/*.worker.ts');
+    expect(exclude).toContain('src/**/*.worker.ts');
   });
 
   it('should add snippet to sibling file', async () => {
@@ -103,4 +98,20 @@ describe('Service Worker Schematic', () => {
       'projects/bar/tsconfig.worker.json',
     ]);
   });
+
+  it(`should add 'tsconfig.worker.json' outside of 'src' directory in root app`, async () => {
+    const rootAppOptions = { ...appOptions, projectRoot: '', name: 'foo' };
+    const workerOptions = { ...defaultOptions, project: 'foo' };
+
+    appTree = await schematicRunner.runSchematicAsync('application', rootAppOptions, appTree)
+      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('web-worker', workerOptions, appTree)
+      .toPromise();
+
+    const path = '/tsconfig.worker.json';
+    expect(tree.exists(path)).toEqual(true);
+
+    const { compilerOptions } = JSON.parse(tree.readContent(path));
+    expect(compilerOptions.outDir).toBe('./out-tsc/worker');
+  });
 });
diff --git a/tests/legacy-cli/e2e/tests/build/worker.ts b/tests/legacy-cli/e2e/tests/build/worker.ts
index 7c9398687af6..759bb57e36c8 100644
--- a/tests/legacy-cli/e2e/tests/build/worker.ts
+++ b/tests/legacy-cli/e2e/tests/build/worker.ts
@@ -14,8 +14,8 @@ export default async function () {
 
   const workerPath = join('src', 'app', 'app.worker.ts');
   const snippetPath = join('src', 'app', 'app.component.ts');
-  const projectTsConfig = join('src', 'tsconfig.json');
-  const workerTsConfig = join('src', 'tsconfig.worker.json');
+  const projectTsConfig = 'tsconfig.json';
+  const workerTsConfig = 'tsconfig.worker.json';
 
   await ng('generate', 'web-worker', 'app');
   await expectFileToExist(workerPath);

From b95933a57d217a82b29fe04fbe333410fe5b8f4f Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Thu, 18 Apr 2019 07:35:57 +0200
Subject: [PATCH 1200/1703] fix(@schematics/angular): handle polyfill migration
 in non root applications

---
 .../migrations/update-8/drop-es6-polyfills.ts | 84 ++++++++++++++++---
 .../update-8/drop-es6-polyfills_spec.ts       | 48 ++++++++---
 2 files changed, 111 insertions(+), 21 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts b/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts
index 7ae0c08595fa..131af6829c75 100644
--- a/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts
+++ b/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts
@@ -6,7 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Rule, Tree } from '@angular-devkit/schematics';
+import { JsonParseMode, isJsonObject, join, normalize, parseJson } from '@angular-devkit/core';
+import { Rule, Tree, chain, noop } from '@angular-devkit/schematics';
 import * as ts from '../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 
 const toDrop: {[importName: string]: true} = {
@@ -26,31 +27,48 @@ const toDrop: {[importName: string]: true} = {
 };
 
 const header = `/**
-*/
+ * This file includes polyfills needed by Angular and is loaded before the app.
+ * You can add your own extra polyfills to this file.
+ *
+ * This file is divided into 2 sections:
+ *   1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
+ *   2. Application imports. Files imported after ZoneJS that should be loaded before your main
+ *      file.
+ *
+ * The current setup is for so-called "evergreen" browsers; the last versions of browsers that
+ * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
+ * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
+ *
+ * Learn more in https://angular.io/guide/browser-support
+ */
 
 /***************************************************************************************************
 * BROWSER POLYFILLS
 */
 
 /** IE9, IE10 and IE11 requires all of the following polyfills. **/
-// import 'core-js/es6/weak-map';`;
+// import 'core-js/es6/weak-map';
+`;
 
 const applicationPolyfillsHeader = 'APPLICATION IMPORTS';
 
-export const dropES2015Polyfills = (): Rule => {
+function dropES2015PolyfillsFromFile(polyfillPath: string): Rule {
   return (tree: Tree) => {
-    const path = '/polyfills.ts';
-    const source = tree.read(path);
+    const source = tree.read(polyfillPath);
     if (!source) {
       return;
     }
 
     // Start the update of the file.
-    const recorder = tree.beginUpdate(path);
+    const recorder = tree.beginUpdate(polyfillPath);
 
-    const sourceFile = ts.createSourceFile(path, source.toString(), ts.ScriptTarget.Latest, true);
+    const sourceFile = ts.createSourceFile(polyfillPath,
+      source.toString(),
+      ts.ScriptTarget.Latest,
+      true,
+    );
     const imports = sourceFile.statements
-        .filter(s => s.kind === ts.SyntaxKind.ImportDeclaration) as ts.ImportDeclaration[];
+      .filter(s => s.kind === ts.SyntaxKind.ImportDeclaration) as ts.ImportDeclaration[];
 
     const applicationPolyfillsStart = sourceFile.getText().indexOf(applicationPolyfillsHeader);
 
@@ -73,4 +91,50 @@ export const dropES2015Polyfills = (): Rule => {
 
     tree.commitUpdate(recorder);
   };
-};
+}
+
+/**
+ * Drop ES2015 polyfills from all application projects
+ */
+export function dropES2015Polyfills(): Rule {
+  return (tree) => {
+    // Simple. Take the ast of polyfills (if it exists) and find the import metadata. Remove it.
+    const angularConfigContent = tree.read('angular.json') || tree.read('.angular.json');
+    const rules: Rule[] = [];
+
+    if (!angularConfigContent) {
+      // Is this even an angular project?
+      return;
+    }
+
+    const angularJson = parseJson(angularConfigContent.toString(), JsonParseMode.Loose);
+
+    if (!isJsonObject(angularJson) || !isJsonObject(angularJson.projects)) {
+      // If that field isn't there, no use...
+      return;
+    }
+
+    // For all projects
+    for (const projectName of Object.keys(angularJson.projects)) {
+      const project = angularJson.projects[projectName];
+      if (!isJsonObject(project)) {
+        continue;
+      }
+      if (project.projectType !== 'application') {
+        continue;
+      }
+
+      const architect = project.architect;
+      if (!isJsonObject(architect)
+        || !isJsonObject(architect.build)
+        || !isJsonObject(architect.build.options)
+        || typeof architect.build.options.polyfills !== 'string') {
+        continue;
+      }
+
+      rules.push(dropES2015PolyfillsFromFile(architect.build.options.polyfills));
+    }
+
+    return chain(rules);
+  };
+}
diff --git a/packages/schematics/angular/migrations/update-8/drop-es6-polyfills_spec.ts b/packages/schematics/angular/migrations/update-8/drop-es6-polyfills_spec.ts
index 320847061ae1..e2baac75b3de 100644
--- a/packages/schematics/angular/migrations/update-8/drop-es6-polyfills_spec.ts
+++ b/packages/schematics/angular/migrations/update-8/drop-es6-polyfills_spec.ts
@@ -16,7 +16,7 @@ describe('Migration to version 8', () => {
   );
 
   let tree: UnitTestTree;
-  const polyfillsPath = '/polyfills.ts';
+  const polyfillsPath = '/src/polyfills.ts';
   const defaultOptions = {};
   const polyfills = `/**
  */
@@ -61,18 +61,19 @@ import 'zone.js/dist/zone'; // Included with Angular CLI.
  */
 `;
 
-  const packageJson = {
-    devDependencies: {
-      codelyzer: '^4.5.0',
-    },
-  };
-  const packageJsonPath = '/package.json';
-
   describe('Migration to differential polyfill loading', () => {
-    beforeEach(() => {
+    beforeEach(async () => {
       tree = new UnitTestTree(new EmptyTree());
-      tree.create(polyfillsPath, polyfills);
-      tree.create(packageJsonPath, JSON.stringify(packageJson, null, 2));
+      tree = await schematicRunner.runExternalSchematicAsync(
+        require.resolve('../../collection.json'), 'ng-new',
+        {
+          name: 'migration-test',
+          version: '1.2.3',
+          directory: '.',
+        },
+        tree,
+      ).toPromise();
+      tree.overwrite(polyfillsPath, polyfills);
     });
 
     it('should drop the es6 polyfills', () => {
@@ -89,5 +90,30 @@ import 'zone.js/dist/zone'; // Included with Angular CLI.
       expect(polyfills).toContain('BROWSER POLYFILLS');
       expect(polyfills).toContain('core-js/es6/weak-map');
     });
+
+    it('should work as expected for a project with a root', async () => {
+      const originalContent = JSON.parse(tree.readContent('angular.json'));
+      originalContent
+        .projects['migration-test']
+        .architect
+        .build
+        .options
+        .polyfills = 'foo/src/polyfills.ts';
+      tree.overwrite('angular.json', JSON.stringify(originalContent));
+      const polyfillPath = '/foo/src/polyfills.ts';
+      tree.create(polyfillPath, polyfills);
+      tree = schematicRunner.runSchematic('migration-07', defaultOptions, tree);
+      const newPolyfills = tree.readContent(polyfillPath);
+      expect(newPolyfills).not.toContain('core-js/es6/symbol');
+      expect(newPolyfills).not.toContain('core-js/es6/set');
+      expect(newPolyfills).toContain('zone.js');
+      expect(newPolyfills).toContain('Zone');
+
+      // We don't want to drop this commented import comments
+      expect(newPolyfills).toContain('core-js/es6/reflect');
+      expect(newPolyfills).toContain('core-js/es7/reflect');
+      expect(newPolyfills).toContain('BROWSER POLYFILLS');
+      expect(newPolyfills).toContain('core-js/es6/weak-map');
+    });
   });
 });

From 7a935518dc066e15b011180c35304e170ae73b0e Mon Sep 17 00:00:00 2001
From: Minko Gechev <mgechev@google.com>
Date: Thu, 18 Apr 2019 17:18:27 -0700
Subject: [PATCH 1201/1703] refactor(@angular-devkit/build-angular): compare
 the target with ScriptTarget

Compare with ScriptTarget and consider ES2017 and newer.
---
 .../src/angular-cli-files/models/webpack-configs/common.ts     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 2a550be777db..83aec5da24fb 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -295,7 +295,8 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
     );
   }
 
-  if (wco.tsConfig.options.target === 4) {
+  if (wco.tsConfig.options.target !== undefined &&
+      wco.tsConfig.options.target >= ts.ScriptTarget.ES2017) {
     wco.logger.warn(tags.stripIndent`
       WARNING: Zone.js does not support native async/await in ES2017.
       These blocks are not intercepted by zone.js and will not triggering change detection.

From 4d7581d60becc1c8479fa6d3ba333d4d50e946eb Mon Sep 17 00:00:00 2001
From: Minko Gechev <mgechev@google.com>
Date: Thu, 18 Apr 2019 16:45:08 -0700
Subject: [PATCH 1202/1703] feat(@schematics/angular): enable support for
 Chrome 41

We want apps to be SEO friendly by default.
---
 .../angular/application/files/browserslist.template           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/application/files/browserslist.template b/packages/schematics/angular/application/files/browserslist.template
index 6ae8a8ab2d57..3525779c0dfb 100644
--- a/packages/schematics/angular/application/files/browserslist.template
+++ b/packages/schematics/angular/application/files/browserslist.template
@@ -11,6 +11,6 @@
 > 0.5%
 last 2 versions
 Firefox ESR
+Chrome 41 # Support for Googlebot
 not dead
-not IE 9-11 # For IE 9-11 support, remove 'not'.
-not Chrome 41 # For Googlebot support, remove 'not'.
\ No newline at end of file
+not IE 9-11 # For IE 9-11 support, remove 'not'.
\ No newline at end of file

From 217afe5def2c9809c948a7597008cef69a6a5548 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 19 Apr 2019 06:20:13 +0000
Subject: [PATCH 1203/1703] build: update typescript to version 3.4.4

---
 package.json                                              | 2 +-
 packages/angular_devkit/build_optimizer/package.json      | 2 +-
 packages/ngtools/webpack/package.json                     | 2 +-
 .../schematics/schematics/schematic/files/package.json    | 2 +-
 yarn.lock                                                 | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index b79247013d33..dc91f63beaf6 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "quicktype-core": "^6.0.15",
     "temp": "^0.9.0",
     "tslint": "^5.15.0",
-    "typescript": "3.4.3"
+    "typescript": "3.4.4"
   },
   "devDependencies": {
     "@angular/compiler": "^8.0.0-beta.12",
diff --git a/packages/angular_devkit/build_optimizer/package.json b/packages/angular_devkit/build_optimizer/package.json
index 131ed5ec97a6..4a4546491253 100644
--- a/packages/angular_devkit/build_optimizer/package.json
+++ b/packages/angular_devkit/build_optimizer/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "loader-utils": "1.2.3",
     "source-map": "0.5.6",
-    "typescript": "3.4.3",
+    "typescript": "3.4.4",
     "webpack-sources": "1.3.0"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index bd91d21eae1f..3c69032cede4 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -35,7 +35,7 @@
   "devDependencies": {
     "@angular/compiler": "^8.0.0-beta.12",
     "@angular/compiler-cli": "^8.0.0-beta.12",
-    "typescript": "3.4.3",
+    "typescript": "3.4.4",
     "webpack": "4.30.0"
   }
 }
diff --git a/packages/schematics/schematics/schematic/files/package.json b/packages/schematics/schematics/schematic/files/package.json
index 7db6a01326dd..bdec3f08c492 100644
--- a/packages/schematics/schematics/schematic/files/package.json
+++ b/packages/schematics/schematics/schematic/files/package.json
@@ -18,6 +18,6 @@
     "@types/jasmine": "^3.3.9",
     "@types/node": "^8.0.31",
     "jasmine": "^3.3.1",
-    "typescript": "3.4.3"
+    "typescript": "3.4.4"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 939c14ad4821..168fdc16ce72 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9532,10 +9532,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@3.4.3:
-  version "3.4.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.3.tgz#0eb320e4ace9b10eadf5bc6103286b0f8b7c224f"
-  integrity sha512-FFgHdPt4T/duxx6Ndf7hwgMZZjZpB+U0nMNGVCYPq0rEzWKjEDobm4J6yb3CS7naZ0yURFqdw9Gwc7UOh/P9oQ==
+typescript@3.4.4:
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.4.tgz#aac4a08abecab8091a75f10842ffa0631818f785"
+  integrity sha512-xt5RsIRCEaf6+j9AyOBgvVuAec0i92rgCaS3S+UVf5Z/vF2Hvtsw08wtUTJqp4djwznoAgjSxeCcU4r+CcDBJA==
 
 uglify-js@^3.1.4:
   version "3.4.9"

From 4807ff00d1d6a80b54a3b450bd58e0b9414ffffd Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 19 Apr 2019 05:27:53 +0000
Subject: [PATCH 1204/1703] build: update sass to version 1.19.0

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index a9319e8d0651..be57460f650b 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -37,7 +37,7 @@
     "postcss-loader": "3.0.0",
     "raw-loader": "1.0.0",
     "rxjs": "6.4.0",
-    "sass": "1.18.0",
+    "sass": "1.19.0",
     "sass-loader": "7.1.0",
     "semver": "6.0.0",
     "source-map-support": "0.5.12",
diff --git a/yarn.lock b/yarn.lock
index 168fdc16ce72..cc321036cda5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8191,10 +8191,10 @@ sass-loader@7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
-sass@1.18.0:
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.18.0.tgz#f34371c31e268e555c2ac8e43d2b64d194e7d090"
-  integrity sha512-Mc579V+BhH693tqt+lvph+gmRqmC6BjtsEVsjkW1944DEA5a0wPuCi781hL3fY4EDuqZnEVPbu42CZRywwE97g==
+sass@1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.19.0.tgz#5de82c713d4299fac57384ef5219534a37fe3e6c"
+  integrity sha512-8kzKCgxCzh8/zEn3AuRwzLWVSSFj8omkiGwqdJdeOufjM+I88dXxu9LYJ/Gw4rRTHXesN0r1AixBuqM6yLQUJw==
   dependencies:
     chokidar "^2.0.0"
 

From 201856a5ec735f139dd6a75574f307a441f9c24c Mon Sep 17 00:00:00 2001
From: ManfredSteyer <manfred.steyer@gmx.net>
Date: Thu, 18 Apr 2019 20:28:12 +0200
Subject: [PATCH 1205/1703] fix(@angular-devkit/build-angular): run build steps
 for differential loading in sequence to avoid confusing progress information

Before, the build tasks ran in parallel and so the different webpack
instances competed over the same lines on the console.

To fail fast and to prevent to show the same errors twice, the second
build step is not executed if the first one fails.

As running these tasks in sequence causes issues with watch mode, this
PR also disables differential loading when watch mode is requested.
---
 .../build_angular/src/browser/index.ts        | 24 +++++++++------
 .../src/utils/webpack-browser-config.ts       |  3 +-
 .../differential_loading_spec_large.ts        | 30 +++++++++++++++++++
 3 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index d26a149a1957..1e8766c796d5 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -10,7 +10,7 @@ import {
   BuilderOutput,
   createBuilder,
 } from '@angular-devkit/architect';
-import { WebpackLoggingCallback, runWebpack } from '@angular-devkit/build-webpack';
+import { BuildResult, WebpackLoggingCallback, runWebpack } from '@angular-devkit/build-webpack';
 import {
   experimental,
   join,
@@ -23,8 +23,8 @@ import {
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as fs from 'fs';
 import * as path from 'path';
-import { from, of, zip } from 'rxjs';
-import { catchError, concatMap, map, switchMap } from 'rxjs/operators';
+import { concat, from, of, zip } from 'rxjs';
+import { bufferCount, catchError, concatMap, map, mergeScan, switchMap } from 'rxjs/operators';
 import * as webpack from 'webpack';
 import { NgBuildAnalyticsPlugin } from '../../plugins/webpack/analytics';
 import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
@@ -182,12 +182,18 @@ export function buildWebpackBrowser(
         normalize(workspace.getProject(projectName).root),
       );
 
-      // We use zip because when having multiple builds we want to wait
-      // for all builds to finish before processeding
-      return zip(
-        ...configs.map(config => runWebpack(config, context, { logging: loggingFn })),
-      )
-      .pipe(
+      return from(configs).pipe(
+        // the concurrency parameter (3rd parameter of mergeScan) is deliberately
+        // set to 1 to make sure the build steps are executed in sequence.
+        mergeScan((lastResult, config) => {
+          // Make sure to only run the 2nd build step, if 1st one succeeded
+          if (lastResult.success) {
+            return runWebpack(config, context, { logging: loggingFn });
+          } else {
+            return of();
+          }
+        }, { success: true } as BuildResult, 1),
+        bufferCount(configs.length),
         switchMap(buildEvents => {
           const success = buildEvents.every(r => r.success);
           if (success && buildEvents.length === 2 && options.index) {
diff --git a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
index bcd8bd685852..652acc4d51e1 100644
--- a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
+++ b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
@@ -55,7 +55,8 @@ export async function generateWebpackConfig(
   // However this config generation is used by multiple builders such as dev-server
   const scriptTarget = tsConfig.options.target;
   const differentialLoading = context.builder.builderName === 'browser'
-    && isDifferentialLoadingNeeded(projectRoot, scriptTarget);
+    && isDifferentialLoadingNeeded(projectRoot, scriptTarget) && !options.watch;
+
   const scriptTargets = [scriptTarget];
 
   if (differentialLoading) {
diff --git a/packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts
index c0eccfe819da..386d82544530 100644
--- a/packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts
@@ -63,6 +63,36 @@ describe('Browser Builder with differential loading', () => {
       .toEqual(jasmine.arrayWithExactContents(expectedOutputs));
   });
 
+  it('deactivates differential loading for watch mode', async () => {
+    const { files } = await browserBuild(architect, host, target, { watch: true });
+
+    const expectedOutputs = [
+      'favicon.ico',
+      'index.html',
+
+      'main.js',
+      'main.js.map',
+
+      'polyfills-es5.js',
+      'polyfills-es5.js.map',
+      'polyfills.js',
+      'polyfills.js.map',
+
+      'runtime.js',
+      'runtime.js.map',
+
+      'styles.js',
+      'styles.js.map',
+
+      'vendor.js',
+      'vendor.js.map',
+    ] as PathFragment[];
+
+    expect(Object.keys(files))
+      .toEqual(jasmine.arrayWithExactContents(expectedOutputs));
+  });
+
+
   it('emits the right ES formats', async () => {
     const { files } = await browserBuild(architect, host, target, { optimization: true });
     expect(await files['main-es5.js']).not.toContain('class');

From f03ff807b440bde880aff117ec816c07e12f6b06 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Thu, 18 Apr 2019 07:44:48 +0200
Subject: [PATCH 1206/1703] refactor(@schematics/angular): create
 `relativePathToWorkspaceRoot` helper and replace usages

---
 .../schematics/angular/application/index.ts   |  9 ++---
 packages/schematics/angular/e2e/index.ts      | 14 ++-----
 packages/schematics/angular/library/index.ts  |  4 +-
 .../angular/service-worker/index.ts           | 15 +++++---
 packages/schematics/angular/utility/paths.ts  | 19 ++++++++++
 .../schematics/angular/utility/paths_spec.ts  | 38 +++++++++++++++++++
 .../schematics/angular/web-worker/index.ts    | 14 +++----
 7 files changed, 81 insertions(+), 32 deletions(-)
 create mode 100644 packages/schematics/angular/utility/paths.ts
 create mode 100644 packages/schematics/angular/utility/paths_spec.ts

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index e8b877b110ee..6de80e6d7718 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -37,6 +37,7 @@ import { NodeDependencyType, addPackageJsonDependency } from '../utility/depende
 import { findPropertyInAstObject, insertPropertyInAstObjectInOrder } from '../utility/json-utils';
 import { latestVersions } from '../utility/latest-versions';
 import { applyLintFix } from '../utility/lint-fix';
+import { relativePathToWorkspaceRoot } from '../utility/paths';
 import { validateProjectName } from '../utility/validation';
 import { getWorkspace, updateWorkspace } from '../utility/workspace';
 import { Builders, ProjectType } from '../utility/workspace-models';
@@ -147,7 +148,8 @@ function addAppToWorkspaceFile(options: ApplicationOptions, newProjectRoot: stri
     ? options.projectRoot
     : `${newProjectRoot}/${options.name}`;
 
-  if (projectRoot !== '' && !projectRoot.endsWith('/')) {
+  projectRoot = normalize(projectRoot);
+  if (projectRoot) {
     projectRoot += '/';
   }
 
@@ -324,9 +326,6 @@ export default function (options: ApplicationOptions): Rule {
     const appDir = isRootApp
       ? options.projectRoot as string
       : `${newProjectRoot}/${options.name}`;
-    const relativePathToWorkspaceRoot = appDir
-      ? appDir.split('/').map(() => '..').join('/')
-      : '.';
     const sourceDir = `${appDir}/src/app`;
 
     const e2eOptions: E2eOptions = {
@@ -342,7 +341,7 @@ export default function (options: ApplicationOptions): Rule {
           applyTemplates({
             utils: strings,
             ...options,
-            relativePathToWorkspaceRoot,
+            relativePathToWorkspaceRoot: relativePathToWorkspaceRoot(appDir),
             appName: options.name,
             isRootApp,
           }),
diff --git a/packages/schematics/angular/e2e/index.ts b/packages/schematics/angular/e2e/index.ts
index 128f3d0e5994..e26e20cfe510 100644
--- a/packages/schematics/angular/e2e/index.ts
+++ b/packages/schematics/angular/e2e/index.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { normalize, strings } from '@angular-devkit/core';
+import { join, normalize, strings } from '@angular-devkit/core';
 import {
   Rule,
   SchematicsException,
@@ -17,16 +17,11 @@ import {
   move,
   url,
 } from '@angular-devkit/schematics';
+import { relativePathToWorkspaceRoot } from '../utility/paths';
 import { getWorkspace, updateWorkspace } from '../utility/workspace';
 import { Builders } from '../utility/workspace-models';
 import { Schema as E2eOptions } from './schema';
 
-function getE2eRoot(projectRoot: string): string {
-  const root = normalize(projectRoot);
-
-  return root ? root + '/e2e' : 'e2e';
-}
-
 export default function (options: E2eOptions): Rule {
   return async (host: Tree) => {
     const appProject = options.relatedAppName;
@@ -36,8 +31,7 @@ export default function (options: E2eOptions): Rule {
       throw new SchematicsException(`Project name "${appProject}" doesn't not exist.`);
     }
 
-    const root = getE2eRoot(project.root);
-    const relativePathToWorkspaceRoot = root.split('/').map(() => '..').join('/');
+    const root = join(normalize(project.root), 'e2e');
 
     project.targets.add({
       name: 'e2e',
@@ -66,7 +60,7 @@ export default function (options: E2eOptions): Rule {
           applyTemplates({
             utils: strings,
             ...options,
-            relativePathToWorkspaceRoot,
+            relativePathToWorkspaceRoot: relativePathToWorkspaceRoot(root),
           }),
           move(root),
         ])),
diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index 2f3c92818796..8378e961c587 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -24,6 +24,7 @@ import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import { NodeDependencyType, addPackageJsonDependency } from '../utility/dependencies';
 import { latestVersions } from '../utility/latest-versions';
 import { applyLintFix } from '../utility/lint-fix';
+import { relativePathToWorkspaceRoot } from '../utility/paths';
 import { validateProjectName } from '../utility/validation';
 import { getWorkspace, updateWorkspace } from '../utility/workspace';
 import { Builders, ProjectType } from '../utility/workspace-models';
@@ -195,7 +196,6 @@ export default function (options: LibraryOptions): Rule {
     const distRoot = `dist/${folderName}`;
 
     const sourceDir = `${projectRoot}/src/lib`;
-    const relativePathToWorkspaceRoot = projectRoot.split('/').map(x => '..').join('/');
 
     const templateSource = apply(url('./files'), [
       applyTemplates({
@@ -204,7 +204,7 @@ export default function (options: LibraryOptions): Rule {
         packageName,
         projectRoot,
         distRoot,
-        relativePathToWorkspaceRoot,
+        relativePathToWorkspaceRoot: relativePathToWorkspaceRoot(projectRoot),
         prefix,
         angularLatestVersion: latestVersions.Angular.replace('~', '').replace('^', ''),
         folderName,
diff --git a/packages/schematics/angular/service-worker/index.ts b/packages/schematics/angular/service-worker/index.ts
index 33247c50bb00..fa01bff3a40d 100644
--- a/packages/schematics/angular/service-worker/index.ts
+++ b/packages/schematics/angular/service-worker/index.ts
@@ -5,6 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import { join, normalize } from '@angular-devkit/core';
 import {
   Rule,
   SchematicContext,
@@ -23,6 +24,7 @@ import { addSymbolToNgModuleMetadata, insertImport, isImported } from '../utilit
 import { InsertChange } from '../utility/change';
 import { addPackageJsonDependency, getPackageJsonDependency } from '../utility/dependencies';
 import { getAppModulePath } from '../utility/ng-ast-utils';
+import { relativePathToWorkspaceRoot } from '../utility/paths';
 import { targetBuildNotFoundError } from '../utility/project-targets';
 import { getWorkspace, updateWorkspace } from '../utility/workspace';
 import { BrowserBuilderOptions } from '../utility/workspace-models';
@@ -136,18 +138,19 @@ export default function (options: ServiceWorkerOptions): Rule {
     const root = project.root;
 
     config.serviceWorker = true;
-    config.ngswConfigPath = `${root && !root.endsWith('/') ? root + '/' : root}ngsw-config.json`;
-
-    const relativePathToWorkspaceRoot = project.root ?
-      project.root.split('/').filter(x => x !== '').map(x => '..').join('/') : '.';
+    config.ngswConfigPath = join(normalize(root), 'ngsw-config.json');
 
     let { resourcesOutputPath = '' } = config;
     if (resourcesOutputPath) {
-      resourcesOutputPath = '/' + resourcesOutputPath.split('/').filter(x => !!x).join('/');
+      resourcesOutputPath = normalize(`/${resourcesOutputPath}`);
     }
 
     const templateSource = apply(url('./files'), [
-      applyTemplates({ ...options, resourcesOutputPath, relativePathToWorkspaceRoot }),
+      applyTemplates({
+        ...options,
+        resourcesOutputPath,
+        relativePathToWorkspaceRoot: relativePathToWorkspaceRoot(project.root),
+      }),
       move(project.root),
     ]);
 
diff --git a/packages/schematics/angular/utility/paths.ts b/packages/schematics/angular/utility/paths.ts
new file mode 100644
index 000000000000..35729a641713
--- /dev/null
+++ b/packages/schematics/angular/utility/paths.ts
@@ -0,0 +1,19 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { normalize, split } from '@angular-devkit/core';
+
+export function relativePathToWorkspaceRoot(projectRoot: string | undefined): string {
+  const normalizedPath = split(normalize(projectRoot || ''));
+
+  if (normalizedPath.length === 0 || !normalizedPath[0]) {
+    return '.';
+  } else {
+    return normalizedPath.map(() => '..').join('/');
+  }
+}
diff --git a/packages/schematics/angular/utility/paths_spec.ts b/packages/schematics/angular/utility/paths_spec.ts
new file mode 100644
index 000000000000..1cdc3e031631
--- /dev/null
+++ b/packages/schematics/angular/utility/paths_spec.ts
@@ -0,0 +1,38 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { relativePathToWorkspaceRoot } from './paths';
+
+describe('paths', () => {
+  describe('relativePathToWorkspaceRoot', () => {
+    it(`should handle root '/'`, () => {
+      const result = relativePathToWorkspaceRoot('/');
+      expect(result).toBe('.');
+    });
+
+    it(`should handle an empty path`, () => {
+      const result = relativePathToWorkspaceRoot('');
+      expect(result).toBe('.');
+    });
+
+    it(`should handle an undefined path`, () => {
+      const result = relativePathToWorkspaceRoot(undefined);
+      expect(result).toBe('.');
+    });
+
+    it(`should handle path with trailing '/'`, () => {
+      const result = relativePathToWorkspaceRoot('foo/bar/');
+      expect(result).toBe('../..');
+    });
+
+    it(`should handle path without trailing '/'`, () => {
+      const result = relativePathToWorkspaceRoot('foo/bar');
+      expect(result).toBe('../..');
+    });
+  });
+});
diff --git a/packages/schematics/angular/web-worker/index.ts b/packages/schematics/angular/web-worker/index.ts
index 92e6df7ff45c..717a3741bfe4 100644
--- a/packages/schematics/angular/web-worker/index.ts
+++ b/packages/schematics/angular/web-worker/index.ts
@@ -12,6 +12,7 @@ import {
 } from '@angular-devkit/schematics';
 import { appendValueInAstArray, findPropertyInAstObject } from '../utility/json-utils';
 import { parseName } from '../utility/parse-name';
+import { relativePathToWorkspaceRoot } from '../utility/paths';
 import { buildDefaultPath, getWorkspace, updateWorkspace } from '../utility/workspace';
 import { BrowserBuilderOptions, LintBuilderOptions } from '../utility/workspace-models';
 import { Schema as WebWorkerOptions } from './schema';
@@ -21,14 +22,6 @@ function addConfig(options: WebWorkerOptions, root: string, tsConfigPath: string
   return (host: Tree, context: SchematicContext) => {
     context.logger.debug('updating project configuration.');
 
-    // todo: replace with the new helper method in a seperate PR
-    // https://github.com/angular/angular-cli/pull/14207
-    const rootNormalized = root.endsWith('/') ? root.slice(0, -1) : root;
-    const relativePathToWorkspaceRoot =
-      rootNormalized
-        ? rootNormalized.split('/').map(x => '..').join('/')
-        : '.';
-
     // Add worker glob exclusion to tsconfig.app.json.
     const workerGlob = 'src/**/*.worker.ts';
     const buffer = host.read(tsConfigPath);
@@ -51,7 +44,10 @@ function addConfig(options: WebWorkerOptions, root: string, tsConfigPath: string
 
     return mergeWith(
       apply(url('./files/worker-tsconfig'), [
-        applyTemplates({ ...options, relativePathToWorkspaceRoot }),
+        applyTemplates({
+          ...options,
+          relativePathToWorkspaceRoot: relativePathToWorkspaceRoot(root),
+        }),
         move(root),
       ]),
     );

From 96fe7686aa15956c8f7254cfe16c0954240c1d26 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Fri, 19 Apr 2019 13:07:43 +0200
Subject: [PATCH 1207/1703] docs: update description for deleteOutputPath in
 server builder

---
 packages/angular_devkit/build_angular/src/server/schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/server/schema.json b/packages/angular_devkit/build_angular/src/server/schema.json
index 5211b8db43e7..d1122c949663 100644
--- a/packages/angular_devkit/build_angular/src/server/schema.json
+++ b/packages/angular_devkit/build_angular/src/server/schema.json
@@ -169,7 +169,7 @@
     },
     "deleteOutputPath": {
       "type": "boolean",
-      "description": "delete-output-path",
+      "description": "Delete the output path before building.",
       "default": true
     },
     "preserveSymlinks": {

From 458ba75e3749f36ca78e2835ad9adc240ec688fe Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 19 Apr 2019 14:57:39 -0400
Subject: [PATCH 1208/1703] fix(@schematics/angular): migrate TS module type to
 esnext

---
 .../update-8/differential-loading.ts          | 23 ++++++++++++-------
 .../update-8/differential-loading_spec.ts     | 18 +++++++++++++++
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-8/differential-loading.ts b/packages/schematics/angular/migrations/update-8/differential-loading.ts
index dcc7084a058d..da953a25f000 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading.ts
@@ -53,19 +53,26 @@ export function updateES5Projects(): Rule {
       return host;
     }
 
-    const scriptTarget = findPropertyInAstObject(compilerOptions, 'target');
-    if (scriptTarget && scriptTarget.value === 'es2015') {
-      return host;
-    }
-
     const recorder = host.beginUpdate(tsConfigPath);
-    if (scriptTarget) {
+
+    const scriptTarget = findPropertyInAstObject(compilerOptions, 'target');
+    if (!scriptTarget) {
+      insertPropertyInAstObjectInOrder(recorder, compilerOptions, 'target', 'es2015', 4);
+    } else if (scriptTarget.value !== 'es2015') {
       const { start, end } = scriptTarget;
       recorder.remove(start.offset, end.offset - start.offset);
       recorder.insertLeft(start.offset, '"es2015"');
-    } else {
-      insertPropertyInAstObjectInOrder(recorder, compilerOptions, 'target', 'es2015', 4);
     }
+
+    const scriptModule = findPropertyInAstObject(compilerOptions, 'module');
+    if (!scriptModule) {
+      insertPropertyInAstObjectInOrder(recorder, compilerOptions, 'module', 'esnext', 4);
+    } else if (scriptModule.value !== 'esnext') {
+      const { start, end } = scriptModule;
+      recorder.remove(start.offset, end.offset - start.offset);
+      recorder.insertLeft(start.offset, '"esnext"');
+    }
+
     host.commitUpdate(recorder);
 
     return updateBrowserlist;
diff --git a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
index d326e30752b3..3242389c69d4 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
@@ -62,6 +62,24 @@ describe('Migration to version 8', () => {
       expect(target).toBe('es2015');
     });
 
+    it(`should update 'module' to esnext when property exists`, () => {
+      const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
+      const { module } = JSON.parse(tree2.readContent(tsConfigPath)).compilerOptions;
+      expect(module).toBe('esnext');
+    });
+
+    it(`should create 'module' property when doesn't exists`, () => {
+      const compilerOptions = {
+        ...oldTsConfig.compilerOptions,
+        module: undefined,
+      };
+
+      tree.overwrite(tsConfigPath, JSON.stringify({ compilerOptions }, null, 2));
+      const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
+      const { module } = JSON.parse(tree2.readContent(tsConfigPath)).compilerOptions;
+      expect(module).toBe('esnext');
+    });
+
     it(`should update browserslist file to add an non evergreen browser`, () => {
       const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
       expect(tree2.readContent('/browserslist')).toContain('Chrome 41');

From 1b6602c0664f3fc439ab5660d162e5c0ed0603ae Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Mon, 15 Apr 2019 08:47:35 -0700
Subject: [PATCH 1209/1703] build: use Bazel from npm

Also hook up bazel format/lint
---
 .circleci/config.yml     | 11 +++++++----
 package.json             |  6 ++++++
 tools/ts_json_schema.bzl |  8 ++------
 yarn.lock                | 42 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 54362128dbc1..9d503505552b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,12 +10,10 @@
 # Variables
 
 ## IMPORTANT
-# If you change the `docker_image` version, also change the `cache_key` suffix and the version of
-# `com_github_bazelbuild_buildtools` in the `/WORKSPACE` file.
 # If you change the cache key prefix, also sync the restore_cache fallback to match.
 # Keep the static part of the cache key as prefix to enable correct fallbacks.
 # See https://circleci.com/docs/2.0/caching/#restoring-cache for how prefixes work in CircleCI.
-var_1: &docker_image angular/ngcontainer:0.10.0
+var_1: &docker_image circleci/node:10.12
 var_2: &cache_key angular_devkit-0.10.0-{{ checksum "yarn.lock" }}
 
 # Settings common to each job
@@ -71,6 +69,11 @@ jobs:
     steps:
       - attach_workspace: *attach_options
       - run: npm run lint
+      - run: 'yarn bazel:format -mode=check ||
+              (echo "BUILD files not formatted. Please run ''yarn bazel:format''" ; exit 1)'
+      # Run the skylark linter to check our Bazel rules
+      - run: 'yarn bazel:lint ||
+              (echo -e "\n.bzl files have lint errors. Please run ''yarn bazel:lint-fix''"; exit 1)'
 
   validate:
     <<: *defaults
@@ -145,7 +148,7 @@ jobs:
     steps:
       - attach_workspace: *attach_options
       - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
-      - run: bazel test ...
+      - run: yarn bazel:test
 
   snapshot_publish:
     <<: *defaults
diff --git a/package.json b/package.json
index dc91f63beaf6..4f571d87e08a 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,10 @@
   ],
   "scripts": {
     "admin": "node ./bin/devkit-admin",
+    "bazel:format": "find . -type f \\( -name \"*.bzl\" -or -name WORKSPACE -or -name BUILD -or -name BUILD.bazel \\) ! -path \"*/node_modules/*\" | xargs buildifier -v --warnings=args-order,attr-cfg,attr-license,attr-non-empty,attr-output-default,attr-single-file,constant-glob,ctx-args,depset-iteration,depset-union,dict-concatenation,duplicated-name,filetype,git-repository,http-archive,integer-division,load,load-on-top,native-build,native-package,output-group,package-name,package-on-top,positional-args,redefined-variable,repository-name,same-origin-load,string-iteration,unused-variable",
+    "bazel:lint": "yarn bazel:format --lint=warn",
+    "bazel:lint-fix": "yarn bazel:format --lint=fix",
+    "bazel:test": "bazel test //...",
     "build": "npm run admin -- build",
     "build-tsc": "tsc -p tsconfig.json",
     "fix": "npm run admin -- lint --fix",
@@ -80,6 +84,8 @@
   "devDependencies": {
     "@angular/compiler": "^8.0.0-beta.12",
     "@angular/compiler-cli": "^8.0.0-beta.12",
+    "@bazel/bazel": "^0.24.0",
+    "@bazel/buildifier": "^0.22.0",
     "@bazel/karma": "~0.26.0",
     "@bazel/typescript": "~0.26.0",
     "@ngtools/json-schema": "^1.1.0",
diff --git a/tools/ts_json_schema.bzl b/tools/ts_json_schema.bzl
index 71f0923a401c..4615e8a94e34 100644
--- a/tools/ts_json_schema.bzl
+++ b/tools/ts_json_schema.bzl
@@ -26,18 +26,14 @@ _ts_json_schema_interface = rule(
     _ts_json_schema_interface_impl,
     attrs = {
         "src": attr.label(
-            allow_files = FileType([
-                ".json",
-            ]),
+            allow_files = [".json"],
             mandatory = True,
         ),
         "out": attr.string(
             mandatory = True,
         ),
         "data": attr.label_list(
-            allow_files = FileType([
-                ".json",
-            ]),
+            allow_files = [".json"],
         ),
         "_binary": attr.label(
             default = Label("//tools:quicktype_runner"),
diff --git a/yarn.lock b/yarn.lock
index cc321036cda5..ef061d0c1cee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -188,6 +188,48 @@
     lodash "^4.17.10"
     to-fast-properties "^2.0.0"
 
+"@bazel/bazel-darwin_x64@0.24.0":
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.24.0.tgz#828ef298d8d542961df388f17b0244f4f4302a74"
+  integrity sha512-xly44vkcD/fauUb7Lm5Lme4qhEZdkuuyBKSVQUHPbYAGDdbj/W8dupI3bZREkJAgG/WrRU+WXUemMj4U8ZcLcw==
+
+"@bazel/bazel-linux_x64@0.24.0":
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.24.0.tgz#9ef2e7266833ad2221fe4af4ceb6763d2897e3ff"
+  integrity sha512-p5ylPLWnJZDGbaIFBrtD/tp3Su5rMdzeeNJKU24XyiWQTHVZ3OD3I2Fb0ILCgfBjY8AlA7EtCtOI4hYnAuIOtg==
+
+"@bazel/bazel-win32_x64@0.24.0":
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.24.0.tgz#02d83113a6c6ed99795a3e41bff5631aa141638d"
+  integrity sha512-/bcSEx+GoV/q7H4WM0jazfxTcurSiIIePhRv+d05mxRDcaWwhCO8KzmmZRWH1abW6npvq5tLkbSQi7G7nUBhgg==
+
+"@bazel/bazel@^0.24.0":
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel/-/bazel-0.24.0.tgz#f4e68e3680ac299858c24c26be3d08d1151e78fc"
+  integrity sha512-/5E55tqH9ogAGF9Dd7RSCJmk7/xdlsPTAhsX3yEsEMs7GLdHlgD3jbeePsKUiHKKr8LXAufjTs2pXQfjrkZRMg==
+  optionalDependencies:
+    "@bazel/bazel-darwin_x64" "0.24.0"
+    "@bazel/bazel-linux_x64" "0.24.0"
+    "@bazel/bazel-win32_x64" "0.24.0"
+
+"@bazel/buildifier-darwin_x64@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@bazel/buildifier-darwin_x64/-/buildifier-darwin_x64-0.22.0.tgz#00dde7ce03be8c550b3908dd91cf1fc0baef7ff7"
+  integrity sha512-tpJ6w3mmh8wBm/k5AidAZvjWm3Hge3ipSjGtxTfq/xgUCacAtGt219nwyAMs0CwLPuABLbcINQmmKtG5VpxK9A==
+
+"@bazel/buildifier-linux_x64@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@bazel/buildifier-linux_x64/-/buildifier-linux_x64-0.22.0.tgz#146c44bafbb1e4711725414582a49835d04b8618"
+  integrity sha512-qaE7QF2YHKOXFBk2QcwOBfA3Ipm08vP9ZK9Vxtubbq9O0MM5tWvfKI48VkfX6pg8QNXDJ+sBndznxQSSWstsWQ==
+
+"@bazel/buildifier@^0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@bazel/buildifier/-/buildifier-0.22.0.tgz#d1abc2ce4317ba71351276c6b1b9e1533abf8e3d"
+  integrity sha512-S+mrUwanR8HMcp92iEDk4D1oOLsVhCM42Hx0rqL1eVmXPwLYL+F/sIjeGTw/6BgxMEHVSl2M3CcTFAS0b60BTQ==
+  optionalDependencies:
+    "@bazel/buildifier-darwin_x64" "0.22.0"
+    "@bazel/buildifier-linux_x64" "0.22.0"
+
 "@bazel/karma@~0.26.0":
   version "0.26.0"
   resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.26.0.tgz#6ad796686f5775df33a96fa5ef3df76a66aed3b2"

From ee619c9a348760873c201b5ed723070ba78cd7fb Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Mon, 15 Apr 2019 08:49:22 -0700
Subject: [PATCH 1210/1703] build: run Bazel format/lint fix

---
 WORKSPACE                                     | 25 ++++----
 etc/api/BUILD                                 | 14 ++--
 package.json                                  |  2 +-
 packages/angular/cli/BUILD                    |  5 +-
 packages/angular/pwa/BUILD                    |  2 +-
 packages/angular_devkit/architect/BUILD       | 30 ++++-----
 packages/angular_devkit/architect_cli/BUILD   |  5 +-
 packages/angular_devkit/benchmark/BUILD       | 22 +++----
 packages/angular_devkit/build_optimizer/BUILD | 12 ++--
 packages/angular_devkit/core/BUILD            | 43 ++++++-------
 packages/angular_devkit/schematics/BUILD      | 64 ++++++++-----------
 packages/angular_devkit/schematics_cli/BUILD  |  4 +-
 packages/schematics/angular/BUILD             | 19 +++---
 packages/schematics/schematics/BUILD          |  6 +-
 packages/schematics/update/BUILD              | 17 ++---
 .../tools/file-system-engine-host/BUILD       |  7 +-
 tools/BUILD                                   |  6 +-
 tools/build_event_protocol/BUILD              |  9 ++-
 tools/ts_json_schema.bzl                      |  6 +-
 19 files changed, 140 insertions(+), 158 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 02e12eec9d94..746d1a21c301 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -5,8 +5,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "build_bazel_rules_nodejs",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.27.7/rules_nodejs-0.27.7.tar.gz"],
     sha256 = "fb87ed5965cef93188af9a7287511639403f4b0da418961ce6defb9dcf658f51",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.27.7/rules_nodejs-0.27.7.tar.gz"],
 )
 
 # TS API Guardian resides in Angular
@@ -20,8 +20,8 @@ http_archive(
 # We use protocol buffers for the Build Event Protocol
 git_repository(
     name = "com_google_protobuf",
-    remote = "https://github.com/protocolbuffers/protobuf",
     commit = "b6375e03aa80274dae89410efdf46346413b2247",
+    remote = "https://github.com/protocolbuffers/protobuf",
 )
 
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
@@ -29,47 +29,50 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 protobuf_deps()
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
+
 # 0.18.0 is needed for .bazelignore
-check_bazel_version("0.18.0")
+check_bazel_version(minimum_bazel_version = "0.18.0")
+
 node_repositories(
-    node_version = "10.9.0",
-    yarn_version = "1.9.2",
     node_repositories = {
         "10.9.0-darwin_amd64": (
             "node-v10.9.0-darwin-x64.tar.gz",
             "node-v10.9.0-darwin-x64",
-            "3c4fe75dacfcc495a432a7ba2dec9045cff359af2a5d7d0429c84a424ef686fc"
+            "3c4fe75dacfcc495a432a7ba2dec9045cff359af2a5d7d0429c84a424ef686fc",
         ),
         "10.9.0-linux_amd64": (
             "node-v10.9.0-linux-x64.tar.xz",
             "node-v10.9.0-linux-x64",
-            "c5acb8b7055ee0b6ac653dc4e458c5db45348cecc564b388f4ed1def84a329ff"
+            "c5acb8b7055ee0b6ac653dc4e458c5db45348cecc564b388f4ed1def84a329ff",
         ),
         "10.9.0-windows_amd64": (
             "node-v10.9.0-win-x64.zip",
             "node-v10.9.0-win-x64",
-            "6a75cdbb69d62ed242d6cbf0238a470bcbf628567ee339d4d098a5efcda2401e"
+            "6a75cdbb69d62ed242d6cbf0238a470bcbf628567ee339d4d098a5efcda2401e",
         ),
     },
+    node_version = "10.9.0",
     yarn_repositories = {
         "1.9.2": (
             "yarn-v1.9.2.tar.gz",
             "yarn-v1.9.2",
-            "3ad69cc7f68159a562c676e21998eb21b44138cae7e8fe0749a7d620cf940204"
+            "3ad69cc7f68159a562c676e21998eb21b44138cae7e8fe0749a7d620cf940204",
         ),
     },
+    yarn_version = "1.9.2",
 )
 
 yarn_install(
     name = "npm",
-    package_json = "//:package.json",
-    yarn_lock = "//:yarn.lock",
     data = [
         "//:tools/yarn/check-yarn.js",
     ],
+    package_json = "//:package.json",
+    yarn_lock = "//:yarn.lock",
 )
 
 load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
+
 install_bazel_dependencies()
 
 load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace")
diff --git a/etc/api/BUILD b/etc/api/BUILD
index 3e8f83d9bea7..cd8577ba9d76 100644
--- a/etc/api/BUILD
+++ b/etc/api/BUILD
@@ -11,6 +11,13 @@ load("@angular//tools/ts-api-guardian:index.bzl", "ts_api_guardian_test")
         bundle[1],
         bundle[2],
     ),
+    allow_module_identifiers = [
+        "fs",
+        "ts",
+        "ajv",
+        "Symbol",
+        "webpack",
+    ],
     data = glob([
         "%s/%s/**/*.d.ts" % (
             bundle[0],
@@ -38,13 +45,6 @@ load("@angular//tools/ts-api-guardian:index.bzl", "ts_api_guardian_test")
         # @angular-devkit/build-optimizer
         "^buildOptimizerLoader$",
     ],
-    allow_module_identifiers = [
-        "fs",
-        "ts",
-        "ajv",
-        "Symbol",
-        "webpack",
-    ],
     # At the moment using this will ignore a big change
     use_angular_tag_rules = False,
 ) for bundle in [b[:-len(".d.ts")].split("/", 2) for b in glob(
diff --git a/package.json b/package.json
index 4f571d87e08a..4d237e926613 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   ],
   "scripts": {
     "admin": "node ./bin/devkit-admin",
-    "bazel:format": "find . -type f \\( -name \"*.bzl\" -or -name WORKSPACE -or -name BUILD -or -name BUILD.bazel \\) ! -path \"*/node_modules/*\" | xargs buildifier -v --warnings=args-order,attr-cfg,attr-license,attr-non-empty,attr-output-default,attr-single-file,constant-glob,ctx-args,depset-iteration,depset-union,dict-concatenation,duplicated-name,filetype,git-repository,http-archive,integer-division,load,load-on-top,native-build,native-package,output-group,package-name,package-on-top,positional-args,redefined-variable,repository-name,same-origin-load,string-iteration,unused-variable",
+    "bazel:format": "find . -type f \\( -name \"*.bzl\" -or -name WORKSPACE -or -name BUILD -or -name BUILD.bazel \\) ! -path \"*/node_modules/*\" | xargs buildifier -v --warnings=attr-cfg,attr-license,attr-non-empty,attr-output-default,attr-single-file,constant-glob,ctx-args,depset-iteration,depset-union,dict-concatenation,duplicated-name,filetype,git-repository,http-archive,integer-division,load,load-on-top,native-build,native-package,output-group,package-name,package-on-top,positional-args,redefined-variable,repository-name,same-origin-load,string-iteration,unused-variable",
     "bazel:lint": "yarn bazel:format --lint=warn",
     "bazel:lint-fix": "yarn bazel:format --lint=fix",
     "bazel:test": "bazel test //...",
diff --git a/packages/angular/cli/BUILD b/packages/angular/cli/BUILD
index 73a0d47bdda2..f225157d9a26 100644
--- a/packages/angular/cli/BUILD
+++ b/packages/angular/cli/BUILD
@@ -19,7 +19,10 @@ ts_library(
             "**/*_spec_large.ts",
         ],
     ),
-    data = glob(["**/*.json", "**/*.md"]),
+    data = glob([
+        "**/*.json",
+        "**/*.md",
+    ]),
     module_name = "@angular/cli",
     # strict_checks = False,
     deps = [
diff --git a/packages/angular/pwa/BUILD b/packages/angular/pwa/BUILD
index 1cbc93bc1477..62d5bb02bb1b 100644
--- a/packages/angular/pwa/BUILD
+++ b/packages/angular/pwa/BUILD
@@ -29,8 +29,8 @@ ts_library(
         ":pwa_schema",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/schematics",
-        "@npm//rxjs",
         "@npm//@types/node",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/angular_devkit/architect/BUILD b/packages/angular_devkit/architect/BUILD
index 138ebff8da75..c2736412f275 100644
--- a/packages/angular_devkit/architect/BUILD
+++ b/packages/angular_devkit/architect/BUILD
@@ -15,14 +15,17 @@ ts_json_schema(
     name = "builder_input_schema",
     src = "src/input-schema.json",
 )
+
 ts_json_schema(
     name = "builder_output_schema",
     src = "src/output-schema.json",
 )
+
 ts_json_schema(
     name = "builder_builders_schema",
     src = "src/builders-schema.json",
 )
+
 ts_json_schema(
     name = "progress_schema",
     src = "src/progress-schema.json",
@@ -41,15 +44,14 @@ ts_library(
     module_root = "node/index.d.ts",
     # strict_checks = False,
     deps = [
-        "//packages/angular_devkit/core",
-        "//packages/angular_devkit/core:node",
-        "@npm//rxjs",
-        
-        "@npm//@types/node",
         ":architect",
         ":builder_builders_schema",
         ":builder_input_schema",
         ":builder_output_schema",
+        "//packages/angular_devkit/core",
+        "//packages/angular_devkit/core:node",
+        "@npm//@types/node",
+        "@npm//rxjs",
     ],
 )
 
@@ -62,18 +64,18 @@ ts_library(
             "**/*_spec_large.ts",
         ],
     ),
-    module_name = "@angular-devkit/architect",
-    module_root = "src/index.d.ts",
     # strict_checks = False,
     data = glob(["**/*.json"]),
+    module_name = "@angular-devkit/architect",
+    module_root = "src/index.d.ts",
     deps = [
-        "//packages/angular_devkit/core",
-        "//packages/angular_devkit/core:node",
-        "@npm//rxjs",
-        "@npm//@types/node",
         ":builder_input_schema",
         ":builder_output_schema",
         ":progress_schema",
+        "//packages/angular_devkit/core",
+        "//packages/angular_devkit/core:node",
+        "@npm//@types/node",
+        "@npm//rxjs",
     ],
 )
 
@@ -92,17 +94,15 @@ ts_library(
         ":architect",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
-        "@npm//rxjs",
-        
         "@npm//@types/node",
+        "@npm//rxjs",
     ],
 )
 
-
 npm_package(
     name = "npm_package",
     deps = [
         ":architect",
-        ":testing"
+        ":testing",
     ],
 )
diff --git a/packages/angular_devkit/architect_cli/BUILD b/packages/angular_devkit/architect_cli/BUILD
index ad26cb545dc7..9dfd78cf63c9 100644
--- a/packages/angular_devkit/architect_cli/BUILD
+++ b/packages/angular_devkit/architect_cli/BUILD
@@ -19,10 +19,9 @@ ts_library(
         "//packages/angular_devkit/architect:node",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
-        "@npm//rxjs",
-        
-        "@npm//@types/node",
         "@npm//@types/minimist",
+        "@npm//@types/node",
         "@npm//@types/progress",
+        "@npm//rxjs",
     ],
 )
diff --git a/packages/angular_devkit/benchmark/BUILD b/packages/angular_devkit/benchmark/BUILD
index 807343503c27..b1a4160c7e4e 100644
--- a/packages/angular_devkit/benchmark/BUILD
+++ b/packages/angular_devkit/benchmark/BUILD
@@ -25,15 +25,15 @@ ts_library(
     deps = [
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
-        "@npm//rxjs",
-        
-        "@npm//@types/node",
         "@npm//@types/minimist",
+        "@npm//@types/node",
+        "@npm//rxjs",
     ],
 )
 
 ts_library(
     name = "benchmark_test_lib",
+    testonly = True,
     srcs = glob(
         include = [
             "src/**/*_spec.ts",
@@ -45,18 +45,16 @@ ts_library(
         "src/test/fibonacci.js",
         "src/test/test-script.js",
     ],
+    # @external_begin
+    tsconfig = "//:tsconfig-test.json",
     deps = [
         ":benchmark",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
-        "@npm//rxjs",
-        
-        "@npm//@types/node",
         "@npm//@types/jasmine",
+        "@npm//@types/node",
+        "@npm//rxjs",
     ],
-    testonly = True,
-    # @external_begin
-    tsconfig = "//:tsconfig-test.json",
     # @external_end
 )
 
@@ -65,12 +63,12 @@ jasmine_node_test(
     srcs = [":benchmark_test_lib"],
     deps = [
         "@npm//jasmine",
-        "@npm//source-map",
         "@npm//minimist",
-        "@npm//pidusage",
         "@npm//pidtree",
-        "@npm//tree-kill",
+        "@npm//pidusage",
+        "@npm//source-map",
         "@npm//temp",
+        "@npm//tree-kill",
     ],
 )
 
diff --git a/packages/angular_devkit/build_optimizer/BUILD b/packages/angular_devkit/build_optimizer/BUILD
index cacfa7db0a64..602373f36e8c 100644
--- a/packages/angular_devkit/build_optimizer/BUILD
+++ b/packages/angular_devkit/build_optimizer/BUILD
@@ -26,29 +26,29 @@ ts_library(
     deps = [
         "@npm//@types/node",
         "@npm//@types/source-map",
-        "@npm//typescript",
         "@npm//@types/webpack",
+        "@npm//typescript",
     ],
 )
 
 ts_library(
     name = "build_optimizer_test_lib",
+    testonly = True,
     srcs = glob(
         include = [
             "src/**/*_spec.ts",
             "src/**/*_spec_large.ts",
         ],
     ),
+    # @external_begin
+    tsconfig = "//:tsconfig-test.json",
     deps = [
         ":build_optimizer",
         "//packages/angular_devkit/core",
-        "@npm//@types/node",
         "@npm//@types/jasmine",
+        "@npm//@types/node",
         "@npm//@types/source-map",
     ],
-    testonly = True,
-    # @external_begin
-    tsconfig = "//:tsconfig-test.json",
     # @external_end
 )
 
@@ -58,7 +58,7 @@ jasmine_node_test(
     deps = [
         "@npm//jasmine",
         "@npm//source-map",
-    ]
+    ],
 )
 
 npm_package(
diff --git a/packages/angular_devkit/core/BUILD b/packages/angular_devkit/core/BUILD
index c26ae254b782..33930c4bc806 100644
--- a/packages/angular_devkit/core/BUILD
+++ b/packages/angular_devkit/core/BUILD
@@ -29,7 +29,6 @@ ts_library(
     # strict_checks = False,
     deps = [
         "@npm//rxjs",
-        
         "@npm//@types/node",
         "@npm//@types/source-map",
         "@npm//ajv",
@@ -42,28 +41,27 @@ ts_library(
 
 ts_library(
     name = "core_test_lib",
+    testonly = True,
     srcs = glob(
         include = [
             "src/**/*_spec.ts",
             "src/**/*_spec_large.ts",
         ],
     ),
+    data = [
+        "src/experimental/workspace/test/test-workspace.json",
+        "src/experimental/workspace/workspace-schema.json",
+    ],
+    # @external_begin
+    tsconfig = "//:tsconfig-test.json",
     # strict_checks = False,
     deps = [
         ":core",
         ":node",
-        "@npm//rxjs",
-        
-        "@npm//@types/node",
         "@npm//@types/jasmine",
+        "@npm//@types/node",
+        "@npm//rxjs",
     ],
-    data = [
-        "src/experimental/workspace/workspace-schema.json",
-        "src/experimental/workspace/test/test-workspace.json"
-    ],
-    testonly = True,
-    # @external_begin
-    tsconfig = "//:tsconfig-test.json",
     # @external_end
 )
 
@@ -76,7 +74,6 @@ jasmine_node_test(
     ],
 )
 
-
 # @angular-devkit/core/node
 
 ts_library(
@@ -94,32 +91,30 @@ ts_library(
     module_root = "node/index.d.ts",
     deps = [
         ":core",
-        "@npm//rxjs",
-        
         "@npm//@types/node",
+        "@npm//rxjs",
     ],
 )
 
 ts_library(
     name = "node_test_lib",
+    testonly = True,
     srcs = glob(
         include = [
             "node/**/*_spec.ts",
             "node/**/*_spec_large.ts",
         ],
     ),
+    # @external_begin
+    tsconfig = "//:tsconfig-test.json",
     deps = [
         ":core",
         ":node",
         "//tests/angular_devkit/core/node/jobs:jobs_test_lib",
-        "@npm//rxjs",
-        
-        "@npm//@types/node",
         "@npm//@types/jasmine",
+        "@npm//@types/node",
+        "@npm//rxjs",
     ],
-    testonly = True,
-    # @external_begin
-    tsconfig = "//:tsconfig-test.json",
     # @external_end
 )
 
@@ -127,15 +122,14 @@ jasmine_node_test(
     name = "node_test",
     srcs = [":node_test_lib"],
     deps = [
-        "@npm//jasmine",
         "@npm//chokidar",
+        "@npm//jasmine",
         "@npm//source-map",
         "@npm//temp",
         "@npm//tslint",
     ],
 )
 
-
 # @angular-devkit/core/node/testing
 
 ts_library(
@@ -154,10 +148,9 @@ ts_library(
     deps = [
         ":core",
         ":node",
-        "@npm//rxjs",
-        
-        "@npm//@types/node",
         "@npm//@types/jasmine",
+        "@npm//@types/node",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/angular_devkit/schematics/BUILD b/packages/angular_devkit/schematics/BUILD
index d218e503e6e6..0732766c5afa 100644
--- a/packages/angular_devkit/schematics/BUILD
+++ b/packages/angular_devkit/schematics/BUILD
@@ -27,33 +27,31 @@ ts_library(
     deps = [
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",  # TODO: get rid of this for 6.0
-        "@npm//rxjs",
-        
         "@npm//@types/node",
+        "@npm//rxjs",
     ],
 )
 
 ts_library(
     name = "schematics_test_lib",
+    testonly = True,
     srcs = glob(
         include = [
             "src/**/*_spec.ts",
             "src/**/*_spec_large.ts",
         ],
     ),
+    # @external_begin
+    tsconfig = "//:tsconfig-test.json",
     deps = [
         ":schematics",
         ":testing",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
-        "@npm//rxjs",
-        
-        "@npm//@types/node",
         "@npm//@types/jasmine",
+        "@npm//@types/node",
+        "@npm//rxjs",
     ],
-    testonly = True,
-    # @external_begin
-    tsconfig = "//:tsconfig-test.json",
     # @external_end
 )
 
@@ -66,7 +64,6 @@ jasmine_node_test(
     ],
 )
 
-
 # @angular-devkit/schematics/tasks
 
 ts_library(
@@ -85,13 +82,12 @@ ts_library(
     # strict_checks = False,
     deps = [
         ":schematics",
+        "//packages/angular_devkit/core",
+        "//packages/angular_devkit/core:node",
         "@npm//@types/node",
+        "@npm//rxjs",
         "@npm//tslint",
         "@npm//typescript",
-        "@npm//rxjs",
-        
-        "//packages/angular_devkit/core:node",
-        "//packages/angular_devkit/core",
     ],
 )
 
@@ -114,14 +110,14 @@ ts_library(
         ":tasks",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
-        "@npm//rxjs",
-        
         "@npm//@types/node",
+        "@npm//rxjs",
     ],
 )
 
 ts_library(
     name = "tasks_test_lib",
+    testonly = True,
     srcs = glob(
         include = [
             "tasks/**/*_spec.ts",
@@ -133,25 +129,22 @@ ts_library(
         "tasks/tslint-fix/test/collection.json",
         "tasks/tslint-fix/test/rules/customRuleRule.js",
     ],
+    # @external_begin
+    tsconfig = "//:tsconfig-test.json",
     deps = [
+        ":schematics",
         ":tasks",
         ":testing",
-        ":schematics",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
         "//packages/angular_devkit/core:node_testing",
-        "@npm//rxjs",
-        
-        "@npm//@types/node",
         "@npm//@types/jasmine",
+        "@npm//@types/node",
+        "@npm//rxjs",
     ],
-    testonly = True,
-    # @external_begin
-    tsconfig = "//:tsconfig-test.json",
     # @external_end
 )
 
-
 jasmine_node_test(
     name = "tasks_test",
     srcs = [":tasks_test_lib"],
@@ -161,7 +154,6 @@ jasmine_node_test(
     ],
 )
 
-
 # @angular-devkit/schematics/tools
 
 ts_library(
@@ -183,14 +175,14 @@ ts_library(
         ":tasks_node",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
-        "@npm//rxjs",
-        
         "@npm//@types/node",
+        "@npm//rxjs",
     ],
 )
 
 ts_library(
     name = "tools_test_lib",
+    testonly = True,
     srcs = glob(
         include = [
             "tools/**/*_spec.ts",
@@ -198,22 +190,20 @@ ts_library(
             "tools/test/**/*.ts",
         ],
     ),
+    # @external_begin
+    tsconfig = "//:tsconfig-test.json",
     deps = [
-        ":tools",
-        ":tasks",
         ":schematics",
+        ":tasks",
         ":testing",
+        ":tools",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",
         "//tests/angular_devkit/schematics/tools/file-system-engine-host:file_system_engine_host_test_lib",
-        "@npm//rxjs",
-        
-        "@npm//@types/node",
         "@npm//@types/jasmine",
+        "@npm//@types/node",
+        "@npm//rxjs",
     ],
-    testonly = True,
-    # @external_begin
-    tsconfig = "//:tsconfig-test.json",
     # @external_end
 )
 
@@ -226,7 +216,6 @@ jasmine_node_test(
     ],
 )
 
-
 # @angular-devkit/schematics/testing
 
 ts_library(
@@ -242,9 +231,8 @@ ts_library(
         ":tasks_node",
         ":tools",
         "//packages/angular_devkit/core",
-        "@npm//rxjs",
-        
         "@npm//@types/node",
+        "@npm//rxjs",
     ],
 )
 
@@ -253,7 +241,7 @@ npm_package(
     deps = [
         ":schematics",
         ":tasks",
+        ":testing",
         ":tools",
-        ":testing"
     ],
 )
diff --git a/packages/angular_devkit/schematics_cli/BUILD b/packages/angular_devkit/schematics_cli/BUILD
index 1c112566c6a9..8faa850b8c97 100644
--- a/packages/angular_devkit/schematics_cli/BUILD
+++ b/packages/angular_devkit/schematics_cli/BUILD
@@ -8,7 +8,6 @@ load("@npm_bazel_typescript//:defs.bzl", "ts_library")
 
 licenses(["notice"])  # MIT License
 
-
 # @angular-devkit/schematics-cli
 
 ts_library(
@@ -29,10 +28,9 @@ ts_library(
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:tasks",
         "//packages/angular_devkit/schematics:tools",
-        "@npm//rxjs",
-        
         "@npm//@types/inquirer",
         "@npm//@types/minimist",
         "@npm//@types/node",
+        "@npm//rxjs",
     ],
 )
diff --git a/packages/schematics/angular/BUILD b/packages/schematics/angular/BUILD
index 507b196b67a3..d0172ec3b516 100644
--- a/packages/schematics/angular/BUILD
+++ b/packages/schematics/angular/BUILD
@@ -13,7 +13,10 @@ package(default_visibility = ["//visibility:public"])
 
 # Create a list of Tuple("path/file.json", "path_file") to be used as rules
 ALL_SCHEMA_TARGETS_PAIR = [
-    (x, x.replace("/", "_").replace("-", "_").replace(".json", ""))
+    (
+        x,
+        x.replace("/", "_").replace("-", "_").replace(".json", ""),
+    )
     for x in glob(["*/schema.json"])
 ]
 
@@ -40,7 +43,7 @@ ts_library(
             "*/files/**/*.ts",
             "*/other-files/**/*.ts",
             # Exclude test helpers.
-            "utility/test/**/*.ts"
+            "utility/test/**/*.ts",
         ],
     ),
     module_name = "@schematics/angular",
@@ -68,11 +71,12 @@ jasmine_node_test(
 
 ts_library(
     name = "angular_test_lib",
+    testonly = True,
     srcs = glob(
         include = [
             "**/*_spec.ts",
             "**/*_spec_large.ts",
-            "utility/test/**/*.ts"
+            "utility/test/**/*.ts",
         ],
     ),
     data = glob(
@@ -80,8 +84,10 @@ ts_library(
             "**/*.json",
             "*/files/**",
             "*/other-files/**",
-        ]
+        ],
     ),
+    # @external_begin
+    tsconfig = "//:tsconfig-test.json",
     deps = ALL_SCHEMA_DEPS + [
         ":angular",
         "//packages/angular_devkit/core",
@@ -95,9 +101,6 @@ ts_library(
         "@npm//rxjs",
         "@npm//tslint",
     ],
-    testonly = True,
-    # @external_begin
-    tsconfig = "//:tsconfig-test.json",
     # @external_end
 )
 
@@ -105,8 +108,8 @@ jasmine_node_test(
     name = "angular_test",
     srcs = [":angular_test_lib"],
     deps = [
+        "//packages/schematics/angular/third_party/github.com/Microsoft/TypeScript",
         "@npm//jasmine",
         "@npm//source-map",
-        "//packages/schematics/angular/third_party/github.com/Microsoft/TypeScript",
     ],
 )
diff --git a/packages/schematics/schematics/BUILD b/packages/schematics/schematics/BUILD
index 2247b2b3169a..2ed5ded5e831 100644
--- a/packages/schematics/schematics/BUILD
+++ b/packages/schematics/schematics/BUILD
@@ -6,6 +6,7 @@
 licenses(["notice"])  # MIT
 
 load("@npm_bazel_typescript//:defs.bzl", "ts_library")
+
 # load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
@@ -30,9 +31,8 @@ ts_library(
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:tasks",
-        "@npm//rxjs",
-        
         "@npm//@types/node",
+        "@npm//rxjs",
     ],
 )
 
@@ -75,7 +75,7 @@ ts_json_schema(
 #         "//packages/angular_devkit/schematics",
 #         "//packages/angular_devkit/schematics:testing",
 #         "@npm//rxjs",
-#         
+#
 #         "@npm//@types/node",
 #         "@npm//@types/jasmine",
 #     ],
diff --git a/packages/schematics/update/BUILD b/packages/schematics/update/BUILD
index 146f202f90eb..a34004461e64 100644
--- a/packages/schematics/update/BUILD
+++ b/packages/schematics/update/BUILD
@@ -27,11 +27,9 @@ ts_library(
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:tasks",
-        "@npm//rxjs",
-        "@npm//semver",
-        
         "@npm//@types/node",
         "@npm//@types/semver",
+        "@npm//rxjs",
     ],
 )
 
@@ -47,6 +45,7 @@ ts_json_schema(
 
 ts_library(
     name = "update_test_lib",
+    testonly = True,
     srcs = glob(
         include = [
             "**/*_spec.ts",
@@ -56,25 +55,23 @@ ts_library(
     data = glob(
         include = [
             "**/*.json",
-        ]
+        ],
     ),
+    # @external_begin
+    tsconfig = "//:tsconfig-test.json",
     deps = [
         ":update",
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:testing",
-        "@npm//rxjs",
-        
         "@npm//@types/jasmine",
         "@npm//@types/node",
         "@npm//@types/semver",
         "@npm//@yarnpkg/lockfile",
         "@npm//ini",
         "@npm//pacote",
+        "@npm//rxjs",
     ],
-    testonly = True,
-    # @external_begin
-    tsconfig = "//:tsconfig-test.json",
     # @external_end
 )
 
@@ -83,7 +80,7 @@ jasmine_node_test(
     srcs = [":update_test_lib"],
     deps = [
         "@npm//jasmine",
-        "@npm//source-map",
         "@npm//npm-registry-client",
+        "@npm//source-map",
     ],
 )
diff --git a/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD b/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD
index 8f5209b06536..3a8d30e24538 100644
--- a/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD
+++ b/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD
@@ -16,7 +16,10 @@ ts_library(
         ],
     ),
     data = glob(
-        include = ["**/collection.json", "**/*.js"],
+        include = [
+            "**/collection.json",
+            "**/*.js",
+        ],
     ),
     deps = [
         "//packages/angular_devkit/schematics",
@@ -24,7 +27,7 @@ ts_library(
         # "//packages/angular_devkit/core",
         # "//packages/angular_devkit/core:node",
         # "@npm//rxjs",
-        # 
+        #
         "@npm//@types/jasmine",
         "@npm//@types/node",
     ],
diff --git a/tools/BUILD b/tools/BUILD
index 4c09dc0603cf..707a63093457 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -8,17 +8,17 @@ package(default_visibility = ["//visibility:public"])
 load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
 
 nodejs_binary(
-    name = 'quicktype_runner',
+    name = "quicktype_runner",
     data = [
         "quicktype_runner.js",
     ],
-    node_modules = "@npm//quicktype-core",
     entry_point = "angular_cli/tools/quicktype_runner.js",
+    install_source_map_support = False,
+    node_modules = "@npm//quicktype-core",
     templated_args = [
         # Needed so that node doesn't walk back to the source directory.
         # From there, the relative imports would point to .ts files.
         "--node_options=--preserve-symlinks",
     ],
-    install_source_map_support = False,
 )
 # @external_end
diff --git a/tools/build_event_protocol/BUILD b/tools/build_event_protocol/BUILD
index 45ee40373780..aabf6d4b91f1 100644
--- a/tools/build_event_protocol/BUILD
+++ b/tools/build_event_protocol/BUILD
@@ -14,15 +14,14 @@ ts_library(
     name = "parse_bep",
     srcs = ["parse_bep.ts"],
     deps = [
-      ":build_event_stream",
-      "@npm//@types/node",
-      "@npm//rxjs",
-      
+        ":build_event_stream",
+        "@npm//@types/node",
+        "@npm//rxjs",
     ],
 )
 
 nodejs_binary(
     name = "parse",
-    entry_point = "angular_devkit/tools/build_event_protocol/parse_bep",
     data = [":parse_bep"],
+    entry_point = "angular_devkit/tools/build_event_protocol/parse_bep",
 )
diff --git a/tools/ts_json_schema.bzl b/tools/ts_json_schema.bzl
index 4615e8a94e34..5cb9483aaa1f 100644
--- a/tools/ts_json_schema.bzl
+++ b/tools/ts_json_schema.bzl
@@ -21,7 +21,6 @@ def _ts_json_schema_interface_impl(ctx):
 
     return [DefaultInfo()]
 
-
 _ts_json_schema_interface = rule(
     _ts_json_schema_interface_impl,
     attrs = {
@@ -42,12 +41,11 @@ _ts_json_schema_interface = rule(
         ),
     },
     outputs = {
-        "ts": "%{out}"
+        "ts": "%{out}",
     },
 )
 # @external_end
 
-
 # Generates a library that contains the interface for a JSON Schema file. Takes a single `src`
 # argument as input, an optional data field for reference files, and produces a ts_library()
 # rule containing the typescript interface.
@@ -74,6 +72,6 @@ def ts_json_schema(name, src, data = []):
         # @external_begin
         srcs = [
             out,
-        ]
+        ],
         # @external_end
     )

From 543cf14c7a870cd5a3867f191bb0c162b5169d39 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Mon, 15 Apr 2019 09:09:30 -0700
Subject: [PATCH 1211/1703] build: update to latest bazel

---
 .circleci/config.yml |  2 ++
 package.json         |  2 +-
 yarn.lock            | 44 ++++++++++++++++++++++----------------------
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9d503505552b..ce1a41cae5b8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -100,6 +100,7 @@ jobs:
     <<: *defaults
     environment:
       BASH_ENV: ~/.profile
+      NPM_CONFIG_PREFIX: ~/.npm-global
     resource_class: xlarge
     parallelism: 4
     steps:
@@ -113,6 +114,7 @@ jobs:
     <<: *defaults
     environment:
       BASH_ENV: ~/.profile
+      NPM_CONFIG_PREFIX: ~/.npm-global
     resource_class: xlarge
     parallelism: 4
     steps:
diff --git a/package.json b/package.json
index 4d237e926613..1303e2afe9b1 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
   "devDependencies": {
     "@angular/compiler": "^8.0.0-beta.12",
     "@angular/compiler-cli": "^8.0.0-beta.12",
-    "@bazel/bazel": "^0.24.0",
+    "@bazel/bazel": "0.24.1",
     "@bazel/buildifier": "^0.22.0",
     "@bazel/karma": "~0.26.0",
     "@bazel/typescript": "~0.26.0",
diff --git a/yarn.lock b/yarn.lock
index ef061d0c1cee..ee1ff90fbc48 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -188,29 +188,29 @@
     lodash "^4.17.10"
     to-fast-properties "^2.0.0"
 
-"@bazel/bazel-darwin_x64@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.24.0.tgz#828ef298d8d542961df388f17b0244f4f4302a74"
-  integrity sha512-xly44vkcD/fauUb7Lm5Lme4qhEZdkuuyBKSVQUHPbYAGDdbj/W8dupI3bZREkJAgG/WrRU+WXUemMj4U8ZcLcw==
-
-"@bazel/bazel-linux_x64@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.24.0.tgz#9ef2e7266833ad2221fe4af4ceb6763d2897e3ff"
-  integrity sha512-p5ylPLWnJZDGbaIFBrtD/tp3Su5rMdzeeNJKU24XyiWQTHVZ3OD3I2Fb0ILCgfBjY8AlA7EtCtOI4hYnAuIOtg==
-
-"@bazel/bazel-win32_x64@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.24.0.tgz#02d83113a6c6ed99795a3e41bff5631aa141638d"
-  integrity sha512-/bcSEx+GoV/q7H4WM0jazfxTcurSiIIePhRv+d05mxRDcaWwhCO8KzmmZRWH1abW6npvq5tLkbSQi7G7nUBhgg==
-
-"@bazel/bazel@^0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel/-/bazel-0.24.0.tgz#f4e68e3680ac299858c24c26be3d08d1151e78fc"
-  integrity sha512-/5E55tqH9ogAGF9Dd7RSCJmk7/xdlsPTAhsX3yEsEMs7GLdHlgD3jbeePsKUiHKKr8LXAufjTs2pXQfjrkZRMg==
+"@bazel/bazel-darwin_x64@0.24.1":
+  version "0.24.1"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.24.1.tgz#11479d0548d83fea22e664452d3e70c5f2edf94e"
+  integrity sha512-EF2WlPIQeq4zhkwwSCDJncG/rA1C2xnjUynabzB04KOxEBj0lveqYLgoCvs6L3Y+1vp2TQJmKGVEG6GpYb4uUA==
+
+"@bazel/bazel-linux_x64@0.24.1":
+  version "0.24.1"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.24.1.tgz#59c61c4ed885fd7ceed1bc9d605db563a51b83bd"
+  integrity sha512-oFLpfUOzZK4VSOM49FMJjb5UOJ5HXpTZ+zBOVO0hfK+oAkRaRfZjQZoKm6wa67MxfvU4tP/LDWcw7uj6swaGLw==
+
+"@bazel/bazel-win32_x64@0.24.1":
+  version "0.24.1"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.24.1.tgz#ebc7b9958a5d0bb5ccca761852bcc750d07ec343"
+  integrity sha512-s+zFYNawvzDLnb0TBY4LmkT+8ZfjMJ6/dyVnH6w8Q24mevnJqTBflcPJUlXoLRCAtaK/S3+1KOfKPccIwDNDDg==
+
+"@bazel/bazel@0.24.1":
+  version "0.24.1"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel/-/bazel-0.24.1.tgz#15380c4d5945de47c7be1e3a83e9a8d1607aa33b"
+  integrity sha512-iTTUqdI2dX4S+fQOGbhr84jRRv9FbYr8GX3L69Z/HurgcDrgErOKo1LGtOuSYqZYaEvQ+ZpV0aP7OzaUsv59WA==
   optionalDependencies:
-    "@bazel/bazel-darwin_x64" "0.24.0"
-    "@bazel/bazel-linux_x64" "0.24.0"
-    "@bazel/bazel-win32_x64" "0.24.0"
+    "@bazel/bazel-darwin_x64" "0.24.1"
+    "@bazel/bazel-linux_x64" "0.24.1"
+    "@bazel/bazel-win32_x64" "0.24.1"
 
 "@bazel/buildifier-darwin_x64@0.22.0":
   version "0.22.0"

From 1d42b2da2ab838429dc0f967ee4c50b4a1af041d Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Mon, 15 Apr 2019 09:45:35 -0700
Subject: [PATCH 1212/1703] build: skip license check for @bazel packages

need to fix them upstream
---
 .circleci/config.yml         | 4 ++--
 scripts/validate-licenses.ts | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ce1a41cae5b8..bb1bdea29fca 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -105,7 +105,7 @@ jobs:
     parallelism: 4
     steps:
       - attach_workspace: *attach_options
-      - run: xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
+      - run: PATH=~/.npm-global/bin:$PATH xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
       - store_artifacts:
           path: /tmp/dist
           destination: cli/new-production
@@ -119,7 +119,7 @@ jobs:
     parallelism: 4
     steps:
       - attach_workspace: *attach_options
-      - run: xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} --ivy          
+      - run: PATH=~/.npm-global/bin:$PATH xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} --ivy
 
   e2e-cli-ng-snapshots:
     <<: *defaults
diff --git a/scripts/validate-licenses.ts b/scripts/validate-licenses.ts
index 2aaa0478804c..40b8f0bce473 100644
--- a/scripts/validate-licenses.ts
+++ b/scripts/validate-licenses.ts
@@ -73,6 +73,14 @@ const ignoredPackages = [
   'true-case-path@1.0.2', // Apache-2.0 but broken license in package.json
   'uws@9.14.0', // zlib license
 
+  // * Need to publish these with LICENSE files
+  // see https://github.com/bazelbuild/rules_nodejs/pull/696
+  // TODO(alexeagle): remove these after a release that fixes it
+  '@bazel/bazel@0.24.1',
+  '@bazel/bazel-linux_x64@0.24.1',
+  '@bazel/buildifier@0.22.0',
+  '@bazel/buildifier-linux_x64@0.22.0',
+
   // * Other
   'font-awesome@4.7.0', // (OFL-1.1 AND MIT)
   'stream-json@0.5.2', // 'New BSD'

From a197615549e298bb6d8ebf500e5833fb1152f4e8 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Mon, 15 Apr 2019 14:39:10 -0700
Subject: [PATCH 1213/1703] build: update jasmine_node_test rules to come from
 npm

---
 .circleci/config.yml                          | 13 ++++++++++---
 package.json                                  |  3 +--
 packages/angular_devkit/benchmark/BUILD       |  3 ++-
 packages/angular_devkit/build_optimizer/BUILD |  3 ++-
 packages/angular_devkit/core/BUILD            |  3 ++-
 packages/angular_devkit/schematics/BUILD      |  3 ++-
 packages/schematics/angular/BUILD             |  2 +-
 packages/schematics/schematics/BUILD          |  2 --
 packages/schematics/update/BUILD              |  3 ++-
 scripts/validate-licenses.ts                  |  1 +
 yarn.lock                                     |  9 ++++++++-
 11 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bb1bdea29fca..79d6808dc248 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,14 +13,15 @@
 # If you change the cache key prefix, also sync the restore_cache fallback to match.
 # Keep the static part of the cache key as prefix to enable correct fallbacks.
 # See https://circleci.com/docs/2.0/caching/#restoring-cache for how prefixes work in CircleCI.
-var_1: &docker_image circleci/node:10.12
-var_2: &cache_key angular_devkit-0.10.0-{{ checksum "yarn.lock" }}
+var_1: &default_docker_image circleci/node:10.12
+var_2: &browsers_docker_image circleci/node:10.12-browsers
+var_3: &cache_key angular_devkit-0.10.0-{{ checksum "yarn.lock" }}
 
 # Settings common to each job
 anchor_1: &defaults
   working_directory: ~/ng
   docker:
-    - image: *docker_image
+    - image: *default_docker_image
 
 # After checkout, rebase on top of target branch.
 anchor_2: &post_checkout
@@ -89,6 +90,8 @@ jobs:
 
   test-large:
     <<: *defaults
+    docker:
+      - image: *browsers_docker_image
     resource_class: large
     parallelism: 4
     steps:
@@ -98,6 +101,8 @@ jobs:
 
   e2e-cli:
     <<: *defaults
+    docker:
+      - image: *browsers_docker_image
     environment:
       BASH_ENV: ~/.profile
       NPM_CONFIG_PREFIX: ~/.npm-global
@@ -112,6 +117,8 @@ jobs:
 
   e2e-cli-ivy:
     <<: *defaults
+    docker:
+      - image: *browsers_docker_image
     environment:
       BASH_ENV: ~/.profile
       NPM_CONFIG_PREFIX: ~/.npm-global
diff --git a/package.json b/package.json
index 1303e2afe9b1..a83b727c343a 100644
--- a/package.json
+++ b/package.json
@@ -28,8 +28,6 @@
     "build-tsc": "tsc -p tsconfig.json",
     "fix": "npm run admin -- lint --fix",
     "lint": "npm run admin -- lint",
-    "prebuildifier": "bazel build --noshow_progress @com_github_bazelbuild_buildtools//buildifier",
-    "buildifier": "find . -type f \\( -name BUILD -or -name BUILD.bazel \\) ! -path \"*/node_modules/*\" | xargs $(bazel info bazel-bin)/external/com_github_bazelbuild_buildtools/buildifier/buildifier",
     "templates": "node ./bin/devkit-admin templates",
     "test": "node ./bin/devkit-admin test",
     "test-large": "node ./bin/devkit-admin test --large --spec-reporter",
@@ -86,6 +84,7 @@
     "@angular/compiler-cli": "^8.0.0-beta.12",
     "@bazel/bazel": "0.24.1",
     "@bazel/buildifier": "^0.22.0",
+    "@bazel/jasmine": "~0.26.0",
     "@bazel/karma": "~0.26.0",
     "@bazel/typescript": "~0.26.0",
     "@ngtools/json-schema": "^1.1.0",
diff --git a/packages/angular_devkit/benchmark/BUILD b/packages/angular_devkit/benchmark/BUILD
index b1a4160c7e4e..423c6a642125 100644
--- a/packages/angular_devkit/benchmark/BUILD
+++ b/packages/angular_devkit/benchmark/BUILD
@@ -5,8 +5,9 @@
 
 licenses(["notice"])  # MIT
 
+load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
 load("@npm_bazel_typescript//:defs.bzl", "ts_library")
-load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test", "npm_package")
+load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/packages/angular_devkit/build_optimizer/BUILD b/packages/angular_devkit/build_optimizer/BUILD
index 602373f36e8c..03cc8af56aa7 100644
--- a/packages/angular_devkit/build_optimizer/BUILD
+++ b/packages/angular_devkit/build_optimizer/BUILD
@@ -5,8 +5,9 @@
 
 licenses(["notice"])  # MIT
 
+load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
 load("@npm_bazel_typescript//:defs.bzl", "ts_library")
-load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test", "npm_package")
+load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/packages/angular_devkit/core/BUILD b/packages/angular_devkit/core/BUILD
index 33930c4bc806..7466504a7b1d 100644
--- a/packages/angular_devkit/core/BUILD
+++ b/packages/angular_devkit/core/BUILD
@@ -4,8 +4,9 @@
 # found in the LICENSE file at https://angular.io/license
 package(default_visibility = ["//visibility:public"])
 
+load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
 load("@npm_bazel_typescript//:defs.bzl", "ts_library")
-load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test", "npm_package")
+load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package")
 
 licenses(["notice"])  # MIT License
 
diff --git a/packages/angular_devkit/schematics/BUILD b/packages/angular_devkit/schematics/BUILD
index 0732766c5afa..41d0462cca05 100644
--- a/packages/angular_devkit/schematics/BUILD
+++ b/packages/angular_devkit/schematics/BUILD
@@ -4,8 +4,9 @@
 # found in the LICENSE file at https://angular.io/license
 package(default_visibility = ["//visibility:public"])
 
+load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
 load("@npm_bazel_typescript//:defs.bzl", "ts_library")
-load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test", "npm_package")
+load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package")
 
 licenses(["notice"])  # MIT License
 
diff --git a/packages/schematics/angular/BUILD b/packages/schematics/angular/BUILD
index d0172ec3b516..5bc09cbbcf8f 100644
--- a/packages/schematics/angular/BUILD
+++ b/packages/schematics/angular/BUILD
@@ -5,8 +5,8 @@
 
 licenses(["notice"])  # MIT
 
+load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
 load("@npm_bazel_typescript//:defs.bzl", "ts_library")
-load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/packages/schematics/schematics/BUILD b/packages/schematics/schematics/BUILD
index 2ed5ded5e831..2534b7fbcb9c 100644
--- a/packages/schematics/schematics/BUILD
+++ b/packages/schematics/schematics/BUILD
@@ -6,8 +6,6 @@
 licenses(["notice"])  # MIT
 
 load("@npm_bazel_typescript//:defs.bzl", "ts_library")
-
-# load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/packages/schematics/update/BUILD b/packages/schematics/update/BUILD
index a34004461e64..dc2b8c99d7e0 100644
--- a/packages/schematics/update/BUILD
+++ b/packages/schematics/update/BUILD
@@ -5,8 +5,8 @@
 
 licenses(["notice"])  # MIT
 
+load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
 load("@npm_bazel_typescript//:defs.bzl", "ts_library")
-load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
 package(default_visibility = ["//visibility:public"])
@@ -30,6 +30,7 @@ ts_library(
         "@npm//@types/node",
         "@npm//@types/semver",
         "@npm//rxjs",
+        "@npm//semver",
     ],
 )
 
diff --git a/scripts/validate-licenses.ts b/scripts/validate-licenses.ts
index 40b8f0bce473..c0c7a82ff82c 100644
--- a/scripts/validate-licenses.ts
+++ b/scripts/validate-licenses.ts
@@ -80,6 +80,7 @@ const ignoredPackages = [
   '@bazel/bazel-linux_x64@0.24.1',
   '@bazel/buildifier@0.22.0',
   '@bazel/buildifier-linux_x64@0.22.0',
+  '@bazel/jasmine@0.26.0',
 
   // * Other
   'font-awesome@4.7.0', // (OFL-1.1 AND MIT)
diff --git a/yarn.lock b/yarn.lock
index ee1ff90fbc48..aaac7d55e7aa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -230,6 +230,13 @@
     "@bazel/buildifier-darwin_x64" "0.22.0"
     "@bazel/buildifier-linux_x64" "0.22.0"
 
+"@bazel/jasmine@~0.26.0":
+  version "0.26.0"
+  resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-0.26.0.tgz#f7aed169b057b5af547d2573657b394ecbda0b5d"
+  integrity sha512-lkvzPHdbSEe1zitnV1hIBwodriXqp/ClHSZQJ5Y486UaLQ6Sm7k7gV2phOwtg7LqLVZnElZDmFLSI0/O1UYYyQ==
+  dependencies:
+    jasmine "~3.3.1"
+
 "@bazel/karma@~0.26.0":
   version "0.26.0"
   resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.26.0.tgz#6ad796686f5775df33a96fa5ef3df76a66aed3b2"
@@ -5234,7 +5241,7 @@ jasmine@2.8.0:
     glob "^7.0.6"
     jasmine-core "~2.8.0"
 
-jasmine@^3.3.1:
+jasmine@^3.3.1, jasmine@~3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.3.1.tgz#d61bb1dd8888859bd11ea83074a78ee13d949905"
   integrity sha512-/vU3/H7U56XsxIXHwgEuWpCgQ0bRi2iiZeUpx7Nqo8n1TpoDHfZhkPIc7CO8I4pnMzYsi3XaSZEiy8cnTfujng==

From 36be8cd42e13cb299b75b9b73df1e599afcf4108 Mon Sep 17 00:00:00 2001
From: Minko Gechev <mgechev@google.com>
Date: Wed, 17 Apr 2019 18:47:34 -0700
Subject: [PATCH 1214/1703] feat(@angular-devkit/build-angular): warn when
 target greater es2015

When using differential loading with targets ES5 and ES2016+, the
browser with ESM support will pick `script[type="module"]` scripts even
without supporting ES2016+ syntax.

We want to warn users in this case.
---
 .../build_angular/src/browser/index.ts        | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 1e8766c796d5..148cf737f325 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -18,13 +18,15 @@ import {
   logging,
   normalize,
   resolve,
+  tags,
   virtualFs,
 } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as fs from 'fs';
 import * as path from 'path';
-import { concat, from, of, zip } from 'rxjs';
+import { from, of } from 'rxjs';
 import { bufferCount, catchError, concatMap, map, mergeScan, switchMap } from 'rxjs/operators';
+import * as ts from 'typescript';
 import * as webpack from 'webpack';
 import { NgBuildAnalyticsPlugin } from '../../plugins/webpack/analytics';
 import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
@@ -38,6 +40,7 @@ import {
   getWorkerConfig,
 } from '../angular-cli-files/models/webpack-configs';
 import { writeIndexHtml } from '../angular-cli-files/utilities/index-file/write-index-html';
+import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
 import { augmentAppWithServiceWorker } from '../angular-cli-files/utilities/service-worker';
 import {
   statsErrorsToString,
@@ -45,7 +48,7 @@ import {
   statsWarningsToString,
 } from '../angular-cli-files/utilities/stats';
 import { ExecutionTransformer } from '../transforms';
-import { deleteOutputDir } from '../utils';
+import { deleteOutputDir, isEs5SupportNeeded } from '../utils';
 import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
 import { Schema as BrowserBuilderSchema } from './schema';
 
@@ -182,6 +185,19 @@ export function buildWebpackBrowser(
         normalize(workspace.getProject(projectName).root),
       );
 
+      const tsConfigPath = path.resolve(workspace.root, options.tsConfig);
+      const tsConfig = readTsconfig(tsConfigPath);
+
+      if (isEs5SupportNeeded(projectRoot) &&
+          tsConfig.options.target !== ts.ScriptTarget.ES5 &&
+          tsConfig.options.target !== ts.ScriptTarget.ES2015) {
+        context.logger.warn(tags.stripIndent`
+          WARNING: Using differential loading with targets ES5 and ES2016 or higher may
+          cause problems. Browsers with support for ES2015 will load the ES2016+ scripts
+          referenced with script[type="module"] but they may not support ES2016+ syntax.
+        `);
+      }
+
       return from(configs).pipe(
         // the concurrency parameter (3rd parameter of mergeScan) is deliberately
         // set to 1 to make sure the build steps are executed in sequence.

From 9b5653b13e2ea6085884fb608a6a1f9362f884ce Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 22 Apr 2019 13:59:58 -0400
Subject: [PATCH 1215/1703] fix(@schematics/angular): ensure Angular builders
 are migrated to latest versions

The package group format required to automatically update the builder packages was not supported until CLI 7.2.  For older CLI versions performing the update, this new migration will update the builders instead.  Once the CLI is updated to at least 7.2, the update algorithm itself will handle the update.
---
 .../angular/migrations/update-8/index.ts      |  2 +
 .../migrations/update-8/update-builders.ts    | 49 +++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 packages/schematics/angular/migrations/update-8/update-builders.ts

diff --git a/packages/schematics/angular/migrations/update-8/index.ts b/packages/schematics/angular/migrations/update-8/index.ts
index 2916796169f5..a6eef2d88642 100644
--- a/packages/schematics/angular/migrations/update-8/index.ts
+++ b/packages/schematics/angular/migrations/update-8/index.ts
@@ -13,6 +13,7 @@ import {
 import { updatePackageJson, updateTsLintConfig } from './codelyzer-5';
 import { updateES5Projects } from './differential-loading';
 import { dropES2015Polyfills } from './drop-es6-polyfills';
+import { updateBuilders } from './update-builders';
 
 export { updateLazyModulePaths } from './update-lazy-module-paths';
 
@@ -23,6 +24,7 @@ export default function(): Rule {
       updatePackageJson(),
       dropES2015Polyfills(),
       updateES5Projects(),
+      updateBuilders(),
     ]);
   };
 }
diff --git a/packages/schematics/angular/migrations/update-8/update-builders.ts b/packages/schematics/angular/migrations/update-8/update-builders.ts
new file mode 100644
index 000000000000..92e59007081d
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-8/update-builders.ts
@@ -0,0 +1,49 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { SchematicContext, Tree } from '@angular-devkit/schematics';
+import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
+import { addPackageJsonDependency, getPackageJsonDependency } from '../../utility/dependencies';
+import { latestVersions } from '../../utility/latest-versions';
+
+export function updateBuilders() {
+  return (host: Tree, context: SchematicContext) => {
+    let updates = false;
+
+    let current = getPackageJsonDependency(host, '@angular-devkit/build-angular');
+    if (current && current.version !== latestVersions.DevkitBuildAngular) {
+      updates = true;
+      addPackageJsonDependency(
+        host,
+        {
+          type: current.type,
+          name: '@angular-devkit/build-angular',
+          version: latestVersions.DevkitBuildAngular,
+          overwrite: true,
+        },
+      );
+    }
+
+    current = getPackageJsonDependency(host, '@angular-devkit/build-ng-packagr');
+    if (current && current.version !== latestVersions.DevkitBuildNgPackagr) {
+      updates = true;
+      addPackageJsonDependency(
+        host,
+        {
+          type: current.type,
+          name: '@angular-devkit/build-ng-packagr',
+          version: latestVersions.DevkitBuildNgPackagr,
+          overwrite: true,
+        },
+      );
+    }
+
+    if (updates) {
+      context.addTask(new NodePackageInstallTask());
+    }
+  };
+}

From c80a92ac675ecf4b4556bc6a415946ea00037f28 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 22 Apr 2019 14:45:19 -0400
Subject: [PATCH 1216/1703] fix(@schematics/angular): skip E2E projects when
 migrating browserslist

---
 .../angular/migrations/update-8/differential-loading.ts    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-8/differential-loading.ts b/packages/schematics/angular/migrations/update-8/differential-loading.ts
index da953a25f000..3c24a6068c69 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading.ts
@@ -95,14 +95,17 @@ function updateBrowserlist(): Rule {
     }
 
     // For all projects
-    for (const projectName of Object.keys(angularJson.projects)) {
-      const project = angularJson.projects[projectName];
+    for (const [name, project] of Object.entries(angularJson.projects)) {
       if (!isJsonObject(project)) {
         continue;
       }
       if (typeof project.root != 'string' || project.projectType !== 'application') {
         continue;
       }
+      if (name.endsWith('-e2e')) {
+        // Skip existing separate E2E projects
+        continue;
+      }
 
       const browserslistPath = join(normalize(project.root), '/browserslist');
       const source = tree.read(browserslistPath);

From 74ec9110b079f4259e6e5c010e592e3b1ec893df Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 22 Apr 2019 10:36:15 -0400
Subject: [PATCH 1217/1703] refactor(@angular-devkit/build-angular): remove
 unused type

---
 .../angular_devkit/build_angular/src/dev-server/index.ts     | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index 92cc630ee613..eba9fbf92518 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -59,11 +59,6 @@ export type DevServerBuilderOutput = DevServerBuildOutput & {
   baseUrl: string;
 };
 
-export type ServerConfigTransformFn = (
-  workspace: experimental.workspace.Workspace,
-  config: WebpackDevServer.Configuration,
-) => Observable<WebpackDevServer.Configuration>;
-
 /**
  * Reusable implementation of the build angular webpack dev server builder.
  * @param options Dev Server options.

From 5b5fffbb5b5b3d6a24a880de1bbf3e4851857270 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 22 Apr 2019 20:44:12 +0200
Subject: [PATCH 1218/1703] test: fix flaky e2e tests under ivy

---
 tests/legacy-cli/e2e/tests/basic/rebuild.ts              | 4 ++--
 tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/basic/rebuild.ts b/tests/legacy-cli/e2e/tests/basic/rebuild.ts
index 085afcf30454..36e03266016c 100644
--- a/tests/legacy-cli/e2e/tests/basic/rebuild.ts
+++ b/tests/legacy-cli/e2e/tests/basic/rebuild.ts
@@ -22,7 +22,7 @@ export default function() {
     // We need to use Promise.all to ensure we are waiting for the rebuild just before we write
     // the file, otherwise rebuilds can be too fast and fail CI.
     .then(() => Promise.all([
-      waitForAnyProcessOutputToMatch(validBundleRegEx, 10000),
+      waitForAnyProcessOutputToMatch(validBundleRegEx, 20000),
       writeFile('src/app/app.module.ts', `
         import { BrowserModule } from '@angular/platform-browser';
         import { NgModule } from '@angular/core';
@@ -59,7 +59,7 @@ export default function() {
     })
     // Change multiple files and check that all of them are invalidated and recompiled.
     .then(() => Promise.all([
-      waitForAnyProcessOutputToMatch(validBundleRegEx, 10000),
+      waitForAnyProcessOutputToMatch(validBundleRegEx, 20000),
       writeMultipleFiles({
         'src/app/app.module.ts': `
           import { BrowserModule } from '@angular/platform-browser';
diff --git a/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts b/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts
index e6a14a106854..b38df33587b7 100644
--- a/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts
+++ b/tests/legacy-cli/e2e/tests/build/rebuild-replacements.ts
@@ -5,6 +5,7 @@ import {
   killAllProcesses,
   waitForAnyProcessOutputToMatch,
 } from '../../utils/process';
+import { wait } from '../../utils/utils';
 
 const webpackGoodRegEx = /: Compiled successfully./;
 
@@ -17,9 +18,8 @@ export default async function() {
   try {
     await execAndWaitForOutputToMatch('ng', ['serve', '--prod'], webpackGoodRegEx);
 
-    // delay file change by 1 second
-    await new Promise(resolve => setTimeout(resolve, 4000));
-
+    await wait(4000);
+ 
     // Should trigger a rebuild.
     await appendToFile('src/environments/environment.prod.ts', `console.log('PROD');`);
     await waitForAnyProcessOutputToMatch(webpackGoodRegEx, 45000);

From 0f9de92dcb8833cfdf6bfad832a9cf281ac27d3d Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 22 Apr 2019 17:04:54 +0100
Subject: [PATCH 1219/1703] feat(@angular-devkit/build-angular): remove
 experimentalImportFactories option

It will just be always be used when applicable.

Fix #14218
---
 packages/angular/cli/lib/config/schema.json                | 5 -----
 .../src/angular-cli-files/models/build-options.ts          | 1 -
 .../angular-cli-files/models/webpack-configs/typescript.ts | 1 -
 .../angular_devkit/build_angular/src/browser/schema.json   | 5 -----
 tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts       | 7 -------
 5 files changed, 19 deletions(-)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index 230b2faac391..cd0b2b193e6c 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -886,11 +886,6 @@
             "webWorkerTsConfig": {
               "type": "string",
               "description": "TypeScript configuration for Web Worker modules."
-            },
-            "experimentalImportFactories": {
-              "description": "**EXPERIMENTAL** Transform import statements for lazy routes to import factories when using View Engine. Should only be used when switching back and forth between View Engine and Ivy. See https://angular.io/guide/ivy for usage information.",
-              "type": "boolean",
-              "default": false
             }
           },
           "additionalProperties": false,
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
index 53591aae038d..a2a8652e294e 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
@@ -60,7 +60,6 @@ export interface BuildOptions {
   forkTypeChecker: boolean;
   profile?: boolean;
   es5BrowserSupport?: boolean;
-  experimentalImportFactories?: boolean;
 
   main: string;
   index: string;
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
index 5e92c917ac91..9965a34c1f33 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
@@ -91,7 +91,6 @@ function _createAotPlugin(
     contextElementDependencyConstructor: require('webpack/lib/dependencies/ContextElementDependency'),
     logger: wco.logger,
     directTemplateLoading: true,
-    importFactories: buildOptions.experimentalImportFactories,
     ...options,
   };
 
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index 6473d01c8feb..fa4876246630 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -316,11 +316,6 @@
       "default": false,
       "x-deprecated": true
     },
-    "experimentalImportFactories": {
-      "description": "**EXPERIMENTAL** Transform import statements for lazy routes to import factories when using View Engine. Should only be used when switching back and forth between View Engine and Ivy. See https://angular.io/guide/ivy for usage information.",
-      "type": "boolean",
-      "default": false
-    },
     "webWorkerTsConfig": {
       "type": "string",
       "description": "TypeScript configuration for Web Worker modules."
diff --git a/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts b/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts
index 826747136718..2a38e84cc83a 100644
--- a/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts
+++ b/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts
@@ -89,13 +89,6 @@ export default async function () {
   await ng('e2e', '--prod');
 
   // Test `import()` style lazy load.
-  if (!ivyProject) {
-    await updateJsonFile('angular.json', json => {
-      // Add the experimental flag to import factories in View Engine.
-      const buildTarget = json['projects'][projectName]['architect']['build'];
-      buildTarget['options']['experimentalImportFactories'] = true;
-    });
-  }
   // Both Ivy and View Engine should support it.
   await replaceLoadChildren(`() => import('./lazy/lazy.module').then(m => m.LazyModule)`);
 

From c8d9e545baf60ca67602a19c5139a779eca6600a Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 22 Apr 2019 17:05:35 +0100
Subject: [PATCH 1220/1703] feat(@ngtools/webpack): remove importFactories
 option

It will just be always be used when applicable.
---
 packages/ngtools/webpack/src/angular_compiler_plugin.ts | 9 ++-------
 packages/ngtools/webpack/src/interfaces.ts              | 1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index af6c6826c049..00eb74abc873 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -94,7 +94,6 @@ export class AngularCompilerPlugin {
   private _moduleResolutionCache: ts.ModuleResolutionCache;
   private _resourceLoader?: WebpackResourceLoader;
   private _discoverLazyRoutes = true;
-  private _importFactories = false;
   private _useFactories = false;
   // Contains `moduleImportPath#exportName` => `fullModulePath`.
   private _lazyRoutes: LazyRouteMap = {};
@@ -283,11 +282,6 @@ export class AngularCompilerPlugin {
       this._useFactories = true;
     }
 
-    if (this._useFactories && options.importFactories === true) {
-      // Only transform imports to use factories with View Engine.
-      this._importFactories = true;
-    }
-
     // Default ContextElementDependency to the one we can import from here.
     // Failing to use the right ContextElementDependency will throw the error below:
     // "No module factory available for dependency type: ContextElementDependency"
@@ -931,7 +925,8 @@ export class AngularCompilerPlugin {
       // Remove unneeded angular decorators.
       this._transformers.push(removeDecorators(isAppPath, getTypeChecker));
       // Import ngfactory in loadChildren import syntax
-      if (this._importFactories) {
+      if (this._useFactories) {
+        // Only transform imports to use factories with View Engine.
         this._transformers.push(importFactory(msg => this._warnings.push(msg)));
       }
     }
diff --git a/packages/ngtools/webpack/src/interfaces.ts b/packages/ngtools/webpack/src/interfaces.ts
index 318e3ffdf082..606c336b38a4 100644
--- a/packages/ngtools/webpack/src/interfaces.ts
+++ b/packages/ngtools/webpack/src/interfaces.ts
@@ -49,7 +49,6 @@ export interface AngularCompilerPluginOptions {
   // When using Ivy, the string syntax is not supported at all. Thus we shouldn't attempt that.
   // This option is also used for when the compilation doesn't need this sort of processing at all.
   discoverLazyRoutes?: boolean;
-  importFactories?: boolean;
 
   // added to the list of lazy routes
   additionalLazyModules?: { [module: string]: string };

From a464c001c333936767ae2473e43a66d6a660337a Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Mon, 22 Apr 2019 11:28:17 +0200
Subject: [PATCH 1221/1703] fix(@schematics/angular): fix paths when
 `newProjectRoot` is an empty string

When `newProjectRoot` the paths are prefixed with an `/` example `/project-name/tsconfig.lib.json` which results in these being marked as absolute paths, which causes build failures.

Fixes #14108
---
 .../schematics/angular/application/index.ts   | 16 ++++++---------
 .../angular/application/index_spec.ts         | 20 +++++++++++++++++++
 packages/schematics/angular/library/index.ts  |  6 +++---
 .../schematics/angular/library/index_spec.ts  | 17 ++++++++++++++++
 .../schematics/angular/universal/index.ts     |  2 +-
 5 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 6de80e6d7718..c2089f970ee8 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -143,12 +143,8 @@ function mergeWithRootTsLint(parentHost: Tree) {
   };
 }
 
-function addAppToWorkspaceFile(options: ApplicationOptions, newProjectRoot: string): Rule {
-  let projectRoot = options.projectRoot !== undefined
-    ? options.projectRoot
-    : `${newProjectRoot}/${options.name}`;
-
-  projectRoot = normalize(projectRoot);
+function addAppToWorkspaceFile(options: ApplicationOptions, appDir: string): Rule {
+  let projectRoot = appDir;
   if (projectRoot) {
     projectRoot += '/';
   }
@@ -184,7 +180,7 @@ function addAppToWorkspaceFile(options: ApplicationOptions, newProjectRoot: stri
   const sourceRoot = join(normalize(projectRoot), 'src');
 
   const project = {
-    root: projectRoot,
+    root: normalize(projectRoot),
     sourceRoot,
     projectType: ProjectType.Application,
     prefix: options.prefix || 'app',
@@ -321,11 +317,11 @@ export default function (options: ApplicationOptions): Rule {
       };
 
     const workspace = await getWorkspace(host);
-    const newProjectRoot = workspace.extensions.newProjectRoot as string || '';
+    const newProjectRoot = workspace.extensions.newProjectRoot as (string | undefined) || '';
     const isRootApp = options.projectRoot !== undefined;
     const appDir = isRootApp
       ? options.projectRoot as string
-      : `${newProjectRoot}/${options.name}`;
+      : join(normalize(newProjectRoot), options.name);
     const sourceDir = `${appDir}/src/app`;
 
     const e2eOptions: E2eOptions = {
@@ -334,7 +330,7 @@ export default function (options: ApplicationOptions): Rule {
     };
 
     return chain([
-      addAppToWorkspaceFile(options, newProjectRoot),
+      addAppToWorkspaceFile(options, appDir),
       mergeWith(
         apply(url('./files'), [
           options.minimal ? filter(minimalPathFilter) : noop(),
diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
index e46bfde7d19d..7a4435080466 100644
--- a/packages/schematics/angular/application/index_spec.ts
+++ b/packages/schematics/angular/application/index_spec.ts
@@ -355,5 +355,25 @@ describe('Application Schematic', () => {
       expect(content.rules['component-selector'][2]).toMatch('app');
       expect(content.rules['trailing-comma']).toBeDefined();
     });
+
+    it(`should create correct paths when 'newProjectRoot' is blank`, async () => {
+      const workspaceTree = schematicRunner.runSchematic('workspace', { ...workspaceOptions, newProjectRoot: '' });
+      const options = { ...defaultOptions, projectRoot: undefined };
+      const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+        .toPromise();
+      const config = JSON.parse(tree.readContent('/angular.json'));
+      const project = config.projects.foo;
+      expect(project.root).toEqual('foo');
+      const buildOpt = project.architect.build.options;
+      expect(buildOpt.index).toEqual('foo/src/index.html');
+      expect(buildOpt.main).toEqual('foo/src/main.ts');
+      expect(buildOpt.polyfills).toEqual('foo/src/polyfills.ts');
+      expect(buildOpt.tsConfig).toEqual('foo/tsconfig.app.json');
+
+      const appTsConfig = JSON.parse(tree.readContent('/foo/tsconfig.app.json'));
+      expect(appTsConfig.extends).toEqual('../tsconfig.json');
+      const specTsConfig = JSON.parse(tree.readContent('/foo/tsconfig.spec.json'));
+      expect(specTsConfig.extends).toEqual('../tsconfig.json');
+    });
   });
 });
diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index 8378e961c587..d0c7d419162e 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { JsonParseMode, parseJson, strings } from '@angular-devkit/core';
+import { JsonParseMode, join, normalize, parseJson, strings } from '@angular-devkit/core';
 import {
   Rule,
   SchematicContext,
@@ -188,11 +188,11 @@ export default function (options: LibraryOptions): Rule {
     }
 
     const workspace = await getWorkspace(host);
-    const newProjectRoot = workspace.extensions.newProjectRoot || '';
+    const newProjectRoot = workspace.extensions.newProjectRoot as (string | undefined) || '';
 
     const scopeFolder = scopeName ? strings.dasherize(scopeName) + '/' : '';
     const folderName = `${scopeFolder}${strings.dasherize(options.name)}`;
-    const projectRoot = `${newProjectRoot}/${folderName}`;
+    const projectRoot = join(normalize(newProjectRoot), folderName);
     const distRoot = `dist/${folderName}`;
 
     const sourceDir = `${projectRoot}/src/lib`;
diff --git a/packages/schematics/angular/library/index_spec.ts b/packages/schematics/angular/library/index_spec.ts
index 1d817e113dbb..eebf2dad3ba5 100644
--- a/packages/schematics/angular/library/index_spec.ts
+++ b/packages/schematics/angular/library/index_spec.ts
@@ -301,4 +301,21 @@ describe('Library Schematic', () => {
     const karmaConf = getFileContent(tree, '/projects/foo/karma.conf.js');
     expect(karmaConf).toContain(`dir: require('path').join(__dirname, '../../coverage/foo')`);
   });
+
+  it(`should create correct paths when 'newProjectRoot' is blank`, async () => {
+    const workspaceTree = schematicRunner.runSchematic('workspace', { ...workspaceOptions, newProjectRoot: '' });
+    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree)
+      .toPromise();
+    const config = JSON.parse(tree.readContent('/angular.json'));
+    const project = config.projects.foo;
+    expect(project.root).toEqual('foo');
+    const buildOpt = project.architect.build.options;
+    expect(buildOpt.project).toEqual('foo/ng-package.json');
+    expect(buildOpt.tsConfig).toEqual('foo/tsconfig.lib.json');
+
+    const appTsConfig = JSON.parse(tree.readContent('/foo/tsconfig.lib.json'));
+    expect(appTsConfig.extends).toEqual('../tsconfig.json');
+    const specTsConfig = JSON.parse(tree.readContent('/foo/tsconfig.spec.json'));
+    expect(specTsConfig.extends).toEqual('../tsconfig.json');
+  });
 });
diff --git a/packages/schematics/angular/universal/index.ts b/packages/schematics/angular/universal/index.ts
index 2dcd9f197697..3a0e58a20abc 100644
--- a/packages/schematics/angular/universal/index.ts
+++ b/packages/schematics/angular/universal/index.ts
@@ -53,7 +53,7 @@ function updateConfigFile(options: UniversalOptions, tsConfigDirectory: Path): R
         builder: Builders.Server,
         options: {
           outputPath: `dist/${options.clientProject}-server`,
-          main: `${clientProject.root}src/main.server.ts`,
+          main: join(normalize(clientProject.root), 'src/main.server.ts'),
           tsConfig: join(tsConfigDirectory, `${options.tsconfigFileName}.json`),
         },
         configurations: {

From fea7117bd252cde96cfb27424ee89feed42945e0 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 23 Apr 2019 14:17:59 +0100
Subject: [PATCH 1222/1703] feat(@schematics/angular): drop @angular/http from
 dependencies

---
 .../angular/migrations/update-8/index.ts      |  2 +
 .../update-8/remove-angular-http.ts           | 20 +++++++
 .../update-8/remove-angular-http_spec.ts      | 44 ++++++++++++++
 .../angular/utility/dependencies.ts           | 21 ++++++-
 .../schematics/angular/utility/json-utils.ts  | 57 ++++++++++++++++++-
 .../angular/utility/json-utils_spec.ts        | 43 ++++++++++++++
 6 files changed, 185 insertions(+), 2 deletions(-)
 create mode 100644 packages/schematics/angular/migrations/update-8/remove-angular-http.ts
 create mode 100644 packages/schematics/angular/migrations/update-8/remove-angular-http_spec.ts

diff --git a/packages/schematics/angular/migrations/update-8/index.ts b/packages/schematics/angular/migrations/update-8/index.ts
index a6eef2d88642..392cb2e092a4 100644
--- a/packages/schematics/angular/migrations/update-8/index.ts
+++ b/packages/schematics/angular/migrations/update-8/index.ts
@@ -13,6 +13,7 @@ import {
 import { updatePackageJson, updateTsLintConfig } from './codelyzer-5';
 import { updateES5Projects } from './differential-loading';
 import { dropES2015Polyfills } from './drop-es6-polyfills';
+import { removeAngularHttp } from './remove-angular-http';
 import { updateBuilders } from './update-builders';
 
 export { updateLazyModulePaths } from './update-lazy-module-paths';
@@ -25,6 +26,7 @@ export default function(): Rule {
       dropES2015Polyfills(),
       updateES5Projects(),
       updateBuilders(),
+      removeAngularHttp(),
     ]);
   };
 }
diff --git a/packages/schematics/angular/migrations/update-8/remove-angular-http.ts b/packages/schematics/angular/migrations/update-8/remove-angular-http.ts
new file mode 100644
index 000000000000..93a393d8c4b8
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-8/remove-angular-http.ts
@@ -0,0 +1,20 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { SchematicContext, Tree } from '@angular-devkit/schematics';
+import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
+import { removePackageJsonDependency } from '../../utility/dependencies';
+
+export const removeAngularHttp = () => {
+  return (host: Tree, context: SchematicContext) => {
+    removePackageJsonDependency(host, '@angular/http');
+    context.addTask(new NodePackageInstallTask());
+
+    return host;
+  };
+};
diff --git a/packages/schematics/angular/migrations/update-8/remove-angular-http_spec.ts b/packages/schematics/angular/migrations/update-8/remove-angular-http_spec.ts
new file mode 100644
index 000000000000..d2ee73ab329b
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-8/remove-angular-http_spec.ts
@@ -0,0 +1,44 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// tslint:disable:no-big-function
+import { EmptyTree } from '@angular-devkit/schematics';
+import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+
+
+describe('Migration to version 8', () => {
+  const schematicRunner = new SchematicTestRunner(
+    'migrations',
+    require.resolve('../migration-collection.json'),
+  );
+
+  let tree: UnitTestTree;
+  const defaultOptions = {};
+  const packageJsonPath = '/package.json';
+  const packageJson = {
+    dependencies: {
+      '@angular/http': '7.0.0',
+    },
+    devDependencies: {
+      '@angular/http': '7.0.0',
+    },
+  };
+
+  describe('Migration to version 8', () => {
+    beforeEach(() => {
+      tree = new UnitTestTree(new EmptyTree());
+      tree.create(packageJsonPath, JSON.stringify(packageJson, null, 2));
+    });
+
+    it('should remove all dependencies on @angular/http', () => {
+      tree = schematicRunner.runSchematic('migration-07', defaultOptions, tree);
+      const packageJson = JSON.parse(tree.readContent(packageJsonPath));
+      expect(packageJson.dependencies['@angular/http']).toBe(undefined);
+      expect(packageJson.devDependencies['@angular/http']).toBe(undefined);
+    });
+  });
+});
diff --git a/packages/schematics/angular/utility/dependencies.ts b/packages/schematics/angular/utility/dependencies.ts
index 92d827182b71..b26ed09f6535 100644
--- a/packages/schematics/angular/utility/dependencies.ts
+++ b/packages/schematics/angular/utility/dependencies.ts
@@ -11,7 +11,8 @@ import {
   appendPropertyInAstObject,
   findPropertyInAstObject,
   insertPropertyInAstObjectInOrder,
- } from './json-utils';
+  removePropertyInAstObject,
+} from './json-utils';
 
 
 const pkgJsonPath = '/package.json';
@@ -62,6 +63,24 @@ export function addPackageJsonDependency(tree: Tree, dependency: NodeDependency)
   tree.commitUpdate(recorder);
 }
 
+export function removePackageJsonDependency(tree: Tree, name: string): void {
+  const packageJson = _readPackageJson(tree);
+  const recorder = tree.beginUpdate(pkgJsonPath);
+  [
+    NodeDependencyType.Default,
+    NodeDependencyType.Dev,
+    NodeDependencyType.Optional,
+    NodeDependencyType.Peer,
+  ].forEach(depType => {
+    const depsNode = findPropertyInAstObject(packageJson, depType);
+    if (depsNode !== null && depsNode.kind === 'object') {
+      removePropertyInAstObject(recorder, depsNode, name);
+    }
+  });
+
+  tree.commitUpdate(recorder);
+}
+
 export function getPackageJsonDependency(tree: Tree, name: string): NodeDependency | null {
   const packageJson = _readPackageJson(tree);
   let dep: NodeDependency | null = null;
diff --git a/packages/schematics/angular/utility/json-utils.ts b/packages/schematics/angular/utility/json-utils.ts
index c42171214788..f34c303f1717 100644
--- a/packages/schematics/angular/utility/json-utils.ts
+++ b/packages/schematics/angular/utility/json-utils.ts
@@ -26,7 +26,7 @@ export function appendPropertyInAstObject(
   if (node.properties.length > 0) {
     // Insert comma.
     const last = node.properties[node.properties.length - 1];
-    const {text, end} = last;
+    const { text, end } = last;
     const commaIndex = text.endsWith('\n') ? end.offset - 1 : end.offset;
     recorder.insertRight(commaIndex, ',');
     index = end.offset;
@@ -93,6 +93,61 @@ export function insertPropertyInAstObjectInOrder(
   );
 }
 
+export function removePropertyInAstObject(
+  recorder: UpdateRecorder,
+  node: JsonAstObject,
+  propertyName: string,
+) {
+  // Find the property inside the object.
+  const propIdx = node.properties.findIndex(prop => prop.key.value === propertyName);
+
+  if (propIdx === -1) {
+    // There's nothing to remove.
+    return;
+  }
+
+  if (node.properties.length === 1) {
+    // This is a special case. Everything should be removed, including indentation.
+    recorder.remove(node.start.offset, node.end.offset - node.start.offset);
+    recorder.insertRight(node.start.offset, '{}');
+
+    return;
+  }
+
+  // The AST considers commas and indentation to be part of the preceding property.
+  // To get around messy comma and identation management, we can work over the range between
+  // two properties instead.
+  const previousProp = node.properties[propIdx - 1];
+  const targetProp = node.properties[propIdx];
+  const nextProp = node.properties[propIdx + 1];
+
+  let start, end;
+  if (previousProp) {
+    // Given the object below, and intending to remove the `m` property:
+    // "{\n  \"a\": \"a\",\n  \"m\": \"m\",\n  \"z\": \"z\"\n}"
+    //                        ^---------------^
+    // Removing the range above results in:
+    // "{\n  \"a\": \"a\",\n  \"z\": \"z\"\n}"
+    start = previousProp.end;
+    end = targetProp.end;
+  } else {
+    // If there's no previousProp there is a nextProp, since we've specialcased the 1 length case.
+    // Given the object below, and intending to remove the `a` property:
+    // "{\n  \"a\": \"a\",\n  \"m\": \"m\",\n  \"z\": \"z\"\n}"
+    //       ^---------------^
+    // Removing the range above results in:
+    // "{\n  \"m\": \"m\",\n  \"z\": \"z\"\n}"
+    start = targetProp.start;
+    end = nextProp.start;
+  }
+
+  recorder.remove(start.offset, end.offset - start.offset);
+  if (!nextProp) {
+
+    recorder.insertRight(start.offset, '\n');
+  }
+}
+
 
 export function appendValueInAstArray(
   recorder: UpdateRecorder,
diff --git a/packages/schematics/angular/utility/json-utils_spec.ts b/packages/schematics/angular/utility/json-utils_spec.ts
index 14cea6c8c06f..becda85f3f1c 100644
--- a/packages/schematics/angular/utility/json-utils_spec.ts
+++ b/packages/schematics/angular/utility/json-utils_spec.ts
@@ -12,6 +12,7 @@ import {
   appendPropertyInAstObject,
   appendValueInAstArray,
   insertPropertyInAstObjectInOrder,
+  removePropertyInAstObject,
 } from './json-utils';
 
 describe('json-utils', () => {
@@ -129,6 +130,48 @@ describe('json-utils', () => {
     });
   });
 
+  describe('removePropertyInAstObject', () => {
+    it('should remove a first prop', () => {
+      const indent = 2;
+      const result = runTest((rec: UpdateRecorder, ast: JsonAstObject) => {
+        expect(ast.kind).toBe('object');
+        removePropertyInAstObject(rec, ast, a);
+      }, {a, m, z}, indent);
+      expect(result).toBe(JSON.stringify({m, z}, null, indent));
+      expect(JSON.parse(result)).toEqual({m, z});
+    });
+
+    it('should remove a middle prop', () => {
+      const indent = 2;
+      const result = runTest((rec: UpdateRecorder, ast: JsonAstObject) => {
+        expect(ast.kind).toBe('object');
+        removePropertyInAstObject(rec, ast, m);
+      }, {a, m, z}, indent);
+      expect(result).toBe(JSON.stringify({a, z}, null, indent));
+      expect(JSON.parse(result)).toEqual({a, z});
+    });
+
+    it('should remove a last prop', () => {
+      const indent = 2;
+      const result = runTest((rec: UpdateRecorder, ast: JsonAstObject) => {
+        expect(ast.kind).toBe('object');
+        removePropertyInAstObject(rec, ast, z);
+      }, {a, m, z}, indent);
+      expect(result).toBe(JSON.stringify({a, m}, null, indent));
+      expect(JSON.parse(result)).toEqual({a, m});
+    });
+
+    it('should remove only prop', () => {
+      const indent = 2;
+      const result = runTest((rec: UpdateRecorder, ast: JsonAstObject) => {
+        expect(ast.kind).toBe('object');
+        removePropertyInAstObject(rec, ast, a);
+      }, {a}, indent);
+      expect(result).toBe(JSON.stringify({}, null, indent));
+      expect(JSON.parse(result)).toEqual({});
+    });
+  });
+
   describe('appendValueInAstArray', () => {
     it('should insert multiple props with different indentations', () => {
       const cases: Array<[string[], string, {}, number]> = [

From 5f44e642ee90976a826b9b2bcb10a051e42a46e0 Mon Sep 17 00:00:00 2001
From: Emilio Martinez <e.marticor@gmail.com>
Date: Mon, 22 Apr 2019 20:30:23 -0700
Subject: [PATCH 1223/1703] fix(@schematics/angular): align differential
 loading migration to browserslist template

Modifies differential loading migration script to align with the changes in 4d7581d to support Googlebot in browserslist by default.
---
 .../angular/migrations/update-8/differential-loading.ts    | 7 +++++--
 .../migrations/update-8/differential-loading_spec.ts       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-8/differential-loading.ts b/packages/schematics/angular/migrations/update-8/differential-loading.ts
index 3c24a6068c69..3511821c5339 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading.ts
@@ -24,15 +24,18 @@ const browserslistContent = `# This file is used by the build system to adjust C
 # For additional information regarding the format and rule options, please see:
 # https://github.com/browserslist/browserslist#queries
 
+# You can see what browsers were selected by your queries by running:
+#   npx browserslist
+
 # Googlebot uses an older version of Chrome
 # For additional information see: https://developers.google.com/search/docs/guides/rendering
 
 > 0.5%
 last 2 versions
 Firefox ESR
+Chrome 41 # Support for Googlebot
 not dead
-not IE 9-11 # For IE 9-11 support, remove 'not'.
-not Chrome 41 # For Googlebot support, remove 'not'.`;
+not IE 9-11 # For IE 9-11 support, remove 'not'.`;
 
 export function updateES5Projects(): Rule {
   return (host: Tree) => {
diff --git a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
index 3242389c69d4..afdcd868bc38 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
@@ -90,7 +90,7 @@ describe('Migration to version 8', () => {
       const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
       expect(tree2.exists('/browserslist')).toBe(true);
       expect(tree2.readContent('/browserslist'))
-        .toContain('Googlebot support');
+        .toContain('Support for Googlebot');
     });
   });
 });

From 0a6df3e8244f0913b359d8b698bba0c39a2b01b0 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 23 Apr 2019 07:57:26 +0200
Subject: [PATCH 1224/1703] fix(@schematics/angular): move and update existing
 `src/browserslist`

Older projects have their `browserslist` file under the `src` folder.

Fixes #14232
---
 .../migrations/update-8/differential-loading.ts       | 11 +++++++++--
 .../migrations/update-8/differential-loading_spec.ts  | 10 ++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-8/differential-loading.ts b/packages/schematics/angular/migrations/update-8/differential-loading.ts
index 3511821c5339..b753c1c9aa02 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading.ts
@@ -110,11 +110,18 @@ function updateBrowserlist(): Rule {
         continue;
       }
 
-      const browserslistPath = join(normalize(project.root), '/browserslist');
+      const browserslistPath = join(normalize(project.root), 'browserslist');
+      if (typeof project.sourceRoot === 'string') {
+        const srcBrowsersList = join(normalize(project.sourceRoot), 'browserslist');
+        if (tree.exists(srcBrowsersList)) {
+          tree.rename(srcBrowsersList, browserslistPath);
+        }
+      }
+
       const source = tree.read(browserslistPath);
       if (!source) {
         tree.create(browserslistPath, browserslistContent);
-      } else {
+      } else if (!source.toString().toLowerCase().includes('chrome 41')) {
         const recorder = tree.beginUpdate(browserslistPath);
         recorder.insertRight(source.length, '\nChrome 41 # Googlebot');
         tree.commitUpdate(recorder);
diff --git a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
index afdcd868bc38..e3faba69f09e 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
@@ -92,5 +92,15 @@ describe('Migration to version 8', () => {
       expect(tree2.readContent('/browserslist'))
         .toContain('Support for Googlebot');
     });
+
+    it('should move browserslist file if it exists in the sourceRoot', () => {
+      tree.create('/src/browserslist', 'last 2 Chrome versions');
+      tree.delete('/browserslist');
+      const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
+      expect(tree2.exists('/browserslist')).toBe(true);
+      const content = tree2.readContent('/browserslist');
+      expect(content).toContain('Chrome 41');
+      expect(content).toContain('last 2 Chrome versions');
+    });
   });
 });

From fd6f07b63dcdccce4827ff49c523f37cce0bd509 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 23 Apr 2019 09:00:30 +0200
Subject: [PATCH 1225/1703] ci: fix e2e snapshots

Without this change the `e2e-cli-ng-snapshots` task fails with an npm error though to the installation of global packages

```
STDERR:
npm WARN checkPermissions Missing write access to /usr/local/lib/node_modules
npm WARN @phenomnomnominal/tsquery@3.0.0 requires a peer of typescript@^3 but none is installed. You must install peer dependencies yourself.

npm ERR! path /usr/local/lib/node_modules
npm ERR! code EACCES
npm ERR! errno -13
npm ERR! syscall access
npm ERR! Error: EACCES: permission denied, access '/usr/local/lib/node_modules'
npm ERR!  { [Error: EACCES: permission denied, access '/usr/local/lib/node_modules']
npm ERR!   stack:
npm ERR!    'Error: EACCES: permission denied, access \'/usr/local/lib/node_modules\'',
npm ERR!   errno: -13,
npm ERR!   code: 'EACCES',
npm ERR!   syscall: 'access',
npm ERR!   path: '/usr/local/lib/node_modules' }
npm ERR!
```
---
 .circleci/config.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 79d6808dc248..1a0575d20a9c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -130,8 +130,11 @@ jobs:
 
   e2e-cli-ng-snapshots:
     <<: *defaults
+    docker:
+      - image: *browsers_docker_image
     environment:
       BASH_ENV: ~/.profile
+      NPM_CONFIG_PREFIX: ~/.npm-global
     resource_class: xlarge
     parallelism: 4
     steps:
@@ -143,7 +146,7 @@ jobs:
               circleci step halt
             fi
       - attach_workspace: *attach_options
-      - run: xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} --ng-snapshots
+      - run: PATH=~/.npm-global/bin:$PATH xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} --ng-snapshots
 
   build:
     <<: *defaults

From 1ad1356a0bcd10902cfcfcc4ed7ebc4f7bad6ed2 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 23 Apr 2019 09:29:12 +0200
Subject: [PATCH 1226/1703] test: fix silent fail of polyfills e2e test

---
 tests/legacy-cli/e2e/tests/build/polyfills.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/build/polyfills.ts b/tests/legacy-cli/e2e/tests/build/polyfills.ts
index 72ad4c7b498e..9588ca29a254 100644
--- a/tests/legacy-cli/e2e/tests/build/polyfills.ts
+++ b/tests/legacy-cli/e2e/tests/build/polyfills.ts
@@ -13,10 +13,11 @@ export default async function () {
     // files were created successfully
     await expectFileToMatch('dist/test-project/polyfills-es5.js', 'core-js/proposals/reflect-metadata');
     await expectFileToMatch('dist/test-project/polyfills-es5.js', 'zone.js');
-    expectFileToMatch('dist/test-project/index.html', oneLineTrim`
-      <script src="runtime.js"></script>
+    await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
+      <script src="runtime-es2015.js" type="module"></script>
+      <script src="polyfills-es2015.js" type="module"></script>
+      <script src="runtime-es5.js" nomodule></script>
       <script src="polyfills-es5.js" nomodule></script>
-      <script src="polyfills.js"></script>
     `);
     const jitPolyfillSize = await getFileSize('dist/test-project/polyfills-es5.js');
 
@@ -26,9 +27,10 @@ export default async function () {
     await expectFileSizeToBeUnder('dist/test-project/polyfills-es5.js', jitPolyfillSize);
     await expectToFail(() => expectFileToMatch('dist/test-project/polyfills-es5.js', 'core-js/proposals/reflect-metadata'));
     await expectFileToMatch('dist/test-project/polyfills-es5.js', 'zone.js');
-    expectFileToMatch('dist/test-project/index.html', oneLineTrim`
-      <script src="runtime-es5.js"></script>
+    await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
+      <script src="runtime-es2015.js" type="module"></script>
+      <script src="polyfills-es2015.js" type="module"></script>
+      <script src="runtime-es5.js" nomodule></script>
       <script src="polyfills-es5.js" nomodule></script>
-      <script src="polyfills.js"></script>
     `);
 }

From 09bed6ffa83bdf6973641568a2979df387aa1acf Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 22 Apr 2019 20:59:02 +0200
Subject: [PATCH 1227/1703] fix(@ngtools/webpack): set correct peerDependencies
 for TypeScript and Angular Compiler CLI

In version 8, we support only Angular 8+ which only supports TypeScript >=3.4 < 3.5
---
 packages/ngtools/webpack/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 3c69032cede4..c348378e73d2 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -28,8 +28,8 @@
     "webpack-sources": "1.3.0"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": ">=6.0.0 <9.0.0 || ^8.0.0-beta.0",
-    "typescript": ">=2.7 < 3.5",
+    "@angular/compiler-cli": ">=8.0.0-beta.0 < 9.0.0",
+    "typescript": ">=3.4 < 3.5",
     "webpack": "^4.0.0"
   },
   "devDependencies": {

From faa4d8d144db57415c620bbf794a6d701fae204e Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 22 Apr 2019 20:59:06 +0200
Subject: [PATCH 1228/1703] fix(@angular-devkit/build-angular): set correct
 peerDependencies for TypeScript

In version 8, we support only Angular 8+ which only supports TypeScript >=3.4 < 3.5
---
 packages/angular_devkit/build_angular/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index be57460f650b..a48ff45863c2 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -87,6 +87,6 @@
     "zone.js": "^0.9.0"
   },
   "peerDependencies": {
-    "typescript": ">=2.7 < 3.5"
+    "typescript": ">=3.4 < 3.5"
   }
 }

From 8fcf9a44019a0bb0569b2a1689f19172c977150d Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 23 Apr 2019 08:14:53 +0200
Subject: [PATCH 1229/1703] fix(@angular-devkit/core): host.delete() completes
 but never emits

RxJS `EMPTY` creates an Observable that emits no items immediately emits a complete notification.

Fixes #14235
---
 packages/angular_devkit/core/node/host.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/core/node/host.ts b/packages/angular_devkit/core/node/host.ts
index 9af2bbde6d0b..9c5dcd571d2b 100644
--- a/packages/angular_devkit/core/node/host.ts
+++ b/packages/angular_devkit/core/node/host.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import * as fs from 'fs';
-import { EMPTY, Observable, concat, from as observableFrom, throwError } from 'rxjs';
+import { Observable, concat, from as observableFrom, of, throwError } from 'rxjs';
 import {
   concatMap,
   ignoreElements,
@@ -305,7 +305,7 @@ export class NodeJsSyncHost implements virtualFs.Host<fs.Stats> {
             return throwError(err);
           }
 
-          return EMPTY;
+          return of(undefined);
         }
       }),
     );

From c4613ced63a901fe327e062d2be474d72ccc56f1 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 23 Apr 2019 05:26:37 +0000
Subject: [PATCH 1230/1703] build: update rxjs to version 6.5.1

---
 package.json                                          | 2 +-
 packages/angular/pwa/package.json                     | 2 +-
 packages/angular_devkit/architect/package.json        | 2 +-
 packages/angular_devkit/architect_cli/package.json    | 2 +-
 packages/angular_devkit/benchmark/package.json        | 2 +-
 packages/angular_devkit/build_angular/package.json    | 2 +-
 packages/angular_devkit/build_ng_packagr/package.json | 2 +-
 packages/angular_devkit/build_webpack/package.json    | 2 +-
 packages/angular_devkit/core/package.json             | 2 +-
 packages/angular_devkit/schematics/package.json       | 2 +-
 packages/angular_devkit/schematics_cli/package.json   | 2 +-
 packages/ngtools/webpack/package.json                 | 2 +-
 packages/schematics/update/package.json               | 2 +-
 yarn.lock                                             | 8 ++++----
 14 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index a83b727c343a..daf7fc98d5c4 100644
--- a/package.json
+++ b/package.json
@@ -127,7 +127,7 @@
     "pacote": "^9.2.3",
     "pidtree": "^0.3.0",
     "pidusage": "^2.0.17",
-    "rxjs": "~6.4.0",
+    "rxjs": "~6.5.0",
     "semver": "6.0.0",
     "source-map": "^0.5.6",
     "source-map-support": "^0.5.0",
diff --git a/packages/angular/pwa/package.json b/packages/angular/pwa/package.json
index 8e75154d06d8..cadebcd5995d 100644
--- a/packages/angular/pwa/package.json
+++ b/packages/angular/pwa/package.json
@@ -14,6 +14,6 @@
     "@angular-devkit/schematics": "0.0.0",
     "@schematics/angular": "0.0.0",
     "parse5-html-rewriting-stream": "5.1.0",
-    "rxjs": "6.4.0"
+    "rxjs": "6.5.1"
   }
 }
diff --git a/packages/angular_devkit/architect/package.json b/packages/angular_devkit/architect/package.json
index 12bad056e733..1d52753aa9c8 100644
--- a/packages/angular_devkit/architect/package.json
+++ b/packages/angular_devkit/architect/package.json
@@ -7,7 +7,7 @@
   "typings": "src/index.d.ts",
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "6.4.0"
+    "rxjs": "6.5.1"
   },
   "builders": "./builders/builders.json"
 }
diff --git a/packages/angular_devkit/architect_cli/package.json b/packages/angular_devkit/architect_cli/package.json
index a434f7adbbc8..cda06c972caf 100644
--- a/packages/angular_devkit/architect_cli/package.json
+++ b/packages/angular_devkit/architect_cli/package.json
@@ -19,7 +19,7 @@
     "ascii-progress": "^1.0.5",
     "minimist": "1.2.0",
     "progress": "^2.0.3",
-    "rxjs": "6.4.0",
+    "rxjs": "6.5.1",
     "symbol-observable": "1.2.0"
   }
 }
diff --git a/packages/angular_devkit/benchmark/package.json b/packages/angular_devkit/benchmark/package.json
index 9d9b0bb12a0e..b17a1284d64c 100644
--- a/packages/angular_devkit/benchmark/package.json
+++ b/packages/angular_devkit/benchmark/package.json
@@ -18,7 +18,7 @@
     "minimist": "1.2.0",
     "pidusage": "2.0.17",
     "pidtree": "0.3.0",
-    "rxjs": "6.4.0",
+    "rxjs": "6.5.1",
     "tree-kill": "^1.2.0"
   }
 }
\ No newline at end of file
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index a48ff45863c2..d77af68851c8 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -36,7 +36,7 @@
     "postcss-import": "12.0.1",
     "postcss-loader": "3.0.0",
     "raw-loader": "1.0.0",
-    "rxjs": "6.4.0",
+    "rxjs": "6.5.1",
     "sass": "1.19.0",
     "sass-loader": "7.1.0",
     "semver": "6.0.0",
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index 686e581c164a..54cf4b9896fc 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -8,7 +8,7 @@
   "builders": "builders.json",
   "dependencies": {
     "@angular-devkit/architect": "0.0.0",
-    "rxjs": "6.4.0"
+    "rxjs": "6.5.1"
   },
   "peerDependencies": {
     "ng-packagr": "^4.0.0 || ^5.0.0"
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index afe552ec44b9..8136ef1d0eb0 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@angular-devkit/architect": "0.0.0",
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "6.4.0",
+    "rxjs": "6.5.1",
     "webpack-merge": "4.2.1"
   },
   "peerDependencies": {
diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json
index 8c4f6b835f7c..fec3b037d079 100644
--- a/packages/angular_devkit/core/package.json
+++ b/packages/angular_devkit/core/package.json
@@ -11,7 +11,7 @@
     "ajv": "6.10.0",
     "fast-json-stable-stringify": "2.0.0",
     "magic-string": "0.25.2",
-    "rxjs": "6.4.0",
+    "rxjs": "6.5.1",
     "source-map": "0.7.3"
   },
   "devDependencies": {
diff --git a/packages/angular_devkit/schematics/package.json b/packages/angular_devkit/schematics/package.json
index ba3351542cde..348607fbb4dd 100644
--- a/packages/angular_devkit/schematics/package.json
+++ b/packages/angular_devkit/schematics/package.json
@@ -14,6 +14,6 @@
   ],
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "6.4.0"
+    "rxjs": "6.5.1"
   }
 }
diff --git a/packages/angular_devkit/schematics_cli/package.json b/packages/angular_devkit/schematics_cli/package.json
index b4ae081ed575..3070773be6e6 100644
--- a/packages/angular_devkit/schematics_cli/package.json
+++ b/packages/angular_devkit/schematics_cli/package.json
@@ -20,7 +20,7 @@
     "@schematics/schematics": "0.0.0",
     "inquirer": "6.3.1",
     "minimist": "1.2.0",
-    "rxjs": "6.4.0",
+    "rxjs": "6.5.1",
     "symbol-observable": "1.2.0"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index c348378e73d2..d1f0a6ef8111 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -23,7 +23,7 @@
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
     "enhanced-resolve": "4.1.0",
-    "rxjs": "6.4.0",
+    "rxjs": "6.5.1",
     "tree-kill": "1.2.1",
     "webpack-sources": "1.3.0"
   },
diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index b125f377651f..d4624aa1342d 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -18,6 +18,6 @@
     "pacote": "9.5.0",
     "semver": "6.0.0",
     "semver-intersect": "1.4.0",
-    "rxjs": "6.4.0"
+    "rxjs": "6.5.1"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index aaac7d55e7aa..c0fb6325f667 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8204,10 +8204,10 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs@6.4.0, rxjs@^6.0.0, rxjs@^6.4.0, rxjs@~6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
-  integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
+rxjs@6.5.1, rxjs@^6.0.0, rxjs@^6.4.0, rxjs@~6.5.0:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.1.tgz#f7a005a9386361921b8524f38f54cbf80e5d08f4"
+  integrity sha512-y0j31WJc83wPu31vS1VlAFW5JGrnGC+j+TtGAa1fRQphy48+fDYiDmX8tjGloToEsMkxnouOg/1IzXGKkJnZMg==
   dependencies:
     tslib "^1.9.0"
 

From 636ff36b3a1789be392698f254d91a80d854f6ea Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 23 Apr 2019 15:03:39 +0200
Subject: [PATCH 1231/1703] feat(@schematics/angular): update scaffolding rxjs
 version to 6.5.1

---
 packages/schematics/angular/utility/latest-versions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 912cd82eb6a6..e4d4aa1b725b 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -9,7 +9,7 @@
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
   Angular: '~8.0.0-beta.12',
-  RxJs: '~6.4.0',
+  RxJs: '~6.5.1',
   ZoneJs: '~0.9.0',
   TypeScript: '~3.4.3',
   TsLib: '^1.9.0',

From 5c969ea417f087ca4c9ae20efcd8b31133590216 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 19 Apr 2019 12:34:54 -0400
Subject: [PATCH 1232/1703] refactor(@angular-devkit/core): simplify workspace
 project/target addition

By returning the newly added project/target, it becomes easier to incrementally augment the new addition.
---
 etc/api/angular_devkit/core/src/_golden-api.d.ts          | 4 ++--
 packages/angular_devkit/core/src/workspace/definitions.ts | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/etc/api/angular_devkit/core/src/_golden-api.d.ts b/etc/api/angular_devkit/core/src/_golden-api.d.ts
index 3bd0193425a6..74b968d99067 100644
--- a/etc/api/angular_devkit/core/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/core/src/_golden-api.d.ts
@@ -775,7 +775,7 @@ export declare class ProjectDefinitionCollection extends DefinitionCollection<Pr
         prefix?: string;
         targets?: Record<string, TargetDefinition | undefined>;
         [key: string]: unknown;
-    }): this;
+    }): ProjectDefinition;
     set(name: string, value: ProjectDefinition): this;
 }
 
@@ -1058,7 +1058,7 @@ export declare class TargetDefinitionCollection extends DefinitionCollection<Tar
     constructor(initial?: Record<string, TargetDefinition>, listener?: DefinitionCollectionListener<TargetDefinition>);
     add(definition: {
         name: string;
-    } & TargetDefinition): this;
+    } & TargetDefinition): TargetDefinition;
     set(name: string, value: TargetDefinition): this;
 }
 
diff --git a/packages/angular_devkit/core/src/workspace/definitions.ts b/packages/angular_devkit/core/src/workspace/definitions.ts
index 86dfe5664c26..75dec6286f4b 100644
--- a/packages/angular_devkit/core/src/workspace/definitions.ts
+++ b/packages/angular_devkit/core/src/workspace/definitions.ts
@@ -149,7 +149,7 @@ export class ProjectDefinitionCollection extends DefinitionCollection<ProjectDef
       targets?: Record<string, TargetDefinition | undefined>,
       [key: string]: unknown,
     },
-  ): this {
+  ): ProjectDefinition {
     if (this.has(definition.name)) {
       throw new Error('Project name already exists.');
     }
@@ -191,7 +191,7 @@ export class ProjectDefinitionCollection extends DefinitionCollection<ProjectDef
 
     super.set(definition.name, project);
 
-    return this;
+    return project;
   }
 
   set(name: string, value: ProjectDefinition): this {
@@ -223,7 +223,7 @@ export class TargetDefinitionCollection extends DefinitionCollection<TargetDefin
     definition: {
       name: string,
     } & TargetDefinition,
-  ): this {
+  ): TargetDefinition {
     if (this.has(definition.name)) {
       throw new Error('Target name already exists.');
     }
@@ -237,7 +237,7 @@ export class TargetDefinitionCollection extends DefinitionCollection<TargetDefin
 
     super.set(definition.name, target);
 
-    return this;
+    return target;
   }
 
   set(name: string, value: TargetDefinition): this {

From a8c86a32e051d62ea10fbc39b2f50342d3bead7c Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Tue, 23 Apr 2019 11:23:44 -0700
Subject: [PATCH 1233/1703] Revert "feat(@schematics/angular): update
 scaffolding rxjs version to 6.5.1"

This reverts commit 636ff36b3a1789be392698f254d91a80d854f6ea.
---
 packages/schematics/angular/utility/latest-versions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index e4d4aa1b725b..912cd82eb6a6 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -9,7 +9,7 @@
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
   Angular: '~8.0.0-beta.12',
-  RxJs: '~6.5.1',
+  RxJs: '~6.4.0',
   ZoneJs: '~0.9.0',
   TypeScript: '~3.4.3',
   TsLib: '^1.9.0',

From d88175ddf1be81959032dd445dd553aaf4861f7a Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Tue, 23 Apr 2019 11:23:51 -0700
Subject: [PATCH 1234/1703] Revert "build: update rxjs to version 6.5.1"

This reverts commit c4613ced63a901fe327e062d2be474d72ccc56f1.
---
 package.json                                          | 2 +-
 packages/angular/pwa/package.json                     | 2 +-
 packages/angular_devkit/architect/package.json        | 2 +-
 packages/angular_devkit/architect_cli/package.json    | 2 +-
 packages/angular_devkit/benchmark/package.json        | 2 +-
 packages/angular_devkit/build_angular/package.json    | 2 +-
 packages/angular_devkit/build_ng_packagr/package.json | 2 +-
 packages/angular_devkit/build_webpack/package.json    | 2 +-
 packages/angular_devkit/core/package.json             | 2 +-
 packages/angular_devkit/schematics/package.json       | 2 +-
 packages/angular_devkit/schematics_cli/package.json   | 2 +-
 packages/ngtools/webpack/package.json                 | 2 +-
 packages/schematics/update/package.json               | 2 +-
 yarn.lock                                             | 8 ++++----
 14 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index daf7fc98d5c4..a83b727c343a 100644
--- a/package.json
+++ b/package.json
@@ -127,7 +127,7 @@
     "pacote": "^9.2.3",
     "pidtree": "^0.3.0",
     "pidusage": "^2.0.17",
-    "rxjs": "~6.5.0",
+    "rxjs": "~6.4.0",
     "semver": "6.0.0",
     "source-map": "^0.5.6",
     "source-map-support": "^0.5.0",
diff --git a/packages/angular/pwa/package.json b/packages/angular/pwa/package.json
index cadebcd5995d..8e75154d06d8 100644
--- a/packages/angular/pwa/package.json
+++ b/packages/angular/pwa/package.json
@@ -14,6 +14,6 @@
     "@angular-devkit/schematics": "0.0.0",
     "@schematics/angular": "0.0.0",
     "parse5-html-rewriting-stream": "5.1.0",
-    "rxjs": "6.5.1"
+    "rxjs": "6.4.0"
   }
 }
diff --git a/packages/angular_devkit/architect/package.json b/packages/angular_devkit/architect/package.json
index 1d52753aa9c8..12bad056e733 100644
--- a/packages/angular_devkit/architect/package.json
+++ b/packages/angular_devkit/architect/package.json
@@ -7,7 +7,7 @@
   "typings": "src/index.d.ts",
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "6.5.1"
+    "rxjs": "6.4.0"
   },
   "builders": "./builders/builders.json"
 }
diff --git a/packages/angular_devkit/architect_cli/package.json b/packages/angular_devkit/architect_cli/package.json
index cda06c972caf..a434f7adbbc8 100644
--- a/packages/angular_devkit/architect_cli/package.json
+++ b/packages/angular_devkit/architect_cli/package.json
@@ -19,7 +19,7 @@
     "ascii-progress": "^1.0.5",
     "minimist": "1.2.0",
     "progress": "^2.0.3",
-    "rxjs": "6.5.1",
+    "rxjs": "6.4.0",
     "symbol-observable": "1.2.0"
   }
 }
diff --git a/packages/angular_devkit/benchmark/package.json b/packages/angular_devkit/benchmark/package.json
index b17a1284d64c..9d9b0bb12a0e 100644
--- a/packages/angular_devkit/benchmark/package.json
+++ b/packages/angular_devkit/benchmark/package.json
@@ -18,7 +18,7 @@
     "minimist": "1.2.0",
     "pidusage": "2.0.17",
     "pidtree": "0.3.0",
-    "rxjs": "6.5.1",
+    "rxjs": "6.4.0",
     "tree-kill": "^1.2.0"
   }
 }
\ No newline at end of file
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index d77af68851c8..a48ff45863c2 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -36,7 +36,7 @@
     "postcss-import": "12.0.1",
     "postcss-loader": "3.0.0",
     "raw-loader": "1.0.0",
-    "rxjs": "6.5.1",
+    "rxjs": "6.4.0",
     "sass": "1.19.0",
     "sass-loader": "7.1.0",
     "semver": "6.0.0",
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index 54cf4b9896fc..686e581c164a 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -8,7 +8,7 @@
   "builders": "builders.json",
   "dependencies": {
     "@angular-devkit/architect": "0.0.0",
-    "rxjs": "6.5.1"
+    "rxjs": "6.4.0"
   },
   "peerDependencies": {
     "ng-packagr": "^4.0.0 || ^5.0.0"
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index 8136ef1d0eb0..afe552ec44b9 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@angular-devkit/architect": "0.0.0",
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "6.5.1",
+    "rxjs": "6.4.0",
     "webpack-merge": "4.2.1"
   },
   "peerDependencies": {
diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json
index fec3b037d079..8c4f6b835f7c 100644
--- a/packages/angular_devkit/core/package.json
+++ b/packages/angular_devkit/core/package.json
@@ -11,7 +11,7 @@
     "ajv": "6.10.0",
     "fast-json-stable-stringify": "2.0.0",
     "magic-string": "0.25.2",
-    "rxjs": "6.5.1",
+    "rxjs": "6.4.0",
     "source-map": "0.7.3"
   },
   "devDependencies": {
diff --git a/packages/angular_devkit/schematics/package.json b/packages/angular_devkit/schematics/package.json
index 348607fbb4dd..ba3351542cde 100644
--- a/packages/angular_devkit/schematics/package.json
+++ b/packages/angular_devkit/schematics/package.json
@@ -14,6 +14,6 @@
   ],
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
-    "rxjs": "6.5.1"
+    "rxjs": "6.4.0"
   }
 }
diff --git a/packages/angular_devkit/schematics_cli/package.json b/packages/angular_devkit/schematics_cli/package.json
index 3070773be6e6..b4ae081ed575 100644
--- a/packages/angular_devkit/schematics_cli/package.json
+++ b/packages/angular_devkit/schematics_cli/package.json
@@ -20,7 +20,7 @@
     "@schematics/schematics": "0.0.0",
     "inquirer": "6.3.1",
     "minimist": "1.2.0",
-    "rxjs": "6.5.1",
+    "rxjs": "6.4.0",
     "symbol-observable": "1.2.0"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index d1f0a6ef8111..c348378e73d2 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -23,7 +23,7 @@
   "dependencies": {
     "@angular-devkit/core": "0.0.0",
     "enhanced-resolve": "4.1.0",
-    "rxjs": "6.5.1",
+    "rxjs": "6.4.0",
     "tree-kill": "1.2.1",
     "webpack-sources": "1.3.0"
   },
diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index d4624aa1342d..b125f377651f 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -18,6 +18,6 @@
     "pacote": "9.5.0",
     "semver": "6.0.0",
     "semver-intersect": "1.4.0",
-    "rxjs": "6.5.1"
+    "rxjs": "6.4.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index c0fb6325f667..aaac7d55e7aa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8204,10 +8204,10 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs@6.5.1, rxjs@^6.0.0, rxjs@^6.4.0, rxjs@~6.5.0:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.1.tgz#f7a005a9386361921b8524f38f54cbf80e5d08f4"
-  integrity sha512-y0j31WJc83wPu31vS1VlAFW5JGrnGC+j+TtGAa1fRQphy48+fDYiDmX8tjGloToEsMkxnouOg/1IzXGKkJnZMg==
+rxjs@6.4.0, rxjs@^6.0.0, rxjs@^6.4.0, rxjs@~6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
+  integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
   dependencies:
     tslib "^1.9.0"
 

From 785b4b10499ece44677d27b9ad209fbd54a5404a Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 23 Apr 2019 17:56:22 +0100
Subject: [PATCH 1235/1703] fix(@schematics/angular): workaround bug in
 recorder/update

---
 .../migrations/update-8/differential-loading.ts  | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-8/differential-loading.ts b/packages/schematics/angular/migrations/update-8/differential-loading.ts
index b753c1c9aa02..2d55c33cd4d9 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading.ts
@@ -112,9 +112,21 @@ function updateBrowserlist(): Rule {
 
       const browserslistPath = join(normalize(project.root), 'browserslist');
       if (typeof project.sourceRoot === 'string') {
+        // Move the CLI 7 style browserlist to root if it's there.
         const srcBrowsersList = join(normalize(project.sourceRoot), 'browserslist');
-        if (tree.exists(srcBrowsersList)) {
-          tree.rename(srcBrowsersList, browserslistPath);
+        if (tree.exists(srcBrowsersList) && !tree.exists(browserslistPath)) {
+          // TODO: use rename instead.
+          // This is a hacky workaround. We should be able to just rename it.
+          // On unit tests the rename works fine but on real projects it fails with
+          //     ERROR! browserslist does not exist..
+          // This seems to happen because we are both renaming and then commiting an update.
+          // But it's fine if we read/create/delete. There's a bug somewhere.
+          // tree.rename(srcBrowsersList, browserslistPath);
+          const content = tree.read(srcBrowsersList);
+          if (content) {
+            tree.create(browserslistPath, content);
+            tree.delete(srcBrowsersList);
+          }
         }
       }
 

From b369aed36ffc07b723f4e34614f4efea0f52ecf9 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Tue, 23 Apr 2019 14:19:56 -0700
Subject: [PATCH 1236/1703] release: v8.0.0-beta.18

---
 packages/schematics/angular/utility/latest-versions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 912cd82eb6a6..eb508b091f2b 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -8,7 +8,7 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~8.0.0-beta.12',
+  Angular: '~8.0.0-beta.14',
   RxJs: '~6.4.0',
   ZoneJs: '~0.9.0',
   TypeScript: '~3.4.3',

From f53d5eca42476836b98083bdad32337b1d754ab3 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 22 Apr 2019 12:54:08 +0100
Subject: [PATCH 1237/1703] test: add 7.0 update test

---
 .../e2e/assets/7.0-project/.editorconfig      |    13 +
 .../e2e/assets/7.0-project/.gitignore         |    39 +
 .../e2e/assets/7.0-project/README.md          |    27 +
 .../e2e/assets/7.0-project/angular.json       |   135 +
 .../assets/7.0-project/e2e/protractor.conf.js |    28 +
 .../7.0-project/e2e/src/app.e2e-spec.ts       |    16 +
 .../e2e/assets/7.0-project/e2e/src/app.po.ts  |    11 +
 .../assets/7.0-project/e2e/tsconfig.e2e.json  |    13 +
 .../e2e/assets/7.0-project/package-lock.json  | 10683 ++++++++++++++++
 .../e2e/assets/7.0-project/package.json       |    48 +
 .../7.0-project/src/app/app-routing.module.ts |    10 +
 .../7.0-project/src/app/app.component.css     |     0
 .../7.0-project/src/app/app.component.html    |    21 +
 .../7.0-project/src/app/app.component.spec.ts |    35 +
 .../7.0-project/src/app/app.component.ts      |    10 +
 .../assets/7.0-project/src/app/app.module.ts  |    18 +
 .../lazy/lazy-comp/lazy-comp.component.css    |     0
 .../lazy/lazy-comp/lazy-comp.component.html   |     3 +
 .../lazy-comp/lazy-comp.component.spec.ts     |    25 +
 .../app/lazy/lazy-comp/lazy-comp.component.ts |    15 +
 .../src/app/lazy/lazy-routing.module.ts       |    13 +
 .../7.0-project/src/app/lazy/lazy.module.ts   |    14 +
 .../assets/7.0-project/src/assets/.gitkeep    |     0
 .../e2e/assets/7.0-project/src/browserslist   |    11 +
 .../src/environments/environment.prod.ts      |     3 +
 .../src/environments/environment.ts           |    16 +
 .../e2e/assets/7.0-project/src/favicon.ico    |   Bin 0 -> 5430 bytes
 .../e2e/assets/7.0-project/src/index.html     |    14 +
 .../e2e/assets/7.0-project/src/karma.conf.js  |    31 +
 .../e2e/assets/7.0-project/src/main.ts        |    12 +
 .../e2e/assets/7.0-project/src/polyfills.ts   |    80 +
 .../e2e/assets/7.0-project/src/styles.css     |     1 +
 .../e2e/assets/7.0-project/src/test.ts        |    20 +
 .../assets/7.0-project/src/tsconfig.app.json  |    11 +
 .../assets/7.0-project/src/tsconfig.spec.json |    18 +
 .../e2e/assets/7.0-project/src/tslint.json    |    17 +
 .../e2e/assets/7.0-project/tsconfig.json      |    21 +
 .../e2e/assets/7.0-project/tslint.json        |   131 +
 .../legacy-cli/e2e/tests/basic/update-1.0.ts  |     3 +-
 .../e2e/tests/basic/update-1.7-longhand.ts    |     3 +-
 .../legacy-cli/e2e/tests/basic/update-1.7.ts  |     3 +-
 .../legacy-cli/e2e/tests/basic/update-7.0.ts  |    63 +
 tests/legacy-cli/e2e/utils/assets.ts          |     4 +-
 tests/legacy-cli/e2e/utils/project.ts         |     4 -
 44 files changed, 11631 insertions(+), 12 deletions(-)
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/.editorconfig
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/.gitignore
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/README.md
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/angular.json
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/e2e/protractor.conf.js
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/e2e/src/app.e2e-spec.ts
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/e2e/src/app.po.ts
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/e2e/tsconfig.e2e.json
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/package-lock.json
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/package.json
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/app/app-routing.module.ts
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/app/app.component.css
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/app/app.component.html
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/app/app.component.spec.ts
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/app/app.component.ts
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/app/app.module.ts
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy-comp/lazy-comp.component.css
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy-comp/lazy-comp.component.html
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy-comp/lazy-comp.component.spec.ts
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy-comp/lazy-comp.component.ts
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy-routing.module.ts
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy.module.ts
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/assets/.gitkeep
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/browserslist
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/environments/environment.prod.ts
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/environments/environment.ts
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/favicon.ico
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/index.html
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/karma.conf.js
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/main.ts
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/polyfills.ts
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/styles.css
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/test.ts
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/tsconfig.app.json
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/tsconfig.spec.json
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/src/tslint.json
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/tsconfig.json
 create mode 100644 tests/legacy-cli/e2e/assets/7.0-project/tslint.json
 create mode 100644 tests/legacy-cli/e2e/tests/basic/update-7.0.ts

diff --git a/tests/legacy-cli/e2e/assets/7.0-project/.editorconfig b/tests/legacy-cli/e2e/assets/7.0-project/.editorconfig
new file mode 100644
index 000000000000..e89330a618c1
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/.editorconfig
@@ -0,0 +1,13 @@
+# Editor configuration, see https://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/.gitignore b/tests/legacy-cli/e2e/assets/7.0-project/.gitignore
new file mode 100644
index 000000000000..ee5c9d8336b7
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/.gitignore
@@ -0,0 +1,39 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+/out-tsc
+
+# dependencies
+/node_modules
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+yarn-error.log
+testem.log
+/typings
+
+# System Files
+.DS_Store
+Thumbs.db
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/README.md b/tests/legacy-cli/e2e/assets/7.0-project/README.md
new file mode 100644
index 000000000000..5223c63955d2
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/README.md
@@ -0,0 +1,27 @@
+# SevenOhProject
+
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.0.7.
+
+## Development server
+
+Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+
+## Code scaffolding
+
+Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
+
+## 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
+
+Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Running end-to-end tests
+
+Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/angular.json b/tests/legacy-cli/e2e/assets/7.0-project/angular.json
new file mode 100644
index 000000000000..98de2c2a14ed
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/angular.json
@@ -0,0 +1,135 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "seven-oh-project": {
+      "root": "",
+      "sourceRoot": "src",
+      "projectType": "application",
+      "prefix": "app",
+      "schematics": {},
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/seven-oh-project",
+            "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,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "seven-oh-project:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "seven-oh-project:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "seven-oh-project: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": [
+              "src/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/**"
+            ]
+          }
+        }
+      }
+    },
+    "seven-oh-project-e2e": {
+      "root": "e2e/",
+      "projectType": "application",
+      "prefix": "",
+      "architect": {
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "e2e/protractor.conf.js",
+            "devServerTarget": "seven-oh-project:serve"
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "seven-oh-project:serve:production"
+            }
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": "e2e/tsconfig.e2e.json",
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "seven-oh-project"
+}
\ No newline at end of file
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/e2e/protractor.conf.js b/tests/legacy-cli/e2e/assets/7.0-project/e2e/protractor.conf.js
new file mode 100644
index 000000000000..86776a391a5b
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/e2e/protractor.conf.js
@@ -0,0 +1,28 @@
+// Protractor configuration file, see link for more information
+// https://github.com/angular/protractor/blob/master/lib/config.ts
+
+const { SpecReporter } = require('jasmine-spec-reporter');
+
+exports.config = {
+  allScriptsTimeout: 11000,
+  specs: [
+    './src/**/*.e2e-spec.ts'
+  ],
+  capabilities: {
+    'browserName': 'chrome'
+  },
+  directConnect: true,
+  baseUrl: 'http://localhost:4200/',
+  framework: 'jasmine',
+  jasmineNodeOpts: {
+    showColors: true,
+    defaultTimeoutInterval: 30000,
+    print: function() {}
+  },
+  onPrepare() {
+    require('ts-node').register({
+      project: require('path').join(__dirname, './tsconfig.e2e.json')
+    });
+    jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
+  }
+};
\ No newline at end of file
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/e2e/src/app.e2e-spec.ts b/tests/legacy-cli/e2e/assets/7.0-project/e2e/src/app.e2e-spec.ts
new file mode 100644
index 000000000000..137ce38ff589
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/e2e/src/app.e2e-spec.ts
@@ -0,0 +1,16 @@
+import { browser, logging, element, by } from 'protractor';
+
+describe('workspace-project App', () => {
+  it('should display lazy route', () => {
+    browser.get(browser.baseUrl + '/lazy');
+    expect(element(by.css('app-lazy-comp p')).getText()).toEqual('lazy-comp works!');
+  });
+
+  afterEach(async () => {
+    // Assert that there are no errors emitted from the browser
+    const logs = await browser.manage().logs().get(logging.Type.BROWSER);
+    expect(logs).not.toContain(jasmine.objectContaining({
+      level: logging.Level.SEVERE,
+    }));
+  });
+});
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/e2e/src/app.po.ts b/tests/legacy-cli/e2e/assets/7.0-project/e2e/src/app.po.ts
new file mode 100644
index 000000000000..72e463a33539
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/e2e/src/app.po.ts
@@ -0,0 +1,11 @@
+import { browser, by, element } from 'protractor';
+
+export class AppPage {
+  navigateTo() {
+    return browser.get('/');
+  }
+
+  getTitleText() {
+    return element(by.css('app-root h1')).getText();
+  }
+}
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/e2e/tsconfig.e2e.json b/tests/legacy-cli/e2e/assets/7.0-project/e2e/tsconfig.e2e.json
new file mode 100644
index 000000000000..a6dd62202824
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/e2e/tsconfig.e2e.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/app",
+    "module": "commonjs",
+    "target": "es5",
+    "types": [
+      "jasmine",
+      "jasminewd2",
+      "node"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/package-lock.json b/tests/legacy-cli/e2e/assets/7.0-project/package-lock.json
new file mode 100644
index 000000000000..80862ed2ea87
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/package-lock.json
@@ -0,0 +1,10683 @@
+{
+  "name": "seven-oh-project",
+  "version": "0.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@angular-devkit/architect": {
+      "version": "0.10.7",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.10.7.tgz",
+      "integrity": "sha512-S49LSslNRxIflHzrIrEgK7mGQ7HzETr/FU0fyTbB0vubcmfzMoYTsgYdK7SUz583lovc+UvASoUAhPJI3e35ng==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/core": "7.0.7",
+        "rxjs": "6.3.3"
+      }
+    },
+    "@angular-devkit/build-angular": {
+      "version": "0.10.7",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.10.7.tgz",
+      "integrity": "sha512-wjhlMWWkGSSkdwd9elKfeeEgyig/eZGyF2wY5kZmWPBdeK/GfdBLyO15qh4ppRYI2SjyRvzl0tWDOA2Y0hKL0w==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/architect": "0.10.7",
+        "@angular-devkit/build-optimizer": "0.10.7",
+        "@angular-devkit/build-webpack": "0.10.7",
+        "@angular-devkit/core": "7.0.7",
+        "@ngtools/webpack": "7.0.7",
+        "ajv": "6.5.3",
+        "autoprefixer": "9.1.5",
+        "circular-dependency-plugin": "5.0.2",
+        "clean-css": "4.2.1",
+        "copy-webpack-plugin": "4.5.4",
+        "file-loader": "2.0.0",
+        "glob": "7.1.3",
+        "istanbul": "0.4.5",
+        "istanbul-instrumenter-loader": "3.0.1",
+        "karma-source-map-support": "1.3.0",
+        "less": "3.8.1",
+        "less-loader": "4.1.0",
+        "license-webpack-plugin": "2.0.2",
+        "loader-utils": "1.1.0",
+        "mini-css-extract-plugin": "0.4.3",
+        "minimatch": "3.0.4",
+        "node-sass": "4.9.3",
+        "opn": "5.3.0",
+        "parse5": "4.0.0",
+        "portfinder": "1.0.17",
+        "postcss": "7.0.5",
+        "postcss-import": "12.0.0",
+        "postcss-loader": "3.0.0",
+        "raw-loader": "0.5.1",
+        "rxjs": "6.3.3",
+        "sass-loader": "7.1.0",
+        "semver": "5.5.1",
+        "source-map-loader": "0.2.4",
+        "source-map-support": "0.5.9",
+        "speed-measure-webpack-plugin": "^1.2.3",
+        "stats-webpack-plugin": "0.7.0",
+        "style-loader": "0.23.0",
+        "stylus": "0.54.5",
+        "stylus-loader": "3.0.2",
+        "terser-webpack-plugin": "1.1.0",
+        "tree-kill": "1.2.0",
+        "webpack": "4.19.1",
+        "webpack-dev-middleware": "3.3.0",
+        "webpack-dev-server": "3.1.8",
+        "webpack-merge": "4.1.4",
+        "webpack-sources": "1.2.0",
+        "webpack-subresource-integrity": "1.1.0-rc.6"
+      }
+    },
+    "@angular-devkit/build-optimizer": {
+      "version": "0.10.7",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.10.7.tgz",
+      "integrity": "sha512-Ztj2U21B8zRO2csQS8mLv/+WKPPLePzaqJDk53Ou2r2HV+kh9GzYvgu1UFeGf/RyEeJi+9KnJGG2wPaeNqDNxg==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "1.1.0",
+        "source-map": "0.5.6",
+        "typescript": "3.1.6",
+        "webpack-sources": "1.2.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.6",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
+          "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
+          "dev": true
+        }
+      }
+    },
+    "@angular-devkit/build-webpack": {
+      "version": "0.10.7",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.10.7.tgz",
+      "integrity": "sha512-sUzgIhm5yWHvRo3GF6mc1J58PCuY5nJDF2vlE8Jhlwkq+/VbJ/NVfTDYRQCeqI1jLcdMaVrVQXnXAWc4KpFNig==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/architect": "0.10.7",
+        "@angular-devkit/core": "7.0.7",
+        "rxjs": "6.3.3"
+      }
+    },
+    "@angular-devkit/core": {
+      "version": "7.0.7",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.0.7.tgz",
+      "integrity": "sha512-M8tTT9r3nUtWI3YyiyynHIQn+lQQgeKkxVZ+rdxvyvgE3U9+wn0yep5HkFLQETTuJetu9ARRRD94sD2XL3F/3A==",
+      "dev": true,
+      "requires": {
+        "ajv": "6.5.3",
+        "chokidar": "2.0.4",
+        "fast-json-stable-stringify": "2.0.0",
+        "rxjs": "6.3.3",
+        "source-map": "0.7.3"
+      }
+    },
+    "@angular-devkit/schematics": {
+      "version": "7.0.7",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.0.7.tgz",
+      "integrity": "sha512-E6GHu4257PvymRjFDtpGc0ykdcIcpFIfXr73lq8qxo1SBkqH7Y1/C670elDg9nrCte8PhnhJVNiwNgNS/ZTAzQ==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/core": "7.0.7",
+        "rxjs": "6.3.3"
+      }
+    },
+    "@angular/animations": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.0.4.tgz",
+      "integrity": "sha512-QfFikT0FzYNMjdVg0LWTBijdu9JDJyzejnhCFlXxv+KR4zolpRK98/rU7CFW1Fg2jjL3/yL9PT1sf5I0fTJZYA==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "@angular/cli": {
+      "version": "7.0.7",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-7.0.7.tgz",
+      "integrity": "sha512-SV3CcHa2oxDKwhOvHqZtysVRRT9pkO04Kv0Z1HEhlgIwqHyIU201R9/mo1gYmBHTNGxowKdvsGLsHQNpsHmQJw==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/architect": "0.10.7",
+        "@angular-devkit/core": "7.0.7",
+        "@angular-devkit/schematics": "7.0.7",
+        "@schematics/angular": "7.0.7",
+        "@schematics/update": "0.10.7",
+        "inquirer": "6.2.0",
+        "opn": "5.3.0",
+        "rxjs": "6.3.3",
+        "semver": "5.5.1",
+        "symbol-observable": "1.2.0"
+      }
+    },
+    "@angular/common": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-7.0.4.tgz",
+      "integrity": "sha512-akQojdqY/RBlItkDWAPI3k0Llk1wnbAp+f47yySi3cgQz9SaZ1/RLNWZV84I/cKrksb4ehorT/lTqRBojsAD1A==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "@angular/compiler": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.0.4.tgz",
+      "integrity": "sha512-ExDhH1cJkuJkUsgNRZyZBse0a7wWkQyG5O8HONi3Rzig9dalFEuve9jD04zfA1Jx1GTXhovqtGnF72x4kw0V8Q==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "@angular/compiler-cli": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-7.0.4.tgz",
+      "integrity": "sha512-kvhWt6OTb1Uduns9Vm+Dwd/UUBNSEU6Jgu+QOPeHr7lg+4NTyr9uQLU0DtfBP0ljOlds8esmfii5IIFTeUQw1Q==",
+      "dev": true,
+      "requires": {
+        "canonical-path": "1.0.0",
+        "chokidar": "^1.4.2",
+        "convert-source-map": "^1.5.1",
+        "dependency-graph": "^0.7.2",
+        "magic-string": "^0.25.0",
+        "minimist": "^1.2.0",
+        "reflect-metadata": "^0.1.2",
+        "shelljs": "^0.8.1",
+        "source-map": "^0.6.1",
+        "tslib": "^1.9.0",
+        "yargs": "9.0.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "anymatch": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+          "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+          "dev": true,
+          "requires": {
+            "micromatch": "^2.1.5",
+            "normalize-path": "^2.0.0"
+          }
+        },
+        "arr-diff": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
+          "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+          "dev": true,
+          "requires": {
+            "arr-flatten": "^1.0.1"
+          }
+        },
+        "array-unique": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+          "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+          "dev": true
+        },
+        "braces": {
+          "version": "1.8.5",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+          "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+          "dev": true,
+          "requires": {
+            "expand-range": "^1.8.1",
+            "preserve": "^0.2.0",
+            "repeat-element": "^1.1.2"
+          }
+        },
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        },
+        "chokidar": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
+          "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
+          "dev": true,
+          "requires": {
+            "anymatch": "^1.3.0",
+            "async-each": "^1.0.0",
+            "fsevents": "^1.0.0",
+            "glob-parent": "^2.0.0",
+            "inherits": "^2.0.1",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^2.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.0.0"
+          }
+        },
+        "cross-spawn": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^4.0.1",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "execa": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^5.0.1",
+            "get-stream": "^3.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        },
+        "expand-brackets": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
+          "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+          "dev": true,
+          "requires": {
+            "is-posix-bracket": "^0.1.0"
+          }
+        },
+        "extglob": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
+          "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        },
+        "glob-parent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+          "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+          "dev": true,
+          "requires": {
+            "is-glob": "^2.0.0"
+          }
+        },
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        },
+        "load-json-file": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^2.2.0",
+            "pify": "^2.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "mem": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
+          "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+          "dev": true,
+          "requires": {
+            "mimic-fn": "^1.0.0"
+          }
+        },
+        "micromatch": {
+          "version": "2.3.11",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
+          "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^2.0.0",
+            "array-unique": "^0.2.1",
+            "braces": "^1.8.2",
+            "expand-brackets": "^0.1.4",
+            "extglob": "^0.3.1",
+            "filename-regex": "^2.0.0",
+            "is-extglob": "^1.0.0",
+            "is-glob": "^2.0.1",
+            "kind-of": "^3.0.2",
+            "normalize-path": "^2.0.1",
+            "object.omit": "^2.0.0",
+            "parse-glob": "^3.0.4",
+            "regex-cache": "^0.4.2"
+          }
+        },
+        "mimic-fn": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+          "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+          "dev": true
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "os-locale": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+          "dev": true,
+          "requires": {
+            "execa": "^0.7.0",
+            "lcid": "^1.0.0",
+            "mem": "^1.1.0"
+          }
+        },
+        "path-type": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+          "dev": true,
+          "requires": {
+            "pify": "^2.0.0"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
+        "read-pkg": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^2.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^2.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+          "dev": true,
+          "requires": {
+            "find-up": "^2.0.0",
+            "read-pkg": "^2.0.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        },
+        "which-module": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+          "dev": true
+        },
+        "y18n": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+          "dev": true
+        },
+        "yargs": {
+          "version": "9.0.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-9.0.1.tgz",
+          "integrity": "sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^4.1.0",
+            "cliui": "^3.2.0",
+            "decamelize": "^1.1.1",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^2.0.0",
+            "read-pkg-up": "^2.0.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^2.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^3.2.1",
+            "yargs-parser": "^7.0.0"
+          }
+        },
+        "yargs-parser": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
+          "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^4.1.0"
+          }
+        }
+      }
+    },
+    "@angular/core": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-7.0.4.tgz",
+      "integrity": "sha512-17SSmCz1wQoZKnVHF/T8UkWYPpDm5kPyoc1okkTTv8ZA2EAMMuZFFnRSAxEL5i7mNB9z5CvRqF2tRx/DbgbIRA==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "@angular/forms": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.0.4.tgz",
+      "integrity": "sha512-W3nN9n1VY9On9+9f7PDRbzJUg+mMq1bjkhWsk/b7DfaYdmlzpG+Wd6OfArob2edsqGqH1dvTM8q8aGbWiFZ7dA==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "@angular/http": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/@angular/http/-/http-7.0.4.tgz",
+      "integrity": "sha512-oUGT7xS7FZYajuHq0DP6MgahacB5sJTRgxiUU4uhQ/mqV7aREODVJJgw7oHDhM7Cnyzzo0B9D0zpEljKmeCLWQ==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "@angular/language-service": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-7.0.4.tgz",
+      "integrity": "sha512-CuJ2Ii97sNoN1HOZOLxG1lEHsQFi8K/RSB/k2suWPKzdM53ldSkKoYRac38zW/uqNABYItgvxb7w0Vi7HhxLsg==",
+      "dev": true
+    },
+    "@angular/platform-browser": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.0.4.tgz",
+      "integrity": "sha512-4brYZZgsCJk1/a6JoSwaiVWO9+/T4iyE27dAgstao1nOf/jrBNKW2HnZtkWZmCCBK0WIk15wlB0Xr87OZbjNVA==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "@angular/platform-browser-dynamic": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.0.4.tgz",
+      "integrity": "sha512-k1I53zIg8YWhtQizLfq/tWrUUdY5vHV8pGHyt0/UTGDqat5TORd6LDFfzCSux0r3qZujCOGNi9f4/AbyV8B9lw==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "@angular/router": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-7.0.4.tgz",
+      "integrity": "sha512-nt1jJsxN+JmYZ6URamMdULUpH4aHdnNVKjWtjDI0OpdZvPx7PMFD8cfc92q0tavy2KqqexcceIb4BIC965gtpA==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "@babel/code-frame": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz",
+      "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
+      "dev": true,
+      "requires": {
+        "@babel/highlight": "^7.0.0"
+      }
+    },
+    "@babel/generator": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.0.tgz",
+      "integrity": "sha512-/v5I+a1jhGSKLgZDcmAUZ4K/VePi43eRkUs3yePW1HB1iANOD5tqJXwGSG4BZhSksP8J9ejSlwGeTiiOFZOrXQ==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.4.0",
+        "jsesc": "^2.5.1",
+        "lodash": "^4.17.11",
+        "source-map": "^0.5.0",
+        "trim-right": "^1.0.1"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "2.5.2",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+          "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "@babel/helper-function-name": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
+      "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-get-function-arity": "^7.0.0",
+        "@babel/template": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-get-function-arity": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
+      "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz",
+      "integrity": "sha512-7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.4.0"
+      }
+    },
+    "@babel/highlight": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz",
+      "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.0.0",
+        "esutils": "^2.0.2",
+        "js-tokens": "^4.0.0"
+      },
+      "dependencies": {
+        "js-tokens": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/parser": {
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.3.tgz",
+      "integrity": "sha512-gxpEUhTS1sGA63EGQGuA+WESPR/6tz6ng7tSHFCmaTJK/cGK8y37cBTspX+U2xCAue2IQVvF6Z0oigmjwD8YGQ==",
+      "dev": true
+    },
+    "@babel/template": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.0.tgz",
+      "integrity": "sha512-SOWwxxClTTh5NdbbYZ0BmaBVzxzTh2tO/TeLTbF6MO6EzVhHTnff8CdBXx3mEtazFBoysmEM6GU/wF+SuSx4Fw==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.4.0",
+        "@babel/types": "^7.4.0"
+      }
+    },
+    "@babel/traverse": {
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.3.tgz",
+      "integrity": "sha512-HmA01qrtaCwwJWpSKpA948cBvU5BrmviAief/b3AVw936DtcdsTexlbyzNuDnthwhOQ37xshn7hvQaEQk7ISYQ==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.0.0",
+        "@babel/generator": "^7.4.0",
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-split-export-declaration": "^7.4.0",
+        "@babel/parser": "^7.4.3",
+        "@babel/types": "^7.4.0",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0",
+        "lodash": "^4.17.11"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "globals": {
+          "version": "11.11.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-11.11.0.tgz",
+          "integrity": "sha512-WHq43gS+6ufNOEqlrDBxVEbb8ntfXrfAUU2ZOpCxrBdGKW3gyv8mCxAfIBD0DroPKGrJ2eSsXsLtY9MPntsyTw==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        }
+      }
+    },
+    "@babel/types": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz",
+      "integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.11",
+        "to-fast-properties": "^2.0.0"
+      },
+      "dependencies": {
+        "to-fast-properties": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+          "dev": true
+        }
+      }
+    },
+    "@ngtools/webpack": {
+      "version": "7.0.7",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.0.7.tgz",
+      "integrity": "sha512-ukZv/8vhiVWLsEEWF1uena8GHRVUpwbPJ+8AupW25d2nNpwfsDtTIXKzTzRYeIQFFCnHJxr04lK18CVsn1lFaQ==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/core": "7.0.7",
+        "enhanced-resolve": "4.1.0",
+        "rxjs": "6.3.3",
+        "tree-kill": "1.2.0",
+        "webpack-sources": "1.2.0"
+      }
+    },
+    "@schematics/angular": {
+      "version": "7.0.7",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-7.0.7.tgz",
+      "integrity": "sha512-xDSMAtOdKNa5uqsEfbwBVHVCjpNSmIIcadi0Rki+5Nmobf5nnQWPly1/xj5aHzT6SKuV4BIMvsBG9UgI9Ss/Iw==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/core": "7.0.7",
+        "@angular-devkit/schematics": "7.0.7",
+        "typescript": "3.1.6"
+      }
+    },
+    "@schematics/update": {
+      "version": "0.10.7",
+      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.10.7.tgz",
+      "integrity": "sha512-E4txrdnIcNn1K0xFPmY4ywAnVj+hN2QB1wBijoAMezYTEjcKxW0g6thPfUv6qhIPcphxrCOqwl6cIELZjq2dtA==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/core": "7.0.7",
+        "@angular-devkit/schematics": "7.0.7",
+        "npm-registry-client": "8.6.0",
+        "rxjs": "6.3.3",
+        "semver": "5.5.1",
+        "semver-intersect": "1.4.0"
+      }
+    },
+    "@types/jasmine": {
+      "version": "2.8.16",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.8.16.tgz",
+      "integrity": "sha512-056oRlBBp7MDzr+HoU5su099s/s7wjZ3KcHxLfv+Byqb9MwdLUvsfLgw1VS97hsh3ddxSPyQu+olHMnoVTUY6g==",
+      "dev": true
+    },
+    "@types/jasminewd2": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.6.tgz",
+      "integrity": "sha512-2ZOKrxb8bKRmP/po5ObYnRDgFE4i+lQiEB27bAMmtMWLgJSqlIDqlLx6S0IRorpOmOPRQ6O80NujTmQAtBkeNw==",
+      "dev": true,
+      "requires": {
+        "@types/jasmine": "*"
+      }
+    },
+    "@types/node": {
+      "version": "8.9.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.9.5.tgz",
+      "integrity": "sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ==",
+      "dev": true
+    },
+    "@types/q": {
+      "version": "0.0.32",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz",
+      "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
+      "dev": true
+    },
+    "@types/selenium-webdriver": {
+      "version": "3.0.16",
+      "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.16.tgz",
+      "integrity": "sha512-lMC2G0ItF2xv4UCiwbJGbnJlIuUixHrioOhNGHSCsYCJ8l4t9hMCUimCytvFv7qy6AfSzRxhRHoGa+UqaqwyeA==",
+      "dev": true
+    },
+    "@webassemblyjs/ast": {
+      "version": "1.7.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.7.6.tgz",
+      "integrity": "sha512-8nkZS48EVsMUU0v6F1LCIOw4RYWLm2plMtbhFTjNgeXmsTNLuU3xTRtnljt9BFQB+iPbLRobkNrCWftWnNC7wQ==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/helper-module-context": "1.7.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.7.6",
+        "@webassemblyjs/wast-parser": "1.7.6",
+        "mamacro": "^0.0.3"
+      }
+    },
+    "@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.7.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.6.tgz",
+      "integrity": "sha512-VBOZvaOyBSkPZdIt5VBMg3vPWxouuM13dPXGWI1cBh3oFLNcFJ8s9YA7S9l4mPI7+Q950QqOmqj06oa83hNWBA==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-api-error": {
+      "version": "1.7.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.6.tgz",
+      "integrity": "sha512-SCzhcQWHXfrfMSKcj8zHg1/kL9kb3aa5TN4plc/EREOs5Xop0ci5bdVBApbk2yfVi8aL+Ly4Qpp3/TRAUInjrg==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-buffer": {
+      "version": "1.7.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.6.tgz",
+      "integrity": "sha512-1/gW5NaGsEOZ02fjnFiU8/OEEXU1uVbv2um0pQ9YVL3IHSkyk6xOwokzyqqO1qDZQUAllb+V8irtClPWntbVqw==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-code-frame": {
+      "version": "1.7.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.6.tgz",
+      "integrity": "sha512-+suMJOkSn9+vEvDvgyWyrJo5vJsWSDXZmJAjtoUq4zS4eqHyXImpktvHOZwXp1XQjO5H+YQwsBgqTQEc0J/5zg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/wast-printer": "1.7.6"
+      }
+    },
+    "@webassemblyjs/helper-fsm": {
+      "version": "1.7.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.6.tgz",
+      "integrity": "sha512-HCS6KN3wgxUihGBW7WFzEC/o8Eyvk0d56uazusnxXthDPnkWiMv+kGi9xXswL2cvfYfeK5yiM17z2K5BVlwypw==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-module-context": {
+      "version": "1.7.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.6.tgz",
+      "integrity": "sha512-e8/6GbY7OjLM+6OsN7f2krC2qYVNaSr0B0oe4lWdmq5sL++8dYDD1TFbD1TdAdWMRTYNr/Qq7ovXWzia2EbSjw==",
+      "dev": true,
+      "requires": {
+        "mamacro": "^0.0.3"
+      }
+    },
+    "@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.7.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.6.tgz",
+      "integrity": "sha512-PzYFCb7RjjSdAOljyvLWVqd6adAOabJW+8yRT+NWhXuf1nNZWH+igFZCUK9k7Cx7CsBbzIfXjJc7u56zZgFj9Q==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-wasm-section": {
+      "version": "1.7.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.6.tgz",
+      "integrity": "sha512-3GS628ppDPSuwcYlQ7cDCGr4W2n9c4hLzvnRKeuz+lGsJSmc/ADVoYpm1ts2vlB1tGHkjtQMni+yu8mHoMlKlA==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.7.6",
+        "@webassemblyjs/helper-buffer": "1.7.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.7.6",
+        "@webassemblyjs/wasm-gen": "1.7.6"
+      }
+    },
+    "@webassemblyjs/ieee754": {
+      "version": "1.7.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.7.6.tgz",
+      "integrity": "sha512-V4cIp0ruyw+hawUHwQLn6o2mFEw4t50tk530oKsYXQhEzKR+xNGDxs/SFFuyTO7X3NzEu4usA3w5jzhl2RYyzQ==",
+      "dev": true,
+      "requires": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "@webassemblyjs/leb128": {
+      "version": "1.7.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.7.6.tgz",
+      "integrity": "sha512-ojdlG8WpM394lBow4ncTGJoIVZ4aAtNOWHhfAM7m7zprmkVcKK+2kK5YJ9Bmj6/ketTtOn7wGSHCtMt+LzqgYQ==",
+      "dev": true,
+      "requires": {
+        "@xtuc/long": "4.2.1"
+      }
+    },
+    "@webassemblyjs/utf8": {
+      "version": "1.7.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.7.6.tgz",
+      "integrity": "sha512-oId+tLxQ+AeDC34ELRYNSqJRaScB0TClUU6KQfpB8rNT6oelYlz8axsPhf6yPTg7PBJ/Z5WcXmUYiHEWgbbHJw==",
+      "dev": true
+    },
+    "@webassemblyjs/wasm-edit": {
+      "version": "1.7.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.6.tgz",
+      "integrity": "sha512-pTNjLO3o41v/Vz9VFLl+I3YLImpCSpodFW77pNoH4agn5I6GgSxXHXtvWDTvYJFty0jSeXZWLEmbaSIRUDlekg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.7.6",
+        "@webassemblyjs/helper-buffer": "1.7.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.7.6",
+        "@webassemblyjs/helper-wasm-section": "1.7.6",
+        "@webassemblyjs/wasm-gen": "1.7.6",
+        "@webassemblyjs/wasm-opt": "1.7.6",
+        "@webassemblyjs/wasm-parser": "1.7.6",
+        "@webassemblyjs/wast-printer": "1.7.6"
+      }
+    },
+    "@webassemblyjs/wasm-gen": {
+      "version": "1.7.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.6.tgz",
+      "integrity": "sha512-mQvFJVumtmRKEUXMohwn8nSrtjJJl6oXwF3FotC5t6e2hlKMh8sIaW03Sck2MDzw9xPogZD7tdP5kjPlbH9EcQ==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.7.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.7.6",
+        "@webassemblyjs/ieee754": "1.7.6",
+        "@webassemblyjs/leb128": "1.7.6",
+        "@webassemblyjs/utf8": "1.7.6"
+      }
+    },
+    "@webassemblyjs/wasm-opt": {
+      "version": "1.7.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.6.tgz",
+      "integrity": "sha512-go44K90fSIsDwRgtHhX14VtbdDPdK2sZQtZqUcMRvTojdozj5tLI0VVJAzLCfz51NOkFXezPeVTAYFqrZ6rI8Q==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.7.6",
+        "@webassemblyjs/helper-buffer": "1.7.6",
+        "@webassemblyjs/wasm-gen": "1.7.6",
+        "@webassemblyjs/wasm-parser": "1.7.6"
+      }
+    },
+    "@webassemblyjs/wasm-parser": {
+      "version": "1.7.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.6.tgz",
+      "integrity": "sha512-t1T6TfwNY85pDA/HWPA8kB9xA4sp9ajlRg5W7EKikqrynTyFo+/qDzIpvdkOkOGjlS6d4n4SX59SPuIayR22Yg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.7.6",
+        "@webassemblyjs/helper-api-error": "1.7.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.7.6",
+        "@webassemblyjs/ieee754": "1.7.6",
+        "@webassemblyjs/leb128": "1.7.6",
+        "@webassemblyjs/utf8": "1.7.6"
+      }
+    },
+    "@webassemblyjs/wast-parser": {
+      "version": "1.7.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.7.6.tgz",
+      "integrity": "sha512-1MaWTErN0ziOsNUlLdvwS+NS1QWuI/kgJaAGAMHX8+fMJFgOJDmN/xsG4h/A1Gtf/tz5VyXQciaqHZqp2q0vfg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.7.6",
+        "@webassemblyjs/floating-point-hex-parser": "1.7.6",
+        "@webassemblyjs/helper-api-error": "1.7.6",
+        "@webassemblyjs/helper-code-frame": "1.7.6",
+        "@webassemblyjs/helper-fsm": "1.7.6",
+        "@xtuc/long": "4.2.1",
+        "mamacro": "^0.0.3"
+      }
+    },
+    "@webassemblyjs/wast-printer": {
+      "version": "1.7.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.7.6.tgz",
+      "integrity": "sha512-vHdHSK1tOetvDcl1IV1OdDeGNe/NDDQ+KzuZHMtqTVP1xO/tZ/IKNpj5BaGk1OYFdsDWQqb31PIwdEyPntOWRQ==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.7.6",
+        "@webassemblyjs/wast-parser": "1.7.6",
+        "@xtuc/long": "4.2.1"
+      }
+    },
+    "@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true
+    },
+    "@xtuc/long": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.1.tgz",
+      "integrity": "sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==",
+      "dev": true
+    },
+    "abbrev": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
+      "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
+      "dev": true
+    },
+    "accepts": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
+      "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
+      "dev": true,
+      "requires": {
+        "mime-types": "~2.1.18",
+        "negotiator": "0.6.1"
+      }
+    },
+    "acorn": {
+      "version": "5.7.3",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+      "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==",
+      "dev": true
+    },
+    "acorn-dynamic-import": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz",
+      "integrity": "sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==",
+      "dev": true,
+      "requires": {
+        "acorn": "^5.0.0"
+      }
+    },
+    "adm-zip": {
+      "version": "0.4.13",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.13.tgz",
+      "integrity": "sha512-fERNJX8sOXfel6qCBCMPvZLzENBEhZTzKqg6vrOW5pvoEaQuJhRU4ndTAh6lHOxn1I6jnz2NHra56ZODM751uw==",
+      "dev": true
+    },
+    "after": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
+      "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
+      "dev": true
+    },
+    "agent-base": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
+      "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
+      "dev": true,
+      "requires": {
+        "es6-promisify": "^5.0.0"
+      }
+    },
+    "ajv": {
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz",
+      "integrity": "sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^2.0.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ajv-errors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
+      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
+      "dev": true
+    },
+    "ajv-keywords": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.0.tgz",
+      "integrity": "sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==",
+      "dev": true
+    },
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "dev": true
+    },
+    "ansi-colors": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
+      "dev": true
+    },
+    "ansi-escapes": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+      "dev": true
+    },
+    "ansi-html": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
+      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "requires": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "app-root-path": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.2.1.tgz",
+      "integrity": "sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==",
+      "dev": true
+    },
+    "append-transform": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz",
+      "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==",
+      "dev": true,
+      "requires": {
+        "default-require-extensions": "^2.0.0"
+      }
+    },
+    "aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "dev": true
+    },
+    "are-we-there-yet": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+      "dev": true,
+      "requires": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^2.0.6"
+      }
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true
+    },
+    "array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+      "dev": true
+    },
+    "array-flatten": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
+      "dev": true
+    },
+    "array-slice": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
+      "dev": true
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "requires": {
+        "array-uniq": "^1.0.1"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true
+    },
+    "array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+      "dev": true
+    },
+    "arraybuffer.slice": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
+      "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
+      "dev": true
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "dev": true
+    },
+    "asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
+      "dev": true,
+      "optional": true
+    },
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "asn1.js": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "assert": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
+      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+      "dev": true,
+      "requires": {
+        "util": "0.10.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
+        },
+        "util": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.1"
+          }
+        }
+      }
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "dev": true
+    },
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "dev": true
+    },
+    "async": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+      "dev": true
+    },
+    "async-each": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
+      "dev": true
+    },
+    "async-foreach": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
+      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
+      "dev": true,
+      "optional": true
+    },
+    "async-limiter": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
+      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
+      "dev": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true
+    },
+    "autoprefixer": {
+      "version": "9.1.5",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.1.5.tgz",
+      "integrity": "sha512-kk4Zb6RUc58ld7gdosERHMF3DzIYJc2fp5sX46qEsGXQQy5bXsu8qyLjoxuY1NuQ/cJuCYnx99BfjwnRggrYIw==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.1.0",
+        "caniuse-lite": "^1.0.30000884",
+        "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "postcss": "^7.0.2",
+        "postcss-value-parser": "^3.2.3"
+      }
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "dev": true
+    },
+    "aws4": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
+      "dev": true
+    },
+    "babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "dev": true,
+      "requires": {
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "babel-generator": {
+      "version": "6.26.1",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
+      "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
+      "dev": true,
+      "requires": {
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "detect-indent": "^4.0.0",
+        "jsesc": "^1.3.0",
+        "lodash": "^4.17.4",
+        "source-map": "^0.5.7",
+        "trim-right": "^1.0.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "babel-messages": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "dev": true,
+      "requires": {
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
+      }
+    },
+    "babel-template": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
+      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "lodash": "^4.17.4"
+      }
+    },
+    "babel-traverse": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
+      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "^6.26.0",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "debug": "^2.6.8",
+        "globals": "^9.18.0",
+        "invariant": "^2.2.2",
+        "lodash": "^4.17.4"
+      }
+    },
+    "babel-types": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.4",
+        "to-fast-properties": "^1.0.3"
+      }
+    },
+    "babylon": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+      "dev": true
+    },
+    "backo2": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
+      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "requires": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "base64-arraybuffer": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
+      "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
+      "dev": true
+    },
+    "base64-js": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
+      "dev": true
+    },
+    "base64id": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
+      "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
+      "dev": true
+    },
+    "batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
+      "dev": true
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "dev": true,
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "better-assert": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
+      "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
+      "dev": true,
+      "requires": {
+        "callsite": "1.0.0"
+      }
+    },
+    "big.js": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
+      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
+      "dev": true
+    },
+    "binary-extensions": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+      "dev": true
+    },
+    "blob": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
+      "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==",
+      "dev": true
+    },
+    "block-stream": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
+      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "inherits": "~2.0.0"
+      }
+    },
+    "blocking-proxy": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/blocking-proxy/-/blocking-proxy-1.0.1.tgz",
+      "integrity": "sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
+    "bluebird": {
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
+      "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==",
+      "dev": true
+    },
+    "bn.js": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+      "dev": true
+    },
+    "body-parser": {
+      "version": "1.18.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz",
+      "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=",
+      "dev": true,
+      "requires": {
+        "bytes": "3.0.0",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "http-errors": "~1.6.3",
+        "iconv-lite": "0.4.23",
+        "on-finished": "~2.3.0",
+        "qs": "6.5.2",
+        "raw-body": "2.3.3",
+        "type-is": "~1.6.16"
+      }
+    },
+    "bonjour": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
+      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
+      "dev": true,
+      "requires": {
+        "array-flatten": "^2.1.0",
+        "deep-equal": "^1.0.1",
+        "dns-equal": "^1.0.0",
+        "dns-txt": "^2.0.2",
+        "multicast-dns": "^6.0.1",
+        "multicast-dns-service-types": "^1.1.0"
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "requires": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "requires": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "browserify-rsa": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "browserify-sign": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.1",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.2",
+        "elliptic": "^6.0.0",
+        "inherits": "^2.0.1",
+        "parse-asn1": "^5.0.0"
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "dev": true,
+      "requires": {
+        "pako": "~1.0.5"
+      }
+    },
+    "browserslist": {
+      "version": "4.5.5",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.5.5.tgz",
+      "integrity": "sha512-0QFO1r/2c792Ohkit5XI8Cm8pDtZxgNl2H6HU4mHrpYz7314pEYcsAVVatM0l/YmxPnEzh9VygXouj4gkFUTKA==",
+      "dev": true,
+      "requires": {
+        "caniuse-lite": "^1.0.30000960",
+        "electron-to-chromium": "^1.3.124",
+        "node-releases": "^1.1.14"
+      }
+    },
+    "browserstack": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.5.2.tgz",
+      "integrity": "sha512-+6AFt9HzhKykcPF79W6yjEUJcdvZOV0lIXdkORXMJftGrDl0OKWqRF4GHqpDNkxiceDT/uB7Fb/aDwktvXX7dg==",
+      "dev": true,
+      "requires": {
+        "https-proxy-agent": "^2.2.1"
+      }
+    },
+    "buffer": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+      "dev": true,
+      "requires": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "buffer-alloc": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
+      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
+      "dev": true,
+      "requires": {
+        "buffer-alloc-unsafe": "^1.1.0",
+        "buffer-fill": "^1.0.0"
+      }
+    },
+    "buffer-alloc-unsafe": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
+      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
+      "dev": true
+    },
+    "buffer-fill": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
+      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
+      "dev": true
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "dev": true
+    },
+    "buffer-indexof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
+      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
+      "dev": true
+    },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "builtin-modules": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+      "dev": true
+    },
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true
+    },
+    "builtins": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
+      "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=",
+      "dev": true
+    },
+    "bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+      "dev": true
+    },
+    "cacache": {
+      "version": "10.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
+      "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.5.1",
+        "chownr": "^1.0.1",
+        "glob": "^7.1.2",
+        "graceful-fs": "^4.1.11",
+        "lru-cache": "^4.1.1",
+        "mississippi": "^2.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.2",
+        "ssri": "^5.2.4",
+        "unique-filename": "^1.1.0",
+        "y18n": "^4.0.0"
+      }
+    },
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "requires": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      }
+    },
+    "callsite": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
+      "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=",
+      "dev": true
+    },
+    "camelcase": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+      "dev": true,
+      "optional": true
+    },
+    "camelcase-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "camelcase": "^2.0.0",
+        "map-obj": "^1.0.0"
+      }
+    },
+    "caniuse-lite": {
+      "version": "1.0.30000962",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000962.tgz",
+      "integrity": "sha512-WXYsW38HK+6eaj5IZR16Rn91TGhU3OhbwjKZvJ4HN/XBIABLKfbij9Mnd3pM0VEwZSlltWjoWg3I8FQ0DGgNOA==",
+      "dev": true
+    },
+    "canonical-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/canonical-path/-/canonical-path-1.0.0.tgz",
+      "integrity": "sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==",
+      "dev": true
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "dev": true
+    },
+    "chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      }
+    },
+    "chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+      "dev": true
+    },
+    "chokidar": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+      "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+      "dev": true,
+      "requires": {
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.0",
+        "braces": "^2.3.0",
+        "fsevents": "^1.2.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.1",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "lodash.debounce": "^4.0.8",
+        "normalize-path": "^2.1.1",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.0.0",
+        "upath": "^1.0.5"
+      }
+    },
+    "chownr": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
+      "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
+      "dev": true
+    },
+    "chrome-trace-event": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz",
+      "integrity": "sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "circular-dependency-plugin": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.0.2.tgz",
+      "integrity": "sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==",
+      "dev": true
+    },
+    "circular-json": {
+      "version": "0.5.9",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz",
+      "integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==",
+      "dev": true
+    },
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "clean-css": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
+      "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
+      "dev": true,
+      "requires": {
+        "source-map": "~0.6.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "dev": true,
+      "requires": {
+        "restore-cursor": "^2.0.0"
+      }
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+      "dev": true
+    },
+    "cliui": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+      "dev": true,
+      "requires": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
+      }
+    },
+    "clone": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+      "dev": true
+    },
+    "clone-deep": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz",
+      "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
+      "dev": true,
+      "requires": {
+        "for-own": "^1.0.0",
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.0",
+        "shallow-clone": "^1.0.0"
+      }
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+      "dev": true
+    },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "dev": true
+    },
+    "codelyzer": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-4.5.0.tgz",
+      "integrity": "sha512-oO6vCkjqsVrEsmh58oNlnJkRXuA30hF8cdNAQV9DytEalDwyOFRvHMnlKFzmOStNerOmPGZU9GAHnBo4tGvtiQ==",
+      "dev": true,
+      "requires": {
+        "app-root-path": "^2.1.0",
+        "css-selector-tokenizer": "^0.7.0",
+        "cssauron": "^1.4.0",
+        "semver-dsl": "^1.0.1",
+        "source-map": "^0.5.7",
+        "sprintf-js": "^1.1.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        },
+        "sprintf-js": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
+          "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
+          "dev": true
+        }
+      }
+    },
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "dev": true,
+      "requires": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "colors": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+      "dev": true
+    },
+    "combine-lists": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz",
+      "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.5.0"
+      }
+    },
+    "combined-stream": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
+      "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
+      "dev": true,
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
+      "dev": true
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
+    },
+    "compare-versions": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.4.0.tgz",
+      "integrity": "sha512-tK69D7oNXXqUW3ZNo/z7NXTEz22TCF0pTE+YF9cxvaAM9XnkLo1fV621xCLrRR6aevJlKxExkss0vWqUCUpqdg==",
+      "dev": true
+    },
+    "component-bind": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
+      "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=",
+      "dev": true
+    },
+    "component-emitter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "dev": true
+    },
+    "component-inherit": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
+      "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=",
+      "dev": true
+    },
+    "compressible": {
+      "version": "2.0.16",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.16.tgz",
+      "integrity": "sha512-JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA==",
+      "dev": true,
+      "requires": {
+        "mime-db": ">= 1.38.0 < 2"
+      }
+    },
+    "compression": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.5",
+        "bytes": "3.0.0",
+        "compressible": "~2.0.16",
+        "debug": "2.6.9",
+        "on-headers": "~1.0.2",
+        "safe-buffer": "5.1.2",
+        "vary": "~1.1.2"
+      }
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "connect": {
+      "version": "3.6.6",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
+      "integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "finalhandler": "1.1.0",
+        "parseurl": "~1.3.2",
+        "utils-merge": "1.0.1"
+      },
+      "dependencies": {
+        "finalhandler": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
+          "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "encodeurl": "~1.0.1",
+            "escape-html": "~1.0.3",
+            "on-finished": "~2.3.0",
+            "parseurl": "~1.3.2",
+            "statuses": "~1.3.1",
+            "unpipe": "~1.0.0"
+          }
+        },
+        "statuses": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
+          "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+          "dev": true
+        }
+      }
+    },
+    "connect-history-api-fallback": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
+      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
+      "dev": true
+    },
+    "console-browserify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+      "dev": true,
+      "requires": {
+        "date-now": "^0.1.4"
+      }
+    },
+    "console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+      "dev": true
+    },
+    "constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true
+    },
+    "content-disposition": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
+      "dev": true
+    },
+    "content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "dev": true
+    },
+    "convert-source-map": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
+      "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "cookie": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
+      "dev": true
+    },
+    "cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
+      "dev": true
+    },
+    "copy-concurrently": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1",
+        "fs-write-stream-atomic": "^1.0.8",
+        "iferr": "^0.1.5",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.0"
+      }
+    },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+      "dev": true
+    },
+    "copy-webpack-plugin": {
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.5.4.tgz",
+      "integrity": "sha512-0lstlEyj74OAtYMrDxlNZsU7cwFijAI3Ofz2fD6Mpo9r4xCv4yegfa3uHIKvZY1NSuOtE9nvG6TAhJ+uz9gDaQ==",
+      "dev": true,
+      "requires": {
+        "cacache": "^10.0.4",
+        "find-cache-dir": "^1.0.0",
+        "globby": "^7.1.1",
+        "is-glob": "^4.0.0",
+        "loader-utils": "^1.1.0",
+        "minimatch": "^3.0.4",
+        "p-limit": "^1.0.0",
+        "serialize-javascript": "^1.4.0"
+      }
+    },
+    "core-js": {
+      "version": "2.6.5",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
+      "integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A=="
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "cosmiconfig": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
+      "integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
+      "dev": true,
+      "requires": {
+        "is-directory": "^0.3.1",
+        "js-yaml": "^3.9.0",
+        "parse-json": "^4.0.0",
+        "require-from-string": "^2.0.1"
+      },
+      "dependencies": {
+        "parse-json": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+          "dev": true,
+          "requires": {
+            "error-ex": "^1.3.1",
+            "json-parse-better-errors": "^1.0.1"
+          }
+        }
+      }
+    },
+    "create-ecdh": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
+      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.0.0"
+      }
+    },
+    "create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "cross-spawn": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
+      "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "lru-cache": "^4.0.1",
+        "which": "^1.2.9"
+      }
+    },
+    "crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "requires": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      }
+    },
+    "css-parse": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz",
+      "integrity": "sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=",
+      "dev": true
+    },
+    "css-selector-tokenizer": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz",
+      "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==",
+      "dev": true,
+      "requires": {
+        "cssesc": "^0.1.0",
+        "fastparse": "^1.1.1",
+        "regexpu-core": "^1.0.0"
+      }
+    },
+    "cssauron": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz",
+      "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=",
+      "dev": true,
+      "requires": {
+        "through": "X.X.X"
+      }
+    },
+    "cssesc": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz",
+      "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=",
+      "dev": true
+    },
+    "currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+      "dev": true,
+      "requires": {
+        "array-find-index": "^1.0.1"
+      }
+    },
+    "custom-event": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
+      "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
+      "dev": true
+    },
+    "cyclist": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
+      "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
+      "dev": true
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "date-format": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz",
+      "integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=",
+      "dev": true
+    },
+    "date-now": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
+      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
+      "dev": true
+    },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "dev": true
+    },
+    "deep-equal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
+      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
+      "dev": true
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
+    },
+    "default-gateway": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-2.7.2.tgz",
+      "integrity": "sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==",
+      "dev": true,
+      "requires": {
+        "execa": "^0.10.0",
+        "ip-regex": "^2.1.0"
+      }
+    },
+    "default-require-extensions": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz",
+      "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=",
+      "dev": true,
+      "requires": {
+        "strip-bom": "^3.0.0"
+      },
+      "dependencies": {
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        }
+      }
+    },
+    "define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "requires": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "del": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
+      "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+      "dev": true,
+      "requires": {
+        "globby": "^6.1.0",
+        "is-path-cwd": "^1.0.0",
+        "is-path-in-cwd": "^1.0.0",
+        "p-map": "^1.1.1",
+        "pify": "^3.0.0",
+        "rimraf": "^2.2.8"
+      },
+      "dependencies": {
+        "globby": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+          "dev": true,
+          "requires": {
+            "array-union": "^1.0.1",
+            "glob": "^7.0.3",
+            "object-assign": "^4.0.1",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+              "dev": true
+            }
+          }
+        }
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
+    },
+    "delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+      "dev": true
+    },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "dev": true
+    },
+    "dependency-graph": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.7.2.tgz",
+      "integrity": "sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==",
+      "dev": true
+    },
+    "des.js": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
+      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+      "dev": true
+    },
+    "detect-indent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+      "dev": true,
+      "requires": {
+        "repeating": "^2.0.0"
+      }
+    },
+    "detect-node": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
+      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
+      "dev": true
+    },
+    "di": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
+      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
+      "dev": true
+    },
+    "diff": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "dev": true
+    },
+    "diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "dir-glob": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
+      "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
+      "dev": true,
+      "requires": {
+        "path-type": "^3.0.0"
+      }
+    },
+    "dns-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
+      "dev": true
+    },
+    "dns-packet": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
+      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "dev": true,
+      "requires": {
+        "ip": "^1.1.0",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "dns-txt": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
+      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
+      "dev": true,
+      "requires": {
+        "buffer-indexof": "^1.0.0"
+      }
+    },
+    "dom-serialize": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
+      "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
+      "dev": true,
+      "requires": {
+        "custom-event": "~1.0.0",
+        "ent": "~2.2.0",
+        "extend": "^3.0.0",
+        "void-elements": "^2.0.0"
+      }
+    },
+    "domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+      "dev": true
+    },
+    "duplexify": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "dev": true,
+      "requires": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+      "dev": true
+    },
+    "electron-to-chromium": {
+      "version": "1.3.125",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.125.tgz",
+      "integrity": "sha512-XxowpqQxJ4nDwUXHtVtmEhRqBpm2OnjBomZmZtHD0d2Eo0244+Ojezhk3sD/MBSSe2nxCdGQFRXHIsf/LUTL9A==",
+      "dev": true
+    },
+    "elliptic": {
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
+      "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
+      }
+    },
+    "emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true
+    },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "dev": true
+    },
+    "end-of-stream": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
+      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+      "dev": true,
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "engine.io": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz",
+      "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.4",
+        "base64id": "1.0.0",
+        "cookie": "0.3.1",
+        "debug": "~3.1.0",
+        "engine.io-parser": "~2.1.0",
+        "ws": "~3.3.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "engine.io-client": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
+      "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
+      "dev": true,
+      "requires": {
+        "component-emitter": "1.2.1",
+        "component-inherit": "0.0.3",
+        "debug": "~3.1.0",
+        "engine.io-parser": "~2.1.1",
+        "has-cors": "1.1.0",
+        "indexof": "0.0.1",
+        "parseqs": "0.0.5",
+        "parseuri": "0.0.5",
+        "ws": "~3.3.1",
+        "xmlhttprequest-ssl": "~1.5.4",
+        "yeast": "0.1.2"
+      },
+      "dependencies": {
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+          "dev": true
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "engine.io-parser": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz",
+      "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==",
+      "dev": true,
+      "requires": {
+        "after": "0.8.2",
+        "arraybuffer.slice": "~0.0.7",
+        "base64-arraybuffer": "0.1.5",
+        "blob": "0.0.5",
+        "has-binary2": "~1.0.2"
+      }
+    },
+    "enhanced-resolve": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
+      "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.4.0",
+        "tapable": "^1.0.0"
+      }
+    },
+    "ent": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
+      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
+      "dev": true
+    },
+    "errno": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
+      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "dev": true,
+      "requires": {
+        "prr": "~1.0.1"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "es6-promise": {
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz",
+      "integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==",
+      "dev": true
+    },
+    "es6-promisify": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
+      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
+      "dev": true,
+      "requires": {
+        "es6-promise": "^4.0.3"
+      }
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "escodegen": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
+      "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
+      "dev": true,
+      "requires": {
+        "esprima": "^2.7.1",
+        "estraverse": "^1.9.1",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1",
+        "source-map": "~0.2.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
+          "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "amdefine": ">=0.0.4"
+          }
+        }
+      }
+    },
+    "eslint-scope": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+          "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+          "dev": true
+        }
+      }
+    },
+    "esprima": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+      "dev": true
+    },
+    "esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^4.1.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+          "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+          "dev": true
+        }
+      }
+    },
+    "estraverse": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
+      "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+      "dev": true
+    },
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "dev": true
+    },
+    "eventemitter3": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
+      "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==",
+      "dev": true
+    },
+    "events": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
+      "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
+      "dev": true
+    },
+    "eventsource": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz",
+      "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=",
+      "dev": true,
+      "requires": {
+        "original": ">=0.0.5"
+      }
+    },
+    "evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "requires": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "execa": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
+      "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^3.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "dev": true,
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        }
+      }
+    },
+    "exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+      "dev": true
+    },
+    "expand-braces": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz",
+      "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=",
+      "dev": true,
+      "requires": {
+        "array-slice": "^0.2.3",
+        "array-unique": "^0.2.1",
+        "braces": "^0.1.2"
+      },
+      "dependencies": {
+        "array-unique": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+          "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+          "dev": true
+        },
+        "braces": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz",
+          "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=",
+          "dev": true,
+          "requires": {
+            "expand-range": "^0.1.0"
+          }
+        },
+        "expand-range": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz",
+          "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=",
+          "dev": true,
+          "requires": {
+            "is-number": "^0.1.1",
+            "repeat-string": "^0.2.2"
+          }
+        },
+        "is-number": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz",
+          "integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=",
+          "dev": true
+        },
+        "repeat-string": {
+          "version": "0.2.2",
+          "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz",
+          "integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=",
+          "dev": true
+        }
+      }
+    },
+    "expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "dev": true,
+      "requires": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "expand-range": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
+      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
+      "dev": true,
+      "requires": {
+        "fill-range": "^2.1.0"
+      },
+      "dependencies": {
+        "fill-range": {
+          "version": "2.2.4",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
+          "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+          "dev": true,
+          "requires": {
+            "is-number": "^2.1.0",
+            "isobject": "^2.0.0",
+            "randomatic": "^3.0.0",
+            "repeat-element": "^1.1.2",
+            "repeat-string": "^1.5.2"
+          }
+        },
+        "is-number": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+          "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+          "dev": true,
+          "requires": {
+            "kind-of": "^3.0.2"
+          }
+        },
+        "isobject": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+          "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+          "dev": true,
+          "requires": {
+            "isarray": "1.0.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "express": {
+      "version": "4.16.4",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
+      "integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.5",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.18.3",
+        "content-disposition": "0.5.2",
+        "content-type": "~1.0.4",
+        "cookie": "0.3.1",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.1.1",
+        "fresh": "0.5.2",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.2",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.4",
+        "qs": "6.5.2",
+        "range-parser": "~1.2.0",
+        "safe-buffer": "5.1.2",
+        "send": "0.16.2",
+        "serve-static": "1.13.2",
+        "setprototypeof": "1.1.0",
+        "statuses": "~1.4.0",
+        "type-is": "~1.6.16",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "array-flatten": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+          "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+          "dev": true
+        }
+      }
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
+    },
+    "extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "requires": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "external-editor": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz",
+      "integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
+      "dev": true,
+      "requires": {
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.4.24",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+          "dev": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        }
+      }
+    },
+    "extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "requires": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "dev": true
+    },
+    "fast-deep-equal": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "dev": true
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "fastparse": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
+      "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
+      "dev": true
+    },
+    "faye-websocket": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+      "dev": true,
+      "requires": {
+        "websocket-driver": ">=0.5.1"
+      }
+    },
+    "figgy-pudding": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
+      "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
+      "dev": true
+    },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
+    "file-loader": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-2.0.0.tgz",
+      "integrity": "sha512-YCsBfd1ZGCyonOKLxPiKPdu+8ld9HAaMEvJewzz+b2eTF7uL5Zm/HdBF6FjCrpCMRq25Mi0U1gl4pwn2TlH7hQ==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.0.2",
+        "schema-utils": "^1.0.0"
+      }
+    },
+    "filename-regex": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
+      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
+      "dev": true
+    },
+    "fileset": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz",
+      "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=",
+      "dev": true,
+      "requires": {
+        "glob": "^7.0.3",
+        "minimatch": "^3.0.3"
+      }
+    },
+    "fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "finalhandler": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
+      "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.2",
+        "statuses": "~1.4.0",
+        "unpipe": "~1.0.0"
+      }
+    },
+    "find-cache-dir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz",
+      "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
+      "dev": true,
+      "requires": {
+        "commondir": "^1.0.1",
+        "make-dir": "^1.0.0",
+        "pkg-dir": "^2.0.0"
+      }
+    },
+    "find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "dev": true,
+      "requires": {
+        "locate-path": "^2.0.0"
+      }
+    },
+    "flush-write-stream": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
+      }
+    },
+    "follow-redirects": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz",
+      "integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.6"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        }
+      }
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "for-own": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
+      "dev": true,
+      "requires": {
+        "for-in": "^1.0.1"
+      }
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true
+    },
+    "form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "dev": true,
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "dev": true
+    },
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "dev": true,
+      "requires": {
+        "map-cache": "^0.2.2"
+      }
+    },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "dev": true
+    },
+    "from2": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0"
+      }
+    },
+    "fs-access": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
+      "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
+      "dev": true,
+      "requires": {
+        "null-check": "^1.0.0"
+      }
+    },
+    "fs-write-stream-atomic": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "iferr": "^0.1.5",
+        "imurmurhash": "^0.1.4",
+        "readable-stream": "1 || 2"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "fsevents": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.8.tgz",
+      "integrity": "sha512-tPvHgPGB7m40CZ68xqFGkKuzN+RnpGmSV+hgeKxhRpbxdqKXUFJGC3yonBOLzQBcJyGpdZFDfCsdOC2KFsXzeA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nan": "^2.12.1",
+        "node-pre-gyp": "^0.12.0"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "aproba": {
+          "version": "1.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delegates": "^1.0.0",
+            "readable-stream": "^2.0.6"
+          }
+        },
+        "balanced-match": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "chownr": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "debug": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "deep-extend": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "detect-libc": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "fs-minipass": {
+          "version": "1.2.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "^2.2.1"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aproba": "^1.0.3",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.0",
+            "object-assign": "^4.1.0",
+            "signal-exit": "^3.0.0",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wide-align": "^1.1.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "iconv-lite": {
+          "version": "0.4.24",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        },
+        "ignore-walk": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minimatch": "^3.0.4"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "once": "^1.3.0",
+            "wrappy": "1"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true
+        },
+        "ini": {
+          "version": "1.3.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true
+        },
+        "minipass": {
+          "version": "2.3.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.0"
+          }
+        },
+        "minizlib": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "^2.2.1"
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "needle": {
+          "version": "2.3.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "^4.1.0",
+            "iconv-lite": "^0.4.4",
+            "sax": "^1.2.4"
+          }
+        },
+        "node-pre-gyp": {
+          "version": "0.12.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "detect-libc": "^1.0.2",
+            "mkdirp": "^0.5.1",
+            "needle": "^2.2.1",
+            "nopt": "^4.0.1",
+            "npm-packlist": "^1.1.6",
+            "npmlog": "^4.0.2",
+            "rc": "^1.2.7",
+            "rimraf": "^2.6.1",
+            "semver": "^5.3.0",
+            "tar": "^4"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1",
+            "osenv": "^0.1.4"
+          }
+        },
+        "npm-bundled": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "npm-packlist": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ignore-walk": "^3.0.1",
+            "npm-bundled": "^1.0.1"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "~1.1.2",
+            "console-control-strings": "~1.1.0",
+            "gauge": "~2.7.3",
+            "set-blocking": "~2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "wrappy": "1"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "^1.0.0",
+            "os-tmpdir": "^1.0.0"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "^0.6.0",
+            "ini": "~1.3.0",
+            "minimist": "^1.2.0",
+            "strip-json-comments": "~2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "bundled": true,
+          "dev": true
+        },
+        "safer-buffer": {
+          "version": "2.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "sax": {
+          "version": "1.2.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "semver": {
+          "version": "5.7.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "4.4.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chownr": "^1.1.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.3.4",
+            "minizlib": "^1.1.1",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.2"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "wide-align": {
+          "version": "1.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "^1.0.2 || 2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "yallist": {
+          "version": "3.0.3",
+          "bundled": true,
+          "dev": true
+        }
+      }
+    },
+    "fstream": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "inherits": "~2.0.0",
+        "mkdirp": ">=0.5 0",
+        "rimraf": "2"
+      }
+    },
+    "gauge": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.0.3",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.0",
+        "object-assign": "^4.1.0",
+        "signal-exit": "^3.0.0",
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wide-align": "^1.1.0"
+      }
+    },
+    "gaze": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
+      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "globule": "^1.0.0"
+      }
+    },
+    "get-caller-file": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+      "dev": true
+    },
+    "get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+      "dev": true
+    },
+    "get-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+      "dev": true
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "glob": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-base": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
+      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+      "dev": true,
+      "requires": {
+        "glob-parent": "^2.0.0",
+        "is-glob": "^2.0.0"
+      },
+      "dependencies": {
+        "glob-parent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+          "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+          "dev": true,
+          "requires": {
+            "is-glob": "^2.0.0"
+          }
+        },
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        }
+      }
+    },
+    "glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "dev": true,
+      "requires": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      },
+      "dependencies": {
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.0"
+          }
+        }
+      }
+    },
+    "globals": {
+      "version": "9.18.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+      "dev": true
+    },
+    "globby": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
+      "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
+      "dev": true,
+      "requires": {
+        "array-union": "^1.0.1",
+        "dir-glob": "^2.0.0",
+        "glob": "^7.1.2",
+        "ignore": "^3.3.5",
+        "pify": "^3.0.0",
+        "slash": "^1.0.0"
+      }
+    },
+    "globule": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
+      "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "glob": "~7.1.1",
+        "lodash": "~4.17.10",
+        "minimatch": "~3.0.2"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.15",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
+      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
+      "dev": true
+    },
+    "handle-thing": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz",
+      "integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=",
+      "dev": true
+    },
+    "handlebars": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz",
+      "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==",
+      "dev": true,
+      "requires": {
+        "neo-async": "^2.6.0",
+        "optimist": "^0.6.1",
+        "source-map": "^0.6.1",
+        "uglify-js": "^3.1.4"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "dev": true
+    },
+    "har-validator": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.5.5",
+        "har-schema": "^2.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        }
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "has-binary2": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
+      "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
+      "dev": true,
+      "requires": {
+        "isarray": "2.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
+          "dev": true
+        }
+      }
+    },
+    "has-cors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
+      "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
+    "has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+      "dev": true
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "dev": true,
+      "requires": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      }
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "hash-base": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "requires": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "hosted-git-info": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
+      "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
+      "dev": true
+    },
+    "hpack.js": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "wbuf": "^1.1.0"
+      }
+    },
+    "html-entities": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
+      "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
+      "dev": true
+    },
+    "http-deceiver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
+      "dev": true
+    },
+    "http-errors": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+      "dev": true,
+      "requires": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
+      }
+    },
+    "http-parser-js": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.0.tgz",
+      "integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==",
+      "dev": true
+    },
+    "http-proxy": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
+      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
+      "dev": true,
+      "requires": {
+        "eventemitter3": "^3.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "http-proxy-middleware": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz",
+      "integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
+      "dev": true,
+      "requires": {
+        "http-proxy": "^1.16.2",
+        "is-glob": "^4.0.0",
+        "lodash": "^4.17.5",
+        "micromatch": "^3.1.9"
+      }
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      }
+    },
+    "https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+      "dev": true
+    },
+    "https-proxy-agent": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz",
+      "integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==",
+      "dev": true,
+      "requires": {
+        "agent-base": "^4.1.0",
+        "debug": "^3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        }
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
+      "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "ieee754": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+      "dev": true
+    },
+    "iferr": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
+      "dev": true
+    },
+    "ignore": {
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+      "dev": true
+    },
+    "image-size": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
+      "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
+      "dev": true,
+      "optional": true
+    },
+    "immediate": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=",
+      "dev": true
+    },
+    "import-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
+      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
+      "dev": true,
+      "requires": {
+        "import-from": "^2.1.0"
+      }
+    },
+    "import-from": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
+      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "import-local": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
+      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+      "dev": true,
+      "requires": {
+        "pkg-dir": "^3.0.0",
+        "resolve-cwd": "^2.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
+          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+          "dev": true,
+          "requires": {
+            "find-up": "^3.0.0"
+          }
+        }
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "in-publish": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
+      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
+      "dev": true,
+      "optional": true
+    },
+    "indent-string": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "repeating": "^2.0.0"
+      }
+    },
+    "indexof": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
+      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "dev": true
+    },
+    "inquirer": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.0.tgz",
+      "integrity": "sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "^3.0.0",
+        "chalk": "^2.0.0",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^3.0.0",
+        "figures": "^2.0.0",
+        "lodash": "^4.17.10",
+        "mute-stream": "0.0.7",
+        "run-async": "^2.2.0",
+        "rxjs": "^6.1.0",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^4.0.0",
+        "through": "^2.3.6"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
+      }
+    },
+    "internal-ip": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-3.0.1.tgz",
+      "integrity": "sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==",
+      "dev": true,
+      "requires": {
+        "default-gateway": "^2.6.0",
+        "ipaddr.js": "^1.5.2"
+      }
+    },
+    "interpret": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
+      "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==",
+      "dev": true
+    },
+    "invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "dev": true,
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
+    "invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+      "dev": true
+    },
+    "ip": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
+      "dev": true
+    },
+    "ip-regex": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
+      "dev": true
+    },
+    "ipaddr.js": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
+      "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==",
+      "dev": true
+    },
+    "is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+      "dev": true
+    },
+    "is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "^1.0.0"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "requires": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
+      }
+    },
+    "is-directory": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
+      "dev": true
+    },
+    "is-dotfile": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
+      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
+      "dev": true
+    },
+    "is-equal-shallow": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
+      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
+      "dev": true,
+      "requires": {
+        "is-primitive": "^2.0.0"
+      }
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
+    },
+    "is-finite": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "^1.0.0"
+      }
+    },
+    "is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "^1.0.0"
+      }
+    },
+    "is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-path-cwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+      "dev": true
+    },
+    "is-path-in-cwd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
+      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
+      "dev": true,
+      "requires": {
+        "is-path-inside": "^1.0.0"
+      }
+    },
+    "is-path-inside": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
+      "dev": true,
+      "requires": {
+        "path-is-inside": "^1.0.1"
+      }
+    },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "is-posix-bracket": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
+      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
+      "dev": true
+    },
+    "is-primitive": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
+      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
+      "dev": true
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+      "dev": true
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "dev": true
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
+    "is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "isbinaryfile": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
+      "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
+      "dev": true,
+      "requires": {
+        "buffer-alloc": "^1.2.0"
+      }
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
+    "istanbul": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
+      "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
+      "dev": true,
+      "requires": {
+        "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"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "5.0.15",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+          "dev": true,
+          "requires": {
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "2 || 3",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "istanbul-api": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.1.5.tgz",
+      "integrity": "sha512-meYk1BwDp59Pfse1TvPrkKYgVqAufbdBLEVoqvu/hLLKSaQ054ZTksbNepyc223tMnWdm6AdK2URIJJRqdP87g==",
+      "dev": true,
+      "requires": {
+        "async": "^2.6.1",
+        "compare-versions": "^3.2.1",
+        "fileset": "^2.0.3",
+        "istanbul-lib-coverage": "^2.0.4",
+        "istanbul-lib-hook": "^2.0.6",
+        "istanbul-lib-instrument": "^3.2.0",
+        "istanbul-lib-report": "^2.0.7",
+        "istanbul-lib-source-maps": "^3.0.5",
+        "istanbul-reports": "^2.2.3",
+        "js-yaml": "^3.13.0",
+        "make-dir": "^2.1.0",
+        "minimatch": "^3.0.4",
+        "once": "^1.4.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
+          "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
+          "dev": true,
+          "requires": {
+            "lodash": "^4.17.11"
+          }
+        },
+        "istanbul-lib-coverage": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
+          "integrity": "sha512-LXTBICkMARVgo579kWDm8SqfB6nvSDKNqIOBEjmJRnL04JvoMHCYGWaMddQnseJYtkEuEvO/sIcOxPLk9gERug==",
+          "dev": true
+        },
+        "istanbul-lib-instrument": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.2.0.tgz",
+          "integrity": "sha512-06IM3xShbNW4NgZv5AP4QH0oHqf1/ivFo8eFys0ZjPXHGldHJQWb3riYOKXqmOqfxXBfxu4B+g/iuhOPZH0RJg==",
+          "dev": true,
+          "requires": {
+            "@babel/generator": "^7.0.0",
+            "@babel/parser": "^7.0.0",
+            "@babel/template": "^7.0.0",
+            "@babel/traverse": "^7.0.0",
+            "@babel/types": "^7.0.0",
+            "istanbul-lib-coverage": "^2.0.4",
+            "semver": "^6.0.0"
+          }
+        },
+        "make-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+          "dev": true,
+          "requires": {
+            "pify": "^4.0.1",
+            "semver": "^5.6.0"
+          },
+          "dependencies": {
+            "semver": {
+              "version": "5.7.0",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+              "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+              "dev": true
+            }
+          }
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        },
+        "semver": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz",
+          "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==",
+          "dev": true
+        }
+      }
+    },
+    "istanbul-instrumenter-loader": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz",
+      "integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==",
+      "dev": true,
+      "requires": {
+        "convert-source-map": "^1.5.0",
+        "istanbul-lib-instrument": "^1.7.3",
+        "loader-utils": "^1.1.0",
+        "schema-utils": "^0.3.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "5.5.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+          "dev": true,
+          "requires": {
+            "co": "^4.6.0",
+            "fast-deep-equal": "^1.0.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.3.0"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+          "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+          "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
+          "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
+          "dev": true,
+          "requires": {
+            "ajv": "^5.0.0"
+          }
+        }
+      }
+    },
+    "istanbul-lib-coverage": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz",
+      "integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==",
+      "dev": true
+    },
+    "istanbul-lib-hook": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.6.tgz",
+      "integrity": "sha512-829DKONApZ7UCiPXcOYWSgkFXa4+vNYoNOt3F+4uDJLKL1OotAoVwvThoEj1i8jmOj7odbYcR3rnaHu+QroaXg==",
+      "dev": true,
+      "requires": {
+        "append-transform": "^1.0.0"
+      }
+    },
+    "istanbul-lib-instrument": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz",
+      "integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==",
+      "dev": true,
+      "requires": {
+        "babel-generator": "^6.18.0",
+        "babel-template": "^6.16.0",
+        "babel-traverse": "^6.18.0",
+        "babel-types": "^6.18.0",
+        "babylon": "^6.18.0",
+        "istanbul-lib-coverage": "^1.2.1",
+        "semver": "^5.3.0"
+      }
+    },
+    "istanbul-lib-report": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.7.tgz",
+      "integrity": "sha512-wLH6beJBFbRBLiTlMOBxmb85cnVM1Vyl36N48e4e/aTKSM3WbOx7zbVIH1SQ537fhhsPbX0/C5JB4qsmyRXXyA==",
+      "dev": true,
+      "requires": {
+        "istanbul-lib-coverage": "^2.0.4",
+        "make-dir": "^2.1.0",
+        "supports-color": "^6.0.0"
+      },
+      "dependencies": {
+        "istanbul-lib-coverage": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
+          "integrity": "sha512-LXTBICkMARVgo579kWDm8SqfB6nvSDKNqIOBEjmJRnL04JvoMHCYGWaMddQnseJYtkEuEvO/sIcOxPLk9gERug==",
+          "dev": true
+        },
+        "make-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+          "dev": true,
+          "requires": {
+            "pify": "^4.0.1",
+            "semver": "^5.6.0"
+          }
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        },
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "istanbul-lib-source-maps": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.5.tgz",
+      "integrity": "sha512-eDhZ7r6r1d1zQPVZehLc3D0K14vRba/eBYkz3rw16DLOrrTzve9RmnkcwrrkWVgO1FL3EK5knujVe5S8QHE9xw==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^2.0.4",
+        "make-dir": "^2.1.0",
+        "rimraf": "^2.6.2",
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "istanbul-lib-coverage": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
+          "integrity": "sha512-LXTBICkMARVgo579kWDm8SqfB6nvSDKNqIOBEjmJRnL04JvoMHCYGWaMddQnseJYtkEuEvO/sIcOxPLk9gERug==",
+          "dev": true
+        },
+        "make-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+          "dev": true,
+          "requires": {
+            "pify": "^4.0.1",
+            "semver": "^5.6.0"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        },
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "istanbul-reports": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.3.tgz",
+      "integrity": "sha512-T6EbPuc8Cb620LWAYyZ4D8SSn06dY9i1+IgUX2lTH8gbwflMc9Obd33zHTyNX653ybjpamAHS9toKS3E6cGhTw==",
+      "dev": true,
+      "requires": {
+        "handlebars": "^4.1.0"
+      }
+    },
+    "jasmine": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.8.0.tgz",
+      "integrity": "sha1-awicChFXax8W3xG4AUbZHU6Lij4=",
+      "dev": true,
+      "requires": {
+        "exit": "^0.1.2",
+        "glob": "^7.0.6",
+        "jasmine-core": "~2.8.0"
+      },
+      "dependencies": {
+        "jasmine-core": {
+          "version": "2.8.0",
+          "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.8.0.tgz",
+          "integrity": "sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=",
+          "dev": true
+        }
+      }
+    },
+    "jasmine-core": {
+      "version": "2.99.1",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz",
+      "integrity": "sha1-5kAN8ea1bhMLYcS80JPap/boyhU=",
+      "dev": true
+    },
+    "jasmine-spec-reporter": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz",
+      "integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==",
+      "dev": true,
+      "requires": {
+        "colors": "1.1.2"
+      }
+    },
+    "jasminewd2": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.2.0.tgz",
+      "integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
+      "dev": true
+    },
+    "js-base64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
+      "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==",
+      "dev": true,
+      "optional": true
+    },
+    "js-tokens": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+          "dev": true
+        }
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true
+    },
+    "jsesc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+      "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+      "dev": true
+    },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
+    "json3": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
+      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
+      "dev": true
+    },
+    "json5": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+      "dev": true
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "jszip": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.2.1.tgz",
+      "integrity": "sha512-iCMBbo4eE5rb1VCpm5qXOAaUiRKRUKiItn8ah2YQQx9qymmSAY98eyQfioChEYcVQLh0zxJ3wS4A0mh90AVPvw==",
+      "dev": true,
+      "requires": {
+        "lie": "~3.3.0",
+        "pako": "~1.0.2",
+        "readable-stream": "~2.3.6",
+        "set-immediate-shim": "~1.0.1"
+      }
+    },
+    "karma": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-3.0.0.tgz",
+      "integrity": "sha512-ZTjyuDXVXhXsvJ1E4CnZzbCjSxD6sEdzEsFYogLuZM0yqvg/mgz+O+R1jb0J7uAQeuzdY8kJgx6hSNXLwFuHIQ==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.3.0",
+        "body-parser": "^1.16.1",
+        "chokidar": "^2.0.3",
+        "colors": "^1.1.0",
+        "combine-lists": "^1.0.0",
+        "connect": "^3.6.0",
+        "core-js": "^2.2.0",
+        "di": "^0.0.1",
+        "dom-serialize": "^2.2.0",
+        "expand-braces": "^0.1.1",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.1.2",
+        "http-proxy": "^1.13.0",
+        "isbinaryfile": "^3.0.0",
+        "lodash": "^4.17.4",
+        "log4js": "^3.0.0",
+        "mime": "^2.3.1",
+        "minimatch": "^3.0.2",
+        "optimist": "^0.6.1",
+        "qjobs": "^1.1.4",
+        "range-parser": "^1.2.0",
+        "rimraf": "^2.6.0",
+        "safe-buffer": "^5.0.1",
+        "socket.io": "2.1.1",
+        "source-map": "^0.6.1",
+        "tmp": "0.0.33",
+        "useragent": "2.2.1"
+      },
+      "dependencies": {
+        "mime": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.2.tgz",
+          "integrity": "sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "karma-chrome-launcher": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz",
+      "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==",
+      "dev": true,
+      "requires": {
+        "fs-access": "^1.0.0",
+        "which": "^1.2.1"
+      }
+    },
+    "karma-coverage-istanbul-reporter": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.0.5.tgz",
+      "integrity": "sha512-yPvAlKtY3y+rKKWbOo0CzBMVTvJEeMOgbMXuVv3yWvS8YtYKC98AU9vFF0mVBZ2RP1E9SgS90+PT6Kf14P3S4w==",
+      "dev": true,
+      "requires": {
+        "istanbul-api": "^2.1.1",
+        "minimatch": "^3.0.4"
+      }
+    },
+    "karma-jasmine": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.1.2.tgz",
+      "integrity": "sha1-OU8rJf+0pkS5rabyLUQ+L9CIhsM=",
+      "dev": true
+    },
+    "karma-jasmine-html-reporter": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-0.2.2.tgz",
+      "integrity": "sha1-SKjl7xiAdhfuK14zwRlMNbQ5Ukw=",
+      "dev": true,
+      "requires": {
+        "karma-jasmine": "^1.0.2"
+      }
+    },
+    "karma-source-map-support": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz",
+      "integrity": "sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==",
+      "dev": true,
+      "requires": {
+        "source-map-support": "^0.5.5"
+      }
+    },
+    "killable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
+      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==",
+      "dev": true
+    },
+    "kind-of": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+      "dev": true
+    },
+    "lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "dev": true,
+      "requires": {
+        "invert-kv": "^1.0.0"
+      }
+    },
+    "less": {
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/less/-/less-3.8.1.tgz",
+      "integrity": "sha512-8HFGuWmL3FhQR0aH89escFNBQH/nEiYPP2ltDFdQw2chE28Yx2E3lhAIq9Y2saYwLSwa699s4dBVEfCY8Drf7Q==",
+      "dev": true,
+      "requires": {
+        "clone": "^2.1.2",
+        "errno": "^0.1.1",
+        "graceful-fs": "^4.1.2",
+        "image-size": "~0.5.0",
+        "mime": "^1.4.1",
+        "mkdirp": "^0.5.0",
+        "promise": "^7.1.1",
+        "request": "^2.83.0",
+        "source-map": "~0.6.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "less-loader": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-4.1.0.tgz",
+      "integrity": "sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==",
+      "dev": true,
+      "requires": {
+        "clone": "^2.1.1",
+        "loader-utils": "^1.1.0",
+        "pify": "^3.0.0"
+      }
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      }
+    },
+    "license-webpack-plugin": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.0.2.tgz",
+      "integrity": "sha512-GsomZw5VoT20ST8qH2tOjBgbyhn6Pgs9M94g0mbvfBIV1VXufm1iKY+4dbgfTObj1Mp6nSRE3Zf74deOZr0KwA==",
+      "dev": true,
+      "requires": {
+        "webpack-sources": "^1.2.0"
+      }
+    },
+    "lie": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+      "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+      "dev": true,
+      "requires": {
+        "immediate": "~3.0.5"
+      }
+    },
+    "load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "loader-runner": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
+      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
+      "dev": true
+    },
+    "loader-utils": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
+      "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
+      "dev": true,
+      "requires": {
+        "big.js": "^3.1.3",
+        "emojis-list": "^2.0.0",
+        "json5": "^0.5.0"
+      }
+    },
+    "locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
+      "requires": {
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.11",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+      "dev": true
+    },
+    "lodash.assign": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
+      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
+      "dev": true,
+      "optional": true
+    },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
+    },
+    "lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
+      "dev": true
+    },
+    "lodash.mergewith": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
+      "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==",
+      "dev": true,
+      "optional": true
+    },
+    "lodash.tail": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz",
+      "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=",
+      "dev": true
+    },
+    "log4js": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-3.0.6.tgz",
+      "integrity": "sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==",
+      "dev": true,
+      "requires": {
+        "circular-json": "^0.5.5",
+        "date-format": "^1.2.0",
+        "debug": "^3.1.0",
+        "rfdc": "^1.1.2",
+        "streamroller": "0.7.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        }
+      }
+    },
+    "loglevel": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz",
+      "integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=",
+      "dev": true
+    },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      }
+    },
+    "loud-rejection": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
+      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+      "dev": true,
+      "requires": {
+        "currently-unhandled": "^0.4.1",
+        "signal-exit": "^3.0.0"
+      }
+    },
+    "lru-cache": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+      "dev": true,
+      "requires": {
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
+      }
+    },
+    "magic-string": {
+      "version": "0.25.2",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.2.tgz",
+      "integrity": "sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==",
+      "dev": true,
+      "requires": {
+        "sourcemap-codec": "^1.4.4"
+      }
+    },
+    "make-dir": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+      "dev": true,
+      "requires": {
+        "pify": "^3.0.0"
+      }
+    },
+    "make-error": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz",
+      "integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==",
+      "dev": true
+    },
+    "mamacro": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
+      "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
+      "dev": true
+    },
+    "map-age-cleaner": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+      "dev": true,
+      "requires": {
+        "p-defer": "^1.0.0"
+      }
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "dev": true
+    },
+    "map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+      "dev": true
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "dev": true,
+      "requires": {
+        "object-visit": "^1.0.0"
+      }
+    },
+    "math-random": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
+      "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
+      "dev": true
+    },
+    "md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "dev": true
+    },
+    "mem": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+      "dev": true,
+      "requires": {
+        "map-age-cleaner": "^0.1.1",
+        "mimic-fn": "^2.0.0",
+        "p-is-promise": "^2.0.0"
+      }
+    },
+    "memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "requires": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "meow": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "camelcase-keys": "^2.0.0",
+        "decamelize": "^1.1.2",
+        "loud-rejection": "^1.0.0",
+        "map-obj": "^1.0.1",
+        "minimist": "^1.1.3",
+        "normalize-package-data": "^2.3.4",
+        "object-assign": "^4.0.1",
+        "read-pkg-up": "^1.0.1",
+        "redent": "^1.0.0",
+        "trim-newlines": "^1.0.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
+      "dev": true
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+      "dev": true
+    },
+    "micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      }
+    },
+    "miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      }
+    },
+    "mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "dev": true,
+      "optional": true
+    },
+    "mime-db": {
+      "version": "1.40.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
+      "dev": true
+    },
+    "mime-types": {
+      "version": "2.1.24",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.40.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true
+    },
+    "mini-css-extract-plugin": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.3.tgz",
+      "integrity": "sha512-Mxs0nxzF1kxPv4TRi2NimewgXlJqh0rGE30vviCU2WHrpbta6wklnUV9dr9FUtoAHmB3p3LeXEC+ZjgHvB0Dzg==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "schema-utils": "^1.0.0",
+        "webpack-sources": "^1.1.0"
+      }
+    },
+    "minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "dev": true
+    },
+    "mississippi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
+      "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
+      "dev": true,
+      "requires": {
+        "concat-stream": "^1.5.0",
+        "duplexify": "^3.4.2",
+        "end-of-stream": "^1.1.0",
+        "flush-write-stream": "^1.0.0",
+        "from2": "^2.1.0",
+        "parallel-transform": "^1.1.0",
+        "pump": "^2.0.1",
+        "pumpify": "^1.3.3",
+        "stream-each": "^1.1.0",
+        "through2": "^2.0.0"
+      }
+    },
+    "mixin-deep": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
+      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+      "dev": true,
+      "requires": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "mixin-object": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
+      "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
+      "dev": true,
+      "requires": {
+        "for-in": "^0.1.3",
+        "is-extendable": "^0.1.1"
+      },
+      "dependencies": {
+        "for-in": {
+          "version": "0.1.8",
+          "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
+          "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=",
+          "dev": true
+        }
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "move-concurrently": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1",
+        "copy-concurrently": "^1.0.0",
+        "fs-write-stream-atomic": "^1.0.8",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.3"
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "multicast-dns": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
+      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
+      "dev": true,
+      "requires": {
+        "dns-packet": "^1.3.1",
+        "thunky": "^1.0.2"
+      }
+    },
+    "multicast-dns-service-types": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
+      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
+      "dev": true
+    },
+    "mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+      "dev": true
+    },
+    "nan": {
+      "version": "2.13.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz",
+      "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==",
+      "dev": true,
+      "optional": true
+    },
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      }
+    },
+    "negotiator": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
+      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
+      "dev": true
+    },
+    "neo-async": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.0.tgz",
+      "integrity": "sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==",
+      "dev": true
+    },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
+    "node-forge": {
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz",
+      "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==",
+      "dev": true
+    },
+    "node-gyp": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
+      "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "fstream": "^1.0.0",
+        "glob": "^7.0.3",
+        "graceful-fs": "^4.1.2",
+        "mkdirp": "^0.5.0",
+        "nopt": "2 || 3",
+        "npmlog": "0 || 1 || 2 || 3 || 4",
+        "osenv": "0",
+        "request": "^2.87.0",
+        "rimraf": "2",
+        "semver": "~5.3.0",
+        "tar": "^2.0.0",
+        "which": "1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "node-libs-browser": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.0.tgz",
+      "integrity": "sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==",
+      "dev": true,
+      "requires": {
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^3.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.0",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.11.0",
+        "vm-browserify": "0.0.4"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true
+        }
+      }
+    },
+    "node-releases": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.15.tgz",
+      "integrity": "sha512-cKV097BQaZr8LTSRUa2+oc/aX5L8UkZtPQrMSTgiJEeaW7ymTDCoRaGCoaTqk0lqnalcoSHu4wjSl0Cmj2+bMw==",
+      "dev": true,
+      "requires": {
+        "semver": "^5.3.0"
+      }
+    },
+    "node-sass": {
+      "version": "4.9.3",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.3.tgz",
+      "integrity": "sha512-XzXyGjO+84wxyH7fV6IwBOTrEBe2f0a6SBze9QWWYR/cL74AcQUks2AsqcCZenl/Fp/JVbuEaLpgrLtocwBUww==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "async-foreach": "^0.1.3",
+        "chalk": "^1.1.1",
+        "cross-spawn": "^3.0.0",
+        "gaze": "^1.0.0",
+        "get-stdin": "^4.0.1",
+        "glob": "^7.0.3",
+        "in-publish": "^2.0.0",
+        "lodash.assign": "^4.2.0",
+        "lodash.clonedeep": "^4.3.2",
+        "lodash.mergewith": "^4.6.0",
+        "meow": "^3.7.0",
+        "mkdirp": "^0.5.1",
+        "nan": "^2.10.0",
+        "node-gyp": "^3.8.0",
+        "npmlog": "^4.0.0",
+        "request": "2.87.0",
+        "sass-graph": "^2.2.4",
+        "stdout-stream": "^1.4.0",
+        "true-case-path": "^1.0.2"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "5.5.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "co": "^4.6.0",
+            "fast-deep-equal": "^1.0.0",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.3.0"
+          }
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true,
+          "optional": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+          "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
+          "dev": true,
+          "optional": true
+        },
+        "har-validator": {
+          "version": "5.0.3",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+          "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ajv": "^5.1.0",
+            "har-schema": "^2.0.0"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+          "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+          "dev": true,
+          "optional": true
+        },
+        "oauth-sign": {
+          "version": "0.8.2",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+          "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
+          "dev": true,
+          "optional": true
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true,
+          "optional": true
+        },
+        "request": {
+          "version": "2.87.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
+          "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aws-sign2": "~0.7.0",
+            "aws4": "^1.6.0",
+            "caseless": "~0.12.0",
+            "combined-stream": "~1.0.5",
+            "extend": "~3.0.1",
+            "forever-agent": "~0.6.1",
+            "form-data": "~2.3.1",
+            "har-validator": "~5.0.3",
+            "http-signature": "~1.2.0",
+            "is-typedarray": "~1.0.0",
+            "isstream": "~0.1.2",
+            "json-stringify-safe": "~5.0.1",
+            "mime-types": "~2.1.17",
+            "oauth-sign": "~0.8.2",
+            "performance-now": "^2.1.0",
+            "qs": "~6.5.1",
+            "safe-buffer": "^5.1.1",
+            "tough-cookie": "~2.3.3",
+            "tunnel-agent": "^0.6.0",
+            "uuid": "^3.1.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true,
+          "optional": true
+        },
+        "tough-cookie": {
+          "version": "2.3.4",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
+          "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "punycode": "^1.4.1"
+          }
+        }
+      }
+    },
+    "nopt": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+      "dev": true,
+      "requires": {
+        "abbrev": "1"
+      }
+    },
+    "normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.10.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
+          "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+          "dev": true,
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        }
+      }
+    },
+    "normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
+      "requires": {
+        "remove-trailing-separator": "^1.0.1"
+      }
+    },
+    "normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+      "dev": true
+    },
+    "npm-package-arg": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz",
+      "integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==",
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "^2.6.0",
+        "osenv": "^0.1.5",
+        "semver": "^5.5.0",
+        "validate-npm-package-name": "^3.0.0"
+      }
+    },
+    "npm-registry-client": {
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.6.0.tgz",
+      "integrity": "sha512-Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg==",
+      "dev": true,
+      "requires": {
+        "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",
+        "npmlog": "2 || ^3.1.0 || ^4.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"
+      }
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "requires": {
+        "path-key": "^2.0.0"
+      }
+    },
+    "npmlog": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "dev": true,
+      "requires": {
+        "are-we-there-yet": "~1.1.2",
+        "console-control-strings": "~1.1.0",
+        "gauge": "~2.7.3",
+        "set-blocking": "~2.0.0"
+      }
+    },
+    "null-check": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz",
+      "integrity": "sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=",
+      "dev": true
+    },
+    "num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "dev": true
+    },
+    "oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+      "dev": true
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
+    },
+    "object-component": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
+      "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=",
+      "dev": true
+    },
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "dev": true,
+      "requires": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.0"
+      }
+    },
+    "object.omit": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
+      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
+      "dev": true,
+      "requires": {
+        "for-own": "^0.1.4",
+        "is-extendable": "^0.1.1"
+      },
+      "dependencies": {
+        "for-own": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+          "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+          "dev": true,
+          "requires": {
+            "for-in": "^1.0.1"
+          }
+        }
+      }
+    },
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "obuf": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+      "dev": true
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "dev": true,
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "dev": true
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "dev": true,
+      "requires": {
+        "mimic-fn": "^1.0.0"
+      },
+      "dependencies": {
+        "mimic-fn": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+          "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+          "dev": true
+        }
+      }
+    },
+    "opn": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz",
+      "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==",
+      "dev": true,
+      "requires": {
+        "is-wsl": "^1.1.0"
+      }
+    },
+    "optimist": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+      "dev": true,
+      "requires": {
+        "minimist": "~0.0.1",
+        "wordwrap": "~0.0.2"
+      },
+      "dependencies": {
+        "wordwrap": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+          "dev": true
+        }
+      }
+    },
+    "optionator": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "dev": true,
+      "requires": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.4",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "wordwrap": "~1.0.0"
+      }
+    },
+    "original": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
+      "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
+      "dev": true,
+      "requires": {
+        "url-parse": "^1.4.3"
+      }
+    },
+    "os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+      "dev": true
+    },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "dev": true
+    },
+    "os-locale": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "lcid": "^1.0.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
+    },
+    "osenv": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+      "dev": true,
+      "requires": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.0"
+      }
+    },
+    "p-defer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
+      "dev": true
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true
+    },
+    "p-is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
+      "dev": true
+    },
+    "p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dev": true,
+      "requires": {
+        "p-try": "^1.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
+      "requires": {
+        "p-limit": "^1.1.0"
+      }
+    },
+    "p-map": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
+      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
+      "dev": true
+    },
+    "p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true
+    },
+    "pako": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
+      "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==",
+      "dev": true
+    },
+    "parallel-transform": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
+      "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
+      "dev": true,
+      "requires": {
+        "cyclist": "~0.2.2",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.1.5"
+      }
+    },
+    "parse-asn1": {
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
+      "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
+      "dev": true,
+      "requires": {
+        "asn1.js": "^4.0.0",
+        "browserify-aes": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "parse-glob": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
+      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+      "dev": true,
+      "requires": {
+        "glob-base": "^0.3.0",
+        "is-dotfile": "^1.0.0",
+        "is-extglob": "^1.0.0",
+        "is-glob": "^2.0.0"
+      },
+      "dependencies": {
+        "is-extglob": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+          "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+          "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^1.0.0"
+          }
+        }
+      }
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "dev": true,
+      "requires": {
+        "error-ex": "^1.2.0"
+      }
+    },
+    "parse5": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
+      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
+      "dev": true
+    },
+    "parseqs": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
+      "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
+      "dev": true,
+      "requires": {
+        "better-assert": "~1.0.0"
+      }
+    },
+    "parseuri": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
+      "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
+      "dev": true,
+      "requires": {
+        "better-assert": "~1.0.0"
+      }
+    },
+    "parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+      "dev": true
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "dev": true
+    },
+    "path-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
+      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
+      "dev": true
+    },
+    "path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+      "dev": true
+    },
+    "path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+      "dev": true
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "dev": true
+    },
+    "path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
+      "dev": true
+    },
+    "path-type": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+      "dev": true,
+      "requires": {
+        "pify": "^3.0.0"
+      }
+    },
+    "pbkdf2": {
+      "version": "3.0.17",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
+      "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
+      "dev": true,
+      "requires": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+      "dev": true
+    },
+    "pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+      "dev": true
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "requires": {
+        "pinkie": "^2.0.0"
+      }
+    },
+    "pkg-dir": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+      "dev": true,
+      "requires": {
+        "find-up": "^2.1.0"
+      }
+    },
+    "portfinder": {
+      "version": "1.0.17",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.17.tgz",
+      "integrity": "sha512-syFcRIRzVI1BoEFOCaAiizwDolh1S1YXSodsVhncbhjzjZQulhczNRbqnUl9N31Q4dKGOXsNDqxC2BWBgSMqeQ==",
+      "dev": true,
+      "requires": {
+        "async": "^1.5.2",
+        "debug": "^2.2.0",
+        "mkdirp": "0.5.x"
+      }
+    },
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+      "dev": true
+    },
+    "postcss": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.5.tgz",
+      "integrity": "sha512-HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.5.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-import": {
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.0.tgz",
+      "integrity": "sha512-3KqKRZcaZAvxbY8DVLdd81tG5uKzbUQuiWIvy0o0fzEC42bKacqPYFWbfCQyw6L4LWUaqPz/idvIdbhpgQ32eQ==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.1",
+        "postcss-value-parser": "^3.2.3",
+        "read-cache": "^1.0.0",
+        "resolve": "^1.1.7"
+      }
+    },
+    "postcss-load-config": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.0.0.tgz",
+      "integrity": "sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "^4.0.0",
+        "import-cwd": "^2.0.0"
+      }
+    },
+    "postcss-loader": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
+      "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "postcss": "^7.0.0",
+        "postcss-load-config": "^2.0.0",
+        "schema-utils": "^1.0.0"
+      }
+    },
+    "postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "dev": true
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true
+    },
+    "preserve": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
+      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
+      "dev": true
+    },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+      "dev": true
+    },
+    "promise": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
+      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "asap": "~2.0.3"
+      }
+    },
+    "promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+      "dev": true
+    },
+    "protractor": {
+      "version": "5.4.2",
+      "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.4.2.tgz",
+      "integrity": "sha512-zlIj64Cr6IOWP7RwxVeD8O4UskLYPoyIcg0HboWJL9T79F1F0VWtKkGTr/9GN6BKL+/Q/GmM7C9kFVCfDbP5sA==",
+      "dev": true,
+      "requires": {
+        "@types/q": "^0.0.32",
+        "@types/selenium-webdriver": "^3.0.0",
+        "blocking-proxy": "^1.0.0",
+        "browserstack": "^1.5.1",
+        "chalk": "^1.1.3",
+        "glob": "^7.0.3",
+        "jasmine": "2.8.0",
+        "jasminewd2": "^2.1.0",
+        "optimist": "~0.6.0",
+        "q": "1.4.1",
+        "saucelabs": "^1.5.0",
+        "selenium-webdriver": "3.6.0",
+        "source-map-support": "~0.4.0",
+        "webdriver-js-extender": "2.1.0",
+        "webdriver-manager": "^12.0.6"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "del": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
+          "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
+          "dev": true,
+          "requires": {
+            "globby": "^5.0.0",
+            "is-path-cwd": "^1.0.0",
+            "is-path-in-cwd": "^1.0.0",
+            "object-assign": "^4.0.1",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0",
+            "rimraf": "^2.2.8"
+          }
+        },
+        "globby": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+          "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
+          "dev": true,
+          "requires": {
+            "array-union": "^1.0.1",
+            "arrify": "^1.0.0",
+            "glob": "^7.0.3",
+            "object-assign": "^4.0.1",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        },
+        "source-map-support": {
+          "version": "0.4.18",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+          "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+          "dev": true,
+          "requires": {
+            "source-map": "^0.5.6"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        },
+        "webdriver-manager": {
+          "version": "12.1.1",
+          "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.1.tgz",
+          "integrity": "sha512-L9TEQmZs6JbMMRQI1w60mfps265/NCr0toYJl7p/R2OAk6oXAfwI6jqYP7EWae+d7Ad2S2Aj4+rzxoSjqk3ZuA==",
+          "dev": true,
+          "requires": {
+            "adm-zip": "^0.4.9",
+            "chalk": "^1.1.1",
+            "del": "^2.2.0",
+            "glob": "^7.0.3",
+            "ini": "^1.3.4",
+            "minimist": "^1.2.0",
+            "q": "^1.4.1",
+            "request": "^2.87.0",
+            "rimraf": "^2.5.2",
+            "semver": "^5.3.0",
+            "xml2js": "^0.4.17"
+          }
+        }
+      }
+    },
+    "proxy-addr": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz",
+      "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==",
+      "dev": true,
+      "requires": {
+        "forwarded": "~0.1.2",
+        "ipaddr.js": "1.9.0"
+      }
+    },
+    "prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+      "dev": true
+    },
+    "psl": {
+      "version": "1.1.31",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
+      "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==",
+      "dev": true
+    },
+    "public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "pump": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "pumpify": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "dev": true,
+      "requires": {
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
+      }
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
+    },
+    "q": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
+      "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=",
+      "dev": true
+    },
+    "qjobs": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
+      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "dev": true
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "dev": true
+    },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true
+    },
+    "querystringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
+      "dev": true
+    },
+    "randomatic": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
+      "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
+      "dev": true,
+      "requires": {
+        "is-number": "^4.0.0",
+        "kind-of": "^6.0.0",
+        "math-random": "^1.0.1"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "dev": true
+        }
+      }
+    },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "range-parser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
+      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
+      "dev": true
+    },
+    "raw-body": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz",
+      "integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==",
+      "dev": true,
+      "requires": {
+        "bytes": "3.0.0",
+        "http-errors": "1.6.3",
+        "iconv-lite": "0.4.23",
+        "unpipe": "1.0.0"
+      }
+    },
+    "raw-loader": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
+      "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=",
+      "dev": true
+    },
+    "read-cache": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+      "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
+      "dev": true,
+      "requires": {
+        "pify": "^2.3.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "dev": true,
+      "requires": {
+        "load-json-file": "^1.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^1.0.0"
+      },
+      "dependencies": {
+        "path-type": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+          "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "dev": true,
+      "requires": {
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+          "dev": true,
+          "requires": {
+            "path-exists": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+          "dev": true,
+          "requires": {
+            "pinkie-promise": "^2.0.0"
+          }
+        }
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "dev": true,
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "readdirp": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+      "dev": true,
+      "requires": {
+        "resolve": "^1.1.6"
+      }
+    },
+    "redent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "indent-string": "^2.1.0",
+        "strip-indent": "^1.0.1"
+      }
+    },
+    "reflect-metadata": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
+      "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
+      "dev": true
+    },
+    "regenerate": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
+      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
+      "dev": true
+    },
+    "regenerator-runtime": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+      "dev": true
+    },
+    "regex-cache": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
+      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
+      "dev": true,
+      "requires": {
+        "is-equal-shallow": "^0.1.3"
+      }
+    },
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "regexpu-core": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
+      "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
+      "dev": true,
+      "requires": {
+        "regenerate": "^1.2.1",
+        "regjsgen": "^0.2.0",
+        "regjsparser": "^0.1.4"
+      }
+    },
+    "regjsgen": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+      "dev": true
+    },
+    "regjsparser": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
+      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+      "dev": true,
+      "requires": {
+        "jsesc": "~0.5.0"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+          "dev": true
+        }
+      }
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "dev": true
+    },
+    "repeat-element": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+      "dev": true
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
+    },
+    "repeating": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+      "dev": true,
+      "requires": {
+        "is-finite": "^1.0.0"
+      }
+    },
+    "request": {
+      "version": "2.88.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+      "dev": true,
+      "requires": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.0",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.4.3",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
+    },
+    "require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+      "dev": true
+    },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+      "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
+      "dev": true
+    },
+    "resolve-cwd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "dev": true
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+      "dev": true
+    },
+    "restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "dev": true,
+      "requires": {
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true
+    },
+    "retry": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
+      "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=",
+      "dev": true
+    },
+    "rfdc": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.2.tgz",
+      "integrity": "sha512-92ktAgvZhBzYTIK0Mja9uen5q5J3NRVMoDkJL2VMwq6SXjVCgqvQeVP2XAaUY6HT+XpQYeLSjb3UoitBryKmdA==",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "dev": true,
+      "requires": {
+        "is-promise": "^2.1.0"
+      }
+    },
+    "run-queue": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
+      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1"
+      }
+    },
+    "rxjs": {
+      "version": "6.3.3",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+      "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "dev": true,
+      "requires": {
+        "ret": "~0.1.10"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "sass-graph": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
+      "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "glob": "^7.0.0",
+        "lodash": "^4.0.0",
+        "scss-tokenizer": "^0.2.3",
+        "yargs": "^7.0.0"
+      }
+    },
+    "sass-loader": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz",
+      "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==",
+      "dev": true,
+      "requires": {
+        "clone-deep": "^2.0.1",
+        "loader-utils": "^1.0.1",
+        "lodash.tail": "^4.1.1",
+        "neo-async": "^2.5.0",
+        "pify": "^3.0.0",
+        "semver": "^5.5.0"
+      }
+    },
+    "saucelabs": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.5.0.tgz",
+      "integrity": "sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==",
+      "dev": true,
+      "requires": {
+        "https-proxy-agent": "^2.2.1"
+      }
+    },
+    "sax": {
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz",
+      "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=",
+      "dev": true
+    },
+    "schema-utils": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.1.0",
+        "ajv-errors": "^1.0.0",
+        "ajv-keywords": "^3.1.0"
+      }
+    },
+    "scss-tokenizer": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
+      "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "js-base64": "^2.1.8",
+        "source-map": "^0.4.2"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "amdefine": ">=0.0.4"
+          }
+        }
+      }
+    },
+    "select-hose": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
+      "dev": true
+    },
+    "selenium-webdriver": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz",
+      "integrity": "sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==",
+      "dev": true,
+      "requires": {
+        "jszip": "^3.1.3",
+        "rimraf": "^2.5.4",
+        "tmp": "0.0.30",
+        "xml2js": "^0.4.17"
+      },
+      "dependencies": {
+        "tmp": {
+          "version": "0.0.30",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz",
+          "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=",
+          "dev": true,
+          "requires": {
+            "os-tmpdir": "~1.0.1"
+          }
+        }
+      }
+    },
+    "selfsigned": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz",
+      "integrity": "sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==",
+      "dev": true,
+      "requires": {
+        "node-forge": "0.7.5"
+      }
+    },
+    "semver": {
+      "version": "5.5.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz",
+      "integrity": "sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==",
+      "dev": true
+    },
+    "semver-dsl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/semver-dsl/-/semver-dsl-1.0.1.tgz",
+      "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=",
+      "dev": true,
+      "requires": {
+        "semver": "^5.3.0"
+      }
+    },
+    "semver-intersect": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/semver-intersect/-/semver-intersect-1.4.0.tgz",
+      "integrity": "sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==",
+      "dev": true,
+      "requires": {
+        "semver": "^5.0.0"
+      }
+    },
+    "send": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "~1.6.2",
+        "mime": "1.4.1",
+        "ms": "2.0.0",
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.0",
+        "statuses": "~1.4.0"
+      },
+      "dependencies": {
+        "mime": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+          "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+          "dev": true
+        }
+      }
+    },
+    "serialize-javascript": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz",
+      "integrity": "sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==",
+      "dev": true
+    },
+    "serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
+      }
+    },
+    "serve-static": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
+      "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
+      "dev": true,
+      "requires": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.2",
+        "send": "0.16.2"
+      }
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
+    },
+    "set-immediate-shim": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
+      "dev": true
+    },
+    "set-value": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
+      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "dev": true
+    },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "shallow-clone": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz",
+      "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
+      "dev": true,
+      "requires": {
+        "is-extendable": "^0.1.1",
+        "kind-of": "^5.0.0",
+        "mixin-object": "^2.0.1"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
+      }
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
+    },
+    "shelljs": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz",
+      "integrity": "sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.0.0",
+        "interpret": "^1.0.0",
+        "rechoir": "^0.6.2"
+      }
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
+    },
+    "slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+      "dev": true
+    },
+    "slide": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
+      "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=",
+      "dev": true
+    },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "requires": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.2.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "socket.io": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
+      "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
+      "dev": true,
+      "requires": {
+        "debug": "~3.1.0",
+        "engine.io": "~3.2.0",
+        "has-binary2": "~1.0.2",
+        "socket.io-adapter": "~1.1.0",
+        "socket.io-client": "2.1.1",
+        "socket.io-parser": "~3.2.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "socket.io-adapter": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz",
+      "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=",
+      "dev": true
+    },
+    "socket.io-client": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
+      "integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==",
+      "dev": true,
+      "requires": {
+        "backo2": "1.0.2",
+        "base64-arraybuffer": "0.1.5",
+        "component-bind": "1.0.0",
+        "component-emitter": "1.2.1",
+        "debug": "~3.1.0",
+        "engine.io-client": "~3.2.0",
+        "has-binary2": "~1.0.2",
+        "has-cors": "1.1.0",
+        "indexof": "0.0.1",
+        "object-component": "0.0.3",
+        "parseqs": "0.0.5",
+        "parseuri": "0.0.5",
+        "socket.io-parser": "~3.2.0",
+        "to-array": "0.1.4"
+      },
+      "dependencies": {
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+          "dev": true
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "socket.io-parser": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
+      "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==",
+      "dev": true,
+      "requires": {
+        "component-emitter": "1.2.1",
+        "debug": "~3.1.0",
+        "isarray": "2.0.1"
+      },
+      "dependencies": {
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+          "dev": true
+        },
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "isarray": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
+          "dev": true
+        }
+      }
+    },
+    "sockjs": {
+      "version": "0.3.19",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
+      "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
+      "dev": true,
+      "requires": {
+        "faye-websocket": "^0.10.0",
+        "uuid": "^3.0.1"
+      }
+    },
+    "sockjs-client": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.5.tgz",
+      "integrity": "sha1-G7fA9yIsQPQq3xT0RCy9Eml3GoM=",
+      "dev": true,
+      "requires": {
+        "debug": "^2.6.6",
+        "eventsource": "0.1.6",
+        "faye-websocket": "~0.11.0",
+        "inherits": "^2.0.1",
+        "json3": "^3.3.2",
+        "url-parse": "^1.1.8"
+      },
+      "dependencies": {
+        "faye-websocket": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
+          "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+          "dev": true,
+          "requires": {
+            "websocket-driver": ">=0.5.1"
+          }
+        }
+      }
+    },
+    "source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
+    "source-map": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+      "dev": true
+    },
+    "source-map-loader": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.4.tgz",
+      "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==",
+      "dev": true,
+      "requires": {
+        "async": "^2.5.0",
+        "loader-utils": "^1.1.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
+          "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
+          "dev": true,
+          "requires": {
+            "lodash": "^4.17.11"
+          }
+        }
+      }
+    },
+    "source-map-resolve": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+      "dev": true,
+      "requires": {
+        "atob": "^2.1.1",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "source-map-support": {
+      "version": "0.5.9",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz",
+      "integrity": "sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "source-map-url": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+      "dev": true
+    },
+    "sourcemap-codec": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz",
+      "integrity": "sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg==",
+      "dev": true
+    },
+    "spdx-correct": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
+      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+      "dev": true,
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
+      "dev": true
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "dev": true,
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz",
+      "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==",
+      "dev": true
+    },
+    "spdy": {
+      "version": "3.4.7",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-3.4.7.tgz",
+      "integrity": "sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=",
+      "dev": true,
+      "requires": {
+        "debug": "^2.6.8",
+        "handle-thing": "^1.2.5",
+        "http-deceiver": "^1.2.7",
+        "safe-buffer": "^5.0.1",
+        "select-hose": "^2.0.0",
+        "spdy-transport": "^2.0.18"
+      }
+    },
+    "spdy-transport": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-2.1.1.tgz",
+      "integrity": "sha512-q7D8c148escoB3Z7ySCASadkegMmUZW8Wb/Q1u0/XBgDKMO880rLQDj8Twiew/tYi7ghemKUi/whSYOwE17f5Q==",
+      "dev": true,
+      "requires": {
+        "debug": "^2.6.8",
+        "detect-node": "^2.0.3",
+        "hpack.js": "^2.1.6",
+        "obuf": "^1.1.1",
+        "readable-stream": "^2.2.9",
+        "safe-buffer": "^5.0.1",
+        "wbuf": "^1.7.2"
+      }
+    },
+    "speed-measure-webpack-plugin": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz",
+      "integrity": "sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.0.1"
+      }
+    },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.0"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "sshpk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "dev": true,
+      "requires": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      }
+    },
+    "ssri": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz",
+      "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "dev": true,
+      "requires": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "stats-webpack-plugin": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/stats-webpack-plugin/-/stats-webpack-plugin-0.7.0.tgz",
+      "integrity": "sha512-NT0YGhwuQ0EOX+uPhhUcI6/+1Sq/pMzNuSCBVT4GbFl/ac6I/JZefBcjlECNfAb1t3GOx5dEj1Z7x0cAxeeVLQ==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.4"
+      }
+    },
+    "statuses": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
+      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
+      "dev": true
+    },
+    "stdout-stream": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
+      "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "stream-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+      "dev": true,
+      "requires": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "stream-each": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "dev": true,
+      "requires": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "stream-shift": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
+      "dev": true
+    },
+    "streamroller": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
+      "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
+      "dev": true,
+      "requires": {
+        "date-format": "^1.2.0",
+        "debug": "^3.1.0",
+        "mkdirp": "^0.5.1",
+        "readable-stream": "^2.3.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        }
+      }
+    },
+    "string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "dev": true,
+      "requires": {
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "dev": true,
+      "requires": {
+        "is-utf8": "^0.2.0"
+      }
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "dev": true
+    },
+    "strip-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "get-stdin": "^4.0.1"
+      }
+    },
+    "style-loader": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.0.tgz",
+      "integrity": "sha512-uCcN7XWHkqwGVt7skpInW6IGO1tG6ReyFQ1Cseh0VcN6VdcFQi62aG/2F3Y9ueA8x4IVlfaSUxpmQXQD9QrEuQ==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "schema-utils": "^0.4.5"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "0.4.7",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
+          "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
+      }
+    },
+    "stylus": {
+      "version": "0.54.5",
+      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz",
+      "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=",
+      "dev": true,
+      "requires": {
+        "css-parse": "1.7.x",
+        "debug": "*",
+        "glob": "7.0.x",
+        "mkdirp": "0.5.x",
+        "sax": "0.5.x",
+        "source-map": "0.1.x"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.0.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
+          "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.2",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "source-map": {
+          "version": "0.1.43",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+          "dev": true,
+          "requires": {
+            "amdefine": ">=0.0.4"
+          }
+        }
+      }
+    },
+    "stylus-loader": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
+      "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.0.2",
+        "lodash.clonedeep": "^4.5.0",
+        "when": "~3.6.x"
+      }
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "symbol-observable": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
+      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
+      "dev": true
+    },
+    "tapable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+      "dev": true
+    },
+    "tar": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "block-stream": "*",
+        "fstream": "^1.0.2",
+        "inherits": "2"
+      }
+    },
+    "terser": {
+      "version": "3.17.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz",
+      "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==",
+      "dev": true,
+      "requires": {
+        "commander": "^2.19.0",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.10"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "source-map-support": {
+          "version": "0.5.12",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
+          "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
+          "dev": true,
+          "requires": {
+            "buffer-from": "^1.0.0",
+            "source-map": "^0.6.0"
+          }
+        }
+      }
+    },
+    "terser-webpack-plugin": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.1.0.tgz",
+      "integrity": "sha512-61lV0DSxMAZ8AyZG7/A4a3UPlrbOBo8NIQ4tJzLPAdGOQ+yoNC7l5ijEow27lBAL2humer01KLS6bGIMYQxKoA==",
+      "dev": true,
+      "requires": {
+        "cacache": "^11.0.2",
+        "find-cache-dir": "^2.0.0",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^1.4.0",
+        "source-map": "^0.6.1",
+        "terser": "^3.8.1",
+        "webpack-sources": "^1.1.0",
+        "worker-farm": "^1.5.2"
+      },
+      "dependencies": {
+        "cacache": {
+          "version": "11.3.2",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+          "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.3",
+            "chownr": "^1.1.1",
+            "figgy-pudding": "^3.5.1",
+            "glob": "^7.1.3",
+            "graceful-fs": "^4.1.15",
+            "lru-cache": "^5.1.1",
+            "mississippi": "^3.0.0",
+            "mkdirp": "^0.5.1",
+            "move-concurrently": "^1.0.1",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^2.6.2",
+            "ssri": "^6.0.1",
+            "unique-filename": "^1.1.1",
+            "y18n": "^4.0.0"
+          }
+        },
+        "find-cache-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+          "dev": true,
+          "requires": {
+            "commondir": "^1.0.1",
+            "make-dir": "^2.0.0",
+            "pkg-dir": "^3.0.0"
+          }
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "dev": true,
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "make-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+          "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+          "dev": true,
+          "requires": {
+            "pify": "^4.0.1",
+            "semver": "^5.6.0"
+          }
+        },
+        "mississippi": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+          "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+          "dev": true,
+          "requires": {
+            "concat-stream": "^1.5.0",
+            "duplexify": "^3.4.2",
+            "end-of-stream": "^1.1.0",
+            "flush-write-stream": "^1.0.0",
+            "from2": "^2.1.0",
+            "parallel-transform": "^1.1.0",
+            "pump": "^3.0.0",
+            "pumpify": "^1.3.3",
+            "stream-each": "^1.1.0",
+            "through2": "^2.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
+          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+          "dev": true,
+          "requires": {
+            "find-up": "^3.0.0"
+          }
+        },
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        },
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "ssri": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+          "dev": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1"
+          }
+        },
+        "yallist": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+          "dev": true
+        }
+      }
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "thunky": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz",
+      "integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==",
+      "dev": true
+    },
+    "timers-browserify": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
+      "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
+      "dev": true,
+      "requires": {
+        "setimmediate": "^1.0.4"
+      }
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
+    "to-array": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
+      "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=",
+      "dev": true
+    },
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
+    },
+    "to-fast-properties": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+      "dev": true
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      }
+    },
+    "tough-cookie": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+      "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+      "dev": true,
+      "requires": {
+        "psl": "^1.1.24",
+        "punycode": "^1.4.1"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true
+        }
+      }
+    },
+    "tree-kill": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz",
+      "integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==",
+      "dev": true
+    },
+    "trim-newlines": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
+      "dev": true,
+      "optional": true
+    },
+    "trim-right": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+      "dev": true
+    },
+    "true-case-path": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
+      "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "glob": "^7.1.2"
+      }
+    },
+    "ts-node": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-7.0.1.tgz",
+      "integrity": "sha512-BVwVbPJRspzNh2yfslyT1PSbl5uIk03EZlb493RKHN4qej/D06n1cEhjlOJG69oFsE7OT8XjpTUcYf6pKTLMhw==",
+      "dev": true,
+      "requires": {
+        "arrify": "^1.0.0",
+        "buffer-from": "^1.1.0",
+        "diff": "^3.1.0",
+        "make-error": "^1.1.1",
+        "minimist": "^1.2.0",
+        "mkdirp": "^0.5.1",
+        "source-map-support": "^0.5.6",
+        "yn": "^2.0.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
+    "tslib": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
+      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
+    },
+    "tslint": {
+      "version": "5.11.0",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.11.0.tgz",
+      "integrity": "sha1-mPMMAurjzecAYgHkwzywi0hYHu0=",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "^6.22.0",
+        "builtin-modules": "^1.1.1",
+        "chalk": "^2.3.0",
+        "commander": "^2.12.1",
+        "diff": "^3.2.0",
+        "glob": "^7.1.1",
+        "js-yaml": "^3.7.0",
+        "minimatch": "^3.0.4",
+        "resolve": "^1.3.2",
+        "semver": "^5.3.0",
+        "tslib": "^1.8.0",
+        "tsutils": "^2.27.2"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.10.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz",
+          "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+          "dev": true,
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        }
+      }
+    },
+    "tsutils": {
+      "version": "2.29.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
+      "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.8.1"
+      }
+    },
+    "tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "~1.1.2"
+      }
+    },
+    "type-is": {
+      "version": "1.6.16",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
+      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+      "dev": true,
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.18"
+      }
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "typescript": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.1.6.tgz",
+      "integrity": "sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==",
+      "dev": true
+    },
+    "uglify-js": {
+      "version": "3.5.6",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.6.tgz",
+      "integrity": "sha512-YDKRX8F0Y+Jr7LhoVk0n4G7ltR3Y7qFAj+DtVBthlOgCcIj1hyMigCfousVfn9HKmvJ+qiFlLDwaHx44/e5ZKw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "commander": "~2.20.0",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "uglifyjs-webpack-plugin": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz",
+      "integrity": "sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==",
+      "dev": true,
+      "requires": {
+        "cacache": "^10.0.4",
+        "find-cache-dir": "^1.0.0",
+        "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"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.13.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
+          "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "0.4.7",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
+          "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "uglify-es": {
+          "version": "3.3.9",
+          "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz",
+          "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
+          "dev": true,
+          "requires": {
+            "commander": "~2.13.0",
+            "source-map": "~0.6.1"
+          }
+        }
+      }
+    },
+    "ultron": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
+      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
+      "dev": true
+    },
+    "union-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
+      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^0.4.3"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "set-value": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
+          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-extendable": "^0.1.1",
+            "is-plain-object": "^2.0.1",
+            "to-object-path": "^0.3.0"
+          }
+        }
+      }
+    },
+    "unique-filename": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "dev": true,
+      "requires": {
+        "unique-slug": "^2.0.0"
+      }
+    },
+    "unique-slug": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
+      "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
+      "dev": true,
+      "requires": {
+        "imurmurhash": "^0.1.4"
+      }
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "dev": true
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "dev": true,
+      "requires": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "dev": true,
+          "requires": {
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "dev": true,
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+          "dev": true
+        }
+      }
+    },
+    "upath": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
+      "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
+      "dev": true
+    },
+    "uri-js": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "dev": true
+    },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+          "dev": true
+        }
+      }
+    },
+    "url-join": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.0.tgz",
+      "integrity": "sha1-TTNA6AfTdzvamZH4MFrNzCpmXSo=",
+      "dev": true
+    },
+    "url-parse": {
+      "version": "1.4.6",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.6.tgz",
+      "integrity": "sha512-/B8AD9iQ01seoXmXf9z/MjLZQIdOoYl/+gvsQF6+mpnxaTfG9P7srYaiqaDMyKkR36XMXfhqSHss5MyFAO8lew==",
+      "dev": true,
+      "requires": {
+        "querystringify": "^2.0.0",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true
+    },
+    "useragent": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz",
+      "integrity": "sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=",
+      "dev": true,
+      "requires": {
+        "lru-cache": "2.2.x",
+        "tmp": "0.0.x"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "2.2.4",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz",
+          "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=",
+          "dev": true
+        }
+      }
+    },
+    "util": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+      "dev": true
+    },
+    "uuid": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+      "dev": true
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "requires": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "validate-npm-package-name": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
+      "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
+      "dev": true,
+      "requires": {
+        "builtins": "^1.0.3"
+      }
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+      "dev": true
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "vm-browserify": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+      "dev": true,
+      "requires": {
+        "indexof": "0.0.1"
+      }
+    },
+    "void-elements": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
+      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
+      "dev": true
+    },
+    "watchpack": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
+      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+      "dev": true,
+      "requires": {
+        "chokidar": "^2.0.2",
+        "graceful-fs": "^4.1.2",
+        "neo-async": "^2.5.0"
+      }
+    },
+    "wbuf": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+      "dev": true,
+      "requires": {
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "webdriver-js-extender": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz",
+      "integrity": "sha512-lcUKrjbBfCK6MNsh7xaY2UAUmZwe+/ib03AjVOpFobX4O7+83BUveSrLfU0Qsyb1DaKJdQRbuU+kM9aZ6QUhiQ==",
+      "dev": true,
+      "requires": {
+        "@types/selenium-webdriver": "^3.0.0",
+        "selenium-webdriver": "^3.0.1"
+      }
+    },
+    "webpack": {
+      "version": "4.19.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.19.1.tgz",
+      "integrity": "sha512-j7Q/5QqZRqIFXJvC0E59ipLV5Hf6lAnS3ezC3I4HMUybwEDikQBVad5d+IpPtmaQPQArvgUZLXIN6lWijHBn4g==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.7.6",
+        "@webassemblyjs/helper-module-context": "1.7.6",
+        "@webassemblyjs/wasm-edit": "1.7.6",
+        "@webassemblyjs/wasm-parser": "1.7.6",
+        "acorn": "^5.6.2",
+        "acorn-dynamic-import": "^3.0.0",
+        "ajv": "^6.1.0",
+        "ajv-keywords": "^3.1.0",
+        "chrome-trace-event": "^1.0.0",
+        "enhanced-resolve": "^4.1.0",
+        "eslint-scope": "^4.0.0",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^2.3.0",
+        "loader-utils": "^1.1.0",
+        "memory-fs": "~0.4.1",
+        "micromatch": "^3.1.8",
+        "mkdirp": "~0.5.0",
+        "neo-async": "^2.5.0",
+        "node-libs-browser": "^2.0.0",
+        "schema-utils": "^0.4.4",
+        "tapable": "^1.1.0",
+        "uglifyjs-webpack-plugin": "^1.2.4",
+        "watchpack": "^1.5.0",
+        "webpack-sources": "^1.2.0"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "0.4.7",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
+          "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
+      }
+    },
+    "webpack-core": {
+      "version": "0.6.9",
+      "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
+      "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
+      "dev": true,
+      "requires": {
+        "source-list-map": "~0.1.7",
+        "source-map": "~0.4.1"
+      },
+      "dependencies": {
+        "source-list-map": {
+          "version": "0.1.8",
+          "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
+          "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "dev": true,
+          "requires": {
+            "amdefine": ">=0.0.4"
+          }
+        }
+      }
+    },
+    "webpack-dev-middleware": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.3.0.tgz",
+      "integrity": "sha512-5C5gXtOo1I6+0AEg4UPglYEtu3Rai6l5IiO6aUu65scHXz29dc3oIWMiRwvcNLXgL0HwRkRxa9N02ZjFt4hY8w==",
+      "dev": true,
+      "requires": {
+        "loud-rejection": "^1.6.0",
+        "memory-fs": "~0.4.1",
+        "mime": "^2.3.1",
+        "range-parser": "^1.0.3",
+        "url-join": "^4.0.0",
+        "webpack-log": "^2.0.0"
+      },
+      "dependencies": {
+        "mime": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.2.tgz",
+          "integrity": "sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg==",
+          "dev": true
+        }
+      }
+    },
+    "webpack-dev-server": {
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.8.tgz",
+      "integrity": "sha512-c+tcJtDqnPdxCAzEEZKdIPmg3i5i7cAHe+B+0xFNK0BlCc2HF/unYccbU7xTgfGc5xxhCztCQzFmsqim+KhI+A==",
+      "dev": true,
+      "requires": {
+        "ansi-html": "0.0.7",
+        "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": "^2.0.0",
+        "internal-ip": "^3.0.1",
+        "ip": "^1.1.5",
+        "killable": "^1.0.0",
+        "loglevel": "^1.4.1",
+        "opn": "^5.1.0",
+        "portfinder": "^1.0.9",
+        "schema-utils": "^1.0.0",
+        "selfsigned": "^1.9.1",
+        "serve-index": "^1.7.2",
+        "sockjs": "0.3.19",
+        "sockjs-client": "1.1.5",
+        "spdy": "^3.4.1",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^5.1.0",
+        "webpack-dev-middleware": "3.2.0",
+        "webpack-log": "^2.0.0",
+        "yargs": "12.0.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
+          },
+          "dependencies": {
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^3.0.0"
+              }
+            }
+          }
+        },
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "dev": true,
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "decamelize": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
+          "integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
+          "dev": true,
+          "requires": {
+            "xregexp": "4.0.0"
+          }
+        },
+        "execa": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^6.0.0",
+            "get-stream": "^4.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "invert-kv": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "lcid": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+          "dev": true,
+          "requires": {
+            "invert-kv": "^2.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "mime": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.2.tgz",
+          "integrity": "sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        },
+        "os-locale": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+          "dev": true,
+          "requires": {
+            "execa": "^1.0.0",
+            "lcid": "^2.0.0",
+            "mem": "^4.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
+          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          },
+          "dependencies": {
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^3.0.0"
+              }
+            }
+          }
+        },
+        "webpack-dev-middleware": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.2.0.tgz",
+          "integrity": "sha512-YJLMF/96TpKXaEQwaLEo+Z4NDK8aV133ROF6xp9pe3gQoS7sxfpXh4Rv9eC+8vCvWfmDjRQaMSlRPbO+9G6jgA==",
+          "dev": true,
+          "requires": {
+            "loud-rejection": "^1.6.0",
+            "memory-fs": "~0.4.1",
+            "mime": "^2.3.1",
+            "path-is-absolute": "^1.0.0",
+            "range-parser": "^1.0.3",
+            "url-join": "^4.0.0",
+            "webpack-log": "^2.0.0"
+          }
+        },
+        "which-module": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+          "dev": true
+        },
+        "yargs": {
+          "version": "12.0.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz",
+          "integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
+          "dev": true,
+          "requires": {
+            "cliui": "^4.0.0",
+            "decamelize": "^2.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^3.0.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^2.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^3.2.1 || ^4.0.0",
+            "yargs-parser": "^10.1.0"
+          }
+        },
+        "yargs-parser": {
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
+          "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^4.1.0"
+          }
+        }
+      }
+    },
+    "webpack-log": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
+      "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^3.0.0",
+        "uuid": "^3.3.2"
+      }
+    },
+    "webpack-merge": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.4.tgz",
+      "integrity": "sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.17.5"
+      }
+    },
+    "webpack-sources": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.2.0.tgz",
+      "integrity": "sha512-9BZwxR85dNsjWz3blyxdOhTgtnQvv3OEs5xofI0wPYTwu5kaWxS08UuD1oI7WLBLpRO+ylf0ofnXLXWmGb2WMw==",
+      "dev": true,
+      "requires": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "webpack-subresource-integrity": {
+      "version": "1.1.0-rc.6",
+      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz",
+      "integrity": "sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==",
+      "dev": true,
+      "requires": {
+        "webpack-core": "^0.6.8"
+      }
+    },
+    "websocket-driver": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
+      "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
+      "dev": true,
+      "requires": {
+        "http-parser-js": ">=0.4.0",
+        "websocket-extensions": ">=0.1.1"
+      }
+    },
+    "websocket-extensions": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
+      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
+      "dev": true
+    },
+    "when": {
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz",
+      "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=",
+      "dev": true
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "which-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+      "dev": true,
+      "optional": true
+    },
+    "wide-align": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "dev": true,
+      "requires": {
+        "string-width": "^1.0.2 || 2"
+      }
+    },
+    "wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+      "dev": true
+    },
+    "worker-farm": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz",
+      "integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
+      "dev": true,
+      "requires": {
+        "errno": "~0.1.7"
+      }
+    },
+    "wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "dev": true,
+      "requires": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "ws": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+      "dev": true,
+      "requires": {
+        "async-limiter": "~1.0.0",
+        "safe-buffer": "~5.1.0",
+        "ultron": "~1.1.0"
+      }
+    },
+    "xml2js": {
+      "version": "0.4.19",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
+      "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
+      "dev": true,
+      "requires": {
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~9.0.1"
+      },
+      "dependencies": {
+        "sax": {
+          "version": "1.2.4",
+          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+          "dev": true
+        }
+      }
+    },
+    "xmlbuilder": {
+      "version": "9.0.7",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
+      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
+      "dev": true
+    },
+    "xmlhttprequest-ssl": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
+      "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=",
+      "dev": true
+    },
+    "xregexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz",
+      "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==",
+      "dev": true
+    },
+    "xtend": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true
+    },
+    "y18n": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "dev": true
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+      "dev": true
+    },
+    "yargs": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
+      "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "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": "^5.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true,
+          "optional": true
+        },
+        "y18n": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "yargs-parser": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
+      "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "camelcase": "^3.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "yeast": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
+      "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=",
+      "dev": true
+    },
+    "yn": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz",
+      "integrity": "sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=",
+      "dev": true
+    },
+    "zone.js": {
+      "version": "0.8.29",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.29.tgz",
+      "integrity": "sha512-mla2acNCMkWXBD+c+yeUrBUrzOxYMNFdQ6FGfigGGtEVBPJx07BQeJekjt9DmH1FtZek4E9rE1eRR9qQpxACOQ=="
+    }
+  }
+}
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/package.json b/tests/legacy-cli/e2e/assets/7.0-project/package.json
new file mode 100644
index 000000000000..fa5e065c8a6b
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/package.json
@@ -0,0 +1,48 @@
+{
+  "name": "seven-oh-project",
+  "version": "0.0.0",
+  "scripts": {
+    "ng": "ng",
+    "start": "ng serve",
+    "build": "ng build",
+    "test": "ng test",
+    "lint": "ng lint",
+    "e2e": "ng e2e"
+  },
+  "private": true,
+  "dependencies": {
+    "@angular/animations": "~7.0.0",
+    "@angular/common": "~7.0.0",
+    "@angular/compiler": "~7.0.0",
+    "@angular/core": "~7.0.0",
+    "@angular/forms": "~7.0.0",
+    "@angular/http": "~7.0.0",
+    "@angular/platform-browser": "~7.0.0",
+    "@angular/platform-browser-dynamic": "~7.0.0",
+    "@angular/router": "~7.0.0",
+    "core-js": "^2.5.4",
+    "rxjs": "~6.3.3",
+    "zone.js": "~0.8.26"
+  },
+  "devDependencies": {
+    "@angular-devkit/build-angular": "~0.10.0",
+    "@angular/cli": "~7.0.7",
+    "@angular/compiler-cli": "~7.0.0",
+    "@angular/language-service": "~7.0.0",
+    "@types/node": "~8.9.4",
+    "@types/jasmine": "~2.8.8",
+    "@types/jasminewd2": "~2.0.3",
+    "codelyzer": "~4.5.0",
+    "jasmine-core": "~2.99.1",
+    "jasmine-spec-reporter": "~4.2.1",
+    "karma": "~3.0.0",
+    "karma-chrome-launcher": "~2.2.0",
+    "karma-coverage-istanbul-reporter": "~2.0.1",
+    "karma-jasmine": "~1.1.2",
+    "karma-jasmine-html-reporter": "^0.2.2",
+    "protractor": "~5.4.0",
+    "ts-node": "~7.0.0",
+    "tslint": "~5.11.0",
+    "typescript": "~3.1.6"
+  }
+}
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/app/app-routing.module.ts b/tests/legacy-cli/e2e/assets/7.0-project/src/app/app-routing.module.ts
new file mode 100644
index 000000000000..942c8098dc82
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/src/app/app-routing.module.ts
@@ -0,0 +1,10 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+const routes: Routes = [{ path: 'lazy', loadChildren: './lazy/lazy.module#LazyModule' }];
+
+@NgModule({
+  imports: [RouterModule.forRoot(routes)],
+  exports: [RouterModule]
+})
+export class AppRoutingModule { }
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/app/app.component.css b/tests/legacy-cli/e2e/assets/7.0-project/src/app/app.component.css
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/app/app.component.html b/tests/legacy-cli/e2e/assets/7.0-project/src/app/app.component.html
new file mode 100644
index 000000000000..1094e7ebdfb8
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/src/app/app.component.html
@@ -0,0 +1,21 @@
+<!--The content below is only a placeholder and can be replaced.-->
+<div style="text-align:center">
+  <h1>
+    Welcome to {{ title }}!
+  </h1>
+  <img width="300" alt="Angular Logo" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNTAgMjUwIj4KICAgIDxwYXRoIGZpbGw9IiNERDAwMzEiIGQ9Ik0xMjUgMzBMMzEuOSA2My4ybDE0LjIgMTIzLjFMMTI1IDIzMGw3OC45LTQzLjcgMTQuMi0xMjMuMXoiIC8+CiAgICA8cGF0aCBmaWxsPSIjQzMwMDJGIiBkPSJNMTI1IDMwdjIyLjItLjFWMjMwbDc4LjktNDMuNyAxNC4yLTEyMy4xTDEyNSAzMHoiIC8+CiAgICA8cGF0aCAgZmlsbD0iI0ZGRkZGRiIgZD0iTTEyNSA1Mi4xTDY2LjggMTgyLjZoMjEuN2wxMS43LTI5LjJoNDkuNGwxMS43IDI5LjJIMTgzTDEyNSA1Mi4xem0xNyA4My4zaC0zNGwxNy00MC45IDE3IDQwLjl6IiAvPgogIDwvc3ZnPg==">
+</div>
+<h2>Here are some links to help you start: </h2>
+<ul>
+  <li>
+    <h2><a target="_blank" rel="noopener" href="https://angular.io/tutorial">Tour of Heroes</a></h2>
+  </li>
+  <li>
+    <h2><a target="_blank" rel="noopener" href="https://github.com/angular/angular-cli/wiki">CLI Documentation</a></h2>
+  </li>
+  <li>
+    <h2><a target="_blank" rel="noopener" href="https://blog.angular.io/">Angular blog</a></h2>
+  </li>
+</ul>
+
+<router-outlet></router-outlet>
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/app/app.component.spec.ts b/tests/legacy-cli/e2e/assets/7.0-project/src/app/app.component.spec.ts
new file mode 100644
index 000000000000..14df92cc2d95
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/src/app/app.component.spec.ts
@@ -0,0 +1,35 @@
+import { TestBed, async } from '@angular/core/testing';
+import { RouterModule } from '@angular/router';
+import { AppComponent } from './app.component';
+
+describe('AppComponent', () => {
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [
+        AppComponent
+      ],
+      imports: [
+        RouterModule.forRoot([])
+      ],
+    }).compileComponents();
+  }));
+
+  it('should create the app', () => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.debugElement.componentInstance;
+    expect(app).toBeTruthy();
+  });
+
+  it(`should have as title 'seven-oh-project'`, () => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.debugElement.componentInstance;
+    expect(app.title).toEqual('seven-oh-project');
+  });
+
+  it('should render title in a h1 tag', () => {
+    const fixture = TestBed.createComponent(AppComponent);
+    fixture.detectChanges();
+    const compiled = fixture.debugElement.nativeElement;
+    expect(compiled.querySelector('h1').textContent).toContain('Welcome to seven-oh-project!');
+  });
+});
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/app/app.component.ts b/tests/legacy-cli/e2e/assets/7.0-project/src/app/app.component.ts
new file mode 100644
index 000000000000..156d6109afa3
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/src/app/app.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-root',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.css']
+})
+export class AppComponent {
+  title = 'seven-oh-project';
+}
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/app/app.module.ts b/tests/legacy-cli/e2e/assets/7.0-project/src/app/app.module.ts
new file mode 100644
index 000000000000..d718d9ba2b50
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/src/app/app.module.ts
@@ -0,0 +1,18 @@
+import { BrowserModule } from '@angular/platform-browser';
+import { NgModule } from '@angular/core';
+
+import { AppRoutingModule } from './app-routing.module';
+import { AppComponent } from './app.component';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    AppRoutingModule,
+  ],
+  providers: [],
+  bootstrap: [AppComponent]
+})
+export class AppModule { }
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy-comp/lazy-comp.component.css b/tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy-comp/lazy-comp.component.css
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy-comp/lazy-comp.component.html b/tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy-comp/lazy-comp.component.html
new file mode 100644
index 000000000000..77d85a09faef
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy-comp/lazy-comp.component.html
@@ -0,0 +1,3 @@
+<p>
+  lazy-comp works!
+</p>
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy-comp/lazy-comp.component.spec.ts b/tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy-comp/lazy-comp.component.spec.ts
new file mode 100644
index 000000000000..b8f42f6a5deb
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy-comp/lazy-comp.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { LazyCompComponent } from './lazy-comp.component';
+
+describe('LazyCompComponent', () => {
+  let component: LazyCompComponent;
+  let fixture: ComponentFixture<LazyCompComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ LazyCompComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(LazyCompComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy-comp/lazy-comp.component.ts b/tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy-comp/lazy-comp.component.ts
new file mode 100644
index 000000000000..ef413e598468
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy-comp/lazy-comp.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-lazy-comp',
+  templateUrl: './lazy-comp.component.html',
+  styleUrls: ['./lazy-comp.component.css']
+})
+export class LazyCompComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy-routing.module.ts b/tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy-routing.module.ts
new file mode 100644
index 000000000000..e5b323332e9e
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy-routing.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { LazyCompComponent } from './lazy-comp/lazy-comp.component';
+
+
+const routes: Routes = [{ path: '', component: LazyCompComponent }];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class LazyRoutingModule { }
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy.module.ts b/tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy.module.ts
new file mode 100644
index 000000000000..44f745b3ca84
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/src/app/lazy/lazy.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { LazyRoutingModule } from './lazy-routing.module';
+import { LazyCompComponent } from './lazy-comp/lazy-comp.component';
+
+@NgModule({
+  declarations: [LazyCompComponent],
+  imports: [
+    CommonModule,
+    LazyRoutingModule
+  ]
+})
+export class LazyModule { }
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/assets/.gitkeep b/tests/legacy-cli/e2e/assets/7.0-project/src/assets/.gitkeep
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/browserslist b/tests/legacy-cli/e2e/assets/7.0-project/src/browserslist
new file mode 100644
index 000000000000..37371cb04b9f
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/src/browserslist
@@ -0,0 +1,11 @@
+# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+#
+# For IE 9-11 support, please remove 'not' from the last line of the file and adjust as needed
+
+> 0.5%
+last 2 versions
+Firefox ESR
+not dead
+not IE 9-11
\ No newline at end of file
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/environments/environment.prod.ts b/tests/legacy-cli/e2e/assets/7.0-project/src/environments/environment.prod.ts
new file mode 100644
index 000000000000..3612073bc31c
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/src/environments/environment.prod.ts
@@ -0,0 +1,3 @@
+export const environment = {
+  production: true
+};
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/environments/environment.ts b/tests/legacy-cli/e2e/assets/7.0-project/src/environments/environment.ts
new file mode 100644
index 000000000000..7b4f817adb75
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/src/environments/environment.ts
@@ -0,0 +1,16 @@
+// This file can be replaced during build by using the `fileReplacements` array.
+// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
+// The list of file replacements can be found in `angular.json`.
+
+export const environment = {
+  production: false
+};
+
+/*
+ * For easier debugging in development mode, you can import the following file
+ * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
+ *
+ * This import should be commented out in production mode because it will have a negative impact
+ * on performance if an error is thrown.
+ */
+// import 'zone.js/dist/zone-error';  // Included with Angular CLI.
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/favicon.ico b/tests/legacy-cli/e2e/assets/7.0-project/src/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..8081c7ceaf2be08bf59010158c586170d9d2d517
GIT binary patch
literal 5430
zcmc(je{54#6vvCoAI3i*G5%$U7!sA3wtMZ$fH6V9C`=eXGJb@R1%(I_{vnZtpD{6n
z5Pl{DmxzBDbrB>}`90e12m8T*36WoeDLA&SD_hw{H^wM!cl_RWcVA!I+x87ee975;
z@4kD^=bYPn&pmG@(+JZ`rqQEKxW<}RzhW}I!|ulN=fmjVi@x{p$cC`)5$a!)X&U<D
zFCrQtlPskre}dB7oMCp>+blKNvN5tg=uLvuLnuqRM;Yc*swiexsoh#XPNu{9F#c`G
zQLe{yWA(Y6(;>y|-e<R78l|^`vH6ft-mErSG~Y`TZF2qm1=W=MNd^2V3)n2xIl=~X
zcQ9VjzHW38ty|rZz+bkcR(-c)`wbqC#l0CF>fAy11k<09(@Oo1B2@0`PtZSkqK&${
zgEY}`W@t{%?9u5rF?}Y7OL{338l<M%K~-+w4iJ-2C_>*JY#P!%MVQY@oqnItpZ}?s
z!r?*kwuR{A@jg2Chlf0^{q*>8n5Ir~YWf*wmsh7B5&EpHfd5@xVaj&gqsdui^spyL
zB|kUoblGoO7G(MuKTfa9?pGH0@QP^b#!lM1yHWLh*2iq#`C1TdrnO-d#?Oh@XV2HK
zKA{`eo{--^K&MW66Lgsktfvn#cCAc*(}qsfhrvOjMGLE?`dHVipu1J3Kgr%g?cNa8
z)pkmC8DGH~fG+dlrp(5^-QBeEvkOvv#q7MBVLtm2oD^$lJZx--_=K&Ttd=-krx(Bb
zcEoKJda@S!%%@`P-##$>*u%T*mh+QjV@)Qa=Mk1?#zLk+M4tIt%}wagT{5<jKE$zW
zf^v7jW~uUE-%mB7^CHH8TL1|_urI~hKTTLO4e;Zw7r~I(052QT!nq=k3BK4rWn{P1
zm1bHmzb3QsEPddOfehts!4+*he<-J0Tp_H*ozKD(I$*vEIRc5vL3kd@p{$kjMIKQs
z<pI0(Vu7$}v<2fENHCVA=ZgE(eBp=9a;_O`BkfrU-cm?UdhYP}+z)k)*4wQOW0K7S
zxLV9h7PeF2dOvMg->J%!tXAE;r{@=bb%nNVxvI+C+$t?!VJ@0d@HIyMJTI{vEw0Ul
ze(ha!e&qANbTL1ZneNl45t=#Ot??C0MHjjgY8%*mGisN|S6%g3;Hlx#fMNcL<87MW
zZ>6moo1YD?P!fJ#Jb(4)_cc50X5n0KoDYfdPoL^iV`k&o{LPyaoqMqk92wVM#_O0l
z09$(A-D+gVIlq4TA&{1T@BsUH`Bm=r#l$Z51J<A&BjWib@$s|gZJQqmbJQD%pmuqr
zlRi3r%o8I$s7b`Nd|6!*{)IIXevOQu?P#Tr`(a_yaC`Z3mz2%s0J*VP!oMryv%aGJ
zJ%+hr;JUR9N%=NQUAcsxH1Ev(z=Jw5x*3ZP^w64B9T1;d$FN#v|K3{yO?U3}p#~CX
zQeul5J0S-k&QP-WS^uxU^lJ9qPEkik*MChluj|;LEt~#I8atbRn<NLMVzYM(P(Mc^
z+=Vcf!|a)D*bAJ$B)>-U&F32+hfUP-iLo=jg7Xmy+WLq6_tWv&`wDlz#`&)Jp~iQf
zZP)tu>}pIIJKuw+$&t}GQuqMd%Z>0?t%&BM&W<om&b&wS^Ui5`y0`bK`dz>o^4P^Y
z)c6h^f2R>X8*}q|bblAF?@;%?2>$y+cMQbN{X$)^R>v<j%HOoXFL3nF-$ASizAu7L
zA~a)K^qdiKCTsOM0PF^%{K=Uu<ZEZkC-ypeB>tNq_5AB|0N5U*d^T?X9{xQnJYeU{
zoZL#obI;~Pp95f1`%X3D$Mh*4^?O?IT~7HqlWguezmg?Ybq|7>qQ(@pPHbE9V?f|(
z+0xo!#m@Np9PljsyxBY-UA*{U*la#8Wz2sO|48_-5t8%_!n?S$zlGe+NA%?vmxjS-
zHE5O3ZarU=X}$7>;Okp(UWXJxI%G_J-@IH;%5#Rt$(WUX?6*Ux!IRd$dLP6+SmPn=
z8zjm4jGjN772R{FGkXwcNv8GBcZI#@Y2m{RNF_w8(Z%^A*!bS*!}s6sh*NnURytky
humW;*g7R+&|Ledvc-<M)bUEqtWbbwV3iw}c{{uEu@7@3a

literal 0
HcmV?d00001

diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/index.html b/tests/legacy-cli/e2e/assets/7.0-project/src/index.html
new file mode 100644
index 000000000000..18e71f811dcc
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/src/index.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>SevenOhProject</title>
+  <base href="/">
+
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" type="image/x-icon" href="favicon.ico">
+</head>
+<body>
+  <app-root></app-root>
+</body>
+</html>
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/karma.conf.js b/tests/legacy-cli/e2e/assets/7.0-project/src/karma.conf.js
new file mode 100644
index 000000000000..b6e00421c95f
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/src/karma.conf.js
@@ -0,0 +1,31 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+  config.set({
+    basePath: '',
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
+    plugins: [
+      require('karma-jasmine'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-html-reporter'),
+      require('karma-coverage-istanbul-reporter'),
+      require('@angular-devkit/build-angular/plugins/karma')
+    ],
+    client: {
+      clearContext: false // leave Jasmine Spec Runner output visible in browser
+    },
+    coverageIstanbulReporter: {
+      dir: require('path').join(__dirname, '../coverage'),
+      reports: ['html', 'lcovonly'],
+      fixWebpackSourcePaths: true
+    },
+    reporters: ['progress', 'kjhtml'],
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: true,
+    browsers: ['Chrome'],
+    singleRun: false
+  });
+};
\ No newline at end of file
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/main.ts b/tests/legacy-cli/e2e/assets/7.0-project/src/main.ts
new file mode 100644
index 000000000000..c7b673cf44b3
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/src/main.ts
@@ -0,0 +1,12 @@
+import { enableProdMode } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app/app.module';
+import { environment } from './environments/environment';
+
+if (environment.production) {
+  enableProdMode();
+}
+
+platformBrowserDynamic().bootstrapModule(AppModule)
+  .catch(err => console.error(err));
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/polyfills.ts b/tests/legacy-cli/e2e/assets/7.0-project/src/polyfills.ts
new file mode 100644
index 000000000000..ee8b84da807c
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/src/polyfills.ts
@@ -0,0 +1,80 @@
+/**
+ * This file includes polyfills needed by Angular and is loaded before the app.
+ * You can add your own extra polyfills to this file.
+ *
+ * This file is divided into 2 sections:
+ *   1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
+ *   2. Application imports. Files imported after ZoneJS that should be loaded before your main
+ *      file.
+ *
+ * The current setup is for so-called "evergreen" browsers; the last versions of browsers that
+ * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
+ * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
+ *
+ * Learn more in https://angular.io/guide/browser-support
+ */
+
+/***************************************************************************************************
+ * BROWSER POLYFILLS
+ */
+
+/** IE9, IE10 and IE11 requires all of the following polyfills. **/
+// import 'core-js/es6/symbol';
+// import 'core-js/es6/object';
+// import 'core-js/es6/function';
+// import 'core-js/es6/parse-int';
+// import 'core-js/es6/parse-float';
+// import 'core-js/es6/number';
+// import 'core-js/es6/math';
+// import 'core-js/es6/string';
+// import 'core-js/es6/date';
+// import 'core-js/es6/array';
+// import 'core-js/es6/regexp';
+// import 'core-js/es6/map';
+// import 'core-js/es6/weak-map';
+// import 'core-js/es6/set';
+
+/**
+ * If the application will be indexed by Google Search, the following is required.
+ * Googlebot uses a renderer based on Chrome 41.
+ * https://developers.google.com/search/docs/guides/rendering
+ **/
+// import 'core-js/es6/array';
+
+/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+// import 'classlist.js';  // Run `npm install --save classlist.js`.
+
+/** IE10 and IE11 requires the following for the Reflect API. */
+// import 'core-js/es6/reflect';
+
+/**
+ * Web Animations `@angular/platform-browser/animations`
+ * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
+ * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
+ **/
+// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
+
+/**
+ * By default, zone.js will patch all possible macroTask and DomEvents
+ * user can disable parts of macroTask/DomEvents patch by setting following flags
+ */
+
+ // (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
+ // (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
+ // (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
+
+ /*
+ * in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
+ * with the following flag, it will bypass `zone.js` patch for IE/Edge
+ */
+// (window as any).__Zone_enable_cross_context_check = true;
+
+/***************************************************************************************************
+ * Zone JS is required by default for Angular itself.
+ */
+import 'zone.js/dist/zone';  // Included with Angular CLI.
+
+
+/***************************************************************************************************
+ * APPLICATION IMPORTS
+ */
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/styles.css b/tests/legacy-cli/e2e/assets/7.0-project/src/styles.css
new file mode 100644
index 000000000000..90d4ee0072ce
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/src/styles.css
@@ -0,0 +1 @@
+/* You can add global styles to this file, and also import other style files */
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/test.ts b/tests/legacy-cli/e2e/assets/7.0-project/src/test.ts
new file mode 100644
index 000000000000..16317897b1c5
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/src/test.ts
@@ -0,0 +1,20 @@
+// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+
+import 'zone.js/dist/zone-testing';
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting
+} from '@angular/platform-browser-dynamic/testing';
+
+declare const require: any;
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting()
+);
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/tsconfig.app.json b/tests/legacy-cli/e2e/assets/7.0-project/src/tsconfig.app.json
new file mode 100644
index 000000000000..190fd300b601
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/src/tsconfig.app.json
@@ -0,0 +1,11 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/app",
+    "types": []
+  },
+  "exclude": [
+    "test.ts",
+    "**/*.spec.ts"
+  ]
+}
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/tsconfig.spec.json b/tests/legacy-cli/e2e/assets/7.0-project/src/tsconfig.spec.json
new file mode 100644
index 000000000000..de7733630eb2
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/src/tsconfig.spec.json
@@ -0,0 +1,18 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/spec",
+    "types": [
+      "jasmine",
+      "node"
+    ]
+  },
+  "files": [
+    "test.ts",
+    "polyfills.ts"
+  ],
+  "include": [
+    "**/*.spec.ts",
+    "**/*.d.ts"
+  ]
+}
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/src/tslint.json b/tests/legacy-cli/e2e/assets/7.0-project/src/tslint.json
new file mode 100644
index 000000000000..52e2c1a5a74c
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/src/tslint.json
@@ -0,0 +1,17 @@
+{
+    "extends": "../tslint.json",
+    "rules": {
+        "directive-selector": [
+            true,
+            "attribute",
+            "app",
+            "camelCase"
+        ],
+        "component-selector": [
+            true,
+            "element",
+            "app",
+            "kebab-case"
+        ]
+    }
+}
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/tsconfig.json b/tests/legacy-cli/e2e/assets/7.0-project/tsconfig.json
new file mode 100644
index 000000000000..46aeded1b278
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/tsconfig.json
@@ -0,0 +1,21 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
+    "declaration": false,
+    "module": "es2015",
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "target": "es5",
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+    "lib": [
+      "es2018",
+      "dom"
+    ]
+  }
+}
diff --git a/tests/legacy-cli/e2e/assets/7.0-project/tslint.json b/tests/legacy-cli/e2e/assets/7.0-project/tslint.json
new file mode 100644
index 000000000000..6ddb6b293151
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/7.0-project/tslint.json
@@ -0,0 +1,131 @@
+{
+  "rulesDirectory": [
+    "node_modules/codelyzer"
+  ],
+  "rules": {
+    "arrow-return-shorthand": true,
+    "callable-types": true,
+    "class-name": true,
+    "comment-format": [
+      true,
+      "check-space"
+    ],
+    "curly": true,
+    "deprecation": {
+      "severity": "warn"
+    },
+    "eofline": true,
+    "forin": true,
+    "import-blacklist": [
+      true,
+      "rxjs/Rx"
+    ],
+    "import-spacing": true,
+    "indent": [
+      true,
+      "spaces"
+    ],
+    "interface-over-type-literal": true,
+    "label-position": true,
+    "max-line-length": [
+      true,
+      140
+    ],
+    "member-access": false,
+    "member-ordering": [
+      true,
+      {
+        "order": [
+          "static-field",
+          "instance-field",
+          "static-method",
+          "instance-method"
+        ]
+      }
+    ],
+    "no-arg": true,
+    "no-bitwise": true,
+    "no-console": [
+      true,
+      "debug",
+      "info",
+      "time",
+      "timeEnd",
+      "trace"
+    ],
+    "no-construct": true,
+    "no-debugger": true,
+    "no-duplicate-super": true,
+    "no-empty": false,
+    "no-empty-interface": true,
+    "no-eval": true,
+    "no-inferrable-types": [
+      true,
+      "ignore-params"
+    ],
+    "no-misused-new": true,
+    "no-non-null-assertion": true,
+    "no-redundant-jsdoc": true,
+    "no-shadowed-variable": true,
+    "no-string-literal": false,
+    "no-string-throw": true,
+    "no-switch-case-fall-through": true,
+    "no-trailing-whitespace": true,
+    "no-unnecessary-initializer": true,
+    "no-unused-expression": true,
+    "no-use-before-declare": true,
+    "no-var-keyword": true,
+    "object-literal-sort-keys": false,
+    "one-line": [
+      true,
+      "check-open-brace",
+      "check-catch",
+      "check-else",
+      "check-whitespace"
+    ],
+    "prefer-const": true,
+    "quotemark": [
+      true,
+      "single"
+    ],
+    "radix": true,
+    "semicolon": [
+      true,
+      "always"
+    ],
+    "triple-equals": [
+      true,
+      "allow-null-check"
+    ],
+    "typedef-whitespace": [
+      true,
+      {
+        "call-signature": "nospace",
+        "index-signature": "nospace",
+        "parameter": "nospace",
+        "property-declaration": "nospace",
+        "variable-declaration": "nospace"
+      }
+    ],
+    "unified-signatures": true,
+    "variable-name": false,
+    "whitespace": [
+      true,
+      "check-branch",
+      "check-decl",
+      "check-operator",
+      "check-separator",
+      "check-type"
+    ],
+    "no-output-on-prefix": true,
+    "use-input-property-decorator": true,
+    "use-output-property-decorator": true,
+    "use-host-property-decorator": true,
+    "no-input-rename": true,
+    "no-output-rename": true,
+    "use-life-cycle-interface": true,
+    "use-pipe-transform-interface": true,
+    "component-class-suffix": true,
+    "directive-class-suffix": true
+  }
+}
diff --git a/tests/legacy-cli/e2e/tests/basic/update-1.0.ts b/tests/legacy-cli/e2e/tests/basic/update-1.0.ts
index 71342bca898f..2d1ce42766ee 100644
--- a/tests/legacy-cli/e2e/tests/basic/update-1.0.ts
+++ b/tests/legacy-cli/e2e/tests/basic/update-1.0.ts
@@ -1,7 +1,7 @@
 import { createProjectFromAsset } from '../../utils/assets';
 import { ng, silentNpm } from '../../utils/process';
 import {
-  isPrereleaseCli, removeHttpDep, useBuiltPackages, useCIChrome, useCIDefaults,
+  isPrereleaseCli, useBuiltPackages, useCIChrome, useCIDefaults,
 } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
 
@@ -15,7 +15,6 @@ export default async function () {
   await ng('update', '@angular/cli');
   await useBuiltPackages();
   await silentNpm('install');
-  await removeHttpDep();
   await ng('update', '@angular/core', ...extraUpdateArgs);
   await useCIDefaults('one-oh-project');
   await ng('generate', 'component', 'my-comp');
diff --git a/tests/legacy-cli/e2e/tests/basic/update-1.7-longhand.ts b/tests/legacy-cli/e2e/tests/basic/update-1.7-longhand.ts
index 2ca3a22d9745..2bfad4c5e740 100644
--- a/tests/legacy-cli/e2e/tests/basic/update-1.7-longhand.ts
+++ b/tests/legacy-cli/e2e/tests/basic/update-1.7-longhand.ts
@@ -1,6 +1,6 @@
 import { createProjectFromAsset } from '../../utils/assets';
 import { ng, silentNpm } from '../../utils/process';
-import { isPrereleaseCli, removeHttpDep, useBuiltPackages } from '../../utils/project';
+import { isPrereleaseCli, useBuiltPackages } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
 
 
@@ -12,7 +12,6 @@ export default async function () {
   await ng('update', '@angular/cli', '--migrate-only', '--from=1.7.1');
   await useBuiltPackages();
   await silentNpm('install');
-  await removeHttpDep();
   await ng('update', '@angular/core', ...extraUpdateArgs);
   await ng('build');
 }
diff --git a/tests/legacy-cli/e2e/tests/basic/update-1.7.ts b/tests/legacy-cli/e2e/tests/basic/update-1.7.ts
index 6abafddee0fd..e1c43b888247 100644
--- a/tests/legacy-cli/e2e/tests/basic/update-1.7.ts
+++ b/tests/legacy-cli/e2e/tests/basic/update-1.7.ts
@@ -1,7 +1,7 @@
 import { createProjectFromAsset } from '../../utils/assets';
 import { ng, silentNpm } from '../../utils/process';
 import {
-  isPrereleaseCli, removeHttpDep, useBuiltPackages, useCIChrome, useCIDefaults,
+  isPrereleaseCli, useBuiltPackages, useCIChrome, useCIDefaults,
 } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
 
@@ -15,7 +15,6 @@ export default async function () {
   await ng('update', '@angular/cli');
   await useBuiltPackages();
   await silentNpm('install');
-  await removeHttpDep();
   await ng('update', '@angular/core', ...extraUpdateArgs);
   await useCIDefaults('latest-project');
   await ng('generate', 'component', 'my-comp');
diff --git a/tests/legacy-cli/e2e/tests/basic/update-7.0.ts b/tests/legacy-cli/e2e/tests/basic/update-7.0.ts
new file mode 100644
index 000000000000..1309dc9f8b4f
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/basic/update-7.0.ts
@@ -0,0 +1,63 @@
+import { createProjectFromAsset } from '../../utils/assets';
+import { expectFileMatchToExist, expectFileToExist, expectFileToMatch } from '../../utils/fs';
+import { ng, noSilentNg, silentNpm } from '../../utils/process';
+import {
+  isPrereleaseCli, useBuiltPackages, useCIChrome, useCIDefaults,
+} from '../../utils/project';
+import { expectToFail } from '../../utils/utils';
+
+
+export default async function () {
+  const extraUpdateArgs = await isPrereleaseCli() ? ['--next', '--force'] : [];
+
+  // Create new project from previous version files.
+  // We must use the original NPM packages to force a real update.
+  // This also means that we can only truly test updates after a release.
+  await createProjectFromAsset('7.0-project', true);
+
+  // Update the CLI.
+  // Users of CLI <7.2 will see the following warnings:
+  //   packageGroup metadata of package @angular/cli is malformed. Ignoring.
+  // This is expected since the format changed in 7.2.
+  await ng('update', '@angular/cli', ...extraUpdateArgs);
+
+  // Test CLI migrations.
+  // Should update the lazy route syntax via update-lazy-module-paths.
+  await expectFileToMatch('src/app/app-routing.module.ts',
+    `loadChildren: () => import('./lazy/lazy.module').then(m => m.LazyModule)`);
+  // Should update tsconfig and src/browserslist via differential-loading.
+  await expectFileToMatch('tsconfig.json', `"target": "es2015",`);
+  await expectFileToMatch('browserslist', `\nChrome 41`);
+  await expectToFail(() => expectFileToExist('e2e/browserlist'));
+  // Should update the build-angular version.
+  await expectFileToMatch('package.json', `"@angular-devkit/build-angular": "~0.8`);
+  // Should rename codelyzer rules.
+  await expectFileToMatch('tslint.json', `use-lifecycle-interface`);
+  // Unnecessary es6 polyfills should be removed via drop-es6-polyfills.
+  // TODO: uncomment after https://github.com/angular/angular-cli/issues/14234 is fixed.
+  // await expectToFail(() => expectFileToMatch('src/polyfills.ts',
+  //  `import 'core-js/es6/symbol';`));
+  // await expectToFail(() => expectFileToMatch('src/polyfills.ts', `import 'core-js/es6/set';`));
+
+  // Use the packages we are building in this commit, and CI Chrome.
+  await useBuiltPackages();
+  await useCIChrome('src/');
+  await useCIChrome('e2e/');
+  await useCIDefaults('seven-oh-project');
+  await silentNpm('install');
+
+  // Update Angular.
+  await ng('update', '@angular/core', ...extraUpdateArgs);
+
+  // Run CLI commands.
+  await ng('generate', 'component', 'my-comp');
+  await ng('test', '--watch=false');
+  await ng('lint');
+  await ng('e2e');
+  await ng('e2e', '--prod');
+
+  // Verify project now creates bundles for differential loading.
+  await noSilentNg('build', '--prod');
+  await expectFileMatchToExist('dist/seven-oh-project/', /main-es5\.[0-9a-f]{20}\.js/);
+  await expectFileMatchToExist('dist/seven-oh-project/', /main-es2015\.[0-9a-f]{20}\.js/);
+}
diff --git a/tests/legacy-cli/e2e/utils/assets.ts b/tests/legacy-cli/e2e/utils/assets.ts
index 83266c792b29..bed540b5bb6c 100644
--- a/tests/legacy-cli/e2e/utils/assets.ts
+++ b/tests/legacy-cli/e2e/utils/assets.ts
@@ -39,10 +39,10 @@ export function copyAssets(assetName: string) {
 }
 
 
-export function createProjectFromAsset(assetName: string) {
+export function createProjectFromAsset(assetName: string, useNpmPackages = false) {
   return Promise.resolve()
     .then(() => copyAssets(assetName))
     .then(dir => process.chdir(dir))
-    .then(() => useBuiltPackages())
+    .then(() => useNpmPackages ? null : useBuiltPackages())
     .then(() => silentNpm('install'));
 }
diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts
index 80af4e9b5097..df27b4fd027f 100644
--- a/tests/legacy-cli/e2e/utils/project.ts
+++ b/tests/legacy-cli/e2e/utils/project.ts
@@ -503,7 +503,3 @@ export async function isPrereleaseCli() {
 
   return prerelease(angularCliPkgJson.version).length > 0;
 }
-
-export async function removeHttpDep() {
-  await updateJsonFile('package.json', json => { delete json['dependencies']['@angular/http']; });
-}

From e1269cb520871ee29b1a4eec6e6c0e4a94f0b5fc Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 23 Apr 2019 10:10:26 +0200
Subject: [PATCH 1238/1703] build: use ts-api-guardian from npm

---
 WORKSPACE     | 14 --------------
 etc/api/BUILD |  2 +-
 package.json  |  1 +
 yarn.lock     | 11 ++++++++++-
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 746d1a21c301..7674029bba46 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -9,14 +9,6 @@ http_archive(
     urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.27.7/rules_nodejs-0.27.7.tar.gz"],
 )
 
-# TS API Guardian resides in Angular
-http_archive(
-    name = "angular",
-    sha256 = "6af15858f480438a9ca3fa8eaf4fdf993ccae878b834f3ea72fa8442f76b73c2",
-    strip_prefix = "angular-7.2.9",
-    url = "https://github.com/angular/angular/archive/7.2.9.zip",
-)
-
 # We use protocol buffers for the Build Event Protocol
 git_repository(
     name = "com_google_protobuf",
@@ -88,9 +80,3 @@ rules_karma_dependencies()
 load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories")
 
 web_test_repositories()
-
-yarn_install(
-    name = "ts-api-guardian_deps",
-    package_json = "@angular//tools/ts-api-guardian:package.json",
-    yarn_lock = "@angular//tools/ts-api-guardian:yarn.lock",
-)
diff --git a/etc/api/BUILD b/etc/api/BUILD
index cd8577ba9d76..3a10d4e9fb48 100644
--- a/etc/api/BUILD
+++ b/etc/api/BUILD
@@ -1,4 +1,4 @@
-load("@angular//tools/ts-api-guardian:index.bzl", "ts_api_guardian_test")
+load("@npm_ts_api_guardian//:index.bzl", "ts_api_guardian_test")
 
 [ts_api_guardian_test(
     name = "%s_%s_%sapi" % (
diff --git a/package.json b/package.json
index a83b727c343a..ce71485c85bb 100644
--- a/package.json
+++ b/package.json
@@ -135,6 +135,7 @@
     "tar": "^4.4.4",
     "through2": "^2.0.3",
     "tree-kill": "^1.2.0",
+    "ts-api-guardian": "0.4.2",
     "ts-node": "^5.0.0",
     "tslint-no-circular-imports": "^0.6.0",
     "tslint-sonarts": "1.9.0"
diff --git a/yarn.lock b/yarn.lock
index aaac7d55e7aa..3f7a9235ca51 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3058,7 +3058,7 @@ diagnostics@^1.1.1:
     enabled "1.0.x"
     kuler "1.0.x"
 
-diff@^3.1.0, diff@^3.2.0:
+diff@^3.1.0, diff@^3.2.0, diff@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
   integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
@@ -9480,6 +9480,15 @@ triple-beam@^1.2.0, triple-beam@^1.3.0:
   resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9"
   integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==
 
+ts-api-guardian@0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/ts-api-guardian/-/ts-api-guardian-0.4.2.tgz#c3d01747f112f2ec049906f63223c6bbb777af59"
+  integrity sha512-ewfaxuSATse2BxRgX2qdOui6DG9+gvlbCjr7L122LzjxlqAFZnqDY9HR0ID768vQbm0aBfyK/jDLgH1vQtpkew==
+  dependencies:
+    chalk "^2.3.1"
+    diff "^3.5.0"
+    minimist "^1.2.0"
+
 ts-node@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-5.0.1.tgz#78e5d1cb3f704de1b641e43b76be2d4094f06f81"

From a1c87dd57778bbc230d1aad99bbc2148eb2d6bc8 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 23 Apr 2019 16:01:18 +0200
Subject: [PATCH 1239/1703] docs: update contributing to use bazel from npm

---
 CONTRIBUTING.md                    | 6 +++---
 scripts/templates/contributing.ejs | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 43f412193d60..6072228db9a3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -284,18 +284,18 @@ To test if your change effect the public API you need to run the API guardian on
 For example in case `@angular-devkit/core` package was modified you need to run:
 
 ```bash
-bazel test //etc/api:angular_devkit_core_api
+yarn bazel test //etc/api:angular_devkit_core_api
 ```
 
 You can also test all packages by running:
 ```bash
-bazel test //etc/api ...
+yarn bazel test //etc/api ...
 ```
 
 If you modified the public API, the test will fail. To update the golden files you need to run:
 
 ```bash
-bazel run //etc/api:angular_devkit_core_api.accept
+yarn bazel run //etc/api:angular_devkit_core_api.accept
 ```
 
 **Note**: In some cases we use aliased symbols to create namespaces.
diff --git a/scripts/templates/contributing.ejs b/scripts/templates/contributing.ejs
index 2b8b9f709377..0690555ada9f 100644
--- a/scripts/templates/contributing.ejs
+++ b/scripts/templates/contributing.ejs
@@ -273,18 +273,18 @@ To test if your change effect the public API you need to run the API guardian on
 For example in case `@angular-devkit/core` package was modified you need to run:
 
 ```bash
-bazel test //etc/api:angular_devkit_core_api
+yarn bazel test //etc/api:angular_devkit_core_api
 ```
 
 You can also test all packages by running:
 ```bash
-bazel test //etc/api ...
+yarn bazel test //etc/api ...
 ```
 
 If you modified the public API, the test will fail. To update the golden files you need to run:
 
 ```bash
-bazel run //etc/api:angular_devkit_core_api.accept
+yarn bazel run //etc/api:angular_devkit_core_api.accept
 ```
 
 **Note**: In some cases we use aliased symbols to create namespaces.

From a53b2066035608824a4fdba81c447311ed937bcb Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 23 Apr 2019 17:23:50 +0000
Subject: [PATCH 1240/1703] build: update open to version 6.2.0

---
 packages/angular/cli/package.json                  | 2 +-
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index d2117177c907..28e8b204ac15 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -35,7 +35,7 @@
     "ini": "1.3.5",
     "inquirer": "6.3.1",
     "npm-package-arg": "6.1.0",
-    "open": "6.1.0",
+    "open": "6.2.0",
     "pacote": "9.5.0",
     "semver": "6.0.0",
     "symbol-observable": "1.2.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index a48ff45863c2..a09a7f0dda19 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -31,7 +31,7 @@
     "mini-css-extract-plugin": "0.6.0",
     "minimatch": "3.0.4",
     "parse5": "4.0.0",
-    "open": "6.1.0",
+    "open": "6.2.0",
     "postcss": "7.0.14",
     "postcss-import": "12.0.1",
     "postcss-loader": "3.0.0",
diff --git a/yarn.lock b/yarn.lock
index 3f7a9235ca51..52af4e282293 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6770,10 +6770,10 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-open@6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-6.1.0.tgz#0e7e671b883976a4e5251b5d1ca905ab6f4be78f"
-  integrity sha512-Vqch7NFb/WsMujhqfq+B3u0xkssRjZlxh+NSsBSphpcgaFD7gfB0SUBfR91E9ygBlyNGNogXR2cUB8rRfoo2kQ==
+open@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.2.0.tgz#7cf92cb961b5d8498b071e64098bf5e27f57230c"
+  integrity sha512-Vxf6HJkwrqmvh9UAID3MnMYXntbTxKLOSfOnO7LJdzPf3NE3KQYFNV0/Lcz2VAndbRFil58XVCyh8tiX11fiYw==
   dependencies:
     is-wsl "^1.1.0"
 

From adf46c2bd5b03c3ceeb51f6294850398e440d5d6 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 24 Apr 2019 11:40:19 +0100
Subject: [PATCH 1241/1703] fix(@angular-devkit/build-angular): pass system
 path to readTsconfig

---
 .../src/angular-cli-files/utilities/read-tsconfig.ts      | 8 ++++++++
 .../angular_devkit/build_angular/src/browser/index.ts     | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/read-tsconfig.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/read-tsconfig.ts
index 52aff15e8901..e4c607d7d294 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/read-tsconfig.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/read-tsconfig.ts
@@ -16,5 +16,13 @@ export function readTsconfig(tsconfigPath: string) {
   const configResult = projectTs.readConfigFile(tsconfigPath, projectTs.sys.readFile);
   const tsConfig = projectTs.parseJsonConfigFileContent(configResult.config, projectTs.sys,
     path.dirname(tsconfigPath), undefined, tsconfigPath);
+
+  if (tsConfig.errors.length > 0) {
+    throw new Error(
+      `Errors found while reading ${tsconfigPath}:\n  ${
+        tsConfig.errors.map(e => e.messageText).join('\n  ')
+      }`
+    )
+  }
   return tsConfig;
 }
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 148cf737f325..e08886c6eb8d 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -13,6 +13,7 @@ import {
 import { BuildResult, WebpackLoggingCallback, runWebpack } from '@angular-devkit/build-webpack';
 import {
   experimental,
+  getSystemPath,
   join,
   json,
   logging,
@@ -185,7 +186,7 @@ export function buildWebpackBrowser(
         normalize(workspace.getProject(projectName).root),
       );
 
-      const tsConfigPath = path.resolve(workspace.root, options.tsConfig);
+      const tsConfigPath = path.resolve(getSystemPath(workspace.root), options.tsConfig);
       const tsConfig = readTsconfig(tsConfigPath);
 
       if (isEs5SupportNeeded(projectRoot) &&

From 9a9939fc4eb92f50241bc1e46b6623505a587bc5 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 16 Apr 2019 15:13:48 +0100
Subject: [PATCH 1242/1703] fix(@angular-devkit/build-angular): remove
 pure_getters

When we first started using Build Optimizer, we saw a lot of the savings were tied to using the Uglify/Terser `pure_getters` option.

This was intimately related with the structure and shape of the Angular codebase. The measurements we did at the time on angular.io showed a significant size reduction, from 1mb to about 600kb. Of these roughly 150kb were tied to using `pure_getters` if I remember correctly.

Meanwhile the Angular codebase has changed significantly and I don't really see these savings anymore, so I don't think it makes sense to keep it on given that it is known to cause problems with some libraries.

Closes #9231, #11439, #12096, #12128.
---
 .../models/webpack-configs/common.ts          | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 83aec5da24fb..70d970236842 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -263,25 +263,16 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
         comments: false,
         webkit: true,
       },
-
-      // On server, we don't want to compress anything. We still set the ngDevMode = false for it
-      // to remove dev code, and ngI18nClosureMode to remove Closure compiler i18n code
-      compress: (buildOptions.platform == 'server' ? {
+      compress: {
+        // PURE comments work best with 3 passes.
+        // See https://github.com/webpack/webpack/issues/2899#issuecomment-317425926.
+        passes: 3,
         global_defs: {
           ngDevMode: false,
           ngI18nClosureMode: false,
         },
-      } : {
-          pure_getters: buildOptions.buildOptimizer,
-          // PURE comments work best with 3 passes.
-          // See https://github.com/webpack/webpack/issues/2899#issuecomment-317425926.
-          passes: buildOptions.buildOptimizer ? 3 : 1,
-          global_defs: {
-            ngDevMode: false,
-            ngI18nClosureMode: false,
-          },
-        }),
-      // We also want to avoid mangling on server.
+      },
+      // We want to avoid mangling on server.
       ...(buildOptions.platform == 'server' ? { mangle: false } : {}),
     };
 

From c8b4f4a57c864462397ab5533cbc15b8ba30b1fb Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 24 Apr 2019 10:27:51 +0100
Subject: [PATCH 1243/1703] build: update to Angular 8.0.0-beta.14

---
 package.json                                  |  4 +-
 .../angular_devkit/build_angular/package.json | 20 ++---
 .../build_ng_packagr/package.json             |  4 +-
 packages/ngtools/webpack/package.json         |  4 +-
 yarn.lock                                     | 80 +++++++++----------
 5 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/package.json b/package.json
index ce71485c85bb..a0c2126e937d 100644
--- a/package.json
+++ b/package.json
@@ -80,8 +80,8 @@
     "typescript": "3.4.4"
   },
   "devDependencies": {
-    "@angular/compiler": "^8.0.0-beta.12",
-    "@angular/compiler-cli": "^8.0.0-beta.12",
+    "@angular/compiler": "^8.0.0-beta.14",
+    "@angular/compiler-cli": "^8.0.0-beta.14",
     "@bazel/bazel": "0.24.1",
     "@bazel/buildifier": "^0.22.0",
     "@bazel/jasmine": "~0.26.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index a09a7f0dda19..c7ba522fbbfd 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -58,18 +58,18 @@
     "worker-plugin": "3.1.0"
   },
   "devDependencies": {
-    "@angular/animations": "^8.0.0-beta.12",
+    "@angular/animations": "^8.0.0-beta.14",
     "@angular/cdk": "^7.3.4",
-    "@angular/common": "^8.0.0-beta.12",
-    "@angular/compiler": "^8.0.0-beta.12",
-    "@angular/compiler-cli": "^8.0.0-beta.12",
-    "@angular/core": "^8.0.0-beta.12",
+    "@angular/common": "^8.0.0-beta.14",
+    "@angular/compiler": "^8.0.0-beta.14",
+    "@angular/compiler-cli": "^8.0.0-beta.14",
+    "@angular/core": "^8.0.0-beta.14",
     "@angular/material": "^7.3.4",
-    "@angular/platform-browser": "^8.0.0-beta.12",
-    "@angular/platform-browser-dynamic": "^8.0.0-beta.12",
-    "@angular/platform-server": "^8.0.0-beta.12",
-    "@angular/router": "^8.0.0-beta.12",
-    "@angular/service-worker": "^8.0.0-beta.12",
+    "@angular/platform-browser": "^8.0.0-beta.14",
+    "@angular/platform-browser-dynamic": "^8.0.0-beta.14",
+    "@angular/platform-server": "^8.0.0-beta.14",
+    "@angular/router": "^8.0.0-beta.14",
+    "@angular/service-worker": "^8.0.0-beta.14",
     "codelyzer": "^5.0.0",
     "bootstrap": "^4.0.0",
     "font-awesome": "^4.7.0",
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index 686e581c164a..3a2629835ed7 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -14,8 +14,8 @@
     "ng-packagr": "^4.0.0 || ^5.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "^8.0.0-beta.12",
-    "@angular/compiler-cli": "^8.0.0-beta.12",
+    "@angular/compiler": "^8.0.0-beta.14",
+    "@angular/compiler-cli": "^8.0.0-beta.14",
     "@angular-devkit/core": "0.0.0",
     "ng-packagr": "^5.1.0",
     "tslib": "^1.9.0"
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index c348378e73d2..3e6f3be2e755 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -33,8 +33,8 @@
     "webpack": "^4.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "^8.0.0-beta.12",
-    "@angular/compiler-cli": "^8.0.0-beta.12",
+    "@angular/compiler": "^8.0.0-beta.14",
+    "@angular/compiler-cli": "^8.0.0-beta.14",
     "typescript": "3.4.4",
     "webpack": "4.30.0"
   }
diff --git a/yarn.lock b/yarn.lock
index 52af4e282293..c7f2e34ec12a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@angular/animations@^8.0.0-beta.12":
-  version "8.0.0-beta.12"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0-beta.12.tgz#b919b204c5523e4377aff9d2661d0b7324d85874"
-  integrity sha512-FHr7/ijyYZ/4VNKxS7Cm6OT4OW7wzfQu15XUx//MTlIV2qeHSxCQWOQ4GjlFQRRiYdjZ261dl3a0ZJQslatPAw==
+"@angular/animations@^8.0.0-beta.14":
+  version "8.0.0-beta.14"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0-beta.14.tgz#50259f6f3c97101183216e8311b8c0875c4356c3"
+  integrity sha512-ihYHQXEbjzemjJxJV4p2XAWOD9H4r8HpfNekxxelgj2RyZhrMQStzL+PEKxHHlGn167HuZz5YEoW4MXGflTtsA==
   dependencies:
     tslib "^1.9.0"
 
@@ -18,17 +18,17 @@
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/common@^8.0.0-beta.12":
-  version "8.0.0-beta.12"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0-beta.12.tgz#dbdb5de68e1950003fb18e4288e1d5a73964ad52"
-  integrity sha512-SQnOj0cvV6hDwTxyhz1tXD4j6hqy8jj/xwYHiqZ+pSMMSEB1C4cf8y0ukFJzVNvWUqZCjZUmG6OY7Ta0IqJ2Yg==
+"@angular/common@^8.0.0-beta.14":
+  version "8.0.0-beta.14"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0-beta.14.tgz#a27efe0b3e38e38f0e481a2a3f8cad026823b39d"
+  integrity sha512-4mBGXb+VyakX+YqAAfDsYrlKmjDcyD0BjmWi1u7aTJgf5QmEvFD4QLXzHoWEsmBFnTgoFHXMtXogF04GXy3kuA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^8.0.0-beta.12":
-  version "8.0.0-beta.12"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0-beta.12.tgz#43e3beb1e5249aef03912e7e403005eb4be1ae4a"
-  integrity sha512-WehBHOrP2PoaXA/F9pEuy+EsC+GBKsuOSe+OPZ1LVmUrboLdtTA1Z6/MURNE7RJxP5aVSHmSz5w74cP/Ta90+A==
+"@angular/compiler-cli@^8.0.0-beta.14":
+  version "8.0.0-beta.14"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0-beta.14.tgz#61aa5947d3427afd0043fdba079a8cc616d29201"
+  integrity sha512-Q+B9bUDqVOT3OZdUsOFJeQWSmVKUdUoaU5ptq6UQFALCa/0skQrcL/KOFpej3fk3ZRVTkQ+vWQ1nMzv+tm8Byw==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -42,17 +42,17 @@
     tslib "^1.9.0"
     yargs "9.0.1"
 
-"@angular/compiler@^8.0.0-beta.12":
-  version "8.0.0-beta.12"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0-beta.12.tgz#cf7d250585ba3965d440aa3fbc6afa71d52bdf0c"
-  integrity sha512-JYC521zMNGCO152UjFU1dm7xsbruDezfrQVlPdCp6aCQEoPFvX07plXSni+exN2M6Jj87Gwsf3nDCAqW4l3tlA==
+"@angular/compiler@^8.0.0-beta.14":
+  version "8.0.0-beta.14"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0-beta.14.tgz#dc01066a060ea9fbd9696a015f481279aa23c2b0"
+  integrity sha512-Copy2bMf8EL9WcHwz1rHeMY6CqWhOZmvGRBSVwI149awbTxc31h3+01TG2I5FlgIm+vc70PUldp7EumqFiCCDA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^8.0.0-beta.12":
-  version "8.0.0-beta.12"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0-beta.12.tgz#0585726423dd1123ed878cb57fde00e1bbd42193"
-  integrity sha512-1V2kEi7iaDVXHPVwqN54sGjr6jEt7Hijj3UIIkAiIJA93Yc2I/c7PsupAho91wwEdya2K/K7gKnIheNS0D4CWQ==
+"@angular/core@^8.0.0-beta.14":
+  version "8.0.0-beta.14"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0-beta.14.tgz#d3e75291ac390a1a29bf037bfd292586a90aea8b"
+  integrity sha512-7gltt13BTUFgGHpOBUmvxr/PUcqY8n6177NpYgEJRBFLZl2FtErG+7BfYBCt23StAi+K6ZafP+IX2m1evOtX8g==
   dependencies:
     tslib "^1.9.0"
 
@@ -63,40 +63,40 @@
   dependencies:
     tslib "^1.7.1"
 
-"@angular/platform-browser-dynamic@^8.0.0-beta.12":
-  version "8.0.0-beta.12"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0-beta.12.tgz#f2c60bb98ca1ab81571a4e1cb7043e0fc707c497"
-  integrity sha512-l61v7KxFzmziu0WTFTMhKTTJSHpioYl7u8uNao4vxhQR5o65G6fiLxNOjqpNe6bKrolbKcbZ4/+N8nPN7Mw/vA==
+"@angular/platform-browser-dynamic@^8.0.0-beta.14":
+  version "8.0.0-beta.14"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0-beta.14.tgz#ef2463033f7383500aaa55627fbd487c5c377033"
+  integrity sha512-NWcOey/bzstnbVzNvBpryEAamWNAQobUkP4i3mSnKvWAyhs1GO7IPOsTwzOOPVvQBTOq0GFdYJjDoB4DIo3/ZA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^8.0.0-beta.12":
-  version "8.0.0-beta.12"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0-beta.12.tgz#9896a85b8edb8dfa633fe7ea38591bc7b0ae6f43"
-  integrity sha512-XL9ybmllynrDiOYhbaRywOQq/NvfNOd/6Cn6jnLXMOSthkqPpYCIejsE/zm7Gq+RPrJeW7kaOg+DyXRPWLWOOQ==
+"@angular/platform-browser@^8.0.0-beta.14":
+  version "8.0.0-beta.14"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0-beta.14.tgz#9023453d850243fbc7c6452c26e100fd1d505617"
+  integrity sha512-nOo8wZU1PToNgb1BdKVWVmJqX4l30YWOzMCJ1S41LMImf0k+PXgKYUCQ5OzFBJNTH0x8JvANTvsBiqJyNN+QkQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-server@^8.0.0-beta.12":
-  version "8.0.0-beta.12"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.0.0-beta.12.tgz#56ddc9a249faf3b31a275315cdb72a5122d365dd"
-  integrity sha512-dWqDqpC/5J7g6jLwvOCmtvL/+OYEtDyuUOaH7fz/Mp9J4lCqqwSJhM7AMFn265VMa8eixohwMoQPA1RSf0Bhtw==
+"@angular/platform-server@^8.0.0-beta.14":
+  version "8.0.0-beta.14"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.0.0-beta.14.tgz#87cc4ce00354b1597890809303bd89b671f78bd1"
+  integrity sha512-VV0m8zqXrk9PzOPccirkL1TV+fVsoqnUc+y9Sfj9nTtufZvAEu2Yp4GDDXvzXncXx+/GEsx+gcpRnlvKHvsOPg==
   dependencies:
     domino "^2.1.2"
     tslib "^1.9.0"
     xhr2 "^0.1.4"
 
-"@angular/router@^8.0.0-beta.12":
-  version "8.0.0-beta.12"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0-beta.12.tgz#0a98d6e7da6ba6a3d8ccd18d2a9dac8956f72e1e"
-  integrity sha512-inuuYL48uPBqFMpqH8IBVzJGA+wUHr0QuLigO1GlAqVEXGXwEPUSbqmqvwv7j1RGT1phC2LC8lWR8yfcNBel7A==
+"@angular/router@^8.0.0-beta.14":
+  version "8.0.0-beta.14"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0-beta.14.tgz#62e4be7b085cce764e00c608eb910886767cd61e"
+  integrity sha512-QGIvWPd4ngxWzEwzAqEk7M54CGmmYGRxs/+V8Zohau580XL5lK6tuPvN+slO1dWe3+YuFt6U02zzs9mRGlLnYw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@^8.0.0-beta.12":
-  version "8.0.0-beta.12"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.0.0-beta.12.tgz#6a5e6e6178b5160a984d231ae65eb7eef31af8cd"
-  integrity sha512-cvS0IplppPhwtfqiSg4NPkp0Ck+3meX8O3aX4OuVeTUKOX1mE9gCTIO7QwDFo0o325mhct2ur9Spx5FPClQVBw==
+"@angular/service-worker@^8.0.0-beta.14":
+  version "8.0.0-beta.14"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.0.0-beta.14.tgz#7fdac405d2f6757cbaeb2abdb35b513f69e0bdf2"
+  integrity sha512-dQGdpjj97bVp0AvLHI4wpbQCEeWSoPssnKf24oXaJHLM0UuWQgumlBzKU4/gWBpQ+lQoW+txELp4qoY4YH/Yig==
   dependencies:
     tslib "^1.9.0"
 

From eec39a20c30e10a6c64b209a490ccd68bb02e0ba Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 24 Apr 2019 10:37:12 +0100
Subject: [PATCH 1244/1703] fix(@angular-devkit/build-angular): use known
 Terser global defs

Followup to https://github.com/angular/angular/pull/29929
---
 .../models/webpack-configs/common.ts          | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 70d970236842..4df73e82b840 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -254,6 +254,22 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
   }
 
   if (scriptsOptimization) {
+    let angularGlobalDefinitions = {
+      ngDevMode: false,
+      ngI18nClosureMode: false,
+    };
+
+    try {
+      // Try to load known global definitions from @angular/compiler-cli.
+      // tslint:disable-next-line:no-implicit-dependencies
+      const GLOBAL_DEFS_FOR_TERSER = require('@angular/compiler-cli').GLOBAL_DEFS_FOR_TERSER;
+      if (GLOBAL_DEFS_FOR_TERSER) {
+        angularGlobalDefinitions = GLOBAL_DEFS_FOR_TERSER;
+      }
+    } catch {
+      // Do nothing, the default above will be used instead.
+    }
+
     const terserOptions = {
       ecma: wco.supportES2015 ? 6 : 5,
       warnings: !!buildOptions.verbose,
@@ -267,10 +283,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
         // PURE comments work best with 3 passes.
         // See https://github.com/webpack/webpack/issues/2899#issuecomment-317425926.
         passes: 3,
-        global_defs: {
-          ngDevMode: false,
-          ngI18nClosureMode: false,
-        },
+        global_defs: angularGlobalDefinitions,
       },
       // We want to avoid mangling on server.
       ...(buildOptions.platform == 'server' ? { mangle: false } : {}),
@@ -287,7 +300,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
   }
 
   if (wco.tsConfig.options.target !== undefined &&
-      wco.tsConfig.options.target >= ts.ScriptTarget.ES2017) {
+    wco.tsConfig.options.target >= ts.ScriptTarget.ES2017) {
     wco.logger.warn(tags.stripIndent`
       WARNING: Zone.js does not support native async/await in ES2017.
       These blocks are not intercepted by zone.js and will not triggering change detection.

From 74af88bf0662cb4fb72ed8dd03aeaacb31413759 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 23 Apr 2019 11:40:53 -0400
Subject: [PATCH 1245/1703] fix(@schematics/angular): avoid double
 header/comments in es6 polyfill migration

If a polyfills file is original, then replace completely with latest version of the file.  This removes the need to deeply analyze the file as well as ensuring all comments are up to date.  Also skips analysis if there is no mention of `core-js` of any form in the file.
The header re-addition check is also reduced in scope to account for varying versions of the header content.
---
 .../migrations/update-8/drop-es6-polyfills.ts | 78 +++++++++++++++----
 .../update-8/drop-es6-polyfills_spec.ts       |  2 -
 2 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts b/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts
index 131af6829c75..862050c1a9b5 100644
--- a/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts
+++ b/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts
@@ -5,9 +5,19 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { JsonParseMode, isJsonObject, join, normalize, parseJson } from '@angular-devkit/core';
-import { Rule, Tree, chain, noop } from '@angular-devkit/schematics';
+import { JsonParseMode, isJsonObject, parseJson } from '@angular-devkit/core';
+import {
+  MergeStrategy,
+  Rule,
+  Tree,
+  apply,
+  chain,
+  filter,
+  mergeWith,
+  move,
+  url,
+} from '@angular-devkit/schematics';
+import { createHash } from 'crypto';
 import * as ts from '../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 
 const toDrop: {[importName: string]: true} = {
@@ -24,6 +34,7 @@ const toDrop: {[importName: string]: true} = {
   'core-js/es6/regexp': true,
   'core-js/es6/map': true,
   'core-js/es6/set': true,
+  'core-js/es6/weak-map': true,
 };
 
 const header = `/**
@@ -45,12 +56,20 @@ const header = `/**
 /***************************************************************************************************
 * BROWSER POLYFILLS
 */
-
-/** IE9, IE10 and IE11 requires all of the following polyfills. **/
-// import 'core-js/es6/weak-map';
 `;
 
 const applicationPolyfillsHeader = 'APPLICATION IMPORTS';
+const browserPolyfillsHeader = 'BROWSER POLYFILLS';
+
+const knownPolyfillHashes = [
+  '3dba718d7afe009e112e10d69073d2a2', // 6.0 - unmodified
+  'fccdb76b06ea636933f8b99b1c8d9725', // 6.0 - all core-js uncommented
+  '97e16639be1de06153695f5fefde745d', // 7.0 - unmodified
+  'd6c13d6dcf94ff3749283f33dd0d4864', // 7.0 - all core-js uncommented
+  '79bf0fd46c215e5f4145e15641c325f3', // 7.2 - unmodified
+  '6fe8080c7e38ee0ce677fdbc3884377a', // 7.2 - all core-js uncommented
+  '8e7f6abb3d2dca03b4dbb300e400a880', // 7.3 - unmodified
+];
 
 function dropES2015PolyfillsFromFile(polyfillPath: string): Rule {
   return (tree: Tree) => {
@@ -59,33 +78,64 @@ function dropES2015PolyfillsFromFile(polyfillPath: string): Rule {
       return;
     }
 
-    // Start the update of the file.
-    const recorder = tree.beginUpdate(polyfillPath);
+    // normalize line endings to increase hash match chances
+    const content = source.toString().replace(/\r\n|\r/g, '\n');
+
+    // Check if file is unmodified, if so then replace and return
+    const hash = createHash('md5');
+    hash.update(content);
+    const digest = hash.digest('hex');
+    if (knownPolyfillHashes.includes(digest)) {
+      // Replace with new project polyfills file
+      // This removes the need to parse and also updates all included comments
+
+      // mergeWith overwrite doesn't work so clear out existing file
+      tree.delete(polyfillPath);
+
+      return mergeWith(
+        apply(url('../../application/files/src'), [
+          filter(path => path === '/polyfills.ts.template'),
+          move('/polyfills.ts.template', polyfillPath),
+        ]),
+        MergeStrategy.Overwrite,
+      );
+    }
+
+    if (!content.includes('core-js')) {
+      // no action required if no mention of core-js
+      return;
+    }
 
     const sourceFile = ts.createSourceFile(polyfillPath,
-      source.toString(),
+      content,
       ts.ScriptTarget.Latest,
       true,
     );
     const imports = sourceFile.statements
       .filter(s => s.kind === ts.SyntaxKind.ImportDeclaration) as ts.ImportDeclaration[];
 
-    const applicationPolyfillsStart = sourceFile.getText().indexOf(applicationPolyfillsHeader);
-
     if (imports.length === 0) { return; }
 
+    // Start the update of the file.
+    const recorder = tree.beginUpdate(polyfillPath);
+
+    const applicationPolyfillsStart = content.indexOf(applicationPolyfillsHeader);
+    const browserPolyfillsStart = content.indexOf(browserPolyfillsHeader);
+
+    let addHeader = false;
     for (const i of imports) {
       const module = ts.isStringLiteral(i.moduleSpecifier) && i.moduleSpecifier.text;
       // We do not want to remove imports which are after the "APPLICATION IMPORTS" header.
       if (module && toDrop[module] && applicationPolyfillsStart > i.getFullStart()) {
         recorder.remove(i.getFullStart(), i.getFullWidth());
+        if (i.getFullStart() <= browserPolyfillsStart) {
+          addHeader = true;
+        }
       }
     }
 
     // We've removed the header since it's part of the JSDoc of the nodes we dropped
-    // As part of the header, we also add the comment for importing WeakMap since
-    // it's not part of the internal ES2015 polyfills we provide.
-    if (sourceFile.getText().indexOf(header) < 0) {
+    if (addHeader) {
       recorder.insertLeft(0, header);
     }
 
diff --git a/packages/schematics/angular/migrations/update-8/drop-es6-polyfills_spec.ts b/packages/schematics/angular/migrations/update-8/drop-es6-polyfills_spec.ts
index e2baac75b3de..f5d481a1dc50 100644
--- a/packages/schematics/angular/migrations/update-8/drop-es6-polyfills_spec.ts
+++ b/packages/schematics/angular/migrations/update-8/drop-es6-polyfills_spec.ts
@@ -88,7 +88,6 @@ import 'zone.js/dist/zone'; // Included with Angular CLI.
       expect(polyfills).toContain('core-js/es6/reflect');
       expect(polyfills).toContain('core-js/es7/reflect');
       expect(polyfills).toContain('BROWSER POLYFILLS');
-      expect(polyfills).toContain('core-js/es6/weak-map');
     });
 
     it('should work as expected for a project with a root', async () => {
@@ -113,7 +112,6 @@ import 'zone.js/dist/zone'; // Included with Angular CLI.
       expect(newPolyfills).toContain('core-js/es6/reflect');
       expect(newPolyfills).toContain('core-js/es7/reflect');
       expect(newPolyfills).toContain('BROWSER POLYFILLS');
-      expect(newPolyfills).toContain('core-js/es6/weak-map');
     });
   });
 });

From 475ba6610ce187885d5c737dab143741ba693e0d Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 23 Apr 2019 21:26:51 -0400
Subject: [PATCH 1246/1703] fix(@angular/cli): only show postinstall prompt
 when global analytics not configured

---
 .../cli/bin/postinstall/analytics-prompt.js        |  6 +++++-
 packages/angular/cli/models/analytics.ts           | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/bin/postinstall/analytics-prompt.js b/packages/angular/cli/bin/postinstall/analytics-prompt.js
index 3a3de1d2b904..4a9ee574af32 100644
--- a/packages/angular/cli/bin/postinstall/analytics-prompt.js
+++ b/packages/angular/cli/bin/postinstall/analytics-prompt.js
@@ -1,10 +1,14 @@
 'use strict';
 // This file is ES6 because it needs to be executed as is.
 
+if ('NG_CLI_ANALYTICS' in process.env) {
+  return;
+}
+
 try {
   const analytics = require('../../models/analytics');
 
-  if (analytics.getGlobalAnalytics() === undefined) {
+  if (!analytics.hasGlobalAnalyticsConfiguration()) {
     analytics.promptGlobalAnalytics();
   }
 } catch (_) {}
diff --git a/packages/angular/cli/models/analytics.ts b/packages/angular/cli/models/analytics.ts
index bf5132f4f487..42674a769ca0 100644
--- a/packages/angular/cli/models/analytics.ts
+++ b/packages/angular/cli/models/analytics.ts
@@ -441,6 +441,20 @@ export async function promptProjectAnalytics(force = false): Promise<boolean> {
   return false;
 }
 
+export function hasGlobalAnalyticsConfiguration(): boolean {
+  try {
+    const globalWorkspace = getWorkspace('global');
+    const analyticsConfig: string | undefined | null | { uid?: string } = globalWorkspace
+      && globalWorkspace.getCli()
+      && globalWorkspace.getCli()['analytics'];
+
+    if (analyticsConfig !== undefined) {
+      return true;
+    }
+  } catch {}
+
+  return false;
+}
 
 /**
  * Get the global analytics object for the user. This returns an instance of UniversalAnalytics,

From ccbac7cd214e2399e046365d15c905275a6ef8b4 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Wed, 24 Apr 2019 13:45:45 +0200
Subject: [PATCH 1247/1703] fix(@angular-devkit/build-optimizer): don't add
 pure comments in call expressions

When we removed tsickle from the library compilation pipeline the emitted JS changes for Classes.

With tsc a class can be of kind CallExpression because of this syntax
```
let Foo = class Foo {
	constructor() {
		this.isExpandedChange = new EventEmitter();
	}

	set isExpanded(value) {
		this.isExpandedChange.emit(value);
	}
};
```

In such case we shall not add `/*@__PURE__*/` inside this class

Fixes #14084
---
 .../src/transforms/prefix-functions.ts        |  1 +
 .../src/transforms/prefix-functions_spec.ts   | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions.ts b/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions.ts
index d2414bb98970..a692862a87bb 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions.ts
@@ -47,6 +47,7 @@ export function findTopLevelFunctions(parentNode: ts.Node): Set<ts.Node> {
     if (ts.isFunctionDeclaration(node)
       || ts.isFunctionExpression(node)
       || ts.isClassDeclaration(node)
+      || ts.isClassExpression(node)
       || ts.isArrowFunction(node)
       || ts.isMethodDeclaration(node)
     ) {
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions_spec.ts
index d8b55c65a5d4..10c444afb057 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions_spec.ts
@@ -167,4 +167,23 @@ describe('prefix-functions', () => {
 
     expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
   });
+
+  it('doesn\'t add comment when inside class expression', () => {
+    const input = tags.stripIndent`
+      let Foo = class Foo {
+        constructor() {
+          this.isExpandedChange = new EventEmitter();
+        }
+
+        set isExpanded(value) {
+          this.isExpandedChange.emit(value);
+        }
+      };
+    `;
+    const output = tags.stripIndent`
+      ${input}
+    `;
+
+    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+  });
 });

From 576577784c455d3be0aac731255b75b5a4a3f0e4 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 25 Apr 2019 11:09:34 -0400
Subject: [PATCH 1248/1703] fix(@schematics/angular): remove tsquery peer
 dependency warning

Replaces the usage of the tsquery package with a conditional based on TypeScript helper functions.  Since a TypeScript-subset is vendored within the package, a TypeScript peer dependency cannot be met even though the functionality is present.

Fixes #14270
---
 package.json                                  |  1 -
 packages/schematics/angular/BUILD             |  2 -
 .../update-8/rules/noLazyModulePathsRule.ts   | 60 +++++++++----------
 packages/schematics/angular/package.json      |  1 -
 yarn.lock                                     | 16 +----
 5 files changed, 31 insertions(+), 49 deletions(-)

diff --git a/package.json b/package.json
index a0c2126e937d..ba3926434399 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,6 @@
     ]
   },
   "dependencies": {
-    "@phenomnomnominal/tsquery": "3.0.0",
     "@types/debug": "^4.1.2",
     "@types/node-fetch": "^2.1.6",
     "@types/progress": "^2.0.3",
diff --git a/packages/schematics/angular/BUILD b/packages/schematics/angular/BUILD
index 5bc09cbbcf8f..cfacc05a342f 100644
--- a/packages/schematics/angular/BUILD
+++ b/packages/schematics/angular/BUILD
@@ -53,7 +53,6 @@ ts_library(
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:tasks",
         "//packages/schematics/angular/third_party/github.com/Microsoft/TypeScript",
-        "@npm//@phenomnomnominal/tsquery",
         "@npm//@types/node",
         "@npm//rxjs",
         "@npm//tslint",
@@ -95,7 +94,6 @@ ts_library(
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:testing",
         "//packages/schematics/angular/third_party/github.com/Microsoft/TypeScript",
-        "@npm//@phenomnomnominal/tsquery",
         "@npm//@types/node",
         "@npm//@types/jasmine",
         "@npm//rxjs",
diff --git a/packages/schematics/angular/migrations/update-8/rules/noLazyModulePathsRule.ts b/packages/schematics/angular/migrations/update-8/rules/noLazyModulePathsRule.ts
index 24ef937cf9d0..1c15e84884a0 100644
--- a/packages/schematics/angular/migrations/update-8/rules/noLazyModulePathsRule.ts
+++ b/packages/schematics/angular/migrations/update-8/rules/noLazyModulePathsRule.ts
@@ -5,8 +5,6 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { tsquery } from '@phenomnomnominal/tsquery';
 import {
     Replacement,
     RuleFailure,
@@ -16,39 +14,41 @@ import * as ts from '../../../third_party/github.com/Microsoft/TypeScript/lib/ty
 
  // Constants:
 const LOAD_CHILDREN_SPLIT = '#';
-const NOT_CHILDREN_QUERY = `:not(:has(Identifier[name="children"]))`;
-const HAS_LOAD_CHILDREN_QUERY = `:has(Identifier[name="loadChildren"])`;
-const LAZY_VALUE_QUERY = `StringLiteral[value=/.*${LOAD_CHILDREN_SPLIT}.*/]`;
-const LOAD_CHILDREN_ASSIGNMENT_QUERY =
-  `PropertyAssignment${NOT_CHILDREN_QUERY}${HAS_LOAD_CHILDREN_QUERY}:has(${LAZY_VALUE_QUERY})`;
-
 const FAILURE_MESSAGE = 'Found magic `loadChildren` string. Use a function with `import` instead.';
 
 export class Rule extends Rules.AbstractRule {
   public apply (ast: ts.SourceFile): Array<RuleFailure> {
-    return tsquery(ast, LOAD_CHILDREN_ASSIGNMENT_QUERY).map(result => {
-      const [valueNode] = tsquery(result, LAZY_VALUE_QUERY);
-      let fix = this._promiseReplacement(valueNode.text);
-
-      // Try to fix indentation in replacement:
-      const { character } = ast.getLineAndCharacterOfPosition(result.getStart());
-      fix = fix.replace(/\n/g, `\n${' '.repeat(character)}`);
-
-      const replacement = new Replacement(valueNode.getStart(), valueNode.getWidth(), fix);
-      const start = result.getStart();
-      const end = result.getEnd();
-
-      return new RuleFailure(ast, start, end, FAILURE_MESSAGE, this.ruleName, replacement);
+    const ruleName = this.ruleName;
+    const changes: RuleFailure[] = [];
+
+    ts.forEachChild(ast, function analyze(node) {
+      if (ts.isPropertyAssignment(node) &&
+          (ts.isIdentifier(node.name) || ts.isStringLiteral(node.name)) &&
+          node.name.text === 'loadChildren' &&
+          ts.isStringLiteral(node.initializer)) {
+        const valueNode = node.initializer;
+        const parts = valueNode.text.split(LOAD_CHILDREN_SPLIT);
+        const path = parts[0];
+        const moduleName = parts[1] || 'default';
+
+        let fix = `() => import('${path}').then(m => m.${moduleName})`;
+
+        // Try to fix indentation in replacement:
+        const { character } = ast.getLineAndCharacterOfPosition(node.getStart());
+        fix = fix.replace(/\n/g, `\n${' '.repeat(character)}`);
+
+        const replacement = new Replacement(valueNode.getStart(), valueNode.getWidth(), fix);
+        const start = node.getStart();
+        const end = node.getEnd();
+
+        const change = new RuleFailure(ast, start, end, FAILURE_MESSAGE, ruleName, replacement);
+        change.setRuleSeverity('warning');
+        changes.push(change);
+      }
+
+      ts.forEachChild(node, analyze);
     });
-  }
-
-  private _promiseReplacement (loadChildren: string): string {
-    const [path, moduleName] = this._getChunks(loadChildren);
-
-    return `() => import('${path}').then(m => m.${moduleName})`;
-  }
 
-  private _getChunks (loadChildren: string): Array<string> {
-    return loadChildren.split(LOAD_CHILDREN_SPLIT);
+    return changes;
   }
 }
diff --git a/packages/schematics/angular/package.json b/packages/schematics/angular/package.json
index e1291b75a864..783b2a424160 100644
--- a/packages/schematics/angular/package.json
+++ b/packages/schematics/angular/package.json
@@ -9,7 +9,6 @@
   ],
   "schematics": "./collection.json",
   "dependencies": {
-    "@phenomnomnominal/tsquery": "3.0.0",
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0"
   }
diff --git a/yarn.lock b/yarn.lock
index c7f2e34ec12a..2bedc0b45472 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -270,13 +270,6 @@
   resolved "https://registry.yarnpkg.com/@ngtools/json-schema/-/json-schema-1.1.0.tgz#c3a0c544d62392acc2813a42c8a0dc6f58f86922"
   integrity sha1-w6DFRNYjkqzCgTpCyKDcb1j4aSI=
 
-"@phenomnomnominal/tsquery@3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@phenomnomnominal/tsquery/-/tsquery-3.0.0.tgz#6f2f4dbf6304ff52b12cc7a5b979f20c3794a22a"
-  integrity sha512-SW8lKitBHWJ9fAYkJ9kJivuctwNYCh3BUxLdH0+XiR1GPBiu+7qiZzh8p8jqlj1LgVC1TbvfNFroaEsmYlL8Iw==
-  dependencies:
-    esquery "^1.0.1"
-
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
@@ -3392,13 +3385,6 @@ esprima@^4.0.0:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
-  integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
-  dependencies:
-    estraverse "^4.0.0"
-
 esrecurse@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
@@ -3411,7 +3397,7 @@ estraverse@^1.9.1:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
   integrity sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=
 
-estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.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"
   integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=

From a818badbb2633c426545e9cfecee712cdba23b3b Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 24 Apr 2019 20:20:32 -0400
Subject: [PATCH 1249/1703] fix(@angular/cli): remove Angular specific version
 check from base architect command

Fixes #14266
---
 .../angular/cli/models/architect-command.ts   |   4 -
 packages/angular/cli/upgrade/version.ts       | 135 ------------------
 2 files changed, 139 deletions(-)
 delete mode 100644 packages/angular/cli/upgrade/version.ts

diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index 5871bd0ccb69..ee1df7dc085e 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -9,7 +9,6 @@ import { Architect, Target } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { experimental, json, schema, tags } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
-import { Version } from '../upgrade/version';
 import { BepJsonWriter } from '../utilities/bep';
 import { parseJsonSchemaToOptions } from '../utilities/json-schema';
 import { isPackageNameSafeForAnalytics } from './analytics';
@@ -275,9 +274,6 @@ export abstract class ArchitectCommand<
   protected async runArchitectTarget(
     options: ArchitectCommandOptions & Arguments,
   ): Promise<number> {
-    // Check Angular version.
-    Version.assertCompatibleAngularVersion(this.workspace.root);
-
     const extra = options['--'] || [];
 
     try {
diff --git a/packages/angular/cli/upgrade/version.ts b/packages/angular/cli/upgrade/version.ts
deleted file mode 100644
index 774678663b99..000000000000
--- a/packages/angular/cli/upgrade/version.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import { tags, terminal } from '@angular-devkit/core';
-import * as path from 'path';
-import { SemVer, satisfies } from 'semver';
-
-
-export class Version {
-  private _semver: SemVer | null = null;
-  constructor(private _version: string | null = null) {
-    this._semver = _version ? new SemVer(_version) : null;
-  }
-
-  isAlpha() { return this.qualifier == 'alpha'; }
-  isBeta() { return this.qualifier == 'beta'; }
-  isReleaseCandidate() { return this.qualifier == 'rc'; }
-  isKnown() { return this._version !== null; }
-
-  isLocal() { return this.isKnown() && this._version && path.isAbsolute(this._version); }
-  isGreaterThanOrEqualTo(other: SemVer) {
-    return this._semver !== null && this._semver.compare(other) >= 0;
-  }
-  satisfies(other: string) {
-    // This comparison includes pre-releases (like betas and rcs), and considers them to be
-    // before the release proper.
-    // e.g. '9.0.0-beta.1' will satisfy '>=7.0.0 <9.0.0', but '9.0.0' will not.
-    return this._semver !== null && satisfies(this._semver, other, { includePrerelease: true });
-  }
-
-  get major() { return this._semver ? this._semver.major : 0; }
-  get minor() { return this._semver ? this._semver.minor : 0; }
-  get patch() { return this._semver ? this._semver.patch : 0; }
-  get qualifier() { return this._semver ? this._semver.prerelease[0] : ''; }
-  get extra() { return this._semver ? this._semver.prerelease[1] : ''; }
-
-  toString() { return this._version; }
-
-  static assertCompatibleAngularVersion(projectRoot: string) {
-    let angularCliPkgJson;
-    let angularPkgJson;
-    let rxjsPkgJson;
-    const resolveOptions = { paths: [projectRoot] };
-
-    try {
-      const angularPackagePath = require.resolve('@angular/core/package.json', resolveOptions);
-      const rxjsPackagePath = require.resolve('rxjs/package.json', resolveOptions);
-
-      angularPkgJson = require(angularPackagePath);
-      rxjsPkgJson = require(rxjsPackagePath);
-    } catch {
-      console.error(terminal.bold(terminal.red(tags.stripIndents`
-        You seem to not be depending on "@angular/core" and/or "rxjs". This is an error.
-      `)));
-      process.exit(2);
-    }
-
-    if (!(angularPkgJson && angularPkgJson['version'] && rxjsPkgJson && rxjsPkgJson['version'])) {
-      console.error(terminal.bold(terminal.red(tags.stripIndents`
-        Cannot determine versions of "@angular/core" and/or "rxjs".
-        This likely means your local installation is broken. Please reinstall your packages.
-      `)));
-      process.exit(2);
-    }
-
-    try {
-      const angularCliPkgPath = require.resolve('@angular/cli/package.json', resolveOptions);
-      angularCliPkgJson = require(angularCliPkgPath);
-      if (!(angularCliPkgJson && angularCliPkgJson['version'])) {
-        throw new Error();
-      }
-    } catch (error) {
-      console.error(terminal.bold(terminal.red(tags.stripIndents`
-        Cannot determine versions of "@angular/cli".
-        This likely means your local installation is broken. Please reinstall your packages.
-      `)));
-      process.exit(2);
-    }
-
-    const cliMajor = new Version(angularCliPkgJson['version']).major;
-    // e.g. CLI 8.0 supports '>=8.0.0 <9.0.0', including pre-releases (betas, rcs, snapshots)
-    // of both 8 and 9.
-    const supportedAngularSemver = `^${cliMajor}.0.0-beta || ` +
-      `>=${cliMajor}.0.0 <${cliMajor + 1}.0.0`;
-
-    const angularVersion = new Version(angularPkgJson['version']);
-    const rxjsVersion = new Version(rxjsPkgJson['version']);
-
-    if (angularVersion.isLocal()) {
-      console.error(terminal.yellow('Using a local version of angular. Proceeding with care...'));
-
-      return;
-    }
-
-    if (!angularVersion.satisfies(supportedAngularSemver)) {
-      console.error(terminal.bold(terminal.red(tags.stripIndents`
-          This version of CLI is only compatible with Angular versions ${supportedAngularSemver},
-          but Angular version ${angularVersion} was found instead.
-
-          Please visit the link below to find instructions on how to update Angular.
-          https://angular-update-guide.firebaseapp.com/
-        ` + '\n')));
-      process.exit(3);
-    } else if (
-      angularVersion.isGreaterThanOrEqualTo(new SemVer('6.0.0-rc.0'))
-      && !rxjsVersion.isGreaterThanOrEqualTo(new SemVer('5.6.0-forward-compat.0'))
-      && !rxjsVersion.isGreaterThanOrEqualTo(new SemVer('6.0.0-beta.0'))
-    ) {
-      console.error(terminal.bold(terminal.red(tags.stripIndents`
-          This project uses version ${rxjsVersion} of RxJs, which is not supported by Angular v6+.
-          The official RxJs version that is supported is 5.6.0-forward-compat.0 and greater.
-
-          Please visit the link below to find instructions on how to update RxJs.
-          https://docs.google.com/document/d/12nlLt71VLKb-z3YaSGzUfx6mJbc34nsMXtByPUN35cg/edit#
-        ` + '\n')));
-      process.exit(3);
-    } else if (
-      angularVersion.isGreaterThanOrEqualTo(new SemVer('6.0.0-rc.0'))
-      && !rxjsVersion.isGreaterThanOrEqualTo(new SemVer('6.0.0-beta.0'))
-    ) {
-      console.warn(terminal.bold(terminal.red(tags.stripIndents`
-          This project uses a temporary compatibility version of RxJs (${rxjsVersion}).
-
-          Please visit the link below to find instructions on how to update RxJs.
-          https://docs.google.com/document/d/12nlLt71VLKb-z3YaSGzUfx6mJbc34nsMXtByPUN35cg/edit#
-        ` + '\n')));
-    }
-  }
-
-}

From b7a26fa08b1557e869364d2f4f5e41030df0f531 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 24 Apr 2019 20:39:38 -0400
Subject: [PATCH 1250/1703] fix(@angular-devkit/build-angular): add Angular
 version check into required builders

---
 .../build_angular/src/browser/index.ts        |   4 +
 .../build_angular/src/dev-server/index.ts     |   4 +
 .../build_angular/src/extract-i18n/index.ts   |   4 +
 .../build_angular/src/karma/index.ts          |   4 +
 .../build_angular/src/server/index.ts         |   4 +
 .../build_angular/src/utils/version.ts        | 135 ++++++++++++++++++
 6 files changed, 155 insertions(+)
 create mode 100644 packages/angular_devkit/build_angular/src/utils/version.ts

diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index e08886c6eb8d..1ba8437ea1e9 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -50,6 +50,7 @@ import {
 } from '../angular-cli-files/utilities/stats';
 import { ExecutionTransformer } from '../transforms';
 import { deleteOutputDir, isEs5SupportNeeded } from '../utils';
+import { Version } from '../utils/version';
 import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
 import { Schema as BrowserBuilderSchema } from './schema';
 
@@ -169,6 +170,9 @@ export function buildWebpackBrowser(
   const host = new NodeJsSyncHost();
   const root = normalize(context.workspaceRoot);
 
+  // Check Angular version.
+  Version.assertCompatibleAngularVersion(context.workspaceRoot);
+
   const loggingFn = transforms.logging
     || createBrowserLoggingCallback(!!options.verbose, context.logger);
 
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index eba9fbf92518..121056c54ac8 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -33,6 +33,7 @@ import {
 import { Schema as BrowserBuilderSchema } from '../browser/schema';
 import { ExecutionTransformer } from '../transforms';
 import { normalizeOptimization } from '../utils';
+import { Version } from '../utils/version';
 import { Schema } from './schema';
 const open = require('open');
 
@@ -74,6 +75,9 @@ export function serveWebpackBrowser(
     logging?: WebpackLoggingCallback,
   } = {},
 ): Observable<DevServerBuilderOutput> {
+  // Check Angular version.
+  Version.assertCompatibleAngularVersion(context.workspaceRoot);
+
   const browserTarget = targetFromTargetString(options.browserTarget);
   const root = context.workspaceRoot;
   let first = true;
diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
index a4acb38c21df..813f07cbed4d 100644
--- a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
@@ -21,6 +21,7 @@ import {
   getStylesConfig,
 } from '../angular-cli-files/models/webpack-configs';
 import { Schema as BrowserBuilderOptions } from '../browser/schema';
+import { Version } from '../utils/version';
 import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
 import { Schema as ExtractI18nBuilderOptions } from './schema';
 
@@ -47,6 +48,9 @@ class InMemoryOutputPlugin {
 }
 
 async function execute(options: ExtractI18nBuilderOptions, context: BuilderContext) {
+  // Check Angular version.
+  Version.assertCompatibleAngularVersion(context.workspaceRoot);
+
   const browserTarget = targetFromTargetString(options.browserTarget);
   const browserOptions = await context.validateOptions<JsonObject & BrowserBuilderOptions>(
     await context.getTargetOptions(browserTarget),
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index c4611b0ef36f..b3d5bb0fe807 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -19,6 +19,7 @@ import {
 } from '../angular-cli-files/models/webpack-configs';
 import { Schema as BrowserBuilderOptions } from '../browser/schema';
 import { ExecutionTransformer } from '../transforms';
+import { Version } from '../utils/version';
 import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
 import { Schema as KarmaBuilderOptions } from './schema';
 
@@ -67,6 +68,9 @@ export function execute(
     karmaOptions?: (options: KarmaConfigOptions) => KarmaConfigOptions,
   } = {},
 ): Observable<BuilderOutput> {
+  // Check Angular version.
+  Version.assertCompatibleAngularVersion(context.workspaceRoot);
+
   return from(initialize(options, context, transforms.webpackConfiguration)).pipe(
     switchMap(([karma, webpackConfig]) => new Observable<BuilderOutput>(subscriber => {
       const karmaOptions: KarmaConfigOptions = {};
diff --git a/packages/angular_devkit/build_angular/src/server/index.ts b/packages/angular_devkit/build_angular/src/server/index.ts
index 97efd4dc1717..480a8aac5acd 100644
--- a/packages/angular_devkit/build_angular/src/server/index.ts
+++ b/packages/angular_devkit/build_angular/src/server/index.ts
@@ -24,6 +24,7 @@ import {
 } from '../angular-cli-files/models/webpack-configs';
 import { ExecutionTransformer } from '../transforms';
 import { NormalizedBrowserBuilderSchema, deleteOutputDir } from '../utils';
+import { Version } from '../utils/version';
 import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
 import { Schema as ServerBuilderOptions } from './schema';
 
@@ -44,6 +45,9 @@ export function execute(
   const host = new NodeJsSyncHost();
   const root = context.workspaceRoot;
 
+  // Check Angular version.
+  Version.assertCompatibleAngularVersion(context.workspaceRoot);
+
   return from(buildServerWebpackConfig(options, context)).pipe(
     concatMap(async v => transforms.webpackConfiguration ? transforms.webpackConfiguration(v) : v),
     concatMap(v => {
diff --git a/packages/angular_devkit/build_angular/src/utils/version.ts b/packages/angular_devkit/build_angular/src/utils/version.ts
new file mode 100644
index 000000000000..774678663b99
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/utils/version.ts
@@ -0,0 +1,135 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { tags, terminal } from '@angular-devkit/core';
+import * as path from 'path';
+import { SemVer, satisfies } from 'semver';
+
+
+export class Version {
+  private _semver: SemVer | null = null;
+  constructor(private _version: string | null = null) {
+    this._semver = _version ? new SemVer(_version) : null;
+  }
+
+  isAlpha() { return this.qualifier == 'alpha'; }
+  isBeta() { return this.qualifier == 'beta'; }
+  isReleaseCandidate() { return this.qualifier == 'rc'; }
+  isKnown() { return this._version !== null; }
+
+  isLocal() { return this.isKnown() && this._version && path.isAbsolute(this._version); }
+  isGreaterThanOrEqualTo(other: SemVer) {
+    return this._semver !== null && this._semver.compare(other) >= 0;
+  }
+  satisfies(other: string) {
+    // This comparison includes pre-releases (like betas and rcs), and considers them to be
+    // before the release proper.
+    // e.g. '9.0.0-beta.1' will satisfy '>=7.0.0 <9.0.0', but '9.0.0' will not.
+    return this._semver !== null && satisfies(this._semver, other, { includePrerelease: true });
+  }
+
+  get major() { return this._semver ? this._semver.major : 0; }
+  get minor() { return this._semver ? this._semver.minor : 0; }
+  get patch() { return this._semver ? this._semver.patch : 0; }
+  get qualifier() { return this._semver ? this._semver.prerelease[0] : ''; }
+  get extra() { return this._semver ? this._semver.prerelease[1] : ''; }
+
+  toString() { return this._version; }
+
+  static assertCompatibleAngularVersion(projectRoot: string) {
+    let angularCliPkgJson;
+    let angularPkgJson;
+    let rxjsPkgJson;
+    const resolveOptions = { paths: [projectRoot] };
+
+    try {
+      const angularPackagePath = require.resolve('@angular/core/package.json', resolveOptions);
+      const rxjsPackagePath = require.resolve('rxjs/package.json', resolveOptions);
+
+      angularPkgJson = require(angularPackagePath);
+      rxjsPkgJson = require(rxjsPackagePath);
+    } catch {
+      console.error(terminal.bold(terminal.red(tags.stripIndents`
+        You seem to not be depending on "@angular/core" and/or "rxjs". This is an error.
+      `)));
+      process.exit(2);
+    }
+
+    if (!(angularPkgJson && angularPkgJson['version'] && rxjsPkgJson && rxjsPkgJson['version'])) {
+      console.error(terminal.bold(terminal.red(tags.stripIndents`
+        Cannot determine versions of "@angular/core" and/or "rxjs".
+        This likely means your local installation is broken. Please reinstall your packages.
+      `)));
+      process.exit(2);
+    }
+
+    try {
+      const angularCliPkgPath = require.resolve('@angular/cli/package.json', resolveOptions);
+      angularCliPkgJson = require(angularCliPkgPath);
+      if (!(angularCliPkgJson && angularCliPkgJson['version'])) {
+        throw new Error();
+      }
+    } catch (error) {
+      console.error(terminal.bold(terminal.red(tags.stripIndents`
+        Cannot determine versions of "@angular/cli".
+        This likely means your local installation is broken. Please reinstall your packages.
+      `)));
+      process.exit(2);
+    }
+
+    const cliMajor = new Version(angularCliPkgJson['version']).major;
+    // e.g. CLI 8.0 supports '>=8.0.0 <9.0.0', including pre-releases (betas, rcs, snapshots)
+    // of both 8 and 9.
+    const supportedAngularSemver = `^${cliMajor}.0.0-beta || ` +
+      `>=${cliMajor}.0.0 <${cliMajor + 1}.0.0`;
+
+    const angularVersion = new Version(angularPkgJson['version']);
+    const rxjsVersion = new Version(rxjsPkgJson['version']);
+
+    if (angularVersion.isLocal()) {
+      console.error(terminal.yellow('Using a local version of angular. Proceeding with care...'));
+
+      return;
+    }
+
+    if (!angularVersion.satisfies(supportedAngularSemver)) {
+      console.error(terminal.bold(terminal.red(tags.stripIndents`
+          This version of CLI is only compatible with Angular versions ${supportedAngularSemver},
+          but Angular version ${angularVersion} was found instead.
+
+          Please visit the link below to find instructions on how to update Angular.
+          https://angular-update-guide.firebaseapp.com/
+        ` + '\n')));
+      process.exit(3);
+    } else if (
+      angularVersion.isGreaterThanOrEqualTo(new SemVer('6.0.0-rc.0'))
+      && !rxjsVersion.isGreaterThanOrEqualTo(new SemVer('5.6.0-forward-compat.0'))
+      && !rxjsVersion.isGreaterThanOrEqualTo(new SemVer('6.0.0-beta.0'))
+    ) {
+      console.error(terminal.bold(terminal.red(tags.stripIndents`
+          This project uses version ${rxjsVersion} of RxJs, which is not supported by Angular v6+.
+          The official RxJs version that is supported is 5.6.0-forward-compat.0 and greater.
+
+          Please visit the link below to find instructions on how to update RxJs.
+          https://docs.google.com/document/d/12nlLt71VLKb-z3YaSGzUfx6mJbc34nsMXtByPUN35cg/edit#
+        ` + '\n')));
+      process.exit(3);
+    } else if (
+      angularVersion.isGreaterThanOrEqualTo(new SemVer('6.0.0-rc.0'))
+      && !rxjsVersion.isGreaterThanOrEqualTo(new SemVer('6.0.0-beta.0'))
+    ) {
+      console.warn(terminal.bold(terminal.red(tags.stripIndents`
+          This project uses a temporary compatibility version of RxJs (${rxjsVersion}).
+
+          Please visit the link below to find instructions on how to update RxJs.
+          https://docs.google.com/document/d/12nlLt71VLKb-z3YaSGzUfx6mJbc34nsMXtByPUN35cg/edit#
+        ` + '\n')));
+    }
+  }
+
+}

From e3a36c4d9ffca6f6e3f1978807a8a44ced7b1f05 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 24 Apr 2019 20:51:55 -0400
Subject: [PATCH 1251/1703] fix(@angular-devkit/build-angular): skip version
 check if unit-testing

---
 packages/angular_devkit/build_angular/src/utils/version.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/angular_devkit/build_angular/src/utils/version.ts b/packages/angular_devkit/build_angular/src/utils/version.ts
index 774678663b99..c4893e7eda6a 100644
--- a/packages/angular_devkit/build_angular/src/utils/version.ts
+++ b/packages/angular_devkit/build_angular/src/utils/version.ts
@@ -82,6 +82,11 @@ export class Version {
       process.exit(2);
     }
 
+    if (angularCliPkgJson['version'] === '0.0.0') {
+      // Internal testing version
+      return;
+    }
+
     const cliMajor = new Version(angularCliPkgJson['version']).major;
     // e.g. CLI 8.0 supports '>=8.0.0 <9.0.0', including pre-releases (betas, rcs, snapshots)
     // of both 8 and 9.

From 5b4b78bfbba61674286a695005167baff164b51c Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 25 Apr 2019 13:40:28 -0400
Subject: [PATCH 1252/1703] feat(@angular-devkit/build-angular): use evergreen
 version of zone.js with ES2015

---
 .../src/utils/webpack-browser-config.ts              | 12 +++++++++++-
 .../test/browser/differential_loading_spec_large.ts  |  9 +++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
index 652acc4d51e1..e9be1252836b 100644
--- a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
+++ b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
@@ -95,7 +95,17 @@ export async function generateWebpackConfig(
     wco.buildOptions.progress = defaultProgress(wco.buildOptions.progress);
 
     const partials = webpackPartialGenerator(wco);
-    const webpackConfig = webpackMerge(partials);
+    const webpackConfig = webpackMerge(partials) as webpack.Configuration;
+
+    if (supportES2015) {
+      if (!webpackConfig.resolve) {
+        webpackConfig.resolve = {};
+      }
+      if (!webpackConfig.resolve.alias) {
+        webpackConfig.resolve.alias = {};
+      }
+      webpackConfig.resolve.alias['zone.js/dist/zone'] = 'zone.js/dist/zone-evergreen';
+    }
 
     if (options.profile || process.env['NG_BUILD_PROFILING']) {
       const esVersionInFileName = getEsVersionForFileName(
diff --git a/packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts
index 386d82544530..62c80dafa543 100644
--- a/packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts
@@ -98,4 +98,13 @@ describe('Browser Builder with differential loading', () => {
     expect(await files['main-es5.js']).not.toContain('class');
     expect(await files['main-es2015.js']).toContain('class');
   });
+
+  it('uses the right zone.js variant', async () => {
+    const { files } = await browserBuild(architect, host, target, { optimization: false });
+    expect(await files['polyfills-es5.js']).toContain('zone.js/dist/zone');
+    expect(await files['polyfills-es5.js']).not.toContain('zone.js/dist/zone-evergreen');
+    expect(await files['polyfills-es5.js']).toContain('registerElementPatch');
+    expect(await files['polyfills-es2015.js']).toContain('zone.js/dist/zone-evergreen');
+    expect(await files['polyfills-es2015.js']).not.toContain('registerElementPatch');
+  });
 });

From 5f248204ec9a33773ca226b2bb7eaf4b6c6bf270 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 25 Apr 2019 21:28:21 -0400
Subject: [PATCH 1253/1703] fix(@angular-devkit/architect): propagate option
 validation errors

    By using the `SchemaValidationException` object, the underlying JSON schema validation errors will be propagated to the consuming code.  This allows for more detailed error reporting of malformed or incorrectly provided options.

Partially addresses #14269
---
 packages/angular_devkit/architect/src/architect.ts  | 6 ++----
 packages/angular_devkit/architect/src/index_spec.ts | 7 +++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/angular_devkit/architect/src/architect.ts b/packages/angular_devkit/architect/src/architect.ts
index 09f797cde570..fb92acc2e0e8 100644
--- a/packages/angular_devkit/architect/src/architect.ts
+++ b/packages/angular_devkit/architect/src/architect.ts
@@ -55,7 +55,7 @@ function _createJobHandlerFromBuilderInfo(
               if (result.success) {
                 return { ...v, options: result.data } as BuilderInput;
               } else if (result.errors) {
-                throw new Error('Options did not validate.' + result.errors.join());
+                throw new json.schema.SchemaValidationException(result.errors);
               } else {
                 return v;
               }
@@ -282,9 +282,7 @@ function _validateOptionsFactory(host: ArchitectHost, registry: json.schema.Sche
           if (success) {
             return of(data as json.JsonObject);
           } else {
-            throw new Error(
-              'Data did not validate: ' + (errors ? errors.join() : 'Unknown error.'),
-            );
+            throw new json.schema.SchemaValidationException(errors);
           }
         }),
       ).toPromise();
diff --git a/packages/angular_devkit/architect/src/index_spec.ts b/packages/angular_devkit/architect/src/index_spec.ts
index 597835e23075..495738a4f043 100644
--- a/packages/angular_devkit/architect/src/index_spec.ts
+++ b/packages/angular_devkit/architect/src/index_spec.ts
@@ -300,10 +300,9 @@ describe('architect', () => {
     // Should also error.
     const run2 = await architect.scheduleBuilder('package:do-it', {});
 
-    try {
-      await run2.output.toPromise();
-      expect('THE ABOVE LINE SHOULD NOT ERROR').toBe('false');
-    } catch {}
+    await expectAsync(run2.output.toPromise())
+      .toBeRejectedWith(jasmine.objectContaining({ message: jasmine.stringMatching('p1')}));
+
     await run2.stop();
   });
 });

From 2acded4bdd37f1de69d804bc427b265e8e354ef8 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 25 Apr 2019 22:59:39 -0400
Subject: [PATCH 1254/1703] fix(@schematics/angular): normalize differing TS
 AST versions in lazy module migration

---
 .../update-8/rules/noLazyModulePathsRule.ts           | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/angular/migrations/update-8/rules/noLazyModulePathsRule.ts b/packages/schematics/angular/migrations/update-8/rules/noLazyModulePathsRule.ts
index 1c15e84884a0..76e66b8af593 100644
--- a/packages/schematics/angular/migrations/update-8/rules/noLazyModulePathsRule.ts
+++ b/packages/schematics/angular/migrations/update-8/rules/noLazyModulePathsRule.ts
@@ -21,7 +21,16 @@ export class Rule extends Rules.AbstractRule {
     const ruleName = this.ruleName;
     const changes: RuleFailure[] = [];
 
-    ts.forEachChild(ast, function analyze(node) {
+    // NOTE: This should ideally be excluded at a higher level to avoid parsing
+    if (ast.isDeclarationFile || /[\\\/]node_modules[\\\/]/.test(ast.fileName)) {
+      return [];
+    }
+
+    // Workaround mismatched tslint TS version and vendored TS version
+    // The TS SyntaxKind enum numeric values change between versions
+    const sourceFile = ts.createSourceFile(ast.fileName, ast.text, ast.languageVersion, true);
+
+    ts.forEachChild(sourceFile, function analyze(node) {
       if (ts.isPropertyAssignment(node) &&
           (ts.isIdentifier(node.name) || ts.isStringLiteral(node.name)) &&
           node.name.text === 'loadChildren' &&

From 72dc96bb04c13f84a8c7e255b6c7a043229eb314 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 26 Apr 2019 08:54:29 -0400
Subject: [PATCH 1255/1703] fix(@schematics/angular): update zone.js version
 during CLI 8.0 migration

Fixes #14281
---
 .../angular/migrations/update-8/update-builders.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/schematics/angular/migrations/update-8/update-builders.ts b/packages/schematics/angular/migrations/update-8/update-builders.ts
index 92e59007081d..97e99e856780 100644
--- a/packages/schematics/angular/migrations/update-8/update-builders.ts
+++ b/packages/schematics/angular/migrations/update-8/update-builders.ts
@@ -42,6 +42,20 @@ export function updateBuilders() {
       );
     }
 
+    current = getPackageJsonDependency(host, 'zone.js');
+    if (current && current.version !== latestVersions.ZoneJs) {
+      updates = true;
+      addPackageJsonDependency(
+        host,
+        {
+          type: current.type,
+          name: 'zone.js',
+          version: latestVersions.ZoneJs,
+          overwrite: true,
+        },
+      );
+    }
+
     if (updates) {
       context.addTask(new NodePackageInstallTask());
     }

From bd143065214d974861ca96d20f8fbb058ea8b62b Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 26 Apr 2019 13:41:13 -0400
Subject: [PATCH 1256/1703] fix(@schematics/angular): set CLI 8.0 codelyzer
 migration version to ^5.0.1

---
 packages/schematics/angular/migrations/update-8/codelyzer-5.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/migrations/update-8/codelyzer-5.ts b/packages/schematics/angular/migrations/update-8/codelyzer-5.ts
index 49909a597669..ce3836e4aed4 100644
--- a/packages/schematics/angular/migrations/update-8/codelyzer-5.ts
+++ b/packages/schematics/angular/migrations/update-8/codelyzer-5.ts
@@ -82,7 +82,7 @@ export const updatePackageJson = () => {
     const dependency: NodeDependency = {
       type: NodeDependencyType.Dev,
       name: 'codelyzer',
-      version: '^5.0.0',
+      version: '^5.0.1',
       overwrite: true,
     };
 

From f1895964140e24397e273d893f8b5a8eb0672009 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 26 Apr 2019 13:41:13 -0400
Subject: [PATCH 1257/1703] test(@schematics/angular): set CLI 8.0 codelyzer
 migration version to ^5.0.1

---
 .../schematics/angular/migrations/update-8/codelyzer-5_spec.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/migrations/update-8/codelyzer-5_spec.ts b/packages/schematics/angular/migrations/update-8/codelyzer-5_spec.ts
index ee658e481ae0..438cafbdd8cc 100644
--- a/packages/schematics/angular/migrations/update-8/codelyzer-5_spec.ts
+++ b/packages/schematics/angular/migrations/update-8/codelyzer-5_spec.ts
@@ -79,7 +79,7 @@ describe('Migration to version 8', () => {
     it('should update codelyzer\'s version', () => {
       tree = schematicRunner.runSchematic('migration-07', defaultOptions, tree);
       const packageJson = JSON.parse(tree.readContent(packageJsonPath));
-      expect(packageJson.devDependencies.codelyzer).toBe('^5.0.0');
+      expect(packageJson.devDependencies.codelyzer).toBe('^5.0.1');
     });
   });
 });

From 29609fb0785646fdbb636b08853a13df65fac06a Mon Sep 17 00:00:00 2001
From: Kara <kara@users.noreply.github.com>
Date: Fri, 26 Apr 2019 12:13:59 -0700
Subject: [PATCH 1258/1703] Merge pull request #14287 from
 kara/revert-pure-getters

Revert "fix(@angular-devkit/build-angular): remove pure_getters"
---
 .../models/webpack-configs/common.ts            | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 4df73e82b840..7d76a8f926eb 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -279,13 +279,18 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
         comments: false,
         webkit: true,
       },
-      compress: {
-        // PURE comments work best with 3 passes.
-        // See https://github.com/webpack/webpack/issues/2899#issuecomment-317425926.
-        passes: 3,
+      // On server, we don't want to compress anything. We still set the ngDevMode = false for it
+      // to remove dev code, and ngI18nClosureMode to remove Closure compiler i18n code
+      compress: (buildOptions.platform == 'server' ? {
         global_defs: angularGlobalDefinitions,
-      },
-      // We want to avoid mangling on server.
+      } : {
+          pure_getters: buildOptions.buildOptimizer,
+          // PURE comments work best with 3 passes.
+          // See https://github.com/webpack/webpack/issues/2899#issuecomment-317425926.
+          passes: buildOptions.buildOptimizer ? 3 : 1,
+          global_defs: angularGlobalDefinitions,
+        }),
+      // We also want to avoid mangling on server.
       ...(buildOptions.platform == 'server' ? { mangle: false } : {}),
     };
 

From b2262e93c16563fce380ed99601f56f6e80c4fba Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Mon, 29 Apr 2019 13:16:13 +0200
Subject: [PATCH 1259/1703] fix(@angular-devkit/build-angular): live reload
 cannot be disabled

By default the application will be served with inline mode enabled. This means that a script will be inserted in your bundle to take care of live reloading.

However at the moment we are already adding these scripts in `_addLiveReload` method.

With this change we always disable this behaviour and only add it when needed via the `_addLiveReload` logic.

Eventually we should try to remove the logic and rely on webpack-dev-server interals.

Fixes #14300
---
 packages/angular_devkit/build_angular/src/dev-server/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index 121056c54ac8..ea8f7d60232a 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -274,6 +274,8 @@ export function buildServerConfig(
       errors: !(styles || scripts),
       warnings: false,
     },
+    // inline is always false, because we add live reloading scripts in _addLiveReload when needed
+    inline: false,
     public: serverOptions.publicHost,
     disableHostCheck: serverOptions.disableHostCheck,
     publicPath: servePath,

From 8089a3fb76bc3cabaf9f673acba918ed1a03618a Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 26 Apr 2019 14:09:29 -0400
Subject: [PATCH 1260/1703] fix(@angular-devkit/core): support writing an empty
 object workspace

---
 packages/angular_devkit/core/src/workspace/core_spec.ts   | 2 +-
 packages/angular_devkit/core/src/workspace/json/writer.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/core/src/workspace/core_spec.ts b/packages/angular_devkit/core/src/workspace/core_spec.ts
index 214b26b062d1..f92170be2586 100644
--- a/packages/angular_devkit/core/src/workspace/core_spec.ts
+++ b/packages/angular_devkit/core/src/workspace/core_spec.ts
@@ -289,7 +289,7 @@ describe('readWorkspace', () => {
 });
 
 describe('writeWorkspace', () => {
-  xit('attempts to write to specified file path', async (done) => {
+  it('attempts to write to specified file path', async (done) => {
     const requestedPath = '/path/to/workspace/angular.json';
 
     let writtenPath: string | undefined;
diff --git a/packages/angular_devkit/core/src/workspace/json/writer.ts b/packages/angular_devkit/core/src/workspace/json/writer.ts
index 612258636718..8087d810e5ff 100644
--- a/packages/angular_devkit/core/src/workspace/json/writer.ts
+++ b/packages/angular_devkit/core/src/workspace/json/writer.ts
@@ -55,7 +55,7 @@ function convertJsonWorkspace(workspace: WorkspaceDefinition, schema?: string):
     $schema: schema || './node_modules/@angular/cli/lib/config/schema.json',
     version: 1,
     ...workspace.extensions,
-    projects: convertJsonProjectCollection(workspace.projects),
+    projects: workspace.projects ? convertJsonProjectCollection(workspace.projects) : {},
   };
 
   return obj;

From 4761b58de4f938763a51785dad53a47e3dbc7ef1 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 7 May 2019 20:28:21 +0200
Subject: [PATCH 1261/1703] build: update ts-api-guardian to version 0.4.4
 (#14278)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index ba3926434399..8723de0a4f01 100644
--- a/package.json
+++ b/package.json
@@ -134,7 +134,7 @@
     "tar": "^4.4.4",
     "through2": "^2.0.3",
     "tree-kill": "^1.2.0",
-    "ts-api-guardian": "0.4.2",
+    "ts-api-guardian": "0.4.4",
     "ts-node": "^5.0.0",
     "tslint-no-circular-imports": "^0.6.0",
     "tslint-sonarts": "1.9.0"
diff --git a/yarn.lock b/yarn.lock
index 2bedc0b45472..2f56665e6a6a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9466,10 +9466,10 @@ triple-beam@^1.2.0, triple-beam@^1.3.0:
   resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9"
   integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==
 
-ts-api-guardian@0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/ts-api-guardian/-/ts-api-guardian-0.4.2.tgz#c3d01747f112f2ec049906f63223c6bbb777af59"
-  integrity sha512-ewfaxuSATse2BxRgX2qdOui6DG9+gvlbCjr7L122LzjxlqAFZnqDY9HR0ID768vQbm0aBfyK/jDLgH1vQtpkew==
+ts-api-guardian@0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/ts-api-guardian/-/ts-api-guardian-0.4.4.tgz#12dfcfa5c5d6c5a8cb2f1b7cc322b9510a81814c"
+  integrity sha512-nWJQRNSeV+er9/deUo/tdYD7Rm7tKOwbcexI8UbqrzC3uAGm2UWncZ9USK0i6kTvT5hCvhW5VNw76JQ8L7Aq8A==
   dependencies:
     chalk "^2.3.1"
     diff "^3.5.0"

From da1f3386d0d4a6193bbb717d36dfff47e4532f24 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 7 May 2019 20:30:53 +0200
Subject: [PATCH 1262/1703] build: update typescript to version 3.4.5 (#14258)

---
 package.json                                              | 2 +-
 packages/angular_devkit/build_optimizer/package.json      | 2 +-
 packages/ngtools/webpack/package.json                     | 2 +-
 .../schematics/schematics/schematic/files/package.json    | 2 +-
 yarn.lock                                                 | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 8723de0a4f01..cc49595194c2 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "quicktype-core": "^6.0.15",
     "temp": "^0.9.0",
     "tslint": "^5.15.0",
-    "typescript": "3.4.4"
+    "typescript": "3.4.5"
   },
   "devDependencies": {
     "@angular/compiler": "^8.0.0-beta.14",
diff --git a/packages/angular_devkit/build_optimizer/package.json b/packages/angular_devkit/build_optimizer/package.json
index 4a4546491253..5755fdc9af00 100644
--- a/packages/angular_devkit/build_optimizer/package.json
+++ b/packages/angular_devkit/build_optimizer/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "loader-utils": "1.2.3",
     "source-map": "0.5.6",
-    "typescript": "3.4.4",
+    "typescript": "3.4.5",
     "webpack-sources": "1.3.0"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 3e6f3be2e755..3ad448143516 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -35,7 +35,7 @@
   "devDependencies": {
     "@angular/compiler": "^8.0.0-beta.14",
     "@angular/compiler-cli": "^8.0.0-beta.14",
-    "typescript": "3.4.4",
+    "typescript": "3.4.5",
     "webpack": "4.30.0"
   }
 }
diff --git a/packages/schematics/schematics/schematic/files/package.json b/packages/schematics/schematics/schematic/files/package.json
index bdec3f08c492..29db628a2212 100644
--- a/packages/schematics/schematics/schematic/files/package.json
+++ b/packages/schematics/schematics/schematic/files/package.json
@@ -18,6 +18,6 @@
     "@types/jasmine": "^3.3.9",
     "@types/node": "^8.0.31",
     "jasmine": "^3.3.1",
-    "typescript": "3.4.4"
+    "typescript": "3.4.5"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 2f56665e6a6a..cfbacfc926a9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9576,10 +9576,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@3.4.4:
-  version "3.4.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.4.tgz#aac4a08abecab8091a75f10842ffa0631818f785"
-  integrity sha512-xt5RsIRCEaf6+j9AyOBgvVuAec0i92rgCaS3S+UVf5Z/vF2Hvtsw08wtUTJqp4djwznoAgjSxeCcU4r+CcDBJA==
+typescript@3.4.5:
+  version "3.4.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.5.tgz#2d2618d10bb566572b8d7aad5180d84257d70a99"
+  integrity sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==
 
 uglify-js@^3.1.4:
   version "3.4.9"

From 1f92015863874df654420b61cb8ef8c036a68e2f Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 7 May 2019 20:31:04 +0200
Subject: [PATCH 1263/1703] build: update copy-webpack-plugin to version 5.0.3
 (#14268)

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 62 ++++++++++++++-----
 2 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index c7ba522fbbfd..9d88c60e5491 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -18,7 +18,7 @@
     "caniuse-api": "3.0.0",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
-    "copy-webpack-plugin": "5.0.2",
+    "copy-webpack-plugin": "5.0.3",
     "core-js": "3.0.1",
     "file-loader": "3.0.1",
     "glob": "7.1.3",
diff --git a/yarn.lock b/yarn.lock
index cfbacfc926a9..8e2f2a4683c1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1755,7 +1755,7 @@ cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0:
     unique-filename "^1.1.0"
     y18n "^4.0.0"
 
-cacache@^11.3.1, cacache@^11.3.2:
+cacache@^11.3.2:
   version "11.3.2"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
   integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==
@@ -2573,21 +2573,22 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-webpack-plugin@5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.2.tgz#56186dfddbf9aa1b29c97fa4c796c1be98870da4"
-  integrity sha512-7nC7EynPrnBTtBwwbG1aTqrfNS1aTb9eEjSmQDqFtKAsJrR3uDb+pCDIFT2LzhW+SgGJxQcYzThrmXzzZ720uw==
+copy-webpack-plugin@5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.3.tgz#2179e3c8fd69f13afe74da338896f1f01a875b5c"
+  integrity sha512-PlZRs9CUMnAVylZq+vg2Juew662jWtwOXOqH4lbQD9ZFhRG9R7tVStOgHt21CBGVq7k5yIJaz8TXDLSjV+Lj8Q==
   dependencies:
-    cacache "^11.3.1"
-    find-cache-dir "^2.0.0"
+    cacache "^11.3.2"
+    find-cache-dir "^2.1.0"
     glob-parent "^3.1.0"
     globby "^7.1.1"
-    is-glob "^4.0.0"
-    loader-utils "^1.1.0"
+    is-glob "^4.0.1"
+    loader-utils "^1.2.3"
     minimatch "^3.0.4"
     normalize-path "^3.0.0"
-    p-limit "^2.1.0"
-    serialize-javascript "^1.4.0"
+    p-limit "^2.2.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^1.7.0"
     webpack-log "^2.0.0"
 
 core-js@3.0.1:
@@ -3779,6 +3780,15 @@ find-cache-dir@^2.0.0:
     make-dir "^1.0.0"
     pkg-dir "^3.0.0"
 
+find-cache-dir@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
+  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^2.0.0"
+    pkg-dir "^3.0.0"
+
 find-parent-dir@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
@@ -4887,6 +4897,13 @@ is-glob@^4.0.0:
   dependencies:
     is-extglob "^2.1.1"
 
+is-glob@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+  dependencies:
+    is-extglob "^2.1.1"
+
 is-installed-globally@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80"
@@ -5697,7 +5714,7 @@ loader-runner@^2.3.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.1.tgz#026f12fe7c3115992896ac02ba022ba92971b979"
   integrity sha512-By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw==
 
-loader-utils@1.2.3:
+loader-utils@1.2.3, loader-utils@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
   integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
@@ -5904,6 +5921,14 @@ make-dir@^1.0.0, make-dir@^1.3.0:
   dependencies:
     pify "^3.0.0"
 
+make-dir@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
+  dependencies:
+    pify "^4.0.1"
+    semver "^5.6.0"
+
 make-error@^1.1.1:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
@@ -6896,10 +6921,10 @@ p-limit@^2.0.0:
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.1.0.tgz#1d5a0d20fb12707c758a655f6bbc4386b5930d68"
-  integrity sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==
+p-limit@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2"
+  integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==
   dependencies:
     p-try "^2.0.0"
 
@@ -8386,6 +8411,11 @@ serialize-javascript@^1.4.0:
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
   integrity sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==
 
+serialize-javascript@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz#d6e0dfb2a3832a8c94468e6eb1db97e55a192a65"
+  integrity sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==
+
 serve-index@^1.7.2, serve-index@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"

From 968204fa2a0920daf48844a0edffc26eb5adb7da Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 7 May 2019 20:31:45 +0200
Subject: [PATCH 1264/1703] refactor(@angular-devkit/architect): remove
 `_registry` from being a private (#14182)

---
 etc/api/angular_devkit/architect/src/index.d.ts    |  2 +-
 packages/angular_devkit/architect/src/architect.ts | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/etc/api/angular_devkit/architect/src/index.d.ts b/etc/api/angular_devkit/architect/src/index.d.ts
index db5ff0a7f9b0..be03aecd6029 100644
--- a/etc/api/angular_devkit/architect/src/index.d.ts
+++ b/etc/api/angular_devkit/architect/src/index.d.ts
@@ -1,5 +1,5 @@
 export declare class Architect {
-    constructor(_host: ArchitectHost, _registry?: json.schema.SchemaRegistry, additionalJobRegistry?: experimental.jobs.Registry);
+    constructor(_host: ArchitectHost, registry?: json.schema.SchemaRegistry, additionalJobRegistry?: experimental.jobs.Registry);
     has(name: experimental.jobs.JobName): Observable<boolean>;
     scheduleBuilder(name: string, options: json.JsonObject, scheduleOptions?: ScheduleOptions): Promise<BuilderRun>;
     scheduleTarget(target: Target, overrides?: json.JsonObject, scheduleOptions?: ScheduleOptions): Promise<BuilderRun>;
diff --git a/packages/angular_devkit/architect/src/architect.ts b/packages/angular_devkit/architect/src/architect.ts
index fb92acc2e0e8..e2ecb429e2c4 100644
--- a/packages/angular_devkit/architect/src/architect.ts
+++ b/packages/angular_devkit/architect/src/architect.ts
@@ -309,23 +309,23 @@ export class Architect {
 
   constructor(
     private _host: ArchitectHost,
-    private _registry: json.schema.SchemaRegistry = new json.schema.CoreSchemaRegistry(),
+    registry: json.schema.SchemaRegistry = new json.schema.CoreSchemaRegistry(),
     additionalJobRegistry?: experimental.jobs.Registry,
   ) {
     const privateArchitectJobRegistry = new experimental.jobs.SimpleJobRegistry();
     // Create private jobs.
     privateArchitectJobRegistry.register(_getTargetOptionsFactory(_host));
     privateArchitectJobRegistry.register(_getBuilderNameForTargetFactory(_host));
-    privateArchitectJobRegistry.register(_validateOptionsFactory(_host, _registry));
+    privateArchitectJobRegistry.register(_validateOptionsFactory(_host, registry));
 
     const jobRegistry = new experimental.jobs.FallbackRegistry([
-      new ArchitectTargetJobRegistry(_host, _registry, this._jobCache, this._infoCache),
-      new ArchitectBuilderJobRegistry(_host, _registry, this._jobCache, this._infoCache),
+      new ArchitectTargetJobRegistry(_host, registry, this._jobCache, this._infoCache),
+      new ArchitectBuilderJobRegistry(_host, registry, this._jobCache, this._infoCache),
       privateArchitectJobRegistry,
       ...(additionalJobRegistry ? [additionalJobRegistry] : []),
     ] as experimental.jobs.Registry[]);
 
-    this._scheduler = new experimental.jobs.SimpleScheduler(jobRegistry, _registry);
+    this._scheduler = new experimental.jobs.SimpleScheduler(jobRegistry, registry);
   }
 
   has(name: experimental.jobs.JobName) {

From 16ce92d77a469bdda3341c5fcf746e8dc1b707b8 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 7 May 2019 20:32:57 +0200
Subject: [PATCH 1265/1703] fix(@angular-devkit/build-angular): e2e does not
 respect dev-server host and port settings (#14165)

Fixes #14151
---
 .../build_angular/src/protractor/index.ts     | 17 +++++++++--
 .../build_angular/src/protractor/schema.json  |  3 +-
 tests/legacy-cli/e2e/tests/misc/e2e-host.ts   | 28 +++++++++++++++++++
 3 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 tests/legacy-cli/e2e/tests/misc/e2e-host.ts

diff --git a/packages/angular_devkit/build_angular/src/protractor/index.ts b/packages/angular_devkit/build_angular/src/protractor/index.ts
index c57d44d9010b..940f49f5475a 100644
--- a/packages/angular_devkit/build_angular/src/protractor/index.ts
+++ b/packages/angular_devkit/build_angular/src/protractor/index.ts
@@ -105,10 +105,21 @@ async function execute(
     const serverOptions = await context.getTargetOptions(target);
 
     const overrides: Record<string, string | number | boolean> = { watch: false };
-    if (options.host !== undefined) { overrides.host = options.host; }
-    if (options.port !== undefined) { overrides.port = options.port; }
-    server = await context.scheduleTarget(target, overrides);
+    if (options.host !== undefined) {
+      overrides.host = options.host;
+    } else if (typeof serverOptions.host === 'string') {
+      options.host = serverOptions.host;
+    } else {
+      options.host = overrides.host = 'localhost';
+    }
 
+    if (options.port !== undefined) {
+      overrides.port = options.port;
+    } else if (typeof serverOptions.port === 'number') {
+      options.port = serverOptions.port;
+    }
+
+    server = await context.scheduleTarget(target, overrides);
     let result;
     try {
       result = await server.result;
diff --git a/packages/angular_devkit/build_angular/src/protractor/schema.json b/packages/angular_devkit/build_angular/src/protractor/schema.json
index 1303da5b2511..4aea8deaecbc 100644
--- a/packages/angular_devkit/build_angular/src/protractor/schema.json
+++ b/packages/angular_devkit/build_angular/src/protractor/schema.json
@@ -41,8 +41,7 @@
     },
     "host": {
       "type": "string",
-      "description": "Host to listen on.",
-      "default": "localhost"
+      "description": "Host to listen on."
     },
     "baseUrl": {
       "type": "string",
diff --git a/tests/legacy-cli/e2e/tests/misc/e2e-host.ts b/tests/legacy-cli/e2e/tests/misc/e2e-host.ts
new file mode 100644
index 000000000000..08d3a76712ae
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/misc/e2e-host.ts
@@ -0,0 +1,28 @@
+import * as os from 'os';
+import { killAllProcesses, ng } from '../../utils/process';
+import { updateJsonFile } from '../../utils/project';
+
+export default async function () {
+  const interfaces = [].concat.apply([], Object.values(os.networkInterfaces()));
+  let host = '';
+  for (const { family, address, internal } of interfaces) {
+    if (family === 'IPv4' && !internal) {
+      host = address;
+      break;
+    }
+  }
+
+  try {
+    await updateJsonFile('angular.json', workspaceJson => {
+      const appArchitect = workspaceJson.projects['test-project'].architect;
+      appArchitect.serve.options.port = 8888;
+      appArchitect.serve.options.host = host;
+    });
+
+    await ng('e2e');
+
+    await ng('e2e', '--host', host);
+  } finally {
+    await killAllProcesses();
+  }
+}

From 9805e8428de86a3c38f9bb800ee47bf15aaada03 Mon Sep 17 00:00:00 2001
From: Tiago Temporin <tiaguinho@users.noreply.github.com>
Date: Tue, 7 May 2019 19:34:27 +0100
Subject: [PATCH 1266/1703] feat(@angular/cli): implement --registry for ng add
 (#14285)

Closes 14189
---
 packages/angular/cli/commands/add-impl.ts |  4 ++--
 packages/angular/cli/commands/add.json    | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/angular/cli/commands/add-impl.ts b/packages/angular/cli/commands/add-impl.ts
index e3d95becc3d3..e005d5e36314 100644
--- a/packages/angular/cli/commands/add-impl.ts
+++ b/packages/angular/cli/commands/add-impl.ts
@@ -64,7 +64,7 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
         packageMetadata = await fetchPackageMetadata(
           packageIdentifier.name,
           this.logger,
-          { usingYarn },
+          { registry: options.registry, usingYarn },
         );
       } catch (e) {
         this.logger.error('Unable to fetch package metadata: ' + e.message);
@@ -114,7 +114,7 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
         const manifest = await fetchPackageManifest(
           packageIdentifier,
           this.logger,
-          { usingYarn },
+          { registry: options.registry, usingYarn },
         );
 
         collectionName = manifest.name;
diff --git a/packages/angular/cli/commands/add.json b/packages/angular/cli/commands/add.json
index 97d7400dd739..a44773d6f7c3 100644
--- a/packages/angular/cli/commands/add.json
+++ b/packages/angular/cli/commands/add.json
@@ -18,6 +18,18 @@
             "$source": "argv",
             "index": 0
           }
+        },
+        "registry": {
+          "description": "The NPM registry to use.",
+          "type": "string",
+          "oneOf": [
+            {
+              "format": "uri"
+            },
+            {
+              "format": "hostname"
+            }
+          ]
         }
       },
       "required": [

From 300ea1f723640d9fec9dfc0eb772d345e3eb95ba Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 7 May 2019 19:34:54 +0100
Subject: [PATCH 1267/1703] remove unused ascii-progress library, resolve
 toplevel browserslist to 4.5.5  (#14303)

* build: remove unused ascii-progress library

Ran into https://github.com/bubkoo/ascii-progress/issues/8 on Windows, but we don't even use this dependency anyway.

* build: resolve toplevel browserslist to 4.5.5

Prevents `BrowserslistError: Unknown browser kaios` error on test-large due to browserslist version skew between hoisted packages.
---
 .../angular_devkit/architect_cli/package.json |  1 -
 yarn.lock                                     | 88 +------------------
 2 files changed, 4 insertions(+), 85 deletions(-)

diff --git a/packages/angular_devkit/architect_cli/package.json b/packages/angular_devkit/architect_cli/package.json
index a434f7adbbc8..6e147149d069 100644
--- a/packages/angular_devkit/architect_cli/package.json
+++ b/packages/angular_devkit/architect_cli/package.json
@@ -16,7 +16,6 @@
     "@angular-devkit/architect": "0.0.0",
     "@angular-devkit/core": "0.0.0",
     "@types/progress": "^2.0.3",
-    "ascii-progress": "^1.0.5",
     "minimist": "1.2.0",
     "progress": "^2.0.3",
     "rxjs": "6.4.0",
diff --git a/yarn.lock b/yarn.lock
index 8e2f2a4683c1..0c3b79df30c3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1022,13 +1022,6 @@ ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-ansi.js@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/ansi.js/-/ansi.js-0.0.5.tgz#e3e9e45eb6977ba0eeeeed11677d12144675348c"
-  integrity sha1-4+nkXraXe6Du7u0RZ30SFEZ1NIw=
-  dependencies:
-    on-new-line "0.0.1"
-
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -1156,17 +1149,6 @@ asap@^2.0.0, asap@~2.0.3:
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
-ascii-progress@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/ascii-progress/-/ascii-progress-1.0.5.tgz#9610aa127ab794af561e893613c36c906f78d9ee"
-  integrity sha1-lhCqEnq3lK9WHok2E8NskG942e4=
-  dependencies:
-    ansi.js "0.0.5"
-    end-with "^1.0.2"
-    get-cursor-position "1.0.3"
-    on-new-line "1.0.0"
-    start-with "^1.0.2"
-
 ascli@~1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ascli/-/ascli-1.0.1.tgz#bcfa5974a62f18e81cabaeb49732ab4a88f906bc"
@@ -1622,7 +1604,7 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@4.5.5:
+browserslist@4.5.5, browserslist@^4.0.0, browserslist@^4.3.3, browserslist@^4.5.4:
   version "4.5.5"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.5.tgz#fe1a352330d2490d5735574c149a85bc18ef9b82"
   integrity sha512-0QFO1r/2c792Ohkit5XI8Cm8pDtZxgNl2H6HU4mHrpYz7314pEYcsAVVatM0l/YmxPnEzh9VygXouj4gkFUTKA==
@@ -1631,24 +1613,6 @@ browserslist@4.5.5:
     electron-to-chromium "^1.3.124"
     node-releases "^1.1.14"
 
-browserslist@^4.0.0, browserslist@^4.3.3:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.4.tgz#4477b737db6a1b07077275b24791e680d4300425"
-  integrity sha512-u5iz+ijIMUlmV8blX82VGFrB9ecnUg5qEt55CMZ/YJEhha+d8qpBfOFuutJ6F/VKRXjZoD33b6uvarpPxcl3RA==
-  dependencies:
-    caniuse-lite "^1.0.30000899"
-    electron-to-chromium "^1.3.82"
-    node-releases "^1.0.1"
-
-browserslist@^4.5.4:
-  version "4.5.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.4.tgz#166c4ecef3b51737a42436ea8002aeea466ea2c7"
-  integrity sha512-rAjx494LMjqKnMPhFkuLmLp8JWEX0o8ADTGeAbOqaF+XCvYLreZrG5uVjnPBlAQ8REZK4pzXGvp0bWgrFtKaag==
-  dependencies:
-    caniuse-lite "^1.0.30000955"
-    electron-to-chromium "^1.3.122"
-    node-releases "^1.1.13"
-
 browserstack@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.5.1.tgz#e2dfa66ffee940ebad0a07f7e00fd4687c455d66"
@@ -1874,12 +1838,12 @@ caniuse-lite@^1.0.0:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000955.tgz#360fdb9a1e41d6dd996130411334e44a39e4446d"
   integrity sha512-6AwmIKgqCYfDWWadRkAuZSHMQP4Mmy96xAXEdRBlN/luQhlRYOKgwOlZ9plpCOsVbBuqbTmGqDK3JUM/nlr8CA==
 
-caniuse-lite@^1.0.30000898, caniuse-lite@^1.0.30000899:
+caniuse-lite@^1.0.30000898:
   version "1.0.30000903"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000903.tgz#86d46227759279b3db345ddbe778335dbba9e858"
   integrity sha512-T1XVJEpGCoaq7MDw7/6hCdYUukmSaS+1l/OQJkLtw7Cr2+/+d67tNGKEbyiqf7Ck8x6EhNFUxjYFXXka0N/w5g==
 
-caniuse-lite@^1.0.30000955, caniuse-lite@^1.0.30000957:
+caniuse-lite@^1.0.30000957:
   version "1.0.30000957"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz#fb1026bf184d7d62c685205358c3b24b9e29f7b3"
   integrity sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ==
@@ -3163,16 +3127,11 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.122, electron-to-chromium@^1.3.124:
+electron-to-chromium@^1.3.124:
   version "1.3.124"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
   integrity sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==
 
-electron-to-chromium@^1.3.82:
-  version "1.3.82"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.82.tgz#7d13ae4437d2a783de3f4efba96b186c540b67b1"
-  integrity sha512-NI4nB2IWGcU4JVT1AE8kBb/dFor4zjLHMLsOROPahppeHrR0FG5uslxMmkp/thO1MvPjM2xhlKoY29/I60s0ew==
-
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
@@ -3217,11 +3176,6 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-end-with@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/end-with/-/end-with-1.0.2.tgz#a432755ab4f51e7fc74f3a719c6b81df5d668bdc"
-  integrity sha1-pDJ1WrT1Hn/HTzpxnGuB311mi9w=
-
 engine.io-client@~3.2.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36"
@@ -3992,11 +3946,6 @@ get-caller-file@^1.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
   integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
-get-cursor-position@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/get-cursor-position/-/get-cursor-position-1.0.3.tgz#0e41d60343b705836a528d69a5e099e2c5108d63"
-  integrity sha1-DkHWA0O3BYNqUo1ppeCZ4sUQjWM=
-
 get-pkg-repo@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
@@ -6487,20 +6436,6 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.2.tgz#27c296d9fca3b659c64f7d43ea47a31ad2a90e4b"
-  integrity sha512-zP8Asfg13lG9KDAW85rylSxXBYvaSdtjMIYKHUk8c1fM8drmFwRqbSYKYD+UlNVPUvrceSvgLUKHMOWR5jPWQg==
-  dependencies:
-    semver "^5.3.0"
-
-node-releases@^1.1.13:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.13.tgz#8c03296b5ae60c08e2ff4f8f22ae45bd2f210083"
-  integrity sha512-fKZGviSXR6YvVPyc011NHuJDSD8gFQvLPmc2d2V3BS4gr52ycyQ1Xzs7a8B+Ax3Ni/W+5h1h4SqmzeoA8WZRmA==
-  dependencies:
-    semver "^5.3.0"
-
 node-releases@^1.1.14:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.15.tgz#9e76a73b0eca3bf7801addaa0e6ce90c795f2b9a"
@@ -6752,16 +6687,6 @@ on-headers@~1.0.2:
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
   integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
-on-new-line@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/on-new-line/-/on-new-line-0.0.1.tgz#99339cb06dcfe3e78d6964a2ef2af374a145f8fb"
-  integrity sha1-mTOcsG3P4+eNaWSi7yrzdKFF+Ps=
-
-on-new-line@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/on-new-line/-/on-new-line-1.0.0.tgz#8585bc2866c8c0e192e410a6d63bdd1722148ae7"
-  integrity sha1-hYW8KGbIwOGS5BCm1jvdFyIUiuc=
-
 once@1.x, once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -8977,11 +8902,6 @@ stack-trace@0.0.x:
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
   integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
 
-start-with@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/start-with/-/start-with-1.0.2.tgz#a069a5f46a95fca7f0874f85a28f653d0095c267"
-  integrity sha1-oGml9GqV/Kfwh0+Foo9lPQCVwmc=
-
 static-eval@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.0.tgz#0e821f8926847def7b4b50cda5d55c04a9b13864"

From 520b4494a88b45800e75a8ea9cdb5da6274ea0c2 Mon Sep 17 00:00:00 2001
From: owenmecham <owenmecham@users.noreply.github.com>
Date: Tue, 7 May 2019 12:35:09 -0600
Subject: [PATCH 1268/1703] docs(@angular/cli): fix typo with service schema
 (#14306)

change the typo "pipe" to "service" in the service schema
---
 packages/schematics/angular/service/schema.json | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/angular/service/schema.json b/packages/schematics/angular/service/schema.json
index 2dce3449d997..e11a84e1b957 100644
--- a/packages/schematics/angular/service/schema.json
+++ b/packages/schematics/angular/service/schema.json
@@ -47,11 +47,9 @@
     "lintFix": {
       "type": "boolean",
       "default": false,
-      "description": "When true, applies lint fixes after generating the pipe.",
+      "description": "When true, applies lint fixes after generating the service.",
       "x-user-analytics": 15
     }
   },
-  "required": [
-    "name"
-  ]
+  "required": ["name"]
 }

From e0246e2bc5abab9f677c649677f29a378e5c22e9 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 7 May 2019 20:35:36 +0200
Subject: [PATCH 1269/1703] build: update less-loader to version 5.0.0 (#14308)

---
 packages/angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                          | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 9d88c60e5491..a57f3f370174 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -25,7 +25,7 @@
     "istanbul-instrumenter-loader": "3.0.1",
     "karma-source-map-support": "1.4.0",
     "less": "3.9.0",
-    "less-loader": "4.1.0",
+    "less-loader": "5.0.0",
     "license-webpack-plugin": "2.1.1",
     "loader-utils": "1.2.3",
     "mini-css-extract-plugin": "0.6.0",
diff --git a/yarn.lock b/yarn.lock
index 0c3b79df30c3..09abacfffd57 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5538,14 +5538,14 @@ lcid@^2.0.0:
   dependencies:
     invert-kv "^2.0.0"
 
-less-loader@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-4.1.0.tgz#2c1352c5b09a4f84101490274fd51674de41363e"
-  integrity sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==
+less-loader@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-5.0.0.tgz#498dde3a6c6c4f887458ee9ed3f086a12ad1b466"
+  integrity sha512-bquCU89mO/yWLaUq0Clk7qCsKhsF/TZpJUzETRvJa9KSVEL9SO3ovCvdEHISBhrC81OwC8QSVX7E0bzElZj9cg==
   dependencies:
     clone "^2.1.1"
     loader-utils "^1.1.0"
-    pify "^3.0.0"
+    pify "^4.0.1"
 
 less-plugin-npm-import@^2.1.0:
   version "2.1.0"

From 4177b563c5fc3cbfda8d32bbe52978e38c6557f3 Mon Sep 17 00:00:00 2001
From: clydin <19598772+clydin@users.noreply.github.com>
Date: Tue, 7 May 2019 14:35:57 -0400
Subject: [PATCH 1270/1703] refactor(@angular-devkit/schematics): minor rule
 cleanup (#14313)

---
 packages/angular_devkit/schematics/src/rules/base.ts | 5 +----
 packages/angular_devkit/schematics/src/rules/call.ts | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/schematics/src/rules/base.ts b/packages/angular_devkit/schematics/src/rules/base.ts
index 8784ff4bed7d..33ba90fbe4de 100644
--- a/packages/angular_devkit/schematics/src/rules/base.ts
+++ b/packages/angular_devkit/schematics/src/rules/base.ts
@@ -70,7 +70,7 @@ export function mergeWith(source: Source, strategy: MergeStrategy = MergeStrateg
 
 
 export function noop(): Rule {
-  return (tree: Tree, _context: SchematicContext) => tree;
+  return () => {};
 }
 
 
@@ -159,12 +159,9 @@ export function forEach(operator: FileOperator): Rule {
         tree.overwrite(newEntry.path, newEntry.content);
       }
     });
-
-    return tree;
   };
 }
 
-
 export function composeFileOperators(operators: FileOperator[]): FileOperator {
   return (entry: FileEntry) => {
     let current: FileEntry | null = entry;
diff --git a/packages/angular_devkit/schematics/src/rules/call.ts b/packages/angular_devkit/schematics/src/rules/call.ts
index 369d81cd9eca..15f7b5bf5422 100644
--- a/packages/angular_devkit/schematics/src/rules/call.ts
+++ b/packages/angular_devkit/schematics/src/rules/call.ts
@@ -7,7 +7,7 @@
  */
 import { BaseException, isObservable, isPromise } from '@angular-devkit/core';
 import { Observable, from, of as observableOf, throwError } from 'rxjs';
-import { defaultIfEmpty, last, map, mergeMap, tap } from 'rxjs/operators';
+import { defaultIfEmpty, last, mergeMap, tap } from 'rxjs/operators';
 import { Rule, SchematicContext, Source } from '../engine/interface';
 import { Tree, TreeSymbol } from '../tree/interface';
 

From d546b83e04bdd86a317b52f2de40a45e8c7ce769 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 7 May 2019 19:37:56 +0100
Subject: [PATCH 1271/1703] fix(@angular-devkit/architect): error run on input
 schema error (#14315)

Fix #14269
---
 .../angular_devkit/architect/src/architect.ts | 50 ++++++++++++++-----
 .../architect/src/index_spec.ts               | 12 +++++
 2 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/packages/angular_devkit/architect/src/architect.ts b/packages/angular_devkit/architect/src/architect.ts
index e2ecb429e2c4..941320afff3c 100644
--- a/packages/angular_devkit/architect/src/architect.ts
+++ b/packages/angular_devkit/architect/src/architect.ts
@@ -6,8 +6,17 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { analytics, experimental, json, logging } from '@angular-devkit/core';
-import { Observable, from, of } from 'rxjs';
-import { concatMap, first, map, shareReplay, switchMap } from 'rxjs/operators';
+import { Observable, from, merge, of, onErrorResumeNext } from 'rxjs';
+import {
+  concatMap,
+  first,
+  ignoreElements,
+  last,
+  map,
+  shareReplay,
+  switchMap,
+  takeUntil,
+} from 'rxjs/operators';
 import {
   BuilderInfo,
   BuilderInput,
@@ -39,7 +48,8 @@ function _createJobHandlerFromBuilderInfo(
   };
 
   function handler(argument: json.JsonObject, context: experimental.jobs.JobHandlerContext) {
-    const inboundBus = context.inboundBus.pipe(
+    // Add input validation to the inbound bus.
+    const inboundBusWithInputValidation = context.inboundBus.pipe(
       concatMap(message => {
         if (message.kind === experimental.jobs.JobInboundMessageKind.Input) {
           const v = message.value as BuilderInput;
@@ -51,14 +61,12 @@ function _createJobHandlerFromBuilderInfo(
           // Validate v against the options schema.
           return registry.compile(info.optionSchema).pipe(
             concatMap(validation => validation(options)),
-            map(result => {
-              if (result.success) {
-                return { ...v, options: result.data } as BuilderInput;
-              } else if (result.errors) {
-                throw new json.schema.SchemaValidationException(result.errors);
-              } else {
-                return v;
+            map(({ data, success, errors }) => {
+              if (success) {
+                return { ...v, options: data } as BuilderInput;
               }
+
+              throw new json.schema.SchemaValidationException(errors);
             }),
             map(value => ({ ...message, value })),
           );
@@ -71,7 +79,11 @@ function _createJobHandlerFromBuilderInfo(
       shareReplay(1),
     );
 
-    return from(host.loadBuilder(info)).pipe(
+    // Make an inboundBus that completes instead of erroring out.
+    // We'll merge the errors into the output instead.
+    const inboundBus = onErrorResumeNext(inboundBusWithInputValidation);
+
+    const output = from(host.loadBuilder(info)).pipe(
       concatMap(builder => {
         if (builder === null) {
           throw new Error(`Cannot load builder for builderInfo ${JSON.stringify(info, null, 2)}`);
@@ -94,7 +106,19 @@ function _createJobHandlerFromBuilderInfo(
           }),
         );
       }),
+      // Share subscriptions to the output, otherwise the the handler will be re-run.
+      shareReplay(),
     );
+
+    // Separate the errors from the inbound bus into their own observable that completes when the
+    // builder output does.
+    const inboundBusErrors = inboundBusWithInputValidation.pipe(
+      ignoreElements(),
+      takeUntil(onErrorResumeNext(output.pipe(last()))),
+    );
+
+    // Return the builder output plus any input errors.
+    return merge(inboundBusErrors, output);
   }
 
   return of(Object.assign(handler, { jobDescription }) as BuilderJobHandler);
@@ -281,9 +305,9 @@ function _validateOptionsFactory(host: ArchitectHost, registry: json.schema.Sche
         switchMap(({ data, success, errors }) => {
           if (success) {
             return of(data as json.JsonObject);
-          } else {
-            throw new json.schema.SchemaValidationException(errors);
           }
+
+          throw new json.schema.SchemaValidationException(errors);
         }),
       ).toPromise();
     },
diff --git a/packages/angular_devkit/architect/src/index_spec.ts b/packages/angular_devkit/architect/src/index_spec.ts
index 495738a4f043..24a44e487d49 100644
--- a/packages/angular_devkit/architect/src/index_spec.ts
+++ b/packages/angular_devkit/architect/src/index_spec.ts
@@ -191,6 +191,18 @@ describe('architect', () => {
     }
   });
 
+  it('reports errors in options', async () => {
+    const builderName = 'options:error';
+    const builder = createBuilder(() => ({ success: true }));
+    const optionSchema = { type: 'object', additionalProperties: false };
+    testArchitectHost.addBuilder(builderName, builder, '', optionSchema);
+
+    const run = await architect.scheduleBuilder(builderName, { extraProp: true });
+    await expectAsync(run.result).toBeRejectedWith(
+      jasmine.objectContaining({ message: jasmine.stringMatching('extraProp') }));
+    await run.stop();
+  });
+
   it('exposes getTargetOptions() properly', async () => {
     const goldenOptions = {
       value: 'value',

From b9479b5230815014b22f11593573862c8d43c023 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 7 May 2019 19:39:16 +0100
Subject: [PATCH 1272/1703] fix(@ngtools/webpack): log ngcc info messages
 (#14320)

Fix #14194
---
 packages/ngtools/webpack/src/ngcc_processor.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/ngtools/webpack/src/ngcc_processor.ts b/packages/ngtools/webpack/src/ngcc_processor.ts
index 8e96e315a880..a0a371b42de7 100644
--- a/packages/ngtools/webpack/src/ngcc_processor.ts
+++ b/packages/ngtools/webpack/src/ngcc_processor.ts
@@ -112,7 +112,10 @@ class NgccLogger implements Logger {
 
   debug(..._args: string[]) { }
 
-  info(..._args: string[]) { }
+  info(...args: string[]) {
+    // Log to stderr because it's a progress-like info message.
+    process.stderr.write(`\n${args.join(' ')}\n`);
+  }
 
   warn(...args: string[]) {
     this.compilationWarnings.push(args.join(' '));

From 537bf5e2fa0ea1dc734f223ede5e3bedd5de28e6 Mon Sep 17 00:00:00 2001
From: clydin <19598772+clydin@users.noreply.github.com>
Date: Tue, 7 May 2019 14:42:46 -0400
Subject: [PATCH 1273/1703] fix(@schematics/angular): reduce package installs
 for 8.0 migrations (#14324)

This provides a ~30% performance improvement for a hello world project.
---
 .../angular/migrations/update-8/codelyzer-5.ts     |  7 +------
 .../angular/migrations/update-8/index.ts           | 12 ++++++++----
 .../migrations/update-8/remove-angular-http.ts     |  8 ++------
 .../angular/migrations/update-8/update-builders.ts | 14 ++------------
 4 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-8/codelyzer-5.ts b/packages/schematics/angular/migrations/update-8/codelyzer-5.ts
index ce3836e4aed4..5116d4a2c10d 100644
--- a/packages/schematics/angular/migrations/update-8/codelyzer-5.ts
+++ b/packages/schematics/angular/migrations/update-8/codelyzer-5.ts
@@ -9,10 +9,8 @@
 import { JsonParseMode, parseJsonAst } from '@angular-devkit/core';
 import {
   Rule,
-  SchematicContext,
   Tree,
 } from '@angular-devkit/schematics';
-import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import {
   NodeDependency,
   NodeDependencyType,
@@ -78,7 +76,7 @@ export const updateTsLintConfig = (): Rule => {
 };
 
 export const updatePackageJson = () => {
-  return (host: Tree, context: SchematicContext) => {
+  return (host: Tree) => {
     const dependency: NodeDependency = {
       type: NodeDependencyType.Dev,
       name: 'codelyzer',
@@ -87,8 +85,5 @@ export const updatePackageJson = () => {
     };
 
     addPackageJsonDependency(host, dependency);
-    context.addTask(new NodePackageInstallTask());
-
-    return host;
   };
 };
diff --git a/packages/schematics/angular/migrations/update-8/index.ts b/packages/schematics/angular/migrations/update-8/index.ts
index 392cb2e092a4..b3cedee3e86e 100644
--- a/packages/schematics/angular/migrations/update-8/index.ts
+++ b/packages/schematics/angular/migrations/update-8/index.ts
@@ -6,10 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {
-  Rule,
-  chain,
-} from '@angular-devkit/schematics';
+import { Rule, chain } from '@angular-devkit/schematics';
+import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import { updatePackageJson, updateTsLintConfig } from './codelyzer-5';
 import { updateES5Projects } from './differential-loading';
 import { dropES2015Polyfills } from './drop-es6-polyfills';
@@ -27,6 +25,12 @@ export default function(): Rule {
       updateES5Projects(),
       updateBuilders(),
       removeAngularHttp(),
+      (tree, context) => {
+        const packageChanges = tree.actions.some(a => a.path.endsWith('/package.json'));
+        if (packageChanges) {
+          context.addTask(new NodePackageInstallTask());
+        }
+      },
     ]);
   };
 }
diff --git a/packages/schematics/angular/migrations/update-8/remove-angular-http.ts b/packages/schematics/angular/migrations/update-8/remove-angular-http.ts
index 93a393d8c4b8..d9279aeff5c2 100644
--- a/packages/schematics/angular/migrations/update-8/remove-angular-http.ts
+++ b/packages/schematics/angular/migrations/update-8/remove-angular-http.ts
@@ -6,15 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { SchematicContext, Tree } from '@angular-devkit/schematics';
-import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
+import { Tree } from '@angular-devkit/schematics';
 import { removePackageJsonDependency } from '../../utility/dependencies';
 
 export const removeAngularHttp = () => {
-  return (host: Tree, context: SchematicContext) => {
+  return (host: Tree) => {
     removePackageJsonDependency(host, '@angular/http');
-    context.addTask(new NodePackageInstallTask());
-
-    return host;
   };
 };
diff --git a/packages/schematics/angular/migrations/update-8/update-builders.ts b/packages/schematics/angular/migrations/update-8/update-builders.ts
index 97e99e856780..de83b3b83240 100644
--- a/packages/schematics/angular/migrations/update-8/update-builders.ts
+++ b/packages/schematics/angular/migrations/update-8/update-builders.ts
@@ -5,18 +5,14 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { SchematicContext, Tree } from '@angular-devkit/schematics';
-import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
+import { Tree } from '@angular-devkit/schematics';
 import { addPackageJsonDependency, getPackageJsonDependency } from '../../utility/dependencies';
 import { latestVersions } from '../../utility/latest-versions';
 
 export function updateBuilders() {
-  return (host: Tree, context: SchematicContext) => {
-    let updates = false;
-
+  return (host: Tree) => {
     let current = getPackageJsonDependency(host, '@angular-devkit/build-angular');
     if (current && current.version !== latestVersions.DevkitBuildAngular) {
-      updates = true;
       addPackageJsonDependency(
         host,
         {
@@ -30,7 +26,6 @@ export function updateBuilders() {
 
     current = getPackageJsonDependency(host, '@angular-devkit/build-ng-packagr');
     if (current && current.version !== latestVersions.DevkitBuildNgPackagr) {
-      updates = true;
       addPackageJsonDependency(
         host,
         {
@@ -44,7 +39,6 @@ export function updateBuilders() {
 
     current = getPackageJsonDependency(host, 'zone.js');
     if (current && current.version !== latestVersions.ZoneJs) {
-      updates = true;
       addPackageJsonDependency(
         host,
         {
@@ -55,9 +49,5 @@ export function updateBuilders() {
         },
       );
     }
-
-    if (updates) {
-      context.addTask(new NodePackageInstallTask());
-    }
   };
 }

From 01e242487b6452db1429de70c52e0f3b1d83fc24 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 1 May 2019 13:59:39 -0400
Subject: [PATCH 1274/1703] fix(@schematics/angular): avoid tslint overhead for
 lazy module migration

By using a pure schematic based implementation the overhead of running tslint can be removed.  This also has the benefit of allowing direct control over the files loaded and to modify files only within the schematic tree context.
For a hello world application, there was a ~20% performance improvement for the CLI migration from 7.0 to 8.0 as well as a ~10% reduction in memory usage.
---
 .../update-8/rules/noLazyModulePathsRule.ts   | 63 -------------
 .../update-8/update-lazy-module-paths.ts      | 90 ++++++++++++++-----
 .../update-8/update-lazy-module-paths_spec.ts | 22 ++---
 3 files changed, 75 insertions(+), 100 deletions(-)
 delete mode 100644 packages/schematics/angular/migrations/update-8/rules/noLazyModulePathsRule.ts

diff --git a/packages/schematics/angular/migrations/update-8/rules/noLazyModulePathsRule.ts b/packages/schematics/angular/migrations/update-8/rules/noLazyModulePathsRule.ts
deleted file mode 100644
index 76e66b8af593..000000000000
--- a/packages/schematics/angular/migrations/update-8/rules/noLazyModulePathsRule.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import {
-    Replacement,
-    RuleFailure,
-    Rules,
-} from 'tslint'; // tslint:disable-line:no-implicit-dependencies
-import * as ts from '../../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
-
- // Constants:
-const LOAD_CHILDREN_SPLIT = '#';
-const FAILURE_MESSAGE = 'Found magic `loadChildren` string. Use a function with `import` instead.';
-
-export class Rule extends Rules.AbstractRule {
-  public apply (ast: ts.SourceFile): Array<RuleFailure> {
-    const ruleName = this.ruleName;
-    const changes: RuleFailure[] = [];
-
-    // NOTE: This should ideally be excluded at a higher level to avoid parsing
-    if (ast.isDeclarationFile || /[\\\/]node_modules[\\\/]/.test(ast.fileName)) {
-      return [];
-    }
-
-    // Workaround mismatched tslint TS version and vendored TS version
-    // The TS SyntaxKind enum numeric values change between versions
-    const sourceFile = ts.createSourceFile(ast.fileName, ast.text, ast.languageVersion, true);
-
-    ts.forEachChild(sourceFile, function analyze(node) {
-      if (ts.isPropertyAssignment(node) &&
-          (ts.isIdentifier(node.name) || ts.isStringLiteral(node.name)) &&
-          node.name.text === 'loadChildren' &&
-          ts.isStringLiteral(node.initializer)) {
-        const valueNode = node.initializer;
-        const parts = valueNode.text.split(LOAD_CHILDREN_SPLIT);
-        const path = parts[0];
-        const moduleName = parts[1] || 'default';
-
-        let fix = `() => import('${path}').then(m => m.${moduleName})`;
-
-        // Try to fix indentation in replacement:
-        const { character } = ast.getLineAndCharacterOfPosition(node.getStart());
-        fix = fix.replace(/\n/g, `\n${' '.repeat(character)}`);
-
-        const replacement = new Replacement(valueNode.getStart(), valueNode.getWidth(), fix);
-        const start = node.getStart();
-        const end = node.getEnd();
-
-        const change = new RuleFailure(ast, start, end, FAILURE_MESSAGE, ruleName, replacement);
-        change.setRuleSeverity('warning');
-        changes.push(change);
-      }
-
-      ts.forEachChild(node, analyze);
-    });
-
-    return changes;
-  }
-}
diff --git a/packages/schematics/angular/migrations/update-8/update-lazy-module-paths.ts b/packages/schematics/angular/migrations/update-8/update-lazy-module-paths.ts
index 4a524b2326f3..ade0418ee39c 100644
--- a/packages/schematics/angular/migrations/update-8/update-lazy-module-paths.ts
+++ b/packages/schematics/angular/migrations/update-8/update-lazy-module-paths.ts
@@ -5,26 +5,72 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import {
-  Rule,
-  SchematicContext,
-  Tree,
-} from '@angular-devkit/schematics';
-import {
-  TslintFixTask,
-} from '@angular-devkit/schematics/tasks';
-import * as path from 'path';
-
-export const updateLazyModulePaths = (): Rule => {
-  return (_: Tree, context: SchematicContext) => {
-    context.addTask(new TslintFixTask({
-      rulesDirectory: path.join(__dirname, 'rules'),
-      rules: {
-        'no-lazy-module-paths': [true],
-      },
-    }, {
-      includes: '**/*.ts',
-      silent: false,
-    }));
+import { DirEntry, Rule, UpdateRecorder } from '@angular-devkit/schematics';
+import * as ts from '../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
+
+function* visit(directory: DirEntry): IterableIterator<ts.SourceFile> {
+  for (const path of directory.subfiles) {
+    if (path.endsWith('.ts') && !path.endsWith('.d.ts')) {
+      const entry = directory.file(path);
+      if (entry) {
+        const content = entry.content;
+        if (content.includes('loadChildren')) {
+          const source = ts.createSourceFile(
+            entry.path,
+            content.toString(),
+            ts.ScriptTarget.Latest,
+            true,
+          );
+
+          yield source;
+        }
+      }
+    }
+  }
+
+  for (const path of directory.subdirs) {
+    if (path === 'node_modules') {
+      continue;
+    }
+
+    yield* visit(directory.dir(path));
+  }
+}
+
+export function updateLazyModulePaths(): Rule {
+  return tree => {
+    for (const sourceFile of visit(tree.root)) {
+      let recorder: UpdateRecorder | undefined;
+
+      ts.forEachChild(sourceFile, function analyze(node) {
+        if (ts.isPropertyAssignment(node) &&
+            (ts.isIdentifier(node.name) || ts.isStringLiteral(node.name)) &&
+            node.name.text === 'loadChildren' &&
+            ts.isStringLiteral(node.initializer)) {
+          const valueNode = node.initializer;
+          const parts = valueNode.text.split('#');
+          const path = parts[0];
+          const moduleName = parts[1] || 'default';
+
+          const fix = `() => import('${path}').then(m => m.${moduleName})`;
+
+          if (!recorder) {
+            recorder = tree.beginUpdate(sourceFile.fileName);
+          }
+
+          const index = valueNode.getStart();
+          const length = valueNode.getWidth();
+          recorder
+            .remove(index, length)
+            .insertLeft(index, fix);
+        }
+
+        ts.forEachChild(node, analyze);
+      });
+
+      if (recorder) {
+        tree.commitUpdate(recorder);
+      }
+    }
   };
-};
+}
diff --git a/packages/schematics/angular/migrations/update-8/update-lazy-module-paths_spec.ts b/packages/schematics/angular/migrations/update-8/update-lazy-module-paths_spec.ts
index 22f6ca921f94..b3cc89c159ef 100644
--- a/packages/schematics/angular/migrations/update-8/update-lazy-module-paths_spec.ts
+++ b/packages/schematics/angular/migrations/update-8/update-lazy-module-paths_spec.ts
@@ -5,9 +5,8 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { getSystemPath, normalize, virtualFs } from '@angular-devkit/core';
-import { TempScopedNodeJsSyncHost } from '@angular-devkit/core/node/testing';
-import { HostTree } from '@angular-devkit/schematics';
+import { normalize, virtualFs } from '@angular-devkit/core';
+import { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 
 describe('Migration to version 8', () => {
@@ -17,7 +16,6 @@ describe('Migration to version 8', () => {
   );
 
   let tree: UnitTestTree;
-  let host: TempScopedNodeJsSyncHost;
 
   const lazyRoutePath = normalize('src/lazy-route.ts');
   const lazyRoute = virtualFs.stringToFileBuffer(`
@@ -45,21 +43,17 @@ describe('Migration to version 8', () => {
 
   describe('Migration to import() style lazy routes', () => {
     beforeEach(async () => {
-      host = new TempScopedNodeJsSyncHost();
-      tree = new UnitTestTree(new HostTree(host));
+      tree = new UnitTestTree(new EmptyTree());
       tree.create('/package.json', JSON.stringify({}));
-      process.chdir(getSystemPath(host.root));
     });
 
     it('should replace the module path string', async () => {
-      await host.write(lazyRoutePath, lazyRoute).toPromise();
+      tree.create(lazyRoutePath, Buffer.from(lazyRoute));
 
       schematicRunner.runSchematic('migration-08', {}, tree);
       await schematicRunner.engine.executePostTasks().toPromise();
 
-      const routes = await host.read(lazyRoutePath)
-        .toPromise()
-        .then(virtualFs.fileBufferToString);
+      const routes = tree.readContent(lazyRoutePath);
 
       expect(routes).not.toContain('./lazy/lazy.module#LazyModule');
       expect(routes).toContain(
@@ -67,14 +61,12 @@ describe('Migration to version 8', () => {
     });
 
     it('should replace the module path string in a child path', async () => {
-      await host.write(lazyRoutePath, lazyChildRoute).toPromise();
+      tree.create(lazyRoutePath, Buffer.from(lazyChildRoute));
 
       schematicRunner.runSchematic('migration-08', {}, tree);
       await schematicRunner.engine.executePostTasks().toPromise();
 
-      const routes = await host.read(lazyRoutePath)
-        .toPromise()
-        .then(virtualFs.fileBufferToString);
+      const routes = tree.readContent(lazyRoutePath);
 
       expect(routes).not.toContain('./lazy/lazy.module#LazyModule');
 

From bdb939b1b6d31df92779ec780edbd38115bda337 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 7 May 2019 21:45:34 +0000
Subject: [PATCH 1275/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 94fc94eb170e..ca09bd46c2bc 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#52aeaad2ae2c1cccfe6c23f91e5f9415eca98f8b",
-    "@angular/common": "github:angular/common-builds#3992286c1ad7811692a41565d1b9ff8ed4a64921",
-    "@angular/compiler": "github:angular/compiler-builds#e67a38d3cf4c06f05800cf41e7a3051cf487aca0",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#3add75626f67ebae2d8d26d0e348c7c62333a46e",
-    "@angular/core": "github:angular/core-builds#f732b02fab309eea458709a39a151ecbaba22fb8",
-    "@angular/forms": "github:angular/forms-builds#e4dd591a2f7d9c25280a796d9afbc7022cfd7404",
-    "@angular/language-service": "github:angular/language-service-builds#a527fb0f5c6d4664f17a81272cd069cfb63a4256",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#b4f6007397eb20e5beaba1c8f1c5e10d2d21fbb9",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#428994a2b9e60acebb421c98fa852969e206b22e",
-    "@angular/router": "github:angular/router-builds#212bdec40188d77ac5c4b8b638151aa96c4e429e"
+    "@angular/animations": "github:angular/animations-builds#d19470cdd70692c502de8d452707061362efeaf2",
+    "@angular/common": "github:angular/common-builds#85600328480f5ded81cea9f41a264147747d9af4",
+    "@angular/compiler": "github:angular/compiler-builds#51f3b807570a1d8f346f3c5ebd21ad9961d9431c",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#bf8704ff2ba56a21afa5e654af66fd4c93808f4b",
+    "@angular/core": "github:angular/core-builds#b296aff36f37e760418b19f27b001b46d3f85a87",
+    "@angular/forms": "github:angular/forms-builds#3d72a646a5fbc4bf090a3b927720eacf870f1114",
+    "@angular/language-service": "github:angular/language-service-builds#f811d514f3beb2e2926bc211333dabf224c425d2",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#57363f9f77998aa0924c8cfcb8b97a5cbc5c4aac",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#4f30ce21228124ad85e43d37eafd217692482109",
+    "@angular/router": "github:angular/router-builds#53f6c9774c0e5fd8dbc3153967061d8761c95090"
   }
 }
\ No newline at end of file

From a54f23956531794ed2b15eeefc62bd954b4dd8ab Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 7 May 2019 18:54:28 +0000
Subject: [PATCH 1276/1703] build: update browserslist to version 4.5.6

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 28 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index a57f3f370174..f91b9eac8b8b 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -14,7 +14,7 @@
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.10.0",
     "autoprefixer": "9.5.1",
-    "browserslist": "4.5.5",
+    "browserslist": "4.5.6",
     "caniuse-api": "3.0.0",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
diff --git a/yarn.lock b/yarn.lock
index 09abacfffd57..13740886b38c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1604,7 +1604,16 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@4.5.5, browserslist@^4.0.0, browserslist@^4.3.3, browserslist@^4.5.4:
+browserslist@4.5.6:
+  version "4.5.6"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.6.tgz#ea42e8581ca2513fa7f371d4dd66da763938163d"
+  integrity sha512-o/hPOtbU9oX507lIqon+UvPYqpx3mHc8cV3QemSBTXwkG8gSQSK6UKvXcE/DcleU3+A59XTUHyCvZ5qGy8xVAg==
+  dependencies:
+    caniuse-lite "^1.0.30000963"
+    electron-to-chromium "^1.3.127"
+    node-releases "^1.1.17"
+
+browserslist@^4.0.0, browserslist@^4.3.3, browserslist@^4.5.4:
   version "4.5.5"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.5.tgz#fe1a352330d2490d5735574c149a85bc18ef9b82"
   integrity sha512-0QFO1r/2c792Ohkit5XI8Cm8pDtZxgNl2H6HU4mHrpYz7314pEYcsAVVatM0l/YmxPnEzh9VygXouj4gkFUTKA==
@@ -1853,6 +1862,11 @@ caniuse-lite@^1.0.30000960:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000960.tgz#ec48297037e5607f582f246ae7b12bee66a78999"
   integrity sha512-7nK5qs17icQaX6V3/RYrJkOsZyRNnroA4+ZwxaKJzIKy+crIy0Mz5CBlLySd2SNV+4nbUZeqeNfiaEieUBu3aA==
 
+caniuse-lite@^1.0.30000963:
+  version "1.0.30000967"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000967.tgz#a5039577806fccee80a04aaafb2c0890b1ee2f73"
+  integrity sha512-rUBIbap+VJfxTzrM4akJ00lkvVb5/n5v3EGXfWzSH5zT8aJmGzjA8HWhJ4U6kCpzxozUSnB+yvAYDRPY6mRpgQ==
+
 canonical-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
@@ -3132,6 +3146,11 @@ electron-to-chromium@^1.3.124:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
   integrity sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==
 
+electron-to-chromium@^1.3.127:
+  version "1.3.131"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.131.tgz#205a0b7a276b3f56bc056f19178909243054252a"
+  integrity sha512-NSO4jLeyGLWrT4mzzfYX8vt1MYCoMI5LxSYAjt0H9+LF/14JyiKJSyyjA6AJTxflZlEM5v3QU33F0ohbPMCAPg==
+
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
@@ -6443,6 +6462,13 @@ node-releases@^1.1.14:
   dependencies:
     semver "^5.3.0"
 
+node-releases@^1.1.17:
+  version "1.1.18"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.18.tgz#cc98fd75598a324a77188ebddf6650e9cbd8b1d5"
+  integrity sha512-/mnVgm6u/8OwlIsoyRXtTI0RfQcxZoAZbdwyXap0EeWwcOpDDymyCHM2/aR9XKmHXrvizHoPAOs0pcbiJ6RUaA==
+  dependencies:
+    semver "^5.3.0"
+
 node-sass-tilde-importer@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz#1a15105c153f648323b4347693fdb0f331bad1ce"

From 7c2d30b8b0c4900355422abeb5ed59176dedab78 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 4 May 2019 05:20:21 +0000
Subject: [PATCH 1277/1703] build: update sass to version 1.20.1

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index f91b9eac8b8b..dadd6dc75752 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -37,7 +37,7 @@
     "postcss-loader": "3.0.0",
     "raw-loader": "1.0.0",
     "rxjs": "6.4.0",
-    "sass": "1.19.0",
+    "sass": "1.20.1",
     "sass-loader": "7.1.0",
     "semver": "6.0.0",
     "source-map-support": "0.5.12",
diff --git a/yarn.lock b/yarn.lock
index 13740886b38c..e970203b8072 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8202,10 +8202,10 @@ sass-loader@7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
-sass@1.19.0:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.19.0.tgz#5de82c713d4299fac57384ef5219534a37fe3e6c"
-  integrity sha512-8kzKCgxCzh8/zEn3AuRwzLWVSSFj8omkiGwqdJdeOufjM+I88dXxu9LYJ/Gw4rRTHXesN0r1AixBuqM6yLQUJw==
+sass@1.20.1:
+  version "1.20.1"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.20.1.tgz#737b901fe072336da540b6d00ec155e2267420da"
+  integrity sha512-BnCawee/L5kVG3B/5Jg6BFwASqUwFVE6fj2lnkVuSXDgQ7gMAhY9a2yPeqsKhJMCN+Wgx0r2mAW7XF/aTF5qtA==
   dependencies:
     chokidar "^2.0.0"
 

From 8e13c952248257624e5c2d6a7b73877c290c09ff Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 4 May 2019 19:02:23 +0000
Subject: [PATCH 1278/1703] build: update postcss to version 7.0.16

---
 .../angular_devkit/build_angular/package.json   |  2 +-
 yarn.lock                                       | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index dadd6dc75752..1db2e94c0032 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -32,7 +32,7 @@
     "minimatch": "3.0.4",
     "parse5": "4.0.0",
     "open": "6.2.0",
-    "postcss": "7.0.14",
+    "postcss": "7.0.16",
     "postcss-import": "12.0.1",
     "postcss-loader": "3.0.0",
     "raw-loader": "1.0.0",
diff --git a/yarn.lock b/yarn.lock
index e970203b8072..c46f6eaec55c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7319,10 +7319,10 @@ postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.1:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss@7.0.14, postcss@^7.0.14:
-  version "7.0.14"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
-  integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==
+postcss@7.0.16:
+  version "7.0.16"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.16.tgz#48f64f1b4b558cb8b52c88987724359acb010da2"
+  integrity sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -7337,6 +7337,15 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
     source-map "^0.6.1"
     supports-color "^5.5.0"
 
+postcss@^7.0.14:
+  version "7.0.14"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
+  integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"

From 4263cc6e6334cb0aed535ec7ceccaef5bf62d453 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 2 May 2019 15:28:51 +0200
Subject: [PATCH 1279/1703] fix(@ngtools/webpack): fixes ngcc error when
 project name is the same or partially the same as a module name

FIxes #14317
---
 .../webpack/src/angular_compiler_plugin.ts    |  1 +
 .../ngtools/webpack/src/ngcc_processor.ts     | 26 +++++++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 00eb74abc873..cd844b3fd2e5 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -674,6 +674,7 @@ export class AngularCompilerPlugin {
             compilerWithFileSystems.inputFileSystem,
             this._warnings,
             this._errors,
+            this._basePath,
           );
         }
       }
diff --git a/packages/ngtools/webpack/src/ngcc_processor.ts b/packages/ngtools/webpack/src/ngcc_processor.ts
index a0a371b42de7..821c6dd710ba 100644
--- a/packages/ngtools/webpack/src/ngcc_processor.ts
+++ b/packages/ngtools/webpack/src/ngcc_processor.ts
@@ -7,10 +7,11 @@
  */
 
 import { Logger } from '@angular/compiler-cli/ngcc';
+import { existsSync } from 'fs';
+import * as path from 'path';
 import * as ts from 'typescript';
 import { InputFileSystem } from 'webpack';
 import { time, timeEnd } from './benchmark';
-import { workaroundResolve } from './utils';
 
 // We cannot create a plugin for this, because NGTSC requires addition type
 // information which ngcc creates when processing a package which was compiled with NGC.
@@ -24,8 +25,8 @@ import { workaroundResolve } from './utils';
 
 export class NgccProcessor {
   private _processedModules = new Set<string>();
-
   private _logger: NgccLogger;
+  private _nodeModulesDirectory: string;
 
   constructor(
     private readonly ngcc: typeof import('@angular/compiler-cli/ngcc'),
@@ -33,8 +34,10 @@ export class NgccProcessor {
     private readonly inputFileSystem: InputFileSystem,
     private readonly compilationWarnings: (Error | string)[],
     private readonly compilationErrors: (Error | string)[],
+    private readonly basePath: string,
   ) {
     this._logger = new NgccLogger(this.compilationWarnings, this.compilationErrors);
+    this._nodeModulesDirectory = this.findNodeModulesDirectory(this.basePath);
   }
 
   processModule(
@@ -57,13 +60,12 @@ export class NgccProcessor {
 
       return;
     }
-    const normalizedJsonPath = workaroundResolve(packageJsonPath);
 
     const timeLabel = `NgccProcessor.processModule.ngcc.process+${moduleName}`;
     time(timeLabel);
     this.ngcc.process({
-      basePath: normalizedJsonPath.substring(0, normalizedJsonPath.indexOf(moduleName)),
-      targetEntryPointPath: moduleName,
+      basePath: this._nodeModulesDirectory,
+      targetEntryPointPath: path.dirname(packageJsonPath),
       propertiesToConsider: this.propertiesToConsider,
       compileAllFormats: false,
       createNewEntryPointFormats: true,
@@ -101,6 +103,20 @@ export class NgccProcessor {
       return undefined;
     }
   }
+
+  private findNodeModulesDirectory(startPoint: string): string {
+    let current = startPoint;
+    while (path.dirname(current) !== current) {
+      const nodePath = path.join(current, 'node_modules');
+      if (existsSync(nodePath)) {
+        return nodePath;
+      }
+
+      current = path.dirname(current);
+    }
+
+    throw new Error(`Cannot locate the 'node_modules' directory.`);
+  }
 }
 
 class NgccLogger implements Logger {

From 16c8d59d1728f64efb6c35557bfc082a7f15e51f Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 2 May 2019 14:18:11 +0100
Subject: [PATCH 1280/1703] fix(@angular-devkit/build-angular): used named
 chunks for dynamic imports

Fix #14251
---
 .../models/webpack-configs/common.ts          |   5 +
 .../plugins/named-chunks-plugin.ts            |  39 ++++++
 .../src/angular-cli-files/plugins/webpack.ts  |   1 +
 .../test/browser/lazy-module_spec_large.ts    | 119 ++++++++++--------
 .../test/browser/output-hashing_spec_large.ts |  10 +-
 .../test/browser/rebuild_spec_large.ts        |   4 +-
 .../build_angular/test/utils.ts               |   9 +-
 7 files changed, 128 insertions(+), 59 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/src/angular-cli-files/plugins/named-chunks-plugin.ts

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 7d76a8f926eb..0ed107a667d5 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -20,6 +20,7 @@ import { AssetPatternClass } from '../../../browser/schema';
 import { isEs5SupportNeeded } from '../../../utils/differential-loading';
 import { BundleBudgetPlugin } from '../../plugins/bundle-budget';
 import { CleanCssWebpackPlugin } from '../../plugins/cleancss-webpack-plugin';
+import { NamedLazyChunksPlugin } from '../../plugins/named-chunks-plugin';
 import { ScriptsWebpackPlugin } from '../../plugins/scripts-webpack-plugin';
 import { findAllNodeModules, findUp } from '../../utilities/find-up';
 import { requireProjectModule } from '../../utilities/require-project-module';
@@ -202,6 +203,10 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
     extraPlugins.push(new StatsPlugin(`stats${targetInFileName}.json`, 'verbose'));
   }
 
+  if (buildOptions.namedChunks) {
+    extraPlugins.push(new NamedLazyChunksPlugin());
+  }
+
   let sourceMapUseRule;
   if ((scriptsSourceMap || stylesSourceMap) && vendorSourceMap) {
     sourceMapUseRule = {
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/named-chunks-plugin.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/named-chunks-plugin.ts
new file mode 100644
index 000000000000..79769dcb0c37
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/named-chunks-plugin.ts
@@ -0,0 +1,39 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Compiler } from 'webpack';
+// Webpack doesn't export these so the deep imports can potentially break.
+// There doesn't seem to exist any ergonomic way to alter chunk names for non-context lazy chunks
+// (https://github.com/webpack/webpack/issues/9075) so this is the best alternative for now.
+const ImportDependency = require('webpack/lib/dependencies/ImportDependency');
+const ImportDependenciesBlock = require('webpack/lib/dependencies/ImportDependenciesBlock');
+const Template = require('webpack/lib/Template');
+
+export class NamedLazyChunksPlugin {
+  constructor() { }
+  apply(compiler: Compiler): void {
+    compiler.hooks.compilation.tap('named-lazy-chunks-plugin', compilation => {
+      // The dependencyReference hook isn't in the webpack typings so we have to type it as any.
+      // tslint:disable-next-line: no-any
+      (compilation.hooks as any).dependencyReference.tap('named-lazy-chunks-plugin',
+        // tslint:disable-next-line: no-any
+        (_: any, dependency: any) => {
+          if (
+            // Check this dependency is from an `import()` statement.
+            dependency instanceof ImportDependency
+            && dependency.block instanceof ImportDependenciesBlock
+            // Don't rename chunks that already have a name.
+            && dependency.block.chunkName === null
+          ) {
+            // Convert the request to a valid chunk name using the same logic used
+            // in webpack/lib/ContextModule.js
+            dependency.block.chunkName = Template.toPath(dependency.request);
+          }
+        });
+    });
+  }
+}
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/webpack.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/webpack.ts
index 5679b0be0011..de7d1a2425ce 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/webpack.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/webpack.ts
@@ -12,6 +12,7 @@ export { BundleBudgetPlugin, BundleBudgetPluginOptions } from './bundle-budget';
 export { ScriptsWebpackPlugin, ScriptsWebpackPluginOptions } from './scripts-webpack-plugin';
 export { SuppressExtractedTextChunksWebpackPlugin } from './suppress-entry-chunks-webpack-plugin';
 export { RemoveHashPlugin, RemoveHashPluginOptions } from './remove-hash-plugin';
+export { NamedLazyChunksPlugin as NamedChunksPlugin } from './named-chunks-plugin';
 export {
   default as PostcssCliResources,
   PostcssCliResourcesOptions,
diff --git a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
index 45777f31eaf5..fb83dc883161 100644
--- a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
@@ -9,7 +9,10 @@
 import { Architect } from '@angular-devkit/architect';
 import { TestLogger } from '@angular-devkit/architect/testing';
 import { take, tap, timeout } from 'rxjs/operators';
-import { browserBuild, createArchitect, host, lazyModuleFiles, lazyModuleImport } from '../utils';
+import {
+  browserBuild, createArchitect, host, lazyModuleFiles,
+  lazyModuleFnImport, lazyModuleStringImport,
+} from '../utils';
 
 // tslint:disable-next-line:no-big-function
 describe('Browser Builder lazy modules', () => {
@@ -22,46 +25,60 @@ describe('Browser Builder lazy modules', () => {
   });
   afterEach(async () => host.restore().toPromise());
 
-  it('supports lazy bundle for lazy routes with JIT', async () => {
-    host.writeMultipleFiles(lazyModuleFiles);
-    host.writeMultipleFiles(lazyModuleImport);
-
-    const { files } = await browserBuild(architect, host, target);
-    expect('lazy-lazy-module.js' in files).toBe(true);
-  });
-
-  it('should show error when lazy route is invalid on watch mode AOT', async () => {
-    host.writeMultipleFiles(lazyModuleFiles);
-    host.writeMultipleFiles(lazyModuleImport);
-    host.replaceInFile(
-      'src/app/app.module.ts',
-      'lazy.module#LazyModule',
-      'invalid.module#LazyModule',
-    );
-
-    const logger = new TestLogger('rebuild-lazy-errors');
-    const overrides = { watch: true, aot: true };
-    const run = await architect.scheduleTarget(target, overrides, { logger });
-    await run.output.pipe(
-      timeout(15000),
-      tap((buildEvent) => expect(buildEvent.success).toBe(false)),
-      tap(() => {
-        expect(logger.includes('Could not resolve module')).toBe(true);
-        logger.clear();
-        host.appendToFile('src/main.ts', ' ');
-      }),
-      take(2),
-    ).toPromise();
-    await run.stop();
-  });
-
-  it('supports lazy bundle for lazy routes with AOT', async () => {
-    host.writeMultipleFiles(lazyModuleFiles);
-    host.writeMultipleFiles(lazyModuleImport);
-
-    const { files } = await browserBuild(architect, host, target, { aot: true });
-    expect(files['lazy-lazy-module-ngfactory.js']).not.toBeUndefined();
-  });
+  for (const [name, imports] of Object.entries({
+    'string': lazyModuleStringImport,
+    'function': lazyModuleFnImport,
+  })) {
+    describe(`Load children ${name} syntax`, () => {
+      it('supports lazy bundle for lazy routes with JIT', async () => {
+        host.writeMultipleFiles(lazyModuleFiles);
+        host.writeMultipleFiles(imports);
+
+        const { files } = await browserBuild(architect, host, target);
+        expect('lazy-lazy-module.js' in files).toBe(true);
+      });
+
+      it('should show error when lazy route is invalid on watch mode AOT', async () => {
+        host.writeMultipleFiles(lazyModuleFiles);
+        host.writeMultipleFiles(imports);
+        host.replaceInFile(
+          'src/app/app.module.ts',
+          'lazy.module',
+          'invalid.module',
+        );
+
+        const logger = new TestLogger('rebuild-lazy-errors');
+        const overrides = { watch: true, aot: true };
+        const run = await architect.scheduleTarget(target, overrides, { logger });
+        await run.output.pipe(
+          timeout(15000),
+          tap((buildEvent) => expect(buildEvent.success).toBe(false)),
+          tap(() => {
+            // Webpack error when using loadchildren string syntax.
+            const hasMissingModuleError = logger.includes('Could not resolve module')
+              // TS type error when using import().
+              || logger.includes('Cannot find module')
+              // Webpack error when using import() on a rebuild.
+              // There is no TS error because the type checker is forked on rebuilds.
+              || logger.includes('Module not found');
+            expect(hasMissingModuleError).toBe(true, 'Should show missing module error');
+            logger.clear();
+            host.appendToFile('src/main.ts', ' ');
+          }),
+          take(2),
+        ).toPromise();
+        await run.stop();
+      });
+
+      it('supports lazy bundle for lazy routes with AOT', async () => {
+        host.writeMultipleFiles(lazyModuleFiles);
+        host.writeMultipleFiles(imports);
+
+        const { files } = await browserBuild(architect, host, target, { aot: true });
+        expect(files['lazy-lazy-module-ngfactory.js']).not.toBeUndefined();
+      });
+    });
+  }
 
   it(`supports lazy bundle for import() calls`, async () => {
     host.writeMultipleFiles({
@@ -72,7 +89,7 @@ describe('Browser Builder lazy modules', () => {
     host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
 
     const { files } = await browserBuild(architect, host, target);
-    expect(files['0.js']).not.toBeUndefined();
+    expect(files['lazy-module.js']).not.toBeUndefined();
   });
 
   it(`supports lazy bundle for dynamic import() calls`, async () => {
@@ -96,7 +113,7 @@ describe('Browser Builder lazy modules', () => {
     });
 
     const { files } = await browserBuild(architect, host, target);
-    expect(files['0.js']).not.toBeUndefined();
+    expect(files['lazy-module.js']).not.toBeUndefined();
   });
 
   it(`supports hiding lazy bundle module name`, async () => {
@@ -116,13 +133,12 @@ describe('Browser Builder lazy modules', () => {
       'src/two.ts': `import * as http from '@angular/common/http'; console.log(http);`,
       'src/main.ts': `import('./one'); import('./two');`,
     });
-    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
 
-    const { files } = await browserBuild(architect, host, target, { namedChunks: false });
-    expect(files['0.js']).not.toBeUndefined();
-    expect(files['1.js']).not.toBeUndefined();
+    const { files } = await browserBuild(architect, host, target);
+    expect(files['one.js']).not.toBeUndefined();
+    expect(files['two.js']).not.toBeUndefined();
     // TODO: the chunk with common modules used to be called `common`, see why that changed.
-    expect(files['2.js']).not.toBeUndefined();
+    expect(files['default~one~two.js']).not.toBeUndefined();
   });
 
   it(`supports disabling the common bundle`, async () => {
@@ -131,12 +147,11 @@ describe('Browser Builder lazy modules', () => {
       'src/two.ts': `import * as http from '@angular/common/http'; console.log(http);`,
       'src/main.ts': `import('./one'); import('./two');`,
     });
-    host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
 
     const { files } = await browserBuild(architect, host, target, { commonChunk: false });
-    expect(files['0.js']).not.toBeUndefined();
-    expect(files['1.js']).not.toBeUndefined();
-    expect(files['2.js']).toBeUndefined();
+    expect(files['one.js']).not.toBeUndefined();
+    expect(files['two.js']).not.toBeUndefined();
+    expect(files['common.js']).toBeUndefined();
   });
 
   it(`supports extra lazy modules array in JIT`, async () => {
diff --git a/packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts
index f8714f6b979f..4ca1779f3448 100644
--- a/packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts
@@ -8,7 +8,9 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { normalize } from '@angular-devkit/core';
-import { browserBuild, createArchitect, host, lazyModuleFiles, lazyModuleImport } from '../utils';
+import {
+  browserBuild, createArchitect, host, lazyModuleFiles, lazyModuleStringImport,
+} from '../utils';
 
 describe('Browser Builder output hashing', () => {
   const target = { project: 'app', target: 'build' };
@@ -58,7 +60,7 @@ describe('Browser Builder output hashing', () => {
     let newHashes: Map<string, string>;
 
     host.writeMultipleFiles(lazyModuleFiles);
-    host.writeMultipleFiles(lazyModuleImport);
+    host.writeMultipleFiles(lazyModuleStringImport);
 
     const overrides = { outputHashing: 'all', extractCss: true };
 
@@ -69,7 +71,7 @@ describe('Browser Builder output hashing', () => {
     // Save the current hashes.
     oldHashes = generateFileHashMap();
     host.writeMultipleFiles(lazyModuleFiles);
-    host.writeMultipleFiles(lazyModuleImport);
+    host.writeMultipleFiles(lazyModuleStringImport);
 
     await browserBuild(architect, host, target, overrides);
     newHashes = generateFileHashMap();
@@ -107,7 +109,7 @@ describe('Browser Builder output hashing', () => {
   it('supports options', async () => {
     host.writeMultipleFiles({ 'src/styles.css': `h1 { background: url('./spectrum.png')}` });
     host.writeMultipleFiles(lazyModuleFiles);
-    host.writeMultipleFiles(lazyModuleImport);
+    host.writeMultipleFiles(lazyModuleStringImport);
 
     // We must do several builds instead of a single one in watch mode, so that the output
     // path is deleted on each run and only contains the most recent files.
diff --git a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
index f7b4f1ad8359..ce69a366348f 100644
--- a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
@@ -11,7 +11,7 @@ import { Architect } from '@angular-devkit/architect';
 import { TestLogger } from '@angular-devkit/architect/testing';
 import { normalize, virtualFs } from '@angular-devkit/core';
 import { debounceTime, take, takeWhile, tap } from 'rxjs/operators';
-import { createArchitect, host, lazyModuleFiles, lazyModuleImport } from '../utils';
+import { createArchitect, host, lazyModuleFiles, lazyModuleStringImport } from '../utils';
 
 
 describe('Browser Builder rebuilds', () => {
@@ -82,7 +82,7 @@ describe('Browser Builder rebuilds', () => {
             // No lazy chunk should exist.
             if (!hasLazyChunk) {
               phase = 2;
-              host.writeMultipleFiles({ ...lazyModuleFiles, ...lazyModuleImport });
+              host.writeMultipleFiles({ ...lazyModuleFiles, ...lazyModuleStringImport });
             }
             break;
 
diff --git a/packages/angular_devkit/build_angular/test/utils.ts b/packages/angular_devkit/build_angular/test/utils.ts
index e8380095a790..a53588a222ed 100644
--- a/packages/angular_devkit/build_angular/test/utils.ts
+++ b/packages/angular_devkit/build_angular/test/utils.ts
@@ -140,7 +140,7 @@ export const lazyModuleFiles: { [path: string]: string } = {
   `,
 };
 
-export const lazyModuleImport: { [path: string]: string } = {
+export const lazyModuleStringImport: { [path: string]: string } = {
   'src/app/app.module.ts': `
     import { BrowserModule } from '@angular/platform-browser';
     import { NgModule } from '@angular/core';
@@ -164,3 +164,10 @@ export const lazyModuleImport: { [path: string]: string } = {
     export class AppModule { }
   `,
 };
+
+export const lazyModuleFnImport: { [path: string]: string } = {
+  'src/app/app.module.ts': lazyModuleStringImport['src/app/app.module.ts'].replace(
+    `loadChildren: './lazy/lazy.module#LazyModule'`,
+    `loadChildren: () => import('./lazy/lazy.module').then(m => m.LazyModule)`,
+  ),
+};

From c1e65294e7ef12247e00e606c65370d380e096b7 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sun, 5 May 2019 16:06:19 +0200
Subject: [PATCH 1281/1703] fix(@schematics/angular): older projects are not
 migrated to support differential loading

Fixes #14321
---
 .../update-8/differential-loading.ts          | 70 ++++++++++++++-----
 .../update-8/differential-loading_spec.ts     | 21 ++++++
 2 files changed, 75 insertions(+), 16 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-8/differential-loading.ts b/packages/schematics/angular/migrations/update-8/differential-loading.ts
index 2d55c33cd4d9..652b1acd292a 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {
+  JsonAstObject,
   JsonParseMode,
   isJsonObject,
   join,
@@ -17,6 +18,7 @@ import { Rule, Tree } from '@angular-devkit/schematics';
 import {
   findPropertyInAstObject,
   insertPropertyInAstObjectInOrder,
+  removePropertyInAstObject,
 } from '../../utility/json-utils';
 
 // tslint:disable-next-line:max-line-length
@@ -40,24 +42,12 @@ not IE 9-11 # For IE 9-11 support, remove 'not'.`;
 export function updateES5Projects(): Rule {
   return (host: Tree) => {
     const tsConfigPath = '/tsconfig.json';
-    const buffer = host.read(tsConfigPath);
-    if (!buffer) {
-      return host;
-    }
-
-    const tsCfgAst = parseJsonAst(buffer.toString(), JsonParseMode.Loose);
-
-    if (tsCfgAst.kind !== 'object') {
-      return host;
-    }
-
-    const compilerOptions = findPropertyInAstObject(tsCfgAst, 'compilerOptions');
-    if (!compilerOptions || compilerOptions.kind !== 'object') {
+    const compilerOptions = getCompilerOptionsAstObject(host, tsConfigPath);
+    if (!compilerOptions) {
       return host;
     }
 
     const recorder = host.beginUpdate(tsConfigPath);
-
     const scriptTarget = findPropertyInAstObject(compilerOptions, 'target');
     if (!scriptTarget) {
       insertPropertyInAstObjectInOrder(recorder, compilerOptions, 'target', 'es2015', 4);
@@ -78,11 +68,11 @@ export function updateES5Projects(): Rule {
 
     host.commitUpdate(recorder);
 
-    return updateBrowserlist;
+    return updateProjects;
   };
 }
 
-function updateBrowserlist(): Rule {
+function updateProjects(): Rule {
   return (tree) => {
     const angularConfigContent = tree.read('angular.json') || tree.read('.angular.json');
 
@@ -110,6 +100,34 @@ function updateBrowserlist(): Rule {
         continue;
       }
 
+      // Older projects app and spec ts configs had script and module set in them.
+      const tsConfigs = [];
+      const architect = project.architect;
+      if (isJsonObject(architect)
+        && isJsonObject(architect.build)
+        && isJsonObject(architect.build.options)
+        && typeof architect.build.options.tsConfig === 'string') {
+        tsConfigs.push(architect.build.options.tsConfig);
+      }
+
+      if (isJsonObject(architect)
+        && isJsonObject(architect.test)
+        && isJsonObject(architect.test.options)
+        && typeof architect.test.options.tsConfig === 'string') {
+        tsConfigs.push(architect.test.options.tsConfig);
+      }
+
+      for (const tsConfig of tsConfigs) {
+        const compilerOptions = getCompilerOptionsAstObject(tree, tsConfig);
+        if (!compilerOptions) {
+          continue;
+        }
+        const recorder = tree.beginUpdate(tsConfig);
+        removePropertyInAstObject(recorder, compilerOptions, 'target');
+        removePropertyInAstObject(recorder, compilerOptions, 'module');
+        tree.commitUpdate(recorder);
+      }
+
       const browserslistPath = join(normalize(project.root), 'browserslist');
       if (typeof project.sourceRoot === 'string') {
         // Move the CLI 7 style browserlist to root if it's there.
@@ -143,3 +161,23 @@ function updateBrowserlist(): Rule {
     return tree;
   };
 }
+
+function getCompilerOptionsAstObject(host: Tree, tsConfigPath: string): JsonAstObject | undefined {
+  const buffer = host.read(tsConfigPath);
+  if (!buffer) {
+    return;
+  }
+
+  const tsCfgAst = parseJsonAst(buffer.toString(), JsonParseMode.Loose);
+
+  if (tsCfgAst.kind !== 'object') {
+    return;
+  }
+
+  const compilerOptions = findPropertyInAstObject(tsCfgAst, 'compilerOptions');
+  if (!compilerOptions || compilerOptions.kind !== 'object') {
+    return;
+  }
+
+  return compilerOptions;
+}
diff --git a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
index e3faba69f09e..01bcb5809364 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
@@ -102,5 +102,26 @@ describe('Migration to version 8', () => {
       expect(content).toContain('Chrome 41');
       expect(content).toContain('last 2 Chrome versions');
     });
+
+    it(`should remove 'target' and 'module' from non workspace tsconfig.json`, () => {
+      const appTsConfig = '/tsconfig.app.json';
+      const specsTsConfig = '/tsconfig.spec.json';
+      const compilerOptions = {
+        ...oldTsConfig.compilerOptions,
+        target: 'es2015',
+        module: 'es2015',
+      };
+
+      tree.overwrite(appTsConfig, JSON.stringify({ compilerOptions }, null, 2));
+      const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
+      const { compilerOptions: appCompilerOptions } = JSON.parse(tree2.readContent(appTsConfig));
+      expect(appCompilerOptions.target).toBeUndefined();
+      expect(appCompilerOptions.module).toBeUndefined();
+
+      const { compilerOptions: specsCompilerOptions }
+        = JSON.parse(tree2.readContent(specsTsConfig));
+      expect(specsCompilerOptions.target).toBeUndefined();
+      expect(specsCompilerOptions.module).toBeUndefined();
+    });
   });
 });

From d1332607d6608decfc3f95f5a022a1857d5ce6fc Mon Sep 17 00:00:00 2001
From: hawkgs <hawk.dvp@gmail.com>
Date: Sun, 21 Apr 2019 12:24:14 +0300
Subject: [PATCH 1282/1703] fix(@schematics/angular): project name option in
 the library schematic

---
 packages/schematics/angular/library/index.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index d0c7d419162e..839fb7413860 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -222,7 +222,7 @@ export default function (options: LibraryOptions): Rule {
         commonModule: false,
         flat: true,
         path: sourceDir,
-        project: options.name,
+        project: projectName,
       }),
       schematic('component', {
         name: options.name,
@@ -232,13 +232,13 @@ export default function (options: LibraryOptions): Rule {
         flat: true,
         path: sourceDir,
         export: true,
-        project: options.name,
+        project: projectName,
       }),
       schematic('service', {
         name: options.name,
         flat: true,
         path: sourceDir,
-        project: options.name,
+        project: projectName,
       }),
       options.lintFix ? applyLintFix(sourceDir) : noop(),
       (_tree: Tree, context: SchematicContext) => {

From a41c18571370a164d8a36695dbf4faf65860fc19 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Fri, 3 May 2019 11:00:46 +0100
Subject: [PATCH 1283/1703] fix(@angular-devkit/build-angular): relax
 typescript peerDep

We only use it for a few things but have a strict peerdep.

This strictness causes errors when updating the CLI from 7.x to 8.x projects:
```
Package "@angular/compiler-cli" has an incompatible peer dependency to "typescript" (requires ">=3.1.1 <3.2", would install "3.4.5").
```
`build-angular` did not have a peerdep in 7.x so this never was a problem.

This PR relaxes the peerdep to `">=3.1 < 3.5"`, which covers the 3.1 used in initial CLI 7.0 projects.
---
 packages/angular_devkit/build_angular/package.json        | 2 +-
 .../src/angular-cli-files/models/build-options.ts         | 6 +++---
 .../angular-cli-files/models/webpack-configs/common.ts    | 6 +++---
 .../src/angular-cli-files/models/webpack-configs/utils.ts | 6 +++---
 .../angular_devkit/build_angular/src/browser/index.ts     | 6 +++---
 packages/angular_devkit/build_angular/src/tslint/index.ts | 8 ++++----
 .../build_angular/src/utils/differential-loading.ts       | 6 +++---
 tests/legacy-cli/e2e/tests/basic/update-7.0.ts            | 2 +-
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 1db2e94c0032..daa560eb476f 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -87,6 +87,6 @@
     "zone.js": "^0.9.0"
   },
   "peerDependencies": {
-    "typescript": ">=3.4 < 3.5"
+    "typescript": ">=3.1 < 3.5"
   }
 }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
index a2a8652e294e..46de94ad5e06 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
@@ -9,7 +9,7 @@
 // TODO: cleanup this file, it's copied as is from Angular CLI.
 
 import { logging } from '@angular-devkit/core';
-import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
+import { ParsedCommandLine, ScriptTarget } from 'typescript';
 import {
   AssetPatternClass,
   Budget,
@@ -79,7 +79,7 @@ export interface BuildOptions {
   esVersionInFileName?: boolean;
 
   /* When specified it will be used instead of the script target in the tsconfig.json. */
-  scriptTargetOverride?: ts.ScriptTarget;
+  scriptTargetOverride?: ScriptTarget;
 }
 
 export interface WebpackTestOptions extends BuildOptions {
@@ -93,7 +93,7 @@ export interface WebpackConfigOptions<T = BuildOptions> {
   projectRoot: string;
   sourceRoot?: string;
   buildOptions: T;
-  tsConfig: ts.ParsedCommandLine;
+  tsConfig: ParsedCommandLine;
   tsConfigPath: string;
   supportES2015: boolean;
 }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 0ed107a667d5..18e066ca0f67 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -8,7 +8,7 @@
 import { tags } from '@angular-devkit/core';
 import * as CopyWebpackPlugin from 'copy-webpack-plugin';
 import * as path from 'path';
-import * as ts from 'typescript';
+import { ScriptTarget } from 'typescript';
 import {
   Configuration,
   ContextReplacementPlugin,
@@ -72,7 +72,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
 
   if (targetInFileName) {
     // For differential loading we don't need to have 2 polyfill bundles
-    if (buildOptions.scriptTargetOverride === ts.ScriptTarget.ES2015) {
+    if (buildOptions.scriptTargetOverride === ScriptTarget.ES2015) {
       entryPoints['polyfills'] = [path.join(__dirname, '..', 'safari-nomodule.js')];
     } else {
       entryPoints['polyfills'] = [es5Polyfills];
@@ -310,7 +310,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
   }
 
   if (wco.tsConfig.options.target !== undefined &&
-    wco.tsConfig.options.target >= ts.ScriptTarget.ES2017) {
+    wco.tsConfig.options.target >= ScriptTarget.ES2017) {
     wco.logger.warn(tags.stripIndent`
       WARNING: Zone.js does not support native async/await in ES2017.
       These blocks are not intercepted by zone.js and will not triggering change detection.
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
index 0a601b89e769..09b023a7b5c4 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
@@ -12,7 +12,7 @@ import * as path from 'path';
 import { basename, normalize } from '@angular-devkit/core';
 import { ExtraEntryPoint, ExtraEntryPointClass } from '../../../browser/schema';
 import { SourceMapDevToolPlugin } from 'webpack';
-import * as ts from 'typescript';
+import { ScriptTarget } from 'typescript';
 
 export const ngAppResolve = (resolvePath: string): string => {
   return path.resolve(process.cwd(), resolvePath);
@@ -95,9 +95,9 @@ export function getSourceMapDevTool(
  * Returns an ES version file suffix to differentiate between various builds.
  */
 export function getEsVersionForFileName(
-  scriptTargetOverride: ts.ScriptTarget | undefined,
+  scriptTargetOverride: ScriptTarget | undefined,
   esVersionInFileName = false,
 ): string {
   return scriptTargetOverride && esVersionInFileName ?
-    '-' + ts.ScriptTarget[scriptTargetOverride].toLowerCase() : '';
+    '-' + ScriptTarget[scriptTargetOverride].toLowerCase() : '';
 }
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 1ba8437ea1e9..6f887a7d9b90 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -27,7 +27,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { from, of } from 'rxjs';
 import { bufferCount, catchError, concatMap, map, mergeScan, switchMap } from 'rxjs/operators';
-import * as ts from 'typescript';
+import { ScriptTarget } from 'typescript';
 import * as webpack from 'webpack';
 import { NgBuildAnalyticsPlugin } from '../../plugins/webpack/analytics';
 import { WebpackConfigOptions } from '../angular-cli-files/models/build-options';
@@ -194,8 +194,8 @@ export function buildWebpackBrowser(
       const tsConfig = readTsconfig(tsConfigPath);
 
       if (isEs5SupportNeeded(projectRoot) &&
-          tsConfig.options.target !== ts.ScriptTarget.ES5 &&
-          tsConfig.options.target !== ts.ScriptTarget.ES2015) {
+          tsConfig.options.target !== ScriptTarget.ES5 &&
+          tsConfig.options.target !== ScriptTarget.ES2015) {
         context.logger.warn(tags.stripIndent`
           WARNING: Using differential loading with targets ES5 and ES2016 or higher may
           cause problems. Browsers with support for ES2015 will load the ES2016+ scripts
diff --git a/packages/angular_devkit/build_angular/src/tslint/index.ts b/packages/angular_devkit/build_angular/src/tslint/index.ts
index 965cafac7d27..434af39f5e6a 100644
--- a/packages/angular_devkit/build_angular/src/tslint/index.ts
+++ b/packages/angular_devkit/build_angular/src/tslint/index.ts
@@ -12,7 +12,7 @@ import * as glob from 'glob';
 import { Minimatch } from 'minimatch';
 import * as path from 'path';
 import * as tslint from 'tslint'; // tslint:disable-line:no-implicit-dependencies
-import * as ts from 'typescript'; // tslint:disable-line:no-implicit-dependencies
+import { Program } from 'typescript';
 import { stripBom } from '../angular-cli-files/utilities/strip-bom';
 import { Schema as RealTslintBuilderOptions } from './schema';
 
@@ -153,8 +153,8 @@ async function _lint(
   systemRoot: string,
   tslintConfigPath: string | null,
   options: TslintBuilderOptions,
-  program?: ts.Program,
-  allPrograms?: ts.Program[],
+  program?: Program,
+  allPrograms?: Program[],
 ): Promise<LintResult> {
   const Linter = projectTslint.Linter;
   const Configuration = projectTslint.Configuration;
@@ -210,7 +210,7 @@ function getFilesToLint(
   root: string,
   options: TslintBuilderOptions,
   linter: typeof tslint.Linter,
-  program?: ts.Program,
+  program?: Program,
 ): string[] {
   const ignore = options.exclude;
   const files = options.files || [];
diff --git a/packages/angular_devkit/build_angular/src/utils/differential-loading.ts b/packages/angular_devkit/build_angular/src/utils/differential-loading.ts
index f2c2271378e7..456007ebff5b 100644
--- a/packages/angular_devkit/build_angular/src/utils/differential-loading.ts
+++ b/packages/angular_devkit/build_angular/src/utils/differential-loading.ts
@@ -8,14 +8,14 @@
 
 import * as browserslist from 'browserslist';
 import * as caniuse from 'caniuse-api';
-import * as ts from 'typescript';
+import { ScriptTarget } from 'typescript';
 
 
 export function isDifferentialLoadingNeeded(
   projectRoot: string,
-  target: ts.ScriptTarget = ts.ScriptTarget.ES5): boolean {
+  target: ScriptTarget = ScriptTarget.ES5): boolean {
 
-  const supportES2015 = target !== ts.ScriptTarget.ES3 && target !== ts.ScriptTarget.ES5;
+  const supportES2015 = target !== ScriptTarget.ES3 && target !== ScriptTarget.ES5;
 
   return supportES2015 && isEs5SupportNeeded(projectRoot);
 }
diff --git a/tests/legacy-cli/e2e/tests/basic/update-7.0.ts b/tests/legacy-cli/e2e/tests/basic/update-7.0.ts
index 1309dc9f8b4f..5a340f81b38b 100644
--- a/tests/legacy-cli/e2e/tests/basic/update-7.0.ts
+++ b/tests/legacy-cli/e2e/tests/basic/update-7.0.ts
@@ -8,7 +8,7 @@ import { expectToFail } from '../../utils/utils';
 
 
 export default async function () {
-  const extraUpdateArgs = await isPrereleaseCli() ? ['--next', '--force'] : [];
+  const extraUpdateArgs = await isPrereleaseCli() ? ['--next'] : [];
 
   // Create new project from previous version files.
   // We must use the original NPM packages to force a real update.

From 888145e5a1091bbcc86deb7f4f706e58d77c9e8d Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Fri, 3 May 2019 15:49:57 +0100
Subject: [PATCH 1284/1703] fix(@angular-devkit/build-angular): never split
 polyfill chunks

Fix #14280
---
 .../src/angular-cli-files/models/webpack-configs/browser.ts | 4 ++--
 .../src/angular-cli-files/models/webpack-configs/test.ts    | 6 +++---
 .../src/angular-cli-files/models/webpack-configs/utils.ts   | 4 ++++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
index d805e2f15e8c..807dc7568a5a 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
@@ -11,7 +11,7 @@ import * as webpack from 'webpack';
 import { IndexHtmlWebpackPlugin } from '../../plugins/index-html-webpack-plugin';
 import { generateEntryPoints } from '../../utilities/package-chunk-sort';
 import { WebpackConfigOptions } from '../build-options';
-import { getSourceMapDevTool, normalizeExtraEntryPoints } from './utils';
+import { getSourceMapDevTool, isPolyfillsEntry, normalizeExtraEntryPoints } from './utils';
 
 const SubresourceIntegrityPlugin = require('webpack-subresource-integrity');
 
@@ -114,7 +114,7 @@ export function getBrowserConfig(wco: WebpackConfigOptions): webpack.Configurati
               const moduleName = module.nameForCondition ? module.nameForCondition() : '';
 
               return /[\\/]node_modules[\\/]/.test(moduleName)
-                && !chunks.some(({ name }) => name === 'polyfills' || name === 'polyfills-es5'
+                && !chunks.some(({ name }) => isPolyfillsEntry(name)
                   || globalStylesBundleNames.includes(name));
             },
           },
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts
index 2ea075e9c397..8c9566b6337f 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts
@@ -10,7 +10,7 @@ import * as glob from 'glob';
 import * as path from 'path';
 import * as webpack from 'webpack';
 import { WebpackConfigOptions, WebpackTestOptions } from '../build-options';
-import { getSourceMapDevTool } from './utils';
+import { getSourceMapDevTool, isPolyfillsEntry } from './utils';
 
 
 /**
@@ -85,7 +85,7 @@ export function getTestConfig(
     plugins: extraPlugins,
     optimization: {
       splitChunks: {
-        chunks: ((chunk: { name: string }) => chunk.name !== 'polyfills'),
+        chunks: ((chunk: { name: string }) => !isPolyfillsEntry(chunk.name)),
         cacheGroups: {
           vendors: false,
           vendor: {
@@ -95,7 +95,7 @@ export function getTestConfig(
               const moduleName = module.nameForCondition ? module.nameForCondition() : '';
 
               return /[\\/]node_modules[\\/]/.test(moduleName)
-                && !chunks.some(({ name }) => name === 'polyfills');
+                && !chunks.some(({ name }) => isPolyfillsEntry(name));
             },
           },
         },
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
index 09b023a7b5c4..2262bde39378 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
@@ -101,3 +101,7 @@ export function getEsVersionForFileName(
   return scriptTargetOverride && esVersionInFileName ?
     '-' + ScriptTarget[scriptTargetOverride].toLowerCase() : '';
 }
+
+export function isPolyfillsEntry(name: string) {
+  return name === 'polyfills' || name === 'polyfills-es5';
+}

From 22e401b151fcfc746acb4643ce5670622373510b Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 7 May 2019 15:10:59 +0100
Subject: [PATCH 1285/1703] fix(@angular-devkit/build-angular): load
 polyfills-es5 on test

Fix #14335
---
 .../src/angular-cli-files/plugins/karma-context.html             | 1 +
 .../build_angular/src/angular-cli-files/plugins/karma-debug.html | 1 +
 .../build_angular/src/angular-cli-files/plugins/karma.ts         | 1 +
 3 files changed, 3 insertions(+)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html
index 5de33896d7db..cef84e87c8ea 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html
@@ -29,6 +29,7 @@
   </script>
   <script src="_karma_webpack_/runtime.js" crossorigin="anonymous"></script>
   <script src="_karma_webpack_/polyfills.js" crossorigin="anonymous"></script>
+  <script src="_karma_webpack_/polyfills-es5.js" crossorigin="anonymous" nomodule></script>
   <!-- Dynamically replaced with <script> tags -->
   %SCRIPTS%
   <script src="_karma_webpack_/styles.js" crossorigin="anonymous"></script>
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-debug.html b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-debug.html
index 93a8a2005d6f..93739d39b7cf 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-debug.html
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-debug.html
@@ -30,6 +30,7 @@
   </script>
   <script src="_karma_webpack_/runtime.js" crossorigin="anonymous"></script>
   <script src="_karma_webpack_/polyfills.js" crossorigin="anonymous"></script>
+  <script src="_karma_webpack_/polyfills-es5.js" crossorigin="anonymous" nomodule></script>
   <!-- Dynamically replaced with <script> tags -->
   %SCRIPTS%
   <script src="_karma_webpack_/styles.js" crossorigin="anonymous"></script>
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
index a009ab2abab5..ca4958baf4a9 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
@@ -209,6 +209,7 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
         const alwaysServe = [
           '/_karma_webpack_/runtime.js',
           '/_karma_webpack_/polyfills.js',
+          '/_karma_webpack_/polyfills-es5.js',
           '/_karma_webpack_/scripts.js',
           '/_karma_webpack_/styles.js',
           '/_karma_webpack_/vendor.js',

From 5b3ee079d7308dc15851c6f1db0771dd79f6ed3a Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Tue, 7 May 2019 08:12:56 -0700
Subject: [PATCH 1286/1703] docs: edit reference doc for update command

---
 packages/angular/cli/commands/update-long.md  |  4 +++-
 packages/schematics/update/update/schema.json | 18 +++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/angular/cli/commands/update-long.md b/packages/angular/cli/commands/update-long.md
index 00fb979d4ca5..2132f0ed69dd 100644
--- a/packages/angular/cli/commands/update-long.md
+++ b/packages/angular/cli/commands/update-long.md
@@ -1,7 +1,9 @@
-Perform a basic update to v7 of the core framework and CLI by running the following command.
+Perform a basic update to the current stable release of the core framework and CLI by running the following command.
 
 ```
 ng update @angular/cli @angular/core
 ```
 
+To update to the next beta or pre-release version, use the `--next=true` option.
+
 For detailed information and guidance on updating your application, see the interactive [Angular Update Guide](https://update.angular.io/).
diff --git a/packages/schematics/update/update/schema.json b/packages/schematics/update/update/schema.json
index 8e0009bd1ec6..2385abbde97b 100644
--- a/packages/schematics/update/update/schema.json
+++ b/packages/schematics/update/update/schema.json
@@ -5,7 +5,7 @@
   "type": "object",
   "properties": {
     "packages": {
-      "description": "The names of package(s) to update.",
+      "description": "The package or packages to update.",
       "type": "array",
       "items": {
         "type": "string"
@@ -15,35 +15,35 @@
       }
     },
     "force": {
-      "description": "If false, will error out if installed packages are incompatible with the update.",
+      "description": "When false (the default), reports an error if installed packages are incompatible with the update.",
       "default": false,
       "type": "boolean"
     },
     "all": {
-      "description": "Whether to update all packages in package.json.",
+      "description": "When true, update all packages in `package.json`.",
       "default": false,
       "type": "boolean"
     },
     "next": {
-      "description": "Use the largest version, including beta and RCs.",
+      "description": "Update to the latest version, including beta and RCs.",
       "default": false,
       "type": "boolean"
     },
     "migrateOnly": {
-      "description": "Only perform a migration, does not update the installed version.",
+      "description": "Perform a migration, but do not update the installed version.",
       "default": false,
       "type": "boolean"
     },
     "from": {
-      "description": "Version from which to migrate from. Only available with a single package being updated, and only on migration only.",
+      "description": "When using `--migrateOnly` for a single package, the version of that package from which to migrate.",
       "type": "string"
     },
     "to": {
-      "description": "Version up to which to apply migrations. Only available with a single package being updated, and only on migrations only. Requires from to be specified. Default to the installed version detected.",
+      "description": "When using `--migrateOnly` for a single package, the version of that package to which to migrate.",
       "type": "string"
     },
     "registry": {
-      "description": "The NPM registry to use.",
+      "description": "The npm registry to use.",
       "type": "string",
       "oneOf": [
         {
@@ -55,7 +55,7 @@
       ]
     },
     "verbose": {
-      "description": "Display additional details during the update process.",
+      "description": "When true, display additional details during the update process.",
       "type": "boolean"
     },
     "packageManager": {

From cbb493eb81eff2220abe03cab4c7f657ef2d49c5 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 30 Apr 2019 12:46:22 -0400
Subject: [PATCH 1287/1703] refactor(@angular-devkit/architect): support stable
 workspaces API

---
 .../node/node-modules-architect-host.ts       | 34 ++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/packages/angular_devkit/architect/node/node-modules-architect-host.ts b/packages/angular_devkit/architect/node/node-modules-architect-host.ts
index 12953389cf40..2e5dd766964c 100644
--- a/packages/angular_devkit/architect/node/node-modules-architect-host.ts
+++ b/packages/angular_devkit/architect/node/node-modules-architect-host.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { experimental, json } from '@angular-devkit/core';
+import { experimental, json, workspaces } from '@angular-devkit/core';
 import { resolve } from '@angular-devkit/core/node';
 import * as path from 'path';
 import { BuilderInfo } from '../src';
@@ -21,13 +21,26 @@ export type NodeModulesBuilderInfo = BuilderInfo & {
 
 // TODO: create a base class for all workspace related hosts.
 export class WorkspaceNodeModulesArchitectHost implements ArchitectHost<NodeModulesBuilderInfo> {
+
+  /**
+   * @deprecated
+   */
+  constructor(_workspace: experimental.workspace.Workspace, _root: string)
+
+  constructor(_workspace: workspaces.WorkspaceDefinition, _root: string)
+
   constructor(
-    protected _workspace: experimental.workspace.Workspace,
+    protected _workspace: experimental.workspace.Workspace | workspaces.WorkspaceDefinition,
     protected _root: string,
   ) {}
 
   async getBuilderNameForTarget(target: Target) {
-    return this._workspace.getProjectTargets(target.project)[target.target]['builder'];
+    const targetDefinition = this.findProjectTarget(target);
+    if (!targetDefinition) {
+      throw new Error('Project target does not exist.');
+    }
+
+    return targetDefinition.builder;
   }
 
   /**
@@ -87,7 +100,7 @@ export class WorkspaceNodeModulesArchitectHost implements ArchitectHost<NodeModu
   }
 
   async getOptionsForTarget(target: Target): Promise<json.JsonObject | null> {
-    const targetSpec = this._workspace.getProjectTargets(target.project)[target.target];
+    const targetSpec = this.findProjectTarget(target);
     if (targetSpec === undefined) {
       return null;
     }
@@ -109,4 +122,17 @@ export class WorkspaceNodeModulesArchitectHost implements ArchitectHost<NodeModu
 
     throw new Error('Builder is not a builder');
   }
+
+  private findProjectTarget(target: Target) {
+    if ('getProjectTargets' in this._workspace) {
+      return this._workspace.getProjectTargets(target.project)[target.target];
+    } else {
+      const projectDefinition = this._workspace.projects.get(target.project);
+      if (!projectDefinition) {
+        throw new Error('Project does not exist.');
+      }
+
+      return projectDefinition.targets.get(target.target);
+    }
+  }
 }

From 5840cad4e0b110ebe6a1e94e951266955fa77210 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Tue, 7 May 2019 17:03:35 -0700
Subject: [PATCH 1288/1703] Update no_typescript_runtime_dep_spec.js

Add license banner for g3 sync
---
 .../schematics/angular/no_typescript_runtime_dep_spec.js  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/schematics/angular/no_typescript_runtime_dep_spec.js b/packages/schematics/angular/no_typescript_runtime_dep_spec.js
index e414190f3aa2..224291d0e9a0 100644
--- a/packages/schematics/angular/no_typescript_runtime_dep_spec.js
+++ b/packages/schematics/angular/no_typescript_runtime_dep_spec.js
@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
 const fs = require('fs');
 const path = require('path');
 

From d629cd64782abc9bc81997bd280b2312177cf8c6 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Tue, 7 May 2019 19:02:45 -0700
Subject: [PATCH 1289/1703] Update BUILD

---
 packages/angular_devkit/architect/BUILD | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/angular_devkit/architect/BUILD b/packages/angular_devkit/architect/BUILD
index c2736412f275..873fd81f56ab 100644
--- a/packages/angular_devkit/architect/BUILD
+++ b/packages/angular_devkit/architect/BUILD
@@ -6,7 +6,9 @@
 licenses(["notice"])  # MIT
 
 load("@npm_bazel_typescript//:defs.bzl", "ts_library")
+# @external_begin
 load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package")
+# @external_end
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
 package(default_visibility = ["//visibility:public"])
@@ -99,6 +101,7 @@ ts_library(
     ],
 )
 
+# @external_begin
 npm_package(
     name = "npm_package",
     deps = [
@@ -106,3 +109,4 @@ npm_package(
         ":testing",
     ],
 )
+# @external_end

From f606a548bfec2050551b34c6daddfb9f25057159 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Tue, 7 May 2019 19:08:09 -0700
Subject: [PATCH 1290/1703] Update BUILD

---
 packages/angular_devkit/schematics/BUILD | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/angular_devkit/schematics/BUILD b/packages/angular_devkit/schematics/BUILD
index 41d0462cca05..e3682a28be17 100644
--- a/packages/angular_devkit/schematics/BUILD
+++ b/packages/angular_devkit/schematics/BUILD
@@ -6,7 +6,9 @@ package(default_visibility = ["//visibility:public"])
 
 load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
 load("@npm_bazel_typescript//:defs.bzl", "ts_library")
+# @external_begin
 load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package")
+# @external_end
 
 licenses(["notice"])  # MIT License
 
@@ -237,6 +239,7 @@ ts_library(
     ],
 )
 
+# @external_begin
 npm_package(
     name = "npm_package",
     deps = [
@@ -246,3 +249,4 @@ npm_package(
         ":tools",
     ],
 )
+# @external_end

From 1a2e4f04ae1d276a826fd958b165c99df215e3c4 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Tue, 7 May 2019 19:12:23 -0700
Subject: [PATCH 1291/1703] Update BUILD

---
 packages/angular_devkit/core/BUILD | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/angular_devkit/core/BUILD b/packages/angular_devkit/core/BUILD
index 7466504a7b1d..8534b45518c7 100644
--- a/packages/angular_devkit/core/BUILD
+++ b/packages/angular_devkit/core/BUILD
@@ -6,7 +6,9 @@ package(default_visibility = ["//visibility:public"])
 
 load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
 load("@npm_bazel_typescript//:defs.bzl", "ts_library")
+# @external_begin
 load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package")
+# @external_end
 
 licenses(["notice"])  # MIT License
 
@@ -155,6 +157,7 @@ ts_library(
     ],
 )
 
+# @external_begin
 npm_package(
     name = "npm_package",
     deps = [
@@ -163,3 +166,4 @@ npm_package(
         ":node_testing",
     ],
 )
+# @external_end

From 2af2b670f817fd5574c4cbaf7735ad364299dcc1 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@umich.edu>
Date: Tue, 7 May 2019 20:02:34 -0700
Subject: [PATCH 1292/1703] fix(build): fix Bazel lint errors

---
 packages/angular_devkit/architect/BUILD  | 2 ++
 packages/angular_devkit/core/BUILD       | 1 +
 packages/angular_devkit/schematics/BUILD | 1 +
 3 files changed, 4 insertions(+)

diff --git a/packages/angular_devkit/architect/BUILD b/packages/angular_devkit/architect/BUILD
index 873fd81f56ab..2dbfbb17be58 100644
--- a/packages/angular_devkit/architect/BUILD
+++ b/packages/angular_devkit/architect/BUILD
@@ -6,8 +6,10 @@
 licenses(["notice"])  # MIT
 
 load("@npm_bazel_typescript//:defs.bzl", "ts_library")
+
 # @external_begin
 load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package")
+
 # @external_end
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
diff --git a/packages/angular_devkit/core/BUILD b/packages/angular_devkit/core/BUILD
index 8534b45518c7..8ed971197534 100644
--- a/packages/angular_devkit/core/BUILD
+++ b/packages/angular_devkit/core/BUILD
@@ -6,6 +6,7 @@ package(default_visibility = ["//visibility:public"])
 
 load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
 load("@npm_bazel_typescript//:defs.bzl", "ts_library")
+
 # @external_begin
 load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package")
 # @external_end
diff --git a/packages/angular_devkit/schematics/BUILD b/packages/angular_devkit/schematics/BUILD
index e3682a28be17..de42024d78a1 100644
--- a/packages/angular_devkit/schematics/BUILD
+++ b/packages/angular_devkit/schematics/BUILD
@@ -6,6 +6,7 @@ package(default_visibility = ["//visibility:public"])
 
 load("@npm_bazel_jasmine//:index.bzl", "jasmine_node_test")
 load("@npm_bazel_typescript//:defs.bzl", "ts_library")
+
 # @external_begin
 load("@build_bazel_rules_nodejs//:defs.bzl", "npm_package")
 # @external_end

From 8a34a85881f8377f399162c1ba2f7aaa6e8f93d8 Mon Sep 17 00:00:00 2001
From: thekiba <hr@thekiba.io>
Date: Wed, 8 May 2019 00:18:08 +0300
Subject: [PATCH 1293/1703] docs: fixes the changelog commits format

---
 scripts/templates/changelog-feat.ejs | 2 +-
 scripts/templates/changelog-fix.ejs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/templates/changelog-feat.ejs b/scripts/templates/changelog-feat.ejs
index 17ccb75d33cc..d12db7b800ca 100644
--- a/scripts/templates/changelog-feat.ejs
+++ b/scripts/templates/changelog-feat.ejs
@@ -12,7 +12,7 @@
     %>
 <a href="https://github.com/angular/angular-cli/commit/<%= hash %>"><img
    align="top"
-   title="Bug Fix" src="https://img.shields.io/badge/<%= shortSha %>-feat-blue.svg" />
+   title="Feature" src="https://img.shields.io/badge/<%= shortSha %>-feat-blue.svg" />
 </a><%
   } %>
   </td>
diff --git a/scripts/templates/changelog-fix.ejs b/scripts/templates/changelog-fix.ejs
index 8ccfbe25f919..c7303ff1decb 100644
--- a/scripts/templates/changelog-fix.ejs
+++ b/scripts/templates/changelog-fix.ejs
@@ -12,7 +12,7 @@
     %>
 <a href="https://github.com/angular/angular-cli/commit/<%= hash %>"><img
    align="top"
-   title="Feature" src="https://img.shields.io/badge/<%= shortSha %>-fix-green.svg" />
+   title="Bug Fix" src="https://img.shields.io/badge/<%= shortSha %>-fix-green.svg" />
 </a><%
   } %>
   </td>

From 8214be43a65bee855c37e0ced2684704ac4caf17 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 25 Apr 2019 13:17:36 -0400
Subject: [PATCH 1294/1703] docs(@angular-devkit/core): add preliminary
 overview of workspace API

---
 packages/angular_devkit/core/README.md        | 108 +++++++++++++++++-
 .../angular_devkit/core/src/workspace/core.ts |  43 +++++++
 2 files changed, 150 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/core/README.md b/packages/angular_devkit/core/README.md
index 9657238b8c32..bc4b5b0991a5 100644
--- a/packages/angular_devkit/core/README.md
+++ b/packages/angular_devkit/core/README.md
@@ -56,4 +56,110 @@ export class CoreSchemaRegistry implements SchemaRegistry {
 
 # Utils
 
-# Virtual FS
\ No newline at end of file
+# Virtual FS
+
+# Workspaces
+
+The `workspaces` namespace provides an API for interacting with the workspace file formats.
+It provides an abstraction of the underlying storage format of the workspace and provides
+support for both reading and writing.  Currently, the only supported format is the JSON-based
+format used by the Angular CLI.  For this format, the API provides internal change tracking of values which
+enables fine-grained updates to the underlying storage of the workspace.  This allows for the
+retention of existing formatting and comments.
+
+A workspace is defined via the following object model.  Definition collection objects are specialized
+Javascript `Map` objects with an additional `add` method to simplify addition and provide more localized
+error checking of the newly added values.
+
+```ts
+export interface WorkspaceDefinition {
+    readonly extensions: Record<string, JsonValue | undefined>;
+    readonly projects: ProjectDefinitionCollection;
+}
+
+export interface ProjectDefinition {
+    readonly extensions: Record<string, JsonValue | undefined>;
+    readonly targets: TargetDefinitionCollection;
+    root: string;
+    prefix?: string;
+    sourceRoot?: string;
+}
+
+export interface TargetDefinition {
+    options?: Record<string, JsonValue | undefined>;
+    configurations?: Record<string, Record<string, JsonValue | undefined> | undefined>;
+    builder: string;
+}
+```
+
+The API is asynchronous and has two main functions to facilitate reading, creation, and modifying
+a workspace: `readWorkspace` and `writeWorkspace`.
+
+```ts
+export enum WorkspaceFormat {
+  JSON,
+}
+```
+
+```ts
+export function readWorkspace(
+  path: string,
+  host: WorkspaceHost,
+  format?: WorkspaceFormat,
+): Promise<{ workspace: WorkspaceDefinition; }>;
+```
+
+```ts
+export function writeWorkspace(
+  workspace: WorkspaceDefinition,
+  host: WorkspaceHost,
+  path?: string,
+  format?: WorkspaceFormat,
+): Promise<void>;
+```
+
+A `WorkspaceHost` abstracts the underlying data access methods from the functions.  It provides
+methods to read, write, and analyze paths.  A utility function is provided to create
+an instance of a `WorkspaceHost` from the Angular DevKit's virtual filesystem host abstraction.
+
+```ts
+export interface WorkspaceHost {
+    readFile(path: string): Promise<string>;
+    writeFile(path: string, data: string): Promise<void>;
+    isDirectory(path: string): Promise<boolean>;
+    isFile(path: string): Promise<boolean>;
+}
+
+export function createWorkspaceHost(host: virtualFs.Host): WorkspaceHost;
+```
+
+## Usage Example
+
+To demonstrate the usage of the API, the following code will show how to add a option property
+to a build target for an application.
+
+```ts
+import { NodeJsSyncHost } from '@angular-devkit/core/node';
+import { workspaces } from '@angular-devkit/core';
+
+async function demonstrate() {
+    const host = workspaces.createWorkspaceHost(new NodeJsSyncHost());
+    const workspace = await workspaces.readWorkspace('path/to/workspace/directory/', host);
+
+    const project = workspace.projects.get('my-app');
+    if (!project) {
+      throw new Error('my-app does not exist');
+    }
+
+    const buildTarget = project.targets.get('build');
+    if (!buildTarget) {
+      throw new Error('build target does not exist');
+    }
+
+    buildTarget.options.optimization = true;
+
+    await workspaces.writeWorkspace(workspace, host);
+}
+
+demonstrate();
+```
\ No newline at end of file
diff --git a/packages/angular_devkit/core/src/workspace/core.ts b/packages/angular_devkit/core/src/workspace/core.ts
index 336696a0300f..ad5ae8be981f 100644
--- a/packages/angular_devkit/core/src/workspace/core.ts
+++ b/packages/angular_devkit/core/src/workspace/core.ts
@@ -13,14 +13,23 @@ import { writeJsonWorkspace } from './json/writer';
 
 const formatLookup = new WeakMap<WorkspaceDefinition, WorkspaceFormat>();
 
+/**
+ * Supported workspace formats
+ */
 export enum WorkspaceFormat {
   JSON,
 }
 
+/**
+ * @private
+ */
 export function _test_addWorkspaceFile(name: string, format: WorkspaceFormat): void {
   workspaceFiles[name] = format;
 }
 
+/**
+ * @private
+ */
 export function _test_removeWorkspaceFile(name: string): void {
   delete workspaceFiles[name];
 }
@@ -31,6 +40,22 @@ const workspaceFiles: Record<string, WorkspaceFormat> = {
   '.angular.json': WorkspaceFormat.JSON,
 };
 
+/**
+ * Reads and constructs a `WorkspaceDefinition`.  If the function is provided with a path to a
+ * directory instead of a file, a search of the directory's files will commence to attempt to
+ * locate a known workspace file.  Currently the following are considered known workspace files:
+ * - `angular.json`
+ * - `.angular.json`
+ *
+ * @param path The path to either a workspace file or a directory containing a workspace file.
+ * @param host The `WorkspaceHost` to use to access the file and directory data.
+ * @param format An optional `WorkspaceFormat` value. Used if the path specifies a non-standard
+ * file name that would prevent automatically discovering the format.
+ *
+ *
+ * @return An `Promise` of the read result object with the `WorkspaceDefinition` contained within
+ * the `workspace` property.
+ */
 export async function readWorkspace(
   path: string,
   host: WorkspaceHost,
@@ -82,6 +107,24 @@ export async function readWorkspace(
   return { workspace };
 }
 
+/**
+ * Writes a `WorkspaceDefinition` to the underlying storage via the provided `WorkspaceHost`.
+ * If the `WorkspaceDefinition` was created via the `readWorkspace` function, metadata will be
+ * used to determine the path and format of the Workspace.  In all other cases, the `path` and
+ * `format` options must be specified as they would be otherwise unknown.
+ *
+ * @param workspace The `WorkspaceDefinition` that will be written.
+ * @param host The `WorkspaceHost` to use to access/write the file and directory data.
+ * @param path The path to a file location for the output. Required if `readWorkspace` was not
+ * used to create the `WorkspaceDefinition`.  Optional otherwise; will override the
+ * `WorkspaceDefinition` metadata if provided.
+ * @param format The `WorkspaceFormat` to use for output. Required if `readWorkspace` was not
+ * used to create the `WorkspaceDefinition`.  Optional otherwise; will override the
+ * `WorkspaceDefinition` metadata if provided.
+ *
+ *
+ * @return An `Promise` of type `void`.
+ */
 export async function writeWorkspace(
   workspace: WorkspaceDefinition,
   host: WorkspaceHost,

From 548fefddbdaa50fb70fb0b2d63aa3ba6863d6f40 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 8 May 2019 11:30:33 -0400
Subject: [PATCH 1295/1703] docs(@angular-devkit/architect): add comment about
 deprecated workspace usage

---
 .../angular_devkit/architect/node/node-modules-architect-host.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/angular_devkit/architect/node/node-modules-architect-host.ts b/packages/angular_devkit/architect/node/node-modules-architect-host.ts
index 2e5dd766964c..c70d303f2dfc 100644
--- a/packages/angular_devkit/architect/node/node-modules-architect-host.ts
+++ b/packages/angular_devkit/architect/node/node-modules-architect-host.ts
@@ -124,6 +124,7 @@ export class WorkspaceNodeModulesArchitectHost implements ArchitectHost<NodeModu
   }
 
   private findProjectTarget(target: Target) {
+    // NOTE: Remove conditional when deprecated support for experimental workspace API is removed.
     if ('getProjectTargets' in this._workspace) {
       return this._workspace.getProjectTargets(target.project)[target.target];
     } else {

From 52e9819232a8e9d89023ce6b50b6db82c6f73e8c Mon Sep 17 00:00:00 2001
From: hawkgs <hawk.dvp@gmail.com>
Date: Wed, 1 May 2019 22:12:50 +0300
Subject: [PATCH 1296/1703] fix(@schematics/angular): allow insertion when
 there are no occurrences

---
 packages/schematics/angular/utility/ast-utils.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/schematics/angular/utility/ast-utils.ts b/packages/schematics/angular/utility/ast-utils.ts
index 101a26cd107b..dc659003f9dc 100644
--- a/packages/schematics/angular/utility/ast-utils.ts
+++ b/packages/schematics/angular/utility/ast-utils.ts
@@ -191,10 +191,7 @@ export function insertAfterLastOccurrence(nodes: ts.Node[],
                                           syntaxKind?: ts.SyntaxKind): Change {
   // sort() has a side effect, so make a copy so that we won't overwrite the parent's object.
   let lastItem = [...nodes].sort(nodesByPosition).pop();
-  if (!lastItem) {
-    throw new Error();
-  }
-  if (syntaxKind) {
+  if (syntaxKind && lastItem) {
     lastItem = findNodes(lastItem, syntaxKind).sort(nodesByPosition).pop();
   }
   if (!lastItem && fallbackPos == undefined) {

From 86f1884e6518876eae52f47a090bfbf9bc701e5e Mon Sep 17 00:00:00 2001
From: hawkgs <hawk.dvp@gmail.com>
Date: Thu, 2 May 2019 18:13:57 +0300
Subject: [PATCH 1297/1703] test(@schematics/angular): insert after last
 occurrence util

---
 .../angular/utility/ast-utils_spec.ts         | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/packages/schematics/angular/utility/ast-utils_spec.ts b/packages/schematics/angular/utility/ast-utils_spec.ts
index 469cebcd3d8a..8e724c0721db 100644
--- a/packages/schematics/angular/utility/ast-utils_spec.ts
+++ b/packages/schematics/angular/utility/ast-utils_spec.ts
@@ -16,6 +16,8 @@ import {
   addExportToModule,
   addProviderToModule,
   addSymbolToNgModuleMetadata,
+  insertAfterLastOccurrence,
+  findNodes,
 } from './ast-utils';
 
 
@@ -205,4 +207,45 @@ describe('ast utils', () => {
     expect(output).toMatch(/import { LogService } from '.\/log.service';/);
     expect(output).toMatch(/\},\r?\n\s*LogService\r?\n\s*\]/);
   });
+
+  describe('insertAfterLastOccurrence', () => {
+    const filePath: string = './src/foo.ts';
+
+    it('should work for the default scenario', () => {
+      const fileContent = `const arr = ['foo'];`;
+      const source = getTsSource(filePath, fileContent);
+      const arrayNode = findNodes(source.getChildren().shift() as ts.Node, ts.SyntaxKind.ArrayLiteralExpression);
+      const elements = (arrayNode.pop() as ts.ArrayLiteralExpression).elements;
+
+      const change = insertAfterLastOccurrence(
+        elements as any as ts.Node[],
+        `, 'bar'`,
+        filePath,
+        elements.pos,
+        ts.SyntaxKind.StringLiteral
+      );
+      const output = applyChanges(filePath, fileContent, [change]);
+
+      expect(output).toMatch(/const arr = \['foo', 'bar'\];/);
+    });
+
+
+    it('should work without occurrences', () => {
+      const fileContent = `const arr = [];`;
+      const source = getTsSource(filePath, fileContent);
+      const arrayNode = findNodes(source.getChildren().shift() as ts.Node, ts.SyntaxKind.ArrayLiteralExpression);
+      const elements = (arrayNode.pop() as ts.ArrayLiteralExpression).elements;
+
+      const change = insertAfterLastOccurrence(
+        elements as any as ts.Node[],
+        `'bar'`,
+        filePath,
+        elements.pos,
+        ts.SyntaxKind.StringLiteral
+      );
+      const output = applyChanges(filePath, fileContent, [change]);
+
+      expect(output).toMatch(/const arr = \['bar'\];/);
+    });
+  });
 });

From 94ca819656c05a02664912f21cf67e4191ce07be Mon Sep 17 00:00:00 2001
From: hawkgs <hawk.dvp@gmail.com>
Date: Thu, 2 May 2019 19:37:30 +0300
Subject: [PATCH 1298/1703] fix(@schematics/angular): linting errors in AST
 utils spec

---
 .../angular/utility/ast-utils_spec.ts         | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/packages/schematics/angular/utility/ast-utils_spec.ts b/packages/schematics/angular/utility/ast-utils_spec.ts
index 8e724c0721db..6603d6c7fda5 100644
--- a/packages/schematics/angular/utility/ast-utils_spec.ts
+++ b/packages/schematics/angular/utility/ast-utils_spec.ts
@@ -16,8 +16,8 @@ import {
   addExportToModule,
   addProviderToModule,
   addSymbolToNgModuleMetadata,
-  insertAfterLastOccurrence,
   findNodes,
+  insertAfterLastOccurrence,
 } from './ast-utils';
 
 
@@ -39,6 +39,7 @@ function applyChanges(path: string, content: string, changes: Change[]): string
   return getFileContent(tree, path);
 }
 
+// tslint:disable-next-line:no-big-function
 describe('ast utils', () => {
   let modulePath: string;
   let moduleContent: string;
@@ -209,20 +210,23 @@ describe('ast utils', () => {
   });
 
   describe('insertAfterLastOccurrence', () => {
-    const filePath: string = './src/foo.ts';
+    const filePath = './src/foo.ts';
 
     it('should work for the default scenario', () => {
       const fileContent = `const arr = ['foo'];`;
       const source = getTsSource(filePath, fileContent);
-      const arrayNode = findNodes(source.getChildren().shift() as ts.Node, ts.SyntaxKind.ArrayLiteralExpression);
+      const arrayNode = findNodes(
+        source.getChildren().shift() as ts.Node,
+        ts.SyntaxKind.ArrayLiteralExpression,
+      );
       const elements = (arrayNode.pop() as ts.ArrayLiteralExpression).elements;
 
       const change = insertAfterLastOccurrence(
-        elements as any as ts.Node[],
+        elements as unknown as ts.Node[],
         `, 'bar'`,
         filePath,
         elements.pos,
-        ts.SyntaxKind.StringLiteral
+        ts.SyntaxKind.StringLiteral,
       );
       const output = applyChanges(filePath, fileContent, [change]);
 
@@ -233,15 +237,18 @@ describe('ast utils', () => {
     it('should work without occurrences', () => {
       const fileContent = `const arr = [];`;
       const source = getTsSource(filePath, fileContent);
-      const arrayNode = findNodes(source.getChildren().shift() as ts.Node, ts.SyntaxKind.ArrayLiteralExpression);
+      const arrayNode = findNodes(
+        source.getChildren().shift() as ts.Node,
+        ts.SyntaxKind.ArrayLiteralExpression,
+      );
       const elements = (arrayNode.pop() as ts.ArrayLiteralExpression).elements;
 
       const change = insertAfterLastOccurrence(
-        elements as any as ts.Node[],
+        elements as unknown as ts.Node[],
         `'bar'`,
         filePath,
         elements.pos,
-        ts.SyntaxKind.StringLiteral
+        ts.SyntaxKind.StringLiteral,
       );
       const output = applyChanges(filePath, fileContent, [change]);
 

From 3a1df538c53b9111b8eda89dbbb6fc7de902d948 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 7 May 2019 11:33:57 +0100
Subject: [PATCH 1299/1703] ci: test on node 12

---
 .circleci/config.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1a0575d20a9c..818d0e2604ef 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,6 +15,7 @@
 # See https://circleci.com/docs/2.0/caching/#restoring-cache for how prefixes work in CircleCI.
 var_1: &default_docker_image circleci/node:10.12
 var_2: &browsers_docker_image circleci/node:10.12-browsers
+var_2: &browsers_docker_image_node_12 circleci/node:12.1-browsers
 var_3: &cache_key angular_devkit-0.10.0-{{ checksum "yarn.lock" }}
 
 # Settings common to each job
@@ -115,6 +116,19 @@ jobs:
           path: /tmp/dist
           destination: cli/new-production
 
+  e2e-cli-node-12:
+    <<: *defaults
+    docker:
+      - image: *browsers_docker_image_node_12
+    environment:
+      BASH_ENV: ~/.profile
+      NPM_CONFIG_PREFIX: ~/.npm-global
+    resource_class: xlarge
+    parallelism: 4
+    steps:
+      - attach_workspace: *attach_options
+      - run: PATH=~/.npm-global/bin:$PATH xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
+
   e2e-cli-ivy:
     <<: *defaults
     docker:
@@ -218,6 +232,9 @@ workflows:
       - e2e-cli:
           requires:
             - build
+      - e2e-cli-node-12:
+          requires:
+            - build
       - e2e-cli-ivy:
           requires:
             - build            

From 8254cfe87fed5c0895621be4c28963790c08e550 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 7 May 2019 20:25:42 -0400
Subject: [PATCH 1300/1703] fix(@angular/cli): honor builder schema additional
 properties option

Fixes #14354
---
 .../angular/cli/models/architect-command.ts   |  5 +++-
 .../tests/commands/additional-properties.ts   | 28 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 tests/legacy-cli/e2e/tests/commands/additional-properties.ts

diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index ee1df7dc085e..fabef4411846 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -239,7 +239,10 @@ export abstract class ArchitectCommand<
     );
     const overrides = parseArguments(targetOptions, targetOptionArray, this.logger);
 
-    if (overrides['--']) {
+    const allowAdditionalProperties = typeof builderDesc.optionSchema === 'object'
+      && builderDesc.optionSchema.additionalProperties;
+
+    if (overrides['--'] && !allowAdditionalProperties) {
       (overrides['--'] || []).forEach(additional => {
         this.logger.fatal(`Unknown option: '${additional.split(/=/)[0]}'`);
       });
diff --git a/tests/legacy-cli/e2e/tests/commands/additional-properties.ts b/tests/legacy-cli/e2e/tests/commands/additional-properties.ts
new file mode 100644
index 000000000000..b9a477c7cff6
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/commands/additional-properties.ts
@@ -0,0 +1,28 @@
+import { createDir, rimraf, writeMultipleFiles } from '../../utils/fs';
+import { execAndWaitForOutputToMatch } from '../../utils/process';
+import { updateJsonFile } from '../../utils/project';
+
+export default async function() {
+  await createDir('example-builder');
+  await writeMultipleFiles({
+    'example-builder/package.json': '{ "builders": "./builders.json" }',
+    'example-builder/schema.json': '{ "$schema": "http://json-schema.org/draft-07/schema", "type": "object", "additionalProperties": true }',
+    'example-builder/builders.json': '{ "$schema": "@angular-devkit/architect/src/builders-schema.json", "builders": { "example": { "implementation": "./example", "schema": "./schema.json" } } }',
+    'example-builder/example.js': 'module.exports.default = require("@angular-devkit/architect").createBuilder((options) => { console.log(options); return { success: true }; });',
+  });
+
+  await updateJsonFile('angular.json', json => {
+    const appArchitect = json.projects['test-project'].architect;
+    appArchitect.example = {
+      builder: './example-builder:example',
+    };
+  });
+
+  await execAndWaitForOutputToMatch(
+    'ng',
+    ['run', 'test-project:example', '--additional', 'property'],
+    /'{ '--': \[ '--additional', 'property' \] }'/,
+  );
+
+  await rimraf('example-builder');
+}

From 8ba4536d52bd9ddb763d1119e32eeb87d9ac0e3a Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 9 May 2019 07:21:12 +0000
Subject: [PATCH 1301/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index ca09bd46c2bc..fe6882b77f58 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#d19470cdd70692c502de8d452707061362efeaf2",
-    "@angular/common": "github:angular/common-builds#85600328480f5ded81cea9f41a264147747d9af4",
-    "@angular/compiler": "github:angular/compiler-builds#51f3b807570a1d8f346f3c5ebd21ad9961d9431c",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#bf8704ff2ba56a21afa5e654af66fd4c93808f4b",
-    "@angular/core": "github:angular/core-builds#b296aff36f37e760418b19f27b001b46d3f85a87",
-    "@angular/forms": "github:angular/forms-builds#3d72a646a5fbc4bf090a3b927720eacf870f1114",
-    "@angular/language-service": "github:angular/language-service-builds#f811d514f3beb2e2926bc211333dabf224c425d2",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#57363f9f77998aa0924c8cfcb8b97a5cbc5c4aac",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#4f30ce21228124ad85e43d37eafd217692482109",
-    "@angular/router": "github:angular/router-builds#53f6c9774c0e5fd8dbc3153967061d8761c95090"
+    "@angular/animations": "github:angular/animations-builds#3dd31e996e82df4048cd096c2e11fc4651224489",
+    "@angular/common": "github:angular/common-builds#7d613dc8118160e57edea9e6591c9b9d783b5631",
+    "@angular/compiler": "github:angular/compiler-builds#698dfb2f2235b56160c96e4febd926605605f184",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#97de8d23bca0410bc1376c2f0466fb4cf14dd785",
+    "@angular/core": "github:angular/core-builds#e716442f48c08add21db9a68352224c53f768faf",
+    "@angular/forms": "github:angular/forms-builds#ca6413367b43cc18fe6d755d273fc1bdd9cd8d53",
+    "@angular/language-service": "github:angular/language-service-builds#69e484a846e163eea4f5faf695869a7ad138957d",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#4a440698bb85a4adf47b0a2a795172827a17f832",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#a8cf1e3532862bcae219a62e4441188dfabf1b25",
+    "@angular/router": "github:angular/router-builds#4de09bde7aebd8c175a2cd6b92a49caac0df6449"
   }
 }
\ No newline at end of file

From 555819dadb2b8a5269072038de7eee5fe4167883 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 8 May 2019 05:37:41 +0000
Subject: [PATCH 1302/1703] build: update glob to version 7.1.4

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 20 +++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index daa560eb476f..9281ec148baa 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -21,7 +21,7 @@
     "copy-webpack-plugin": "5.0.3",
     "core-js": "3.0.1",
     "file-loader": "3.0.1",
-    "glob": "7.1.3",
+    "glob": "7.1.4",
     "istanbul-instrumenter-loader": "3.0.1",
     "karma-source-map-support": "1.4.0",
     "less": "3.9.0",
diff --git a/yarn.lock b/yarn.lock
index c46f6eaec55c..0f704512cd8b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4097,10 +4097,10 @@ glob@7.0.x:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
+glob@7.1.4:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
+  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -4120,6 +4120,18 @@ glob@^5.0.15:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 global-dirs@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"

From 04b854956c5e84c319e0f4b1b6c27c34b84814e6 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Wed, 8 May 2019 08:25:22 +0200
Subject: [PATCH 1303/1703] fix(@schematics/angular): remove old GoogleBot
 browserslist setting

GoogleBot is now evergreen, we don't need to specialcase it: https://webmasters.googleblog.com/2019/05/the-new-evergreen-googlebot.html?m=1

Fixes #14364
---
 .../angular/application/files/browserslist.template   |  4 ----
 .../migrations/update-8/differential-loading.ts       | 11 +----------
 .../migrations/update-8/differential-loading_spec.ts  | 10 ----------
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/packages/schematics/angular/application/files/browserslist.template b/packages/schematics/angular/application/files/browserslist.template
index 3525779c0dfb..80848532e47d 100644
--- a/packages/schematics/angular/application/files/browserslist.template
+++ b/packages/schematics/angular/application/files/browserslist.template
@@ -5,12 +5,8 @@
 # You can see what browsers were selected by your queries by running:
 #   npx browserslist
 
-# Googlebot uses an older version of Chrome
-# For additional information see: https://developers.google.com/search/docs/guides/rendering
-
 > 0.5%
 last 2 versions
 Firefox ESR
-Chrome 41 # Support for Googlebot
 not dead
 not IE 9-11 # For IE 9-11 support, remove 'not'.
\ No newline at end of file
diff --git a/packages/schematics/angular/migrations/update-8/differential-loading.ts b/packages/schematics/angular/migrations/update-8/differential-loading.ts
index 652b1acd292a..8daf53941bef 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading.ts
@@ -29,13 +29,9 @@ const browserslistContent = `# This file is used by the build system to adjust C
 # You can see what browsers were selected by your queries by running:
 #   npx browserslist
 
-# Googlebot uses an older version of Chrome
-# For additional information see: https://developers.google.com/search/docs/guides/rendering
-
 > 0.5%
 last 2 versions
 Firefox ESR
-Chrome 41 # Support for Googlebot
 not dead
 not IE 9-11 # For IE 9-11 support, remove 'not'.`;
 
@@ -148,13 +144,8 @@ function updateProjects(): Rule {
         }
       }
 
-      const source = tree.read(browserslistPath);
-      if (!source) {
+      if (!tree.exists(browserslistPath)) {
         tree.create(browserslistPath, browserslistContent);
-      } else if (!source.toString().toLowerCase().includes('chrome 41')) {
-        const recorder = tree.beginUpdate(browserslistPath);
-        recorder.insertRight(source.length, '\nChrome 41 # Googlebot');
-        tree.commitUpdate(recorder);
       }
     }
 
diff --git a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
index 01bcb5809364..10d94f6d55dc 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
@@ -80,17 +80,10 @@ describe('Migration to version 8', () => {
       expect(module).toBe('esnext');
     });
 
-    it(`should update browserslist file to add an non evergreen browser`, () => {
-      const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
-      expect(tree2.readContent('/browserslist')).toContain('Chrome 41');
-    });
-
     it(`should create browserslist file if it doesn't exist`, () => {
       tree.delete('/browserslist');
       const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
       expect(tree2.exists('/browserslist')).toBe(true);
-      expect(tree2.readContent('/browserslist'))
-        .toContain('Support for Googlebot');
     });
 
     it('should move browserslist file if it exists in the sourceRoot', () => {
@@ -98,9 +91,6 @@ describe('Migration to version 8', () => {
       tree.delete('/browserslist');
       const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
       expect(tree2.exists('/browserslist')).toBe(true);
-      const content = tree2.readContent('/browserslist');
-      expect(content).toContain('Chrome 41');
-      expect(content).toContain('last 2 Chrome versions');
     });
 
     it(`should remove 'target' and 'module' from non workspace tsconfig.json`, () => {

From ac23dc091312ce8f8452071a0dc6899b9ecb0f82 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Wed, 8 May 2019 14:04:56 +0300
Subject: [PATCH 1304/1703] fix(@schematics/angular): tsconfig with comments
 breaks universal schematic

Fixes #14371
---
 packages/schematics/angular/universal/index.ts    |  3 ++-
 .../schematics/angular/universal/index_spec.ts    | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/universal/index.ts b/packages/schematics/angular/universal/index.ts
index 3a0e58a20abc..e6e9a263b89b 100644
--- a/packages/schematics/angular/universal/index.ts
+++ b/packages/schematics/angular/universal/index.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {
+  JsonParseMode,
   Path,
   basename,
   join,
@@ -206,7 +207,7 @@ function getTsConfigOutDir(host: Tree, tsConfigPath: string): string {
     throw new SchematicsException(`Could not read ${tsConfigPath}`);
   }
   const tsConfigContent = tsConfigBuffer.toString();
-  const tsConfig = parseJson(tsConfigContent);
+  const tsConfig = parseJson(tsConfigContent, JsonParseMode.Loose);
   if (tsConfig === null || typeof tsConfig !== 'object' || Array.isArray(tsConfig) ||
     tsConfig.compilerOptions === null || typeof tsConfig.compilerOptions !== 'object' ||
     Array.isArray(tsConfig.compilerOptions)) {
diff --git a/packages/schematics/angular/universal/index_spec.ts b/packages/schematics/angular/universal/index_spec.ts
index 16c6737423bb..1cc9b90c0154 100644
--- a/packages/schematics/angular/universal/index_spec.ts
+++ b/packages/schematics/angular/universal/index_spec.ts
@@ -10,6 +10,7 @@ import { Schema as ApplicationOptions, Style } from '../application/schema';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { Schema as UniversalOptions } from './schema';
 
+// tslint:disable-next-line:no-big-function
 describe('Universal Schematic', () => {
   const schematicRunner = new SchematicTestRunner(
     '@schematics/angular',
@@ -82,7 +83,6 @@ describe('Universal Schematic', () => {
     const tree = await schematicRunner
       .runSchematicAsync('universal', workspaceUniversalOptions, appTree)
       .toPromise();
-    debugger;
     const filePath = '/tsconfig.server.json';
     expect(tree.exists(filePath)).toEqual(true);
     const contents = tree.readContent(filePath);
@@ -204,4 +204,17 @@ describe('Universal Schematic', () => {
     expect(schematicRunner.tasks[0].name).toBe('node-package');
     expect((schematicRunner.tasks[0].options as {command: string}).command).toBe('install');
   });
+
+  it(`should work when 'tsconfig.app.json' has comments`, async () => {
+    const appTsConfigPath = '/projects/bar/tsconfig.app.json';
+    const appTsConfigContent = appTree.readContent(appTsConfigPath);
+    appTree.overwrite(appTsConfigPath, '// comment in json file\n' + appTsConfigContent);
+
+    const tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
+      .toPromise();
+
+    const filePath = '/projects/bar/tsconfig.server.json';
+    expect(tree.exists(filePath)).toEqual(true);
+  });
+
 });

From 225cd36f491194d4aa603238915f57fa4e6fbf0c Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 8 May 2019 11:40:51 -0400
Subject: [PATCH 1305/1703] fix(@angular-devkit/core): NodeJSAsyncHost.isFile
 should check for a file

---
 packages/angular_devkit/core/node/host.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/core/node/host.ts b/packages/angular_devkit/core/node/host.ts
index 9c5dcd571d2b..49907cd55355 100644
--- a/packages/angular_devkit/core/node/host.ts
+++ b/packages/angular_devkit/core/node/host.ts
@@ -181,7 +181,7 @@ export class NodeJsAsyncHost implements virtualFs.Host<fs.Stats> {
   }
   isFile(path: Path): Observable<boolean> {
     return _callFs(fs.stat, getSystemPath(path)).pipe(
-      map(stat => stat.isDirectory()),
+      map(stat => stat.isFile()),
     );
   }
 

From e3eee5fc91dc9382555f6ba8579069b37adef735 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 8 May 2019 13:22:48 -0400
Subject: [PATCH 1306/1703] fix(@angular-devkit/build-angular): account for
 dynamic port with dev-server baseUrl

The underlying webpack dev server builder is responsible for determining the actual port value for dynamic port cases (port = 0).  This change uses that value to generate the full URL for accessing the dev server.
---
 .../build_angular/src/dev-server/index.ts     | 56 +++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index ea8f7d60232a..db0e5a4801c8 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -81,7 +81,6 @@ export function serveWebpackBrowser(
   const browserTarget = targetFromTargetString(options.browserTarget);
   const root = context.workspaceRoot;
   let first = true;
-  let openAddress: string;
   const host = new NodeJsSyncHost();
 
   const loggingFn = transforms.logging
@@ -152,15 +151,6 @@ export function serveWebpackBrowser(
         options.publicHost = clientAddress.host;
       }
 
-      // Resolve serve address.
-      const serverAddress = url.format({
-        protocol: options.ssl ? 'https' : 'http',
-        hostname: options.host === '0.0.0.0' ? 'localhost' : options.host,
-        // Port cannot be undefined here since we have a step that sets it back in options above.
-        // tslint:disable-next-line:no-non-null-assertion
-        port: options.port !.toString(),
-      });
-
       // Add live reload config.
       if (options.liveReload) {
         _addLiveReload(options, browserOptions, webpackConfig, clientAddress, context.logger);
@@ -193,24 +183,34 @@ export function serveWebpackBrowser(
         `);
       }
 
-      context.logger.info(tags.oneLine`
-        **
-        Angular Live Development Server is listening on ${options.host}:${options.port},
-        open your browser on ${serverAddress}${webpackDevServerConfig.publicPath}
-        **
-      `);
-
-      openAddress = serverAddress + webpackDevServerConfig.publicPath;
-
-      return runWebpackDevServer(webpackConfig, context, { logging: loggingFn });
-    }),
-    map(buildEvent => {
-      if (first && options.open) {
-        first = false;
-        open(openAddress);
-      }
-
-      return { ...buildEvent, baseUrl: openAddress } as DevServerBuilderOutput;
+      return runWebpackDevServer(webpackConfig, context, { logging: loggingFn }).pipe(
+        map(buildEvent => {
+          // Resolve serve address.
+          const serverAddress = url.format({
+            protocol: options.ssl ? 'https' : 'http',
+            hostname: options.host === '0.0.0.0' ? 'localhost' : options.host,
+            pathname: webpackDevServerConfig.publicPath,
+            port: buildEvent.port,
+          });
+
+          if (first) {
+            first = false;
+
+            context.logger.info(tags.oneLine`
+              **
+              Angular Live Development Server is listening on ${options.host}:${options.port},
+              open your browser on ${serverAddress}
+              **
+            `);
+
+            if (options.open) {
+              open(serverAddress);
+            }
+          }
+
+          return { ...buildEvent, baseUrl: serverAddress } as DevServerBuilderOutput;
+        }),
+      );
     }),
   );
 }

From 0b700c3c278b91f5900024f96d5e0a3630f4275a Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 8 May 2019 13:39:20 -0400
Subject: [PATCH 1307/1703] fix(@angular-devkit/build-angular): protractor
 should use dev server baseUrl

---
 .../build_angular/src/protractor/index.ts        |  2 ++
 .../test/protractor/works_spec_large.ts          | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/packages/angular_devkit/build_angular/src/protractor/index.ts b/packages/angular_devkit/build_angular/src/protractor/index.ts
index 940f49f5475a..630c76ee4881 100644
--- a/packages/angular_devkit/build_angular/src/protractor/index.ts
+++ b/packages/angular_devkit/build_angular/src/protractor/index.ts
@@ -140,6 +140,8 @@ async function execute(
       }
       const clientUrl = url.parse(publicHost);
       baseUrl = url.format(clientUrl);
+    } else if (typeof result.baseUrl === 'string') {
+      baseUrl = result.baseUrl;
     } else if (typeof result.port === 'number') {
       baseUrl = url.format({
         protocol: serverOptions.ssl ? 'https' : 'http',
diff --git a/packages/angular_devkit/build_angular/test/protractor/works_spec_large.ts b/packages/angular_devkit/build_angular/test/protractor/works_spec_large.ts
index 2955b8f8acf4..490a5985a545 100644
--- a/packages/angular_devkit/build_angular/test/protractor/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/protractor/works_spec_large.ts
@@ -81,4 +81,20 @@ describe('Protractor Builder', () => {
     await run.stop();
   }, 30000);
 
+  it('supports dev server builder with browser builder base HREF option', async () => {
+    host.replaceInFile(
+      'angular.json',
+      '"main": "src/main.ts",',
+      '"main": "src/main.ts", "baseHref": "/base/",',
+    );
+    // Need to reset architect to use the modified config
+    architect = (await createArchitect(host.root())).architect;
+
+    const run = await architect.scheduleTarget(protractorTargetSpec);
+
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+    await run.stop();
+  }, 30000);
+
 });

From 01247c9339d928cac1291f268ad17ee3a153c057 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 8 May 2019 14:28:16 -0400
Subject: [PATCH 1308/1703] fix(@angular-devkit/build-angular): stop dev server
 fallback outside of serve path

The serve path represents the base of the application.  Accessing a different path (`/api/` for instance) should not cause the application to load if the application's base is `/test/`
---
 .../build_angular/src/dev-server/index.ts     |  8 +++-
 .../test/dev-server/serve-path_spec_large.ts  | 37 ++++++++++++++++++-
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index db0e5a4801c8..48a5dfd1d1b8 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -259,10 +259,16 @@ export function buildServerConfig(
     host: serverOptions.host,
     port: serverOptions.port,
     headers: { 'Access-Control-Allow-Origin': '*' },
-    historyApiFallback: {
+    historyApiFallback: !!browserOptions.index && {
       index: `${servePath}/${path.basename(browserOptions.index)}`,
       disableDotRule: true,
       htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
+      rewrites: [
+        {
+          from: new RegExp(`^(?!${servePath})/.*`),
+          to: context => url.format(context.parsedUrl),
+        },
+      ],
     } as WebpackDevServer.HistoryApiFallbackConfig,
     stats: false,
     compress: styles || scripts,
diff --git a/packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts
index 3f5781c09698..21e7e11ec112 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts
@@ -27,7 +27,7 @@ describe('Dev Server Builder serve path', () => {
     await Promise.all(runs.map(r => r.stop()));
   });
 
-  it('works', async () => {
+  it('uses the servePath option when specified', async () => {
     const run = await architect.scheduleTarget(target, { servePath: 'test/' });
     runs.push(run);
     const output = await run.result as DevServerBuilderOutput;
@@ -37,4 +37,39 @@ describe('Dev Server Builder serve path', () => {
     const response = await fetch(`${output.baseUrl}/polyfills.js`);
     expect(await response.text()).toContain('window["webpackJsonp"]');
   }, 30000);
+
+  it('does not fallback when request is outside serve path', async () => {
+    const run = await architect.scheduleTarget(target, { servePath: 'test/' });
+
+    await expectAsync(run.result).toBeResolvedTo(
+      jasmine.objectContaining({ success: true, baseUrl: 'http://localhost:4200/test' }),
+    );
+
+    // fallback processing requires an accept header
+    await expectAsync(
+      fetch('http://localhost:4200', { headers: { 'accept': 'text/html' } }),
+    ).toBeResolvedTo(jasmine.objectContaining({ status: 404 }));
+
+    await expectAsync(
+      fetch('http://localhost:4200/api/', { headers: { 'accept': 'text/html' } }),
+    ).toBeResolvedTo(jasmine.objectContaining({ status: 404 }));
+
+    await run.stop();
+  }, 30000);
+
+  it('does fallback when request is inside serve path', async () => {
+    const run = await architect.scheduleTarget(target, { servePath: 'test/' });
+
+    await expectAsync(run.result).toBeResolvedTo(
+      jasmine.objectContaining({ success: true, baseUrl: 'http://localhost:4200/test' }),
+    );
+
+    // fallback processing requires an accept header
+    await expectAsync(
+      fetch('http://localhost:4200/test/nothere', { headers: { 'accept': 'text/html' } }),
+    ).toBeResolvedTo(jasmine.objectContaining({ status: 200 }));
+
+    await run.stop();
+  }, 30000);
+
 });

From 3fc520278cd233f7b0f0984128005cd51c72a750 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 8 May 2019 20:16:15 -0400
Subject: [PATCH 1309/1703] refactor(@angular-devkit/schematics): update rxjs
 usage in rules

rxjs has improved over time and this updates the rules to take advantage of improvements where applicable.
---
 .../schematics/src/_golden-api.d.ts           |  2 +-
 .../schematics/src/rules/base.ts              | 84 ++++++++-----------
 .../schematics/src/rules/call.ts              | 12 +--
 3 files changed, 40 insertions(+), 58 deletions(-)

diff --git a/etc/api/angular_devkit/schematics/src/_golden-api.d.ts b/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
index 4edbf47bee79..2c86d1d05ca4 100644
--- a/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
@@ -67,7 +67,7 @@ export interface BaseWorkflowOptions {
 
 export declare function branchAndMerge(rule: Rule, strategy?: MergeStrategy): Rule;
 
-export declare function callRule(rule: Rule, input: Observable<Tree>, context: SchematicContext): Observable<Tree>;
+export declare function callRule(rule: Rule, input: Tree | Observable<Tree>, context: SchematicContext): Observable<Tree>;
 
 export declare function callSource(source: Source, context: SchematicContext): Observable<Tree>;
 
diff --git a/packages/angular_devkit/schematics/src/rules/base.ts b/packages/angular_devkit/schematics/src/rules/base.ts
index 33ba90fbe4de..779219d3c321 100644
--- a/packages/angular_devkit/schematics/src/rules/base.ts
+++ b/packages/angular_devkit/schematics/src/rules/base.ts
@@ -5,22 +5,16 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Observable, of as observableOf } from 'rxjs';
-import { concatMap, last, map } from 'rxjs/operators';
-import { FileOperator, Rule, SchematicContext, Source } from '../engine/interface';
+import { Observable, concat } from 'rxjs';
+import { map, mapTo, toArray } from 'rxjs/operators';
+import { FileOperator, Rule, Source } from '../engine/interface';
 import { SchematicsException } from '../exception/exception';
 import { FilterHostTree, HostTree } from '../tree/host-tree';
 import { FileEntry, FilePredicate, MergeStrategy, Tree } from '../tree/interface';
 import { ScopedTree } from '../tree/scoped';
-import {
-  branch,
-  empty as staticEmpty,
-  merge as staticMerge,
-  partition as staticPartition,
-} from '../tree/static';
+import { empty as staticEmpty, partition } from '../tree/static';
 import { callRule, callSource } from './call';
 
-
 /**
  * A Source that returns an tree as its single value.
  */
@@ -28,7 +22,6 @@ export function source(tree: Tree): Source {
   return () => tree;
 }
 
-
 /**
  * A source that returns an empty tree.
  */
@@ -36,19 +29,18 @@ export function empty(): Source {
   return () => staticEmpty();
 }
 
-
 /**
  * Chain multiple rules into a single rule.
  */
 export function chain(rules: Rule[]): Rule {
-  return (tree: Tree, context: SchematicContext) => {
-    return rules.reduce((acc: Observable<Tree>, curr: Rule) => {
-      return callRule(curr, acc, context);
-    }, observableOf(tree));
+  return (tree, context) => {
+    return rules.reduce(
+      (acc: Tree | Observable<Tree>, curr: Rule) => callRule(curr, acc, context),
+      tree,
+    );
   };
 }
 
-
 /**
  * Apply multiple rules to a source, and returns the source transformed.
  */
@@ -56,24 +48,22 @@ export function apply(source: Source, rules: Rule[]): Source {
   return context => callRule(chain(rules), callSource(source, context), context);
 }
 
-
 /**
  * Merge an input tree with the source passed in.
  */
 export function mergeWith(source: Source, strategy: MergeStrategy = MergeStrategy.Default): Rule {
-  return (tree: Tree, context: SchematicContext) => {
-    const result = callSource(source, context);
-
-    return result.pipe(map(other => staticMerge(tree, other, strategy || context.strategy)));
+  return (tree, context) => {
+    return callSource(source, context).pipe(
+      map(sourceTree => tree.merge(sourceTree, strategy || context.strategy)),
+      mapTo(tree),
+    );
   };
 }
 
-
 export function noop(): Rule {
   return () => {};
 }
 
-
 export function filter(predicate: FilePredicate<boolean>): Rule {
   return ((tree: Tree) => {
     if (HostTree.isHostTree(tree)) {
@@ -84,25 +74,19 @@ export function filter(predicate: FilePredicate<boolean>): Rule {
   });
 }
 
-
 export function asSource(rule: Rule): Source {
-  return apply(empty(), [rule]);
+  return context => callRule(rule, staticEmpty(), context);
 }
 
-
 export function branchAndMerge(rule: Rule, strategy = MergeStrategy.Default): Rule {
-  return (tree: Tree, context: SchematicContext) => {
-    const branchedTree = branch(tree);
-
-    return callRule(rule, observableOf(branchedTree), context)
-      .pipe(
-        last(),
-        map(t => staticMerge(tree, t, strategy)),
-      );
+  return (tree, context) => {
+    return callRule(rule, tree.branch(), context).pipe(
+      map(branch => tree.merge(branch, strategy || context.strategy)),
+      mapTo(tree),
+    );
   };
 }
 
-
 export function when(predicate: FilePredicate<boolean>, operator: FileOperator): FileOperator {
   return (entry: FileEntry) => {
     if (predicate(entry.path, entry)) {
@@ -113,30 +97,28 @@ export function when(predicate: FilePredicate<boolean>, operator: FileOperator):
   };
 }
 
-
 export function partitionApplyMerge(
   predicate: FilePredicate<boolean>,
   ruleYes: Rule,
   ruleNo?: Rule,
 ): Rule {
-  return (tree: Tree, context: SchematicContext) => {
-    const [yes, no] = staticPartition(tree, predicate);
+  return (tree, context) => {
+    const [yes, no] = partition(tree, predicate);
 
-    if (!ruleNo) {
-      // Shortcut.
-      return callRule(ruleYes, observableOf(staticPartition(tree, predicate)[0]), context)
-        .pipe(map(yesTree => staticMerge(yesTree, no, context.strategy)));
-    }
+    return concat(
+      callRule(ruleYes, yes, context),
+      callRule(ruleNo || noop(), no, context),
+    ).pipe(
+      toArray(),
+      map(([yesTree, noTree]) => {
+        yesTree.merge(noTree, context.strategy);
 
-    return callRule(ruleYes, observableOf(yes), context)
-      .pipe(concatMap(yesTree => {
-        return callRule(ruleNo, observableOf(no), context)
-          .pipe(map(noTree => staticMerge(yesTree, noTree, context.strategy)));
-      }));
+        return yesTree;
+      }),
+    );
   };
 }
 
-
 export function forEach(operator: FileOperator): Rule {
   return (tree: Tree) => {
     tree.visit((path, entry) => {
@@ -182,7 +164,7 @@ export function applyToSubtree(path: string, rules: Rule[]): Rule {
   return (tree, context) => {
     const scoped = new ScopedTree(tree, path);
 
-    return callRule(chain(rules), observableOf(scoped), context).pipe(
+    return callRule(chain(rules), scoped, context).pipe(
       map(result => {
         if (result === scoped) {
           return tree;
diff --git a/packages/angular_devkit/schematics/src/rules/call.ts b/packages/angular_devkit/schematics/src/rules/call.ts
index 15f7b5bf5422..a9f2762e3c96 100644
--- a/packages/angular_devkit/schematics/src/rules/call.ts
+++ b/packages/angular_devkit/schematics/src/rules/call.ts
@@ -5,8 +5,8 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { BaseException, isObservable, isPromise } from '@angular-devkit/core';
-import { Observable, from, of as observableOf, throwError } from 'rxjs';
+import { BaseException, isPromise } from '@angular-devkit/core';
+import { Observable, from, isObservable, of as observableOf, throwError } from 'rxjs';
 import { defaultIfEmpty, last, mergeMap, tap } from 'rxjs/operators';
 import { Rule, SchematicContext, Source } from '../engine/interface';
 import { Tree, TreeSymbol } from '../tree/interface';
@@ -74,17 +74,17 @@ export function callSource(source: Source, context: SchematicContext): Observabl
 
 export function callRule(
   rule: Rule,
-  input: Observable<Tree>,
+  input: Tree | Observable<Tree>,
   context: SchematicContext,
 ): Observable<Tree> {
-  return input.pipe(mergeMap(inputTree => {
+  return (isObservable(input) ? input : observableOf(input)).pipe(mergeMap(inputTree => {
     const result = rule(inputTree, context);
 
     if (!result) {
       return observableOf(inputTree);
     } else if (typeof result == 'function') {
       // This is considered a Rule, chain the rule and return its output.
-      return callRule(result, observableOf(inputTree), context);
+      return callRule(result, inputTree, context);
     } else if (isObservable(result)) {
       // Only return the last Tree, and make sure it's a Tree.
       return result.pipe(
@@ -101,7 +101,7 @@ export function callRule(
         mergeMap(inner => {
           if (typeof inner === 'function') {
             // This is considered a Rule, chain the rule and return its output.
-            return callRule(inner, observableOf(inputTree), context);
+            return callRule(inner, inputTree, context);
           } else {
             return observableOf(inputTree);
           }

From cc8c3fd904163264fdd0bf92af580924c39533c7 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Thu, 9 May 2019 11:18:09 +0300
Subject: [PATCH 1310/1703] fix(@angular-devkit/build-angular): propagate
 protractor errors during execution

---
 .../build_angular/src/protractor/index.ts      | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/protractor/index.ts b/packages/angular_devkit/build_angular/src/protractor/index.ts
index 630c76ee4881..3899946c4ab8 100644
--- a/packages/angular_devkit/build_angular/src/protractor/index.ts
+++ b/packages/angular_devkit/build_angular/src/protractor/index.ts
@@ -89,13 +89,7 @@ async function execute(
   }
 
   if (options.webdriverUpdate) {
-    try {
-      await updateWebdriver();
-    } catch (error) {
-      context.reportStatus('Error: ' + error);
-
-      return { success: false };
-    }
+    await updateWebdriver();
   }
 
   let baseUrl;
@@ -120,14 +114,8 @@ async function execute(
     }
 
     server = await context.scheduleTarget(target, overrides);
-    let result;
-    try {
-      result = await server.result;
-    } catch (error) {
-      context.reportStatus('Error: ' + error);
-    }
-
-    if (!result || !result.success) {
+    const result = await server.result;
+    if (!result.success) {
       return { success: false };
     }
 

From 2521a39559ce6b19c9543871c70d86a94158d455 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Thu, 9 May 2019 15:05:47 +0300
Subject: [PATCH 1311/1703] fix(@angular/cli): print full error when package is
 not found

---
 packages/angular/cli/tasks/npm-install.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular/cli/tasks/npm-install.ts b/packages/angular/cli/tasks/npm-install.ts
index 99a470b8d902..b14df7b5481a 100644
--- a/packages/angular/cli/tasks/npm-install.ts
+++ b/packages/angular/cli/tasks/npm-install.ts
@@ -26,7 +26,7 @@ export default async function (packageName: string,
     case 'cnpm':
     case 'pnpm':
     case 'npm':
-      installArgs.push('install', '--silent');
+      installArgs.push('install');
       break;
 
     case 'yarn':
@@ -35,7 +35,7 @@ export default async function (packageName: string,
 
     default:
       packageManager = 'npm';
-      installArgs.push('install', '--quiet');
+      installArgs.push('install');
       break;
   }
 
@@ -49,6 +49,8 @@ export default async function (packageName: string,
     installArgs.push('--no-save');
   }
 
+  installArgs.push('--quiet');
+
   await new Promise((resolve, reject) => {
     spawn(packageManager, installArgs, { stdio: 'inherit', shell: true })
       .on('close', (code: number) => {
@@ -56,9 +58,7 @@ export default async function (packageName: string,
           logger.info(terminal.green(`Installed packages for tooling via ${packageManager}.`));
           resolve();
         } else {
-          const message = 'Package install failed, see above.';
-          logger.info(terminal.red(message));
-          reject(message);
+          reject('Package install failed, see above.');
         }
       });
   });

From 816d23ba8212287c7ebc2d8c66302b93809654d6 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Thu, 9 May 2019 12:08:14 -0700
Subject: [PATCH 1312/1703] build: fix external block in BUILD files

---
 packages/angular_devkit/core/BUILD       |  7 ++-----
 packages/angular_devkit/schematics/BUILD | 10 +++-------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/packages/angular_devkit/core/BUILD b/packages/angular_devkit/core/BUILD
index 8ed971197534..d6e45f65c371 100644
--- a/packages/angular_devkit/core/BUILD
+++ b/packages/angular_devkit/core/BUILD
@@ -30,7 +30,6 @@ ts_library(
     ],
     module_name = "@angular-devkit/core",
     module_root = "src/index.d.ts",
-    # strict_checks = False,
     deps = [
         "@npm//rxjs",
         "@npm//@types/node",
@@ -58,7 +57,7 @@ ts_library(
     ],
     # @external_begin
     tsconfig = "//:tsconfig-test.json",
-    # strict_checks = False,
+    # @external_end
     deps = [
         ":core",
         ":node",
@@ -66,7 +65,6 @@ ts_library(
         "@npm//@types/node",
         "@npm//rxjs",
     ],
-    # @external_end
 )
 
 jasmine_node_test(
@@ -111,6 +109,7 @@ ts_library(
     ),
     # @external_begin
     tsconfig = "//:tsconfig-test.json",
+    # @external_end
     deps = [
         ":core",
         ":node",
@@ -119,7 +118,6 @@ ts_library(
         "@npm//@types/node",
         "@npm//rxjs",
     ],
-    # @external_end
 )
 
 jasmine_node_test(
@@ -148,7 +146,6 @@ ts_library(
     ),
     module_name = "@angular-devkit/core/node/testing",
     module_root = "node/testing/index.d.ts",
-    # strict_checks = False,
     deps = [
         ":core",
         ":node",
diff --git a/packages/angular_devkit/schematics/BUILD b/packages/angular_devkit/schematics/BUILD
index de42024d78a1..bb07197cf112 100644
--- a/packages/angular_devkit/schematics/BUILD
+++ b/packages/angular_devkit/schematics/BUILD
@@ -27,7 +27,6 @@ ts_library(
     ),
     module_name = "@angular-devkit/schematics",
     module_root = "src/index.d.ts",
-    # strict_checks = False,
     deps = [
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core:node",  # TODO: get rid of this for 6.0
@@ -47,6 +46,7 @@ ts_library(
     ),
     # @external_begin
     tsconfig = "//:tsconfig-test.json",
+    # @external_end
     deps = [
         ":schematics",
         ":testing",
@@ -56,7 +56,6 @@ ts_library(
         "@npm//@types/node",
         "@npm//rxjs",
     ],
-    # @external_end
 )
 
 jasmine_node_test(
@@ -83,7 +82,6 @@ ts_library(
     ),
     module_name = "@angular-devkit/schematics/tasks",
     module_root = "tasks/index.d.ts",
-    # strict_checks = False,
     deps = [
         ":schematics",
         "//packages/angular_devkit/core",
@@ -108,7 +106,6 @@ ts_library(
     ),
     module_name = "@angular-devkit/schematics/tasks/node",
     module_root = "tasks/node/index.d.ts",
-    # strict_checks = False,
     deps = [
         ":schematics",
         ":tasks",
@@ -135,6 +132,7 @@ ts_library(
     ],
     # @external_begin
     tsconfig = "//:tsconfig-test.json",
+    # @external_end
     deps = [
         ":schematics",
         ":tasks",
@@ -146,7 +144,6 @@ ts_library(
         "@npm//@types/node",
         "@npm//rxjs",
     ],
-    # @external_end
 )
 
 jasmine_node_test(
@@ -172,7 +169,6 @@ ts_library(
     ),
     module_name = "@angular-devkit/schematics/tools",
     module_root = "tools/index.d.ts",
-    # strict_checks = False,
     deps = [
         ":schematics",
         ":tasks",
@@ -196,6 +192,7 @@ ts_library(
     ),
     # @external_begin
     tsconfig = "//:tsconfig-test.json",
+    # @external_end
     deps = [
         ":schematics",
         ":tasks",
@@ -208,7 +205,6 @@ ts_library(
         "@npm//@types/node",
         "@npm//rxjs",
     ],
-    # @external_end
 )
 
 jasmine_node_test(

From 7a72f2fb1757c02ed7964591d0205b70bbe0c406 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 29 Apr 2019 11:23:59 -0400
Subject: [PATCH 1313/1703] refactor(@angular/cli): avoid aggressive eager
 command loading

Currently, upon execution `ng` will load all description files AND code for all available commands.  This requires a large amount of unnecessary file access and processing since only at most one command will be executed.  This change limits the loading to only command being executed in the common case and a subset of commands in the event an alias is used.  The help command now loads all commands during its execution which is needed to gather command description information.  Further improvements are possible by only loading the necessary metadata instead of the execution code (and its dependencies) as well.
This change allows for savings of ~250ms per execution.

Examples:
Before -- `./node_modules/.bin/ng version  0.99s user 0.17s system 113% cpu 1.020 total`
After -- `./node_modules/.bin/ng version  0.70s user 0.13s system 110% cpu 0.749 total`

Before -- `./node_modules/.bin/ng g c a  1.91s user 0.30s system 111% cpu 1.996 total`
After -- `./node_modules/.bin/ng g c a  1.62s user 0.27s system 110% cpu 1.715 total`
---
 packages/angular/cli/commands/help-impl.ts    |   4 +-
 packages/angular/cli/models/command-runner.ts | 173 +++++++++---------
 packages/angular/cli/models/command.ts        |   4 +-
 3 files changed, 90 insertions(+), 91 deletions(-)

diff --git a/packages/angular/cli/commands/help-impl.ts b/packages/angular/cli/commands/help-impl.ts
index 7bab545922e4..0a62c82176ba 100644
--- a/packages/angular/cli/commands/help-impl.ts
+++ b/packages/angular/cli/commands/help-impl.ts
@@ -13,9 +13,7 @@ export class HelpCommand extends Command<HelpCommandSchema> {
   async run() {
     this.logger.info(`Available Commands:`);
 
-    for (const name of Object.keys(Command.commandMap)) {
-      const cmd = Command.commandMap[name];
-
+    for (const cmd of Object.values(await Command.commandMap())) {
       if (cmd.hidden) {
         continue;
       }
diff --git a/packages/angular/cli/models/command-runner.ts b/packages/angular/cli/models/command-runner.ts
index db6ef73bbd84..58387fcef775 100644
--- a/packages/angular/cli/models/command-runner.ts
+++ b/packages/angular/cli/models/command-runner.ts
@@ -17,26 +17,42 @@ import {
 } from '@angular-devkit/core';
 import * as debug from 'debug';
 import { readFileSync } from 'fs';
-import { dirname, join, resolve } from 'path';
-import { findUp } from '../utilities/find-up';
+import { join, resolve } from 'path';
 import { parseJsonSchemaToCommandDescription } from '../utilities/json-schema';
 import { UniversalAnalytics, getGlobalAnalytics, getSharedAnalytics } from './analytics';
 import { Command } from './command';
-import {
-  CommandDescription,
-  CommandDescriptionMap,
-  CommandWorkspace,
-} from './interface';
+import { CommandDescription, CommandWorkspace } from './interface';
 import * as parser from './parser';
 
 const analyticsDebug = debug('ng:analytics:commands');
 
+// NOTE: Update commands.json if changing this.  It's still deep imported in one CI validation
+const standardCommands = {
+  'add': '../commands/add.json',
+  'analytics': '../commands/analytics.json',
+  'build': '../commands/build.json',
+  'config': '../commands/config.json',
+  'doc': '../commands/doc.json',
+  'e2e': '../commands/e2e.json',
+  'make-this-awesome': '../commands/easter-egg.json',
+  'generate': '../commands/generate.json',
+  'get': '../commands/deprecated.json',
+  'set': '../commands/deprecated.json',
+  'help': '../commands/help.json',
+  'lint': '../commands/lint.json',
+  'new': '../commands/new.json',
+  'run': '../commands/run.json',
+  'serve': '../commands/serve.json',
+  'test': '../commands/test.json',
+  'update': '../commands/update.json',
+  'version': '../commands/version.json',
+  'xi18n': '../commands/xi18n.json',
+};
 
 export interface CommandMapOptions {
   [key: string]: string;
 }
 
-
 /**
  * Create the analytics instance.
  * @private
@@ -56,6 +72,21 @@ async function _createAnalytics(): Promise<analytics.Analytics> {
   }
 }
 
+async function loadCommandDescription(
+  name: string,
+  path: string,
+  registry: json.schema.CoreSchemaRegistry,
+): Promise<CommandDescription> {
+  const schemaPath = resolve(__dirname, path);
+  const schemaContent = readFileSync(schemaPath, 'utf-8');
+  const schema = json.parseJson(schemaContent, JsonParseMode.Loose, { path: schemaPath });
+  if (!isJsonObject(schema)) {
+    throw new Error('Invalid command JSON loaded from ' + JSON.stringify(schemaPath));
+  }
+
+  return parseJsonSchemaToCommandDescription(name, schemaPath, registry, schema);
+}
+
 /**
  * Run a command.
  * @param args Raw unparsed arguments.
@@ -68,34 +99,9 @@ export async function runCommand(
   args: string[],
   logger: logging.Logger,
   workspace: CommandWorkspace,
-  commands?: CommandMapOptions,
+  commands: CommandMapOptions = standardCommands,
   options: { analytics?: analytics.Analytics } = {},
 ): Promise<number | void> {
-  if (commands === undefined) {
-    const commandMapPath = findUp('commands.json', __dirname);
-    if (commandMapPath === null) {
-      throw new Error('Unable to find command map.');
-    }
-    const cliDir = dirname(commandMapPath);
-    const commandsText = readFileSync(commandMapPath).toString('utf-8');
-    const commandJson = json.parseJson(
-      commandsText,
-      JsonParseMode.Loose,
-      { path: commandMapPath },
-    );
-    if (!isJsonObject(commandJson)) {
-      throw Error('Invalid command.json');
-    }
-
-    commands = {};
-    for (const commandName of Object.keys(commandJson)) {
-      const commandValue = commandJson[commandName];
-      if (typeof commandValue == 'string') {
-        commands[commandName] = resolve(cliDir, commandValue);
-      }
-    }
-  }
-
   // This registry is exclusively used for flattening schemas, and not for validating.
   const registry = new schema.CoreSchemaRegistry([]);
   registry.registerUriHandler((uri: string) => {
@@ -108,86 +114,74 @@ export async function runCommand(
     }
   });
 
-  // Normalize the commandMap
-  const commandMap: CommandDescriptionMap = {};
-  for (const name of Object.keys(commands)) {
-    const schemaPath = commands[name];
-    const schemaContent = readFileSync(schemaPath, 'utf-8');
-    const schema = json.parseJson(schemaContent, JsonParseMode.Loose, { path: schemaPath });
-    if (!isJsonObject(schema)) {
-      throw new Error('Invalid command JSON loaded from ' + JSON.stringify(schemaPath));
-    }
-
-    commandMap[name] =
-      await parseJsonSchemaToCommandDescription(name, schemaPath, registry, schema);
-  }
-
   let commandName: string | undefined = undefined;
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
 
-    if (arg in commandMap) {
-      commandName = arg;
-      args.splice(i, 1);
-      break;
-    } else if (!arg.startsWith('-')) {
+    if (!arg.startsWith('-')) {
       commandName = arg;
       args.splice(i, 1);
       break;
     }
   }
 
+  let description: CommandDescription | null = null;
+
   // if no commands were found, use `help`.
-  if (commandName === undefined) {
+  if (!commandName) {
     if (args.length === 1 && args[0] === '--version') {
       commandName = 'version';
     } else {
       commandName = 'help';
     }
-  }
 
-  let description: CommandDescription | null = null;
+    if (!(commandName in commands)) {
+      logger.error(tags.stripIndent`
+          The "${commandName}" command seems to be disabled.
+          This is an issue with the CLI itself. If you see this comment, please report it and
+          provide your repository.
+        `);
 
-  if (commandName !== undefined) {
-    if (commandMap[commandName]) {
-      description = commandMap[commandName];
-    } else {
-      Object.keys(commandMap).forEach(name => {
-        const commandDescription = commandMap[name];
-        const aliases = commandDescription.aliases;
-
-        let found = false;
-        if (aliases) {
-          if (aliases.some(alias => alias === commandName)) {
-            found = true;
-          }
-        }
+      return 1;
+    }
+  }
 
-        if (found) {
-          if (description) {
-            throw new Error('Found multiple commands with the same alias.');
-          }
-          commandName = name;
-          description = commandDescription;
+  if (commandName in commands) {
+    description = await loadCommandDescription(commandName, commands[commandName], registry);
+  } else {
+    const commandNames = Object.keys(commands);
+
+    // Optimize loading for common aliases
+    if (commandName.length === 1) {
+      commandNames.sort((a, b) => {
+        const aMatch = a[0] === commandName;
+        const bMatch = b[0] === commandName;
+        if (aMatch && !bMatch) {
+          return -1;
+        } else if (!aMatch && bMatch) {
+          return 1;
+        } else {
+          return 0;
         }
       });
     }
-  }
 
-  if (!commandName) {
-    logger.error(tags.stripIndent`
-        We could not find a command from the arguments and the help command seems to be disabled.
-        This is an issue with the CLI itself. If you see this comment, please report it and
-        provide your repository.
-      `);
+    for (const name of commandNames) {
+      const aliasDesc = await loadCommandDescription(name, commands[name], registry);
+      const aliases = aliasDesc.aliases;
 
-    return 1;
+      if (aliases && aliases.some(alias => alias === commandName)) {
+        commandName = name;
+        description = aliasDesc;
+        break;
+      }
+    }
   }
 
   if (!description) {
     const commandsDistance = {} as { [name: string]: number };
     const name = commandName;
-    const allCommands = Object.keys(commandMap).sort((a, b) => {
+    const allCommands = Object.keys(commands).sort((a, b) => {
       if (!(a in commandsDistance)) {
         commandsDistance[a] = strings.levenshtein(a, name);
       }
@@ -210,7 +204,14 @@ export async function runCommand(
 
   try {
     const parsedOptions = parser.parseArguments(args, description.options, logger);
-    Command.setCommandMap(commandMap);
+    Command.setCommandMap(async () => {
+      const map: Record<string, CommandDescription> = {};
+      for (const [name, path] of Object.entries(commands)) {
+        map[name] = await loadCommandDescription(name, path, registry);
+      }
+
+      return map;
+    });
 
     const analytics = options.analytics || await _createAnalytics();
     const context = { workspace, analytics };
diff --git a/packages/angular/cli/models/command.ts b/packages/angular/cli/models/command.ts
index 344f879e9886..e0fe53056f9e 100644
--- a/packages/angular/cli/models/command.ts
+++ b/packages/angular/cli/models/command.ts
@@ -29,8 +29,8 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
   public workspace: CommandWorkspace;
   public analytics: analytics.Analytics;
 
-  protected static commandMap: CommandDescriptionMap;
-  static setCommandMap(map: CommandDescriptionMap) {
+  protected static commandMap: () => Promise<CommandDescriptionMap>;
+  static setCommandMap(map: () => Promise<CommandDescriptionMap>) {
     this.commandMap = map;
   }
 

From 19df9358c4ae2d1267ff500823501bc5bddcec0c Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 8 May 2019 11:59:06 -0400
Subject: [PATCH 1314/1703] fix(@angular-devkit/core): handle async host
 exceptions for workspace isDirectory/isFile

---
 packages/angular_devkit/core/src/workspace/host.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/core/src/workspace/host.ts b/packages/angular_devkit/core/src/workspace/host.ts
index 8ac2509206db..d9d75c0cf171 100644
--- a/packages/angular_devkit/core/src/workspace/host.ts
+++ b/packages/angular_devkit/core/src/workspace/host.ts
@@ -30,7 +30,7 @@ export function createWorkspaceHost(host: virtualFs.Host): WorkspaceHost {
     },
     async isDirectory(path: string): Promise<boolean> {
       try {
-        return host.isDirectory(normalize(path)).toPromise();
+        return await host.isDirectory(normalize(path)).toPromise();
       } catch {
         // some hosts throw if path does not exist
         return false;
@@ -38,7 +38,7 @@ export function createWorkspaceHost(host: virtualFs.Host): WorkspaceHost {
     },
     async isFile(path: string): Promise<boolean> {
       try {
-        return host.isFile(normalize(path)).toPromise();
+        return await host.isFile(normalize(path)).toPromise();
       } catch {
         // some hosts throw if path does not exist
         return false;

From c652ec7456d31323280c62820e015ef5ffbc72f6 Mon Sep 17 00:00:00 2001
From: Captain Caius <241342+captaincaius@users.noreply.github.com>
Date: Thu, 9 May 2019 01:38:10 +0300
Subject: [PATCH 1315/1703] docs: describe prod flag more explicitly

---
 packages/angular/cli/commands/definitions.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/angular/cli/commands/definitions.json b/packages/angular/cli/commands/definitions.json
index 6c6f6f0b90a6..7288953ef0c3 100644
--- a/packages/angular/cli/commands/definitions.json
+++ b/packages/angular/cli/commands/definitions.json
@@ -14,14 +14,14 @@
           }
         },
         "configuration": {
-          "description": "A named build target, as specified in the \"configurations\" section of angular.json.\nEach named target is accompanied by a configuration of option defaults for that target.",
+          "description": "A named build target, as specified in the \"configurations\" section of angular.json.\nEach named target is accompanied by a configuration of option defaults for that target.\nSetting this explicitly overrides the \"--prod\" flag",
           "type": "string",
           "aliases": [
             "c"
           ]
         },
         "prod": {
-          "description": "When true, sets the build configuration to the production target.\nAll builds make use of bundling and limited tree-shaking. A production build also runs limited dead code elimination.",
+          "description": "Shorthand for \"--configuration=production\".\nWhen true, sets the build configuration to the production target.\nBy default, the production target is set up in the workspace configuration such that all builds make use of bundling, limited tree-shaking, and also limited dead code elimination.",
           "type": "boolean"
         }
       }

From 5f80702d8208fc9dac52f2b90099e49ec2b159c0 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 8 May 2019 20:38:59 -0400
Subject: [PATCH 1316/1703] fix(@angular-devkit/build-ng-packagr): propogate
 errors during execution

---
 .../angular_devkit/build_ng_packagr/src/build/index.ts     | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/angular_devkit/build_ng_packagr/src/build/index.ts b/packages/angular_devkit/build_ng_packagr/src/build/index.ts
index 0bd4f4f49ebb..42c5555f5108 100644
--- a/packages/angular_devkit/build_ng_packagr/src/build/index.ts
+++ b/packages/angular_devkit/build_ng_packagr/src/build/index.ts
@@ -8,7 +8,7 @@
 import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
 import { resolve } from 'path';
 import { Observable, from } from 'rxjs';
-import { catchError, mapTo, switchMap } from 'rxjs/operators';
+import { mapTo, switchMap } from 'rxjs/operators';
 import { Schema as NgPackagrBuilderOptions } from './schema';
 
 async function initialize(
@@ -33,11 +33,6 @@ export function execute(
   return from(initialize(options, context.workspaceRoot)).pipe(
     switchMap(packager => options.watch ? packager.watch() : packager.build()),
     mapTo({ success: true }),
-    catchError(error => {
-      context.reportStatus('Error: ' + error);
-
-      return [{ success: false }];
-    }),
   );
 }
 

From 68bc0c7bc1dfe4f9da8ec0b77bdc9bb4f4dbe196 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 8 May 2019 21:06:02 -0400
Subject: [PATCH 1317/1703] fix(@angular-devkit/build-angular): extract i18n
 should only show warnings/errors

Fixes #14373
---
 .../build_angular/src/extract-i18n/index.ts     | 17 +++++++++++++++--
 .../test/extract-i18n/works_spec_large.ts       | 16 +++++++++++++++-
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
index 813f07cbed4d..1672ff9d47cb 100644
--- a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
@@ -10,7 +10,7 @@ import {
   createBuilder,
   targetFromTargetString,
 } from '@angular-devkit/architect';
-import { runWebpack } from '@angular-devkit/build-webpack';
+import { WebpackLoggingCallback, runWebpack } from '@angular-devkit/build-webpack';
 import { JsonObject } from '@angular-devkit/core';
 import * as path from 'path';
 import * as webpack from 'webpack';
@@ -20,6 +20,7 @@ import {
   getStatsConfig,
   getStylesConfig,
 } from '../angular-cli-files/models/webpack-configs';
+import { statsErrorsToString, statsWarningsToString } from '../angular-cli-files/utilities/stats';
 import { Schema as BrowserBuilderOptions } from '../browser/schema';
 import { Version } from '../utils/version';
 import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
@@ -91,7 +92,19 @@ async function execute(options: ExtractI18nBuilderOptions, context: BuilderConte
     ],
   );
 
-  return runWebpack(config[0], context).toPromise();
+  const logging: WebpackLoggingCallback = (stats, config) => {
+    const json = stats.toJson({ errors: true, warnings: true });
+
+    if (stats.hasWarnings()) {
+      context.logger.warn(statsWarningsToString(json, config.stats));
+    }
+
+    if (stats.hasErrors()) {
+      context.logger.error(statsErrorsToString(json, config.stats));
+    }
+  };
+
+  return runWebpack(config[0], context, { logging }).toPromise();
 }
 
 export default createBuilder<JsonObject & ExtractI18nBuilderOptions>(execute);
diff --git a/packages/angular_devkit/build_angular/test/extract-i18n/works_spec_large.ts b/packages/angular_devkit/build_angular/test/extract-i18n/works_spec_large.ts
index 798c38354275..f22e39932655 100644
--- a/packages/angular_devkit/build_angular/test/extract-i18n/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/extract-i18n/works_spec_large.ts
@@ -22,7 +22,7 @@ describe('Extract i18n Target', () => {
 
   afterEach(() => host.restore().toPromise());
 
-  it('works', async () => {
+  it('generates an extraction file', async () => {
     host.appendToFile('src/app/app.component.html', '<p i18n>i18n test</p>');
 
     const run = await architect.scheduleTarget(extractI18nTargetSpec);
@@ -40,6 +40,20 @@ describe('Extract i18n Target', () => {
     }
   }, 30000);
 
+  it('does not show full build logs', async () => {
+    const logger = new TestLogger('i18n');
+    host.appendToFile('src/app/app.component.html', '<p i18n>i18n test</p>');
+
+    const run = await architect.scheduleTarget(extractI18nTargetSpec);
+
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+    await run.stop();
+
+    expect(logger.includes('Chunk Names')).toBe(false);
+    expect(logger.includes('[emitted]')).toBe(false);
+  }, 30000);
+
   it('shows errors', async () => {
     const logger = new TestLogger('i18n-errors');
     host.appendToFile('src/app/app.component.html',

From 061b94172250b75a9840af5194452b036a490d93 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 9 May 2019 08:09:14 +0000
Subject: [PATCH 1318/1703] build: update webpack to version 4.31.0

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 packages/angular_devkit/build_webpack/package.json | 2 +-
 packages/ngtools/webpack/package.json              | 2 +-
 yarn.lock                                          | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 9281ec148baa..7b48011c8e1a 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -49,7 +49,7 @@
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.2.3",
-    "webpack": "4.30.0",
+    "webpack": "4.31.0",
     "webpack-dev-middleware": "3.6.2",
     "webpack-dev-server": "3.3.1",
     "webpack-merge": "4.2.1",
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index afe552ec44b9..9a08c04b61f6 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -17,7 +17,7 @@
     "webpack-dev-server": "^3.1.4"
   },
   "devDependencies": {
-    "webpack": "4.30.0",
+    "webpack": "4.31.0",
     "webpack-dev-server": "^3.1.4"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 3ad448143516..33cd4c2ce6ec 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -36,6 +36,6 @@
     "@angular/compiler": "^8.0.0-beta.14",
     "@angular/compiler-cli": "^8.0.0-beta.14",
     "typescript": "3.4.5",
-    "webpack": "4.30.0"
+    "webpack": "4.31.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 0f704512cd8b..a2ef2cee400c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10004,10 +10004,10 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.30.0:
-  version "4.30.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.30.0.tgz#aca76ef75630a22c49fcc235b39b4c57591d33a9"
-  integrity sha512-4hgvO2YbAFUhyTdlR4FNyt2+YaYBYHavyzjCMbZzgglo02rlKi/pcsEzwCuCpsn1ryzIl1cq/u8ArIKu8JBYMg==
+webpack@4.31.0:
+  version "4.31.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.31.0.tgz#ae201d45f0571336e42d1c2b5c8ab56c4d3b0c63"
+  integrity sha512-n6RVO3X0LbbipoE62akME9K/JI7qYrwwufs20VvgNNpqUoH4860KkaxJTbGq5bgkVZF9FqyyTG/0WPLH3PVNJA==
   dependencies:
     "@webassemblyjs/ast" "1.8.5"
     "@webassemblyjs/helper-module-context" "1.8.5"

From 3912fdee5d99a84013d00b88ebdcc8435418b971 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 10 May 2019 01:19:13 -0400
Subject: [PATCH 1319/1703] fix(@angular/cli): enable analytics for safe
 builders

Fixes #14355
---
 packages/angular/cli/models/architect-command.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index fabef4411846..899bd806bed4 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -264,7 +264,10 @@ export abstract class ArchitectCommand<
       const run = await this._architect.scheduleTarget(
         target,
         overrides as json.JsonObject,
-        { logger: this.logger },
+        {
+          logger: this.logger,
+          analytics: isPackageNameSafeForAnalytics(builderConf) ? this.analytics : undefined,
+        },
       );
 
       const result = await run.output.toPromise();

From e5cf843aeb80f56ebf8d718ca849bc3dc9525028 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sun, 12 May 2019 08:53:02 +0000
Subject: [PATCH 1320/1703] build: update open to version 6.3.0

---
 packages/angular/cli/package.json                  | 2 +-
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 28e8b204ac15..0dffd2f4a386 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -35,7 +35,7 @@
     "ini": "1.3.5",
     "inquirer": "6.3.1",
     "npm-package-arg": "6.1.0",
-    "open": "6.2.0",
+    "open": "6.3.0",
     "pacote": "9.5.0",
     "semver": "6.0.0",
     "symbol-observable": "1.2.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 7b48011c8e1a..d561427ea40f 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -31,7 +31,7 @@
     "mini-css-extract-plugin": "0.6.0",
     "minimatch": "3.0.4",
     "parse5": "4.0.0",
-    "open": "6.2.0",
+    "open": "6.3.0",
     "postcss": "7.0.16",
     "postcss-import": "12.0.1",
     "postcss-loader": "3.0.0",
diff --git a/yarn.lock b/yarn.lock
index a2ef2cee400c..a772be6f83b7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6744,10 +6744,10 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-open@6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-6.2.0.tgz#7cf92cb961b5d8498b071e64098bf5e27f57230c"
-  integrity sha512-Vxf6HJkwrqmvh9UAID3MnMYXntbTxKLOSfOnO7LJdzPf3NE3KQYFNV0/Lcz2VAndbRFil58XVCyh8tiX11fiYw==
+open@6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.3.0.tgz#60d0b845ee38fae0631f5d739a21bd40e3d2a527"
+  integrity sha512-6AHdrJxPvAXIowO/aIaeHZ8CeMdDf7qCyRNq8NwJpinmCdXhz+NZR7ie1Too94lpciCDsG+qHGO9Mt0svA4OqA==
   dependencies:
     is-wsl "^1.1.0"
 

From 7d6b50238761a6328ca9630a654e3d85be4b3cf5 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Sun, 12 May 2019 19:43:10 -0400
Subject: [PATCH 1321/1703] fix(@angular-devkit/build-optimizer): remove
 deprecated test functions from public API

---
 etc/api/angular_devkit/build_optimizer/src/_golden-api.d.ts | 6 ------
 packages/angular_devkit/build_optimizer/src/index.ts        | 5 ++---
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/etc/api/angular_devkit/build_optimizer/src/_golden-api.d.ts b/etc/api/angular_devkit/build_optimizer/src/_golden-api.d.ts
index efd778ab0f9e..c545afc96c41 100644
--- a/etc/api/angular_devkit/build_optimizer/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/build_optimizer/src/_golden-api.d.ts
@@ -16,10 +16,4 @@ export declare function getScrubFileTransformerForCore(program: ts.Program): ts.
 
 export declare function getWrapEnumsTransformer(): ts.TransformerFactory<ts.SourceFile>;
 
-export declare function testImportTslib(content: string): boolean;
-
-export declare function testPrefixClasses(content: string): boolean;
-
-export declare function testScrubFile(content: string): boolean;
-
 export declare function transformJavascript(options: TransformJavascriptOptions): TransformJavascriptOutput;
diff --git a/packages/angular_devkit/build_optimizer/src/index.ts b/packages/angular_devkit/build_optimizer/src/index.ts
index 56f62c1f4b56..78ea03851fa8 100644
--- a/packages/angular_devkit/build_optimizer/src/index.ts
+++ b/packages/angular_devkit/build_optimizer/src/index.ts
@@ -11,12 +11,11 @@ export { buildOptimizer } from './build-optimizer/build-optimizer';
 export { transformJavascript } from './helpers/transform-javascript';
 
 export { getFoldFileTransformer } from './transforms/class-fold';
-export { getImportTslibTransformer, testImportTslib } from './transforms/import-tslib';
-export { getPrefixClassesTransformer, testPrefixClasses } from './transforms/prefix-classes';
+export { getImportTslibTransformer } from './transforms/import-tslib';
+export { getPrefixClassesTransformer } from './transforms/prefix-classes';
 export { getPrefixFunctionsTransformer } from './transforms/prefix-functions';
 export {
   getScrubFileTransformer,
   getScrubFileTransformerForCore,
-  testScrubFile,
 } from './transforms/scrub-file';
 export { getWrapEnumsTransformer } from './transforms/wrap-enums';

From 4f9ac220d84714d55d2f63559ad0504fcaba168d Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Sun, 12 May 2019 19:35:42 -0400
Subject: [PATCH 1322/1703] refactor(@angular-devkit/build-angular): remove
 unused utility functions

---
 .../build_angular/src/utils/index.ts          |   3 -
 .../src/utils/normalize-karma-schema.ts       |  52 ------
 .../utils/normalize-webpack-server-schema.ts  |  51 ------
 .../utils/webpack-file-system-host-adapter.ts | 160 ------------------
 4 files changed, 266 deletions(-)
 delete mode 100644 packages/angular_devkit/build_angular/src/utils/normalize-karma-schema.ts
 delete mode 100644 packages/angular_devkit/build_angular/src/utils/normalize-webpack-server-schema.ts
 delete mode 100644 packages/angular_devkit/build_angular/src/utils/webpack-file-system-host-adapter.ts

diff --git a/packages/angular_devkit/build_angular/src/utils/index.ts b/packages/angular_devkit/build_angular/src/utils/index.ts
index 59247c78baed..0f297fff122b 100644
--- a/packages/angular_devkit/build_angular/src/utils/index.ts
+++ b/packages/angular_devkit/build_angular/src/utils/index.ts
@@ -5,7 +5,6 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
 export * from './default-progress';
 export * from './delete-output-dir';
 export * from './differential-loading';
@@ -15,5 +14,3 @@ export * from './normalize-asset-patterns';
 export * from './normalize-source-maps';
 export * from './normalize-optimization';
 export * from './normalize-builder-schema';
-export * from './normalize-karma-schema';
-export * from './normalize-webpack-server-schema';
diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-karma-schema.ts b/packages/angular_devkit/build_angular/src/utils/normalize-karma-schema.ts
deleted file mode 100644
index ef2f354762fb..000000000000
--- a/packages/angular_devkit/build_angular/src/utils/normalize-karma-schema.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-
-import { Path, virtualFs } from '@angular-devkit/core';
-import { AssetPatternClass, OptimizationClass, SourceMapClass } from '../browser/schema';
-import { Schema as KarmaBuilderSchema } from '../karma/schema';
-import { normalizeAssetPatterns } from './normalize-asset-patterns';
-import {
-  NormalizedFileReplacement,
-  normalizeFileReplacements,
-} from './normalize-file-replacements';
-import { normalizeOptimization } from './normalize-optimization';
-import { normalizeSourceMaps } from './normalize-source-maps';
-
-/**
- * A normalized webpack server builder schema.
- */
-export interface NormalizedKarmaBuilderSchema extends KarmaBuilderSchema {
-  sourceMap: SourceMapClass;
-  fileReplacements: NormalizedFileReplacement[];
-  assets: AssetPatternClass[];
-  optimization: OptimizationClass;
-}
-
-export function normalizeKarmaSchema(
-  host: virtualFs.Host<{}>,
-  root: Path,
-  projectRoot: Path,
-  sourceRoot: Path | undefined,
-  options: KarmaBuilderSchema,
-): NormalizedKarmaBuilderSchema {
-  const syncHost = new virtualFs.SyncDelegateHost(host);
-
-  const normalizedSourceMapOptions = normalizeSourceMaps(options.sourceMap || false);
-  normalizedSourceMapOptions.vendor =
-    normalizedSourceMapOptions.vendor || options.vendorSourceMap || false;
-
-  return {
-    ...options,
-    fileReplacements: normalizeFileReplacements(options.fileReplacements || [], syncHost, root),
-    assets: normalizeAssetPatterns(options.assets || [], syncHost, root, projectRoot, sourceRoot),
-    sourceMap: normalizedSourceMapOptions,
-    optimization: normalizeOptimization(undefined),
-  };
-}
diff --git a/packages/angular_devkit/build_angular/src/utils/normalize-webpack-server-schema.ts b/packages/angular_devkit/build_angular/src/utils/normalize-webpack-server-schema.ts
deleted file mode 100644
index 0f911329fdc4..000000000000
--- a/packages/angular_devkit/build_angular/src/utils/normalize-webpack-server-schema.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-
-import { Path, virtualFs } from '@angular-devkit/core';
-import { OptimizationClass, SourceMapClass } from '../browser/schema';
-import { Schema as BuildWebpackServerSchema } from '../server/schema';
-import {
-  NormalizedFileReplacement,
-  normalizeFileReplacements,
-} from './normalize-file-replacements';
-import { normalizeOptimization } from './normalize-optimization';
-import { normalizeSourceMaps } from './normalize-source-maps';
-
-/**
- * A normalized webpack server builder schema.
- */
-export interface NormalizedWebpackServerBuilderSchema extends BuildWebpackServerSchema {
-  sourceMap: SourceMapClass;
-  fileReplacements: NormalizedFileReplacement[];
-  optimization: OptimizationClass;
-}
-
-export function normalizeWebpackServerSchema(
-  host: virtualFs.Host<{}>,
-  root: Path,
-  projectRoot: Path,
-  sourceRoot: Path | undefined,
-  options: BuildWebpackServerSchema,
-): NormalizedWebpackServerBuilderSchema {
-  const syncHost = new virtualFs.SyncDelegateHost(host);
-
-  const normalizedSourceMapOptions = normalizeSourceMaps(options.sourceMap || {});
-  normalizedSourceMapOptions.vendor =
-    normalizedSourceMapOptions.vendor || options.vendorSourceMap || false;
-
-  const optimization = options.hasOwnProperty('optimization') && options.optimization || {};
-
-  return {
-    ...options,
-    fileReplacements: normalizeFileReplacements(options.fileReplacements || [], syncHost, root),
-    optimization: normalizeOptimization(optimization),
-    sourceMap: normalizedSourceMapOptions,
-  };
-}
diff --git a/packages/angular_devkit/build_angular/src/utils/webpack-file-system-host-adapter.ts b/packages/angular_devkit/build_angular/src/utils/webpack-file-system-host-adapter.ts
deleted file mode 100644
index 3905dfd963a1..000000000000
--- a/packages/angular_devkit/build_angular/src/utils/webpack-file-system-host-adapter.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { FileDoesNotExistException, JsonObject, normalize, virtualFs } from '@angular-devkit/core';
-import { Callback } from '@ngtools/webpack/src/webpack';
-import { Stats } from 'fs';
-import { Observable, of } from 'rxjs';
-import { map, mergeMap, switchMap } from 'rxjs/operators';
-
-
-export class WebpackFileSystemHostAdapter {
-  protected _syncHost: virtualFs.SyncDelegateHost<Stats> | null = null;
-
-  constructor(protected _host: virtualFs.Host<Stats>) {}
-
-  private _doHostCall<T>(o: Observable<T>, callback: Callback<T>) {
-    const token = Symbol();
-    let value: T | typeof token = token;
-    let error = false;
-
-    try {
-      o.subscribe({
-        error(err) {
-          error = true;
-          callback(err);
-        },
-        next(v) {
-          value = v;
-        },
-        complete() {
-          if (value !== token) {
-            callback(null, value);
-          } else {
-            callback(new Error('Unknown error happened.'));
-          }
-        },
-      });
-    } catch (err) {
-      // In some occasions, the error handler above will be called, then an exception will be
-      // thrown (by design in observable constructors in RxJS 5). Don't call the callback
-      // twice.
-      if (!error) {
-        callback(err);
-      }
-    }
-  }
-
-  stat(path: string, callback: Callback<Stats>): void {
-    const p = normalize('/' + path);
-    const result = this._host.stat(p);
-
-    if (result === null) {
-      const o = this._host.exists(p).pipe(
-        switchMap(exists => {
-          if (!exists) {
-            throw new FileDoesNotExistException(p);
-          }
-
-          return this._host.isDirectory(p).pipe(
-            mergeMap(isDirectory => {
-              return (isDirectory ? of(0) : this._host.read(p).pipe(
-                map(content => content.byteLength),
-              )).pipe(
-                map(size => [isDirectory, size]),
-              );
-            }),
-          );
-        }),
-        map(([isDirectory, size]) => {
-          return {
-            isFile() { return !isDirectory; },
-            isDirectory() { return isDirectory; },
-            size,
-            atime: new Date(),
-            mtime: new Date(),
-            ctime: new Date(),
-            birthtime: new Date(),
-          };
-        }),
-      );
-
-      this._doHostCall(o, callback);
-    } else {
-      this._doHostCall(result, callback);
-    }
-  }
-
-  readdir(path: string, callback: Callback<string[]>): void {
-    return this._doHostCall(this._host.list(normalize('/' + path)), callback);
-  }
-
-  readFile(path: string, callback: Callback<Buffer>): void {
-    const o = this._host.read(normalize('/' + path)).pipe(
-      map(content => Buffer.from(content)),
-    );
-
-    return this._doHostCall(o, callback);
-  }
-
-  readJson(path: string, callback: Callback<JsonObject>): void {
-    const o = this._host.read(normalize('/' + path)).pipe(
-      map(content => JSON.parse(virtualFs.fileBufferToString(content))),
-    );
-
-    return this._doHostCall(o, callback);
-  }
-
-  readlink(path: string, callback: Callback<string>): void {
-    const err: NodeJS.ErrnoException = new Error('Not a symlink.');
-    err.code = 'EINVAL';
-    callback(err);
-  }
-
-  statSync(path: string): Stats {
-    if (!this._syncHost) {
-      this._syncHost = new virtualFs.SyncDelegateHost(this._host);
-    }
-
-    const result = this._syncHost.stat(normalize('/' + path));
-    if (result) {
-      return result;
-    } else {
-      return {} as Stats;
-    }
-  }
-  readdirSync(path: string): string[] {
-    if (!this._syncHost) {
-      this._syncHost = new virtualFs.SyncDelegateHost(this._host);
-    }
-
-    return this._syncHost.list(normalize('/' + path));
-  }
-  readFileSync(path: string): Buffer {
-    if (!this._syncHost) {
-      this._syncHost = new virtualFs.SyncDelegateHost(this._host);
-    }
-
-    return Buffer.from(this._syncHost.read(normalize('/' + path)));
-  }
-  readJsonSync(path: string): {} {
-    if (!this._syncHost) {
-      this._syncHost = new virtualFs.SyncDelegateHost(this._host);
-    }
-
-    const data = this._syncHost.read(normalize('/' + path));
-
-    return JSON.parse(virtualFs.fileBufferToString(data));
-  }
-  readlinkSync(path: string): string {
-    const err: NodeJS.ErrnoException = new Error('Not a symlink.');
-    err.code = 'EINVAL';
-    throw err;
-  }
-
-  purge(_changes?: string[] | string): void {}
-}

From 64786cf64a8ac26ce62de6db1375b6c793814fc2 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Sun, 12 May 2019 19:59:35 -0400
Subject: [PATCH 1323/1703] fix(@angular-devkit/core): remove unimplemented
 prompt priority

Node.js versions prior to 11 used an unstable sort for arrays with a length greater than 10.  This caused the prompt order of a schematic with more than 10 prompts to be inconsistent with the content of the file and the same schematic with several of the prompts removed.  Since priorities were never fully implemented and property dependencies will most likely be used at a higher level instead, the underlying elements have been removed with this change.

Fixes #14402
---
 etc/api/angular_devkit/core/src/_golden-api.d.ts          | 1 -
 packages/angular_devkit/core/src/json/schema/interface.ts | 1 -
 packages/angular_devkit/core/src/json/schema/registry.ts  | 3 ---
 3 files changed, 5 deletions(-)

diff --git a/etc/api/angular_devkit/core/src/_golden-api.d.ts b/etc/api/angular_devkit/core/src/_golden-api.d.ts
index 74b968d99067..9ed0852e8304 100644
--- a/etc/api/angular_devkit/core/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/core/src/_golden-api.d.ts
@@ -796,7 +796,6 @@ export interface PromptDefinition {
     }>;
     message: string;
     multiselect?: boolean;
-    priority: number;
     raw?: string | JsonObject;
     type: string;
     validator?: (value: string) => boolean | string | Promise<boolean | string>;
diff --git a/packages/angular_devkit/core/src/json/schema/interface.ts b/packages/angular_devkit/core/src/json/schema/interface.ts
index 4269b191a197..768acf726b4f 100644
--- a/packages/angular_devkit/core/src/json/schema/interface.ts
+++ b/packages/angular_devkit/core/src/json/schema/interface.ts
@@ -100,7 +100,6 @@ export interface PromptDefinition {
   type: string;
   message: string;
   default?: string | string[] | number | boolean | null;
-  priority: number;
   validator?: (value: string) => boolean | string | Promise<boolean | string>;
 
   items?: Array<string | { value: JsonValue, label: string }>;
diff --git a/packages/angular_devkit/core/src/json/schema/registry.ts b/packages/angular_devkit/core/src/json/schema/registry.ts
index be0fd3124a9a..e592e55e0d1c 100644
--- a/packages/angular_devkit/core/src/json/schema/registry.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry.ts
@@ -569,7 +569,6 @@ export class CoreSchemaRegistry implements SchemaRegistry {
           id: path,
           type,
           message,
-          priority: 0,
           raw: schema,
           items,
           multiselect: type === 'list' ? schema.multiselect : false,
@@ -625,8 +624,6 @@ export class CoreSchemaRegistry implements SchemaRegistry {
       return of(data);
     }
 
-    prompts.sort((a, b) => b.priority - a.priority);
-
     return from(provider(prompts)).pipe(
       map(answers => {
         for (const path in answers) {

From fc05076e3dcae380d7a3083a3042e4a5b0fa7cce Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 13 May 2019 19:10:33 +0000
Subject: [PATCH 1324/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index fe6882b77f58..07d9bb288a9b 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#3dd31e996e82df4048cd096c2e11fc4651224489",
-    "@angular/common": "github:angular/common-builds#7d613dc8118160e57edea9e6591c9b9d783b5631",
-    "@angular/compiler": "github:angular/compiler-builds#698dfb2f2235b56160c96e4febd926605605f184",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#97de8d23bca0410bc1376c2f0466fb4cf14dd785",
-    "@angular/core": "github:angular/core-builds#e716442f48c08add21db9a68352224c53f768faf",
-    "@angular/forms": "github:angular/forms-builds#ca6413367b43cc18fe6d755d273fc1bdd9cd8d53",
-    "@angular/language-service": "github:angular/language-service-builds#69e484a846e163eea4f5faf695869a7ad138957d",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#4a440698bb85a4adf47b0a2a795172827a17f832",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#a8cf1e3532862bcae219a62e4441188dfabf1b25",
-    "@angular/router": "github:angular/router-builds#4de09bde7aebd8c175a2cd6b92a49caac0df6449"
+    "@angular/animations": "github:angular/animations-builds#68605ff4f918d20c48ee4486eb7daedf01b0a1db",
+    "@angular/common": "github:angular/common-builds#f7e063a3f25a7e00643c39f0108c6e7e37022c35",
+    "@angular/compiler": "github:angular/compiler-builds#d50214e999506cc26af473222794d7e4039aaba3",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#99ca5a4d53aacc4cc7790826e88f6e2cc7e0a572",
+    "@angular/core": "github:angular/core-builds#3d70cf290a29a2de41bac50a669d10ec351f4b63",
+    "@angular/forms": "github:angular/forms-builds#dbe9a76cfd3d801210cb9865c5f3445fa3f9b6c7",
+    "@angular/language-service": "github:angular/language-service-builds#afc1b5571602728a34b6e8ad3e1f66d027d3a57e",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#e3874c090cd8cd583e43f6b23b9f3f6100791236",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#9a1b1efdf5da8c51dc8cfd234ea4565d4e3218a3",
+    "@angular/router": "github:angular/router-builds#a40918060f9c99386effd94b6a9ee31b34d333f0"
   }
 }
\ No newline at end of file

From 5125db38f8868f396d9731f12e9c93759e1f35c4 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Mon, 13 May 2019 10:37:27 +0200
Subject: [PATCH 1325/1703] fix(@schematics/angular): differential loading
 migration should run only for projects using
 `@angular-devkit/build-angular:browser`

Differential loading migration should run only when the project is using `@angular-devkit/build-angular:browser` as it's browser builder. Otherwise we might break applications that are using different builders.

Fixes #14389
---
 .../update-8/differential-loading.ts          | 26 ++++++++++++-------
 .../update-8/differential-loading_spec.ts     | 14 ++++++++++
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-8/differential-loading.ts b/packages/schematics/angular/migrations/update-8/differential-loading.ts
index 8daf53941bef..ff565c60d29d 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading.ts
@@ -97,20 +97,26 @@ function updateProjects(): Rule {
       }
 
       // Older projects app and spec ts configs had script and module set in them.
-      const tsConfigs = [];
       const architect = project.architect;
-      if (isJsonObject(architect)
+      if (!(isJsonObject(architect)
         && isJsonObject(architect.build)
-        && isJsonObject(architect.build.options)
-        && typeof architect.build.options.tsConfig === 'string') {
-        tsConfigs.push(architect.build.options.tsConfig);
+        && architect.build.builder === '@angular-devkit/build-angular:browser')
+      ) {
+        // Skip projects who's build builder is not build-angular:browser
+        continue;
+      }
+
+      const tsConfigs = [];
+      const buildOptionsConfig = architect.build.options;
+      if (isJsonObject(buildOptionsConfig) && typeof buildOptionsConfig.tsConfig === 'string') {
+        tsConfigs.push(buildOptionsConfig.tsConfig);
       }
 
-      if (isJsonObject(architect)
-        && isJsonObject(architect.test)
-        && isJsonObject(architect.test.options)
-        && typeof architect.test.options.tsConfig === 'string') {
-        tsConfigs.push(architect.test.options.tsConfig);
+      const testConfig = architect.test;
+      if (isJsonObject(testConfig)
+        && isJsonObject(testConfig.options)
+        && typeof testConfig.options.tsConfig === 'string') {
+        tsConfigs.push(testConfig.options.tsConfig);
       }
 
       for (const tsConfig of tsConfigs) {
diff --git a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
index 10d94f6d55dc..92ddab277791 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
@@ -113,5 +113,19 @@ describe('Migration to version 8', () => {
       expect(specsCompilerOptions.target).toBeUndefined();
       expect(specsCompilerOptions.module).toBeUndefined();
     });
+
+    it(`should not update projects which browser builder is not 'build-angular:browser'`, () => {
+      tree.delete('/browserslist');
+      const config = JSON.parse(tree.readContent('angular.json'));
+      config
+        .projects['migration-test']
+        .architect
+        .build
+        .builder = '@dummy/builders:browser';
+
+      tree.overwrite('angular.json', JSON.stringify(config));
+      const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
+      expect(tree2.exists('/browserslist')).toBe(false);
+    });
   });
 });

From 825bcacdc27417000edc1105588dea18c356cbc9 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 13 May 2019 13:31:50 -0400
Subject: [PATCH 1326/1703] fix(@angular-devkit/core): deprecate redundant
 isObservable function

rxjs provides a canonical version of the helper function.  Internal usage has also been changed to use this version.
---
 .../angular_devkit/core/src/json/schema/registry.ts   |  4 ++--
 .../angular_devkit/core/src/json/schema/visitor.ts    | 11 +++--------
 packages/angular_devkit/core/src/utils/lang.ts        |  1 +
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/packages/angular_devkit/core/src/json/schema/registry.ts b/packages/angular_devkit/core/src/json/schema/registry.ts
index e592e55e0d1c..6245bdd2f488 100644
--- a/packages/angular_devkit/core/src/json/schema/registry.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry.ts
@@ -7,11 +7,11 @@
  */
 import * as ajv from 'ajv';
 import * as http from 'http';
-import { Observable, from, of, throwError } from 'rxjs';
+import { Observable, from, isObservable, of, throwError } from 'rxjs';
 import { concatMap, map, switchMap, tap } from 'rxjs/operators';
 import * as Url from 'url';
 import { BaseException } from '../../exception/exception';
-import { PartiallyOrderedSet, deepCopy, isObservable } from '../../utils';
+import { PartiallyOrderedSet, deepCopy } from '../../utils';
 import { JsonArray, JsonObject, JsonValue, isJsonObject } from '../interface';
 import {
   JsonPointer,
diff --git a/packages/angular_devkit/core/src/json/schema/visitor.ts b/packages/angular_devkit/core/src/json/schema/visitor.ts
index b3b46c40df9f..a00ed14a0247 100644
--- a/packages/angular_devkit/core/src/json/schema/visitor.ts
+++ b/packages/angular_devkit/core/src/json/schema/visitor.ts
@@ -5,15 +5,13 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Observable, concat, from, of as observableOf } from 'rxjs';
+import { Observable, concat, from, isObservable, of as observableOf } from 'rxjs';
 import { concatMap, ignoreElements, mergeMap, tap } from 'rxjs/operators';
-import { isObservable } from '../../utils';
 import { JsonArray, JsonObject, JsonValue } from '../interface';
 import { JsonPointer, JsonSchemaVisitor, JsonVisitor } from './interface';
 import { buildJsonPointer, joinJsonPointer } from './pointer';
 import { JsonSchema } from './schema';
 
-
 export interface ReferenceResolver<ContextT> {
   (ref: string, context?: ContextT): { context?: ContextT, schema?: JsonObject };
 }
@@ -70,11 +68,8 @@ function _visitJsonRecursive<ContextT>(
 
   const value = visitor(json, ptr, schema, root);
 
-  return (isObservable(value)
-      ? value as Observable<JsonValue>
-      : observableOf(value as JsonValue)
-  ).pipe(
-    concatMap((value: JsonValue) => {
+  return (isObservable<JsonValue>(value) ? value : observableOf(value)).pipe(
+    concatMap(value => {
       if (Array.isArray(value)) {
         return concat(
           from(value).pipe(
diff --git a/packages/angular_devkit/core/src/utils/lang.ts b/packages/angular_devkit/core/src/utils/lang.ts
index 1fc0b09cbe4d..cca193771732 100644
--- a/packages/angular_devkit/core/src/utils/lang.ts
+++ b/packages/angular_devkit/core/src/utils/lang.ts
@@ -20,6 +20,7 @@ export function isPromise(obj: any): obj is Promise<any> {
 
 /**
  * Determine if the argument is an Observable
+ * @deprecated as of 8.0; use rxjs' built-in version
  */
 // tslint:disable-next-line:no-any
 export function isObservable(obj: any | Observable<any>): obj is Observable<any> {

From 48e6060e02792cd614a1f80ae8b87109df88c893 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 13 May 2019 13:32:17 -0400
Subject: [PATCH 1327/1703] fix(@angular-devkit/schematics): use rxjs version
 of isObservable

---
 .../schematics/tools/file-system-engine-host-base.ts            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts b/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts
index 08705de9406e..5c823fa3ec3d 100644
--- a/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts
+++ b/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts
@@ -10,7 +10,6 @@ import {
   InvalidJsonCharacterException,
   JsonObject,
   UnexpectedEndOfInputException,
-  isObservable,
   isPromise,
   normalize,
   virtualFs,
@@ -21,6 +20,7 @@ import { dirname, isAbsolute, join, resolve } from 'path';
 import {
   Observable,
   from as observableFrom,
+  isObservable,
   of as observableOf,
   throwError,
 } from 'rxjs';

From 5770762ac193c323310f53f6c37288275552fc7c Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 13 May 2019 19:43:54 +0100
Subject: [PATCH 1328/1703] fix(@schematics/angular): update zone.js to 0.9.1

---
 packages/angular_devkit/build_angular/package.json     | 2 +-
 packages/schematics/angular/utility/latest-versions.ts | 2 +-
 yarn.lock                                              | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index d561427ea40f..02ef4f808fc5 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -84,7 +84,7 @@
     "material-design-icons": "^3.0.1",
     "popper.js": "^1.14.1",
     "protractor": "~5.4.0",
-    "zone.js": "^0.9.0"
+    "zone.js": "^0.9.1"
   },
   "peerDependencies": {
     "typescript": ">=3.1 < 3.5"
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index eb508b091f2b..ae0241719979 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -10,7 +10,7 @@ export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
   Angular: '~8.0.0-beta.14',
   RxJs: '~6.4.0',
-  ZoneJs: '~0.9.0',
+  ZoneJs: '~0.9.1',
   TypeScript: '~3.4.3',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
diff --git a/yarn.lock b/yarn.lock
index a772be6f83b7..377fb6f3e554 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10340,7 +10340,7 @@ yn@^2.0.0:
   resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
   integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=
 
-zone.js@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.0.tgz#f42319d657f7616724ed40c5907d4614b4c683fa"
-  integrity sha512-EfygvVnLxPSCMSgJ4h7SoY+XNr7ybdwvvwEQ70lvMFl9coNnciXSyWi8Kg6znK1ubyUSffkCKvleSQpLuUKw0Q==
+zone.js@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.1.tgz#e37c6e5c54c13fae4de26b5ffe8d8e9212da6d9b"
+  integrity sha512-GkPiJL8jifSrKReKaTZ5jkhrMEgXbXYC+IPo1iquBjayRa0q86w3Dipjn8b415jpitMExe9lV8iTsv8tk3DGag==

From 3bf929f3923c93e1311bd97bb12f2b360bb08f63 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 14 May 2019 09:21:46 +0000
Subject: [PATCH 1329/1703] build: update browserslist to version 4.6.0

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 32 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 02ef4f808fc5..e8bd3f46c4f4 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -14,7 +14,7 @@
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.10.0",
     "autoprefixer": "9.5.1",
-    "browserslist": "4.5.6",
+    "browserslist": "4.6.0",
     "caniuse-api": "3.0.0",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
diff --git a/yarn.lock b/yarn.lock
index 377fb6f3e554..e8b9398d8afa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1604,14 +1604,14 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@4.5.6:
-  version "4.5.6"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.6.tgz#ea42e8581ca2513fa7f371d4dd66da763938163d"
-  integrity sha512-o/hPOtbU9oX507lIqon+UvPYqpx3mHc8cV3QemSBTXwkG8gSQSK6UKvXcE/DcleU3+A59XTUHyCvZ5qGy8xVAg==
+browserslist@4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.0.tgz#5274028c26f4d933d5b1323307c1d1da5084c9ff"
+  integrity sha512-Jk0YFwXBuMOOol8n6FhgkDzn3mY9PYLYGk29zybF05SbRTsMgPqmTNeQQhOghCxq5oFqAXE3u4sYddr4C0uRhg==
   dependencies:
-    caniuse-lite "^1.0.30000963"
-    electron-to-chromium "^1.3.127"
-    node-releases "^1.1.17"
+    caniuse-lite "^1.0.30000967"
+    electron-to-chromium "^1.3.133"
+    node-releases "^1.1.19"
 
 browserslist@^4.0.0, browserslist@^4.3.3, browserslist@^4.5.4:
   version "4.5.5"
@@ -1862,7 +1862,7 @@ caniuse-lite@^1.0.30000960:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000960.tgz#ec48297037e5607f582f246ae7b12bee66a78999"
   integrity sha512-7nK5qs17icQaX6V3/RYrJkOsZyRNnroA4+ZwxaKJzIKy+crIy0Mz5CBlLySd2SNV+4nbUZeqeNfiaEieUBu3aA==
 
-caniuse-lite@^1.0.30000963:
+caniuse-lite@^1.0.30000967:
   version "1.0.30000967"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000967.tgz#a5039577806fccee80a04aaafb2c0890b1ee2f73"
   integrity sha512-rUBIbap+VJfxTzrM4akJ00lkvVb5/n5v3EGXfWzSH5zT8aJmGzjA8HWhJ4U6kCpzxozUSnB+yvAYDRPY6mRpgQ==
@@ -3146,10 +3146,10 @@ electron-to-chromium@^1.3.124:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
   integrity sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==
 
-electron-to-chromium@^1.3.127:
-  version "1.3.131"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.131.tgz#205a0b7a276b3f56bc056f19178909243054252a"
-  integrity sha512-NSO4jLeyGLWrT4mzzfYX8vt1MYCoMI5LxSYAjt0H9+LF/14JyiKJSyyjA6AJTxflZlEM5v3QU33F0ohbPMCAPg==
+electron-to-chromium@^1.3.133:
+  version "1.3.133"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.133.tgz#c47639c19b91feee3e22fad69f5556142007008c"
+  integrity sha512-lyoC8aoqbbDqsprb6aPdt9n3DpOZZzdz/T4IZKsR0/dkZIxnJVUjjcpOSwA66jPRIOyDAamCTAUqweU05kKNSg==
 
 elliptic@^6.0.0:
   version "6.4.1"
@@ -6474,10 +6474,10 @@ node-releases@^1.1.14:
   dependencies:
     semver "^5.3.0"
 
-node-releases@^1.1.17:
-  version "1.1.18"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.18.tgz#cc98fd75598a324a77188ebddf6650e9cbd8b1d5"
-  integrity sha512-/mnVgm6u/8OwlIsoyRXtTI0RfQcxZoAZbdwyXap0EeWwcOpDDymyCHM2/aR9XKmHXrvizHoPAOs0pcbiJ6RUaA==
+node-releases@^1.1.19:
+  version "1.1.19"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.19.tgz#c492d1e381fea0350b338b646c27867e88e91b3d"
+  integrity sha512-SH/B4WwovHbulIALsQllAVwqZZD1kPmKCqrhGfR29dXjLAVZMHvBjD3S6nL9D/J9QkmZ1R92/0wCMDKXUUvyyA==
   dependencies:
     semver "^5.3.0"
 

From e333450dc0ce200c7519c8ef262d837d8ff5ff1e Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Tue, 14 May 2019 15:52:32 +0200
Subject: [PATCH 1330/1703] feat(@angular-devkit/build-angular): add a post
 transformation hook to index generation

Fixes #14392
---
 .../models/webpack-configs/browser.ts         | 17 +--------
 .../plugins/index-html-webpack-plugin.ts      | 25 ++++++------
 .../index-file/augment-index-html.ts          | 10 ++---
 .../index-file/augment-index-html_spec.ts     |  6 +--
 .../utilities/index-file/write-index-html.ts  | 35 +++++++++++------
 .../build_angular/src/browser/index.ts        | 38 +++++++++++++++----
 .../build_angular/src/dev-server/index.ts     | 27 +++++++++++--
 .../build_angular/src/server/index.ts         |  1 -
 .../src/utils/webpack-browser-config.ts       |  1 -
 .../test/browser/index_spec_large.ts          |  3 +-
 10 files changed, 99 insertions(+), 64 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
index 807dc7568a5a..456c9591c215 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/browser.ts
@@ -6,10 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { LicenseWebpackPlugin } from 'license-webpack-plugin';
-import * as path from 'path';
 import * as webpack from 'webpack';
-import { IndexHtmlWebpackPlugin } from '../../plugins/index-html-webpack-plugin';
-import { generateEntryPoints } from '../../utilities/package-chunk-sort';
 import { WebpackConfigOptions } from '../build-options';
 import { getSourceMapDevTool, isPolyfillsEntry, normalizeExtraEntryPoints } from './utils';
 
@@ -17,7 +14,7 @@ const SubresourceIntegrityPlugin = require('webpack-subresource-integrity');
 
 
 export function getBrowserConfig(wco: WebpackConfigOptions): webpack.Configuration {
-  const { root, buildOptions } = wco;
+  const { buildOptions } = wco;
   const extraPlugins = [];
 
   let isEval = false;
@@ -37,18 +34,6 @@ export function getBrowserConfig(wco: WebpackConfigOptions): webpack.Configurati
     isEval = true;
   }
 
-  if (buildOptions.index) {
-    extraPlugins.push(new IndexHtmlWebpackPlugin({
-      input: path.resolve(root, buildOptions.index),
-      output: path.basename(buildOptions.index),
-      baseHref: buildOptions.baseHref,
-      entrypoints: generateEntryPoints(buildOptions),
-      deployUrl: buildOptions.deployUrl,
-      sri: buildOptions.subresourceIntegrity,
-      noModuleEntrypoints: ['polyfills-es5'],
-    }));
-  }
-
   if (buildOptions.subresourceIntegrity) {
     extraPlugins.push(new SubresourceIntegrityPlugin({
       hashFuncNames: ['sha384'],
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
index 38673f11b713..7bdbded397d8 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
@@ -7,7 +7,10 @@
  */
 import * as path from 'path';
 import { Compiler, compilation } from 'webpack';
+import { RawSource } from 'webpack-sources';
 import { FileInfo, augmentIndexHtml } from '../utilities/index-file/augment-index-html';
+import { IndexHtmlTransform } from '../utilities/index-file/write-index-html';
+import { stripBom } from '../utilities/strip-bom';
 
 export interface IndexHtmlWebpackPluginOptions {
   input: string;
@@ -17,6 +20,7 @@ export interface IndexHtmlWebpackPluginOptions {
   deployUrl?: string;
   sri: boolean;
   noModuleEntrypoints: string[];
+  postTransform?: IndexHtmlTransform;
 }
 
 function readFile(filename: string, compilation: compilation.Compilation): Promise<string> {
@@ -28,18 +32,7 @@ function readFile(filename: string, compilation: compilation.Compilation): Promi
         return;
       }
 
-      let content;
-      if (data.length >= 3 && data[0] === 0xEF && data[1] === 0xBB && data[2] === 0xBF) {
-        // Strip UTF-8 BOM
-        content = data.toString('utf8', 3);
-      } else if (data.length >= 2 && data[0] === 0xFF && data[1] === 0xFE) {
-        // Strip UTF-16 LE BOM
-        content = data.toString('utf16le', 2);
-      } else {
-        content = data.toString();
-      }
-
-      resolve(content);
+      resolve(stripBom(data.toString()));
     });
   });
 }
@@ -86,7 +79,7 @@ export class IndexHtmlWebpackPlugin {
       }
 
       const loadOutputFile = (name: string) => compilation.assets[name].source();
-      const indexSource = await augmentIndexHtml({
+      let indexSource = await augmentIndexHtml({
         input: this._options.input,
         inputContent,
         baseHref: this._options.baseHref,
@@ -98,8 +91,12 @@ export class IndexHtmlWebpackPlugin {
         entrypoints: this._options.entrypoints,
       });
 
+      if (this._options.postTransform) {
+        indexSource = await this._options.postTransform(indexSource);
+      }
+
       // Add to compilation assets
-      compilation.assets[this._options.output] = indexSource;
+      compilation.assets[this._options.output] = new RawSource(indexSource);
     });
   }
 }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html.ts
index e92e3b4279de..4abc7ba32bd0 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html.ts
@@ -7,11 +7,7 @@
  */
 
 import { createHash } from 'crypto';
-import {
-  RawSource,
-  ReplaceSource,
-  Source,
-} from 'webpack-sources';
+import { RawSource, ReplaceSource } from 'webpack-sources';
 
 const parse5 = require('parse5');
 
@@ -57,7 +53,7 @@ export interface FileInfo {
  * after processing several configurations in order to build different sets of
  * bundles for differential serving.
  */
-export async function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise<Source> {
+export async function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise<string> {
   const {
     loadOutputFile,
     files,
@@ -236,7 +232,7 @@ export async function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise
     parse5.serialize(styleElements, { treeAdapter }),
   );
 
-  return indexSource;
+  return indexSource.source();
 }
 
 function _generateSriAttributes(content: string) {
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html_spec.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html_spec.ts
index 45c2700a43f7..fb8a444d9063 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html_spec.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html_spec.ts
@@ -34,7 +34,7 @@ describe('augment-index-html', () => {
       ],
     });
 
-    const html = (await source).source();
+    const html = await source;
     expect(html).toEqual(oneLineHtml`
       <html>
         <head><base href="/">
@@ -74,7 +74,7 @@ describe('augment-index-html', () => {
       noModuleFiles: es5JsFiles,
     });
 
-    const html = (await source).source();
+    const html = await source;
     expect(html).toEqual(oneLineHtml`
       <html>
         <head>
@@ -116,7 +116,7 @@ describe('augment-index-html', () => {
         noModuleFiles: es5JsFiles,
       });
 
-      const html = (await source).source();
+      const html = await source;
       expect(html).toEqual(oneLineHtml`
       <html>
         <head>
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/write-index-html.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/write-index-html.ts
index b81ecd53aa57..f6a3e81bab6e 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/write-index-html.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/write-index-html.ts
@@ -8,37 +8,45 @@
 
 import { EmittedFiles } from '@angular-devkit/build-webpack';
 import { Path, basename, getSystemPath, join, virtualFs } from '@angular-devkit/core';
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 import { ExtraEntryPoint } from '../../../browser/schema';
 import { generateEntryPoints } from '../package-chunk-sort';
 import { stripBom } from '../strip-bom';
 import { FileInfo, augmentIndexHtml } from './augment-index-html';
 
+type ExtensionFilter = '.js' | '.css';
+
 export interface WriteIndexHtmlOptions {
   host: virtualFs.Host;
   outputPath: Path;
   indexPath: Path;
-  ES5BuildFiles: EmittedFiles[];
-  ES2015BuildFiles: EmittedFiles[];
+  files?: EmittedFiles[];
+  noModuleFiles?: EmittedFiles[];
+  moduleFiles?: EmittedFiles[];
   baseHref?: string;
   deployUrl?: string;
   sri?: boolean;
   scripts?: ExtraEntryPoint[];
   styles?: ExtraEntryPoint[];
+  postTransform?: IndexHtmlTransform;
 }
 
+export type IndexHtmlTransform = (content: string) => Promise<string>;
+
 export function writeIndexHtml({
   host,
   outputPath,
   indexPath,
-  ES5BuildFiles,
-  ES2015BuildFiles,
+  files = [],
+  noModuleFiles = [],
+  moduleFiles = [],
   baseHref,
   deployUrl,
   sri = false,
   scripts = [],
   styles = [],
+  postTransform,
 }: WriteIndexHtmlOptions): Observable<void> {
 
   return host.read(indexPath)
@@ -51,9 +59,9 @@ export function writeIndexHtml({
         deployUrl,
         sri,
         entrypoints: generateEntryPoints({ scripts, styles }),
-        files: filterAndMapBuildFiles(ES5BuildFiles, '.css'),
-        noModuleFiles: filterAndMapBuildFiles(ES5BuildFiles, '.js'),
-        moduleFiles: filterAndMapBuildFiles(ES2015BuildFiles, '.js'),
+        files: filterAndMapBuildFiles(files, ['.js', '.css']),
+        noModuleFiles: filterAndMapBuildFiles(noModuleFiles, '.js'),
+        moduleFiles: filterAndMapBuildFiles(moduleFiles, '.js'),
         loadOutputFile: async filePath => {
           return host.read(join(outputPath, filePath))
             .pipe(
@@ -63,18 +71,23 @@ export function writeIndexHtml({
         },
       }),
       ),
-      map(content => virtualFs.stringToFileBuffer(content.source())),
+      switchMap(content => postTransform ? postTransform(content) : of(content)),
+      map(content => virtualFs.stringToFileBuffer(content)),
       switchMap(content => host.write(join(outputPath, basename(indexPath)), content)),
     );
 }
 
 function filterAndMapBuildFiles(
   files: EmittedFiles[],
-  extensionFilter: '.js' | '.css',
+  extensionFilter: ExtensionFilter | ExtensionFilter[],
 ): FileInfo[] {
   const filteredFiles: FileInfo[] = [];
+  const validExtensions: string[] = Array.isArray(extensionFilter)
+    ? extensionFilter
+    : [extensionFilter];
+
   for (const { file, name, extension, initial } of files) {
-    if (name && initial && extension === extensionFilter) {
+    if (name && initial && validExtensions.includes(extension)) {
       filteredFiles.push({ file, extension, name });
     }
   }
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 6f887a7d9b90..84047467c314 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -10,7 +10,12 @@ import {
   BuilderOutput,
   createBuilder,
 } from '@angular-devkit/architect';
-import { BuildResult, WebpackLoggingCallback, runWebpack } from '@angular-devkit/build-webpack';
+import {
+  BuildResult,
+  EmittedFiles,
+  WebpackLoggingCallback,
+  runWebpack,
+ } from '@angular-devkit/build-webpack';
 import {
   experimental,
   getSystemPath,
@@ -40,7 +45,10 @@ import {
   getStylesConfig,
   getWorkerConfig,
 } from '../angular-cli-files/models/webpack-configs';
-import { writeIndexHtml } from '../angular-cli-files/utilities/index-file/write-index-html';
+import {
+  IndexHtmlTransform,
+  writeIndexHtml,
+} from '../angular-cli-files/utilities/index-file/write-index-html';
 import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
 import { augmentAppWithServiceWorker } from '../angular-cli-files/utilities/service-worker';
 import {
@@ -165,6 +173,7 @@ export function buildWebpackBrowser(
   transforms: {
     webpackConfiguration?: ExecutionTransformer<webpack.Configuration>,
     logging?: WebpackLoggingCallback,
+    indexHtml?: IndexHtmlTransform,
   } = {},
 ) {
   const host = new NodeJsSyncHost();
@@ -217,21 +226,36 @@ export function buildWebpackBrowser(
         bufferCount(configs.length),
         switchMap(buildEvents => {
           const success = buildEvents.every(r => r.success);
-          if (success && buildEvents.length === 2 && options.index) {
-            const { emittedFiles: ES5BuildFiles = [] } = buildEvents[0];
-            const { emittedFiles: ES2015BuildFiles = [] } = buildEvents[1];
+          if (success && options.index) {
+            let noModuleFiles: EmittedFiles[] | undefined;
+            let moduleFiles: EmittedFiles[] | undefined;
+            let files: EmittedFiles[] | undefined;
+
+            const [ES5Result, ES2015Result] = buildEvents;
+
+            if (buildEvents.length === 2) {
+              noModuleFiles = ES5Result.emittedFiles;
+              moduleFiles = ES2015Result.emittedFiles || [];
+              files = moduleFiles.filter(x => x.extension === '.css');
+            } else {
+              const { emittedFiles = [] } = ES5Result;
+              files = emittedFiles.filter(x => x.name !== 'polyfills-es5');
+              noModuleFiles = emittedFiles.filter(x => x.name === 'polyfills-es5');
+            }
 
             return writeIndexHtml({
               host,
               outputPath: join(root, options.outputPath),
               indexPath: join(root, options.index),
-              ES5BuildFiles,
-              ES2015BuildFiles,
+              files,
+              noModuleFiles,
+              moduleFiles,
               baseHref: options.baseHref,
               deployUrl: options.deployUrl,
               sri: options.subresourceIntegrity,
               scripts: options.scripts,
               styles: options.styles,
+              postTransform: transforms.indexHtml,
             })
             .pipe(
               map(() => ({ success: true })),
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index 48a5dfd1d1b8..ccdc5e23e150 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -16,7 +16,7 @@ import {
   WebpackLoggingCallback,
   runWebpackDevServer,
 } from '@angular-devkit/build-webpack';
-import { experimental, json, logging, tags } from '@angular-devkit/core';
+import { json, logging, tags } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { existsSync, readFileSync } from 'fs';
 import * as path from 'path';
@@ -25,7 +25,10 @@ import { map, switchMap } from 'rxjs/operators';
 import * as url from 'url';
 import * as webpack from 'webpack';
 import * as WebpackDevServer from 'webpack-dev-server';
+import { IndexHtmlWebpackPlugin } from '../angular-cli-files/plugins/index-html-webpack-plugin';
 import { checkPort } from '../angular-cli-files/utilities/check-port';
+import { IndexHtmlTransform } from '../angular-cli-files/utilities/index-file/write-index-html';
+import { generateEntryPoints } from '../angular-cli-files/utilities/package-chunk-sort';
 import {
   buildBrowserWebpackConfigFromContext,
   createBrowserLoggingCallback,
@@ -73,6 +76,7 @@ export function serveWebpackBrowser(
   transforms: {
     webpackConfiguration?: ExecutionTransformer<webpack.Configuration>,
     logging?: WebpackLoggingCallback,
+    indexHtml?: IndexHtmlTransform,
   } = {},
 ): Observable<DevServerBuilderOutput> {
   // Check Angular version.
@@ -158,17 +162,34 @@ export function serveWebpackBrowser(
         context.logger.warn('Live reload is disabled. HMR option ignored.');
       }
 
+      webpackConfig.plugins = [...(webpackConfig.plugins || [])];
+
       if (!options.watch) {
         // There's no option to turn off file watching in webpack-dev-server, but
         // we can override the file watcher instead.
-        webpackConfig.plugins = [...(webpackConfig.plugins || []),  {
+        webpackConfig.plugins.push({
           // tslint:disable-next-line:no-any
           apply: (compiler: any) => {
             compiler.hooks.afterEnvironment.tap('angular-cli', () => {
               compiler.watchFileSystem = { watch: () => { } };
             });
           },
-        }];
+        });
+      }
+
+      if (browserOptions.index) {
+        const { scripts = [], styles = [], index, baseHref } = browserOptions;
+
+        webpackConfig.plugins.push(new IndexHtmlWebpackPlugin({
+          input: path.resolve(root, index),
+          output: path.basename(index),
+          baseHref,
+          entrypoints: generateEntryPoints({ scripts, styles }),
+          deployUrl: browserOptions.deployUrl,
+          sri: browserOptions.subresourceIntegrity,
+          noModuleEntrypoints: ['polyfills-es5'],
+          postTransform: transforms.indexHtml,
+        }));
       }
 
       const normalizedOptimization = normalizeOptimization(browserOptions.optimization);
diff --git a/packages/angular_devkit/build_angular/src/server/index.ts b/packages/angular_devkit/build_angular/src/server/index.ts
index 480a8aac5acd..4130baa0ecd8 100644
--- a/packages/angular_devkit/build_angular/src/server/index.ts
+++ b/packages/angular_devkit/build_angular/src/server/index.ts
@@ -92,7 +92,6 @@ async function buildServerWebpackConfig(
   const { config } = await generateBrowserWebpackConfigFromContext(
     {
       ...options,
-      index: '',
       buildOptimizer: false,
       aot: true,
       platform: 'server',
diff --git a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
index e9be1252836b..94966ee738bd 100644
--- a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
+++ b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
@@ -72,7 +72,6 @@ export async function generateWebpackConfig(
       buildOptions = {
         ...options,
         es5BrowserSupport: undefined,
-        index: '',
         esVersionInFileName: true,
         scriptTargetOverride: scriptTarget,
       };
diff --git a/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts
index 47c0455c1ca1..b327fc75dc0b 100644
--- a/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts
@@ -43,7 +43,8 @@ describe('Browser Builder works with BOM index.html', () => {
     await run.stop();
   });
 
-  it('works with UTF16 LE BOM', async () => {
+  // todo: enable when utf16 is supported
+  xit('works with UTF16 LE BOM', async () => {
     host.writeMultipleFiles({
       'src/index.html': Buffer.from(
         '\ufeff<html><head><base href="/"></head><body><app-root></app-root></body></html>',

From 2172db1ed0d9e1e879ad316a9d899b4dc8755239 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 13 May 2019 12:33:40 -0400
Subject: [PATCH 1331/1703] fix(@angular-devkit/schematics): deprecate
 synchronous testing methods

All schematics can potentially be async.  The synchronous test method variants (`runSchematic`/`runExternalSchematic`) will fail if the schematic, any of its rules, or any schematic it calls are async.
---
 .../schematics/testing/schematic-test-runner.ts      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/angular_devkit/schematics/testing/schematic-test-runner.ts b/packages/angular_devkit/schematics/testing/schematic-test-runner.ts
index 1c0c06ac1ce8..9b89f6f46057 100644
--- a/packages/angular_devkit/schematics/testing/schematic-test-runner.ts
+++ b/packages/angular_devkit/schematics/testing/schematic-test-runner.ts
@@ -85,6 +85,12 @@ export class SchematicTestRunner {
       .pipe(map(tree => new UnitTestTree(tree)));
   }
 
+  /**
+   * @deprecated Since v8.0.0 - Use {@link SchematicTestRunner.runSchematicAsync} instead.
+   * All schematics can potentially be async.
+   * This synchronous variant will fail if the schematic, any of its rules, or any schematics
+   * it calls are async.
+   */
   runSchematic<SchematicSchemaT>(
     schematicName: string,
     opts?: SchematicSchemaT,
@@ -126,6 +132,12 @@ export class SchematicTestRunner {
       .pipe(map(tree => new UnitTestTree(tree)));
   }
 
+  /**
+   * @deprecated Since v8.0.0 - Use {@link SchematicTestRunner.runExternalSchematicAsync} instead.
+   * All schematics can potentially be async.
+   * This synchronous variant will fail if the schematic, any of its rules, or any schematics
+   * it calls are async.
+   */
   runExternalSchematic<SchematicSchemaT>(
     collectionName: string,
     schematicName: string,

From fb8548160d7138edb7ea914d7bde96d894aed294 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 13 May 2019 13:11:32 +0100
Subject: [PATCH 1332/1703] test(@ngtools/webpack): add test for changing
 import arg name

---
 .../src/transformers/import_factory.ts        |  9 ++++---
 .../src/transformers/import_factory_spec.ts   | 24 +++++++++++++++++++
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/packages/ngtools/webpack/src/transformers/import_factory.ts b/packages/ngtools/webpack/src/transformers/import_factory.ts
index 3750f7b9c0fe..3dadc48dad47 100644
--- a/packages/ngtools/webpack/src/transformers/import_factory.ts
+++ b/packages/ngtools/webpack/src/transformers/import_factory.ts
@@ -59,9 +59,9 @@ export function importFactory(
 Found 'loadChildren' with a non-string syntax in ${sourceFile.fileName} but could not transform it.
 Make sure it matches the format below:
 
-loadChildren: () => import('IMPORT_STRING').then(m => m.EXPORT_NAME)
+loadChildren: () => import('IMPORT_STRING').then(M => M.EXPORT_NAME)
 
-Please note that only IMPORT_STRING and EXPORT_NAME can be replaced in this format.
+Please note that only IMPORT_STRING, M, and EXPORT_NAME can be replaced in this format.
 
 Visit https://next.angular.io/guide/ivy for more information on using Ivy.
 `;
@@ -97,14 +97,13 @@ function replaceImport(
   emitWarning: () => void,
 ): ts.Node {
   // This ONLY matches the original source code format below:
-  // loadChildren: () => import('IMPORT_STRING').then(m => m.EXPORT_NAME)
+  // loadChildren: () => import('IMPORT_STRING').then(M => M.EXPORT_NAME)
   // And expects that source code to be transformed by NGC (see comment for importFactory).
   // It will not match nor alter variations, for instance:
   // - not using arrow functions
-  // - not using `m` as the module argument
   // - using `await` instead of `then`
   // - using a default export (https://github.com/angular/angular/issues/11402)
-  // The only parts that can change are the ones in caps: IMPORT_STRING and EXPORT_NAME.
+  // The only parts that can change are the ones in caps: IMPORT_STRING, M and EXPORT_NAME.
 
   // Exit early if the structure is not what we expect.
 
diff --git a/packages/ngtools/webpack/src/transformers/import_factory_spec.ts b/packages/ngtools/webpack/src/transformers/import_factory_spec.ts
index 8e199c92b45b..daa655118d5e 100644
--- a/packages/ngtools/webpack/src/transformers/import_factory_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/import_factory_spec.ts
@@ -51,5 +51,29 @@ describe('@ngtools/webpack transformers', () => {
       expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${input}`);
       expect(warningCalled).toBeTruthy();
     });
+
+    it('should support different arg name', () => {
+      const input = tags.stripIndent`
+        const ɵ0 = () => import('./lazy/lazy.module').then(a => a.LazyModule);
+        const routes = [{
+          path: 'lazy',
+          loadChildren: ɵ0
+        }];
+      `;
+      const output = tags.stripIndent`
+        const ɵ0 = () => import("./lazy/lazy.module.ngfactory").then(a => a.LazyModuleNgFactory);
+        const routes = [{
+          path: 'lazy',
+          loadChildren: ɵ0
+        }];
+      `;
+
+      let warningCalled = false;
+      const transformer = importFactory(() => warningCalled = true);
+      const result = transformTypescript(input, [transformer]);
+
+      expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+      expect(warningCalled).toBeFalsy();
+    });
   });
 });

From f4be46513bb5986cdb6ace03c8eec9f5eae4849b Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 13 May 2019 14:17:21 +0100
Subject: [PATCH 1333/1703] refactor(@ngtools/webpack): add forwardSlashPath
 util

I figured one day I'd get tired of repeating this replace. Today was that day.
---
 packages/ngtools/webpack/src/angular_compiler_plugin.ts    | 6 +++---
 packages/ngtools/webpack/src/lazy_routes.ts                | 3 ++-
 packages/ngtools/webpack/src/refactor.ts                   | 3 ++-
 .../webpack/src/transformers/export_lazy_module_map.ts     | 3 ++-
 .../ngtools/webpack/src/transformers/export_ngfactory.ts   | 3 ++-
 .../ngtools/webpack/src/transformers/replace_bootstrap.ts  | 3 ++-
 .../webpack/src/transformers/replace_server_bootstrap.ts   | 3 ++-
 packages/ngtools/webpack/src/utils.ts                      | 7 ++++++-
 8 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index cd844b3fd2e5..63745ef8b307 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -69,7 +69,7 @@ import {
   MESSAGE_KIND,
   UpdateMessage,
 } from './type_checker_messages';
-import { flattenArray, workaroundResolve } from './utils';
+import { flattenArray, forwardSlashPath, workaroundResolve } from './utils';
 import {
   VirtualFileSystemDecorator,
   VirtualWatchFileSystemDecorator,
@@ -163,7 +163,7 @@ export class AngularCompilerPlugin {
       throw new Error('Must specify "tsConfigPath" in the configuration of @ngtools/webpack.');
     }
     // TS represents paths internally with '/' and expects the tsconfig path to be in this format
-    this._tsConfigPath = options.tsConfigPath.replace(/\\/g, '/');
+    this._tsConfigPath = forwardSlashPath(options.tsConfigPath);
 
     // Check the base path.
     const maybeBasePath = path.resolve(process.cwd(), this._tsConfigPath);
@@ -482,7 +482,7 @@ export class AngularCompilerPlugin {
           return;
         }
 
-        const lazyRouteTSFile = discoveredLazyRoutes[lazyRouteKey].replace(/\\/g, '/');
+        const lazyRouteTSFile = forwardSlashPath(discoveredLazyRoutes[lazyRouteKey]);
         let modulePath: string, moduleKey: string;
 
         if (this._useFactories) {
diff --git a/packages/ngtools/webpack/src/lazy_routes.ts b/packages/ngtools/webpack/src/lazy_routes.ts
index dc32ebcea8c5..737b6c105d30 100644
--- a/packages/ngtools/webpack/src/lazy_routes.ts
+++ b/packages/ngtools/webpack/src/lazy_routes.ts
@@ -8,6 +8,7 @@
 import { dirname, join } from 'path';
 import * as ts from 'typescript';
 import { findAstNodes, resolve } from './refactor';
+import { forwardSlashPath } from './utils';
 
 
 function _getContentOfKeyLiteral(_source: ts.SourceFile, node: ts.Node): string | null {
@@ -38,7 +39,7 @@ export function findLazyRoutes(
     }
     compilerOptions = program.getCompilerOptions();
   }
-  const fileName = resolve(filePath, host, compilerOptions).replace(/\\/g, '/');
+  const fileName = forwardSlashPath(resolve(filePath, host, compilerOptions));
   let sourceFile: ts.SourceFile | undefined;
   if (program) {
     sourceFile = program.getSourceFile(fileName);
diff --git a/packages/ngtools/webpack/src/refactor.ts b/packages/ngtools/webpack/src/refactor.ts
index 634117268de9..f9c984f5d884 100644
--- a/packages/ngtools/webpack/src/refactor.ts
+++ b/packages/ngtools/webpack/src/refactor.ts
@@ -7,6 +7,7 @@
  */
 import * as path from 'path';
 import * as ts from 'typescript';
+import { forwardSlashPath } from './utils';
 
 
 /**
@@ -95,7 +96,7 @@ export class TypeScriptFileRefactor {
     let sourceFile: ts.SourceFile | null = null;
 
     if (_program) {
-      fileName = resolve(fileName, _host, _program.getCompilerOptions()).replace(/\\/g, '/');
+      fileName = forwardSlashPath(resolve(fileName, _host, _program.getCompilerOptions()));
       this._fileName = fileName;
 
       if (source) {
diff --git a/packages/ngtools/webpack/src/transformers/export_lazy_module_map.ts b/packages/ngtools/webpack/src/transformers/export_lazy_module_map.ts
index 9cfc9be42db7..9898dc20b4a4 100644
--- a/packages/ngtools/webpack/src/transformers/export_lazy_module_map.ts
+++ b/packages/ngtools/webpack/src/transformers/export_lazy_module_map.ts
@@ -8,6 +8,7 @@
 import * as path from 'path';
 import * as ts from 'typescript';
 import { LazyRouteMap } from '../lazy_routes';
+import { forwardSlashPath } from '../utils';
 import { getFirstNode, getLastNode } from './ast_helpers';
 import { AddNodeOperation, StandardTransform, TransformOperation } from './interfaces';
 import { makeTransform } from './make_transform';
@@ -46,7 +47,7 @@ export function exportLazyModuleMap(
         return;
       }
 
-      let relativePath = path.relative(dirName, modulePath).replace(/\\/g, '/');
+      let relativePath = forwardSlashPath(path.relative(dirName, modulePath));
       if (!(relativePath.startsWith('./') || relativePath.startsWith('../'))) {
         // 'a/b/c' is a relative path for Node but an absolute path for TS, so we must convert it.
         relativePath = `./${relativePath}`;
diff --git a/packages/ngtools/webpack/src/transformers/export_ngfactory.ts b/packages/ngtools/webpack/src/transformers/export_ngfactory.ts
index 04a8afd1bcce..6a5b13ee0426 100644
--- a/packages/ngtools/webpack/src/transformers/export_ngfactory.ts
+++ b/packages/ngtools/webpack/src/transformers/export_ngfactory.ts
@@ -7,6 +7,7 @@
  */
 import { dirname, relative } from 'path';
 import * as ts from 'typescript';
+import { forwardSlashPath } from '../utils';
 import { collectDeepNodes, getFirstNode } from './ast_helpers';
 import { AddNodeOperation, StandardTransform, TransformOperation } from './interfaces';
 import { makeTransform } from './make_transform';
@@ -35,7 +36,7 @@ export function exportNgFactory(
     }
 
     const relativeEntryModulePath = relative(dirname(sourceFile.fileName), entryModule.path);
-    const normalizedEntryModulePath = `./${relativeEntryModulePath}`.replace(/\\/g, '/');
+    const normalizedEntryModulePath = forwardSlashPath(`./${relativeEntryModulePath}`);
 
     // Get the module path from the import.
     entryModuleIdentifiers.forEach((entryModuleIdentifier) => {
diff --git a/packages/ngtools/webpack/src/transformers/replace_bootstrap.ts b/packages/ngtools/webpack/src/transformers/replace_bootstrap.ts
index 37aeebcbbdb6..0153c8740d2d 100644
--- a/packages/ngtools/webpack/src/transformers/replace_bootstrap.ts
+++ b/packages/ngtools/webpack/src/transformers/replace_bootstrap.ts
@@ -7,6 +7,7 @@
  */
 import { dirname, relative } from 'path';
 import * as ts from 'typescript';
+import { forwardSlashPath } from '../utils';
 import { collectDeepNodes } from './ast_helpers';
 import { insertStarImport } from './insert_import';
 import { ReplaceNodeOperation, StandardTransform, TransformOperation } from './interfaces';
@@ -79,7 +80,7 @@ export function replaceBootstrap(
       // Add the transform operations.
       const relativeEntryModulePath = relative(dirname(sourceFile.fileName), entryModule.path);
       let className = entryModule.className;
-      let modulePath = `./${relativeEntryModulePath}`.replace(/\\/g, '/');
+      let modulePath = forwardSlashPath(`./${relativeEntryModulePath}`);
       let bootstrapIdentifier = 'bootstrapModule';
 
       if (useFactories) {
diff --git a/packages/ngtools/webpack/src/transformers/replace_server_bootstrap.ts b/packages/ngtools/webpack/src/transformers/replace_server_bootstrap.ts
index 483080bf4a6b..e9fcee0b748e 100644
--- a/packages/ngtools/webpack/src/transformers/replace_server_bootstrap.ts
+++ b/packages/ngtools/webpack/src/transformers/replace_server_bootstrap.ts
@@ -7,6 +7,7 @@
  */
 import { dirname, relative } from 'path';
 import * as ts from 'typescript';
+import { forwardSlashPath } from '../utils';
 import { collectDeepNodes } from './ast_helpers';
 import { insertStarImport } from './insert_import';
 import { ReplaceNodeOperation, StandardTransform, TransformOperation } from './interfaces';
@@ -37,7 +38,7 @@ export function replaceServerBootstrap(
     }
 
     const relativeEntryModulePath = relative(dirname(sourceFile.fileName), entryModule.path);
-    const normalizedEntryModulePath = `./${relativeEntryModulePath}`.replace(/\\/g, '/');
+    const normalizedEntryModulePath = forwardSlashPath(`./${relativeEntryModulePath}`);
     const factoryClassName = entryModule.className + 'NgFactory';
     const factoryModulePath = normalizedEntryModulePath + '.ngfactory';
 
diff --git a/packages/ngtools/webpack/src/utils.ts b/packages/ngtools/webpack/src/utils.ts
index 08c2e0a67010..db4336ada4b2 100644
--- a/packages/ngtools/webpack/src/utils.ts
+++ b/packages/ngtools/webpack/src/utils.ts
@@ -12,9 +12,14 @@ import { Path, getSystemPath, normalize } from '@angular-devkit/core';
 // To work around this we must provide the same path format as TS internally uses in
 // the SourceFile paths.
 export function workaroundResolve(path: Path | string) {
-  return getSystemPath(normalize(path)).replace(/\\/g, '/');
+  return forwardSlashPath(getSystemPath(normalize(path)));
 }
 
 export function flattenArray<T>(value: Array<T | T[]>): T[] {
   return [].concat.apply([], value);
 }
+
+// TS represents paths internally with '/' and expects paths to be in this format.
+export function forwardSlashPath(path: string) {
+  return path.replace(/\\/g, '/');
+}

From 85b2016e7748fd7a4247ce6d15a5d9ec5fc5a736 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 13 May 2019 16:52:28 +0100
Subject: [PATCH 1334/1703] test(@ngtools/webpack): support libs on transformer
 test errors

---
 .../webpack/src/transformers/ast_helpers.ts   | 43 ++++++++++++++++---
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/packages/ngtools/webpack/src/transformers/ast_helpers.ts b/packages/ngtools/webpack/src/transformers/ast_helpers.ts
index 1d3beb7a3336..7ef8ec366a5b 100644
--- a/packages/ngtools/webpack/src/transformers/ast_helpers.ts
+++ b/packages/ngtools/webpack/src/transformers/ast_helpers.ts
@@ -6,6 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { virtualFs } from '@angular-devkit/core';
+import { readFileSync, readdirSync } from 'fs';
+import { dirname, join } from 'path';
 import * as ts from 'typescript';
 import { WebpackCompilerHost } from '../compiler_host';
 
@@ -48,14 +50,20 @@ export function getLastNode(sourceFile: ts.SourceFile): ts.Node | null {
 // Test transform helpers.
 const basePath = '/project/src/';
 const fileName = basePath + 'test-file.ts';
+const tsLibFiles = loadTsLibFiles();
 
-export function createTypescriptContext(content: string, additionalFiles?: Record<string, string>) {
+export function createTypescriptContext(
+  content: string,
+  additionalFiles?: Record<string, string>,
+  useLibs = false,
+) {
   // Set compiler options.
   const compilerOptions: ts.CompilerOptions = {
-    noEmitOnError: false,
+    noEmitOnError: useLibs,
     allowJs: true,
     newLine: ts.NewLineKind.LineFeed,
     moduleResolution: ts.ModuleResolutionKind.NodeJs,
+    module: ts.ModuleKind.ESNext,
     target: ts.ScriptTarget.ESNext,
     skipLibCheck: true,
     sourceMap: false,
@@ -73,6 +81,15 @@ export function createTypescriptContext(content: string, additionalFiles?: Recor
   // Add a dummy file to host content.
   compilerHost.writeFile(fileName, content, false);
 
+  if (useLibs) {
+    // Write the default libs.
+    // These are needed for tests that use import(), because it relies on a Promise being there.
+    const compilerLibFolder = dirname(compilerHost.getDefaultLibFileName(compilerOptions));
+    for (const [k, v] of Object.entries(tsLibFiles)) {
+      compilerHost.writeFile(join(compilerLibFolder, k), v, false);
+    }
+  }
+
   if (additionalFiles) {
     for (const key in additionalFiles) {
       compilerHost.writeFile(basePath + key, additionalFiles[key], false);
@@ -106,13 +123,27 @@ export function transformTypescript(
     undefined, undefined, undefined, undefined, { before: transformers },
   );
 
-  // Log diagnostics if emit wasn't successfull.
+  // Throw error with diagnostics if emit wasn't successfull.
   if (emitSkipped) {
-    console.error(diagnostics);
-
-    return null;
+    throw new Error(ts.formatDiagnostics(diagnostics, compilerHost));
   }
 
   // Return the transpiled js.
   return compilerHost.readFile(fileName.replace(/\.tsx?$/, '.js'));
 }
+
+function loadTsLibFiles() {
+  const libFolderPath = dirname(require.resolve('typescript/lib/lib.d.ts'));
+  const libFolderFiles = readdirSync(libFolderPath);
+  const libFileNames = libFolderFiles.filter(f => f.startsWith('lib.') && f.endsWith('.d.ts'));
+
+  // Return a map of the lib names to their content.
+  return libFileNames.reduce(
+    (map, f) => {
+      map[f] = readFileSync(join(libFolderPath, f), 'utf-8');
+
+      return map;
+    },
+    {} as { [k: string]: string },
+  );
+}

From a491b09800b493fe01301387fa9a025f7c7d4808 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 13 May 2019 19:22:58 +0100
Subject: [PATCH 1335/1703] fix(@ngtools/webpack): import factory from original
 declaration file

Fix #14399
---
 .../webpack/src/angular_compiler_plugin.ts    |  2 +-
 .../src/transformers/import_factory.ts        | 47 ++++++++++++++-----
 .../src/transformers/import_factory_spec.ts   | 46 +++++++++++++-----
 3 files changed, 71 insertions(+), 24 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 63745ef8b307..d94bb047e2c7 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -928,7 +928,7 @@ export class AngularCompilerPlugin {
       // Import ngfactory in loadChildren import syntax
       if (this._useFactories) {
         // Only transform imports to use factories with View Engine.
-        this._transformers.push(importFactory(msg => this._warnings.push(msg)));
+        this._transformers.push(importFactory(msg => this._warnings.push(msg), getTypeChecker));
       }
     }
 
diff --git a/packages/ngtools/webpack/src/transformers/import_factory.ts b/packages/ngtools/webpack/src/transformers/import_factory.ts
index 3dadc48dad47..c1a5b3b7a477 100644
--- a/packages/ngtools/webpack/src/transformers/import_factory.ts
+++ b/packages/ngtools/webpack/src/transformers/import_factory.ts
@@ -5,7 +5,9 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import { dirname, relative } from 'path';
 import * as ts from 'typescript';
+import { forwardSlashPath } from '../utils';
 
 
 /**
@@ -51,6 +53,7 @@ import * as ts from 'typescript';
 
 export function importFactory(
   warningCb: (warning: string) => void,
+  getTypeChecker: () => ts.TypeChecker,
 ): ts.TransformerFactory<ts.SourceFile> {
   return (context: ts.TransformationContext) => {
     // TODO(filipesilva): change the link to https://angular.io/guide/ivy once it is out.
@@ -69,7 +72,7 @@ Visit https://next.angular.io/guide/ivy for more information on using Ivy.
       const emitWarning = () => warningCb(warning);
       const visitVariableStatement: ts.Visitor = (node: ts.Node) => {
         if (ts.isVariableDeclaration(node)) {
-          return replaceImport(node, context, emitWarning);
+          return replaceImport(node, context, emitWarning, sourceFile.fileName, getTypeChecker());
         }
 
         return ts.visitEachChild(node, visitVariableStatement, context);
@@ -95,6 +98,8 @@ function replaceImport(
   node: ts.VariableDeclaration,
   context: ts.TransformationContext,
   emitWarning: () => void,
+  fileName: string,
+  typeChecker: ts.TypeChecker,
 ): ts.Node {
   // This ONLY matches the original source code format below:
   // loadChildren: () => import('IMPORT_STRING').then(M => M.EXPORT_NAME)
@@ -157,16 +162,20 @@ function replaceImport(
     return node;
   }
 
+  // Now that we know it's both `ɵ0` (generated by NGC) and a `import()`, start emitting a warning
+  // if the structure isn't as expected to help users identify unusable syntax.
+  const warnAndBail = () => {
+    emitWarning();
+
+    return node;
+  };
+
   // ɵ0 = () => import('IMPORT_STRING').then(m => m.EXPORT_NAME)
   if (!(
     topArrowFnBody.arguments.length === 1
     && ts.isArrowFunction(topArrowFnBody.arguments[0])
   )) {
-    // Now that we know it's both `ɵ0` (generated by NGC) and a `import()`, start emitting a warning
-    // if the structure isn't as expected to help users identify unusable syntax.
-    emitWarning();
-
-    return node;
+    return warnAndBail();
   }
 
   const thenArrowFn = topArrowFnBody.arguments[0] as ts.ArrowFunction;
@@ -175,20 +184,36 @@ function replaceImport(
     && ts.isPropertyAccessExpression(thenArrowFn.body)
     && ts.isIdentifier(thenArrowFn.body.name)
   )) {
-    emitWarning();
-
-    return node;
+    return warnAndBail();
   }
 
   // At this point we know what are the nodes we need to replace.
-  const importStringLit = importCall.arguments[0] as ts.StringLiteral;
   const exportNameId = thenArrowFn.body.name;
+  const importStringLit = importCall.arguments[0] as ts.StringLiteral;
+
+  // Try to resolve the import. It might be a reexport from somewhere and the ngfactory will only
+  // be present next to the original module.
+  const exportedSymbol = typeChecker.getSymbolAtLocation(exportNameId);
+  if (!exportedSymbol) {
+    return warnAndBail();
+  }
+  const exportedSymbolDecl = exportedSymbol.getDeclarations();
+  if (!exportedSymbolDecl || exportedSymbolDecl.length === 0) {
+    return warnAndBail();
+  }
+
+  // Get the relative path from the containing module to the imported module.
+  const relativePath = relative(dirname(fileName), exportedSymbolDecl[0].getSourceFile().fileName);
+
+  // node's `relative` call doesn't actually add `./` so we add it here.
+  // Also replace the 'ts' extension with just 'ngfactory'.
+  const newImportString = `./${forwardSlashPath(relativePath)}`.replace(/ts$/, 'ngfactory');
 
   // The easiest way to alter them is with a simple visitor.
   const replacementVisitor: ts.Visitor = (node: ts.Node) => {
     if (node === importStringLit) {
       // Transform the import string.
-      return ts.createStringLiteral(importStringLit.text + '.ngfactory');
+      return ts.createStringLiteral(newImportString);
     } else if (node === exportNameId) {
       // Transform the export name.
       return ts.createIdentifier(exportNameId.text + 'NgFactory');
diff --git a/packages/ngtools/webpack/src/transformers/import_factory_spec.ts b/packages/ngtools/webpack/src/transformers/import_factory_spec.ts
index daa655118d5e..7ba5e3c67fa8 100644
--- a/packages/ngtools/webpack/src/transformers/import_factory_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/import_factory_spec.ts
@@ -6,12 +6,17 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { tags } from '@angular-devkit/core';
-import { transformTypescript } from './ast_helpers';
+import { createTypescriptContext, transformTypescript } from './ast_helpers';
 import { importFactory } from './import_factory';
 
 describe('@ngtools/webpack transformers', () => {
   describe('import_factory', () => {
     it('should support arrow functions', () => {
+      const additionalFiles: Record<string, string> = {
+        'lazy/lazy.module.ts': `
+          export const LazyModule = {};
+        `,
+      };
       const input = tags.stripIndent`
         const ɵ0 = () => import('./lazy/lazy.module').then(m => m.LazyModule);
         const routes = [{
@@ -28,14 +33,20 @@ describe('@ngtools/webpack transformers', () => {
       `;
 
       let warningCalled = false;
-      const transformer = importFactory(() => warningCalled = true);
-      const result = transformTypescript(input, [transformer]);
+      const { program, compilerHost } = createTypescriptContext(input, additionalFiles, true);
+      const transformer = importFactory(() => warningCalled = true, () => program.getTypeChecker());
+      const result = transformTypescript(undefined, [transformer], program, compilerHost);
 
       expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
       expect(warningCalled).toBeFalsy();
     });
 
     it('should not transform if the format is different than expected', () => {
+      const additionalFiles: Record<string, string> = {
+        'lazy/lazy.module.ts': `
+          export const LazyModule = {};
+        `,
+      };
       const input = tags.stripIndent`
         const ɵ0 = () => import('./lazy/lazy.module').then(function (m) { return m.LazyModule; });
         const routes = [{
@@ -45,35 +56,46 @@ describe('@ngtools/webpack transformers', () => {
       `;
 
       let warningCalled = false;
-      const transformer = importFactory(() => warningCalled = true);
-      const result = transformTypescript(input, [transformer]);
+      const { program, compilerHost } = createTypescriptContext(input, additionalFiles, true);
+      const transformer = importFactory(() => warningCalled = true, () => program.getTypeChecker());
+      const result = transformTypescript(undefined, [transformer], program, compilerHost);
 
       expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${input}`);
       expect(warningCalled).toBeTruthy();
     });
 
-    it('should support different arg name', () => {
+    it('should support resolving reexports', () => {
+      const additionalFiles: Record<string, string> = {
+        'shared/index.ts': `
+          export * from './path/to/lazy/lazy.module';
+        `,
+        'shared/path/to/lazy/lazy.module.ts': `
+          export const LazyModule = {};
+        `,
+      };
       const input = tags.stripIndent`
-        const ɵ0 = () => import('./lazy/lazy.module').then(a => a.LazyModule);
+        const ɵ0 = () => import('./shared').then(m => m.LazyModule);
         const routes = [{
           path: 'lazy',
           loadChildren: ɵ0
         }];
       `;
+
+      // tslint:disable: max-line-length
       const output = tags.stripIndent`
-        const ɵ0 = () => import("./lazy/lazy.module.ngfactory").then(a => a.LazyModuleNgFactory);
+        const ɵ0 = () => import("./shared/path/to/lazy/lazy.module.ngfactory").then(m => m.LazyModuleNgFactory);
         const routes = [{
           path: 'lazy',
           loadChildren: ɵ0
         }];
       `;
+      // tslint:enable: max-line-length
 
-      let warningCalled = false;
-      const transformer = importFactory(() => warningCalled = true);
-      const result = transformTypescript(input, [transformer]);
+      const { program, compilerHost } = createTypescriptContext(input, additionalFiles, true);
+      const transformer = importFactory(() => { }, () => program.getTypeChecker());
+      const result = transformTypescript(undefined, [transformer], program, compilerHost);
 
       expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
-      expect(warningCalled).toBeFalsy();
     });
   });
 });

From 290898536bab3e5dd1395b8c4cea3a01c5f155d7 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 13 May 2019 19:36:42 -0400
Subject: [PATCH 1336/1703] fix(@angular/cli): prevent nested schematic
 execution from generating analytics

Fixes #14190
---
 .../angular/cli/models/schematic-command.ts   | 38 +------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index 94aa069423d9..7b99766c6b05 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -265,48 +265,12 @@ export abstract class SchematicCommand<
           analytics: this.analytics,
         };
       } else {
-        return {
-          ...context,
-          analytics: new analytics.NoopAnalytics(),
-        };
+        return context;
       }
     });
 
     workflow.engineHost.registerOptionsTransform(validateOptionsWithSchema(workflow.registry));
 
-    // This needs to be the last transform as it reports the flags to analytics (if enabled).
-    workflow.engineHost.registerOptionsTransform(async (
-      schematic,
-      options: { [prop: string]: number | string },
-      context,
-    ): Promise<{ [prop: string]: number | string }> => {
-      const analytics = context && context.analytics;
-      if (!schematic.schemaJson || !context || !analytics) {
-        return options;
-      }
-
-      const collectionName = context.schematic.collection.description.name;
-      const schematicName = context.schematic.description.name;
-
-      if (!isPackageNameSafeForAnalytics(collectionName)) {
-        return options;
-      }
-
-      const args = await parseJsonSchemaToOptions(this._workflow.registry, schematic.schemaJson);
-      const dimensions: (boolean | number | string)[] = [];
-      for (const option of args) {
-        const ua = option.userAnalytics;
-
-        if (option.name in options && ua) {
-          dimensions[ua] = options[option.name];
-        }
-      }
-
-      analytics.event('schematics', collectionName + ':' + schematicName, { dimensions });
-
-      return options;
-    });
-
     if (options.defaults) {
       workflow.registry.addPreTransform(schema.transforms.addUndefinedDefaults);
     } else {

From 06c1e1c05152f199e65dd7c13c2c4cc35ac5fb8f Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 14 May 2019 11:32:04 -0400
Subject: [PATCH 1337/1703] refactor(@angular-devkit/build-angular): simplify
 webpack stats output

---
 packages/angular_devkit/build_angular/package.json  |  1 -
 .../models/webpack-configs/common.ts                | 13 ++++++++++---
 yarn.lock                                           |  7 -------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index e8bd3f46c4f4..952558d4ac4c 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -43,7 +43,6 @@
     "source-map-support": "0.5.12",
     "source-map-loader": "0.2.4",
     "speed-measure-webpack-plugin": "1.3.1",
-    "stats-webpack-plugin": "0.7.0",
     "style-loader": "0.23.1",
     "stylus": "0.54.5",
     "stylus-loader": "3.0.2",
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 18e066ca0f67..1807838af858 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -10,12 +10,14 @@ import * as CopyWebpackPlugin from 'copy-webpack-plugin';
 import * as path from 'path';
 import { ScriptTarget } from 'typescript';
 import {
+  Compiler,
   Configuration,
   ContextReplacementPlugin,
   HashedModuleIdsPlugin,
   Output,
   debug,
 } from 'webpack';
+import { RawSource } from 'webpack-sources';
 import { AssetPatternClass } from '../../../browser/schema';
 import { isEs5SupportNeeded } from '../../../utils/differential-loading';
 import { BundleBudgetPlugin } from '../../plugins/bundle-budget';
@@ -30,8 +32,6 @@ import { getEsVersionForFileName, getOutputHashFormat, normalizeExtraEntryPoints
 const ProgressPlugin = require('webpack/lib/ProgressPlugin');
 const CircularDependencyPlugin = require('circular-dependency-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
-const StatsPlugin = require('stats-webpack-plugin');
-
 
 // tslint:disable-next-line:no-any
 const g: any = typeof global !== 'undefined' ? global : {};
@@ -200,7 +200,14 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
   }
 
   if (buildOptions.statsJson) {
-    extraPlugins.push(new StatsPlugin(`stats${targetInFileName}.json`, 'verbose'));
+    extraPlugins.push(new class {
+      apply(compiler: Compiler) {
+        compiler.hooks.emit.tap('angular-cli-stats', compilation => {
+          const data = JSON.stringify(compilation.getStats().toJson('verbose'));
+          compilation.assets[`stats${targetInFileName}.json`] = new RawSource(data);
+        });
+      }
+    });
   }
 
   if (buildOptions.namedChunks) {
diff --git a/yarn.lock b/yarn.lock
index e8b9398d8afa..5f0a9c3a40ca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8984,13 +8984,6 @@ static-module@^2.2.0:
     static-eval "^2.0.0"
     through2 "~2.0.3"
 
-stats-webpack-plugin@0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/stats-webpack-plugin/-/stats-webpack-plugin-0.7.0.tgz#ccffe9b745de8bbb155571e063f8263fc0e2bc06"
-  integrity sha512-NT0YGhwuQ0EOX+uPhhUcI6/+1Sq/pMzNuSCBVT4GbFl/ac6I/JZefBcjlECNfAb1t3GOx5dEj1Z7x0cAxeeVLQ==
-  dependencies:
-    lodash "^4.17.4"
-
 "statuses@>= 1.4.0 < 2":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"

From 56d6dc848bafda6a8342a5a8e46051fce152d886 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 14 May 2019 12:59:56 -0400
Subject: [PATCH 1338/1703] refactor(@angular-devkit/build-angular): use
 standard node resolution methods where possible

---
 .../models/webpack-configs/common.ts          |  5 ++--
 .../utilities/read-tsconfig.ts                | 11 ++++----
 .../utilities/require-project-module.ts       | 25 -------------------
 .../build_angular/src/app-shell/index.ts      | 16 +++++++-----
 4 files changed, 17 insertions(+), 40 deletions(-)
 delete mode 100644 packages/angular_devkit/build_angular/src/angular-cli-files/utilities/require-project-module.ts

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 1807838af858..63a09d7ffbe8 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -25,7 +25,6 @@ import { CleanCssWebpackPlugin } from '../../plugins/cleancss-webpack-plugin';
 import { NamedLazyChunksPlugin } from '../../plugins/named-chunks-plugin';
 import { ScriptsWebpackPlugin } from '../../plugins/scripts-webpack-plugin';
 import { findAllNodeModules, findUp } from '../../utilities/find-up';
-import { requireProjectModule } from '../../utilities/require-project-module';
 import { WebpackConfigOptions } from '../build-options';
 import { getEsVersionForFileName, getOutputHashFormat, normalizeExtraEntryPoints } from './utils';
 
@@ -244,13 +243,13 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
   loaderNodeModules.unshift('node_modules');
 
   // Load rxjs path aliases.
-  // https://github.com/ReactiveX/rxjs/blob/master/doc/lettable-operators.md#build-and-treeshaking
+  // https://github.com/ReactiveX/rxjs/blob/master/doc/pipeable-operators.md#build-and-treeshaking
   let alias = {};
   try {
     const rxjsPathMappingImport = wco.supportES2015
       ? 'rxjs/_esm2015/path-mapping'
       : 'rxjs/_esm5/path-mapping';
-    const rxPaths = requireProjectModule(projectRoot, rxjsPathMappingImport);
+    const rxPaths = require(require.resolve(rxjsPathMappingImport, { paths: [projectRoot] }));
     alias = rxPaths(nodeModules);
   } catch { }
 
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/read-tsconfig.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/read-tsconfig.ts
index e4c607d7d294..0ac120536ed7 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/read-tsconfig.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/read-tsconfig.ts
@@ -5,14 +5,12 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable
 // TODO: cleanup this file, it's copied as is from Angular CLI.
-import * as ts from 'typescript';
 import * as path from 'path';
-import { requireProjectModule } from '../utilities/require-project-module';
 
 export function readTsconfig(tsconfigPath: string) {
-  const projectTs = requireProjectModule(path.dirname(tsconfigPath), 'typescript') as typeof ts;
+  // build-angular has a peer dependency on typescript
+  const projectTs = require('typescript') as typeof import('typescript');
   const configResult = projectTs.readConfigFile(tsconfigPath, projectTs.sys.readFile);
   const tsConfig = projectTs.parseJsonConfigFileContent(configResult.config, projectTs.sys,
     path.dirname(tsconfigPath), undefined, tsconfigPath);
@@ -21,8 +19,9 @@ export function readTsconfig(tsconfigPath: string) {
     throw new Error(
       `Errors found while reading ${tsconfigPath}:\n  ${
         tsConfig.errors.map(e => e.messageText).join('\n  ')
-      }`
-    )
+      }`,
+    );
   }
+
   return tsConfig;
 }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/require-project-module.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/require-project-module.ts
deleted file mode 100644
index ec1eed116dca..000000000000
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/require-project-module.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { resolve } from '@angular-devkit/core/node';
-
-// Resolve dependencies within the target project.
-export function resolveProjectModule(root: string, moduleName: string) {
-  return resolve(
-    moduleName,
-    {
-      basedir: root,
-      checkGlobal: false,
-      checkLocal: true,
-    },
-  );
-}
-
-// Require dependencies within the target project.
-export function requireProjectModule(root: string, moduleName: string) {
-  return require(resolveProjectModule(root, moduleName));
-}
diff --git a/packages/angular_devkit/build_angular/src/app-shell/index.ts b/packages/angular_devkit/build_angular/src/app-shell/index.ts
index bd13ab545416..d71db512caa2 100644
--- a/packages/angular_devkit/build_angular/src/app-shell/index.ts
+++ b/packages/angular_devkit/build_angular/src/app-shell/index.ts
@@ -15,7 +15,6 @@ import { JsonObject, experimental, join, normalize, resolve, schema } from '@ang
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as fs from 'fs';
 import * as path from 'path';
-import { requireProjectModule } from '../angular-cli-files/utilities/require-project-module';
 import { augmentAppWithServiceWorker } from '../angular-cli-files/utilities/service-worker';
 import { BrowserBuilderOutput } from '../browser';
 import { Schema as BrowserBuilderSchema } from '../browser/schema';
@@ -34,12 +33,17 @@ async function _renderUniversal(
   const serverBundlePath = await _getServerModuleBundlePath(options, context, serverResult);
 
   const root = context.workspaceRoot;
-  requireProjectModule(root, 'zone.js/dist/zone-node');
 
-  const renderModuleFactory = requireProjectModule(
-    root,
-    '@angular/platform-server',
-  ).renderModuleFactory;
+  // Initialize zone.js
+  const zonePackage = require.resolve('zone.js', { paths: [root] });
+  await import(zonePackage);
+
+  // Load platform server module renderer
+  const platformServerPackage = require.resolve('@angular/platform-server', { paths: [root] });
+  const renderModuleFactory = await import(platformServerPackage)
+    // tslint:disable-next-line:no-implicit-dependencies
+    .then((m: typeof import('@angular/platform-server')) => m.renderModuleFactory);
+
   const AppServerModuleNgFactory = require(serverBundlePath).AppServerModuleNgFactory;
   const outputIndexPath = options.outputIndexPath
     ? path.join(root, options.outputIndexPath)

From d02e80c528b2f369b039a264a5d802f6f90bdae5 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 15 May 2019 08:11:29 +0000
Subject: [PATCH 1339/1703] build: update webpack-dev-middleware to version
 3.7.0

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 22 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 952558d4ac4c..63d9cd88841c 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -49,7 +49,7 @@
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.2.3",
     "webpack": "4.31.0",
-    "webpack-dev-middleware": "3.6.2",
+    "webpack-dev-middleware": "3.7.0",
     "webpack-dev-server": "3.3.1",
     "webpack-merge": "4.2.1",
     "webpack-sources": "1.3.0",
diff --git a/yarn.lock b/yarn.lock
index 5f0a9c3a40ca..9db8f87e647f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6149,6 +6149,11 @@ mime@^2.3.1:
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
   integrity sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==
 
+mime@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.2.tgz#ce5229a5e99ffc313abac806b482c10e7ba6ac78"
+  integrity sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg==
+
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
@@ -7659,6 +7664,11 @@ range-parser@^1.0.3, range-parser@^1.2.0, range-parser@~1.2.0:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
   integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
+range-parser@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+
 raw-body@2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
@@ -9887,7 +9897,17 @@ webpack-dev-middleware@3.4.0:
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
-webpack-dev-middleware@3.6.2, webpack-dev-middleware@^3.6.2:
+webpack-dev-middleware@3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz#ef751d25f4e9a5c8a35da600c5fda3582b5c6cff"
+  integrity sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==
+  dependencies:
+    memory-fs "^0.4.1"
+    mime "^2.4.2"
+    range-parser "^1.2.1"
+    webpack-log "^2.0.0"
+
+webpack-dev-middleware@^3.6.2:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.2.tgz#f37a27ad7c09cd7dc67cd97655413abaa1f55942"
   integrity sha512-A47I5SX60IkHrMmZUlB0ZKSWi29TZTcPz7cha1Z75yYOsgWh/1AcPmQEbC8ZIbU3A1ytSv1PMU0PyPz2Lmz2jg==

From 74f2ee68d6d166903d5ef571d8a793bd4994e142 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 15 May 2019 19:47:06 +0100
Subject: [PATCH 1340/1703] fix(@angular-devkit/build-angular): show error for
 missing modules

Fix #14421
---
 .../models/webpack-configs/common.ts          |  2 ++
 .../test/browser/errors_spec_large.ts         | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 63a09d7ffbe8..6a842bd80ee8 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -359,6 +359,8 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
       hints: false,
     },
     module: {
+      // Show an error for missing exports instead of a warning.
+      strictExportPresence: true,
       rules: [
         {
           test: /\.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)$/,
diff --git a/packages/angular_devkit/build_angular/test/browser/errors_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/errors_spec_large.ts
index 462593faeea5..63f16d0c859c 100644
--- a/packages/angular_devkit/build_angular/test/browser/errors_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/errors_spec_large.ts
@@ -62,4 +62,23 @@ describe('Browser Builder errors', () => {
     expect(logs.join()).toContain('Function expressions are not supported in');
     await run.stop();
   });
+
+  it('shows missing export errors', async () => {
+    host.writeMultipleFiles({
+      'src/not-main.js': `
+        import { missingExport } from 'rxjs';
+        console.log(missingExport);
+      `,
+    });
+    const overrides = { main: 'src/not-main.js' };
+    const logger = new logging.Logger('');
+    const logs: string[] = [];
+    logger.subscribe(e => logs.push(e.message));
+
+    const run = await architect.scheduleTarget(targetSpec, overrides, { logger });
+    const output = await run.result;
+    expect(output.success).toBe(false);
+    expect(logs.join()).toContain(`export 'missingExport' was not found in 'rxjs'`);
+    await run.stop();
+  });
 });

From ff2600b417c3554f3070ec3eaf57b74826dde27b Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Tue, 14 May 2019 16:20:19 -0700
Subject: [PATCH 1341/1703] fix(@angular/cli): @bazel/* are not shown in `ng
 version`

Update `ng version` to show versions for @bazel/* packages to help users
report meaningful errors when they opt in to Bazel.
---
 packages/angular/cli/commands/version-impl.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/angular/cli/commands/version-impl.ts b/packages/angular/cli/commands/version-impl.ts
index 0dc34650e231..5724a2b49910 100644
--- a/packages/angular/cli/commands/version-impl.ts
+++ b/packages/angular/cli/commands/version-impl.ts
@@ -29,6 +29,7 @@ export class VersionCommand extends Command<VersionCommandSchema> {
     const patterns = [
       /^@angular\/.*/,
       /^@angular-devkit\/.*/,
+      /^@bazel\/.*/,
       /^@ngtools\/.*/,
       /^@nguniversal\/.*/,
       /^@schematics\/.*/,

From 221249d9d1b00886d9b48d2008b15721ed3d08de Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 15 May 2019 08:22:03 +0000
Subject: [PATCH 1342/1703] build: update terser-webpack-plugin to version
 1.2.4

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 42 ++++++++++++++-----
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 63d9cd88841c..aae8f27ef512 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -47,7 +47,7 @@
     "stylus": "0.54.5",
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
-    "terser-webpack-plugin": "1.2.3",
+    "terser-webpack-plugin": "1.2.4",
     "webpack": "4.31.0",
     "webpack-dev-middleware": "3.7.0",
     "webpack-dev-server": "3.3.1",
diff --git a/yarn.lock b/yarn.lock
index 9db8f87e647f..5b34a687ad9c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2204,6 +2204,11 @@ commander@^2.12.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
   integrity sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==
 
+commander@^2.19.0:
+  version "2.20.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
+  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
+
 commander@~2.17.1:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
@@ -8684,7 +8689,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@0.5.12:
+source-map-support@0.5.12, source-map-support@~0.5.10:
   version "0.5.12"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
   integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
@@ -9263,19 +9268,20 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
-terser-webpack-plugin@1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz#3f98bc902fac3e5d0de730869f50668561262ec8"
-  integrity sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==
+terser-webpack-plugin@1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.4.tgz#56f87540c28dd5265753431009388f473b5abba3"
+  integrity sha512-64IiILNQlACWZLzFlpzNaG0bpQ4ytaB7fwOsbpsdIV70AfLUmIGGeuKL0YV2WmtcrURjE2aOvHD4/lrFV3Rg+Q==
   dependencies:
-    cacache "^11.0.2"
+    cacache "^11.3.2"
     find-cache-dir "^2.0.0"
+    is-wsl "^1.1.0"
     schema-utils "^1.0.0"
-    serialize-javascript "^1.4.0"
+    serialize-javascript "^1.7.0"
     source-map "^0.6.1"
-    terser "^3.16.1"
-    webpack-sources "^1.1.0"
-    worker-farm "^1.5.2"
+    terser "^3.17.0"
+    webpack-sources "^1.3.0"
+    worker-farm "^1.7.0"
 
 terser-webpack-plugin@^1.1.0:
   version "1.2.0"
@@ -9300,6 +9306,15 @@ terser@^3.16.1:
     source-map "~0.6.1"
     source-map-support "~0.5.9"
 
+terser@^3.17.0:
+  version "3.17.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2"
+  integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==
+  dependencies:
+    commander "^2.19.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.10"
+
 terser@^3.8.1:
   version "3.10.8"
   resolved "https://registry.yarnpkg.com/terser/-/terser-3.10.8.tgz#2fe3967396a10cdc3d575074fe857efd30a2895a"
@@ -10136,6 +10151,13 @@ worker-farm@^1.5.2:
   dependencies:
     errno "~0.1.7"
 
+worker-farm@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
+  integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==
+  dependencies:
+    errno "~0.1.7"
+
 worker-plugin@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/worker-plugin/-/worker-plugin-3.1.0.tgz#6311778f3514a87c273510ee3f809cc3fe161e6f"

From b12118eae978258187d53b88b2aaba3ac069a9ab Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 17 Apr 2019 16:44:43 -0400
Subject: [PATCH 1343/1703] refactor(@angular/cli): remove unused npm install
 task type

---
 packages/angular/cli/tasks/npm-install.ts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/angular/cli/tasks/npm-install.ts b/packages/angular/cli/tasks/npm-install.ts
index b14df7b5481a..aae5eb68fcad 100644
--- a/packages/angular/cli/tasks/npm-install.ts
+++ b/packages/angular/cli/tasks/npm-install.ts
@@ -9,13 +9,6 @@
 import { logging, terminal } from '@angular-devkit/core';
 import { spawn } from 'child_process';
 
-
-export type NpmInstall = (packageName: string,
-                          logger: logging.Logger,
-                          packageManager: string,
-                          projectRoot: string,
-                          save?: boolean) => Promise<void>;
-
 export default async function (packageName: string,
                                logger: logging.Logger,
                                packageManager: string,

From b7fc6125e536c9a94250b901ed925a6cb92dae76 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 18 Apr 2019 13:55:59 -0400
Subject: [PATCH 1344/1703] fix(@angular/cli): improve error handling of update
 command

This adds extensive option checking and error handling with the goal to catch user errors as early in the process as possible.  Bad option combinations and/or values will result in actionable information and stop the process before network access and processing occurs.
---
 packages/angular/cli/commands/update-impl.ts  | 277 +++++++++++++++---
 packages/angular/cli/commands/update.json     |  42 +++
 packages/angular/cli/package.json             |   1 +
 .../angular/cli/utilities/package-metadata.ts |   2 +
 .../angular/cli/utilities/package-tree.ts     |  76 +++++
 yarn.lock                                     |  11 +
 6 files changed, 372 insertions(+), 37 deletions(-)
 create mode 100644 packages/angular/cli/utilities/package-tree.ts

diff --git a/packages/angular/cli/commands/update-impl.ts b/packages/angular/cli/commands/update-impl.ts
index 389ee9728c0f..5d1c418f4980 100644
--- a/packages/angular/cli/commands/update-impl.ts
+++ b/packages/angular/cli/commands/update-impl.ts
@@ -5,62 +5,265 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { normalize } from '@angular-devkit/core';
+import * as path from 'path';
+import * as semver from 'semver';
 import { Arguments, Option } from '../models/interface';
 import { SchematicCommand } from '../models/schematic-command';
 import { findUp } from '../utilities/find-up';
 import { getPackageManager } from '../utilities/package-manager';
+import {
+  PackageIdentifier,
+  PackageManifest,
+  fetchPackageMetadata,
+} from '../utilities/package-metadata';
+import { findNodeDependencies, readPackageTree } from '../utilities/package-tree';
 import { Schema as UpdateCommandSchema } from './update';
 
+const npa = require('npm-package-arg');
+
+const oldConfigFileNames = [
+  '.angular-cli.json',
+  'angular-cli.json',
+];
+
 export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
   public readonly allowMissingWorkspace = true;
 
-  collectionName = '@schematics/update';
-  schematicName = 'update';
-
-  async parseArguments(schematicOptions: string[], schema: Option[]): Promise<Arguments> {
-    const args = await super.parseArguments(schematicOptions, schema);
-    const maybeArgsLeftovers = args['--'];
-
-    if (maybeArgsLeftovers
-        && maybeArgsLeftovers.length == 1
-        && maybeArgsLeftovers[0] == '@angular/cli'
-        && args.migrateOnly === undefined
-        && args.from === undefined) {
-      // Check for a 1.7 angular-cli.json file.
-      const oldConfigFileNames = [
-        normalize('.angular-cli.json'),
-        normalize('angular-cli.json'),
-      ];
-      const oldConfigFilePath = findUp(oldConfigFileNames, process.cwd())
-                             || findUp(oldConfigFileNames, __dirname);
-
-      if (oldConfigFilePath) {
-        args.migrateOnly = true;
-        args.from = '1.0.0';
+  async parseArguments(_schematicOptions: string[], _schema: Option[]): Promise<Arguments> {
+    return {};
+  }
+
+  // tslint:disable-next-line:no-big-function
+  async run(options: UpdateCommandSchema & Arguments) {
+    const packages: PackageIdentifier[] = [];
+    for (const request of options['--'] || []) {
+      try {
+        const packageIdentifier: PackageIdentifier = npa(request);
+
+        // only registry identifiers are supported
+        if (!packageIdentifier.registry) {
+          this.logger.error(`Package '${request}' is not a registry package identifer.`);
+
+          return 1;
+        }
+
+        if (packages.some(v => v.name === packageIdentifier.name)) {
+          this.logger.error(`Duplicate package '${packageIdentifier.name}' specified.`);
+
+          return 1;
+        }
+
+        // If next option is used and no specifier supplied, use next tag
+        if (options.next && !packageIdentifier.rawSpec) {
+          packageIdentifier.fetchSpec = 'next';
+        }
+
+        packages.push(packageIdentifier);
+      } catch (e) {
+        this.logger.error(e.message);
+
+        return 1;
       }
     }
 
-    // Move `--` to packages.
-    if (args.packages == undefined && args['--']) {
-      args.packages = args['--'];
-      delete args['--'];
-    }
+    if (options.all && packages.length > 0) {
+      this.logger.error('Cannot specify packages when using the "all" option.');
 
-    return args;
-  }
+      return 1;
+    } else if (options.all && options.migrateOnly) {
+      this.logger.error('Cannot use "all" option with "migrate-only" option.');
+
+      return 1;
+    } else if (!options.migrateOnly && (options.from || options.to)) {
+      this.logger.error('Can only use "from" or "to" options with "migrate-only" option.');
+
+      return 1;
+    }
 
-  async run(options: UpdateCommandSchema & Arguments) {
     const packageManager = getPackageManager(this.workspace.root);
+    this.logger.info(`Using package manager: '${packageManager}'`);
+
+    // Special handling for Angular CLI 1.x migrations
+    if (options.migrateOnly === undefined && options.from === undefined) {
+      if (!options.all && packages.length === 1 && packages[0].name === '@angular/cli') {
+        const oldConfigFilePath = findUp(oldConfigFileNames, process.cwd());
+        if (oldConfigFilePath) {
+          options.migrateOnly = true;
+          options.from = '1.0.0';
+        }
+      }
+    }
+
+    this.logger.info('Collecting installed dependencies...');
+
+    const packageTree = await readPackageTree(this.workspace.root);
+    const rootDependencies = findNodeDependencies(packageTree);
+
+    this.logger.info(`Found ${Object.keys(rootDependencies).length} dependencies.`);
+
+    if (options.all || packages.length === 0) {
+      // Either update all packages or show status
+      return this.runSchematic({
+        collectionName: '@schematics/update',
+        schematicName: 'update',
+        dryRun: !!options.dryRun,
+        showNothingDone: false,
+        additionalOptions: {
+          force: options.force || false,
+          next: options.next || false,
+          packageManager,
+          packages: options.all ? Object.keys(rootDependencies) : [],
+        },
+      });
+    }
+
+    if (options.migrateOnly) {
+      if (!options.from) {
+        this.logger.error('"from" option is required when using the "migrate-only" option.');
+
+        return 1;
+      } else if (packages.length !== 1) {
+        this.logger.error(
+          'A single package must be specified when using the "migrate-only" option.',
+        );
+
+        return 1;
+      }
+
+      if (options.next) {
+        this.logger.warn('"next" option has no effect when using "migrate-only" option.');
+      }
+
+      const packageName = packages[0].name;
+      let packageNode = rootDependencies[packageName];
+      if (typeof packageNode === 'string') {
+        this.logger.error('Package found in package.json but is not installed.');
+
+        return 1;
+      } else if (!packageNode) {
+        // Allow running migrations on transitively installed dependencies
+        // There can technically be nested multiple versions
+        // TODO: If multiple, this should find all versions and ask which one to use
+        const child = packageTree.children.find(c => c.name === packageName);
+        if (child) {
+          // A link represents a symlinked package so use the actual in this case
+          packageNode = child.isLink ? child.target : child;
+        }
+
+        if (!packageNode) {
+          this.logger.error('Package is not installed.');
+
+          return 1;
+        }
+      }
+
+      const updateMetadata = packageNode.package['ng-update'];
+      let migrations = updateMetadata && updateMetadata.migrations;
+      if (migrations === undefined) {
+        this.logger.error('Package does not provide migrations.');
+
+        return 1;
+      } else if (typeof migrations !== 'string') {
+        this.logger.error('Package contains a malformed migrations field.');
+
+        return 1;
+      }
+
+      // if not non-relative, add package name
+      if (migrations.startsWith('.') || migrations.startsWith('/')) {
+        migrations = path.join(packageName, migrations);
+      }
+
+      return this.runSchematic({
+        collectionName: '@schematics/update',
+        schematicName: 'migrate',
+        dryRun: !!options.dryRun,
+        force: false,
+        showNothingDone: false,
+        additionalOptions: {
+          package: packageName,
+          collection: migrations,
+          from: options.from,
+          to: options.to || packageNode.package.version,
+        },
+      });
+    }
+
+    const requests: PackageIdentifier[] = [];
+
+    // Validate packages actually are part of the workspace
+    for (const pkg of packages) {
+      const node = rootDependencies[pkg.name];
+      if (!node) {
+        this.logger.error(`Package '${pkg.name}' is not a dependency.`);
+
+        return 1;
+      }
+
+      // If a specific version is requested and matches the installed version, skip.
+      if (pkg.type === 'version' &&
+         typeof node === 'object' &&
+         node.package.version === pkg.fetchSpec) {
+        this.logger.info(`Package '${pkg.name}' is already at '${pkg.fetchSpec}'.`);
+        continue;
+      }
+
+      requests.push(pkg);
+    }
+
+    if (requests.length === 0) {
+      return 0;
+    }
+
+    this.logger.info('Fetching dependency metadata from registry...');
+    for (const requestIdentifier of requests) {
+      let metadata;
+      try {
+        // Metadata requests are internally cached; multiple requests for same name
+        // does not result in additional network traffic
+        metadata = await fetchPackageMetadata(requestIdentifier.name, this.logger);
+      } catch (e) {
+        this.logger.error(`Error fetching metadata for '${requestIdentifier.name}': ` + e.message);
+
+        return 1;
+      }
+
+      // Try to find a package version based on the user requested package specifier
+      // registry specifier types are either version, range, or tag
+      let manifest: PackageManifest | undefined;
+      if (requestIdentifier.type === 'version') {
+        manifest = metadata.versions.get(requestIdentifier.fetchSpec);
+      } else if (requestIdentifier.type === 'range') {
+        const maxVersion = semver.maxSatisfying(
+          Array.from(metadata.versions.keys()),
+          requestIdentifier.fetchSpec,
+        );
+        if (maxVersion) {
+          manifest = metadata.versions.get(maxVersion);
+        }
+      } else if (requestIdentifier.type === 'tag') {
+        manifest = metadata.tags[requestIdentifier.fetchSpec];
+      }
+
+      if (!manifest) {
+        this.logger.error(
+          `Package specified by '${requestIdentifier.raw}' does not exist within the registry.`,
+        );
+
+        return 1;
+      }
+    }
 
     return this.runSchematic({
-      collectionName: this.collectionName,
-      schematicName: this.schematicName,
-      schematicOptions: options['--'],
+      collectionName: '@schematics/update',
+      schematicName: 'update',
       dryRun: !!options.dryRun,
-      force: false,
       showNothingDone: false,
-      additionalOptions: { packageManager },
+      additionalOptions: {
+        force: options.force || false,
+        packageManager,
+        packages: requests.map(p => p.toString()),
+      },
     });
   }
 }
diff --git a/packages/angular/cli/commands/update.json b/packages/angular/cli/commands/update.json
index 3ccaf012ca77..053101434194 100644
--- a/packages/angular/cli/commands/update.json
+++ b/packages/angular/cli/commands/update.json
@@ -13,6 +13,48 @@
   "allOf": [
     {
       "$ref": "./definitions.json#/definitions/base"
+    },
+    {
+      "type": "object",
+      "properties": {
+        "packages": {
+          "description": "The names of package(s) to update.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "$default": {
+            "$source": "argv"
+          }
+        },
+        "force": {
+          "description": "If false, will error out if installed packages are incompatible with the update.",
+          "default": false,
+          "type": "boolean"
+        },
+        "all": {
+          "description": "Whether to update all packages in package.json.",
+          "default": false,
+          "type": "boolean"
+        },
+        "next": {
+          "description": "Use the largest version, including beta and RCs.",
+          "default": false,
+          "type": "boolean"
+        },
+        "migrateOnly": {
+          "description": "Only perform a migration, does not update the installed version.",
+          "type": "boolean"
+        },
+        "from": {
+          "description": "Version from which to migrate from. Only available with a single package being updated, and only on migration only.",
+          "type": "string"
+        },
+        "to": {
+          "description": "Version up to which to apply migrations. Only available with a single package being updated, and only on migrations only. Requires from to be specified. Default to the installed version detected.",
+          "type": "string"
+        }
+      }
     }
   ]
 }
diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 0dffd2f4a386..edc173d9fda4 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -37,6 +37,7 @@
     "npm-package-arg": "6.1.0",
     "open": "6.3.0",
     "pacote": "9.5.0",
+    "read-package-tree": "5.2.2",
     "semver": "6.0.0",
     "symbol-observable": "1.2.0",
     "universal-analytics": "^0.4.20",
diff --git a/packages/angular/cli/utilities/package-metadata.ts b/packages/angular/cli/utilities/package-metadata.ts
index aabe530ca10f..0775c55792b7 100644
--- a/packages/angular/cli/utilities/package-metadata.ts
+++ b/packages/angular/cli/utilities/package-metadata.ts
@@ -24,6 +24,8 @@ export interface PackageIdentifier {
   scope: string | null;
   registry: boolean;
   raw: string;
+  fetchSpec: string;
+  rawSpec: string;
 }
 
 export interface PackageManifest {
diff --git a/packages/angular/cli/utilities/package-tree.ts b/packages/angular/cli/utilities/package-tree.ts
new file mode 100644
index 000000000000..3005546098eb
--- /dev/null
+++ b/packages/angular/cli/utilities/package-tree.ts
@@ -0,0 +1,76 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+export interface PackageTreeNodeBase {
+  name: string;
+  path: string;
+  realpath: string;
+  error?: Error;
+  id: number;
+  isLink: boolean;
+  package: {
+    name: string;
+    version: string;
+    dependencies?: Record<string, string>;
+    devDependencies?: Record<string, string>;
+    peerDependencies?: Record<string, string>;
+    'ng-update'?: {
+      migrations?: string;
+    };
+  };
+  children: PackageTreeNode[];
+}
+
+export interface PackageTreeActual extends PackageTreeNodeBase {
+  isLink: false;
+  parent?: PackageTreeActual;
+}
+
+export interface PackageTreeLink extends PackageTreeNodeBase {
+  isLink: true;
+  parent: null;
+  target: PackageTreeActual;
+}
+
+export type PackageTreeNode = PackageTreeActual | PackageTreeLink;
+
+export function readPackageTree(path: string): Promise<PackageTreeNode> {
+  const rpt = require('read-package-tree');
+
+  return new Promise((resolve, reject) => {
+    rpt(path, (e: Error | undefined, data: PackageTreeNode) => {
+      if (e) {
+        reject(e);
+      } else {
+        resolve(data);
+      }
+    });
+  });
+}
+
+export function findNodeDependencies(root: PackageTreeNode, node = root) {
+  const actual = node.isLink ? node.target : node;
+
+  const rawDeps: Record<string, string> = {
+    ...actual.package.dependencies,
+    ...actual.package.devDependencies,
+    ...actual.package.peerDependencies,
+  };
+
+  return Object.entries(rawDeps).reduce(
+    (deps, [name, version]) => {
+      const depNode = root.children.find(child => {
+        return child.name === name && !child.isLink && child.parent === node;
+      }) as PackageTreeActual | undefined;
+
+      deps[name] = depNode || version;
+
+      return deps;
+    },
+    {} as Record<string, string | PackageTreeActual | undefined>,
+  );
+}
diff --git a/yarn.lock b/yarn.lock
index 5b34a687ad9c..ad442ee998dc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7735,6 +7735,17 @@ read-package-json@^2.0.0:
   optionalDependencies:
     graceful-fs "^4.1.2"
 
+read-package-tree@5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.2.2.tgz#4b6a0ef2d943c1ea36a578214c9a7f6b7424f7a8"
+  integrity sha512-rW3XWUUkhdKmN2JKB4FL563YAgtINifso5KShykufR03nJ5loGFlkUMe1g/yxmqX073SoYYTsgXu7XdDinKZuA==
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    once "^1.3.0"
+    read-package-json "^2.0.0"
+    readdir-scoped-modules "^1.0.0"
+
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"

From 32457943c363b51737000b74c621e9a289908ee4 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 9 May 2019 20:31:18 -0400
Subject: [PATCH 1345/1703] fix(@schematics/update): show executing package
 during migrations

Partially addresses #14390
---
 packages/schematics/update/migrate/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/schematics/update/migrate/index.ts b/packages/schematics/update/migrate/index.ts
index 501e1b220459..4d9a371f9027 100644
--- a/packages/schematics/update/migrate/index.ts
+++ b/packages/schematics/update/migrate/index.ts
@@ -82,6 +82,8 @@ export default function(options: PostUpdateSchema): Rule {
     });
 
     if (schematicsToRun.length > 0) {
+      context.logger.info(`** Executing migrations for package '${options.package}' **`);
+
       const rules = schematicsToRun.map(x => externalSchematic(options.collection, x.name, {}));
 
       return chain(rules);

From 3abd87ab2b63587f4229dc27afb105e382075224 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 15 May 2019 19:31:06 -0400
Subject: [PATCH 1346/1703] test: update update-7.0 E2E to reflect 8.0-rc.4
 changes

Chrome 41 is no longer added to browserslist and polyfills are now removed from unmodified polyfills.ts files
---
 tests/legacy-cli/e2e/tests/basic/update-7.0.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/basic/update-7.0.ts b/tests/legacy-cli/e2e/tests/basic/update-7.0.ts
index 5a340f81b38b..c24b4e6d6d47 100644
--- a/tests/legacy-cli/e2e/tests/basic/update-7.0.ts
+++ b/tests/legacy-cli/e2e/tests/basic/update-7.0.ts
@@ -27,17 +27,15 @@ export default async function () {
     `loadChildren: () => import('./lazy/lazy.module').then(m => m.LazyModule)`);
   // Should update tsconfig and src/browserslist via differential-loading.
   await expectFileToMatch('tsconfig.json', `"target": "es2015",`);
-  await expectFileToMatch('browserslist', `\nChrome 41`);
   await expectToFail(() => expectFileToExist('e2e/browserlist'));
   // Should update the build-angular version.
   await expectFileToMatch('package.json', `"@angular-devkit/build-angular": "~0.8`);
   // Should rename codelyzer rules.
   await expectFileToMatch('tslint.json', `use-lifecycle-interface`);
   // Unnecessary es6 polyfills should be removed via drop-es6-polyfills.
-  // TODO: uncomment after https://github.com/angular/angular-cli/issues/14234 is fixed.
-  // await expectToFail(() => expectFileToMatch('src/polyfills.ts',
-  //  `import 'core-js/es6/symbol';`));
-  // await expectToFail(() => expectFileToMatch('src/polyfills.ts', `import 'core-js/es6/set';`));
+  await expectToFail(() => expectFileToMatch('src/polyfills.ts',
+   `import 'core-js/es6/symbol';`));
+  await expectToFail(() => expectFileToMatch('src/polyfills.ts', `import 'core-js/es6/set';`));
 
   // Use the packages we are building in this commit, and CI Chrome.
   await useBuiltPackages();

From c402903a3d4b6315ff694393d15101a9397d3aa5 Mon Sep 17 00:00:00 2001
From: hawkgs <hawk.dvp@gmail.com>
Date: Thu, 16 May 2019 22:12:05 +0300
Subject: [PATCH 1347/1703] refactor(@schematics/angular): optimize
 insertAfterLastOccurrence AST util

---
 packages/schematics/angular/utility/ast-utils.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/utility/ast-utils.ts b/packages/schematics/angular/utility/ast-utils.ts
index dc659003f9dc..d87e243de893 100644
--- a/packages/schematics/angular/utility/ast-utils.ts
+++ b/packages/schematics/angular/utility/ast-utils.ts
@@ -189,8 +189,12 @@ export function insertAfterLastOccurrence(nodes: ts.Node[],
                                           file: string,
                                           fallbackPos: number,
                                           syntaxKind?: ts.SyntaxKind): Change {
-  // sort() has a side effect, so make a copy so that we won't overwrite the parent's object.
-  let lastItem = [...nodes].sort(nodesByPosition).pop();
+  let lastItem: ts.Node | undefined;
+  for (const node of nodes) {
+    if (!lastItem || lastItem.getStart() < node.getStart()) {
+      lastItem = node;
+    }
+  }
   if (syntaxKind && lastItem) {
     lastItem = findNodes(lastItem, syntaxKind).sort(nodesByPosition).pop();
   }

From c81adbdad396155bacbb7e2cbe5c369466437f2a Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Thu, 16 May 2019 16:00:06 +0200
Subject: [PATCH 1348/1703] fix(@schematics/angular): polyfills migration
 leaving broken code in windows

Replacment of line endings should only happen to increase the hash matches as otherwise the recorder will fail to update the correct positions

Fixes #14443
---
 .../angular/migrations/update-8/drop-es6-polyfills.ts      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts b/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts
index 862050c1a9b5..d7442b4819c1 100644
--- a/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts
+++ b/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts
@@ -78,12 +78,11 @@ function dropES2015PolyfillsFromFile(polyfillPath: string): Rule {
       return;
     }
 
-    // normalize line endings to increase hash match chances
-    const content = source.toString().replace(/\r\n|\r/g, '\n');
-
+    const content = source.toString();
     // Check if file is unmodified, if so then replace and return
     const hash = createHash('md5');
-    hash.update(content);
+    // normalize line endings to increase hash match chances
+    hash.update(content.replace(/\r\n|\r/g, '\n'));
     const digest = hash.digest('hex');
     if (knownPolyfillHashes.includes(digest)) {
       // Replace with new project polyfills file

From 7e0e981c470c3623ef15c8a8da534e5b59bf9376 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 21 May 2019 00:26:07 +0000
Subject: [PATCH 1349/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 07d9bb288a9b..05ca1310f782 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#68605ff4f918d20c48ee4486eb7daedf01b0a1db",
-    "@angular/common": "github:angular/common-builds#f7e063a3f25a7e00643c39f0108c6e7e37022c35",
-    "@angular/compiler": "github:angular/compiler-builds#d50214e999506cc26af473222794d7e4039aaba3",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#99ca5a4d53aacc4cc7790826e88f6e2cc7e0a572",
-    "@angular/core": "github:angular/core-builds#3d70cf290a29a2de41bac50a669d10ec351f4b63",
-    "@angular/forms": "github:angular/forms-builds#dbe9a76cfd3d801210cb9865c5f3445fa3f9b6c7",
-    "@angular/language-service": "github:angular/language-service-builds#afc1b5571602728a34b6e8ad3e1f66d027d3a57e",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#e3874c090cd8cd583e43f6b23b9f3f6100791236",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#9a1b1efdf5da8c51dc8cfd234ea4565d4e3218a3",
-    "@angular/router": "github:angular/router-builds#a40918060f9c99386effd94b6a9ee31b34d333f0"
+    "@angular/animations": "github:angular/animations-builds#6efd0431bd7cb57fe6f3dafb0b9c872fbbae042c",
+    "@angular/common": "github:angular/common-builds#3c390317552b89144d9d462587b3a1d6102c4121",
+    "@angular/compiler": "github:angular/compiler-builds#3b66fd9c26948ac5c27b294c5ea0448721a48e08",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#f474d6a033c12945806d83b03d76e494acf67e3b",
+    "@angular/core": "github:angular/core-builds#cb58a94ee76e1ca88caa61780bb3284f0299e8be",
+    "@angular/forms": "github:angular/forms-builds#537a9405bb19e6fb146ffe1165be90296e0d51ae",
+    "@angular/language-service": "github:angular/language-service-builds#136bd4691aabcc22946fd8a2f6d9a60147391824",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#ea9d7a9394dbb6f88a10ceaf707fc38571892a85",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#272a0ab8d4487f01c0ead97267a41d78d70848eb",
+    "@angular/router": "github:angular/router-builds#f275be42b6f4ddac1018a6ac24a9492a9703f850"
   }
 }
\ No newline at end of file

From 4e693ef694c5dc67cb717355cf94f972e672afbc Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Thu, 16 May 2019 11:03:36 +0200
Subject: [PATCH 1350/1703] fix(@schematics/angular): update or add module and
 target to non extended tsconfig

Fixes #14436
---
 .../update-8/differential-loading.ts          | 86 ++++++++-----------
 .../update-8/differential-loading_spec.ts     | 53 ++++++++++--
 2 files changed, 81 insertions(+), 58 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-8/differential-loading.ts b/packages/schematics/angular/migrations/update-8/differential-loading.ts
index ff565c60d29d..620a34bedba2 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading.ts
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {
-  JsonAstObject,
   JsonParseMode,
   isJsonObject,
   join,
@@ -36,40 +35,10 @@ not dead
 not IE 9-11 # For IE 9-11 support, remove 'not'.`;
 
 export function updateES5Projects(): Rule {
-  return (host: Tree) => {
-    const tsConfigPath = '/tsconfig.json';
-    const compilerOptions = getCompilerOptionsAstObject(host, tsConfigPath);
-    if (!compilerOptions) {
-      return host;
-    }
-
-    const recorder = host.beginUpdate(tsConfigPath);
-    const scriptTarget = findPropertyInAstObject(compilerOptions, 'target');
-    if (!scriptTarget) {
-      insertPropertyInAstObjectInOrder(recorder, compilerOptions, 'target', 'es2015', 4);
-    } else if (scriptTarget.value !== 'es2015') {
-      const { start, end } = scriptTarget;
-      recorder.remove(start.offset, end.offset - start.offset);
-      recorder.insertLeft(start.offset, '"es2015"');
-    }
-
-    const scriptModule = findPropertyInAstObject(compilerOptions, 'module');
-    if (!scriptModule) {
-      insertPropertyInAstObjectInOrder(recorder, compilerOptions, 'module', 'esnext', 4);
-    } else if (scriptModule.value !== 'esnext') {
-      const { start, end } = scriptModule;
-      recorder.remove(start.offset, end.offset - start.offset);
-      recorder.insertLeft(start.offset, '"esnext"');
-    }
-
-    host.commitUpdate(recorder);
-
-    return updateProjects;
-  };
-}
+  return (tree: Tree) => {
+    // update workspace tsconfig
+    updateTsConfig(tree, '/tsconfig.json');
 
-function updateProjects(): Rule {
-  return (tree) => {
     const angularConfigContent = tree.read('angular.json') || tree.read('.angular.json');
 
     if (!angularConfigContent) {
@@ -106,28 +75,16 @@ function updateProjects(): Rule {
         continue;
       }
 
-      const tsConfigs = [];
       const buildOptionsConfig = architect.build.options;
       if (isJsonObject(buildOptionsConfig) && typeof buildOptionsConfig.tsConfig === 'string') {
-        tsConfigs.push(buildOptionsConfig.tsConfig);
+        updateTsConfig(tree, buildOptionsConfig.tsConfig);
       }
 
       const testConfig = architect.test;
       if (isJsonObject(testConfig)
         && isJsonObject(testConfig.options)
         && typeof testConfig.options.tsConfig === 'string') {
-        tsConfigs.push(testConfig.options.tsConfig);
-      }
-
-      for (const tsConfig of tsConfigs) {
-        const compilerOptions = getCompilerOptionsAstObject(tree, tsConfig);
-        if (!compilerOptions) {
-          continue;
-        }
-        const recorder = tree.beginUpdate(tsConfig);
-        removePropertyInAstObject(recorder, compilerOptions, 'target');
-        removePropertyInAstObject(recorder, compilerOptions, 'module');
-        tree.commitUpdate(recorder);
+        updateTsConfig(tree, testConfig.options.tsConfig);
       }
 
       const browserslistPath = join(normalize(project.root), 'browserslist');
@@ -159,8 +116,8 @@ function updateProjects(): Rule {
   };
 }
 
-function getCompilerOptionsAstObject(host: Tree, tsConfigPath: string): JsonAstObject | undefined {
-  const buffer = host.read(tsConfigPath);
+function updateTsConfig(tree: Tree, tsConfigPath: string): void {
+  const buffer = tree.read(tsConfigPath);
   if (!buffer) {
     return;
   }
@@ -171,10 +128,37 @@ function getCompilerOptionsAstObject(host: Tree, tsConfigPath: string): JsonAstO
     return;
   }
 
+  const configExtends = findPropertyInAstObject(tsCfgAst, 'extends');
+  const isExtendedConfig = configExtends && configExtends.kind === 'string';
+
   const compilerOptions = findPropertyInAstObject(tsCfgAst, 'compilerOptions');
   if (!compilerOptions || compilerOptions.kind !== 'object') {
     return;
   }
 
-  return compilerOptions;
+  const recorder = tree.beginUpdate(tsConfigPath);
+
+  if (isExtendedConfig) {
+    removePropertyInAstObject(recorder, compilerOptions, 'target');
+    removePropertyInAstObject(recorder, compilerOptions, 'module');
+  } else {
+    const scriptTarget = findPropertyInAstObject(compilerOptions, 'target');
+    if (!scriptTarget) {
+      insertPropertyInAstObjectInOrder(recorder, compilerOptions, 'target', 'es2015', 4);
+    } else if (scriptTarget.value !== 'es2015') {
+      const { start, end } = scriptTarget;
+      recorder.remove(start.offset, end.offset - start.offset);
+      recorder.insertLeft(start.offset, '"es2015"');
+    }
+    const scriptModule = findPropertyInAstObject(compilerOptions, 'module');
+    if (!scriptModule) {
+      insertPropertyInAstObjectInOrder(recorder, compilerOptions, 'module', 'esnext', 4);
+    } else if (scriptModule.value !== 'esnext') {
+      const { start, end } = scriptModule;
+      recorder.remove(start.offset, end.offset - start.offset);
+      recorder.insertLeft(start.offset, '"esnext"');
+    }
+  }
+
+  tree.commitUpdate(recorder);
 }
diff --git a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
index 92ddab277791..4dfdf6347ca5 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
@@ -93,16 +93,21 @@ describe('Migration to version 8', () => {
       expect(tree2.exists('/browserslist')).toBe(true);
     });
 
-    it(`should remove 'target' and 'module' from non workspace tsconfig.json`, () => {
+    it(`should remove 'target' and 'module' from non workspace extended tsconfig.json`, () => {
       const appTsConfig = '/tsconfig.app.json';
       const specsTsConfig = '/tsconfig.spec.json';
-      const compilerOptions = {
-        ...oldTsConfig.compilerOptions,
-        target: 'es2015',
-        module: 'es2015',
-      };
+      const tsConfig = JSON.stringify({
+        extends: '../../tsconfig.json',
+        compilerOptions: {
+          moduleResolution: 'node',
+          target: 'es2015',
+          module: 'es2015',
+        },
+      }, null, 2);
+
+      tree.overwrite(appTsConfig, tsConfig);
+      tree.overwrite(specsTsConfig, tsConfig);
 
-      tree.overwrite(appTsConfig, JSON.stringify({ compilerOptions }, null, 2));
       const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
       const { compilerOptions: appCompilerOptions } = JSON.parse(tree2.readContent(appTsConfig));
       expect(appCompilerOptions.target).toBeUndefined();
@@ -114,6 +119,40 @@ describe('Migration to version 8', () => {
       expect(specsCompilerOptions.module).toBeUndefined();
     });
 
+    it(`should update 'target' and 'module' to non workspace non-extended tsconfig.json`, () => {
+      const appTsConfig = '/tsconfig.app.json';
+      const tsConfig = JSON.stringify({
+        compilerOptions: {
+          moduleResolution: 'node',
+          target: 'es5',
+          module: 'es5',
+        },
+      }, null, 2);
+
+      tree.overwrite(appTsConfig, tsConfig);
+
+      const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
+      const { compilerOptions: appCompilerOptions } = JSON.parse(tree2.readContent(appTsConfig));
+      expect(appCompilerOptions.target).toBe('es2015');
+      expect(appCompilerOptions.module).toBe('esnext');
+    });
+
+    it(`should add 'target' and 'module' to non workspace non-extended tsconfig.json`, () => {
+      const appTsConfig = '/tsconfig.app.json';
+      const tsConfig = JSON.stringify({
+        compilerOptions: {
+          moduleResolution: 'node',
+        },
+      }, null, 2);
+
+      tree.overwrite(appTsConfig, tsConfig);
+
+      const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
+      const { compilerOptions: appCompilerOptions } = JSON.parse(tree2.readContent(appTsConfig));
+      expect(appCompilerOptions.target).toBe('es2015');
+      expect(appCompilerOptions.module).toBe('esnext');
+    });
+
     it(`should not update projects which browser builder is not 'build-angular:browser'`, () => {
       tree.delete('/browserslist');
       const config = JSON.parse(tree.readContent('angular.json'));

From ffaf76491cc43d1ad028aecee3d0d2aa6356692c Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 18 May 2019 05:25:47 +0000
Subject: [PATCH 1351/1703] build: update webpack-dev-server to version 3.4.1

---
 .../angular_devkit/build_angular/package.json |   2 +-
 yarn.lock                                     | 282 +++++++++++++++---
 2 files changed, 234 insertions(+), 50 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index aae8f27ef512..393d9ca0efc2 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -50,7 +50,7 @@
     "terser-webpack-plugin": "1.2.4",
     "webpack": "4.31.0",
     "webpack-dev-middleware": "3.7.0",
-    "webpack-dev-server": "3.3.1",
+    "webpack-dev-server": "3.4.1",
     "webpack-merge": "4.2.1",
     "webpack-sources": "1.3.0",
     "webpack-subresource-integrity": "1.1.0-rc.6",
diff --git a/yarn.lock b/yarn.lock
index ad442ee998dc..f539a2e403d6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -365,7 +365,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/glob@^7.0.0":
+"@types/glob@^7.0.0", "@types/glob@^7.1.1":
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
   integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
@@ -884,6 +884,14 @@ accepts@~1.3.4, accepts@~1.3.5:
     mime-types "~2.1.18"
     negotiator "0.6.1"
 
+accepts@~1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+  dependencies:
+    mime-types "~2.1.24"
+    negotiator "0.6.2"
+
 acorn-dynamic-import@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
@@ -1467,6 +1475,22 @@ body-parser@1.18.3, body-parser@^1.16.1:
     raw-body "2.3.3"
     type-is "~1.6.16"
 
+body-parser@1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
+  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
+  dependencies:
+    bytes "3.1.0"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.2"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    on-finished "~2.3.0"
+    qs "6.7.0"
+    raw-body "2.4.0"
+    type-is "~1.6.17"
+
 bonjour@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
@@ -1708,6 +1732,11 @@ bytes@3.0.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
   integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
+bytes@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
+
 cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0:
   version "11.2.0"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.2.0.tgz#617bdc0b02844af56310e411c0878941d5739965"
@@ -1955,10 +1984,10 @@ chokidar@^2.1.1:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chokidar@^2.1.5:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
-  integrity sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==
+chokidar@^2.1.6:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.6.tgz#b6cad653a929e244ce8a834244164d241fa954c5"
+  integrity sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.1"
@@ -2361,6 +2390,13 @@ content-disposition@0.5.2:
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
   integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
 
+content-disposition@0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
+  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+  dependencies:
+    safe-buffer "5.1.2"
+
 content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
@@ -2539,6 +2575,11 @@ cookie@0.3.1:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
   integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
 
+cookie@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
+  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+
 copy-concurrently@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
@@ -2884,10 +2925,10 @@ default-gateway@^2.6.0:
     execa "^0.10.0"
     ip-regex "^2.1.0"
 
-default-gateway@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.0.1.tgz#3a7d071ca610a2831190341bd0666382b9dbc340"
-  integrity sha512-JnSsMUgrBFy9ycs+tmOvLHN1GpILe+hNSUrIVM8mXjymfcBH9a7LJjOdoHLuUqKGuCUk6mSIPJjZ11Zszrg3oQ==
+default-gateway@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
+  integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
   dependencies:
     execa "^1.0.0"
     ip-regex "^2.1.0"
@@ -2951,11 +2992,12 @@ del@^3.0.0:
     pify "^3.0.0"
     rimraf "^2.2.8"
 
-del@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/del/-/del-4.1.0.tgz#049543b8290e1a9293e2bd150ab3a06f637322b8"
-  integrity sha512-C4kvKNlYrwXhKxz97BuohF8YoGgQ23Xm9lvoHmgT7JaPGprSEjk3+XFled74Yt/x0ZABUHg2D67covzAPUKx5Q==
+del@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4"
+  integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==
   dependencies:
+    "@types/glob" "^7.1.1"
     globby "^6.1.0"
     is-path-cwd "^2.0.0"
     is-path-in-cwd "^2.0.0"
@@ -3497,7 +3539,7 @@ expand-range@^1.8.1:
   dependencies:
     fill-range "^2.1.0"
 
-express@^4.16.2, express@^4.16.4:
+express@^4.16.2:
   version "4.16.4"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
   integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
@@ -3533,6 +3575,42 @@ express@^4.16.2, express@^4.16.4:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+express@^4.17.0:
+  version "4.17.0"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.0.tgz#288af62228a73f4c8ea2990ba3b791bb87cd4438"
+  integrity sha512-1Z7/t3Z5ZnBG252gKUPyItc4xdeaA0X934ca2ewckAsVsw9EG71i++ZHZPYnus8g/s5Bty8IMpSVEuRkmwwPRQ==
+  dependencies:
+    accepts "~1.3.7"
+    array-flatten "1.1.1"
+    body-parser "1.19.0"
+    content-disposition "0.5.3"
+    content-type "~1.0.4"
+    cookie "0.4.0"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "~1.1.2"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.5"
+    qs "6.7.0"
+    range-parser "~1.2.1"
+    safe-buffer "5.1.2"
+    send "0.17.1"
+    serve-static "1.14.1"
+    setprototypeof "1.1.1"
+    statuses "~1.5.0"
+    type-is "~1.6.18"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -3749,6 +3827,19 @@ finalhandler@1.1.1:
     statuses "~1.4.0"
     unpipe "~1.0.0"
 
+finalhandler@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    statuses "~1.5.0"
+    unpipe "~1.0.0"
+
 find-cache-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d"
@@ -4409,6 +4500,17 @@ http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
+http-errors@1.7.2, http-errors@~1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
 http-parser-js@>=0.4.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8"
@@ -4503,7 +4605,7 @@ iconv-lite@0.4.23:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -4659,12 +4761,12 @@ internal-ip@^3.0.1:
     default-gateway "^2.6.0"
     ipaddr.js "^1.5.2"
 
-internal-ip@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.2.0.tgz#46e81b638d84c338e5c67e42b1a17db67d0814fa"
-  integrity sha512-ZY8Rk+hlvFeuMmG5uH1MXhhdeMntmIaxaInvAmzMq/SHV8rv4Kh+6GiQNNDQd0wZFrcO+FiTBo8lui/osKOyJw==
+internal-ip@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
+  integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==
   dependencies:
-    default-gateway "^4.0.1"
+    default-gateway "^4.2.0"
     ipaddr.js "^1.9.0"
 
 interpret@^1.0.0:
@@ -4704,16 +4806,16 @@ ipaddr.js@1.8.0:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
   integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
 
+ipaddr.js@1.9.0, ipaddr.js@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
+  integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
+
 ipaddr.js@^1.5.2:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.1.tgz#fa4b79fa47fd3def5e3b159825161c0a519c9427"
   integrity sha1-+kt5+kf9Pe9eOxWYJRYcClGclCc=
 
-ipaddr.js@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
-  integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
-
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
@@ -6112,6 +6214,11 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
+mime-db@1.40.0:
+  version "1.40.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
+  integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
+
 "mime-db@>= 1.36.0 < 2":
   version "1.37.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
@@ -6134,12 +6241,19 @@ mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
   dependencies:
     mime-db "~1.36.0"
 
+mime-types@~2.1.24:
+  version "2.1.24"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
+  integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
+  dependencies:
+    mime-db "1.40.0"
+
 mime@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
   integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
-mime@^1.4.1:
+mime@1.6.0, mime@^1.4.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
@@ -6310,7 +6424,7 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@^2.0.0, ms@^2.1.1:
+ms@2.1.1, ms@^2.0.0, ms@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
@@ -6369,6 +6483,11 @@ negotiator@0.6.1:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
   integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
 
+negotiator@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
+
 neo-async@^2.5.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
@@ -7115,6 +7234,11 @@ parseurl@~1.3.2:
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
   integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
 
+parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
@@ -7482,6 +7606,14 @@ proxy-addr@~2.0.4:
     forwarded "~0.1.2"
     ipaddr.js "1.8.0"
 
+proxy-addr@~2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"
+  integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==
+  dependencies:
+    forwarded "~0.1.2"
+    ipaddr.js "1.9.0"
+
 proxy-from-env@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
@@ -7588,6 +7720,11 @@ qs@6.5.2, qs@~6.5.2:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
+qs@6.7.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
+
 query-string@^5.0.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
@@ -7669,7 +7806,7 @@ range-parser@^1.0.3, range-parser@^1.2.0, range-parser@~1.2.0:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
   integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
-range-parser@^1.2.1:
+range-parser@^1.2.1, range-parser@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
@@ -7684,6 +7821,16 @@ raw-body@2.3.3:
     iconv-lite "0.4.23"
     unpipe "1.0.0"
 
+raw-body@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
+  dependencies:
+    bytes "3.1.0"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
 raw-loader@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-1.0.0.tgz#3f9889e73dadbda9a424bce79809b4133ad46405"
@@ -8404,6 +8551,25 @@ send@0.16.2:
     range-parser "~1.2.0"
     statuses "~1.4.0"
 
+send@0.17.1:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
+  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
+  dependencies:
+    debug "2.6.9"
+    depd "~1.1.2"
+    destroy "~1.0.4"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "~1.7.2"
+    mime "1.6.0"
+    ms "2.1.1"
+    on-finished "~2.3.0"
+    range-parser "~1.2.1"
+    statuses "~1.5.0"
+
 serialize-javascript@^1.4.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
@@ -8437,6 +8603,16 @@ serve-static@1.13.2:
     parseurl "~1.3.2"
     send "0.16.2"
 
+serve-static@1.14.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
+  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.3"
+    send "0.17.1"
+
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -8477,6 +8653,11 @@ setprototypeof@1.1.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
   integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
+setprototypeof@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.11"
   resolved "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
@@ -9010,7 +9191,7 @@ static-module@^2.2.0:
     static-eval "^2.0.0"
     through2 "~2.0.3"
 
-"statuses@>= 1.4.0 < 2":
+"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
@@ -9444,6 +9625,11 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
+toidentifier@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
@@ -9597,6 +9783,14 @@ type-is@~1.6.16:
     media-typer "0.3.0"
     mime-types "~2.1.18"
 
+type-is@~1.6.17, type-is@~1.6.18:
+  version "1.6.18"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.24"
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -9923,7 +10117,7 @@ webpack-dev-middleware@3.4.0:
     range-parser "^1.0.3"
     webpack-log "^2.0.0"
 
-webpack-dev-middleware@3.7.0:
+webpack-dev-middleware@3.7.0, webpack-dev-middleware@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz#ef751d25f4e9a5c8a35da600c5fda3582b5c6cff"
   integrity sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==
@@ -9933,33 +10127,23 @@ webpack-dev-middleware@3.7.0:
     range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
-webpack-dev-middleware@^3.6.2:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.2.tgz#f37a27ad7c09cd7dc67cd97655413abaa1f55942"
-  integrity sha512-A47I5SX60IkHrMmZUlB0ZKSWi29TZTcPz7cha1Z75yYOsgWh/1AcPmQEbC8ZIbU3A1ytSv1PMU0PyPz2Lmz2jg==
-  dependencies:
-    memory-fs "^0.4.1"
-    mime "^2.3.1"
-    range-parser "^1.0.3"
-    webpack-log "^2.0.0"
-
-webpack-dev-server@3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.3.1.tgz#7046e49ded5c1255a82c5d942bcdda552b72a62d"
-  integrity sha512-jY09LikOyGZrxVTXK0mgIq9y2IhCoJ05848dKZqX1gAGLU1YDqgpOT71+W53JH/wI4v6ky4hm+KvSyW14JEs5A==
+webpack-dev-server@3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.4.1.tgz#a5fd8dec95dec410098e7d9a037ff9405395d51a"
+  integrity sha512-CRqZQX2ryMtrg0r3TXQPpNh76eM1HD3Wmu6zDBxIKi/d2y+4aa28Ia8weNT0bfgWpY6Vs3Oq/K8+DjfbR+tWYw==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
-    chokidar "^2.1.5"
+    chokidar "^2.1.6"
     compression "^1.7.4"
     connect-history-api-fallback "^1.6.0"
     debug "^4.1.1"
-    del "^4.1.0"
-    express "^4.16.4"
+    del "^4.1.1"
+    express "^4.17.0"
     html-entities "^1.2.1"
     http-proxy-middleware "^0.19.1"
     import-local "^2.0.0"
-    internal-ip "^4.2.0"
+    internal-ip "^4.3.0"
     ip "^1.1.5"
     killable "^1.0.1"
     loglevel "^1.6.1"
@@ -9975,7 +10159,7 @@ webpack-dev-server@3.3.1:
     strip-ansi "^3.0.1"
     supports-color "^6.1.0"
     url "^0.11.0"
-    webpack-dev-middleware "^3.6.2"
+    webpack-dev-middleware "^3.7.0"
     webpack-log "^2.0.0"
     yargs "12.0.5"
 

From a7f2346e1493b16d4047570b68de250ba4bc49f6 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 20 May 2019 14:19:30 +0200
Subject: [PATCH 1352/1703] fix(@angular-devkit/build-angular): normalize
 sourceMap options in karma webpack plugin

`sourceMap` option can be either a boolean or an object,we need to normalize it before trying to get the `script` value.

Fixes #14457
---
 .../src/angular-cli-files/plugins/karma.ts    |  3 +-
 .../e2e/tests/test/test-sourcemap.ts          | 57 ++++++++++++++-----
 2 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
index ca4958baf4a9..adbda0f12dab 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
@@ -19,6 +19,7 @@ import { getWebpackStatsConfig } from '../models/webpack-configs/stats';
 import { createConsoleLogger } from '@angular-devkit/core/node';
 import { logging } from '@angular-devkit/core';
 import { WebpackTestOptions } from '../models/build-options';
+import { normalizeSourceMaps } from '../../utils/index';
 
 /**
  * Enumerate needed (but not require/imported) dependencies from this file
@@ -78,7 +79,7 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
   }
 
   // Add a reporter that fixes sourcemap urls.
-  if (options.sourceMap.scripts) {
+  if (normalizeSourceMaps(options.sourceMap).scripts) {
     config.reporters.unshift('@angular-devkit/build-angular--sourcemap-reporter');
 
     // Code taken from https://github.com/tschaub/karma-source-map-support.
diff --git a/tests/legacy-cli/e2e/tests/test/test-sourcemap.ts b/tests/legacy-cli/e2e/tests/test/test-sourcemap.ts
index 1963cfbd7bef..7bf102e0820a 100644
--- a/tests/legacy-cli/e2e/tests/test/test-sourcemap.ts
+++ b/tests/legacy-cli/e2e/tests/test/test-sourcemap.ts
@@ -1,8 +1,14 @@
 import { writeFile } from '../../utils/fs';
-import { execAndWaitForOutputToMatch, killAllProcesses } from '../../utils/process';
+import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 
 export default async function () {
+  await writeFile('src/app/app.component.spec.ts', `
+      it('show fail', () => {
+        expect(undefined).toBeTruthy();
+      });
+    `);
+
   await updateJsonFile('angular.json', configJson => {
     const appArchitect = configJson.projects['test-project'].architect;
     appArchitect.test.options.sourceMap = {
@@ -10,20 +16,43 @@ export default async function () {
     };
   });
 
-  await writeFile('src/app/app.component.spec.ts', `
-      it('show fail', () => {
-        expect(undefined).toBeTruthy();
-      });
-    `);
+  // when sourcemaps are 'on' the stacktrace will point to the spec.ts file.
+  try {
+    await ng('test', '--watch', 'false');
+    throw new Error('ng test should have failed.');
+  } catch (error) {
+    if (!error.message.includes('app.component.spec.ts')) {
+      throw error;
+    };
+  }
 
-  // when sourcemaps are not working the stacktrace won't point to the spec.ts file.
+  await updateJsonFile('angular.json', configJson => {
+    const appArchitect = configJson.projects['test-project'].architect;
+    appArchitect.test.options.sourceMap = true;
+  });
+
+  // when sourcemaps are 'on' the stacktrace will point to the spec.ts file.
   try {
-    await execAndWaitForOutputToMatch(
-      'ng',
-      ['test', '--watch', 'false'],
-      /app\.component\.spec\.ts/,
-    );
-  } finally {
-    killAllProcesses();
+    await ng('test', '--watch', 'false');
+    throw new Error('ng test should have failed.');
+  } catch (error) {
+    if (!error.message.includes('app.component.spec.ts')) {
+      throw error;
+    };
+  }
+
+  await updateJsonFile('angular.json', configJson => {
+    const appArchitect = configJson.projects['test-project'].architect;
+    appArchitect.test.options.sourceMap = false;
+  });
+
+  // when sourcemaps are 'off' the stacktrace won't point to the spec.ts file.
+  try {
+    await ng('test', '--watch', 'false');
+    throw new Error('ng test should have failed.');
+  } catch (error) {
+    if (!error.message.includes('main.js')) {
+      throw error;
+    };
   }
 }

From e8b7cd92e5d54d0cfdfeb05c75ce056cfe96bd82 Mon Sep 17 00:00:00 2001
From: Santosh Yadav <santosh.yadav198613@gmail.com>
Date: Mon, 20 May 2019 19:30:49 +0530
Subject: [PATCH 1353/1703] fix(@schematics/angular): webworker snippet should
 not generate to module

Fixes #14467
---
 packages/schematics/angular/web-worker/index.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/web-worker/index.ts b/packages/schematics/angular/web-worker/index.ts
index 717a3741bfe4..e00db6e17b8b 100644
--- a/packages/schematics/angular/web-worker/index.ts
+++ b/packages/schematics/angular/web-worker/index.ts
@@ -63,8 +63,10 @@ function addSnippet(options: WebWorkerOptions): Rule {
     }
 
     const siblingModules = host.getDir(options.path).subfiles
-      // Find all files that start with the same name, are ts files, and aren't spec files.
-      .filter(f => f.startsWith(options.name) && f.endsWith('.ts') && !f.endsWith('spec.ts'))
+      // Find all files that start with the same name, are ts files,
+      // and aren't spec or module files.
+      .filter(f => f.startsWith(options.name) && f.endsWith('.ts')
+      && !f.endsWith('spec.ts') && !f.endsWith('-.module.ts'))
       // Sort alphabetically for consistency.
       .sort();
 

From 0d493cb2a2558b1ef6142c7a0e18ded219f1ffe8 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Tue, 21 May 2019 08:08:27 +0200
Subject: [PATCH 1354/1703] refactor: update file filtering logic for webworker
 snippet Insertion

---
 packages/schematics/angular/web-worker/index.ts      | 4 ++--
 packages/schematics/angular/web-worker/index_spec.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/angular/web-worker/index.ts b/packages/schematics/angular/web-worker/index.ts
index e00db6e17b8b..012566b1df0a 100644
--- a/packages/schematics/angular/web-worker/index.ts
+++ b/packages/schematics/angular/web-worker/index.ts
@@ -62,11 +62,11 @@ function addSnippet(options: WebWorkerOptions): Rule {
       return;
     }
 
+    const fileRegExp = new RegExp(`^${options.name}.*\.ts`);
     const siblingModules = host.getDir(options.path).subfiles
       // Find all files that start with the same name, are ts files,
       // and aren't spec or module files.
-      .filter(f => f.startsWith(options.name) && f.endsWith('.ts')
-      && !f.endsWith('spec.ts') && !f.endsWith('-.module.ts'))
+      .filter(f => fileRegExp.test(f) && !/(module|spec)\.ts$/.test(f))
       // Sort alphabetically for consistency.
       .sort();
 
diff --git a/packages/schematics/angular/web-worker/index_spec.ts b/packages/schematics/angular/web-worker/index_spec.ts
index bc68cba035d5..a8f6520189c1 100644
--- a/packages/schematics/angular/web-worker/index_spec.ts
+++ b/packages/schematics/angular/web-worker/index_spec.ts
@@ -11,7 +11,7 @@ import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { Schema as WebWorkerOptions } from './schema';
 
 
-describe('Service Worker Schematic', () => {
+describe('Web Worker Schematic', () => {
   const schematicRunner = new SchematicTestRunner(
     '@schematics/angular',
     require.resolve('../collection.json'),
@@ -35,7 +35,7 @@ describe('Service Worker Schematic', () => {
     name: 'bar',
     inlineStyle: false,
     inlineTemplate: false,
-    routing: false,
+    routing: true,
     skipTests: false,
     skipPackageJson: false,
   };

From 6d36d1b9b6af2a7065d379a373b8338ad990d0b9 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 20 May 2019 20:48:38 +0000
Subject: [PATCH 1355/1703] build: update core-js to version 3.1.1

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 393d9ca0efc2..9effea85351e 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -19,7 +19,7 @@
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.3",
-    "core-js": "3.0.1",
+    "core-js": "3.1.1",
     "file-loader": "3.0.1",
     "glob": "7.1.4",
     "istanbul-instrumenter-loader": "3.0.1",
diff --git a/yarn.lock b/yarn.lock
index f539a2e403d6..ffd1cdbdf157 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2615,10 +2615,10 @@ copy-webpack-plugin@5.0.3:
     serialize-javascript "^1.7.0"
     webpack-log "^2.0.0"
 
-core-js@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.1.tgz#1343182634298f7f38622f95e73f54e48ddf4738"
-  integrity sha512-sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew==
+core-js@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.1.tgz#502ba6e7c15300de20a372b390f9fc9039db76f2"
+  integrity sha512-OddJJmAMN6czmPEtp1ScHFWq4RXzH1iWJFGL8CZ6UcopeBzCMjo4Slv0UoLW2hhny1/wsDowm6xCmBCWQ1azkA==
 
 core-js@^2.2.0, core-js@^2.4.0:
   version "2.5.7"

From fda698a1a9ad95ec929ac19b309c7f66796bee74 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 20 May 2019 09:39:39 +0100
Subject: [PATCH 1356/1703] ci: trim the appveyor tests

Removing the `build/styles` tests because they can take a while and others are more important.

Fix #14451
---
 appveyor-e2e.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor-e2e.bat b/appveyor-e2e.bat
index b0e6fa7c4a4f..f8dc735269d8 100644
--- a/appveyor-e2e.bat
+++ b/appveyor-e2e.bat
@@ -2,7 +2,7 @@
 IF not defined APPVEYOR_PULL_REQUEST_NUMBER (
   IF not defined BUILDKITE_PULL_REQUEST (
     REM Run full test suite if not on a Appveyor/Buildkite PR.
-    node tests\legacy-cli\run_e2e.js --appveyor "--glob=tests/{basic,commands,generate,build/styles,ivy}/**"
+    node tests\legacy-cli\run_e2e.js --appveyor "--glob=tests/{basic,commands,generate,ivy}/**"
     exit
   )
 ) 

From b361a97abed0fd6589ce8fdffe29719e2bfd0dca Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Tue, 21 May 2019 07:57:22 +0200
Subject: [PATCH 1357/1703] fix(@angular-devkit/build-angular): absolute
 outputPath outputs index.html in wrong location

Fixes #14474
---
 .../build_angular/src/browser/index.ts              |  2 +-
 .../test/browser/output-path_spec_large.ts          | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 84047467c314..b5d75281ee68 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -245,7 +245,7 @@ export function buildWebpackBrowser(
 
             return writeIndexHtml({
               host,
-              outputPath: join(root, options.outputPath),
+              outputPath: resolve(root, normalize(options.outputPath)),
               indexPath: join(root, options.index),
               files,
               noModuleFiles,
diff --git a/packages/angular_devkit/build_angular/test/browser/output-path_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/output-path_spec_large.ts
index 8d55a3146cd5..53f819eae4b5 100644
--- a/packages/angular_devkit/build_angular/test/browser/output-path_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/output-path_spec_large.ts
@@ -7,8 +7,8 @@
  */
 
 import { Architect } from '@angular-devkit/architect';
-import { join, virtualFs } from '@angular-devkit/core';
-import { createArchitect, host } from '../utils';
+import { getSystemPath, join, virtualFs } from '@angular-devkit/core';
+import { browserBuild, createArchitect, host } from '../utils';
 
 
 describe('Browser Builder output path', () => {
@@ -48,4 +48,13 @@ describe('Browser Builder output path', () => {
     } catch {}
     await run.stop();
   });
+
+  it('works with absolute outputPath', async () => {
+    const overrides = {
+      outputPath: getSystemPath(join(host.root(), 'dist')),
+    };
+    const { files } = await browserBuild(architect, host, target, overrides);
+    expect('main.js' in files).toBe(true);
+    expect('index.html' in files).toBe(true);
+  });
 });

From ec731f0454988b69d443e0f444f70793100bd4d5 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@angular.io>
Date: Mon, 20 May 2019 11:27:22 -0700
Subject: [PATCH 1358/1703] docs: don't reference next.angular.io

When we cut a release, this moves to angular.io.
Use v8.angular.io in places where angular.io is currently a 404.

Fixes https://github.com/angular/angular/issues/30407
---
 docs/documentation/stories/multiple-projects.md             | 2 +-
 docs/documentation/stories/third-party-lib.md               | 2 +-
 packages/angular/cli/commands/analytics.json                | 2 +-
 packages/ngtools/webpack/src/transformers/import_factory.ts | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/documentation/stories/multiple-projects.md b/docs/documentation/stories/multiple-projects.md
index 96f2dfba45b6..79743c8b57db 100644
--- a/docs/documentation/stories/multiple-projects.md
+++ b/docs/documentation/stories/multiple-projects.md
@@ -1,4 +1,4 @@
-**Documentation below is deprecated and we no longer accept PRs to improve this. The new documentation is available [here](https://next.angular.io/guide/build)**.
+**Documentation below is deprecated and we no longer accept PRs to improve this. The new documentation is available [here](https://angular.io/guide/build)**.
 
 # Multiple Projects
 
diff --git a/docs/documentation/stories/third-party-lib.md b/docs/documentation/stories/third-party-lib.md
index 44b0addb2431..bba00af34ad2 100644
--- a/docs/documentation/stories/third-party-lib.md
+++ b/docs/documentation/stories/third-party-lib.md
@@ -1,4 +1,4 @@
-**Documentation below is deprecated and we no longer accept PRs to improve this. The new documentation is available [here](https://next.angular.io/guide/build)**.
+**Documentation below is deprecated and we no longer accept PRs to improve this. The new documentation is available [here](https://angular.io/guide/build)**.
 
 # 3rd Party Library Installation
 
diff --git a/packages/angular/cli/commands/analytics.json b/packages/angular/cli/commands/analytics.json
index 9001ef511d29..f2e17059161f 100644
--- a/packages/angular/cli/commands/analytics.json
+++ b/packages/angular/cli/commands/analytics.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/analytics.json",
-  "description": "Configures the gathering of Angular CLI usage metrics. See https://next.angular.io/cli/usage-analytics-gathering.",
+  "description": "Configures the gathering of Angular CLI usage metrics. See https://v8.angular.io/cli/usage-analytics-gathering.",
   "$longDescription": "",
 
   "$aliases": [],
diff --git a/packages/ngtools/webpack/src/transformers/import_factory.ts b/packages/ngtools/webpack/src/transformers/import_factory.ts
index c1a5b3b7a477..7637c72f00bb 100644
--- a/packages/ngtools/webpack/src/transformers/import_factory.ts
+++ b/packages/ngtools/webpack/src/transformers/import_factory.ts
@@ -66,7 +66,7 @@ loadChildren: () => import('IMPORT_STRING').then(M => M.EXPORT_NAME)
 
 Please note that only IMPORT_STRING, M, and EXPORT_NAME can be replaced in this format.
 
-Visit https://next.angular.io/guide/ivy for more information on using Ivy.
+Visit https://v8.angular.io/guide/ivy for more information on using Ivy.
 `;
 
       const emitWarning = () => warningCb(warning);

From d962d6c3bc7ae8f1d5e8a4ae590bb1e760d79843 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 20 May 2019 15:08:30 -0400
Subject: [PATCH 1359/1703] refactor(@angular/pwa): remove unneeded rxjs
 dependency

---
 packages/angular/pwa/package.json |  3 +--
 packages/angular/pwa/pwa/index.ts | 11 ++++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/packages/angular/pwa/package.json b/packages/angular/pwa/package.json
index 8e75154d06d8..a9ef0a0996b6 100644
--- a/packages/angular/pwa/package.json
+++ b/packages/angular/pwa/package.json
@@ -13,7 +13,6 @@
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
     "@schematics/angular": "0.0.0",
-    "parse5-html-rewriting-stream": "5.1.0",
-    "rxjs": "6.4.0"
+    "parse5-html-rewriting-stream": "5.1.0"
   }
 }
diff --git a/packages/angular/pwa/pwa/index.ts b/packages/angular/pwa/pwa/index.ts
index 45ce584abe6c..f4bf3a4f907c 100644
--- a/packages/angular/pwa/pwa/index.ts
+++ b/packages/angular/pwa/pwa/index.ts
@@ -15,7 +15,6 @@ import {
 } from '@angular-devkit/core';
 import {
   Rule,
-  SchematicContext,
   SchematicsException,
   Tree,
   apply,
@@ -26,7 +25,6 @@ import {
   template,
   url,
 } from '@angular-devkit/schematics';
-import { Observable } from 'rxjs';
 import { Readable, Writable } from 'stream';
 import { Schema as PwaOptions } from './schema';
 
@@ -85,7 +83,7 @@ function updateIndexFile(path: string): Rule {
       rewriter.emitEndTag(endTag);
     });
 
-    return new Observable<Tree>(obs => {
+    return new Promise<void>(resolve => {
       const input = new Readable({
         encoding: 'utf8',
         read(): void {
@@ -104,8 +102,7 @@ function updateIndexFile(path: string): Rule {
           const full = Buffer.concat(chunks);
           host.overwrite(path, full.toString());
           callback();
-          obs.next(host);
-          obs.complete();
+          resolve();
         },
       });
 
@@ -115,7 +112,7 @@ function updateIndexFile(path: string): Rule {
 }
 
 export default function (options: PwaOptions): Rule {
-  return (host: Tree, context: SchematicContext) => {
+  return (host: Tree) => {
     if (!options.title) {
       options.title = options.project;
     }
@@ -210,6 +207,6 @@ export default function (options: PwaOptions): Rule {
       mergeWith(rootTemplateSource),
       mergeWith(assetsTemplateSource),
       ...[...indexFiles].map(path => updateIndexFile(path)),
-    ])(host, context);
+    ]);
   };
 }

From 8e3efaf70b899350a9c995c844180aaaedf7388c Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Tue, 21 May 2019 08:15:03 +0200
Subject: [PATCH 1360/1703] docs: update project description to full
 application instead of app

---
 packages/angular/cli/commands/definitions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular/cli/commands/definitions.json b/packages/angular/cli/commands/definitions.json
index 7288953ef0c3..1713520fc1d1 100644
--- a/packages/angular/cli/commands/definitions.json
+++ b/packages/angular/cli/commands/definitions.json
@@ -7,7 +7,7 @@
       "properties": {
         "project": {
           "type": "string",
-          "description": "The name of the project to build. Can be an app or a library.",
+          "description": "The name of the project to build. Can be an application or a library.",
           "$default": {
             "$source": "argv",
             "index": 0

From 8f0b3eb09a3f73ff32779921ab689793f0e09671 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 20 May 2019 16:56:08 -0400
Subject: [PATCH 1361/1703] fix(@angular/cli): show error when using x18n
 command on Node.js 12.0

Node.js 12.0 contains a defect which will cause the command to crash.  This is due to the locale support in Node.js 12.0 (ICU).  ref: https://github.com/nodejs/node/issues/27379
---
 packages/angular/cli/commands/xi18n-impl.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/angular/cli/commands/xi18n-impl.ts b/packages/angular/cli/commands/xi18n-impl.ts
index 59e191dd5259..5412750138df 100644
--- a/packages/angular/cli/commands/xi18n-impl.ts
+++ b/packages/angular/cli/commands/xi18n-impl.ts
@@ -15,6 +15,15 @@ export class Xi18nCommand extends ArchitectCommand<Xi18nCommandSchema> {
   public readonly multiTarget: true;
 
   public async run(options: Xi18nCommandSchema & Arguments) {
+    const version = process.version.substr(1).split('.');
+    if (Number(version[0]) === 12 && Number(version[1]) === 0) {
+      this.logger.error(
+        'Due to a defect in Node.js 12.0, the command is not supported on this Node.js version. '
+        + 'Please upgrade to Node.js 12.1 or later.');
+
+      return 1;
+    }
+
     return this.runArchitectTarget(options);
   }
 }

From 41301918778578c664eb492d728c50ae332be181 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 21 May 2019 14:10:22 -0400
Subject: [PATCH 1362/1703] fix(@angular/cli): show analytics prompt when no
 global configuration file

Fixes #14486
---
 packages/angular/cli/models/analytics.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular/cli/models/analytics.ts b/packages/angular/cli/models/analytics.ts
index 42674a769ca0..accb98d410e1 100644
--- a/packages/angular/cli/models/analytics.ts
+++ b/packages/angular/cli/models/analytics.ts
@@ -448,7 +448,7 @@ export function hasGlobalAnalyticsConfiguration(): boolean {
       && globalWorkspace.getCli()
       && globalWorkspace.getCli()['analytics'];
 
-    if (analyticsConfig !== undefined) {
+    if (analyticsConfig !== null && analyticsConfig !== undefined) {
       return true;
     }
   } catch {}

From 57189f6eca9447ae5723a8f5d04044ee43ece94f Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 21 May 2019 16:28:49 -0400
Subject: [PATCH 1363/1703] fix(@angular/cli): standardize TTY checks

---
 packages/angular/cli/models/analytics.ts         |  5 +++--
 packages/angular/cli/models/schematic-command.ts |  3 ++-
 packages/angular/cli/utilities/tty.ts            | 15 +++++++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 packages/angular/cli/utilities/tty.ts

diff --git a/packages/angular/cli/models/analytics.ts b/packages/angular/cli/models/analytics.ts
index accb98d410e1..dec1a0567f82 100644
--- a/packages/angular/cli/models/analytics.ts
+++ b/packages/angular/cli/models/analytics.ts
@@ -14,6 +14,7 @@ import * as os from 'os';
 import * as ua from 'universal-analytics';
 import { v4 as uuidV4 } from 'uuid';
 import { getWorkspace, getWorkspaceRaw } from '../utilities/config';
+import { isTTY } from '../utilities/tty';
 
 const analyticsDebug = debug('ng:analytics');  // Generate analytics, including settings and users.
 const analyticsLogDebug = debug('ng:analytics:log');  // Actual logs of events.
@@ -359,7 +360,7 @@ export function setAnalyticsConfig(level: 'global' | 'local', value: string | bo
  */
 export async function promptGlobalAnalytics(force = false) {
   analyticsDebug('prompting global analytics.');
-  if (force || (process.stdout.isTTY && process.stdin.isTTY)) {
+  if (force || isTTY()) {
     const answers = await inquirer.prompt<{ analytics: boolean }>([
       {
         type: 'confirm',
@@ -407,7 +408,7 @@ export async function promptProjectAnalytics(force = false): Promise<boolean> {
     throw new Error(`Could not find a local workspace. Are you in a project?`);
   }
 
-  if (force || (process.stdout.isTTY && process.stdin.isTTY)) {
+  if (force || isTTY()) {
     const answers = await inquirer.prompt<{ analytics: boolean }>([
       {
         type: 'confirm',
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index 7b99766c6b05..7cbc13e807c3 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -37,6 +37,7 @@ import {
 } from '../utilities/config';
 import { parseJsonSchemaToOptions } from '../utilities/json-schema';
 import { getPackageManager } from '../utilities/package-manager';
+import { isTTY } from '../utilities/tty';
 import { isPackageNameSafeForAnalytics } from './analytics';
 import { BaseCommandOptions, Command } from './command';
 import { Arguments, CommandContext, CommandDescription, Option } from './interface';
@@ -299,7 +300,7 @@ export abstract class SchematicCommand<
       return undefined;
     });
 
-    if (options.interactive !== false && process.stdout.isTTY) {
+    if (options.interactive !== false && isTTY()) {
       workflow.registry.usePromptProvider((definitions: Array<schema.PromptDefinition>) => {
         const questions: inquirer.Questions = definitions.map(definition => {
           const question: inquirer.Question = {
diff --git a/packages/angular/cli/utilities/tty.ts b/packages/angular/cli/utilities/tty.ts
new file mode 100644
index 000000000000..1b168be93dab
--- /dev/null
+++ b/packages/angular/cli/utilities/tty.ts
@@ -0,0 +1,15 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+export function isTTY(): boolean {
+  const force = process.env['NG_FORCE_TTY'];
+  if (force !== undefined) {
+    return !(force === '0' || force.toUpperCase() === 'FALSE');
+  }
+
+  return !!process.stdout.isTTY && !!process.stdin.isTTY;
+}

From eefa0bfc3233a7b09210a4abc4a4896c157006e8 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 21 May 2019 19:20:36 -0400
Subject: [PATCH 1364/1703] test: add an E2E test for post-install analytics
 prompt

---
 .../e2e/tests/misc/ask-analytics.ts           | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 tests/legacy-cli/e2e/tests/misc/ask-analytics.ts

diff --git a/tests/legacy-cli/e2e/tests/misc/ask-analytics.ts b/tests/legacy-cli/e2e/tests/misc/ask-analytics.ts
new file mode 100644
index 000000000000..1bd61b7b1138
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/misc/ask-analytics.ts
@@ -0,0 +1,34 @@
+import { createDir, rimraf } from '../../utils/fs';
+import {
+  execWithEnv,
+  killAllProcesses,
+  waitForAnyProcessOutputToMatch,
+} from '../../utils/process';
+
+const packages = require('../../../../../lib/packages').packages;
+
+export default async function() {
+  // Create a temporary directory to install the CLI
+  await createDir('../ask-analytics');
+  const cwd = process.cwd();
+  process.chdir('../ask-analytics');
+
+  try {
+    // Install the CLI with TTY force enabled
+    const execution = execWithEnv(
+      'npm',
+      ['install', packages['@angular/cli'].tar],
+      { ...process.env, 'NG_FORCE_TTY': '1' },
+    );
+
+    // Check if the prompt is shown
+    await waitForAnyProcessOutputToMatch(/Would you like to share anonymous usage data/);
+
+  } finally {
+    killAllProcesses();
+
+    // Cleanup
+    process.chdir(cwd);
+    await rimraf('../ask-analytics');
+  }
+}

From 5639079c50edcf8d509290e802530b4aff91d480 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 22 May 2019 05:24:54 +0000
Subject: [PATCH 1365/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 05ca1310f782..9b9f543ebb26 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#6efd0431bd7cb57fe6f3dafb0b9c872fbbae042c",
-    "@angular/common": "github:angular/common-builds#3c390317552b89144d9d462587b3a1d6102c4121",
-    "@angular/compiler": "github:angular/compiler-builds#3b66fd9c26948ac5c27b294c5ea0448721a48e08",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#f474d6a033c12945806d83b03d76e494acf67e3b",
-    "@angular/core": "github:angular/core-builds#cb58a94ee76e1ca88caa61780bb3284f0299e8be",
-    "@angular/forms": "github:angular/forms-builds#537a9405bb19e6fb146ffe1165be90296e0d51ae",
-    "@angular/language-service": "github:angular/language-service-builds#136bd4691aabcc22946fd8a2f6d9a60147391824",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#ea9d7a9394dbb6f88a10ceaf707fc38571892a85",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#272a0ab8d4487f01c0ead97267a41d78d70848eb",
-    "@angular/router": "github:angular/router-builds#f275be42b6f4ddac1018a6ac24a9492a9703f850"
+    "@angular/animations": "github:angular/animations-builds#0ed0b5400ab848d83ab849b23d812dbe16323765",
+    "@angular/common": "github:angular/common-builds#04e6ed5efbb59a950cabdea38b543baebf518bb1",
+    "@angular/compiler": "github:angular/compiler-builds#fdfe604f98a68f6157d11fd489565a64af453140",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#21eb2fd3e16ac346ea8f60f0f60c27e1c5ee3405",
+    "@angular/core": "github:angular/core-builds#d1d181b62d967018aad4d626cc21bf39d0f10b5f",
+    "@angular/forms": "github:angular/forms-builds#44dfdc6df6e5249807fdd0602d5c632dd9452b1b",
+    "@angular/language-service": "github:angular/language-service-builds#8401ab002fe1125895d878980d45e1787026953b",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#2c30f9374d2133e64530a376d9bd3b93c1620fd0",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#ce048438e72f627ad035a5aff19a323e1f65e5b4",
+    "@angular/router": "github:angular/router-builds#84faa5bee6d74f5cc9c8a24c8897a6eaa8933e70"
   }
 }
\ No newline at end of file

From 8d5b735cd0e17e5e685cc57ede26517c85779f27 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 22 May 2019 05:25:15 +0000
Subject: [PATCH 1366/1703] build: update core-js to version 3.1.2

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 9effea85351e..30e1d6b446f9 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -19,7 +19,7 @@
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.3",
-    "core-js": "3.1.1",
+    "core-js": "3.1.2",
     "file-loader": "3.0.1",
     "glob": "7.1.4",
     "istanbul-instrumenter-loader": "3.0.1",
diff --git a/yarn.lock b/yarn.lock
index ffd1cdbdf157..c94ef75ae076 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2615,10 +2615,10 @@ copy-webpack-plugin@5.0.3:
     serialize-javascript "^1.7.0"
     webpack-log "^2.0.0"
 
-core-js@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.1.tgz#502ba6e7c15300de20a372b390f9fc9039db76f2"
-  integrity sha512-OddJJmAMN6czmPEtp1ScHFWq4RXzH1iWJFGL8CZ6UcopeBzCMjo4Slv0UoLW2hhny1/wsDowm6xCmBCWQ1azkA==
+core-js@3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.2.tgz#2549a2cfb3ca1a5d851c9f7838e8b282cef2f3ba"
+  integrity sha512-3poRGjbu56leCtZCZCzCgQ7GcKOflDFnjWIepaPFUsM0IXUBrne10sl3aa2Bkcz3+FjRdIxBe9dAMhIJmEnQNA==
 
 core-js@^2.2.0, core-js@^2.4.0:
   version "2.5.7"

From f651a2bd30fe812954dee6cc1fb2cc2e385a1bfd Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 22 May 2019 08:05:28 +0000
Subject: [PATCH 1367/1703] build: update webpack to version 4.32.1

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 packages/angular_devkit/build_webpack/package.json | 2 +-
 packages/ngtools/webpack/package.json              | 2 +-
 yarn.lock                                          | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 30e1d6b446f9..30449b08dfba 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -48,7 +48,7 @@
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.2.4",
-    "webpack": "4.31.0",
+    "webpack": "4.32.1",
     "webpack-dev-middleware": "3.7.0",
     "webpack-dev-server": "3.4.1",
     "webpack-merge": "4.2.1",
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index 9a08c04b61f6..0fecddb08771 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -17,7 +17,7 @@
     "webpack-dev-server": "^3.1.4"
   },
   "devDependencies": {
-    "webpack": "4.31.0",
+    "webpack": "4.32.1",
     "webpack-dev-server": "^3.1.4"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 33cd4c2ce6ec..099168b6a101 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -36,6 +36,6 @@
     "@angular/compiler": "^8.0.0-beta.14",
     "@angular/compiler-cli": "^8.0.0-beta.14",
     "typescript": "3.4.5",
-    "webpack": "4.31.0"
+    "webpack": "4.32.1"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index c94ef75ae076..3e5e9ff7df03 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10227,10 +10227,10 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.31.0:
-  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.31.0.tgz#ae201d45f0571336e42d1c2b5c8ab56c4d3b0c63"
-  integrity sha512-n6RVO3X0LbbipoE62akME9K/JI7qYrwwufs20VvgNNpqUoH4860KkaxJTbGq5bgkVZF9FqyyTG/0WPLH3PVNJA==
+webpack@4.32.1:
+  version "4.32.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.32.1.tgz#afe0cc7dd2b196e5a58f8d1d385311cfbb5d68c0"
+  integrity sha512-R0S2tfWP2tZ8ZC2dwgnUVfa9LPvhGWJXjqfgIQ6jply+9ncBbt8IZ9p83uVeqsZ/s8zKA3XyepciWNHnSxxnHg==
   dependencies:
     "@webassemblyjs/ast" "1.8.5"
     "@webassemblyjs/helper-module-context" "1.8.5"

From 258dfc281e4db2369044d39b1b877145b4a9c130 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Sun, 19 May 2019 11:50:40 -0400
Subject: [PATCH 1368/1703] fix(@ngtools/webpack): downlevel constructor
 parameter type information

The TypeScript `emitDecoratorMetadata` option does not support forward references of ES2015 classes due to the TypeScript compiler transforming the metadata into a direct reference of the yet to be defined class.  This results in a runtime TDZ error.  This is a known limitation of the `emitDecoratorMetadata` option.
The change in the PR removes the need for the option by storing the information in a static property function via the use of the tsickle `ctorParameters` transformation.  By leveraging the existing functionality, no changes to the framework code is necessary.  Also, minimal new code is required within the CLI, as the relevant tsickle code can be extracted and used with several local modifications.
---
 .../webpack/src/angular_compiler_plugin.ts    |   4 +
 .../src/transformers/ctor-parameters.ts       | 377 ++++++++++++++++++
 .../e2e/tests/misc/forwardref-es2105.ts       |  46 +++
 3 files changed, 427 insertions(+)
 create mode 100644 packages/ngtools/webpack/src/transformers/ctor-parameters.ts
 create mode 100644 tests/legacy-cli/e2e/tests/misc/forwardref-es2105.ts

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index d94bb047e2c7..cf7087d2579a 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -60,6 +60,7 @@ import {
   replaceServerBootstrap,
 } from './transformers';
 import { collectDeepNodes } from './transformers/ast_helpers';
+import { downlevelConstructorParameters } from './transformers/ctor-parameters';
 import {
   AUTO_START_ARG,
 } from './type_checker';
@@ -922,6 +923,9 @@ export class AngularCompilerPlugin {
       // Replace resources in JIT.
       this._transformers.push(
         replaceResources(isAppPath, getTypeChecker, this._options.directTemplateLoading));
+      // Downlevel constructor parameters for DI support
+      // This is required to support forwardRef in ES2015 due to TDZ issues
+      this._transformers.push(downlevelConstructorParameters(getTypeChecker));
     } else {
       // Remove unneeded angular decorators.
       this._transformers.push(removeDecorators(isAppPath, getTypeChecker));
diff --git a/packages/ngtools/webpack/src/transformers/ctor-parameters.ts b/packages/ngtools/webpack/src/transformers/ctor-parameters.ts
new file mode 100644
index 000000000000..b43f9e40ddec
--- /dev/null
+++ b/packages/ngtools/webpack/src/transformers/ctor-parameters.ts
@@ -0,0 +1,377 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import * as ts from 'typescript';
+
+export function downlevelConstructorParameters(
+  getTypeChecker: () => ts.TypeChecker,
+): ts.TransformerFactory<ts.SourceFile> {
+  return (context: ts.TransformationContext) => {
+    const transformer = decoratorDownlevelTransformer(getTypeChecker(), []);
+
+    return transformer(context);
+  };
+}
+
+// The following is sourced from tsickle with local modifications
+// Only the creation of `ctorParameters` is retained
+// tslint:disable-next-line:max-line-length
+// https://github.com/angular/tsickle/blob/0ceb7d6bc47f6945a6c4c09689f1388eb48f5c07/src/decorator_downlevel_transformer.ts
+//
+
+/**
+ * Extracts the type of the decorator (the function or expression invoked), as well as all the
+ * arguments passed to the decorator. Returns an AST with the form:
+ *
+ *     // For @decorator(arg1, arg2)
+ *     { type: decorator, args: [arg1, arg2] }
+ */
+function extractMetadataFromSingleDecorator(
+  decorator: ts.Decorator,
+  diagnostics: ts.Diagnostic[],
+): ts.ObjectLiteralExpression {
+  const metadataProperties: ts.ObjectLiteralElementLike[] = [];
+  const expr = decorator.expression;
+  switch (expr.kind) {
+    case ts.SyntaxKind.Identifier:
+      // The decorator was a plain @Foo.
+      metadataProperties.push(ts.createPropertyAssignment('type', expr));
+      break;
+    case ts.SyntaxKind.CallExpression:
+      // The decorator was a call, like @Foo(bar).
+      const call = expr as ts.CallExpression;
+      metadataProperties.push(ts.createPropertyAssignment('type', call.expression));
+      if (call.arguments.length) {
+        const args: ts.Expression[] = [];
+        for (const arg of call.arguments) {
+          args.push(arg);
+        }
+        const argsArrayLiteral = ts.createArrayLiteral(args);
+        argsArrayLiteral.elements.hasTrailingComma = true;
+        metadataProperties.push(ts.createPropertyAssignment('args', argsArrayLiteral));
+      }
+      break;
+    default:
+      diagnostics.push({
+        file: decorator.getSourceFile(),
+        start: decorator.getStart(),
+        length: decorator.getEnd() - decorator.getStart(),
+        messageText: `${
+          ts.SyntaxKind[decorator.kind]
+        } not implemented in gathering decorator metadata`,
+        category: ts.DiagnosticCategory.Error,
+        code: 0,
+      });
+      break;
+  }
+
+  return ts.createObjectLiteral(metadataProperties);
+}
+
+/**
+ * createCtorParametersClassProperty creates a static 'ctorParameters' property containing
+ * downleveled decorator information.
+ *
+ * The property contains an arrow function that returns an array of object literals of the shape:
+ *     static ctorParameters = () => [{
+ *       type: SomeClass|undefined,  // the type of the param that's decorated, if it's a value.
+ *       decorators: [{
+ *         type: DecoratorFn,  // the type of the decorator that's invoked.
+ *         args: [ARGS],       // the arguments passed to the decorator.
+ *       }]
+ *     }];
+ */
+function createCtorParametersClassProperty(
+  diagnostics: ts.Diagnostic[],
+  entityNameToExpression: (n: ts.EntityName) => ts.Expression | undefined,
+  ctorParameters: ParameterDecorationInfo[],
+): ts.PropertyDeclaration {
+  const params: ts.Expression[] = [];
+
+  for (const ctorParam of ctorParameters) {
+    if (!ctorParam.type && ctorParam.decorators.length === 0) {
+      params.push(ts.createNull());
+      continue;
+    }
+
+    const paramType = ctorParam.type
+      ? typeReferenceToExpression(entityNameToExpression, ctorParam.type)
+      : undefined;
+    const members = [
+      ts.createPropertyAssignment('type', paramType || ts.createIdentifier('undefined')),
+    ];
+
+    const decorators: ts.ObjectLiteralExpression[] = [];
+    for (const deco of ctorParam.decorators) {
+      decorators.push(extractMetadataFromSingleDecorator(deco, diagnostics));
+    }
+    if (decorators.length) {
+      members.push(ts.createPropertyAssignment('decorators', ts.createArrayLiteral(decorators)));
+    }
+    params.push(ts.createObjectLiteral(members));
+  }
+
+  const initializer = ts.createArrowFunction(
+    undefined,
+    undefined,
+    [],
+    undefined,
+    ts.createToken(ts.SyntaxKind.EqualsGreaterThanToken),
+    ts.createArrayLiteral(params, true),
+  );
+
+  const ctorProp = ts.createProperty(
+    undefined,
+    [ts.createToken(ts.SyntaxKind.StaticKeyword)],
+    'ctorParameters',
+    undefined,
+    undefined,
+    initializer,
+  );
+
+  return ctorProp;
+}
+
+/**
+ * Returns an expression representing the (potentially) value part for the given node.
+ *
+ * This is a partial re-implementation of TypeScript's serializeTypeReferenceNode. This is a
+ * workaround for https://github.com/Microsoft/TypeScript/issues/17516 (serializeTypeReferenceNode
+ * not being exposed). In practice this implementation is sufficient for Angular's use of type
+ * metadata.
+ */
+function typeReferenceToExpression(
+  entityNameToExpression: (n: ts.EntityName) => ts.Expression | undefined,
+  node: ts.TypeNode,
+): ts.Expression | undefined {
+  let kind = node.kind;
+  if (ts.isLiteralTypeNode(node)) {
+    // Treat literal types like their base type (boolean, string, number).
+    kind = node.literal.kind;
+  }
+  switch (kind) {
+    case ts.SyntaxKind.FunctionType:
+    case ts.SyntaxKind.ConstructorType:
+      return ts.createIdentifier('Function');
+    case ts.SyntaxKind.ArrayType:
+    case ts.SyntaxKind.TupleType:
+      return ts.createIdentifier('Array');
+    case ts.SyntaxKind.TypePredicate:
+    case ts.SyntaxKind.TrueKeyword:
+    case ts.SyntaxKind.FalseKeyword:
+    case ts.SyntaxKind.BooleanKeyword:
+      return ts.createIdentifier('Boolean');
+    case ts.SyntaxKind.StringLiteral:
+    case ts.SyntaxKind.StringKeyword:
+      return ts.createIdentifier('String');
+    case ts.SyntaxKind.ObjectKeyword:
+      return ts.createIdentifier('Object');
+    case ts.SyntaxKind.NumberKeyword:
+    case ts.SyntaxKind.NumericLiteral:
+      return ts.createIdentifier('Number');
+    case ts.SyntaxKind.TypeReference:
+      const typeRef = node as ts.TypeReferenceNode;
+
+      // Ignore any generic types, just return the base type.
+      return entityNameToExpression(typeRef.typeName);
+    default:
+      return undefined;
+  }
+}
+
+/** ParameterDecorationInfo describes the information for a single constructor parameter. */
+interface ParameterDecorationInfo {
+  /**
+   * The type declaration for the parameter. Only set if the type is a value (e.g. a class, not an
+   * interface).
+   */
+  type: ts.TypeNode | null;
+  /** The list of decorators found on the parameter, null if none. */
+  decorators: ts.Decorator[];
+}
+
+/**
+ * Transformer factory for the decorator downlevel transformer. See fileoverview for details.
+ */
+export function decoratorDownlevelTransformer(
+  typeChecker: ts.TypeChecker,
+  diagnostics: ts.Diagnostic[],
+): (context: ts.TransformationContext) => ts.Transformer<ts.SourceFile> {
+  return (context: ts.TransformationContext) => {
+    /** A map from symbols to the identifier of an import, reset per SourceFile. */
+    let importNamesBySymbol = new Map<ts.Symbol, ts.Identifier>();
+
+    /**
+     * Converts an EntityName (from a type annotation) to an expression (accessing a value).
+     *
+     * For a given ts.EntityName, this walks depth first to find the leftmost ts.Identifier, then
+     * converts the path into property accesses.
+     *
+     * This generally works, but TypeScript's emit pipeline does not serialize identifiers that are
+     * only used in a type location (such as identifiers in a TypeNode), even if the identifier
+     * itself points to a value (e.g. a class). To avoid that problem, this method finds the symbol
+     * representing the identifier (using typeChecker), then looks up where it was imported (using
+     * importNamesBySymbol), and then uses the imported name instead of the identifier from the type
+     * expression, if any. Otherwise it'll use the identifier unchanged. This makes sure the
+     * identifier is not marked as stemming from a "type only" expression, causing it to be emitted
+     * and causing the import to be retained.
+     */
+    function entityNameToExpression(name: ts.EntityName): ts.Expression | undefined {
+      const sym = typeChecker.getSymbolAtLocation(name);
+      if (!sym) {
+        return undefined;
+      }
+      // Check if the entity name references a symbol that is an actual value. If it is not, it
+      // cannot be referenced by an expression, so return undefined.
+      let symToCheck = sym;
+      if (symToCheck.flags & ts.SymbolFlags.Alias) {
+        symToCheck = typeChecker.getAliasedSymbol(symToCheck);
+      }
+      if (!(symToCheck.flags & ts.SymbolFlags.Value)) {
+        return undefined;
+      }
+
+      if (ts.isIdentifier(name)) {
+        // If there's a known import name for this symbol, use it so that the import will be
+        // retained and the value can be referenced.
+        const value = importNamesBySymbol.get(sym);
+        if (value) {
+          return value;
+        }
+
+        // Otherwise this will be a locally declared name, just return that.
+        return name;
+      }
+      const ref = entityNameToExpression(name.left);
+      if (!ref) {
+        return undefined;
+      }
+
+      return ts.createPropertyAccess(ref, name.right);
+    }
+
+    /**
+     * Transforms a constructor. Returns the transformed constructor and the list of parameter
+     * information collected, consisting of decorators and optional type.
+     */
+    function transformConstructor(
+      ctor: ts.ConstructorDeclaration,
+    ): [ts.ConstructorDeclaration, ParameterDecorationInfo[]] {
+      ctor = ts.visitEachChild(ctor, visitor, context);
+
+      const parametersInfo: ParameterDecorationInfo[] = [];
+      for (const param of ctor.parameters) {
+        const paramInfo: ParameterDecorationInfo = { decorators: [], type: null };
+
+        for (const decorator of param.decorators || []) {
+          paramInfo.decorators.push(decorator);
+        }
+        if (param.type) {
+          // param has a type provided, e.g. "foo: Bar".
+          // The type will be emitted as a value expression in entityNameToExpression, which takes
+          // care not to emit anything for types that cannot be expressed as a value (e.g.
+          // interfaces).
+          paramInfo.type = param.type;
+        }
+        parametersInfo.push(paramInfo);
+      }
+
+      return [ctor, parametersInfo];
+    }
+
+    /**
+     * Transforms a single class declaration:
+     * - creates a ctorParameters property
+     */
+    function transformClassDeclaration(classDecl: ts.ClassDeclaration): ts.ClassDeclaration {
+      if (!classDecl.decorators || classDecl.decorators.length === 0) {
+        return classDecl;
+      }
+
+      const newMembers: ts.ClassElement[] = [];
+      let classParameters: ParameterDecorationInfo[] | null = null;
+
+      for (const member of classDecl.members) {
+        switch (member.kind) {
+          case ts.SyntaxKind.Constructor: {
+            const ctor = member as ts.ConstructorDeclaration;
+            if (!ctor.body) {
+              break;
+            }
+
+            const [newMember, parametersInfo] = transformConstructor(
+              member as ts.ConstructorDeclaration,
+            );
+            classParameters = parametersInfo;
+            newMembers.push(newMember);
+            continue;
+          }
+          default:
+            break;
+        }
+        newMembers.push(ts.visitEachChild(member, visitor, context));
+      }
+
+      const newClassDeclaration = ts.getMutableClone(classDecl);
+
+      if (classParameters) {
+        newMembers.push(
+          createCtorParametersClassProperty(diagnostics, entityNameToExpression, classParameters),
+        );
+      }
+
+      newClassDeclaration.members = ts.setTextRange(
+        ts.createNodeArray(newMembers, newClassDeclaration.members.hasTrailingComma),
+        classDecl.members,
+      );
+
+      return newClassDeclaration;
+    }
+
+    function visitor(node: ts.Node): ts.Node {
+      switch (node.kind) {
+        case ts.SyntaxKind.SourceFile: {
+          importNamesBySymbol = new Map<ts.Symbol, ts.Identifier>();
+
+          return ts.visitEachChild(node, visitor, context);
+        }
+        case ts.SyntaxKind.ImportDeclaration: {
+          const impDecl = node as ts.ImportDeclaration;
+          if (impDecl.importClause) {
+            const importClause = impDecl.importClause;
+            const names = [];
+            if (importClause.name) {
+              names.push(importClause.name);
+            }
+            if (
+              importClause.namedBindings &&
+              importClause.namedBindings.kind === ts.SyntaxKind.NamedImports
+            ) {
+              const namedImports = importClause.namedBindings as ts.NamedImports;
+              names.push(...namedImports.elements.map(e => e.name));
+            }
+            for (const name of names) {
+              const sym = typeChecker.getSymbolAtLocation(name);
+              if (sym) {
+                importNamesBySymbol.set(sym, name);
+              }
+            }
+          }
+
+          return ts.visitEachChild(node, visitor, context);
+        }
+        case ts.SyntaxKind.ClassDeclaration: {
+          return transformClassDeclaration(node as ts.ClassDeclaration);
+        }
+        default:
+          return ts.visitEachChild(node, visitor, context);
+      }
+    }
+
+    return (sf: ts.SourceFile) => visitor(sf) as ts.SourceFile;
+  };
+}
diff --git a/tests/legacy-cli/e2e/tests/misc/forwardref-es2105.ts b/tests/legacy-cli/e2e/tests/misc/forwardref-es2105.ts
new file mode 100644
index 000000000000..af0e32ee5c01
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/misc/forwardref-es2105.ts
@@ -0,0 +1,46 @@
+import { appendToFile, replaceInFile, writeFile } from '../../utils/fs';
+import { ng } from '../../utils/process';
+import { expectToFail } from '../../utils/utils';
+
+export default async function() {
+  // Ensure an ES2015 build is used in test
+  await writeFile('browserslist', 'Chrome 65');
+
+  // Update the application to use a forward reference
+  await replaceInFile(
+    'src/app/app.component.ts',
+    'import { Component } from \'@angular/core\';',
+    'import { Component, Inject, Injectable, forwardRef } from \'@angular/core\';',
+  );
+  await appendToFile('src/app/app.component.ts', '\n@Injectable() export class Lock { }\n');
+  await replaceInFile(
+    'src/app/app.component.ts',
+    'export class AppComponent {',
+    'export class AppComponent {\n  constructor(@Inject(forwardRef(() => Lock)) lock: Lock) {}',
+  );
+
+  // Update the application's unit tests to include the new injectable
+  await replaceInFile(
+    'src/app/app.component.spec.ts',
+    'import { AppComponent } from \'./app.component\';',
+    'import { AppComponent, Lock } from \'./app.component\';',
+  );
+  await replaceInFile(
+    'src/app/app.component.spec.ts',
+    'TestBed.configureTestingModule({',
+    'TestBed.configureTestingModule({ providers: [Lock],',
+  );
+
+  // Execute the application's tests with emitDecoratorMetadata disabled (default)
+  await ng('test', '--no-watch');
+
+  // Turn on emitDecoratorMetadata
+  await replaceInFile(
+    'tsconfig.json',
+    '"experimentalDecorators": true',
+    '"experimentalDecorators": true, "emitDecoratorMetadata": true',
+  );
+
+  // Execute the application's tests with emitDecoratorMetadata enabled
+  await expectToFail(() => ng('test', '--no-watch'));
+}

From 6b28d3ac51f226f6f7fc6065de9d5f2db72302d1 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 20 May 2019 20:11:04 -0400
Subject: [PATCH 1369/1703] fix(@schematics/angular): remove
 `emitDecoratorMetadata` TS option for new applications

---
 .../schematics/angular/library/files/tsconfig.lib.json.template  | 1 +
 .../schematics/angular/workspace/files/tsconfig.json.template    | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/library/files/tsconfig.lib.json.template b/packages/schematics/angular/library/files/tsconfig.lib.json.template
index 730ff84bbeaf..30e37f49ec97 100644
--- a/packages/schematics/angular/library/files/tsconfig.lib.json.template
+++ b/packages/schematics/angular/library/files/tsconfig.lib.json.template
@@ -3,6 +3,7 @@
   "compilerOptions": {
     "outDir": "<%= relativePathToWorkspaceRoot %>/out-tsc/lib",
     "target": "es2015",
+    "emitDecoratorMetadata": true,
     "declaration": true,
     "inlineSources": true,
     "types": [],
diff --git a/packages/schematics/angular/workspace/files/tsconfig.json.template b/packages/schematics/angular/workspace/files/tsconfig.json.template
index 6ec9ceb17451..1e35a04fa981 100644
--- a/packages/schematics/angular/workspace/files/tsconfig.json.template
+++ b/packages/schematics/angular/workspace/files/tsconfig.json.template
@@ -7,7 +7,6 @@
     "declaration": false,
     "module": "esnext",
     "moduleResolution": "node",
-    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "importHelpers": true,
     "target": "es2015",

From 635de55982f2d1274977dc5c32620b0d59285766 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 21 May 2019 11:31:31 -0400
Subject: [PATCH 1370/1703] fix(@schematics/angular): enable tsickle for
 library compilation

This is required to support forward references in ES2015 target code.  tsickle provides the constructor parameter downlevel logic that removes the runtime TDZ error that would otherwise be encountered.
---
 .../angular/library/files/tsconfig.lib.json.template         | 2 +-
 packages/schematics/angular/library/index.ts                 | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/angular/library/files/tsconfig.lib.json.template b/packages/schematics/angular/library/files/tsconfig.lib.json.template
index 30e37f49ec97..e40a3d9124bf 100644
--- a/packages/schematics/angular/library/files/tsconfig.lib.json.template
+++ b/packages/schematics/angular/library/files/tsconfig.lib.json.template
@@ -3,7 +3,6 @@
   "compilerOptions": {
     "outDir": "<%= relativePathToWorkspaceRoot %>/out-tsc/lib",
     "target": "es2015",
-    "emitDecoratorMetadata": true,
     "declaration": true,
     "inlineSources": true,
     "types": [],
@@ -13,6 +12,7 @@
     ]
   },
   "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
     "skipTemplateCodegen": true,
     "strictMetadataEmit": true,
     "fullTemplateTypeCheck": true,
diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index 839fb7413860..07dd260fc627 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -103,6 +103,11 @@ function addDependenciesToPackageJson() {
         name: 'ng-packagr',
         version: '^5.1.0',
       },
+      {
+        type: NodeDependencyType.Dev,
+        name: 'tsickle',
+        version: '^0.35.0',
+      },
       {
         type: NodeDependencyType.Default,
         name: 'tslib',

From b336cc7798afcb530d1843b92c039b38093ede5e Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 21 May 2019 22:58:36 -0400
Subject: [PATCH 1371/1703] fix(@angular/cli): ensure git repository is clean
 before updates

If not asking for update status then this change checks for a clean git repository before proceeding.  This allows the user to easily reset any changes from the update and avoid any developer code changes from being mixed with update changes.
---
 packages/angular/cli/commands/update-impl.ts  | 21 +++++++++++++++++++
 .../e2e/tests/misc/update-git-clean.ts        | 12 +++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 tests/legacy-cli/e2e/tests/misc/update-git-clean.ts

diff --git a/packages/angular/cli/commands/update-impl.ts b/packages/angular/cli/commands/update-impl.ts
index 5d1c418f4980..90872e5079ab 100644
--- a/packages/angular/cli/commands/update-impl.ts
+++ b/packages/angular/cli/commands/update-impl.ts
@@ -5,6 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import { execSync } from 'child_process';
 import * as path from 'path';
 import * as semver from 'semver';
 import { Arguments, Option } from '../models/interface';
@@ -80,6 +81,16 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
       return 1;
     }
 
+    // If not asking for status then check for a clean git repository.
+    // This allows the user to easily reset any changes from the update.
+    if ((packages.length !== 0 || options.all) && !this.checkCleanGit()) {
+      this.logger.error(
+        'Repository is not clean.  Please commit or stash any changes before updating.',
+      );
+
+      return 2;
+    }
+
     const packageManager = getPackageManager(this.workspace.root);
     this.logger.info(`Using package manager: '${packageManager}'`);
 
@@ -266,4 +277,14 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
       },
     });
   }
+
+  checkCleanGit() {
+    try {
+      const result = execSync('git status --porcelain', { encoding: 'utf8', stdio: 'pipe' });
+
+      return result.trim().length === 0;
+    } catch {
+      return true;
+    }
+  }
 }
diff --git a/tests/legacy-cli/e2e/tests/misc/update-git-clean.ts b/tests/legacy-cli/e2e/tests/misc/update-git-clean.ts
new file mode 100644
index 000000000000..04345b4441ec
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/misc/update-git-clean.ts
@@ -0,0 +1,12 @@
+import { appendToFile } from '../../utils/fs';
+import { ng } from '../../utils/process';
+import { expectToFail } from '../../utils/utils';
+
+export default async function() {
+  await appendToFile('src/main.ts', 'console.log(\'changed\');\n');
+
+  const { message } = await expectToFail(() => ng('update', '--all'));
+  if (!message || !message.includes('Repository is not clean.')) {
+    throw new Error('Expected unclean repository');
+  }
+}

From 2b777e446f61ae5472cbe16637bfb94668e808d6 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 21 May 2019 23:58:23 -0400
Subject: [PATCH 1372/1703] fix(@angular-devkit/core): properly replace an
 added value in workspace API

Replacing a previous added value in the same session should cause the replace operation to become an add operation with the original add operation elided.
---
 .../core/src/workspace/json/metadata.ts       |   3 +
 .../core/src/workspace/json/reader_spec.ts    | 182 ++++++++++++++++++
 2 files changed, 185 insertions(+)

diff --git a/packages/angular_devkit/core/src/workspace/json/metadata.ts b/packages/angular_devkit/core/src/workspace/json/metadata.ts
index 6d8b94d4529d..bc7d2c58bd5d 100644
--- a/packages/angular_devkit/core/src/workspace/json/metadata.ts
+++ b/packages/angular_devkit/core/src/workspace/json/metadata.ts
@@ -60,6 +60,9 @@ export class JsonWorkspaceMetadata {
       for (let i = this.changes.length - 1; i >= 0; --i) {
         const currentPath = this.changes[i].path;
         if (currentPath === path || currentPath.startsWith(path + '/')) {
+          if (op === 'replace' && currentPath === path && this.changes[i].op === 'add') {
+            op = 'add';
+          }
           this.changes.splice(i, 1);
         }
       }
diff --git a/packages/angular_devkit/core/src/workspace/json/reader_spec.ts b/packages/angular_devkit/core/src/workspace/json/reader_spec.ts
index 914e7df007d8..b5c84591dde6 100644
--- a/packages/angular_devkit/core/src/workspace/json/reader_spec.ts
+++ b/packages/angular_devkit/core/src/workspace/json/reader_spec.ts
@@ -183,6 +183,188 @@ describe('JSON WorkspaceDefinition Tracks Workspace Changes', () => {
     }
   });
 
+  it('tracks complex extension additions with Object.assign target', async () => {
+    const host = createTestHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const value = { a: 1, b: 2, c: { d: 'abc' } };
+    workspace.extensions['x-baz'] = value;
+    expect(workspace.extensions['x-baz']).toEqual({ a: 1, b: 2, c: { d: 'abc' } });
+
+    Object.assign(value, { x: 9, y: 8, z: 7 });
+    expect(workspace.extensions['x-baz'])
+      .toEqual({ a: 1, b: 2, c: { d: 'abc' }, x: 9, y: 8, z: 7 });
+
+    const metadata = getMetadata(workspace);
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(1);
+
+    const change = metadata.findChangesForPath('/x-baz')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual({ a: 1, b: 2, c: { d: 'abc' }, x: 9, y: 8, z: 7 });
+    }
+  });
+
+  it('tracks complex extension additions with Object.assign return', async () => {
+    const host = createTestHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const value = { a: 1, b: 2, c: { d: 'abc' } };
+    workspace.extensions['x-baz'] = value;
+    expect(workspace.extensions['x-baz']).toEqual({ a: 1, b: 2, c: { d: 'abc' } });
+
+    workspace.extensions['x-baz'] = Object.assign(value, { x: 9, y: 8, z: 7 });
+    expect(workspace.extensions['x-baz'])
+      .toEqual({ a: 1, b: 2, c: { d: 'abc' }, x: 9, y: 8, z: 7 });
+
+    const metadata = getMetadata(workspace);
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(1);
+
+    const change = metadata.findChangesForPath('/x-baz')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual({ a: 1, b: 2, c: { d: 'abc' }, x: 9, y: 8, z: 7 });
+    }
+  });
+
+  it('tracks complex extension additions with spread operator', async () => {
+    const host = createTestHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    const value = { a: 1, b: 2, c: { d: 'abc' } };
+    workspace.extensions['x-baz'] = value;
+    expect(workspace.extensions['x-baz']).toEqual({ a: 1, b: 2, c: { d: 'abc' } });
+
+    workspace.extensions['x-baz'] = { ...value, ...{ x: 9, y: 8 }, z: 7 };
+    expect(workspace.extensions['x-baz'])
+      .toEqual({ a: 1, b: 2, c: { d: 'abc' }, x: 9, y: 8, z: 7 });
+
+    const metadata = getMetadata(workspace);
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(1);
+
+    const change = metadata.findChangesForPath('/x-baz')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual({ a: 1, b: 2, c: { d: 'abc' }, x: 9, y: 8, z: 7 });
+    }
+  });
+
+  it('tracks modifying an existing extension object with spread operator', async () => {
+    const host = createTestHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    workspace.extensions['x-foo'] = {
+      ...workspace.extensions['x-foo'] as JsonObject,
+      ...{ x: 9, y: 8 }, z: 7 };
+    expect(workspace.extensions['x-foo'])
+      .toEqual({ is: ['good', 'great', 'awesome'], x: 9, y: 8, z: 7 });
+
+    const metadata = getMetadata(workspace);
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(1);
+
+    const change = metadata.findChangesForPath('/x-foo')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('replace');
+      expect(change.value).toEqual({ is: ['good', 'great', 'awesome'], x: 9, y: 8, z: 7 });
+    }
+  });
+
+  it('tracks modifying an existing extension object with Object.assign target', async () => {
+    const host = createTestHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    Object.assign(
+      workspace.extensions['x-foo'],
+      { x: 9, y: 8 },
+      { z: 7 },
+    );
+    expect(workspace.extensions['x-foo'])
+      .toEqual({ is: ['good', 'great', 'awesome'], x: 9, y: 8, z: 7 });
+
+    const metadata = getMetadata(workspace);
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(3);
+
+    let change = metadata.findChangesForPath('/x-foo/x')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual(9);
+    }
+
+    change = metadata.findChangesForPath('/x-foo/y')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual(8);
+    }
+
+    change = metadata.findChangesForPath('/x-foo/z')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual(7);
+    }
+  });
+
+  it('tracks modifying an existing extension object with Object.assign return', async () => {
+    const host = createTestHost(basicFile);
+
+    const workspace = await readJsonWorkspace('', host);
+
+    workspace.extensions['x-foo'] = Object.assign(
+      workspace.extensions['x-foo'],
+      { x: 9, y: 8 },
+      { z: 7 },
+    );
+    expect(workspace.extensions['x-foo'])
+      .toEqual({ is: ['good', 'great', 'awesome'], x: 9, y: 8, z: 7 });
+
+    const metadata = getMetadata(workspace);
+
+    expect(metadata.hasChanges).toBeTruthy();
+    expect(metadata.changeCount).toBe(3);
+
+    let change = metadata.findChangesForPath('/x-foo/x')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual(9);
+    }
+
+    change = metadata.findChangesForPath('/x-foo/y')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual(8);
+    }
+
+    change = metadata.findChangesForPath('/x-foo/z')[0];
+    expect(change).not.toBeUndefined();
+    if (change) {
+      expect(change.op).toBe('add');
+      expect(change.value).toEqual(7);
+    }
+  });
+
   it('tracks add and remove of an existing extension object', async () => {
     const host = createTestHost(basicFile);
 

From 22d77285e1ec01ffefdb50199fcddee1779dc8de Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Wed, 22 May 2019 14:56:56 +0200
Subject: [PATCH 1373/1703] fix(@schematics/angular): handle newline after `@`
 of a decorator

Fixes #14490
---
 packages/schematics/angular/utility/ast-utils.ts |  5 ++---
 .../schematics/angular/utility/ast-utils_spec.ts | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/packages/schematics/angular/utility/ast-utils.ts b/packages/schematics/angular/utility/ast-utils.ts
index d87e243de893..461b34ba3b62 100644
--- a/packages/schematics/angular/utility/ast-utils.ts
+++ b/packages/schematics/angular/utility/ast-utils.ts
@@ -290,8 +290,7 @@ export function getDecoratorMetadata(source: ts.SourceFile, identifier: string,
       if (expr.expression.kind == ts.SyntaxKind.Identifier) {
         const id = expr.expression as ts.Identifier;
 
-        return id.getFullText(source) == identifier
-          && angularImports[id.getFullText(source)] === module;
+        return id.text == identifier && angularImports[id.text] === module;
       } else if (expr.expression.kind == ts.SyntaxKind.PropertyAccessExpression) {
         // This covers foo.NgModule when importing * as foo.
         const paExpr = expr.expression as ts.PropertyAccessExpression;
@@ -301,7 +300,7 @@ export function getDecoratorMetadata(source: ts.SourceFile, identifier: string,
         }
 
         const id = paExpr.name.text;
-        const moduleId = (paExpr.expression as ts.Identifier).getText(source);
+        const moduleId = (paExpr.expression as ts.Identifier).text;
 
         return id === identifier && (angularImports[moduleId + '.'] === module);
       }
diff --git a/packages/schematics/angular/utility/ast-utils_spec.ts b/packages/schematics/angular/utility/ast-utils_spec.ts
index 6603d6c7fda5..54049048a169 100644
--- a/packages/schematics/angular/utility/ast-utils_spec.ts
+++ b/packages/schematics/angular/utility/ast-utils_spec.ts
@@ -169,6 +169,22 @@ describe('ast utils', () => {
     expect(output).toMatch(/imports: \[HelloWorld],\r?\n/m);
   });
 
+  it(`should handle NgModule with newline after '@'`, () => {
+    const moduleContent = `
+      import { BrowserModule } from '@angular/platform-browser';
+      import { NgModule } from '@angular/core';
+
+      @
+      NgModule({imports: [BrowserModule], declarations: []})
+      export class AppModule { }
+    `;
+    const source = getTsSource(modulePath, moduleContent);
+    const changes = addExportToModule(source, modulePath, 'FooComponent', './foo.component');
+    const output = applyChanges(modulePath, moduleContent, changes);
+    expect(output).toMatch(/import { FooComponent } from '.\/foo.component';/);
+    expect(output).toMatch(/exports: \[FooComponent\]/);
+  });
+
   it('should handle NgModule with no newlines', () => {
     const moduleContent = `
       import { BrowserModule } from '@angular/platform-browser';

From 3a400c54cbe46726628177bc6f0e90103d8623fb Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Wed, 22 May 2019 15:34:21 +0200
Subject: [PATCH 1374/1703] fix(@angular-devkit/build-angular): dev-server port
 number mismatches in logs when using `port=0`

Fixes #14499
---
 .../build_angular/src/dev-server/index.ts     |  3 +--
 .../test/dev-server/works_spec_large.ts       | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index ccdc5e23e150..f0679628691f 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -216,10 +216,9 @@ export function serveWebpackBrowser(
 
           if (first) {
             first = false;
-
             context.logger.info(tags.oneLine`
               **
-              Angular Live Development Server is listening on ${options.host}:${options.port},
+              Angular Live Development Server is listening on ${options.host}:${buildEvent.port},
               open your browser on ${serverAddress}
               **
             `);
diff --git a/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts
index bcf0630404f5..bc95fcf69746 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/works_spec_large.ts
@@ -67,4 +67,29 @@ describe('Dev Server Builder', () => {
     expect(res).not.toContain('This file is automatically generated during release.');
     expect(res).toContain('<title>HelloWorldApp</title>');
   });
+
+  it('works with port 0', async () => {
+    const logger = new logging.Logger('');
+    const logs: string[] = [];
+    logger.subscribe(e => logs.push(e.message));
+
+    const run = await architect.scheduleTarget(target, { port: 0 }, { logger });
+    runs.push(run);
+    const output = await run.result as DevServerBuilderOutput;
+    expect(output.success).toBe(true);
+
+    const groups = logs.join().match(/\:(\d+){4,6}/g);
+    if (!groups) {
+      throw new Error('Expected log to contain port number.');
+    }
+
+    // tests that both the ports in the logs are the same.
+    const [firstPort, secondPort] = groups;
+    expect(firstPort).toBe(secondPort);
+
+    expect(output.baseUrl).toBe(`http://localhost${firstPort}/`);
+    const response = await fetch(`http://localhost${firstPort}/index.html`);
+    expect(await response.text()).toContain('<title>HelloWorldApp</title>');
+  });
+
 });

From ac493cf6e368ff571a81272fcdc05a30bef1a1fe Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 23 May 2019 05:18:07 +0000
Subject: [PATCH 1375/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 9b9f543ebb26..7c36612aefe5 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#0ed0b5400ab848d83ab849b23d812dbe16323765",
-    "@angular/common": "github:angular/common-builds#04e6ed5efbb59a950cabdea38b543baebf518bb1",
-    "@angular/compiler": "github:angular/compiler-builds#fdfe604f98a68f6157d11fd489565a64af453140",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#21eb2fd3e16ac346ea8f60f0f60c27e1c5ee3405",
-    "@angular/core": "github:angular/core-builds#d1d181b62d967018aad4d626cc21bf39d0f10b5f",
-    "@angular/forms": "github:angular/forms-builds#44dfdc6df6e5249807fdd0602d5c632dd9452b1b",
-    "@angular/language-service": "github:angular/language-service-builds#8401ab002fe1125895d878980d45e1787026953b",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#2c30f9374d2133e64530a376d9bd3b93c1620fd0",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#ce048438e72f627ad035a5aff19a323e1f65e5b4",
-    "@angular/router": "github:angular/router-builds#84faa5bee6d74f5cc9c8a24c8897a6eaa8933e70"
+    "@angular/animations": "github:angular/animations-builds#421ef090faf1f49604efba0444939db11f08130c",
+    "@angular/common": "github:angular/common-builds#fdb501a03169b4af2727ecfe9cf2ea51aea29bf2",
+    "@angular/compiler": "github:angular/compiler-builds#bb7e6ece56f2f8141e61a6083512b12c2106d1df",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#ba4494fa4f4da1f90164e3b2b757e2f213c03821",
+    "@angular/core": "github:angular/core-builds#be71bbe4eb9fd3be315d5f22d6b2ffc3e3f287ce",
+    "@angular/forms": "github:angular/forms-builds#f01cff105563fd0f73ca0d0ed122d8eac4be4f94",
+    "@angular/language-service": "github:angular/language-service-builds#232a6a1fbb2beb9364a14f847d1490fce8f42fdf",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#68e5d25b0b5db2c84a1b6f12650c029cd399f583",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#35339ea39a9469a13e278e28c82a97d8d7be184c",
+    "@angular/router": "github:angular/router-builds#8938ec2932bb08040ab0b02f203155c03aab7835"
   }
 }
\ No newline at end of file

From db819cbd2c4f8d1d1bc24d40e1f2dcb5673b0f2a Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 23 May 2019 05:18:41 +0000
Subject: [PATCH 1376/1703] build: update semver to version 6.1.0

---
 package.json                                       | 2 +-
 packages/angular/cli/package.json                  | 2 +-
 packages/angular_devkit/build_angular/package.json | 2 +-
 packages/schematics/update/package.json            | 2 +-
 yarn.lock                                          | 7 ++++++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index cc49595194c2..f0fd351929a8 100644
--- a/package.json
+++ b/package.json
@@ -127,7 +127,7 @@
     "pidtree": "^0.3.0",
     "pidusage": "^2.0.17",
     "rxjs": "~6.4.0",
-    "semver": "6.0.0",
+    "semver": "6.1.0",
     "source-map": "^0.5.6",
     "source-map-support": "^0.5.0",
     "spdx-satisfies": "^4.0.0",
diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index edc173d9fda4..9c3ac1b449f4 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -38,7 +38,7 @@
     "open": "6.3.0",
     "pacote": "9.5.0",
     "read-package-tree": "5.2.2",
-    "semver": "6.0.0",
+    "semver": "6.1.0",
     "symbol-observable": "1.2.0",
     "universal-analytics": "^0.4.20",
     "uuid": "^3.3.2"
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 30449b08dfba..9b799fba1036 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -39,7 +39,7 @@
     "rxjs": "6.4.0",
     "sass": "1.20.1",
     "sass-loader": "7.1.0",
-    "semver": "6.0.0",
+    "semver": "6.1.0",
     "source-map-support": "0.5.12",
     "source-map-loader": "0.2.4",
     "speed-measure-webpack-plugin": "1.3.1",
diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index b125f377651f..2f933b51adfd 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -16,7 +16,7 @@
     "@yarnpkg/lockfile": "1.1.0",
     "ini": "1.3.5",
     "pacote": "9.5.0",
-    "semver": "6.0.0",
+    "semver": "6.1.0",
     "semver-intersect": "1.4.0",
     "rxjs": "6.4.0"
   }
diff --git a/yarn.lock b/yarn.lock
index 3e5e9ff7df03..c24eba12688e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8527,7 +8527,12 @@ semver-intersect@1.4.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
   integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
 
-semver@6.0.0, semver@^6.0.0:
+semver@6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.0.tgz#e95dc415d45ecf03f2f9f83b264a6b11f49c0cca"
+  integrity sha512-kCqEOOHoBcFs/2Ccuk4Xarm/KiWRSLEX9CAZF8xkJ6ZPlIoTZ8V5f7J16vYLJqDbR7KrxTJpR2lqjIEm2Qx9cQ==
+
+semver@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
   integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==

From 5df02a3de5257162c7b8a5e2c65d388debcd51f0 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 23 May 2019 06:19:18 +0000
Subject: [PATCH 1377/1703] build: update webpack to version 4.32.2

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 packages/angular_devkit/build_webpack/package.json | 2 +-
 packages/ngtools/webpack/package.json              | 2 +-
 yarn.lock                                          | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 9b799fba1036..11a85c4fbf31 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -48,7 +48,7 @@
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.2.4",
-    "webpack": "4.32.1",
+    "webpack": "4.32.2",
     "webpack-dev-middleware": "3.7.0",
     "webpack-dev-server": "3.4.1",
     "webpack-merge": "4.2.1",
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index 0fecddb08771..dd94afe40ce8 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -17,7 +17,7 @@
     "webpack-dev-server": "^3.1.4"
   },
   "devDependencies": {
-    "webpack": "4.32.1",
+    "webpack": "4.32.2",
     "webpack-dev-server": "^3.1.4"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 099168b6a101..3463a8c1ebf3 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -36,6 +36,6 @@
     "@angular/compiler": "^8.0.0-beta.14",
     "@angular/compiler-cli": "^8.0.0-beta.14",
     "typescript": "3.4.5",
-    "webpack": "4.32.1"
+    "webpack": "4.32.2"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index c24eba12688e..f326ec0442e8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10232,10 +10232,10 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.32.1:
-  version "4.32.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.32.1.tgz#afe0cc7dd2b196e5a58f8d1d385311cfbb5d68c0"
-  integrity sha512-R0S2tfWP2tZ8ZC2dwgnUVfa9LPvhGWJXjqfgIQ6jply+9ncBbt8IZ9p83uVeqsZ/s8zKA3XyepciWNHnSxxnHg==
+webpack@4.32.2:
+  version "4.32.2"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.32.2.tgz#3639375364a617e84b914ddb2c770aed511e5bc8"
+  integrity sha512-F+H2Aa1TprTQrpodRAWUMJn7A8MgDx82yQiNvYMaj3d1nv3HetKU0oqEulL9huj8enirKi8KvEXQ3QtuHF89Zg==
   dependencies:
     "@webassemblyjs/ast" "1.8.5"
     "@webassemblyjs/helper-module-context" "1.8.5"

From bf7c4aadbec8e6f0f1b018825d190c99a66bec65 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 25 May 2019 05:25:21 +0000
Subject: [PATCH 1378/1703] build: update terser-webpack-plugin to version
 1.3.0

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 29 ++++++++++---------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 11a85c4fbf31..5f330df89879 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -47,7 +47,7 @@
     "stylus": "0.54.5",
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
-    "terser-webpack-plugin": "1.2.4",
+    "terser-webpack-plugin": "1.3.0",
     "webpack": "4.32.2",
     "webpack-dev-middleware": "3.7.0",
     "webpack-dev-server": "3.4.1",
diff --git a/yarn.lock b/yarn.lock
index f326ec0442e8..fafa6c65dd67 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9465,18 +9465,19 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
-terser-webpack-plugin@1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.4.tgz#56f87540c28dd5265753431009388f473b5abba3"
-  integrity sha512-64IiILNQlACWZLzFlpzNaG0bpQ4ytaB7fwOsbpsdIV70AfLUmIGGeuKL0YV2WmtcrURjE2aOvHD4/lrFV3Rg+Q==
+terser-webpack-plugin@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz#69aa22426299f4b5b3775cbed8cb2c5d419aa1d4"
+  integrity sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==
   dependencies:
     cacache "^11.3.2"
     find-cache-dir "^2.0.0"
     is-wsl "^1.1.0"
+    loader-utils "^1.2.3"
     schema-utils "^1.0.0"
     serialize-javascript "^1.7.0"
     source-map "^0.6.1"
-    terser "^3.17.0"
+    terser "^4.0.0"
     webpack-sources "^1.3.0"
     worker-farm "^1.7.0"
 
@@ -9503,15 +9504,6 @@ terser@^3.16.1:
     source-map "~0.6.1"
     source-map-support "~0.5.9"
 
-terser@^3.17.0:
-  version "3.17.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2"
-  integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==
-  dependencies:
-    commander "^2.19.0"
-    source-map "~0.6.1"
-    source-map-support "~0.5.10"
-
 terser@^3.8.1:
   version "3.10.8"
   resolved "https://registry.yarnpkg.com/terser/-/terser-3.10.8.tgz#2fe3967396a10cdc3d575074fe857efd30a2895a"
@@ -9521,6 +9513,15 @@ terser@^3.8.1:
     source-map "~0.6.1"
     source-map-support "~0.5.6"
 
+terser@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.0.0.tgz#ef356f6f359a963e2cc675517f21c1c382877374"
+  integrity sha512-dOapGTU0hETFl1tCo4t56FN+2jffoKyER9qBGoUFyZ6y7WLoKT0bF+lAYi6B6YsILcGF3q1C2FBh8QcKSCgkgA==
+  dependencies:
+    commander "^2.19.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.10"
+
 text-extensions@^1.0.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.8.0.tgz#6f343c62268843019b21a616a003557bdb952d2b"

From 8110a5b27c8b721fd5d9c45c550e606a5528bb71 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Mon, 27 May 2019 07:54:25 +0200
Subject: [PATCH 1379/1703] ci: add bazel workspace file to renovate
 `packageFiles`

---
 renovate.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/renovate.json b/renovate.json
index 04db877f6a05..876bc68ab6fb 100644
--- a/renovate.json
+++ b/renovate.json
@@ -23,6 +23,7 @@
     "webpack-subresource-integrity"
   ],
   "packageFiles": [
+    "WORKSPACE",
     "package.json",
     "packages/**/package.json",
     "tests/legacy-cli/e2e/ng-snapshot/package.json"

From c1cb92ff6b5b736193864294fa0137de9abe9eb5 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 28 May 2019 05:18:01 +0000
Subject: [PATCH 1380/1703] build: update core-js to version 3.1.3

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 5f330df89879..a35c460a8afc 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -19,7 +19,7 @@
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.3",
-    "core-js": "3.1.2",
+    "core-js": "3.1.3",
     "file-loader": "3.0.1",
     "glob": "7.1.4",
     "istanbul-instrumenter-loader": "3.0.1",
diff --git a/yarn.lock b/yarn.lock
index fafa6c65dd67..aed43e323172 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2615,10 +2615,10 @@ copy-webpack-plugin@5.0.3:
     serialize-javascript "^1.7.0"
     webpack-log "^2.0.0"
 
-core-js@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.2.tgz#2549a2cfb3ca1a5d851c9f7838e8b282cef2f3ba"
-  integrity sha512-3poRGjbu56leCtZCZCzCgQ7GcKOflDFnjWIepaPFUsM0IXUBrne10sl3aa2Bkcz3+FjRdIxBe9dAMhIJmEnQNA==
+core-js@3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.3.tgz#95700bca5f248f5f78c0ec63e784eca663ec4138"
+  integrity sha512-PWZ+ZfuaKf178BIAg+CRsljwjIMRV8MY00CbZczkR6Zk5LfkSkjGoaab3+bqRQWVITNZxQB7TFYz+CFcyuamvA==
 
 core-js@^2.2.0, core-js@^2.4.0:
   version "2.5.7"

From 80c7479bbf5709eb728c46202af978d4f850bb47 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 28 May 2019 05:18:17 +0000
Subject: [PATCH 1381/1703] build: update mini-css-extract-plugin to version
 0.7.0

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 44 +++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index a35c460a8afc..5a0a1c503bee 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -28,7 +28,7 @@
     "less-loader": "5.0.0",
     "license-webpack-plugin": "2.1.1",
     "loader-utils": "1.2.3",
-    "mini-css-extract-plugin": "0.6.0",
+    "mini-css-extract-plugin": "0.7.0",
     "minimatch": "3.0.4",
     "parse5": "4.0.0",
     "open": "6.3.0",
diff --git a/yarn.lock b/yarn.lock
index aed43e323172..ba08aeb099e5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6283,13 +6283,13 @@ mimic-response@^1.0.0, mimic-response@^1.0.1:
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
   integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
 
-mini-css-extract-plugin@0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.6.0.tgz#a3f13372d6fcde912f3ee4cd039665704801e3b9"
-  integrity sha512-79q5P7YGI6rdnVyIAV4NXpBQJFWdkzJxCim3Kog4078fM0piAaFlwocqbejdWtLW1cEzCexPrh6EdyFsPgVdAw==
+mini-css-extract-plugin@0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.7.0.tgz#5ba8290fbb4179a43dd27cca444ba150bee743a0"
+  integrity sha512-RQIw6+7utTYn8DBGsf/LpRgZCJMpZt+kuawJ/fju0KiOL6nAaTBNmCJwS7HtwSCXfS47gCkmtBFS7HdsquhdxQ==
   dependencies:
     loader-utils "^1.1.0"
-    normalize-url "^2.0.1"
+    normalize-url "1.9.1"
     schema-utils "^1.0.0"
     webpack-sources "^1.1.0"
 
@@ -6659,14 +6659,15 @@ normalize-range@^0.1.2:
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
   integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
-normalize-url@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
-  integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==
+normalize-url@1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
+  integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=
   dependencies:
-    prepend-http "^2.0.0"
-    query-string "^5.0.1"
-    sort-keys "^2.0.0"
+    object-assign "^4.0.1"
+    prepend-http "^1.0.0"
+    query-string "^4.1.0"
+    sort-keys "^1.0.0"
 
 normalize-url@^3.1.0:
   version "3.3.0"
@@ -7497,7 +7498,7 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
-prepend-http@^1.0.1:
+prepend-http@^1.0.0, prepend-http@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
   integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
@@ -7725,12 +7726,11 @@ qs@6.7.0:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
   integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
-query-string@^5.0.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
-  integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==
+query-string@^4.1.0:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
+  integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s=
   dependencies:
-    decode-uri-component "^0.2.0"
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
@@ -8850,10 +8850,10 @@ socks@~2.2.0:
     ip "^1.1.5"
     smart-buffer "^4.0.1"
 
-sort-keys@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
-  integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=
+sort-keys@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
+  integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0=
   dependencies:
     is-plain-obj "^1.0.0"
 

From 9a4e2f5870e65f90eee7a406436643c51f08a777 Mon Sep 17 00:00:00 2001
From: mgechev <mgechev@gmail.com>
Date: Mon, 27 May 2019 16:58:41 +0200
Subject: [PATCH 1382/1703] fix(@schematics/angular): drop the worker alias

Fix #14525
---
 packages/schematics/angular/collection.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/collection.json b/packages/schematics/angular/collection.json
index 81a1fb045b86..75f507d8346d 100644
--- a/packages/schematics/angular/collection.json
+++ b/packages/schematics/angular/collection.json
@@ -102,7 +102,7 @@
       "description": "Generate a library project for Angular."
     },
     "webWorker": {
-      "aliases": ["web-worker", "worker"],
+      "aliases": ["web-worker"],
       "factory": "./web-worker",
       "schema": "./web-worker/schema.json",
       "description": "Create a Web Worker."

From db344641f428105c007cf1a45c41673ecdf240bf Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 28 May 2019 18:03:28 +0200
Subject: [PATCH 1383/1703] fix(@angular/cli): ng generate --help shows the
 wrong collection

At the moment, collectionName and schematicCollections are not set in various schematics command which result in fallbacking to the hardcoded default collectionName https://github.com/angular/angular-cli/blob/master/packages/angular/cli/models/schematic-command.ts#L79

Hence, this will result in incorrect information being present when using the `--help`, `--list`.

Fixes #14519
---
 .../angular/cli/commands/generate-impl.ts     | 15 +++++-----
 packages/angular/cli/commands/new-impl.ts     | 13 +++++----
 .../angular/cli/models/schematic-command.ts   |  8 ++---
 .../e2e/tests/generate/help-output.ts         | 29 ++++++++++++++++++-
 4 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/packages/angular/cli/commands/generate-impl.ts b/packages/angular/cli/commands/generate-impl.ts
index 3ae839ce5590..cfaf096f01b9 100644
--- a/packages/angular/cli/commands/generate-impl.ts
+++ b/packages/angular/cli/commands/generate-impl.ts
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-// tslint:disable:no-global-tslint-disable no-any
 import { terminal } from '@angular-devkit/core';
 import { Arguments, SubCommandDescription } from '../models/interface';
 import { SchematicCommand } from '../models/schematic-command';
@@ -18,10 +17,12 @@ export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
   longSchematicName: string|undefined;
 
   async initialize(options: GenerateCommandSchema & Arguments) {
-    await super.initialize(options);
-
     // Fill up the schematics property of the command description.
     const [collectionName, schematicName] = this.parseSchematicInfo(options);
+    this.collectionName = collectionName;
+    this.schematicName = schematicName;
+
+    await super.initialize(options);
 
     const collection = this.getCollection(collectionName);
     const subcommands: { [name: string]: SubCommandDescription } = {};
@@ -60,15 +61,13 @@ export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
   }
 
   public async run(options: GenerateCommandSchema & Arguments) {
-    const [collectionName, schematicName] = this.parseSchematicInfo(options);
-
-    if (!schematicName || !collectionName) {
+    if (!this.schematicName || !this.collectionName) {
       return this.printHelp(options);
     }
 
     return this.runSchematic({
-      collectionName,
-      schematicName,
+      collectionName: this.collectionName,
+      schematicName: this.schematicName,
       schematicOptions: options['--'] || [],
       debug: !!options.debug || false,
       dryRun: !!options.dryRun || false,
diff --git a/packages/angular/cli/commands/new-impl.ts b/packages/angular/cli/commands/new-impl.ts
index 10f5d6cee1d6..1b1761680088 100644
--- a/packages/angular/cli/commands/new-impl.ts
+++ b/packages/angular/cli/commands/new-impl.ts
@@ -16,14 +16,17 @@ export class NewCommand extends SchematicCommand<NewCommandSchema> {
   public readonly allowMissingWorkspace = true;
   schematicName = 'ng-new';
 
-  public async run(options: NewCommandSchema & Arguments) {
-    let collectionName: string;
+  async initialize(options: NewCommandSchema & Arguments) {
     if (options.collection) {
-      collectionName = options.collection;
+      this.collectionName = options.collection;
     } else {
-      collectionName = this.parseCollectionName(options);
+      this.collectionName = this.parseCollectionName(options);
     }
 
+    return super.initialize(options);
+  }
+
+  public async run(options: NewCommandSchema & Arguments) {
     // Register the version of the CLI in the registry.
     const packageJson = require('../package.json');
     const version = packageJson.version;
@@ -31,7 +34,7 @@ export class NewCommand extends SchematicCommand<NewCommandSchema> {
     this._workflow.registry.addSmartDefaultProvider('ng-cli-version', () => version);
 
     return this.runSchematic({
-      collectionName: collectionName,
+      collectionName: this.collectionName,
       schematicName: this.schematicName,
       schematicOptions: options['--'] || [],
       debug: !!options.debug,
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index 7cbc13e807c3..872b16534824 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {
-  analytics,
   experimental,
   json,
   logging,
@@ -76,7 +75,8 @@ export abstract class SchematicCommand<
   private _workspace: experimental.workspace.Workspace;
   protected _workflow: NodeWorkflow;
 
-  protected collectionName = '@schematics/angular';
+  private readonly defaultCollectionName = '@schematics/angular';
+  protected collectionName = this.defaultCollectionName;
   protected schematicName?: string;
 
   constructor(
@@ -373,7 +373,7 @@ export abstract class SchematicCommand<
       }
     }
 
-    return this.collectionName;
+    return this.defaultCollectionName;
   }
 
   protected async runSchematic(options: RunSchematicOptions) {
@@ -400,7 +400,7 @@ export abstract class SchematicCommand<
     schematicName = schematic.description.name;
 
     // TODO: Remove warning check when 'targets' is default
-    if (collectionName !== this.collectionName) {
+    if (collectionName !== this.defaultCollectionName) {
       const [ast, configPath] = getWorkspaceRaw('local');
       if (ast) {
         const projectsKeyValue = ast.properties.find(p => p.key.value === 'projects');
diff --git a/tests/legacy-cli/e2e/tests/generate/help-output.ts b/tests/legacy-cli/e2e/tests/generate/help-output.ts
index 0b2f8607ca6c..7fc079729562 100644
--- a/tests/legacy-cli/e2e/tests/generate/help-output.ts
+++ b/tests/legacy-cli/e2e/tests/generate/help-output.ts
@@ -22,7 +22,7 @@ export default function() {
             "factory": "./fake",
             "description": "Fake schematic",
             "schema": "./fake-schema.json"
-          }
+          },
         }
       }`,
       [join(genRoot, 'fake-schema.json')]: `
@@ -94,6 +94,33 @@ export default function() {
       if (!/opt-a[\s\S]*opt-b[\s\S]*opt-c/.test(stdout)) {
         throw new Error('Help signature options are incorrect.');
       }
+    })
+
+    // should print all the available schematics in a collection
+    // when a collection has more than 1 schematic
+    .then(() => writeMultipleFiles({
+      [join(genRoot, 'collection.json')]: `
+      {
+        "schematics": {
+          "fake": {
+            "factory": "./fake",
+            "description": "Fake schematic",
+            "schema": "./fake-schema.json"
+          },
+          "fake-two": {
+            "factory": "./fake",
+            "description": "Fake schematic",
+            "schema": "./fake-schema.json"
+          },
+        }
+      }`,
+    }))
+    .then(() => ng('generate', '--help'))
+    .then(({stdout}) => {
+      if (!/Collection \"fake-schematics\" \(default\):[\s\S]*fake[\s\S]*fake-two/.test(stdout)) {
+        throw new Error(
+          `Help result is wrong, it didn't contain all the schematics.`);
+      }
     });
 
 }

From c70cf991acb1a1441277cb58a6f16f56ce7bb25b Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 28 May 2019 13:05:20 +0200
Subject: [PATCH 1384/1703] refactor(@angular-devkit/architect): remove index2
 from testing folder

---
 packages/angular_devkit/architect/testing/index2.ts | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 packages/angular_devkit/architect/testing/index2.ts

diff --git a/packages/angular_devkit/architect/testing/index2.ts b/packages/angular_devkit/architect/testing/index2.ts
deleted file mode 100644
index 783d596d1a54..000000000000
--- a/packages/angular_devkit/architect/testing/index2.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export * from './testing-architect-host';

From 757d8df3e6c3d35b6f540cabf0782d746433a9ab Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Tue, 28 May 2019 15:15:08 +0200
Subject: [PATCH 1385/1703] fix(@angular/cli): ng config doesn't parse
 positional array

Fixes #14516
---
 packages/angular/cli/commands/config-impl.ts       | 13 ++++++++-----
 .../e2e/tests/commands/config/config-get.ts        | 14 +++++++++++++-
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/packages/angular/cli/commands/config-impl.ts b/packages/angular/cli/commands/config-impl.ts
index 06850ea83946..f69e5f024dc1 100644
--- a/packages/angular/cli/commands/config-impl.ts
+++ b/packages/angular/cli/commands/config-impl.ts
@@ -86,12 +86,12 @@ const validCliPaths = new Map<string, ((arg: string) => JsonValue)>([
  * by the path. For example, a path of "a[3].foo.bar[2]" would give you a fragment array of
  * ["a", 3, "foo", "bar", 2].
  * @param path The JSON string to parse.
- * @returns {string[]} The fragments for the string.
+ * @returns {(string|number)[]} The fragments for the string.
  * @private
  */
-function parseJsonPath(path: string): string[] {
+function parseJsonPath(path: string): (string|number)[] {
   const fragments = (path || '').split(/\./g);
-  const result: string[] = [];
+  const result: (string|number)[] = [];
 
   while (fragments.length > 0) {
     const fragment = fragments.shift();
@@ -106,12 +106,15 @@ function parseJsonPath(path: string): string[] {
 
     result.push(match[1]);
     if (match[2]) {
-      const indices = match[2].slice(1, -1).split('][');
+      const indices = match[2]
+        .slice(1, -1)
+        .split('][')
+        .map(x => /^\d$/.test(x) ? +x : x.replace(/\"|\'/g, ''));
       result.push(...indices);
     }
   }
 
-  return result.filter(fragment => !!fragment);
+  return result.filter(fragment => fragment != null);
 }
 
 function getValueFromPath<T extends JsonArray | JsonObject>(
diff --git a/tests/legacy-cli/e2e/tests/commands/config/config-get.ts b/tests/legacy-cli/e2e/tests/commands/config/config-get.ts
index a5abd6ad6fed..4786838afefc 100644
--- a/tests/legacy-cli/e2e/tests/commands/config/config-get.ts
+++ b/tests/legacy-cli/e2e/tests/commands/config/config-get.ts
@@ -19,5 +19,17 @@ export default function() {
         throw new Error(`Expected "true", received "${JSON.stringify(stdout)}".`);
       }
     })
-    .then(() => ng('config', 'schematics.@schematics/angular.component.inlineStyle', 'false'));
+    .then(() => ng('config', 'schematics.@schematics/angular.component.inlineStyle', 'false'))
+    .then(() => ng('config', `projects.test-project.architect.build.options.assets[0]`))
+    .then(({ stdout }) => {
+      if (!stdout.includes('src/favicon.ico')) {
+        throw new Error(`Expected "src/favicon.ico", received "${JSON.stringify(stdout)}".`);
+      }
+    })
+    .then(() => ng('config', `projects["test-project"].architect.build.options.assets[0]`))
+    .then(({ stdout }) => {
+      if (!stdout.includes('src/favicon.ico')) {
+        throw new Error(`Expected "src/favicon.ico", received "${JSON.stringify(stdout)}".`);
+      }
+    });
 }

From 3afdab21a0f0307dcd2be1b44a868ea3d7a8938c Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 28 May 2019 19:38:55 +0200
Subject: [PATCH 1386/1703] fix(@schematics/angular): add migration to update
 `web-animations-js` polyfill

Previous versions rely on `this` which breaks differential loading since it's `undefined` when using script tags with type module.

Fixes #14518
---
 .../angular/migrations/update-8/index.ts        |  4 ++--
 ...pdate-builders.ts => update-dependencies.ts} | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)
 rename packages/schematics/angular/migrations/update-8/{update-builders.ts => update-dependencies.ts} (74%)

diff --git a/packages/schematics/angular/migrations/update-8/index.ts b/packages/schematics/angular/migrations/update-8/index.ts
index b3cedee3e86e..6e84be4837d9 100644
--- a/packages/schematics/angular/migrations/update-8/index.ts
+++ b/packages/schematics/angular/migrations/update-8/index.ts
@@ -12,7 +12,7 @@ import { updatePackageJson, updateTsLintConfig } from './codelyzer-5';
 import { updateES5Projects } from './differential-loading';
 import { dropES2015Polyfills } from './drop-es6-polyfills';
 import { removeAngularHttp } from './remove-angular-http';
-import { updateBuilders } from './update-builders';
+import { updateDependencies } from './update-dependencies';
 
 export { updateLazyModulePaths } from './update-lazy-module-paths';
 
@@ -23,7 +23,7 @@ export default function(): Rule {
       updatePackageJson(),
       dropES2015Polyfills(),
       updateES5Projects(),
-      updateBuilders(),
+      updateDependencies(),
       removeAngularHttp(),
       (tree, context) => {
         const packageChanges = tree.actions.some(a => a.path.endsWith('/package.json'));
diff --git a/packages/schematics/angular/migrations/update-8/update-builders.ts b/packages/schematics/angular/migrations/update-8/update-dependencies.ts
similarity index 74%
rename from packages/schematics/angular/migrations/update-8/update-builders.ts
rename to packages/schematics/angular/migrations/update-8/update-dependencies.ts
index de83b3b83240..5f29c6d708df 100644
--- a/packages/schematics/angular/migrations/update-8/update-builders.ts
+++ b/packages/schematics/angular/migrations/update-8/update-dependencies.ts
@@ -9,7 +9,7 @@ import { Tree } from '@angular-devkit/schematics';
 import { addPackageJsonDependency, getPackageJsonDependency } from '../../utility/dependencies';
 import { latestVersions } from '../../utility/latest-versions';
 
-export function updateBuilders() {
+export function updateDependencies() {
   return (host: Tree) => {
     let current = getPackageJsonDependency(host, '@angular-devkit/build-angular');
     if (current && current.version !== latestVersions.DevkitBuildAngular) {
@@ -49,5 +49,20 @@ export function updateBuilders() {
         },
       );
     }
+
+    // FIXME: change to ^2.3.2 as soon as it's released with the pr208 fix
+    const webAnimationsJsVersion = 'github:angular/web-animations-js#release_pr208';
+    current = getPackageJsonDependency(host, 'web-animations-js');
+    if (current && current.version !== webAnimationsJsVersion) {
+      addPackageJsonDependency(
+        host,
+        {
+          type: current.type,
+          name: 'web-animations-js',
+          version: webAnimationsJsVersion,
+          overwrite: true,
+        },
+      );
+    }
   };
 }

From 37debd7105eb499adf8268ade4ad8b33f6153f24 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 29 May 2019 22:24:39 +0100
Subject: [PATCH 1387/1703] ci: remove duplicate anchor keys in circleci cfg

When updating to Pipelines (https://circleci.com/docs/2.0/build-processing/), duplicate keys cause builds to fail.
---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 818d0e2604ef..a1b54ad84631 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,8 +15,8 @@
 # See https://circleci.com/docs/2.0/caching/#restoring-cache for how prefixes work in CircleCI.
 var_1: &default_docker_image circleci/node:10.12
 var_2: &browsers_docker_image circleci/node:10.12-browsers
-var_2: &browsers_docker_image_node_12 circleci/node:12.1-browsers
-var_3: &cache_key angular_devkit-0.10.0-{{ checksum "yarn.lock" }}
+var_3: &browsers_docker_image_node_12 circleci/node:12.1-browsers
+var_4: &cache_key angular_devkit-0.10.0-{{ checksum "yarn.lock" }}
 
 # Settings common to each job
 anchor_1: &defaults

From 410b56e107a1c13df3489e6c2d37192fa5cc54a7 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 29 May 2019 19:46:06 -0400
Subject: [PATCH 1388/1703] fix(@angular/cli): check for CI environment
 variable in tty helper

Fixes #14563
---
 packages/angular/cli/utilities/tty.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular/cli/utilities/tty.ts b/packages/angular/cli/utilities/tty.ts
index 1b168be93dab..e02ea017525c 100644
--- a/packages/angular/cli/utilities/tty.ts
+++ b/packages/angular/cli/utilities/tty.ts
@@ -11,5 +11,5 @@ export function isTTY(): boolean {
     return !(force === '0' || force.toUpperCase() === 'FALSE');
   }
 
-  return !!process.stdout.isTTY && !!process.stdin.isTTY;
+  return !!process.stdout.isTTY && !!process.stdin.isTTY && !('CI' in process.env);
 }

From a57f053867b81cfca9713447147bdc1f0f97ec8a Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Wed, 29 May 2019 20:51:14 +0200
Subject: [PATCH 1389/1703] fix(@angular/cli): ng-update migrations not running
 with --migrate-only

With Angular CLI version 8, migrations cannot be re-run with the
`--migrate-only` flag as there was a recent regression introduced
in https://github.com/angular/angular-cli/commit/e406f00909a72dff70cbaaff52a5495258ee77c3#diff-0d0a748fb9a38a7ccde08d9b42e70bce as it now passes
a normalized platform path to the `engine.createCollection` call.

This breaks as there is incorrect logic within
`node-modules-engine-host` that causes the schematic collection to be
searched within the `package.json#schematics` entry. This is incorrect
as migration schematics specify their migration schematics in a separate
schematic collection file which is part of `package.json#ng-update`.

Fixes #14565
---
 .../tools/node-module-engine-host.ts          |  2 +-
 .../tools/node-module-engine-host_spec.ts     | 54 +++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 packages/angular_devkit/schematics/tools/node-module-engine-host_spec.ts

diff --git a/packages/angular_devkit/schematics/tools/node-module-engine-host.ts b/packages/angular_devkit/schematics/tools/node-module-engine-host.ts
index 2c0e681626bc..9475a87d3440 100644
--- a/packages/angular_devkit/schematics/tools/node-module-engine-host.ts
+++ b/packages/angular_devkit/schematics/tools/node-module-engine-host.ts
@@ -79,7 +79,7 @@ export class NodeModulesEngineHost extends FileSystemEngineHostBase {
   protected _resolveCollectionPath(name: string): string {
     let collectionPath: string | undefined = undefined;
 
-    if (name.replace(/\\/, '/').split('/').length > (name[0] == '@' ? 2 : 1)) {
+    if (name.replace(/\\/g, '/').split('/').length > (name[0] == '@' ? 2 : 1)) {
       try {
         collectionPath = this._resolvePath(name, process.cwd());
       } catch {
diff --git a/packages/angular_devkit/schematics/tools/node-module-engine-host_spec.ts b/packages/angular_devkit/schematics/tools/node-module-engine-host_spec.ts
new file mode 100644
index 000000000000..4d33a745a2b6
--- /dev/null
+++ b/packages/angular_devkit/schematics/tools/node-module-engine-host_spec.ts
@@ -0,0 +1,54 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+// tslint:disable:no-implicit-dependencies
+
+import { SchematicEngine } from '@angular-devkit/schematics';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { NodeModulesEngineHost } from './node-module-engine-host';
+
+const TMP_DIR = process.env['$TEST_TMPDIR'] || os.tmpdir();
+
+describe('NodeModulesEngineHost', () => {
+  let tmpDir!: string;
+  let previousDir!: string;
+
+  beforeEach(() => {
+    tmpDir = fs.mkdtempSync(path.join(TMP_DIR,
+        'angular-devkit-schematics-tools-node-module-engine-host'));
+    previousDir = process.cwd();
+    process.chdir(tmpDir);
+  });
+
+  afterEach(() => process.chdir(previousDir));
+
+  /** Creates a fake NPM module that can be used to test the node module engine host. */
+  function createFakeNpmModule() {
+    fs.mkdirSync(path.join(tmpDir, 'node_modules'));
+    fs.mkdirSync(path.join(tmpDir, 'node_modules/@angular/'));
+    fs.mkdirSync(path.join(tmpDir, 'node_modules/@angular/core'));
+    fs.mkdirSync(path.join(tmpDir, 'node_modules/@angular/core/schematics'));
+    fs.writeFileSync(path.join(tmpDir, 'node_modules/@angular/core/package.json'),
+      JSON.stringify({name: '@angular/core'}));
+    fs.writeFileSync(path.join(tmpDir, 'node_modules/@angular/core/schematics/migrations.json'),
+      JSON.stringify({schematics: {}}));
+  }
+
+  it('should properly create collections with explicit collection path', () => {
+    createFakeNpmModule();
+
+    const engineHost = new NodeModulesEngineHost();
+    const engine = new SchematicEngine(engineHost);
+
+    expect(() => {
+      engine.createCollection(path.join('@angular/core', './schematics/migrations.json'));
+    }).not.toThrow();
+  });
+});

From 0048bf286fd93319945e53a674e0abc145d4e834 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 29 May 2019 14:22:17 -0400
Subject: [PATCH 1390/1703] fix(@schematics/update): respect semver rules for
 migration from & to

This implements the logic provided in the following link with the exception that the lower range is exclusive instead of inclusive.
https://github.com/npm/node-semver#hyphen-ranges-xyz---abc

Fixes #14559
---
 packages/schematics/update/migrate/index.ts   | 17 ++++-
 .../schematics/update/migrate/index_spec.ts   | 69 +++++++++++++++++++
 2 files changed, 85 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/update/migrate/index.ts b/packages/schematics/update/migrate/index.ts
index 4d9a371f9027..3f3529575d2c 100644
--- a/packages/schematics/update/migrate/index.ts
+++ b/packages/schematics/update/migrate/index.ts
@@ -51,6 +51,20 @@ export default function(options: PostUpdateSchema): Rule {
   return (tree: Tree, context: SchematicContext) => {
     const schematicsToRun: { name: string; version: string; }[] = [];
 
+    const from = _coerceVersionNumber(options.from);
+    if (!from) {
+      throw new SchematicsException(
+        `Invalid from option: ${JSON.stringify(options.from)}`,
+      );
+    }
+
+    const to = semver.validRange('<=' + options.to);
+    if (!to) {
+      throw new SchematicsException(
+        `Invalid to option: ${JSON.stringify(options.to)}`,
+      );
+    }
+
     // Create the collection for the package.
     const collection = context.engine.createCollection(options.collection);
     for (const name of collection.listSchematicNames()) {
@@ -68,7 +82,8 @@ export default function(options: PostUpdateSchema): Rule {
           );
         }
 
-        if (semver.gt(version, options.from) && semver.lte(version, options.to)) {
+        if (semver.gt(version, from) &&
+            semver.satisfies(version, to, { includePrerelease: true })) {
           schematicsToRun.push({ name, version });
         }
       }
diff --git a/packages/schematics/update/migrate/index_spec.ts b/packages/schematics/update/migrate/index_spec.ts
index ea5856f88e76..54daeb2558e1 100644
--- a/packages/schematics/update/migrate/index_spec.ts
+++ b/packages/schematics/update/migrate/index_spec.ts
@@ -57,6 +57,75 @@ describe('@schematics/update:migrate', () => {
       }),
     ).toPromise().then(done, done.fail);
   });
+
+  it('supports partial version ranges with only major', done => {
+    // Since we cannot run tasks in unit tests, we need to validate that the default
+    // update schematic updates the package.json appropriately, AND validate that the
+    // migrate schematic actually do work appropriately, in a separate test.
+    schematicRunner.runSchematicAsync('migrate', {
+      package: 'test',
+      collection: require.resolve('./test/migration.json'),
+      from: '1',
+      to: '2',
+    }, appTree).pipe(
+      map(tree => {
+        const resultJson = JSON.parse(tree.readContent('/migrations'));
+
+        expect(resultJson).toEqual([
+          'migration-03', // "1.0.5"
+          'migration-05', // "1.1.0-beta.0"
+          'migration-04', // "1.1.0-beta.1"
+          'migration-02', // "1.1.0"
+          'migration-13', // "1.1.0"
+          'migration-19', // "1.1"
+          'migration-06', // "1.4.0"
+          'migration-17', // "2.0.0-alpha"
+          'migration-16', // "2.0.0-alpha.5"
+          'migration-08', // "2.0.0-beta.0"
+          'migration-07', // "2.0.0-rc.0"
+          'migration-12', // "2.0.0-rc.4"
+          'migration-14', // "2.0.0"
+          'migration-20', // "2"
+          'migration-15', // "2.0.1"
+          'migration-11', // "2.1.0"
+        ]);
+      }),
+    ).toPromise().then(done, done.fail);
+  });
+
+  it('supports partial version ranges with major and minor', done => {
+    // Since we cannot run tasks in unit tests, we need to validate that the default
+    // update schematic updates the package.json appropriately, AND validate that the
+    // migrate schematic actually do work appropriately, in a separate test.
+    schematicRunner.runSchematicAsync('migrate', {
+      package: 'test',
+      collection: require.resolve('./test/migration.json'),
+      from: '1.0',
+      to: '2.0',
+    }, appTree).pipe(
+      map(tree => {
+        const resultJson = JSON.parse(tree.readContent('/migrations'));
+
+        expect(resultJson).toEqual([
+          'migration-03', // "1.0.5"
+          'migration-05', // "1.1.0-beta.0"
+          'migration-04', // "1.1.0-beta.1"
+          'migration-02', // "1.1.0"
+          'migration-13', // "1.1.0"
+          'migration-19', // "1.1"
+          'migration-06', // "1.4.0"
+          'migration-17', // "2.0.0-alpha"
+          'migration-16', // "2.0.0-alpha.5"
+          'migration-08', // "2.0.0-beta.0"
+          'migration-07', // "2.0.0-rc.0"
+          'migration-12', // "2.0.0-rc.4"
+          'migration-14', // "2.0.0"
+          'migration-20', // "2"
+          'migration-15', // "2.0.1"
+        ]);
+      }),
+    ).toPromise().then(done, done.fail);
+  });
 });
 
 

From 576119f2cab6a53f0bc67026b723fffbe8407258 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Wed, 29 May 2019 12:21:16 +0200
Subject: [PATCH 1391/1703] fix(@schematics/angular): TypeScript related
 migrations should cater for BOM

In the CLI `UpdateRecorder` methods such as `insertLeft`, `remove` etc.. accepts positions which are not offset by a BOM. This is because when a file has a BOM a different recorder will be used https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics/src/tree/recorder.ts#L72 which caters for an addition offset/delta.

The main reason for this is that when a developer is writing a schematic they shouldn't need to compute the offset based if a file has a BOM or not and is handled out of the box.

Example
```ts
recorder.insertLeft(5, 'true');
```

However this is unfortunate in the case if a ts SourceFile is used and one uses `getWidth` and `getStart` method they will already be offset by 1, which at the end it results in a double offset and hence the problem.

Fixes #14551
---
 .../migrations/update-8/drop-es6-polyfills.ts      |  2 +-
 .../update-8/update-lazy-module-paths.ts           |  2 +-
 .../update-8/update-lazy-module-paths_spec.ts      | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts b/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts
index d7442b4819c1..265595e1f0ba 100644
--- a/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts
+++ b/packages/schematics/angular/migrations/update-8/drop-es6-polyfills.ts
@@ -106,7 +106,7 @@ function dropES2015PolyfillsFromFile(polyfillPath: string): Rule {
     }
 
     const sourceFile = ts.createSourceFile(polyfillPath,
-      content,
+      content.replace(/^\uFEFF/, ''),
       ts.ScriptTarget.Latest,
       true,
     );
diff --git a/packages/schematics/angular/migrations/update-8/update-lazy-module-paths.ts b/packages/schematics/angular/migrations/update-8/update-lazy-module-paths.ts
index ade0418ee39c..1c829889c5e7 100644
--- a/packages/schematics/angular/migrations/update-8/update-lazy-module-paths.ts
+++ b/packages/schematics/angular/migrations/update-8/update-lazy-module-paths.ts
@@ -17,7 +17,7 @@ function* visit(directory: DirEntry): IterableIterator<ts.SourceFile> {
         if (content.includes('loadChildren')) {
           const source = ts.createSourceFile(
             entry.path,
-            content.toString(),
+            content.toString().replace(/^\uFEFF/, ''),
             ts.ScriptTarget.Latest,
             true,
           );
diff --git a/packages/schematics/angular/migrations/update-8/update-lazy-module-paths_spec.ts b/packages/schematics/angular/migrations/update-8/update-lazy-module-paths_spec.ts
index b3cc89c159ef..a8dbd30e8b20 100644
--- a/packages/schematics/angular/migrations/update-8/update-lazy-module-paths_spec.ts
+++ b/packages/schematics/angular/migrations/update-8/update-lazy-module-paths_spec.ts
@@ -73,5 +73,19 @@ describe('Migration to version 8', () => {
       expect(routes).toContain(
         `loadChildren: () => import('./lazy/lazy.module').then(m => m.LazyModule)`);
     });
+
+    it('should replace the module path string when file has BOM', async () => {
+      tree.create(lazyRoutePath, '\uFEFF' + Buffer.from(lazyRoute).toString());
+
+      schematicRunner.runSchematic('migration-08', {}, tree);
+      await schematicRunner.engine.executePostTasks().toPromise();
+
+      const routes = tree.readContent(lazyRoutePath);
+
+      expect(routes).not.toContain('./lazy/lazy.module#LazyModule');
+      expect(routes).toContain(
+        `loadChildren: () => import('./lazy/lazy.module').then(m => m.LazyModule)`);
+    });
+
   });
 });

From 99a27403666c45c553c447675c8072a919ac93cb Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Wed, 29 May 2019 08:24:26 +0200
Subject: [PATCH 1392/1703] ci: add `build_bazel` packages in `bazel` package
 group

---
 renovate.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/renovate.json b/renovate.json
index 876bc68ab6fb..1628fb58f0f5 100644
--- a/renovate.json
+++ b/renovate.json
@@ -43,7 +43,8 @@
     },
     {
       "packagePatterns": [
-        "^@bazel\/.*"
+        "^@bazel\/.*",
+        "^build_bazel.*"
       ],
       "groupName": "bazel",
       "pinVersions": false

From 5a100c776811b7831e2ab117c8b4f386200b4d9f Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 30 May 2019 19:43:09 +0200
Subject: [PATCH 1393/1703] fix(@schematics/update): improve error message when
 finding incompatible peer dependencies

fix #14562
---
 packages/schematics/update/update/index.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/update/update/index.ts b/packages/schematics/update/update/index.ts
index 7ac57a6e7fcc..4fac798518a1 100644
--- a/packages/schematics/update/update/index.ts
+++ b/packages/schematics/update/update/index.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { logging } from '@angular-devkit/core';
+import { logging, tags } from '@angular-devkit/core';
 import {
   Rule,
   SchematicContext,
@@ -214,7 +214,10 @@ function _validateUpdatePackages(
   });
 
   if (!force && peerErrors) {
-    throw new SchematicsException(`Incompatible peer dependencies found. See above.`);
+    throw new SchematicsException(tags.stripIndents
+      `Incompatible peer dependencies found.
+      Peer dependency warnings when installing dependencies means that those dependencies might not work correctly together.
+      You can use the '--force' option to ignore incompatible peer dependencies and instead address these warnings later.`);
   }
 }
 

From 19ed795cb124758a4f0569376563657382cc10a7 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 29 May 2019 21:06:49 -0400
Subject: [PATCH 1394/1703] fix(@angular-devkit/architect): support all
 observable types as build results

Fixes #14579
---
 .../angular_devkit/architect/src/index.d.ts   |  4 +++-
 packages/angular_devkit/architect/src/api.ts  | 12 ++++++++++--
 .../architect/src/create-builder.ts           | 19 +++++++++----------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/etc/api/angular_devkit/architect/src/index.d.ts b/etc/api/angular_devkit/architect/src/index.d.ts
index be03aecd6029..1d7e5cb3e925 100644
--- a/etc/api/angular_devkit/architect/src/index.d.ts
+++ b/etc/api/angular_devkit/architect/src/index.d.ts
@@ -38,7 +38,7 @@ export declare type BuilderInput = json.JsonObject & RealBuilderInput;
 
 export declare type BuilderOutput = json.JsonObject & RealBuilderOutput;
 
-export declare type BuilderOutputLike = Observable<BuilderOutput> | Promise<BuilderOutput> | BuilderOutput;
+export declare type BuilderOutputLike = SubscribableOrPromise<BuilderOutput> | BuilderOutput;
 
 export declare type BuilderProgress = json.JsonObject & RealBuilderProgress & TypedBuilderProgress;
 
@@ -60,6 +60,8 @@ export interface BuilderRun {
 
 export declare function createBuilder<OptT extends json.JsonObject, OutT extends BuilderOutput = BuilderOutput>(fn: BuilderHandlerFn<OptT>): Builder<OptT>;
 
+export declare function isBuilderOutput(obj: any): obj is BuilderOutput;
+
 export interface ScheduleOptions {
     analytics?: analytics.Analytics;
     logger?: logging.Logger;
diff --git a/packages/angular_devkit/architect/src/api.ts b/packages/angular_devkit/architect/src/api.ts
index 032482041059..52dfcf377883 100644
--- a/packages/angular_devkit/architect/src/api.ts
+++ b/packages/angular_devkit/architect/src/api.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { analytics, experimental, json, logging } from '@angular-devkit/core';
-import { Observable, from } from 'rxjs';
+import { Observable, SubscribableOrPromise, from } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import { Schema as RealBuilderInput, Target as RealTarget } from './input-schema';
 import { Schema as RealBuilderOutput } from './output-schema';
@@ -250,8 +250,16 @@ export interface BuilderContext {
 /**
  * An accepted return value from a builder. Can be either an Observable, a Promise or a vector.
  */
-export type BuilderOutputLike = Observable<BuilderOutput> | Promise<BuilderOutput> | BuilderOutput;
+export type BuilderOutputLike = SubscribableOrPromise<BuilderOutput> | BuilderOutput;
 
+// tslint:disable-next-line:no-any
+export function isBuilderOutput(obj: any): obj is BuilderOutput {
+  if (!obj || typeof obj.then === 'function' || typeof obj.subscribe === 'function') {
+    return false;
+  }
+
+  return typeof obj.success === 'boolean';
+}
 
 /**
  * A builder handler function. The function signature passed to `createBuilder()`.
diff --git a/packages/angular_devkit/architect/src/create-builder.ts b/packages/angular_devkit/architect/src/create-builder.ts
index 224431e5d4c6..0a4b97aaebde 100644
--- a/packages/angular_devkit/architect/src/create-builder.ts
+++ b/packages/angular_devkit/architect/src/create-builder.ts
@@ -5,8 +5,8 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { analytics, experimental, isPromise, json, logging } from '@angular-devkit/core';
-import { Observable, Subscription, from, isObservable, of, throwError } from 'rxjs';
+import { analytics, experimental, json, logging } from '@angular-devkit/core';
+import { Observable, Subscription, from, of, throwError } from 'rxjs';
 import { tap } from 'rxjs/operators';
 import {
   BuilderContext,
@@ -14,11 +14,11 @@ import {
   BuilderInfo,
   BuilderInput,
   BuilderOutput,
-  BuilderOutputLike,
   BuilderProgressState,
   ScheduleOptions,
   Target,
   TypedBuilderProgress,
+  isBuilderOutput,
   targetStringFromTarget,
 } from './api';
 import { Builder, BuilderSymbol, BuilderVersionSymbol } from './internal';
@@ -189,19 +189,18 @@ export function createBuilder<
         };
 
         context.reportRunning();
-        let result: BuilderOutputLike;
+        let result;
         try {
           result = fn(i.options as OptT, context);
+          if (isBuilderOutput(result)) {
+            result = of(result);
+          } else {
+            result = from(result);
+          }
         } catch (e) {
           result = throwError(e);
         }
 
-        if (isPromise(result)) {
-          result = from(result);
-        } else if (!isObservable(result)) {
-          result = of(result);
-        }
-
         // Manage some state automatically.
         progress({ state: BuilderProgressState.Running, current: 0, total: 1 }, context);
         subscriptions.push(result.pipe(

From aceaacde503da86e5161dcf92df24d5fcda75d4e Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 30 May 2019 14:27:04 -0400
Subject: [PATCH 1395/1703] fix(@angular/cli): provide an option to update
 dirty repositories

---
 packages/angular/cli/commands/update-impl.ts | 17 ++++++++++++-----
 packages/angular/cli/commands/update.json    |  4 ++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/packages/angular/cli/commands/update-impl.ts b/packages/angular/cli/commands/update-impl.ts
index 90872e5079ab..dc39e1c685e4 100644
--- a/packages/angular/cli/commands/update-impl.ts
+++ b/packages/angular/cli/commands/update-impl.ts
@@ -83,12 +83,19 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
 
     // If not asking for status then check for a clean git repository.
     // This allows the user to easily reset any changes from the update.
-    if ((packages.length !== 0 || options.all) && !this.checkCleanGit()) {
-      this.logger.error(
-        'Repository is not clean.  Please commit or stash any changes before updating.',
-      );
+    const statusCheck = packages.length === 0 && !options.all;
+    if (!statusCheck && !this.checkCleanGit()) {
+      if (options.allowDirty) {
+        this.logger.warn(
+          'Repository is not clean.  Update changes will be mixed with pre-existing changes.',
+        );
+      } else {
+        this.logger.error(
+          'Repository is not clean.  Please commit or stash any changes before updating.',
+        );
 
-      return 2;
+        return 2;
+      }
     }
 
     const packageManager = getPackageManager(this.workspace.root);
diff --git a/packages/angular/cli/commands/update.json b/packages/angular/cli/commands/update.json
index 053101434194..d17d7c0fafb6 100644
--- a/packages/angular/cli/commands/update.json
+++ b/packages/angular/cli/commands/update.json
@@ -53,6 +53,10 @@
         "to": {
           "description": "Version up to which to apply migrations. Only available with a single package being updated, and only on migrations only. Requires from to be specified. Default to the installed version detected.",
           "type": "string"
+        },
+        "allowDirty": {
+          "description": "Whether to allow updating when the repository contains modified or untracked files.",
+          "type": "boolean"
         }
       }
     }

From 34a55c96b2ed38b226879913839b97c601387653 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 30 May 2019 14:35:51 -0400
Subject: [PATCH 1396/1703] refactor(@schematics/update): fix lint error

---
 packages/schematics/update/update/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/schematics/update/update/index.ts b/packages/schematics/update/update/index.ts
index 4fac798518a1..5418c797c564 100644
--- a/packages/schematics/update/update/index.ts
+++ b/packages/schematics/update/update/index.ts
@@ -213,12 +213,14 @@ function _validateUpdatePackages(
       || peerErrors;
   });
 
+  // tslint:disable:max-line-length
   if (!force && peerErrors) {
     throw new SchematicsException(tags.stripIndents
       `Incompatible peer dependencies found.
       Peer dependency warnings when installing dependencies means that those dependencies might not work correctly together.
       You can use the '--force' option to ignore incompatible peer dependencies and instead address these warnings later.`);
   }
+  // tslint:enable:max-line-length
 }
 
 

From e14f2e113e738b086d3677d99d4f0c933d2da3e5 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Thu, 23 May 2019 08:43:55 +0200
Subject: [PATCH 1397/1703] fix(@ngtools/webpack): update supported
 compiler-cli supported version

`@ngtools/webpack` only supports compiler version 8 as per the peerDependency.

The fixes the `isSupported` version static and also removes code that was to support prior versions of compiler-cli
---
 .../webpack/src/angular_compiler_plugin.ts    | 27 ++++++-------------
 .../ngtools/webpack/src/ngcc_processor.ts     |  5 ++--
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index cf7087d2579a..1d5af7c2626a 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -152,7 +152,7 @@ export class AngularCompilerPlugin {
   }
 
   static isSupported() {
-    return VERSION && parseInt(VERSION.major) >= 5;
+    return VERSION && parseInt(VERSION.major) >= 8;
   }
 
   private _setupOptions(options: AngularCompilerPluginOptions) {
@@ -660,24 +660,13 @@ export class AngularCompilerPlugin {
 
       let ngccProcessor: NgccProcessor | undefined;
       if (this._compilerOptions.enableIvy) {
-        let ngcc: typeof import('@angular/compiler-cli/ngcc') | undefined;
-        try {
-          // this is done for the sole reason that @ngtools/webpack
-          // support versions of Angular that don't have NGCC API
-          ngcc = require('@angular/compiler-cli/ngcc');
-        } catch {
-        }
-
-        if (ngcc) {
-          ngccProcessor = new NgccProcessor(
-            ngcc,
-            this._mainFields,
-            compilerWithFileSystems.inputFileSystem,
-            this._warnings,
-            this._errors,
-            this._basePath,
-          );
-        }
+        ngccProcessor = new NgccProcessor(
+          this._mainFields,
+          compilerWithFileSystems.inputFileSystem,
+          this._warnings,
+          this._errors,
+          this._basePath,
+        );
       }
 
       // Create the webpack compiler host.
diff --git a/packages/ngtools/webpack/src/ngcc_processor.ts b/packages/ngtools/webpack/src/ngcc_processor.ts
index 821c6dd710ba..a4ae1185fca3 100644
--- a/packages/ngtools/webpack/src/ngcc_processor.ts
+++ b/packages/ngtools/webpack/src/ngcc_processor.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Logger } from '@angular/compiler-cli/ngcc';
+import { Logger, process as mainNgcc } from '@angular/compiler-cli/ngcc';
 import { existsSync } from 'fs';
 import * as path from 'path';
 import * as ts from 'typescript';
@@ -29,7 +29,6 @@ export class NgccProcessor {
   private _nodeModulesDirectory: string;
 
   constructor(
-    private readonly ngcc: typeof import('@angular/compiler-cli/ngcc'),
     private readonly propertiesToConsider: string[],
     private readonly inputFileSystem: InputFileSystem,
     private readonly compilationWarnings: (Error | string)[],
@@ -63,7 +62,7 @@ export class NgccProcessor {
 
     const timeLabel = `NgccProcessor.processModule.ngcc.process+${moduleName}`;
     time(timeLabel);
-    this.ngcc.process({
+    mainNgcc({
       basePath: this._nodeModulesDirectory,
       targetEntryPointPath: path.dirname(packageJsonPath),
       propertiesToConsider: this.propertiesToConsider,

From bed09493b075d56ef20224bbbb086f5f06f1bdd4 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Thu, 23 May 2019 14:54:33 +0200
Subject: [PATCH 1398/1703] test: refactor webpack tests to work and use
 angular compiler-cli 8

---
 .../assets/webpack/test-app-ng5/package.json  | 28 ------------------
 .../webpack/test-app-weird-ng5/package.json   | 29 -------------------
 .../aotplugin.config.json                     |  0
 .../not/so/source/app/app.component.html      |  0
 .../not/so/source/app/app.component.scss      |  0
 .../not/so/source/app/app.component.ts        |  0
 .../not/so/source/app/app.module.ts           |  0
 .../so/source}/app/feature/feature.module.ts  |  0
 .../app/feature/lazy-feature.module.ts        |  8 ++---
 .../not/so/source}/app/lazy.module.ts         |  6 +---
 .../not/so/source/app/main.jit.ts             |  0
 .../not/so/source}/index.html                 |  0
 .../not/so/source/tsconfig.json               |  0
 .../webpack/test-app-weird/package.json       | 28 ++++++++++++++++++
 .../webpack.config.js                         |  0
 .../webpack.flags.json                        |  0
 .../app/app.component.html                    |  0
 .../app/app.component.scss                    |  0
 .../app/app.component.ts                      |  0
 .../app/app.module.ts                         |  0
 .../app/feature/feature.module.ts             |  0
 .../app/feature/lazy-feature.module.ts        |  8 ++---
 .../app/injectable.ts                         |  2 +-
 .../app/lazy.module.ts                        |  6 +---
 .../{test-app-ng5 => test-app}/app/main.ts    |  0
 .../not/so/source => test-app}/index.html     |  0
 .../e2e/assets/webpack/test-app/package.json  | 27 +++++++++++++++++
 .../{test-app-ng5 => test-app}/tsconfig.json  |  0
 .../webpack.config.js                         |  0
 .../test-server-app-ng5/app/injectable.ts     |  8 -----
 .../webpack/test-server-app-ng5/package.json  | 29 -------------------
 .../app/app.component.html                    |  0
 .../app/app.component.scss                    |  0
 .../app/app.component.ts                      |  0
 .../app/app.module.ts                         |  0
 .../app/feature/feature.module.ts             |  0
 .../app/feature/lazy-feature.module.ts        |  8 ++---
 .../webpack/test-server-app/app/injectable.ts |  8 +++++
 .../app/lazy.module.ts                        |  8 ++---
 .../app/main.commonjs.ts                      |  0
 .../app/main.ts                               |  0
 .../index.html                                |  0
 .../index.js                                  |  0
 .../webpack/test-server-app/package.json      | 28 ++++++++++++++++++
 .../tsconfig.json                             |  0
 .../webpack.config.js                         |  0
 .../webpack/{server-ng5.ts => server-app.ts}  |  2 +-
 .../webpack/{test-ng5.ts => test-app.ts}      |  4 +--
 .../webpack/{weird-ng5.ts => weird-app.ts}    |  5 +++-
 tests/legacy-cli/e2e/utils/fs.ts              |  2 +-
 50 files changed, 110 insertions(+), 134 deletions(-)
 delete mode 100644 tests/legacy-cli/e2e/assets/webpack/test-app-ng5/package.json
 delete mode 100644 tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/package.json
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-weird-ng5 => test-app-weird}/aotplugin.config.json (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-weird-ng5 => test-app-weird}/not/so/source/app/app.component.html (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-weird-ng5 => test-app-weird}/not/so/source/app/app.component.scss (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-weird-ng5 => test-app-weird}/not/so/source/app/app.component.ts (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-weird-ng5 => test-app-weird}/not/so/source/app/app.module.ts (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-ng5 => test-app-weird/not/so/source}/app/feature/feature.module.ts (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-ng5 => test-app-weird/not/so/source}/app/feature/lazy-feature.module.ts (77%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-server-app-ng5 => test-app-weird/not/so/source}/app/lazy.module.ts (82%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-weird-ng5 => test-app-weird}/not/so/source/app/main.jit.ts (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-ng5 => test-app-weird/not/so/source}/index.html (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-weird-ng5 => test-app-weird}/not/so/source/tsconfig.json (100%)
 create mode 100644 tests/legacy-cli/e2e/assets/webpack/test-app-weird/package.json
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-weird-ng5 => test-app-weird}/webpack.config.js (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-weird-ng5 => test-app-weird}/webpack.flags.json (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-ng5 => test-app}/app/app.component.html (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-ng5 => test-app}/app/app.component.scss (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-ng5 => test-app}/app/app.component.ts (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-ng5 => test-app}/app/app.module.ts (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-weird-ng5/not/so/source => test-app}/app/feature/feature.module.ts (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-server-app-ng5 => test-app}/app/feature/lazy-feature.module.ts (77%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-ng5 => test-app}/app/injectable.ts (79%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-ng5 => test-app}/app/lazy.module.ts (82%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-ng5 => test-app}/app/main.ts (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-weird-ng5/not/so/source => test-app}/index.html (100%)
 create mode 100644 tests/legacy-cli/e2e/assets/webpack/test-app/package.json
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-ng5 => test-app}/tsconfig.json (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-ng5 => test-app}/webpack.config.js (100%)
 delete mode 100644 tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/injectable.ts
 delete mode 100644 tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/package.json
 rename tests/legacy-cli/e2e/assets/webpack/{test-server-app-ng5 => test-server-app}/app/app.component.html (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-server-app-ng5 => test-server-app}/app/app.component.scss (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-server-app-ng5 => test-server-app}/app/app.component.ts (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-server-app-ng5 => test-server-app}/app/app.module.ts (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-server-app-ng5 => test-server-app}/app/feature/feature.module.ts (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-weird-ng5/not/so/source => test-server-app}/app/feature/lazy-feature.module.ts (77%)
 create mode 100644 tests/legacy-cli/e2e/assets/webpack/test-server-app/app/injectable.ts
 rename tests/legacy-cli/e2e/assets/webpack/{test-app-weird-ng5/not/so/source => test-server-app}/app/lazy.module.ts (81%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-server-app-ng5 => test-server-app}/app/main.commonjs.ts (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-server-app-ng5 => test-server-app}/app/main.ts (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-server-app-ng5 => test-server-app}/index.html (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-server-app-ng5 => test-server-app}/index.js (100%)
 create mode 100644 tests/legacy-cli/e2e/assets/webpack/test-server-app/package.json
 rename tests/legacy-cli/e2e/assets/webpack/{test-server-app-ng5 => test-server-app}/tsconfig.json (100%)
 rename tests/legacy-cli/e2e/assets/webpack/{test-server-app-ng5 => test-server-app}/webpack.config.js (100%)
 rename tests/legacy-cli/e2e/tests/packages/webpack/{server-ng5.ts => server-app.ts} (94%)
 rename tests/legacy-cli/e2e/tests/packages/webpack/{test-ng5.ts => test-app.ts} (89%)
 rename tests/legacy-cli/e2e/tests/packages/webpack/{weird-ng5.ts => weird-app.ts} (92%)

diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/package.json b/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/package.json
deleted file mode 100644
index e5078904a00a..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/package.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "name": "test",
-  "license": "MIT",
-  "dependencies": {
-    "@angular/common": "^5.0.0-rc.8",
-    "@angular/compiler": "^5.0.0-rc.8",
-    "@angular/compiler-cli": "^5.0.0-rc.8",
-    "@angular/core": "^5.0.0-rc.8",
-    "@angular/http": "^5.0.0-rc.8",
-    "@angular/platform-browser": "^5.0.0-rc.8",
-    "@angular/platform-browser-dynamic": "^5.0.0-rc.8",
-    "@angular/platform-server": "^5.0.0-rc.8",
-    "@angular/router": "^5.0.0-rc.8",
-    "@ngtools/webpack": "0.0.0",
-    "core-js": "^3.0.0",
-    "rxjs": "^5.5.0",
-    "zone.js": "^0.8.14"
-  },
-  "devDependencies": {
-    "node-sass": "^4.7.0",
-    "performance-now": "^0.2.0",
-    "raw-loader": "^0.5.1",
-    "sass-loader": "^6.0.0",
-    "typescript": "~2.4.2",
-    "webpack": "~4.0.1",
-    "webpack-cli": "~2.0.9"
-  }
-}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/package.json b/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/package.json
deleted file mode 100644
index f15ed005a3de..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/package.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name": "test",
-  "license": "MIT",
-  "dependencies": {
-    "@angular/common": "^5.0.0-rc.8",
-    "@angular/compiler": "^5.0.0-rc.8",
-    "@angular/compiler-cli": "^5.0.0-rc.8",
-    "@angular/core": "^5.0.0-rc.8",
-    "@angular/http": "^5.0.0-rc.8",
-    "@angular/platform-browser": "^5.0.0-rc.8",
-    "@angular/platform-browser-dynamic": "^5.0.0-rc.8",
-    "@angular/platform-server": "^5.0.0-rc.8",
-    "@angular/router": "^5.0.0-rc.8",
-    "@ngtools/webpack": "0.0.0",
-    "core-js": "^3.0.0",
-    "rxjs": "^5.5.0",
-    "zone.js": "^0.8.14"
-  },
-  "devDependencies": {
-    "node-sass": "^4.7.0",
-    "performance-now": "^0.2.0",
-    "preprocess-loader": "^0.2.2",
-    "raw-loader": "^0.5.1",
-    "sass-loader": "^6.0.0",
-    "typescript": "~2.4.2",
-    "webpack": "~4.0.1",
-    "webpack-cli": "~2.0.9"
-  }
-}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/aotplugin.config.json b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/aotplugin.config.json
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/aotplugin.config.json
rename to tests/legacy-cli/e2e/assets/webpack/test-app-weird/aotplugin.config.json
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/app/app.component.html b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/app.component.html
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/app/app.component.html
rename to tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/app.component.html
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/app/app.component.scss b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/app.component.scss
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/app/app.component.scss
rename to tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/app.component.scss
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/app/app.component.ts b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/app.component.ts
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/app/app.component.ts
rename to tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/app.component.ts
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/app/app.module.ts b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/app.module.ts
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/app/app.module.ts
rename to tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/app.module.ts
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/feature/feature.module.ts b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/feature/feature.module.ts
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/feature/feature.module.ts
rename to tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/feature/feature.module.ts
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/feature/lazy-feature.module.ts b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/feature/lazy-feature.module.ts
similarity index 77%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/feature/lazy-feature.module.ts
rename to tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/feature/lazy-feature.module.ts
index 8fafca158b24..b7d72eab327b 100644
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/feature/lazy-feature.module.ts
+++ b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/feature/lazy-feature.module.ts
@@ -1,6 +1,5 @@
 import {NgModule, Component} from '@angular/core';
 import {RouterModule} from '@angular/router';
-import {HttpModule, Http} from '@angular/http';
 
 @Component({
   selector: 'lazy-feature-comp',
@@ -13,11 +12,8 @@ export class LazyFeatureComponent {}
     RouterModule.forChild([
       {path: '', component: LazyFeatureComponent, pathMatch: 'full'},
       {path: 'feature', loadChildren: './feature.module#FeatureModule'}
-    ]),
-    HttpModule
+    ])
   ],
   declarations: [LazyFeatureComponent]
 })
-export class LazyFeatureModule {
-  constructor(http: Http) {}
-}
+export class LazyFeatureModule {}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/lazy.module.ts b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/lazy.module.ts
similarity index 82%
rename from tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/lazy.module.ts
rename to tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/lazy.module.ts
index 96da4de7515b..32c07594ac3d 100644
--- a/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/lazy.module.ts
+++ b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/lazy.module.ts
@@ -1,6 +1,5 @@
 import {NgModule, Component} from '@angular/core';
 import {RouterModule} from '@angular/router';
-import {HttpModule, Http} from '@angular/http';
 
 @Component({
   selector: 'lazy-comp',
@@ -15,12 +14,9 @@ export class LazyComponent {}
      {path: 'feature', loadChildren: './feature/feature.module#FeatureModule'},
      {path: 'lazy-feature', loadChildren: './feature/lazy-feature.module#LazyFeatureModule'}
     ]),
-    HttpModule
   ],
   declarations: [LazyComponent]
 })
-export class LazyModule {
-  constructor(http: Http) {}
-}
+export class LazyModule {}
 
 export class SecondModule {}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/app/main.jit.ts b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/main.jit.ts
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/app/main.jit.ts
rename to tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/app/main.jit.ts
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/index.html b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/index.html
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-ng5/index.html
rename to tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/index.html
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/tsconfig.json b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/tsconfig.json
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/tsconfig.json
rename to tests/legacy-cli/e2e/assets/webpack/test-app-weird/not/so/source/tsconfig.json
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/package.json b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/package.json
new file mode 100644
index 000000000000..71c49f7b9fa7
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "test",
+  "license": "MIT",
+  "dependencies": {
+    "@angular/common": "^8.0.0-rc.0",
+    "@angular/compiler": "^8.0.0-rc.0",
+    "@angular/compiler-cli": "^8.0.0-rc.0",
+    "@angular/core": "^8.0.0-rc.0",
+    "@angular/platform-browser": "^8.0.0-rc.0",
+    "@angular/platform-browser-dynamic": "^8.0.0-rc.0",
+    "@angular/platform-server": "^8.0.0-rc.0",
+    "@angular/router": "^8.0.0-rc.0",
+    "@ngtools/webpack": "0.0.0",
+    "core-js": "^3.0.0",
+    "rxjs": "^6.4.2",
+    "zone.js": "^0.9.1"
+  },
+  "devDependencies": {
+    "node-sass": "^4.7.0",
+    "performance-now": "^0.2.0",
+    "preprocess-loader": "^0.2.2",
+    "raw-loader": "^0.5.1",
+    "sass-loader": "^6.0.0",
+    "typescript": "~3.4.5",
+    "webpack": "~4.0.1",
+    "webpack-cli": "~2.0.9"
+  }
+}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/webpack.config.js b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/webpack.config.js
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/webpack.config.js
rename to tests/legacy-cli/e2e/assets/webpack/test-app-weird/webpack.config.js
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/webpack.flags.json b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/webpack.flags.json
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/webpack.flags.json
rename to tests/legacy-cli/e2e/assets/webpack/test-app-weird/webpack.flags.json
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/app.component.html b/tests/legacy-cli/e2e/assets/webpack/test-app/app/app.component.html
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/app.component.html
rename to tests/legacy-cli/e2e/assets/webpack/test-app/app/app.component.html
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/app.component.scss b/tests/legacy-cli/e2e/assets/webpack/test-app/app/app.component.scss
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/app.component.scss
rename to tests/legacy-cli/e2e/assets/webpack/test-app/app/app.component.scss
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/app.component.ts b/tests/legacy-cli/e2e/assets/webpack/test-app/app/app.component.ts
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/app.component.ts
rename to tests/legacy-cli/e2e/assets/webpack/test-app/app/app.component.ts
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/app.module.ts b/tests/legacy-cli/e2e/assets/webpack/test-app/app/app.module.ts
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/app.module.ts
rename to tests/legacy-cli/e2e/assets/webpack/test-app/app/app.module.ts
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/app/feature/feature.module.ts b/tests/legacy-cli/e2e/assets/webpack/test-app/app/feature/feature.module.ts
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/app/feature/feature.module.ts
rename to tests/legacy-cli/e2e/assets/webpack/test-app/app/feature/feature.module.ts
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/feature/lazy-feature.module.ts b/tests/legacy-cli/e2e/assets/webpack/test-app/app/feature/lazy-feature.module.ts
similarity index 77%
rename from tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/feature/lazy-feature.module.ts
rename to tests/legacy-cli/e2e/assets/webpack/test-app/app/feature/lazy-feature.module.ts
index 8fafca158b24..b7d72eab327b 100644
--- a/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/feature/lazy-feature.module.ts
+++ b/tests/legacy-cli/e2e/assets/webpack/test-app/app/feature/lazy-feature.module.ts
@@ -1,6 +1,5 @@
 import {NgModule, Component} from '@angular/core';
 import {RouterModule} from '@angular/router';
-import {HttpModule, Http} from '@angular/http';
 
 @Component({
   selector: 'lazy-feature-comp',
@@ -13,11 +12,8 @@ export class LazyFeatureComponent {}
     RouterModule.forChild([
       {path: '', component: LazyFeatureComponent, pathMatch: 'full'},
       {path: 'feature', loadChildren: './feature.module#FeatureModule'}
-    ]),
-    HttpModule
+    ])
   ],
   declarations: [LazyFeatureComponent]
 })
-export class LazyFeatureModule {
-  constructor(http: Http) {}
-}
+export class LazyFeatureModule {}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/injectable.ts b/tests/legacy-cli/e2e/assets/webpack/test-app/app/injectable.ts
similarity index 79%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/injectable.ts
rename to tests/legacy-cli/e2e/assets/webpack/test-app/app/injectable.ts
index 04d8486586c4..feb7ab0b76a8 100644
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/injectable.ts
+++ b/tests/legacy-cli/e2e/assets/webpack/test-app/app/injectable.ts
@@ -1,5 +1,5 @@
 import {Injectable, Inject, ViewContainerRef} from '@angular/core';
-import {DOCUMENT} from '@angular/platform-browser';
+import {DOCUMENT} from '@angular/common';
 
 
 @Injectable()
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/lazy.module.ts b/tests/legacy-cli/e2e/assets/webpack/test-app/app/lazy.module.ts
similarity index 82%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/lazy.module.ts
rename to tests/legacy-cli/e2e/assets/webpack/test-app/app/lazy.module.ts
index 96da4de7515b..32c07594ac3d 100644
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/lazy.module.ts
+++ b/tests/legacy-cli/e2e/assets/webpack/test-app/app/lazy.module.ts
@@ -1,6 +1,5 @@
 import {NgModule, Component} from '@angular/core';
 import {RouterModule} from '@angular/router';
-import {HttpModule, Http} from '@angular/http';
 
 @Component({
   selector: 'lazy-comp',
@@ -15,12 +14,9 @@ export class LazyComponent {}
      {path: 'feature', loadChildren: './feature/feature.module#FeatureModule'},
      {path: 'lazy-feature', loadChildren: './feature/lazy-feature.module#LazyFeatureModule'}
     ]),
-    HttpModule
   ],
   declarations: [LazyComponent]
 })
-export class LazyModule {
-  constructor(http: Http) {}
-}
+export class LazyModule {}
 
 export class SecondModule {}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/main.ts b/tests/legacy-cli/e2e/assets/webpack/test-app/app/main.ts
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-ng5/app/main.ts
rename to tests/legacy-cli/e2e/assets/webpack/test-app/app/main.ts
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/index.html b/tests/legacy-cli/e2e/assets/webpack/test-app/index.html
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/index.html
rename to tests/legacy-cli/e2e/assets/webpack/test-app/index.html
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app/package.json b/tests/legacy-cli/e2e/assets/webpack/test-app/package.json
new file mode 100644
index 000000000000..11ea587ef4da
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/webpack/test-app/package.json
@@ -0,0 +1,27 @@
+{
+  "name": "test",
+  "license": "MIT",
+  "dependencies": {
+    "@angular/common": "^8.0.0-rc.0",
+    "@angular/compiler": "^8.0.0-rc.0",
+    "@angular/compiler-cli": "^8.0.0-rc.0",
+    "@angular/core": "^8.0.0-rc.0",
+    "@angular/platform-browser": "^8.0.0-rc.0",
+    "@angular/platform-browser-dynamic": "^8.0.0-rc.0",
+    "@angular/platform-server": "^8.0.0-rc.0",
+    "@angular/router": "^8.0.0-rc.0",
+    "@ngtools/webpack": "0.0.0",
+    "core-js": "^3.0.0",
+    "rxjs": "^6.4.0",
+    "zone.js": "^0.9.1"
+  },
+  "devDependencies": {
+    "node-sass": "^4.7.0",
+    "performance-now": "^0.2.0",
+    "raw-loader": "^0.5.1",
+    "sass-loader": "^6.0.0",
+    "typescript": "~3.4.5",
+    "webpack": "~4.0.1",
+    "webpack-cli": "~2.0.9"
+  }
+}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/tsconfig.json b/tests/legacy-cli/e2e/assets/webpack/test-app/tsconfig.json
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-ng5/tsconfig.json
rename to tests/legacy-cli/e2e/assets/webpack/test-app/tsconfig.json
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-ng5/webpack.config.js b/tests/legacy-cli/e2e/assets/webpack/test-app/webpack.config.js
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-ng5/webpack.config.js
rename to tests/legacy-cli/e2e/assets/webpack/test-app/webpack.config.js
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/injectable.ts b/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/injectable.ts
deleted file mode 100644
index b357678ae77a..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/injectable.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {Injectable, Inject, ViewContainerRef} from '@angular/core';
-import {DOCUMENT} from '@angular/platform-browser';
-
-
-@Injectable()
-export class MyInjectable {
-  constructor(@Inject(DOCUMENT) public doc) {}
-}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/package.json b/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/package.json
deleted file mode 100644
index 003d0506fe8f..000000000000
--- a/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/package.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name": "test",
-  "license": "MIT",
-  "dependencies": {
-    "@angular/animations": "^5.0.0",
-    "@angular/common": "^5.0.0",
-    "@angular/compiler": "^5.0.0",
-    "@angular/compiler-cli": "^5.0.0",
-    "@angular/core": "^5.0.0",
-    "@angular/http": "^5.0.0",
-    "@angular/platform-browser": "^5.0.0",
-    "@angular/platform-browser-dynamic": "^5.0.0",
-    "@angular/platform-server": "^5.0.0",
-    "@angular/router": "^5.0.0",
-    "@ngtools/webpack": "0.0.0",
-    "core-js": "^3.0.0",
-    "rxjs": "^5.4.2",
-    "zone.js": "^0.8.14"
-  },
-  "devDependencies": {
-    "node-sass": "^4.5.0",
-    "performance-now": "^0.2.0",
-    "raw-loader": "^0.5.1",
-    "sass-loader": "^6.0.3",
-    "typescript": "~2.5.0",
-    "webpack": "~4.0.1",
-    "webpack-cli": "~2.0.9"
-  }
-}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/app.component.html b/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/app.component.html
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/app.component.html
rename to tests/legacy-cli/e2e/assets/webpack/test-server-app/app/app.component.html
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/app.component.scss b/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/app.component.scss
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/app.component.scss
rename to tests/legacy-cli/e2e/assets/webpack/test-server-app/app/app.component.scss
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/app.component.ts b/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/app.component.ts
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/app.component.ts
rename to tests/legacy-cli/e2e/assets/webpack/test-server-app/app/app.component.ts
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/app.module.ts b/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/app.module.ts
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/app.module.ts
rename to tests/legacy-cli/e2e/assets/webpack/test-server-app/app/app.module.ts
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/feature/feature.module.ts b/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/feature/feature.module.ts
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/feature/feature.module.ts
rename to tests/legacy-cli/e2e/assets/webpack/test-server-app/app/feature/feature.module.ts
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/app/feature/lazy-feature.module.ts b/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/feature/lazy-feature.module.ts
similarity index 77%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/app/feature/lazy-feature.module.ts
rename to tests/legacy-cli/e2e/assets/webpack/test-server-app/app/feature/lazy-feature.module.ts
index 8fafca158b24..b7d72eab327b 100644
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/app/feature/lazy-feature.module.ts
+++ b/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/feature/lazy-feature.module.ts
@@ -1,6 +1,5 @@
 import {NgModule, Component} from '@angular/core';
 import {RouterModule} from '@angular/router';
-import {HttpModule, Http} from '@angular/http';
 
 @Component({
   selector: 'lazy-feature-comp',
@@ -13,11 +12,8 @@ export class LazyFeatureComponent {}
     RouterModule.forChild([
       {path: '', component: LazyFeatureComponent, pathMatch: 'full'},
       {path: 'feature', loadChildren: './feature.module#FeatureModule'}
-    ]),
-    HttpModule
+    ])
   ],
   declarations: [LazyFeatureComponent]
 })
-export class LazyFeatureModule {
-  constructor(http: Http) {}
-}
+export class LazyFeatureModule {}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/injectable.ts b/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/injectable.ts
new file mode 100644
index 000000000000..3ed533966fe7
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/injectable.ts
@@ -0,0 +1,8 @@
+import {Injectable, Inject} from '@angular/core';
+import {DOCUMENT} from '@angular/common';
+
+
+@Injectable()
+export class MyInjectable {
+  constructor(@Inject(DOCUMENT) public doc) {}
+}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/app/lazy.module.ts b/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/lazy.module.ts
similarity index 81%
rename from tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/app/lazy.module.ts
rename to tests/legacy-cli/e2e/assets/webpack/test-server-app/app/lazy.module.ts
index 96da4de7515b..7430b634ec68 100644
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-weird-ng5/not/so/source/app/lazy.module.ts
+++ b/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/lazy.module.ts
@@ -1,6 +1,5 @@
 import {NgModule, Component} from '@angular/core';
 import {RouterModule} from '@angular/router';
-import {HttpModule, Http} from '@angular/http';
 
 @Component({
   selector: 'lazy-comp',
@@ -14,13 +13,10 @@ export class LazyComponent {}
      {path: '', component: LazyComponent, pathMatch: 'full'},
      {path: 'feature', loadChildren: './feature/feature.module#FeatureModule'},
      {path: 'lazy-feature', loadChildren: './feature/lazy-feature.module#LazyFeatureModule'}
-    ]),
-    HttpModule
+    ])
   ],
   declarations: [LazyComponent]
 })
-export class LazyModule {
-  constructor(http: Http) {}
-}
+export class LazyModule {}
 
 export class SecondModule {}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/main.commonjs.ts b/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/main.commonjs.ts
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/main.commonjs.ts
rename to tests/legacy-cli/e2e/assets/webpack/test-server-app/app/main.commonjs.ts
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/main.ts b/tests/legacy-cli/e2e/assets/webpack/test-server-app/app/main.ts
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/app/main.ts
rename to tests/legacy-cli/e2e/assets/webpack/test-server-app/app/main.ts
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/index.html b/tests/legacy-cli/e2e/assets/webpack/test-server-app/index.html
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/index.html
rename to tests/legacy-cli/e2e/assets/webpack/test-server-app/index.html
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/index.js b/tests/legacy-cli/e2e/assets/webpack/test-server-app/index.js
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/index.js
rename to tests/legacy-cli/e2e/assets/webpack/test-server-app/index.js
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app/package.json b/tests/legacy-cli/e2e/assets/webpack/test-server-app/package.json
new file mode 100644
index 000000000000..5f30c3cb4556
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/webpack/test-server-app/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "test",
+  "license": "MIT",
+  "dependencies": {
+    "@angular/animations": "^8.0.0-rc.0",
+    "@angular/common": "^8.0.0-rc.0",
+    "@angular/compiler": "^8.0.0-rc.0",
+    "@angular/compiler-cli": "^8.0.0-rc.0",
+    "@angular/core": "^8.0.0-rc.0",
+    "@angular/platform-browser": "^8.0.0-rc.0",
+    "@angular/platform-browser-dynamic": "^8.0.0-rc.0",
+    "@angular/platform-server": "^8.0.0-rc.0",
+    "@angular/router": "^8.0.0-rc.0",
+    "@ngtools/webpack": "0.0.0",
+    "core-js": "^3.0.0",
+    "rxjs": "^6.4.2",
+    "zone.js": "^0.9.1"
+  },
+  "devDependencies": {
+    "node-sass": "^4.5.0",
+    "performance-now": "^0.2.0",
+    "raw-loader": "^0.5.1",
+    "sass-loader": "^6.0.3",
+    "typescript": "~3.4.5",
+    "webpack": "~4.0.1",
+    "webpack-cli": "~2.0.9"
+  }
+}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/tsconfig.json b/tests/legacy-cli/e2e/assets/webpack/test-server-app/tsconfig.json
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/tsconfig.json
rename to tests/legacy-cli/e2e/assets/webpack/test-server-app/tsconfig.json
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/webpack.config.js b/tests/legacy-cli/e2e/assets/webpack/test-server-app/webpack.config.js
similarity index 100%
rename from tests/legacy-cli/e2e/assets/webpack/test-server-app-ng5/webpack.config.js
rename to tests/legacy-cli/e2e/assets/webpack/test-server-app/webpack.config.js
diff --git a/tests/legacy-cli/e2e/tests/packages/webpack/server-ng5.ts b/tests/legacy-cli/e2e/tests/packages/webpack/server-app.ts
similarity index 94%
rename from tests/legacy-cli/e2e/tests/packages/webpack/server-ng5.ts
rename to tests/legacy-cli/e2e/tests/packages/webpack/server-app.ts
index c2f975d34fe7..992cbe4de699 100644
--- a/tests/legacy-cli/e2e/tests/packages/webpack/server-ng5.ts
+++ b/tests/legacy-cli/e2e/tests/packages/webpack/server-app.ts
@@ -10,7 +10,7 @@ export default function (skipCleaning: () => void) {
   return;
 
   return Promise.resolve()
-    .then(() => createProjectFromAsset('webpack/test-server-app-ng5'))
+    .then(() => createProjectFromAsset('webpack/test-server-app'))
     .then(() => exec(normalize('node_modules/.bin/webpack-cli')))
     .then(() => expectFileToMatch('dist/app.main.js',
       new RegExp('MyInjectable.ctorParameters = .*'
diff --git a/tests/legacy-cli/e2e/tests/packages/webpack/test-ng5.ts b/tests/legacy-cli/e2e/tests/packages/webpack/test-app.ts
similarity index 89%
rename from tests/legacy-cli/e2e/tests/packages/webpack/test-ng5.ts
rename to tests/legacy-cli/e2e/tests/packages/webpack/test-app.ts
index f30d5fa250c2..8a7a09072186 100644
--- a/tests/legacy-cli/e2e/tests/packages/webpack/test-ng5.ts
+++ b/tests/legacy-cli/e2e/tests/packages/webpack/test-app.ts
@@ -6,9 +6,9 @@ import {expectFileSizeToBeUnder, replaceInFile, expectFileToMatch} from '../../.
 
 export default function(skipCleaning: () => void) {
   return Promise.resolve()
-    .then(() => createProjectFromAsset('webpack/test-app-ng5'))
+    .then(() => createProjectFromAsset('webpack/test-app'))
     .then(() => exec(normalize('node_modules/.bin/webpack-cli')))
-    .then(() => expectFileSizeToBeUnder('dist/app.main.js', 375 * 1024))
+    .then(() => expectFileSizeToBeUnder('dist/app.main.js', 470 * 1024))
     .then(() => expectFileSizeToBeUnder('dist/0.app.main.js', 25 * 1024))
     .then(() => expectFileSizeToBeUnder('dist/1.app.main.js', 2 * 1024))
     // test resource urls without ./
diff --git a/tests/legacy-cli/e2e/tests/packages/webpack/weird-ng5.ts b/tests/legacy-cli/e2e/tests/packages/webpack/weird-app.ts
similarity index 92%
rename from tests/legacy-cli/e2e/tests/packages/webpack/weird-ng5.ts
rename to tests/legacy-cli/e2e/tests/packages/webpack/weird-app.ts
index 49546dd3b988..99b012c98d0a 100644
--- a/tests/legacy-cli/e2e/tests/packages/webpack/weird-ng5.ts
+++ b/tests/legacy-cli/e2e/tests/packages/webpack/weird-app.ts
@@ -8,8 +8,11 @@ import {expectToFail} from '../../../utils/utils';
 
 
 export default function(skipCleaning: () => void) {
+  // This test was broken in angular 8
+  return;
+
   return Promise.resolve()
-    .then(() => createProjectFromAsset('webpack/test-app-weird-ng5'))
+    .then(() => createProjectFromAsset('webpack/test-app-weird'))
     .then(() => exec(normalize('node_modules/.bin/webpack-cli')))
     .then(() => expectFileToExist('dist/app.main.js'))
     .then(() => expectFileToExist('dist/0.app.main.js'))
diff --git a/tests/legacy-cli/e2e/utils/fs.ts b/tests/legacy-cli/e2e/utils/fs.ts
index 4beb03021e1f..6b696065b829 100644
--- a/tests/legacy-cli/e2e/utils/fs.ts
+++ b/tests/legacy-cli/e2e/utils/fs.ts
@@ -202,6 +202,6 @@ export async function expectFileSizeToBeUnder(fileName: string, sizeInBytes: num
   const fileSize = await getFileSize(fileName);
 
   if (fileSize > sizeInBytes) {
-    throw new Error(`File "${fileName}" exceeded file size of "${sizeInBytes}".`);
+    throw new Error(`File "${fileName}" exceeded file size of "${sizeInBytes}". Size is ${fileSize}.`);
   }
 }

From 8b89cbdb5310cca045c0e51b765e6aad476ec9a1 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 29 May 2019 20:20:33 +0000
Subject: [PATCH 1399/1703] build: update com_google_protobuf to version

---
 WORKSPACE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WORKSPACE b/WORKSPACE
index 7674029bba46..3feedcb097ee 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -12,7 +12,7 @@ http_archive(
 # We use protocol buffers for the Build Event Protocol
 git_repository(
     name = "com_google_protobuf",
-    commit = "b6375e03aa80274dae89410efdf46346413b2247",
+    commit = "beaeaeda34e97a6ff9735b33a66e011102ab506b",
     remote = "https://github.com/protocolbuffers/protobuf",
 )
 

From 559e7423bea253f13d51fcc54f6fe7eb0fa4db67 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 29 May 2019 05:19:01 +0000
Subject: [PATCH 1400/1703] build: update browserslist to version 4.6.1

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 38 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 5a0a1c503bee..0f5676b4c5f7 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -14,7 +14,7 @@
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.10.0",
     "autoprefixer": "9.5.1",
-    "browserslist": "4.6.0",
+    "browserslist": "4.6.1",
     "caniuse-api": "3.0.0",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
diff --git a/yarn.lock b/yarn.lock
index ba08aeb099e5..79f5a9f57c18 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1628,14 +1628,14 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.0.tgz#5274028c26f4d933d5b1323307c1d1da5084c9ff"
-  integrity sha512-Jk0YFwXBuMOOol8n6FhgkDzn3mY9PYLYGk29zybF05SbRTsMgPqmTNeQQhOghCxq5oFqAXE3u4sYddr4C0uRhg==
+browserslist@4.6.1:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.1.tgz#ee5059b1aec18cbec9d055d6cb5e24ae50343a9b"
+  integrity sha512-1MC18ooMPRG2UuVFJTHFIAkk6mpByJfxCrnUyvSlu/hyQSFHMrlhM02SzNuCV+quTP4CKmqtOMAIjrifrpBJXQ==
   dependencies:
-    caniuse-lite "^1.0.30000967"
-    electron-to-chromium "^1.3.133"
-    node-releases "^1.1.19"
+    caniuse-lite "^1.0.30000971"
+    electron-to-chromium "^1.3.137"
+    node-releases "^1.1.21"
 
 browserslist@^4.0.0, browserslist@^4.3.3, browserslist@^4.5.4:
   version "4.5.5"
@@ -1891,10 +1891,10 @@ caniuse-lite@^1.0.30000960:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000960.tgz#ec48297037e5607f582f246ae7b12bee66a78999"
   integrity sha512-7nK5qs17icQaX6V3/RYrJkOsZyRNnroA4+ZwxaKJzIKy+crIy0Mz5CBlLySd2SNV+4nbUZeqeNfiaEieUBu3aA==
 
-caniuse-lite@^1.0.30000967:
-  version "1.0.30000967"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000967.tgz#a5039577806fccee80a04aaafb2c0890b1ee2f73"
-  integrity sha512-rUBIbap+VJfxTzrM4akJ00lkvVb5/n5v3EGXfWzSH5zT8aJmGzjA8HWhJ4U6kCpzxozUSnB+yvAYDRPY6mRpgQ==
+caniuse-lite@^1.0.30000971:
+  version "1.0.30000971"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000971.tgz#d1000e4546486a6977756547352bc96a4cfd2b13"
+  integrity sha512-TQFYFhRS0O5rdsmSbF1Wn+16latXYsQJat66f7S7lizXW1PVpWJeZw9wqqVLIjuxDRz7s7xRUj13QCfd8hKn6g==
 
 canonical-path@1.0.0:
   version "1.0.0"
@@ -3193,10 +3193,10 @@ electron-to-chromium@^1.3.124:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
   integrity sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==
 
-electron-to-chromium@^1.3.133:
-  version "1.3.133"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.133.tgz#c47639c19b91feee3e22fad69f5556142007008c"
-  integrity sha512-lyoC8aoqbbDqsprb6aPdt9n3DpOZZzdz/T4IZKsR0/dkZIxnJVUjjcpOSwA66jPRIOyDAamCTAUqweU05kKNSg==
+electron-to-chromium@^1.3.137:
+  version "1.3.137"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.137.tgz#ba7c88024984c038a5c5c434529aabcea7b42944"
+  integrity sha512-kGi32g42a8vS/WnYE7ELJyejRT7hbr3UeOOu0WeuYuQ29gCpg9Lrf6RdcTQVXSt/v0bjCfnlb/EWOOsiKpTmkw==
 
 elliptic@^6.0.0:
   version "6.4.1"
@@ -6603,10 +6603,10 @@ node-releases@^1.1.14:
   dependencies:
     semver "^5.3.0"
 
-node-releases@^1.1.19:
-  version "1.1.19"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.19.tgz#c492d1e381fea0350b338b646c27867e88e91b3d"
-  integrity sha512-SH/B4WwovHbulIALsQllAVwqZZD1kPmKCqrhGfR29dXjLAVZMHvBjD3S6nL9D/J9QkmZ1R92/0wCMDKXUUvyyA==
+node-releases@^1.1.21:
+  version "1.1.21"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.21.tgz#46c86f9adaceae4d63c75d3c2f2e6eee618e55f3"
+  integrity sha512-TwnURTCjc8a+ElJUjmDqU6+12jhli1Q61xOQmdZ7ECZVBZuQpN/1UnembiIHDM1wCcfLvh5wrWXUF5H6ufX64Q==
   dependencies:
     semver "^5.3.0"
 

From e7419d5d24f453de0352436c8d8814b43f43521d Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 29 May 2019 06:18:19 +0000
Subject: [PATCH 1401/1703] build: update semver to version 6.1.1

---
 package.json                                       | 2 +-
 packages/angular/cli/package.json                  | 2 +-
 packages/angular_devkit/build_angular/package.json | 2 +-
 packages/schematics/update/package.json            | 2 +-
 yarn.lock                                          | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index f0fd351929a8..94a029b462f9 100644
--- a/package.json
+++ b/package.json
@@ -127,7 +127,7 @@
     "pidtree": "^0.3.0",
     "pidusage": "^2.0.17",
     "rxjs": "~6.4.0",
-    "semver": "6.1.0",
+    "semver": "6.1.1",
     "source-map": "^0.5.6",
     "source-map-support": "^0.5.0",
     "spdx-satisfies": "^4.0.0",
diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 9c3ac1b449f4..57bbcce14c45 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -38,7 +38,7 @@
     "open": "6.3.0",
     "pacote": "9.5.0",
     "read-package-tree": "5.2.2",
-    "semver": "6.1.0",
+    "semver": "6.1.1",
     "symbol-observable": "1.2.0",
     "universal-analytics": "^0.4.20",
     "uuid": "^3.3.2"
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 0f5676b4c5f7..cbe64581ea69 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -39,7 +39,7 @@
     "rxjs": "6.4.0",
     "sass": "1.20.1",
     "sass-loader": "7.1.0",
-    "semver": "6.1.0",
+    "semver": "6.1.1",
     "source-map-support": "0.5.12",
     "source-map-loader": "0.2.4",
     "speed-measure-webpack-plugin": "1.3.1",
diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index 2f933b51adfd..f0f19cbf9269 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -16,7 +16,7 @@
     "@yarnpkg/lockfile": "1.1.0",
     "ini": "1.3.5",
     "pacote": "9.5.0",
-    "semver": "6.1.0",
+    "semver": "6.1.1",
     "semver-intersect": "1.4.0",
     "rxjs": "6.4.0"
   }
diff --git a/yarn.lock b/yarn.lock
index 79f5a9f57c18..9abdb6f6082a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8527,10 +8527,10 @@ semver-intersect@1.4.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
   integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
 
-semver@6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.0.tgz#e95dc415d45ecf03f2f9f83b264a6b11f49c0cca"
-  integrity sha512-kCqEOOHoBcFs/2Ccuk4Xarm/KiWRSLEX9CAZF8xkJ6ZPlIoTZ8V5f7J16vYLJqDbR7KrxTJpR2lqjIEm2Qx9cQ==
+semver@6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
+  integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==
 
 semver@^6.0.0:
   version "6.0.0"

From a976e45f8b5d29b7d7cd623287307477b0bd7c1a Mon Sep 17 00:00:00 2001
From: Nick Webster <nick@nick.geek.nz>
Date: Fri, 29 Mar 2019 16:18:38 +1300
Subject: [PATCH 1402/1703] fix(@angular-devkit/build-angular): exclude map
 files from 'bundle' budgets

---
 .../angular-cli-files/utilities/bundle-calculator.ts |  1 +
 .../test/browser/bundle-budgets_spec_large.ts        | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator.ts
index 62c9fb652e69..8af29c8e1208 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator.ts
@@ -48,6 +48,7 @@ class BundleCalculator extends Calculator {
     const size: number = this.compilation.chunks
       .filter(chunk => chunk.name === this.budget.name)
       .reduce((files, chunk) => [...files, ...chunk.files], [])
+      .filter((file: string) => !file.endsWith('.map'))
       .map((file: string) => this.compilation.assets[file].size())
       .reduce((total: number, size: number) => total + size, 0);
 
diff --git a/packages/angular_devkit/build_angular/test/browser/bundle-budgets_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/bundle-budgets_spec_large.ts
index 2217f019aaf3..37e150210ecb 100644
--- a/packages/angular_devkit/build_angular/test/browser/bundle-budgets_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/bundle-budgets_spec_large.ts
@@ -65,6 +65,18 @@ describe('Browser Builder bundle budgets', () => {
   });
 
   describe(`should ignore '.map' files`, () => {
+    it(`when 'bundle' budget`, async () => {
+      const overrides = {
+        optimization: true,
+        budgets: [{ type: 'bundle', name: 'main', maximumError: '3Kb' }],
+      };
+
+      const run = await architect.scheduleTarget(targetSpec, overrides);
+      const output = await run.result;
+      expect(output.success).toBe(true);
+      await run.stop();
+    });
+
     it(`when 'intial' budget`, async () => {
       const overrides = {
         optimization: true,

From 3b46107a2fb4f586e4f61d77c93282673414ab68 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 29 May 2019 18:42:19 +0000
Subject: [PATCH 1403/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 7c36612aefe5..70ef51550c15 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#421ef090faf1f49604efba0444939db11f08130c",
-    "@angular/common": "github:angular/common-builds#fdb501a03169b4af2727ecfe9cf2ea51aea29bf2",
-    "@angular/compiler": "github:angular/compiler-builds#bb7e6ece56f2f8141e61a6083512b12c2106d1df",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#ba4494fa4f4da1f90164e3b2b757e2f213c03821",
-    "@angular/core": "github:angular/core-builds#be71bbe4eb9fd3be315d5f22d6b2ffc3e3f287ce",
-    "@angular/forms": "github:angular/forms-builds#f01cff105563fd0f73ca0d0ed122d8eac4be4f94",
-    "@angular/language-service": "github:angular/language-service-builds#232a6a1fbb2beb9364a14f847d1490fce8f42fdf",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#68e5d25b0b5db2c84a1b6f12650c029cd399f583",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#35339ea39a9469a13e278e28c82a97d8d7be184c",
-    "@angular/router": "github:angular/router-builds#8938ec2932bb08040ab0b02f203155c03aab7835"
+    "@angular/animations": "github:angular/animations-builds#1e34cab0423db59c3b364c948337d74ce4f655f0",
+    "@angular/common": "github:angular/common-builds#3830190f3c40574b790bb3293eec43922504a7d1",
+    "@angular/compiler": "github:angular/compiler-builds#dec1d0ae65eb72be351688f41942aa7906d63a85",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#760f674ae4521cbb3e466cecebf6d56a2298d2ff",
+    "@angular/core": "github:angular/core-builds#3c57d29f87d0e6d04019458bf9039ca7a761e692",
+    "@angular/forms": "github:angular/forms-builds#05058433150bd292035551f3ba494fe5067ba5b6",
+    "@angular/language-service": "github:angular/language-service-builds#f93bbf43d420a6de2143797384754b7ec520bde0",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#6275982f552fa3be5cc6357ad77417ce9bc535ac",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#a698e7053da378af94b0866c9d1c11863ac5139c",
+    "@angular/router": "github:angular/router-builds#cde8b1753d043667fe2548495fab136307c325f2"
   }
 }
\ No newline at end of file

From 6ec09919b5c2695dee784ce0c3accee7f9754bb0 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 30 May 2019 17:23:02 -0400
Subject: [PATCH 1404/1703] test: fix prelease CLI E2E check

---
 tests/legacy-cli/e2e/utils/project.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts
index df27b4fd027f..7960614d06b5 100644
--- a/tests/legacy-cli/e2e/utils/project.ts
+++ b/tests/legacy-cli/e2e/utils/project.ts
@@ -500,6 +500,7 @@ export function useNg4() {
 
 export async function isPrereleaseCli() {
   const angularCliPkgJson = JSON.parse(await readFile('node_modules/@angular/cli/package.json'));
+  const pre = prerelease(angularCliPkgJson.version);
 
-  return prerelease(angularCliPkgJson.version).length > 0;
+  return pre && pre.length > 0;
 }

From 24f37a602c8a3ca1f3dcd771e50fc7983bb49036 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Tue, 28 May 2019 15:25:23 +0100
Subject: [PATCH 1405/1703] feat(@schematics/angular): default Ivy apps to AOT
 true

Testing on AIO with Angular master as of 28/05/2019 I got these results:
JIT ~414ms (369, 378, 408, 323, 593)
AOT using VE ~1383ms (1365, 1185, 1767, 1135, 1467)
AOT using Ivy ~517ms (600, 391, 444, 756, 394)

This is largely due to https://github.com/angular/angular/pull/29380 and https://github.com/angular/angular/pull/30238.

The second PR above was not merged to master, and thus will not be in 8.0.0. This PR should be merged to match it.
---
 .../schematics/angular/application/index.ts    |  1 +
 .../angular/application/index_spec.ts          | 18 ++++++++++++++++++
 tests/legacy-cli/e2e/tests/build/polyfills.ts  |  4 ++--
 .../e2e/tests/build/script-target.ts           | 10 +++++-----
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index c2089f970ee8..4b4ac3f3e1c5 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -194,6 +194,7 @@ function addAppToWorkspaceFile(options: ApplicationOptions, appDir: string): Rul
           main: `${sourceRoot}/main.ts`,
           polyfills: `${sourceRoot}/polyfills.ts`,
           tsConfig: `${projectRoot}tsconfig.app.json`,
+          aot: !!options.enableIvy,
           assets: [
             `${sourceRoot}/favicon.ico`,
             `${sourceRoot}/assets`,
diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
index 7a4435080466..65dd365c38cb 100644
--- a/packages/schematics/angular/application/index_spec.ts
+++ b/packages/schematics/angular/application/index_spec.ts
@@ -213,6 +213,24 @@ describe('Application Schematic', () => {
     ]));
   });
 
+  it('should set AOT option to false for VE projects', async () => {
+    const options = { ...defaultOptions };
+
+    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+      .toPromise();
+    const workspace = JSON.parse(tree.readContent('/angular.json'));
+    expect(workspace.projects.foo.architect.build.options.aot).toEqual(false);
+  });
+
+  it('should set AOT option to true for Ivy projects', async () => {
+    const options = { ...defaultOptions, enableIvy: true };
+
+    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+      .toPromise();
+    const workspace = JSON.parse(tree.readContent('/angular.json'));
+    expect(workspace.projects.foo.architect.build.options.aot).toEqual(true);
+  });
+
   describe(`update package.json`, () => {
     it(`should add build-angular to devDependencies`, async () => {
       const tree = await schematicRunner.runSchematicAsync('application', defaultOptions, workspaceTree)
diff --git a/tests/legacy-cli/e2e/tests/build/polyfills.ts b/tests/legacy-cli/e2e/tests/build/polyfills.ts
index 9588ca29a254..170574e17396 100644
--- a/tests/legacy-cli/e2e/tests/build/polyfills.ts
+++ b/tests/legacy-cli/e2e/tests/build/polyfills.ts
@@ -9,7 +9,7 @@ import { ng } from '../../utils/process';
 import { expectToFail } from '../../utils/utils';
 
 export default async function () {
-    await ng('build');
+    await ng('build', '--aot=false');
     // files were created successfully
     await expectFileToMatch('dist/test-project/polyfills-es5.js', 'core-js/proposals/reflect-metadata');
     await expectFileToMatch('dist/test-project/polyfills-es5.js', 'zone.js');
@@ -21,7 +21,7 @@ export default async function () {
     `);
     const jitPolyfillSize = await getFileSize('dist/test-project/polyfills-es5.js');
 
-    await ng('build', '--aot');
+    await ng('build', '--aot=true');
     // files were created successfully
     await expectFileToExist('dist/test-project/polyfills-es5.js');
     await expectFileSizeToBeUnder('dist/test-project/polyfills-es5.js', jitPolyfillSize);
diff --git a/tests/legacy-cli/e2e/tests/build/script-target.ts b/tests/legacy-cli/e2e/tests/build/script-target.ts
index b7eb6a896b8a..91d00eca3c79 100644
--- a/tests/legacy-cli/e2e/tests/build/script-target.ts
+++ b/tests/legacy-cli/e2e/tests/build/script-target.ts
@@ -8,7 +8,7 @@ import { expectToFail } from '../../utils/utils';
 export default function () {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
-  // Skip this test in Angular 2, it had different bundles.	
+  // Skip this test in Angular 2, it had different bundles.
   if (getGlobalVariable('argv')['ng2']) {
     return Promise.resolve();
   }
@@ -19,7 +19,7 @@ export default function () {
       compilerOptions['target'] = 'es2015';
     }))
     .then(() => ng('build', '--optimization', '--output-hashing=none', '--vendor-chunk'))
-    // Check class constructors are present in the vendor output.	
-    .then(() => expectFileToMatch('dist/test-project/vendor-es2015.js', /class \w{constructor\(\){/))
-    .then(() => expectToFail(() => expectFileToMatch('dist/test-project/vendor-es5.js', /class \w{constructor\(\){/)));
-}
\ No newline at end of file
+    // Check class constructors are present in the vendor output.
+    .then(() => expectFileToMatch('dist/test-project/vendor-es2015.js', /class \w{constructor\(/))
+    .then(() => expectToFail(() => expectFileToMatch('dist/test-project/vendor-es5.js', /class \w{constructor\(/)));
+}

From 3ec845caf37dc624e0b4e43a1b4f7de2dab64793 Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Tue, 28 May 2019 09:36:07 -0700
Subject: [PATCH 1406/1703] docs: make connection of live-reload and
 public-host explicit

---
 .../angular_devkit/build_angular/src/dev-server/schema.json   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/dev-server/schema.json b/packages/angular_devkit/build_angular/src/dev-server/schema.json
index 2257fd4cecc1..02172ed3fbbd 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/schema.json
+++ b/packages/angular_devkit/build_angular/src/dev-server/schema.json
@@ -49,12 +49,12 @@
     },
     "liveReload": {
       "type": "boolean",
-      "description": "Whether to reload the page on change, using live-reload.",
+      "description": "Whether to reload the page on change, using live-reload with the public host.",
       "default": true
     },
     "publicHost": {
       "type": "string",
-      "description": "Specify the URL that the browser client will use."
+      "description": "Specify the URL that the browser client will use for live reload."
     },
     "servePath": {
       "type": "string",

From 7ef64dbe46cb2539a49569a6b084270ab8a6d4ae Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Tue, 28 May 2019 09:47:30 -0700
Subject: [PATCH 1407/1703] docs: more complete description

---
 .../angular_devkit/build_angular/src/dev-server/schema.json   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/dev-server/schema.json b/packages/angular_devkit/build_angular/src/dev-server/schema.json
index 02172ed3fbbd..731ef39e459c 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/schema.json
+++ b/packages/angular_devkit/build_angular/src/dev-server/schema.json
@@ -49,12 +49,12 @@
     },
     "liveReload": {
       "type": "boolean",
-      "description": "Whether to reload the page on change, using live-reload with the public host.",
+      "description": "Whether to reload the page on change, using live-reload.",
       "default": true
     },
     "publicHost": {
       "type": "string",
-      "description": "Specify the URL that the browser client will use for live reload."
+      "description": "The URL that the browser client (or live-reload client, if enabled) should use to connect to the development server. Use for a complex dev server setup, such as one with reverse proxies."
     },
     "servePath": {
       "type": "string",

From bebd8b6c0964a1de4e2b39a50e9ae1012a35c12f Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Thu, 30 May 2019 08:39:49 +0200
Subject: [PATCH 1408/1703] refactor: use standard node resolution and use
 async/await instead of rxjs

---
 .../schematics/tasks/tslint-fix/executor.ts   | 202 ++++++++----------
 1 file changed, 92 insertions(+), 110 deletions(-)

diff --git a/packages/angular_devkit/schematics/tasks/tslint-fix/executor.ts b/packages/angular_devkit/schematics/tasks/tslint-fix/executor.ts
index d933945d5f53..0d6224e0d318 100644
--- a/packages/angular_devkit/schematics/tasks/tslint-fix/executor.ts
+++ b/packages/angular_devkit/schematics/tasks/tslint-fix/executor.ts
@@ -5,25 +5,16 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { resolve } from '@angular-devkit/core/node';
 import * as fs from 'fs';
 import * as path from 'path';
-import { Observable } from 'rxjs';
-import {
-  Configuration as ConfigurationNS,
-  Linter as LinterNS,
-} from 'tslint';  // tslint:disable-line:no-implicit-dependencies
+import * as tsLint from 'tslint';  // tslint:disable-line:no-implicit-dependencies
 import * as ts from 'typescript';  // tslint:disable-line:no-implicit-dependencies
 import { SchematicContext, TaskExecutor } from '../../src';
 import { TslintFixTaskOptions } from './options';
 
 
-type ConfigurationT = typeof ConfigurationNS;
-type LinterT = typeof LinterNS;
-
-
 function _loadConfiguration(
-  Configuration: ConfigurationT,
+  Configuration: typeof tsLint.Configuration,
   options: TslintFixTaskOptions,
   root: string,
   file?: string,
@@ -89,114 +80,105 @@ function _listAllFiles(root: string): string[] {
 }
 
 
-export default function(): TaskExecutor<TslintFixTaskOptions> {
-  return (options: TslintFixTaskOptions, context: SchematicContext) => {
-    return new Observable(obs => {
-      const root = process.cwd();
-      const tslint = require(resolve('tslint', {
-        basedir: root,
-        checkGlobal: true,
-        checkLocal: true,
-      }));
-      const includes = (
-        Array.isArray(options.includes)
-          ? options.includes
-          : (options.includes ? [options.includes] : [])
-      );
-      const files = (
-        Array.isArray(options.files)
-          ? options.files
-          : (options.files ? [options.files] : [])
-      );
-
-      const Linter = tslint.Linter as LinterT;
-      const Configuration = tslint.Configuration as ConfigurationT;
-      let program: ts.Program | undefined = undefined;
-      let filesToLint: string[] = files;
+export default function (): TaskExecutor<TslintFixTaskOptions> {
+  return async (options: TslintFixTaskOptions, context: SchematicContext) => {
+    const root = process.cwd();
+    const tslint = await import('tslint'); // tslint:disable-line:no-implicit-dependencies
+
+    const includes = (
+      Array.isArray(options.includes)
+        ? options.includes
+        : (options.includes ? [options.includes] : [])
+    );
+    const files = (
+      Array.isArray(options.files)
+        ? options.files
+        : (options.files ? [options.files] : [])
+    );
+
+    const Linter = tslint.Linter;
+    const Configuration = tslint.Configuration;
+    let program: ts.Program | undefined = undefined;
+    let filesToLint: string[] = files;
+
+    if (options.tsConfigPath && files.length == 0) {
+      const tsConfigPath = path.join(process.cwd(), options.tsConfigPath);
+
+      if (!fs.existsSync(tsConfigPath)) {
+        throw new Error('Could not find tsconfig.');
+      }
 
-      if (options.tsConfigPath && files.length == 0) {
-        const tsConfigPath = path.join(process.cwd(), options.tsConfigPath);
+      program = Linter.createProgram(tsConfigPath);
+      filesToLint = Linter.getFileNames(program);
+    }
 
-        if (!fs.existsSync(tsConfigPath)) {
-          obs.error(new Error('Could not find tsconfig.'));
+    if (includes.length > 0) {
+      const allFilesRel = _listAllFiles(root);
+      const pattern = '^('
+        + (includes as string[])
+          .map(ex => '('
+            + ex.split(/[\/\\]/g).map(f => f
+              .replace(/[\-\[\]{}()+?.^$|]/g, '\\$&')
+              .replace(/^\*\*/g, '(.+?)?')
+              .replace(/\*/g, '[^/\\\\]*'))
+              .join('[\/\\\\]')
+            + ')')
+          .join('|')
+        + ')($|/|\\\\)';
+      const re = new RegExp(pattern);
+
+      filesToLint.push(...allFilesRel
+        .filter(x => re.test(x))
+        .map(x => path.join(root, x)),
+      );
+    }
 
-          return;
-        }
-        program = Linter.createProgram(tsConfigPath);
-        filesToLint = Linter.getFileNames(program);
+    const lintOptions = {
+      fix: true,
+      formatter: options.format || 'prose',
+    };
+
+    const linter = new Linter(lintOptions, program);
+    // If directory doesn't change, we
+    let lastDirectory: string | null = null;
+    let config;
+
+    for (const file of filesToLint) {
+      const dir = path.dirname(file);
+      if (lastDirectory !== dir) {
+        lastDirectory = dir;
+        config = _loadConfiguration(Configuration, options, root, file);
       }
+      const content = _getFileContent(file, options, program);
 
-      if (includes.length > 0) {
-        const allFilesRel = _listAllFiles(root);
-        const pattern = '^('
-          + (includes as string[])
-            .map(ex => '('
-              + ex.split(/[\/\\]/g).map(f => f
-                .replace(/[\-\[\]{}()+?.^$|]/g, '\\$&')
-                .replace(/^\*\*/g, '(.+?)?')
-                .replace(/\*/g, '[^/\\\\]*'))
-                .join('[\/\\\\]')
-              + ')')
-            .join('|')
-          + ')($|/|\\\\)';
-        const re = new RegExp(pattern);
-
-        filesToLint.push(...allFilesRel
-          .filter(x => re.test(x))
-          .map(x => path.join(root, x)),
-        );
+      if (!content) {
+        continue;
       }
 
-      const lintOptions = {
-        fix: true,
-        formatter: options.format || 'prose',
-      };
-
-      const linter = new Linter(lintOptions, program);
-      // If directory doesn't change, we
-      let lastDirectory: string | null = null;
-      let config;
-
-      for (const file of filesToLint) {
-        const dir = path.dirname(file);
-        if (lastDirectory !== dir) {
-          lastDirectory = dir;
-          config = _loadConfiguration(Configuration, options, root, file);
-        }
-        const content = _getFileContent(file, options, program);
-
-        if (!content) {
-          continue;
-        }
-
-        linter.lint(file, content, config);
-      }
+      linter.lint(file, content, config);
+    }
 
-      const result = linter.getResult();
-
-      // Format and show the results.
-      if (!options.silent) {
-        const Formatter = tslint.findFormatter(options.format || 'prose');
-        if (!Formatter) {
-          throw new Error(`Invalid lint format "${options.format}".`);
-        }
-        const formatter = new Formatter();
-
-        // Certain tslint formatters outputs '\n' when there are no failures.
-        // This will bloat the console when having schematics running refactor tasks.
-        // see https://github.com/palantir/tslint/issues/4244
-        const output = (formatter.format(result.failures, result.fixes) || '').trim();
-        if (output) {
-          context.logger.info(output);
-        }
-      }
+    const result = linter.getResult();
 
-      if (!options.ignoreErrors && result.errorCount > 0) {
-        obs.error(new Error('Lint errors were found.'));
-      } else {
-        obs.next();
-        obs.complete();
+    // Format and show the results.
+    if (!options.silent) {
+      const Formatter = tslint.findFormatter(options.format || 'prose');
+      if (!Formatter) {
+        throw new Error(`Invalid lint format "${options.format}".`);
       }
-    });
+      const formatter = new Formatter();
+
+      // Certain tslint formatters outputs '\n' when there are no failures.
+      // This will bloat the console when having schematics running refactor tasks.
+      // see https://github.com/palantir/tslint/issues/4244
+      const output = (formatter.format(result.failures, result.fixes) || '').trim();
+      if (output) {
+        context.logger.info(output);
+      }
+    }
+
+    if (!options.ignoreErrors && result.errorCount > 0) {
+      throw new Error('Lint errors were found.');
+    }
   };
 }

From f5200775f9af988ae6f7755b173b59501f241d5d Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sat, 1 Jun 2019 17:57:30 +0200
Subject: [PATCH 1409/1703] fix(@angular-devkit/build-optimizer): wrap es2015
 class expressions for better tree-shaking

ClassExpressions such as the below are not treeshakable unless we wrap them in an IIFE

```js
let AggregateColumnDirective = class AggregateColumnDirective {
	constructor(viewContainerRef) { }
};
AggregateColumnDirective = __decorate([
	Directive({}),
	__metadata("design:paramtypes", [ViewContainerRef])
], AggregateColumnDirective);
```

With this change we wrap the above in an IIFE and mark it as a PURE function.
```js
const AggregateColumnDirective = /*@__PURE__*/ (() => {
	let AggregateColumnDirective = class AggregateColumnDirective {
		constructor(viewContainerRef) { }
	};
	AggregateColumnDirective = __decorate([
		Directive({}),
		__metadata("design:paramtypes", [ViewContainerRef])
	], AggregateColumnDirective);

	return AggregateColumnDirective;
})();
```

With this pattern if the class is unused it will be dropped.

Note: In future we should rename `wrap-enums` to something more generic, and combine class-fold with this transformer especially considering the future fix that needs to be done for https://github.com/angular/angular-cli/issues/14610

Fixes #14577
---
 .../src/transforms/wrap-enums.ts              | 104 ++-
 .../src/transforms/wrap-enums_spec.ts         | 631 +++++++++++-------
 2 files changed, 480 insertions(+), 255 deletions(-)

diff --git a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
index 8b2341cdd00f..5cd0fcdfbf48 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
@@ -61,7 +61,7 @@ function visitBlockStatements(
   };
 
   // 'oIndex' is the original statement index; 'uIndex' is the updated statement index
-  for (let oIndex = 0, uIndex = 0; oIndex < statements.length; oIndex++, uIndex++) {
+  for (let oIndex = 0, uIndex = 0; oIndex < statements.length - 1; oIndex++, uIndex++) {
     const currentStatement = statements[oIndex];
 
     // these can't contain an enum declaration
@@ -74,9 +74,14 @@ function visitBlockStatements(
     //   * be a variable statement
     //   * have only one declaration
     //   * have an identifer as a declaration name
-    if (oIndex < statements.length - 1
-        && ts.isVariableStatement(currentStatement)
-        && currentStatement.declarationList.declarations.length === 1) {
+
+    // ClassExpression declarations must:
+    //   * not be last statement
+    //   * be a variable statement
+    //   * have only one declaration
+    //   * have an ClassExpression as a initializer
+    if (ts.isVariableStatement(currentStatement)
+      && currentStatement.declarationList.declarations.length === 1) {
 
       const variableDeclaration = currentStatement.declarationList.declarations[0];
       if (ts.isIdentifier(variableDeclaration.name)) {
@@ -148,6 +153,23 @@ function visitBlockStatements(
             oIndex += enumStatements.length;
             continue;
           }
+        } else if (ts.isClassExpression(variableDeclaration.initializer)) {
+          const classStatements = findClassExpressionStatements(name, statements, oIndex);
+          if (!classStatements) {
+            continue;
+          }
+
+          if (!updatedStatements) {
+            updatedStatements = [...statements];
+          }
+
+          updatedStatements.splice(uIndex, classStatements.length, createWrappedClass(
+            name,
+            classStatements,
+          ));
+
+          oIndex += classStatements.length - 1;
+          continue;
         }
       }
     }
@@ -389,7 +411,6 @@ function updateHostNode(
   hostNode: ts.VariableStatement,
   expression: ts.Expression,
 ): ts.Statement {
-
   // Update existing host node with the pure comment before the variable declaration initializer.
   const variableDeclaration = hostNode.declarationList.declarations[0];
   const outerVarStmt = ts.updateVariableStatement(
@@ -411,6 +432,54 @@ function updateHostNode(
   return outerVarStmt;
 }
 
+/**
+ * Find class expression statements.
+ *
+ * The classExpressions block to wrap in an iife must
+ * - end with an ExpressionStatement
+ * - it's expression must be a BinaryExpression
+ * - have the same name
+ *
+ * ```
+ let Foo = class Foo {};
+ Foo = __decorate([]);
+ ```
+ */
+function findClassExpressionStatements(
+  name: string,
+  statements: ts.NodeArray<ts.Statement>,
+  statementIndex: number,
+): ts.Statement[] | undefined {
+  let index = statementIndex + 1;
+  let statement = statements[index];
+
+  while (ts.isExpressionStatement(statement)) {
+    const expression = statement.expression;
+    if (ts.isCallExpression(expression)) {
+      // Ex:
+      // __decorate([propDecorator()], FooClass, "propertyName", void 0);
+      // __decorate$1([propDecorator()], FooClass, "propertyName", void 0);
+      const callExpression = expression.expression;
+      if (!ts.isIdentifier(callExpression) || !/^__decorate(\$\d+)?$/.test(callExpression.text)) {
+        break;
+      }
+    }
+
+    if (
+      ts.isBinaryExpression(expression)
+      && ts.isIdentifier(expression.left)
+      && expression.left.getText() === name
+    ) {
+      // Ex: FooClass = __decorate([Component()], FooClass);
+      return statements.slice(statementIndex, index + 1);
+    }
+
+    statement = statements[++index];
+  }
+
+  return undefined;
+}
+
 function updateEnumIife(
   hostNode: ts.VariableStatement,
   iife: ts.CallExpression,
@@ -474,11 +543,9 @@ function createWrappedEnum(
   name: string,
   hostNode: ts.VariableStatement,
   statements: Array<ts.Statement>,
-  literalInitializer: ts.ObjectLiteralExpression | undefined,
+  literalInitializer: ts.ObjectLiteralExpression = ts.createObjectLiteral(),
   addExportModifier = false,
 ): ts.Statement {
-  literalInitializer = literalInitializer || ts.createObjectLiteral();
-
   const node = addExportModifier
     ? ts.updateVariableStatement(
       hostNode,
@@ -504,3 +571,24 @@ function createWrappedEnum(
 
   return updateHostNode(node, addPureComment(ts.createParen(iife)));
 }
+
+function createWrappedClass(
+  name: string,
+  statements: ts.Statement[],
+): ts.Statement {
+  const pureIife = addPureComment(
+    ts.createImmediatelyInvokedArrowFunction([
+      ...statements,
+      ts.createReturn(ts.createIdentifier(name)),
+    ]),
+  );
+
+  return ts.createVariableStatement(
+    undefined,
+    ts.createVariableDeclarationList([
+      ts.createVariableDeclaration(name, undefined, pureIife),
+    ],
+      ts.NodeFlags.Const,
+    ),
+  );
+}
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
index 8c72b04ead37..31acd5bb0e5c 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
@@ -15,200 +15,324 @@ const transform = (content: string) => transformJavascript(
   { content, getTransforms: [getWrapEnumsTransformer] }).content;
 
 // tslint:disable-next-line:no-big-function
-describe('wrap-enums', () => {
-  it('wraps ts 2.2 enums in IIFE', () => {
-    const input = tags.stripIndent`
-      export var ChangeDetectionStrategy = {};
-      ChangeDetectionStrategy.OnPush = 0;
-      ChangeDetectionStrategy.Default = 1;
-      ChangeDetectionStrategy[ChangeDetectionStrategy.OnPush] = "OnPush";
-      ChangeDetectionStrategy[ChangeDetectionStrategy.Default] = "Default";
-    `;
-    const output = tags.stripIndent`
-      export var ChangeDetectionStrategy = /*@__PURE__*/ (function () {
-        var ChangeDetectionStrategy = {};
+describe('wrap enums and classes transformer', () => {
+  describe('wrap class expressions', () => {
+    it('should wrap ClassExpression without property decorators in IIFE', () => {
+      const input = tags.stripIndent`
+          let AggregateColumnDirective = class AggregateColumnDirective {
+              constructor(viewContainerRef) { }
+          };
+          AggregateColumnDirective = __decorate([
+              Directive({}),
+              __metadata("design:paramtypes", [ViewContainerRef])
+          ], AggregateColumnDirective);
+      `;
+
+      const output = tags.stripIndent`
+          const AggregateColumnDirective = /*@__PURE__*/ (() => {
+            ${input}
+
+            return AggregateColumnDirective;
+          })();
+      `;
+
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it('should wrap ClassExpression with property decorators in IIFE', () => {
+      const input = tags.stripIndent`
+          let ChipList = class ChipList extends Component {
+            constructor(options, element) {
+              super(options, element);
+            }
+          };
+          __decorate$4([Property([])], ChipList.prototype, "chips", void 0);
+          ChipList = __decorate$4([NotifyPropertyChanges], ChipList);
+      `;
+
+      const output = tags.stripIndent`
+          const ChipList = /*@__PURE__*/ (() => {
+            ${input}
+            return ChipList;
+          })();`;
+
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+    
+    it('should not wrap ClassExpression without decorators', () => {
+      const input = tags.stripIndent`
+          let ChipList = class ChipList extends Component {
+            constructor(options, element) {
+              super(options, element);
+            }
+          };
+          fooBar();
+      `;
+
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${input}`);
+    });
+
+    it('should wrap ClassExpression with property decorators and static property in IIFE', () => {
+      const input = tags.stripIndent`
+          let ChipList = class ChipList extends Component {
+            constructor(options, element) {
+              super(options, element);
+            }
+          };
+          ChipList.prop = 1;
+          __decorate$4([Property([])], ChipList.prototype, "chips", void 0);
+          ChipList = __decorate$4([NotifyPropertyChanges], ChipList);`;
+
+      const output = tags.stripIndent`
+          const ChipList = /*@__PURE__*/ (() => {
+            ${input}
+            return ChipList;
+          })();`;
+
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it('should wrap multiple ClassExpression in IIFE', () => {
+      const firstClass = `
+        let AggregateColumnDirective = class AggregateColumnDirective {
+          constructor(viewContainerRef) { }
+        };
+        AggregateColumnDirective = __decorate([
+            Directive({}),
+            __metadata("design:paramtypes", [ViewContainerRef])
+        ], AggregateColumnDirective);
+      `;
+
+      const secondClass = `
+        let ChipList = class ChipList extends Component {
+          constructor(options, element) {
+            super(options, element);
+          }
+        };
+        __decorate$4([Property([])], ChipList.prototype, "chips", void 0);
+        ChipList = __decorate$4([NotifyPropertyChanges], ChipList);
+      `;
+
+      const input = tags.stripIndent`
+          const minutesMilliSeconds = 60000;
+
+          ${firstClass}
+
+          const CSS = 'e-css';
+          const PRIMARY = 'e-primary';
+
+          ${secondClass}
+
+          const chipList = new ChipList({}, {});
+      `;
+
+      const output = tags.stripIndent`
+          const minutesMilliSeconds = 60000;
+
+          const AggregateColumnDirective = /*@__PURE__*/ (() => {
+            ${firstClass}
+
+            return AggregateColumnDirective;
+          })();
+
+          const CSS = 'e-css';
+          const PRIMARY = 'e-primary';
+
+          const ChipList = /*@__PURE__*/ (() => {
+            ${secondClass}
+
+            return ChipList;
+          })();
+
+          const chipList = new ChipList({}, {});
+      `;
+
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+  });
+
+  // tslint:disable-next-line:no-big-function
+  describe('wrap enums', () => {
+    it('wraps ts 2.2 enums in IIFE', () => {
+      const input = tags.stripIndent`
+        export var ChangeDetectionStrategy = {};
         ChangeDetectionStrategy.OnPush = 0;
         ChangeDetectionStrategy.Default = 1;
         ChangeDetectionStrategy[ChangeDetectionStrategy.OnPush] = "OnPush";
         ChangeDetectionStrategy[ChangeDetectionStrategy.Default] = "Default";
-        return ChangeDetectionStrategy;
-      }());
-    `;
+      `;
+      const output = tags.stripIndent`
+        export var ChangeDetectionStrategy = /*@__PURE__*/ (function () {
+          var ChangeDetectionStrategy = {};
+          ChangeDetectionStrategy.OnPush = 0;
+          ChangeDetectionStrategy.Default = 1;
+          ChangeDetectionStrategy[ChangeDetectionStrategy.OnPush] = "OnPush";
+          ChangeDetectionStrategy[ChangeDetectionStrategy.Default] = "Default";
+          return ChangeDetectionStrategy;
+        }());
+      `;
 
-    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
-  });
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
 
-  it('wraps ES2015 tsickle enums in IIFE', () => {
-    const input = tags.stripIndent`
-      const ChangeDetectionStrategy = {
-          OnPush: 0,
-          Default: 1,
-      };
-      export { ChangeDetectionStrategy };
-      ChangeDetectionStrategy[ChangeDetectionStrategy.OnPush] = 'OnPush';
-      ChangeDetectionStrategy[ChangeDetectionStrategy.Default] = 'Default';
-    `;
-
-    const output = tags.stripIndent`
-      export const ChangeDetectionStrategy = /*@__PURE__*/ (function () {
-          var ChangeDetectionStrategy = { OnPush: 0, Default: 1, };
-
-          ChangeDetectionStrategy[ChangeDetectionStrategy.OnPush] = 'OnPush';
-          ChangeDetectionStrategy[ChangeDetectionStrategy.Default] = 'Default';
-          return ChangeDetectionStrategy;
-      }());
-    `;
+    it('wraps ES2015 tsickle enums in IIFE', () => {
+      const input = tags.stripIndent`
+        const ChangeDetectionStrategy = {
+            OnPush: 0,
+            Default: 1,
+        };
+        export { ChangeDetectionStrategy };
+        ChangeDetectionStrategy[ChangeDetectionStrategy.OnPush] = 'OnPush';
+        ChangeDetectionStrategy[ChangeDetectionStrategy.Default] = 'Default';
+      `;
 
-    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
-  });
+      const output = tags.stripIndent`
+        export const ChangeDetectionStrategy = /*@__PURE__*/ (function () {
+            var ChangeDetectionStrategy = { OnPush: 0, Default: 1, };
 
-  it('wraps only ES2015 tsickle enums in IIFE', () => {
-    const input = tags.stripIndent`
-      const RendererStyleFlags3 = {
-          Important: 1,
-          DashCase: 2,
-      };
-      export { RendererStyleFlags3 };
-      RendererStyleFlags3[RendererStyleFlags3.Important] = 'Important';
-      RendererStyleFlags3[RendererStyleFlags3.DashCase] = 'DashCase';
-
-      export const domRendererFactory3 = {
-          createRenderer: (hostElement, rendererType) => { return document; }
-      };
+            ChangeDetectionStrategy[ChangeDetectionStrategy.OnPush] = 'OnPush';
+            ChangeDetectionStrategy[ChangeDetectionStrategy.Default] = 'Default';
+            return ChangeDetectionStrategy;
+        }());
+      `;
 
-      export const unusedValueExportToPlacateAjd = 1;
-    `;
-    const output = tags.stripIndent`
-      export const RendererStyleFlags3 = /*@__PURE__*/ (function () {
-        var RendererStyleFlags3 = { Important: 1, DashCase: 2, };
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it('wraps only ES2015 tsickle enums in IIFE', () => {
+      const input = tags.stripIndent`
+        const RendererStyleFlags3 = {
+            Important: 1,
+            DashCase: 2,
+        };
+        export { RendererStyleFlags3 };
         RendererStyleFlags3[RendererStyleFlags3.Important] = 'Important';
         RendererStyleFlags3[RendererStyleFlags3.DashCase] = 'DashCase';
-        return RendererStyleFlags3;
-      }());
 
-      export const domRendererFactory3 = {
-        createRenderer: (hostElement, rendererType) => { return document; }
-      };
+        export const domRendererFactory3 = {
+            createRenderer: (hostElement, rendererType) => { return document; }
+        };
 
-      export const unusedValueExportToPlacateAjd = 1;
-    `;
+        export const unusedValueExportToPlacateAjd = 1;
+      `;
+      const output = tags.stripIndent`
+        export const RendererStyleFlags3 = /*@__PURE__*/ (function () {
+          var RendererStyleFlags3 = { Important: 1, DashCase: 2, };
+          RendererStyleFlags3[RendererStyleFlags3.Important] = 'Important';
+          RendererStyleFlags3[RendererStyleFlags3.DashCase] = 'DashCase';
+          return RendererStyleFlags3;
+        }());
 
-    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
-  });
+        export const domRendererFactory3 = {
+          createRenderer: (hostElement, rendererType) => { return document; }
+        };
+
+        export const unusedValueExportToPlacateAjd = 1;
+      `;
 
-  it('wraps ts >2.3 enums in IIFE', () => {
-    const input = tags.stripIndent`
-      export var ChangeDetectionStrategy;
-      (function (ChangeDetectionStrategy) {
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it('wraps ts >2.3 enums in IIFE', () => {
+      const input = tags.stripIndent`
+        export var ChangeDetectionStrategy;
+        (function (ChangeDetectionStrategy) {
+            ChangeDetectionStrategy[ChangeDetectionStrategy["OnPush"] = 0] = "OnPush";
+            ChangeDetectionStrategy[ChangeDetectionStrategy["Default"] = 1] = "Default";
+        })(ChangeDetectionStrategy || (ChangeDetectionStrategy = {}));
+      `;
+      const output = tags.stripIndent`
+        export var ChangeDetectionStrategy = /*@__PURE__*/ (function (ChangeDetectionStrategy) {
           ChangeDetectionStrategy[ChangeDetectionStrategy["OnPush"] = 0] = "OnPush";
           ChangeDetectionStrategy[ChangeDetectionStrategy["Default"] = 1] = "Default";
-      })(ChangeDetectionStrategy || (ChangeDetectionStrategy = {}));
-    `;
-    const output = tags.stripIndent`
-      export var ChangeDetectionStrategy = /*@__PURE__*/ (function (ChangeDetectionStrategy) {
-        ChangeDetectionStrategy[ChangeDetectionStrategy["OnPush"] = 0] = "OnPush";
-        ChangeDetectionStrategy[ChangeDetectionStrategy["Default"] = 1] = "Default";
-        return ChangeDetectionStrategy;
-      })({});
-    `;
-
-    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
-  });
+          return ChangeDetectionStrategy;
+        })({});
+      `;
 
-  it('wraps ts >2.3 enums in IIFE, even if they have funny numbers', () => {
-    const input = tags.stripIndent`
-      export var AnimatorControlState;
-      (function (AnimatorControlState) {
-          AnimatorControlState[AnimatorControlState["INITIALIZED"] = 1] = "INITIALIZED";
-          AnimatorControlState[AnimatorControlState["STARTED"] = 2] = "STARTED";
-          AnimatorControlState[AnimatorControlState["FINISHED"] = 3] = "FINISHED";
-          AnimatorControlState[AnimatorControlState["DESTROYED"] = 4] = "DESTROYED";
-      })(AnimatorControlState || (AnimatorControlState = {}));
-    `;
-    const output = tags.stripIndent`
-      export var AnimatorControlState = /*@__PURE__*/ (function (AnimatorControlState) {
-          AnimatorControlState[AnimatorControlState["INITIALIZED"] = 1] = "INITIALIZED";
-          AnimatorControlState[AnimatorControlState["STARTED"] = 2] = "STARTED";
-          AnimatorControlState[AnimatorControlState["FINISHED"] = 3] = "FINISHED";
-          AnimatorControlState[AnimatorControlState["DESTROYED"] = 4] = "DESTROYED";
-          return AnimatorControlState;
-      })({});
-    `;
-
-    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
-  });
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
 
-  it('wraps ts >2.3 enums in IIFE, even if they were renamed due to scope hoisting', () => {
-    const input = tags.stripIndent`
-      var TokenType$1;
-      (function (TokenType) {
-        TokenType[TokenType["TAG_OPEN_START"] = 0] = "TAG_OPEN_START";
-        TokenType[TokenType["TAG_OPEN_END"] = 1] = "TAG_OPEN_END";
-        TokenType[TokenType["TAG_OPEN_END_VOID"] = 2] = "TAG_OPEN_END_VOID";
-        TokenType[TokenType["TAG_CLOSE"] = 3] = "TAG_CLOSE";
-        TokenType[TokenType["TEXT"] = 4] = "TEXT";
-        TokenType[TokenType["ESCAPABLE_RAW_TEXT"] = 5] = "ESCAPABLE_RAW_TEXT";
-        TokenType[TokenType["RAW_TEXT"] = 6] = "RAW_TEXT";
-        TokenType[TokenType["COMMENT_START"] = 7] = "COMMENT_START";
-        TokenType[TokenType["COMMENT_END"] = 8] = "COMMENT_END";
-        TokenType[TokenType["CDATA_START"] = 9] = "CDATA_START";
-        TokenType[TokenType["CDATA_END"] = 10] = "CDATA_END";
-        TokenType[TokenType["ATTR_NAME"] = 11] = "ATTR_NAME";
-        TokenType[TokenType["ATTR_VALUE"] = 12] = "ATTR_VALUE";
-        TokenType[TokenType["DOC_TYPE"] = 13] = "DOC_TYPE";
-        TokenType[TokenType["EXPANSION_FORM_START"] = 14] = "EXPANSION_FORM_START";
-        TokenType[TokenType["EXPANSION_CASE_VALUE"] = 15] = "EXPANSION_CASE_VALUE";
-        TokenType[TokenType["EXPANSION_CASE_EXP_START"] = 16] = "EXPANSION_CASE_EXP_START";
-        TokenType[TokenType["EXPANSION_CASE_EXP_END"] = 17] = "EXPANSION_CASE_EXP_END";
-        TokenType[TokenType["EXPANSION_FORM_END"] = 18] = "EXPANSION_FORM_END";
-        TokenType[TokenType["EOF"] = 19] = "EOF";
-      })(TokenType$1 || (TokenType$1 = {}));
-    `;
-    const output = tags.stripIndent`
-      var TokenType$1 = /*@__PURE__*/ (function (TokenType) {
-        TokenType[TokenType["TAG_OPEN_START"] = 0] = "TAG_OPEN_START";
-        TokenType[TokenType["TAG_OPEN_END"] = 1] = "TAG_OPEN_END";
-        TokenType[TokenType["TAG_OPEN_END_VOID"] = 2] = "TAG_OPEN_END_VOID";
-        TokenType[TokenType["TAG_CLOSE"] = 3] = "TAG_CLOSE";
-        TokenType[TokenType["TEXT"] = 4] = "TEXT";
-        TokenType[TokenType["ESCAPABLE_RAW_TEXT"] = 5] = "ESCAPABLE_RAW_TEXT";
-        TokenType[TokenType["RAW_TEXT"] = 6] = "RAW_TEXT";
-        TokenType[TokenType["COMMENT_START"] = 7] = "COMMENT_START";
-        TokenType[TokenType["COMMENT_END"] = 8] = "COMMENT_END";
-        TokenType[TokenType["CDATA_START"] = 9] = "CDATA_START";
-        TokenType[TokenType["CDATA_END"] = 10] = "CDATA_END";
-        TokenType[TokenType["ATTR_NAME"] = 11] = "ATTR_NAME";
-        TokenType[TokenType["ATTR_VALUE"] = 12] = "ATTR_VALUE";
-        TokenType[TokenType["DOC_TYPE"] = 13] = "DOC_TYPE";
-        TokenType[TokenType["EXPANSION_FORM_START"] = 14] = "EXPANSION_FORM_START";
-        TokenType[TokenType["EXPANSION_CASE_VALUE"] = 15] = "EXPANSION_CASE_VALUE";
-        TokenType[TokenType["EXPANSION_CASE_EXP_START"] = 16] = "EXPANSION_CASE_EXP_START";
-        TokenType[TokenType["EXPANSION_CASE_EXP_END"] = 17] = "EXPANSION_CASE_EXP_END";
-        TokenType[TokenType["EXPANSION_FORM_END"] = 18] = "EXPANSION_FORM_END";
-        TokenType[TokenType["EOF"] = 19] = "EOF";
-        return TokenType;
-      })({});
-    `;
-
-    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
-  });
+    it('wraps ts >2.3 enums in IIFE, even if they have funny numbers', () => {
+      const input = tags.stripIndent`
+        export var AnimatorControlState;
+        (function (AnimatorControlState) {
+            AnimatorControlState[AnimatorControlState["INITIALIZED"] = 1] = "INITIALIZED";
+            AnimatorControlState[AnimatorControlState["STARTED"] = 2] = "STARTED";
+            AnimatorControlState[AnimatorControlState["FINISHED"] = 3] = "FINISHED";
+            AnimatorControlState[AnimatorControlState["DESTROYED"] = 4] = "DESTROYED";
+        })(AnimatorControlState || (AnimatorControlState = {}));
+      `;
+      const output = tags.stripIndent`
+        export var AnimatorControlState = /*@__PURE__*/ (function (AnimatorControlState) {
+            AnimatorControlState[AnimatorControlState["INITIALIZED"] = 1] = "INITIALIZED";
+            AnimatorControlState[AnimatorControlState["STARTED"] = 2] = "STARTED";
+            AnimatorControlState[AnimatorControlState["FINISHED"] = 3] = "FINISHED";
+            AnimatorControlState[AnimatorControlState["DESTROYED"] = 4] = "DESTROYED";
+            return AnimatorControlState;
+        })({});
+      `;
+
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it('wraps ts >2.3 enums in IIFE, even if they were renamed due to scope hoisting', () => {
+      const input = tags.stripIndent`
+        var TokenType$1;
+        (function (TokenType) {
+          TokenType[TokenType["TAG_OPEN_START"] = 0] = "TAG_OPEN_START";
+          TokenType[TokenType["TAG_OPEN_END"] = 1] = "TAG_OPEN_END";
+          TokenType[TokenType["TAG_OPEN_END_VOID"] = 2] = "TAG_OPEN_END_VOID";
+          TokenType[TokenType["TAG_CLOSE"] = 3] = "TAG_CLOSE";
+          TokenType[TokenType["TEXT"] = 4] = "TEXT";
+          TokenType[TokenType["ESCAPABLE_RAW_TEXT"] = 5] = "ESCAPABLE_RAW_TEXT";
+          TokenType[TokenType["RAW_TEXT"] = 6] = "RAW_TEXT";
+          TokenType[TokenType["COMMENT_START"] = 7] = "COMMENT_START";
+          TokenType[TokenType["COMMENT_END"] = 8] = "COMMENT_END";
+          TokenType[TokenType["CDATA_START"] = 9] = "CDATA_START";
+          TokenType[TokenType["CDATA_END"] = 10] = "CDATA_END";
+          TokenType[TokenType["ATTR_NAME"] = 11] = "ATTR_NAME";
+          TokenType[TokenType["ATTR_VALUE"] = 12] = "ATTR_VALUE";
+          TokenType[TokenType["DOC_TYPE"] = 13] = "DOC_TYPE";
+          TokenType[TokenType["EXPANSION_FORM_START"] = 14] = "EXPANSION_FORM_START";
+          TokenType[TokenType["EXPANSION_CASE_VALUE"] = 15] = "EXPANSION_CASE_VALUE";
+          TokenType[TokenType["EXPANSION_CASE_EXP_START"] = 16] = "EXPANSION_CASE_EXP_START";
+          TokenType[TokenType["EXPANSION_CASE_EXP_END"] = 17] = "EXPANSION_CASE_EXP_END";
+          TokenType[TokenType["EXPANSION_FORM_END"] = 18] = "EXPANSION_FORM_END";
+          TokenType[TokenType["EOF"] = 19] = "EOF";
+        })(TokenType$1 || (TokenType$1 = {}));
+      `;
+      const output = tags.stripIndent`
+        var TokenType$1 = /*@__PURE__*/ (function (TokenType) {
+          TokenType[TokenType["TAG_OPEN_START"] = 0] = "TAG_OPEN_START";
+          TokenType[TokenType["TAG_OPEN_END"] = 1] = "TAG_OPEN_END";
+          TokenType[TokenType["TAG_OPEN_END_VOID"] = 2] = "TAG_OPEN_END_VOID";
+          TokenType[TokenType["TAG_CLOSE"] = 3] = "TAG_CLOSE";
+          TokenType[TokenType["TEXT"] = 4] = "TEXT";
+          TokenType[TokenType["ESCAPABLE_RAW_TEXT"] = 5] = "ESCAPABLE_RAW_TEXT";
+          TokenType[TokenType["RAW_TEXT"] = 6] = "RAW_TEXT";
+          TokenType[TokenType["COMMENT_START"] = 7] = "COMMENT_START";
+          TokenType[TokenType["COMMENT_END"] = 8] = "COMMENT_END";
+          TokenType[TokenType["CDATA_START"] = 9] = "CDATA_START";
+          TokenType[TokenType["CDATA_END"] = 10] = "CDATA_END";
+          TokenType[TokenType["ATTR_NAME"] = 11] = "ATTR_NAME";
+          TokenType[TokenType["ATTR_VALUE"] = 12] = "ATTR_VALUE";
+          TokenType[TokenType["DOC_TYPE"] = 13] = "DOC_TYPE";
+          TokenType[TokenType["EXPANSION_FORM_START"] = 14] = "EXPANSION_FORM_START";
+          TokenType[TokenType["EXPANSION_CASE_VALUE"] = 15] = "EXPANSION_CASE_VALUE";
+          TokenType[TokenType["EXPANSION_CASE_EXP_START"] = 16] = "EXPANSION_CASE_EXP_START";
+          TokenType[TokenType["EXPANSION_CASE_EXP_END"] = 17] = "EXPANSION_CASE_EXP_END";
+          TokenType[TokenType["EXPANSION_FORM_END"] = 18] = "EXPANSION_FORM_END";
+          TokenType[TokenType["EOF"] = 19] = "EOF";
+          return TokenType;
+        })({});
+      `;
 
-  it('wraps tsickle enums in IIFE', () => {
-    const input = tags.stripIndent`
-      /** @enum {number} */
-      var FormatWidth = {
-        Short: 0,
-        Medium: 1,
-        Long: 2,
-        Full: 3,
-      };
-      FormatWidth[FormatWidth.Short] = "Short";
-      FormatWidth[FormatWidth.Medium] = "Medium";
-      FormatWidth[FormatWidth.Long] = "Long";
-      FormatWidth[FormatWidth.Full] = "Full";
-    `;
-    const output = tags.stripIndent`
-      /** @enum {number} */ var FormatWidth = /*@__PURE__*/ (function () {
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it('wraps tsickle enums in IIFE', () => {
+      const input = tags.stripIndent`
+        /** @enum {number} */
         var FormatWidth = {
           Short: 0,
           Medium: 1,
@@ -219,81 +343,94 @@ describe('wrap-enums', () => {
         FormatWidth[FormatWidth.Medium] = "Medium";
         FormatWidth[FormatWidth.Long] = "Long";
         FormatWidth[FormatWidth.Full] = "Full";
-        return FormatWidth;
-      }());
-    `;
+      `;
+      const output = tags.stripIndent`
+        /** @enum {number} */ var FormatWidth = /*@__PURE__*/ (function () {
+          var FormatWidth = {
+            Short: 0,
+            Medium: 1,
+            Long: 2,
+            Full: 3,
+          };
+          FormatWidth[FormatWidth.Short] = "Short";
+          FormatWidth[FormatWidth.Medium] = "Medium";
+          FormatWidth[FormatWidth.Long] = "Long";
+          FormatWidth[FormatWidth.Full] = "Full";
+          return FormatWidth;
+        }());
+      `;
 
-    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
-  });
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
 
-  it('wraps enums with multi-line comments in IIFE', () => {
-    const input = tags.stripIndent`
-      /**
-       * Supported http methods.
-       * @deprecated use @angular/common/http instead
-       */
-      var RequestMethod;
-      /**
-       * Supported http methods.
-       * @deprecated use @angular/common/http instead
-       */
-      (function (RequestMethod) {
-          RequestMethod[RequestMethod["Get"] = 0] = "Get";
-          RequestMethod[RequestMethod["Post"] = 1] = "Post";
-          RequestMethod[RequestMethod["Put"] = 2] = "Put";
-          RequestMethod[RequestMethod["Delete"] = 3] = "Delete";
-          RequestMethod[RequestMethod["Options"] = 4] = "Options";
-          RequestMethod[RequestMethod["Head"] = 5] = "Head";
-          RequestMethod[RequestMethod["Patch"] = 6] = "Patch";
-      })(RequestMethod || (RequestMethod = {}));
-    `;
-    // We need to interpolate this space because our editorconfig automatically strips
-    // trailing whitespace.
-    const space = ' ';
-    const output = tags.stripIndent`
-      /**
-       * Supported http methods.
-       * @deprecated use @angular/common/http instead
-       */
-      var RequestMethod =${space}
-       /**
-       * Supported http methods.
-       * @deprecated use @angular/common/http instead
-       */
-      /*@__PURE__*/ (function (RequestMethod) {
-          RequestMethod[RequestMethod["Get"] = 0] = "Get";
-          RequestMethod[RequestMethod["Post"] = 1] = "Post";
-          RequestMethod[RequestMethod["Put"] = 2] = "Put";
-          RequestMethod[RequestMethod["Delete"] = 3] = "Delete";
-          RequestMethod[RequestMethod["Options"] = 4] = "Options";
-          RequestMethod[RequestMethod["Head"] = 5] = "Head";
-          RequestMethod[RequestMethod["Patch"] = 6] = "Patch";
-          return RequestMethod;
-      })({});
-    `;
-
-    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
-  });
+    it('wraps enums with multi-line comments in IIFE', () => {
+      const input = tags.stripIndent`
+        /**
+         * Supported http methods.
+         * @deprecated use @angular/common/http instead
+         */
+        var RequestMethod;
+        /**
+         * Supported http methods.
+         * @deprecated use @angular/common/http instead
+         */
+        (function (RequestMethod) {
+            RequestMethod[RequestMethod["Get"] = 0] = "Get";
+            RequestMethod[RequestMethod["Post"] = 1] = "Post";
+            RequestMethod[RequestMethod["Put"] = 2] = "Put";
+            RequestMethod[RequestMethod["Delete"] = 3] = "Delete";
+            RequestMethod[RequestMethod["Options"] = 4] = "Options";
+            RequestMethod[RequestMethod["Head"] = 5] = "Head";
+            RequestMethod[RequestMethod["Patch"] = 6] = "Patch";
+        })(RequestMethod || (RequestMethod = {}));
+      `;
+      // We need to interpolate this space because our editorconfig automatically strips
+      // trailing whitespace.
+      const space = ' ';
+      const output = tags.stripIndent`
+        /**
+         * Supported http methods.
+         * @deprecated use @angular/common/http instead
+         */
+        var RequestMethod =${space}
+         /**
+         * Supported http methods.
+         * @deprecated use @angular/common/http instead
+         */
+        /*@__PURE__*/ (function (RequestMethod) {
+            RequestMethod[RequestMethod["Get"] = 0] = "Get";
+            RequestMethod[RequestMethod["Post"] = 1] = "Post";
+            RequestMethod[RequestMethod["Put"] = 2] = "Put";
+            RequestMethod[RequestMethod["Delete"] = 3] = "Delete";
+            RequestMethod[RequestMethod["Options"] = 4] = "Options";
+            RequestMethod[RequestMethod["Head"] = 5] = "Head";
+            RequestMethod[RequestMethod["Patch"] = 6] = "Patch";
+            return RequestMethod;
+        })({});
+      `;
 
-  it('wraps exported enums in IIFE', () => {
-    const input = tags.stripIndent`
-      var ExportEnum;
-      (function (ExportEnum) {
-        ExportEnum[ExportEnum["A"] = 0] = "A";
-        ExportEnum[ExportEnum["B"] = 1] = "B";
-        ExportEnum[ExportEnum["C"] = 2] = "C";
-      })(ExportEnum = exports.ExportEnum || (exports.ExportEnum = {}));
-    `;
-    const output = tags.stripIndent`
-      var ExportEnum = exports.ExportEnum = /*@__PURE__*/ (function (ExportEnum) {
-        ExportEnum[ExportEnum["A"] = 0] = "A";
-        ExportEnum[ExportEnum["B"] = 1] = "B";
-        ExportEnum[ExportEnum["C"] = 2] = "C";
-        return ExportEnum;
-      })(exports.ExportEnum || {});
-    `;
-
-    expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
-  });
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it('wraps exported enums in IIFE', () => {
+      const input = tags.stripIndent`
+        var ExportEnum;
+        (function (ExportEnum) {
+          ExportEnum[ExportEnum["A"] = 0] = "A";
+          ExportEnum[ExportEnum["B"] = 1] = "B";
+          ExportEnum[ExportEnum["C"] = 2] = "C";
+        })(ExportEnum = exports.ExportEnum || (exports.ExportEnum = {}));
+      `;
+      const output = tags.stripIndent`
+        var ExportEnum = exports.ExportEnum = /*@__PURE__*/ (function (ExportEnum) {
+          ExportEnum[ExportEnum["A"] = 0] = "A";
+          ExportEnum[ExportEnum["B"] = 1] = "B";
+          ExportEnum[ExportEnum["C"] = 2] = "C";
+          return ExportEnum;
+        })(exports.ExportEnum || {});
+      `;
 
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+  });
 });

From 8104fce690791f20d384b985581d5fce88444a86 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Mon, 3 Jun 2019 14:53:03 +0200
Subject: [PATCH 1410/1703] fix(@angular-devkit/build-optimizer): wrap
 ClassDeclarations in an IIFE for better treeshaking

With this change we wrap ClassDeclarations inside an IIFE, also we move some code from the class fold into the wrap-enums.

This changes the below code:
```js
export class Foo {
	method() {
	}
}
Foo.bar = 'barValue';
__decorate([
	methodDecorator
], Foo.prototype, "method", null);
```

to

```js
export const Foo = /*@__PURE__*/ (() => {
  class Foo {
    method() {
    }
  }
  Foo.bar = 'barValue';
  __decorate([
    methodDecorator
  ], Foo.prototype, "method", null);

  return Foo;
})();
```

Fixes #14610
---
 .../src/build-optimizer/build-optimizer.ts    |   3 -
 .../build-optimizer/build-optimizer_spec.ts   |   7 +-
 .../src/transforms/class-fold.ts              |   1 +
 .../src/transforms/wrap-enums.ts              | 185 ++++++++++++------
 .../src/transforms/wrap-enums_spec.ts         | 162 ++++++++++++++-
 5 files changed, 282 insertions(+), 76 deletions(-)

diff --git a/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer.ts b/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer.ts
index 2ca30df2b7af..437229b2af87 100644
--- a/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer.ts
+++ b/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer.ts
@@ -11,7 +11,6 @@ import {
   TransformJavascriptOutput,
   transformJavascript,
 } from '../helpers/transform-javascript';
-import { getFoldFileTransformer } from '../transforms/class-fold';
 import { getImportTslibTransformer, testImportTslib } from '../transforms/import-tslib';
 import { getPrefixClassesTransformer, testPrefixClasses } from '../transforms/prefix-classes';
 import { getPrefixFunctionsTransformer } from '../transforms/prefix-functions';
@@ -124,14 +123,12 @@ export function buildOptimizer(options: BuildOptimizerOptions): TransformJavascr
       // getPrefixFunctionsTransformer needs to be before getFoldFileTransformer.
       getPrefixFunctionsTransformer,
       selectedGetScrubFileTransformer,
-      getFoldFileTransformer,
     );
     typeCheck = true;
   } else if (testScrubFile(content)) {
     // Always test as these require the type checker
     getTransforms.push(
       selectedGetScrubFileTransformer,
-      getFoldFileTransformer,
     );
     typeCheck = true;
   }
diff --git a/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer_spec.ts b/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer_spec.ts
index 42768c1b15d7..05a322c6c2a7 100644
--- a/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer_spec.ts
@@ -16,11 +16,10 @@ import { buildOptimizer } from './build-optimizer';
 describe('build-optimizer', () => {
   const imports = 'import { Injectable, Input, Component } from \'@angular/core\';';
   const clazz = 'var Clazz = (function () { function Clazz() { } return Clazz; }());';
-  const staticProperty = 'Clazz.prop = 1;';
   const decorators = 'Clazz.decorators = [ { type: Injectable } ];';
 
   describe('basic functionality', () => {
-    it('applies class-fold, scrub-file and prefix-functions to side-effect free modules', () => {
+    it('applies scrub-file and prefix-functions to side-effect free modules', () => {
       const input = tags.stripIndent`
         ${imports}
         var __extends = (this && this.__extends) || function (d, b) {
@@ -34,7 +33,6 @@ describe('build-optimizer', () => {
           ChangeDetectionStrategy[ChangeDetectionStrategy["Default"] = 1] = "Default";
         })(ChangeDetectionStrategy || (ChangeDetectionStrategy = {}));
         ${clazz}
-        ${staticProperty}
         ${decorators}
         Clazz.propDecorators = { 'ngIf': [{ type: Input }] };
         Clazz.ctorParameters = function () { return [{type: Injectable}]; };
@@ -65,7 +63,7 @@ describe('build-optimizer', () => {
           ChangeDetectionStrategy[ChangeDetectionStrategy["Default"] = 1] = "Default";
           return ChangeDetectionStrategy;
         })({});
-        var Clazz = /*@__PURE__*/ (function () { function Clazz() { } ${staticProperty} return Clazz; }());
+        var Clazz = /*@__PURE__*/ (function () { function Clazz() { } return Clazz; }());
         var ComponentClazz = /*@__PURE__*/ (function () {
           function ComponentClazz() { }
           return ComponentClazz;
@@ -202,7 +200,6 @@ describe('build-optimizer', () => {
     xit('doesn\'t produce sourcemaps when emitting was skipped', () => {
       const ignoredInput = tags.oneLine`
         var Clazz = (function () { function Clazz() { } return Clazz; }());
-        ${staticProperty}
       `;
       const invalidInput = tags.oneLine`
         ))))invalid syntax
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/class-fold.ts b/packages/angular_devkit/build_optimizer/src/transforms/class-fold.ts
index 206a1b4ab420..634f195c92df 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/class-fold.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/class-fold.ts
@@ -20,6 +20,7 @@ interface StatementData {
   hostClass: ClassData;
 }
 
+/** @deprecated Since version 8 */
 export function getFoldFileTransformer(program: ts.Program): ts.TransformerFactory<ts.SourceFile> {
   const checker = program.getTypeChecker();
 
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
index 5cd0fcdfbf48..f6400a7a4de4 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
@@ -63,6 +63,8 @@ function visitBlockStatements(
   // 'oIndex' is the original statement index; 'uIndex' is the updated statement index
   for (let oIndex = 0, uIndex = 0; oIndex < statements.length - 1; oIndex++, uIndex++) {
     const currentStatement = statements[oIndex];
+    let newStatement: ts.Statement | undefined;
+    let oldStatementsLength = 0;
 
     // these can't contain an enum declaration
     if (currentStatement.kind === ts.SyntaxKind.ImportDeclaration) {
@@ -79,53 +81,47 @@ function visitBlockStatements(
     //   * not be last statement
     //   * be a variable statement
     //   * have only one declaration
-    //   * have an ClassExpression as a initializer
+    //   * have an ClassExpression or BinaryExpression and a right
+    //     of kind ClassExpression as a initializer
     if (ts.isVariableStatement(currentStatement)
       && currentStatement.declarationList.declarations.length === 1) {
 
       const variableDeclaration = currentStatement.declarationList.declarations[0];
+      const initializer = variableDeclaration.initializer;
       if (ts.isIdentifier(variableDeclaration.name)) {
         const name = variableDeclaration.name.text;
 
-        if (!variableDeclaration.initializer) {
+        if (!initializer) {
           const iife = findTs2_3EnumIife(name, statements[oIndex + 1]);
           if (iife) {
-            // found an enum
-            if (!updatedStatements) {
-              updatedStatements = statements.slice();
-            }
             // update IIFE and replace variable statement and old IIFE
-            updatedStatements.splice(uIndex, 2, updateEnumIife(
+            oldStatementsLength = 2;
+            newStatement = updateEnumIife(
               currentStatement,
               iife[0],
               iife[1],
-            ));
+            );
             // skip IIFE statement
             oIndex++;
-            continue;
           }
-        } else if (ts.isObjectLiteralExpression(variableDeclaration.initializer)
-                   && variableDeclaration.initializer.properties.length === 0) {
+        } else if (ts.isObjectLiteralExpression(initializer)
+                   && initializer.properties.length === 0) {
           const enumStatements = findTs2_2EnumStatements(name, statements, oIndex + 1);
           if (enumStatements.length > 0) {
-            // found an enum
-            if (!updatedStatements) {
-              updatedStatements = statements.slice();
-            }
             // create wrapper and replace variable statement and enum member statements
-            updatedStatements.splice(uIndex, enumStatements.length + 1, createWrappedEnum(
+            oldStatementsLength = enumStatements.length + 1;
+            newStatement = createWrappedEnum(
               name,
               currentStatement,
               enumStatements,
-              variableDeclaration.initializer,
-            ));
+              initializer,
+            );
             // skip enum member declarations
             oIndex += enumStatements.length;
-            continue;
           }
-        } else if (ts.isObjectLiteralExpression(variableDeclaration.initializer)
-          && variableDeclaration.initializer.properties.length !== 0) {
-          const literalPropertyCount = variableDeclaration.initializer.properties.length;
+        } else if (ts.isObjectLiteralExpression(initializer)
+          && initializer.properties.length !== 0) {
+          const literalPropertyCount = initializer.properties.length;
 
           // tsickle es2015 enums first statement is an export declaration
           const isPotentialEnumExport = ts.isExportDeclaration(statements[oIndex + 1]);
@@ -136,42 +132,61 @@ function visitBlockStatements(
 
           const enumStatements = findEnumNameStatements(name, statements, oIndex + 1);
           if (enumStatements.length === literalPropertyCount) {
-            // found an enum
-            if (!updatedStatements) {
-              updatedStatements = statements.slice();
-            }
             // create wrapper and replace variable statement and enum member statements
-            const deleteCount = enumStatements.length + (isPotentialEnumExport ? 2 : 1);
-            updatedStatements.splice(uIndex, deleteCount, createWrappedEnum(
+            oldStatementsLength = enumStatements.length + (isPotentialEnumExport ? 2 : 1);
+            newStatement = createWrappedEnum(
               name,
               currentStatement,
               enumStatements,
-              variableDeclaration.initializer,
+              initializer,
               isPotentialEnumExport,
-            ));
+            );
             // skip enum member declarations
             oIndex += enumStatements.length;
-            continue;
           }
-        } else if (ts.isClassExpression(variableDeclaration.initializer)) {
-          const classStatements = findClassExpressionStatements(name, statements, oIndex);
+        } else if (
+          ts.isClassExpression(initializer)
+          || (
+            ts.isBinaryExpression(initializer)
+            && ts.isClassExpression(initializer.right)
+          )
+        ) {
+          const classStatements = findClassStatements(name, statements, oIndex);
           if (!classStatements) {
             continue;
           }
 
-          if (!updatedStatements) {
-            updatedStatements = [...statements];
-          }
-
-          updatedStatements.splice(uIndex, classStatements.length, createWrappedClass(
-            name,
+          oldStatementsLength = classStatements.length;
+          newStatement = createWrappedClass(
+            variableDeclaration,
             classStatements,
-          ));
+          );
 
           oIndex += classStatements.length - 1;
-          continue;
         }
       }
+    } else if (ts.isClassDeclaration(currentStatement)) {
+      const name = (currentStatement.name as ts.Identifier).text;
+      const classStatements = findClassStatements(name, statements, oIndex);
+      if (!classStatements) {
+        continue;
+      }
+
+      oldStatementsLength = classStatements.length;
+      newStatement = createWrappedClass(
+        currentStatement,
+        classStatements,
+      );
+
+      oIndex += classStatements.length - 1;
+    }
+
+    if (newStatement) {
+      if (!updatedStatements) {
+        updatedStatements = [...statements];
+      }
+
+      updatedStatements.splice(uIndex, oldStatementsLength, newStatement);
     }
 
     const result = ts.visitNode(currentStatement, visitor);
@@ -433,7 +448,7 @@ function updateHostNode(
 }
 
 /**
- * Find class expression statements.
+ * Find class expression or declaration statements.
  *
  * The classExpressions block to wrap in an iife must
  * - end with an ExpressionStatement
@@ -445,36 +460,63 @@ function updateHostNode(
  Foo = __decorate([]);
  ```
  */
-function findClassExpressionStatements(
+function findClassStatements(
   name: string,
   statements: ts.NodeArray<ts.Statement>,
   statementIndex: number,
 ): ts.Statement[] | undefined {
-  let index = statementIndex + 1;
-  let statement = statements[index];
+  let count = 1;
+
+  for (let index = statementIndex + 1; index < statements.length; ++index) {
+    const statement = statements[index];
+    if (!ts.isExpressionStatement(statement)) {
+      break;
+    }
 
-  while (ts.isExpressionStatement(statement)) {
     const expression = statement.expression;
+
     if (ts.isCallExpression(expression)) {
-      // Ex:
-      // __decorate([propDecorator()], FooClass, "propertyName", void 0);
-      // __decorate$1([propDecorator()], FooClass, "propertyName", void 0);
-      const callExpression = expression.expression;
-      if (!ts.isIdentifier(callExpression) || !/^__decorate(\$\d+)?$/.test(callExpression.text)) {
-        break;
+    // Ex:
+    // setClassMetadata(FooClass, [{}], void 0);
+    // __decorate([propDecorator()], FooClass.prototype, "propertyName", void 0);
+    // __decorate([propDecorator()], FooClass, "propertyName", void 0);
+    // __decorate$1([propDecorator()], FooClass, "propertyName", void 0);
+      const args = expression.arguments;
+
+      if (args.length > 2) {
+        const isReferenced = args.some(arg => {
+          const potentialIdentifier = ts.isPropertyAccessExpression(arg) ? arg.expression : arg;
+
+          return ts.isIdentifier(potentialIdentifier) && potentialIdentifier.text === name;
+        });
+
+        if (isReferenced) {
+          count++;
+          continue;
+        }
+      }
+    } else if (ts.isBinaryExpression(expression)) {
+      const node = ts.isBinaryExpression(expression.left)
+        ? expression.left.left
+        : expression.left;
+
+      const leftExpression = ts.isPropertyAccessExpression(node)
+        // Static Properties // Ex: Foo.bar = 'value';
+        ? node.expression
+        // Ex: FooClass = __decorate([Component()], FooClass);
+        : node;
+
+      if (ts.isIdentifier(leftExpression) && leftExpression.text === name) {
+        count++;
+        continue;
       }
     }
 
-    if (
-      ts.isBinaryExpression(expression)
-      && ts.isIdentifier(expression.left)
-      && expression.left.getText() === name
-    ) {
-      // Ex: FooClass = __decorate([Component()], FooClass);
-      return statements.slice(statementIndex, index + 1);
-    }
+    break;
+  }
 
-    statement = statements[++index];
+  if (count > 1) {
+    return statements.slice(statementIndex, statementIndex + count);
   }
 
   return undefined;
@@ -573,18 +615,33 @@ function createWrappedEnum(
 }
 
 function createWrappedClass(
-  name: string,
+  hostNode: ts.ClassDeclaration | ts.VariableDeclaration,
   statements: ts.Statement[],
 ): ts.Statement {
+  const name = (hostNode.name as ts.Identifier).text;
+
+  const updatedStatements = [...statements];
+
+  if (ts.isClassDeclaration(hostNode)) {
+    updatedStatements[0] = ts.createClassDeclaration(
+      hostNode.decorators,
+      undefined,
+      hostNode.name,
+      hostNode.typeParameters,
+      hostNode.heritageClauses,
+      hostNode.members,
+    );
+  }
+
   const pureIife = addPureComment(
     ts.createImmediatelyInvokedArrowFunction([
-      ...statements,
+      ...updatedStatements,
       ts.createReturn(ts.createIdentifier(name)),
     ]),
   );
 
   return ts.createVariableStatement(
-    undefined,
+    hostNode.modifiers,
     ts.createVariableDeclarationList([
       ts.createVariableDeclaration(name, undefined, pureIife),
     ],
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
index 31acd5bb0e5c..7a82b4f88642 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
@@ -16,8 +16,129 @@ const transform = (content: string) => transformJavascript(
 
 // tslint:disable-next-line:no-big-function
 describe('wrap enums and classes transformer', () => {
+  describe('wraps class declarations', () => {
+    it('should ClassDeclarations that are referenced with in CallExpressions', () => {
+      const input = tags.stripIndent`
+        class ApplicationModule {
+            constructor(appRef) { }
+        }
+        ApplicationModule.ngModuleDef = ɵɵdefineNgModule({ type: ApplicationModule });
+        /*@__PURE__*/ setClassMetadata(ApplicationModule, [{
+                type: NgModule,
+                args: [{ providers: APPLICATION_MODULE_PROVIDERS }]
+            }], function () { return [{ type: ApplicationRef }]; }, { constructor: [] });
+        ApplicationModule.ctorParameters = () => [
+            { type: ApplicationRef }
+        ];
+      `;
+
+      const output = tags.stripIndent`
+        const ApplicationModule = /*@__PURE__*/ (() => {
+          ${input}
+
+          return ApplicationModule;
+        })();
+      `;
+
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it('with nested static properties in IIFE', () => {
+      const input = tags.stripIndent`
+        class CommonModule { }
+        CommonModule.ngModuleDef = defineNgModule({
+            type: CommonModule
+        }), CommonModule.ngInjectorDef = defineInjector({
+            factory: function (t) {
+                return new (t || CommonModule)();
+            },
+            providers: [{
+                provide: NgLocalization,
+                useClass: NgLocaleLocalization
+            }]
+        });
+      `;
+
+      const output = tags.stripIndent`
+        const CommonModule = /*@__PURE__*/ (() => {
+          ${input}
+
+          return CommonModule;
+        })();
+      `;
+
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it('with property decorators in IIFE', () => {
+      const input = tags.stripIndent`
+        export class Foo {
+          method() {
+          }
+        }
+        Foo.bar = 'barValue';
+        __decorate([
+            methodDecorator
+        ], Foo.prototype, "method", null);
+      `;
+
+      const output = tags.stripIndent`
+          export const Foo = /*@__PURE__*/ (() => {
+            ${input.replace('export ', '')}
+
+            return Foo;
+          })();
+      `;
+
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it('folds static properties in IIFE', () => {
+      const input = tags.stripIndent`
+        export class TemplateRef { }
+        TemplateRef.__NG_ELEMENT_ID__ = () => SWITCH_TEMPLATE_REF_FACTORY(TemplateRef, ElementRef);
+      `;
+      const output = tags.stripIndent`
+      export const TemplateRef = /*@__PURE__*/ (() => {
+        class TemplateRef { }
+        TemplateRef.__NG_ELEMENT_ID__ = () => SWITCH_TEMPLATE_REF_FACTORY(TemplateRef, ElementRef);
+        return TemplateRef;
+      })();
+    `;
+
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it('folds multiple static properties into class', () => {
+      const input = tags.stripIndent`
+      export class TemplateRef { }
+      TemplateRef.__NG_ELEMENT_ID__ = () => SWITCH_TEMPLATE_REF_FACTORY(TemplateRef, ElementRef);
+      TemplateRef.somethingElse = true;
+    `;
+      const output = tags.stripIndent`
+      export const TemplateRef = /*@__PURE__*/ (() => {
+        class TemplateRef {
+        }
+        TemplateRef.__NG_ELEMENT_ID__ = () => SWITCH_TEMPLATE_REF_FACTORY(TemplateRef, ElementRef);
+        TemplateRef.somethingElse = true;
+        return TemplateRef;
+      })();
+    `;
+
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it(`doesn't wrap classes without static properties in IIFE`, () => {
+      const input = tags.stripIndent`
+      export class TemplateRef { }
+    `;
+
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${input}`);
+    });
+  });
+
   describe('wrap class expressions', () => {
-    it('should wrap ClassExpression without property decorators in IIFE', () => {
+    it('without property decorators in IIFE', () => {
       const input = tags.stripIndent`
           let AggregateColumnDirective = class AggregateColumnDirective {
               constructor(viewContainerRef) { }
@@ -39,7 +160,40 @@ describe('wrap enums and classes transformer', () => {
       expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
     });
 
-    it('should wrap ClassExpression with property decorators in IIFE', () => {
+    it('with forwardRef in IIFE', () => {
+      const classContent = tags.stripIndent`
+        let FooDirective = FooDirective_1 = class FooDirective {
+            constructor(parent) { }
+        };
+        FooDirective = FooDirective_1 = __decorate([
+            Directive({
+                selector: '[libUnshakeable2]',
+            }),
+            __param(0, SkipSelf()), __param(0, Inject(forwardRef(() => FooDirective_1))),
+            __metadata("design:paramtypes", [FooDirective])
+        ], FooDirective);
+      `;
+
+      const input = tags.stripIndent`
+        var FooDirective_1;
+        ${classContent}
+        export { FooDirective };
+      `;
+
+      const output = tags.stripIndent`
+        var FooDirective_1;
+        const FooDirective = /*@__PURE__*/ (() => {
+            ${classContent}
+
+            return FooDirective;
+        })();
+        export { FooDirective };
+      `;
+
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+
+    it('with property decorators in IIFE', () => {
       const input = tags.stripIndent`
           let ChipList = class ChipList extends Component {
             constructor(options, element) {
@@ -58,8 +212,8 @@ describe('wrap enums and classes transformer', () => {
 
       expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
     });
-    
-    it('should not wrap ClassExpression without decorators', () => {
+
+    it('should not wrap without decorators', () => {
       const input = tags.stripIndent`
           let ChipList = class ChipList extends Component {
             constructor(options, element) {

From 8d479c93d28ce1cc973ef0820fff42c504e1f63f Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 5 Jun 2019 09:01:56 +0200
Subject: [PATCH 1411/1703] test: add test to verify that the new es2015 class
 wrapping logic handles wrapping of tslib and tsickle classes

Related to https://github.com/ngrx/platform/issues/1905 and https://github.com/ng-packagr/ng-packagr/issues/1307

Fixes #14613
---
 .../src/transforms/wrap-enums_spec.ts         | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
index 7a82b4f88642..c5cc64241e23 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
@@ -14,9 +14,40 @@ import { getWrapEnumsTransformer } from './wrap-enums';
 const transform = (content: string) => transformJavascript(
   { content, getTransforms: [getWrapEnumsTransformer] }).content;
 
-// tslint:disable-next-line:no-big-function
+// tslint:disable:no-big-function
 describe('wrap enums and classes transformer', () => {
   describe('wraps class declarations', () => {
+    it('should wrap tsickle emitted classes which followed by metadata', () => {
+      const input = tags.stripIndent`
+       class CustomComponentEffects {
+            constructor(_actions) {
+              this._actions = _actions;
+              this.doThis = this._actions;
+            }
+        }
+        CustomComponentEffects.decorators = [{ type: Injectable }];
+        CustomComponentEffects.ctorParameters = () => [{ type: Actions }];
+        tslib_1.__decorate([
+            Effect(),
+            tslib_1.__metadata("design:type", Object)
+        ], CustomComponentEffects.prototype, "doThis", void 0);
+        tslib_1.__decorate([
+            Effect({ dispatch: false }),
+            tslib_1.__metadata("design:type", Object)
+        ], CustomComponentEffects.prototype, "doThat", void 0);
+      `;
+
+      const output = tags.stripIndent`
+        const CustomComponentEffects = /*@__PURE__*/ (() => {
+          ${input}
+
+          return CustomComponentEffects;
+        })();
+      `;
+
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+
     it('should ClassDeclarations that are referenced with in CallExpressions', () => {
       const input = tags.stripIndent`
         class ApplicationModule {
@@ -305,7 +336,6 @@ describe('wrap enums and classes transformer', () => {
     });
   });
 
-  // tslint:disable-next-line:no-big-function
   describe('wrap enums', () => {
     it('wraps ts 2.2 enums in IIFE', () => {
       const input = tags.stripIndent`

From ef981d63b7f500955780e0410bf362bdea33e98f Mon Sep 17 00:00:00 2001
From: Matt Lewis <hello@mattlewis.me>
Date: Thu, 30 May 2019 15:15:22 -0400
Subject: [PATCH 1412/1703] fix(@angular/cli): add analytics option to options
 schema

---
 packages/angular/cli/lib/config/schema.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index cd0b2b193e6c..0381c91317ab 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -65,6 +65,10 @@
               "x-deprecated": true
             }
           }
+        },
+        "analytics": {
+          "type": "boolean",
+          "description": "Share anonymous usage data with the Angular Team at Google."
         }
       },
       "additionalProperties": false

From 89a122cd5c25deb8e819970714f3aa142949e89d Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Fri, 31 May 2019 07:47:49 +0200
Subject: [PATCH 1413/1703] fix(@schematics/angular): update `ng-packagr` and
 `tsickle` when migrating to version 8

---
 packages/schematics/angular/library/index.ts  |  4 +-
 .../schematics/angular/library/index_spec.ts  |  2 +-
 .../update-8/update-dependencies.ts           | 58 +++++--------------
 .../angular/utility/latest-versions.ts        |  3 +
 4 files changed, 22 insertions(+), 45 deletions(-)

diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index 07dd260fc627..354f23b6bdf9 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -101,12 +101,12 @@ function addDependenciesToPackageJson() {
       {
         type: NodeDependencyType.Dev,
         name: 'ng-packagr',
-        version: '^5.1.0',
+        version: latestVersions.ngPackagr,
       },
       {
         type: NodeDependencyType.Dev,
         name: 'tsickle',
-        version: '^0.35.0',
+        version: latestVersions.tsickle,
       },
       {
         type: NodeDependencyType.Default,
diff --git a/packages/schematics/angular/library/index_spec.ts b/packages/schematics/angular/library/index_spec.ts
index eebf2dad3ba5..310653e9b04a 100644
--- a/packages/schematics/angular/library/index_spec.ts
+++ b/packages/schematics/angular/library/index_spec.ts
@@ -163,7 +163,7 @@ describe('Library Schematic', () => {
       const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
 
       const packageJson = getJsonFileContent(tree, 'package.json');
-      expect(packageJson.devDependencies['ng-packagr']).toEqual('^5.1.0');
+      expect(packageJson.devDependencies['ng-packagr']).toEqual(latestVersions.ngPackagr);
       expect(packageJson.devDependencies['@angular-devkit/build-ng-packagr'])
         .toEqual(latestVersions.DevkitBuildNgPackagr);
     });
diff --git a/packages/schematics/angular/migrations/update-8/update-dependencies.ts b/packages/schematics/angular/migrations/update-8/update-dependencies.ts
index 5f29c6d708df..6845b04deddf 100644
--- a/packages/schematics/angular/migrations/update-8/update-dependencies.ts
+++ b/packages/schematics/angular/migrations/update-8/update-dependencies.ts
@@ -11,55 +11,29 @@ import { latestVersions } from '../../utility/latest-versions';
 
 export function updateDependencies() {
   return (host: Tree) => {
-    let current = getPackageJsonDependency(host, '@angular-devkit/build-angular');
-    if (current && current.version !== latestVersions.DevkitBuildAngular) {
-      addPackageJsonDependency(
-        host,
-        {
-          type: current.type,
-          name: '@angular-devkit/build-angular',
-          version: latestVersions.DevkitBuildAngular,
-          overwrite: true,
-        },
-      );
-    }
 
-    current = getPackageJsonDependency(host, '@angular-devkit/build-ng-packagr');
-    if (current && current.version !== latestVersions.DevkitBuildNgPackagr) {
-      addPackageJsonDependency(
-        host,
-        {
-          type: current.type,
-          name: '@angular-devkit/build-ng-packagr',
-          version: latestVersions.DevkitBuildNgPackagr,
-          overwrite: true,
-        },
-      );
-    }
+    const dependenciesToUpdate: Record<string, string> = {
+      '@angular-devkit/build-angular': latestVersions.DevkitBuildAngular,
+      '@angular-devkit/build-ng-packagr': latestVersions.DevkitBuildNgPackagr,
+      'zone.js': latestVersions.ZoneJs,
+      'tsickle': latestVersions.tsickle,
+      'ng-packagr': latestVersions.ngPackagr,
+      // FIXME: change to ^2.3.2 as soon as it's released with the pr208 fix
+      'web-animations-js': 'github:angular/web-animations-js#release_pr208',
+    };
 
-    current = getPackageJsonDependency(host, 'zone.js');
-    if (current && current.version !== latestVersions.ZoneJs) {
-      addPackageJsonDependency(
-        host,
-        {
-          type: current.type,
-          name: 'zone.js',
-          version: latestVersions.ZoneJs,
-          overwrite: true,
-        },
-      );
-    }
+    for (const [name, version] of Object.entries(dependenciesToUpdate)) {
+      const current = getPackageJsonDependency(host, name);
+      if (!current || current.version === version) {
+        continue;
+      }
 
-    // FIXME: change to ^2.3.2 as soon as it's released with the pr208 fix
-    const webAnimationsJsVersion = 'github:angular/web-animations-js#release_pr208';
-    current = getPackageJsonDependency(host, 'web-animations-js');
-    if (current && current.version !== webAnimationsJsVersion) {
       addPackageJsonDependency(
         host,
         {
           type: current.type,
-          name: 'web-animations-js',
-          version: webAnimationsJsVersion,
+          name,
+          version,
           overwrite: true,
         },
       );
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index ae0241719979..a5b9b0a26b5c 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -16,4 +16,7 @@ export const latestVersions = {
   // The versions below must be manually updated when making a new devkit release.
   DevkitBuildAngular: '~0.800.0-beta.13',
   DevkitBuildNgPackagr: '~0.800.0-beta.13',
+
+  tsickle: '^0.35.0',
+  ngPackagr: '^5.1.0',
 };

From 50c974a583ab1a17cfce14f695cee82c35f552f2 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Mon, 3 Jun 2019 07:38:54 +0200
Subject: [PATCH 1414/1703] fix(@schematics/angular): add
 '@angular-devkit/build-webpack' package to the version 8 migration

---
 .../angular/migrations/update-8/update-dependencies.ts           | 1 +
 packages/schematics/angular/utility/latest-versions.ts           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/schematics/angular/migrations/update-8/update-dependencies.ts b/packages/schematics/angular/migrations/update-8/update-dependencies.ts
index 6845b04deddf..341262f9c5af 100644
--- a/packages/schematics/angular/migrations/update-8/update-dependencies.ts
+++ b/packages/schematics/angular/migrations/update-8/update-dependencies.ts
@@ -15,6 +15,7 @@ export function updateDependencies() {
     const dependenciesToUpdate: Record<string, string> = {
       '@angular-devkit/build-angular': latestVersions.DevkitBuildAngular,
       '@angular-devkit/build-ng-packagr': latestVersions.DevkitBuildNgPackagr,
+      '@angular-devkit/build-webpack': latestVersions.DevkitBuildWebpack,
       'zone.js': latestVersions.ZoneJs,
       'tsickle': latestVersions.tsickle,
       'ng-packagr': latestVersions.ngPackagr,
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index a5b9b0a26b5c..602134e28275 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -16,6 +16,7 @@ export const latestVersions = {
   // The versions below must be manually updated when making a new devkit release.
   DevkitBuildAngular: '~0.800.0-beta.13',
   DevkitBuildNgPackagr: '~0.800.0-beta.13',
+  DevkitBuildWebpack: '~0.800.0-beta.13',
 
   tsickle: '^0.35.0',
   ngPackagr: '^5.1.0',

From be35b7821189dbbeaf12c10417e6cbe8218504f5 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 3 Jun 2019 17:31:13 +0200
Subject: [PATCH 1415/1703] refactor: remove beta versions from latest versions

---
 packages/schematics/angular/utility/latest-versions.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 602134e28275..9a3cf6b2a433 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -8,15 +8,15 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~8.0.0-beta.14',
+  Angular: '~8.0.0',
   RxJs: '~6.4.0',
   ZoneJs: '~0.9.1',
   TypeScript: '~3.4.3',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.800.0-beta.13',
-  DevkitBuildNgPackagr: '~0.800.0-beta.13',
-  DevkitBuildWebpack: '~0.800.0-beta.13',
+  DevkitBuildAngular: '~0.800.0',
+  DevkitBuildNgPackagr: '~0.800.0',
+  DevkitBuildWebpack: '~0.800.0',
 
   tsickle: '^0.35.0',
   ngPackagr: '^5.1.0',

From ac90732e0b2b508a89b042715c091388546abd23 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Fri, 31 May 2019 07:50:53 +0200
Subject: [PATCH 1416/1703] refactor: deprecate `isSupported` static in
 `AngularCompilerPlugin`

---
 packages/ngtools/webpack/src/angular_compiler_plugin.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 1d5af7c2626a..24e3952e2293 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -151,6 +151,7 @@ export class AngularCompilerPlugin {
     return tsProgram ? tsProgram.getTypeChecker() : null;
   }
 
+  /** @deprecated  From 8.0.2 */
   static isSupported() {
     return VERSION && parseInt(VERSION.major) >= 8;
   }

From 7dac687767068ff298072dd76f4c8b56e6e5fb38 Mon Sep 17 00:00:00 2001
From: Amadou Sall <ahasall.dev@gmail.com>
Date: Fri, 31 May 2019 12:48:53 +0200
Subject: [PATCH 1417/1703] refactor(@schematics/angular): remove non-useful or
 operator

---
 packages/schematics/angular/ng-new/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/ng-new/index.ts b/packages/schematics/angular/ng-new/index.ts
index 055eb092311d..af8ac134c3f3 100644
--- a/packages/schematics/angular/ng-new/index.ts
+++ b/packages/schematics/angular/ng-new/index.ts
@@ -65,7 +65,7 @@ export default function (options: NgNewOptions): Rule {
       apply(empty(), [
         schematic('workspace', workspaceOptions),
         options.createApplication ? schematic('application', applicationOptions) : noop,
-        move(options.directory || options.name),
+        move(options.directory),
       ]),
     ),
     (_host: Tree, context: SchematicContext) => {

From 2d27cb4671795242148f813cd27c27167ca96b63 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 31 May 2019 19:15:43 -0400
Subject: [PATCH 1418/1703] fix(@angular/cli): resolve update migrations from
 referenced package root

This ensures that migration fields that reference other packages use the package version specified in the migrating package's dependencies and not the version that a package manager happens to hoist to the root of the workspace.
---
 packages/angular/cli/commands/update-impl.ts | 53 ++++++++++++++++----
 1 file changed, 43 insertions(+), 10 deletions(-)

diff --git a/packages/angular/cli/commands/update-impl.ts b/packages/angular/cli/commands/update-impl.ts
index dc39e1c685e4..5ffe7f1faec4 100644
--- a/packages/angular/cli/commands/update-impl.ts
+++ b/packages/angular/cli/commands/update-impl.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { execSync } from 'child_process';
+import * as fs from 'fs';
 import * as path from 'path';
 import * as semver from 'semver';
 import { Arguments, Option } from '../models/interface';
@@ -22,10 +23,7 @@ import { Schema as UpdateCommandSchema } from './update';
 
 const npa = require('npm-package-arg');
 
-const oldConfigFileNames = [
-  '.angular-cli.json',
-  'angular-cli.json',
-];
+const oldConfigFileNames = ['.angular-cli.json', 'angular-cli.json'];
 
 export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
   public readonly allowMissingWorkspace = true;
@@ -184,12 +182,45 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
       } else if (typeof migrations !== 'string') {
         this.logger.error('Package contains a malformed migrations field.');
 
+        return 1;
+      } else if (path.posix.isAbsolute(migrations) || path.win32.isAbsolute(migrations)) {
+        this.logger.error(
+          'Package contains an invalid migrations field. Absolute paths are not permitted.',
+        );
+
         return 1;
       }
 
-      // if not non-relative, add package name
-      if (migrations.startsWith('.') || migrations.startsWith('/')) {
-        migrations = path.join(packageName, migrations);
+      // Normalize slashes
+      migrations = migrations.replace(/\\/g, '/');
+
+      if (migrations.startsWith('../')) {
+        this.logger.error(
+          'Package contains an invalid migrations field. ' +
+            'Paths outside the package root are not permitted.',
+        );
+
+        return 1;
+      }
+
+      // Check if it is a package-local location
+      const localMigrations = path.join(packageNode.path, migrations);
+      if (fs.existsSync(localMigrations)) {
+        migrations = localMigrations;
+      } else {
+        // Try to resolve from package location.
+        // This avoids issues with package hoisting.
+        try {
+          migrations = require.resolve(migrations, { paths: [packageNode.path] });
+        } catch (e) {
+          if (e.code === 'MODULE_NOT_FOUND') {
+            this.logger.error('Migrations for package were not found.');
+          } else {
+            this.logger.error(`Unable to resolve migrations for package.  [${e.message}]`);
+          }
+
+          return 1;
+        }
       }
 
       return this.runSchematic({
@@ -219,9 +250,11 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
       }
 
       // If a specific version is requested and matches the installed version, skip.
-      if (pkg.type === 'version' &&
-         typeof node === 'object' &&
-         node.package.version === pkg.fetchSpec) {
+      if (
+        pkg.type === 'version' &&
+        typeof node === 'object' &&
+        node.package.version === pkg.fetchSpec
+      ) {
         this.logger.info(`Package '${pkg.name}' is already at '${pkg.fetchSpec}'.`);
         continue;
       }

From 275fdef3500d40e5299305ff9a107e1cca2627ea Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius@betssongroup.com>
Date: Mon, 3 Jun 2019 14:50:16 +0200
Subject: [PATCH 1419/1703] ci: disable TypeScript patch updates for different
 major and minor versions.

At the moment, we get patch updates for different major and minor versions than the current version of TypeScript installed.

```json
{
  "packageRules": [
    {
      "packageNames": [
        "typescript"
      ],
      "separateMinorPatch": true
    },
    {
      "packageNames": [
        "typescript"
      ],
      "updateTypes": [
        "minor",
        "major"
      ],
      "enabled": false
    }
  ]
}
```

What the first rule does is override Renovate's results so that if TypeScript has both a minor update as well as a patch update then you get both PRs. Renovate's default otherwise is to just give you the latest minor or squash. So for example if the current TypeScript is `3.4.4` then the default behaviour is just to PR you for `3.5.1`. With this rule, we get both `3.4.5` and `3.5.1`.

The second rule then disables major and minor updates for TypeScript, which has the effect of them suppressing the minor `3.5.1` update.

For more context see: https://github.com/renovatebot/config-help/issues/260
---
 renovate.json | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/renovate.json b/renovate.json
index 1628fb58f0f5..8aef72e289b8 100644
--- a/renovate.json
+++ b/renovate.json
@@ -53,7 +53,17 @@
       "packageNames": [
         "typescript"
       ],
-      "updateTypes": "patch"
+      "separateMinorPatch": true
+    },
+    {
+      "packageNames": [
+        "typescript"
+      ],
+      "updateTypes": [
+        "minor",
+        "major"
+      ],
+      "enabled": false
     }
   ]
 }

From e509255dc5c8ba2338ac9d2e57e7161694a0504b Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sun, 2 Jun 2019 20:28:00 +0000
Subject: [PATCH 1420/1703] build: update tslint-no-circular-imports to version
 ^0.7.0

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 94a029b462f9..4779f2f69474 100644
--- a/package.json
+++ b/package.json
@@ -136,7 +136,7 @@
     "tree-kill": "^1.2.0",
     "ts-api-guardian": "0.4.4",
     "ts-node": "^5.0.0",
-    "tslint-no-circular-imports": "^0.6.0",
+    "tslint-no-circular-imports": "^0.7.0",
     "tslint-sonarts": "1.9.0"
   },
   "husky": {
diff --git a/yarn.lock b/yarn.lock
index 9abdb6f6082a..8650534be4dc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9712,10 +9712,10 @@ tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
   integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
-tslint-no-circular-imports@^0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/tslint-no-circular-imports/-/tslint-no-circular-imports-0.6.1.tgz#a91358395a81c067bf104a641f269655057715cd"
-  integrity sha512-XuRgHZKFu6dv7fm/tuilmvynLHgtCTd63/p3744dYVEpnMExp2Jd9IwTiBOGmy5bUDlpTy117vtBcLd028RsBA==
+tslint-no-circular-imports@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/tslint-no-circular-imports/-/tslint-no-circular-imports-0.7.0.tgz#9df0a15654d66b172e0b7843eed073fa5ae99b5f"
+  integrity sha512-k3wxpeMC4ef40UbpfBVHEHIzKfNZq5/SCtAO1YjGsaNTklo+K53/TWLrym+poA65RJFDiYgYNWvkeIIkJNA0Vw==
 
 tslint-sonarts@1.9.0:
   version "1.9.0"

From a89a5b59a497f91140e8084ca952fbf2d62b4a28 Mon Sep 17 00:00:00 2001
From: Amadou Sall <ahasall.dev@gmail.com>
Date: Sun, 2 Jun 2019 17:23:42 +0200
Subject: [PATCH 1421/1703] docs: remove mention of the Angular CLI depending
 on Node 8

---
 README.md                    | 2 +-
 scripts/templates/readme.ejs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 865ad2636f26..276c4bdc98d6 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ To get started locally, follow these instructions:
 
 1. If you haven't done it already, [make a fork of this repo](https://github.com/angular/angular-cli/fork).
 1. Clone to your local computer using `git`.
-1. Make sure that you have Node 10.9 or later installed. See instructions [here](https://nodejs.org/en/download/). The Angular CLI requires Node 8, but development requires Node 10.
+1. Make sure that you have Node 10.9 or later installed. See instructions [here](https://nodejs.org/en/download/).
 1. Make sure that you have `yarn` installed; see instructions [here](https://yarnpkg.com/lang/en/docs/install/).
 1. Run `yarn` (no arguments) from the root of your clone of this project.
 1. Run `yarn link` to add all custom scripts we use to your global install.
diff --git a/scripts/templates/readme.ejs b/scripts/templates/readme.ejs
index a4f1857f6998..ff0c5398e0f3 100644
--- a/scripts/templates/readme.ejs
+++ b/scripts/templates/readme.ejs
@@ -56,7 +56,7 @@ To get started locally, follow these instructions:
 
 1. If you haven't done it already, [make a fork of this repo](https://github.com/angular/angular-cli/fork).
 1. Clone to your local computer using `git`.
-1. Make sure that you have Node 10.9 or later installed. See instructions [here](https://nodejs.org/en/download/). The Angular CLI requires Node 8, but development requires Node 10.
+1. Make sure that you have Node 10.9 or later installed. See instructions [here](https://nodejs.org/en/download/).
 1. Make sure that you have `yarn` installed; see instructions [here](https://yarnpkg.com/lang/en/docs/install/).
 1. Run `yarn` (no arguments) from the root of your clone of this project.
 1. Run `yarn link` to add all custom scripts we use to your global install.
@@ -134,8 +134,8 @@ for (const pkgName of Object.keys(packages)) {
   %> | [![latest](https://img.shields.io/npm/v/<%= encode(pkgName) %>/latest.svg)](https://npmjs.com/package/<%= pkgName %>)<%
   %> | <% for (const link of mrPkg.links || []) {
     %>[![<%= link.label %>](https://img.shields.io/badge/<%= link.label %>--<%= link.color || 'green' %>.svg)](<%= link.url %>)<%
-  } 
-  if (mrPkg.snapshotRepo) { 
+  }
+  if (mrPkg.snapshotRepo) {
     %> [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/<%= mrPkg.snapshotRepo %>)<%
   } %>
 <% } %>

From aebcbfed1aa96b4c9e6876b757888357afbaf68c Mon Sep 17 00:00:00 2001
From: Amadou Sall <ahasall.dev@gmail.com>
Date: Sun, 2 Jun 2019 17:27:32 +0200
Subject: [PATCH 1422/1703] docs: add Architect CLI to the "Tooling" section

---
 .monorepo.json | 1 +
 README.md      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.monorepo.json b/.monorepo.json
index 2cb14e819019..81367b00b771 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -75,6 +75,7 @@
     },
     "@angular-devkit/architect-cli": {
       "name": "Architect CLI",
+      "section": "Tooling",
       "snapshotRepo": "angular/angular-devkit-architect-cli-builds"
     },
     "@angular-devkit/benchmark": {
diff --git a/README.md b/README.md
index 276c4bdc98d6..2b50b1394f92 100644
--- a/README.md
+++ b/README.md
@@ -75,6 +75,7 @@ This is a monorepo which contains many tools and packages:
 | Project | Package | Version | Links |
 |---|---|---|---|
 **Angular CLI** | [`@angular/cli`](https://npmjs.com/package/@angular/cli) | [![latest](https://img.shields.io/npm/v/%40angular%2Fcli/latest.svg)](https://npmjs.com/package/@angular/cli) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular/cli/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/cli-builds)
+**Architect CLI** | [`@angular-devkit/architect-cli`](https://npmjs.com/package/@angular-devkit/architect-cli) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Farchitect-cli/latest.svg)](https://npmjs.com/package/@angular-devkit/architect-cli) |  [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-architect-cli-builds)
 **Schematics CLI** | [`@angular-devkit/schematics-cli`](https://npmjs.com/package/@angular-devkit/schematics-cli) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fschematics-cli/latest.svg)](https://npmjs.com/package/@angular-devkit/schematics-cli) |  [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-schematics-cli-builds)
 
 
@@ -84,7 +85,6 @@ This is a monorepo which contains many tools and packages:
 | Project | Package | Version | Links |
 |---|---|---|---|
 **Architect** | [`@angular-devkit/architect`](https://npmjs.com/package/@angular-devkit/architect) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Farchitect/latest.svg)](https://npmjs.com/package/@angular-devkit/architect) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular_devkit/architect/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-architect-builds)
-**Architect CLI** | [`@angular-devkit/architect-cli`](https://npmjs.com/package/@angular-devkit/architect-cli) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Farchitect-cli/latest.svg)](https://npmjs.com/package/@angular-devkit/architect-cli) |  [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-architect-cli-builds)
 **Build Angular** | [`@angular-devkit/build-angular`](https://npmjs.com/package/@angular-devkit/build-angular) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-angular/latest.svg)](https://npmjs.com/package/@angular-devkit/build-angular) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular_devkit/build_angular/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-build-angular-builds)
 **Build NgPackagr** | [`@angular-devkit/build-ng-packagr`](https://npmjs.com/package/@angular-devkit/build-ng-packagr) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-ng-packagr/latest.svg)](https://npmjs.com/package/@angular-devkit/build-ng-packagr) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular_devkit/build_ng_packagr/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-build-ng-packagr-builds)
 **Build Optimizer** | [`@angular-devkit/build-optimizer`](https://npmjs.com/package/@angular-devkit/build-optimizer) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-optimizer/latest.svg)](https://npmjs.com/package/@angular-devkit/build-optimizer) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular_devkit/build_optimizer/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-build-optimizer-builds)

From ed4baa48842175d4dbf13d0b59b6027531ee7ca0 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 3 Jun 2019 13:35:31 -0400
Subject: [PATCH 1423/1703] fix(@angular/cli): avoid updating when package is
 already up to date

Fixes #14647
---
 packages/angular/cli/commands/update-impl.ts | 39 ++++++++++++++++----
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/packages/angular/cli/commands/update-impl.ts b/packages/angular/cli/commands/update-impl.ts
index 5ffe7f1faec4..0dc5bbd587b8 100644
--- a/packages/angular/cli/commands/update-impl.ts
+++ b/packages/angular/cli/commands/update-impl.ts
@@ -18,7 +18,11 @@ import {
   PackageManifest,
   fetchPackageMetadata,
 } from '../utilities/package-metadata';
-import { findNodeDependencies, readPackageTree } from '../utilities/package-tree';
+import {
+  PackageTreeActual,
+  findNodeDependencies,
+  readPackageTree,
+} from '../utilities/package-tree';
 import { Schema as UpdateCommandSchema } from './update';
 
 const npa = require('npm-package-arg');
@@ -238,7 +242,10 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
       });
     }
 
-    const requests: PackageIdentifier[] = [];
+    const requests: {
+      identifier: PackageIdentifier;
+      node: PackageTreeActual | string;
+    }[] = [];
 
     // Validate packages actually are part of the workspace
     for (const pkg of packages) {
@@ -259,22 +266,26 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
         continue;
       }
 
-      requests.push(pkg);
+      requests.push({ identifier: pkg, node });
     }
 
     if (requests.length === 0) {
       return 0;
     }
 
+    const packagesToUpdate: string[] = [];
+
     this.logger.info('Fetching dependency metadata from registry...');
-    for (const requestIdentifier of requests) {
+    for (const { identifier: requestIdentifier, node } of requests) {
+      const packageName = requestIdentifier.name;
+
       let metadata;
       try {
         // Metadata requests are internally cached; multiple requests for same name
         // does not result in additional network traffic
-        metadata = await fetchPackageMetadata(requestIdentifier.name, this.logger);
+        metadata = await fetchPackageMetadata(packageName, this.logger);
       } catch (e) {
-        this.logger.error(`Error fetching metadata for '${requestIdentifier.name}': ` + e.message);
+        this.logger.error(`Error fetching metadata for '${packageName}': ` + e.message);
 
         return 1;
       }
@@ -303,6 +314,20 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
 
         return 1;
       }
+
+      if (
+        (typeof node === 'string' && manifest.version === node) ||
+        (typeof node === 'object' && manifest.version === node.package.version)
+      ) {
+        this.logger.info(`Package '${packageName}' is already up to date.`);
+        continue;
+      }
+
+      packagesToUpdate.push(requestIdentifier.toString());
+    }
+
+    if (packagesToUpdate.length === 0) {
+      return 0;
     }
 
     return this.runSchematic({
@@ -313,7 +338,7 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
       additionalOptions: {
         force: options.force || false,
         packageManager,
-        packages: requests.map(p => p.toString()),
+        packages: packagesToUpdate,
       },
     });
   }

From 195807141cb7a4ef1781d7a467dbeaa4da7a6591 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 4 Jun 2019 05:22:10 +0000
Subject: [PATCH 1424/1703] build: update autoprefixer to version 9.6.0

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 35 ++++++-------------
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index cbe64581ea69..d39d47260e78 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -13,7 +13,7 @@
     "@angular-devkit/core": "0.0.0",
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.10.0",
-    "autoprefixer": "9.5.1",
+    "autoprefixer": "9.6.0",
     "browserslist": "4.6.1",
     "caniuse-api": "3.0.0",
     "circular-dependency-plugin": "5.0.2",
diff --git a/yarn.lock b/yarn.lock
index 8650534be4dc..c97a5d28310a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1240,16 +1240,17 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@9.5.1:
-  version "9.5.1"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.5.1.tgz#243b1267b67e7e947f28919d786b50d3bb0fb357"
-  integrity sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==
+autoprefixer@9.6.0:
+  version "9.6.0"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.0.tgz#0111c6bde2ad20c6f17995a33fad7cf6854b4c87"
+  integrity sha512-kuip9YilBqhirhHEGHaBTZKXL//xxGnzvsD0FtBQa6z+A69qZD6s/BAX9VzDF1i9VKDquTJDQaPLSEhOnL6FvQ==
   dependencies:
-    browserslist "^4.5.4"
-    caniuse-lite "^1.0.30000957"
+    browserslist "^4.6.1"
+    caniuse-lite "^1.0.30000971"
+    chalk "^2.4.2"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.14"
+    postcss "^7.0.16"
     postcss-value-parser "^3.3.1"
 
 autoprefixer@^9.0.0:
@@ -1628,7 +1629,7 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@4.6.1:
+browserslist@4.6.1, browserslist@^4.6.1:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.1.tgz#ee5059b1aec18cbec9d055d6cb5e24ae50343a9b"
   integrity sha512-1MC18ooMPRG2UuVFJTHFIAkk6mpByJfxCrnUyvSlu/hyQSFHMrlhM02SzNuCV+quTP4CKmqtOMAIjrifrpBJXQ==
@@ -1637,7 +1638,7 @@ browserslist@4.6.1:
     electron-to-chromium "^1.3.137"
     node-releases "^1.1.21"
 
-browserslist@^4.0.0, browserslist@^4.3.3, browserslist@^4.5.4:
+browserslist@^4.0.0, browserslist@^4.3.3:
   version "4.5.5"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.5.tgz#fe1a352330d2490d5735574c149a85bc18ef9b82"
   integrity sha512-0QFO1r/2c792Ohkit5XI8Cm8pDtZxgNl2H6HU4mHrpYz7314pEYcsAVVatM0l/YmxPnEzh9VygXouj4gkFUTKA==
@@ -1881,11 +1882,6 @@ caniuse-lite@^1.0.30000898:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000903.tgz#86d46227759279b3db345ddbe778335dbba9e858"
   integrity sha512-T1XVJEpGCoaq7MDw7/6hCdYUukmSaS+1l/OQJkLtw7Cr2+/+d67tNGKEbyiqf7Ck8x6EhNFUxjYFXXka0N/w5g==
 
-caniuse-lite@^1.0.30000957:
-  version "1.0.30000957"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000957.tgz#fb1026bf184d7d62c685205358c3b24b9e29f7b3"
-  integrity sha512-8wxNrjAzyiHcLXN/iunskqQnJquQQ6VX8JHfW5kLgAPRSiSuKZiNfmIkP5j7jgyXqAQBSoXyJxfnbCFS0ThSiQ==
-
 caniuse-lite@^1.0.30000960:
   version "1.0.30000960"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000960.tgz#ec48297037e5607f582f246ae7b12bee66a78999"
@@ -7466,7 +7462,7 @@ postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.1:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss@7.0.16:
+postcss@7.0.16, postcss@^7.0.16:
   version "7.0.16"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.16.tgz#48f64f1b4b558cb8b52c88987724359acb010da2"
   integrity sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==
@@ -7484,15 +7480,6 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
     source-map "^0.6.1"
     supports-color "^5.5.0"
 
-postcss@^7.0.14:
-  version "7.0.14"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
-  integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==
-  dependencies:
-    chalk "^2.4.2"
-    source-map "^0.6.1"
-    supports-color "^6.1.0"
-
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"

From e3bb367db1834027680bdd7c88f2f8a083e158c7 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Tue, 4 Jun 2019 14:47:15 +0200
Subject: [PATCH 1425/1703] fix(@ngtools/webpack): rebuilding project with
 errors reports cannot find .ts files in JIT

When the first build in JIT has an error we are not emitting files. This ends up causing an issue because subsequent builds only trigger partial emits of files and only emits the full set of files if the number of files changed is greater than 20.

This logic adds the behavior that we only enter the 'only 20 files' part when the previous build was successful.

Fixes #14644
---
 .../test/browser/rebuild_spec_large.ts        | 46 +++++++++++++++++--
 .../webpack/src/angular_compiler_plugin.ts    |  2 +-
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
index ce69a366348f..ea88bef2ab70 100644
--- a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
@@ -9,7 +9,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { TestLogger } from '@angular-devkit/architect/testing';
-import { normalize, virtualFs } from '@angular-devkit/core';
+import { logging, normalize, virtualFs } from '@angular-devkit/core';
 import { debounceTime, take, takeWhile, tap } from 'rxjs/operators';
 import { createArchitect, host, lazyModuleFiles, lazyModuleStringImport } from '../utils';
 
@@ -68,14 +68,11 @@ describe('Browser Builder rebuilds', () => {
 
     const overrides = { watch: true };
 
-    let buildCount = 0;
     let phase = 1;
     const run = await architect.scheduleTarget(target, overrides);
     await run.output.pipe(
       tap(result => {
         expect(result.success).toBe(true, 'build should succeed');
-        buildCount++;
-
         const hasLazyChunk = host.scopedSync().exists(normalize('dist/lazy-lazy-module.js'));
         switch (phase) {
           case 1:
@@ -205,6 +202,47 @@ describe('Browser Builder rebuilds', () => {
     ).toPromise();
   });
 
+  it('rebuilds after errors in JIT', async () => {
+    const origContent = virtualFs.fileBufferToString(
+      host.scopedSync().read(normalize('src/app/app.component.ts')));
+    host.appendToFile('./src/app/app.component.ts', `console.logg('error')`);
+
+    const overrides = { watch: true, aot: false };
+    let buildNumber = 0;
+    const logger = new logging.Logger('');
+    let logs: string[] = [];
+    logger.subscribe(e => logs.push(e.message));
+
+    const run = await architect.scheduleTarget(target, overrides, { logger });
+    await run.output.pipe(
+      debounceTime(1000),
+      tap((buildEvent) => {
+        buildNumber ++;
+        switch (buildNumber) {
+          case 1:
+            // The first build should error out with an error.
+            expect(buildEvent.success).toBe(false);
+            expect(logs.join()).toContain(`Property 'logg' does not exist on type 'Console'`);
+            logs = [];
+            // Fix the error.
+            host.writeMultipleFiles({ 'src/app/app.component.ts': `
+              ${origContent}
+              console.errorr('error');
+            `});
+            break;
+
+          case 2:
+            // The second build should have everything fixed.
+            expect(buildEvent.success).toBe(true);
+            expect(logs.join()).not.toContain('Module build failed');
+            break;
+        }
+      }),
+      take(2),
+    ).toPromise();
+    await run.stop();
+  });
+
   it('rebuilds after errors in AOT', async () => {
     // Save the original contents of `./src/app/app.component.ts`.
     const origContent = virtualFs.fileBufferToString(
diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 24e3952e2293..e6a218830068 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -1196,7 +1196,7 @@ export class AngularCompilerPlugin {
           'AngularCompilerPlugin._emit.ts', diagMode));
 
         if (!hasErrors(allDiagnostics)) {
-          if (this._firstRun || changedTsFiles.size > 20) {
+          if (this._firstRun || changedTsFiles.size > 20 || this._emitSkipped) {
             emitResult = tsProgram.emit(
               undefined,
               undefined,

From 6893fc1cddab21635a9befa2f0677108a9e1e1d0 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius@betssongroup.com>
Date: Tue, 4 Jun 2019 16:10:58 +0200
Subject: [PATCH 1426/1703] fix(@angular-devkit/build-angular): server build is
 generating un-needed polyfill file

Fixes #14655
---
 .../models/webpack-configs/common.ts          | 63 ++++++++++---------
 .../test/server/base_spec_large.ts            | 30 ++++++++-
 2 files changed, 61 insertions(+), 32 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 6a842bd80ee8..7e9402759b0c 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -66,42 +66,43 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
     entryPoints['main'] = [path.resolve(root, buildOptions.main)];
   }
 
-  const es5Polyfills = path.join(__dirname, '..', 'es5-polyfills.js');
-  const es5JitPolyfills = path.join(__dirname, '..', 'es5-jit-polyfills.js');
-
-  if (targetInFileName) {
-    // For differential loading we don't need to have 2 polyfill bundles
-    if (buildOptions.scriptTargetOverride === ScriptTarget.ES2015) {
-      entryPoints['polyfills'] = [path.join(__dirname, '..', 'safari-nomodule.js')];
-    } else {
-      entryPoints['polyfills'] = [es5Polyfills];
-      if (!buildOptions.aot) {
-        entryPoints['polyfills'].push(es5JitPolyfills);
+  if (wco.buildOptions.platform !== 'server') {
+    const es5Polyfills = path.join(__dirname, '..', 'es5-polyfills.js');
+    const es5JitPolyfills = path.join(__dirname, '..', 'es5-jit-polyfills.js');
+    if (targetInFileName) {
+      // For differential loading we don't need to have 2 polyfill bundles
+      if (buildOptions.scriptTargetOverride === ScriptTarget.ES2015) {
+        entryPoints['polyfills'] = [path.join(__dirname, '..', 'safari-nomodule.js')];
+      } else {
+        entryPoints['polyfills'] = [es5Polyfills];
+        if (!buildOptions.aot) {
+          entryPoints['polyfills'].push(es5JitPolyfills);
+        }
       }
-    }
-  } else {
-    // For NON differential loading we want to have 2 polyfill bundles
-    if (buildOptions.es5BrowserSupport
-      || (buildOptions.es5BrowserSupport === undefined && isEs5SupportNeeded(projectRoot))) {
-      entryPoints['polyfills-es5'] = [es5Polyfills];
-      if (!buildOptions.aot) {
-        entryPoints['polyfills-es5'].push(es5JitPolyfills);
+    } else {
+      // For NON differential loading we want to have 2 polyfill bundles
+      if (buildOptions.es5BrowserSupport
+        || (buildOptions.es5BrowserSupport === undefined && isEs5SupportNeeded(projectRoot))) {
+        entryPoints['polyfills-es5'] = [es5Polyfills];
+        if (!buildOptions.aot) {
+          entryPoints['polyfills-es5'].push(es5JitPolyfills);
+        }
       }
     }
-  }
 
-  if (buildOptions.polyfills) {
-    entryPoints['polyfills'] = [
-      ...(entryPoints['polyfills'] || []),
-      path.resolve(root, buildOptions.polyfills),
-    ];
-  }
+    if (buildOptions.polyfills) {
+      entryPoints['polyfills'] = [
+        ...(entryPoints['polyfills'] || []),
+        path.resolve(root, buildOptions.polyfills),
+      ];
+    }
 
-  if (!buildOptions.aot) {
-    entryPoints['polyfills'] = [
-      ...(entryPoints['polyfills'] || []),
-      path.join(__dirname, '..', 'jit-polyfills.js'),
-    ];
+    if (!buildOptions.aot) {
+      entryPoints['polyfills'] = [
+        ...(entryPoints['polyfills'] || []),
+        path.join(__dirname, '..', 'jit-polyfills.js'),
+      ];
+    }
   }
 
   if (buildOptions.profile || process.env['NG_BUILD_PROFILING']) {
diff --git a/packages/angular_devkit/build_angular/test/server/base_spec_large.ts b/packages/angular_devkit/build_angular/test/server/base_spec_large.ts
index 471529110938..6a3fa9403b2f 100644
--- a/packages/angular_devkit/build_angular/test/server/base_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/server/base_spec_large.ts
@@ -7,7 +7,7 @@
  */
 
 import { Architect } from '@angular-devkit/architect';
-import { join, normalize, virtualFs } from '@angular-devkit/core';
+import { getSystemPath, join, normalize, virtualFs } from '@angular-devkit/core';
 import { take, tap } from 'rxjs/operators';
 import { BrowserBuilderOutput } from '../../src/browser';
 import { createArchitect, host } from '../utils';
@@ -37,6 +37,34 @@ describe('Server Builder', () => {
     await run.stop();
   });
 
+  it('should not emit polyfills', async () => {
+    const run = await architect.scheduleTarget(target);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+
+    expect(host.fileMatchExists(getSystemPath(outputPath), /polyfills/)).not.toBeDefined();
+    expect(host.fileMatchExists(getSystemPath(outputPath), /main/)).toBeDefined();
+
+    await run.stop();
+  });
+
+  it('should not emit polyfills when ES5 support is needed', async () => {
+    // the below is needed because of different code paths
+    // for polyfills if differential loading is needed
+    host.writeMultipleFiles({
+      'browserslist': 'IE 10',
+    });
+
+    const run = await architect.scheduleTarget(target);
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+
+    expect(host.fileMatchExists(getSystemPath(outputPath), /polyfills/)).not.toBeDefined();
+    expect(host.fileMatchExists(getSystemPath(outputPath), /main/)).toBeDefined();
+
+    await run.stop();
+  });
+
   it('supports sourcemaps', async () => {
     const overrides = { sourceMap: true };
 

From 301b1fe8f4cdf8849b2e323d80984aec3f2fd356 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 5 Jun 2019 05:21:55 +0000
Subject: [PATCH 1427/1703] build: update webpack to version 4.33.0

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 packages/angular_devkit/build_webpack/package.json | 2 +-
 packages/ngtools/webpack/package.json              | 2 +-
 yarn.lock                                          | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index d39d47260e78..e48468702b00 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -48,7 +48,7 @@
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.3.0",
-    "webpack": "4.32.2",
+    "webpack": "4.33.0",
     "webpack-dev-middleware": "3.7.0",
     "webpack-dev-server": "3.4.1",
     "webpack-merge": "4.2.1",
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index dd94afe40ce8..62dad0e90c0e 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -17,7 +17,7 @@
     "webpack-dev-server": "^3.1.4"
   },
   "devDependencies": {
-    "webpack": "4.32.2",
+    "webpack": "4.33.0",
     "webpack-dev-server": "^3.1.4"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 3463a8c1ebf3..c16ee2f22ec7 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -36,6 +36,6 @@
     "@angular/compiler": "^8.0.0-beta.14",
     "@angular/compiler-cli": "^8.0.0-beta.14",
     "typescript": "3.4.5",
-    "webpack": "4.32.2"
+    "webpack": "4.33.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index c97a5d28310a..7f47f8856fc2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10220,10 +10220,10 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.32.2:
-  version "4.32.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.32.2.tgz#3639375364a617e84b914ddb2c770aed511e5bc8"
-  integrity sha512-F+H2Aa1TprTQrpodRAWUMJn7A8MgDx82yQiNvYMaj3d1nv3HetKU0oqEulL9huj8enirKi8KvEXQ3QtuHF89Zg==
+webpack@4.33.0:
+  version "4.33.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.33.0.tgz#c30fc4307db432e5c5e3333aaa7c16a15a3b277e"
+  integrity sha512-ggWMb0B2QUuYso6FPZKUohOgfm+Z0sVFs8WwWuSH1IAvkWs428VDNmOlAxvHGTB9Dm/qOB/qtE5cRx5y01clxw==
   dependencies:
     "@webassemblyjs/ast" "1.8.5"
     "@webassemblyjs/helper-module-context" "1.8.5"

From 5476a45ac443d703163db53d5940dc1e2d442f16 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 5 Jun 2019 19:24:26 +0200
Subject: [PATCH 1428/1703] fix(@ngtools/webpack): always strip BOM when
 reading files

This is to align with the tsc readFile logic https://github.com/microsoft/TypeScript/blob/9da05243ff7ba9a2776d5a52118d680348b1454d/src/compiler/sys.ts#L1067
---
 packages/ngtools/webpack/src/compiler_host.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/ngtools/webpack/src/compiler_host.ts b/packages/ngtools/webpack/src/compiler_host.ts
index 93701c93a161..47b069391984 100644
--- a/packages/ngtools/webpack/src/compiler_host.ts
+++ b/packages/ngtools/webpack/src/compiler_host.ts
@@ -147,13 +147,15 @@ export class WebpackCompilerHost implements ts.CompilerHost {
     const filePath = this.resolve(fileName);
 
     try {
+      let content: ArrayBuffer;
       if (this._memoryHost.isFile(filePath)) {
-        return virtualFs.fileBufferToString(this._memoryHost.read(filePath));
+        content = this._memoryHost.read(filePath);
       } else {
-        const content = this._syncHost.read(filePath);
-
-        return virtualFs.fileBufferToString(content);
+        content = this._syncHost.read(filePath);
       }
+
+      // strip BOM
+      return virtualFs.fileBufferToString(content).replace(/^\uFEFF/, '');
     } catch {
       return undefined;
     }

From 2334a7c030971af240f744f170bf162121370275 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 5 Jun 2019 12:30:26 -0400
Subject: [PATCH 1429/1703] fix(@angular/cli): use recommended TTY check logic

`stdin` can be redirected/piped by various shells but still be interactive.  Node.js recommends only testing `stdout`: https://nodejs.org/api/tty.html#tty_tty

Fixes #14640
---
 packages/angular/cli/utilities/tty.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/utilities/tty.ts b/packages/angular/cli/utilities/tty.ts
index e02ea017525c..24d499d3e4a8 100644
--- a/packages/angular/cli/utilities/tty.ts
+++ b/packages/angular/cli/utilities/tty.ts
@@ -11,5 +11,7 @@ export function isTTY(): boolean {
     return !(force === '0' || force.toUpperCase() === 'FALSE');
   }
 
-  return !!process.stdout.isTTY && !!process.stdin.isTTY && !('CI' in process.env);
+  const ci = process.env['CI'];
+
+  return !!process.stdout.isTTY && (!ci || ci === '0' || ci.toUpperCase() === 'FALSE');
 }

From 1648a67ff2fccb41c86d7944676fdd8a084ac93f Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 6 Jun 2019 05:23:56 +0000
Subject: [PATCH 1430/1703] build: update file-loader to version 4.0.0

---
 packages/angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                          | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index e48468702b00..e77cc58f44be 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -20,7 +20,7 @@
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.3",
     "core-js": "3.1.3",
-    "file-loader": "3.0.1",
+    "file-loader": "4.0.0",
     "glob": "7.1.4",
     "istanbul-instrumenter-loader": "3.0.1",
     "karma-source-map-support": "1.4.0",
diff --git a/yarn.lock b/yarn.lock
index 7f47f8856fc2..dd45f277588a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3755,12 +3755,12 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-file-loader@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz#f8e0ba0b599918b51adfe45d66d1e771ad560faa"
-  integrity sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==
+file-loader@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.0.0.tgz#c3570783fefb6e1bc0978a856f4bf5825b966c2a"
+  integrity sha512-roAbL6IdSGczwfXxhMi6Zq+jD4IfUpL0jWHD7fvmjdOVb7xBfdRUHe4LpBgO23VtVK5AW1OlWZo0p34Jvx3iWg==
   dependencies:
-    loader-utils "^1.0.2"
+    loader-utils "^1.2.2"
     schema-utils "^1.0.0"
 
 filename-regex@^2.0.0:
@@ -5797,7 +5797,7 @@ loader-runner@^2.3.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.1.tgz#026f12fe7c3115992896ac02ba022ba92971b979"
   integrity sha512-By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw==
 
-loader-utils@1.2.3, loader-utils@^1.2.3:
+loader-utils@1.2.3, loader-utils@^1.2.2, loader-utils@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
   integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==

From 0531242f4b15e68dde845012d710dafce6ac8cf8 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 6 Jun 2019 15:07:02 +0200
Subject: [PATCH 1431/1703] fix(@schematics/angular): move browserslist even
 when no sourceRoot is available

```
Using package manager: 'npm'
Collecting installed dependencies...
Found 36 dependencies.
    ** Executing migrations for package '@angular/cli' **
RENAME src/browserslist => /browserslist
UPDATE tslint.json (2800 bytes)
UPDATE package.json (1396 bytes)
UPDATE tsconfig.json (460 bytes)
UPDATE tsconfig.app.json (282 bytes)
UPDATE tsconfig.spec.json (256 bytes)
```

Fixes #14660
---
 .../update-8/differential-loading.ts          | 28 ++++++-------------
 .../update-8/differential-loading_spec.ts     | 13 +++++++++
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-8/differential-loading.ts b/packages/schematics/angular/migrations/update-8/differential-loading.ts
index 620a34bedba2..41408e6b18a3 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading.ts
@@ -88,26 +88,16 @@ export function updateES5Projects(): Rule {
       }
 
       const browserslistPath = join(normalize(project.root), 'browserslist');
-      if (typeof project.sourceRoot === 'string') {
-        // Move the CLI 7 style browserlist to root if it's there.
-        const srcBrowsersList = join(normalize(project.sourceRoot), 'browserslist');
-        if (tree.exists(srcBrowsersList) && !tree.exists(browserslistPath)) {
-          // TODO: use rename instead.
-          // This is a hacky workaround. We should be able to just rename it.
-          // On unit tests the rename works fine but on real projects it fails with
-          //     ERROR! browserslist does not exist..
-          // This seems to happen because we are both renaming and then commiting an update.
-          // But it's fine if we read/create/delete. There's a bug somewhere.
-          // tree.rename(srcBrowsersList, browserslistPath);
-          const content = tree.read(srcBrowsersList);
-          if (content) {
-            tree.create(browserslistPath, content);
-            tree.delete(srcBrowsersList);
-          }
-        }
-      }
 
-      if (!tree.exists(browserslistPath)) {
+      // Move the CLI 7 style browserlist to root if it's there.
+      const sourceRoot = project.sourceRoot === 'string'
+        ? project.sourceRoot
+        : join(normalize(project.root), 'src');
+      const srcBrowsersList = join(normalize(sourceRoot), 'browserslist');
+
+      if (tree.exists(srcBrowsersList)) {
+        tree.rename(srcBrowsersList, browserslistPath);
+      } else if (!tree.exists(browserslistPath)) {
         tree.create(browserslistPath, browserslistContent);
       }
     }
diff --git a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
index 4dfdf6347ca5..c546af8d346d 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
@@ -166,5 +166,18 @@ describe('Migration to version 8', () => {
       const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
       expect(tree2.exists('/browserslist')).toBe(false);
     });
+
+    it(`should move 'browserslist' to root when 'sourceRoot' is not defined`, () => {
+      tree.rename('/browserslist', '/src/browserslist');
+      expect(tree.exists('/src/browserslist')).toBe(true);
+
+      const config = JSON.parse(tree.readContent('angular.json'));
+      config.projects['migration-test'].sourceRoot = undefined;
+
+      tree.overwrite('angular.json', JSON.stringify(config));
+      const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
+      expect(tree2.exists('/src/browserslist')).toBe(false);
+      expect(tree2.exists('/browserslist')).toBe(true);
+    });
   });
 });

From 8828a7d271672930cdc12236eda8fc036aaf8ed6 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 6 Jun 2019 18:57:59 +0200
Subject: [PATCH 1432/1703] fix(@angular-devkit/build-angular): re-order ES5
 polyfills in karma HTMLs

Similar to the index HTML page (https://github.com/angular/angular-cli/blob/6ec09919b5c2695dee784ce0c3accee7f9754bb0/tests/legacy-cli/e2e/tests/misc/support-ie.ts#L30-L37) ES5 polyfills should be loaded prior to the other polyfills. This is because other polyfills such as `zone.js` require these for example `Symbol` and `Object.isFrozen`

Fixes #14618
---
 .../src/angular-cli-files/plugins/karma-context.html            | 2 +-
 .../src/angular-cli-files/plugins/karma-debug.html              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html
index cef84e87c8ea..1f91cd461a97 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-context.html
@@ -28,8 +28,8 @@
     %MAPPINGS%
   </script>
   <script src="_karma_webpack_/runtime.js" crossorigin="anonymous"></script>
-  <script src="_karma_webpack_/polyfills.js" crossorigin="anonymous"></script>
   <script src="_karma_webpack_/polyfills-es5.js" crossorigin="anonymous" nomodule></script>
+  <script src="_karma_webpack_/polyfills.js" crossorigin="anonymous"></script>
   <!-- Dynamically replaced with <script> tags -->
   %SCRIPTS%
   <script src="_karma_webpack_/styles.js" crossorigin="anonymous"></script>
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-debug.html b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-debug.html
index 93739d39b7cf..8c3fe313059d 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-debug.html
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma-debug.html
@@ -29,8 +29,8 @@
     %MAPPINGS%
   </script>
   <script src="_karma_webpack_/runtime.js" crossorigin="anonymous"></script>
-  <script src="_karma_webpack_/polyfills.js" crossorigin="anonymous"></script>
   <script src="_karma_webpack_/polyfills-es5.js" crossorigin="anonymous" nomodule></script>
+  <script src="_karma_webpack_/polyfills.js" crossorigin="anonymous"></script>
   <!-- Dynamically replaced with <script> tags -->
   %SCRIPTS%
   <script src="_karma_webpack_/styles.js" crossorigin="anonymous"></script>

From 66a18defc217bd8a3039d9bb9224417826878046 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 6 Jun 2019 21:07:50 +0000
Subject: [PATCH 1433/1703] build: update sass to version 1.21.0

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index e77cc58f44be..b7a61358c849 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -37,7 +37,7 @@
     "postcss-loader": "3.0.0",
     "raw-loader": "1.0.0",
     "rxjs": "6.4.0",
-    "sass": "1.20.1",
+    "sass": "1.21.0",
     "sass-loader": "7.1.0",
     "semver": "6.1.1",
     "source-map-support": "0.5.12",
diff --git a/yarn.lock b/yarn.lock
index dd45f277588a..af04e04f4eb9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8383,10 +8383,10 @@ sass-loader@7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
-sass@1.20.1:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.20.1.tgz#737b901fe072336da540b6d00ec155e2267420da"
-  integrity sha512-BnCawee/L5kVG3B/5Jg6BFwASqUwFVE6fj2lnkVuSXDgQ7gMAhY9a2yPeqsKhJMCN+Wgx0r2mAW7XF/aTF5qtA==
+sass@1.21.0:
+  version "1.21.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.21.0.tgz#cc565444e27c2336746b09c45d6e8c46caaf6b04"
+  integrity sha512-67hIIOZZtarbhI2aSgKBPDUgn+VqetduKoD+ZSYeIWg+ksNioTzeX+R2gUdebDoolvKNsQ/GY9NDxctbXluTNA==
   dependencies:
     chokidar "^2.0.0"
 

From a208cf4b311d4ba15a2978a9decf804a973b2fc0 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 6 Jun 2019 21:24:19 +0000
Subject: [PATCH 1434/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 70ef51550c15..297633071ac3 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#1e34cab0423db59c3b364c948337d74ce4f655f0",
-    "@angular/common": "github:angular/common-builds#3830190f3c40574b790bb3293eec43922504a7d1",
-    "@angular/compiler": "github:angular/compiler-builds#dec1d0ae65eb72be351688f41942aa7906d63a85",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#760f674ae4521cbb3e466cecebf6d56a2298d2ff",
-    "@angular/core": "github:angular/core-builds#3c57d29f87d0e6d04019458bf9039ca7a761e692",
-    "@angular/forms": "github:angular/forms-builds#05058433150bd292035551f3ba494fe5067ba5b6",
-    "@angular/language-service": "github:angular/language-service-builds#f93bbf43d420a6de2143797384754b7ec520bde0",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#6275982f552fa3be5cc6357ad77417ce9bc535ac",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#a698e7053da378af94b0866c9d1c11863ac5139c",
-    "@angular/router": "github:angular/router-builds#cde8b1753d043667fe2548495fab136307c325f2"
+    "@angular/animations": "github:angular/animations-builds#e7ec74fd6fcc9c4b76ccae9216a2024d53866213",
+    "@angular/common": "github:angular/common-builds#004f3c99bc42f741c03e16a31eb92e6400651699",
+    "@angular/compiler": "github:angular/compiler-builds#c611936467612af339ec4e9c5c543daaf5d6736f",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#dfed7d095e31cf906fd50993a42e443e48d29735",
+    "@angular/core": "github:angular/core-builds#c16911476ec4ba6be8c8c84ad26e0ac291b25519",
+    "@angular/forms": "github:angular/forms-builds#11e3f5059c3ed69b40c9cdc46ae5a2084b203c8c",
+    "@angular/language-service": "github:angular/language-service-builds#dd25a1c434227c26f94b75d6019c13ee1635adcb",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#c4e3021a9fe77888a97fa0d4944ff8aba2f8622a",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#b8c6d3d756bc7fb5f037f1b6b0409299253b36b5",
+    "@angular/router": "github:angular/router-builds#8710ca55dcd996044fe4720cb906d7c007776a49"
   }
 }
\ No newline at end of file

From 97970026f1680af48867efcd73914c30033fdc99 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 6 Jun 2019 11:05:44 +0100
Subject: [PATCH 1435/1703] ci: add circleci windows preview

---
 .circleci/config.yml                          | 73 ++++++++++++++++++-
 .circleci/windows-env.ps1                     |  9 +++
 lib/bootstrap-local.js                        |  6 +-
 package.json                                  |  2 +-
 .../angular/universal/index_spec.ts           |  2 +-
 .../generate/directive/directive-prefix.ts    |  4 +-
 tests/legacy-cli/e2e/tests/misc/title.ts      |  6 ++
 7 files changed, 94 insertions(+), 8 deletions(-)
 create mode 100644 .circleci/windows-env.ps1

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a1b54ad84631..8af69dc07f08 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,6 +23,12 @@ anchor_1: &defaults
   working_directory: ~/ng
   docker:
     - image: *default_docker_image
+anchor_1_win: &defaults_win
+  working_directory: ~/ng
+  resource_class: windows.medium
+  shell: powershell.exe -ExecutionPolicy Bypass
+  machine:
+    image: windows-server-2019  
 
 # After checkout, rebase on top of target branch.
 anchor_2: &post_checkout
@@ -38,6 +44,14 @@ anchor_2: &post_checkout
       else
         echo "This build is not over a PR, nothing to do."
       fi
+anchor_2_win: &post_checkout_win
+  run:
+    name: Rebase PR on target branch
+    command: >
+      if (Test-Path env:CIRCLE_PR_NUMBER) {
+        git config user.name "angular-ci"
+        git config user.email "angular-ci"
+        node tools\rebase-pr.js angular/angular-cli $env:CIRCLE_PR_NUMBER }
 anchor_3: &restore_cache
   restore_cache:
     keys:
@@ -46,9 +60,15 @@ anchor_3: &restore_cache
       - angular_devkit-0.7.0-
 anchor_4: &attach_options
   at: .
+anchor_5: &env_win
+  run:
+    # Need to install node and yarn before, as the base windows image doesn't have anything.
+    # TODO: remove when CircleCI provides preconfigured node images/VMs.
+    name: Setup windows node environment
+    command: ./.circleci/windows-env.ps1 
 
 # Job definitions
-version: 2
+version: 2.1
 jobs:
   install:
     <<: *defaults
@@ -202,6 +222,45 @@ jobs:
           command: |
             npm run admin -- publish --verbose
 
+  # Windows jobs
+  # CircleCI support for Windows jobs is still in preview.
+  # Docs: https://github.com/CircleCI-Public/windows-preview-docs
+  test-win:
+    <<: *defaults_win
+    # Skipping cache and workspace for now because it takes 10x longer than on linux. 
+    # TODO: when/if CircleCI makes them faster, use cache and workspaces fully.
+    # Notes: 
+    # - windows needs its own cache key because binaries in node_modules are different.
+    # - windows might need its own workspace for the same reason.
+    # - get cache dir on windows via `yarn cache dir` (was `C:\Users\circleci\AppData\Local\Yarn\Cache\v4` last time)
+    steps:
+      - checkout
+      - *env_win
+      - *post_checkout_win
+      - run: node --version
+      - run: yarn --version
+      - run: yarn install --frozen-lockfile
+      # Build and test should be on their own jobs, but restoring workspaces is too slow
+      # so we do it here.
+      - run: npm run admin -- build  
+      - run: npm run test -- --full        
+      # Run partial e2e suite on PRs only. Master will run the full e2e suite with sharding.
+      - run: if (Test-Path env:CIRCLE_PR_NUMBER) { node tests\legacy-cli\run_e2e.js "--glob=tests/{basic,ivy}/**" }            
+             
+  e2e-cli-win:
+    <<: *defaults_win
+    parallelism: 4
+    steps:     
+      - checkout
+      - *env_win
+      # TODO: remove commands other than the e2e runner when workspaces on windows are well supported.
+      - *post_checkout_win
+      - run: node --version
+      - run: yarn --version
+      - run: yarn install --frozen-lockfile
+      - run: npm run admin -- build  
+      - run: node tests\legacy-cli\run_e2e.js --nb-shards=$env:CIRCLE_NODE_TOTAL --shard=$env:CIRCLE_NODE_INDEX             
+
 workflows:
   version: 2
   default_workflow:
@@ -237,7 +296,7 @@ workflows:
             - build
       - e2e-cli-ivy:
           requires:
-            - build            
+            - build
       - snapshot_publish_docs:
           requires:
           - install
@@ -248,6 +307,16 @@ workflows:
       - e2e-cli-ng-snapshots:
           requires:
             - build
+      - test-win:
+          requires:
+            - test     
+      - e2e-cli-win:
+          requires:
+            - e2e-cli      
+          filters:
+            branches:
+              ignore:
+                - /pull\/.*/
       - snapshot_publish:
           requires:
             - test
diff --git a/.circleci/windows-env.ps1 b/.circleci/windows-env.ps1
new file mode 100644
index 000000000000..1c4fff24e433
--- /dev/null
+++ b/.circleci/windows-env.ps1
@@ -0,0 +1,9 @@
+# Install nodejs and yarn via Chocolatey.
+choco install nodejs --version 12.1.0 --no-progress
+choco install yarn --version 1.16.0 --no-progress
+
+# Add PATH modifications to the Powershell profile. This is the win equivalent of .bash_profile.
+# https://docs.microsoft.com/en-us/previous-versions//bb613488(v=vs.85)
+new-item -path $profile -itemtype file -force
+# Paths for nodejs, npm, and yarn. Use single quotes to prevent interpolation.
+Add-Content $profile '$Env:path += ";C:\Program Files\nodejs\;C:\Users\circleci\AppData\Roaming\npm\;C:\Program Files (x86)\Yarn\bin\;"'
diff --git a/lib/bootstrap-local.js b/lib/bootstrap-local.js
index 0a18be4ee19b..fd85505c0bef 100644
--- a/lib/bootstrap-local.js
+++ b/lib/bootstrap-local.js
@@ -87,12 +87,12 @@ const oldRequireTs = require.extensions['.ts'];
 require.extensions['.ts'] = function (m, filename) {
   // If we're in node module, either call the old hook or simply compile the
   // file without transpilation. We do not touch node_modules/**.
-  // We do touch `Angular DevK` files anywhere though.
-  if (!filename.match(/@angular\/cli\b/) && filename.match(/node_modules/)) {
+  // To account for Yarn workspaces symlinks, we much check the real path.
+  if (fs.realpathSync(filename).match(/node_modules/)) {
     if (oldRequireTs) {
       return oldRequireTs(m, filename);
     }
-    return m._compile(fs.readFileSync(filename), filename);
+    return m._compile(fs.readFileSync(filename).toString(), filename);
   }
 
   debugBuildTs(filename);
diff --git a/package.json b/package.json
index 4779f2f69474..751520b3b9f9 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "url": "https://github.com/angular/angular-cli.git"
   },
   "engines": {
-    "node": ">=10.9.0 <11.0.0",
+    "node": ">=10.9.0 <13.0.0",
     "yarn": ">=1.9.0 <2.0.0"
   },
   "author": "Angular Authors",
diff --git a/packages/schematics/angular/universal/index_spec.ts b/packages/schematics/angular/universal/index_spec.ts
index 1cc9b90c0154..ec9f7a77cb29 100644
--- a/packages/schematics/angular/universal/index_spec.ts
+++ b/packages/schematics/angular/universal/index_spec.ts
@@ -164,7 +164,7 @@ describe('Universal Schematic', () => {
     const filePath = '/projects/bar/src/main.ts';
     const contents = tree.readContent(filePath);
     expect(contents)
-      .toMatch(/document.addEventListener\('DOMContentLoaded', \(\) => {[\w\W]+;[\r\n]}\);/);
+      .toMatch(/document.addEventListener\('DOMContentLoaded', \(\) => {/);
   });
 
   it('should wrap the bootstrap declaration in a DOMContentLoaded event handler', async () => {
diff --git a/tests/legacy-cli/e2e/tests/generate/directive/directive-prefix.ts b/tests/legacy-cli/e2e/tests/generate/directive/directive-prefix.ts
index 127b88b18868..7667915c7af3 100644
--- a/tests/legacy-cli/e2e/tests/generate/directive/directive-prefix.ts
+++ b/tests/legacy-cli/e2e/tests/generate/directive/directive-prefix.ts
@@ -1,7 +1,7 @@
 import {join} from 'path';
 import {ng} from '../../../utils/process';
 import {expectFileToMatch} from '../../../utils/fs';
-import { updateJsonFile } from '../../../utils/project';
+import { updateJsonFile, useCIChrome, useCIDefaults } from '../../../utils/project';
 
 
 export default function() {
@@ -17,6 +17,8 @@ export default function() {
     .then(() => expectFileToMatch(join(directiveDir, 'test2-directive.directive.ts'),
       /selector: '\[preW/))
     .then(() => ng('generate', 'application', 'app-two', '--skip-install'))
+    .then(() => useCIDefaults('app-two'))
+    .then(() => useCIChrome('./projects/app-two'))
     .then(() => updateJsonFile('angular.json', configJson => {
       configJson.projects['test-project'].schematics = {
         '@schematics/angular:directive': { prefix: 'preP' }
diff --git a/tests/legacy-cli/e2e/tests/misc/title.ts b/tests/legacy-cli/e2e/tests/misc/title.ts
index 1e5cc5f763a6..748bc6297d49 100644
--- a/tests/legacy-cli/e2e/tests/misc/title.ts
+++ b/tests/legacy-cli/e2e/tests/misc/title.ts
@@ -2,6 +2,12 @@ import { execAndWaitForOutputToMatch, execWithEnv, killAllProcesses } from '../.
 
 
 export default async function() {
+  if (process.platform.startsWith('win')) {
+    // "On Windows, process.title affects the console title, but not the name of the process in the task manager."
+    // https://stackoverflow.com/questions/44756196/how-to-change-the-node-js-process-name-on-windows-10#comment96259375_44756196
+    return Promise.resolve();
+  }
+
   try {
     await execAndWaitForOutputToMatch('ng', ['build', '--watch'], /./);
 

From 05471cc65f5358719453aefffe43f01c7ec68363 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 6 Jun 2019 13:18:38 +0100
Subject: [PATCH 1436/1703] ci: use node-12 as default

---
 .circleci/config.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8af69dc07f08..b09aac89d860 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,10 +13,10 @@
 # If you change the cache key prefix, also sync the restore_cache fallback to match.
 # Keep the static part of the cache key as prefix to enable correct fallbacks.
 # See https://circleci.com/docs/2.0/caching/#restoring-cache for how prefixes work in CircleCI.
-var_1: &default_docker_image circleci/node:10.12
-var_2: &browsers_docker_image circleci/node:10.12-browsers
-var_3: &browsers_docker_image_node_12 circleci/node:12.1-browsers
-var_4: &cache_key angular_devkit-0.10.0-{{ checksum "yarn.lock" }}
+var_1: &default_docker_image circleci/node:12.1
+var_2: &browsers_docker_image circleci/node:12.1-browsers
+var_3: &browsers_docker_image_node_10 circleci/node:10.12-browsers
+var_4: &cache_key angular_devkit-0.11.0-{{ checksum "yarn.lock" }}
 
 # Settings common to each job
 anchor_1: &defaults
@@ -57,7 +57,7 @@ anchor_3: &restore_cache
     keys:
       - *cache_key
       # This fallback should be the cache_key without variables.
-      - angular_devkit-0.7.0-
+      - angular_devkit-0.11.0-
 anchor_4: &attach_options
   at: .
 anchor_5: &env_win
@@ -136,10 +136,10 @@ jobs:
           path: /tmp/dist
           destination: cli/new-production
 
-  e2e-cli-node-12:
+  e2e-cli-node-10:
     <<: *defaults
     docker:
-      - image: *browsers_docker_image_node_12
+      - image: *browsers_docker_image_node_10
     environment:
       BASH_ENV: ~/.profile
       NPM_CONFIG_PREFIX: ~/.npm-global
@@ -291,7 +291,7 @@ workflows:
       - e2e-cli:
           requires:
             - build
-      - e2e-cli-node-12:
+      - e2e-cli-node-10:
           requires:
             - build
       - e2e-cli-ivy:

From 2d338a0126ab0adaafc83636ef65572342398d42 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 6 Jun 2019 11:06:11 +0100
Subject: [PATCH 1437/1703] ci: only run node 10 and ng snapshots on master

---
 .circleci/config.yml | 50 +++++++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b09aac89d860..660b61d03846 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -65,7 +65,12 @@ anchor_5: &env_win
     # Need to install node and yarn before, as the base windows image doesn't have anything.
     # TODO: remove when CircleCI provides preconfigured node images/VMs.
     name: Setup windows node environment
-    command: ./.circleci/windows-env.ps1 
+    command: ./.circleci/windows-env.ps1
+anchor_6: &ignore_pull_requests
+  filters:  
+    branches:
+      ignore:
+        - /pull\/.*/
 
 # Job definitions
 version: 2.1
@@ -172,13 +177,6 @@ jobs:
     resource_class: xlarge
     parallelism: 4
     steps:
-      - run:
-          name: Don't run expensive e2e tests for forks other than renovate-bot and angular
-          command: >
-            if [[ "$CIRCLE_PR_USERNAME" != "renovate-bot" ]] &&
-               [[ "$CIRCLE_PROJECT_USERNAME" != "angular" || $CIRCLE_BRANCH != "master" ]]; then
-              circleci step halt
-            fi
       - attach_workspace: *attach_options
       - run: PATH=~/.npm-global/bin:$PATH xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} --ng-snapshots
 
@@ -285,47 +283,43 @@ workflows:
       - test:
           requires:
             - build
+      - test-win:
+          requires:
+            - test
       - test-large:
           requires:
             - build
       - e2e-cli:
           requires:
             - build
-      - e2e-cli-node-10:
-          requires:
-            - build
       - e2e-cli-ivy:
           requires:
             - build
-      - snapshot_publish_docs:
-          requires:
-          - install
-          filters:
-            branches:
-              only:
-              - /docs-preview/
       - e2e-cli-ng-snapshots:
+          <<: *ignore_pull_requests
           requires:
-            - build
-      - test-win:
+            - e2e-cli
+      - e2e-cli-node-10:
+          <<: *ignore_pull_requests
           requires:
-            - test     
+            - e2e-cli
       - e2e-cli-win:
+          <<: *ignore_pull_requests
+          requires:
+            - e2e-cli
+      - snapshot_publish_docs:
           requires:
-            - e2e-cli      
+          - install
           filters:
             branches:
-              ignore:
-                - /pull\/.*/
+              only:
+              - /docs-preview/
       - snapshot_publish:
+          <<: *ignore_pull_requests
           requires:
             - test
             - build
             - e2e-cli
-          filters:
-            branches:
-              ignore:
-                - /pull\/.*/
       - publish:
           requires:
             - test

From 819892a359d4fc5839b0fee90977164ff333bbd6 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 6 Jun 2019 11:34:08 +0100
Subject: [PATCH 1438/1703] ci: remove appveyor and buildkite

---
 .appveyor.yml                                 | 34 -------------------
 .buildkite/pipeline.yml                       | 32 -----------------
 .github/angular-robot.yml                     |  2 +-
 appveyor-e2e.bat                              | 12 -------
 .../test/karma/works_spec_large.ts            |  9 +----
 .../core/src/json/schema/registry_spec.ts     |  8 -----
 scripts/test.ts                               | 12 -------
 tests/legacy-cli/e2e_runner.ts                |  1 -
 8 files changed, 2 insertions(+), 108 deletions(-)
 delete mode 100644 .appveyor.yml
 delete mode 100644 .buildkite/pipeline.yml
 delete mode 100644 appveyor-e2e.bat

diff --git a/.appveyor.yml b/.appveyor.yml
deleted file mode 100644
index c30e66cbb674..000000000000
--- a/.appveyor.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-environment:
-  nodejs_version: "10.9.0" # Same version as used in CircleCI.
-
-matrix:
-  fast_finish: true
-
-skip_tags: true
-skip_branch_with_pr: true
-
-install:
-  - ps: Install-Product node $env:nodejs_version
-  - ps: |
-      if (Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER) {
-        # user is required for rebase.
-        git config user.name "angular-ci"
-        git config user.email "angular-ci"
-        # Rebase on target branch.
-        node tools\rebase-pr.js angular/angular-cli $env:APPVEYOR_PULL_REQUEST_NUMBER }
-  # --network-timeout is a workaround for https://github.com/yarnpkg/yarn/issues/6221
-  - yarn --frozen-lockfile --network-timeout=500000
-  - yarn webdriver-update
-
-test_script:
-  - node --version
-  - yarn --version
-  - yarn test -- --full
-  - appveyor-e2e.bat
-
-build: off
-deploy: off
-
-cache:
-  - node_modules -> yarn.lock
-  - "%LOCALAPPDATA%\\Yarn"
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
deleted file mode 100644
index d64c71597ddb..000000000000
--- a/.buildkite/pipeline.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-steps:
-  - label: windows-test
-    commands:
-      # Yarn workspaces creates directory junctions inside node_modules, but these fail in docker.
-      # E.g. inside the container, `mklink /J "C:\src\_" "C:\src\packages\_"` will fail with 
-      # `Access is denied.`
-      # https://github.com/moby/moby/issues/37024
-      # As a workaround, we copy all files in the shared volume and run the commands in the new dir.
-      - xcopy C:\workdir C:\workdir-copy /E /H /K /S /Q /I
-      - cd C:\workdir-copy
-      # Actual CI commands
-      # --network-timeout is a workaround for https://github.com/yarnpkg/yarn/issues/6221
-      - yarn install --frozen-lockfile --non-interactive --network-timeout 500000
-      - yarn webdriver-update
-      - node --version
-      - yarn --version
-      - yarn test
-      # Move this file into the .buildkite folder if Appveyor is removed.
-      - appveyor-e2e.bat
-      # - bazel test ...
-    plugins:
-      - docker#v2.1.0:
-          image: "filipesilva/node-bazel-windows:0.0.2"
-    # Times out in 2h
-    timeout_in_minutes: 120
-    # Automatically retries up to 2 times.
-    retry:
-      automatic:
-        exit_status: "*"
-        limit: 2    
-    agents:
-      windows: true
diff --git a/.github/angular-robot.yml b/.github/angular-robot.yml
index 3cf5b4b9eea3..c00e502cba2b 100644
--- a/.github/angular-robot.yml
+++ b/.github/angular-robot.yml
@@ -41,13 +41,13 @@ merge:
 
     # list of PR statuses that need to be successful
     requiredStatuses:
-      - "continuous-integration/appveyor/pr"
       - "ci/circleci: build"
       - "ci/circleci: build-bazel"
       - "ci/circleci: install"
       - "ci/circleci: lint"
       - "ci/circleci: validate"
       - "ci/circleci: test"
+      - "ci/circleci: test-win"
       - "ci/circleci: test-large"
 
   # the comment that will be added when the merge label is added despite failing checks, leave empty or set to false to disable
diff --git a/appveyor-e2e.bat b/appveyor-e2e.bat
deleted file mode 100644
index f8dc735269d8..000000000000
--- a/appveyor-e2e.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-@ECHO OFF
-IF not defined APPVEYOR_PULL_REQUEST_NUMBER (
-  IF not defined BUILDKITE_PULL_REQUEST (
-    REM Run full test suite if not on a Appveyor/Buildkite PR.
-    node tests\legacy-cli\run_e2e.js --appveyor "--glob=tests/{basic,commands,generate,ivy}/**"
-    exit
-  )
-) 
-
-REM Run partial test suite.
-node tests\legacy-cli\run_e2e.js --appveyor "--glob=tests/{basic,ivy}/**"
-
diff --git a/packages/angular_devkit/build_angular/test/karma/works_spec_large.ts b/packages/angular_devkit/build_angular/test/karma/works_spec_large.ts
index 131ee7a9ae71..26683a0adf92 100644
--- a/packages/angular_devkit/build_angular/test/karma/works_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/karma/works_spec_large.ts
@@ -8,11 +8,6 @@
 import { Architect } from '@angular-devkit/architect';
 import { createArchitect, host, karmaTargetSpec } from '../utils';
 
-// TODO: replace this with an "it()" macro that's reusable globally.
-let linuxOnlyIt: typeof it = it;
-if (process.platform.startsWith('win')) {
-  linuxOnlyIt = xit;
-}
 
 // tslint:disable-next-line:no-big-function
 describe('Karma Builder', () => {
@@ -33,9 +28,7 @@ describe('Karma Builder', () => {
     await run.stop();
   });
 
-  // This test seems to succeed on appveyor but not terminate Karma, leaving the port used
-  // and killing Chrome after 60s. This causes other tests that use Chrome to fail.
-  linuxOnlyIt('fails with broken compilation', async () => {
+  it('fails with broken compilation', async () => {
     host.writeMultipleFiles({
       'src/app/app.component.spec.ts': '<p> definitely not typescript </p>',
     });
diff --git a/packages/angular_devkit/core/src/json/schema/registry_spec.ts b/packages/angular_devkit/core/src/json/schema/registry_spec.ts
index 337e82e719df..1d9bf89c8d3f 100644
--- a/packages/angular_devkit/core/src/json/schema/registry_spec.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry_spec.ts
@@ -14,14 +14,6 @@ import { addUndefinedDefaults } from './transforms';
 
 describe('CoreSchemaRegistry', () => {
   it('works asynchronously', done => {
-    if (process.platform.startsWith('win')) {
-      // This test consistently fails on Windows BuildKite, but doesn't fail on local Windows
-      // or in Appveyor. Many tests test the async behaviour of the registry, but this is the only
-      // one that also fetches an async ref. Perhaps that is why.
-      done();
-
-      return;
-    }
     const registry = new CoreSchemaRegistry();
     registry.addPostTransform(addUndefinedDefaults);
     const data: any = {};  // tslint:disable-line:no-any
diff --git a/scripts/test.ts b/scripts/test.ts
index 87d0f9cb4189..13df4f0db3a4 100644
--- a/scripts/test.ts
+++ b/scripts/test.ts
@@ -158,18 +158,6 @@ if (process.argv.indexOf('--spec-reporter') != -1) {
 // Manually set exit code (needed with custom reporters)
 runner.onComplete((success: boolean) => {
   process.exitCode = success ? 0 : 1;
-  if (process.platform.startsWith('win')) {
-    // TODO(filipesilva): finish figuring out why this happens.
-    // We should not need to force exit here, but when:
-    // - on windows
-    // - running webpack-dev-server
-    // - with ngtools/webpack on the compilation
-    // Something seems to hang and the process never exists.
-    // This does not happen on linux, nor with webpack on watch mode.
-    // Until this is figured out, we need to exit the process manually after tests finish
-    // otherwise appveyor will hang until it timeouts.
-    process.exit();
-  }
 });
 
 
diff --git a/tests/legacy-cli/e2e_runner.ts b/tests/legacy-cli/e2e_runner.ts
index cf2f3904455d..b4ad05e5d46a 100644
--- a/tests/legacy-cli/e2e_runner.ts
+++ b/tests/legacy-cli/e2e_runner.ts
@@ -44,7 +44,6 @@ Error.stackTraceLimit = Infinity;
  */
 const argv = minimist(process.argv.slice(2), {
   'boolean': [
-    'appveyor',
     'debug',
     'ng-snapshots',
     'noglobal',

From cb6e12de02e3d9345c30cf8abd8ad1e89793c012 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 6 Jun 2019 11:36:06 +0100
Subject: [PATCH 1439/1703] ci: use `yarn` instead of `npm run`

---
 .circleci/config.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 660b61d03846..e15710a23485 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -95,7 +95,7 @@ jobs:
     <<: *defaults
     steps:
       - attach_workspace: *attach_options
-      - run: npm run lint
+      - run: yarn lint
       - run: 'yarn bazel:format -mode=check ||
               (echo "BUILD files not formatted. Please run ''yarn bazel:format''" ; exit 1)'
       # Run the skylark linter to check our Bazel rules
@@ -106,13 +106,13 @@ jobs:
     <<: *defaults
     steps:
       - attach_workspace: *attach_options
-      - run: npm run validate -- --ci
+      - run: yarn validate -- --ci
 
   test:
     <<: *defaults
     steps:
       - attach_workspace: *attach_options
-      - run: npm run test -- --full
+      - run: yarn test -- --full
 
   test-large:
     <<: *defaults
@@ -122,8 +122,8 @@ jobs:
     parallelism: 4
     steps:
       - attach_workspace: *attach_options
-      - run: npm run webdriver-update
-      - run: npm run test-large -- --full --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
+      - run: yarn webdriver-update
+      - run: yarn test-large -- --full --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
 
   e2e-cli:
     <<: *defaults
@@ -184,7 +184,7 @@ jobs:
     <<: *defaults
     steps:
       - attach_workspace: *attach_options
-      - run: npm run admin -- build
+      - run: yarn admin -- build
 
   build-bazel:
     <<: *defaults
@@ -205,7 +205,7 @@ jobs:
       - run:
           name: Deployment to Snapshot
           command: |
-            npm run admin -- snapshots --verbose --githubTokenFile=${HOME}/github_token
+            yarn admin -- snapshots --verbose --githubTokenFile=${HOME}/github_token
 
   publish:
     <<: *defaults
@@ -218,7 +218,7 @@ jobs:
       - run:
           name: Deployment to NPM
           command: |
-            npm run admin -- publish --verbose
+            yarn admin -- publish --verbose
 
   # Windows jobs
   # CircleCI support for Windows jobs is still in preview.
@@ -240,8 +240,8 @@ jobs:
       - run: yarn install --frozen-lockfile
       # Build and test should be on their own jobs, but restoring workspaces is too slow
       # so we do it here.
-      - run: npm run admin -- build  
-      - run: npm run test -- --full        
+      - run: yarn admin -- build  
+      - run: yarn test -- --full        
       # Run partial e2e suite on PRs only. Master will run the full e2e suite with sharding.
       - run: if (Test-Path env:CIRCLE_PR_NUMBER) { node tests\legacy-cli\run_e2e.js "--glob=tests/{basic,ivy}/**" }            
              
@@ -256,7 +256,7 @@ jobs:
       - run: node --version
       - run: yarn --version
       - run: yarn install --frozen-lockfile
-      - run: npm run admin -- build  
+      - run: yarn admin -- build  
       - run: node tests\legacy-cli\run_e2e.js --nb-shards=$env:CIRCLE_NODE_TOTAL --shard=$env:CIRCLE_NODE_INDEX             
 
 workflows:

From 996c48548d4a925b0797e62fe0fc32191e3f101a Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 6 Jun 2019 13:21:38 +0100
Subject: [PATCH 1440/1703] ci: remove missing job

---
 .circleci/config.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e15710a23485..201a49201d49 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -307,13 +307,6 @@ workflows:
           <<: *ignore_pull_requests
           requires:
             - e2e-cli
-      - snapshot_publish_docs:
-          requires:
-          - install
-          filters:
-            branches:
-              only:
-              - /docs-preview/
       - snapshot_publish:
           <<: *ignore_pull_requests
           requires:

From 6e4c22a5ec1d0f8854c83b596e45070c35f12174 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 6 Jun 2019 14:10:01 +0100
Subject: [PATCH 1441/1703] test: move update e2e to own folder

They take a while and significantly slow down the Windows basic e2e.
---
 tests/legacy-cli/e2e/tests/{basic => update}/update-1.0.ts        | 0
 .../legacy-cli/e2e/tests/{basic => update}/update-1.7-longhand.ts | 0
 tests/legacy-cli/e2e/tests/{basic => update}/update-1.7.ts        | 0
 tests/legacy-cli/e2e/tests/{basic => update}/update-7.0.ts        | 0
 tests/legacy-cli/e2e/tests/{basic => update}/update.ts            | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/legacy-cli/e2e/tests/{basic => update}/update-1.0.ts (100%)
 rename tests/legacy-cli/e2e/tests/{basic => update}/update-1.7-longhand.ts (100%)
 rename tests/legacy-cli/e2e/tests/{basic => update}/update-1.7.ts (100%)
 rename tests/legacy-cli/e2e/tests/{basic => update}/update-7.0.ts (100%)
 rename tests/legacy-cli/e2e/tests/{basic => update}/update.ts (100%)

diff --git a/tests/legacy-cli/e2e/tests/basic/update-1.0.ts b/tests/legacy-cli/e2e/tests/update/update-1.0.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/basic/update-1.0.ts
rename to tests/legacy-cli/e2e/tests/update/update-1.0.ts
diff --git a/tests/legacy-cli/e2e/tests/basic/update-1.7-longhand.ts b/tests/legacy-cli/e2e/tests/update/update-1.7-longhand.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/basic/update-1.7-longhand.ts
rename to tests/legacy-cli/e2e/tests/update/update-1.7-longhand.ts
diff --git a/tests/legacy-cli/e2e/tests/basic/update-1.7.ts b/tests/legacy-cli/e2e/tests/update/update-1.7.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/basic/update-1.7.ts
rename to tests/legacy-cli/e2e/tests/update/update-1.7.ts
diff --git a/tests/legacy-cli/e2e/tests/basic/update-7.0.ts b/tests/legacy-cli/e2e/tests/update/update-7.0.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/basic/update-7.0.ts
rename to tests/legacy-cli/e2e/tests/update/update-7.0.ts
diff --git a/tests/legacy-cli/e2e/tests/basic/update.ts b/tests/legacy-cli/e2e/tests/update/update.ts
similarity index 100%
rename from tests/legacy-cli/e2e/tests/basic/update.ts
rename to tests/legacy-cli/e2e/tests/update/update.ts

From 5f6f6d345c7e925c30c33fa540624e2336afc5b0 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 6 Jun 2019 14:11:31 +0100
Subject: [PATCH 1442/1703] test: remove disabled test

This test has been disabled for a while and is in test-large instead.
---
 tests/legacy-cli/e2e/tests/basic/assets.ts | 194 ---------------------
 1 file changed, 194 deletions(-)
 delete mode 100644 tests/legacy-cli/e2e/tests/basic/assets.ts

diff --git a/tests/legacy-cli/e2e/tests/basic/assets.ts b/tests/legacy-cli/e2e/tests/basic/assets.ts
deleted file mode 100644
index 1d20c8bb3873..000000000000
--- a/tests/legacy-cli/e2e/tests/basic/assets.ts
+++ /dev/null
@@ -1,194 +0,0 @@
-// import * as path from 'path';
-import {
-  writeMultipleFiles,
-  createDir,
-  expectFileToMatch,
-  expectFileToExist
-} from '../../utils/fs';
-import { ng } from '../../utils/process';
-import { updateJsonFile } from '../../utils/project';
-import { expectToFail } from '../../utils/utils';
-
-
-// const temp = require('temp');
-// const tempDir = path.join(temp.mkdirSync('angular-cli-e2e-assets-'), 'out');
-
-// tslint:disable:max-line-length
-export default function () {
-  // Disable parts of it in webpack tests.
-
-  // TODO: update test
-  return;
-
-  return Promise.resolve()
-    .then(_ => createDir('./src/folder'))
-    .then(_ => createDir('./node_modules/some-package/'))
-    // Write assets.
-    .then(_ => writeMultipleFiles({
-      './src/folder/.gitkeep': '',
-      './src/folder/folder-asset.txt': 'folder-asset.txt',
-      './src/glob-asset.txt': 'glob-asset.txt',
-      './src/output-asset.txt': 'output-asset.txt',
-      './node_modules/some-package/node_modules-asset.txt': 'node_modules-asset.txt',
-    }))
-    // TODO(architect): Review allowOutsideOutDir logic inside build-angular.
-    // // Add invalid asset config in angular.json.
-    // .then(() => updateJsonFile('angular.json', configJson => {
-    //   const app = configJson['apps'][0];
-    //   app['assets'] = [
-    //     { 'glob': '**/*', 'input': '../node_modules/some-package/', 'output': '../temp' }
-    //   ];
-    // }))
-    // .then(() => expectToFail(() => ng('build')))
-
-    // // Set an exception for the invalid asset config in angular.json.
-    // .then(() => updateJsonFile('angular.json', configJson => {
-    //   const app = configJson['apps'][0];
-    //   app['assets'] = [
-    //     { 'glob': '**/*', 'input': '../node_modules/some-package/', 'output': '../temp',
-    //       'allowOutsideOutDir': true }
-    //   ];
-    // }))
-    // .then(() => ng('build'))
-
-    // // This asset should fail even with the exception above.
-    // .then(() => updateJsonFile('angular.json', configJson => {
-    //   const app = configJson['apps'][0];
-    //   app['assets'] = [
-    //     { 'glob': '**/*', 'input': '../node_modules/some-package/', 'output': '../../temp',
-    //       'allowOutsideOutDir': true }
-    //   ];
-    // }))
-    // .then(() => expectToFail(() => ng('build')))
-
-    // // This asset will not fail with the exception above.
-    // .then(() => updateJsonFile('angular.json', configJson => {
-    //   const app = configJson['apps'][0];
-    //   app['outDir'] = tempDir;
-    //   app['assets'] = [
-    //     { 'glob': '**/*', 'input': '../node_modules/some-package/', 'output': tempDir,
-    //       'allowOutsideOutDir': true }
-    //   ];
-    // }))
-    // .then(() => ng('build'))
-    // .then(() => updateJsonFile('angular.json', configJson => {
-    //   const app = configJson['apps'][0];
-    //   app['outDir'] = 'dist';
-    // })
-
-    // // This asset should also fail from reading from outside the project.
-    // .then(() => updateJsonFile('angular.json', configJson => {
-    //   const app = configJson['apps'][0];
-    //   app['assets'] = [
-    //     { 'glob': '**/*', 'input': '/temp-folder/outside/of/project', 'output': 'temp' }
-    //   ];
-    // }))
-    // .then(() => expectToFail(() => ng('build')))
-
-    // Add asset config in angular.json.
-    .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const assets = [
-        { 'glob': '**/*', 'input': 'src/folder', 'output': 'folder' },
-        { 'glob': 'glob-asset.txt' },
-        { 'glob': 'output-asset.txt', 'output': 'output-folder' },
-        { 'glob': '**/*', 'input': 'node_modules/some-package/', 'output': 'package-folder' },
-      ];
-      const appArchitect = workspaceJson.projects['test-project'].architect;
-      appArchitect.build.options.assets = assets;
-      appArchitect.test.options.assets = assets;
-    }))
-    // Test files are present on build output.
-    .then(() => ng('build'))
-    .then(() => expectFileToMatch('./dist/test-project/folder/folder-asset.txt', 'folder-asset.txt'))
-
-    .then(() => expectFileToMatch('./dist/test-project/glob-asset.txt', 'glob-asset.txt'))
-    .then(() => expectFileToMatch('./dist/test-project/output-folder/output-asset.txt', 'output-asset.txt'))
-    .then(() => expectFileToMatch('./dist/test-project/package-folder/node_modules-asset.txt',
-      'node_modules-asset.txt'))
-    // .gitkeep shouldn't be copied.
-    .then(() => expectToFail(() => expectFileToExist('dist/assets/.gitkeep')))
-    // Update app to test assets are present.
-    .then(_ => writeMultipleFiles({
-      'src/app/app.module.ts': `
-        import { BrowserModule } from '@angular/platform-browser';
-        import { NgModule } from '@angular/core';
-        import { FormsModule } from '@angular/forms';
-        import { HttpModule } from '@angular/http';
-        import { AppComponent } from './app.component';
-
-        @NgModule({
-          declarations: [
-            AppComponent
-          ],
-          imports: [
-            BrowserModule,
-            FormsModule,
-            HttpModule
-          ],
-          providers: [],
-          bootstrap: [AppComponent]
-        })
-        export class AppModule { }
-      `,
-      'src/app/app.component.ts': `
-        import { Component } from '@angular/core';
-        import { Http, Response } from '@angular/http';
-
-        @Component({
-          selector: 'app-root',
-          template: '<p *ngFor="let asset of assets">{{asset.content }}</p>'
-        })
-        export class AppComponent {
-          public assets = [
-            { path: './folder/folder-asset.txt', content: '' },
-            { path: './glob-asset.txt', content: '' },
-            { path: './output-folder/output-asset.txt', content: '' },
-            { path: './package-folder/node_modules-asset.txt', content: '' },
-          ];
-          constructor(private http: Http) {
-            this.assets.forEach(asset => http.get(asset.path)
-              .subscribe(res => asset.content = res['_body']));
-          }
-        }`,
-      'src/app/app.component.spec.ts': `
-        import { TestBed, async } from '@angular/core/testing';
-        import { HttpModule } from '@angular/http';
-        import { AppComponent } from './app.component';
-
-        describe('AppComponent', () => {
-          beforeEach(async(() => {
-            TestBed.configureTestingModule({
-              imports: [
-                HttpModule
-              ],
-              declarations: [
-                AppComponent
-              ]
-            }).compileComponents();
-          }));
-
-          it('should create the app', async(() => {
-            const fixture = TestBed.createComponent(AppComponent);
-            const app = fixture.debugElement.componentInstance;
-            expect(app).toBeTruthy();
-          }));
-        });`,
-      'e2e/app.e2e-spec.ts': `
-        import { browser, element, by } from 'protractor';
-
-        describe('master-project App', function () {
-          it('should display asset contents', () => {
-            browser.get('/');
-            element.all(by.css('app-root p')).then(function (assets) {
-              expect(assets.length).toBe(4);
-              expect(assets[0].getText()).toBe('folder-asset.txt');
-              expect(assets[1].getText()).toBe('glob-asset.txt');
-              expect(assets[2].getText()).toBe('output-asset.txt');
-              expect(assets[3].getText()).toBe('node_modules-asset.txt');
-            });
-          });
-        });`,
-    }))
-    .then(() => ng('test', '--watch=false'))
-    .then(() => ng('e2e', 'test-project-e2e'));
-}

From e70b0e41bc13512c9cf56846ba0e39a8fab64e61 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 6 Jun 2019 14:11:53 +0100
Subject: [PATCH 1443/1703] test: re-enable rebuild test on windows

---
 tests/legacy-cli/e2e/tests/basic/rebuild.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/basic/rebuild.ts b/tests/legacy-cli/e2e/tests/basic/rebuild.ts
index 36e03266016c..82991e9ed890 100644
--- a/tests/legacy-cli/e2e/tests/basic/rebuild.ts
+++ b/tests/legacy-cli/e2e/tests/basic/rebuild.ts
@@ -11,10 +11,6 @@ import {request} from '../../utils/http';
 const validBundleRegEx = /: Compiled successfully./;
 
 export default function() {
-  if (process.platform.startsWith('win')) {
-    return Promise.resolve();
-  }
-
   return execAndWaitForOutputToMatch('ng', ['serve'], validBundleRegEx)
     // Add a lazy module.
     .then(() => ng('generate', 'module', 'lazy', '--routing'))

From c6fb34a09253d8b4debdeb3467dc1424a080608c Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 7 Jun 2019 00:04:36 +0200
Subject: [PATCH 1444/1703] fix(@schematics/angular): enable tsc
 `downlevelIteration`

We by default now use ES2015. Users can use ES2015 iterations however the ES5 build will fail.

Fixes #14697
---
 .../update-8/differential-loading.ts          |  9 ++++++++
 .../update-8/differential-loading_spec.ts     | 23 +++++++++++++++++++
 .../workspace/files/tsconfig.json.template    |  3 ++-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/angular/migrations/update-8/differential-loading.ts b/packages/schematics/angular/migrations/update-8/differential-loading.ts
index 41408e6b18a3..dd943583aced 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading.ts
@@ -131,7 +131,16 @@ function updateTsConfig(tree: Tree, tsConfigPath: string): void {
   if (isExtendedConfig) {
     removePropertyInAstObject(recorder, compilerOptions, 'target');
     removePropertyInAstObject(recorder, compilerOptions, 'module');
+    removePropertyInAstObject(recorder, compilerOptions, 'downlevelIteration');
   } else {
+    const downlevelIteration = findPropertyInAstObject(compilerOptions, 'downlevelIteration');
+    if (!downlevelIteration) {
+      insertPropertyInAstObjectInOrder(recorder, compilerOptions, 'downlevelIteration', true, 4);
+    } else if (!downlevelIteration.value) {
+      const { start, end } = downlevelIteration;
+      recorder.remove(start.offset, end.offset - start.offset);
+      recorder.insertLeft(start.offset, 'true');
+    }
     const scriptTarget = findPropertyInAstObject(compilerOptions, 'target');
     if (!scriptTarget) {
       insertPropertyInAstObjectInOrder(recorder, compilerOptions, 'target', 'es2015', 4);
diff --git a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
index c546af8d346d..57fc7cd2f9df 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
@@ -80,6 +80,29 @@ describe('Migration to version 8', () => {
       expect(module).toBe('esnext');
     });
 
+    it(`should create 'downlevelIteration' property when doesn't exists`, () => {
+      const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
+      const compilerOptions = {
+        ...oldTsConfig.compilerOptions,
+      };
+
+      tree.overwrite(tsConfigPath, JSON.stringify({ compilerOptions }, null, 2));
+      const { downlevelIteration } = JSON.parse(tree2.readContent(tsConfigPath)).compilerOptions;
+      expect(downlevelIteration).toBe(true);
+    });
+
+    it(`should update 'downlevelIteration' to true when it's false`, () => {
+      const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
+      const compilerOptions = {
+        ...oldTsConfig.compilerOptions,
+        downlevelIteration: false,
+      };
+
+      tree.overwrite(tsConfigPath, JSON.stringify({ compilerOptions }, null, 2));
+      const { downlevelIteration } = JSON.parse(tree2.readContent(tsConfigPath)).compilerOptions;
+      expect(downlevelIteration).toBe(true);
+    });
+
     it(`should create browserslist file if it doesn't exist`, () => {
       tree.delete('/browserslist');
       const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
diff --git a/packages/schematics/angular/workspace/files/tsconfig.json.template b/packages/schematics/angular/workspace/files/tsconfig.json.template
index 1e35a04fa981..a4df54fff629 100644
--- a/packages/schematics/angular/workspace/files/tsconfig.json.template
+++ b/packages/schematics/angular/workspace/files/tsconfig.json.template
@@ -5,9 +5,10 @@
     "outDir": "./dist/out-tsc",
     "sourceMap": true,
     "declaration": false,
+    "downlevelIteration": true,
+    "experimentalDecorators": true,
     "module": "esnext",
     "moduleResolution": "node",
-    "experimentalDecorators": true,
     "importHelpers": true,
     "target": "es2015",
     "typeRoots": [

From 30345c34995e1d683f6b96395635ecaf749cfbb1 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 7 Jun 2019 17:09:59 +0000
Subject: [PATCH 1445/1703] build: update postcss to version 7.0.17

---
 .../angular_devkit/build_angular/package.json   |  2 +-
 yarn.lock                                       | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index b7a61358c849..b0ea96c4581a 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -32,7 +32,7 @@
     "minimatch": "3.0.4",
     "parse5": "4.0.0",
     "open": "6.3.0",
-    "postcss": "7.0.16",
+    "postcss": "7.0.17",
     "postcss-import": "12.0.1",
     "postcss-loader": "3.0.0",
     "raw-loader": "1.0.0",
diff --git a/yarn.lock b/yarn.lock
index af04e04f4eb9..574467e8d0d3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7462,10 +7462,10 @@ postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.1:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss@7.0.16, postcss@^7.0.16:
-  version "7.0.16"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.16.tgz#48f64f1b4b558cb8b52c88987724359acb010da2"
-  integrity sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==
+postcss@7.0.17:
+  version "7.0.17"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f"
+  integrity sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -7480,6 +7480,15 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
     source-map "^0.6.1"
     supports-color "^5.5.0"
 
+postcss@^7.0.16:
+  version "7.0.16"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.16.tgz#48f64f1b4b558cb8b52c88987724359acb010da2"
+  integrity sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"

From 0b6441fc35250aa17266ebe6bd7833d642d3e7bd Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 8 Jun 2019 05:23:04 +0000
Subject: [PATCH 1446/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 297633071ac3..9214327db6aa 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#e7ec74fd6fcc9c4b76ccae9216a2024d53866213",
-    "@angular/common": "github:angular/common-builds#004f3c99bc42f741c03e16a31eb92e6400651699",
-    "@angular/compiler": "github:angular/compiler-builds#c611936467612af339ec4e9c5c543daaf5d6736f",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#dfed7d095e31cf906fd50993a42e443e48d29735",
-    "@angular/core": "github:angular/core-builds#c16911476ec4ba6be8c8c84ad26e0ac291b25519",
-    "@angular/forms": "github:angular/forms-builds#11e3f5059c3ed69b40c9cdc46ae5a2084b203c8c",
-    "@angular/language-service": "github:angular/language-service-builds#dd25a1c434227c26f94b75d6019c13ee1635adcb",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#c4e3021a9fe77888a97fa0d4944ff8aba2f8622a",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#b8c6d3d756bc7fb5f037f1b6b0409299253b36b5",
-    "@angular/router": "github:angular/router-builds#8710ca55dcd996044fe4720cb906d7c007776a49"
+    "@angular/animations": "github:angular/animations-builds#e81d99aed4a8cd827d2a480f6bf07545278987fe",
+    "@angular/common": "github:angular/common-builds#9c0a44d3ef4616f4cff9de43e21603aca1806d4d",
+    "@angular/compiler": "github:angular/compiler-builds#a089a36f26abb71a9fe8a86a96658c1b93adcae8",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#8bc2255ca2824311a1be50bde4ce402a50c84ed5",
+    "@angular/core": "github:angular/core-builds#3390fbfe87bdbe3423814caf5f79d4c28b820de5",
+    "@angular/forms": "github:angular/forms-builds#549eab1d1acdcec41a1c833ce51410c0648952ac",
+    "@angular/language-service": "github:angular/language-service-builds#6021060be11be7e168155ff53b24fc09b7ac02de",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#fe5bbc69bee7b06988f2c17b7819801efa9531e5",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#6357f6008a0a961d90e6c437e7171e80fbb357d3",
+    "@angular/router": "github:angular/router-builds#d4078629e5720ed53338726260260da81d7bb859"
   }
 }
\ No newline at end of file

From eacacef8489837593466119196c8d14c86f4a645 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 8 Jun 2019 05:23:23 +0000
Subject: [PATCH 1447/1703] build: update browserslist to version 4.6.2

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 40 +++++++++++++++----
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index b0ea96c4581a..1803c7f40286 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -14,7 +14,7 @@
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.10.0",
     "autoprefixer": "9.6.0",
-    "browserslist": "4.6.1",
+    "browserslist": "4.6.2",
     "caniuse-api": "3.0.0",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
diff --git a/yarn.lock b/yarn.lock
index 574467e8d0d3..72b867017af8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1629,14 +1629,14 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@4.6.1, browserslist@^4.6.1:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.1.tgz#ee5059b1aec18cbec9d055d6cb5e24ae50343a9b"
-  integrity sha512-1MC18ooMPRG2UuVFJTHFIAkk6mpByJfxCrnUyvSlu/hyQSFHMrlhM02SzNuCV+quTP4CKmqtOMAIjrifrpBJXQ==
+browserslist@4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.2.tgz#574c665950915c2ac73a4594b8537a9eba26203f"
+  integrity sha512-2neU/V0giQy9h3XMPwLhEY3+Ao0uHSwHvU8Q1Ea6AgLVL1sXbX3dzPrJ8NWe5Hi4PoTkCYXOtVR9rfRLI0J/8Q==
   dependencies:
-    caniuse-lite "^1.0.30000971"
-    electron-to-chromium "^1.3.137"
-    node-releases "^1.1.21"
+    caniuse-lite "^1.0.30000974"
+    electron-to-chromium "^1.3.150"
+    node-releases "^1.1.23"
 
 browserslist@^4.0.0, browserslist@^4.3.3:
   version "4.5.5"
@@ -1647,6 +1647,15 @@ browserslist@^4.0.0, browserslist@^4.3.3:
     electron-to-chromium "^1.3.124"
     node-releases "^1.1.14"
 
+browserslist@^4.6.1:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.1.tgz#ee5059b1aec18cbec9d055d6cb5e24ae50343a9b"
+  integrity sha512-1MC18ooMPRG2UuVFJTHFIAkk6mpByJfxCrnUyvSlu/hyQSFHMrlhM02SzNuCV+quTP4CKmqtOMAIjrifrpBJXQ==
+  dependencies:
+    caniuse-lite "^1.0.30000971"
+    electron-to-chromium "^1.3.137"
+    node-releases "^1.1.21"
+
 browserstack@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.5.1.tgz#e2dfa66ffee940ebad0a07f7e00fd4687c455d66"
@@ -1892,6 +1901,11 @@ caniuse-lite@^1.0.30000971:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000971.tgz#d1000e4546486a6977756547352bc96a4cfd2b13"
   integrity sha512-TQFYFhRS0O5rdsmSbF1Wn+16latXYsQJat66f7S7lizXW1PVpWJeZw9wqqVLIjuxDRz7s7xRUj13QCfd8hKn6g==
 
+caniuse-lite@^1.0.30000974:
+  version "1.0.30000974"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000974.tgz#b7afe14ee004e97ce6dc73e3f878290a12928ad8"
+  integrity sha512-xc3rkNS/Zc3CmpMKuczWEdY2sZgx09BkAxfvkxlAEBTqcMHeL8QnPqhKse+5sRTi3nrw2pJwToD2WvKn1Uhvww==
+
 canonical-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
@@ -3194,6 +3208,11 @@ electron-to-chromium@^1.3.137:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.137.tgz#ba7c88024984c038a5c5c434529aabcea7b42944"
   integrity sha512-kGi32g42a8vS/WnYE7ELJyejRT7hbr3UeOOu0WeuYuQ29gCpg9Lrf6RdcTQVXSt/v0bjCfnlb/EWOOsiKpTmkw==
 
+electron-to-chromium@^1.3.150:
+  version "1.3.152"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.152.tgz#8f1c08e101d58fe2ef72655481bbf8c83f9450fa"
+  integrity sha512-Ah10cGMWIXYD8aUTH2Y7lGRhaOFQLyWuxvXmCPCZCbUIGJ4swnNmT6P4aA8RTgUmNw9kmcDL6SoU8TZC4YuZGg==
+
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
@@ -6606,6 +6625,13 @@ node-releases@^1.1.21:
   dependencies:
     semver "^5.3.0"
 
+node-releases@^1.1.23:
+  version "1.1.23"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.23.tgz#de7409f72de044a2fa59c097f436ba89c39997f0"
+  integrity sha512-uq1iL79YjfYC0WXoHbC/z28q/9pOl8kSHaXdWmAAc8No+bDwqkZbzIJz55g/MUsPgSGm9LZ7QSUbzTcH5tz47w==
+  dependencies:
+    semver "^5.3.0"
+
 node-sass-tilde-importer@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz#1a15105c153f648323b4347693fdb0f331bad1ce"

From 8792ecd8a0cc00608c2a3e65424b43037486b56d Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Fri, 7 Jun 2019 22:45:47 +0100
Subject: [PATCH 1448/1703] ci: use matching openssl key digest

---
 .circleci/config.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 201a49201d49..6b08b36cb158 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -200,8 +200,11 @@ jobs:
       - attach_workspace: *attach_options
       - run:
           name: Decrypt Credentials
+          # Note: when changing the image, you might have to re-encrypt the credentials with a 
+          # matching version of openssl.
+          # See https://stackoverflow.com/a/43847627/2116927 for more info.
           command: |
-            openssl aes-256-cbc -d -in .circleci/github_token -k "${KEY}" -out ~/github_token
+            openssl aes-256-cbc -d -in .circleci/github_token -k "${KEY}" -out ~/github_token -md md5
       - run:
           name: Deployment to Snapshot
           command: |

From 53d027837eaab45e5b4b80a631d9ca246a2d35b9 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 10 Jun 2019 20:20:30 +0200
Subject: [PATCH 1449/1703] fix(@angular-devkit/architect): error out when
 invalid configurations are provided

Fixes #14654
---
 .../architect/node/node-modules-architect-host.ts    |  7 +++++--
 packages/angular_devkit/architect/src/architect.ts   |  3 ++-
 packages/angular_devkit/architect/src/index_spec.ts  |  9 +++++++++
 .../e2e/tests/commands/unknown-configuration.ts      | 12 ++++++++++++
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 tests/legacy-cli/e2e/tests/commands/unknown-configuration.ts

diff --git a/packages/angular_devkit/architect/node/node-modules-architect-host.ts b/packages/angular_devkit/architect/node/node-modules-architect-host.ts
index c70d303f2dfc..f1cd327136e2 100644
--- a/packages/angular_devkit/architect/node/node-modules-architect-host.ts
+++ b/packages/angular_devkit/architect/node/node-modules-architect-host.ts
@@ -104,8 +104,11 @@ export class WorkspaceNodeModulesArchitectHost implements ArchitectHost<NodeModu
     if (targetSpec === undefined) {
       return null;
     }
-    if (target.configuration && !targetSpec['configurations']) {
-      throw new Error('Configuration not set in the workspace.');
+    if (
+      target.configuration
+      && !(targetSpec['configurations'] && targetSpec['configurations'][target.configuration])
+    ) {
+      throw new Error(`Configuration '${target.configuration}' is not set in the workspace.`);
     }
 
     return {
diff --git a/packages/angular_devkit/architect/src/architect.ts b/packages/angular_devkit/architect/src/architect.ts
index 941320afff3c..877b91e46a9a 100644
--- a/packages/angular_devkit/architect/src/architect.ts
+++ b/packages/angular_devkit/architect/src/architect.ts
@@ -361,7 +361,8 @@ export class Architect {
     options: json.JsonObject,
     scheduleOptions: ScheduleOptions = {},
   ): Promise<BuilderRun> {
-    if (!/^[^:]+:[^:]+$/.test(name)) {
+    // The below will match 'project:target:configuration'
+    if (!/^[^:]+:[^:]+(:[^:]+)?$/.test(name)) {
       throw new Error('Invalid builder name: ' + JSON.stringify(name));
     }
 
diff --git a/packages/angular_devkit/architect/src/index_spec.ts b/packages/angular_devkit/architect/src/index_spec.ts
index 24a44e487d49..cac45b39de5e 100644
--- a/packages/angular_devkit/architect/src/index_spec.ts
+++ b/packages/angular_devkit/architect/src/index_spec.ts
@@ -106,6 +106,15 @@ describe('architect', () => {
     await run.stop();
   });
 
+  it(`errors when target configuration doesn't exists`, async () => {
+    try {
+      await architect.scheduleBuilder('test:test:invalid', {});
+      throw new Error('should have thrown');
+    } catch (err) {
+      expect(err.message).toContain('Job name "test:test:invalid" does not exist.');
+    }
+  });
+
   it('errors when builder cannot be resolved', async () => {
     try {
       await architect.scheduleBuilder('non:existent', {});
diff --git a/tests/legacy-cli/e2e/tests/commands/unknown-configuration.ts b/tests/legacy-cli/e2e/tests/commands/unknown-configuration.ts
new file mode 100644
index 000000000000..98257ee86e70
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/commands/unknown-configuration.ts
@@ -0,0 +1,12 @@
+import { ng } from "../../utils/process";
+
+export default async function () {
+  try {
+    await ng('build', '--configuration', 'invalid');
+    throw new Error('should have failed.');
+  } catch (error) {
+    if (!error.message.includes(`Configuration 'invalid' is not set in the workspace`)) {
+      throw error;
+    }
+  }
+};

From 50a172a797df1639eb14947ba9e344a5a784de8c Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 10 Jun 2019 13:39:30 -0400
Subject: [PATCH 1450/1703] fix(@ngtools/webpack): avoid resetting emit skipped
 flag before emit

Fixes #14719
---
 packages/ngtools/webpack/src/angular_compiler_plugin.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index e6a218830068..716e0958c611 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -846,7 +846,6 @@ export class AngularCompilerPlugin {
 
   private async _make(compilation: compilation.Compilation) {
     time('AngularCompilerPlugin._make');
-    this._emitSkipped = true;
     // tslint:disable-next-line:no-any
     if ((compilation as any)._ngToolsWebpackPluginInstance) {
       throw new Error('An @ngtools/webpack plugin already exist for this compilation.');

From 905f3acae80fa7847b2f5098a26958c38246d3ac Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 10 Jun 2019 20:05:28 +0200
Subject: [PATCH 1451/1703] build: update angular framework packages to next`

---
 package.json                                  |   4 +-
 .../angular_devkit/build_angular/package.json |  24 +-
 .../build_ng_packagr/package.json             |   4 +-
 packages/ngtools/webpack/package.json         |   4 +-
 .../angular/utility/latest-versions.ts        |   2 +-
 yarn.lock                                     | 222 ++++++++----------
 6 files changed, 121 insertions(+), 139 deletions(-)

diff --git a/package.json b/package.json
index 751520b3b9f9..bcf4926320ac 100644
--- a/package.json
+++ b/package.json
@@ -79,8 +79,8 @@
     "typescript": "3.4.5"
   },
   "devDependencies": {
-    "@angular/compiler": "^8.0.0-beta.14",
-    "@angular/compiler-cli": "^8.0.0-beta.14",
+    "@angular/compiler": "~8.1.0-next.1",
+    "@angular/compiler-cli": "~8.1.0-next.1",
     "@bazel/bazel": "0.24.1",
     "@bazel/buildifier": "^0.22.0",
     "@bazel/jasmine": "~0.26.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 1803c7f40286..4c5bd1b7bd94 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -57,18 +57,18 @@
     "worker-plugin": "3.1.0"
   },
   "devDependencies": {
-    "@angular/animations": "^8.0.0-beta.14",
-    "@angular/cdk": "^7.3.4",
-    "@angular/common": "^8.0.0-beta.14",
-    "@angular/compiler": "^8.0.0-beta.14",
-    "@angular/compiler-cli": "^8.0.0-beta.14",
-    "@angular/core": "^8.0.0-beta.14",
-    "@angular/material": "^7.3.4",
-    "@angular/platform-browser": "^8.0.0-beta.14",
-    "@angular/platform-browser-dynamic": "^8.0.0-beta.14",
-    "@angular/platform-server": "^8.0.0-beta.14",
-    "@angular/router": "^8.0.0-beta.14",
-    "@angular/service-worker": "^8.0.0-beta.14",
+    "@angular/animations": "~8.1.0-next.1",
+    "@angular/cdk": "^8.0.0",
+    "@angular/common": "~8.1.0-next.1",
+    "@angular/compiler": "~8.1.0-next.1",
+    "@angular/compiler-cli": "~8.1.0-next.1",
+    "@angular/core": "~8.1.0-next.1",
+    "@angular/material": "^8.0.0",
+    "@angular/platform-browser": "~8.1.0-next.1",
+    "@angular/platform-browser-dynamic": "~8.1.0-next.1",
+    "@angular/platform-server": "~8.1.0-next.1",
+    "@angular/router": "~8.1.0-next.1",
+    "@angular/service-worker": "~8.1.0-next.1",
     "codelyzer": "^5.0.0",
     "bootstrap": "^4.0.0",
     "font-awesome": "^4.7.0",
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index 3a2629835ed7..a16a36dd279b 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -14,8 +14,8 @@
     "ng-packagr": "^4.0.0 || ^5.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "^8.0.0-beta.14",
-    "@angular/compiler-cli": "^8.0.0-beta.14",
+    "@angular/compiler": "~8.1.0-next.1",
+    "@angular/compiler-cli": "~8.1.0-next.1",
     "@angular-devkit/core": "0.0.0",
     "ng-packagr": "^5.1.0",
     "tslib": "^1.9.0"
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index c16ee2f22ec7..582d16bbaad8 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -33,8 +33,8 @@
     "webpack": "^4.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "^8.0.0-beta.14",
-    "@angular/compiler-cli": "^8.0.0-beta.14",
+    "@angular/compiler": "~8.1.0-next.1",
+    "@angular/compiler-cli": "~8.1.0-next.1",
     "typescript": "3.4.5",
     "webpack": "4.33.0"
   }
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 9a3cf6b2a433..b8cd44a6a471 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -8,7 +8,7 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~8.0.0',
+  Angular: '~8.1.0-next.1',
   RxJs: '~6.4.0',
   ZoneJs: '~0.9.1',
   TypeScript: '~3.4.3',
diff --git a/yarn.lock b/yarn.lock
index 72b867017af8..51393155f1f7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,33 +2,33 @@
 # yarn lockfile v1
 
 
-"@angular/animations@^8.0.0-beta.14":
-  version "8.0.0-beta.14"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0-beta.14.tgz#50259f6f3c97101183216e8311b8c0875c4356c3"
-  integrity sha512-ihYHQXEbjzemjJxJV4p2XAWOD9H4r8HpfNekxxelgj2RyZhrMQStzL+PEKxHHlGn167HuZz5YEoW4MXGflTtsA==
+"@angular/animations@~8.1.0-next.1":
+  version "8.1.0-next.1"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.1.0-next.1.tgz#6c79ac16b7da239b7823259994d2b379d883dd68"
+  integrity sha512-drwdK7ARU41hGj6JebO7gF0MeeNz3qSMoPs8zRqjC3sfWZ4Jp9eNlfTf1b86gd6w9GMeOna/JjwxUeNEmxdLBw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cdk@^7.3.4":
-  version "7.3.5"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.3.5.tgz#1b8a73ebb79371d8e1fe055a74bd5dd9515883a7"
-  integrity sha512-5m5HYm/D3/HveZdQQ4wtXk1Vm7bPiV+X5hPgegSHaoX6XONLIwSf821UqE+yYgjalILN44080+p3wHXtQT6Fkg==
+"@angular/cdk@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-8.0.0.tgz#34ca95e71d71780b29b5ba07318c88c4577bdc25"
+  integrity sha512-2vsRWEHNARe0iRmqgzvM67gwfRy+aKvdef4Qu9L+ndSsTrrZT3tSgG8SMn1v9SfBHnx5G8mo4d1AMquXG69AuQ==
   dependencies:
     tslib "^1.7.1"
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/common@^8.0.0-beta.14":
-  version "8.0.0-beta.14"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0-beta.14.tgz#a27efe0b3e38e38f0e481a2a3f8cad026823b39d"
-  integrity sha512-4mBGXb+VyakX+YqAAfDsYrlKmjDcyD0BjmWi1u7aTJgf5QmEvFD4QLXzHoWEsmBFnTgoFHXMtXogF04GXy3kuA==
+"@angular/common@~8.1.0-next.1":
+  version "8.1.0-next.1"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.1.0-next.1.tgz#2b6674ad46c13d0e24fedb6f239d338448ca72b0"
+  integrity sha512-sHzv1QIt2g6stXVqIiHpR2yk8goA3nek1FohUWz4H9mE24Knb4qSNvn25wztYdH5n5WPY+jyHyhWrqoXtrPvuQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^8.0.0-beta.14":
-  version "8.0.0-beta.14"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0-beta.14.tgz#61aa5947d3427afd0043fdba079a8cc616d29201"
-  integrity sha512-Q+B9bUDqVOT3OZdUsOFJeQWSmVKUdUoaU5ptq6UQFALCa/0skQrcL/KOFpej3fk3ZRVTkQ+vWQ1nMzv+tm8Byw==
+"@angular/compiler-cli@~8.1.0-next.1":
+  version "8.1.0-next.1"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.1.0-next.1.tgz#27047724d40a40b172497a0ebc40846a16bc481b"
+  integrity sha512-pJ5s5cEh/cXasMwUzJLwypoSaDzmAV6tfOKhm3bN6dfSh1bS8jliElIwxgPkqlUv9zo4Io/RZD4KgvwBzD7WSw==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -40,63 +40,63 @@
     shelljs "^0.8.1"
     source-map "^0.6.1"
     tslib "^1.9.0"
-    yargs "9.0.1"
+    yargs "13.1.0"
 
-"@angular/compiler@^8.0.0-beta.14":
-  version "8.0.0-beta.14"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0-beta.14.tgz#dc01066a060ea9fbd9696a015f481279aa23c2b0"
-  integrity sha512-Copy2bMf8EL9WcHwz1rHeMY6CqWhOZmvGRBSVwI149awbTxc31h3+01TG2I5FlgIm+vc70PUldp7EumqFiCCDA==
+"@angular/compiler@~8.1.0-next.1":
+  version "8.1.0-next.1"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.1.0-next.1.tgz#e0dadb973b15497d9afccccd1e56ae36c3a32014"
+  integrity sha512-3Qh4cSEPX3C2c+J9xea0CNnoy/UqtCqHzVuslfCdTRrgdCYx2xxcHvmwZHccDyTCTW8bX7C4jjr0Gf1w1lANlg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^8.0.0-beta.14":
-  version "8.0.0-beta.14"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0-beta.14.tgz#d3e75291ac390a1a29bf037bfd292586a90aea8b"
-  integrity sha512-7gltt13BTUFgGHpOBUmvxr/PUcqY8n6177NpYgEJRBFLZl2FtErG+7BfYBCt23StAi+K6ZafP+IX2m1evOtX8g==
+"@angular/core@~8.1.0-next.1":
+  version "8.1.0-next.1"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.1.0-next.1.tgz#ff8c51089a46e5fdaaa77bb65efb1b07aee47d68"
+  integrity sha512-i26/UkfTOd+nZuPbUOgGHGSWwl1fghUlLwQHvDqtdMC2VANQOjEyQZrcNHP+N7ZumVdcfxDAisFOMWgnwFzVcw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/material@^7.3.4":
-  version "7.3.5"
-  resolved "https://registry.yarnpkg.com/@angular/material/-/material-7.3.5.tgz#987df1e2a428660b15c860d05360449b008682b1"
-  integrity sha512-BkakYMuvicKIybp4LI1FKbC8a1jmmTo1ruNugy4PvQmjvj+kim7OMtAR/yCHycYq4cNQDq5LmnqLdclQEniqFw==
+"@angular/material@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@angular/material/-/material-8.0.0.tgz#21dd15c318d1e29eb4d1a2dd888ddb027897eb49"
+  integrity sha512-c7O7GhZd46xF2WB6T/YPam5lJkTgQLdIS53IqwZIFhL427+SEfPvejVzRnVfZCI3NdrKiWt/5VsvtQZwWzlGvw==
   dependencies:
     tslib "^1.7.1"
 
-"@angular/platform-browser-dynamic@^8.0.0-beta.14":
-  version "8.0.0-beta.14"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0-beta.14.tgz#ef2463033f7383500aaa55627fbd487c5c377033"
-  integrity sha512-NWcOey/bzstnbVzNvBpryEAamWNAQobUkP4i3mSnKvWAyhs1GO7IPOsTwzOOPVvQBTOq0GFdYJjDoB4DIo3/ZA==
+"@angular/platform-browser-dynamic@~8.1.0-next.1":
+  version "8.1.0-next.1"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.1.0-next.1.tgz#6e927d97583ec2bb9a9803c0f5003ef41fc39d9e"
+  integrity sha512-BDeLlzpg7T2nv3Y6ywQAW+cBAgbSQUku7W1p71vFGqE8p4c79HmKbykGSR1/n7Sez8LV+N1LpliCrNQEgGtBaA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^8.0.0-beta.14":
-  version "8.0.0-beta.14"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0-beta.14.tgz#9023453d850243fbc7c6452c26e100fd1d505617"
-  integrity sha512-nOo8wZU1PToNgb1BdKVWVmJqX4l30YWOzMCJ1S41LMImf0k+PXgKYUCQ5OzFBJNTH0x8JvANTvsBiqJyNN+QkQ==
+"@angular/platform-browser@~8.1.0-next.1":
+  version "8.1.0-next.1"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.1.0-next.1.tgz#0cf2b04437d190687d7efbaa6b7e9be5f5a076e2"
+  integrity sha512-EkDgr1wWW2eAd542k46JKb9jIr50M5eiq49QjDVmnjXCS1WNIyiW1TxTpyOiDNz8nK0jHYTzEw+PWEyvmwJV8Q==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-server@^8.0.0-beta.14":
-  version "8.0.0-beta.14"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.0.0-beta.14.tgz#87cc4ce00354b1597890809303bd89b671f78bd1"
-  integrity sha512-VV0m8zqXrk9PzOPccirkL1TV+fVsoqnUc+y9Sfj9nTtufZvAEu2Yp4GDDXvzXncXx+/GEsx+gcpRnlvKHvsOPg==
+"@angular/platform-server@~8.1.0-next.1":
+  version "8.1.0-next.1"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.1.0-next.1.tgz#d4c94dd48cf02c1e55aa22f73e744d1a17e915e4"
+  integrity sha512-TIH5Glb2Wxons7re8w6EeZuyBMhdYztN4n5tUNCZ4Yy0bmyQ/P/zqXOuSabDFf1NJxMRzMAZnp/2eJKv5ETrOw==
   dependencies:
     domino "^2.1.2"
     tslib "^1.9.0"
     xhr2 "^0.1.4"
 
-"@angular/router@^8.0.0-beta.14":
-  version "8.0.0-beta.14"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0-beta.14.tgz#62e4be7b085cce764e00c608eb910886767cd61e"
-  integrity sha512-QGIvWPd4ngxWzEwzAqEk7M54CGmmYGRxs/+V8Zohau580XL5lK6tuPvN+slO1dWe3+YuFt6U02zzs9mRGlLnYw==
+"@angular/router@~8.1.0-next.1":
+  version "8.1.0-next.1"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.1.0-next.1.tgz#b957531748e153ddafb666fd8cd68546a7508e54"
+  integrity sha512-balgDD3IlsnWs+WWuSAQn3oXULbh44oklqBQgDAl8CX94ki0jDCeVFob57cCflqRx7WjtxB053X9keg6EA2YtA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@^8.0.0-beta.14":
-  version "8.0.0-beta.14"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.0.0-beta.14.tgz#7fdac405d2f6757cbaeb2abdb35b513f69e0bdf2"
-  integrity sha512-dQGdpjj97bVp0AvLHI4wpbQCEeWSoPssnKf24oXaJHLM0UuWQgumlBzKU4/gWBpQ+lQoW+txELp4qoY4YH/Yig==
+"@angular/service-worker@~8.1.0-next.1":
+  version "8.1.0-next.1"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.1.0-next.1.tgz#bf00349b1993a6ecda07b9c08920b16aae176950"
+  integrity sha512-lctU2Dq96ovsFU/e7vIKUUvg+k5H2w+RHOx8ARlgraCU3T5fYyriQvZ9GH7y86fkAFtSrQ6MX0+pnY5dFUUZ1Q==
   dependencies:
     tslib "^1.9.0"
 
@@ -2092,7 +2092,7 @@ cli-width@^2.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
   integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
 
-cliui@^3.0.3, cliui@^3.2.0:
+cliui@^3.0.3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
   integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
@@ -3226,6 +3226,11 @@ elliptic@^6.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.0"
 
+emoji-regex@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
@@ -4076,6 +4081,11 @@ get-caller-file@^1.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
   integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
+get-caller-file@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
 get-pkg-repo@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
@@ -5791,16 +5801,6 @@ load-json-file@^1.0.0:
     pinkie-promise "^2.0.0"
     strip-bom "^2.0.0"
 
-load-json-file@^2.0.0:
-  version "2.0.0"
-  resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
-  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    strip-bom "^3.0.0"
-
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
@@ -6111,13 +6111,6 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
-mem@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
-  integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
-  dependencies:
-    mimic-fn "^1.0.0"
-
 mem@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf"
@@ -6971,15 +6964,6 @@ os-locale@^1.4.0:
   dependencies:
     lcid "^1.0.0"
 
-os-locale@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
-  integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==
-  dependencies:
-    execa "^0.7.0"
-    lcid "^1.0.0"
-    mem "^1.1.0"
-
 os-locale@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.0.1.tgz#3b014fbf01d87f60a1e5348d80fe870dc82c4620"
@@ -6989,6 +6973,15 @@ os-locale@^3.0.0:
     lcid "^2.0.0"
     mem "^4.0.0"
 
+os-locale@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
+  integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
+  dependencies:
+    execa "^1.0.0"
+    lcid "^2.0.0"
+    mem "^4.0.0"
+
 os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -7323,13 +7316,6 @@ path-type@^1.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-path-type@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
-  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
-  dependencies:
-    pify "^2.0.0"
-
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -7923,14 +7909,6 @@ read-pkg-up@^1.0.1:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
 
-read-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
-  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
-  dependencies:
-    find-up "^2.0.0"
-    read-pkg "^2.0.0"
-
 read-pkg-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
@@ -7956,15 +7934,6 @@ read-pkg@^1.0.0, read-pkg@^1.1.0:
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
-read-pkg@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
-  integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
-  dependencies:
-    load-json-file "^2.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^2.0.0"
-
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -8206,6 +8175,11 @@ require-main-filename@^1.0.1:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
   integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
 
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
 requirejs@2.3.5:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.5.tgz#617b9acbbcb336540ef4914d790323a8d4b861b0"
@@ -9308,6 +9282,15 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
+string-width@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+  dependencies:
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.1.0"
+
 string_decoder@^1.0.0, string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -10471,7 +10454,7 @@ xxhashjs@^0.2.1:
   dependencies:
     cuint "^0.2.2"
 
-y18n@^3.2.0, y18n@^3.2.1:
+y18n@^3.2.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
   integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
@@ -10506,12 +10489,13 @@ yargs-parser@^11.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
-  integrity sha1-jQrELxbqVd69MyyvTEA4s+P139k=
+yargs-parser@^13.0.0:
+  version "13.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
+  integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==
   dependencies:
-    camelcase "^4.1.0"
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
 
 yargs@12.0.2:
   version "12.0.2"
@@ -10549,24 +10533,22 @@ yargs@12.0.5:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^11.1.1"
 
-yargs@9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
-  integrity sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=
+yargs@13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.1.0.tgz#b2729ce4bfc0c584939719514099d8a916ad2301"
+  integrity sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==
   dependencies:
-    camelcase "^4.1.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^2.0.0"
-    read-pkg-up "^2.0.0"
+    cliui "^4.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    os-locale "^3.1.0"
     require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
+    require-main-filename "^2.0.0"
     set-blocking "^2.0.0"
-    string-width "^2.0.0"
+    string-width "^3.0.0"
     which-module "^2.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^7.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.0.0"
 
 yargs@^3.10.0:
   version "3.32.0"

From efe463371d3d0947701812997f7b41bffe0532d7 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 10 Jun 2019 20:12:10 +0200
Subject: [PATCH 1452/1703] feat(@ngtools/webpack): add path mappings
 resolution to NGCC

In version 8.1, similar to TypeScript Compiler, NGCC supports Path Mappings. This enable NGCC to process workspace libraries similar to what it is currently being done for `node_modules`

Closes #14594
---
 .../ngtools/webpack/src/angular_compiler_plugin.ts  |  1 +
 packages/ngtools/webpack/src/ngcc_processor.ts      | 13 ++++++++++++-
 .../legacy-cli/e2e/tests/misc/module-resolution.ts  |  8 --------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 716e0958c611..bdf21596e97b 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -667,6 +667,7 @@ export class AngularCompilerPlugin {
           this._warnings,
           this._errors,
           this._basePath,
+          this._compilerOptions,
         );
       }
 
diff --git a/packages/ngtools/webpack/src/ngcc_processor.ts b/packages/ngtools/webpack/src/ngcc_processor.ts
index a4ae1185fca3..b5933ab70066 100644
--- a/packages/ngtools/webpack/src/ngcc_processor.ts
+++ b/packages/ngtools/webpack/src/ngcc_processor.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { Logger, process as mainNgcc } from '@angular/compiler-cli/ngcc';
+import { Logger, PathMappings, process as mainNgcc } from '@angular/compiler-cli/ngcc';
 import { existsSync } from 'fs';
 import * as path from 'path';
 import * as ts from 'typescript';
@@ -27,6 +27,7 @@ export class NgccProcessor {
   private _processedModules = new Set<string>();
   private _logger: NgccLogger;
   private _nodeModulesDirectory: string;
+  private _pathMappings: PathMappings | undefined;
 
   constructor(
     private readonly propertiesToConsider: string[],
@@ -34,9 +35,18 @@ export class NgccProcessor {
     private readonly compilationWarnings: (Error | string)[],
     private readonly compilationErrors: (Error | string)[],
     private readonly basePath: string,
+    private readonly compilerOptions: ts.CompilerOptions,
   ) {
     this._logger = new NgccLogger(this.compilationWarnings, this.compilationErrors);
     this._nodeModulesDirectory = this.findNodeModulesDirectory(this.basePath);
+
+    const { baseUrl, paths } = this.compilerOptions;
+    if (baseUrl && paths) {
+      this._pathMappings = {
+        baseUrl,
+        paths,
+      };
+    }
   }
 
   processModule(
@@ -69,6 +79,7 @@ export class NgccProcessor {
       compileAllFormats: false,
       createNewEntryPointFormats: true,
       logger: this._logger,
+      pathMappings: this._pathMappings,
     });
     timeEnd(timeLabel);
 
diff --git a/tests/legacy-cli/e2e/tests/misc/module-resolution.ts b/tests/legacy-cli/e2e/tests/misc/module-resolution.ts
index b7b3f435d662..0396650258c7 100644
--- a/tests/legacy-cli/e2e/tests/misc/module-resolution.ts
+++ b/tests/legacy-cli/e2e/tests/misc/module-resolution.ts
@@ -2,17 +2,9 @@ import { appendToFile, createDir, moveFile, prependToFile } from '../../utils/fs
 import { ng, silentNpm } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
-import { getGlobalVariable } from '../../utils/env';
 
 
 export default async function () {
-  if (getGlobalVariable('argv')['ivy']) {
-    // todo: enable when NGCC supports this.
-    // this test is not yet supported under IVY because can only transform packages from a single basePaths.
-    // https://angular-team.atlassian.net/browse/FW-1204
-    return;
-  }
-
   await updateJsonFile('tsconfig.json', tsconfig => {
     tsconfig.compilerOptions.paths = {
       '*': ['./node_modules/*'],

From 09149fe5e4f99ce4e034178c21ed158d3568136f Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 10 Jun 2019 21:32:01 -0400
Subject: [PATCH 1453/1703] fix(@angular/cli): allow update when git is unclean
 outside the workspace

---
 packages/angular/cli/commands/update-impl.ts | 22 ++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/packages/angular/cli/commands/update-impl.ts b/packages/angular/cli/commands/update-impl.ts
index 0dc5bbd587b8..17dddb3800fb 100644
--- a/packages/angular/cli/commands/update-impl.ts
+++ b/packages/angular/cli/commands/update-impl.ts
@@ -346,10 +346,24 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
   checkCleanGit() {
     try {
       const result = execSync('git status --porcelain', { encoding: 'utf8', stdio: 'pipe' });
+      if (result.trim().length === 0) {
+        return true;
+      }
 
-      return result.trim().length === 0;
-    } catch {
-      return true;
-    }
+      // Only files inside the workspace root are relevant
+      for (const entry of result.split('\n')) {
+        const relativeEntry = path.relative(
+          path.resolve(this.workspace.root),
+          path.resolve(entry.slice(3).trim()),
+        );
+
+        if (!relativeEntry.startsWith('..') && !path.isAbsolute(relativeEntry)) {
+          return false;
+        }
+      }
+
+    } catch { }
+
+    return true;
   }
 }

From 473b4c4a5abcd649c25f438845fa236121a9e1ce Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 11 Jun 2019 09:27:45 +0200
Subject: [PATCH 1454/1703] test: fix flakes of `rebuilds TS worker`

Not quite sure why such a long 'debounceTime' is needed anything under `2500` is a constant failure locally and this is also rather flaky on CI when it doesn't run as the first test.

It seems that the outputted files contents don't get updated in time.
---
 .../build_angular/test/browser/web-worker_spec_large.ts   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts
index 711a9267e118..4fa2689d537d 100644
--- a/packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts
@@ -138,7 +138,6 @@ describe('Browser Builder Web Worker support', () => {
       watch: true,
     };
 
-    let buildCount = 0;
     let phase = 1;
     const workerPath = join(outputPath, '0.worker.js');
     let workerContent = '';
@@ -146,10 +145,13 @@ describe('Browser Builder Web Worker support', () => {
     const run = await architect.scheduleTarget(target, overrides);
     await run.output.pipe(
       // Wait for files to be written to disk.
-      debounceTime(1000),
+      // FIXME: Not quite sure why such a long 'debounceTime' is needed.
+      // Anything under `2500` is a constant failure locally when using
+      // 'fdescribe' and this tests doesn't run as first one and is also rather flaky on CI.
+      // It seems that the outputted files contents don't get updated in time.
+      debounceTime(2500),
       tap((buildEvent) => expect(buildEvent.success).toBe(true, 'build should succeed')),
       tap(() => {
-        buildCount++;
         switch (phase) {
           case 1:
             // Original worker content should be there.

From 1dd399c4d27d2f532ad1ca5fd6db094b2feed18d Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sat, 8 Jun 2019 17:12:33 +0200
Subject: [PATCH 1455/1703] fix(@angular-devkit/build-angular): nomodule
 polyfill for Safari 10.1 and iOS Safari 10.3

The nomodule polyfill needs to be loaded prior to any script and be
outside of webpack compilation because otherwise webpack will cause the
script to be wrapped in `window["webpackJsonp"]` which causes it to
fail.

This polyfill will only be injected when the either Safari 10.1 or iOS
Safari 10.3 support is required, which is based on the browsers  defined in browserslist file.

Fixes #14680
---
 .../models/safari-nomodule.js                 |  20 +-
 .../models/webpack-configs/common.ts          |  54 +++--
 .../models/webpack-configs/utils.ts           |   5 -
 .../utilities/package-chunk-sort.ts           |   1 +
 .../build_angular/src/browser/index.ts        |  12 +-
 .../src/utils/build-browser-features.ts       |  58 ++++++
 .../src/utils/build-browser-features_spec.ts  | 195 ++++++++++++++++++
 .../src/utils/differential-loading.ts         |  30 ---
 .../src/utils/differential-loading_spec.ts    |  56 -----
 .../build_angular/src/utils/index.ts          |   3 +-
 .../src/utils/webpack-browser-config.ts       |   8 +-
 .../differential_loading_spec_large.ts        |   2 -
 .../e2e/tests/misc/support-safari-10.1.ts     |  42 ++++
 13 files changed, 348 insertions(+), 138 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/src/utils/build-browser-features.ts
 create mode 100644 packages/angular_devkit/build_angular/src/utils/build-browser-features_spec.ts
 delete mode 100644 packages/angular_devkit/build_angular/src/utils/differential-loading.ts
 delete mode 100644 packages/angular_devkit/build_angular/src/utils/differential-loading_spec.ts
 create mode 100644 tests/legacy-cli/e2e/tests/misc/support-safari-10.1.ts

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/safari-nomodule.js b/packages/angular_devkit/build_angular/src/angular-cli-files/models/safari-nomodule.js
index 89db355822ae..1d2dbd1436ff 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/safari-nomodule.js
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/safari-nomodule.js
@@ -1,22 +1,8 @@
-/**
- * Safari 10.1 supports modules, but does not support the `nomodule` attribute - it will
- * load <script nomodule> anyway. This snippet solve this problem, but only for script
- * tags that load external code, e.g.: <script nomodule src="nomodule.js"></script>
- *
- * Again: this will **not** prevent inline script, e.g.:
- * <script nomodule>alert('no modules');</script>.
- *
- * This workaround is possible because Safari supports the non-standard 'beforeload' event.
- * This allows us to trap the module and nomodule load.
- *
- * Note also that `nomodule` is supported in later versions of Safari - it's just 10.1 that
- * omits this attribute.
- */
-(function() {
+(function () {
   var check = document.createElement('script');
   if (!('noModule' in check) && 'onbeforeload' in check) {
     var support = false;
-    document.addEventListener('beforeload', function(e) {
+    document.addEventListener('beforeload', function (e) {
       if (e.target === check) {
         support = true;
       } else if (!e.target.hasAttribute('nomodule') || !support) {
@@ -30,4 +16,4 @@
     document.head.appendChild(check);
     check.remove();
   }
-}());
\ No newline at end of file
+}());
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 7e9402759b0c..ec8318348e78 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -18,8 +18,8 @@ import {
   debug,
 } from 'webpack';
 import { RawSource } from 'webpack-sources';
-import { AssetPatternClass } from '../../../browser/schema';
-import { isEs5SupportNeeded } from '../../../utils/differential-loading';
+import { AssetPatternClass, ExtraEntryPoint } from '../../../browser/schema';
+import { BuildBrowserFeatures } from '../../../utils/build-browser-features';
 import { BundleBudgetPlugin } from '../../plugins/bundle-budget';
 import { CleanCssWebpackPlugin } from '../../plugins/cleancss-webpack-plugin';
 import { NamedLazyChunksPlugin } from '../../plugins/named-chunks-plugin';
@@ -40,7 +40,7 @@ export const buildOptimizerLoader: string = g['_DevKitIsLocal']
 
 // tslint:disable-next-line:no-big-function
 export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
-  const { root, projectRoot, buildOptions } = wco;
+  const { root, projectRoot, buildOptions, tsConfig } = wco;
   const { styles: stylesOptimization, scripts: scriptsOptimization } = buildOptions.optimization;
   const {
     styles: stylesSourceMap,
@@ -67,25 +67,39 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
   }
 
   if (wco.buildOptions.platform !== 'server') {
-    const es5Polyfills = path.join(__dirname, '..', 'es5-polyfills.js');
-    const es5JitPolyfills = path.join(__dirname, '..', 'es5-jit-polyfills.js');
-    if (targetInFileName) {
-      // For differential loading we don't need to have 2 polyfill bundles
-      if (buildOptions.scriptTargetOverride === ScriptTarget.ES2015) {
-        entryPoints['polyfills'] = [path.join(__dirname, '..', 'safari-nomodule.js')];
-      } else {
-        entryPoints['polyfills'] = [es5Polyfills];
-        if (!buildOptions.aot) {
-          entryPoints['polyfills'].push(es5JitPolyfills);
+    const buildBrowserFeatures = new BuildBrowserFeatures(
+      projectRoot,
+      tsConfig.options.target || ScriptTarget.ES5,
+    );
+    if ((buildOptions.scriptTargetOverride || tsConfig.options.target) === ScriptTarget.ES5) {
+      if (buildOptions.es5BrowserSupport ||
+        (
+          buildOptions.es5BrowserSupport === undefined &&
+          buildBrowserFeatures.isEs5SupportNeeded()
+        )
+      ) {
+        // The nomodule polyfill needs to be inject prior to any script and be
+        // outside of webpack compilation because otherwise webpack will cause the
+        // script to be wrapped in window["webpackJsonp"] which causes this to fail.
+        if (buildBrowserFeatures.isNoModulePolyfillNeeded()) {
+          const noModuleScript: ExtraEntryPoint = {
+            bundleName: 'polyfills-nomodule-es5',
+            input: path.join(__dirname, '..', 'safari-nomodule.js'),
+          };
+          buildOptions.scripts = buildOptions.scripts
+            ? [...buildOptions.scripts, noModuleScript]
+            : [noModuleScript];
         }
-      }
-    } else {
-      // For NON differential loading we want to have 2 polyfill bundles
-      if (buildOptions.es5BrowserSupport
-        || (buildOptions.es5BrowserSupport === undefined && isEs5SupportNeeded(projectRoot))) {
-        entryPoints['polyfills-es5'] = [es5Polyfills];
+
+         // For differential loading we don't need to generate a seperate polyfill file
+        // because they will be loaded exclusivly based on module and nomodule
+        const polyfillsChunkName = buildBrowserFeatures.isDifferentialLoadingNeeded()
+          ? 'polyfills'
+          : 'polyfills-es5';
+
+        entryPoints[polyfillsChunkName] = [path.join(__dirname, '..', 'es5-polyfills.js')];
         if (!buildOptions.aot) {
-          entryPoints['polyfills-es5'].push(es5JitPolyfills);
+          entryPoints[polyfillsChunkName].push(path.join(__dirname, '..', 'es5-jit-polyfills.js'));
         }
       }
     }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
index 2262bde39378..e0afd2ad53ef 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
@@ -8,16 +8,11 @@
 // tslint:disable
 // TODO: cleanup this file, it's copied as is from Angular CLI.
 
-import * as path from 'path';
 import { basename, normalize } from '@angular-devkit/core';
 import { ExtraEntryPoint, ExtraEntryPointClass } from '../../../browser/schema';
 import { SourceMapDevToolPlugin } from 'webpack';
 import { ScriptTarget } from 'typescript';
 
-export const ngAppResolve = (resolvePath: string): string => {
-  return path.resolve(process.cwd(), resolvePath);
-};
-
 export interface HashFormat {
   chunk: string;
   extract: string;
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts
index 5f45c58c7af5..3b2262575d70 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts
@@ -26,6 +26,7 @@ export function generateEntryPoints(
   };
 
   const entryPoints = [
+    'polyfills-nomodule-es5',
     'polyfills-es5',
     'polyfills',
     'sw-register',
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index b5d75281ee68..76bb388e6295 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -57,7 +57,7 @@ import {
   statsWarningsToString,
 } from '../angular-cli-files/utilities/stats';
 import { ExecutionTransformer } from '../transforms';
-import { deleteOutputDir, isEs5SupportNeeded } from '../utils';
+import { BuildBrowserFeatures, deleteOutputDir } from '../utils';
 import { Version } from '../utils/version';
 import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
 import { Schema as BrowserBuilderSchema } from './schema';
@@ -202,9 +202,13 @@ export function buildWebpackBrowser(
       const tsConfigPath = path.resolve(getSystemPath(workspace.root), options.tsConfig);
       const tsConfig = readTsconfig(tsConfigPath);
 
-      if (isEs5SupportNeeded(projectRoot) &&
-          tsConfig.options.target !== ScriptTarget.ES5 &&
-          tsConfig.options.target !== ScriptTarget.ES2015) {
+      const target = tsConfig.options.target || ScriptTarget.ES5;
+      const buildBrowserFeatures = new BuildBrowserFeatures(
+        getSystemPath(projectRoot),
+        target,
+      );
+
+      if (target > ScriptTarget.ES2015 && buildBrowserFeatures.isDifferentialLoadingNeeded()) {
         context.logger.warn(tags.stripIndent`
           WARNING: Using differential loading with targets ES5 and ES2016 or higher may
           cause problems. Browsers with support for ES2015 will load the ES2016+ scripts
diff --git a/packages/angular_devkit/build_angular/src/utils/build-browser-features.ts b/packages/angular_devkit/build_angular/src/utils/build-browser-features.ts
new file mode 100644
index 000000000000..b330dad94a60
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/utils/build-browser-features.ts
@@ -0,0 +1,58 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import * as browserslist from 'browserslist';
+import { feature, features } from 'caniuse-lite';
+import * as ts from 'typescript';
+
+export class BuildBrowserFeatures {
+  private readonly _supportedBrowsers: string[];
+  private readonly _es6TargetOrLater: boolean;
+
+  constructor(
+    private projectRoot: string,
+    private scriptTarget: ts.ScriptTarget,
+  ) {
+    this._supportedBrowsers = browserslist(undefined, { path: this.projectRoot });
+    this._es6TargetOrLater = this.scriptTarget > ts.ScriptTarget.ES5;
+  }
+
+  /**
+   * True, when one or more browsers requires ES5
+   * support and the scirpt target is ES2015 or greater.
+   */
+  isDifferentialLoadingNeeded(): boolean {
+    return this._es6TargetOrLater && this.isEs5SupportNeeded();
+  }
+
+  /**
+   * True, when one or more browsers requires ES5 support
+   */
+  isEs5SupportNeeded(): boolean {
+    return !caniuse.isSupported('es6-module', this._supportedBrowsers.join(', '));
+  }
+
+  /**
+   * Safari 10.1 and iOS Safari 10.3 supports modules,
+   * but does not support the `nomodule` attribute.
+   * While return `true`, when support for Safari 10.1 and iOS Safari 10.3
+   * is required and in differential loading is enabled.
+   */
+  isNoModulePolyfillNeeded(): boolean {
+    if (!this.isDifferentialLoadingNeeded()) {
+      return false;
+    }
+
+    const safariBrowsers = [
+      'safari 10.1',
+      'ios_saf 10.3',
+    ];
+
+    return this._supportedBrowsers.some(browser => safariBrowsers.includes(browser));
+  }
+}
diff --git a/packages/angular_devkit/build_angular/src/utils/build-browser-features_spec.ts b/packages/angular_devkit/build_angular/src/utils/build-browser-features_spec.ts
new file mode 100644
index 000000000000..0f111b563e1d
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/utils/build-browser-features_spec.ts
@@ -0,0 +1,195 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+
+import { TestProjectHost } from '@angular-devkit/architect/testing';
+import { getSystemPath, join } from '@angular-devkit/core';
+import { ScriptTarget } from 'typescript';
+import { BuildBrowserFeatures } from './build-browser-features';
+
+const devkitRoot = (global as any)._DevKitRoot; // tslint:disable-line:no-any
+const workspaceRoot = join(
+  devkitRoot,
+  'tests/angular_devkit/build_angular/hello-world-app/');
+
+const host = new TestProjectHost(workspaceRoot);
+
+describe('BuildBrowserFeatures', () => {
+  let workspaceRootSysPath = '';
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    workspaceRootSysPath = getSystemPath(host.root());
+  });
+
+  afterEach(async () => host.restore().toPromise());
+
+  describe('isDifferentialLoadingNeeded', () => {
+    it('should be true for for IE 9-11 and ES2015', () => {
+      host.writeMultipleFiles({
+        'browserslist': 'IE 9-11',
+      });
+
+      const buildBrowserFeatures = new BuildBrowserFeatures(
+        workspaceRootSysPath,
+        ScriptTarget.ES2015,
+      );
+      expect(buildBrowserFeatures.isDifferentialLoadingNeeded()).toBe(true);
+    });
+
+    it('should be false for Chrome and ES2015', () => {
+      host.writeMultipleFiles({
+        'browserslist': 'last 1 chrome version',
+      });
+
+      const buildBrowserFeatures = new BuildBrowserFeatures(
+        workspaceRootSysPath,
+        ScriptTarget.ES2015,
+      );
+      expect(buildBrowserFeatures.isDifferentialLoadingNeeded()).toBe(false);
+    });
+
+    it('detects no need for differential loading for target is ES5', () => {
+      host.writeMultipleFiles({
+        'browserslist': 'last 1 chrome version',
+      });
+
+      const buildBrowserFeatures = new BuildBrowserFeatures(
+        workspaceRootSysPath,
+        ScriptTarget.ES5,
+      );
+      expect(buildBrowserFeatures.isDifferentialLoadingNeeded()).toBe(false);
+    });
+
+    it('should be false for Safari 10.1 when target is ES2015', () => {
+      host.writeMultipleFiles({
+        'browserslist': 'Safari 10.1',
+      });
+
+      const buildBrowserFeatures = new BuildBrowserFeatures(
+        workspaceRootSysPath,
+        ScriptTarget.ES2015,
+      );
+      expect(buildBrowserFeatures.isDifferentialLoadingNeeded()).toBe(false);
+    });
+  });
+
+  describe('isFeatureSupported', () => {
+    it('should be true for es6-module and Safari 10.1', () => {
+      host.writeMultipleFiles({
+        'browserslist': 'Safari 10.1',
+      });
+
+      const buildBrowserFeatures = new BuildBrowserFeatures(
+        workspaceRootSysPath,
+        ScriptTarget.ES2015,
+      );
+      expect(buildBrowserFeatures.isFeatureSupported('es6-module')).toBe(true);
+    });
+
+    it('should be false for es6-module and IE9', () => {
+      host.writeMultipleFiles({
+        'browserslist': 'IE 9',
+      });
+
+      const buildBrowserFeatures = new BuildBrowserFeatures(
+        workspaceRootSysPath,
+        ScriptTarget.ES2015,
+      );
+      expect(buildBrowserFeatures.isFeatureSupported('es6-module')).toBe(false);
+    });
+
+    it('should be true for es6-module and last 1 chrome version', () => {
+      host.writeMultipleFiles({
+        'browserslist': 'last 1 chrome version',
+      });
+
+      const buildBrowserFeatures = new BuildBrowserFeatures(
+        workspaceRootSysPath,
+        ScriptTarget.ES2015,
+      );
+      expect(buildBrowserFeatures.isFeatureSupported('es6-module')).toBe(true);
+    });
+
+    it('should be true for es6-module and Edge 18', () => {
+      host.writeMultipleFiles({
+        'browserslist': 'Edge 18',
+      });
+
+      const buildBrowserFeatures = new BuildBrowserFeatures(
+        workspaceRootSysPath,
+        ScriptTarget.ES2015,
+      );
+      expect(buildBrowserFeatures.isFeatureSupported('es6-module')).toBe(true);
+    });
+  });
+
+  describe('isNoModulePolyfillNeeded', () => {
+    it('should be false for Safari 10.1 when target is ES5', () => {
+      host.writeMultipleFiles({
+        'browserslist': 'Safari 10.1',
+      });
+
+      const buildBrowserFeatures = new BuildBrowserFeatures(
+        workspaceRootSysPath,
+        ScriptTarget.ES5,
+      );
+      expect(buildBrowserFeatures.isNoModulePolyfillNeeded()).toBe(false);
+    });
+
+    it('should be false for Safari 10.1 when target is ES2015', () => {
+      host.writeMultipleFiles({
+        'browserslist': 'Safari 10.1',
+      });
+
+      const buildBrowserFeatures = new BuildBrowserFeatures(
+        workspaceRootSysPath,
+        ScriptTarget.ES2015,
+      );
+      expect(buildBrowserFeatures.isNoModulePolyfillNeeded()).toBe(false);
+    });
+
+    it('should be true for Safari 9+ when target is ES2015', () => {
+      host.writeMultipleFiles({
+        'browserslist': 'Safari >= 9',
+      });
+
+      const buildBrowserFeatures = new BuildBrowserFeatures(
+        workspaceRootSysPath,
+        ScriptTarget.ES2015,
+      );
+      expect(buildBrowserFeatures.isNoModulePolyfillNeeded()).toBe(true);
+    });
+
+    it('should be false for Safari 9+ when target is ES5', () => {
+      host.writeMultipleFiles({
+        'browserslist': 'Safari >= 9',
+      });
+
+      const buildBrowserFeatures = new BuildBrowserFeatures(
+        workspaceRootSysPath,
+        ScriptTarget.ES5,
+      );
+      expect(buildBrowserFeatures.isNoModulePolyfillNeeded()).toBe(false);
+    });
+
+    it('should be false when not supporting Safari 10.1 target is ES2015', () => {
+      host.writeMultipleFiles({
+        'browserslist': `
+          Edge 18
+          IE 9
+        `,
+      });
+
+      const buildBrowserFeatures = new BuildBrowserFeatures(
+        workspaceRootSysPath,
+        ScriptTarget.ES2015,
+      );
+      expect(buildBrowserFeatures.isNoModulePolyfillNeeded()).toBe(false);
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/utils/differential-loading.ts b/packages/angular_devkit/build_angular/src/utils/differential-loading.ts
deleted file mode 100644
index 456007ebff5b..000000000000
--- a/packages/angular_devkit/build_angular/src/utils/differential-loading.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import * as browserslist from 'browserslist';
-import * as caniuse from 'caniuse-api';
-import { ScriptTarget } from 'typescript';
-
-
-export function isDifferentialLoadingNeeded(
-  projectRoot: string,
-  target: ScriptTarget = ScriptTarget.ES5): boolean {
-
-  const supportES2015 = target !== ScriptTarget.ES3 && target !== ScriptTarget.ES5;
-
-  return supportES2015 && isEs5SupportNeeded(projectRoot);
-}
-
-export function isEs5SupportNeeded(projectRoot: string): boolean {
-  const browsersList: string[] = browserslist(
-    undefined, {
-      path: projectRoot,
-    });
-
-  return !caniuse.isSupported('es6-module', browsersList.join(', '));
-}
diff --git a/packages/angular_devkit/build_angular/src/utils/differential-loading_spec.ts b/packages/angular_devkit/build_angular/src/utils/differential-loading_spec.ts
deleted file mode 100644
index 1307fd9f67cd..000000000000
--- a/packages/angular_devkit/build_angular/src/utils/differential-loading_spec.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-
-import { TestProjectHost } from '@angular-devkit/architect/testing';
-import { getSystemPath, join } from '@angular-devkit/core';
-import { ScriptTarget } from 'typescript';
-import { isDifferentialLoadingNeeded } from './differential-loading';
-
-const devkitRoot = (global as any)._DevKitRoot; // tslint:disable-line:no-any
-const workspaceRoot = join(
-  devkitRoot,
-  'tests/angular_devkit/build_angular/hello-world-app/');
-
-const host = new TestProjectHost(workspaceRoot);
-
-
-describe('differential loading', () => {
-
-  beforeEach(async () => host.initialize().toPromise());
-  afterEach(async () => host.restore().toPromise());
-
-  it('detects the need for differential loading for IE 9-11 and ES2015', () => {
-    host.writeMultipleFiles({
-      'browserslist': 'IE 9-11',
-    });
-
-    const needed = isDifferentialLoadingNeeded(getSystemPath(host.root()), ScriptTarget.ES2015);
-    expect(needed).toBe(true);
-  });
-
-  it('detects no need for differential loading for Chrome and ES2015', () => {
-    host.writeMultipleFiles({
-      'browserslist': 'last 1 chrome version',
-    });
-
-    const needed = isDifferentialLoadingNeeded(getSystemPath(host.root()), ScriptTarget.ES2015);
-
-    expect(needed).toBe(false);
-  });
-
-  it('detects no need for differential loading for target is ES5', () => {
-    host.writeMultipleFiles({
-      'browserslist': 'last 1 chrome version',
-    });
-
-    const needed = isDifferentialLoadingNeeded(getSystemPath(host.root()), ScriptTarget.ES5);
-
-    expect(needed).toBe(false);
-  });
-});
diff --git a/packages/angular_devkit/build_angular/src/utils/index.ts b/packages/angular_devkit/build_angular/src/utils/index.ts
index 0f297fff122b..8cd7670f0a9b 100644
--- a/packages/angular_devkit/build_angular/src/utils/index.ts
+++ b/packages/angular_devkit/build_angular/src/utils/index.ts
@@ -5,9 +5,10 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
+export * from './build-browser-features';
 export * from './default-progress';
 export * from './delete-output-dir';
-export * from './differential-loading';
 export * from './run-module-as-observable-fork';
 export * from './normalize-file-replacements';
 export * from './normalize-asset-patterns';
diff --git a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
index 94966ee738bd..df478dbfde32 100644
--- a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
+++ b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
@@ -24,7 +24,7 @@ import { getEsVersionForFileName } from '../angular-cli-files/models/webpack-con
 import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
 import { Schema as BrowserBuilderSchema } from '../browser/schema';
 import { NormalizedBrowserBuilderSchema, defaultProgress, normalizeBrowserSchema } from '../utils';
-import { isDifferentialLoadingNeeded } from './differential-loading';
+import { BuildBrowserFeatures } from './build-browser-features';
 
 const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');
 const webpackMerge = require('webpack-merge');
@@ -53,9 +53,11 @@ export async function generateWebpackConfig(
 
   // At the moment, only the browser builder supports differential loading
   // However this config generation is used by multiple builders such as dev-server
-  const scriptTarget = tsConfig.options.target;
+  const scriptTarget = tsConfig.options.target || ts.ScriptTarget.ES5;
+  const buildBrowserFeatures = new BuildBrowserFeatures(projectRoot, scriptTarget);
   const differentialLoading = context.builder.builderName === 'browser'
-    && isDifferentialLoadingNeeded(projectRoot, scriptTarget) && !options.watch;
+    && !options.watch
+    && buildBrowserFeatures.isDifferentialLoadingNeeded();
 
   const scriptTargets = [scriptTarget];
 
diff --git a/packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts
index 62c80dafa543..16530d00e934 100644
--- a/packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts
@@ -73,8 +73,6 @@ describe('Browser Builder with differential loading', () => {
       'main.js',
       'main.js.map',
 
-      'polyfills-es5.js',
-      'polyfills-es5.js.map',
       'polyfills.js',
       'polyfills.js.map',
 
diff --git a/tests/legacy-cli/e2e/tests/misc/support-safari-10.1.ts b/tests/legacy-cli/e2e/tests/misc/support-safari-10.1.ts
new file mode 100644
index 000000000000..f78cb217bdcb
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/misc/support-safari-10.1.ts
@@ -0,0 +1,42 @@
+import { oneLineTrim } from 'common-tags';
+import {
+  expectFileNotToExist,
+  expectFileToExist,
+  expectFileToMatch,
+  writeFile,
+} from '../../utils/fs';
+import { ng } from '../../utils/process';
+
+export default async function () {
+  await writeFile('browserslist', 'Safari 10.1');
+  await ng('build');
+  await expectFileNotToExist('dist/test-project/polyfills-es5.js');
+  await expectFileNotToExist('dist/test-project/polyfills-nomodule-es5.js');
+  await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
+    <script src="runtime.js"></script>
+    <script src="polyfills.js"></script>
+    <script src="styles.js"></script>
+    <script src="vendor.js"></script>
+    <script src="main.js"></script>
+  `);
+
+  await writeFile('browserslist', `
+    IE 9
+    Safari 10.1
+  `);
+  await ng('build');
+  await expectFileToExist('dist/test-project/polyfills-nomodule-es5.js');
+  await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
+    <script src="polyfills-nomodule-es5.js" nomodule></script>
+    <script src="runtime-es2015.js" type="module"></script>
+    <script src="polyfills-es2015.js" type="module"></script>
+    <script src="runtime-es5.js" nomodule></script>
+    <script src="polyfills-es5.js" nomodule></script>
+    <script src="styles-es2015.js" type="module"></script>
+    <script src="styles-es5.js" nomodule></script>
+    <script src="vendor-es2015.js" type="module"></script>
+    <script src="main-es2015.js" type="module"></script>
+    <script src="vendor-es5.js" nomodule></script>
+    <script src="main-es5.js" nomodule></script>
+  `);
+}

From 36d9e933d5918d87f88123ce96a1b4ee687ea01c Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 11 Jun 2019 07:51:40 +0200
Subject: [PATCH 1456/1703] test: change polyfills in hello-world-app which
 causes `rebuilds TS worker` to fail

---
 .../hello-world-app/package.json              |  1 -
 .../hello-world-app/src/polyfills.ts          | 57 +++++++++----------
 2 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/tests/angular_devkit/build_angular/hello-world-app/package.json b/tests/angular_devkit/build_angular/hello-world-app/package.json
index 97164be01a98..5aecb7dd20b6 100644
--- a/tests/angular_devkit/build_angular/hello-world-app/package.json
+++ b/tests/angular_devkit/build_angular/hello-world-app/package.json
@@ -23,7 +23,6 @@
     "@angular/platform-browser": "^6.0.0-rc.0",
     "@angular/platform-browser-dynamic": "^6.0.0-rc.0",
     "@angular/router": "^6.0.0-rc.0",
-    "core-js": "^2.4.1",
     "rxjs": "~6.2.0",
     "zone.js": "^0.8.19"
   },
diff --git a/tests/angular_devkit/build_angular/hello-world-app/src/polyfills.ts b/tests/angular_devkit/build_angular/hello-world-app/src/polyfills.ts
index d7fd9a7ba789..bd13d5722895 100644
--- a/tests/angular_devkit/build_angular/hello-world-app/src/polyfills.ts
+++ b/tests/angular_devkit/build_angular/hello-world-app/src/polyfills.ts
@@ -25,41 +25,39 @@
  * BROWSER POLYFILLS
  */
 
-/** IE9, IE10 and IE11 requires all of the following polyfills. **/
-// import 'core-js/es6/symbol';
-// import 'core-js/es6/object';
-// import 'core-js/es6/function';
-// import 'core-js/es6/parse-int';
-// import 'core-js/es6/parse-float';
-// import 'core-js/es6/number';
-// import 'core-js/es6/math';
-// import 'core-js/es6/string';
-// import 'core-js/es6/date';
-// import 'core-js/es6/array';
-// import 'core-js/es6/regexp';
-// import 'core-js/es6/map';
-// import 'core-js/es6/weak-map';
-// import 'core-js/es6/set';
-
 /** IE10 and IE11 requires the following for NgClass support on SVG elements */
 // import 'classlist.js';  // Run `npm install --save classlist.js`.
 
-/** IE10 and IE11 requires the following for the Reflect API. */
-// import 'core-js/es6/reflect';
-
-
-/** Evergreen browsers require these. **/
-// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
-import 'core-js/es7/reflect';
-
-
 /**
- * Required to support Web Animations `@angular/platform-browser/animations`.
- * Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation
- **/
+ * Web Animations `@angular/platform-browser/animations`
+ * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
+ * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
+ */
 // import 'web-animations-js';  // Run `npm install --save web-animations-js`.
 
-
+/**
+ * By default, zone.js will patch all possible macroTask and DomEvents
+ * user can disable parts of macroTask/DomEvents patch by setting following flags
+ * because those flags need to be set before `zone.js` being loaded, and webpack
+ * will put import in the top of bundle, so user need to create a separate file
+ * in this directory (for example: zone-flags.ts), and put the following flags
+ * into that file, and then add the following code before importing zone.js.
+ * import './zone-flags.ts';
+ *
+ * The flags allowed in zone-flags.ts are listed here.
+ *
+ * The following flags will work for all browsers.
+ *
+ * (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
+ * (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
+ * (window as any).__zone_symbol__UNPATCHED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
+ *
+ *  in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
+ *  with the following flag, it will bypass `zone.js` patch for IE/Edge
+ *
+ *  (window as any).__Zone_enable_cross_context_check = true;
+ *
+ */
 
 /***************************************************************************************************
  * Zone JS is required by default for Angular itself.
@@ -67,7 +65,6 @@ import 'core-js/es7/reflect';
 import 'zone.js/dist/zone';  // Included with Angular CLI.
 
 
-
 /***************************************************************************************************
  * APPLICATION IMPORTS
  */

From 69e47c2249128bd713e5251ab2ebc922a443cabc Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 11 Jun 2019 07:56:05 +0200
Subject: [PATCH 1457/1703] fix(@angular-devkit/build-angular): browsers that
 partially support ES6 modules are being marked as not supported

`caniuse-api` only returns `true` for a feature when it's fully supported. This might causes redundant ES5 builds if users opt to support only browsers which do support ES6 modules but either require polyfills such as Safari 10.1 or when both bundles will be downloaded such as `Edge 18`

See: https://github.com/Nyalab/caniuse-api/blob/1b74c10257e36877709da4f6630513db10203a78/src/index.js#L49 and https://github.com/Nyalab/caniuse-api/issues/82

Fixes #14580
---
 package.json                                  |  2 +-
 .../angular_devkit/build_angular/package.json |  2 +-
 .../src/utils/build-browser-features.ts       | 31 +++++++++++++++-
 yarn.lock                                     | 36 +++++--------------
 4 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/package.json b/package.json
index bcf4926320ac..22cc9b3343cf 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@bazel/typescript": "~0.26.0",
     "@ngtools/json-schema": "^1.1.0",
     "@types/browserslist": "^4.4.0",
-    "@types/caniuse-api": "^3.0.0",
+    "@types/caniuse-lite": "^1.0.0",
     "@types/copy-webpack-plugin": "^4.4.1",
     "@types/express": "^4.16.0",
     "@types/glob": "^7.0.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 4c5bd1b7bd94..fa6a188b578a 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -15,7 +15,7 @@
     "ajv": "6.10.0",
     "autoprefixer": "9.6.0",
     "browserslist": "4.6.2",
-    "caniuse-api": "3.0.0",
+    "caniuse-lite": "1.0.30000974",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.3",
diff --git a/packages/angular_devkit/build_angular/src/utils/build-browser-features.ts b/packages/angular_devkit/build_angular/src/utils/build-browser-features.ts
index b330dad94a60..cfd3e58dda4c 100644
--- a/packages/angular_devkit/build_angular/src/utils/build-browser-features.ts
+++ b/packages/angular_devkit/build_angular/src/utils/build-browser-features.ts
@@ -34,7 +34,7 @@ export class BuildBrowserFeatures {
    * True, when one or more browsers requires ES5 support
    */
   isEs5SupportNeeded(): boolean {
-    return !caniuse.isSupported('es6-module', this._supportedBrowsers.join(', '));
+    return !this.isFeatureSupported('es6-module');
   }
 
   /**
@@ -55,4 +55,33 @@ export class BuildBrowserFeatures {
 
     return this._supportedBrowsers.some(browser => safariBrowsers.includes(browser));
   }
+
+  /**
+   * True, when a browser feature is supported partially or fully.
+   */
+  isFeatureSupported(featureId: string): boolean {
+    // y: feature is fully available
+    // n: feature is unavailable
+    // a: feature is partially supported
+    // x: feature is prefixed
+    const criteria = [
+      'y',
+      'a',
+    ];
+
+    const data = feature(features[featureId]);
+
+    return !this._supportedBrowsers
+      .some(browser => {
+        const [agentId, version] = browser.split(' ');
+
+        const browserData = data.stats[agentId];
+        const featureStatus = (browserData && browserData[version]) as string | undefined;
+
+        // We are only interested in the first character
+        // Ex: when 'a #4 #5', we only need to check for 'a'
+        // as for such cases we should polyfill these features as needed
+        return !featureStatus || !criteria.includes(featureStatus.charAt(0));
+      });
+  }
 }
diff --git a/yarn.lock b/yarn.lock
index 51393155f1f7..2670c9a4277d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -300,10 +300,10 @@
   resolved "https://registry.yarnpkg.com/@types/browserslist/-/browserslist-4.4.0.tgz#e2a5f7f8c7e97afb39f50812a77e5230d3ca2353"
   integrity sha512-hrIjWSu7Hh96/rKlpChe58qHEwIZ0+F5Zf4QNdvSVP5LUXbaJM04g9tBjo702VTNqPZr5znEJeqNR3nAV3vJPg==
 
-"@types/caniuse-api@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/caniuse-api/-/caniuse-api-3.0.0.tgz#af31cc52062be0ab24583be072fd49b634dcc2fe"
-  integrity sha512-wT1VfnScjAftZsvLYaefu/UuwYJdYBwD2JDL2OQd01plGmuAoir5V6HnVHgrfh7zEwcasoiyO2wQ+W58sNh2sw==
+"@types/caniuse-lite@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/caniuse-lite/-/caniuse-lite-1.0.0.tgz#6506ed4b3f8d19def130d19419062960e86cc3bc"
+  integrity sha512-g28510gzJpFL0xqvuGAlI+dfIr3qvUcZQVFc7f7u2VlWVqI1oBkWhGLYh3fXfoflR7HRnU4w0NRux0pPJQ7VVg==
 
 "@types/caseless@*":
   version "0.12.1"
@@ -1871,20 +1871,10 @@ camelcase@^5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-api@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
-  integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==
-  dependencies:
-    browserslist "^4.0.0"
-    caniuse-lite "^1.0.0"
-    lodash.memoize "^4.1.2"
-    lodash.uniq "^4.5.0"
-
-caniuse-lite@^1.0.0:
-  version "1.0.30000955"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000955.tgz#360fdb9a1e41d6dd996130411334e44a39e4446d"
-  integrity sha512-6AwmIKgqCYfDWWadRkAuZSHMQP4Mmy96xAXEdRBlN/luQhlRYOKgwOlZ9plpCOsVbBuqbTmGqDK3JUM/nlr8CA==
+caniuse-lite@1.0.30000974:
+  version "1.0.30000974"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000974.tgz#b7afe14ee004e97ce6dc73e3f878290a12928ad8"
+  integrity sha512-xc3rkNS/Zc3CmpMKuczWEdY2sZgx09BkAxfvkxlAEBTqcMHeL8QnPqhKse+5sRTi3nrw2pJwToD2WvKn1Uhvww==
 
 caniuse-lite@^1.0.30000898:
   version "1.0.30000903"
@@ -5870,11 +5860,6 @@ lodash.get@^4.4.2:
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
   integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
 
-lodash.memoize@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
-
 lodash.tail@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
@@ -5895,11 +5880,6 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
-lodash.uniq@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
-  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
-
 lodash@^4.16.6, lodash@^4.17.11, lodash@^4.17.5:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"

From 8f3cacaff639dd7ab68832dcaeddfdea053685c2 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 11 Jun 2019 15:43:50 +0200
Subject: [PATCH 1458/1703] style: remove extra whitespaces for circleci config

---
 .circleci/config.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6b08b36cb158..ee9dbeebd80a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,7 +28,7 @@ anchor_1_win: &defaults_win
   resource_class: windows.medium
   shell: powershell.exe -ExecutionPolicy Bypass
   machine:
-    image: windows-server-2019  
+    image: windows-server-2019
 
 # After checkout, rebase on top of target branch.
 anchor_2: &post_checkout
@@ -37,8 +37,8 @@ anchor_2: &post_checkout
     command: >
       if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then
         # User is required for rebase.
-        git config user.name "angular-ci"	
-        git config user.email "angular-ci"      
+        git config user.name "angular-ci"
+        git config user.email "angular-ci"
         # Rebase PR on top of target branch.
         node tools/rebase-pr.js angular/angular-cli ${CIRCLE_PR_NUMBER}
       else
@@ -67,7 +67,7 @@ anchor_5: &env_win
     name: Setup windows node environment
     command: ./.circleci/windows-env.ps1
 anchor_6: &ignore_pull_requests
-  filters:  
+  filters:
     branches:
       ignore:
         - /pull\/.*/
@@ -228,9 +228,9 @@ jobs:
   # Docs: https://github.com/CircleCI-Public/windows-preview-docs
   test-win:
     <<: *defaults_win
-    # Skipping cache and workspace for now because it takes 10x longer than on linux. 
+    # Skipping cache and workspace for now because it takes 10x longer than on linux.
     # TODO: when/if CircleCI makes them faster, use cache and workspaces fully.
-    # Notes: 
+    # Notes:
     # - windows needs its own cache key because binaries in node_modules are different.
     # - windows might need its own workspace for the same reason.
     # - get cache dir on windows via `yarn cache dir` (was `C:\Users\circleci\AppData\Local\Yarn\Cache\v4` last time)
@@ -243,10 +243,10 @@ jobs:
       - run: yarn install --frozen-lockfile
       # Build and test should be on their own jobs, but restoring workspaces is too slow
       # so we do it here.
-      - run: yarn admin -- build  
-      - run: yarn test -- --full        
+      - run: yarn admin -- build
+      - run: yarn test -- --full
       # Run partial e2e suite on PRs only. Master will run the full e2e suite with sharding.
-      - run: if (Test-Path env:CIRCLE_PR_NUMBER) { node tests\legacy-cli\run_e2e.js "--glob=tests/{basic,ivy}/**" }            
+      - run: if (Test-Path env:CIRCLE_PR_NUMBER) { node tests\legacy-cli\run_e2e.js "--glob=tests/{basic,ivy}/**" }
              
   e2e-cli-win:
     <<: *defaults_win
@@ -259,8 +259,8 @@ jobs:
       - run: node --version
       - run: yarn --version
       - run: yarn install --frozen-lockfile
-      - run: yarn admin -- build  
-      - run: node tests\legacy-cli\run_e2e.js --nb-shards=$env:CIRCLE_NODE_TOTAL --shard=$env:CIRCLE_NODE_INDEX             
+      - run: yarn admin -- build
+      - run: node tests\legacy-cli\run_e2e.js --nb-shards=$env:CIRCLE_NODE_TOTAL --shard=$env:CIRCLE_NODE_INDEX
 
 workflows:
   version: 2

From fce849c7d6594672d7b6cb11072c261089fac1cc Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 11 Jun 2019 10:38:28 +0200
Subject: [PATCH 1459/1703] fix(@schematics/angular): remove `lint` target from
 minimal projects

Minimal projects are considered as throw-away projects and only a small subset of features are supported.

More context #13408 and #13354

Closes #14727
---
 packages/schematics/angular/application/index.ts  |  2 +-
 .../schematics/angular/application/index_spec.ts  | 15 ++++++++++++++-
 packages/schematics/angular/e2e/index_spec.ts     | 12 ------------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 4b4ac3f3e1c5..f7ff777a4b77 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -261,7 +261,7 @@ function addAppToWorkspaceFile(options: ApplicationOptions, appDir: string): Rul
           scripts: [],
         },
       },
-      lint: {
+      lint: options.minimal ? undefined : {
         builder: Builders.TsLint,
         options: {
           tsConfig: [
diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
index 65dd365c38cb..21cfed8d4752 100644
--- a/packages/schematics/angular/application/index_spec.ts
+++ b/packages/schematics/angular/application/index_spec.ts
@@ -174,7 +174,7 @@ describe('Application Schematic', () => {
     expect(karmaConf).toContain(`dir: require('path').join(__dirname, '../../coverage/foo')`);
   });
 
-  it('minimal=true should not create e2e and test targets', async () => {
+  it('minimal=true should not create e2e, lint and test targets', async () => {
     const options = { ...defaultOptions, minimal: true };
     const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
       .toPromise();
@@ -182,6 +182,7 @@ describe('Application Schematic', () => {
     const architect = config.projects.foo.architect;
     expect(architect.test).not.toBeDefined();
     expect(architect.e2e).not.toBeDefined();
+    expect(architect.e2e).not.toBeDefined();
   });
 
   it('should create correct files when using minimal', async () => {
@@ -271,6 +272,18 @@ describe('Application Schematic', () => {
       const packageJson = JSON.parse(tree.readContent('package.json'));
       expect(packageJson.devDependencies['@angular-devkit/build-angular']).toBeUndefined();
     });
+
+    it('should set the lint tsConfig option', async () => {
+      const tree = await schematicRunner.runSchematicAsync('application', defaultOptions, workspaceTree)
+        .toPromise();
+      const workspace = JSON.parse(tree.readContent('/angular.json'));
+      const lintOptions = workspace.projects.foo.architect.lint.options;
+      expect(lintOptions.tsConfig).toEqual([
+        'projects/foo/tsconfig.app.json',
+        'projects/foo/tsconfig.spec.json',
+        'projects/foo/e2e/tsconfig.json',
+      ]);
+    });
   });
 
   describe('custom projectRoot', () => {
diff --git a/packages/schematics/angular/e2e/index_spec.ts b/packages/schematics/angular/e2e/index_spec.ts
index 5e22f89b0e1d..5aca0f291985 100644
--- a/packages/schematics/angular/e2e/index_spec.ts
+++ b/packages/schematics/angular/e2e/index_spec.ts
@@ -98,17 +98,5 @@ describe('Application Schematic', () => {
       expect(e2eOptions.protractorConfig).toEqual('projects/foo/e2e/protractor.conf.js');
       expect(e2eOptions.devServerTarget).toEqual('foo:serve');
     });
-
-    it('should set the lint options', async () => {
-      const tree = await schematicRunner.runSchematicAsync('e2e', defaultOptions, applicationTree)
-        .toPromise();
-      const workspace = JSON.parse(tree.readContent('/angular.json'));
-      const lintOptions = workspace.projects.foo.architect.lint.options;
-      expect(lintOptions.tsConfig).toEqual([
-        'projects/foo/tsconfig.app.json',
-        'projects/foo/tsconfig.spec.json',
-        'projects/foo/e2e/tsconfig.json',
-      ]);
-    });
   });
 });

From dc117324acd20a34975ea0df8b8eed024deecf9e Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Thu, 23 May 2019 10:26:49 -0700
Subject: [PATCH 1460/1703] docs: differentiate lib build from app build

---
 packages/angular/cli/commands/build-long.md          | 12 ++++++++----
 .../build_ng_packagr/src/build/schema.json           |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/angular/cli/commands/build-long.md b/packages/angular/cli/commands/build-long.md
index 7913795c54b7..4e10498f4cd5 100644
--- a/packages/angular/cli/commands/build-long.md
+++ b/packages/angular/cli/commands/build-long.md
@@ -1,14 +1,18 @@
-Uses the [webpack](https://webpack.js.org/) build tool, with default configuration options specified in the workspace configuration file (`angular.json`) or with a named alternative configuration. 
-A "production" configuration is created by default when you use the CLI to create the project, and you can use that configuration by specifying the `--prod` option.
+The command can be used to build a project of type "application" or "library".
+When used to build a library, a different builder is invoked, and only the `ts-config`, `configuration`, and `watch` options are applied.
+All other options apply only to building applications.
+
+The application builder uses the [webpack](https://webpack.js.org/) build tool, with default configuration options specified in the workspace configuration file (`angular.json`) or with a named alternative configuration.
+A "production" configuration is created by default when you use the CLI to create the project, and you can use that configuration by specifying the `--configuration="production"` or the `--prod="true"` option.
 
 The configuration options generally correspond to the command options.
-You can override individual configuration defaults by specifying the corresponding options on the command line. 
+You can override individual configuration defaults by specifying the corresponding options on the command line.
 The command can accept option names given in either dash-case or camelCase.
 Note that in the configuration file, you must specify names in camelCase.
 
 Some additional options can only be set through the configuration file,
 either by direct editing or with the `ng config` command.
-These include `assets`, `styles`, and `scripts` objects that provide runtime-global resources to include in the project. 
+These include `assets`, `styles`, and `scripts` objects that provide runtime-global resources to include in the project.
 Resources in CSS, such as images and fonts, are automatically written and fingerprinted at the root of the output folder.
 
 For further details, see [Workspace Configuration](guide/workspace-config).
diff --git a/packages/angular_devkit/build_ng_packagr/src/build/schema.json b/packages/angular_devkit/build_ng_packagr/src/build/schema.json
index a7c8fb13061c..30d1551f1929 100644
--- a/packages/angular_devkit/build_ng_packagr/src/build/schema.json
+++ b/packages/angular_devkit/build_ng_packagr/src/build/schema.json
@@ -10,11 +10,11 @@
     },
     "tsConfig": {
       "type": "string",
-      "description": "The file path of the TypeScript configuration file."
+      "description": "The full path for the TypeScript configuration file, relative to the current workspace. Applies to both libraries and applications."
     },
     "watch": {
       "type": "boolean",
-      "description": "Run build when files change.",
+      "description": "Run build when files change. Applies to both libraries and applications.",
       "default": false
     }
   },

From 23553d12eba3648f4ff345cfde90225ae410571f Mon Sep 17 00:00:00 2001
From: Judy Bogart <jbogart@gmail.com>
Date: Mon, 3 Jun 2019 08:23:20 -0700
Subject: [PATCH 1461/1703] docs: remove ref to apps in ng_packagr doc

---
 .../angular_devkit/build_ng_packagr/src/build/schema.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/build_ng_packagr/src/build/schema.json b/packages/angular_devkit/build_ng_packagr/src/build/schema.json
index 30d1551f1929..a72def315064 100644
--- a/packages/angular_devkit/build_ng_packagr/src/build/schema.json
+++ b/packages/angular_devkit/build_ng_packagr/src/build/schema.json
@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "title": "ng-packagr Target",
-  "description": "ng-packagr target options for Build Architect.",
+  "description": "ng-packagr target options for Build Architect. Use to build library projects.",
   "type": "object",
   "properties": {
     "project": {
@@ -10,11 +10,11 @@
     },
     "tsConfig": {
       "type": "string",
-      "description": "The full path for the TypeScript configuration file, relative to the current workspace. Applies to both libraries and applications."
+      "description": "The full path for the TypeScript configuration file, relative to the current workspace."
     },
     "watch": {
       "type": "boolean",
-      "description": "Run build when files change. Applies to both libraries and applications.",
+      "description": "Run build when files change.",
       "default": false
     }
   },

From dea6bb317b30a36a1590d609c24863a5c323de8d Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 10 Jun 2019 21:24:32 -0400
Subject: [PATCH 1462/1703] fix(@angular/cli): only enable CLI 1.x update
 handling when no new config

Fixes #14703
---
 packages/angular/cli/commands/update-impl.ts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/angular/cli/commands/update-impl.ts b/packages/angular/cli/commands/update-impl.ts
index 17dddb3800fb..64d63baf812c 100644
--- a/packages/angular/cli/commands/update-impl.ts
+++ b/packages/angular/cli/commands/update-impl.ts
@@ -104,15 +104,18 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
     this.logger.info(`Using package manager: '${packageManager}'`);
 
     // Special handling for Angular CLI 1.x migrations
-    if (options.migrateOnly === undefined && options.from === undefined) {
-      if (!options.all && packages.length === 1 && packages[0].name === '@angular/cli') {
-        const oldConfigFilePath = findUp(oldConfigFileNames, process.cwd());
-        if (oldConfigFilePath) {
+    if (
+      options.migrateOnly === undefined &&
+      options.from === undefined &&
+      !options.all &&
+      packages.length === 1 &&
+      packages[0].name === '@angular/cli' &&
+      this.workspace.configFile &&
+      oldConfigFileNames.includes(this.workspace.configFile)
+    ) {
           options.migrateOnly = true;
           options.from = '1.0.0';
         }
-      }
-    }
 
     this.logger.info('Collecting installed dependencies...');
 

From 4024e8a742745deaf30fd34b7ef8e1e301be50cd Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 12 Jun 2019 09:01:32 +0200
Subject: [PATCH 1463/1703] refactor: update `compilerOptions` to NG
 `CompilerOptions`

---
 packages/ngtools/webpack/src/interfaces.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/ngtools/webpack/src/interfaces.ts b/packages/ngtools/webpack/src/interfaces.ts
index 606c336b38a4..a5bdd3b05a27 100644
--- a/packages/ngtools/webpack/src/interfaces.ts
+++ b/packages/ngtools/webpack/src/interfaces.ts
@@ -7,6 +7,7 @@
  */
 
 import { logging, virtualFs } from '@angular-devkit/core';
+import { CompilerOptions } from '@angular/compiler-cli';
 import * as fs from 'fs';
 import * as ts from 'typescript';
 
@@ -59,7 +60,7 @@ export interface AngularCompilerPluginOptions {
   contextElementDependencyConstructor?: ContextElementDependencyConstructor;
 
   // Use tsconfig to include path globs.
-  compilerOptions?: ts.CompilerOptions;
+  compilerOptions?: CompilerOptions;
 
   host?: virtualFs.Host<fs.Stats>;
   platformTransformers?: ts.TransformerFactory<ts.SourceFile>[];

From 32bae6dbd83649f09bfd90f34f3a46580f2ea9b8 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 12 Jun 2019 09:02:19 +0200
Subject: [PATCH 1464/1703] refactor: small refactor in AOT plugin file

---
 .../models/webpack-configs/typescript.ts            | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
index 9965a34c1f33..9660f0fe662a 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
@@ -49,9 +49,8 @@ function _pluginOptionsOverrides(
 
 function _createAotPlugin(
   wco: WebpackConfigOptions,
-  options: any,
-  useMain = true,
-  extract = false,
+  options: AngularCompilerPluginOptions,
+  i18nExtract = false,
 ) {
   const { root, buildOptions } = wco;
 
@@ -59,7 +58,7 @@ function _createAotPlugin(
     ? path.resolve(root, buildOptions.i18nFile)
     : undefined;
 
-  const i18nFileAndFormat = extract
+  const i18nFileAndFormat = i18nExtract
     ? {
       i18nOutFile: buildOptions.i18nFile,
       i18nOutFormat: buildOptions.i18nFormat,
@@ -79,7 +78,7 @@ function _createAotPlugin(
   }
 
   let pluginOptions: AngularCompilerPluginOptions = {
-    mainPath: useMain ? path.join(root, buildOptions.main) : undefined,
+    mainPath: path.join(root, buildOptions.main),
     ...i18nFileAndFormat,
     locale: buildOptions.i18nLocale,
     platform: buildOptions.platform === 'server' ? PLATFORM.Server : PLATFORM.Browser,
@@ -108,7 +107,7 @@ export function getNonAotConfig(wco: WebpackConfigOptions) {
   };
 }
 
-export function getAotConfig(wco: WebpackConfigOptions, extract = false) {
+export function getAotConfig(wco: WebpackConfigOptions, i18nExtract = false) {
   const { tsConfigPath, buildOptions } = wco;
 
   const loaders: any[] = [NgToolsLoader];
@@ -123,7 +122,7 @@ export function getAotConfig(wco: WebpackConfigOptions, extract = false) {
 
   return {
     module: { rules: [{ test, use: loaders }] },
-    plugins: [_createAotPlugin(wco, { tsConfigPath }, true, extract)]
+    plugins: [_createAotPlugin(wco, { tsConfigPath }, i18nExtract)]
   };
 }
 

From 4ad0fb73c325291999a87f968919df1f3c1d8a3c Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 12 Jun 2019 09:03:23 +0200
Subject: [PATCH 1465/1703] fix(@angular-devkit/build-angular): always disable
 `buildOptimizer` when extracting i18n

---
 packages/angular_devkit/build_angular/src/extract-i18n/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
index 1672ff9d47cb..93b6db07b017 100644
--- a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
@@ -72,6 +72,7 @@ async function execute(options: ExtractI18nBuilderOptions, context: BuilderConte
         scripts: false,
         styles: false,
       },
+      buildOptimizer: false,
       i18nLocale: options.i18nLocale,
       i18nFormat: options.i18nFormat,
       i18nFile: outFile,

From caeaa53e1ab2c1978484ab59d08f5ccf92f65f21 Mon Sep 17 00:00:00 2001
From: Ben Lesh <ben@benlesh.com>
Date: Wed, 12 Jun 2019 14:58:24 -0700
Subject: [PATCH 1466/1703] refactor: Add explict type to allow RxJS to be
 updated

While trying to sync RxJS into google3 an issue came up around the code in question, where TypeScript is unable to properly infer the type. Adding this explicit type resolves the issue.
---
 .../core/src/experimental/workspace/workspace.ts               | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/core/src/experimental/workspace/workspace.ts b/packages/angular_devkit/core/src/experimental/workspace/workspace.ts
index f19850544111..805938706e1a 100644
--- a/packages/angular_devkit/core/src/experimental/workspace/workspace.ts
+++ b/packages/angular_devkit/core/src/experimental/workspace/workspace.ts
@@ -17,6 +17,7 @@ import {
   parseJson,
   schema,
 } from '../../json';
+import { SchemaValidatorResult } from '../../json/schema/interface';
 import {
   Path,
   basename,
@@ -342,7 +343,7 @@ export class Workspace {
 
     return this._registry.compile(schemaJson).pipe(
       concatMap(validator => validator(contentJsonCopy)),
-      concatMap(validatorResult => {
+      concatMap((validatorResult: SchemaValidatorResult) => {
         if (validatorResult.success) {
           return of(contentJsonCopy as T);
         } else {

From 3d25d4cb1bce1ede2f2208dbb309a57e58a51d56 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 12 Jun 2019 19:29:09 +0000
Subject: [PATCH 1467/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 9214327db6aa..35b4aba3d040 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#e81d99aed4a8cd827d2a480f6bf07545278987fe",
-    "@angular/common": "github:angular/common-builds#9c0a44d3ef4616f4cff9de43e21603aca1806d4d",
-    "@angular/compiler": "github:angular/compiler-builds#a089a36f26abb71a9fe8a86a96658c1b93adcae8",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#8bc2255ca2824311a1be50bde4ce402a50c84ed5",
-    "@angular/core": "github:angular/core-builds#3390fbfe87bdbe3423814caf5f79d4c28b820de5",
-    "@angular/forms": "github:angular/forms-builds#549eab1d1acdcec41a1c833ce51410c0648952ac",
-    "@angular/language-service": "github:angular/language-service-builds#6021060be11be7e168155ff53b24fc09b7ac02de",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#fe5bbc69bee7b06988f2c17b7819801efa9531e5",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#6357f6008a0a961d90e6c437e7171e80fbb357d3",
-    "@angular/router": "github:angular/router-builds#d4078629e5720ed53338726260260da81d7bb859"
+    "@angular/animations": "github:angular/animations-builds#74dbafe9f20965f7738f4ba9e9ac1c1d824bd9ad",
+    "@angular/common": "github:angular/common-builds#ca23631aae3ded3946dc39ee094749af00796197",
+    "@angular/compiler": "github:angular/compiler-builds#6b76ef7f6a079aa8380c1089651e3af9b07262fe",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#3509f67d6acabf635f1d2b2d2abd79abb563cbad",
+    "@angular/core": "github:angular/core-builds#79eb28650422f8fb46f4e2ab98c6bde23a192605",
+    "@angular/forms": "github:angular/forms-builds#79d7c5ea475d794659042e0745819a166fed1885",
+    "@angular/language-service": "github:angular/language-service-builds#e5cf15995e8da7308d635c5d66d1f853e676f139",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#d20cd651c9561c0ded9558cd90766768e4eefda0",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#5fd53fa06f4b40503e8221a1eb762c53e11b2849",
+    "@angular/router": "github:angular/router-builds#81b30520137a1b297db1a82518468144298dda32"
   }
 }
\ No newline at end of file

From 0e339ee56051d7c625ea9d8da2fb5049d3a246e8 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 12 Jun 2019 13:52:57 -0400
Subject: [PATCH 1468/1703] fix(@ngtools/webpack): implement
 getModifiedResourceFiles for Ivy AOT

This method enables the Ivy incremental compiler to track changes to resource files and their requisites.
---
 packages/ngtools/webpack/src/compiler_host.ts | 22 +++++++++++++++++++
 .../ngtools/webpack/src/resource_loader.ts    | 13 +++++++++++
 2 files changed, 35 insertions(+)

diff --git a/packages/ngtools/webpack/src/compiler_host.ts b/packages/ngtools/webpack/src/compiler_host.ts
index 47b069391984..331d388f9b3c 100644
--- a/packages/ngtools/webpack/src/compiler_host.ts
+++ b/packages/ngtools/webpack/src/compiler_host.ts
@@ -32,6 +32,7 @@ export class WebpackCompilerHost implements ts.CompilerHost {
   private _syncHost: virtualFs.SyncDelegateHost;
   private _memoryHost: virtualFs.SyncDelegateHost;
   private _changedFiles = new Set<string>();
+  private _readResourceFiles = new Set<string>();
   private _basePath: Path;
   private _resourceLoader?: WebpackResourceLoader;
   private _sourceFileCache = new Map<string, ts.SourceFile>();
@@ -341,6 +342,8 @@ export class WebpackCompilerHost implements ts.CompilerHost {
   }
 
   readResource(fileName: string) {
+    this._readResourceFiles.add(fileName);
+
     if (this.directTemplateLoading &&
         (fileName.endsWith('.html') || fileName.endsWith('.svg'))) {
       return this.readFile(fileName);
@@ -356,6 +359,25 @@ export class WebpackCompilerHost implements ts.CompilerHost {
     }
   }
 
+  getModifiedResourceFiles(): Set<string> {
+    const modifiedFiles = new Set<string>();
+
+    for (const changedFile of this._changedFiles) {
+      if (this._readResourceFiles.has(changedFile)) {
+        modifiedFiles.add(changedFile);
+      }
+
+      if (!this._resourceLoader) {
+        continue;
+      }
+      for (const resourcePath of this._resourceLoader.getAffectedResources(changedFile)) {
+          modifiedFiles.add(resourcePath);
+      }
+    }
+
+    return modifiedFiles;
+  }
+
   trace(message: string) {
     console.log(message);
   }
diff --git a/packages/ngtools/webpack/src/resource_loader.ts b/packages/ngtools/webpack/src/resource_loader.ts
index 0497102da31c..75d9a68db70d 100644
--- a/packages/ngtools/webpack/src/resource_loader.ts
+++ b/packages/ngtools/webpack/src/resource_loader.ts
@@ -27,6 +27,7 @@ export class WebpackResourceLoader {
   private _parentCompilation: any;
   private _context: string;
   private _fileDependencies = new Map<string, string[]>();
+  private _reverseDependencies = new Map<string, string[]>();
   private _cachedSources = new Map<string, string>();
   private _cachedEvaluatedSources = new Map<string, RawSource>();
 
@@ -41,6 +42,10 @@ export class WebpackResourceLoader {
     return this._fileDependencies.get(filePath) || [];
   }
 
+  getAffectedResources(file: string) {
+    return this._reverseDependencies.get(file) || [];
+  }
+
   private _compile(filePath: string): Promise<CompilationOutput> {
 
     if (!this._parentCompilation) {
@@ -117,6 +122,14 @@ export class WebpackResourceLoader {
 
           // Save the dependencies for this resource.
           this._fileDependencies.set(filePath, childCompilation.fileDependencies);
+          for (const file of childCompilation.fileDependencies) {
+            const entry = this._reverseDependencies.get(file);
+            if (entry) {
+              entry.push(filePath);
+            } else {
+              this._reverseDependencies.set(file, [filePath]);
+            }
+          }
 
           const compilationHash = childCompilation.fullHash;
           const maybeSource = this._cachedSources.get(compilationHash);

From ebbfbd6ef9253a332798a93f2f499bc8df95bf4f Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 13 Jun 2019 05:18:32 +0000
Subject: [PATCH 1469/1703] build: update webpack to version 4.34.0

---
 .../angular_devkit/build_angular/package.json     |  2 +-
 .../angular_devkit/build_webpack/package.json     |  2 +-
 packages/ngtools/webpack/package.json             |  2 +-
 yarn.lock                                         | 15 +++++----------
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index fa6a188b578a..ab78decfcdc8 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -48,7 +48,7 @@
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.3.0",
-    "webpack": "4.33.0",
+    "webpack": "4.34.0",
     "webpack-dev-middleware": "3.7.0",
     "webpack-dev-server": "3.4.1",
     "webpack-merge": "4.2.1",
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index 62dad0e90c0e..960c4b6f7adb 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -17,7 +17,7 @@
     "webpack-dev-server": "^3.1.4"
   },
   "devDependencies": {
-    "webpack": "4.33.0",
+    "webpack": "4.34.0",
     "webpack-dev-server": "^3.1.4"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 582d16bbaad8..3f47e1767d8c 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -36,6 +36,6 @@
     "@angular/compiler": "~8.1.0-next.1",
     "@angular/compiler-cli": "~8.1.0-next.1",
     "typescript": "3.4.5",
-    "webpack": "4.33.0"
+    "webpack": "4.34.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 2670c9a4277d..e073fa58d4f2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1871,7 +1871,7 @@ camelcase@^5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@1.0.30000974:
+caniuse-lite@1.0.30000974, caniuse-lite@^1.0.30000974:
   version "1.0.30000974"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000974.tgz#b7afe14ee004e97ce6dc73e3f878290a12928ad8"
   integrity sha512-xc3rkNS/Zc3CmpMKuczWEdY2sZgx09BkAxfvkxlAEBTqcMHeL8QnPqhKse+5sRTi3nrw2pJwToD2WvKn1Uhvww==
@@ -1891,11 +1891,6 @@ caniuse-lite@^1.0.30000971:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000971.tgz#d1000e4546486a6977756547352bc96a4cfd2b13"
   integrity sha512-TQFYFhRS0O5rdsmSbF1Wn+16latXYsQJat66f7S7lizXW1PVpWJeZw9wqqVLIjuxDRz7s7xRUj13QCfd8hKn6g==
 
-caniuse-lite@^1.0.30000974:
-  version "1.0.30000974"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000974.tgz#b7afe14ee004e97ce6dc73e3f878290a12928ad8"
-  integrity sha512-xc3rkNS/Zc3CmpMKuczWEdY2sZgx09BkAxfvkxlAEBTqcMHeL8QnPqhKse+5sRTi3nrw2pJwToD2WvKn1Uhvww==
-
 canonical-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
@@ -10218,10 +10213,10 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.33.0:
-  version "4.33.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.33.0.tgz#c30fc4307db432e5c5e3333aaa7c16a15a3b277e"
-  integrity sha512-ggWMb0B2QUuYso6FPZKUohOgfm+Z0sVFs8WwWuSH1IAvkWs428VDNmOlAxvHGTB9Dm/qOB/qtE5cRx5y01clxw==
+webpack@4.34.0:
+  version "4.34.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.34.0.tgz#a4c30129482f7b4ece4c0842002dedf2b56fab58"
+  integrity sha512-ry2IQy1wJjOefLe1uJLzn5tG/DdIKzQqNlIAd2L84kcaADqNvQDTBlo8UcCNyDaT5FiaB+16jhAkb63YeG3H8Q==
   dependencies:
     "@webassemblyjs/ast" "1.8.5"
     "@webassemblyjs/helper-module-context" "1.8.5"

From abd2f9744f525c4db2292e5b8a2a0ce8dbba1094 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 13 Jun 2019 10:49:45 -0400
Subject: [PATCH 1470/1703] fix(@schematics/update): remove update all
 suggestion message

The language within the message specifies that update all will _try_ to update all the packages.  In practice and especially for larger projects, this operation will mostly likely not succeed.  This can lead to the users attempting to use the all option with the force option which has a decent probability to break the project via incorrect peer dependency installation or other incompability version increases (packages that don't follow semver, for instance).

Reference: https://github.com/angular/angular-cli/issues/14561#issuecomment-498817825
---
 packages/schematics/update/update/index.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/schematics/update/update/index.ts b/packages/schematics/update/update/index.ts
index 5418c797c564..6d84a9175c8f 100644
--- a/packages/schematics/update/update/index.ts
+++ b/packages/schematics/update/update/index.ts
@@ -508,10 +508,6 @@ function _usageMessage(
     logger.info('  ' + fields.map((x, i) => x.padEnd(pads[i])).join(''));
   });
 
-  logger.info('\n');
-  logger.info('There might be additional packages that are outdated.');
-  logger.info('Run "ng update --all" to try to update all at the same time.\n');
-
   return of<void>(undefined);
 }
 

From 4e45e9948642cf779e3f5f228a8bb444a3dfdd22 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Thu, 13 Jun 2019 16:03:12 -0700
Subject: [PATCH 1471/1703] release: v8.1.0-beta.0

---
 packages/schematics/angular/utility/latest-versions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index b8cd44a6a471..fd95bf73e06d 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -8,7 +8,7 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~8.1.0-next.1',
+  Angular: '~8.1.0-next.2',
   RxJs: '~6.4.0',
   ZoneJs: '~0.9.1',
   TypeScript: '~3.4.3',

From 16df11ba28fbd2bc02ac224afbe652df6013ad26 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Thu, 13 Jun 2019 16:07:00 -0700
Subject: [PATCH 1472/1703] release: v8.1.0-beta.1

---
 packages/schematics/angular/utility/latest-versions.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index fd95bf73e06d..3975960b6cec 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -14,9 +14,9 @@ export const latestVersions = {
   TypeScript: '~3.4.3',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.800.0',
-  DevkitBuildNgPackagr: '~0.800.0',
-  DevkitBuildWebpack: '~0.800.0',
+  DevkitBuildAngular: '~0.801.0-beta.1',
+  DevkitBuildNgPackagr: '~0.801.0-beta.1',
+  DevkitBuildWebpack: '~0.801.0-beta.1',
 
   tsickle: '^0.35.0',
   ngPackagr: '^5.1.0',

From 64243919c10c33775be71010efd5ae69622a728f Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Thu, 13 Jun 2019 16:09:36 -0700
Subject: [PATCH 1473/1703] release: v8.1.0-beta.2

---
 packages/schematics/angular/utility/latest-versions.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 3975960b6cec..c6d1dfdd49d9 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -14,9 +14,9 @@ export const latestVersions = {
   TypeScript: '~3.4.3',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.801.0-beta.1',
-  DevkitBuildNgPackagr: '~0.801.0-beta.1',
-  DevkitBuildWebpack: '~0.801.0-beta.1',
+  DevkitBuildAngular: '~0.801.0-beta.2',
+  DevkitBuildNgPackagr: '~0.801.0-beta.2',
+  DevkitBuildWebpack: '~0.801.0-beta.2',
 
   tsickle: '^0.35.0',
   ngPackagr: '^5.1.0',

From d7a0a69f03931594742aedd33162759a1ca8bf68 Mon Sep 17 00:00:00 2001
From: istiti <elvis_203@msn.com>
Date: Tue, 4 Jun 2019 16:48:03 +0200
Subject: [PATCH 1474/1703] feat(@angular-devkit/build-angular): move
 milliseconds time audit at the end of console
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In a project with a lot of lazy modules we need scroll console window to see Date - Hash - Time audit message.

This PR should keep Date - Hash - Time at the end on first `ng s` or `ng b` to see if first build just happend or not. On rebuild only Time is at the end which is most valuable

Before:
```
$ ng s
Date: 2019-06-04T14:41:49.775Z
Hash: 998791a06c755186a7dc
Time: 37700ms
chunk {0} 0.205d3a05f39f54abaf98.js () 26.3 kB  [rendered]
chunk {1} 1.78ebb349f1f621ecc6dd.js () 85.3 kB  [rendered]
chunk {2} 2.6999dce3fa088a3aa465.js () 33.9 kB  [rendered]
chunk {3} 3.5532acdb300ef6741a51.js () 49.2 kB  [rendered]
chunk {4} 4.2add4f56d22ab59d79c6.js () 56.9 kB  [rendered]
...
chunk {137} 137.a15fd611c1c4b96d409a.js () 3.26 kB  [rendered]
chunk {138} 138.c9e103d1056bb9d070e3.js () 2.94 kB  [rendered]
chunk {139} 139.455c4ac2d85c520f1254.js () 3.17 kB  [rendered]
chunk {140} 140.4ca3e4f5eccec58809be.js () 4.29 kB  [rendered]
chunk {141} 141.c27def44603508d8df52.js () 2.37 kB  [rendered]
chunk {common} common.b74eca2038a9b1b5f3e4.js (common) 39.7 kB  [rendered]
chunk {main} main.db063f94924f162703a2.js (main) 163 kB [initial] [rendered]
chunk {polyfills} polyfills.4ac5e2c02b432e50dfda.js (polyfills) 295 kB [initial] [rendered]
chunk {polyfills-es5} polyfills-es5.5468c4e590607eea5bd4.js (polyfills-es5) 462 kB [initial] [rendered]
chunk {runtime} runtime.7381db3f14ba80dfec8f.js (runtime) 12.7 kB [entry] [rendered]
chunk {scripts} scripts.9a46a0e28dae0f11bffb.js (scripts) 20.3 kB [entry] [rendered]
chunk {styles} styles.e8c91b6de63cbd1ef1be.js (styles) 624 kB [initial] [rendered]
chunk {vendor} vendor.eccdafeabbb649d68877.js (vendor) 4.77 MB [initial] [rendered]
** Angular Live Development Server is listening on 0.0.0.0:80, open your browser on http://localhost:80/ **
i ｢wdm｣: Compiled successfully.
i ｢wdm｣: Compiling...

Date: 2019-06-04T14:41:54.313Z - Hash: 41c1ac04e7ee47d1f385 - Time: 1463ms
148 unchanged chunks
chunk {64} 64.ca3cef05dbfd71b73683.js () 36.2 kB  [rendered]
chunk {runtime} runtime.629babcdb3b730464fa1.js (runtime) 12.7 kB [entry] [rendered]
i ｢wdm｣: Compiled successfully.
```

After:
```
$ ng serve
chunk {0} 0.205d3a05f39f54abaf98.js () 26.3 kB  [rendered]
chunk {1} 1.78ebb349f1f621ecc6dd.js () 85.3 kB  [rendered]
chunk {2} 2.6999dce3fa088a3aa465.js () 33.9 kB  [rendered]
chunk {3} 3.5532acdb300ef6741a51.js () 49.2 kB  [rendered]
chunk {4} 4.2add4f56d22ab59d79c6.js () 56.9 kB  [rendered]
...
chunk {137} 137.a15fd611c1c4b96d409a.js () 3.26 kB  [rendered]
chunk {138} 138.c9e103d1056bb9d070e3.js () 2.94 kB  [rendered]
chunk {139} 139.455c4ac2d85c520f1254.js () 3.17 kB  [rendered]
chunk {140} 140.4ca3e4f5eccec58809be.js () 4.29 kB  [rendered]
chunk {141} 141.c27def44603508d8df52.js () 2.37 kB  [rendered]
chunk {common} common.b74eca2038a9b1b5f3e4.js (common) 39.7 kB  [rendered]
chunk {main} main.db063f94924f162703a2.js (main) 163 kB [initial] [rendered]
chunk {polyfills} polyfills.4ac5e2c02b432e50dfda.js (polyfills) 295 kB [initial] [rendered]
chunk {polyfills-es5} polyfills-es5.5468c4e590607eea5bd4.js (polyfills-es5) 462 kB [initial] [rendered]
chunk {runtime} runtime.b9d205421cbb4e61db70.js (runtime) 12.7 kB [entry] [rendered]
chunk {scripts} scripts.9a46a0e28dae0f11bffb.js (scripts) 20.3 kB [entry] [rendered]
chunk {styles} styles.e8c91b6de63cbd1ef1be.js (styles) 624 kB [initial] [rendered]
chunk {vendor} vendor.eccdafeabbb649d68877.js (vendor) 4.77 MB [initial] [rendered]
Date: 2019-06-04T14:14:33.560Z - Hash: 1690109f67cb887a6d5d - Time: 34676ms
** Angular Live Development Server is listening on 0.0.0.0:80, open your browser on http://localhost:80/ **
i ｢wdm｣: Compiled successfully.
i ｢wdm｣: Compiling...

Date: 2019-06-04T14:14:53.336Z - Hash: 998791a06c755186a7dc
148 unchanged chunks
chunk {64} 64.0bf728d7fbcbba217b53.js () 36.2 kB  [rendered]
chunk {runtime} runtime.7381db3f14ba80dfec8f.js (runtime) 12.7 kB [entry] [rendered]
Time: 1411ms
i ｢wdm｣: Compiled successfully.
```
---
 .../build_angular/src/angular-cli-files/utilities/stats.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/stats.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/stats.ts
index 3a355b132444..296b4f16b34f 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/stats.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/stats.ts
@@ -50,16 +50,15 @@ export function statsToString(json: any, statsConfig: any) {
 
   if (unchangedChunkNumber > 0) {
     return '\n' + rs(tags.stripIndents`
-      Date: ${w(new Date().toISOString())} - Hash: ${w(json.hash)} - Time: ${w('' + json.time)}ms
+      Date: ${w(new Date().toISOString())} - Hash: ${w(json.hash)}
       ${unchangedChunkNumber} unchanged chunks
       ${changedChunksStats.join('\n')}
+      Time: ${w('' + json.time)}ms
       `);
   } else {
     return '\n' + rs(tags.stripIndents`
-      Date: ${w(new Date().toISOString())}
-      Hash: ${w(json.hash)}
-      Time: ${w('' + json.time)}ms
       ${changedChunksStats.join('\n')}
+      Date: ${w(new Date().toISOString())} - Hash: ${w(json.hash)} - Time: ${w('' + json.time)}ms
       `);
   }
 }

From 9431d551282b43b302c2efd203d2068bcd6b2576 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 14 Jun 2019 12:45:09 +0200
Subject: [PATCH 1475/1703] fix(@ngtools/webpack): avoid re-running full emit
 when there wasn't a an emit

There can be a number of reason why `_emitSkipped` is set to true these are:
- Errors have been encountered
- Changes are outside of TS compilations such as HTML and CSS in JIT mode

We only want to run a full JIT emit when;
- There hasn't been a success emit
- When a large number of files have changed
- First run

If a subsequent JIT build fails we shouldn't do a full emit either as we will transpile only the files that changes after the success build

https://github.com/angular/angular-cli/blob/64243919c10c33775be71010efd5ae69622a728f/packages/ngtools/webpack/src/angular_compiler_plugin.ts#L1029-L1031

Fixes #14775
---
 packages/ngtools/webpack/src/angular_compiler_plugin.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index bdf21596e97b..72c46ffa7da3 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -107,6 +107,9 @@ export class AngularCompilerPlugin {
   private _platform: PLATFORM;
   private _JitMode = false;
   private _emitSkipped = true;
+  // This is needed because if the first build fails we need to do a full emit
+  // even whe only a single file gets updated.
+  private _hadFullJitEmit: boolean | undefined;
   private _changedFileExtensions = new Set(['ts', 'tsx', 'html', 'css', 'js', 'json']);
 
   // Webpack plugin.
@@ -1196,7 +1199,7 @@ export class AngularCompilerPlugin {
           'AngularCompilerPlugin._emit.ts', diagMode));
 
         if (!hasErrors(allDiagnostics)) {
-          if (this._firstRun || changedTsFiles.size > 20 || this._emitSkipped) {
+          if (this._firstRun || changedTsFiles.size > 20 || !this._hadFullJitEmit) {
             emitResult = tsProgram.emit(
               undefined,
               undefined,
@@ -1204,6 +1207,7 @@ export class AngularCompilerPlugin {
               undefined,
               { before: this._transformers },
             );
+            this._hadFullJitEmit = !emitResult.emitSkipped;
             allDiagnostics.push(...emitResult.diagnostics);
           } else {
             for (const changedFile of changedTsFiles) {

From be210778f4f3f75639554846f7297b48ba382987 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Fri, 14 Jun 2019 08:20:31 +0200
Subject: [PATCH 1476/1703] fix(@angular-devkit/build-angular): emit warning
 when using extract-i18n in Ivy

i18n is not yet implemented in Ivy, we should emit a warning stating this and exit gracefully.

This also swaps the readTsConfig logic to use `@angular/compiler-cli` instead of `typescript`. This is needed because when parsing the tsconfig, typescript is not aware of `angularCompilerOptions` and will not merged them if they are at un upper level tsconfig file when using `extends`.

Closes #14225
---
 .../angular_devkit/build_angular/package.json |  1 +
 .../angular-cli-files/models/build-options.ts |  5 +--
 .../utilities/read-tsconfig.ts                | 35 +++++++++++--------
 .../build_angular/src/browser/index.ts        |  4 +--
 .../build_angular/src/extract-i18n/index.ts   | 10 ++++++
 5 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index ab78decfcdc8..df496f12b8ff 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -86,6 +86,7 @@
     "zone.js": "^0.9.1"
   },
   "peerDependencies": {
+    "@angular/compiler-cli": ">=8.0.0-beta.0 < 9.0.0",
     "typescript": ">=3.1 < 3.5"
   }
 }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
index 46de94ad5e06..c35b6a1cad73 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
@@ -9,7 +9,8 @@
 // TODO: cleanup this file, it's copied as is from Angular CLI.
 
 import { logging } from '@angular-devkit/core';
-import { ParsedCommandLine, ScriptTarget } from 'typescript';
+import { ParsedConfiguration } from '@angular/compiler-cli';
+import { ScriptTarget } from 'typescript';
 import {
   AssetPatternClass,
   Budget,
@@ -93,7 +94,7 @@ export interface WebpackConfigOptions<T = BuildOptions> {
   projectRoot: string;
   sourceRoot?: string;
   buildOptions: T;
-  tsConfig: ParsedCommandLine;
+  tsConfig: ParsedConfiguration;
   tsConfigPath: string;
   supportES2015: boolean;
 }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/read-tsconfig.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/read-tsconfig.ts
index 0ac120536ed7..9d58349af889 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/read-tsconfig.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/read-tsconfig.ts
@@ -5,23 +5,30 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// TODO: cleanup this file, it's copied as is from Angular CLI.
+
+import { ParsedConfiguration } from '@angular/compiler-cli';
 import * as path from 'path';
 
-export function readTsconfig(tsconfigPath: string) {
-  // build-angular has a peer dependency on typescript
-  const projectTs = require('typescript') as typeof import('typescript');
-  const configResult = projectTs.readConfigFile(tsconfigPath, projectTs.sys.readFile);
-  const tsConfig = projectTs.parseJsonConfigFileContent(configResult.config, projectTs.sys,
-    path.dirname(tsconfigPath), undefined, tsconfigPath);
+/**
+ * Reads and parses a given TsConfig file.
+ *
+ * @param tsconfigPath - An absolute or relative path from 'workspaceRoot' of the tsconfig file.
+ * @param workspaceRoot - workspaceRoot root location when provided
+ * it will resolve 'tsconfigPath' from this path.
+ */
+export function readTsconfig(tsconfigPath: string, workspaceRoot?: string): ParsedConfiguration {
+  const tsConfigFullPath = workspaceRoot
+    ? path.resolve(workspaceRoot, tsconfigPath)
+    : tsconfigPath;
+
+  // We use 'ng' instead of 'ts' here because 'ts' is not aware of 'angularCompilerOptions'
+  // and will not merged them if they are at un upper level tsconfig file when using `extends`.
+  const ng: typeof import('@angular/compiler-cli') = require('@angular/compiler-cli');
 
-  if (tsConfig.errors.length > 0) {
-    throw new Error(
-      `Errors found while reading ${tsconfigPath}:\n  ${
-        tsConfig.errors.map(e => e.messageText).join('\n  ')
-      }`,
-    );
+  const configResult = ng.readConfiguration(tsConfigFullPath);
+  if (configResult.errors && configResult.errors.length) {
+    throw new Error(ng.formatDiagnostics(configResult.errors));
   }
 
-  return tsConfig;
+  return configResult;
 }
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 76bb388e6295..5e01a8c51b20 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -199,9 +199,7 @@ export function buildWebpackBrowser(
         normalize(workspace.getProject(projectName).root),
       );
 
-      const tsConfigPath = path.resolve(getSystemPath(workspace.root), options.tsConfig);
-      const tsConfig = readTsconfig(tsConfigPath);
-
+      const tsConfig = readTsconfig(options.tsConfig, context.workspaceRoot);
       const target = tsConfig.options.target || ScriptTarget.ES5;
       const buildBrowserFeatures = new BuildBrowserFeatures(
         getSystemPath(projectRoot),
diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
index 93b6db07b017..70b80c95034b 100644
--- a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
@@ -20,6 +20,7 @@ import {
   getStatsConfig,
   getStylesConfig,
 } from '../angular-cli-files/models/webpack-configs';
+import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
 import { statsErrorsToString, statsWarningsToString } from '../angular-cli-files/utilities/stats';
 import { Schema as BrowserBuilderOptions } from '../browser/schema';
 import { Version } from '../utils/version';
@@ -58,6 +59,15 @@ async function execute(options: ExtractI18nBuilderOptions, context: BuilderConte
     await context.getBuilderNameForTarget(browserTarget),
   );
 
+  // FIXME: i18n is not yet implemented in Ivy
+  // We should display a warning and exit gracefully.
+  const { options: compilerOptions } = readTsconfig(browserOptions.tsConfig, context.workspaceRoot);
+  if (compilerOptions.enableIvy) {
+    context.logger.warn('We are sorry but i18n is not yet implemented in Ivy.');
+
+    return { success: true };
+  }
+
   // We need to determine the outFile name so that AngularCompiler can retrieve it.
   let outFile = options.outFile || getI18nOutfile(options.i18nFormat);
   if (options.outputPath) {

From e6feb0d0dbeb7b740d178b83b5d1d7f2d6795892 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 13 Jun 2019 14:18:46 -0400
Subject: [PATCH 1477/1703] fix(@angular/cli): ensure analytics prompt
 exceptions are caught

Fixes #14684
---
 .../cli/bin/postinstall/analytics-prompt.js        | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/angular/cli/bin/postinstall/analytics-prompt.js b/packages/angular/cli/bin/postinstall/analytics-prompt.js
index 4a9ee574af32..c1641478d649 100644
--- a/packages/angular/cli/bin/postinstall/analytics-prompt.js
+++ b/packages/angular/cli/bin/postinstall/analytics-prompt.js
@@ -5,10 +5,12 @@ if ('NG_CLI_ANALYTICS' in process.env) {
   return;
 }
 
-try {
-  const analytics = require('../../models/analytics');
+(async () => {
+  try {
+    const analytics = require('../../models/analytics');
 
-  if (!analytics.hasGlobalAnalyticsConfiguration()) {
-    analytics.promptGlobalAnalytics();
-  }
-} catch (_) {}
+    if (!analytics.hasGlobalAnalyticsConfiguration()) {
+      await analytics.promptGlobalAnalytics();
+    }
+  } catch (_) {}
+})();

From 7e537c133109aed72a9d723a7ab4a65b505ec86d Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 14 Jun 2019 22:25:32 +0000
Subject: [PATCH 1478/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 35b4aba3d040..302f2bdd0d78 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#74dbafe9f20965f7738f4ba9e9ac1c1d824bd9ad",
-    "@angular/common": "github:angular/common-builds#ca23631aae3ded3946dc39ee094749af00796197",
-    "@angular/compiler": "github:angular/compiler-builds#6b76ef7f6a079aa8380c1089651e3af9b07262fe",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#3509f67d6acabf635f1d2b2d2abd79abb563cbad",
-    "@angular/core": "github:angular/core-builds#79eb28650422f8fb46f4e2ab98c6bde23a192605",
-    "@angular/forms": "github:angular/forms-builds#79d7c5ea475d794659042e0745819a166fed1885",
-    "@angular/language-service": "github:angular/language-service-builds#e5cf15995e8da7308d635c5d66d1f853e676f139",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#d20cd651c9561c0ded9558cd90766768e4eefda0",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#5fd53fa06f4b40503e8221a1eb762c53e11b2849",
-    "@angular/router": "github:angular/router-builds#81b30520137a1b297db1a82518468144298dda32"
+    "@angular/animations": "github:angular/animations-builds#44788d819d5d9701a07e80d736cfe3d5834db340",
+    "@angular/common": "github:angular/common-builds#c840831b2a79bc8c4abbe0f5a4444f176df2beb1",
+    "@angular/compiler": "github:angular/compiler-builds#825c2e4adbf3d6a9b53ac4f1e099f2bd63a5c67c",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#19fdb03cd203f63f813c5a6ef9537811f652d7dd",
+    "@angular/core": "github:angular/core-builds#9e9afc5e3d5d380cd1c39f25a5cc415906faa93c",
+    "@angular/forms": "github:angular/forms-builds#972e26919475a71c39b914de1cc098fc5512b47d",
+    "@angular/language-service": "github:angular/language-service-builds#16d4ffec9d5280ef7dfed323820d4da755195f8b",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#9e4f1181093b74e5043749ccf60b1db732f42121",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#1eb402687a5ab9f58a655686b6912b55b6af62f2",
+    "@angular/router": "github:angular/router-builds#dae3e105a01138a647e205b962b4f28dc46757c1"
   }
 }
\ No newline at end of file

From 780ef797e1c5e4f817ed32ebdf32dc85dd8b6dd3 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 15 Jun 2019 12:00:37 +0000
Subject: [PATCH 1479/1703] build: update core-js to version 3.1.4

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index df496f12b8ff..dae59b317141 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -19,7 +19,7 @@
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.3",
-    "core-js": "3.1.3",
+    "core-js": "3.1.4",
     "file-loader": "4.0.0",
     "glob": "7.1.4",
     "istanbul-instrumenter-loader": "3.0.1",
diff --git a/yarn.lock b/yarn.lock
index e073fa58d4f2..9dc4eeea1ddb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2610,10 +2610,10 @@ copy-webpack-plugin@5.0.3:
     serialize-javascript "^1.7.0"
     webpack-log "^2.0.0"
 
-core-js@3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.3.tgz#95700bca5f248f5f78c0ec63e784eca663ec4138"
-  integrity sha512-PWZ+ZfuaKf178BIAg+CRsljwjIMRV8MY00CbZczkR6Zk5LfkSkjGoaab3+bqRQWVITNZxQB7TFYz+CFcyuamvA==
+core-js@3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.4.tgz#3a2837fc48e582e1ae25907afcd6cf03b0cc7a07"
+  integrity sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ==
 
 core-js@^2.2.0, core-js@^2.4.0:
   version "2.5.7"

From 555668c987f6f56642c41cc227d0d0150fea6663 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Mon, 17 Jun 2019 13:20:11 +0200
Subject: [PATCH 1480/1703] feat(@schematics/angular): add
 `fullTemplateTypeCheck` and `strictInjectionParameters` to workspace
 tsconfig.json

Closes #14794
---
 .../schematics/angular/workspace/files/tsconfig.json.template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/schematics/angular/workspace/files/tsconfig.json.template b/packages/schematics/angular/workspace/files/tsconfig.json.template
index a4df54fff629..30956ae7ea26 100644
--- a/packages/schematics/angular/workspace/files/tsconfig.json.template
+++ b/packages/schematics/angular/workspace/files/tsconfig.json.template
@@ -18,5 +18,9 @@
       "es2018",
       "dom"
     ]
+  },
+  "angularCompilerOptions": {
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true
   }
 }

From cc9108845f0e49a0a81e1e3bc82dd75eb90d077e Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 14 Jun 2019 15:18:33 -0400
Subject: [PATCH 1481/1703] feat(@ngtools/webpack): improved TypeScript
 diagnostic reporting

By leveraging the built-in TS error formatting, additional context related to errors or warnings will now be shown.  This includes a segment of the code that caused the diagnostic message.
---
 .../webpack/src/angular_compiler_plugin.ts    | 57 ++++++++++++++++---
 1 file changed, 48 insertions(+), 9 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 72c46ffa7da3..872b47f37ca7 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -28,6 +28,7 @@ import {
   createCompilerHost,
   createProgram,
   formatDiagnostics,
+  isNgDiagnostic,
   readConfiguration,
 } from '@angular/compiler-cli';
 import { ChildProcess, ForkOptions, fork } from 'child_process';
@@ -1010,19 +1011,57 @@ export class AngularCompilerPlugin {
     const { emitResult, diagnostics } = this._emit();
     timeEnd('AngularCompilerPlugin._update._emit');
 
-    // Report diagnostics.
-    const errors = diagnostics
-      .filter((diag) => diag.category === ts.DiagnosticCategory.Error);
-    const warnings = diagnostics
-      .filter((diag) => diag.category === ts.DiagnosticCategory.Warning);
+    // Report Diagnostics
+    const tsErrors = [];
+    const tsWarnings = [];
+    const ngErrors = [];
+    const ngWarnings = [];
+
+    for (const diagnostic of diagnostics) {
+      switch (diagnostic.category) {
+        case ts.DiagnosticCategory.Error:
+          if (isNgDiagnostic(diagnostic)) {
+            ngErrors.push(diagnostic);
+          } else {
+            tsErrors.push(diagnostic);
+          }
+          break;
+        case ts.DiagnosticCategory.Message:
+        case ts.DiagnosticCategory.Suggestion:
+          // Warnings?
+        case ts.DiagnosticCategory.Warning:
+          if (isNgDiagnostic(diagnostic)) {
+            ngWarnings.push(diagnostic);
+          } else {
+            tsWarnings.push(diagnostic);
+          }
+          break;
+      }
+    }
+
+    if (tsErrors.length > 0) {
+      const message = ts.formatDiagnosticsWithColorAndContext(
+        tsErrors,
+        this._compilerHost,
+      );
+      this._errors.push(new Error(message));
+    }
+
+    if (tsWarnings.length > 0) {
+      const message = ts.formatDiagnosticsWithColorAndContext(
+        tsWarnings,
+        this._compilerHost,
+      );
+      this._warnings.push(message);
+    }
 
-    if (errors.length > 0) {
-      const message = formatDiagnostics(errors);
+    if (ngErrors.length > 0) {
+      const message = formatDiagnostics(ngErrors);
       this._errors.push(new Error(message));
     }
 
-    if (warnings.length > 0) {
-      const message = formatDiagnostics(warnings);
+    if (ngWarnings.length > 0) {
+      const message = formatDiagnostics(ngWarnings);
       this._warnings.push(message);
     }
 

From 58599e125e83ac750479802e6eeaa5232728c335 Mon Sep 17 00:00:00 2001
From: Lakhyari <med.lakhyari@gmail.com>
Date: Sat, 15 Jun 2019 15:51:35 +0200
Subject: [PATCH 1482/1703] feat(@angular/cli): ng doc accepts a version flag

With this commit, we can now specify a `version`
for the `ng doc` command

    ng doc --version 6
    ng doc -v 6

and this will open `v6.angular.io` instead of `angular.io`.
The default domain is still used
if no version is specified.

Refs #12365
---
 packages/angular/cli/commands/doc-impl.ts | 16 ++++++++++++++--
 packages/angular/cli/commands/doc.json    | 15 +++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/packages/angular/cli/commands/doc-impl.ts b/packages/angular/cli/commands/doc-impl.ts
index e0382c596009..d78e3fce252b 100644
--- a/packages/angular/cli/commands/doc-impl.ts
+++ b/packages/angular/cli/commands/doc-impl.ts
@@ -19,9 +19,21 @@ export class DocCommand extends Command<DocCommandSchema> {
 
       return 0;
     }
-    let searchUrl = `https://angular.io/api?query=${options.keyword}`;
+
+    let domain = 'angular.io';
+
+    if (options.version) {
+      if (options.version == 'next') {
+        domain = 'next.angular.io';
+      } else {
+        domain = `v${options.version}.angular.io`;
+      }
+    }
+
+    let searchUrl = `https://${domain}/api?query=${options.keyword}`;
+
     if (options.search) {
-      searchUrl = `https://www.google.com/search?q=site%3Aangular.io+${options.keyword}`;
+      searchUrl = `https://www.google.com/search?q=site%3A${domain}+${options.keyword}`;
     }
 
     // We should wrap `open` in a new Promise because `open` is already resolved
diff --git a/packages/angular/cli/commands/doc.json b/packages/angular/cli/commands/doc.json
index 302c1cac3f4a..edb3d6b6d7fe 100644
--- a/packages/angular/cli/commands/doc.json
+++ b/packages/angular/cli/commands/doc.json
@@ -25,6 +25,21 @@
           "type": "boolean",
           "default": false,
           "description": "When true, searches all of angular.io. Otherwise, searches only API reference documentation."
+        },
+        "version" : {
+          "anyOf": [
+            {
+              "const" : 2
+            },
+            {
+              "type" : "integer",
+              "minimum": 4
+            },
+            {
+              "const": "next"
+            }
+          ],
+          "description": "Contains the version of Angular to use for the documentation."
         }
       },
       "required": [

From a70932b1acf97d20cc04cb7c875cdddd2fe11637 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 5 Jun 2019 19:48:41 -0400
Subject: [PATCH 1483/1703] refactor(@angular/cli): standardize color handling
 and support checking

Node.js 10+ provides built-in functionality to test for color support based on chalk's `supports-color` package as well as several others. This alleviates the need for custom code or third-party packages to determine color support.  In addition for this PR, the `ansi-colors` package is added to the CLI which provides color, cross-platform symbol, and style/color removal support.  The package is light-weight, contains typings, and has no dependencies. The removal support is leveraged to remove all styling from logger messages when color is not supported.  This removes a current defect in which color/styling is still displayed if generated manually or via methods that do not perform supportability checks.  Finally, the typically used console functions are overriden to leverage the logger to ensure that the color processing is applied to third-party code (e.g., webpack internally as well as some of its loaders and plugins) which output to the console directly.
---
 package.json                          |  1 +
 packages/angular/cli/BUILD            |  1 +
 packages/angular/cli/lib/cli/index.ts | 23 ++++++++++++++++++-----
 packages/angular/cli/package.json     |  1 +
 yarn.lock                             |  5 +++++
 5 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 22cc9b3343cf..3377133e3888 100644
--- a/package.json
+++ b/package.json
@@ -107,6 +107,7 @@
     "@types/webpack-sources": "^0.1.5",
     "@yarnpkg/lockfile": "1.1.0",
     "ajv": "6.10.0",
+    "ansi-colors": "3.2.4",
     "common-tags": "^1.8.0",
     "conventional-changelog": "^1.1.0",
     "conventional-commits-parser": "^3.0.0",
diff --git a/packages/angular/cli/BUILD b/packages/angular/cli/BUILD
index f225157d9a26..6361ada810b6 100644
--- a/packages/angular/cli/BUILD
+++ b/packages/angular/cli/BUILD
@@ -41,6 +41,7 @@ ts_library(
         "@npm//@types/semver",
         "@npm//@types/universal-analytics",
         "@npm//@types/uuid",
+        "@npm//ansi-colors",
         "@npm//rxjs",
     ],
 )
diff --git a/packages/angular/cli/lib/cli/index.ts b/packages/angular/cli/lib/cli/index.ts
index aac8708aba36..f0c5069c45e3 100644
--- a/packages/angular/cli/lib/cli/index.ts
+++ b/packages/angular/cli/lib/cli/index.ts
@@ -5,25 +5,38 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { terminal } from '@angular-devkit/core';
 import { createConsoleLogger } from '@angular-devkit/core/node';
+import * as colors from 'ansi-colors';
+import { WriteStream } from 'tty';
+import { format } from 'util';
 import { runCommand } from '../../models/command-runner';
 import { getWorkspaceRaw } from '../../utilities/config';
 import { getWorkspaceDetails } from '../../utilities/project';
 
-
 export default async function(options: { testing?: boolean, cliArgs: string[] }) {
+  // Typings do not contain the function call (added in Node.js v9.9.0)
+  const supportsColor = process.stdout instanceof WriteStream &&
+    (process.stdout as unknown as { getColorDepth(): number }).getColorDepth() > 1;
+
   const logger = createConsoleLogger(
     false,
     process.stdout,
     process.stderr,
     {
-      warn: s => terminal.bold(terminal.yellow(s)),
-      error: s => terminal.bold(terminal.red(s)),
-      fatal: s => terminal.bold(terminal.red(s)),
+      info: s => supportsColor ? s : colors.unstyle(s),
+      debug: s => supportsColor ? s : colors.unstyle(s),
+      warn: s => supportsColor ? colors.bold.yellow(s) : colors.unstyle(s),
+      error: s => supportsColor ? colors.bold.red(s) : colors.unstyle(s),
+      fatal: s => supportsColor ? colors.bold.red(s) : colors.unstyle(s),
     },
   );
 
+  // Redirect console to logger
+  console.log = function() { logger.info(format.apply(null, arguments)); };
+  console.info = function() { logger.info(format.apply(null, arguments)); };
+  console.warn = function() { logger.warn(format.apply(null, arguments)); };
+  console.error = function() { logger.error(format.apply(null, arguments)); };
+
   let projectDetails = getWorkspaceDetails();
   if (projectDetails === null) {
     const [, localPath] = getWorkspaceRaw('local');
diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 57bbcce14c45..1eec7d263540 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -31,6 +31,7 @@
     "@schematics/angular": "0.0.0",
     "@schematics/update": "0.0.0",
     "@yarnpkg/lockfile": "1.1.0",
+    "ansi-colors": "3.2.4",
     "debug": "^4.1.1",
     "ini": "1.3.5",
     "inquirer": "6.3.1",
diff --git a/yarn.lock b/yarn.lock
index 9dc4eeea1ddb..cf962d90a2ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -988,6 +988,11 @@ ansi-align@^2.0.0:
   dependencies:
     string-width "^2.0.0"
 
+ansi-colors@3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
+  integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
+
 ansi-colors@^3.0.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.1.tgz#9638047e4213f3428a11944a7d4b31cba0a3ff95"

From 3ecf29bb92a10023ba05358276e87ecbd8d49fe9 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Mon, 17 Jun 2019 12:54:16 +0200
Subject: [PATCH 1484/1703] fix(@schematics/angular): support adding web-worker
 to pre version 8 applications

Fixes #14791
---
 packages/schematics/angular/web-worker/index.ts   | 15 +++++++++++++--
 .../schematics/angular/web-worker/index_spec.ts   | 13 +++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/web-worker/index.ts b/packages/schematics/angular/web-worker/index.ts
index 012566b1df0a..2964937bd13f 100644
--- a/packages/schematics/angular/web-worker/index.ts
+++ b/packages/schematics/angular/web-worker/index.ts
@@ -5,7 +5,15 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { JsonParseMode, join, normalize, parseJsonAst, strings, tags } from '@angular-devkit/core';
+import {
+  JsonParseMode,
+  dirname,
+  join,
+  normalize,
+  parseJsonAst,
+  strings,
+  tags,
+} from '@angular-devkit/core';
 import {
   Rule, SchematicContext, SchematicsException, Tree,
   apply, applyTemplates, chain, mergeWith, move, noop, url,
@@ -23,7 +31,10 @@ function addConfig(options: WebWorkerOptions, root: string, tsConfigPath: string
     context.logger.debug('updating project configuration.');
 
     // Add worker glob exclusion to tsconfig.app.json.
-    const workerGlob = 'src/**/*.worker.ts';
+    // Projects pre version 8 should to have tsconfig.app.json inside their application
+    const isInSrc = dirname(normalize(tsConfigPath)).endsWith('src');
+    const workerGlob = `${isInSrc ? '' : 'src/'}**/*.worker.ts`;
+
     const buffer = host.read(tsConfigPath);
     if (buffer) {
       const tsCfgAst = parseJsonAst(buffer.toString(), JsonParseMode.Loose);
diff --git a/packages/schematics/angular/web-worker/index_spec.ts b/packages/schematics/angular/web-worker/index_spec.ts
index a8f6520189c1..6843175d005c 100644
--- a/packages/schematics/angular/web-worker/index_spec.ts
+++ b/packages/schematics/angular/web-worker/index_spec.ts
@@ -114,4 +114,17 @@ describe('Web Worker Schematic', () => {
     const { compilerOptions } = JSON.parse(tree.readContent(path));
     expect(compilerOptions.outDir).toBe('./out-tsc/worker');
   });
+
+  it('supports pre version 8 structure', async () => {
+    const workspace = JSON.parse(appTree.readContent('/angular.json'));
+    const tsConfigPath = '/projects/bar/src/tsconfig.app.json';
+    workspace.projects.bar.architect.build.options.tsConfig = tsConfigPath;
+    appTree.overwrite('/angular.json', JSON.stringify(workspace));
+    appTree.rename('projects/bar/tsconfig.app.json', tsConfigPath);
+
+    const tree = await schematicRunner.runSchematicAsync('web-worker', defaultOptions, appTree)
+      .toPromise();
+    const { exclude } = JSON.parse(tree.readContent(tsConfigPath));
+    expect(exclude).toContain('**/*.worker.ts');
+  });
 });

From d44c6acb3299b39d47f95515d68cf0745dcdf976 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Sat, 15 Jun 2019 14:38:25 -0400
Subject: [PATCH 1485/1703] fix(@ngtools/webpack): remove old TypeScript
 workarounds

These are only needed on older versions of TypeScript which are no longer supported (2.x) and can cause issues with transformers later in the pipeline due to the modification of nodes and potential destructive effects on type analysis.
---
 .../src/transformers/make_transform.ts        | 85 +++++--------------
 1 file changed, 19 insertions(+), 66 deletions(-)

diff --git a/packages/ngtools/webpack/src/transformers/make_transform.ts b/packages/ngtools/webpack/src/transformers/make_transform.ts
index 1b36d821a0e5..5d998db5f26d 100644
--- a/packages/ngtools/webpack/src/transformers/make_transform.ts
+++ b/packages/ngtools/webpack/src/transformers/make_transform.ts
@@ -16,26 +16,20 @@ import {
   TransformOperation,
 } from './interfaces';
 
-
-// Typescript below 2.7.0 needs a workaround.
-const tsVersionParts = ts.version.split('.').map(p => Number(p));
-const visitEachChild = tsVersionParts[0] <= 2 && tsVersionParts[1] < 7
-  ? visitEachChildWorkaround
-  : ts.visitEachChild;
-
 export function makeTransform(
   standardTransform: StandardTransform,
   getTypeChecker?: () => ts.TypeChecker,
 ): ts.TransformerFactory<ts.SourceFile> {
-
   return (context: ts.TransformationContext): ts.Transformer<ts.SourceFile> => {
     const transformer: ts.Transformer<ts.SourceFile> = (sf: ts.SourceFile) => {
       const ops: TransformOperation[] = standardTransform(sf);
-      const removeOps = ops
-        .filter((op) => op.kind === OPERATION_KIND.Remove) as RemoveNodeOperation[];
-      const addOps = ops.filter((op) => op.kind === OPERATION_KIND.Add) as AddNodeOperation[];
-      const replaceOps = ops
-        .filter((op) => op.kind === OPERATION_KIND.Replace) as ReplaceNodeOperation[];
+      const removeOps = ops.filter(
+        op => op.kind === OPERATION_KIND.Remove,
+      ) as RemoveNodeOperation[];
+      const addOps = ops.filter(op => op.kind === OPERATION_KIND.Add) as AddNodeOperation[];
+      const replaceOps = ops.filter(
+        op => op.kind === OPERATION_KIND.Replace,
+      ) as ReplaceNodeOperation[];
 
       // If nodes are removed, elide the imports as well.
       // Mainly a workaround for https://github.com/Microsoft/TypeScript/issues/17552.
@@ -43,33 +37,33 @@ export function makeTransform(
       // This is currently true for transforms that use replaceOps (replace_bootstrap and
       // replace_resources), but may not be true for new transforms.
       if (getTypeChecker && removeOps.length + replaceOps.length > 0) {
-        const removedNodes = removeOps.concat(replaceOps).map((op) => op.target);
+        const removedNodes = removeOps.concat(replaceOps).map(op => op.target);
         removeOps.push(...elideImports(sf, removedNodes, getTypeChecker));
       }
 
-      const visitor: ts.Visitor = (node) => {
+      const visitor: ts.Visitor = node => {
         let modified = false;
         let modifiedNodes = [node];
         // Check if node should be dropped.
-        if (removeOps.find((op) => op.target === node)) {
+        if (removeOps.find(op => op.target === node)) {
           modifiedNodes = [];
           modified = true;
         }
 
         // Check if node should be replaced (only replaces with first op found).
-        const replace = replaceOps.find((op) => op.target === node);
+        const replace = replaceOps.find(op => op.target === node);
         if (replace) {
           modifiedNodes = [replace.replacement];
           modified = true;
         }
 
         // Check if node should be added to.
-        const add = addOps.filter((op) => op.target === node);
+        const add = addOps.filter(op => op.target === node);
         if (add.length > 0) {
           modifiedNodes = [
-            ...add.filter((op) => op.before).map(((op) => op.before)),
+            ...add.filter(op => op.before).map(op => op.before),
             ...modifiedNodes,
-            ...add.filter((op) => op.after).map(((op) => op.after)),
+            ...add.filter(op => op.after).map(op => op.after),
           ] as ts.Node[];
           modified = true;
         }
@@ -79,7 +73,7 @@ export function makeTransform(
           return modifiedNodes;
         } else {
           // Otherwise return node as is and visit children.
-          return visitEachChild(node, visitor, context);
+          return ts.visitEachChild(node, visitor, context);
         }
       };
 
@@ -91,7 +85,7 @@ export function makeTransform(
       const result = ts.visitNode(sf, visitor);
 
       // If we removed any decorators, we need to clean up the decorator arrays.
-      if (removeOps.some((op) => op.target.kind === ts.SyntaxKind.Decorator)) {
+      if (removeOps.some(op => op.target.kind === ts.SyntaxKind.Decorator)) {
         cleanupDecorators(result);
       }
 
@@ -102,52 +96,11 @@ export function makeTransform(
   };
 }
 
-/**
- * This is a version of `ts.visitEachChild` that works that calls our version
- * of `updateSourceFileNode`, so that typescript doesn't lose type information
- * for property decorators.
- * See https://github.com/Microsoft/TypeScript/issues/17384 (fixed by
- * https://github.com/Microsoft/TypeScript/pull/20314 and released in TS 2.7.0) and
- * https://github.com/Microsoft/TypeScript/issues/17551 (fixed by
- * https://github.com/Microsoft/TypeScript/pull/18051 and released on TS 2.5.0).
- */
-function visitEachChildWorkaround(
-  node: ts.Node,
-  visitor: ts.Visitor,
-  context: ts.TransformationContext,
-) {
-
-  if (node.kind === ts.SyntaxKind.SourceFile) {
-    const sf = node as ts.SourceFile;
-    const statements = ts.visitLexicalEnvironment(sf.statements, visitor, context);
-
-    if (statements === sf.statements) {
-      return sf;
-    }
-    // Note: Need to clone the original file (and not use `ts.updateSourceFileNode`)
-    // as otherwise TS fails when resolving types for decorators.
-    const sfClone = ts.getMutableClone(sf);
-    sfClone.statements = statements;
-
-    return sfClone;
-  }
-
-  return ts.visitEachChild(node, visitor, context);
-}
-
-
-// 1) If TS sees an empty decorator array, it will still emit a `__decorate` call.
+// If TS sees an empty decorator array, it will still emit a `__decorate` call.
 //    This seems to be a TS bug.
-// 2) Also ensure nodes with modified decorators have parents
-//    built in TS transformers assume certain nodes have parents (fixed in TS 2.7+)
 function cleanupDecorators(node: ts.Node) {
-  if (node.decorators) {
-    if (node.decorators.length == 0) {
-      node.decorators = undefined;
-    } else if (node.parent == undefined) {
-      const originalNode = ts.getParseTreeNode(node);
-      node.parent = originalNode.parent;
-    }
+  if (node.decorators && node.decorators.length === 0) {
+    node.decorators = undefined;
   }
 
   ts.forEachChild(node, node => cleanupDecorators(node));

From fd90f105124942dfa40dae6ae9dd3a4246ccfbcd Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Sat, 15 Jun 2019 14:41:34 -0400
Subject: [PATCH 1486/1703] fix(@ngtools/webpack): ensure references for
 constructor parameter types

By cloning the import specifier for each of the parameter types, TypeScript's import eliding algorithm will skip removal and prevent reference exceptions at runtime.
---
 .../src/transformers/ctor-parameters.ts       | 182 ++++++------------
 .../e2e/tests/misc/es2015-nometa.ts           |  24 +++
 2 files changed, 83 insertions(+), 123 deletions(-)
 create mode 100644 tests/legacy-cli/e2e/tests/misc/es2015-nometa.ts

diff --git a/packages/ngtools/webpack/src/transformers/ctor-parameters.ts b/packages/ngtools/webpack/src/transformers/ctor-parameters.ts
index b43f9e40ddec..6adc5d88bedd 100644
--- a/packages/ngtools/webpack/src/transformers/ctor-parameters.ts
+++ b/packages/ngtools/webpack/src/transformers/ctor-parameters.ts
@@ -202,8 +202,7 @@ export function decoratorDownlevelTransformer(
   diagnostics: ts.Diagnostic[],
 ): (context: ts.TransformationContext) => ts.Transformer<ts.SourceFile> {
   return (context: ts.TransformationContext) => {
-    /** A map from symbols to the identifier of an import, reset per SourceFile. */
-    let importNamesBySymbol = new Map<ts.Symbol, ts.Identifier>();
+    const parameterTypeSymbols = new Set<ts.Symbol>();
 
     /**
      * Converts an EntityName (from a type annotation) to an expression (accessing a value).
@@ -211,40 +210,23 @@ export function decoratorDownlevelTransformer(
      * For a given ts.EntityName, this walks depth first to find the leftmost ts.Identifier, then
      * converts the path into property accesses.
      *
-     * This generally works, but TypeScript's emit pipeline does not serialize identifiers that are
-     * only used in a type location (such as identifiers in a TypeNode), even if the identifier
-     * itself points to a value (e.g. a class). To avoid that problem, this method finds the symbol
-     * representing the identifier (using typeChecker), then looks up where it was imported (using
-     * importNamesBySymbol), and then uses the imported name instead of the identifier from the type
-     * expression, if any. Otherwise it'll use the identifier unchanged. This makes sure the
-     * identifier is not marked as stemming from a "type only" expression, causing it to be emitted
-     * and causing the import to be retained.
      */
     function entityNameToExpression(name: ts.EntityName): ts.Expression | undefined {
-      const sym = typeChecker.getSymbolAtLocation(name);
-      if (!sym) {
-        return undefined;
-      }
-      // Check if the entity name references a symbol that is an actual value. If it is not, it
-      // cannot be referenced by an expression, so return undefined.
-      let symToCheck = sym;
-      if (symToCheck.flags & ts.SymbolFlags.Alias) {
-        symToCheck = typeChecker.getAliasedSymbol(symToCheck);
-      }
-      if (!(symToCheck.flags & ts.SymbolFlags.Value)) {
-        return undefined;
-      }
-
       if (ts.isIdentifier(name)) {
-        // If there's a known import name for this symbol, use it so that the import will be
-        // retained and the value can be referenced.
-        const value = importNamesBySymbol.get(sym);
-        if (value) {
-          return value;
+        const typeSymbol = typeChecker.getSymbolAtLocation(name);
+        if (typeSymbol) {
+          parameterTypeSymbols.add(typeSymbol);
         }
 
-        // Otherwise this will be a locally declared name, just return that.
-        return name;
+        // Based on TS's strategy to allow the checker to reach this identifier
+        // tslint:disable-next-line:max-line-length
+        // https://github.com/microsoft/TypeScript/blob/7f47a08a5e9874f0f97a667bd81eebddec61247c/src/compiler/transformers/ts.ts#L2093
+        const exp = ts.getMutableClone(name);
+        exp.flags &= ~ts.NodeFlags.Synthesized;
+        ((exp as unknown) as { original: undefined }).original = undefined;
+        exp.parent = ts.getParseTreeNode(name.getSourceFile());
+
+        return exp;
       }
       const ref = entityNameToExpression(name.left);
       if (!ref) {
@@ -254,17 +236,13 @@ export function decoratorDownlevelTransformer(
       return ts.createPropertyAccess(ref, name.right);
     }
 
-    /**
-     * Transforms a constructor. Returns the transformed constructor and the list of parameter
-     * information collected, consisting of decorators and optional type.
-     */
-    function transformConstructor(
-      ctor: ts.ConstructorDeclaration,
-    ): [ts.ConstructorDeclaration, ParameterDecorationInfo[]] {
-      ctor = ts.visitEachChild(ctor, visitor, context);
+    function classMemberVisitor(node: ts.Node): ts.VisitResult<ts.Node> {
+      if (!ts.isConstructorDeclaration(node) || !node.body) {
+        return visitor(node);
+      }
 
       const parametersInfo: ParameterDecorationInfo[] = [];
-      for (const param of ctor.parameters) {
+      for (const param of node.parameters) {
         const paramInfo: ParameterDecorationInfo = { decorators: [], type: null };
 
         for (const decorator of param.decorators || []) {
@@ -280,98 +258,56 @@ export function decoratorDownlevelTransformer(
         parametersInfo.push(paramInfo);
       }
 
-      return [ctor, parametersInfo];
-    }
-
-    /**
-     * Transforms a single class declaration:
-     * - creates a ctorParameters property
-     */
-    function transformClassDeclaration(classDecl: ts.ClassDeclaration): ts.ClassDeclaration {
-      if (!classDecl.decorators || classDecl.decorators.length === 0) {
-        return classDecl;
-      }
-
-      const newMembers: ts.ClassElement[] = [];
-      let classParameters: ParameterDecorationInfo[] | null = null;
-
-      for (const member of classDecl.members) {
-        switch (member.kind) {
-          case ts.SyntaxKind.Constructor: {
-            const ctor = member as ts.ConstructorDeclaration;
-            if (!ctor.body) {
-              break;
-            }
+      if (parametersInfo.length > 0) {
+        const ctorProperty = createCtorParametersClassProperty(
+          diagnostics,
+          entityNameToExpression,
+          parametersInfo,
+        );
 
-            const [newMember, parametersInfo] = transformConstructor(
-              member as ts.ConstructorDeclaration,
-            );
-            classParameters = parametersInfo;
-            newMembers.push(newMember);
-            continue;
-          }
-          default:
-            break;
-        }
-        newMembers.push(ts.visitEachChild(member, visitor, context));
+        return [node, ctorProperty];
+      } else {
+        return node;
       }
+    }
 
-      const newClassDeclaration = ts.getMutableClone(classDecl);
-
-      if (classParameters) {
-        newMembers.push(
-          createCtorParametersClassProperty(diagnostics, entityNameToExpression, classParameters),
+    function visitor<T extends ts.Node>(node: T): ts.Node {
+      if (ts.isClassDeclaration(node)) {
+        return ts.updateClassDeclaration(
+          node,
+          node.decorators,
+          node.modifiers,
+          node.name,
+          node.typeParameters,
+          node.heritageClauses,
+          ts.visitNodes(node.members, classMemberVisitor),
         );
+      } else {
+        return ts.visitEachChild(node, visitor, context);
       }
-
-      newClassDeclaration.members = ts.setTextRange(
-        ts.createNodeArray(newMembers, newClassDeclaration.members.hasTrailingComma),
-        classDecl.members,
-      );
-
-      return newClassDeclaration;
     }
 
-    function visitor(node: ts.Node): ts.Node {
-      switch (node.kind) {
-        case ts.SyntaxKind.SourceFile: {
-          importNamesBySymbol = new Map<ts.Symbol, ts.Identifier>();
-
-          return ts.visitEachChild(node, visitor, context);
-        }
-        case ts.SyntaxKind.ImportDeclaration: {
-          const impDecl = node as ts.ImportDeclaration;
-          if (impDecl.importClause) {
-            const importClause = impDecl.importClause;
-            const names = [];
-            if (importClause.name) {
-              names.push(importClause.name);
-            }
-            if (
-              importClause.namedBindings &&
-              importClause.namedBindings.kind === ts.SyntaxKind.NamedImports
-            ) {
-              const namedImports = importClause.namedBindings as ts.NamedImports;
-              names.push(...namedImports.elements.map(e => e.name));
-            }
-            for (const name of names) {
-              const sym = typeChecker.getSymbolAtLocation(name);
-              if (sym) {
-                importNamesBySymbol.set(sym, name);
-              }
+    return (sf: ts.SourceFile) => {
+      parameterTypeSymbols.clear();
+
+      return ts.visitEachChild(
+        visitor(sf) as ts.SourceFile,
+        function visitImports(node: ts.Node): ts.Node {
+          if (
+            (ts.isImportSpecifier(node) || ts.isNamespaceImport(node) || ts.isImportClause(node)) &&
+            node.name
+          ) {
+            const importSymbol = typeChecker.getSymbolAtLocation(node.name);
+            if (importSymbol && parameterTypeSymbols.has(importSymbol)) {
+              // Using a clone prevents TS from removing the import specifier
+              return ts.getMutableClone(node);
             }
           }
 
-          return ts.visitEachChild(node, visitor, context);
-        }
-        case ts.SyntaxKind.ClassDeclaration: {
-          return transformClassDeclaration(node as ts.ClassDeclaration);
-        }
-        default:
-          return ts.visitEachChild(node, visitor, context);
-      }
-    }
-
-    return (sf: ts.SourceFile) => visitor(sf) as ts.SourceFile;
+          return ts.visitEachChild(node, visitImports, context);
+        },
+        context,
+      );
+    };
   };
 }
diff --git a/tests/legacy-cli/e2e/tests/misc/es2015-nometa.ts b/tests/legacy-cli/e2e/tests/misc/es2015-nometa.ts
new file mode 100644
index 000000000000..d283d03be9a7
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/misc/es2015-nometa.ts
@@ -0,0 +1,24 @@
+import { prependToFile, replaceInFile, writeFile } from '../../utils/fs';
+import { ng } from '../../utils/process';
+
+export default async function() {
+  // Ensure an ES2015 build is used in test
+  await writeFile('browserslist', 'Chrome 65');
+
+  await ng('generate', 'service', 'user');
+
+  // Update the application to use the new service
+  await prependToFile(
+    'src/app/app.component.ts',
+    'import { UserService } from \'./user.service\';',
+  );
+
+  await replaceInFile(
+    'src/app/app.component.ts',
+    'export class AppComponent {',
+    'export class AppComponent {\n  constructor(user: UserService) {}',
+  );
+
+  // Execute the application's tests with emitDecoratorMetadata disabled (default)
+  await ng('test', '--no-watch');
+}

From 3dced5491b5922da3f2c52afa17c79e601ee081e Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 17 Jun 2019 13:24:47 -0400
Subject: [PATCH 1487/1703] feat(@angular/cli): log unhandled exceptions

Whenever an unhandled exception during command processing occurs, the message and stack trace will be saved to a debug log located in a temporary directory.  The user will be informed of the log location as well as the exception message and instructions to file a bug report at the GitHub repository.
---
 packages/angular/cli/lib/cli/index.ts | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/packages/angular/cli/lib/cli/index.ts b/packages/angular/cli/lib/cli/index.ts
index f0c5069c45e3..d02e8103e9ef 100644
--- a/packages/angular/cli/lib/cli/index.ts
+++ b/packages/angular/cli/lib/cli/index.ts
@@ -61,10 +61,30 @@ export default async function(options: { testing?: boolean, cliArgs: string[] })
     return 0;
   } catch (err) {
     if (err instanceof Error) {
-      logger.fatal(err.message);
-      if (err.stack) {
-        logger.fatal(err.stack);
+      try {
+        const fs = await import('fs');
+        const os = await import('os');
+        const tempDirectory = fs.mkdtempSync(fs.realpathSync(os.tmpdir()) + '/' + 'ng-');
+        const logPath = tempDirectory + '/angular-errors.log';
+        fs.appendFileSync(logPath, '[error] ' + (err.stack || err));
+
+        logger.fatal(
+          `An unhandled exception occurred: ${err.message}\n` +
+          `See "${logPath}" for further details.\n\n` +
+          'Please report with the contents of the log file at ' +
+          'https://github.com/angular/angular-cli/issues/new?template=1-bug-report.md',
+        );
+      } catch (e) {
+        logger.fatal(
+          `An unhandled exception occurred: ${err.message}\n` +
+          `Fatal error writing debug log file: ${e.message}`,
+        );
+        if (err.stack) {
+          logger.fatal(err.stack);
+        }
       }
+
+      return 127;
     } else if (typeof err === 'string') {
       logger.fatal(err);
     } else if (typeof err === 'number') {

From 1d7cf6aa232e065faa53205fbfef9b30fe6d5d58 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 18 Jun 2019 09:14:47 +0000
Subject: [PATCH 1488/1703] build: update browserslist to version 4.6.3

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 27 +++++++++++--------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index dae59b317141..7d7caa85b886 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -14,7 +14,7 @@
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.10.0",
     "autoprefixer": "9.6.0",
-    "browserslist": "4.6.2",
+    "browserslist": "4.6.3",
     "caniuse-lite": "1.0.30000974",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
diff --git a/yarn.lock b/yarn.lock
index cf962d90a2ec..cab3103bb896 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1634,13 +1634,13 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@4.6.2:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.2.tgz#574c665950915c2ac73a4594b8537a9eba26203f"
-  integrity sha512-2neU/V0giQy9h3XMPwLhEY3+Ao0uHSwHvU8Q1Ea6AgLVL1sXbX3dzPrJ8NWe5Hi4PoTkCYXOtVR9rfRLI0J/8Q==
+browserslist@4.6.3:
+  version "4.6.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.3.tgz#0530cbc6ab0c1f3fc8c819c72377ba55cf647f05"
+  integrity sha512-CNBqTCq22RKM8wKJNowcqihHJ4SkI8CGeK7KOR9tPboXUuS5Zk5lQgzzTbs4oxD8x+6HUshZUa2OyNI9lR93bQ==
   dependencies:
-    caniuse-lite "^1.0.30000974"
-    electron-to-chromium "^1.3.150"
+    caniuse-lite "^1.0.30000975"
+    electron-to-chromium "^1.3.164"
     node-releases "^1.1.23"
 
 browserslist@^4.0.0, browserslist@^4.3.3:
@@ -1876,7 +1876,7 @@ camelcase@^5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@1.0.30000974, caniuse-lite@^1.0.30000974:
+caniuse-lite@1.0.30000974:
   version "1.0.30000974"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000974.tgz#b7afe14ee004e97ce6dc73e3f878290a12928ad8"
   integrity sha512-xc3rkNS/Zc3CmpMKuczWEdY2sZgx09BkAxfvkxlAEBTqcMHeL8QnPqhKse+5sRTi3nrw2pJwToD2WvKn1Uhvww==
@@ -1896,6 +1896,11 @@ caniuse-lite@^1.0.30000971:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000971.tgz#d1000e4546486a6977756547352bc96a4cfd2b13"
   integrity sha512-TQFYFhRS0O5rdsmSbF1Wn+16latXYsQJat66f7S7lizXW1PVpWJeZw9wqqVLIjuxDRz7s7xRUj13QCfd8hKn6g==
 
+caniuse-lite@^1.0.30000975:
+  version "1.0.30000975"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000975.tgz#d4e7131391dddcf2838999d3ce75065f65f1cdfc"
+  integrity sha512-ZsXA9YWQX6ATu5MNg+Vx/cMQ+hM6vBBSqDeJs8ruk9z0ky4yIHML15MoxcFt088ST2uyjgqyUGRJButkptWf0w==
+
 canonical-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
@@ -3198,10 +3203,10 @@ electron-to-chromium@^1.3.137:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.137.tgz#ba7c88024984c038a5c5c434529aabcea7b42944"
   integrity sha512-kGi32g42a8vS/WnYE7ELJyejRT7hbr3UeOOu0WeuYuQ29gCpg9Lrf6RdcTQVXSt/v0bjCfnlb/EWOOsiKpTmkw==
 
-electron-to-chromium@^1.3.150:
-  version "1.3.152"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.152.tgz#8f1c08e101d58fe2ef72655481bbf8c83f9450fa"
-  integrity sha512-Ah10cGMWIXYD8aUTH2Y7lGRhaOFQLyWuxvXmCPCZCbUIGJ4swnNmT6P4aA8RTgUmNw9kmcDL6SoU8TZC4YuZGg==
+electron-to-chromium@^1.3.164:
+  version "1.3.164"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.164.tgz#8680b875577882c1572c42218d53fa9ba5f71d5d"
+  integrity sha512-VLlalqUeduN4+fayVtRZvGP2Hl1WrRxlwzh2XVVMJym3IFrQUS29BFQ1GP/BxOJXJI1OFCrJ5BnFEsAe8NHtOg==
 
 elliptic@^6.0.0:
   version "6.4.1"

From 6fcedc19bc5f57109a13fe6329c35d16e35db02f Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 18 Jun 2019 05:27:24 +0000
Subject: [PATCH 1489/1703] build: update pacote to version 9.5.1

---
 packages/angular/cli/package.json       | 2 +-
 packages/schematics/update/package.json | 2 +-
 yarn.lock                               | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 1eec7d263540..b5598c217070 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -37,7 +37,7 @@
     "inquirer": "6.3.1",
     "npm-package-arg": "6.1.0",
     "open": "6.3.0",
-    "pacote": "9.5.0",
+    "pacote": "9.5.1",
     "read-package-tree": "5.2.2",
     "semver": "6.1.1",
     "symbol-observable": "1.2.0",
diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index f0f19cbf9269..e24bf285c9ce 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -15,7 +15,7 @@
     "@angular-devkit/schematics": "0.0.0",
     "@yarnpkg/lockfile": "1.1.0",
     "ini": "1.3.5",
-    "pacote": "9.5.0",
+    "pacote": "9.5.1",
     "semver": "6.1.1",
     "semver-intersect": "1.4.0",
     "rxjs": "6.4.0"
diff --git a/yarn.lock b/yarn.lock
index cab3103bb896..36fe366e5cea 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7065,10 +7065,10 @@ package-json@^4.0.0:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
-pacote@9.5.0:
-  version "9.5.0"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.0.tgz#85f3013a3f6dd51c108b0ccabd3de8102ddfaeda"
-  integrity sha512-aUplXozRbzhaJO48FaaeClmN+2Mwt741MC6M3bevIGZwdCaP7frXzbUOfOWa91FPHoLITzG0hYaKY363lxO3bg==
+pacote@9.5.1:
+  version "9.5.1"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.1.tgz#adb0d23daeef6d0b813ab5891d0c6459ccec998d"
+  integrity sha512-Zqvczvf/zZ7QNosdE9uTC7SRuvSs9tFqRkF6cJl+2HH7COBnx4BRAGpeXJlrbN+mM0CMHpbi620xdEHhCflghA==
   dependencies:
     bluebird "^3.5.3"
     cacache "^11.3.2"

From 497308e90aec52fa3f7f8ff091b7e54bafa45ce1 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 18 Jun 2019 21:25:26 +0000
Subject: [PATCH 1490/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 302f2bdd0d78..394a9c7c05a7 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#44788d819d5d9701a07e80d736cfe3d5834db340",
-    "@angular/common": "github:angular/common-builds#c840831b2a79bc8c4abbe0f5a4444f176df2beb1",
-    "@angular/compiler": "github:angular/compiler-builds#825c2e4adbf3d6a9b53ac4f1e099f2bd63a5c67c",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#19fdb03cd203f63f813c5a6ef9537811f652d7dd",
-    "@angular/core": "github:angular/core-builds#9e9afc5e3d5d380cd1c39f25a5cc415906faa93c",
-    "@angular/forms": "github:angular/forms-builds#972e26919475a71c39b914de1cc098fc5512b47d",
-    "@angular/language-service": "github:angular/language-service-builds#16d4ffec9d5280ef7dfed323820d4da755195f8b",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#9e4f1181093b74e5043749ccf60b1db732f42121",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#1eb402687a5ab9f58a655686b6912b55b6af62f2",
-    "@angular/router": "github:angular/router-builds#dae3e105a01138a647e205b962b4f28dc46757c1"
+    "@angular/animations": "github:angular/animations-builds#6ccdf5ee497b13c54b5a5d4eb6c17f74f3b91977",
+    "@angular/common": "github:angular/common-builds#c808b66386cb24eb65fecb92826600a24629ebd8",
+    "@angular/compiler": "github:angular/compiler-builds#f43f0a4cd1886682751ce50c3dc146e692f85caf",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#1e7c5f91f3334e71bd24d57de4879cec1dbd8317",
+    "@angular/core": "github:angular/core-builds#955bb375afc4fb1bcbdebe6ca55490d95b206aba",
+    "@angular/forms": "github:angular/forms-builds#87db7f986f948bfc2f53bd305cdc63be6009dc03",
+    "@angular/language-service": "github:angular/language-service-builds#33965b66619d61328c9b492b84b9d5d1265fe6cb",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#60ad162592a1dfa014a1fde1536b351f3db0f4f2",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#cdfac5f8605c3e1941303f78522d9a06ca96e9e2",
+    "@angular/router": "github:angular/router-builds#8ce26b221611c2a96f79c4b48c65b5aeb919fa71"
   }
 }
\ No newline at end of file

From 991599c0caeb62e797c333e4615f43d175f663ae Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Sat, 15 Jun 2019 21:20:24 -0400
Subject: [PATCH 1491/1703] test(@angular-devkit/build-webpack): use stable
 workspace API

---
 .../src/webpack-dev-server/index_spec_large.ts        | 11 +++++------
 .../build_webpack/src/webpack/index_spec_large.ts     | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec_large.ts b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec_large.ts
index fe75a3f5aa94..447a5f1541eb 100644
--- a/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec_large.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack-dev-server/index_spec_large.ts
@@ -8,9 +8,8 @@
 import { Architect } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { TestingArchitectHost } from '@angular-devkit/architect/testing';
-import { experimental, normalize, schema } from '@angular-devkit/core';
+import { schema, workspaces } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
-import * as fs from 'fs';
 import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
 import * as path from 'path';
 import { DevServerBuildOutput } from './index';
@@ -27,14 +26,14 @@ describe('Dev Server Builder', () => {
 
   async function createArchitect(workspaceRoot: string) {
     vfHost = new NodeJsSyncHost();
-    const configContent = fs.readFileSync(path.join(workspaceRoot, 'angular.json'), 'utf-8');
-    const workspaceJson = JSON.parse(configContent);
 
     const registry = new schema.CoreSchemaRegistry();
     registry.addPostTransform(schema.transforms.addUndefinedDefaults);
 
-    const workspace = new experimental.workspace.Workspace(normalize(workspaceRoot), vfHost);
-    await workspace.loadWorkspaceFromJson(workspaceJson).toPromise();
+    const { workspace } = await workspaces.readWorkspace(
+      workspaceRoot,
+      workspaces.createWorkspaceHost(vfHost),
+    );
 
     testArchitectHost = new TestingArchitectHost(workspaceRoot, workspaceRoot,
       new WorkspaceNodeModulesArchitectHost(workspace, workspaceRoot));
diff --git a/packages/angular_devkit/build_webpack/src/webpack/index_spec_large.ts b/packages/angular_devkit/build_webpack/src/webpack/index_spec_large.ts
index 9c3db5b863f8..1c173f088296 100644
--- a/packages/angular_devkit/build_webpack/src/webpack/index_spec_large.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack/index_spec_large.ts
@@ -8,9 +8,8 @@
 import { Architect } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { TestingArchitectHost } from '@angular-devkit/architect/testing';
-import { experimental, join, normalize, schema } from '@angular-devkit/core';
+import { join, normalize, schema, workspaces } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
-import * as fs from 'fs';
 import * as path from 'path';
 import { BuildResult } from './index';
 
@@ -24,14 +23,14 @@ describe('Webpack Builder basic test', () => {
 
   async function createArchitect(workspaceRoot: string) {
     vfHost = new NodeJsSyncHost();
-    const configContent = fs.readFileSync(path.join(workspaceRoot, 'angular.json'), 'utf-8');
-    const workspaceJson = JSON.parse(configContent);
 
     const registry = new schema.CoreSchemaRegistry();
     registry.addPostTransform(schema.transforms.addUndefinedDefaults);
 
-    const workspace = new experimental.workspace.Workspace(normalize(workspaceRoot), vfHost);
-    await workspace.loadWorkspaceFromJson(workspaceJson).toPromise();
+    const { workspace } = await workspaces.readWorkspace(
+      workspaceRoot,
+      workspaces.createWorkspaceHost(vfHost),
+    );
 
     testArchitectHost = new TestingArchitectHost(workspaceRoot, workspaceRoot,
       new WorkspaceNodeModulesArchitectHost(workspace, workspaceRoot));

From d3e2267afe25aac795d92a87e5b10bbd1d7d8d7c Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Sat, 15 Jun 2019 21:20:38 -0400
Subject: [PATCH 1492/1703] test(@angular-devkit/build-ng-packagr): use stable
 workspace API

---
 .../build_ng_packagr/src/build/index_spec_large.ts         | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_ng_packagr/src/build/index_spec_large.ts b/packages/angular_devkit/build_ng_packagr/src/build/index_spec_large.ts
index 4637cc463f7e..325e7e328e3f 100644
--- a/packages/angular_devkit/build_ng_packagr/src/build/index_spec_large.ts
+++ b/packages/angular_devkit/build_ng_packagr/src/build/index_spec_large.ts
@@ -9,11 +9,11 @@ import { Architect } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { TestProjectHost, TestingArchitectHost } from '@angular-devkit/architect/testing';
 import {
-  experimental,
   join,
   normalize,
   schema,
   virtualFs,
+  workspaces,
 } from '@angular-devkit/core'; // tslint:disable-line:no-implicit-dependencies
 import { map, take, tap } from 'rxjs/operators';
 
@@ -33,7 +33,10 @@ describe('NgPackagr Builder', () => {
     const registry = new schema.CoreSchemaRegistry();
     registry.addPostTransform(schema.transforms.addUndefinedDefaults);
 
-    const workspace = await experimental.workspace.Workspace.fromPath(host, host.root(), registry);
+    const { workspace } = await workspaces.readWorkspace(
+      host.root(),
+      workspaces.createWorkspaceHost(host),
+    );
     const architectHost = new TestingArchitectHost(
       host.root(),
       host.root(),

From 8ef316745fefdde8d7353e8b1724947b89c52faf Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Sun, 16 Jun 2019 19:33:44 -0400
Subject: [PATCH 1493/1703] refactor(@angular-devkit/architect-cli): use stable
 workspace API

---
 .../architect_cli/bin/architect.ts              | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/packages/angular_devkit/architect_cli/bin/architect.ts b/packages/angular_devkit/architect_cli/bin/architect.ts
index 9ee3c4369124..d8eaf6470299 100644
--- a/packages/angular_devkit/architect_cli/bin/architect.ts
+++ b/packages/angular_devkit/architect_cli/bin/architect.ts
@@ -9,16 +9,15 @@
 import { Architect, BuilderInfo, BuilderProgressState, Target } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import {
-  experimental,
   json,
   logging,
-  normalize,
   schema,
   tags,
   terminal,
+  workspaces,
 } from '@angular-devkit/core';
 import { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node';
-import { existsSync, readFileSync } from 'fs';
+import { existsSync } from 'fs';
 import * as minimist from 'minimist';
 import * as path from 'path';
 import { tap } from 'rxjs/operators';
@@ -82,7 +81,7 @@ interface BarInfo {
 
 async function _executeTarget(
   parentLogger: logging.Logger,
-  workspace: experimental.workspace.Workspace,
+  workspace: workspaces.WorkspaceDefinition,
   root: string,
   argv: minimist.ParsedArgs,
   registry: json.schema.SchemaRegistry,
@@ -213,16 +212,14 @@ async function main(args: string[]): Promise<number> {
   }
 
   const root = path.dirname(configFilePath);
-  const configContent = readFileSync(configFilePath, 'utf-8');
-  const workspaceJson = JSON.parse(configContent);
 
   const registry = new schema.CoreSchemaRegistry();
   registry.addPostTransform(schema.transforms.addUndefinedDefaults);
 
-  const host = new NodeJsSyncHost();
-  const workspace = new experimental.workspace.Workspace(normalize(root), host);
-
-  await workspace.loadWorkspaceFromJson(workspaceJson).toPromise();
+  const { workspace } = await workspaces.readWorkspace(
+    configFilePath,
+    workspaces.createWorkspaceHost(new NodeJsSyncHost()),
+  );
 
   // Clear the console.
   process.stdout.write('\u001Bc');

From 5b9415f7d33e63dd93aa2f7a64943f7cbcc41e57 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 18 Jun 2019 00:08:05 +0000
Subject: [PATCH 1494/1703] build: update webpack-dev-server to version 3.7.2

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 49 ++++++++++++-------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 7d7caa85b886..d37202d49958 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -50,7 +50,7 @@
     "terser-webpack-plugin": "1.3.0",
     "webpack": "4.34.0",
     "webpack-dev-middleware": "3.7.0",
-    "webpack-dev-server": "3.4.1",
+    "webpack-dev-server": "3.7.2",
     "webpack-merge": "4.2.1",
     "webpack-sources": "1.3.0",
     "webpack-subresource-integrity": "1.1.0-rc.6",
diff --git a/yarn.lock b/yarn.lock
index 36fe366e5cea..c309838f0aa9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3590,10 +3590,10 @@ express@^4.16.2:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-express@^4.17.0:
-  version "4.17.0"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.17.0.tgz#288af62228a73f4c8ea2990ba3b791bb87cd4438"
-  integrity sha512-1Z7/t3Z5ZnBG252gKUPyItc4xdeaA0X934ca2ewckAsVsw9EG71i++ZHZPYnus8g/s5Bty8IMpSVEuRkmwwPRQ==
+express@^4.17.1:
+  version "4.17.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
+  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
   dependencies:
     accepts "~1.3.7"
     array-flatten "1.1.1"
@@ -5928,11 +5928,16 @@ logform@^1.9.1:
     ms "^2.1.1"
     triple-beam "^1.2.0"
 
-loglevel@^1.4.1, loglevel@^1.6.1:
+loglevel@^1.4.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
   integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
 
+loglevel@^1.6.3:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.3.tgz#77f2eb64be55a404c9fd04ad16d57c1d6d6b1280"
+  integrity sha512-LoEDv5pgpvWgPF4kNYuIp0qqSJVWak/dML0RY74xlzMZiT9w77teNAwKYKWBTYjlokMirg+o3jBwp+vlLrcfAA==
+
 long@~3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
@@ -7045,6 +7050,13 @@ p-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
   integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
 
+p-retry@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328"
+  integrity sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==
+  dependencies:
+    retry "^0.12.0"
+
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
@@ -8236,6 +8248,11 @@ retry@^0.10.0:
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
   integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
 
+retry@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
+  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
+
 rfdc@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.2.tgz#e6e72d74f5dc39de8f538f65e00c36c18018e349"
@@ -8508,16 +8525,11 @@ semver-intersect@1.4.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
   integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
 
-semver@6.1.1:
+semver@6.1.1, semver@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
   integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==
 
-semver@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
-  integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
-
 send@0.16.2:
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
@@ -10123,10 +10135,10 @@ webpack-dev-middleware@3.7.0, webpack-dev-middleware@^3.7.0:
     range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
-webpack-dev-server@3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.4.1.tgz#a5fd8dec95dec410098e7d9a037ff9405395d51a"
-  integrity sha512-CRqZQX2ryMtrg0r3TXQPpNh76eM1HD3Wmu6zDBxIKi/d2y+4aa28Ia8weNT0bfgWpY6Vs3Oq/K8+DjfbR+tWYw==
+webpack-dev-server@3.7.2:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.7.2.tgz#f79caa5974b7f8b63268ef5421222a8486d792f5"
+  integrity sha512-mjWtrKJW2T9SsjJ4/dxDC2fkFVUw8jlpemDERqV0ZJIkjjjamR2AbQlr3oz+j4JLhYCHImHnXZK5H06P2wvUew==
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"
@@ -10135,19 +10147,20 @@ webpack-dev-server@3.4.1:
     connect-history-api-fallback "^1.6.0"
     debug "^4.1.1"
     del "^4.1.1"
-    express "^4.17.0"
+    express "^4.17.1"
     html-entities "^1.2.1"
     http-proxy-middleware "^0.19.1"
     import-local "^2.0.0"
     internal-ip "^4.3.0"
     ip "^1.1.5"
     killable "^1.0.1"
-    loglevel "^1.6.1"
+    loglevel "^1.6.3"
     opn "^5.5.0"
+    p-retry "^3.0.1"
     portfinder "^1.0.20"
     schema-utils "^1.0.0"
     selfsigned "^1.10.4"
-    semver "^6.0.0"
+    semver "^6.1.1"
     serve-index "^1.9.1"
     sockjs "0.3.19"
     sockjs-client "1.3.0"

From 8352f1e10f5dd47b92410d5b3c9653dc0bbe8914 Mon Sep 17 00:00:00 2001
From: SamanthaAdrichem <samantha@adrichem.nu>
Date: Tue, 18 Jun 2019 14:04:19 +0200
Subject: [PATCH 1495/1703] fix(@schematics/angular): remove indentation in
 component html

Most editors remember the indentation, even if you remove all code. This way, there is no
indentation thus there is nothing for the editor to remember and there will be no need for
a HTML lint fix.

Fixes #14816
---
 .../__name@dasherize__.component.html.template                | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.html.template b/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.html.template
index 0e75382ec66e..4579e8f9e38b 100644
--- a/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.html.template
+++ b/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.html.template
@@ -1,3 +1 @@
-<p>
-  <%= dasherize(name) %> works!
-</p>
+<p><%= dasherize(name) %> works!</p>

From c9535a53c209b5bd8c4485fda39b48acc5691945 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 18 Jun 2019 10:50:45 +0200
Subject: [PATCH 1496/1703] fix(@angular-devkit/build-optimizer): wrap
 TypeScript string enums in IIFE

Fixes #14786
---
 .../src/transforms/wrap-enums.ts              | 11 +++++++---
 .../src/transforms/wrap-enums_spec.ts         | 21 +++++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
index f6400a7a4de4..f6149363b93e 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
@@ -299,11 +299,16 @@ function findTs2_3EnumIife(
     }
 
     const memberArgument = assignment.argumentExpression;
-    if (!memberArgument || !ts.isBinaryExpression(memberArgument)
-        || memberArgument.operatorToken.kind !== ts.SyntaxKind.FirstAssignment) {
-      return null;
+    // String enum
+    if (ts.isStringLiteral(memberArgument)) {
+      return [callExpression, exportExpression];
     }
 
+    // Non string enums
+    if (!ts.isBinaryExpression(memberArgument)
+      || memberArgument.operatorToken.kind !== ts.SyntaxKind.FirstAssignment) {
+      return null;
+    }
 
     if (!ts.isElementAccessExpression(memberArgument.left)) {
       return null;
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
index c5cc64241e23..e9881adf3c69 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
@@ -514,6 +514,27 @@ describe('wrap enums and classes transformer', () => {
       expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
     });
 
+    it('wraps TS string enums in IIFE', () => {
+      const input = tags.stripIndent`
+        export var NotificationKind;
+        (function (NotificationKind) {
+            NotificationKind["NEXT"] = "N";
+            NotificationKind["ERROR"] = "E";
+            NotificationKind["COMPLETE"] = "C";
+        })(NotificationKind || (NotificationKind = {}));
+      `;
+      const output = tags.stripIndent`
+        export var NotificationKind = /*@__PURE__*/ (function (NotificationKind) {
+            NotificationKind["NEXT"] = "N";
+            NotificationKind["ERROR"] = "E";
+            NotificationKind["COMPLETE"] = "C";
+            return NotificationKind;
+        })({});
+      `;
+
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+
     it('wraps tsickle enums in IIFE', () => {
       const input = tags.stripIndent`
         /** @enum {number} */

From 3bb67d81fb882d8624c60bf45a4e4990a09e9d16 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Tue, 18 Jun 2019 08:22:14 +0200
Subject: [PATCH 1497/1703] fix(@angular-devkit/build-optimizer): incorrectly
 augmented ES2015 default class exports

Fixes #14769
---
 .../src/transforms/wrap-enums.ts              | 53 ++++++++----
 .../src/transforms/wrap-enums_spec.ts         | 80 +++++++++++++++++++
 2 files changed, 117 insertions(+), 16 deletions(-)

diff --git a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
index f6149363b93e..ef2b94d020ea 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
@@ -63,7 +63,7 @@ function visitBlockStatements(
   // 'oIndex' is the original statement index; 'uIndex' is the updated statement index
   for (let oIndex = 0, uIndex = 0; oIndex < statements.length - 1; oIndex++, uIndex++) {
     const currentStatement = statements[oIndex];
-    let newStatement: ts.Statement | undefined;
+    let newStatement: ts.Statement[] | undefined;
     let oldStatementsLength = 0;
 
     // these can't contain an enum declaration
@@ -181,12 +181,15 @@ function visitBlockStatements(
       oIndex += classStatements.length - 1;
     }
 
-    if (newStatement) {
+    if (newStatement && newStatement.length > 0) {
       if (!updatedStatements) {
         updatedStatements = [...statements];
       }
 
-      updatedStatements.splice(uIndex, oldStatementsLength, newStatement);
+      updatedStatements.splice(uIndex, oldStatementsLength, ...newStatement);
+      // When having more than a single new statement
+      // we need to update the update Index
+      uIndex += (newStatement ? newStatement.length - 1 : 0);
     }
 
     const result = ts.visitNode(currentStatement, visitor);
@@ -531,7 +534,7 @@ function updateEnumIife(
   hostNode: ts.VariableStatement,
   iife: ts.CallExpression,
   exportAssignment?: ts.Expression,
-): ts.Statement {
+): ts.Statement[] {
   if (!ts.isParenthesizedExpression(iife.expression)
       || !ts.isFunctionExpression(iife.expression.expression)) {
     throw new Error('Invalid IIFE Structure');
@@ -583,7 +586,7 @@ function updateEnumIife(
       updatedIife);
   }
 
-  return updateHostNode(hostNode, value);
+  return [updateHostNode(hostNode, value)];
 }
 
 function createWrappedEnum(
@@ -592,7 +595,7 @@ function createWrappedEnum(
   statements: Array<ts.Statement>,
   literalInitializer: ts.ObjectLiteralExpression = ts.createObjectLiteral(),
   addExportModifier = false,
-): ts.Statement {
+): ts.Statement[] {
   const node = addExportModifier
     ? ts.updateVariableStatement(
       hostNode,
@@ -616,13 +619,13 @@ function createWrappedEnum(
     innerReturn,
   ]);
 
-  return updateHostNode(node, addPureComment(ts.createParen(iife)));
+  return [updateHostNode(node, addPureComment(ts.createParen(iife)))];
 }
 
 function createWrappedClass(
   hostNode: ts.ClassDeclaration | ts.VariableDeclaration,
   statements: ts.Statement[],
-): ts.Statement {
+): ts.Statement[] {
   const name = (hostNode.name as ts.Identifier).text;
 
   const updatedStatements = [...statements];
@@ -645,12 +648,30 @@ function createWrappedClass(
     ]),
   );
 
-  return ts.createVariableStatement(
-    hostNode.modifiers,
-    ts.createVariableDeclarationList([
-      ts.createVariableDeclaration(name, undefined, pureIife),
-    ],
-      ts.NodeFlags.Const,
-    ),
-  );
+  const modifiers = hostNode.modifiers;
+  const isDefault = !!modifiers
+    && modifiers.some(x => x.kind === ts.SyntaxKind.DefaultKeyword);
+
+  const newStatement: ts.Statement[] = [];
+  newStatement.push(
+    ts.createVariableStatement(
+      isDefault ? undefined : modifiers,
+      ts.createVariableDeclarationList([
+        ts.createVariableDeclaration(name, undefined, pureIife),
+      ],
+        ts.NodeFlags.Const,
+      ),
+    ));
+
+  if (isDefault) {
+    newStatement.push(
+      ts.createExportAssignment(
+        undefined,
+        undefined,
+        false,
+        ts.createIdentifier(name),
+      ));
+  }
+
+  return newStatement;
 }
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
index e9881adf3c69..8f6547274bd3 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
@@ -17,6 +17,46 @@ const transform = (content: string) => transformJavascript(
 // tslint:disable:no-big-function
 describe('wrap enums and classes transformer', () => {
   describe('wraps class declarations', () => {
+    it('should wrap default exported classes', () => {
+      const defaultClass = tags.stripIndent`
+       export default class CustomComponentEffects {
+          constructor(_actions) {
+            this._actions = _actions;
+            this.doThis = this._actions;
+          }
+        }
+        CustomComponentEffects.decorators = [{ type: Injectable }];
+      `;
+
+      const namedClass = tags.stripIndent`
+        class CustomComponent {
+          constructor(_actions) {
+            this._actions = _actions;
+            this.doThis = this._actions;
+          }
+        }
+        CustomComponent.decorators = [{ type: Injectable }];
+      `;
+
+      const output = tags.stripIndent`
+        const CustomComponentEffects = /*@__PURE__*/ (() => {
+          ${defaultClass.replace('export default ', '')}
+
+          return CustomComponentEffects;
+        })();
+        export default CustomComponentEffects;
+
+        const CustomComponent = /*@__PURE__*/ (() => {
+          ${namedClass}
+
+          return CustomComponent;
+        })();
+      `;
+
+      const input = defaultClass + namedClass;
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+
     it('should wrap tsickle emitted classes which followed by metadata', () => {
       const input = tags.stripIndent`
        class CustomComponentEffects {
@@ -169,6 +209,46 @@ describe('wrap enums and classes transformer', () => {
   });
 
   describe('wrap class expressions', () => {
+    it('should wrap default exported classes', () => {
+      const defaultClass = tags.stripIndent`
+        let Foo = class Foo {
+        };
+        Foo.bar = 'bar';
+        Foo = __decorate([
+            component()
+        ], Foo);
+        export default Foo;
+      `;
+
+      const namedClass = tags.stripIndent`
+        let AggregateColumnDirective = class AggregateColumnDirective {
+          constructor(viewContainerRef) { }
+        };
+        AggregateColumnDirective = __decorate([
+            Directive({}),
+            __metadata("design:paramtypes", [ViewContainerRef])
+        ], AggregateColumnDirective);
+      `;
+
+      const output = tags.stripIndent`
+        const Foo = /*@__PURE__*/ (() => {
+          ${defaultClass.replace('export default Foo;', '')}
+
+          return Foo;
+        })();
+        export default Foo;
+
+        const AggregateColumnDirective = /*@__PURE__*/ (() => {
+          ${namedClass}
+
+          return AggregateColumnDirective;
+        })();
+      `;
+
+      const input = defaultClass + namedClass;
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+
     it('without property decorators in IIFE', () => {
       const input = tags.stripIndent`
           let AggregateColumnDirective = class AggregateColumnDirective {

From 0ed8de1e8a8bb39fa58c4a475c2fd56c2aae28fa Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 18 Jun 2019 19:38:55 -0400
Subject: [PATCH 1498/1703] refactor(@angular-devkit/build-angular): cleanup
 compatible Angular version check

---
 .../build_angular/src/browser/index.ts        |   4 +-
 .../build_angular/src/dev-server/index.ts     |   4 +-
 .../build_angular/src/extract-i18n/index.ts   |   4 +-
 .../build_angular/src/karma/index.ts          |   4 +-
 .../build_angular/src/server/index.ts         |   4 +-
 .../build_angular/src/utils/version.ts        | 211 ++++++++----------
 6 files changed, 99 insertions(+), 132 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 5e01a8c51b20..7d28a41987cd 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -58,7 +58,7 @@ import {
 } from '../angular-cli-files/utilities/stats';
 import { ExecutionTransformer } from '../transforms';
 import { BuildBrowserFeatures, deleteOutputDir } from '../utils';
-import { Version } from '../utils/version';
+import { assertCompatibleAngularVersion } from '../utils/version';
 import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
 import { Schema as BrowserBuilderSchema } from './schema';
 
@@ -180,7 +180,7 @@ export function buildWebpackBrowser(
   const root = normalize(context.workspaceRoot);
 
   // Check Angular version.
-  Version.assertCompatibleAngularVersion(context.workspaceRoot);
+  assertCompatibleAngularVersion(context.workspaceRoot, context.logger);
 
   const loggingFn = transforms.logging
     || createBrowserLoggingCallback(!!options.verbose, context.logger);
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index f0679628691f..dd46b80e9ae1 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -36,7 +36,7 @@ import {
 import { Schema as BrowserBuilderSchema } from '../browser/schema';
 import { ExecutionTransformer } from '../transforms';
 import { normalizeOptimization } from '../utils';
-import { Version } from '../utils/version';
+import { assertCompatibleAngularVersion } from '../utils/version';
 import { Schema } from './schema';
 const open = require('open');
 
@@ -80,7 +80,7 @@ export function serveWebpackBrowser(
   } = {},
 ): Observable<DevServerBuilderOutput> {
   // Check Angular version.
-  Version.assertCompatibleAngularVersion(context.workspaceRoot);
+  assertCompatibleAngularVersion(context.workspaceRoot, context.logger);
 
   const browserTarget = targetFromTargetString(options.browserTarget);
   const root = context.workspaceRoot;
diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
index 70b80c95034b..92e44c6d9fc5 100644
--- a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
@@ -23,7 +23,7 @@ import {
 import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
 import { statsErrorsToString, statsWarningsToString } from '../angular-cli-files/utilities/stats';
 import { Schema as BrowserBuilderOptions } from '../browser/schema';
-import { Version } from '../utils/version';
+import { assertCompatibleAngularVersion } from '../utils/version';
 import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
 import { Schema as ExtractI18nBuilderOptions } from './schema';
 
@@ -51,7 +51,7 @@ class InMemoryOutputPlugin {
 
 async function execute(options: ExtractI18nBuilderOptions, context: BuilderContext) {
   // Check Angular version.
-  Version.assertCompatibleAngularVersion(context.workspaceRoot);
+  assertCompatibleAngularVersion(context.workspaceRoot, context.logger);
 
   const browserTarget = targetFromTargetString(options.browserTarget);
   const browserOptions = await context.validateOptions<JsonObject & BrowserBuilderOptions>(
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index b3d5bb0fe807..2c6615fa094f 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -19,7 +19,7 @@ import {
 } from '../angular-cli-files/models/webpack-configs';
 import { Schema as BrowserBuilderOptions } from '../browser/schema';
 import { ExecutionTransformer } from '../transforms';
-import { Version } from '../utils/version';
+import { assertCompatibleAngularVersion } from '../utils/version';
 import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
 import { Schema as KarmaBuilderOptions } from './schema';
 
@@ -69,7 +69,7 @@ export function execute(
   } = {},
 ): Observable<BuilderOutput> {
   // Check Angular version.
-  Version.assertCompatibleAngularVersion(context.workspaceRoot);
+  assertCompatibleAngularVersion(context.workspaceRoot, context.logger);
 
   return from(initialize(options, context, transforms.webpackConfiguration)).pipe(
     switchMap(([karma, webpackConfig]) => new Observable<BuilderOutput>(subscriber => {
diff --git a/packages/angular_devkit/build_angular/src/server/index.ts b/packages/angular_devkit/build_angular/src/server/index.ts
index 4130baa0ecd8..866a1bb1dce9 100644
--- a/packages/angular_devkit/build_angular/src/server/index.ts
+++ b/packages/angular_devkit/build_angular/src/server/index.ts
@@ -24,7 +24,7 @@ import {
 } from '../angular-cli-files/models/webpack-configs';
 import { ExecutionTransformer } from '../transforms';
 import { NormalizedBrowserBuilderSchema, deleteOutputDir } from '../utils';
-import { Version } from '../utils/version';
+import { assertCompatibleAngularVersion } from '../utils/version';
 import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
 import { Schema as ServerBuilderOptions } from './schema';
 
@@ -46,7 +46,7 @@ export function execute(
   const root = context.workspaceRoot;
 
   // Check Angular version.
-  Version.assertCompatibleAngularVersion(context.workspaceRoot);
+  assertCompatibleAngularVersion(context.workspaceRoot, context.logger);
 
   return from(buildServerWebpackConfig(options, context)).pipe(
     concatMap(async v => transforms.webpackConfiguration ? transforms.webpackConfiguration(v) : v),
diff --git a/packages/angular_devkit/build_angular/src/utils/version.ts b/packages/angular_devkit/build_angular/src/utils/version.ts
index c4893e7eda6a..3a1b47c94357 100644
--- a/packages/angular_devkit/build_angular/src/utils/version.ts
+++ b/packages/angular_devkit/build_angular/src/utils/version.ts
@@ -5,136 +5,103 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { tags, terminal } from '@angular-devkit/core';
-import * as path from 'path';
-import { SemVer, satisfies } from 'semver';
-
-
-export class Version {
-  private _semver: SemVer | null = null;
-  constructor(private _version: string | null = null) {
-    this._semver = _version ? new SemVer(_version) : null;
+import { logging, tags } from '@angular-devkit/core';
+import { SemVer, gte, satisfies } from 'semver';
+
+export function assertCompatibleAngularVersion(projectRoot: string, logger: logging.LoggerApi) {
+  let angularCliPkgJson;
+  let angularPkgJson;
+  let rxjsPkgJson;
+  const resolveOptions = { paths: [projectRoot] };
+
+  try {
+    const angularPackagePath = require.resolve('@angular/core/package.json', resolveOptions);
+    const rxjsPackagePath = require.resolve('rxjs/package.json', resolveOptions);
+
+    angularPkgJson = require(angularPackagePath);
+    rxjsPkgJson = require(rxjsPackagePath);
+  } catch {
+    logger.error(tags.stripIndents`
+      You seem to not be depending on "@angular/core" and/or "rxjs". This is an error.
+    `);
+
+    process.exit(2);
   }
 
-  isAlpha() { return this.qualifier == 'alpha'; }
-  isBeta() { return this.qualifier == 'beta'; }
-  isReleaseCandidate() { return this.qualifier == 'rc'; }
-  isKnown() { return this._version !== null; }
+  if (!(angularPkgJson && angularPkgJson['version'] && rxjsPkgJson && rxjsPkgJson['version'])) {
+    logger.error(tags.stripIndents`
+      Cannot determine versions of "@angular/core" and/or "rxjs".
+      This likely means your local installation is broken. Please reinstall your packages.
+    `);
 
-  isLocal() { return this.isKnown() && this._version && path.isAbsolute(this._version); }
-  isGreaterThanOrEqualTo(other: SemVer) {
-    return this._semver !== null && this._semver.compare(other) >= 0;
-  }
-  satisfies(other: string) {
-    // This comparison includes pre-releases (like betas and rcs), and considers them to be
-    // before the release proper.
-    // e.g. '9.0.0-beta.1' will satisfy '>=7.0.0 <9.0.0', but '9.0.0' will not.
-    return this._semver !== null && satisfies(this._semver, other, { includePrerelease: true });
+    process.exit(2);
   }
 
-  get major() { return this._semver ? this._semver.major : 0; }
-  get minor() { return this._semver ? this._semver.minor : 0; }
-  get patch() { return this._semver ? this._semver.patch : 0; }
-  get qualifier() { return this._semver ? this._semver.prerelease[0] : ''; }
-  get extra() { return this._semver ? this._semver.prerelease[1] : ''; }
-
-  toString() { return this._version; }
-
-  static assertCompatibleAngularVersion(projectRoot: string) {
-    let angularCliPkgJson;
-    let angularPkgJson;
-    let rxjsPkgJson;
-    const resolveOptions = { paths: [projectRoot] };
-
-    try {
-      const angularPackagePath = require.resolve('@angular/core/package.json', resolveOptions);
-      const rxjsPackagePath = require.resolve('rxjs/package.json', resolveOptions);
-
-      angularPkgJson = require(angularPackagePath);
-      rxjsPkgJson = require(rxjsPackagePath);
-    } catch {
-      console.error(terminal.bold(terminal.red(tags.stripIndents`
-        You seem to not be depending on "@angular/core" and/or "rxjs". This is an error.
-      `)));
-      process.exit(2);
+  try {
+    const angularCliPkgPath = require.resolve('@angular/cli/package.json', resolveOptions);
+    angularCliPkgJson = require(angularCliPkgPath);
+    if (!(angularCliPkgJson && angularCliPkgJson['version'])) {
+      throw new Error();
     }
+  } catch {
+    logger.error(tags.stripIndents`
+      Cannot determine versions of "@angular/cli".
+      This likely means your local installation is broken. Please reinstall your packages.
+    `);
 
-    if (!(angularPkgJson && angularPkgJson['version'] && rxjsPkgJson && rxjsPkgJson['version'])) {
-      console.error(terminal.bold(terminal.red(tags.stripIndents`
-        Cannot determine versions of "@angular/core" and/or "rxjs".
-        This likely means your local installation is broken. Please reinstall your packages.
-      `)));
-      process.exit(2);
-    }
-
-    try {
-      const angularCliPkgPath = require.resolve('@angular/cli/package.json', resolveOptions);
-      angularCliPkgJson = require(angularCliPkgPath);
-      if (!(angularCliPkgJson && angularCliPkgJson['version'])) {
-        throw new Error();
-      }
-    } catch (error) {
-      console.error(terminal.bold(terminal.red(tags.stripIndents`
-        Cannot determine versions of "@angular/cli".
-        This likely means your local installation is broken. Please reinstall your packages.
-      `)));
-      process.exit(2);
-    }
-
-    if (angularCliPkgJson['version'] === '0.0.0') {
-      // Internal testing version
-      return;
-    }
-
-    const cliMajor = new Version(angularCliPkgJson['version']).major;
-    // e.g. CLI 8.0 supports '>=8.0.0 <9.0.0', including pre-releases (betas, rcs, snapshots)
-    // of both 8 and 9.
-    const supportedAngularSemver = `^${cliMajor}.0.0-beta || ` +
-      `>=${cliMajor}.0.0 <${cliMajor + 1}.0.0`;
-
-    const angularVersion = new Version(angularPkgJson['version']);
-    const rxjsVersion = new Version(rxjsPkgJson['version']);
-
-    if (angularVersion.isLocal()) {
-      console.error(terminal.yellow('Using a local version of angular. Proceeding with care...'));
-
-      return;
-    }
+    process.exit(2);
+  }
 
-    if (!angularVersion.satisfies(supportedAngularSemver)) {
-      console.error(terminal.bold(terminal.red(tags.stripIndents`
-          This version of CLI is only compatible with Angular versions ${supportedAngularSemver},
-          but Angular version ${angularVersion} was found instead.
-
-          Please visit the link below to find instructions on how to update Angular.
-          https://angular-update-guide.firebaseapp.com/
-        ` + '\n')));
-      process.exit(3);
-    } else if (
-      angularVersion.isGreaterThanOrEqualTo(new SemVer('6.0.0-rc.0'))
-      && !rxjsVersion.isGreaterThanOrEqualTo(new SemVer('5.6.0-forward-compat.0'))
-      && !rxjsVersion.isGreaterThanOrEqualTo(new SemVer('6.0.0-beta.0'))
-    ) {
-      console.error(terminal.bold(terminal.red(tags.stripIndents`
-          This project uses version ${rxjsVersion} of RxJs, which is not supported by Angular v6+.
-          The official RxJs version that is supported is 5.6.0-forward-compat.0 and greater.
-
-          Please visit the link below to find instructions on how to update RxJs.
-          https://docs.google.com/document/d/12nlLt71VLKb-z3YaSGzUfx6mJbc34nsMXtByPUN35cg/edit#
-        ` + '\n')));
-      process.exit(3);
-    } else if (
-      angularVersion.isGreaterThanOrEqualTo(new SemVer('6.0.0-rc.0'))
-      && !rxjsVersion.isGreaterThanOrEqualTo(new SemVer('6.0.0-beta.0'))
-    ) {
-      console.warn(terminal.bold(terminal.red(tags.stripIndents`
-          This project uses a temporary compatibility version of RxJs (${rxjsVersion}).
-
-          Please visit the link below to find instructions on how to update RxJs.
-          https://docs.google.com/document/d/12nlLt71VLKb-z3YaSGzUfx6mJbc34nsMXtByPUN35cg/edit#
-        ` + '\n')));
-    }
+  if (angularCliPkgJson['version'] === '0.0.0') {
+    // Internal testing version
+    return;
   }
 
+  const cliMajor = new SemVer(angularCliPkgJson['version']).major;
+  // e.g. CLI 8.0 supports '>=8.0.0 <9.0.0', including pre-releases (betas, rcs, snapshots)
+  // of both 8 and 9.
+  const supportedAngularSemver =
+    `^${cliMajor}.0.0-beta || ` + `>=${cliMajor}.0.0 <${cliMajor + 1}.0.0`;
+
+  const angularVersion = new SemVer(angularPkgJson['version']);
+  const rxjsVersion = new SemVer(rxjsPkgJson['version']);
+
+  if (!satisfies(angularVersion, supportedAngularSemver, { includePrerelease: true })) {
+    logger.error(
+      tags.stripIndents`
+        This version of CLI is only compatible with Angular versions ${supportedAngularSemver},
+        but Angular version ${angularVersion} was found instead.
+
+        Please visit the link below to find instructions on how to update Angular.
+        https://angular-update-guide.firebaseapp.com/
+      ` + '\n',
+    );
+
+    process.exit(3);
+  } else if (
+    gte(angularVersion, '6.0.0-rc.0') &&
+    !gte(rxjsVersion, '5.6.0-forward-compat.0') &&
+    !gte(rxjsVersion, '6.0.0-beta.0')
+  ) {
+    logger.error(
+      tags.stripIndents`
+        This project uses version ${rxjsVersion} of RxJs, which is not supported by Angular v6+.
+        The official RxJs version that is supported is 5.6.0-forward-compat.0 and greater.
+
+        Please visit the link below to find instructions on how to update RxJs.
+        https://docs.google.com/document/d/12nlLt71VLKb-z3YaSGzUfx6mJbc34nsMXtByPUN35cg/edit#
+      ` + '\n',
+    );
+
+    process.exit(3);
+  } else if (gte(angularVersion, '6.0.0-rc.0') && !gte(rxjsVersion, '6.0.0-beta.0')) {
+    logger.warn(
+      tags.stripIndents`
+        This project uses a temporary compatibility version of RxJs (${rxjsVersion}).
+
+        Please visit the link below to find instructions on how to update RxJs.
+        https://docs.google.com/document/d/12nlLt71VLKb-z3YaSGzUfx6mJbc34nsMXtByPUN35cg/edit#
+      ` + '\n',
+    );
+  }
 }

From 3cd0931eb740960a7004b0af060fe0f378b4cfcd Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Wed, 19 Jun 2019 15:31:42 +0200
Subject: [PATCH 1499/1703] fix(@angular/cli): correct git branch in ng version

When testing a local CLI build with `npm link @angular/cli`, if you run `ng version`,
you currently see:

    Angular CLI: local (v8.1.0-beta.2+24.3bb67d8.with-local-changes, branch: version)

if the Git branch is `fix/version`.

Whit this PR, `ng version` now displays the proper Git branch name:

    Angular CLI: local (v8.1.0-beta.2+24.3bb67d8.with-local-changes, branch: fix/version)
---
 packages/angular/cli/commands/version-impl.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/angular/cli/commands/version-impl.ts b/packages/angular/cli/commands/version-impl.ts
index 5724a2b49910..44bcdfa759df 100644
--- a/packages/angular/cli/commands/version-impl.ts
+++ b/packages/angular/cli/commands/version-impl.ts
@@ -84,8 +84,12 @@ export class VersionCommand extends Command<VersionCommandSchema> {
     if (!__dirname.match(/node_modules/)) {
       let gitBranch = '??';
       try {
-        const gitRefName = '' + child_process.execSync('git symbolic-ref HEAD', {cwd: __dirname});
-        gitBranch = path.basename(gitRefName.replace('\n', ''));
+        const gitRefName = child_process.execSync('git rev-parse --abbrev-ref HEAD', {
+          cwd: __dirname,
+          encoding: 'utf8',
+          stdio: 'pipe',
+        });
+        gitBranch = gitRefName.replace('\n', '');
       } catch {
       }
 

From c7135fae357ffe16bd420b59b80b002632806a45 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Wed, 19 Jun 2019 14:14:21 +0200
Subject: [PATCH 1500/1703] fix(@angular-devkit/build-angular): browser builder
 should not swollow error messages

Closes #14813
---
 .../angular/cli/models/architect-command.ts   |  8 ++++++--
 .../utilities/service-worker/index.ts         |  2 +-
 .../build_angular/src/browser/index.ts        | 19 +++++++++++++++++--
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index 899bd806bed4..9af118b80db1 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -270,10 +270,14 @@ export abstract class ArchitectCommand<
         },
       );
 
-      const result = await run.output.toPromise();
+      const { error, success } = await run.output.toPromise();
       await run.stop();
 
-      return result.success ? 0 : 1;
+      if (error) {
+        this.logger.error(error);
+      }
+
+      return success ? 0 : 1;
     }
   }
 
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/service-worker/index.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/service-worker/index.ts
index fb1baa6ebc31..bb712e5b7894 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/service-worker/index.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/service-worker/index.ts
@@ -102,7 +102,7 @@ export async function augmentAppWithServiceWorker(
   if (!configExists) {
     throw new Error(tags.oneLine`
       Error: Expected to find an ngsw-config.json configuration
-      file in the ${appRoot} folder. Either provide one or disable Service Worker
+      file in the ${getSystemPath(appRoot)} folder. Either provide one or disable Service Worker
       in your angular.json configuration file.
     `);
   }
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 7d28a41987cd..ad875e077e13 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -261,7 +261,7 @@ export function buildWebpackBrowser(
             })
             .pipe(
               map(() => ({ success: true })),
-              catchError(() => of({ success: false })),
+              catchError(error => of({ success: false, error: mapErrorToMessage(error) })),
             );
           } else {
             return of({ success });
@@ -276,7 +276,10 @@ export function buildWebpackBrowser(
               resolve(root, normalize(options.outputPath)),
               options.baseHref || '/',
               options.ngswConfigPath,
-            ).then(() => ({ success: true }), () => ({ success: false })));
+            ).then(
+              () => ({ success: true }),
+              error => ({ success: false, error: mapErrorToMessage(error) }),
+            ));
           } else {
             return of(buildEvent);
           }
@@ -291,4 +294,16 @@ export function buildWebpackBrowser(
   );
 }
 
+function mapErrorToMessage(error: unknown): string | undefined {
+  if (error instanceof Error) {
+    return error.message;
+  }
+
+  if (typeof error === 'string') {
+    return error;
+  }
+
+  return undefined;
+}
+
 export default createBuilder<json.JsonObject & BrowserBuilderSchema>(buildWebpackBrowser);

From 0701afc31f6f1361ca70ec86107dfa87c4fb86a1 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 19 Jun 2019 17:16:02 +0200
Subject: [PATCH 1501/1703] fix(@angular-devkit/build-angular): browser builder
 should not swollow error messages

Closes #14813
---
 packages/angular_devkit/build_angular/src/karma/index.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index 2c6615fa094f..134dee009d08 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -8,7 +8,7 @@
 import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
 import { resolve } from 'path';
 import { Observable, from } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
+import { defaultIfEmpty, switchMap } from 'rxjs/operators';
 import * as webpack from 'webpack';
 import {
   getCommonConfig,
@@ -128,6 +128,7 @@ export function execute(
         }
       };
     })),
+    defaultIfEmpty({ success: false }),
   );
 }
 

From 10200f1395229032caebf98d92a32ba4c975a96f Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Wed, 19 Jun 2019 09:17:46 +0200
Subject: [PATCH 1502/1703] fix(@angular-devkit/build-angular): remove certain
 redundant build steps from second build in differential loading

With this change we remove styles compilation and copying of assets for the second build when differential loading is enabled.

This should improve the build times for larger applications.
---
 .../src/utils/webpack-browser-config.ts       | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
index df478dbfde32..44e09b02f977 100644
--- a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
+++ b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
@@ -68,20 +68,29 @@ export async function generateWebpackConfig(
   // For differential loading, we can have several targets
   return scriptTargets.map(scriptTarget => {
     let buildOptions: NormalizedBrowserBuilderSchema = { ...options };
+    const supportES2015
+      = scriptTarget !== ts.ScriptTarget.ES3 && scriptTarget !== ts.ScriptTarget.ES5;
+
     if (differentialLoading) {
-      // For differential loading, the builder needs to created the index.html by itself
-      // without using a webpack plugin.
       buildOptions = {
         ...options,
+        ...(
+          // FIXME: we do create better webpack config composition to achieve the below
+          // When DL is enabled and supportES2015 is true it means that we are on the second build
+          // This also means that we don't need to include styles and assets multiple times
+          supportES2015
+            ? {}
+            : {
+              styles: options.extractCss ? [] : options.styles,
+              assets: [],
+            }
+        ),
         es5BrowserSupport: undefined,
         esVersionInFileName: true,
         scriptTargetOverride: scriptTarget,
       };
     }
 
-    const supportES2015
-      = scriptTarget !== ts.ScriptTarget.ES3 && scriptTarget !== ts.ScriptTarget.ES5;
-
     const wco: BrowserWebpackConfigOptions = {
       root: workspaceRoot,
       logger: logger.createChild('webpackConfigOptions'),

From 533961198a63b9518056896a53677ad3c541f9ca Mon Sep 17 00:00:00 2001
From: Lakhyari <med.lakhyari@gmail.com>
Date: Sat, 15 Jun 2019 13:35:22 +0200
Subject: [PATCH 1503/1703] fix(@schematics/angular): improve pipe signature

Currently , the CLI generates :

```typescript

transform(value: any , args?: any)

```

With this commit , it generate :

```typescript

transform(value: any, ...args?: any[])

```

Which conforms to the official doc

Fixes #12602
---
 .../__name@dasherize__.pipe.ts.template                         | 2 +-
 packages/schematics/angular/pipe/index_spec.ts                  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/angular/pipe/files/__name@dasherize@if-flat__/__name@dasherize__.pipe.ts.template b/packages/schematics/angular/pipe/files/__name@dasherize@if-flat__/__name@dasherize__.pipe.ts.template
index dfe487a73d9d..28ce3d4cb566 100644
--- a/packages/schematics/angular/pipe/files/__name@dasherize@if-flat__/__name@dasherize__.pipe.ts.template
+++ b/packages/schematics/angular/pipe/files/__name@dasherize@if-flat__/__name@dasherize__.pipe.ts.template
@@ -5,7 +5,7 @@ import { Pipe, PipeTransform } from '@angular/core';
 })
 export class <%= classify(name) %>Pipe implements PipeTransform {
 
-  transform(value: any, args?: any): any {
+  transform(value: any, ...args: any[]): any {
     return null;
   }
 
diff --git a/packages/schematics/angular/pipe/index_spec.ts b/packages/schematics/angular/pipe/index_spec.ts
index 70c7b171b3f7..1586f75530ce 100644
--- a/packages/schematics/angular/pipe/index_spec.ts
+++ b/packages/schematics/angular/pipe/index_spec.ts
@@ -57,6 +57,8 @@ describe('Pipe Schematic', () => {
     const moduleContent = getFileContent(tree, '/projects/bar/src/app/app.module.ts');
     expect(moduleContent).toMatch(/import.*Foo.*from '.\/foo.pipe'/);
     expect(moduleContent).toMatch(/declarations:\s*\[[^\]]+?,\r?\n\s+FooPipe\r?\n/m);
+    const fileContent = tree.readContent('/projects/bar/src/app/foo.pipe.ts');
+    expect(fileContent).toContain('transform(value: any, ...args: any[])');
   });
 
   it('should import into a specified module', async () => {

From 92b35fba23bcb2466bdcac3476c7879f6a6d19af Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 20 Jun 2019 06:18:50 +0000
Subject: [PATCH 1504/1703] build: update ansi-colors to version 4.0.1

---
 packages/angular/cli/package.json | 2 +-
 yarn.lock                         | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index b5598c217070..2bb99bd888be 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -31,7 +31,7 @@
     "@schematics/angular": "0.0.0",
     "@schematics/update": "0.0.0",
     "@yarnpkg/lockfile": "1.1.0",
-    "ansi-colors": "3.2.4",
+    "ansi-colors": "4.0.1",
     "debug": "^4.1.1",
     "ini": "1.3.5",
     "inquirer": "6.3.1",
diff --git a/yarn.lock b/yarn.lock
index c309838f0aa9..f5aa45678dc4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -993,6 +993,11 @@ ansi-colors@3.2.4:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
   integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
 
+ansi-colors@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.0.1.tgz#3dc29301836c6152f617a71466bde162a2e42582"
+  integrity sha512-1Qs1jdXEMSYwcVooLRfnCc5+e3365pw38v4AVkSsCxsjXRGKDTem5VLCl53SpHSpLnEy8O5DofJHZJELaRiJbg==
+
 ansi-colors@^3.0.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.1.tgz#9638047e4213f3428a11944a7d4b31cba0a3ff95"

From bf4d97254eec3f47e4d572ab5d87c1fba102481a Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 20 Jun 2019 06:18:35 +0000
Subject: [PATCH 1505/1703] build: update webpack to version 4.35.0

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 packages/angular_devkit/build_webpack/package.json | 2 +-
 packages/ngtools/webpack/package.json              | 2 +-
 yarn.lock                                          | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index d37202d49958..da177f6409c8 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -48,7 +48,7 @@
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.3.0",
-    "webpack": "4.34.0",
+    "webpack": "4.35.0",
     "webpack-dev-middleware": "3.7.0",
     "webpack-dev-server": "3.7.2",
     "webpack-merge": "4.2.1",
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index 960c4b6f7adb..d41e52e177db 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -17,7 +17,7 @@
     "webpack-dev-server": "^3.1.4"
   },
   "devDependencies": {
-    "webpack": "4.34.0",
+    "webpack": "4.35.0",
     "webpack-dev-server": "^3.1.4"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 3f47e1767d8c..c6b5f5820a55 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -36,6 +36,6 @@
     "@angular/compiler": "~8.1.0-next.1",
     "@angular/compiler-cli": "~8.1.0-next.1",
     "typescript": "3.4.5",
-    "webpack": "4.34.0"
+    "webpack": "4.35.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index f5aa45678dc4..650960c5bde1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10241,10 +10241,10 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.34.0:
-  version "4.34.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.34.0.tgz#a4c30129482f7b4ece4c0842002dedf2b56fab58"
-  integrity sha512-ry2IQy1wJjOefLe1uJLzn5tG/DdIKzQqNlIAd2L84kcaADqNvQDTBlo8UcCNyDaT5FiaB+16jhAkb63YeG3H8Q==
+webpack@4.35.0:
+  version "4.35.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.35.0.tgz#ad3f0f8190876328806ccb7a36f3ce6e764b8378"
+  integrity sha512-M5hL3qpVvtr8d4YaJANbAQBc4uT01G33eDpl/psRTBCfjxFTihdhin1NtAKB1ruDwzeVdcsHHV3NX+QsAgOosw==
   dependencies:
     "@webassemblyjs/ast" "1.8.5"
     "@webassemblyjs/helper-module-context" "1.8.5"

From a88dce5b89ba338ac5d9205b660fd60105b65d23 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 20 Jun 2019 05:02:38 +0000
Subject: [PATCH 1506/1703] build: update inquirer to version 6.4.0

---
 packages/angular/cli/package.json                   | 2 +-
 packages/angular_devkit/schematics_cli/package.json | 2 +-
 yarn.lock                                           | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 2bb99bd888be..92d96004a419 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -34,7 +34,7 @@
     "ansi-colors": "4.0.1",
     "debug": "^4.1.1",
     "ini": "1.3.5",
-    "inquirer": "6.3.1",
+    "inquirer": "6.4.0",
     "npm-package-arg": "6.1.0",
     "open": "6.3.0",
     "pacote": "9.5.1",
diff --git a/packages/angular_devkit/schematics_cli/package.json b/packages/angular_devkit/schematics_cli/package.json
index b4ae081ed575..07965fdd963a 100644
--- a/packages/angular_devkit/schematics_cli/package.json
+++ b/packages/angular_devkit/schematics_cli/package.json
@@ -18,7 +18,7 @@
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
     "@schematics/schematics": "0.0.0",
-    "inquirer": "6.3.1",
+    "inquirer": "6.4.0",
     "minimist": "1.2.0",
     "rxjs": "6.4.0",
     "symbol-observable": "1.2.0"
diff --git a/yarn.lock b/yarn.lock
index 650960c5bde1..1b423a3a9520 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4759,10 +4759,10 @@ injection-js@^2.2.1:
   resolved "https://registry.yarnpkg.com/injection-js/-/injection-js-2.2.1.tgz#a8d6a085b2f0b8d8650f6f4487f6abb8cc0d67ce"
   integrity sha512-zHI+E+dM0PXix5FFTO1Y4/UOyAzE7zG1l/QwAn4jchTThOoBq+UYRFK4AVG7lQgFL+go62SbrzSsjXy9DFEZUg==
 
-inquirer@6.3.1:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.3.1.tgz#7a413b5e7950811013a3db491c61d1f3b776e8e7"
-  integrity sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==
+inquirer@6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.4.0.tgz#6f9284047c4e48b76b169e46b3ae3b2171ce30a2"
+  integrity sha512-O3qJQ+fU/AI1K2y5/RjqefMEQTdJQf6sPTvyRA1bx6D634ADxcu97u6YOUciIeU2OWIuvpUsQs6Wx3Fdi3eFaQ==
   dependencies:
     ansi-escapes "^3.2.0"
     chalk "^2.4.2"

From c3aa8b9ac79ae011a66726345f54b3635d5e72a7 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 20 Jun 2019 05:02:17 +0000
Subject: [PATCH 1507/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 394a9c7c05a7..b72189b98ba4 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#6ccdf5ee497b13c54b5a5d4eb6c17f74f3b91977",
-    "@angular/common": "github:angular/common-builds#c808b66386cb24eb65fecb92826600a24629ebd8",
-    "@angular/compiler": "github:angular/compiler-builds#f43f0a4cd1886682751ce50c3dc146e692f85caf",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#1e7c5f91f3334e71bd24d57de4879cec1dbd8317",
-    "@angular/core": "github:angular/core-builds#955bb375afc4fb1bcbdebe6ca55490d95b206aba",
-    "@angular/forms": "github:angular/forms-builds#87db7f986f948bfc2f53bd305cdc63be6009dc03",
-    "@angular/language-service": "github:angular/language-service-builds#33965b66619d61328c9b492b84b9d5d1265fe6cb",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#60ad162592a1dfa014a1fde1536b351f3db0f4f2",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#cdfac5f8605c3e1941303f78522d9a06ca96e9e2",
-    "@angular/router": "github:angular/router-builds#8ce26b221611c2a96f79c4b48c65b5aeb919fa71"
+    "@angular/animations": "github:angular/animations-builds#09fd01d9f398e4a2d826b942d7b435e2d1878f00",
+    "@angular/common": "github:angular/common-builds#33a3734803a93036938742fb99f118687e6442e1",
+    "@angular/compiler": "github:angular/compiler-builds#2cf9d9dcf381f50493d312dca4263a149413c368",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#824d6f6673fdae374c85b096801aca497e0b03bd",
+    "@angular/core": "github:angular/core-builds#dd0b0634c792646444f4a2e70895bef5637e49cb",
+    "@angular/forms": "github:angular/forms-builds#0ab8c0a2d62a4c3cbb7c25b3fcc5c2bca2797741",
+    "@angular/language-service": "github:angular/language-service-builds#c63b5e2fb64ac63924bc5da75d358bf9d4a66e5e",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#66b65b144219e610478415ff7e3d27ec70597116",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#b1eabe4001426347842d09b5c9df8432b802c843",
+    "@angular/router": "github:angular/router-builds#25a02f28e2c7cad90801fd653f72c302658b2779"
   }
 }
\ No newline at end of file

From ba44d944b07f35a15639d092aecc92814cbcbeae Mon Sep 17 00:00:00 2001
From: ukrukarg <ukrukar@google.com>
Date: Wed, 19 Jun 2019 14:51:52 -0400
Subject: [PATCH 1508/1703] feat(@angular-devkit/schematics): Add
 registerCollection to SchematicsTestRunner

Fixes #14833
---
 .../schematics/testing/schematic-test-runner.ts               | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/angular_devkit/schematics/testing/schematic-test-runner.ts b/packages/angular_devkit/schematics/testing/schematic-test-runner.ts
index 9b89f6f46057..02d12c4ff2ca 100644
--- a/packages/angular_devkit/schematics/testing/schematic-test-runner.ts
+++ b/packages/angular_devkit/schematics/testing/schematic-test-runner.ts
@@ -72,6 +72,10 @@ export class SchematicTestRunner {
   get logger(): logging.Logger { return this._logger; }
   get tasks(): TaskConfiguration[] { return [...this._engineHost.tasks]; }
 
+  registerCollection(collectionName: string, collectionPath: string) {
+    this._engineHost.registerCollection(collectionName, collectionPath);
+  }
+
   runSchematicAsync<SchematicSchemaT>(
     schematicName: string,
     opts?: SchematicSchemaT,

From 11c8e935b7e83c25d2d57aa75a460eac2ba0e773 Mon Sep 17 00:00:00 2001
From: ukrukarg <ukrukar@google.com>
Date: Wed, 19 Jun 2019 14:51:52 -0400
Subject: [PATCH 1509/1703] feat(@angular-devkit/schematics): Add
 registerCollection to SchematicsTestRunner

Fixes #14833
---
 etc/api/angular_devkit/schematics/testing/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/etc/api/angular_devkit/schematics/testing/index.d.ts b/etc/api/angular_devkit/schematics/testing/index.d.ts
index b2fd06c700a4..14148f616992 100644
--- a/etc/api/angular_devkit/schematics/testing/index.d.ts
+++ b/etc/api/angular_devkit/schematics/testing/index.d.ts
@@ -4,6 +4,7 @@ export declare class SchematicTestRunner {
     readonly tasks: TaskConfiguration[];
     constructor(_collectionName: string, collectionPath: string);
     callRule(rule: Rule, tree: Tree, parentContext?: Partial<SchematicContext>): Observable<Tree>;
+    registerCollection(collectionName: string, collectionPath: string): void;
     runExternalSchematic<SchematicSchemaT>(collectionName: string, schematicName: string, opts?: SchematicSchemaT, tree?: Tree): UnitTestTree;
     runExternalSchematicAsync<SchematicSchemaT>(collectionName: string, schematicName: string, opts?: SchematicSchemaT, tree?: Tree): Observable<UnitTestTree>;
     runSchematic<SchematicSchemaT>(schematicName: string, opts?: SchematicSchemaT, tree?: Tree): UnitTestTree;

From 302cace038285c7a502dae2a5aa2207e0f2b0197 Mon Sep 17 00:00:00 2001
From: mgechev <mgechev@gmail.com>
Date: Fri, 14 Jun 2019 18:16:13 -0700
Subject: [PATCH 1510/1703] feat(@schematics/angular): add skipSelector
 property to the component generator

Fix #14749
---
 .../__name@dasherize__.component.ts.template             | 4 ++--
 packages/schematics/angular/component/index_spec.ts      | 9 +++++++++
 packages/schematics/angular/component/schema.json        | 5 +++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template b/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template
index 05940077a7fb..7993328cbf83 100644
--- a/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template
+++ b/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.component.ts.template
@@ -1,7 +1,7 @@
 import { Component, OnInit<% if(!!viewEncapsulation) { %>, ViewEncapsulation<% }%><% if(changeDetection !== 'Default') { %>, ChangeDetectionStrategy<% }%> } from '@angular/core';
 
-@Component({
-  selector: '<%= selector %>',<% if(inlineTemplate) { %>
+@Component({<% if(!skipSelector) {%>
+  selector: '<%= selector %>',<%}%><% if(inlineTemplate) { %>
   template: `
     <p>
       <%= dasherize(name) %> works!
diff --git a/packages/schematics/angular/component/index_spec.ts b/packages/schematics/angular/component/index_spec.ts
index 303d8ebcc3e1..7496c2d986c5 100644
--- a/packages/schematics/angular/component/index_spec.ts
+++ b/packages/schematics/angular/component/index_spec.ts
@@ -325,6 +325,15 @@ describe('Component Schematic', () => {
     expect(content).toMatch(/selector: 'app-test'/);
   });
 
+  it('should respect the skipSelector option', async () => {
+    const options = { ...defaultOptions, name: 'sub/test', skipSelector: true };
+    appTree = await schematicRunner.runSchematicAsync('component', options, appTree)
+      .toPromise();
+    const content = appTree.readContent('/projects/bar/src/app/sub/test/test.component.ts');
+    expect(content).not.toMatch(/selector: 'app-test'/);
+    console.log(content);
+  });
+
   it('should respect the sourceRoot value', async () => {
     const config = JSON.parse(appTree.readContent('/angular.json'));
     config.projects.bar.sourceRoot = 'projects/bar/custom';
diff --git a/packages/schematics/angular/component/schema.json b/packages/schematics/angular/component/schema.json
index 1e543bab2122..95f25cdc2dc4 100644
--- a/packages/schematics/angular/component/schema.json
+++ b/packages/schematics/angular/component/schema.json
@@ -116,6 +116,11 @@
       "format": "html-selector",
       "description": "The HTML selector to use for this component."
     },
+    "skipSelector": {
+      "type": "boolean",
+      "default": false,
+      "description": "Specifies if the component should have a selector or not."
+    },
     "module":  {
       "type": "string",
       "description": "The declaring NgModule.",

From a1402d9f107c3ed09288f29c1482a3a22a03ac61 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 19 Jun 2019 20:45:25 +0200
Subject: [PATCH 1511/1703] fix(@ngtools/webpack): NGCC workspace libraries
 module resolution

Fixes #14594
---
 packages/ngtools/webpack/src/ngcc_processor.ts | 7 ++++++-
 tests/legacy-cli/e2e_runner.ts                 | 2 --
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/ngtools/webpack/src/ngcc_processor.ts b/packages/ngtools/webpack/src/ngcc_processor.ts
index b5933ab70066..241b1a2ba12c 100644
--- a/packages/ngtools/webpack/src/ngcc_processor.ts
+++ b/packages/ngtools/webpack/src/ngcc_processor.ts
@@ -97,10 +97,15 @@ export class NgccProcessor {
    */
   private tryResolvePackage(moduleName: string, resolvedFileName: string): string | undefined {
     try {
+      let packageJsonPath = path.resolve(resolvedFileName, '../package.json');
+      if (existsSync(packageJsonPath)) {
+        return packageJsonPath;
+      }
+
       // This is based on the logic in the NGCC compiler
       // tslint:disable-next-line:max-line-length
       // See: https://github.com/angular/angular/blob/b93c1dffa17e4e6900b3ab1b9e554b6da92be0de/packages/compiler-cli/src/ngcc/src/packages/dependency_host.ts#L85-L121
-      const packageJsonPath = require.resolve(`${moduleName}/package.json`,
+      packageJsonPath = require.resolve(`${moduleName}/package.json`,
         {
           paths: [resolvedFileName],
         },
diff --git a/tests/legacy-cli/e2e_runner.ts b/tests/legacy-cli/e2e_runner.ts
index b4ad05e5d46a..ec1d980aa132 100644
--- a/tests/legacy-cli/e2e_runner.ts
+++ b/tests/legacy-cli/e2e_runner.ts
@@ -141,8 +141,6 @@ if (argv.ivy) {
     // Ivy doesn't support i18n externally at the moment.
     .filter(name => !name.includes('tests/i18n/'))
     .filter(name => !name.endsWith('tests/build/aot/aot-i18n.ts'))
-    // We don't have a library consumption story yet for Ivy.
-    .filter(name => !name.endsWith('tests/generate/library/library-consumption.ts'))
     // The additional lazy modules array does not work with Ivy because it's not needed.
     .filter(name => !name.endsWith('tests/build/dynamic-import.ts'))
     // We don't have a platform-server usage story yet for Ivy.

From c0eadbe2a8a1f71f53d2a89f549e3ae5721bf081 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 5 Mar 2019 21:20:34 -0500
Subject: [PATCH 1512/1703] build: integrate prettier code formatting

---
 .circleci/config.yml |   8 +-
 .lintstagedrc        |   3 +
 .prettierrc          |   5 +
 package.json         |   3 +
 tslint.json          |  59 --------
 yarn.lock            | 318 +++++++++++++++++++++++++++++++++++++++++--
 6 files changed, 324 insertions(+), 72 deletions(-)
 create mode 100644 .lintstagedrc
 create mode 100644 .prettierrc

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ee9dbeebd80a..0f323e609ffe 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -106,7 +106,13 @@ jobs:
     <<: *defaults
     steps:
       - attach_workspace: *attach_options
-      - run: yarn validate -- --ci
+      - run: yarn validate --ci
+      - run:
+          name: Validate Code Formatting
+          command: |
+            if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then
+              npx prettier --check ".prettierrc" $(git log $CIRCLE_BRANCH --name-only --diff-filter=ACM --pretty="format:" --not $(git for-each-ref --format='%(refname)' refs/heads/ | grep -v "refs/heads/$CIRCLE_BRANCH") -- "*.js" "*.ts")
+            fi
 
   test:
     <<: *defaults
diff --git a/.lintstagedrc b/.lintstagedrc
new file mode 100644
index 000000000000..a27f13725bb0
--- /dev/null
+++ b/.lintstagedrc
@@ -0,0 +1,3 @@
+{
+  "*.{js,ts}": ["prettier --write", "git add"]
+}
\ No newline at end of file
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 000000000000..5e2863a11f68
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,5 @@
+{
+  "printWidth": 100,
+  "singleQuote": true,
+  "trailingComma": "all"
+}
diff --git a/package.json b/package.json
index 3377133e3888..caf204e882f5 100644
--- a/package.json
+++ b/package.json
@@ -72,6 +72,7 @@
     "debug": "^4.1.1",
     "glob": "^7.0.3",
     "node-fetch": "^2.2.0",
+    "prettier": "^1.16.4",
     "puppeteer": "1.12.2",
     "quicktype-core": "^6.0.15",
     "temp": "^0.9.0",
@@ -121,6 +122,7 @@
     "karma-jasmine": "^2.0.1",
     "karma-jasmine-html-reporter": "^1.4.0",
     "license-checker": "^20.1.0",
+    "lint-staged": "^8.1.5",
     "minimatch": "^3.0.4",
     "minimist": "^1.2.0",
     "npm-registry-client": "8.6.0",
@@ -142,6 +144,7 @@
   },
   "husky": {
     "hooks": {
+      "pre-commit": "lint-staged",
       "pre-push": "node ./bin/devkit-admin hooks/pre-push"
     }
   }
diff --git a/tslint.json b/tslint.json
index e617a4d2236f..7ca85c581707 100644
--- a/tslint.json
+++ b/tslint.json
@@ -15,7 +15,6 @@
     "defocus": true,
     "import-groups": true,
     "no-global-tslint-disable": true,
-    "single-eof-line": true,
     // ==================================================================================================
     // tslint-sonarts rules. See https://github.com/SonarSource/SonarTS
     // These rules are part of the bug detection section of tslint-sonarts
@@ -52,45 +51,21 @@
     "no-floating-promises": true,
     "no-implicit-dependencies": true,
     "no-import-side-effect": [true, {"ignore-module": "^(?!rxjs\/)"}],
-    "align": [
-      true,
-      "elements",
-      "members",
-      "parameters",
-      "statements"
-    ],
-    "max-line-length": [true, 100],
     "no-inferrable-types": true,
     "class-name": true,
     "comment-format": [
       true,
       "check-space"
     ],
-    "indent": [
-      true,
-      "spaces"
-    ],
-    "eofline": true,
-    "import-spacing": true,
     "match-default-export-name": true,
     "newline-before-return": true,
-    "no-consecutive-blank-lines": [true, 2],
     "no-duplicate-variable": true,
     "no-eval": true,
     "no-any": true,
     "no-arg": true,
     "no-internal-module": true,
-    "no-trailing-whitespace": true,
     "no-unused-expression": true,
     "no-var-keyword": true,
-    "one-line": [
-      true,
-      "check-catch",
-      "check-else",
-      "check-finally",
-      "check-open-brace",
-      "check-whitespace"
-    ],
     "ordered-imports": [
       true,
       {
@@ -99,29 +74,6 @@
       }
     ],
     "prefer-const": true,
-    "quotemark": [
-      true,
-      "single",
-      "avoid-escape"
-    ],
-    "semicolon": [true, "always"],
-    "trailing-comma": [
-      true,
-      {
-        "multiline": "always",
-        "singleline": "never"
-      }
-    ],
-    "typedef-whitespace": [
-      true,
-      {
-        "call-signature": "nospace",
-        "index-signature": "nospace",
-        "parameter": "nospace",
-        "property-declaration": "nospace",
-        "variable-declaration": "nospace"
-      }
-    ],
     "curly": true,
     "file-header": [
       true,
@@ -133,17 +85,6 @@
       "check-format",
       "allow-leading-underscore",
       "allow-pascal-case"
-    ],
-    "whitespace": [
-      true,
-      "check-branch",
-      "check-decl",
-      "check-module",
-      "check-preblock",
-      "check-operator",
-      "check-separator",
-      "check-type",
-      "check-typecast"
     ]
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 1b423a3a9520..67c93d147700 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -155,6 +155,13 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.3.tgz#2c92469bac2b7fbff810b67fca07bd138b48af77"
   integrity sha512-gqmspPZOMW3MIRb9HlrnbZHXI1/KHTOroBwN1NcLL6pWxzqzEKGvRTq0W/PxS45OtQGbaFikSQpkS5zbnsQm2w==
 
+"@babel/runtime@^7.0.0":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12"
+  integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==
+  dependencies:
+    regenerator-runtime "^0.13.2"
+
 "@babel/template@^7.0.0", "@babel/template@^7.1.0":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.1.2.tgz#090484a574fef5a2d2d7726a674eceda5c5b5644"
@@ -270,6 +277,13 @@
   resolved "https://registry.yarnpkg.com/@ngtools/json-schema/-/json-schema-1.1.0.tgz#c3a0c544d62392acc2813a42c8a0dc6f58f86922"
   integrity sha1-w6DFRNYjkqzCgTpCyKDcb1j4aSI=
 
+"@samverschueren/stream-to-observable@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"
+  integrity sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==
+  dependencies:
+    any-observable "^0.3.0"
+
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
@@ -1003,7 +1017,7 @@ ansi-colors@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.1.tgz#9638047e4213f3428a11944a7d4b31cba0a3ff95"
   integrity sha512-Xt+zb6nqgvV9SWAVp0EG3lRsHcbq5DDgqjPPz6pwgtj6RKz65zGXMNa82oJfOSBA/to6GmRP7Dr+6o+kbApTzQ==
 
-ansi-escapes@^3.2.0:
+ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
@@ -1040,6 +1054,11 @@ ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
+any-observable@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
+  integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==
+
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -1921,7 +1940,7 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@^1.1.1, chalk@^1.1.3:
+chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
@@ -2080,13 +2099,21 @@ cli-boxes@^1.0.0:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
   integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM=
 
-cli-cursor@^2.1.0:
+cli-cursor@^2.0.0, cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
   integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
   dependencies:
     restore-cursor "^2.0.0"
 
+cli-truncate@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
+  integrity sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=
+  dependencies:
+    slice-ansi "0.0.4"
+    string-width "^1.0.1"
+
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
@@ -2243,7 +2270,7 @@ commander@^2.12.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
   integrity sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==
 
-commander@^2.19.0:
+commander@^2.14.1, commander@^2.19.0, commander@^2.9.0:
   version "2.20.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
   integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
@@ -2666,6 +2693,16 @@ cosmiconfig@^5.0.7:
     lodash.get "^4.4.2"
     parse-json "^4.0.0"
 
+cosmiconfig@^5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
+  integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
+  dependencies:
+    import-fresh "^2.0.0"
+    is-directory "^0.3.1"
+    js-yaml "^3.13.1"
+    parse-json "^4.0.0"
+
 create-ecdh@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
@@ -2813,6 +2850,11 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+date-fns@^1.27.2:
+  version "1.30.1"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
+  integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
+
 date-format@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"
@@ -2868,7 +2910,7 @@ debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.0, debug@^4.1.1:
+debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -2912,6 +2954,11 @@ decompress-response@^3.3.0:
   dependencies:
     mimic-response "^1.0.0"
 
+dedent@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
+  integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
+
 deep-equal@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
@@ -3213,6 +3260,11 @@ electron-to-chromium@^1.3.164:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.164.tgz#8680b875577882c1572c42218d53fa9ba5f71d5d"
   integrity sha512-VLlalqUeduN4+fayVtRZvGP2Hl1WrRxlwzh2XVVMJym3IFrQUS29BFQ1GP/BxOJXJI1OFCrJ5BnFEsAe8NHtOg==
 
+elegant-spinner@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
+  integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
+
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
@@ -3362,7 +3414,7 @@ escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.4, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
@@ -3772,6 +3824,14 @@ figgy-pudding@^3.1.0, figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
   integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
 
+figures@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
+  integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=
+  dependencies:
+    escape-string-regexp "^1.0.5"
+    object-assign "^4.1.0"
+
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
@@ -3918,6 +3978,11 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.1"
     readable-stream "^2.0.4"
 
+fn-name@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz#5214d7537a4d06a4a301c0cc262feb84188002e7"
+  integrity sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=
+
 follow-redirects@^1.0.0:
   version "1.5.7"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.7.tgz#a39e4804dacb90202bca76a9e2ac10433ca6a69a"
@@ -4057,6 +4122,15 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+g-status@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/g-status/-/g-status-2.0.2.tgz#270fd32119e8fc9496f066fe5fe88e0a6bc78b97"
+  integrity sha512-kQoE9qH+T1AHKgSSD0Hkv98bobE90ILQcXAF4wvGgsr7uFqNvwmh8j+Lq3l0RVt3E3HjSbv2B9biEGcEtpHLCA==
+  dependencies:
+    arrify "^1.0.1"
+    matcher "^1.0.0"
+    simple-git "^1.85.0"
+
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
@@ -4086,6 +4160,11 @@ get-caller-file@^2.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
+get-own-enumerable-property-symbols@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz#b877b49a5c16aefac3655f2ed2ea5b684df8d203"
+  integrity sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg==
+
 get-pkg-repo@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
@@ -5053,11 +5132,18 @@ is-number@^4.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
   integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
-is-obj@^1.0.0:
+is-obj@^1.0.0, is-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
   integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
 
+is-observable@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e"
+  integrity sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==
+  dependencies:
+    symbol-observable "^1.1.0"
+
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
@@ -5121,6 +5207,11 @@ is-redirect@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
   integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=
 
+is-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
+  integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
+
 is-retry-allowed@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
@@ -5397,7 +5488,7 @@ js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.9.0:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^3.13.0:
+js-yaml@^3.13.0, js-yaml@^3.13.1:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -5790,6 +5881,80 @@ lie@~3.1.0:
   dependencies:
     immediate "~3.0.5"
 
+lint-staged@^8.1.5:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.2.0.tgz#3d4149a229580815c955047a7acd8f09054be5a9"
+  integrity sha512-DxguyxGOIfb67wZ6EOrqzjAbw6ZH9XK3YS74HO+erJf6+SAQeJJPN//GBOG5xhdt2THeuXjVPaHcCYOWGZwRbA==
+  dependencies:
+    chalk "^2.3.1"
+    commander "^2.14.1"
+    cosmiconfig "^5.2.0"
+    debug "^3.1.0"
+    dedent "^0.7.0"
+    del "^3.0.0"
+    execa "^1.0.0"
+    g-status "^2.0.2"
+    is-glob "^4.0.0"
+    is-windows "^1.0.2"
+    listr "^0.14.2"
+    listr-update-renderer "^0.5.0"
+    lodash "^4.17.11"
+    log-symbols "^2.2.0"
+    micromatch "^3.1.8"
+    npm-which "^3.0.1"
+    p-map "^1.1.1"
+    path-is-inside "^1.0.2"
+    pify "^3.0.0"
+    please-upgrade-node "^3.0.2"
+    staged-git-files "1.1.2"
+    string-argv "^0.0.2"
+    stringify-object "^3.2.2"
+    yup "^0.27.0"
+
+listr-silent-renderer@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
+  integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=
+
+listr-update-renderer@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz#4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2"
+  integrity sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==
+  dependencies:
+    chalk "^1.1.3"
+    cli-truncate "^0.2.1"
+    elegant-spinner "^1.0.1"
+    figures "^1.7.0"
+    indent-string "^3.0.0"
+    log-symbols "^1.0.2"
+    log-update "^2.3.0"
+    strip-ansi "^3.0.1"
+
+listr-verbose-renderer@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz#f1132167535ea4c1261102b9f28dac7cba1e03db"
+  integrity sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==
+  dependencies:
+    chalk "^2.4.1"
+    cli-cursor "^2.1.0"
+    date-fns "^1.27.2"
+    figures "^2.0.0"
+
+listr@^0.14.2:
+  version "0.14.3"
+  resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz#2fea909604e434be464c50bddba0d496928fa586"
+  integrity sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==
+  dependencies:
+    "@samverschueren/stream-to-observable" "^0.3.0"
+    is-observable "^1.1.0"
+    is-promise "^2.1.0"
+    is-stream "^1.1.0"
+    listr-silent-renderer "^1.1.1"
+    listr-update-renderer "^0.5.0"
+    listr-verbose-renderer "^0.5.0"
+    p-map "^2.0.0"
+    rxjs "^6.3.3"
+
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -5900,6 +6065,29 @@ lodash@^4.17.10, lodash@^4.17.4, lodash@^4.2.1:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
   integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==
 
+log-symbols@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
+  integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=
+  dependencies:
+    chalk "^1.0.0"
+
+log-symbols@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
+  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
+  dependencies:
+    chalk "^2.0.1"
+
+log-update@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708"
+  integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg=
+  dependencies:
+    ansi-escapes "^3.0.0"
+    cli-cursor "^2.0.0"
+    wrap-ansi "^3.0.1"
+
 log4js@^3.0.0:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.6.tgz#e6caced94967eeeb9ce399f9f8682a4b2b28c8ff"
@@ -6082,6 +6270,13 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
+matcher@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/matcher/-/matcher-1.1.1.tgz#51d8301e138f840982b338b116bb0c09af62c1c2"
+  integrity sha512-+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg==
+  dependencies:
+    escape-string-regexp "^1.0.4"
+
 material-design-icons@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/material-design-icons/-/material-design-icons-3.0.1.tgz#9a71c48747218ebca51e51a66da682038cdcb7bf"
@@ -6715,6 +6910,13 @@ npm-packlist@^1.1.6:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
+npm-path@^2.0.2:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64"
+  integrity sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw==
+  dependencies:
+    which "^1.2.10"
+
 npm-pick-manifest@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40"
@@ -6762,6 +6964,15 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
+npm-which@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/npm-which/-/npm-which-3.0.1.tgz#9225f26ec3a285c209cae67c3b11a6b4ab7140aa"
+  integrity sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo=
+  dependencies:
+    commander "^2.9.0"
+    npm-path "^2.0.2"
+    which "^1.2.10"
+
 "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
@@ -7289,7 +7500,7 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@^1.0.1:
+path-is-inside@^1.0.1, path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
   integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
@@ -7392,7 +7603,7 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
-please-upgrade-node@^3.1.1:
+please-upgrade-node@^3.0.2, please-upgrade-node@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac"
   integrity sha512-KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ==
@@ -7523,6 +7734,11 @@ preserve@^0.2.0:
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
   integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
+prettier@^1.16.4:
+  version "1.18.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
+  integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
+
 process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
@@ -7570,6 +7786,11 @@ promise@~7.0.1:
   dependencies:
     asap "~2.0.3"
 
+property-expr@^1.5.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-1.5.1.tgz#22e8706894a0c8e28d58735804f6ba3a3673314f"
+  integrity sha512-CGuc0VUTGthpJXL36ydB6jnbyOf/rAHFvmVrJlH+Rg0DqqLFQGAP6hIaxD/G0OAmBJPhXDHuEJigrp0e0wFV6g==
+
 protobufjs@5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.3.tgz#e4dfe9fb67c90b2630d15868249bcc4961467a17"
@@ -8063,6 +8284,11 @@ regenerator-runtime@^0.11.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
+regenerator-runtime@^0.13.2:
+  version "0.13.2"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
+  integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==
+
 regex-cache@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
@@ -8370,6 +8596,13 @@ rxjs@6.4.0, rxjs@^6.0.0, rxjs@^6.4.0, rxjs@~6.4.0:
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^6.3.3:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
+  integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==
+  dependencies:
+    tslib "^1.9.0"
+
 safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -8709,6 +8942,13 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
+simple-git@^1.85.0:
+  version "1.113.0"
+  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.113.0.tgz#668989728a1e9cf4ec6c72b69ea2eecc93489bea"
+  integrity sha512-i9WVsrK2u0G/cASI9nh7voxOk9mhanWY9eGtWBDSYql6m49Yk5/Fan6uZsDr/xmzv8n+eQ8ahKCoEr8cvU3h+g==
+  dependencies:
+    debug "^4.0.1"
+
 simple-swizzle@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
@@ -8726,6 +8966,11 @@ slash@^2.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
   integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
 
+slice-ansi@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
+  integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=
+
 slide@^1.1.3, slide@~1.1.3:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
@@ -9159,6 +9404,11 @@ stack-trace@0.0.x:
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
   integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
 
+staged-git-files@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-1.1.2.tgz#4326d33886dc9ecfa29a6193bf511ba90a46454b"
+  integrity sha512-0Eyrk6uXW6tg9PYkhi/V/J4zHp33aNyi2hOCmhFLqLTIhbgqWn5jlSzI+IU0VqrZq6+DbHcabQl/WP6P3BG0QA==
+
 static-eval@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.0.tgz#0e821f8926847def7b4b50cda5d55c04a9b13864"
@@ -9267,6 +9517,11 @@ strict-uri-encode@^1.0.0:
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
   integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
 
+string-argv@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.0.2.tgz#dac30408690c21f3c3630a3ff3a05877bdcbd736"
+  integrity sha1-2sMECGkMIfPDYwo/86BYd73L1zY=
+
 string-width@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -9312,6 +9567,15 @@ string_decoder@~0.10.x:
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
   integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
 
+stringify-object@^3.2.2:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629"
+  integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==
+  dependencies:
+    get-own-enumerable-property-symbols "^3.0.0"
+    is-obj "^1.0.1"
+    is-regexp "^1.0.0"
+
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -9422,11 +9686,16 @@ supports-color@^6.1.0:
   dependencies:
     has-flag "^3.0.0"
 
-symbol-observable@1.2.0:
+symbol-observable@1.2.0, symbol-observable@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
   integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
+synchronous-promise@^2.0.6:
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.9.tgz#b83db98e9e7ae826bf9c8261fd8ac859126c780a"
+  integrity sha512-LO95GIW16x69LuND1nuuwM4pjgFGupg7pZ/4lU86AmchPKrhk0o2tpMU2unXRrqo81iAFe1YJ0nAGEVwsrZAgg==
+
 tapable@^1.0.0, tapable@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c"
@@ -9643,6 +9912,11 @@ toidentifier@1.0.0:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
+toposort@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
+  integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=
+
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
@@ -10294,7 +10568,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@^1.1.1, which@^1.2.1, which@^1.2.9, which@^1.3.1:
+which@^1.1.1, which@^1.2.1, which@^1.2.10, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -10382,6 +10656,14 @@ wrap-ansi@^2.0.0:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
 
+wrap-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba"
+  integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=
+  dependencies:
+    string-width "^2.1.1"
+    strip-ansi "^4.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -10583,6 +10865,18 @@ yn@^2.0.0:
   resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
   integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=
 
+yup@^0.27.0:
+  version "0.27.0"
+  resolved "https://registry.yarnpkg.com/yup/-/yup-0.27.0.tgz#f8cb198c8e7dd2124beddc2457571329096b06e7"
+  integrity sha512-v1yFnE4+u9za42gG/b/081E7uNW9mUj3qtkmelLbW5YPROZzSH/KUUyJu9Wt8vxFJcT9otL/eZopS0YK1L5yPQ==
+  dependencies:
+    "@babel/runtime" "^7.0.0"
+    fn-name "~2.0.1"
+    lodash "^4.17.11"
+    property-expr "^1.5.0"
+    synchronous-promise "^2.0.6"
+    toposort "^2.0.2"
+
 zone.js@^0.9.1:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.1.tgz#e37c6e5c54c13fae4de26b5ffe8d8e9212da6d9b"

From d43ca041e278d211a90ba355cb5d3078a5801928 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Thu, 20 Jun 2019 09:29:05 +0200
Subject: [PATCH 1513/1703] fix(@angular-devkit/build-angular): re-order
 reporters to set code coverage at the very end

---
 .../src/angular-cli-files/plugins/karma.ts      |  8 ++++----
 .../test/karma/code-coverage_spec_large.ts      | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
index adbda0f12dab..2fa31a88ae73 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
@@ -70,17 +70,15 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
   successCb = config.buildWebpack.successCb;
   failureCb = config.buildWebpack.failureCb;
 
-  config.reporters.unshift('@angular-devkit/build-angular--event-reporter');
-
   // When using code-coverage, auto-add coverage-istanbul.
   config.reporters = config.reporters || [];
   if (options.codeCoverage && config.reporters.indexOf('coverage-istanbul') === -1) {
-    config.reporters.unshift('coverage-istanbul');
+    config.reporters.push('coverage-istanbul');
   }
 
   // Add a reporter that fixes sourcemap urls.
   if (normalizeSourceMaps(options.sourceMap).scripts) {
-    config.reporters.unshift('@angular-devkit/build-angular--sourcemap-reporter');
+    config.reporters.push('@angular-devkit/build-angular--sourcemap-reporter');
 
     // Code taken from https://github.com/tschaub/karma-source-map-support.
     // We can't use it directly because we need to add it conditionally in this file, and karma
@@ -94,6 +92,8 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
     ], true);
   }
 
+  config.reporters.push('@angular-devkit/build-angular--event-reporter');
+
   // Add webpack config.
   const webpackConfig = config.buildWebpack.webpackConfig;
   const webpackMiddlewareConfig = {
diff --git a/packages/angular_devkit/build_angular/test/karma/code-coverage_spec_large.ts b/packages/angular_devkit/build_angular/test/karma/code-coverage_spec_large.ts
index 2ab9bd95273b..2364fd53f683 100644
--- a/packages/angular_devkit/build_angular/test/karma/code-coverage_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/karma/code-coverage_spec_large.ts
@@ -110,4 +110,21 @@ describe('Karma Builder code coverage', () => {
       expect(content).not.toContain('my-lib');
     }
   }, 120000);
+
+  it(`should fail when coverage is below threhold and 'emitWarning' is false`, async () => {
+    host.replaceInFile('karma.conf.js', 'fixWebpackSourcePaths: true',
+      `
+      fixWebpackSourcePaths: true,
+      thresholds: {
+        emitWarning: false,
+        global: {
+          statements: 200
+        }
+      }`,
+    );
+
+    const run = await architect.scheduleTarget(karmaTargetSpec, { codeCoverage: true });
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: false }));
+    await run.stop();
+  }, 120000);
 });

From a56cc3105fe1d855a8f5d546db7547b3fee20597 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Sat, 15 Jun 2019 21:07:28 -0400
Subject: [PATCH 1514/1703] refactor(@angular/pwa): update to use new workspace
 rules

---
 packages/angular/pwa/pwa/index.ts | 79 ++++++++++---------------------
 1 file changed, 24 insertions(+), 55 deletions(-)

diff --git a/packages/angular/pwa/pwa/index.ts b/packages/angular/pwa/pwa/index.ts
index f4bf3a4f907c..3389528f8743 100644
--- a/packages/angular/pwa/pwa/index.ts
+++ b/packages/angular/pwa/pwa/index.ts
@@ -1,18 +1,11 @@
 /**
-* @license
-* Copyright Google Inc. All Rights Reserved.
-*
-* Use of this source code is governed by an MIT-style license that can be
-* found in the LICENSE file at https://angular.io/license
-*/
-import {
-  JsonParseMode,
-  experimental,
-  getSystemPath,
-  join,
-  normalize,
-  parseJson,
-} from '@angular-devkit/core';
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { getSystemPath, join, normalize } from '@angular-devkit/core';
 import {
   Rule,
   SchematicsException,
@@ -30,28 +23,6 @@ import { Schema as PwaOptions } from './schema';
 
 const RewritingStream = require('parse5-html-rewriting-stream');
 
-
-function getWorkspace(
-  host: Tree,
-): { path: string, workspace: experimental.workspace.WorkspaceSchema } {
-  const possibleFiles = [ '/angular.json', '/.angular.json' ];
-  const path = possibleFiles.filter(path => host.exists(path))[0];
-
-  const configBuffer = host.read(path);
-  if (configBuffer === null) {
-    throw new SchematicsException(`Could not find (${path})`);
-  }
-  const content = configBuffer.toString();
-
-  return {
-    path,
-    workspace: parseJson(
-      content,
-      JsonParseMode.Loose,
-    ) as {} as experimental.workspace.WorkspaceSchema,
-  };
-}
-
 function updateIndexFile(path: string): Rule {
   return (host: Tree) => {
     const buffer = host.read(path);
@@ -111,40 +82,38 @@ function updateIndexFile(path: string): Rule {
   };
 }
 
-export default function (options: PwaOptions): Rule {
-  return (host: Tree) => {
+export default function(options: PwaOptions): Rule {
+  return async host => {
     if (!options.title) {
       options.title = options.project;
     }
-    const {path: workspacePath, workspace } = getWorkspace(host);
+
+    // Keep Bazel from failing due to deep import
+    const { getWorkspace, updateWorkspace } = require('@schematics/angular/utility/workspace');
+
+    const workspace = await getWorkspace(host);
 
     if (!options.project) {
       throw new SchematicsException('Option "project" is required.');
     }
 
-    const project = workspace.projects[options.project];
+    const project = workspace.projects.get(options.project);
     if (!project) {
       throw new SchematicsException(`Project is not defined in this workspace.`);
     }
 
-    if (project.projectType !== 'application') {
+    if (project.extensions['projectType'] !== 'application') {
       throw new SchematicsException(`PWA requires a project type of "application".`);
     }
 
     // Find all the relevant targets for the project
-    const projectTargets = project.targets || project.architect;
-    if (!projectTargets || Object.keys(projectTargets).length === 0) {
+    if (project.targets.size === 0) {
       throw new SchematicsException(`Targets are not defined for this project.`);
     }
 
     const buildTargets = [];
     const testTargets = [];
-    for (const targetName in projectTargets) {
-      const target = projectTargets[targetName];
-      if (!target) {
-        continue;
-      }
-
+    for (const target of project.targets.values()) {
       if (target.builder === '@angular-devkit/build-angular:browser') {
         buildTargets.push(target);
       } else if (target.builder === '@angular-devkit/build-angular:karma') {
@@ -156,21 +125,20 @@ export default function (options: PwaOptions): Rule {
     const assetEntry = join(normalize(project.root), 'src', 'manifest.webmanifest');
     for (const target of [...buildTargets, ...testTargets]) {
       if (target.options) {
-        if (target.options.assets) {
+        if (Array.isArray(target.options.assets)) {
           target.options.assets.push(assetEntry);
         } else {
-          target.options.assets = [ assetEntry ];
+          target.options.assets = [assetEntry];
         }
       } else {
-        target.options = { assets: [ assetEntry ] };
+        target.options = { assets: [assetEntry] };
       }
     }
-    host.overwrite(workspacePath, JSON.stringify(workspace, null, 2));
 
     // Find all index.html files in build targets
     const indexFiles = new Set<string>();
     for (const target of buildTargets) {
-      if (target.options && target.options.index) {
+      if (target.options && typeof target.options.index === 'string') {
         indexFiles.add(target.options.index);
       }
 
@@ -179,7 +147,7 @@ export default function (options: PwaOptions): Rule {
       }
       for (const configName in target.configurations) {
         const configuration = target.configurations[configName];
-        if (configuration && configuration.index) {
+        if (configuration && typeof configuration.index === 'string') {
           indexFiles.add(configuration.index);
         }
       }
@@ -203,6 +171,7 @@ export default function (options: PwaOptions): Rule {
 
     // Chain the rules and return
     return chain([
+      updateWorkspace(workspace),
       externalSchematic('@schematics/angular', 'service-worker', swOptions),
       mergeWith(rootTemplateSource),
       mergeWith(assetsTemplateSource),

From 415130023e0f2e11456721a226b24b517be9860d Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 24 Jun 2019 13:43:53 -0700
Subject: [PATCH 1515/1703] release: v8.1.0-beta.3


From af2b1b55dcaafba42c3ac7f4d11dcf345ca79961 Mon Sep 17 00:00:00 2001
From: FDIM <domas.trijonis@gmail.com>
Date: Fri, 21 Jun 2019 20:56:09 +0200
Subject: [PATCH 1516/1703] feat(@angular-devkit/build-angular): option to
 build and test only specified spec files

---
 .../plugins/single-test-transform.ts          |  58 ++++++
 .../angular-cli-files/utilities/find-tests.ts |  62 +++++++
 .../build_angular/src/karma/index.ts          | 172 +++++++++++-------
 .../build_angular/src/karma/schema.json       |   7 +
 .../test/karma/selected_spec_large.ts         | 143 +++++++++++++++
 5 files changed, 379 insertions(+), 63 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/src/angular-cli-files/plugins/single-test-transform.ts
 create mode 100644 packages/angular_devkit/build_angular/src/angular-cli-files/utilities/find-tests.ts
 create mode 100644 packages/angular_devkit/build_angular/test/karma/selected_spec_large.ts

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/single-test-transform.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/single-test-transform.ts
new file mode 100644
index 000000000000..ea8b09fdc038
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/single-test-transform.ts
@@ -0,0 +1,58 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { logging } from '@angular-devkit/core';
+import { getOptions } from 'loader-utils';
+import { extname, join } from 'path';
+import { loader } from 'webpack';
+
+export interface SingleTestTransformLoaderOptions {
+  files: string[]; // list of paths relative to main
+  logger: logging.Logger;
+}
+
+export const SingleTestTransformLoader = require.resolve(join(__dirname, 'single-test-transform'));
+
+/**
+ * This loader transforms the default test file to only run tests
+ * for some specs instead of all specs.
+ * It works by replacing the known content of the auto-generated test file:
+ *   const context = require.context('./', true, /\.spec\.ts$/);
+ *   context.keys().map(context);
+ * with:
+ *   const context = { keys: () => ({ map: (_a) => { } }) };
+ *   context.keys().map(context);
+ * So that it does nothing.
+ * Then it adds import statements for each file in the files options
+ * array to import them directly, and thus run the tests there.
+ */
+export default function loader(this: loader.LoaderContext, source: string) {
+  const options = getOptions(this) as SingleTestTransformLoaderOptions;
+  const lineSeparator = process.platform === 'win32' ? '\r\n' : '\n';
+
+  const targettedImports = options.files
+    .map(path => `require('./${path.replace('.' + extname(path), '')}');`)
+    .join(lineSeparator);
+
+  // TODO: maybe a documented 'marker/comment' inside test.ts would be nicer?
+  const regex = /require\.context\(.*/;
+
+  // signal the user that expected content is not present
+  if (!regex.test(source)) {
+    const message = [
+      `The 'include' option requires that the 'main' file for tests include the line below:`,
+      `const context = require.context('./', true, /\.spec\.ts$/);`,
+      `Arguments passed to require.context are not strict and can be changed`,
+    ];
+    options.logger.error(message.join(lineSeparator));
+  }
+
+  const mockedRequireContext = '{ keys: () => ({ map: (_a) => { } }) };' + lineSeparator;
+  source = source.replace(regex, mockedRequireContext + targettedImports);
+
+  return source;
+}
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/find-tests.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/find-tests.ts
new file mode 100644
index 000000000000..72ec0019f103
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/find-tests.ts
@@ -0,0 +1,62 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { existsSync } from 'fs';
+import * as glob from 'glob';
+import { basename, dirname, extname, join } from 'path';
+import { isDirectory } from './is-directory';
+
+// go through all patterns and find unique list of files
+export function findTests(patterns: string[], cwd: string, workspaceRoot: string): string[] {
+  return patterns.reduce(
+    (files, pattern) => {
+      const relativePathToMain = cwd.replace(workspaceRoot, '').substr(1); // remove leading slash
+      const tests = findMatchingTests(pattern, cwd, relativePathToMain);
+      tests.forEach(file => {
+        if (!files.includes(file)) {
+          files.push(file);
+        }
+      });
+
+      return files;
+    },
+    [] as string[],
+  );
+}
+
+function findMatchingTests(pattern: string, cwd: string, relativePathToMain: string): string[] {
+  // normalize pattern, glob lib only accepts forward slashes
+  pattern = pattern.replace(/\\/g, '/');
+  relativePathToMain = relativePathToMain.replace(/\\/g, '/');
+
+  // remove relativePathToMain to support relative paths from root
+  // such paths are easy to get when running scripts via IDEs
+  if (pattern.startsWith(relativePathToMain + '/')) {
+    pattern = pattern.substr(relativePathToMain.length + 1); // +1 to include slash
+  }
+
+  // special logic when pattern does not look like a glob
+  if (!glob.hasMagic(pattern)) {
+    if (isDirectory(join(cwd, pattern))) {
+      pattern = `${pattern}/**/*.spec.@(ts|tsx)`;
+    } else {
+      // see if matching spec file exists
+      const extension = extname(pattern);
+      const matchingSpec = `${basename(pattern, extension)}.spec${extension}`;
+
+      if (existsSync(join(cwd, dirname(pattern), matchingSpec))) {
+        pattern = join(dirname(pattern), matchingSpec).replace(/\\/g, '/');
+      }
+    }
+  }
+
+  const files = glob.sync(pattern, {
+    cwd,
+  });
+
+  return files;
+}
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index 134dee009d08..c95c400d6216 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.ts
@@ -6,7 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
-import { resolve } from 'path';
+import { experimental, getSystemPath, join } from '@angular-devkit/core';
+import { dirname, resolve } from 'path';
 import { Observable, from } from 'rxjs';
 import { defaultIfEmpty, switchMap } from 'rxjs/operators';
 import * as webpack from 'webpack';
@@ -17,6 +18,11 @@ import {
   getTestConfig,
   getWorkerConfig,
 } from '../angular-cli-files/models/webpack-configs';
+import {
+  SingleTestTransformLoader,
+  SingleTestTransformLoaderOptions,
+} from '../angular-cli-files/plugins/single-test-transform';
+import { findTests } from '../angular-cli-files/utilities/find-tests';
 import { Schema as BrowserBuilderOptions } from '../browser/schema';
 import { ExecutionTransformer } from '../transforms';
 import { assertCompatibleAngularVersion } from '../utils/version';
@@ -24,7 +30,7 @@ import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browse
 import { Schema as KarmaBuilderOptions } from './schema';
 
 // tslint:disable-next-line:no-implicit-dependencies
-export type KarmaConfigOptions = import ('karma').ConfigOptions & {
+export type KarmaConfigOptions = import('karma').ConfigOptions & {
   buildWebpack?: unknown;
   configFile?: string;
 };
@@ -34,12 +40,12 @@ async function initialize(
   context: BuilderContext,
   webpackConfigurationTransformer?: ExecutionTransformer<webpack.Configuration>,
   // tslint:disable-next-line:no-implicit-dependencies
-): Promise<[typeof import ('karma'), webpack.Configuration]> {
-  const { config } = await generateBrowserWebpackConfigFromContext(
+): Promise<[experimental.workspace.Workspace, typeof import('karma'), webpack.Configuration]> {
+  const { config, workspace } = await generateBrowserWebpackConfigFromContext(
     // only two properties are missing:
     // * `outputPath` which is fixed for tests
     // * `budgets` which might be incorrect due to extra dev libs
-    { ...options as unknown as BrowserBuilderOptions, outputPath: '', budgets: undefined },
+    { ...((options as unknown) as BrowserBuilderOptions), outputPath: '', budgets: undefined },
     context,
     wco => [
       getCommonConfig(wco),
@@ -54,6 +60,7 @@ async function initialize(
   const karma = await import('karma');
 
   return [
+    workspace,
     karma,
     webpackConfigurationTransformer ? await webpackConfigurationTransformer(config[0]) : config[0],
   ];
@@ -63,71 +70,110 @@ export function execute(
   options: KarmaBuilderOptions,
   context: BuilderContext,
   transforms: {
-    webpackConfiguration?: ExecutionTransformer<webpack.Configuration>,
+    webpackConfiguration?: ExecutionTransformer<webpack.Configuration>;
     // The karma options transform cannot be async without a refactor of the builder implementation
-    karmaOptions?: (options: KarmaConfigOptions) => KarmaConfigOptions,
+    karmaOptions?: (options: KarmaConfigOptions) => KarmaConfigOptions;
   } = {},
 ): Observable<BuilderOutput> {
   // Check Angular version.
   assertCompatibleAngularVersion(context.workspaceRoot, context.logger);
 
   return from(initialize(options, context, transforms.webpackConfiguration)).pipe(
-    switchMap(([karma, webpackConfig]) => new Observable<BuilderOutput>(subscriber => {
-      const karmaOptions: KarmaConfigOptions = {};
-
-      if (options.watch !== undefined) {
-        karmaOptions.singleRun = !options.watch;
-      }
-
-      // Convert browsers from a string to an array
-      if (options.browsers) {
-        karmaOptions.browsers = options.browsers.split(',');
-      }
-
-      if (options.reporters) {
-        // Split along commas to make it more natural, and remove empty strings.
-        const reporters = options.reporters
-          .reduce<string[]>((acc, curr) => acc.concat(curr.split(',')), [])
-          .filter(x => !!x);
-
-        if (reporters.length > 0) {
-          karmaOptions.reporters = reporters;
-        }
-      }
-
-      // Assign additional karmaConfig options to the local ngapp config
-      karmaOptions.configFile = resolve(context.workspaceRoot, options.karmaConfig);
-
-      karmaOptions.buildWebpack = {
-        options,
-        webpackConfig,
-        // Pass onto Karma to emit BuildEvents.
-        successCb: () => subscriber.next({ success: true }),
-        failureCb: () => subscriber.next({ success: false }),
-        // Workaround for https://github.com/karma-runner/karma/issues/3154
-        // When this workaround is removed, user projects need to be updated to use a Karma
-        // version that has a fix for this issue.
-        toJSON: () => { },
-        logger: context.logger,
-      };
-
-      // Complete the observable once the Karma server returns.
-      const karmaServer = new karma.Server(
-        transforms.karmaOptions ? transforms.karmaOptions(karmaOptions) : karmaOptions,
-        () => subscriber.complete());
-      // karma typings incorrectly define start's return value as void
-      // tslint:disable-next-line:no-use-of-empty-return-value
-      const karmaStart = karmaServer.start() as unknown as Promise<void>;
-
-      // Cleanup, signal Karma to exit.
-      return () => {
-        // Karma only has the `stop` method start with 3.1.1, so we must defensively check.
-        const karmaServerWithStop = karmaServer as unknown as { stop: () => Promise<void> };
-        if (typeof karmaServerWithStop.stop === 'function') {
-          return karmaStart.then(() => karmaServerWithStop.stop());
-        }
-      };
-    })),
+    switchMap(
+      ([workspace, karma, webpackConfig]) =>
+        new Observable<BuilderOutput>(subscriber => {
+          const karmaOptions: KarmaConfigOptions = {};
+
+          if (options.watch !== undefined) {
+            karmaOptions.singleRun = !options.watch;
+          }
+
+          // Convert browsers from a string to an array
+          if (options.browsers) {
+            karmaOptions.browsers = options.browsers.split(',');
+          }
+
+          if (options.reporters) {
+            // Split along commas to make it more natural, and remove empty strings.
+            const reporters = options.reporters
+              .reduce<string[]>((acc, curr) => acc.concat(curr.split(',')), [])
+              .filter(x => !!x);
+
+            if (reporters.length > 0) {
+              karmaOptions.reporters = reporters;
+            }
+          }
+
+          // prepend special webpack loader that will transform test.ts
+          if (
+            webpackConfig &&
+            webpackConfig.module &&
+            options.include &&
+            options.include.length > 0
+          ) {
+            const mainFilePath = getSystemPath(join(workspace.root, options.main));
+            const files = findTests(
+              options.include,
+              dirname(mainFilePath),
+              getSystemPath(workspace.root),
+            );
+            // early exit, no reason to start karma
+            if (!files.length) {
+              subscriber.error(
+                `Specified patterns: "${options.include.join(', ')}" did not match any spec files`,
+              );
+
+              return;
+            }
+
+            webpackConfig.module.rules.unshift({
+              test: path => path === mainFilePath,
+              use: {
+                // cannot be a simple path as it differs between environments
+                loader: SingleTestTransformLoader,
+                options: {
+                  files,
+                  logger: context.logger,
+                } as SingleTestTransformLoaderOptions,
+              },
+            });
+          }
+
+          // Assign additional karmaConfig options to the local ngapp config
+          karmaOptions.configFile = resolve(context.workspaceRoot, options.karmaConfig);
+
+          karmaOptions.buildWebpack = {
+            options,
+            webpackConfig,
+            // Pass onto Karma to emit BuildEvents.
+            successCb: () => subscriber.next({ success: true }),
+            failureCb: () => subscriber.next({ success: false }),
+            // Workaround for https://github.com/karma-runner/karma/issues/3154
+            // When this workaround is removed, user projects need to be updated to use a Karma
+            // version that has a fix for this issue.
+            toJSON: () => {},
+            logger: context.logger,
+          };
+
+          // Complete the observable once the Karma server returns.
+          const karmaServer = new karma.Server(
+            transforms.karmaOptions ? transforms.karmaOptions(karmaOptions) : karmaOptions,
+            () => subscriber.complete(),
+          );
+          // karma typings incorrectly define start's return value as void
+          // tslint:disable-next-line:no-use-of-empty-return-value
+          const karmaStart = (karmaServer.start() as unknown) as Promise<void>;
+
+          // Cleanup, signal Karma to exit.
+          return () => {
+            // Karma only has the `stop` method start with 3.1.1, so we must defensively check.
+            const karmaServerWithStop = (karmaServer as unknown) as { stop: () => Promise<void> };
+            if (typeof karmaServerWithStop.stop === 'function') {
+              return karmaStart.then(() => karmaServerWithStop.stop());
+            }
+          };
+        }),
+    ),
     defaultIfEmpty({ success: false }),
   );
 }
diff --git a/packages/angular_devkit/build_angular/src/karma/schema.json b/packages/angular_devkit/build_angular/src/karma/schema.json
index 1f70c9976313..f5b8b64fddab 100644
--- a/packages/angular_devkit/build_angular/src/karma/schema.json
+++ b/packages/angular_devkit/build_angular/src/karma/schema.json
@@ -63,6 +63,13 @@
       "type": "string",
       "description": "Defines the build environment."
     },
+    "include": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "description": "Globs of files to include, relative to workspace or project root. \nThere are 2 special cases:\n - when a path to directory is provided, all spec files ending \".spec.@(ts|tsx)\" will be included\n - when a path to a file is provided, and a matching spec file exists it will be included instead"
+    },
     "sourceMap": {
       "description": "Output sourcemaps.",
       "default": true,
diff --git a/packages/angular_devkit/build_angular/test/karma/selected_spec_large.ts b/packages/angular_devkit/build_angular/test/karma/selected_spec_large.ts
new file mode 100644
index 000000000000..b42a586fe04d
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/karma/selected_spec_large.ts
@@ -0,0 +1,143 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Architect } from '@angular-devkit/architect';
+import { logging } from '@angular-devkit/core';
+import { createArchitect, host, karmaTargetSpec } from '../utils';
+
+describe('Karma Builder', () => {
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+  });
+
+  afterEach(() => host.restore().toPromise());
+
+  describe('with include option', () => {
+    it('should fail when include does not match any files', async () => {
+      const overrides = {
+        include: ['abc.spec.ts', 'def.spec.ts'],
+      };
+      const run = await architect.scheduleTarget(karmaTargetSpec, overrides);
+
+      await expectAsync(run.result).toBeRejectedWith(
+        `Specified patterns: "abc.spec.ts, def.spec.ts" did not match any spec files`,
+      );
+
+      await run.stop();
+    });
+
+    it('should fail when main test file does not include require.context usage', async () => {
+      let lastErrorLogEntry: logging.LogEntry | undefined;
+      const logger = new logging.Logger('test');
+      logger.subscribe(m => {
+        if (m.level === 'error') {
+          lastErrorLogEntry = m;
+        }
+      });
+
+      const mockedRequireContext = '{ keys: () => ({ map: (_a) => { } }) };';
+      const regex = /require\.context\(.*/;
+      host.replaceInFile('src/test.ts', regex, mockedRequireContext);
+
+      const overrides = {
+        include: ['**/*.spec.ts'],
+      };
+
+      const run = await architect.scheduleTarget(karmaTargetSpec, overrides, {
+        logger,
+      });
+
+      await expectAsync(run.result).toBeResolved();
+
+      expect(lastErrorLogEntry && lastErrorLogEntry.message).toContain(
+        'const context = require.context',
+      );
+      expect(lastErrorLogEntry && lastErrorLogEntry.message)
+        // tslint:disable-next-line:max-line-length
+        .toContain(
+          "The 'include' option requires that the 'main' file for tests include the line below:",
+        );
+
+      await run.stop();
+    });
+
+    beforeEach(() => {
+      host.writeMultipleFiles({
+        'src/app/services/test.service.spec.ts': `
+          describe('TestService', () => {
+            it('should succeed', () => {
+              expect(true).toBe(true);
+            });
+          });`,
+        'src/app/failing.service.spec.ts': `
+          describe('FailingService', () => {
+            it('should be ignored', () => {
+              expect(true).toBe(false);
+            });
+          });`,
+        'src/app/property.pipe.spec.ts': `
+          describe('PropertyPipe', () => {
+            it('should succeed', () => {
+              expect(true).toBe(true);
+            });
+          });`,
+      });
+    });
+    [
+      {
+        test: 'relative path from workspace to spec',
+        input: ['src/app/app.component.spec.ts'],
+      },
+      {
+        test: 'relative path from workspace to file',
+        input: ['src/app/app.component.ts'],
+      },
+      {
+        test: 'relative path from project root to spec',
+        input: ['app/services/test.service.spec.ts'],
+      },
+      {
+        test: 'relative path from project root to file',
+        input: ['app/services/test.service.ts'],
+      },
+      {
+        test: 'relative path from workspace to directory',
+        input: ['src/app/services'],
+      },
+      {
+        test: 'relative path from project root to directory',
+        input: ['app/services'],
+      },
+      {
+        test: 'glob with spec suffix',
+        input: ['**/*.pipe.spec.ts', '**/*.pipe.spec.ts', '**/*test.service.spec.ts'],
+      },
+    ].forEach(options => {
+      it(`should work with ${options.test}`, async () => {
+        const overrides = {
+          include: options.input,
+        };
+        const logger = new logging.Logger('test');
+        logger.subscribe(m => {
+          if (m.level === 'error') {
+            fail(m);
+          }
+        });
+        const run = await architect.scheduleTarget(karmaTargetSpec, overrides, {
+          logger,
+        });
+
+        await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+        await run.stop();
+      }, 30000);
+    });
+  });
+});

From 1df5eeb3e51492b5b45a7593d7df7a33ca232ff4 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 21 Jun 2019 06:39:50 +0000
Subject: [PATCH 1517/1703] build: update caniuse-lite to version 1.0.30000976

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index da177f6409c8..0705dd92d220 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -15,7 +15,7 @@
     "ajv": "6.10.0",
     "autoprefixer": "9.6.0",
     "browserslist": "4.6.3",
-    "caniuse-lite": "1.0.30000974",
+    "caniuse-lite": "1.0.30000976",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.3",
diff --git a/yarn.lock b/yarn.lock
index 67c93d147700..f7b65c64b44f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1900,10 +1900,10 @@ camelcase@^5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@1.0.30000974:
-  version "1.0.30000974"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000974.tgz#b7afe14ee004e97ce6dc73e3f878290a12928ad8"
-  integrity sha512-xc3rkNS/Zc3CmpMKuczWEdY2sZgx09BkAxfvkxlAEBTqcMHeL8QnPqhKse+5sRTi3nrw2pJwToD2WvKn1Uhvww==
+caniuse-lite@1.0.30000976:
+  version "1.0.30000976"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000976.tgz#d30fe12662cb2a21e130d307db9907513ca830a2"
+  integrity sha512-tleNB1IwPRqZiod6nUNum63xQCMN96BUO2JTeiwuRM7p9d616EHsMBjBWJMudX39qCaPuWY8KEWzMZq7A9XQMQ==
 
 caniuse-lite@^1.0.30000898:
   version "1.0.30000903"

From c4313f55e4412dba50a8d09c4daa4a20642b8e77 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 20 Jun 2019 20:44:05 -0400
Subject: [PATCH 1518/1703] refactor(@angular/cli): unify color handling and
 support

---
 packages/angular/cli/commands/add-impl.ts     |  63 ++++---
 .../angular/cli/commands/easter-egg-impl.ts   |   5 +-
 .../angular/cli/commands/generate-impl.ts     |   7 +-
 packages/angular/cli/commands/help-impl.ts    |   4 +-
 packages/angular/cli/commands/version-impl.ts | 110 ++++++------
 packages/angular/cli/lib/cli/index.ts         |  58 +++----
 packages/angular/cli/lib/init.ts              |  18 +-
 packages/angular/cli/models/analytics.ts      |  65 ++++---
 packages/angular/cli/models/command.ts        |  25 ++-
 .../angular/cli/models/schematic-command.ts   | 161 +++++++++---------
 packages/angular/cli/tasks/npm-install.ts     |  29 ++--
 packages/angular/cli/utilities/color.ts       |  18 ++
 12 files changed, 292 insertions(+), 271 deletions(-)
 create mode 100644 packages/angular/cli/utilities/color.ts

diff --git a/packages/angular/cli/commands/add-impl.ts b/packages/angular/cli/commands/add-impl.ts
index e005d5e36314..2e47e52ef3df 100644
--- a/packages/angular/cli/commands/add-impl.ts
+++ b/packages/angular/cli/commands/add-impl.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { analytics, tags, terminal } from '@angular-devkit/core';
+import { analytics, tags } from '@angular-devkit/core';
 import { NodePackageDoesNotSupportSchematics } from '@angular-devkit/schematics/tools';
 import { dirname, join } from 'path';
 import { intersects, prerelease, rcompare, satisfies, valid, validRange } from 'semver';
@@ -13,6 +13,7 @@ import { isPackageNameSafeForAnalytics } from '../models/analytics';
 import { Arguments } from '../models/interface';
 import { SchematicCommand } from '../models/schematic-command';
 import npmInstall from '../tasks/npm-install';
+import { colors } from '../utilities/color';
 import { getPackageManager } from '../utilities/package-manager';
 import {
   PackageManifest,
@@ -31,8 +32,8 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
   async run(options: AddCommandSchema & Arguments) {
     if (!options.collection) {
       this.logger.fatal(
-        `The "ng add" command requires a name argument to be specified eg. `
-        + `${terminal.yellow('ng add [name] ')}. For more details, use "ng help".`,
+        `The "ng add" command requires a name argument to be specified eg. ` +
+          `${colors.yellow('ng add [name] ')}. For more details, use "ng help".`,
       );
 
       return 1;
@@ -61,11 +62,10 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
       // plus special cases for packages that did not have peer deps setup
       let packageMetadata;
       try {
-        packageMetadata = await fetchPackageMetadata(
-          packageIdentifier.name,
-          this.logger,
-          { registry: options.registry, usingYarn },
-        );
+        packageMetadata = await fetchPackageMetadata(packageIdentifier.name, this.logger, {
+          registry: options.registry,
+          usingYarn,
+        });
       } catch (e) {
         this.logger.error('Unable to fetch package metadata: ' + e.message);
 
@@ -79,16 +79,19 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
           // tslint:disable-next-line:no-any
           const semverOptions = { includePrerelease: true } as any;
 
-          if (version
-              && ((validRange(version) && intersects(version, '7', semverOptions))
-                  || (valid(version) && satisfies(version, '7', semverOptions)))) {
+          if (
+            version &&
+            ((validRange(version) && intersects(version, '7', semverOptions)) ||
+              (valid(version) && satisfies(version, '7', semverOptions)))
+          ) {
             packageIdentifier = npa.resolve('@angular/pwa', '0.12');
           }
         }
       } else if (!latestManifest || (await this.hasMismatchedPeer(latestManifest))) {
         // 'latest' is invalid so search for most recent matching package
-        const versionManifests = Array.from(packageMetadata.versions.values())
-          .filter(value => !prerelease(value.version));
+        const versionManifests = Array.from(packageMetadata.versions.values()).filter(
+          value => !prerelease(value.version),
+        );
 
         versionManifests.sort((a, b) => rcompare(a.version, b.version, true));
 
@@ -101,7 +104,7 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
         }
 
         if (!newIdentifier) {
-          this.logger.warn('Unable to find compatible package.  Using \'latest\'.');
+          this.logger.warn("Unable to find compatible package.  Using 'latest'.");
         } else {
           packageIdentifier = newIdentifier;
         }
@@ -111,11 +114,10 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
     let collectionName = packageIdentifier.name;
     if (!packageIdentifier.registry) {
       try {
-        const manifest = await fetchPackageManifest(
-          packageIdentifier,
-          this.logger,
-          { registry: options.registry, usingYarn },
-        );
+        const manifest = await fetchPackageManifest(packageIdentifier, this.logger, {
+          registry: options.registry,
+          usingYarn,
+        });
 
         collectionName = manifest.name;
 
@@ -129,12 +131,7 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
       }
     }
 
-    await npmInstall(
-      packageIdentifier.raw,
-      this.logger,
-      this.packageManager,
-      this.workspace.root,
-    );
+    await npmInstall(packageIdentifier.raw, this.logger, this.packageManager, this.workspace.root);
 
     return this.executeSchematic(collectionName, options['--']);
   }
@@ -204,11 +201,10 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
   private async findProjectVersion(name: string): Promise<string | null> {
     let installedPackage;
     try {
-      installedPackage = require.resolve(
-        join(name, 'package.json'),
-        { paths: [this.workspace.root] },
-      );
-    } catch { }
+      installedPackage = require.resolve(join(name, 'package.json'), {
+        paths: [this.workspace.root],
+      });
+    } catch {}
 
     if (installedPackage) {
       try {
@@ -253,8 +249,10 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
           // tslint:disable-next-line:no-any
           const options = { includePrerelease: true } as any;
 
-          if (!intersects(version, peerIdentifier.rawSpec, options)
-              && !satisfies(version, peerIdentifier.rawSpec, options)) {
+          if (
+            !intersects(version, peerIdentifier.rawSpec, options) &&
+            !satisfies(version, peerIdentifier.rawSpec, options)
+          ) {
             return true;
           }
         } catch {
@@ -265,7 +263,6 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
         // type === 'tag' | 'file' | 'directory' | 'remote' | 'git'
         // Cannot accurately compare these as the tag/location may have changed since install
       }
-
     }
 
     return false;
diff --git a/packages/angular/cli/commands/easter-egg-impl.ts b/packages/angular/cli/commands/easter-egg-impl.ts
index e6cd9ee3eb45..8e70d46dc827 100644
--- a/packages/angular/cli/commands/easter-egg-impl.ts
+++ b/packages/angular/cli/commands/easter-egg-impl.ts
@@ -5,9 +5,8 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { terminal } from '@angular-devkit/core';
 import { Command } from '../models/command';
+import { colors } from '../utilities/color';
 import { Schema as AwesomeCommandSchema } from './easter-egg';
 
 function pickOne(of: string[]): string {
@@ -26,6 +25,6 @@ export class AwesomeCommand extends Command<AwesomeCommandSchema> {
       `I spy with my little eye a great developer!`,
       `Noop... already awesome.`,
     ]);
-    this.logger.info(terminal.green(phrase));
+    this.logger.info(colors.green(phrase));
   }
 }
diff --git a/packages/angular/cli/commands/generate-impl.ts b/packages/angular/cli/commands/generate-impl.ts
index cfaf096f01b9..f384d30e87bc 100644
--- a/packages/angular/cli/commands/generate-impl.ts
+++ b/packages/angular/cli/commands/generate-impl.ts
@@ -5,16 +5,15 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { terminal } from '@angular-devkit/core';
 import { Arguments, SubCommandDescription } from '../models/interface';
 import { SchematicCommand } from '../models/schematic-command';
+import { colors } from '../utilities/color';
 import { parseJsonSchemaToSubCommandDescription } from '../utilities/json-schema';
 import { Schema as GenerateCommandSchema } from './generate';
 
 export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
   // Allows us to resolve aliases before reporting analytics
-  longSchematicName: string|undefined;
+  longSchematicName: string | undefined;
 
   async initialize(options: GenerateCommandSchema & Arguments) {
     // Fill up the schematics property of the command description.
@@ -114,7 +113,7 @@ export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
     const subcommand = this.description.options.filter(x => x.subcommands)[0];
     if (Object.keys((subcommand && subcommand.subcommands) || {}).length == 1) {
       this.logger.info(`\nTo see help for a schematic run:`);
-      this.logger.info(terminal.cyan(`  ng generate <schematic> --help`));
+      this.logger.info(colors.cyan(`  ng generate <schematic> --help`));
     }
 
     return 0;
diff --git a/packages/angular/cli/commands/help-impl.ts b/packages/angular/cli/commands/help-impl.ts
index 0a62c82176ba..9c30c5e2f608 100644
--- a/packages/angular/cli/commands/help-impl.ts
+++ b/packages/angular/cli/commands/help-impl.ts
@@ -5,8 +5,8 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { terminal } from '@angular-devkit/core';
 import { Command } from '../models/command';
+import { colors } from '../utilities/color';
 import { Schema as HelpCommandSchema } from './help';
 
 export class HelpCommand extends Command<HelpCommandSchema> {
@@ -19,7 +19,7 @@ export class HelpCommand extends Command<HelpCommandSchema> {
       }
 
       const aliasInfo = cmd.aliases.length > 0 ? ` (${cmd.aliases.join(', ')})` : '';
-      this.logger.info(`  ${terminal.cyan(cmd.name)}${aliasInfo} ${cmd.description}`);
+      this.logger.info(`  ${colors.cyan(cmd.name)}${aliasInfo} ${cmd.description}`);
     }
     this.logger.info(`\nFor more detailed help run "ng [command name] --help"`);
   }
diff --git a/packages/angular/cli/commands/version-impl.ts b/packages/angular/cli/commands/version-impl.ts
index 44bcdfa759df..acf6d0d5bdb0 100644
--- a/packages/angular/cli/commands/version-impl.ts
+++ b/packages/angular/cli/commands/version-impl.ts
@@ -5,12 +5,11 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import { terminal } from '@angular-devkit/core';
 import * as child_process from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
 import { Command } from '../models/command';
+import { colors } from '../utilities/color';
 import { findUp } from '../utilities/find-up';
 import { Schema as VersionCommandSchema } from './version';
 
@@ -45,40 +44,41 @@ export class VersionCommand extends Command<VersionCommandSchema> {
       : maybeNodeModules;
 
     const packageNames = [
-      ...Object.keys(pkg && pkg['dependencies'] || {}),
-      ...Object.keys(pkg && pkg['devDependencies'] || {}),
-      ...Object.keys(projPkg && projPkg['dependencies'] || {}),
-      ...Object.keys(projPkg && projPkg['devDependencies'] || {}),
-      ];
+      ...Object.keys((pkg && pkg['dependencies']) || {}),
+      ...Object.keys((pkg && pkg['devDependencies']) || {}),
+      ...Object.keys((projPkg && projPkg['dependencies']) || {}),
+      ...Object.keys((projPkg && projPkg['devDependencies']) || {}),
+    ];
 
     if (packageRoot != null) {
       // Add all node_modules and node_modules/@*/*
-      const nodePackageNames = fs.readdirSync(packageRoot)
-        .reduce<string[]>((acc, name) => {
-          if (name.startsWith('@')) {
-            return acc.concat(
-              fs.readdirSync(path.resolve(packageRoot, name))
-                .map(subName => name + '/' + subName),
-            );
-          } else {
-            return acc.concat(name);
-          }
-        }, []);
+      const nodePackageNames = fs.readdirSync(packageRoot).reduce<string[]>((acc, name) => {
+        if (name.startsWith('@')) {
+          return acc.concat(
+            fs.readdirSync(path.resolve(packageRoot, name)).map(subName => name + '/' + subName),
+          );
+        } else {
+          return acc.concat(name);
+        }
+      }, []);
 
       packageNames.push(...nodePackageNames);
     }
 
     const versions = packageNames
       .filter(x => patterns.some(p => p.test(x)))
-      .reduce((acc, name) => {
-        if (name in acc) {
-          return acc;
-        }
+      .reduce(
+        (acc, name) => {
+          if (name in acc) {
+            return acc;
+          }
 
-        acc[name] = this.getVersion(name, packageRoot, maybeNodeModules);
+          acc[name] = this.getVersion(name, packageRoot, maybeNodeModules);
 
-        return acc;
-      }, {} as { [module: string]: string });
+          return acc;
+        },
+        {} as { [module: string]: string },
+      );
 
     let ngCliVersion = pkg.version;
     if (!__dirname.match(/node_modules/)) {
@@ -90,8 +90,7 @@ export class VersionCommand extends Command<VersionCommandSchema> {
           stdio: 'pipe',
         });
         gitBranch = gitRefName.replace('\n', '');
-      } catch {
-      }
+      } catch {}
 
       ngCliVersion = `local (v${pkg.version}, branch: ${gitBranch})`;
     }
@@ -103,8 +102,10 @@ export class VersionCommand extends Command<VersionCommandSchema> {
       angularCoreVersion = versions['@angular/core'];
       if (angularCoreVersion) {
         for (const angularPackage of Object.keys(versions)) {
-          if (versions[angularPackage] == angularCoreVersion
-              && angularPackage.startsWith('@angular/')) {
+          if (
+            versions[angularPackage] == angularCoreVersion &&
+            angularPackage.startsWith('@angular/')
+          ) {
             angularSameAsCore.push(angularPackage.replace(/^@angular\//, ''));
             delete versions[angularPackage];
           }
@@ -125,36 +126,43 @@ export class VersionCommand extends Command<VersionCommandSchema> {
   / ___ \\| | | | (_| | |_| | | (_| | |      | |___| |___ | |
  /_/   \\_\\_| |_|\\__, |\\__,_|_|\\__,_|_|       \\____|_____|___|
                 |___/
-    `.split('\n').map(x => terminal.red(x)).join('\n');
+    `
+      .split('\n')
+      .map(x => colors.red(x))
+      .join('\n');
 
     this.logger.info(asciiArt);
-    this.logger.info(`
+    this.logger.info(
+      `
       Angular CLI: ${ngCliVersion}
       Node: ${process.versions.node}
       OS: ${process.platform} ${process.arch}
       Angular: ${angularCoreVersion}
-      ... ${angularSameAsCore.reduce<string[]>((acc, name) => {
-        // Perform a simple word wrap around 60.
-        if (acc.length == 0) {
-          return [name];
-        }
-        const line = (acc[acc.length - 1] + ', ' + name);
-        if (line.length > 60) {
-          acc.push(name);
-        } else {
-          acc[acc.length - 1] = line;
-        }
+      ... ${angularSameAsCore
+        .reduce<string[]>((acc, name) => {
+          // Perform a simple word wrap around 60.
+          if (acc.length == 0) {
+            return [name];
+          }
+          const line = acc[acc.length - 1] + ', ' + name;
+          if (line.length > 60) {
+            acc.push(name);
+          } else {
+            acc[acc.length - 1] = line;
+          }
 
-        return acc;
-      }, []).join('\n... ')}
+          return acc;
+        }, [])
+        .join('\n... ')}
 
       Package${namePad.slice(7)}Version
       -------${namePad.replace(/ /g, '-')}------------------
       ${Object.keys(versions)
-          .map(module => `${module}${namePad.slice(module.length)}${versions[module]}`)
-          .sort()
-          .join('\n')}
-    `.replace(/^ {6}/gm, ''));
+        .map(module => `${module}${namePad.slice(module.length)}${versions[module]}`)
+        .sort()
+        .join('\n')}
+    `.replace(/^ {6}/gm, ''),
+    );
   }
 
   private getVersion(
@@ -168,8 +176,7 @@ export class VersionCommand extends Command<VersionCommandSchema> {
 
         return modulePkg.version;
       }
-    } catch (_) {
-    }
+    } catch (_) {}
 
     try {
       if (cliNodeModules) {
@@ -177,8 +184,7 @@ export class VersionCommand extends Command<VersionCommandSchema> {
 
         return modulePkg.version + ' (cli-only)';
       }
-    } catch {
-    }
+    } catch {}
 
     return '<error>';
   }
diff --git a/packages/angular/cli/lib/cli/index.ts b/packages/angular/cli/lib/cli/index.ts
index d02e8103e9ef..e86b4afe9b04 100644
--- a/packages/angular/cli/lib/cli/index.ts
+++ b/packages/angular/cli/lib/cli/index.ts
@@ -6,43 +6,43 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { createConsoleLogger } from '@angular-devkit/core/node';
-import * as colors from 'ansi-colors';
-import { WriteStream } from 'tty';
 import { format } from 'util';
 import { runCommand } from '../../models/command-runner';
+import { colors, supportsColor } from '../../utilities/color';
 import { getWorkspaceRaw } from '../../utilities/config';
 import { getWorkspaceDetails } from '../../utilities/project';
 
-export default async function(options: { testing?: boolean, cliArgs: string[] }) {
-  // Typings do not contain the function call (added in Node.js v9.9.0)
-  const supportsColor = process.stdout instanceof WriteStream &&
-    (process.stdout as unknown as { getColorDepth(): number }).getColorDepth() > 1;
-
-  const logger = createConsoleLogger(
-    false,
-    process.stdout,
-    process.stderr,
-    {
-      info: s => supportsColor ? s : colors.unstyle(s),
-      debug: s => supportsColor ? s : colors.unstyle(s),
-      warn: s => supportsColor ? colors.bold.yellow(s) : colors.unstyle(s),
-      error: s => supportsColor ? colors.bold.red(s) : colors.unstyle(s),
-      fatal: s => supportsColor ? colors.bold.red(s) : colors.unstyle(s),
-    },
-  );
+export default async function(options: { testing?: boolean; cliArgs: string[] }) {
+  const logger = createConsoleLogger(false, process.stdout, process.stderr, {
+    info: s => (supportsColor ? s : colors.unstyle(s)),
+    debug: s => (supportsColor ? s : colors.unstyle(s)),
+    warn: s => (supportsColor ? colors.bold.yellow(s) : colors.unstyle(s)),
+    error: s => (supportsColor ? colors.bold.red(s) : colors.unstyle(s)),
+    fatal: s => (supportsColor ? colors.bold.red(s) : colors.unstyle(s)),
+  });
 
   // Redirect console to logger
-  console.log = function() { logger.info(format.apply(null, arguments)); };
-  console.info = function() { logger.info(format.apply(null, arguments)); };
-  console.warn = function() { logger.warn(format.apply(null, arguments)); };
-  console.error = function() { logger.error(format.apply(null, arguments)); };
+  console.log = function() {
+    logger.info(format.apply(null, arguments));
+  };
+  console.info = function() {
+    logger.info(format.apply(null, arguments));
+  };
+  console.warn = function() {
+    logger.warn(format.apply(null, arguments));
+  };
+  console.error = function() {
+    logger.error(format.apply(null, arguments));
+  };
 
   let projectDetails = getWorkspaceDetails();
   if (projectDetails === null) {
     const [, localPath] = getWorkspaceRaw('local');
     if (localPath !== null) {
-      logger.fatal(`An invalid configuration file was found ['${localPath}'].`
-                 + ' Please delete the file before running the command.');
+      logger.fatal(
+        `An invalid configuration file was found ['${localPath}'].` +
+          ' Please delete the file before running the command.',
+      );
 
       return 1;
     }
@@ -70,14 +70,14 @@ export default async function(options: { testing?: boolean, cliArgs: string[] })
 
         logger.fatal(
           `An unhandled exception occurred: ${err.message}\n` +
-          `See "${logPath}" for further details.\n\n` +
-          'Please report with the contents of the log file at ' +
-          'https://github.com/angular/angular-cli/issues/new?template=1-bug-report.md',
+            `See "${logPath}" for further details.\n\n` +
+            'Please report with the contents of the log file at ' +
+            'https://github.com/angular/angular-cli/issues/new?template=1-bug-report.md',
         );
       } catch (e) {
         logger.fatal(
           `An unhandled exception occurred: ${err.message}\n` +
-          `Fatal error writing debug log file: ${e.message}`,
+            `Fatal error writing debug log file: ${e.message}`,
         );
         if (err.stack) {
           logger.fatal(err.stack);
diff --git a/packages/angular/cli/lib/init.ts b/packages/angular/cli/lib/init.ts
index bbaa4a00d81d..b48e467328fa 100644
--- a/packages/angular/cli/lib/init.ts
+++ b/packages/angular/cli/lib/init.ts
@@ -8,11 +8,12 @@
 import 'symbol-observable';
 // symbol polyfill must go first
 // tslint:disable-next-line:ordered-imports import-groups
-import { tags, terminal } from '@angular-devkit/core';
+import { tags } from '@angular-devkit/core';
 import * as fs from 'fs';
 import * as path from 'path';
 import { SemVer } from 'semver';
 import { Duplex } from 'stream';
+import { colors } from '../utilities/color';
 import { isWarningEnabled } from '../utilities/config';
 
 const packageJson = require('../package.json');
@@ -39,7 +40,6 @@ function _fromPackageJson(cwd?: string) {
   return null;
 }
 
-
 // Check if we need to profile this CLI run.
 if (process.env['NG_CLI_PROFILING']) {
   let profiler: {
@@ -49,13 +49,15 @@ if (process.env['NG_CLI_PROFILING']) {
   try {
     profiler = require('v8-profiler-node8'); // tslint:disable-line:no-implicit-dependencies
   } catch (err) {
-    throw new Error(`Could not require 'v8-profiler-node8'. You must install it separetely with ` +
-      `'npm install v8-profiler-node8 --no-save'.\n\nOriginal error:\n\n${err}`);
+    throw new Error(
+      `Could not require 'v8-profiler-node8'. You must install it separetely with ` +
+        `'npm install v8-profiler-node8 --no-save'.\n\nOriginal error:\n\n${err}`,
+    );
   }
 
   profiler.startProfiling();
 
-  const exitHandler = (options: { cleanup?: boolean, exit?: boolean }) => {
+  const exitHandler = (options: { cleanup?: boolean; exit?: boolean }) => {
     if (options.cleanup) {
       const cpuProfile = profiler.stopProfiling();
       fs.writeFileSync(
@@ -93,7 +95,7 @@ try {
   }
 
   if (shouldWarn && isWarningEnabled('versionMismatch')) {
-    const warning = terminal.yellow(tags.stripIndents`
+    const warning = colors.yellow(tags.stripIndents`
     Your global Angular CLI version (${globalVersion}) is greater than your local
     version (${localVersion}). The local Angular CLI version is used.
 
@@ -101,10 +103,10 @@ try {
     `);
     // Don't show warning colorised on `ng completion`
     if (process.argv[2] !== 'completion') {
-        // eslint-disable-next-line no-console
+      // eslint-disable-next-line no-console
       console.error(warning);
     } else {
-        // eslint-disable-next-line no-console
+      // eslint-disable-next-line no-console
       console.error(warning);
       process.exit(1);
     }
diff --git a/packages/angular/cli/models/analytics.ts b/packages/angular/cli/models/analytics.ts
index dec1a0567f82..3d48f2677cd8 100644
--- a/packages/angular/cli/models/analytics.ts
+++ b/packages/angular/cli/models/analytics.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { analytics, json, tags, terminal } from '@angular-devkit/core';
+import { analytics, json, tags } from '@angular-devkit/core';
 import * as child_process from 'child_process';
 import * as debug from 'debug';
 import { writeFileSync } from 'fs';
@@ -13,11 +13,12 @@ import * as inquirer from 'inquirer';
 import * as os from 'os';
 import * as ua from 'universal-analytics';
 import { v4 as uuidV4 } from 'uuid';
+import { colors } from '../utilities/color';
 import { getWorkspace, getWorkspaceRaw } from '../utilities/config';
 import { isTTY } from '../utilities/tty';
 
-const analyticsDebug = debug('ng:analytics');  // Generate analytics, including settings and users.
-const analyticsLogDebug = debug('ng:analytics:log');  // Actual logs of events.
+const analyticsDebug = debug('ng:analytics'); // Generate analytics, including settings and users.
+const analyticsLogDebug = debug('ng:analytics:log'); // Actual logs of events.
 
 const BYTES_PER_MEGABYTES = 1024 * 1024;
 
@@ -43,7 +44,6 @@ export function isPackageNameSafeForAnalytics(name: string) {
   });
 }
 
-
 /**
  * Attempt to get the Windows Language Code string.
  * @private
@@ -56,7 +56,10 @@ function _getWindowsLanguageCode(): string | undefined {
   try {
     // This is true on Windows XP, 7, 8 and 10 AFAIK. Would return empty string or fail if it
     // doesn't work.
-    return child_process.execSync('wmic.exe os get locale').toString().trim();
+    return child_process
+      .execSync('wmic.exe os get locale')
+      .toString()
+      .trim();
   } catch (_) {}
 
   return undefined;
@@ -68,11 +71,13 @@ function _getWindowsLanguageCode(): string | undefined {
  */
 function _getLanguage() {
   // Note: Windows does not expose the configured language by default.
-  return process.env.LANG  // Default Unix env variable.
-      || process.env.LC_CTYPE  // For C libraries. Sometimes the above isn't set.
-      || process.env.LANGSPEC  // For Windows, sometimes this will be set (not always).
-      || _getWindowsLanguageCode()
-      || '??';  // ¯\_(ツ)_/¯
+  return (
+    process.env.LANG || // Default Unix env variable.
+    process.env.LC_CTYPE || // For C libraries. Sometimes the above isn't set.
+    process.env.LANGSPEC || // For Windows, sometimes this will be set (not always).
+    _getWindowsLanguageCode() ||
+    '??'
+  ); // ¯\_(ツ)_/¯
 }
 
 /**
@@ -113,9 +118,10 @@ function _getRamSize() {
 function _getNodeVersion() {
   // We use any here because p.release is a new Node construct in Node 10 (and our typings are the
   // minimal version of Node we support).
-  const p = process as any;  // tslint:disable-line:no-any
-  const name = typeof p.release == 'object' && typeof p.release.name == 'string' && p.release.name
-          || process.argv0;
+  const p = process as any; // tslint:disable-line:no-any
+  const name =
+    (typeof p.release == 'object' && typeof p.release.name == 'string' && p.release.name) ||
+    process.argv0;
 
   return name + ' ' + process.version;
 }
@@ -128,10 +134,9 @@ function _getNumericNodeVersion() {
   const p = process.version;
   const m = p.match(/\d+\.\d+/);
 
-  return m && m[0] && parseFloat(m[0]) || 0;
+  return (m && m[0] && parseFloat(m[0])) || 0;
 }
 
-
 // These are just approximations of UA strings. We just try to fool Google Analytics to give us the
 // data we want.
 // See https://developers.whatismybrowser.com/useragents/
@@ -165,7 +170,6 @@ const osVersionMap: { [os: string]: { [release: string]: string } } = {
   },
 };
 
-
 /**
  * Build a fake User Agent string for OSX. This gets sent to Analytics so it shows the proper OS,
  * versions and others.
@@ -226,7 +230,6 @@ function _buildUserAgentString() {
   }
 }
 
-
 /**
  * Implementation of the Analytics interface for using `universal-analytics` package.
  */
@@ -272,10 +275,10 @@ export class UniversalAnalytics implements analytics.Analytics {
    */
   private _customVariables(options: analytics.CustomDimensionsAndMetricsOptions) {
     const additionals: { [key: string]: boolean | number | string } = {};
-    this._dimensions.forEach((v, i) => additionals['cd' + i] = v);
-    (options.dimensions || []).forEach((v, i) => additionals['cd' + i] = v);
-    this._metrics.forEach((v, i) => additionals['cm' + i] = v);
-    (options.metrics || []).forEach((v, i) => additionals['cm' + i] = v);
+    this._dimensions.forEach((v, i) => (additionals['cd' + i] = v));
+    (options.dimensions || []).forEach((v, i) => (additionals['cd' + i] = v));
+    this._metrics.forEach((v, i) => (additionals['cm' + i] = v));
+    (options.metrics || []).forEach((v, i) => (additionals['cm' + i] = v));
 
     return additionals;
   }
@@ -382,7 +385,7 @@ export async function promptGlobalAnalytics(force = false) {
         Thank you for sharing anonymous usage data. If you change your mind, the following
         command will disable this feature entirely:
 
-            ${terminal.yellow('ng analytics off')}
+            ${colors.yellow('ng analytics off')}
       `);
       console.log('');
     }
@@ -431,7 +434,7 @@ export async function promptProjectAnalytics(force = false): Promise<boolean> {
         Thank you for sharing anonymous usage data. Would you change your mind, the following
         command will disable this feature entirely:
 
-            ${terminal.yellow('ng analytics project off')}
+            ${colors.yellow('ng analytics project off')}
       `);
       console.log('');
     }
@@ -445,9 +448,8 @@ export async function promptProjectAnalytics(force = false): Promise<boolean> {
 export function hasGlobalAnalyticsConfiguration(): boolean {
   try {
     const globalWorkspace = getWorkspace('global');
-    const analyticsConfig: string | undefined | null | { uid?: string } = globalWorkspace
-      && globalWorkspace.getCli()
-      && globalWorkspace.getCli()['analytics'];
+    const analyticsConfig: string | undefined | null | { uid?: string } =
+      globalWorkspace && globalWorkspace.getCli() && globalWorkspace.getCli()['analytics'];
 
     if (analyticsConfig !== null && analyticsConfig !== undefined) {
       return true;
@@ -483,9 +485,8 @@ export function getGlobalAnalytics(): UniversalAnalytics | undefined {
   // If anything happens we just keep the NOOP analytics.
   try {
     const globalWorkspace = getWorkspace('global');
-    const analyticsConfig: string | undefined | null | { uid?: string } = globalWorkspace
-      && globalWorkspace.getCli()
-      && globalWorkspace.getCli()['analytics'];
+    const analyticsConfig: string | undefined | null | { uid?: string } =
+      globalWorkspace && globalWorkspace.getCli() && globalWorkspace.getCli()['analytics'];
     analyticsDebug('Client Analytics config found: %j', analyticsConfig);
 
     if (analyticsConfig === false) {
@@ -521,7 +522,6 @@ export function getGlobalAnalytics(): UniversalAnalytics | undefined {
   }
 }
 
-
 /**
  * Return the usage analytics sharing setting, which is either a property string (GA-XXXXXXX-XX),
  * or undefined if no sharing.
@@ -541,9 +541,8 @@ export function getSharedAnalytics(): UniversalAnalytics | undefined {
   // If anything happens we just keep the NOOP analytics.
   try {
     const globalWorkspace = getWorkspace('global');
-    const analyticsConfig = globalWorkspace
-      && globalWorkspace.getCli()
-      && globalWorkspace.getCli()['analyticsSharing'];
+    const analyticsConfig =
+      globalWorkspace && globalWorkspace.getCli() && globalWorkspace.getCli()['analyticsSharing'];
 
     if (!analyticsConfig || !analyticsConfig.tracking || !analyticsConfig.uuid) {
       return undefined;
diff --git a/packages/angular/cli/models/command.ts b/packages/angular/cli/models/command.ts
index e0fe53056f9e..676c3714fdc8 100644
--- a/packages/angular/cli/models/command.ts
+++ b/packages/angular/cli/models/command.ts
@@ -7,8 +7,9 @@
  */
 
 // tslint:disable:no-global-tslint-disable no-any
-import { analytics, logging, strings, tags, terminal } from '@angular-devkit/core';
+import { analytics, logging, strings, tags } from '@angular-devkit/core';
 import * as path from 'path';
+import { colors } from '../utilities/color';
 import { getWorkspace } from '../utilities/config';
 import {
   Arguments,
@@ -17,7 +18,8 @@ import {
   CommandDescriptionMap,
   CommandScope,
   CommandWorkspace,
-  Option, SubCommandDescription,
+  Option,
+  SubCommandDescription,
 } from './interface';
 
 export interface BaseCommandOptions {
@@ -67,12 +69,8 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
     const args = this.description.options.filter(x => x.positional !== undefined);
     const opts = this.description.options.filter(x => x.positional === undefined);
 
-    const argDisplay = args && args.length > 0
-      ? ' ' + args.map(a => `<${a.name}>`).join(' ')
-      : '';
-    const optionsDisplay = opts && opts.length > 0
-      ? ` [options]`
-      : ``;
+    const argDisplay = args && args.length > 0 ? ' ' + args.map(a => `<${a.name}>`).join(' ') : '';
+    const optionsDisplay = opts && opts.length > 0 ? ` [options]` : ``;
 
     this.logger.info(`usage: ng ${name}${argDisplay}${optionsDisplay}`);
     this.logger.info('');
@@ -94,7 +92,7 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
     if (args.length > 0) {
       this.logger.info(`arguments:`);
       args.forEach(o => {
-        this.logger.info(`  ${terminal.cyan(o.name)}`);
+        this.logger.info(`  ${colors.cyan(o.name)}`);
         if (o.description) {
           this.logger.info(formatDescription(o.description));
         }
@@ -109,10 +107,11 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
         .filter(o => !o.hidden)
         .sort((a, b) => a.name.localeCompare(b.name))
         .forEach(o => {
-          const aliases = o.aliases && o.aliases.length > 0
-            ? '(' + o.aliases.map(a => `-${a}`).join(' ') + ')'
-            : '';
-          this.logger.info(`  ${terminal.cyan('--' + strings.dasherize(o.name))} ${aliases}`);
+          const aliases =
+            o.aliases && o.aliases.length > 0
+              ? '(' + o.aliases.map(a => `-${a}`).join(' ') + ')'
+              : '';
+          this.logger.info(`  ${colors.cyan('--' + strings.dasherize(o.name))} ${aliases}`);
           if (o.description) {
             this.logger.info(formatDescription(o.description));
           }
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index 872b16534824..c6d6fcb6a2a3 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -13,7 +13,6 @@ import {
   schema,
   strings,
   tags,
-  terminal,
   virtualFs,
 } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
@@ -28,6 +27,7 @@ import {
 import * as inquirer from 'inquirer';
 import * as systemPath from 'path';
 import { WorkspaceLoader } from '../models/workspace-loader';
+import { colors } from '../utilities/color';
 import {
   getProjectByCwd,
   getSchematicDefaults,
@@ -42,7 +42,6 @@ import { BaseCommandOptions, Command } from './command';
 import { Arguments, CommandContext, CommandDescription, Option } from './interface';
 import { parseArguments, parseFreeFormArguments } from './parser';
 
-
 export interface BaseSchematicSchema {
   debug?: boolean;
   dryRun?: boolean;
@@ -59,7 +58,6 @@ export interface RunSchematicOptions extends BaseSchematicSchema {
   showNothingDone?: boolean;
 }
 
-
 export class UnknownCollectionError extends Error {
   constructor(collectionName: string) {
     super(`Invalid collection (${collectionName}).`);
@@ -67,7 +65,7 @@ export class UnknownCollectionError extends Error {
 }
 
 export abstract class SchematicCommand<
-  T extends (BaseSchematicSchema & BaseCommandOptions),
+  T extends BaseSchematicSchema & BaseCommandOptions
 > extends Command<T> {
   readonly allowPrivateSchematics: boolean = false;
   readonly allowAdditionalArgs: boolean = false;
@@ -79,11 +77,7 @@ export abstract class SchematicCommand<
   protected collectionName = this.defaultCollectionName;
   protected schematicName?: string;
 
-  constructor(
-    context: CommandContext,
-    description: CommandDescription,
-    logger: logging.Logger,
-  ) {
+  constructor(context: CommandContext, description: CommandDescription, logger: logging.Logger) {
     super(context, description, logger);
   }
 
@@ -146,9 +140,7 @@ export abstract class SchematicCommand<
       const defaultCollection = this.getDefaultSchematicCollection();
       Object.keys(namesPerCollection).forEach(collectionName => {
         const isDefault = defaultCollection == collectionName;
-        this.logger.info(
-          `  Collection "${collectionName}"${isDefault ? ' (default)' : ''}:`,
-        );
+        this.logger.info(`  Collection "${collectionName}"${isDefault ? ' (default)' : ''}:`);
 
         namesPerCollection[collectionName].forEach(schematicName => {
           this.logger.info(`    ${schematicName}`);
@@ -178,15 +170,15 @@ export abstract class SchematicCommand<
 
       // Display <collectionName:schematicName> if this is not the default collectionName,
       // otherwise just show the schematicName.
-      const displayName = collectionName == this.getDefaultSchematicCollection()
-        ? schematicName
-        : schematicNames[0];
+      const displayName =
+        collectionName == this.getDefaultSchematicCollection() ? schematicName : schematicNames[0];
 
       const schematicOptions = subCommandOption.subcommands[schematicNames[0]].options;
       const schematicArgs = schematicOptions.filter(x => x.positional !== undefined);
-      const argDisplay = schematicArgs.length > 0
-        ? ' ' + schematicArgs.map(a => `<${strings.dasherize(a.name)}>`).join(' ')
-        : '';
+      const argDisplay =
+        schematicArgs.length > 0
+          ? ' ' + schematicArgs.map(a => `<${strings.dasherize(a.name)}>`).join(' ')
+          : '';
 
       this.logger.info(tags.oneLine`
         usage: ng ${this.description.name} ${displayName}${argDisplay}
@@ -229,11 +221,14 @@ export abstract class SchematicCommand<
     return options
       .filter(o => o.format === 'path')
       .map(o => o.name)
-      .reduce((acc, curr) => {
-        acc[curr] = workingDir;
+      .reduce(
+        (acc, curr) => {
+          acc[curr] = workingDir;
 
-        return acc;
-      }, {} as { [name: string]: string });
+          return acc;
+        },
+        {} as { [name: string]: string },
+      );
   }
 
   /*
@@ -247,15 +242,12 @@ export abstract class SchematicCommand<
     const { force, dryRun } = options;
     const fsHost = new virtualFs.ScopedHost(new NodeJsSyncHost(), normalize(this.workspace.root));
 
-    const workflow = new NodeWorkflow(
-        fsHost,
-        {
-          force,
-          dryRun,
-          packageManager: getPackageManager(this.workspace.root),
-          root: normalize(this.workspace.root),
-        },
-    );
+    const workflow = new NodeWorkflow(fsHost, {
+      force,
+      dryRun,
+      packageManager: getPackageManager(this.workspace.root),
+      root: normalize(this.workspace.root),
+    });
     workflow.engineHost.registerContextTransform(context => {
       // This is run by ALL schematics, so if someone uses `externalSchematics(...)` which
       // is safelisted, it would move to the right analytics (even if their own isn't).
@@ -281,8 +273,10 @@ export abstract class SchematicCommand<
     workflow.registry.addSmartDefaultProvider('projectName', () => {
       if (this._workspace) {
         try {
-          return this._workspace.getProjectByPath(normalize(process.cwd()))
-            || this._workspace.getDefaultProjectName();
+          return (
+            this._workspace.getProjectByPath(normalize(process.cwd())) ||
+            this._workspace.getDefaultProjectName()
+          );
         } catch (e) {
           if (e instanceof experimental.workspace.AmbiguousProjectPathException) {
             this.logger.warn(tags.oneLine`
@@ -320,16 +314,18 @@ export abstract class SchematicCommand<
               break;
             case 'list':
               question.type = !!definition.multiselect ? 'checkbox' : 'list';
-              question.choices = definition.items && definition.items.map(item => {
-                if (typeof item == 'string') {
-                  return item;
-                } else {
-                  return {
-                    name: item.label,
-                    value: item.value,
-                  };
-                }
-              });
+              question.choices =
+                definition.items &&
+                definition.items.map(item => {
+                  if (typeof item == 'string') {
+                    return item;
+                  } else {
+                    return {
+                      name: item.label,
+                      value: item.value,
+                    };
+                  }
+                });
               break;
             default:
               question.type = definition.type;
@@ -343,7 +339,7 @@ export abstract class SchematicCommand<
       });
     }
 
-    return this._workflow = workflow;
+    return (this._workflow = workflow);
   }
 
   protected getDefaultSchematicCollection(): string {
@@ -482,19 +478,19 @@ export abstract class SchematicCommand<
           break;
         case 'update':
           loggingQueue.push(tags.oneLine`
-            ${terminal.white('UPDATE')} ${eventPath} (${event.content.length} bytes)
+            ${colors.white('UPDATE')} ${eventPath} (${event.content.length} bytes)
           `);
           break;
         case 'create':
           loggingQueue.push(tags.oneLine`
-            ${terminal.green('CREATE')} ${eventPath} (${event.content.length} bytes)
+            ${colors.green('CREATE')} ${eventPath} (${event.content.length} bytes)
           `);
           break;
         case 'delete':
-          loggingQueue.push(`${terminal.yellow('DELETE')} ${eventPath}`);
+          loggingQueue.push(`${colors.yellow('DELETE')} ${eventPath}`);
           break;
         case 'rename':
-          loggingQueue.push(`${terminal.blue('RENAME')} ${eventPath} => ${event.to}`);
+          loggingQueue.push(`${colors.blue('RENAME')} ${eventPath} => ${event.to}`);
           break;
       }
     });
@@ -511,40 +507,41 @@ export abstract class SchematicCommand<
       }
     });
 
-    return new Promise<number | void>((resolve) => {
-      workflow.execute({
-        collection: collectionName,
-        schematic: schematicName,
-        options: input,
-        debug: debug,
-        logger: this.logger,
-        allowPrivate: this.allowPrivateSchematics,
-      })
-      .subscribe({
-        error: (err: Error) => {
-          // In case the workflow was not successful, show an appropriate error message.
-          if (err instanceof UnsuccessfulWorkflowExecution) {
-            // "See above" because we already printed the error.
-            this.logger.fatal('The Schematic workflow failed. See above.');
-          } else if (debug) {
-            this.logger.fatal(`An error occured:\n${err.message}\n${err.stack}`);
-          } else {
-            this.logger.fatal(err.message);
-          }
-
-          resolve(1);
-        },
-        complete: () => {
-          const showNothingDone = !(options.showNothingDone === false);
-          if (nothingDone && showNothingDone) {
-            this.logger.info('Nothing to be done.');
-          }
-          if (dryRun) {
-            this.logger.warn(`\nNOTE: The "dryRun" flag means no changes were made.`);
-          }
-          resolve();
-        },
-      });
+    return new Promise<number | void>(resolve => {
+      workflow
+        .execute({
+          collection: collectionName,
+          schematic: schematicName,
+          options: input,
+          debug: debug,
+          logger: this.logger,
+          allowPrivate: this.allowPrivateSchematics,
+        })
+        .subscribe({
+          error: (err: Error) => {
+            // In case the workflow was not successful, show an appropriate error message.
+            if (err instanceof UnsuccessfulWorkflowExecution) {
+              // "See above" because we already printed the error.
+              this.logger.fatal('The Schematic workflow failed. See above.');
+            } else if (debug) {
+              this.logger.fatal(`An error occured:\n${err.message}\n${err.stack}`);
+            } else {
+              this.logger.fatal(err.message);
+            }
+
+            resolve(1);
+          },
+          complete: () => {
+            const showNothingDone = !(options.showNothingDone === false);
+            if (nothingDone && showNothingDone) {
+              this.logger.info('Nothing to be done.');
+            }
+            if (dryRun) {
+              this.logger.warn(`\nNOTE: The "dryRun" flag means no changes were made.`);
+            }
+            resolve();
+          },
+        });
     });
   }
 
diff --git a/packages/angular/cli/tasks/npm-install.ts b/packages/angular/cli/tasks/npm-install.ts
index aae5eb68fcad..f60fce0f8991 100644
--- a/packages/angular/cli/tasks/npm-install.ts
+++ b/packages/angular/cli/tasks/npm-install.ts
@@ -6,14 +6,17 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { logging, terminal } from '@angular-devkit/core';
+import { logging } from '@angular-devkit/core';
 import { spawn } from 'child_process';
-
-export default async function (packageName: string,
-                               logger: logging.Logger,
-                               packageManager: string,
-                               projectRoot: string,
-                               save = true) {
+import { colors } from '../utilities/color';
+
+export default async function(
+  packageName: string,
+  logger: logging.Logger,
+  packageManager: string,
+  projectRoot: string,
+  save = true,
+) {
   const installArgs: string[] = [];
   switch (packageManager) {
     case 'cnpm':
@@ -32,7 +35,7 @@ export default async function (packageName: string,
       break;
   }
 
-  logger.info(terminal.green(`Installing packages for tooling via ${packageManager}.`));
+  logger.info(colors.green(`Installing packages for tooling via ${packageManager}.`));
 
   if (packageName) {
     installArgs.push(packageName);
@@ -45,14 +48,16 @@ export default async function (packageName: string,
   installArgs.push('--quiet');
 
   await new Promise((resolve, reject) => {
-    spawn(packageManager, installArgs, { stdio: 'inherit', shell: true })
-      .on('close', (code: number) => {
+    spawn(packageManager, installArgs, { stdio: 'inherit', shell: true }).on(
+      'close',
+      (code: number) => {
         if (code === 0) {
-          logger.info(terminal.green(`Installed packages for tooling via ${packageManager}.`));
+          logger.info(colors.green(`Installed packages for tooling via ${packageManager}.`));
           resolve();
         } else {
           reject('Package install failed, see above.');
         }
-      });
+      },
+    );
   });
 }
diff --git a/packages/angular/cli/utilities/color.ts b/packages/angular/cli/utilities/color.ts
new file mode 100644
index 000000000000..59344dfa95f3
--- /dev/null
+++ b/packages/angular/cli/utilities/color.ts
@@ -0,0 +1,18 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import * as colors from 'ansi-colors';
+import { WriteStream } from 'tty';
+
+// Typings do not contain the function call (added in Node.js v9.9.0)
+export const supportsColor =
+  process.stdout instanceof WriteStream &&
+  ((process.stdout as unknown) as { getColorDepth(): number }).getColorDepth() > 1;
+
+(colors as { enabled: boolean }).enabled = supportsColor;
+
+export { colors };

From bbb12e3b861bceb8d97cce736c4e9e65f0d4aaa5 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 21 Jun 2019 08:48:53 +0000
Subject: [PATCH 1519/1703] build: update inquirer to version 6.4.1

---
 packages/angular/cli/package.json                   | 2 +-
 packages/angular_devkit/schematics_cli/package.json | 2 +-
 yarn.lock                                           | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 92d96004a419..1a66fd933060 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -34,7 +34,7 @@
     "ansi-colors": "4.0.1",
     "debug": "^4.1.1",
     "ini": "1.3.5",
-    "inquirer": "6.4.0",
+    "inquirer": "6.4.1",
     "npm-package-arg": "6.1.0",
     "open": "6.3.0",
     "pacote": "9.5.1",
diff --git a/packages/angular_devkit/schematics_cli/package.json b/packages/angular_devkit/schematics_cli/package.json
index 07965fdd963a..40fd8c462303 100644
--- a/packages/angular_devkit/schematics_cli/package.json
+++ b/packages/angular_devkit/schematics_cli/package.json
@@ -18,7 +18,7 @@
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
     "@schematics/schematics": "0.0.0",
-    "inquirer": "6.4.0",
+    "inquirer": "6.4.1",
     "minimist": "1.2.0",
     "rxjs": "6.4.0",
     "symbol-observable": "1.2.0"
diff --git a/yarn.lock b/yarn.lock
index f7b65c64b44f..00dc866ece9e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4838,10 +4838,10 @@ injection-js@^2.2.1:
   resolved "https://registry.yarnpkg.com/injection-js/-/injection-js-2.2.1.tgz#a8d6a085b2f0b8d8650f6f4487f6abb8cc0d67ce"
   integrity sha512-zHI+E+dM0PXix5FFTO1Y4/UOyAzE7zG1l/QwAn4jchTThOoBq+UYRFK4AVG7lQgFL+go62SbrzSsjXy9DFEZUg==
 
-inquirer@6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.4.0.tgz#6f9284047c4e48b76b169e46b3ae3b2171ce30a2"
-  integrity sha512-O3qJQ+fU/AI1K2y5/RjqefMEQTdJQf6sPTvyRA1bx6D634ADxcu97u6YOUciIeU2OWIuvpUsQs6Wx3Fdi3eFaQ==
+inquirer@6.4.1:
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.4.1.tgz#7bd9e5ab0567cd23b41b0180b68e0cfa82fc3c0b"
+  integrity sha512-/Jw+qPZx4EDYsaT6uz7F4GJRNFMRdKNeUZw3ZnKV8lyuUgz/YWRCSUAJMZSVhSq4Ec0R2oYnyi6b3d4JXcL5Nw==
   dependencies:
     ansi-escapes "^3.2.0"
     chalk "^2.4.2"

From 371bd6194a82b496efa9be7a3cbf43e03ff7f84c Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Fri, 21 Jun 2019 14:47:27 +0200
Subject: [PATCH 1520/1703] fix(@angular/cli): validate version in doc command

As the JSON Schema validation is minimum in the CLI, we have to also validate in code.
This PR:
- updates the JSON Schema to use `number` and `enum` instead of `integer` and `const` that are not supported.
- adds validation in the doc command implementation
- adds error reporting if the version is not valid
- fixes a typo in an error message in the parser
---
 packages/angular/cli/commands/doc-impl.ts | 8 +++++++-
 packages/angular/cli/commands/doc.json    | 9 +++------
 packages/angular/cli/models/parser.ts     | 2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/angular/cli/commands/doc-impl.ts b/packages/angular/cli/commands/doc-impl.ts
index d78e3fce252b..5f258bab424c 100644
--- a/packages/angular/cli/commands/doc-impl.ts
+++ b/packages/angular/cli/commands/doc-impl.ts
@@ -23,10 +23,16 @@ export class DocCommand extends Command<DocCommandSchema> {
     let domain = 'angular.io';
 
     if (options.version) {
+      // version can either be a string containing "next"
       if (options.version == 'next') {
         domain = 'next.angular.io';
-      } else {
+      // or a number where version must be a valid Angular version (i.e. not 0, 1 or 3)
+      } else if (!isNaN(+options.version) && ![0, 1, 3].includes(+options.version)) {
         domain = `v${options.version}.angular.io`;
+      } else {
+        this.logger.error('Version should either be a number (2, 4, 5, 6...) or "next"');
+
+        return 0;
       }
     }
 
diff --git a/packages/angular/cli/commands/doc.json b/packages/angular/cli/commands/doc.json
index edb3d6b6d7fe..68158583452b 100644
--- a/packages/angular/cli/commands/doc.json
+++ b/packages/angular/cli/commands/doc.json
@@ -27,16 +27,13 @@
           "description": "When true, searches all of angular.io. Otherwise, searches only API reference documentation."
         },
         "version" : {
-          "anyOf": [
+          "oneOf": [
             {
-              "const" : 2
-            },
-            {
-              "type" : "integer",
+              "type": "number",
               "minimum": 4
             },
             {
-              "const": "next"
+              "enum": [2, "next"]
             }
           ],
           "description": "Contains the version of Angular to use for the documentation."
diff --git a/packages/angular/cli/models/parser.ts b/packages/angular/cli/models/parser.ts
index 8631a9e99900..f37d604aa536 100644
--- a/packages/angular/cli/models/parser.ts
+++ b/packages/angular/cli/models/parser.ts
@@ -16,7 +16,7 @@ export class ParseArgumentException extends BaseException {
     public readonly parsed: Arguments,
     public readonly ignored: string[],
   ) {
-    super(`One or more errors occured while parsing arguments:\n  ${comments.join('\n  ')}`);
+    super(`One or more errors occurred while parsing arguments:\n  ${comments.join('\n  ')}`);
   }
 }
 

From 4a4155b089725705367ad8c930a900252fb9270c Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Sat, 22 Jun 2019 09:43:17 -0700
Subject: [PATCH 1521/1703] fix(@schematics/angular): fix BUILD file filter for
 npm package to include both BUILD and BUILD.bazel file

This removes the file https://github.com/angular/angular-cli/blob/master/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/BUILD.bazel which currently makes it into the npm dist at `@schematics/angular/third_party/github.com/Microsoft/TypeScript/BUILD.bazel`.
---
 scripts/build.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build.ts b/scripts/build.ts
index 5ff134e17aea..50264bd99958 100644
--- a/scripts/build.ts
+++ b/scripts/build.ts
@@ -264,7 +264,7 @@ export default async function(
         }
 
         // Remove Bazel files from NPM.
-        if (fileName.endsWith('BUILD')) {
+        if (fileName === 'BUILD' || fileName === 'BUILD.bazel') {
           return false;
         }
 

From ce578ae9b3c92acc00fd768f2d551430113cedbf Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 24 Jun 2019 01:52:32 +0000
Subject: [PATCH 1522/1703] build: update semver to version 6.1.2

---
 package.json                                       | 2 +-
 packages/angular/cli/package.json                  | 2 +-
 packages/angular_devkit/build_angular/package.json | 2 +-
 packages/schematics/update/package.json            | 2 +-
 yarn.lock                                          | 7 ++++++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index caf204e882f5..cccbdec32ec3 100644
--- a/package.json
+++ b/package.json
@@ -130,7 +130,7 @@
     "pidtree": "^0.3.0",
     "pidusage": "^2.0.17",
     "rxjs": "~6.4.0",
-    "semver": "6.1.1",
+    "semver": "6.1.2",
     "source-map": "^0.5.6",
     "source-map-support": "^0.5.0",
     "spdx-satisfies": "^4.0.0",
diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 1a66fd933060..f3b8b191a9e3 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -39,7 +39,7 @@
     "open": "6.3.0",
     "pacote": "9.5.1",
     "read-package-tree": "5.2.2",
-    "semver": "6.1.1",
+    "semver": "6.1.2",
     "symbol-observable": "1.2.0",
     "universal-analytics": "^0.4.20",
     "uuid": "^3.3.2"
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 0705dd92d220..c7e63ffc641e 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -39,7 +39,7 @@
     "rxjs": "6.4.0",
     "sass": "1.21.0",
     "sass-loader": "7.1.0",
-    "semver": "6.1.1",
+    "semver": "6.1.2",
     "source-map-support": "0.5.12",
     "source-map-loader": "0.2.4",
     "speed-measure-webpack-plugin": "1.3.1",
diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index e24bf285c9ce..3692deb683b8 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -16,7 +16,7 @@
     "@yarnpkg/lockfile": "1.1.0",
     "ini": "1.3.5",
     "pacote": "9.5.1",
-    "semver": "6.1.1",
+    "semver": "6.1.2",
     "semver-intersect": "1.4.0",
     "rxjs": "6.4.0"
   }
diff --git a/yarn.lock b/yarn.lock
index 00dc866ece9e..0aa0aadba82a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8763,7 +8763,12 @@ semver-intersect@1.4.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
   integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
 
-semver@6.1.1, semver@^6.1.1:
+semver@6.1.2:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.2.tgz#079960381376a3db62eb2edc8a3bfb10c7cfe318"
+  integrity sha512-z4PqiCpomGtWj8633oeAdXm1Kn1W++3T8epkZYnwiVgIYIJ0QHszhInYSJTYxebByQH7KVCEAn8R9duzZW2PhQ==
+
+semver@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
   integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==

From 572d0055fb1cdfb521068be30104a9539e9992aa Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 25 Jun 2019 11:02:57 +0200
Subject: [PATCH 1523/1703] fix(@angular-devkit/build-angular): add
 `@angular/compiler-cli` version `8.1.0-next.0` as `peerDependency`

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index c7e63ffc641e..a69c43f0d7d6 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -86,7 +86,7 @@
     "zone.js": "^0.9.1"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": ">=8.0.0-beta.0 < 9.0.0",
+    "@angular/compiler-cli": "^8.0.0-beta.0 || ^8.1.0-beta.0 || ^8.2.0-beta.0 || ^8.3.0-beta.0 || ^8.4.0-beta.0 || >=9.0.0-beta < 9",
     "typescript": ">=3.1 < 3.5"
   }
 }

From 6d6f7864fa8a4d99d9fbd368134ba11705bdb622 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 25 Jun 2019 11:03:09 +0200
Subject: [PATCH 1524/1703] fix(@ngtools/webpack): add `@angular/compiler-cli`
 version `8.1.0-next.0` as `peerDependency`

---
 packages/ngtools/webpack/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index c6b5f5820a55..e6cd859a70e2 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -28,7 +28,7 @@
     "webpack-sources": "1.3.0"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": ">=8.0.0-beta.0 < 9.0.0",
+    "@angular/compiler-cli": "^8.0.0-beta.0 || ^8.1.0-beta.0 || ^8.2.0-beta.0 || ^8.3.0-beta.0 || ^8.4.0-beta.0 || >=9.0.0-beta < 9",
     "typescript": ">=3.4 < 3.5",
     "webpack": "^4.0.0"
   },

From dc9dc0ff22a87ae054fda7877f879c694ace6952 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 25 Jun 2019 11:21:38 +0200
Subject: [PATCH 1525/1703] test: add `--force` to version 7 migration when
 updating prerelease versions

We only use it for a few things but have a strict peerdep.

This strictness causes errors when updating the CLI from 7.x to 8.1 next projects:
```
Package "@angular-devkit/build-angular" has an incompatible peer dependency to "@angular/compiler-cli" (requires ">=8.0.0-beta.0 < 9.0.0" (extended), would install "8.1.0-next.3").
```
`build-angular` didn't have a peerdep on `@angular/compiler-cli` that supported `8.1.0-next`

This PR relaxes this requirement.

After the other commits get merged and released, we should to revert this commit.
---
 .../legacy-cli/e2e/tests/update/update-7.0.ts  | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/update/update-7.0.ts b/tests/legacy-cli/e2e/tests/update/update-7.0.ts
index c24b4e6d6d47..a2ab5da9ce23 100644
--- a/tests/legacy-cli/e2e/tests/update/update-7.0.ts
+++ b/tests/legacy-cli/e2e/tests/update/update-7.0.ts
@@ -1,14 +1,11 @@
 import { createProjectFromAsset } from '../../utils/assets';
 import { expectFileMatchToExist, expectFileToExist, expectFileToMatch } from '../../utils/fs';
 import { ng, noSilentNg, silentNpm } from '../../utils/process';
-import {
-  isPrereleaseCli, useBuiltPackages, useCIChrome, useCIDefaults,
-} from '../../utils/project';
+import { isPrereleaseCli, useBuiltPackages, useCIChrome, useCIDefaults } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
 
-
-export default async function () {
-  const extraUpdateArgs = await isPrereleaseCli() ? ['--next'] : [];
+export default async function() {
+  const extraUpdateArgs = (await isPrereleaseCli()) ? ['--next', '--force'] : [];
 
   // Create new project from previous version files.
   // We must use the original NPM packages to force a real update.
@@ -23,8 +20,10 @@ export default async function () {
 
   // Test CLI migrations.
   // Should update the lazy route syntax via update-lazy-module-paths.
-  await expectFileToMatch('src/app/app-routing.module.ts',
-    `loadChildren: () => import('./lazy/lazy.module').then(m => m.LazyModule)`);
+  await expectFileToMatch(
+    'src/app/app-routing.module.ts',
+    `loadChildren: () => import('./lazy/lazy.module').then(m => m.LazyModule)`,
+  );
   // Should update tsconfig and src/browserslist via differential-loading.
   await expectFileToMatch('tsconfig.json', `"target": "es2015",`);
   await expectToFail(() => expectFileToExist('e2e/browserlist'));
@@ -33,8 +32,7 @@ export default async function () {
   // Should rename codelyzer rules.
   await expectFileToMatch('tslint.json', `use-lifecycle-interface`);
   // Unnecessary es6 polyfills should be removed via drop-es6-polyfills.
-  await expectToFail(() => expectFileToMatch('src/polyfills.ts',
-   `import 'core-js/es6/symbol';`));
+  await expectToFail(() => expectFileToMatch('src/polyfills.ts', `import 'core-js/es6/symbol';`));
   await expectToFail(() => expectFileToMatch('src/polyfills.ts', `import 'core-js/es6/set';`));
 
   // Use the packages we are building in this commit, and CI Chrome.

From a5afd7b2b69211276ae5ce3592c8da953ca5ea3b Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 24 Jun 2019 15:22:23 -0700
Subject: [PATCH 1526/1703] fix(@angular-devkit/build-angular): force event
 category to be something

If it is empty (or undefined), the Universal Analytics package will not send events.
---
 packages/angular_devkit/build_angular/src/browser/index.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index ad875e077e13..4550bb570576 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -118,7 +118,9 @@ function getAnalyticsConfig(
     let category = 'build';
     if (context.builder) {
       // We already vetted that this is a "safe" package, otherwise the analytics would be noop.
-      category = context.builder.builderName.split(':')[1];
+      category = context.builder.builderName.split(':')[1]
+              || context.builder.builderName
+              || 'build';
     }
 
     // The category is the builder name if it's an angular builder.

From d7460517cf760b3d22cdb78bdcb1bcfa32f1d6ff Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Fri, 21 Jun 2019 08:02:52 +0200
Subject: [PATCH 1527/1703] fix(@angular/cli): log file path normalization

In windows the logfile path in the console will be printed with both back and forward slashes if not normalized.
---
 packages/angular/cli/lib/cli/index.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/lib/cli/index.ts b/packages/angular/cli/lib/cli/index.ts
index e86b4afe9b04..da9c92906c36 100644
--- a/packages/angular/cli/lib/cli/index.ts
+++ b/packages/angular/cli/lib/cli/index.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { createConsoleLogger } from '@angular-devkit/core/node';
+import { normalize } from 'path';
 import { format } from 'util';
 import { runCommand } from '../../models/command-runner';
 import { colors, supportsColor } from '../../utilities/color';
@@ -65,7 +66,7 @@ export default async function(options: { testing?: boolean; cliArgs: string[] })
         const fs = await import('fs');
         const os = await import('os');
         const tempDirectory = fs.mkdtempSync(fs.realpathSync(os.tmpdir()) + '/' + 'ng-');
-        const logPath = tempDirectory + '/angular-errors.log';
+        const logPath = normalize(tempDirectory + '/angular-errors.log');
         fs.appendFileSync(logPath, '[error] ' + (err.stack || err));
 
         logger.fatal(

From 708259bd22ce23d8a3fa58de6c0a2ae0499aac12 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 25 Jun 2019 18:20:56 +0000
Subject: [PATCH 1528/1703] build: update sass to version 1.22.0

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index a69c43f0d7d6..4d201bcf8234 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -37,7 +37,7 @@
     "postcss-loader": "3.0.0",
     "raw-loader": "1.0.0",
     "rxjs": "6.4.0",
-    "sass": "1.21.0",
+    "sass": "1.22.0",
     "sass-loader": "7.1.0",
     "semver": "6.1.2",
     "source-map-support": "0.5.12",
diff --git a/yarn.lock b/yarn.lock
index 0aa0aadba82a..17eef329e92b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8632,10 +8632,10 @@ sass-loader@7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
-sass@1.21.0:
-  version "1.21.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.21.0.tgz#cc565444e27c2336746b09c45d6e8c46caaf6b04"
-  integrity sha512-67hIIOZZtarbhI2aSgKBPDUgn+VqetduKoD+ZSYeIWg+ksNioTzeX+R2gUdebDoolvKNsQ/GY9NDxctbXluTNA==
+sass@1.22.0:
+  version "1.22.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.22.0.tgz#70fcfa86d78450d98a54c7459d3f2c93d7abf30b"
+  integrity sha512-6BEkdLYPP26cKggrMuBjMWpguMFgeayW+35LGnzXqCipm86fUboSVAdRLFKRpk1ClMNzFZums6kKkjgWF00WoA==
   dependencies:
     chokidar "^2.0.0"
 

From a5e6b10c40c7a07cd58b0ed5c845470263ecc8fd Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 25 Jun 2019 18:00:18 +0000
Subject: [PATCH 1529/1703] build: update caniuse-lite to version 1.0.30000977

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 4d201bcf8234..7332473a3b2a 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -15,7 +15,7 @@
     "ajv": "6.10.0",
     "autoprefixer": "9.6.0",
     "browserslist": "4.6.3",
-    "caniuse-lite": "1.0.30000976",
+    "caniuse-lite": "1.0.30000977",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.3",
diff --git a/yarn.lock b/yarn.lock
index 17eef329e92b..9d8d8534429f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1900,10 +1900,10 @@ camelcase@^5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@1.0.30000976:
-  version "1.0.30000976"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000976.tgz#d30fe12662cb2a21e130d307db9907513ca830a2"
-  integrity sha512-tleNB1IwPRqZiod6nUNum63xQCMN96BUO2JTeiwuRM7p9d616EHsMBjBWJMudX39qCaPuWY8KEWzMZq7A9XQMQ==
+caniuse-lite@1.0.30000977:
+  version "1.0.30000977"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000977.tgz#7da2ca14cae2fddb368c05c57ab4a529afd658ff"
+  integrity sha512-RTXL32vdfAc2g9aoDL6vnBzbOO/3sM+T+YX4m7W9iFZnl3qIz7WYoZZpcZpALud8xq4+N56rnruX/NQy9HQu6A==
 
 caniuse-lite@^1.0.30000898:
   version "1.0.30000903"

From 01930d685dc5a6878bc4077f4a28c1fde57b4a44 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Tue, 25 Jun 2019 09:32:17 +0200
Subject: [PATCH 1530/1703] test: file override should happen before migration
 being run

---
 .../update-8/differential-loading_spec.ts     | 87 ++++++++++---------
 1 file changed, 48 insertions(+), 39 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
index 57fc7cd2f9df..418367846f78 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
@@ -9,7 +9,6 @@
 import { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 
-
 describe('Migration to version 8', () => {
   describe('Migrate ES5 projects to enable differential loading', () => {
     const tsConfigPath = '/tsconfig.json';
@@ -17,9 +16,7 @@ describe('Migration to version 8', () => {
       compilerOptions: {
         module: 'es2015',
         moduleResolution: 'node',
-        typeRoots: [
-          'node_modules/@types',
-        ],
+        typeRoots: ['node_modules/@types'],
       },
     };
 
@@ -32,15 +29,18 @@ describe('Migration to version 8', () => {
 
     beforeEach(async () => {
       tree = new UnitTestTree(new EmptyTree());
-      tree = await schematicRunner.runExternalSchematicAsync(
-        require.resolve('../../collection.json'), 'ng-new',
-        {
-          name: 'migration-test',
-          version: '1.2.3',
-          directory: '.',
-        },
-        tree,
-      ).toPromise();
+      tree = await schematicRunner
+        .runExternalSchematicAsync(
+          require.resolve('../../collection.json'),
+          'ng-new',
+          {
+            name: 'migration-test',
+            version: '1.2.3',
+            directory: '.',
+          },
+          tree,
+        )
+        .toPromise();
       tree.overwrite(tsConfigPath, JSON.stringify(oldTsConfig, null, 2));
     });
 
@@ -81,24 +81,24 @@ describe('Migration to version 8', () => {
     });
 
     it(`should create 'downlevelIteration' property when doesn't exists`, () => {
-      const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
       const compilerOptions = {
         ...oldTsConfig.compilerOptions,
       };
 
       tree.overwrite(tsConfigPath, JSON.stringify({ compilerOptions }, null, 2));
+      const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
       const { downlevelIteration } = JSON.parse(tree2.readContent(tsConfigPath)).compilerOptions;
       expect(downlevelIteration).toBe(true);
     });
 
     it(`should update 'downlevelIteration' to true when it's false`, () => {
-      const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
       const compilerOptions = {
         ...oldTsConfig.compilerOptions,
         downlevelIteration: false,
       };
 
       tree.overwrite(tsConfigPath, JSON.stringify({ compilerOptions }, null, 2));
+      const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());
       const { downlevelIteration } = JSON.parse(tree2.readContent(tsConfigPath)).compilerOptions;
       expect(downlevelIteration).toBe(true);
     });
@@ -119,14 +119,18 @@ describe('Migration to version 8', () => {
     it(`should remove 'target' and 'module' from non workspace extended tsconfig.json`, () => {
       const appTsConfig = '/tsconfig.app.json';
       const specsTsConfig = '/tsconfig.spec.json';
-      const tsConfig = JSON.stringify({
-        extends: '../../tsconfig.json',
-        compilerOptions: {
-          moduleResolution: 'node',
-          target: 'es2015',
-          module: 'es2015',
+      const tsConfig = JSON.stringify(
+        {
+          extends: '../../tsconfig.json',
+          compilerOptions: {
+            moduleResolution: 'node',
+            target: 'es2015',
+            module: 'es2015',
+          },
         },
-      }, null, 2);
+        null,
+        2,
+      );
 
       tree.overwrite(appTsConfig, tsConfig);
       tree.overwrite(specsTsConfig, tsConfig);
@@ -136,21 +140,26 @@ describe('Migration to version 8', () => {
       expect(appCompilerOptions.target).toBeUndefined();
       expect(appCompilerOptions.module).toBeUndefined();
 
-      const { compilerOptions: specsCompilerOptions }
-        = JSON.parse(tree2.readContent(specsTsConfig));
+      const { compilerOptions: specsCompilerOptions } = JSON.parse(
+        tree2.readContent(specsTsConfig),
+      );
       expect(specsCompilerOptions.target).toBeUndefined();
       expect(specsCompilerOptions.module).toBeUndefined();
     });
 
     it(`should update 'target' and 'module' to non workspace non-extended tsconfig.json`, () => {
       const appTsConfig = '/tsconfig.app.json';
-      const tsConfig = JSON.stringify({
-        compilerOptions: {
-          moduleResolution: 'node',
-          target: 'es5',
-          module: 'es5',
+      const tsConfig = JSON.stringify(
+        {
+          compilerOptions: {
+            moduleResolution: 'node',
+            target: 'es5',
+            module: 'es5',
+          },
         },
-      }, null, 2);
+        null,
+        2,
+      );
 
       tree.overwrite(appTsConfig, tsConfig);
 
@@ -162,11 +171,15 @@ describe('Migration to version 8', () => {
 
     it(`should add 'target' and 'module' to non workspace non-extended tsconfig.json`, () => {
       const appTsConfig = '/tsconfig.app.json';
-      const tsConfig = JSON.stringify({
-        compilerOptions: {
-          moduleResolution: 'node',
+      const tsConfig = JSON.stringify(
+        {
+          compilerOptions: {
+            moduleResolution: 'node',
+          },
         },
-      }, null, 2);
+        null,
+        2,
+      );
 
       tree.overwrite(appTsConfig, tsConfig);
 
@@ -179,11 +192,7 @@ describe('Migration to version 8', () => {
     it(`should not update projects which browser builder is not 'build-angular:browser'`, () => {
       tree.delete('/browserslist');
       const config = JSON.parse(tree.readContent('angular.json'));
-      config
-        .projects['migration-test']
-        .architect
-        .build
-        .builder = '@dummy/builders:browser';
+      config.projects['migration-test'].architect.build.builder = '@dummy/builders:browser';
 
       tree.overwrite('angular.json', JSON.stringify(config));
       const tree2 = schematicRunner.runSchematic('migration-07', {}, tree.branch());

From 2c1b78f35d7820102ea097e6ecfbc041cae1ecf6 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Tue, 25 Jun 2019 09:32:28 +0200
Subject: [PATCH 1531/1703] style: remove redundant console.log

---
 .../angular/component/index_spec.ts           | 169 +++++++-----------
 1 file changed, 69 insertions(+), 100 deletions(-)

diff --git a/packages/schematics/angular/component/index_spec.ts b/packages/schematics/angular/component/index_spec.ts
index 7496c2d986c5..41830ef13bae 100644
--- a/packages/schematics/angular/component/index_spec.ts
+++ b/packages/schematics/angular/component/index_spec.ts
@@ -31,7 +31,6 @@ describe('Component Schematic', () => {
     project: 'bar',
   };
 
-
   const workspaceOptions: WorkspaceOptions = {
     name: 'workspace',
     newProjectRoot: 'projects',
@@ -50,21 +49,23 @@ describe('Component Schematic', () => {
   let appTree: UnitTestTree;
   beforeEach(async () => {
     appTree = schematicRunner.runSchematic('workspace', workspaceOptions);
-    appTree = await schematicRunner.runSchematicAsync('application', appOptions, appTree)
+    appTree = await schematicRunner
+      .runSchematicAsync('application', appOptions, appTree)
       .toPromise();
   });
 
   it('should create a component', async () => {
     const options = { ...defaultOptions };
-    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const files = tree.files;
-    expect(files).toEqual(jasmine.arrayContaining([
-      '/projects/bar/src/app/foo/foo.component.css',
-      '/projects/bar/src/app/foo/foo.component.html',
-      '/projects/bar/src/app/foo/foo.component.spec.ts',
-      '/projects/bar/src/app/foo/foo.component.ts',
-    ]));
+    expect(files).toEqual(
+      jasmine.arrayContaining([
+        '/projects/bar/src/app/foo/foo.component.css',
+        '/projects/bar/src/app/foo/foo.component.html',
+        '/projects/bar/src/app/foo/foo.component.spec.ts',
+        '/projects/bar/src/app/foo/foo.component.ts',
+      ]),
+    );
     const moduleContent = tree.readContent('/projects/bar/src/app/app.module.ts');
     expect(moduleContent).toMatch(/import.*Foo.*from '.\/foo\/foo.component'/);
     expect(moduleContent).toMatch(/declarations:\s*\[[^\]]+?,\r?\n\s+FooComponent\r?\n/m);
@@ -73,8 +74,7 @@ describe('Component Schematic', () => {
   it('should set change detection to OnPush', async () => {
     const options = { ...defaultOptions, changeDetection: 'OnPush' };
 
-    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const tsContent = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(tsContent).toMatch(/changeDetection: ChangeDetectionStrategy.OnPush/);
   });
@@ -82,8 +82,7 @@ describe('Component Schematic', () => {
   it('should not set view encapsulation', async () => {
     const options = { ...defaultOptions };
 
-    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const tsContent = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(tsContent).not.toMatch(/encapsulation: ViewEncapsulation/);
   });
@@ -91,8 +90,7 @@ describe('Component Schematic', () => {
   it('should set view encapsulation to Emulated', async () => {
     const options = { ...defaultOptions, viewEncapsulation: 'Emulated' };
 
-    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const tsContent = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(tsContent).toMatch(/encapsulation: ViewEncapsulation.Emulated/);
   });
@@ -100,8 +98,7 @@ describe('Component Schematic', () => {
   it('should set view encapsulation to None', async () => {
     const options = { ...defaultOptions, viewEncapsulation: 'None' };
 
-    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const tsContent = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(tsContent).toMatch(/encapsulation: ViewEncapsulation.None/);
   });
@@ -109,21 +106,24 @@ describe('Component Schematic', () => {
   it('should create a flat component', async () => {
     const options = { ...defaultOptions, flat: true };
 
-    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const files = tree.files;
-    expect(files).toEqual(jasmine.arrayContaining([
-      '/projects/bar/src/app/foo.component.css',
-      '/projects/bar/src/app/foo.component.html',
-      '/projects/bar/src/app/foo.component.spec.ts',
-      '/projects/bar/src/app/foo.component.ts',
-    ]));
+    expect(files).toEqual(
+      jasmine.arrayContaining([
+        '/projects/bar/src/app/foo.component.css',
+        '/projects/bar/src/app/foo.component.html',
+        '/projects/bar/src/app/foo.component.spec.ts',
+        '/projects/bar/src/app/foo.component.ts',
+      ]),
+    );
   });
 
   it('should find the closest module', async () => {
     const options = { ...defaultOptions };
     const fooModule = '/projects/bar/src/app/foo/foo.module.ts';
-    appTree.create(fooModule, `
+    appTree.create(
+      fooModule,
+      `
       import { NgModule } from '@angular/core';
 
       @NgModule({
@@ -131,10 +131,10 @@ describe('Component Schematic', () => {
         declarations: []
       })
       export class FooModule { }
-    `);
+    `,
+    );
 
-    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const fooModuleContent = tree.readContent(fooModule);
     expect(fooModuleContent).toMatch(/import { FooComponent } from '.\/foo.component'/);
   });
@@ -142,8 +142,7 @@ describe('Component Schematic', () => {
   it('should export the component', async () => {
     const options = { ...defaultOptions, export: true };
 
-    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const appModuleContent = tree.readContent('/projects/bar/src/app/app.module.ts');
     expect(appModuleContent).toMatch(/exports: \[FooComponent\]/);
   });
@@ -151,8 +150,7 @@ describe('Component Schematic', () => {
   it('should set the entry component', async () => {
     const options = { ...defaultOptions, entryComponent: true };
 
-    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const appModuleContent = tree.readContent('/projects/bar/src/app/app.module.ts');
     expect(appModuleContent).toMatch(/entryComponents: \[FooComponent\]/);
   });
@@ -160,8 +158,7 @@ describe('Component Schematic', () => {
   it('should import into a specified module', async () => {
     const options = { ...defaultOptions, module: 'app.module.ts' };
 
-    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const appModule = tree.readContent('/projects/bar/src/app/app.module.ts');
 
     expect(appModule).toMatch(/import { FooComponent } from '.\/foo\/foo.component'/);
@@ -182,50 +179,37 @@ describe('Component Schematic', () => {
     const pathOption = 'projects/bar/src/app/SOME/UPPER/DIR';
     const options = { ...defaultOptions, path: pathOption };
 
-    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     let files = tree.files;
     let root = `/${pathOption}/foo/foo.component`;
-    expect(files).toEqual(jasmine.arrayContaining([
-      `${root}.css`,
-      `${root}.html`,
-      `${root}.spec.ts`,
-      `${root}.ts`,
-    ]));
+    expect(files).toEqual(
+      jasmine.arrayContaining([`${root}.css`, `${root}.html`, `${root}.spec.ts`, `${root}.ts`]),
+    );
 
     const options2 = { ...options, name: 'BAR' };
-    const tree2 = await schematicRunner.runSchematicAsync('component', options2, tree)
-      .toPromise();
+    const tree2 = await schematicRunner.runSchematicAsync('component', options2, tree).toPromise();
     files = tree2.files;
     root = `/${pathOption}/bar/bar.component`;
-    expect(files).toEqual(jasmine.arrayContaining([
-      `${root}.css`,
-      `${root}.html`,
-      `${root}.spec.ts`,
-      `${root}.ts`,
-    ]));
+    expect(files).toEqual(
+      jasmine.arrayContaining([`${root}.css`, `${root}.html`, `${root}.spec.ts`, `${root}.ts`]),
+    );
   });
 
   it('should create a component in a sub-directory', async () => {
     const options = { ...defaultOptions, path: 'projects/bar/src/app/a/b/c' };
 
-    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const files = tree.files;
     const root = `/${options.path}/foo/foo.component`;
-    expect(files).toEqual(jasmine.arrayContaining([
-      `${root}.css`,
-      `${root}.html`,
-      `${root}.spec.ts`,
-      `${root}.ts`,
-    ]));
+    expect(files).toEqual(
+      jasmine.arrayContaining([`${root}.css`, `${root}.html`, `${root}.spec.ts`, `${root}.ts`]),
+    );
   });
 
   it('should use the prefix', async () => {
     const options = { ...defaultOptions, prefix: 'pre' };
 
-    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(content).toMatch(/selector: 'pre-foo'/);
   });
@@ -233,8 +217,7 @@ describe('Component Schematic', () => {
   it('should use the default project prefix if none is passed', async () => {
     const options = { ...defaultOptions, prefix: undefined };
 
-    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(content).toMatch(/selector: 'app-foo'/);
   });
@@ -242,16 +225,14 @@ describe('Component Schematic', () => {
   it('should use the supplied prefix if it is ""', async () => {
     const options = { ...defaultOptions, prefix: '' };
 
-    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(content).toMatch(/selector: 'foo'/);
   });
 
   it('should respect the inlineTemplate option', async () => {
     const options = { ...defaultOptions, inlineTemplate: true };
-    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(content).toMatch(/template: /);
     expect(content).not.toMatch(/templateUrl: /);
@@ -260,8 +241,7 @@ describe('Component Schematic', () => {
 
   it('should respect the inlineStyle option', async () => {
     const options = { ...defaultOptions, inlineStyle: true };
-    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(content).toMatch(/styles: \[/);
     expect(content).not.toMatch(/styleUrls: /);
@@ -270,8 +250,7 @@ describe('Component Schematic', () => {
 
   it('should respect the style option', async () => {
     const options = { ...defaultOptions, style: Style.Sass };
-    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
     expect(content).toMatch(/styleUrls: \['.\/foo.component.sass/);
     expect(tree.files).toContain('/projects/bar/src/app/foo/foo.component.sass');
@@ -283,8 +262,7 @@ describe('Component Schematic', () => {
     const routingModulePath = `/projects/bar/src/app/${routingFileName}`;
     const newTree = createAppModule(appTree, routingModulePath);
     const options = { ...defaultOptions, module: routingFileName };
-    const tree = await schematicRunner.runSchematicAsync('component', options, newTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('component', options, newTree).toPromise();
     const content = tree.readContent(routingModulePath);
     expect(content).toMatch(/import { FooComponent } from '.\/foo\/foo.component/);
   });
@@ -292,46 +270,41 @@ describe('Component Schematic', () => {
   it('should handle a path in the name option', async () => {
     const options = { ...defaultOptions, name: 'dir/test-component' };
 
-    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const content = tree.readContent('/projects/bar/src/app/app.module.ts');
     expect(content).toMatch(
       // tslint:disable-next-line:max-line-length
-      /import { TestComponentComponent } from '\.\/dir\/test-component\/test-component.component'/);
+      /import { TestComponentComponent } from '\.\/dir\/test-component\/test-component.component'/,
+    );
   });
 
   it('should handle a path in the name and module options', async () => {
-    appTree = await schematicRunner.runSchematicAsync(
-      'module',
-      { name: 'admin/module', project: 'bar' },
-      appTree,
-    ).toPromise();
+    appTree = await schematicRunner
+      .runSchematicAsync('module', { name: 'admin/module', project: 'bar' }, appTree)
+      .toPromise();
 
     const options = { ...defaultOptions, name: 'other/test-component', module: 'admin/module' };
-    appTree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    appTree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
 
     const content = appTree.readContent('/projects/bar/src/app/admin/module/module.module.ts');
     expect(content).toMatch(
       // tslint:disable-next-line:max-line-length
-      /import { TestComponentComponent } from '..\/..\/other\/test-component\/test-component.component'/);
+      /import { TestComponentComponent } from '..\/..\/other\/test-component\/test-component.component'/,
+    );
   });
 
   it('should create the right selector with a path in the name', async () => {
     const options = { ...defaultOptions, name: 'sub/test' };
-    appTree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    appTree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const content = appTree.readContent('/projects/bar/src/app/sub/test/test.component.ts');
     expect(content).toMatch(/selector: 'app-test'/);
   });
 
   it('should respect the skipSelector option', async () => {
     const options = { ...defaultOptions, name: 'sub/test', skipSelector: true };
-    appTree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    appTree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const content = appTree.readContent('/projects/bar/src/app/sub/test/test.component.ts');
     expect(content).not.toMatch(/selector: 'app-test'/);
-    console.log(content);
   });
 
   it('should respect the sourceRoot value', async () => {
@@ -346,7 +319,8 @@ describe('Component Schematic', () => {
 
     // move the module
     appTree.rename('/projects/bar/src/app/app.module.ts', '/projects/bar/custom/app/app.module.ts');
-    appTree = await schematicRunner.runSchematicAsync('component', defaultOptions, appTree)
+    appTree = await schematicRunner
+      .runSchematicAsync('component', defaultOptions, appTree)
       .toPromise();
     expect(appTree.files).toContain('/projects/bar/custom/app/foo/foo.component.ts');
   });
@@ -354,34 +328,29 @@ describe('Component Schematic', () => {
   // testing deprecating options don't cause conflicts
   it('should respect the deprecated styleext (scss) option', async () => {
     const options = { ...defaultOptions, style: undefined, styleext: 'scss' };
-    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo/foo.component.scss');
   });
 
   it('should respect the deprecated styleext (css) option', async () => {
     const options = { ...defaultOptions, style: undefined, styleext: 'css' };
-    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo/foo.component.css');
   });
 
   it('should respect the deprecated spec option when false', async () => {
     const options = { ...defaultOptions, skipTests: undefined, spec: false };
-    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const files = tree.files;
     expect(files).not.toContain('/projects/bar/src/app/foo/foo.component.spec.ts');
   });
 
   it('should respect the deprecated spec option when true', async () => {
     const options = { ...defaultOptions, skipTests: false, spec: true };
-    const tree = await schematicRunner.runSchematicAsync('component', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo/foo.component.spec.ts');
   });
-
 });

From aed4228d6ff9d5eb04c7c6261153bbb3d67bbe89 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Tue, 25 Jun 2019 10:17:09 +0200
Subject: [PATCH 1532/1703] style: disable tslint rule no-big-function

---
 .../angular/migrations/update-8/differential-loading_spec.ts     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
index 418367846f78..184098db340a 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading_spec.ts
@@ -9,6 +9,7 @@
 import { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 
+// tslint:disable:no-big-function
 describe('Migration to version 8', () => {
   describe('Migrate ES5 projects to enable differential loading', () => {
     const tsConfigPath = '/tsconfig.json';

From 6416629a42a473d719d4de455141f3a76f01ca43 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Tue, 25 Jun 2019 10:45:59 +0200
Subject: [PATCH 1533/1703] fix(@schematics/angular): replace forked
 `web-animations-js` with latest version

Closes #14518
---
 .../update-8/update-dependencies.ts           | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-8/update-dependencies.ts b/packages/schematics/angular/migrations/update-8/update-dependencies.ts
index 341262f9c5af..b39bc04c5995 100644
--- a/packages/schematics/angular/migrations/update-8/update-dependencies.ts
+++ b/packages/schematics/angular/migrations/update-8/update-dependencies.ts
@@ -11,16 +11,14 @@ import { latestVersions } from '../../utility/latest-versions';
 
 export function updateDependencies() {
   return (host: Tree) => {
-
     const dependenciesToUpdate: Record<string, string> = {
       '@angular-devkit/build-angular': latestVersions.DevkitBuildAngular,
       '@angular-devkit/build-ng-packagr': latestVersions.DevkitBuildNgPackagr,
       '@angular-devkit/build-webpack': latestVersions.DevkitBuildWebpack,
       'zone.js': latestVersions.ZoneJs,
-      'tsickle': latestVersions.tsickle,
+      tsickle: latestVersions.tsickle,
       'ng-packagr': latestVersions.ngPackagr,
-      // FIXME: change to ^2.3.2 as soon as it's released with the pr208 fix
-      'web-animations-js': 'github:angular/web-animations-js#release_pr208',
+      'web-animations-js': '^2.3.2',
     };
 
     for (const [name, version] of Object.entries(dependenciesToUpdate)) {
@@ -29,15 +27,12 @@ export function updateDependencies() {
         continue;
       }
 
-      addPackageJsonDependency(
-        host,
-        {
-          type: current.type,
-          name,
-          version,
-          overwrite: true,
-        },
-      );
+      addPackageJsonDependency(host, {
+        type: current.type,
+        name,
+        version,
+        overwrite: true,
+      });
     }
   };
 }

From 10c4144e3bdc2b4b4e4450f220979655e9356e67 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 25 Jun 2019 10:22:39 -0400
Subject: [PATCH 1534/1703] fix(@ngtools/webpack): skip non-runtime types when
 transforming constructors

Fixes #14876
---
 .../src/transformers/ctor-parameters.ts       |  18 +-
 .../src/transformers/ctor-parameters_spec.ts  | 174 ++++++++++++++++++
 2 files changed, 191 insertions(+), 1 deletion(-)
 create mode 100644 packages/ngtools/webpack/src/transformers/ctor-parameters_spec.ts

diff --git a/packages/ngtools/webpack/src/transformers/ctor-parameters.ts b/packages/ngtools/webpack/src/transformers/ctor-parameters.ts
index 6adc5d88bedd..c839c89dc2f0 100644
--- a/packages/ngtools/webpack/src/transformers/ctor-parameters.ts
+++ b/packages/ngtools/webpack/src/transformers/ctor-parameters.ts
@@ -89,6 +89,7 @@ function createCtorParametersClassProperty(
   diagnostics: ts.Diagnostic[],
   entityNameToExpression: (n: ts.EntityName) => ts.Expression | undefined,
   ctorParameters: ParameterDecorationInfo[],
+  typeChecker: ts.TypeChecker,
 ): ts.PropertyDeclaration {
   const params: ts.Expression[] = [];
 
@@ -99,7 +100,7 @@ function createCtorParametersClassProperty(
     }
 
     const paramType = ctorParam.type
-      ? typeReferenceToExpression(entityNameToExpression, ctorParam.type)
+      ? typeReferenceToExpression(entityNameToExpression, ctorParam.type, typeChecker)
       : undefined;
     const members = [
       ts.createPropertyAssignment('type', paramType || ts.createIdentifier('undefined')),
@@ -147,6 +148,7 @@ function createCtorParametersClassProperty(
 function typeReferenceToExpression(
   entityNameToExpression: (n: ts.EntityName) => ts.Expression | undefined,
   node: ts.TypeNode,
+  typeChecker: ts.TypeChecker,
 ): ts.Expression | undefined {
   let kind = node.kind;
   if (ts.isLiteralTypeNode(node)) {
@@ -175,6 +177,19 @@ function typeReferenceToExpression(
       return ts.createIdentifier('Number');
     case ts.SyntaxKind.TypeReference:
       const typeRef = node as ts.TypeReferenceNode;
+      let typeSymbol = typeChecker.getSymbolAtLocation(typeRef.typeName);
+      if (typeSymbol && typeSymbol.flags & ts.SymbolFlags.Alias) {
+        typeSymbol = typeChecker.getAliasedSymbol(typeSymbol);
+      }
+
+      if (!typeSymbol || !(typeSymbol.flags & ts.SymbolFlags.Value)) {
+        return undefined;
+      }
+
+      const type = typeChecker.getTypeOfSymbolAtLocation(typeSymbol, typeRef);
+      if (!type || typeChecker.getSignaturesOfType(type, ts.SignatureKind.Construct).length === 0) {
+        return undefined;
+      }
 
       // Ignore any generic types, just return the base type.
       return entityNameToExpression(typeRef.typeName);
@@ -263,6 +278,7 @@ export function decoratorDownlevelTransformer(
           diagnostics,
           entityNameToExpression,
           parametersInfo,
+          typeChecker,
         );
 
         return [node, ctorProperty];
diff --git a/packages/ngtools/webpack/src/transformers/ctor-parameters_spec.ts b/packages/ngtools/webpack/src/transformers/ctor-parameters_spec.ts
new file mode 100644
index 000000000000..c9425666da10
--- /dev/null
+++ b/packages/ngtools/webpack/src/transformers/ctor-parameters_spec.ts
@@ -0,0 +1,174 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { tags } from '@angular-devkit/core'; // tslint:disable-line:no-implicit-dependencies
+import { createTypescriptContext, transformTypescript } from './ast_helpers';
+import { downlevelConstructorParameters } from './ctor-parameters';
+
+function transform(input: string, additionalFiles?: Record<string, string>) {
+  const { program, compilerHost } = createTypescriptContext(input, additionalFiles);
+  const transformer = downlevelConstructorParameters(() => program.getTypeChecker());
+  const result = transformTypescript(undefined, [transformer], program, compilerHost);
+
+  return result;
+}
+
+describe('Constructor Parameter Transformer', () => {
+  it('records class name in same module', () => {
+    const input = `
+      export class ClassInject {};
+
+      export class MyService {
+        constructor(v: ClassInject) {}
+      }
+    `;
+
+    const output = `
+      export class ClassInject { } ;
+      export class MyService { constructor(v) { } } MyService.ctorParameters = () => [ { type: ClassInject } ];
+    `;
+
+    const result = transform(input);
+
+    expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+  });
+
+  it('records class name of root-provided injectable in same module', () => {
+    const input = `
+      @Injectable({
+        providedIn: 'root'
+      })
+      export class RootProvidedService {
+
+        constructor() { }
+      }
+
+      export class MyService {
+        constructor(v: RootProvidedService) {}
+      }
+    `;
+
+    const output = `
+      import * as tslib_1 from "tslib";
+      let RootProvidedService = class RootProvidedService { constructor() { } };
+      RootProvidedService = tslib_1.__decorate([ Injectable({ providedIn: 'root' }) ], RootProvidedService);
+      export { RootProvidedService }; export class MyService { constructor(v) { } } MyService.ctorParameters = () => [ { type: RootProvidedService } ];
+    `;
+
+    const result = transform(input);
+
+    expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+  });
+
+  // The current testing infrastructure does not support this test
+  // Aliased TS symbols are resolved to 'unknown'
+  xit('records class name of root-provided injectable in imported module', () => {
+    const rootProvided = {
+      'root-provided-service': `
+        @Injectable({
+          providedIn: 'root'
+        })
+        export class RootProvidedService {
+
+          constructor() { }
+        }
+      `,
+    };
+
+    const input = `
+      import { RootProvidedService } from './root-provided-service';
+
+      export class MyService {
+        constructor(v: RootProvidedService) {}
+      }
+    `;
+
+    const output = `export class MyService { constructor(v) { } } MyService.ctorParameters = () => [ { type: RootProvidedService } ];`;
+
+    const result = transform(input, rootProvided);
+
+    expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+  });
+
+  it('does not record exported interface name in same module with Inject decorators', () => {
+    const input = `
+      export interface InterInject {}
+      export const INTERFACE_INJECT = new InjectionToken<InterInject>('interface-inject');
+
+      export class MyService {
+        constructor(@Inject(INTERFACE_INJECT) v: InterInject) {}
+      }
+    `;
+
+    const output = `
+      import * as tslib_1 from "tslib";
+      export const INTERFACE_INJECT = new InjectionToken('interface-inject');
+      let MyService = class MyService { constructor(v) { } };
+      MyService.ctorParameters = () => [ { type: undefined, decorators: [{ type: Inject, args: [INTERFACE_INJECT,] }] } ];
+      MyService = tslib_1.__decorate([ tslib_1.__param(0, Inject(INTERFACE_INJECT)) ], MyService);
+      export { MyService };
+    `;
+
+    const result = transform(input);
+
+    expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+  });
+
+  it('does not record interface name in same module with Inject decorators', () => {
+    const input = `
+      interface InterInject {}
+      export const INTERFACE_INJECT = new InjectionToken<InterInject>('interface-inject');
+
+      export class MyService {
+        constructor(@Inject(INTERFACE_INJECT) v: InterInject) {}
+      }
+    `;
+
+    const output = `
+      import * as tslib_1 from "tslib";
+      export const INTERFACE_INJECT = new InjectionToken('interface-inject');
+      let MyService = class MyService { constructor(v) { } };
+      MyService.ctorParameters = () => [ { type: undefined, decorators: [{ type: Inject, args: [INTERFACE_INJECT,] }] } ];
+      MyService = tslib_1.__decorate([ tslib_1.__param(0, Inject(INTERFACE_INJECT)) ], MyService);
+      export { MyService };
+    `;
+
+    const result = transform(input);
+
+    expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+  });
+
+  it('does not record interface name in imported module with Inject decorators', () => {
+    const injectedModule = {
+      'module-inject': `
+        export interface InterInject {};
+        export const INTERFACE_INJECT = new InjectionToken<InterInject>('interface-inject');
+      `,
+    };
+
+    const input = `
+      import { INTERFACE_INJECT, InterInject } from './module-inject';
+
+      export class MyService {
+        constructor(@Inject(INTERFACE_INJECT) v: InterInject) {}
+      }
+    `;
+
+    const output = `
+      import * as tslib_1 from "tslib";
+      import { INTERFACE_INJECT } from './module-inject';
+      let MyService = class MyService { constructor(v) { } };
+      MyService.ctorParameters = () => [ { type: undefined, decorators: [{ type: Inject, args: [INTERFACE_INJECT,] }] } ];
+      MyService = tslib_1.__decorate([ tslib_1.__param(0, Inject(INTERFACE_INJECT)) ], MyService);
+      export { MyService };
+    `;
+
+    const result = transform(input, injectedModule);
+
+    expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+  });
+});

From 277d4abd4b3172abbcd7b7c3bbe83d894887f9f7 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 25 Jun 2019 22:32:37 +0000
Subject: [PATCH 1535/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index b72189b98ba4..9497e1148bcf 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#09fd01d9f398e4a2d826b942d7b435e2d1878f00",
-    "@angular/common": "github:angular/common-builds#33a3734803a93036938742fb99f118687e6442e1",
-    "@angular/compiler": "github:angular/compiler-builds#2cf9d9dcf381f50493d312dca4263a149413c368",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#824d6f6673fdae374c85b096801aca497e0b03bd",
-    "@angular/core": "github:angular/core-builds#dd0b0634c792646444f4a2e70895bef5637e49cb",
-    "@angular/forms": "github:angular/forms-builds#0ab8c0a2d62a4c3cbb7c25b3fcc5c2bca2797741",
-    "@angular/language-service": "github:angular/language-service-builds#c63b5e2fb64ac63924bc5da75d358bf9d4a66e5e",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#66b65b144219e610478415ff7e3d27ec70597116",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#b1eabe4001426347842d09b5c9df8432b802c843",
-    "@angular/router": "github:angular/router-builds#25a02f28e2c7cad90801fd653f72c302658b2779"
+    "@angular/animations": "github:angular/animations-builds#3869273bb4e82fbac766d38350b3c9d31b2d0b0c",
+    "@angular/common": "github:angular/common-builds#875fa651cf9d7f7ce609cff6f6ac10bf4543db17",
+    "@angular/compiler": "github:angular/compiler-builds#f995b1f58d05a0dfda93bfb430f52fa0b8c692f2",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#ab5d02541a65947818fa819b3cd34e88c9d8226c",
+    "@angular/core": "github:angular/core-builds#2aea9245788dee2258fc4f9595411fb38a41ce24",
+    "@angular/forms": "github:angular/forms-builds#0cd029a2fdc8a32c00c749fca39ed1a85c7a3b66",
+    "@angular/language-service": "github:angular/language-service-builds#c6ce83a54eff35e2cc2b0b0e379d772994e702d1",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#fd9dcb22f5d76df96d87dcea34090b7168210741",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#9e7f5d17f7cc4ca99d24db75e56f7188b80d3071",
+    "@angular/router": "github:angular/router-builds#fee844f75d67c069fbfbbc31c15aa4596dd6868d"
   }
 }
\ No newline at end of file

From fdcd1f75460d6d4a4f0fdfe52a9b925ed4b35dc9 Mon Sep 17 00:00:00 2001
From: hawkgs <hawk.dvp@gmail.com>
Date: Sat, 16 Mar 2019 17:25:38 +0200
Subject: [PATCH 1536/1703] feat(@schematics/angular): lazy routing module
 generator

Introduces the lazy routing module generator as part of the existing
module generator.

Feature document:
https://docs.google.com/document/d/1NAJEWTG54cu4kW7XBp0gVadmz-gqJouW2XDs4c9PPJM/edit#heading=h.xgjl2srtytjt
---
 packages/schematics/angular/library/index.ts  |   6 +-
 ...ame@dasherize__-routing.module.ts.template |   4 +-
 .../__name@dasherize__.module.ts.template     |  14 +-
 packages/schematics/angular/module/index.ts   | 113 ++++++++-
 .../schematics/angular/module/index_spec.ts   |  93 ++++++-
 .../schematics/angular/module/schema.json     |   4 +
 .../schematics/angular/utility/ast-utils.ts   | 127 ++++++++--
 .../angular/utility/ast-utils_spec.ts         | 237 ++++++++++++++++++
 8 files changed, 560 insertions(+), 38 deletions(-)

diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index 354f23b6bdf9..8ae1642f2db4 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.ts
@@ -227,7 +227,7 @@ export default function (options: LibraryOptions): Rule {
         commonModule: false,
         flat: true,
         path: sourceDir,
-        project: projectName,
+        project: options.name,
       }),
       schematic('component', {
         name: options.name,
@@ -237,13 +237,13 @@ export default function (options: LibraryOptions): Rule {
         flat: true,
         path: sourceDir,
         export: true,
-        project: projectName,
+        project: options.name,
       }),
       schematic('service', {
         name: options.name,
         flat: true,
         path: sourceDir,
-        project: projectName,
+        project: options.name,
       }),
       options.lintFix ? applyLintFix(sourceDir) : noop(),
       (_tree: Tree, context: SchematicContext) => {
diff --git a/packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__-routing.module.ts.template b/packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__-routing.module.ts.template
index 217c659c2250..fe292137bb21 100644
--- a/packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__-routing.module.ts.template
+++ b/packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__-routing.module.ts.template
@@ -1,7 +1,9 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
+<% if (lazyRoute) { %>
+import { <%= classify(name) %>Component } from './<%= dasherize(name) %>.component';<% } %>
 
-const routes: Routes = [];
+const routes: Routes = [<% if (lazyRoute) { %>{ path: '', component: <%= classify(name) %>Component }<% } %>];
 
 @NgModule({
   imports: [RouterModule.for<%= routingScope %>(routes)],
diff --git a/packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__.module.ts.template b/packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__.module.ts.template
index 3ba2010a36e9..c7eea239b596 100644
--- a/packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__.module.ts.template
+++ b/packages/schematics/angular/module/files/__name@dasherize@if-flat__/__name@dasherize__.module.ts.template
@@ -1,13 +1,19 @@
 import { NgModule } from '@angular/core';<% if (commonModule) { %>
-import { CommonModule } from '@angular/common';<% } %><% if (routing) { %>
-
+import { CommonModule } from '@angular/common';<% } %><% if (lazyRouteWithoutRouteModule) { %>
+import { Routes, RouterModule } from '@angular/router';<% } %>
+<% if (routing || lazyRouteWithRouteModule) { %>
 import { <%= classify(name) %>RoutingModule } from './<%= dasherize(name) %>-routing.module';<% } %>
+<% if (lazyRouteWithoutRouteModule) { %>
+const routes: Routes = [
+  { path: '', component: <%= classify(name) %>Component }
+];<% } %>
 
 @NgModule({
   declarations: [],
   imports: [<% if (commonModule) { %>
-    CommonModule<%= routing ? ',' : '' %><% } %><% if (routing) { %>
-    <%= classify(name) %>RoutingModule<% } %>
+    CommonModule<%= routing || lazyRouteWithRouteModule ? ',' : '' %><% } %><% if (routing || lazyRouteWithRouteModule) { %>
+    <%= classify(name) %>RoutingModule<% } %><%= lazyRouteWithoutRouteModule ? ',' : '' %><% if (lazyRouteWithoutRouteModule) { %>
+    RouterModule.forChild(routes)<% } %>
   ]
 })
 export class <%= classify(name) %>Module { }
diff --git a/packages/schematics/angular/module/index.ts b/packages/schematics/angular/module/index.ts
index e13c9b4a5cb5..83f5c5f67156 100644
--- a/packages/schematics/angular/module/index.ts
+++ b/packages/schematics/angular/module/index.ts
@@ -5,7 +5,7 @@
 * Use of this source code is governed by an MIT-style license that can be
 * found in the LICENSE file at https://angular.io/license
 */
-import { normalize, strings } from '@angular-devkit/core';
+import { Path, normalize, strings } from '@angular-devkit/core';
 import {
   Rule,
   SchematicsException,
@@ -17,17 +17,28 @@ import {
   mergeWith,
   move,
   noop,
+  schematic,
   url,
 } from '@angular-devkit/schematics';
 import * as ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
-import { addImportToModule } from '../utility/ast-utils';
+import { addImportToModule, addRouteDeclarationToModule } from '../utility/ast-utils';
 import { InsertChange } from '../utility/change';
 import { buildRelativePath, findModuleFromOptions } from '../utility/find-module';
 import { applyLintFix } from '../utility/lint-fix';
 import { parseName } from '../utility/parse-name';
 import { createDefaultPath } from '../utility/workspace';
-import { Schema as ModuleOptions } from './schema';
+import { RoutingScope, Schema as ModuleOptions } from './schema';
 
+function buildRelativeModulePath(options: ModuleOptions, modulePath: string): string {
+  const importModulePath = normalize(
+    `/${options.path}/`
+    + (options.flat ? '' : strings.dasherize(options.name) + '/')
+    + strings.dasherize(options.name)
+    + '.module',
+  );
+
+  return buildRelativePath(modulePath, importModulePath);
+}
 
 function addDeclarationToNgModule(options: ModuleOptions): Rule {
   return (host: Tree) => {
@@ -41,16 +52,10 @@ function addDeclarationToNgModule(options: ModuleOptions): Rule {
     if (text === null) {
       throw new SchematicsException(`File ${modulePath} does not exist.`);
     }
-    const sourceText = text.toString('utf-8');
+    const sourceText = text.toString();
     const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
 
-    const importModulePath = normalize(
-      `/${options.path}/`
-      + (options.flat ? '' : strings.dasherize(options.name) + '/')
-      + strings.dasherize(options.name)
-      + '.module',
-    );
-    const relativePath = buildRelativePath(modulePath, importModulePath);
+    const relativePath = buildRelativeModulePath(options, modulePath);
     const changes = addImportToModule(source,
                                       modulePath,
                                       strings.classify(`${options.name}Module`),
@@ -68,6 +73,66 @@ function addDeclarationToNgModule(options: ModuleOptions): Rule {
   };
 }
 
+function addRouteDeclarationToNgModule(
+  options: ModuleOptions,
+  routingModulePath: Path | undefined,
+): Rule {
+  return (host: Tree) => {
+    if (!options.route) {
+      return host;
+    }
+    if (!options.module) {
+      throw new Error('Module option required when creating a lazy loaded routing module.');
+    }
+
+    let path: string;
+    if (routingModulePath) {
+      path = routingModulePath;
+    } else {
+      path = options.module;
+    }
+
+    const text = host.read(path);
+    if (!text) {
+      throw new Error(`Couldn't find the module nor its routing module.`);
+    }
+
+    const sourceText = text.toString();
+    const addDeclaration = addRouteDeclarationToModule(
+      ts.createSourceFile(path, sourceText, ts.ScriptTarget.Latest, true),
+      path,
+      buildRoute(options, options.module),
+    ) as InsertChange;
+
+    const recorder = host.beginUpdate(path);
+    recorder.insertLeft(addDeclaration.pos, addDeclaration.toAdd);
+    host.commitUpdate(recorder);
+
+    return host;
+  };
+}
+
+function getRoutingModulePath(host: Tree, options: ModuleOptions): Path | undefined {
+  let path: Path | undefined;
+  const modulePath = options.module as string;
+  const routingModuleName = modulePath.split('.')[0] + '-routing';
+  const { module, ...rest } = options;
+
+  try {
+    path = findModuleFromOptions(host, { module: routingModuleName, ...rest });
+  } catch {}
+
+  return path;
+}
+
+function buildRoute(options: ModuleOptions, modulePath: string) {
+  const relativeModulePath = buildRelativeModulePath(options, modulePath);
+  const moduleName = `${strings.classify(options.name)}Module`;
+  const loadChildren = `() => import('${relativeModulePath}').then(m => m.${moduleName})`;
+
+  return `{ path: '${options.route}', loadChildren: ${loadChildren} }`;
+}
+
 export default function (options: ModuleOptions): Rule {
   return async (host: Tree) => {
     if (options.path === undefined) {
@@ -82,19 +147,41 @@ export default function (options: ModuleOptions): Rule {
     options.name = parsedPath.name;
     options.path = parsedPath.path;
 
+    let routingModulePath: Path | undefined;
+    const isLazyLoadedModuleGen = options.route && options.module;
+    if (isLazyLoadedModuleGen) {
+      options.routingScope = RoutingScope.Child;
+      routingModulePath = getRoutingModulePath(host, options);
+    }
+
     const templateSource = apply(url('./files'), [
-      options.routing ? noop() : filter(path => !path.endsWith('-routing.module.ts.template')),
+      options.routing || isLazyLoadedModuleGen && !!routingModulePath
+        ? noop()
+        : filter(path => !path.endsWith('-routing.module.ts.template')),
       applyTemplates({
         ...strings,
         'if-flat': (s: string) => options.flat ? '' : s,
+        lazyRoute: isLazyLoadedModuleGen,
+        lazyRouteWithoutRouteModule: isLazyLoadedModuleGen && !routingModulePath,
+        lazyRouteWithRouteModule: isLazyLoadedModuleGen && routingModulePath,
         ...options,
       }),
       move(parsedPath.path),
     ]);
+    const moduleDasherized = strings.dasherize(options.name);
+    const modulePath =
+      `${!options.flat ? moduleDasherized + '/' : ''}${moduleDasherized}.module.ts`;
 
     return chain([
-      addDeclarationToNgModule(options),
+      !isLazyLoadedModuleGen ? addDeclarationToNgModule(options) : noop(),
+      addRouteDeclarationToNgModule(options, routingModulePath),
       mergeWith(templateSource),
+      isLazyLoadedModuleGen
+        ? schematic('component', {
+            ...options,
+            module: modulePath,
+          })
+        : noop(),
       options.lintFix ? applyLintFix(options.path) : noop(),
     ]);
   };
diff --git a/packages/schematics/angular/module/index_spec.ts b/packages/schematics/angular/module/index_spec.ts
index 3e5a807eb411..ae476a98dcf9 100644
--- a/packages/schematics/angular/module/index_spec.ts
+++ b/packages/schematics/angular/module/index_spec.ts
@@ -33,7 +33,7 @@ describe('Module Schematic', () => {
     name: 'bar',
     inlineStyle: false,
     inlineTemplate: false,
-    routing: false,
+    routing: true,
     skipTests: false,
     skipPackageJson: false,
   };
@@ -118,4 +118,95 @@ describe('Module Schematic', () => {
       .toPromise();
     expect(appTree.files).toContain('/projects/bar/custom/app/foo/foo.module.ts');
   });
+
+  describe('lazy route generator', () => {
+    const options = {
+      ...defaultOptions,
+      route: '/new-route',
+      module: 'app',
+    };
+
+    it('should generate a lazy loaded module with a routing module', async () => {
+      const tree = await schematicRunner.runSchematicAsync('module', options, appTree).toPromise();
+      const files = tree.files;
+
+      expect(files).toContain('/projects/bar/src/app/foo/foo.module.ts');
+      expect(files).toContain('/projects/bar/src/app/foo/foo-routing.module.ts');
+      expect(files).toContain('/projects/bar/src/app/foo/foo.component.ts');
+      expect(files).toContain('/projects/bar/src/app/foo/foo.component.html');
+      expect(files).toContain('/projects/bar/src/app/foo/foo.component.css');
+
+      const appRoutingModuleContent = tree.readContent('/projects/bar/src/app/app-routing.module.ts');
+      expect(appRoutingModuleContent).toMatch(
+        /path: '\/new-route', loadChildren: \(\) => import\('.\/foo\/foo.module'\).then\(m => m.FooModule\)/,
+      );
+
+      const fooRoutingModuleContent = tree.readContent('/projects/bar/src/app/foo/foo-routing.module.ts');
+      expect(fooRoutingModuleContent).toMatch(/RouterModule.forChild\(routes\)/);
+      expect(fooRoutingModuleContent)
+        .toMatch(/const routes: Routes = \[\r?\n?\s*{ path: '', component: FooComponent }\r?\n?\s*\];/);
+    });
+
+    it('should generate a lazy loaded module with embedded route declarations', async () => {
+      appTree.overwrite('/projects/bar/src/app/app.module.ts',
+        `
+        import { NgModule } from '@angular/core';
+        import { AppComponent } from './app.component';
+
+        @NgModule({
+          declarations: [
+            AppComponent
+          ],
+          imports: [
+            BrowserModule,
+            RouterModule.forRoot([])
+          ],
+          providers: [],
+          bootstrap: [AppComponent]
+        })
+        export class AppModule { }
+        `,
+      );
+      appTree.delete('/projects/bar/src/app/app-routing.module.ts');
+
+      const tree = await schematicRunner.runSchematicAsync('module', options, appTree).toPromise();
+      const files = tree.files;
+
+      expect(files).toContain('/projects/bar/src/app/foo/foo.module.ts');
+      expect(files).not.toContain('/projects/bar/src/app/foo/foo-routing.module.ts');
+      expect(files).toContain('/projects/bar/src/app/foo/foo.component.ts');
+      expect(files).toContain('/projects/bar/src/app/foo/foo.component.html');
+      expect(files).toContain('/projects/bar/src/app/foo/foo.component.css');
+
+      const appModuleContent = tree.readContent('/projects/bar/src/app/app.module.ts');
+      expect(appModuleContent).toMatch(
+        /path: '\/new-route', loadChildren: \(\) => import\('.\/foo\/foo.module'\).then\(m => m.FooModule\)/,
+      );
+
+      const fooModuleContent = tree.readContent('/projects/bar/src/app/foo/foo.module.ts');
+      expect(fooModuleContent).toMatch(/RouterModule.forChild\(routes\)/);
+      expect(fooModuleContent)
+        .toMatch(/const routes: Routes = \[\r?\n?\s*{ path: '', component: FooComponent }\r?\n?\s*\];/);
+    });
+
+    it('should generate a lazy loaded module when "flat" flag is true', async () => {
+      const tree = await schematicRunner.runSchematicAsync(
+        'module',
+        { ...options, flat: true },
+        appTree,
+      ).toPromise();
+      const files = tree.files;
+
+      expect(files).toContain('/projects/bar/src/app/foo.module.ts');
+      expect(files).toContain('/projects/bar/src/app/foo-routing.module.ts');
+      expect(files).toContain('/projects/bar/src/app/foo.component.ts');
+      expect(files).toContain('/projects/bar/src/app/foo.component.html');
+      expect(files).toContain('/projects/bar/src/app/foo.component.css');
+
+      const appRoutingModuleContent = tree.readContent('/projects/bar/src/app/app-routing.module.ts');
+      expect(appRoutingModuleContent).toMatch(
+        /path: '\/new-route', loadChildren: \(\) => import\('.\/foo.module'\).then\(m => m.FooModule\)/,
+      );
+    });
+  });
 });
diff --git a/packages/schematics/angular/module/schema.json b/packages/schematics/angular/module/schema.json
index 1e046c3bcf88..2f509c5c57fe 100644
--- a/packages/schematics/angular/module/schema.json
+++ b/packages/schematics/angular/module/schema.json
@@ -39,6 +39,10 @@
       "description": "The scope for the new routing module.",
       "default": "Child"
     },
+    "route": {
+      "type": "string",
+      "description": "Creates lazy loaded routing module. Requires --module option."
+    },
     "flat": {
       "type": "boolean",
       "description": "When true, creates the new files at the top level of the current project root. ",
diff --git a/packages/schematics/angular/utility/ast-utils.ts b/packages/schematics/angular/utility/ast-utils.ts
index 461b34ba3b62..0f9a724153a7 100644
--- a/packages/schematics/angular/utility/ast-utils.ts
+++ b/packages/schematics/angular/utility/ast-utils.ts
@@ -344,6 +344,20 @@ export function getFirstNgModuleName(source: ts.SourceFile): string|undefined {
   return moduleClass.name.text;
 }
 
+export function getMetadataField(
+  node: ts.ObjectLiteralExpression,
+  metadataField: string,
+): ts.ObjectLiteralElement[] {
+  return node.properties
+    .filter(prop => ts.isPropertyAssignment(prop))
+    // Filter out every fields that's not "metadataField". Also handles string literals
+    // (but not expressions).
+    .filter(({ name }: ts.PropertyAssignment) => {
+      return (ts.isIdentifier(name) || ts.isStringLiteral(name))
+        && name.getText() === metadataField;
+    });
+}
+
 export function addSymbolToNgModuleMetadata(
   source: ts.SourceFile,
   ngModulePath: string,
@@ -360,22 +374,10 @@ export function addSymbolToNgModuleMetadata(
   }
 
   // Get all the children property assignment of object literals.
-  const matchingProperties: ts.ObjectLiteralElement[] =
-    (node as ts.ObjectLiteralExpression).properties
-    .filter(prop => prop.kind == ts.SyntaxKind.PropertyAssignment)
-    // Filter out every fields that's not "metadataField". Also handles string literals
-    // (but not expressions).
-    .filter((prop: ts.PropertyAssignment) => {
-      const name = prop.name;
-      switch (name.kind) {
-        case ts.SyntaxKind.Identifier:
-          return (name as ts.Identifier).getText(source) == metadataField;
-        case ts.SyntaxKind.StringLiteral:
-          return (name as ts.StringLiteral).text == metadataField;
-      }
-
-      return false;
-    });
+  const matchingProperties = getMetadataField(
+    node as ts.ObjectLiteralExpression,
+    metadataField,
+  );
 
   // Get the last node of the array literal.
   if (!matchingProperties) {
@@ -567,3 +569,96 @@ export function isImported(source: ts.SourceFile,
 
   return matchingNodes.length > 0;
 }
+
+/**
+ * Returns the RouterModule declaration from NgModule metadata, if any.
+ */
+export function getRouterModuleDeclaration(source: ts.SourceFile): ts.Expression | undefined {
+  const result = getDecoratorMetadata(source, 'NgModule', '@angular/core') as ts.Node[];
+  const node = result[0] as ts.ObjectLiteralExpression;
+  const matchingProperties = getMetadataField(node, 'imports');
+
+  if (!matchingProperties) {
+    return;
+  }
+
+  const assignment = matchingProperties[0] as ts.PropertyAssignment;
+
+  if (assignment.initializer.kind !== ts.SyntaxKind.ArrayLiteralExpression) {
+    return;
+  }
+
+  const arrLiteral = assignment.initializer as ts.ArrayLiteralExpression;
+
+  return arrLiteral.elements
+    .filter(el => el.kind === ts.SyntaxKind.CallExpression)
+    .find(el => (el as ts.Identifier).getText().startsWith('RouterModule'));
+}
+
+/**
+ * Adds a new route declaration to a router module (i.e. has a RouterModule declaration)
+ */
+export function addRouteDeclarationToModule(
+  source: ts.SourceFile,
+  fileToAdd: string,
+  routeLiteral: string,
+): Change {
+  const routerModuleExpr = getRouterModuleDeclaration(source);
+  if (!routerModuleExpr) {
+    throw new Error(`Couldn't find a route declaration in ${fileToAdd}.`);
+  }
+  const scopeConfigMethodArgs = (routerModuleExpr as ts.CallExpression).arguments;
+  if (!scopeConfigMethodArgs.length) {
+    const { line } = source.getLineAndCharacterOfPosition(routerModuleExpr.getStart());
+    throw new Error(
+      `The router module method doesn't have arguments ` +
+      `at line ${line} in ${fileToAdd}`,
+    );
+  }
+
+  let routesArr: ts.ArrayLiteralExpression | undefined;
+  const routesArg = scopeConfigMethodArgs[0];
+
+  // Check if the route declarations array is
+  // an inlined argument of RouterModule or a standalone variable
+  if (routesArg.kind === ts.SyntaxKind.ArrayLiteralExpression) {
+    routesArr = routesArg as ts.ArrayLiteralExpression;
+  } else {
+    const routesVarName = routesArg.getText();
+    let routesVar;
+    if (routesArg.kind === ts.SyntaxKind.Identifier) {
+      routesVar = source.statements
+        .filter((s: ts.Statement) => s.kind === ts.SyntaxKind.VariableStatement)
+        .find((v: ts.VariableStatement) => {
+          return v.declarationList.declarations[0].name.getText() === routesVarName;
+        }) as ts.VariableStatement | undefined;
+    }
+
+    if (!routesVar) {
+      const { line } = source.getLineAndCharacterOfPosition(routesArg.getStart());
+      throw new Error(
+        `No route declaration array was found that corresponds ` +
+        `to router module at line ${line} in ${fileToAdd}`,
+      );
+    }
+    const arrExpr = findNodes(routesVar, ts.SyntaxKind.ArrayLiteralExpression).pop();
+    routesArr = arrExpr as ts.ArrayLiteralExpression;
+  }
+
+  const occurencesCount = routesArr.elements.length;
+  const text = routesArr.getFullText(source);
+
+  let route: string = routeLiteral;
+  if (occurencesCount > 0) {
+    const identation = text.match(/\r?\n(\r?)\s*/) || [];
+    route = `,${identation[0] || ' '}${routeLiteral}`;
+  }
+
+  return insertAfterLastOccurrence(
+    routesArr.elements as unknown as ts.Node[],
+    route,
+    fileToAdd,
+    routesArr.elements.pos,
+    ts.SyntaxKind.ObjectLiteralExpression,
+  );
+}
diff --git a/packages/schematics/angular/utility/ast-utils_spec.ts b/packages/schematics/angular/utility/ast-utils_spec.ts
index 54049048a169..60a4958aa12f 100644
--- a/packages/schematics/angular/utility/ast-utils_spec.ts
+++ b/packages/schematics/angular/utility/ast-utils_spec.ts
@@ -15,6 +15,7 @@ import {
   addDeclarationToModule,
   addExportToModule,
   addProviderToModule,
+  addRouteDeclarationToModule,
   addSymbolToNgModuleMetadata,
   findNodes,
   insertAfterLastOccurrence,
@@ -271,4 +272,240 @@ describe('ast utils', () => {
       expect(output).toMatch(/const arr = \['bar'\];/);
     });
   });
+
+  // tslint:disable-next-line:no-big-function
+  describe('addRouteDeclarationToModule', () => {
+    it('should throw an error when there is no router module', () => {
+      const moduleContent = `
+        import { BrowserModule } from '@angular/platform-browser';
+        import { NgModule } from '@angular/core';
+        import { AppComponent } from './app.component';
+
+        @NgModule({
+          declarations: [
+            AppComponent
+          ],
+          imports: [BrowserModule],
+          bootstrap: [AppComponent]
+        })
+        export class AppModule { }
+      `;
+
+      const source = getTsSource(modulePath, moduleContent);
+      const change = () => addRouteDeclarationToModule(source, './src/app', '');
+      expect(change).toThrowError(`Couldn't find a route declaration in ./src/app.`);
+    });
+
+    it(`should throw an error when router module doesn't have arguments`, () => {
+      const moduleContent = `
+        import { BrowserModule } from '@angular/platform-browser';
+        import { NgModule } from '@angular/core';
+        import { AppComponent } from './app.component';
+
+        @NgModule({
+          declarations: [
+            AppComponent
+          ],
+          imports: [
+            BrowserModule,
+            RouterModule.forRoot()
+          ],
+          bootstrap: [AppComponent]
+        })
+        export class AppModule { }
+      `;
+
+      const source = getTsSource(modulePath, moduleContent);
+      const change = () => addRouteDeclarationToModule(source, './src/app', '');
+      expect(change).toThrowError(
+        `The router module method doesn't have arguments at line 11 in ./src/app`,
+      );
+    });
+
+    it(`should throw an error when the provided var (array) to router module doesn't exist`, () => {
+      const moduleContent = `
+        import { BrowserModule } from '@angular/platform-browser';
+        import { NgModule } from '@angular/core';
+        import { AppComponent } from './app.component';
+
+        @NgModule({
+          declarations: [
+            AppComponent
+          ],
+          imports: [
+            BrowserModule,
+            RouterModule.forRoot(routes)
+          ],
+          bootstrap: [AppComponent]
+        })
+        export class AppModule { }
+      `;
+
+      const source = getTsSource(modulePath, moduleContent);
+      const change = () => addRouteDeclarationToModule(source, './src/app', '');
+      expect(change).toThrowError(
+        // tslint:disable-next-line:max-line-length
+        `No route declaration array was found that corresponds to router module at line 11 in ./src/app`,
+      );
+    });
+
+    // tslint:disable-next-line:max-line-length
+    it(`should throw an error, if the provided first argument of router module is not an identifier`, () => {
+      const moduleContent = `
+        import { BrowserModule } from '@angular/platform-browser';
+        import { NgModule } from '@angular/core';
+        import { AppComponent } from './app.component';
+
+        @NgModule({
+          declarations: [
+            AppComponent
+          ],
+          imports: [
+            BrowserModule,
+            RouterModule.forRoot(42)
+          ],
+          bootstrap: [AppComponent]
+        })
+        export class AppModule { }
+      `;
+
+      const source = getTsSource(modulePath, moduleContent);
+      const change = () => addRouteDeclarationToModule(source, './src/app', '');
+      expect(change).toThrowError(
+        // tslint:disable-next-line:max-line-length
+        `No route declaration array was found that corresponds to router module at line 11 in ./src/app`,
+      );
+    });
+
+    it('should add a route to the routes array', () => {
+      const moduleContent = `
+        import { BrowserModule } from '@angular/platform-browser';
+        import { NgModule } from '@angular/core';
+        import { AppComponent } from './app.component';
+
+        const routes = [];
+
+        @NgModule({
+          declarations: [
+            AppComponent
+          ],
+          imports: [
+            BrowserModule,
+            RouterModule.forRoot(routes)
+          ],
+          bootstrap: [AppComponent]
+        })
+        export class AppModule { }
+      `;
+
+      const source = getTsSource(modulePath, moduleContent);
+      const changes = addRouteDeclarationToModule(
+        source,
+        './src/app', `{ path: 'foo', component: FooComponent }`,
+      );
+      const output = applyChanges(modulePath, moduleContent, [changes]);
+
+      expect(output).toMatch(/const routes = \[{ path: 'foo', component: FooComponent }\]/);
+    });
+
+    it('should add a route to the routes array when there are multiple declarations', () => {
+      const moduleContent = `
+        import { BrowserModule } from '@angular/platform-browser';
+        import { NgModule } from '@angular/core';
+        import { AppComponent } from './app.component';
+
+        const routes = [
+          { path: 'foo', component: FooComponent }
+        ];
+
+        @NgModule({
+          declarations: [
+            AppComponent
+          ],
+          imports: [
+            BrowserModule,
+            RouterModule.forRoot(routes)
+          ],
+          bootstrap: [AppComponent]
+        })
+        export class AppModule { }
+      `;
+
+      const source = getTsSource(modulePath, moduleContent);
+      const changes = addRouteDeclarationToModule(
+        source,
+        './src/app', `{ path: 'bar', component: BarComponent }`,
+      );
+      const output = applyChanges(modulePath, moduleContent, [changes]);
+
+      expect(output).toMatch(
+        // tslint:disable-next-line:max-line-length
+        /const routes = \[\r?\n?\s*{ path: 'foo', component: FooComponent },\r?\n?\s*{ path: 'bar', component: BarComponent }\r?\n?\s*\]/,
+      );
+    });
+
+    it('should add a route to the routes argument of RouteModule', () => {
+      const moduleContent = `
+        import { BrowserModule } from '@angular/platform-browser';
+        import { NgModule } from '@angular/core';
+        import { AppComponent } from './app.component';
+
+        @NgModule({
+          declarations: [
+            AppComponent
+          ],
+          imports: [
+            BrowserModule,
+            RouterModule.forRoot([])
+          ],
+          bootstrap: [AppComponent]
+        })
+        export class AppModule { }
+      `;
+
+      const source = getTsSource(modulePath, moduleContent);
+      const changes = addRouteDeclarationToModule(
+        source,
+        './src/app', `{ path: 'foo', component: FooComponent }`,
+      );
+      const output = applyChanges(modulePath, moduleContent, [changes]);
+
+      expect(output).toMatch(
+        /RouterModule\.forRoot\(\[{ path: 'foo', component: FooComponent }\]\)/,
+      );
+    });
+
+    // tslint:disable-next-line:max-line-length
+    it('should add a route to the routes argument of RouterModule when there are multiple declarations', () => {
+      const moduleContent = `
+        import { BrowserModule } from '@angular/platform-browser';
+        import { NgModule } from '@angular/core';
+        import { AppComponent } from './app.component';
+
+        @NgModule({
+          declarations: [
+            AppComponent
+          ],
+          imports: [
+            BrowserModule,
+            RouterModule.forRoot([{ path: 'foo', component: FooComponent }])
+          ],
+          bootstrap: [AppComponent]
+        })
+        export class AppModule { }
+      `;
+
+      const source = getTsSource(modulePath, moduleContent);
+      const changes = addRouteDeclarationToModule(
+        source,
+        './src/app', `{ path: 'bar', component: BarComponent }`,
+      );
+      const output = applyChanges(modulePath, moduleContent, [changes]);
+
+      expect(output).toMatch(
+        // tslint:disable-next-line:max-line-length
+        /RouterModule\.forRoot\(\[\r?\n?\s*{ path: 'foo', component: FooComponent },\r?\n?\s*{ path: 'bar', component: BarComponent }\r?\n?\s*\]\)/,
+      );
+    });
+  });
 });

From 44a0d0fb4e68d8402f223e225adfab06f504d4a7 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Tue, 25 Jun 2019 09:18:14 +0200
Subject: [PATCH 1537/1703] fix(@angular-devkit/build-angular): add
 `type="module"` on script tags when differential loading will be enabled

Fixes #14747
---
 .../plugins/index-html-webpack-plugin.ts      |  19 ++-
 .../build_angular/src/browser/index.ts        | 118 +++++++------
 .../build_angular/src/dev-server/index.ts     | 157 +++++++++++-------
 .../differential_loading_spec_large.ts        |  27 ++-
 .../test/dev-server/index_spec_large.ts       |  62 +++++++
 5 files changed, 253 insertions(+), 130 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/test/dev-server/index_spec_large.ts

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
index 7bdbded397d8..6f91eab8cf21 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
@@ -20,6 +20,7 @@ export interface IndexHtmlWebpackPluginOptions {
   deployUrl?: string;
   sri: boolean;
   noModuleEntrypoints: string[];
+  moduleEntrypoints: string[];
   postTransform?: IndexHtmlTransform;
 }
 
@@ -37,7 +38,6 @@ function readFile(filename: string, compilation: compilation.Compilation): Promi
   });
 }
 
-
 export class IndexHtmlWebpackPlugin {
   private _options: IndexHtmlWebpackPluginOptions;
 
@@ -47,6 +47,7 @@ export class IndexHtmlWebpackPlugin {
       output: 'index.html',
       entrypoints: ['polyfills', 'main'],
       noModuleEntrypoints: [],
+      moduleEntrypoints: [],
       sri: false,
       ...options,
     };
@@ -56,23 +57,28 @@ export class IndexHtmlWebpackPlugin {
     compiler.hooks.emit.tapPromise('index-html-webpack-plugin', async compilation => {
       // Get input html file
       const inputContent = await readFile(this._options.input, compilation);
-      (compilation as compilation.Compilation & { fileDependencies: Set<string> })
-        .fileDependencies.add(this._options.input);
+      (compilation as compilation.Compilation & {
+        fileDependencies: Set<string>;
+      }).fileDependencies.add(this._options.input);
 
       // Get all files for selected entrypoints
       const files: FileInfo[] = [];
       const noModuleFiles: FileInfo[] = [];
+      const moduleFiles: FileInfo[] = [];
 
       for (const [entryName, entrypoint] of compilation.entrypoints) {
-        const entryFiles: FileInfo[] = (entrypoint && entrypoint.getFiles() || [])
-          .map((f: string): FileInfo => ({
+        const entryFiles: FileInfo[] = ((entrypoint && entrypoint.getFiles()) || []).map(
+          (f: string): FileInfo => ({
             name: entryName,
             file: f,
             extension: path.extname(f),
-          }));
+          }),
+        );
 
         if (this._options.noModuleEntrypoints.includes(entryName)) {
           noModuleFiles.push(...entryFiles);
+        } else if (this._options.moduleEntrypoints.includes(entryName)) {
+          moduleFiles.push(...entryFiles);
         } else {
           files.push(...entryFiles);
         }
@@ -88,6 +94,7 @@ export class IndexHtmlWebpackPlugin {
         files,
         noModuleFiles,
         loadOutputFile,
+        moduleFiles,
         entrypoints: this._options.entrypoints,
       });
 
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 4550bb570576..fca271e2fafd 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -5,17 +5,13 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import {
-  BuilderContext,
-  BuilderOutput,
-  createBuilder,
-} from '@angular-devkit/architect';
+import { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
 import {
   BuildResult,
   EmittedFiles,
   WebpackLoggingCallback,
   runWebpack,
- } from '@angular-devkit/build-webpack';
+} from '@angular-devkit/build-webpack';
 import {
   experimental,
   getSystemPath,
@@ -62,9 +58,10 @@ import { assertCompatibleAngularVersion } from '../utils/version';
 import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
 import { Schema as BrowserBuilderSchema } from './schema';
 
-export type BrowserBuilderOutput = json.JsonObject & BuilderOutput & {
-  outputPath: string;
-};
+export type BrowserBuilderOutput = json.JsonObject &
+  BuilderOutput & {
+    outputPath: string;
+  };
 
 export function createBrowserLoggingCallback(
   verbose: boolean,
@@ -92,7 +89,7 @@ export async function buildBrowserWebpackConfigFromContext(
   options: BrowserBuilderSchema,
   context: BuilderContext,
   host: virtualFs.Host<fs.Stats> = new NodeJsSyncHost(),
-): Promise<{ workspace: experimental.workspace.Workspace, config: webpack.Configuration[] }> {
+): Promise<{ workspace: experimental.workspace.Workspace; config: webpack.Configuration[] }> {
   return generateBrowserWebpackConfigFromContext(
     options,
     context,
@@ -125,9 +122,7 @@ function getAnalyticsConfig(
 
     // The category is the builder name if it's an angular builder.
     return {
-      plugins: [
-        new NgBuildAnalyticsPlugin(wco.projectRoot, context.analytics, category),
-      ],
+      plugins: [new NgBuildAnalyticsPlugin(wco.projectRoot, context.analytics, category)],
     };
   }
 
@@ -147,7 +142,7 @@ async function initialize(
   context: BuilderContext,
   host: virtualFs.Host<fs.Stats>,
   webpackConfigurationTransform?: ExecutionTransformer<webpack.Configuration>,
-): Promise<{ workspace: experimental.workspace.Workspace, config: webpack.Configuration[] }> {
+): Promise<{ workspace: experimental.workspace.Workspace; config: webpack.Configuration[] }> {
   const { config, workspace } = await buildBrowserWebpackConfigFromContext(options, context, host);
 
   let transformedConfig;
@@ -173,9 +168,9 @@ export function buildWebpackBrowser(
   options: BrowserBuilderSchema,
   context: BuilderContext,
   transforms: {
-    webpackConfiguration?: ExecutionTransformer<webpack.Configuration>,
-    logging?: WebpackLoggingCallback,
-    indexHtml?: IndexHtmlTransform,
+    webpackConfiguration?: ExecutionTransformer<webpack.Configuration>;
+    logging?: WebpackLoggingCallback;
+    indexHtml?: IndexHtmlTransform;
   } = {},
 ) {
   const host = new NodeJsSyncHost();
@@ -184,13 +179,14 @@ export function buildWebpackBrowser(
   // Check Angular version.
   assertCompatibleAngularVersion(context.workspaceRoot, context.logger);
 
-  const loggingFn = transforms.logging
-    || createBrowserLoggingCallback(!!options.verbose, context.logger);
+  const loggingFn =
+    transforms.logging || createBrowserLoggingCallback(!!options.verbose, context.logger);
 
   return from(initialize(options, context, host, transforms.webpackConfiguration)).pipe(
     switchMap(({ workspace, config: configs }) => {
       const projectName = context.target
-        ? context.target.project : workspace.getDefaultProjectName();
+        ? context.target.project
+        : workspace.getDefaultProjectName();
 
       if (!projectName) {
         throw new Error('Must either have a target from the context or a default project.');
@@ -203,12 +199,11 @@ export function buildWebpackBrowser(
 
       const tsConfig = readTsconfig(options.tsConfig, context.workspaceRoot);
       const target = tsConfig.options.target || ScriptTarget.ES5;
-      const buildBrowserFeatures = new BuildBrowserFeatures(
-        getSystemPath(projectRoot),
-        target,
-      );
+      const buildBrowserFeatures = new BuildBrowserFeatures(getSystemPath(projectRoot), target);
 
-      if (target > ScriptTarget.ES2015 && buildBrowserFeatures.isDifferentialLoadingNeeded()) {
+      const isDifferentialLoadingNeeded = buildBrowserFeatures.isDifferentialLoadingNeeded();
+
+      if (target > ScriptTarget.ES2015 && isDifferentialLoadingNeeded) {
         context.logger.warn(tags.stripIndent`
           WARNING: Using differential loading with targets ES5 and ES2016 or higher may
           cause problems. Browsers with support for ES2015 will load the ES2016+ scripts
@@ -219,14 +214,18 @@ export function buildWebpackBrowser(
       return from(configs).pipe(
         // the concurrency parameter (3rd parameter of mergeScan) is deliberately
         // set to 1 to make sure the build steps are executed in sequence.
-        mergeScan((lastResult, config) => {
-          // Make sure to only run the 2nd build step, if 1st one succeeded
-          if (lastResult.success) {
-            return runWebpack(config, context, { logging: loggingFn });
-          } else {
-            return of();
-          }
-        }, { success: true } as BuildResult, 1),
+        mergeScan(
+          (lastResult, config) => {
+            // Make sure to only run the 2nd build step, if 1st one succeeded
+            if (lastResult.success) {
+              return runWebpack(config, context, { logging: loggingFn });
+            } else {
+              return of();
+            }
+          },
+          { success: true } as BuildResult,
+          1,
+        ),
         bufferCount(configs.length),
         switchMap(buildEvents => {
           const success = buildEvents.every(r => r.success);
@@ -235,14 +234,19 @@ export function buildWebpackBrowser(
             let moduleFiles: EmittedFiles[] | undefined;
             let files: EmittedFiles[] | undefined;
 
-            const [ES5Result, ES2015Result] = buildEvents;
+            const [firstBuild, secondBuild] = buildEvents;
 
             if (buildEvents.length === 2) {
-              noModuleFiles = ES5Result.emittedFiles;
-              moduleFiles = ES2015Result.emittedFiles || [];
+              noModuleFiles = firstBuild.emittedFiles;
+              moduleFiles = secondBuild.emittedFiles || [];
+              files = moduleFiles.filter(x => x.extension === '.css');
+            } else if (options.watch && isDifferentialLoadingNeeded) {
+              // differential loading is not enabled in watch mode
+              // but we still want to use module type tags
+              moduleFiles = firstBuild.emittedFiles || [];
               files = moduleFiles.filter(x => x.extension === '.css');
             } else {
-              const { emittedFiles = [] } = ES5Result;
+              const { emittedFiles = [] } = firstBuild;
               files = emittedFiles.filter(x => x.name !== 'polyfills-es5');
               noModuleFiles = emittedFiles.filter(x => x.name === 'polyfills-es5');
             }
@@ -260,8 +264,7 @@ export function buildWebpackBrowser(
               scripts: options.scripts,
               styles: options.styles,
               postTransform: transforms.indexHtml,
-            })
-            .pipe(
+            }).pipe(
               map(() => ({ success: true })),
               catchError(error => of({ success: false, error: mapErrorToMessage(error) })),
             );
@@ -271,26 +274,31 @@ export function buildWebpackBrowser(
         }),
         concatMap(buildEvent => {
           if (buildEvent.success && !options.watch && options.serviceWorker) {
-            return from(augmentAppWithServiceWorker(
-              host,
-              root,
-              projectRoot,
-              resolve(root, normalize(options.outputPath)),
-              options.baseHref || '/',
-              options.ngswConfigPath,
-            ).then(
-              () => ({ success: true }),
-              error => ({ success: false, error: mapErrorToMessage(error) }),
-            ));
+            return from(
+              augmentAppWithServiceWorker(
+                host,
+                root,
+                projectRoot,
+                resolve(root, normalize(options.outputPath)),
+                options.baseHref || '/',
+                options.ngswConfigPath,
+              ).then(
+                () => ({ success: true }),
+                error => ({ success: false, error: mapErrorToMessage(error) }),
+              ),
+            );
           } else {
             return of(buildEvent);
           }
         }),
-        map(event => ({
-          ...event,
-          // If we use differential loading, both configs have the same outputs
-          outputPath: path.resolve(context.workspaceRoot, options.outputPath),
-        } as BrowserBuilderOutput)),
+        map(
+          event =>
+            ({
+              ...event,
+              // If we use differential loading, both configs have the same outputs
+              outputPath: path.resolve(context.workspaceRoot, options.outputPath),
+            } as BrowserBuilderOutput),
+        ),
       );
     }),
   );
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index dd46b80e9ae1..b7ac62ee4507 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -6,22 +6,27 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {
-  BuilderContext,
-  createBuilder,
-  targetFromTargetString,
-} from '@angular-devkit/architect';
+import { BuilderContext, createBuilder, targetFromTargetString } from '@angular-devkit/architect';
 import {
   DevServerBuildOutput,
   WebpackLoggingCallback,
   runWebpackDevServer,
 } from '@angular-devkit/build-webpack';
-import { json, logging, tags } from '@angular-devkit/core';
+import {
+  experimental,
+  getSystemPath,
+  json,
+  logging,
+  normalize,
+  resolve,
+  tags,
+} from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { existsSync, readFileSync } from 'fs';
 import * as path from 'path';
 import { Observable, from } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
+import * as ts from 'typescript';
 import * as url from 'url';
 import * as webpack from 'webpack';
 import * as WebpackDevServer from 'webpack-dev-server';
@@ -29,13 +34,11 @@ import { IndexHtmlWebpackPlugin } from '../angular-cli-files/plugins/index-html-
 import { checkPort } from '../angular-cli-files/utilities/check-port';
 import { IndexHtmlTransform } from '../angular-cli-files/utilities/index-file/write-index-html';
 import { generateEntryPoints } from '../angular-cli-files/utilities/package-chunk-sort';
-import {
-  buildBrowserWebpackConfigFromContext,
-  createBrowserLoggingCallback,
-} from '../browser';
+import { readTsconfig } from '../angular-cli-files/utilities/read-tsconfig';
+import { buildBrowserWebpackConfigFromContext, createBrowserLoggingCallback } from '../browser';
 import { Schema as BrowserBuilderSchema } from '../browser/schema';
 import { ExecutionTransformer } from '../transforms';
-import { normalizeOptimization } from '../utils';
+import { BuildBrowserFeatures, normalizeOptimization } from '../utils';
 import { assertCompatibleAngularVersion } from '../utils/version';
 import { Schema } from './schema';
 const open = require('open');
@@ -58,7 +61,6 @@ export const devServerBuildOverriddenKeys: (keyof DevServerBuilderOptions)[] = [
   'deployUrl',
 ];
 
-
 export type DevServerBuilderOutput = DevServerBuildOutput & {
   baseUrl: string;
 };
@@ -74,9 +76,9 @@ export function serveWebpackBrowser(
   options: DevServerBuilderOptions,
   context: BuilderContext,
   transforms: {
-    webpackConfiguration?: ExecutionTransformer<webpack.Configuration>,
-    logging?: WebpackLoggingCallback,
-    indexHtml?: IndexHtmlTransform,
+    webpackConfiguration?: ExecutionTransformer<webpack.Configuration>;
+    logging?: WebpackLoggingCallback;
+    indexHtml?: IndexHtmlTransform;
   } = {},
 ): Observable<DevServerBuilderOutput> {
   // Check Angular version.
@@ -87,25 +89,29 @@ export function serveWebpackBrowser(
   let first = true;
   const host = new NodeJsSyncHost();
 
-  const loggingFn = transforms.logging
-    || createBrowserLoggingCallback(!!options.verbose, context.logger);
+  const loggingFn =
+    transforms.logging || createBrowserLoggingCallback(!!options.verbose, context.logger);
 
   async function setup(): Promise<{
-    browserOptions: json.JsonObject & BrowserBuilderSchema,
-    webpackConfig: webpack.Configuration,
-    webpackDevServerConfig: WebpackDevServer.Configuration,
-    port: number,
+    browserOptions: json.JsonObject & BrowserBuilderSchema;
+    webpackConfig: webpack.Configuration;
+    webpackDevServerConfig: WebpackDevServer.Configuration;
+    port: number;
+    workspace: experimental.workspace.Workspace;
   }> {
     // Get the browser configuration from the target name.
     const rawBrowserOptions = await context.getTargetOptions(browserTarget);
 
     // Override options we need to override, if defined.
     const overrides = (Object.keys(options) as (keyof DevServerBuilderOptions)[])
-    .filter(key => options[key] !== undefined && devServerBuildOverriddenKeys.includes(key))
-    .reduce<json.JsonObject & Partial<BrowserBuilderSchema>>((previous, key) => ({
-      ...previous,
-      [key]: options[key],
-    }), {});
+      .filter(key => options[key] !== undefined && devServerBuildOverriddenKeys.includes(key))
+      .reduce<json.JsonObject & Partial<BrowserBuilderSchema>>(
+        (previous, key) => ({
+          ...previous,
+          [key]: options[key],
+        }),
+        {},
+      );
 
     // In dev server we should not have budgets because of extra libs such as socks-js
     overrides.budgets = undefined;
@@ -126,22 +132,28 @@ export function serveWebpackBrowser(
     let webpackConfig = webpackConfigResult.config[0];
 
     const port = await checkPort(options.port || 0, options.host || 'localhost', 4200);
-    const webpackDevServerConfig = webpackConfig.devServer = buildServerConfig(
+    const webpackDevServerConfig = (webpackConfig.devServer = buildServerConfig(
       root,
       options,
       browserOptions,
       context.logger,
-    );
+    ));
 
     if (transforms.webpackConfiguration) {
       webpackConfig = await transforms.webpackConfiguration(webpackConfig);
     }
 
-    return { browserOptions, webpackConfig, webpackDevServerConfig, port };
+    return {
+      browserOptions,
+      webpackConfig,
+      webpackDevServerConfig,
+      port,
+      workspace: webpackConfigResult.workspace,
+    };
   }
 
   return from(setup()).pipe(
-    switchMap(({ browserOptions, webpackConfig, webpackDevServerConfig, port }) => {
+    switchMap(({ browserOptions, webpackConfig, webpackDevServerConfig, port, workspace }) => {
       options.port = port;
 
       // Resolve public host and client address.
@@ -171,25 +183,48 @@ export function serveWebpackBrowser(
           // tslint:disable-next-line:no-any
           apply: (compiler: any) => {
             compiler.hooks.afterEnvironment.tap('angular-cli', () => {
-              compiler.watchFileSystem = { watch: () => { } };
+              compiler.watchFileSystem = { watch: () => {} };
             });
           },
         });
       }
 
       if (browserOptions.index) {
-        const { scripts = [], styles = [], index, baseHref } = browserOptions;
-
-        webpackConfig.plugins.push(new IndexHtmlWebpackPlugin({
-          input: path.resolve(root, index),
-          output: path.basename(index),
-          baseHref,
-          entrypoints: generateEntryPoints({ scripts, styles }),
-          deployUrl: browserOptions.deployUrl,
-          sri: browserOptions.subresourceIntegrity,
-          noModuleEntrypoints: ['polyfills-es5'],
-          postTransform: transforms.indexHtml,
-        }));
+        const { scripts = [], styles = [], index, baseHref, tsConfig } = browserOptions;
+        const projectName = context.target
+          ? context.target.project
+          : workspace.getDefaultProjectName();
+
+        if (!projectName) {
+          throw new Error('Must either have a target from the context or a default project.');
+        }
+        const projectRoot = resolve(
+          workspace.root,
+          normalize(workspace.getProject(projectName).root),
+        );
+
+        const { options: compilerOptions } = readTsconfig(tsConfig, context.workspaceRoot);
+        const target = compilerOptions.target || ts.ScriptTarget.ES5;
+        const buildBrowserFeatures = new BuildBrowserFeatures(getSystemPath(projectRoot), target);
+
+        const entrypoints = generateEntryPoints({ scripts, styles });
+        const moduleEntrypoints = buildBrowserFeatures.isDifferentialLoadingNeeded()
+          ? entrypoints
+          : [];
+
+        webpackConfig.plugins.push(
+          new IndexHtmlWebpackPlugin({
+            input: path.resolve(root, index),
+            output: path.basename(index),
+            baseHref,
+            moduleEntrypoints,
+            entrypoints,
+            deployUrl: browserOptions.deployUrl,
+            sri: browserOptions.subresourceIntegrity,
+            noModuleEntrypoints: ['polyfills-es5'],
+            postTransform: transforms.indexHtml,
+          }),
+        );
       }
 
       const normalizedOptimization = normalizeOptimization(browserOptions.optimization);
@@ -235,7 +270,6 @@ export function serveWebpackBrowser(
   );
 }
 
-
 /**
  * Create a webpack configuration for the dev server.
  * @param workspaceRoot The root of the workspace. This comes from the context.
@@ -279,17 +313,19 @@ export function buildServerConfig(
     host: serverOptions.host,
     port: serverOptions.port,
     headers: { 'Access-Control-Allow-Origin': '*' },
-    historyApiFallback: !!browserOptions.index && {
-      index: `${servePath}/${path.basename(browserOptions.index)}`,
-      disableDotRule: true,
-      htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
-      rewrites: [
-        {
-          from: new RegExp(`^(?!${servePath})/.*`),
-          to: context => url.format(context.parsedUrl),
-        },
-      ],
-    } as WebpackDevServer.HistoryApiFallbackConfig,
+    historyApiFallback:
+      !!browserOptions.index &&
+      ({
+        index: `${servePath}/${path.basename(browserOptions.index)}`,
+        disableDotRule: true,
+        htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
+        rewrites: [
+          {
+            from: new RegExp(`^(?!${servePath})/.*`),
+            to: context => url.format(context.parsedUrl),
+          },
+        ],
+      } as WebpackDevServer.HistoryApiFallbackConfig),
     stats: false,
     compress: styles || scripts,
     watchOptions: {
@@ -388,8 +424,7 @@ function _addLiveReload(
   if (options.hmr) {
     const webpackHmrLink = 'https://webpack.js.org/guides/hot-module-replacement';
 
-    logger.warn(
-      tags.oneLine`NOTICE: Hot Module Replacement (HMR) is enabled for the dev server.`);
+    logger.warn(tags.oneLine`NOTICE: Hot Module Replacement (HMR) is enabled for the dev server.`);
 
     const showWarning = options.hmrWarning;
     if (showWarning) {
@@ -398,8 +433,7 @@ function _addLiveReload(
           but to take advantage of HMR additional application code is required'
           (not included in an Angular CLI project by default).'
           See ${webpackHmrLink}
-          for information on working with HMR for Webpack.`,
-      );
+          for information on working with HMR for Webpack.`);
       logger.warn(
         tags.oneLine`To disable this warning use "hmrWarning: false" under "serve"
            options in "angular.json".`,
@@ -493,9 +527,7 @@ function _findDefaultServePath(baseHref?: string, deployUrl?: string): string |
   // normalize baseHref
   // for ng serve the starting base is always `/` so a relative
   // and root relative value are identical
-  const baseHrefParts = (baseHref || '')
-    .split('/')
-    .filter(part => part !== '');
+  const baseHrefParts = (baseHref || '').split('/').filter(part => part !== '');
   if (baseHref && !baseHref.endsWith('/')) {
     baseHrefParts.pop();
   }
@@ -514,5 +546,4 @@ function _findDefaultServePath(baseHref?: string, deployUrl?: string): string |
   return `${normalizedBaseHref}${deployUrl || ''}`;
 }
 
-
 export default createBuilder<DevServerBuilderOptions, DevServerBuilderOutput>(serveWebpackBrowser);
diff --git a/packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts
index 16530d00e934..2141c89a1a12 100644
--- a/packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/differential_loading_spec_large.ts
@@ -18,7 +18,7 @@ describe('Browser Builder with differential loading', () => {
     await host.initialize().toPromise();
     // to trigger differential loading we need an non ever green browser
     host.writeMultipleFiles({
-      'browserslist': 'IE 10',
+      browserslist: 'IE 10',
     });
 
     architect = (await createArchitect(host.root())).architect;
@@ -59,8 +59,7 @@ describe('Browser Builder with differential loading', () => {
       'vendor-es5.js.map',
     ] as PathFragment[];
 
-    expect(Object.keys(files))
-      .toEqual(jasmine.arrayWithExactContents(expectedOutputs));
+    expect(Object.keys(files)).toEqual(jasmine.arrayWithExactContents(expectedOutputs));
   });
 
   it('deactivates differential loading for watch mode', async () => {
@@ -86,11 +85,9 @@ describe('Browser Builder with differential loading', () => {
       'vendor.js.map',
     ] as PathFragment[];
 
-    expect(Object.keys(files))
-      .toEqual(jasmine.arrayWithExactContents(expectedOutputs));
+    expect(Object.keys(files)).toEqual(jasmine.arrayWithExactContents(expectedOutputs));
   });
 
-
   it('emits the right ES formats', async () => {
     const { files } = await browserBuild(architect, host, target, { optimization: true });
     expect(await files['main-es5.js']).not.toContain('class');
@@ -105,4 +102,22 @@ describe('Browser Builder with differential loading', () => {
     expect(await files['polyfills-es2015.js']).toContain('zone.js/dist/zone-evergreen');
     expect(await files['polyfills-es2015.js']).not.toContain('registerElementPatch');
   });
+
+  it('adds `type="module"` when differential loading is needed', async () => {
+    host.writeMultipleFiles({
+      browserslist: `
+        last 1 chrome version
+        IE 9
+      `,
+    });
+
+    const { files } = await browserBuild(architect, host, target, { watch: true });
+    expect(await files['index.html']).toContain(
+      '<script src="runtime.js" type="module"></script>' +
+        '<script src="polyfills.js" type="module"></script>' +
+        '<script src="styles.js" type="module"></script>' +
+        '<script src="vendor.js" type="module"></script>' +
+        '<script src="main.js" type="module"></script>',
+    );
+  });
 });
diff --git a/packages/angular_devkit/build_angular/test/dev-server/index_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/index_spec_large.ts
new file mode 100644
index 000000000000..bf261a5b5987
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/dev-server/index_spec_large.ts
@@ -0,0 +1,62 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import fetch from 'node-fetch'; // tslint:disable-line:no-implicit-dependencies
+import { DevServerBuilderOutput } from '../../src/dev-server/index';
+import { createArchitect, host } from '../utils';
+
+describe('Dev Server Builder index', () => {
+  const targetSpec = { project: 'app', target: 'serve' };
+
+  beforeEach(async () => host.initialize().toPromise());
+  afterEach(async () => host.restore().toPromise());
+
+  it(`adds 'type="module"' when differential loading is needed`, async () => {
+    host.writeMultipleFiles({
+      browserslist: `
+        last 1 chrome version
+        IE 10
+      `,
+    });
+
+    const architect = (await createArchitect(host.root())).architect;
+    const run = await architect.scheduleTarget(targetSpec);
+    const output = (await run.result) as DevServerBuilderOutput;
+    expect(output.success).toBe(true);
+    const response = await fetch('http://localhost:4200/index.html');
+    expect(await response.text()).toContain(
+      '<script src="runtime.js" type="module"></script>' +
+        '<script src="polyfills.js" type="module"></script>' +
+        '<script src="styles.js" type="module"></script>' +
+        '<script src="vendor.js" type="module"></script>' +
+        '<script src="main.js" type="module"></script>',
+    );
+    await run.stop();
+  });
+
+  it(`doesn't 'type="module"' when differential loading is not needed`, async () => {
+    host.writeMultipleFiles({
+      browserslist: `
+        last 1 chrome version
+      `,
+    });
+
+    const architect = (await createArchitect(host.root())).architect;
+    const run = await architect.scheduleTarget(targetSpec);
+    const output = (await run.result) as DevServerBuilderOutput;
+    expect(output.success).toBe(true);
+    const response = await fetch('http://localhost:4200/index.html');
+    expect(await response.text()).toContain(
+      '<script src="runtime.js"></script>' +
+        '<script src="polyfills.js"></script>' +
+        '<script src="styles.js"></script>' +
+        '<script src="vendor.js"></script>' +
+        '<script src="main.js"></script>',
+    );
+    await run.stop();
+  });
+});

From 3aee401397c39930e072372ca934f1165f74974b Mon Sep 17 00:00:00 2001
From: c4605 <bolasblack@gmail.com>
Date: Sun, 23 Jun 2019 00:57:50 +0800
Subject: [PATCH 1538/1703] fix(@angular-devkit/schematics): fix use `install`
 subcommand when override package manager to yarn

---
 .../schematics/tasks/node-package/executor.ts               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/schematics/tasks/node-package/executor.ts b/packages/angular_devkit/schematics/tasks/node-package/executor.ts
index 0a704cd43859..1c7664077265 100644
--- a/packages/angular_devkit/schematics/tasks/node-package/executor.ts
+++ b/packages/angular_devkit/schematics/tasks/node-package/executor.ts
@@ -88,11 +88,11 @@ export default function(
 
     if (options.packageName) {
       if (options.command === 'install') {
-        args.push(packageManagerProfile.commands.installPackage);
+        args.push(taskPackageManagerProfile.commands.installPackage);
       }
       args.push(options.packageName);
-    } else if (options.command === 'install' && packageManagerProfile.commands.installAll) {
-      args.push(packageManagerProfile.commands.installAll);
+    } else if (options.command === 'install' && taskPackageManagerProfile.commands.installAll) {
+      args.push(taskPackageManagerProfile.commands.installAll);
     }
 
     if (options.quiet && taskPackageManagerProfile.quietArgument) {

From 51c30e5def121ea7acbee162d933ce16e281a7dd Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Tue, 25 Jun 2019 15:15:29 -0700
Subject: [PATCH 1539/1703] refactor(@angular/cli): refactor isTTY() function

It was really hard to read with double negatives and such.
---
 packages/angular/cli/utilities/tty.ts | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/angular/cli/utilities/tty.ts b/packages/angular/cli/utilities/tty.ts
index 24d499d3e4a8..dd5931e26fb6 100644
--- a/packages/angular/cli/utilities/tty.ts
+++ b/packages/angular/cli/utilities/tty.ts
@@ -5,13 +5,18 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
+function _isTruthy(value: undefined | string): boolean {
+  // Returns true if value is a string that is anything but 0 or false.
+  return value !== undefined && value !== '0' && value.toUpperCase() !== 'FALSE';
+}
+
 export function isTTY(): boolean {
+  // If we force TTY, we always return true.
   const force = process.env['NG_FORCE_TTY'];
   if (force !== undefined) {
-    return !(force === '0' || force.toUpperCase() === 'FALSE');
+    return _isTruthy(force);
   }
 
-  const ci = process.env['CI'];
-
-  return !!process.stdout.isTTY && (!ci || ci === '0' || ci.toUpperCase() === 'FALSE');
+  return !!process.stdout.isTTY && !_isTruthy(process.env['CI']);
 }

From cf86f0663e0d60355f91e3796fabc7f8e4268431 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Tue, 25 Jun 2019 15:17:06 -0700
Subject: [PATCH 1540/1703] feat(@angular/cli): move non-stable version
 analytics to own property

And refactor it to be put magic strings in a single place.
---
 packages/angular/cli/models/analytics.ts | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/models/analytics.ts b/packages/angular/cli/models/analytics.ts
index 3d48f2677cd8..bf6f8f6df5da 100644
--- a/packages/angular/cli/models/analytics.ts
+++ b/packages/angular/cli/models/analytics.ts
@@ -22,6 +22,28 @@ const analyticsLogDebug = debug('ng:analytics:log'); // Actual logs of events.
 
 const BYTES_PER_MEGABYTES = 1024 * 1024;
 
+let _defaultAngularCliPropertyCache: string;
+export const AnalyticsProperties = {
+  AngularCliProd: 'UA-8594346-29',
+  AngularCliStaging: 'UA-8594346-32',
+  get AngularCliDefault(): string {
+    if (_defaultAngularCliPropertyCache) {
+      return _defaultAngularCliPropertyCache;
+    }
+
+    const v = require('../package.json').version;
+
+    // The logic is if it's a full version then we should use the prod GA property.
+    if (/^\d+\.\d+\.\d+$/.test(v) && v !== '0.0.0') {
+      _defaultAngularCliPropertyCache = AnalyticsProperties.AngularCliProd;
+    } else {
+      _defaultAngularCliPropertyCache = AnalyticsProperties.AngularCliStaging;
+    }
+
+    return _defaultAngularCliPropertyCache;
+  },
+};
+
 /**
  * This is the ultimate safelist for checking if a package name is safe to report to analytics.
  */
@@ -467,7 +489,7 @@ export function hasGlobalAnalyticsConfiguration(): boolean {
  */
 export function getGlobalAnalytics(): UniversalAnalytics | undefined {
   analyticsDebug('getGlobalAnalytics');
-  const propertyId = 'UA-8594346-29';
+  const propertyId = AnalyticsProperties.AngularCliDefault;
 
   if ('NG_CLI_ANALYTICS' in process.env) {
     if (process.env['NG_CLI_ANALYTICS'] == 'false' || process.env['NG_CLI_ANALYTICS'] == '') {

From 2e6d2e18b954f91245a54181c4879e5251edceb3 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Tue, 25 Jun 2019 15:18:45 -0700
Subject: [PATCH 1541/1703] feat(@angular/cli): ping back when user opts out of
 analytics

On prompt only, does not contain any user info. Since prompt should be only
shown at install or first run, this is not going to ping more than once and
the users privacy is also protected.
---
 packages/angular/cli/models/analytics.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/angular/cli/models/analytics.ts b/packages/angular/cli/models/analytics.ts
index bf6f8f6df5da..bac5b4bf37e3 100644
--- a/packages/angular/cli/models/analytics.ts
+++ b/packages/angular/cli/models/analytics.ts
@@ -410,6 +410,11 @@ export async function promptGlobalAnalytics(force = false) {
             ${colors.yellow('ng analytics off')}
       `);
       console.log('');
+    } else {
+      // Send back a ping with the user `optout`. This is the only thing we send.
+      const ua = new UniversalAnalytics(AnalyticsProperties.AngularCliDefault, 'optout');
+      ua.pageview('/telemetry/optout');
+      await ua.flush();
     }
 
     return true;
@@ -459,6 +464,11 @@ export async function promptProjectAnalytics(force = false): Promise<boolean> {
             ${colors.yellow('ng analytics project off')}
       `);
       console.log('');
+    } else {
+      // Send back a ping with the user `optout`. This is the only thing we send.
+      const ua = new UniversalAnalytics(AnalyticsProperties.AngularCliDefault, 'optout');
+      ua.pageview('/telemetry/project/optout');
+      await ua.flush();
     }
 
     return true;

From f9f6b8073a77183038f5f56c1c1e9a1eaa089a30 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 26 Jun 2019 17:24:36 +0000
Subject: [PATCH 1542/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 9497e1148bcf..d1c8d60c265c 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#3869273bb4e82fbac766d38350b3c9d31b2d0b0c",
-    "@angular/common": "github:angular/common-builds#875fa651cf9d7f7ce609cff6f6ac10bf4543db17",
-    "@angular/compiler": "github:angular/compiler-builds#f995b1f58d05a0dfda93bfb430f52fa0b8c692f2",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#ab5d02541a65947818fa819b3cd34e88c9d8226c",
-    "@angular/core": "github:angular/core-builds#2aea9245788dee2258fc4f9595411fb38a41ce24",
-    "@angular/forms": "github:angular/forms-builds#0cd029a2fdc8a32c00c749fca39ed1a85c7a3b66",
-    "@angular/language-service": "github:angular/language-service-builds#c6ce83a54eff35e2cc2b0b0e379d772994e702d1",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#fd9dcb22f5d76df96d87dcea34090b7168210741",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#9e7f5d17f7cc4ca99d24db75e56f7188b80d3071",
-    "@angular/router": "github:angular/router-builds#fee844f75d67c069fbfbbc31c15aa4596dd6868d"
+    "@angular/animations": "github:angular/animations-builds#a40f3e28bf5ef8cc2e2e4d86055227673a5ff978",
+    "@angular/common": "github:angular/common-builds#2658186ad80a78f51ffbad5b1d32184c07751998",
+    "@angular/compiler": "github:angular/compiler-builds#1066029fc1c6e5a8301f2a5f7d778eb4f2f77087",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#eb492be8c22ac71780a604b59fa088725414ab90",
+    "@angular/core": "github:angular/core-builds#124efff2e454da49435afadc6c316a037854a792",
+    "@angular/forms": "github:angular/forms-builds#f4273358b89cde7462c743a28ce811185b6372cc",
+    "@angular/language-service": "github:angular/language-service-builds#79c60b364143be5bb3aab06db40c9eec83e4bb81",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#29b8ece1aa40097c563335f86cafe0892b10e4fb",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#1c34a279ca0f1022fb495608ea0f969922bb8c2b",
+    "@angular/router": "github:angular/router-builds#8793ac29b5402162b9145d7342125b4ea906cc06"
   }
 }
\ No newline at end of file

From 3e5e2574c759f66f1ba5aae92c685b2f6bd6b698 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 26 Jun 2019 06:39:45 +0000
Subject: [PATCH 1543/1703] build: update caniuse-lite to version 1.0.30000978

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 7332473a3b2a..e37f030c6302 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -15,7 +15,7 @@
     "ajv": "6.10.0",
     "autoprefixer": "9.6.0",
     "browserslist": "4.6.3",
-    "caniuse-lite": "1.0.30000977",
+    "caniuse-lite": "1.0.30000978",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.3",
diff --git a/yarn.lock b/yarn.lock
index 9d8d8534429f..3f2e1d058b30 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1900,10 +1900,10 @@ camelcase@^5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@1.0.30000977:
-  version "1.0.30000977"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000977.tgz#7da2ca14cae2fddb368c05c57ab4a529afd658ff"
-  integrity sha512-RTXL32vdfAc2g9aoDL6vnBzbOO/3sM+T+YX4m7W9iFZnl3qIz7WYoZZpcZpALud8xq4+N56rnruX/NQy9HQu6A==
+caniuse-lite@1.0.30000978:
+  version "1.0.30000978"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000978.tgz#1e3346c27fc46bce9ac1ccd77863153a263dde56"
+  integrity sha512-H6gK6kxUzG6oAwg/Jal279z8pHw0BzrpZfwo/CA9FFm/vA0l8IhDfkZtepyJNE2Y4V6Dp3P3ubz6czby1/Mgsw==
 
 caniuse-lite@^1.0.30000898:
   version "1.0.30000903"

From 46ade49a2f9182466f7db48891e917370a8bc49b Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 26 Jun 2019 13:14:10 -0700
Subject: [PATCH 1544/1703] feat(@angular/cli): report RAM in gigabytes instead
 of megabytes

Otherwise its too much noise. Some people have weird MB count probably due to
containers and VMs.
---
 docs/design/analytics.md                            | 2 +-
 etc/api/angular_devkit/core/src/_golden-api.d.ts    | 2 +-
 packages/angular/cli/models/analytics.ts            | 8 ++++----
 packages/angular_devkit/core/src/analytics/index.ts | 5 ++---
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/docs/design/analytics.md b/docs/design/analytics.md
index 932f9f4ee756..dca7e0039cd2 100644
--- a/docs/design/analytics.md
+++ b/docs/design/analytics.md
@@ -43,7 +43,7 @@ Note: There's a limit of 20 custom dimensions.
 |:---:|:---|:---|
 | 1 | `CPU Count` | `number` |
 | 2 | `CPU Speed` | `number` |
-| 3 | `RAM (In MB)` | `number` |
+| 3 | `RAM (In GB)` | `number` |
 | 4 | `Node Version` | `number` |
 | 5 | `Flag: --style` | `string` |
 | 6 | `--collection` | `string` |
diff --git a/etc/api/angular_devkit/core/src/_golden-api.d.ts b/etc/api/angular_devkit/core/src/_golden-api.d.ts
index 9ed0852e8304..cc667472dce2 100644
--- a/etc/api/angular_devkit/core/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/core/src/_golden-api.d.ts
@@ -614,7 +614,7 @@ export declare class MultiAnalytics implements Analytics {
 export declare enum NgCliAnalyticsDimensions {
     CpuCount = 1,
     CpuSpeed = 2,
-    RamInMegabytes = 3,
+    RamInGigabytes = 3,
     NodeVersion = 4,
     NgAddCollection = 6,
     NgBuildBuildEventLog = 7,
diff --git a/packages/angular/cli/models/analytics.ts b/packages/angular/cli/models/analytics.ts
index bac5b4bf37e3..871fca5d9ab7 100644
--- a/packages/angular/cli/models/analytics.ts
+++ b/packages/angular/cli/models/analytics.ts
@@ -20,7 +20,7 @@ import { isTTY } from '../utilities/tty';
 const analyticsDebug = debug('ng:analytics'); // Generate analytics, including settings and users.
 const analyticsLogDebug = debug('ng:analytics:log'); // Actual logs of events.
 
-const BYTES_PER_MEGABYTES = 1024 * 1024;
+const BYTES_PER_GIGABYTES = 1024 * 1024 * 1024;
 
 let _defaultAngularCliPropertyCache: string;
 export const AnalyticsProperties = {
@@ -129,8 +129,8 @@ function _getCpuSpeed() {
  * @private
  */
 function _getRamSize() {
-  // Report in megabytes. Otherwise it's too much noise.
-  return Math.floor(os.totalmem() / BYTES_PER_MEGABYTES);
+  // Report in gigabytes (or closest). Otherwise it's too much noise.
+  return Math.round(os.totalmem() / BYTES_PER_GIGABYTES);
 }
 
 /**
@@ -287,7 +287,7 @@ export class UniversalAnalytics implements analytics.Analytics {
     // We set custom metrics for values we care about.
     this._dimensions[analytics.NgCliAnalyticsDimensions.CpuCount] = _getCpuCount();
     this._dimensions[analytics.NgCliAnalyticsDimensions.CpuSpeed] = _getCpuSpeed();
-    this._dimensions[analytics.NgCliAnalyticsDimensions.RamInMegabytes] = _getRamSize();
+    this._dimensions[analytics.NgCliAnalyticsDimensions.RamInGigabytes] = _getRamSize();
     this._dimensions[analytics.NgCliAnalyticsDimensions.NodeVersion] = _getNumericNodeVersion();
   }
 
diff --git a/packages/angular_devkit/core/src/analytics/index.ts b/packages/angular_devkit/core/src/analytics/index.ts
index 66970294b9c5..e84d8f597977 100644
--- a/packages/angular_devkit/core/src/analytics/index.ts
+++ b/packages/angular_devkit/core/src/analytics/index.ts
@@ -11,7 +11,6 @@ export * from './logging';
 export * from './multi';
 export * from './noop';
 
-
 /**
  * MAKE SURE TO KEEP THIS IN SYNC WITH THE TABLE AND CONTENT IN `/docs/design/analytics.md`.
  * WE LIST THOSE DIMENSIONS (AND MORE).
@@ -23,7 +22,7 @@ export * from './noop';
 export enum NgCliAnalyticsDimensions {
   CpuCount = 1,
   CpuSpeed = 2,
-  RamInMegabytes = 3,
+  RamInGigabytes = 3,
   NodeVersion = 4,
   NgAddCollection = 6,
   NgBuildBuildEventLog = 7,
@@ -53,7 +52,7 @@ export enum NgCliAnalyticsMetrics {
 export const NgCliAnalyticsDimensionsFlagInfo: { [name: string]: [string, string] } = {
   CpuCount: ['CPU Count', 'number'],
   CpuSpeed: ['CPU Speed', 'number'],
-  RamInMegabytes: ['RAM (In MB)', 'number'],
+  RamInGigabytes: ['RAM (In GB)', 'number'],
   NodeVersion: ['Node Version', 'number'],
   NgAddCollection: ['--collection', 'string'],
   NgBuildBuildEventLog: ['--buildEventLog', 'boolean'],

From 3e95474d1fc1afacda97307fccc27fb950739408 Mon Sep 17 00:00:00 2001
From: cexbrayat <cedric@ninja-squad.com>
Date: Thu, 27 Jun 2019 16:50:16 +0200
Subject: [PATCH 1545/1703] feat(@angular/cli): ng doc uses angular core
 version by default

Follow-up to #14788 that allowed `ng doc --version 6`.
This commit enhances the doc command to use the current Angular version of the project by default, if no version is provided explicitely.

Fixes #12365
---
 packages/angular/cli/commands/doc-impl.ts | 10 +++++++++-
 packages/angular/cli/commands/doc.json    |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/angular/cli/commands/doc-impl.ts b/packages/angular/cli/commands/doc-impl.ts
index 5f258bab424c..2330f9c10005 100644
--- a/packages/angular/cli/commands/doc-impl.ts
+++ b/packages/angular/cli/commands/doc-impl.ts
@@ -26,7 +26,7 @@ export class DocCommand extends Command<DocCommandSchema> {
       // version can either be a string containing "next"
       if (options.version == 'next') {
         domain = 'next.angular.io';
-      // or a number where version must be a valid Angular version (i.e. not 0, 1 or 3)
+        // or a number where version must be a valid Angular version (i.e. not 0, 1 or 3)
       } else if (!isNaN(+options.version) && ![0, 1, 3].includes(+options.version)) {
         domain = `v${options.version}.angular.io`;
       } else {
@@ -34,6 +34,14 @@ export class DocCommand extends Command<DocCommandSchema> {
 
         return 0;
       }
+    } else {
+      // we try to get the current Angular version of the project
+      // and use it if we can find it
+      try {
+        /* tslint:disable-next-line:no-implicit-dependencies */
+        const currentNgVersion = require('@angular/core').VERSION.major;
+        domain = `v${currentNgVersion}.angular.io`;
+      } catch (e) {}
     }
 
     let searchUrl = `https://${domain}/api?query=${options.keyword}`;
diff --git a/packages/angular/cli/commands/doc.json b/packages/angular/cli/commands/doc.json
index 68158583452b..b43f448d03cb 100644
--- a/packages/angular/cli/commands/doc.json
+++ b/packages/angular/cli/commands/doc.json
@@ -36,7 +36,7 @@
               "enum": [2, "next"]
             }
           ],
-          "description": "Contains the version of Angular to use for the documentation."
+          "description": "Contains the version of Angular to use for the documentation. If not provided, the command uses your current Angular core version."
         }
       },
       "required": [

From 1cf3ebf329a94d3de9ee0407cb99ffe0ef8ab22e Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 27 Jun 2019 05:25:09 +0000
Subject: [PATCH 1546/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index d1c8d60c265c..6e76013403a0 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#a40f3e28bf5ef8cc2e2e4d86055227673a5ff978",
-    "@angular/common": "github:angular/common-builds#2658186ad80a78f51ffbad5b1d32184c07751998",
-    "@angular/compiler": "github:angular/compiler-builds#1066029fc1c6e5a8301f2a5f7d778eb4f2f77087",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#eb492be8c22ac71780a604b59fa088725414ab90",
-    "@angular/core": "github:angular/core-builds#124efff2e454da49435afadc6c316a037854a792",
-    "@angular/forms": "github:angular/forms-builds#f4273358b89cde7462c743a28ce811185b6372cc",
-    "@angular/language-service": "github:angular/language-service-builds#79c60b364143be5bb3aab06db40c9eec83e4bb81",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#29b8ece1aa40097c563335f86cafe0892b10e4fb",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#1c34a279ca0f1022fb495608ea0f969922bb8c2b",
-    "@angular/router": "github:angular/router-builds#8793ac29b5402162b9145d7342125b4ea906cc06"
+    "@angular/animations": "github:angular/animations-builds#58e95052aa1cb2b74abe14596ea2403ec71e6860",
+    "@angular/common": "github:angular/common-builds#3c64d96e19b8b38ce150fce268c9f4c7282789ad",
+    "@angular/compiler": "github:angular/compiler-builds#0298c425de7b034afa2189266eee0b6b7afcc474",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#fced6a25606f7f5d42ca2c378308b4d2dbdbb385",
+    "@angular/core": "github:angular/core-builds#7a0739bbd145d81ef391b12532b7d2533823c572",
+    "@angular/forms": "github:angular/forms-builds#fcbd8afc80d7f1605f1b14cdf10393e4e529e4ce",
+    "@angular/language-service": "github:angular/language-service-builds#323f589c8a2b3882638916363f0bbfa56cb2b78d",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#ba201bf950c595fc2bd5a593b1505b1c43875b68",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#b88046531f0f64b9f1d736253ef602e698d80de4",
+    "@angular/router": "github:angular/router-builds#4d09d1f0545ac960e10fa1f934d714c61110bb26"
   }
 }
\ No newline at end of file

From 8886c82552fbc99d44dcd2f07bd9e16f8c7d4d97 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 27 Jun 2019 06:19:33 +0000
Subject: [PATCH 1547/1703] build: update read-package-tree to version 5.3.0

---
 packages/angular/cli/package.json |  2 +-
 yarn.lock                         | 91 ++++++++++++++++++++++++++++---
 2 files changed, 84 insertions(+), 9 deletions(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index f3b8b191a9e3..f62ea002709f 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -38,7 +38,7 @@
     "npm-package-arg": "6.1.0",
     "open": "6.3.0",
     "pacote": "9.5.1",
-    "read-package-tree": "5.2.2",
+    "read-package-tree": "5.3.0",
     "semver": "6.1.2",
     "symbol-observable": "1.2.0",
     "universal-analytics": "^0.4.20",
diff --git a/yarn.lock b/yarn.lock
index 3f2e1d058b30..8685e17e0acb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3002,6 +3002,13 @@ defer-to-connect@^1.0.1:
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.0.1.tgz#41ec1dd670dc4c6dcbe7e54c9e44d784d025fe63"
   integrity sha512-2e0FJesseUqQj671gvZWfUyxpnFx/5n4xleamlpCD3U6Fm5dh5qzmmLNxNhtmHF06+SYVHH8QU6FACffYTnj0Q==
 
+define-properties@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+  dependencies:
+    object-keys "^1.0.12"
+
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
@@ -3392,6 +3399,27 @@ error-ex@^1.2.0, error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
+es-abstract@^1.5.1:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
+  integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
+  dependencies:
+    es-to-primitive "^1.2.0"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    is-callable "^1.1.4"
+    is-regex "^1.0.4"
+    object-keys "^1.0.12"
+
+es-to-primitive@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
+  integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
+  dependencies:
+    is-callable "^1.1.4"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.2"
+
 es6-promise@^4.0.3:
   version "4.2.5"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
@@ -4491,6 +4519,11 @@ has-flag@^3.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
+has-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
+  integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
+
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -4527,7 +4560,7 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has@^1.0.1:
+has@^1.0.1, has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
   integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
@@ -4963,6 +4996,11 @@ is-builtin-module@^1.0.0:
   dependencies:
     builtin-modules "^1.0.0"
 
+is-callable@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
+  integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
+
 is-ci@^1.0.10:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
@@ -4991,6 +5029,11 @@ is-data-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
+is-date-object@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+  integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
+
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
@@ -5207,6 +5250,13 @@ is-redirect@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
   integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=
 
+is-regex@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+  integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
+  dependencies:
+    has "^1.0.1"
+
 is-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
@@ -5227,6 +5277,13 @@ is-subset@^0.1.1:
   resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
   integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=
 
+is-symbol@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
+  integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==
+  dependencies:
+    has-symbols "^1.0.0"
+
 is-text-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
@@ -7027,6 +7084,11 @@ object-inspect@~1.4.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4"
   integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==
 
+object-keys@^1.0.12:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+
 object-keys@^1.0.6:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
@@ -7039,6 +7101,14 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
+object.getownpropertydescriptors@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
+  integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.5.1"
+
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
@@ -8113,16 +8183,14 @@ read-package-json@^2.0.0:
   optionalDependencies:
     graceful-fs "^4.1.2"
 
-read-package-tree@5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.2.2.tgz#4b6a0ef2d943c1ea36a578214c9a7f6b7424f7a8"
-  integrity sha512-rW3XWUUkhdKmN2JKB4FL563YAgtINifso5KShykufR03nJ5loGFlkUMe1g/yxmqX073SoYYTsgXu7XdDinKZuA==
+read-package-tree@5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.3.0.tgz#4f95472e45e7145fb77f4069d12844b139f5ea12"
+  integrity sha512-Gi64+EWmi4515E1rPR77ae/Ip8cjFQTlsWytSYJj974U0tSnxm67pyXltbDjB1lvLw4dc85HbtidGL1K2c/oxw==
   dependencies:
-    debuglog "^1.0.1"
-    dezalgo "^1.0.0"
-    once "^1.3.0"
     read-package-json "^2.0.0"
     readdir-scoped-modules "^1.0.0"
+    util-promisify "^2.1.0"
 
 read-pkg-up@^1.0.1:
   version "1.0.1"
@@ -10280,6 +10348,13 @@ util-extend@^1.0.1:
   resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f"
   integrity sha1-p8IW0mdUUWljeztu3GypEZ4v+T8=
 
+util-promisify@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/util-promisify/-/util-promisify-2.1.0.tgz#3c2236476c4d32c5ff3c47002add7c13b9a82a53"
+  integrity sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=
+  dependencies:
+    object.getownpropertydescriptors "^2.0.3"
+
 util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"

From b02dba5925ac93f14ad361ef710037f6d8080e9f Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 27 Jun 2019 06:19:48 +0000
Subject: [PATCH 1548/1703] build: update sass to version 1.22.1

---
 .../angular_devkit/build_angular/package.json |   2 +-
 yarn.lock                                     | 101 +++++++++++++++++-
 2 files changed, 97 insertions(+), 6 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index e37f030c6302..e580b6ac5dc7 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -37,7 +37,7 @@
     "postcss-loader": "3.0.0",
     "raw-loader": "1.0.0",
     "rxjs": "6.4.0",
-    "sass": "1.22.0",
+    "sass": "1.22.1",
     "sass-loader": "7.1.0",
     "semver": "6.1.2",
     "source-map-support": "0.5.12",
diff --git a/yarn.lock b/yarn.lock
index 8685e17e0acb..b1850e9606cc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1067,6 +1067,14 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
+anymatch@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.0.2.tgz#ddb3a8495d44875423af7b919aace11e91732a41"
+  integrity sha512-rUe9SxpRQlVg4EM8It7JMNWWYHAirTPpbTuvaSKybb5IejNgWB3PGBBX9rrPKDx2pM/p3Wh+7+ASaWRyyAbxmQ==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
 app-root-path@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.1.0.tgz#98bf6599327ecea199309866e8140368fd2e646a"
@@ -1242,6 +1250,11 @@ async-each@^1.0.1:
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.2.tgz#8b8a7ca2a658f927e9f307d6d1a42f4199f0f735"
   integrity sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg==
 
+async-each@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
+  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
+
 async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
@@ -1462,6 +1475,11 @@ binary-extensions@^1.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
   integrity sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=
 
+binary-extensions@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
+  integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==
+
 blob@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
@@ -1584,6 +1602,13 @@ braces@^2.3.0, braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
+braces@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
 brfs@^1.4.0:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.6.1.tgz#b78ce2336d818e25eea04a0947cba6d4fb8849c3"
@@ -1974,6 +1999,22 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
+"chokidar@>=2.0.0 <4.0.0":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.0.1.tgz#98fe9aa476c55d9aea7841d6325ffdb30e95b40c"
+  integrity sha512-2ww34sJWehnbpV0Q4k4V5Hh7juo7po6z7LUWkcIQnSGN1lHOL8GGtLtfwabKvLFQw/hbSUQ0u6V7OgGYgBzlkQ==
+  dependencies:
+    anymatch "^3.0.1"
+    async-each "^1.0.3"
+    braces "^3.0.2"
+    glob-parent "^5.0.0"
+    is-binary-path "^2.1.0"
+    is-glob "^4.0.1"
+    normalize-path "^3.0.0"
+    readdirp "^3.0.2"
+  optionalDependencies:
+    fsevents "^2.0.6"
+
 chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
@@ -3909,6 +3950,13 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
 finalhandler@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
@@ -4145,6 +4193,11 @@ fsevents@^1.2.7:
     nan "^2.9.2"
     node-pre-gyp "^0.10.0"
 
+fsevents@^2.0.6:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.0.7.tgz#382c9b443c6cbac4c57187cdda23aa3bf1ccfc2a"
+  integrity sha512-a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ==
+
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -4313,6 +4366,13 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
+glob-parent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.0.0.tgz#1dc99f0f39b006d3e92c2c284068382f0c20e954"
+  integrity sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==
+  dependencies:
+    is-glob "^4.0.1"
+
 glob@7.0.x:
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
@@ -4984,6 +5044,13 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
+is-binary-path@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
@@ -5175,6 +5242,11 @@ is-number@^4.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
   integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
 is-obj@^1.0.0, is-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
@@ -7627,6 +7699,11 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
+picomatch@^2.0.4:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.7.tgz#514169d8c7cd0bdbeecc8a2609e34a7163de69f6"
+  integrity sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==
+
 pidtree@0.3.0, pidtree@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.0.tgz#f6fada10fccc9f99bf50e90d0b23d72c9ebc2e6b"
@@ -8314,6 +8391,13 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
+readdirp@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.0.2.tgz#cba63348e9e42fc1bd334b1d2ef895b6a043cbd6"
+  integrity sha512-LbyJYv48eywrhOlScq16H/VkCiGKGPC2TpOdZCJ7QXnYEjn3NN/Oblh8QEU3vqfSRBB7OGvh5x45NKiVeNujIQ==
+  dependencies:
+    picomatch "^2.0.4"
+
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
@@ -8700,12 +8784,12 @@ sass-loader@7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
-sass@1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.22.0.tgz#70fcfa86d78450d98a54c7459d3f2c93d7abf30b"
-  integrity sha512-6BEkdLYPP26cKggrMuBjMWpguMFgeayW+35LGnzXqCipm86fUboSVAdRLFKRpk1ClMNzFZums6kKkjgWF00WoA==
+sass@1.22.1:
+  version "1.22.1"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.22.1.tgz#9dc3cb2ea37d12fec94ef5c0e1112055f23e5bc8"
+  integrity sha512-VsWrNdfIzCLbD2TO2bq9tCaUzEE0UUSGtP3r9IhHi8ypAPCb3FOVP99kMRil+ZROEcTnKReZcQP9vk6ArV2eLw==
   dependencies:
-    chokidar "^2.0.0"
+    chokidar ">=2.0.0 <4.0.0"
 
 sass@^1.17.3:
   version "1.17.3"
@@ -9970,6 +10054,13 @@ to-regex-range@^2.1.0:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
 
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"

From 814b3c586caffb50a2c4bca8afc2aa46200e4b43 Mon Sep 17 00:00:00 2001
From: Minko Gechev <mgechev@gmail.com>
Date: Wed, 26 Jun 2019 17:42:30 -0700
Subject: [PATCH 1549/1703] fix(@schematics/angular): set proper severity of
 the tslint deprecation rule

---
 .../schematics/angular/workspace/files/tslint.json.template   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/workspace/files/tslint.json.template b/packages/schematics/angular/workspace/files/tslint.json.template
index 62a9cc5f0cac..9c729f991da5 100644
--- a/packages/schematics/angular/workspace/files/tslint.json.template
+++ b/packages/schematics/angular/workspace/files/tslint.json.template
@@ -7,7 +7,7 @@
     "array-type": false,
     "arrow-parens": false,
     "deprecation": {
-      "severity": "warn"
+      "severity": "warning"
     },
     "import-blacklist": [
       true,
@@ -77,4 +77,4 @@
     "use-lifecycle-interface": true,
     "use-pipe-transform-interface": true
   }
-}
\ No newline at end of file
+}

From 4bfa4e0c06ddeee9c2c5c2be452f1f5d15796e6b Mon Sep 17 00:00:00 2001
From: Suguru Inatomi <suguru.inatomi@gmail.com>
Date: Thu, 27 Jun 2019 14:03:57 +0900
Subject: [PATCH 1550/1703] fix(@angular-devkit/build-angular): add
 Symbol.iterator polyfill for legacy browsers

---
 .../build_angular/src/angular-cli-files/models/es5-polyfills.js  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/es5-polyfills.js b/packages/angular_devkit/build_angular/src/angular-cli-files/models/es5-polyfills.js
index e0f9b333efa6..9c63707754c4 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/es5-polyfills.js
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/es5-polyfills.js
@@ -8,6 +8,7 @@
 
 // ES2015 symbol capabilities
 import 'core-js/modules/es.symbol';
+import 'core-js/modules/es.symbol.iterator';
 
 // ES2015 function capabilities
 import 'core-js/modules/es.function.bind';

From 70a4cbe306e50af56e9c41a1b788991abb85687b Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Thu, 27 Jun 2019 08:01:45 +0200
Subject: [PATCH 1551/1703] style: enable `no-debugger` and `no-console` tslint
 rules

---
 packages/angular/cli/commands/add-impl.ts     |   4 +-
 packages/angular/cli/lib/cli/index.ts         |   2 +
 packages/angular/cli/lib/init.ts              |   1 +
 packages/angular/cli/models/analytics.ts      |   1 +
 .../architect_cli/bin/architect.ts            | 146 ++++++++----------
 .../src/build-optimizer/cli.ts                |   4 +-
 .../src/build-optimizer/rollup-plugin.ts      |  20 ++-
 packages/ngtools/webpack/src/benchmark.ts     |   2 +-
 packages/ngtools/webpack/src/compiler_host.ts |  99 ++++++------
 .../schematics/angular/utility/ast-utils.ts   |   1 +
 scripts/benchmark.ts                          |  28 ++--
 scripts/changelog.ts                          |  76 ++++-----
 scripts/lint.ts                               |   5 +-
 scripts/publish-docs.ts                       |   2 +-
 scripts/test.ts                               | 114 +++++++-------
 tslint.json                                   |   2 +
 16 files changed, 262 insertions(+), 245 deletions(-)

diff --git a/packages/angular/cli/commands/add-impl.ts b/packages/angular/cli/commands/add-impl.ts
index 2e47e52ef3df..adcbdc6af316 100644
--- a/packages/angular/cli/commands/add-impl.ts
+++ b/packages/angular/cli/commands/add-impl.ts
@@ -122,7 +122,9 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
         collectionName = manifest.name;
 
         if (await this.hasMismatchedPeer(manifest)) {
-          console.warn('Package has unmet peer dependencies. Adding the package may not succeed.');
+          this.logger.warn(
+            'Package has unmet peer dependencies. Adding the package may not succeed.',
+          );
         }
       } catch (e) {
         this.logger.error('Unable to fetch package manifest: ' + e.message);
diff --git a/packages/angular/cli/lib/cli/index.ts b/packages/angular/cli/lib/cli/index.ts
index da9c92906c36..a517447cd92d 100644
--- a/packages/angular/cli/lib/cli/index.ts
+++ b/packages/angular/cli/lib/cli/index.ts
@@ -13,6 +13,7 @@ import { colors, supportsColor } from '../../utilities/color';
 import { getWorkspaceRaw } from '../../utilities/config';
 import { getWorkspaceDetails } from '../../utilities/project';
 
+// tslint:disable: no-console
 export default async function(options: { testing?: boolean; cliArgs: string[] }) {
   const logger = createConsoleLogger(false, process.stdout, process.stderr, {
     info: s => (supportsColor ? s : colors.unstyle(s)),
@@ -95,6 +96,7 @@ export default async function(options: { testing?: boolean; cliArgs: string[] })
     }
 
     if (options.testing) {
+      // tslint:disable-next-line: no-debugger
       debugger;
       throw err;
     }
diff --git a/packages/angular/cli/lib/init.ts b/packages/angular/cli/lib/init.ts
index b48e467328fa..c1d3d71aa3c2 100644
--- a/packages/angular/cli/lib/init.ts
+++ b/packages/angular/cli/lib/init.ts
@@ -7,6 +7,7 @@
  */
 import 'symbol-observable';
 // symbol polyfill must go first
+// tslint:disable: no-console
 // tslint:disable-next-line:ordered-imports import-groups
 import { tags } from '@angular-devkit/core';
 import * as fs from 'fs';
diff --git a/packages/angular/cli/models/analytics.ts b/packages/angular/cli/models/analytics.ts
index 871fca5d9ab7..ae4bc8b65cdc 100644
--- a/packages/angular/cli/models/analytics.ts
+++ b/packages/angular/cli/models/analytics.ts
@@ -17,6 +17,7 @@ import { colors } from '../utilities/color';
 import { getWorkspace, getWorkspaceRaw } from '../utilities/config';
 import { isTTY } from '../utilities/tty';
 
+// tslint:disable: no-console
 const analyticsDebug = debug('ng:analytics'); // Generate analytics, including settings and users.
 const analyticsLogDebug = debug('ng:analytics:log'); // Actual logs of events.
 
diff --git a/packages/angular_devkit/architect_cli/bin/architect.ts b/packages/angular_devkit/architect_cli/bin/architect.ts
index d8eaf6470299..4860a3267187 100644
--- a/packages/angular_devkit/architect_cli/bin/architect.ts
+++ b/packages/angular_devkit/architect_cli/bin/architect.ts
@@ -8,14 +8,7 @@
  */
 import { Architect, BuilderInfo, BuilderProgressState, Target } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
-import {
-  json,
-  logging,
-  schema,
-  tags,
-  terminal,
-  workspaces,
-} from '@angular-devkit/core';
+import { json, logging, schema, tags, terminal, workspaces } from '@angular-devkit/core';
 import { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node';
 import { existsSync } from 'fs';
 import * as minimist from 'minimist';
@@ -23,7 +16,6 @@ import * as path from 'path';
 import { tap } from 'rxjs/operators';
 import { MultiProgressBar } from '../src/progress';
 
-
 function findUp(names: string | string[], from: string) {
   if (!Array.isArray(names)) {
     names = [names];
@@ -64,21 +56,19 @@ function usage(logger: logging.Logger, exitCode = 0): never {
   `);
 
   process.exit(exitCode);
-  throw 0;  // The node typing sometimes don't have a never type for process.exit().
+  throw 0; // The node typing sometimes don't have a never type for process.exit().
 }
 
-function _targetStringFromTarget({project, target, configuration}: Target) {
+function _targetStringFromTarget({ project, target, configuration }: Target) {
   return `${project}:${target}${configuration !== undefined ? ':' + configuration : ''}`;
 }
 
-
 interface BarInfo {
   status?: string;
   builder: BuilderInfo;
   target?: Target;
 }
 
-
 async function _executeTarget(
   parentLogger: logging.Logger,
   workspace: workspaces.WorkspaceDefinition,
@@ -104,63 +94,64 @@ async function _executeTarget(
   const run = await architect.scheduleTarget(targetSpec, argv, { logger });
   const bars = new MultiProgressBar<number, BarInfo>(':name :bar (:current/:total) :status');
 
-  run.progress.subscribe(
-    update => {
-      const data = bars.get(update.id) || {
-        id: update.id,
-        builder: update.builder,
-        target: update.target,
-        status: update.status || '',
-        name: ((update.target ? _targetStringFromTarget(update.target) : update.builder.name)
-                + ' '.repeat(80)
-              ).substr(0, 40),
-      };
-
-      if (update.status !== undefined) {
-        data.status = update.status;
-      }
+  run.progress.subscribe(update => {
+    const data = bars.get(update.id) || {
+      id: update.id,
+      builder: update.builder,
+      target: update.target,
+      status: update.status || '',
+      name: (
+        (update.target ? _targetStringFromTarget(update.target) : update.builder.name) +
+        ' '.repeat(80)
+      ).substr(0, 40),
+    };
+
+    if (update.status !== undefined) {
+      data.status = update.status;
+    }
 
-      switch (update.state) {
-        case BuilderProgressState.Error:
-          data.status = 'Error: ' + update.error;
-          bars.update(update.id, data);
-          break;
-
-        case BuilderProgressState.Stopped:
-          data.status = 'Done.';
-          bars.complete(update.id);
-          bars.update(update.id, data, update.total, update.total);
-          break;
-
-        case BuilderProgressState.Waiting:
-          bars.update(update.id, data);
-          break;
-
-        case BuilderProgressState.Running:
-          bars.update(update.id, data, update.current, update.total);
-          break;
-      }
+    switch (update.state) {
+      case BuilderProgressState.Error:
+        data.status = 'Error: ' + update.error;
+        bars.update(update.id, data);
+        break;
+
+      case BuilderProgressState.Stopped:
+        data.status = 'Done.';
+        bars.complete(update.id);
+        bars.update(update.id, data, update.total, update.total);
+        break;
+
+      case BuilderProgressState.Waiting:
+        bars.update(update.id, data);
+        break;
+
+      case BuilderProgressState.Running:
+        bars.update(update.id, data, update.current, update.total);
+        break;
+    }
 
-      bars.render();
-    },
-  );
+    bars.render();
+  });
 
   // Wait for full completion of the builder.
   try {
-    const { success } = await run.output.pipe(
-      tap(result => {
-        if (result.success) {
-          parentLogger.info(terminal.green('SUCCESS'));
-        } else {
-          parentLogger.info(terminal.yellow('FAILURE'));
-        }
-        parentLogger.info('Result: ' + JSON.stringify({ ...result, info: undefined }, null, 4));
-
-        parentLogger.info('\nLogs:');
-        logs.forEach(l => parentLogger.next(l));
-        logs.splice(0);
-      }),
-    ).toPromise();
+    const { success } = await run.output
+      .pipe(
+        tap(result => {
+          if (result.success) {
+            parentLogger.info(terminal.green('SUCCESS'));
+          } else {
+            parentLogger.info(terminal.yellow('FAILURE'));
+          }
+          parentLogger.info('Result: ' + JSON.stringify({ ...result, info: undefined }, null, 4));
+
+          parentLogger.info('\nLogs:');
+          logs.forEach(l => parentLogger.next(l));
+          logs.splice(0);
+        }),
+      )
+      .toPromise();
 
     await run.stop();
     bars.terminate();
@@ -178,7 +169,6 @@ async function _executeTarget(
   }
 }
 
-
 async function main(args: string[]): Promise<number> {
   /** Parse the command line. */
   const argv = minimist(args, { boolean: ['help'] });
@@ -195,18 +185,15 @@ async function main(args: string[]): Promise<number> {
 
   // Load workspace configuration file.
   const currentPath = process.cwd();
-  const configFileNames = [
-    'angular.json',
-    '.angular.json',
-    'workspace.json',
-    '.workspace.json',
-  ];
+  const configFileNames = ['angular.json', '.angular.json', 'workspace.json', '.workspace.json'];
 
   const configFilePath = findUp(configFileNames, currentPath);
 
   if (!configFilePath) {
-    logger.fatal(`Workspace configuration file (${configFileNames.join(', ')}) cannot be found in `
-      + `'${currentPath}' or in parent directories.`);
+    logger.fatal(
+      `Workspace configuration file (${configFileNames.join(', ')}) cannot be found in ` +
+        `'${currentPath}' or in parent directories.`,
+    );
 
     return 3;
   }
@@ -227,10 +214,13 @@ async function main(args: string[]): Promise<number> {
   return await _executeTarget(logger, workspace, root, argv, registry);
 }
 
-main(process.argv.slice(2))
-  .then(code => {
+main(process.argv.slice(2)).then(
+  code => {
     process.exit(code);
-  }, err => {
+  },
+  err => {
+    // tslint:disable-next-line: no-console
     console.error('Error: ' + err.stack || err.message || err);
     process.exit(-1);
-  });
+  },
+);
diff --git a/packages/angular_devkit/build_optimizer/src/build-optimizer/cli.ts b/packages/angular_devkit/build_optimizer/src/build-optimizer/cli.ts
index 3b669935b4c6..f09f53defddc 100644
--- a/packages/angular_devkit/build_optimizer/src/build-optimizer/cli.ts
+++ b/packages/angular_devkit/build_optimizer/src/build-optimizer/cli.ts
@@ -10,7 +10,7 @@ import { writeFileSync } from 'fs';
 import { join } from 'path';
 import { buildOptimizer } from './build-optimizer';
 
-
+// tslint:disable: no-console
 if (process.argv.length < 3 || process.argv.length > 4) {
   throw new Error(`
     build-optimizer should be called with either one or two arguments:
@@ -30,7 +30,7 @@ if (!inputFile.match(tsOrJsRegExp)) {
 }
 
 // Use provided output file, or add the .bo suffix before the extension.
-const outputFile = process.argv[3] || inputFile.replace(tsOrJsRegExp, (subStr) => `.bo${subStr}`);
+const outputFile = process.argv[3] || inputFile.replace(tsOrJsRegExp, subStr => `.bo${subStr}`);
 
 const boOutput = buildOptimizer({
   inputFilePath: join(currentDir, inputFile),
diff --git a/packages/angular_devkit/build_optimizer/src/build-optimizer/rollup-plugin.ts b/packages/angular_devkit/build_optimizer/src/build-optimizer/rollup-plugin.ts
index 29b85fd7ceb9..cb661c66abbe 100644
--- a/packages/angular_devkit/build_optimizer/src/build-optimizer/rollup-plugin.ts
+++ b/packages/angular_devkit/build_optimizer/src/build-optimizer/rollup-plugin.ts
@@ -31,19 +31,27 @@ export default function optimizer(options: Options) {
 
   return {
     name: 'build-optimizer',
-    transform: (content: string, id: string): {code: string, map: RawSourceMap}|null => {
+    transform: (content: string, id: string): { code: string; map: RawSourceMap } | null => {
       const normalizedId = id.replace(/\\/g, '/');
-      const isSideEffectFree = options.sideEffectFreeModules &&
+      const isSideEffectFree =
+        options.sideEffectFreeModules &&
         options.sideEffectFreeModules.some(m => normalizedId.indexOf(m) >= 0);
-      const isAngularCoreFile = options.angularCoreModules &&
+      const isAngularCoreFile =
+        options.angularCoreModules &&
         options.angularCoreModules.some(m => normalizedId.indexOf(m) >= 0);
       const { content: code, sourceMap: map } = buildOptimizer({
-        content, inputFilePath: id, emitSourceMap: true, isSideEffectFree, isAngularCoreFile,
+        content,
+        inputFilePath: id,
+        emitSourceMap: true,
+        isSideEffectFree,
+        isAngularCoreFile,
       });
       if (!code) {
         if (DEBUG) {
-          console.error('no transforms produced by buildOptimizer for '
-             + path.relative(process.cwd(), id));
+          // tslint:disable-next-line: no-console
+          console.error(
+            'no transforms produced by buildOptimizer for ' + path.relative(process.cwd(), id),
+          );
         }
 
         return null;
diff --git a/packages/ngtools/webpack/src/benchmark.ts b/packages/ngtools/webpack/src/benchmark.ts
index 978dfe01261e..b54f5d39f5fb 100644
--- a/packages/ngtools/webpack/src/benchmark.ts
+++ b/packages/ngtools/webpack/src/benchmark.ts
@@ -9,7 +9,7 @@
 // Use with CLI --no-progress flag for best results.
 // This should be false for commited code.
 const _benchmark = false;
-
+// tslint:disable:no-console
 export function time(label: string) {
   if (_benchmark) {
     console.time(label);
diff --git a/packages/ngtools/webpack/src/compiler_host.ts b/packages/ngtools/webpack/src/compiler_host.ts
index 331d388f9b3c..06b3b78aeca3 100644
--- a/packages/ngtools/webpack/src/compiler_host.ts
+++ b/packages/ngtools/webpack/src/compiler_host.ts
@@ -5,29 +5,19 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import {
-  Path,
-  getSystemPath,
-  isAbsolute,
-  join,
-  normalize,
-  virtualFs,
-} from '@angular-devkit/core';
+import { Path, getSystemPath, isAbsolute, join, normalize, virtualFs } from '@angular-devkit/core';
 import { Stats } from 'fs';
 import * as ts from 'typescript';
 import { NgccProcessor } from './ngcc_processor';
 import { WebpackResourceLoader } from './resource_loader';
 import { workaroundResolve } from './utils';
 
-
 export interface OnErrorFn {
   (message: string): void;
 }
 
-
 const dev = Math.floor(Math.random() * 10000);
 
-
 export class WebpackCompilerHost implements ts.CompilerHost {
   private _syncHost: virtualFs.SyncDelegateHost;
   private _memoryHost: virtualFs.SyncDelegateHost;
@@ -37,13 +27,15 @@ export class WebpackCompilerHost implements ts.CompilerHost {
   private _resourceLoader?: WebpackResourceLoader;
   private _sourceFileCache = new Map<string, ts.SourceFile>();
   private _virtualFileExtensions = [
-    '.js', '.js.map',
-    '.ngfactory.js', '.ngfactory.js.map',
-    '.ngstyle.js', '.ngstyle.js.map',
+    '.js',
+    '.js.map',
+    '.ngfactory.js',
+    '.ngfactory.js.map',
+    '.ngstyle.js',
+    '.ngstyle.js.map',
     '.ngsummary.json',
   ];
 
-
   constructor(
     private _options: ts.CompilerOptions,
     basePath: string,
@@ -58,8 +50,7 @@ export class WebpackCompilerHost implements ts.CompilerHost {
   }
 
   private get virtualFiles(): Path[] {
-    return [...(this._memoryHost.delegate as {} as { _cache: Map<Path, {}> })
-      ._cache.keys()];
+    return [...((this._memoryHost.delegate as {}) as { _cache: Map<Path, {}> })._cache.keys()];
   }
 
   denormalizePath(path: string) {
@@ -84,10 +75,12 @@ export class WebpackCompilerHost implements ts.CompilerHost {
   }
 
   getNgFactoryPaths(): string[] {
-    return this.virtualFiles
-      .filter(fileName => fileName.endsWith('.ngfactory.js') || fileName.endsWith('.ngstyle.js'))
-      // These paths are used by the virtual file system decorator so we must denormalize them.
-      .map(path => this.denormalizePath(path));
+    return (
+      this.virtualFiles
+        .filter(fileName => fileName.endsWith('.ngfactory.js') || fileName.endsWith('.ngstyle.js'))
+        // These paths are used by the virtual file system decorator so we must denormalize them.
+        .map(path => this.denormalizePath(path))
+    );
   }
 
   invalidate(fileName: string): void {
@@ -100,13 +93,15 @@ export class WebpackCompilerHost implements ts.CompilerHost {
       if (exists) {
         this._changedFiles.add(fullPath);
       }
-    } catch { }
+    } catch {}
 
     // File doesn't exist anymore and is not a factory, so we should delete the related
     // virtual files.
-    if (!exists && fullPath.endsWith('.ts') && !(
-      fullPath.endsWith('.ngfactory.ts') || fullPath.endsWith('.shim.ngstyle.ts')
-    )) {
+    if (
+      !exists &&
+      fullPath.endsWith('.ts') &&
+      !(fullPath.endsWith('.ngfactory.ts') || fullPath.endsWith('.shim.ngstyle.ts'))
+    ) {
       this._virtualFileExtensions.forEach(ext => {
         const virtualFile = (fullPath.slice(0, -3) + ext) as Path;
         if (this._memoryHost.exists(virtualFile)) {
@@ -117,8 +112,10 @@ export class WebpackCompilerHost implements ts.CompilerHost {
 
     // In case resolveJsonModule and allowJs we also need to remove virtual emitted files
     // both if they exists or not.
-    if ((fullPath.endsWith('.js') || fullPath.endsWith('.json'))
-      && !/(\.(ngfactory|ngstyle)\.js|ngsummary\.json)$/.test(fullPath)) {
+    if (
+      (fullPath.endsWith('.js') || fullPath.endsWith('.json')) &&
+      !/(\.(ngfactory|ngstyle)\.js|ngsummary\.json)$/.test(fullPath)
+    ) {
       if (this._memoryHost.exists(fullPath)) {
         this._memoryHost.delete(fullPath);
       }
@@ -139,7 +136,7 @@ export class WebpackCompilerHost implements ts.CompilerHost {
     let exists = false;
     try {
       exists = this._syncHost.isFile(p);
-    } catch { }
+    } catch {}
 
     return exists;
   }
@@ -178,11 +175,11 @@ export class WebpackCompilerHost implements ts.CompilerHost {
     return {
       isFile: () => stats.isFile(),
       isDirectory: () => stats.isDirectory(),
-      isBlockDevice: () => stats.isBlockDevice && stats.isBlockDevice() || false,
-      isCharacterDevice: () => stats.isCharacterDevice && stats.isCharacterDevice() || false,
-      isFIFO: () => stats.isFIFO && stats.isFIFO() || false,
-      isSymbolicLink: () => stats.isSymbolicLink && stats.isSymbolicLink() || false,
-      isSocket: () => stats.isSocket && stats.isSocket() || false,
+      isBlockDevice: () => (stats.isBlockDevice && stats.isBlockDevice()) || false,
+      isCharacterDevice: () => (stats.isCharacterDevice && stats.isCharacterDevice()) || false,
+      isFIFO: () => (stats.isFIFO && stats.isFIFO()) || false,
+      isSymbolicLink: () => (stats.isSymbolicLink && stats.isSymbolicLink()) || false,
+      isSocket: () => (stats.isSocket && stats.isSocket()) || false,
       dev: stats.dev === undefined ? dev : stats.dev,
       ino: stats.ino === undefined ? Math.floor(Math.random() * 100000) : stats.ino,
       mode: stats.mode === undefined ? parseInt('777', 8) : stats.mode,
@@ -210,7 +207,7 @@ export class WebpackCompilerHost implements ts.CompilerHost {
     let stats: virtualFs.Stats<Partial<Stats>> | Stats | null = null;
     try {
       stats = this._memoryHost.stat(p) || this._syncHost.stat(p);
-    } catch { }
+    } catch {}
 
     if (!stats) {
       return null;
@@ -344,8 +341,7 @@ export class WebpackCompilerHost implements ts.CompilerHost {
   readResource(fileName: string) {
     this._readResourceFiles.add(fileName);
 
-    if (this.directTemplateLoading &&
-        (fileName.endsWith('.html') || fileName.endsWith('.svg'))) {
+    if (this.directTemplateLoading && (fileName.endsWith('.html') || fileName.endsWith('.svg'))) {
       return this.readFile(fileName);
     }
 
@@ -371,7 +367,7 @@ export class WebpackCompilerHost implements ts.CompilerHost {
         continue;
       }
       for (const resourcePath of this._resourceLoader.getAffectedResources(changedFile)) {
-          modifiedFiles.add(resourcePath);
+        modifiedFiles.add(resourcePath);
       }
     }
 
@@ -379,6 +375,7 @@ export class WebpackCompilerHost implements ts.CompilerHost {
   }
 
   trace(message: string) {
+    // tslint:disable-next-line: no-console
     console.log(message);
   }
 
@@ -407,20 +404,20 @@ export class WebpackCompilerHost implements ts.CompilerHost {
     containingFile: string,
     redirectedReference?: ts.ResolvedProjectReference,
   ): (ts.ResolvedTypeReferenceDirective | undefined)[] {
-      return typeReferenceDirectiveNames.map(moduleName => {
-        const { resolvedTypeReferenceDirective } = ts.resolveTypeReferenceDirective(
-          moduleName,
-          workaroundResolve(containingFile),
-          this._options,
-          this,
-          redirectedReference,
-        );
-
-        if (this._options.enableIvy && resolvedTypeReferenceDirective && this.ngccProcessor) {
-          this.ngccProcessor.processModule(moduleName, resolvedTypeReferenceDirective);
-        }
+    return typeReferenceDirectiveNames.map(moduleName => {
+      const { resolvedTypeReferenceDirective } = ts.resolveTypeReferenceDirective(
+        moduleName,
+        workaroundResolve(containingFile),
+        this._options,
+        this,
+        redirectedReference,
+      );
 
-        return resolvedTypeReferenceDirective;
-      });
+      if (this._options.enableIvy && resolvedTypeReferenceDirective && this.ngccProcessor) {
+        this.ngccProcessor.processModule(moduleName, resolvedTypeReferenceDirective);
+      }
+
+      return resolvedTypeReferenceDirective;
+    });
   }
 }
diff --git a/packages/schematics/angular/utility/ast-utils.ts b/packages/schematics/angular/utility/ast-utils.ts
index 0f9a724153a7..906246e2f860 100644
--- a/packages/schematics/angular/utility/ast-utils.ts
+++ b/packages/schematics/angular/utility/ast-utils.ts
@@ -428,6 +428,7 @@ export function addSymbolToNgModuleMetadata(
   }
 
   if (!node) {
+    // tslint:disable-next-line: no-console
     console.error('No app module found. Please add your new class to your component.');
 
     return [];
diff --git a/scripts/benchmark.ts b/scripts/benchmark.ts
index 822d798f918d..3c3296e55356 100644
--- a/scripts/benchmark.ts
+++ b/scripts/benchmark.ts
@@ -6,13 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 // tslint:disable:no-implicit-dependencies
+// tslint:disable:no-console
 import { tags, terminal } from '@angular-devkit/core';
 import * as glob from 'glob';
 import 'jasmine';
 import { SpecReporter as JasmineSpecReporter } from 'jasmine-spec-reporter';
 import { join, relative } from 'path';
 
-
 const Jasmine = require('jasmine');
 
 const projectBaseDir = join(__dirname, '../packages');
@@ -20,12 +20,10 @@ require('source-map-support').install({
   hookRequire: true,
 });
 
-
 declare const global: {
   benchmarkReporter: {};
 };
 
-
 interface BenchmarkResult {
   count: number;
   slowest: number[];
@@ -36,7 +34,6 @@ interface BenchmarkResult {
   base?: BenchmarkResult;
 }
 
-
 class BenchmarkReporter extends JasmineSpecReporter implements jasmine.CustomReporter {
   private _stats: BenchmarkResult | null;
 
@@ -91,7 +88,8 @@ class BenchmarkReporter extends JasmineSpecReporter implements jasmine.CustomRep
         const baseAverage = pad(Math.floor(stat.base.average));
         const baseAverageMult = pad(precision(stat.average / stat.base.average), multPad);
 
-        console.log(terminal.colors.yellow(tags.indentBy(6)`
+        console.log(
+          terminal.colors.yellow(tags.indentBy(6)`
           count:   ${count}
           fastest: ${fastest}
             (base) ${baseFastest}
@@ -99,15 +97,18 @@ class BenchmarkReporter extends JasmineSpecReporter implements jasmine.CustomRep
             (base) ${baseSlowest}
           mean:    ${mean} (${baseMean}) (${baseMeanMult}x)
           average: ${average} (${baseAverage}) (${baseAverageMult}x)
-        `));
+        `),
+        );
       } else {
-        console.log(terminal.colors.yellow(tags.indentBy(6)`
+        console.log(
+          terminal.colors.yellow(tags.indentBy(6)`
           count:   ${count}
           fastest: ${fastest}
           slowest: ${slowest}
           mean:    ${mean}
           average: ${average}
-        `));
+        `),
+        );
       }
     }
   }
@@ -119,7 +120,6 @@ class BenchmarkReporter extends JasmineSpecReporter implements jasmine.CustomRep
   }
 }
 
-
 // Create a Jasmine runner and configure it.
 const runner = new Jasmine({ projectBaseDir: projectBaseDir });
 
@@ -127,13 +127,11 @@ runner.env.clearReporters();
 global.benchmarkReporter = new BenchmarkReporter();
 runner.env.addReporter(global.benchmarkReporter);
 
-
 // Run the tests.
-const allTests =
-  glob.sync('packages/**/*_benchmark.ts')
-    .map(p => relative(projectBaseDir, p))
-    .filter(p => !/schematics_cli\/schematics\//.test(p));
-
+const allTests = glob
+  .sync('packages/**/*_benchmark.ts')
+  .map(p => relative(projectBaseDir, p))
+  .filter(p => !/schematics_cli\/schematics\//.test(p));
 
 export default function(_args: {}) {
   return new Promise(resolve => {
diff --git a/scripts/changelog.ts b/scripts/changelog.ts
index 303111db38cc..56f4ba1a6fd1 100644
--- a/scripts/changelog.ts
+++ b/scripts/changelog.ts
@@ -5,6 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+// tslint:disable:no-console
 // tslint:disable:no-implicit-dependencies
 import { JsonObject, logging } from '@angular-devkit/core';
 import * as fs from 'fs';
@@ -19,7 +20,6 @@ const gitRawCommits = require('git-raw-commits');
 const ghGot = require('gh-got');
 const through = require('through2');
 
-
 export interface ChangelogOptions {
   from: string;
   to?: string;
@@ -29,18 +29,17 @@ export interface ChangelogOptions {
   stdout?: boolean;
 }
 
-
 export default function(args: ChangelogOptions, logger: logging.Logger) {
   const commits: JsonObject[] = [];
   let toSha: string | null = null;
 
   const githubToken = (
-    args.githubToken
-    || (args.githubTokenFile && fs.readFileSync(args.githubTokenFile, 'utf-8'))
-    || ''
+    args.githubToken ||
+    (args.githubTokenFile && fs.readFileSync(args.githubTokenFile, 'utf-8')) ||
+    ''
   ).trim();
 
-  return new Promise((resolve) => {
+  return new Promise(resolve => {
     (gitRawCommits({
       from: args.from,
       to: args.to || 'HEAD',
@@ -50,36 +49,43 @@ export default function(args: ChangelogOptions, logger: logging.Logger) {
         logger.fatal('An error happened: ' + err.message);
         process.exit(1);
       })
-      .pipe(through((chunk: Buffer, enc: string, callback: Function) => {
-        // Replace github URLs with `@XYZ#123`
-        const commit = chunk.toString('utf-8')
-          .replace(/https?:\/\/github.com\/(.*?)\/issues\/(\d+)/g, '@$1#$2');
-
-        callback(undefined, Buffer.from(commit));
-      }))
-      .pipe(conventionalCommitsParser({
-        headerPattern: /^(\w*)(?:\(([^)]*)\))?: (.*)$/,
-        headerCorrespondence: ['type', 'scope', 'subject'],
-        noteKeywords: ['BREAKING CHANGE'],
-        revertPattern: /^revert:\s([\s\S]*?)\s*This reverts commit (\w*)\./,
-        revertCorrespondence: [`header`, `hash`],
-      }))
-      .pipe(through.obj((chunk: JsonObject, _: string, cb: Function) => {
-        try {
-          const maybeTag = chunk.gitTags && (chunk.gitTags as string).match(/tag: (.*)/);
-          const tags = maybeTag && maybeTag[1].split(/,/g);
-          chunk['tags'] = tags;
-
-          if (tags && tags.find(x => x == args.to)) {
-            toSha = chunk.hash as string;
+      .pipe(
+        through((chunk: Buffer, enc: string, callback: Function) => {
+          // Replace github URLs with `@XYZ#123`
+          const commit = chunk
+            .toString('utf-8')
+            .replace(/https?:\/\/github.com\/(.*?)\/issues\/(\d+)/g, '@$1#$2');
+
+          callback(undefined, Buffer.from(commit));
+        }),
+      )
+      .pipe(
+        conventionalCommitsParser({
+          headerPattern: /^(\w*)(?:\(([^)]*)\))?: (.*)$/,
+          headerCorrespondence: ['type', 'scope', 'subject'],
+          noteKeywords: ['BREAKING CHANGE'],
+          revertPattern: /^revert:\s([\s\S]*?)\s*This reverts commit (\w*)\./,
+          revertCorrespondence: [`header`, `hash`],
+        }),
+      )
+      .pipe(
+        through.obj((chunk: JsonObject, _: string, cb: Function) => {
+          try {
+            const maybeTag = chunk.gitTags && (chunk.gitTags as string).match(/tag: (.*)/);
+            const tags = maybeTag && maybeTag[1].split(/,/g);
+            chunk['tags'] = tags;
+
+            if (tags && tags.find(x => x == args.to)) {
+              toSha = chunk.hash as string;
+            }
+
+            commits.push(chunk);
+            cb();
+          } catch (err) {
+            cb(err);
           }
-
-          commits.push(chunk);
-          cb();
-        } catch (err) {
-          cb(err);
-        }
-      }))
+        }),
+      )
       .on('finish', resolve);
   })
     .then(() => {
diff --git a/scripts/lint.ts b/scripts/lint.ts
index 42a3767394b3..7e22368d4e64 100644
--- a/scripts/lint.ts
+++ b/scripts/lint.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 // tslint:disable:no-implicit-dependencies
+// tslint:disable:no-console
 import { logging } from '@angular-devkit/core';
 import { ParsedArgs } from 'minimist';
 import * as path from 'path';
@@ -16,7 +17,6 @@ import * as ts from 'typescript';
 // TODO: when moved to using bazel for the build system, this won't be needed.
 const excluded = [/^dist-schema[\\\/].*/, /.*\/third_party\/.*/];
 
-
 function _buildRules(logger: logging.Logger) {
   const tsConfigPath = path.join(__dirname, '../etc/rules/tsconfig.json');
   const configFile = ts.readConfigFile(tsConfigPath, ts.sys.readFile);
@@ -40,8 +40,7 @@ function _buildRules(logger: logging.Logger) {
   }
 }
 
-
-export default async function (options: ParsedArgs, logger: logging.Logger) {
+export default async function(options: ParsedArgs, logger: logging.Logger) {
   _buildRules(logger);
 
   const lintOptions: ILinterOptions = {
diff --git a/scripts/publish-docs.ts b/scripts/publish-docs.ts
index 4e7baf776657..4dbd5ca455af 100644
--- a/scripts/publish-docs.ts
+++ b/scripts/publish-docs.ts
@@ -5,6 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+// tslint:disable: no-console
 import { exec } from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -56,7 +57,6 @@ function listAllFiles(directory: string) {
   return list;
 }
 
-
 export default async function() {
   console.log(`Documentation Path: ${docsRoot}`);
   console.log(`Wiki path: ${outputPath}`);
diff --git a/scripts/test.ts b/scripts/test.ts
index 13df4f0db3a4..1776875d6067 100644
--- a/scripts/test.ts
+++ b/scripts/test.ts
@@ -5,6 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+// tslint:disable:no-console
 // tslint:disable:no-implicit-dependencies
 import { logging } from '@angular-devkit/core';
 import { spawnSync } from 'child_process';
@@ -26,18 +27,16 @@ require('source-map-support').install({
   hookRequire: true,
 });
 
-
 interface CoverageLocation {
   start: Position;
   end: Position;
 }
 
-type CoverageType = any;  // tslint:disable-line:no-any
+type CoverageType = any; // tslint:disable-line:no-any
 declare const global: {
   __coverage__: CoverageType;
 };
 
-
 function _exec(command: string, args: string[], opts: { cwd?: string }, logger: logging.Logger) {
   const { status, error, stdout } = spawnSync(command, args, {
     stdio: ['ignore', 'pipe', 'inherit'],
@@ -52,13 +51,11 @@ function _exec(command: string, args: string[], opts: { cwd?: string }, logger:
   return stdout.toString('utf-8');
 }
 
-
 // Add the Istanbul (not Constantinople) reporter.
 const istanbulCollector = new Istanbul.Collector({});
 const istanbulReporter = new Istanbul.Reporter(undefined, 'coverage/');
 istanbulReporter.addAll(['json', 'lcov']);
 
-
 class IstanbulReporter implements jasmine.CustomReporter {
   // Update a location object from a SourceMap. Will ignore the location if the sourcemap does
   // not have a valid mapping.
@@ -126,48 +123,48 @@ class IstanbulReporter implements jasmine.CustomReporter {
   }
 }
 
-
 // Create a Jasmine runner and configure it.
 const runner = new Jasmine({ projectBaseDir: projectBaseDir });
 
 if (process.argv.indexOf('--spec-reporter') != -1) {
   runner.env.clearReporters();
-  runner.env.addReporter(new JasmineSpecReporter({
-    stacktrace: {
-      // Filter all JavaScript files that appear after a TypeScript file (callers) from the stack
-      // trace.
-      filter: (x: string) => {
-        return x.substr(0, x.indexOf('\n', x.indexOf('\n', x.lastIndexOf('.ts:')) + 1));
+  runner.env.addReporter(
+    new JasmineSpecReporter({
+      stacktrace: {
+        // Filter all JavaScript files that appear after a TypeScript file (callers) from the stack
+        // trace.
+        filter: (x: string) => {
+          return x.substr(0, x.indexOf('\n', x.indexOf('\n', x.lastIndexOf('.ts:')) + 1));
+        },
       },
-    },
-    spec: {
-      displayDuration: true,
-    },
-    suite: {
-      displayNumber: true,
-    },
-    summary: {
-      displayStacktrace: true,
-      displayErrorMessages: true,
-      displayDuration: true,
-    },
-  }));
+      spec: {
+        displayDuration: true,
+      },
+      suite: {
+        displayNumber: true,
+      },
+      summary: {
+        displayStacktrace: true,
+        displayErrorMessages: true,
+        displayDuration: true,
+      },
+    }),
+  );
 }
 
-
 // Manually set exit code (needed with custom reporters)
 runner.onComplete((success: boolean) => {
   process.exitCode = success ? 0 : 1;
 });
 
-
-glob.sync('packages/**/*.spec.ts')
+glob
+  .sync('packages/**/*.spec.ts')
   .filter(p => !/\/schematics\/.*\/(other-)?files\//.test(p))
   .forEach(path => {
     console.error(`Invalid spec file name: ${path}. You're using the old convention.`);
   });
 
-export default function (args: ParsedArgs, logger: logging.Logger) {
+export default function(args: ParsedArgs, logger: logging.Logger) {
   const specGlob = args.large ? '*_spec_large.ts' : '*_spec.ts';
   const regex = args.glob ? args.glob : `packages/**/${specGlob}`;
 
@@ -185,44 +182,56 @@ export default function (args: ParsedArgs, logger: logging.Logger) {
   }
 
   // Run the tests.
-  const allTests =
-    glob.sync(regex)
-      .map(p => relative(projectBaseDir, p));
+  const allTests = glob.sync(regex).map(p => relative(projectBaseDir, p));
 
   const tsConfigPath = join(__dirname, '../tsconfig.json');
   const tsConfig = ts.readConfigFile(tsConfigPath, ts.sys.readFile);
-  const pattern = '^('
-                  + (tsConfig.config.exclude as string[])
-                    .map(ex => '('
-                      + ex.split(/[\/\\]/g).map(f => f
-                          .replace(/[\-\[\]{}()+?.^$|]/g, '\\$&')
-                          .replace(/^\*\*/g, '(.+?)?')
-                          .replace(/\*/g, '[^/\\\\]*'))
-                        .join('[\/\\\\]')
-                      + ')')
-                    .join('|')
-                  + ')($|/|\\\\)';
+  const pattern =
+    '^(' +
+    (tsConfig.config.exclude as string[])
+      .map(
+        ex =>
+          '(' +
+          ex
+            .split(/[\/\\]/g)
+            .map(f =>
+              f
+                .replace(/[\-\[\]{}()+?.^$|]/g, '\\$&')
+                .replace(/^\*\*/g, '(.+?)?')
+                .replace(/\*/g, '[^/\\\\]*'),
+            )
+            .join('[/\\\\]') +
+          ')',
+      )
+      .join('|') +
+    ')($|/|\\\\)';
   const excludeRe = new RegExp(pattern);
   let tests = allTests.filter(x => !excludeRe.test(x));
 
   if (!args.full) {
     // Find the point where this branch merged with master.
     const branch = _exec('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {}, logger).trim();
-    const masterRevList = _exec('git', ['rev-list', 'master'], {}, logger).trim().split('\n');
-    const branchRevList = _exec('git', ['rev-list', branch], {}, logger).trim().split('\n');
+    const masterRevList = _exec('git', ['rev-list', 'master'], {}, logger)
+      .trim()
+      .split('\n');
+    const branchRevList = _exec('git', ['rev-list', branch], {}, logger)
+      .trim()
+      .split('\n');
     const sha = branchRevList.find(s => masterRevList.includes(s));
 
     if (sha) {
       const diffFiles = [
         // Get diff between $SHA and HEAD.
         ..._exec('git', ['diff', sha, 'HEAD', '--name-only'], {}, logger)
-          .trim().split('\n'),
+          .trim()
+          .split('\n'),
         // And add the current status to it (so it takes the non-committed changes).
         ..._exec('git', ['status', '--short', '--show-stash'], {}, logger)
-          .split('\n').map(x => x.slice(2).trim()),
+          .split('\n')
+          .map(x => x.slice(2).trim()),
       ]
         .map(x => normalize(x))
-        .filter(x => x !== '.' && x !== '');  // Empty paths will be normalized to dot.
+        .filter(x => x !== '.' && x !== ''); // Empty paths will be normalized to dot.
 
       const diffPackages = new Set();
       for (const pkgName of Object.keys(packages)) {
@@ -239,12 +248,13 @@ export default function (args: ParsedArgs, logger: logging.Logger) {
       logger.info(JSON.stringify([...diffPackages], null, 2));
 
       // Remove the tests from packages that haven't changed.
-      tests = tests
-        .filter(p => Object.keys(packages).some(name => {
+      tests = tests.filter(p =>
+        Object.keys(packages).some(name => {
           const relativeRoot = relative(projectBaseDir, packages[name].root);
 
           return p.startsWith(relativeRoot) && diffPackages.has(name);
-        }));
+        }),
+      );
 
       logger.info(`Found ${tests.length} spec files, out of ${allTests.length}.`);
 
@@ -259,7 +269,7 @@ export default function (args: ParsedArgs, logger: logging.Logger) {
     // Remove tests that are not part of this shard.
     const shardId = args['shard'];
     const nbShards = args['nb-shards'] || 2;
-    tests = tests.filter((name, i) => (i % nbShards) == shardId);
+    tests = tests.filter((name, i) => i % nbShards == shardId);
   }
 
   return new Promise(resolve => {
diff --git a/tslint.json b/tslint.json
index 7ca85c581707..db156e9d81cb 100644
--- a/tslint.json
+++ b/tslint.json
@@ -63,6 +63,8 @@
     "no-eval": true,
     "no-any": true,
     "no-arg": true,
+    "no-debugger": true,
+    "no-console": true,
     "no-internal-module": true,
     "no-unused-expression": true,
     "no-var-keyword": true,

From 860e12b46827a8fdf1908732ac7e939d28d24022 Mon Sep 17 00:00:00 2001
From: Vikram Subramanian <vikram.subramanian@gmail.com>
Date: Thu, 27 Jun 2019 11:52:14 -0700
Subject: [PATCH 1552/1703] release: v8.1.0-rc.0

---
 packages/schematics/angular/utility/latest-versions.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index c6d1dfdd49d9..915d7da11e2c 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -8,15 +8,15 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~8.1.0-next.2',
+  Angular: '~8.1.0-rc.0',
   RxJs: '~6.4.0',
   ZoneJs: '~0.9.1',
   TypeScript: '~3.4.3',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.801.0-beta.2',
-  DevkitBuildNgPackagr: '~0.801.0-beta.2',
-  DevkitBuildWebpack: '~0.801.0-beta.2',
+  DevkitBuildAngular: '~0.801.0-rc.0',
+  DevkitBuildNgPackagr: '~0.801.0-rc.0',
+  DevkitBuildWebpack: '~0.801.0-rc.0',
 
   tsickle: '^0.35.0',
   ngPackagr: '^5.1.0',

From 68227565cec0197ddcf3891a93bd0fd9378df4e5 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 27 Jun 2019 20:24:35 +0200
Subject: [PATCH 1553/1703] feat(@angular-devkit/build-angular): add
 crossorigin options

This options allows to define the crossorigin attribute setting of elements that provide CORS support

Closes #14743
---
 packages/angular/cli/lib/config/schema.json   | 10 +++
 .../plugins/index-html-webpack-plugin.ts      |  8 +-
 .../index-file/augment-index-html.ts          | 59 ++++++------
 .../utilities/index-file/write-index-html.ts  | 31 +++----
 .../build_angular/src/browser/index.ts        |  6 +-
 .../build_angular/src/browser/schema.json     | 10 +++
 .../build_angular/src/dev-server/index.ts     |  1 +
 .../test/browser/cross-origin_spec_large.ts   | 89 +++++++++++++++++++
 8 files changed, 165 insertions(+), 49 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/test/browser/cross-origin_spec_large.ts

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index 0381c91317ab..cf93bf4e4dad 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -890,6 +890,16 @@
             "webWorkerTsConfig": {
               "type": "string",
               "description": "TypeScript configuration for Web Worker modules."
+            },
+            "crossOrigin": {
+              "type": "string",
+              "description": "Define the crossorigin attribute setting of elements that provide CORS support.",
+              "default": "none",
+              "enum": [
+                "none",
+                "anonymous",
+                "use-credentials"
+              ]
             }
           },
           "additionalProperties": false,
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
index 6f91eab8cf21..7542d4178709 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/index-html-webpack-plugin.ts
@@ -8,7 +8,11 @@
 import * as path from 'path';
 import { Compiler, compilation } from 'webpack';
 import { RawSource } from 'webpack-sources';
-import { FileInfo, augmentIndexHtml } from '../utilities/index-file/augment-index-html';
+import {
+  CrossOriginValue,
+  FileInfo,
+  augmentIndexHtml,
+} from '../utilities/index-file/augment-index-html';
 import { IndexHtmlTransform } from '../utilities/index-file/write-index-html';
 import { stripBom } from '../utilities/strip-bom';
 
@@ -22,6 +26,7 @@ export interface IndexHtmlWebpackPluginOptions {
   noModuleEntrypoints: string[];
   moduleEntrypoints: string[];
   postTransform?: IndexHtmlTransform;
+  crossOrigin?: CrossOriginValue;
 }
 
 function readFile(filename: string, compilation: compilation.Compilation): Promise<string> {
@@ -91,6 +96,7 @@ export class IndexHtmlWebpackPlugin {
         baseHref: this._options.baseHref,
         deployUrl: this._options.deployUrl,
         sri: this._options.sri,
+        crossOrigin: this._options.crossOrigin,
         files,
         noModuleFiles,
         loadOutputFile,
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html.ts
index 4abc7ba32bd0..3b42e21df687 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html.ts
@@ -11,9 +11,10 @@ import { RawSource, ReplaceSource } from 'webpack-sources';
 
 const parse5 = require('parse5');
 
-
 export type LoadOutputFileFunctionType = (file: string) => Promise<string>;
 
+export type CrossOriginValue = 'none' | 'anonymous' | 'use-credentials';
+
 export interface AugmentIndexHtmlOptions {
   /* Input file name (e. g. index.html) */
   input: string;
@@ -22,6 +23,8 @@ export interface AugmentIndexHtmlOptions {
   baseHref?: string;
   deployUrl?: string;
   sri: boolean;
+  /** crossorigin attribute setting of elements that provide CORS support */
+  crossOrigin?: CrossOriginValue;
   /*
    * Files emitted by the build.
    * Js files will be added without 'nomodule' nor 'module'.
@@ -54,13 +57,12 @@ export interface FileInfo {
  * bundles for differential serving.
  */
 export async function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise<string> {
-  const {
-    loadOutputFile,
-    files,
-    noModuleFiles = [],
-    moduleFiles = [],
-    entrypoints,
-  } = params;
+  const { loadOutputFile, files, noModuleFiles = [], moduleFiles = [], entrypoints } = params;
+
+  let { crossOrigin = 'none' } = params;
+  if (params.sri && crossOrigin === 'none') {
+    crossOrigin = 'anonymous';
+  }
 
   const stylesheets = new Set<string>();
   const scripts = new Set<string>();
@@ -69,7 +71,9 @@ export async function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise
   const mergedFiles = [...moduleFiles, ...noModuleFiles, ...files];
   for (const entrypoint of entrypoints) {
     for (const { extension, file, name } of mergedFiles) {
-      if (name !== entrypoint) { continue; }
+      if (name !== entrypoint) {
+        continue;
+      }
 
       switch (extension) {
         case '.js':
@@ -127,10 +131,14 @@ export async function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise
 
   let scriptElements = '';
   for (const script of scripts) {
-    const attrs: { name: string, value: string | null }[] = [
+    const attrs: { name: string; value: string | null }[] = [
       { name: 'src', value: (params.deployUrl || '') + script },
     ];
 
+    if (crossOrigin !== 'none') {
+      attrs.push({ name: 'crossorigin', value: crossOrigin });
+    }
+
     // We want to include nomodule or module when a file is not common amongs all
     // such as runtime.js
     const scriptPredictor = ({ file }: FileInfo): boolean => file === script;
@@ -154,15 +162,12 @@ export async function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise
     }
 
     const attributes = attrs
-      .map(attr => attr.value === null ? attr.name : `${attr.name}="${attr.value}"`)
+      .map(attr => (attr.value === null ? attr.name : `${attr.name}="${attr.value}"`))
       .join(' ');
     scriptElements += `<script ${attributes}></script>`;
   }
 
-  indexSource.insert(
-    scriptInsertionPoint,
-    scriptElements,
-  );
+  indexSource.insert(scriptInsertionPoint, scriptElements);
 
   // Adjust base href if specified
   if (typeof params.baseHref == 'string') {
@@ -176,13 +181,9 @@ export async function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise
     const baseFragment = treeAdapter.createDocumentFragment();
 
     if (!baseElement) {
-      baseElement = treeAdapter.createElement(
-        'base',
-        undefined,
-        [
-          { name: 'href', value: params.baseHref },
-        ],
-      );
+      baseElement = treeAdapter.createElement('base', undefined, [
+        { name: 'href', value: params.baseHref },
+      ]);
 
       treeAdapter.appendChild(baseFragment, baseElement);
       indexSource.insert(
@@ -218,6 +219,10 @@ export async function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise
       { name: 'href', value: (params.deployUrl || '') + stylesheet },
     ];
 
+    if (crossOrigin !== 'none') {
+      attrs.push({ name: 'crossorigin', value: crossOrigin });
+    }
+
     if (params.sri) {
       const content = await loadOutputFile(stylesheet);
       attrs.push(..._generateSriAttributes(content));
@@ -227,10 +232,7 @@ export async function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise
     treeAdapter.appendChild(styleElements, element);
   }
 
-  indexSource.insert(
-    styleInsertionPoint,
-    parse5.serialize(styleElements, { treeAdapter }),
-  );
+  indexSource.insert(styleInsertionPoint, parse5.serialize(styleElements, { treeAdapter }));
 
   return indexSource.source();
 }
@@ -241,8 +243,5 @@ function _generateSriAttributes(content: string) {
     .update(content, 'utf8')
     .digest('base64');
 
-  return [
-    { name: 'integrity', value: `${algo}-${hash}` },
-    { name: 'crossorigin', value: 'anonymous' },
-  ];
+  return [{ name: 'integrity', value: `${algo}-${hash}` }];
 }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/write-index-html.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/write-index-html.ts
index f6a3e81bab6e..c5fb9e3fb701 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/write-index-html.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/write-index-html.ts
@@ -13,7 +13,7 @@ import { map, switchMap } from 'rxjs/operators';
 import { ExtraEntryPoint } from '../../../browser/schema';
 import { generateEntryPoints } from '../package-chunk-sort';
 import { stripBom } from '../strip-bom';
-import { FileInfo, augmentIndexHtml } from './augment-index-html';
+import { CrossOriginValue, FileInfo, augmentIndexHtml } from './augment-index-html';
 
 type ExtensionFilter = '.js' | '.css';
 
@@ -30,6 +30,7 @@ export interface WriteIndexHtmlOptions {
   scripts?: ExtraEntryPoint[];
   styles?: ExtraEntryPoint[];
   postTransform?: IndexHtmlTransform;
+  crossOrigin?: CrossOriginValue;
 }
 
 export type IndexHtmlTransform = (content: string) => Promise<string>;
@@ -47,34 +48,34 @@ export function writeIndexHtml({
   scripts = [],
   styles = [],
   postTransform,
+  crossOrigin,
 }: WriteIndexHtmlOptions): Observable<void> {
-
-  return host.read(indexPath)
-    .pipe(
-      map(content => stripBom(virtualFs.fileBufferToString(content))),
-      switchMap(content => augmentIndexHtml({
+  return host.read(indexPath).pipe(
+    map(content => stripBom(virtualFs.fileBufferToString(content))),
+    switchMap(content =>
+      augmentIndexHtml({
         input: getSystemPath(outputPath),
         inputContent: content,
         baseHref,
         deployUrl,
+        crossOrigin,
         sri,
         entrypoints: generateEntryPoints({ scripts, styles }),
         files: filterAndMapBuildFiles(files, ['.js', '.css']),
         noModuleFiles: filterAndMapBuildFiles(noModuleFiles, '.js'),
         moduleFiles: filterAndMapBuildFiles(moduleFiles, '.js'),
         loadOutputFile: async filePath => {
-          return host.read(join(outputPath, filePath))
-            .pipe(
-              map(data => virtualFs.fileBufferToString(data)),
-            )
+          return host
+            .read(join(outputPath, filePath))
+            .pipe(map(data => virtualFs.fileBufferToString(data)))
             .toPromise();
         },
       }),
-      ),
-      switchMap(content => postTransform ? postTransform(content) : of(content)),
-      map(content => virtualFs.stringToFileBuffer(content)),
-      switchMap(content => host.write(join(outputPath, basename(indexPath)), content)),
-    );
+    ),
+    switchMap(content => (postTransform ? postTransform(content) : of(content))),
+    map(content => virtualFs.stringToFileBuffer(content)),
+    switchMap(content => host.write(join(outputPath, basename(indexPath)), content)),
+  );
 }
 
 function filterAndMapBuildFiles(
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index fca271e2fafd..27a42bdbaeb9 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -115,9 +115,8 @@ function getAnalyticsConfig(
     let category = 'build';
     if (context.builder) {
       // We already vetted that this is a "safe" package, otherwise the analytics would be noop.
-      category = context.builder.builderName.split(':')[1]
-              || context.builder.builderName
-              || 'build';
+      category =
+        context.builder.builderName.split(':')[1] || context.builder.builderName || 'build';
     }
 
     // The category is the builder name if it's an angular builder.
@@ -264,6 +263,7 @@ export function buildWebpackBrowser(
               scripts: options.scripts,
               styles: options.styles,
               postTransform: transforms.indexHtml,
+              crossOrigin: options.crossOrigin,
             }).pipe(
               map(() => ({ success: true })),
               catchError(error => of({ success: false, error: mapErrorToMessage(error) })),
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index fa4876246630..57122978fea1 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -319,6 +319,16 @@
     "webWorkerTsConfig": {
       "type": "string",
       "description": "TypeScript configuration for Web Worker modules."
+    },
+    "crossOrigin": {
+      "type": "string",
+      "description": "Define the crossorigin attribute setting of elements that provide CORS support.",
+      "default": "none",
+      "enum": [
+        "none",
+        "anonymous",
+        "use-credentials"
+      ]
     }
   },
   "additionalProperties": false,
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index b7ac62ee4507..f9f39164e260 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -223,6 +223,7 @@ export function serveWebpackBrowser(
             sri: browserOptions.subresourceIntegrity,
             noModuleEntrypoints: ['polyfills-es5'],
             postTransform: transforms.indexHtml,
+            crossOrigin: browserOptions.crossOrigin,
           }),
         );
       }
diff --git a/packages/angular_devkit/build_angular/test/browser/cross-origin_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/cross-origin_spec_large.ts
new file mode 100644
index 000000000000..01a03a460cb5
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/cross-origin_spec_large.ts
@@ -0,0 +1,89 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { Architect } from '@angular-devkit/architect';
+import { join, normalize, virtualFs } from '@angular-devkit/core';
+import { BrowserBuilderOutput } from '../../src/browser/index';
+import { CrossOrigin } from '../../src/browser/schema';
+import { createArchitect, host } from '../utils';
+
+describe('Browser Builder crossOrigin', () => {
+  const targetSpec = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+    architect = (await createArchitect(host.root())).architect;
+
+    host.writeMultipleFiles({
+      'src/index.html': Buffer.from(
+        '\ufeff<html><head><base href="/"></head><body><app-root></app-root></body></html>',
+        'utf8',
+      ),
+    });
+  });
+
+  afterEach(async () => host.restore().toPromise());
+
+  it('works with use-credentials', async () => {
+    const overrides = { crossOrigin: CrossOrigin.UseCredentials };
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = (await run.result) as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+    const fileName = join(normalize(output.outputPath), 'index.html');
+    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content).toBe(
+      `<html><head><base href="/"></head>` +
+        `<body><app-root></app-root>` +
+        `<script src="runtime.js" crossorigin="use-credentials"></script>` +
+        `<script src="polyfills.js" crossorigin="use-credentials"></script>` +
+        `<script src="styles.js" crossorigin="use-credentials"></script>` +
+        `<script src="vendor.js" crossorigin="use-credentials"></script>` +
+        `<script src="main.js" crossorigin="use-credentials"></script></body></html>`,
+    );
+    await run.stop();
+  });
+
+  it('works with anonymous', async () => {
+    const overrides = { crossOrigin: CrossOrigin.Anonymous };
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = (await run.result) as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+    const fileName = join(normalize(output.outputPath), 'index.html');
+    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content).toBe(
+      `<html><head><base href="/"></head>` +
+        `<body><app-root></app-root>` +
+        `<script src="runtime.js" crossorigin="anonymous"></script>` +
+        `<script src="polyfills.js" crossorigin="anonymous"></script>` +
+        `<script src="styles.js" crossorigin="anonymous"></script>` +
+        `<script src="vendor.js" crossorigin="anonymous"></script>` +
+        `<script src="main.js" crossorigin="anonymous"></script></body></html>`,
+    );
+    await run.stop();
+  });
+
+  it('works with none', async () => {
+    const overrides = { crossOrigin: CrossOrigin.None };
+    const run = await architect.scheduleTarget(targetSpec, overrides);
+    const output = (await run.result) as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+    const fileName = join(normalize(output.outputPath), 'index.html');
+    const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
+    expect(content).toBe(
+      `<html><head><base href="/"></head>` +
+        `<body><app-root></app-root>` +
+        `<script src="runtime.js"></script>` +
+        `<script src="polyfills.js"></script>` +
+        `<script src="styles.js"></script>` +
+        `<script src="vendor.js"></script>` +
+        `<script src="main.js"></script></body></html>`,
+    );
+    await run.stop();
+  });
+});

From ce4e9f1d803ce2f03e74ed92833e964cf4c17284 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Wed, 26 Jun 2019 15:22:15 -0700
Subject: [PATCH 1554/1703] fix(@angular/cli): pass in metrics to the pageview
 for commands

We might want to pass those later.
---
 packages/angular/cli/models/command.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular/cli/models/command.ts b/packages/angular/cli/models/command.ts
index 676c3714fdc8..0e783fb18318 100644
--- a/packages/angular/cli/models/command.ts
+++ b/packages/angular/cli/models/command.ts
@@ -163,7 +163,7 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
       }
     }
 
-    this.analytics.pageview('/command/' + paths.join('/'), { dimensions });
+    this.analytics.pageview('/command/' + paths.join('/'), { dimensions, metrics });
   }
 
   abstract async run(options: T & Arguments): Promise<number | void>;

From 6a99e74a14ef2a5ce24eb6897f517095bf2b5d5a Mon Sep 17 00:00:00 2001
From: Pete Bacon Darwin <pete@bacondarwin.com>
Date: Fri, 28 Jun 2019 10:29:31 +0100
Subject: [PATCH 1555/1703] fix(@ngtools/webpack): NGCC should process
 secondary entry-points

Previously secondary entry-points, e.g
`@angular/common/http`,  were being resolved to
the primary entry-point, e.g `@angular/common`.
This meant that these entry-points were not being
processed as part of a compilation leading to error messages.

This change inverts the `tryResolvePackage` logic
to attempt to use `require.resolve()` first and only
looking in the parent directory of the typings file
as a fallback if the main resolve fails.

Fixes https://github.com/angular/angular/issues/30972#issuecomment-506428267
---
 .../ngtools/webpack/src/ngcc_processor.ts     | 30 +++++++------------
 tests/legacy-cli/e2e/tests/ivy/ivy.ts         | 16 ++++++++--
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/packages/ngtools/webpack/src/ngcc_processor.ts b/packages/ngtools/webpack/src/ngcc_processor.ts
index 241b1a2ba12c..22115a8ff869 100644
--- a/packages/ngtools/webpack/src/ngcc_processor.ts
+++ b/packages/ngtools/webpack/src/ngcc_processor.ts
@@ -54,10 +54,7 @@ export class NgccProcessor {
     resolvedModule: ts.ResolvedModule | ts.ResolvedTypeReferenceDirective,
   ): void {
     const resolvedFileName = resolvedModule.resolvedFileName;
-    if (
-      !resolvedFileName
-      || moduleName.startsWith('.')
-      || this._processedModules.has(moduleName)) {
+    if (!resolvedFileName || moduleName.startsWith('.') || this._processedModules.has(moduleName)) {
       // Skip when module is unknown, relative or NGCC compiler is not found or already processed.
       return;
     }
@@ -97,25 +94,19 @@ export class NgccProcessor {
    */
   private tryResolvePackage(moduleName: string, resolvedFileName: string): string | undefined {
     try {
-      let packageJsonPath = path.resolve(resolvedFileName, '../package.json');
-      if (existsSync(packageJsonPath)) {
-        return packageJsonPath;
-      }
-
       // This is based on the logic in the NGCC compiler
       // tslint:disable-next-line:max-line-length
       // See: https://github.com/angular/angular/blob/b93c1dffa17e4e6900b3ab1b9e554b6da92be0de/packages/compiler-cli/src/ngcc/src/packages/dependency_host.ts#L85-L121
-      packageJsonPath = require.resolve(`${moduleName}/package.json`,
-        {
-          paths: [resolvedFileName],
-        },
-      );
-
-      return packageJsonPath;
+      return require.resolve(`${moduleName}/package.json`, {
+        paths: [resolvedFileName],
+      });
     } catch {
       // if it fails this might be a deep import which doesn't have a package.json
       // Ex: @angular/compiler/src/i18n/i18n_ast/package.json
-      return undefined;
+      // or local libraries which don't reside in node_modules
+      const packageJsonPath = path.resolve(resolvedFileName, '../package.json');
+
+      return existsSync(packageJsonPath) ? packageJsonPath : undefined;
     }
   }
 
@@ -138,10 +129,9 @@ class NgccLogger implements Logger {
   constructor(
     private readonly compilationWarnings: (Error | string)[],
     private readonly compilationErrors: (Error | string)[],
-  ) {
-  }
+  ) {}
 
-  debug(..._args: string[]) { }
+  debug(..._args: string[]) {}
 
   info(...args: string[]) {
     // Log to stderr because it's a progress-like info message.
diff --git a/tests/legacy-cli/e2e/tests/ivy/ivy.ts b/tests/legacy-cli/e2e/tests/ivy/ivy.ts
index 81390d538088..dcdf9ecb952a 100644
--- a/tests/legacy-cli/e2e/tests/ivy/ivy.ts
+++ b/tests/legacy-cli/e2e/tests/ivy/ivy.ts
@@ -5,16 +5,28 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import { expectFileToExist, replaceInFile } from '../../utils/fs';
 import { request } from '../../utils/http';
-import { killAllProcesses } from '../../utils/process';
+import { killAllProcesses, ng } from '../../utils/process';
 import { createProject, ngServe } from '../../utils/project';
 
 export default async function() {
   try {
     await createProject('ivy-project', '--enable-ivy');
 
+    // Add in a reference to a secondary entry-point to check that ngcc processes it correctly
+    await replaceInFile(
+      'src/app/app.module.ts',
+      `import { AppComponent } from './app.component';`,
+      `import { AppComponent } from './app.component';\nimport { HttpClientModule } from '@angular/common/http';`,
+    );
+    await replaceInFile('src/app/app.module.ts', `imports: [`, `imports: [\n    HttpClientModule,`);
+
     await ngServe('--prod');
 
+    // Check that @angular/common/http was processed by ngcc
+    await expectFileToExist('node_modules/@angular/common/http/http.d.ts.__ivy_ngcc_bak');
+
     // Verify the index.html
     const body = await request('http://localhost:4200/');
     if (!body.match(/<app-root><\/app-root>/)) {
@@ -33,6 +45,6 @@ export default async function() {
       throw new Error('NgDevMode was not tree shaken away.');
     }
   } finally {
-    await killAllProcesses();
+    killAllProcesses();
   }
 }

From f9ae8ab5651f7785296aa7047a968f4de4cc9ef8 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 28 Jun 2019 17:31:46 +0000
Subject: [PATCH 1556/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 6e76013403a0..4979f988c026 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#58e95052aa1cb2b74abe14596ea2403ec71e6860",
-    "@angular/common": "github:angular/common-builds#3c64d96e19b8b38ce150fce268c9f4c7282789ad",
-    "@angular/compiler": "github:angular/compiler-builds#0298c425de7b034afa2189266eee0b6b7afcc474",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#fced6a25606f7f5d42ca2c378308b4d2dbdbb385",
-    "@angular/core": "github:angular/core-builds#7a0739bbd145d81ef391b12532b7d2533823c572",
-    "@angular/forms": "github:angular/forms-builds#fcbd8afc80d7f1605f1b14cdf10393e4e529e4ce",
-    "@angular/language-service": "github:angular/language-service-builds#323f589c8a2b3882638916363f0bbfa56cb2b78d",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#ba201bf950c595fc2bd5a593b1505b1c43875b68",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#b88046531f0f64b9f1d736253ef602e698d80de4",
-    "@angular/router": "github:angular/router-builds#4d09d1f0545ac960e10fa1f934d714c61110bb26"
+    "@angular/animations": "github:angular/animations-builds#01910a670163fc7acc1e993066bde0c0eb6ce58e",
+    "@angular/common": "github:angular/common-builds#8b473a254e1047706ce56fffe5c7ad59782eecab",
+    "@angular/compiler": "github:angular/compiler-builds#6900e046e428294112406b31e8013c88f8b6798c",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#7d3b4fe2675b74dc8a29185f319774578c17ac27",
+    "@angular/core": "github:angular/core-builds#ce3be8c61cdcdf766c14170a1b5da5d1c6ea47c4",
+    "@angular/forms": "github:angular/forms-builds#39f69204a523456600628e2da229258c35cf844c",
+    "@angular/language-service": "github:angular/language-service-builds#5eb843f38c07bfc8d52729cbcc743126c7d9203f",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#ea7770663bf6a8163c0b4b596fa09cfc8863efbf",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#f0dde9bfd237485b1f94e68ad5543b8383ed85da",
+    "@angular/router": "github:angular/router-builds#cf23f40674e12644bddedb6f9e7216074e76c71f"
   }
 }
\ No newline at end of file

From faa255afcc6d38b4323596122f81507e3e6a94dd Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 28 Jun 2019 13:43:55 -0400
Subject: [PATCH 1557/1703] build: stop code formatting with prettier

Fixes #14939
---
 .circleci/config.yml |   6 -
 .lintstagedrc        |   3 -
 package.json         |   2 -
 yarn.lock            | 313 ++-----------------------------------------
 4 files changed, 12 insertions(+), 312 deletions(-)
 delete mode 100644 .lintstagedrc

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0f323e609ffe..a4112e2bc0d3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -107,12 +107,6 @@ jobs:
     steps:
       - attach_workspace: *attach_options
       - run: yarn validate --ci
-      - run:
-          name: Validate Code Formatting
-          command: |
-            if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then
-              npx prettier --check ".prettierrc" $(git log $CIRCLE_BRANCH --name-only --diff-filter=ACM --pretty="format:" --not $(git for-each-ref --format='%(refname)' refs/heads/ | grep -v "refs/heads/$CIRCLE_BRANCH") -- "*.js" "*.ts")
-            fi
 
   test:
     <<: *defaults
diff --git a/.lintstagedrc b/.lintstagedrc
deleted file mode 100644
index a27f13725bb0..000000000000
--- a/.lintstagedrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "*.{js,ts}": ["prettier --write", "git add"]
-}
\ No newline at end of file
diff --git a/package.json b/package.json
index cccbdec32ec3..3bcbf2e32afa 100644
--- a/package.json
+++ b/package.json
@@ -122,7 +122,6 @@
     "karma-jasmine": "^2.0.1",
     "karma-jasmine-html-reporter": "^1.4.0",
     "license-checker": "^20.1.0",
-    "lint-staged": "^8.1.5",
     "minimatch": "^3.0.4",
     "minimist": "^1.2.0",
     "npm-registry-client": "8.6.0",
@@ -144,7 +143,6 @@
   },
   "husky": {
     "hooks": {
-      "pre-commit": "lint-staged",
       "pre-push": "node ./bin/devkit-admin hooks/pre-push"
     }
   }
diff --git a/yarn.lock b/yarn.lock
index b1850e9606cc..82601eb83490 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -155,13 +155,6 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.3.tgz#2c92469bac2b7fbff810b67fca07bd138b48af77"
   integrity sha512-gqmspPZOMW3MIRb9HlrnbZHXI1/KHTOroBwN1NcLL6pWxzqzEKGvRTq0W/PxS45OtQGbaFikSQpkS5zbnsQm2w==
 
-"@babel/runtime@^7.0.0":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12"
-  integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==
-  dependencies:
-    regenerator-runtime "^0.13.2"
-
 "@babel/template@^7.0.0", "@babel/template@^7.1.0":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.1.2.tgz#090484a574fef5a2d2d7726a674eceda5c5b5644"
@@ -277,13 +270,6 @@
   resolved "https://registry.yarnpkg.com/@ngtools/json-schema/-/json-schema-1.1.0.tgz#c3a0c544d62392acc2813a42c8a0dc6f58f86922"
   integrity sha1-w6DFRNYjkqzCgTpCyKDcb1j4aSI=
 
-"@samverschueren/stream-to-observable@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"
-  integrity sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==
-  dependencies:
-    any-observable "^0.3.0"
-
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
@@ -1017,7 +1003,7 @@ ansi-colors@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.1.tgz#9638047e4213f3428a11944a7d4b31cba0a3ff95"
   integrity sha512-Xt+zb6nqgvV9SWAVp0EG3lRsHcbq5DDgqjPPz6pwgtj6RKz65zGXMNa82oJfOSBA/to6GmRP7Dr+6o+kbApTzQ==
 
-ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
+ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
@@ -1054,11 +1040,6 @@ ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-any-observable@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
-  integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==
-
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -1965,7 +1946,7 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
+chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
@@ -2140,21 +2121,13 @@ cli-boxes@^1.0.0:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
   integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM=
 
-cli-cursor@^2.0.0, cli-cursor@^2.1.0:
+cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
   integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
   dependencies:
     restore-cursor "^2.0.0"
 
-cli-truncate@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
-  integrity sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=
-  dependencies:
-    slice-ansi "0.0.4"
-    string-width "^1.0.1"
-
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
@@ -2311,7 +2284,7 @@ commander@^2.12.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
   integrity sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==
 
-commander@^2.14.1, commander@^2.19.0, commander@^2.9.0:
+commander@^2.19.0:
   version "2.20.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
   integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
@@ -2734,16 +2707,6 @@ cosmiconfig@^5.0.7:
     lodash.get "^4.4.2"
     parse-json "^4.0.0"
 
-cosmiconfig@^5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
-  integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
-  dependencies:
-    import-fresh "^2.0.0"
-    is-directory "^0.3.1"
-    js-yaml "^3.13.1"
-    parse-json "^4.0.0"
-
 create-ecdh@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
@@ -2891,11 +2854,6 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-date-fns@^1.27.2:
-  version "1.30.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
-  integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
-
 date-format@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"
@@ -2951,7 +2909,7 @@ debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
+debug@^4.1.0, debug@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -2995,11 +2953,6 @@ decompress-response@^3.3.0:
   dependencies:
     mimic-response "^1.0.0"
 
-dedent@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
-  integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
-
 deep-equal@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
@@ -3308,11 +3261,6 @@ electron-to-chromium@^1.3.164:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.164.tgz#8680b875577882c1572c42218d53fa9ba5f71d5d"
   integrity sha512-VLlalqUeduN4+fayVtRZvGP2Hl1WrRxlwzh2XVVMJym3IFrQUS29BFQ1GP/BxOJXJI1OFCrJ5BnFEsAe8NHtOg==
 
-elegant-spinner@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
-  integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
-
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
@@ -3483,7 +3431,7 @@ escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.4, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
@@ -3893,14 +3841,6 @@ figgy-pudding@^3.1.0, figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
   integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
 
-figures@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
-  integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=
-  dependencies:
-    escape-string-regexp "^1.0.5"
-    object-assign "^4.1.0"
-
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
@@ -4054,11 +3994,6 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.1"
     readable-stream "^2.0.4"
 
-fn-name@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz#5214d7537a4d06a4a301c0cc262feb84188002e7"
-  integrity sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=
-
 follow-redirects@^1.0.0:
   version "1.5.7"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.7.tgz#a39e4804dacb90202bca76a9e2ac10433ca6a69a"
@@ -4203,15 +4138,6 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-g-status@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/g-status/-/g-status-2.0.2.tgz#270fd32119e8fc9496f066fe5fe88e0a6bc78b97"
-  integrity sha512-kQoE9qH+T1AHKgSSD0Hkv98bobE90ILQcXAF4wvGgsr7uFqNvwmh8j+Lq3l0RVt3E3HjSbv2B9biEGcEtpHLCA==
-  dependencies:
-    arrify "^1.0.1"
-    matcher "^1.0.0"
-    simple-git "^1.85.0"
-
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
@@ -4241,11 +4167,6 @@ get-caller-file@^2.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-own-enumerable-property-symbols@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz#b877b49a5c16aefac3655f2ed2ea5b684df8d203"
-  integrity sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg==
-
 get-pkg-repo@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
@@ -5247,18 +5168,11 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-obj@^1.0.0, is-obj@^1.0.1:
+is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
   integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
 
-is-observable@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e"
-  integrity sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==
-  dependencies:
-    symbol-observable "^1.1.0"
-
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
@@ -5329,11 +5243,6 @@ is-regex@^1.0.4:
   dependencies:
     has "^1.0.1"
 
-is-regexp@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
-  integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
-
 is-retry-allowed@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
@@ -5617,7 +5526,7 @@ js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.9.0:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^3.13.0, js-yaml@^3.13.1:
+js-yaml@^3.13.0:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -6010,80 +5919,6 @@ lie@~3.1.0:
   dependencies:
     immediate "~3.0.5"
 
-lint-staged@^8.1.5:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.2.0.tgz#3d4149a229580815c955047a7acd8f09054be5a9"
-  integrity sha512-DxguyxGOIfb67wZ6EOrqzjAbw6ZH9XK3YS74HO+erJf6+SAQeJJPN//GBOG5xhdt2THeuXjVPaHcCYOWGZwRbA==
-  dependencies:
-    chalk "^2.3.1"
-    commander "^2.14.1"
-    cosmiconfig "^5.2.0"
-    debug "^3.1.0"
-    dedent "^0.7.0"
-    del "^3.0.0"
-    execa "^1.0.0"
-    g-status "^2.0.2"
-    is-glob "^4.0.0"
-    is-windows "^1.0.2"
-    listr "^0.14.2"
-    listr-update-renderer "^0.5.0"
-    lodash "^4.17.11"
-    log-symbols "^2.2.0"
-    micromatch "^3.1.8"
-    npm-which "^3.0.1"
-    p-map "^1.1.1"
-    path-is-inside "^1.0.2"
-    pify "^3.0.0"
-    please-upgrade-node "^3.0.2"
-    staged-git-files "1.1.2"
-    string-argv "^0.0.2"
-    stringify-object "^3.2.2"
-    yup "^0.27.0"
-
-listr-silent-renderer@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
-  integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=
-
-listr-update-renderer@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz#4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2"
-  integrity sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==
-  dependencies:
-    chalk "^1.1.3"
-    cli-truncate "^0.2.1"
-    elegant-spinner "^1.0.1"
-    figures "^1.7.0"
-    indent-string "^3.0.0"
-    log-symbols "^1.0.2"
-    log-update "^2.3.0"
-    strip-ansi "^3.0.1"
-
-listr-verbose-renderer@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz#f1132167535ea4c1261102b9f28dac7cba1e03db"
-  integrity sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==
-  dependencies:
-    chalk "^2.4.1"
-    cli-cursor "^2.1.0"
-    date-fns "^1.27.2"
-    figures "^2.0.0"
-
-listr@^0.14.2:
-  version "0.14.3"
-  resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz#2fea909604e434be464c50bddba0d496928fa586"
-  integrity sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==
-  dependencies:
-    "@samverschueren/stream-to-observable" "^0.3.0"
-    is-observable "^1.1.0"
-    is-promise "^2.1.0"
-    is-stream "^1.1.0"
-    listr-silent-renderer "^1.1.1"
-    listr-update-renderer "^0.5.0"
-    listr-verbose-renderer "^0.5.0"
-    p-map "^2.0.0"
-    rxjs "^6.3.3"
-
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -6194,29 +6029,6 @@ lodash@^4.17.10, lodash@^4.17.4, lodash@^4.2.1:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
   integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==
 
-log-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
-  integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=
-  dependencies:
-    chalk "^1.0.0"
-
-log-symbols@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
-  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
-  dependencies:
-    chalk "^2.0.1"
-
-log-update@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708"
-  integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg=
-  dependencies:
-    ansi-escapes "^3.0.0"
-    cli-cursor "^2.0.0"
-    wrap-ansi "^3.0.1"
-
 log4js@^3.0.0:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.6.tgz#e6caced94967eeeb9ce399f9f8682a4b2b28c8ff"
@@ -6399,13 +6211,6 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-matcher@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/matcher/-/matcher-1.1.1.tgz#51d8301e138f840982b338b116bb0c09af62c1c2"
-  integrity sha512-+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg==
-  dependencies:
-    escape-string-regexp "^1.0.4"
-
 material-design-icons@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/material-design-icons/-/material-design-icons-3.0.1.tgz#9a71c48747218ebca51e51a66da682038cdcb7bf"
@@ -7039,13 +6844,6 @@ npm-packlist@^1.1.6:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
-npm-path@^2.0.2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64"
-  integrity sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw==
-  dependencies:
-    which "^1.2.10"
-
 npm-pick-manifest@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40"
@@ -7093,15 +6891,6 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npm-which@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/npm-which/-/npm-which-3.0.1.tgz#9225f26ec3a285c209cae67c3b11a6b4ab7140aa"
-  integrity sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo=
-  dependencies:
-    commander "^2.9.0"
-    npm-path "^2.0.2"
-    which "^1.2.10"
-
 "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
@@ -7642,7 +7431,7 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@^1.0.1, path-is-inside@^1.0.2:
+path-is-inside@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
   integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
@@ -7750,7 +7539,7 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
-please-upgrade-node@^3.0.2, please-upgrade-node@^3.1.1:
+please-upgrade-node@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac"
   integrity sha512-KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ==
@@ -7933,11 +7722,6 @@ promise@~7.0.1:
   dependencies:
     asap "~2.0.3"
 
-property-expr@^1.5.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-1.5.1.tgz#22e8706894a0c8e28d58735804f6ba3a3673314f"
-  integrity sha512-CGuc0VUTGthpJXL36ydB6jnbyOf/rAHFvmVrJlH+Rg0DqqLFQGAP6hIaxD/G0OAmBJPhXDHuEJigrp0e0wFV6g==
-
 protobufjs@5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.3.tgz#e4dfe9fb67c90b2630d15868249bcc4961467a17"
@@ -8436,11 +8220,6 @@ regenerator-runtime@^0.11.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
-regenerator-runtime@^0.13.2:
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
-  integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==
-
 regex-cache@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
@@ -8748,13 +8527,6 @@ rxjs@6.4.0, rxjs@^6.0.0, rxjs@^6.4.0, rxjs@~6.4.0:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^6.3.3:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
-  integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==
-  dependencies:
-    tslib "^1.9.0"
-
 safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -9099,13 +8871,6 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
-simple-git@^1.85.0:
-  version "1.113.0"
-  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.113.0.tgz#668989728a1e9cf4ec6c72b69ea2eecc93489bea"
-  integrity sha512-i9WVsrK2u0G/cASI9nh7voxOk9mhanWY9eGtWBDSYql6m49Yk5/Fan6uZsDr/xmzv8n+eQ8ahKCoEr8cvU3h+g==
-  dependencies:
-    debug "^4.0.1"
-
 simple-swizzle@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
@@ -9123,11 +8888,6 @@ slash@^2.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
   integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
 
-slice-ansi@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
-  integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=
-
 slide@^1.1.3, slide@~1.1.3:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
@@ -9561,11 +9321,6 @@ stack-trace@0.0.x:
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
   integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
 
-staged-git-files@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-1.1.2.tgz#4326d33886dc9ecfa29a6193bf511ba90a46454b"
-  integrity sha512-0Eyrk6uXW6tg9PYkhi/V/J4zHp33aNyi2hOCmhFLqLTIhbgqWn5jlSzI+IU0VqrZq6+DbHcabQl/WP6P3BG0QA==
-
 static-eval@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.0.tgz#0e821f8926847def7b4b50cda5d55c04a9b13864"
@@ -9674,11 +9429,6 @@ strict-uri-encode@^1.0.0:
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
   integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
 
-string-argv@^0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.0.2.tgz#dac30408690c21f3c3630a3ff3a05877bdcbd736"
-  integrity sha1-2sMECGkMIfPDYwo/86BYd73L1zY=
-
 string-width@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -9724,15 +9474,6 @@ string_decoder@~0.10.x:
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
   integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
 
-stringify-object@^3.2.2:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629"
-  integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==
-  dependencies:
-    get-own-enumerable-property-symbols "^3.0.0"
-    is-obj "^1.0.1"
-    is-regexp "^1.0.0"
-
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -9843,16 +9584,11 @@ supports-color@^6.1.0:
   dependencies:
     has-flag "^3.0.0"
 
-symbol-observable@1.2.0, symbol-observable@^1.1.0:
+symbol-observable@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
   integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
-synchronous-promise@^2.0.6:
-  version "2.0.9"
-  resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.9.tgz#b83db98e9e7ae826bf9c8261fd8ac859126c780a"
-  integrity sha512-LO95GIW16x69LuND1nuuwM4pjgFGupg7pZ/4lU86AmchPKrhk0o2tpMU2unXRrqo81iAFe1YJ0nAGEVwsrZAgg==
-
 tapable@^1.0.0, tapable@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c"
@@ -10076,11 +9812,6 @@ toidentifier@1.0.0:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
-toposort@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
-  integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=
-
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
@@ -10739,7 +10470,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@^1.1.1, which@^1.2.1, which@^1.2.10, which@^1.2.9, which@^1.3.1:
+which@^1.1.1, which@^1.2.1, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -10827,14 +10558,6 @@ wrap-ansi@^2.0.0:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
 
-wrap-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba"
-  integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=
-  dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -11036,18 +10759,6 @@ yn@^2.0.0:
   resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
   integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo=
 
-yup@^0.27.0:
-  version "0.27.0"
-  resolved "https://registry.yarnpkg.com/yup/-/yup-0.27.0.tgz#f8cb198c8e7dd2124beddc2457571329096b06e7"
-  integrity sha512-v1yFnE4+u9za42gG/b/081E7uNW9mUj3qtkmelLbW5YPROZzSH/KUUyJu9Wt8vxFJcT9otL/eZopS0YK1L5yPQ==
-  dependencies:
-    "@babel/runtime" "^7.0.0"
-    fn-name "~2.0.1"
-    lodash "^4.17.11"
-    property-expr "^1.5.0"
-    synchronous-promise "^2.0.6"
-    toposort "^2.0.2"
-
 zone.js@^0.9.1:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.1.tgz#e37c6e5c54c13fae4de26b5ffe8d8e9212da6d9b"

From 821d2fa4a7ee48cd298af7763ea218343f52a501 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 29 Jun 2019 14:41:01 +0000
Subject: [PATCH 1558/1703] build: update open to version 6.4.0

---
 packages/angular/cli/package.json                  | 2 +-
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index f62ea002709f..f9b2c3fd4888 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -36,7 +36,7 @@
     "ini": "1.3.5",
     "inquirer": "6.4.1",
     "npm-package-arg": "6.1.0",
-    "open": "6.3.0",
+    "open": "6.4.0",
     "pacote": "9.5.1",
     "read-package-tree": "5.3.0",
     "semver": "6.1.2",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index e580b6ac5dc7..fd48c522c567 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -31,7 +31,7 @@
     "mini-css-extract-plugin": "0.7.0",
     "minimatch": "3.0.4",
     "parse5": "4.0.0",
-    "open": "6.3.0",
+    "open": "6.4.0",
     "postcss": "7.0.17",
     "postcss-import": "12.0.1",
     "postcss-loader": "3.0.0",
diff --git a/yarn.lock b/yarn.lock
index 82601eb83490..890021840af2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7026,10 +7026,10 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-open@6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-6.3.0.tgz#60d0b845ee38fae0631f5d739a21bd40e3d2a527"
-  integrity sha512-6AHdrJxPvAXIowO/aIaeHZ8CeMdDf7qCyRNq8NwJpinmCdXhz+NZR7ie1Too94lpciCDsG+qHGO9Mt0svA4OqA==
+open@6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz#5c13e96d0dc894686164f18965ecfe889ecfc8a9"
+  integrity sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==
   dependencies:
     is-wsl "^1.1.0"
 

From 0c49097d6d54fdc1b8e2eb5c0bc10869b739ac46 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 29 Jun 2019 21:07:03 +0000
Subject: [PATCH 1559/1703] build: update read-package-tree to version 5.3.1

---
 packages/angular/cli/package.json | 2 +-
 yarn.lock                         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index f9b2c3fd4888..0e06d862f633 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -38,7 +38,7 @@
     "npm-package-arg": "6.1.0",
     "open": "6.4.0",
     "pacote": "9.5.1",
-    "read-package-tree": "5.3.0",
+    "read-package-tree": "5.3.1",
     "semver": "6.1.2",
     "symbol-observable": "1.2.0",
     "universal-analytics": "^0.4.20",
diff --git a/yarn.lock b/yarn.lock
index 890021840af2..5846ca950802 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8044,10 +8044,10 @@ read-package-json@^2.0.0:
   optionalDependencies:
     graceful-fs "^4.1.2"
 
-read-package-tree@5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.3.0.tgz#4f95472e45e7145fb77f4069d12844b139f5ea12"
-  integrity sha512-Gi64+EWmi4515E1rPR77ae/Ip8cjFQTlsWytSYJj974U0tSnxm67pyXltbDjB1lvLw4dc85HbtidGL1K2c/oxw==
+read-package-tree@5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.3.1.tgz#a32cb64c7f31eb8a6f31ef06f9cedf74068fe636"
+  integrity sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==
   dependencies:
     read-package-json "^2.0.0"
     readdir-scoped-modules "^1.0.0"

From c22d0d02686cc7881fce37c58f775c1616a4bd5d Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 1 Jul 2019 07:25:10 +0000
Subject: [PATCH 1560/1703] build: update caniuse-lite to version 1.0.30000979

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index fd48c522c567..7d4b084638ba 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -15,7 +15,7 @@
     "ajv": "6.10.0",
     "autoprefixer": "9.6.0",
     "browserslist": "4.6.3",
-    "caniuse-lite": "1.0.30000978",
+    "caniuse-lite": "1.0.30000979",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.3",
diff --git a/yarn.lock b/yarn.lock
index 5846ca950802..8ab54f121c05 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1906,10 +1906,10 @@ camelcase@^5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@1.0.30000978:
-  version "1.0.30000978"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000978.tgz#1e3346c27fc46bce9ac1ccd77863153a263dde56"
-  integrity sha512-H6gK6kxUzG6oAwg/Jal279z8pHw0BzrpZfwo/CA9FFm/vA0l8IhDfkZtepyJNE2Y4V6Dp3P3ubz6czby1/Mgsw==
+caniuse-lite@1.0.30000979:
+  version "1.0.30000979"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000979.tgz#92f16d00186a6cf20d6c5711bb6e042a3d667029"
+  integrity sha512-gcu45yfq3B7Y+WB05fOMfr0EiSlq+1u+m6rPHyJli/Wy3PVQNGaU7VA4bZE5qw+AU2UVOBR/N5g1bzADUqdvFw==
 
 caniuse-lite@^1.0.30000898:
   version "1.0.30000903"

From fb8deb06d327acd97599986eb68a4bbb3fa3ce6e Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 1 Jul 2019 09:43:26 +0000
Subject: [PATCH 1561/1703] build: update webpack to version 4.35.2

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 packages/angular_devkit/build_webpack/package.json | 2 +-
 packages/ngtools/webpack/package.json              | 2 +-
 yarn.lock                                          | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 7d4b084638ba..3d55f6c69813 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -48,7 +48,7 @@
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.3.0",
-    "webpack": "4.35.0",
+    "webpack": "4.35.2",
     "webpack-dev-middleware": "3.7.0",
     "webpack-dev-server": "3.7.2",
     "webpack-merge": "4.2.1",
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index d41e52e177db..7f6e431331ed 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -17,7 +17,7 @@
     "webpack-dev-server": "^3.1.4"
   },
   "devDependencies": {
-    "webpack": "4.35.0",
+    "webpack": "4.35.2",
     "webpack-dev-server": "^3.1.4"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index e6cd859a70e2..aecdcd9198c1 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -36,6 +36,6 @@
     "@angular/compiler": "~8.1.0-next.1",
     "@angular/compiler-cli": "~8.1.0-next.1",
     "typescript": "3.4.5",
-    "webpack": "4.35.0"
+    "webpack": "4.35.2"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 8ab54f121c05..605103c5946f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10417,10 +10417,10 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.35.0:
-  version "4.35.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.35.0.tgz#ad3f0f8190876328806ccb7a36f3ce6e764b8378"
-  integrity sha512-M5hL3qpVvtr8d4YaJANbAQBc4uT01G33eDpl/psRTBCfjxFTihdhin1NtAKB1ruDwzeVdcsHHV3NX+QsAgOosw==
+webpack@4.35.2:
+  version "4.35.2"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.35.2.tgz#5c8b8a66602cbbd6ec65c6e6747914a61c1449b1"
+  integrity sha512-TZAmorNymV4q66gAM/h90cEjG+N3627Q2MnkSgKlX/z3DlNVKUtqy57lz1WmZU2+FUZwzM+qm7cGaO95PyrX5A==
   dependencies:
     "@webassemblyjs/ast" "1.8.5"
     "@webassemblyjs/helper-module-context" "1.8.5"

From 77d4dd973306cce9c32ea6c2f00d9840da9d1a86 Mon Sep 17 00:00:00 2001
From: vikerman <viks@google.com>
Date: Mon, 1 Jul 2019 15:58:45 -0700
Subject: [PATCH 1562/1703] fix(@angular-devkit/architect): fix for newest
 version of rxjs

---
 packages/angular_devkit/architect/src/architect.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/architect/src/architect.ts b/packages/angular_devkit/architect/src/architect.ts
index 877b91e46a9a..62350f8fc0f7 100644
--- a/packages/angular_devkit/architect/src/architect.ts
+++ b/packages/angular_devkit/architect/src/architect.ts
@@ -61,7 +61,8 @@ function _createJobHandlerFromBuilderInfo(
           // Validate v against the options schema.
           return registry.compile(info.optionSchema).pipe(
             concatMap(validation => validation(options)),
-            map(({ data, success, errors }) => {
+            map((validationResult: json.schema.SchemaValidatorResult) => {
+              const { data, success, errors } = validationResult;
               if (success) {
                 return { ...v, options: data } as BuilderInput;
               }

From 335fa893255c054998935bfbeaba60913eb31d4d Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 1 Jul 2019 22:25:20 +0000
Subject: [PATCH 1563/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 4979f988c026..945471d7aed5 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#01910a670163fc7acc1e993066bde0c0eb6ce58e",
-    "@angular/common": "github:angular/common-builds#8b473a254e1047706ce56fffe5c7ad59782eecab",
-    "@angular/compiler": "github:angular/compiler-builds#6900e046e428294112406b31e8013c88f8b6798c",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#7d3b4fe2675b74dc8a29185f319774578c17ac27",
-    "@angular/core": "github:angular/core-builds#ce3be8c61cdcdf766c14170a1b5da5d1c6ea47c4",
-    "@angular/forms": "github:angular/forms-builds#39f69204a523456600628e2da229258c35cf844c",
-    "@angular/language-service": "github:angular/language-service-builds#5eb843f38c07bfc8d52729cbcc743126c7d9203f",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#ea7770663bf6a8163c0b4b596fa09cfc8863efbf",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#f0dde9bfd237485b1f94e68ad5543b8383ed85da",
-    "@angular/router": "github:angular/router-builds#cf23f40674e12644bddedb6f9e7216074e76c71f"
+    "@angular/animations": "github:angular/animations-builds#2ec0e754c404bece4ce3ca3a1ba1c0052efab41a",
+    "@angular/common": "github:angular/common-builds#556a1d7ea67a68deff67bf2faec6d55b6171c7bd",
+    "@angular/compiler": "github:angular/compiler-builds#c33715c363a274bb948d221f86bb38d8b99df3b0",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#042678d10664e41a24b0f24ccd6c47dd7513e702",
+    "@angular/core": "github:angular/core-builds#1e59db6846ba56bc705ddfd568f914e4fb976987",
+    "@angular/forms": "github:angular/forms-builds#c026076b8cb95ce0118b23031c0ce6b7e0b54d30",
+    "@angular/language-service": "github:angular/language-service-builds#e7201e54a8258ac83b10363f8d442eeb4546cc20",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#f4f97178a1287d050244d4d37f6c54d577115171",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#921540c3eed19b379609ac1556caf605a80fdb6b",
+    "@angular/router": "github:angular/router-builds#ad274b01ca7564822ad9c1be4d20f22bb94eaec7"
   }
 }
\ No newline at end of file

From 41abb9d557fc24cea2522d0cc5b55638d6fbea03 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 24 Jun 2019 12:48:24 -0400
Subject: [PATCH 1564/1703] test: minor E2E runner cleanup

---
 tests/legacy-cli/e2e_runner.ts | 239 ++++++++++++++-------------------
 1 file changed, 101 insertions(+), 138 deletions(-)

diff --git a/tests/legacy-cli/e2e_runner.ts b/tests/legacy-cli/e2e_runner.ts
index ec1d980aa132..1087b12492bb 100644
--- a/tests/legacy-cli/e2e_runner.ts
+++ b/tests/legacy-cli/e2e_runner.ts
@@ -1,7 +1,6 @@
 // This may seem awkward but we're using Logger in our e2e. At this point the unit tests
 // have run already so it should be "safe", teehee.
-import { logging } from '@angular-devkit/core';
-import { terminal } from '@angular-devkit/core';
+import { logging, terminal } from '@angular-devkit/core';
 import { createConsoleLogger } from '@angular-devkit/core/node';
 import * as glob from 'glob';
 import * as minimist from 'minimist';
@@ -9,15 +8,10 @@ import * as path from 'path';
 import { setGlobalVariable } from './e2e/utils/env';
 import { gitClean } from './e2e/utils/git';
 
-// RxJS
-import { filter } from 'rxjs/operators';
-
 const { blue, bold, green, red, yellow, white } = terminal;
 
-
 Error.stackTraceLimit = Infinity;
 
-
 /**
  * Here's a short description of those flags:
  *   --debug          If a test fails, block the thread so the temporary directory isn't deleted.
@@ -43,20 +37,10 @@ Error.stackTraceLimit = Infinity;
  * If unnamed flags are passed in, the list of tests will be filtered to include only those passed.
  */
 const argv = minimist(process.argv.slice(2), {
-  'boolean': [
-    'debug',
-    'ng-snapshots',
-    'noglobal',
-    'nosilent',
-    'noproject',
-    'verbose',
-    'ivy',
-  ],
-  'string': ['devkit', 'glob', 'ignore', 'reuse', 'ng-tag', 'tmpdir', 'ng-version'],
-  'number': ['nb-shards', 'shard'],
+  boolean: ['debug', 'ng-snapshots', 'noglobal', 'nosilent', 'noproject', 'verbose', 'ivy'],
+  string: ['devkit', 'glob', 'ignore', 'reuse', 'ng-tag', 'tmpdir', 'ng-version'],
 });
 
-
 /**
  * Set the error code of the process to 255.  This is to ensure that if something forces node
  * to exit without finishing properly, the error code will be 255. Right now that code is not used.
@@ -68,47 +52,22 @@ const argv = minimist(process.argv.slice(2), {
  */
 process.exitCode = 255;
 
-
 const logger = createConsoleLogger(argv.verbose);
 const logStack = [logger];
 function lastLogger() {
   return logStack[logStack.length - 1];
 }
 
-// This code doesn't work and I have no idea why and no intention to investigate at this point.
-// (console as any).debug = (msg: string, ...args: any[]) => {
-//   const logger = lastLogger();
-//   if (logger) {
-//     logger.debug(msg, { args });
-//   }
-// };
-// console.log = (msg: string, ...args: any[]) => {
-//   const logger = lastLogger();
-//   if (logger) {
-//     logger.info(msg, { args });
-//   }
-// };
-// console.warn = (msg: string, ...args: any[]) => {
-//   const logger = lastLogger();
-//   if (logger) {
-//     logger.warn(msg, { args });
-//   }
-// };
-// console.error = (msg: string, ...args: any[]) => {
-//   const logger = lastLogger();
-//   if (logger) {
-//     logger.error(msg, { args });
-//   }
-// };
-
 const testGlob = argv.glob || 'tests/**/*.ts';
 let currentFileName = null;
 
 const e2eRoot = path.join(__dirname, 'e2e');
-const allSetups = glob.sync(path.join(e2eRoot, 'setup/**/*.ts'), { nodir: true })
+const allSetups = glob
+  .sync(path.join(e2eRoot, 'setup/**/*.ts'), { nodir: true })
   .map(name => path.relative(e2eRoot, name))
   .sort();
-let allTests = glob.sync(path.join(e2eRoot, testGlob), { nodir: true, ignore: argv.ignore })
+let allTests = glob
+  .sync(path.join(e2eRoot, testGlob), { nodir: true, ignore: argv.ignore })
   .map(name => path.relative(e2eRoot, name))
   // Replace windows slashes.
   .map(name => name.replace(/\\/g, '/'))
@@ -151,25 +110,25 @@ if (argv.ivy) {
     .filter(name => !name.endsWith('tests/build/build-app-shell-with-schematic.ts'));
 }
 
-const shardId = ('shard' in argv) ? argv['shard'] : null;
+const shardId = 'shard' in argv ? argv['shard'] : null;
 const nbShards = (shardId === null ? 1 : argv['nb-shards']) || 2;
-const tests = allTests
-  .filter(name => {
-    // Check for naming tests on command line.
-    if (argv._.length == 0) {
-      return true;
-    }
+const tests = allTests.filter(name => {
+  // Check for naming tests on command line.
+  if (argv._.length == 0) {
+    return true;
+  }
 
-    return argv._.some(argName => {
-      return path.join(process.cwd(), argName) == path.join(__dirname, 'e2e', name)
-        || argName == name
-        || argName == name.replace(/\.ts$/, '');
-    });
+  return argv._.some(argName => {
+    return (
+      path.join(process.cwd(), argName) == path.join(__dirname, 'e2e', name) ||
+      argName == name ||
+      argName == name.replace(/\.ts$/, '')
+    );
   });
+});
 
 // Remove tests that are not part of this shard.
-const shardedTests = tests
-  .filter((name, i) => (shardId === null || (i % nbShards) == shardId));
+const shardedTests = tests.filter((name, i) => shardId === null || i % nbShards == shardId);
 const testsToRun = allSetups.concat(shardedTests);
 
 if (shardedTests.length === 0) {
@@ -190,64 +149,82 @@ if (testsToRun.length == allTests.length) {
 
 setGlobalVariable('argv', argv);
 
-testsToRun.reduce((previous, relativeName, testIndex) => {
-  // Make sure this is a windows compatible path.
-  let absoluteName = path.join(e2eRoot, relativeName);
-  if (/^win/.test(process.platform)) {
-    absoluteName = absoluteName.replace(/\\/g, path.posix.sep);
-  }
-
-  return previous.then(() => {
-    currentFileName = relativeName.replace(/\.ts$/, '');
-    const start = +new Date();
-
-    const module = require(absoluteName);
-    const fn: (...args: any[]) => Promise<any> | any =
-      (typeof module == 'function') ? module
-      : (typeof module.default == 'function') ? module.default
-      : () => { throw new Error('Invalid test module.'); };
+testsToRun
+  .reduce((previous, relativeName, testIndex) => {
+    // Make sure this is a windows compatible path.
+    let absoluteName = path.join(e2eRoot, relativeName);
+    if (/^win/.test(process.platform)) {
+      absoluteName = absoluteName.replace(/\\/g, path.posix.sep);
+    }
 
-    let clean = true;
-    let previousDir = null;
-    return Promise.resolve()
-      .then(() => printHeader(currentFileName, testIndex))
-      .then(() => previousDir = process.cwd())
-      .then(() => logStack.push(lastLogger().createChild(currentFileName)))
-      .then(() => fn(() => clean = false))
-      .then(() => logStack.pop(), (err: any) => { logStack.pop(); throw err; })
-      .then(() => console.log('----'))
-      .then(() => {
-        // If we're not in a setup, change the directory back to where it was before the test.
-        // This allows tests to chdir without worrying about keeping the original directory.
-        if (allSetups.indexOf(relativeName) == -1 && previousDir) {
-          process.chdir(previousDir);
-        }
-      })
-      .then(() => {
-        // Only clean after a real test, not a setup step. Also skip cleaning if the test
-        // requested an exception.
-        if (allSetups.indexOf(relativeName) == -1 && clean) {
-          logStack.push(new logging.NullLogger());
-          return gitClean()
-            .then(() => logStack.pop(), (err: any) => {
-              logStack.pop();
-              throw err;
-            });
-        }
-      })
-      .then(() => printFooter(currentFileName, start),
-        (err) => {
-          printFooter(currentFileName, start);
-          console.error(err);
-          throw err;
-        });
-  });
-}, Promise.resolve())
-  .then(() => {
+    return previous.then(() => {
+      currentFileName = relativeName.replace(/\.ts$/, '');
+      const start = +new Date();
+
+      const module = require(absoluteName);
+      const fn: (skipClean?: () => void) => Promise<void> | void =
+        typeof module == 'function'
+          ? module
+          : typeof module.default == 'function'
+          ? module.default
+          : () => {
+              throw new Error('Invalid test module.');
+            };
+
+      let clean = true;
+      let previousDir = null;
+
+      return Promise.resolve()
+        .then(() => printHeader(currentFileName, testIndex))
+        .then(() => (previousDir = process.cwd()))
+        .then(() => logStack.push(lastLogger().createChild(currentFileName)))
+        .then(() => fn(() => (clean = false)))
+        .then(
+          () => logStack.pop(),
+          err => {
+            logStack.pop();
+            throw err;
+          },
+        )
+        .then(() => console.log('----'))
+        .then(() => {
+          // If we're not in a setup, change the directory back to where it was before the test.
+          // This allows tests to chdir without worrying about keeping the original directory.
+          if (allSetups.indexOf(relativeName) == -1 && previousDir) {
+            process.chdir(previousDir);
+          }
+        })
+        .then(() => {
+          // Only clean after a real test, not a setup step. Also skip cleaning if the test
+          // requested an exception.
+          if (allSetups.indexOf(relativeName) == -1 && clean) {
+            logStack.push(new logging.NullLogger());
+
+            return gitClean().then(
+              () => logStack.pop(),
+              err => {
+                logStack.pop();
+                throw err;
+              },
+            );
+          }
+        })
+        .then(
+          () => printFooter(currentFileName, start),
+          err => {
+            printFooter(currentFileName, start);
+            console.error(err);
+            throw err;
+          },
+        );
+    });
+  }, Promise.resolve())
+  .then(
+    () => {
       console.log(green('Done.'));
       process.exit(0);
     },
-    (err) => {
+    err => {
       console.log('\n');
       console.error(red(`Test "${currentFileName}" failed...`));
       console.error(red(err.message));
@@ -264,36 +241,22 @@ testsToRun.reduce((previous, relativeName, testIndex) => {
       }
 
       process.exit(1);
-    });
-
-
-function encode(str) {
-  return str.replace(/[^A-Za-z\d\/]+/g, '-').replace(/\//g, '.').replace(/[\/-]$/, '');
-}
-
-function isTravis() {
-  return process.env['TRAVIS'];
-}
+    },
+  );
 
 function printHeader(testName: string, testIndex: number) {
   const text = `${testIndex + 1} of ${testsToRun.length}`;
-  const fullIndex = (testIndex < allSetups.length ? testIndex
+  const fullIndex =
+    (testIndex < allSetups.length
+      ? testIndex
       : (testIndex - allSetups.length) * nbShards + shardId + allSetups.length) + 1;
   const length = tests.length + allSetups.length;
-  const shard = shardId === null ? ''
-      : yellow(` [${shardId}:${nbShards}]` + bold(` (${fullIndex}/${length})`));
+  const shard =
+    shardId === null ? '' : yellow(` [${shardId}:${nbShards}]` + bold(` (${fullIndex}/${length})`));
   console.log(green(`Running "${bold(blue(testName))}" (${bold(white(text))}${shard})...`));
-
-  if (isTravis()) {
-    console.log(`travis_fold:start:${encode(testName)}`);
-  }
 }
 
-function printFooter(testName, startTime) {
-  if (isTravis()) {
-    console.log(`travis_fold:end:${encode(testName)}`);
-  }
-
+function printFooter(testName: string, startTime: number) {
   // Round to hundredth of a second.
   const t = Math.round((Date.now() - startTime) / 10) / 100;
   console.log(green('Last step took ') + bold(blue(t)) + green('s...'));

From 460c32054272780dab6cf0c50f824455b30cb219 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 24 Jun 2019 14:03:54 -0400
Subject: [PATCH 1565/1703] test: minor cleanup of E2E setup steps

---
 tests/legacy-cli/e2e/setup/015-build.ts       |  9 ++---
 tests/legacy-cli/e2e/setup/100-global-cli.ts  | 33 ++++++++-----------
 .../e2e/setup/200-create-tmp-dir.ts           | 15 +++++----
 .../e2e/setup/300-log-environment.ts          | 27 +++++----------
 .../e2e/setup/500-create-project.ts           | 24 +++++++-------
 5 files changed, 46 insertions(+), 62 deletions(-)

diff --git a/tests/legacy-cli/e2e/setup/015-build.ts b/tests/legacy-cli/e2e/setup/015-build.ts
index faf9b3f5b9c8..4c434aac714b 100644
--- a/tests/legacy-cli/e2e/setup/015-build.ts
+++ b/tests/legacy-cli/e2e/setup/015-build.ts
@@ -1,13 +1,8 @@
-import {join} from 'path';
-import {getGlobalVariable} from '../utils/env';
-import {npm} from '../utils/process';
-import {updateJsonFile} from '../utils/project';
-
-const packages = require('../../../../lib/packages').packages;
+import { getGlobalVariable } from '../utils/env';
+import { npm } from '../utils/process';
 
 export default function() {
   const argv = getGlobalVariable('argv');
-
   if (argv.nobuild) {
     return;
   }
diff --git a/tests/legacy-cli/e2e/setup/100-global-cli.ts b/tests/legacy-cli/e2e/setup/100-global-cli.ts
index 31a862ff5b80..2cdb9ac88f10 100644
--- a/tests/legacy-cli/e2e/setup/100-global-cli.ts
+++ b/tests/legacy-cli/e2e/setup/100-global-cli.ts
@@ -1,25 +1,20 @@
-import {silentNpm, exec} from '../utils/process';
-import {getGlobalVariable} from '../utils/env';
+import { getGlobalVariable } from '../utils/env';
+import { exec, silentNpm } from '../utils/process';
 
 const packages = require('../../../../lib/packages').packages;
 
+export default async function() {
+  const argv = getGlobalVariable('argv');
+  if (argv.noglobal) {
+    return;
+  }
 
-export default function () {
-  return Promise.resolve()
-    .then(() => {
-      const argv = getGlobalVariable('argv');
-      if (argv.noglobal) {
-        return;
-      }
+  // Install global Angular CLI.
+  // --unsafe-perm is needed for circleci
+  // because of https://github.com/sass/node-sass/issues/2006
+  await silentNpm('install', '-g', packages['@angular/cli'].tar, '--unsafe-perm');
 
-      // Install global Angular CLI.
-      // --unsafe-perm is needed for circleci
-      // because of https://github.com/sass/node-sass/issues/2006
-      return silentNpm('install', '-g', packages['@angular/cli'].tar, '--unsafe-perm');
-    })
-    .then(() => {
-      return exec(process.platform.startsWith('win') ? 'where' : 'which', 'ng')
-        // Ignore errors on `which`.
-        .catch(() => {});
-    });
+  try {
+    await exec(process.platform.startsWith('win') ? 'where' : 'which', 'ng');
+  } catch {}
 }
diff --git a/tests/legacy-cli/e2e/setup/200-create-tmp-dir.ts b/tests/legacy-cli/e2e/setup/200-create-tmp-dir.ts
index ec8cdd032913..ae4b16ebec6d 100644
--- a/tests/legacy-cli/e2e/setup/200-create-tmp-dir.ts
+++ b/tests/legacy-cli/e2e/setup/200-create-tmp-dir.ts
@@ -1,16 +1,19 @@
-import {dirname} from 'path';
-import {setGlobalVariable, getGlobalVariable} from '../utils/env';
-
-
-const temp = require('temp');
+import { mkdtempSync, realpathSync } from 'fs';
+import { tmpdir } from 'os';
+import { dirname, join } from 'path';
+import { getGlobalVariable, setGlobalVariable } from '../utils/env';
 
 export default function() {
   const argv = getGlobalVariable('argv');
 
   // Get to a temporary directory.
-  let tempRoot = argv.tmpdir || temp.mkdirSync('angular-cli-e2e-');
+  let tempRoot: string;
   if (argv.reuse) {
     tempRoot = dirname(argv.reuse);
+  } else if (argv.tmpdir) {
+    tempRoot = argv.tmpdir;
+  } else {
+    tempRoot = mkdtempSync(join(realpathSync(tmpdir()), 'angular-cli-e2e-'));
   }
   console.log(`  Using "${tempRoot}" as temporary directory for a new project.`);
   setGlobalVariable('tmp-root', tempRoot);
diff --git a/tests/legacy-cli/e2e/setup/300-log-environment.ts b/tests/legacy-cli/e2e/setup/300-log-environment.ts
index c6c59b01b4be..7048e06e3240 100644
--- a/tests/legacy-cli/e2e/setup/300-log-environment.ts
+++ b/tests/legacy-cli/e2e/setup/300-log-environment.ts
@@ -1,22 +1,13 @@
-import {node, ng, npm} from '../utils/process';
+import { ng, node, npm } from '../utils/process';
 
-const packages = require('../../../../lib/packages').packages;
+export default async function() {
+  console.log('Environment:');
 
+  Object.keys(process.env).forEach(envName => {
+    console.log(`  ${envName}: ${process.env[envName].replace(/[\n\r]+/g, '\n        ')}`);
+  });
 
-export default function() {
-  return Promise.resolve()
-    .then(() => console.log('Environment:'))
-    .then(() => {
-      Object.keys(process.env).forEach(envName => {
-        console.log(`  ${envName}: ${process.env[envName].replace(/[\n\r]+/g, '\n        ')}`);
-      });
-    })
-    // TODO: Investigate why this fails
-    // .then(() => {
-    //   console.log('Packages:');
-    //   console.log(JSON.stringify(packages, null, 2));
-    // })
-    .then(() => node('--version'))
-    .then(() => npm('--version'))
-    .then(() => ng('version'));
+  await node('--version');
+  await npm('--version');
+  await ng('version');
 }
diff --git a/tests/legacy-cli/e2e/setup/500-create-project.ts b/tests/legacy-cli/e2e/setup/500-create-project.ts
index f995bbbd2a1e..d8d25d906b7e 100644
--- a/tests/legacy-cli/e2e/setup/500-create-project.ts
+++ b/tests/legacy-cli/e2e/setup/500-create-project.ts
@@ -1,18 +1,12 @@
-import {join} from 'path';
-import {ng} from '../utils/process';
-import {expectFileToExist} from '../utils/fs';
-import {prepareProjectForE2e} from '../utils/project';
-import {gitClean} from '../utils/git';
-import {getGlobalVariable} from '../utils/env';
-
+import { join } from 'path';
+import { getGlobalVariable } from '../utils/env';
+import { expectFileToExist } from '../utils/fs';
+import { gitClean } from '../utils/git';
+import { ng } from '../utils/process';
+import { prepareProjectForE2e } from '../utils/project';
 
 export default async function() {
   const argv = getGlobalVariable('argv');
-  const extraArgs = [];
-
-  if (argv['ivy']) {
-    extraArgs.push('--enable-ivy');
-  }
 
   if (argv.noproject) {
     return;
@@ -22,6 +16,12 @@ export default async function() {
     process.chdir(argv.reuse);
     await gitClean();
   } else {
+    const extraArgs = [];
+
+    if (argv['ivy']) {
+      extraArgs.push('--enable-ivy');
+    }
+
     await ng('new', 'test-project', '--skip-install', ...extraArgs);
     await expectFileToExist(join(process.cwd(), 'test-project'));
     process.chdir('./test-project');

From 1e8bfa5bdc85809c42688f1f082d724bdc623780 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 24 Jun 2019 14:12:37 -0400
Subject: [PATCH 1566/1703] test: remove unneed unsafe-perm option when
 installing CLI for E2E

The node-sass package originally required this option for CircleCI.  However, node-sass is no longer a dependency of the CLI.
---
 tests/legacy-cli/e2e/setup/100-global-cli.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/legacy-cli/e2e/setup/100-global-cli.ts b/tests/legacy-cli/e2e/setup/100-global-cli.ts
index 2cdb9ac88f10..dd24d7acc8a7 100644
--- a/tests/legacy-cli/e2e/setup/100-global-cli.ts
+++ b/tests/legacy-cli/e2e/setup/100-global-cli.ts
@@ -10,9 +10,7 @@ export default async function() {
   }
 
   // Install global Angular CLI.
-  // --unsafe-perm is needed for circleci
-  // because of https://github.com/sass/node-sass/issues/2006
-  await silentNpm('install', '-g', packages['@angular/cli'].tar, '--unsafe-perm');
+  await silentNpm('install', '-g', packages['@angular/cli'].tar);
 
   try {
     await exec(process.platform.startsWith('win') ? 'where' : 'which', 'ng');

From 9b2a38cab483f312ea4e3d1b72d2dfcafae2e64a Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 18 Jun 2019 13:57:32 -0400
Subject: [PATCH 1567/1703] test: introduce local package repository based E2E
 testing

---
 package.json                                  |   3 +-
 .../legacy-cli/e2e/setup/010-local-publish.ts |  21 +
 .../legacy-cli/e2e/tests/update/update-1.0.ts |  12 +-
 .../e2e/tests/update/update-1.7-longhand.ts   |   8 +-
 .../legacy-cli/e2e/tests/update/update-1.7.ts |  12 +-
 .../legacy-cli/e2e/tests/update/update-7.0.ts |   3 +-
 tests/legacy-cli/e2e_runner.ts                |  26 +
 tests/legacy-cli/verdaccio.yaml               |  38 +
 yarn.lock                                     | 760 ++++++++++++++++--
 9 files changed, 811 insertions(+), 72 deletions(-)
 create mode 100644 tests/legacy-cli/e2e/setup/010-local-publish.ts
 create mode 100644 tests/legacy-cli/verdaccio.yaml

diff --git a/package.json b/package.json
index 3bcbf2e32afa..a9a197bebf41 100644
--- a/package.json
+++ b/package.json
@@ -139,7 +139,8 @@
     "ts-api-guardian": "0.4.4",
     "ts-node": "^5.0.0",
     "tslint-no-circular-imports": "^0.7.0",
-    "tslint-sonarts": "1.9.0"
+    "tslint-sonarts": "1.9.0",
+    "verdaccio": "4.0.3"
   },
   "husky": {
     "hooks": {
diff --git a/tests/legacy-cli/e2e/setup/010-local-publish.ts b/tests/legacy-cli/e2e/setup/010-local-publish.ts
new file mode 100644
index 000000000000..cd509d5113cb
--- /dev/null
+++ b/tests/legacy-cli/e2e/setup/010-local-publish.ts
@@ -0,0 +1,21 @@
+import * as fs from 'fs';
+import { prerelease } from 'semver';
+import { packages } from '../../../../lib/packages';
+import { npm } from '../utils/process';
+
+export default async function() {
+  const pre = prerelease(packages['@angular/cli'].version);
+
+  fs.writeFileSync('.npmrc', 'registry = http://localhost:4873', 'utf8');
+
+  try {
+    const publishArgs = ['run', 'admin', '--', 'publish', '--versionCheck', 'false'];
+    if (pre && pre.length > 0) {
+      publishArgs.push('--tag');
+      publishArgs.push('next');
+    }
+    await npm(...publishArgs);
+  } finally {
+    fs.unlinkSync('.npmrc');
+  }
+}
diff --git a/tests/legacy-cli/e2e/tests/update/update-1.0.ts b/tests/legacy-cli/e2e/tests/update/update-1.0.ts
index 2d1ce42766ee..c3171f99cb84 100644
--- a/tests/legacy-cli/e2e/tests/update/update-1.0.ts
+++ b/tests/legacy-cli/e2e/tests/update/update-1.0.ts
@@ -1,15 +1,15 @@
+import * as fs from 'fs';
 import { createProjectFromAsset } from '../../utils/assets';
 import { ng, silentNpm } from '../../utils/process';
-import {
-  isPrereleaseCli, useBuiltPackages, useCIChrome, useCIDefaults,
-} from '../../utils/project';
+import { isPrereleaseCli, useBuiltPackages, useCIChrome, useCIDefaults } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
 
-
-export default async function () {
-  const extraUpdateArgs = await isPrereleaseCli() ? ['--next', '--force'] : [];
+export default async function() {
+  const extraUpdateArgs = (await isPrereleaseCli()) ? ['--next', '--force'] : [];
 
   await createProjectFromAsset('1.0-project');
+  fs.writeFileSync('.npmrc', 'registry = http://localhost:4873', 'utf8');
+
   await useCIChrome('.');
   await expectToFail(() => ng('build'));
   await ng('update', '@angular/cli');
diff --git a/tests/legacy-cli/e2e/tests/update/update-1.7-longhand.ts b/tests/legacy-cli/e2e/tests/update/update-1.7-longhand.ts
index 2bfad4c5e740..0fff642ce419 100644
--- a/tests/legacy-cli/e2e/tests/update/update-1.7-longhand.ts
+++ b/tests/legacy-cli/e2e/tests/update/update-1.7-longhand.ts
@@ -1,13 +1,15 @@
+import * as fs from 'fs';
 import { createProjectFromAsset } from '../../utils/assets';
 import { ng, silentNpm } from '../../utils/process';
 import { isPrereleaseCli, useBuiltPackages } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
 
-
-export default async function () {
-  const extraUpdateArgs = await isPrereleaseCli() ? ['--next', '--force'] : [];
+export default async function() {
+  const extraUpdateArgs = (await isPrereleaseCli()) ? ['--next', '--force'] : [];
 
   await createProjectFromAsset('1.7-project');
+  fs.writeFileSync('.npmrc', 'registry = http://localhost:4873', 'utf8');
+
   await expectToFail(() => ng('build'));
   await ng('update', '@angular/cli', '--migrate-only', '--from=1.7.1');
   await useBuiltPackages();
diff --git a/tests/legacy-cli/e2e/tests/update/update-1.7.ts b/tests/legacy-cli/e2e/tests/update/update-1.7.ts
index e1c43b888247..335368638446 100644
--- a/tests/legacy-cli/e2e/tests/update/update-1.7.ts
+++ b/tests/legacy-cli/e2e/tests/update/update-1.7.ts
@@ -1,15 +1,15 @@
+import * as fs from 'fs';
 import { createProjectFromAsset } from '../../utils/assets';
 import { ng, silentNpm } from '../../utils/process';
-import {
-  isPrereleaseCli, useBuiltPackages, useCIChrome, useCIDefaults,
-} from '../../utils/project';
+import { isPrereleaseCli, useBuiltPackages, useCIChrome, useCIDefaults } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
 
-
-export default async function () {
-  const extraUpdateArgs = await isPrereleaseCli() ? ['--next', '--force'] : [];
+export default async function() {
+  const extraUpdateArgs = (await isPrereleaseCli()) ? ['--next', '--force'] : [];
 
   await createProjectFromAsset('1.7-project');
+  fs.writeFileSync('.npmrc', 'registry = http://localhost:4873', 'utf8');
+
   await useCIChrome('.');
   await expectToFail(() => ng('build'));
   await ng('update', '@angular/cli');
diff --git a/tests/legacy-cli/e2e/tests/update/update-7.0.ts b/tests/legacy-cli/e2e/tests/update/update-7.0.ts
index a2ab5da9ce23..b34dc25b31f2 100644
--- a/tests/legacy-cli/e2e/tests/update/update-7.0.ts
+++ b/tests/legacy-cli/e2e/tests/update/update-7.0.ts
@@ -1,3 +1,4 @@
+import * as fs from 'fs';
 import { createProjectFromAsset } from '../../utils/assets';
 import { expectFileMatchToExist, expectFileToExist, expectFileToMatch } from '../../utils/fs';
 import { ng, noSilentNg, silentNpm } from '../../utils/process';
@@ -9,8 +10,8 @@ export default async function() {
 
   // Create new project from previous version files.
   // We must use the original NPM packages to force a real update.
-  // This also means that we can only truly test updates after a release.
   await createProjectFromAsset('7.0-project', true);
+  fs.writeFileSync('.npmrc', 'registry = http://localhost:4873', 'utf8');
 
   // Update the CLI.
   // Users of CLI <7.2 will see the following warnings:
diff --git a/tests/legacy-cli/e2e_runner.ts b/tests/legacy-cli/e2e_runner.ts
index 1087b12492bb..557ed4559797 100644
--- a/tests/legacy-cli/e2e_runner.ts
+++ b/tests/legacy-cli/e2e_runner.ts
@@ -2,8 +2,11 @@
 // have run already so it should be "safe", teehee.
 import { logging, terminal } from '@angular-devkit/core';
 import { createConsoleLogger } from '@angular-devkit/core/node';
+import { spawn } from 'child_process';
+import * as fs from 'fs';
 import * as glob from 'glob';
 import * as minimist from 'minimist';
+import * as os from 'os';
 import * as path from 'path';
 import { setGlobalVariable } from './e2e/utils/env';
 import { gitClean } from './e2e/utils/git';
@@ -12,6 +15,8 @@ const { blue, bold, green, red, yellow, white } = terminal;
 
 Error.stackTraceLimit = Infinity;
 
+// tslint:disable:no-global-tslint-disable no-console
+
 /**
  * Here's a short description of those flags:
  *   --debug          If a test fails, block the thread so the temporary directory isn't deleted.
@@ -149,6 +154,19 @@ if (testsToRun.length == allTests.length) {
 
 setGlobalVariable('argv', argv);
 
+// Setup local package registry
+const registryPath =
+  fs.mkdtempSync(path.join(fs.realpathSync(os.tmpdir()), 'angular-cli-e2e-registry-'));
+fs.copyFileSync(
+  path.join(__dirname, 'verdaccio.yaml'),
+  path.join(registryPath, 'verdaccio.yaml'),
+);
+const registryProcess = spawn(
+  'node',
+  [require.resolve('verdaccio/bin/verdaccio'), '-c', './verdaccio.yaml'],
+  { cwd: registryPath, stdio: 'inherit' },
+);
+
 testsToRun
   .reduce((previous, relativeName, testIndex) => {
     // Make sure this is a windows compatible path.
@@ -221,6 +239,10 @@ testsToRun
   }, Promise.resolve())
   .then(
     () => {
+      if (registryProcess) {
+        registryProcess.kill();
+      }
+
       console.log(green('Done.'));
       process.exit(0);
     },
@@ -230,6 +252,10 @@ testsToRun
       console.error(red(err.message));
       console.error(red(err.stack));
 
+      if (registryProcess) {
+        registryProcess.kill();
+      }
+
       if (argv.debug) {
         console.log(`Current Directory: ${process.cwd()}`);
         console.log('Will loop forever while you debug... CTRL-C to quit.');
diff --git a/tests/legacy-cli/verdaccio.yaml b/tests/legacy-cli/verdaccio.yaml
new file mode 100644
index 000000000000..1a3c825278c3
--- /dev/null
+++ b/tests/legacy-cli/verdaccio.yaml
@@ -0,0 +1,38 @@
+storage: ./storage
+
+auth:
+  htpasswd:
+    file: ./htpasswd
+    max_users: -1
+
+uplinks:
+  npmjs:
+    url: https://registry.npmjs.org/
+
+packages:
+  '@angular/{cli,pwa}':
+    access: $all
+    publish: $all
+    
+  '@angular-devkit/*':
+    access: $all
+    publish: $all
+
+  '@ngtools/*':
+    access: $all
+    publish: $all
+
+  '@schematics/{angular,schematics,update}':
+    access: $all
+    publish: $all
+
+  '**':
+    access: $all
+    proxy: npmjs
+
+logs:
+  - {type: stdout, format: pretty, level: warn}
+
+# https://github.com/verdaccio/verdaccio/issues/301
+server:
+  keepAliveTimeout: 0
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 605103c5946f..afe3921782a9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -689,6 +689,49 @@
     "@types/uglify-js" "*"
     source-map "^0.6.0"
 
+"@verdaccio/file-locking@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@verdaccio/file-locking/-/file-locking-1.0.0.tgz#2f148612d9ce5c3c0dfd826151561b2aa887777d"
+  integrity sha512-FncTOEL01a8yd6xOcNX1TQgc3pRYxByAI2OaAJHjGu5xxcGoqTo6RrIDU3ILdW2ypjc9Ow/xJLarUkr6zDhyfQ==
+  dependencies:
+    lockfile "1.0.4"
+
+"@verdaccio/local-storage@2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@verdaccio/local-storage/-/local-storage-2.1.0.tgz#d941592237adb8e291942d6c87a90cefe32838e3"
+  integrity sha512-BmXkSdXT219+BBTe5vHemYpw8Vf1be2ZUdxYlvFpRltm+egJTtBSFO6lOWWcjaORkM48TGc7wR2K/jGJfX8KAg==
+  dependencies:
+    "@verdaccio/file-locking" "1.0.0"
+    "@verdaccio/streams" "2.0.0-beta.0"
+    async "3.0.1-0"
+    http-errors "1.7.2"
+    lodash "4.17.11"
+    mkdirp "0.5.1"
+
+"@verdaccio/readme@1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@verdaccio/readme/-/readme-1.0.3.tgz#2cf9c8fd7ce356db7581c0d59e5444874d9b0bec"
+  integrity sha512-05DQQUl1n1afDgvv/C+ZR8dn/pW75scwtpW+sHs5MsvRDdwc7iilXBtrVje+1ioa+QU8LrDJvKnttvuwAoD+yw==
+  dependencies:
+    dompurify "1.0.10"
+    jsdom "15.1.0"
+    marked "0.6.2"
+
+"@verdaccio/streams@2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@verdaccio/streams/-/streams-2.0.0.tgz#27f51d0cb19d5e49248860942092646e9a357967"
+  integrity sha512-QW1LsYir3wNnqhSznbJlt0iqkcgve0LpXI8RkoTTBPrq3M6ei3Ys4iw+JQKFve3gmYw9O+w8lBiOLc1qvvsoVQ==
+
+"@verdaccio/streams@2.0.0-beta.0":
+  version "2.0.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@verdaccio/streams/-/streams-2.0.0-beta.0.tgz#af8c7e673a3c368deacc8024c6f5671aa2ec32ac"
+  integrity sha512-EdVF6RP0abRNT0RfgLCsqLNv7FOpm+BpzMZoaQuQGHSBQRj7OTM8ft5mpbJ40rYVXKv6D8xyU0vUnoRl09ah6g==
+
+"@verdaccio/ui-theme@0.1.11":
+  version "0.1.11"
+  resolved "https://registry.yarnpkg.com/@verdaccio/ui-theme/-/ui-theme-0.1.11.tgz#48e1bb9139c61016e143e57102bee8c8fbf0cb92"
+  integrity sha512-VxuqUOycaFRwZ7RV6etvGECELvgZ1iO8KFZJlLVUWvrv218mAULZVacKyJ6i8FbLvaqxnx7lEUIEBzhz7KX/Iw==
+
 "@webassemblyjs/ast@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
@@ -850,6 +893,14 @@
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
   integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
 
+JSONStream@1.3.5, JSONStream@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
+  integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
+  dependencies:
+    jsonparse "^1.2.0"
+    through ">=2.2.7 <3"
+
 JSONStream@^1.0.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.4.tgz#615bb2adb0cd34c8f4c447b5f6512fa1d8f16a2e"
@@ -858,13 +909,10 @@ JSONStream@^1.0.4:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
-JSONStream@^1.3.4:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
-  integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
-  dependencies:
-    jsonparse "^1.2.0"
-    through ">=2.2.7 <3"
+abab@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f"
+  integrity sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w==
 
 abbrev@1:
   version "1.1.1"
@@ -897,21 +945,34 @@ acorn-dynamic-import@^4.0.0:
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
   integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
 
+acorn-globals@^4.3.0:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.2.tgz#4e2c2313a597fd589720395f6354b41cd5ec8006"
+  integrity sha512-BbzvZhVtZP+Bs1J1HcwrQe8ycfO0wStkSGxuul3He3GkHOIZ6eTqOkPuw9IP1X3+IkOo4wiJmwkobzXYz4wewQ==
+  dependencies:
+    acorn "^6.0.1"
+    acorn-walk "^6.0.1"
+
+acorn-walk@^6.0.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913"
+  integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==
+
 acorn@^5.0.0:
   version "5.7.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
   integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
+acorn@^6.0.1, acorn@^6.0.4, acorn@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
+  integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
+
 acorn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.5.tgz#81730c0815f3f3b34d8efa95cb7430965f4d887a"
   integrity sha512-i33Zgp3XWtmZBMNvCr4azvOFeWVw1Rk6p3hfi3LUDvIFraOMywb1kAtrbi+med14m4Xfpqm3zRZMT+c0FNE7kg==
 
-acorn@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
-  integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
-
 adm-zip@^0.4.9, adm-zip@~0.4.3:
   version "0.4.11"
   resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.11.tgz#2aa54c84c4b01a9d0fb89bb11982a51f13e3d62a"
@@ -956,7 +1017,7 @@ ajv@6.10.0:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^5.0.0, ajv@^5.3.0:
+ajv@^5.0.0, ajv@^5.1.0, ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
   integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
@@ -1056,6 +1117,11 @@ anymatch@^3.0.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+apache-md5@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/apache-md5/-/apache-md5-1.1.2.tgz#ee49736b639b4f108b6e9e626c6da99306b41692"
+  integrity sha1-7klza2ObTxCLbp5ibG2pkwa0FpI=
+
 app-root-path@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.1.0.tgz#98bf6599327ecea199309866e8140368fd2e646a"
@@ -1118,6 +1184,11 @@ arr-union@^3.1.0:
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
+array-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+  integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
+
 array-find-index@^1.0.1, array-find-index@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
@@ -1246,6 +1317,16 @@ async@1.x, async@^1.5.2:
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
   integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
+async@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.0.1.tgz#dfeb34657d1e63c94c0eee424297bf8a2c9a8182"
+  integrity sha512-ZswD8vwPtmBZzbn9xyi8XBQWXH3AvOQ43Za1KWYq7JeycrZuUYzx01KvHcVbXltjqH4y0MWrQ33008uLTqXuDw==
+
+async@3.0.1-0:
+  version "3.0.1-0"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.0.1-0.tgz#ca06713f91c3d9eea3e966ace4093f41ef89f200"
+  integrity sha512-b+lONkCWH/GCAIrU0j4m5zed5t+5dfjM2TbUSmKCagx6TZp2jQrNkGL7j1SUb0fF1yH6sKBiXC7Zid8Zj94O6A==
+
 async@^2.1.2, async@^2.5.0, async@^2.6.0, async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
@@ -1293,7 +1374,7 @@ aws-sign2@~0.7.0:
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
-aws4@^1.8.0:
+aws4@^1.6.0, aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
   integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
@@ -1434,6 +1515,11 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
+bcryptjs@2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb"
+  integrity sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms=
+
 better-assert@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
@@ -1605,6 +1691,11 @@ brorand@^1.0.1:
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
+browser-process-hrtime@^0.1.2:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"
+  integrity sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==
+
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
   resolved "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
@@ -1711,6 +1802,11 @@ buffer-alloc@^1.2.0:
     buffer-alloc-unsafe "^1.1.0"
     buffer-fill "^1.0.0"
 
+buffer-equal-constant-time@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
+  integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=
+
 buffer-equal@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"
@@ -1765,6 +1861,16 @@ builtins@^1.0.3:
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
   integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
 
+bunyan@1.8.12:
+  version "1.8.12"
+  resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.12.tgz#f150f0f6748abdd72aeae84f04403be2ef113797"
+  integrity sha1-8VDw9nSKvdcq6uhPBEA74u8RN5c=
+  optionalDependencies:
+    dtrace-provider "~0.8"
+    moment "^2.10.6"
+    mv "~2"
+    safe-json-stringify "~1"
+
 bytebuffer@~5:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd"
@@ -2274,6 +2380,18 @@ combined-stream@1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
+combined-stream@^1.0.6, combined-stream@~1.0.5:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  dependencies:
+    delayed-stream "~1.0.0"
+
+commander@2.20.0, commander@^2.19.0:
+  version "2.20.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
+  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
+
 commander@^2.11.0, commander@^2.12.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
@@ -2284,11 +2402,6 @@ commander@^2.12.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
   integrity sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==
 
-commander@^2.19.0:
-  version "2.20.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
-  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
-
 commander@~2.17.1:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
@@ -2346,29 +2459,29 @@ compressible@~2.0.16:
   dependencies:
     mime-db ">= 1.38.0 < 2"
 
-compression@^1.5.2:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db"
-  integrity sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==
+compression@1.7.4, compression@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
   dependencies:
     accepts "~1.3.5"
     bytes "3.0.0"
-    compressible "~2.0.14"
+    compressible "~2.0.16"
     debug "2.6.9"
-    on-headers "~1.0.1"
+    on-headers "~1.0.2"
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
-compression@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
-  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
+compression@^1.5.2:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db"
+  integrity sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==
   dependencies:
     accepts "~1.3.5"
     bytes "3.0.0"
-    compressible "~2.0.16"
+    compressible "~2.0.14"
     debug "2.6.9"
-    on-headers "~1.0.2"
+    on-headers "~1.0.1"
     safe-buffer "5.1.2"
     vary "~1.1.2"
 
@@ -2631,6 +2744,14 @@ cookie@0.4.0:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
   integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
 
+cookies@0.7.3:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/cookies/-/cookies-0.7.3.tgz#7912ce21fbf2e8c2da70cf1c3f351aecf59dadfa"
+  integrity sha512-+gixgxYSgQLTaTIilDHAdlNPZDENDQernEMiIcZpYYP14zgHsCt4Ce1FEjFtcp6GefhozebB6orvhAAWx/IS0A==
+  dependencies:
+    depd "~1.1.2"
+    keygrip "~1.0.3"
+
 copy-concurrently@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
@@ -2686,6 +2807,14 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
+cors@2.8.5:
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
+  integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
+  dependencies:
+    object-assign "^4"
+    vary "^1"
+
 cosmiconfig@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
@@ -2813,6 +2942,18 @@ cssesc@^0.1.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
   integrity sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=
 
+cssom@^0.3.4, cssom@~0.3.6:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.6.tgz#f85206cee04efa841f3c5982a74ba96ab20d65ad"
+  integrity sha512-DtUeseGk9/GBW0hl0vVPpU22iHL6YB5BUX7ml1hB+GMpo0NX5G4voX3kdWiMSEguFtcW3Vh3djqNF4aIe6ne0A==
+
+cssstyle@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.3.0.tgz#c36c466f7037fd30f03baa271b65f0f17b50585c"
+  integrity sha512-wXsoRfsRfsLVNaVzoKdqvEmK/5PFaEXNspVT22Ots6K/cnJdpoDKuQFw+qlMiXnmaif1OgeC466X1zISgAOcGg==
+  dependencies:
+    cssom "~0.3.6"
+
 cuint@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
@@ -2854,6 +2995,15 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+data-urls@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe"
+  integrity sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==
+  dependencies:
+    abab "^2.0.0"
+    whatwg-mimetype "^2.2.0"
+    whatwg-url "^7.0.0"
+
 date-format@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"
@@ -2874,6 +3024,11 @@ dateformat@^3.0.0:
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
   integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
+dayjs@1.8.14:
+  version "1.8.14"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.14.tgz#43e4f62830c2c3342c3fcd25934dc9162dbe6f38"
+  integrity sha512-AVhDmRTe541iWirnoeFSSDDGvCT6HWaNQ4z2WmmzXMGZj6ph6ydao2teKq/eUtR43GPJXlYFD+C/SotG1P9wUQ==
+
 debug@*:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
@@ -3192,11 +3347,23 @@ domain-browser@^1.1.1:
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
   integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
+domexception@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
+  integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==
+  dependencies:
+    webidl-conversions "^4.0.2"
+
 domino@^2.1.2:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.3.tgz#0ca1ad02cbd316ebe2e99e0ac9fb0010407d4601"
   integrity sha512-EwjTbUv1Q/RLQOdn9k7ClHutrQcWGsfXaRQNOnM/KgK4xDBoLFEcIRFuBSxAx13Vfa63X029gXYrNFrSy+DOSg==
 
+dompurify@1.0.10:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-1.0.10.tgz#18d7353631c86ee25049e38fbca8c6b2c5a2af87"
+  integrity sha512-huhl3DSWX5LaA7jDtnj3XQdJgWW1wYouNW7N0drGzQa4vEUSVWyeFN+Atx6HP4r5cang6oQytMom6I4yhGJj5g==
+
 dot-prop@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
@@ -3211,6 +3378,13 @@ dot-prop@^4.1.0:
   dependencies:
     is-obj "^1.0.0"
 
+dtrace-provider@~0.8:
+  version "0.8.7"
+  resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.7.tgz#dc939b4d3e0620cfe0c1cd803d0d2d7ed04ffd04"
+  integrity sha1-3JObTT4GIM/gwc2APQ0tftBP/QQ=
+  dependencies:
+    nan "^2.10.0"
+
 duplexer2@~0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
@@ -3241,6 +3415,13 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
+ecdsa-sig-formatter@1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
+  integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
+  dependencies:
+    safe-buffer "^5.0.1"
+
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -3448,6 +3629,18 @@ escodegen@1.8.x:
   optionalDependencies:
     source-map "~0.2.0"
 
+escodegen@^1.11.0:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510"
+  integrity sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==
+  dependencies:
+    esprima "^3.1.3"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
 escodegen@^1.8.1:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589"
@@ -3628,7 +3821,7 @@ expand-range@^1.8.1:
   dependencies:
     fill-range "^2.1.0"
 
-express@^4.16.2:
+express@4.16.4, express@^4.16.2:
   version "4.16.4"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
   integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
@@ -3715,7 +3908,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@^3.0.0, extend@~3.0.2:
+extend@^3.0.0, extend@~3.0.1, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -4040,6 +4233,15 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
+form-data@~2.3.1:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
 form-data@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
@@ -4329,6 +4531,17 @@ glob@^5.0.15:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^6.0.1:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
+  integrity sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
@@ -4447,6 +4660,17 @@ handle-thing@^2.0.0:
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754"
   integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
 
+handlebars@4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
+  integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==
+  dependencies:
+    neo-async "^2.6.0"
+    optimist "^0.6.1"
+    source-map "^0.6.1"
+  optionalDependencies:
+    uglify-js "^3.1.4"
+
 handlebars@^4.0.1, handlebars@^4.0.11, handlebars@^4.0.2:
   version "4.0.12"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5"
@@ -4463,6 +4687,14 @@ har-schema@^2.0.0:
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
+har-validator@~5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
+  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
+  dependencies:
+    ajv "^5.1.0"
+    har-schema "^2.0.0"
+
 har-validator@~5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
@@ -4588,6 +4820,13 @@ hpack.js@^2.1.6:
     readable-stream "^2.0.1"
     wbuf "^1.1.0"
 
+html-encoding-sniffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
+  integrity sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==
+  dependencies:
+    whatwg-encoding "^1.0.1"
+
 html-entities@^1.2.0, html-entities@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
@@ -5518,18 +5757,18 @@ js-tokens@^3.0.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
   integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
-js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.9.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
-  integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==
+js-yaml@3.13.1, js-yaml@^3.13.0:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^3.13.0:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.9.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
+  integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -5539,6 +5778,38 @@ jsbn@~0.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
+jsdom@15.1.0:
+  version "15.1.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-15.1.0.tgz#80c5f0dd69466742ab1194f15d301bdd01417596"
+  integrity sha512-QEmc2XIkNfCK3KRfa9ljMJjC4kAGdVgRrs/pCBsQG/QoKz0B42+C58f6TdAmhq/rw494eFCoLHxX6+hWuxb96Q==
+  dependencies:
+    abab "^2.0.0"
+    acorn "^6.0.4"
+    acorn-globals "^4.3.0"
+    array-equal "^1.0.0"
+    cssom "^0.3.4"
+    cssstyle "^1.1.1"
+    data-urls "^1.1.0"
+    domexception "^1.0.1"
+    escodegen "^1.11.0"
+    html-encoding-sniffer "^1.0.2"
+    nwsapi "^2.1.3"
+    parse5 "5.1.0"
+    pn "^1.1.0"
+    request "^2.88.0"
+    request-promise-native "^1.0.5"
+    saxes "^3.1.9"
+    symbol-tree "^3.2.2"
+    tough-cookie "^2.5.0"
+    w3c-hr-time "^1.0.1"
+    w3c-xmlserializer "^1.1.2"
+    webidl-conversions "^4.0.2"
+    whatwg-encoding "^1.0.5"
+    whatwg-mimetype "^2.3.0"
+    whatwg-url "^7.0.0"
+    ws "^6.1.2"
+    xml-name-validator "^3.0.0"
+
 jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
@@ -5613,6 +5884,22 @@ jsonparse@^1.2.0:
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
 
+jsonwebtoken@8.5.1:
+  version "8.5.1"
+  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d"
+  integrity sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==
+  dependencies:
+    jws "^3.2.2"
+    lodash.includes "^4.3.0"
+    lodash.isboolean "^3.0.3"
+    lodash.isinteger "^4.0.4"
+    lodash.isnumber "^3.0.3"
+    lodash.isplainobject "^4.0.6"
+    lodash.isstring "^4.0.1"
+    lodash.once "^4.0.0"
+    ms "^2.1.1"
+    semver "^5.6.0"
+
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -5634,6 +5921,23 @@ jszip@^3.1.3:
     pako "~1.0.2"
     readable-stream "~2.0.6"
 
+jwa@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
+  integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
+  dependencies:
+    buffer-equal-constant-time "1.0.1"
+    ecdsa-sig-formatter "1.0.11"
+    safe-buffer "^5.0.1"
+
+jws@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
+  integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
+  dependencies:
+    jwa "^1.4.1"
+    safe-buffer "^5.0.1"
+
 karma-chrome-launcher@2.2.0, karma-chrome-launcher@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf"
@@ -5766,6 +6070,11 @@ karma@~4.1.0:
     tmp "0.0.33"
     useragent "2.3.0"
 
+keygrip@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.0.3.tgz#399d709f0aed2bab0a059e0cdd3a5023a053e1dc"
+  integrity sha512-/PpesirAIfaklxUzp4Yb7xBper9MwP6hNRA6BGGUFCgbJ+BM5CKBtsoxinNXkLHAr+GXS1/lSlF2rP7cv5Fl+g==
+
 keyv@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
@@ -5802,6 +6111,11 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
   integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
 
+kleur@3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
+  integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
+
 kuler@1.0.x:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/kuler/-/kuler-1.0.0.tgz#904ad31c373b781695854d32be33818bf1d60250"
@@ -5979,6 +6293,13 @@ locate-path@^3.0.0:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
+lockfile@1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.4.tgz#07f819d25ae48f87e538e6578b6964a4981a5609"
+  integrity sha512-cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA==
+  dependencies:
+    signal-exit "^3.0.2"
+
 lodash._reinterpolate@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
@@ -5999,6 +6320,46 @@ lodash.get@^4.4.2:
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
   integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
 
+lodash.includes@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
+  integrity sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=
+
+lodash.isboolean@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
+  integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=
+
+lodash.isinteger@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
+  integrity sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=
+
+lodash.isnumber@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc"
+  integrity sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=
+
+lodash.isplainobject@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+  integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
+
+lodash.isstring@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
+  integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=
+
+lodash.once@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
+  integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
+
+lodash.sortby@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
+
 lodash.tail@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
@@ -6019,7 +6380,7 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
-lodash@^4.16.6, lodash@^4.17.11, lodash@^4.17.5:
+lodash@4.17.11, lodash@^4.16.6, lodash@^4.17.11, lodash@^4.17.5:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
@@ -6112,6 +6473,18 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
+lunr-mutable-indexes@2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/lunr-mutable-indexes/-/lunr-mutable-indexes-2.3.2.tgz#864253489735d598c5140f3fb75c0a5c8be2e98c"
+  integrity sha512-Han6cdWAPPFM7C2AigS2Ofl3XjAT0yVMrUixodJEpyg71zCtZ2yzXc3s+suc/OaNt4ca6WJBEzVnEIjxCTwFMw==
+  dependencies:
+    lunr ">= 2.3.0 < 2.4.0"
+
+"lunr@>= 2.3.0 < 2.4.0":
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.6.tgz#f278beee7ffd56ad86e6e478ce02ab2b98c78dd5"
+  integrity sha512-swStvEyDqQ85MGpABCMBclZcLI/pBIlu8FFDtmX197+oEgKloJ67QnB+Tidh0340HmLMs39c4GrkPY3cmkXp6Q==
+
 magic-string@0.25.2:
   version "0.25.2"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9"
@@ -6211,6 +6584,11 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
+marked@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.2.tgz#c574be8b545a8b48641456ca1dbe0e37b6dccc1a"
+  integrity sha512-LqxwVH3P/rqKX4EKGz7+c2G9r98WeM/SW34ybhgNGhUQNKtf1GmmSkJ6cDGJ/t6tiyae49qRkpyTw2B9HOrgUA==
+
 material-design-icons@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/material-design-icons/-/material-design-icons-3.0.1.tgz#9a71c48747218ebca51e51a66da682038cdcb7bf"
@@ -6390,6 +6768,11 @@ mime@1.6.0, mime@^1.4.1:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
+mime@2.4.4:
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
+  integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
+
 mime@^2.0.3:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6"
@@ -6527,7 +6910,7 @@ mixin-object@^2.0.1:
     for-in "^0.1.3"
     is-extendable "^0.1.1"
 
-mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
+mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
@@ -6539,6 +6922,11 @@ modify-values@^1.0.0:
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
+moment@^2.10.6:
+  version "2.24.0"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
+  integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
+
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
@@ -6579,6 +6967,20 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
+mv@2.1.1, mv@~2:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/mv/-/mv-2.1.1.tgz#ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"
+  integrity sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=
+  dependencies:
+    mkdirp "~0.5.1"
+    ncp "~2.0.0"
+    rimraf "~2.4.0"
+
+nan@^2.10.0:
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
+  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
+
 nan@^2.9.2:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.0.tgz#574e360e4d954ab16966ec102c0c049fd961a099"
@@ -6601,6 +7003,11 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+ncp@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
+  integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=
+
 needle@^2.2.1:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.3.tgz#c1b04da378cd634d8befe2de965dc2cfb0fd65ca"
@@ -6625,6 +7032,11 @@ neo-async@^2.5.0:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
   integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
 
+neo-async@^2.6.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
+  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
+
 ng-packagr@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-5.1.0.tgz#4262775f29f7da72b3e5492c480a6857065d712e"
@@ -6916,12 +7328,22 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
+nwsapi@^2.1.3:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.4.tgz#e006a878db23636f8e8a67d33ca0e4edf61a842f"
+  integrity sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw==
+
+oauth-sign@~0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
+
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
-object-assign@^4.0.1, object-assign@^4.1.0:
+object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -7370,7 +7792,7 @@ parse5@4.0.0:
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
   integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
 
-parse5@^5.0.0, parse5@^5.1.0:
+parse5@5.1.0, parse5@^5.0.0, parse5@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2"
   integrity sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==
@@ -7539,6 +7961,11 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
+pkginfo@0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.4.1.tgz#b5418ef0439de5425fc4995042dced14fb2a84ff"
+  integrity sha1-tUGO8EOd5UJfxJlQQtztFPsqhP8=
+
 please-upgrade-node@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac"
@@ -7551,6 +7978,11 @@ pluralize@^7.0.0:
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
   integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==
 
+pn@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
+  integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
+
 popper.js@^1.14.1:
   version "1.14.4"
   resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.4.tgz#8eec1d8ff02a5a3a152dd43414a15c7b79fd69b6"
@@ -7797,6 +8229,11 @@ psl@^1.1.24:
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
   integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==
 
+psl@^1.1.28:
+  version "1.1.33"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.33.tgz#5533d9384ca7aab86425198e10e8053ebfeab661"
+  integrity sha512-LTDP2uSrsc7XCb5lO7A8BI1qYxRe/8EqlRvMeEl6rsnYAqDOl8xHR+8lSAIVfrNaSAlTPTNOCgNjWcoUL3AZsw==
+
 public-encrypt@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
@@ -7844,7 +8281,7 @@ punycode@^1.2.4, punycode@^1.4.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
-punycode@^2.1.0:
+punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
@@ -7878,7 +8315,7 @@ qjobs@^1.1.4:
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
   integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
 
-qs@6.5.2, qs@~6.5.2:
+qs@6.5.2, qs@~6.5.1, qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
@@ -8293,7 +8730,49 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
-request@^2.74.0, request@^2.83.0, request@^2.87.0, request@^2.88.0:
+request-promise-core@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.2.tgz#339f6aababcafdb31c799ff158700336301d3346"
+  integrity sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==
+  dependencies:
+    lodash "^4.17.11"
+
+request-promise-native@^1.0.5:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.7.tgz#a49868a624bdea5069f1251d0a836e0d89aa2c59"
+  integrity sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==
+  dependencies:
+    request-promise-core "1.1.2"
+    stealthy-require "^1.1.1"
+    tough-cookie "^2.3.3"
+
+request@2.87.0:
+  version "2.87.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
+  integrity sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.6.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.1"
+    forever-agent "~0.6.1"
+    form-data "~2.3.1"
+    har-validator "~5.0.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.17"
+    oauth-sign "~0.8.2"
+    performance-now "^2.1.0"
+    qs "~6.5.1"
+    safe-buffer "^5.1.1"
+    tough-cookie "~2.3.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.1.0"
+
+request@2.88.0, request@^2.74.0, request@^2.83.0, request@^2.87.0, request@^2.88.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
   integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
@@ -8434,6 +8913,13 @@ rimraf@^2.6.3:
   dependencies:
     glob "^7.1.3"
 
+rimraf@~2.4.0:
+  version "2.4.5"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"
+  integrity sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=
+  dependencies:
+    glob "^6.0.1"
+
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -8532,6 +9018,11 @@ safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
+safe-json-stringify@~1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd"
+  integrity sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==
+
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
@@ -8598,6 +9089,13 @@ sax@>=0.6.0, sax@^1.2.4:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
+saxes@^3.1.9:
+  version "3.1.11"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.11.tgz#d59d1fd332ec92ad98a2e0b2ee644702384b1c5b"
+  integrity sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==
+  dependencies:
+    xmlchars "^2.1.1"
+
 schema-utils@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
@@ -8687,16 +9185,16 @@ semver-intersect@1.4.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
   integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
 
+semver@6.1.1, semver@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
+  integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==
+
 semver@6.1.2:
   version "6.1.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.2.tgz#079960381376a3db62eb2edc8a3bfb10c7cfe318"
   integrity sha512-z4PqiCpomGtWj8633oeAdXm1Kn1W++3T8epkZYnwiVgIYIJ0QHszhInYSJTYxebByQH7KVCEAn8R9duzZW2PhQ==
 
-semver@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
-  integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==
-
 send@0.16.2:
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
@@ -9371,6 +9869,11 @@ statuses@~1.4.0:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
   integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
 
+stealthy-require@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
+
 stream-browserify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
@@ -9589,6 +10092,11 @@ symbol-observable@1.2.0:
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
   integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
+symbol-tree@^3.2.2:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
+  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
+
 tapable@^1.0.0, tapable@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c"
@@ -9812,6 +10320,21 @@ toidentifier@1.0.0:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
+tough-cookie@^2.3.3, tough-cookie@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
+tough-cookie@~2.3.3:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
+  integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==
+  dependencies:
+    punycode "^1.4.1"
+
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
@@ -9820,6 +10343,13 @@ tough-cookie@~2.4.3:
     psl "^1.1.24"
     punycode "^1.4.1"
 
+tr46@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
+  integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
+  dependencies:
+    punycode "^2.1.0"
+
 tree-kill@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.1.tgz#5398f374e2f292b9dcc7b2e71e30a5c3bb6c743a"
@@ -10056,6 +10586,11 @@ universalify@^0.1.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
+unix-crypt-td-js@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unix-crypt-td-js/-/unix-crypt-td-js-1.0.0.tgz#1c0824150481bc7a01d49e98f1ec668d82412f3b"
+  integrity sha1-HAgkFQSBvHoB1J6Y8exmjYJBLzs=
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -10196,7 +10731,7 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@^3.0.0, uuid@^3.0.1, uuid@^3.3.2:
+uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
@@ -10216,11 +10751,67 @@ validate-npm-package-name@^3.0.0:
   dependencies:
     builtins "^1.0.3"
 
-vary@~1.1.2:
+vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
+verdaccio-audit@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/verdaccio-audit/-/verdaccio-audit-1.2.0.tgz#932485729a39f518bd4fd8d5688160cc5edafcbb"
+  integrity sha512-383K+EFqsc0kirh2mXrd7xCBzEIQBHlGZsJCT99W8UxKtdG1vyaHiPOe8wb7/aLENSOu7G7UFSMrad/F3oCrtw==
+  dependencies:
+    express "4.16.4"
+    request "2.88.0"
+
+verdaccio-htpasswd@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/verdaccio-htpasswd/-/verdaccio-htpasswd-2.0.0.tgz#cd517dca1d3cee8a46e6ed59b9b9693acb6d9b1f"
+  integrity sha512-HI6AvstmpkyQp6mHHbCVrSu1rOFq/FND2V4gM7EhUtmOAoJjOmZENVGT87ZNf2mTQq8P4MRnfypBIjfutI3BAg==
+  dependencies:
+    "@verdaccio/file-locking" "1.0.0"
+    apache-md5 "1.1.2"
+    bcryptjs "2.4.3"
+    http-errors "1.7.2"
+    unix-crypt-td-js "1.0.0"
+
+verdaccio@4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/verdaccio/-/verdaccio-4.0.3.tgz#15928893fedc08c7bc0fc52c997abd6fc7f0094e"
+  integrity sha512-mLdREiwFmsT9yQpJjpqcUNGqJMrgh+3b3rgg8fW4+ClrVzzw40lqwKHVTlNGLuXIbE7B5wNEKr7vObtL/9JWvw==
+  dependencies:
+    "@verdaccio/local-storage" "2.1.0"
+    "@verdaccio/readme" "1.0.3"
+    "@verdaccio/streams" "2.0.0"
+    "@verdaccio/ui-theme" "0.1.11"
+    JSONStream "1.3.5"
+    async "3.0.1"
+    body-parser "1.19.0"
+    bunyan "1.8.12"
+    commander "2.20.0"
+    compression "1.7.4"
+    cookies "0.7.3"
+    cors "2.8.5"
+    dayjs "1.8.14"
+    express "4.16.4"
+    handlebars "4.1.2"
+    http-errors "1.7.2"
+    js-yaml "3.13.1"
+    jsonwebtoken "8.5.1"
+    kleur "3.0.3"
+    lodash "4.17.11"
+    lunr-mutable-indexes "2.3.2"
+    marked "0.6.2"
+    mime "2.4.4"
+    minimatch "3.0.4"
+    mkdirp "0.5.1"
+    mv "2.1.1"
+    pkginfo "0.4.1"
+    request "2.87.0"
+    semver "6.1.1"
+    verdaccio-audit "1.2.0"
+    verdaccio-htpasswd "2.0.0"
+
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
@@ -10247,6 +10838,22 @@ void-elements@^2.0.0:
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
   integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
 
+w3c-hr-time@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"
+  integrity sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=
+  dependencies:
+    browser-process-hrtime "^0.1.2"
+
+w3c-xmlserializer@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz#30485ca7d70a6fd052420a3d12fd90e6339ce794"
+  integrity sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==
+  dependencies:
+    domexception "^1.0.1"
+    webidl-conversions "^4.0.2"
+    xml-name-validator "^3.0.0"
+
 watchpack@^1.5.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
@@ -10288,6 +10895,11 @@ webdriver-manager@^12.0.6:
     semver "^5.3.0"
     xml2js "^0.4.17"
 
+webidl-conversions@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
+  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
+
 webpack-core@^0.6.8:
   version "0.6.9"
   resolved "https://registry.yarnpkg.com/webpack-core/-/webpack-core-0.6.9.tgz#fc571588c8558da77be9efb6debdc5a3b172bdc2"
@@ -10460,6 +11072,27 @@ websocket-extensions@>=0.1.1:
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
   integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
 
+whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
+  integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
+  dependencies:
+    iconv-lite "0.4.24"
+
+whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
+  integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
+
+whatwg-url@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd"
+  integrity sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==
+  dependencies:
+    lodash.sortby "^4.7.0"
+    tr46 "^1.0.1"
+    webidl-conversions "^4.0.2"
+
 when@~3.6.x:
   version "3.6.4"
   resolved "https://registry.yarnpkg.com/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e"
@@ -10579,6 +11212,13 @@ ws@^6.1.0:
   dependencies:
     async-limiter "~1.0.0"
 
+ws@^6.1.2:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
+  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
+  dependencies:
+    async-limiter "~1.0.0"
+
 ws@~3.3.1:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
@@ -10598,6 +11238,11 @@ xhr2@^0.1.4:
   resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.4.tgz#7f87658847716db5026323812f818cadab387a5f"
   integrity sha1-f4dliEdxbbUCYyOBL4GMras4el8=
 
+xml-name-validator@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
+  integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
+
 xml2js@^0.4.17:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
@@ -10611,6 +11256,11 @@ xmlbuilder@~9.0.1:
   resolved "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
   integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
 
+xmlchars@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.1.1.tgz#ef1a81c05bff629c2280007f12daca21bd6f6c93"
+  integrity sha512-7hew1RPJ1iIuje/Y01bGD/mXokXxegAgVS+e+E0wSi2ILHQkYAH1+JXARwTjZSM4Z4Z+c73aKspEcqj+zPPL/w==
+
 xmlhttprequest-ssl@~1.5.4:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"

From 99fa7bd71fb919cc59515eed997da1a69b659539 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 25 Jun 2019 21:26:24 -0400
Subject: [PATCH 1568/1703] test: add initial ivy large test support

---
 .circleci/config.yml                          |  16 +-
 .../test/browser/aot_spec_large.ts            |  11 +-
 .../test/browser/errors_spec_large.ts         |  17 +-
 .../test/browser/i18n_spec_large.ts           |  20 +-
 .../test/browser/lazy-module_spec_large.ts    |  92 ++-
 .../browser/no-entry-module_spec_large.ts     |   9 +-
 .../test/browser/rebuild_spec_large.ts        | 576 ++++++++++--------
 .../test/browser/svg_spec_large.ts            |  17 +-
 .../browser/vendor-source-map_spec_large.ts   |   5 +-
 .../build_angular/test/utils.ts               |  18 +-
 .../hello-world-app-ivy/.editorconfig         |  13 +
 .../hello-world-app-ivy/.gitignore            |   3 +
 .../hello-world-app-ivy/README.md             |  27 +
 .../hello-world-app-ivy/angular.json          | 162 +++++
 .../hello-world-app-ivy/browserslist          |   4 +
 .../hello-world-app-ivy/e2e/app.e2e-spec.ts   |  21 +
 .../hello-world-app-ivy/e2e/app.po.ts         |  18 +
 .../hello-world-app-ivy/e2e/tsconfig.e2e.json |  13 +
 .../hello-world-app-ivy/karma.conf.js         |  46 ++
 .../hello-world-app-ivy/package.json          |  50 ++
 .../hello-world-app-ivy/protractor.conf.js    |  38 ++
 .../src/app/app.component.css                 |   0
 .../src/app/app.component.html                |  22 +
 .../src/app/app.component.spec.ts             |  32 +
 .../src/app/app.component.ts                  |  17 +
 .../hello-world-app-ivy/src/app/app.module.ts |  19 +
 .../src/app/app.server.module.ts              |  18 +
 .../hello-world-app-ivy/src/assets/.gitkeep   |   0
 .../src/environments/environment.prod.ts      |  10 +
 .../src/environments/environment.ts           |  15 +
 .../hello-world-app-ivy/src/favicon.ico       | Bin 0 -> 5430 bytes
 .../hello-world-app-ivy/src/index.html        |  14 +
 .../hello-world-app-ivy/src/main.server.ts    |  16 +
 .../hello-world-app-ivy/src/main.ts           |  20 +
 .../hello-world-app-ivy/src/polyfills.ts      |  69 +++
 .../hello-world-app-ivy/src/spectrum.png      | Bin 0 -> 30822 bytes
 .../src/src/locale/messages.xlf               |  18 +
 .../hello-world-app-ivy/src/styles.css        |   1 +
 .../hello-world-app-ivy/src/test.ts           |  24 +
 .../hello-world-app-ivy/src/tsconfig.app.json |  14 +
 .../src/tsconfig.server.json                  |  17 +
 .../src/tsconfig.spec.json                    |  21 +
 .../hello-world-app-ivy/src/typings.d.ts      |  12 +
 .../hello-world-app-ivy/tsconfig.json         |  21 +
 .../hello-world-app-ivy/tslint.json           | 143 +++++
 45 files changed, 1372 insertions(+), 327 deletions(-)
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/.editorconfig
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/.gitignore
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/README.md
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/angular.json
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/browserslist
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/e2e/app.e2e-spec.ts
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/e2e/app.po.ts
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/e2e/tsconfig.e2e.json
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/karma.conf.js
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/package.json
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/protractor.conf.js
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/src/app/app.component.css
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/src/app/app.component.html
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/src/app/app.component.spec.ts
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/src/app/app.component.ts
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/src/app/app.module.ts
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/src/app/app.server.module.ts
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/src/assets/.gitkeep
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/src/environments/environment.prod.ts
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/src/environments/environment.ts
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/src/favicon.ico
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/src/index.html
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/src/main.server.ts
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/src/main.ts
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/src/polyfills.ts
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/src/spectrum.png
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/src/src/locale/messages.xlf
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/src/styles.css
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/src/test.ts
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/src/tsconfig.app.json
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/src/tsconfig.server.json
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/src/tsconfig.spec.json
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/src/typings.d.ts
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/tsconfig.json
 create mode 100644 tests/angular_devkit/build_angular/hello-world-app-ivy/tslint.json

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a4112e2bc0d3..860b6de6ae0a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -123,7 +123,18 @@ jobs:
     steps:
       - attach_workspace: *attach_options
       - run: yarn webdriver-update
-      - run: yarn test-large -- --full --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
+      - run: yarn test-large --full --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
+
+  test-large-ivy:
+    <<: *defaults
+    docker:
+      - image: *browsers_docker_image
+    resource_class: large
+    parallelism: 4
+    steps:
+      - attach_workspace: *attach_options
+      - run: yarn webdriver-update
+      - run: yarn test-large --ivy --full --glob="packages/angular_devkit/build_angular/test/browser/*_spec_large.ts" --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
 
   e2e-cli:
     <<: *defaults
@@ -292,6 +303,9 @@ workflows:
       - test-large:
           requires:
             - build
+      - test-large-ivy:
+          requires:
+            - build
       - e2e-cli:
           requires:
             - build
diff --git a/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
index a7e0708af970..785713cac442 100644
--- a/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
@@ -9,8 +9,7 @@
 import { Architect } from '@angular-devkit/architect';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { BrowserBuilderOutput } from '../../src/browser';
-import { createArchitect, host } from '../utils';
-
+import { createArchitect, host, ivyEnabled } from '../utils';
 
 describe('Browser Builder AOT', () => {
   const targetSpec = { project: 'app', target: 'build' };
@@ -26,13 +25,17 @@ describe('Browser Builder AOT', () => {
     const overrides = { aot: true };
 
     const run = await architect.scheduleTarget(targetSpec, overrides);
-    const output = await run.result as BrowserBuilderOutput;
+    const output = (await run.result) as BrowserBuilderOutput;
 
     expect(output.success).toBe(true);
 
     const fileName = join(normalize(output.outputPath), 'main.js');
     const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
-    expect(content).toMatch(/platformBrowser.*bootstrapModuleFactory.*AppModuleNgFactory/);
+    if (ivyEnabled) {
+      expect(content).toContain('AppComponent.ngComponentDef');
+    } else {
+      expect(content).toMatch(/platformBrowser.*bootstrapModuleFactory.*AppModuleNgFactory/);
+    }
 
     await run.stop();
   });
diff --git a/packages/angular_devkit/build_angular/test/browser/errors_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/errors_spec_large.ts
index 63f16d0c859c..95e49b132dbd 100644
--- a/packages/angular_devkit/build_angular/test/browser/errors_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/errors_spec_large.ts
@@ -8,8 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { logging } from '@angular-devkit/core';
-import { createArchitect, host } from '../utils';
-
+import { createArchitect, host, ivyEnabled } from '../utils';
 
 describe('Browser Builder errors', () => {
   const targetSpec = { project: 'app', target: 'build' };
@@ -22,10 +21,14 @@ describe('Browser Builder errors', () => {
   afterEach(async () => host.restore().toPromise());
 
   it('shows error when files are not part of the compilation', async () => {
-    host.replaceInFile('src/tsconfig.app.json', '"compilerOptions": {', `
+    host.replaceInFile(
+      'src/tsconfig.app.json',
+      '"compilerOptions": {',
+      `
       "files": ["main.ts"],
       "compilerOptions": {
-    `);
+    `,
+    );
     const logger = new logging.Logger('');
     const logs: string[] = [];
     logger.subscribe(e => logs.push(e.message));
@@ -59,7 +62,11 @@ describe('Browser Builder errors', () => {
     const run = await architect.scheduleTarget(targetSpec, { aot: true }, { logger });
     const output = await run.result;
     expect(output.success).toBe(false);
-    expect(logs.join()).toContain('Function expressions are not supported in');
+    if (ivyEnabled) {
+      expect(logs.join()).toContain('selector must be a string');
+    } else {
+      expect(logs.join()).toContain('Function expressions are not supported in');
+    }
     await run.stop();
   });
 
diff --git a/packages/angular_devkit/build_angular/test/browser/i18n_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/i18n_spec_large.ts
index 8c98a586dd20..7bd03a28b17c 100644
--- a/packages/angular_devkit/build_angular/test/browser/i18n_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/i18n_spec_large.ts
@@ -8,10 +8,10 @@
 import { Architect } from '@angular-devkit/architect';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { BrowserBuilderOutput } from '../../src/browser';
-import { createArchitect, host } from '../utils';
+import { createArchitect, host, ivyEnabled } from '../utils';
 
-
-describe('Browser Builder i18n', () => {
+// DISABLED_FOR_IVY - These should pass but are currently not supported
+(ivyEnabled ? xdescribe : describe)('Browser Builder i18n', () => {
   const emptyTranslationFile = `
       <?xml version="1.0" encoding="UTF-8" ?>
       <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
@@ -48,8 +48,10 @@ describe('Browser Builder i18n', () => {
       `,
     });
 
-    host.appendToFile('src/app/app.component.html',
-      '<h1 i18n="An introduction header for this sample">Hello i18n!</h1>');
+    host.appendToFile(
+      'src/app/app.component.html',
+      '<h1 i18n="An introduction header for this sample">Hello i18n!</h1>',
+    );
 
     const overrides = {
       aot: true,
@@ -59,7 +61,7 @@ describe('Browser Builder i18n', () => {
     };
 
     const run = await architect.scheduleTarget(targetSpec, overrides);
-    const output = await run.result as BrowserBuilderOutput;
+    const output = (await run.result) as BrowserBuilderOutput;
     expect(output.success).toBe(true);
     const outputPath = output.outputPath;
     const fileName = join(normalize(outputPath), 'main.js');
@@ -82,7 +84,7 @@ describe('Browser Builder i18n', () => {
     host.appendToFile('src/app/app.component.html', '<p i18n>Other content</p>');
 
     const run = await architect.scheduleTarget(targetSpec, overrides);
-    const output = await run.result as BrowserBuilderOutput;
+    const output = (await run.result) as BrowserBuilderOutput;
     expect(output.success).toBe(true);
     const outputPath = output.outputPath;
     const fileName = join(normalize(outputPath), 'main.js');
@@ -105,7 +107,7 @@ describe('Browser Builder i18n', () => {
     host.appendToFile('src/app/app.component.html', '<p i18n>Other content</p>');
 
     const run = await architect.scheduleTarget(targetSpec, overrides);
-    const output = await run.result as BrowserBuilderOutput;
+    const output = (await run.result) as BrowserBuilderOutput;
     expect(output.success).toBe(false);
 
     await run.stop();
@@ -115,7 +117,7 @@ describe('Browser Builder i18n', () => {
     const overrides = { aot: true, i18nLocale: 'fr_FR' };
 
     const run = await architect.scheduleTarget(targetSpec, overrides);
-    const output = await run.result as BrowserBuilderOutput;
+    const output = (await run.result) as BrowserBuilderOutput;
     expect(output.success).toBe(true);
     const outputPath = output.outputPath;
     const fileName = join(normalize(outputPath), 'main.js');
diff --git a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
index fb83dc883161..56ddfa2521c0 100644
--- a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
@@ -10,8 +10,13 @@ import { Architect } from '@angular-devkit/architect';
 import { TestLogger } from '@angular-devkit/architect/testing';
 import { take, tap, timeout } from 'rxjs/operators';
 import {
-  browserBuild, createArchitect, host, lazyModuleFiles,
-  lazyModuleFnImport, lazyModuleStringImport,
+  browserBuild,
+  createArchitect,
+  host,
+  ivyEnabled,
+  lazyModuleFiles,
+  lazyModuleFnImport,
+  lazyModuleStringImport,
 } from '../utils';
 
 // tslint:disable-next-line:no-big-function
@@ -25,10 +30,11 @@ describe('Browser Builder lazy modules', () => {
   });
   afterEach(async () => host.restore().toPromise());
 
-  for (const [name, imports] of Object.entries({
-    'string': lazyModuleStringImport,
-    'function': lazyModuleFnImport,
-  })) {
+  const cases: [string, Record<string, string>][] = [
+    ['string', lazyModuleStringImport],
+    ['function', lazyModuleFnImport],
+  ];
+  for (const [name, imports] of cases) {
     describe(`Load children ${name} syntax`, () => {
       it('supports lazy bundle for lazy routes with JIT', async () => {
         host.writeMultipleFiles(lazyModuleFiles);
@@ -39,34 +45,46 @@ describe('Browser Builder lazy modules', () => {
       });
 
       it('should show error when lazy route is invalid on watch mode AOT', async () => {
+        if (ivyEnabled && name === 'string') {
+          pending('Does not apply to Ivy.');
+
+          return;
+        }
+
+        // DISABLED_FOR_IVY - These should pass but are currently not supported
+        if (ivyEnabled) {
+          pending('Broken in Ivy');
+
+          return;
+        }
+
         host.writeMultipleFiles(lazyModuleFiles);
         host.writeMultipleFiles(imports);
-        host.replaceInFile(
-          'src/app/app.module.ts',
-          'lazy.module',
-          'invalid.module',
-        );
+        host.replaceInFile('src/app/app.module.ts', 'lazy.module', 'invalid.module');
 
         const logger = new TestLogger('rebuild-lazy-errors');
         const overrides = { watch: true, aot: true };
         const run = await architect.scheduleTarget(target, overrides, { logger });
-        await run.output.pipe(
-          timeout(15000),
-          tap((buildEvent) => expect(buildEvent.success).toBe(false)),
-          tap(() => {
-            // Webpack error when using loadchildren string syntax.
-            const hasMissingModuleError = logger.includes('Could not resolve module')
-              // TS type error when using import().
-              || logger.includes('Cannot find module')
-              // Webpack error when using import() on a rebuild.
-              // There is no TS error because the type checker is forked on rebuilds.
-              || logger.includes('Module not found');
-            expect(hasMissingModuleError).toBe(true, 'Should show missing module error');
-            logger.clear();
-            host.appendToFile('src/main.ts', ' ');
-          }),
-          take(2),
-        ).toPromise();
+        await run.output
+          .pipe(
+            timeout(15000),
+            tap(buildEvent => expect(buildEvent.success).toBe(false)),
+            tap(() => {
+              // Webpack error when using loadchildren string syntax.
+              const hasMissingModuleError =
+                logger.includes('Could not resolve module') ||
+                // TS type error when using import().
+                logger.includes('Cannot find module') ||
+                // Webpack error when using import() on a rebuild.
+                // There is no TS error because the type checker is forked on rebuilds.
+                logger.includes('Module not found');
+              expect(hasMissingModuleError).toBe(true, 'Should show missing module error');
+              logger.clear();
+              host.appendToFile('src/main.ts', ' ');
+            }),
+            take(2),
+          )
+          .toPromise();
         await run.stop();
       });
 
@@ -75,7 +93,13 @@ describe('Browser Builder lazy modules', () => {
         host.writeMultipleFiles(imports);
 
         const { files } = await browserBuild(architect, host, target, { aot: true });
-        expect(files['lazy-lazy-module-ngfactory.js']).not.toBeUndefined();
+        if (ivyEnabled) {
+          const data = await files['lazy-lazy-module.js'];
+          expect(data).not.toBeUndefined('Lazy module output bundle does not exist');
+          expect(data).toContain('LazyModule.ngModuleDef');
+        } else {
+          expect(files['lazy-lazy-module-ngfactory.js']).not.toBeUndefined();
+        }
       });
     });
   }
@@ -206,8 +230,14 @@ describe('Browser Builder lazy modules', () => {
     const { files } = await browserBuild(architect, host, target, {
       lazyModules: ['src/app/lazy/lazy.module'],
       aot: true,
-      optimization: true,
     });
-    expect(files['src-app-lazy-lazy-module-ngfactory.js']).not.toBeUndefined();
+
+    if (ivyEnabled) {
+      const data = await files['src-app-lazy-lazy-module.js'];
+      expect(data).not.toBeUndefined('Lazy module output bundle does not exist');
+      expect(data).toContain('LazyModule.ngModuleDef');
+    } else {
+      expect(files['src-app-lazy-lazy-module-ngfactory.js']).not.toBeUndefined();
+    }
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/no-entry-module_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/no-entry-module_spec_large.ts
index 3377f0b00168..0c55828d4d0f 100644
--- a/packages/angular_devkit/build_angular/test/browser/no-entry-module_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/no-entry-module_spec_large.ts
@@ -8,8 +8,7 @@
 
 import { Architect } from '@angular-devkit/architect';
 import { TestLogger } from '@angular-devkit/architect/testing';
-import { browserBuild, createArchitect, host } from '../utils';
-
+import { browserBuild, createArchitect, host, ivyEnabled } from '../utils';
 
 describe('Browser Builder no entry module', () => {
   const target = { project: 'app', target: 'build' };
@@ -30,6 +29,12 @@ describe('Browser Builder no entry module', () => {
   });
 
   it('reports warning when no bootstrap code', async () => {
+    if (ivyEnabled) {
+      pending('Does not apply to Ivy.');
+
+      return;
+    }
+
     host.replaceInFile('src/main.ts', /./g, '');
     host.appendToFile('src/main.ts', `import './app/app.module';`);
 
diff --git a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
index ea88bef2ab70..6585ecdd7fa9 100644
--- a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
@@ -6,13 +6,17 @@
  * found in the LICENSE file at https://angular.io/license
  */
 // tslint:disable:no-big-function
-
 import { Architect } from '@angular-devkit/architect';
 import { TestLogger } from '@angular-devkit/architect/testing';
 import { logging, normalize, virtualFs } from '@angular-devkit/core';
 import { debounceTime, take, takeWhile, tap } from 'rxjs/operators';
-import { createArchitect, host, lazyModuleFiles, lazyModuleStringImport } from '../utils';
-
+import {
+  createArchitect,
+  host,
+  ivyEnabled,
+  lazyModuleFiles,
+  lazyModuleStringImport,
+} from '../utils';
 
 describe('Browser Builder rebuilds', () => {
   const target = { project: 'app', target: 'build' };
@@ -70,47 +74,49 @@ describe('Browser Builder rebuilds', () => {
 
     let phase = 1;
     const run = await architect.scheduleTarget(target, overrides);
-    await run.output.pipe(
-      tap(result => {
-        expect(result.success).toBe(true, 'build should succeed');
-        const hasLazyChunk = host.scopedSync().exists(normalize('dist/lazy-lazy-module.js'));
-        switch (phase) {
-          case 1:
-            // No lazy chunk should exist.
-            if (!hasLazyChunk) {
-              phase = 2;
-              host.writeMultipleFiles({ ...lazyModuleFiles, ...lazyModuleStringImport });
-            }
-            break;
-
-          case 2:
-            // A lazy chunk should have been with the filename.
-            if (hasLazyChunk) {
-              phase = 3;
-              host.writeMultipleFiles(goldenValueFiles);
-            }
-            break;
-
-          case 3:
-            // The golden values should be present and in the right order.
-            const re = new RegExp(
-              /\$\$_E2E_GOLDEN_VALUE_1(.|\n|\r)*/.source
-              + /\$\$_E2E_GOLDEN_VALUE_2(.|\n|\r)*/.source
-              + /\$\$_E2E_GOLDEN_VALUE_3/.source,
-            );
-            const fileName = './dist/main.js';
-            const content = virtualFs.fileBufferToString(
-              host.scopedSync().read(normalize(fileName)),
-            );
-
-            if (re.test(content)) {
-              phase = 4;
-            }
-            break;
-        }
-      }),
-      takeWhile(() => phase < 4),
-    ).toPromise();
+    await run.output
+      .pipe(
+        tap(result => {
+          expect(result.success).toBe(true, 'build should succeed');
+          const hasLazyChunk = host.scopedSync().exists(normalize('dist/lazy-lazy-module.js'));
+          switch (phase) {
+            case 1:
+              // No lazy chunk should exist.
+              if (!hasLazyChunk) {
+                phase = 2;
+                host.writeMultipleFiles({ ...lazyModuleFiles, ...lazyModuleStringImport });
+              }
+              break;
+
+            case 2:
+              // A lazy chunk should have been with the filename.
+              if (hasLazyChunk) {
+                phase = 3;
+                host.writeMultipleFiles(goldenValueFiles);
+              }
+              break;
+
+            case 3:
+              // The golden values should be present and in the right order.
+              const re = new RegExp(
+                /\$\$_E2E_GOLDEN_VALUE_1(.|\n|\r)*/.source +
+                  /\$\$_E2E_GOLDEN_VALUE_2(.|\n|\r)*/.source +
+                  /\$\$_E2E_GOLDEN_VALUE_3/.source,
+              );
+              const fileName = './dist/main.js';
+              const content = virtualFs.fileBufferToString(
+                host.scopedSync().read(normalize(fileName)),
+              );
+
+              if (re.test(content)) {
+                phase = 4;
+              }
+              break;
+          }
+        }),
+        takeWhile(() => phase < 4),
+      )
+      .toPromise();
     await run.stop();
   });
 
@@ -118,12 +124,14 @@ describe('Browser Builder rebuilds', () => {
     const overrides = { watch: true };
 
     const run = await architect.scheduleTarget(target, overrides);
-    await run.output.pipe(
-      debounceTime(500),
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => host.appendToFile('src/app/app.component.css', ':host { color: blue; }')),
-      take(2),
-    ).toPromise();
+    await run.output
+      .pipe(
+        debounceTime(500),
+        tap(buildEvent => expect(buildEvent.success).toBe(true)),
+        tap(() => host.appendToFile('src/app/app.component.css', ':host { color: blue; }')),
+        take(2),
+      )
+      .toPromise();
     await run.stop();
   });
 
@@ -132,10 +140,13 @@ describe('Browser Builder rebuilds', () => {
       'src/funky2.ts': `export const funky2 = (value: string) => value + 'hello';`,
       'src/funky.ts': `export * from './funky2';`,
     });
-    host.appendToFile('src/main.ts', `
+    host.appendToFile(
+      'src/main.ts',
+      `
       import { funky2 } from './funky';
       console.log(funky2('town'));
-    `);
+    `,
+    );
 
     const overrides = { watch: true, forkTypeChecker: false };
     const logger = new TestLogger('rebuild-type-errors');
@@ -143,48 +154,50 @@ describe('Browser Builder rebuilds', () => {
     let buildNumber = 0;
 
     const run = await architect.scheduleTarget(target, overrides, { logger });
-    await run.output.pipe(
-      debounceTime(1000),
-      tap((buildEvent) => {
-        buildNumber += 1;
-        switch (buildNumber) {
-          case 1:
-            expect(buildEvent.success).toBe(true);
-            // Make an invalid version of the file.
-            // Should trigger a rebuild, this time an error is expected.
-            host.writeMultipleFiles({
-              'src/funky2.ts': `export const funky2 = (value: number) => value + 1;`,
-            });
-            break;
-
-          case 2:
-            // The second build should error out with a type error on the type of an argument.
-            expect(buildEvent.success).toBe(false);
-            expect(logger.includes(typeError)).toBe(true);
-            logger.clear();
-            // Change an UNRELATED file and the error should still happen.
-            // Should trigger a rebuild, this time an error is also expected.
-            host.appendToFile('src/app/app.module.ts', `console.log(1);`);
-            break;
-
-          case 3:
-            // The third build should have the same error as the first.
-            expect(buildEvent.success).toBe(false);
-            expect(logger.includes(typeError)).toBe(true);
-            logger.clear();
-            // Fix the error.
-            host.writeMultipleFiles({
-              'src/funky2.ts': `export const funky2 = (value: string) => value + 'hello';`,
-            });
-            break;
-
-          default:
-            expect(buildEvent.success).toBe(true);
-            break;
-        }
-      }),
-      take(4),
-    ).toPromise();
+    await run.output
+      .pipe(
+        debounceTime(1000),
+        tap(buildEvent => {
+          buildNumber += 1;
+          switch (buildNumber) {
+            case 1:
+              expect(buildEvent.success).toBe(true);
+              // Make an invalid version of the file.
+              // Should trigger a rebuild, this time an error is expected.
+              host.writeMultipleFiles({
+                'src/funky2.ts': `export const funky2 = (value: number) => value + 1;`,
+              });
+              break;
+
+            case 2:
+              // The second build should error out with a type error on the type of an argument.
+              expect(buildEvent.success).toBe(false);
+              expect(logger.includes(typeError)).toBe(true);
+              logger.clear();
+              // Change an UNRELATED file and the error should still happen.
+              // Should trigger a rebuild, this time an error is also expected.
+              host.appendToFile('src/app/app.module.ts', `console.log(1);`);
+              break;
+
+            case 3:
+              // The third build should have the same error as the first.
+              expect(buildEvent.success).toBe(false);
+              expect(logger.includes(typeError)).toBe(true);
+              logger.clear();
+              // Fix the error.
+              host.writeMultipleFiles({
+                'src/funky2.ts': `export const funky2 = (value: string) => value + 'hello';`,
+              });
+              break;
+
+            default:
+              expect(buildEvent.success).toBe(true);
+              break;
+          }
+        }),
+        take(4),
+      )
+      .toPromise();
     await run.stop();
   });
 
@@ -194,17 +207,20 @@ describe('Browser Builder rebuilds', () => {
 
     const overrides = { watch: true };
     const run = await architect.scheduleTarget(target, overrides);
-    await run.output.pipe(
-      debounceTime(1000),
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      tap(() => host.writeMultipleFiles({ 'src/type.ts': `export type MyType = string;` })),
-      take(2),
-    ).toPromise();
+    await run.output
+      .pipe(
+        debounceTime(1000),
+        tap(buildEvent => expect(buildEvent.success).toBe(true)),
+        tap(() => host.writeMultipleFiles({ 'src/type.ts': `export type MyType = string;` })),
+        take(2),
+      )
+      .toPromise();
   });
 
   it('rebuilds after errors in JIT', async () => {
     const origContent = virtualFs.fileBufferToString(
-      host.scopedSync().read(normalize('src/app/app.component.ts')));
+      host.scopedSync().read(normalize('src/app/app.component.ts')),
+    );
     host.appendToFile('./src/app/app.component.ts', `console.logg('error')`);
 
     const overrides = { watch: true, aot: false };
@@ -214,99 +230,132 @@ describe('Browser Builder rebuilds', () => {
     logger.subscribe(e => logs.push(e.message));
 
     const run = await architect.scheduleTarget(target, overrides, { logger });
-    await run.output.pipe(
-      debounceTime(1000),
-      tap((buildEvent) => {
-        buildNumber ++;
-        switch (buildNumber) {
-          case 1:
-            // The first build should error out with an error.
-            expect(buildEvent.success).toBe(false);
-            expect(logs.join()).toContain(`Property 'logg' does not exist on type 'Console'`);
-            logs = [];
-            // Fix the error.
-            host.writeMultipleFiles({ 'src/app/app.component.ts': `
+    await run.output
+      .pipe(
+        debounceTime(1000),
+        tap(buildEvent => {
+          buildNumber++;
+          switch (buildNumber) {
+            case 1:
+              // The first build should error out with an error.
+              expect(buildEvent.success).toBe(false);
+              expect(logs.join()).toContain(`Property 'logg' does not exist on type 'Console'`);
+              logs = [];
+              // Fix the error.
+              host.writeMultipleFiles({
+                'src/app/app.component.ts': `
               ${origContent}
               console.errorr('error');
-            `});
-            break;
-
-          case 2:
-            // The second build should have everything fixed.
-            expect(buildEvent.success).toBe(true);
-            expect(logs.join()).not.toContain('Module build failed');
-            break;
-        }
-      }),
-      take(2),
-    ).toPromise();
+            `,
+              });
+              break;
+
+            case 2:
+              // The second build should have everything fixed.
+              expect(buildEvent.success).toBe(true);
+              expect(logs.join()).not.toContain('Module build failed');
+              break;
+          }
+        }),
+        take(2),
+      )
+      .toPromise();
     await run.stop();
   });
 
   it('rebuilds after errors in AOT', async () => {
+    // DISABLED_FOR_IVY - These should pass but are currently not supported
+    if (ivyEnabled) {
+      pending('Broken in Ivy');
+
+      return;
+    }
+
     // Save the original contents of `./src/app/app.component.ts`.
     const origContent = virtualFs.fileBufferToString(
-      host.scopedSync().read(normalize('src/app/app.component.ts')));
+      host.scopedSync().read(normalize('src/app/app.component.ts')),
+    );
     // Add a major static analysis error on a non-main file to the initial build.
     host.replaceInFile('./src/app/app.component.ts', `'app-root'`, `(() => 'app-root')()`);
 
     const overrides = { watch: true, aot: true };
     const logger = new TestLogger('rebuild-aot-errors');
-    const staticAnalysisError = 'Function expressions are not supported in decorators';
+    const staticAnalysisError = ivyEnabled
+      ? 'selector must be a string'
+      : 'Function expressions are not supported in decorators';
     const syntaxError = 'Declaration or statement expected.';
     let buildNumber = 0;
 
     const run = await architect.scheduleTarget(target, overrides, { logger });
-    await run.output.pipe(
-      debounceTime(1000),
-      tap((buildEvent) => {
-        buildNumber += 1;
-        switch (buildNumber) {
-          case 1:
-            // The first build should error out with a static analysis error.
-            expect(buildEvent.success).toBe(false);
-            expect(logger.includes(staticAnalysisError)).toBe(true);
-            logger.clear();
-            // Fix the static analysis error.
-            host.writeMultipleFiles({ 'src/app/app.component.ts': origContent });
-            break;
-
-          case 2:
-            expect(buildEvent.success).toBe(true);
-            // Add an syntax error to a non-main file.
-            host.appendToFile('src/app/app.component.ts', `]]]`);
-            break;
-
-          case 3:
-            // The third build should have TS syntax error.
-            expect(buildEvent.success).toBe(false);
-            expect(logger.includes(syntaxError)).toBe(true);
-            logger.clear();
-            // Fix the syntax error, but add the static analysis error again.
-            host.writeMultipleFiles({
-              'src/app/app.component.ts': origContent.replace(`'app-root'`, `(() => 'app-root')()`),
-            });
-            break;
-
-          case 4:
-            expect(buildEvent.success).toBe(false);
-            // Restore the file to a error-less state.
-            host.writeMultipleFiles({ 'src/app/app.component.ts': origContent });
-            break;
-
-          case 5:
-            // The fifth build should have everything fixed..
-            expect(buildEvent.success).toBe(true);
-            expect(logger.includes(staticAnalysisError)).toBe(true);
-            break;
-        }
-      }),
-      take(5),
-    ).toPromise();
+    await run.output
+      .pipe(
+        debounceTime(1000),
+        tap(buildEvent => {
+          buildNumber += 1;
+          switch (buildNumber) {
+            case 1:
+              // The first build should error out with a static analysis error.
+              expect(buildEvent.success).toBe(false);
+              expect(logger.includes(staticAnalysisError)).toBe(true);
+              logger.clear();
+              // Fix the static analysis error.
+              host.writeMultipleFiles({ 'src/app/app.component.ts': origContent });
+              break;
+
+            case 2:
+              expect(buildEvent.success).toBe(true);
+              expect(logger.includes(staticAnalysisError)).toBe(false);
+              logger.clear();
+              // Add an syntax error to a non-main file.
+              host.appendToFile('src/app/app.component.ts', `]]]`);
+              break;
+
+            case 3:
+              // The third build should have TS syntax error.
+              expect(buildEvent.success).toBe(false);
+              expect(logger.includes(syntaxError)).toBe(true);
+              expect(logger.includes(staticAnalysisError)).toBe(false);
+              logger.clear();
+              // Fix the syntax error, but add the static analysis error again.
+              host.writeMultipleFiles({
+                'src/app/app.component.ts': origContent.replace(
+                  `'app-root'`,
+                  `(() => 'app-root')()`,
+                ),
+              });
+              break;
+
+            case 4:
+              expect(buildEvent.success).toBe(false);
+              expect(logger.includes(syntaxError)).toBe(false);
+              expect(logger.includes(staticAnalysisError)).toBe(true);
+              logger.clear();
+              // Restore the file to a error-less state.
+              host.writeMultipleFiles({ 'src/app/app.component.ts': origContent });
+              break;
+
+            case 5:
+              // The fifth build should have everything fixed..
+              expect(buildEvent.success).toBe(true);
+              expect(logger.includes(syntaxError)).toBe(false);
+              expect(logger.includes(staticAnalysisError)).toBe(false);
+              break;
+          }
+        }),
+        take(5),
+      )
+      .toPromise();
     await run.stop();
   });
 
   it('rebuilds AOT factories', async () => {
+    // DISABLED_FOR_IVY - These should pass but require fixes for resource rebuilds
+    //                    https://github.com/angular/angular/pull/30954
+    if (ivyEnabled) {
+      pending('Broken in Ivy.');
+
+      return;
+    }
 
     host.writeMultipleFiles({
       'src/app/app.component.css': `
@@ -320,69 +369,77 @@ describe('Browser Builder rebuilds', () => {
     let buildNumber = 0;
 
     const run = await architect.scheduleTarget(target, overrides);
-    await run.output.pipe(
-      debounceTime(1000),
-      tap((buildEvent) => {
-        buildNumber += 1;
-        const fileName = './dist/main.js';
-        let content;
-        switch (buildNumber) {
-          case 1:
-            // Trigger a few rebuilds first.
-            // The AOT compiler is still optimizing rebuilds on the first rebuilds.
-            expect(buildEvent.success).toBe(true);
-            host.appendToFile('src/main.ts', 'console.log(1);');
-            break;
-
-          case 2:
-            expect(buildEvent.success).toBe(true);
-            host.appendToFile('src/main.ts', 'console.log(1);');
-            break;
-
-          case 3:
-            // Change the component html.
-            expect(buildEvent.success).toBe(true);
-            host.appendToFile('src/app/app.component.html', '<p>HTML_REBUILD_STRING<p>');
-            break;
-
-          case 4:
-            // Check if html changes are added to factories.
-            expect(buildEvent.success).toBe(true);
-            content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-            expect(content).toContain('HTML_REBUILD_STRING');
-            // Change the component css.
-            host.appendToFile('src/app/app.component.css', 'CSS_REBUILD_STRING {color: #f00;}');
-            break;
-
-          case 5:
-            // Check if css changes are added to factories.
-            expect(buildEvent.success).toBe(true);
-            content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-            expect(content).toContain('CSS_REBUILD_STRING');
-            // Change the component css import.
-            host.appendToFile('src/app/app.component.css', 'CSS_DEP_REBUILD_STRING {color: #f00;}');
-            break;
-
-          case 6:
-            // Check if css import changes are added to factories.
-            expect(buildEvent.success).toBe(true);
-            content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-            expect(content).toContain('CSS_DEP_REBUILD_STRING');
-            // Change the component itself.
-            host.replaceInFile('src/app/app.component.ts', 'app-root',
-              'app-root-FACTORY_REBUILD_STRING');
-            break;
-
-          case 7:
-            // Check if component changes are added to factories.
-            expect(buildEvent.success).toBe(true);
-            content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-            expect(content).toContain('FACTORY_REBUILD_STRING');
-            break;
-        }
-      }),
-      take(7),
-    ).toPromise();
+    await run.output
+      .pipe(
+        debounceTime(1000),
+        tap(buildEvent => {
+          buildNumber += 1;
+          const fileName = './dist/main.js';
+          let content;
+          switch (buildNumber) {
+            case 1:
+              // Trigger a few rebuilds first.
+              // The AOT compiler is still optimizing rebuilds on the first rebuilds.
+              expect(buildEvent.success).toBe(true);
+              host.appendToFile('src/main.ts', 'console.log(1);');
+              break;
+
+            case 2:
+              expect(buildEvent.success).toBe(true);
+              host.appendToFile('src/main.ts', 'console.log(1);');
+              break;
+
+            case 3:
+              // Change the component html.
+              expect(buildEvent.success).toBe(true);
+              host.appendToFile('src/app/app.component.html', '<p>HTML_REBUILD_STRING<p>');
+              break;
+
+            case 4:
+              // Check if html changes are added to factories.
+              expect(buildEvent.success).toBe(true);
+              content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
+              expect(content).toContain('HTML_REBUILD_STRING');
+              // Change the component css.
+              host.appendToFile('src/app/app.component.css', 'CSS_REBUILD_STRING {color: #f00;}');
+              break;
+
+            case 5:
+              // Check if css changes are added to factories.
+              expect(buildEvent.success).toBe(true);
+              content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
+              expect(content).toContain('CSS_REBUILD_STRING');
+              // Change the component css import.
+              host.appendToFile(
+                'src/app/app.component.css',
+                'CSS_DEP_REBUILD_STRING {color: #f00;}',
+              );
+              break;
+
+            case 6:
+              // Check if css import changes are added to factories.
+              expect(buildEvent.success).toBe(true);
+              content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
+              expect(content).toContain('CSS_DEP_REBUILD_STRING');
+              // Change the component itself.
+              host.replaceInFile(
+                'src/app/app.component.ts',
+                'app-root',
+                'app-root-FACTORY_REBUILD_STRING',
+              );
+              break;
+
+            case 7:
+              // Check if component changes are added to factories.
+              expect(buildEvent.success).toBe(true);
+              content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
+              expect(content).toContain('FACTORY_REBUILD_STRING');
+              break;
+          }
+        }),
+        take(7),
+      )
+      .toPromise();
     await run.stop();
   });
 
@@ -391,36 +448,41 @@ describe('Browser Builder rebuilds', () => {
       'src/index.ts': `export * from './interface'`,
       'src/interface.ts': `export interface Foo { bar: boolean };`,
     });
-    host.appendToFile('src/main.ts', `
+    host.appendToFile(
+      'src/main.ts',
+      `
       import { Foo } from './index';
       const x: Foo = { bar: true };
-    `);
+    `,
+    );
 
     const overrides = { watch: true, aot: false };
     let buildNumber = 0;
     const run = await architect.scheduleTarget(target, overrides);
-    await run.output.pipe(
-      debounceTime(1000),
-      tap((buildEvent) => {
-        buildNumber += 1;
-        switch (buildNumber) {
-          case 1:
-            expect(buildEvent.success).toBe(true);
-            host.writeMultipleFiles({
-              'src/interface.ts': `export interface Foo {
+    await run.output
+      .pipe(
+        debounceTime(1000),
+        tap(buildEvent => {
+          buildNumber += 1;
+          switch (buildNumber) {
+            case 1:
+              expect(buildEvent.success).toBe(true);
+              host.writeMultipleFiles({
+                'src/interface.ts': `export interface Foo {
                 bar: boolean;
                 baz?: string;
                };`,
-            });
-            break;
-
-          case 2:
-            expect(buildEvent.success).toBe(true);
-            break;
-        }
-      }),
-      take(2),
-    ).toPromise();
+              });
+              break;
+
+            case 2:
+              expect(buildEvent.success).toBe(true);
+              break;
+          }
+        }),
+        take(2),
+      )
+      .toPromise();
     await run.stop();
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/svg_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/svg_spec_large.ts
index b925fdec0e20..6f151c1a905c 100644
--- a/packages/angular_devkit/build_angular/test/browser/svg_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/svg_spec_large.ts
@@ -7,7 +7,7 @@
  */
 import { Architect } from '@angular-devkit/architect';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { createArchitect, host, outputPath } from '../utils';
+import { createArchitect, host, ivyEnabled, outputPath } from '../utils';
 
 describe('Browser Builder allow svg', () => {
   const target = { project: 'app', target: 'build' };
@@ -48,19 +48,24 @@ describe('Browser Builder allow svg', () => {
     await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
 
     const exists = host.scopedSync().exists(join(outputPath, 'main.js'));
-    expect(exists).toBe(true, '\'main.js\' should exist');
+    expect(exists).toBe(true, '"main.js" should exist');
 
     if (exists) {
       const content = virtualFs.fileBufferToString(
         host.scopedSync().read(join(outputPath, 'main.js')),
       );
 
-      expect(content).toContain('":svg:svg"');
-      expect(host.scopedSync().exists(normalize('dist/app.component.svg')))
-        .toBe(false, 'should not copy app.component.svg to dist');
+      if (ivyEnabled) {
+        expect(content).toContain('ɵɵnamespaceSVG');
+      } else {
+        expect(content).toContain('":svg:svg"');
+      }
+      expect(host.scopedSync().exists(normalize('dist/app.component.svg'))).toBe(
+        false,
+        'should not copy app.component.svg to dist',
+      );
     }
 
     await run.stop();
   });
-
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts
index 940e5bece41b..1a0d12631e44 100644
--- a/packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/vendor-source-map_spec_large.ts
@@ -7,9 +7,10 @@
  */
 import { Architect } from '@angular-devkit/architect';
 import * as path from 'path';
-import { browserBuild, createArchitect, host } from '../utils';
+import { browserBuild, createArchitect, host, ivyEnabled } from '../utils';
 
-describe('Browser Builder external source map', () => {
+// DISABLED_FOR_IVY   These should pass but are currently not supported
+(ivyEnabled ? xdescribe : describe)('Browser Builder external source map', () => {
   const target = { project: 'app', target: 'build' };
   let architect: Architect;
 
diff --git a/packages/angular_devkit/build_angular/test/utils.ts b/packages/angular_devkit/build_angular/test/utils.ts
index a53588a222ed..e866dddc1b1f 100644
--- a/packages/angular_devkit/build_angular/test/utils.ts
+++ b/packages/angular_devkit/build_angular/test/utils.ts
@@ -5,13 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
-import {
-  Architect,
-  BuilderOutput,
-  ScheduleOptions,
-  Target,
-} from '@angular-devkit/architect';
+import { Architect, BuilderOutput, ScheduleOptions, Target } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { TestProjectHost, TestingArchitectHost } from '@angular-devkit/architect/testing';
 import {
@@ -26,11 +20,16 @@ import {
 } from '@angular-devkit/core';
 import { BrowserBuilderOutput } from '../src/browser';
 
+export const ivyEnabled = process.argv.includes('--ivy');
+if (ivyEnabled) {
+  // tslint:disable-next-line:no-console
+  console.warn('********* IVY Enabled ***********');
+}
 
 const devkitRoot = normalize((global as any)._DevKitRoot); // tslint:disable-line:no-any
 export const workspaceRoot = join(
   devkitRoot,
-  'tests/angular_devkit/build_angular/hello-world-app/',
+  `tests/angular_devkit/build_angular/hello-world-app${ivyEnabled ? '-ivy' : ''}/`,
 );
 export const host = new TestProjectHost(workspaceRoot);
 export const outputPath: Path = normalize('dist');
@@ -42,7 +41,6 @@ export const karmaTargetSpec = { project: 'app', target: 'test' };
 export const tslintTargetSpec = { project: 'app', target: 'lint' };
 export const protractorTargetSpec = { project: 'app-e2e', target: 'e2e' };
 
-
 export async function createArchitect(workspaceRoot: Path) {
   const registry = new schema.CoreSchemaRegistry();
   registry.addPostTransform(schema.transforms.addUndefinedDefaults);
@@ -69,7 +67,7 @@ export async function browserBuild(
   target: Target,
   overrides?: json.JsonObject,
   scheduleOptions?: ScheduleOptions,
-): Promise<{ output: BuilderOutput; files: { [file: string]: string } }> {
+): Promise<{ output: BuilderOutput; files: { [file: string]: Promise<string> } }> {
   const run = await architect.scheduleTarget(target, overrides, scheduleOptions);
   const output = (await run.result) as BrowserBuilderOutput;
   expect(output.success).toBe(true);
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/.editorconfig b/tests/angular_devkit/build_angular/hello-world-app-ivy/.editorconfig
new file mode 100644
index 000000000000..e89330a618c1
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/.editorconfig
@@ -0,0 +1,13 @@
+# Editor configuration, see https://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/.gitignore b/tests/angular_devkit/build_angular/hello-world-app-ivy/.gitignore
new file mode 100644
index 000000000000..e3038ca2d394
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/.gitignore
@@ -0,0 +1,3 @@
+# Don't ignore node_modules, this project is not meant to be installed.
+# Also, ~ import path in styles does only looks in the first node_modules found.
+# /node_modules
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/README.md b/tests/angular_devkit/build_angular/hello-world-app-ivy/README.md
new file mode 100644
index 000000000000..fa1c5ca7d3f1
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/README.md
@@ -0,0 +1,27 @@
+# HelloWorldApp
+
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.7.0-beta.1.
+
+## Development server
+
+Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+
+## Code scaffolding
+
+Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
+
+## 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
+
+Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Running end-to-end tests
+
+Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/angular.json b/tests/angular_devkit/build_angular/hello-world-app-ivy/angular.json
new file mode 100644
index 000000000000..25e2f12f40e5
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/angular.json
@@ -0,0 +1,162 @@
+{
+  "$schema": "../../../../packages/angular_devkit/core/src/workspace/workspace-schema.json",
+  "version": 1,
+  "newProjectRoot": "./projects",
+  "cli": {},
+  "schematics": {},
+  "targets": {},
+  "projects": {
+    "app": {
+      "root": "src",
+      "sourceRoot": "src",
+      "projectType": "application",
+      "prefix": "app",
+      "schematics": {},
+      "targets": {
+        "build": {
+          "builder": "../../../../packages/angular_devkit/build_angular:browser",
+          "options": {
+            "outputPath": "dist",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "src/tsconfig.app.json",
+            "progress": false,
+            "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
+            }
+          }
+        },
+        "server": {
+          "builder": "../../../../packages/angular_devkit/build_angular:server",
+          "options": {
+            "outputPath": "dist-server",
+            "main": "src/main.server.ts",
+            "tsConfig": "src/tsconfig.server.json",
+            "progress": false
+          }
+        },
+        "app-shell": {
+          "builder": "../../../../packages/angular_devkit/build_angular:app-shell",
+          "options": {
+            "browserTarget": "app:build",
+            "serverTarget": "app:server"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "app:build:production"
+            }
+          }
+        },
+        "serve": {
+          "builder": "../../../../packages/angular_devkit/build_angular:dev-server",
+          "options": {
+            "browserTarget": "app:build",
+            "watch": false
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "app:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "../../../../packages/angular_devkit/build_angular:extract-i18n",
+          "options": {
+            "browserTarget": "app:build"
+          }
+        },
+        "test": {
+          "builder": "../../../../packages/angular_devkit/build_angular:karma",
+          "options": {
+            "main": "src/test.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "src/tsconfig.spec.json",
+            "karmaConfig": "karma.conf.js",
+            "browsers": "ChromeHeadlessCI",
+            "progress": false,
+            "watch": false,
+            "styles": [
+              {
+                "input": "src/styles.css"
+              }
+            ],
+            "scripts": [],
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ]
+          }
+        },
+        "lint": {
+          "builder": "../../../../packages/angular_devkit/build_angular:tslint",
+          "options": {
+            "tsConfig": [
+              "src/tsconfig.app.json",
+              "src/tsconfig.spec.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        },
+        "lint-test": {
+          "builder": "../../../../packages/angular_devkit/build_angular:tslint",
+          "options": {
+            "tsConfig": "src/tsconfig.spec.json",
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    },
+    "app-e2e": {
+      "root": "e2e",
+      "projectType": "application",
+      "targets": {
+        "e2e": {
+          "builder": "../../../../packages/angular_devkit/build_angular:protractor",
+          "options": {
+            "protractorConfig": "protractor.conf.js",
+            "devServerTarget": "app:serve",
+            "webdriverUpdate": false
+          }
+        },
+        "lint": {
+          "builder": "../../../../packages/angular_devkit/build_angular:tslint",
+          "options": {
+            "tsConfig": "e2e/tsconfig.e2e.json",
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/browserslist b/tests/angular_devkit/build_angular/hello-world-app-ivy/browserslist
new file mode 100644
index 000000000000..7fd7c3b8783f
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/browserslist
@@ -0,0 +1,4 @@
+# We want to run tests large with ever green browser so that 
+# we never trigger differential loading as this will slow down the tests.
+
+last 2 Chrome versions
\ No newline at end of file
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/e2e/app.e2e-spec.ts b/tests/angular_devkit/build_angular/hello-world-app-ivy/e2e/app.e2e-spec.ts
new file mode 100644
index 000000000000..05f1adf816da
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/e2e/app.e2e-spec.ts
@@ -0,0 +1,21 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { AppPage } from './app.po';
+
+describe('hello-world-app App', () => {
+  let page: AppPage;
+
+  beforeEach(() => {
+    page = new AppPage();
+  });
+
+  it('should display welcome message', () => {
+    page.navigateTo();
+    expect(page.getTitleText()).toEqual('Welcome to app!');
+  });
+});
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/e2e/app.po.ts b/tests/angular_devkit/build_angular/hello-world-app-ivy/e2e/app.po.ts
new file mode 100644
index 000000000000..ba8e25c4823e
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/e2e/app.po.ts
@@ -0,0 +1,18 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { browser, by, element } from 'protractor';
+
+export class AppPage {
+  navigateTo() {
+    return browser.get(browser.baseUrl);
+  }
+
+  getTitleText() {
+    return element(by.css('app-root h1')).getText();
+  }
+}
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/e2e/tsconfig.e2e.json b/tests/angular_devkit/build_angular/hello-world-app-ivy/e2e/tsconfig.e2e.json
new file mode 100644
index 000000000000..39b800f78961
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/e2e/tsconfig.e2e.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/e2e",
+    "module": "commonjs",
+    "target": "es5",
+    "types": [
+      "jasmine",
+      "jasminewd2",
+      "node"
+    ]
+  }
+}
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/karma.conf.js b/tests/angular_devkit/build_angular/hello-world-app-ivy/karma.conf.js
new file mode 100644
index 000000000000..1f190e628d37
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/karma.conf.js
@@ -0,0 +1,46 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+const path = require('path');
+
+module.exports = function(config) {
+  config.set({
+    basePath: '',
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
+    plugins: [
+      require('karma-jasmine'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-html-reporter'),
+      require('karma-coverage-istanbul-reporter'),
+      require('@angular-devkit/build-angular/plugins/karma'),
+    ],
+    client: {
+      clearContext: false, // leave Jasmine Spec Runner output visible in browser
+    },
+    coverageIstanbulReporter: {
+      dir: path.join(__dirname, 'coverage'),
+      reports: ['html', 'lcovonly'],
+      fixWebpackSourcePaths: true,
+    },
+    reporters: ['progress', 'kjhtml'],
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: true,
+    browsers: ['Chrome'],
+    customLaunchers: {
+      ChromeHeadlessCI: {
+        base: 'ChromeHeadless',
+        flags: ['--disable-gpu'],
+      },
+    },
+    singleRun: false,
+  });
+};
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/package.json b/tests/angular_devkit/build_angular/hello-world-app-ivy/package.json
new file mode 100644
index 000000000000..5aecb7dd20b6
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/package.json
@@ -0,0 +1,50 @@
+{
+  "name": "hello-world-app",
+  "version": "0.0.0",
+  "license": "MIT",
+  "scripts": {
+    "ng": "ng",
+    "start": "ng serve",
+    "build": "ng build --prod",
+    "test": "ng test",
+    "lint": "ng lint",
+    "e2e": "ng e2e"
+  },
+  "private": true,
+  "dependencies": {
+    "//NOTE1": "These dependencies are not actually installed so it doesn't matter what they are.",
+    "//NOTE2": "The used dependencies are the ones in packages/angular_devkit/build_angular.",
+    "@angular/animations": "^6.0.0-rc.0",
+    "@angular/common": "^6.0.0-rc.0",
+    "@angular/compiler": "^6.0.0-rc.0",
+    "@angular/core": "^6.0.0-rc.0",
+    "@angular/forms": "^6.0.0-rc.0",
+    "@angular/http": "^6.0.0-rc.0",
+    "@angular/platform-browser": "^6.0.0-rc.0",
+    "@angular/platform-browser-dynamic": "^6.0.0-rc.0",
+    "@angular/router": "^6.0.0-rc.0",
+    "rxjs": "~6.2.0",
+    "zone.js": "^0.8.19"
+  },
+  "devDependencies": {
+    "@angular/cli": "1.7.0-beta.1",
+    "@angular/compiler-cli": "^6.0.0-rc.0",
+    "@angular/language-service": "^6.0.0-rc.0",
+    "@types/jasmine": "~2.8.3",
+    "@types/jasminewd2": "~2.0.2",
+    "@types/node": "~6.0.60",
+    "codelyzer": "^5.0.0",
+    "jasmine-core": "~2.8.0",
+    "jasmine-spec-reporter": "~4.2.1",
+    "karma": "~2.0.0",
+    "karma-chrome-launcher": "~2.2.0",
+    "karma-cli": "~1.0.1",
+    "karma-coverage-istanbul-reporter": "~2.0.0",
+    "karma-jasmine": "~1.1.0",
+    "karma-jasmine-html-reporter": "^0.2.2",
+    "protractor": "~5.4.0",
+    "ts-node": "~4.1.0",
+    "tslint": "~5.9.1",
+    "typescript": "~2.5.3"
+  }
+}
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/protractor.conf.js b/tests/angular_devkit/build_angular/hello-world-app-ivy/protractor.conf.js
new file mode 100644
index 000000000000..f18562f46242
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/protractor.conf.js
@@ -0,0 +1,38 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// Protractor configuration file, see link for more information
+// https://github.com/angular/protractor/blob/master/lib/config.ts
+
+const { SpecReporter } = require('jasmine-spec-reporter');
+const { resolve } = require('path');
+
+exports.config = {
+  allScriptsTimeout: 11000,
+  specs: ['./e2e/**/*.e2e-spec.ts'],
+  capabilities: {
+    browserName: 'chrome',
+    chromeOptions: {
+      args: ['--headless', '--disable-gpu', '--window-size=800,600'],
+      binary: require('puppeteer').executablePath(),
+    },
+  },
+  directConnect: true,
+  baseUrl: 'http://localhost:4200/',
+  framework: 'jasmine',
+  jasmineNodeOpts: {
+    showColors: true,
+    defaultTimeoutInterval: 30000,
+    print: function() {},
+  },
+  onPrepare() {
+    require('ts-node').register({
+      project: resolve(__dirname, './e2e/tsconfig.e2e.json'),
+    });
+    jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
+  },
+};
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/app/app.component.css b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/app/app.component.css
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/app/app.component.html b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/app/app.component.html
new file mode 100644
index 000000000000..248632148832
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/app/app.component.html
@@ -0,0 +1,22 @@
+<!--The content below is only a placeholder and can be replaced.-->
+<div style="text-align:center">
+  <h1>
+    Welcome to {{ title }}!
+  </h1>
+  <img width="300" alt="Angular Logo" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNTAgMjUwIj4KICAgIDxwYXRoIGZpbGw9IiNERDAwMzEiIGQ9Ik0xMjUgMzBMMzEuOSA2My4ybDE0LjIgMTIzLjFMMTI1IDIzMGw3OC45LTQzLjcgMTQuMi0xMjMuMXoiIC8+CiAgICA8cGF0aCBmaWxsPSIjQzMwMDJGIiBkPSJNMTI1IDMwdjIyLjItLjFWMjMwbDc4LjktNDMuNyAxNC4yLTEyMy4xTDEyNSAzMHoiIC8+CiAgICA8cGF0aCAgZmlsbD0iI0ZGRkZGRiIgZD0iTTEyNSA1Mi4xTDY2LjggMTgyLjZoMjEuN2wxMS43LTI5LjJoNDkuNGwxMS43IDI5LjJIMTgzTDEyNSA1Mi4xem0xNyA4My4zaC0zNGwxNy00MC45IDE3IDQwLjl6IiAvPgogIDwvc3ZnPg==">
+</div>
+<h2>Here are some links to help you start: </h2>
+<ul>
+  <li>
+    <h2><a target="_blank" rel="noopener" href="https://angular.io/tutorial">Tour of Heroes</a></h2>
+  </li>
+  <li>
+    <h2><a target="_blank" rel="noopener" href="https://github.com/angular/angular-cli/wiki">CLI Documentation</a></h2>
+  </li>
+  <li>
+    <h2><a target="_blank" rel="noopener" href="https://blog.angular.io/">Angular blog</a></h2>
+  </li>
+</ul>
+
+<p i18n>i18n test</p>
+
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/app/app.component.spec.ts b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/app/app.component.spec.ts
new file mode 100644
index 000000000000..b7a7162e8e1f
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/app/app.component.spec.ts
@@ -0,0 +1,32 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { TestBed, async } from '@angular/core/testing';
+import { AppComponent } from './app.component';
+describe('AppComponent', () => {
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [AppComponent],
+    }).compileComponents();
+  }));
+  it('should create the app', async(() => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.debugElement.componentInstance;
+    expect(app).toBeTruthy();
+  }));
+  it(`should have as title 'app'`, async(() => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.debugElement.componentInstance;
+    expect(app.title).toEqual('app');
+  }));
+  it('should render title in a h1 tag', async(() => {
+    const fixture = TestBed.createComponent(AppComponent);
+    fixture.detectChanges();
+    const compiled = fixture.debugElement.nativeElement;
+    expect(compiled.querySelector('h1').textContent).toContain('Welcome to app!');
+  }));
+});
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/app/app.component.ts b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/app/app.component.ts
new file mode 100644
index 000000000000..7ea162bf0946
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/app/app.component.ts
@@ -0,0 +1,17 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-root',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.css'],
+})
+export class AppComponent {
+  title = 'app';
+}
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/app/app.module.ts b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/app/app.module.ts
new file mode 100644
index 000000000000..ba889e142a96
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/app/app.module.ts
@@ -0,0 +1,19 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { BrowserModule } from '@angular/platform-browser';
+import { NgModule } from '@angular/core';
+
+import { AppComponent } from './app.component';
+
+@NgModule({
+  declarations: [AppComponent],
+  imports: [BrowserModule],
+  providers: [],
+  bootstrap: [AppComponent],
+})
+export class AppModule {}
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/app/app.server.module.ts b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/app/app.server.module.ts
new file mode 100644
index 000000000000..e6203b203b30
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/app/app.server.module.ts
@@ -0,0 +1,18 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { NgModule } from '@angular/core';
+import { ServerModule } from '@angular/platform-server';
+
+import { AppModule } from './app.module';
+import { AppComponent } from './app.component';
+
+@NgModule({
+  imports: [AppModule, ServerModule],
+  bootstrap: [AppComponent],
+})
+export class AppServerModule {}
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/assets/.gitkeep b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/assets/.gitkeep
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/environments/environment.prod.ts b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/environments/environment.prod.ts
new file mode 100644
index 000000000000..585b70e8c518
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/environments/environment.prod.ts
@@ -0,0 +1,10 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+export const environment = {
+  production: true,
+};
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/environments/environment.ts b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/environments/environment.ts
new file mode 100644
index 000000000000..7a2b5a1e7ce5
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/environments/environment.ts
@@ -0,0 +1,15 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// The file contents for the current environment will overwrite these during build.
+// The build system defaults to the dev environment which uses `environment.ts`, but if you do
+// `ng build --env=prod` then `environment.prod.ts` will be used instead.
+// The list of which env maps to which file can be found in `.angular-cli.json`.
+
+export const environment = {
+  production: false,
+};
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/favicon.ico b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..8081c7ceaf2be08bf59010158c586170d9d2d517
GIT binary patch
literal 5430
zcmc(je{54#6vvCoAI3i*G5%$U7!sA3wtMZ$fH6V9C`=eXGJb@R1%(I_{vnZtpD{6n
z5Pl{DmxzBDbrB>}`90e12m8T*36WoeDLA&SD_hw{H^wM!cl_RWcVA!I+x87ee975;
z@4kD^=bYPn&pmG@(+JZ`rqQEKxW<}RzhW}I!|ulN=fmjVi@x{p$cC`)5$a!)X&U<D
zFCrQtlPskre}dB7oMCp>+blKNvN5tg=uLvuLnuqRM;Yc*swiexsoh#XPNu{9F#c`G
zQLe{yWA(Y6(;>y|-e<R78l|^`vH6ft-mErSG~Y`TZF2qm1=W=MNd^2V3)n2xIl=~X
zcQ9VjzHW38ty|rZz+bkcR(-c)`wbqC#l0CF>fAy11k<09(@Oo1B2@0`PtZSkqK&${
zgEY}`W@t{%?9u5rF?}Y7OL{338l<M%K~-+w4iJ-2C_>*JY#P!%MVQY@oqnItpZ}?s
z!r?*kwuR{A@jg2Chlf0^{q*>8n5Ir~YWf*wmsh7B5&EpHfd5@xVaj&gqsdui^spyL
zB|kUoblGoO7G(MuKTfa9?pGH0@QP^b#!lM1yHWLh*2iq#`C1TdrnO-d#?Oh@XV2HK
zKA{`eo{--^K&MW66Lgsktfvn#cCAc*(}qsfhrvOjMGLE?`dHVipu1J3Kgr%g?cNa8
z)pkmC8DGH~fG+dlrp(5^-QBeEvkOvv#q7MBVLtm2oD^$lJZx--_=K&Ttd=-krx(Bb
zcEoKJda@S!%%@`P-##$>*u%T*mh+QjV@)Qa=Mk1?#zLk+M4tIt%}wagT{5<jKE$zW
zf^v7jW~uUE-%mB7^CHH8TL1|_urI~hKTTLO4e;Zw7r~I(052QT!nq=k3BK4rWn{P1
zm1bHmzb3QsEPddOfehts!4+*he<-J0Tp_H*ozKD(I$*vEIRc5vL3kd@p{$kjMIKQs
z<pI0(Vu7$}v<2fENHCVA=ZgE(eBp=9a;_O`BkfrU-cm?UdhYP}+z)k)*4wQOW0K7S
zxLV9h7PeF2dOvMg->J%!tXAE;r{@=bb%nNVxvI+C+$t?!VJ@0d@HIyMJTI{vEw0Ul
ze(ha!e&qANbTL1ZneNl45t=#Ot??C0MHjjgY8%*mGisN|S6%g3;Hlx#fMNcL<87MW
zZ>6moo1YD?P!fJ#Jb(4)_cc50X5n0KoDYfdPoL^iV`k&o{LPyaoqMqk92wVM#_O0l
z09$(A-D+gVIlq4TA&{1T@BsUH`Bm=r#l$Z51J<A&BjWib@$s|gZJQqmbJQD%pmuqr
zlRi3r%o8I$s7b`Nd|6!*{)IIXevOQu?P#Tr`(a_yaC`Z3mz2%s0J*VP!oMryv%aGJ
zJ%+hr;JUR9N%=NQUAcsxH1Ev(z=Jw5x*3ZP^w64B9T1;d$FN#v|K3{yO?U3}p#~CX
zQeul5J0S-k&QP-WS^uxU^lJ9qPEkik*MChluj|;LEt~#I8atbRn<NLMVzYM(P(Mc^
z+=Vcf!|a)D*bAJ$B)>-U&F32+hfUP-iLo=jg7Xmy+WLq6_tWv&`wDlz#`&)Jp~iQf
zZP)tu>}pIIJKuw+$&t}GQuqMd%Z>0?t%&BM&W<om&b&wS^Ui5`y0`bK`dz>o^4P^Y
z)c6h^f2R>X8*}q|bblAF?@;%?2>$y+cMQbN{X$)^R>v<j%HOoXFL3nF-$ASizAu7L
zA~a)K^qdiKCTsOM0PF^%{K=Uu<ZEZkC-ypeB>tNq_5AB|0N5U*d^T?X9{xQnJYeU{
zoZL#obI;~Pp95f1`%X3D$Mh*4^?O?IT~7HqlWguezmg?Ybq|7>qQ(@pPHbE9V?f|(
z+0xo!#m@Np9PljsyxBY-UA*{U*la#8Wz2sO|48_-5t8%_!n?S$zlGe+NA%?vmxjS-
zHE5O3ZarU=X}$7>;Okp(UWXJxI%G_J-@IH;%5#Rt$(WUX?6*Ux!IRd$dLP6+SmPn=
z8zjm4jGjN772R{FGkXwcNv8GBcZI#@Y2m{RNF_w8(Z%^A*!bS*!}s6sh*NnURytky
humW;*g7R+&|Ledvc-<M)bUEqtWbbwV3iw}c{{uEu@7@3a

literal 0
HcmV?d00001

diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/index.html b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/index.html
new file mode 100644
index 000000000000..189ff561c88c
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/index.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>HelloWorldApp</title>
+  <base href="/">
+
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" type="image/x-icon" href="favicon.ico">
+</head>
+<body>
+  <app-root></app-root>
+</body>
+</html>
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/main.server.ts b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/main.server.ts
new file mode 100644
index 000000000000..00f62942d0b2
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/main.server.ts
@@ -0,0 +1,16 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { enableProdMode } from '@angular/core';
+
+import { environment } from './environments/environment';
+
+if (environment.production) {
+  enableProdMode();
+}
+
+export { AppServerModule } from './app/app.server.module';
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/main.ts b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/main.ts
new file mode 100644
index 000000000000..cb8269cc1ad4
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/main.ts
@@ -0,0 +1,20 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { enableProdMode } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { AppModule } from './app/app.module';
+import { environment } from './environments/environment';
+
+if (environment.production) {
+  enableProdMode();
+}
+
+platformBrowserDynamic()
+  .bootstrapModule(AppModule)
+  .catch(err => console.log(err));
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/polyfills.ts b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/polyfills.ts
new file mode 100644
index 000000000000..b631294a5491
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/polyfills.ts
@@ -0,0 +1,69 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+/**
+ * This file includes polyfills needed by Angular and is loaded before the app.
+ * You can add your own extra polyfills to this file.
+ *
+ * This file is divided into 2 sections:
+ *   1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
+ *   2. Application imports. Files imported after ZoneJS that should be loaded before your main
+ *      file.
+ *
+ * The current setup is for so-called "evergreen" browsers; the last versions of browsers that
+ * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
+ * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
+ *
+ * Learn more in https://angular.io/guide/browser-support
+ */
+
+/***************************************************************************************************
+ * BROWSER POLYFILLS
+ */
+
+/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+// import 'classlist.js';  // Run `npm install --save classlist.js`.
+
+/**
+ * Web Animations `@angular/platform-browser/animations`
+ * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
+ * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
+ */
+// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
+
+/**
+ * By default, zone.js will patch all possible macroTask and DomEvents
+ * user can disable parts of macroTask/DomEvents patch by setting following flags
+ * because those flags need to be set before `zone.js` being loaded, and webpack
+ * will put import in the top of bundle, so user need to create a separate file
+ * in this directory (for example: zone-flags.ts), and put the following flags
+ * into that file, and then add the following code before importing zone.js.
+ * import './zone-flags.ts';
+ *
+ * The flags allowed in zone-flags.ts are listed here.
+ *
+ * The following flags will work for all browsers.
+ *
+ * (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
+ * (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
+ * (window as any).__zone_symbol__UNPATCHED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
+ *
+ *  in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
+ *  with the following flag, it will bypass `zone.js` patch for IE/Edge
+ *
+ *  (window as any).__Zone_enable_cross_context_check = true;
+ *
+ */
+
+/***************************************************************************************************
+ * Zone JS is required by default for Angular itself.
+ */
+import 'zone.js/dist/zone'; // Included with Angular CLI.
+
+/***************************************************************************************************
+ * APPLICATION IMPORTS
+ */
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/spectrum.png b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/spectrum.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a5f123afc84832cfe8d551417376e7295bc1d15
GIT binary patch
literal 30822
zcmY(KQ;;q^)TQ6H-KTBawt3pNZQHhO+qP|=wr#t6zJKOoW_CTbvoCj5DoJInBtl+R
z91a=_8UO&mNlJ()0sz2P|JC`B!2ji~-0o`tz@1i7L{Qls=xSx`PY?s5z<`e6ugL*b
zbxU6DEGL67SJ9JG6Ah3yT>i0cb2~0z9vC1m|9{B`1LWub$DL%x0uw+sBgiiqQ(R?)
zJxi>ywdY{TlBX<`am-0~<x{NswX%)A9%nbQ5?WsVXPD<WR;S9}5nHk_)f!>TeNdKd
zdTRRrhJmRm6Z58#De`ujXVFr$8$uEc&+`)YRE?s`b6xI-&dTbNGCEcv1!L(Nr*Bh?
zTllz(YO`it30qA<eu;HRhS8KN=FjqW46UbT1QsbFEauZUimwR=kiMPuFh=SafhTVF
z=kMVx87-}BJQx5tyJT$<5c$^?#@13PYck(*$&%8p&@eK&IR}NpULY!V$Itk6mCSSL
zAt@H^90C+1DY+VdZf&ei(v<qD!|N4$xhms0SSEb{rrR`;@;EvzZo5NGi+RQgYcc*o
z<?@S3k5NHi;)lGfNXki&+zZ|Uf4&Km9Xoiz1undRT*q*<MsgJ9+3DqmyW5Sr>7FyX
zR6k-gr@R{G&jDEK;k&NQM?sI48{Ts0O3Q>Ks&nk<m)oXDON9(Cgi2JK3=8X8g3liM
z>rkK9&HDtYp4-o!r*$;BMmh0=ttJf8>-N24!>D48kzRNIS3S?q%~d_S#sVRt?MHU{
z;EKdAY3Q%D;MMAFwx9lI(`5o<ZW;L--q(tZ=grTA%jWB>N<d)l4q(Z@tI=dNhXTD)
z2T3|5T~C#4C+ClYt8z0zT+A)E{E{3s^6Sr)r(?HWDs9uWn!9h}?*)Ce9(`niuYgik
z`yJlQiuVLG&AT0}Le|DIj<QX+zXUnjs_c5pYwu83LK4;DZgr6-=2I4%f`I5#P|5xA
z&sWYE?2bjgAR9R8Kmc#1EvKV=>2&lBb*a*zX+5q532AZ$+{{K5{Egq>Y)?FU5D{a@
z`RbFQ+|MFN+j@f^HYn)1zGK?}xC7cCxWLsC*n&sw)wMXnj*mo__mPHKNbj`_I}RU1
zLftKge{`1vc4V7$&pX0ts8`!LKEKNw9SEGhgSfa!1o>%X6zJ~QJSa7r%06z&Q5qQp
zV9iDxfvwf*H_N4#t)&9Cl1&QwsSBPhyU&i_`w%q1nW!_xlIJIJ8k`1((Ih|Nb0I=J
za$a&D+q0j7OS2eGvHYvb5>qA$qJe~V?~mb`)#5^JySi~G+pwPV0cLKHb!Xef>_!#+
z6S`G4hwABDI1KOL$2#k%cp+SgtRe~-B_@k-`+^itu+TVSh=2HJ+dp_{MzD*$1zrZ6
zVFOwwyyO|P%_fMLE8jsnA4?iJ=hRE>927Gk$xPU%wfqFGnt!|g>P@*XWL1}gq&OZz
ze;`Oj#1LU=H<n%*A}t(Zj2Kd{Xat5`T+ztJzbD!oVQux>kXJ%O2vx<&t7QzUyW(&i
zCvSZ65%uF(ey;lywoyhry`p4&MVBKQnez#hwE8ggRSvI?i%eh_M*3n5jY$!0;uT`U
zDXZa9qQR3hDxRgK3FbuU&&-MFEd=K9RU8fo0;+LDiR%PJbr$FiN(gzm452iPE*nDN
zJQu0wglsJTsM%-{MHouwR@JvZEQVwWsYFjdEa`VfnoGFEmW^8jpIeqrPoAUigdbf<
zz#$#RhZILnZ^$n!D1Zx}{Z<pf#)^2qmR06U$`vY_a&U4GJtbRp%T`&eEJ3RO39Vzw
zmf!>?beG{!dMv377jF(+5QGZf#_h-?RUEv}BG(W!7pq(#6&xNQkyRv&6Ca_nicPjJ
z_>qLHhFKfD6AF1OtFj6LLyZYQfC~SW?GI{6=LSms`je3;L|!L?jS?)IAK)e3+`N_L
zMoOiU3Slm_Y!4$f8m&LdWVb^J1OsKrL`*a~z<|W4D^d+SED<WJo%H8271?JpWt!{a
z2m@<&5H8y!E@j_5dJ~K>Cm4ia(4mf1GnA?t`o1zswg4+~qJ%4rV!6O1xFN(q)TrKT
zTutK)bGb=$2WU?e$5a@bo^(FmVR-UVXvDoY)Dbcm8|JW>$R-js?ejq$AOIq(rb%tr
zN96*)nmJe^k7X6MCT-YXK&BD9&miLuD{_}2kGtNkZ$T&>$}{%(V!n<>EgX7<UEkeM
ziQOjEpbe)_#hXIMTwJChJ|xp>?xE8T`HRfVfaHBpvob)`9ie3SWWHR=bhf&-jDJZ~
zy8BRb*aU|3{`GewdWoZ_>wtOcwh9?CxjDI<(3F>d;dLq!lxVe%`moLSwtY`{X#_t@
zFB?bwWJXW`(-3j+s$uc7X(-Lxn(r25DJ4%M7xz|gZ_;tm)UTBFaoo;Uo}looP1<ly
z_Kuf%huzc#SP+dSkl}UbYQAQdGf@;=52~oBK=y4vd%Q(&gYIqK`<#3ghL53-k++>H
z-cHkwvtfVfJ%QaU)UujkGu7ix4I#SwjQFw0sC$Xl!aTGbCmiW-pT<^z(mo77lipVY
zm?b{`Wr)o*IGhInkrPqk{zq?1&D+w)y85(Hj%H5gt{|*5peEaELBCF|6pZe3892%I
zcjx{LBaTx$n4W-PEWzW99f3eJ`p3ZoC!Cjc=k+p@!y72PA1D1eX7``NPnhx_4u1*V
z?5ke`N>F!z*XOJ3H2kcmZ=qiVcUiGKWDq5JjWq9F)n_ffPMhx~V9;(3wwIYYoLQ%w
z^gKUNLGxKt9n4Ym56}yUFQ--r#BniZ6LuHZ`w<7dIW~4OI@$Z&?>K0=-OuX#Ok(Wc
z2$jHSuYSI<gg<a^gD-b>czbsrPXw#vqk;L2ruFkFUcQcd-LEp}-p0K@)Sp_+!mH*`
zrv5N}nm9hTg$S(%OLsR{^G%077;XtLN@!|cox{MJ8LhBv3AeM*dXFX7g9tMApf98y
z&>+e{On5-X>s0m^KKxzwlQ89sEcwEp4i-3;4KC_uv%GAhUcFCo{v%CH@&Jy1|Nd&H
zb)HCbukM)SY4)jOT#m0fTZXG(D%)t87nRSh@qY|N@hnc7>;U&pqDHRxtK&$mAt7=)
z=1WO}2?z#F@5P)K)S-=tVQSTJxc4J%KI3$e-7h8!Fer(d5}4(kNFec-3tsVAcj2w!
zG3^!Wd=lV#m`K^Th`7se8G?qu#H8}gQ;JGOjtO*!lEj`723X6KzYQAyvPgT*6>QV-
zxBr?zJoB5D<t|m9fBL>mJDnUAl(>P3^vt1)>|`TZE?Cj?=Ko@PVXT3|$VETaz@tGD
z?jwX^w6VP}MY?-cy+reVXuFL2H@z^0F0y{zLHG3s0z_>PKTu^poPALjFhlp7A8rmq
zwd?Kpi-Yv5-(_J*45O4s(P;S|y39iQ>`!t>A>^=J2YkQf!39i}j5rd-6^Dt=g9yk>
z8{Bn-qEA^<%{euU3I8V2zQL`8w3&tSX(8gSmK{e1ec<;P$$izny-)ZWSAjBWQiaE9
z<aoPSBC>6HALW0_;WS?6w_2paPA<&*I}~U~fYl+@^KO{L1Ks{~6U8>k@rcNQXeSfA
z7pkMYYPo&wL7QFpncdRlZ%Q<>X1Ati{AChO_ejS~%lO~n7WO~GkiNw9%Rfcy=TGHV
zk(=>*B>|7UC6{JStd6cdRh#c;y-M~PiCz~M==P86YpwTwqzaKz5Zx*7@28U)q`GV3
zF=gTsW;Bso50gEZv>HFl%Xk-dsii#Zyz}p`k~;fVftBBzmI{>^AopuIyNxZ*^nhQc
zzEPDrsobq8zep8es;})!wu2t;zg}lY?+RfuM#V;lTo@5w8ZMAs@*{WuKq0_Nh!;vw
znCLK0Ll9iPzfNes9$r{04$Z>w*ExnQ9(vV2{OrF+{rKlQx@TW!TPjwIFXP;7`tJ5^
zb<-?=^ZqoYyUHh-H*!KV{b>ij;5#hH6@FDdDNe2(@nnnrwH~v+2eoL&J#!rUrkhfc
zd#Y#k+Y7gBFly-d`qrJ@UZ2ZN=X3Ez4KM7d4WNlOPOV+|aBvzlqlq41y2YOC^>MLu
z*cj_gRm$S~ot&kEW`x$8#}rb@TW9;aX2zCH$2RCYacdv^6X)i4JsD$d{8-83o2GJx
z5ai?g30Vh-9BU3a#|x&xb@_U~iJijRY^WbCBjRw;)K)&^E+qYzXm2FmOhGZ&{Tfrn
zzSU=|uOi%k*ql7laC}ZXbjtg$rGE6YW$6;dm)l2#OuPlGK;x8uc_sH@4+50rVD@A9
zWIwOB_FRTK32{uLNyv;Y8i*e@GJ?C2)_EiFtc>2nMB46ThB^_Hn9?ZspBp(T+r-MU
zF>k#=KH1UNmt>3dB`}^B7}tCJX6V{Yi`=vK69)U?G0Tu77(~g4#ci5gP2BrguCKB5
z8TOiW`|EK)Tdfpb^>bmen6{XjnrTu!W^=N@ty}G8dn@I5@g9$g0VO<v0Ug1I8gK7o
z@_RyCjjRed?pKP(*O$qqt!Hf*(!Oa*)_el52qF)kkKk3(*cy|`QyyR|CFZA2uVeop
ztP8u4u8mhtG$QYPs%P^)=<}h%W$NO)8q_dS_rmwN_4MQI08+U=8*u34_xg9)>T}qE
zb;2K43lP?agRgO&2`(t2s>fM#Grr0&KTepaGS+?;THR>~!x*@IXx1PZC*-u-%@hH~
zb<|KuFG%b-qr}Ugz;U)FTf<$+I~@i4LY-FEcMy>yz4TMGDg5`0rYRj~nZ}ecN@Lm(
z?Z4WY3_aN;jlUJ7g(S>EvTM}B%f@N1Mfwn9=cSD;_QHIJ&sljT5}cn)%-cR6hI}qc
z_vI`$hI`b$!r!UClf!NI$8a~oiAcOH<Xw(Nw;S78Yqy;Vh!EqnKJJy6T2{>knm>Is
zOHJt}xs7kv?KJA!9aVUQfb(qq4TY-9Xmbdm7QgfI*mv2-j3&~=?KqfaFXmyvsH(t|
z2Uev-jeI6X`)eHDUHG@EOJDP_gQr1V^HjVKq6iCbs=^-0Mxn+|AttSL4{gSl{pn`!
zkc{55J*su5n<)XB>keFTCwJq^^1t?m{MxO!8@YU4gHaWZPzPI}6+^-aW}dc8+621K
zKzim!JX(^6qeXdY7qIIrpiR@Or-R1~0$_AM%-J3N%R8=U09(e5Sze>MT_mznpoUHr
z$@D6MW@7^Ey86Lme`_*&8E^4<I=L>Iejj_`m6OZ8<E-Htku?=<pStaP1Cg`NbeqrS
z1x2DAfis#*c>Y_8Kl`)SX*``E0Zp(49rMl@7nf-x`%c7><?D_glcD_^se5p9Pu;d2
zhQ2N6XzrgdJ?<q)rH$pQd2WW2C)B|Os&%d>&LtWR)5rs7m3KW7vh~IvzadFWG<cy=
zt7|74b}2ojqt7QQ6KiyF%-rc}KJb?jPQ<U>JpJmuUamu#rGVwsF$sHztE)SN+TG|+
zj4HLQoF6~brgTV4G^nAmR3&?S6E`clj`vzz`D!lDzK?R4sw|GPM}+xsc;y%RGFtrd
z`W}9m_EKWmyd_|^@vbiwiwSp8V70d}qTTnun|}V7b^54TQ>c3ZTMy(oG*H><%9kVg
zEj9eiv1{e&70EI6gcsnR9@2wQUv$_UlWyLBjgKaQCCFLCL~;&2x)&(%!u|kG&}(q`
zL_q3di`+yDB7ahEiC7rD4;+D&?Yr~6%qdX#xbHj;n|K}SdTJIATOFp;m0PD4$|MXu
z&--PzOmuiO(yRTaMkgY$>g~HErAmVR+h3r^SopSG<GcguF1c4p6oQJ-davJg?NRyj
zUvU*&9=5_A*eU{3`~|U`x}0;HfbGZi*<YiHfZB!vw>_=&$S#@+a!op@WcXx`o)>vW
zH81cdh)L6fyJ%plDK8TBkt+}>HRPKscOvbJ??m}T@8T++$5-W7<8AKyX_8%#(xxm2
z`sdu1ufOmEp3fcr$<qhTgg|Dr<7X@>fdBkL^UN3$m1_WCag6KBCqjuvEb8K60T8VY
zs3TWaUW#HZx2NUn7Aw{MNdq@d0EHK1HIPmHT{HAmb3uB4=<hmx{IWk^!Rt-+vY6Zx
z?$V_$BL>i?39&yk0~p!N|GFK*pTphkIC0wV;6sd%CWIqN<(miqQ6{TVIYrS{_Rd1x
zzVLQ%J+F6_Rk>U536FX_4z^Ess{|(ob=!%&?LKW3(5oCY4virRNrQ$?dZlJ0TA0q3
zT)yh-F}y_p?`f;5{$oq5DctsuFU}aB4|ngP1HX<gkg)yT?S`4tdV$t-R$_C^vfR39
z5+|su22B!UG%x@rp*^Ib#Uk@LwI2R1&op8>?hY_FkQ$ypuN6;AnX57XT%gHbAd|zW
z!$cqGINEe+wYtXNgMruIiu4f?`KG&HGsRN@|L9zigKWiCveGZ2C-~{4>dRxQV#UI<
zk(h~aiq9~cCpft^{Ox)RCp%Ngjnl@73L!Xg>b$S_@)?vj5mGBu?p{&%9y%#6))LL5
zx?5c>$rlP>>G8LqygP>`VfX7+GG3GpVP*~e#M(BpZF9Z*1Hr(v)PdG9HaOmPgS(cg
z1E)%!jxE11mV=pLqyT4VJ<gWe3%t+U+l%(+klqy;pyG)x($9iF#l;j|OSS=Z*r&)Y
zX9hC^t;OQ(_O?(Kyy1@KDiw|_j8PH!rWsJ8jgU~&SBI)Zy}uAmyaAZz@}&KKmM{=v
z==xNm920(mjhHxhLoFnq;f09{rdqogg5~j9b$P0Ng$oGyCR(LXM86WW%C$A9rC`%<
zIDdl8ih<#cX5DCi19DF=0*CVuS3v>~ayx6ik|E=(a<2sKB9<tr%%A$gP7Il1mf=8^
z@Rra9jeq7ox$p8vKi*nbB!S~OycmO)Cgj;^7()G-Ts?gD>|R|Cwj;k;_gW_{jO(7F
z2Es>Gk_jXzyQIhL&@e_nxEsonDTt}KSB|8{>yalBygq)m5X}EOb0965lyR?sWQWbk
zwRC;^syG<3V$4;|kRXIexx<=*FN!LJ-&G+S*iWVptt3%Ud;D<~2@#U4A)AjJ&arIt
zjYoV(86Y7I2=;b+-CUgHLcLi)^^lP`itW|SwoFu70#LS;1AQC4c*Hk|t6Q6uK=s3g
z^HKNja*QA%l?rJuiDVbqwx6`=%{z-{$$F6YQ>d%ul`_2>4G<&lN0b(491!rtI8YMQ
z!iOVSf`L6Yh#~XS+A5UD9O%Z#$sOdA$}l^2WBg!H#w0@o?`^FH;m(g>5`p?6p8DM?
z*sijvNWo=W-eL>-N+N0rf#u1llSSf2|4>&jzvPrJYO&z_(>`alvj|OEeRI~pn=wRV
z&K#j3bkijcEix7N1D_ojt3^gGkRGNz0Q@7*f-eZDfm-{%1drGmA`a!c2R?p9Z;eBo
z(&Jc*+NBIeNJGobz)GS@4{$+=lSxcZYU{DGN0&HP_&#!DBGG=bXP3mzm&v$~_+~bw
z1STQl`UsuPxUb!0Y>kC6IFsarF28cqj5CLdxn7iX8Rm;-At?wJk3m1C-HzYZ^YF45
z4^9d=+wqa5AkZU6c?Kd}?(jXuD1)xp-}92VZhrVzx_@m6L;?aoOX`p5<8&pXAytI!
zIf|#w-ro>ZLgWPG5KNYsANFI&w3h~)tpHWK*N*cT4I9ZYd6~NtvHfwEsvmLzl5y7X
z=?ZUp>)VmXhKXC_U!gqfw}|h+E6gFi_!B-BX~*{3+NlyU+!6RBXN!9<OtyXO*DY~J
zEoOT(cVXx&U8|LCVZqKUm^k(I&Bn({Q5fk^LiRd8Ef=bfmK2m};wQt0bJWq<NPFJv
z_YH{nw(l~N^KP&@T0Q-M5POA}Ag$9DS<%FIDFh)IfrWAy&-TAGq7(o3NkRF<=WI;M
z)&!Lj^m*2bxRZ6tza@(AToPd;)h<7ZhLxC_Zz8><i$_ND{pw~*Dj7JH5C;DggU+)o
zNd!jZq$tRJt;urOMT*+tPzOhjg<Q4s;Z4to-7QN5W)CkU7CiJ5-6<k5p<qK;+4GiQ
zTkj;}#PFy7lBxwIIIaMfojZ^iK~k08yFIGsCwvvro+)+4FoI+aIRZWNz*a%`&{bp@
za!(LEVuOKbe8@)E5N(R3h>j3~lPkZ^$Mh2NJ=fR$kgVkIsNULOf{APi1U8B9ny9C{
zb$l_|&&dk*0vifqU=ig3&O|hdyvWw_1^BN<)Zu|GEttU|O`p>>*#r4rcV<pH!RCQc
zR@i`0W<F=GF{rkK)2p-(N&jJ*i3^`T23e=WDMkaeYL(b1zB|=jXlfP<OfjjU#lBqB
z9C};=ZQ^R5o2(I4{4KvYHBpGK%jGHz-VLyl!HPp4FRrWQ($QoYfx&^(iLxgWJtl-k
zwm}`P#0gGB*6Wk42pK2qf4d=bv-u=a8Y1v<QNyc!0+dVb?-}C?&wJfx*FWxlWo>C$
zJq*!|mj)PJq7Nlz0><Uw(;9F$ypHn_NKguieK8~sw1tejjsI?U??<Ba()rRd;{iF<
zG6yg!5+G{MKu~IYy^pwlUU)Qw*IQ+=b$_q~ZS+0xWK>8(*DOf?29{3zC%Oe+o%6V>
zE8QiH9Y1ys@Q?Tj@2F&KMft=scp%Rar4KS-AJPS)u7`IpxCquj#3==;%U=k&{`%@c
z#8@(AZx`*LziOutIc%l-r1i9O9lcFQv=py?o_^<e1Mqyk%@5^G=6xr-De$IPfS9A+
zt^0ayumz;sN&KN5X=FYjrAftvzBCC#9xHvaN$x&8Uio$XF?uXS4<5-&Lhz2oZ4wmZ
zWYN?Whs!Li^p#~+ZSl!-1wUoT_wOI5wy|-t-adVD&f@!A#DsmOO@eU@RW_A&n$X4o
zLbW0(0}pN|Y1IM6jFoX58f;)Mky%d~QPk&O^mgmOQzAcm>k2gk2>3cdHOg1j{kmR@
zk0D8y0`q#?tzg<D6Q~3H#f~Icr&pwmXhGGW9LL;is)c4?7m$Q2%i)@dbPp7y-|!be
z2^x7gA{>78&2I$w(^bpF8~VcsnFm%eEF3}$i0~7?-F;C(xKrtG%Cm@h+?3xV(rXFP
zJ8#g)NmVeBs~7`gsl0xNq@&}Nh*oVHrj`xfA4++dl81~@wadkz*wvP>g_SesOH9fK
zcMRP?86+3P{@*rLiNo7N*ZTZN{X@g*;dBJ6xo`aSW&P5_A&EWU7)9U_BK^@Jo-uCg
z5D~6pOV9PGdzY!CJM~0Rd<6~3uJ^nJ+nM!Ff-MMsQ%0M@Z;9bkq}Zg+a5nYskI<v>
z0HDV4l7ivQ8gob-e)2(?>_;o_Wm9KfgJ05fT%@p7Ufuu;EbyhwyL`eU54MGqVr;DB
zJI;7Ht^=YjN}6m~KPPHl7|VqVNvVGt_U3G7o#{=<YRRKr&C*+y3NaJtj+FBTix7jj
z351|gG|+qa(7F>D0%}@`Hytav`BP~23z+0#82N$aszwqNssbXKC=Rsc4~b}p?Jo>Z
zyk+(ArE098rz%my&J3Y~xI4&}v0ZQh_|c)WfYcx7<q#b65Bygb`?B*i*$S_@eU-m-
z5wUUd_)Ob7FGBq8!se09x)|_9T8gK7i7#yATgGA}AVd-0x=l0=vj-S#%h7{gjAV&S
zh%AOQ#q!`0*hX}Y4)L{d(;?Xy(85U{R>bdpjTin-jR>kCIOO!<y$+&=CO!oGCS7yh
zG~**KeBDl%Sc)MBeI_P5w~{B)sc0$Gf}90S@+zr$nF-zMh<wCE>jn$j7n28kZIjZA
zQsWet?^~n}XzGKv`tpCNzs)?RK15t;gv^__Udh3>?H27$UrXDoD1tL<8(-8VnCXd@
zX%f9OF8}rVki|^W7_td7awN_eP*DA$P&80dvqIV*69bv+ZvZnwrXPfd;luS$n#bLq
zhn5cp|69Ae_&QC#R}b}bUWi^&Nd%S|JU!I##_dzgX^^-F-8YZOY8eVW!bG0Z-^Q^9
z!_SPSA3BcO>KnmIgW9(=SQHYaP(py8%HOO|t7EkH1fdC@kx#FAUoMTBDR#m_iynv-
zr42=nt`bQO|IGmY+{8T;L$VLZLE@(zNbiw?4I@r>9wlHjCN4^~eT))ovk+#NMKeR9
zrXMJD_f?uZ>-zZtj+ev2C4~U$^OkFuIc`d;wvz7fv$tJRwy7rx$!8|=+aLIg&x%eK
z1>T_O7iMKVYfVtVQ_$d?o=1uq*sP*F{6#q<IgGSx5r|(3tt2wmX);~EQ;0`I3Qkcl
z5prUlsUpLUIJM*AK=ltbgtO)mv&cf3Aoc)E;P@#?@90B?Qn7<!fe5q&-0@FL28%OU
zDm04V43Q{Cacvr}v5@S|u|*p66!v1-J>_q|v~%vu)A@)>B{PpII8=R;lL>oT_&{Hu
zgBb60MSL}||NAB{t{VUPV}nuE1Xf<y@ppDC5om~WAupYC7mX54<K%gXsVkO3nnJfJ
zBhs=Z^dQZ#8Y7fzYRk4TGGzJht(Qv*vf6tHz-t&SDj;K1y@T~Jm@}as0zMT%fwTfx
zE!5$C?P63QmJZikj_ko$4XNe(?8TR-6hAP7wPA^-lsw@-1tfK`fW~}nP6t`o&SNd=
z`{)Sdx*y)L$B}TmYgN?|JMD;_W3LE`O(#0!?ec~R&i{W}`A<BV`b%|4#m+>>yrmN)
z+=3y~0C)Hpi1~;53TUV-omBFLrETL=?`pdRXiy%*e}HG*4_~#QbZmP&2YehiQQ4yJ
zt*^W8v?NWZzmD?WMP7e>q1`KDj>-4afewF?k*1AjC)zZ~=!OIs02TuV*z0NkKYscD
zWdA_m|ChTgMVkMtbzQvORlM1>UkVBU{WJpp+)0Y1-+Q07xFC?bl=@tA9c$^7ACQVX
zKpWz}^na{)0YRYu7XTR8{|726;D1Q28Vu~I15_XU+u6-{zLX5lAJ~pkq9|zx3q#K5
zXl@p`Hv|)k7qFMJ4^zaEasUQ}L)1ow9RB{$$@$%pF;}AKd->kA`W&BH19m%|oz3~~
zbvn5kpA`xuAOQGDu5*T*Qg-><WE0%|Mj^##?ca_;(5M3a{IiDsf)D(yH3fXtAfY0|
zPFe2w7li-Pvq67F8?$ueOST0|99*+;(@*@<18}z42Y=524E*!WLlxUaJrvW~tzl%l
zW=JJ4+;`s-r)=HsZ|CwWC8&?T%Qiut3?f6e#AHs{;ApB4f89EepGyga>@q1LC;t4{
zg;}!6u2?@%qo%NW^fUbiE=!<g|4MF(Vffoc(?QV4Ao;0!_)B&x-8({k+aRF=rZeuJ
z6rN(L)adkjohctamXyh-=6@Bj6#<D0@`fkhRcZ7(s)+9-GRq!kjW^c#|626^t)Oa(
z3t#a=j-RC$hyTgZdf9Mi4pM-b`vv&-2S>l9F-Djo9dU5<2P8i5(5(Zjuf9M0t8cX_
z{eBBxY`W8#q`=K^aGLcm5QM;+0#9|HyQbcoq0jC6+Y*HV_@!*1z|HZsy7aI8X4jT3
zaaj%{LIZ9Wn~KDwx6|$@R)0>pY(vQ*krsMFhhT(cSjcq#{rOItKog0#gmyF?<@fp7
z7&N-ISVscps9Lcw2mXv(MM%V&#KGlq9)HqVNK_C$lI|Ofr@c0L+NN*=m3N@MupmSD
z5rG7N3acN&%boEVPuX<k4(!H;aMUbW{I+1z`-3bbAiti?)?BJ>)l>wId(9<r-kEiF
z1dmdP-exkoo0~UhEGFL7#pPe{mSXf&$+hY3PHVRtuTLH`_uV|&+`W{uApfi{i~$P-
zrX<=~>+<+sC67#{(djfA&qj9?l;N8a4&)}LCtsru_@zscOfi{IXjfQ*>ERMeGY$Sg
z_%Df3TIkKM2@Cs8l0Bn3mz~`w`|Q4AcO5C0RvWS4nN%s?zb=095dr`cDGABhw#Peb
zupo&gy18$iziZgGCVNMI)x?!QjhvK(6IY4-VF$_pMbHF?+pvzMF}aL3%aMl?m=l?-
zCd1Dl<pi>Ry^ZhUg0HK+=uvz>90tp4V)CLgiBL5BZ;mSQy=53EdGW)(%|s=k)f{Q`
zT3+e2`(NX4<@@&OBkiV%G~s&Glg@5i<EmMZGFt6cV~6s<lznl-D?ch@AV9pnw6p|U
z7b3teEt)AWhu7&iMC0qR0aQ_wiP&>uEvFMcgTwFqVZ_qMHMiR;U^;K%&mM-EjGXN3
z!H=j~(C-c;N}N@dPlxqd0<n1P&E|$G7mw{hB{`jlLiLXEqC7_^sy=89D@HSk026Ss
zSlyb1y6Wk^!D17MydxlR1v6O~0Rf>X6!=%#DX00)akF{>8!t7z<#4_Lgdgu;pVway
zGCocnU=mR!&d_iM0Vd55+!R6t_9~3Y1=)QS8Rm0VR1wIIK7W#`shLVMhw|bhumkIC
zy&@!T1lx19sikAY<Y~{;QjD5~BR<hFM0Gx}L=pv|J{crZNi^;5Qsb;+{x6OmCC-5h
z5kRGJ*ZSSllQN&Vg?2(@F$FTY#>QSjzqvl-oogIe#qqI>w;KFjt82}I@L1x-J7k9_
zOQthT>_p?|sP;s)P#vN2HGssCc7F&!AQ2eFjr(-H{3-fjyX|*$HvqzK4gEdMOiH#L
zqEx+8ZicyfeJvFPSh*y}NKs0fL@X&auq-OLOBQC6KGNiI-mKs*qYUeB(=^76pp?we
z9F2GUJ^D#{1r-ZA9WR9Z{dCmFuz4avW}8iKzB{t2sf&{oX67mqlop1qa50L(15XWZ
z{2bqQ#dLO#EfNe|&2qdR&M(-WqyhwYl^AK%?38O0N+WSpq{9sxw}GAiwdGf-%CRHp
zs_r%mfhX*W!{>f03bd&jTVa*t5j%I$3@v5>R}l`9g#+v0^%ct^ZVxDsShU%+>p&7a
z=V`ttAB)X(BTRaxGd6@GIQ<uK9+P9P98m8@$VFqEVyona!|8D3ubA`wDAxLdW`kUz
zqFg{BW;eM46R5}C<=LXmTT%d(__3w~_md?E5c<2PEi0WmQuLBvn};UT?m`@7-_u)f
zKHa{}o)jR~K=$-7IJ&2ig{OfDa^BtP^PX5gH1<k=wMlM2y0b~QwFkEpSMyyfm&ca}
z0iXVG2ohQPBR(47Acf-Px^mLA9Dlx)h30CaRinziUcUQeKsyDbG0lqTf62nYXZRQ{
z5R%8|^MSB~eVuOsPBCe9thH$duekUL3%BmMbZol<#Y;N&)6K-daQDa;@STP;hb+NX
z7t*N(MD;zp6S4c3^I^EOsD1p~N;M}YlCR-K`ZybCXppXK{@s}gTR`FqjYC!d5;D`7
zOgod?^eNNHp;&iJfYER$Ex-quAK_}vZ?7K+B&?bT1;PObIMGxQ9z5=Pg}i<@7z_zY
zV9viS(>{D?H~q%$_|5R#0fs>_HSCfsR@>*Q!&sky#3lWBF}0#7?M4ofx0{9Gez3DQ
zGJjGo7)QbZ>4xIN07!^}bJhl~<H(ZRNAnk%fR%TO$a3--kCin)RBd(WkZ?&guiM*R
zvyab*oUS7kG#Wf6+5YA;z=z)rWyfuQAA-k%1V|s&TJdQ0{u`C*BRaE{KY&C+VxGp&
zWax-KIon5!X4g-Sp^@VSEq)w@)ROgjVcy+&DYsl%L0Ax={Ol_pi=wJcOs)-?!NN^M
zcmC76NB;qv)A4vpEL}Fe?z<v&p$^wPnw|dge1(s%5ltgwSewO-KBw(VrZmLB0<%bb
z3WuMs%56WJdkMcaJP&K&)5+?-@Pa}<bn3m-b(^MTXS|r)70WRsaO3f>9I0uDc!hB4
z3xvH3AXyj>l8cU5Ay`M8TD##%$!59v4+&Z{D2R=ZNl6o$Ap1V}<Wb9%BIf(_yYvgy
zh&;Sa6I;S+e+h+pbap*0_1SoHS&%nuj^}Iq#AJD50^JnhCe4T(#<zPYK@9rG)`dWz
z@lD!B1PWQ?tHkEfEyn}Z$JkR}Kd<-O>?Y=bA=4it-x>TdCuA4yy<4tMVL&Sn3Ks6?
zr==ZGW*)j?j?qs_M%rQDlcq3LCWa5WiF(h2T|^lvNclQ<we54#lC&)F{ybx|R2Hq_
zH@icTZ`M>f@|WUzeDa<dzPo(oB`TJ+{~qkW36w6hz?u3bkYxJ#LP)SM(e&1awfB}C
zPu6j5nj!r$M1Upa<>h#N%-Ae}t^xLPwbJEq+HX$azJ&%yaJIUfwg@}0Y`a<SQyD>*
zoBeSoUMe2a`$FY19MByS?*Z9NjoQWj`Yx5=PIY4?AfOn;a&s9w;Z=~tkuiWuz%GmV
za($F})9BM(Im&`5jp2VnEs~6<C$|wvV<qOL)e+V7EX_gR#uG;tT3r&}Y|Zvb7Hl9e
zoGH(bsjG6nT&lpreLsw2{CkXL(gQ?<VKZH^!fn{R(&b_sSxcM6V)rdvwZZB6d#eCC
zNj+AzJ+N!nA-kZwc->RL9Y?<2f|Yv0ly{}o`tX1vdn-ehqr+)EYuc#!+KXFRj0>I7
z`xB_~)1SJ3fOu--7KbbIWW7<zWz!m=e$&WN6*6SbdAt+bq9h)>9c$Tkz16MDh%oBm
z_PV#gT#K^O<$Al_)H@e(tT)Gd2g!b>L}!!UegsgcIz->rbdPFV&2~3nkxE;Y%X8tn
zJcRH0@Ke3m$!Qw9HMTf+1C7_l(dm5j&mGaj-*mWWh$?o7r-t~h#lfzH3{{NDVtsjK
z`cu1AZxi-HYxQQz&(*<Z{o7={1=*fn4ie>-8{UgYZ?2)upvTpHBH_$bvoK)xpOeda
zo?N9}X4}JWci>0qeHE?4&M_(BWT6&Ei@|O=3fCdjMTcAU$AAQi7!#LpI5_Uz^P1D@
zypxo*JNO|@OEQp|nwNDZ#yLs}6f`KqD6Tr^>DYfJ*3-tbxg6Qg{=%&ao?J3Fciz$U
z&<({+M9p%6Kc9_@f&Z#9hnV1Nra#`FM{31#wY*W`R;fiYE0z{J<&l}A@D(1H^%+^U
zM7nLK2OEvE$8-4#|K@=sXvpm{2sDh7SEfeJv{ic8KCqeZ+v6uVVM&d*7Uy4EN}ti|
z);{$t8No(*@Z9^7`0w3hn{Zog2@U(IE$^??*iTha{&1f-etgK)zyFMOclyhmZzlx4
zstvyh@||Wx=?h+8?no<85)meFN#vpK$z~`V-p-V~er}XHJ3Swo+UMY)CC{{xqtM~Y
zT&FdB%S}UL$-N^5U%g%6YBp>tt%`04NrGXcTfhNm+MgcZLxUOerZl<pT4IO$BrK?*
z4eNiN?b1!Ea&x)Tj?R`?^If@h%MAOXsnS*x-F+ULNUbswZ^?l0=W3ENP?~j@2Cr-Q
z5t$B<!NzERfaI#V;us+#tduq3?nO>0!nw9!p6;l3&0%*q#Qiok+7KvX-%N<*2s-(Y
z_$$8@vE(QLP<CA&$;WE}p%9?#Nh~SWAm0A9jCZZOD_HJqK}=j#s>AmdRjb?50Re;j
zp03foC^iq_N^j)su5BBm@lDbBA>8uVA&sJ^j9E;g6~g1VoPf+txA)yUZ@zcv6Ia*!
z`s1)!Q>J+iPrMfq3l?vyrTy_HTjp~(uFNKVJ#3^NOT=?iqe~9KTsiBj|74zoP%H5{
zg(|HS>`0&wH+RS)Mq!oxmj9({r#F}YGGfy-Y<r=Zm&fcc9KUF|D?`u7QO&*&*Bsid
zp2r)&MR%Tfk67pO#X%0m0e-6e_i^3XQT~yxr_vqrS+|G9DHs>YGYA|w|Ao&ZLKs7!
zJLS<5nW6kV6)LMO)|@+p=q?)*W#Q${hBNiLebq{54!&m6=7Y0C>=Ca=(?ef1E`62n
z^@h(kXI*H{45oa6T&2HAi@u|@_niHP=ke|8Q!c7txrcj@Xqe0^XpHq`O`tky)zR%J
zwq<Q&*;=rXhC0xZ790V0y*qpL`3VD9*6AV2$4M36Q^$Ao=N)(Qj3Y{Vmj6<Opd{d2
zPHq<OWg0+=DIXI$owKzKfmjTlVd;FnLtQToMV1oV^R^u_Rd?0nowGLdx?PLY?y!1S
zilNpAnZoOQBO@sWnW&kQ+VA9i<UPr5z58_$2(s?7;e4w!)$erAjaJ(w*vf_RWs^e$
z+s_rBQ8Q|*g?~2@C>M$CsKs{7gEW5Qz<V>0K&mHdM`{f9Sixic_1a^}1eo9XSfmYu
z{pdEqtPGh;it4G;@d<XJeSF)R%|U>P(PA~2AM^FDid?)5lQsgy{PsaY6#z!ZZ6F^+
z7rlhk$mhduGm;q7^!zK4vU{t?qgCiU<jD%X&eViNN6Ooklpd%S-qlF@)f`-0R*`Y<
z5Qp4&*N7FJR{sT`?|<l_Q2_IU*8_0s?)9OEw`1ytr`2S(4kzWkP^;)ZK1%VT<mJDZ
zZ+Ux~-w7&~<mIbXZPJaYB%5mKa>L*3rs~;1?u`{M{^Fn|rDWw>Ku+?0z9>RHYIWNU
z#mzj%v`iM2JXPw}3{ebbrNy?8LZg!$Eh7<D2cEKv*LE#@G8<BxyVO%}w)bcB|M!O&
zLi``+IeXQ<3mHAG<3ADTAr5iR(shkwwLD5>(FXgB%43)Y*(epJKeXbPMoCLe_fmLL
z6SvqbCrLM=rwPKInW>ra4|}ZU8oy0kiXy|$;yu{QQl40GDweD5s)S}+_nQbaJ0pp1
zp>^m;V7cUFr2KJ`N0tVALCluH@rEn^HsupZ11WwbA2YGmQ?LD_pC_KVCsO#Wltrks
znwXJl>NKhdJ5D!N%xY)hI$7><*geeqmIJmglxtM_3i_@FE#1zJ82wb+2DXA{pDTTo
z>l`t2-tTLO*YfO%1{n&~TSlL$GnJQ4a<uQ^i9KsC_?!k>U4t}$g#dpz6L%Ac8IL^*
zaj6ebNhFVORHIZlJCtkUE)mym`J-hhtfr%Bc`4?ZFGh>f>cC{4X3W3E^;qu0G}voJ
zM^dWzmUn}*nwU%`)k{o?w?m8A4QFPgCxCC2K9fdEy!|<+0!6Y{HtlSGUU2kWZ|3-2
z>8zTyaNa4rsp2`qu5=2nuVMtB)w`4iAtOZ#DW-@5ODb0>D^jM>$j{YEo82jyH!WL@
zc_ja`w$iBy)t9U@mJW-rOd+<Jgrl^!7n#`=Yl4=D7$s1_WqJ>Dah4#aZCkc57i%;m
z4NJ*j{aG?tkIaz|y=cK=<R-ouDM^)x>UQK;NWe$bZP9G41t8t#SGnT#c`9-v?2Hm;
zn@U2EOET56t5oO?jhhueCdc`S-X5l+5}5G$ePtU@rahb3WMuRgnXgEdc;iJ8y}XLb
zlRy!fR6nmY&InhUyDPXNggv?j<R@H#ry5cB+w^*<HUo}{6G@*jDD@&^ry<nljG5^K
z!GjB4(tNVe2f%;~-f<y^)HS1eJfAn{q(cb$9Vrwvrlc9cAyW%QIKvn+RA&=Fv;MGL
zet%QR8NC&3b_t35(ED{7i`z59L6QEf^n@=>v=`sWxj*6ENrK>W?myHxp&KR}I>?MD
z&SZW3tcE32)3pFF5=k_^zrQBgWgDgRmMHY;`ZN7=2_0Yyx~T&QG#afrE$%Zb^cr3x
zd)sja*ggvFn28A`6=$zQDJCSYC#apjp)wIeeTl<PPeC%5nI`kipG#fFedO@Sx~Uvb
z_mhNVK2`PIb%h`!?h%OP%#tJ)fYw|ucbg0t#bQ$%5TH3~haf+r+DQ_s1Me|jS`|S4
zrjjH-3htvUEha}VYd4B4V2L7kg}hp=n*ER!UZonfA%KQN)3ew<1`=LVv14)g$r#kh
zjNRD5?tD$o8;qo$yR;8iA)(WBJF=-PsaMDz3n4lQJ9EOibVi@MKXma@Q+bz?5_sp~
z;Cm=Fep%HCpMbR*cf?IDp5E}r)|qspA2K_OtY4<-_PM(vjEtgL{cCDPSJvcE5W&h6
zYt*zMNlXp}$Ri%JyCK@GIuq}hQ17&Ri9flY4%9d4s6O5Kr_-GFiPu=<3>X_bC^~+M
z?VROz!Z<R+GWf?2b9!J3z*am-Os>h}S`O))zuM~hW*;fXMk=!_+bQa0t#vtG1^@Tj
zJzkSRw5h$YVz_K%hu3evAj`QjS+5A~PeG@0+-m!Fc2IWo1SfyVst_uP2x32OM*OB9
zX~3yFX3#j?O4SNP;g1U9FI!OKxD!s;V<1TtI;3&N${A)1gnxWKg=Vr2TN5Vp;O<sT
zrQbfstRmSQbkNCv0*7R(2q>XQprf$9N;tUsPv|&I@66_k9;V|%nK*G@ZCP4;{s(@*
zAwe1`Y*CN27j`=Yy&khO91x+uHlsrvt7umW1HtSu#kS*M<ZLjnr`O!gF0GDR!>X~J
z+^Dk4+rbEL<V0aOrS+t?YAKixU&*lm6S?{%#;g4M<@fklGx4*jU@{3*IFbAeD*}L|
z<O!P{&#Mi8wGcTZ7`mo3=JwIz4}$Lfho6ZKm>?qL1O|M8U{%@QmB-0|x2q>>>IbVg
z$s!%`T+wadSHtK$_`1Jb9%;H&<jygD>20q1oF%Ck_HBrCJ3ky!BL5&jG*T^OMqX+n
zWxG9}G&RRc@e*~00pMHy9^QI3XbHXQ6Na6<4h>9}f00Rw*T?AbIp9Jj-<S%SH{~hy
zKPGqFKUy-rL#s3UK9f>mE(Fy^WSLc8f!EgtK|E)58w=i3JM!wFZV4+!py|@~ragsI
zDcZd^V=#T~@6tA7y{sZ4(-Ujg&d%MA>LC>?DI_8Hf`PT|9ozj@HcDs0=CnK2hu6zZ
zCK5|52b3HT=tg&mGM_6f`biYDij(`!%hnjXNt9qCFl@B9K&Y*#)YM@dg)H&95<$C4
zg}NMkpnbM&edTkIVIX`#ZEC&WU@`lZ6BzG)#4$|-&S28+**X<z=t3WmNrN?-mP|lF
zW2u$R2DjpzPN+q8_78AfRZs#+9KsF2M`WLn92$@<r4mT=|DDp~bFqN)<L7<k$yz>m
z+)&g;4Hc&?*1cL;`Vjc<xfSsxiY^u>N7WjybBKyVkGqD6MkwLk*~R2Hjyv4Un!)d2
zz?~{|ntodj-zS~wu~7rt+UeBaA6VT2!Wr^?FZqOdHR3UTGjXxexAD2mOd~3YsT(HR
zW^p)^bzCO%#bC+D)qlVfIh1R^-;m6-YO~m;F}f>-F-asAuZN;?Q?Zuehqid2kT2Ex
zd_cZmAyo0K8>=ml_J0;a_Sto=OW~`}yIH+7g7pqtfn1`v7pvp%DYSaS+tl7&XL!tL
zaaD%wEMWXNKX)2N)XMjTH_}F}Gdh$M;}?|1Yp}}7OD6}Mx`X?(c!k_mvc1ptB$R7q
z;t|1pWfbVx$iXDLH>tqNsnrTt{H|YU_sRqtoi8UN!grd)Tx^O#8i~SaCOOTjKp!p?
z@Y-P<)MwT;G`L9aAQ!pn#Bj5`W>t>O&*{y?@U@U7V=y*)St3#_-z+9trr4`HGj-Ze
zhaaky5Fz6}ay0+s^`2z4kghsYgmL5LL2^cg#+=uNP>5F}43(NllKE)C{oI`Hf0OyB
zIqomlRbuG8JpIdyy*A{}S_>F=q76sSXsprnZFYIyh&koQ-1@iX>!frx3u6M(+Wg{z
zv)xUosq|arZ%HsTx?iu{gJr^02W}Thv)Qdvl^H^diKcj})9I}MXEx)^L7L26B2w`U
zowngTjtmjSf`@l^|5Fhb;b@XT)3Af@W_^PBm5M{$xx(b}>BVIyy6uapH>8IkQPz7?
zmY2bH`@S!t++-J~RGinR_tAR|aigV0pQ{B)kW2oR)n<u`)<}4zJf%P@b+^EcZpWw4
z{(N9s!rLGs$V$>8)&YOqs8JF*)0fNmAan}GT$!@T(p(!xjZaIKD7s_OMpd+)LDwbi
zIF<jrT-Dou3R%;c)_>nk08mQMe4f;5y;0w+S)F!#$rCCK+ikJX0){l+F?2ogkjf?N
z{{AXPXRqbIQ7t5@q2I1_>5-XQ4b8J*E3_~eyRIqNoJ+QD>$HICnM$?s8X_%z4wh=~
z;?l_QZ@Xs#m)J0$@1nl55>SXk#ns7l#P`v*9$LQhIkkkhi}z&o-k+_SAf4Lt(*qTS
ztj8n$io)>yj7CA$q0@N|ApR7a+5Rxu+b=ZPc*^EzKVwBQln@fQRq8Gtic;lPM;_bf
zdoHEZ3J9sjU_Oh+Ltl>sG7?iWRYsY9l|OP_6cwB1m3O=x)Ij;TnQxb*+&X%c)RAJA
ziy4thz0(K8Wpu{rjnu(p@HUn~1ZAUjeka!qX}WVGZgwt?cogW}B2(;uPr1F@s`h2}
zgK^7f5LV~)=}(^;(2!+XBH*!>r>Dl7P|n2>2_0$(QD%>*a7LyQ!~_SU>T?__E#osY
zG6}s`-%=VBPqdjs)!>PDEI}X>{SEn!%1lN@ivJ+``SAr$bsOo4-j8Cvc~TjR<S3q5
zTl))@aj@U_T4m_Di#%e25>z3wAGwZBZ)xc7n7oD_`R5O@YIGF5lFz)d+w`<UPta<h
ziC`qoek2YaJ{%rveR*iSJNb=TmkY>Dbx<AF%lp5)cu?J82BS@=srgcmCUQ{QH31Dh
z*1OAsk|$#<8^z&=WyG@~$U+H3&O+nIKL(rV^m>dAXPmf%QyfZdr{xPK82hyi?i0wm
znOoa_plR|Ao6~Ui3*{cdau$>mC)M*V=hcKW7-HpWMMohiO(1Q;!(HPKJ!vx6X9Y=`
z$$YGKvuRnzgC<3mFL`_|;(yMZBPimgG3L>zG%MTLVd80|k@czFFgWyoYm~(BY3Ux+
z3u=|r2u8RcCIzF=DiwE;^tLj)Y^M90R6xpTE|k*Bx7v+bgt2YW>5q%jLA6R8h-U_1
zM4l~Mc(z|v0+)_=Z@Ol}F*^*6jWKAsaY(hm=-;{W5$zu^YFO-K>1l6Nr)(&8MxvC&
z1_{qHeVE-$C+D}b+E(aaby$N&NKat;1|j8skvqe)9z$P>R|o{sBjKPnmIaNdF7%d@
zNEtLFMT&RE`Y48gb(hny8BH2Y2DTbNxUnlDum1qeiegYat&X=2GOCmg{S!n=VwZ*I
z(W%;fy9IyF?ZKS>HQm2^tfE-Iq1bd-IM}!00i?aEir8#8lTxAfx>#JN<=G9a(B<fD
z&nA(3Tird~(+@NPoXQBd_LK(m7{=+kdNu1tmJY^hAfb7x=rwC?b|XOOwhjC@(0)Ap
zi-(8(tRU5d>~h;CVMyT)bJ!rr50Yo|iBatY=W}FIw{q~a`v>Ta%s>e{t5qS$tGuW&
zSc3^9{{6z*Cx#|YSvPci`T~kr#CYLA1rbR#NYM^Rpg_ykP1Vxk8^Md<rLz6)p~Km-
zVo;F$lUKis+h`z}WEF1~t8W$o6^!SYM`T|)1ApE2MgEhU=z*y`O16r=z)7U3{5Ynw
z0+*|1-V^6BnB(MZIq5t%*7L-aS137|h|rpE+naAHlXlza2D`E$zXp?NdI=fmYYIsq
zZ}7r9fdPoop96weksinS3B|Jsl$gc=rzU}=ei_jrpdnL{r2j-$Q2v6WC82tdP_7~K
z;V1w|Bo!SsXkF8ylZmreGSsz?L|<DdXb$XZ!6-&!BG95j(&8NxSM`<OkV&Hb|NHW=
z!3hP(UcG2xAq)2h4P3EwI~}&j(Uk_0L_|tWOTmGeUFrrvCiHh?;i+(C=jT7Q;vfeG
zZ>V#o<Q1`KiXxI$5ye8Tm>De3IDrD~gTncLNw)-;x2P-M60>*`2X&cEASq5weSdeu
zgQfKOpDEXd=R2_ly+HtgP7vouv0DXQT(FSG&-f423}=JVY>U(|%l<$Y42Ht)VA#ao
zc9?|u_d`WAQP%JRM-K=G-Dj73Kh|1+kSf$~;&j7ehMHhRjyIq%j>*EZC@-h^&CQ4g
zs8uF)DFPuTJ2J(JklxZ)Qg}FK0f#3cI&IKKK5-PWn-}aMuW&q*zboI_iOKK%uxg|t
zer(rmfmWhSU<9Xg_2fE%EApRCT!c=#z_0%r0p@2^a#QhoL{a3m=DT-K4b)|n^Gi==
zvf1taR{-xf5XfHSEj;I=lI`s;@*Nb8fog+!@ABTT0NngT0=&97CwSI*p;5c49*}U}
zITaxn>-1gdpo%Pkp&Uy_@8d}=1P35b$5-`>_sNlyt|p;(Eg?7ahpdTuDS3_deZ2j8
zTO%u9$>@DnoHtF)_<x#qUYapAu)Vk3JdM?xw47Y((Hmve1ugGZJ8wyOfB)S>s2=2I
z%^wjoFQ0GB-Yp{LcBo&QF96@P|9P7&Hx(fFi}#nDQy_Yeo&34#ASF4^@8mstU!3}v
zBWM8%Pyn3L5GmJJ?>w35kTDF9h3oh0*RnV%IJgh&^%?~zz+WFh3;0y<W*)Qv1t@^X
zJ7k}F<EMX;dmAfpR;%64Apo!f6rcbFc<)N00u-PC0K<^r$jWr&O?+SYEI<JYPymP(
zpa2CZKmiI+fPX%M{`I%)1t?IgfcygF3vCJjK6K6C|G7RCyl0)$`v56c!!qRml?k|u
zc^5E$n=1hDzwjE7qAB5iuTIXZ8uKmwE6G;?a7OVLiopJu`+Tm=e__2S)iDZ!=wB&4
z$*^zs)_f-{0PuFafDpVtj6jfEpoSs<LjQaOMbbO(3(na;_5Cq|z)|w98H2uDc*05&
zIK+SVb)`rWoHi8>Coc$`)1Gs{i4q3>+%Al2xgXra$0~W~k6#r>Q8@f-gQi;;bq6h+
zA)WCTrVbhq`co{SWAblfp^`8EA^Fg4S@>T|160hHB!K$^AzL3T`KJGOTW`u*3S$4G
z$Z1vnjMtNYvDX8fpeYgp^%F?nH*3hS`G>P{0x#%`{uN}Cq>vu9X66Ltg~wVNst=a(
zInh9cLl6<BK65QN?N*!3?&Oei5)RRu2K7z!P+{jVhRnYA!<cc?jz4!9SmK|Ippep#
zS@)I<?=foqWgD#{l`J@|!(MHh+-Ja?!<iEO`!8Gq0APG_%)`fV=@P`D=txaU&T@)*
zH<cz?XnA>NPT#(PeftIW2x$Ikv$kD6@9RDszccc+tfTQi<Q<9TwB+P0hYUUxy9Ojf
z+hb3B+pAZ|iC9uk!~bIdLa-($rC2x_1Am#}Vxl!YB`L!u0jNN7WyL&r5SQ)%I0X4~
z!wOQ$zCCwPj|p3DV(&FD)p|u|T2gYRUBJL!#y*Ce*=dQXW&r~bKuof~dUF4Hk_Ceh
z{BQO?v1GMXIb<eD9Dw(Gy^xifoSN-Kf1xy(XwOPWN_R>a1PX-I7Y`r3NE5+dAWZ=P
zATjCXxt;6JXBfQ=ILV}(U)HT%%Ya^iYB*5-pLp<*g<|FC6U)Br)q6nye!V)i@45J-
zSp*b>B!NFaG^<UE*6!$`=I=LX=FcxAWrIBV{^<?-BGUm&!GEw13Lp?2i7%eMOtDG;
z2e~aTpBDG*c|w*bD+h!|r_+!mtuuHkP+vAFOM(cBkKTIu^s+!NLhoh2F=^n)bx}4i
zUtc|wv&9k;U9!GJvk75g8@FuRIKB;UNv_g&!KTey!oz~PH!N);v_`cw4GGoVpb&th
znxw$}6Bw!U(U|wm`ex+1>$snvw~qQiS_&Y!vR^)XmYD5QJ|hg!3VjSkGFp>zWgZ?{
z8b>lBb%i{WmHkA={uqb*`grA#07%y4p%P%!(Kt|9M3_R0O1uh{e;mUIMsL(HG;2^Z
zQxKDpdxxXkEP4$A5F#}`I@igCV+MzwlYM<X38X6<u;a?rrGZrivqN$h%o^X6s-p?_
zkEyS9)a$e~p%kXp*P#8727Lj*L`Oo*)3`JnrZ$EIqt&xC`Gy)jOJWE?jh8QfXX@au
zR$McC`uZ7jEEcB?IqaJZ>>HcJ0M6?3kndsAkN`nSXH-gM^-BI6cR+|>+(#;7ZaEO3
z3mJ%q+rIBTc~_=~Um-0{demKX;>Mnd&7jpKx(lWa9_|y=T2VkH->tPy$C9L?u4)E)
zbrYj}Gtnrd#XVPA6$t=<6c#lGt$M9FCa?BQFxu!tr)-?~<@lWsX+MQGw_Y+(T)>pW
zzm8VLasyCWQ(kS{UjbaB*K1iu>n6}cOF`vqsHm?pohudwbw-2Z(%K$_7v2ZHJ{}AP
z3XcfCcz(^GLLx6B83UwFHGb8%SRBYm0l-<UPD?4Kq<0tQVbqZD&qz}M0HDODM_jyG
ztZkomC2&r{T<Nc0CNZ6+uHL+P<A$)X@UYpPs`+v+@1DBzqR!}Ldv|PIHmdo<%@aq3
zUB@*v1ei7PWrEf3iv=6EZrTtY7PfxXq$b`#_OIKudFhO6XCEbV1OfliQCt8ino&EO
z=$C;Ml4cl+fH;Xek}jS)b2}sL!J$oag64#T?|))eJ6Fhl|NP;Tw_c{kT->l`_q`WS
zF6>+pG<WI2yXo%9p4`Tt_3%~T=j-jM(<!Z(x3a~)Z?O_3VA8(zi-LlJ=B?gyD-D@g
z0+2L?WnJ7nfA;LzLGyM!&X$4j>S*|?pQ0W=xwvQHtl%X-J(NF?yLSMI9P-?sWY?p}
z(`TM1C*3)|WcKX2OV(U?DH@Gb%Izbo)*pHn_we|JMYBS}&OWo~bp|&3{`#eJX9op`
zY(5$1!1Xi$l$JqR7k7uunLRsr;gS_AmxZj{bUhh^X?G9pIr}&+YU{i?bJqRvI188z
zhWJb2!9lZU&6&6MXq5YGKK{g}Rfn!Uin)3qbXIWavHSMyR~HT+ihPy{D3aD_VaA<J
z3xZX`7oLrAG7L))6iR=1?9`Pwd;GaIi)RPVTfYBthRAA241GAA9g1-qv-=Z333tvN
zzZ;kFGGeVlV94U5_p+6UYKx87v}Whs*r%8GtO^QVye}$+(HM+;+@7!;o7{URU9m|V
z!)cb3?jBvFa5QIr=<<~-7A;wM>N!W*VovNndH2P=A6L&0S{#1$HD@q+nWOhFnWvCH
zcggOvsiICtWJl~-yY<ZN*Y{4Xo--$C*QGRb+O3}tow=KYNSt7_8vez;r3-?B6q{IZ
zC@O_u^(09`YuuTi&p$AyM(tj!n8CuW$6h)Z9hGlpPIFrobptli8WVZw@`H@bd%IK%
z+#c})V{|C{;g9RqoxA_^{^@NCX3bl3_8CU$yb1I9eXHjL%?=J-|8uO<q#+OnX;u?|
zIecEw?4Y?JOINO3vM^-d%@mwZzjW}}l?RW{?_WD7DCFq<EY{#7y}rC5G-y`PocZhb
zJ~q=HTJgcjt!sa{7$19WTj;FWYY#umu)c^qcI46%7XX0N8p+JFTUN|bU1`hD(LCkJ
zkT}j~-8g^xN@CiJ^Lysc4w}DeTU090(SJM%R{)4ZS7OAuD5g%;@&L(59o1zudQWd9
zFyz3C!Cb(*#@Hz<zHV8TGI&?+@a4pM+80;u#gRCnZh@)M84CHl$?xN-Atjg7t8)F?
zbmq;=4-*7}g#VpuaRI?lwpTwc|7OUr?+-=2vO7{wtQ<W$bXOc_)Zl4{7LA{>?wkb^
z?RF;unCP@-Wt;811VEmh3k4PGw4f}BJi;~BryJ*g6SOzV;;`KMVc~>1TVoxp7E3*}
zeopA&+dMB=@1F?Xb0N{faSj_VW0>GHXJuKOJaU%{KB$o^f<n%yA7%|6Hfr?`H?xrN
zVE_D4(}E+D30!ho?HmRWZ!>3QTU>}{GjD}{KWgRaSArw)r?oStto$hx=~*%TXy~}$
zwWm`sG3MCH@#90z##s@e<)5FNIcms|kqb^g%d|P12-43_EnRisLW)I1$<bl+#)KTc
z?*cS$w{j8!lGBovWfPGr>1xRMvFk3pVvIWJ>Cy2MCx)MY#qqr5-oYtTCLeg<q_svY
zF>>+LA%ll3k4&;U6Yqu196WQ^RSVMPTIh$xKEz&}SvF|c@ZdFPlQH?#ne}5QPB{96
zhe)tm9kOb%*;(0ki8Q)mx6B_Myzh?HVZO0%!T8|qicRVX;qs>GGv@7kA)}Nl+b4~m
zw*PLjKx$#ijpb8^3>`f6!0mXm-6<2gl*mmhckPc!6R^zKA6HD6y7^o-(nv0ggO?SB
zmESPCMA7<e!}QVfeu&2OdN%n=(A3c(2k%>*A|HEk!HjR$M<hemgET+g7BXVUkl>#l
zr8q6G_AmN!{OZF=f}V!?Z(@wjzO#GG(4pT>-}juCv+o|AIbnGCr6d^xPMcLg7~&mn
zujil<%lbKN(!@2#6RqOQi{TR{FOEzGMh)}q<dSKVSKYD-)+eXujvv4J)MFd2W$bZ3
zEEzpy$T#7q?x)#Z60Wg7IT5yb-HkXWW>1UU88jwzN1RI!c&oxZ1d_v?on>>$DC79j
ziIZ3TY^HS{&gUCL#!Lu1mtqyMv<I6Pj0xIzo1;86V)~hl;|C9$xc%%Cn`phfY4SI7
z);u(8XaXz1ANV1J>9_C1;N@%AEF?)XhTga*N#%e57(#FMxm6(}KoA6$XE#5PCqJ&n
zVNv3Ji<I@0U*C9;U>8UT|4W}{K?tWbf{PQ2wEi|Ibn&u~Z(5`u+jr?T&yWP8Gq5=H
zs@!_i!~qoxmuxz4%94dM`_}b!aN_$aKx^RBQ|sqnkjKnhw`}q99m_^}Uf;9o#1p&t
z`0)CZUI9TN3qzJ}oHwjdNv*bQw{Iu6uU@KT)BeFr7tQQi6Gzeq_aYGlaT=4QY@%xK
zZ$svWEL$?h@7Cc1k;$b#?(^N4ZY6xnbr>~g*}O?zYHQAJ4_zNycKO<{1&hOX%??QV
zVbkvDq^!hKTese+`PI60!3$QbpV_H=$p+1PepZg<5KXb^X3tN9R;^e(VL%m60W+2D
z^3~$i%NNWITQ#bxxOMHW7_L~r*eTuWmMvDV_pD`$W`16mAqZA)&@mJ)ryX1$dd$^m
z^`=z|7cN}3en$X%VOiMzWC<fEjn-j>g=+T?njadzd~!3-Yx|ErHDeS3KFIZd5XUpc
z;;jY;1<zX<9#khOV&CZ}#)_>+O&VOasDI;rlNX219@f0b?W3y}L}23=tY5l##m=SQ
z7$SGCKKaxx-rlqNh^gzc4fE!%+PZLH&9c=$?$NQDry$c>eRcv>V@&X><w4&zDGmh2
zw?+TpWh+C1SFN4hzSvLUn=U76J{vJ*c*|<u728Y-4P7+6m9G{jGzL9OQ<UrC&c)%6
ziUh4&vov%;NZ76smEyx!uYYV235L~j4uL2gFnMn1^5t{;e-wLQ|IK76U#=3x37WRr
zj5Rw?SU7LR*3cf>xI>4oI6Z0yP8{F7f`5fp!{#jwncBTt@~u6ycRy%3W@Y%Y1zXlH
z{M39lWaBlvKH>O^u;gkJ)-MTJx?{z-wlyo&?9i=YX&jO|U1q$?r`tCnYnIIER^1>#
z_M?vD<}V8kUb1${m{u{nH|&iv*X{M~_`oKfMe7cmy>!W>z-m6UOlb{T4a;JWPOh7G
zG<(3D6>FC*2wuB=R)Ft`u=!_SSP7QZNCIy+HX1f{;esWLXY`TJ?mzv^_6JjN1yFbE
zkBfT>1VX2Uxzdw_a@)RobgxdGyL9c=ZPdCmnSvS^6<`=i;g)BokKVS{Y}ufwAc`0u
zD8ia}W!~T}9Xoeb@=x7)(}gIAB+{oyX&*ZE#cP+l+Xnuz2#Qp^oBk$T2^?3nX3G{;
z3rkju)4M`_Uz6i?ateVHIcqXxo^xee1xa*SvokWYY~1@V1}7OI;o{jyZIOolcyd(K
zog~iaqs_i`=aGddU9Aj^SU!Bl){Bo5siyU+cx#c6ndRU`rQFO+dzPKYK1fKs%TS_P
z%VzaGEa~a6NUe%xv~fwVWx=U**F{Nim@_l79a8q=)93G(s@PbYb^m(QJqP2bmtNg`
z^xDdcIP2r%qf^uXMkDRac=bBPJ&lGWf-cjkZ#zF^PR%qsdD*{SKs_(p%_~=<9>hUU
zKZdfqoOaA&wsV5W*|IX6HXDa>y6}*cQg5BSoYLsifGQ?FB{?}0_iNjve#X_GZzhX4
z6lGYsdGC)4%N85QmakO@$|)IU3l4GY!-FjFly9j|+q5p>Oigo{Dp#-U8=o8}@-D?<
z-Iis`R>&8vuOiM})fH_}93(|W-A(3=K5S;x-6t6?5hFZ(3mc(~WSv1PTNC0EY@7^$
zBuRxo>(RNqkxNg@v^iZqHQF{Q$v(aodF$RoyT;c;$JuOF%x1PYc}3yu47<(Zl#u!o
z7n~%l4}UuMsC?Z{4T_P<GOsjF-@I9K`0!#xOg08&K`dFXeRHK`n_VharJhM^PDo3~
zaUvfsnU*k}cl{3Cs}kuMX1sWf+T}B|UOAmM%wlm0qTsY-nmNv%cK6D8GhU^pFLp2L
z=EEecs1Nqw_U#0_h>*^^Xd#-%FkGW2g|xU=>bfwAb9&Wm*|mOoZFWjZw$-64-MCrJ
zG8y+GZ$#aE&6x`O0E^XvIjv@!OBOjxR)#s-#^=1-1Ck6Mf8lH-<KLo9bw6u*a;h2B
zZqmj-^WoXsFI*Vlxk42hwyIZ=Qbu(2rRw<?mR}|$67Y|tDFDJ;f&(w<RS3eIKqE^M
z!4~_h@5r%ZMvopfs$cUeI$RWGgsHRR!0~kRoJB8;0blg1ML7kezVwDMmFqZUbWZ*r
z4NH+glqFdvNi9K3E~kXhKewwNLIjTE1O;&XmyR${5+Fts1OOoC800+fg53EfQWhl{
z{Qt#piI*@UCHmOh$x#%>E2Z&tkp|^FNvh&kt9MZgMju%{dh-~p&3CgV4*$%EgZwd*
z4iwTPLB;?Q5h4*UNpEKmIZ=YK5nH~CJqVEqkj(j&tx=?qr*Ew?#&O%{&np32oA-x3
z^=~raV}C^n_1=zQaZFH62d9XPr$4QjIy=Iw)6*dP)gxPpYSjDLL!6x#VPTWOCCF-H
z#v45Ra4FWx<rpH41VKcIP~S)`Lg_<(g$}?FCW*WZ01^<UkT1VOzTmdW<mjWplW&no
zwMk8}2IYOUn(~#)q%T=Kw`!3uv=Lh_5mf_QRU@G+AcYNzC4i(*<R+hTCSBd|{q(~z
zNUtUADKS}8LzaN=y^G}?E*J9iFo`loD&&it&g8=YWOIr+<YSU3$`Vp3mvEK*{0amm
zfs+6MMNHvBK+;=NzCadbM401ltoeS_7T{8MGuAX|T9ig*t9?YT4qv#mCRQc!)Pa|}
zCf|Nih{<^u3dNE*!eoUtNKwe~eEY)hH=j+Sy;vbD;Wh8Y68QV10TO3-aD|K}2%%Dv
zEOL6ChmNLgc1}ht0636kNfr?Xkn*j&8I-UB{J9{CDU9WLxhEt&%GYV~NmW)5BuV7e
z_XHwHX?4)CcizzOn39t=OsvaDE)J2<%{Ivvs?y+-W<`)olx2Z)32$D%^N;U~D@(G*
z<WbmLe=R**mT??n7$AYeo}TIQu2O_$NVO;WYbVwH0RaWSEk%|PBuD~)Kj2ZONhoq<
z8Vn9!JK7&lw~3U|put>L3-2(M`snLr5o5&oBO#N%oE}`Ve)aDv;IfQCg80xMzCgd_
z4+4-&8io@j4irWiijbt5ou+U4z74~hdBAuWSR~k<Upki{m91EckKFsCh&Kw^^lcL#
z!KO|stJ0}92`Ea8-7<Z`G1zy{-fyZDrLQa+FzAGplXBj=g#bn1ILKQYsPpzPfSBY|
znkeZKF`U$-CC5q{y^kKEZ0s$$0jA3R0pmU7=UA+g%D8Q^Y=a>i){QETW!PlWsMq3>
zE9L2l$7z05YH08N_=AK>Oj<X#ePykS6V%e)y!;H1ES`BFWJ37!nqgb#Hm_)SvTJhp
zrB9qH`LcvC+-<&jyIzR(Eab^tOHPJJh5!SME+sY2fz!Sw3d7#<wLeLIK9EL6xmT*t
zrh2{G=?NS|oNt-d^LMQK*pQON6YjOjm}tqkvGoaEzJBr7rw_l9h@QdWfi22n4yX7=
z8kIRhLvs<~GlLIVr)=IksEKdt<;{J@tanLoG66ze!zusTD<<_m-ln9u6c^7EG>~Ym
zB`Yb5=gWHO2q2=oqjh<j!9PF&0H$GdQd~xcLOFow4colS;cy@!Hx?p5vKnAJw_^CD
z!}b9oyZY2Li7p4i;2ZmpIHx<mOO$_o!ywO_1t+1=;@}@#i!1X^UAZPr%4Yw(eB;Sj
z+)&uhB;4G;<>&O$Et=Ob;Vwx=Z%k4}o+BhHQ0+>mHK6p@ud*mc!;<*BUFzJkB!R;V
zH)zt>erMC}h!|+_^CMFa@7%WcRtgt;dj6IO3&fd173$V1=~a}aWPm8fz`8PCB|0SK
z1Brbw$RXzU4lwi!X+W>l@ky@|Y#NpT`f^P_uKN7cvZME{T2DV;;aPb2j?>R9tj5!$
z5Ti914a)!8j3et7oqq)shA}LUCICV#BjKeLdi$61@s#4O9slWivXdnN!YJCH5zPtl
zR*u$bsoc6qf-=q7qQ2Mdlbf%lvV{tHi_cH2KN4BCb+3BfgeXaQ)z0&t%nyrv^t;v1
zWli~Cr!`_3@vkxol7vc+vq>Y{?M-_kVsWFdACYok`<7kTlPK29qY$gr8x0Ed+=VR*
zk40OQ{2;HS3i;5I{4#^n7b{)Zo6LNE=IF_I3r$0W5v0}tTuHCeY`9LxK!Dubi@d0<
z)clhQ36Yym$4Ex6!gNaH#$5-sjk-1~?SUjodXKN=3*;d#uQqv)WP})vk#?lMN)`}B
zGG0~cf9jEbY|EjG4%W|4%iTP-ec6e}koNTO)aY~u74)MMYxbOdB9K}F<W(Qw(3zQ#
zoCSPK7Aryt)@w(%JW9ey=x%%|1C3|DN=%oGdJO?F)h~FCDAwqchIq{0LpPF0lb^{I
zvv=Euq>|0s*C|WOyd>on<IhP`0OaP@zf>hiiB_u&e$g5MN~8M)G)3!y{o1zghHrn_
zD`@}ht`#&SWLZ|79L3z(G013j`rPbVB^}_TD<$DYs_0j$I7>q$qkkxZBGJiH)qBqh
z8(aU_!a)H60i8N^o_s88z`WH1>w9B7FJs_0on`ROAerP6d_Nx2v+BLDaoxKPUUDv8
z&l2z15K-c+pj_v%i@vP3f6f=3It6s@F>e1oN0A~%R%>!xTiLr?*MN>~y3W7fe$2S;
zRdrUpc*kCy{9@M+?bdEk*kuvmAJC2=c^P|)K7auv@vu~@;T;SA6g;eRpHUkwI$C`_
zXGVKw?#OPP6!Z_io`(B+>qsr;N=vg!rZQzqmGLj`y1i%mthM*-6pjDp9*AeE4xKQ_
zbY*FefPik3ccf{H7A+)6g1}M5T6XVRK4aHcJ=*qPe%2-91a!Cmf~0LVboRJP3Bv-r
zbn4u>d;jn4^{31l-drb%5_-?2d^iAqcqF=9-VF!$uJv@w#2#Jx&H3?l?Ou~YhF9J*
ztA9tgO^!eK$W^4U9@h~lJ0;!0mMT@UbeVFR_%pMog+wIFBmsYwROX$iM6WR;Yos3>
z)T2Y&;S28aMg0pSQIG^^tktGhbHk;{fgJ*7?TNPmhJYAAf(xtJed_!+?98uvbP5RQ
z+-t-gpD*T2>{E=AB}rCGey7g)2D!w&Umb~aXe##T(}uYjI-pC35$kUFHW(N>vwO^r
zv7Ho4?K)`j$%Mj1j6h2guJn{FtY~rn(&Z`^79Opb@%_H&3_y?&{MxeFMUPLv__}M+
zXOq8Z-=W8dL$AC``{N4962c4D?bf$e`r@y8boge;wFE)O5N>H4oZly3t{PhZz`Q{n
zJ9X~VrRVO%I#Xs%s^bkfUiwRA$=|~a9wkc{Ic0@MD#W2e98Qvg<^Gz{y#th$LEXD|
z>)s<gGBqpy`o>k;5>mKFduR3tXxFiG_ilry{%|kbz>*|QSd${>4er`eS$L%6|NM)c
zQC6B^(-NO%k^c3o71a>`k6No%l%5EquYg1KON~`H75V}+$OF*et`9(kOG$^_OjfUZ
zvdMa~9=Y+%d=uO27l&EFDbaD4@0_!mum7Qs`2^!X31JBF{%PvT8zr7w;5dFw?$Ys5
z3Lzl?{+=pJ&E6iSK!F6-peji{Gl;?K)kLW|2-qN+#O`2srO5N8U3D*}<TvXRAl5(<
zcU8>;j3LU7V^><A?!_;+wBTSIM^O^?g*-xtL&f!m7o}-LFo{y)s^W5i=gO5XTM1bF
zZwCMp+QXV4w1+k@i(y}DRi(zjrvQX7^C?xaF|a61j7BYWqnt<i<!ax~vV%jcZ!G2z
z$8m+Nk)NFH`=35@_xT$im%sX9>b_S#dgS6YH-FGP-1qvjQ0W>TAv04)<HT!kEisek
zH|m<!Zz*ld!vIkNepg;)1}usl&(<0uJD5c%q}hIAscdt$U9PY(^t1gm0s?q)_-fa5
z2>_+U9koTdX}TeuZuDOdgkaxnRfKxiBol+<y>6o-cN{{11?=`GHJyzjki_0lSS|9X
zxUCp*x_=zGm9^rOlPhflpPuXsZ#{J3`~wJoJF`A4y>i`U7hf+2``E0DLThMa0)R0N
z={Us$X+4h^op*X8T~X?q9nuNFL~m`CatLkKEt}~`sC5hsBu@7CgVAb<N8AFRUsg=I
zKW1YIct)!twFefNYRxyhl2jd9K?D=y|Ifq3{=NE7uNVY8O_9W=;fKJg5bCNdHhX@E
z0g?n;&7DQY&1JbyqU<CCRb0uT1r8Mj#b%FgnYov)zxuW}1Tur>JMH6puetP*cVtR&
zw<=T>Eto?CS;j;r7MZFFOH6ltRqhym1Q5~48%Rq99xd$-EJtfqDviF6F~sBJ$PuSZ
zKzu>!xEXtSA{YXvSC?vv9!`afUA-Y!6wUq5LPH6*z3{aKjir?Qt0$px<ZL~8=lL5R
zdEXjmF@UctyPK<JrV9=+$0H>5Y|kE5H`lgS873TS=UIDkwJ~y&2%KSaYkj%M&j<5-
zzBVAIUxy3N-hcg_kFIFxK>~ljJ%4298lWuMfoLj8r~A#fZQHj0(YI~ewr$(CZ5zvj
zwT(u&m1JgZqwlbTs_I)ePeFIgHQ;~ae6vlHEERFa(Hd1%m2m)A4osv1jI5-=3(9yZ
zIMz!|M3!-)%F53W0P}}3P-3;LN@W2?H{M8vkp<cq)t5z2Qh8TA$uhwR!s-gmdvEy7
z(JrTe?Fw``^TQLy(=@Rv-WN?o%0VM3o=%`5P4OyHM8nO2!?wtx1umM9Y6z1AQd6hf
zzJBE~kNvyb(HHHoB=X$(jXRzgu*wnF-E+)}o<e41oKOz{7Kw63DMJ_#sid*!pQA@V
z*@^^ehp8mUcpx0ZY^0ocSXGuIrG{g+mA3v?LiDooIR-K-!1EwL%M#TB7(eRFdb(S7
z^fT*OBVMrrMM%M`4NI_T125xybSW*N{lB^Ih#OvCX`f5>TU{6!@aaPj{%5wo>dEsq
zXmFZvPoqXV5cTcV&nU45g-a<lDsW6ae}Yrz<1r`;YMKK>?~OEp&>Q6tOp&1WgeYV`
zj5Qn*2~#0nfZ60kg;5?c1jw?Ax(in(Of%yJiZEr=`B9IJDaT9B!oWb<onY<WIN|&o
z2XAub@mnt?(&~>_AASFiMb3WahTWE*j{^fME7>eq{Ehk-ocXjW4U}1pl@{<nfn+mc
zby-P3rdt9dG%6vwLsKf4f&@cyzD-<IjaI{zn>kZMf#k|P@#~OdHo+6+U`Ecw0L=tx
z{o<vE-q-cg=bt`c8Jj!IZ$d}nO_jN_)IXunQPykA$|sBYrv^TPXXi8;?fAh7$6VEK
z=j)!hXt$<vh;q}KPXwW)MvWRZYSgGP=?L#ZYs@O3d~RC&@%|&XzWQhUIAHz_4!+{d
z-4}}M*QPCM&@3Tcet7ocN4|<&^A&c#?EC{(YI2pbq{a*d7ny4N&V_fr)-MmARL#Hf
zDd!)z)pCupP&3`YsNaKzUC^@cf3H9L)?7QCzTY}?7gIWdAZhSEf4qI~JMFhW^pxFK
z%7#>C+VhDZoYa_wVD(^^uD$1luN)B1um%$Lt0}yg=BQx{1&eQe{3|=39LWbK^SrFo
zj3>W_mL*$t&xfAcpOEH(QRYQaC{kl)gfmj{`PV+`!i`KhG?x}&N)4)9&cDvyH*cEA
zV(8#<7<+bL0RRXFVf4QwwEw!%00Btky(K>9R$_w!aBYL)2YmwoS^)qG3IGZU0165K
zf9Z7?bF*UwDRLY^Fr&K1Mmkua7YOts|3#ni*<aB`y7{WJ!53qUk=T`Xro-J)1f-Il
z(y%*=gzO?nq9UU*tE;*-iw*#|QH46JUnf<?3k@jxzUT2%ywbCBpj=mf{33zJC+5SA
zJk;>;Y_)xb?LB(^GH~B4zD8LazR|~d_#km}6Xb4+PoBgy#eZqw;R{KoBb~Dez;arC
z|Lu>{aY10k=W8LB#X?HTc6Oyk1XyfcW-wO(f_7S`iD177VcylQuoH=JHm4-IwIjmZ
zHq*f88w?ZcIgU=K@{tGP98|k3q7*57<lkTAL1Qr~)4~VYB8FloEcc9n_rknc>E`=C
zzv!f<QXLm(CW=+BS7)9#bH)HGHRb5y3Uy=E@23_)ZN$2(x}0g@Mw+u(ub)IXL#8dW
zd{>&vz_K>QN=p537jL$Hx4C;>>xH#rU3J06P@K7ub#bd*ujc)2(8Rk1MD8_OJHC7w
zhr>>VX`0`?!-o&?eGc?%FlT;$o$`6ZKMYbmD8UMSxAQ!$M><VAzo2byAK!oc<>z1j
z{_CF~;t66kVU36uF|`#Uo31IeC<2tC)VxMU>$=eO#yCV^iMH~#*;aC(%n0-)>vV~k
z8)=J*OJ9{)N~3y-LyhJ&yJ))TiSHs#I*e6W$r{Duq<9o5$`Ta7ZAnk@v_&k+c0ze%
zplZMeBLp{o=m!u6w>YCew^E3nYC`7-rF!g73_Uv1RH*}^_nN!d>ob5v`l{4O=OpfX
zn4ltvSqAii_RLI=rq`(VMJ*^E?zo+<a3g$*_!#^YSmTZ2UEsEJWo3xFh+C14+YJ<l
zmCbo4{(d7oZVK)qonm7^d+!RY!=5=$?Sa>(3iiNH4^7!q62pqSgj4QoT?AHUMH>S2
zCBur_fwGy4h?fe9x7ylfPv>lN+5FU#6d#Mt6!&H#9jv~MEkfT$biNXE_NlRWif*XU
ze)C{gN?BJ{chJTCG5a%4W~ObN{M&c5%?lH}mhRORi!N(X20FUCKykYDG5xDVDdQ81
zfWWxt;NkG+n>VKyFK~Msc>sL+^ru&^eti9!@m&p`|I^zf8#1q}C_>+SSMcoFv$t>Y
z{COOY`~Qmz1hx>+w30f_!^(Lb9ST{j&T;X|uQqTN&YrVY<>F4`?Bz9qp$9Iz+oh|_
z@8DGjF7g-`-w(~cgfDicWB2=a)FU5>Nv?e1JM-A1w*KZvi&)NoJ|aNyKL3@>u~-Ll
zcW*2_<+X39a1(FD8+iBt;u_=sfip+icB~DE>jArZRKOAYsWDmxqBX^=WP+*`(Xd!j
zJ~^}=qbb6qR6&Xb-LDieg`Y%Z@0gm94uu=E858LOQq;Y(-v`tX>C;8?G*m}&FD628
z_?L}Prl@`tz!==;2<h-l%1N7#pi86HvNfnC0B!^kE1$MhtplwEfzBBsV_=X<Xgj<*
zD>p9xE3{l!OL0&k>7y5+nOlS_!y;l6iLBT6#VoxtO|Vj@BhiR`G$;#0N(=J>2(brb
zZWMj6@L%@MK(}3=S)z0DyYK(TALmN_x0b<;MFIqx_^3*Qk`xMoWyiZ?{8tulJ4C_T
zZT+in#hr^#bFS2TxE80VPYx(a%9s2)YH@3<ZcvRRxA2O!>asM7C$^fh>50+YL8CD>
zb#C?ZvL%--e+*`sfj81WtBu(JU*u&_rzmKG<_n$FSR&T)UK5hoPq&*XvOTs$LS26p
z1nO<7KS*^zCQ}VwvX9nAS-f6hiN^28df+wesnfJKnQYv<15%xoylFSffB>msL)<Az
zU3Ycm^}C^#gr8R}1MB9!v6jz-?+3D#`To|Eu8`*PaJ9A9ve-~V2P1-B4Wp(;!nTZ7
za}WO`ai&W|<ElaVccqhqx@+j7D43_|S(L?B$Ki5Erm30oO)~^<UV=rQxs!v&vUC_~
zInlnK4@LxCQ$JH*o|$jVl#r9~RePes2MZP|Ey-G9r7vzk`Or@VG-|90`pa>UWP37p
z{o`cy7|BjKXmu$h)B>rC)4-U+F|G?vRg;+sk(h)Hx>#w$f_^34DP>S3a3=?qa<mS-
zdAr5$F*wLzM9@{tvm0*-@fJ&LnDP>s)#72|i()8kq2QC_pd~_T=Mtt-OR5#Af+Rn`
zEpM;NRGJH{{u-dO2Y#_eZc`6QMk@e#>RUlVT#hVa`Q9_HP-rl!b)hunLk*??v|q50
zuwrX%3NWTP#Sj5QY1wwaaZpZ{A6De=n;|9>VKIyfX4&%{b5RBk754*G+?WV~%7X&K
zA_p>>$@07w;p!|6$m_Am?BHw_cd$XlEttX;Ra~Pvh%&sQ<#`4p2OX?ejy9>d)txfA
zht$<9AryrwLYPav-HpXWJ)y{mMo{zgN}|CA71t&Qy_$*}%F@BRr#!nB14jg1FDo$@
z%2Y4k%~C~D*Y=uQAAFk2S+fqJ&3M{8W*cj*GOvMiDv9cUdy$db-9R7d1t9>Mq(08N
z=T!hT+j-A!mZp-(<(an~pv2K*3J(TmIq2ocLEoWiY42{9oi3|dkBq&)s$~7Rs*-4$
z-}$H+bkM|JNh>F)xCM#MLVKHohF9#KXa*-kUGb-hy^inORcs?lfd%z#-aBJxT*aPM
zaf|cuGr0WbxD=Q4*kt5N=gzv@RAW`~#D;qG3*mCZ{B_iD)0y6?xYua~?j@JxDAbS;
zjf@faGqEwAfiPG4@T>^hwy%_*;`&Q@>0jQM6I5L9%emC=sT&vl`I|?25?Q>uTTh}F
z1=`ZBVFEE?d*4a0=-<rCNZ~;XU`heY0jOo0pYbG`n9UUOPyU4%qQu0a{68v|(o=Cy
z7zgG1fxe1+q$d%;P;p-()>jqvbWTj>`h%uEp&TmiM|u){Q5}D$>Jp~&LC_EKB(hX-
zDV4?iZ_e_jCC{k1M)UXJ13igCSsHxc1fu%(<DjFP#r2*<P1_kIfZFD(8sFWMh?4(<
zC454ab<{{5P|KYuWHnPg(8dRLv$QJi<-1w(5#1~U%TKITT)0{U9gy^M(0vEi2tb0N
zY4I!oF-fQ=C4i7?z-w|)HG$IYZdwST%0V}vdU<Ot_UmTp|Mk($GB^v$Pk5#lckDdp
z4FdrAD-hP)UMYq^TGaaLi?yhGx+jr|$9fXA>5tl(o8^l~;}-4s3XndnCs7Ary;h9c
z#4wg(gi_)Rk4NWw2b2CmINy_~e^5s^%b#rNd|Ws34@A&$T+K!mw|8}w;z@+W=ubk*
zJQ84%&`OtA@FZdpM}a+6-0$V0;$9Ao>fi0QHhmSh=7Ut+YK23^y&&YtZWezlpsgWq
zj(HhmtBPx{-;TNK0aS;NW`58@TWu;DC*w|iDP;=d7Tf=Ugx9IK$LIq-(dff&jr{zY
z6T7U}C&5T2A~Cx-%csxfRNS)JTz_z4a6${+ZQImV^#u2C=}8oiT-`1?=&Ej(5<6Em
ziF7=PN}mIF{}SPmZy??Ostz5VP)YQlvpl<Q8+(Lp@Ar)pZ%}sbwCMRH%dEe=xUaK(
zuIDVTv1;4?lb%E)Z*=LhMtSagc@hms+>%ChFGxs$6l~*O9j9zu8{UzA4*E7TY*YQ_
zWKW{>Ii(i22ZwKsnxW$EO}Q-@&hqD05`_a-w_gq#V*f<P#kGLCDoC9-Krwr-K9*(~
z_uEJ2dbGZ{eW9V6o7L=>#;iXI^{OAD5_F?JnQ22p=h&XB;>OjvG6&pO!tO%-K>giz
z&GMWPL0<r`QsTFdgR&wCsO|}-SyKi@x^5h5T2CU%>W+r<`$2bM;kj>4xK^^?jSP7f
zF0bOY<DeXSq&Ua!aimLIZvrnCK?f2J8ySZLt*l&0L1SzaT8jIiL&crpaF&14I{lI=
zuHA9a+67~%xZ^AA{t?s+PIOeTnjaK8#~%W4BZ+-q(6m+lpXEu^|JSXZ<<~QA`pxC$
z2Q74JaT7?(U~t>!c4PT@NN{XF``yoAdFg+770!&-CAoz^)DK!Vz1u@ijMiQJ3AIr=
zk%U^ZfB=DTZw54va8%%n6LQcbmb8G@S-vb%EgUpI==QAU7U)_Ugc$y(Wt(W;L}E0O
z1h7QH4MTkuSDzpBXIJXqbyOJesF$@d1Srm?-;0k#P!fI%do}Jh80gPhtk(6$7(AmZ
zjCsKB9a9s-?-qdM9pP?XZmFlO3v(=IW6o#0K@iLTn*DuolW-wVBG0d8({h#}L&d!u
zdcjJf0r8b8ZcQg$;$D8aplm#Esp6(&qfnkMx*G_M9zW<n>7e>sDsEXiK9C!8eFh_f
z4hDn4U@#)+W|$>%m`w4EaZnB$2koz)<=79mcKaaT$Yk0T8S9>nJ)Gr@CgfmB)iER*
z5=o%6%HDI9zX2@9R9K}8!iqvIqsp@*Yg2Un4BLl7Z|~S-U+wcV$3aaJKgpA5K#28J
z^_4WjH6rMMyl{r?_+UJlLo{y-)r|;ff+ikl$>hT|RYu>UZKfFqr8yaz=jY9^4dHkd
zm->=0xYqojH<DCmpKlgH#|+z9F~c_hk+yOxi6vVJflO2ROg;fC6+$8Lz)WCjL#VxM
zygo7jfj>OMb`sO#wfjLmc5aqf4)(PwiN^e(`u)R$bF+ACoG1P~$<O0NyqvSVzRnfH
z9r79a*7EJ`)@%W+0y&m&>tmio#_ioKMeNMWuqnKJ+*#g78mLI``b+@ox-NQees0!O
z%Dc<=KQP};ZUGaOpA&_I4Rf=Qkk~}Aq6M6(;%;~KJ72{elyM+8%nu6X%lpmB9F!L%
z%hOPC_jUDyct55Q2?W}8&m*PF?+c`c_ibWHFh#{Zg!Uo~ux=xLZDJ;g`DaKpx939|
zS66ZAs<>QT#T_(a992Sj{QRJUw^wl!N|DZ@ivX7A?#H<LH7afnP;rMvwA0m9T>Gwm
z7guoyZ9#}e_7V$5E$(pjBa#3KX}5%rboFa1iGuE)gAQgw*x&01C6K?tpxCYj6B6Dq
zf(}f4VK)o>o~D{OA1HO<>X*=&XZZkEzg{;BS>OpdXn%Gy+I`!|a~|Cq#d=LppveNA
zH+rew$~_<3UHyuR`$xK2_&ctC0|M2;W>>#yO1ww}9UK@9=o=U#tf*ZHHseFu&h&m-
zjy7Ad@xaQ=jdQaQxWo+GCR9F>oLq}be}*xe?DTLIm*MI+I4}n_gIBovWt)m??1)W@
z<>cfRZd5ngiJc=4^UWiX6Jr5o891(zX#3nOCTV8aE^Fh}Dz&UTpV|NX_tLI@4p+ay
z{t?t<YWf~%KK^jI6Uoio{`;^=dA!C*ja7yQ@GdHD0)!GbC(8(^i6Pv+H|$1|WHSDI
zGVw*8L`@Rs>nn*6k|*Y7X|b7M+hj^SaC8lxxE>S9luYyUQ8JN<_7d>^D(>(k8lFUu
z+b!NN#=Y&4fU?WC7sF?X^)K`!(nPCk0P~!Z@|3g#o_<&*k!V*zrX5pxQ|Q*OZvT_R
zlW26aeDg=H5HNe`{}yjm|DXHn(3RwdVWcNLpB2=6RK7U9-L?@Arp0-)`ws2U4-gER
zqU5%gcmDt5!@v0dTkQ0QBC!!0unl}QrhbfcEjWErPNsm(-7TMW1r#x4WnuVHPYt&j
z6pVKalPWtkp_Z&#Pl3CWA2}=D8?cLVx_!zVDC`#84ccpaOw4J5%p8Fa2WIzP0I@@R
zDoMQh$~(HnymRuNX~ebK0d3Hd0r(o)h#5|_k{Yv3cj8)rOSulGfi><XN_IJkz2z=B
z$I?+CdapZ>r-fi>>qn(5IMq+b#^j%g<MRR2LU~`aoqPay@a9vxYPOfj-~({AU2Gq~
z17Gd!5a8blat>wdu?PfvQr<A*fo!4q5n~SF*f8=<bL=ZE;1VQ{S1f}LVL+2MJdLQY
zGo|Elev?bj^KjwGj0k(JEGMK%#T%?oKKX1SU0P2F6>$Q2{w|F^-L)t1*i1_1I-074
z$1TA{0X0Fae8+6NQ2v=zu5JNpX5xpFST>b?OACS-mw>ym3cEp)b80GgK68H99PU6t
zYK>AFl+hg+Z%>jf%P8H-%nA|o6f*7^x(u>*3eZ!nv0I~|_}QiZazWL(>PtZ+|Na|a
z+86J+07)-DV@({Pk$VxA+jv7u#`*EqZ@)+X?gg#AzWVm7pMUx3^51R4c9cn`;4s~^
zxnHqUb&89GI{dg~Osk0FHIrM}dJc$QLz%fZ-{Rq@4%uOC7jIbxF^eap-p&&vVUg4#
zVFnb}`{InwRymm715QB8KyahXWKGJp87v$D4UV&&uJIDG+C)*bMv$3^*<HHTVluY~
z5P>udBn_GuX<&_#a1AH#-_vO;rNPW;w%$3r?fb@0z_;L!ke^SLTVvEwe%$Wqx|IQq
zt%=}1Te-_3loy=rIxd2Xw-Ld|WMkH!EB{LfHBN#_^3c3(8&loleLuuu9O&ucbTSi@
zJi2Va<n(DP37I8ZX#8^hGKAG3(JievR?dw)l*~&i`pHPD2XIg34pA#lMz;<wwBY!`
zZ*iUV<poRD>+Q-JTP&|tsF&E>UYxteVD7n|=N9ti|Cbid>Z<^zWGGRfAm?{TmT%^4
z2@GBU$+Kr@8AR5Cip->C*3sn0_U<a7VITkk=u8Zk6L7m89RF;7aF#*px{>`N^XgrX
zd%7tKouA|5V`F_+czb&ujoxl<{^JVcyr)gRQj^}m#nQ;qKLDx8$I_UaP2#Ryv+YYb
zKE~l8LYM^c@!?^u_~Xl?EL)n9FG#UF^|lDz9Yjp*i_9IN1iJm4U^FyRwHDvgM^n6R
zk!XE`xchziOP`qBdfG^<J`){AQ|8=$^jN0;b?)D^Xy$DH4|~K<mn3~X(<kXi%IX>+
zOcs=aa8rk?%RHZ~Ib2+*EQfp*5OxTXG#*3B_+v5$H8ZmTsB*ps!Frp_K{J?{*)Vwa
gnN|ifGc#-N8&t%*{U#4V+5i9m07*qoM6N<$f*wW>jsO4v

literal 0
HcmV?d00001

diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/src/locale/messages.xlf b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/src/locale/messages.xlf
new file mode 100644
index 000000000000..5ba84a9b3570
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/src/locale/messages.xlf
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+  <file source-language="en" datatype="plaintext" original="ng2.template">
+    <body>
+      <trans-unit id="8261100fbc1830397116d0a032e7c8f54af93c68" datatype="html">
+        <source>i18n test</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/app.component.ts</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/app.component.ts</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/styles.css b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/styles.css
new file mode 100644
index 000000000000..90d4ee0072ce
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/styles.css
@@ -0,0 +1 @@
+/* You can add global styles to this file, and also import other style files */
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/test.ts b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/test.ts
new file mode 100644
index 000000000000..8e0f0217aee9
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/test.ts
@@ -0,0 +1,24 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+
+import 'zone.js/dist/zone-testing';
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting,
+} from '@angular/platform-browser-dynamic/testing';
+
+declare const require: any;
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/tsconfig.app.json b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/tsconfig.app.json
new file mode 100644
index 000000000000..27c32c624e5a
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/tsconfig.app.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/app",
+    "types": []
+  },
+  "exclude": [
+    "test.ts",
+    "**/*.spec.ts"
+  ],
+  "angularCompilerOptions": {
+    "enableIvy": true
+  }
+}
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/tsconfig.server.json b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/tsconfig.server.json
new file mode 100644
index 000000000000..01b7878504a2
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/tsconfig.server.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../dist-server",
+    "baseUrl": "./",
+    "module": "commonjs",
+    "types": []
+  },
+  "exclude": [
+    "test.ts",
+    "**/*.spec.ts"
+  ],
+  "angularCompilerOptions": {
+    "entryModule": "app/app.server.module#AppServerModule",
+    "enableIvy": true
+  }
+}
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/tsconfig.spec.json b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/tsconfig.spec.json
new file mode 100644
index 000000000000..a55f430af829
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/tsconfig.spec.json
@@ -0,0 +1,21 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/spec",
+    "types": [
+      "jasmine",
+      "node"
+    ]
+  },
+  "files": [
+    "test.ts",
+    "polyfills.ts"
+  ],
+  "include": [
+    "**/*.spec.ts",
+    "**/*.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "enableIvy": true
+  }
+}
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/typings.d.ts b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/typings.d.ts
new file mode 100644
index 000000000000..fe59b01a3b02
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/typings.d.ts
@@ -0,0 +1,12 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+/* SystemJS module definition */
+declare var module: NodeModule;
+interface NodeModule {
+  id: string;
+}
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/tsconfig.json b/tests/angular_devkit/build_angular/hello-world-app-ivy/tsconfig.json
new file mode 100644
index 000000000000..944d93dc8215
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/tsconfig.json
@@ -0,0 +1,21 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "target": "es2015",
+    "module": "esnext",
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+    "lib": [
+      "es2017",
+      "dom"
+    ]
+  }
+}
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/tslint.json b/tests/angular_devkit/build_angular/hello-world-app-ivy/tslint.json
new file mode 100644
index 000000000000..b265b58ffecb
--- /dev/null
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/tslint.json
@@ -0,0 +1,143 @@
+{
+  "rulesDirectory": [
+    "../../../../node_modules/codelyzer"
+  ],
+  "rules": {
+    "arrow-return-shorthand": true,
+    "callable-types": true,
+    "class-name": true,
+    "comment-format": [
+      true,
+      "check-space"
+    ],
+    "curly": true,
+    "deprecation": {
+      "severity": "warn"
+    },
+    "eofline": true,
+    "forin": true,
+    "import-blacklist": [
+      true,
+      "rxjs",
+      "rxjs/Rx"
+    ],
+    "import-spacing": true,
+    "indent": [
+      true,
+      "spaces"
+    ],
+    "interface-over-type-literal": true,
+    "label-position": true,
+    "max-line-length": [
+      true,
+      140
+    ],
+    "member-access": false,
+    "member-ordering": [
+      true,
+      {
+        "order": [
+          "static-field",
+          "instance-field",
+          "static-method",
+          "instance-method"
+        ]
+      }
+    ],
+    "no-arg": true,
+    "no-bitwise": true,
+    "no-console": [
+      true,
+      "debug",
+      "info",
+      "time",
+      "timeEnd",
+      "trace"
+    ],
+    "no-construct": true,
+    "no-debugger": true,
+    "no-duplicate-super": true,
+    "no-empty": false,
+    "no-empty-interface": true,
+    "no-eval": true,
+    "no-inferrable-types": [
+      true,
+      "ignore-params"
+    ],
+    "no-misused-new": true,
+    "no-non-null-assertion": true,
+    "no-shadowed-variable": true,
+    "no-string-literal": false,
+    "no-string-throw": true,
+    "no-switch-case-fall-through": true,
+    "no-trailing-whitespace": true,
+    "no-unnecessary-initializer": true,
+    "no-unused-expression": true,
+    "no-use-before-declare": true,
+    "no-var-keyword": true,
+    "object-literal-sort-keys": false,
+    "one-line": [
+      true,
+      "check-open-brace",
+      "check-catch",
+      "check-else",
+      "check-whitespace"
+    ],
+    "prefer-const": true,
+    "quotemark": [
+      true,
+      "single"
+    ],
+    "radix": true,
+    "semicolon": [
+      true,
+      "always"
+    ],
+    "triple-equals": [
+      true,
+      "allow-null-check"
+    ],
+    "typedef-whitespace": [
+      true,
+      {
+        "call-signature": "nospace",
+        "index-signature": "nospace",
+        "parameter": "nospace",
+        "property-declaration": "nospace",
+        "variable-declaration": "nospace"
+      }
+    ],
+    "unified-signatures": true,
+    "variable-name": false,
+    "whitespace": [
+      true,
+      "check-branch",
+      "check-decl",
+      "check-operator",
+      "check-separator",
+      "check-type"
+    ],
+    "directive-selector": [
+      true,
+      "attribute",
+      "app",
+      "camelCase"
+    ],
+    "component-selector": [
+      true,
+      "element",
+      "app",
+      "kebab-case"
+    ],
+    "no-output-on-prefix": true,
+    "no-inputs-metadata-property": true,
+    "no-outputs-metadata-property": true,
+    "no-host-metadata-property": true,
+    "no-input-rename": true,
+    "no-output-rename": true,
+    "use-lifecycle-interface": true,
+    "use-pipe-transform-interface": true,
+    "component-class-suffix": true,
+    "directive-class-suffix": true
+  }
+}

From 8754ecbf992530359c5e9b6c2591712053cc2280 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 1 Jul 2019 11:21:41 +0200
Subject: [PATCH 1569/1703] fix(@angular-devkit/build-angular): IE11 errors
 when using scripts and differential loading

Invert the builds so that es2015 scripts output don't override the es5 version.

Fixes #14777
---
 packages/angular_devkit/build_angular/src/browser/index.ts    | 4 ++--
 .../build_angular/src/utils/webpack-browser-config.ts         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 27a42bdbaeb9..6397ee7174a7 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -236,8 +236,8 @@ export function buildWebpackBrowser(
             const [firstBuild, secondBuild] = buildEvents;
 
             if (buildEvents.length === 2) {
-              noModuleFiles = firstBuild.emittedFiles;
-              moduleFiles = secondBuild.emittedFiles || [];
+              moduleFiles = firstBuild.emittedFiles || [];
+              noModuleFiles = secondBuild.emittedFiles;
               files = moduleFiles.filter(x => x.extension === '.css');
             } else if (options.watch && isDifferentialLoadingNeeded) {
               // differential loading is not enabled in watch mode
diff --git a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
index 44e09b02f977..727934a9beee 100644
--- a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
+++ b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
@@ -62,7 +62,7 @@ export async function generateWebpackConfig(
   const scriptTargets = [scriptTarget];
 
   if (differentialLoading) {
-    scriptTargets.unshift(ts.ScriptTarget.ES5);
+    scriptTargets.push(ts.ScriptTarget.ES5);
   }
 
   // For differential loading, we can have several targets

From 2b367be1c3a5108281cd6390917c845dee132e41 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Tue, 2 Jul 2019 12:32:09 +0200
Subject: [PATCH 1570/1703] feat(@angular-devkit/build-angular): deprecate
 scripts and styles `lazy` option in favor of`inject`

The lazy option inside the script and style option is confusing as this option doesn't lazy load a bundle but rather it doesn't inject/reference the script in the HTML. While this option is an enabler for lazy loading, the users will still need to handle on how how this bundle will be lazy loaded. There are also potential use cases beyond lazy loading for the option.

Closes #14814
---
 packages/angular/cli/lib/config/schema.json   |  10 ++
 .../models/webpack-configs/common.ts          | 154 +++++++++--------
 .../models/webpack-configs/styles.ts          | 118 +++++++------
 .../models/webpack-configs/utils.ts           |  40 +++--
 .../utilities/package-chunk-sort.ts           |  16 +-
 .../build_angular/src/browser/schema.json     |   8 +-
 .../build_angular/src/karma/schema.json       |   8 +-
 .../test/browser/output-hashing_spec_large.ts |  34 ++--
 .../test/browser/scripts-array_spec_large.ts  |   4 +-
 .../test/browser/styles_spec_large.ts         |  83 ++++-----
 .../e2e/tests/basic/scripts-array.ts          | 163 ++++++++++--------
 .../e2e/tests/basic/styles-array.ts           |  88 ++++++----
 .../e2e/tests/build/styles/extract-css.ts     | 160 ++++++++++-------
 13 files changed, 511 insertions(+), 375 deletions(-)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index cf93bf4e4dad..8a3117b98f1d 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -995,6 +995,11 @@
                       "type": "boolean",
                       "description": "If the bundle will be lazy loaded.",
                       "default": false
+                    },
+                    "inject": {
+                      "type": "boolean",
+                      "description": "If the bundle will be referenced in the HTML file.",
+                      "default": true
                     }
                   },
                   "additionalProperties": false,
@@ -1516,6 +1521,11 @@
                       "type": "boolean",
                       "description": "If the bundle will be lazy loaded.",
                       "default": false
+                    },
+                    "inject": {
+                      "type": "boolean",
+                      "description": "If the bundle will be referenced in the HTML file.",
+                      "default": true
                     }
                   },
                   "additionalProperties": false,
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index ec8318348e78..a553b2d98508 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -72,11 +72,9 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
       tsConfig.options.target || ScriptTarget.ES5,
     );
     if ((buildOptions.scriptTargetOverride || tsConfig.options.target) === ScriptTarget.ES5) {
-      if (buildOptions.es5BrowserSupport ||
-        (
-          buildOptions.es5BrowserSupport === undefined &&
-          buildBrowserFeatures.isEs5SupportNeeded()
-        )
+      if (
+        buildOptions.es5BrowserSupport ||
+        (buildOptions.es5BrowserSupport === undefined && buildBrowserFeatures.isEs5SupportNeeded())
       ) {
         // The nomodule polyfill needs to be inject prior to any script and be
         // outside of webpack compilation because otherwise webpack will cause the
@@ -91,7 +89,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
             : [noModuleScript];
         }
 
-         // For differential loading we don't need to generate a seperate polyfill file
+        // For differential loading we don't need to generate a seperate polyfill file
         // because they will be loaded exclusivly based on module and nomodule
         const polyfillsChunkName = buildBrowserFeatures.isDifferentialLoadingNeeded()
           ? 'polyfills'
@@ -120,9 +118,11 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
   }
 
   if (buildOptions.profile || process.env['NG_BUILD_PROFILING']) {
-    extraPlugins.push(new debug.ProfilingPlugin({
-      outputPath: path.resolve(root, `chrome-profiler-events${targetInFileName}.json`),
-    }));
+    extraPlugins.push(
+      new debug.ProfilingPlugin({
+        outputPath: path.resolve(root, `chrome-profiler-events${targetInFileName}.json`),
+      }),
+    );
   }
 
   // determine hashing format
@@ -130,50 +130,54 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
 
   // process global scripts
   if (buildOptions.scripts.length > 0) {
-    const globalScriptsByBundleName = normalizeExtraEntryPoints(buildOptions.scripts, 'scripts')
-      .reduce((prev: { bundleName: string, paths: string[], lazy: boolean }[], curr) => {
-        const bundleName = curr.bundleName;
-        const resolvedPath = path.resolve(root, curr.input);
-        const existingEntry = prev.find((el) => el.bundleName === bundleName);
-        if (existingEntry) {
-          if (existingEntry.lazy && !curr.lazy) {
-            // All entries have to be lazy for the bundle to be lazy.
-            throw new Error(`The ${curr.bundleName} bundle is mixing lazy and non-lazy scripts.`);
-          }
-
-          existingEntry.paths.push(resolvedPath);
-        } else {
-          prev.push({
-            bundleName,
-            paths: [resolvedPath],
-            lazy: curr.lazy || false,
-          });
+    const globalScriptsByBundleName = normalizeExtraEntryPoints(
+      buildOptions.scripts,
+      'scripts',
+    ).reduce((prev: { bundleName: string; paths: string[]; inject: boolean }[], curr) => {
+      const bundleName = curr.bundleName;
+      const resolvedPath = path.resolve(root, curr.input);
+      const existingEntry = prev.find(el => el.bundleName === bundleName);
+      if (existingEntry) {
+        if (existingEntry.inject && !curr.inject) {
+          // All entries have to be lazy for the bundle to be lazy.
+          throw new Error(
+            `The ${curr.bundleName} bundle is mixing injected and non-injected scripts.`,
+          );
         }
 
-        return prev;
-      }, []);
+        existingEntry.paths.push(resolvedPath);
+      } else {
+        prev.push({
+          bundleName,
+          paths: [resolvedPath],
+          inject: curr.inject,
+        });
+      }
 
+      return prev;
+    }, []);
 
     // Add a new asset for each entry.
-    globalScriptsByBundleName.forEach((script) => {
+    globalScriptsByBundleName.forEach(script => {
       // Lazy scripts don't get a hash, otherwise they can't be loaded by name.
-      const hash = script.lazy ? '' : hashFormat.script;
+      const hash = script.inject ? hashFormat.script : '';
       const bundleName = script.bundleName;
 
-      extraPlugins.push(new ScriptsWebpackPlugin({
-        name: bundleName,
-        sourceMap: scriptsSourceMap,
-        filename: `${path.basename(bundleName)}${hash}.js`,
-        scripts: script.paths,
-        basePath: projectRoot,
-      }));
+      extraPlugins.push(
+        new ScriptsWebpackPlugin({
+          name: bundleName,
+          sourceMap: scriptsSourceMap,
+          filename: `${path.basename(bundleName)}${hash}.js`,
+          scripts: script.paths,
+          basePath: projectRoot,
+        }),
+      );
     });
   }
 
   // process asset entries
   if (buildOptions.assets) {
     const copyWebpackPluginPatterns = buildOptions.assets.map((asset: AssetPatternClass) => {
-
       // Resolve input paths relative to workspace root and add slash at the end.
       asset.input = path.resolve(root, asset.input).replace(/\\/g, '/');
       asset.input = asset.input.endsWith('/') ? asset.input : asset.input + '/';
@@ -198,8 +202,10 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
 
     const copyWebpackPluginOptions = { ignore: ['.gitkeep', '**/.DS_Store', '**/Thumbs.db'] };
 
-    const copyWebpackPluginInstance = new CopyWebpackPlugin(copyWebpackPluginPatterns,
-      copyWebpackPluginOptions);
+    const copyWebpackPluginInstance = new CopyWebpackPlugin(
+      copyWebpackPluginPatterns,
+      copyWebpackPluginOptions,
+    );
     extraPlugins.push(copyWebpackPluginInstance);
   }
 
@@ -208,20 +214,24 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
   }
 
   if (buildOptions.showCircularDependencies) {
-    extraPlugins.push(new CircularDependencyPlugin({
-      exclude: /([\\\/]node_modules[\\\/])|(ngfactory\.js$)/,
-    }));
+    extraPlugins.push(
+      new CircularDependencyPlugin({
+        exclude: /([\\\/]node_modules[\\\/])|(ngfactory\.js$)/,
+      }),
+    );
   }
 
   if (buildOptions.statsJson) {
-    extraPlugins.push(new class {
-      apply(compiler: Compiler) {
-        compiler.hooks.emit.tap('angular-cli-stats', compilation => {
-          const data = JSON.stringify(compilation.getStats().toJson('verbose'));
-          compilation.assets[`stats${targetInFileName}.json`] = new RawSource(data);
-        });
-      }
-    });
+    extraPlugins.push(
+      new (class {
+        apply(compiler: Compiler) {
+          compiler.hooks.emit.tap('angular-cli-stats', compilation => {
+            const data = JSON.stringify(compilation.getStats().toJson('verbose'));
+            compilation.assets[`stats${targetInFileName}.json`] = new RawSource(data);
+          });
+        }
+      })(),
+    );
   }
 
   if (buildOptions.namedChunks) {
@@ -266,7 +276,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
       : 'rxjs/_esm5/path-mapping';
     const rxPaths = require(require.resolve(rxjsPathMappingImport, { paths: [projectRoot] }));
     alias = rxPaths(nodeModules);
-  } catch { }
+  } catch {}
 
   const extraMinimizers = [];
   if (stylesOptimization) {
@@ -274,7 +284,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
       new CleanCssWebpackPlugin({
         sourceMap: stylesSourceMap,
         // component styles retain their original file name
-        test: (file) => /\.(?:css|scss|sass|less|styl)$/.test(file),
+        test: file => /\.(?:css|scss|sass|less|styl)$/.test(file),
       }),
     );
   }
@@ -307,15 +317,18 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
       },
       // On server, we don't want to compress anything. We still set the ngDevMode = false for it
       // to remove dev code, and ngI18nClosureMode to remove Closure compiler i18n code
-      compress: (buildOptions.platform == 'server' ? {
-        global_defs: angularGlobalDefinitions,
-      } : {
-          pure_getters: buildOptions.buildOptimizer,
-          // PURE comments work best with 3 passes.
-          // See https://github.com/webpack/webpack/issues/2899#issuecomment-317425926.
-          passes: buildOptions.buildOptimizer ? 3 : 1,
-          global_defs: angularGlobalDefinitions,
-        }),
+      compress:
+        buildOptions.platform == 'server'
+          ? {
+              global_defs: angularGlobalDefinitions,
+            }
+          : {
+              pure_getters: buildOptions.buildOptimizer,
+              // PURE comments work best with 3 passes.
+              // See https://github.com/webpack/webpack/issues/2899#issuecomment-317425926.
+              passes: buildOptions.buildOptimizer ? 3 : 1,
+              global_defs: angularGlobalDefinitions,
+            },
       // We also want to avoid mangling on server.
       ...(buildOptions.platform == 'server' ? { mangle: false } : {}),
     };
@@ -330,8 +343,10 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
     );
   }
 
-  if (wco.tsConfig.options.target !== undefined &&
-    wco.tsConfig.options.target >= ScriptTarget.ES2017) {
+  if (
+    wco.tsConfig.options.target !== undefined &&
+    wco.tsConfig.options.target >= ScriptTarget.ES2017
+  ) {
     wco.logger.warn(tags.stripIndent`
       WARNING: Zone.js does not support native async/await in ES2017.
       These blocks are not intercepted by zone.js and will not triggering change detection.
@@ -340,18 +355,13 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
   }
 
   return {
-    mode: scriptsOptimization || stylesOptimization
-      ? 'production'
-      : 'development',
+    mode: scriptsOptimization || stylesOptimization ? 'production' : 'development',
     devtool: false,
     profile: buildOptions.statsJson,
     resolve: {
       extensions: ['.ts', '.tsx', '.mjs', '.js'],
       symlinks: !buildOptions.preserveSymlinks,
-      modules: [
-        wco.tsConfig.options.baseUrl || projectRoot,
-        'node_modules',
-      ],
+      modules: [wco.tsConfig.options.baseUrl || projectRoot, 'node_modules'],
       alias,
     },
     resolveLoader: {
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
index b7e13bb67203..12d99fbef39a 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/styles.ts
@@ -34,7 +34,7 @@ const postcssImports = require('postcss-import');
  * require('node-sass')
  * require('sass-loader')
  */
-
+// tslint:disable-next-line:no-big-function
 export function getStylesConfig(wco: WebpackConfigOptions) {
   const { root, buildOptions } = wco;
   const entryPoints: { [key: string]: string[] } = {};
@@ -46,10 +46,10 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
   // Determine hashing format.
   const hashFormat = getOutputHashFormat(buildOptions.outputHashing as string);
 
-  const postcssPluginCreator = function (loader: webpack.loader.LoaderContext) {
+  const postcssPluginCreator = function(loader: webpack.loader.LoaderContext) {
     return [
       postcssImports({
-        resolve: (url: string) => url.startsWith('~') ? url.substr(1) : url,
+        resolve: (url: string) => (url.startsWith('~') ? url.substr(1) : url),
         load: (filename: string) => {
           return new Promise<string>((resolve, reject) => {
             loader.fs.readFile(filename, (err: Error, data: Buffer) => {
@@ -81,12 +81,14 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
   const includePaths: string[] = [];
   let lessPathOptions: { paths?: string[] } = {};
 
-  if (buildOptions.stylePreprocessorOptions
-    && buildOptions.stylePreprocessorOptions.includePaths
-    && buildOptions.stylePreprocessorOptions.includePaths.length > 0
+  if (
+    buildOptions.stylePreprocessorOptions &&
+    buildOptions.stylePreprocessorOptions.includePaths &&
+    buildOptions.stylePreprocessorOptions.includePaths.length > 0
   ) {
     buildOptions.stylePreprocessorOptions.includePaths.forEach((includePath: string) =>
-      includePaths.push(path.resolve(root, includePath)));
+      includePaths.push(path.resolve(root, includePath)),
+    );
     lessPathOptions = {
       paths: includePaths,
     };
@@ -105,8 +107,8 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
         entryPoints[style.bundleName] = [resolvedPath];
       }
 
-      // Add lazy styles to the list.
-      if (style.lazy) {
+      // Add non injected styles to the list.
+      if (!style.inject) {
         chunkNames.push(style.bundleName);
       }
 
@@ -131,7 +133,7 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
     try {
       // tslint:disable-next-line:no-implicit-dependencies
       fiber = require('fibers');
-    } catch { }
+    } catch {}
   }
 
   // set base rules to derive final rules from
@@ -139,38 +141,44 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
     { test: /\.css$/, use: [] },
     {
       test: /\.scss$|\.sass$/,
-      use: [{
-        loader: 'sass-loader',
-        options: {
-          implementation: sassImplementation,
-          fiber,
-          sourceMap: cssSourceMap,
-          // bootstrap-sass requires a minimum precision of 8
-          precision: 8,
-          includePaths,
+      use: [
+        {
+          loader: 'sass-loader',
+          options: {
+            implementation: sassImplementation,
+            fiber,
+            sourceMap: cssSourceMap,
+            // bootstrap-sass requires a minimum precision of 8
+            precision: 8,
+            includePaths,
+          },
         },
-      }],
+      ],
     },
     {
       test: /\.less$/,
-      use: [{
-        loader: 'less-loader',
-        options: {
-          sourceMap: cssSourceMap,
-          javascriptEnabled: true,
-          ...lessPathOptions,
+      use: [
+        {
+          loader: 'less-loader',
+          options: {
+            sourceMap: cssSourceMap,
+            javascriptEnabled: true,
+            ...lessPathOptions,
+          },
         },
-      }],
+      ],
     },
     {
       test: /\.styl$/,
-      use: [{
-        loader: 'stylus-loader',
-        options: {
-          sourceMap: cssSourceMap,
-          paths: includePaths,
+      use: [
+        {
+          loader: 'stylus-loader',
+          options: {
+            sourceMap: cssSourceMap,
+            paths: includePaths,
+          },
         },
-      }],
+      ],
     },
   ];
 
@@ -194,28 +202,30 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
 
   // load global css as css files
   if (globalStylePaths.length > 0) {
-    rules.push(...baseRules.map(({ test, use }) => {
-      return {
-        include: globalStylePaths,
-        test,
-        use: [
-          buildOptions.extractCss ? MiniCssExtractPlugin.loader : 'style-loader',
-          RawCssLoader,
-          {
-            loader: 'postcss-loader',
-            options: {
-              ident: buildOptions.extractCss ? 'extracted' : 'embedded',
-              plugins: postcssPluginCreator,
-              sourceMap: cssSourceMap
-                && !buildOptions.extractCss
-                && !buildOptions.sourceMap.hidden
-                ? 'inline' : cssSourceMap,
+    rules.push(
+      ...baseRules.map(({ test, use }) => {
+        return {
+          include: globalStylePaths,
+          test,
+          use: [
+            buildOptions.extractCss ? MiniCssExtractPlugin.loader : 'style-loader',
+            RawCssLoader,
+            {
+              loader: 'postcss-loader',
+              options: {
+                ident: buildOptions.extractCss ? 'extracted' : 'embedded',
+                plugins: postcssPluginCreator,
+                sourceMap:
+                  cssSourceMap && !buildOptions.extractCss && !buildOptions.sourceMap.hidden
+                    ? 'inline'
+                    : cssSourceMap,
+              },
             },
-          },
-          ...(use as webpack.Loader[]),
-        ],
-      };
-    }));
+            ...(use as webpack.Loader[]),
+          ],
+        };
+      }),
+    );
   }
 
   if (buildOptions.extractCss) {
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
index e0afd2ad53ef..d9a3e5da7594 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
@@ -23,32 +23,45 @@ export interface HashFormat {
 export function getOutputHashFormat(option: string, length = 20): HashFormat {
   /* tslint:disable:max-line-length */
   const hashFormats: { [option: string]: HashFormat } = {
-    none:    { chunk: '',                       extract: '',                         file: ''                 , script: '' },
-    media:   { chunk: '',                       extract: '',                         file: `.[hash:${length}]`, script: ''  },
-    bundles: { chunk: `.[chunkhash:${length}]`, extract: `.[contenthash:${length}]`, file: ''                 , script: `.[hash:${length}]`  },
-    all:     { chunk: `.[chunkhash:${length}]`, extract: `.[contenthash:${length}]`, file: `.[hash:${length}]`, script: `.[hash:${length}]`  },
+    none: { chunk: '', extract: '', file: '', script: '' },
+    media: { chunk: '', extract: '', file: `.[hash:${length}]`, script: '' },
+    bundles: {
+      chunk: `.[chunkhash:${length}]`,
+      extract: `.[contenthash:${length}]`,
+      file: '',
+      script: `.[hash:${length}]`,
+    },
+    all: {
+      chunk: `.[chunkhash:${length}]`,
+      extract: `.[contenthash:${length}]`,
+      file: `.[hash:${length}]`,
+      script: `.[hash:${length}]`,
+    },
   };
   /* tslint:enable:max-line-length */
   return hashFormats[option] || hashFormats['none'];
 }
 
-export type NormalizedEntryPoint = ExtraEntryPointClass & { bundleName: string };
+// todo: replace with Omit when we update to TS 3.5
+type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
+export type NormalizedEntryPoint = Required<Omit<ExtraEntryPointClass, 'lazy'>>;
 
 export function normalizeExtraEntryPoints(
   extraEntryPoints: ExtraEntryPoint[],
-  defaultBundleName: string
+  defaultBundleName: string,
 ): NormalizedEntryPoint[] {
   return extraEntryPoints.map(entry => {
     let normalizedEntry;
-
     if (typeof entry === 'string') {
-      normalizedEntry = { input: entry, lazy: false, bundleName: defaultBundleName };
+      normalizedEntry = { input: entry, inject: true, bundleName: defaultBundleName };
     } else {
+      const { lazy, inject = true, ...newEntry } = entry;
+      const injectNormalized = entry.lazy !== undefined ? !entry.lazy : inject;
       let bundleName;
 
       if (entry.bundleName) {
         bundleName = entry.bundleName;
-      } else if (entry.lazy) {
+      } else if (!injectNormalized) {
         // Lazy entry points use the file name as bundle name.
         bundleName = basename(
           normalize(entry.input.replace(/\.(js|css|scss|sass|less|styl)$/i, '')),
@@ -57,11 +70,11 @@ export function normalizeExtraEntryPoints(
         bundleName = defaultBundleName;
       }
 
-      normalizedEntry = {...entry, bundleName};
+      normalizedEntry = { ...newEntry, inject: injectNormalized, bundleName };
     }
 
     return normalizedEntry;
-  })
+  });
 }
 
 export function getSourceMapDevTool(
@@ -93,8 +106,9 @@ export function getEsVersionForFileName(
   scriptTargetOverride: ScriptTarget | undefined,
   esVersionInFileName = false,
 ): string {
-  return scriptTargetOverride && esVersionInFileName ?
-    '-' + ScriptTarget[scriptTargetOverride].toLowerCase() : '';
+  return scriptTargetOverride && esVersionInFileName
+    ? '-' + ScriptTarget[scriptTargetOverride].toLowerCase()
+    : '';
 }
 
 export function isPolyfillsEntry(name: string) {
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts
index 3b2262575d70..29e5e17ac34e 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/package-chunk-sort.ts
@@ -8,17 +8,17 @@
 import { ExtraEntryPoint } from '../../browser/schema';
 import { normalizeExtraEntryPoints } from '../models/webpack-configs/utils';
 
-export function generateEntryPoints(
-  appConfig: { styles: ExtraEntryPoint[], scripts: ExtraEntryPoint[] },
-) {
-
+export function generateEntryPoints(appConfig: {
+  styles: ExtraEntryPoint[];
+  scripts: ExtraEntryPoint[];
+}) {
   // Add all styles/scripts, except lazy-loaded ones.
   const extraEntryPoints = (
     extraEntryPoints: ExtraEntryPoint[],
     defaultBundleName: string,
   ): string[] => {
     const entryPoints = normalizeExtraEntryPoints(extraEntryPoints, defaultBundleName)
-      .filter(entry => !entry.lazy)
+      .filter(entry => entry.inject)
       .map(entry => entry.bundleName);
 
     // remove duplicates
@@ -35,9 +35,9 @@ export function generateEntryPoints(
     'main',
   ];
 
-  const duplicates = [...new Set(
-    entryPoints.filter(x => entryPoints.indexOf(x) !== entryPoints.lastIndexOf(x)),
-  )];
+  const duplicates = [
+    ...new Set(entryPoints.filter(x => entryPoints.indexOf(x) !== entryPoints.lastIndexOf(x))),
+  ];
 
   if (duplicates.length > 0) {
     throw new Error(`Multiple bundles have been named the same: '${duplicates.join(`', '`)}'.`);
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index 57122978fea1..12967f11c7d0 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -428,7 +428,13 @@
             "lazy": {
               "type": "boolean",
               "description": "If the bundle will be lazy loaded.",
-              "default": false
+              "default": false,
+              "x-deprecated": "Use 'inject' option with 'false' value instead."
+            },
+            "inject": {
+              "type": "boolean",
+              "description": "If the bundle will be referenced in the HTML file.",
+              "default": true
             }
           },
           "additionalProperties": false,
diff --git a/packages/angular_devkit/build_angular/src/karma/schema.json b/packages/angular_devkit/build_angular/src/karma/schema.json
index f5b8b64fddab..9bf96efe307e 100644
--- a/packages/angular_devkit/build_angular/src/karma/schema.json
+++ b/packages/angular_devkit/build_angular/src/karma/schema.json
@@ -258,7 +258,13 @@
             "lazy": {
               "type": "boolean",
               "description": "If the bundle will be lazy loaded.",
-              "default": false
+              "default": false,
+              "x-deprecated": "Use 'inject' option with 'false' value instead."
+            },
+            "inject": {
+              "type": "boolean",
+              "description": "If the bundle will be referenced in the HTML file.",
+              "default": true
             }
           },
           "additionalProperties": false,
diff --git a/packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts
index 4ca1779f3448..c99cad5b62bf 100644
--- a/packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts
@@ -9,7 +9,11 @@
 import { Architect } from '@angular-devkit/architect';
 import { normalize } from '@angular-devkit/core';
 import {
-  browserBuild, createArchitect, host, lazyModuleFiles, lazyModuleStringImport,
+  browserBuild,
+  createArchitect,
+  host,
+  lazyModuleFiles,
+  lazyModuleStringImport,
 } from '../utils';
 
 describe('Browser Builder output hashing', () => {
@@ -28,13 +32,16 @@ describe('Browser Builder output hashing', () => {
     function generateFileHashMap(): Map<string, string> {
       const hashes = new Map<string, string>();
 
-      host.scopedSync().list(normalize('./dist')).forEach(name => {
-        const matches = name.match(OUTPUT_RE);
-        if (matches) {
-          const [, module, hash] = matches;
-          hashes.set(module, hash);
-        }
-      });
+      host
+        .scopedSync()
+        .list(normalize('./dist'))
+        .forEach(name => {
+          const matches = name.match(OUTPUT_RE);
+          if (matches) {
+            const [, module, hash] = matches;
+            hashes.set(module, hash);
+          }
+        });
 
       return hashes;
     }
@@ -48,7 +55,8 @@ describe('Browser Builder output hashing', () => {
         if (hash == oldHashes.get(module)) {
           if (shouldChange.includes(module)) {
             throw new Error(
-              `Module "${module}" did not change hash (${hash}), but was expected to.`);
+              `Module "${module}" did not change hash (${hash}), but was expected to.`,
+            );
           }
         } else if (!shouldChange.includes(module)) {
           throw new Error(`Module "${module}" changed hash (${hash}), but was not expected to.`);
@@ -153,11 +161,11 @@ describe('Browser Builder output hashing', () => {
     expect(host.fileMatchExists('dist', /spectrum\.[0-9a-f]{20}\.png/)).toBeFalsy();
   });
 
-  it('does not hash lazy styles', async () => {
+  it('does not hash non injected styles', async () => {
     const overrides = {
       outputHashing: 'all',
       extractCss: true,
-      styles: [{ input: 'src/styles.css', lazy: true }],
+      styles: [{ input: 'src/styles.css', inject: false }],
     };
 
     await browserBuild(architect, host, target, overrides);
@@ -168,12 +176,12 @@ describe('Browser Builder output hashing', () => {
     expect(host.scopedSync().exists(normalize('dist/styles.css.map'))).toBe(true);
   });
 
-  it('does not hash lazy styles when optimization is enabled', async () => {
+  it('does not hash non injected styles when optimization is enabled', async () => {
     const overrides = {
       outputHashing: 'all',
       extractCss: true,
       optimization: true,
-      styles: [{ input: 'src/styles.css', lazy: true }],
+      styles: [{ input: 'src/styles.css', inject: false }],
     };
 
     await browserBuild(architect, host, target, overrides);
diff --git a/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
index 48aa593dbdc9..615c3bf8b7c3 100644
--- a/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
@@ -33,9 +33,9 @@ describe('Browser Builder scripts array', () => {
     'src/binput-script.js',
     'src/ainput-script.js',
     'src/cinput-script.js',
-    { input: 'src/lazy-script.js', bundleName: 'lazy-script', lazy: true },
+    { input: 'src/lazy-script.js', bundleName: 'lazy-script', inject: false },
     { input: 'src/pre-rename-script.js', bundleName: 'renamed-script' },
-    { input: 'src/pre-rename-lazy-script.js', bundleName: 'renamed-lazy-script', lazy: true },
+    { input: 'src/pre-rename-lazy-script.js', bundleName: 'renamed-lazy-script', inject: false },
   ];
 
   const target = { project: 'app', target: 'build' };
diff --git a/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
index 242bcddcd32a..0bbfd62e544b 100644
--- a/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
@@ -11,7 +11,6 @@ import { Architect } from '@angular-devkit/architect';
 import { logging, normalize, tags } from '@angular-devkit/core';
 import { browserBuild, createArchitect, host } from '../utils';
 
-
 describe('Browser Builder styles', () => {
   const extensionsWithImportSupport = ['css', 'scss', 'less', 'styl'];
   const extensionsWithVariableSupport = ['scss', 'less', 'styl'];
@@ -32,9 +31,9 @@ describe('Browser Builder styles', () => {
   it('supports global styles', async () => {
     const styles = [
       'src/input-style.css',
-      { input: 'src/lazy-style.css', bundleName: 'lazy-style', lazy: true },
+      { input: 'src/lazy-style.css', bundleName: 'lazy-style', inject: false },
       { input: 'src/pre-rename-style.css', bundleName: 'renamed-style' },
-      { input: 'src/pre-rename-lazy-style.css', bundleName: 'renamed-lazy-style', lazy: true },
+      { input: 'src/pre-rename-lazy-style.css', bundleName: 'renamed-lazy-style', inject: false },
     ] as {};
     const cssMatches: { [path: string]: string } = {
       'styles.css': '.input-style',
@@ -43,8 +42,9 @@ describe('Browser Builder styles', () => {
       'renamed-lazy-style.css': '.pre-rename-lazy-style',
     };
     const cssIndexMatches: { [path: string]: string } = {
-      'index.html': '<link rel="stylesheet" href="styles.css">'
-        + '<link rel="stylesheet" href="renamed-style.css">',
+      'index.html':
+        '<link rel="stylesheet" href="styles.css">' +
+        '<link rel="stylesheet" href="renamed-style.css">',
     };
     const jsMatches: { [path: string]: string } = {
       'styles.js': '.input-style',
@@ -53,12 +53,13 @@ describe('Browser Builder styles', () => {
       'renamed-lazy-style.js': '.pre-rename-lazy-style',
     };
     const jsIndexMatches: { [path: string]: string } = {
-      'index.html': '<script src="runtime.js"></script>'
-        + '<script src="polyfills.js"></script>'
-        + '<script src="styles.js"></script>'
-        + '<script src="renamed-style.js"></script>'
-        + '<script src="vendor.js"></script>'
-        + '<script src="main.js"></script>',
+      'index.html':
+        '<script src="runtime.js"></script>' +
+        '<script src="polyfills.js"></script>' +
+        '<script src="styles.js"></script>' +
+        '<script src="renamed-style.js"></script>' +
+        '<script src="vendor.js"></script>' +
+        '<script src="main.js"></script>',
     };
 
     host.writeMultipleFiles({
@@ -144,16 +145,16 @@ describe('Browser Builder styles', () => {
       const matches: { [path: string]: RegExp } = {
         'styles.css': new RegExp(
           // The global style should be there
-          /p\s*{\s*background-color: #f00;\s*}(.|\n|\r)*/.source
-          // The global style via import should be there
-          + /body\s*{\s*background-color: #00f;\s*}/.source,
+          /p\s*{\s*background-color: #f00;\s*}(.|\n|\r)*/.source +
+            // The global style via import should be there
+            /body\s*{\s*background-color: #00f;\s*}/.source,
         ),
         'styles.css.map': /"mappings":".+"/,
         'main.js': new RegExp(
           // The component style should be there
-          /h1(.|\n|\r)*background:\s*#000(.|\n|\r)*/.source
-          // The component style via import should be there
-          + /.outer(.|\n|\r)*.inner(.|\n|\r)*background:\s*#[fF]+/.source,
+          /h1(.|\n|\r)*background:\s*#000(.|\n|\r)*/.source +
+            // The component style via import should be there
+            /.outer(.|\n|\r)*.inner(.|\n|\r)*background:\s*#[fF]+/.source,
         ),
       };
 
@@ -188,8 +189,11 @@ describe('Browser Builder styles', () => {
           @import "@angular/material/prebuilt-themes/indigo-pink.css";
         `,
       });
-      host.replaceInFile('src/app/app.component.ts', './app.component.css',
-        `./app.component.${ext}`);
+      host.replaceInFile(
+        'src/app/app.component.ts',
+        './app.component.css',
+        `./app.component.${ext}`,
+      );
 
       const overrides = {
         extractCss: true,
@@ -213,7 +217,6 @@ describe('Browser Builder styles', () => {
 
   extensionsWithVariableSupport.forEach(ext => {
     it(`supports ${ext} includePaths`, async () => {
-
       let variableAssignment = '';
       let variablereference = '';
       if (ext === 'scss') {
@@ -244,8 +247,11 @@ describe('Browser Builder styles', () => {
         'main.js': /h2.*{.*color: #f00;.*}/,
       };
 
-      host.replaceInFile('src/app/app.component.ts', './app.component.css',
-        `./app.component.${ext}`);
+      host.replaceInFile(
+        'src/app/app.component.ts',
+        './app.component.css',
+        `./app.component.${ext}`,
+      );
 
       const overrides = {
         extractCss: true,
@@ -291,7 +297,7 @@ describe('Browser Builder styles', () => {
         /* normal-comment */
         /*! important-comment */
         div { flex: 1 }`,
-      'browserslist': 'IE 10',
+      browserslist: 'IE 10',
     });
 
     const overrides = { extractCss: true, optimization: false };
@@ -299,8 +305,7 @@ describe('Browser Builder styles', () => {
     expect(await files['styles.css']).toContain(tags.stripIndents`
       /* normal-comment */
       /*! important-comment */
-      div { -ms-flex: 1; flex: 1 }`,
-    );
+      div { -ms-flex: 1; flex: 1 }`);
   });
 
   it(`minimizes css`, async () => {
@@ -345,14 +350,12 @@ describe('Browser Builder styles', () => {
     expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
     expect(main).toContain(`url('component-img-relative.png')`);
 
-    expect(host.scopedSync().exists(normalize('dist/assets/global-img-absolute.svg')))
-      .toBe(true);
-    expect(host.scopedSync().exists(normalize('dist/global-img-relative.png')))
-      .toBe(true);
-    expect(host.scopedSync().exists(normalize('dist/assets/component-img-absolute.svg')))
-      .toBe(true);
-    expect(host.scopedSync().exists(normalize('dist/component-img-relative.png')))
-      .toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/assets/global-img-absolute.svg'))).toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/global-img-relative.png'))).toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/assets/component-img-absolute.svg'))).toBe(
+      true,
+    );
+    expect(host.scopedSync().exists(normalize('dist/component-img-relative.png'))).toBe(true);
 
     // Check urls with deploy-url scheme are used as is.
     files = (await browserBuild(architect, host, target, {
@@ -456,14 +459,12 @@ describe('Browser Builder styles', () => {
     expect(styles).toContain(`url('global-img-relative.png')`);
     expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
     expect(main).toContain(`url('component-img-relative.png')`);
-    expect(host.scopedSync().exists(normalize('dist/assets/global-img-absolute.svg')))
-      .toBe(true);
-    expect(host.scopedSync().exists(normalize('dist/global-img-relative.png')))
-      .toBe(true);
-    expect(host.scopedSync().exists(normalize('dist/assets/component-img-absolute.svg')))
-      .toBe(true);
-    expect(host.scopedSync().exists(normalize('dist/component-img-relative.png')))
-      .toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/assets/global-img-absolute.svg'))).toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/global-img-relative.png'))).toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/assets/component-img-absolute.svg'))).toBe(
+      true,
+    );
+    expect(host.scopedSync().exists(normalize('dist/component-img-relative.png'))).toBe(true);
 
     // Check urls with deploy-url scheme are used as is.
     files = (await browserBuild(architect, host, target, {
diff --git a/tests/legacy-cli/e2e/tests/basic/scripts-array.ts b/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
index 061b36f38d03..a3a59832068f 100644
--- a/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
+++ b/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
@@ -4,7 +4,7 @@ import {
   writeMultipleFiles,
   expectFileToMatch,
   appendToFile,
-  expectFileMatchToExist
+  expectFileMatchToExist,
 } from '../../utils/fs';
 import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
@@ -13,46 +13,58 @@ import * as fs from 'fs';
 import * as path from 'path';
 
 // tslint:disable:max-line-length
-export default function () {
-  return writeMultipleFiles({
-    'src/string-script.js': 'console.log(\'string-script\'); var number = 1+1;',
-    'src/zstring-script.js': 'console.log(\'zstring-script\');',
-    'src/fstring-script.js': 'console.log(\'fstring-script\');',
-    'src/ustring-script.js': 'console.log(\'ustring-script\');',
-    'src/bstring-script.js': 'console.log(\'bstring-script\');',
-    'src/astring-script.js': 'console.log(\'astring-script\');',
-    'src/cstring-script.js': 'console.log(\'cstring-script\');',
-    'src/input-script.js': 'console.log(\'input-script\');',
-    'src/lazy-script.js': 'console.log(\'lazy-script\');',
-    'src/pre-rename-script.js': 'console.log(\'pre-rename-script\');',
-    'src/pre-rename-lazy-script.js': 'console.log(\'pre-rename-lazy-script\');',
-  })
-    .then(() => appendToFile('src/main.ts', 'import \'./string-script.js\';'))
-    .then(() => updateJsonFile('angular.json', configJson => {
-      const appArchitect = configJson.projects['test-project'].architect;
-      appArchitect.build.options.scripts = [
-        { input: 'src/string-script.js' },
-        { input: 'src/zstring-script.js' },
-        { input: 'src/fstring-script.js' },
-        { input: 'src/ustring-script.js' },
-        { input: 'src/bstring-script.js' },
-        { input: 'src/astring-script.js' },
-        { input: 'src/cstring-script.js' },
-        { input: 'src/input-script.js' },
-        { input: 'src/lazy-script.js', lazy: true },
-        { input: 'src/pre-rename-script.js', bundleName: 'renamed-script' },
-        { input: 'src/pre-rename-lazy-script.js', bundleName: 'renamed-lazy-script', lazy: true }
-      ];
-    }))
-    .then(() => ng('build', '--extract-css'))
-    // files were created successfully
-    .then(() => expectFileToMatch('dist/test-project/scripts.js', 'string-script'))
-    .then(() => expectFileToMatch('dist/test-project/scripts.js', 'input-script'))
-    .then(() => expectFileToMatch('dist/test-project/lazy-script.js', 'lazy-script'))
-    .then(() => expectFileToMatch('dist/test-project/renamed-script.js', 'pre-rename-script'))
-    .then(() => expectFileToMatch('dist/test-project/renamed-lazy-script.js', 'pre-rename-lazy-script'))
-    // index.html lists the right bundles
-    .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
+export default function() {
+  return (
+    writeMultipleFiles({
+      'src/string-script.js': "console.log('string-script'); var number = 1+1;",
+      'src/zstring-script.js': "console.log('zstring-script');",
+      'src/fstring-script.js': "console.log('fstring-script');",
+      'src/ustring-script.js': "console.log('ustring-script');",
+      'src/bstring-script.js': "console.log('bstring-script');",
+      'src/astring-script.js': "console.log('astring-script');",
+      'src/cstring-script.js': "console.log('cstring-script');",
+      'src/input-script.js': "console.log('input-script');",
+      'src/lazy-script.js': "console.log('lazy-script');",
+      'src/pre-rename-script.js': "console.log('pre-rename-script');",
+      'src/pre-rename-lazy-script.js': "console.log('pre-rename-lazy-script');",
+    })
+      .then(() => appendToFile('src/main.ts', "import './string-script.js';"))
+      .then(() =>
+        updateJsonFile('angular.json', configJson => {
+          const appArchitect = configJson.projects['test-project'].architect;
+          appArchitect.build.options.scripts = [
+            { input: 'src/string-script.js' },
+            { input: 'src/zstring-script.js' },
+            { input: 'src/fstring-script.js' },
+            { input: 'src/ustring-script.js' },
+            { input: 'src/bstring-script.js' },
+            { input: 'src/astring-script.js' },
+            { input: 'src/cstring-script.js' },
+            { input: 'src/input-script.js' },
+            { input: 'src/lazy-script.js', inject: false },
+            { input: 'src/pre-rename-script.js', bundleName: 'renamed-script' },
+            {
+              input: 'src/pre-rename-lazy-script.js',
+              bundleName: 'renamed-lazy-script',
+              inject: false,
+            },
+          ];
+        }),
+      )
+      .then(() => ng('build', '--extract-css'))
+      // files were created successfully
+      .then(() => expectFileToMatch('dist/test-project/scripts.js', 'string-script'))
+      .then(() => expectFileToMatch('dist/test-project/scripts.js', 'input-script'))
+      .then(() => expectFileToMatch('dist/test-project/lazy-script.js', 'lazy-script'))
+      .then(() => expectFileToMatch('dist/test-project/renamed-script.js', 'pre-rename-script'))
+      .then(() =>
+        expectFileToMatch('dist/test-project/renamed-lazy-script.js', 'pre-rename-lazy-script'),
+      )
+      // index.html lists the right bundles
+      .then(() =>
+        expectFileToMatch(
+          'dist/test-project/index.html',
+          oneLineTrim`
       <script src="runtime-es2015.js" type="module"></script>
       <script src="polyfills-es2015.js" type="module"></script>
       <script src="runtime-es5.js" nomodule></script>
@@ -63,37 +75,44 @@ export default function () {
       <script src="main-es2015.js" type="module"></script>
       <script src="vendor-es5.js" nomodule></script>
       <script src="main-es5.js" nomodule></script>
-    `))
-    // Ensure scripts can be separately imported from the app.
-    .then(() => expectFileToMatch('dist/test-project/main-es5.js', 'console.log(\'string-script\');'))
-    .then(() => expectFileToMatch('dist/test-project/main-es2015.js', 'console.log(\'string-script\');'));
-    // TODO(architect): disabled until --prod is added.
-    // Verify uglify, sourcemaps and hashes. Lazy scripts should not get hashes.
-    // .then(() => ng('build', '--prod', '--source-map'))
-    // .then(() => expectFileMatchToExist('dist', /scripts\.[0-9a-f]{20}\.js/))
-    // .then(fileName => expectFileToMatch(`dist/${fileName}`, 'var number=2;'))
-    // .then(() => expectFileMatchToExist('dist', /scripts\.[0-9a-f]{20}\.js\.map/))
-    // .then(() => expectFileMatchToExist('dist', /renamed-script\.[0-9a-f]{20}\.js/))
-    // .then(() => expectFileMatchToExist('dist', /renamed-script\.[0-9a-f]{20}\.js.map/))
-    // .then(() => expectFileToMatch('dist/test-project/lazy-script.js', 'lazy-script'))
-    // .then(() => expectFileToMatch('dist/test-project/enamed-lazy-script.js', 'pre-rename-lazy-script'))
+    `,
+        ),
+      )
+      // Ensure scripts can be separately imported from the app.
+      .then(() =>
+        expectFileToMatch('dist/test-project/main-es5.js', "console.log('string-script');"),
+      )
+      .then(() =>
+        expectFileToMatch('dist/test-project/main-es2015.js', "console.log('string-script');"),
+      )
+  );
+  // TODO(architect): disabled until --prod is added.
+  // Verify uglify, sourcemaps and hashes. Lazy scripts should not get hashes.
+  // .then(() => ng('build', '--prod', '--source-map'))
+  // .then(() => expectFileMatchToExist('dist', /scripts\.[0-9a-f]{20}\.js/))
+  // .then(fileName => expectFileToMatch(`dist/${fileName}`, 'var number=2;'))
+  // .then(() => expectFileMatchToExist('dist', /scripts\.[0-9a-f]{20}\.js\.map/))
+  // .then(() => expectFileMatchToExist('dist', /renamed-script\.[0-9a-f]{20}\.js/))
+  // .then(() => expectFileMatchToExist('dist', /renamed-script\.[0-9a-f]{20}\.js.map/))
+  // .then(() => expectFileToMatch('dist/test-project/lazy-script.js', 'lazy-script'))
+  // .then(() => expectFileToMatch('dist/test-project/enamed-lazy-script.js', 'pre-rename-lazy-script'))
 
-    // // Expect order to be preserved.
-    // .then(() => {
-    //   const [fileName] = fs.readdirSync('dist')
-    //     .filter(name => name.match(/^scripts\..*\.js$/));
+  // // Expect order to be preserved.
+  // .then(() => {
+  //   const [fileName] = fs.readdirSync('dist')
+  //     .filter(name => name.match(/^scripts\..*\.js$/));
 
-    //   const content = fs.readFileSync(path.join('dist', fileName), 'utf-8');
-    //   const re = new RegExp(/['"]string-script['"].*/.source
-    //                       + /['"]zstring-script['"].*/.source
-    //                       + /['"]fstring-script['"].*/.source
-    //                       + /['"]ustring-script['"].*/.source
-    //                       + /['"]bstring-script['"].*/.source
-    //                       + /['"]astring-script['"].*/.source
-    //                       + /['"]cstring-script['"].*/.source
-    //                       + /['"]input-script['"]/.source);
-    //   if (!content.match(re)) {
-    //     throw new Error('Scripts are not included in order.');
-    //   }
-    // });
+  //   const content = fs.readFileSync(path.join('dist', fileName), 'utf-8');
+  //   const re = new RegExp(/['"]string-script['"].*/.source
+  //                       + /['"]zstring-script['"].*/.source
+  //                       + /['"]fstring-script['"].*/.source
+  //                       + /['"]ustring-script['"].*/.source
+  //                       + /['"]bstring-script['"].*/.source
+  //                       + /['"]astring-script['"].*/.source
+  //                       + /['"]cstring-script['"].*/.source
+  //                       + /['"]input-script['"]/.source);
+  //   if (!content.match(re)) {
+  //     throw new Error('Scripts are not included in order.');
+  //   }
+  // });
 }
diff --git a/tests/legacy-cli/e2e/tests/basic/styles-array.ts b/tests/legacy-cli/e2e/tests/basic/styles-array.ts
index 0261b23de5bd..93565e3c1fca 100644
--- a/tests/legacy-cli/e2e/tests/basic/styles-array.ts
+++ b/tests/legacy-cli/e2e/tests/basic/styles-array.ts
@@ -1,47 +1,58 @@
 // TODO(architect): edit the architect config instead of the cli config.
 
-import {
-  writeMultipleFiles,
-  expectFileToMatch
-} from '../../utils/fs';
+import { writeMultipleFiles, expectFileToMatch } from '../../utils/fs';
 import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { oneLineTrim } from 'common-tags';
 
-export default function () {
-  return writeMultipleFiles({
-    'src/string-style.css': '.string-style { color: red }',
-    'src/input-style.css': '.input-style { color: red }',
-    'src/lazy-style.css': '.lazy-style { color: red }',
-    'src/pre-rename-style.css': '.pre-rename-style { color: red }',
-    'src/pre-rename-lazy-style.css': '.pre-rename-lazy-style { color: red }',
-  })
-    .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
-      appArchitect.build.options.styles = [
-        { input: 'src/string-style.css' },
-        { input: 'src/input-style.css' },
-        { input: 'src/lazy-style.css', lazy: true },
-        { input: 'src/pre-rename-style.css', bundleName: 'renamed-style' },
-        { input: 'src/pre-rename-lazy-style.css', bundleName: 'renamed-lazy-style', lazy: true }
-      ];
-    }))
-    .then(() => ng('build', '--extract-css'))
-    // files were created successfully
-    .then(() => expectFileToMatch('dist/test-project/styles.css', '.string-style'))
-    .then(() => expectFileToMatch('dist/test-project/styles.css', '.input-style'))
-    .then(() => expectFileToMatch('dist/test-project/lazy-style.css', '.lazy-style'))
-    .then(() => expectFileToMatch('dist/test-project/renamed-style.css', '.pre-rename-style'))
-    .then(() => expectFileToMatch(
-      'dist/test-project/renamed-lazy-style.css',
-      '.pre-rename-lazy-style',
-    ))
-    // index.html lists the right bundles
-    .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
+export default function() {
+  return (
+    writeMultipleFiles({
+      'src/string-style.css': '.string-style { color: red }',
+      'src/input-style.css': '.input-style { color: red }',
+      'src/lazy-style.css': '.lazy-style { color: red }',
+      'src/pre-rename-style.css': '.pre-rename-style { color: red }',
+      'src/pre-rename-lazy-style.css': '.pre-rename-lazy-style { color: red }',
+    })
+      .then(() =>
+        updateJsonFile('angular.json', workspaceJson => {
+          const appArchitect = workspaceJson.projects['test-project'].architect;
+          appArchitect.build.options.styles = [
+            { input: 'src/string-style.css' },
+            { input: 'src/input-style.css' },
+            { input: 'src/lazy-style.css', inject: false },
+            { input: 'src/pre-rename-style.css', bundleName: 'renamed-style' },
+            {
+              input: 'src/pre-rename-lazy-style.css',
+              bundleName: 'renamed-lazy-style',
+              inject: false,
+            },
+          ];
+        }),
+      )
+      .then(() => ng('build', '--extract-css'))
+      // files were created successfully
+      .then(() => expectFileToMatch('dist/test-project/styles.css', '.string-style'))
+      .then(() => expectFileToMatch('dist/test-project/styles.css', '.input-style'))
+      .then(() => expectFileToMatch('dist/test-project/lazy-style.css', '.lazy-style'))
+      .then(() => expectFileToMatch('dist/test-project/renamed-style.css', '.pre-rename-style'))
+      .then(() =>
+        expectFileToMatch('dist/test-project/renamed-lazy-style.css', '.pre-rename-lazy-style'),
+      )
+      // index.html lists the right bundles
+      .then(() =>
+        expectFileToMatch(
+          'dist/test-project/index.html',
+          oneLineTrim`
       <link rel="stylesheet" href="styles.css">
       <link rel="stylesheet" href="renamed-style.css">
-    `))
-    .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
+    `,
+        ),
+      )
+      .then(() =>
+        expectFileToMatch(
+          'dist/test-project/index.html',
+          oneLineTrim`
       <script src="runtime-es2015.js" type="module"></script>
       <script src="polyfills-es2015.js" type="module"></script>
       <script src="runtime-es5.js" nomodule></script>
@@ -50,5 +61,8 @@ export default function () {
       <script src="main-es2015.js" type="module"></script>
       <script src="vendor-es5.js" nomodule></script>
       <script src="main-es5.js" nomodule></script>
-    `));
+    `,
+        ),
+      )
+  );
 }
diff --git a/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts b/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
index bfb970699528..89c213820aba 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
@@ -1,56 +1,77 @@
-import {
-  writeMultipleFiles,
-  expectFileToExist,
-  expectFileToMatch
-} from '../../../utils/fs';
+import { writeMultipleFiles, expectFileToExist, expectFileToMatch } from '../../../utils/fs';
 import { ng } from '../../../utils/process';
 import { updateJsonFile } from '../../../utils/project';
 import { expectToFail } from '../../../utils/utils';
 import { oneLineTrim } from 'common-tags';
 
-export default function () {
+export default function() {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
-  return Promise.resolve()
-    .then(() => writeMultipleFiles({
-      'src/string-style.css': '.string-style { color: red }',
-      'src/input-style.css': '.input-style { color: red }',
-      'src/lazy-style.css': '.lazy-style { color: red }',
-      'src/pre-rename-style.css': '.pre-rename-style { color: red }',
-      'src/pre-rename-lazy-style.css': '.pre-rename-lazy-style { color: red }',
-    }))
-    .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
-      appArchitect.build.options.styles = [
-        { input: 'src/string-style.css' },
-        { input: 'src/input-style.css' },
-        { input: 'src/lazy-style.css', lazy: true },
-        { input: 'src/pre-rename-style.css', bundleName: 'renamed-style' },
-        { input: 'src/pre-rename-lazy-style.css', bundleName: 'renamed-lazy-style', lazy: true }
-      ];
-    }))
-    .then(() => ng('build', '--extract-css'))
-    // files were created successfully
-    .then(() => expectFileToMatch('dist/test-project/styles.css', '.string-style'))
-    .then(() => expectFileToMatch('dist/test-project/styles.css', '.input-style'))
-    .then(() => expectFileToMatch('dist/test-project/lazy-style.css', '.lazy-style'))
-    .then(() => expectFileToMatch('dist/test-project/renamed-style.css', '.pre-rename-style'))
-    .then(() => expectFileToMatch('dist/test-project/renamed-lazy-style.css', '.pre-rename-lazy-style'))
-    // there are no js entry points for css only bundles
-    .then(() => expectToFail(() => expectFileToExist('dist/test-project/style-es5.js')))
-    .then(() => expectToFail(() => expectFileToExist('dist/test-project/lazy-style-es5.js')))
-    .then(() => expectToFail(() => expectFileToExist('dist/test-project/renamed-style-es5.js')))
-    .then(() => expectToFail(() => expectFileToExist('dist/test-project/renamed-lazy-style-es5.js')))
-    .then(() => expectToFail(() => expectFileToExist('dist/test-project/style-es2015.js')))
-    .then(() => expectToFail(() => expectFileToExist('dist/test-project/lazy-style-es2015.js')))
-    .then(() => expectToFail(() => expectFileToExist('dist/test-project/renamed-style-es2015.js')))
-    .then(() => expectToFail(() => expectFileToExist('dist/test-project/renamed-lazy-style-es2015.js')))
-    // index.html lists the right bundles
-    .then(() => expectFileToMatch('dist/test-project/index.html', new RegExp(oneLineTrim`
+  return (
+    Promise.resolve()
+      .then(() =>
+        writeMultipleFiles({
+          'src/string-style.css': '.string-style { color: red }',
+          'src/input-style.css': '.input-style { color: red }',
+          'src/lazy-style.css': '.lazy-style { color: red }',
+          'src/pre-rename-style.css': '.pre-rename-style { color: red }',
+          'src/pre-rename-lazy-style.css': '.pre-rename-lazy-style { color: red }',
+        }),
+      )
+      .then(() =>
+        updateJsonFile('angular.json', workspaceJson => {
+          const appArchitect = workspaceJson.projects['test-project'].architect;
+          appArchitect.build.options.styles = [
+            { input: 'src/string-style.css' },
+            { input: 'src/input-style.css' },
+            { input: 'src/lazy-style.css', inject: false },
+            { input: 'src/pre-rename-style.css', bundleName: 'renamed-style' },
+            {
+              input: 'src/pre-rename-lazy-style.css',
+              bundleName: 'renamed-lazy-style',
+              inject: false,
+            },
+          ];
+        }),
+      )
+      .then(() => ng('build', '--extract-css'))
+      // files were created successfully
+      .then(() => expectFileToMatch('dist/test-project/styles.css', '.string-style'))
+      .then(() => expectFileToMatch('dist/test-project/styles.css', '.input-style'))
+      .then(() => expectFileToMatch('dist/test-project/lazy-style.css', '.lazy-style'))
+      .then(() => expectFileToMatch('dist/test-project/renamed-style.css', '.pre-rename-style'))
+      .then(() =>
+        expectFileToMatch('dist/test-project/renamed-lazy-style.css', '.pre-rename-lazy-style'),
+      )
+      // there are no js entry points for css only bundles
+      .then(() => expectToFail(() => expectFileToExist('dist/test-project/style-es5.js')))
+      .then(() => expectToFail(() => expectFileToExist('dist/test-project/lazy-style-es5.js')))
+      .then(() => expectToFail(() => expectFileToExist('dist/test-project/renamed-style-es5.js')))
+      .then(() =>
+        expectToFail(() => expectFileToExist('dist/test-project/renamed-lazy-style-es5.js')),
+      )
+      .then(() => expectToFail(() => expectFileToExist('dist/test-project/style-es2015.js')))
+      .then(() => expectToFail(() => expectFileToExist('dist/test-project/lazy-style-es2015.js')))
+      .then(() =>
+        expectToFail(() => expectFileToExist('dist/test-project/renamed-style-es2015.js')),
+      )
+      .then(() =>
+        expectToFail(() => expectFileToExist('dist/test-project/renamed-lazy-style-es2015.js')),
+      )
+      // index.html lists the right bundles
+      .then(() =>
+        expectFileToMatch(
+          'dist/test-project/index.html',
+          new RegExp(oneLineTrim`
       <link rel="stylesheet" href="styles\.css"/?>
       <link rel="stylesheet" href="renamed-style\.css"/?>
-    `)))
-    .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
+    `),
+        ),
+      )
+      .then(() =>
+        expectFileToMatch(
+          'dist/test-project/index.html',
+          oneLineTrim`
     <script src="runtime-es2015.js" type="module"></script>
     <script src="polyfills-es2015.js" type="module"></script>
     <script src="runtime-es5.js" nomodule></script>
@@ -59,22 +80,36 @@ export default function () {
     <script src="main-es2015.js" type="module"></script>
     <script src="vendor-es5.js" nomodule></script>
     <script src="main-es5.js" nomodule></script>
-    `))
-    // also check when css isn't extracted
-    .then(() => ng('build', '--no-extract-css'))
-    // files were created successfully
-    .then(() => expectFileToMatch('dist/test-project/styles-es5.js', '.string-style'))
-    .then(() => expectFileToMatch('dist/test-project/styles-es5.js', '.input-style'))
-    .then(() => expectFileToMatch('dist/test-project/lazy-style-es5.js', '.lazy-style'))
-    .then(() => expectFileToMatch('dist/test-project/renamed-style-es5.js', '.pre-rename-style'))
-    .then(() => expectFileToMatch('dist/test-project/renamed-lazy-style-es5.js', '.pre-rename-lazy-style'))
-    .then(() => expectFileToMatch('dist/test-project/styles-es2015.js', '.string-style'))
-    .then(() => expectFileToMatch('dist/test-project/styles-es2015.js', '.input-style'))
-    .then(() => expectFileToMatch('dist/test-project/lazy-style-es2015.js', '.lazy-style'))
-    .then(() => expectFileToMatch('dist/test-project/renamed-style-es2015.js', '.pre-rename-style'))
-    .then(() => expectFileToMatch('dist/test-project/renamed-lazy-style-es2015.js', '.pre-rename-lazy-style'))
-    // index.html lists the right bundles
-    .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
+    `,
+        ),
+      )
+      // also check when css isn't extracted
+      .then(() => ng('build', '--no-extract-css'))
+      // files were created successfully
+      .then(() => expectFileToMatch('dist/test-project/styles-es5.js', '.string-style'))
+      .then(() => expectFileToMatch('dist/test-project/styles-es5.js', '.input-style'))
+      .then(() => expectFileToMatch('dist/test-project/lazy-style-es5.js', '.lazy-style'))
+      .then(() => expectFileToMatch('dist/test-project/renamed-style-es5.js', '.pre-rename-style'))
+      .then(() =>
+        expectFileToMatch('dist/test-project/renamed-lazy-style-es5.js', '.pre-rename-lazy-style'),
+      )
+      .then(() => expectFileToMatch('dist/test-project/styles-es2015.js', '.string-style'))
+      .then(() => expectFileToMatch('dist/test-project/styles-es2015.js', '.input-style'))
+      .then(() => expectFileToMatch('dist/test-project/lazy-style-es2015.js', '.lazy-style'))
+      .then(() =>
+        expectFileToMatch('dist/test-project/renamed-style-es2015.js', '.pre-rename-style'),
+      )
+      .then(() =>
+        expectFileToMatch(
+          'dist/test-project/renamed-lazy-style-es2015.js',
+          '.pre-rename-lazy-style',
+        ),
+      )
+      // index.html lists the right bundles
+      .then(() =>
+        expectFileToMatch(
+          'dist/test-project/index.html',
+          oneLineTrim`
     <script src="runtime-es2015.js" type="module"></script>
     <script src="polyfills-es2015.js" type="module"></script>
     <script src="runtime-es5.js" nomodule></script>
@@ -87,5 +122,8 @@ export default function () {
     <script src="main-es2015.js" type="module"></script>
     <script src="vendor-es5.js" nomodule></script>
     <script src="main-es5.js" nomodule></script>
-    `));
+    `,
+        ),
+      )
+  );
 }

From 040e3ea78938d2ea9188ce03c8d12785ca56e8a4 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Tue, 2 Jul 2019 12:37:35 +0200
Subject: [PATCH 1571/1703] feat(@schematics/angular): add migration from
 `lazy` option to `inject`

---
 .../migrations/migration-collection.json      |   5 +
 .../angular/migrations/update-9/index.ts      |  18 +++
 .../update-9/update-workspace-config.ts       | 123 +++++++++++++++++
 .../update-9/update-workspace-config_spec.ts  | 128 ++++++++++++++++++
 4 files changed, 274 insertions(+)
 create mode 100644 packages/schematics/angular/migrations/update-9/index.ts
 create mode 100644 packages/schematics/angular/migrations/update-9/update-workspace-config.ts
 create mode 100644 packages/schematics/angular/migrations/update-9/update-workspace-config_spec.ts

diff --git a/packages/schematics/angular/migrations/migration-collection.json b/packages/schematics/angular/migrations/migration-collection.json
index 3cd1b2c82c79..f2f7a02f7551 100644
--- a/packages/schematics/angular/migrations/migration-collection.json
+++ b/packages/schematics/angular/migrations/migration-collection.json
@@ -39,6 +39,11 @@
       "version": "8.0.0-beta.14",
       "factory": "./update-8/#updateLazyModulePaths",
       "description": "Update an Angular CLI project to version 8."
+    },
+    "migration-09": {
+      "version": "9.0.0-beta.0",
+      "factory": "./update-9",
+      "description": "Update an Angular CLI project to version 9."
     }
   }
 }
diff --git a/packages/schematics/angular/migrations/update-9/index.ts b/packages/schematics/angular/migrations/update-9/index.ts
new file mode 100644
index 000000000000..eb6d7869a4d2
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-9/index.ts
@@ -0,0 +1,18 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { Rule, chain } from '@angular-devkit/schematics';
+import { UpdateWorkspaceConfig } from './update-workspace-config';
+
+export default function(): Rule {
+  return () => {
+    return chain([
+      UpdateWorkspaceConfig(),
+    ]);
+  };
+}
diff --git a/packages/schematics/angular/migrations/update-9/update-workspace-config.ts b/packages/schematics/angular/migrations/update-9/update-workspace-config.ts
new file mode 100644
index 000000000000..3dc9f637ce53
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-9/update-workspace-config.ts
@@ -0,0 +1,123 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import {
+  JsonAstObject,
+  JsonParseMode,
+  parseJsonAst,
+} from '@angular-devkit/core';
+import { Rule, Tree, UpdateRecorder } from '@angular-devkit/schematics';
+import {
+  findPropertyInAstObject,
+  insertPropertyInAstObjectInOrder,
+  removePropertyInAstObject,
+} from '../../utility/json-utils';
+
+export function UpdateWorkspaceConfig(): Rule {
+  return (tree: Tree) => {
+    let workspaceConfigPath = 'angular.json';
+    let angularConfigContent = tree.read(workspaceConfigPath);
+
+    if (!angularConfigContent) {
+      workspaceConfigPath = '.angular.json';
+      angularConfigContent = tree.read(workspaceConfigPath);
+
+      if (!angularConfigContent) {
+        return;
+      }
+    }
+
+    const angularJson = parseJsonAst(angularConfigContent.toString(), JsonParseMode.Loose);
+    if (angularJson.kind !== 'object') {
+      return;
+    }
+
+    const projects = findPropertyInAstObject(angularJson, 'projects');
+    if (!projects || projects.kind !== 'object') {
+      return;
+    }
+
+    // For all projects
+    const recorder = tree.beginUpdate(workspaceConfigPath);
+    for (const project of projects.properties) {
+      const projectConfig = project.value;
+      if (projectConfig.kind !== 'object') {
+        break;
+      }
+
+      const architect = findPropertyInAstObject(projectConfig, 'architect');
+      if (!architect || architect.kind !== 'object') {
+        break;
+      }
+
+      const buildTarget = findPropertyInAstObject(architect, 'build');
+      if (buildTarget && buildTarget.kind === 'object') {
+        const builder = findPropertyInAstObject(buildTarget, 'builder');
+        // Projects who's build builder is not build-angular:browser
+        if (builder && builder.kind === 'string' && builder.value === '@angular-devkit/build-angular:browser') {
+          updateOption('styles', recorder, buildTarget);
+          updateOption('scripts', recorder, buildTarget);
+        }
+      }
+
+      const testTarget = findPropertyInAstObject(architect, 'test');
+      if (testTarget && testTarget.kind === 'object') {
+        const builder = findPropertyInAstObject(testTarget, 'builder');
+        // Projects who's build builder is not build-angular:browser
+        if (builder && builder.kind === 'string' && builder.value === '@angular-devkit/build-angular:karma') {
+          updateOption('styles', recorder, testTarget);
+          updateOption('scripts', recorder, testTarget);
+        }
+      }
+    }
+
+    tree.commitUpdate(recorder);
+
+    return tree;
+  };
+}
+
+/**
+ * Helper to retreive all the options in various configurations
+ */
+function getAllOptions(builderConfig: JsonAstObject): JsonAstObject[] {
+  const options = [];
+  const configurations = findPropertyInAstObject(builderConfig, 'configurations');
+  if (configurations && configurations.kind === 'object') {
+    options.push(...configurations.properties.map(x => x.value));
+  }
+
+  options.push(findPropertyInAstObject(builderConfig, 'options'));
+
+  return options.filter(o => o && o.kind === 'object') as JsonAstObject[];
+}
+
+function updateOption(property: 'scripts' | 'styles', recorder: UpdateRecorder, builderConfig: JsonAstObject) {
+  const options = getAllOptions(builderConfig);
+
+  for (const option of options) {
+    const propertyOption = findPropertyInAstObject(option, property);
+    if (!propertyOption || propertyOption.kind !== 'array') {
+      continue;
+    }
+
+    for (const node of propertyOption.elements) {
+      if (!node || node.kind !== 'object') {
+        // skip non complex objects
+        continue;
+      }
+
+      const lazy = findPropertyInAstObject(node, 'lazy');
+      removePropertyInAstObject(recorder, node, 'lazy');
+
+      // if lazy was not true, it is redundant hence, don't add it
+      if (lazy && lazy.kind === 'true') {
+        insertPropertyInAstObjectInOrder(recorder, node, 'inject', false, 0);
+      }
+    }
+  }
+}
diff --git a/packages/schematics/angular/migrations/update-9/update-workspace-config_spec.ts b/packages/schematics/angular/migrations/update-9/update-workspace-config_spec.ts
new file mode 100644
index 000000000000..64865e83c83b
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-9/update-workspace-config_spec.ts
@@ -0,0 +1,128 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import { EmptyTree } from '@angular-devkit/schematics';
+import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+
+function readWorkspaceConfig(tree: UnitTestTree) {
+  return JSON.parse(tree.readContent('/angular.json'));
+}
+
+const scriptsWithLazy = [
+  { bundleName: 'one', input: 'one.js', lazy: false },
+  { bundleName: 'two', input: 'two.js', lazy: true },
+  { bundleName: 'tree', input: 'tree.js' },
+  'four.js',
+]
+
+const scriptsExpectWithLazy = [
+  { bundleName: 'one', input: 'one.js' },
+  { bundleName: 'two', inject: false, input: 'two.js' },
+  { bundleName: 'tree', input: 'tree.js' },
+  'four.js',
+]
+
+const stylesWithLazy = [
+  { bundleName: 'one', input: 'one.css', lazy: false },
+  { bundleName: 'two', input: 'two.css', lazy: true },
+  { bundleName: 'tree', input: 'tree.css' },
+  'four.css',
+]
+
+const stylesExpectWithLazy = [
+  { bundleName: 'one', input: 'one.css' },
+  { bundleName: 'two', inject: false, input: 'two.css' },
+  { bundleName: 'tree', input: 'tree.css' },
+  'four.css',
+]
+
+const workspacePath = '/angular.json';
+
+// tslint:disable:no-big-function
+describe('Migration to version 9', () => {
+  describe('Migrate workspace config', () => {
+    const schematicRunner = new SchematicTestRunner(
+      'migrations',
+      require.resolve('../migration-collection.json'),
+    );
+
+    let tree: UnitTestTree;
+
+    beforeEach(async () => {
+      tree = new UnitTestTree(new EmptyTree());
+      tree = await schematicRunner
+        .runExternalSchematicAsync(
+          require.resolve('../../collection.json'),
+          'ng-new',
+          {
+            name: 'migration-test',
+            version: '1.2.3',
+            directory: '.',
+          },
+          tree,
+        )
+        .toPromise();
+    });
+
+    it('should update scripts in build target', () => {
+      let config = readWorkspaceConfig(tree);
+      let build = config.projects['migration-test'].architect.build;
+      build.options.scripts = scriptsWithLazy;
+      build.configurations.production.scripts = scriptsWithLazy;
+
+      tree.overwrite(workspacePath, JSON.stringify(config));
+      const tree2 = schematicRunner.runSchematic('migration-09', {}, tree.branch());
+      config = readWorkspaceConfig(tree2);
+      build = config.projects['migration-test'].architect.build;
+      expect(build.options.scripts).toEqual(scriptsExpectWithLazy);
+      expect(build.configurations.production.scripts).toEqual(scriptsExpectWithLazy);
+    });
+
+    it('should update styles in build target', () => {
+      let config = readWorkspaceConfig(tree);
+      let build = config.projects['migration-test'].architect.build;
+      build.options.styles = stylesWithLazy;
+      build.configurations.production.styles = stylesWithLazy;
+
+      tree.overwrite(workspacePath, JSON.stringify(config));
+      const tree2 = schematicRunner.runSchematic('migration-09', {}, tree.branch());
+      config = readWorkspaceConfig(tree2);
+      build = config.projects['migration-test'].architect.build;
+      expect(build.options.styles).toEqual(stylesExpectWithLazy);
+      expect(build.configurations.production.styles).toEqual(stylesExpectWithLazy);
+    });
+
+    it('should update scripts in test target', () => {
+      let config = readWorkspaceConfig(tree);
+      let test = config.projects['migration-test'].architect.test;
+      test.options.scripts = scriptsWithLazy;
+      test.configurations = { production: { scripts: scriptsWithLazy } };
+
+      tree.overwrite(workspacePath, JSON.stringify(config));
+      const tree2 = schematicRunner.runSchematic('migration-09', {}, tree.branch());
+      config = readWorkspaceConfig(tree2);
+      test = config.projects['migration-test'].architect.test;
+      expect(test.options.scripts).toEqual(scriptsExpectWithLazy);
+      expect(test.configurations.production.scripts).toEqual(scriptsExpectWithLazy);
+    });
+
+    it('should update styles in test target', () => {
+      let config = readWorkspaceConfig(tree);
+      let test = config.projects['migration-test'].architect.test;
+      test.options.styles = stylesWithLazy;
+      test.configurations = { production: { styles: stylesWithLazy } };
+
+      tree.overwrite(workspacePath, JSON.stringify(config));
+      const tree2 = schematicRunner.runSchematic('migration-09', {}, tree.branch());
+      config = readWorkspaceConfig(tree2);
+      test = config.projects['migration-test'].architect.test;
+      expect(test.options.styles).toEqual(stylesExpectWithLazy);
+      expect(test.configurations.production.styles).toEqual(stylesExpectWithLazy);
+    });
+  });
+});

From af6c6d41d5d8ff5efc4febba34aa943dfea2c46a Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Fri, 28 Jun 2019 13:18:57 -0700
Subject: [PATCH 1572/1703] refactor: add count of component to analytics

---
 docs/design/analytics.md                      |  2 +-
 .../angular_devkit/core/src/_golden-api.d.ts  |  2 +-
 .../plugins/webpack/analytics.ts              | 27 +++++++++++++++++--
 .../core/src/analytics/index.ts               |  4 +--
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/docs/design/analytics.md b/docs/design/analytics.md
index dca7e0039cd2..5ec9c56adf29 100644
--- a/docs/design/analytics.md
+++ b/docs/design/analytics.md
@@ -69,7 +69,7 @@ Note: There's a limit of 20 custom dimensions.
 <!--METRICS_TABLE_BEGIN-->
 | Id | Flag | Type |
 |:---:|:---|:---|
-| 1 | `UNUSED_1` | `none` |
+| 1 | `NgComponentCount` | `number` |
 | 2 | `UNUSED_2` | `none` |
 | 3 | `UNUSED_3` | `none` |
 | 4 | `UNUSED_4` | `none` |
diff --git a/etc/api/angular_devkit/core/src/_golden-api.d.ts b/etc/api/angular_devkit/core/src/_golden-api.d.ts
index cc667472dce2..bd578e135b04 100644
--- a/etc/api/angular_devkit/core/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/core/src/_golden-api.d.ts
@@ -626,7 +626,7 @@ export declare const NgCliAnalyticsDimensionsFlagInfo: {
 };
 
 export declare enum NgCliAnalyticsMetrics {
-    UNUSED_1 = 1,
+    NgComponentCount = 1,
     UNUSED_2 = 2,
     UNUSED_3 = 3,
     UNUSED_4 = 4,
diff --git a/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts b/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts
index d2f1ee59d08b..147557f8dae3 100644
--- a/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts
+++ b/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts
@@ -72,6 +72,7 @@ export function countOccurrences(source: string, match: string, wordBreak = fals
 class AnalyticsBuildStats {
   public errors: string[] = [];
   public numberOfNgOnInit = 0;
+  public numberOfComponents = 0;
   public initialChunkSize = 0;
   public totalChunkCount = 0;
   public totalChunkSize = 0;
@@ -107,6 +108,7 @@ export class NgBuildAnalyticsPlugin {
     const metrics: (string | number)[] = [];
     metrics[analytics.NgCliAnalyticsMetrics.BuildTime] = (endTime - startTime);
     metrics[analytics.NgCliAnalyticsMetrics.NgOnInitCount] = this._stats.numberOfNgOnInit;
+    metrics[analytics.NgCliAnalyticsMetrics.NgComponentCount] = this._stats.numberOfComponents;
     metrics[analytics.NgCliAnalyticsMetrics.InitialChunkSize] = this._stats.initialChunkSize;
     metrics[analytics.NgCliAnalyticsMetrics.TotalChunkCount] = this._stats.totalChunkCount;
     metrics[analytics.NgCliAnalyticsMetrics.TotalChunkSize] = this._stats.totalChunkSize;
@@ -141,10 +143,29 @@ export class NgBuildAnalyticsPlugin {
 
   protected _checkTsNormalModule(module: NormalModule) {
     if (module._source) {
+      // PLEASE REMEMBER:
       // We're dealing with ES5 _or_ ES2015 JavaScript at this point (we don't know for sure).
+
       // Just count the ngOnInit occurences. Comments/Strings/calls occurences should be sparse
       // so we just consider them within the margin of error. We do break on word break though.
       this._stats.numberOfNgOnInit += countOccurrences(module._source.source(), 'ngOnInit', true);
+
+      // Count the number of `Component({` strings (case sensitive), which happens in __decorate().
+      // This does not include View Engine AOT compilation, we use the ngfactory for it.
+      this._stats.numberOfComponents += countOccurrences(module._source.source(), ' Component({');
+      // For Ivy we just count ngComponentDef.
+      this._stats.numberOfComponents += countOccurrences(module._source.source(), 'ngComponentDef', true);
+    }
+  }
+
+  protected _checkNgFactoryNormalModule(module: NormalModule) {
+    if (module._source) {
+      // PLEASE REMEMBER:
+      // We're dealing with ES5 _or_ ES2015 JavaScript at this point (we don't know for sure).
+
+      // Count the number of `.ɵccf(` strings (case sensitive). They're calls to components
+      // factories.
+      this._stats.numberOfComponents += countOccurrences(module._source.source(), '.ɵccf(');
     }
   }
 
@@ -231,8 +252,10 @@ export class NgBuildAnalyticsPlugin {
     }
 
     // Check that it's a source file from the project.
-    if (module.constructor === NormalModule && module.resource.endsWith('.ts')) {
-      this._checkTsNormalModule(module as {} as NormalModule);
+    if (module.resource.endsWith('.ts')) {
+      this._checkTsNormalModule(module);
+    } else if (module.resource.endsWith('.ngfactory.js')) {
+      this._checkNgFactoryNormalModule(module);
     }
   }
 
diff --git a/packages/angular_devkit/core/src/analytics/index.ts b/packages/angular_devkit/core/src/analytics/index.ts
index e84d8f597977..962c451acea1 100644
--- a/packages/angular_devkit/core/src/analytics/index.ts
+++ b/packages/angular_devkit/core/src/analytics/index.ts
@@ -30,7 +30,7 @@ export enum NgCliAnalyticsDimensions {
 }
 
 export enum NgCliAnalyticsMetrics {
-  UNUSED_1 = 1,
+  NgComponentCount = 1,
   UNUSED_2 = 2,
   UNUSED_3 = 3,
   UNUSED_4 = 4,
@@ -62,7 +62,7 @@ export const NgCliAnalyticsDimensionsFlagInfo: { [name: string]: [string, string
 // This table is used when generating the analytics.md file. It should match the enum above
 // or the validate-user-analytics script will fail.
 export const NgCliAnalyticsMetricsFlagInfo: { [name: string]: [string, string] } = {
-  UNUSED_1: ['UNUSED_1', 'none'],
+  NgComponentCount: ['NgComponentCount', 'number'],
   UNUSED_2: ['UNUSED_2', 'none'],
   UNUSED_3: ['UNUSED_3', 'none'],
   UNUSED_4: ['UNUSED_4', 'none'],

From fd512b821705de094e8aa8c9e44fa5c99aa007d0 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 1 Jul 2019 15:09:39 -0700
Subject: [PATCH 1573/1703] refactor: do not report errors if there is no
 errors to report

---
 .../build_angular/plugins/webpack/analytics.ts             | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts b/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts
index 147557f8dae3..509c8a1d18c0 100644
--- a/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts
+++ b/packages/angular_devkit/build_angular/plugins/webpack/analytics.ts
@@ -123,8 +123,11 @@ export class NgBuildAnalyticsPlugin {
   }
   protected _getDimensions(stats: Stats) {
     const dimensions: (string | number)[] = [];
-    // Adding commas before and after so the regex are easier to define.
-    dimensions[analytics.NgCliAnalyticsDimensions.BuildErrors] = `,${this._stats.errors.join()},`;
+
+    if (this._stats.errors.length) {
+      // Adding commas before and after so the regex are easier to define filters.
+      dimensions[analytics.NgCliAnalyticsDimensions.BuildErrors] = `,${this._stats.errors.join()},`;
+    }
 
     return dimensions;
   }

From 994f8c57a62412059358e6c909c51172463a6eed Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 2 Jul 2019 05:19:48 +0000
Subject: [PATCH 1574/1703] build: update ansi-colors to version 4.1.0

---
 packages/angular/cli/package.json | 2 +-
 yarn.lock                         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 0e06d862f633..e420675e8a90 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -31,7 +31,7 @@
     "@schematics/angular": "0.0.0",
     "@schematics/update": "0.0.0",
     "@yarnpkg/lockfile": "1.1.0",
-    "ansi-colors": "4.0.1",
+    "ansi-colors": "4.1.0",
     "debug": "^4.1.1",
     "ini": "1.3.5",
     "inquirer": "6.4.1",
diff --git a/yarn.lock b/yarn.lock
index afe3921782a9..4623c14a6fc9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1054,10 +1054,10 @@ ansi-colors@3.2.4:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
   integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
 
-ansi-colors@4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.0.1.tgz#3dc29301836c6152f617a71466bde162a2e42582"
-  integrity sha512-1Qs1jdXEMSYwcVooLRfnCc5+e3365pw38v4AVkSsCxsjXRGKDTem5VLCl53SpHSpLnEy8O5DofJHZJELaRiJbg==
+ansi-colors@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.0.tgz#e1674bd61027c8c219b9edec929b6b57641b0c09"
+  integrity sha512-3NkLpm6I6kEgC8J0I9EZ0fouXc/mm5J9zqJFCgA2jGqmsL0O64I7Uvi3AmUMnnRqc6u7uLgVVnY4pyBQ03nCiw==
 
 ansi-colors@^3.0.0:
   version "3.2.1"

From 5b372dc7dd496474913839361c2284a7f704e6b1 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 2 Jul 2019 06:13:37 +0000
Subject: [PATCH 1575/1703] build: update sass to version 1.22.2

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 3d55f6c69813..9416b892f1e0 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -37,7 +37,7 @@
     "postcss-loader": "3.0.0",
     "raw-loader": "1.0.0",
     "rxjs": "6.4.0",
-    "sass": "1.22.1",
+    "sass": "1.22.2",
     "sass-loader": "7.1.0",
     "semver": "6.1.2",
     "source-map-support": "0.5.12",
diff --git a/yarn.lock b/yarn.lock
index 4623c14a6fc9..c531cb769668 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9047,10 +9047,10 @@ sass-loader@7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
-sass@1.22.1:
-  version "1.22.1"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.22.1.tgz#9dc3cb2ea37d12fec94ef5c0e1112055f23e5bc8"
-  integrity sha512-VsWrNdfIzCLbD2TO2bq9tCaUzEE0UUSGtP3r9IhHi8ypAPCb3FOVP99kMRil+ZROEcTnKReZcQP9vk6ArV2eLw==
+sass@1.22.2:
+  version "1.22.2"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.22.2.tgz#ed9abee7a3e409fe2ccfdc1b66c64c7c841e0c62"
+  integrity sha512-enuQuy/CbfrZLA2vOy9tB7CK7pP5bZllnMbr5nPGWCFelwt0EMUVGC11gsv9rybkWc8pp/NKVY/c5+AKyjbnXg==
   dependencies:
     chokidar ">=2.0.0 <4.0.0"
 

From 88ca7a7a0621aaab7989dad5de9058f894d26172 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hansl@users.noreply.github.com>
Date: Mon, 1 Jul 2019 16:13:03 -0700
Subject: [PATCH 1576/1703] build: remove serialize script and
 @ngtool/json-schema deps

Wasnt needed or used.
---
 package.json         |  1 -
 scripts/serialize.ts | 53 --------------------------------------------
 2 files changed, 54 deletions(-)
 delete mode 100644 scripts/serialize.ts

diff --git a/package.json b/package.json
index a9a197bebf41..8104b8479bfd 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,6 @@
     "@bazel/jasmine": "~0.26.0",
     "@bazel/karma": "~0.26.0",
     "@bazel/typescript": "~0.26.0",
-    "@ngtools/json-schema": "^1.1.0",
     "@types/browserslist": "^4.4.0",
     "@types/caniuse-lite": "^1.0.0",
     "@types/copy-webpack-plugin": "^4.4.1",
diff --git a/scripts/serialize.ts b/scripts/serialize.ts
deleted file mode 100644
index f3d0b3a64baf..000000000000
--- a/scripts/serialize.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-// tslint:disable:no-implicit-dependencies
-import { logging, strings } from '@angular-devkit/core';
-import { SchemaClassFactory } from '@ngtools/json-schema';
-import * as fs from 'fs';
-
-
-export function buildSchema(inFile: string, mimetype: string): string {
-  const jsonSchema = JSON.parse(fs.readFileSync(inFile, 'utf-8'));
-  const SchemaClass = SchemaClassFactory(jsonSchema);
-  const schemaInstance = new SchemaClass({});
-
-  let name = inFile.split(/[\/\\]/g).pop();
-  if (name) {
-    name = strings.classify(name.replace(/\.[^.]*$/, ''));
-  }
-
-  const license = `/**
-     * @license
-     * Copyright Google Inc. All Rights Reserved.
-     *
-     * Use of this source code is governed by an MIT-style license that can be
-     * found in the LICENSE file at https://angular.io/license
-     */
-
-    `.replace(/^ {4}/gm, '');
-
-  return license + schemaInstance.$$serialize(mimetype, name);
-}
-
-
-export default function(opts: { _: string[], mimetype?: string }, logger: logging.Logger) {
-  const inFile = opts._[0] as string;
-  const outFile = opts._[1] as string;
-  const mimetype = opts.mimetype || 'text/x.dts';
-
-  if (!inFile) {
-    logger.fatal('Command serialize needs an input file.');
-  } else {
-    const output = buildSchema(inFile, mimetype);
-    if (outFile) {
-      fs.writeFileSync(outFile, output, { encoding: 'utf-8' });
-    } else {
-      logger.info(output);
-    }
-  }
-}

From 762d95741b94395dc88a4759f263aae29c994ff7 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 2 Jul 2019 13:57:51 -0400
Subject: [PATCH 1577/1703] refactor(@angular/cli): simplify unhandled
 exception message

---
 packages/angular/cli/lib/cli/index.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/angular/cli/lib/cli/index.ts b/packages/angular/cli/lib/cli/index.ts
index a517447cd92d..c5bb1c53c546 100644
--- a/packages/angular/cli/lib/cli/index.ts
+++ b/packages/angular/cli/lib/cli/index.ts
@@ -72,9 +72,7 @@ export default async function(options: { testing?: boolean; cliArgs: string[] })
 
         logger.fatal(
           `An unhandled exception occurred: ${err.message}\n` +
-            `See "${logPath}" for further details.\n\n` +
-            'Please report with the contents of the log file at ' +
-            'https://github.com/angular/angular-cli/issues/new?template=1-bug-report.md',
+            `See "${logPath}" for further details.`
         );
       } catch (e) {
         logger.fatal(

From 76d5e76283e3baf03d0b61173154775d720ebae5 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 2 Jul 2019 14:16:57 -0400
Subject: [PATCH 1578/1703] test: ensure Node.js 10 E2E has latest npm version

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 860b6de6ae0a..291a72a17bfd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -163,6 +163,8 @@ jobs:
     parallelism: 4
     steps:
       - attach_workspace: *attach_options
+      # Ensure latest npm version to support local package repository
+      - run: PATH=~/.npm-global/bin:$PATH npm install --global npm
       - run: PATH=~/.npm-global/bin:$PATH xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
 
   e2e-cli-ivy:

From a41e94a5689a7fbc336d952ec849f28e1014f129 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 2 Jul 2019 18:10:29 +0000
Subject: [PATCH 1579/1703] build: update magic-string to version 0.25.3

---
 packages/angular_devkit/core/package.json | 2 +-
 yarn.lock                                 | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json
index 8c4f6b835f7c..25cbead03134 100644
--- a/packages/angular_devkit/core/package.json
+++ b/packages/angular_devkit/core/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "ajv": "6.10.0",
     "fast-json-stable-stringify": "2.0.0",
-    "magic-string": "0.25.2",
+    "magic-string": "0.25.3",
     "rxjs": "6.4.0",
     "source-map": "0.7.3"
   },
diff --git a/yarn.lock b/yarn.lock
index c531cb769668..b258440580f4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6485,10 +6485,10 @@ lunr-mutable-indexes@2.3.2:
   resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.6.tgz#f278beee7ffd56ad86e6e478ce02ab2b98c78dd5"
   integrity sha512-swStvEyDqQ85MGpABCMBclZcLI/pBIlu8FFDtmX197+oEgKloJ67QnB+Tidh0340HmLMs39c4GrkPY3cmkXp6Q==
 
-magic-string@0.25.2:
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9"
-  integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==
+magic-string@0.25.3:
+  version "0.25.3"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.3.tgz#34b8d2a2c7fec9d9bdf9929a3fd81d271ef35be9"
+  integrity sha512-6QK0OpF/phMz0Q2AxILkX2mFhi7m+WMwTRg0LQKq/WBB0cDP4rYH3Wp4/d3OTXlrPLVJT/RFqj8tFeAR4nk8AA==
   dependencies:
     sourcemap-codec "^1.4.4"
 

From 64eff51be6dac6b278df74f9bf06b94758a2bae4 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 2 Jul 2019 18:11:04 +0000
Subject: [PATCH 1580/1703] build: update semver to version 6.2.0

---
 package.json                                       | 2 +-
 packages/angular/cli/package.json                  | 2 +-
 packages/angular_devkit/build_angular/package.json | 2 +-
 packages/schematics/update/package.json            | 2 +-
 yarn.lock                                          | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 8104b8479bfd..a2c1dfa85e88 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "pidtree": "^0.3.0",
     "pidusage": "^2.0.17",
     "rxjs": "~6.4.0",
-    "semver": "6.1.2",
+    "semver": "6.2.0",
     "source-map": "^0.5.6",
     "source-map-support": "^0.5.0",
     "spdx-satisfies": "^4.0.0",
diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index e420675e8a90..37dcc2ce6ddd 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -39,7 +39,7 @@
     "open": "6.4.0",
     "pacote": "9.5.1",
     "read-package-tree": "5.3.1",
-    "semver": "6.1.2",
+    "semver": "6.2.0",
     "symbol-observable": "1.2.0",
     "universal-analytics": "^0.4.20",
     "uuid": "^3.3.2"
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 9416b892f1e0..58eb2819ea83 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -39,7 +39,7 @@
     "rxjs": "6.4.0",
     "sass": "1.22.2",
     "sass-loader": "7.1.0",
-    "semver": "6.1.2",
+    "semver": "6.2.0",
     "source-map-support": "0.5.12",
     "source-map-loader": "0.2.4",
     "speed-measure-webpack-plugin": "1.3.1",
diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index 3692deb683b8..decc895f8759 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -16,7 +16,7 @@
     "@yarnpkg/lockfile": "1.1.0",
     "ini": "1.3.5",
     "pacote": "9.5.1",
-    "semver": "6.1.2",
+    "semver": "6.2.0",
     "semver-intersect": "1.4.0",
     "rxjs": "6.4.0"
   }
diff --git a/yarn.lock b/yarn.lock
index b258440580f4..cdd74948c8ff 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9190,10 +9190,10 @@ semver@6.1.1, semver@^6.1.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
   integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==
 
-semver@6.1.2:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.2.tgz#079960381376a3db62eb2edc8a3bfb10c7cfe318"
-  integrity sha512-z4PqiCpomGtWj8633oeAdXm1Kn1W++3T8epkZYnwiVgIYIJ0QHszhInYSJTYxebByQH7KVCEAn8R9duzZW2PhQ==
+semver@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db"
+  integrity sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==
 
 send@0.16.2:
   version "0.16.2"

From 5ef08462149335febdb7e6057c20194edb5ec18f Mon Sep 17 00:00:00 2001
From: vikerman <viks@google.com>
Date: Tue, 2 Jul 2019 11:21:25 -0700
Subject: [PATCH 1581/1703] fix(@angular-devkit/architect): one more fix for
 newest version of rxjs

---
 .../core/src/experimental/jobs/simple-scheduler.ts             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts b/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts
index 9c1c4fb7d88a..9c79628b8544 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts
@@ -509,7 +509,8 @@ export class SimpleScheduler<
       waitable,
 
       from(handler).pipe(
-        switchMap(handler => new Observable((subscriber: Observer<JobOutboundMessage<O>>) => {
+        switchMap(handler => new Observable<JobOutboundMessage<O>>(
+                      (subscriber: Observer<JobOutboundMessage<O>>) => {
           if (!handler) {
             throw new JobDoesNotExistException(name);
           }

From ec925af64aef55bd56d3e4dfddaa56e26ec1b02f Mon Sep 17 00:00:00 2001
From: vikerman <viks@google.com>
Date: Tue, 2 Jul 2019 14:20:37 -0700
Subject: [PATCH 1582/1703] release: v8.1.0

---
 packages/schematics/angular/utility/latest-versions.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 915d7da11e2c..f96674b1584e 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -8,15 +8,15 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~8.1.0-rc.0',
+  Angular: '~8.1.0',
   RxJs: '~6.4.0',
   ZoneJs: '~0.9.1',
   TypeScript: '~3.4.3',
   TsLib: '^1.9.0',
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.801.0-rc.0',
-  DevkitBuildNgPackagr: '~0.801.0-rc.0',
-  DevkitBuildWebpack: '~0.801.0-rc.0',
+  DevkitBuildAngular: '~0.801.0',
+  DevkitBuildNgPackagr: '~0.801.0',
+  DevkitBuildWebpack: '~0.801.0',
 
   tsickle: '^0.35.0',
   ngPackagr: '^5.1.0',

From fa84505563861ba18fd1af203201b09669ccb677 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 2 Jul 2019 16:22:09 -0400
Subject: [PATCH 1583/1703] build: support publishing on windows

---
 scripts/publish.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/publish.ts b/scripts/publish.ts
index 0144e1120f5e..a3c0727d7d3f 100644
--- a/scripts/publish.ts
+++ b/scripts/publish.ts
@@ -21,6 +21,11 @@ export interface PublishArgs {
 
 
 function _exec(command: string, args: string[], opts: { cwd?: string }, logger: logging.Logger) {
+  if (process.platform.startsWith('win')) {
+    args.unshift('/c', command);
+    command = 'cmd.exe';
+  }
+
   const { status, error, stderr, stdout } = spawnSync(command, args, { ...opts });
 
   if (status != 0) {

From 560ba2a5dd32801bd4d95e0f2fa4f14493358eaa Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 3 Jul 2019 14:13:29 +0100
Subject: [PATCH 1584/1703] test: update ngtools/webpack size check

See https://github.com/angular/angular/issues/31404 for details.
---
 tests/legacy-cli/e2e/tests/packages/webpack/test-app.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/legacy-cli/e2e/tests/packages/webpack/test-app.ts b/tests/legacy-cli/e2e/tests/packages/webpack/test-app.ts
index 8a7a09072186..e562226e6b98 100644
--- a/tests/legacy-cli/e2e/tests/packages/webpack/test-app.ts
+++ b/tests/legacy-cli/e2e/tests/packages/webpack/test-app.ts
@@ -8,7 +8,8 @@ export default function(skipCleaning: () => void) {
   return Promise.resolve()
     .then(() => createProjectFromAsset('webpack/test-app'))
     .then(() => exec(normalize('node_modules/.bin/webpack-cli')))
-    .then(() => expectFileSizeToBeUnder('dist/app.main.js', 470 * 1024))
+    // Note: these sizes are without Build Optimizer or any advanced optimizations in the CLI.
+    .then(() => expectFileSizeToBeUnder('dist/app.main.js', 483 * 1024))
     .then(() => expectFileSizeToBeUnder('dist/0.app.main.js', 25 * 1024))
     .then(() => expectFileSizeToBeUnder('dist/1.app.main.js', 2 * 1024))
     // test resource urls without ./

From 5b5f140109c0c3ba0bc235ca322028f9b558dd93 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 28 Jun 2019 19:28:33 -0400
Subject: [PATCH 1585/1703] refactor(@angular/cli): use stable workspace API

---
 .../angular/cli/models/architect-command.ts   | 70 +++++++++----------
 .../angular/cli/models/schematic-command.ts   | 70 +++++++++++++++----
 .../angular/cli/models/workspace-loader.ts    | 54 --------------
 3 files changed, 91 insertions(+), 103 deletions(-)
 delete mode 100644 packages/angular/cli/models/workspace-loader.ts

diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index 9af118b80db1..d8250fbdede5 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.ts
@@ -7,7 +7,7 @@
  */
 import { Architect, Target } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
-import { experimental, json, schema, tags } from '@angular-devkit/core';
+import { json, schema, tags, workspaces } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { BepJsonWriter } from '../utilities/bep';
 import { parseJsonSchemaToOptions } from '../utilities/json-schema';
@@ -15,7 +15,6 @@ import { isPackageNameSafeForAnalytics } from './analytics';
 import { BaseCommandOptions, Command } from './command';
 import { Arguments, Option } from './interface';
 import { parseArguments } from './parser';
-import { WorkspaceLoader } from './workspace-loader';
 
 export interface ArchitectCommandOptions extends BaseCommandOptions {
   project?: string;
@@ -25,11 +24,11 @@ export interface ArchitectCommandOptions extends BaseCommandOptions {
 }
 
 export abstract class ArchitectCommand<
-  T extends ArchitectCommandOptions = ArchitectCommandOptions,
-> extends Command<ArchitectCommandOptions> {
+  T extends ArchitectCommandOptions = ArchitectCommandOptions
+> extends Command<T> {
   protected _architect: Architect;
   protected _architectHost: WorkspaceNodeModulesArchitectHost;
-  protected _workspace: experimental.workspace.Workspace;
+  protected _workspace: workspaces.WorkspaceDefinition;
   protected _registry: json.schema.SchemaRegistry;
 
   // If this command supports running multiple targets.
@@ -37,15 +36,16 @@ export abstract class ArchitectCommand<
 
   target: string | undefined;
 
-  public async initialize(options: ArchitectCommandOptions & Arguments): Promise<void> {
+  public async initialize(options: T & Arguments): Promise<void> {
     await super.initialize(options);
 
     this._registry = new json.schema.CoreSchemaRegistry();
     this._registry.addPostTransform(json.schema.transforms.addUndefinedDefaults);
 
-    const workspaceLoader = new WorkspaceLoader(new NodeJsSyncHost());
-
-    const workspace = await workspaceLoader.loadWorkspace(this.workspace.root);
+    const { workspace } = await workspaces.readWorkspace(
+      this.workspace.root,
+      workspaces.createWorkspaceHost(new NodeJsSyncHost()),
+    );
     this._workspace = workspace;
 
     this._architectHost = new WorkspaceNodeModulesArchitectHost(workspace, this.workspace.root);
@@ -68,8 +68,8 @@ export abstract class ArchitectCommand<
     const commandLeftovers = options['--'];
     let projectName = options.project;
     const targetProjectNames: string[] = [];
-    for (const name of this._workspace.listProjectNames()) {
-      if (this._workspace.getProjectTargets(name)[this.target]) {
+    for (const [name, project] of this._workspace.projects) {
+      if (project.targets.has(this.target)) {
         targetProjectNames.push(name);
       }
     }
@@ -84,7 +84,7 @@ export abstract class ArchitectCommand<
 
     if (!projectName && commandLeftovers && commandLeftovers.length > 0) {
       const builderNames = new Set<string>();
-      const leftoverMap = new Map<string, { optionDefs: Option[], parsedOptions: Arguments }>();
+      const leftoverMap = new Map<string, { optionDefs: Option[]; parsedOptions: Arguments }>();
       let potentialProjectNames = new Set<string>(targetProjectNames);
       for (const name of targetProjectNames) {
         const builderName = await this._architectHost.getBuilderNameForTarget({
@@ -147,7 +147,7 @@ export abstract class ArchitectCommand<
     }
 
     if (!projectName && !this.multiTarget) {
-      const defaultProjectName = this._workspace.getDefaultProjectName();
+      const defaultProjectName = this._workspace.extensions['defaultProject'] as string;
       if (targetProjectNames.length === 1) {
         projectName = targetProjectNames[0];
       } else if (defaultProjectName && targetProjectNames.includes(defaultProjectName)) {
@@ -168,9 +168,12 @@ export abstract class ArchitectCommand<
     });
     const builderDesc = await this._architectHost.resolveBuilder(builderConf);
 
-    this.description.options.push(...(
-      await parseJsonSchemaToOptions(this._registry, builderDesc.optionSchema as json.JsonObject)
-    ));
+    this.description.options.push(
+      ...(await parseJsonSchemaToOptions(
+        this._registry,
+        builderDesc.optionSchema as json.JsonObject,
+      )),
+    );
 
     // Update options to remove analytics from options if the builder isn't safelisted.
     for (const o of this.description.options) {
@@ -199,11 +202,9 @@ export abstract class ArchitectCommand<
 
     let last = 1;
     let rebuild = false;
-    const run = await this._architect.scheduleTarget(
-      configuration,
-      overrides,
-      { logger: this.logger },
-    );
+    const run = await this._architect.scheduleTarget(configuration, overrides, {
+      logger: this.logger,
+    });
     await run.output.forEach(event => {
       last = event.success ? 0 : 1;
 
@@ -239,8 +240,8 @@ export abstract class ArchitectCommand<
     );
     const overrides = parseArguments(targetOptions, targetOptionArray, this.logger);
 
-    const allowAdditionalProperties = typeof builderDesc.optionSchema === 'object'
-      && builderDesc.optionSchema.additionalProperties;
+    const allowAdditionalProperties =
+      typeof builderDesc.optionSchema === 'object' && builderDesc.optionSchema.additionalProperties;
 
     if (overrides['--'] && !allowAdditionalProperties) {
       (overrides['--'] || []).forEach(additional => {
@@ -261,14 +262,10 @@ export abstract class ArchitectCommand<
         commandOptions.buildEventLog as string,
       );
     } else {
-      const run = await this._architect.scheduleTarget(
-        target,
-        overrides as json.JsonObject,
-        {
-          logger: this.logger,
-          analytics: isPackageNameSafeForAnalytics(builderConf) ? this.analytics : undefined,
-        },
-      );
+      const run = await this._architect.scheduleTarget(target, overrides as json.JsonObject, {
+        logger: this.logger,
+        analytics: isPackageNameSafeForAnalytics(builderConf) ? this.analytics : undefined,
+      });
 
       const { error, success } = await run.output.toPromise();
       await run.stop();
@@ -331,9 +328,12 @@ export abstract class ArchitectCommand<
   }
 
   private getProjectNamesByTarget(targetName: string): string[] {
-    const allProjectsForTargetName = this._workspace.listProjectNames().map(projectName =>
-      this._workspace.getProjectTargets(projectName)[targetName] ? projectName : null,
-    ).filter(x => !!x) as string[];
+    const allProjectsForTargetName: string[] = [];
+    for (const [name, project] of this._workspace.projects) {
+      if (project.targets.has(targetName)) {
+        allProjectsForTargetName.push(name);
+      }
+    }
 
     if (this.multiTarget) {
       // For multi target commands, we always list all projects that have the target.
@@ -341,7 +341,7 @@ export abstract class ArchitectCommand<
     } else {
       // For single target commands, we try the default project first,
       // then the full list if it has a single project, then error out.
-      const maybeDefaultProject = this._workspace.getDefaultProjectName();
+      const maybeDefaultProject = this._workspace.extensions['defaultProject'] as string;
       if (maybeDefaultProject && allProjectsForTargetName.includes(maybeDefaultProject)) {
         return [maybeDefaultProject];
       }
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index c6d6fcb6a2a3..f5a4a5b67073 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {
-  experimental,
   json,
   logging,
   normalize,
@@ -14,6 +13,7 @@ import {
   strings,
   tags,
   virtualFs,
+  workspaces,
 } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { DryRunEvent, UnsuccessfulWorkflowExecution, workflow } from '@angular-devkit/schematics';
@@ -26,7 +26,6 @@ import {
 } from '@angular-devkit/schematics/tools';
 import * as inquirer from 'inquirer';
 import * as systemPath from 'path';
-import { WorkspaceLoader } from '../models/workspace-loader';
 import { colors } from '../utilities/color';
 import {
   getProjectByCwd,
@@ -70,7 +69,7 @@ export abstract class SchematicCommand<
   readonly allowPrivateSchematics: boolean = false;
   readonly allowAdditionalArgs: boolean = false;
   private _host = new NodeJsSyncHost();
-  private _workspace: experimental.workspace.Workspace;
+  private _workspace: workspaces.WorkspaceDefinition;
   protected _workflow: NodeWorkflow;
 
   private readonly defaultCollectionName = '@schematics/angular';
@@ -272,22 +271,23 @@ export abstract class SchematicCommand<
 
     workflow.registry.addSmartDefaultProvider('projectName', () => {
       if (this._workspace) {
-        try {
-          return (
-            this._workspace.getProjectByPath(normalize(process.cwd())) ||
-            this._workspace.getDefaultProjectName()
-          );
-        } catch (e) {
-          if (e instanceof experimental.workspace.AmbiguousProjectPathException) {
+        const projectNames = getProjectsByPath(this._workspace, process.cwd(), this.workspace.root);
+
+        if (projectNames.length === 1) {
+          return projectNames[0];
+        } else {
+          if (projectNames.length > 1) {
             this.logger.warn(tags.oneLine`
               Two or more projects are using identical roots.
               Unable to determine project using current working directory.
               Using default workspace project instead.
             `);
+          }
 
-            return this._workspace.getDefaultProjectName();
+          const defaultProjectName = this._workspace.extensions['defaultProject'];
+          if (typeof defaultProjectName === 'string' && defaultProjectName) {
+            return defaultProjectName;
           }
-          throw e;
         }
       }
 
@@ -560,10 +560,13 @@ export abstract class SchematicCommand<
     if (this._workspace) {
       return;
     }
-    const workspaceLoader = new WorkspaceLoader(this._host);
 
     try {
-      this._workspace = await workspaceLoader.loadWorkspace(this.workspace.root);
+      const { workspace } = await workspaces.readWorkspace(
+        this.workspace.root,
+        workspaces.createWorkspaceHost(this._host),
+      );
+      this._workspace = workspace;
     } catch (err) {
       if (!this.allowMissingWorkspace) {
         // Ignore missing workspace
@@ -572,3 +575,42 @@ export abstract class SchematicCommand<
     }
   }
 }
+
+function getProjectsByPath(
+  workspace: workspaces.WorkspaceDefinition,
+  path: string,
+  root: string,
+): string[] {
+  if (workspace.projects.size === 1) {
+    return Array.from(workspace.projects.keys());
+  }
+
+  const isInside = (base: string, potential: string): boolean => {
+    const absoluteBase = systemPath.resolve(root, base);
+    const absolutePotential = systemPath.resolve(root, potential);
+    const relativePotential = systemPath.relative(absoluteBase, absolutePotential);
+    if (!relativePotential.startsWith('..') && !systemPath.isAbsolute(relativePotential)) {
+      return true;
+    }
+
+    return false;
+  };
+
+  const projects = Array.from(workspace.projects.entries())
+    .map(([name, project]) => [systemPath.resolve(root, project.root), name] as [string, string])
+    .filter(tuple => isInside(tuple[0], path))
+    // Sort tuples by depth, with the deeper ones first. Since the first member is a path and
+    // we filtered all invalid paths, the longest will be the deepest (and in case of equality
+    // the sort is stable and the first declared project will win).
+    .sort((a, b) => b[0].length - a[0].length);
+
+  if (projects.length === 1) {
+    return [projects[0][1]];
+  } else if (projects.length > 1) {
+    const firstPath = projects[0][0];
+
+    return projects.filter(v => v[0] === firstPath).map(v => v[1]);
+  }
+
+  return [];
+}
diff --git a/packages/angular/cli/models/workspace-loader.ts b/packages/angular/cli/models/workspace-loader.ts
deleted file mode 100644
index 854492a2e03b..000000000000
--- a/packages/angular/cli/models/workspace-loader.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-import {
-  Path,
-  basename,
-  dirname,
-  experimental,
-  normalize,
-  virtualFs,
-} from '@angular-devkit/core';
-import { findUp } from '../utilities/find-up';
-
-
-export class WorkspaceLoader {
-  // TODO: add remaining fallbacks.
-  private _configFileNames = [
-    normalize('.angular.json'),
-    normalize('angular.json'),
-  ];
-  constructor(private _host: virtualFs.Host) { }
-
-  loadWorkspace(projectPath?: string): Promise<experimental.workspace.Workspace> {
-    return this._loadWorkspaceFromPath(this._getProjectWorkspaceFilePath(projectPath));
-  }
-
-  // TODO: do this with the host instead of fs.
-  private _getProjectWorkspaceFilePath(projectPath?: string): Path {
-    // Find the workspace file, either where specified, in the Angular CLI project
-    // (if it's in node_modules) or from the current process.
-    const workspaceFilePath = (projectPath && findUp(this._configFileNames, projectPath))
-      || findUp(this._configFileNames, process.cwd())
-      || findUp(this._configFileNames, __dirname);
-
-    if (workspaceFilePath) {
-      return normalize(workspaceFilePath);
-    } else {
-      throw new Error(`Local workspace file ('angular.json') could not be found.`);
-    }
-  }
-
-  private _loadWorkspaceFromPath(workspacePath: Path) {
-    const workspaceRoot = dirname(workspacePath);
-    const workspaceFileName = basename(workspacePath);
-    const workspace = new experimental.workspace.Workspace(workspaceRoot, this._host);
-
-    return workspace.loadWorkspaceFromHost(workspaceFileName).toPromise();
-  }
-}

From d575428381e973e0daa1752cd913a71eb25e475a Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 3 Jul 2019 16:41:11 +0000
Subject: [PATCH 1586/1703] build: update ansi-colors to version 4.1.1

---
 packages/angular/cli/package.json | 2 +-
 yarn.lock                         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 37dcc2ce6ddd..2588687437b6 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -31,7 +31,7 @@
     "@schematics/angular": "0.0.0",
     "@schematics/update": "0.0.0",
     "@yarnpkg/lockfile": "1.1.0",
-    "ansi-colors": "4.1.0",
+    "ansi-colors": "4.1.1",
     "debug": "^4.1.1",
     "ini": "1.3.5",
     "inquirer": "6.4.1",
diff --git a/yarn.lock b/yarn.lock
index cdd74948c8ff..0ead01039a6a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1054,10 +1054,10 @@ ansi-colors@3.2.4:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
   integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
 
-ansi-colors@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.0.tgz#e1674bd61027c8c219b9edec929b6b57641b0c09"
-  integrity sha512-3NkLpm6I6kEgC8J0I9EZ0fouXc/mm5J9zqJFCgA2jGqmsL0O64I7Uvi3AmUMnnRqc6u7uLgVVnY4pyBQ03nCiw==
+ansi-colors@4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
 
 ansi-colors@^3.0.0:
   version "3.2.1"

From 072ddd3dbdae98b19647697c39b919eed4f3d2c4 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 4 Jul 2019 05:19:42 +0000
Subject: [PATCH 1587/1703] build: update sass to version 1.22.3

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 58eb2819ea83..16dc792b4258 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -37,7 +37,7 @@
     "postcss-loader": "3.0.0",
     "raw-loader": "1.0.0",
     "rxjs": "6.4.0",
-    "sass": "1.22.2",
+    "sass": "1.22.3",
     "sass-loader": "7.1.0",
     "semver": "6.2.0",
     "source-map-support": "0.5.12",
diff --git a/yarn.lock b/yarn.lock
index 0ead01039a6a..b0eb761d6965 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9047,10 +9047,10 @@ sass-loader@7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
-sass@1.22.2:
-  version "1.22.2"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.22.2.tgz#ed9abee7a3e409fe2ccfdc1b66c64c7c841e0c62"
-  integrity sha512-enuQuy/CbfrZLA2vOy9tB7CK7pP5bZllnMbr5nPGWCFelwt0EMUVGC11gsv9rybkWc8pp/NKVY/c5+AKyjbnXg==
+sass@1.22.3:
+  version "1.22.3"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.22.3.tgz#b3591191ab0f3caece39ed9384c90caccacf471c"
+  integrity sha512-9ECcSAEgGStxZkpOCT+Z8F6jEJq+jjPonxgX52QVNeJbRL1CmrjN9qcoO78gob6M1bY4ocGVwPWjGDNMeOgvbg==
   dependencies:
     chokidar ">=2.0.0 <4.0.0"
 

From bfb03d2ab2a6fbf2583cd42c50182904c30f92b7 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 6 Jul 2019 05:19:58 +0000
Subject: [PATCH 1588/1703] build: update autoprefixer to version 9.6.1

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 65 ++++++-------------
 2 files changed, 21 insertions(+), 46 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 16dc792b4258..09475f1e63cb 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -13,7 +13,7 @@
     "@angular-devkit/core": "0.0.0",
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.10.0",
-    "autoprefixer": "9.6.0",
+    "autoprefixer": "9.6.1",
     "browserslist": "4.6.3",
     "caniuse-lite": "1.0.30000979",
     "circular-dependency-plugin": "5.0.2",
diff --git a/yarn.lock b/yarn.lock
index b0eb761d6965..9de7b799ddb5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1344,18 +1344,18 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@9.6.0:
-  version "9.6.0"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.0.tgz#0111c6bde2ad20c6f17995a33fad7cf6854b4c87"
-  integrity sha512-kuip9YilBqhirhHEGHaBTZKXL//xxGnzvsD0FtBQa6z+A69qZD6s/BAX9VzDF1i9VKDquTJDQaPLSEhOnL6FvQ==
+autoprefixer@9.6.1:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz#51967a02d2d2300bb01866c1611ec8348d355a47"
+  integrity sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==
   dependencies:
-    browserslist "^4.6.1"
-    caniuse-lite "^1.0.30000971"
+    browserslist "^4.6.3"
+    caniuse-lite "^1.0.30000980"
     chalk "^2.4.2"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^7.0.16"
-    postcss-value-parser "^3.3.1"
+    postcss "^7.0.17"
+    postcss-value-parser "^4.0.0"
 
 autoprefixer@^9.0.0:
   version "9.3.1"
@@ -1755,7 +1755,7 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@4.6.3:
+browserslist@4.6.3, browserslist@^4.6.3:
   version "4.6.3"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.3.tgz#0530cbc6ab0c1f3fc8c819c72377ba55cf647f05"
   integrity sha512-CNBqTCq22RKM8wKJNowcqihHJ4SkI8CGeK7KOR9tPboXUuS5Zk5lQgzzTbs4oxD8x+6HUshZUa2OyNI9lR93bQ==
@@ -1773,15 +1773,6 @@ browserslist@^4.0.0, browserslist@^4.3.3:
     electron-to-chromium "^1.3.124"
     node-releases "^1.1.14"
 
-browserslist@^4.6.1:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.1.tgz#ee5059b1aec18cbec9d055d6cb5e24ae50343a9b"
-  integrity sha512-1MC18ooMPRG2UuVFJTHFIAkk6mpByJfxCrnUyvSlu/hyQSFHMrlhM02SzNuCV+quTP4CKmqtOMAIjrifrpBJXQ==
-  dependencies:
-    caniuse-lite "^1.0.30000971"
-    electron-to-chromium "^1.3.137"
-    node-releases "^1.1.21"
-
 browserstack@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.5.1.tgz#e2dfa66ffee940ebad0a07f7e00fd4687c455d66"
@@ -2027,16 +2018,16 @@ caniuse-lite@^1.0.30000960:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000960.tgz#ec48297037e5607f582f246ae7b12bee66a78999"
   integrity sha512-7nK5qs17icQaX6V3/RYrJkOsZyRNnroA4+ZwxaKJzIKy+crIy0Mz5CBlLySd2SNV+4nbUZeqeNfiaEieUBu3aA==
 
-caniuse-lite@^1.0.30000971:
-  version "1.0.30000971"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000971.tgz#d1000e4546486a6977756547352bc96a4cfd2b13"
-  integrity sha512-TQFYFhRS0O5rdsmSbF1Wn+16latXYsQJat66f7S7lizXW1PVpWJeZw9wqqVLIjuxDRz7s7xRUj13QCfd8hKn6g==
-
 caniuse-lite@^1.0.30000975:
   version "1.0.30000975"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000975.tgz#d4e7131391dddcf2838999d3ce75065f65f1cdfc"
   integrity sha512-ZsXA9YWQX6ATu5MNg+Vx/cMQ+hM6vBBSqDeJs8ruk9z0ky4yIHML15MoxcFt088ST2uyjgqyUGRJButkptWf0w==
 
+caniuse-lite@^1.0.30000980:
+  version "1.0.30000980"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000980.tgz#0df53e4354b3111f83ac15b0bd4c71fe92994231"
+  integrity sha512-as0PRtWHaX3gl2gpC7qA7bX88lr+qLacMMXm1QKLLQtBCwT/Ljbgrv5EXKMNBoeEX6yFZ4vIsBb4Nh+PEwW2Rw==
+
 canonical-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
@@ -3432,11 +3423,6 @@ electron-to-chromium@^1.3.124:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.124.tgz#861fc0148748a11b3e5ccebdf8b795ff513fa11f"
   integrity sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==
 
-electron-to-chromium@^1.3.137:
-  version "1.3.137"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.137.tgz#ba7c88024984c038a5c5c434529aabcea7b42944"
-  integrity sha512-kGi32g42a8vS/WnYE7ELJyejRT7hbr3UeOOu0WeuYuQ29gCpg9Lrf6RdcTQVXSt/v0bjCfnlb/EWOOsiKpTmkw==
-
 electron-to-chromium@^1.3.164:
   version "1.3.164"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.164.tgz#8680b875577882c1572c42218d53fa9ba5f71d5d"
@@ -7147,13 +7133,6 @@ node-releases@^1.1.14:
   dependencies:
     semver "^5.3.0"
 
-node-releases@^1.1.21:
-  version "1.1.21"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.21.tgz#46c86f9adaceae4d63c75d3c2f2e6eee618e55f3"
-  integrity sha512-TwnURTCjc8a+ElJUjmDqU6+12jhli1Q61xOQmdZ7ECZVBZuQpN/1UnembiIHDM1wCcfLvh5wrWXUF5H6ufX64Q==
-  dependencies:
-    semver "^5.3.0"
-
 node-releases@^1.1.23:
   version "1.1.23"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.23.tgz#de7409f72de044a2fa59c097f436ba89c39997f0"
@@ -8055,7 +8034,12 @@ postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.1:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss@7.0.17:
+postcss-value-parser@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.0.tgz#99a983d365f7b2ad8d0f9b8c3094926eab4b936d"
+  integrity sha512-ESPktioptiSUchCKgggAkzdmkgzKfmp0EU8jXH+5kbIUB+unr0Y4CY9SRMvibuvYUBjNh1ACLbxqYNpdTQOteQ==
+
+postcss@7.0.17, postcss@^7.0.17:
   version "7.0.17"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f"
   integrity sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==
@@ -8073,15 +8057,6 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
     source-map "^0.6.1"
     supports-color "^5.5.0"
 
-postcss@^7.0.16:
-  version "7.0.16"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.16.tgz#48f64f1b4b558cb8b52c88987724359acb010da2"
-  integrity sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==
-  dependencies:
-    chalk "^2.4.2"
-    source-map "^0.6.1"
-    supports-color "^6.1.0"
-
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"

From 5da90e9075b304adf14c40643b1bdd0ec057f3cd Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott.github@gmail.com>
Date: Tue, 25 Jun 2019 13:07:00 -0700
Subject: [PATCH 1589/1703] ci: setup RBE on CI

---
 .bazelrc                           |  54 +++++++++++++++++++++++++++++
 .circleci/config.yml               |  22 ++++++++++++
 .circleci/gcp_token                | Bin 0 -> 2352 bytes
 WORKSPACE                          |  31 +++++++++++++++++
 packages/angular_devkit/core/BUILD |   2 ++
 packages/schematics/update/BUILD   |   2 ++
 tools/BUILD                        |  13 +++++++
 7 files changed, 124 insertions(+)
 create mode 100644 .circleci/gcp_token

diff --git a/.bazelrc b/.bazelrc
index 722747468c4f..776a8225c3e7 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -6,3 +6,57 @@ build --strategy=TypeScriptCompile=worker
 build --watchfs
 
 test --test_output=errors
+
+################################
+# Remote Execution Setup       #
+################################
+
+ # Use the Angular team internal GCP instance for remote execution.
+build:remote --remote_instance_name=projects/internal-200822/instances/default_instance
+build:remote --project_id=internal-200822
+
+ # Setup the build strategy for various types of actions. Mixing "local" and "remote"
+# can cause unexpected results and we want to run everything remotely if possible.
+build:remote --spawn_strategy=remote
+build:remote --strategy=Javac=remote
+build:remote --strategy=Closure=remote
+build:remote --strategy=Genrule=remote
+build:remote --define=EXECUTOR=remote
+
+ # Setup the remote build execution servers.
+build:remote --remote_cache=remotebuildexecution.googleapis.com
+build:remote --remote_executor=remotebuildexecution.googleapis.com
+build:remote --tls_enabled=true
+build:remote --auth_enabled=true
+build:remote --remote_timeout=3600
+build:remote --jobs=50
+
+ # Setup the toolchain and platform for the remote build execution. The platform
+# is automatically configured by the "rbe_autoconfig" rule in the project workpsace.
+build:remote --host_javabase=@rbe_ubuntu1604_angular//java:jdk
+build:remote --javabase=@rbe_ubuntu1604_angular//java:jdk
+build:remote --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
+build:remote --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
+build:remote --crosstool_top=@rbe_ubuntu1604_angular//cc:toolchain
+build:remote --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
+build:remote --extra_toolchains=@rbe_ubuntu1604_angular//config:cc-toolchain
+build:remote --extra_execution_platforms=//tools:rbe_ubuntu1604-angular
+build:remote --host_platform=//tools:rbe_ubuntu1604-angular
+build:remote --platforms=//tools:rbe_ubuntu1604-angular
+
+  # Setup Build Event Service
+build:remote --bes_backend=buildeventservice.googleapis.com
+build:remote --bes_timeout=30s
+build:remote --bes_results_url="https://source.cloud.google.com/results/invocations/"
+
+ # Set remote caching settings
+build:remote --remote_accept_cached=true
+
+####################################################
+# User bazel configuration
+# NOTE: This needs to be the *last* entry in the config.
+####################################################
+
+# Load any settings which are specific to the current user. Needs to be *last* statement
+# in this config, as the user configuration should be able to overwrite flags from this file.
+try-import .bazelrc.user
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 291a72a17bfd..a262535ecd4b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -71,6 +71,27 @@ anchor_6: &ignore_pull_requests
     branches:
       ignore:
         - /pull\/.*/
+anchor_7: &setup_bazel_remote_execution
+  run:
+    name: "Setup bazel RBE remote execution"
+    command: |
+      touch .bazelrc.user;
+      # We need ensure that the same default digest is used for encoding and decoding
+      # with openssl. Openssl versions might have different default digests which can
+      # cause decryption failures based on the openssl version. https://stackoverflow.com/a/39641378/4317734
+      openssl aes-256-cbc -d -in .circleci/gcp_token -md md5 -k "${CIRCLE_PROJECT_REPONAME}" -out /home/circleci/.gcp_credentials;
+      sudo bash -c "echo -e 'build --google_credentials=/home/circleci/.gcp_credentials' >> .bazelrc.user";
+      # Upload/don't upload local results to cache based on environment
+      if [[ -n "{$CIRCLE_PR_NUMBER}" ]]; then
+        sudo bash -c "echo -e 'build:remote --remote_upload_local_results=false\n' >> .bazelrc.user";
+        echo "Not uploading local build results to remote cache.";
+      else
+        sudo bash -c "echo -e 'build:remote --remote_upload_local_results=true\n' >> .bazelrc.user";
+        echo "Uploading local build results to remote cache.";
+      fi
+      # Enable remote builds
+      sudo bash -c "echo -e 'build --config=remote' >> .bazelrc.user";
+      echo "Reading from remote cache for bazel remote jobs.";
 
 # Job definitions
 version: 2.1
@@ -204,6 +225,7 @@ jobs:
     resource_class: xlarge
     steps:
       - attach_workspace: *attach_options
+      - *setup_bazel_remote_execution
       - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
       - run: yarn bazel:test
 
diff --git a/.circleci/gcp_token b/.circleci/gcp_token
new file mode 100644
index 0000000000000000000000000000000000000000..06773903e8d854c81189f19d5db30380de71c5f5
GIT binary patch
literal 2352
zcmV-03D5RZVQh3|WM5xLFak`XkkRX1|2<M-7u;hmvHlP;<(OaFBc^}Ea{;R{e-HM`
zPIuksKJMY1{z<#QlJe!f_!9<%cPd7$sTu^pbZmbKoDSL7KLoYFFP4-ihhjT~qFsQm
zmkMlmv!Se1m0Kp2kw5{la=Y_?<X)&sL_Z%4Yu|Vp<SmtyiwP<d*!X<FI2lX8oZyAU
zQjAV&l1vVV2E`nv-GRWg8}WM!{qmkqTNB$>9dfyw?5eewT>mKEM8Y^Z70anA#cpL~
z1w~VTBsjj^dQJy(yTVmnI^_OhHwzHa#{6&wC}E1CCt)D%w#>7qf=HD69$jUp*gdI~
zm>P!IeQihhLi#S!-XOADbRsWWnDggItO(JNx3yOf=YUBI1p^XlS-?6nDYL@H0Qz~z
z$Jn%LTX?dV)n!WIcRYgEROMgI?QC8m_nX0~(q^oW^#JFmb#zUw;Fzj$ABYnDK_W&1
zpOCk4wvN_-Vh{jk7>QZ5Z_prIRgu0JwEuug+bG8x%$L@LRJU^kR=~at@x45Ry8(dc
zP;1<1mSy(8DZ$j(K(0!>!YF>fMwwk@zv$bp6|!o@q@FY=ZR?y6_;Ui&7RtAzvd`Tr
z<dS521~@KzI!+pBVH_|x<~TUJpWVo$%6Xe8tf7nCR)#OHfJ$<Ai^#W^y!{&ZJowk{
zR=VHBRM|$K#;8atsx&EW*|Q()$pi~_orG+M`g;r0InixGi7nYvfod#NM-xzuy@gDk
z1l`G7IC4BK2wr#3=Ol8K!g-|a16Wq;jH7@E=0TGa8p+id&}n57fL6J2jJ!m2y!w>Z
z`GPTuDR~t16Ol`K1@S=_FOs2%`byotftll`B20LV1+~*BzOfYCe2?jR`6HC5$hn?2
zG$ZO?Pk$e$?efB{IJmDz?tI|m-powtB3_QUCc32PiM-9dC=bSXY%|L}1_|u>lMDE(
zla#^L7Z-%AW-MvSV9iZ-<-O#2GRoVX%Pwn)#fbjY8CY}Gr9$FV4s?hH+1N@dD4^2a
z@uRn_`N!?7t&S1X$ik=(tLQE^TO~`9atvqdr%+5yDwMytvgd$=(bd06Xz60b^PAJa
z28uRMJ%MW_0|UBk$gjlDB~p0OC@HL3tSl<I9PWvZ76NWnxK<J`of{$W{<VC;j)5Fz
zSkxBh5aa*fgpx?b@e76Y<ZLN_vF1LcclN2TFj#ju5$Ul>T~o2-=RcO<JvjAnHlU;&
zi-6qUWp1xw#Q2C`uc4z^<lH*8dsCyk3$lDx0aek)I7)gH^5we*yLr)`+y$l7hqt+g
zQ1oeivt4wGjk}%7&F9u<Hj=O{{i7c#FCv9IVn+V2SIjyH@qf&JEEqOA8}L0<2BC0R
zZM;$t)}+NPKPsFDu?#V?<<4oJKE{ngPc>2A#&F!RH%(f$jO9xGP<W$dX_+BsYmbgj
z^Y$ZwxKbGIr>8thg`u{<o=sk!=5G`-;Fq4qyR9|N6(pvIDTkDx;^EnM6(H`YHXuU4
z@R*s$l;r7?)7F`<P0ZyJGQFj59{+jJ<%O2x8`0*v8*V6gkTdg{?-9U*$AW<tZw<l6
zsf#N@#?Ci{Bl*xU3glLP6E?TD81CRA*mK%`uS<pv_F@@4R8kWPf$|jL^M`|jT~QDJ
zo1iTgt>nFi{q4lrIB}_ir;QOz6fx*%a3D`yZ@fWn#iZNO0hGa2bvSxnm+O%yO{Y+i
z_Ql*P@odkEu^JHuyzQ+A^26D1%fjPdnr@MS^$+nLi3FCQ=5U{w7dBi-{O2oAl$LEy
zy;WPX#4MqFSb&dQ!E@|vFm)HRCYDSnIy<^Luzy5qtA};U%^x2ivd<26(1NCie^o1U
z(ypIdIS(J@WT+VJ{-a8$<jio_W_dJEWrM>ouDh;k6=U@yvBYDo=;PP&omT+sWr2=Z
zWLa)ELHsDy4q@A_7Uy_rt+$=!Ot>$m^$b&a@471wYi39i`7JZ5!`9PMB50ACwX26u
z{$%0>?|sOGXgGEFq(%cX2{D0>{%1Bf3;t39xbyZjp1>}8=NfVtH)k-)?WsH!nNrr(
z74_XwRsuBTjM(}C*Mh~eKn+pno?oK{V+N&nGlm30xOW}gzh9CiXD47FE9AV&4t8S=
zx$Td>X1wWK70BV_ETQo<D{b9)&9mC`8_+~whK$AlJ>p{n@~KQOe!*mDNZ%Ff|AhhT
z5ddSN^CGhAB(pzW)+%EltwIDZ8BGO^+(_f)*`}qaLhw8_hZhimjw?4!5i8kQRLo%&
z)mrRARx&BN*>04^9K_n_RF~&|y$P*Dju=z#PRZ(x4aw#<dy-_B<!IM6C=EjA7=OFP
z-Jb)0q*%U{5`hiNYf<l$)+R(VI9rBWw_v~#7~ytP#|Ttis)uS$r@d`$uYnvV)bDIq
zE`%J2x-NKtyr@zZ1Qp9&qr6fJC#36m7#mM8?JO0lTSV^yPp|H9Z>`gme7a-Ldgh3S
zu@_jM@m$L*7$?JjPvfkHz@(gA;qk1vo3wF@afaZA0!*Z8$@%#Xr5azxQIs}}^0fEm
zMBd@shSZHW93?Lr+-#;n#+zh7bggosPF9#b@^Vze>efjmXz)<V<3B7a77^07OMBXW
z$7Pc#p<{HgA^!Si3P;UA1f73qBNh4)mB%!Yt3q_0jIC8;XHs>X(zA)}VsM+IBam{p
zcqPe!Lup`?$yrC0@5pXQ@*cTnx}oGlmCx<ncTn^qE(w7WXk9hbivi0(f8Y-gx(f@z
zP|O8bYEE*5dCG1xI@=T=nu?pkm9h2&#QE*Ay7g>O>DS6jJnK&s{;I%Cp`Zt=x7=K<
zYyz&i+qBY@OEa6H=}MO^kf1%y&5}-4?5h+m{&9QHpym=AAt%BmIrY+lf*RVr<sm$r
zz9Z6AzZM`F5vzZe{E<v8GG|J2qo}AVj)S#LniPWILO-pJ!1A72sPb!pw63(Nn@~PN
z^3kPmX@ZN3iNupj!A{pdFX#`(tGP7|pRK+4e`+Y8W#jJ+dImPWn5@M`M5dLpJAZ-M
z3g}9rb+}{S4iRF<Ovn&G1TAh=(u!zcj1mbQZBN&UfchWIi@#30q9pqC=Y9ce-xf}{
WWy~$H9q}#c>T-`I6jx!>IXBaaKBC$H

literal 0
HcmV?d00001

diff --git a/WORKSPACE b/WORKSPACE
index 3feedcb097ee..cdcdc0042c18 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -80,3 +80,34 @@ rules_karma_dependencies()
 load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories")
 
 web_test_repositories()
+
+##########################
+# Remote Execution Setup #
+##########################
+# Bring in bazel_toolchains for RBE setup configuration.
+http_archive(
+    name = "bazel_toolchains",
+    sha256 = "142bcbd8cb751ce1193a1d7fef4e328493cd0a69cc0555183ad237f81418ba40",
+    strip_prefix = "bazel-toolchains-628224f6cf48e81116d0ee0bf65424eaa630d5b3",
+    urls = ["https://github.com/xingao267/bazel-toolchains/archive/628224f6cf48e81116d0ee0bf65424eaa630d5b3.tar.gz"],
+)
+
+load("@bazel_toolchains//rules:environments.bzl", "clang_env")
+load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig")
+
+rbe_autoconfig(
+    name = "rbe_ubuntu1604_angular",
+    # The sha256 of marketplace.gcr.io/google/rbe-ubuntu16-04 container that is
+    # used by rbe_autoconfig() to pair toolchain configs in the @bazel_toolchains repo.
+    base_container_digest = "sha256:677c1317f14c6fd5eba2fd8ec645bfdc5119f64b3e5e944e13c89e0525cc8ad1",
+    # Note that if you change the `digest`, you might also need to update the
+    # `base_container_digest` to make sure marketplace.gcr.io/google/rbe-ubuntu16-04-webtest:<digest>
+    # and marketplace.gcr.io/google/rbe-ubuntu16-04:<base_container_digest> have
+    # the same Clang and JDK installed.
+    # Clang is needed because of the dependency on @com_google_protobuf.
+    # Java is needed for the Bazel's test executor Java tool.
+    digest = "sha256:74a8e9dca4781d5f277a7bd8e7ea7ed0f5906c79c9cd996205b6d32f090c62f3",
+    env = clang_env(),
+    registry = "marketplace.gcr.io",
+    repository = "google/rbe-ubuntu16-04-webtest",
+)
diff --git a/packages/angular_devkit/core/BUILD b/packages/angular_devkit/core/BUILD
index d6e45f65c371..8710c3943062 100644
--- a/packages/angular_devkit/core/BUILD
+++ b/packages/angular_devkit/core/BUILD
@@ -70,6 +70,8 @@ ts_library(
 jasmine_node_test(
     name = "core_test",
     srcs = [":core_test_lib"],
+    # TODO: Audit tests to determine if tests can be run in RBE environments
+    local = True,
     deps = [
         "@npm//jasmine",
         "@npm//source-map",
diff --git a/packages/schematics/update/BUILD b/packages/schematics/update/BUILD
index dc2b8c99d7e0..25f87339837e 100644
--- a/packages/schematics/update/BUILD
+++ b/packages/schematics/update/BUILD
@@ -79,6 +79,8 @@ ts_library(
 jasmine_node_test(
     name = "update_test",
     srcs = [":update_test_lib"],
+    # TODO: Audit tests to determine if tests can be run in RBE environments
+    local = True,
     deps = [
         "@npm//jasmine",
         "@npm//npm-registry-client",
diff --git a/tools/BUILD b/tools/BUILD
index 707a63093457..642792dc2427 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -21,4 +21,17 @@ nodejs_binary(
         "--node_options=--preserve-symlinks",
     ],
 )
+
+platform(
+    name = "rbe_ubuntu1604-angular",
+    parents = ["@rbe_ubuntu1604_angular//config:platform"],
+    remote_execution_properties = """
+        {PARENT_REMOTE_EXECUTION_PROPERTIES}
+        properties: {
+            name: "dockerAddCapabilities"
+            value: "SYS_ADMIN"
+        }
+        """,
+)
+
 # @external_end

From 7fe0fda8085957ada1b8573e3a2a4dce04ab89a3 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 2 Jul 2019 19:05:20 -0400
Subject: [PATCH 1590/1703] test: always allow local E2E publishing

Without this change and if master is not on a prerelease version, E2E will fail due to the local package repository publish failing.
---
 tests/legacy-cli/e2e/setup/010-local-publish.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tests/legacy-cli/e2e/setup/010-local-publish.ts b/tests/legacy-cli/e2e/setup/010-local-publish.ts
index cd509d5113cb..4e9456d970c7 100644
--- a/tests/legacy-cli/e2e/setup/010-local-publish.ts
+++ b/tests/legacy-cli/e2e/setup/010-local-publish.ts
@@ -9,7 +9,16 @@ export default async function() {
   fs.writeFileSync('.npmrc', 'registry = http://localhost:4873', 'utf8');
 
   try {
-    const publishArgs = ['run', 'admin', '--', 'publish', '--versionCheck', 'false'];
+    const publishArgs = [
+      'run',
+      'admin',
+      '--',
+      'publish',
+      '--versionCheck',
+      'false',
+      '--branchCheck',
+      'false',
+    ];
     if (pre && pre.length > 0) {
       publishArgs.push('--tag');
       publishArgs.push('next');

From 8ef7ba5a8dd366ddcce18df400e6e267ce258d9f Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 2 Jul 2019 19:53:13 -0400
Subject: [PATCH 1591/1703] build: generate valid version when on release
 commit

---
 lib/packages.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/packages.ts b/lib/packages.ts
index 66b3536f484d..4d69ecb81098 100644
--- a/lib/packages.ts
+++ b/lib/packages.ts
@@ -164,8 +164,10 @@ function _getVersionFromGit(experimental: boolean): string {
   const hasLocalChanges = _exec(`git status --porcelain`) != '';
   const scmVersionTagRaw = _exec(`git describe --match v[0-9].[0-9].[0-9]* --abbrev=7 --tags`)
     .slice(1);
-  stableVersion = scmVersionTagRaw.replace(/-([0-9]+)-g/, '+$1.')
-    + (hasLocalChanges ? '.with-local-changes' : '');
+  stableVersion = scmVersionTagRaw.replace(/-([0-9]+)-g/, '+$1.');
+  if (hasLocalChanges) {
+    stableVersion += stableVersion.includes('+') ? '.with-local-changes' : '+with-local-changes';
+  }
 
   experimentalVersion = `0.${stableVersion.replace(/^(\d+)\.(\d+)/, (_, major, minor) => {
     return '' + (parseInt(major, 10) * 100 + parseInt(minor, 10));

From eba2ea7b14fd4e3110e53cab009481607618bc4d Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 2 Jul 2019 20:00:25 -0400
Subject: [PATCH 1592/1703] build: support publish registry option

---
 scripts/publish.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/scripts/publish.ts b/scripts/publish.ts
index a3c0727d7d3f..a940ecc79f99 100644
--- a/scripts/publish.ts
+++ b/scripts/publish.ts
@@ -17,6 +17,7 @@ export interface PublishArgs {
   tag?: string;
   branchCheck?: boolean;
   versionCheck?: boolean;
+  registry?: string;
 }
 
 
@@ -111,7 +112,15 @@ export default async function (args: PublishArgs, logger: logging.Logger) {
       .then(() => {
         logger.info(name);
 
-        return _exec('npm', ['publish'].concat(args.tag ? ['--tag', args.tag] : []), {
+        const publishArgs = ['publish'];
+        if (args.tag) {
+          publishArgs.push('--tag', args.tag);
+        }
+        if (args.registry) {
+          publishArgs.push('--registry', args.registry);
+        }
+
+        return _exec('npm', publishArgs, {
           cwd: pkg.dist,
         }, logger);
       })

From 59e8f74cc3edb45da9809becb137eed71843b531 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 2 Jul 2019 20:07:01 -0400
Subject: [PATCH 1593/1703] test: use registry option for E2E local package
 repository publish

---
 .../legacy-cli/e2e/setup/010-local-publish.ts | 36 ++++++++-----------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/tests/legacy-cli/e2e/setup/010-local-publish.ts b/tests/legacy-cli/e2e/setup/010-local-publish.ts
index 4e9456d970c7..ad25029fdedd 100644
--- a/tests/legacy-cli/e2e/setup/010-local-publish.ts
+++ b/tests/legacy-cli/e2e/setup/010-local-publish.ts
@@ -1,30 +1,22 @@
-import * as fs from 'fs';
 import { prerelease } from 'semver';
 import { packages } from '../../../../lib/packages';
 import { npm } from '../utils/process';
 
 export default async function() {
-  const pre = prerelease(packages['@angular/cli'].version);
-
-  fs.writeFileSync('.npmrc', 'registry = http://localhost:4873', 'utf8');
+  const publishArgs = [
+    'run',
+    'admin',
+    '--',
+    'publish',
+    '--versionCheck=false',
+    '--branchCheck=false',
+    '--registry=http://localhost:4873',
+  ];
 
-  try {
-    const publishArgs = [
-      'run',
-      'admin',
-      '--',
-      'publish',
-      '--versionCheck',
-      'false',
-      '--branchCheck',
-      'false',
-    ];
-    if (pre && pre.length > 0) {
-      publishArgs.push('--tag');
-      publishArgs.push('next');
-    }
-    await npm(...publishArgs);
-  } finally {
-    fs.unlinkSync('.npmrc');
+  const pre = prerelease(packages['@angular/cli'].version);
+  if (pre && pre.length > 0) {
+    publishArgs.push('--tag', 'next');
   }
+
+  await npm(...publishArgs);
 }

From 15cf32f289cc093006d75fa53872d2efcb2f7c25 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 8 Jul 2019 07:55:13 +0000
Subject: [PATCH 1594/1703] build: update verdaccio to version 4.1.0

---
 package.json |   2 +-
 yarn.lock    | 186 +++++++++++++++++++++++++++++++--------------------
 2 files changed, 113 insertions(+), 75 deletions(-)

diff --git a/package.json b/package.json
index a2c1dfa85e88..3175f8705eb9 100644
--- a/package.json
+++ b/package.json
@@ -139,7 +139,7 @@
     "ts-node": "^5.0.0",
     "tslint-no-circular-imports": "^0.7.0",
     "tslint-sonarts": "1.9.0",
-    "verdaccio": "4.0.3"
+    "verdaccio": "4.1.0"
   },
   "husky": {
     "hooks": {
diff --git a/yarn.lock b/yarn.lock
index 9de7b799ddb5..161fc8c30984 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -696,25 +696,32 @@
   dependencies:
     lockfile "1.0.4"
 
-"@verdaccio/local-storage@2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@verdaccio/local-storage/-/local-storage-2.1.0.tgz#d941592237adb8e291942d6c87a90cefe32838e3"
-  integrity sha512-BmXkSdXT219+BBTe5vHemYpw8Vf1be2ZUdxYlvFpRltm+egJTtBSFO6lOWWcjaORkM48TGc7wR2K/jGJfX8KAg==
+"@verdaccio/file-locking@1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@verdaccio/file-locking/-/file-locking-1.0.3.tgz#8244380a4ee41e585ef38690f9dbcaa1aba6bdc4"
+  integrity sha512-+npFxBPq8c7oXHtroLGjcrninqtoQBPVeCfLG0BzrEe3ZM5bCcaz3nwQsXLBzhL/QP5z3zLiOgpsxddDN3UIyw==
   dependencies:
-    "@verdaccio/file-locking" "1.0.0"
-    "@verdaccio/streams" "2.0.0-beta.0"
-    async "3.0.1-0"
-    http-errors "1.7.2"
+    lockfile "1.0.4"
+
+"@verdaccio/local-storage@2.2.1":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@verdaccio/local-storage/-/local-storage-2.2.1.tgz#ce8b9ab6c05d6ce2bccef5c7781abe8667eab778"
+  integrity sha512-lSM5Rc2dn8rtzo1P2kQz7TNlVgm12OQzOcocK9uwVgKS95sWqjxttLB9EMfsGsy0+qwfzw96AMBkOXn3f55m/Q==
+  dependencies:
+    "@verdaccio/file-locking" "1.0.3"
+    "@verdaccio/streams" "2.0.0"
+    async "3.1.0"
+    http-errors "1.7.3"
     lodash "4.17.11"
     mkdirp "0.5.1"
 
-"@verdaccio/readme@1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@verdaccio/readme/-/readme-1.0.3.tgz#2cf9c8fd7ce356db7581c0d59e5444874d9b0bec"
-  integrity sha512-05DQQUl1n1afDgvv/C+ZR8dn/pW75scwtpW+sHs5MsvRDdwc7iilXBtrVje+1ioa+QU8LrDJvKnttvuwAoD+yw==
+"@verdaccio/readme@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@verdaccio/readme/-/readme-1.0.4.tgz#84fa63f9e278bf4626d1d96460c1ea0359d76974"
+  integrity sha512-coBtSAriyrGgnzeY4Mu4ps/0P8/B+7fSbG7rcv6DoTb2vl2uLV/zAtet3n55iLKIAg5I4h3LuJ6m+uX2bMkZRA==
   dependencies:
-    dompurify "1.0.10"
-    jsdom "15.1.0"
+    dompurify "1.0.11"
+    jsdom "15.1.1"
     marked "0.6.2"
 
 "@verdaccio/streams@2.0.0":
@@ -722,11 +729,6 @@
   resolved "https://registry.yarnpkg.com/@verdaccio/streams/-/streams-2.0.0.tgz#27f51d0cb19d5e49248860942092646e9a357967"
   integrity sha512-QW1LsYir3wNnqhSznbJlt0iqkcgve0LpXI8RkoTTBPrq3M6ei3Ys4iw+JQKFve3gmYw9O+w8lBiOLc1qvvsoVQ==
 
-"@verdaccio/streams@2.0.0-beta.0":
-  version "2.0.0-beta.0"
-  resolved "https://registry.yarnpkg.com/@verdaccio/streams/-/streams-2.0.0-beta.0.tgz#af8c7e673a3c368deacc8024c6f5671aa2ec32ac"
-  integrity sha512-EdVF6RP0abRNT0RfgLCsqLNv7FOpm+BpzMZoaQuQGHSBQRj7OTM8ft5mpbJ40rYVXKv6D8xyU0vUnoRl09ah6g==
-
 "@verdaccio/ui-theme@0.1.11":
   version "0.1.11"
   resolved "https://registry.yarnpkg.com/@verdaccio/ui-theme/-/ui-theme-0.1.11.tgz#48e1bb9139c61016e143e57102bee8c8fbf0cb92"
@@ -945,7 +947,7 @@ acorn-dynamic-import@^4.0.0:
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
   integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
 
-acorn-globals@^4.3.0:
+acorn-globals@^4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.2.tgz#4e2c2313a597fd589720395f6354b41cd5ec8006"
   integrity sha512-BbzvZhVtZP+Bs1J1HcwrQe8ycfO0wStkSGxuul3He3GkHOIZ6eTqOkPuw9IP1X3+IkOo4wiJmwkobzXYz4wewQ==
@@ -963,7 +965,7 @@ acorn@^5.0.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
   integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
-acorn@^6.0.1, acorn@^6.0.4, acorn@^6.1.1:
+acorn@^6.0.1, acorn@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
   integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
@@ -1307,7 +1309,7 @@ async-each@^1.0.3:
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
   integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
 
-async-limiter@~1.0.0:
+async-limiter@^1.0.0, async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
   integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
@@ -1317,15 +1319,10 @@ async@1.x, async@^1.5.2:
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
   integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
-async@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.0.1.tgz#dfeb34657d1e63c94c0eee424297bf8a2c9a8182"
-  integrity sha512-ZswD8vwPtmBZzbn9xyi8XBQWXH3AvOQ43Za1KWYq7JeycrZuUYzx01KvHcVbXltjqH4y0MWrQ33008uLTqXuDw==
-
-async@3.0.1-0:
-  version "3.0.1-0"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.0.1-0.tgz#ca06713f91c3d9eea3e966ace4093f41ef89f200"
-  integrity sha512-b+lONkCWH/GCAIrU0j4m5zed5t+5dfjM2TbUSmKCagx6TZp2jQrNkGL7j1SUb0fF1yH6sKBiXC7Zid8Zj94O6A==
+async@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.1.0.tgz#42b3b12ae1b74927b5217d8c0016baaf62463772"
+  integrity sha512-4vx/aaY6j/j3Lw3fbCHNWP0pPaTCew3F6F3hYyl/tHs/ndmV1q7NW9T5yuJ2XAGwdQrP+6Wu20x06U4APo/iQQ==
 
 async@^2.1.2, async@^2.5.0, async@^2.6.0, async@^2.6.1:
   version "2.6.1"
@@ -2933,12 +2930,17 @@ cssesc@^0.1.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
   integrity sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=
 
-cssom@^0.3.4, cssom@~0.3.6:
+cssom@^0.3.6:
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
+  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
+
+cssom@~0.3.6:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.6.tgz#f85206cee04efa841f3c5982a74ba96ab20d65ad"
   integrity sha512-DtUeseGk9/GBW0hl0vVPpU22iHL6YB5BUX7ml1hB+GMpo0NX5G4voX3kdWiMSEguFtcW3Vh3djqNF4aIe6ne0A==
 
-cssstyle@^1.1.1:
+cssstyle@^1.2.2:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.3.0.tgz#c36c466f7037fd30f03baa271b65f0f17b50585c"
   integrity sha512-wXsoRfsRfsLVNaVzoKdqvEmK/5PFaEXNspVT22Ots6K/cnJdpoDKuQFw+qlMiXnmaif1OgeC466X1zISgAOcGg==
@@ -3350,10 +3352,10 @@ domino@^2.1.2:
   resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.3.tgz#0ca1ad02cbd316ebe2e99e0ac9fb0010407d4601"
   integrity sha512-EwjTbUv1Q/RLQOdn9k7ClHutrQcWGsfXaRQNOnM/KgK4xDBoLFEcIRFuBSxAx13Vfa63X029gXYrNFrSy+DOSg==
 
-dompurify@1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-1.0.10.tgz#18d7353631c86ee25049e38fbca8c6b2c5a2af87"
-  integrity sha512-huhl3DSWX5LaA7jDtnj3XQdJgWW1wYouNW7N0drGzQa4vEUSVWyeFN+Atx6HP4r5cang6oQytMom6I4yhGJj5g==
+dompurify@1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-1.0.11.tgz#fe0f4a40d147f7cebbe31a50a1357539cfc1eb4d"
+  integrity sha512-XywCTXZtc/qCX3iprD1pIklRVk/uhl8BKpkTxr+ZyMVUzSUg7wkQXRBp/euJ5J5moa1QvfpvaPQVP71z1O59dQ==
 
 dot-prop@^3.0.0:
   version "3.0.0"
@@ -3536,6 +3538,11 @@ env-variable@0.0.x:
   resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.4.tgz#0d6280cf507d84242befe35a512b5ae4be77c54e"
   integrity sha512-+jpGxSWG4vr6gVxUHOc4p+ilPnql7NzZxOZBxNldsKGjCF+97df3CbuX7XMaDa5oAVkKQj4rKp38rYdC4VcpDg==
 
+envinfo@7.3.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.3.1.tgz#892e42f7bf858b3446d9414ad240dbaf8da52f09"
+  integrity sha512-GvXiDTqLYrORVSCuJCsWHPXF5BFvoWMQA9xX4YVjPT1jyS3aZEHUBwjzxU/6LTPF9ReHgVEbX7IEN5UvSXHw/A==
+
 err-code@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
@@ -3615,7 +3622,7 @@ escodegen@1.8.x:
   optionalDependencies:
     source-map "~0.2.0"
 
-escodegen@^1.11.0:
+escodegen@^1.11.1:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510"
   integrity sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==
@@ -4854,6 +4861,17 @@ http-errors@1.7.2, http-errors@~1.7.2:
     statuses ">= 1.5.0 < 2"
     toidentifier "1.0.0"
 
+http-errors@1.7.3:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
+  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.4"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
 http-parser-js@>=0.4.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8"
@@ -5067,6 +5085,11 @@ inherits@2.0.1:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
   integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
+inherits@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
 ini@1.3.5, ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
@@ -5764,36 +5787,36 @@ jsbn@~0.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
-jsdom@15.1.0:
-  version "15.1.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-15.1.0.tgz#80c5f0dd69466742ab1194f15d301bdd01417596"
-  integrity sha512-QEmc2XIkNfCK3KRfa9ljMJjC4kAGdVgRrs/pCBsQG/QoKz0B42+C58f6TdAmhq/rw494eFCoLHxX6+hWuxb96Q==
+jsdom@15.1.1:
+  version "15.1.1"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-15.1.1.tgz#21ed01f81d95ef4327f3e564662aef5e65881252"
+  integrity sha512-cQZRBB33arrDAeCrAEWn1U3SvrvC8XysBua9Oqg1yWrsY/gYcusloJC3RZJXuY5eehSCmws8f2YeliCqGSkrtQ==
   dependencies:
     abab "^2.0.0"
-    acorn "^6.0.4"
-    acorn-globals "^4.3.0"
+    acorn "^6.1.1"
+    acorn-globals "^4.3.2"
     array-equal "^1.0.0"
-    cssom "^0.3.4"
-    cssstyle "^1.1.1"
+    cssom "^0.3.6"
+    cssstyle "^1.2.2"
     data-urls "^1.1.0"
     domexception "^1.0.1"
-    escodegen "^1.11.0"
+    escodegen "^1.11.1"
     html-encoding-sniffer "^1.0.2"
-    nwsapi "^2.1.3"
+    nwsapi "^2.1.4"
     parse5 "5.1.0"
     pn "^1.1.0"
     request "^2.88.0"
-    request-promise-native "^1.0.5"
+    request-promise-native "^1.0.7"
     saxes "^3.1.9"
     symbol-tree "^3.2.2"
-    tough-cookie "^2.5.0"
+    tough-cookie "^3.0.1"
     w3c-hr-time "^1.0.1"
     w3c-xmlserializer "^1.1.2"
     webidl-conversions "^4.0.2"
     whatwg-encoding "^1.0.5"
     whatwg-mimetype "^2.3.0"
     whatwg-url "^7.0.0"
-    ws "^6.1.2"
+    ws "^7.0.0"
     xml-name-validator "^3.0.0"
 
 jsesc@^1.3.0:
@@ -6575,6 +6598,11 @@ marked@0.6.2:
   resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.2.tgz#c574be8b545a8b48641456ca1dbe0e37b6dccc1a"
   integrity sha512-LqxwVH3P/rqKX4EKGz7+c2G9r98WeM/SW34ybhgNGhUQNKtf1GmmSkJ6cDGJ/t6tiyae49qRkpyTw2B9HOrgUA==
 
+marked@0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.7.0.tgz#b64201f051d271b1edc10a04d1ae9b74bb8e5c0e"
+  integrity sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==
+
 material-design-icons@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/material-design-icons/-/material-design-icons-3.0.1.tgz#9a71c48747218ebca51e51a66da682038cdcb7bf"
@@ -7307,7 +7335,7 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-nwsapi@^2.1.3:
+nwsapi@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.4.tgz#e006a878db23636f8e8a67d33ca0e4edf61a842f"
   integrity sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw==
@@ -8712,7 +8740,7 @@ request-promise-core@1.1.2:
   dependencies:
     lodash "^4.17.11"
 
-request-promise-native@^1.0.5:
+request-promise-native@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.7.tgz#a49868a624bdea5069f1251d0a836e0d89aa2c59"
   integrity sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==
@@ -9160,16 +9188,16 @@ semver-intersect@1.4.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
   integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
 
-semver@6.1.1, semver@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
-  integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==
-
 semver@6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db"
   integrity sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==
 
+semver@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
+  integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==
+
 send@0.16.2:
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
@@ -10295,7 +10323,7 @@ toidentifier@1.0.0:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
-tough-cookie@^2.3.3, tough-cookie@^2.5.0:
+tough-cookie@^2.3.3:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
   integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
@@ -10303,6 +10331,15 @@ tough-cookie@^2.3.3, tough-cookie@^2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
+tough-cookie@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2"
+  integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==
+  dependencies:
+    ip-regex "^2.1.0"
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
 tough-cookie@~2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
@@ -10750,17 +10787,17 @@ verdaccio-htpasswd@2.0.0:
     http-errors "1.7.2"
     unix-crypt-td-js "1.0.0"
 
-verdaccio@4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/verdaccio/-/verdaccio-4.0.3.tgz#15928893fedc08c7bc0fc52c997abd6fc7f0094e"
-  integrity sha512-mLdREiwFmsT9yQpJjpqcUNGqJMrgh+3b3rgg8fW4+ClrVzzw40lqwKHVTlNGLuXIbE7B5wNEKr7vObtL/9JWvw==
+verdaccio@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/verdaccio/-/verdaccio-4.1.0.tgz#b80084baacf9cb59aa4469ae0a412fe797b146b7"
+  integrity sha512-l4MH9rhtMXq/WZsG3azcINJbd3jku4fvRJR/a6dGFR8qllO/aE1jE1wnL+CWUpa+YtiGOaeb3X5D4Y4mzx/9JQ==
   dependencies:
-    "@verdaccio/local-storage" "2.1.0"
-    "@verdaccio/readme" "1.0.3"
+    "@verdaccio/local-storage" "2.2.1"
+    "@verdaccio/readme" "1.0.4"
     "@verdaccio/streams" "2.0.0"
     "@verdaccio/ui-theme" "0.1.11"
     JSONStream "1.3.5"
-    async "3.0.1"
+    async "3.1.0"
     body-parser "1.19.0"
     bunyan "1.8.12"
     commander "2.20.0"
@@ -10768,22 +10805,23 @@ verdaccio@4.0.3:
     cookies "0.7.3"
     cors "2.8.5"
     dayjs "1.8.14"
+    envinfo "7.3.1"
     express "4.16.4"
     handlebars "4.1.2"
-    http-errors "1.7.2"
+    http-errors "1.7.3"
     js-yaml "3.13.1"
     jsonwebtoken "8.5.1"
     kleur "3.0.3"
     lodash "4.17.11"
     lunr-mutable-indexes "2.3.2"
-    marked "0.6.2"
+    marked "0.7.0"
     mime "2.4.4"
     minimatch "3.0.4"
     mkdirp "0.5.1"
     mv "2.1.1"
     pkginfo "0.4.1"
     request "2.87.0"
-    semver "6.1.1"
+    semver "6.2.0"
     verdaccio-audit "1.2.0"
     verdaccio-htpasswd "2.0.0"
 
@@ -11187,12 +11225,12 @@ ws@^6.1.0:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^6.1.2:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
-  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
+ws@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.0.1.tgz#1a04e86cc3a57c03783f4910fdb090cf31b8e165"
+  integrity sha512-ILHfMbuqLJvnSgYXLgy4kMntroJpe8hT41dOVWM8bxRuw6TK4mgMp9VJUNsZTEc5Bh+Mbs0DJT4M0N+wBG9l9A==
   dependencies:
-    async-limiter "~1.0.0"
+    async-limiter "^1.0.0"
 
 ws@~3.3.1:
   version "3.3.3"

From c119a402bd3341a12616402822d15b68b792fde9 Mon Sep 17 00:00:00 2001
From: istiti <elvis_203@msn.com>
Date: Wed, 3 Jul 2019 09:54:16 +0200
Subject: [PATCH 1595/1703] fix(@schematics/angular): update sass documentation
 links

Closes #14975
---
 packages/schematics/angular/ng-new/schema.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
index 3dd03342a57a..59200ea3f83b 100644
--- a/packages/schematics/angular/ng-new/schema.json
+++ b/packages/schematics/angular/ng-new/schema.json
@@ -130,10 +130,10 @@
         "type": "list",
         "items": [
           { "value": "css",  "label": "CSS" },
-          { "value": "scss", "label": "SCSS   [ http://sass-lang.com/documentation/file.SASS_REFERENCE.html#syntax ]" },
-          { "value": "sass", "label": "Sass   [ http://sass-lang.com/documentation/file.INDENTED_SYNTAX.html       ]" },
-          { "value": "less", "label": "Less   [ http://lesscss.org                                                 ]" },
-          { "value": "styl", "label": "Stylus [ http://stylus-lang.com                                             ] " }
+          { "value": "scss", "label": "SCSS   [ https://sass-lang.com/documentation/syntax#scss                ]" },
+          { "value": "sass", "label": "Sass   [ https://sass-lang.com/documentation/syntax#the-indented-syntax ]" },
+          { "value": "less", "label": "Less   [ http://lesscss.org                                             ]" },
+          { "value": "styl", "label": "Stylus [ http://stylus-lang.com                                         ]" }
         ]
       },
       "x-user-analytics": 5

From f6953f0123435ad9417127c04bfa5f7389d0b465 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 3 Jul 2019 11:21:58 -0400
Subject: [PATCH 1596/1703] fix(@angular-devkit/build-angular): only add module
 script types to actual module scripts

`ng serve` was errantly adding a module type to custom script bundles.  These scripts may contain ES5 and non-strict compatible code and can therefore not be marked as module scripts.  `ng build` already correctly operates in this fashion.

Fixes #14952
---
 .../build_angular/src/dev-server/index.ts     |  2 +-
 .../test/dev-server/index_spec_large.ts       | 45 +++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index f9f39164e260..a945b9b77053 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -209,7 +209,7 @@ export function serveWebpackBrowser(
 
         const entrypoints = generateEntryPoints({ scripts, styles });
         const moduleEntrypoints = buildBrowserFeatures.isDifferentialLoadingNeeded()
-          ? entrypoints
+          ? generateEntryPoints({ scripts: [], styles })
           : [];
 
         webpackConfig.plugins.push(
diff --git a/packages/angular_devkit/build_angular/test/dev-server/index_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/index_spec_large.ts
index bf261a5b5987..9ef1269cc1dd 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/index_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/index_spec_large.ts
@@ -5,6 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import { workspaces } from '@angular-devkit/core';
 import fetch from 'node-fetch'; // tslint:disable-line:no-implicit-dependencies
 import { DevServerBuilderOutput } from '../../src/dev-server/index';
 import { createArchitect, host } from '../utils';
@@ -38,6 +39,50 @@ describe('Dev Server Builder index', () => {
     await run.stop();
   });
 
+  it(`does not add 'type="module"' to custom scripts when differential loading is needed`, async () => {
+    host.writeMultipleFiles({
+      browserslist: `
+        last 1 chrome version
+        IE 10
+      `,
+      'test.js': 'console.log("test");',
+    });
+
+    const { workspace } = await workspaces.readWorkspace(host.root(), workspaces.createWorkspaceHost(host));
+    const app = workspace.projects.get('app');
+    if (!app) {
+      fail('Test application "app" not found.');
+
+      return;
+    }
+    const target = app.targets.get('build');
+    if (!target) {
+      fail('Test application "app" target "build" not found.');
+
+      return;
+    }
+    if (!target.options) {
+      target.options = {};
+    }
+    target.options.scripts = ['test.js'];
+    await workspaces.writeWorkspace(workspace, workspaces.createWorkspaceHost(host));
+
+    const architect = (await createArchitect(host.root())).architect;
+    const run = await architect.scheduleTarget(targetSpec);
+    const output = (await run.result) as DevServerBuilderOutput;
+    expect(output.success).toBe(true);
+    const response = await fetch('http://localhost:4200/index.html');
+    expect(await response.text()).toContain(
+      '<script src="runtime.js" type="module"></script>' +
+        '<script src="polyfills.js" type="module"></script>' +
+        '<script src="styles.js" type="module"></script>' +
+        '<script src="scripts.js"></script>' +
+        '<script src="vendor.js" type="module"></script>' +
+        '<script src="main.js" type="module"></script>',
+    );
+    await run.stop();
+  });
+
   it(`doesn't 'type="module"' when differential loading is not needed`, async () => {
     host.writeMultipleFiles({
       browserslist: `

From 8752f21abd7f4682b8844f5358976c1afb6057e1 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Wed, 3 Jul 2019 19:37:24 -0400
Subject: [PATCH 1597/1703] fix(@angular-devkit/build-optimizer): wrap classes
 with a let variable

Classes can technically be re-assigned.  By using a let variable this behavior will be retained and prevent potential runtime errors.

Fixes #14930
---
 .../src/transforms/wrap-enums.ts              |  2 +-
 .../src/transforms/wrap-enums_spec.ts         | 32 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
index ef2b94d020ea..ac5c0ed97a0c 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
@@ -659,7 +659,7 @@ function createWrappedClass(
       ts.createVariableDeclarationList([
         ts.createVariableDeclaration(name, undefined, pureIife),
       ],
-        ts.NodeFlags.Const,
+        ts.NodeFlags.Let,
       ),
     ));
 
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
index 8f6547274bd3..a2b344b6f79b 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
@@ -39,14 +39,14 @@ describe('wrap enums and classes transformer', () => {
       `;
 
       const output = tags.stripIndent`
-        const CustomComponentEffects = /*@__PURE__*/ (() => {
+        let CustomComponentEffects = /*@__PURE__*/ (() => {
           ${defaultClass.replace('export default ', '')}
 
           return CustomComponentEffects;
         })();
         export default CustomComponentEffects;
 
-        const CustomComponent = /*@__PURE__*/ (() => {
+        let CustomComponent = /*@__PURE__*/ (() => {
           ${namedClass}
 
           return CustomComponent;
@@ -78,7 +78,7 @@ describe('wrap enums and classes transformer', () => {
       `;
 
       const output = tags.stripIndent`
-        const CustomComponentEffects = /*@__PURE__*/ (() => {
+        let CustomComponentEffects = /*@__PURE__*/ (() => {
           ${input}
 
           return CustomComponentEffects;
@@ -104,7 +104,7 @@ describe('wrap enums and classes transformer', () => {
       `;
 
       const output = tags.stripIndent`
-        const ApplicationModule = /*@__PURE__*/ (() => {
+        let ApplicationModule = /*@__PURE__*/ (() => {
           ${input}
 
           return ApplicationModule;
@@ -131,7 +131,7 @@ describe('wrap enums and classes transformer', () => {
       `;
 
       const output = tags.stripIndent`
-        const CommonModule = /*@__PURE__*/ (() => {
+        let CommonModule = /*@__PURE__*/ (() => {
           ${input}
 
           return CommonModule;
@@ -154,7 +154,7 @@ describe('wrap enums and classes transformer', () => {
       `;
 
       const output = tags.stripIndent`
-          export const Foo = /*@__PURE__*/ (() => {
+          export let Foo = /*@__PURE__*/ (() => {
             ${input.replace('export ', '')}
 
             return Foo;
@@ -170,7 +170,7 @@ describe('wrap enums and classes transformer', () => {
         TemplateRef.__NG_ELEMENT_ID__ = () => SWITCH_TEMPLATE_REF_FACTORY(TemplateRef, ElementRef);
       `;
       const output = tags.stripIndent`
-      export const TemplateRef = /*@__PURE__*/ (() => {
+      export let TemplateRef = /*@__PURE__*/ (() => {
         class TemplateRef { }
         TemplateRef.__NG_ELEMENT_ID__ = () => SWITCH_TEMPLATE_REF_FACTORY(TemplateRef, ElementRef);
         return TemplateRef;
@@ -187,7 +187,7 @@ describe('wrap enums and classes transformer', () => {
       TemplateRef.somethingElse = true;
     `;
       const output = tags.stripIndent`
-      export const TemplateRef = /*@__PURE__*/ (() => {
+      export let TemplateRef = /*@__PURE__*/ (() => {
         class TemplateRef {
         }
         TemplateRef.__NG_ELEMENT_ID__ = () => SWITCH_TEMPLATE_REF_FACTORY(TemplateRef, ElementRef);
@@ -231,14 +231,14 @@ describe('wrap enums and classes transformer', () => {
       `;
 
       const output = tags.stripIndent`
-        const Foo = /*@__PURE__*/ (() => {
+        let Foo = /*@__PURE__*/ (() => {
           ${defaultClass.replace('export default Foo;', '')}
 
           return Foo;
         })();
         export default Foo;
 
-        const AggregateColumnDirective = /*@__PURE__*/ (() => {
+        let AggregateColumnDirective = /*@__PURE__*/ (() => {
           ${namedClass}
 
           return AggregateColumnDirective;
@@ -261,7 +261,7 @@ describe('wrap enums and classes transformer', () => {
       `;
 
       const output = tags.stripIndent`
-          const AggregateColumnDirective = /*@__PURE__*/ (() => {
+          let AggregateColumnDirective = /*@__PURE__*/ (() => {
             ${input}
 
             return AggregateColumnDirective;
@@ -293,7 +293,7 @@ describe('wrap enums and classes transformer', () => {
 
       const output = tags.stripIndent`
         var FooDirective_1;
-        const FooDirective = /*@__PURE__*/ (() => {
+        let FooDirective = /*@__PURE__*/ (() => {
             ${classContent}
 
             return FooDirective;
@@ -316,7 +316,7 @@ describe('wrap enums and classes transformer', () => {
       `;
 
       const output = tags.stripIndent`
-          const ChipList = /*@__PURE__*/ (() => {
+          let ChipList = /*@__PURE__*/ (() => {
             ${input}
             return ChipList;
           })();`;
@@ -349,7 +349,7 @@ describe('wrap enums and classes transformer', () => {
           ChipList = __decorate$4([NotifyPropertyChanges], ChipList);`;
 
       const output = tags.stripIndent`
-          const ChipList = /*@__PURE__*/ (() => {
+          let ChipList = /*@__PURE__*/ (() => {
             ${input}
             return ChipList;
           })();`;
@@ -394,7 +394,7 @@ describe('wrap enums and classes transformer', () => {
       const output = tags.stripIndent`
           const minutesMilliSeconds = 60000;
 
-          const AggregateColumnDirective = /*@__PURE__*/ (() => {
+          let AggregateColumnDirective = /*@__PURE__*/ (() => {
             ${firstClass}
 
             return AggregateColumnDirective;
@@ -403,7 +403,7 @@ describe('wrap enums and classes transformer', () => {
           const CSS = 'e-css';
           const PRIMARY = 'e-primary';
 
-          const ChipList = /*@__PURE__*/ (() => {
+          let ChipList = /*@__PURE__*/ (() => {
             ${secondClass}
 
             return ChipList;

From d8bdf86d0737c9e4f0f1a6825b3049b99f62b897 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 4 Jul 2019 13:52:18 +0200
Subject: [PATCH 1598/1703] fix(@schematics/update): update `@angular/pwa` when
 migrating to 8

Related to https://github.com/angular/angular-cli/issues/14589#issuecomment-508026441
---
 .../angular/migrations/update-8/update-dependencies.ts          | 1 +
 packages/schematics/angular/utility/latest-versions.ts          | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/packages/schematics/angular/migrations/update-8/update-dependencies.ts b/packages/schematics/angular/migrations/update-8/update-dependencies.ts
index b39bc04c5995..00b891ab4718 100644
--- a/packages/schematics/angular/migrations/update-8/update-dependencies.ts
+++ b/packages/schematics/angular/migrations/update-8/update-dependencies.ts
@@ -12,6 +12,7 @@ import { latestVersions } from '../../utility/latest-versions';
 export function updateDependencies() {
   return (host: Tree) => {
     const dependenciesToUpdate: Record<string, string> = {
+      '@angular/pwa': latestVersions.AngularPWA,
       '@angular-devkit/build-angular': latestVersions.DevkitBuildAngular,
       '@angular-devkit/build-ng-packagr': latestVersions.DevkitBuildNgPackagr,
       '@angular-devkit/build-webpack': latestVersions.DevkitBuildWebpack,
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index f96674b1584e..17ec5cdc984a 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -13,10 +13,12 @@ export const latestVersions = {
   ZoneJs: '~0.9.1',
   TypeScript: '~3.4.3',
   TsLib: '^1.9.0',
+
   // The versions below must be manually updated when making a new devkit release.
   DevkitBuildAngular: '~0.801.0',
   DevkitBuildNgPackagr: '~0.801.0',
   DevkitBuildWebpack: '~0.801.0',
+  AngularPWA: '~0.801.0',
 
   tsickle: '^0.35.0',
   ngPackagr: '^5.1.0',

From 3d1d225dd245aac4d93ff2af94563c92de129a21 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Mon, 8 Jul 2019 08:14:46 +0200
Subject: [PATCH 1599/1703] fix(@angular/cli): add `verbose` option to `update`
 and `add`

At the moment there is no way to turn on the verbose logging for `ng update` and `ng add`. This is useful for use so that when users report issues such as npmrc is not read we can see the lookup locations.

This also removes some reduncant that were being provided in `executeSchematic`.

Related to https://github.com/angular/angular-cli/issues/14993
---
 packages/angular/cli/commands/add-impl.ts    | 8 ++++----
 packages/angular/cli/commands/add.json       | 5 +++++
 packages/angular/cli/commands/update-impl.ts | 6 ++++--
 packages/angular/cli/commands/update.json    | 5 +++++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/packages/angular/cli/commands/add-impl.ts b/packages/angular/cli/commands/add-impl.ts
index adcbdc6af316..72370fa873a7 100644
--- a/packages/angular/cli/commands/add-impl.ts
+++ b/packages/angular/cli/commands/add-impl.ts
@@ -11,7 +11,7 @@ import { dirname, join } from 'path';
 import { intersects, prerelease, rcompare, satisfies, valid, validRange } from 'semver';
 import { isPackageNameSafeForAnalytics } from '../models/analytics';
 import { Arguments } from '../models/interface';
-import { SchematicCommand } from '../models/schematic-command';
+import { RunSchematicOptions, SchematicCommand } from '../models/schematic-command';
 import npmInstall from '../tasks/npm-install';
 import { colors } from '../utilities/color';
 import { getPackageManager } from '../utilities/package-manager';
@@ -65,6 +65,7 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
         packageMetadata = await fetchPackageMetadata(packageIdentifier.name, this.logger, {
           registry: options.registry,
           usingYarn,
+          verbose: options.verbose,
         });
       } catch (e) {
         this.logger.error('Unable to fetch package metadata: ' + e.message);
@@ -116,6 +117,7 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
       try {
         const manifest = await fetchPackageManifest(packageIdentifier, this.logger, {
           registry: options.registry,
+          verbose: options.verbose,
           usingYarn,
         });
 
@@ -174,12 +176,10 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
     collectionName: string,
     options: string[] = [],
   ): Promise<number | void> {
-    const runOptions = {
+    const runOptions: RunSchematicOptions = {
       schematicOptions: options,
-      workingDir: this.workspace.root,
       collectionName,
       schematicName: 'ng-add',
-      allowPrivate: true,
       dryRun: false,
       force: false,
     };
diff --git a/packages/angular/cli/commands/add.json b/packages/angular/cli/commands/add.json
index a44773d6f7c3..45679b0faf4d 100644
--- a/packages/angular/cli/commands/add.json
+++ b/packages/angular/cli/commands/add.json
@@ -30,6 +30,11 @@
               "format": "hostname"
             }
           ]
+        },
+        "verbose": {
+          "description": "Display additional details about internal operations during execution.",
+          "type": "boolean",
+          "default": false
         }
       },
       "required": [
diff --git a/packages/angular/cli/commands/update-impl.ts b/packages/angular/cli/commands/update-impl.ts
index 64d63baf812c..3323a054c5f9 100644
--- a/packages/angular/cli/commands/update-impl.ts
+++ b/packages/angular/cli/commands/update-impl.ts
@@ -11,7 +11,6 @@ import * as path from 'path';
 import * as semver from 'semver';
 import { Arguments, Option } from '../models/interface';
 import { SchematicCommand } from '../models/schematic-command';
-import { findUp } from '../utilities/find-up';
 import { getPackageManager } from '../utilities/package-manager';
 import {
   PackageIdentifier,
@@ -134,6 +133,7 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
         additionalOptions: {
           force: options.force || false,
           next: options.next || false,
+          verbose: options.verbose || false,
           packageManager,
           packages: options.all ? Object.keys(rootDependencies) : [],
         },
@@ -240,6 +240,7 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
           package: packageName,
           collection: migrations,
           from: options.from,
+          verbose: options.verbose || false,
           to: options.to || packageNode.package.version,
         },
       });
@@ -286,7 +287,7 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
       try {
         // Metadata requests are internally cached; multiple requests for same name
         // does not result in additional network traffic
-        metadata = await fetchPackageMetadata(packageName, this.logger);
+        metadata = await fetchPackageMetadata(packageName, this.logger, { verbose: options.verbose });
       } catch (e) {
         this.logger.error(`Error fetching metadata for '${packageName}': ` + e.message);
 
@@ -339,6 +340,7 @@ export class UpdateCommand extends SchematicCommand<UpdateCommandSchema> {
       dryRun: !!options.dryRun,
       showNothingDone: false,
       additionalOptions: {
+        verbose: options.verbose || false,
         force: options.force || false,
         packageManager,
         packages: packagesToUpdate,
diff --git a/packages/angular/cli/commands/update.json b/packages/angular/cli/commands/update.json
index d17d7c0fafb6..41e19d672f2b 100644
--- a/packages/angular/cli/commands/update.json
+++ b/packages/angular/cli/commands/update.json
@@ -57,6 +57,11 @@
         "allowDirty": {
           "description": "Whether to allow updating when the repository contains modified or untracked files.",
           "type": "boolean"
+        },
+        "verbose": {
+          "description": "Display additional details about internal operations during execution.",
+          "type": "boolean",
+          "default": false
         }
       }
     }

From 445f3873b9df51deda708c6b647c8b9e1ac4254f Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 5 Jul 2019 19:05:08 -0400
Subject: [PATCH 1600/1703] fix(@angular-devkit/build-angular): use query
 option to set sockJS path in dev-server

Fixes #15002
---
 .../angular_devkit/build_angular/src/dev-server/index.ts    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index a945b9b77053..84451a0bd9c1 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -417,11 +417,13 @@ function _addLiveReload(
 
   // If a custom path is provided the webpack dev server client drops the sockjs-node segment.
   // This adds it back so that behavior is consistent when using a custom URL path
+  let sockjsPath = '';
   if (clientAddress.pathname) {
-    clientAddress.pathname = path.posix.join(clientAddress.pathname, 'sockjs-node');
+      clientAddress.pathname = path.posix.join(clientAddress.pathname, 'sockjs-node');
+      sockjsPath = '&sockPath=' + clientAddress.pathname;
   }
 
-  const entryPoints = [`${webpackDevServerPath}?${url.format(clientAddress)}`];
+  const entryPoints = [`${webpackDevServerPath}?${url.format(clientAddress)}${sockjsPath}`];
   if (options.hmr) {
     const webpackHmrLink = 'https://webpack.js.org/guides/hot-module-replacement';
 

From aadaf093e4bc3e1b39a02e5bc9a967bc88feb349 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 8 Jul 2019 07:19:38 +0000
Subject: [PATCH 1601/1703] build: update caniuse-lite to version 1.0.30000981

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 09475f1e63cb..6ab4937ceca8 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -15,7 +15,7 @@
     "ajv": "6.10.0",
     "autoprefixer": "9.6.1",
     "browserslist": "4.6.3",
-    "caniuse-lite": "1.0.30000979",
+    "caniuse-lite": "1.0.30000981",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.3",
diff --git a/yarn.lock b/yarn.lock
index 161fc8c30984..7d6b7f1504c7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2000,10 +2000,10 @@ camelcase@^5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@1.0.30000979:
-  version "1.0.30000979"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000979.tgz#92f16d00186a6cf20d6c5711bb6e042a3d667029"
-  integrity sha512-gcu45yfq3B7Y+WB05fOMfr0EiSlq+1u+m6rPHyJli/Wy3PVQNGaU7VA4bZE5qw+AU2UVOBR/N5g1bzADUqdvFw==
+caniuse-lite@1.0.30000981:
+  version "1.0.30000981"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000981.tgz#5b6828803362363e5a1deba2eb550185cf6cec8f"
+  integrity sha512-JTByHj4DQgL2crHNMK6PibqAMrqqb/Vvh0JrsTJVSWG4VSUrT16EklkuRZofurlMjgA9e+zlCM4Y39F3kootMQ==
 
 caniuse-lite@^1.0.30000898:
   version "1.0.30000903"

From 4cbf59beb2a7925b393617899c669a40b9bb0b8a Mon Sep 17 00:00:00 2001
From: "Wataru.Kasahara" <kasahara1019@gmail.com>
Date: Sun, 7 Jul 2019 18:19:52 +0900
Subject: [PATCH 1602/1703] fix(@schematics/angular): add `text-summary` to
 code coverage reporter

---
 .../schematics/angular/library/files/karma.conf.js.template     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/library/files/karma.conf.js.template b/packages/schematics/angular/library/files/karma.conf.js.template
index 87b2dd32d60d..f6988d985b26 100644
--- a/packages/schematics/angular/library/files/karma.conf.js.template
+++ b/packages/schematics/angular/library/files/karma.conf.js.template
@@ -17,7 +17,7 @@ module.exports = function (config) {
     },
     coverageIstanbulReporter: {
       dir: require('path').join(__dirname, '<%= relativePathToWorkspaceRoot %>/coverage/<%= folderName %>'),
-      reports: ['html', 'lcovonly'],
+      reports: ['html', 'lcovonly', 'text-summary'],
       fixWebpackSourcePaths: true
     },
     reporters: ['progress', 'kjhtml'],

From 86266a39faaf221f385cf0e611ca09cd9cea6121 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 8 Jul 2019 13:45:29 +0200
Subject: [PATCH 1603/1703] fix(@ngtools/webpack): resources path
 normalizations

Compiler host `readResource` is always called with POSIX seperators. However the `denormalizePath` method doesn't convert forward slashes to back slashes which causes `getModifiedResourceFiles` to return an empty `Set`.

We were also assuming that `_changedFiles` is an FS path which was not the case as it's original type is `Path`

Fix #15012
---
 .../test/browser/rebuild_spec_large.ts           |  8 --------
 packages/ngtools/webpack/src/compiler_host.ts    | 16 ++++++++--------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
index 6585ecdd7fa9..50b4ed03381e 100644
--- a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
@@ -349,14 +349,6 @@ describe('Browser Builder rebuilds', () => {
   });
 
   it('rebuilds AOT factories', async () => {
-    // DISABLED_FOR_IVY - These should pass but require fixes for resource rebuilds
-    //                    https://github.com/angular/angular/pull/30954
-    if (ivyEnabled) {
-      pending('Broken in Ivy.');
-
-      return;
-    }
-
     host.writeMultipleFiles({
       'src/app/app.component.css': `
         @import './imported-styles.css';
diff --git a/packages/ngtools/webpack/src/compiler_host.ts b/packages/ngtools/webpack/src/compiler_host.ts
index 06b3b78aeca3..5653905b7fea 100644
--- a/packages/ngtools/webpack/src/compiler_host.ts
+++ b/packages/ngtools/webpack/src/compiler_host.ts
@@ -91,7 +91,7 @@ export class WebpackCompilerHost implements ts.CompilerHost {
     try {
       exists = this._syncHost.isFile(fullPath);
       if (exists) {
-        this._changedFiles.add(fullPath);
+        this._changedFiles.add(workaroundResolve(fullPath));
       }
     } catch {}
 
@@ -339,16 +339,15 @@ export class WebpackCompilerHost implements ts.CompilerHost {
   }
 
   readResource(fileName: string) {
-    this._readResourceFiles.add(fileName);
+    // These paths are meant to be used by the loader so we must denormalize them
+    const denormalizedFileName = workaroundResolve(fileName);
+    this._readResourceFiles.add(denormalizedFileName);
 
     if (this.directTemplateLoading && (fileName.endsWith('.html') || fileName.endsWith('.svg'))) {
       return this.readFile(fileName);
     }
 
     if (this._resourceLoader) {
-      // These paths are meant to be used by the loader so we must denormalize them.
-      const denormalizedFileName = this.denormalizePath(normalize(fileName));
-
       return this._resourceLoader.get(denormalizedFileName);
     } else {
       return this.readFile(fileName);
@@ -359,14 +358,15 @@ export class WebpackCompilerHost implements ts.CompilerHost {
     const modifiedFiles = new Set<string>();
 
     for (const changedFile of this._changedFiles) {
-      if (this._readResourceFiles.has(changedFile)) {
-        modifiedFiles.add(changedFile);
+      const denormalizedFileName = workaroundResolve(changedFile);
+      if (this._readResourceFiles.has(denormalizedFileName)) {
+        modifiedFiles.add(denormalizedFileName);
       }
 
       if (!this._resourceLoader) {
         continue;
       }
-      for (const resourcePath of this._resourceLoader.getAffectedResources(changedFile)) {
+      for (const resourcePath of this._resourceLoader.getAffectedResources(denormalizedFileName)) {
         modifiedFiles.add(resourcePath);
       }
     }

From 85011b36d31faf4bf8d3720d9e96e9989400b5fd Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 8 Jul 2019 13:45:59 +0200
Subject: [PATCH 1604/1703] build: update angular packages to 8.1.0

---
 package.json                                  |  4 +-
 .../angular_devkit/build_angular/package.json | 20 ++---
 .../build_ng_packagr/package.json             |  4 +-
 packages/ngtools/webpack/package.json         |  4 +-
 yarn.lock                                     | 80 +++++++++----------
 5 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/package.json b/package.json
index 3175f8705eb9..c8f87859938e 100644
--- a/package.json
+++ b/package.json
@@ -80,8 +80,8 @@
     "typescript": "3.4.5"
   },
   "devDependencies": {
-    "@angular/compiler": "~8.1.0-next.1",
-    "@angular/compiler-cli": "~8.1.0-next.1",
+    "@angular/compiler": "~8.1.0",
+    "@angular/compiler-cli": "~8.1.0",
     "@bazel/bazel": "0.24.1",
     "@bazel/buildifier": "^0.22.0",
     "@bazel/jasmine": "~0.26.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 6ab4937ceca8..439e07f2e32d 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -57,18 +57,18 @@
     "worker-plugin": "3.1.0"
   },
   "devDependencies": {
-    "@angular/animations": "~8.1.0-next.1",
+    "@angular/animations": "~8.1.0",
     "@angular/cdk": "^8.0.0",
-    "@angular/common": "~8.1.0-next.1",
-    "@angular/compiler": "~8.1.0-next.1",
-    "@angular/compiler-cli": "~8.1.0-next.1",
-    "@angular/core": "~8.1.0-next.1",
+    "@angular/common": "~8.1.0",
+    "@angular/compiler": "~8.1.0",
+    "@angular/compiler-cli": "~8.1.0",
+    "@angular/core": "~8.1.0",
     "@angular/material": "^8.0.0",
-    "@angular/platform-browser": "~8.1.0-next.1",
-    "@angular/platform-browser-dynamic": "~8.1.0-next.1",
-    "@angular/platform-server": "~8.1.0-next.1",
-    "@angular/router": "~8.1.0-next.1",
-    "@angular/service-worker": "~8.1.0-next.1",
+    "@angular/platform-browser": "~8.1.0",
+    "@angular/platform-browser-dynamic": "~8.1.0",
+    "@angular/platform-server": "~8.1.0",
+    "@angular/router": "~8.1.0",
+    "@angular/service-worker": "~8.1.0",
     "codelyzer": "^5.0.0",
     "bootstrap": "^4.0.0",
     "font-awesome": "^4.7.0",
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index a16a36dd279b..68f06ca6f381 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -14,8 +14,8 @@
     "ng-packagr": "^4.0.0 || ^5.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "~8.1.0-next.1",
-    "@angular/compiler-cli": "~8.1.0-next.1",
+    "@angular/compiler": "~8.1.0",
+    "@angular/compiler-cli": "~8.1.0",
     "@angular-devkit/core": "0.0.0",
     "ng-packagr": "^5.1.0",
     "tslib": "^1.9.0"
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index aecdcd9198c1..2ef336868a5b 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -33,8 +33,8 @@
     "webpack": "^4.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "~8.1.0-next.1",
-    "@angular/compiler-cli": "~8.1.0-next.1",
+    "@angular/compiler": "~8.1.0",
+    "@angular/compiler-cli": "~8.1.0",
     "typescript": "3.4.5",
     "webpack": "4.35.2"
   }
diff --git a/yarn.lock b/yarn.lock
index 7d6b7f1504c7..f9f83f0d6acb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@angular/animations@~8.1.0-next.1":
-  version "8.1.0-next.1"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.1.0-next.1.tgz#6c79ac16b7da239b7823259994d2b379d883dd68"
-  integrity sha512-drwdK7ARU41hGj6JebO7gF0MeeNz3qSMoPs8zRqjC3sfWZ4Jp9eNlfTf1b86gd6w9GMeOna/JjwxUeNEmxdLBw==
+"@angular/animations@~8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.1.0.tgz#acc6716df47599e48c715c7ec24dfc1e340256e2"
+  integrity sha512-v1paXrWQGsD+E4QBpwNUZ8dPj8hEn0b2kDVzYX6l/e9flUX6W2BWYx+BRuC4QBnNtTV9jiGsHT8FmQq/WztgWw==
   dependencies:
     tslib "^1.9.0"
 
@@ -18,17 +18,17 @@
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/common@~8.1.0-next.1":
-  version "8.1.0-next.1"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.1.0-next.1.tgz#2b6674ad46c13d0e24fedb6f239d338448ca72b0"
-  integrity sha512-sHzv1QIt2g6stXVqIiHpR2yk8goA3nek1FohUWz4H9mE24Knb4qSNvn25wztYdH5n5WPY+jyHyhWrqoXtrPvuQ==
+"@angular/common@~8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.1.0.tgz#aeb34e52e7f808e49d045eee36b97c802152c8fb"
+  integrity sha512-m5oEBPSy5nE+4SZTu3XchJhKT/u73NnJIS3+41xRsF5aX/1p8uNHkhJR7kcJmlVa7BZNr4byl8bGsYjX0CCpVg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@~8.1.0-next.1":
-  version "8.1.0-next.1"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.1.0-next.1.tgz#27047724d40a40b172497a0ebc40846a16bc481b"
-  integrity sha512-pJ5s5cEh/cXasMwUzJLwypoSaDzmAV6tfOKhm3bN6dfSh1bS8jliElIwxgPkqlUv9zo4Io/RZD4KgvwBzD7WSw==
+"@angular/compiler-cli@~8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.1.0.tgz#a42376cc42d34d04a9d7f1238b5d7ef535a218f6"
+  integrity sha512-WqEWjUTkvkp4rYDwYKo9XVXK1sbUHihwiZDOZrBEiGdw08TvZ+3qZs/mnYwRUYCzoN99RVG5rxJDg8Sf2VTY+w==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -42,17 +42,17 @@
     tslib "^1.9.0"
     yargs "13.1.0"
 
-"@angular/compiler@~8.1.0-next.1":
-  version "8.1.0-next.1"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.1.0-next.1.tgz#e0dadb973b15497d9afccccd1e56ae36c3a32014"
-  integrity sha512-3Qh4cSEPX3C2c+J9xea0CNnoy/UqtCqHzVuslfCdTRrgdCYx2xxcHvmwZHccDyTCTW8bX7C4jjr0Gf1w1lANlg==
+"@angular/compiler@~8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.1.0.tgz#8d94ad49d5388b2f2f0e369233a224f649619be9"
+  integrity sha512-+o4jR7WfqR39zgGk7gwpxZfd2hS3X2qgr17mUCeqQkKj0gh+GYWj7OlSuYXG63OS9S4iLsKQiVUYYgqdNSK5mg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@~8.1.0-next.1":
-  version "8.1.0-next.1"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.1.0-next.1.tgz#ff8c51089a46e5fdaaa77bb65efb1b07aee47d68"
-  integrity sha512-i26/UkfTOd+nZuPbUOgGHGSWwl1fghUlLwQHvDqtdMC2VANQOjEyQZrcNHP+N7ZumVdcfxDAisFOMWgnwFzVcw==
+"@angular/core@~8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.1.0.tgz#68bc170b4c041e3c19b9a17c0fff74b88fb37aae"
+  integrity sha512-GviWJjOu6LJMYNbukdSK35VaXvSrp5LTNd0FbXoBQF+mhVVV/8cG4hTKKjxG1xwWXI5E1t5U4aUKXrKUNJ1sQg==
   dependencies:
     tslib "^1.9.0"
 
@@ -63,40 +63,40 @@
   dependencies:
     tslib "^1.7.1"
 
-"@angular/platform-browser-dynamic@~8.1.0-next.1":
-  version "8.1.0-next.1"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.1.0-next.1.tgz#6e927d97583ec2bb9a9803c0f5003ef41fc39d9e"
-  integrity sha512-BDeLlzpg7T2nv3Y6ywQAW+cBAgbSQUku7W1p71vFGqE8p4c79HmKbykGSR1/n7Sez8LV+N1LpliCrNQEgGtBaA==
+"@angular/platform-browser-dynamic@~8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.1.0.tgz#407fae89fc7294783b8d27c19c1f96e36a3fdabd"
+  integrity sha512-By9I9hXqg538UzhlYDrF1dW7cDaF2JPjoFCE9jZZQxVRhOdjVoYVuIxIa5qPuGWfmMITO2G9rfMMrDiRHMyEDg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@~8.1.0-next.1":
-  version "8.1.0-next.1"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.1.0-next.1.tgz#0cf2b04437d190687d7efbaa6b7e9be5f5a076e2"
-  integrity sha512-EkDgr1wWW2eAd542k46JKb9jIr50M5eiq49QjDVmnjXCS1WNIyiW1TxTpyOiDNz8nK0jHYTzEw+PWEyvmwJV8Q==
+"@angular/platform-browser@~8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.1.0.tgz#186ce714304d2f72c4a3bf50a1607e03c8de6abd"
+  integrity sha512-qH6bH6DSRGvgx5iD7BbufsdeMxhh7lL1zN47LkrLGa8hojF+yxwtdE+go+WJ160ArACyX/FrPmPDSWT20YilUQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-server@~8.1.0-next.1":
-  version "8.1.0-next.1"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.1.0-next.1.tgz#d4c94dd48cf02c1e55aa22f73e744d1a17e915e4"
-  integrity sha512-TIH5Glb2Wxons7re8w6EeZuyBMhdYztN4n5tUNCZ4Yy0bmyQ/P/zqXOuSabDFf1NJxMRzMAZnp/2eJKv5ETrOw==
+"@angular/platform-server@~8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.1.0.tgz#e0f9e69cbe87ab8538c5256be748e0718a480718"
+  integrity sha512-bFsbYnbsXl178pOYxppfpTAxGcOaAz1kjTWQr/zVcMOthtu/M08oGXMke2l7Fx4Bt3MM7DXd93Qjebv7N4ECRQ==
   dependencies:
     domino "^2.1.2"
     tslib "^1.9.0"
     xhr2 "^0.1.4"
 
-"@angular/router@~8.1.0-next.1":
-  version "8.1.0-next.1"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.1.0-next.1.tgz#b957531748e153ddafb666fd8cd68546a7508e54"
-  integrity sha512-balgDD3IlsnWs+WWuSAQn3oXULbh44oklqBQgDAl8CX94ki0jDCeVFob57cCflqRx7WjtxB053X9keg6EA2YtA==
+"@angular/router@~8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.1.0.tgz#e8e0d146a489abcc7b8aed0f9efe10922e467db6"
+  integrity sha512-LeJOmiFdsXVf0KlN/jzA5NgWY1V4Ty5TDcfNd01s/ckZlzZd+p5hFhRFc75qwENTb8UwClTLsYQLmvmphnB4dA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@~8.1.0-next.1":
-  version "8.1.0-next.1"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.1.0-next.1.tgz#bf00349b1993a6ecda07b9c08920b16aae176950"
-  integrity sha512-lctU2Dq96ovsFU/e7vIKUUvg+k5H2w+RHOx8ARlgraCU3T5fYyriQvZ9GH7y86fkAFtSrQ6MX0+pnY5dFUUZ1Q==
+"@angular/service-worker@~8.1.0":
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.1.0.tgz#bd7d41863526441e4ea2b93ac19e69255c52ca6e"
+  integrity sha512-O4vUqrTPoCeRRnbUYBk+5Dx2zj/nc6UxZS/WZ1HKEGJZvYvuXf3SMfi1cHdzKPedCUj8PMt6yLpiP0qkyxV+Ww==
   dependencies:
     tslib "^1.9.0"
 

From 2c71af1465461b3d1133f98137c47e9d6bf83a26 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Tue, 9 Jul 2019 10:03:01 +0200
Subject: [PATCH 1605/1703] fix(@schematics/angular): ignore nested arrays in
 route declarations

`findNodes` will continue looking for arrays recursively unless we specify that we specify that we want only the first array.

Routes array can contain nested arrays such as when specifying guards.

Fixes #15016
---
 .../schematics/angular/utility/ast-utils.ts   |  8 ++---
 .../angular/utility/ast-utils_spec.ts         | 35 +++++++++++++++++++
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/angular/utility/ast-utils.ts b/packages/schematics/angular/utility/ast-utils.ts
index 906246e2f860..4f6dc3565aab 100644
--- a/packages/schematics/angular/utility/ast-utils.ts
+++ b/packages/schematics/angular/utility/ast-utils.ts
@@ -622,8 +622,8 @@ export function addRouteDeclarationToModule(
 
   // Check if the route declarations array is
   // an inlined argument of RouterModule or a standalone variable
-  if (routesArg.kind === ts.SyntaxKind.ArrayLiteralExpression) {
-    routesArr = routesArg as ts.ArrayLiteralExpression;
+  if (ts.isArrayLiteralExpression(routesArg)) {
+    routesArr = routesArg;
   } else {
     const routesVarName = routesArg.getText();
     let routesVar;
@@ -642,8 +642,8 @@ export function addRouteDeclarationToModule(
         `to router module at line ${line} in ${fileToAdd}`,
       );
     }
-    const arrExpr = findNodes(routesVar, ts.SyntaxKind.ArrayLiteralExpression).pop();
-    routesArr = arrExpr as ts.ArrayLiteralExpression;
+
+    routesArr = findNodes(routesVar, ts.SyntaxKind.ArrayLiteralExpression, 1)[0] as ts.ArrayLiteralExpression;
   }
 
   const occurencesCount = routesArr.elements.length;
diff --git a/packages/schematics/angular/utility/ast-utils_spec.ts b/packages/schematics/angular/utility/ast-utils_spec.ts
index 60a4958aa12f..0f82e4acf2d4 100644
--- a/packages/schematics/angular/utility/ast-utils_spec.ts
+++ b/packages/schematics/angular/utility/ast-utils_spec.ts
@@ -444,6 +444,41 @@ describe('ast utils', () => {
       );
     });
 
+    it('should add a route to the routes to the correct array when having guards', () => {
+      const moduleContent = `
+        import { BrowserModule } from '@angular/platform-browser';
+        import { NgModule } from '@angular/core';
+        import { AppComponent } from './app.component';
+
+        const routes = [
+          { path: 'foo', component: FooComponent, canLoad: [Guard] }
+        ];
+
+        @NgModule({
+          declarations: [
+            AppComponent
+          ],
+          imports: [
+            BrowserModule,
+            RouterModule.forRoot(routes)
+          ],
+          bootstrap: [AppComponent]
+        })
+        export class AppModule { }
+      `;
+
+      const source = getTsSource(modulePath, moduleContent);
+      const changes = addRouteDeclarationToModule(
+        source,
+        './src/app', `{ path: 'bar', component: BarComponent }`,
+      );
+      const output = applyChanges(modulePath, moduleContent, [changes]);
+      expect(output).toMatch(
+        // tslint:disable-next-line:max-line-length
+        /const routes = \[\r?\n?\s*{ path: 'foo', component: FooComponent, canLoad: \[Guard\] },\r?\n?\s*{ path: 'bar', component: BarComponent }\r?\n?\s*\]/,
+      );
+    });
+
     it('should add a route to the routes argument of RouteModule', () => {
       const moduleContent = `
         import { BrowserModule } from '@angular/platform-browser';

From 8e97df38889b201aebf361ce7e8e07673411cb31 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Sat, 6 Jul 2019 13:06:01 -0400
Subject: [PATCH 1606/1703] feat(@angular-devkit/build-angular): allow control
 of index output path

This allows the output path of an application's index HTML file to be controlled independently of the input file.  The output path for the file will be considered relative to the application's configured output path.  This allows an application to contain multiple input index files for different configurations and allow the output file to remain constant.  This also enables the placement of the index file in a subdirectory within the output path or change the name of the output index file neither of which was previously possible.
---
 .../angular-cli-files/models/build-options.ts |   1 -
 .../utilities/index-file/write-index-html.ts  |   6 +-
 .../build_angular/src/browser/index.ts        |  10 +-
 .../build_angular/src/browser/schema.json     |  27 +++-
 .../build_angular/src/dev-server/index.ts     |   9 +-
 .../src/utils/webpack-browser-config.ts       |  16 ++
 .../test/browser/index_spec_large.ts          | 137 +++++++++++++++++-
 7 files changed, 189 insertions(+), 17 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
index c35b6a1cad73..5ed595b83f66 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/build-options.ts
@@ -63,7 +63,6 @@ export interface BuildOptions {
   es5BrowserSupport?: boolean;
 
   main: string;
-  index: string;
   polyfills?: string;
   budgets: Budget[];
   assets: AssetPatternClass[];
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/write-index-html.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/write-index-html.ts
index c5fb9e3fb701..06694394ef40 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/write-index-html.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/write-index-html.ts
@@ -7,7 +7,7 @@
  */
 
 import { EmittedFiles } from '@angular-devkit/build-webpack';
-import { Path, basename, getSystemPath, join, virtualFs } from '@angular-devkit/core';
+import { Path, dirname, getSystemPath, join, virtualFs } from '@angular-devkit/core';
 import { Observable, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 import { ExtraEntryPoint } from '../../../browser/schema';
@@ -66,7 +66,7 @@ export function writeIndexHtml({
         moduleFiles: filterAndMapBuildFiles(moduleFiles, '.js'),
         loadOutputFile: async filePath => {
           return host
-            .read(join(outputPath, filePath))
+            .read(join(dirname(outputPath), filePath))
             .pipe(map(data => virtualFs.fileBufferToString(data)))
             .toPromise();
         },
@@ -74,7 +74,7 @@ export function writeIndexHtml({
     ),
     switchMap(content => (postTransform ? postTransform(content) : of(content))),
     map(content => virtualFs.stringToFileBuffer(content)),
-    switchMap(content => host.write(join(outputPath, basename(indexPath)), content)),
+    switchMap(content => host.write(outputPath, content)),
   );
 }
 
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 6397ee7174a7..9cf285de5084 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -55,7 +55,11 @@ import {
 import { ExecutionTransformer } from '../transforms';
 import { BuildBrowserFeatures, deleteOutputDir } from '../utils';
 import { assertCompatibleAngularVersion } from '../utils/version';
-import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
+import {
+  generateBrowserWebpackConfigFromContext,
+  getIndexInputFile,
+  getIndexOutputFile,
+} from '../utils/webpack-browser-config';
 import { Schema as BrowserBuilderSchema } from './schema';
 
 export type BrowserBuilderOutput = json.JsonObject &
@@ -252,8 +256,8 @@ export function buildWebpackBrowser(
 
             return writeIndexHtml({
               host,
-              outputPath: resolve(root, normalize(options.outputPath)),
-              indexPath: join(root, options.index),
+              outputPath: resolve(root, join(normalize(options.outputPath), getIndexOutputFile(options))),
+              indexPath: join(root, getIndexInputFile(options)),
               files,
               noModuleFiles,
               moduleFiles,
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index 12967f11c7d0..42c8ef8045cc 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -270,8 +270,31 @@
       "x-deprecated": true
     },
     "index": {
-      "type": "string",
-      "description": "The name of the index HTML file."
+      "description": "Configures the generation of the application's HTML index.",
+      "oneOf": [
+        {
+          "type": "string",
+          "description": "The path of a file to use for the application's HTML index. The filename of the specified path will be used for the generated file and will be created in the root of the application's configured output path."
+        },
+        {
+          "type": "object",
+          "description": "",
+          "properties": {
+            "input": {
+              "type": "string",
+              "minLength": 1,
+              "description": "The path of a file to use for the application's generated HTML index."
+            },
+            "output": {
+              "type": "string",
+              "minLength": 1,
+              "default": "index.html",
+              "description": "The output path of the application's generated HTML index file. The full provided path will be used and will be considered relative to the application's configured output path."
+            }
+          },
+          "required": ["input"]
+        }
+      ]
     },
     "statsJson": {
       "type": "boolean",
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index 84451a0bd9c1..ec61f44aa73d 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -40,6 +40,7 @@ import { Schema as BrowserBuilderSchema } from '../browser/schema';
 import { ExecutionTransformer } from '../transforms';
 import { BuildBrowserFeatures, normalizeOptimization } from '../utils';
 import { assertCompatibleAngularVersion } from '../utils/version';
+import { getIndexInputFile, getIndexOutputFile } from '../utils/webpack-browser-config';
 import { Schema } from './schema';
 const open = require('open');
 
@@ -190,7 +191,7 @@ export function serveWebpackBrowser(
       }
 
       if (browserOptions.index) {
-        const { scripts = [], styles = [], index, baseHref, tsConfig } = browserOptions;
+        const { scripts = [], styles = [], baseHref, tsConfig } = browserOptions;
         const projectName = context.target
           ? context.target.project
           : workspace.getDefaultProjectName();
@@ -214,8 +215,8 @@ export function serveWebpackBrowser(
 
         webpackConfig.plugins.push(
           new IndexHtmlWebpackPlugin({
-            input: path.resolve(root, index),
-            output: path.basename(index),
+            input: path.resolve(root, getIndexInputFile(browserOptions)),
+            output: getIndexOutputFile(browserOptions),
             baseHref,
             moduleEntrypoints,
             entrypoints,
@@ -317,7 +318,7 @@ export function buildServerConfig(
     historyApiFallback:
       !!browserOptions.index &&
       ({
-        index: `${servePath}/${path.basename(browserOptions.index)}`,
+        index: `${servePath}/${getIndexOutputFile(browserOptions)}`,
         disableDotRule: true,
         htmlAcceptHeaders: ['text/html', 'application/xhtml+xml'],
         rewrites: [
diff --git a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
index 727934a9beee..5b4b584cd77b 100644
--- a/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
+++ b/packages/angular_devkit/build_angular/src/utils/webpack-browser-config.ts
@@ -208,3 +208,19 @@ export async function generateBrowserWebpackConfigFromContext(
 
   return { workspace, config };
 }
+
+export function getIndexOutputFile(options: BrowserBuilderSchema): string {
+  if (typeof options.index === 'string') {
+    return path.basename(options.index);
+  } else {
+    return options.index.output || 'index.html';
+  }
+}
+
+export function getIndexInputFile(options: BrowserBuilderSchema): string {
+  if (typeof options.index === 'string') {
+    return options.index;
+  } else {
+    return options.index.input;
+  }
+}
diff --git a/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts
index b327fc75dc0b..7b30b0f28102 100644
--- a/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts
@@ -5,14 +5,13 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
 import { Architect } from '@angular-devkit/architect';
-import { join, normalize, tags, virtualFs } from '@angular-devkit/core';
+import { join, normalize, tags, virtualFs, workspaces } from '@angular-devkit/core';
 import { BrowserBuilderOutput } from '../../src/browser';
 import { createArchitect, host } from '../utils';
 
-
-describe('Browser Builder works with BOM index.html', () => {
+// tslint:disable-next-line:no-big-function
+describe('Browser Builder index HTML processing', () => {
   const targetSpec = { project: 'app', target: 'build' };
   let architect: Architect;
 
@@ -108,4 +107,134 @@ describe('Browser Builder works with BOM index.html', () => {
     );
     await run.stop();
   });
+
+  it('uses the input value from the index option longform', async () => {
+    const { workspace } = await workspaces.readWorkspace(host.root(), workspaces.createWorkspaceHost(host));
+    const app = workspace.projects.get('app');
+    if (!app) {
+      fail('Test application "app" not found.');
+
+      return;
+    }
+    const target = app.targets.get('build');
+    if (!target) {
+      fail('Test application "app" target "build" not found.');
+
+      return;
+    }
+    if (!target.options) {
+      target.options = {};
+    }
+    target.options.index = { input: 'src/index-2.html' };
+    await workspaces.writeWorkspace(workspace, workspaces.createWorkspaceHost(host));
+
+    host.writeMultipleFiles({
+      'src/index-2.html': tags.oneLine`
+        <html><head><base href="/"><%= csrf_meta_tags %></head>
+        <body><app-root></app-root></body></html>
+      `,
+    });
+    await host.delete(join(host.root(), normalize('src/index.html'))).toPromise();
+
+    // Recreate architect to use update angular.json
+    architect = (await createArchitect(host.root())).architect;
+
+    const run = await architect.scheduleTarget(targetSpec);
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+    const outputIndexPath = join(host.root(), 'dist', 'index.html');
+    const content = await host.read(normalize(outputIndexPath)).toPromise();
+    expect(virtualFs.fileBufferToString(content)).toBe(
+      `<html><head><base href="/"><%= csrf_meta_tags %></head> `
+      + `<body><app-root></app-root><script src="runtime.js"></script>`
+      + `<script src="polyfills.js"></script><script src="styles.js"></script>`
+      + `<script src="vendor.js"></script><script src="main.js"></script></body></html>`,
+    );
+  });
+
+  it('uses the output value from the index option longform', async () => {
+    const { workspace } = await workspaces.readWorkspace(host.root(), workspaces.createWorkspaceHost(host));
+    const app = workspace.projects.get('app');
+    if (!app) {
+      fail('Test application "app" not found.');
+
+      return;
+    }
+    const target = app.targets.get('build');
+    if (!target) {
+      fail('Test application "app" target "build" not found.');
+
+      return;
+    }
+    if (!target.options) {
+      target.options = {};
+    }
+    target.options.index = { input: 'src/index.html', output: 'main.html' };
+    await workspaces.writeWorkspace(workspace, workspaces.createWorkspaceHost(host));
+
+    host.writeMultipleFiles({
+      'src/index.html': tags.oneLine`
+        <html><head><base href="/"></head>
+        <body><app-root></app-root></body></html>
+      `,
+    });
+
+    // Recreate architect to use update angular.json
+    architect = (await createArchitect(host.root())).architect;
+
+    const run = await architect.scheduleTarget(targetSpec);
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+    const outputIndexPath = join(host.root(), 'dist', 'main.html');
+    const content = await host.read(normalize(outputIndexPath)).toPromise();
+    expect(virtualFs.fileBufferToString(content)).toBe(
+      `<html><head><base href="/"></head> `
+      + `<body><app-root></app-root><script src="runtime.js"></script>`
+      + `<script src="polyfills.js"></script><script src="styles.js"></script>`
+      + `<script src="vendor.js"></script><script src="main.js"></script></body></html>`,
+    );
+  });
+
+  it('creates subdirectories for output value from the index option longform', async () => {
+    const { workspace } = await workspaces.readWorkspace(host.root(), workspaces.createWorkspaceHost(host));
+    const app = workspace.projects.get('app');
+    if (!app) {
+      fail('Test application "app" not found.');
+
+      return;
+    }
+    const target = app.targets.get('build');
+    if (!target) {
+      fail('Test application "app" target "build" not found.');
+
+      return;
+    }
+    if (!target.options) {
+      target.options = {};
+    }
+    target.options.index = { input: 'src/index.html', output: 'extra/main.html' };
+    await workspaces.writeWorkspace(workspace, workspaces.createWorkspaceHost(host));
+
+    host.writeMultipleFiles({
+      'src/index.html': tags.oneLine`
+        <html><head><base href="/"></head>
+        <body><app-root></app-root></body></html>
+      `,
+    });
+
+    // Recreate architect to use update angular.json
+    architect = (await createArchitect(host.root())).architect;
+
+    const run = await architect.scheduleTarget(targetSpec);
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+    const outputIndexPath = join(host.root(), 'dist', 'extra', 'main.html');
+    const content = await host.read(normalize(outputIndexPath)).toPromise();
+    expect(virtualFs.fileBufferToString(content)).toBe(
+      `<html><head><base href="/"></head> `
+      + `<body><app-root></app-root><script src="runtime.js"></script>`
+      + `<script src="polyfills.js"></script><script src="styles.js"></script>`
+      + `<script src="vendor.js"></script><script src="main.js"></script></body></html>`,
+    );
+  });
 });

From a57e98662c96046dbc4cfe0379ae653d71872b78 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 9 Jul 2019 21:50:49 +0200
Subject: [PATCH 1607/1703] fix(@angular/cli): display a more detailed error
 message when workspace cannot be loaded

Closes #15023, closes #10757, closes #14933 and closes #11204
---
 packages/angular/cli/utilities/config.ts | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/angular/cli/utilities/config.ts b/packages/angular/cli/utilities/config.ts
index 3351b5d7fb4b..88eafe97a883 100644
--- a/packages/angular/cli/utilities/config.ts
+++ b/packages/angular/cli/utilities/config.ts
@@ -78,7 +78,18 @@ export function getWorkspace(
     new NodeJsSyncHost(),
   );
 
-  workspace.loadWorkspaceFromHost(file).subscribe();
+  let error: unknown;
+  workspace.loadWorkspaceFromHost(file).subscribe({
+    error: e => error = e,
+  });
+
+  if (error) {
+    throw new Error(
+      `Workspace config file cannot le loaded: ${configPath}`
+      + `\n${error instanceof Error ? error.message : error}`
+    )
+  }
+
   cachedWorkspaces.set(level, workspace);
 
   return workspace;
@@ -116,7 +127,7 @@ export function getWorkspaceRaw(
   const ast = parseJsonAst(content, JsonParseMode.Loose);
 
   if (ast.kind != 'object') {
-    throw new Error('Invalid JSON');
+    throw new Error(`Invalid JSON file: ${configPath}`);
   }
 
   return [ast, configPath];

From b48dede4e0c2827cec8b822d59f2a52799d34e56 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Thu, 4 Jul 2019 12:54:44 +0200
Subject: [PATCH 1608/1703] fix(@angular-devkit/build-angular): fix sourcemaps
 paths

`output.devtoolModuleFilenameTemplate` is not used when `SourceMapDevToolPlugin`

https://github.com/webpack/webpack/blob/671cb184e34e748e7c3e1d724ee24263c18c19e9/lib/SourceMapDevToolPlugin.js#L77

Current stacktraces are not properly formatted
```
http://localhost:9876/_karma_webpack_/webpack:/src/app/dummy.component.spec.ts:36:76
```

With this change we wil change this to
```
http://localhost:9876/src/app/validation-directive.ts:13:23
```

This also allows users to click on the stacktrace in the browser and go to source.
---
 .../src/angular-cli-files/models/webpack-configs/utils.ts        | 1 +
 .../build_angular/src/angular-cli-files/plugins/karma.ts         | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
index d9a3e5da7594..b43c4d287073 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
@@ -95,6 +95,7 @@ export function getSourceMapDevTool(
   return new SourceMapDevToolPlugin({
     filename: inlineSourceMap ? undefined : '[file].map',
     include,
+    moduleFilenameTemplate: '[namespace]/[resource-path]',
     append: hiddenSourceMap ? false : undefined,
   });
 }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
index 2fa31a88ae73..86c7ffac7e0f 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/karma.ts
@@ -147,7 +147,6 @@ const init: any = (config: any, emitter: any, customFileHandlers: any) => {
   // Files need to be served from a custom path for Karma.
   webpackConfig.output.path = '/_karma_webpack_/';
   webpackConfig.output.publicPath = '/_karma_webpack_/';
-  webpackConfig.output.devtoolModuleFilenameTemplate = '[namespace]/[resource-path]?[loaders]';
 
   let compiler: any;
   try {

From 7d9ead4261ac0b11da1a0072bad9f504f5d99825 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 4 Jul 2019 19:02:14 +0100
Subject: [PATCH 1609/1703] feat(@angular-devkit/build-optimizer): add
 BuildOptimizerWebpackPlugin

Using this webpack allows determining in advance if files from a package should be skipped by the Build Optimizer loader.
---
 .../build_optimizer/src/_golden-api.d.ts      |  6 ++++
 .../angular_devkit/build_optimizer/README.md  |  5 +++
 .../src/build-optimizer/webpack-loader.ts     | 27 +++++++++++++--
 .../src/build-optimizer/webpack-plugin.ts     | 33 +++++++++++++++++++
 .../build_optimizer/src/index.ts              |  1 +
 5 files changed, 69 insertions(+), 3 deletions(-)
 create mode 100644 packages/angular_devkit/build_optimizer/src/build-optimizer/webpack-plugin.ts

diff --git a/etc/api/angular_devkit/build_optimizer/src/_golden-api.d.ts b/etc/api/angular_devkit/build_optimizer/src/_golden-api.d.ts
index c545afc96c41..83e1865b8cba 100644
--- a/etc/api/angular_devkit/build_optimizer/src/_golden-api.d.ts
+++ b/etc/api/angular_devkit/build_optimizer/src/_golden-api.d.ts
@@ -1,5 +1,11 @@
 export declare function buildOptimizer(options: BuildOptimizerOptions): TransformJavascriptOutput;
 
+export declare const buildOptimizerLoaderPath: string;
+
+export declare class BuildOptimizerWebpackPlugin {
+    apply(compiler: Compiler): void;
+}
+
 export default function buildOptimizerLoader(this: webpack.loader.LoaderContext, content: string, previousSourceMap: RawSourceMap): void;
 
 export declare function getFoldFileTransformer(program: ts.Program): ts.TransformerFactory<ts.SourceFile>;
diff --git a/packages/angular_devkit/build_optimizer/README.md b/packages/angular_devkit/build_optimizer/README.md
index 0a7b3236badb..6b97c1b3588d 100644
--- a/packages/angular_devkit/build_optimizer/README.md
+++ b/packages/angular_devkit/build_optimizer/README.md
@@ -186,7 +186,12 @@ export interface BuildOptimizerOptions {
 ## Webpack loader usage:
 
 ```typescript
+import { BuildOptimizerWebpackPlugin } from '@angular-devkit/build-optimizer';
+
 module.exports = {
+  plugins: [
+    new BuildOptimizerWebpackPlugin(),
+  ]
   module: {
     rules: [
       {
diff --git a/packages/angular_devkit/build_optimizer/src/build-optimizer/webpack-loader.ts b/packages/angular_devkit/build_optimizer/src/build-optimizer/webpack-loader.ts
index e05666f8b596..eadf1aacb161 100644
--- a/packages/angular_devkit/build_optimizer/src/build-optimizer/webpack-loader.ts
+++ b/packages/angular_devkit/build_optimizer/src/build-optimizer/webpack-loader.ts
@@ -17,9 +17,31 @@ interface BuildOptimizerLoaderOptions {
   sourceMap: boolean;
 }
 
+const alwaysProcess = (path: string) =>
+  // Always process TS files.
+  path.endsWith('.ts') || path.endsWith('.tsx')
+  // Always process factory files.
+  || path.endsWith('.ngfactory.js') || path.endsWith('.ngstyle.js');
+
 export default function buildOptimizerLoader
   (this: webpack.loader.LoaderContext, content: string, previousSourceMap: RawSourceMap) {
   this.cacheable();
+
+  const skipBuildOptimizer = this._module
+    && this._module.factoryMeta
+    && this._module.factoryMeta.skipBuildOptimizer;
+
+  if (!alwaysProcess(this.resourcePath) && skipBuildOptimizer) {
+    // Skip loading processing this file with Build Optimizer if we determined in
+    // BuildOptimizerWebpackPlugin that we shouldn't.
+
+    // Webpack typings for previousSourceMap are wrong, they are JSON objects and not strings.
+    // tslint:disable-next-line:no-any
+    this.callback(null, content, previousSourceMap as any);
+
+    return;
+  }
+
   const options: BuildOptimizerLoaderOptions = loaderUtils.getOptions(this) || {};
 
   // Make up names of the intermediate files so we can chain the sourcemaps.
@@ -33,12 +55,11 @@ export default function buildOptimizerLoader
     outputFilePath,
     emitSourceMap: options.sourceMap,
     isSideEffectFree: this._module
-                      && this._module.factoryMeta
-                      && this._module.factoryMeta.sideEffectFree,
+      && this._module.factoryMeta
+      && this._module.factoryMeta.sideEffectFree,
   });
 
   if (boOutput.emitSkipped || boOutput.content === null) {
-    // Webpack typings for previousSourceMap are wrong, they are JSON objects and not strings.
     // tslint:disable-next-line:no-any
     this.callback(null, content, previousSourceMap as any);
 
diff --git a/packages/angular_devkit/build_optimizer/src/build-optimizer/webpack-plugin.ts b/packages/angular_devkit/build_optimizer/src/build-optimizer/webpack-plugin.ts
new file mode 100644
index 000000000000..b31f0ecbb6cf
--- /dev/null
+++ b/packages/angular_devkit/build_optimizer/src/build-optimizer/webpack-plugin.ts
@@ -0,0 +1,33 @@
+
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Compiler } from 'webpack';  // tslint:disable-line:no-implicit-dependencies
+
+export class BuildOptimizerWebpackPlugin {
+  apply(compiler: Compiler) {
+    compiler.hooks.normalModuleFactory.tap("BuildOptimizerWebpackPlugin", nmf => {
+      nmf.hooks.module.tap("BuildOptimizerWebpackPlugin", (module, data) => {
+        const resolveData = data.resourceResolveData;
+        if (resolveData && resolveData.descriptionFileData) {
+          // Only TS packages should use Build Optimizer.
+          const typings = resolveData.descriptionFileData.typings;
+          // Notes:
+          // - a TS package might not have defined typings but still use .d.ts files next to their
+          // .js files. We don't cover that case because the Angular Package Format (APF) calls for
+          // using the Typings field and Build Optimizer is geared towards APF. Maybe we could
+          // provide configuration options to the plugin to cover that case if there's demand.
+          // - a JS-only package that also happens to provides typings will also be flagged by this
+          // check. Not sure there's a good way to skip those.
+          module.factoryMeta.skipBuildOptimizer = !typings;
+        }
+
+        return module;
+      });
+    });
+  }
+}
diff --git a/packages/angular_devkit/build_optimizer/src/index.ts b/packages/angular_devkit/build_optimizer/src/index.ts
index 78ea03851fa8..9e11e4d3052e 100644
--- a/packages/angular_devkit/build_optimizer/src/index.ts
+++ b/packages/angular_devkit/build_optimizer/src/index.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 export { default as buildOptimizerLoader } from './build-optimizer/webpack-loader';
+export { BuildOptimizerWebpackPlugin } from './build-optimizer/webpack-plugin';
 export { buildOptimizer } from './build-optimizer/build-optimizer';
 
 export { transformJavascript } from './helpers/transform-javascript';

From 9b7f196a8030413e46ec5f78aa4db2b3b56c0f4a Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 4 Jul 2019 19:11:07 +0100
Subject: [PATCH 1610/1703] feat(@angular-devkit/build-angular): run Build
 Optimizer only on TS-generated files

---
 .../src/angular-cli-files/models/webpack-configs/common.ts      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index a553b2d98508..47d241805b2a 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -5,6 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import { BuildOptimizerWebpackPlugin } from '@angular-devkit/build-optimizer';
 import { tags } from '@angular-devkit/core';
 import * as CopyWebpackPlugin from 'copy-webpack-plugin';
 import * as path from 'path';
@@ -251,6 +252,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
 
   let buildOptimizerUseRule;
   if (buildOptions.buildOptimizer) {
+    extraPlugins.push(new BuildOptimizerWebpackPlugin());
     buildOptimizerUseRule = {
       use: [
         {

From 9d9d46bab3fcd64d4a2f61ff1eb832a8656cb194 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Thu, 4 Jul 2019 19:13:33 +0100
Subject: [PATCH 1611/1703] refactor: use buildOptimizerLoaderPath

---
 .../angular-cli-files/models/webpack-configs/common.ts | 10 +++++-----
 .../models/webpack-configs/typescript.ts               |  4 ++--
 .../src/build-optimizer/webpack-loader.ts              |  2 ++
 packages/angular_devkit/build_optimizer/src/index.ts   |  5 ++++-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 47d241805b2a..e2677039b0f7 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -5,7 +5,10 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { BuildOptimizerWebpackPlugin } from '@angular-devkit/build-optimizer';
+import {
+  BuildOptimizerWebpackPlugin,
+  buildOptimizerLoaderPath,
+} from '@angular-devkit/build-optimizer';
 import { tags } from '@angular-devkit/core';
 import * as CopyWebpackPlugin from 'copy-webpack-plugin';
 import * as path from 'path';
@@ -35,9 +38,6 @@ const TerserPlugin = require('terser-webpack-plugin');
 
 // tslint:disable-next-line:no-any
 const g: any = typeof global !== 'undefined' ? global : {};
-export const buildOptimizerLoader: string = g['_DevKitIsLocal']
-  ? require.resolve('@angular-devkit/build-optimizer/src/build-optimizer/webpack-loader')
-  : '@angular-devkit/build-optimizer/webpack-loader';
 
 // tslint:disable-next-line:no-big-function
 export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
@@ -256,7 +256,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
     buildOptimizerUseRule = {
       use: [
         {
-          loader: buildOptimizerLoader,
+          loader: buildOptimizerLoaderPath,
           options: { sourceMap: scriptsSourceMap },
         },
       ],
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
index 9660f0fe662a..eef882522e00 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
@@ -7,6 +7,7 @@
  */
 // tslint:disable
 // TODO: cleanup this file, it's copied as is from Angular CLI.
+import { buildOptimizerLoaderPath } from '@angular-devkit/build-optimizer';
 import * as path from 'path';
 import {
   AngularCompilerPlugin,
@@ -14,7 +15,6 @@ import {
   NgToolsLoader,
   PLATFORM
 } from '@ngtools/webpack';
-import { buildOptimizerLoader } from './common';
 import { WebpackConfigOptions, BuildOptions } from '../build-options';
 
 function _pluginOptionsOverrides(
@@ -113,7 +113,7 @@ export function getAotConfig(wco: WebpackConfigOptions, i18nExtract = false) {
   const loaders: any[] = [NgToolsLoader];
   if (buildOptions.buildOptimizer) {
     loaders.unshift({
-      loader: buildOptimizerLoader,
+      loader: buildOptimizerLoaderPath,
       options: { sourceMap: buildOptions.sourceMap.scripts }
     });
   }
diff --git a/packages/angular_devkit/build_optimizer/src/build-optimizer/webpack-loader.ts b/packages/angular_devkit/build_optimizer/src/build-optimizer/webpack-loader.ts
index eadf1aacb161..ec4c138a7900 100644
--- a/packages/angular_devkit/build_optimizer/src/build-optimizer/webpack-loader.ts
+++ b/packages/angular_devkit/build_optimizer/src/build-optimizer/webpack-loader.ts
@@ -17,6 +17,8 @@ interface BuildOptimizerLoaderOptions {
   sourceMap: boolean;
 }
 
+export const buildOptimizerLoaderPath = __filename;
+
 const alwaysProcess = (path: string) =>
   // Always process TS files.
   path.endsWith('.ts') || path.endsWith('.tsx')
diff --git a/packages/angular_devkit/build_optimizer/src/index.ts b/packages/angular_devkit/build_optimizer/src/index.ts
index 9e11e4d3052e..96b201de9f66 100644
--- a/packages/angular_devkit/build_optimizer/src/index.ts
+++ b/packages/angular_devkit/build_optimizer/src/index.ts
@@ -5,7 +5,10 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-export { default as buildOptimizerLoader } from './build-optimizer/webpack-loader';
+export {
+  default as buildOptimizerLoader,
+  buildOptimizerLoaderPath,
+} from './build-optimizer/webpack-loader';
 export { BuildOptimizerWebpackPlugin } from './build-optimizer/webpack-plugin';
 export { buildOptimizer } from './build-optimizer/build-optimizer';
 

From fc1d89cf13bb9644da602f4325ea6ac336f990dc Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 10 Jul 2019 05:24:09 +0000
Subject: [PATCH 1612/1703] build: update bazel_toolchains to version

---
 WORKSPACE | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index cdcdc0042c18..e3a274dae0be 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -87,9 +87,9 @@ web_test_repositories()
 # Bring in bazel_toolchains for RBE setup configuration.
 http_archive(
     name = "bazel_toolchains",
-    sha256 = "142bcbd8cb751ce1193a1d7fef4e328493cd0a69cc0555183ad237f81418ba40",
-    strip_prefix = "bazel-toolchains-628224f6cf48e81116d0ee0bf65424eaa630d5b3",
-    urls = ["https://github.com/xingao267/bazel-toolchains/archive/628224f6cf48e81116d0ee0bf65424eaa630d5b3.tar.gz"],
+    sha256 = "54764b510cf45754c01ac65c9ba83e5f8fc8a033b8296ef74c4e4d6d1dbfaf21",
+    strip_prefix = "bazel-toolchains-d67435097bd65153a592ecdcc83094474914c205",
+    urls = ["https://github.com/xingao267/bazel-toolchains/archive/d67435097bd65153a592ecdcc83094474914c205.tar.gz"],
 )
 
 load("@bazel_toolchains//rules:environments.bzl", "clang_env")

From bf87dd3d22900c1164c744c6b8f91d4b467db64e Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 10 Jul 2019 07:13:48 +0000
Subject: [PATCH 1613/1703] build: update caniuse-lite to version 1.0.30000983

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 439e07f2e32d..464c85f5bf47 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -15,7 +15,7 @@
     "ajv": "6.10.0",
     "autoprefixer": "9.6.1",
     "browserslist": "4.6.3",
-    "caniuse-lite": "1.0.30000981",
+    "caniuse-lite": "1.0.30000983",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.3",
diff --git a/yarn.lock b/yarn.lock
index f9f83f0d6acb..d8421f067f6e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2000,10 +2000,10 @@ camelcase@^5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@1.0.30000981:
-  version "1.0.30000981"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000981.tgz#5b6828803362363e5a1deba2eb550185cf6cec8f"
-  integrity sha512-JTByHj4DQgL2crHNMK6PibqAMrqqb/Vvh0JrsTJVSWG4VSUrT16EklkuRZofurlMjgA9e+zlCM4Y39F3kootMQ==
+caniuse-lite@1.0.30000983:
+  version "1.0.30000983"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000983.tgz#ab3c70061ca2a3467182a10ac75109b199b647f8"
+  integrity sha512-/llD1bZ6qwNkt41AsvjsmwNOoA4ZB+8iqmf5LVyeSXuBODT/hAMFNVOh84NdUzoiYiSKqo5vQ3ZzeYHSi/olDQ==
 
 caniuse-lite@^1.0.30000898:
   version "1.0.30000903"

From b918891a665ffc6760ed69616b2a2fb4e9db1ee0 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 9 Jul 2019 22:24:29 +0000
Subject: [PATCH 1614/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 945471d7aed5..dd63f4946c81 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#2ec0e754c404bece4ce3ca3a1ba1c0052efab41a",
-    "@angular/common": "github:angular/common-builds#556a1d7ea67a68deff67bf2faec6d55b6171c7bd",
-    "@angular/compiler": "github:angular/compiler-builds#c33715c363a274bb948d221f86bb38d8b99df3b0",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#042678d10664e41a24b0f24ccd6c47dd7513e702",
-    "@angular/core": "github:angular/core-builds#1e59db6846ba56bc705ddfd568f914e4fb976987",
-    "@angular/forms": "github:angular/forms-builds#c026076b8cb95ce0118b23031c0ce6b7e0b54d30",
-    "@angular/language-service": "github:angular/language-service-builds#e7201e54a8258ac83b10363f8d442eeb4546cc20",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#f4f97178a1287d050244d4d37f6c54d577115171",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#921540c3eed19b379609ac1556caf605a80fdb6b",
-    "@angular/router": "github:angular/router-builds#ad274b01ca7564822ad9c1be4d20f22bb94eaec7"
+    "@angular/animations": "github:angular/animations-builds#1e2eb2bd302bc661c55dbd2d1934f00bbf2ee34a",
+    "@angular/common": "github:angular/common-builds#1898b80926083e20c0bcd990ce654ba583846742",
+    "@angular/compiler": "github:angular/compiler-builds#05398e918add23daa627549909aadf3202436022",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#ccf81739487bb5c00a2b5e822f334a8b33f9b0c2",
+    "@angular/core": "github:angular/core-builds#64aa9177be9357ab4a58aa5277acae2956965d80",
+    "@angular/forms": "github:angular/forms-builds#0de9704387eefb498ab5ce6b0b48504e15c639c7",
+    "@angular/language-service": "github:angular/language-service-builds#8c195062683066f9449cab4a6bf18ad47157067f",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#5fa8e14f471fc85ea5c612d47f046bf0d8152326",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#21d1d5b87d4f1353493198d86a6af1c12a4e4fd1",
+    "@angular/router": "github:angular/router-builds#0ccef73be7f7c11b2878d44c752d6238060a4db0"
   }
 }
\ No newline at end of file

From d29cf86aa6a577dd448cf81ec717729ce0a3c11d Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 9 Jul 2019 20:18:41 +0000
Subject: [PATCH 1615/1703] build: update ajv to version 6.10.1

---
 package.json                                       | 2 +-
 packages/angular_devkit/build_angular/package.json | 2 +-
 packages/angular_devkit/core/package.json          | 2 +-
 yarn.lock                                          | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index c8f87859938e..c5080083cd12 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
     "@types/webpack-dev-server": "^3.1.0",
     "@types/webpack-sources": "^0.1.5",
     "@yarnpkg/lockfile": "1.1.0",
-    "ajv": "6.10.0",
+    "ajv": "6.10.1",
     "ansi-colors": "3.2.4",
     "common-tags": "^1.8.0",
     "conventional-changelog": "^1.1.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 464c85f5bf47..f0b5456cea81 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -12,7 +12,7 @@
     "@angular-devkit/build-webpack": "0.0.0",
     "@angular-devkit/core": "0.0.0",
     "@ngtools/webpack": "0.0.0",
-    "ajv": "6.10.0",
+    "ajv": "6.10.1",
     "autoprefixer": "9.6.1",
     "browserslist": "4.6.3",
     "caniuse-lite": "1.0.30000983",
diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json
index 25cbead03134..3c7ebdce2d98 100644
--- a/packages/angular_devkit/core/package.json
+++ b/packages/angular_devkit/core/package.json
@@ -8,7 +8,7 @@
     "core"
   ],
   "dependencies": {
-    "ajv": "6.10.0",
+    "ajv": "6.10.1",
     "fast-json-stable-stringify": "2.0.0",
     "magic-string": "0.25.3",
     "rxjs": "6.4.0",
diff --git a/yarn.lock b/yarn.lock
index d8421f067f6e..aa195cd0df62 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1009,10 +1009,10 @@ ajv-keywords@^3.1.0:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
   integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
 
-ajv@6.10.0:
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
-  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
+ajv@6.10.1:
+  version "6.10.1"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.1.tgz#ebf8d3af22552df9dd049bfbe50cc2390e823593"
+  integrity sha512-w1YQaVGNC6t2UCPjEawK/vo/dG8OOrVtUmhBT1uJJYxbl5kU2Tj3v6LGqBcsysN1yhuCStJCCA3GqdvKY8sqXQ==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"

From 885005241e50e2a1a60c9cb2c40bbf97c01be7ae Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Wed, 10 Jul 2019 09:08:06 +0200
Subject: [PATCH 1616/1703] build: update webpack to version 4.35.3

---
 .../angular_devkit/build_angular/package.json |  2 +-
 .../browser/resolve-json-module_spec_large.ts |  4 ++--
 .../angular_devkit/build_webpack/package.json |  2 +-
 packages/ngtools/webpack/package.json         |  2 +-
 yarn.lock                                     | 24 +++++++------------
 5 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index f0b5456cea81..c0d2996fb599 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -48,7 +48,7 @@
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.3.0",
-    "webpack": "4.35.2",
+    "webpack": "4.35.3",
     "webpack-dev-middleware": "3.7.0",
     "webpack-dev-server": "3.7.2",
     "webpack-merge": "4.2.1",
diff --git a/packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts
index d522120884e5..369032e49145 100644
--- a/packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/resolve-json-module_spec_large.ts
@@ -46,13 +46,13 @@ describe('Browser Builder resolve json module', () => {
 
         switch (buildCount) {
           case 1:
-            expect(content).toContain('foo":"1"');
+            expect(content).toContain('\\"foo\\":\\"1\\"');
             host.writeMultipleFiles({
               'src/my-json-file.json': `{"foo": "2"}`,
             });
             break;
           case 2:
-            expect(content).toContain('foo":"2"');
+            expect(content).toContain('\\"foo\\":\\"2\\"');
             break;
         }
 
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index 7f6e431331ed..136e3deb03ad 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -17,7 +17,7 @@
     "webpack-dev-server": "^3.1.4"
   },
   "devDependencies": {
-    "webpack": "4.35.2",
+    "webpack": "4.35.3",
     "webpack-dev-server": "^3.1.4"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 2ef336868a5b..a7b6e418c979 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -36,6 +36,6 @@
     "@angular/compiler": "~8.1.0",
     "@angular/compiler-cli": "~8.1.0",
     "typescript": "3.4.5",
-    "webpack": "4.35.2"
+    "webpack": "4.35.3"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index aa195cd0df62..7fec4952aed7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -942,11 +942,6 @@ accepts@~1.3.7:
     mime-types "~2.1.24"
     negotiator "0.6.2"
 
-acorn-dynamic-import@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
-  integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
-
 acorn-globals@^4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.2.tgz#4e2c2313a597fd589720395f6354b41cd5ec8006"
@@ -970,10 +965,10 @@ acorn@^6.0.1, acorn@^6.1.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
   integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
 
-acorn@^6.0.5:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.5.tgz#81730c0815f3f3b34d8efa95cb7430965f4d887a"
-  integrity sha512-i33Zgp3XWtmZBMNvCr4azvOFeWVw1Rk6p3hfi3LUDvIFraOMywb1kAtrbi+med14m4Xfpqm3zRZMT+c0FNE7kg==
+acorn@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.2.0.tgz#67f0da2fc339d6cfb5d6fb244fd449f33cd8bbe3"
+  integrity sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw==
 
 adm-zip@^0.4.9, adm-zip@~0.4.3:
   version "0.4.11"
@@ -11042,17 +11037,16 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.35.2:
-  version "4.35.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.35.2.tgz#5c8b8a66602cbbd6ec65c6e6747914a61c1449b1"
-  integrity sha512-TZAmorNymV4q66gAM/h90cEjG+N3627Q2MnkSgKlX/z3DlNVKUtqy57lz1WmZU2+FUZwzM+qm7cGaO95PyrX5A==
+webpack@4.35.3:
+  version "4.35.3"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.35.3.tgz#66bc35ef215a7b75e8790f84d560013ffecf0ca3"
+  integrity sha512-xggQPwr9ILlXzz61lHzjvgoqGU08v5+Wnut19Uv3GaTtzN4xBTcwnobodrXE142EL1tOiS5WVEButooGzcQzTA==
   dependencies:
     "@webassemblyjs/ast" "1.8.5"
     "@webassemblyjs/helper-module-context" "1.8.5"
     "@webassemblyjs/wasm-edit" "1.8.5"
     "@webassemblyjs/wasm-parser" "1.8.5"
-    acorn "^6.0.5"
-    acorn-dynamic-import "^4.0.0"
+    acorn "^6.2.0"
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
     chrome-trace-event "^1.0.0"

From 982bb42607752b0be15e5daccd03eff199de0709 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Wed, 10 Jul 2019 10:49:12 -0700
Subject: [PATCH 1617/1703] release: v8.2.0-next.0

---
 packages/schematics/angular/utility/latest-versions.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 17ec5cdc984a..4f467d99d1c0 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -8,17 +8,17 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~8.1.0',
+  Angular: '~8.2.0-next.0',
   RxJs: '~6.4.0',
   ZoneJs: '~0.9.1',
   TypeScript: '~3.4.3',
   TsLib: '^1.9.0',
 
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.801.0',
-  DevkitBuildNgPackagr: '~0.801.0',
-  DevkitBuildWebpack: '~0.801.0',
-  AngularPWA: '~0.801.0',
+  DevkitBuildAngular: '~0.802.0-next.0',
+  DevkitBuildNgPackagr: '~0.802.0-next.0',
+  DevkitBuildWebpack: '~0.802.0-next.0',
+  AngularPWA: '~0.802.0-next.0',
 
   tsickle: '^0.35.0',
   ngPackagr: '^5.1.0',

From 77f2af00bb6e0d8fbc018f3134ae871519dff5dd Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 10 Jul 2019 17:22:59 +0000
Subject: [PATCH 1618/1703] build: update browserslist to version 4.6.4

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 37 +++++++++++++++----
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index c0d2996fb599..7647ca720570 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -14,7 +14,7 @@
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.10.1",
     "autoprefixer": "9.6.1",
-    "browserslist": "4.6.3",
+    "browserslist": "4.6.4",
     "caniuse-lite": "1.0.30000983",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
diff --git a/yarn.lock b/yarn.lock
index 7fec4952aed7..ab1767d1bbec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1747,14 +1747,14 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@4.6.3, browserslist@^4.6.3:
-  version "4.6.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.3.tgz#0530cbc6ab0c1f3fc8c819c72377ba55cf647f05"
-  integrity sha512-CNBqTCq22RKM8wKJNowcqihHJ4SkI8CGeK7KOR9tPboXUuS5Zk5lQgzzTbs4oxD8x+6HUshZUa2OyNI9lR93bQ==
+browserslist@4.6.4:
+  version "4.6.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.4.tgz#fd0638b3f8867fec2c604ed0ed9300379f8ec7c2"
+  integrity sha512-ErJT8qGfRt/VWHSr1HeqZzz50DvxHtr1fVL1m5wf20aGrG8e1ce8fpZ2EjZEfs09DDZYSvtRaDlMpWslBf8Low==
   dependencies:
-    caniuse-lite "^1.0.30000975"
-    electron-to-chromium "^1.3.164"
-    node-releases "^1.1.23"
+    caniuse-lite "^1.0.30000981"
+    electron-to-chromium "^1.3.188"
+    node-releases "^1.1.25"
 
 browserslist@^4.0.0, browserslist@^4.3.3:
   version "4.5.5"
@@ -1765,6 +1765,15 @@ browserslist@^4.0.0, browserslist@^4.3.3:
     electron-to-chromium "^1.3.124"
     node-releases "^1.1.14"
 
+browserslist@^4.6.3:
+  version "4.6.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.3.tgz#0530cbc6ab0c1f3fc8c819c72377ba55cf647f05"
+  integrity sha512-CNBqTCq22RKM8wKJNowcqihHJ4SkI8CGeK7KOR9tPboXUuS5Zk5lQgzzTbs4oxD8x+6HUshZUa2OyNI9lR93bQ==
+  dependencies:
+    caniuse-lite "^1.0.30000975"
+    electron-to-chromium "^1.3.164"
+    node-releases "^1.1.23"
+
 browserstack@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.5.1.tgz#e2dfa66ffee940ebad0a07f7e00fd4687c455d66"
@@ -1995,7 +2004,7 @@ camelcase@^5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@1.0.30000983:
+caniuse-lite@1.0.30000983, caniuse-lite@^1.0.30000981:
   version "1.0.30000983"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000983.tgz#ab3c70061ca2a3467182a10ac75109b199b647f8"
   integrity sha512-/llD1bZ6qwNkt41AsvjsmwNOoA4ZB+8iqmf5LVyeSXuBODT/hAMFNVOh84NdUzoiYiSKqo5vQ3ZzeYHSi/olDQ==
@@ -3425,6 +3434,11 @@ electron-to-chromium@^1.3.164:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.164.tgz#8680b875577882c1572c42218d53fa9ba5f71d5d"
   integrity sha512-VLlalqUeduN4+fayVtRZvGP2Hl1WrRxlwzh2XVVMJym3IFrQUS29BFQ1GP/BxOJXJI1OFCrJ5BnFEsAe8NHtOg==
 
+electron-to-chromium@^1.3.188:
+  version "1.3.188"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.188.tgz#e28e1afe4bb229989e280bfd3b395c7ec03c8b7a"
+  integrity sha512-tEQcughYIMj8WDMc59EGEtNxdGgwal/oLLTDw+NEqJRJwGflQvH3aiyiexrWeZOETP4/ko78PVr6gwNhdozvuQ==
+
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
@@ -7163,6 +7177,13 @@ node-releases@^1.1.23:
   dependencies:
     semver "^5.3.0"
 
+node-releases@^1.1.25:
+  version "1.1.25"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.25.tgz#0c2d7dbc7fed30fbe02a9ee3007b8c90bf0133d3"
+  integrity sha512-fI5BXuk83lKEoZDdH3gRhtsNgh05/wZacuXkgbiYkceE7+QIMXOg98n9ZV7mz27B+kFHnqHcUpscZZlGRSmTpQ==
+  dependencies:
+    semver "^5.3.0"
+
 node-sass-tilde-importer@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz#1a15105c153f648323b4347693fdb0f331bad1ce"

From 1bf6b3c2a4801506544617c408fe2bbff986de40 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 11 Jul 2019 05:24:22 +0000
Subject: [PATCH 1619/1703] build: update inquirer to version 6.5.0

---
 packages/angular/cli/package.json                 |  2 +-
 .../angular_devkit/schematics_cli/package.json    |  2 +-
 yarn.lock                                         | 15 ++++++++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 2588687437b6..15018e394be6 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -34,7 +34,7 @@
     "ansi-colors": "4.1.1",
     "debug": "^4.1.1",
     "ini": "1.3.5",
-    "inquirer": "6.4.1",
+    "inquirer": "6.5.0",
     "npm-package-arg": "6.1.0",
     "open": "6.4.0",
     "pacote": "9.5.1",
diff --git a/packages/angular_devkit/schematics_cli/package.json b/packages/angular_devkit/schematics_cli/package.json
index 40fd8c462303..e53eea8f171f 100644
--- a/packages/angular_devkit/schematics_cli/package.json
+++ b/packages/angular_devkit/schematics_cli/package.json
@@ -18,7 +18,7 @@
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
     "@schematics/schematics": "0.0.0",
-    "inquirer": "6.4.1",
+    "inquirer": "6.5.0",
     "minimist": "1.2.0",
     "rxjs": "6.4.0",
     "symbol-observable": "1.2.0"
diff --git a/yarn.lock b/yarn.lock
index ab1767d1bbec..06bd6c064d00 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5109,10 +5109,10 @@ injection-js@^2.2.1:
   resolved "https://registry.yarnpkg.com/injection-js/-/injection-js-2.2.1.tgz#a8d6a085b2f0b8d8650f6f4487f6abb8cc0d67ce"
   integrity sha512-zHI+E+dM0PXix5FFTO1Y4/UOyAzE7zG1l/QwAn4jchTThOoBq+UYRFK4AVG7lQgFL+go62SbrzSsjXy9DFEZUg==
 
-inquirer@6.4.1:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.4.1.tgz#7bd9e5ab0567cd23b41b0180b68e0cfa82fc3c0b"
-  integrity sha512-/Jw+qPZx4EDYsaT6uz7F4GJRNFMRdKNeUZw3ZnKV8lyuUgz/YWRCSUAJMZSVhSq4Ec0R2oYnyi6b3d4JXcL5Nw==
+inquirer@6.5.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.0.tgz#2303317efc9a4ea7ec2e2df6f86569b734accf42"
+  integrity sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA==
   dependencies:
     ansi-escapes "^3.2.0"
     chalk "^2.4.2"
@@ -5120,7 +5120,7 @@ inquirer@6.4.1:
     cli-width "^2.0.0"
     external-editor "^3.0.3"
     figures "^2.0.0"
-    lodash "^4.17.11"
+    lodash "^4.17.12"
     mute-stream "0.0.7"
     run-async "^2.2.0"
     rxjs "^6.4.0"
@@ -6408,6 +6408,11 @@ lodash@^4.17.10, lodash@^4.17.4, lodash@^4.2.1:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
   integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==
 
+lodash@^4.17.12:
+  version "4.17.14"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba"
+  integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==
+
 log4js@^3.0.0:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.6.tgz#e6caced94967eeeb9ce399f9f8682a4b2b28c8ff"

From 6d6db15846ea2bd45bb95683fd77df03ffb73751 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 11 Jul 2019 23:15:55 +0000
Subject: [PATCH 1620/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index dd63f4946c81..5b93d77d1558 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#1e2eb2bd302bc661c55dbd2d1934f00bbf2ee34a",
-    "@angular/common": "github:angular/common-builds#1898b80926083e20c0bcd990ce654ba583846742",
-    "@angular/compiler": "github:angular/compiler-builds#05398e918add23daa627549909aadf3202436022",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#ccf81739487bb5c00a2b5e822f334a8b33f9b0c2",
-    "@angular/core": "github:angular/core-builds#64aa9177be9357ab4a58aa5277acae2956965d80",
-    "@angular/forms": "github:angular/forms-builds#0de9704387eefb498ab5ce6b0b48504e15c639c7",
-    "@angular/language-service": "github:angular/language-service-builds#8c195062683066f9449cab4a6bf18ad47157067f",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#5fa8e14f471fc85ea5c612d47f046bf0d8152326",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#21d1d5b87d4f1353493198d86a6af1c12a4e4fd1",
-    "@angular/router": "github:angular/router-builds#0ccef73be7f7c11b2878d44c752d6238060a4db0"
+    "@angular/animations": "github:angular/animations-builds#c9327cddc787ae44ea2fcda72f9e95609b3ac37a",
+    "@angular/common": "github:angular/common-builds#4e5c45ccd94c7adbc123f8fed1b74143702d4184",
+    "@angular/compiler": "github:angular/compiler-builds#27aec5d9dea44e2fada397ae6bc327ee987556e3",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#d5445a9985dc6b0a4aeef1aabc88e62db8f79c20",
+    "@angular/core": "github:angular/core-builds#696341672e26b7008ab8b3deb8226eac3104c876",
+    "@angular/forms": "github:angular/forms-builds#23d95dbc3ac1d2bf1a0c7ad98f82302da39275d9",
+    "@angular/language-service": "github:angular/language-service-builds#206af4f2783252feae3440431c47566f534d6a06",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#be431cf510fe9d2bdbcbf3d25f546033c099d057",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#131670d9be96ce688030b0c7557133176de6b888",
+    "@angular/router": "github:angular/router-builds#a11f2ccf91cac795be25eec5b20b7685c090e523"
   }
 }
\ No newline at end of file

From 38f5eeeebfca6af13f28ed7ea930279ebf8e1261 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 8 Jul 2019 19:00:26 -0400
Subject: [PATCH 1621/1703] ci: CircleCI configuration cleanup using 2.1
 features

---
 .circleci/config.yml | 336 +++++++++++++++++++++----------------------
 1 file changed, 164 insertions(+), 172 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a262535ecd4b..28976f7a85f9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,101 +7,129 @@
 # To validate changes, use an online parser, eg.
 # http://yaml-online-parser.appspot.com/
 
+version: 2.1
+
 # Variables
 
 ## IMPORTANT
 # If you change the cache key prefix, also sync the restore_cache fallback to match.
 # Keep the static part of the cache key as prefix to enable correct fallbacks.
 # See https://circleci.com/docs/2.0/caching/#restoring-cache for how prefixes work in CircleCI.
-var_1: &default_docker_image circleci/node:12.1
-var_2: &browsers_docker_image circleci/node:12.1-browsers
-var_3: &browsers_docker_image_node_10 circleci/node:10.12-browsers
-var_4: &cache_key angular_devkit-0.11.0-{{ checksum "yarn.lock" }}
-
-# Settings common to each job
-anchor_1: &defaults
-  working_directory: ~/ng
-  docker:
-    - image: *default_docker_image
-anchor_1_win: &defaults_win
-  working_directory: ~/ng
-  resource_class: windows.medium
-  shell: powershell.exe -ExecutionPolicy Bypass
-  machine:
-    image: windows-server-2019
-
-# After checkout, rebase on top of target branch.
-anchor_2: &post_checkout
-  run:
-    name: Rebase PR on target branch
-    command: >
-      if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then
-        # User is required for rebase.
-        git config user.name "angular-ci"
-        git config user.email "angular-ci"
-        # Rebase PR on top of target branch.
-        node tools/rebase-pr.js angular/angular-cli ${CIRCLE_PR_NUMBER}
-      else
-        echo "This build is not over a PR, nothing to do."
-      fi
-anchor_2_win: &post_checkout_win
-  run:
-    name: Rebase PR on target branch
-    command: >
-      if (Test-Path env:CIRCLE_PR_NUMBER) {
-        git config user.name "angular-ci"
-        git config user.email "angular-ci"
-        node tools\rebase-pr.js angular/angular-cli $env:CIRCLE_PR_NUMBER }
-anchor_3: &restore_cache
-  restore_cache:
-    keys:
-      - *cache_key
-      # This fallback should be the cache_key without variables.
-      - angular_devkit-0.11.0-
-anchor_4: &attach_options
+var_1: &cache_key angular_devkit-0.11.0-{{ checksum "yarn.lock" }}
+var_2: &default_nodeversion "12.1"
+var_3: &attach_options
   at: .
-anchor_5: &env_win
-  run:
-    # Need to install node and yarn before, as the base windows image doesn't have anything.
-    # TODO: remove when CircleCI provides preconfigured node images/VMs.
-    name: Setup windows node environment
-    command: ./.circleci/windows-env.ps1
-anchor_6: &ignore_pull_requests
+var_4: &ignore_pull_requests
   filters:
     branches:
       ignore:
         - /pull\/.*/
-anchor_7: &setup_bazel_remote_execution
-  run:
-    name: "Setup bazel RBE remote execution"
-    command: |
-      touch .bazelrc.user;
-      # We need ensure that the same default digest is used for encoding and decoding
-      # with openssl. Openssl versions might have different default digests which can
-      # cause decryption failures based on the openssl version. https://stackoverflow.com/a/39641378/4317734
-      openssl aes-256-cbc -d -in .circleci/gcp_token -md md5 -k "${CIRCLE_PROJECT_REPONAME}" -out /home/circleci/.gcp_credentials;
-      sudo bash -c "echo -e 'build --google_credentials=/home/circleci/.gcp_credentials' >> .bazelrc.user";
-      # Upload/don't upload local results to cache based on environment
-      if [[ -n "{$CIRCLE_PR_NUMBER}" ]]; then
-        sudo bash -c "echo -e 'build:remote --remote_upload_local_results=false\n' >> .bazelrc.user";
-        echo "Not uploading local build results to remote cache.";
-      else
-        sudo bash -c "echo -e 'build:remote --remote_upload_local_results=true\n' >> .bazelrc.user";
-        echo "Uploading local build results to remote cache.";
-      fi
-      # Enable remote builds
-      sudo bash -c "echo -e 'build --config=remote' >> .bazelrc.user";
-      echo "Reading from remote cache for bazel remote jobs.";
+
+# Executor Definitions
+# https://circleci.com/docs/2.0/reusing-config/#authoring-reusable-executors
+executors:
+  action-executor:
+    parameters:
+      nodeversion:
+        type: string
+        default: *default_nodeversion
+    docker:
+      - image: circleci/node:<< parameters.nodeversion >>
+    working_directory: ~/ng
+
+  test-executor:
+    parameters:
+      nodeversion:
+        type: string
+        default: *default_nodeversion
+    docker:
+      - image: circleci/node:<< parameters.nodeversion >>-browsers
+    working_directory: ~/ng
+    environment:
+      BASH_ENV: ~/.profile
+      NPM_CONFIG_PREFIX: ~/.npm-global
+    resource_class: xlarge
+
+  windows-executor:
+    working_directory: ~/ng
+    resource_class: windows.medium
+    shell: powershell.exe -ExecutionPolicy Bypass
+    machine:
+      image: windows-server-2019
+
+# Command Definitions
+# https://circleci.com/docs/2.0/reusing-config/#authoring-reusable-commands
+commands:
+  setup_windows:
+    steps:     
+      - checkout
+      - run:
+          # Need to install node and yarn before, as the base windows image doesn't have anything.
+          # TODO: remove when CircleCI provides preconfigured node images/VMs.
+          name: Setup windows node environment
+          command: ./.circleci/windows-env.ps1
+      # TODO: remove commands other than the e2e runner when workspaces on windows are well supported.
+      - run:
+          name: Rebase PR on target branch
+          command: >
+            if (Test-Path env:CIRCLE_PR_NUMBER) {
+              git config user.name "angular-ci"
+              git config user.email "angular-ci"
+              node tools\rebase-pr.js angular/angular-cli $env:CIRCLE_PR_NUMBER }
+      - run: node --version
+      - run: yarn --version
+      - run: yarn install --frozen-lockfile
+
+  setup_bazel_rbe:
+    parameters:
+      key:
+        type: env_var_name
+        default: CIRCLE_PROJECT_REPONAME
+    steps:
+      - run:
+          name: "Setup bazel RBE remote execution"
+          command: |
+            touch .bazelrc.user;
+            # We need ensure that the same default digest is used for encoding and decoding
+            # with openssl. Openssl versions might have different default digests which can
+            # cause decryption failures based on the openssl version. https://stackoverflow.com/a/39641378/4317734
+            openssl aes-256-cbc -d -in .circleci/gcp_token -md md5 -k "${<< parameters.key >>}" -out /home/circleci/.gcp_credentials;
+            sudo bash -c "echo -e 'build --google_credentials=/home/circleci/.gcp_credentials' >> .bazelrc.user";
+            # Upload/don't upload local results to cache based on environment
+            if [[ -n "{$CIRCLE_PR_NUMBER}" ]]; then
+              sudo bash -c "echo -e 'build:remote --remote_upload_local_results=false\n' >> .bazelrc.user";
+              echo "Not uploading local build results to remote cache.";
+            else
+              sudo bash -c "echo -e 'build:remote --remote_upload_local_results=true\n' >> .bazelrc.user";
+              echo "Uploading local build results to remote cache.";
+            fi
+            # Enable remote builds
+            sudo bash -c "echo -e 'build --config=remote' >> .bazelrc.user";
+            echo "Reading from remote cache for bazel remote jobs.";
 
 # Job definitions
-version: 2.1
 jobs:
   install:
-    <<: *defaults
+    executor: action-executor
     steps:
       - checkout
-      - *post_checkout
-      - *restore_cache
+      - run:
+          name: Rebase PR on target branch
+          command: >
+            if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then
+              # User is required for rebase.
+              git config user.name "angular-ci"
+              git config user.email "angular-ci"
+              # Rebase PR on top of target branch.
+              node tools/rebase-pr.js angular/angular-cli ${CIRCLE_PR_NUMBER}
+            else
+              echo "This build is not over a PR, nothing to do."
+            fi
+      - restore_cache:
+          keys:
+            - *cache_key
+            # This fallback should be the cache_key without variables.
+            - angular_devkit-0.11.0-
       - run: yarn install --frozen-lockfile
       - persist_to_workspace:
           root: .
@@ -113,7 +141,7 @@ jobs:
             - ~/.cache/yarn
 
   lint:
-    <<: *defaults
+    executor: action-executor
     steps:
       - attach_workspace: *attach_options
       - run: yarn lint
@@ -124,113 +152,77 @@ jobs:
               (echo -e "\n.bzl files have lint errors. Please run ''yarn bazel:lint-fix''"; exit 1)'
 
   validate:
-    <<: *defaults
+    executor: action-executor
     steps:
       - attach_workspace: *attach_options
       - run: yarn validate --ci
 
   test:
-    <<: *defaults
+    executor: action-executor
     steps:
       - attach_workspace: *attach_options
-      - run: yarn test -- --full
+      - run: yarn test --full
 
   test-large:
-    <<: *defaults
-    docker:
-      - image: *browsers_docker_image
-    resource_class: large
-    parallelism: 4
-    steps:
-      - attach_workspace: *attach_options
-      - run: yarn webdriver-update
-      - run: yarn test-large --full --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
-
-  test-large-ivy:
-    <<: *defaults
-    docker:
-      - image: *browsers_docker_image
+    parameters:
+      ivy:
+        type: boolean
+        default: false
+      glob:
+        type: string
+        default: ""
+    executor: test-executor
     resource_class: large
     parallelism: 4
     steps:
       - attach_workspace: *attach_options
       - run: yarn webdriver-update
-      - run: yarn test-large --ivy --full --glob="packages/angular_devkit/build_angular/test/browser/*_spec_large.ts" --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
+      - run: yarn test-large --full <<# parameters.ivy >>--ivy<</ parameters.ivy >> <<# parameters.glob >>--glob="<< parameters.glob >>"<</ parameters.glob >> --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
 
   e2e-cli:
-    <<: *defaults
-    docker:
-      - image: *browsers_docker_image
-    environment:
-      BASH_ENV: ~/.profile
-      NPM_CONFIG_PREFIX: ~/.npm-global
-    resource_class: xlarge
+    parameters:
+      ivy:
+        type: boolean
+        default: false
+      snapshots:
+        type: boolean
+        default: false
+    executor: test-executor
     parallelism: 4
     steps:
       - attach_workspace: *attach_options
-      - run: PATH=~/.npm-global/bin:$PATH xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
-      - store_artifacts:
-          path: /tmp/dist
-          destination: cli/new-production
+      - run:
+          name: Execute CLI E2E Tests
+          command: PATH=~/.npm-global/bin:$PATH node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} <<# parameters.ivy >>--ivy<</ parameters.ivy >> <<# parameters.snapshots >>--ng-snapshots<</ parameters.snapshots >>
 
   e2e-cli-node-10:
-    <<: *defaults
-    docker:
-      - image: *browsers_docker_image_node_10
-    environment:
-      BASH_ENV: ~/.profile
-      NPM_CONFIG_PREFIX: ~/.npm-global
-    resource_class: xlarge
+    executor:
+      name: test-executor
+      nodeversion: "10.12"
     parallelism: 4
     steps:
       - attach_workspace: *attach_options
       # Ensure latest npm version to support local package repository
       - run: PATH=~/.npm-global/bin:$PATH npm install --global npm
-      - run: PATH=~/.npm-global/bin:$PATH xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
-
-  e2e-cli-ivy:
-    <<: *defaults
-    docker:
-      - image: *browsers_docker_image
-    environment:
-      BASH_ENV: ~/.profile
-      NPM_CONFIG_PREFIX: ~/.npm-global
-    resource_class: xlarge
-    parallelism: 4
-    steps:
-      - attach_workspace: *attach_options
-      - run: PATH=~/.npm-global/bin:$PATH xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} --ivy
-
-  e2e-cli-ng-snapshots:
-    <<: *defaults
-    docker:
-      - image: *browsers_docker_image
-    environment:
-      BASH_ENV: ~/.profile
-      NPM_CONFIG_PREFIX: ~/.npm-global
-    resource_class: xlarge
-    parallelism: 4
-    steps:
-      - attach_workspace: *attach_options
-      - run: PATH=~/.npm-global/bin:$PATH xvfb-run -a node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} --ng-snapshots
+      - run: PATH=~/.npm-global/bin:$PATH node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
 
   build:
-    <<: *defaults
+    executor: action-executor
     steps:
       - attach_workspace: *attach_options
-      - run: yarn admin -- build
+      - run: yarn build
 
   build-bazel:
-    <<: *defaults
+    executor: action-executor
     resource_class: xlarge
     steps:
       - attach_workspace: *attach_options
-      - *setup_bazel_remote_execution
+      - setup_bazel_rbe
       - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
       - run: yarn bazel:test
 
   snapshot_publish:
-    <<: *defaults
+    executor: action-executor
     steps:
       - attach_workspace: *attach_options
       - run:
@@ -243,10 +235,10 @@ jobs:
       - run:
           name: Deployment to Snapshot
           command: |
-            yarn admin -- snapshots --verbose --githubTokenFile=${HOME}/github_token
+            yarn admin snapshots --verbose --githubTokenFile=${HOME}/github_token
 
   publish:
-    <<: *defaults
+    executor: action-executor
     steps:
       - attach_workspace: *attach_options
       - run:
@@ -256,13 +248,13 @@ jobs:
       - run:
           name: Deployment to NPM
           command: |
-            yarn admin -- publish --verbose
+            yarn admin publish --verbose
 
   # Windows jobs
   # CircleCI support for Windows jobs is still in preview.
   # Docs: https://github.com/CircleCI-Public/windows-preview-docs
   test-win:
-    <<: *defaults_win
+    executor: windows-executor
     # Skipping cache and workspace for now because it takes 10x longer than on linux.
     # TODO: when/if CircleCI makes them faster, use cache and workspaces fully.
     # Notes:
@@ -270,31 +262,20 @@ jobs:
     # - windows might need its own workspace for the same reason.
     # - get cache dir on windows via `yarn cache dir` (was `C:\Users\circleci\AppData\Local\Yarn\Cache\v4` last time)
     steps:
-      - checkout
-      - *env_win
-      - *post_checkout_win
-      - run: node --version
-      - run: yarn --version
-      - run: yarn install --frozen-lockfile
+      - setup_windows
       # Build and test should be on their own jobs, but restoring workspaces is too slow
       # so we do it here.
-      - run: yarn admin -- build
-      - run: yarn test -- --full
+      - run: yarn build
+      - run: yarn test --full
       # Run partial e2e suite on PRs only. Master will run the full e2e suite with sharding.
       - run: if (Test-Path env:CIRCLE_PR_NUMBER) { node tests\legacy-cli\run_e2e.js "--glob=tests/{basic,ivy}/**" }
              
   e2e-cli-win:
-    <<: *defaults_win
+    executor: windows-executor
     parallelism: 4
-    steps:     
-      - checkout
-      - *env_win
-      # TODO: remove commands other than the e2e runner when workspaces on windows are well supported.
-      - *post_checkout_win
-      - run: node --version
-      - run: yarn --version
-      - run: yarn install --frozen-lockfile
-      - run: yarn admin -- build
+    steps:
+      - setup_windows
+      - run: yarn build
       - run: node tests\legacy-cli\run_e2e.js --nb-shards=$env:CIRCLE_NODE_TOTAL --shard=$env:CIRCLE_NODE_INDEX
 
 workflows:
@@ -327,16 +308,27 @@ workflows:
       - test-large:
           requires:
             - build
-      - test-large-ivy:
+      - test-large:
+          name: test-large-ivy
+          ivy: true
+          glob: "packages/angular_devkit/build_angular/test/browser/*_spec_large.ts"
           requires:
             - build
       - e2e-cli:
+          post-steps:
+            - store_artifacts:
+                path: /tmp/dist
+                destination: cli/new-production
           requires:
             - build
-      - e2e-cli-ivy:
+      - e2e-cli:
+          name: e2e-cli-ivy
+          ivy: true
           requires:
             - build
-      - e2e-cli-ng-snapshots:
+      - e2e-cli:
+          name: e2e-cli-ng-snapshots
+          snapshots: true
           <<: *ignore_pull_requests
           requires:
             - e2e-cli

From 515e67eb14ac0486a3f630580546fde82a853dbf Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 9 Jul 2019 12:31:52 -0400
Subject: [PATCH 1622/1703] ci: introduce SauceLabs environment variables

---
 .circleci/config.yml         | 12 ++++--
 .circleci/env-helpers.inc.sh | 73 ++++++++++++++++++++++++++++++++++++
 .circleci/env.sh             | 33 ++++++++++++++++
 3 files changed, 115 insertions(+), 3 deletions(-)
 create mode 100644 .circleci/env-helpers.inc.sh
 create mode 100755 .circleci/env.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 28976f7a85f9..3b098810cd51 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -46,7 +46,6 @@ executors:
       - image: circleci/node:<< parameters.nodeversion >>-browsers
     working_directory: ~/ng
     environment:
-      BASH_ENV: ~/.profile
       NPM_CONFIG_PREFIX: ~/.npm-global
     resource_class: xlarge
 
@@ -191,6 +190,9 @@ jobs:
     parallelism: 4
     steps:
       - attach_workspace: *attach_options
+      - run:
+          name: Initialize Environment
+          command: ./.circleci/env.sh
       - run:
           name: Execute CLI E2E Tests
           command: PATH=~/.npm-global/bin:$PATH node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} <<# parameters.ivy >>--ivy<</ parameters.ivy >> <<# parameters.snapshots >>--ng-snapshots<</ parameters.snapshots >>
@@ -202,8 +204,12 @@ jobs:
     parallelism: 4
     steps:
       - attach_workspace: *attach_options
-      # Ensure latest npm version to support local package repository
-      - run: PATH=~/.npm-global/bin:$PATH npm install --global npm
+      - run:
+          name: Initialize Environment
+          command: |
+            ./.circleci/env.sh
+            # Ensure latest npm version to support local package repository
+            PATH=~/.npm-global/bin:$PATH npm install --global npm
       - run: PATH=~/.npm-global/bin:$PATH node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
 
   build:
diff --git a/.circleci/env-helpers.inc.sh b/.circleci/env-helpers.inc.sh
new file mode 100644
index 000000000000..5fa1263e112f
--- /dev/null
+++ b/.circleci/env-helpers.inc.sh
@@ -0,0 +1,73 @@
+####################################################################################################
+# Helpers for defining environment variables for CircleCI.
+#
+# In CircleCI, each step runs in a new shell. The way to share ENV variables across steps is to
+# export them from `$BASH_ENV`, which is automatically sourced at the beginning of every step (for
+# the default `bash` shell).
+#
+# See also https://circleci.com/docs/2.0/env-vars/#using-bash_env-to-set-environment-variables.
+####################################################################################################
+
+# Set and print an environment variable.
+#
+# Use this function for setting environment variables that are public, i.e. it is OK for them to be
+# visible to anyone through the CI logs.
+#
+# Usage: `setPublicVar <name> <value>`
+function setPublicVar() {
+  setSecretVar $1 "$2";
+  echo "$1=$2";
+}
+
+# Set (without printing) an environment variable.
+#
+# Use this function for setting environment variables that are secret, i.e. should not be visible to
+# everyone through the CI logs.
+#
+# Usage: `setSecretVar <name> <value>`
+function setSecretVar() {
+  # WARNING: Secrets (e.g. passwords, access tokens) should NOT be printed.
+  # (Keep original shell options to restore at the end.)
+  local -r originalShellOptions=$(set +o);
+  set +x -eu -o pipefail;
+
+  echo "export $1=\"${2:-}\";" >> $BASH_ENV;
+
+  # Restore original shell options.
+  eval "$originalShellOptions";
+}
+
+
+# Create a function to set an environment variable, when called.
+#
+# Use this function for creating setter for public environment variables that require expensive or
+# time-consuming computaions and may not be needed. When needed, you can call this function to set
+# the environment variable (which will be available through `$BASH_ENV` from that point onwards).
+#
+# Arguments:
+# - `<name>`: The name of the environment variable. The generated setter function will be
+#   `setPublicVar_<name>`.
+# - `<code>`: The code to run to compute the value for the variable. Since this code should be
+#   executed lazily, it must be properly escaped. For example:
+#   ```sh
+#   # DO NOT do this:
+#   createPublicVarSetter MY_VAR "$(whoami)";  # `whoami` will be evaluated eagerly
+#
+#   # DO this isntead:
+#   createPublicVarSetter MY_VAR "\$(whoami)";  # `whoami` will NOT be evaluated eagerly
+#   ```
+#
+# Usage: `createPublicVarSetter <name> <code>`
+#
+# Example:
+# ```sh
+# createPublicVarSetter MY_VAR 'echo "FOO"';
+# echo $MY_VAR;  # Not defined
+#
+# setPublicVar_MY_VAR;
+# source $BASH_ENV;
+# echo $MY_VAR;  # FOO
+# ```
+function createPublicVarSetter() {
+  echo "setPublicVar_$1() { setPublicVar $1 \"$2\"; }" >> $BASH_ENV;
+}
diff --git a/.circleci/env.sh b/.circleci/env.sh
new file mode 100755
index 000000000000..49c0ab18326a
--- /dev/null
+++ b/.circleci/env.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+# Variables
+readonly projectDir=$(realpath "$(dirname ${BASH_SOURCE[0]})/..")
+readonly envHelpersPath="$projectDir/.circleci/env-helpers.inc.sh";
+
+# Load helpers and make them available everywhere (through `$BASH_ENV`).
+source $envHelpersPath;
+echo "source $envHelpersPath;" >> $BASH_ENV;
+
+
+####################################################################################################
+# Define PUBLIC environment variables for CircleCI.
+####################################################################################################
+# See https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables for more info.
+####################################################################################################
+setPublicVar PROJECT_ROOT "$projectDir";
+
+####################################################################################################
+# Define SauceLabs environment variables for CircleCI.
+####################################################################################################
+setPublicVar SAUCE_USERNAME "angular-ci";
+setSecretVar SAUCE_ACCESS_KEY "9b988f434ff8-fbca-8aa4-4ae3-35442987";
+setPublicVar SAUCE_LOG_FILE /tmp/angular/sauce-connect.log
+setPublicVar SAUCE_READY_FILE /tmp/angular/sauce-connect-ready-file.lock
+setPublicVar SAUCE_PID_FILE /tmp/angular/sauce-connect-pid-file.lock
+setPublicVar SAUCE_TUNNEL_IDENTIFIER "angular-${CIRCLE_BUILD_NUM}-${CIRCLE_NODE_INDEX}"
+# Amount of seconds we wait for sauceconnect to establish a tunnel instance. In order to not
+# acquire CircleCI instances for too long if sauceconnect failed, we need a connect timeout.
+setPublicVar SAUCE_READY_FILE_TIMEOUT 120
+
+# Source `$BASH_ENV` to make the variables available immediately.
+source $BASH_ENV;

From afdd2111a42830f52fc7b1e3fa2c0211c44816f8 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 9 Jul 2019 13:28:30 -0400
Subject: [PATCH 1623/1703] test: control E2E environment logging

---
 tests/legacy-cli/e2e/setup/300-log-environment.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/legacy-cli/e2e/setup/300-log-environment.ts b/tests/legacy-cli/e2e/setup/300-log-environment.ts
index 7048e06e3240..ab60477ba4ca 100644
--- a/tests/legacy-cli/e2e/setup/300-log-environment.ts
+++ b/tests/legacy-cli/e2e/setup/300-log-environment.ts
@@ -4,6 +4,12 @@ export default async function() {
   console.log('Environment:');
 
   Object.keys(process.env).forEach(envName => {
+    // CI Logs should not contain environment variables that are considered secret
+    const lowerName = envName.toLowerCase();
+    if (lowerName.includes('key') || lowerName.includes('secret')) {
+      return;
+    }
+
     console.log(`  ${envName}: ${process.env[envName].replace(/[\n\r]+/g, '\n        ')}`);
   });
 

From 2676c2d86a5640a9f7bfefb6c20a9e395b009f58 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Tue, 9 Jul 2019 09:04:43 +0200
Subject: [PATCH 1624/1703] refactor(@angular-devkit/build-optimizer): refactor
 wrap enums

Most of the logic that can find class statements to wrap can be used to wrap Enums, with the exception of TS 2.3+ enums which is slightly different.

This PR combines the enums and classes lookup logic and also simplifies the TS 2.3+ enum lookup logic
---
 .../src/transforms/wrap-enums.ts              | 277 ++++--------------
 1 file changed, 61 insertions(+), 216 deletions(-)

diff --git a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
index ac5c0ed97a0c..de60bd585e30 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
@@ -104,46 +104,30 @@ function visitBlockStatements(
             // skip IIFE statement
             oIndex++;
           }
-        } else if (ts.isObjectLiteralExpression(initializer)
-                   && initializer.properties.length === 0) {
-          const enumStatements = findTs2_2EnumStatements(name, statements, oIndex + 1);
-          if (enumStatements.length > 0) {
-            // create wrapper and replace variable statement and enum member statements
-            oldStatementsLength = enumStatements.length + 1;
-            newStatement = createWrappedEnum(
-              name,
-              currentStatement,
-              enumStatements,
-              initializer,
-            );
-            // skip enum member declarations
-            oIndex += enumStatements.length;
-          }
-        } else if (ts.isObjectLiteralExpression(initializer)
-          && initializer.properties.length !== 0) {
-          const literalPropertyCount = initializer.properties.length;
-
+        } else if (ts.isObjectLiteralExpression(initializer)) {
           // tsickle es2015 enums first statement is an export declaration
           const isPotentialEnumExport = ts.isExportDeclaration(statements[oIndex + 1]);
           if (isPotentialEnumExport) {
             // skip the export
-            oIndex ++;
+            oIndex++;
           }
 
-          const enumStatements = findEnumNameStatements(name, statements, oIndex + 1);
-          if (enumStatements.length === literalPropertyCount) {
-            // create wrapper and replace variable statement and enum member statements
-            oldStatementsLength = enumStatements.length + (isPotentialEnumExport ? 2 : 1);
-            newStatement = createWrappedEnum(
-              name,
-              currentStatement,
-              enumStatements,
-              initializer,
-              isPotentialEnumExport,
-            );
-            // skip enum member declarations
-            oIndex += enumStatements.length;
+          const enumStatements = findStatements(name, statements, oIndex + 1);
+          if (!enumStatements) {
+            continue;
           }
+
+          // create wrapper and replace variable statement and enum member statements
+          oldStatementsLength = enumStatements.length + (isPotentialEnumExport ? 2 : 1);
+          newStatement = createWrappedEnum(
+            name,
+            currentStatement,
+            enumStatements,
+            initializer,
+            isPotentialEnumExport,
+          );
+          // skip enum member declarations
+          oIndex += enumStatements.length;
         } else if (
           ts.isClassExpression(initializer)
           || (
@@ -151,7 +135,7 @@ function visitBlockStatements(
             && ts.isClassExpression(initializer.right)
           )
         ) {
-          const classStatements = findClassStatements(name, statements, oIndex);
+          const classStatements = findStatements(name, statements, oIndex);
           if (!classStatements) {
             continue;
           }
@@ -167,7 +151,7 @@ function visitBlockStatements(
       }
     } else if (ts.isClassDeclaration(currentStatement)) {
       const name = (currentStatement.name as ts.Identifier).text;
-      const classStatements = findClassStatements(name, statements, oIndex);
+      const classStatements = findStatements(name, statements, oIndex);
       if (!classStatements) {
         continue;
       }
@@ -215,31 +199,43 @@ function findTs2_3EnumIife(
     return null;
   }
 
-  let expression = statement.expression;
-  while (ts.isParenthesizedExpression(expression)) {
-    expression = expression.expression;
-  }
-
+  const expression = statement.expression;
   if (!expression || !ts.isCallExpression(expression) || expression.arguments.length !== 1) {
     return null;
   }
 
   const callExpression = expression;
-  let exportExpression;
+  let exportExpression: ts.Expression | undefined;
 
-  let argument = expression.arguments[0];
-  if (!ts.isBinaryExpression(argument)) {
+  if (!ts.isParenthesizedExpression(callExpression.expression)) {
+    return null;
+  }
+
+  const functionExpression = callExpression.expression.expression;
+  if (!ts.isFunctionExpression(functionExpression)) {
+    return null;
+  }
+
+  // The name of the parameter can be different than the name of the enum if it was renamed
+  // due to scope hoisting.
+  const parameter = functionExpression.parameters[0];
+  if (!ts.isIdentifier(parameter.name)) {
     return null;
   }
+  const parameterName = parameter.name.text;
 
-  if (!ts.isIdentifier(argument.left) || argument.left.text !== name) {
+  let argument = callExpression.arguments[0];
+  if (
+    !ts.isBinaryExpression(argument)
+    || !ts.isIdentifier(argument.left)
+    || argument.left.text !== name
+  ) {
     return null;
   }
 
   let potentialExport = false;
   if (argument.operatorToken.kind === ts.SyntaxKind.FirstAssignment) {
-    if (!ts.isBinaryExpression(argument.right)
-        || argument.right.operatorToken.kind !== ts.SyntaxKind.BarBarToken) {
+    if (ts.isBinaryExpression(argument.right) && argument.right.operatorToken.kind !== ts.SyntaxKind.BarBarToken) {
       return null;
     }
 
@@ -259,75 +255,18 @@ function findTs2_3EnumIife(
     exportExpression = argument.left;
   }
 
-  expression = expression.expression;
-  while (ts.isParenthesizedExpression(expression)) {
-    expression = expression.expression;
-  }
-
-  if (!expression || !ts.isFunctionExpression(expression) || expression.parameters.length !== 1) {
-    return null;
-  }
-
-  const parameter = expression.parameters[0];
-  if (!ts.isIdentifier(parameter.name)) {
-    return null;
-  }
-
-  // The name of the parameter can be different than the name of the enum if it was renamed
-  // due to scope hoisting.
-  const parameterName = parameter.name.text;
-
-  // In TS 2.3 enums, the IIFE contains only expressions with a certain format.
-  // If we find any that is different, we ignore the whole thing.
-  for (let bodyIndex = 0; bodyIndex < expression.body.statements.length; ++bodyIndex) {
-    const bodyStatement = expression.body.statements[bodyIndex];
-
-    if (!ts.isExpressionStatement(bodyStatement) || !bodyStatement.expression) {
-      return null;
-    }
-
-    if (!ts.isBinaryExpression(bodyStatement.expression)
-        || bodyStatement.expression.operatorToken.kind !== ts.SyntaxKind.FirstAssignment) {
-      return null;
-    }
-
-    const assignment = bodyStatement.expression.left;
-    const value = bodyStatement.expression.right;
-    if (!ts.isElementAccessExpression(assignment) || !ts.isStringLiteral(value)) {
-      return null;
-    }
-
-    if (!ts.isIdentifier(assignment.expression) || assignment.expression.text !== parameterName) {
-      return null;
-    }
-
-    const memberArgument = assignment.argumentExpression;
-    // String enum
-    if (ts.isStringLiteral(memberArgument)) {
-      return [callExpression, exportExpression];
-    }
-
-    // Non string enums
-    if (!ts.isBinaryExpression(memberArgument)
-      || memberArgument.operatorToken.kind !== ts.SyntaxKind.FirstAssignment) {
-      return null;
-    }
-
-    if (!ts.isElementAccessExpression(memberArgument.left)) {
-      return null;
-    }
-
-    if (!ts.isIdentifier(memberArgument.left.expression)
-      || memberArgument.left.expression.text !== parameterName) {
-      return null;
+  // Go through all the statements and check that all match the name
+  for (const statement of functionExpression.body.statements) {
+    if (
+      !ts.isExpressionStatement(statement)
+      || !ts.isBinaryExpression(statement.expression)
+      || !ts.isElementAccessExpression(statement.expression.left)
+    ) {
+      return null
     }
 
-    if (!memberArgument.left.argumentExpression
-        || !ts.isStringLiteral(memberArgument.left.argumentExpression)) {
-      return null;
-    }
-
-    if (memberArgument.left.argumentExpression.text !== value.text) {
+    const leftExpression = statement.expression.left.expression;
+    if (!ts.isIdentifier(leftExpression) || leftExpression.text !== parameterName) {
       return null;
     }
   }
@@ -335,101 +274,6 @@ function findTs2_3EnumIife(
   return [callExpression, exportExpression];
 }
 
-// TS 2.2 enums have statements after the variable declaration, with index statements followed
-// by value statements.
-function findTs2_2EnumStatements(
-  name: string,
-  statements: ts.NodeArray<ts.Statement>,
-  statementOffset: number,
-): ts.Statement[] {
-  const enumValueStatements: ts.Statement[] = [];
-  const memberNames: string[] = [];
-
-  let index = statementOffset;
-  for (; index < statements.length; ++index) {
-    // Ensure all statements are of the expected format and using the right identifer.
-    // When we find a statement that isn't part of the enum, return what we collected so far.
-    const current = statements[index];
-    if (!ts.isExpressionStatement(current) || !ts.isBinaryExpression(current.expression)) {
-      break;
-    }
-
-    const property = current.expression.left;
-    if (!property || !ts.isPropertyAccessExpression(property)) {
-      break;
-    }
-
-    if (!ts.isIdentifier(property.expression) || property.expression.text !== name) {
-      break;
-    }
-
-    memberNames.push(property.name.text);
-    enumValueStatements.push(current);
-  }
-
-  if (enumValueStatements.length === 0) {
-    return [];
-  }
-
-  const enumNameStatements = findEnumNameStatements(name, statements, index, memberNames);
-  if (enumNameStatements.length !== enumValueStatements.length) {
-    return [];
-  }
-
-  return enumValueStatements.concat(enumNameStatements);
-}
-
-// Tsickle enums have a variable statement with indexes, followed by value statements.
-// See https://github.com/angular/devkit/issues/229#issuecomment-338512056 fore more information.
-function findEnumNameStatements(
-  name: string,
-  statements: ts.NodeArray<ts.Statement>,
-  statementOffset: number,
-  memberNames?: string[],
-): ts.Statement[] {
-  const enumStatements: ts.Statement[] = [];
-
-  for (let index = statementOffset; index < statements.length; ++index) {
-    // Ensure all statements are of the expected format and using the right identifer.
-    // When we find a statement that isn't part of the enum, return what we collected so far.
-    const current = statements[index];
-    if (!ts.isExpressionStatement(current) || !ts.isBinaryExpression(current.expression)) {
-      break;
-    }
-
-    const access = current.expression.left;
-    const value = current.expression.right;
-    if (!access || !ts.isElementAccessExpression(access) || !value || !ts.isStringLiteral(value)) {
-      break;
-    }
-
-    if (memberNames && !memberNames.includes(value.text)) {
-      break;
-    }
-
-    if (!ts.isIdentifier(access.expression) || access.expression.text !== name) {
-      break;
-    }
-
-    if (!access.argumentExpression || !ts.isPropertyAccessExpression(access.argumentExpression)) {
-      break;
-    }
-
-    const enumExpression = access.argumentExpression.expression;
-    if (!ts.isIdentifier(enumExpression) || enumExpression.text !== name) {
-      break;
-    }
-
-    if (value.text !== access.argumentExpression.name.text) {
-      break;
-    }
-
-    enumStatements.push(current);
-  }
-
-  return enumStatements;
-}
-
 function updateHostNode(
   hostNode: ts.VariableStatement,
   expression: ts.Expression,
@@ -456,7 +300,7 @@ function updateHostNode(
 }
 
 /**
- * Find class expression or declaration statements.
+ * Find enums, class expression or declaration statements.
  *
  * The classExpressions block to wrap in an iife must
  * - end with an ExpressionStatement
@@ -468,7 +312,7 @@ function updateHostNode(
  Foo = __decorate([]);
  ```
  */
-function findClassStatements(
+function findStatements(
   name: string,
   statements: ts.NodeArray<ts.Statement>,
   statementIndex: number,
@@ -484,11 +328,11 @@ function findClassStatements(
     const expression = statement.expression;
 
     if (ts.isCallExpression(expression)) {
-    // Ex:
-    // setClassMetadata(FooClass, [{}], void 0);
-    // __decorate([propDecorator()], FooClass.prototype, "propertyName", void 0);
-    // __decorate([propDecorator()], FooClass, "propertyName", void 0);
-    // __decorate$1([propDecorator()], FooClass, "propertyName", void 0);
+      // Ex:
+      // setClassMetadata(FooClass, [{}], void 0);
+      // __decorate([propDecorator()], FooClass.prototype, "propertyName", void 0);
+      // __decorate([propDecorator()], FooClass, "propertyName", void 0);
+      // __decorate$1([propDecorator()], FooClass, "propertyName", void 0);
       const args = expression.arguments;
 
       if (args.length > 2) {
@@ -508,8 +352,9 @@ function findClassStatements(
         ? expression.left.left
         : expression.left;
 
-      const leftExpression = ts.isPropertyAccessExpression(node)
+      const leftExpression = ts.isPropertyAccessExpression(node) || ts.isElementAccessExpression(node)
         // Static Properties // Ex: Foo.bar = 'value';
+        // ENUM Property // Ex:  ChangeDetectionStrategy[ChangeDetectionStrategy.Default] = "Default";
         ? node.expression
         // Ex: FooClass = __decorate([Component()], FooClass);
         : node;

From 15b9ea899881834d69b1ca66827f25b4d29bdd71 Mon Sep 17 00:00:00 2001
From: Hans <hans@hansl.ca>
Date: Fri, 12 Jul 2019 15:15:21 -0700
Subject: [PATCH 1625/1703] feat(@angular/cli): report telemetry opt-ins
 (#15054)

Only when prompted.
---
 packages/angular/cli/models/analytics.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/angular/cli/models/analytics.ts b/packages/angular/cli/models/analytics.ts
index ae4bc8b65cdc..db8619792f3e 100644
--- a/packages/angular/cli/models/analytics.ts
+++ b/packages/angular/cli/models/analytics.ts
@@ -411,6 +411,11 @@ export async function promptGlobalAnalytics(force = false) {
             ${colors.yellow('ng analytics off')}
       `);
       console.log('');
+
+      // Send back a ping with the user `optin`.
+      const ua = new UniversalAnalytics(AnalyticsProperties.AngularCliDefault, 'optin');
+      ua.pageview('/telemetry/optin');
+      await ua.flush();
     } else {
       // Send back a ping with the user `optout`. This is the only thing we send.
       const ua = new UniversalAnalytics(AnalyticsProperties.AngularCliDefault, 'optout');
@@ -465,6 +470,11 @@ export async function promptProjectAnalytics(force = false): Promise<boolean> {
             ${colors.yellow('ng analytics project off')}
       `);
       console.log('');
+
+      // Send back a ping with the user `optin`.
+      const ua = new UniversalAnalytics(AnalyticsProperties.AngularCliDefault, 'optin');
+      ua.pageview('/telemetry/project/optin');
+      await ua.flush();
     } else {
       // Send back a ping with the user `optout`. This is the only thing we send.
       const ua = new UniversalAnalytics(AnalyticsProperties.AngularCliDefault, 'optout');

From f83fe22635c83405181ac4bd7881b3e80e637f38 Mon Sep 17 00:00:00 2001
From: Charles <19598772+clydin@users.noreply.github.com>
Date: Mon, 15 Jul 2019 12:48:20 -0400
Subject: [PATCH 1626/1703] test: integrate browser testing for differential
 loading (#15065)

---
 .circleci/config.yml                          |  26 ++++
 package.json                                  |   1 +
 scripts/saucelabs/start-tunnel.sh             |  35 +++++
 scripts/saucelabs/stop-tunnel.sh              |  27 ++++
 scripts/saucelabs/wait-for-tunnel.sh          |  28 ++++
 .../e2e/assets/protractor-saucelabs.conf.js   | 120 ++++++++++++++++++
 tests/legacy-cli/e2e/tests/misc/browsers.ts   |  63 +++++++++
 yarn.lock                                     |   4 +
 8 files changed, 304 insertions(+)
 create mode 100755 scripts/saucelabs/start-tunnel.sh
 create mode 100755 scripts/saucelabs/stop-tunnel.sh
 create mode 100755 scripts/saucelabs/wait-for-tunnel.sh
 create mode 100644 tests/legacy-cli/e2e/assets/protractor-saucelabs.conf.js
 create mode 100644 tests/legacy-cli/e2e/tests/misc/browsers.ts

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3b098810cd51..67bd5fd2ac9c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -212,6 +212,29 @@ jobs:
             PATH=~/.npm-global/bin:$PATH npm install --global npm
       - run: PATH=~/.npm-global/bin:$PATH node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX}
 
+  test-browsers:
+    executor:
+      name: test-executor
+    environment:
+      E2E_BROWSERS: true
+    steps:
+      - attach_workspace: *attach_options
+      - run:
+          name: Initialize Environment
+          command: ./.circleci/env.sh
+      - run:
+          name: Initialize Saucelabs
+          command: setSecretVar SAUCE_ACCESS_KEY $(echo $SAUCE_ACCESS_KEY | rev)
+      - run:
+          name: Start Saucelabs Tunnel
+          command: ./scripts/saucelabs/start-tunnel.sh
+          background: true
+        # Waits for the Saucelabs tunnel to be ready. This ensures that we don't run tests
+        # too early without Saucelabs not being ready.
+      - run: ./scripts/saucelabs/wait-for-tunnel.sh
+      - run: PATH=~/.npm-global/bin:$PATH node ./tests/legacy-cli/run_e2e ./tests/legacy-cli/e2e/tests/misc/browsers.ts
+      - run: ./scripts/saucelabs/stop-tunnel.sh
+
   build:
     executor: action-executor
     steps:
@@ -346,6 +369,9 @@ workflows:
           <<: *ignore_pull_requests
           requires:
             - e2e-cli
+      - test-browsers:
+          requires:
+            - build
       - snapshot_publish:
           <<: *ignore_pull_requests
           requires:
diff --git a/package.json b/package.json
index c5080083cd12..d3393a199855 100644
--- a/package.json
+++ b/package.json
@@ -128,6 +128,7 @@
     "pidtree": "^0.3.0",
     "pidusage": "^2.0.17",
     "rxjs": "~6.4.0",
+    "sauce-connect": "https://saucelabs.com/downloads/sc-4.5.4-linux.tar.gz",
     "semver": "6.2.0",
     "source-map": "^0.5.6",
     "source-map-support": "^0.5.0",
diff --git a/scripts/saucelabs/start-tunnel.sh b/scripts/saucelabs/start-tunnel.sh
new file mode 100755
index 000000000000..34bf0a7b5bc9
--- /dev/null
+++ b/scripts/saucelabs/start-tunnel.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+set -x -u -e -o pipefail
+
+readonly currentDir=$(cd $(dirname $0); pwd)
+
+# Command arguments that will be passed to sauce-connect. By default we disable SSL bumping for
+# all requests. This is because SSL bumping is not needed for our test setup and in order
+# to perform the SSL bumping, Saucelabs intercepts all HTTP requests in the tunnel VM and modifies
+# them. This can cause flakiness as it makes all requests dependent on the SSL bumping middleware.
+# See: https://wiki.saucelabs.com/display/DOCS/Troubleshooting+Sauce+Connect#TroubleshootingSauceConnect-DisablingSSLBumping
+sauceArgs="--no-ssl-bump-domains all"
+
+if [[ ! -z "${SAUCE_LOG_FILE:-}" ]]; then
+  mkdir -p $(dirname ${SAUCE_LOG_FILE})
+  sauceArgs="${sauceArgs} --logfile ${SAUCE_LOG_FILE}"
+fi
+
+if [[ ! -z "${SAUCE_READY_FILE:-}" ]]; then
+  mkdir -p $(dirname ${SAUCE_READY_FILE})
+  sauceArgs="${sauceArgs} --readyfile ${SAUCE_READY_FILE}"
+fi
+
+if [[ ! -z "${SAUCE_PID_FILE:-}" ]]; then
+  mkdir -p $(dirname ${SAUCE_PID_FILE})
+  sauceArgs="${sauceArgs} --pidfile ${SAUCE_PID_FILE}"
+fi
+
+if [[ ! -z "${SAUCE_TUNNEL_IDENTIFIER:-}" ]]; then
+  sauceArgs="${sauceArgs} --tunnel-identifier ${SAUCE_TUNNEL_IDENTIFIER}"
+fi
+
+echo "Starting Sauce Connect. Passed arguments: ${sauceArgs}"
+
+${currentDir}/../../node_modules/sauce-connect/bin/sc -u ${SAUCE_USERNAME} -k ${SAUCE_ACCESS_KEY} ${sauceArgs}
diff --git a/scripts/saucelabs/stop-tunnel.sh b/scripts/saucelabs/stop-tunnel.sh
new file mode 100755
index 000000000000..c53a7e31ca08
--- /dev/null
+++ b/scripts/saucelabs/stop-tunnel.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+# Disable printing of any executed command because this would cause a lot
+# of spam due to the loop.
+set +x -u -e -o pipefail
+
+if [[ ! -f ${SAUCE_PID_FILE} ]]; then
+  echo "Could not find Saucelabs tunnel PID file. Cannot stop tunnel.."
+  exit 1
+fi
+
+echo "Shutting down Sauce Connect tunnel"
+
+# The process id for the sauce-connect instance is stored inside of the pidfile.
+tunnelProcessId=$(cat ${SAUCE_PID_FILE})
+
+# Kill the process by using the PID that has been read from the pidfile. Note that
+# we cannot use killall because CircleCI base container images don't have it installed.
+kill ${tunnelProcessId}
+
+while (ps -p ${tunnelProcessId} &> /dev/null); do
+  printf "."
+  sleep .5
+done
+
+echo ""
+echo "Sauce Connect tunnel has been shut down"
diff --git a/scripts/saucelabs/wait-for-tunnel.sh b/scripts/saucelabs/wait-for-tunnel.sh
new file mode 100755
index 000000000000..feda9a85b694
--- /dev/null
+++ b/scripts/saucelabs/wait-for-tunnel.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+# Disable printing of any executed command because this would cause a lot
+# of spam due to the loop.
+set +x -u -e -o pipefail
+
+# Waits for Saucelabs Connect to be ready before executing any tests.
+counter=0
+
+while [[ ! -f ${SAUCE_READY_FILE} ]]; do
+  counter=$((counter + 1))
+
+  # Counter needs to be multiplied by two because the while loop only sleeps a half second.
+  # This has been made in favor of better progress logging (printing dots every half second)
+  if [ $counter -gt $[${SAUCE_READY_FILE_TIMEOUT} * 2] ]; then
+    echo "Timed out after ${SAUCE_READY_FILE_TIMEOUT} seconds waiting for tunnel ready file."
+    echo "Printing logfile output:"
+    echo ""
+    cat ${SAUCE_LOG_FILE}
+    exit 5
+  fi
+
+  printf "."
+  sleep 0.5
+done
+
+echo ""
+echo "Connected to Saucelabs"
diff --git a/tests/legacy-cli/e2e/assets/protractor-saucelabs.conf.js b/tests/legacy-cli/e2e/assets/protractor-saucelabs.conf.js
new file mode 100644
index 000000000000..d3f5cd26834c
--- /dev/null
+++ b/tests/legacy-cli/e2e/assets/protractor-saucelabs.conf.js
@@ -0,0 +1,120 @@
+// @ts-check
+// Protractor configuration file, see link for more information
+// https://github.com/angular/protractor/blob/master/lib/config.ts
+
+const { SpecReporter } = require('jasmine-spec-reporter');
+
+const tunnelIdentifier = process.env['SAUCE_TUNNEL_IDENTIFIER'];
+
+/**
+ * @type { import("protractor").Config }
+ */
+exports.config = {
+  sauceUser: process.env['SAUCE_USERNAME'],
+  sauceKey: process.env['SAUCE_ACCESS_KEY'],
+
+  allScriptsTimeout: 11000,
+  specs: ['./src/**/*.e2e-spec.ts'],
+
+  multiCapabilities: [
+    {
+      browserName: 'chrome',
+      version: '41',
+      tunnelIdentifier,
+    },
+    {
+      browserName: 'chrome',
+      version: '75',
+      tunnelIdentifier,
+    },
+    {
+      browserName: 'safari',
+      platform: 'OS X 10.11',
+      version: '9.0',
+      tunnelIdentifier,
+    },
+    // TODO: Investigate. Failure:
+    // Failed: Error while running testForAngular: undefined is not an object (evaluating 'd.prototype[b].apply')
+    // {
+    //   browserName: 'safari',
+    //   platform: 'OS X 10.12',
+    //   version: '10.1',
+    //   tunnelIdentifier,
+    // },
+    {
+      browserName: 'safari',
+      platform: 'macOS 10.13',
+      version: '11.1',
+      tunnelIdentifier,
+    },
+    {
+      browserName: 'safari',
+      platform: 'macOS 10.13',
+      version: '12.1',
+      tunnelIdentifier,
+    },
+    {
+      browserName: 'firefox',
+      version: '48',
+      tunnelIdentifier,
+    },
+    {
+      browserName: 'firefox',
+      version: '60',
+      tunnelIdentifier,
+    },
+    {
+      browserName: 'firefox',
+      version: '68',
+      tunnelIdentifier,
+    },
+    {
+      browserName: 'internet explorer',
+      platform: 'Windows 8',
+      version: '10',
+      tunnelIdentifier,
+    },
+    {
+      browserName: 'internet explorer',
+      platform: 'Windows 8.1',
+      version: '11',
+      tunnelIdentifier,
+    },
+    {
+      browserName: "MicrosoftEdge",
+      platform: 'Windows 10',
+      version: "14.14393",
+      tunnelIdentifier,
+    },
+    {
+      browserName: "MicrosoftEdge",
+      platform: 'Windows 10',
+      version: "17.17134",
+      tunnelIdentifier,
+    },
+    {
+      browserName: "MicrosoftEdge",
+      platform: 'Windows 10',
+      version: "18.17763",
+      tunnelIdentifier,
+    },
+  ],
+
+  baseUrl: 'http://localhost:2000/',
+  framework: 'jasmine',
+  jasmineNodeOpts: {
+    showColors: true,
+    defaultTimeoutInterval: 30000,
+    print: function() {},
+  },
+
+  onPrepare() {
+    // Fix for Safari 12 -- https://github.com/angular/protractor/issues/4964
+    browser.resetUrl = 'about:blank';
+
+    require('ts-node').register({
+      project: require('path').join(__dirname, './tsconfig.json'),
+    });
+    jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
+  },
+};
diff --git a/tests/legacy-cli/e2e/tests/misc/browsers.ts b/tests/legacy-cli/e2e/tests/misc/browsers.ts
new file mode 100644
index 000000000000..8b1c617d8b19
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/misc/browsers.ts
@@ -0,0 +1,63 @@
+import * as express from 'express';
+import * as path from 'path';
+import { copyProjectAsset } from '../../utils/assets';
+import { replaceInFile } from '../../utils/fs';
+import { ng } from '../../utils/process';
+
+export default async function () {
+  if (!process.env['E2E_BROWSERS']) {
+    return;
+  }
+
+  // Ensure SauceLabs configuration
+  if (!process.env['SAUCE_USERNAME'] || !process.env['SAUCE_ACCESS_KEY']) {
+    throw new Error('SauceLabs is not configured.');
+  }
+
+  await ng('build', '--prod');
+
+  // Add Protractor configuration
+  await copyProjectAsset('protractor-saucelabs.conf.js', 'e2e/protractor-saucelabs.conf.js');
+
+  // Remove browser log checks as they are only supported with the chrome webdriver
+  await replaceInFile(
+    'e2e/src/app.e2e-spec.ts',
+    'await browser.manage().logs().get(logging.Type.BROWSER)',
+    '[]',
+  );
+
+  // Workaround defect in getText WebDriver implementation for Safari/Edge
+  // Leading and trailing space is not removed
+  await replaceInFile(
+    'e2e/src/app.e2e-spec.ts',
+    '\'should display welcome message\',',
+    '\'should display welcome message\', async',
+  );
+  await replaceInFile(
+    'e2e/src/app.e2e-spec.ts',
+    'page.navigateTo();',
+    'await page.navigateTo();',
+  );
+  await replaceInFile(
+    'e2e/src/app.e2e-spec.ts',
+    'page.getTitleText()',
+    '(await page.getTitleText()).trim()',
+  );
+
+  // Setup server
+  const app = express();
+  app.use(express.static(path.resolve('dist/test-project')));
+  const server = app.listen(2000, 'localhost');
+
+  try {
+    // Execute application's E2E tests with SauceLabs
+    await ng(
+      'e2e',
+      'test-project',
+      '--protractorConfig=e2e/protractor-saucelabs.conf.js',
+      '--devServerTarget=',
+    );
+  } finally {
+    server.close();
+  }
+}
diff --git a/yarn.lock b/yarn.lock
index 06bd6c064d00..4846aabd996a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9096,6 +9096,10 @@ sauce-connect-launcher@^1.2.4:
     lodash "^4.16.6"
     rimraf "^2.5.4"
 
+"sauce-connect@https://saucelabs.com/downloads/sc-4.5.4-linux.tar.gz":
+  version "0.0.0"
+  resolved "https://saucelabs.com/downloads/sc-4.5.4-linux.tar.gz#dc5efcd2be24ddb099a85b923d6e754754651fa8"
+
 saucelabs@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-1.5.0.tgz#9405a73c360d449b232839919a86c396d379fd9d"

From 1eda02730616686822b73ce8d0ffaa1d54587ce0 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 15 Jul 2019 19:48:31 +0300
Subject: [PATCH 1627/1703] build: update @angular/animations to version
 (#15067)

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 5b93d77d1558..20510504db9a 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#c9327cddc787ae44ea2fcda72f9e95609b3ac37a",
-    "@angular/common": "github:angular/common-builds#4e5c45ccd94c7adbc123f8fed1b74143702d4184",
-    "@angular/compiler": "github:angular/compiler-builds#27aec5d9dea44e2fada397ae6bc327ee987556e3",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#d5445a9985dc6b0a4aeef1aabc88e62db8f79c20",
-    "@angular/core": "github:angular/core-builds#696341672e26b7008ab8b3deb8226eac3104c876",
-    "@angular/forms": "github:angular/forms-builds#23d95dbc3ac1d2bf1a0c7ad98f82302da39275d9",
-    "@angular/language-service": "github:angular/language-service-builds#206af4f2783252feae3440431c47566f534d6a06",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#be431cf510fe9d2bdbcbf3d25f546033c099d057",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#131670d9be96ce688030b0c7557133176de6b888",
-    "@angular/router": "github:angular/router-builds#a11f2ccf91cac795be25eec5b20b7685c090e523"
+    "@angular/animations": "github:angular/animations-builds#68f54731bd13545d015042cd182c27a105309468",
+    "@angular/common": "github:angular/common-builds#b8292525b518ee2e55418a77490dbc088779bd49",
+    "@angular/compiler": "github:angular/compiler-builds#944776fc6fbb0b3766ae60a01a60cfe819594925",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#b55708729f50605a18db7eb93f812de10930f303",
+    "@angular/core": "github:angular/core-builds#d13b5a6da61e01558463491000b85a381a251ae3",
+    "@angular/forms": "github:angular/forms-builds#2f60b2df87e5f851a9c6f9981a0d5e8649763cdc",
+    "@angular/language-service": "github:angular/language-service-builds#6c70ef077b8b4e2ef8973e15280a6d610edd2284",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#bca102c0ed014d321d716d7db5c9568531a27d81",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#f42403fb1aff67e080d689457bf2185e8d6e5c7b",
+    "@angular/router": "github:angular/router-builds#9b5d77107e6fabc76f7a3a7433b7f43ad7db50c2"
   }
 }
\ No newline at end of file

From 7e80c12bcd9cafdcab0790dfde1334f7eebcae72 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 15 Jul 2019 19:48:41 +0300
Subject: [PATCH 1628/1703] build: update karma to version ~4.2.0 (#15068)

---
 package.json                                  |  2 +-
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 38 +++++++++++++++----
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index d3393a199855..edfe2b411c41 100644
--- a/package.json
+++ b/package.json
@@ -117,7 +117,7 @@
     "istanbul": "^0.4.5",
     "jasmine": "^3.3.1",
     "jasmine-spec-reporter": "^4.2.1",
-    "karma": "~4.1.0",
+    "karma": "~4.2.0",
     "karma-jasmine": "^2.0.1",
     "karma-jasmine-html-reporter": "^1.4.0",
     "license-checker": "^20.1.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 7647ca720570..d2680eab7466 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -75,7 +75,7 @@
     "jquery": "^3.3.1",
     "jasmine-core": "~3.4.0",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~4.1.0",
+    "karma": "~4.2.0",
     "karma-chrome-launcher": "~2.2.0",
     "karma-coverage-istanbul-reporter": "~2.0.0",
     "karma-jasmine": "~2.0.1",
diff --git a/yarn.lock b/yarn.lock
index 4846aabd996a..2df13abbe7ab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2152,6 +2152,21 @@ chokidar@^2.1.6:
   optionalDependencies:
     fsevents "^1.2.7"
 
+chokidar@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.0.2.tgz#0d1cd6d04eb2df0327446188cd13736a3367d681"
+  integrity sha512-c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==
+  dependencies:
+    anymatch "^3.0.1"
+    braces "^3.0.2"
+    glob-parent "^5.0.0"
+    is-binary-path "^2.1.0"
+    is-glob "^4.0.1"
+    normalize-path "^3.0.0"
+    readdirp "^3.1.1"
+  optionalDependencies:
+    fsevents "^2.0.6"
+
 chownr@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
@@ -2779,7 +2794,7 @@ copy-webpack-plugin@5.0.3:
     serialize-javascript "^1.7.0"
     webpack-log "^2.0.0"
 
-core-js@3.1.4:
+core-js@3.1.4, core-js@^3.1.3:
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.4.tgz#3a2837fc48e582e1ae25907afcd6cf03b0cc7a07"
   integrity sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ==
@@ -6055,18 +6070,18 @@ karma@^4.0.0:
     tmp "0.0.33"
     useragent "2.3.0"
 
-karma@~4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-4.1.0.tgz#d07387c9743a575b40faf73e8a3eb5421c2193e1"
-  integrity sha512-xckiDqyNi512U4dXGOOSyLKPwek6X/vUizSy2f3geYevbLj+UIdvNwbn7IwfUIL2g1GXEPWt/87qFD1fBbl/Uw==
+karma@~4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-4.2.0.tgz#27e88b310cde090d016980ff5444e3a239196fca"
+  integrity sha512-fmCuxN1rwJxTdZfOXK5LjlmS4Ana/OvzNMpkyLL/TLE8hmgSkpVpMYQ7RTVa8TNKRVQDZNl5W1oF5cfKfgIMlA==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
-    braces "^2.3.2"
-    chokidar "^2.0.3"
+    braces "^3.0.2"
+    chokidar "^3.0.0"
     colors "^1.1.0"
     connect "^3.6.0"
-    core-js "^2.2.0"
+    core-js "^3.1.3"
     di "^0.0.1"
     dom-serialize "^2.2.0"
     flatted "^2.0.0"
@@ -8643,6 +8658,13 @@ readdirp@^3.0.2:
   dependencies:
     picomatch "^2.0.4"
 
+readdirp@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.1.1.tgz#b158123ac343c8b0f31d65680269cc0fc1025db1"
+  integrity sha512-XXdSXZrQuvqoETj50+JAitxz1UPdt5dupjT6T5nVB+WvjMv2XKYj+s7hPeAVCXvmJrL36O4YYyWlIC3an2ePiQ==
+  dependencies:
+    picomatch "^2.0.4"
+
 rechoir@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"

From d6df5d22a247c8449226d27310cbe94988909dea Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 15 Jul 2019 19:48:54 +0300
Subject: [PATCH 1629/1703] build: update caniuse-lite to version 1.0.30000984
 (#15069)

---
 packages/angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                          | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index d2680eab7466..ba0714a1c6bb 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -15,7 +15,7 @@
     "ajv": "6.10.1",
     "autoprefixer": "9.6.1",
     "browserslist": "4.6.4",
-    "caniuse-lite": "1.0.30000983",
+    "caniuse-lite": "1.0.30000984",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.3",
diff --git a/yarn.lock b/yarn.lock
index 2df13abbe7ab..902a3afcf73b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2004,10 +2004,10 @@ camelcase@^5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@1.0.30000983, caniuse-lite@^1.0.30000981:
-  version "1.0.30000983"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000983.tgz#ab3c70061ca2a3467182a10ac75109b199b647f8"
-  integrity sha512-/llD1bZ6qwNkt41AsvjsmwNOoA4ZB+8iqmf5LVyeSXuBODT/hAMFNVOh84NdUzoiYiSKqo5vQ3ZzeYHSi/olDQ==
+caniuse-lite@1.0.30000984:
+  version "1.0.30000984"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000984.tgz#dc96c3c469e9bcfc6ad5bdd24c77ec918ea76fe0"
+  integrity sha512-n5tKOjMaZ1fksIpQbjERuqCyfgec/m9pferkFQbLmWtqLUdmt12hNhjSwsmPdqeiG2NkITOQhr1VYIwWSAceiA==
 
 caniuse-lite@^1.0.30000898:
   version "1.0.30000903"
@@ -2029,6 +2029,11 @@ caniuse-lite@^1.0.30000980:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000980.tgz#0df53e4354b3111f83ac15b0bd4c71fe92994231"
   integrity sha512-as0PRtWHaX3gl2gpC7qA7bX88lr+qLacMMXm1QKLLQtBCwT/Ljbgrv5EXKMNBoeEX6yFZ4vIsBb4Nh+PEwW2Rw==
 
+caniuse-lite@^1.0.30000981:
+  version "1.0.30000983"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000983.tgz#ab3c70061ca2a3467182a10ac75109b199b647f8"
+  integrity sha512-/llD1bZ6qwNkt41AsvjsmwNOoA4ZB+8iqmf5LVyeSXuBODT/hAMFNVOh84NdUzoiYiSKqo5vQ3ZzeYHSi/olDQ==
+
 canonical-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"

From 254b02619c4a1d4b527c28e6d52aebc5a08856cd Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 15 Jul 2019 19:49:05 +0300
Subject: [PATCH 1630/1703] build: update pacote to version 9.5.2 (#15070)

---
 packages/angular/cli/package.json       | 2 +-
 packages/schematics/update/package.json | 2 +-
 yarn.lock                               | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index 15018e394be6..aa2da7eaee91 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -37,7 +37,7 @@
     "inquirer": "6.5.0",
     "npm-package-arg": "6.1.0",
     "open": "6.4.0",
-    "pacote": "9.5.1",
+    "pacote": "9.5.2",
     "read-package-tree": "5.3.1",
     "semver": "6.2.0",
     "symbol-observable": "1.2.0",
diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index decc895f8759..4253a9355109 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -15,7 +15,7 @@
     "@angular-devkit/schematics": "0.0.0",
     "@yarnpkg/lockfile": "1.1.0",
     "ini": "1.3.5",
-    "pacote": "9.5.1",
+    "pacote": "9.5.2",
     "semver": "6.2.0",
     "semver-intersect": "1.4.0",
     "rxjs": "6.4.0"
diff --git a/yarn.lock b/yarn.lock
index 902a3afcf73b..1b23cbcf63b7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7694,10 +7694,10 @@ package-json@^4.0.0:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
-pacote@9.5.1:
-  version "9.5.1"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.1.tgz#adb0d23daeef6d0b813ab5891d0c6459ccec998d"
-  integrity sha512-Zqvczvf/zZ7QNosdE9uTC7SRuvSs9tFqRkF6cJl+2HH7COBnx4BRAGpeXJlrbN+mM0CMHpbi620xdEHhCflghA==
+pacote@9.5.2:
+  version "9.5.2"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.2.tgz#6132afe7a53bb6fa189df72572c87bb03ab2cc5f"
+  integrity sha512-KVxalD57jaHnWIBQKPeU/eFU4UoMqUOj3h5AXvVMp9oJd8BZvIdTm8qmazy4jpYBf7RX9xCFmeFcU3ebvrUSZQ==
   dependencies:
     bluebird "^3.5.3"
     cacache "^11.3.2"

From 1959b3b4c797c77200369da3686b739b3005a4ed Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 15 Jul 2019 19:49:23 +0300
Subject: [PATCH 1631/1703] build: update ajv to version 6.10.2 (#15073)

---
 package.json                                       | 2 +-
 packages/angular_devkit/build_angular/package.json | 2 +-
 packages/angular_devkit/core/package.json          | 2 +-
 yarn.lock                                          | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index edfe2b411c41..ad92b91e092c 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
     "@types/webpack-dev-server": "^3.1.0",
     "@types/webpack-sources": "^0.1.5",
     "@yarnpkg/lockfile": "1.1.0",
-    "ajv": "6.10.1",
+    "ajv": "6.10.2",
     "ansi-colors": "3.2.4",
     "common-tags": "^1.8.0",
     "conventional-changelog": "^1.1.0",
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index ba0714a1c6bb..f6fe8dcdf28b 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -12,7 +12,7 @@
     "@angular-devkit/build-webpack": "0.0.0",
     "@angular-devkit/core": "0.0.0",
     "@ngtools/webpack": "0.0.0",
-    "ajv": "6.10.1",
+    "ajv": "6.10.2",
     "autoprefixer": "9.6.1",
     "browserslist": "4.6.4",
     "caniuse-lite": "1.0.30000984",
diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json
index 3c7ebdce2d98..45ecc3089b10 100644
--- a/packages/angular_devkit/core/package.json
+++ b/packages/angular_devkit/core/package.json
@@ -8,7 +8,7 @@
     "core"
   ],
   "dependencies": {
-    "ajv": "6.10.1",
+    "ajv": "6.10.2",
     "fast-json-stable-stringify": "2.0.0",
     "magic-string": "0.25.3",
     "rxjs": "6.4.0",
diff --git a/yarn.lock b/yarn.lock
index 1b23cbcf63b7..7975698537f2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1004,10 +1004,10 @@ ajv-keywords@^3.1.0:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
   integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
 
-ajv@6.10.1:
-  version "6.10.1"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.1.tgz#ebf8d3af22552df9dd049bfbe50cc2390e823593"
-  integrity sha512-w1YQaVGNC6t2UCPjEawK/vo/dG8OOrVtUmhBT1uJJYxbl5kU2Tj3v6LGqBcsysN1yhuCStJCCA3GqdvKY8sqXQ==
+ajv@6.10.2:
+  version "6.10.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
+  integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"

From 20696fa9dbd4fb960234d5e49a340ac7925f85cc Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 15 Jul 2019 19:49:56 +0300
Subject: [PATCH 1632/1703] build: update sass to version 1.22.4 (#15055)

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index f6fe8dcdf28b..08f48c63ed0c 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -37,7 +37,7 @@
     "postcss-loader": "3.0.0",
     "raw-loader": "1.0.0",
     "rxjs": "6.4.0",
-    "sass": "1.22.3",
+    "sass": "1.22.4",
     "sass-loader": "7.1.0",
     "semver": "6.2.0",
     "source-map-support": "0.5.12",
diff --git a/yarn.lock b/yarn.lock
index 7975698537f2..0f6f8bcd5cbc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9098,10 +9098,10 @@ sass-loader@7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
-sass@1.22.3:
-  version "1.22.3"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.22.3.tgz#b3591191ab0f3caece39ed9384c90caccacf471c"
-  integrity sha512-9ECcSAEgGStxZkpOCT+Z8F6jEJq+jjPonxgX52QVNeJbRL1CmrjN9qcoO78gob6M1bY4ocGVwPWjGDNMeOgvbg==
+sass@1.22.4:
+  version "1.22.4"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.22.4.tgz#00b433055f00a25ed5f060ca4abc332facaf02fc"
+  integrity sha512-gQFNzYKlAn9ee6Qy1UhTxy0G24QR5BWP61AN61jAEqwauzVCP5qjUveO/WkIj72po0ljncdVXo96EQR+ig2lRw==
   dependencies:
     chokidar ">=2.0.0 <4.0.0"
 

From 8d7ab42c191cc7152f2701f0ec4350c853d6007a Mon Sep 17 00:00:00 2001
From: Charles <19598772+clydin@users.noreply.github.com>
Date: Mon, 15 Jul 2019 12:50:07 -0400
Subject: [PATCH 1633/1703] test: use locally published version in E2E project
 setup (#15052)

---
 tests/legacy-cli/e2e/setup/015-build.ts      |  11 -
 tests/legacy-cli/e2e/setup/100-global-cli.ts |   9 +-
 tests/legacy-cli/e2e/utils/project.ts        | 230 +------------------
 tests/legacy-cli/verdaccio.yaml              |   2 +-
 4 files changed, 18 insertions(+), 234 deletions(-)
 delete mode 100644 tests/legacy-cli/e2e/setup/015-build.ts

diff --git a/tests/legacy-cli/e2e/setup/015-build.ts b/tests/legacy-cli/e2e/setup/015-build.ts
deleted file mode 100644
index 4c434aac714b..000000000000
--- a/tests/legacy-cli/e2e/setup/015-build.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { getGlobalVariable } from '../utils/env';
-import { npm } from '../utils/process';
-
-export default function() {
-  const argv = getGlobalVariable('argv');
-  if (argv.nobuild) {
-    return;
-  }
-
-  return npm('run', 'build', '--', '--local');
-}
diff --git a/tests/legacy-cli/e2e/setup/100-global-cli.ts b/tests/legacy-cli/e2e/setup/100-global-cli.ts
index dd24d7acc8a7..21ed8749789c 100644
--- a/tests/legacy-cli/e2e/setup/100-global-cli.ts
+++ b/tests/legacy-cli/e2e/setup/100-global-cli.ts
@@ -1,8 +1,6 @@
 import { getGlobalVariable } from '../utils/env';
 import { exec, silentNpm } from '../utils/process';
 
-const packages = require('../../../../lib/packages').packages;
-
 export default async function() {
   const argv = getGlobalVariable('argv');
   if (argv.noglobal) {
@@ -10,7 +8,12 @@ export default async function() {
   }
 
   // Install global Angular CLI.
-  await silentNpm('install', '-g', packages['@angular/cli'].tar);
+  await silentNpm(
+    'install',
+    '--global',
+    '@angular/cli',
+    '--registry=http://localhost:4873',
+  );
 
   try {
     await exec(process.platform.startsWith('win') ? 'where' : 'which', 'ng');
diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts
index 7960614d06b5..789ce4eab3f3 100644
--- a/tests/legacy-cli/e2e/utils/project.ts
+++ b/tests/legacy-cli/e2e/utils/project.ts
@@ -4,8 +4,7 @@ import { execAndWaitForOutputToMatch, npm, silentNpm, ng, git } from './process'
 import { getGlobalVariable } from './env';
 import { gitCommit } from './git';
 import { prerelease } from 'semver';
-
-const packages = require('../../../../lib/packages').packages;
+import { packages } from '../../../../lib/packages';
 
 
 const tsConfigPath = 'tsconfig.json';
@@ -35,7 +34,7 @@ export function ngServe(...args: string[]) {
 
 
 export async function createProject(name: string, ...args: string[]) {
-  const argv: any = getGlobalVariable('argv');
+  const argv: string[] = getGlobalVariable('argv');
   const extraArgs = [];
 
   if (argv['ivy']) {
@@ -49,9 +48,7 @@ export async function createProject(name: string, ...args: string[]) {
 }
 
 export async function prepareProjectForE2e(name) {
-  const argv: string[] = getGlobalVariable(
-    'argv',
-  );
+  const argv: string[] = getGlobalVariable('argv');
 
   await git(
     'config',
@@ -68,7 +65,7 @@ export async function prepareProjectForE2e(name) {
     'commit.gpgSign',
     'false',
   );
-  await useBuiltPackages();
+
   await useCIChrome(
     'e2e',
   );
@@ -81,26 +78,13 @@ export async function prepareProjectForE2e(name) {
     'src',
   );
 
-  await useDevKitSnapshots();
-  (await argv[
-    'ng2'
-  ])
-    ? useNg2()
-    : Promise.resolve();
-  (await argv[
-    'ng4'
-  ])
-    ? useNg4()
-    : Promise.resolve();
-  (await argv[
-    'ng-snapshots'
-  ]) ||
-    argv[
-    'ng-tag'
-    ]
-    ? useSha()
-    : Promise.resolve();
-  await console.log(
+  if (argv['ng-snapshots'] || argv['ng-tag']) {
+    await useSha();
+  } else {
+    await writeFile('.npmrc', 'registry=http://localhost:4873');
+  }
+
+  console.log(
     `Project ${name} created... Installing npm.`,
   );
   await silentNpm(
@@ -126,44 +110,6 @@ export async function prepareProjectForE2e(name) {
   );
 }
 
-
-export function useDevKit(devkitRoot: string) {
-  return Promise.resolve()
-    .then(() => {
-      // Load the packages info for devkit.
-      const devkitPackages = require(devkitRoot + '/lib/packages').packages;
-
-      return updateJsonFile('package.json', json => {
-        if (!json['dependencies']) {
-          json['dependencies'] = {};
-        }
-        if (!json['devDependencies']) {
-          json['devDependencies'] = {};
-        }
-
-        for (const packageName of Object.keys(devkitPackages)) {
-          if (json['dependencies'].hasOwnProperty(packageName)) {
-            json['dependencies'][packageName] = devkitPackages[packageName].tar;
-          } else if (json['devDependencies'].hasOwnProperty(packageName)) {
-            json['devDependencies'][packageName] = devkitPackages[packageName].tar;
-          }
-        }
-      });
-    });
-}
-
-export function useDevKitSnapshots() {
-  return updateJsonFile('package.json', json => {
-    // TODO: actually add these.
-    // These were not working on any test that ran `npm i`.
-    // json['devDependencies']['@angular-devkit/build-angular'] =
-    //   'github:angular/angular-devkit-build-angular-builds';
-    // // By adding build-ng-packagr preemptively, adding a lib will not update it.
-    // json['devDependencies']['@angular-devkit/build-ng-packagr'] =
-    //   'github:angular/angular-devkit-build-ng-packagr-builds';
-  });
-}
-
 export function useBuiltPackages() {
   return Promise.resolve()
     .then(() => updateJsonFile('package.json', json => {
@@ -344,160 +290,6 @@ export function useCIChrome(projectDir: string) {
     });
 }
 
-// Convert a Angular 5 project to Angular 2.
-export function useNg2() {
-  const ng2Deps: any = {
-    'dependencies': {
-      '@angular/common': '^2.4.0',
-      '@angular/compiler': '^2.4.0',
-      '@angular/core': '^2.4.0',
-      '@angular/forms': '^2.4.0',
-      '@angular/http': '^2.4.0',
-      '@angular/platform-browser': '^2.4.0',
-      '@angular/platform-browser-dynamic': '^2.4.0',
-      '@angular/router': '^3.4.0',
-      'zone.js': '^0.7.4'
-    },
-    'devDependencies': {
-      '@angular/compiler-cli': '^2.4.0',
-      '@types/jasmine': '~2.2.0',
-      '@types/jasminewd2': undefined,
-      'typescript': '~2.0.0'
-    }
-  };
-
-  const tsconfigAppJson: any = {
-    'compilerOptions': {
-      'sourceMap': true,
-      'declaration': false,
-      'moduleResolution': 'node',
-      'emitDecoratorMetadata': true,
-      'experimentalDecorators': true,
-      'target': 'es5',
-      'lib': [
-        'es2017',
-        'dom'
-      ],
-      'outDir': '../out-tsc/app',
-      'module': 'es2015',
-      'baseUrl': '',
-      'types': []
-    },
-    'exclude': [
-      'test.ts',
-      '**/*.spec.ts'
-    ]
-  };
-
-  const tsconfigSpecJson: any = {
-    'compilerOptions': {
-      'sourceMap': true,
-      'declaration': false,
-      'moduleResolution': 'node',
-      'emitDecoratorMetadata': true,
-      'experimentalDecorators': true,
-      'lib': [
-        'es2017',
-        'dom'
-      ],
-      'outDir': '../out-tsc/spec',
-      'module': 'commonjs',
-      'target': 'es5',
-      'baseUrl': '',
-      'types': [
-        'jasmine',
-        'node'
-      ]
-    },
-    'files': [
-      'test.ts'
-    ],
-    'include': [
-      '**/*.spec.ts',
-      '**/*.d.ts'
-    ]
-  };
-
-  const tsconfigE2eJson: any = {
-    'compilerOptions': {
-      'sourceMap': true,
-      'declaration': false,
-      'moduleResolution': 'node',
-      'emitDecoratorMetadata': true,
-      'experimentalDecorators': true,
-      'lib': [
-        'es2017'
-      ],
-      'outDir': '../out-tsc/e2e',
-      'module': 'commonjs',
-      'target': 'es5',
-      'types': [
-        'jasmine',
-        'node'
-      ]
-    }
-  };
-
-
-  return Promise.resolve()
-    .then(() => updateJsonFile('package.json', json => {
-      Object.keys(ng2Deps['dependencies']).forEach(pkgName => {
-        json['dependencies'][pkgName] = ng2Deps['dependencies'][pkgName];
-      });
-      Object.keys(ng2Deps['devDependencies']).forEach(pkgName => {
-        json['devDependencies'][pkgName] = ng2Deps['devDependencies'][pkgName];
-      });
-      console.log(JSON.stringify(json));
-    }))
-    .then(() => updateJsonFile('src/tsconfig.app.json', json =>
-      Object.assign(json, tsconfigAppJson)))
-    .then(() => updateJsonFile('src/tsconfig.spec.json', json =>
-      Object.assign(json, tsconfigSpecJson)))
-    .then(() => updateJsonFile('e2e/tsconfig.e2e.json', json =>
-      Object.assign(json, tsconfigE2eJson)))
-    .then(() => replaceInFile('src/test.ts', 'import \'zone.js/dist/zone-testing\';', `
-      import 'zone.js/dist/long-stack-trace-zone';
-      import 'zone.js/dist/proxy.js';
-      import 'zone.js/dist/sync-test';
-      import 'zone.js/dist/jasmine-patch';
-      import 'zone.js/dist/async-test';
-      import 'zone.js/dist/fake-async-test';
-    `));
-}
-
-// Convert a Angular 5 project to Angular 4.
-export function useNg4() {
-  const ng4Deps: any = {
-    'dependencies': {
-      '@angular/common': '^4.4.6',
-      '@angular/compiler': '^4.4.6',
-      '@angular/core': '^4.4.6',
-      '@angular/forms': '^4.4.6',
-      '@angular/http': '^4.4.6',
-      '@angular/platform-browser': '^4.4.6',
-      '@angular/platform-browser-dynamic': '^4.4.6',
-      '@angular/router': '^4.4.6',
-      'zone.js': '^0.8.14'
-    },
-    'devDependencies': {
-      '@angular/compiler-cli': '^4.4.6',
-      'typescript': '~2.3.3'
-    }
-  };
-
-
-  return Promise.resolve()
-    .then(() => updateJsonFile('package.json', json => {
-      Object.keys(ng4Deps['dependencies']).forEach(pkgName => {
-        json['dependencies'][pkgName] = ng4Deps['dependencies'][pkgName];
-      });
-      Object.keys(ng4Deps['devDependencies']).forEach(pkgName => {
-        json['devDependencies'][pkgName] = ng4Deps['devDependencies'][pkgName];
-      });
-      console.log(JSON.stringify(json));
-    }));
-}
-
 export async function isPrereleaseCli() {
   const angularCliPkgJson = JSON.parse(await readFile('node_modules/@angular/cli/package.json'));
   const pre = prerelease(angularCliPkgJson.version);
diff --git a/tests/legacy-cli/verdaccio.yaml b/tests/legacy-cli/verdaccio.yaml
index 1a3c825278c3..75ca0c10e257 100644
--- a/tests/legacy-cli/verdaccio.yaml
+++ b/tests/legacy-cli/verdaccio.yaml
@@ -18,7 +18,7 @@ packages:
     access: $all
     publish: $all
 
-  '@ngtools/*':
+  '@ngtools/webpack':
     access: $all
     publish: $all
 

From 9d4d5742bb0ca6b52a7b293e29fab592fe534d4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Exbrayat?=
 <cexbrayat@users.noreply.github.com>
Date: Mon, 15 Jul 2019 18:50:16 +0200
Subject: [PATCH 1634/1703] feat(@schematics/angular): enable ivy in tests
 (#15044)

If a project is generated with `enableIvy`, this commit adds the necessary configuration to `tsconfig.spec.json` to then run the tests with Ivy. Note that the CLI already does the correct work (runs `ngcc` and then runs the tests).
---
 .../angular/application/files/tsconfig.spec.json.template    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/angular/application/files/tsconfig.spec.json.template b/packages/schematics/angular/application/files/tsconfig.spec.json.template
index 72aa864c8732..df547643751e 100644
--- a/packages/schematics/angular/application/files/tsconfig.spec.json.template
+++ b/packages/schematics/angular/application/files/tsconfig.spec.json.template
@@ -14,5 +14,8 @@
   "include": [
     "src/**/*.spec.ts",
     "src/**/*.d.ts"
-  ]
+  ]<% if (enableIvy) { %>,
+  "angularCompilerOptions": {
+    "enableIvy": true
+  }<% } %>
 }

From 41c86610c5c1a60ec54b278909b911fed0e6d251 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 15 Jul 2019 22:56:40 +0200
Subject: [PATCH 1635/1703] test: fix safari 10.1 e2e differential loading
 browser test (#15085)

Closes: #15084
---
 .../e2e/assets/protractor-saucelabs.conf.js     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/tests/legacy-cli/e2e/assets/protractor-saucelabs.conf.js b/tests/legacy-cli/e2e/assets/protractor-saucelabs.conf.js
index d3f5cd26834c..01651880f517 100644
--- a/tests/legacy-cli/e2e/assets/protractor-saucelabs.conf.js
+++ b/tests/legacy-cli/e2e/assets/protractor-saucelabs.conf.js
@@ -33,14 +33,15 @@ exports.config = {
       version: '9.0',
       tunnelIdentifier,
     },
-    // TODO: Investigate. Failure:
-    // Failed: Error while running testForAngular: undefined is not an object (evaluating 'd.prototype[b].apply')
-    // {
-    //   browserName: 'safari',
-    //   platform: 'OS X 10.12',
-    //   version: '10.1',
-    //   tunnelIdentifier,
-    // },
+    {
+      browserName: 'safari',
+      platform: 'OS X 10.12',
+      version: '10.1',
+      // This specific version is needed as otherwise it will not pass
+      // See: https://github.com/angular/angular-cli/issues/15084
+      seleniumVersion: '3.4.0',
+      tunnelIdentifier,
+    },
     {
       browserName: 'safari',
       platform: 'macOS 10.13',

From f568fe06841814d0a311e6cdf16b59e1b5ff5ca3 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Mon, 15 Jul 2019 23:56:56 +0300
Subject: [PATCH 1636/1703] build: update browserslist to version 4.6.6
 (#15072)

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 27 ++++++++-----------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 08f48c63ed0c..95fc1c26deb6 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -14,7 +14,7 @@
     "@ngtools/webpack": "0.0.0",
     "ajv": "6.10.2",
     "autoprefixer": "9.6.1",
-    "browserslist": "4.6.4",
+    "browserslist": "4.6.6",
     "caniuse-lite": "1.0.30000984",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
diff --git a/yarn.lock b/yarn.lock
index 0f6f8bcd5cbc..87559033e64c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1747,13 +1747,13 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@4.6.4:
-  version "4.6.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.4.tgz#fd0638b3f8867fec2c604ed0ed9300379f8ec7c2"
-  integrity sha512-ErJT8qGfRt/VWHSr1HeqZzz50DvxHtr1fVL1m5wf20aGrG8e1ce8fpZ2EjZEfs09DDZYSvtRaDlMpWslBf8Low==
+browserslist@4.6.6:
+  version "4.6.6"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.6.tgz#6e4bf467cde520bc9dbdf3747dafa03531cec453"
+  integrity sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==
   dependencies:
-    caniuse-lite "^1.0.30000981"
-    electron-to-chromium "^1.3.188"
+    caniuse-lite "^1.0.30000984"
+    electron-to-chromium "^1.3.191"
     node-releases "^1.1.25"
 
 browserslist@^4.0.0, browserslist@^4.3.3:
@@ -2004,7 +2004,7 @@ camelcase@^5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@1.0.30000984:
+caniuse-lite@1.0.30000984, caniuse-lite@^1.0.30000984:
   version "1.0.30000984"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000984.tgz#dc96c3c469e9bcfc6ad5bdd24c77ec918ea76fe0"
   integrity sha512-n5tKOjMaZ1fksIpQbjERuqCyfgec/m9pferkFQbLmWtqLUdmt12hNhjSwsmPdqeiG2NkITOQhr1VYIwWSAceiA==
@@ -2029,11 +2029,6 @@ caniuse-lite@^1.0.30000980:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000980.tgz#0df53e4354b3111f83ac15b0bd4c71fe92994231"
   integrity sha512-as0PRtWHaX3gl2gpC7qA7bX88lr+qLacMMXm1QKLLQtBCwT/Ljbgrv5EXKMNBoeEX6yFZ4vIsBb4Nh+PEwW2Rw==
 
-caniuse-lite@^1.0.30000981:
-  version "1.0.30000983"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000983.tgz#ab3c70061ca2a3467182a10ac75109b199b647f8"
-  integrity sha512-/llD1bZ6qwNkt41AsvjsmwNOoA4ZB+8iqmf5LVyeSXuBODT/hAMFNVOh84NdUzoiYiSKqo5vQ3ZzeYHSi/olDQ==
-
 canonical-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
@@ -3454,10 +3449,10 @@ electron-to-chromium@^1.3.164:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.164.tgz#8680b875577882c1572c42218d53fa9ba5f71d5d"
   integrity sha512-VLlalqUeduN4+fayVtRZvGP2Hl1WrRxlwzh2XVVMJym3IFrQUS29BFQ1GP/BxOJXJI1OFCrJ5BnFEsAe8NHtOg==
 
-electron-to-chromium@^1.3.188:
-  version "1.3.188"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.188.tgz#e28e1afe4bb229989e280bfd3b395c7ec03c8b7a"
-  integrity sha512-tEQcughYIMj8WDMc59EGEtNxdGgwal/oLLTDw+NEqJRJwGflQvH3aiyiexrWeZOETP4/ko78PVr6gwNhdozvuQ==
+electron-to-chromium@^1.3.191:
+  version "1.3.191"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.191.tgz#c451b422cd8b2eab84dedabab5abcae1eaefb6f0"
+  integrity sha512-jasjtY5RUy/TOyiUYM2fb4BDaPZfm6CXRFeJDMfFsXYADGxUN49RBqtgB7EL2RmJXeIRUk9lM1U6A5yk2YJMPQ==
 
 elliptic@^6.0.0:
   version "6.4.1"

From b5924febb28a8e406c55c967a1621c2aecf528b0 Mon Sep 17 00:00:00 2001
From: Judy Bogart <31899326+jbogarthyde@users.noreply.github.com>
Date: Mon, 15 Jul 2019 16:31:08 -0700
Subject: [PATCH 1637/1703] Document possible values of analytics command
 (#15039)

* docs: add possible values to ref doc for analytics command

* docs: add ci value
---
 packages/angular/cli/commands/analytics-long.md | 7 +++++++
 packages/angular/cli/commands/analytics.json    | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 packages/angular/cli/commands/analytics-long.md

diff --git a/packages/angular/cli/commands/analytics-long.md b/packages/angular/cli/commands/analytics-long.md
new file mode 100644
index 000000000000..60e0d86686e8
--- /dev/null
+++ b/packages/angular/cli/commands/analytics-long.md
@@ -0,0 +1,7 @@
+The value of *settingOrProject* is one of the following.
+* "on" : Enables analytics gathering and reporting for the user.
+* "off" : Disables analytics gathering and reporting for the user.
+* "ci" : Enables analytics and configures reporting for use with Continuous Integration,
+which uses a common CI user.
+* "prompt" : Prompts the user to set the status interactively.
+* "project" : Sets the default status for the project to the *projectSetting* value, which can be any of the other values. The *projectSetting* argument is ignored for all other values of *settingOrProject*.
\ No newline at end of file
diff --git a/packages/angular/cli/commands/analytics.json b/packages/angular/cli/commands/analytics.json
index f2e17059161f..f806e5c8e7bf 100644
--- a/packages/angular/cli/commands/analytics.json
+++ b/packages/angular/cli/commands/analytics.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/schema",
   "$id": "ng-cli://commands/analytics.json",
   "description": "Configures the gathering of Angular CLI usage metrics. See https://v8.angular.io/cli/usage-analytics-gathering.",
-  "$longDescription": "",
+  "$longDescription": "./analytics-long.md",
 
   "$aliases": [],
   "$scope": "all",

From bf8441304c1cfc3d5bc5a27e61d44d0d39b0f667 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 16 Jul 2019 17:27:26 +0300
Subject: [PATCH 1638/1703] build: update sass to version 1.22.5 (#15089)

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 95fc1c26deb6..740817de7800 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -37,7 +37,7 @@
     "postcss-loader": "3.0.0",
     "raw-loader": "1.0.0",
     "rxjs": "6.4.0",
-    "sass": "1.22.4",
+    "sass": "1.22.5",
     "sass-loader": "7.1.0",
     "semver": "6.2.0",
     "source-map-support": "0.5.12",
diff --git a/yarn.lock b/yarn.lock
index 87559033e64c..10814b94483a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9093,10 +9093,10 @@ sass-loader@7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
-sass@1.22.4:
-  version "1.22.4"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.22.4.tgz#00b433055f00a25ed5f060ca4abc332facaf02fc"
-  integrity sha512-gQFNzYKlAn9ee6Qy1UhTxy0G24QR5BWP61AN61jAEqwauzVCP5qjUveO/WkIj72po0ljncdVXo96EQR+ig2lRw==
+sass@1.22.5:
+  version "1.22.5"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.22.5.tgz#0436ba64eaad4c9eb523480c141becc330ddd90b"
+  integrity sha512-Z06zPez82QqlQbqvGKMMEs2bBpLUsmFQxd+8wZJedkptMn8jyk+fccMhfUloD8HsfsYw572ca7Be3zbMBsip4A==
   dependencies:
     chokidar ">=2.0.0 <4.0.0"
 

From dbea7d5c9f145a1c113ffb997de7e10dc3d170d6 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 16 Jul 2019 17:28:10 +0300
Subject: [PATCH 1639/1703] build: update @angular/animations to version
 (#15088)

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 20510504db9a..982a3d133649 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#68f54731bd13545d015042cd182c27a105309468",
-    "@angular/common": "github:angular/common-builds#b8292525b518ee2e55418a77490dbc088779bd49",
-    "@angular/compiler": "github:angular/compiler-builds#944776fc6fbb0b3766ae60a01a60cfe819594925",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#b55708729f50605a18db7eb93f812de10930f303",
-    "@angular/core": "github:angular/core-builds#d13b5a6da61e01558463491000b85a381a251ae3",
-    "@angular/forms": "github:angular/forms-builds#2f60b2df87e5f851a9c6f9981a0d5e8649763cdc",
-    "@angular/language-service": "github:angular/language-service-builds#6c70ef077b8b4e2ef8973e15280a6d610edd2284",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#bca102c0ed014d321d716d7db5c9568531a27d81",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#f42403fb1aff67e080d689457bf2185e8d6e5c7b",
-    "@angular/router": "github:angular/router-builds#9b5d77107e6fabc76f7a3a7433b7f43ad7db50c2"
+    "@angular/animations": "github:angular/animations-builds#a77928455c835dac4c0ca8437db1529ff06db340",
+    "@angular/common": "github:angular/common-builds#05c13c9e12381e89d7053f61a1b33aee678d1a96",
+    "@angular/compiler": "github:angular/compiler-builds#1cdbb28ed56085b62b04e2046c2f04d5eb3b3792",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#fb1df7528e6bbfaadebacb13bd3deeab8b8e29f8",
+    "@angular/core": "github:angular/core-builds#5a90a0c918281bd814cd949c23b8e6ea989f166e",
+    "@angular/forms": "github:angular/forms-builds#45566b5ae1c47eaec0e257a6e75b0fb6c6ea4a1c",
+    "@angular/language-service": "github:angular/language-service-builds#f91750bc3c13ec9555f9d4a30718a1a812a1cd87",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#ec4e3bac0cd80b3fdaf1e651524d9bda9af440ef",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#b1107bf372feac806f7738783dd5dda8fa6d9b48",
+    "@angular/router": "github:angular/router-builds#5c59bfa8b856fd96dc0439889e79f035a459cab8"
   }
 }
\ No newline at end of file

From d274add7b4e41e39debd32306d35aadfff40bb54 Mon Sep 17 00:00:00 2001
From: Minko Gechev <mgechev@gmail.com>
Date: Tue, 16 Jul 2019 09:58:01 -0700
Subject: [PATCH 1640/1703] fix(@angular/cli): use correct schematic defaults
 considering workspace (#15041)

Fix #14986

This PR includes some refactoring to simplify the interaction
of the `NodeWorkflow` and the `BaseWorkflow` with the registry.

We were registering redundant `addPostTransform`s. Some of them in
the constructor of the `BaseWorkflow`, which did not allow us to
intercept `addUndefinedDefaults`.

Additionally, we were setting the `validateOptionsWithSchema` transform
multiple times unnecessarily.

An issue left to fix is support for the `--project` option in
schematic commands. Currently, `getProjectName` does not know about
this option, since `createWorkflow` does not know how to parse the
command line arguments. The parsing logic is implemented partially
by the concrete implementation of the `SchematicCommand` template
method.
---
 .../schematics/tools/index.d.ts               |  4 ++
 .../angular/cli/models/schematic-command.ts   | 38 +++++++++++++------
 .../schematics/tools/description.ts           |  3 ++
 .../tools/workflow/node-workflow.ts           |  8 ++--
 .../tools/workflow/node-workflow_spec.ts      |  1 +
 .../schematics_cli/bin/schematics.ts          | 10 +++--
 6 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/etc/api/angular_devkit/schematics/tools/index.d.ts b/etc/api/angular_devkit/schematics/tools/index.d.ts
index 9fc13dbca786..912d3bedcdd6 100644
--- a/etc/api/angular_devkit/schematics/tools/index.d.ts
+++ b/etc/api/angular_devkit/schematics/tools/index.d.ts
@@ -28,6 +28,7 @@ export declare type FileSystemCollection = Collection<FileSystemCollectionDescri
 export declare type FileSystemCollectionDesc = CollectionDescription<FileSystemCollectionDescription>;
 
 export interface FileSystemCollectionDescription {
+    readonly name: string;
     readonly path: string;
     readonly schematics: {
         [name: string]: FileSystemSchematicDesc;
@@ -92,9 +93,11 @@ export interface FileSystemSchematicDescription extends FileSystemSchematicJsonD
 
 export interface FileSystemSchematicJsonDescription {
     readonly aliases?: string[];
+    readonly collection: FileSystemCollectionDescription;
     readonly description: string;
     readonly extends?: string;
     readonly factory: string;
+    readonly name: string;
     readonly schema?: string;
 }
 
@@ -135,6 +138,7 @@ export declare class NodeWorkflow extends workflow.BaseWorkflow {
         dryRun?: boolean;
         root?: Path;
         packageManager?: string;
+        registry?: schema.CoreSchemaRegistry;
     });
 }
 
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index f5a4a5b67073..7cd74c07caf6 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -16,11 +16,17 @@ import {
   workspaces,
 } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
-import { DryRunEvent, UnsuccessfulWorkflowExecution, workflow } from '@angular-devkit/schematics';
+import {
+  DryRunEvent,
+  UnsuccessfulWorkflowExecution,
+  formats,
+  workflow,
+} from '@angular-devkit/schematics';
 import {
   FileSystemCollection,
   FileSystemEngine,
   FileSystemSchematic,
+  FileSystemSchematicDescription,
   NodeWorkflow,
   validateOptionsWithSchema,
 } from '@angular-devkit/schematics/tools';
@@ -246,6 +252,7 @@ export abstract class SchematicCommand<
       dryRun,
       packageManager: getPackageManager(this.workspace.root),
       root: normalize(this.workspace.root),
+      registry: new schema.CoreSchemaRegistry(formats.standardFormats),
     });
     workflow.engineHost.registerContextTransform(context => {
       // This is run by ALL schematics, so if someone uses `externalSchematics(...)` which
@@ -261,15 +268,7 @@ export abstract class SchematicCommand<
       }
     });
 
-    workflow.engineHost.registerOptionsTransform(validateOptionsWithSchema(workflow.registry));
-
-    if (options.defaults) {
-      workflow.registry.addPreTransform(schema.transforms.addUndefinedDefaults);
-    } else {
-      workflow.registry.addPostTransform(schema.transforms.addUndefinedDefaults);
-    }
-
-    workflow.registry.addSmartDefaultProvider('projectName', () => {
+    const getProjectName = () => {
       if (this._workspace) {
         const projectNames = getProjectsByPath(this._workspace, process.cwd(), this.workspace.root);
 
@@ -292,7 +291,24 @@ export abstract class SchematicCommand<
       }
 
       return undefined;
-    });
+    };
+
+    workflow.engineHost.registerOptionsTransform(
+      <T extends {}>(schematic: FileSystemSchematicDescription, current: T) => ({
+        ...getSchematicDefaults(schematic.collection.name, schematic.name, getProjectName()),
+        ...current,
+      }),
+    );
+
+    if (options.defaults) {
+      workflow.registry.addPreTransform(schema.transforms.addUndefinedDefaults);
+    } else {
+      workflow.registry.addPostTransform(schema.transforms.addUndefinedDefaults);
+    }
+
+    workflow.engineHost.registerOptionsTransform(validateOptionsWithSchema(workflow.registry));
+
+    workflow.registry.addSmartDefaultProvider('projectName', getProjectName);
 
     if (options.interactive !== false && isTTY()) {
       workflow.registry.usePromptProvider((definitions: Array<schema.PromptDefinition>) => {
diff --git a/packages/angular_devkit/schematics/tools/description.ts b/packages/angular_devkit/schematics/tools/description.ts
index b95ecab8f813..52ee09d13f7c 100644
--- a/packages/angular_devkit/schematics/tools/description.ts
+++ b/packages/angular_devkit/schematics/tools/description.ts
@@ -19,6 +19,7 @@ import {
 
 
 export interface FileSystemCollectionDescription {
+  readonly name: string;
   readonly path: string;
   readonly version?: string;
   readonly schematics: { [name: string]: FileSystemSchematicDesc };
@@ -28,6 +29,8 @@ export interface FileSystemCollectionDescription {
 export interface FileSystemSchematicJsonDescription {
   readonly aliases?: string[];
   readonly factory: string;
+  readonly name: string;
+  readonly collection: FileSystemCollectionDescription;
   readonly description: string;
   readonly schema?: string;
   readonly extends?: string;
diff --git a/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts b/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts
index 8649e9712108..9c55e7267995 100644
--- a/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts
+++ b/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts
@@ -5,14 +5,13 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Path, getSystemPath, virtualFs } from '@angular-devkit/core';
+import { Path, getSystemPath, schema, virtualFs } from '@angular-devkit/core';
 import {
   workflow,
 } from '@angular-devkit/schematics';  // tslint:disable-line:no-implicit-dependencies
 import { BuiltinTaskExecutor } from '../../tasks/node';
 import { FileSystemEngine } from '../description';
 import { NodeModulesEngineHost } from '../node-module-engine-host';
-import { validateOptionsWithSchema } from '../schema-option-transform';
 
 /**
  * A workflow specifically for Node tools.
@@ -23,8 +22,9 @@ export class NodeWorkflow extends workflow.BaseWorkflow {
     options: {
       force?: boolean;
       dryRun?: boolean;
-      root?: Path,
+      root?: Path;
       packageManager?: string;
+      registry?: schema.CoreSchemaRegistry;
     },
   ) {
     const engineHost = new NodeModulesEngineHost();
@@ -34,9 +34,9 @@ export class NodeWorkflow extends workflow.BaseWorkflow {
 
       force: options.force,
       dryRun: options.dryRun,
+      registry: options.registry
     });
 
-    engineHost.registerOptionsTransform(validateOptionsWithSchema(this._registry));
     engineHost.registerTaskExecutor(
       BuiltinTaskExecutor.NodePackage,
       {
diff --git a/packages/angular_devkit/schematics/tools/workflow/node-workflow_spec.ts b/packages/angular_devkit/schematics/tools/workflow/node-workflow_spec.ts
index df2af3c9d94c..22b25beb5786 100644
--- a/packages/angular_devkit/schematics/tools/workflow/node-workflow_spec.ts
+++ b/packages/angular_devkit/schematics/tools/workflow/node-workflow_spec.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 // tslint:disable:no-implicit-dependencies
+import { schema } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { NodeWorkflow } from '@angular-devkit/schematics/tools';
 import * as path from 'path';
diff --git a/packages/angular_devkit/schematics_cli/bin/schematics.ts b/packages/angular_devkit/schematics_cli/bin/schematics.ts
index 3ce98f7fa17f..255591e3728b 100644
--- a/packages/angular_devkit/schematics_cli/bin/schematics.ts
+++ b/packages/angular_devkit/schematics_cli/bin/schematics.ts
@@ -7,8 +7,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import 'symbol-observable';
 // symbol polyfill must go first
+import 'symbol-observable';
 // tslint:disable-next-line:ordered-imports import-groups
 import {
   JsonObject,
@@ -24,8 +24,9 @@ import {
   DryRunEvent,
   SchematicEngine,
   UnsuccessfulWorkflowExecution,
+  formats
 } from '@angular-devkit/schematics';
-import { NodeModulesEngineHost, NodeWorkflow } from '@angular-devkit/schematics/tools';
+import { NodeModulesEngineHost, NodeWorkflow, validateOptionsWithSchema } from '@angular-devkit/schematics/tools';
 import * as inquirer from 'inquirer';
 import * as minimist from 'minimist';
 
@@ -160,9 +161,12 @@ export async function main({
 
   /** Create a Virtual FS Host scoped to where the process is being run. **/
   const fsHost = new virtualFs.ScopedHost(new NodeJsSyncHost(), normalize(process.cwd()));
+  const registry = new schema.CoreSchemaRegistry(formats.standardFormats);
 
   /** Create the workflow that will be executed with this run. */
-  const workflow = new NodeWorkflow(fsHost, { force, dryRun });
+  const workflow = new NodeWorkflow(fsHost, { force, dryRun, registry });
+  registry.addPostTransform(schema.transforms.addUndefinedDefaults);
+  workflow.engineHost.registerOptionsTransform(validateOptionsWithSchema(registry));
 
   // Indicate to the user when nothing has been done. This is automatically set to off when there's
   // a new DryRunEvent.

From f8a58213eb6450f6b7313ae9f2a39632757b2412 Mon Sep 17 00:00:00 2001
From: Charles <19598772+clydin@users.noreply.github.com>
Date: Tue, 16 Jul 2019 12:58:19 -0400
Subject: [PATCH 1641/1703] feat(@angular-devkit/build-angular): add defer
 attributes to classic scripts (#15087)

This change synchronizes the behavior of classic scripts and module scripts (`type="module"`).  Module scripts are deferred by default.  Also, certain injected scripts are not considered module scripts even in a ES2015+ build due to the strict mode behavior of module scripts.  Deferring such scripts also ensures consistent execution in those scenarios.
---
 .../index-file/augment-index-html.ts          |  6 ++-
 .../index-file/augment-index-html_spec.ts     | 16 +++----
 .../test/browser/cross-origin_spec_large.ts   | 30 ++++++-------
 .../test/browser/index_spec_large.ts          | 42 +++++++++----------
 .../test/browser/scripts-array_spec_large.ts  | 12 +++---
 .../test/browser/service-worker_spec_large.ts |  4 +-
 .../test/browser/styles_spec_large.ts         | 12 +++---
 .../test/dev-server/index_spec_large.ts       | 12 +++---
 .../e2e/tests/basic/scripts-array.ts          | 12 +++---
 .../e2e/tests/basic/styles-array.ts           |  8 ++--
 tests/legacy-cli/e2e/tests/build/polyfills.ts |  8 ++--
 .../e2e/tests/build/styles/extract-css.ts     | 20 ++++-----
 tests/legacy-cli/e2e/tests/misc/support-ie.ts | 34 +++++++--------
 .../e2e/tests/misc/support-safari-10.1.ts     | 22 +++++-----
 .../e2e/tests/third-party/bootstrap.ts        | 18 ++++----
 15 files changed, 130 insertions(+), 126 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html.ts
index 3b42e21df687..bc1591bad662 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html.ts
@@ -150,10 +150,14 @@ export async function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise
       const isModuleType = moduleFiles.some(scriptPredictor);
 
       if (isNoModuleType && !isModuleType) {
-        attrs.push({ name: 'nomodule', value: null });
+        attrs.push({ name: 'nomodule', value: null }, { name: 'defer', value: null });
       } else if (isModuleType && !isNoModuleType) {
         attrs.push({ name: 'type', value: 'module' });
+      } else {
+        attrs.push({ name: 'defer', value: null });
       }
+    } else {
+      attrs.push({ name: 'defer', value: null });
     }
 
     if (params.sri) {
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html_spec.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html_spec.ts
index fb8a444d9063..269c0ef43c55 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html_spec.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/index-file/augment-index-html_spec.ts
@@ -41,9 +41,9 @@ describe('augment-index-html', () => {
           <link rel="stylesheet" href="styles.css">
         </head>
         <body>
-          <script src="runtime.js"></script>
-          <script src="polyfills.js"></script>
-          <script src="main.js"></script>
+          <script src="runtime.js" defer></script>
+          <script src="polyfills.js" defer></script>
+          <script src="main.js" defer></script>
         </body>
       </html>
     `);
@@ -84,10 +84,10 @@ describe('augment-index-html', () => {
         <body>
           <script src="runtime-es2015.js" type="module"></script>
           <script src="polyfills-es2015.js" type="module"></script>
-          <script src="runtime-es5.js" nomodule></script>
-          <script src="polyfills-es5.js" nomodule></script>
+          <script src="runtime-es5.js" nomodule defer></script>
+          <script src="polyfills-es5.js" nomodule defer></script>
           <script src="main-es2015.js" type="module"></script>
-          <script src="main-es5.js" nomodule></script>
+          <script src="main-es5.js" nomodule defer></script>
         </body>
       </html>
     `);
@@ -124,9 +124,9 @@ describe('augment-index-html', () => {
           <link rel="stylesheet" href="styles.css">
         </head>
         <body>
-          <script src="scripts.js"></script>
+          <script src="scripts.js" defer></script>
           <script src="main-es2015.js" type="module"></script>
-          <script src="main-es5.js" nomodule></script>
+          <script src="main-es5.js" nomodule defer></script>
         </body>
       </html>
     `);
diff --git a/packages/angular_devkit/build_angular/test/browser/cross-origin_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/cross-origin_spec_large.ts
index 01a03a460cb5..1e787262a84e 100644
--- a/packages/angular_devkit/build_angular/test/browser/cross-origin_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/cross-origin_spec_large.ts
@@ -40,11 +40,11 @@ describe('Browser Builder crossOrigin', () => {
     expect(content).toBe(
       `<html><head><base href="/"></head>` +
         `<body><app-root></app-root>` +
-        `<script src="runtime.js" crossorigin="use-credentials"></script>` +
-        `<script src="polyfills.js" crossorigin="use-credentials"></script>` +
-        `<script src="styles.js" crossorigin="use-credentials"></script>` +
-        `<script src="vendor.js" crossorigin="use-credentials"></script>` +
-        `<script src="main.js" crossorigin="use-credentials"></script></body></html>`,
+        `<script src="runtime.js" crossorigin="use-credentials" defer></script>` +
+        `<script src="polyfills.js" crossorigin="use-credentials" defer></script>` +
+        `<script src="styles.js" crossorigin="use-credentials" defer></script>` +
+        `<script src="vendor.js" crossorigin="use-credentials" defer></script>` +
+        `<script src="main.js" crossorigin="use-credentials" defer></script></body></html>`,
     );
     await run.stop();
   });
@@ -59,11 +59,11 @@ describe('Browser Builder crossOrigin', () => {
     expect(content).toBe(
       `<html><head><base href="/"></head>` +
         `<body><app-root></app-root>` +
-        `<script src="runtime.js" crossorigin="anonymous"></script>` +
-        `<script src="polyfills.js" crossorigin="anonymous"></script>` +
-        `<script src="styles.js" crossorigin="anonymous"></script>` +
-        `<script src="vendor.js" crossorigin="anonymous"></script>` +
-        `<script src="main.js" crossorigin="anonymous"></script></body></html>`,
+        `<script src="runtime.js" crossorigin="anonymous" defer></script>` +
+        `<script src="polyfills.js" crossorigin="anonymous" defer></script>` +
+        `<script src="styles.js" crossorigin="anonymous" defer></script>` +
+        `<script src="vendor.js" crossorigin="anonymous" defer></script>` +
+        `<script src="main.js" crossorigin="anonymous" defer></script></body></html>`,
     );
     await run.stop();
   });
@@ -78,11 +78,11 @@ describe('Browser Builder crossOrigin', () => {
     expect(content).toBe(
       `<html><head><base href="/"></head>` +
         `<body><app-root></app-root>` +
-        `<script src="runtime.js"></script>` +
-        `<script src="polyfills.js"></script>` +
-        `<script src="styles.js"></script>` +
-        `<script src="vendor.js"></script>` +
-        `<script src="main.js"></script></body></html>`,
+        `<script src="runtime.js" defer></script>` +
+        `<script src="polyfills.js" defer></script>` +
+        `<script src="styles.js" defer></script>` +
+        `<script src="vendor.js" defer></script>` +
+        `<script src="main.js" defer></script></body></html>`,
     );
     await run.stop();
   });
diff --git a/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts
index 7b30b0f28102..9da24721f57c 100644
--- a/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/index_spec_large.ts
@@ -35,9 +35,9 @@ describe('Browser Builder index HTML processing', () => {
     const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
     expect(content).toBe(
       `<html><head><base href="/"></head>`
-      + `<body><app-root></app-root><script src="runtime.js"></script>`
-      + `<script src="polyfills.js"></script><script src="styles.js"></script>`
-      + `<script src="vendor.js"></script><script src="main.js"></script></body></html>`,
+      + `<body><app-root></app-root><script src="runtime.js" defer></script>`
+      + `<script src="polyfills.js" defer></script><script src="styles.js" defer></script>`
+      + `<script src="vendor.js" defer></script><script src="main.js" defer></script></body></html>`,
     );
     await run.stop();
   });
@@ -57,9 +57,9 @@ describe('Browser Builder index HTML processing', () => {
     const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
     expect(content).toBe(
       `<html><head><base href="/"></head><body><app-root></app-root>`
-      + `<script src="runtime.js"></script><script src="polyfills.js"></script>`
-      + `<script src="styles.js"></script><script src="vendor.js"></script>`
-      + `<script src="main.js"></script></body></html>`,
+      + `<script src="runtime.js" defer></script><script src="polyfills.js" defer></script>`
+      + `<script src="styles.js" defer></script><script src="vendor.js" defer></script>`
+      + `<script src="main.js" defer></script></body></html>`,
     );
     await run.stop();
   });
@@ -79,9 +79,9 @@ describe('Browser Builder index HTML processing', () => {
     const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
     expect(content).toBe(
       `<html><head><title>&iacute;</title><base href="/"></head> `
-      + `<body><app-root></app-root><script src="runtime.js"></script>`
-      + `<script src="polyfills.js"></script><script src="styles.js"></script>`
-      + `<script src="vendor.js"></script><script src="main.js"></script></body></html>`,
+      + `<body><app-root></app-root><script src="runtime.js" defer></script>`
+      + `<script src="polyfills.js" defer></script><script src="styles.js" defer></script>`
+      + `<script src="vendor.js" defer></script><script src="main.js" defer></script></body></html>`,
     );
     await run.stop();
   });
@@ -101,9 +101,9 @@ describe('Browser Builder index HTML processing', () => {
     const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
     expect(content).toBe(
       `<html><head><base href="/"><%= csrf_meta_tags %></head> `
-      + `<body><app-root></app-root><script src="runtime.js"></script>`
-      + `<script src="polyfills.js"></script><script src="styles.js"></script>`
-      + `<script src="vendor.js"></script><script src="main.js"></script></body></html>`,
+      + `<body><app-root></app-root><script src="runtime.js" defer></script>`
+      + `<script src="polyfills.js" defer></script><script src="styles.js" defer></script>`
+      + `<script src="vendor.js" defer></script><script src="main.js" defer></script></body></html>`,
     );
     await run.stop();
   });
@@ -146,9 +146,9 @@ describe('Browser Builder index HTML processing', () => {
     const content = await host.read(normalize(outputIndexPath)).toPromise();
     expect(virtualFs.fileBufferToString(content)).toBe(
       `<html><head><base href="/"><%= csrf_meta_tags %></head> `
-      + `<body><app-root></app-root><script src="runtime.js"></script>`
-      + `<script src="polyfills.js"></script><script src="styles.js"></script>`
-      + `<script src="vendor.js"></script><script src="main.js"></script></body></html>`,
+      + `<body><app-root></app-root><script src="runtime.js" defer></script>`
+      + `<script src="polyfills.js" defer></script><script src="styles.js" defer></script>`
+      + `<script src="vendor.js" defer></script><script src="main.js" defer></script></body></html>`,
     );
   });
 
@@ -189,9 +189,9 @@ describe('Browser Builder index HTML processing', () => {
     const content = await host.read(normalize(outputIndexPath)).toPromise();
     expect(virtualFs.fileBufferToString(content)).toBe(
       `<html><head><base href="/"></head> `
-      + `<body><app-root></app-root><script src="runtime.js"></script>`
-      + `<script src="polyfills.js"></script><script src="styles.js"></script>`
-      + `<script src="vendor.js"></script><script src="main.js"></script></body></html>`,
+      + `<body><app-root></app-root><script src="runtime.js" defer></script>`
+      + `<script src="polyfills.js" defer></script><script src="styles.js" defer></script>`
+      + `<script src="vendor.js" defer></script><script src="main.js" defer></script></body></html>`,
     );
   });
 
@@ -232,9 +232,9 @@ describe('Browser Builder index HTML processing', () => {
     const content = await host.read(normalize(outputIndexPath)).toPromise();
     expect(virtualFs.fileBufferToString(content)).toBe(
       `<html><head><base href="/"></head> `
-      + `<body><app-root></app-root><script src="runtime.js"></script>`
-      + `<script src="polyfills.js"></script><script src="styles.js"></script>`
-      + `<script src="vendor.js"></script><script src="main.js"></script></body></html>`,
+      + `<body><app-root></app-root><script src="runtime.js" defer></script>`
+      + `<script src="polyfills.js" defer></script><script src="styles.js" defer></script>`
+      + `<script src="vendor.js" defer></script><script src="main.js" defer></script></body></html>`,
     );
   });
 });
diff --git a/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
index 615c3bf8b7c3..77edd2f02376 100644
--- a/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
@@ -54,12 +54,12 @@ describe('Browser Builder scripts array', () => {
       'renamed-script.js': 'pre-rename-script',
       'renamed-lazy-script.js': 'pre-rename-lazy-script',
       'main.js': 'input-script',
-      'index.html': '<script src="runtime.js"></script>'
-        + '<script src="polyfills.js"></script>'
-        + '<script src="scripts.js"></script>'
-        + '<script src="renamed-script.js"></script>'
-        + '<script src="vendor.js"></script>'
-        + '<script src="main.js"></script>',
+      'index.html': '<script src="runtime.js" defer></script>'
+        + '<script src="polyfills.js" defer></script>'
+        + '<script src="scripts.js" defer></script>'
+        + '<script src="renamed-script.js" defer></script>'
+        + '<script src="vendor.js" defer></script>'
+        + '<script src="main.js" defer></script>',
     };
 
     host.writeMultipleFiles(scripts);
diff --git a/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts
index 07508d8fcd82..3b70f2e5f477 100644
--- a/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/service-worker_spec_large.ts
@@ -110,7 +110,7 @@ describe('Browser Builder service worker', () => {
       hashTable: {
         '/favicon.ico': '84161b857f5c547e3699ddfbffc6d8d737542e01',
         '/assets/folder-asset.txt': '617f202968a6a81050aa617c2e28e1dca11ce8d4',
-        '/index.html': '1bcafd53046ffb270ac5e6f3cab23e0442f95c4f',
+        '/index.html': 'f95e7a84949070c4984069b592be7969bc3187a0',
         '/spectrum.png': '8d048ece46c0f3af4b598a95fd8e4709b631c3c0',
       },
     }));
@@ -167,7 +167,7 @@ describe('Browser Builder service worker', () => {
       hashTable: {
         '/foo/bar/favicon.ico': '84161b857f5c547e3699ddfbffc6d8d737542e01',
         '/foo/bar/assets/folder-asset.txt': '617f202968a6a81050aa617c2e28e1dca11ce8d4',
-        '/foo/bar/index.html': '925d80777b6ba64b526b0be79761d254dfe94c65',
+        '/foo/bar/index.html': 'a5359e8e1a516683b32bbb2f9e8bf402dae4738e',
       },
     }));
 
diff --git a/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
index 0bbfd62e544b..4cd161a343a7 100644
--- a/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
@@ -54,12 +54,12 @@ describe('Browser Builder styles', () => {
     };
     const jsIndexMatches: { [path: string]: string } = {
       'index.html':
-        '<script src="runtime.js"></script>' +
-        '<script src="polyfills.js"></script>' +
-        '<script src="styles.js"></script>' +
-        '<script src="renamed-style.js"></script>' +
-        '<script src="vendor.js"></script>' +
-        '<script src="main.js"></script>',
+        '<script src="runtime.js" defer></script>' +
+        '<script src="polyfills.js" defer></script>' +
+        '<script src="styles.js" defer></script>' +
+        '<script src="renamed-style.js" defer></script>' +
+        '<script src="vendor.js" defer></script>' +
+        '<script src="main.js" defer></script>',
     };
 
     host.writeMultipleFiles({
diff --git a/packages/angular_devkit/build_angular/test/dev-server/index_spec_large.ts b/packages/angular_devkit/build_angular/test/dev-server/index_spec_large.ts
index 9ef1269cc1dd..22aca8912431 100644
--- a/packages/angular_devkit/build_angular/test/dev-server/index_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/dev-server/index_spec_large.ts
@@ -76,7 +76,7 @@ describe('Dev Server Builder index', () => {
       '<script src="runtime.js" type="module"></script>' +
         '<script src="polyfills.js" type="module"></script>' +
         '<script src="styles.js" type="module"></script>' +
-        '<script src="scripts.js"></script>' +
+        '<script src="scripts.js" defer></script>' +
         '<script src="vendor.js" type="module"></script>' +
         '<script src="main.js" type="module"></script>',
     );
@@ -96,11 +96,11 @@ describe('Dev Server Builder index', () => {
     expect(output.success).toBe(true);
     const response = await fetch('http://localhost:4200/index.html');
     expect(await response.text()).toContain(
-      '<script src="runtime.js"></script>' +
-        '<script src="polyfills.js"></script>' +
-        '<script src="styles.js"></script>' +
-        '<script src="vendor.js"></script>' +
-        '<script src="main.js"></script>',
+      '<script src="runtime.js" defer></script>' +
+        '<script src="polyfills.js" defer></script>' +
+        '<script src="styles.js" defer></script>' +
+        '<script src="vendor.js" defer></script>' +
+        '<script src="main.js" defer></script>',
     );
     await run.stop();
   });
diff --git a/tests/legacy-cli/e2e/tests/basic/scripts-array.ts b/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
index a3a59832068f..504d7a12ee4e 100644
--- a/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
+++ b/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
@@ -67,14 +67,14 @@ export default function() {
           oneLineTrim`
       <script src="runtime-es2015.js" type="module"></script>
       <script src="polyfills-es2015.js" type="module"></script>
-      <script src="runtime-es5.js" nomodule></script>
-      <script src="polyfills-es5.js" nomodule></script>
-      <script src="scripts.js"></script>
-      <script src="renamed-script.js"></script>
+      <script src="runtime-es5.js" nomodule defer></script>
+      <script src="polyfills-es5.js" nomodule defer></script>
+      <script src="scripts.js" defer></script>
+      <script src="renamed-script.js" defer></script>
       <script src="vendor-es2015.js" type="module"></script>
       <script src="main-es2015.js" type="module"></script>
-      <script src="vendor-es5.js" nomodule></script>
-      <script src="main-es5.js" nomodule></script>
+      <script src="vendor-es5.js" nomodule defer></script>
+      <script src="main-es5.js" nomodule defer></script>
     `,
         ),
       )
diff --git a/tests/legacy-cli/e2e/tests/basic/styles-array.ts b/tests/legacy-cli/e2e/tests/basic/styles-array.ts
index 93565e3c1fca..0a89491cc5f1 100644
--- a/tests/legacy-cli/e2e/tests/basic/styles-array.ts
+++ b/tests/legacy-cli/e2e/tests/basic/styles-array.ts
@@ -55,12 +55,12 @@ export default function() {
           oneLineTrim`
       <script src="runtime-es2015.js" type="module"></script>
       <script src="polyfills-es2015.js" type="module"></script>
-      <script src="runtime-es5.js" nomodule></script>
-      <script src="polyfills-es5.js" nomodule></script>
+      <script src="runtime-es5.js" nomodule defer></script>
+      <script src="polyfills-es5.js" nomodule defer></script>
       <script src="vendor-es2015.js" type="module"></script>
       <script src="main-es2015.js" type="module"></script>
-      <script src="vendor-es5.js" nomodule></script>
-      <script src="main-es5.js" nomodule></script>
+      <script src="vendor-es5.js" nomodule defer></script>
+      <script src="main-es5.js" nomodule defer></script>
     `,
         ),
       )
diff --git a/tests/legacy-cli/e2e/tests/build/polyfills.ts b/tests/legacy-cli/e2e/tests/build/polyfills.ts
index 170574e17396..6c61ab6c919c 100644
--- a/tests/legacy-cli/e2e/tests/build/polyfills.ts
+++ b/tests/legacy-cli/e2e/tests/build/polyfills.ts
@@ -16,8 +16,8 @@ export default async function () {
     await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script src="runtime-es2015.js" type="module"></script>
       <script src="polyfills-es2015.js" type="module"></script>
-      <script src="runtime-es5.js" nomodule></script>
-      <script src="polyfills-es5.js" nomodule></script>
+      <script src="runtime-es5.js" nomodule defer></script>
+      <script src="polyfills-es5.js" nomodule defer></script>
     `);
     const jitPolyfillSize = await getFileSize('dist/test-project/polyfills-es5.js');
 
@@ -30,7 +30,7 @@ export default async function () {
     await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script src="runtime-es2015.js" type="module"></script>
       <script src="polyfills-es2015.js" type="module"></script>
-      <script src="runtime-es5.js" nomodule></script>
-      <script src="polyfills-es5.js" nomodule></script>
+      <script src="runtime-es5.js" nomodule defer></script>
+      <script src="polyfills-es5.js" nomodule defer></script>
     `);
 }
diff --git a/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts b/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
index 89c213820aba..07ff403dc44e 100644
--- a/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
+++ b/tests/legacy-cli/e2e/tests/build/styles/extract-css.ts
@@ -74,12 +74,12 @@ export default function() {
           oneLineTrim`
     <script src="runtime-es2015.js" type="module"></script>
     <script src="polyfills-es2015.js" type="module"></script>
-    <script src="runtime-es5.js" nomodule></script>
-    <script src="polyfills-es5.js" nomodule></script>
+    <script src="runtime-es5.js" nomodule defer></script>
+    <script src="polyfills-es5.js" nomodule defer></script>
     <script src="vendor-es2015.js" type="module"></script>
     <script src="main-es2015.js" type="module"></script>
-    <script src="vendor-es5.js" nomodule></script>
-    <script src="main-es5.js" nomodule></script>
+    <script src="vendor-es5.js" nomodule defer></script>
+    <script src="main-es5.js" nomodule defer></script>
     `,
         ),
       )
@@ -112,16 +112,16 @@ export default function() {
           oneLineTrim`
     <script src="runtime-es2015.js" type="module"></script>
     <script src="polyfills-es2015.js" type="module"></script>
-    <script src="runtime-es5.js" nomodule></script>
-    <script src="polyfills-es5.js" nomodule></script>
+    <script src="runtime-es5.js" nomodule defer></script>
+    <script src="polyfills-es5.js" nomodule defer></script>
     <script src="styles-es2015.js" type="module"></script>
-    <script src="styles-es5.js" nomodule></script>
+    <script src="styles-es5.js" nomodule defer></script>
     <script src="renamed-style-es2015.js" type="module"></script>
-    <script src="renamed-style-es5.js" nomodule></script>
+    <script src="renamed-style-es5.js" nomodule defer></script>
     <script src="vendor-es2015.js" type="module"></script>
     <script src="main-es2015.js" type="module"></script>
-    <script src="vendor-es5.js" nomodule></script>
-    <script src="main-es5.js" nomodule></script>
+    <script src="vendor-es5.js" nomodule defer></script>
+    <script src="main-es5.js" nomodule defer></script>
     `,
         ),
       )
diff --git a/tests/legacy-cli/e2e/tests/misc/support-ie.ts b/tests/legacy-cli/e2e/tests/misc/support-ie.ts
index cb53aa43ff21..8f174b7059e5 100644
--- a/tests/legacy-cli/e2e/tests/misc/support-ie.ts
+++ b/tests/legacy-cli/e2e/tests/misc/support-ie.ts
@@ -18,22 +18,22 @@ export default async function () {
   await ng('build');
   await expectFileNotToExist('dist/test-project/polyfills-es5.js');
   await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
-    <script src="runtime.js"></script>
-    <script src="polyfills.js"></script>
-    <script src="styles.js"></script>
-    <script src="vendor.js"></script>
-    <script src="main.js"></script>
+    <script src="runtime.js" defer></script>
+    <script src="polyfills.js" defer></script>
+    <script src="styles.js" defer></script>
+    <script src="vendor.js" defer></script>
+    <script src="main.js" defer></script>
   `);
 
   await ng('build', `--es5BrowserSupport`);
   await expectFileToMatch('dist/test-project/polyfills-es5.js', 'core-js');
   await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
-    <script src="runtime.js"></script>
-    <script src="polyfills-es5.js" nomodule></script>
-    <script src="polyfills.js"></script>
-    <script src="styles.js"></script>
-    <script src="vendor.js"></script>
-    <script src="main.js"></script>
+    <script src="runtime.js" defer></script>
+    <script src="polyfills-es5.js" nomodule defer></script>
+    <script src="polyfills.js" defer></script>
+    <script src="styles.js" defer></script>
+    <script src="vendor.js" defer></script>
+    <script src="main.js" defer></script>
   `);
 
   await updateJsonFile('angular.json', workspaceJson => {
@@ -44,11 +44,11 @@ export default async function () {
   await ng('build');
   await expectFileToMatch('dist/test-project/polyfills-es5.js', 'core-js');
   await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
-    <script src="runtime.js"></script>
-    <script src="polyfills-es5.js" nomodule></script>
-    <script src="polyfills.js"></script>
-    <script src="styles.js"></script>
-    <script src="vendor.js"></script>
-    <script src="main.js"></script>
+    <script src="runtime.js" defer></script>
+    <script src="polyfills-es5.js" nomodule defer></script>
+    <script src="polyfills.js" defer></script>
+    <script src="styles.js" defer></script>
+    <script src="vendor.js" defer></script>
+    <script src="main.js" defer></script>
   `);
 }
diff --git a/tests/legacy-cli/e2e/tests/misc/support-safari-10.1.ts b/tests/legacy-cli/e2e/tests/misc/support-safari-10.1.ts
index f78cb217bdcb..325fc84ee1f6 100644
--- a/tests/legacy-cli/e2e/tests/misc/support-safari-10.1.ts
+++ b/tests/legacy-cli/e2e/tests/misc/support-safari-10.1.ts
@@ -13,11 +13,11 @@ export default async function () {
   await expectFileNotToExist('dist/test-project/polyfills-es5.js');
   await expectFileNotToExist('dist/test-project/polyfills-nomodule-es5.js');
   await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
-    <script src="runtime.js"></script>
-    <script src="polyfills.js"></script>
-    <script src="styles.js"></script>
-    <script src="vendor.js"></script>
-    <script src="main.js"></script>
+    <script src="runtime.js" defer></script>
+    <script src="polyfills.js" defer></script>
+    <script src="styles.js" defer></script>
+    <script src="vendor.js" defer></script>
+    <script src="main.js" defer></script>
   `);
 
   await writeFile('browserslist', `
@@ -27,16 +27,16 @@ export default async function () {
   await ng('build');
   await expectFileToExist('dist/test-project/polyfills-nomodule-es5.js');
   await expectFileToMatch('dist/test-project/index.html', oneLineTrim`
-    <script src="polyfills-nomodule-es5.js" nomodule></script>
+    <script src="polyfills-nomodule-es5.js" nomodule defer></script>
     <script src="runtime-es2015.js" type="module"></script>
     <script src="polyfills-es2015.js" type="module"></script>
-    <script src="runtime-es5.js" nomodule></script>
-    <script src="polyfills-es5.js" nomodule></script>
+    <script src="runtime-es5.js" nomodule defer></script>
+    <script src="polyfills-es5.js" nomodule defer></script>
     <script src="styles-es2015.js" type="module"></script>
-    <script src="styles-es5.js" nomodule></script>
+    <script src="styles-es5.js" nomodule defer></script>
     <script src="vendor-es2015.js" type="module"></script>
     <script src="main-es2015.js" type="module"></script>
-    <script src="vendor-es5.js" nomodule></script>
-    <script src="main-es5.js" nomodule></script>
+    <script src="vendor-es5.js" nomodule defer></script>
+    <script src="main-es5.js" nomodule defer></script>
   `);
 }
diff --git a/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts b/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts
index 92aab3fa6972..69d8563c97ef 100644
--- a/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts
+++ b/tests/legacy-cli/e2e/tests/third-party/bootstrap.ts
@@ -24,13 +24,13 @@ export default function() {
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
       <script src="runtime-es2015.js" type="module"></script>
       <script src="polyfills-es2015.js" type="module"></script>
-      <script src="runtime-es5.js" nomodule></script>
-      <script src="polyfills-es5.js" nomodule></script>
-      <script src="scripts.js"></script>
+      <script src="runtime-es5.js" nomodule defer></script>
+      <script src="polyfills-es5.js" nomodule defer></script>
+      <script src="scripts.js" defer></script>
       <script src="vendor-es2015.js" type="module"></script>
       <script src="main-es2015.js" type="module"></script>
-      <script src="vendor-es5.js" nomodule></script>
-      <script src="main-es5.js" nomodule></script>
+      <script src="vendor-es5.js" nomodule defer></script>
+      <script src="main-es5.js" nomodule defer></script>
     `))
     .then(() => ng(
       'build',
@@ -44,10 +44,10 @@ export default function() {
     .then(() => expectFileToMatch('dist/test-project/index.html', oneLineTrim`
     <script src="runtime-es2015.js" type="module"></script>
     <script src="polyfills-es2015.js" type="module"></script>
-    <script src="runtime-es5.js" nomodule></script>
-    <script src="polyfills-es5.js" nomodule></script>
-    <script src="scripts.js"></script>
+    <script src="runtime-es5.js" nomodule defer></script>
+    <script src="polyfills-es5.js" nomodule defer></script>
+    <script src="scripts.js" defer></script>
     <script src="main-es2015.js" type="module"></script>
-    <script src="main-es5.js" nomodule></script>
+    <script src="main-es5.js" nomodule defer></script>
     `));
 }

From d0f2cc3b688848fb9e0f8d90a3c9b10344731725 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 16 Jul 2019 18:58:44 +0200
Subject: [PATCH 1642/1703] fix(@schematics/angular): add commonjs module to
 universal tsconfig (#15090)

The universal tsconfig extends the application tsconfig which by default it's module format is ES2015. While NodeJS 12 does support this, older versions of Node don't
---
 .../universal/files/root/__tsconfigFileName__.json.template    | 3 ++-
 packages/schematics/angular/universal/index_spec.ts            | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/angular/universal/files/root/__tsconfigFileName__.json.template b/packages/schematics/angular/universal/files/root/__tsconfigFileName__.json.template
index f11e5fa48259..66c7aeafdfee 100644
--- a/packages/schematics/angular/universal/files/root/__tsconfigFileName__.json.template
+++ b/packages/schematics/angular/universal/files/root/__tsconfigFileName__.json.template
@@ -1,7 +1,8 @@
 {
   "extends": "./<%= tsConfigExtends %>",
   "compilerOptions": {
-    "outDir": "<%= outDir %>-server"
+    "outDir": "<%= outDir %>-server",
+    "module": "commonjs"
   },
   "angularCompilerOptions": {
     "entryModule": "./<%= rootInSrc ? '' : 'src/' %><%= appDir %>/<%= stripTsExtension(rootModuleFileName) %>#<%= rootModuleClassName %>"
diff --git a/packages/schematics/angular/universal/index_spec.ts b/packages/schematics/angular/universal/index_spec.ts
index ec9f7a77cb29..ec2366246d6c 100644
--- a/packages/schematics/angular/universal/index_spec.ts
+++ b/packages/schematics/angular/universal/index_spec.ts
@@ -90,6 +90,7 @@ describe('Universal Schematic', () => {
       extends: './tsconfig.app.json',
       compilerOptions: {
         outDir: './out-tsc/app-server',
+        module: 'commonjs',
       },
       angularCompilerOptions: {
         entryModule: './src/app/app.server.module#AppServerModule',
@@ -110,6 +111,7 @@ describe('Universal Schematic', () => {
       extends: './tsconfig.app.json',
       compilerOptions: {
         outDir: '../../out-tsc/app-server',
+        module: 'commonjs',
       },
       angularCompilerOptions: {
         entryModule: './src/app/app.server.module#AppServerModule',

From 0551360035d7e8d13a9b27c2d0318879711bcae5 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 16 Jul 2019 20:04:29 +0200
Subject: [PATCH 1643/1703] fix(@schematics/angular): exclusively list the
 files in tsconfigs (#15030)

* test: update tests to work with new stricter tsconfig file inclusions

* fix(@schematics/angular): exclusively list the files in tsconfigs

With the omission of `includes` or `files` in tsconfig files tsc will pick up all the files under the rootDir and make them as part of the compilation. In certain cases, redundant files will be picked up which will cause a slower compilations.

Related to: TOOL-949
---
 .../test/browser/errors_spec_large.ts         | 12 ++++---
 .../test/browser/lazy-module_spec_large.ts    | 31 +++++++++++++++++--
 .../test/browser/output-hashing_spec_large.ts |  8 ++---
 .../test/browser/rebuild_spec_large.ts        |  4 +--
 .../files/tsconfig.app.json.template          |  9 +++++-
 .../angular/application/index_spec.ts         | 21 +++++++++++++
 .../root/__tsconfigFileName__.json.template   |  3 ++
 .../angular/universal/index_spec.ts           |  6 ++++
 .../hello-world-app-ivy/src/tsconfig.app.json |  9 ++++--
 .../src/tsconfig.server.json                  |  7 ++---
 .../hello-world-app/src/tsconfig.app.json     |  7 +++++
 .../hello-world-app/src/tsconfig.server.json  |  8 ++---
 tests/legacy-cli/e2e/tests/basic/rebuild.ts   |  2 +-
 .../e2e/tests/build/build-app-shell.ts        |  6 ++++
 .../e2e/tests/build/build-errors.ts           |  1 +
 .../e2e/tests/build/dynamic-import.ts         |  4 +++
 .../e2e/tests/build/lazy-load-syntax.ts       | 16 +++++-----
 .../e2e/tests/build/platform-server.ts        |  6 ++++
 .../legacy-cli/e2e/tests/misc/lazy-module.ts  |  6 ++--
 19 files changed, 127 insertions(+), 39 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/errors_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/errors_spec_large.ts
index 95e49b132dbd..1e8ef05309e5 100644
--- a/packages/angular_devkit/build_angular/test/browser/errors_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/errors_spec_large.ts
@@ -23,11 +23,13 @@ describe('Browser Builder errors', () => {
   it('shows error when files are not part of the compilation', async () => {
     host.replaceInFile(
       'src/tsconfig.app.json',
-      '"compilerOptions": {',
-      `
-      "files": ["main.ts"],
-      "compilerOptions": {
-    `,
+      /,\r?\n?\s*"polyfills\.ts"/,
+      '',
+    );
+    host.replaceInFile(
+      'src/tsconfig.app.json',
+      '"**/*.ts"',
+      '"**/*.d.ts"',
     );
     const logger = new logging.Logger('');
     const logs: string[] = [];
diff --git a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
index 56ddfa2521c0..d8c82d76691b 100644
--- a/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/lazy-module_spec_large.ts
@@ -7,7 +7,7 @@
  */
 
 import { Architect } from '@angular-devkit/architect';
-import { TestLogger } from '@angular-devkit/architect/testing';
+import { TestLogger, TestProjectHost } from '@angular-devkit/architect/testing';
 import { take, tap, timeout } from 'rxjs/operators';
 import {
   browserBuild,
@@ -30,6 +30,21 @@ describe('Browser Builder lazy modules', () => {
   });
   afterEach(async () => host.restore().toPromise());
 
+  function addLazyLoadedModulesInTsConfig(host: TestProjectHost, lazyModuleFiles: Record<string, string>) {
+    const files = [
+      ...Object.keys(lazyModuleFiles),
+      'main.ts',
+    ]
+    .map(f => '"' + f.replace('src/', '') + '"')
+    .join(', ');
+
+    host.replaceInFile(
+      'src/tsconfig.app.json',
+      '"main.ts"',
+      `${files}`,
+    );
+  }
+
   const cases: [string, Record<string, string>][] = [
     ['string', lazyModuleStringImport],
     ['function', lazyModuleFnImport],
@@ -40,6 +55,10 @@ describe('Browser Builder lazy modules', () => {
         host.writeMultipleFiles(lazyModuleFiles);
         host.writeMultipleFiles(imports);
 
+        if (name === 'string') {
+          addLazyLoadedModulesInTsConfig(host, lazyModuleFiles);
+        }
+
         const { files } = await browserBuild(architect, host, target);
         expect('lazy-lazy-module.js' in files).toBe(true);
       });
@@ -91,6 +110,7 @@ describe('Browser Builder lazy modules', () => {
       it('supports lazy bundle for lazy routes with AOT', async () => {
         host.writeMultipleFiles(lazyModuleFiles);
         host.writeMultipleFiles(imports);
+        addLazyLoadedModulesInTsConfig(host, lazyModuleFiles);
 
         const { files } = await browserBuild(architect, host, target, { aot: true });
         if (ivyEnabled) {
@@ -131,10 +151,13 @@ describe('Browser Builder lazy modules', () => {
   });
 
   it(`supports lazy bundle for System.import() calls`, async () => {
-    host.writeMultipleFiles({
+    const lazyfiles = {
       'src/lazy-module.ts': 'export const value = 42;',
       'src/main.ts': `declare var System: any; System.import('./lazy-module');`,
-    });
+    };
+
+    host.writeMultipleFiles(lazyfiles);
+    addLazyLoadedModulesInTsConfig(host, lazyfiles);
 
     const { files } = await browserBuild(architect, host, target);
     expect(files['lazy-module.js']).not.toBeUndefined();
@@ -199,6 +222,7 @@ describe('Browser Builder lazy modules', () => {
         }`,
     });
     host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
+    addLazyLoadedModulesInTsConfig(host, lazyModuleFiles);
 
     const { files } = await browserBuild(architect, host, target, {
       lazyModules: ['src/app/lazy/lazy.module'],
@@ -227,6 +251,7 @@ describe('Browser Builder lazy modules', () => {
         }`,
     });
     host.replaceInFile('src/tsconfig.app.json', `"module": "es2015"`, `"module": "esnext"`);
+    addLazyLoadedModulesInTsConfig(host, lazyModuleFiles);
     const { files } = await browserBuild(architect, host, target, {
       lazyModules: ['src/app/lazy/lazy.module'],
       aot: true,
diff --git a/packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts
index c99cad5b62bf..d81ef71eeda5 100644
--- a/packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/output-hashing_spec_large.ts
@@ -13,7 +13,7 @@ import {
   createArchitect,
   host,
   lazyModuleFiles,
-  lazyModuleStringImport,
+  lazyModuleFnImport,
 } from '../utils';
 
 describe('Browser Builder output hashing', () => {
@@ -68,7 +68,7 @@ describe('Browser Builder output hashing', () => {
     let newHashes: Map<string, string>;
 
     host.writeMultipleFiles(lazyModuleFiles);
-    host.writeMultipleFiles(lazyModuleStringImport);
+    host.writeMultipleFiles(lazyModuleFnImport);
 
     const overrides = { outputHashing: 'all', extractCss: true };
 
@@ -79,7 +79,7 @@ describe('Browser Builder output hashing', () => {
     // Save the current hashes.
     oldHashes = generateFileHashMap();
     host.writeMultipleFiles(lazyModuleFiles);
-    host.writeMultipleFiles(lazyModuleStringImport);
+    host.writeMultipleFiles(lazyModuleFnImport);
 
     await browserBuild(architect, host, target, overrides);
     newHashes = generateFileHashMap();
@@ -117,7 +117,7 @@ describe('Browser Builder output hashing', () => {
   it('supports options', async () => {
     host.writeMultipleFiles({ 'src/styles.css': `h1 { background: url('./spectrum.png')}` });
     host.writeMultipleFiles(lazyModuleFiles);
-    host.writeMultipleFiles(lazyModuleStringImport);
+    host.writeMultipleFiles(lazyModuleFnImport);
 
     // We must do several builds instead of a single one in watch mode, so that the output
     // path is deleted on each run and only contains the most recent files.
diff --git a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
index 50b4ed03381e..2119c017c9c9 100644
--- a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
@@ -15,7 +15,7 @@ import {
   host,
   ivyEnabled,
   lazyModuleFiles,
-  lazyModuleStringImport,
+  lazyModuleFnImport,
 } from '../utils';
 
 describe('Browser Builder rebuilds', () => {
@@ -84,7 +84,7 @@ describe('Browser Builder rebuilds', () => {
               // No lazy chunk should exist.
               if (!hasLazyChunk) {
                 phase = 2;
-                host.writeMultipleFiles({ ...lazyModuleFiles, ...lazyModuleStringImport });
+                host.writeMultipleFiles({ ...lazyModuleFiles, ...lazyModuleFnImport });
               }
               break;
 
diff --git a/packages/schematics/angular/application/files/tsconfig.app.json.template b/packages/schematics/angular/application/files/tsconfig.app.json.template
index d24bbb988f70..7f38e6593828 100644
--- a/packages/schematics/angular/application/files/tsconfig.app.json.template
+++ b/packages/schematics/angular/application/files/tsconfig.app.json.template
@@ -4,13 +4,20 @@
     "outDir": "<%= relativePathToWorkspaceRoot %>/out-tsc/app",
     "types": []
   },
+  "files": [
+    "src/main.ts",
+    "src/polyfills.ts"
+  ],<% if (!enableIvy) { %>
   "include": [
     "src/**/*.ts"
   ],
   "exclude": [
     "src/test.ts",
     "src/**/*.spec.ts"
-  ]<% if (enableIvy) { %>,
+  ]<% } %><% if (enableIvy) { %>
+  "include": [
+    "src/**/*.d.ts"
+  ],
   "angularCompilerOptions": {
     "enableIvy": true
   }<% } %>
diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
index 21cfed8d4752..8ddc4d016062 100644
--- a/packages/schematics/angular/application/index_spec.ts
+++ b/packages/schematics/angular/application/index_spec.ts
@@ -232,6 +232,27 @@ describe('Application Schematic', () => {
     expect(workspace.projects.foo.architect.build.options.aot).toEqual(true);
   });
 
+  it('should set the right files, exclude, include in the tsconfig for VE projects', async () => {
+    const tree = await schematicRunner.runSchematicAsync('application', defaultOptions, workspaceTree)
+      .toPromise();
+    const path = '/projects/foo/tsconfig.app.json';
+    const tsConfig = JSON.parse(tree.readContent(path));
+    expect(tsConfig.files).toEqual(['src/main.ts', 'src/polyfills.ts']);
+    expect(tsConfig.exclude).toEqual(['src/test.ts', 'src/**/*.spec.ts']);
+    expect(tsConfig.include).toEqual(['src/**/*.ts']);
+  });
+
+  it('should set the right files, exclude, include in the tsconfig for Ivy projects', async () => {
+    const options = { ...defaultOptions, enableIvy: true };
+    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+      .toPromise();
+    const path = '/projects/foo/tsconfig.app.json';
+    const tsConfig = JSON.parse(tree.readContent(path));
+    expect(tsConfig.files).toEqual(['src/main.ts', 'src/polyfills.ts']);
+    expect(tsConfig.exclude).toBeUndefined();
+    expect(tsConfig.include).toEqual(['src/**/*.d.ts']);
+  });
+
   describe(`update package.json`, () => {
     it(`should add build-angular to devDependencies`, async () => {
       const tree = await schematicRunner.runSchematicAsync('application', defaultOptions, workspaceTree)
diff --git a/packages/schematics/angular/universal/files/root/__tsconfigFileName__.json.template b/packages/schematics/angular/universal/files/root/__tsconfigFileName__.json.template
index 66c7aeafdfee..c62101e0cd14 100644
--- a/packages/schematics/angular/universal/files/root/__tsconfigFileName__.json.template
+++ b/packages/schematics/angular/universal/files/root/__tsconfigFileName__.json.template
@@ -4,6 +4,9 @@
     "outDir": "<%= outDir %>-server",
     "module": "commonjs"
   },
+  "files": [
+    "src/main.server.ts"
+  ],
   "angularCompilerOptions": {
     "entryModule": "./<%= rootInSrc ? '' : 'src/' %><%= appDir %>/<%= stripTsExtension(rootModuleFileName) %>#<%= rootModuleClassName %>"
   }
diff --git a/packages/schematics/angular/universal/index_spec.ts b/packages/schematics/angular/universal/index_spec.ts
index ec2366246d6c..c14faecd62c9 100644
--- a/packages/schematics/angular/universal/index_spec.ts
+++ b/packages/schematics/angular/universal/index_spec.ts
@@ -92,6 +92,9 @@ describe('Universal Schematic', () => {
         outDir: './out-tsc/app-server',
         module: 'commonjs',
       },
+      files: [
+        "src/main.server.ts"
+      ],
       angularCompilerOptions: {
         entryModule: './src/app/app.server.module#AppServerModule',
       },
@@ -113,6 +116,9 @@ describe('Universal Schematic', () => {
         outDir: '../../out-tsc/app-server',
         module: 'commonjs',
       },
+      files: [
+        "src/main.server.ts"
+      ],
       angularCompilerOptions: {
         entryModule: './src/app/app.server.module#AppServerModule',
       },
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/tsconfig.app.json b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/tsconfig.app.json
index 27c32c624e5a..572dee5c7f13 100644
--- a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/tsconfig.app.json
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/tsconfig.app.json
@@ -4,9 +4,12 @@
     "outDir": "../out-tsc/app",
     "types": []
   },
-  "exclude": [
-    "test.ts",
-    "**/*.spec.ts"
+  "files": [
+    "main.ts",
+    "polyfills.ts"
+  ],
+  "include": [
+    "**/*.d.ts"
   ],
   "angularCompilerOptions": {
     "enableIvy": true
diff --git a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/tsconfig.server.json b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/tsconfig.server.json
index 01b7878504a2..8d960ce360c1 100644
--- a/tests/angular_devkit/build_angular/hello-world-app-ivy/src/tsconfig.server.json
+++ b/tests/angular_devkit/build_angular/hello-world-app-ivy/src/tsconfig.server.json
@@ -1,14 +1,13 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "./tsconfig.app.json",
   "compilerOptions": {
     "outDir": "../dist-server",
     "baseUrl": "./",
     "module": "commonjs",
     "types": []
   },
-  "exclude": [
-    "test.ts",
-    "**/*.spec.ts"
+  "files": [
+    "main.server.ts"
   ],
   "angularCompilerOptions": {
     "entryModule": "app/app.server.module#AppServerModule",
diff --git a/tests/angular_devkit/build_angular/hello-world-app/src/tsconfig.app.json b/tests/angular_devkit/build_angular/hello-world-app/src/tsconfig.app.json
index 190fd300b601..5e0a2836e21e 100644
--- a/tests/angular_devkit/build_angular/hello-world-app/src/tsconfig.app.json
+++ b/tests/angular_devkit/build_angular/hello-world-app/src/tsconfig.app.json
@@ -4,6 +4,13 @@
     "outDir": "../out-tsc/app",
     "types": []
   },
+  "files": [
+    "main.ts",
+    "polyfills.ts"
+  ],
+  "include": [
+    "**/*.ts"
+  ],
   "exclude": [
     "test.ts",
     "**/*.spec.ts"
diff --git a/tests/angular_devkit/build_angular/hello-world-app/src/tsconfig.server.json b/tests/angular_devkit/build_angular/hello-world-app/src/tsconfig.server.json
index 36fa0af8d3d3..ca19d0259199 100644
--- a/tests/angular_devkit/build_angular/hello-world-app/src/tsconfig.server.json
+++ b/tests/angular_devkit/build_angular/hello-world-app/src/tsconfig.server.json
@@ -1,14 +1,12 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "./tsconfig.app.json",
   "compilerOptions": {
     "outDir": "../dist-server",
-    "baseUrl": "./",
     "module": "commonjs",
     "types": []
   },
-  "exclude": [
-    "test.ts",
-    "**/*.spec.ts"
+  "files": [
+    "main.server.ts"
   ],
   "angularCompilerOptions": {
     "entryModule": "app/app.server.module#AppServerModule"
diff --git a/tests/legacy-cli/e2e/tests/basic/rebuild.ts b/tests/legacy-cli/e2e/tests/basic/rebuild.ts
index 82991e9ed890..30410249760b 100644
--- a/tests/legacy-cli/e2e/tests/basic/rebuild.ts
+++ b/tests/legacy-cli/e2e/tests/basic/rebuild.ts
@@ -37,7 +37,7 @@ export default function() {
             FormsModule,
             HttpClientModule,
             RouterModule.forRoot([
-              { path: 'lazy', loadChildren: './lazy/lazy.module#LazyModule' }
+              { path: 'lazy', loadChildren: () => import('./lazy/lazy.module').then(m => m.LazyModule) }
             ])
           ],
           providers: [],
diff --git a/tests/legacy-cli/e2e/tests/build/build-app-shell.ts b/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
index d98f7433556f..d12350b13f08 100644
--- a/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
+++ b/tests/legacy-cli/e2e/tests/build/build-app-shell.ts
@@ -52,6 +52,12 @@ export default function() {
           "module": "commonjs",
           "types": []
         },
+        "files": [
+          "src/main.server.ts"
+        ],
+        "include": [
+          "src/**/*.d.ts"
+        ],
         "angularCompilerOptions": {
           "entryModule": "src/app/app.server.module#AppServerModule"
         }
diff --git a/tests/legacy-cli/e2e/tests/build/build-errors.ts b/tests/legacy-cli/e2e/tests/build/build-errors.ts
index ccfe80b7c117..b11c2c94053b 100644
--- a/tests/legacy-cli/e2e/tests/build/build-errors.ts
+++ b/tests/legacy-cli/e2e/tests/build/build-errors.ts
@@ -50,6 +50,7 @@ export default function() {
       .then(() =>
         updateJsonFile('./tsconfig.app.json', configJson => {
           configJson.include = ['src/**/*.ts'];
+          configJson.exclude = ['**/**.spec.ts'];
           configJson.files = undefined;
         }),
       )
diff --git a/tests/legacy-cli/e2e/tests/build/dynamic-import.ts b/tests/legacy-cli/e2e/tests/build/dynamic-import.ts
index e999cf107138..ff0d29a5cc9c 100644
--- a/tests/legacy-cli/e2e/tests/build/dynamic-import.ts
+++ b/tests/legacy-cli/e2e/tests/build/dynamic-import.ts
@@ -14,6 +14,10 @@ export default async function() {
     ];
   });
 
+  await updateJsonFile('tsconfig.app.json', tsConfig => {
+    tsConfig.files.push('src/app/lazy/lazy.module.ts');
+  });
+
   // Update the app component to use the lazy module
   await writeFile('src/app/app.component.ts', `
     import { Component, SystemJsNgModuleLoader } from '@angular/core';
diff --git a/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts b/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts
index 2a38e84cc83a..ffed461c4f7f 100644
--- a/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts
+++ b/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts
@@ -82,19 +82,19 @@ export default async function () {
     buildTarget['configurations']['production'] = { aot: true };
   });
 
-  // Test string import.
-  // Both Ivy and View Engine should support it.
-  await replaceLoadChildren(`'./lazy/lazy.module#LazyModule'`);
-  await ng('e2e');
-  await ng('e2e', '--prod');
-
   // Test `import()` style lazy load.
   // Both Ivy and View Engine should support it.
   await replaceLoadChildren(`() => import('./lazy/lazy.module').then(m => m.LazyModule)`);
 
-  // TODO: remove cast after https://github.com/angular/angular/pull/29832 is released.
-  await replaceInFile(appRoutingModulePath, '];', '] as Routes;');
+  await ng('e2e');
+  await ng('e2e', '--prod');
 
+  // Test string import.
+  // Both Ivy and View Engine should support it.
+  await updateJsonFile('tsconfig.app.json', tsConfig => {
+    tsConfig.files.push('src/app/lazy/lazy.module.ts');
+  });
+  await replaceLoadChildren(`'./lazy/lazy.module#LazyModule'`);
   await ng('e2e');
   await ng('e2e', '--prod');
 }
diff --git a/tests/legacy-cli/e2e/tests/build/platform-server.ts b/tests/legacy-cli/e2e/tests/build/platform-server.ts
index 43653ed88029..534884ea10c1 100644
--- a/tests/legacy-cli/e2e/tests/build/platform-server.ts
+++ b/tests/legacy-cli/e2e/tests/build/platform-server.ts
@@ -50,6 +50,12 @@ export default function() {
           "module": "commonjs",
           "types": []
         },
+        "files": [
+          "src/main.server.ts"
+        ],
+        "include": [
+          "src/**/*.d.ts"
+        ],
         "angularCompilerOptions": {
           "entryModule": "src/app/app.server.module#AppServerModule"
         }
diff --git a/tests/legacy-cli/e2e/tests/misc/lazy-module.ts b/tests/legacy-cli/e2e/tests/misc/lazy-module.ts
index ee35bebba9b1..0256d2a82081 100644
--- a/tests/legacy-cli/e2e/tests/misc/lazy-module.ts
+++ b/tests/legacy-cli/e2e/tests/misc/lazy-module.ts
@@ -15,9 +15,9 @@ export default function() {
       import { RouterModule } from '@angular/router';
     `))
     .then(() => replaceInFile('src/app/app.module.ts', 'imports: [', `imports: [
-      RouterModule.forRoot([{ path: "lazy", loadChildren: 'src/app/lazy/lazy.module#LazyModule' }]),
-      RouterModule.forRoot([{ path: "lazy1", loadChildren: './lazy/lazy.module#LazyModule' }]),
-      RouterModule.forRoot([{ path: "lazy2", loadChildren: './too/lazy/lazy.module#LazyModule' }]),
+      RouterModule.forRoot([{ path: "lazy", loadChildren: () => import('src/app/lazy/lazy.module').then(m => m.LazyModule) }]),
+      RouterModule.forRoot([{ path: "lazy1", loadChildren: () => import('./lazy/lazy.module').then(m => m.LazyModule) }]),
+      RouterModule.forRoot([{ path: "lazy2", loadChildren: () => import('./too/lazy/lazy.module').then(m => m.LazyModule) }]),
     `))
     .then(() => ng('build', '--named-chunks'))
     .then(() => readdirSync('dist/test-project'))

From 6d4f8a249ca9b6d3ed7f0433e0d99b3f62280776 Mon Sep 17 00:00:00 2001
From: Charles <19598772+clydin@users.noreply.github.com>
Date: Tue, 16 Jul 2019 17:41:59 -0400
Subject: [PATCH 1644/1703] test: remove material-design-icons package as a
 development dependency (#15096)

The package is quite large at 33MB (46MB on disk).  The package is also only used in one test that is already covered by an E2E test.  The E2E test does not require the package to be present for development as the test installs it within a generated project during execution.  This also has the benefit of testing the icons package in a more real world use case; as well as allowing the test to serve as a guide for a user to add the package to their own application.
---
 .../angular_devkit/build_angular/package.json |  1 -
 .../test/browser/styles_spec_large.ts         | 12 -----
 .../e2e/tests/third-party/material-icons.ts   | 46 ++++++++++---------
 yarn.lock                                     |  5 --
 4 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 740817de7800..253f07bc4dc7 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -80,7 +80,6 @@
     "karma-coverage-istanbul-reporter": "~2.0.0",
     "karma-jasmine": "~2.0.1",
     "karma-jasmine-html-reporter": "^1.4.0",
-    "material-design-icons": "^3.0.1",
     "popper.js": "^1.14.1",
     "protractor": "~5.4.0",
     "zone.js": "^0.9.1"
diff --git a/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
index 4cd161a343a7..5e5e5fe9cf04 100644
--- a/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
@@ -203,18 +203,6 @@ describe('Browser Builder styles', () => {
     });
   });
 
-  it(`supports material icons`, async () => {
-    const overrides = {
-      extractCss: true,
-      optimization: true,
-      styles: [
-        { input: '../../../../node_modules/material-design-icons/iconfont/material-icons.css' },
-      ],
-    };
-
-    await browserBuild(architect, host, target, overrides);
-  });
-
   extensionsWithVariableSupport.forEach(ext => {
     it(`supports ${ext} includePaths`, async () => {
       let variableAssignment = '';
diff --git a/tests/legacy-cli/e2e/tests/third-party/material-icons.ts b/tests/legacy-cli/e2e/tests/third-party/material-icons.ts
index 07d5ac97b904..4ced68fbaca8 100644
--- a/tests/legacy-cli/e2e/tests/third-party/material-icons.ts
+++ b/tests/legacy-cli/e2e/tests/third-party/material-icons.ts
@@ -1,26 +1,28 @@
-import {silentNpm, ng} from '../../utils/process';
-import {updateJsonFile} from '../../utils/project';
-import {expectFileToMatch} from '../../utils/fs';
+import { expectFileToMatch } from '../../utils/fs';
+import { ng, silentNpm } from '../../utils/process';
+import { updateJsonFile } from '../../utils/project';
 
+export default async function() {
+  // Install material design icons
+  await silentNpm('install', 'material-design-icons@3.0.1');
 
-export default function() {
-  // TODO(architect): Delete this test. It is now in devkit/build-angular.
+  // Add icon stylesheet to application
+  await updateJsonFile('angular.json', workspaceJson => {
+    const appArchitect = workspaceJson.projects['test-project'].architect;
+    appArchitect.build.options.styles = [
+      { input: 'node_modules/material-design-icons/iconfont/material-icons.css' },
+    ];
+  });
 
-  return Promise.resolve()
-    .then(() => silentNpm('install', 'material-design-icons@3.0.1'))
-    .then(() => updateJsonFile('angular.json', workspaceJson => {
-      const appArchitect = workspaceJson.projects['test-project'].architect;
-      appArchitect.build.options.styles = [
-        { input: 'node_modules/material-design-icons/iconfont/material-icons.css' },
-      ];
-    }))
-    .then(() => ng('build', '--extract-css'))
-    .then(() => expectFileToMatch('dist/test-project/styles.css', 'Material Icons'))
-    .then(() => ng(
-      'build',
-      '--prod',
-      '--extract-css',
-      '--output-hashing=none'
-    ))
-    .then(() => expectFileToMatch('dist/test-project/styles.css', 'Material Icons'));
+  // Build dev application
+  await ng('build', '--extract-css');
+
+  // Ensure icons are included
+  await expectFileToMatch('dist/test-project/styles.css', 'Material Icons')
+
+  // Build prod application
+  await ng('build', '--prod', '--extract-css', '--output-hashing=none');
+
+  // Ensure icons are included
+  await expectFileToMatch('dist/test-project/styles.css', 'Material Icons')
 }
diff --git a/yarn.lock b/yarn.lock
index 10814b94483a..d9ea0352c41c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6632,11 +6632,6 @@ marked@0.7.0:
   resolved "https://registry.yarnpkg.com/marked/-/marked-0.7.0.tgz#b64201f051d271b1edc10a04d1ae9b74bb8e5c0e"
   integrity sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==
 
-material-design-icons@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/material-design-icons/-/material-design-icons-3.0.1.tgz#9a71c48747218ebca51e51a66da682038cdcb7bf"
-  integrity sha1-mnHEh0chjrylHlGmbaaCA4zct78=
-
 math-random@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"

From 214a4189b763216df98057af29d4072dfbc9da0a Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 17 Jul 2019 21:07:37 +0300
Subject: [PATCH 1645/1703] build: update pacote to version 9.5.4 (#15100)

---
 packages/angular/cli/package.json       |  2 +-
 packages/schematics/update/package.json |  2 +-
 yarn.lock                               | 70 ++++++++++++++++++++++---
 3 files changed, 64 insertions(+), 10 deletions(-)

diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index aa2da7eaee91..cbb92957df7f 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -37,7 +37,7 @@
     "inquirer": "6.5.0",
     "npm-package-arg": "6.1.0",
     "open": "6.4.0",
-    "pacote": "9.5.2",
+    "pacote": "9.5.4",
     "read-package-tree": "5.3.1",
     "semver": "6.2.0",
     "symbol-observable": "1.2.0",
diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index 4253a9355109..90ca472b0161 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -15,7 +15,7 @@
     "@angular-devkit/schematics": "0.0.0",
     "@yarnpkg/lockfile": "1.1.0",
     "ini": "1.3.5",
-    "pacote": "9.5.2",
+    "pacote": "9.5.4",
     "semver": "6.2.0",
     "semver-intersect": "1.4.0",
     "rxjs": "6.4.0"
diff --git a/yarn.lock b/yarn.lock
index d9ea0352c41c..2c3bd32c000a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1561,6 +1561,11 @@ bluebird@^3.5.3:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
   integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
 
+bluebird@^3.5.5:
+  version "3.5.5"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
+  integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==
+
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
@@ -1920,6 +1925,26 @@ cacache@^11.3.2:
     unique-filename "^1.1.1"
     y18n "^4.0.0"
 
+cacache@^12.0.0:
+  version "12.0.0"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.0.tgz#1ed91cc306312a53ad688b1563ce4c416faec564"
+  integrity sha512-0baf1FhCp16LhN+xDJsOrSiaPDCTD3JegZptVmLDoEbFcT5aT+BeFGt3wcDU3olCP5tpTCXU5sv0+TsKWT9WGQ==
+  dependencies:
+    bluebird "^3.5.5"
+    chownr "^1.1.1"
+    figgy-pudding "^3.5.1"
+    glob "^7.1.4"
+    graceful-fs "^4.1.15"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.3"
+    ssri "^6.0.1"
+    unique-filename "^1.1.1"
+    y18n "^4.0.0"
+
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -4525,7 +4550,7 @@ glob@7.0.x:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@7.1.4:
+glob@7.1.4, glob@^7.1.4:
   version "7.1.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
   integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
@@ -6588,6 +6613,23 @@ make-fetch-happen@^4.0.1:
     socks-proxy-agent "^4.0.0"
     ssri "^6.0.0"
 
+make-fetch-happen@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.0.tgz#a8e3fe41d3415dd656fe7b8e8172e1fb4458b38d"
+  integrity sha512-nFr/vpL1Jc60etMVKeaLOqfGjMMb3tAHFVJWxHOFCFS04Zmd7kGlMxo0l1tzfhoQje0/UPnd0X8OeGUiXXnfPA==
+  dependencies:
+    agentkeepalive "^3.4.1"
+    cacache "^12.0.0"
+    http-cache-semantics "^3.8.1"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.1"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    node-fetch-npm "^2.0.2"
+    promise-retry "^1.1.1"
+    socks-proxy-agent "^4.0.0"
+    ssri "^6.0.0"
+
 mamacro@^0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
@@ -7334,6 +7376,18 @@ npm-registry-fetch@^3.8.0:
     make-fetch-happen "^4.0.1"
     npm-package-arg "^6.1.0"
 
+npm-registry-fetch@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.0.tgz#5ef75845b605855c7964472542c25da172af8677"
+  integrity sha512-Jllq35Jag8dtv0M17ue74XtdQTyqKzuAYGiX9mAjOhkmNjib3bBUgK6mUY61+AHnXeSRobQkpY3/xIOS/omptw==
+  dependencies:
+    JSONStream "^1.3.4"
+    bluebird "^3.5.1"
+    figgy-pudding "^3.4.1"
+    lru-cache "^5.1.1"
+    make-fetch-happen "^5.0.0"
+    npm-package-arg "^6.1.0"
+
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -7684,18 +7738,18 @@ package-json@^4.0.0:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
-pacote@9.5.2:
-  version "9.5.2"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.2.tgz#6132afe7a53bb6fa189df72572c87bb03ab2cc5f"
-  integrity sha512-KVxalD57jaHnWIBQKPeU/eFU4UoMqUOj3h5AXvVMp9oJd8BZvIdTm8qmazy4jpYBf7RX9xCFmeFcU3ebvrUSZQ==
+pacote@9.5.4:
+  version "9.5.4"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.4.tgz#8baa26f3d1326d13dc2fe0fe84040a364ae30aad"
+  integrity sha512-nWr0ari6E+apbdoN0hToTKZElO5h4y8DGFa2pyNA5GQIdcP0imC96bA0bbPw1gpeguVIiUgHHaAlq/6xfPp8Qw==
   dependencies:
     bluebird "^3.5.3"
-    cacache "^11.3.2"
+    cacache "^12.0.0"
     figgy-pudding "^3.5.1"
     get-stream "^4.1.0"
     glob "^7.1.3"
     lru-cache "^5.1.1"
-    make-fetch-happen "^4.0.1"
+    make-fetch-happen "^5.0.0"
     minimatch "^3.0.4"
     minipass "^2.3.5"
     mississippi "^3.0.0"
@@ -7704,7 +7758,7 @@ pacote@9.5.2:
     npm-package-arg "^6.1.0"
     npm-packlist "^1.1.12"
     npm-pick-manifest "^2.2.3"
-    npm-registry-fetch "^3.8.0"
+    npm-registry-fetch "^4.0.0"
     osenv "^0.1.5"
     promise-inflight "^1.0.1"
     promise-retry "^1.1.1"

From 83bd1284db3db60f7f0b01ec8204bcd13225b834 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 17 Jul 2019 21:07:48 +0300
Subject: [PATCH 1646/1703] build: update mini-css-extract-plugin to version
 0.8.0 (#15098)

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 253f07bc4dc7..57075305a66b 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -28,7 +28,7 @@
     "less-loader": "5.0.0",
     "license-webpack-plugin": "2.1.1",
     "loader-utils": "1.2.3",
-    "mini-css-extract-plugin": "0.7.0",
+    "mini-css-extract-plugin": "0.8.0",
     "minimatch": "3.0.4",
     "parse5": "4.0.0",
     "open": "6.4.0",
diff --git a/yarn.lock b/yarn.lock
index 2c3bd32c000a..1852aee12b37 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6878,10 +6878,10 @@ mimic-response@^1.0.0, mimic-response@^1.0.1:
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
   integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
 
-mini-css-extract-plugin@0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.7.0.tgz#5ba8290fbb4179a43dd27cca444ba150bee743a0"
-  integrity sha512-RQIw6+7utTYn8DBGsf/LpRgZCJMpZt+kuawJ/fju0KiOL6nAaTBNmCJwS7HtwSCXfS47gCkmtBFS7HdsquhdxQ==
+mini-css-extract-plugin@0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.0.tgz#81d41ec4fe58c713a96ad7c723cdb2d0bd4d70e1"
+  integrity sha512-MNpRGbNA52q6U92i0qbVpQNsgk7LExy41MdAlG84FeytfDOtRIf/mCHdEgG8rpTKOaNKiqUnZdlptF469hxqOw==
   dependencies:
     loader-utils "^1.1.0"
     normalize-url "1.9.1"

From 076b29558d172abbde863b20eba4e4a569cb58f6 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 17 Jul 2019 21:08:01 +0300
Subject: [PATCH 1647/1703] build: update @angular/animations to version
 (#15097)

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 982a3d133649..977707c26a61 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#a77928455c835dac4c0ca8437db1529ff06db340",
-    "@angular/common": "github:angular/common-builds#05c13c9e12381e89d7053f61a1b33aee678d1a96",
-    "@angular/compiler": "github:angular/compiler-builds#1cdbb28ed56085b62b04e2046c2f04d5eb3b3792",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#fb1df7528e6bbfaadebacb13bd3deeab8b8e29f8",
-    "@angular/core": "github:angular/core-builds#5a90a0c918281bd814cd949c23b8e6ea989f166e",
-    "@angular/forms": "github:angular/forms-builds#45566b5ae1c47eaec0e257a6e75b0fb6c6ea4a1c",
-    "@angular/language-service": "github:angular/language-service-builds#f91750bc3c13ec9555f9d4a30718a1a812a1cd87",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#ec4e3bac0cd80b3fdaf1e651524d9bda9af440ef",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#b1107bf372feac806f7738783dd5dda8fa6d9b48",
-    "@angular/router": "github:angular/router-builds#5c59bfa8b856fd96dc0439889e79f035a459cab8"
+    "@angular/animations": "github:angular/animations-builds#87c7c17a28e2bbd5d17dfc5fc54ee163da9df5d9",
+    "@angular/common": "github:angular/common-builds#b4f6bfab7bb0184713064bd00e2c6ac49794a27d",
+    "@angular/compiler": "github:angular/compiler-builds#4d805779bcafcb1365680c18ca9961e3547a8c14",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#c1803948f6c4e5277a474cb91355aeb8813b0366",
+    "@angular/core": "github:angular/core-builds#a03e0b3a2951ce7be3571b6ebfcd74cd494e190f",
+    "@angular/forms": "github:angular/forms-builds#de20e3b01a25e3571db2cd4af59047511acedcc9",
+    "@angular/language-service": "github:angular/language-service-builds#663d857e06869430a88d185322b5daf9bc41294b",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#1ad31b5208cfa37426eb51c71ffb6f7149b4772f",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#d0038080008dc0f0ffc3f6e169e536e3748899cc",
+    "@angular/router": "github:angular/router-builds#c681121caa1d25478e8149f24169b76611280ec8"
   }
 }
\ No newline at end of file

From 47c0db9eb394640501af5f0fd36495547466bc37 Mon Sep 17 00:00:00 2001
From: mgechev <mgechev@gmail.com>
Date: Wed, 17 Jul 2019 17:41:17 -0700
Subject: [PATCH 1648/1703] release: v8.2.0-next.1

---
 packages/schematics/angular/utility/latest-versions.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 4f467d99d1c0..0fdabb43986a 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -8,17 +8,17 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~8.2.0-next.0',
+  Angular: '~8.2.0-next.2',
   RxJs: '~6.4.0',
   ZoneJs: '~0.9.1',
   TypeScript: '~3.4.3',
   TsLib: '^1.9.0',
 
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.802.0-next.0',
-  DevkitBuildNgPackagr: '~0.802.0-next.0',
-  DevkitBuildWebpack: '~0.802.0-next.0',
-  AngularPWA: '~0.802.0-next.0',
+  DevkitBuildAngular: '~0.802.0-next.1',
+  DevkitBuildNgPackagr: '~0.802.0-next.1',
+  DevkitBuildWebpack: '~0.802.0-next.1',
+  AngularPWA: '~0.802.0-next.1',
 
   tsickle: '^0.35.0',
   ngPackagr: '^5.1.0',

From d25879f9fcecce79d82d8b042eaa791567ca3c30 Mon Sep 17 00:00:00 2001
From: Amadou Sall <ahasall.dev@gmail.com>
Date: Fri, 7 Jun 2019 15:44:01 +0200
Subject: [PATCH 1649/1703] fix(@schematics/angular): the required 'alt'
 attribute is missing in the root component's template

When you generate an application with `--minimal` flag, the image in the
HTML template of the root component doesn't have the 'alt' attribute
---
 .../angular/application/other-files/app.component.ts.template   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schematics/angular/application/other-files/app.component.ts.template b/packages/schematics/angular/application/other-files/app.component.ts.template
index 36845433365f..d1b227e6584b 100644
--- a/packages/schematics/angular/application/other-files/app.component.ts.template
+++ b/packages/schematics/angular/application/other-files/app.component.ts.template
@@ -8,7 +8,7 @@ import { Component } from '@angular/core';
       <h1>
         Welcome to {{title}}!
       </h1>
-      <img width="300" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNTAgMjUwIj4KICAgIDxwYXRoIGZpbGw9IiNERDAwMzEiIGQ9Ik0xMjUgMzBMMzEuOSA2My4ybDE0LjIgMTIzLjFMMTI1IDIzMGw3OC45LTQzLjcgMTQuMi0xMjMuMXoiIC8+CiAgICA8cGF0aCBmaWxsPSIjQzMwMDJGIiBkPSJNMTI1IDMwdjIyLjItLjFWMjMwbDc4LjktNDMuNyAxNC4yLTEyMy4xTDEyNSAzMHoiIC8+CiAgICA8cGF0aCAgZmlsbD0iI0ZGRkZGRiIgZD0iTTEyNSA1Mi4xTDY2LjggMTgyLjZoMjEuN2wxMS43LTI5LjJoNDkuNGwxMS43IDI5LjJIMTgzTDEyNSA1Mi4xem0xNyA4My4zaC0zNGwxNy00MC45IDE3IDQwLjl6IiAvPgogIDwvc3ZnPg==">
+      <img width="300" alt="Angular Logo" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNTAgMjUwIj4KICAgIDxwYXRoIGZpbGw9IiNERDAwMzEiIGQ9Ik0xMjUgMzBMMzEuOSA2My4ybDE0LjIgMTIzLjFMMTI1IDIzMGw3OC45LTQzLjcgMTQuMi0xMjMuMXoiIC8+CiAgICA8cGF0aCBmaWxsPSIjQzMwMDJGIiBkPSJNMTI1IDMwdjIyLjItLjFWMjMwbDc4LjktNDMuNyAxNC4yLTEyMy4xTDEyNSAzMHoiIC8+CiAgICA8cGF0aCAgZmlsbD0iI0ZGRkZGRiIgZD0iTTEyNSA1Mi4xTDY2LjggMTgyLjZoMjEuN2wxMS43LTI5LjJoNDkuNGwxMS43IDI5LjJIMTgzTDEyNSA1Mi4xem0xNyA4My4zaC0zNGwxNy00MC45IDE3IDQwLjl6IiAvPgogIDwvc3ZnPg==">
     </div>
     <h2>Here are some links to help you start: </h2>
     <ul>

From 069a18200ef521321c712b6c18b0d76ba2891249 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Thu, 11 Jul 2019 12:12:17 -0400
Subject: [PATCH 1650/1703] fix(@angular-devkit/build-angular): support pnpm
 with ng serve

Webpack and its development server assume the presence of two node builtins (`events` & `querystring`).  Do to package hoisting npm/yarn will usually place the shims for those two builtins at locations that webpack find them.  This is however not guaranteed nor will it work with pnpm which strictly follows the prescribed dependency tree.
To remedy this, the specific node shims are enabled only for the specific internal webpack files that are used within the development server.  This ensures that the requirements of these files does not pollute the entire application.

Fixes #13680
---
 .../models/webpack-configs/common.ts               |  8 ++++++++
 .../build_angular/src/dev-server/index.ts          | 14 ++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index e2677039b0f7..c393254f507a 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -402,6 +402,14 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
           test: /[\/\\]@angular[\/\\]core[\/\\].+\.js$/,
           parser: { system: true },
         },
+        {
+          test: /[\/\\]hot[\/\\]emitter.js$/,
+          parser: { node: { events: true } },
+        },
+        {
+          test: /[\/\\]webpack-dev-server[\/\\]client[\/\\]utils[\/\\]createSocketUrl.js$/,
+          parser: { node: { querystring: true } },
+        },
         {
           test: /\.js$/,
           ...buildOptimizerUseRule,
diff --git a/packages/angular_devkit/build_angular/src/dev-server/index.ts b/packages/angular_devkit/build_angular/src/dev-server/index.ts
index ec61f44aa73d..cbb7f4297dca 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/index.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/index.ts
@@ -407,6 +407,20 @@ function _addLiveReload(
     webpackConfig.plugins = [];
   }
 
+  // Enable the internal node plugins but no individual shims
+  // This is needed to allow module specific rules to include node shims
+  // Only needed in dev server mode to support live reload capabilities in all package managers
+  if (webpackConfig.node === false) {
+    webpackConfig.node = {
+      global: false,
+      process: false,
+      __filename: false,
+      __dirname: false,
+      Buffer: false,
+      setImmediate: false,
+    };
+  }
+
   // This allows for live reload of page when changes are made to repo.
   // https://webpack.js.org/configuration/dev-server/#devserver-inline
   let webpackDevServerPath;

From 63f0049e4371af1b3eff43fd0d84d38546d13485 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 18 Jul 2019 14:51:25 +0200
Subject: [PATCH 1651/1703] feat(@ngtools/webpack): show warning when a TS
 compilations contains unused files

When a tsconfig without `includes` or `files` all files under the `rootDir` will be included in the compilation. This results in redundant files to inserted as part of the ts compilation which in some cases might reduce the compilation drastically.

Related to: TOOL-949
---
 .../unused-files-warning_spec_large.ts        | 165 ++++++++++++++++++
 .../webpack/src/angular_compiler_plugin.ts    |  51 +++++-
 2 files changed, 213 insertions(+), 3 deletions(-)
 create mode 100644 packages/angular_devkit/build_angular/test/browser/unused-files-warning_spec_large.ts

diff --git a/packages/angular_devkit/build_angular/test/browser/unused-files-warning_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/unused-files-warning_spec_large.ts
new file mode 100644
index 000000000000..75b16fbb998d
--- /dev/null
+++ b/packages/angular_devkit/build_angular/test/browser/unused-files-warning_spec_large.ts
@@ -0,0 +1,165 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Architect } from '@angular-devkit/architect';
+import { TestLogger } from '@angular-devkit/architect/testing';
+import { debounceTime, take, tap } from 'rxjs/operators';
+import { BrowserBuilderOutput } from '../../src/browser/index';
+import { createArchitect, host, ivyEnabled } from '../utils';
+
+
+describe('Browser Builder unused files warnings', () => {
+  const warningMessageSuffix = `is part of the TypeScript compilation but it's unused`;
+  const targetSpec = { project: 'app', target: 'build' };
+  let architect: Architect;
+
+  beforeEach(async () => {
+    await host.initialize().toPromise();
+
+    architect = (await createArchitect(host.root())).architect;
+  });
+  afterEach(async () => host.restore().toPromise());
+
+  it('should not show warning when all files are used', async () => {
+    if (!ivyEnabled) {
+      // TODO: https://github.com/angular/angular-cli/issues/15056
+      pending('Only supported in Ivy.');
+
+      return;
+    }
+
+    const logger = new TestLogger('unused-files-warnings');
+    const run = await architect.scheduleTarget(targetSpec, undefined, { logger });
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+    expect(logger.includes(warningMessageSuffix)).toBe(false);
+    logger.clear();
+
+    await run.stop();
+  });
+
+  it('should show warning when some files are unused', async () => {
+    if (!ivyEnabled) {
+      // TODO: https://github.com/angular/angular-cli/issues/15056
+      pending('Only supported in Ivy.');
+
+      return;
+    }
+
+    host.replaceInFile(
+      'src/tsconfig.app.json',
+      '"main.ts"',
+      '"main.ts", "environments/environment.prod.ts"',
+    );
+
+    const logger = new TestLogger('unused-files-warnings');
+    const run = await architect.scheduleTarget(targetSpec, undefined, { logger });
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+    expect(logger.includes(`environment.prod.ts ${warningMessageSuffix}`)).toBe(true);
+    logger.clear();
+
+    await run.stop();
+  });
+
+  it('should not show warning when type files are used', async () => {
+    if (!ivyEnabled) {
+      // TODO: https://github.com/angular/angular-cli/issues/15056
+      pending('Only supported in Ivy.');
+
+      return;
+    }
+
+    host.writeMultipleFiles({
+      'src/app/type.ts': 'export type MyType = number;'
+    });
+
+    host.replaceInFile(
+      'src/app/app.component.ts',
+      `'@angular/core';`,
+      `'@angular/core';\nimport { MyType } from './type';\n`
+    );
+
+    const logger = new TestLogger('unused-files-warnings');
+    const run = await architect.scheduleTarget(targetSpec, undefined, { logger });
+    const output = await run.result as BrowserBuilderOutput;
+    expect(output.success).toBe(true);
+    expect(logger.includes(warningMessageSuffix)).toBe(false);
+    logger.clear();
+
+    await run.stop();
+  });
+
+  it('works for rebuilds', async () => {
+    if (!ivyEnabled) {
+      // TODO: https://github.com/angular/angular-cli/issues/15056
+      pending('Only supported in Ivy.');
+
+      return;
+    }
+
+    host.replaceInFile(
+      'src/tsconfig.app.json',
+      '"**/*.d.ts"',
+      '"**/*.d.ts", "testing/**/*.ts"',
+    );
+
+    const logger = new TestLogger('unused-files-warnings');
+    let buildNumber = 0;
+    const run = await architect.scheduleTarget(targetSpec, { watch: true }, { logger });
+
+    await run.output
+      .pipe(
+        debounceTime(1000),
+        tap(buildEvent => {
+          expect(buildEvent.success).toBe(true);
+
+          buildNumber ++;
+          switch (buildNumber) {
+            case 1:
+              // The first should not have unused files
+              expect(logger.includes(warningMessageSuffix)).toBe(false, `Case ${buildNumber} failed.`);
+
+              // Write a used file
+              host.writeMultipleFiles({
+                'src/testing/type.ts': 'export type MyType = number;'
+              });
+              
+              // touch file to trigger build
+              host.replaceInFile(
+                'src/app/app.component.ts',
+                `'@angular/core';`,
+                `'@angular/core';\n`
+              );
+              break;
+
+            case 2:
+              // The second should have type.ts as unused
+              expect(logger.includes(`type.ts ${warningMessageSuffix}`)).toBe(true, `Case ${buildNumber} failed.`);
+
+              host.replaceInFile(
+                'src/app/app.component.ts',
+                `'@angular/core';`,
+                `'@angular/core';\nimport { MyType } from '../testing/type';`
+              );
+              break;
+
+            case 3:
+              // The third should not have any unused files
+              expect(logger.includes(warningMessageSuffix)).toBe(false, `Case ${buildNumber} failed.`);
+              break;
+          }
+
+          logger.clear();
+        }),
+        take(3),
+      )
+      .toPromise();
+    await run.stop();
+  });
+
+});
diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 872b47f37ca7..455c6bd434c7 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -593,6 +593,50 @@ export class AngularCompilerPlugin {
     }
   }
 
+  private _warnOnUnusedFiles(compilation: compilation.Compilation) {
+    // Only do the unused TS files checks when under Ivy
+    // since previously we did include unused files in the compilation
+    // See: https://github.com/angular/angular-cli/pull/15030
+    if (!this._compilerOptions.enableIvy) {
+      return;
+    }
+
+    const program = this._getTsProgram();
+    if (!program) {
+      return;
+    }
+
+    // Exclude the following files from unused checks
+    // - ngfactories & ngstyle might not have a correspondent
+    //   JS file example `@angular/core/core.ngfactory.ts`.
+    // - .d.ts files might not have a correspondent JS file due to bundling.
+    // - __ng_typecheck__.ts will never be requested.
+    const fileExcludeRegExp = /(\.(d|ngfactory|ngstyle)\.ts|ng_typecheck__\.ts)$/;
+
+    const usedFiles = new Set<string>();
+    for (const compilationModule of compilation.modules) {
+      if (!compilationModule.resource) {
+        continue;
+      }
+
+      usedFiles.add(forwardSlashPath(compilationModule.resource));
+
+      // We need the below for dependencies which 
+      // are not emitted such as type only TS files
+      for (const dependency of compilationModule.buildInfo.fileDependencies) {
+        usedFiles.add(forwardSlashPath(dependency));
+      }
+    }
+
+    const unusedFilesWarning = program.getSourceFiles()
+      .filter(({ fileName }) => !fileExcludeRegExp.test(fileName) && !usedFiles.has(fileName))
+      .map(({ fileName }) => `${fileName} is part of the TypeScript compilation but it's unused.`);
+
+    if (unusedFilesWarning.length) {
+      compilation.warnings.push(...unusedFilesWarning);
+    }
+  }
+
   // Registration hook for webpack plugin.
   // tslint:disable-next-line:no-big-function
   apply(compiler: Compiler & { watchMode?: boolean, parentCompilation?: compilation.Compilation }) {
@@ -609,6 +653,8 @@ export class AngularCompilerPlugin {
     // cleanup if not watching
     compiler.hooks.thisCompilation.tap('angular-compiler', compilation => {
       compilation.hooks.finishModules.tap('angular-compiler', () => {
+        this._warnOnUnusedFiles(compilation);
+
         let rootCompiler = compiler;
         while (rootCompiler.parentCompilation) {
           // tslint:disable-next-line:no-any
@@ -1174,7 +1220,7 @@ export class AngularCompilerPlugin {
           return null;
         }
       })
-      .filter(x => x);
+      .filter(x => x) as string[];
 
     const resourceImports = findResources(sourceFile)
       .map(resourcePath => resolve(dirname(resolvedFileName), normalize(resourcePath)));
@@ -1186,8 +1232,7 @@ export class AngularCompilerPlugin {
       ...this.getResourceDependencies(this._compilerHost.denormalizePath(resolvedFileName)),
     ].map((p) => p && this._compilerHost.denormalizePath(p)));
 
-    return [...uniqueDependencies]
-      .filter(x => !!x) as string[];
+    return [...uniqueDependencies];
   }
 
   getResourceDependencies(fileName: string): string[] {

From 4a8ed4abebc4745da63fccafe4125d212f5f14ca Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 24 Jul 2019 23:19:14 +0000
Subject: [PATCH 1652/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 977707c26a61..6832f5a0757b 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#87c7c17a28e2bbd5d17dfc5fc54ee163da9df5d9",
-    "@angular/common": "github:angular/common-builds#b4f6bfab7bb0184713064bd00e2c6ac49794a27d",
-    "@angular/compiler": "github:angular/compiler-builds#4d805779bcafcb1365680c18ca9961e3547a8c14",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#c1803948f6c4e5277a474cb91355aeb8813b0366",
-    "@angular/core": "github:angular/core-builds#a03e0b3a2951ce7be3571b6ebfcd74cd494e190f",
-    "@angular/forms": "github:angular/forms-builds#de20e3b01a25e3571db2cd4af59047511acedcc9",
-    "@angular/language-service": "github:angular/language-service-builds#663d857e06869430a88d185322b5daf9bc41294b",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#1ad31b5208cfa37426eb51c71ffb6f7149b4772f",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#d0038080008dc0f0ffc3f6e169e536e3748899cc",
-    "@angular/router": "github:angular/router-builds#c681121caa1d25478e8149f24169b76611280ec8"
+    "@angular/animations": "github:angular/animations-builds#05dbe29e4cf274a1f3d2033c0747ce7e1c4df389",
+    "@angular/common": "github:angular/common-builds#bd8b165c773aac498a3b7f85a11451f78133f4ad",
+    "@angular/compiler": "github:angular/compiler-builds#d9eff2a8978631c6456e4854f827baeb4fdb7da3",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#b20f652da542fe1f8c04575dbb471cbb5452cb08",
+    "@angular/core": "github:angular/core-builds#d8f3855dfb5a839df67e9e01f5330db847c262c2",
+    "@angular/forms": "github:angular/forms-builds#9dc7f1e5358d1928c8c39570cd3e63cae8999ecc",
+    "@angular/language-service": "github:angular/language-service-builds#35ce49bfe0c9ee3cff517b324346c5055a5ba627",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#f3c23e305a7cf67c88ccfd0fd1b109653a563d9d",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#bb93ab9bb2a4f586b4a5d5c07dff4617a0c0288a",
+    "@angular/router": "github:angular/router-builds#f1cf28650b74b2e532be29064ee6fe46ae205bd1"
   }
 }
\ No newline at end of file

From 78acd2aeeda3bbe3c404d8fa49e33fa6afcfab92 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 24 Jul 2019 23:39:25 +0000
Subject: [PATCH 1653/1703] build: update sass to version 1.22.8

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 57075305a66b..02b0efd6828a 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -37,7 +37,7 @@
     "postcss-loader": "3.0.0",
     "raw-loader": "1.0.0",
     "rxjs": "6.4.0",
-    "sass": "1.22.5",
+    "sass": "1.22.8",
     "sass-loader": "7.1.0",
     "semver": "6.2.0",
     "source-map-support": "0.5.12",
diff --git a/yarn.lock b/yarn.lock
index 1852aee12b37..73925e4bdc31 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9142,10 +9142,10 @@ sass-loader@7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
-sass@1.22.5:
-  version "1.22.5"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.22.5.tgz#0436ba64eaad4c9eb523480c141becc330ddd90b"
-  integrity sha512-Z06zPez82QqlQbqvGKMMEs2bBpLUsmFQxd+8wZJedkptMn8jyk+fccMhfUloD8HsfsYw572ca7Be3zbMBsip4A==
+sass@1.22.8:
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.22.8.tgz#835178085177d5a934fb0e25a0f958b4b5bbff65"
+  integrity sha512-5md/TfquFCQw+Wp9/FoQuEolVuVsJJZ6dQjfCRihCYcyr8xoQICIU0Nads9CVH8z9khd7k8AnwCcgH6L7t+SAg==
   dependencies:
     chokidar ">=2.0.0 <4.0.0"
 

From f796e454393966d1fa1d0ba5679e57059f281228 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 23 Jul 2019 09:51:32 +0000
Subject: [PATCH 1654/1703] build: update webpack to version 4.37.0

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 packages/angular_devkit/build_webpack/package.json | 2 +-
 packages/ngtools/webpack/package.json              | 2 +-
 yarn.lock                                          | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 02b0efd6828a..2a43457d779a 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -48,7 +48,7 @@
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.3.0",
-    "webpack": "4.35.3",
+    "webpack": "4.37.0",
     "webpack-dev-middleware": "3.7.0",
     "webpack-dev-server": "3.7.2",
     "webpack-merge": "4.2.1",
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index 136e3deb03ad..a3133d9509ce 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -17,7 +17,7 @@
     "webpack-dev-server": "^3.1.4"
   },
   "devDependencies": {
-    "webpack": "4.35.3",
+    "webpack": "4.37.0",
     "webpack-dev-server": "^3.1.4"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index a7b6e418c979..334e9d1f7abe 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -36,6 +36,6 @@
     "@angular/compiler": "~8.1.0",
     "@angular/compiler-cli": "~8.1.0",
     "typescript": "3.4.5",
-    "webpack": "4.35.3"
+    "webpack": "4.37.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 73925e4bdc31..98a1768d8314 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11138,10 +11138,10 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.35.3:
-  version "4.35.3"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.35.3.tgz#66bc35ef215a7b75e8790f84d560013ffecf0ca3"
-  integrity sha512-xggQPwr9ILlXzz61lHzjvgoqGU08v5+Wnut19Uv3GaTtzN4xBTcwnobodrXE142EL1tOiS5WVEButooGzcQzTA==
+webpack@4.37.0:
+  version "4.37.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.37.0.tgz#3508ef10f7996612c2be6026076d89760f776f54"
+  integrity sha512-iJPPvL7XpbcbwOthbzpa2BSPlmGp8lGDokAj/LdWtK80rsPoPOdANSbDBf2GAVLKZD3GhCuQ/gGkgN9HWs0Keg==
   dependencies:
     "@webassemblyjs/ast" "1.8.5"
     "@webassemblyjs/helper-module-context" "1.8.5"

From 4f8e34903312f40ffb9ad0a921851afcf5a52a93 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 18 Jul 2019 22:13:36 +0200
Subject: [PATCH 1655/1703] fix(@angular-devkit/build-angular): only add module
 script types to actual module scripts

Fixes #15102
---
 .../build_angular/src/browser/index.ts        | 17 ++++----
 .../test/browser/scripts-array_spec_large.ts  | 39 +++++++++++++++++--
 2 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 9cf285de5084..73d207564458 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -40,6 +40,7 @@ import {
   getStatsConfig,
   getStylesConfig,
   getWorkerConfig,
+  normalizeExtraEntryPoints,
 } from '../angular-cli-files/models/webpack-configs';
 import {
   IndexHtmlTransform,
@@ -238,16 +239,16 @@ export function buildWebpackBrowser(
             let files: EmittedFiles[] | undefined;
 
             const [firstBuild, secondBuild] = buildEvents;
+            if (isDifferentialLoadingNeeded) {
+              const scriptsEntryPointName = normalizeExtraEntryPoints(options.scripts || [], 'scripts')
+                .map(x => x.bundleName);
 
-            if (buildEvents.length === 2) {
               moduleFiles = firstBuild.emittedFiles || [];
-              noModuleFiles = secondBuild.emittedFiles;
-              files = moduleFiles.filter(x => x.extension === '.css');
-            } else if (options.watch && isDifferentialLoadingNeeded) {
-              // differential loading is not enabled in watch mode
-              // but we still want to use module type tags
-              moduleFiles = firstBuild.emittedFiles || [];
-              files = moduleFiles.filter(x => x.extension === '.css');
+              files = moduleFiles.filter(x => x.extension === '.css' || (x.name && scriptsEntryPointName.includes(x.name)));
+
+              if (buildEvents.length === 2) {
+                noModuleFiles = secondBuild.emittedFiles;
+              }
             } else {
               const { emittedFiles = [] } = firstBuild;
               files = emittedFiles.filter(x => x.name !== 'polyfills-es5');
diff --git a/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
index 77edd2f02376..64af80cc7230 100644
--- a/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
@@ -48,7 +48,7 @@ describe('Browser Builder scripts array', () => {
   afterEach(async () => host.restore().toPromise());
 
   it('works', async () => {
-    const matches: { [path: string]: string } = {
+    const matches: Record<string, string> = {
       'scripts.js': 'input-script',
       'lazy-script.js': 'lazy-script',
       'renamed-script.js': 'pre-rename-script',
@@ -71,8 +71,41 @@ describe('Browser Builder scripts array', () => {
       scripts: getScriptsOption(),
     } as {});
 
-    for (const fileName of Object.keys(matches)) {
-      expect(await files[fileName]).toMatch(matches[fileName]);
+    for (const [fileName, content] of Object.entries(matches)) {
+      expect(await files[fileName]).toMatch(content);
+    }
+  });
+
+  it('works in watch mode with differential loading', async () => {
+    const matches: Record<string, string> = {
+      'scripts.js': 'input-script',
+      'lazy-script.js': 'lazy-script',
+      'renamed-script.js': 'pre-rename-script',
+      'renamed-lazy-script.js': 'pre-rename-lazy-script',
+      'main.js': 'input-script',
+      'index.html': '<script src="runtime.js" type="module"></script>'
+        + '<script src="polyfills.js" type="module"></script>'
+        + '<script src="scripts.js" defer></script>'
+        + '<script src="renamed-script.js" defer></script>'
+        + '<script src="vendor.js" type="module"></script>'
+        + '<script src="main.js" type="module"></script>',
+    };
+
+    host.writeMultipleFiles(scripts);
+    host.appendToFile('src/main.ts', '\nimport \'./input-script.js\';');
+    
+    // Enable differential loading
+    host.appendToFile('browserslist', '\nIE 10');
+
+    // Remove styles so we don't have to account for them in the index.html order check.
+    const { files } = await browserBuild(architect, host, target, {
+      styles: [],
+      scripts: getScriptsOption(),
+      watch: true,
+    } as {});
+
+    for (const [fileName, content] of Object.entries(matches)) {
+      expect(await files[fileName]).toMatch(content);
     }
   });
 

From 35532055c0a90009693003c561f04de943c58b87 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 18 Jul 2019 22:17:14 +0200
Subject: [PATCH 1656/1703] refactor: scripts array e2e tests to use
 async/await

---
 .../e2e/tests/basic/scripts-array.ts          | 176 +++++++-----------
 1 file changed, 66 insertions(+), 110 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/basic/scripts-array.ts b/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
index 504d7a12ee4e..816b40be0a14 100644
--- a/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
+++ b/tests/legacy-cli/e2e/tests/basic/scripts-array.ts
@@ -1,118 +1,74 @@
 // TODO(architect): edit the architect config instead of the cli config.
 
-import {
-  writeMultipleFiles,
-  expectFileToMatch,
-  appendToFile,
-  expectFileMatchToExist,
-} from '../../utils/fs';
+import { oneLineTrim } from 'common-tags';
+import { appendToFile, expectFileToMatch, writeMultipleFiles } from '../../utils/fs';
 import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
-import { oneLineTrim } from 'common-tags';
-import * as fs from 'fs';
-import * as path from 'path';
 
-// tslint:disable:max-line-length
-export default function() {
-  return (
-    writeMultipleFiles({
-      'src/string-script.js': "console.log('string-script'); var number = 1+1;",
-      'src/zstring-script.js': "console.log('zstring-script');",
-      'src/fstring-script.js': "console.log('fstring-script');",
-      'src/ustring-script.js': "console.log('ustring-script');",
-      'src/bstring-script.js': "console.log('bstring-script');",
-      'src/astring-script.js': "console.log('astring-script');",
-      'src/cstring-script.js': "console.log('cstring-script');",
-      'src/input-script.js': "console.log('input-script');",
-      'src/lazy-script.js': "console.log('lazy-script');",
-      'src/pre-rename-script.js': "console.log('pre-rename-script');",
-      'src/pre-rename-lazy-script.js': "console.log('pre-rename-lazy-script');",
-    })
-      .then(() => appendToFile('src/main.ts', "import './string-script.js';"))
-      .then(() =>
-        updateJsonFile('angular.json', configJson => {
-          const appArchitect = configJson.projects['test-project'].architect;
-          appArchitect.build.options.scripts = [
-            { input: 'src/string-script.js' },
-            { input: 'src/zstring-script.js' },
-            { input: 'src/fstring-script.js' },
-            { input: 'src/ustring-script.js' },
-            { input: 'src/bstring-script.js' },
-            { input: 'src/astring-script.js' },
-            { input: 'src/cstring-script.js' },
-            { input: 'src/input-script.js' },
-            { input: 'src/lazy-script.js', inject: false },
-            { input: 'src/pre-rename-script.js', bundleName: 'renamed-script' },
-            {
-              input: 'src/pre-rename-lazy-script.js',
-              bundleName: 'renamed-lazy-script',
-              inject: false,
-            },
-          ];
-        }),
-      )
-      .then(() => ng('build', '--extract-css'))
-      // files were created successfully
-      .then(() => expectFileToMatch('dist/test-project/scripts.js', 'string-script'))
-      .then(() => expectFileToMatch('dist/test-project/scripts.js', 'input-script'))
-      .then(() => expectFileToMatch('dist/test-project/lazy-script.js', 'lazy-script'))
-      .then(() => expectFileToMatch('dist/test-project/renamed-script.js', 'pre-rename-script'))
-      .then(() =>
-        expectFileToMatch('dist/test-project/renamed-lazy-script.js', 'pre-rename-lazy-script'),
-      )
-      // index.html lists the right bundles
-      .then(() =>
-        expectFileToMatch(
-          'dist/test-project/index.html',
-          oneLineTrim`
-      <script src="runtime-es2015.js" type="module"></script>
-      <script src="polyfills-es2015.js" type="module"></script>
-      <script src="runtime-es5.js" nomodule defer></script>
-      <script src="polyfills-es5.js" nomodule defer></script>
-      <script src="scripts.js" defer></script>
-      <script src="renamed-script.js" defer></script>
-      <script src="vendor-es2015.js" type="module"></script>
-      <script src="main-es2015.js" type="module"></script>
-      <script src="vendor-es5.js" nomodule defer></script>
-      <script src="main-es5.js" nomodule defer></script>
-    `,
-        ),
-      )
-      // Ensure scripts can be separately imported from the app.
-      .then(() =>
-        expectFileToMatch('dist/test-project/main-es5.js', "console.log('string-script');"),
-      )
-      .then(() =>
-        expectFileToMatch('dist/test-project/main-es2015.js', "console.log('string-script');"),
-      )
-  );
-  // TODO(architect): disabled until --prod is added.
-  // Verify uglify, sourcemaps and hashes. Lazy scripts should not get hashes.
-  // .then(() => ng('build', '--prod', '--source-map'))
-  // .then(() => expectFileMatchToExist('dist', /scripts\.[0-9a-f]{20}\.js/))
-  // .then(fileName => expectFileToMatch(`dist/${fileName}`, 'var number=2;'))
-  // .then(() => expectFileMatchToExist('dist', /scripts\.[0-9a-f]{20}\.js\.map/))
-  // .then(() => expectFileMatchToExist('dist', /renamed-script\.[0-9a-f]{20}\.js/))
-  // .then(() => expectFileMatchToExist('dist', /renamed-script\.[0-9a-f]{20}\.js.map/))
-  // .then(() => expectFileToMatch('dist/test-project/lazy-script.js', 'lazy-script'))
-  // .then(() => expectFileToMatch('dist/test-project/enamed-lazy-script.js', 'pre-rename-lazy-script'))
+export default async function () {
+  await writeMultipleFiles({
+    'src/string-script.js': "console.log('string-script'); var number = 1+1;",
+    'src/zstring-script.js': "console.log('zstring-script');",
+    'src/fstring-script.js': "console.log('fstring-script');",
+    'src/ustring-script.js': "console.log('ustring-script');",
+    'src/bstring-script.js': "console.log('bstring-script');",
+    'src/astring-script.js': "console.log('astring-script');",
+    'src/cstring-script.js': "console.log('cstring-script');",
+    'src/input-script.js': "console.log('input-script');",
+    'src/lazy-script.js': "console.log('lazy-script');",
+    'src/pre-rename-script.js': "console.log('pre-rename-script');",
+    'src/pre-rename-lazy-script.js': "console.log('pre-rename-lazy-script');",
+  });
+
+  await appendToFile('src/main.ts', "import './string-script.js';");
 
-  // // Expect order to be preserved.
-  // .then(() => {
-  //   const [fileName] = fs.readdirSync('dist')
-  //     .filter(name => name.match(/^scripts\..*\.js$/));
+  await updateJsonFile('angular.json', configJson => {
+    const appArchitect = configJson.projects['test-project'].architect;
+    appArchitect.build.options.scripts = [
+      { input: 'src/string-script.js' },
+      { input: 'src/zstring-script.js' },
+      { input: 'src/fstring-script.js' },
+      { input: 'src/ustring-script.js' },
+      { input: 'src/bstring-script.js' },
+      { input: 'src/astring-script.js' },
+      { input: 'src/cstring-script.js' },
+      { input: 'src/input-script.js' },
+      { input: 'src/lazy-script.js', inject: false },
+      { input: 'src/pre-rename-script.js', bundleName: 'renamed-script' },
+      {
+        input: 'src/pre-rename-lazy-script.js',
+        bundleName: 'renamed-lazy-script',
+        inject: false,
+      },
+    ];
+  });
 
-  //   const content = fs.readFileSync(path.join('dist', fileName), 'utf-8');
-  //   const re = new RegExp(/['"]string-script['"].*/.source
-  //                       + /['"]zstring-script['"].*/.source
-  //                       + /['"]fstring-script['"].*/.source
-  //                       + /['"]ustring-script['"].*/.source
-  //                       + /['"]bstring-script['"].*/.source
-  //                       + /['"]astring-script['"].*/.source
-  //                       + /['"]cstring-script['"].*/.source
-  //                       + /['"]input-script['"]/.source);
-  //   if (!content.match(re)) {
-  //     throw new Error('Scripts are not included in order.');
-  //   }
-  // });
+  await ng('build', '--extract-css');
+
+  // files were created successfully
+  await expectFileToMatch('dist/test-project/scripts.js', 'string-script');
+  await expectFileToMatch('dist/test-project/scripts.js', 'input-script');
+  await expectFileToMatch('dist/test-project/lazy-script.js', 'lazy-script');
+  await expectFileToMatch('dist/test-project/renamed-script.js', 'pre-rename-script');
+  await expectFileToMatch('dist/test-project/renamed-lazy-script.js', 'pre-rename-lazy-script');
+
+  // index.html lists the right bundles
+  await expectFileToMatch(
+    'dist/test-project/index.html',
+    oneLineTrim`
+    <script src="runtime-es2015.js" type="module"></script>
+    <script src="polyfills-es2015.js" type="module"></script>
+    <script src="runtime-es5.js" nomodule defer></script>
+    <script src="polyfills-es5.js" nomodule defer></script>
+    <script src="scripts.js" defer></script>
+    <script src="renamed-script.js" defer></script>
+    <script src="vendor-es2015.js" type="module"></script>
+    <script src="main-es2015.js" type="module"></script>
+    <script src="vendor-es5.js" nomodule defer></script>
+    <script src="main-es5.js" nomodule defer></script>
+  `,
+  );
+  // Ensure scripts can be separately imported from the app.
+  await expectFileToMatch('dist/test-project/main-es5.js', "console.log('string-script');");
+  await expectFileToMatch('dist/test-project/main-es2015.js', "console.log('string-script');");
 }

From 21cd079e7625ec4b939eb166fa466fad90c3d223 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 19 Jul 2019 05:14:58 +0000
Subject: [PATCH 1657/1703] build: update file-loader to version 4.1.0

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 22 +++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 2a43457d779a..a0e5754dc4e3 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -20,7 +20,7 @@
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.3",
     "core-js": "3.1.4",
-    "file-loader": "4.0.0",
+    "file-loader": "4.1.0",
     "glob": "7.1.4",
     "istanbul-instrumenter-loader": "3.0.1",
     "karma-source-map-support": "1.4.0",
diff --git a/yarn.lock b/yarn.lock
index 98a1768d8314..e74fcd3845be 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4083,13 +4083,13 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-file-loader@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.0.0.tgz#c3570783fefb6e1bc0978a856f4bf5825b966c2a"
-  integrity sha512-roAbL6IdSGczwfXxhMi6Zq+jD4IfUpL0jWHD7fvmjdOVb7xBfdRUHe4LpBgO23VtVK5AW1OlWZo0p34Jvx3iWg==
+file-loader@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.1.0.tgz#3a763391bc9502da7c59612fe348e38fc1980336"
+  integrity sha512-ajDk1nlByoalZAGR4b0H6oD+EGlWnyW1qbSxzaUc7RFiqmn+RbXQQRbTc72jsiUIlVusJ4Et58ltds8ZwTfnAw==
   dependencies:
-    loader-utils "^1.2.2"
-    schema-utils "^1.0.0"
+    loader-utils "^1.2.3"
+    schema-utils "^2.0.0"
 
 filename-regex@^2.0.0:
   version "2.0.1"
@@ -6317,7 +6317,7 @@ loader-runner@^2.3.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.1.tgz#026f12fe7c3115992896ac02ba022ba92971b979"
   integrity sha512-By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw==
 
-loader-utils@1.2.3, loader-utils@^1.2.2, loader-utils@^1.2.3:
+loader-utils@1.2.3, loader-utils@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
   integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
@@ -9211,6 +9211,14 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
+schema-utils@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.0.1.tgz#1eec2e059556af841b7f3a83b61af13d7a3f9196"
+  integrity sha512-HJFKJ4JixDpRur06QHwi8uu2kZbng318ahWEKgBjc0ZklcE4FDvmm2wghb448q0IRaABxIESt8vqPFvwgMB80A==
+  dependencies:
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+
 seedrandom@^2.4.4:
   version "2.4.4"
   resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-2.4.4.tgz#b25ea98632c73e45f58b77cfaa931678df01f9ba"

From 28bd5493a71d3294995a5b2dbb606b9c8a9cb01c Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Fri, 19 Jul 2019 11:26:32 +0200
Subject: [PATCH 1658/1703] fix(@ngtools/webpack): retain child compilation
 warnings and errors

At the moment child compilation warnings and errors are being lost as they are not passed to the root compilation.  This means that any errors that are being set by clean-css for component styles are being lost.
---
 .../test/browser/aot_spec_large.ts            | 26 ++++++++++++++++++-
 .../ngtools/webpack/src/resource_loader.ts    | 17 +++++++++---
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
index 785713cac442..4d0a141a5c77 100644
--- a/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
@@ -7,7 +7,7 @@
  */
 
 import { Architect } from '@angular-devkit/architect';
-import { join, normalize, virtualFs } from '@angular-devkit/core';
+import { join, logging, normalize, virtualFs } from '@angular-devkit/core';
 import { BrowserBuilderOutput } from '../../src/browser';
 import { createArchitect, host, ivyEnabled } from '../utils';
 
@@ -39,4 +39,28 @@ describe('Browser Builder AOT', () => {
 
     await run.stop();
   });
+
+  it('shows warnings for component styles', async () => {
+    const overrides = {
+      aot: true,
+      optimization: true,
+    };
+
+    host.writeMultipleFiles({
+      'src/app/app.component.css': `
+        .foo { color: white; padding: 1px; };
+        .buz { color: white; padding: 2px; };
+      `,
+    });
+
+    const logger = new logging.Logger('');
+    const logs: string[] = [];
+    logger.subscribe(e => logs.push(e.message));
+
+    const run = await architect.scheduleTarget(targetSpec, overrides, { logger });
+    const output = await run.result;
+    expect(output.success).toBe(true);
+    expect(logs.join()).toContain('WARNING in Invalid selector');
+    await run.stop();
+  });
 });
diff --git a/packages/ngtools/webpack/src/resource_loader.ts b/packages/ngtools/webpack/src/resource_loader.ts
index 75d9a68db70d..8dc72d93f202 100644
--- a/packages/ngtools/webpack/src/resource_loader.ts
+++ b/packages/ngtools/webpack/src/resource_loader.ts
@@ -100,10 +100,19 @@ export class WebpackResourceLoader {
     return new Promise((resolve, reject) => {
       childCompiler.compile((err: Error, childCompilation: any) => {
         // Resolve / reject the promise
-        if (childCompilation && childCompilation.errors && childCompilation.errors.length) {
-          const errorDetails = childCompilation.errors.map(function (error: any) {
-            return error.message + (error.error ? ':\n' + error.error : '');
-          }).join('\n');
+        const { warnings, errors } = childCompilation;
+
+        if (warnings && warnings.length) {
+          this._parentCompilation.warnings.push(...warnings);
+        }
+
+        if (errors && errors.length) {
+          this._parentCompilation.errors.push(...errors);
+
+          const errorDetails = errors
+            .map((error: any) => error.message + (error.error ? ':\n' + error.error : ''))
+            .join('\n');
+
           reject(new Error('Child compilation failed:\n' + errorDetails));
         } else if (err) {
           reject(err);

From bcf250c94d384dc5ae57d68ec3c0e516ed0a1778 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Fri, 19 Jul 2019 11:22:45 +0200
Subject: [PATCH 1659/1703] feat(@angular-devkit/build-angular): add bundle
 budget for component styles
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It’s very easy to inadvertently import toplevel css in component styles. Since component css is standalone and self-contained, it will never be shared between components and remains as a single large bundle for each component. This in turn adds a large amount of code that must be processed and increases bundle size.

Related to: TOOL-949
---
 .../plugins/bundle-budget.ts                  | 68 ++++++++++++-------
 .../utilities/bundle-calculator.ts            | 16 +++++
 .../build_angular/src/browser/schema.json     |  1 +
 .../test/browser/bundle-budgets_spec_large.ts | 62 +++++++++++++++++
 4 files changed, 121 insertions(+), 26 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/bundle-budget.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/bundle-budget.ts
index 4ee676886846..911e4c55d852 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/bundle-budget.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/plugins/bundle-budget.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { Compiler, compilation } from 'webpack';
-import { Budget } from '../../browser/schema';
+import { Budget, Type } from '../../browser/schema';
 import { Size, calculateBytes, calculateSizes } from '../utilities/bundle-calculator';
 import { formatSize } from '../utilities/stats';
 
@@ -30,33 +30,28 @@ export class BundleBudgetPlugin {
 
   apply(compiler: Compiler): void {
     const { budgets } = this.options;
-    compiler.hooks.afterEmit.tap('BundleBudgetPlugin', (compilation: compilation.Compilation) => {
-      if (!budgets || budgets.length === 0) {
-        return;
-      }
 
-      budgets.map(budget => {
-        const thresholds = this.calculate(budget);
-
-        return {
-          budget,
-          thresholds,
-          sizes: calculateSizes(budget, compilation),
-        };
-      })
-        .forEach(budgetCheck => {
-          budgetCheck.sizes.forEach(size => {
-            this.checkMaximum(budgetCheck.thresholds.maximumWarning, size, compilation.warnings);
-            this.checkMaximum(budgetCheck.thresholds.maximumError, size, compilation.errors);
-            this.checkMinimum(budgetCheck.thresholds.minimumWarning, size, compilation.warnings);
-            this.checkMinimum(budgetCheck.thresholds.minimumError, size, compilation.errors);
-            this.checkMinimum(budgetCheck.thresholds.warningLow, size, compilation.warnings);
-            this.checkMaximum(budgetCheck.thresholds.warningHigh, size, compilation.warnings);
-            this.checkMinimum(budgetCheck.thresholds.errorLow, size, compilation.errors);
-            this.checkMaximum(budgetCheck.thresholds.errorHigh, size, compilation.errors);
-          });
+    if (!budgets || budgets.length === 0) {
+      return;
+    }
 
-        });
+    compiler.hooks.compilation.tap('BundleBudgetPlugin', (compilation: compilation.Compilation) => {
+      compilation.hooks.afterOptimizeChunkAssets.tap('BundleBudgetPlugin', () => {
+        // In AOT compilations component styles get processed in child compilations.
+        // tslint:disable-next-line: no-any
+        const parentCompilation = (compilation.compiler as any).parentCompilation;
+        if (!parentCompilation) {
+          return;
+        }
+
+        const filteredBudgets = budgets.filter(budget => budget.type === Type.AnyComponentStyle);
+        this.runChecks(filteredBudgets, compilation);
+      });
+    });
+
+    compiler.hooks.afterEmit.tap('BundleBudgetPlugin', (compilation: compilation.Compilation) => {
+      const filteredBudgets = budgets.filter(budget => budget.type !== Type.AnyComponentStyle);
+      this.runChecks(filteredBudgets, compilation);
     });
   }
 
@@ -116,4 +111,25 @@ export class BundleBudgetPlugin {
 
     return thresholds;
   }
+
+  private runChecks(budgets: Budget[], compilation: compilation.Compilation) {
+    budgets
+      .map(budget => ({
+        budget,
+        thresholds: this.calculate(budget),
+        sizes: calculateSizes(budget, compilation),
+      }))
+      .forEach(budgetCheck => {
+        budgetCheck.sizes.forEach(size => {
+          this.checkMaximum(budgetCheck.thresholds.maximumWarning, size, compilation.warnings);
+          this.checkMaximum(budgetCheck.thresholds.maximumError, size, compilation.errors);
+          this.checkMinimum(budgetCheck.thresholds.minimumWarning, size, compilation.warnings);
+          this.checkMinimum(budgetCheck.thresholds.minimumError, size, compilation.errors);
+          this.checkMinimum(budgetCheck.thresholds.warningLow, size, compilation.warnings);
+          this.checkMaximum(budgetCheck.thresholds.warningHigh, size, compilation.warnings);
+          this.checkMinimum(budgetCheck.thresholds.errorLow, size, compilation.errors);
+          this.checkMaximum(budgetCheck.thresholds.errorHigh, size, compilation.errors);
+        });
+      });
+  }
 }
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator.ts
index 8af29c8e1208..8ef3cb93884f 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/utilities/bundle-calculator.ts
@@ -25,9 +25,11 @@ export function calculateSizes(budget: Budget, compilation: Compilation): Size[]
     allScript: AllScriptCalculator,
     any: AnyCalculator,
     anyScript: AnyScriptCalculator,
+    anyComponentStyle: AnyComponentStyleCalculator,
     bundle: BundleCalculator,
     initial: InitialCalculator,
   };
+
   const ctor = calculatorMap[budget.type];
   const calculator = new ctor(budget, compilation);
 
@@ -101,6 +103,20 @@ class AllCalculator extends Calculator {
   }
 }
 
+/**
+ * Any components styles
+ */
+class AnyComponentStyleCalculator extends Calculator {
+  calculate() {
+    return Object.keys(this.compilation.assets)
+      .filter(key => key.endsWith('.css'))
+      .map(key => ({
+        size: this.compilation.assets[key].size(),
+        label: key,
+      }));
+  }
+}
+
 /**
  * Any script, individually.
  */
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index 42c8ef8045cc..dbc930292512 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -482,6 +482,7 @@
             "allScript",
             "any",
             "anyScript",
+            "anyComponentStyle",
             "bundle",
             "initial"
           ]
diff --git a/packages/angular_devkit/build_angular/test/browser/bundle-budgets_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/bundle-budgets_spec_large.ts
index 37e150210ecb..2ce1a5691e41 100644
--- a/packages/angular_devkit/build_angular/test/browser/bundle-budgets_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/bundle-budgets_spec_large.ts
@@ -64,6 +64,68 @@ describe('Browser Builder bundle budgets', () => {
     await run.stop();
   });
 
+  it(`shows warnings for large component css when using 'anyComponentStyle' when AOT`, async () => {
+    const overrides = {
+      aot: true,
+      optimization: true,
+      budgets: [{ type: 'anyComponentStyle', maximumWarning: '1b' }],
+    };
+
+    const cssContent = `
+      .foo { color: white; padding: 1px; }
+      .buz { color: white; padding: 2px; }
+      .bar { color: white; padding: 3px; }
+    `;
+
+    host.writeMultipleFiles({
+      'src/app/app.component.css': cssContent,
+      'src/assets/foo.css': cssContent,
+      'src/styles.css': cssContent,
+    });
+
+    const logger = new logging.Logger('');
+    const logs: string[] = [];
+    logger.subscribe(e => logs.push(e.message));
+
+    const run = await architect.scheduleTarget(targetSpec, overrides, { logger });
+    const output = await run.result;
+    expect(output.success).toBe(true);
+    expect(logs.length).toBe(2);
+    expect(logs.join()).toMatch(/WARNING.+app\.component\.css/);
+    await run.stop();
+  });
+
+  it(`shows error for large component css when using 'anyComponentStyle' when AOT`, async () => {
+    const overrides = {
+      aot: true,
+      optimization: true,
+      budgets: [{ type: 'anyComponentStyle', maximumError: '1b' }],
+    };
+
+    const cssContent = `
+      .foo { color: white; padding: 1px; }
+      .buz { color: white; padding: 2px; }
+      .bar { color: white; padding: 3px; }
+    `;
+
+    host.writeMultipleFiles({
+      'src/app/app.component.css': cssContent,
+      'src/assets/foo.css': cssContent,
+      'src/styles.css': cssContent,
+    });
+
+    const logger = new logging.Logger('');
+    const logs: string[] = [];
+    logger.subscribe(e => logs.push(e.message));
+
+    const run = await architect.scheduleTarget(targetSpec, overrides, { logger });
+    const output = await run.result;
+    expect(output.success).toBe(false);
+    expect(logs.length).toBe(2);
+    expect(logs.join()).toMatch(/ERROR.+app\.component\.css/);
+    await run.stop();
+  });
+
   describe(`should ignore '.map' files`, () => {
     it(`when 'bundle' budget`, async () => {
       const overrides = {

From f32c9dde1ad6ae9be072a57f7ef68c8b62c29cc9 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sat, 20 Jul 2019 11:48:21 +0200
Subject: [PATCH 1660/1703] feat(@angular/cli): add `anyComponentStyle` budget
 type

---
 packages/angular/cli/lib/config/schema.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/angular/cli/lib/config/schema.json b/packages/angular/cli/lib/config/schema.json
index 8a3117b98f1d..1b7b03daa269 100644
--- a/packages/angular/cli/lib/config/schema.json
+++ b/packages/angular/cli/lib/config/schema.json
@@ -1024,6 +1024,7 @@
                     "allScript",
                     "any",
                     "anyScript",
+                    "anyComponentStyle",
                     "bundle",
                     "initial"
                   ]

From 19b120947d355444edd8fe08b6d8bdd50bcaaffb Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 23 Jul 2019 19:58:40 +0200
Subject: [PATCH 1661/1703] feat(@schematics/angular): add migration to add
 `anyComponentStyle` bundle budget

---
 .../update-9/update-workspace-config.ts       |  62 ++++++-
 .../update-9/update-workspace-config_spec.ts  | 153 +++++++++++-------
 packages/schematics/angular/utility/config.ts |   2 +-
 .../schematics/angular/utility/json-utils.ts  |  27 +++-
 .../angular/utility/workspace-models.ts       |   4 +-
 5 files changed, 181 insertions(+), 67 deletions(-)

diff --git a/packages/schematics/angular/migrations/update-9/update-workspace-config.ts b/packages/schematics/angular/migrations/update-9/update-workspace-config.ts
index 3dc9f637ce53..ca8310724223 100644
--- a/packages/schematics/angular/migrations/update-9/update-workspace-config.ts
+++ b/packages/schematics/angular/migrations/update-9/update-workspace-config.ts
@@ -12,11 +12,17 @@ import {
 } from '@angular-devkit/core';
 import { Rule, Tree, UpdateRecorder } from '@angular-devkit/schematics';
 import {
+  appendValueInAstArray,
   findPropertyInAstObject,
   insertPropertyInAstObjectInOrder,
   removePropertyInAstObject,
 } from '../../utility/json-utils';
 
+export const ANY_COMPONENT_STYLE_BUDGET = {
+  type: 'anyComponentStyle',
+  maximumWarning: '6kb',
+};
+
 export function UpdateWorkspaceConfig(): Rule {
   return (tree: Tree) => {
     let workspaceConfigPath = 'angular.json';
@@ -59,8 +65,9 @@ export function UpdateWorkspaceConfig(): Rule {
         const builder = findPropertyInAstObject(buildTarget, 'builder');
         // Projects who's build builder is not build-angular:browser
         if (builder && builder.kind === 'string' && builder.value === '@angular-devkit/build-angular:browser') {
-          updateOption('styles', recorder, buildTarget);
-          updateOption('scripts', recorder, buildTarget);
+          updateStyleOrScriptOption('styles', recorder, buildTarget);
+          updateStyleOrScriptOption('scripts', recorder, buildTarget);
+          addAnyComponentStyleBudget(recorder, buildTarget);
         }
       }
 
@@ -69,8 +76,8 @@ export function UpdateWorkspaceConfig(): Rule {
         const builder = findPropertyInAstObject(testTarget, 'builder');
         // Projects who's build builder is not build-angular:browser
         if (builder && builder.kind === 'string' && builder.value === '@angular-devkit/build-angular:karma') {
-          updateOption('styles', recorder, testTarget);
-          updateOption('scripts', recorder, testTarget);
+          updateStyleOrScriptOption('styles', recorder, testTarget);
+          updateStyleOrScriptOption('scripts', recorder, testTarget);
         }
       }
     }
@@ -84,19 +91,21 @@ export function UpdateWorkspaceConfig(): Rule {
 /**
  * Helper to retreive all the options in various configurations
  */
-function getAllOptions(builderConfig: JsonAstObject): JsonAstObject[] {
+function getAllOptions(builderConfig: JsonAstObject, configurationsOnly = false): JsonAstObject[] {
   const options = [];
   const configurations = findPropertyInAstObject(builderConfig, 'configurations');
   if (configurations && configurations.kind === 'object') {
     options.push(...configurations.properties.map(x => x.value));
   }
 
-  options.push(findPropertyInAstObject(builderConfig, 'options'));
+  if (!configurationsOnly) {
+    options.push(findPropertyInAstObject(builderConfig, 'options'));
+  }
 
   return options.filter(o => o && o.kind === 'object') as JsonAstObject[];
 }
 
-function updateOption(property: 'scripts' | 'styles', recorder: UpdateRecorder, builderConfig: JsonAstObject) {
+function updateStyleOrScriptOption(property: 'scripts' | 'styles', recorder: UpdateRecorder, builderConfig: JsonAstObject) {
   const options = getAllOptions(builderConfig);
 
   for (const option of options) {
@@ -121,3 +130,42 @@ function updateOption(property: 'scripts' | 'styles', recorder: UpdateRecorder,
     }
   }
 }
+
+function addAnyComponentStyleBudget(recorder: UpdateRecorder, builderConfig: JsonAstObject) {
+  const options = getAllOptions(builderConfig, true);
+
+  for (const option of options) {
+    const aotOption = findPropertyInAstObject(option, 'aot');
+    if (!aotOption || aotOption.kind !== 'true') {
+      // AnyComponentStyle only works for AOT
+      continue;
+    }
+
+    const budgetOption = findPropertyInAstObject(option, 'budgets');
+    if (!budgetOption) {
+      // add
+      insertPropertyInAstObjectInOrder(recorder, option, 'budgets', [ANY_COMPONENT_STYLE_BUDGET], 14);
+      continue;
+    }
+
+    if (budgetOption.kind !== 'array') {
+      continue;
+    }
+
+    // if 'anyComponentStyle' budget already exists don't add.
+    const hasAnyComponentStyle = budgetOption.elements.some(node => {
+      if (!node || node.kind !== 'object') {
+        // skip non complex objects
+        return false;
+      }
+
+      const budget = findPropertyInAstObject(node, 'type');
+
+      return !!budget && budget.kind === 'string' && budget.value === 'anyComponentStyle';
+    });
+
+    if (!hasAnyComponentStyle) {
+      appendValueInAstArray(recorder, budgetOption, ANY_COMPONENT_STYLE_BUDGET, 16);
+    }
+  }
+}
diff --git a/packages/schematics/angular/migrations/update-9/update-workspace-config_spec.ts b/packages/schematics/angular/migrations/update-9/update-workspace-config_spec.ts
index 64865e83c83b..dd83dbdeb1f2 100644
--- a/packages/schematics/angular/migrations/update-9/update-workspace-config_spec.ts
+++ b/packages/schematics/angular/migrations/update-9/update-workspace-config_spec.ts
@@ -8,9 +8,19 @@
 
 import { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+import { WorkspaceTargets } from '../../utility/workspace-models';
+import { ANY_COMPONENT_STYLE_BUDGET } from './update-workspace-config';
 
-function readWorkspaceConfig(tree: UnitTestTree) {
-  return JSON.parse(tree.readContent('/angular.json'));
+// tslint:disable-next-line: no-any
+function getWorkspaceTargets(tree: UnitTestTree): any {
+  return JSON.parse(tree.readContent(workspacePath))
+    .projects['migration-test'].architect;
+}
+
+function updateWorkspaceTargets(tree: UnitTestTree, workspaceTargets: WorkspaceTargets) {
+  const config = JSON.parse(tree.readContent(workspacePath));
+  config.projects['migration-test'].architect = workspaceTargets;
+  tree.overwrite(workspacePath, JSON.stringify(config, undefined, 2));
 }
 
 const scriptsWithLazy = [
@@ -69,60 +79,95 @@ describe('Migration to version 9', () => {
         .toPromise();
     });
 
-    it('should update scripts in build target', () => {
-      let config = readWorkspaceConfig(tree);
-      let build = config.projects['migration-test'].architect.build;
-      build.options.scripts = scriptsWithLazy;
-      build.configurations.production.scripts = scriptsWithLazy;
-
-      tree.overwrite(workspacePath, JSON.stringify(config));
-      const tree2 = schematicRunner.runSchematic('migration-09', {}, tree.branch());
-      config = readWorkspaceConfig(tree2);
-      build = config.projects['migration-test'].architect.build;
-      expect(build.options.scripts).toEqual(scriptsExpectWithLazy);
-      expect(build.configurations.production.scripts).toEqual(scriptsExpectWithLazy);
-    });
-
-    it('should update styles in build target', () => {
-      let config = readWorkspaceConfig(tree);
-      let build = config.projects['migration-test'].architect.build;
-      build.options.styles = stylesWithLazy;
-      build.configurations.production.styles = stylesWithLazy;
-
-      tree.overwrite(workspacePath, JSON.stringify(config));
-      const tree2 = schematicRunner.runSchematic('migration-09', {}, tree.branch());
-      config = readWorkspaceConfig(tree2);
-      build = config.projects['migration-test'].architect.build;
-      expect(build.options.styles).toEqual(stylesExpectWithLazy);
-      expect(build.configurations.production.styles).toEqual(stylesExpectWithLazy);
-    });
-
-    it('should update scripts in test target', () => {
-      let config = readWorkspaceConfig(tree);
-      let test = config.projects['migration-test'].architect.test;
-      test.options.scripts = scriptsWithLazy;
-      test.configurations = { production: { scripts: scriptsWithLazy } };
-
-      tree.overwrite(workspacePath, JSON.stringify(config));
-      const tree2 = schematicRunner.runSchematic('migration-09', {}, tree.branch());
-      config = readWorkspaceConfig(tree2);
-      test = config.projects['migration-test'].architect.test;
-      expect(test.options.scripts).toEqual(scriptsExpectWithLazy);
-      expect(test.configurations.production.scripts).toEqual(scriptsExpectWithLazy);
+    describe('scripts and style options', () => {
+      it('should update scripts in build target', () => {
+        let config = getWorkspaceTargets(tree);
+        config.build.options.scripts = scriptsWithLazy;
+        config.build.configurations.production.scripts = scriptsWithLazy;
+
+        updateWorkspaceTargets(tree, config);
+        const tree2 = schematicRunner.runSchematic('migration-09', {}, tree.branch());
+        config = getWorkspaceTargets(tree2).build;
+        expect(config.options.scripts).toEqual(scriptsExpectWithLazy);
+        expect(config.configurations.production.scripts).toEqual(scriptsExpectWithLazy);
+      });
+
+      it('should update styles in build target', () => {
+        let config = getWorkspaceTargets(tree);
+        config.build.options.styles = stylesWithLazy;
+        config.build.configurations.production.styles = stylesWithLazy;
+
+        updateWorkspaceTargets(tree, config);
+        const tree2 = schematicRunner.runSchematic('migration-09', {}, tree.branch());
+        config = getWorkspaceTargets(tree2).build;
+        expect(config.options.styles).toEqual(stylesExpectWithLazy);
+        expect(config.configurations.production.styles).toEqual(stylesExpectWithLazy);
+      });
+
+      it('should update scripts in test target', () => {
+        let config = getWorkspaceTargets(tree);
+        config.test.options.scripts = scriptsWithLazy;
+        config.test.configurations = { production: { scripts: scriptsWithLazy } };
+
+        updateWorkspaceTargets(tree, config);
+        const tree2 = schematicRunner.runSchematic('migration-09', {}, tree.branch());
+        config = getWorkspaceTargets(tree2).test;
+        expect(config.options.scripts).toEqual(scriptsExpectWithLazy);
+        expect(config.configurations.production.scripts).toEqual(scriptsExpectWithLazy);
+      });
+
+      it('should update styles in test target', () => {
+        let config = getWorkspaceTargets(tree);
+        config.test.options.styles = stylesWithLazy;
+        config.test.configurations = { production: { styles: stylesWithLazy } };
+
+        updateWorkspaceTargets(tree, config);
+        const tree2 = schematicRunner.runSchematic('migration-09', {}, tree.branch());
+        config = getWorkspaceTargets(tree2).test;
+        expect(config.options.styles).toEqual(stylesExpectWithLazy);
+        expect(config.configurations.production.styles).toEqual(stylesExpectWithLazy);
+      });
     });
 
-    it('should update styles in test target', () => {
-      let config = readWorkspaceConfig(tree);
-      let test = config.projects['migration-test'].architect.test;
-      test.options.styles = stylesWithLazy;
-      test.configurations = { production: { styles: stylesWithLazy } };
-
-      tree.overwrite(workspacePath, JSON.stringify(config));
-      const tree2 = schematicRunner.runSchematic('migration-09', {}, tree.branch());
-      config = readWorkspaceConfig(tree2);
-      test = config.projects['migration-test'].architect.test;
-      expect(test.options.styles).toEqual(stylesExpectWithLazy);
-      expect(test.configurations.production.styles).toEqual(stylesExpectWithLazy);
+    describe('anyComponentStyle bundle budget', () => {
+      it('should not append budget when already exists', () => {
+        const defaultBudget = [
+          { type: 'initial', maximumWarning: '2mb', maximumError: '5mb' },
+          { type: 'anyComponentStyle', maximumWarning: '10kb', maximumError: '50kb' },
+        ];
+
+        let config = getWorkspaceTargets(tree);
+        config.build.configurations.production.budgets = defaultBudget;
+        updateWorkspaceTargets(tree, config);
+
+        const tree2 = schematicRunner.runSchematic('migration-09', {}, tree.branch());
+        config = getWorkspaceTargets(tree2).build;
+        expect(config.configurations.production.budgets).toEqual(defaultBudget);
+      });
+
+      it('should append budget in build target', () => {
+        const defaultBudget = [{ type: 'initial', maximumWarning: '2mb', maximumError: '5mb' }];
+        let config = getWorkspaceTargets(tree);
+        config.build.configurations.production.budgets = defaultBudget;
+        updateWorkspaceTargets(tree, config);
+
+        const tree2 = schematicRunner.runSchematic('migration-09', {}, tree.branch());
+        config = getWorkspaceTargets(tree2).build;
+        expect(config.configurations.production.budgets).toEqual([
+          ...defaultBudget,
+          ANY_COMPONENT_STYLE_BUDGET,
+        ]);
+      });
+
+      it('should add budget in build target', () => {
+        let config = getWorkspaceTargets(tree);
+        config.build.configurations.production.budgets = undefined;
+        updateWorkspaceTargets(tree, config);
+
+        const tree2 = schematicRunner.runSchematic('migration-09', {}, tree.branch());
+        config = getWorkspaceTargets(tree2).build;
+        expect(config.configurations.production.budgets).toEqual([ANY_COMPONENT_STYLE_BUDGET]);
+      });
     });
   });
 });
diff --git a/packages/schematics/angular/utility/config.ts b/packages/schematics/angular/utility/config.ts
index 2d3b0c8c6cd0..5b72c4d4f5ed 100644
--- a/packages/schematics/angular/utility/config.ts
+++ b/packages/schematics/angular/utility/config.ts
@@ -130,7 +130,7 @@ export interface AppConfig {
     /**
      * The type of budget
      */
-    type?: ('bundle' | 'initial' | 'allScript' | 'all' | 'anyScript' | 'any');
+    type?: ('bundle' | 'initial' | 'allScript' | 'all' | 'anyScript' | 'any' | 'anyComponentStyle');
     /**
      * The name of the bundle
      */
diff --git a/packages/schematics/angular/utility/json-utils.ts b/packages/schematics/angular/utility/json-utils.ts
index f34c303f1717..72cb4937514f 100644
--- a/packages/schematics/angular/utility/json-utils.ts
+++ b/packages/schematics/angular/utility/json-utils.ts
@@ -31,7 +31,7 @@ export function appendPropertyInAstObject(
     recorder.insertRight(commaIndex, ',');
     index = end.offset;
   }
-  const content = JSON.stringify(value, null, indent).replace(/\n/g, indentStr);
+  const content = _stringifyContent(value, indentStr);
   recorder.insertRight(
     index,
     (node.properties.length === 0 && indent ? '\n' : '')
@@ -84,7 +84,7 @@ export function insertPropertyInAstObjectInOrder(
   const insertIndex = insertAfterProp === null
     ? node.start.offset + 1
     : insertAfterProp.end.offset + 1;
-  const content = JSON.stringify(value, null, indent).replace(/\n/g, indentStr);
+  const content = _stringifyContent(value, indentStr);
   recorder.insertRight(
     insertIndex,
     indentStr
@@ -168,7 +168,7 @@ export function appendValueInAstArray(
     index,
     (node.elements.length === 0 && indent ? '\n' : '')
     + ' '.repeat(indent)
-    + JSON.stringify(value, null, indent).replace(/\n/g, indentStr)
+    + _stringifyContent(value, indentStr)
     + indentStr.slice(0, -indent),
   );
 }
@@ -191,3 +191,24 @@ export function findPropertyInAstObject(
 function _buildIndent(count: number): string {
   return count ? '\n' + ' '.repeat(count) : '';
 }
+
+function _stringifyContent(value: JsonValue, indentStr: string): string {
+  // TODO: Add snapshot tests
+  
+  // The 'space' value is 2, because we want to add 2 additional
+  // indents from the 'key' node.
+
+  // If we use the indent provided we will have double indents: 
+  // "budgets": [
+  //   {
+  //     "type": "initial",
+  //     "maximumWarning": "2mb",
+  //     "maximumError": "5mb"
+  //   },
+  //   {
+  //       "type": "anyComponentStyle",
+  //       'maximumWarning": "5kb"
+  //   }
+  // ]
+  return JSON.stringify(value, null, 2).replace(/\n/g, indentStr);
+}
diff --git a/packages/schematics/angular/utility/workspace-models.ts b/packages/schematics/angular/utility/workspace-models.ts
index 9c8eebdcf78f..4c83b5f18f18 100644
--- a/packages/schematics/angular/utility/workspace-models.ts
+++ b/packages/schematics/angular/utility/workspace-models.ts
@@ -38,8 +38,8 @@ export interface BrowserBuilderBaseOptions {
     index?: string;
     polyfills: string;
     assets?: (object|string)[];
-    styles?: string[];
-    scripts?: string[];
+    styles?: (object|string)[];
+    scripts?: (object|string)[];
     sourceMap?: boolean;
 }
 

From 2a0dc39de38a45bcda2abbfb6283725eb982a804 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 23 Jul 2019 19:58:43 +0200
Subject: [PATCH 1662/1703] feat(@schematics/angular): add `anyComponentStyle`
 to the applications bundle budget

---
 packages/schematics/angular/application/index.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index f7ff777a4b77..8a80af4bead8 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -223,6 +223,11 @@ function addAppToWorkspaceFile(options: ApplicationOptions, appDir: string): Rul
               type: 'initial',
               maximumWarning: '2mb',
               maximumError: '5mb',
+            },
+            {
+              type: 'anyComponentStyle',
+              maximumWarning: '6kb',
+              maximumError: '10kb',
             }],
           },
         },

From fc1fda266354ca3291b8045be6cee21f62204902 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Fri, 19 Jul 2019 11:40:25 +0200
Subject: [PATCH 1663/1703] fix(@schematics/angular): add differential loading
 profiling file to gitignore

When differential loading enabled we will have different profiling files for every build target

Ex:
```
chrome-profiler-events-es2015.json
speed-measure-plugin-es2015.json
chrome-profiler-events-es5.json
speed-measure-plugin-es5.json
```
---
 .../angular/workspace/files/__dot__gitignore.template         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/workspace/files/__dot__gitignore.template b/packages/schematics/angular/workspace/files/__dot__gitignore.template
index f4f46a5feeb9..86d943a9b2e8 100644
--- a/packages/schematics/angular/workspace/files/__dot__gitignore.template
+++ b/packages/schematics/angular/workspace/files/__dot__gitignore.template
@@ -11,8 +11,8 @@
 /node_modules
 
 # profiling files
-chrome-profiler-events.json
-speed-measure-plugin.json
+chrome-profiler-events*.json
+speed-measure-plugin*.json
 
 # IDEs and editors
 /.idea

From 0224d2b92eda628a7edd0797d194e509953f67bb Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Fri, 19 Jul 2019 15:16:45 +0200
Subject: [PATCH 1664/1703] fix(@angular-devkit/build-angular): fix sourcemaps
 for vscode breakpoints

`namespace` is always empty which is breaking sourcemaps since when sources start with `/` vscode will not be able to resolve them unless users configure `sourceMapPathOverrides`.

Fixes #15116
---
 .../models/webpack-configs/utils.ts             |  2 +-
 .../test/browser/source-map_spec_large.ts       | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
index b43c4d287073..298a10c7bb60 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
@@ -95,7 +95,7 @@ export function getSourceMapDevTool(
   return new SourceMapDevToolPlugin({
     filename: inlineSourceMap ? undefined : '[file].map',
     include,
-    moduleFilenameTemplate: '[namespace]/[resource-path]',
+    moduleFilenameTemplate: '[resource-path]',
     append: hiddenSourceMap ? false : undefined,
   });
 }
diff --git a/packages/angular_devkit/build_angular/test/browser/source-map_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/source-map_spec_large.ts
index 992dc61e0e04..df9688e1d3b1 100644
--- a/packages/angular_devkit/build_angular/test/browser/source-map_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/source-map_spec_large.ts
@@ -36,6 +36,23 @@ describe('Browser Builder source map', () => {
     expect(await files['styles.css.map']).not.toBeUndefined();
   });
 
+  it(`sourcemaps sources should not start with '/'`, async () => {
+    // If sourcemaps sources start with a '/' it will break VS code breakpoints
+    // Unless 'sourceMapPathOverrides' are provided
+    const overrides = {
+      sourceMap: true,
+    };
+
+    const { files } = await browserBuild(architect, host, target, overrides);
+    const mainJSMap = await files['main.js.map'];
+    expect(mainJSMap).not.toBeUndefined();
+
+    const sources: string[] = JSON.parse(mainJSMap).sources;
+    for (const source of sources) {
+      expect(source.startsWith('/')).toBe(false, `${source} started with an '/'.`);
+    }
+  });
+
   it('works with outputHashing', async () => {
     const { files } = await browserBuild(architect, host, target, {
       sourceMap: true,

From 52741b43f64fd4c1ae1e57e9128d159070b26c02 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sun, 21 Jul 2019 05:35:17 +0000
Subject: [PATCH 1665/1703] build: update caniuse-lite to version 1.0.30000985

---
 packages/angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                          | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index a0e5754dc4e3..18f1539d0be9 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -15,7 +15,7 @@
     "ajv": "6.10.2",
     "autoprefixer": "9.6.1",
     "browserslist": "4.6.6",
-    "caniuse-lite": "1.0.30000984",
+    "caniuse-lite": "1.0.30000985",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.3",
diff --git a/yarn.lock b/yarn.lock
index e74fcd3845be..a35caed7c450 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2029,10 +2029,10 @@ camelcase@^5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@1.0.30000984, caniuse-lite@^1.0.30000984:
-  version "1.0.30000984"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000984.tgz#dc96c3c469e9bcfc6ad5bdd24c77ec918ea76fe0"
-  integrity sha512-n5tKOjMaZ1fksIpQbjERuqCyfgec/m9pferkFQbLmWtqLUdmt12hNhjSwsmPdqeiG2NkITOQhr1VYIwWSAceiA==
+caniuse-lite@1.0.30000985:
+  version "1.0.30000985"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000985.tgz#0eb40f6c8a8c219155cbe43c4975c0efb4a0f77f"
+  integrity sha512-1ngiwkgqAYPG0JSSUp3PUDGPKKY59EK7NrGGX+VOxaKCNzRbNc7uXMny+c3VJfZxtoK3wSImTvG9T9sXiTw2+w==
 
 caniuse-lite@^1.0.30000898:
   version "1.0.30000903"
@@ -2054,6 +2054,11 @@ caniuse-lite@^1.0.30000980:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000980.tgz#0df53e4354b3111f83ac15b0bd4c71fe92994231"
   integrity sha512-as0PRtWHaX3gl2gpC7qA7bX88lr+qLacMMXm1QKLLQtBCwT/Ljbgrv5EXKMNBoeEX6yFZ4vIsBb4Nh+PEwW2Rw==
 
+caniuse-lite@^1.0.30000984:
+  version "1.0.30000984"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000984.tgz#dc96c3c469e9bcfc6ad5bdd24c77ec918ea76fe0"
+  integrity sha512-n5tKOjMaZ1fksIpQbjERuqCyfgec/m9pferkFQbLmWtqLUdmt12hNhjSwsmPdqeiG2NkITOQhr1VYIwWSAceiA==
+
 canonical-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"

From 278d0d3bc80e3b81a1d6aeae52f86223a4bfb612 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sun, 21 Jul 2019 19:07:21 +0200
Subject: [PATCH 1666/1703] style: enable tslint rules that were removed due to
 prettier

Prettier was disabled in this PR https://github.com/angular/angular-cli/pull/14940

Until we re-introduce it again, we should re-introduce certain lint rules to maintaince a coding standards.

Also, this increases the `max-line-length` to `140` instead of `100`.
---
 tslint.json | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/tslint.json b/tslint.json
index db156e9d81cb..984fb344304f 100644
--- a/tslint.json
+++ b/tslint.json
@@ -15,6 +15,7 @@
     "defocus": true,
     "import-groups": true,
     "no-global-tslint-disable": true,
+    "single-eof-line": true,
     // ==================================================================================================
     // tslint-sonarts rules. See https://github.com/SonarSource/SonarTS
     // These rules are part of the bug detection section of tslint-sonarts
@@ -51,14 +52,29 @@
     "no-floating-promises": true,
     "no-implicit-dependencies": true,
     "no-import-side-effect": [true, {"ignore-module": "^(?!rxjs\/)"}],
+    "align": [
+      true,
+      "elements",
+      "members",
+      "parameters",
+      "statements"
+    ],
+    "max-line-length": [true, 140],
     "no-inferrable-types": true,
     "class-name": true,
     "comment-format": [
       true,
       "check-space"
     ],
+    "indent": [
+      true,
+      "spaces"
+    ],
+    "eofline": true,
+    "import-spacing": true,
     "match-default-export-name": true,
     "newline-before-return": true,
+    "no-consecutive-blank-lines": [true, 2],
     "no-duplicate-variable": true,
     "no-eval": true,
     "no-any": true,
@@ -66,8 +82,17 @@
     "no-debugger": true,
     "no-console": true,
     "no-internal-module": true,
+    "no-trailing-whitespace": true,
     "no-unused-expression": true,
     "no-var-keyword": true,
+    "one-line": [
+      true,
+      "check-catch",
+      "check-else",
+      "check-finally",
+      "check-open-brace",
+      "check-whitespace"
+    ],
     "ordered-imports": [
       true,
       {
@@ -76,6 +101,29 @@
       }
     ],
     "prefer-const": true,
+    "quotemark": [
+      true,
+      "single",
+      "avoid-escape"
+    ],
+    "semicolon": [true, "always"],
+    "trailing-comma": [
+      true,
+      {
+        "multiline": "always",
+        "singleline": "never"
+      }
+    ],
+    "typedef-whitespace": [
+      true,
+      {
+        "call-signature": "nospace",
+        "index-signature": "nospace",
+        "parameter": "nospace",
+        "property-declaration": "nospace",
+        "variable-declaration": "nospace"
+      }
+    ],
     "curly": true,
     "file-header": [
       true,
@@ -87,6 +135,17 @@
       "check-format",
       "allow-leading-underscore",
       "allow-pascal-case"
+    ],
+    "whitespace": [
+      true,
+      "check-branch",
+      "check-decl",
+      "check-module",
+      "check-preblock",
+      "check-operator",
+      "check-separator",
+      "check-type",
+      "check-typecast"
     ]
   }
 }

From 15ef15e94a368b6d48d24af4df675820863c9b89 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sun, 21 Jul 2019 19:21:57 +0200
Subject: [PATCH 1667/1703] style: remove redundant `max-line-length` disables
 and fix other lint issues

---
 packages/angular/cli/lib/cli/index.ts                     | 2 +-
 packages/angular/cli/utilities/config.ts                  | 4 ++--
 packages/angular/pwa/pwa/index_spec.ts                    | 2 --
 .../src/angular-cli-files/models/webpack-configs/utils.ts | 2 --
 .../src/build-optimizer/build-optimizer_spec.ts           | 1 -
 .../build_optimizer/src/build-optimizer/webpack-plugin.ts | 4 ++--
 .../build_optimizer/src/transforms/import-tslib_spec.ts   | 4 ----
 .../build_optimizer/src/transforms/wrap-enums.ts          | 2 +-
 .../schematics/tools/workflow/node-workflow.ts            | 2 +-
 packages/angular_devkit/schematics_cli/bin/schematics.ts  | 2 +-
 .../ngtools/webpack/src/transformers/ctor-parameters.ts   | 1 -
 .../webpack/src/transformers/ctor-parameters_spec.ts      | 2 ++
 .../webpack/src/transformers/import_factory_spec.ts       | 2 --
 .../webpack/src/transformers/replace_bootstrap_spec.ts    | 2 --
 .../src/transformers/replace_server_bootstrap_spec.ts     | 8 --------
 packages/schematics/angular/application/index_spec.ts     | 1 -
 packages/schematics/angular/component/index_spec.ts       | 3 ---
 packages/schematics/angular/directive/index_spec.ts       | 1 -
 packages/schematics/angular/library/index_spec.ts         | 1 -
 packages/schematics/angular/migrations/update-6/index.ts  | 1 -
 .../angular/migrations/update-8/differential-loading.ts   | 1 -
 .../migrations/update-9/update-workspace-config_spec.ts   | 8 ++++----
 packages/schematics/angular/module/index_spec.ts          | 1 -
 packages/schematics/angular/service-worker/index_spec.ts  | 1 -
 packages/schematics/angular/service/index_spec.ts         | 1 -
 packages/schematics/angular/universal/index_spec.ts       | 4 ++--
 packages/schematics/angular/utility/ast-utils_spec.ts     | 7 ++-----
 packages/schematics/update/update/index.ts                | 2 --
 tests/legacy-cli/e2e/tests/basic/e2e.ts                   | 1 -
 tests/legacy-cli/e2e/tests/basic/test.ts                  | 1 -
 tests/legacy-cli/e2e/tests/build/build-errors.ts          | 2 --
 .../e2e/tests/generate/component/component-duplicate.ts   | 1 -
 .../legacy-cli/e2e/tests/generate/module/module-import.ts | 1 -
 33 files changed, 18 insertions(+), 60 deletions(-)

diff --git a/packages/angular/cli/lib/cli/index.ts b/packages/angular/cli/lib/cli/index.ts
index c5bb1c53c546..370040cb90d4 100644
--- a/packages/angular/cli/lib/cli/index.ts
+++ b/packages/angular/cli/lib/cli/index.ts
@@ -72,7 +72,7 @@ export default async function(options: { testing?: boolean; cliArgs: string[] })
 
         logger.fatal(
           `An unhandled exception occurred: ${err.message}\n` +
-            `See "${logPath}" for further details.`
+            `See "${logPath}" for further details.`,
         );
       } catch (e) {
         logger.fatal(
diff --git a/packages/angular/cli/utilities/config.ts b/packages/angular/cli/utilities/config.ts
index 88eafe97a883..6f653a05ad5b 100644
--- a/packages/angular/cli/utilities/config.ts
+++ b/packages/angular/cli/utilities/config.ts
@@ -86,8 +86,8 @@ export function getWorkspace(
   if (error) {
     throw new Error(
       `Workspace config file cannot le loaded: ${configPath}`
-      + `\n${error instanceof Error ? error.message : error}`
-    )
+      + `\n${error instanceof Error ? error.message : error}`,
+    );
   }
 
   cachedWorkspaces.set(level, workspace);
diff --git a/packages/angular/pwa/pwa/index_spec.ts b/packages/angular/pwa/pwa/index_spec.ts
index a6cd6afb90b0..8f6651c96588 100644
--- a/packages/angular/pwa/pwa/index_spec.ts
+++ b/packages/angular/pwa/pwa/index_spec.ts
@@ -9,8 +9,6 @@ import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/te
 import * as path from 'path';
 import { Schema as PwaOptions } from './schema';
 
-
-// tslint:disable:max-line-length
 describe('PWA Schematic', () => {
   const schematicRunner = new SchematicTestRunner(
     '@angular/pwa',
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
index 298a10c7bb60..63c6651bb857 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
@@ -21,7 +21,6 @@ export interface HashFormat {
 }
 
 export function getOutputHashFormat(option: string, length = 20): HashFormat {
-  /* tslint:disable:max-line-length */
   const hashFormats: { [option: string]: HashFormat } = {
     none: { chunk: '', extract: '', file: '', script: '' },
     media: { chunk: '', extract: '', file: `.[hash:${length}]`, script: '' },
@@ -38,7 +37,6 @@ export function getOutputHashFormat(option: string, length = 20): HashFormat {
       script: `.[hash:${length}]`,
     },
   };
-  /* tslint:enable:max-line-length */
   return hashFormats[option] || hashFormats['none'];
 }
 
diff --git a/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer_spec.ts b/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer_spec.ts
index 05a322c6c2a7..efc090e663b1 100644
--- a/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer_spec.ts
@@ -54,7 +54,6 @@ describe('build-optimizer', () => {
         }());
         var RenderType_MdOption = ɵcrt({ encapsulation: 2, styles: styles_MdOption});
       `;
-      // tslint:disable:max-line-length
       const output = tags.oneLine`
         import { __extends } from "tslib";
         ${imports}
diff --git a/packages/angular_devkit/build_optimizer/src/build-optimizer/webpack-plugin.ts b/packages/angular_devkit/build_optimizer/src/build-optimizer/webpack-plugin.ts
index b31f0ecbb6cf..22437803d97f 100644
--- a/packages/angular_devkit/build_optimizer/src/build-optimizer/webpack-plugin.ts
+++ b/packages/angular_devkit/build_optimizer/src/build-optimizer/webpack-plugin.ts
@@ -10,8 +10,8 @@ import { Compiler } from 'webpack';  // tslint:disable-line:no-implicit-dependen
 
 export class BuildOptimizerWebpackPlugin {
   apply(compiler: Compiler) {
-    compiler.hooks.normalModuleFactory.tap("BuildOptimizerWebpackPlugin", nmf => {
-      nmf.hooks.module.tap("BuildOptimizerWebpackPlugin", (module, data) => {
+    compiler.hooks.normalModuleFactory.tap('BuildOptimizerWebpackPlugin', nmf => {
+      nmf.hooks.module.tap('BuildOptimizerWebpackPlugin', (module, data) => {
         const resolveData = data.resourceResolveData;
         if (resolveData && resolveData.descriptionFileData) {
           // Only TS packages should use Build Optimizer.
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/import-tslib_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/import-tslib_spec.ts
index 7f914f582a95..5dfb65fae2f2 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/import-tslib_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/import-tslib_spec.ts
@@ -32,7 +32,6 @@ describe('import-tslib', () => {
   });
 
   it('replaces wrapped __extends', () => {
-    // tslint:disable:max-line-length
     const input = tags.stripIndent`
     export default function appGlobal() {
         var __extends = (this && this.__extends) || function (d, b) {
@@ -61,7 +60,6 @@ describe('import-tslib', () => {
           return c > 3 && r && Object.defineProperty(target, key, r), r;
       };
     `;
-    // tslint:enable:max-line-length
     const output = tags.stripIndent`
       import { __decorate } from "tslib";
     `;
@@ -71,13 +69,11 @@ describe('import-tslib', () => {
   });
 
   it('replaces __metadata', () => {
-    // tslint:disable:max-line-length
     const input = tags.stripIndent`
       var __metadata = (this && this.__metadata) || function (k, v) {
           if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
       };
     `;
-    // tslint:enable:max-line-length
     const output = tags.stripIndent`
       import { __metadata } from "tslib";
     `;
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
index de60bd585e30..350d4f70395c 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
@@ -262,7 +262,7 @@ function findTs2_3EnumIife(
       || !ts.isBinaryExpression(statement.expression)
       || !ts.isElementAccessExpression(statement.expression.left)
     ) {
-      return null
+      return null;
     }
 
     const leftExpression = statement.expression.left.expression;
diff --git a/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts b/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts
index 9c55e7267995..64022ad3903d 100644
--- a/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts
+++ b/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts
@@ -34,7 +34,7 @@ export class NodeWorkflow extends workflow.BaseWorkflow {
 
       force: options.force,
       dryRun: options.dryRun,
-      registry: options.registry
+      registry: options.registry,
     });
 
     engineHost.registerTaskExecutor(
diff --git a/packages/angular_devkit/schematics_cli/bin/schematics.ts b/packages/angular_devkit/schematics_cli/bin/schematics.ts
index 255591e3728b..1e0104753967 100644
--- a/packages/angular_devkit/schematics_cli/bin/schematics.ts
+++ b/packages/angular_devkit/schematics_cli/bin/schematics.ts
@@ -24,7 +24,7 @@ import {
   DryRunEvent,
   SchematicEngine,
   UnsuccessfulWorkflowExecution,
-  formats
+  formats,
 } from '@angular-devkit/schematics';
 import { NodeModulesEngineHost, NodeWorkflow, validateOptionsWithSchema } from '@angular-devkit/schematics/tools';
 import * as inquirer from 'inquirer';
diff --git a/packages/ngtools/webpack/src/transformers/ctor-parameters.ts b/packages/ngtools/webpack/src/transformers/ctor-parameters.ts
index c839c89dc2f0..fff7eee38f71 100644
--- a/packages/ngtools/webpack/src/transformers/ctor-parameters.ts
+++ b/packages/ngtools/webpack/src/transformers/ctor-parameters.ts
@@ -19,7 +19,6 @@ export function downlevelConstructorParameters(
 
 // The following is sourced from tsickle with local modifications
 // Only the creation of `ctorParameters` is retained
-// tslint:disable-next-line:max-line-length
 // https://github.com/angular/tsickle/blob/0ceb7d6bc47f6945a6c4c09689f1388eb48f5c07/src/decorator_downlevel_transformer.ts
 //
 
diff --git a/packages/ngtools/webpack/src/transformers/ctor-parameters_spec.ts b/packages/ngtools/webpack/src/transformers/ctor-parameters_spec.ts
index c9425666da10..b4b11312dcbb 100644
--- a/packages/ngtools/webpack/src/transformers/ctor-parameters_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/ctor-parameters_spec.ts
@@ -52,12 +52,14 @@ describe('Constructor Parameter Transformer', () => {
       }
     `;
 
+    // tslint:disable:max-line-length
     const output = `
       import * as tslib_1 from "tslib";
       let RootProvidedService = class RootProvidedService { constructor() { } };
       RootProvidedService = tslib_1.__decorate([ Injectable({ providedIn: 'root' }) ], RootProvidedService);
       export { RootProvidedService }; export class MyService { constructor(v) { } } MyService.ctorParameters = () => [ { type: RootProvidedService } ];
     `;
+    // tslint:enable:max-line-length
 
     const result = transform(input);
 
diff --git a/packages/ngtools/webpack/src/transformers/import_factory_spec.ts b/packages/ngtools/webpack/src/transformers/import_factory_spec.ts
index 7ba5e3c67fa8..e0ab9422290b 100644
--- a/packages/ngtools/webpack/src/transformers/import_factory_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/import_factory_spec.ts
@@ -81,7 +81,6 @@ describe('@ngtools/webpack transformers', () => {
         }];
       `;
 
-      // tslint:disable: max-line-length
       const output = tags.stripIndent`
         const ɵ0 = () => import("./shared/path/to/lazy/lazy.module.ngfactory").then(m => m.LazyModuleNgFactory);
         const routes = [{
@@ -89,7 +88,6 @@ describe('@ngtools/webpack transformers', () => {
           loadChildren: ɵ0
         }];
       `;
-      // tslint:enable: max-line-length
 
       const { program, compilerHost } = createTypescriptContext(input, additionalFiles, true);
       const transformer = importFactory(() => { }, () => program.getTypeChecker());
diff --git a/packages/ngtools/webpack/src/transformers/replace_bootstrap_spec.ts b/packages/ngtools/webpack/src/transformers/replace_bootstrap_spec.ts
index 0dc2742689d7..be3ae55831fb 100644
--- a/packages/ngtools/webpack/src/transformers/replace_bootstrap_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/replace_bootstrap_spec.ts
@@ -26,7 +26,6 @@ describe('@ngtools/webpack transformers', () => {
         platformBrowserDynamic().bootstrapModule(AppModule);
       `;
 
-      // tslint:disable:max-line-length
       const output = tags.stripIndent`
         import { enableProdMode } from '@angular/core';
         import { environment } from './environments/environment';
@@ -39,7 +38,6 @@ describe('@ngtools/webpack transformers', () => {
         }
         __NgCli_bootstrap_2.platformBrowser().bootstrapModuleFactory(__NgCli_bootstrap_1.AppModuleNgFactory);
       `;
-      // tslint:enable:max-line-length
 
       const { program, compilerHost } = createTypescriptContext(input);
       const transformer = replaceBootstrap(
diff --git a/packages/ngtools/webpack/src/transformers/replace_server_bootstrap_spec.ts b/packages/ngtools/webpack/src/transformers/replace_server_bootstrap_spec.ts
index bd73a70eb5cf..bc4c589f7ce9 100644
--- a/packages/ngtools/webpack/src/transformers/replace_server_bootstrap_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/replace_server_bootstrap_spec.ts
@@ -27,7 +27,6 @@ describe('@ngtools/webpack transformers', () => {
         platformDynamicServer().bootstrapModule(AppModule);
       `;
 
-      // tslint:disable:max-line-length
       const output = tags.stripIndent`
         import { enableProdMode } from '@angular/core';
         import { environment } from './environments/environment';
@@ -40,7 +39,6 @@ describe('@ngtools/webpack transformers', () => {
         }
         __NgCli_bootstrap_2.platformServer().bootstrapModuleFactory(__NgCli_bootstrap_1.AppModuleNgFactory);
       `;
-      // tslint:enable:max-line-length
 
       const { program, compilerHost } = createTypescriptContext(input);
       const transformer = replaceServerBootstrap(
@@ -71,7 +69,6 @@ describe('@ngtools/webpack transformers', () => {
         });
       `;
 
-      // tslint:disable:max-line-length
       const output = tags.stripIndent`
         import { enableProdMode } from '@angular/core';
         import { environment } from './environments/environment';
@@ -87,7 +84,6 @@ describe('@ngtools/webpack transformers', () => {
             url: '/'
           });
       `;
-      // tslint:enable:max-line-length
 
       const { program, compilerHost } = createTypescriptContext(input);
       const transformer = replaceServerBootstrap(
@@ -120,7 +116,6 @@ describe('@ngtools/webpack transformers', () => {
         }));
       `;
 
-      // tslint:disable:max-line-length
       const output = tags.stripIndent`
         import * as express from 'express';
 
@@ -140,7 +135,6 @@ describe('@ngtools/webpack transformers', () => {
           bootstrap: __NgCli_bootstrap_1.AppModuleNgFactory
         }));
       `;
-      // tslint:enable:max-line-length
 
       const { program, compilerHost } = createTypescriptContext(input);
       const transformer = replaceServerBootstrap(
@@ -168,7 +162,6 @@ describe('@ngtools/webpack transformers', () => {
         platformDynamicServer().bootstrapModule(AppModule);
       `;
 
-      // tslint:disable:max-line-length
       const output = tags.stripIndent`
         import { enableProdMode } from '@angular/core';
         import { environment } from './environments/environment';
@@ -181,7 +174,6 @@ describe('@ngtools/webpack transformers', () => {
         }
         __NgCli_bootstrap_2.platformServer().bootstrapModuleFactory(__NgCli_bootstrap_1.AppModuleNgFactory);
       `;
-      // tslint:enable:max-line-length
 
       const { program, compilerHost } = createTypescriptContext(input);
       const transformer = replaceServerBootstrap(
diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
index 8ddc4d016062..6d8c7e241e90 100644
--- a/packages/schematics/angular/application/index_spec.ts
+++ b/packages/schematics/angular/application/index_spec.ts
@@ -12,7 +12,6 @@ import { getFileContent } from '../utility/test';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { Schema as ApplicationOptions, Style, ViewEncapsulation } from './schema';
 
-// tslint:disable:max-line-length
 describe('Application Schematic', () => {
   const schematicRunner = new SchematicTestRunner(
     '@schematics/angular',
diff --git a/packages/schematics/angular/component/index_spec.ts b/packages/schematics/angular/component/index_spec.ts
index 41830ef13bae..f1b3645b5366 100644
--- a/packages/schematics/angular/component/index_spec.ts
+++ b/packages/schematics/angular/component/index_spec.ts
@@ -12,7 +12,6 @@ import { createAppModule } from '../utility/test';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { ChangeDetection, Schema as ComponentOptions, Style } from './schema';
 
-// tslint:disable:max-line-length
 describe('Component Schematic', () => {
   const schematicRunner = new SchematicTestRunner(
     '@schematics/angular',
@@ -273,7 +272,6 @@ describe('Component Schematic', () => {
     const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const content = tree.readContent('/projects/bar/src/app/app.module.ts');
     expect(content).toMatch(
-      // tslint:disable-next-line:max-line-length
       /import { TestComponentComponent } from '\.\/dir\/test-component\/test-component.component'/,
     );
   });
@@ -288,7 +286,6 @@ describe('Component Schematic', () => {
 
     const content = appTree.readContent('/projects/bar/src/app/admin/module/module.module.ts');
     expect(content).toMatch(
-      // tslint:disable-next-line:max-line-length
       /import { TestComponentComponent } from '..\/..\/other\/test-component\/test-component.component'/,
     );
   });
diff --git a/packages/schematics/angular/directive/index_spec.ts b/packages/schematics/angular/directive/index_spec.ts
index df5753fccc27..c7a4cb060754 100644
--- a/packages/schematics/angular/directive/index_spec.ts
+++ b/packages/schematics/angular/directive/index_spec.ts
@@ -10,7 +10,6 @@ import { Schema as ApplicationOptions } from '../application/schema';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { Schema as DirectiveOptions } from './schema';
 
-// tslint:disable:max-line-length
 describe('Directive Schematic', () => {
   const schematicRunner = new SchematicTestRunner(
     '@schematics/angular',
diff --git a/packages/schematics/angular/library/index_spec.ts b/packages/schematics/angular/library/index_spec.ts
index 310653e9b04a..48449dde4986 100644
--- a/packages/schematics/angular/library/index_spec.ts
+++ b/packages/schematics/angular/library/index_spec.ts
@@ -17,7 +17,6 @@ function getJsonFileContent(tree: UnitTestTree, path: string) {
   return JSON.parse(tree.readContent(path));
 }
 
-// tslint:disable:max-line-length
 describe('Library Schematic', () => {
   const schematicRunner = new SchematicTestRunner(
     '@schematics/ng_packagr',
diff --git a/packages/schematics/angular/migrations/update-6/index.ts b/packages/schematics/angular/migrations/update-6/index.ts
index eb5c5d9bd1b4..f2f6d817780a 100644
--- a/packages/schematics/angular/migrations/update-6/index.ts
+++ b/packages/schematics/angular/migrations/update-6/index.ts
@@ -556,7 +556,6 @@ function extractProjectsConfig(
 
       const e2eTargets: JsonObject = {};
 
-      // tslint:disable-next-line:max-line-length
       const protractorConfig = config && config.e2e && config.e2e.protractor && config.e2e.protractor.config
         ? config.e2e.protractor.config
         : '';
diff --git a/packages/schematics/angular/migrations/update-8/differential-loading.ts b/packages/schematics/angular/migrations/update-8/differential-loading.ts
index dd943583aced..c461a9d8882d 100644
--- a/packages/schematics/angular/migrations/update-8/differential-loading.ts
+++ b/packages/schematics/angular/migrations/update-8/differential-loading.ts
@@ -20,7 +20,6 @@ import {
   removePropertyInAstObject,
 } from '../../utility/json-utils';
 
-// tslint:disable-next-line:max-line-length
 const browserslistContent = `# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
 # For additional information regarding the format and rule options, please see:
 # https://github.com/browserslist/browserslist#queries
diff --git a/packages/schematics/angular/migrations/update-9/update-workspace-config_spec.ts b/packages/schematics/angular/migrations/update-9/update-workspace-config_spec.ts
index dd83dbdeb1f2..a35c5fdb2a62 100644
--- a/packages/schematics/angular/migrations/update-9/update-workspace-config_spec.ts
+++ b/packages/schematics/angular/migrations/update-9/update-workspace-config_spec.ts
@@ -28,28 +28,28 @@ const scriptsWithLazy = [
   { bundleName: 'two', input: 'two.js', lazy: true },
   { bundleName: 'tree', input: 'tree.js' },
   'four.js',
-]
+];
 
 const scriptsExpectWithLazy = [
   { bundleName: 'one', input: 'one.js' },
   { bundleName: 'two', inject: false, input: 'two.js' },
   { bundleName: 'tree', input: 'tree.js' },
   'four.js',
-]
+];
 
 const stylesWithLazy = [
   { bundleName: 'one', input: 'one.css', lazy: false },
   { bundleName: 'two', input: 'two.css', lazy: true },
   { bundleName: 'tree', input: 'tree.css' },
   'four.css',
-]
+];
 
 const stylesExpectWithLazy = [
   { bundleName: 'one', input: 'one.css' },
   { bundleName: 'two', inject: false, input: 'two.css' },
   { bundleName: 'tree', input: 'tree.css' },
   'four.css',
-]
+];
 
 const workspacePath = '/angular.json';
 
diff --git a/packages/schematics/angular/module/index_spec.ts b/packages/schematics/angular/module/index_spec.ts
index ae476a98dcf9..539d29e390bb 100644
--- a/packages/schematics/angular/module/index_spec.ts
+++ b/packages/schematics/angular/module/index_spec.ts
@@ -10,7 +10,6 @@ import { Schema as ApplicationOptions } from '../application/schema';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { Schema as ModuleOptions } from './schema';
 
-// tslint:disable:max-line-length
 describe('Module Schematic', () => {
   const schematicRunner = new SchematicTestRunner(
     '@schematics/angular',
diff --git a/packages/schematics/angular/service-worker/index_spec.ts b/packages/schematics/angular/service-worker/index_spec.ts
index aded04f6075e..37af450b1eea 100644
--- a/packages/schematics/angular/service-worker/index_spec.ts
+++ b/packages/schematics/angular/service-worker/index_spec.ts
@@ -93,7 +93,6 @@ describe('Service Worker Schematic', () => {
     const tree = await schematicRunner.runSchematicAsync('service-worker', defaultOptions, appTree)
       .toPromise();
     const pkgText = tree.readContent('/projects/bar/src/app/app.module.ts');
-    // tslint:disable-next-line:max-line-length
     const expectedText = 'ServiceWorkerModule.register(\'ngsw-worker.js\', { enabled: environment.production })';
     expect(pkgText).toContain(expectedText);
   });
diff --git a/packages/schematics/angular/service/index_spec.ts b/packages/schematics/angular/service/index_spec.ts
index 59f1610a9230..ae79adfc619f 100644
--- a/packages/schematics/angular/service/index_spec.ts
+++ b/packages/schematics/angular/service/index_spec.ts
@@ -10,7 +10,6 @@ import { Schema as ApplicationOptions } from '../application/schema';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { Schema as ServiceOptions } from './schema';
 
-// tslint:disable:max-line-length
 describe('Service Schematic', () => {
   const schematicRunner = new SchematicTestRunner(
     '@schematics/angular',
diff --git a/packages/schematics/angular/universal/index_spec.ts b/packages/schematics/angular/universal/index_spec.ts
index c14faecd62c9..d7a4ea14580d 100644
--- a/packages/schematics/angular/universal/index_spec.ts
+++ b/packages/schematics/angular/universal/index_spec.ts
@@ -93,7 +93,7 @@ describe('Universal Schematic', () => {
         module: 'commonjs',
       },
       files: [
-        "src/main.server.ts"
+        'src/main.server.ts',
       ],
       angularCompilerOptions: {
         entryModule: './src/app/app.server.module#AppServerModule',
@@ -117,7 +117,7 @@ describe('Universal Schematic', () => {
         module: 'commonjs',
       },
       files: [
-        "src/main.server.ts"
+        'src/main.server.ts',
       ],
       angularCompilerOptions: {
         entryModule: './src/app/app.server.module#AppServerModule',
diff --git a/packages/schematics/angular/utility/ast-utils_spec.ts b/packages/schematics/angular/utility/ast-utils_spec.ts
index 0f82e4acf2d4..86e7ab3ce2a8 100644
--- a/packages/schematics/angular/utility/ast-utils_spec.ts
+++ b/packages/schematics/angular/utility/ast-utils_spec.ts
@@ -344,12 +344,10 @@ describe('ast utils', () => {
       const source = getTsSource(modulePath, moduleContent);
       const change = () => addRouteDeclarationToModule(source, './src/app', '');
       expect(change).toThrowError(
-        // tslint:disable-next-line:max-line-length
         `No route declaration array was found that corresponds to router module at line 11 in ./src/app`,
       );
     });
 
-    // tslint:disable-next-line:max-line-length
     it(`should throw an error, if the provided first argument of router module is not an identifier`, () => {
       const moduleContent = `
         import { BrowserModule } from '@angular/platform-browser';
@@ -372,7 +370,6 @@ describe('ast utils', () => {
       const source = getTsSource(modulePath, moduleContent);
       const change = () => addRouteDeclarationToModule(source, './src/app', '');
       expect(change).toThrowError(
-        // tslint:disable-next-line:max-line-length
         `No route declaration array was found that corresponds to router module at line 11 in ./src/app`,
       );
     });
@@ -439,7 +436,6 @@ describe('ast utils', () => {
       const output = applyChanges(modulePath, moduleContent, [changes]);
 
       expect(output).toMatch(
-        // tslint:disable-next-line:max-line-length
         /const routes = \[\r?\n?\s*{ path: 'foo', component: FooComponent },\r?\n?\s*{ path: 'bar', component: BarComponent }\r?\n?\s*\]/,
       );
     });
@@ -473,10 +469,11 @@ describe('ast utils', () => {
         './src/app', `{ path: 'bar', component: BarComponent }`,
       );
       const output = applyChanges(modulePath, moduleContent, [changes]);
+      // tslint:disable:max-line-length
       expect(output).toMatch(
-        // tslint:disable-next-line:max-line-length
         /const routes = \[\r?\n?\s*{ path: 'foo', component: FooComponent, canLoad: \[Guard\] },\r?\n?\s*{ path: 'bar', component: BarComponent }\r?\n?\s*\]/,
       );
+      // tslint:enable:max-line-length
     });
 
     it('should add a route to the routes argument of RouteModule', () => {
diff --git a/packages/schematics/update/update/index.ts b/packages/schematics/update/update/index.ts
index 6d84a9175c8f..42feca52aa23 100644
--- a/packages/schematics/update/update/index.ts
+++ b/packages/schematics/update/update/index.ts
@@ -213,14 +213,12 @@ function _validateUpdatePackages(
       || peerErrors;
   });
 
-  // tslint:disable:max-line-length
   if (!force && peerErrors) {
     throw new SchematicsException(tags.stripIndents
       `Incompatible peer dependencies found.
       Peer dependency warnings when installing dependencies means that those dependencies might not work correctly together.
       You can use the '--force' option to ignore incompatible peer dependencies and instead address these warnings later.`);
   }
-  // tslint:enable:max-line-length
 }
 
 
diff --git a/tests/legacy-cli/e2e/tests/basic/e2e.ts b/tests/legacy-cli/e2e/tests/basic/e2e.ts
index fa3100915d46..c3c7db2d6c49 100644
--- a/tests/legacy-cli/e2e/tests/basic/e2e.ts
+++ b/tests/legacy-cli/e2e/tests/basic/e2e.ts
@@ -10,7 +10,6 @@ import {updateJsonFile} from '../../utils/project';
 import {expectToFail} from '../../utils/utils';
 import {moveFile, copyFile, replaceInFile} from '../../utils/fs';
 
-// tslint:disable:max-line-length
 export default function () {
   // Should fail without updated webdriver
   return updateJsonFile('package.json', packageJson => {
diff --git a/tests/legacy-cli/e2e/tests/basic/test.ts b/tests/legacy-cli/e2e/tests/basic/test.ts
index c3cd6a3d36f6..9ae72b9026d1 100644
--- a/tests/legacy-cli/e2e/tests/basic/test.ts
+++ b/tests/legacy-cli/e2e/tests/basic/test.ts
@@ -1,7 +1,6 @@
 import { ng } from '../../utils/process';
 import { moveFile } from '../../utils/fs';
 
-// tslint:disable:max-line-length
 export default function () {
   // make sure both --watch=false work
   return ng('test', '--watch=false')
diff --git a/tests/legacy-cli/e2e/tests/build/build-errors.ts b/tests/legacy-cli/e2e/tests/build/build-errors.ts
index b11c2c94053b..b8abc5b4dad3 100644
--- a/tests/legacy-cli/e2e/tests/build/build-errors.ts
+++ b/tests/legacy-cli/e2e/tests/build/build-errors.ts
@@ -4,8 +4,6 @@ import { writeFile, appendToFile, readFile, replaceInFile } from '../../utils/fs
 import { getGlobalVariable } from '../../utils/env';
 import { expectToFail } from '../../utils/utils';
 
-// tslint:disable:max-line-length
-
 const extraErrors = [
   `Final loader didn't return a Buffer or String`,
   `doesn't contain a valid alias configuration`,
diff --git a/tests/legacy-cli/e2e/tests/generate/component/component-duplicate.ts b/tests/legacy-cli/e2e/tests/generate/component/component-duplicate.ts
index a90043c1fc17..94d73a23fcb3 100644
--- a/tests/legacy-cli/e2e/tests/generate/component/component-duplicate.ts
+++ b/tests/legacy-cli/e2e/tests/generate/component/component-duplicate.ts
@@ -5,7 +5,6 @@ import { oneLine } from 'common-tags';
 export default function () {
   return ng('generate', 'component', 'test-component')
     .then((output) => {
-      // tslint:disable-next-line:max-line-length
       if (!output.stdout.match(/UPDATE src[\\|\/]app[\\|\/]app.module.ts/)) {
         throw new Error(oneLine`
           Expected to match
diff --git a/tests/legacy-cli/e2e/tests/generate/module/module-import.ts b/tests/legacy-cli/e2e/tests/generate/module/module-import.ts
index d2b773da24c8..1e00993bc858 100644
--- a/tests/legacy-cli/e2e/tests/generate/module/module-import.ts
+++ b/tests/legacy-cli/e2e/tests/generate/module/module-import.ts
@@ -2,7 +2,6 @@ import { join } from 'path';
 import { ng } from '../../../utils/process';
 import { expectFileToMatch } from '../../../utils/fs';
 
-// tslint:disable:max-line-length
 export default function () {
   const root = process.cwd();
   const modulePath = join(root, 'src', 'app', 'app.module.ts');

From ae0f790ee779d987f9471ca1609e4d2c566a3af2 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 22 Jul 2019 09:23:28 +0200
Subject: [PATCH 1668/1703] fix(@schematics/angular): change `findNodes` to
 stop recursive lookup for child nodes of kind

Curtrently, when a node of kind is found, we recursivly continue to look up it's child nodes until the end of the AST. This ends up returing other nodes which we were not looking for as typically we are looking for the first level of children of the specified kind.

By default now, we stop recursivly looking for child nodes of kind when we encounter one.

Closes #15117
---
 .../schematics/angular/utility/ast-utils.ts   |  6 ++--
 .../angular/utility/ast-utils_spec.ts         | 35 +++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/utility/ast-utils.ts b/packages/schematics/angular/utility/ast-utils.ts
index 4f6dc3565aab..541786dd8e49 100644
--- a/packages/schematics/angular/utility/ast-utils.ts
+++ b/packages/schematics/angular/utility/ast-utils.ts
@@ -93,9 +93,11 @@ export function insertImport(source: ts.SourceFile, fileToEdit: string, symbolNa
  * @param node
  * @param kind
  * @param max The maximum number of items to return.
+ * @param recursive Continue looking for nodes of kind recursive until end
+ * the last child even when node of kind has been found.
  * @return all nodes of kind, or [] if none is found
  */
-export function findNodes(node: ts.Node, kind: ts.SyntaxKind, max = Infinity): ts.Node[] {
+export function findNodes(node: ts.Node, kind: ts.SyntaxKind, max = Infinity, recursive = false): ts.Node[] {
   if (!node || max == 0) {
     return [];
   }
@@ -105,7 +107,7 @@ export function findNodes(node: ts.Node, kind: ts.SyntaxKind, max = Infinity): t
     arr.push(node);
     max--;
   }
-  if (max > 0) {
+  if (max > 0 && (recursive || node.kind !== kind)) {
     for (const child of node.getChildren()) {
       findNodes(child, kind, max).forEach(node => {
         if (max > 0) {
diff --git a/packages/schematics/angular/utility/ast-utils_spec.ts b/packages/schematics/angular/utility/ast-utils_spec.ts
index 86e7ab3ce2a8..6a03de30e2fe 100644
--- a/packages/schematics/angular/utility/ast-utils_spec.ts
+++ b/packages/schematics/angular/utility/ast-utils_spec.ts
@@ -476,6 +476,41 @@ describe('ast utils', () => {
       // tslint:enable:max-line-length
     });
 
+    it('should add a route to the routes to the correct array when having nested object literal', () => {
+      const moduleContent = `
+        import { BrowserModule } from '@angular/platform-browser';
+        import { NgModule } from '@angular/core';
+        import { AppComponent } from './app.component';
+
+        const routes = [
+            { path: 'foo', component: FooComponent, data: { path: 'test' }}
+        ];
+
+        @NgModule({
+          declarations: [
+            AppComponent
+          ],
+          imports: [
+            BrowserModule,
+            RouterModule.forRoot(routes)
+          ],
+          bootstrap: [AppComponent]
+        })
+        export class AppModule { }
+      `;
+
+      const source = getTsSource(modulePath, moduleContent);
+      const changes = addRouteDeclarationToModule(
+        source,
+        './src/app', `{ path: 'bar', component: BarComponent }`,
+      );
+      const output = applyChanges(modulePath, moduleContent, [changes]);
+      expect(output).toMatch(
+        // tslint:disable-next-line:max-line-length
+        /const routes = \[\r?\n?\s*{ path: 'foo', component: FooComponent, data: { path: 'test' }},\r?\n?\s*{ path: 'bar', component: BarComponent }\r?\n?\s*\]/,
+      );
+    });
+
     it('should add a route to the routes argument of RouteModule', () => {
       const moduleContent = `
         import { BrowserModule } from '@angular/platform-browser';

From 6649483d86a27abb1eb2392a612f4d1bdf7a8cfc Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Mon, 22 Jul 2019 14:37:05 +0200
Subject: [PATCH 1669/1703] fix(@ngtools/webpack): delete all virtual files for
 styles on change

Fixes #15143
---
 .../test/browser/rebuild_spec_large.ts        | 63 ++++++++++++++++++-
 packages/ngtools/webpack/src/compiler_host.ts | 20 +++++-
 2 files changed, 80 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
index 2119c017c9c9..ca506418d2c6 100644
--- a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
@@ -8,7 +8,7 @@
 // tslint:disable:no-big-function
 import { Architect } from '@angular-devkit/architect';
 import { TestLogger } from '@angular-devkit/architect/testing';
-import { logging, normalize, virtualFs } from '@angular-devkit/core';
+import { join, logging, normalize, virtualFs } from '@angular-devkit/core';
 import { debounceTime, take, takeWhile, tap } from 'rxjs/operators';
 import {
   createArchitect,
@@ -16,6 +16,7 @@ import {
   ivyEnabled,
   lazyModuleFiles,
   lazyModuleFnImport,
+  outputPath,
 } from '../utils';
 
 describe('Browser Builder rebuilds', () => {
@@ -477,4 +478,64 @@ describe('Browser Builder rebuilds', () => {
       .toPromise();
     await run.stop();
   });
+
+  it('rebuilds AOT on CSS changes', async () => {
+    const overrides = { watch: true, aot: true };
+
+    let buildCount = 1;
+    const run = await architect.scheduleTarget(target, overrides);
+    await run.output.pipe(
+      debounceTime(1000),
+      tap(() => {
+        const content = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, 'main.js')),
+        );
+
+        switch (buildCount) {
+          case 1:
+              expect(content).not.toContain('color: green');
+              host.appendToFile('src/app/app.component.css', 'h1 { color: green; }');
+            break;
+          case 2:
+              expect(content).toContain('color: green');
+            break;
+        }
+
+        buildCount++;
+      }),
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      take(2),
+    ).toPromise();
+    await run.stop();
+  });
+
+  it('rebuilds AOT on HTML changes', async () => {
+    const overrides = { watch: true, aot: true };
+
+    let buildCount = 1;
+    const run = await architect.scheduleTarget(target, overrides);
+    await run.output.pipe(
+      debounceTime(1000),
+      tap(() => {
+        const content = virtualFs.fileBufferToString(
+          host.scopedSync().read(join(outputPath, 'main.js')),
+        );
+
+        switch (buildCount) {
+          case 1:
+              expect(content).not.toContain('New Updated Content');
+              host.appendToFile('src/app/app.component.html', 'New Updated Content');
+            break;
+          case 2:
+              expect(content).toContain('New Updated Content');
+            break;
+        }
+
+        buildCount++;
+      }),
+      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+      take(2),
+    ).toPromise();
+    await run.stop();
+  });
 });
diff --git a/packages/ngtools/webpack/src/compiler_host.ts b/packages/ngtools/webpack/src/compiler_host.ts
index 5653905b7fea..915b94454dc4 100644
--- a/packages/ngtools/webpack/src/compiler_host.ts
+++ b/packages/ngtools/webpack/src/compiler_host.ts
@@ -31,11 +31,14 @@ export class WebpackCompilerHost implements ts.CompilerHost {
     '.js.map',
     '.ngfactory.js',
     '.ngfactory.js.map',
-    '.ngstyle.js',
-    '.ngstyle.js.map',
     '.ngsummary.json',
   ];
 
+  private _virtualStyleFileExtensions = [
+    '.shim.ngstyle.js',
+    '.shim.ngstyle.js.map',
+  ];
+
   constructor(
     private _options: ts.CompilerOptions,
     basePath: string,
@@ -110,6 +113,10 @@ export class WebpackCompilerHost implements ts.CompilerHost {
       });
     }
 
+    if (fullPath.endsWith('.ts')) {
+      return;
+    }
+
     // In case resolveJsonModule and allowJs we also need to remove virtual emitted files
     // both if they exists or not.
     if (
@@ -119,6 +126,15 @@ export class WebpackCompilerHost implements ts.CompilerHost {
       if (this._memoryHost.exists(fullPath)) {
         this._memoryHost.delete(fullPath);
       }
+
+      return;
+    }
+
+    for (const ext of this._virtualStyleFileExtensions) {
+      const virtualFile = (fullPath + ext) as Path;
+      if (this._memoryHost.exists(virtualFile)) {
+        this._memoryHost.delete(virtualFile);
+      }
     }
   }
 

From 64d25a55b3c1c137ae472c2262b69120e4b6ff5f Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Tue, 23 Jul 2019 11:58:02 -0400
Subject: [PATCH 1670/1703] test: ensure E2E locally published packages are
 used

Fixes issues when `ng-snapshots` option is used.  Otherwise an older version of the CLI packages could potentially be used.
---
 tests/legacy-cli/e2e/utils/project.ts | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts
index 789ce4eab3f3..c25c368c3704 100644
--- a/tests/legacy-cli/e2e/utils/project.ts
+++ b/tests/legacy-cli/e2e/utils/project.ts
@@ -1,11 +1,10 @@
-import * as fs from 'fs-extra';
-import { readFile, writeFile, replaceInFile, prependToFile } from './fs';
-import { execAndWaitForOutputToMatch, npm, silentNpm, ng, git } from './process';
-import { getGlobalVariable } from './env';
-import { gitCommit } from './git';
+import * as fs from 'fs';
 import { prerelease } from 'semver';
 import { packages } from '../../../../lib/packages';
-
+import { getGlobalVariable } from './env';
+import { prependToFile, readFile, replaceInFile, writeFile } from './fs';
+import { gitCommit } from './git';
+import { execAndWaitForOutputToMatch, git, ng, npm, silentNpm } from './process';
 
 const tsConfigPath = 'tsconfig.json';
 
@@ -80,10 +79,10 @@ export async function prepareProjectForE2e(name) {
 
   if (argv['ng-snapshots'] || argv['ng-tag']) {
     await useSha();
-  } else {
-    await writeFile('.npmrc', 'registry=http://localhost:4873');
   }
 
+  await writeFile('.npmrc', 'registry=http://localhost:4873');
+
   console.log(
     `Project ${name} created... Installing npm.`,
   );

From 79f529839113b9559cca46a30d63cda9df2298d7 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Wed, 24 Jul 2019 05:04:30 +0000
Subject: [PATCH 1671/1703] build: update semver to version 6.3.0

---
 package.json                                       | 2 +-
 packages/angular/cli/package.json                  | 2 +-
 packages/angular_devkit/build_angular/package.json | 2 +-
 packages/schematics/update/package.json            | 2 +-
 yarn.lock                                          | 5 +++++
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index ad92b91e092c..9d6cbc5772ca 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,7 @@
     "pidusage": "^2.0.17",
     "rxjs": "~6.4.0",
     "sauce-connect": "https://saucelabs.com/downloads/sc-4.5.4-linux.tar.gz",
-    "semver": "6.2.0",
+    "semver": "6.3.0",
     "source-map": "^0.5.6",
     "source-map-support": "^0.5.0",
     "spdx-satisfies": "^4.0.0",
diff --git a/packages/angular/cli/package.json b/packages/angular/cli/package.json
index cbb92957df7f..90dadff8f2ab 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -39,7 +39,7 @@
     "open": "6.4.0",
     "pacote": "9.5.4",
     "read-package-tree": "5.3.1",
-    "semver": "6.2.0",
+    "semver": "6.3.0",
     "symbol-observable": "1.2.0",
     "universal-analytics": "^0.4.20",
     "uuid": "^3.3.2"
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 18f1539d0be9..4939fc37dde1 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -39,7 +39,7 @@
     "rxjs": "6.4.0",
     "sass": "1.22.8",
     "sass-loader": "7.1.0",
-    "semver": "6.2.0",
+    "semver": "6.3.0",
     "source-map-support": "0.5.12",
     "source-map-loader": "0.2.4",
     "speed-measure-webpack-plugin": "1.3.1",
diff --git a/packages/schematics/update/package.json b/packages/schematics/update/package.json
index 90ca472b0161..3773967b25b6 100644
--- a/packages/schematics/update/package.json
+++ b/packages/schematics/update/package.json
@@ -16,7 +16,7 @@
     "@yarnpkg/lockfile": "1.1.0",
     "ini": "1.3.5",
     "pacote": "9.5.4",
-    "semver": "6.2.0",
+    "semver": "6.3.0",
     "semver-intersect": "1.4.0",
     "rxjs": "6.4.0"
   }
diff --git a/yarn.lock b/yarn.lock
index a35caed7c450..a4bdd81f0ca1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9302,6 +9302,11 @@ semver@6.2.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db"
   integrity sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==
 
+semver@6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
 semver@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"

From 7df180d9c9dd3540811b6bd634772c08b774a382 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 24 Jul 2019 09:26:46 +0200
Subject: [PATCH 1672/1703] fix(@ngtools/webpack): use a single module
 resolution cache

---
 packages/ngtools/webpack/src/angular_compiler_plugin.ts | 6 ++++--
 packages/ngtools/webpack/src/compiler_host.ts           | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 455c6bd434c7..571ba39301c0 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -355,8 +355,6 @@ export class AngularCompilerPlugin {
       this._updateForkedTypeChecker(this._rootNames, this._getChangedCompilationFiles());
     }
 
-    // Use an identity function as all our paths are absolute already.
-    this._moduleResolutionCache = ts.createModuleResolutionCache(this._basePath, x => x);
     const oldTsProgram = this._getTsProgram();
 
     if (this._JitMode) {
@@ -721,6 +719,9 @@ export class AngularCompilerPlugin {
         );
       }
 
+      // Use an identity function as all our paths are absolute already.
+      this._moduleResolutionCache = ts.createModuleResolutionCache(this._basePath, x => x);
+
       // Create the webpack compiler host.
       const webpackCompilerHost = new WebpackCompilerHost(
         this._compilerOptions,
@@ -729,6 +730,7 @@ export class AngularCompilerPlugin {
         true,
         this._options.directTemplateLoading,
         ngccProcessor,
+        this._moduleResolutionCache,
       );
 
       // Create and set a new WebpackResourceLoader in AOT
diff --git a/packages/ngtools/webpack/src/compiler_host.ts b/packages/ngtools/webpack/src/compiler_host.ts
index 915b94454dc4..042195b96e32 100644
--- a/packages/ngtools/webpack/src/compiler_host.ts
+++ b/packages/ngtools/webpack/src/compiler_host.ts
@@ -46,6 +46,7 @@ export class WebpackCompilerHost implements ts.CompilerHost {
     private readonly cacheSourceFiles: boolean,
     private readonly directTemplateLoading = false,
     private readonly ngccProcessor?: NgccProcessor,
+    private readonly moduleResolutionCache?: ts.ModuleResolutionCache,
   ) {
     this._syncHost = new virtualFs.SyncDelegateHost(host);
     this._memoryHost = new virtualFs.SyncDelegateHost(new virtualFs.SimpleMemoryHost());
@@ -405,6 +406,7 @@ export class WebpackCompilerHost implements ts.CompilerHost {
         workaroundResolve(containingFile),
         this._options,
         this,
+        this.moduleResolutionCache,
       );
 
       if (this._options.enableIvy && resolvedModule && this.ngccProcessor) {

From 07780b9272d985606d318da16d732dd28a41d592 Mon Sep 17 00:00:00 2001
From: vikerman <viks@google.com>
Date: Wed, 24 Jul 2019 22:31:10 -0700
Subject: [PATCH 1673/1703] style: clean up existing lint errors

---
 .../build_angular/test/browser/rebuild_spec_large.ts |  8 ++++----
 .../test/browser/scripts-array_spec_large.ts         |  2 +-
 .../test/browser/unused-files-warning_spec_large.ts  | 12 ++++++------
 .../ngtools/webpack/src/angular_compiler_plugin.ts   |  2 +-
 packages/schematics/angular/application/index.ts     |  3 ++-
 packages/schematics/angular/utility/json-utils.ts    |  4 ++--
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
index ca506418d2c6..e82f573249d9 100644
--- a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
@@ -495,10 +495,10 @@ describe('Browser Builder rebuilds', () => {
           case 1:
               expect(content).not.toContain('color: green');
               host.appendToFile('src/app/app.component.css', 'h1 { color: green; }');
-            break;
+              break;
           case 2:
               expect(content).toContain('color: green');
-            break;
+              break;
         }
 
         buildCount++;
@@ -525,10 +525,10 @@ describe('Browser Builder rebuilds', () => {
           case 1:
               expect(content).not.toContain('New Updated Content');
               host.appendToFile('src/app/app.component.html', 'New Updated Content');
-            break;
+              break;
           case 2:
               expect(content).toContain('New Updated Content');
-            break;
+              break;
         }
 
         buildCount++;
diff --git a/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
index 64af80cc7230..da0129c9fb5b 100644
--- a/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/scripts-array_spec_large.ts
@@ -93,7 +93,7 @@ describe('Browser Builder scripts array', () => {
 
     host.writeMultipleFiles(scripts);
     host.appendToFile('src/main.ts', '\nimport \'./input-script.js\';');
-    
+
     // Enable differential loading
     host.appendToFile('browserslist', '\nIE 10');
 
diff --git a/packages/angular_devkit/build_angular/test/browser/unused-files-warning_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/unused-files-warning_spec_large.ts
index 75b16fbb998d..d341876d3218 100644
--- a/packages/angular_devkit/build_angular/test/browser/unused-files-warning_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/unused-files-warning_spec_large.ts
@@ -75,13 +75,13 @@ describe('Browser Builder unused files warnings', () => {
     }
 
     host.writeMultipleFiles({
-      'src/app/type.ts': 'export type MyType = number;'
+      'src/app/type.ts': 'export type MyType = number;',
     });
 
     host.replaceInFile(
       'src/app/app.component.ts',
       `'@angular/core';`,
-      `'@angular/core';\nimport { MyType } from './type';\n`
+      `'@angular/core';\nimport { MyType } from './type';\n`,
     );
 
     const logger = new TestLogger('unused-files-warnings');
@@ -126,14 +126,14 @@ describe('Browser Builder unused files warnings', () => {
 
               // Write a used file
               host.writeMultipleFiles({
-                'src/testing/type.ts': 'export type MyType = number;'
+                'src/testing/type.ts': 'export type MyType = number;',
               });
-              
+
               // touch file to trigger build
               host.replaceInFile(
                 'src/app/app.component.ts',
                 `'@angular/core';`,
-                `'@angular/core';\n`
+                `'@angular/core';\n`,
               );
               break;
 
@@ -144,7 +144,7 @@ describe('Browser Builder unused files warnings', () => {
               host.replaceInFile(
                 'src/app/app.component.ts',
                 `'@angular/core';`,
-                `'@angular/core';\nimport { MyType } from '../testing/type';`
+                `'@angular/core';\nimport { MyType } from '../testing/type';`,
               );
               break;
 
diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 571ba39301c0..6962bd7bb04d 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -619,7 +619,7 @@ export class AngularCompilerPlugin {
 
       usedFiles.add(forwardSlashPath(compilationModule.resource));
 
-      // We need the below for dependencies which 
+      // We need the below for dependencies which
       // are not emitted such as type only TS files
       for (const dependency of compilationModule.buildInfo.fileDependencies) {
         usedFiles.add(forwardSlashPath(dependency));
diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 8a80af4bead8..5689d6dc413d 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -219,7 +219,8 @@ function addAppToWorkspaceFile(options: ApplicationOptions, appDir: string): Rul
             extractLicenses: true,
             vendorChunk: false,
             buildOptimizer: true,
-            budgets: [{
+            budgets: [
+            {
               type: 'initial',
               maximumWarning: '2mb',
               maximumError: '5mb',
diff --git a/packages/schematics/angular/utility/json-utils.ts b/packages/schematics/angular/utility/json-utils.ts
index 72cb4937514f..8684785aef8d 100644
--- a/packages/schematics/angular/utility/json-utils.ts
+++ b/packages/schematics/angular/utility/json-utils.ts
@@ -194,11 +194,11 @@ function _buildIndent(count: number): string {
 
 function _stringifyContent(value: JsonValue, indentStr: string): string {
   // TODO: Add snapshot tests
-  
+
   // The 'space' value is 2, because we want to add 2 additional
   // indents from the 'key' node.
 
-  // If we use the indent provided we will have double indents: 
+  // If we use the indent provided we will have double indents:
   // "budgets": [
   //   {
   //     "type": "initial",

From 50b290e9f09fd9ef27106cc92e2644a5341edae2 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 25 Jul 2019 10:51:47 +0200
Subject: [PATCH 1674/1703] fix(@angular-devkit/build-angular): rollback sass
 to version `1.22.7`

sass version `1.22.8` was rolled back and is no longer available on NPM
---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 4939fc37dde1..74514219f8a9 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -37,7 +37,7 @@
     "postcss-loader": "3.0.0",
     "raw-loader": "1.0.0",
     "rxjs": "6.4.0",
-    "sass": "1.22.8",
+    "sass": "1.22.7",
     "sass-loader": "7.1.0",
     "semver": "6.3.0",
     "source-map-support": "0.5.12",
diff --git a/yarn.lock b/yarn.lock
index a4bdd81f0ca1..9fd67b877813 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9147,10 +9147,10 @@ sass-loader@7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
-sass@1.22.8:
-  version "1.22.8"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.22.8.tgz#835178085177d5a934fb0e25a0f958b4b5bbff65"
-  integrity sha512-5md/TfquFCQw+Wp9/FoQuEolVuVsJJZ6dQjfCRihCYcyr8xoQICIU0Nads9CVH8z9khd7k8AnwCcgH6L7t+SAg==
+sass@1.22.7:
+  version "1.22.7"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.22.7.tgz#5a1a77dc11aa659db4e782d238bf9f3d44a60546"
+  integrity sha512-ahREi0AdG7RTovSv14+yd1prQSfIvFcrDpOsth5EQf1+RM7SvOxsSttzNQaFmK1aa/k/3vyYwlYF5l0Xl+6c+g==
   dependencies:
     chokidar ">=2.0.0 <4.0.0"
 

From 3dd3529ba417c7993d4d7f4c666a6e4fc9c95080 Mon Sep 17 00:00:00 2001
From: vikerman <viks@google.com>
Date: Thu, 25 Jul 2019 21:38:08 -0700
Subject: [PATCH 1675/1703] release: v8.2.0-next.2

---
 packages/schematics/angular/utility/latest-versions.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 0fdabb43986a..3f1016dbb2be 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -15,10 +15,10 @@ export const latestVersions = {
   TsLib: '^1.9.0',
 
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.802.0-next.1',
-  DevkitBuildNgPackagr: '~0.802.0-next.1',
-  DevkitBuildWebpack: '~0.802.0-next.1',
-  AngularPWA: '~0.802.0-next.1',
+  DevkitBuildAngular: '~0.802.0-next.2',
+  DevkitBuildNgPackagr: '~0.802.0-next.2',
+  DevkitBuildWebpack: '~0.802.0-next.2',
+  AngularPWA: '~0.802.0-next.2',
 
   tsickle: '^0.35.0',
   ngPackagr: '^5.1.0',

From 2299ad4b99ad7fcb71dd79f7f74a0a365e8fac46 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 26 Jul 2019 17:17:31 +0200
Subject: [PATCH 1676/1703] test: add local npm registry that require local
 built packages

---
 tests/legacy-cli/e2e/tests/misc/ask-analytics.ts |  2 +-
 .../legacy-cli/e2e/tests/schematics_cli/basic.ts |  8 +++++++-
 tests/legacy-cli/e2e/tests/update/update-1.0.ts  |  2 --
 .../e2e/tests/update/update-1.7-longhand.ts      |  2 --
 tests/legacy-cli/e2e/utils/assets.ts             | 16 +++++++++-------
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/misc/ask-analytics.ts b/tests/legacy-cli/e2e/tests/misc/ask-analytics.ts
index 1bd61b7b1138..ecc6b797de3f 100644
--- a/tests/legacy-cli/e2e/tests/misc/ask-analytics.ts
+++ b/tests/legacy-cli/e2e/tests/misc/ask-analytics.ts
@@ -17,7 +17,7 @@ export default async function() {
     // Install the CLI with TTY force enabled
     const execution = execWithEnv(
       'npm',
-      ['install', packages['@angular/cli'].tar],
+      ['install', packages['@angular/cli'].tar, '--registry=http://localhost:4873'],
       { ...process.env, 'NG_FORCE_TTY': '1' },
     );
 
diff --git a/tests/legacy-cli/e2e/tests/schematics_cli/basic.ts b/tests/legacy-cli/e2e/tests/schematics_cli/basic.ts
index 45e2aed81115..fe94d50a057b 100644
--- a/tests/legacy-cli/e2e/tests/schematics_cli/basic.ts
+++ b/tests/legacy-cli/e2e/tests/schematics_cli/basic.ts
@@ -12,7 +12,13 @@ export default async function () {
   }
 
   const startCwd = process.cwd();
-  await silentNpm('install', '-g', packages['@angular-devkit/schematics-cli'].tar, '--unsafe-perm');
+  await silentNpm(
+    'install',
+    '-g',
+    packages['@angular-devkit/schematics-cli'].tar,
+    '--unsafe-perm',
+    '--registry=http://localhost:4873',
+  );
   await exec(process.platform.startsWith('win') ? 'where' : 'which', 'schematics');
 
   // create blank schematic
diff --git a/tests/legacy-cli/e2e/tests/update/update-1.0.ts b/tests/legacy-cli/e2e/tests/update/update-1.0.ts
index c3171f99cb84..6d24c8ffeb4d 100644
--- a/tests/legacy-cli/e2e/tests/update/update-1.0.ts
+++ b/tests/legacy-cli/e2e/tests/update/update-1.0.ts
@@ -1,4 +1,3 @@
-import * as fs from 'fs';
 import { createProjectFromAsset } from '../../utils/assets';
 import { ng, silentNpm } from '../../utils/process';
 import { isPrereleaseCli, useBuiltPackages, useCIChrome, useCIDefaults } from '../../utils/project';
@@ -8,7 +7,6 @@ export default async function() {
   const extraUpdateArgs = (await isPrereleaseCli()) ? ['--next', '--force'] : [];
 
   await createProjectFromAsset('1.0-project');
-  fs.writeFileSync('.npmrc', 'registry = http://localhost:4873', 'utf8');
 
   await useCIChrome('.');
   await expectToFail(() => ng('build'));
diff --git a/tests/legacy-cli/e2e/tests/update/update-1.7-longhand.ts b/tests/legacy-cli/e2e/tests/update/update-1.7-longhand.ts
index 0fff642ce419..adec63d719ac 100644
--- a/tests/legacy-cli/e2e/tests/update/update-1.7-longhand.ts
+++ b/tests/legacy-cli/e2e/tests/update/update-1.7-longhand.ts
@@ -1,4 +1,3 @@
-import * as fs from 'fs';
 import { createProjectFromAsset } from '../../utils/assets';
 import { ng, silentNpm } from '../../utils/process';
 import { isPrereleaseCli, useBuiltPackages } from '../../utils/project';
@@ -8,7 +7,6 @@ export default async function() {
   const extraUpdateArgs = (await isPrereleaseCli()) ? ['--next', '--force'] : [];
 
   await createProjectFromAsset('1.7-project');
-  fs.writeFileSync('.npmrc', 'registry = http://localhost:4873', 'utf8');
 
   await expectToFail(() => ng('build'));
   await ng('update', '@angular/cli', '--migrate-only', '--from=1.7.1');
diff --git a/tests/legacy-cli/e2e/utils/assets.ts b/tests/legacy-cli/e2e/utils/assets.ts
index bed540b5bb6c..b8c0c2736c42 100644
--- a/tests/legacy-cli/e2e/utils/assets.ts
+++ b/tests/legacy-cli/e2e/utils/assets.ts
@@ -2,7 +2,7 @@ import {join} from 'path';
 import * as glob from 'glob';
 import {getGlobalVariable} from './env';
 import {relative} from 'path';
-import {copyFile} from './fs';
+import {copyFile, writeFile} from './fs';
 import {useBuiltPackages} from './project';
 import { git, silentNpm } from './process';
 
@@ -39,10 +39,12 @@ export function copyAssets(assetName: string) {
 }
 
 
-export function createProjectFromAsset(assetName: string, useNpmPackages = false) {
-  return Promise.resolve()
-    .then(() => copyAssets(assetName))
-    .then(dir => process.chdir(dir))
-    .then(() => useNpmPackages ? null : useBuiltPackages())
-    .then(() => silentNpm('install'));
+export async function createProjectFromAsset(assetName: string, useNpmPackages = false) {
+  const dir = await copyAssets(assetName);
+  process.chdir(dir);
+  if (!useNpmPackages) {
+    await useBuiltPackages();
+    await writeFile('.npmrc', 'registry = http://localhost:4873', 'utf8');
+  }
+  await silentNpm('install');
 }

From 78a50ad3289db2d0588057f791d1dc3e73ca9878 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 26 Jul 2019 18:23:15 +0000
Subject: [PATCH 1677/1703] build: update copy-webpack-plugin to version 5.0.4

---
 .../angular_devkit/build_angular/package.json |  2 +-
 yarn.lock                                     | 30 +++++++++++++++----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 74514219f8a9..cca4d0654785 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -18,7 +18,7 @@
     "caniuse-lite": "1.0.30000985",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
-    "copy-webpack-plugin": "5.0.3",
+    "copy-webpack-plugin": "5.0.4",
     "core-js": "3.1.4",
     "file-loader": "4.1.0",
     "glob": "7.1.4",
diff --git a/yarn.lock b/yarn.lock
index 9fd67b877813..de87b26f8eb7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1925,6 +1925,26 @@ cacache@^11.3.2:
     unique-filename "^1.1.1"
     y18n "^4.0.0"
 
+cacache@^11.3.3:
+  version "11.3.3"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.3.tgz#8bd29df8c6a718a6ebd2d010da4d7972ae3bbadc"
+  integrity sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==
+  dependencies:
+    bluebird "^3.5.5"
+    chownr "^1.1.1"
+    figgy-pudding "^3.5.1"
+    glob "^7.1.4"
+    graceful-fs "^4.1.15"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.3"
+    ssri "^6.0.1"
+    unique-filename "^1.1.1"
+    y18n "^4.0.0"
+
 cacache@^12.0.0:
   version "12.0.0"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.0.tgz#1ed91cc306312a53ad688b1563ce4c416faec564"
@@ -2806,12 +2826,12 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-webpack-plugin@5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.3.tgz#2179e3c8fd69f13afe74da338896f1f01a875b5c"
-  integrity sha512-PlZRs9CUMnAVylZq+vg2Juew662jWtwOXOqH4lbQD9ZFhRG9R7tVStOgHt21CBGVq7k5yIJaz8TXDLSjV+Lj8Q==
+copy-webpack-plugin@5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.4.tgz#c78126f604e24f194c6ec2f43a64e232b5d43655"
+  integrity sha512-YBuYGpSzoCHSSDGyHy6VJ7SHojKp6WHT4D7ItcQFNAYx2hrwkMe56e97xfVR0/ovDuMTrMffXUiltvQljtAGeg==
   dependencies:
-    cacache "^11.3.2"
+    cacache "^11.3.3"
     find-cache-dir "^2.1.0"
     glob-parent "^3.1.0"
     globby "^7.1.1"

From b4c441e790fed3ffd6da9f168b7905aaccd066e5 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 26 Jul 2019 18:26:14 +0000
Subject: [PATCH 1678/1703] build: update webpack to version 4.38.0

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 packages/angular_devkit/build_webpack/package.json | 2 +-
 packages/ngtools/webpack/package.json              | 2 +-
 yarn.lock                                          | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index cca4d0654785..1bc308c435d5 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -48,7 +48,7 @@
     "stylus-loader": "3.0.2",
     "tree-kill": "1.2.1",
     "terser-webpack-plugin": "1.3.0",
-    "webpack": "4.37.0",
+    "webpack": "4.38.0",
     "webpack-dev-middleware": "3.7.0",
     "webpack-dev-server": "3.7.2",
     "webpack-merge": "4.2.1",
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index a3133d9509ce..f1d916fc2f94 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -17,7 +17,7 @@
     "webpack-dev-server": "^3.1.4"
   },
   "devDependencies": {
-    "webpack": "4.37.0",
+    "webpack": "4.38.0",
     "webpack-dev-server": "^3.1.4"
   }
 }
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 334e9d1f7abe..3d063ffe57d0 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -36,6 +36,6 @@
     "@angular/compiler": "~8.1.0",
     "@angular/compiler-cli": "~8.1.0",
     "typescript": "3.4.5",
-    "webpack": "4.37.0"
+    "webpack": "4.38.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index de87b26f8eb7..8fe6d4366c2a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11176,10 +11176,10 @@ webpack-subresource-integrity@1.1.0-rc.6:
   dependencies:
     webpack-core "^0.6.8"
 
-webpack@4.37.0:
-  version "4.37.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.37.0.tgz#3508ef10f7996612c2be6026076d89760f776f54"
-  integrity sha512-iJPPvL7XpbcbwOthbzpa2BSPlmGp8lGDokAj/LdWtK80rsPoPOdANSbDBf2GAVLKZD3GhCuQ/gGkgN9HWs0Keg==
+webpack@4.38.0:
+  version "4.38.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.38.0.tgz#6d77108404b08883c78f4e7e45a43c4e5c47c931"
+  integrity sha512-lbuFsVOq8PZY+1Ytz/mYOvYOo+d4IJ31hHk/7iyoeWtwN33V+5HYotSH+UIb9tq914ey0Hot7z6HugD+je3sWw==
   dependencies:
     "@webassemblyjs/ast" "1.8.5"
     "@webassemblyjs/helper-module-context" "1.8.5"

From e8dff5718f3f1935f683f2cc53247d9e61f20234 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Fri, 26 Jul 2019 19:00:04 +0100
Subject: [PATCH 1679/1703] build: update to TS 3.5

---
 package.json                                  |     6 +-
 .../angular/cli/utilities/package-metadata.ts |     2 +-
 .../angular_devkit/build_angular/package.json |    23 +-
 .../build_ng_packagr/package.json             |     8 +-
 .../build_optimizer/package.json              |     2 +-
 .../schematics/tools/fallback-engine-host.ts  |     2 +-
 .../tools/file-system-engine-host-base.ts     |     2 +-
 packages/ngtools/webpack/package.json         |     8 +-
 .../Microsoft/TypeScript/lib/typescript.d.ts  |   655 +-
 .../Microsoft/TypeScript/lib/typescript.js    | 20843 ++++++++--------
 .../angular/utility/latest-versions.ts        |    10 +-
 .../blank/project-files/package.json.template |     2 +-
 .../schematics/schematic/files/package.json   |     2 +-
 .../webpack/test-app-weird/package.json       |     2 +-
 .../e2e/assets/webpack/test-app/package.json  |    18 +-
 .../webpack/test-server-app/package.json      |     2 +-
 yarn.lock                                     |   584 +-
 17 files changed, 11680 insertions(+), 10491 deletions(-)

diff --git a/package.json b/package.json
index 9d6cbc5772ca..30c0eca39302 100644
--- a/package.json
+++ b/package.json
@@ -77,11 +77,11 @@
     "quicktype-core": "^6.0.15",
     "temp": "^0.9.0",
     "tslint": "^5.15.0",
-    "typescript": "3.4.5"
+    "typescript": "3.5.3"
   },
   "devDependencies": {
-    "@angular/compiler": "~8.1.0",
-    "@angular/compiler-cli": "~8.1.0",
+    "@angular/compiler": "~8.2.0-rc.0",
+    "@angular/compiler-cli": "~8.2.0-rc.0",
     "@bazel/bazel": "0.24.1",
     "@bazel/buildifier": "^0.22.0",
     "@bazel/jasmine": "~0.26.0",
diff --git a/packages/angular/cli/utilities/package-metadata.ts b/packages/angular/cli/utilities/package-metadata.ts
index 0775c55792b7..26b3f446b135 100644
--- a/packages/angular/cli/utilities/package-metadata.ts
+++ b/packages/angular/cli/utilities/package-metadata.ts
@@ -191,7 +191,7 @@ export async function fetchPackageMetadata(
 
   if (response.versions) {
     for (const [version, manifest] of Object.entries(response.versions)) {
-      metadata.versions.set(version, normalizeManifest(manifest));
+      metadata.versions.set(version, normalizeManifest(manifest as {}));
     }
   }
 
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 1bc308c435d5..a731d937734f 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -57,18 +57,19 @@
     "worker-plugin": "3.1.0"
   },
   "devDependencies": {
-    "@angular/animations": "~8.1.0",
+    "@angular/animations": "~8.2.0-rc.0",
     "@angular/cdk": "^8.0.0",
-    "@angular/common": "~8.1.0",
-    "@angular/compiler": "~8.1.0",
-    "@angular/compiler-cli": "~8.1.0",
-    "@angular/core": "~8.1.0",
+    "@angular/common": "~8.2.0-rc.0",
+    "@angular/compiler": "~8.2.0-rc.0",
+    "@angular/compiler-cli": "~8.2.0-rc.0",
+    "@angular/core": "~8.2.0-rc.0",
+    "@angular/forms": "~8.2.0-rc.0",
     "@angular/material": "^8.0.0",
-    "@angular/platform-browser": "~8.1.0",
-    "@angular/platform-browser-dynamic": "~8.1.0",
-    "@angular/platform-server": "~8.1.0",
-    "@angular/router": "~8.1.0",
-    "@angular/service-worker": "~8.1.0",
+    "@angular/platform-browser": "~8.2.0-rc.0",
+    "@angular/platform-browser-dynamic": "~8.2.0-rc.0",
+    "@angular/platform-server": "~8.2.0-rc.0",
+    "@angular/router": "~8.2.0-rc.0",
+    "@angular/service-worker": "~8.2.0-rc.0",
     "codelyzer": "^5.0.0",
     "bootstrap": "^4.0.0",
     "font-awesome": "^4.7.0",
@@ -86,6 +87,6 @@
   },
   "peerDependencies": {
     "@angular/compiler-cli": "^8.0.0-beta.0 || ^8.1.0-beta.0 || ^8.2.0-beta.0 || ^8.3.0-beta.0 || ^8.4.0-beta.0 || >=9.0.0-beta < 9",
-    "typescript": ">=3.1 < 3.5"
+    "typescript": ">=3.1 < 3.6"
   }
 }
diff --git a/packages/angular_devkit/build_ng_packagr/package.json b/packages/angular_devkit/build_ng_packagr/package.json
index 68f06ca6f381..4e0e0627a8e7 100644
--- a/packages/angular_devkit/build_ng_packagr/package.json
+++ b/packages/angular_devkit/build_ng_packagr/package.json
@@ -14,10 +14,10 @@
     "ng-packagr": "^4.0.0 || ^5.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "~8.1.0",
-    "@angular/compiler-cli": "~8.1.0",
+    "@angular/compiler": "~8.2.0-rc.0",
+    "@angular/compiler-cli": "~8.2.0-rc.0",
     "@angular-devkit/core": "0.0.0",
-    "ng-packagr": "^5.1.0",
-    "tslib": "^1.9.0"
+    "ng-packagr": "^5.3.0",
+    "tslib": "^1.10.0"
   }
 }
diff --git a/packages/angular_devkit/build_optimizer/package.json b/packages/angular_devkit/build_optimizer/package.json
index 5755fdc9af00..b0b73cc0d1c4 100644
--- a/packages/angular_devkit/build_optimizer/package.json
+++ b/packages/angular_devkit/build_optimizer/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "loader-utils": "1.2.3",
     "source-map": "0.5.6",
-    "typescript": "3.4.5",
+    "typescript": "3.5.3",
     "webpack-sources": "1.3.0"
   }
 }
diff --git a/packages/angular_devkit/schematics/tools/fallback-engine-host.ts b/packages/angular_devkit/schematics/tools/fallback-engine-host.ts
index 3e9f882452b5..c8e8d3a37430 100644
--- a/packages/angular_devkit/schematics/tools/fallback-engine-host.ts
+++ b/packages/angular_devkit/schematics/tools/fallback-engine-host.ts
@@ -94,7 +94,7 @@ export class FallbackEngineHost implements EngineHost<{}, {}> {
     // tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
     return ((observableOf(options) as any)
       .pipe(...this._hosts
-        .map(host => mergeMap(opt => host.transformOptions(schematic, opt, context))),
+        .map(host => mergeMap((opt: {}) => host.transformOptions(schematic, opt, context))),
       )
     ) as {} as Observable<ResultT>;
   }
diff --git a/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts b/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts
index 5c823fa3ec3d..8c5e560fb6f4 100644
--- a/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts
+++ b/packages/angular_devkit/schematics/tools/file-system-engine-host-base.ts
@@ -301,7 +301,7 @@ export abstract class FileSystemEngineHostBase implements FileSystemEngineHost {
     // tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
     return ((observableOf(options) as any)
       .pipe(
-        ...this._transforms.map(tFn => mergeMap(opt => {
+        ...this._transforms.map(tFn => mergeMap((opt: {}) => {
           const newOptions = tFn(schematic, opt, context);
           if (isObservable(newOptions)) {
             return newOptions;
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index 3d063ffe57d0..1b5b04237012 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -29,13 +29,13 @@
   },
   "peerDependencies": {
     "@angular/compiler-cli": "^8.0.0-beta.0 || ^8.1.0-beta.0 || ^8.2.0-beta.0 || ^8.3.0-beta.0 || ^8.4.0-beta.0 || >=9.0.0-beta < 9",
-    "typescript": ">=3.4 < 3.5",
+    "typescript": ">=3.4 < 3.6",
     "webpack": "^4.0.0"
   },
   "devDependencies": {
-    "@angular/compiler": "~8.1.0",
-    "@angular/compiler-cli": "~8.1.0",
-    "typescript": "3.4.5",
+    "@angular/compiler": "~8.2.0-rc.0",
+    "@angular/compiler-cli": "~8.2.0-rc.0",
+    "typescript": "3.5.3",
     "webpack": "4.38.0"
   }
 }
diff --git a/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts b/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts
index 314ccf298cf2..58ccd42344b0 100644
--- a/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts
+++ b/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts
@@ -14,7 +14,7 @@ and limitations under the License.
 ***************************************************************************** */
 
 declare namespace ts {
-    const versionMajorMinor = "3.4";
+    const versionMajorMinor = "3.5";
     /** The version of the TypeScript compiler release */
     const version: string;
 }
@@ -72,7 +72,7 @@ declare namespace ts {
         pos: number;
         end: number;
     }
-    type JsDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.NoSubstitutionTemplateLiteral | SyntaxKind.Unknown | KeywordSyntaxKind;
+    type JSDocSyntaxKind = SyntaxKind.EndOfFileToken | SyntaxKind.WhitespaceTrivia | SyntaxKind.AtToken | SyntaxKind.NewLineTrivia | SyntaxKind.AsteriskToken | SyntaxKind.OpenBraceToken | SyntaxKind.CloseBraceToken | SyntaxKind.LessThanToken | SyntaxKind.OpenBracketToken | SyntaxKind.CloseBracketToken | SyntaxKind.EqualsToken | SyntaxKind.CommaToken | SyntaxKind.DotToken | SyntaxKind.Identifier | SyntaxKind.BacktickToken | SyntaxKind.Unknown | KeywordSyntaxKind;
     type KeywordSyntaxKind = SyntaxKind.AbstractKeyword | SyntaxKind.AnyKeyword | SyntaxKind.AsKeyword | SyntaxKind.BigIntKeyword | SyntaxKind.BooleanKeyword | SyntaxKind.BreakKeyword | SyntaxKind.CaseKeyword | SyntaxKind.CatchKeyword | SyntaxKind.ClassKeyword | SyntaxKind.ContinueKeyword | SyntaxKind.ConstKeyword | SyntaxKind.ConstructorKeyword | SyntaxKind.DebuggerKeyword | SyntaxKind.DeclareKeyword | SyntaxKind.DefaultKeyword | SyntaxKind.DeleteKeyword | SyntaxKind.DoKeyword | SyntaxKind.ElseKeyword | SyntaxKind.EnumKeyword | SyntaxKind.ExportKeyword | SyntaxKind.ExtendsKeyword | SyntaxKind.FalseKeyword | SyntaxKind.FinallyKeyword | SyntaxKind.ForKeyword | SyntaxKind.FromKeyword | SyntaxKind.FunctionKeyword | SyntaxKind.GetKeyword | SyntaxKind.IfKeyword | SyntaxKind.ImplementsKeyword | SyntaxKind.ImportKeyword | SyntaxKind.InKeyword | SyntaxKind.InferKeyword | SyntaxKind.InstanceOfKeyword | SyntaxKind.InterfaceKeyword | SyntaxKind.IsKeyword | SyntaxKind.KeyOfKeyword | SyntaxKind.LetKeyword | SyntaxKind.ModuleKeyword | SyntaxKind.NamespaceKeyword | SyntaxKind.NeverKeyword | SyntaxKind.NewKeyword | SyntaxKind.NullKeyword | SyntaxKind.NumberKeyword | SyntaxKind.ObjectKeyword | SyntaxKind.PackageKeyword | SyntaxKind.PrivateKeyword | SyntaxKind.ProtectedKeyword | SyntaxKind.PublicKeyword | SyntaxKind.ReadonlyKeyword | SyntaxKind.RequireKeyword | SyntaxKind.GlobalKeyword | SyntaxKind.ReturnKeyword | SyntaxKind.SetKeyword | SyntaxKind.StaticKeyword | SyntaxKind.StringKeyword | SyntaxKind.SuperKeyword | SyntaxKind.SwitchKeyword | SyntaxKind.SymbolKeyword | SyntaxKind.ThisKeyword | SyntaxKind.ThrowKeyword | SyntaxKind.TrueKeyword | SyntaxKind.TryKeyword | SyntaxKind.TypeKeyword | SyntaxKind.TypeOfKeyword | SyntaxKind.UndefinedKeyword | SyntaxKind.UniqueKeyword | SyntaxKind.UnknownKeyword | SyntaxKind.VarKeyword | SyntaxKind.VoidKeyword | SyntaxKind.WhileKeyword | SyntaxKind.WithKeyword | SyntaxKind.YieldKeyword | SyntaxKind.AsyncKeyword | SyntaxKind.AwaitKeyword | SyntaxKind.OfKeyword;
     type JsxTokenSyntaxKind = SyntaxKind.LessThanSlashToken | SyntaxKind.EndOfFileToken | SyntaxKind.ConflictMarkerTrivia | SyntaxKind.JsxText | SyntaxKind.JsxTextAllWhiteSpaces | SyntaxKind.OpenBraceToken | SyntaxKind.LessThanToken;
     enum SyntaxKind {
@@ -135,281 +135,283 @@ declare namespace ts {
         QuestionToken = 56,
         ColonToken = 57,
         AtToken = 58,
-        EqualsToken = 59,
-        PlusEqualsToken = 60,
-        MinusEqualsToken = 61,
-        AsteriskEqualsToken = 62,
-        AsteriskAsteriskEqualsToken = 63,
-        SlashEqualsToken = 64,
-        PercentEqualsToken = 65,
-        LessThanLessThanEqualsToken = 66,
-        GreaterThanGreaterThanEqualsToken = 67,
-        GreaterThanGreaterThanGreaterThanEqualsToken = 68,
-        AmpersandEqualsToken = 69,
-        BarEqualsToken = 70,
-        CaretEqualsToken = 71,
-        Identifier = 72,
-        BreakKeyword = 73,
-        CaseKeyword = 74,
-        CatchKeyword = 75,
-        ClassKeyword = 76,
-        ConstKeyword = 77,
-        ContinueKeyword = 78,
-        DebuggerKeyword = 79,
-        DefaultKeyword = 80,
-        DeleteKeyword = 81,
-        DoKeyword = 82,
-        ElseKeyword = 83,
-        EnumKeyword = 84,
-        ExportKeyword = 85,
-        ExtendsKeyword = 86,
-        FalseKeyword = 87,
-        FinallyKeyword = 88,
-        ForKeyword = 89,
-        FunctionKeyword = 90,
-        IfKeyword = 91,
-        ImportKeyword = 92,
-        InKeyword = 93,
-        InstanceOfKeyword = 94,
-        NewKeyword = 95,
-        NullKeyword = 96,
-        ReturnKeyword = 97,
-        SuperKeyword = 98,
-        SwitchKeyword = 99,
-        ThisKeyword = 100,
-        ThrowKeyword = 101,
-        TrueKeyword = 102,
-        TryKeyword = 103,
-        TypeOfKeyword = 104,
-        VarKeyword = 105,
-        VoidKeyword = 106,
-        WhileKeyword = 107,
-        WithKeyword = 108,
-        ImplementsKeyword = 109,
-        InterfaceKeyword = 110,
-        LetKeyword = 111,
-        PackageKeyword = 112,
-        PrivateKeyword = 113,
-        ProtectedKeyword = 114,
-        PublicKeyword = 115,
-        StaticKeyword = 116,
-        YieldKeyword = 117,
-        AbstractKeyword = 118,
-        AsKeyword = 119,
-        AnyKeyword = 120,
-        AsyncKeyword = 121,
-        AwaitKeyword = 122,
-        BooleanKeyword = 123,
-        ConstructorKeyword = 124,
-        DeclareKeyword = 125,
-        GetKeyword = 126,
-        InferKeyword = 127,
-        IsKeyword = 128,
-        KeyOfKeyword = 129,
-        ModuleKeyword = 130,
-        NamespaceKeyword = 131,
-        NeverKeyword = 132,
-        ReadonlyKeyword = 133,
-        RequireKeyword = 134,
-        NumberKeyword = 135,
-        ObjectKeyword = 136,
-        SetKeyword = 137,
-        StringKeyword = 138,
-        SymbolKeyword = 139,
-        TypeKeyword = 140,
-        UndefinedKeyword = 141,
-        UniqueKeyword = 142,
-        UnknownKeyword = 143,
-        FromKeyword = 144,
-        GlobalKeyword = 145,
-        BigIntKeyword = 146,
-        OfKeyword = 147,
-        QualifiedName = 148,
-        ComputedPropertyName = 149,
-        TypeParameter = 150,
-        Parameter = 151,
-        Decorator = 152,
-        PropertySignature = 153,
-        PropertyDeclaration = 154,
-        MethodSignature = 155,
-        MethodDeclaration = 156,
-        Constructor = 157,
-        GetAccessor = 158,
-        SetAccessor = 159,
-        CallSignature = 160,
-        ConstructSignature = 161,
-        IndexSignature = 162,
-        TypePredicate = 163,
-        TypeReference = 164,
-        FunctionType = 165,
-        ConstructorType = 166,
-        TypeQuery = 167,
-        TypeLiteral = 168,
-        ArrayType = 169,
-        TupleType = 170,
-        OptionalType = 171,
-        RestType = 172,
-        UnionType = 173,
-        IntersectionType = 174,
-        ConditionalType = 175,
-        InferType = 176,
-        ParenthesizedType = 177,
-        ThisType = 178,
-        TypeOperator = 179,
-        IndexedAccessType = 180,
-        MappedType = 181,
-        LiteralType = 182,
-        ImportType = 183,
-        ObjectBindingPattern = 184,
-        ArrayBindingPattern = 185,
-        BindingElement = 186,
-        ArrayLiteralExpression = 187,
-        ObjectLiteralExpression = 188,
-        PropertyAccessExpression = 189,
-        ElementAccessExpression = 190,
-        CallExpression = 191,
-        NewExpression = 192,
-        TaggedTemplateExpression = 193,
-        TypeAssertionExpression = 194,
-        ParenthesizedExpression = 195,
-        FunctionExpression = 196,
-        ArrowFunction = 197,
-        DeleteExpression = 198,
-        TypeOfExpression = 199,
-        VoidExpression = 200,
-        AwaitExpression = 201,
-        PrefixUnaryExpression = 202,
-        PostfixUnaryExpression = 203,
-        BinaryExpression = 204,
-        ConditionalExpression = 205,
-        TemplateExpression = 206,
-        YieldExpression = 207,
-        SpreadElement = 208,
-        ClassExpression = 209,
-        OmittedExpression = 210,
-        ExpressionWithTypeArguments = 211,
-        AsExpression = 212,
-        NonNullExpression = 213,
-        MetaProperty = 214,
-        SyntheticExpression = 215,
-        TemplateSpan = 216,
-        SemicolonClassElement = 217,
-        Block = 218,
-        VariableStatement = 219,
-        EmptyStatement = 220,
-        ExpressionStatement = 221,
-        IfStatement = 222,
-        DoStatement = 223,
-        WhileStatement = 224,
-        ForStatement = 225,
-        ForInStatement = 226,
-        ForOfStatement = 227,
-        ContinueStatement = 228,
-        BreakStatement = 229,
-        ReturnStatement = 230,
-        WithStatement = 231,
-        SwitchStatement = 232,
-        LabeledStatement = 233,
-        ThrowStatement = 234,
-        TryStatement = 235,
-        DebuggerStatement = 236,
-        VariableDeclaration = 237,
-        VariableDeclarationList = 238,
-        FunctionDeclaration = 239,
-        ClassDeclaration = 240,
-        InterfaceDeclaration = 241,
-        TypeAliasDeclaration = 242,
-        EnumDeclaration = 243,
-        ModuleDeclaration = 244,
-        ModuleBlock = 245,
-        CaseBlock = 246,
-        NamespaceExportDeclaration = 247,
-        ImportEqualsDeclaration = 248,
-        ImportDeclaration = 249,
-        ImportClause = 250,
-        NamespaceImport = 251,
-        NamedImports = 252,
-        ImportSpecifier = 253,
-        ExportAssignment = 254,
-        ExportDeclaration = 255,
-        NamedExports = 256,
-        ExportSpecifier = 257,
-        MissingDeclaration = 258,
-        ExternalModuleReference = 259,
-        JsxElement = 260,
-        JsxSelfClosingElement = 261,
-        JsxOpeningElement = 262,
-        JsxClosingElement = 263,
-        JsxFragment = 264,
-        JsxOpeningFragment = 265,
-        JsxClosingFragment = 266,
-        JsxAttribute = 267,
-        JsxAttributes = 268,
-        JsxSpreadAttribute = 269,
-        JsxExpression = 270,
-        CaseClause = 271,
-        DefaultClause = 272,
-        HeritageClause = 273,
-        CatchClause = 274,
-        PropertyAssignment = 275,
-        ShorthandPropertyAssignment = 276,
-        SpreadAssignment = 277,
-        EnumMember = 278,
-        UnparsedPrologue = 279,
-        UnparsedPrepend = 280,
-        UnparsedText = 281,
-        UnparsedInternalText = 282,
-        UnparsedSyntheticReference = 283,
-        SourceFile = 284,
-        Bundle = 285,
-        UnparsedSource = 286,
-        InputFiles = 287,
-        JSDocTypeExpression = 288,
-        JSDocAllType = 289,
-        JSDocUnknownType = 290,
-        JSDocNullableType = 291,
-        JSDocNonNullableType = 292,
-        JSDocOptionalType = 293,
-        JSDocFunctionType = 294,
-        JSDocVariadicType = 295,
-        JSDocComment = 296,
-        JSDocTypeLiteral = 297,
-        JSDocSignature = 298,
-        JSDocTag = 299,
-        JSDocAugmentsTag = 300,
-        JSDocClassTag = 301,
-        JSDocCallbackTag = 302,
-        JSDocEnumTag = 303,
-        JSDocParameterTag = 304,
-        JSDocReturnTag = 305,
-        JSDocThisTag = 306,
-        JSDocTypeTag = 307,
-        JSDocTemplateTag = 308,
-        JSDocTypedefTag = 309,
-        JSDocPropertyTag = 310,
-        SyntaxList = 311,
-        NotEmittedStatement = 312,
-        PartiallyEmittedExpression = 313,
-        CommaListExpression = 314,
-        MergeDeclarationMarker = 315,
-        EndOfDeclarationMarker = 316,
-        Count = 317,
-        FirstAssignment = 59,
-        LastAssignment = 71,
-        FirstCompoundAssignment = 60,
-        LastCompoundAssignment = 71,
-        FirstReservedWord = 73,
-        LastReservedWord = 108,
-        FirstKeyword = 73,
-        LastKeyword = 147,
-        FirstFutureReservedWord = 109,
-        LastFutureReservedWord = 117,
-        FirstTypeNode = 163,
-        LastTypeNode = 183,
+        /** Only the JSDoc scanner produces BacktickToken. The normal scanner produces NoSubstitutionTemplateLiteral and related kinds. */
+        BacktickToken = 59,
+        EqualsToken = 60,
+        PlusEqualsToken = 61,
+        MinusEqualsToken = 62,
+        AsteriskEqualsToken = 63,
+        AsteriskAsteriskEqualsToken = 64,
+        SlashEqualsToken = 65,
+        PercentEqualsToken = 66,
+        LessThanLessThanEqualsToken = 67,
+        GreaterThanGreaterThanEqualsToken = 68,
+        GreaterThanGreaterThanGreaterThanEqualsToken = 69,
+        AmpersandEqualsToken = 70,
+        BarEqualsToken = 71,
+        CaretEqualsToken = 72,
+        Identifier = 73,
+        BreakKeyword = 74,
+        CaseKeyword = 75,
+        CatchKeyword = 76,
+        ClassKeyword = 77,
+        ConstKeyword = 78,
+        ContinueKeyword = 79,
+        DebuggerKeyword = 80,
+        DefaultKeyword = 81,
+        DeleteKeyword = 82,
+        DoKeyword = 83,
+        ElseKeyword = 84,
+        EnumKeyword = 85,
+        ExportKeyword = 86,
+        ExtendsKeyword = 87,
+        FalseKeyword = 88,
+        FinallyKeyword = 89,
+        ForKeyword = 90,
+        FunctionKeyword = 91,
+        IfKeyword = 92,
+        ImportKeyword = 93,
+        InKeyword = 94,
+        InstanceOfKeyword = 95,
+        NewKeyword = 96,
+        NullKeyword = 97,
+        ReturnKeyword = 98,
+        SuperKeyword = 99,
+        SwitchKeyword = 100,
+        ThisKeyword = 101,
+        ThrowKeyword = 102,
+        TrueKeyword = 103,
+        TryKeyword = 104,
+        TypeOfKeyword = 105,
+        VarKeyword = 106,
+        VoidKeyword = 107,
+        WhileKeyword = 108,
+        WithKeyword = 109,
+        ImplementsKeyword = 110,
+        InterfaceKeyword = 111,
+        LetKeyword = 112,
+        PackageKeyword = 113,
+        PrivateKeyword = 114,
+        ProtectedKeyword = 115,
+        PublicKeyword = 116,
+        StaticKeyword = 117,
+        YieldKeyword = 118,
+        AbstractKeyword = 119,
+        AsKeyword = 120,
+        AnyKeyword = 121,
+        AsyncKeyword = 122,
+        AwaitKeyword = 123,
+        BooleanKeyword = 124,
+        ConstructorKeyword = 125,
+        DeclareKeyword = 126,
+        GetKeyword = 127,
+        InferKeyword = 128,
+        IsKeyword = 129,
+        KeyOfKeyword = 130,
+        ModuleKeyword = 131,
+        NamespaceKeyword = 132,
+        NeverKeyword = 133,
+        ReadonlyKeyword = 134,
+        RequireKeyword = 135,
+        NumberKeyword = 136,
+        ObjectKeyword = 137,
+        SetKeyword = 138,
+        StringKeyword = 139,
+        SymbolKeyword = 140,
+        TypeKeyword = 141,
+        UndefinedKeyword = 142,
+        UniqueKeyword = 143,
+        UnknownKeyword = 144,
+        FromKeyword = 145,
+        GlobalKeyword = 146,
+        BigIntKeyword = 147,
+        OfKeyword = 148,
+        QualifiedName = 149,
+        ComputedPropertyName = 150,
+        TypeParameter = 151,
+        Parameter = 152,
+        Decorator = 153,
+        PropertySignature = 154,
+        PropertyDeclaration = 155,
+        MethodSignature = 156,
+        MethodDeclaration = 157,
+        Constructor = 158,
+        GetAccessor = 159,
+        SetAccessor = 160,
+        CallSignature = 161,
+        ConstructSignature = 162,
+        IndexSignature = 163,
+        TypePredicate = 164,
+        TypeReference = 165,
+        FunctionType = 166,
+        ConstructorType = 167,
+        TypeQuery = 168,
+        TypeLiteral = 169,
+        ArrayType = 170,
+        TupleType = 171,
+        OptionalType = 172,
+        RestType = 173,
+        UnionType = 174,
+        IntersectionType = 175,
+        ConditionalType = 176,
+        InferType = 177,
+        ParenthesizedType = 178,
+        ThisType = 179,
+        TypeOperator = 180,
+        IndexedAccessType = 181,
+        MappedType = 182,
+        LiteralType = 183,
+        ImportType = 184,
+        ObjectBindingPattern = 185,
+        ArrayBindingPattern = 186,
+        BindingElement = 187,
+        ArrayLiteralExpression = 188,
+        ObjectLiteralExpression = 189,
+        PropertyAccessExpression = 190,
+        ElementAccessExpression = 191,
+        CallExpression = 192,
+        NewExpression = 193,
+        TaggedTemplateExpression = 194,
+        TypeAssertionExpression = 195,
+        ParenthesizedExpression = 196,
+        FunctionExpression = 197,
+        ArrowFunction = 198,
+        DeleteExpression = 199,
+        TypeOfExpression = 200,
+        VoidExpression = 201,
+        AwaitExpression = 202,
+        PrefixUnaryExpression = 203,
+        PostfixUnaryExpression = 204,
+        BinaryExpression = 205,
+        ConditionalExpression = 206,
+        TemplateExpression = 207,
+        YieldExpression = 208,
+        SpreadElement = 209,
+        ClassExpression = 210,
+        OmittedExpression = 211,
+        ExpressionWithTypeArguments = 212,
+        AsExpression = 213,
+        NonNullExpression = 214,
+        MetaProperty = 215,
+        SyntheticExpression = 216,
+        TemplateSpan = 217,
+        SemicolonClassElement = 218,
+        Block = 219,
+        VariableStatement = 220,
+        EmptyStatement = 221,
+        ExpressionStatement = 222,
+        IfStatement = 223,
+        DoStatement = 224,
+        WhileStatement = 225,
+        ForStatement = 226,
+        ForInStatement = 227,
+        ForOfStatement = 228,
+        ContinueStatement = 229,
+        BreakStatement = 230,
+        ReturnStatement = 231,
+        WithStatement = 232,
+        SwitchStatement = 233,
+        LabeledStatement = 234,
+        ThrowStatement = 235,
+        TryStatement = 236,
+        DebuggerStatement = 237,
+        VariableDeclaration = 238,
+        VariableDeclarationList = 239,
+        FunctionDeclaration = 240,
+        ClassDeclaration = 241,
+        InterfaceDeclaration = 242,
+        TypeAliasDeclaration = 243,
+        EnumDeclaration = 244,
+        ModuleDeclaration = 245,
+        ModuleBlock = 246,
+        CaseBlock = 247,
+        NamespaceExportDeclaration = 248,
+        ImportEqualsDeclaration = 249,
+        ImportDeclaration = 250,
+        ImportClause = 251,
+        NamespaceImport = 252,
+        NamedImports = 253,
+        ImportSpecifier = 254,
+        ExportAssignment = 255,
+        ExportDeclaration = 256,
+        NamedExports = 257,
+        ExportSpecifier = 258,
+        MissingDeclaration = 259,
+        ExternalModuleReference = 260,
+        JsxElement = 261,
+        JsxSelfClosingElement = 262,
+        JsxOpeningElement = 263,
+        JsxClosingElement = 264,
+        JsxFragment = 265,
+        JsxOpeningFragment = 266,
+        JsxClosingFragment = 267,
+        JsxAttribute = 268,
+        JsxAttributes = 269,
+        JsxSpreadAttribute = 270,
+        JsxExpression = 271,
+        CaseClause = 272,
+        DefaultClause = 273,
+        HeritageClause = 274,
+        CatchClause = 275,
+        PropertyAssignment = 276,
+        ShorthandPropertyAssignment = 277,
+        SpreadAssignment = 278,
+        EnumMember = 279,
+        UnparsedPrologue = 280,
+        UnparsedPrepend = 281,
+        UnparsedText = 282,
+        UnparsedInternalText = 283,
+        UnparsedSyntheticReference = 284,
+        SourceFile = 285,
+        Bundle = 286,
+        UnparsedSource = 287,
+        InputFiles = 288,
+        JSDocTypeExpression = 289,
+        JSDocAllType = 290,
+        JSDocUnknownType = 291,
+        JSDocNullableType = 292,
+        JSDocNonNullableType = 293,
+        JSDocOptionalType = 294,
+        JSDocFunctionType = 295,
+        JSDocVariadicType = 296,
+        JSDocComment = 297,
+        JSDocTypeLiteral = 298,
+        JSDocSignature = 299,
+        JSDocTag = 300,
+        JSDocAugmentsTag = 301,
+        JSDocClassTag = 302,
+        JSDocCallbackTag = 303,
+        JSDocEnumTag = 304,
+        JSDocParameterTag = 305,
+        JSDocReturnTag = 306,
+        JSDocThisTag = 307,
+        JSDocTypeTag = 308,
+        JSDocTemplateTag = 309,
+        JSDocTypedefTag = 310,
+        JSDocPropertyTag = 311,
+        SyntaxList = 312,
+        NotEmittedStatement = 313,
+        PartiallyEmittedExpression = 314,
+        CommaListExpression = 315,
+        MergeDeclarationMarker = 316,
+        EndOfDeclarationMarker = 317,
+        Count = 318,
+        FirstAssignment = 60,
+        LastAssignment = 72,
+        FirstCompoundAssignment = 61,
+        LastCompoundAssignment = 72,
+        FirstReservedWord = 74,
+        LastReservedWord = 109,
+        FirstKeyword = 74,
+        LastKeyword = 148,
+        FirstFutureReservedWord = 110,
+        LastFutureReservedWord = 118,
+        FirstTypeNode = 164,
+        LastTypeNode = 184,
         FirstPunctuation = 18,
-        LastPunctuation = 71,
+        LastPunctuation = 72,
         FirstToken = 0,
-        LastToken = 147,
+        LastToken = 148,
         FirstTriviaToken = 2,
         LastTriviaToken = 7,
         FirstLiteralToken = 8,
@@ -417,12 +419,12 @@ declare namespace ts {
         FirstTemplateToken = 14,
         LastTemplateToken = 17,
         FirstBinaryOperator = 28,
-        LastBinaryOperator = 71,
-        FirstNode = 148,
-        FirstJSDocNode = 288,
-        LastJSDocNode = 310,
-        FirstJSDocTagNode = 299,
-        LastJSDocTagNode = 310,
+        LastBinaryOperator = 72,
+        FirstNode = 149,
+        FirstJSDocNode = 289,
+        LastJSDocNode = 311,
+        FirstJSDocTagNode = 300,
+        LastJSDocTagNode = 311,
     }
     enum NodeFlags {
         None = 0,
@@ -626,7 +628,7 @@ declare namespace ts {
         initializer?: Expression;
     }
     interface ObjectLiteralElement extends NamedDeclaration {
-        _objectLiteralBrandBrand: any;
+        _objectLiteralBrand: any;
         name?: PropertyName;
     }
     /** Unlike ObjectLiteralElement, excludes JSXAttribute and JSXSpreadAttribute. */
@@ -1601,7 +1603,7 @@ declare namespace ts {
     }
     interface JSDocTypeTag extends JSDocTag {
         kind: SyntaxKind.JSDocTypeTag;
-        typeExpression?: JSDocTypeExpression;
+        typeExpression: JSDocTypeExpression;
     }
     interface JSDocTypedefTag extends JSDocTag, NamedDeclaration {
         parent: JSDoc;
@@ -1877,13 +1879,18 @@ declare namespace ts {
         sourceFile: SourceFile;
         references?: ReadonlyArray<ResolvedProjectReference | undefined>;
     }
+    type CustomTransformerFactory = (context: TransformationContext) => CustomTransformer;
+    interface CustomTransformer {
+        transformSourceFile(node: SourceFile): SourceFile;
+        transformBundle(node: Bundle): Bundle;
+    }
     interface CustomTransformers {
         /** Custom transformers to evaluate before built-in .js transformations. */
-        before?: TransformerFactory<SourceFile>[];
+        before?: (TransformerFactory<SourceFile> | CustomTransformerFactory)[];
         /** Custom transformers to evaluate after built-in .js transformations. */
-        after?: TransformerFactory<SourceFile>[];
+        after?: (TransformerFactory<SourceFile> | CustomTransformerFactory)[];
         /** Custom transformers to evaluate after built-in .d.ts transformations. */
-        afterDeclarations?: TransformerFactory<Bundle | SourceFile>[];
+        afterDeclarations?: (TransformerFactory<Bundle | SourceFile> | CustomTransformerFactory)[];
     }
     interface SourceMapSpan {
         /** Line number in the .js file. */
@@ -1962,6 +1969,7 @@ declare namespace ts {
          */
         getExportSymbolOfSymbol(symbol: Symbol): Symbol;
         getPropertySymbolOfDestructuringAssignment(location: Identifier): Symbol | undefined;
+        getTypeOfAssignmentPattern(pattern: AssignmentPattern): Type;
         getTypeAtLocation(node: Node): Type;
         getTypeFromTypeNode(node: TypeNode): Type;
         signatureToString(signature: Signature, enclosingDeclaration?: Node, flags?: TypeFormatFlags, kind?: SignatureKind): string;
@@ -2359,7 +2367,8 @@ declare namespace ts {
         objectType: Type;
         indexType: Type;
         constraint?: Type;
-        simplified?: Type;
+        simplifiedForReading?: Type;
+        simplifiedForWriting?: Type;
     }
     type TypeVariable = TypeParameter | IndexedAccessType;
     interface IndexType extends InstantiableType {
@@ -2382,8 +2391,8 @@ declare namespace ts {
         root: ConditionalRoot;
         checkType: Type;
         extendsType: Type;
-        trueType: Type;
-        falseType: Type;
+        resolvedTrueType: Type;
+        resolvedFalseType: Type;
     }
     interface SubstitutionType extends InstantiableType {
         typeVariable: TypeVariable;
@@ -2410,12 +2419,13 @@ declare namespace ts {
     enum InferencePriority {
         NakedTypeVariable = 1,
         HomomorphicMappedType = 2,
-        MappedTypeConstraint = 4,
-        ReturnType = 8,
-        LiteralKeyof = 16,
-        NoConstraints = 32,
-        AlwaysStrict = 64,
-        PriorityImpliesCombination = 28
+        PartialHomomorphicMappedType = 4,
+        MappedTypeConstraint = 8,
+        ReturnType = 16,
+        LiteralKeyof = 32,
+        NoConstraints = 64,
+        AlwaysStrict = 128,
+        PriorityImpliesCombination = 56
     }
     /** @deprecated Use FileExtensionInfo instead. */
     type JsFileExtensionInfo = FileExtensionInfo;
@@ -2489,6 +2499,7 @@ declare namespace ts {
     interface CompilerOptions {
         allowJs?: boolean;
         allowSyntheticDefaultImports?: boolean;
+        allowUmdGlobalAccess?: boolean;
         allowUnreachableCode?: boolean;
         allowUnusedLabels?: boolean;
         alwaysStrict?: boolean;
@@ -2621,9 +2632,10 @@ declare namespace ts {
         ES2017 = 4,
         ES2018 = 5,
         ES2019 = 6,
-        ESNext = 7,
+        ES2020 = 7,
+        ESNext = 8,
         JSON = 100,
-        Latest = 7
+        Latest = 8
     }
     enum LanguageVariant {
         Standard = 0,
@@ -2756,6 +2768,7 @@ declare namespace ts {
         resolveTypeReferenceDirectives?(typeReferenceDirectiveNames: string[], containingFile: string, redirectedReference?: ResolvedProjectReference): (ResolvedTypeReferenceDirective | undefined)[];
         getEnvironmentVariable?(name: string): string | undefined;
         createHash?(data: string): string;
+        getParsedCommandLine?(fileName: string): ParsedCommandLine | undefined;
     }
     interface SourceMapRange extends TextRange {
         source?: SourceMapSource;
@@ -3159,7 +3172,7 @@ declare namespace ts {
         reScanJsxToken(): JsxTokenSyntaxKind;
         reScanLessThanToken(): SyntaxKind;
         scanJsxToken(): JsxTokenSyntaxKind;
-        scanJSDocToken(): JsDocSyntaxKind;
+        scanJsDocToken(): JSDocSyntaxKind;
         scan(): SyntaxKind;
         getText(): string;
         setText(text: string | undefined, start?: number, length?: number): void;
@@ -3627,7 +3640,7 @@ declare namespace ts {
     /**
      * Reads the config file, reports errors if any and exits if the config file cannot be found
      */
-    function getParsedCommandLineOfConfigFile(configFileName: string, optionsToExtend: CompilerOptions, host: ParseConfigFileHost): ParsedCommandLine | undefined;
+    function getParsedCommandLineOfConfigFile(configFileName: string, optionsToExtend: CompilerOptions, host: ParseConfigFileHost, extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine | undefined;
     /**
      * Read tsconfig.json file
      * @param fileName The path to the config file
@@ -3661,7 +3674,7 @@ declare namespace ts {
      * @param basePath A root directory to resolve relative path entries in the config
      *    file to. e.g. outDir
      */
-    function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>): ParsedCommandLine;
+    function parseJsonConfigFileContent(json: any, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>, extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine;
     /**
      * Parse the contents of a config file (tsconfig.json).
      * @param jsonNode The contents of the config file to parse
@@ -3669,7 +3682,20 @@ declare namespace ts {
      * @param basePath A root directory to resolve relative path entries in the config
      *    file to. e.g. outDir
      */
-    function parseJsonSourceFileConfigFileContent(sourceFile: TsConfigSourceFile, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>): ParsedCommandLine;
+    function parseJsonSourceFileConfigFileContent(sourceFile: TsConfigSourceFile, host: ParseConfigHost, basePath: string, existingOptions?: CompilerOptions, configFileName?: string, resolutionStack?: Path[], extraFileExtensions?: ReadonlyArray<FileExtensionInfo>, extendedConfigCache?: Map<ExtendedConfigCacheEntry>): ParsedCommandLine;
+    interface ParsedTsconfig {
+        raw: any;
+        options?: CompilerOptions;
+        typeAcquisition?: TypeAcquisition;
+        /**
+         * Note that the case of the config path has not yet been normalized, as no files have been imported into the project yet
+         */
+        extendedConfigPath?: string;
+    }
+    interface ExtendedConfigCacheEntry {
+        extendedResult: TsConfigSourceFile;
+        extendedConfig: ParsedTsconfig | undefined;
+    }
     function convertCompilerOptionsFromJson(jsonOptions: any, basePath: string, configFileName?: string): {
         options: CompilerOptions;
         errors: Diagnostic[];
@@ -3714,7 +3740,7 @@ declare namespace ts {
         get(directory: string): ResolvedModuleWithFailedLookupLocations | undefined;
         set(directory: string, result: ResolvedModuleWithFailedLookupLocations): void;
     }
-    function createModuleResolutionCache(currentDirectory: string, getCanonicalFileName: (s: string) => string): ModuleResolutionCache;
+    function createModuleResolutionCache(currentDirectory: string, getCanonicalFileName: (s: string) => string, options?: CompilerOptions): ModuleResolutionCache;
     function resolveModuleNameFromCache(moduleName: string, containingFile: string, cache: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations | undefined;
     function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations;
     function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations;
@@ -3837,7 +3863,7 @@ declare namespace ts {
     function updateArrayLiteral(node: ArrayLiteralExpression, elements: ReadonlyArray<Expression>): ArrayLiteralExpression;
     function createObjectLiteral(properties?: ReadonlyArray<ObjectLiteralElementLike>, multiLine?: boolean): ObjectLiteralExpression;
     function updateObjectLiteral(node: ObjectLiteralExpression, properties: ReadonlyArray<ObjectLiteralElementLike>): ObjectLiteralExpression;
-    function createPropertyAccess(expression: Expression, name: string | Identifier | undefined): PropertyAccessExpression;
+    function createPropertyAccess(expression: Expression, name: string | Identifier): PropertyAccessExpression;
     function updatePropertyAccess(node: PropertyAccessExpression, expression: Expression, name: Identifier): PropertyAccessExpression;
     function createElementAccess(expression: Expression, index: number | Expression): ElementAccessExpression;
     function updateElementAccess(node: ElementAccessExpression, expression: Expression, argumentExpression: Expression): ElementAccessExpression;
@@ -4052,7 +4078,7 @@ declare namespace ts {
     function createInputFiles(javascriptText: string, declarationText: string): InputFiles;
     function createInputFiles(readFileText: (path: string) => string | undefined, javascriptPath: string, javascriptMapPath: string | undefined, declarationPath: string, declarationMapPath: string | undefined, buildInfoPath: string | undefined): InputFiles;
     function createInputFiles(javascriptText: string, declarationText: string, javascriptMapPath: string | undefined, javascriptMapText: string | undefined, declarationMapPath: string | undefined, declarationMapText: string | undefined): InputFiles;
-    function updateBundle(node: Bundle, sourceFiles: ReadonlyArray<SourceFile>, prepends?: ReadonlyArray<UnparsedSource>): Bundle;
+    function updateBundle(node: Bundle, sourceFiles: ReadonlyArray<SourceFile>, prepends?: ReadonlyArray<UnparsedSource | InputFiles>): Bundle;
     function createImmediatelyInvokedFunctionExpression(statements: ReadonlyArray<Statement>): CallExpression;
     function createImmediatelyInvokedFunctionExpression(statements: ReadonlyArray<Statement>, param: ParameterDeclaration, paramValue: Expression): CallExpression;
     function createImmediatelyInvokedArrowFunction(statements: ReadonlyArray<Statement>): CallExpression;
@@ -4540,13 +4566,12 @@ declare namespace ts.server {
     type ActionSet = "action::set";
     type ActionInvalidate = "action::invalidate";
     type ActionPackageInstalled = "action::packageInstalled";
-    type ActionValueInspected = "action::valueInspected";
     type EventTypesRegistry = "event::typesRegistry";
     type EventBeginInstallTypes = "event::beginInstallTypes";
     type EventEndInstallTypes = "event::endInstallTypes";
     type EventInitializationFailed = "event::initializationFailed";
     interface TypingInstallerResponse {
-        readonly kind: ActionSet | ActionInvalidate | EventTypesRegistry | ActionPackageInstalled | ActionValueInspected | EventBeginInstallTypes | EventEndInstallTypes | EventInitializationFailed;
+        readonly kind: ActionSet | ActionInvalidate | EventTypesRegistry | ActionPackageInstalled | EventBeginInstallTypes | EventEndInstallTypes | EventInitializationFailed;
     }
     interface TypingInstallerRequestWithProjectName {
         readonly projectName: string;
@@ -4785,6 +4810,7 @@ declare namespace ts {
         getSignatureHelpItems(fileName: string, position: number, options: SignatureHelpItemsOptions | undefined): SignatureHelpItems | undefined;
         getRenameInfo(fileName: string, position: number, options?: RenameInfoOptions): RenameInfo;
         findRenameLocations(fileName: string, position: number, findInStrings: boolean, findInComments: boolean, providePrefixAndSuffixTextForRename?: boolean): ReadonlyArray<RenameLocation> | undefined;
+        getSmartSelectionRange(fileName: string, position: number): SelectionRange;
         getDefinitionAtPosition(fileName: string, position: number): ReadonlyArray<DefinitionInfo> | undefined;
         getDefinitionAndBoundSpan(fileName: string, position: number): DefinitionInfoAndBoundSpan | undefined;
         getTypeDefinitionAtPosition(fileName: string, position: number): ReadonlyArray<DefinitionInfo> | undefined;
@@ -4979,16 +5005,9 @@ declare namespace ts {
         changes: ReadonlyArray<FileTextChanges>;
         commands?: ReadonlyArray<CodeActionCommand>;
     }
-    type CodeActionCommand = InstallPackageAction | GenerateTypesAction;
+    type CodeActionCommand = InstallPackageAction;
     interface InstallPackageAction {
     }
-    interface GenerateTypesAction extends GenerateTypesOptions {
-    }
-    interface GenerateTypesOptions {
-        readonly file: string;
-        readonly fileToGenerateTypesFor: string;
-        readonly outputFileName: string;
-    }
     /**
      * A set of one or more available refactoring actions, grouped under a parent refactoring.
      */
@@ -5236,6 +5255,10 @@ declare namespace ts {
         displayParts: SymbolDisplayPart[];
         isOptional: boolean;
     }
+    interface SelectionRange {
+        textSpan: TextSpan;
+        parent?: SelectionRange;
+    }
     /**
      * Represents a single signature to show in signature help.
      * The id is used for subsequent calls into the language service to ask questions about the
@@ -5612,10 +5635,6 @@ declare namespace ts {
     function transpileModule(input: string, transpileOptions: TranspileOptions): TranspileOutput;
     function transpile(input: string, compilerOptions?: CompilerOptions, fileName?: string, diagnostics?: Diagnostic[], moduleName?: string): string;
 }
-declare namespace ts {
-    function generateTypesForModule(name: string, moduleValue: unknown, formatSettings: FormatCodeSettings): string;
-    function generateTypesForGlobal(name: string, globalValue: unknown, formatSettings: FormatCodeSettings): string;
-}
 declare namespace ts {
     /** The version of the language service API */
     const servicesVersion = "0.8";
diff --git a/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js b/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js
index da4767072f7c..56ae492c34c3 100644
--- a/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js
+++ b/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js
@@ -73,7 +73,7 @@ var ts;
 (function (ts) {
     // WARNING: The script `configureNightly.ts` uses a regexp to parse out these values.
     // If changing the text in this section, be sure to test `configureNightly` too.
-    ts.versionMajorMinor = "3.4";
+    ts.versionMajorMinor = "3.5";
     /** The version of the TypeScript compiler release */
     ts.version = ts.versionMajorMinor + ".3";
 })(ts || (ts = {}));
@@ -205,7 +205,7 @@ var ts;
                         entry.nextEntry.previousEntry = previousEntry;
                     }
                     // When the deleted entry was the last one, we need to
-                    // adust the lastEntry reference.
+                    // adjust the lastEntry reference.
                     if (this.lastEntry === entry) {
                         this.lastEntry = previousEntry;
                     }
@@ -315,7 +315,7 @@ var ts;
     ts.firstDefinedIterator = firstDefinedIterator;
     function zipWith(arrayA, arrayB, callback) {
         var result = [];
-        Debug.assertEqual(arrayA.length, arrayB.length);
+        ts.Debug.assertEqual(arrayA.length, arrayB.length);
         for (var i = 0; i < arrayA.length; i++) {
             result.push(callback(arrayA[i], arrayB[i], i));
         }
@@ -323,7 +323,7 @@ var ts;
     }
     ts.zipWith = zipWith;
     function zipToIterator(arrayA, arrayB) {
-        Debug.assertEqual(arrayA.length, arrayB.length);
+        ts.Debug.assertEqual(arrayA.length, arrayB.length);
         var i = 0;
         return {
             next: function () {
@@ -337,7 +337,7 @@ var ts;
     }
     ts.zipToIterator = zipToIterator;
     function zipToMap(keys, values) {
-        Debug.assert(keys.length === values.length);
+        ts.Debug.assert(keys.length === values.length);
         var map = createMap();
         for (var i = 0; i < keys.length; ++i) {
             map.set(keys[i], values[i]);
@@ -411,7 +411,7 @@ var ts;
                 return result;
             }
         }
-        return Debug.fail();
+        return ts.Debug.fail();
     }
     ts.findMap = findMap;
     function contains(array, value, equalityComparer) {
@@ -841,7 +841,7 @@ var ts;
                     continue;
                 case -1 /* LessThan */:
                     // If `array` is sorted, `next` should **never** be less than `last`.
-                    return Debug.fail("Array is unsorted.");
+                    return ts.Debug.fail("Array is unsorted.");
             }
             deduplicated.push(last = next);
         }
@@ -908,13 +908,13 @@ var ts;
         loopB: for (var offsetA = 0, offsetB = 0; offsetB < arrayB.length; offsetB++) {
             if (offsetB > 0) {
                 // Ensure `arrayB` is properly sorted.
-                Debug.assertGreaterThanOrEqual(comparer(arrayB[offsetB], arrayB[offsetB - 1]), 0 /* EqualTo */);
+                ts.Debug.assertGreaterThanOrEqual(comparer(arrayB[offsetB], arrayB[offsetB - 1]), 0 /* EqualTo */);
             }
             loopA: for (var startA = offsetA; offsetA < arrayA.length; offsetA++) {
                 if (offsetA > startA) {
                     // Ensure `arrayA` is properly sorted. We only need to perform this check if
                     // `offsetA` has changed since we entered the loop.
-                    Debug.assertGreaterThanOrEqual(comparer(arrayA[offsetA], arrayA[offsetA - 1]), 0 /* EqualTo */);
+                    ts.Debug.assertGreaterThanOrEqual(comparer(arrayA[offsetA], arrayA[offsetA - 1]), 0 /* EqualTo */);
                 }
                 switch (comparer(arrayB[offsetB], arrayA[offsetA])) {
                     case -1 /* LessThan */:
@@ -1084,7 +1084,7 @@ var ts;
     }
     ts.firstOrUndefined = firstOrUndefined;
     function first(array) {
-        Debug.assert(array.length !== 0);
+        ts.Debug.assert(array.length !== 0);
         return array[0];
     }
     ts.first = first;
@@ -1096,7 +1096,7 @@ var ts;
     }
     ts.lastOrUndefined = lastOrUndefined;
     function last(array) {
-        Debug.assert(array.length !== 0);
+        ts.Debug.assert(array.length !== 0);
         return array[array.length - 1];
     }
     ts.last = last;
@@ -1421,7 +1421,7 @@ var ts;
     function cast(value, test) {
         if (value !== undefined && test(value))
             return value;
-        return Debug.fail("Invalid cast. The supplied value " + value + " did not pass the test '" + Debug.getFunctionName(test) + "'.");
+        return ts.Debug.fail("Invalid cast. The supplied value " + value + " did not pass the test '" + ts.Debug.getFunctionName(test) + "'.");
     }
     ts.cast = cast;
     /** Does nothing. */
@@ -1458,38 +1458,13 @@ var ts;
         };
     }
     ts.memoize = memoize;
-    function chain(a, b, c, d, e) {
+    function compose(a, b, c, d, e) {
         if (e) {
             var args_2 = [];
             for (var i = 0; i < arguments.length; i++) {
                 args_2[i] = arguments[i];
             }
-            return function (t) { return compose.apply(void 0, map(args_2, function (f) { return f(t); })); };
-        }
-        else if (d) {
-            return function (t) { return compose(a(t), b(t), c(t), d(t)); };
-        }
-        else if (c) {
-            return function (t) { return compose(a(t), b(t), c(t)); };
-        }
-        else if (b) {
-            return function (t) { return compose(a(t), b(t)); };
-        }
-        else if (a) {
-            return function (t) { return compose(a(t)); };
-        }
-        else {
-            return function (_) { return function (u) { return u; }; };
-        }
-    }
-    ts.chain = chain;
-    function compose(a, b, c, d, e) {
-        if (e) {
-            var args_3 = [];
-            for (var i = 0; i < arguments.length; i++) {
-                args_3[i] = arguments[i];
-            }
-            return function (t) { return reduceLeft(args_3, function (u, f) { return f(u); }, t); };
+            return function (t) { return reduceLeft(args_2, function (u, f) { return f(u); }, t); };
         }
         else if (d) {
             return function (t) { return d(c(b(a(t)))); };
@@ -1515,92 +1490,6 @@ var ts;
         AssertionLevel[AssertionLevel["Aggressive"] = 2] = "Aggressive";
         AssertionLevel[AssertionLevel["VeryAggressive"] = 3] = "VeryAggressive";
     })(AssertionLevel = ts.AssertionLevel || (ts.AssertionLevel = {}));
-    var Debug;
-    (function (Debug) {
-        Debug.currentAssertionLevel = 0 /* None */;
-        Debug.isDebugging = false;
-        function shouldAssert(level) {
-            return Debug.currentAssertionLevel >= level;
-        }
-        Debug.shouldAssert = shouldAssert;
-        function assert(expression, message, verboseDebugInfo, stackCrawlMark) {
-            if (!expression) {
-                if (verboseDebugInfo) {
-                    message += "\r\nVerbose Debug Information: " + (typeof verboseDebugInfo === "string" ? verboseDebugInfo : verboseDebugInfo());
-                }
-                fail(message ? "False expression: " + message : "False expression.", stackCrawlMark || assert);
-            }
-        }
-        Debug.assert = assert;
-        function assertEqual(a, b, msg, msg2) {
-            if (a !== b) {
-                var message = msg ? msg2 ? msg + " " + msg2 : msg : "";
-                fail("Expected " + a + " === " + b + ". " + message);
-            }
-        }
-        Debug.assertEqual = assertEqual;
-        function assertLessThan(a, b, msg) {
-            if (a >= b) {
-                fail("Expected " + a + " < " + b + ". " + (msg || ""));
-            }
-        }
-        Debug.assertLessThan = assertLessThan;
-        function assertLessThanOrEqual(a, b) {
-            if (a > b) {
-                fail("Expected " + a + " <= " + b);
-            }
-        }
-        Debug.assertLessThanOrEqual = assertLessThanOrEqual;
-        function assertGreaterThanOrEqual(a, b) {
-            if (a < b) {
-                fail("Expected " + a + " >= " + b);
-            }
-        }
-        Debug.assertGreaterThanOrEqual = assertGreaterThanOrEqual;
-        function fail(message, stackCrawlMark) {
-            debugger;
-            var e = new Error(message ? "Debug Failure. " + message : "Debug Failure.");
-            if (Error.captureStackTrace) {
-                Error.captureStackTrace(e, stackCrawlMark || fail);
-            }
-            throw e;
-        }
-        Debug.fail = fail;
-        function assertDefined(value, message) {
-            if (value === undefined || value === null)
-                return fail(message);
-            return value;
-        }
-        Debug.assertDefined = assertDefined;
-        function assertEachDefined(value, message) {
-            for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
-                var v = value_1[_i];
-                assertDefined(v, message);
-            }
-            return value;
-        }
-        Debug.assertEachDefined = assertEachDefined;
-        function assertNever(member, message, stackCrawlMark) {
-            if (message === void 0) { message = "Illegal value:"; }
-            var detail = typeof member === "object" && "kind" in member && "pos" in member ? "SyntaxKind: " + Debug.showSyntaxKind(member) : JSON.stringify(member);
-            return fail(message + " " + detail, stackCrawlMark || assertNever);
-        }
-        Debug.assertNever = assertNever;
-        function getFunctionName(func) {
-            if (typeof func !== "function") {
-                return "";
-            }
-            else if (func.hasOwnProperty("name")) {
-                return func.name;
-            }
-            else {
-                var text = Function.prototype.toString.call(func);
-                var match = /^function\s+([\w\$]+)\s*\(/.exec(text);
-                return match ? match[1] : "";
-            }
-        }
-        Debug.getFunctionName = getFunctionName;
-    })(Debug = ts.Debug || (ts.Debug = {}));
     function equateValues(a, b) {
         return a === b;
     }
@@ -1857,7 +1746,7 @@ var ts;
                     bestCandidate = candidate;
                 }
                 else {
-                    Debug.assert(distance < bestDistance); // Else `levenshteinWithMax` should return undefined
+                    ts.Debug.assert(distance < bestDistance); // Else `levenshteinWithMax` should return undefined
                     bestDistance = distance;
                     bestCandidate = candidate;
                 }
@@ -2001,7 +1890,7 @@ var ts;
      * E.g.: matchedText(tryParsePattern("foo*baz"), "foobarbaz") === "bar"
      */
     function matchedText(pattern, candidate) {
-        Debug.assert(isPatternMatch(pattern, candidate));
+        ts.Debug.assert(isPatternMatch(pattern, candidate));
         return candidate.substring(pattern.prefix.length, candidate.length - pattern.suffix.length);
     }
     ts.matchedText = matchedText;
@@ -2094,6 +1983,267 @@ var ts;
         return result;
     }
     ts.fill = fill;
+    function cartesianProduct(arrays) {
+        var result = [];
+        cartesianProductWorker(arrays, result, /*outer*/ undefined, 0);
+        return result;
+    }
+    ts.cartesianProduct = cartesianProduct;
+    function cartesianProductWorker(arrays, result, outer, index) {
+        for (var _i = 0, _a = arrays[index]; _i < _a.length; _i++) {
+            var element = _a[_i];
+            var inner = void 0;
+            if (outer) {
+                inner = outer.slice();
+                inner.push(element);
+            }
+            else {
+                inner = [element];
+            }
+            if (index === arrays.length - 1) {
+                result.push(inner);
+            }
+            else {
+                cartesianProductWorker(arrays, result, inner, index + 1);
+            }
+        }
+    }
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var Debug;
+    (function (Debug) {
+        Debug.currentAssertionLevel = 0 /* None */;
+        Debug.isDebugging = false;
+        function shouldAssert(level) {
+            return Debug.currentAssertionLevel >= level;
+        }
+        Debug.shouldAssert = shouldAssert;
+        function assert(expression, message, verboseDebugInfo, stackCrawlMark) {
+            if (!expression) {
+                if (verboseDebugInfo) {
+                    message += "\r\nVerbose Debug Information: " + (typeof verboseDebugInfo === "string" ? verboseDebugInfo : verboseDebugInfo());
+                }
+                fail(message ? "False expression: " + message : "False expression.", stackCrawlMark || assert);
+            }
+        }
+        Debug.assert = assert;
+        function assertEqual(a, b, msg, msg2) {
+            if (a !== b) {
+                var message = msg ? msg2 ? msg + " " + msg2 : msg : "";
+                fail("Expected " + a + " === " + b + ". " + message);
+            }
+        }
+        Debug.assertEqual = assertEqual;
+        function assertLessThan(a, b, msg) {
+            if (a >= b) {
+                fail("Expected " + a + " < " + b + ". " + (msg || ""));
+            }
+        }
+        Debug.assertLessThan = assertLessThan;
+        function assertLessThanOrEqual(a, b) {
+            if (a > b) {
+                fail("Expected " + a + " <= " + b);
+            }
+        }
+        Debug.assertLessThanOrEqual = assertLessThanOrEqual;
+        function assertGreaterThanOrEqual(a, b) {
+            if (a < b) {
+                fail("Expected " + a + " >= " + b);
+            }
+        }
+        Debug.assertGreaterThanOrEqual = assertGreaterThanOrEqual;
+        function fail(message, stackCrawlMark) {
+            debugger;
+            var e = new Error(message ? "Debug Failure. " + message : "Debug Failure.");
+            if (Error.captureStackTrace) {
+                Error.captureStackTrace(e, stackCrawlMark || fail);
+            }
+            throw e;
+        }
+        Debug.fail = fail;
+        function assertDefined(value, message) {
+            if (value === undefined || value === null)
+                return fail(message);
+            return value;
+        }
+        Debug.assertDefined = assertDefined;
+        function assertEachDefined(value, message) {
+            for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
+                var v = value_1[_i];
+                assertDefined(v, message);
+            }
+            return value;
+        }
+        Debug.assertEachDefined = assertEachDefined;
+        function assertNever(member, message, stackCrawlMark) {
+            if (message === void 0) { message = "Illegal value:"; }
+            var detail = typeof member === "object" && "kind" in member && "pos" in member && formatSyntaxKind ? "SyntaxKind: " + formatSyntaxKind(member.kind) : JSON.stringify(member);
+            return fail(message + " " + detail, stackCrawlMark || assertNever);
+        }
+        Debug.assertNever = assertNever;
+        function getFunctionName(func) {
+            if (typeof func !== "function") {
+                return "";
+            }
+            else if (func.hasOwnProperty("name")) {
+                return func.name;
+            }
+            else {
+                var text = Function.prototype.toString.call(func);
+                var match = /^function\s+([\w\$]+)\s*\(/.exec(text);
+                return match ? match[1] : "";
+            }
+        }
+        Debug.getFunctionName = getFunctionName;
+        function formatSymbol(symbol) {
+            return "{ name: " + ts.unescapeLeadingUnderscores(symbol.escapedName) + "; flags: " + formatSymbolFlags(symbol.flags) + "; declarations: " + ts.map(symbol.declarations, function (node) { return formatSyntaxKind(node.kind); }) + " }";
+        }
+        Debug.formatSymbol = formatSymbol;
+        /**
+         * Formats an enum value as a string for debugging and debug assertions.
+         */
+        function formatEnum(value, enumObject, isFlags) {
+            if (value === void 0) { value = 0; }
+            var members = getEnumMembers(enumObject);
+            if (value === 0) {
+                return members.length > 0 && members[0][0] === 0 ? members[0][1] : "0";
+            }
+            if (isFlags) {
+                var result = "";
+                var remainingFlags = value;
+                for (var i = members.length - 1; i >= 0 && remainingFlags !== 0; i--) {
+                    var _a = members[i], enumValue = _a[0], enumName = _a[1];
+                    if (enumValue !== 0 && (remainingFlags & enumValue) === enumValue) {
+                        remainingFlags &= ~enumValue;
+                        result = "" + enumName + (result ? "|" : "") + result;
+                    }
+                }
+                if (remainingFlags === 0) {
+                    return result;
+                }
+            }
+            else {
+                for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
+                    var _b = members_1[_i], enumValue = _b[0], enumName = _b[1];
+                    if (enumValue === value) {
+                        return enumName;
+                    }
+                }
+            }
+            return value.toString();
+        }
+        Debug.formatEnum = formatEnum;
+        function getEnumMembers(enumObject) {
+            var result = [];
+            for (var name in enumObject) {
+                var value = enumObject[name];
+                if (typeof value === "number") {
+                    result.push([value, name]);
+                }
+            }
+            return ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
+        }
+        function formatSyntaxKind(kind) {
+            return formatEnum(kind, ts.SyntaxKind, /*isFlags*/ false);
+        }
+        Debug.formatSyntaxKind = formatSyntaxKind;
+        function formatNodeFlags(flags) {
+            return formatEnum(flags, ts.NodeFlags, /*isFlags*/ true);
+        }
+        Debug.formatNodeFlags = formatNodeFlags;
+        function formatModifierFlags(flags) {
+            return formatEnum(flags, ts.ModifierFlags, /*isFlags*/ true);
+        }
+        Debug.formatModifierFlags = formatModifierFlags;
+        function formatTransformFlags(flags) {
+            return formatEnum(flags, ts.TransformFlags, /*isFlags*/ true);
+        }
+        Debug.formatTransformFlags = formatTransformFlags;
+        function formatEmitFlags(flags) {
+            return formatEnum(flags, ts.EmitFlags, /*isFlags*/ true);
+        }
+        Debug.formatEmitFlags = formatEmitFlags;
+        function formatSymbolFlags(flags) {
+            return formatEnum(flags, ts.SymbolFlags, /*isFlags*/ true);
+        }
+        Debug.formatSymbolFlags = formatSymbolFlags;
+        function formatTypeFlags(flags) {
+            return formatEnum(flags, ts.TypeFlags, /*isFlags*/ true);
+        }
+        Debug.formatTypeFlags = formatTypeFlags;
+        function formatObjectFlags(flags) {
+            return formatEnum(flags, ts.ObjectFlags, /*isFlags*/ true);
+        }
+        Debug.formatObjectFlags = formatObjectFlags;
+        function failBadSyntaxKind(node, message) {
+            return fail((message || "Unexpected node.") + "\r\nNode " + formatSyntaxKind(node.kind) + " was unexpected.", failBadSyntaxKind);
+        }
+        Debug.failBadSyntaxKind = failBadSyntaxKind;
+        Debug.assertEachNode = shouldAssert(1 /* Normal */)
+            ? function (nodes, test, message) { return assert(test === undefined || ts.every(nodes, test), message || "Unexpected node.", function () { return "Node array did not pass test '" + getFunctionName(test) + "'."; }, Debug.assertEachNode); }
+            : ts.noop;
+        Debug.assertNode = shouldAssert(1 /* Normal */)
+            ? function (node, test, message) { return assert(test === undefined || test(node), message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " did not pass test '" + getFunctionName(test) + "'."; }, Debug.assertNode); }
+            : ts.noop;
+        Debug.assertOptionalNode = shouldAssert(1 /* Normal */)
+            ? function (node, test, message) { return assert(test === undefined || node === undefined || test(node), message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " did not pass test '" + getFunctionName(test) + "'."; }, Debug.assertOptionalNode); }
+            : ts.noop;
+        Debug.assertOptionalToken = shouldAssert(1 /* Normal */)
+            ? function (node, kind, message) { return assert(kind === undefined || node === undefined || node.kind === kind, message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " was not a '" + formatSyntaxKind(kind) + "' token."; }, Debug.assertOptionalToken); }
+            : ts.noop;
+        Debug.assertMissingNode = shouldAssert(1 /* Normal */)
+            ? function (node, message) { return assert(node === undefined, message || "Unexpected node.", function () { return "Node " + formatSyntaxKind(node.kind) + " was unexpected'."; }, Debug.assertMissingNode); }
+            : ts.noop;
+        var isDebugInfoEnabled = false;
+        /**
+         * Injects debug information into frequently used types.
+         */
+        function enableDebugInfo() {
+            if (isDebugInfoEnabled)
+                return;
+            // Add additional properties in debug mode to assist with debugging.
+            Object.defineProperties(ts.objectAllocator.getSymbolConstructor().prototype, {
+                __debugFlags: { get: function () { return formatSymbolFlags(this.flags); } }
+            });
+            Object.defineProperties(ts.objectAllocator.getTypeConstructor().prototype, {
+                __debugFlags: { get: function () { return formatTypeFlags(this.flags); } },
+                __debugObjectFlags: { get: function () { return this.flags & 524288 /* Object */ ? formatObjectFlags(this.objectFlags) : ""; } },
+                __debugTypeToString: { value: function () { return this.checker.typeToString(this); } },
+            });
+            var nodeConstructors = [
+                ts.objectAllocator.getNodeConstructor(),
+                ts.objectAllocator.getIdentifierConstructor(),
+                ts.objectAllocator.getTokenConstructor(),
+                ts.objectAllocator.getSourceFileConstructor()
+            ];
+            for (var _i = 0, nodeConstructors_1 = nodeConstructors; _i < nodeConstructors_1.length; _i++) {
+                var ctor = nodeConstructors_1[_i];
+                if (!ctor.prototype.hasOwnProperty("__debugKind")) {
+                    Object.defineProperties(ctor.prototype, {
+                        __debugKind: { get: function () { return formatSyntaxKind(this.kind); } },
+                        __debugNodeFlags: { get: function () { return formatNodeFlags(this.flags); } },
+                        __debugModifierFlags: { get: function () { return formatModifierFlags(ts.getModifierFlagsNoCache(this)); } },
+                        __debugTransformFlags: { get: function () { return formatTransformFlags(this.transformFlags); } },
+                        __debugIsParseTreeNode: { get: function () { return ts.isParseTreeNode(this); } },
+                        __debugEmitFlags: { get: function () { return formatEmitFlags(ts.getEmitFlags(this)); } },
+                        __debugGetText: {
+                            value: function (includeTrivia) {
+                                if (ts.nodeIsSynthesized(this))
+                                    return "";
+                                var parseNode = ts.getParseTreeNode(this);
+                                var sourceFile = parseNode && ts.getSourceFileOfNode(parseNode);
+                                return sourceFile ? ts.getSourceTextOfNodeFromSourceFile(sourceFile, parseNode, includeTrivia) : "";
+                            }
+                        }
+                    });
+                }
+            }
+            isDebugInfoEnabled = true;
+        }
+        Debug.enableDebugInfo = enableDebugInfo;
+    })(Debug = ts.Debug || (ts.Debug = {}));
 })(ts || (ts = {}));
 /*@internal*/
 var ts;
@@ -2646,309 +2796,311 @@ var ts;
         SyntaxKind[SyntaxKind["QuestionToken"] = 56] = "QuestionToken";
         SyntaxKind[SyntaxKind["ColonToken"] = 57] = "ColonToken";
         SyntaxKind[SyntaxKind["AtToken"] = 58] = "AtToken";
+        /** Only the JSDoc scanner produces BacktickToken. The normal scanner produces NoSubstitutionTemplateLiteral and related kinds. */
+        SyntaxKind[SyntaxKind["BacktickToken"] = 59] = "BacktickToken";
         // Assignments
-        SyntaxKind[SyntaxKind["EqualsToken"] = 59] = "EqualsToken";
-        SyntaxKind[SyntaxKind["PlusEqualsToken"] = 60] = "PlusEqualsToken";
-        SyntaxKind[SyntaxKind["MinusEqualsToken"] = 61] = "MinusEqualsToken";
-        SyntaxKind[SyntaxKind["AsteriskEqualsToken"] = 62] = "AsteriskEqualsToken";
-        SyntaxKind[SyntaxKind["AsteriskAsteriskEqualsToken"] = 63] = "AsteriskAsteriskEqualsToken";
-        SyntaxKind[SyntaxKind["SlashEqualsToken"] = 64] = "SlashEqualsToken";
-        SyntaxKind[SyntaxKind["PercentEqualsToken"] = 65] = "PercentEqualsToken";
-        SyntaxKind[SyntaxKind["LessThanLessThanEqualsToken"] = 66] = "LessThanLessThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanEqualsToken"] = 67] = "GreaterThanGreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanEqualsToken"] = 68] = "GreaterThanGreaterThanGreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["AmpersandEqualsToken"] = 69] = "AmpersandEqualsToken";
-        SyntaxKind[SyntaxKind["BarEqualsToken"] = 70] = "BarEqualsToken";
-        SyntaxKind[SyntaxKind["CaretEqualsToken"] = 71] = "CaretEqualsToken";
+        SyntaxKind[SyntaxKind["EqualsToken"] = 60] = "EqualsToken";
+        SyntaxKind[SyntaxKind["PlusEqualsToken"] = 61] = "PlusEqualsToken";
+        SyntaxKind[SyntaxKind["MinusEqualsToken"] = 62] = "MinusEqualsToken";
+        SyntaxKind[SyntaxKind["AsteriskEqualsToken"] = 63] = "AsteriskEqualsToken";
+        SyntaxKind[SyntaxKind["AsteriskAsteriskEqualsToken"] = 64] = "AsteriskAsteriskEqualsToken";
+        SyntaxKind[SyntaxKind["SlashEqualsToken"] = 65] = "SlashEqualsToken";
+        SyntaxKind[SyntaxKind["PercentEqualsToken"] = 66] = "PercentEqualsToken";
+        SyntaxKind[SyntaxKind["LessThanLessThanEqualsToken"] = 67] = "LessThanLessThanEqualsToken";
+        SyntaxKind[SyntaxKind["GreaterThanGreaterThanEqualsToken"] = 68] = "GreaterThanGreaterThanEqualsToken";
+        SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanEqualsToken"] = 69] = "GreaterThanGreaterThanGreaterThanEqualsToken";
+        SyntaxKind[SyntaxKind["AmpersandEqualsToken"] = 70] = "AmpersandEqualsToken";
+        SyntaxKind[SyntaxKind["BarEqualsToken"] = 71] = "BarEqualsToken";
+        SyntaxKind[SyntaxKind["CaretEqualsToken"] = 72] = "CaretEqualsToken";
         // Identifiers
-        SyntaxKind[SyntaxKind["Identifier"] = 72] = "Identifier";
+        SyntaxKind[SyntaxKind["Identifier"] = 73] = "Identifier";
         // Reserved words
-        SyntaxKind[SyntaxKind["BreakKeyword"] = 73] = "BreakKeyword";
-        SyntaxKind[SyntaxKind["CaseKeyword"] = 74] = "CaseKeyword";
-        SyntaxKind[SyntaxKind["CatchKeyword"] = 75] = "CatchKeyword";
-        SyntaxKind[SyntaxKind["ClassKeyword"] = 76] = "ClassKeyword";
-        SyntaxKind[SyntaxKind["ConstKeyword"] = 77] = "ConstKeyword";
-        SyntaxKind[SyntaxKind["ContinueKeyword"] = 78] = "ContinueKeyword";
-        SyntaxKind[SyntaxKind["DebuggerKeyword"] = 79] = "DebuggerKeyword";
-        SyntaxKind[SyntaxKind["DefaultKeyword"] = 80] = "DefaultKeyword";
-        SyntaxKind[SyntaxKind["DeleteKeyword"] = 81] = "DeleteKeyword";
-        SyntaxKind[SyntaxKind["DoKeyword"] = 82] = "DoKeyword";
-        SyntaxKind[SyntaxKind["ElseKeyword"] = 83] = "ElseKeyword";
-        SyntaxKind[SyntaxKind["EnumKeyword"] = 84] = "EnumKeyword";
-        SyntaxKind[SyntaxKind["ExportKeyword"] = 85] = "ExportKeyword";
-        SyntaxKind[SyntaxKind["ExtendsKeyword"] = 86] = "ExtendsKeyword";
-        SyntaxKind[SyntaxKind["FalseKeyword"] = 87] = "FalseKeyword";
-        SyntaxKind[SyntaxKind["FinallyKeyword"] = 88] = "FinallyKeyword";
-        SyntaxKind[SyntaxKind["ForKeyword"] = 89] = "ForKeyword";
-        SyntaxKind[SyntaxKind["FunctionKeyword"] = 90] = "FunctionKeyword";
-        SyntaxKind[SyntaxKind["IfKeyword"] = 91] = "IfKeyword";
-        SyntaxKind[SyntaxKind["ImportKeyword"] = 92] = "ImportKeyword";
-        SyntaxKind[SyntaxKind["InKeyword"] = 93] = "InKeyword";
-        SyntaxKind[SyntaxKind["InstanceOfKeyword"] = 94] = "InstanceOfKeyword";
-        SyntaxKind[SyntaxKind["NewKeyword"] = 95] = "NewKeyword";
-        SyntaxKind[SyntaxKind["NullKeyword"] = 96] = "NullKeyword";
-        SyntaxKind[SyntaxKind["ReturnKeyword"] = 97] = "ReturnKeyword";
-        SyntaxKind[SyntaxKind["SuperKeyword"] = 98] = "SuperKeyword";
-        SyntaxKind[SyntaxKind["SwitchKeyword"] = 99] = "SwitchKeyword";
-        SyntaxKind[SyntaxKind["ThisKeyword"] = 100] = "ThisKeyword";
-        SyntaxKind[SyntaxKind["ThrowKeyword"] = 101] = "ThrowKeyword";
-        SyntaxKind[SyntaxKind["TrueKeyword"] = 102] = "TrueKeyword";
-        SyntaxKind[SyntaxKind["TryKeyword"] = 103] = "TryKeyword";
-        SyntaxKind[SyntaxKind["TypeOfKeyword"] = 104] = "TypeOfKeyword";
-        SyntaxKind[SyntaxKind["VarKeyword"] = 105] = "VarKeyword";
-        SyntaxKind[SyntaxKind["VoidKeyword"] = 106] = "VoidKeyword";
-        SyntaxKind[SyntaxKind["WhileKeyword"] = 107] = "WhileKeyword";
-        SyntaxKind[SyntaxKind["WithKeyword"] = 108] = "WithKeyword";
+        SyntaxKind[SyntaxKind["BreakKeyword"] = 74] = "BreakKeyword";
+        SyntaxKind[SyntaxKind["CaseKeyword"] = 75] = "CaseKeyword";
+        SyntaxKind[SyntaxKind["CatchKeyword"] = 76] = "CatchKeyword";
+        SyntaxKind[SyntaxKind["ClassKeyword"] = 77] = "ClassKeyword";
+        SyntaxKind[SyntaxKind["ConstKeyword"] = 78] = "ConstKeyword";
+        SyntaxKind[SyntaxKind["ContinueKeyword"] = 79] = "ContinueKeyword";
+        SyntaxKind[SyntaxKind["DebuggerKeyword"] = 80] = "DebuggerKeyword";
+        SyntaxKind[SyntaxKind["DefaultKeyword"] = 81] = "DefaultKeyword";
+        SyntaxKind[SyntaxKind["DeleteKeyword"] = 82] = "DeleteKeyword";
+        SyntaxKind[SyntaxKind["DoKeyword"] = 83] = "DoKeyword";
+        SyntaxKind[SyntaxKind["ElseKeyword"] = 84] = "ElseKeyword";
+        SyntaxKind[SyntaxKind["EnumKeyword"] = 85] = "EnumKeyword";
+        SyntaxKind[SyntaxKind["ExportKeyword"] = 86] = "ExportKeyword";
+        SyntaxKind[SyntaxKind["ExtendsKeyword"] = 87] = "ExtendsKeyword";
+        SyntaxKind[SyntaxKind["FalseKeyword"] = 88] = "FalseKeyword";
+        SyntaxKind[SyntaxKind["FinallyKeyword"] = 89] = "FinallyKeyword";
+        SyntaxKind[SyntaxKind["ForKeyword"] = 90] = "ForKeyword";
+        SyntaxKind[SyntaxKind["FunctionKeyword"] = 91] = "FunctionKeyword";
+        SyntaxKind[SyntaxKind["IfKeyword"] = 92] = "IfKeyword";
+        SyntaxKind[SyntaxKind["ImportKeyword"] = 93] = "ImportKeyword";
+        SyntaxKind[SyntaxKind["InKeyword"] = 94] = "InKeyword";
+        SyntaxKind[SyntaxKind["InstanceOfKeyword"] = 95] = "InstanceOfKeyword";
+        SyntaxKind[SyntaxKind["NewKeyword"] = 96] = "NewKeyword";
+        SyntaxKind[SyntaxKind["NullKeyword"] = 97] = "NullKeyword";
+        SyntaxKind[SyntaxKind["ReturnKeyword"] = 98] = "ReturnKeyword";
+        SyntaxKind[SyntaxKind["SuperKeyword"] = 99] = "SuperKeyword";
+        SyntaxKind[SyntaxKind["SwitchKeyword"] = 100] = "SwitchKeyword";
+        SyntaxKind[SyntaxKind["ThisKeyword"] = 101] = "ThisKeyword";
+        SyntaxKind[SyntaxKind["ThrowKeyword"] = 102] = "ThrowKeyword";
+        SyntaxKind[SyntaxKind["TrueKeyword"] = 103] = "TrueKeyword";
+        SyntaxKind[SyntaxKind["TryKeyword"] = 104] = "TryKeyword";
+        SyntaxKind[SyntaxKind["TypeOfKeyword"] = 105] = "TypeOfKeyword";
+        SyntaxKind[SyntaxKind["VarKeyword"] = 106] = "VarKeyword";
+        SyntaxKind[SyntaxKind["VoidKeyword"] = 107] = "VoidKeyword";
+        SyntaxKind[SyntaxKind["WhileKeyword"] = 108] = "WhileKeyword";
+        SyntaxKind[SyntaxKind["WithKeyword"] = 109] = "WithKeyword";
         // Strict mode reserved words
-        SyntaxKind[SyntaxKind["ImplementsKeyword"] = 109] = "ImplementsKeyword";
-        SyntaxKind[SyntaxKind["InterfaceKeyword"] = 110] = "InterfaceKeyword";
-        SyntaxKind[SyntaxKind["LetKeyword"] = 111] = "LetKeyword";
-        SyntaxKind[SyntaxKind["PackageKeyword"] = 112] = "PackageKeyword";
-        SyntaxKind[SyntaxKind["PrivateKeyword"] = 113] = "PrivateKeyword";
-        SyntaxKind[SyntaxKind["ProtectedKeyword"] = 114] = "ProtectedKeyword";
-        SyntaxKind[SyntaxKind["PublicKeyword"] = 115] = "PublicKeyword";
-        SyntaxKind[SyntaxKind["StaticKeyword"] = 116] = "StaticKeyword";
-        SyntaxKind[SyntaxKind["YieldKeyword"] = 117] = "YieldKeyword";
+        SyntaxKind[SyntaxKind["ImplementsKeyword"] = 110] = "ImplementsKeyword";
+        SyntaxKind[SyntaxKind["InterfaceKeyword"] = 111] = "InterfaceKeyword";
+        SyntaxKind[SyntaxKind["LetKeyword"] = 112] = "LetKeyword";
+        SyntaxKind[SyntaxKind["PackageKeyword"] = 113] = "PackageKeyword";
+        SyntaxKind[SyntaxKind["PrivateKeyword"] = 114] = "PrivateKeyword";
+        SyntaxKind[SyntaxKind["ProtectedKeyword"] = 115] = "ProtectedKeyword";
+        SyntaxKind[SyntaxKind["PublicKeyword"] = 116] = "PublicKeyword";
+        SyntaxKind[SyntaxKind["StaticKeyword"] = 117] = "StaticKeyword";
+        SyntaxKind[SyntaxKind["YieldKeyword"] = 118] = "YieldKeyword";
         // Contextual keywords
-        SyntaxKind[SyntaxKind["AbstractKeyword"] = 118] = "AbstractKeyword";
-        SyntaxKind[SyntaxKind["AsKeyword"] = 119] = "AsKeyword";
-        SyntaxKind[SyntaxKind["AnyKeyword"] = 120] = "AnyKeyword";
-        SyntaxKind[SyntaxKind["AsyncKeyword"] = 121] = "AsyncKeyword";
-        SyntaxKind[SyntaxKind["AwaitKeyword"] = 122] = "AwaitKeyword";
-        SyntaxKind[SyntaxKind["BooleanKeyword"] = 123] = "BooleanKeyword";
-        SyntaxKind[SyntaxKind["ConstructorKeyword"] = 124] = "ConstructorKeyword";
-        SyntaxKind[SyntaxKind["DeclareKeyword"] = 125] = "DeclareKeyword";
-        SyntaxKind[SyntaxKind["GetKeyword"] = 126] = "GetKeyword";
-        SyntaxKind[SyntaxKind["InferKeyword"] = 127] = "InferKeyword";
-        SyntaxKind[SyntaxKind["IsKeyword"] = 128] = "IsKeyword";
-        SyntaxKind[SyntaxKind["KeyOfKeyword"] = 129] = "KeyOfKeyword";
-        SyntaxKind[SyntaxKind["ModuleKeyword"] = 130] = "ModuleKeyword";
-        SyntaxKind[SyntaxKind["NamespaceKeyword"] = 131] = "NamespaceKeyword";
-        SyntaxKind[SyntaxKind["NeverKeyword"] = 132] = "NeverKeyword";
-        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 133] = "ReadonlyKeyword";
-        SyntaxKind[SyntaxKind["RequireKeyword"] = 134] = "RequireKeyword";
-        SyntaxKind[SyntaxKind["NumberKeyword"] = 135] = "NumberKeyword";
-        SyntaxKind[SyntaxKind["ObjectKeyword"] = 136] = "ObjectKeyword";
-        SyntaxKind[SyntaxKind["SetKeyword"] = 137] = "SetKeyword";
-        SyntaxKind[SyntaxKind["StringKeyword"] = 138] = "StringKeyword";
-        SyntaxKind[SyntaxKind["SymbolKeyword"] = 139] = "SymbolKeyword";
-        SyntaxKind[SyntaxKind["TypeKeyword"] = 140] = "TypeKeyword";
-        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 141] = "UndefinedKeyword";
-        SyntaxKind[SyntaxKind["UniqueKeyword"] = 142] = "UniqueKeyword";
-        SyntaxKind[SyntaxKind["UnknownKeyword"] = 143] = "UnknownKeyword";
-        SyntaxKind[SyntaxKind["FromKeyword"] = 144] = "FromKeyword";
-        SyntaxKind[SyntaxKind["GlobalKeyword"] = 145] = "GlobalKeyword";
-        SyntaxKind[SyntaxKind["BigIntKeyword"] = 146] = "BigIntKeyword";
-        SyntaxKind[SyntaxKind["OfKeyword"] = 147] = "OfKeyword";
+        SyntaxKind[SyntaxKind["AbstractKeyword"] = 119] = "AbstractKeyword";
+        SyntaxKind[SyntaxKind["AsKeyword"] = 120] = "AsKeyword";
+        SyntaxKind[SyntaxKind["AnyKeyword"] = 121] = "AnyKeyword";
+        SyntaxKind[SyntaxKind["AsyncKeyword"] = 122] = "AsyncKeyword";
+        SyntaxKind[SyntaxKind["AwaitKeyword"] = 123] = "AwaitKeyword";
+        SyntaxKind[SyntaxKind["BooleanKeyword"] = 124] = "BooleanKeyword";
+        SyntaxKind[SyntaxKind["ConstructorKeyword"] = 125] = "ConstructorKeyword";
+        SyntaxKind[SyntaxKind["DeclareKeyword"] = 126] = "DeclareKeyword";
+        SyntaxKind[SyntaxKind["GetKeyword"] = 127] = "GetKeyword";
+        SyntaxKind[SyntaxKind["InferKeyword"] = 128] = "InferKeyword";
+        SyntaxKind[SyntaxKind["IsKeyword"] = 129] = "IsKeyword";
+        SyntaxKind[SyntaxKind["KeyOfKeyword"] = 130] = "KeyOfKeyword";
+        SyntaxKind[SyntaxKind["ModuleKeyword"] = 131] = "ModuleKeyword";
+        SyntaxKind[SyntaxKind["NamespaceKeyword"] = 132] = "NamespaceKeyword";
+        SyntaxKind[SyntaxKind["NeverKeyword"] = 133] = "NeverKeyword";
+        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 134] = "ReadonlyKeyword";
+        SyntaxKind[SyntaxKind["RequireKeyword"] = 135] = "RequireKeyword";
+        SyntaxKind[SyntaxKind["NumberKeyword"] = 136] = "NumberKeyword";
+        SyntaxKind[SyntaxKind["ObjectKeyword"] = 137] = "ObjectKeyword";
+        SyntaxKind[SyntaxKind["SetKeyword"] = 138] = "SetKeyword";
+        SyntaxKind[SyntaxKind["StringKeyword"] = 139] = "StringKeyword";
+        SyntaxKind[SyntaxKind["SymbolKeyword"] = 140] = "SymbolKeyword";
+        SyntaxKind[SyntaxKind["TypeKeyword"] = 141] = "TypeKeyword";
+        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 142] = "UndefinedKeyword";
+        SyntaxKind[SyntaxKind["UniqueKeyword"] = 143] = "UniqueKeyword";
+        SyntaxKind[SyntaxKind["UnknownKeyword"] = 144] = "UnknownKeyword";
+        SyntaxKind[SyntaxKind["FromKeyword"] = 145] = "FromKeyword";
+        SyntaxKind[SyntaxKind["GlobalKeyword"] = 146] = "GlobalKeyword";
+        SyntaxKind[SyntaxKind["BigIntKeyword"] = 147] = "BigIntKeyword";
+        SyntaxKind[SyntaxKind["OfKeyword"] = 148] = "OfKeyword";
         // Parse tree nodes
         // Names
-        SyntaxKind[SyntaxKind["QualifiedName"] = 148] = "QualifiedName";
-        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 149] = "ComputedPropertyName";
+        SyntaxKind[SyntaxKind["QualifiedName"] = 149] = "QualifiedName";
+        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 150] = "ComputedPropertyName";
         // Signature elements
-        SyntaxKind[SyntaxKind["TypeParameter"] = 150] = "TypeParameter";
-        SyntaxKind[SyntaxKind["Parameter"] = 151] = "Parameter";
-        SyntaxKind[SyntaxKind["Decorator"] = 152] = "Decorator";
+        SyntaxKind[SyntaxKind["TypeParameter"] = 151] = "TypeParameter";
+        SyntaxKind[SyntaxKind["Parameter"] = 152] = "Parameter";
+        SyntaxKind[SyntaxKind["Decorator"] = 153] = "Decorator";
         // TypeMember
-        SyntaxKind[SyntaxKind["PropertySignature"] = 153] = "PropertySignature";
-        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 154] = "PropertyDeclaration";
-        SyntaxKind[SyntaxKind["MethodSignature"] = 155] = "MethodSignature";
-        SyntaxKind[SyntaxKind["MethodDeclaration"] = 156] = "MethodDeclaration";
-        SyntaxKind[SyntaxKind["Constructor"] = 157] = "Constructor";
-        SyntaxKind[SyntaxKind["GetAccessor"] = 158] = "GetAccessor";
-        SyntaxKind[SyntaxKind["SetAccessor"] = 159] = "SetAccessor";
-        SyntaxKind[SyntaxKind["CallSignature"] = 160] = "CallSignature";
-        SyntaxKind[SyntaxKind["ConstructSignature"] = 161] = "ConstructSignature";
-        SyntaxKind[SyntaxKind["IndexSignature"] = 162] = "IndexSignature";
+        SyntaxKind[SyntaxKind["PropertySignature"] = 154] = "PropertySignature";
+        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 155] = "PropertyDeclaration";
+        SyntaxKind[SyntaxKind["MethodSignature"] = 156] = "MethodSignature";
+        SyntaxKind[SyntaxKind["MethodDeclaration"] = 157] = "MethodDeclaration";
+        SyntaxKind[SyntaxKind["Constructor"] = 158] = "Constructor";
+        SyntaxKind[SyntaxKind["GetAccessor"] = 159] = "GetAccessor";
+        SyntaxKind[SyntaxKind["SetAccessor"] = 160] = "SetAccessor";
+        SyntaxKind[SyntaxKind["CallSignature"] = 161] = "CallSignature";
+        SyntaxKind[SyntaxKind["ConstructSignature"] = 162] = "ConstructSignature";
+        SyntaxKind[SyntaxKind["IndexSignature"] = 163] = "IndexSignature";
         // Type
-        SyntaxKind[SyntaxKind["TypePredicate"] = 163] = "TypePredicate";
-        SyntaxKind[SyntaxKind["TypeReference"] = 164] = "TypeReference";
-        SyntaxKind[SyntaxKind["FunctionType"] = 165] = "FunctionType";
-        SyntaxKind[SyntaxKind["ConstructorType"] = 166] = "ConstructorType";
-        SyntaxKind[SyntaxKind["TypeQuery"] = 167] = "TypeQuery";
-        SyntaxKind[SyntaxKind["TypeLiteral"] = 168] = "TypeLiteral";
-        SyntaxKind[SyntaxKind["ArrayType"] = 169] = "ArrayType";
-        SyntaxKind[SyntaxKind["TupleType"] = 170] = "TupleType";
-        SyntaxKind[SyntaxKind["OptionalType"] = 171] = "OptionalType";
-        SyntaxKind[SyntaxKind["RestType"] = 172] = "RestType";
-        SyntaxKind[SyntaxKind["UnionType"] = 173] = "UnionType";
-        SyntaxKind[SyntaxKind["IntersectionType"] = 174] = "IntersectionType";
-        SyntaxKind[SyntaxKind["ConditionalType"] = 175] = "ConditionalType";
-        SyntaxKind[SyntaxKind["InferType"] = 176] = "InferType";
-        SyntaxKind[SyntaxKind["ParenthesizedType"] = 177] = "ParenthesizedType";
-        SyntaxKind[SyntaxKind["ThisType"] = 178] = "ThisType";
-        SyntaxKind[SyntaxKind["TypeOperator"] = 179] = "TypeOperator";
-        SyntaxKind[SyntaxKind["IndexedAccessType"] = 180] = "IndexedAccessType";
-        SyntaxKind[SyntaxKind["MappedType"] = 181] = "MappedType";
-        SyntaxKind[SyntaxKind["LiteralType"] = 182] = "LiteralType";
-        SyntaxKind[SyntaxKind["ImportType"] = 183] = "ImportType";
+        SyntaxKind[SyntaxKind["TypePredicate"] = 164] = "TypePredicate";
+        SyntaxKind[SyntaxKind["TypeReference"] = 165] = "TypeReference";
+        SyntaxKind[SyntaxKind["FunctionType"] = 166] = "FunctionType";
+        SyntaxKind[SyntaxKind["ConstructorType"] = 167] = "ConstructorType";
+        SyntaxKind[SyntaxKind["TypeQuery"] = 168] = "TypeQuery";
+        SyntaxKind[SyntaxKind["TypeLiteral"] = 169] = "TypeLiteral";
+        SyntaxKind[SyntaxKind["ArrayType"] = 170] = "ArrayType";
+        SyntaxKind[SyntaxKind["TupleType"] = 171] = "TupleType";
+        SyntaxKind[SyntaxKind["OptionalType"] = 172] = "OptionalType";
+        SyntaxKind[SyntaxKind["RestType"] = 173] = "RestType";
+        SyntaxKind[SyntaxKind["UnionType"] = 174] = "UnionType";
+        SyntaxKind[SyntaxKind["IntersectionType"] = 175] = "IntersectionType";
+        SyntaxKind[SyntaxKind["ConditionalType"] = 176] = "ConditionalType";
+        SyntaxKind[SyntaxKind["InferType"] = 177] = "InferType";
+        SyntaxKind[SyntaxKind["ParenthesizedType"] = 178] = "ParenthesizedType";
+        SyntaxKind[SyntaxKind["ThisType"] = 179] = "ThisType";
+        SyntaxKind[SyntaxKind["TypeOperator"] = 180] = "TypeOperator";
+        SyntaxKind[SyntaxKind["IndexedAccessType"] = 181] = "IndexedAccessType";
+        SyntaxKind[SyntaxKind["MappedType"] = 182] = "MappedType";
+        SyntaxKind[SyntaxKind["LiteralType"] = 183] = "LiteralType";
+        SyntaxKind[SyntaxKind["ImportType"] = 184] = "ImportType";
         // Binding patterns
-        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 184] = "ObjectBindingPattern";
-        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 185] = "ArrayBindingPattern";
-        SyntaxKind[SyntaxKind["BindingElement"] = 186] = "BindingElement";
+        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 185] = "ObjectBindingPattern";
+        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 186] = "ArrayBindingPattern";
+        SyntaxKind[SyntaxKind["BindingElement"] = 187] = "BindingElement";
         // Expression
-        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 187] = "ArrayLiteralExpression";
-        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 188] = "ObjectLiteralExpression";
-        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 189] = "PropertyAccessExpression";
-        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 190] = "ElementAccessExpression";
-        SyntaxKind[SyntaxKind["CallExpression"] = 191] = "CallExpression";
-        SyntaxKind[SyntaxKind["NewExpression"] = 192] = "NewExpression";
-        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 193] = "TaggedTemplateExpression";
-        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 194] = "TypeAssertionExpression";
-        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 195] = "ParenthesizedExpression";
-        SyntaxKind[SyntaxKind["FunctionExpression"] = 196] = "FunctionExpression";
-        SyntaxKind[SyntaxKind["ArrowFunction"] = 197] = "ArrowFunction";
-        SyntaxKind[SyntaxKind["DeleteExpression"] = 198] = "DeleteExpression";
-        SyntaxKind[SyntaxKind["TypeOfExpression"] = 199] = "TypeOfExpression";
-        SyntaxKind[SyntaxKind["VoidExpression"] = 200] = "VoidExpression";
-        SyntaxKind[SyntaxKind["AwaitExpression"] = 201] = "AwaitExpression";
-        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 202] = "PrefixUnaryExpression";
-        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 203] = "PostfixUnaryExpression";
-        SyntaxKind[SyntaxKind["BinaryExpression"] = 204] = "BinaryExpression";
-        SyntaxKind[SyntaxKind["ConditionalExpression"] = 205] = "ConditionalExpression";
-        SyntaxKind[SyntaxKind["TemplateExpression"] = 206] = "TemplateExpression";
-        SyntaxKind[SyntaxKind["YieldExpression"] = 207] = "YieldExpression";
-        SyntaxKind[SyntaxKind["SpreadElement"] = 208] = "SpreadElement";
-        SyntaxKind[SyntaxKind["ClassExpression"] = 209] = "ClassExpression";
-        SyntaxKind[SyntaxKind["OmittedExpression"] = 210] = "OmittedExpression";
-        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 211] = "ExpressionWithTypeArguments";
-        SyntaxKind[SyntaxKind["AsExpression"] = 212] = "AsExpression";
-        SyntaxKind[SyntaxKind["NonNullExpression"] = 213] = "NonNullExpression";
-        SyntaxKind[SyntaxKind["MetaProperty"] = 214] = "MetaProperty";
-        SyntaxKind[SyntaxKind["SyntheticExpression"] = 215] = "SyntheticExpression";
+        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 188] = "ArrayLiteralExpression";
+        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 189] = "ObjectLiteralExpression";
+        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 190] = "PropertyAccessExpression";
+        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 191] = "ElementAccessExpression";
+        SyntaxKind[SyntaxKind["CallExpression"] = 192] = "CallExpression";
+        SyntaxKind[SyntaxKind["NewExpression"] = 193] = "NewExpression";
+        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 194] = "TaggedTemplateExpression";
+        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 195] = "TypeAssertionExpression";
+        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 196] = "ParenthesizedExpression";
+        SyntaxKind[SyntaxKind["FunctionExpression"] = 197] = "FunctionExpression";
+        SyntaxKind[SyntaxKind["ArrowFunction"] = 198] = "ArrowFunction";
+        SyntaxKind[SyntaxKind["DeleteExpression"] = 199] = "DeleteExpression";
+        SyntaxKind[SyntaxKind["TypeOfExpression"] = 200] = "TypeOfExpression";
+        SyntaxKind[SyntaxKind["VoidExpression"] = 201] = "VoidExpression";
+        SyntaxKind[SyntaxKind["AwaitExpression"] = 202] = "AwaitExpression";
+        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 203] = "PrefixUnaryExpression";
+        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 204] = "PostfixUnaryExpression";
+        SyntaxKind[SyntaxKind["BinaryExpression"] = 205] = "BinaryExpression";
+        SyntaxKind[SyntaxKind["ConditionalExpression"] = 206] = "ConditionalExpression";
+        SyntaxKind[SyntaxKind["TemplateExpression"] = 207] = "TemplateExpression";
+        SyntaxKind[SyntaxKind["YieldExpression"] = 208] = "YieldExpression";
+        SyntaxKind[SyntaxKind["SpreadElement"] = 209] = "SpreadElement";
+        SyntaxKind[SyntaxKind["ClassExpression"] = 210] = "ClassExpression";
+        SyntaxKind[SyntaxKind["OmittedExpression"] = 211] = "OmittedExpression";
+        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 212] = "ExpressionWithTypeArguments";
+        SyntaxKind[SyntaxKind["AsExpression"] = 213] = "AsExpression";
+        SyntaxKind[SyntaxKind["NonNullExpression"] = 214] = "NonNullExpression";
+        SyntaxKind[SyntaxKind["MetaProperty"] = 215] = "MetaProperty";
+        SyntaxKind[SyntaxKind["SyntheticExpression"] = 216] = "SyntheticExpression";
         // Misc
-        SyntaxKind[SyntaxKind["TemplateSpan"] = 216] = "TemplateSpan";
-        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 217] = "SemicolonClassElement";
+        SyntaxKind[SyntaxKind["TemplateSpan"] = 217] = "TemplateSpan";
+        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 218] = "SemicolonClassElement";
         // Element
-        SyntaxKind[SyntaxKind["Block"] = 218] = "Block";
-        SyntaxKind[SyntaxKind["VariableStatement"] = 219] = "VariableStatement";
-        SyntaxKind[SyntaxKind["EmptyStatement"] = 220] = "EmptyStatement";
-        SyntaxKind[SyntaxKind["ExpressionStatement"] = 221] = "ExpressionStatement";
-        SyntaxKind[SyntaxKind["IfStatement"] = 222] = "IfStatement";
-        SyntaxKind[SyntaxKind["DoStatement"] = 223] = "DoStatement";
-        SyntaxKind[SyntaxKind["WhileStatement"] = 224] = "WhileStatement";
-        SyntaxKind[SyntaxKind["ForStatement"] = 225] = "ForStatement";
-        SyntaxKind[SyntaxKind["ForInStatement"] = 226] = "ForInStatement";
-        SyntaxKind[SyntaxKind["ForOfStatement"] = 227] = "ForOfStatement";
-        SyntaxKind[SyntaxKind["ContinueStatement"] = 228] = "ContinueStatement";
-        SyntaxKind[SyntaxKind["BreakStatement"] = 229] = "BreakStatement";
-        SyntaxKind[SyntaxKind["ReturnStatement"] = 230] = "ReturnStatement";
-        SyntaxKind[SyntaxKind["WithStatement"] = 231] = "WithStatement";
-        SyntaxKind[SyntaxKind["SwitchStatement"] = 232] = "SwitchStatement";
-        SyntaxKind[SyntaxKind["LabeledStatement"] = 233] = "LabeledStatement";
-        SyntaxKind[SyntaxKind["ThrowStatement"] = 234] = "ThrowStatement";
-        SyntaxKind[SyntaxKind["TryStatement"] = 235] = "TryStatement";
-        SyntaxKind[SyntaxKind["DebuggerStatement"] = 236] = "DebuggerStatement";
-        SyntaxKind[SyntaxKind["VariableDeclaration"] = 237] = "VariableDeclaration";
-        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 238] = "VariableDeclarationList";
-        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 239] = "FunctionDeclaration";
-        SyntaxKind[SyntaxKind["ClassDeclaration"] = 240] = "ClassDeclaration";
-        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 241] = "InterfaceDeclaration";
-        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 242] = "TypeAliasDeclaration";
-        SyntaxKind[SyntaxKind["EnumDeclaration"] = 243] = "EnumDeclaration";
-        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 244] = "ModuleDeclaration";
-        SyntaxKind[SyntaxKind["ModuleBlock"] = 245] = "ModuleBlock";
-        SyntaxKind[SyntaxKind["CaseBlock"] = 246] = "CaseBlock";
-        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 247] = "NamespaceExportDeclaration";
-        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 248] = "ImportEqualsDeclaration";
-        SyntaxKind[SyntaxKind["ImportDeclaration"] = 249] = "ImportDeclaration";
-        SyntaxKind[SyntaxKind["ImportClause"] = 250] = "ImportClause";
-        SyntaxKind[SyntaxKind["NamespaceImport"] = 251] = "NamespaceImport";
-        SyntaxKind[SyntaxKind["NamedImports"] = 252] = "NamedImports";
-        SyntaxKind[SyntaxKind["ImportSpecifier"] = 253] = "ImportSpecifier";
-        SyntaxKind[SyntaxKind["ExportAssignment"] = 254] = "ExportAssignment";
-        SyntaxKind[SyntaxKind["ExportDeclaration"] = 255] = "ExportDeclaration";
-        SyntaxKind[SyntaxKind["NamedExports"] = 256] = "NamedExports";
-        SyntaxKind[SyntaxKind["ExportSpecifier"] = 257] = "ExportSpecifier";
-        SyntaxKind[SyntaxKind["MissingDeclaration"] = 258] = "MissingDeclaration";
+        SyntaxKind[SyntaxKind["Block"] = 219] = "Block";
+        SyntaxKind[SyntaxKind["VariableStatement"] = 220] = "VariableStatement";
+        SyntaxKind[SyntaxKind["EmptyStatement"] = 221] = "EmptyStatement";
+        SyntaxKind[SyntaxKind["ExpressionStatement"] = 222] = "ExpressionStatement";
+        SyntaxKind[SyntaxKind["IfStatement"] = 223] = "IfStatement";
+        SyntaxKind[SyntaxKind["DoStatement"] = 224] = "DoStatement";
+        SyntaxKind[SyntaxKind["WhileStatement"] = 225] = "WhileStatement";
+        SyntaxKind[SyntaxKind["ForStatement"] = 226] = "ForStatement";
+        SyntaxKind[SyntaxKind["ForInStatement"] = 227] = "ForInStatement";
+        SyntaxKind[SyntaxKind["ForOfStatement"] = 228] = "ForOfStatement";
+        SyntaxKind[SyntaxKind["ContinueStatement"] = 229] = "ContinueStatement";
+        SyntaxKind[SyntaxKind["BreakStatement"] = 230] = "BreakStatement";
+        SyntaxKind[SyntaxKind["ReturnStatement"] = 231] = "ReturnStatement";
+        SyntaxKind[SyntaxKind["WithStatement"] = 232] = "WithStatement";
+        SyntaxKind[SyntaxKind["SwitchStatement"] = 233] = "SwitchStatement";
+        SyntaxKind[SyntaxKind["LabeledStatement"] = 234] = "LabeledStatement";
+        SyntaxKind[SyntaxKind["ThrowStatement"] = 235] = "ThrowStatement";
+        SyntaxKind[SyntaxKind["TryStatement"] = 236] = "TryStatement";
+        SyntaxKind[SyntaxKind["DebuggerStatement"] = 237] = "DebuggerStatement";
+        SyntaxKind[SyntaxKind["VariableDeclaration"] = 238] = "VariableDeclaration";
+        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 239] = "VariableDeclarationList";
+        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 240] = "FunctionDeclaration";
+        SyntaxKind[SyntaxKind["ClassDeclaration"] = 241] = "ClassDeclaration";
+        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 242] = "InterfaceDeclaration";
+        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 243] = "TypeAliasDeclaration";
+        SyntaxKind[SyntaxKind["EnumDeclaration"] = 244] = "EnumDeclaration";
+        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 245] = "ModuleDeclaration";
+        SyntaxKind[SyntaxKind["ModuleBlock"] = 246] = "ModuleBlock";
+        SyntaxKind[SyntaxKind["CaseBlock"] = 247] = "CaseBlock";
+        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 248] = "NamespaceExportDeclaration";
+        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 249] = "ImportEqualsDeclaration";
+        SyntaxKind[SyntaxKind["ImportDeclaration"] = 250] = "ImportDeclaration";
+        SyntaxKind[SyntaxKind["ImportClause"] = 251] = "ImportClause";
+        SyntaxKind[SyntaxKind["NamespaceImport"] = 252] = "NamespaceImport";
+        SyntaxKind[SyntaxKind["NamedImports"] = 253] = "NamedImports";
+        SyntaxKind[SyntaxKind["ImportSpecifier"] = 254] = "ImportSpecifier";
+        SyntaxKind[SyntaxKind["ExportAssignment"] = 255] = "ExportAssignment";
+        SyntaxKind[SyntaxKind["ExportDeclaration"] = 256] = "ExportDeclaration";
+        SyntaxKind[SyntaxKind["NamedExports"] = 257] = "NamedExports";
+        SyntaxKind[SyntaxKind["ExportSpecifier"] = 258] = "ExportSpecifier";
+        SyntaxKind[SyntaxKind["MissingDeclaration"] = 259] = "MissingDeclaration";
         // Module references
-        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 259] = "ExternalModuleReference";
+        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 260] = "ExternalModuleReference";
         // JSX
-        SyntaxKind[SyntaxKind["JsxElement"] = 260] = "JsxElement";
-        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 261] = "JsxSelfClosingElement";
-        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 262] = "JsxOpeningElement";
-        SyntaxKind[SyntaxKind["JsxClosingElement"] = 263] = "JsxClosingElement";
-        SyntaxKind[SyntaxKind["JsxFragment"] = 264] = "JsxFragment";
-        SyntaxKind[SyntaxKind["JsxOpeningFragment"] = 265] = "JsxOpeningFragment";
-        SyntaxKind[SyntaxKind["JsxClosingFragment"] = 266] = "JsxClosingFragment";
-        SyntaxKind[SyntaxKind["JsxAttribute"] = 267] = "JsxAttribute";
-        SyntaxKind[SyntaxKind["JsxAttributes"] = 268] = "JsxAttributes";
-        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 269] = "JsxSpreadAttribute";
-        SyntaxKind[SyntaxKind["JsxExpression"] = 270] = "JsxExpression";
+        SyntaxKind[SyntaxKind["JsxElement"] = 261] = "JsxElement";
+        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 262] = "JsxSelfClosingElement";
+        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 263] = "JsxOpeningElement";
+        SyntaxKind[SyntaxKind["JsxClosingElement"] = 264] = "JsxClosingElement";
+        SyntaxKind[SyntaxKind["JsxFragment"] = 265] = "JsxFragment";
+        SyntaxKind[SyntaxKind["JsxOpeningFragment"] = 266] = "JsxOpeningFragment";
+        SyntaxKind[SyntaxKind["JsxClosingFragment"] = 267] = "JsxClosingFragment";
+        SyntaxKind[SyntaxKind["JsxAttribute"] = 268] = "JsxAttribute";
+        SyntaxKind[SyntaxKind["JsxAttributes"] = 269] = "JsxAttributes";
+        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 270] = "JsxSpreadAttribute";
+        SyntaxKind[SyntaxKind["JsxExpression"] = 271] = "JsxExpression";
         // Clauses
-        SyntaxKind[SyntaxKind["CaseClause"] = 271] = "CaseClause";
-        SyntaxKind[SyntaxKind["DefaultClause"] = 272] = "DefaultClause";
-        SyntaxKind[SyntaxKind["HeritageClause"] = 273] = "HeritageClause";
-        SyntaxKind[SyntaxKind["CatchClause"] = 274] = "CatchClause";
+        SyntaxKind[SyntaxKind["CaseClause"] = 272] = "CaseClause";
+        SyntaxKind[SyntaxKind["DefaultClause"] = 273] = "DefaultClause";
+        SyntaxKind[SyntaxKind["HeritageClause"] = 274] = "HeritageClause";
+        SyntaxKind[SyntaxKind["CatchClause"] = 275] = "CatchClause";
         // Property assignments
-        SyntaxKind[SyntaxKind["PropertyAssignment"] = 275] = "PropertyAssignment";
-        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 276] = "ShorthandPropertyAssignment";
-        SyntaxKind[SyntaxKind["SpreadAssignment"] = 277] = "SpreadAssignment";
+        SyntaxKind[SyntaxKind["PropertyAssignment"] = 276] = "PropertyAssignment";
+        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 277] = "ShorthandPropertyAssignment";
+        SyntaxKind[SyntaxKind["SpreadAssignment"] = 278] = "SpreadAssignment";
         // Enum
-        SyntaxKind[SyntaxKind["EnumMember"] = 278] = "EnumMember";
+        SyntaxKind[SyntaxKind["EnumMember"] = 279] = "EnumMember";
         // Unparsed
-        SyntaxKind[SyntaxKind["UnparsedPrologue"] = 279] = "UnparsedPrologue";
-        SyntaxKind[SyntaxKind["UnparsedPrepend"] = 280] = "UnparsedPrepend";
-        SyntaxKind[SyntaxKind["UnparsedText"] = 281] = "UnparsedText";
-        SyntaxKind[SyntaxKind["UnparsedInternalText"] = 282] = "UnparsedInternalText";
-        SyntaxKind[SyntaxKind["UnparsedSyntheticReference"] = 283] = "UnparsedSyntheticReference";
+        SyntaxKind[SyntaxKind["UnparsedPrologue"] = 280] = "UnparsedPrologue";
+        SyntaxKind[SyntaxKind["UnparsedPrepend"] = 281] = "UnparsedPrepend";
+        SyntaxKind[SyntaxKind["UnparsedText"] = 282] = "UnparsedText";
+        SyntaxKind[SyntaxKind["UnparsedInternalText"] = 283] = "UnparsedInternalText";
+        SyntaxKind[SyntaxKind["UnparsedSyntheticReference"] = 284] = "UnparsedSyntheticReference";
         // Top-level nodes
-        SyntaxKind[SyntaxKind["SourceFile"] = 284] = "SourceFile";
-        SyntaxKind[SyntaxKind["Bundle"] = 285] = "Bundle";
-        SyntaxKind[SyntaxKind["UnparsedSource"] = 286] = "UnparsedSource";
-        SyntaxKind[SyntaxKind["InputFiles"] = 287] = "InputFiles";
+        SyntaxKind[SyntaxKind["SourceFile"] = 285] = "SourceFile";
+        SyntaxKind[SyntaxKind["Bundle"] = 286] = "Bundle";
+        SyntaxKind[SyntaxKind["UnparsedSource"] = 287] = "UnparsedSource";
+        SyntaxKind[SyntaxKind["InputFiles"] = 288] = "InputFiles";
         // JSDoc nodes
-        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 288] = "JSDocTypeExpression";
+        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 289] = "JSDocTypeExpression";
         // The * type
-        SyntaxKind[SyntaxKind["JSDocAllType"] = 289] = "JSDocAllType";
+        SyntaxKind[SyntaxKind["JSDocAllType"] = 290] = "JSDocAllType";
         // The ? type
-        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 290] = "JSDocUnknownType";
-        SyntaxKind[SyntaxKind["JSDocNullableType"] = 291] = "JSDocNullableType";
-        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 292] = "JSDocNonNullableType";
-        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 293] = "JSDocOptionalType";
-        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 294] = "JSDocFunctionType";
-        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 295] = "JSDocVariadicType";
-        SyntaxKind[SyntaxKind["JSDocComment"] = 296] = "JSDocComment";
-        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 297] = "JSDocTypeLiteral";
-        SyntaxKind[SyntaxKind["JSDocSignature"] = 298] = "JSDocSignature";
-        SyntaxKind[SyntaxKind["JSDocTag"] = 299] = "JSDocTag";
-        SyntaxKind[SyntaxKind["JSDocAugmentsTag"] = 300] = "JSDocAugmentsTag";
-        SyntaxKind[SyntaxKind["JSDocClassTag"] = 301] = "JSDocClassTag";
-        SyntaxKind[SyntaxKind["JSDocCallbackTag"] = 302] = "JSDocCallbackTag";
-        SyntaxKind[SyntaxKind["JSDocEnumTag"] = 303] = "JSDocEnumTag";
-        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 304] = "JSDocParameterTag";
-        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 305] = "JSDocReturnTag";
-        SyntaxKind[SyntaxKind["JSDocThisTag"] = 306] = "JSDocThisTag";
-        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 307] = "JSDocTypeTag";
-        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 308] = "JSDocTemplateTag";
-        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 309] = "JSDocTypedefTag";
-        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 310] = "JSDocPropertyTag";
+        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 291] = "JSDocUnknownType";
+        SyntaxKind[SyntaxKind["JSDocNullableType"] = 292] = "JSDocNullableType";
+        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 293] = "JSDocNonNullableType";
+        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 294] = "JSDocOptionalType";
+        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 295] = "JSDocFunctionType";
+        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 296] = "JSDocVariadicType";
+        SyntaxKind[SyntaxKind["JSDocComment"] = 297] = "JSDocComment";
+        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 298] = "JSDocTypeLiteral";
+        SyntaxKind[SyntaxKind["JSDocSignature"] = 299] = "JSDocSignature";
+        SyntaxKind[SyntaxKind["JSDocTag"] = 300] = "JSDocTag";
+        SyntaxKind[SyntaxKind["JSDocAugmentsTag"] = 301] = "JSDocAugmentsTag";
+        SyntaxKind[SyntaxKind["JSDocClassTag"] = 302] = "JSDocClassTag";
+        SyntaxKind[SyntaxKind["JSDocCallbackTag"] = 303] = "JSDocCallbackTag";
+        SyntaxKind[SyntaxKind["JSDocEnumTag"] = 304] = "JSDocEnumTag";
+        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 305] = "JSDocParameterTag";
+        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 306] = "JSDocReturnTag";
+        SyntaxKind[SyntaxKind["JSDocThisTag"] = 307] = "JSDocThisTag";
+        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 308] = "JSDocTypeTag";
+        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 309] = "JSDocTemplateTag";
+        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 310] = "JSDocTypedefTag";
+        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 311] = "JSDocPropertyTag";
         // Synthesized list
-        SyntaxKind[SyntaxKind["SyntaxList"] = 311] = "SyntaxList";
+        SyntaxKind[SyntaxKind["SyntaxList"] = 312] = "SyntaxList";
         // Transformation nodes
-        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 312] = "NotEmittedStatement";
-        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 313] = "PartiallyEmittedExpression";
-        SyntaxKind[SyntaxKind["CommaListExpression"] = 314] = "CommaListExpression";
-        SyntaxKind[SyntaxKind["MergeDeclarationMarker"] = 315] = "MergeDeclarationMarker";
-        SyntaxKind[SyntaxKind["EndOfDeclarationMarker"] = 316] = "EndOfDeclarationMarker";
+        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 313] = "NotEmittedStatement";
+        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 314] = "PartiallyEmittedExpression";
+        SyntaxKind[SyntaxKind["CommaListExpression"] = 315] = "CommaListExpression";
+        SyntaxKind[SyntaxKind["MergeDeclarationMarker"] = 316] = "MergeDeclarationMarker";
+        SyntaxKind[SyntaxKind["EndOfDeclarationMarker"] = 317] = "EndOfDeclarationMarker";
         // Enum value count
-        SyntaxKind[SyntaxKind["Count"] = 317] = "Count";
+        SyntaxKind[SyntaxKind["Count"] = 318] = "Count";
         // Markers
-        SyntaxKind[SyntaxKind["FirstAssignment"] = 59] = "FirstAssignment";
-        SyntaxKind[SyntaxKind["LastAssignment"] = 71] = "LastAssignment";
-        SyntaxKind[SyntaxKind["FirstCompoundAssignment"] = 60] = "FirstCompoundAssignment";
-        SyntaxKind[SyntaxKind["LastCompoundAssignment"] = 71] = "LastCompoundAssignment";
-        SyntaxKind[SyntaxKind["FirstReservedWord"] = 73] = "FirstReservedWord";
-        SyntaxKind[SyntaxKind["LastReservedWord"] = 108] = "LastReservedWord";
-        SyntaxKind[SyntaxKind["FirstKeyword"] = 73] = "FirstKeyword";
-        SyntaxKind[SyntaxKind["LastKeyword"] = 147] = "LastKeyword";
-        SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 109] = "FirstFutureReservedWord";
-        SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 117] = "LastFutureReservedWord";
-        SyntaxKind[SyntaxKind["FirstTypeNode"] = 163] = "FirstTypeNode";
-        SyntaxKind[SyntaxKind["LastTypeNode"] = 183] = "LastTypeNode";
+        SyntaxKind[SyntaxKind["FirstAssignment"] = 60] = "FirstAssignment";
+        SyntaxKind[SyntaxKind["LastAssignment"] = 72] = "LastAssignment";
+        SyntaxKind[SyntaxKind["FirstCompoundAssignment"] = 61] = "FirstCompoundAssignment";
+        SyntaxKind[SyntaxKind["LastCompoundAssignment"] = 72] = "LastCompoundAssignment";
+        SyntaxKind[SyntaxKind["FirstReservedWord"] = 74] = "FirstReservedWord";
+        SyntaxKind[SyntaxKind["LastReservedWord"] = 109] = "LastReservedWord";
+        SyntaxKind[SyntaxKind["FirstKeyword"] = 74] = "FirstKeyword";
+        SyntaxKind[SyntaxKind["LastKeyword"] = 148] = "LastKeyword";
+        SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 110] = "FirstFutureReservedWord";
+        SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 118] = "LastFutureReservedWord";
+        SyntaxKind[SyntaxKind["FirstTypeNode"] = 164] = "FirstTypeNode";
+        SyntaxKind[SyntaxKind["LastTypeNode"] = 184] = "LastTypeNode";
         SyntaxKind[SyntaxKind["FirstPunctuation"] = 18] = "FirstPunctuation";
-        SyntaxKind[SyntaxKind["LastPunctuation"] = 71] = "LastPunctuation";
+        SyntaxKind[SyntaxKind["LastPunctuation"] = 72] = "LastPunctuation";
         SyntaxKind[SyntaxKind["FirstToken"] = 0] = "FirstToken";
-        SyntaxKind[SyntaxKind["LastToken"] = 147] = "LastToken";
+        SyntaxKind[SyntaxKind["LastToken"] = 148] = "LastToken";
         SyntaxKind[SyntaxKind["FirstTriviaToken"] = 2] = "FirstTriviaToken";
         SyntaxKind[SyntaxKind["LastTriviaToken"] = 7] = "LastTriviaToken";
         SyntaxKind[SyntaxKind["FirstLiteralToken"] = 8] = "FirstLiteralToken";
@@ -2956,14 +3108,14 @@ var ts;
         SyntaxKind[SyntaxKind["FirstTemplateToken"] = 14] = "FirstTemplateToken";
         SyntaxKind[SyntaxKind["LastTemplateToken"] = 17] = "LastTemplateToken";
         SyntaxKind[SyntaxKind["FirstBinaryOperator"] = 28] = "FirstBinaryOperator";
-        SyntaxKind[SyntaxKind["LastBinaryOperator"] = 71] = "LastBinaryOperator";
-        SyntaxKind[SyntaxKind["FirstNode"] = 148] = "FirstNode";
-        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 288] = "FirstJSDocNode";
-        SyntaxKind[SyntaxKind["LastJSDocNode"] = 310] = "LastJSDocNode";
-        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 299] = "FirstJSDocTagNode";
-        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 310] = "LastJSDocTagNode";
-        /* @internal */ SyntaxKind[SyntaxKind["FirstContextualKeyword"] = 118] = "FirstContextualKeyword";
-        /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 147] = "LastContextualKeyword";
+        SyntaxKind[SyntaxKind["LastBinaryOperator"] = 72] = "LastBinaryOperator";
+        SyntaxKind[SyntaxKind["FirstNode"] = 149] = "FirstNode";
+        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 289] = "FirstJSDocNode";
+        SyntaxKind[SyntaxKind["LastJSDocNode"] = 311] = "LastJSDocNode";
+        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 300] = "FirstJSDocTagNode";
+        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 311] = "LastJSDocTagNode";
+        /* @internal */ SyntaxKind[SyntaxKind["FirstContextualKeyword"] = 119] = "FirstContextualKeyword";
+        /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 148] = "LastContextualKeyword";
     })(SyntaxKind = ts.SyntaxKind || (ts.SyntaxKind = {}));
     var NodeFlags;
     (function (NodeFlags) {
@@ -3106,6 +3258,8 @@ var ts;
         FlowFlags[FlowFlags["Shared"] = 1024] = "Shared";
         FlowFlags[FlowFlags["PreFinally"] = 2048] = "PreFinally";
         FlowFlags[FlowFlags["AfterFinally"] = 4096] = "AfterFinally";
+        /** @internal */
+        FlowFlags[FlowFlags["Cached"] = 8192] = "Cached";
         FlowFlags[FlowFlags["Label"] = 12] = "Label";
         FlowFlags[FlowFlags["Condition"] = 96] = "Condition";
     })(FlowFlags = ts.FlowFlags || (ts.FlowFlags = {}));
@@ -3358,19 +3512,22 @@ var ts;
         CheckFlags[CheckFlags["SyntheticProperty"] = 2] = "SyntheticProperty";
         CheckFlags[CheckFlags["SyntheticMethod"] = 4] = "SyntheticMethod";
         CheckFlags[CheckFlags["Readonly"] = 8] = "Readonly";
-        CheckFlags[CheckFlags["Partial"] = 16] = "Partial";
-        CheckFlags[CheckFlags["HasNonUniformType"] = 32] = "HasNonUniformType";
-        CheckFlags[CheckFlags["HasLiteralType"] = 64] = "HasLiteralType";
-        CheckFlags[CheckFlags["ContainsPublic"] = 128] = "ContainsPublic";
-        CheckFlags[CheckFlags["ContainsProtected"] = 256] = "ContainsProtected";
-        CheckFlags[CheckFlags["ContainsPrivate"] = 512] = "ContainsPrivate";
-        CheckFlags[CheckFlags["ContainsStatic"] = 1024] = "ContainsStatic";
-        CheckFlags[CheckFlags["Late"] = 2048] = "Late";
-        CheckFlags[CheckFlags["ReverseMapped"] = 4096] = "ReverseMapped";
-        CheckFlags[CheckFlags["OptionalParameter"] = 8192] = "OptionalParameter";
-        CheckFlags[CheckFlags["RestParameter"] = 16384] = "RestParameter";
+        CheckFlags[CheckFlags["ReadPartial"] = 16] = "ReadPartial";
+        CheckFlags[CheckFlags["WritePartial"] = 32] = "WritePartial";
+        CheckFlags[CheckFlags["HasNonUniformType"] = 64] = "HasNonUniformType";
+        CheckFlags[CheckFlags["HasLiteralType"] = 128] = "HasLiteralType";
+        CheckFlags[CheckFlags["ContainsPublic"] = 256] = "ContainsPublic";
+        CheckFlags[CheckFlags["ContainsProtected"] = 512] = "ContainsProtected";
+        CheckFlags[CheckFlags["ContainsPrivate"] = 1024] = "ContainsPrivate";
+        CheckFlags[CheckFlags["ContainsStatic"] = 2048] = "ContainsStatic";
+        CheckFlags[CheckFlags["Late"] = 4096] = "Late";
+        CheckFlags[CheckFlags["ReverseMapped"] = 8192] = "ReverseMapped";
+        CheckFlags[CheckFlags["OptionalParameter"] = 16384] = "OptionalParameter";
+        CheckFlags[CheckFlags["RestParameter"] = 32768] = "RestParameter";
+        CheckFlags[CheckFlags["DeferredType"] = 65536] = "DeferredType";
         CheckFlags[CheckFlags["Synthetic"] = 6] = "Synthetic";
-        CheckFlags[CheckFlags["Discriminant"] = 96] = "Discriminant";
+        CheckFlags[CheckFlags["Discriminant"] = 192] = "Discriminant";
+        CheckFlags[CheckFlags["Partial"] = 48] = "Partial";
     })(CheckFlags = ts.CheckFlags || (ts.CheckFlags = {}));
     var InternalSymbolName;
     (function (InternalSymbolName) {
@@ -3480,7 +3637,9 @@ var ts;
         TypeFlags[TypeFlags["Instantiable"] = 63176704] = "Instantiable";
         TypeFlags[TypeFlags["StructuredOrInstantiable"] = 66846720] = "StructuredOrInstantiable";
         /* @internal */
-        TypeFlags[TypeFlags["ObjectFlagsType"] = 3768320] = "ObjectFlagsType";
+        TypeFlags[TypeFlags["ObjectFlagsType"] = 3899392] = "ObjectFlagsType";
+        /* @internal */
+        TypeFlags[TypeFlags["Simplifiable"] = 25165824] = "Simplifiable";
         // 'Narrowable' types are types where narrowing actually narrows.
         // This *should* be every type other than null, undefined, void, and never
         TypeFlags[TypeFlags["Narrowable"] = 133970943] = "Narrowable";
@@ -3528,7 +3687,7 @@ var ts;
         /* @internal */
         ObjectFlags[ObjectFlags["ContainsObjectLiteral"] = 262144] = "ContainsObjectLiteral";
         /* @internal */
-        ObjectFlags[ObjectFlags["ContainsAnyFunctionType"] = 524288] = "ContainsAnyFunctionType";
+        ObjectFlags[ObjectFlags["NonInferrableType"] = 524288] = "NonInferrableType";
         ObjectFlags[ObjectFlags["ClassOrInterface"] = 3] = "ClassOrInterface";
         /* @internal */
         ObjectFlags[ObjectFlags["RequiresWidening"] = 393216] = "RequiresWidening";
@@ -3536,14 +3695,18 @@ var ts;
         ObjectFlags[ObjectFlags["PropagatingFlags"] = 917504] = "PropagatingFlags";
     })(ObjectFlags = ts.ObjectFlags || (ts.ObjectFlags = {}));
     /* @internal */
-    var Variance;
-    (function (Variance) {
-        Variance[Variance["Invariant"] = 0] = "Invariant";
-        Variance[Variance["Covariant"] = 1] = "Covariant";
-        Variance[Variance["Contravariant"] = 2] = "Contravariant";
-        Variance[Variance["Bivariant"] = 3] = "Bivariant";
-        Variance[Variance["Independent"] = 4] = "Independent";
-    })(Variance = ts.Variance || (ts.Variance = {}));
+    var VarianceFlags;
+    (function (VarianceFlags) {
+        VarianceFlags[VarianceFlags["Invariant"] = 0] = "Invariant";
+        VarianceFlags[VarianceFlags["Covariant"] = 1] = "Covariant";
+        VarianceFlags[VarianceFlags["Contravariant"] = 2] = "Contravariant";
+        VarianceFlags[VarianceFlags["Bivariant"] = 3] = "Bivariant";
+        VarianceFlags[VarianceFlags["Independent"] = 4] = "Independent";
+        VarianceFlags[VarianceFlags["VarianceMask"] = 7] = "VarianceMask";
+        VarianceFlags[VarianceFlags["Unmeasurable"] = 8] = "Unmeasurable";
+        VarianceFlags[VarianceFlags["Unreliable"] = 16] = "Unreliable";
+        VarianceFlags[VarianceFlags["AllowsStructuralFallback"] = 24] = "AllowsStructuralFallback";
+    })(VarianceFlags = ts.VarianceFlags || (ts.VarianceFlags = {}));
     /* @internal */
     var JsxReferenceKind;
     (function (JsxReferenceKind) {
@@ -3565,12 +3728,13 @@ var ts;
     (function (InferencePriority) {
         InferencePriority[InferencePriority["NakedTypeVariable"] = 1] = "NakedTypeVariable";
         InferencePriority[InferencePriority["HomomorphicMappedType"] = 2] = "HomomorphicMappedType";
-        InferencePriority[InferencePriority["MappedTypeConstraint"] = 4] = "MappedTypeConstraint";
-        InferencePriority[InferencePriority["ReturnType"] = 8] = "ReturnType";
-        InferencePriority[InferencePriority["LiteralKeyof"] = 16] = "LiteralKeyof";
-        InferencePriority[InferencePriority["NoConstraints"] = 32] = "NoConstraints";
-        InferencePriority[InferencePriority["AlwaysStrict"] = 64] = "AlwaysStrict";
-        InferencePriority[InferencePriority["PriorityImpliesCombination"] = 28] = "PriorityImpliesCombination";
+        InferencePriority[InferencePriority["PartialHomomorphicMappedType"] = 4] = "PartialHomomorphicMappedType";
+        InferencePriority[InferencePriority["MappedTypeConstraint"] = 8] = "MappedTypeConstraint";
+        InferencePriority[InferencePriority["ReturnType"] = 16] = "ReturnType";
+        InferencePriority[InferencePriority["LiteralKeyof"] = 32] = "LiteralKeyof";
+        InferencePriority[InferencePriority["NoConstraints"] = 64] = "NoConstraints";
+        InferencePriority[InferencePriority["AlwaysStrict"] = 128] = "AlwaysStrict";
+        InferencePriority[InferencePriority["PriorityImpliesCombination"] = 56] = "PriorityImpliesCombination";
     })(InferencePriority = ts.InferencePriority || (ts.InferencePriority = {}));
     /* @internal */
     var InferenceFlags;
@@ -3687,9 +3851,10 @@ var ts;
         ScriptTarget[ScriptTarget["ES2017"] = 4] = "ES2017";
         ScriptTarget[ScriptTarget["ES2018"] = 5] = "ES2018";
         ScriptTarget[ScriptTarget["ES2019"] = 6] = "ES2019";
-        ScriptTarget[ScriptTarget["ESNext"] = 7] = "ESNext";
+        ScriptTarget[ScriptTarget["ES2020"] = 7] = "ES2020";
+        ScriptTarget[ScriptTarget["ESNext"] = 8] = "ESNext";
         ScriptTarget[ScriptTarget["JSON"] = 100] = "JSON";
-        ScriptTarget[ScriptTarget["Latest"] = 7] = "Latest";
+        ScriptTarget[ScriptTarget["Latest"] = 8] = "Latest";
     })(ScriptTarget = ts.ScriptTarget || (ts.ScriptTarget = {}));
     var LanguageVariant;
     (function (LanguageVariant) {
@@ -4102,17 +4267,10 @@ var ts;
         PragmaKindFlags[PragmaKindFlags["All"] = 7] = "All";
         PragmaKindFlags[PragmaKindFlags["Default"] = 7] = "Default";
     })(PragmaKindFlags = ts.PragmaKindFlags || (ts.PragmaKindFlags = {}));
-    /**
-     * This function only exists to cause exact types to be inferred for all the literals within `commentPragmas`
-     */
-    /* @internal */
-    function _contextuallyTypePragmas(args) {
-        return args;
-    }
     // While not strictly a type, this is here because `PragmaMap` needs to be here to be used with `SourceFile`, and we don't
     //  fancy effectively defining it twice, once in value-space and once in type-space
     /* @internal */
-    ts.commentPragmas = _contextuallyTypePragmas({
+    ts.commentPragmas = {
         "reference": {
             args: [
                 { name: "types", optional: true, captureSpan: true },
@@ -4140,7 +4298,7 @@ var ts;
             args: [{ name: "factory" }],
             kind: 4 /* MultiLine */
         },
-    });
+    };
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -5187,7 +5345,7 @@ var ts;
         _0_modifier_cannot_appear_on_a_data_property: diag(1043, ts.DiagnosticCategory.Error, "_0_modifier_cannot_appear_on_a_data_property_1043", "'{0}' modifier cannot appear on a data property."),
         _0_modifier_cannot_appear_on_a_module_or_namespace_element: diag(1044, ts.DiagnosticCategory.Error, "_0_modifier_cannot_appear_on_a_module_or_namespace_element_1044", "'{0}' modifier cannot appear on a module or namespace element."),
         A_0_modifier_cannot_be_used_with_an_interface_declaration: diag(1045, ts.DiagnosticCategory.Error, "A_0_modifier_cannot_be_used_with_an_interface_declaration_1045", "A '{0}' modifier cannot be used with an interface declaration."),
-        A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: diag(1046, ts.DiagnosticCategory.Error, "A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file_1046", "A 'declare' modifier is required for a top level declaration in a .d.ts file."),
+        Top_level_declarations_in_d_ts_files_must_start_with_either_a_declare_or_export_modifier: diag(1046, ts.DiagnosticCategory.Error, "Top_level_declarations_in_d_ts_files_must_start_with_either_a_declare_or_export_modifier_1046", "Top-level declarations in .d.ts files must start with either a 'declare' or 'export' modifier."),
         A_rest_parameter_cannot_be_optional: diag(1047, ts.DiagnosticCategory.Error, "A_rest_parameter_cannot_be_optional_1047", "A rest parameter cannot be optional."),
         A_rest_parameter_cannot_have_an_initializer: diag(1048, ts.DiagnosticCategory.Error, "A_rest_parameter_cannot_have_an_initializer_1048", "A rest parameter cannot have an initializer."),
         A_set_accessor_must_have_exactly_one_parameter: diag(1049, ts.DiagnosticCategory.Error, "A_set_accessor_must_have_exactly_one_parameter_1049", "A 'set' accessor must have exactly one parameter."),
@@ -5316,7 +5474,7 @@ var ts;
         Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided: diag(1205, ts.DiagnosticCategory.Error, "Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided_1205", "Cannot re-export a type when the '--isolatedModules' flag is provided."),
         Decorators_are_not_valid_here: diag(1206, ts.DiagnosticCategory.Error, "Decorators_are_not_valid_here_1206", "Decorators are not valid here."),
         Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name: diag(1207, ts.DiagnosticCategory.Error, "Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name_1207", "Decorators cannot be applied to multiple get/set accessors of the same name."),
-        Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided: diag(1208, ts.DiagnosticCategory.Error, "Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided_1208", "Cannot compile namespaces when the '--isolatedModules' flag is provided."),
+        All_files_must_be_modules_when_the_isolatedModules_flag_is_provided: diag(1208, ts.DiagnosticCategory.Error, "All_files_must_be_modules_when_the_isolatedModules_flag_is_provided_1208", "All files must be modules when the '--isolatedModules' flag is provided."),
         Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode: diag(1210, ts.DiagnosticCategory.Error, "Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode_1210", "Invalid use of '{0}'. Class definitions are automatically in strict mode."),
         A_class_declaration_without_the_default_modifier_must_have_a_name: diag(1211, ts.DiagnosticCategory.Error, "A_class_declaration_without_the_default_modifier_must_have_a_name_1211", "A class declaration without the 'default' modifier must have a name."),
         Identifier_expected_0_is_a_reserved_word_in_strict_mode: diag(1212, ts.DiagnosticCategory.Error, "Identifier_expected_0_is_a_reserved_word_in_strict_mode_1212", "Identifier expected. '{0}' is a reserved word in strict mode."),
@@ -5325,7 +5483,7 @@ var ts;
         Invalid_use_of_0_Modules_are_automatically_in_strict_mode: diag(1215, ts.DiagnosticCategory.Error, "Invalid_use_of_0_Modules_are_automatically_in_strict_mode_1215", "Invalid use of '{0}'. Modules are automatically in strict mode."),
         Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules: diag(1216, ts.DiagnosticCategory.Error, "Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules_1216", "Identifier expected. '__esModule' is reserved as an exported marker when transforming ECMAScript modules."),
         Export_assignment_is_not_supported_when_module_flag_is_system: diag(1218, ts.DiagnosticCategory.Error, "Export_assignment_is_not_supported_when_module_flag_is_system_1218", "Export assignment is not supported when '--module' flag is 'system'."),
-        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning: diag(1219, ts.DiagnosticCategory.Error, "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_t_1219", "Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning."),
+        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning: diag(1219, ts.DiagnosticCategory.Error, "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_t_1219", "Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option in your 'tsconfig' or 'jsconfig' to remove this warning."),
         Generators_are_only_available_when_targeting_ECMAScript_2015_or_higher: diag(1220, ts.DiagnosticCategory.Error, "Generators_are_only_available_when_targeting_ECMAScript_2015_or_higher_1220", "Generators are only available when targeting ECMAScript 2015 or higher."),
         Generators_are_not_allowed_in_an_ambient_context: diag(1221, ts.DiagnosticCategory.Error, "Generators_are_not_allowed_in_an_ambient_context_1221", "Generators are not allowed in an ambient context."),
         An_overload_signature_cannot_be_declared_as_a_generator: diag(1222, ts.DiagnosticCategory.Error, "An_overload_signature_cannot_be_declared_as_a_generator_1222", "An overload signature cannot be declared as a generator."),
@@ -5364,6 +5522,8 @@ var ts;
         A_definite_assignment_assertion_is_not_permitted_in_this_context: diag(1255, ts.DiagnosticCategory.Error, "A_definite_assignment_assertion_is_not_permitted_in_this_context_1255", "A definite assignment assertion '!' is not permitted in this context."),
         A_rest_element_must_be_last_in_a_tuple_type: diag(1256, ts.DiagnosticCategory.Error, "A_rest_element_must_be_last_in_a_tuple_type_1256", "A rest element must be last in a tuple type."),
         A_required_element_cannot_follow_an_optional_element: diag(1257, ts.DiagnosticCategory.Error, "A_required_element_cannot_follow_an_optional_element_1257", "A required element cannot follow an optional element."),
+        Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation: diag(1258, ts.DiagnosticCategory.Error, "Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation_1258", "Definite assignment assertions can only be used along with a type annotation."),
+        Module_0_can_only_be_default_imported_using_the_1_flag: diag(1259, ts.DiagnosticCategory.Error, "Module_0_can_only_be_default_imported_using_the_1_flag_1259", "Module '{0}' can only be default-imported using the '{1}' flag"),
         with_statements_are_not_allowed_in_an_async_function_block: diag(1300, ts.DiagnosticCategory.Error, "with_statements_are_not_allowed_in_an_async_function_block_1300", "'with' statements are not allowed in an async function block."),
         await_expression_is_only_allowed_within_an_async_function: diag(1308, ts.DiagnosticCategory.Error, "await_expression_is_only_allowed_within_an_async_function_1308", "'await' expression is only allowed within an async function."),
         can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment: diag(1312, ts.DiagnosticCategory.Error, "can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment_1312", "'=' can only be used in an object literal property inside a destructuring assignment."),
@@ -5408,7 +5568,8 @@ var ts;
         A_bigint_literal_cannot_use_exponential_notation: diag(1352, ts.DiagnosticCategory.Error, "A_bigint_literal_cannot_use_exponential_notation_1352", "A bigint literal cannot use exponential notation."),
         A_bigint_literal_must_be_an_integer: diag(1353, ts.DiagnosticCategory.Error, "A_bigint_literal_must_be_an_integer_1353", "A bigint literal must be an integer."),
         readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types: diag(1354, ts.DiagnosticCategory.Error, "readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types_1354", "'readonly' type modifier is only permitted on array and tuple literal types."),
-        A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal: diag(1355, ts.DiagnosticCategory.Error, "A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal_1355", "A 'const' assertion can only be applied to a string, number, boolean, array, or object literal."),
+        A_const_assertions_can_only_be_applied_to_references_to_enum_members_or_string_number_boolean_array_or_object_literals: diag(1355, ts.DiagnosticCategory.Error, "A_const_assertions_can_only_be_applied_to_references_to_enum_members_or_string_number_boolean_array__1355", "A 'const' assertions can only be applied to references to enum members, or string, number, boolean, array, or object literals."),
+        Did_you_mean_to_mark_this_function_as_async: diag(1356, ts.DiagnosticCategory.Error, "Did_you_mean_to_mark_this_function_as_async_1356", "Did you mean to mark this function as 'async'?"),
         Duplicate_identifier_0: diag(2300, ts.DiagnosticCategory.Error, "Duplicate_identifier_0_2300", "Duplicate identifier '{0}'."),
         Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: diag(2301, ts.DiagnosticCategory.Error, "Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301", "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor."),
         Static_members_cannot_reference_class_type_parameters: diag(2302, ts.DiagnosticCategory.Error, "Static_members_cannot_reference_class_type_parameters_2302", "Static members cannot reference class type parameters."),
@@ -5690,6 +5851,7 @@ var ts;
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_and_then_add_node_to_the_types_field_in_your_tsconfig: diag(2591, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_types_Slashnode_and_th_2591", "Cannot find name '{0}'. Do you need to install type definitions for node? Try `npm i @types/node` and then add `node` to the types field in your tsconfig."),
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_and_then_add_jquery_to_the_types_field_in_your_tsconfig: diag(2592, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_jQuery_Try_npm_i_types_Slashjquery_an_2592", "Cannot find name '{0}'. Do you need to install type definitions for jQuery? Try `npm i @types/jquery` and then add `jquery` to the types field in your tsconfig."),
         Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashjest_or_npm_i_types_Slashmocha_and_then_add_jest_or_mocha_to_the_types_field_in_your_tsconfig: diag(2593, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_a_test_runner_Try_npm_i_types_Slashje_2593", "Cannot find name '{0}'. Do you need to install type definitions for a test runner? Try `npm i @types/jest` or `npm i @types/mocha` and then add `jest` or `mocha` to the types field in your tsconfig."),
+        This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag: diag(2594, ts.DiagnosticCategory.Error, "This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the__2594", "This module is declared with using 'export =', and can only be used with a default import when using the '{0}' flag."),
         JSX_element_attributes_type_0_may_not_be_a_union_type: diag(2600, ts.DiagnosticCategory.Error, "JSX_element_attributes_type_0_may_not_be_a_union_type_2600", "JSX element attributes type '{0}' may not be a union type."),
         The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: diag(2601, ts.DiagnosticCategory.Error, "The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601", "The return type of a JSX element constructor must return an object type."),
         JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist: diag(2602, ts.DiagnosticCategory.Error, "JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602", "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist."),
@@ -5802,6 +5964,7 @@ var ts;
         Circularity_originates_in_type_at_this_location: diag(2751, ts.DiagnosticCategory.Error, "Circularity_originates_in_type_at_this_location_2751", "Circularity originates in type at this location."),
         The_first_export_default_is_here: diag(2752, ts.DiagnosticCategory.Error, "The_first_export_default_is_here_2752", "The first export default is here."),
         Another_export_default_is_here: diag(2753, ts.DiagnosticCategory.Error, "Another_export_default_is_here_2753", "Another export default is here."),
+        super_may_not_use_type_arguments: diag(2754, ts.DiagnosticCategory.Error, "super_may_not_use_type_arguments_2754", "'super' may not use type arguments."),
         Import_declaration_0_is_using_private_name_1: diag(4000, ts.DiagnosticCategory.Error, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),
@@ -5886,6 +6049,7 @@ var ts;
         Method_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: diag(4101, ts.DiagnosticCategory.Error, "Method_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2_4101", "Method '{0}' of exported interface has or is using name '{1}' from private module '{2}'."),
         Method_0_of_exported_interface_has_or_is_using_private_name_1: diag(4102, ts.DiagnosticCategory.Error, "Method_0_of_exported_interface_has_or_is_using_private_name_1_4102", "Method '{0}' of exported interface has or is using private name '{1}'."),
         Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1: diag(4103, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1_4103", "Type parameter '{0}' of exported mapped object type is using private name '{1}'."),
+        The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1: diag(4104, ts.DiagnosticCategory.Error, "The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1_4104", "The type '{0}' is 'readonly' and cannot be assigned to the mutable type '{1}'."),
         The_current_host_does_not_support_the_0_option: diag(5001, ts.DiagnosticCategory.Error, "The_current_host_does_not_support_the_0_option_5001", "The current host does not support the '{0}' option."),
         Cannot_find_the_common_subdirectory_path_for_the_input_files: diag(5009, ts.DiagnosticCategory.Error, "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", "Cannot find the common subdirectory path for the input files."),
         File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: diag(5010, ts.DiagnosticCategory.Error, "File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0_5010", "File specification cannot end in a recursive directory wildcard ('**'): '{0}'."),
@@ -5919,6 +6083,8 @@ var ts;
         Option_resolveJsonModule_can_only_be_specified_when_module_code_generation_is_commonjs_amd_es2015_or_esNext: diag(5071, ts.DiagnosticCategory.Error, "Option_resolveJsonModule_can_only_be_specified_when_module_code_generation_is_commonjs_amd_es2015_or_5071", "Option '--resolveJsonModule' can only be specified when module code generation is 'commonjs', 'amd', 'es2015' or 'esNext'."),
         Unknown_build_option_0: diag(5072, ts.DiagnosticCategory.Error, "Unknown_build_option_0_5072", "Unknown build option '{0}'."),
         Build_option_0_requires_a_value_of_type_1: diag(5073, ts.DiagnosticCategory.Error, "Build_option_0_requires_a_value_of_type_1_5073", "Build option '{0}' requires a value of type {1}."),
+        Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBuildInfoFile_is_specified: diag(5074, ts.DiagnosticCategory.Error, "Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBui_5074", "Option '--incremental' can only be specified using tsconfig, emitting to single file or when option `--tsBuildInfoFile` is specified."),
+        _0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_constraint_2: diag(5075, ts.DiagnosticCategory.Error, "_0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_5075", "'{0}' is assignable to the constraint of type '{1}', but '{1}' could be instantiated with a different subtype of constraint '{2}'."),
         Generates_a_sourcemap_for_each_corresponding_d_ts_file: diag(6000, ts.DiagnosticCategory.Message, "Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000", "Generates a sourcemap for each corresponding '.d.ts' file."),
         Concatenate_and_emit_output_to_single_file: diag(6001, ts.DiagnosticCategory.Message, "Concatenate_and_emit_output_to_single_file_6001", "Concatenate and emit output to single file."),
         Generates_corresponding_d_ts_file: diag(6002, ts.DiagnosticCategory.Message, "Generates_corresponding_d_ts_file_6002", "Generates corresponding '.d.ts' file."),
@@ -6095,7 +6261,6 @@ var ts;
         Enable_strict_checking_of_property_initialization_in_classes: diag(6187, ts.DiagnosticCategory.Message, "Enable_strict_checking_of_property_initialization_in_classes_6187", "Enable strict checking of property initialization in classes."),
         Numeric_separators_are_not_allowed_here: diag(6188, ts.DiagnosticCategory.Error, "Numeric_separators_are_not_allowed_here_6188", "Numeric separators are not allowed here."),
         Multiple_consecutive_numeric_separators_are_not_permitted: diag(6189, ts.DiagnosticCategory.Error, "Multiple_consecutive_numeric_separators_are_not_permitted_6189", "Multiple consecutive numeric separators are not permitted."),
-        Found_package_json_at_0_Package_ID_is_1: diag(6190, ts.DiagnosticCategory.Message, "Found_package_json_at_0_Package_ID_is_1_6190", "Found 'package.json' at '{0}'. Package ID is '{1}'."),
         Whether_to_keep_outdated_console_output_in_watch_mode_instead_of_clearing_the_screen: diag(6191, ts.DiagnosticCategory.Message, "Whether_to_keep_outdated_console_output_in_watch_mode_instead_of_clearing_the_screen_6191", "Whether to keep outdated console output in watch mode instead of clearing the screen."),
         All_imports_in_import_declaration_are_unused: diag(6192, ts.DiagnosticCategory.Error, "All_imports_in_import_declaration_are_unused_6192", "All imports in import declaration are unused.", /*reportsUnnecessary*/ true),
         Found_1_error_Watching_for_file_changes: diag(6193, ts.DiagnosticCategory.Message, "Found_1_error_Watching_for_file_changes_6193", "Found 1 error. Watching for file changes."),
@@ -6122,6 +6287,9 @@ var ts;
         Using_compiler_options_of_project_reference_redirect_0: diag(6215, ts.DiagnosticCategory.Message, "Using_compiler_options_of_project_reference_redirect_0_6215", "Using compiler options of project reference redirect '{0}'."),
         Found_1_error: diag(6216, ts.DiagnosticCategory.Message, "Found_1_error_6216", "Found 1 error."),
         Found_0_errors: diag(6217, ts.DiagnosticCategory.Message, "Found_0_errors_6217", "Found {0} errors."),
+        Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2: diag(6218, ts.DiagnosticCategory.Message, "Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2_6218", "======== Module name '{0}' was successfully resolved to '{1}' with Package ID '{2}'. ========"),
+        Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3: diag(6219, ts.DiagnosticCategory.Message, "Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3_6219", "======== Type reference directive '{0}' was successfully resolved to '{1}' with Package ID '{2}', primary: {3}. ========"),
+        package_json_had_a_falsy_0_field: diag(6220, ts.DiagnosticCategory.Message, "package_json_had_a_falsy_0_field_6220", "'package.json' had a falsy '{0}' field."),
         Projects_to_reference: diag(6300, ts.DiagnosticCategory.Message, "Projects_to_reference_6300", "Projects to reference"),
         Enable_project_compilation: diag(6302, ts.DiagnosticCategory.Message, "Enable_project_compilation_6302", "Enable project compilation"),
         Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0: diag(6202, ts.DiagnosticCategory.Error, "Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0_6202", "Project references may not form a circular graph. Cycle detected: {0}"),
@@ -6210,6 +6378,9 @@ var ts;
         Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage: diag(7049, ts.DiagnosticCategory.Suggestion, "Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage_7049", "Property '{0}' implicitly has type 'any', but a better type for its set accessor may be inferred from usage."),
         _0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage: diag(7050, ts.DiagnosticCategory.Suggestion, "_0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage_7050", "'{0}' implicitly has an '{1}' return type, but a better type may be inferred from usage."),
         Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1: diag(7051, ts.DiagnosticCategory.Error, "Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1_7051", "Parameter has a name but no type. Did you mean '{0}: {1}'?"),
+        Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_Did_you_mean_to_call_1: diag(7052, ts.DiagnosticCategory.Error, "Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_Did_you_mean_to_call_1_7052", "Element implicitly has an 'any' type because type '{0}' has no index signature. Did you mean to call '{1}' ?"),
+        Element_implicitly_has_an_any_type_because_expression_of_type_0_can_t_be_used_to_index_type_1: diag(7053, ts.DiagnosticCategory.Error, "Element_implicitly_has_an_any_type_because_expression_of_type_0_can_t_be_used_to_index_type_1_7053", "Element implicitly has an 'any' type because expression of type '{0}' can't be used to index type '{1}'."),
+        No_index_signature_with_a_parameter_of_type_0_was_found_on_type_1: diag(7054, ts.DiagnosticCategory.Error, "No_index_signature_with_a_parameter_of_type_0_was_found_on_type_1_7054", "No index signature with a parameter of type '{0}' was found on type '{1}'."),
         You_cannot_rename_this_element: diag(8000, ts.DiagnosticCategory.Error, "You_cannot_rename_this_element_8000", "You cannot rename this element."),
         You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: diag(8001, ts.DiagnosticCategory.Error, "You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library_8001", "You cannot rename elements that are defined in the standard TypeScript library."),
         import_can_only_be_used_in_a_ts_file: diag(8002, ts.DiagnosticCategory.Error, "import_can_only_be_used_in_a_ts_file_8002", "'import ... =' can only be used in a .ts file."),
@@ -6371,8 +6542,6 @@ var ts;
         Add_all_missing_imports: diag(95064, ts.DiagnosticCategory.Message, "Add_all_missing_imports_95064", "Add all missing imports"),
         Convert_to_async_function: diag(95065, ts.DiagnosticCategory.Message, "Convert_to_async_function_95065", "Convert to async function"),
         Convert_all_to_async_functions: diag(95066, ts.DiagnosticCategory.Message, "Convert_all_to_async_functions_95066", "Convert all to async functions"),
-        Generate_types_for_0: diag(95067, ts.DiagnosticCategory.Message, "Generate_types_for_0_95067", "Generate types for '{0}'"),
-        Generate_types_for_all_packages_without_types: diag(95068, ts.DiagnosticCategory.Message, "Generate_types_for_all_packages_without_types_95068", "Generate types for all packages without types"),
         Add_unknown_conversion_for_non_overlapping_types: diag(95069, ts.DiagnosticCategory.Message, "Add_unknown_conversion_for_non_overlapping_types_95069", "Add 'unknown' conversion for non-overlapping types"),
         Add_unknown_to_all_conversions_of_non_overlapping_types: diag(95070, ts.DiagnosticCategory.Message, "Add_unknown_to_all_conversions_of_non_overlapping_types_95070", "Add 'unknown' to all conversions of non-overlapping types"),
         Add_missing_new_operator_to_call: diag(95071, ts.DiagnosticCategory.Message, "Add_missing_new_operator_to_call_95071", "Add missing 'new' operator to call"),
@@ -6380,6 +6549,13 @@ var ts;
         Add_names_to_all_parameters_without_names: diag(95073, ts.DiagnosticCategory.Message, "Add_names_to_all_parameters_without_names_95073", "Add names to all parameters without names"),
         Enable_the_experimentalDecorators_option_in_your_configuration_file: diag(95074, ts.DiagnosticCategory.Message, "Enable_the_experimentalDecorators_option_in_your_configuration_file_95074", "Enable the 'experimentalDecorators' option in your configuration file"),
         Convert_parameters_to_destructured_object: diag(95075, ts.DiagnosticCategory.Message, "Convert_parameters_to_destructured_object_95075", "Convert parameters to destructured object"),
+        Allow_accessing_UMD_globals_from_modules: diag(95076, ts.DiagnosticCategory.Message, "Allow_accessing_UMD_globals_from_modules_95076", "Allow accessing UMD globals from modules."),
+        Extract_type: diag(95077, ts.DiagnosticCategory.Message, "Extract_type_95077", "Extract type"),
+        Extract_to_type_alias: diag(95078, ts.DiagnosticCategory.Message, "Extract_to_type_alias_95078", "Extract to type alias"),
+        Extract_to_typedef: diag(95079, ts.DiagnosticCategory.Message, "Extract_to_typedef_95079", "Extract to typedef"),
+        No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, ts.DiagnosticCategory.Error, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
+        Quoted_constructors_have_previously_been_interpreted_as_methods_which_is_incorrect_In_TypeScript_3_6_they_will_be_correctly_parsed_as_constructors_In_the_meantime_consider_using_constructor_to_write_a_constructor_or_constructor_to_write_a_method: diag(18005, ts.DiagnosticCategory.Error, "Quoted_constructors_have_previously_been_interpreted_as_methods_which_is_incorrect_In_TypeScript_3_6_18005", "Quoted constructors have previously been interpreted as methods, which is incorrect. In TypeScript 3.6, they will be correctly parsed as constructors. In the meantime, consider using 'constructor()' to write a constructor, or '[\"constructor\"]()' to write a method."),
+        Classes_may_not_have_a_field_named_constructor: diag(18006, ts.DiagnosticCategory.Error, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
     };
 })(ts || (ts = {}));
 var ts;
@@ -6387,7 +6563,7 @@ var ts;
     var _a;
     /* @internal */
     function tokenIsIdentifierOrKeyword(token) {
-        return token >= 72 /* Identifier */;
+        return token >= 73 /* Identifier */;
     }
     ts.tokenIsIdentifierOrKeyword = tokenIsIdentifierOrKeyword;
     /* @internal */
@@ -6396,85 +6572,85 @@ var ts;
     }
     ts.tokenIsIdentifierOrKeywordOrGreaterThan = tokenIsIdentifierOrKeywordOrGreaterThan;
     var textToKeywordObj = (_a = {
-            abstract: 118 /* AbstractKeyword */,
-            any: 120 /* AnyKeyword */,
-            as: 119 /* AsKeyword */,
-            bigint: 146 /* BigIntKeyword */,
-            boolean: 123 /* BooleanKeyword */,
-            break: 73 /* BreakKeyword */,
-            case: 74 /* CaseKeyword */,
-            catch: 75 /* CatchKeyword */,
-            class: 76 /* ClassKeyword */,
-            continue: 78 /* ContinueKeyword */,
-            const: 77 /* ConstKeyword */
+            abstract: 119 /* AbstractKeyword */,
+            any: 121 /* AnyKeyword */,
+            as: 120 /* AsKeyword */,
+            bigint: 147 /* BigIntKeyword */,
+            boolean: 124 /* BooleanKeyword */,
+            break: 74 /* BreakKeyword */,
+            case: 75 /* CaseKeyword */,
+            catch: 76 /* CatchKeyword */,
+            class: 77 /* ClassKeyword */,
+            continue: 79 /* ContinueKeyword */,
+            const: 78 /* ConstKeyword */
         },
-        _a["" + "constructor"] = 124 /* ConstructorKeyword */,
-        _a.debugger = 79 /* DebuggerKeyword */,
-        _a.declare = 125 /* DeclareKeyword */,
-        _a.default = 80 /* DefaultKeyword */,
-        _a.delete = 81 /* DeleteKeyword */,
-        _a.do = 82 /* DoKeyword */,
-        _a.else = 83 /* ElseKeyword */,
-        _a.enum = 84 /* EnumKeyword */,
-        _a.export = 85 /* ExportKeyword */,
-        _a.extends = 86 /* ExtendsKeyword */,
-        _a.false = 87 /* FalseKeyword */,
-        _a.finally = 88 /* FinallyKeyword */,
-        _a.for = 89 /* ForKeyword */,
-        _a.from = 144 /* FromKeyword */,
-        _a.function = 90 /* FunctionKeyword */,
-        _a.get = 126 /* GetKeyword */,
-        _a.if = 91 /* IfKeyword */,
-        _a.implements = 109 /* ImplementsKeyword */,
-        _a.import = 92 /* ImportKeyword */,
-        _a.in = 93 /* InKeyword */,
-        _a.infer = 127 /* InferKeyword */,
-        _a.instanceof = 94 /* InstanceOfKeyword */,
-        _a.interface = 110 /* InterfaceKeyword */,
-        _a.is = 128 /* IsKeyword */,
-        _a.keyof = 129 /* KeyOfKeyword */,
-        _a.let = 111 /* LetKeyword */,
-        _a.module = 130 /* ModuleKeyword */,
-        _a.namespace = 131 /* NamespaceKeyword */,
-        _a.never = 132 /* NeverKeyword */,
-        _a.new = 95 /* NewKeyword */,
-        _a.null = 96 /* NullKeyword */,
-        _a.number = 135 /* NumberKeyword */,
-        _a.object = 136 /* ObjectKeyword */,
-        _a.package = 112 /* PackageKeyword */,
-        _a.private = 113 /* PrivateKeyword */,
-        _a.protected = 114 /* ProtectedKeyword */,
-        _a.public = 115 /* PublicKeyword */,
-        _a.readonly = 133 /* ReadonlyKeyword */,
-        _a.require = 134 /* RequireKeyword */,
-        _a.global = 145 /* GlobalKeyword */,
-        _a.return = 97 /* ReturnKeyword */,
-        _a.set = 137 /* SetKeyword */,
-        _a.static = 116 /* StaticKeyword */,
-        _a.string = 138 /* StringKeyword */,
-        _a.super = 98 /* SuperKeyword */,
-        _a.switch = 99 /* SwitchKeyword */,
-        _a.symbol = 139 /* SymbolKeyword */,
-        _a.this = 100 /* ThisKeyword */,
-        _a.throw = 101 /* ThrowKeyword */,
-        _a.true = 102 /* TrueKeyword */,
-        _a.try = 103 /* TryKeyword */,
-        _a.type = 140 /* TypeKeyword */,
-        _a.typeof = 104 /* TypeOfKeyword */,
-        _a.undefined = 141 /* UndefinedKeyword */,
-        _a.unique = 142 /* UniqueKeyword */,
-        _a.unknown = 143 /* UnknownKeyword */,
-        _a.var = 105 /* VarKeyword */,
-        _a.void = 106 /* VoidKeyword */,
-        _a.while = 107 /* WhileKeyword */,
-        _a.with = 108 /* WithKeyword */,
-        _a.yield = 117 /* YieldKeyword */,
-        _a.async = 121 /* AsyncKeyword */,
-        _a.await = 122 /* AwaitKeyword */,
-        _a.of = 147 /* OfKeyword */,
+        _a["" + "constructor"] = 125 /* ConstructorKeyword */,
+        _a.debugger = 80 /* DebuggerKeyword */,
+        _a.declare = 126 /* DeclareKeyword */,
+        _a.default = 81 /* DefaultKeyword */,
+        _a.delete = 82 /* DeleteKeyword */,
+        _a.do = 83 /* DoKeyword */,
+        _a.else = 84 /* ElseKeyword */,
+        _a.enum = 85 /* EnumKeyword */,
+        _a.export = 86 /* ExportKeyword */,
+        _a.extends = 87 /* ExtendsKeyword */,
+        _a.false = 88 /* FalseKeyword */,
+        _a.finally = 89 /* FinallyKeyword */,
+        _a.for = 90 /* ForKeyword */,
+        _a.from = 145 /* FromKeyword */,
+        _a.function = 91 /* FunctionKeyword */,
+        _a.get = 127 /* GetKeyword */,
+        _a.if = 92 /* IfKeyword */,
+        _a.implements = 110 /* ImplementsKeyword */,
+        _a.import = 93 /* ImportKeyword */,
+        _a.in = 94 /* InKeyword */,
+        _a.infer = 128 /* InferKeyword */,
+        _a.instanceof = 95 /* InstanceOfKeyword */,
+        _a.interface = 111 /* InterfaceKeyword */,
+        _a.is = 129 /* IsKeyword */,
+        _a.keyof = 130 /* KeyOfKeyword */,
+        _a.let = 112 /* LetKeyword */,
+        _a.module = 131 /* ModuleKeyword */,
+        _a.namespace = 132 /* NamespaceKeyword */,
+        _a.never = 133 /* NeverKeyword */,
+        _a.new = 96 /* NewKeyword */,
+        _a.null = 97 /* NullKeyword */,
+        _a.number = 136 /* NumberKeyword */,
+        _a.object = 137 /* ObjectKeyword */,
+        _a.package = 113 /* PackageKeyword */,
+        _a.private = 114 /* PrivateKeyword */,
+        _a.protected = 115 /* ProtectedKeyword */,
+        _a.public = 116 /* PublicKeyword */,
+        _a.readonly = 134 /* ReadonlyKeyword */,
+        _a.require = 135 /* RequireKeyword */,
+        _a.global = 146 /* GlobalKeyword */,
+        _a.return = 98 /* ReturnKeyword */,
+        _a.set = 138 /* SetKeyword */,
+        _a.static = 117 /* StaticKeyword */,
+        _a.string = 139 /* StringKeyword */,
+        _a.super = 99 /* SuperKeyword */,
+        _a.switch = 100 /* SwitchKeyword */,
+        _a.symbol = 140 /* SymbolKeyword */,
+        _a.this = 101 /* ThisKeyword */,
+        _a.throw = 102 /* ThrowKeyword */,
+        _a.true = 103 /* TrueKeyword */,
+        _a.try = 104 /* TryKeyword */,
+        _a.type = 141 /* TypeKeyword */,
+        _a.typeof = 105 /* TypeOfKeyword */,
+        _a.undefined = 142 /* UndefinedKeyword */,
+        _a.unique = 143 /* UniqueKeyword */,
+        _a.unknown = 144 /* UnknownKeyword */,
+        _a.var = 106 /* VarKeyword */,
+        _a.void = 107 /* VoidKeyword */,
+        _a.while = 108 /* WhileKeyword */,
+        _a.with = 109 /* WithKeyword */,
+        _a.yield = 118 /* YieldKeyword */,
+        _a.async = 122 /* AsyncKeyword */,
+        _a.await = 123 /* AwaitKeyword */,
+        _a.of = 148 /* OfKeyword */,
         _a);
     var textToKeyword = ts.createMapFromTemplate(textToKeywordObj);
-    var textToToken = ts.createMapFromTemplate(__assign({}, textToKeywordObj, { "{": 18 /* OpenBraceToken */, "}": 19 /* CloseBraceToken */, "(": 20 /* OpenParenToken */, ")": 21 /* CloseParenToken */, "[": 22 /* OpenBracketToken */, "]": 23 /* CloseBracketToken */, ".": 24 /* DotToken */, "...": 25 /* DotDotDotToken */, ";": 26 /* SemicolonToken */, ",": 27 /* CommaToken */, "<": 28 /* LessThanToken */, ">": 30 /* GreaterThanToken */, "<=": 31 /* LessThanEqualsToken */, ">=": 32 /* GreaterThanEqualsToken */, "==": 33 /* EqualsEqualsToken */, "!=": 34 /* ExclamationEqualsToken */, "===": 35 /* EqualsEqualsEqualsToken */, "!==": 36 /* ExclamationEqualsEqualsToken */, "=>": 37 /* EqualsGreaterThanToken */, "+": 38 /* PlusToken */, "-": 39 /* MinusToken */, "**": 41 /* AsteriskAsteriskToken */, "*": 40 /* AsteriskToken */, "/": 42 /* SlashToken */, "%": 43 /* PercentToken */, "++": 44 /* PlusPlusToken */, "--": 45 /* MinusMinusToken */, "<<": 46 /* LessThanLessThanToken */, "</": 29 /* LessThanSlashToken */, ">>": 47 /* GreaterThanGreaterThanToken */, ">>>": 48 /* GreaterThanGreaterThanGreaterThanToken */, "&": 49 /* AmpersandToken */, "|": 50 /* BarToken */, "^": 51 /* CaretToken */, "!": 52 /* ExclamationToken */, "~": 53 /* TildeToken */, "&&": 54 /* AmpersandAmpersandToken */, "||": 55 /* BarBarToken */, "?": 56 /* QuestionToken */, ":": 57 /* ColonToken */, "=": 59 /* EqualsToken */, "+=": 60 /* PlusEqualsToken */, "-=": 61 /* MinusEqualsToken */, "*=": 62 /* AsteriskEqualsToken */, "**=": 63 /* AsteriskAsteriskEqualsToken */, "/=": 64 /* SlashEqualsToken */, "%=": 65 /* PercentEqualsToken */, "<<=": 66 /* LessThanLessThanEqualsToken */, ">>=": 67 /* GreaterThanGreaterThanEqualsToken */, ">>>=": 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */, "&=": 69 /* AmpersandEqualsToken */, "|=": 70 /* BarEqualsToken */, "^=": 71 /* CaretEqualsToken */, "@": 58 /* AtToken */ }));
+    var textToToken = ts.createMapFromTemplate(__assign({}, textToKeywordObj, { "{": 18 /* OpenBraceToken */, "}": 19 /* CloseBraceToken */, "(": 20 /* OpenParenToken */, ")": 21 /* CloseParenToken */, "[": 22 /* OpenBracketToken */, "]": 23 /* CloseBracketToken */, ".": 24 /* DotToken */, "...": 25 /* DotDotDotToken */, ";": 26 /* SemicolonToken */, ",": 27 /* CommaToken */, "<": 28 /* LessThanToken */, ">": 30 /* GreaterThanToken */, "<=": 31 /* LessThanEqualsToken */, ">=": 32 /* GreaterThanEqualsToken */, "==": 33 /* EqualsEqualsToken */, "!=": 34 /* ExclamationEqualsToken */, "===": 35 /* EqualsEqualsEqualsToken */, "!==": 36 /* ExclamationEqualsEqualsToken */, "=>": 37 /* EqualsGreaterThanToken */, "+": 38 /* PlusToken */, "-": 39 /* MinusToken */, "**": 41 /* AsteriskAsteriskToken */, "*": 40 /* AsteriskToken */, "/": 42 /* SlashToken */, "%": 43 /* PercentToken */, "++": 44 /* PlusPlusToken */, "--": 45 /* MinusMinusToken */, "<<": 46 /* LessThanLessThanToken */, "</": 29 /* LessThanSlashToken */, ">>": 47 /* GreaterThanGreaterThanToken */, ">>>": 48 /* GreaterThanGreaterThanGreaterThanToken */, "&": 49 /* AmpersandToken */, "|": 50 /* BarToken */, "^": 51 /* CaretToken */, "!": 52 /* ExclamationToken */, "~": 53 /* TildeToken */, "&&": 54 /* AmpersandAmpersandToken */, "||": 55 /* BarBarToken */, "?": 56 /* QuestionToken */, ":": 57 /* ColonToken */, "=": 60 /* EqualsToken */, "+=": 61 /* PlusEqualsToken */, "-=": 62 /* MinusEqualsToken */, "*=": 63 /* AsteriskEqualsToken */, "**=": 64 /* AsteriskAsteriskEqualsToken */, "/=": 65 /* SlashEqualsToken */, "%=": 66 /* PercentEqualsToken */, "<<=": 67 /* LessThanLessThanEqualsToken */, ">>=": 68 /* GreaterThanGreaterThanEqualsToken */, ">>>=": 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */, "&=": 70 /* AmpersandEqualsToken */, "|=": 71 /* BarEqualsToken */, "^=": 72 /* CaretEqualsToken */, "@": 58 /* AtToken */ }));
     /*
         As per ECMAScript Language Specification 3th Edition, Section 7.6: Identifiers
         IdentifierStart ::
@@ -7088,8 +7264,8 @@ var ts;
             getTokenValue: function () { return tokenValue; },
             hasExtendedUnicodeEscape: function () { return (tokenFlags & 8 /* ExtendedUnicodeEscape */) !== 0; },
             hasPrecedingLineBreak: function () { return (tokenFlags & 1 /* PrecedingLineBreak */) !== 0; },
-            isIdentifier: function () { return token === 72 /* Identifier */ || token > 108 /* LastReservedWord */; },
-            isReservedWord: function () { return token >= 73 /* FirstReservedWord */ && token <= 108 /* LastReservedWord */; },
+            isIdentifier: function () { return token === 73 /* Identifier */ || token > 109 /* LastReservedWord */; },
+            isReservedWord: function () { return token >= 74 /* FirstReservedWord */ && token <= 109 /* LastReservedWord */; },
             isUnterminated: function () { return (tokenFlags & 4 /* Unterminated */) !== 0; },
             getTokenFlags: function () { return tokenFlags; },
             reScanGreaterToken: reScanGreaterToken,
@@ -7100,7 +7276,7 @@ var ts;
             reScanJsxToken: reScanJsxToken,
             reScanLessThanToken: reScanLessThanToken,
             scanJsxToken: scanJsxToken,
-            scanJSDocToken: scanJSDocToken,
+            scanJsDocToken: scanJsDocToken,
             scan: scan,
             getText: getText,
             setText: setText,
@@ -7540,7 +7716,7 @@ var ts;
                     }
                 }
             }
-            return token = 72 /* Identifier */;
+            return token = 73 /* Identifier */;
         }
         function scanBinaryOrOctalDigits(base) {
             var value = "";
@@ -7689,7 +7865,7 @@ var ts;
                         return token = scanTemplateAndSetTokenValue();
                     case 37 /* percent */:
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 65 /* PercentEqualsToken */;
+                            return pos += 2, token = 66 /* PercentEqualsToken */;
                         }
                         pos++;
                         return token = 43 /* PercentToken */;
@@ -7698,7 +7874,7 @@ var ts;
                             return pos += 2, token = 54 /* AmpersandAmpersandToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 69 /* AmpersandEqualsToken */;
+                            return pos += 2, token = 70 /* AmpersandEqualsToken */;
                         }
                         pos++;
                         return token = 49 /* AmpersandToken */;
@@ -7710,11 +7886,11 @@ var ts;
                         return token = 21 /* CloseParenToken */;
                     case 42 /* asterisk */:
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 62 /* AsteriskEqualsToken */;
+                            return pos += 2, token = 63 /* AsteriskEqualsToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 42 /* asterisk */) {
                             if (text.charCodeAt(pos + 2) === 61 /* equals */) {
-                                return pos += 3, token = 63 /* AsteriskAsteriskEqualsToken */;
+                                return pos += 3, token = 64 /* AsteriskAsteriskEqualsToken */;
                             }
                             return pos += 2, token = 41 /* AsteriskAsteriskToken */;
                         }
@@ -7730,7 +7906,7 @@ var ts;
                             return pos += 2, token = 44 /* PlusPlusToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 60 /* PlusEqualsToken */;
+                            return pos += 2, token = 61 /* PlusEqualsToken */;
                         }
                         pos++;
                         return token = 38 /* PlusToken */;
@@ -7742,7 +7918,7 @@ var ts;
                             return pos += 2, token = 45 /* MinusMinusToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 61 /* MinusEqualsToken */;
+                            return pos += 2, token = 62 /* MinusEqualsToken */;
                         }
                         pos++;
                         return token = 39 /* MinusToken */;
@@ -7806,7 +7982,7 @@ var ts;
                             }
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 64 /* SlashEqualsToken */;
+                            return pos += 2, token = 65 /* SlashEqualsToken */;
                         }
                         pos++;
                         return token = 42 /* SlashToken */;
@@ -7883,7 +8059,7 @@ var ts;
                         }
                         if (text.charCodeAt(pos + 1) === 60 /* lessThan */) {
                             if (text.charCodeAt(pos + 2) === 61 /* equals */) {
-                                return pos += 3, token = 66 /* LessThanLessThanEqualsToken */;
+                                return pos += 3, token = 67 /* LessThanLessThanEqualsToken */;
                             }
                             return pos += 2, token = 46 /* LessThanLessThanToken */;
                         }
@@ -7917,7 +8093,7 @@ var ts;
                             return pos += 2, token = 37 /* EqualsGreaterThanToken */;
                         }
                         pos++;
-                        return token = 59 /* EqualsToken */;
+                        return token = 60 /* EqualsToken */;
                     case 62 /* greaterThan */:
                         if (isConflictMarkerTrivia(text, pos)) {
                             pos = scanConflictMarkerTrivia(text, pos, error);
@@ -7941,7 +8117,7 @@ var ts;
                         return token = 23 /* CloseBracketToken */;
                     case 94 /* caret */:
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 71 /* CaretEqualsToken */;
+                            return pos += 2, token = 72 /* CaretEqualsToken */;
                         }
                         pos++;
                         return token = 51 /* CaretToken */;
@@ -7962,7 +8138,7 @@ var ts;
                             return pos += 2, token = 55 /* BarBarToken */;
                         }
                         if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 70 /* BarEqualsToken */;
+                            return pos += 2, token = 71 /* BarEqualsToken */;
                         }
                         pos++;
                         return token = 50 /* BarToken */;
@@ -8016,12 +8192,12 @@ var ts;
                 if (text.charCodeAt(pos) === 62 /* greaterThan */) {
                     if (text.charCodeAt(pos + 1) === 62 /* greaterThan */) {
                         if (text.charCodeAt(pos + 2) === 61 /* equals */) {
-                            return pos += 3, token = 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */;
+                            return pos += 3, token = 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */;
                         }
                         return pos += 2, token = 48 /* GreaterThanGreaterThanGreaterThanToken */;
                     }
                     if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                        return pos += 2, token = 67 /* GreaterThanGreaterThanEqualsToken */;
+                        return pos += 2, token = 68 /* GreaterThanGreaterThanEqualsToken */;
                     }
                     pos++;
                     return token = 47 /* GreaterThanGreaterThanToken */;
@@ -8034,7 +8210,7 @@ var ts;
             return token;
         }
         function reScanSlashToken() {
-            if (token === 42 /* SlashToken */ || token === 64 /* SlashEqualsToken */) {
+            if (token === 42 /* SlashToken */ || token === 65 /* SlashEqualsToken */) {
                 var p = tokenPos + 1;
                 var inEscape = false;
                 var inCharacterClass = false;
@@ -8183,7 +8359,7 @@ var ts;
                     return scan();
             }
         }
-        function scanJSDocToken() {
+        function scanJsDocToken() {
             startPos = tokenPos = pos;
             tokenFlags = 0;
             if (pos >= end) {
@@ -8219,21 +8395,16 @@ var ts;
                 case 60 /* lessThan */:
                     return token = 28 /* LessThanToken */;
                 case 61 /* equals */:
-                    return token = 59 /* EqualsToken */;
+                    return token = 60 /* EqualsToken */;
                 case 44 /* comma */:
                     return token = 27 /* CommaToken */;
                 case 46 /* dot */:
                     return token = 24 /* DotToken */;
                 case 96 /* backtick */:
-                    while (pos < end && text.charCodeAt(pos) !== 96 /* backtick */) {
-                        pos++;
-                    }
-                    tokenValue = text.substring(tokenPos + 1, pos);
-                    pos++;
-                    return token = 14 /* NoSubstitutionTemplateLiteral */;
+                    return token = 59 /* BacktickToken */;
             }
-            if (isIdentifierStart(ch, 7 /* Latest */)) {
-                while (isIdentifierPart(text.charCodeAt(pos), 7 /* Latest */) && pos < end) {
+            if (isIdentifierStart(ch, 8 /* Latest */)) {
+                while (isIdentifierPart(text.charCodeAt(pos), 8 /* Latest */) && pos < end) {
                     pos++;
                 }
                 tokenValue = text.substring(tokenPos, pos);
@@ -8418,11 +8589,16 @@ var ts;
     }
     ts.toPath = toPath;
     function changesAffectModuleResolution(oldOptions, newOptions) {
-        return oldOptions.configFilePath !== newOptions.configFilePath || ts.moduleResolutionOptionDeclarations.some(function (o) {
+        return oldOptions.configFilePath !== newOptions.configFilePath ||
+            optionsHaveModuleResolutionChanges(oldOptions, newOptions);
+    }
+    ts.changesAffectModuleResolution = changesAffectModuleResolution;
+    function optionsHaveModuleResolutionChanges(oldOptions, newOptions) {
+        return ts.moduleResolutionOptionDeclarations.some(function (o) {
             return !ts.isJsonEqual(ts.getCompilerOptionValue(oldOptions, o), ts.getCompilerOptionValue(newOptions, o));
         });
     }
-    ts.changesAffectModuleResolution = changesAffectModuleResolution;
+    ts.optionsHaveModuleResolutionChanges = optionsHaveModuleResolutionChanges;
     function findAncestor(node, callback) {
         while (node) {
             var result = callback(node);
@@ -8591,7 +8767,7 @@ var ts;
         }
     }
     function getSourceFileOfNode(node) {
-        while (node && node.kind !== 284 /* SourceFile */) {
+        while (node && node.kind !== 285 /* SourceFile */) {
             node = node.parent;
         }
         return node;
@@ -8599,11 +8775,11 @@ var ts;
     ts.getSourceFileOfNode = getSourceFileOfNode;
     function isStatementWithLocals(node) {
         switch (node.kind) {
-            case 218 /* Block */:
-            case 246 /* CaseBlock */:
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
+            case 219 /* Block */:
+            case 247 /* CaseBlock */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
                 return true;
         }
         return false;
@@ -8771,7 +8947,7 @@ var ts;
         // the syntax list itself considers them as normal trivia. Therefore if we simply skip
         // trivia for the list, we may have skipped the JSDocComment as well. So we should process its
         // first child to determine the actual position of its first token.
-        if (node.kind === 311 /* SyntaxList */ && node._children.length > 0) {
+        if (node.kind === 312 /* SyntaxList */ && node._children.length > 0) {
             return getTokenPosOfNode(node._children[0], sourceFile, includeJsDoc);
         }
         return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos);
@@ -8790,7 +8966,7 @@ var ts;
     }
     ts.getSourceTextOfNodeFromSourceFile = getSourceTextOfNodeFromSourceFile;
     function isJSDocTypeExpressionOrChild(node) {
-        return node.kind === 288 /* JSDocTypeExpression */ || (node.parent && isJSDocTypeExpressionOrChild(node.parent));
+        return node.kind === 289 /* JSDocTypeExpression */ || (node.parent && isJSDocTypeExpressionOrChild(node.parent));
     }
     function getTextOfNodeFromSourceText(sourceText, node, includeTrivia) {
         if (includeTrivia === void 0) { includeTrivia = false; }
@@ -8882,7 +9058,7 @@ var ts;
     ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
     function isCatchClauseVariableDeclarationOrBindingElement(declaration) {
         var node = getRootDeclaration(declaration);
-        return node.kind === 237 /* VariableDeclaration */ && node.parent.kind === 274 /* CatchClause */;
+        return node.kind === 238 /* VariableDeclaration */ && node.parent.kind === 275 /* CatchClause */;
     }
     ts.isCatchClauseVariableDeclarationOrBindingElement = isCatchClauseVariableDeclarationOrBindingElement;
     function isAmbientModule(node) {
@@ -8914,11 +9090,11 @@ var ts;
     ts.isShorthandAmbientModuleSymbol = isShorthandAmbientModuleSymbol;
     function isShorthandAmbientModule(node) {
         // The only kind of module that can be missing a body is a shorthand ambient module.
-        return node && node.kind === 244 /* ModuleDeclaration */ && (!node.body);
+        return node && node.kind === 245 /* ModuleDeclaration */ && (!node.body);
     }
     function isBlockScopedContainerTopLevel(node) {
-        return node.kind === 284 /* SourceFile */ ||
-            node.kind === 244 /* ModuleDeclaration */ ||
+        return node.kind === 285 /* SourceFile */ ||
+            node.kind === 245 /* ModuleDeclaration */ ||
             ts.isFunctionLike(node);
     }
     ts.isBlockScopedContainerTopLevel = isBlockScopedContainerTopLevel;
@@ -8935,9 +9111,9 @@ var ts;
         // - defined in the top level scope and source file is an external module
         // - defined inside ambient module declaration located in the top level scope and source file not an external module
         switch (node.parent.kind) {
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return ts.isExternalModule(node.parent);
-            case 245 /* ModuleBlock */:
+            case 246 /* ModuleBlock */:
                 return isAmbientModule(node.parent.parent) && ts.isSourceFile(node.parent.parent.parent) && !ts.isExternalModule(node.parent.parent.parent);
         }
         return false;
@@ -8953,22 +9129,22 @@ var ts;
     ts.isEffectiveExternalModule = isEffectiveExternalModule;
     function isBlockScope(node, parentNode) {
         switch (node.kind) {
-            case 284 /* SourceFile */:
-            case 246 /* CaseBlock */:
-            case 274 /* CatchClause */:
-            case 244 /* ModuleDeclaration */:
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
-            case 157 /* Constructor */:
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
+            case 285 /* SourceFile */:
+            case 247 /* CaseBlock */:
+            case 275 /* CatchClause */:
+            case 245 /* ModuleDeclaration */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
+            case 158 /* Constructor */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
                 return true;
-            case 218 /* Block */:
+            case 219 /* Block */:
                 // function block is not considered block-scope container
                 // see comment in binder.ts: bind(...), case for SyntaxKind.Block
                 return !ts.isFunctionLike(parentNode);
@@ -8978,9 +9154,9 @@ var ts;
     ts.isBlockScope = isBlockScope;
     function isDeclarationWithTypeParameters(node) {
         switch (node.kind) {
-            case 302 /* JSDocCallbackTag */:
-            case 309 /* JSDocTypedefTag */:
-            case 298 /* JSDocSignature */:
+            case 303 /* JSDocCallbackTag */:
+            case 310 /* JSDocTypedefTag */:
+            case 299 /* JSDocSignature */:
                 return true;
             default:
                 ts.assertType(node);
@@ -8990,25 +9166,25 @@ var ts;
     ts.isDeclarationWithTypeParameters = isDeclarationWithTypeParameters;
     function isDeclarationWithTypeParameterChildren(node) {
         switch (node.kind) {
-            case 160 /* CallSignature */:
-            case 161 /* ConstructSignature */:
-            case 155 /* MethodSignature */:
-            case 162 /* IndexSignature */:
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
-            case 294 /* JSDocFunctionType */:
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 308 /* JSDocTemplateTag */:
-            case 239 /* FunctionDeclaration */:
-            case 156 /* MethodDeclaration */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
+            case 161 /* CallSignature */:
+            case 162 /* ConstructSignature */:
+            case 156 /* MethodSignature */:
+            case 163 /* IndexSignature */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
+            case 295 /* JSDocFunctionType */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 309 /* JSDocTemplateTag */:
+            case 240 /* FunctionDeclaration */:
+            case 157 /* MethodDeclaration */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
                 return true;
             default:
                 ts.assertType(node);
@@ -9018,8 +9194,8 @@ var ts;
     ts.isDeclarationWithTypeParameterChildren = isDeclarationWithTypeParameterChildren;
     function isAnyImportSyntax(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
-            case 248 /* ImportEqualsDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return true;
             default:
                 return false;
@@ -9028,15 +9204,15 @@ var ts;
     ts.isAnyImportSyntax = isAnyImportSyntax;
     function isLateVisibilityPaintedStatement(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
-            case 248 /* ImportEqualsDeclaration */:
-            case 219 /* VariableStatement */:
-            case 240 /* ClassDeclaration */:
-            case 239 /* FunctionDeclaration */:
-            case 244 /* ModuleDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 241 /* InterfaceDeclaration */:
-            case 243 /* EnumDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
+            case 220 /* VariableStatement */:
+            case 241 /* ClassDeclaration */:
+            case 240 /* FunctionDeclaration */:
+            case 245 /* ModuleDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 244 /* EnumDeclaration */:
                 return true;
             default:
                 return false;
@@ -9066,13 +9242,13 @@ var ts;
     ts.getNameFromIndexInfo = getNameFromIndexInfo;
     function getTextOfPropertyName(name) {
         switch (name.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return name.escapedText;
             case 10 /* StringLiteral */:
             case 8 /* NumericLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
                 return ts.escapeLeadingUnderscores(name.text);
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 if (isStringOrNumericLiteralLike(name.expression))
                     return ts.escapeLeadingUnderscores(name.expression.text);
                 return ts.Debug.fail("Text of property name cannot be read from non-literal-valued ComputedPropertyNames");
@@ -9083,11 +9259,11 @@ var ts;
     ts.getTextOfPropertyName = getTextOfPropertyName;
     function entityNameToString(name) {
         switch (name.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return getFullWidth(name) === 0 ? ts.idText(name) : getTextOfNode(name);
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 return entityNameToString(name.left) + "." + entityNameToString(name.right);
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return entityNameToString(name.expression) + "." + entityNameToString(name.name);
             default:
                 throw ts.Debug.assertNever(name);
@@ -9132,7 +9308,7 @@ var ts;
     ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition;
     function getErrorSpanForArrowFunction(sourceFile, node) {
         var pos = ts.skipTrivia(sourceFile.text, node.pos);
-        if (node.body && node.body.kind === 218 /* Block */) {
+        if (node.body && node.body.kind === 219 /* Block */) {
             var startLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.pos).line;
             var endLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.end).line;
             if (startLine < endLine) {
@@ -9146,7 +9322,7 @@ var ts;
     function getErrorSpanForNode(sourceFile, node) {
         var errorNode = node;
         switch (node.kind) {
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 var pos_1 = ts.skipTrivia(sourceFile.text, 0, /*stopAfterLineBreak*/ false);
                 if (pos_1 === sourceFile.text.length) {
                     // file is empty - return span for the beginning of the file
@@ -9155,25 +9331,25 @@ var ts;
                 return getSpanOfTokenAtPosition(sourceFile, pos_1);
             // This list is a work in progress. Add missing node kinds to improve their error
             // spans.
-            case 237 /* VariableDeclaration */:
-            case 186 /* BindingElement */:
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
-            case 241 /* InterfaceDeclaration */:
-            case 244 /* ModuleDeclaration */:
-            case 243 /* EnumDeclaration */:
-            case 278 /* EnumMember */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 242 /* TypeAliasDeclaration */:
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
+            case 238 /* VariableDeclaration */:
+            case 187 /* BindingElement */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
+            case 242 /* InterfaceDeclaration */:
+            case 245 /* ModuleDeclaration */:
+            case 244 /* EnumDeclaration */:
+            case 279 /* EnumMember */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 243 /* TypeAliasDeclaration */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
                 errorNode = node.name;
                 break;
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 return getErrorSpanForArrowFunction(sourceFile, node);
         }
         if (errorNode === undefined) {
@@ -9222,11 +9398,11 @@ var ts;
     }
     ts.isLet = isLet;
     function isSuperCall(n) {
-        return n.kind === 191 /* CallExpression */ && n.expression.kind === 98 /* SuperKeyword */;
+        return n.kind === 192 /* CallExpression */ && n.expression.kind === 99 /* SuperKeyword */;
     }
     ts.isSuperCall = isSuperCall;
     function isImportCall(n) {
-        return n.kind === 191 /* CallExpression */ && n.expression.kind === 92 /* ImportKeyword */;
+        return n.kind === 192 /* CallExpression */ && n.expression.kind === 93 /* ImportKeyword */;
     }
     ts.isImportCall = isImportCall;
     function isLiteralImportTypeNode(n) {
@@ -9234,7 +9410,7 @@ var ts;
     }
     ts.isLiteralImportTypeNode = isLiteralImportTypeNode;
     function isPrologueDirective(node) {
-        return node.kind === 221 /* ExpressionStatement */
+        return node.kind === 222 /* ExpressionStatement */
             && node.expression.kind === 10 /* StringLiteral */;
     }
     ts.isPrologueDirective = isPrologueDirective;
@@ -9243,11 +9419,11 @@ var ts;
     }
     ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode;
     function getJSDocCommentRanges(node, text) {
-        var commentRanges = (node.kind === 151 /* Parameter */ ||
-            node.kind === 150 /* TypeParameter */ ||
-            node.kind === 196 /* FunctionExpression */ ||
-            node.kind === 197 /* ArrowFunction */ ||
-            node.kind === 195 /* ParenthesizedExpression */) ?
+        var commentRanges = (node.kind === 152 /* Parameter */ ||
+            node.kind === 151 /* TypeParameter */ ||
+            node.kind === 197 /* FunctionExpression */ ||
+            node.kind === 198 /* ArrowFunction */ ||
+            node.kind === 196 /* ParenthesizedExpression */) ?
             ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
             ts.getLeadingCommentRanges(text, node.pos);
         // True if the comment starts with '/**' but not if it is '/**/'
@@ -9263,48 +9439,48 @@ var ts;
     ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
     var defaultLibReferenceRegEx = /^(\/\/\/\s*<reference\s+no-default-lib\s*=\s*)('|")(.+?)\2\s*\/>/;
     function isPartOfTypeNode(node) {
-        if (163 /* FirstTypeNode */ <= node.kind && node.kind <= 183 /* LastTypeNode */) {
+        if (164 /* FirstTypeNode */ <= node.kind && node.kind <= 184 /* LastTypeNode */) {
             return true;
         }
         switch (node.kind) {
-            case 120 /* AnyKeyword */:
-            case 143 /* UnknownKeyword */:
-            case 135 /* NumberKeyword */:
-            case 146 /* BigIntKeyword */:
-            case 138 /* StringKeyword */:
-            case 123 /* BooleanKeyword */:
-            case 139 /* SymbolKeyword */:
-            case 136 /* ObjectKeyword */:
-            case 141 /* UndefinedKeyword */:
-            case 132 /* NeverKeyword */:
+            case 121 /* AnyKeyword */:
+            case 144 /* UnknownKeyword */:
+            case 136 /* NumberKeyword */:
+            case 147 /* BigIntKeyword */:
+            case 139 /* StringKeyword */:
+            case 124 /* BooleanKeyword */:
+            case 140 /* SymbolKeyword */:
+            case 137 /* ObjectKeyword */:
+            case 142 /* UndefinedKeyword */:
+            case 133 /* NeverKeyword */:
                 return true;
-            case 106 /* VoidKeyword */:
-                return node.parent.kind !== 200 /* VoidExpression */;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 107 /* VoidKeyword */:
+                return node.parent.kind !== 201 /* VoidExpression */;
+            case 212 /* ExpressionWithTypeArguments */:
                 return !isExpressionWithTypeArgumentsInClassExtendsClause(node);
-            case 150 /* TypeParameter */:
-                return node.parent.kind === 181 /* MappedType */ || node.parent.kind === 176 /* InferType */;
+            case 151 /* TypeParameter */:
+                return node.parent.kind === 182 /* MappedType */ || node.parent.kind === 177 /* InferType */;
             // Identifiers and qualified names may be type nodes, depending on their context. Climb
             // above them to find the lowest container
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 // If the identifier is the RHS of a qualified name, then it's a type iff its parent is.
-                if (node.parent.kind === 148 /* QualifiedName */ && node.parent.right === node) {
+                if (node.parent.kind === 149 /* QualifiedName */ && node.parent.right === node) {
                     node = node.parent;
                 }
-                else if (node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node) {
+                else if (node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.name === node) {
                     node = node.parent;
                 }
                 // At this point, node is either a qualified name or an identifier
-                ts.Debug.assert(node.kind === 72 /* Identifier */ || node.kind === 148 /* QualifiedName */ || node.kind === 189 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
+                ts.Debug.assert(node.kind === 73 /* Identifier */ || node.kind === 149 /* QualifiedName */ || node.kind === 190 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
             // falls through
-            case 148 /* QualifiedName */:
-            case 189 /* PropertyAccessExpression */:
-            case 100 /* ThisKeyword */: {
+            case 149 /* QualifiedName */:
+            case 190 /* PropertyAccessExpression */:
+            case 101 /* ThisKeyword */: {
                 var parent = node.parent;
-                if (parent.kind === 167 /* TypeQuery */) {
+                if (parent.kind === 168 /* TypeQuery */) {
                     return false;
                 }
-                if (parent.kind === 183 /* ImportType */) {
+                if (parent.kind === 184 /* ImportType */) {
                     return !parent.isTypeOf;
                 }
                 // Do not recursively call isPartOfTypeNode on the parent. In the example:
@@ -9313,40 +9489,40 @@ var ts;
                 //
                 // Calling isPartOfTypeNode would consider the qualified name A.B a type node.
                 // Only C and A.B.C are type nodes.
-                if (163 /* FirstTypeNode */ <= parent.kind && parent.kind <= 183 /* LastTypeNode */) {
+                if (164 /* FirstTypeNode */ <= parent.kind && parent.kind <= 184 /* LastTypeNode */) {
                     return true;
                 }
                 switch (parent.kind) {
-                    case 211 /* ExpressionWithTypeArguments */:
+                    case 212 /* ExpressionWithTypeArguments */:
                         return !isExpressionWithTypeArgumentsInClassExtendsClause(parent);
-                    case 150 /* TypeParameter */:
+                    case 151 /* TypeParameter */:
                         return node === parent.constraint;
-                    case 308 /* JSDocTemplateTag */:
+                    case 309 /* JSDocTemplateTag */:
                         return node === parent.constraint;
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
-                    case 151 /* Parameter */:
-                    case 237 /* VariableDeclaration */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
+                    case 152 /* Parameter */:
+                    case 238 /* VariableDeclaration */:
                         return node === parent.type;
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
-                    case 157 /* Constructor */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 158 /* Constructor */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         return node === parent.type;
-                    case 160 /* CallSignature */:
-                    case 161 /* ConstructSignature */:
-                    case 162 /* IndexSignature */:
+                    case 161 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 163 /* IndexSignature */:
                         return node === parent.type;
-                    case 194 /* TypeAssertionExpression */:
+                    case 195 /* TypeAssertionExpression */:
                         return node === parent.type;
-                    case 191 /* CallExpression */:
-                    case 192 /* NewExpression */:
+                    case 192 /* CallExpression */:
+                    case 193 /* NewExpression */:
                         return ts.contains(parent.typeArguments, node);
-                    case 193 /* TaggedTemplateExpression */:
+                    case 194 /* TaggedTemplateExpression */:
                         // TODO (drosen): TaggedTemplateExpressions may eventually support type arguments.
                         return false;
                 }
@@ -9371,23 +9547,23 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return visitor(node);
-                case 246 /* CaseBlock */:
-                case 218 /* Block */:
-                case 222 /* IfStatement */:
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
-                case 231 /* WithStatement */:
-                case 232 /* SwitchStatement */:
-                case 271 /* CaseClause */:
-                case 272 /* DefaultClause */:
-                case 233 /* LabeledStatement */:
-                case 235 /* TryStatement */:
-                case 274 /* CatchClause */:
+                case 247 /* CaseBlock */:
+                case 219 /* Block */:
+                case 223 /* IfStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
+                case 232 /* WithStatement */:
+                case 233 /* SwitchStatement */:
+                case 272 /* CaseClause */:
+                case 273 /* DefaultClause */:
+                case 234 /* LabeledStatement */:
+                case 236 /* TryStatement */:
+                case 275 /* CatchClause */:
                     return ts.forEachChild(node, traverse);
             }
         }
@@ -9397,26 +9573,26 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     visitor(node);
                     var operand = node.expression;
                     if (operand) {
                         traverse(operand);
                     }
                     return;
-                case 243 /* EnumDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 244 /* EnumDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     // These are not allowed inside a generator now, but eventually they may be allowed
                     // as local types. Regardless, any yield statements contained within them should be
                     // skipped in this traversal.
                     return;
                 default:
                     if (ts.isFunctionLike(node)) {
-                        if (node.name && node.name.kind === 149 /* ComputedPropertyName */) {
+                        if (node.name && node.name.kind === 150 /* ComputedPropertyName */) {
                             // Note that we will not include methods/accessors of a class because they would require
                             // first descending into the class. This is by design.
                             traverse(node.name.expression);
@@ -9439,10 +9615,10 @@ var ts;
      * @param node The type node.
      */
     function getRestParameterElementType(node) {
-        if (node && node.kind === 169 /* ArrayType */) {
+        if (node && node.kind === 170 /* ArrayType */) {
             return node.elementType;
         }
-        else if (node && node.kind === 164 /* TypeReference */) {
+        else if (node && node.kind === 165 /* TypeReference */) {
             return ts.singleOrUndefined(node.typeArguments);
         }
         else {
@@ -9452,12 +9628,12 @@ var ts;
     ts.getRestParameterElementType = getRestParameterElementType;
     function getMembersOfDeclaration(node) {
         switch (node.kind) {
-            case 241 /* InterfaceDeclaration */:
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
-            case 168 /* TypeLiteral */:
+            case 242 /* InterfaceDeclaration */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
+            case 169 /* TypeLiteral */:
                 return node.members;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return node.properties;
         }
     }
@@ -9465,14 +9641,14 @@ var ts;
     function isVariableLike(node) {
         if (node) {
             switch (node.kind) {
-                case 186 /* BindingElement */:
-                case 278 /* EnumMember */:
-                case 151 /* Parameter */:
-                case 275 /* PropertyAssignment */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 276 /* ShorthandPropertyAssignment */:
-                case 237 /* VariableDeclaration */:
+                case 187 /* BindingElement */:
+                case 279 /* EnumMember */:
+                case 152 /* Parameter */:
+                case 276 /* PropertyAssignment */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 277 /* ShorthandPropertyAssignment */:
+                case 238 /* VariableDeclaration */:
                     return true;
             }
         }
@@ -9484,8 +9660,8 @@ var ts;
     }
     ts.isVariableLikeOrAccessor = isVariableLikeOrAccessor;
     function isVariableDeclarationInVariableStatement(node) {
-        return node.parent.kind === 238 /* VariableDeclarationList */
-            && node.parent.parent.kind === 219 /* VariableStatement */;
+        return node.parent.kind === 239 /* VariableDeclarationList */
+            && node.parent.parent.kind === 220 /* VariableStatement */;
     }
     ts.isVariableDeclarationInVariableStatement = isVariableDeclarationInVariableStatement;
     function isValidESSymbolDeclaration(node) {
@@ -9496,13 +9672,13 @@ var ts;
     ts.isValidESSymbolDeclaration = isValidESSymbolDeclaration;
     function introducesArgumentsExoticObject(node) {
         switch (node.kind) {
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
                 return true;
         }
         return false;
@@ -9513,7 +9689,7 @@ var ts;
             if (beforeUnwrapLabelCallback) {
                 beforeUnwrapLabelCallback(node);
             }
-            if (node.statement.kind !== 233 /* LabeledStatement */) {
+            if (node.statement.kind !== 234 /* LabeledStatement */) {
                 return node.statement;
             }
             node = node.statement;
@@ -9521,17 +9697,17 @@ var ts;
     }
     ts.unwrapInnermostStatementOfLabel = unwrapInnermostStatementOfLabel;
     function isFunctionBlock(node) {
-        return node && node.kind === 218 /* Block */ && ts.isFunctionLike(node.parent);
+        return node && node.kind === 219 /* Block */ && ts.isFunctionLike(node.parent);
     }
     ts.isFunctionBlock = isFunctionBlock;
     function isObjectLiteralMethod(node) {
-        return node && node.kind === 156 /* MethodDeclaration */ && node.parent.kind === 188 /* ObjectLiteralExpression */;
+        return node && node.kind === 157 /* MethodDeclaration */ && node.parent.kind === 189 /* ObjectLiteralExpression */;
     }
     ts.isObjectLiteralMethod = isObjectLiteralMethod;
     function isObjectLiteralOrClassExpressionMethod(node) {
-        return node.kind === 156 /* MethodDeclaration */ &&
-            (node.parent.kind === 188 /* ObjectLiteralExpression */ ||
-                node.parent.kind === 209 /* ClassExpression */);
+        return node.kind === 157 /* MethodDeclaration */ &&
+            (node.parent.kind === 189 /* ObjectLiteralExpression */ ||
+                node.parent.kind === 210 /* ClassExpression */);
     }
     ts.isObjectLiteralOrClassExpressionMethod = isObjectLiteralOrClassExpressionMethod;
     function isIdentifierTypePredicate(predicate) {
@@ -9544,7 +9720,7 @@ var ts;
     ts.isThisTypePredicate = isThisTypePredicate;
     function getPropertyAssignment(objectLiteral, key, key2) {
         return objectLiteral.properties.filter(function (property) {
-            if (property.kind === 275 /* PropertyAssignment */) {
+            if (property.kind === 276 /* PropertyAssignment */) {
                 var propName = getTextOfPropertyName(property.name);
                 return key === propName || (!!key2 && key2 === propName);
             }
@@ -9576,19 +9752,23 @@ var ts;
         return findAncestor(node.parent, ts.isFunctionLike);
     }
     ts.getContainingFunction = getContainingFunction;
+    function getContainingFunctionDeclaration(node) {
+        return findAncestor(node.parent, ts.isFunctionLikeDeclaration);
+    }
+    ts.getContainingFunctionDeclaration = getContainingFunctionDeclaration;
     function getContainingClass(node) {
         return findAncestor(node.parent, ts.isClassLike);
     }
     ts.getContainingClass = getContainingClass;
     function getThisContainer(node, includeArrowFunctions) {
-        ts.Debug.assert(node.kind !== 284 /* SourceFile */);
+        ts.Debug.assert(node.kind !== 285 /* SourceFile */);
         while (true) {
             node = node.parent;
             if (!node) {
                 return ts.Debug.fail(); // If we never pass in a SourceFile, this should be unreachable, since we'll stop when we reach that.
             }
             switch (node.kind) {
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     // If the grandparent node is an object literal (as opposed to a class),
                     // then the computed property is not a 'this' container.
                     // A computed property name in a class needs to be a this container
@@ -9603,9 +9783,9 @@ var ts;
                     // the *body* of the container.
                     node = node.parent;
                     break;
-                case 152 /* Decorator */:
+                case 153 /* Decorator */:
                     // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 151 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
+                    if (node.parent.kind === 152 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
                         // If the decorator's parent is a Parameter, we resolve the this container from
                         // the grandparent class declaration.
                         node = node.parent.parent;
@@ -9616,26 +9796,26 @@ var ts;
                         node = node.parent;
                     }
                     break;
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     if (!includeArrowFunctions) {
                         continue;
                     }
                 // falls through
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 244 /* ModuleDeclaration */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 157 /* Constructor */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 162 /* IndexSignature */:
-                case 243 /* EnumDeclaration */:
-                case 284 /* SourceFile */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 245 /* ModuleDeclaration */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 158 /* Constructor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 163 /* IndexSignature */:
+                case 244 /* EnumDeclaration */:
+                case 285 /* SourceFile */:
                     return node;
             }
         }
@@ -9645,9 +9825,9 @@ var ts;
         var container = getThisContainer(node, /*includeArrowFunctions*/ false);
         if (container) {
             switch (container.kind) {
-                case 157 /* Constructor */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
+                case 158 /* Constructor */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
                     return container;
             }
         }
@@ -9669,27 +9849,27 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     node = node.parent;
                     break;
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     if (!stopOnFunctions) {
                         continue;
                     }
                 // falls through
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 157 /* Constructor */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 158 /* Constructor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return node;
-                case 152 /* Decorator */:
+                case 153 /* Decorator */:
                     // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 151 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
+                    if (node.parent.kind === 152 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
                         // If the decorator's parent is a Parameter, we resolve the this container from
                         // the grandparent class declaration.
                         node = node.parent.parent;
@@ -9705,21 +9885,21 @@ var ts;
     }
     ts.getSuperContainer = getSuperContainer;
     function getImmediatelyInvokedFunctionExpression(func) {
-        if (func.kind === 196 /* FunctionExpression */ || func.kind === 197 /* ArrowFunction */) {
+        if (func.kind === 197 /* FunctionExpression */ || func.kind === 198 /* ArrowFunction */) {
             var prev = func;
             var parent = func.parent;
-            while (parent.kind === 195 /* ParenthesizedExpression */) {
+            while (parent.kind === 196 /* ParenthesizedExpression */) {
                 prev = parent;
                 parent = parent.parent;
             }
-            if (parent.kind === 191 /* CallExpression */ && parent.expression === prev) {
+            if (parent.kind === 192 /* CallExpression */ && parent.expression === prev) {
                 return parent;
             }
         }
     }
     ts.getImmediatelyInvokedFunctionExpression = getImmediatelyInvokedFunctionExpression;
     function isSuperOrSuperProperty(node) {
-        return node.kind === 98 /* SuperKeyword */
+        return node.kind === 99 /* SuperKeyword */
             || isSuperProperty(node);
     }
     ts.isSuperOrSuperProperty = isSuperOrSuperProperty;
@@ -9728,8 +9908,8 @@ var ts;
      */
     function isSuperProperty(node) {
         var kind = node.kind;
-        return (kind === 189 /* PropertyAccessExpression */ || kind === 190 /* ElementAccessExpression */)
-            && node.expression.kind === 98 /* SuperKeyword */;
+        return (kind === 190 /* PropertyAccessExpression */ || kind === 191 /* ElementAccessExpression */)
+            && node.expression.kind === 99 /* SuperKeyword */;
     }
     ts.isSuperProperty = isSuperProperty;
     /**
@@ -9737,20 +9917,20 @@ var ts;
      */
     function isThisProperty(node) {
         var kind = node.kind;
-        return (kind === 189 /* PropertyAccessExpression */ || kind === 190 /* ElementAccessExpression */)
-            && node.expression.kind === 100 /* ThisKeyword */;
+        return (kind === 190 /* PropertyAccessExpression */ || kind === 191 /* ElementAccessExpression */)
+            && node.expression.kind === 101 /* ThisKeyword */;
     }
     ts.isThisProperty = isThisProperty;
     function getEntityNameFromTypeNode(node) {
         switch (node.kind) {
-            case 164 /* TypeReference */:
+            case 165 /* TypeReference */:
                 return node.typeName;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return isEntityNameExpression(node.expression)
                     ? node.expression
                     : undefined;
-            case 72 /* Identifier */:
-            case 148 /* QualifiedName */:
+            case 73 /* Identifier */:
+            case 149 /* QualifiedName */:
                 return node;
         }
         return undefined;
@@ -9758,10 +9938,10 @@ var ts;
     ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode;
     function getInvokedExpression(node) {
         switch (node.kind) {
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return node.tag;
-            case 262 /* JsxOpeningElement */:
-            case 261 /* JsxSelfClosingElement */:
+            case 263 /* JsxOpeningElement */:
+            case 262 /* JsxSelfClosingElement */:
                 return node.tagName;
             default:
                 return node.expression;
@@ -9770,25 +9950,25 @@ var ts;
     ts.getInvokedExpression = getInvokedExpression;
     function nodeCanBeDecorated(node, parent, grandparent) {
         switch (node.kind) {
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 // classes are valid targets
                 return true;
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 // property declarations are valid if their parent is a class declaration.
-                return parent.kind === 240 /* ClassDeclaration */;
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 156 /* MethodDeclaration */:
+                return parent.kind === 241 /* ClassDeclaration */;
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 157 /* MethodDeclaration */:
                 // if this method has a body and its parent is a class declaration, this is a valid target.
                 return node.body !== undefined
-                    && parent.kind === 240 /* ClassDeclaration */;
-            case 151 /* Parameter */:
+                    && parent.kind === 241 /* ClassDeclaration */;
+            case 152 /* Parameter */:
                 // if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target;
                 return parent.body !== undefined
-                    && (parent.kind === 157 /* Constructor */
-                        || parent.kind === 156 /* MethodDeclaration */
-                        || parent.kind === 159 /* SetAccessor */)
-                    && grandparent.kind === 240 /* ClassDeclaration */;
+                    && (parent.kind === 158 /* Constructor */
+                        || parent.kind === 157 /* MethodDeclaration */
+                        || parent.kind === 160 /* SetAccessor */)
+                    && grandparent.kind === 241 /* ClassDeclaration */;
         }
         return false;
     }
@@ -9804,10 +9984,10 @@ var ts;
     ts.nodeOrChildIsDecorated = nodeOrChildIsDecorated;
     function childIsDecorated(node, parent) {
         switch (node.kind) {
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 return ts.some(node.members, function (m) { return nodeOrChildIsDecorated(m, node, parent); }); // TODO: GH#18217
-            case 156 /* MethodDeclaration */:
-            case 159 /* SetAccessor */:
+            case 157 /* MethodDeclaration */:
+            case 160 /* SetAccessor */:
                 return ts.some(node.parameters, function (p) { return nodeIsDecorated(p, node, parent); }); // TODO: GH#18217
             default:
                 return false;
@@ -9816,9 +9996,9 @@ var ts;
     ts.childIsDecorated = childIsDecorated;
     function isJSXTagName(node) {
         var parent = node.parent;
-        if (parent.kind === 262 /* JsxOpeningElement */ ||
-            parent.kind === 261 /* JsxSelfClosingElement */ ||
-            parent.kind === 263 /* JsxClosingElement */) {
+        if (parent.kind === 263 /* JsxOpeningElement */ ||
+            parent.kind === 262 /* JsxSelfClosingElement */ ||
+            parent.kind === 264 /* JsxClosingElement */) {
             return parent.tagName === node;
         }
         return false;
@@ -9826,57 +10006,57 @@ var ts;
     ts.isJSXTagName = isJSXTagName;
     function isExpressionNode(node) {
         switch (node.kind) {
-            case 98 /* SuperKeyword */:
-            case 96 /* NullKeyword */:
-            case 102 /* TrueKeyword */:
-            case 87 /* FalseKeyword */:
+            case 99 /* SuperKeyword */:
+            case 97 /* NullKeyword */:
+            case 103 /* TrueKeyword */:
+            case 88 /* FalseKeyword */:
             case 13 /* RegularExpressionLiteral */:
-            case 187 /* ArrayLiteralExpression */:
-            case 188 /* ObjectLiteralExpression */:
-            case 189 /* PropertyAccessExpression */:
-            case 190 /* ElementAccessExpression */:
-            case 191 /* CallExpression */:
-            case 192 /* NewExpression */:
-            case 193 /* TaggedTemplateExpression */:
-            case 212 /* AsExpression */:
-            case 194 /* TypeAssertionExpression */:
-            case 213 /* NonNullExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 196 /* FunctionExpression */:
-            case 209 /* ClassExpression */:
-            case 197 /* ArrowFunction */:
-            case 200 /* VoidExpression */:
-            case 198 /* DeleteExpression */:
-            case 199 /* TypeOfExpression */:
-            case 202 /* PrefixUnaryExpression */:
-            case 203 /* PostfixUnaryExpression */:
-            case 204 /* BinaryExpression */:
-            case 205 /* ConditionalExpression */:
-            case 208 /* SpreadElement */:
-            case 206 /* TemplateExpression */:
+            case 188 /* ArrayLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
+            case 190 /* PropertyAccessExpression */:
+            case 191 /* ElementAccessExpression */:
+            case 192 /* CallExpression */:
+            case 193 /* NewExpression */:
+            case 194 /* TaggedTemplateExpression */:
+            case 213 /* AsExpression */:
+            case 195 /* TypeAssertionExpression */:
+            case 214 /* NonNullExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 197 /* FunctionExpression */:
+            case 210 /* ClassExpression */:
+            case 198 /* ArrowFunction */:
+            case 201 /* VoidExpression */:
+            case 199 /* DeleteExpression */:
+            case 200 /* TypeOfExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
+            case 205 /* BinaryExpression */:
+            case 206 /* ConditionalExpression */:
+            case 209 /* SpreadElement */:
+            case 207 /* TemplateExpression */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 210 /* OmittedExpression */:
-            case 260 /* JsxElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 264 /* JsxFragment */:
-            case 207 /* YieldExpression */:
-            case 201 /* AwaitExpression */:
-            case 214 /* MetaProperty */:
+            case 211 /* OmittedExpression */:
+            case 261 /* JsxElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 265 /* JsxFragment */:
+            case 208 /* YieldExpression */:
+            case 202 /* AwaitExpression */:
+            case 215 /* MetaProperty */:
                 return true;
-            case 148 /* QualifiedName */:
-                while (node.parent.kind === 148 /* QualifiedName */) {
+            case 149 /* QualifiedName */:
+                while (node.parent.kind === 149 /* QualifiedName */) {
                     node = node.parent;
                 }
-                return node.parent.kind === 167 /* TypeQuery */ || isJSXTagName(node);
-            case 72 /* Identifier */:
-                if (node.parent.kind === 167 /* TypeQuery */ || isJSXTagName(node)) {
+                return node.parent.kind === 168 /* TypeQuery */ || isJSXTagName(node);
+            case 73 /* Identifier */:
+                if (node.parent.kind === 168 /* TypeQuery */ || isJSXTagName(node)) {
                     return true;
                 }
             // falls through
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
                 return isInExpressionContext(node);
             default:
                 return false;
@@ -9886,49 +10066,49 @@ var ts;
     function isInExpressionContext(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 237 /* VariableDeclaration */:
-            case 151 /* Parameter */:
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 278 /* EnumMember */:
-            case 275 /* PropertyAssignment */:
-            case 186 /* BindingElement */:
+            case 238 /* VariableDeclaration */:
+            case 152 /* Parameter */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 279 /* EnumMember */:
+            case 276 /* PropertyAssignment */:
+            case 187 /* BindingElement */:
                 return parent.initializer === node;
-            case 221 /* ExpressionStatement */:
-            case 222 /* IfStatement */:
-            case 223 /* DoStatement */:
-            case 224 /* WhileStatement */:
-            case 230 /* ReturnStatement */:
-            case 231 /* WithStatement */:
-            case 232 /* SwitchStatement */:
-            case 271 /* CaseClause */:
-            case 234 /* ThrowStatement */:
+            case 222 /* ExpressionStatement */:
+            case 223 /* IfStatement */:
+            case 224 /* DoStatement */:
+            case 225 /* WhileStatement */:
+            case 231 /* ReturnStatement */:
+            case 232 /* WithStatement */:
+            case 233 /* SwitchStatement */:
+            case 272 /* CaseClause */:
+            case 235 /* ThrowStatement */:
                 return parent.expression === node;
-            case 225 /* ForStatement */:
+            case 226 /* ForStatement */:
                 var forStatement = parent;
-                return (forStatement.initializer === node && forStatement.initializer.kind !== 238 /* VariableDeclarationList */) ||
+                return (forStatement.initializer === node && forStatement.initializer.kind !== 239 /* VariableDeclarationList */) ||
                     forStatement.condition === node ||
                     forStatement.incrementor === node;
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
                 var forInStatement = parent;
-                return (forInStatement.initializer === node && forInStatement.initializer.kind !== 238 /* VariableDeclarationList */) ||
+                return (forInStatement.initializer === node && forInStatement.initializer.kind !== 239 /* VariableDeclarationList */) ||
                     forInStatement.expression === node;
-            case 194 /* TypeAssertionExpression */:
-            case 212 /* AsExpression */:
+            case 195 /* TypeAssertionExpression */:
+            case 213 /* AsExpression */:
                 return node === parent.expression;
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 return node === parent.expression;
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 return node === parent.expression;
-            case 152 /* Decorator */:
-            case 270 /* JsxExpression */:
-            case 269 /* JsxSpreadAttribute */:
-            case 277 /* SpreadAssignment */:
+            case 153 /* Decorator */:
+            case 271 /* JsxExpression */:
+            case 270 /* JsxSpreadAttribute */:
+            case 278 /* SpreadAssignment */:
                 return true;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return parent.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent);
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 return parent.objectAssignmentInitializer === node;
             default:
                 return isExpressionNode(parent);
@@ -9936,7 +10116,7 @@ var ts;
     }
     ts.isInExpressionContext = isInExpressionContext;
     function isExternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 248 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 259 /* ExternalModuleReference */;
+        return node.kind === 249 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 260 /* ExternalModuleReference */;
     }
     ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
     function getExternalModuleImportEqualsDeclarationExpression(node) {
@@ -9945,7 +10125,7 @@ var ts;
     }
     ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
     function isInternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 248 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 259 /* ExternalModuleReference */;
+        return node.kind === 249 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 260 /* ExternalModuleReference */;
     }
     ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
     function isSourceFileJS(file) {
@@ -9973,15 +10153,15 @@ var ts;
             ts.isIdentifier(node.typeName) &&
             node.typeName.escapedText === "Object" &&
             node.typeArguments && node.typeArguments.length === 2 &&
-            (node.typeArguments[0].kind === 138 /* StringKeyword */ || node.typeArguments[0].kind === 135 /* NumberKeyword */);
+            (node.typeArguments[0].kind === 139 /* StringKeyword */ || node.typeArguments[0].kind === 136 /* NumberKeyword */);
     }
     ts.isJSDocIndexSignature = isJSDocIndexSignature;
     function isRequireCall(callExpression, checkArgumentIsStringLiteralLike) {
-        if (callExpression.kind !== 191 /* CallExpression */) {
+        if (callExpression.kind !== 192 /* CallExpression */) {
             return false;
         }
         var _a = callExpression, expression = _a.expression, args = _a.arguments;
-        if (expression.kind !== 72 /* Identifier */ || expression.escapedText !== "require") {
+        if (expression.kind !== 73 /* Identifier */ || expression.escapedText !== "require") {
             return false;
         }
         if (args.length !== 1) {
@@ -10012,7 +10192,7 @@ var ts;
             name = node.parent.name;
             decl = node.parent;
         }
-        else if (ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 59 /* EqualsToken */ && node.parent.right === node) {
+        else if (ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 60 /* EqualsToken */ && node.parent.right === node) {
             name = node.parent.left;
             decl = name;
         }
@@ -10021,7 +10201,7 @@ var ts;
                 name = node.parent.parent.name;
                 decl = node.parent.parent;
             }
-            else if (ts.isBinaryExpression(node.parent.parent) && node.parent.parent.operatorToken.kind === 59 /* EqualsToken */ && node.parent.parent.right === node.parent) {
+            else if (ts.isBinaryExpression(node.parent.parent) && node.parent.parent.operatorToken.kind === 60 /* EqualsToken */ && node.parent.parent.right === node.parent) {
                 name = node.parent.parent.left;
                 decl = name;
             }
@@ -10063,7 +10243,7 @@ var ts;
      * We treat the right hand side of assignments with container-like initalizers as declarations.
      */
     function getAssignedExpandoInitializer(node) {
-        if (node && node.parent && ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 59 /* EqualsToken */) {
+        if (node && node.parent && ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 60 /* EqualsToken */) {
             var isPrototypeAssignment = isPrototypeAccess(node.parent.left);
             return getExpandoInitializer(node.parent.right, isPrototypeAssignment) ||
                 getDefaultedExpandoInitializer(node.parent.left, node.parent.right, isPrototypeAssignment);
@@ -10089,11 +10269,11 @@ var ts;
     function getExpandoInitializer(initializer, isPrototypeAssignment) {
         if (ts.isCallExpression(initializer)) {
             var e = skipParentheses(initializer.expression);
-            return e.kind === 196 /* FunctionExpression */ || e.kind === 197 /* ArrowFunction */ ? initializer : undefined;
+            return e.kind === 197 /* FunctionExpression */ || e.kind === 198 /* ArrowFunction */ ? initializer : undefined;
         }
-        if (initializer.kind === 196 /* FunctionExpression */ ||
-            initializer.kind === 209 /* ClassExpression */ ||
-            initializer.kind === 197 /* ArrowFunction */) {
+        if (initializer.kind === 197 /* FunctionExpression */ ||
+            initializer.kind === 210 /* ClassExpression */ ||
+            initializer.kind === 198 /* ArrowFunction */) {
             return initializer;
         }
         if (ts.isObjectLiteralExpression(initializer) && (initializer.properties.length === 0 || isPrototypeAssignment)) {
@@ -10117,7 +10297,7 @@ var ts;
     }
     function isDefaultedExpandoInitializer(node) {
         var name = ts.isVariableDeclaration(node.parent) ? node.parent.name :
-            ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 59 /* EqualsToken */ ? node.parent.left :
+            ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 60 /* EqualsToken */ ? node.parent.left :
                 undefined;
         return name && getExpandoInitializer(node.right, isPrototypeAccess(name)) && isEntityNameExpression(name) && isSameEntityName(name, node.left);
     }
@@ -10126,7 +10306,7 @@ var ts;
     function getNameOfExpando(node) {
         if (ts.isBinaryExpression(node.parent)) {
             var parent = (node.parent.operatorToken.kind === 55 /* BarBarToken */ && ts.isBinaryExpression(node.parent.parent)) ? node.parent.parent : node.parent;
-            if (parent.operatorToken.kind === 59 /* EqualsToken */ && ts.isIdentifier(parent.left)) {
+            if (parent.operatorToken.kind === 60 /* EqualsToken */ && ts.isIdentifier(parent.left)) {
                 return parent.left;
             }
         }
@@ -10149,7 +10329,7 @@ var ts;
             return name.escapedText === initializer.escapedText;
         }
         if (ts.isIdentifier(name) && ts.isPropertyAccessExpression(initializer)) {
-            return (initializer.expression.kind === 100 /* ThisKeyword */ ||
+            return (initializer.expression.kind === 101 /* ThisKeyword */ ||
                 ts.isIdentifier(initializer.expression) &&
                     (initializer.expression.escapedText === "window" ||
                         initializer.expression.escapedText === "self" ||
@@ -10207,7 +10387,7 @@ var ts;
             }
             return 7 /* ObjectDefinePropertyValue */;
         }
-        if (expr.operatorToken.kind !== 59 /* EqualsToken */ ||
+        if (expr.operatorToken.kind !== 60 /* EqualsToken */ ||
             !ts.isPropertyAccessExpression(expr.left)) {
             return 0 /* None */;
         }
@@ -10219,7 +10399,7 @@ var ts;
         return getAssignmentDeclarationPropertyAccessKind(lhs);
     }
     function getAssignmentDeclarationPropertyAccessKind(lhs) {
-        if (lhs.expression.kind === 100 /* ThisKeyword */) {
+        if (lhs.expression.kind === 101 /* ThisKeyword */) {
             return 4 /* ThisProperty */;
         }
         else if (isModuleExportsPropertyAccessExpression(lhs)) {
@@ -10261,7 +10441,7 @@ var ts;
     ts.isPrototypePropertyAssignment = isPrototypePropertyAssignment;
     function isSpecialPropertyDeclaration(expr) {
         return isInJSFile(expr) &&
-            expr.parent && expr.parent.kind === 221 /* ExpressionStatement */ &&
+            expr.parent && expr.parent.kind === 222 /* ExpressionStatement */ &&
             !!ts.getJSDocTypeTag(expr.parent);
     }
     ts.isSpecialPropertyDeclaration = isSpecialPropertyDeclaration;
@@ -10270,23 +10450,23 @@ var ts;
             return false;
         }
         var decl = symbol.valueDeclaration;
-        return decl.kind === 239 /* FunctionDeclaration */ || ts.isVariableDeclaration(decl) && decl.initializer && ts.isFunctionLike(decl.initializer);
+        return decl.kind === 240 /* FunctionDeclaration */ || ts.isVariableDeclaration(decl) && decl.initializer && ts.isFunctionLike(decl.initializer);
     }
     ts.isFunctionSymbol = isFunctionSymbol;
     function importFromModuleSpecifier(node) {
-        return tryGetImportFromModuleSpecifier(node) || ts.Debug.fail(ts.Debug.showSyntaxKind(node.parent));
+        return tryGetImportFromModuleSpecifier(node) || ts.Debug.failBadSyntaxKind(node.parent);
     }
     ts.importFromModuleSpecifier = importFromModuleSpecifier;
     function tryGetImportFromModuleSpecifier(node) {
         switch (node.parent.kind) {
-            case 249 /* ImportDeclaration */:
-            case 255 /* ExportDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return node.parent;
-            case 259 /* ExternalModuleReference */:
+            case 260 /* ExternalModuleReference */:
                 return node.parent.parent;
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return isImportCall(node.parent) || isRequireCall(node.parent, /*checkArg*/ false) ? node.parent : undefined;
-            case 182 /* LiteralType */:
+            case 183 /* LiteralType */:
                 ts.Debug.assert(ts.isStringLiteral(node));
                 return ts.tryCast(node.parent.parent, ts.isImportTypeNode);
             default:
@@ -10296,12 +10476,12 @@ var ts;
     ts.tryGetImportFromModuleSpecifier = tryGetImportFromModuleSpecifier;
     function getExternalModuleName(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
-            case 255 /* ExportDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return node.moduleSpecifier;
-            case 248 /* ImportEqualsDeclaration */:
-                return node.moduleReference.kind === 259 /* ExternalModuleReference */ ? node.moduleReference.expression : undefined;
-            case 183 /* ImportType */:
+            case 249 /* ImportEqualsDeclaration */:
+                return node.moduleReference.kind === 260 /* ExternalModuleReference */ ? node.moduleReference.expression : undefined;
+            case 184 /* ImportType */:
                 return isLiteralImportTypeNode(node) ? node.argument.literal : undefined;
             default:
                 return ts.Debug.assertNever(node);
@@ -10310,11 +10490,11 @@ var ts;
     ts.getExternalModuleName = getExternalModuleName;
     function getNamespaceDeclarationNode(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 return node.importClause && ts.tryCast(node.importClause.namedBindings, ts.isNamespaceImport);
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return node;
-            case 255 /* ExportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return undefined;
             default:
                 return ts.Debug.assertNever(node);
@@ -10322,19 +10502,19 @@ var ts;
     }
     ts.getNamespaceDeclarationNode = getNamespaceDeclarationNode;
     function isDefaultImport(node) {
-        return node.kind === 249 /* ImportDeclaration */ && !!node.importClause && !!node.importClause.name;
+        return node.kind === 250 /* ImportDeclaration */ && !!node.importClause && !!node.importClause.name;
     }
     ts.isDefaultImport = isDefaultImport;
     function hasQuestionToken(node) {
         if (node) {
             switch (node.kind) {
-                case 151 /* Parameter */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 276 /* ShorthandPropertyAssignment */:
-                case 275 /* PropertyAssignment */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 152 /* Parameter */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 277 /* ShorthandPropertyAssignment */:
+                case 276 /* PropertyAssignment */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     return node.questionToken !== undefined;
             }
         }
@@ -10348,7 +10528,7 @@ var ts;
     }
     ts.isJSDocConstructSignature = isJSDocConstructSignature;
     function isJSDocTypeAlias(node) {
-        return node.kind === 309 /* JSDocTypedefTag */ || node.kind === 302 /* JSDocCallbackTag */;
+        return node.kind === 310 /* JSDocTypedefTag */ || node.kind === 303 /* JSDocCallbackTag */;
     }
     ts.isJSDocTypeAlias = isJSDocTypeAlias;
     function isTypeAlias(node) {
@@ -10358,7 +10538,7 @@ var ts;
     function getSourceOfAssignment(node) {
         return ts.isExpressionStatement(node) &&
             node.expression && ts.isBinaryExpression(node.expression) &&
-            node.expression.operatorToken.kind === 59 /* EqualsToken */
+            node.expression.operatorToken.kind === 60 /* EqualsToken */
             ? node.expression.right
             : undefined;
     }
@@ -10373,12 +10553,12 @@ var ts;
     }
     function getSingleInitializerOfVariableStatementOrPropertyDeclaration(node) {
         switch (node.kind) {
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 var v = getSingleVariableOfVariableStatement(node);
                 return v && v.initializer;
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 return node.initializer;
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 return node.initializer;
         }
     }
@@ -10389,7 +10569,7 @@ var ts;
     function getNestedModuleDeclaration(node) {
         return ts.isModuleDeclaration(node) &&
             node.body &&
-            node.body.kind === 244 /* ModuleDeclaration */
+            node.body.kind === 245 /* ModuleDeclaration */
             ? node.body
             : undefined;
     }
@@ -10404,11 +10584,11 @@ var ts;
             if (ts.hasJSDocNodes(node)) {
                 result = ts.addRange(result, node.jsDoc);
             }
-            if (node.kind === 151 /* Parameter */) {
+            if (node.kind === 152 /* Parameter */) {
                 result = ts.addRange(result, ts.getJSDocParameterTags(node));
                 break;
             }
-            if (node.kind === 150 /* TypeParameter */) {
+            if (node.kind === 151 /* TypeParameter */) {
                 result = ts.addRange(result, ts.getJSDocTypeParameterTags(node));
                 break;
             }
@@ -10419,11 +10599,12 @@ var ts;
     ts.getJSDocCommentsAndTags = getJSDocCommentsAndTags;
     function getNextJSDocCommentLocation(node) {
         var parent = node.parent;
-        if (parent.kind === 275 /* PropertyAssignment */ ||
-            parent.kind === 154 /* PropertyDeclaration */ ||
-            parent.kind === 221 /* ExpressionStatement */ && node.kind === 189 /* PropertyAccessExpression */ ||
+        if (parent.kind === 276 /* PropertyAssignment */ ||
+            parent.kind === 255 /* ExportAssignment */ ||
+            parent.kind === 155 /* PropertyDeclaration */ ||
+            parent.kind === 222 /* ExpressionStatement */ && node.kind === 190 /* PropertyAccessExpression */ ||
             getNestedModuleDeclaration(parent) ||
-            ts.isBinaryExpression(node) && node.operatorToken.kind === 59 /* EqualsToken */) {
+            ts.isBinaryExpression(node) && node.operatorToken.kind === 60 /* EqualsToken */) {
             return parent;
         }
         // Try to recognize this pattern when node is initializer of variable declaration and JSDoc comments are on containing variable statement.
@@ -10434,7 +10615,7 @@ var ts;
         // var x = function(name) { return name.length; }
         else if (parent.parent &&
             (getSingleVariableOfVariableStatement(parent.parent) === node ||
-                ts.isBinaryExpression(parent) && parent.operatorToken.kind === 59 /* EqualsToken */)) {
+                ts.isBinaryExpression(parent) && parent.operatorToken.kind === 60 /* EqualsToken */)) {
             return parent.parent;
         }
         else if (parent.parent && parent.parent.parent &&
@@ -10457,7 +10638,7 @@ var ts;
         if (!decl) {
             return undefined;
         }
-        var parameter = ts.find(decl.parameters, function (p) { return p.name.kind === 72 /* Identifier */ && p.name.escapedText === name; });
+        var parameter = ts.find(decl.parameters, function (p) { return p.name.kind === 73 /* Identifier */ && p.name.escapedText === name; });
         return parameter && parameter.symbol;
     }
     ts.getParameterSymbolFromJSDoc = getParameterSymbolFromJSDoc;
@@ -10492,7 +10673,7 @@ var ts;
     ts.hasRestParameter = hasRestParameter;
     function isRestParameter(node) {
         var type = ts.isJSDocParameterTag(node) ? (node.typeExpression && node.typeExpression.type) : node.type;
-        return node.dotDotDotToken !== undefined || !!type && type.kind === 295 /* JSDocVariadicType */;
+        return node.dotDotDotToken !== undefined || !!type && type.kind === 296 /* JSDocVariadicType */;
     }
     ts.isRestParameter = isRestParameter;
     var AssignmentKind;
@@ -10505,31 +10686,31 @@ var ts;
         var parent = node.parent;
         while (true) {
             switch (parent.kind) {
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     var binaryOperator = parent.operatorToken.kind;
                     return isAssignmentOperator(binaryOperator) && parent.left === node ?
-                        binaryOperator === 59 /* EqualsToken */ ? 1 /* Definite */ : 2 /* Compound */ :
+                        binaryOperator === 60 /* EqualsToken */ ? 1 /* Definite */ : 2 /* Compound */ :
                         0 /* None */;
-                case 202 /* PrefixUnaryExpression */:
-                case 203 /* PostfixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     var unaryOperator = parent.operator;
                     return unaryOperator === 44 /* PlusPlusToken */ || unaryOperator === 45 /* MinusMinusToken */ ? 2 /* Compound */ : 0 /* None */;
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
                     return parent.initializer === node ? 1 /* Definite */ : 0 /* None */;
-                case 195 /* ParenthesizedExpression */:
-                case 187 /* ArrayLiteralExpression */:
-                case 208 /* SpreadElement */:
-                case 213 /* NonNullExpression */:
+                case 196 /* ParenthesizedExpression */:
+                case 188 /* ArrayLiteralExpression */:
+                case 209 /* SpreadElement */:
+                case 214 /* NonNullExpression */:
                     node = parent;
                     break;
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     if (parent.name !== node) {
                         return 0 /* None */;
                     }
                     node = parent.parent;
                     break;
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     if (parent.name === node) {
                         return 0 /* None */;
                     }
@@ -10556,22 +10737,22 @@ var ts;
      */
     function isNodeWithPossibleHoistedDeclaration(node) {
         switch (node.kind) {
-            case 218 /* Block */:
-            case 219 /* VariableStatement */:
-            case 231 /* WithStatement */:
-            case 222 /* IfStatement */:
-            case 232 /* SwitchStatement */:
-            case 246 /* CaseBlock */:
-            case 271 /* CaseClause */:
-            case 272 /* DefaultClause */:
-            case 233 /* LabeledStatement */:
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
-            case 223 /* DoStatement */:
-            case 224 /* WhileStatement */:
-            case 235 /* TryStatement */:
-            case 274 /* CatchClause */:
+            case 219 /* Block */:
+            case 220 /* VariableStatement */:
+            case 232 /* WithStatement */:
+            case 223 /* IfStatement */:
+            case 233 /* SwitchStatement */:
+            case 247 /* CaseBlock */:
+            case 272 /* CaseClause */:
+            case 273 /* DefaultClause */:
+            case 234 /* LabeledStatement */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
+            case 224 /* DoStatement */:
+            case 225 /* WhileStatement */:
+            case 236 /* TryStatement */:
+            case 275 /* CatchClause */:
                 return true;
         }
         return false;
@@ -10588,33 +10769,33 @@ var ts;
         return node;
     }
     function walkUpParenthesizedTypes(node) {
-        return walkUp(node, 177 /* ParenthesizedType */);
+        return walkUp(node, 178 /* ParenthesizedType */);
     }
     ts.walkUpParenthesizedTypes = walkUpParenthesizedTypes;
     function walkUpParenthesizedExpressions(node) {
-        return walkUp(node, 195 /* ParenthesizedExpression */);
+        return walkUp(node, 196 /* ParenthesizedExpression */);
     }
     ts.walkUpParenthesizedExpressions = walkUpParenthesizedExpressions;
     function skipParentheses(node) {
-        while (node.kind === 195 /* ParenthesizedExpression */) {
+        while (node.kind === 196 /* ParenthesizedExpression */) {
             node = node.expression;
         }
         return node;
     }
     ts.skipParentheses = skipParentheses;
     function skipParenthesesUp(node) {
-        while (node.kind === 195 /* ParenthesizedExpression */) {
+        while (node.kind === 196 /* ParenthesizedExpression */) {
             node = node.parent;
         }
         return node;
     }
     // a node is delete target iff. it is PropertyAccessExpression/ElementAccessExpression with parentheses skipped
     function isDeleteTarget(node) {
-        if (node.kind !== 189 /* PropertyAccessExpression */ && node.kind !== 190 /* ElementAccessExpression */) {
+        if (node.kind !== 190 /* PropertyAccessExpression */ && node.kind !== 191 /* ElementAccessExpression */) {
             return false;
         }
         node = walkUpParenthesizedExpressions(node.parent);
-        return node && node.kind === 198 /* DeleteExpression */;
+        return node && node.kind === 199 /* DeleteExpression */;
     }
     ts.isDeleteTarget = isDeleteTarget;
     function isNodeDescendantOf(node, ancestor) {
@@ -10640,7 +10821,7 @@ var ts;
                 if (ts.isComputedPropertyName(parent))
                     return parent.parent;
             // falls through
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 if (ts.isDeclaration(parent)) {
                     return parent.name === name ? parent : undefined;
                 }
@@ -10664,7 +10845,7 @@ var ts;
     ts.getDeclarationFromName = getDeclarationFromName;
     function isLiteralComputedPropertyDeclarationName(node) {
         return (node.kind === 10 /* StringLiteral */ || node.kind === 8 /* NumericLiteral */) &&
-            node.parent.kind === 149 /* ComputedPropertyName */ &&
+            node.parent.kind === 150 /* ComputedPropertyName */ &&
             ts.isDeclaration(node.parent.parent);
     }
     ts.isLiteralComputedPropertyDeclarationName = isLiteralComputedPropertyDeclarationName;
@@ -10672,32 +10853,32 @@ var ts;
     function isIdentifierName(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 278 /* EnumMember */:
-            case 275 /* PropertyAssignment */:
-            case 189 /* PropertyAccessExpression */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 279 /* EnumMember */:
+            case 276 /* PropertyAssignment */:
+            case 190 /* PropertyAccessExpression */:
                 // Name in member declaration or property name in property access
                 return parent.name === node;
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 // Name on right hand side of dot in a type query or type reference
                 if (parent.right === node) {
-                    while (parent.kind === 148 /* QualifiedName */) {
+                    while (parent.kind === 149 /* QualifiedName */) {
                         parent = parent.parent;
                     }
-                    return parent.kind === 167 /* TypeQuery */ || parent.kind === 164 /* TypeReference */;
+                    return parent.kind === 168 /* TypeQuery */ || parent.kind === 165 /* TypeReference */;
                 }
                 return false;
-            case 186 /* BindingElement */:
-            case 253 /* ImportSpecifier */:
+            case 187 /* BindingElement */:
+            case 254 /* ImportSpecifier */:
                 // Property name in binding element or import specifier
                 return parent.propertyName === node;
-            case 257 /* ExportSpecifier */:
-            case 267 /* JsxAttribute */:
+            case 258 /* ExportSpecifier */:
+            case 268 /* JsxAttribute */:
                 // Any name in an export specifier or JSX Attribute
                 return true;
         }
@@ -10714,13 +10895,13 @@ var ts;
     // export default <EntityNameExpression>
     // module.exports = <EntityNameExpression>
     function isAliasSymbolDeclaration(node) {
-        return node.kind === 248 /* ImportEqualsDeclaration */ ||
-            node.kind === 247 /* NamespaceExportDeclaration */ ||
-            node.kind === 250 /* ImportClause */ && !!node.name ||
-            node.kind === 251 /* NamespaceImport */ ||
-            node.kind === 253 /* ImportSpecifier */ ||
-            node.kind === 257 /* ExportSpecifier */ ||
-            node.kind === 254 /* ExportAssignment */ && exportAssignmentIsAlias(node) ||
+        return node.kind === 249 /* ImportEqualsDeclaration */ ||
+            node.kind === 248 /* NamespaceExportDeclaration */ ||
+            node.kind === 251 /* ImportClause */ && !!node.name ||
+            node.kind === 252 /* NamespaceImport */ ||
+            node.kind === 254 /* ImportSpecifier */ ||
+            node.kind === 258 /* ExportSpecifier */ ||
+            node.kind === 255 /* ExportAssignment */ && exportAssignmentIsAlias(node) ||
             ts.isBinaryExpression(node) && getAssignmentDeclarationKind(node) === 2 /* ModuleExports */ && exportAssignmentIsAlias(node);
     }
     ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
@@ -10742,12 +10923,12 @@ var ts;
     }
     ts.getEffectiveBaseTypeNode = getEffectiveBaseTypeNode;
     function getClassExtendsHeritageElement(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 86 /* ExtendsKeyword */);
+        var heritageClause = getHeritageClause(node.heritageClauses, 87 /* ExtendsKeyword */);
         return heritageClause && heritageClause.types.length > 0 ? heritageClause.types[0] : undefined;
     }
     ts.getClassExtendsHeritageElement = getClassExtendsHeritageElement;
     function getClassImplementsHeritageClauseElements(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 109 /* ImplementsKeyword */);
+        var heritageClause = getHeritageClause(node.heritageClauses, 110 /* ImplementsKeyword */);
         return heritageClause ? heritageClause.types : undefined;
     }
     ts.getClassImplementsHeritageClauseElements = getClassImplementsHeritageClauseElements;
@@ -10759,7 +10940,7 @@ var ts;
     }
     ts.getAllSuperTypeNodes = getAllSuperTypeNodes;
     function getInterfaceBaseTypeNodes(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 86 /* ExtendsKeyword */);
+        var heritageClause = getHeritageClause(node.heritageClauses, 87 /* ExtendsKeyword */);
         return heritageClause ? heritageClause.types : undefined;
     }
     ts.getInterfaceBaseTypeNodes = getInterfaceBaseTypeNodes;
@@ -10793,11 +10974,11 @@ var ts;
     }
     ts.getAncestor = getAncestor;
     function isKeyword(token) {
-        return 73 /* FirstKeyword */ <= token && token <= 147 /* LastKeyword */;
+        return 74 /* FirstKeyword */ <= token && token <= 148 /* LastKeyword */;
     }
     ts.isKeyword = isKeyword;
     function isContextualKeyword(token) {
-        return 118 /* FirstContextualKeyword */ <= token && token <= 147 /* LastContextualKeyword */;
+        return 119 /* FirstContextualKeyword */ <= token && token <= 148 /* LastContextualKeyword */;
     }
     ts.isContextualKeyword = isContextualKeyword;
     function isNonContextualKeyword(token) {
@@ -10832,14 +11013,14 @@ var ts;
         }
         var flags = 0 /* Normal */;
         switch (node.kind) {
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 156 /* MethodDeclaration */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 157 /* MethodDeclaration */:
                 if (node.asteriskToken) {
                     flags |= 1 /* Generator */;
                 }
             // falls through
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 if (hasModifier(node, 256 /* Async */)) {
                     flags |= 2 /* Async */;
                 }
@@ -10853,10 +11034,10 @@ var ts;
     ts.getFunctionFlags = getFunctionFlags;
     function isAsyncFunction(node) {
         switch (node.kind) {
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
-            case 156 /* MethodDeclaration */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
+            case 157 /* MethodDeclaration */:
                 return node.body !== undefined
                     && node.asteriskToken === undefined
                     && hasModifier(node, 256 /* Async */);
@@ -10881,7 +11062,7 @@ var ts;
     }
     ts.hasDynamicName = hasDynamicName;
     function isDynamicName(name) {
-        return name.kind === 149 /* ComputedPropertyName */ &&
+        return name.kind === 150 /* ComputedPropertyName */ &&
             !isStringOrNumericLiteralLike(name.expression) &&
             !isWellKnownSymbolSyntactically(name.expression);
     }
@@ -10897,12 +11078,12 @@ var ts;
     ts.isWellKnownSymbolSyntactically = isWellKnownSymbolSyntactically;
     function getPropertyNameForPropertyNameNode(name) {
         switch (name.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return name.escapedText;
             case 10 /* StringLiteral */:
             case 8 /* NumericLiteral */:
                 return ts.escapeLeadingUnderscores(name.text);
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 var nameExpression = name.expression;
                 if (isWellKnownSymbolSyntactically(nameExpression)) {
                     return getPropertyNameForKnownSymbolName(ts.idText(nameExpression.name));
@@ -10918,7 +11099,7 @@ var ts;
     ts.getPropertyNameForPropertyNameNode = getPropertyNameForPropertyNameNode;
     function isPropertyNameLiteral(node) {
         switch (node.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
             case 10 /* StringLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
             case 8 /* NumericLiteral */:
@@ -10929,11 +11110,11 @@ var ts;
     }
     ts.isPropertyNameLiteral = isPropertyNameLiteral;
     function getTextOfIdentifierOrLiteral(node) {
-        return node.kind === 72 /* Identifier */ ? ts.idText(node) : node.text;
+        return node.kind === 73 /* Identifier */ ? ts.idText(node) : node.text;
     }
     ts.getTextOfIdentifierOrLiteral = getTextOfIdentifierOrLiteral;
     function getEscapedTextOfIdentifierOrLiteral(node) {
-        return node.kind === 72 /* Identifier */ ? node.escapedText : ts.escapeLeadingUnderscores(node.text);
+        return node.kind === 73 /* Identifier */ ? node.escapedText : ts.escapeLeadingUnderscores(node.text);
     }
     ts.getEscapedTextOfIdentifierOrLiteral = getEscapedTextOfIdentifierOrLiteral;
     function getPropertyNameForKnownSymbolName(symbolName) {
@@ -10948,7 +11129,7 @@ var ts;
      * Includes the word "Symbol" with unicode escapes
      */
     function isESSymbolIdentifier(node) {
-        return node.kind === 72 /* Identifier */ && node.escapedText === "Symbol";
+        return node.kind === 73 /* Identifier */ && node.escapedText === "Symbol";
     }
     ts.isESSymbolIdentifier = isESSymbolIdentifier;
     function isPushOrUnshiftIdentifier(node) {
@@ -10957,11 +11138,11 @@ var ts;
     ts.isPushOrUnshiftIdentifier = isPushOrUnshiftIdentifier;
     function isParameterDeclaration(node) {
         var root = getRootDeclaration(node);
-        return root.kind === 151 /* Parameter */;
+        return root.kind === 152 /* Parameter */;
     }
     ts.isParameterDeclaration = isParameterDeclaration;
     function getRootDeclaration(node) {
-        while (node.kind === 186 /* BindingElement */) {
+        while (node.kind === 187 /* BindingElement */) {
             node = node.parent.parent;
         }
         return node;
@@ -10969,15 +11150,15 @@ var ts;
     ts.getRootDeclaration = getRootDeclaration;
     function nodeStartsNewLexicalEnvironment(node) {
         var kind = node.kind;
-        return kind === 157 /* Constructor */
-            || kind === 196 /* FunctionExpression */
-            || kind === 239 /* FunctionDeclaration */
-            || kind === 197 /* ArrowFunction */
-            || kind === 156 /* MethodDeclaration */
-            || kind === 158 /* GetAccessor */
-            || kind === 159 /* SetAccessor */
-            || kind === 244 /* ModuleDeclaration */
-            || kind === 284 /* SourceFile */;
+        return kind === 158 /* Constructor */
+            || kind === 197 /* FunctionExpression */
+            || kind === 240 /* FunctionDeclaration */
+            || kind === 198 /* ArrowFunction */
+            || kind === 157 /* MethodDeclaration */
+            || kind === 159 /* GetAccessor */
+            || kind === 160 /* SetAccessor */
+            || kind === 245 /* ModuleDeclaration */
+            || kind === 285 /* SourceFile */;
     }
     ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
     function nodeIsSynthesized(range) {
@@ -10996,38 +11177,38 @@ var ts;
     })(Associativity = ts.Associativity || (ts.Associativity = {}));
     function getExpressionAssociativity(expression) {
         var operator = getOperator(expression);
-        var hasArguments = expression.kind === 192 /* NewExpression */ && expression.arguments !== undefined;
+        var hasArguments = expression.kind === 193 /* NewExpression */ && expression.arguments !== undefined;
         return getOperatorAssociativity(expression.kind, operator, hasArguments);
     }
     ts.getExpressionAssociativity = getExpressionAssociativity;
     function getOperatorAssociativity(kind, operator, hasArguments) {
         switch (kind) {
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return hasArguments ? 0 /* Left */ : 1 /* Right */;
-            case 202 /* PrefixUnaryExpression */:
-            case 199 /* TypeOfExpression */:
-            case 200 /* VoidExpression */:
-            case 198 /* DeleteExpression */:
-            case 201 /* AwaitExpression */:
-            case 205 /* ConditionalExpression */:
-            case 207 /* YieldExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 200 /* TypeOfExpression */:
+            case 201 /* VoidExpression */:
+            case 199 /* DeleteExpression */:
+            case 202 /* AwaitExpression */:
+            case 206 /* ConditionalExpression */:
+            case 208 /* YieldExpression */:
                 return 1 /* Right */;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 switch (operator) {
                     case 41 /* AsteriskAsteriskToken */:
-                    case 59 /* EqualsToken */:
-                    case 60 /* PlusEqualsToken */:
-                    case 61 /* MinusEqualsToken */:
-                    case 63 /* AsteriskAsteriskEqualsToken */:
-                    case 62 /* AsteriskEqualsToken */:
-                    case 64 /* SlashEqualsToken */:
-                    case 65 /* PercentEqualsToken */:
-                    case 66 /* LessThanLessThanEqualsToken */:
-                    case 67 /* GreaterThanGreaterThanEqualsToken */:
-                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-                    case 69 /* AmpersandEqualsToken */:
-                    case 71 /* CaretEqualsToken */:
-                    case 70 /* BarEqualsToken */:
+                    case 60 /* EqualsToken */:
+                    case 61 /* PlusEqualsToken */:
+                    case 62 /* MinusEqualsToken */:
+                    case 64 /* AsteriskAsteriskEqualsToken */:
+                    case 63 /* AsteriskEqualsToken */:
+                    case 65 /* SlashEqualsToken */:
+                    case 66 /* PercentEqualsToken */:
+                    case 67 /* LessThanLessThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanEqualsToken */:
+                    case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 70 /* AmpersandEqualsToken */:
+                    case 72 /* CaretEqualsToken */:
+                    case 71 /* BarEqualsToken */:
                         return 1 /* Right */;
                 }
         }
@@ -11036,15 +11217,15 @@ var ts;
     ts.getOperatorAssociativity = getOperatorAssociativity;
     function getExpressionPrecedence(expression) {
         var operator = getOperator(expression);
-        var hasArguments = expression.kind === 192 /* NewExpression */ && expression.arguments !== undefined;
+        var hasArguments = expression.kind === 193 /* NewExpression */ && expression.arguments !== undefined;
         return getOperatorPrecedence(expression.kind, operator, hasArguments);
     }
     ts.getExpressionPrecedence = getExpressionPrecedence;
     function getOperator(expression) {
-        if (expression.kind === 204 /* BinaryExpression */) {
+        if (expression.kind === 205 /* BinaryExpression */) {
             return expression.operatorToken.kind;
         }
-        else if (expression.kind === 202 /* PrefixUnaryExpression */ || expression.kind === 203 /* PostfixUnaryExpression */) {
+        else if (expression.kind === 203 /* PrefixUnaryExpression */ || expression.kind === 204 /* PostfixUnaryExpression */) {
             return expression.operator;
         }
         else {
@@ -11054,73 +11235,73 @@ var ts;
     ts.getOperator = getOperator;
     function getOperatorPrecedence(nodeKind, operatorKind, hasArguments) {
         switch (nodeKind) {
-            case 314 /* CommaListExpression */:
+            case 315 /* CommaListExpression */:
                 return 0;
-            case 208 /* SpreadElement */:
+            case 209 /* SpreadElement */:
                 return 1;
-            case 207 /* YieldExpression */:
+            case 208 /* YieldExpression */:
                 return 2;
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 return 4;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 switch (operatorKind) {
                     case 27 /* CommaToken */:
                         return 0;
-                    case 59 /* EqualsToken */:
-                    case 60 /* PlusEqualsToken */:
-                    case 61 /* MinusEqualsToken */:
-                    case 63 /* AsteriskAsteriskEqualsToken */:
-                    case 62 /* AsteriskEqualsToken */:
-                    case 64 /* SlashEqualsToken */:
-                    case 65 /* PercentEqualsToken */:
-                    case 66 /* LessThanLessThanEqualsToken */:
-                    case 67 /* GreaterThanGreaterThanEqualsToken */:
-                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-                    case 69 /* AmpersandEqualsToken */:
-                    case 71 /* CaretEqualsToken */:
-                    case 70 /* BarEqualsToken */:
+                    case 60 /* EqualsToken */:
+                    case 61 /* PlusEqualsToken */:
+                    case 62 /* MinusEqualsToken */:
+                    case 64 /* AsteriskAsteriskEqualsToken */:
+                    case 63 /* AsteriskEqualsToken */:
+                    case 65 /* SlashEqualsToken */:
+                    case 66 /* PercentEqualsToken */:
+                    case 67 /* LessThanLessThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanEqualsToken */:
+                    case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 70 /* AmpersandEqualsToken */:
+                    case 72 /* CaretEqualsToken */:
+                    case 71 /* BarEqualsToken */:
                         return 3;
                     default:
                         return getBinaryOperatorPrecedence(operatorKind);
                 }
-            case 202 /* PrefixUnaryExpression */:
-            case 199 /* TypeOfExpression */:
-            case 200 /* VoidExpression */:
-            case 198 /* DeleteExpression */:
-            case 201 /* AwaitExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 200 /* TypeOfExpression */:
+            case 201 /* VoidExpression */:
+            case 199 /* DeleteExpression */:
+            case 202 /* AwaitExpression */:
                 return 16;
-            case 203 /* PostfixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 return 17;
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return 18;
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return hasArguments ? 19 : 18;
-            case 193 /* TaggedTemplateExpression */:
-            case 189 /* PropertyAccessExpression */:
-            case 190 /* ElementAccessExpression */:
+            case 194 /* TaggedTemplateExpression */:
+            case 190 /* PropertyAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return 19;
-            case 100 /* ThisKeyword */:
-            case 98 /* SuperKeyword */:
-            case 72 /* Identifier */:
-            case 96 /* NullKeyword */:
-            case 102 /* TrueKeyword */:
-            case 87 /* FalseKeyword */:
+            case 101 /* ThisKeyword */:
+            case 99 /* SuperKeyword */:
+            case 73 /* Identifier */:
+            case 97 /* NullKeyword */:
+            case 103 /* TrueKeyword */:
+            case 88 /* FalseKeyword */:
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
-            case 187 /* ArrayLiteralExpression */:
-            case 188 /* ObjectLiteralExpression */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
-            case 209 /* ClassExpression */:
-            case 260 /* JsxElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 264 /* JsxFragment */:
+            case 188 /* ArrayLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
+            case 210 /* ClassExpression */:
+            case 261 /* JsxElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 265 /* JsxFragment */:
             case 13 /* RegularExpressionLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 206 /* TemplateExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 210 /* OmittedExpression */:
+            case 207 /* TemplateExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 211 /* OmittedExpression */:
                 return 20;
             default:
                 return -1;
@@ -11148,9 +11329,9 @@ var ts;
             case 30 /* GreaterThanToken */:
             case 31 /* LessThanEqualsToken */:
             case 32 /* GreaterThanEqualsToken */:
-            case 94 /* InstanceOfKeyword */:
-            case 93 /* InKeyword */:
-            case 119 /* AsKeyword */:
+            case 95 /* InstanceOfKeyword */:
+            case 94 /* InKeyword */:
+            case 120 /* AsKeyword */:
                 return 11;
             case 46 /* LessThanLessThanToken */:
             case 47 /* GreaterThanGreaterThanToken */:
@@ -11612,11 +11793,11 @@ var ts;
     }
     ts.parameterIsThisKeyword = parameterIsThisKeyword;
     function isThisIdentifier(node) {
-        return !!node && node.kind === 72 /* Identifier */ && identifierIsThisKeyword(node);
+        return !!node && node.kind === 73 /* Identifier */ && identifierIsThisKeyword(node);
     }
     ts.isThisIdentifier = isThisIdentifier;
     function identifierIsThisKeyword(id) {
-        return id.originalKeywordKind === 100 /* ThisKeyword */;
+        return id.originalKeywordKind === 101 /* ThisKeyword */;
     }
     ts.identifierIsThisKeyword = identifierIsThisKeyword;
     function getAllAccessorDeclarations(declarations, accessor) {
@@ -11627,10 +11808,10 @@ var ts;
         var setAccessor;
         if (hasDynamicName(accessor)) {
             firstAccessor = accessor;
-            if (accessor.kind === 158 /* GetAccessor */) {
+            if (accessor.kind === 159 /* GetAccessor */) {
                 getAccessor = accessor;
             }
-            else if (accessor.kind === 159 /* SetAccessor */) {
+            else if (accessor.kind === 160 /* SetAccessor */) {
                 setAccessor = accessor;
             }
             else {
@@ -11650,10 +11831,10 @@ var ts;
                         else if (!secondAccessor) {
                             secondAccessor = member;
                         }
-                        if (member.kind === 158 /* GetAccessor */ && !getAccessor) {
+                        if (member.kind === 159 /* GetAccessor */ && !getAccessor) {
                             getAccessor = member;
                         }
-                        if (member.kind === 159 /* SetAccessor */ && !setAccessor) {
+                        if (member.kind === 160 /* SetAccessor */ && !setAccessor) {
                             setAccessor = member;
                         }
                     }
@@ -11699,7 +11880,7 @@ var ts;
     ts.getJSDocTypeParameterDeclarations = getJSDocTypeParameterDeclarations;
     /** template tags are only available when a typedef isn't already using them */
     function isNonTypeAliasTemplate(tag) {
-        return ts.isJSDocTemplateTag(tag) && !(tag.parent.kind === 296 /* JSDocComment */ && tag.parent.tags.some(isJSDocTypeAlias));
+        return ts.isJSDocTemplateTag(tag) && !(tag.parent.kind === 297 /* JSDocComment */ && tag.parent.tags.some(isJSDocTypeAlias));
     }
     /**
      * Gets the effective type annotation of the value parameter of a set accessor. If the node
@@ -11939,7 +12120,7 @@ var ts;
                 flags |= modifierToFlag(modifier.kind);
             }
         }
-        if (node.flags & 4 /* NestedNamespace */ || (node.kind === 72 /* Identifier */ && node.isInJSDocNamespace)) {
+        if (node.flags & 4 /* NestedNamespace */ || (node.kind === 73 /* Identifier */ && node.isInJSDocNamespace)) {
             flags |= 1 /* Export */;
         }
         return flags;
@@ -11947,17 +12128,17 @@ var ts;
     ts.getModifierFlagsNoCache = getModifierFlagsNoCache;
     function modifierToFlag(token) {
         switch (token) {
-            case 116 /* StaticKeyword */: return 32 /* Static */;
-            case 115 /* PublicKeyword */: return 4 /* Public */;
-            case 114 /* ProtectedKeyword */: return 16 /* Protected */;
-            case 113 /* PrivateKeyword */: return 8 /* Private */;
-            case 118 /* AbstractKeyword */: return 128 /* Abstract */;
-            case 85 /* ExportKeyword */: return 1 /* Export */;
-            case 125 /* DeclareKeyword */: return 2 /* Ambient */;
-            case 77 /* ConstKeyword */: return 2048 /* Const */;
-            case 80 /* DefaultKeyword */: return 512 /* Default */;
-            case 121 /* AsyncKeyword */: return 256 /* Async */;
-            case 133 /* ReadonlyKeyword */: return 64 /* Readonly */;
+            case 117 /* StaticKeyword */: return 32 /* Static */;
+            case 116 /* PublicKeyword */: return 4 /* Public */;
+            case 115 /* ProtectedKeyword */: return 16 /* Protected */;
+            case 114 /* PrivateKeyword */: return 8 /* Private */;
+            case 119 /* AbstractKeyword */: return 128 /* Abstract */;
+            case 86 /* ExportKeyword */: return 1 /* Export */;
+            case 126 /* DeclareKeyword */: return 2 /* Ambient */;
+            case 78 /* ConstKeyword */: return 2048 /* Const */;
+            case 81 /* DefaultKeyword */: return 512 /* Default */;
+            case 122 /* AsyncKeyword */: return 256 /* Async */;
+            case 134 /* ReadonlyKeyword */: return 64 /* Readonly */;
         }
         return 0 /* None */;
     }
@@ -11969,7 +12150,7 @@ var ts;
     }
     ts.isLogicalOperator = isLogicalOperator;
     function isAssignmentOperator(token) {
-        return token >= 59 /* FirstAssignment */ && token <= 71 /* LastAssignment */;
+        return token >= 60 /* FirstAssignment */ && token <= 72 /* LastAssignment */;
     }
     ts.isAssignmentOperator = isAssignmentOperator;
     /** Get `C` given `N` if `N` is in the position `class C extends N` where `N` is an ExpressionWithTypeArguments. */
@@ -11982,14 +12163,14 @@ var ts;
         return ts.isExpressionWithTypeArguments(node)
             && ts.isHeritageClause(node.parent)
             && ts.isClassLike(node.parent.parent)
-            ? { class: node.parent.parent, isImplements: node.parent.token === 109 /* ImplementsKeyword */ }
+            ? { class: node.parent.parent, isImplements: node.parent.token === 110 /* ImplementsKeyword */ }
             : undefined;
     }
     ts.tryGetClassImplementingOrExtendingExpressionWithTypeArguments = tryGetClassImplementingOrExtendingExpressionWithTypeArguments;
     function isAssignmentExpression(node, excludeCompoundAssignment) {
         return ts.isBinaryExpression(node)
             && (excludeCompoundAssignment
-                ? node.operatorToken.kind === 59 /* EqualsToken */
+                ? node.operatorToken.kind === 60 /* EqualsToken */
                 : isAssignmentOperator(node.operatorToken.kind))
             && ts.isLeftHandSideExpression(node.left);
     }
@@ -11997,8 +12178,8 @@ var ts;
     function isDestructuringAssignment(node) {
         if (isAssignmentExpression(node, /*excludeCompoundAssignment*/ true)) {
             var kind = node.left.kind;
-            return kind === 188 /* ObjectLiteralExpression */
-                || kind === 187 /* ArrayLiteralExpression */;
+            return kind === 189 /* ObjectLiteralExpression */
+                || kind === 188 /* ArrayLiteralExpression */;
         }
         return false;
     }
@@ -12008,29 +12189,39 @@ var ts;
     }
     ts.isExpressionWithTypeArgumentsInClassExtendsClause = isExpressionWithTypeArgumentsInClassExtendsClause;
     function isEntityNameExpression(node) {
-        return node.kind === 72 /* Identifier */ || isPropertyAccessEntityNameExpression(node);
+        return node.kind === 73 /* Identifier */ || isPropertyAccessEntityNameExpression(node);
     }
     ts.isEntityNameExpression = isEntityNameExpression;
     function isPropertyAccessEntityNameExpression(node) {
         return ts.isPropertyAccessExpression(node) && isEntityNameExpression(node.expression);
     }
     ts.isPropertyAccessEntityNameExpression = isPropertyAccessEntityNameExpression;
+    function tryGetPropertyAccessOrIdentifierToString(expr) {
+        if (ts.isPropertyAccessExpression(expr)) {
+            return tryGetPropertyAccessOrIdentifierToString(expr.expression) + "." + expr.name;
+        }
+        if (ts.isIdentifier(expr)) {
+            return ts.unescapeLeadingUnderscores(expr.escapedText);
+        }
+        return undefined;
+    }
+    ts.tryGetPropertyAccessOrIdentifierToString = tryGetPropertyAccessOrIdentifierToString;
     function isPrototypeAccess(node) {
         return ts.isPropertyAccessExpression(node) && node.name.escapedText === "prototype";
     }
     ts.isPrototypeAccess = isPrototypeAccess;
     function isRightSideOfQualifiedNameOrPropertyAccess(node) {
-        return (node.parent.kind === 148 /* QualifiedName */ && node.parent.right === node) ||
-            (node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node);
+        return (node.parent.kind === 149 /* QualifiedName */ && node.parent.right === node) ||
+            (node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.name === node);
     }
     ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess;
     function isEmptyObjectLiteral(expression) {
-        return expression.kind === 188 /* ObjectLiteralExpression */ &&
+        return expression.kind === 189 /* ObjectLiteralExpression */ &&
             expression.properties.length === 0;
     }
     ts.isEmptyObjectLiteral = isEmptyObjectLiteral;
     function isEmptyArrayLiteral(expression) {
-        return expression.kind === 187 /* ArrayLiteralExpression */ &&
+        return expression.kind === 188 /* ArrayLiteralExpression */ &&
             expression.elements.length === 0;
     }
     ts.isEmptyArrayLiteral = isEmptyArrayLiteral;
@@ -12218,77 +12409,6 @@ var ts;
         return getNewLine ? getNewLine() : ts.sys ? ts.sys.newLine : carriageReturnLineFeed;
     }
     ts.getNewLineCharacter = getNewLineCharacter;
-    /**
-     * Formats an enum value as a string for debugging and debug assertions.
-     */
-    function formatEnum(value, enumObject, isFlags) {
-        if (value === void 0) { value = 0; }
-        var members = getEnumMembers(enumObject);
-        if (value === 0) {
-            return members.length > 0 && members[0][0] === 0 ? members[0][1] : "0";
-        }
-        if (isFlags) {
-            var result = "";
-            var remainingFlags = value;
-            for (var i = members.length - 1; i >= 0 && remainingFlags !== 0; i--) {
-                var _a = members[i], enumValue = _a[0], enumName = _a[1];
-                if (enumValue !== 0 && (remainingFlags & enumValue) === enumValue) {
-                    remainingFlags &= ~enumValue;
-                    result = "" + enumName + (result ? ", " : "") + result;
-                }
-            }
-            if (remainingFlags === 0) {
-                return result;
-            }
-        }
-        else {
-            for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
-                var _b = members_1[_i], enumValue = _b[0], enumName = _b[1];
-                if (enumValue === value) {
-                    return enumName;
-                }
-            }
-        }
-        return value.toString();
-    }
-    function getEnumMembers(enumObject) {
-        var result = [];
-        for (var name in enumObject) {
-            var value = enumObject[name];
-            if (typeof value === "number") {
-                result.push([value, name]);
-            }
-        }
-        return ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
-    }
-    function formatSyntaxKind(kind) {
-        return formatEnum(kind, ts.SyntaxKind, /*isFlags*/ false);
-    }
-    ts.formatSyntaxKind = formatSyntaxKind;
-    function formatModifierFlags(flags) {
-        return formatEnum(flags, ts.ModifierFlags, /*isFlags*/ true);
-    }
-    ts.formatModifierFlags = formatModifierFlags;
-    function formatTransformFlags(flags) {
-        return formatEnum(flags, ts.TransformFlags, /*isFlags*/ true);
-    }
-    ts.formatTransformFlags = formatTransformFlags;
-    function formatEmitFlags(flags) {
-        return formatEnum(flags, ts.EmitFlags, /*isFlags*/ true);
-    }
-    ts.formatEmitFlags = formatEmitFlags;
-    function formatSymbolFlags(flags) {
-        return formatEnum(flags, ts.SymbolFlags, /*isFlags*/ true);
-    }
-    ts.formatSymbolFlags = formatSymbolFlags;
-    function formatTypeFlags(flags) {
-        return formatEnum(flags, ts.TypeFlags, /*isFlags*/ true);
-    }
-    ts.formatTypeFlags = formatTypeFlags;
-    function formatObjectFlags(flags) {
-        return formatEnum(flags, ts.ObjectFlags, /*isFlags*/ true);
-    }
-    ts.formatObjectFlags = formatObjectFlags;
     /**
      * Creates a new TextRange from the provided pos and end.
      *
@@ -12378,6 +12498,10 @@ var ts;
         return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile), sourceFile);
     }
     ts.rangeEndIsOnSameLineAsRangeStart = rangeEndIsOnSameLineAsRangeStart;
+    function isNodeArrayMultiLine(list, sourceFile) {
+        return !positionsAreOnSameLine(list.pos, list.end, sourceFile);
+    }
+    ts.isNodeArrayMultiLine = isNodeArrayMultiLine;
     function positionsAreOnSameLine(pos1, pos2, sourceFile) {
         return pos1 === pos2 ||
             getLineOfLocalPosition(sourceFile, pos1) === getLineOfLocalPosition(sourceFile, pos2);
@@ -12395,8 +12519,8 @@ var ts;
         var parseNode = ts.getParseTreeNode(node);
         if (parseNode) {
             switch (parseNode.parent.kind) {
-                case 243 /* EnumDeclaration */:
-                case 244 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return parseNode === parseNode.parent.name;
             }
         }
@@ -12430,10 +12554,10 @@ var ts;
         }
         if (getCheckFlags(s) & 6 /* Synthetic */) {
             var checkFlags = s.checkFlags;
-            var accessModifier = checkFlags & 512 /* ContainsPrivate */ ? 8 /* Private */ :
-                checkFlags & 128 /* ContainsPublic */ ? 4 /* Public */ :
+            var accessModifier = checkFlags & 1024 /* ContainsPrivate */ ? 8 /* Private */ :
+                checkFlags & 256 /* ContainsPublic */ ? 4 /* Public */ :
                     16 /* Protected */;
-            var staticModifier = checkFlags & 1024 /* ContainsStatic */ ? 32 /* Static */ : 0;
+            var staticModifier = checkFlags & 2048 /* ContainsStatic */ ? 32 /* Static */ : 0;
             return accessModifier | staticModifier;
         }
         if (s.flags & 4194304 /* Prototype */) {
@@ -12473,35 +12597,35 @@ var ts;
         if (!parent)
             return 0 /* Read */;
         switch (parent.kind) {
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return accessKind(parent);
-            case 203 /* PostfixUnaryExpression */:
-            case 202 /* PrefixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 var operator = parent.operator;
                 return operator === 44 /* PlusPlusToken */ || operator === 45 /* MinusMinusToken */ ? writeOrReadWrite() : 0 /* Read */;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 var _a = parent, left = _a.left, operatorToken = _a.operatorToken;
                 return left === node && isAssignmentOperator(operatorToken.kind) ?
-                    operatorToken.kind === 59 /* EqualsToken */ ? 1 /* Write */ : writeOrReadWrite()
+                    operatorToken.kind === 60 /* EqualsToken */ ? 1 /* Write */ : writeOrReadWrite()
                     : 0 /* Read */;
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return parent.name !== node ? 0 /* Read */ : accessKind(parent);
-            case 275 /* PropertyAssignment */: {
+            case 276 /* PropertyAssignment */: {
                 var parentAccess = accessKind(parent.parent);
                 // In `({ x: varname }) = { x: 1 }`, the left `x` is a read, the right `x` is a write.
                 return node === parent.name ? reverseAccessKind(parentAccess) : parentAccess;
             }
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 // Assume it's the local variable being accessed, since we don't check public properties for --noUnusedLocals.
                 return node === parent.objectAssignmentInitializer ? 0 /* Read */ : accessKind(parent.parent);
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 return accessKind(parent);
             default:
                 return 0 /* Read */;
         }
         function writeOrReadWrite() {
             // If grandparent is not an ExpressionStatement, this is used as an expression in addition to having a side effect.
-            return parent.parent && skipParenthesesUp(parent.parent).kind === 221 /* ExpressionStatement */ ? 1 /* Write */ : 2 /* ReadWrite */;
+            return parent.parent && skipParenthesesUp(parent.parent).kind === 222 /* ExpressionStatement */ ? 1 /* Write */ : 2 /* ReadWrite */;
         }
     }
     function reverseAccessKind(a) {
@@ -12604,7 +12728,7 @@ var ts;
     }
     ts.getClassLikeDeclarationOfSymbol = getClassLikeDeclarationOfSymbol;
     function getObjectFlags(type) {
-        return type.flags & 3768320 /* ObjectFlagsType */ ? type.objectFlags : 0;
+        return type.flags & 3899392 /* ObjectFlagsType */ ? type.objectFlags : 0;
     }
     ts.getObjectFlags = getObjectFlags;
     function typeHasCallOrConstructSignatures(type, checker) {
@@ -12656,32 +12780,32 @@ var ts;
     }
     ts.isObjectTypeDeclaration = isObjectTypeDeclaration;
     function isTypeNodeKind(kind) {
-        return (kind >= 163 /* FirstTypeNode */ && kind <= 183 /* LastTypeNode */)
-            || kind === 120 /* AnyKeyword */
-            || kind === 143 /* UnknownKeyword */
-            || kind === 135 /* NumberKeyword */
-            || kind === 146 /* BigIntKeyword */
-            || kind === 136 /* ObjectKeyword */
-            || kind === 123 /* BooleanKeyword */
-            || kind === 138 /* StringKeyword */
-            || kind === 139 /* SymbolKeyword */
-            || kind === 100 /* ThisKeyword */
-            || kind === 106 /* VoidKeyword */
-            || kind === 141 /* UndefinedKeyword */
-            || kind === 96 /* NullKeyword */
-            || kind === 132 /* NeverKeyword */
-            || kind === 211 /* ExpressionWithTypeArguments */
-            || kind === 289 /* JSDocAllType */
-            || kind === 290 /* JSDocUnknownType */
-            || kind === 291 /* JSDocNullableType */
-            || kind === 292 /* JSDocNonNullableType */
-            || kind === 293 /* JSDocOptionalType */
-            || kind === 294 /* JSDocFunctionType */
-            || kind === 295 /* JSDocVariadicType */;
+        return (kind >= 164 /* FirstTypeNode */ && kind <= 184 /* LastTypeNode */)
+            || kind === 121 /* AnyKeyword */
+            || kind === 144 /* UnknownKeyword */
+            || kind === 136 /* NumberKeyword */
+            || kind === 147 /* BigIntKeyword */
+            || kind === 137 /* ObjectKeyword */
+            || kind === 124 /* BooleanKeyword */
+            || kind === 139 /* StringKeyword */
+            || kind === 140 /* SymbolKeyword */
+            || kind === 101 /* ThisKeyword */
+            || kind === 107 /* VoidKeyword */
+            || kind === 142 /* UndefinedKeyword */
+            || kind === 97 /* NullKeyword */
+            || kind === 133 /* NeverKeyword */
+            || kind === 212 /* ExpressionWithTypeArguments */
+            || kind === 290 /* JSDocAllType */
+            || kind === 291 /* JSDocUnknownType */
+            || kind === 292 /* JSDocNullableType */
+            || kind === 293 /* JSDocNonNullableType */
+            || kind === 294 /* JSDocOptionalType */
+            || kind === 295 /* JSDocFunctionType */
+            || kind === 296 /* JSDocVariadicType */;
     }
     ts.isTypeNodeKind = isTypeNodeKind;
     function isAccessExpression(node) {
-        return node.kind === 189 /* PropertyAccessExpression */ || node.kind === 190 /* ElementAccessExpression */;
+        return node.kind === 190 /* PropertyAccessExpression */ || node.kind === 191 /* ElementAccessExpression */;
     }
     ts.isAccessExpression = isAccessExpression;
     function isBundleFileTextLike(section) {
@@ -12698,8 +12822,10 @@ var ts;
 (function (ts) {
     function getDefaultLibFileName(options) {
         switch (options.target) {
-            case 7 /* ESNext */:
+            case 8 /* ESNext */:
                 return "lib.esnext.full.d.ts";
+            case 7 /* ES2020 */:
+                return "lib.es2020.full.d.ts";
             case 6 /* ES2019 */:
                 return "lib.es2019.full.d.ts";
             case 5 /* ES2018 */:
@@ -12916,9 +13042,9 @@ var ts;
     }
     ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
     function getTypeParameterOwner(d) {
-        if (d && d.kind === 150 /* TypeParameter */) {
+        if (d && d.kind === 151 /* TypeParameter */) {
             for (var current = d; current; current = current.parent) {
-                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 241 /* InterfaceDeclaration */) {
+                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 242 /* InterfaceDeclaration */) {
                     return current;
                 }
             }
@@ -12926,7 +13052,7 @@ var ts;
     }
     ts.getTypeParameterOwner = getTypeParameterOwner;
     function isParameterPropertyDeclaration(node) {
-        return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) && node.parent.kind === 157 /* Constructor */;
+        return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) && node.parent.kind === 158 /* Constructor */;
     }
     ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration;
     function isEmptyBindingPattern(node) {
@@ -12956,14 +13082,14 @@ var ts;
             node = walkUpBindingElementsAndPatterns(node);
         }
         var flags = getFlags(node);
-        if (node.kind === 237 /* VariableDeclaration */) {
+        if (node.kind === 238 /* VariableDeclaration */) {
             node = node.parent;
         }
-        if (node && node.kind === 238 /* VariableDeclarationList */) {
+        if (node && node.kind === 239 /* VariableDeclarationList */) {
             flags |= getFlags(node);
             node = node.parent;
         }
-        if (node && node.kind === 219 /* VariableStatement */) {
+        if (node && node.kind === 220 /* VariableStatement */) {
             flags |= getFlags(node);
         }
         return flags;
@@ -13109,27 +13235,27 @@ var ts;
         }
         // Covers remaining cases (returning undefined if none match).
         switch (hostNode.kind) {
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 if (hostNode.declarationList && hostNode.declarationList.declarations[0]) {
                     return getDeclarationIdentifier(hostNode.declarationList.declarations[0]);
                 }
                 break;
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 var expr = hostNode.expression;
                 switch (expr.kind) {
-                    case 189 /* PropertyAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         return expr.name;
-                    case 190 /* ElementAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         var arg = expr.argumentExpression;
                         if (ts.isIdentifier(arg)) {
                             return arg;
                         }
                 }
                 break;
-            case 195 /* ParenthesizedExpression */: {
+            case 196 /* ParenthesizedExpression */: {
                 return getDeclarationIdentifier(hostNode.expression);
             }
-            case 233 /* LabeledStatement */: {
+            case 234 /* LabeledStatement */: {
                 if (ts.isDeclaration(hostNode.statement) || ts.isExpression(hostNode.statement)) {
                     return getDeclarationIdentifier(hostNode.statement);
                 }
@@ -13153,18 +13279,18 @@ var ts;
     /** @internal */
     function getNonAssignedNameOfDeclaration(declaration) {
         switch (declaration.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return declaration;
-            case 310 /* JSDocPropertyTag */:
-            case 304 /* JSDocParameterTag */: {
+            case 311 /* JSDocPropertyTag */:
+            case 305 /* JSDocParameterTag */: {
                 var name = declaration.name;
-                if (name.kind === 148 /* QualifiedName */) {
+                if (name.kind === 149 /* QualifiedName */) {
                     return name.right;
                 }
                 break;
             }
-            case 191 /* CallExpression */:
-            case 204 /* BinaryExpression */: {
+            case 192 /* CallExpression */:
+            case 205 /* BinaryExpression */: {
                 var expr = declaration;
                 switch (ts.getAssignmentDeclarationKind(expr)) {
                     case 1 /* ExportsProperty */:
@@ -13180,9 +13306,9 @@ var ts;
                         return undefined;
                 }
             }
-            case 309 /* JSDocTypedefTag */:
+            case 310 /* JSDocTypedefTag */:
                 return getNameOfJSDocTypedef(declaration);
-            case 254 /* ExportAssignment */: {
+            case 255 /* ExportAssignment */: {
                 var expression = declaration.expression;
                 return ts.isIdentifier(expression) ? expression : undefined;
             }
@@ -13384,7 +13510,7 @@ var ts;
             return ts.emptyArray;
         }
         if (ts.isJSDocTypeAlias(node)) {
-            ts.Debug.assert(node.parent.kind === 296 /* JSDocComment */);
+            ts.Debug.assert(node.parent.kind === 297 /* JSDocComment */);
             return ts.flatMap(node.parent.tags, function (tag) { return ts.isJSDocTemplateTag(tag) ? tag.typeParameters : undefined; });
         }
         if (node.typeParameters) {
@@ -13452,198 +13578,198 @@ var ts;
     }
     ts.isTemplateTail = isTemplateTail;
     function isIdentifier(node) {
-        return node.kind === 72 /* Identifier */;
+        return node.kind === 73 /* Identifier */;
     }
     ts.isIdentifier = isIdentifier;
     // Names
     function isQualifiedName(node) {
-        return node.kind === 148 /* QualifiedName */;
+        return node.kind === 149 /* QualifiedName */;
     }
     ts.isQualifiedName = isQualifiedName;
     function isComputedPropertyName(node) {
-        return node.kind === 149 /* ComputedPropertyName */;
+        return node.kind === 150 /* ComputedPropertyName */;
     }
     ts.isComputedPropertyName = isComputedPropertyName;
     // Signature elements
     function isTypeParameterDeclaration(node) {
-        return node.kind === 150 /* TypeParameter */;
+        return node.kind === 151 /* TypeParameter */;
     }
     ts.isTypeParameterDeclaration = isTypeParameterDeclaration;
     function isParameter(node) {
-        return node.kind === 151 /* Parameter */;
+        return node.kind === 152 /* Parameter */;
     }
     ts.isParameter = isParameter;
     function isDecorator(node) {
-        return node.kind === 152 /* Decorator */;
+        return node.kind === 153 /* Decorator */;
     }
     ts.isDecorator = isDecorator;
     // TypeMember
     function isPropertySignature(node) {
-        return node.kind === 153 /* PropertySignature */;
+        return node.kind === 154 /* PropertySignature */;
     }
     ts.isPropertySignature = isPropertySignature;
     function isPropertyDeclaration(node) {
-        return node.kind === 154 /* PropertyDeclaration */;
+        return node.kind === 155 /* PropertyDeclaration */;
     }
     ts.isPropertyDeclaration = isPropertyDeclaration;
     function isMethodSignature(node) {
-        return node.kind === 155 /* MethodSignature */;
+        return node.kind === 156 /* MethodSignature */;
     }
     ts.isMethodSignature = isMethodSignature;
     function isMethodDeclaration(node) {
-        return node.kind === 156 /* MethodDeclaration */;
+        return node.kind === 157 /* MethodDeclaration */;
     }
     ts.isMethodDeclaration = isMethodDeclaration;
     function isConstructorDeclaration(node) {
-        return node.kind === 157 /* Constructor */;
+        return node.kind === 158 /* Constructor */;
     }
     ts.isConstructorDeclaration = isConstructorDeclaration;
     function isGetAccessorDeclaration(node) {
-        return node.kind === 158 /* GetAccessor */;
+        return node.kind === 159 /* GetAccessor */;
     }
     ts.isGetAccessorDeclaration = isGetAccessorDeclaration;
     function isSetAccessorDeclaration(node) {
-        return node.kind === 159 /* SetAccessor */;
+        return node.kind === 160 /* SetAccessor */;
     }
     ts.isSetAccessorDeclaration = isSetAccessorDeclaration;
     function isCallSignatureDeclaration(node) {
-        return node.kind === 160 /* CallSignature */;
+        return node.kind === 161 /* CallSignature */;
     }
     ts.isCallSignatureDeclaration = isCallSignatureDeclaration;
     function isConstructSignatureDeclaration(node) {
-        return node.kind === 161 /* ConstructSignature */;
+        return node.kind === 162 /* ConstructSignature */;
     }
     ts.isConstructSignatureDeclaration = isConstructSignatureDeclaration;
     function isIndexSignatureDeclaration(node) {
-        return node.kind === 162 /* IndexSignature */;
+        return node.kind === 163 /* IndexSignature */;
     }
     ts.isIndexSignatureDeclaration = isIndexSignatureDeclaration;
     /* @internal */
     function isGetOrSetAccessorDeclaration(node) {
-        return node.kind === 159 /* SetAccessor */ || node.kind === 158 /* GetAccessor */;
+        return node.kind === 160 /* SetAccessor */ || node.kind === 159 /* GetAccessor */;
     }
     ts.isGetOrSetAccessorDeclaration = isGetOrSetAccessorDeclaration;
     // Type
     function isTypePredicateNode(node) {
-        return node.kind === 163 /* TypePredicate */;
+        return node.kind === 164 /* TypePredicate */;
     }
     ts.isTypePredicateNode = isTypePredicateNode;
     function isTypeReferenceNode(node) {
-        return node.kind === 164 /* TypeReference */;
+        return node.kind === 165 /* TypeReference */;
     }
     ts.isTypeReferenceNode = isTypeReferenceNode;
     function isFunctionTypeNode(node) {
-        return node.kind === 165 /* FunctionType */;
+        return node.kind === 166 /* FunctionType */;
     }
     ts.isFunctionTypeNode = isFunctionTypeNode;
     function isConstructorTypeNode(node) {
-        return node.kind === 166 /* ConstructorType */;
+        return node.kind === 167 /* ConstructorType */;
     }
     ts.isConstructorTypeNode = isConstructorTypeNode;
     function isTypeQueryNode(node) {
-        return node.kind === 167 /* TypeQuery */;
+        return node.kind === 168 /* TypeQuery */;
     }
     ts.isTypeQueryNode = isTypeQueryNode;
     function isTypeLiteralNode(node) {
-        return node.kind === 168 /* TypeLiteral */;
+        return node.kind === 169 /* TypeLiteral */;
     }
     ts.isTypeLiteralNode = isTypeLiteralNode;
     function isArrayTypeNode(node) {
-        return node.kind === 169 /* ArrayType */;
+        return node.kind === 170 /* ArrayType */;
     }
     ts.isArrayTypeNode = isArrayTypeNode;
     function isTupleTypeNode(node) {
-        return node.kind === 170 /* TupleType */;
+        return node.kind === 171 /* TupleType */;
     }
     ts.isTupleTypeNode = isTupleTypeNode;
     function isUnionTypeNode(node) {
-        return node.kind === 173 /* UnionType */;
+        return node.kind === 174 /* UnionType */;
     }
     ts.isUnionTypeNode = isUnionTypeNode;
     function isIntersectionTypeNode(node) {
-        return node.kind === 174 /* IntersectionType */;
+        return node.kind === 175 /* IntersectionType */;
     }
     ts.isIntersectionTypeNode = isIntersectionTypeNode;
     function isConditionalTypeNode(node) {
-        return node.kind === 175 /* ConditionalType */;
+        return node.kind === 176 /* ConditionalType */;
     }
     ts.isConditionalTypeNode = isConditionalTypeNode;
     function isInferTypeNode(node) {
-        return node.kind === 176 /* InferType */;
+        return node.kind === 177 /* InferType */;
     }
     ts.isInferTypeNode = isInferTypeNode;
     function isParenthesizedTypeNode(node) {
-        return node.kind === 177 /* ParenthesizedType */;
+        return node.kind === 178 /* ParenthesizedType */;
     }
     ts.isParenthesizedTypeNode = isParenthesizedTypeNode;
     function isThisTypeNode(node) {
-        return node.kind === 178 /* ThisType */;
+        return node.kind === 179 /* ThisType */;
     }
     ts.isThisTypeNode = isThisTypeNode;
     function isTypeOperatorNode(node) {
-        return node.kind === 179 /* TypeOperator */;
+        return node.kind === 180 /* TypeOperator */;
     }
     ts.isTypeOperatorNode = isTypeOperatorNode;
     function isIndexedAccessTypeNode(node) {
-        return node.kind === 180 /* IndexedAccessType */;
+        return node.kind === 181 /* IndexedAccessType */;
     }
     ts.isIndexedAccessTypeNode = isIndexedAccessTypeNode;
     function isMappedTypeNode(node) {
-        return node.kind === 181 /* MappedType */;
+        return node.kind === 182 /* MappedType */;
     }
     ts.isMappedTypeNode = isMappedTypeNode;
     function isLiteralTypeNode(node) {
-        return node.kind === 182 /* LiteralType */;
+        return node.kind === 183 /* LiteralType */;
     }
     ts.isLiteralTypeNode = isLiteralTypeNode;
     function isImportTypeNode(node) {
-        return node.kind === 183 /* ImportType */;
+        return node.kind === 184 /* ImportType */;
     }
     ts.isImportTypeNode = isImportTypeNode;
     // Binding patterns
     function isObjectBindingPattern(node) {
-        return node.kind === 184 /* ObjectBindingPattern */;
+        return node.kind === 185 /* ObjectBindingPattern */;
     }
     ts.isObjectBindingPattern = isObjectBindingPattern;
     function isArrayBindingPattern(node) {
-        return node.kind === 185 /* ArrayBindingPattern */;
+        return node.kind === 186 /* ArrayBindingPattern */;
     }
     ts.isArrayBindingPattern = isArrayBindingPattern;
     function isBindingElement(node) {
-        return node.kind === 186 /* BindingElement */;
+        return node.kind === 187 /* BindingElement */;
     }
     ts.isBindingElement = isBindingElement;
     // Expression
     function isArrayLiteralExpression(node) {
-        return node.kind === 187 /* ArrayLiteralExpression */;
+        return node.kind === 188 /* ArrayLiteralExpression */;
     }
     ts.isArrayLiteralExpression = isArrayLiteralExpression;
     function isObjectLiteralExpression(node) {
-        return node.kind === 188 /* ObjectLiteralExpression */;
+        return node.kind === 189 /* ObjectLiteralExpression */;
     }
     ts.isObjectLiteralExpression = isObjectLiteralExpression;
     function isPropertyAccessExpression(node) {
-        return node.kind === 189 /* PropertyAccessExpression */;
+        return node.kind === 190 /* PropertyAccessExpression */;
     }
     ts.isPropertyAccessExpression = isPropertyAccessExpression;
     function isElementAccessExpression(node) {
-        return node.kind === 190 /* ElementAccessExpression */;
+        return node.kind === 191 /* ElementAccessExpression */;
     }
     ts.isElementAccessExpression = isElementAccessExpression;
     function isCallExpression(node) {
-        return node.kind === 191 /* CallExpression */;
+        return node.kind === 192 /* CallExpression */;
     }
     ts.isCallExpression = isCallExpression;
     function isNewExpression(node) {
-        return node.kind === 192 /* NewExpression */;
+        return node.kind === 193 /* NewExpression */;
     }
     ts.isNewExpression = isNewExpression;
     function isTaggedTemplateExpression(node) {
-        return node.kind === 193 /* TaggedTemplateExpression */;
+        return node.kind === 194 /* TaggedTemplateExpression */;
     }
     ts.isTaggedTemplateExpression = isTaggedTemplateExpression;
     function isTypeAssertion(node) {
-        return node.kind === 194 /* TypeAssertionExpression */;
+        return node.kind === 195 /* TypeAssertionExpression */;
     }
     ts.isTypeAssertion = isTypeAssertion;
     function isConstTypeReference(node) {
@@ -13652,376 +13778,376 @@ var ts;
     }
     ts.isConstTypeReference = isConstTypeReference;
     function isParenthesizedExpression(node) {
-        return node.kind === 195 /* ParenthesizedExpression */;
+        return node.kind === 196 /* ParenthesizedExpression */;
     }
     ts.isParenthesizedExpression = isParenthesizedExpression;
     function skipPartiallyEmittedExpressions(node) {
-        while (node.kind === 313 /* PartiallyEmittedExpression */) {
+        while (node.kind === 314 /* PartiallyEmittedExpression */) {
             node = node.expression;
         }
         return node;
     }
     ts.skipPartiallyEmittedExpressions = skipPartiallyEmittedExpressions;
     function isFunctionExpression(node) {
-        return node.kind === 196 /* FunctionExpression */;
+        return node.kind === 197 /* FunctionExpression */;
     }
     ts.isFunctionExpression = isFunctionExpression;
     function isArrowFunction(node) {
-        return node.kind === 197 /* ArrowFunction */;
+        return node.kind === 198 /* ArrowFunction */;
     }
     ts.isArrowFunction = isArrowFunction;
     function isDeleteExpression(node) {
-        return node.kind === 198 /* DeleteExpression */;
+        return node.kind === 199 /* DeleteExpression */;
     }
     ts.isDeleteExpression = isDeleteExpression;
     function isTypeOfExpression(node) {
-        return node.kind === 199 /* TypeOfExpression */;
+        return node.kind === 200 /* TypeOfExpression */;
     }
     ts.isTypeOfExpression = isTypeOfExpression;
     function isVoidExpression(node) {
-        return node.kind === 200 /* VoidExpression */;
+        return node.kind === 201 /* VoidExpression */;
     }
     ts.isVoidExpression = isVoidExpression;
     function isAwaitExpression(node) {
-        return node.kind === 201 /* AwaitExpression */;
+        return node.kind === 202 /* AwaitExpression */;
     }
     ts.isAwaitExpression = isAwaitExpression;
     function isPrefixUnaryExpression(node) {
-        return node.kind === 202 /* PrefixUnaryExpression */;
+        return node.kind === 203 /* PrefixUnaryExpression */;
     }
     ts.isPrefixUnaryExpression = isPrefixUnaryExpression;
     function isPostfixUnaryExpression(node) {
-        return node.kind === 203 /* PostfixUnaryExpression */;
+        return node.kind === 204 /* PostfixUnaryExpression */;
     }
     ts.isPostfixUnaryExpression = isPostfixUnaryExpression;
     function isBinaryExpression(node) {
-        return node.kind === 204 /* BinaryExpression */;
+        return node.kind === 205 /* BinaryExpression */;
     }
     ts.isBinaryExpression = isBinaryExpression;
     function isConditionalExpression(node) {
-        return node.kind === 205 /* ConditionalExpression */;
+        return node.kind === 206 /* ConditionalExpression */;
     }
     ts.isConditionalExpression = isConditionalExpression;
     function isTemplateExpression(node) {
-        return node.kind === 206 /* TemplateExpression */;
+        return node.kind === 207 /* TemplateExpression */;
     }
     ts.isTemplateExpression = isTemplateExpression;
     function isYieldExpression(node) {
-        return node.kind === 207 /* YieldExpression */;
+        return node.kind === 208 /* YieldExpression */;
     }
     ts.isYieldExpression = isYieldExpression;
     function isSpreadElement(node) {
-        return node.kind === 208 /* SpreadElement */;
+        return node.kind === 209 /* SpreadElement */;
     }
     ts.isSpreadElement = isSpreadElement;
     function isClassExpression(node) {
-        return node.kind === 209 /* ClassExpression */;
+        return node.kind === 210 /* ClassExpression */;
     }
     ts.isClassExpression = isClassExpression;
     function isOmittedExpression(node) {
-        return node.kind === 210 /* OmittedExpression */;
+        return node.kind === 211 /* OmittedExpression */;
     }
     ts.isOmittedExpression = isOmittedExpression;
     function isExpressionWithTypeArguments(node) {
-        return node.kind === 211 /* ExpressionWithTypeArguments */;
+        return node.kind === 212 /* ExpressionWithTypeArguments */;
     }
     ts.isExpressionWithTypeArguments = isExpressionWithTypeArguments;
     function isAsExpression(node) {
-        return node.kind === 212 /* AsExpression */;
+        return node.kind === 213 /* AsExpression */;
     }
     ts.isAsExpression = isAsExpression;
     function isNonNullExpression(node) {
-        return node.kind === 213 /* NonNullExpression */;
+        return node.kind === 214 /* NonNullExpression */;
     }
     ts.isNonNullExpression = isNonNullExpression;
     function isMetaProperty(node) {
-        return node.kind === 214 /* MetaProperty */;
+        return node.kind === 215 /* MetaProperty */;
     }
     ts.isMetaProperty = isMetaProperty;
     // Misc
     function isTemplateSpan(node) {
-        return node.kind === 216 /* TemplateSpan */;
+        return node.kind === 217 /* TemplateSpan */;
     }
     ts.isTemplateSpan = isTemplateSpan;
     function isSemicolonClassElement(node) {
-        return node.kind === 217 /* SemicolonClassElement */;
+        return node.kind === 218 /* SemicolonClassElement */;
     }
     ts.isSemicolonClassElement = isSemicolonClassElement;
     // Block
     function isBlock(node) {
-        return node.kind === 218 /* Block */;
+        return node.kind === 219 /* Block */;
     }
     ts.isBlock = isBlock;
     function isVariableStatement(node) {
-        return node.kind === 219 /* VariableStatement */;
+        return node.kind === 220 /* VariableStatement */;
     }
     ts.isVariableStatement = isVariableStatement;
     function isEmptyStatement(node) {
-        return node.kind === 220 /* EmptyStatement */;
+        return node.kind === 221 /* EmptyStatement */;
     }
     ts.isEmptyStatement = isEmptyStatement;
     function isExpressionStatement(node) {
-        return node.kind === 221 /* ExpressionStatement */;
+        return node.kind === 222 /* ExpressionStatement */;
     }
     ts.isExpressionStatement = isExpressionStatement;
     function isIfStatement(node) {
-        return node.kind === 222 /* IfStatement */;
+        return node.kind === 223 /* IfStatement */;
     }
     ts.isIfStatement = isIfStatement;
     function isDoStatement(node) {
-        return node.kind === 223 /* DoStatement */;
+        return node.kind === 224 /* DoStatement */;
     }
     ts.isDoStatement = isDoStatement;
     function isWhileStatement(node) {
-        return node.kind === 224 /* WhileStatement */;
+        return node.kind === 225 /* WhileStatement */;
     }
     ts.isWhileStatement = isWhileStatement;
     function isForStatement(node) {
-        return node.kind === 225 /* ForStatement */;
+        return node.kind === 226 /* ForStatement */;
     }
     ts.isForStatement = isForStatement;
     function isForInStatement(node) {
-        return node.kind === 226 /* ForInStatement */;
+        return node.kind === 227 /* ForInStatement */;
     }
     ts.isForInStatement = isForInStatement;
     function isForOfStatement(node) {
-        return node.kind === 227 /* ForOfStatement */;
+        return node.kind === 228 /* ForOfStatement */;
     }
     ts.isForOfStatement = isForOfStatement;
     function isContinueStatement(node) {
-        return node.kind === 228 /* ContinueStatement */;
+        return node.kind === 229 /* ContinueStatement */;
     }
     ts.isContinueStatement = isContinueStatement;
     function isBreakStatement(node) {
-        return node.kind === 229 /* BreakStatement */;
+        return node.kind === 230 /* BreakStatement */;
     }
     ts.isBreakStatement = isBreakStatement;
     function isBreakOrContinueStatement(node) {
-        return node.kind === 229 /* BreakStatement */ || node.kind === 228 /* ContinueStatement */;
+        return node.kind === 230 /* BreakStatement */ || node.kind === 229 /* ContinueStatement */;
     }
     ts.isBreakOrContinueStatement = isBreakOrContinueStatement;
     function isReturnStatement(node) {
-        return node.kind === 230 /* ReturnStatement */;
+        return node.kind === 231 /* ReturnStatement */;
     }
     ts.isReturnStatement = isReturnStatement;
     function isWithStatement(node) {
-        return node.kind === 231 /* WithStatement */;
+        return node.kind === 232 /* WithStatement */;
     }
     ts.isWithStatement = isWithStatement;
     function isSwitchStatement(node) {
-        return node.kind === 232 /* SwitchStatement */;
+        return node.kind === 233 /* SwitchStatement */;
     }
     ts.isSwitchStatement = isSwitchStatement;
     function isLabeledStatement(node) {
-        return node.kind === 233 /* LabeledStatement */;
+        return node.kind === 234 /* LabeledStatement */;
     }
     ts.isLabeledStatement = isLabeledStatement;
     function isThrowStatement(node) {
-        return node.kind === 234 /* ThrowStatement */;
+        return node.kind === 235 /* ThrowStatement */;
     }
     ts.isThrowStatement = isThrowStatement;
     function isTryStatement(node) {
-        return node.kind === 235 /* TryStatement */;
+        return node.kind === 236 /* TryStatement */;
     }
     ts.isTryStatement = isTryStatement;
     function isDebuggerStatement(node) {
-        return node.kind === 236 /* DebuggerStatement */;
+        return node.kind === 237 /* DebuggerStatement */;
     }
     ts.isDebuggerStatement = isDebuggerStatement;
     function isVariableDeclaration(node) {
-        return node.kind === 237 /* VariableDeclaration */;
+        return node.kind === 238 /* VariableDeclaration */;
     }
     ts.isVariableDeclaration = isVariableDeclaration;
     function isVariableDeclarationList(node) {
-        return node.kind === 238 /* VariableDeclarationList */;
+        return node.kind === 239 /* VariableDeclarationList */;
     }
     ts.isVariableDeclarationList = isVariableDeclarationList;
     function isFunctionDeclaration(node) {
-        return node.kind === 239 /* FunctionDeclaration */;
+        return node.kind === 240 /* FunctionDeclaration */;
     }
     ts.isFunctionDeclaration = isFunctionDeclaration;
     function isClassDeclaration(node) {
-        return node.kind === 240 /* ClassDeclaration */;
+        return node.kind === 241 /* ClassDeclaration */;
     }
     ts.isClassDeclaration = isClassDeclaration;
     function isInterfaceDeclaration(node) {
-        return node.kind === 241 /* InterfaceDeclaration */;
+        return node.kind === 242 /* InterfaceDeclaration */;
     }
     ts.isInterfaceDeclaration = isInterfaceDeclaration;
     function isTypeAliasDeclaration(node) {
-        return node.kind === 242 /* TypeAliasDeclaration */;
+        return node.kind === 243 /* TypeAliasDeclaration */;
     }
     ts.isTypeAliasDeclaration = isTypeAliasDeclaration;
     function isEnumDeclaration(node) {
-        return node.kind === 243 /* EnumDeclaration */;
+        return node.kind === 244 /* EnumDeclaration */;
     }
     ts.isEnumDeclaration = isEnumDeclaration;
     function isModuleDeclaration(node) {
-        return node.kind === 244 /* ModuleDeclaration */;
+        return node.kind === 245 /* ModuleDeclaration */;
     }
     ts.isModuleDeclaration = isModuleDeclaration;
     function isModuleBlock(node) {
-        return node.kind === 245 /* ModuleBlock */;
+        return node.kind === 246 /* ModuleBlock */;
     }
     ts.isModuleBlock = isModuleBlock;
     function isCaseBlock(node) {
-        return node.kind === 246 /* CaseBlock */;
+        return node.kind === 247 /* CaseBlock */;
     }
     ts.isCaseBlock = isCaseBlock;
     function isNamespaceExportDeclaration(node) {
-        return node.kind === 247 /* NamespaceExportDeclaration */;
+        return node.kind === 248 /* NamespaceExportDeclaration */;
     }
     ts.isNamespaceExportDeclaration = isNamespaceExportDeclaration;
     function isImportEqualsDeclaration(node) {
-        return node.kind === 248 /* ImportEqualsDeclaration */;
+        return node.kind === 249 /* ImportEqualsDeclaration */;
     }
     ts.isImportEqualsDeclaration = isImportEqualsDeclaration;
     function isImportDeclaration(node) {
-        return node.kind === 249 /* ImportDeclaration */;
+        return node.kind === 250 /* ImportDeclaration */;
     }
     ts.isImportDeclaration = isImportDeclaration;
     function isImportClause(node) {
-        return node.kind === 250 /* ImportClause */;
+        return node.kind === 251 /* ImportClause */;
     }
     ts.isImportClause = isImportClause;
     function isNamespaceImport(node) {
-        return node.kind === 251 /* NamespaceImport */;
+        return node.kind === 252 /* NamespaceImport */;
     }
     ts.isNamespaceImport = isNamespaceImport;
     function isNamedImports(node) {
-        return node.kind === 252 /* NamedImports */;
+        return node.kind === 253 /* NamedImports */;
     }
     ts.isNamedImports = isNamedImports;
     function isImportSpecifier(node) {
-        return node.kind === 253 /* ImportSpecifier */;
+        return node.kind === 254 /* ImportSpecifier */;
     }
     ts.isImportSpecifier = isImportSpecifier;
     function isExportAssignment(node) {
-        return node.kind === 254 /* ExportAssignment */;
+        return node.kind === 255 /* ExportAssignment */;
     }
     ts.isExportAssignment = isExportAssignment;
     function isExportDeclaration(node) {
-        return node.kind === 255 /* ExportDeclaration */;
+        return node.kind === 256 /* ExportDeclaration */;
     }
     ts.isExportDeclaration = isExportDeclaration;
     function isNamedExports(node) {
-        return node.kind === 256 /* NamedExports */;
+        return node.kind === 257 /* NamedExports */;
     }
     ts.isNamedExports = isNamedExports;
     function isExportSpecifier(node) {
-        return node.kind === 257 /* ExportSpecifier */;
+        return node.kind === 258 /* ExportSpecifier */;
     }
     ts.isExportSpecifier = isExportSpecifier;
     function isMissingDeclaration(node) {
-        return node.kind === 258 /* MissingDeclaration */;
+        return node.kind === 259 /* MissingDeclaration */;
     }
     ts.isMissingDeclaration = isMissingDeclaration;
     // Module References
     function isExternalModuleReference(node) {
-        return node.kind === 259 /* ExternalModuleReference */;
+        return node.kind === 260 /* ExternalModuleReference */;
     }
     ts.isExternalModuleReference = isExternalModuleReference;
     // JSX
     function isJsxElement(node) {
-        return node.kind === 260 /* JsxElement */;
+        return node.kind === 261 /* JsxElement */;
     }
     ts.isJsxElement = isJsxElement;
     function isJsxSelfClosingElement(node) {
-        return node.kind === 261 /* JsxSelfClosingElement */;
+        return node.kind === 262 /* JsxSelfClosingElement */;
     }
     ts.isJsxSelfClosingElement = isJsxSelfClosingElement;
     function isJsxOpeningElement(node) {
-        return node.kind === 262 /* JsxOpeningElement */;
+        return node.kind === 263 /* JsxOpeningElement */;
     }
     ts.isJsxOpeningElement = isJsxOpeningElement;
     function isJsxClosingElement(node) {
-        return node.kind === 263 /* JsxClosingElement */;
+        return node.kind === 264 /* JsxClosingElement */;
     }
     ts.isJsxClosingElement = isJsxClosingElement;
     function isJsxFragment(node) {
-        return node.kind === 264 /* JsxFragment */;
+        return node.kind === 265 /* JsxFragment */;
     }
     ts.isJsxFragment = isJsxFragment;
     function isJsxOpeningFragment(node) {
-        return node.kind === 265 /* JsxOpeningFragment */;
+        return node.kind === 266 /* JsxOpeningFragment */;
     }
     ts.isJsxOpeningFragment = isJsxOpeningFragment;
     function isJsxClosingFragment(node) {
-        return node.kind === 266 /* JsxClosingFragment */;
+        return node.kind === 267 /* JsxClosingFragment */;
     }
     ts.isJsxClosingFragment = isJsxClosingFragment;
     function isJsxAttribute(node) {
-        return node.kind === 267 /* JsxAttribute */;
+        return node.kind === 268 /* JsxAttribute */;
     }
     ts.isJsxAttribute = isJsxAttribute;
     function isJsxAttributes(node) {
-        return node.kind === 268 /* JsxAttributes */;
+        return node.kind === 269 /* JsxAttributes */;
     }
     ts.isJsxAttributes = isJsxAttributes;
     function isJsxSpreadAttribute(node) {
-        return node.kind === 269 /* JsxSpreadAttribute */;
+        return node.kind === 270 /* JsxSpreadAttribute */;
     }
     ts.isJsxSpreadAttribute = isJsxSpreadAttribute;
     function isJsxExpression(node) {
-        return node.kind === 270 /* JsxExpression */;
+        return node.kind === 271 /* JsxExpression */;
     }
     ts.isJsxExpression = isJsxExpression;
     // Clauses
     function isCaseClause(node) {
-        return node.kind === 271 /* CaseClause */;
+        return node.kind === 272 /* CaseClause */;
     }
     ts.isCaseClause = isCaseClause;
     function isDefaultClause(node) {
-        return node.kind === 272 /* DefaultClause */;
+        return node.kind === 273 /* DefaultClause */;
     }
     ts.isDefaultClause = isDefaultClause;
     function isHeritageClause(node) {
-        return node.kind === 273 /* HeritageClause */;
+        return node.kind === 274 /* HeritageClause */;
     }
     ts.isHeritageClause = isHeritageClause;
     function isCatchClause(node) {
-        return node.kind === 274 /* CatchClause */;
+        return node.kind === 275 /* CatchClause */;
     }
     ts.isCatchClause = isCatchClause;
     // Property assignments
     function isPropertyAssignment(node) {
-        return node.kind === 275 /* PropertyAssignment */;
+        return node.kind === 276 /* PropertyAssignment */;
     }
     ts.isPropertyAssignment = isPropertyAssignment;
     function isShorthandPropertyAssignment(node) {
-        return node.kind === 276 /* ShorthandPropertyAssignment */;
+        return node.kind === 277 /* ShorthandPropertyAssignment */;
     }
     ts.isShorthandPropertyAssignment = isShorthandPropertyAssignment;
     function isSpreadAssignment(node) {
-        return node.kind === 277 /* SpreadAssignment */;
+        return node.kind === 278 /* SpreadAssignment */;
     }
     ts.isSpreadAssignment = isSpreadAssignment;
     // Enum
     function isEnumMember(node) {
-        return node.kind === 278 /* EnumMember */;
+        return node.kind === 279 /* EnumMember */;
     }
     ts.isEnumMember = isEnumMember;
     // Top-level nodes
     function isSourceFile(node) {
-        return node.kind === 284 /* SourceFile */;
+        return node.kind === 285 /* SourceFile */;
     }
     ts.isSourceFile = isSourceFile;
     function isBundle(node) {
-        return node.kind === 285 /* Bundle */;
+        return node.kind === 286 /* Bundle */;
     }
     ts.isBundle = isBundle;
     function isUnparsedSource(node) {
-        return node.kind === 286 /* UnparsedSource */;
+        return node.kind === 287 /* UnparsedSource */;
     }
     ts.isUnparsedSource = isUnparsedSource;
     function isUnparsedPrepend(node) {
-        return node.kind === 280 /* UnparsedPrepend */;
+        return node.kind === 281 /* UnparsedPrepend */;
     }
     ts.isUnparsedPrepend = isUnparsedPrepend;
     function isUnparsedTextLike(node) {
         switch (node.kind) {
-            case 281 /* UnparsedText */:
-            case 282 /* UnparsedInternalText */:
+            case 282 /* UnparsedText */:
+            case 283 /* UnparsedInternalText */:
                 return true;
             default:
                 return false;
@@ -14030,101 +14156,101 @@ var ts;
     ts.isUnparsedTextLike = isUnparsedTextLike;
     function isUnparsedNode(node) {
         return isUnparsedTextLike(node) ||
-            node.kind === 279 /* UnparsedPrologue */ ||
-            node.kind === 283 /* UnparsedSyntheticReference */;
+            node.kind === 280 /* UnparsedPrologue */ ||
+            node.kind === 284 /* UnparsedSyntheticReference */;
     }
     ts.isUnparsedNode = isUnparsedNode;
     // JSDoc
     function isJSDocTypeExpression(node) {
-        return node.kind === 288 /* JSDocTypeExpression */;
+        return node.kind === 289 /* JSDocTypeExpression */;
     }
     ts.isJSDocTypeExpression = isJSDocTypeExpression;
     function isJSDocAllType(node) {
-        return node.kind === 289 /* JSDocAllType */;
+        return node.kind === 290 /* JSDocAllType */;
     }
     ts.isJSDocAllType = isJSDocAllType;
     function isJSDocUnknownType(node) {
-        return node.kind === 290 /* JSDocUnknownType */;
+        return node.kind === 291 /* JSDocUnknownType */;
     }
     ts.isJSDocUnknownType = isJSDocUnknownType;
     function isJSDocNullableType(node) {
-        return node.kind === 291 /* JSDocNullableType */;
+        return node.kind === 292 /* JSDocNullableType */;
     }
     ts.isJSDocNullableType = isJSDocNullableType;
     function isJSDocNonNullableType(node) {
-        return node.kind === 292 /* JSDocNonNullableType */;
+        return node.kind === 293 /* JSDocNonNullableType */;
     }
     ts.isJSDocNonNullableType = isJSDocNonNullableType;
     function isJSDocOptionalType(node) {
-        return node.kind === 293 /* JSDocOptionalType */;
+        return node.kind === 294 /* JSDocOptionalType */;
     }
     ts.isJSDocOptionalType = isJSDocOptionalType;
     function isJSDocFunctionType(node) {
-        return node.kind === 294 /* JSDocFunctionType */;
+        return node.kind === 295 /* JSDocFunctionType */;
     }
     ts.isJSDocFunctionType = isJSDocFunctionType;
     function isJSDocVariadicType(node) {
-        return node.kind === 295 /* JSDocVariadicType */;
+        return node.kind === 296 /* JSDocVariadicType */;
     }
     ts.isJSDocVariadicType = isJSDocVariadicType;
     function isJSDoc(node) {
-        return node.kind === 296 /* JSDocComment */;
+        return node.kind === 297 /* JSDocComment */;
     }
     ts.isJSDoc = isJSDoc;
     function isJSDocAugmentsTag(node) {
-        return node.kind === 300 /* JSDocAugmentsTag */;
+        return node.kind === 301 /* JSDocAugmentsTag */;
     }
     ts.isJSDocAugmentsTag = isJSDocAugmentsTag;
     function isJSDocClassTag(node) {
-        return node.kind === 301 /* JSDocClassTag */;
+        return node.kind === 302 /* JSDocClassTag */;
     }
     ts.isJSDocClassTag = isJSDocClassTag;
     function isJSDocEnumTag(node) {
-        return node.kind === 303 /* JSDocEnumTag */;
+        return node.kind === 304 /* JSDocEnumTag */;
     }
     ts.isJSDocEnumTag = isJSDocEnumTag;
     function isJSDocThisTag(node) {
-        return node.kind === 306 /* JSDocThisTag */;
+        return node.kind === 307 /* JSDocThisTag */;
     }
     ts.isJSDocThisTag = isJSDocThisTag;
     function isJSDocParameterTag(node) {
-        return node.kind === 304 /* JSDocParameterTag */;
+        return node.kind === 305 /* JSDocParameterTag */;
     }
     ts.isJSDocParameterTag = isJSDocParameterTag;
     function isJSDocReturnTag(node) {
-        return node.kind === 305 /* JSDocReturnTag */;
+        return node.kind === 306 /* JSDocReturnTag */;
     }
     ts.isJSDocReturnTag = isJSDocReturnTag;
     function isJSDocTypeTag(node) {
-        return node.kind === 307 /* JSDocTypeTag */;
+        return node.kind === 308 /* JSDocTypeTag */;
     }
     ts.isJSDocTypeTag = isJSDocTypeTag;
     function isJSDocTemplateTag(node) {
-        return node.kind === 308 /* JSDocTemplateTag */;
+        return node.kind === 309 /* JSDocTemplateTag */;
     }
     ts.isJSDocTemplateTag = isJSDocTemplateTag;
     function isJSDocTypedefTag(node) {
-        return node.kind === 309 /* JSDocTypedefTag */;
+        return node.kind === 310 /* JSDocTypedefTag */;
     }
     ts.isJSDocTypedefTag = isJSDocTypedefTag;
     function isJSDocPropertyTag(node) {
-        return node.kind === 310 /* JSDocPropertyTag */;
+        return node.kind === 311 /* JSDocPropertyTag */;
     }
     ts.isJSDocPropertyTag = isJSDocPropertyTag;
     function isJSDocPropertyLikeTag(node) {
-        return node.kind === 310 /* JSDocPropertyTag */ || node.kind === 304 /* JSDocParameterTag */;
+        return node.kind === 311 /* JSDocPropertyTag */ || node.kind === 305 /* JSDocParameterTag */;
     }
     ts.isJSDocPropertyLikeTag = isJSDocPropertyLikeTag;
     function isJSDocTypeLiteral(node) {
-        return node.kind === 297 /* JSDocTypeLiteral */;
+        return node.kind === 298 /* JSDocTypeLiteral */;
     }
     ts.isJSDocTypeLiteral = isJSDocTypeLiteral;
     function isJSDocCallbackTag(node) {
-        return node.kind === 302 /* JSDocCallbackTag */;
+        return node.kind === 303 /* JSDocCallbackTag */;
     }
     ts.isJSDocCallbackTag = isJSDocCallbackTag;
     function isJSDocSignature(node) {
-        return node.kind === 298 /* JSDocSignature */;
+        return node.kind === 299 /* JSDocSignature */;
     }
     ts.isJSDocSignature = isJSDocSignature;
 })(ts || (ts = {}));
@@ -14135,7 +14261,7 @@ var ts;
 (function (ts) {
     /* @internal */
     function isSyntaxList(n) {
-        return n.kind === 311 /* SyntaxList */;
+        return n.kind === 312 /* SyntaxList */;
     }
     ts.isSyntaxList = isSyntaxList;
     /* @internal */
@@ -14145,7 +14271,7 @@ var ts;
     ts.isNode = isNode;
     /* @internal */
     function isNodeKind(kind) {
-        return kind >= 148 /* FirstNode */;
+        return kind >= 149 /* FirstNode */;
     }
     ts.isNodeKind = isNodeKind;
     /**
@@ -14154,7 +14280,7 @@ var ts;
      * Literals are considered tokens, except TemplateLiteral, but does include TemplateHead/Middle/Tail.
      */
     function isToken(n) {
-        return n.kind >= 0 /* FirstToken */ && n.kind <= 147 /* LastToken */;
+        return n.kind >= 0 /* FirstToken */ && n.kind <= 148 /* LastToken */;
     }
     ts.isToken = isToken;
     // Node Arrays
@@ -14207,17 +14333,17 @@ var ts;
     /* @internal */
     function isModifierKind(token) {
         switch (token) {
-            case 118 /* AbstractKeyword */:
-            case 121 /* AsyncKeyword */:
-            case 77 /* ConstKeyword */:
-            case 125 /* DeclareKeyword */:
-            case 80 /* DefaultKeyword */:
-            case 85 /* ExportKeyword */:
-            case 115 /* PublicKeyword */:
-            case 113 /* PrivateKeyword */:
-            case 114 /* ProtectedKeyword */:
-            case 133 /* ReadonlyKeyword */:
-            case 116 /* StaticKeyword */:
+            case 119 /* AbstractKeyword */:
+            case 122 /* AsyncKeyword */:
+            case 78 /* ConstKeyword */:
+            case 126 /* DeclareKeyword */:
+            case 81 /* DefaultKeyword */:
+            case 86 /* ExportKeyword */:
+            case 116 /* PublicKeyword */:
+            case 114 /* PrivateKeyword */:
+            case 115 /* ProtectedKeyword */:
+            case 134 /* ReadonlyKeyword */:
+            case 117 /* StaticKeyword */:
                 return true;
         }
         return false;
@@ -14230,7 +14356,7 @@ var ts;
     ts.isParameterPropertyModifier = isParameterPropertyModifier;
     /* @internal */
     function isClassMemberModifier(idToken) {
-        return isParameterPropertyModifier(idToken) || idToken === 116 /* StaticKeyword */;
+        return isParameterPropertyModifier(idToken) || idToken === 117 /* StaticKeyword */;
     }
     ts.isClassMemberModifier = isClassMemberModifier;
     function isModifier(node) {
@@ -14239,23 +14365,23 @@ var ts;
     ts.isModifier = isModifier;
     function isEntityName(node) {
         var kind = node.kind;
-        return kind === 148 /* QualifiedName */
-            || kind === 72 /* Identifier */;
+        return kind === 149 /* QualifiedName */
+            || kind === 73 /* Identifier */;
     }
     ts.isEntityName = isEntityName;
     function isPropertyName(node) {
         var kind = node.kind;
-        return kind === 72 /* Identifier */
+        return kind === 73 /* Identifier */
             || kind === 10 /* StringLiteral */
             || kind === 8 /* NumericLiteral */
-            || kind === 149 /* ComputedPropertyName */;
+            || kind === 150 /* ComputedPropertyName */;
     }
     ts.isPropertyName = isPropertyName;
     function isBindingName(node) {
         var kind = node.kind;
-        return kind === 72 /* Identifier */
-            || kind === 184 /* ObjectBindingPattern */
-            || kind === 185 /* ArrayBindingPattern */;
+        return kind === 73 /* Identifier */
+            || kind === 185 /* ObjectBindingPattern */
+            || kind === 186 /* ArrayBindingPattern */;
     }
     ts.isBindingName = isBindingName;
     // Functions
@@ -14270,13 +14396,13 @@ var ts;
     ts.isFunctionLikeDeclaration = isFunctionLikeDeclaration;
     function isFunctionLikeDeclarationKind(kind) {
         switch (kind) {
-            case 239 /* FunctionDeclaration */:
-            case 156 /* MethodDeclaration */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
+            case 240 /* FunctionDeclaration */:
+            case 157 /* MethodDeclaration */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
                 return true;
             default:
                 return false;
@@ -14285,14 +14411,14 @@ var ts;
     /* @internal */
     function isFunctionLikeKind(kind) {
         switch (kind) {
-            case 155 /* MethodSignature */:
-            case 160 /* CallSignature */:
-            case 298 /* JSDocSignature */:
-            case 161 /* ConstructSignature */:
-            case 162 /* IndexSignature */:
-            case 165 /* FunctionType */:
-            case 294 /* JSDocFunctionType */:
-            case 166 /* ConstructorType */:
+            case 156 /* MethodSignature */:
+            case 161 /* CallSignature */:
+            case 299 /* JSDocSignature */:
+            case 162 /* ConstructSignature */:
+            case 163 /* IndexSignature */:
+            case 166 /* FunctionType */:
+            case 295 /* JSDocFunctionType */:
+            case 167 /* ConstructorType */:
                 return true;
             default:
                 return isFunctionLikeDeclarationKind(kind);
@@ -14307,29 +14433,29 @@ var ts;
     // Classes
     function isClassElement(node) {
         var kind = node.kind;
-        return kind === 157 /* Constructor */
-            || kind === 154 /* PropertyDeclaration */
-            || kind === 156 /* MethodDeclaration */
-            || kind === 158 /* GetAccessor */
-            || kind === 159 /* SetAccessor */
-            || kind === 162 /* IndexSignature */
-            || kind === 217 /* SemicolonClassElement */;
+        return kind === 158 /* Constructor */
+            || kind === 155 /* PropertyDeclaration */
+            || kind === 157 /* MethodDeclaration */
+            || kind === 159 /* GetAccessor */
+            || kind === 160 /* SetAccessor */
+            || kind === 163 /* IndexSignature */
+            || kind === 218 /* SemicolonClassElement */;
     }
     ts.isClassElement = isClassElement;
     function isClassLike(node) {
-        return node && (node.kind === 240 /* ClassDeclaration */ || node.kind === 209 /* ClassExpression */);
+        return node && (node.kind === 241 /* ClassDeclaration */ || node.kind === 210 /* ClassExpression */);
     }
     ts.isClassLike = isClassLike;
     function isAccessor(node) {
-        return node && (node.kind === 158 /* GetAccessor */ || node.kind === 159 /* SetAccessor */);
+        return node && (node.kind === 159 /* GetAccessor */ || node.kind === 160 /* SetAccessor */);
     }
     ts.isAccessor = isAccessor;
     /* @internal */
     function isMethodOrAccessor(node) {
         switch (node.kind) {
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
                 return true;
             default:
                 return false;
@@ -14339,11 +14465,11 @@ var ts;
     // Type members
     function isTypeElement(node) {
         var kind = node.kind;
-        return kind === 161 /* ConstructSignature */
-            || kind === 160 /* CallSignature */
-            || kind === 153 /* PropertySignature */
-            || kind === 155 /* MethodSignature */
-            || kind === 162 /* IndexSignature */;
+        return kind === 162 /* ConstructSignature */
+            || kind === 161 /* CallSignature */
+            || kind === 154 /* PropertySignature */
+            || kind === 156 /* MethodSignature */
+            || kind === 163 /* IndexSignature */;
     }
     ts.isTypeElement = isTypeElement;
     function isClassOrTypeElement(node) {
@@ -14352,12 +14478,12 @@ var ts;
     ts.isClassOrTypeElement = isClassOrTypeElement;
     function isObjectLiteralElementLike(node) {
         var kind = node.kind;
-        return kind === 275 /* PropertyAssignment */
-            || kind === 276 /* ShorthandPropertyAssignment */
-            || kind === 277 /* SpreadAssignment */
-            || kind === 156 /* MethodDeclaration */
-            || kind === 158 /* GetAccessor */
-            || kind === 159 /* SetAccessor */;
+        return kind === 276 /* PropertyAssignment */
+            || kind === 277 /* ShorthandPropertyAssignment */
+            || kind === 278 /* SpreadAssignment */
+            || kind === 157 /* MethodDeclaration */
+            || kind === 159 /* GetAccessor */
+            || kind === 160 /* SetAccessor */;
     }
     ts.isObjectLiteralElementLike = isObjectLiteralElementLike;
     // Type
@@ -14372,8 +14498,8 @@ var ts;
     ts.isTypeNode = isTypeNode;
     function isFunctionOrConstructorTypeNode(node) {
         switch (node.kind) {
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
                 return true;
         }
         return false;
@@ -14384,8 +14510,8 @@ var ts;
     function isBindingPattern(node) {
         if (node) {
             var kind = node.kind;
-            return kind === 185 /* ArrayBindingPattern */
-                || kind === 184 /* ObjectBindingPattern */;
+            return kind === 186 /* ArrayBindingPattern */
+                || kind === 185 /* ObjectBindingPattern */;
         }
         return false;
     }
@@ -14393,15 +14519,15 @@ var ts;
     /* @internal */
     function isAssignmentPattern(node) {
         var kind = node.kind;
-        return kind === 187 /* ArrayLiteralExpression */
-            || kind === 188 /* ObjectLiteralExpression */;
+        return kind === 188 /* ArrayLiteralExpression */
+            || kind === 189 /* ObjectLiteralExpression */;
     }
     ts.isAssignmentPattern = isAssignmentPattern;
     /* @internal */
     function isArrayBindingElement(node) {
         var kind = node.kind;
-        return kind === 186 /* BindingElement */
-            || kind === 210 /* OmittedExpression */;
+        return kind === 187 /* BindingElement */
+            || kind === 211 /* OmittedExpression */;
     }
     ts.isArrayBindingElement = isArrayBindingElement;
     /**
@@ -14410,9 +14536,9 @@ var ts;
     /* @internal */
     function isDeclarationBindingElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 237 /* VariableDeclaration */:
-            case 151 /* Parameter */:
-            case 186 /* BindingElement */:
+            case 238 /* VariableDeclaration */:
+            case 152 /* Parameter */:
+            case 187 /* BindingElement */:
                 return true;
         }
         return false;
@@ -14433,8 +14559,8 @@ var ts;
     /* @internal */
     function isObjectBindingOrAssignmentPattern(node) {
         switch (node.kind) {
-            case 184 /* ObjectBindingPattern */:
-            case 188 /* ObjectLiteralExpression */:
+            case 185 /* ObjectBindingPattern */:
+            case 189 /* ObjectLiteralExpression */:
                 return true;
         }
         return false;
@@ -14446,8 +14572,8 @@ var ts;
     /* @internal */
     function isArrayBindingOrAssignmentPattern(node) {
         switch (node.kind) {
-            case 185 /* ArrayBindingPattern */:
-            case 187 /* ArrayLiteralExpression */:
+            case 186 /* ArrayBindingPattern */:
+            case 188 /* ArrayLiteralExpression */:
                 return true;
         }
         return false;
@@ -14456,26 +14582,26 @@ var ts;
     /* @internal */
     function isPropertyAccessOrQualifiedNameOrImportTypeNode(node) {
         var kind = node.kind;
-        return kind === 189 /* PropertyAccessExpression */
-            || kind === 148 /* QualifiedName */
-            || kind === 183 /* ImportType */;
+        return kind === 190 /* PropertyAccessExpression */
+            || kind === 149 /* QualifiedName */
+            || kind === 184 /* ImportType */;
     }
     ts.isPropertyAccessOrQualifiedNameOrImportTypeNode = isPropertyAccessOrQualifiedNameOrImportTypeNode;
     // Expression
     function isPropertyAccessOrQualifiedName(node) {
         var kind = node.kind;
-        return kind === 189 /* PropertyAccessExpression */
-            || kind === 148 /* QualifiedName */;
+        return kind === 190 /* PropertyAccessExpression */
+            || kind === 149 /* QualifiedName */;
     }
     ts.isPropertyAccessOrQualifiedName = isPropertyAccessOrQualifiedName;
     function isCallLikeExpression(node) {
         switch (node.kind) {
-            case 262 /* JsxOpeningElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 191 /* CallExpression */:
-            case 192 /* NewExpression */:
-            case 193 /* TaggedTemplateExpression */:
-            case 152 /* Decorator */:
+            case 263 /* JsxOpeningElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 192 /* CallExpression */:
+            case 193 /* NewExpression */:
+            case 194 /* TaggedTemplateExpression */:
+            case 153 /* Decorator */:
                 return true;
             default:
                 return false;
@@ -14483,12 +14609,12 @@ var ts;
     }
     ts.isCallLikeExpression = isCallLikeExpression;
     function isCallOrNewExpression(node) {
-        return node.kind === 191 /* CallExpression */ || node.kind === 192 /* NewExpression */;
+        return node.kind === 192 /* CallExpression */ || node.kind === 193 /* NewExpression */;
     }
     ts.isCallOrNewExpression = isCallOrNewExpression;
     function isTemplateLiteral(node) {
         var kind = node.kind;
-        return kind === 206 /* TemplateExpression */
+        return kind === 207 /* TemplateExpression */
             || kind === 14 /* NoSubstitutionTemplateLiteral */;
     }
     ts.isTemplateLiteral = isTemplateLiteral;
@@ -14499,34 +14625,34 @@ var ts;
     ts.isLeftHandSideExpression = isLeftHandSideExpression;
     function isLeftHandSideExpressionKind(kind) {
         switch (kind) {
-            case 189 /* PropertyAccessExpression */:
-            case 190 /* ElementAccessExpression */:
-            case 192 /* NewExpression */:
-            case 191 /* CallExpression */:
-            case 260 /* JsxElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 264 /* JsxFragment */:
-            case 193 /* TaggedTemplateExpression */:
-            case 187 /* ArrayLiteralExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 188 /* ObjectLiteralExpression */:
-            case 209 /* ClassExpression */:
-            case 196 /* FunctionExpression */:
-            case 72 /* Identifier */:
+            case 190 /* PropertyAccessExpression */:
+            case 191 /* ElementAccessExpression */:
+            case 193 /* NewExpression */:
+            case 192 /* CallExpression */:
+            case 261 /* JsxElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 265 /* JsxFragment */:
+            case 194 /* TaggedTemplateExpression */:
+            case 188 /* ArrayLiteralExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 189 /* ObjectLiteralExpression */:
+            case 210 /* ClassExpression */:
+            case 197 /* FunctionExpression */:
+            case 73 /* Identifier */:
             case 13 /* RegularExpressionLiteral */:
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 206 /* TemplateExpression */:
-            case 87 /* FalseKeyword */:
-            case 96 /* NullKeyword */:
-            case 100 /* ThisKeyword */:
-            case 102 /* TrueKeyword */:
-            case 98 /* SuperKeyword */:
-            case 213 /* NonNullExpression */:
-            case 214 /* MetaProperty */:
-            case 92 /* ImportKeyword */: // technically this is only an Expression if it's in a CallExpression
+            case 207 /* TemplateExpression */:
+            case 88 /* FalseKeyword */:
+            case 97 /* NullKeyword */:
+            case 101 /* ThisKeyword */:
+            case 103 /* TrueKeyword */:
+            case 99 /* SuperKeyword */:
+            case 214 /* NonNullExpression */:
+            case 215 /* MetaProperty */:
+            case 93 /* ImportKeyword */: // technically this is only an Expression if it's in a CallExpression
                 return true;
             default:
                 return false;
@@ -14539,13 +14665,13 @@ var ts;
     ts.isUnaryExpression = isUnaryExpression;
     function isUnaryExpressionKind(kind) {
         switch (kind) {
-            case 202 /* PrefixUnaryExpression */:
-            case 203 /* PostfixUnaryExpression */:
-            case 198 /* DeleteExpression */:
-            case 199 /* TypeOfExpression */:
-            case 200 /* VoidExpression */:
-            case 201 /* AwaitExpression */:
-            case 194 /* TypeAssertionExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
+            case 199 /* DeleteExpression */:
+            case 200 /* TypeOfExpression */:
+            case 201 /* VoidExpression */:
+            case 202 /* AwaitExpression */:
+            case 195 /* TypeAssertionExpression */:
                 return true;
             default:
                 return isLeftHandSideExpressionKind(kind);
@@ -14554,9 +14680,9 @@ var ts;
     /* @internal */
     function isUnaryExpressionWithWrite(expr) {
         switch (expr.kind) {
-            case 203 /* PostfixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 return true;
-            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 return expr.operator === 44 /* PlusPlusToken */ ||
                     expr.operator === 45 /* MinusMinusToken */;
             default:
@@ -14575,15 +14701,15 @@ var ts;
     ts.isExpression = isExpression;
     function isExpressionKind(kind) {
         switch (kind) {
-            case 205 /* ConditionalExpression */:
-            case 207 /* YieldExpression */:
-            case 197 /* ArrowFunction */:
-            case 204 /* BinaryExpression */:
-            case 208 /* SpreadElement */:
-            case 212 /* AsExpression */:
-            case 210 /* OmittedExpression */:
-            case 314 /* CommaListExpression */:
-            case 313 /* PartiallyEmittedExpression */:
+            case 206 /* ConditionalExpression */:
+            case 208 /* YieldExpression */:
+            case 198 /* ArrowFunction */:
+            case 205 /* BinaryExpression */:
+            case 209 /* SpreadElement */:
+            case 213 /* AsExpression */:
+            case 211 /* OmittedExpression */:
+            case 315 /* CommaListExpression */:
+            case 314 /* PartiallyEmittedExpression */:
                 return true;
             default:
                 return isUnaryExpressionKind(kind);
@@ -14591,18 +14717,18 @@ var ts;
     }
     function isAssertionExpression(node) {
         var kind = node.kind;
-        return kind === 194 /* TypeAssertionExpression */
-            || kind === 212 /* AsExpression */;
+        return kind === 195 /* TypeAssertionExpression */
+            || kind === 213 /* AsExpression */;
     }
     ts.isAssertionExpression = isAssertionExpression;
     /* @internal */
     function isPartiallyEmittedExpression(node) {
-        return node.kind === 313 /* PartiallyEmittedExpression */;
+        return node.kind === 314 /* PartiallyEmittedExpression */;
     }
     ts.isPartiallyEmittedExpression = isPartiallyEmittedExpression;
     /* @internal */
     function isNotEmittedStatement(node) {
-        return node.kind === 312 /* NotEmittedStatement */;
+        return node.kind === 313 /* NotEmittedStatement */;
     }
     ts.isNotEmittedStatement = isNotEmittedStatement;
     /* @internal */
@@ -14613,13 +14739,13 @@ var ts;
     ts.isNotEmittedOrPartiallyEmittedNode = isNotEmittedOrPartiallyEmittedNode;
     function isIterationStatement(node, lookInLabeledStatements) {
         switch (node.kind) {
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
-            case 223 /* DoStatement */:
-            case 224 /* WhileStatement */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
+            case 224 /* DoStatement */:
+            case 225 /* WhileStatement */:
                 return true;
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
         }
         return false;
@@ -14627,7 +14753,7 @@ var ts;
     ts.isIterationStatement = isIterationStatement;
     /* @internal */
     function isForInOrOfStatement(node) {
-        return node.kind === 226 /* ForInStatement */ || node.kind === 227 /* ForOfStatement */;
+        return node.kind === 227 /* ForInStatement */ || node.kind === 228 /* ForOfStatement */;
     }
     ts.isForInOrOfStatement = isForInOrOfStatement;
     // Element
@@ -14651,113 +14777,113 @@ var ts;
     /* @internal */
     function isModuleBody(node) {
         var kind = node.kind;
-        return kind === 245 /* ModuleBlock */
-            || kind === 244 /* ModuleDeclaration */
-            || kind === 72 /* Identifier */;
+        return kind === 246 /* ModuleBlock */
+            || kind === 245 /* ModuleDeclaration */
+            || kind === 73 /* Identifier */;
     }
     ts.isModuleBody = isModuleBody;
     /* @internal */
     function isNamespaceBody(node) {
         var kind = node.kind;
-        return kind === 245 /* ModuleBlock */
-            || kind === 244 /* ModuleDeclaration */;
+        return kind === 246 /* ModuleBlock */
+            || kind === 245 /* ModuleDeclaration */;
     }
     ts.isNamespaceBody = isNamespaceBody;
     /* @internal */
     function isJSDocNamespaceBody(node) {
         var kind = node.kind;
-        return kind === 72 /* Identifier */
-            || kind === 244 /* ModuleDeclaration */;
+        return kind === 73 /* Identifier */
+            || kind === 245 /* ModuleDeclaration */;
     }
     ts.isJSDocNamespaceBody = isJSDocNamespaceBody;
     /* @internal */
     function isNamedImportBindings(node) {
         var kind = node.kind;
-        return kind === 252 /* NamedImports */
-            || kind === 251 /* NamespaceImport */;
+        return kind === 253 /* NamedImports */
+            || kind === 252 /* NamespaceImport */;
     }
     ts.isNamedImportBindings = isNamedImportBindings;
     /* @internal */
     function isModuleOrEnumDeclaration(node) {
-        return node.kind === 244 /* ModuleDeclaration */ || node.kind === 243 /* EnumDeclaration */;
+        return node.kind === 245 /* ModuleDeclaration */ || node.kind === 244 /* EnumDeclaration */;
     }
     ts.isModuleOrEnumDeclaration = isModuleOrEnumDeclaration;
     function isDeclarationKind(kind) {
-        return kind === 197 /* ArrowFunction */
-            || kind === 186 /* BindingElement */
-            || kind === 240 /* ClassDeclaration */
-            || kind === 209 /* ClassExpression */
-            || kind === 157 /* Constructor */
-            || kind === 243 /* EnumDeclaration */
-            || kind === 278 /* EnumMember */
-            || kind === 257 /* ExportSpecifier */
-            || kind === 239 /* FunctionDeclaration */
-            || kind === 196 /* FunctionExpression */
-            || kind === 158 /* GetAccessor */
-            || kind === 250 /* ImportClause */
-            || kind === 248 /* ImportEqualsDeclaration */
-            || kind === 253 /* ImportSpecifier */
-            || kind === 241 /* InterfaceDeclaration */
-            || kind === 267 /* JsxAttribute */
-            || kind === 156 /* MethodDeclaration */
-            || kind === 155 /* MethodSignature */
-            || kind === 244 /* ModuleDeclaration */
-            || kind === 247 /* NamespaceExportDeclaration */
-            || kind === 251 /* NamespaceImport */
-            || kind === 151 /* Parameter */
-            || kind === 275 /* PropertyAssignment */
-            || kind === 154 /* PropertyDeclaration */
-            || kind === 153 /* PropertySignature */
-            || kind === 159 /* SetAccessor */
-            || kind === 276 /* ShorthandPropertyAssignment */
-            || kind === 242 /* TypeAliasDeclaration */
-            || kind === 150 /* TypeParameter */
-            || kind === 237 /* VariableDeclaration */
-            || kind === 309 /* JSDocTypedefTag */
-            || kind === 302 /* JSDocCallbackTag */
-            || kind === 310 /* JSDocPropertyTag */;
+        return kind === 198 /* ArrowFunction */
+            || kind === 187 /* BindingElement */
+            || kind === 241 /* ClassDeclaration */
+            || kind === 210 /* ClassExpression */
+            || kind === 158 /* Constructor */
+            || kind === 244 /* EnumDeclaration */
+            || kind === 279 /* EnumMember */
+            || kind === 258 /* ExportSpecifier */
+            || kind === 240 /* FunctionDeclaration */
+            || kind === 197 /* FunctionExpression */
+            || kind === 159 /* GetAccessor */
+            || kind === 251 /* ImportClause */
+            || kind === 249 /* ImportEqualsDeclaration */
+            || kind === 254 /* ImportSpecifier */
+            || kind === 242 /* InterfaceDeclaration */
+            || kind === 268 /* JsxAttribute */
+            || kind === 157 /* MethodDeclaration */
+            || kind === 156 /* MethodSignature */
+            || kind === 245 /* ModuleDeclaration */
+            || kind === 248 /* NamespaceExportDeclaration */
+            || kind === 252 /* NamespaceImport */
+            || kind === 152 /* Parameter */
+            || kind === 276 /* PropertyAssignment */
+            || kind === 155 /* PropertyDeclaration */
+            || kind === 154 /* PropertySignature */
+            || kind === 160 /* SetAccessor */
+            || kind === 277 /* ShorthandPropertyAssignment */
+            || kind === 243 /* TypeAliasDeclaration */
+            || kind === 151 /* TypeParameter */
+            || kind === 238 /* VariableDeclaration */
+            || kind === 310 /* JSDocTypedefTag */
+            || kind === 303 /* JSDocCallbackTag */
+            || kind === 311 /* JSDocPropertyTag */;
     }
     function isDeclarationStatementKind(kind) {
-        return kind === 239 /* FunctionDeclaration */
-            || kind === 258 /* MissingDeclaration */
-            || kind === 240 /* ClassDeclaration */
-            || kind === 241 /* InterfaceDeclaration */
-            || kind === 242 /* TypeAliasDeclaration */
-            || kind === 243 /* EnumDeclaration */
-            || kind === 244 /* ModuleDeclaration */
-            || kind === 249 /* ImportDeclaration */
-            || kind === 248 /* ImportEqualsDeclaration */
-            || kind === 255 /* ExportDeclaration */
-            || kind === 254 /* ExportAssignment */
-            || kind === 247 /* NamespaceExportDeclaration */;
+        return kind === 240 /* FunctionDeclaration */
+            || kind === 259 /* MissingDeclaration */
+            || kind === 241 /* ClassDeclaration */
+            || kind === 242 /* InterfaceDeclaration */
+            || kind === 243 /* TypeAliasDeclaration */
+            || kind === 244 /* EnumDeclaration */
+            || kind === 245 /* ModuleDeclaration */
+            || kind === 250 /* ImportDeclaration */
+            || kind === 249 /* ImportEqualsDeclaration */
+            || kind === 256 /* ExportDeclaration */
+            || kind === 255 /* ExportAssignment */
+            || kind === 248 /* NamespaceExportDeclaration */;
     }
     function isStatementKindButNotDeclarationKind(kind) {
-        return kind === 229 /* BreakStatement */
-            || kind === 228 /* ContinueStatement */
-            || kind === 236 /* DebuggerStatement */
-            || kind === 223 /* DoStatement */
-            || kind === 221 /* ExpressionStatement */
-            || kind === 220 /* EmptyStatement */
-            || kind === 226 /* ForInStatement */
-            || kind === 227 /* ForOfStatement */
-            || kind === 225 /* ForStatement */
-            || kind === 222 /* IfStatement */
-            || kind === 233 /* LabeledStatement */
-            || kind === 230 /* ReturnStatement */
-            || kind === 232 /* SwitchStatement */
-            || kind === 234 /* ThrowStatement */
-            || kind === 235 /* TryStatement */
-            || kind === 219 /* VariableStatement */
-            || kind === 224 /* WhileStatement */
-            || kind === 231 /* WithStatement */
-            || kind === 312 /* NotEmittedStatement */
-            || kind === 316 /* EndOfDeclarationMarker */
-            || kind === 315 /* MergeDeclarationMarker */;
+        return kind === 230 /* BreakStatement */
+            || kind === 229 /* ContinueStatement */
+            || kind === 237 /* DebuggerStatement */
+            || kind === 224 /* DoStatement */
+            || kind === 222 /* ExpressionStatement */
+            || kind === 221 /* EmptyStatement */
+            || kind === 227 /* ForInStatement */
+            || kind === 228 /* ForOfStatement */
+            || kind === 226 /* ForStatement */
+            || kind === 223 /* IfStatement */
+            || kind === 234 /* LabeledStatement */
+            || kind === 231 /* ReturnStatement */
+            || kind === 233 /* SwitchStatement */
+            || kind === 235 /* ThrowStatement */
+            || kind === 236 /* TryStatement */
+            || kind === 220 /* VariableStatement */
+            || kind === 225 /* WhileStatement */
+            || kind === 232 /* WithStatement */
+            || kind === 313 /* NotEmittedStatement */
+            || kind === 317 /* EndOfDeclarationMarker */
+            || kind === 316 /* MergeDeclarationMarker */;
     }
     /* @internal */
     function isDeclaration(node) {
-        if (node.kind === 150 /* TypeParameter */) {
-            return (node.parent && node.parent.kind !== 308 /* JSDocTemplateTag */) || ts.isInJSFile(node);
+        if (node.kind === 151 /* TypeParameter */) {
+            return (node.parent && node.parent.kind !== 309 /* JSDocTemplateTag */) || ts.isInJSFile(node);
         }
         return isDeclarationKind(node.kind);
     }
@@ -14784,10 +14910,10 @@ var ts;
     }
     ts.isStatement = isStatement;
     function isBlockStatement(node) {
-        if (node.kind !== 218 /* Block */)
+        if (node.kind !== 219 /* Block */)
             return false;
         if (node.parent !== undefined) {
-            if (node.parent.kind === 235 /* TryStatement */ || node.parent.kind === 274 /* CatchClause */) {
+            if (node.parent.kind === 236 /* TryStatement */ || node.parent.kind === 275 /* CatchClause */) {
                 return false;
             }
         }
@@ -14797,81 +14923,81 @@ var ts;
     /* @internal */
     function isModuleReference(node) {
         var kind = node.kind;
-        return kind === 259 /* ExternalModuleReference */
-            || kind === 148 /* QualifiedName */
-            || kind === 72 /* Identifier */;
+        return kind === 260 /* ExternalModuleReference */
+            || kind === 149 /* QualifiedName */
+            || kind === 73 /* Identifier */;
     }
     ts.isModuleReference = isModuleReference;
     // JSX
     /* @internal */
     function isJsxTagNameExpression(node) {
         var kind = node.kind;
-        return kind === 100 /* ThisKeyword */
-            || kind === 72 /* Identifier */
-            || kind === 189 /* PropertyAccessExpression */;
+        return kind === 101 /* ThisKeyword */
+            || kind === 73 /* Identifier */
+            || kind === 190 /* PropertyAccessExpression */;
     }
     ts.isJsxTagNameExpression = isJsxTagNameExpression;
     /* @internal */
     function isJsxChild(node) {
         var kind = node.kind;
-        return kind === 260 /* JsxElement */
-            || kind === 270 /* JsxExpression */
-            || kind === 261 /* JsxSelfClosingElement */
+        return kind === 261 /* JsxElement */
+            || kind === 271 /* JsxExpression */
+            || kind === 262 /* JsxSelfClosingElement */
             || kind === 11 /* JsxText */
-            || kind === 264 /* JsxFragment */;
+            || kind === 265 /* JsxFragment */;
     }
     ts.isJsxChild = isJsxChild;
     /* @internal */
     function isJsxAttributeLike(node) {
         var kind = node.kind;
-        return kind === 267 /* JsxAttribute */
-            || kind === 269 /* JsxSpreadAttribute */;
+        return kind === 268 /* JsxAttribute */
+            || kind === 270 /* JsxSpreadAttribute */;
     }
     ts.isJsxAttributeLike = isJsxAttributeLike;
     /* @internal */
     function isStringLiteralOrJsxExpression(node) {
         var kind = node.kind;
         return kind === 10 /* StringLiteral */
-            || kind === 270 /* JsxExpression */;
+            || kind === 271 /* JsxExpression */;
     }
     ts.isStringLiteralOrJsxExpression = isStringLiteralOrJsxExpression;
     function isJsxOpeningLikeElement(node) {
         var kind = node.kind;
-        return kind === 262 /* JsxOpeningElement */
-            || kind === 261 /* JsxSelfClosingElement */;
+        return kind === 263 /* JsxOpeningElement */
+            || kind === 262 /* JsxSelfClosingElement */;
     }
     ts.isJsxOpeningLikeElement = isJsxOpeningLikeElement;
     // Clauses
     function isCaseOrDefaultClause(node) {
         var kind = node.kind;
-        return kind === 271 /* CaseClause */
-            || kind === 272 /* DefaultClause */;
+        return kind === 272 /* CaseClause */
+            || kind === 273 /* DefaultClause */;
     }
     ts.isCaseOrDefaultClause = isCaseOrDefaultClause;
     // JSDoc
     /** True if node is of some JSDoc syntax kind. */
     /* @internal */
     function isJSDocNode(node) {
-        return node.kind >= 288 /* FirstJSDocNode */ && node.kind <= 310 /* LastJSDocNode */;
+        return node.kind >= 289 /* FirstJSDocNode */ && node.kind <= 311 /* LastJSDocNode */;
     }
     ts.isJSDocNode = isJSDocNode;
     /** True if node is of a kind that may contain comment text. */
     function isJSDocCommentContainingNode(node) {
-        return node.kind === 296 /* JSDocComment */ || isJSDocTag(node) || ts.isJSDocTypeLiteral(node) || ts.isJSDocSignature(node);
+        return node.kind === 297 /* JSDocComment */ || isJSDocTag(node) || ts.isJSDocTypeLiteral(node) || ts.isJSDocSignature(node);
     }
     ts.isJSDocCommentContainingNode = isJSDocCommentContainingNode;
     // TODO: determine what this does before making it public.
     /* @internal */
     function isJSDocTag(node) {
-        return node.kind >= 299 /* FirstJSDocTagNode */ && node.kind <= 310 /* LastJSDocTagNode */;
+        return node.kind >= 300 /* FirstJSDocTagNode */ && node.kind <= 311 /* LastJSDocTagNode */;
     }
     ts.isJSDocTag = isJSDocTag;
     function isSetAccessor(node) {
-        return node.kind === 159 /* SetAccessor */;
+        return node.kind === 160 /* SetAccessor */;
     }
     ts.isSetAccessor = isSetAccessor;
     function isGetAccessor(node) {
-        return node.kind === 158 /* GetAccessor */;
+        return node.kind === 159 /* GetAccessor */;
     }
     ts.isGetAccessor = isGetAccessor;
     /** True if has jsdoc nodes attached to it. */
@@ -14901,12 +15027,12 @@ var ts;
     }
     ts.hasOnlyExpressionInitializer = hasOnlyExpressionInitializer;
     function isObjectLiteralElement(node) {
-        return node.kind === 267 /* JsxAttribute */ || node.kind === 269 /* JsxSpreadAttribute */ || isObjectLiteralElementLike(node);
+        return node.kind === 268 /* JsxAttribute */ || node.kind === 270 /* JsxSpreadAttribute */ || isObjectLiteralElementLike(node);
     }
     ts.isObjectLiteralElement = isObjectLiteralElement;
     /* @internal */
     function isTypeReferenceType(node) {
-        return node.kind === 164 /* TypeReference */ || node.kind === 211 /* ExpressionWithTypeArguments */;
+        return node.kind === 165 /* TypeReference */ || node.kind === 212 /* ExpressionWithTypeArguments */;
     }
     ts.isTypeReferenceType = isTypeReferenceType;
     var MAX_SMI_X86 = 1073741823;
@@ -14942,7 +15068,7 @@ var ts;
 /* @internal */
 (function (ts) {
     function isNamedImportsOrExports(node) {
-        return node.kind === 252 /* NamedImports */ || node.kind === 256 /* NamedExports */;
+        return node.kind === 253 /* NamedImports */ || node.kind === 257 /* NamedExports */;
     }
     ts.isNamedImportsOrExports = isNamedImportsOrExports;
     function Symbol(flags, name) {
@@ -15193,6 +15319,11 @@ var ts;
             ts.semanticDiagnosticsOptionDeclarations.some(function (option) { return !ts.isJsonEqual(getCompilerOptionValue(oldOptions, option), getCompilerOptionValue(newOptions, option)); });
     }
     ts.compilerOptionsAffectSemanticDiagnostics = compilerOptionsAffectSemanticDiagnostics;
+    function compilerOptionsAffectEmit(newOptions, oldOptions) {
+        return oldOptions !== newOptions &&
+            ts.affectsEmitOptionDeclarations.some(function (option) { return !ts.isJsonEqual(getCompilerOptionValue(oldOptions, option), getCompilerOptionValue(newOptions, option)); });
+    }
+    ts.compilerOptionsAffectEmit = compilerOptionsAffectEmit;
     function getCompilerOptionValue(options, option) {
         return option.strictFlag ? getStrictOptionValue(options, option.name) : options[option.name];
     }
@@ -15471,6 +15602,15 @@ var ts;
         return root + pathComponents.slice(1).join(ts.directorySeparator);
     }
     ts.getPathFromPathComponents = getPathFromPathComponents;
+    function getNormalizedAbsolutePathWithoutRoot(fileName, currentDirectory) {
+        return getPathWithoutRoot(getNormalizedPathComponents(fileName, currentDirectory));
+    }
+    ts.getNormalizedAbsolutePathWithoutRoot = getNormalizedAbsolutePathWithoutRoot;
+    function getPathWithoutRoot(pathComponents) {
+        if (pathComponents.length === 0)
+            return "";
+        return pathComponents.slice(1).join(ts.directorySeparator);
+    }
 })(ts || (ts = {}));
 /* @internal */
 (function (ts) {
@@ -15501,7 +15641,7 @@ var ts;
     }
     ts.getRelativePathFromFile = getRelativePathFromFile;
     function getRelativePathFromDirectory(fromDirectory, to, getCanonicalFileNameOrIgnoreCase) {
-        Debug.assert((ts.getRootLength(fromDirectory) > 0) === (ts.getRootLength(to) > 0), "Paths must either both be absolute or both be relative");
+        ts.Debug.assert((ts.getRootLength(fromDirectory) > 0) === (ts.getRootLength(to) > 0), "Paths must either both be absolute or both be relative");
         var getCanonicalFileName = typeof getCanonicalFileNameOrIgnoreCase === "function" ? getCanonicalFileNameOrIgnoreCase : ts.identity;
         var ignoreCase = typeof getCanonicalFileNameOrIgnoreCase === "boolean" ? getCanonicalFileNameOrIgnoreCase : false;
         var pathComponents = getPathComponentsRelativeTo(fromDirectory, to, ignoreCase ? ts.equateStringsCaseInsensitive : ts.equateStringsCaseSensitive, getCanonicalFileName);
@@ -16145,32 +16285,9 @@ var ts;
         return pathext ? path.slice(0, path.length - pathext.length) + (ts.startsWith(ext, ".") ? ext : "." + ext) : path;
     }
     ts.changeAnyExtension = changeAnyExtension;
-    var Debug;
-    (function (Debug) {
-        function showSymbol(symbol) {
-            var symbolFlags = ts.SymbolFlags;
-            return "{ flags: " + (symbolFlags ? showFlags(symbol.flags, symbolFlags) : symbol.flags) + "; declarations: " + ts.map(symbol.declarations, showSyntaxKind) + " }";
-        }
-        Debug.showSymbol = showSymbol;
-        function showFlags(flags, flagsEnum) {
-            var out = [];
-            for (var pow = 0; pow <= 30; pow++) {
-                var n = 1 << pow;
-                if (flags & n) {
-                    out.push(flagsEnum[n]);
-                }
-            }
-            return out.join("|");
-        }
-        function showSyntaxKind(node) {
-            var syntaxKind = ts.SyntaxKind;
-            return syntaxKind ? syntaxKind[node.kind] : node.kind.toString();
-        }
-        Debug.showSyntaxKind = showSyntaxKind;
-    })(Debug = ts.Debug || (ts.Debug = {}));
     function tryParsePattern(pattern) {
         // This should be verified outside of here and a proper error thrown.
-        Debug.assert(ts.hasZeroOrOneAsteriskCharacter(pattern));
+        ts.Debug.assert(ts.hasZeroOrOneAsteriskCharacter(pattern));
         var indexOfStar = pattern.indexOf("*");
         return indexOfStar === -1 ? undefined : {
             prefix: pattern.substr(0, indexOfStar),
@@ -16199,7 +16316,7 @@ var ts;
      */
     function extensionFromPath(path) {
         var ext = tryGetExtensionFromPath(path);
-        return ext !== undefined ? ext : Debug.fail("File " + path + " has unknown extension.");
+        return ext !== undefined ? ext : ts.Debug.fail("File " + path + " has unknown extension.");
     }
     ts.extensionFromPath = extensionFromPath;
     function isAnySupportedFileExtension(path) {
@@ -16271,7 +16388,7 @@ var ts;
     ts.matchPatternOrExact = matchPatternOrExact;
     function sliceAfter(arr, value) {
         var index = arr.indexOf(value);
-        Debug.assert(index !== -1);
+        ts.Debug.assert(index !== -1);
         return arr.slice(index);
     }
     ts.sliceAfter = sliceAfter;
@@ -16289,7 +16406,7 @@ var ts;
     }
     ts.addRelatedInfo = addRelatedInfo;
     function minAndMax(arr, getValue) {
-        Debug.assert(arr.length !== 0);
+        ts.Debug.assert(arr.length !== 0);
         var min = getValue(arr[0]);
         var max = min;
         for (var i = 1; i < arr.length; i++) {
@@ -16487,10 +16604,10 @@ var ts;
     var SourceFileConstructor;
     // tslint:enable variable-name
     function createNode(kind, pos, end) {
-        if (kind === 284 /* SourceFile */) {
+        if (kind === 285 /* SourceFile */) {
             return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
         }
-        else if (kind === 72 /* Identifier */) {
+        else if (kind === 73 /* Identifier */) {
             return new (IdentifierConstructor || (IdentifierConstructor = ts.objectAllocator.getIdentifierConstructor()))(kind, pos, end);
         }
         else if (!ts.isNodeKind(kind)) {
@@ -16539,19 +16656,19 @@ var ts;
      * that they appear in the source code. The language service depends on this property to locate nodes by position.
      */
     function forEachChild(node, cbNode, cbNodes) {
-        if (!node || node.kind <= 147 /* LastToken */) {
+        if (!node || node.kind <= 148 /* LastToken */) {
             return;
         }
         switch (node.kind) {
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.right);
-            case 150 /* TypeParameter */:
+            case 151 /* TypeParameter */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNode(cbNode, node.default) ||
                     visitNode(cbNode, node.expression);
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
@@ -16559,9 +16676,9 @@ var ts;
                     visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.equalsToken) ||
                     visitNode(cbNode, node.objectAssignmentInitializer);
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 return visitNode(cbNode, node.expression);
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.dotDotDotToken) ||
@@ -16569,7 +16686,7 @@ var ts;
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
@@ -16577,51 +16694,51 @@ var ts;
                     visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 153 /* PropertySignature */:
+            case 154 /* PropertySignature */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.initializer);
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.dotDotDotToken) ||
                     visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
-            case 160 /* CallSignature */:
-            case 161 /* ConstructSignature */:
-            case 162 /* IndexSignature */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
+            case 161 /* CallSignature */:
+            case 162 /* ConstructSignature */:
+            case 163 /* IndexSignature */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNodes(cbNode, cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 196 /* FunctionExpression */:
-            case 239 /* FunctionDeclaration */:
-            case 197 /* ArrowFunction */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 197 /* FunctionExpression */:
+            case 240 /* FunctionDeclaration */:
+            case 198 /* ArrowFunction */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.asteriskToken) ||
@@ -16633,343 +16750,343 @@ var ts;
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.equalsGreaterThanToken) ||
                     visitNode(cbNode, node.body);
-            case 164 /* TypeReference */:
+            case 165 /* TypeReference */:
                 return visitNode(cbNode, node.typeName) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 163 /* TypePredicate */:
+            case 164 /* TypePredicate */:
                 return visitNode(cbNode, node.parameterName) ||
                     visitNode(cbNode, node.type);
-            case 167 /* TypeQuery */:
+            case 168 /* TypeQuery */:
                 return visitNode(cbNode, node.exprName);
-            case 168 /* TypeLiteral */:
+            case 169 /* TypeLiteral */:
                 return visitNodes(cbNode, cbNodes, node.members);
-            case 169 /* ArrayType */:
+            case 170 /* ArrayType */:
                 return visitNode(cbNode, node.elementType);
-            case 170 /* TupleType */:
+            case 171 /* TupleType */:
                 return visitNodes(cbNode, cbNodes, node.elementTypes);
-            case 173 /* UnionType */:
-            case 174 /* IntersectionType */:
+            case 174 /* UnionType */:
+            case 175 /* IntersectionType */:
                 return visitNodes(cbNode, cbNodes, node.types);
-            case 175 /* ConditionalType */:
+            case 176 /* ConditionalType */:
                 return visitNode(cbNode, node.checkType) ||
                     visitNode(cbNode, node.extendsType) ||
                     visitNode(cbNode, node.trueType) ||
                     visitNode(cbNode, node.falseType);
-            case 176 /* InferType */:
+            case 177 /* InferType */:
                 return visitNode(cbNode, node.typeParameter);
-            case 183 /* ImportType */:
+            case 184 /* ImportType */:
                 return visitNode(cbNode, node.argument) ||
                     visitNode(cbNode, node.qualifier) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 177 /* ParenthesizedType */:
-            case 179 /* TypeOperator */:
+            case 178 /* ParenthesizedType */:
+            case 180 /* TypeOperator */:
                 return visitNode(cbNode, node.type);
-            case 180 /* IndexedAccessType */:
+            case 181 /* IndexedAccessType */:
                 return visitNode(cbNode, node.objectType) ||
                     visitNode(cbNode, node.indexType);
-            case 181 /* MappedType */:
+            case 182 /* MappedType */:
                 return visitNode(cbNode, node.readonlyToken) ||
                     visitNode(cbNode, node.typeParameter) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type);
-            case 182 /* LiteralType */:
+            case 183 /* LiteralType */:
                 return visitNode(cbNode, node.literal);
-            case 184 /* ObjectBindingPattern */:
-            case 185 /* ArrayBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return visitNodes(cbNode, cbNodes, node.properties);
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.name);
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.argumentExpression);
-            case 191 /* CallExpression */:
-            case 192 /* NewExpression */:
+            case 192 /* CallExpression */:
+            case 193 /* NewExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNodes(cbNode, cbNodes, node.arguments);
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return visitNode(cbNode, node.tag) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNode(cbNode, node.template);
-            case 194 /* TypeAssertionExpression */:
+            case 195 /* TypeAssertionExpression */:
                 return visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.expression);
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return visitNode(cbNode, node.expression);
-            case 198 /* DeleteExpression */:
+            case 199 /* DeleteExpression */:
                 return visitNode(cbNode, node.expression);
-            case 199 /* TypeOfExpression */:
+            case 200 /* TypeOfExpression */:
                 return visitNode(cbNode, node.expression);
-            case 200 /* VoidExpression */:
+            case 201 /* VoidExpression */:
                 return visitNode(cbNode, node.expression);
-            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 return visitNode(cbNode, node.operand);
-            case 207 /* YieldExpression */:
+            case 208 /* YieldExpression */:
                 return visitNode(cbNode, node.asteriskToken) ||
                     visitNode(cbNode, node.expression);
-            case 201 /* AwaitExpression */:
+            case 202 /* AwaitExpression */:
                 return visitNode(cbNode, node.expression);
-            case 203 /* PostfixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 return visitNode(cbNode, node.operand);
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.operatorToken) ||
                     visitNode(cbNode, node.right);
-            case 212 /* AsExpression */:
+            case 213 /* AsExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.type);
-            case 213 /* NonNullExpression */:
+            case 214 /* NonNullExpression */:
                 return visitNode(cbNode, node.expression);
-            case 214 /* MetaProperty */:
+            case 215 /* MetaProperty */:
                 return visitNode(cbNode, node.name);
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 return visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.whenTrue) ||
                     visitNode(cbNode, node.colonToken) ||
                     visitNode(cbNode, node.whenFalse);
-            case 208 /* SpreadElement */:
+            case 209 /* SpreadElement */:
                 return visitNode(cbNode, node.expression);
-            case 218 /* Block */:
-            case 245 /* ModuleBlock */:
+            case 219 /* Block */:
+            case 246 /* ModuleBlock */:
                 return visitNodes(cbNode, cbNodes, node.statements);
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return visitNodes(cbNode, cbNodes, node.statements) ||
                     visitNode(cbNode, node.endOfFileToken);
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.declarationList);
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 return visitNodes(cbNode, cbNodes, node.declarations);
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 return visitNode(cbNode, node.expression);
-            case 222 /* IfStatement */:
+            case 223 /* IfStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.thenStatement) ||
                     visitNode(cbNode, node.elseStatement);
-            case 223 /* DoStatement */:
+            case 224 /* DoStatement */:
                 return visitNode(cbNode, node.statement) ||
                     visitNode(cbNode, node.expression);
-            case 224 /* WhileStatement */:
+            case 225 /* WhileStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 225 /* ForStatement */:
+            case 226 /* ForStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.incrementor) ||
                     visitNode(cbNode, node.statement);
-            case 226 /* ForInStatement */:
+            case 227 /* ForInStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 227 /* ForOfStatement */:
+            case 228 /* ForOfStatement */:
                 return visitNode(cbNode, node.awaitModifier) ||
                     visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 228 /* ContinueStatement */:
-            case 229 /* BreakStatement */:
+            case 229 /* ContinueStatement */:
+            case 230 /* BreakStatement */:
                 return visitNode(cbNode, node.label);
-            case 230 /* ReturnStatement */:
+            case 231 /* ReturnStatement */:
                 return visitNode(cbNode, node.expression);
-            case 231 /* WithStatement */:
+            case 232 /* WithStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 232 /* SwitchStatement */:
+            case 233 /* SwitchStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.caseBlock);
-            case 246 /* CaseBlock */:
+            case 247 /* CaseBlock */:
                 return visitNodes(cbNode, cbNodes, node.clauses);
-            case 271 /* CaseClause */:
+            case 272 /* CaseClause */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.statements);
-            case 272 /* DefaultClause */:
+            case 273 /* DefaultClause */:
                 return visitNodes(cbNode, cbNodes, node.statements);
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 return visitNode(cbNode, node.label) ||
                     visitNode(cbNode, node.statement);
-            case 234 /* ThrowStatement */:
+            case 235 /* ThrowStatement */:
                 return visitNode(cbNode, node.expression);
-            case 235 /* TryStatement */:
+            case 236 /* TryStatement */:
                 return visitNode(cbNode, node.tryBlock) ||
                     visitNode(cbNode, node.catchClause) ||
                     visitNode(cbNode, node.finallyBlock);
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return visitNode(cbNode, node.variableDeclaration) ||
                     visitNode(cbNode, node.block);
-            case 152 /* Decorator */:
+            case 153 /* Decorator */:
                 return visitNode(cbNode, node.expression);
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNodes(cbNode, cbNodes, node.heritageClauses) ||
                     visitNodes(cbNode, cbNodes, node.members);
-            case 241 /* InterfaceDeclaration */:
+            case 242 /* InterfaceDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNodes(cbNode, cbNodes, node.heritageClauses) ||
                     visitNodes(cbNode, cbNodes, node.members);
-            case 242 /* TypeAliasDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters) ||
                     visitNode(cbNode, node.type);
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.members);
-            case 278 /* EnumMember */:
+            case 279 /* EnumMember */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.body);
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.moduleReference);
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.importClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 250 /* ImportClause */:
+            case 251 /* ImportClause */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.namedBindings);
-            case 247 /* NamespaceExportDeclaration */:
+            case 248 /* NamespaceExportDeclaration */:
                 return visitNode(cbNode, node.name);
-            case 251 /* NamespaceImport */:
+            case 252 /* NamespaceImport */:
                 return visitNode(cbNode, node.name);
-            case 252 /* NamedImports */:
-            case 256 /* NamedExports */:
+            case 253 /* NamedImports */:
+            case 257 /* NamedExports */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 255 /* ExportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.exportClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 253 /* ImportSpecifier */:
-            case 257 /* ExportSpecifier */:
+            case 254 /* ImportSpecifier */:
+            case 258 /* ExportSpecifier */:
                 return visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name);
-            case 254 /* ExportAssignment */:
+            case 255 /* ExportAssignment */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.expression);
-            case 206 /* TemplateExpression */:
+            case 207 /* TemplateExpression */:
                 return visitNode(cbNode, node.head) || visitNodes(cbNode, cbNodes, node.templateSpans);
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal);
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 return visitNode(cbNode, node.expression);
-            case 273 /* HeritageClause */:
+            case 274 /* HeritageClause */:
                 return visitNodes(cbNode, cbNodes, node.types);
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 259 /* ExternalModuleReference */:
+            case 260 /* ExternalModuleReference */:
                 return visitNode(cbNode, node.expression);
-            case 258 /* MissingDeclaration */:
+            case 259 /* MissingDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators);
-            case 314 /* CommaListExpression */:
+            case 315 /* CommaListExpression */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 260 /* JsxElement */:
+            case 261 /* JsxElement */:
                 return visitNode(cbNode, node.openingElement) ||
                     visitNodes(cbNode, cbNodes, node.children) ||
                     visitNode(cbNode, node.closingElement);
-            case 264 /* JsxFragment */:
+            case 265 /* JsxFragment */:
                 return visitNode(cbNode, node.openingFragment) ||
                     visitNodes(cbNode, cbNodes, node.children) ||
                     visitNode(cbNode, node.closingFragment);
-            case 261 /* JsxSelfClosingElement */:
-            case 262 /* JsxOpeningElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 263 /* JsxOpeningElement */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNode(cbNode, node.attributes);
-            case 268 /* JsxAttributes */:
+            case 269 /* JsxAttributes */:
                 return visitNodes(cbNode, cbNodes, node.properties);
-            case 267 /* JsxAttribute */:
+            case 268 /* JsxAttribute */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 269 /* JsxSpreadAttribute */:
+            case 270 /* JsxSpreadAttribute */:
                 return visitNode(cbNode, node.expression);
-            case 270 /* JsxExpression */:
+            case 271 /* JsxExpression */:
                 return visitNode(cbNode, node.dotDotDotToken) ||
                     visitNode(cbNode, node.expression);
-            case 263 /* JsxClosingElement */:
+            case 264 /* JsxClosingElement */:
                 return visitNode(cbNode, node.tagName);
-            case 171 /* OptionalType */:
-            case 172 /* RestType */:
-            case 288 /* JSDocTypeExpression */:
-            case 292 /* JSDocNonNullableType */:
-            case 291 /* JSDocNullableType */:
-            case 293 /* JSDocOptionalType */:
-            case 295 /* JSDocVariadicType */:
+            case 172 /* OptionalType */:
+            case 173 /* RestType */:
+            case 289 /* JSDocTypeExpression */:
+            case 293 /* JSDocNonNullableType */:
+            case 292 /* JSDocNullableType */:
+            case 294 /* JSDocOptionalType */:
+            case 296 /* JSDocVariadicType */:
                 return visitNode(cbNode, node.type);
-            case 294 /* JSDocFunctionType */:
+            case 295 /* JSDocFunctionType */:
                 return visitNodes(cbNode, cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 296 /* JSDocComment */:
+            case 297 /* JSDocComment */:
                 return visitNodes(cbNode, cbNodes, node.tags);
-            case 304 /* JSDocParameterTag */:
-            case 310 /* JSDocPropertyTag */:
+            case 305 /* JSDocParameterTag */:
+            case 311 /* JSDocPropertyTag */:
                 return visitNode(cbNode, node.tagName) ||
                     (node.isNameFirst
                         ? visitNode(cbNode, node.name) ||
                             visitNode(cbNode, node.typeExpression)
                         : visitNode(cbNode, node.typeExpression) ||
                             visitNode(cbNode, node.name));
-            case 300 /* JSDocAugmentsTag */:
+            case 301 /* JSDocAugmentsTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.class);
-            case 308 /* JSDocTemplateTag */:
+            case 309 /* JSDocTemplateTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNodes(cbNode, cbNodes, node.typeParameters);
-            case 309 /* JSDocTypedefTag */:
+            case 310 /* JSDocTypedefTag */:
                 return visitNode(cbNode, node.tagName) ||
                     (node.typeExpression &&
-                        node.typeExpression.kind === 288 /* JSDocTypeExpression */
+                        node.typeExpression.kind === 289 /* JSDocTypeExpression */
                         ? visitNode(cbNode, node.typeExpression) ||
                             visitNode(cbNode, node.fullName)
                         : visitNode(cbNode, node.fullName) ||
                             visitNode(cbNode, node.typeExpression));
-            case 302 /* JSDocCallbackTag */:
+            case 303 /* JSDocCallbackTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.fullName) ||
                     visitNode(cbNode, node.typeExpression);
-            case 305 /* JSDocReturnTag */:
-            case 307 /* JSDocTypeTag */:
-            case 306 /* JSDocThisTag */:
-            case 303 /* JSDocEnumTag */:
+            case 306 /* JSDocReturnTag */:
+            case 308 /* JSDocTypeTag */:
+            case 307 /* JSDocThisTag */:
+            case 304 /* JSDocEnumTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.typeExpression);
-            case 298 /* JSDocSignature */:
+            case 299 /* JSDocSignature */:
                 return ts.forEach(node.typeParameters, cbNode) ||
                     ts.forEach(node.parameters, cbNode) ||
                     visitNode(cbNode, node.type);
-            case 297 /* JSDocTypeLiteral */:
+            case 298 /* JSDocTypeLiteral */:
                 return ts.forEach(node.jsDocPropertyTags, cbNode);
-            case 299 /* JSDocTag */:
-            case 301 /* JSDocClassTag */:
+            case 300 /* JSDocTag */:
+            case 302 /* JSDocClassTag */:
                 return visitNode(cbNode, node.tagName);
-            case 313 /* PartiallyEmittedExpression */:
+            case 314 /* PartiallyEmittedExpression */:
                 return visitNode(cbNode, node.expression);
         }
     }
@@ -17049,7 +17166,7 @@ var ts;
     (function (Parser) {
         // Share a single scanner across all calls to parse a source file.  This helps speed things
         // up by avoiding the cost of creating/compiling scanners over and over again.
-        var scanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ true);
+        var scanner = ts.createScanner(8 /* Latest */, /*skipTrivia*/ true);
         var disallowInAndDecoratorContext = 2048 /* DisallowInContext */ | 8192 /* DecoratorContext */;
         // capture constructors in 'initializeState' to avoid null checks
         // tslint:disable variable-name
@@ -17187,14 +17304,14 @@ var ts;
                 sourceFile.endOfFileToken = parseTokenNode();
             }
             else {
-                var statement = createNode(221 /* ExpressionStatement */);
+                var statement = createNode(222 /* ExpressionStatement */);
                 switch (token()) {
                     case 22 /* OpenBracketToken */:
                         statement.expression = parseArrayLiteralExpression();
                         break;
-                    case 102 /* TrueKeyword */:
-                    case 87 /* FalseKeyword */:
-                    case 96 /* NullKeyword */:
+                    case 103 /* TrueKeyword */:
+                    case 88 /* FalseKeyword */:
+                    case 97 /* NullKeyword */:
                         statement.expression = parseTokenNode();
                         break;
                     case 39 /* MinusToken */:
@@ -17343,7 +17460,7 @@ var ts;
         function createSourceFile(fileName, languageVersion, scriptKind, isDeclarationFile) {
             // code from createNode is inlined here so createNode won't have to deal with special case of creating source files
             // this is quite rare comparing to other nodes and createNode should be as fast as possible
-            var sourceFile = new SourceFileConstructor(284 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
+            var sourceFile = new SourceFileConstructor(285 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
             nodeCount++;
             sourceFile.text = sourceText;
             sourceFile.bindDiagnostics = [];
@@ -17486,6 +17603,9 @@ var ts;
         function nextToken() {
             return currentToken = scanner.scan();
         }
+        function nextTokenJSDoc() {
+            return currentToken = scanner.scanJsDocToken();
+        }
         function reScanGreaterToken() {
             return currentToken = scanner.reScanGreaterToken();
         }
@@ -17551,20 +17671,20 @@ var ts;
         }
         // Ignore strict mode flag because we will report an error in type checker instead.
         function isIdentifier() {
-            if (token() === 72 /* Identifier */) {
+            if (token() === 73 /* Identifier */) {
                 return true;
             }
             // If we have a 'yield' keyword, and we're in the [yield] context, then 'yield' is
             // considered a keyword and is not an identifier.
-            if (token() === 117 /* YieldKeyword */ && inYieldContext()) {
+            if (token() === 118 /* YieldKeyword */ && inYieldContext()) {
                 return false;
             }
             // If we have a 'await' keyword, and we're in the [Await] context, then 'await' is
             // considered a keyword and is not an identifier.
-            if (token() === 122 /* AwaitKeyword */ && inAwaitContext()) {
+            if (token() === 123 /* AwaitKeyword */ && inAwaitContext()) {
                 return false;
             }
-            return token() > 108 /* LastReservedWord */;
+            return token() > 109 /* LastReservedWord */;
         }
         function parseExpected(kind, diagnosticMessage, shouldAdvance) {
             if (shouldAdvance === void 0) { shouldAdvance = true; }
@@ -17583,6 +17703,14 @@ var ts;
             }
             return false;
         }
+        function parseExpectedJSDoc(kind) {
+            if (token() === kind) {
+                nextTokenJSDoc();
+                return true;
+            }
+            parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(kind));
+            return false;
+        }
         function parseOptional(t) {
             if (token() === t) {
                 nextToken();
@@ -17596,15 +17724,30 @@ var ts;
             }
             return undefined;
         }
+        function parseOptionalTokenJSDoc(t) {
+            if (token() === t) {
+                return parseTokenNodeJSDoc();
+            }
+            return undefined;
+        }
         function parseExpectedToken(t, diagnosticMessage, arg0) {
             return parseOptionalToken(t) ||
                 createMissingNode(t, /*reportAtCurrentPosition*/ false, diagnosticMessage || ts.Diagnostics._0_expected, arg0 || ts.tokenToString(t));
         }
+        function parseExpectedTokenJSDoc(t) {
+            return parseOptionalTokenJSDoc(t) ||
+                createMissingNode(t, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(t));
+        }
         function parseTokenNode() {
             var node = createNode(token());
             nextToken();
             return finishNode(node);
         }
+        function parseTokenNodeJSDoc() {
+            var node = createNode(token());
+            nextTokenJSDoc();
+            return finishNode(node);
+        }
         function canParseSemicolon() {
             // If there's a real semicolon, then we can always parse it out.
             if (token() === 26 /* SemicolonToken */) {
@@ -17629,7 +17772,7 @@ var ts;
             nodeCount++;
             var p = pos >= 0 ? pos : scanner.getStartPos();
             return ts.isNodeKind(kind) || kind === 0 /* Unknown */ ? new NodeConstructor(kind, p, p) :
-                kind === 72 /* Identifier */ ? new IdentifierConstructor(kind, p, p) :
+                kind === 73 /* Identifier */ ? new IdentifierConstructor(kind, p, p) :
                     new TokenConstructor(kind, p, p);
         }
         function createNodeWithJSDoc(kind, pos) {
@@ -17671,7 +17814,7 @@ var ts;
                 parseErrorAtCurrentToken(diagnosticMessage, arg0);
             }
             var result = createNode(kind);
-            if (kind === 72 /* Identifier */) {
+            if (kind === 73 /* Identifier */) {
                 result.escapedText = "";
             }
             else if (ts.isLiteralKind(kind) || ts.isTemplateLiteralKind(kind)) {
@@ -17692,9 +17835,9 @@ var ts;
         function createIdentifier(isIdentifier, diagnosticMessage) {
             identifierCount++;
             if (isIdentifier) {
-                var node = createNode(72 /* Identifier */);
+                var node = createNode(73 /* Identifier */);
                 // Store original token kind if it is not just an Identifier so we can report appropriate error later in type checker
-                if (token() !== 72 /* Identifier */) {
+                if (token() !== 73 /* Identifier */) {
                     node.originalKeywordKind = token();
                 }
                 node.escapedText = ts.escapeLeadingUnderscores(internIdentifier(scanner.getTokenValue()));
@@ -17703,7 +17846,7 @@ var ts;
             }
             // Only for end of file because the error gets reported incorrectly on embedded script tags.
             var reportAtCurrentPosition = token() === 1 /* EndOfFileToken */;
-            return createMissingNode(72 /* Identifier */, reportAtCurrentPosition, diagnosticMessage || ts.Diagnostics.Identifier_expected);
+            return createMissingNode(73 /* Identifier */, reportAtCurrentPosition, diagnosticMessage || ts.Diagnostics.Identifier_expected);
         }
         function parseIdentifier(diagnosticMessage) {
             return createIdentifier(isIdentifier(), diagnosticMessage);
@@ -17734,7 +17877,7 @@ var ts;
             // PropertyName [Yield]:
             //      LiteralPropertyName
             //      ComputedPropertyName[?Yield]
-            var node = createNode(149 /* ComputedPropertyName */);
+            var node = createNode(150 /* ComputedPropertyName */);
             parseExpected(22 /* OpenBracketToken */);
             // We parse any expression (including a comma expression). But the grammar
             // says that only an assignment expression is allowed, so the grammar checker
@@ -17755,20 +17898,20 @@ var ts;
         }
         function nextTokenCanFollowModifier() {
             switch (token()) {
-                case 77 /* ConstKeyword */:
+                case 78 /* ConstKeyword */:
                     // 'const' is only a modifier if followed by 'enum'.
-                    return nextToken() === 84 /* EnumKeyword */;
-                case 85 /* ExportKeyword */:
+                    return nextToken() === 85 /* EnumKeyword */;
+                case 86 /* ExportKeyword */:
                     nextToken();
-                    if (token() === 80 /* DefaultKeyword */) {
+                    if (token() === 81 /* DefaultKeyword */) {
                         return lookAhead(nextTokenCanFollowDefaultKeyword);
                     }
-                    return token() !== 40 /* AsteriskToken */ && token() !== 119 /* AsKeyword */ && token() !== 18 /* OpenBraceToken */ && canFollowModifier();
-                case 80 /* DefaultKeyword */:
+                    return token() !== 40 /* AsteriskToken */ && token() !== 120 /* AsKeyword */ && token() !== 18 /* OpenBraceToken */ && canFollowModifier();
+                case 81 /* DefaultKeyword */:
                     return nextTokenCanFollowDefaultKeyword();
-                case 116 /* StaticKeyword */:
-                case 126 /* GetKeyword */:
-                case 137 /* SetKeyword */:
+                case 117 /* StaticKeyword */:
+                case 127 /* GetKeyword */:
+                case 138 /* SetKeyword */:
                     nextToken();
                     return canFollowModifier();
                 default:
@@ -17787,10 +17930,10 @@ var ts;
         }
         function nextTokenCanFollowDefaultKeyword() {
             nextToken();
-            return token() === 76 /* ClassKeyword */ || token() === 90 /* FunctionKeyword */ ||
-                token() === 110 /* InterfaceKeyword */ ||
-                (token() === 118 /* AbstractKeyword */ && lookAhead(nextTokenIsClassKeywordOnSameLine)) ||
-                (token() === 121 /* AsyncKeyword */ && lookAhead(nextTokenIsFunctionKeywordOnSameLine));
+            return token() === 77 /* ClassKeyword */ || token() === 91 /* FunctionKeyword */ ||
+                token() === 111 /* InterfaceKeyword */ ||
+                (token() === 119 /* AbstractKeyword */ && lookAhead(nextTokenIsClassKeywordOnSameLine)) ||
+                (token() === 122 /* AsyncKeyword */ && lookAhead(nextTokenIsFunctionKeywordOnSameLine));
         }
         // True if positioned at the start of a list element
         function isListElement(parsingContext, inErrorRecovery) {
@@ -17810,7 +17953,7 @@ var ts;
                     // outer module.  We just want to consume and move on.
                     return !(token() === 26 /* SemicolonToken */ && inErrorRecovery) && isStartOfStatement();
                 case 2 /* SwitchClauses */:
-                    return token() === 74 /* CaseKeyword */ || token() === 80 /* DefaultKeyword */;
+                    return token() === 75 /* CaseKeyword */ || token() === 81 /* DefaultKeyword */;
                 case 4 /* TypeMembers */:
                     return lookAhead(isTypeMemberStart);
                 case 5 /* ClassMembers */:
@@ -17896,7 +18039,7 @@ var ts;
                 //      extends {} extends
                 //      extends {} implements
                 var next = nextToken();
-                return next === 27 /* CommaToken */ || next === 18 /* OpenBraceToken */ || next === 86 /* ExtendsKeyword */ || next === 109 /* ImplementsKeyword */;
+                return next === 27 /* CommaToken */ || next === 18 /* OpenBraceToken */ || next === 87 /* ExtendsKeyword */ || next === 110 /* ImplementsKeyword */;
             }
             return true;
         }
@@ -17913,8 +18056,8 @@ var ts;
             return ts.tokenIsIdentifierOrKeywordOrGreaterThan(token());
         }
         function isHeritageClauseExtendsOrImplementsKeyword() {
-            if (token() === 109 /* ImplementsKeyword */ ||
-                token() === 86 /* ExtendsKeyword */) {
+            if (token() === 110 /* ImplementsKeyword */ ||
+                token() === 87 /* ExtendsKeyword */) {
                 return lookAhead(nextTokenIsStartOfExpression);
             }
             return false;
@@ -17944,14 +18087,14 @@ var ts;
                 case 23 /* ImportOrExportSpecifiers */:
                     return token() === 19 /* CloseBraceToken */;
                 case 3 /* SwitchClauseStatements */:
-                    return token() === 19 /* CloseBraceToken */ || token() === 74 /* CaseKeyword */ || token() === 80 /* DefaultKeyword */;
+                    return token() === 19 /* CloseBraceToken */ || token() === 75 /* CaseKeyword */ || token() === 81 /* DefaultKeyword */;
                 case 7 /* HeritageClauseElement */:
-                    return token() === 18 /* OpenBraceToken */ || token() === 86 /* ExtendsKeyword */ || token() === 109 /* ImplementsKeyword */;
+                    return token() === 18 /* OpenBraceToken */ || token() === 87 /* ExtendsKeyword */ || token() === 110 /* ImplementsKeyword */;
                 case 8 /* VariableDeclarations */:
                     return isVariableDeclaratorListTerminator();
                 case 19 /* TypeParameters */:
                     // Tokens other than '>' are here for better error recovery
-                    return token() === 30 /* GreaterThanToken */ || token() === 20 /* OpenParenToken */ || token() === 18 /* OpenBraceToken */ || token() === 86 /* ExtendsKeyword */ || token() === 109 /* ImplementsKeyword */;
+                    return token() === 30 /* GreaterThanToken */ || token() === 20 /* OpenParenToken */ || token() === 18 /* OpenBraceToken */ || token() === 87 /* ExtendsKeyword */ || token() === 110 /* ImplementsKeyword */;
                 case 11 /* ArgumentExpressions */:
                     // Tokens other than ')' are here for better error recovery
                     return token() === 21 /* CloseParenToken */ || token() === 26 /* SemicolonToken */;
@@ -18168,20 +18311,20 @@ var ts;
         function isReusableClassMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 157 /* Constructor */:
-                    case 162 /* IndexSignature */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 154 /* PropertyDeclaration */:
-                    case 217 /* SemicolonClassElement */:
+                    case 158 /* Constructor */:
+                    case 163 /* IndexSignature */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 155 /* PropertyDeclaration */:
+                    case 218 /* SemicolonClassElement */:
                         return true;
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         // Method declarations are not necessarily reusable.  An object-literal
                         // may have a method calls "constructor(...)" and we must reparse that
                         // into an actual .ConstructorDeclaration.
                         var methodDeclaration = node;
-                        var nameIsConstructor = methodDeclaration.name.kind === 72 /* Identifier */ &&
-                            methodDeclaration.name.originalKeywordKind === 124 /* ConstructorKeyword */;
+                        var nameIsConstructor = methodDeclaration.name.kind === 73 /* Identifier */ &&
+                            methodDeclaration.name.originalKeywordKind === 125 /* ConstructorKeyword */;
                         return !nameIsConstructor;
                 }
             }
@@ -18190,8 +18333,8 @@ var ts;
         function isReusableSwitchClause(node) {
             if (node) {
                 switch (node.kind) {
-                    case 271 /* CaseClause */:
-                    case 272 /* DefaultClause */:
+                    case 272 /* CaseClause */:
+                    case 273 /* DefaultClause */:
                         return true;
                 }
             }
@@ -18200,58 +18343,58 @@ var ts;
         function isReusableStatement(node) {
             if (node) {
                 switch (node.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 219 /* VariableStatement */:
-                    case 218 /* Block */:
-                    case 222 /* IfStatement */:
-                    case 221 /* ExpressionStatement */:
-                    case 234 /* ThrowStatement */:
-                    case 230 /* ReturnStatement */:
-                    case 232 /* SwitchStatement */:
-                    case 229 /* BreakStatement */:
-                    case 228 /* ContinueStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
-                    case 225 /* ForStatement */:
-                    case 224 /* WhileStatement */:
-                    case 231 /* WithStatement */:
-                    case 220 /* EmptyStatement */:
-                    case 235 /* TryStatement */:
-                    case 233 /* LabeledStatement */:
-                    case 223 /* DoStatement */:
-                    case 236 /* DebuggerStatement */:
-                    case 249 /* ImportDeclaration */:
-                    case 248 /* ImportEqualsDeclaration */:
-                    case 255 /* ExportDeclaration */:
-                    case 254 /* ExportAssignment */:
-                    case 244 /* ModuleDeclaration */:
-                    case 240 /* ClassDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 243 /* EnumDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
+                    case 240 /* FunctionDeclaration */:
+                    case 220 /* VariableStatement */:
+                    case 219 /* Block */:
+                    case 223 /* IfStatement */:
+                    case 222 /* ExpressionStatement */:
+                    case 235 /* ThrowStatement */:
+                    case 231 /* ReturnStatement */:
+                    case 233 /* SwitchStatement */:
+                    case 230 /* BreakStatement */:
+                    case 229 /* ContinueStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 226 /* ForStatement */:
+                    case 225 /* WhileStatement */:
+                    case 232 /* WithStatement */:
+                    case 221 /* EmptyStatement */:
+                    case 236 /* TryStatement */:
+                    case 234 /* LabeledStatement */:
+                    case 224 /* DoStatement */:
+                    case 237 /* DebuggerStatement */:
+                    case 250 /* ImportDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
+                    case 256 /* ExportDeclaration */:
+                    case 255 /* ExportAssignment */:
+                    case 245 /* ModuleDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
                         return true;
                 }
             }
             return false;
         }
         function isReusableEnumMember(node) {
-            return node.kind === 278 /* EnumMember */;
+            return node.kind === 279 /* EnumMember */;
         }
         function isReusableTypeMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 161 /* ConstructSignature */:
-                    case 155 /* MethodSignature */:
-                    case 162 /* IndexSignature */:
-                    case 153 /* PropertySignature */:
-                    case 160 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 156 /* MethodSignature */:
+                    case 163 /* IndexSignature */:
+                    case 154 /* PropertySignature */:
+                    case 161 /* CallSignature */:
                         return true;
                 }
             }
             return false;
         }
         function isReusableVariableDeclaration(node) {
-            if (node.kind !== 237 /* VariableDeclaration */) {
+            if (node.kind !== 238 /* VariableDeclaration */) {
                 return false;
             }
             // Very subtle incremental parsing bug.  Consider the following code:
@@ -18272,7 +18415,7 @@ var ts;
             return variableDeclarator.initializer === undefined;
         }
         function isReusableParameter(node) {
-            if (node.kind !== 151 /* Parameter */) {
+            if (node.kind !== 152 /* Parameter */) {
                 return false;
             }
             // See the comment in isReusableVariableDeclaration for why we do this.
@@ -18408,7 +18551,7 @@ var ts;
             return entity;
         }
         function createQualifiedName(entity, name) {
-            var node = createNode(148 /* QualifiedName */, entity.pos);
+            var node = createNode(149 /* QualifiedName */, entity.pos);
             node.left = entity;
             node.right = name;
             return finishNode(node);
@@ -18439,13 +18582,13 @@ var ts;
                     // Report that we need an identifier.  However, report it right after the dot,
                     // and not on the next token.  This is because the next token might actually
                     // be an identifier and the error would be quite confusing.
-                    return createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Identifier_expected);
+                    return createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Identifier_expected);
                 }
             }
             return allowIdentifierNames ? parseIdentifierName() : parseIdentifier();
         }
         function parseTemplateExpression() {
-            var template = createNode(206 /* TemplateExpression */);
+            var template = createNode(207 /* TemplateExpression */);
             template.head = parseTemplateHead();
             ts.Debug.assert(template.head.kind === 15 /* TemplateHead */, "Template head has wrong token kind");
             var list = [];
@@ -18457,7 +18600,7 @@ var ts;
             return finishNode(template);
         }
         function parseTemplateSpan() {
-            var span = createNode(216 /* TemplateSpan */);
+            var span = createNode(217 /* TemplateSpan */);
             span.expression = allowInAnd(parseExpression);
             var literal;
             if (token() === 19 /* CloseBraceToken */) {
@@ -18507,7 +18650,7 @@ var ts;
         }
         // TYPES
         function parseTypeReference() {
-            var node = createNode(164 /* TypeReference */);
+            var node = createNode(165 /* TypeReference */);
             node.typeName = parseEntityName(/*allowReservedWords*/ true, ts.Diagnostics.Type_expected);
             if (!scanner.hasPrecedingLineBreak() && reScanLessThanToken() === 28 /* LessThanToken */) {
                 node.typeArguments = parseBracketedList(20 /* TypeArguments */, parseType, 28 /* LessThanToken */, 30 /* GreaterThanToken */);
@@ -18517,14 +18660,14 @@ var ts;
         // If true, we should abort parsing an error function.
         function typeHasArrowFunctionBlockingParseError(node) {
             switch (node.kind) {
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return ts.nodeIsMissing(node.typeName);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */: {
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */: {
                     var _a = node, parameters = _a.parameters, type = _a.type;
                     return isMissingList(parameters) || typeHasArrowFunctionBlockingParseError(type);
                 }
-                case 177 /* ParenthesizedType */:
+                case 178 /* ParenthesizedType */:
                     return typeHasArrowFunctionBlockingParseError(node.type);
                 default:
                     return false;
@@ -18532,20 +18675,20 @@ var ts;
         }
         function parseThisTypePredicate(lhs) {
             nextToken();
-            var node = createNode(163 /* TypePredicate */, lhs.pos);
+            var node = createNode(164 /* TypePredicate */, lhs.pos);
             node.parameterName = lhs;
             node.type = parseType();
             return finishNode(node);
         }
         function parseThisTypeNode() {
-            var node = createNode(178 /* ThisType */);
+            var node = createNode(179 /* ThisType */);
             nextToken();
             return finishNode(node);
         }
         function parseJSDocAllType(postFixEquals) {
-            var result = createNode(289 /* JSDocAllType */);
+            var result = createNode(290 /* JSDocAllType */);
             if (postFixEquals) {
-                return createPostfixType(293 /* JSDocOptionalType */, result);
+                return createPostfixType(294 /* JSDocOptionalType */, result);
             }
             else {
                 nextToken();
@@ -18553,7 +18696,7 @@ var ts;
             return finishNode(result);
         }
         function parseJSDocNonNullableType() {
-            var result = createNode(292 /* JSDocNonNullableType */);
+            var result = createNode(293 /* JSDocNonNullableType */);
             nextToken();
             result.type = parseNonArrayType();
             return finishNode(result);
@@ -18575,31 +18718,31 @@ var ts;
                 token() === 19 /* CloseBraceToken */ ||
                 token() === 21 /* CloseParenToken */ ||
                 token() === 30 /* GreaterThanToken */ ||
-                token() === 59 /* EqualsToken */ ||
+                token() === 60 /* EqualsToken */ ||
                 token() === 50 /* BarToken */) {
-                var result = createNode(290 /* JSDocUnknownType */, pos);
+                var result = createNode(291 /* JSDocUnknownType */, pos);
                 return finishNode(result);
             }
             else {
-                var result = createNode(291 /* JSDocNullableType */, pos);
+                var result = createNode(292 /* JSDocNullableType */, pos);
                 result.type = parseType();
                 return finishNode(result);
             }
         }
         function parseJSDocFunctionType() {
             if (lookAhead(nextTokenIsOpenParen)) {
-                var result = createNodeWithJSDoc(294 /* JSDocFunctionType */);
+                var result = createNodeWithJSDoc(295 /* JSDocFunctionType */);
                 nextToken();
                 fillSignature(57 /* ColonToken */, 4 /* Type */ | 32 /* JSDoc */, result);
                 return finishNode(result);
             }
-            var node = createNode(164 /* TypeReference */);
+            var node = createNode(165 /* TypeReference */);
             node.typeName = parseIdentifierName();
             return finishNode(node);
         }
         function parseJSDocParameter() {
-            var parameter = createNode(151 /* Parameter */);
-            if (token() === 100 /* ThisKeyword */ || token() === 95 /* NewKeyword */) {
+            var parameter = createNode(152 /* Parameter */);
+            if (token() === 101 /* ThisKeyword */ || token() === 96 /* NewKeyword */) {
                 parameter.name = parseIdentifierName();
                 parseExpected(57 /* ColonToken */);
             }
@@ -18612,25 +18755,25 @@ var ts;
             var type = parseTypeOrTypePredicate();
             scanner.setInJSDocType(false);
             if (dotdotdot) {
-                var variadic = createNode(295 /* JSDocVariadicType */, dotdotdot.pos);
+                var variadic = createNode(296 /* JSDocVariadicType */, dotdotdot.pos);
                 variadic.type = type;
                 type = finishNode(variadic);
             }
-            if (token() === 59 /* EqualsToken */) {
-                return createPostfixType(293 /* JSDocOptionalType */, type);
+            if (token() === 60 /* EqualsToken */) {
+                return createPostfixType(294 /* JSDocOptionalType */, type);
             }
             return type;
         }
         function parseTypeQuery() {
-            var node = createNode(167 /* TypeQuery */);
-            parseExpected(104 /* TypeOfKeyword */);
+            var node = createNode(168 /* TypeQuery */);
+            parseExpected(105 /* TypeOfKeyword */);
             node.exprName = parseEntityName(/*allowReservedWords*/ true);
             return finishNode(node);
         }
         function parseTypeParameter() {
-            var node = createNode(150 /* TypeParameter */);
+            var node = createNode(151 /* TypeParameter */);
             node.name = parseIdentifier();
-            if (parseOptional(86 /* ExtendsKeyword */)) {
+            if (parseOptional(87 /* ExtendsKeyword */)) {
                 // It's not uncommon for people to write improper constraints to a generic.  If the
                 // user writes a constraint that is an expression and not an actual type, then parse
                 // it out as an expression (so we can recover well), but report that a type is needed
@@ -18649,7 +18792,7 @@ var ts;
                     node.expression = parseUnaryExpressionOrHigher();
                 }
             }
-            if (parseOptional(59 /* EqualsToken */)) {
+            if (parseOptional(60 /* EqualsToken */)) {
                 node.default = parseType();
             }
             return finishNode(node);
@@ -18673,8 +18816,8 @@ var ts;
                 isStartOfType(/*inStartOfParameter*/ !isJSDocParameter);
         }
         function parseParameter() {
-            var node = createNodeWithJSDoc(151 /* Parameter */);
-            if (token() === 100 /* ThisKeyword */) {
+            var node = createNodeWithJSDoc(152 /* Parameter */);
+            if (token() === 101 /* ThisKeyword */) {
                 node.name = createIdentifier(/*isIdentifier*/ true);
                 node.type = parseParameterType();
                 return finishNode(node);
@@ -18774,8 +18917,8 @@ var ts;
         }
         function parseSignatureMember(kind) {
             var node = createNodeWithJSDoc(kind);
-            if (kind === 161 /* ConstructSignature */) {
-                parseExpected(95 /* NewKeyword */);
+            if (kind === 162 /* ConstructSignature */) {
+                parseExpected(96 /* NewKeyword */);
             }
             fillSignature(57 /* ColonToken */, 4 /* Type */, node);
             parseTypeMemberSemicolon();
@@ -18835,7 +18978,7 @@ var ts;
             return token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 23 /* CloseBracketToken */;
         }
         function parseIndexSignatureDeclaration(node) {
-            node.kind = 162 /* IndexSignature */;
+            node.kind = 163 /* IndexSignature */;
             node.parameters = parseBracketedList(16 /* Parameters */, parseParameter, 22 /* OpenBracketToken */, 23 /* CloseBracketToken */);
             node.type = parseTypeAnnotation();
             parseTypeMemberSemicolon();
@@ -18845,15 +18988,15 @@ var ts;
             node.name = parsePropertyName();
             node.questionToken = parseOptionalToken(56 /* QuestionToken */);
             if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */) {
-                node.kind = 155 /* MethodSignature */;
+                node.kind = 156 /* MethodSignature */;
                 // Method signatures don't exist in expression contexts.  So they have neither
                 // [Yield] nor [Await]
                 fillSignature(57 /* ColonToken */, 4 /* Type */, node);
             }
             else {
-                node.kind = 153 /* PropertySignature */;
+                node.kind = 154 /* PropertySignature */;
                 node.type = parseTypeAnnotation();
-                if (token() === 59 /* EqualsToken */) {
+                if (token() === 60 /* EqualsToken */) {
                     // Although type literal properties cannot not have initializers, we attempt
                     // to parse an initializer so we can report in the checker that an interface
                     // property or type literal property cannot have an initializer.
@@ -18897,10 +19040,10 @@ var ts;
         }
         function parseTypeMember() {
             if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */) {
-                return parseSignatureMember(160 /* CallSignature */);
+                return parseSignatureMember(161 /* CallSignature */);
             }
-            if (token() === 95 /* NewKeyword */ && lookAhead(nextTokenIsOpenParenOrLessThan)) {
-                return parseSignatureMember(161 /* ConstructSignature */);
+            if (token() === 96 /* NewKeyword */ && lookAhead(nextTokenIsOpenParenOrLessThan)) {
+                return parseSignatureMember(162 /* ConstructSignature */);
             }
             var node = createNodeWithJSDoc(0 /* Unknown */);
             node.modifiers = parseModifiers();
@@ -18926,7 +19069,7 @@ var ts;
             return false;
         }
         function parseTypeLiteral() {
-            var node = createNode(168 /* TypeLiteral */);
+            var node = createNode(169 /* TypeLiteral */);
             node.members = parseObjectTypeMembers();
             return finishNode(node);
         }
@@ -18944,27 +19087,27 @@ var ts;
         function isStartOfMappedType() {
             nextToken();
             if (token() === 38 /* PlusToken */ || token() === 39 /* MinusToken */) {
-                return nextToken() === 133 /* ReadonlyKeyword */;
+                return nextToken() === 134 /* ReadonlyKeyword */;
             }
-            if (token() === 133 /* ReadonlyKeyword */) {
+            if (token() === 134 /* ReadonlyKeyword */) {
                 nextToken();
             }
-            return token() === 22 /* OpenBracketToken */ && nextTokenIsIdentifier() && nextToken() === 93 /* InKeyword */;
+            return token() === 22 /* OpenBracketToken */ && nextTokenIsIdentifier() && nextToken() === 94 /* InKeyword */;
         }
         function parseMappedTypeParameter() {
-            var node = createNode(150 /* TypeParameter */);
+            var node = createNode(151 /* TypeParameter */);
             node.name = parseIdentifier();
-            parseExpected(93 /* InKeyword */);
+            parseExpected(94 /* InKeyword */);
             node.constraint = parseType();
             return finishNode(node);
         }
         function parseMappedType() {
-            var node = createNode(181 /* MappedType */);
+            var node = createNode(182 /* MappedType */);
             parseExpected(18 /* OpenBraceToken */);
-            if (token() === 133 /* ReadonlyKeyword */ || token() === 38 /* PlusToken */ || token() === 39 /* MinusToken */) {
+            if (token() === 134 /* ReadonlyKeyword */ || token() === 38 /* PlusToken */ || token() === 39 /* MinusToken */) {
                 node.readonlyToken = parseTokenNode();
-                if (node.readonlyToken.kind !== 133 /* ReadonlyKeyword */) {
-                    parseExpectedToken(133 /* ReadonlyKeyword */);
+                if (node.readonlyToken.kind !== 134 /* ReadonlyKeyword */) {
+                    parseExpectedToken(134 /* ReadonlyKeyword */);
                 }
             }
             parseExpected(22 /* OpenBracketToken */);
@@ -18984,23 +19127,23 @@ var ts;
         function parseTupleElementType() {
             var pos = getNodePos();
             if (parseOptional(25 /* DotDotDotToken */)) {
-                var node = createNode(172 /* RestType */, pos);
+                var node = createNode(173 /* RestType */, pos);
                 node.type = parseType();
                 return finishNode(node);
             }
             var type = parseType();
-            if (!(contextFlags & 2097152 /* JSDoc */) && type.kind === 291 /* JSDocNullableType */ && type.pos === type.type.pos) {
-                type.kind = 171 /* OptionalType */;
+            if (!(contextFlags & 2097152 /* JSDoc */) && type.kind === 292 /* JSDocNullableType */ && type.pos === type.type.pos) {
+                type.kind = 172 /* OptionalType */;
             }
             return type;
         }
         function parseTupleType() {
-            var node = createNode(170 /* TupleType */);
+            var node = createNode(171 /* TupleType */);
             node.elementTypes = parseBracketedList(21 /* TupleElementTypes */, parseTupleElementType, 22 /* OpenBracketToken */, 23 /* CloseBracketToken */);
             return finishNode(node);
         }
         function parseParenthesizedType() {
-            var node = createNode(177 /* ParenthesizedType */);
+            var node = createNode(178 /* ParenthesizedType */);
             parseExpected(20 /* OpenParenToken */);
             node.type = parseType();
             parseExpected(21 /* CloseParenToken */);
@@ -19008,7 +19151,7 @@ var ts;
         }
         function parseFunctionOrConstructorType() {
             var pos = getNodePos();
-            var kind = parseOptional(95 /* NewKeyword */) ? 166 /* ConstructorType */ : 165 /* FunctionType */;
+            var kind = parseOptional(96 /* NewKeyword */) ? 167 /* ConstructorType */ : 166 /* FunctionType */;
             var node = createNodeWithJSDoc(kind, pos);
             fillSignature(37 /* EqualsGreaterThanToken */, 4 /* Type */, node);
             return finishNode(node);
@@ -19018,14 +19161,14 @@ var ts;
             return token() === 24 /* DotToken */ ? undefined : node;
         }
         function parseLiteralTypeNode(negative) {
-            var node = createNode(182 /* LiteralType */);
+            var node = createNode(183 /* LiteralType */);
             var unaryMinusExpression;
             if (negative) {
-                unaryMinusExpression = createNode(202 /* PrefixUnaryExpression */);
+                unaryMinusExpression = createNode(203 /* PrefixUnaryExpression */);
                 unaryMinusExpression.operator = 39 /* MinusToken */;
                 nextToken();
             }
-            var expression = token() === 102 /* TrueKeyword */ || token() === 87 /* FalseKeyword */
+            var expression = token() === 103 /* TrueKeyword */ || token() === 88 /* FalseKeyword */
                 ? parseTokenNode()
                 : parseLiteralLikeNode(token());
             if (negative) {
@@ -19038,22 +19181,24 @@ var ts;
         }
         function isStartOfTypeOfImportType() {
             nextToken();
-            return token() === 92 /* ImportKeyword */;
+            return token() === 93 /* ImportKeyword */;
         }
         function parseImportType() {
             sourceFile.flags |= 524288 /* PossiblyContainsDynamicImport */;
-            var node = createNode(183 /* ImportType */);
-            if (parseOptional(104 /* TypeOfKeyword */)) {
+            var node = createNode(184 /* ImportType */);
+            if (parseOptional(105 /* TypeOfKeyword */)) {
                 node.isTypeOf = true;
             }
-            parseExpected(92 /* ImportKeyword */);
+            parseExpected(93 /* ImportKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.argument = parseType();
             parseExpected(21 /* CloseParenToken */);
             if (parseOptional(24 /* DotToken */)) {
                 node.qualifier = parseEntityName(/*allowReservedWords*/ true, ts.Diagnostics.Type_expected);
             }
-            node.typeArguments = tryParseTypeArguments();
+            if (!scanner.hasPrecedingLineBreak() && reScanLessThanToken() === 28 /* LessThanToken */) {
+                node.typeArguments = parseBracketedList(20 /* TypeArguments */, parseType, 28 /* LessThanToken */, 30 /* GreaterThanToken */);
+            }
             return finishNode(node);
         }
         function nextTokenIsNumericOrBigIntLiteral() {
@@ -19062,25 +19207,25 @@ var ts;
         }
         function parseNonArrayType() {
             switch (token()) {
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 138 /* StringKeyword */:
-                case 135 /* NumberKeyword */:
-                case 146 /* BigIntKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 132 /* NeverKeyword */:
-                case 136 /* ObjectKeyword */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 139 /* StringKeyword */:
+                case 136 /* NumberKeyword */:
+                case 147 /* BigIntKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 133 /* NeverKeyword */:
+                case 137 /* ObjectKeyword */:
                     // If these are followed by a dot, then parse these out as a dotted type reference instead.
                     return tryParse(parseKeywordAndNoDot) || parseTypeReference();
                 case 40 /* AsteriskToken */:
                     return parseJSDocAllType(/*postfixEquals*/ false);
-                case 62 /* AsteriskEqualsToken */:
+                case 63 /* AsteriskEqualsToken */:
                     return parseJSDocAllType(/*postfixEquals*/ true);
                 case 56 /* QuestionToken */:
                     return parseJSDocUnknownOrNullableType();
-                case 90 /* FunctionKeyword */:
+                case 91 /* FunctionKeyword */:
                     return parseJSDocFunctionType();
                 case 52 /* ExclamationToken */:
                     return parseJSDocNonNullableType();
@@ -19088,24 +19233,24 @@ var ts;
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
                     return parseLiteralTypeNode();
                 case 39 /* MinusToken */:
                     return lookAhead(nextTokenIsNumericOrBigIntLiteral) ? parseLiteralTypeNode(/*negative*/ true) : parseTypeReference();
-                case 106 /* VoidKeyword */:
-                case 96 /* NullKeyword */:
+                case 107 /* VoidKeyword */:
+                case 97 /* NullKeyword */:
                     return parseTokenNode();
-                case 100 /* ThisKeyword */: {
+                case 101 /* ThisKeyword */: {
                     var thisKeyword = parseThisTypeNode();
-                    if (token() === 128 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
+                    if (token() === 129 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
                         return parseThisTypePredicate(thisKeyword);
                     }
                     else {
                         return thisKeyword;
                     }
                 }
-                case 104 /* TypeOfKeyword */:
+                case 105 /* TypeOfKeyword */:
                     return lookAhead(isStartOfTypeOfImportType) ? parseImportType() : parseTypeQuery();
                 case 18 /* OpenBraceToken */:
                     return lookAhead(isStartOfMappedType) ? parseMappedType() : parseTypeLiteral();
@@ -19113,7 +19258,7 @@ var ts;
                     return parseTupleType();
                 case 20 /* OpenParenToken */:
                     return parseParenthesizedType();
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     return parseImportType();
                 default:
                     return parseTypeReference();
@@ -19121,41 +19266,41 @@ var ts;
         }
         function isStartOfType(inStartOfParameter) {
             switch (token()) {
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 138 /* StringKeyword */:
-                case 135 /* NumberKeyword */:
-                case 146 /* BigIntKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 133 /* ReadonlyKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 142 /* UniqueKeyword */:
-                case 106 /* VoidKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 96 /* NullKeyword */:
-                case 100 /* ThisKeyword */:
-                case 104 /* TypeOfKeyword */:
-                case 132 /* NeverKeyword */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 139 /* StringKeyword */:
+                case 136 /* NumberKeyword */:
+                case 147 /* BigIntKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 134 /* ReadonlyKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 143 /* UniqueKeyword */:
+                case 107 /* VoidKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 97 /* NullKeyword */:
+                case 101 /* ThisKeyword */:
+                case 105 /* TypeOfKeyword */:
+                case 133 /* NeverKeyword */:
                 case 18 /* OpenBraceToken */:
                 case 22 /* OpenBracketToken */:
                 case 28 /* LessThanToken */:
                 case 50 /* BarToken */:
                 case 49 /* AmpersandToken */:
-                case 95 /* NewKeyword */:
+                case 96 /* NewKeyword */:
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 136 /* ObjectKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 137 /* ObjectKeyword */:
                 case 40 /* AsteriskToken */:
                 case 56 /* QuestionToken */:
                 case 52 /* ExclamationToken */:
                 case 25 /* DotDotDotToken */:
-                case 127 /* InferKeyword */:
-                case 92 /* ImportKeyword */:
+                case 128 /* InferKeyword */:
+                case 93 /* ImportKeyword */:
                     return true;
-                case 90 /* FunctionKeyword */:
+                case 91 /* FunctionKeyword */:
                     return !inStartOfParameter;
                 case 39 /* MinusToken */:
                     return !inStartOfParameter && lookAhead(nextTokenIsNumericOrBigIntLiteral);
@@ -19176,26 +19321,26 @@ var ts;
             while (!scanner.hasPrecedingLineBreak()) {
                 switch (token()) {
                     case 52 /* ExclamationToken */:
-                        type = createPostfixType(292 /* JSDocNonNullableType */, type);
+                        type = createPostfixType(293 /* JSDocNonNullableType */, type);
                         break;
                     case 56 /* QuestionToken */:
                         // If not in JSDoc and next token is start of a type we have a conditional type
                         if (!(contextFlags & 2097152 /* JSDoc */) && lookAhead(nextTokenIsStartOfType)) {
                             return type;
                         }
-                        type = createPostfixType(291 /* JSDocNullableType */, type);
+                        type = createPostfixType(292 /* JSDocNullableType */, type);
                         break;
                     case 22 /* OpenBracketToken */:
                         parseExpected(22 /* OpenBracketToken */);
                         if (isStartOfType()) {
-                            var node = createNode(180 /* IndexedAccessType */, type.pos);
+                            var node = createNode(181 /* IndexedAccessType */, type.pos);
                             node.objectType = type;
                             node.indexType = parseType();
                             parseExpected(23 /* CloseBracketToken */);
                             type = finishNode(node);
                         }
                         else {
-                            var node = createNode(169 /* ArrayType */, type.pos);
+                            var node = createNode(170 /* ArrayType */, type.pos);
                             node.elementType = type;
                             parseExpected(23 /* CloseBracketToken */);
                             type = finishNode(node);
@@ -19214,16 +19359,16 @@ var ts;
             return finishNode(postfix);
         }
         function parseTypeOperator(operator) {
-            var node = createNode(179 /* TypeOperator */);
+            var node = createNode(180 /* TypeOperator */);
             parseExpected(operator);
             node.operator = operator;
             node.type = parseTypeOperatorOrHigher();
             return finishNode(node);
         }
         function parseInferType() {
-            var node = createNode(176 /* InferType */);
-            parseExpected(127 /* InferKeyword */);
-            var typeParameter = createNode(150 /* TypeParameter */);
+            var node = createNode(177 /* InferType */);
+            parseExpected(128 /* InferKeyword */);
+            var typeParameter = createNode(151 /* TypeParameter */);
             typeParameter.name = parseIdentifier();
             node.typeParameter = finishNode(typeParameter);
             return finishNode(node);
@@ -19231,34 +19376,35 @@ var ts;
         function parseTypeOperatorOrHigher() {
             var operator = token();
             switch (operator) {
-                case 129 /* KeyOfKeyword */:
-                case 142 /* UniqueKeyword */:
-                case 133 /* ReadonlyKeyword */:
+                case 130 /* KeyOfKeyword */:
+                case 143 /* UniqueKeyword */:
+                case 134 /* ReadonlyKeyword */:
                     return parseTypeOperator(operator);
-                case 127 /* InferKeyword */:
+                case 128 /* InferKeyword */:
                     return parseInferType();
             }
             return parsePostfixTypeOrHigher();
         }
         function parseUnionOrIntersectionType(kind, parseConstituentType, operator) {
-            parseOptional(operator);
+            var start = scanner.getStartPos();
+            var hasLeadingOperator = parseOptional(operator);
             var type = parseConstituentType();
-            if (token() === operator) {
+            if (token() === operator || hasLeadingOperator) {
                 var types = [type];
                 while (parseOptional(operator)) {
                     types.push(parseConstituentType());
                 }
-                var node = createNode(kind, type.pos);
-                node.types = createNodeArray(types, type.pos);
+                var node = createNode(kind, start);
+                node.types = createNodeArray(types, start);
                 type = finishNode(node);
             }
             return type;
         }
         function parseIntersectionTypeOrHigher() {
-            return parseUnionOrIntersectionType(174 /* IntersectionType */, parseTypeOperatorOrHigher, 49 /* AmpersandToken */);
+            return parseUnionOrIntersectionType(175 /* IntersectionType */, parseTypeOperatorOrHigher, 49 /* AmpersandToken */);
         }
         function parseUnionTypeOrHigher() {
-            return parseUnionOrIntersectionType(173 /* UnionType */, parseIntersectionTypeOrHigher, 50 /* BarToken */);
+            return parseUnionOrIntersectionType(174 /* UnionType */, parseIntersectionTypeOrHigher, 50 /* BarToken */);
         }
         function isStartOfFunctionType() {
             if (token() === 28 /* LessThanToken */) {
@@ -19271,7 +19417,7 @@ var ts;
                 // Skip modifiers
                 parseModifiers();
             }
-            if (isIdentifier() || token() === 100 /* ThisKeyword */) {
+            if (isIdentifier() || token() === 101 /* ThisKeyword */) {
                 nextToken();
                 return true;
             }
@@ -19294,7 +19440,7 @@ var ts;
                 // We successfully skipped modifiers (if any) and an identifier or binding pattern,
                 // now see if we have something that indicates a parameter declaration
                 if (token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ ||
-                    token() === 56 /* QuestionToken */ || token() === 59 /* EqualsToken */) {
+                    token() === 56 /* QuestionToken */ || token() === 60 /* EqualsToken */) {
                     // ( xxx :
                     // ( xxx ,
                     // ( xxx ?
@@ -19315,7 +19461,7 @@ var ts;
             var typePredicateVariable = isIdentifier() && tryParse(parseTypePredicatePrefix);
             var type = parseType();
             if (typePredicateVariable) {
-                var node = createNode(163 /* TypePredicate */, typePredicateVariable.pos);
+                var node = createNode(164 /* TypePredicate */, typePredicateVariable.pos);
                 node.parameterName = typePredicateVariable;
                 node.type = type;
                 return finishNode(node);
@@ -19326,7 +19472,7 @@ var ts;
         }
         function parseTypePredicatePrefix() {
             var id = parseIdentifier();
-            if (token() === 128 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
+            if (token() === 129 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
                 nextToken();
                 return id;
             }
@@ -19337,12 +19483,12 @@ var ts;
             return doOutsideOfContext(20480 /* TypeExcludesFlags */, parseTypeWorker);
         }
         function parseTypeWorker(noConditionalTypes) {
-            if (isStartOfFunctionType() || token() === 95 /* NewKeyword */) {
+            if (isStartOfFunctionType() || token() === 96 /* NewKeyword */) {
                 return parseFunctionOrConstructorType();
             }
             var type = parseUnionTypeOrHigher();
-            if (!noConditionalTypes && !scanner.hasPrecedingLineBreak() && parseOptional(86 /* ExtendsKeyword */)) {
-                var node = createNode(175 /* ConditionalType */, type.pos);
+            if (!noConditionalTypes && !scanner.hasPrecedingLineBreak() && parseOptional(87 /* ExtendsKeyword */)) {
+                var node = createNode(176 /* ConditionalType */, type.pos);
                 node.checkType = type;
                 // The type following 'extends' is not permitted to be another conditional type
                 node.extendsType = parseTypeWorker(/*noConditionalTypes*/ true);
@@ -19360,11 +19506,11 @@ var ts;
         // EXPRESSIONS
         function isStartOfLeftHandSideExpression() {
             switch (token()) {
-                case 100 /* ThisKeyword */:
-                case 98 /* SuperKeyword */:
-                case 96 /* NullKeyword */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
+                case 101 /* ThisKeyword */:
+                case 99 /* SuperKeyword */:
+                case 97 /* NullKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
                 case 10 /* StringLiteral */:
@@ -19373,14 +19519,14 @@ var ts;
                 case 20 /* OpenParenToken */:
                 case 22 /* OpenBracketToken */:
                 case 18 /* OpenBraceToken */:
-                case 90 /* FunctionKeyword */:
-                case 76 /* ClassKeyword */:
-                case 95 /* NewKeyword */:
+                case 91 /* FunctionKeyword */:
+                case 77 /* ClassKeyword */:
+                case 96 /* NewKeyword */:
                 case 42 /* SlashToken */:
-                case 64 /* SlashEqualsToken */:
-                case 72 /* Identifier */:
+                case 65 /* SlashEqualsToken */:
+                case 73 /* Identifier */:
                     return true;
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     return lookAhead(nextTokenIsOpenParenOrLessThanOrDot);
                 default:
                     return isIdentifier();
@@ -19395,14 +19541,14 @@ var ts;
                 case 39 /* MinusToken */:
                 case 53 /* TildeToken */:
                 case 52 /* ExclamationToken */:
-                case 81 /* DeleteKeyword */:
-                case 104 /* TypeOfKeyword */:
-                case 106 /* VoidKeyword */:
+                case 82 /* DeleteKeyword */:
+                case 105 /* TypeOfKeyword */:
+                case 107 /* VoidKeyword */:
                 case 44 /* PlusPlusToken */:
                 case 45 /* MinusMinusToken */:
                 case 28 /* LessThanToken */:
-                case 122 /* AwaitKeyword */:
-                case 117 /* YieldKeyword */:
+                case 123 /* AwaitKeyword */:
+                case 118 /* YieldKeyword */:
                     // Yield/await always starts an expression.  Either it is an identifier (in which case
                     // it is definitely an expression).  Or it's a keyword (either because we're in
                     // a generator or async function, or in strict mode (or both)) and it started a yield or await expression.
@@ -19421,8 +19567,8 @@ var ts;
         function isStartOfExpressionStatement() {
             // As per the grammar, none of '{' or 'function' or 'class' can start an expression statement.
             return token() !== 18 /* OpenBraceToken */ &&
-                token() !== 90 /* FunctionKeyword */ &&
-                token() !== 76 /* ClassKeyword */ &&
+                token() !== 91 /* FunctionKeyword */ &&
+                token() !== 77 /* ClassKeyword */ &&
                 token() !== 58 /* AtToken */ &&
                 isStartOfExpression();
         }
@@ -19446,7 +19592,7 @@ var ts;
             return expr;
         }
         function parseInitializer() {
-            return parseOptional(59 /* EqualsToken */) ? parseAssignmentExpressionOrHigher() : undefined;
+            return parseOptional(60 /* EqualsToken */) ? parseAssignmentExpressionOrHigher() : undefined;
         }
         function parseAssignmentExpressionOrHigher() {
             //  AssignmentExpression[in,yield]:
@@ -19491,7 +19637,7 @@ var ts;
             // To avoid a look-ahead, we did not handle the case of an arrow function with a single un-parenthesized
             // parameter ('x => ...') above. We handle it here by checking if the parsed expression was a single
             // identifier and the current token is an arrow.
-            if (expr.kind === 72 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
+            if (expr.kind === 73 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
                 return parseSimpleArrowFunctionExpression(expr);
             }
             // Now see if we might be in cases '2' or '3'.
@@ -19507,7 +19653,7 @@ var ts;
             return parseConditionalExpressionRest(expr);
         }
         function isYieldExpression() {
-            if (token() === 117 /* YieldKeyword */) {
+            if (token() === 118 /* YieldKeyword */) {
                 // If we have a 'yield' keyword, and this is a context where yield expressions are
                 // allowed, then definitely parse out a yield expression.
                 if (inYieldContext()) {
@@ -19536,7 +19682,7 @@ var ts;
             return !scanner.hasPrecedingLineBreak() && isIdentifier();
         }
         function parseYieldExpression() {
-            var node = createNode(207 /* YieldExpression */);
+            var node = createNode(208 /* YieldExpression */);
             // YieldExpression[In] :
             //      yield
             //      yield [no LineTerminator here] [Lexical goal InputElementRegExp]AssignmentExpression[?In, Yield]
@@ -19558,13 +19704,13 @@ var ts;
             ts.Debug.assert(token() === 37 /* EqualsGreaterThanToken */, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
             var node;
             if (asyncModifier) {
-                node = createNode(197 /* ArrowFunction */, asyncModifier.pos);
+                node = createNode(198 /* ArrowFunction */, asyncModifier.pos);
                 node.modifiers = asyncModifier;
             }
             else {
-                node = createNode(197 /* ArrowFunction */, identifier.pos);
+                node = createNode(198 /* ArrowFunction */, identifier.pos);
             }
-            var parameter = createNode(151 /* Parameter */, identifier.pos);
+            var parameter = createNode(152 /* Parameter */, identifier.pos);
             parameter.name = identifier;
             finishNode(parameter);
             node.parameters = createNodeArray([parameter], parameter.pos, parameter.end);
@@ -19604,7 +19750,7 @@ var ts;
         //  Unknown     -> There *might* be a parenthesized arrow function here.
         //                 Speculatively look ahead to be sure, and rollback if not.
         function isParenthesizedArrowFunctionExpression() {
-            if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */ || token() === 121 /* AsyncKeyword */) {
+            if (token() === 20 /* OpenParenToken */ || token() === 28 /* LessThanToken */ || token() === 122 /* AsyncKeyword */) {
                 return lookAhead(isParenthesizedArrowFunctionExpressionWorker);
             }
             if (token() === 37 /* EqualsGreaterThanToken */) {
@@ -19617,7 +19763,7 @@ var ts;
             return 0 /* False */;
         }
         function isParenthesizedArrowFunctionExpressionWorker() {
-            if (token() === 121 /* AsyncKeyword */) {
+            if (token() === 122 /* AsyncKeyword */) {
                 nextToken();
                 if (scanner.hasPrecedingLineBreak()) {
                     return 0 /* False */;
@@ -19661,13 +19807,13 @@ var ts;
                 // Check for "(xxx yyy", where xxx is a modifier and yyy is an identifier. This
                 // isn't actually allowed, but we want to treat it as a lambda so we can provide
                 // a good error message.
-                if (ts.isModifierKind(second) && second !== 121 /* AsyncKeyword */ && lookAhead(nextTokenIsIdentifier)) {
+                if (ts.isModifierKind(second) && second !== 122 /* AsyncKeyword */ && lookAhead(nextTokenIsIdentifier)) {
                     return 1 /* True */;
                 }
                 // If we had "(" followed by something that's not an identifier,
                 // then this definitely doesn't look like a lambda.  "this" is not
                 // valid, but we want to parse it and then give a semantic error.
-                if (!isIdentifier() && second !== 100 /* ThisKeyword */) {
+                if (!isIdentifier() && second !== 101 /* ThisKeyword */) {
                     return 0 /* False */;
                 }
                 switch (nextToken()) {
@@ -19678,13 +19824,13 @@ var ts;
                     case 56 /* QuestionToken */:
                         nextToken();
                         // If we have "(a?:" or "(a?," or "(a?=" or "(a?)" then it is definitely a lambda.
-                        if (token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 59 /* EqualsToken */ || token() === 21 /* CloseParenToken */) {
+                        if (token() === 57 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 60 /* EqualsToken */ || token() === 21 /* CloseParenToken */) {
                             return 1 /* True */;
                         }
                         // Otherwise it is definitely not a lambda.
                         return 0 /* False */;
                     case 27 /* CommaToken */:
-                    case 59 /* EqualsToken */:
+                    case 60 /* EqualsToken */:
                     case 21 /* CloseParenToken */:
                         // If we have "(a," or "(a=" or "(a)" this *could* be an arrow function
                         return 2 /* Unknown */;
@@ -19703,10 +19849,10 @@ var ts;
                 if (sourceFile.languageVariant === 1 /* JSX */) {
                     var isArrowFunctionInJsx = lookAhead(function () {
                         var third = nextToken();
-                        if (third === 86 /* ExtendsKeyword */) {
+                        if (third === 87 /* ExtendsKeyword */) {
                             var fourth = nextToken();
                             switch (fourth) {
-                                case 59 /* EqualsToken */:
+                                case 60 /* EqualsToken */:
                                 case 30 /* GreaterThanToken */:
                                     return false;
                                 default:
@@ -19732,7 +19878,7 @@ var ts;
         }
         function tryParseAsyncSimpleArrowFunctionExpression() {
             // We do a check here so that we won't be doing unnecessarily call to "lookAhead"
-            if (token() === 121 /* AsyncKeyword */) {
+            if (token() === 122 /* AsyncKeyword */) {
                 if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1 /* True */) {
                     var asyncModifier = parseModifiersForArrowFunction();
                     var expr = parseBinaryExpressionOrHigher(/*precedence*/ 0);
@@ -19745,7 +19891,7 @@ var ts;
             // AsyncArrowFunctionExpression:
             //      1) async[no LineTerminator here]AsyncArrowBindingIdentifier[?Yield][no LineTerminator here]=>AsyncConciseBody[?In]
             //      2) CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await][no LineTerminator here]=>AsyncConciseBody[?In]
-            if (token() === 121 /* AsyncKeyword */) {
+            if (token() === 122 /* AsyncKeyword */) {
                 nextToken();
                 // If the "async" is followed by "=>" token then it is not a beginning of an async arrow-function
                 // but instead a simple arrow-function which will be parsed inside "parseAssignmentExpressionOrHigher"
@@ -19754,14 +19900,14 @@ var ts;
                 }
                 // Check for un-parenthesized AsyncArrowFunction
                 var expr = parseBinaryExpressionOrHigher(/*precedence*/ 0);
-                if (!scanner.hasPrecedingLineBreak() && expr.kind === 72 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
+                if (!scanner.hasPrecedingLineBreak() && expr.kind === 73 /* Identifier */ && token() === 37 /* EqualsGreaterThanToken */) {
                     return 1 /* True */;
                 }
             }
             return 0 /* False */;
         }
         function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) {
-            var node = createNodeWithJSDoc(197 /* ArrowFunction */);
+            var node = createNodeWithJSDoc(198 /* ArrowFunction */);
             node.modifiers = parseModifiersForArrowFunction();
             var isAsync = ts.hasModifier(node, 256 /* Async */) ? 2 /* Await */ : 0 /* None */;
             // Arrow functions are never generators.
@@ -19780,9 +19926,11 @@ var ts;
             //  - "(x = 10)" is an assignment expression parsed as a signature with a default parameter value.
             //  - "(x,y)" is a comma expression parsed as a signature with two parameters.
             //  - "a ? (b): c" will have "(b):" parsed as a signature with a return type annotation.
+            //  - "a ? (b): function() {}" will too, since function() is a valid JSDoc function type.
             //
             // So we need just a bit of lookahead to ensure that it can only be a signature.
-            if (!allowAmbiguity && token() !== 37 /* EqualsGreaterThanToken */ && token() !== 18 /* OpenBraceToken */) {
+            var hasJSDocFunctionType = node.type && ts.isJSDocFunctionType(node.type);
+            if (!allowAmbiguity && token() !== 37 /* EqualsGreaterThanToken */ && (hasJSDocFunctionType || token() !== 18 /* OpenBraceToken */)) {
                 // Returning undefined here will cause our caller to rewind to where we started from.
                 return undefined;
             }
@@ -19793,8 +19941,8 @@ var ts;
                 return parseFunctionBlock(isAsync ? 2 /* Await */ : 0 /* None */);
             }
             if (token() !== 26 /* SemicolonToken */ &&
-                token() !== 90 /* FunctionKeyword */ &&
-                token() !== 76 /* ClassKeyword */ &&
+                token() !== 91 /* FunctionKeyword */ &&
+                token() !== 77 /* ClassKeyword */ &&
                 isStartOfStatement() &&
                 !isStartOfExpressionStatement()) {
                 // Check if we got a plain statement (i.e. no expression-statements, no function/class expressions/declarations)
@@ -19825,14 +19973,14 @@ var ts;
             }
             // Note: we explicitly 'allowIn' in the whenTrue part of the condition expression, and
             // we do not that for the 'whenFalse' part.
-            var node = createNode(205 /* ConditionalExpression */, leftOperand.pos);
+            var node = createNode(206 /* ConditionalExpression */, leftOperand.pos);
             node.condition = leftOperand;
             node.questionToken = questionToken;
             node.whenTrue = doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher);
             node.colonToken = parseExpectedToken(57 /* ColonToken */);
             node.whenFalse = ts.nodeIsPresent(node.colonToken)
                 ? parseAssignmentExpressionOrHigher()
-                : createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(57 /* ColonToken */));
+                : createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(57 /* ColonToken */));
             return finishNode(node);
         }
         function parseBinaryExpressionOrHigher(precedence) {
@@ -19840,7 +19988,7 @@ var ts;
             return parseBinaryExpressionRest(precedence, leftOperand);
         }
         function isInOrOfKeyword(t) {
-            return t === 93 /* InKeyword */ || t === 147 /* OfKeyword */;
+            return t === 94 /* InKeyword */ || t === 148 /* OfKeyword */;
         }
         function parseBinaryExpressionRest(precedence, leftOperand) {
             while (true) {
@@ -19875,10 +20023,10 @@ var ts;
                 if (!consumeCurrentOperator) {
                     break;
                 }
-                if (token() === 93 /* InKeyword */ && inDisallowInContext()) {
+                if (token() === 94 /* InKeyword */ && inDisallowInContext()) {
                     break;
                 }
-                if (token() === 119 /* AsKeyword */) {
+                if (token() === 120 /* AsKeyword */) {
                     // Make sure we *do* perform ASI for constructs like this:
                     //    var x = foo
                     //    as (Bar)
@@ -19899,51 +20047,51 @@ var ts;
             return leftOperand;
         }
         function isBinaryOperator() {
-            if (inDisallowInContext() && token() === 93 /* InKeyword */) {
+            if (inDisallowInContext() && token() === 94 /* InKeyword */) {
                 return false;
             }
             return ts.getBinaryOperatorPrecedence(token()) > 0;
         }
         function makeBinaryExpression(left, operatorToken, right) {
-            var node = createNode(204 /* BinaryExpression */, left.pos);
+            var node = createNode(205 /* BinaryExpression */, left.pos);
             node.left = left;
             node.operatorToken = operatorToken;
             node.right = right;
             return finishNode(node);
         }
         function makeAsExpression(left, right) {
-            var node = createNode(212 /* AsExpression */, left.pos);
+            var node = createNode(213 /* AsExpression */, left.pos);
             node.expression = left;
             node.type = right;
             return finishNode(node);
         }
         function parsePrefixUnaryExpression() {
-            var node = createNode(202 /* PrefixUnaryExpression */);
+            var node = createNode(203 /* PrefixUnaryExpression */);
             node.operator = token();
             nextToken();
             node.operand = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseDeleteExpression() {
-            var node = createNode(198 /* DeleteExpression */);
+            var node = createNode(199 /* DeleteExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseTypeOfExpression() {
-            var node = createNode(199 /* TypeOfExpression */);
+            var node = createNode(200 /* TypeOfExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function parseVoidExpression() {
-            var node = createNode(200 /* VoidExpression */);
+            var node = createNode(201 /* VoidExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
         }
         function isAwaitExpression() {
-            if (token() === 122 /* AwaitKeyword */) {
+            if (token() === 123 /* AwaitKeyword */) {
                 if (inAwaitContext()) {
                     return true;
                 }
@@ -19953,7 +20101,7 @@ var ts;
             return false;
         }
         function parseAwaitExpression() {
-            var node = createNode(201 /* AwaitExpression */);
+            var node = createNode(202 /* AwaitExpression */);
             nextToken();
             node.expression = parseSimpleUnaryExpression();
             return finishNode(node);
@@ -19997,7 +20145,7 @@ var ts;
             if (token() === 41 /* AsteriskAsteriskToken */) {
                 var pos = ts.skipTrivia(sourceText, simpleUnaryExpression.pos);
                 var end = simpleUnaryExpression.end;
-                if (simpleUnaryExpression.kind === 194 /* TypeAssertionExpression */) {
+                if (simpleUnaryExpression.kind === 195 /* TypeAssertionExpression */) {
                     parseErrorAt(pos, end, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses);
                 }
                 else {
@@ -20027,18 +20175,18 @@ var ts;
                 case 53 /* TildeToken */:
                 case 52 /* ExclamationToken */:
                     return parsePrefixUnaryExpression();
-                case 81 /* DeleteKeyword */:
+                case 82 /* DeleteKeyword */:
                     return parseDeleteExpression();
-                case 104 /* TypeOfKeyword */:
+                case 105 /* TypeOfKeyword */:
                     return parseTypeOfExpression();
-                case 106 /* VoidKeyword */:
+                case 107 /* VoidKeyword */:
                     return parseVoidExpression();
                 case 28 /* LessThanToken */:
                     // This is modified UnaryExpression grammar in TypeScript
                     //  UnaryExpression (modified):
                     //      < type > UnaryExpression
                     return parseTypeAssertion();
-                case 122 /* AwaitKeyword */:
+                case 123 /* AwaitKeyword */:
                     if (isAwaitExpression()) {
                         return parseAwaitExpression();
                     }
@@ -20065,10 +20213,10 @@ var ts;
                 case 39 /* MinusToken */:
                 case 53 /* TildeToken */:
                 case 52 /* ExclamationToken */:
-                case 81 /* DeleteKeyword */:
-                case 104 /* TypeOfKeyword */:
-                case 106 /* VoidKeyword */:
-                case 122 /* AwaitKeyword */:
+                case 82 /* DeleteKeyword */:
+                case 105 /* TypeOfKeyword */:
+                case 107 /* VoidKeyword */:
+                case 123 /* AwaitKeyword */:
                     return false;
                 case 28 /* LessThanToken */:
                     // If we are not in JSX context, we are parsing TypeAssertion which is an UnaryExpression
@@ -20094,7 +20242,7 @@ var ts;
          */
         function parseUpdateExpression() {
             if (token() === 44 /* PlusPlusToken */ || token() === 45 /* MinusMinusToken */) {
-                var node = createNode(202 /* PrefixUnaryExpression */);
+                var node = createNode(203 /* PrefixUnaryExpression */);
                 node.operator = token();
                 nextToken();
                 node.operand = parseLeftHandSideExpressionOrHigher();
@@ -20107,7 +20255,7 @@ var ts;
             var expression = parseLeftHandSideExpressionOrHigher();
             ts.Debug.assert(ts.isLeftHandSideExpression(expression));
             if ((token() === 44 /* PlusPlusToken */ || token() === 45 /* MinusMinusToken */) && !scanner.hasPrecedingLineBreak()) {
-                var node = createNode(203 /* PostfixUnaryExpression */, expression.pos);
+                var node = createNode(204 /* PostfixUnaryExpression */, expression.pos);
                 node.operand = expression;
                 node.operator = token();
                 nextToken();
@@ -20148,7 +20296,7 @@ var ts;
             // 3)we have a MemberExpression which either completes the LeftHandSideExpression,
             // or starts the beginning of the first four CallExpression productions.
             var expression;
-            if (token() === 92 /* ImportKeyword */) {
+            if (token() === 93 /* ImportKeyword */) {
                 if (lookAhead(nextTokenIsOpenParenOrLessThan)) {
                     // We don't want to eagerly consume all import keyword as import call expression so we look ahead to find "("
                     // For example:
@@ -20163,8 +20311,8 @@ var ts;
                     var fullStart = scanner.getStartPos();
                     nextToken(); // advance past the 'import'
                     nextToken(); // advance past the dot
-                    var node = createNode(214 /* MetaProperty */, fullStart);
-                    node.keywordToken = 92 /* ImportKeyword */;
+                    var node = createNode(215 /* MetaProperty */, fullStart);
+                    node.keywordToken = 93 /* ImportKeyword */;
                     node.name = parseIdentifierName();
                     expression = finishNode(node);
                     sourceFile.flags |= 1048576 /* PossiblyContainsImportMeta */;
@@ -20174,7 +20322,7 @@ var ts;
                 }
             }
             else {
-                expression = token() === 98 /* SuperKeyword */ ? parseSuperExpression() : parseMemberExpressionOrHigher();
+                expression = token() === 99 /* SuperKeyword */ ? parseSuperExpression() : parseMemberExpressionOrHigher();
             }
             // Now, we *may* be complete.  However, we might have consumed the start of a
             // CallExpression.  As such, we need to consume the rest of it here to be complete.
@@ -20233,12 +20381,19 @@ var ts;
         }
         function parseSuperExpression() {
             var expression = parseTokenNode();
+            if (token() === 28 /* LessThanToken */) {
+                var startPos = getNodePos();
+                var typeArguments = tryParse(parseTypeArgumentsInExpression);
+                if (typeArguments !== undefined) {
+                    parseErrorAt(startPos, getNodePos(), ts.Diagnostics.super_may_not_use_type_arguments);
+                }
+            }
             if (token() === 20 /* OpenParenToken */ || token() === 24 /* DotToken */ || token() === 22 /* OpenBracketToken */) {
                 return expression;
             }
             // If we have seen "super" it must be followed by '(' or '.'.
             // If it wasn't then just try to parse out a '.' and report an error.
-            var node = createNode(189 /* PropertyAccessExpression */, expression.pos);
+            var node = createNode(190 /* PropertyAccessExpression */, expression.pos);
             node.expression = expression;
             parseExpectedToken(24 /* DotToken */, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access);
             node.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
@@ -20247,8 +20402,8 @@ var ts;
         function parseJsxElementOrSelfClosingElementOrFragment(inExpressionContext) {
             var opening = parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext);
             var result;
-            if (opening.kind === 262 /* JsxOpeningElement */) {
-                var node = createNode(260 /* JsxElement */, opening.pos);
+            if (opening.kind === 263 /* JsxOpeningElement */) {
+                var node = createNode(261 /* JsxElement */, opening.pos);
                 node.openingElement = opening;
                 node.children = parseJsxChildren(node.openingElement);
                 node.closingElement = parseJsxClosingElement(inExpressionContext);
@@ -20257,15 +20412,15 @@ var ts;
                 }
                 result = finishNode(node);
             }
-            else if (opening.kind === 265 /* JsxOpeningFragment */) {
-                var node = createNode(264 /* JsxFragment */, opening.pos);
+            else if (opening.kind === 266 /* JsxOpeningFragment */) {
+                var node = createNode(265 /* JsxFragment */, opening.pos);
                 node.openingFragment = opening;
                 node.children = parseJsxChildren(node.openingFragment);
                 node.closingFragment = parseJsxClosingFragment(inExpressionContext);
                 result = finishNode(node);
             }
             else {
-                ts.Debug.assert(opening.kind === 261 /* JsxSelfClosingElement */);
+                ts.Debug.assert(opening.kind === 262 /* JsxSelfClosingElement */);
                 // Nothing else to do for self-closing elements
                 result = opening;
             }
@@ -20280,11 +20435,11 @@ var ts;
                 var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElementOrFragment(/*inExpressionContext*/ true); });
                 if (invalidElement) {
                     parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element);
-                    var badNode = createNode(204 /* BinaryExpression */, result.pos);
+                    var badNode = createNode(205 /* BinaryExpression */, result.pos);
                     badNode.end = invalidElement.end;
                     badNode.left = result;
                     badNode.right = invalidElement;
-                    badNode.operatorToken = createMissingNode(27 /* CommaToken */, /*reportAtCurrentPosition*/ false, /*diagnosticMessage*/ undefined); // TODO: GH#18217
+                    badNode.operatorToken = createMissingNode(27 /* CommaToken */, /*reportAtCurrentPosition*/ false);
                     badNode.operatorToken.pos = badNode.operatorToken.end = badNode.right.pos;
                     return badNode;
                 }
@@ -20339,7 +20494,7 @@ var ts;
             return createNodeArray(list, listPos);
         }
         function parseJsxAttributes() {
-            var jsxAttributes = createNode(268 /* JsxAttributes */);
+            var jsxAttributes = createNode(269 /* JsxAttributes */);
             jsxAttributes.properties = parseList(13 /* JsxAttributes */, parseJsxAttribute);
             return finishNode(jsxAttributes);
         }
@@ -20348,7 +20503,7 @@ var ts;
             parseExpected(28 /* LessThanToken */);
             if (token() === 30 /* GreaterThanToken */) {
                 // See below for explanation of scanJsxText
-                var node_1 = createNode(265 /* JsxOpeningFragment */, fullStart);
+                var node_1 = createNode(266 /* JsxOpeningFragment */, fullStart);
                 scanJsxText();
                 return finishNode(node_1);
             }
@@ -20360,7 +20515,7 @@ var ts;
                 // Closing tag, so scan the immediately-following text with the JSX scanning instead
                 // of regular scanning to avoid treating illegal characters (e.g. '#') as immediate
                 // scanning errors
-                node = createNode(262 /* JsxOpeningElement */, fullStart);
+                node = createNode(263 /* JsxOpeningElement */, fullStart);
                 scanJsxText();
             }
             else {
@@ -20372,7 +20527,7 @@ var ts;
                     parseExpected(30 /* GreaterThanToken */, /*diagnostic*/ undefined, /*shouldAdvance*/ false);
                     scanJsxText();
                 }
-                node = createNode(261 /* JsxSelfClosingElement */, fullStart);
+                node = createNode(262 /* JsxSelfClosingElement */, fullStart);
             }
             node.tagName = tagName;
             node.typeArguments = typeArguments;
@@ -20386,10 +20541,10 @@ var ts;
             //      primaryExpression in the form of an identifier and "this" keyword
             // We can't just simply use parseLeftHandSideExpressionOrHigher because then we will start consider class,function etc as a keyword
             // We only want to consider "this" as a primaryExpression
-            var expression = token() === 100 /* ThisKeyword */ ?
+            var expression = token() === 101 /* ThisKeyword */ ?
                 parseTokenNode() : parseIdentifierName();
             while (parseOptional(24 /* DotToken */)) {
-                var propertyAccess = createNode(189 /* PropertyAccessExpression */, expression.pos);
+                var propertyAccess = createNode(190 /* PropertyAccessExpression */, expression.pos);
                 propertyAccess.expression = expression;
                 propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
                 expression = finishNode(propertyAccess);
@@ -20397,7 +20552,7 @@ var ts;
             return expression;
         }
         function parseJsxExpression(inExpressionContext) {
-            var node = createNode(270 /* JsxExpression */);
+            var node = createNode(271 /* JsxExpression */);
             if (!parseExpected(18 /* OpenBraceToken */)) {
                 return undefined;
             }
@@ -20419,9 +20574,9 @@ var ts;
                 return parseJsxSpreadAttribute();
             }
             scanJsxIdentifier();
-            var node = createNode(267 /* JsxAttribute */);
+            var node = createNode(268 /* JsxAttribute */);
             node.name = parseIdentifierName();
-            if (token() === 59 /* EqualsToken */) {
+            if (token() === 60 /* EqualsToken */) {
                 switch (scanJsxAttributeValue()) {
                     case 10 /* StringLiteral */:
                         node.initializer = parseLiteralNode();
@@ -20434,7 +20589,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxSpreadAttribute() {
-            var node = createNode(269 /* JsxSpreadAttribute */);
+            var node = createNode(270 /* JsxSpreadAttribute */);
             parseExpected(18 /* OpenBraceToken */);
             parseExpected(25 /* DotDotDotToken */);
             node.expression = parseExpression();
@@ -20442,7 +20597,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxClosingElement(inExpressionContext) {
-            var node = createNode(263 /* JsxClosingElement */);
+            var node = createNode(264 /* JsxClosingElement */);
             parseExpected(29 /* LessThanSlashToken */);
             node.tagName = parseJsxElementName();
             if (inExpressionContext) {
@@ -20455,7 +20610,7 @@ var ts;
             return finishNode(node);
         }
         function parseJsxClosingFragment(inExpressionContext) {
-            var node = createNode(266 /* JsxClosingFragment */);
+            var node = createNode(267 /* JsxClosingFragment */);
             parseExpected(29 /* LessThanSlashToken */);
             if (ts.tokenIsIdentifierOrKeyword(token())) {
                 parseErrorAtRange(parseJsxElementName(), ts.Diagnostics.Expected_corresponding_closing_tag_for_JSX_fragment);
@@ -20470,7 +20625,7 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAssertion() {
-            var node = createNode(194 /* TypeAssertionExpression */);
+            var node = createNode(195 /* TypeAssertionExpression */);
             parseExpected(28 /* LessThanToken */);
             node.type = parseType();
             parseExpected(30 /* GreaterThanToken */);
@@ -20481,7 +20636,7 @@ var ts;
             while (true) {
                 var dotToken = parseOptionalToken(24 /* DotToken */);
                 if (dotToken) {
-                    var propertyAccess = createNode(189 /* PropertyAccessExpression */, expression.pos);
+                    var propertyAccess = createNode(190 /* PropertyAccessExpression */, expression.pos);
                     propertyAccess.expression = expression;
                     propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
                     expression = finishNode(propertyAccess);
@@ -20489,17 +20644,17 @@ var ts;
                 }
                 if (token() === 52 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
                     nextToken();
-                    var nonNullExpression = createNode(213 /* NonNullExpression */, expression.pos);
+                    var nonNullExpression = createNode(214 /* NonNullExpression */, expression.pos);
                     nonNullExpression.expression = expression;
                     expression = finishNode(nonNullExpression);
                     continue;
                 }
                 // when in the [Decorator] context, we do not parse ElementAccess as it could be part of a ComputedPropertyName
                 if (!inDecoratorContext() && parseOptional(22 /* OpenBracketToken */)) {
-                    var indexedAccess = createNode(190 /* ElementAccessExpression */, expression.pos);
+                    var indexedAccess = createNode(191 /* ElementAccessExpression */, expression.pos);
                     indexedAccess.expression = expression;
                     if (token() === 23 /* CloseBracketToken */) {
-                        indexedAccess.argumentExpression = createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.An_element_access_expression_should_take_an_argument);
+                        indexedAccess.argumentExpression = createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.An_element_access_expression_should_take_an_argument);
                     }
                     else {
                         var argument = allowInAnd(parseExpression);
@@ -20523,7 +20678,7 @@ var ts;
             return token() === 14 /* NoSubstitutionTemplateLiteral */ || token() === 15 /* TemplateHead */;
         }
         function parseTaggedTemplateRest(tag, typeArguments) {
-            var tagExpression = createNode(193 /* TaggedTemplateExpression */, tag.pos);
+            var tagExpression = createNode(194 /* TaggedTemplateExpression */, tag.pos);
             tagExpression.tag = tag;
             tagExpression.typeArguments = typeArguments;
             tagExpression.template = token() === 14 /* NoSubstitutionTemplateLiteral */
@@ -20548,7 +20703,7 @@ var ts;
                         expression = parseTaggedTemplateRest(expression, typeArguments);
                         continue;
                     }
-                    var callExpr = createNode(191 /* CallExpression */, expression.pos);
+                    var callExpr = createNode(192 /* CallExpression */, expression.pos);
                     callExpr.expression = expression;
                     callExpr.typeArguments = typeArguments;
                     callExpr.arguments = parseArgumentList();
@@ -20556,7 +20711,7 @@ var ts;
                     continue;
                 }
                 else if (token() === 20 /* OpenParenToken */) {
-                    var callExpr = createNode(191 /* CallExpression */, expression.pos);
+                    var callExpr = createNode(192 /* CallExpression */, expression.pos);
                     callExpr.expression = expression;
                     callExpr.arguments = parseArgumentList();
                     expression = finishNode(callExpr);
@@ -20632,11 +20787,11 @@ var ts;
                 case 10 /* StringLiteral */:
                 case 14 /* NoSubstitutionTemplateLiteral */:
                     return parseLiteralNode();
-                case 100 /* ThisKeyword */:
-                case 98 /* SuperKeyword */:
-                case 96 /* NullKeyword */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
+                case 101 /* ThisKeyword */:
+                case 99 /* SuperKeyword */:
+                case 97 /* NullKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
                     return parseTokenNode();
                 case 20 /* OpenParenToken */:
                     return parseParenthesizedExpression();
@@ -20644,7 +20799,7 @@ var ts;
                     return parseArrayLiteralExpression();
                 case 18 /* OpenBraceToken */:
                     return parseObjectLiteralExpression();
-                case 121 /* AsyncKeyword */:
+                case 122 /* AsyncKeyword */:
                     // Async arrow functions are parsed earlier in parseAssignmentExpressionOrHigher.
                     // If we encounter `async [no LineTerminator here] function` then this is an async
                     // function; otherwise, its an identifier.
@@ -20652,14 +20807,14 @@ var ts;
                         break;
                     }
                     return parseFunctionExpression();
-                case 76 /* ClassKeyword */:
+                case 77 /* ClassKeyword */:
                     return parseClassExpression();
-                case 90 /* FunctionKeyword */:
+                case 91 /* FunctionKeyword */:
                     return parseFunctionExpression();
-                case 95 /* NewKeyword */:
+                case 96 /* NewKeyword */:
                     return parseNewExpressionOrNewDotTarget();
                 case 42 /* SlashToken */:
-                case 64 /* SlashEqualsToken */:
+                case 65 /* SlashEqualsToken */:
                     if (reScanSlashToken() === 13 /* RegularExpressionLiteral */) {
                         return parseLiteralNode();
                     }
@@ -20670,28 +20825,28 @@ var ts;
             return parseIdentifier(ts.Diagnostics.Expression_expected);
         }
         function parseParenthesizedExpression() {
-            var node = createNodeWithJSDoc(195 /* ParenthesizedExpression */);
+            var node = createNodeWithJSDoc(196 /* ParenthesizedExpression */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
             return finishNode(node);
         }
         function parseSpreadElement() {
-            var node = createNode(208 /* SpreadElement */);
+            var node = createNode(209 /* SpreadElement */);
             parseExpected(25 /* DotDotDotToken */);
             node.expression = parseAssignmentExpressionOrHigher();
             return finishNode(node);
         }
         function parseArgumentOrArrayLiteralElement() {
             return token() === 25 /* DotDotDotToken */ ? parseSpreadElement() :
-                token() === 27 /* CommaToken */ ? createNode(210 /* OmittedExpression */) :
+                token() === 27 /* CommaToken */ ? createNode(211 /* OmittedExpression */) :
                     parseAssignmentExpressionOrHigher();
         }
         function parseArgumentExpression() {
             return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement);
         }
         function parseArrayLiteralExpression() {
-            var node = createNode(187 /* ArrayLiteralExpression */);
+            var node = createNode(188 /* ArrayLiteralExpression */);
             parseExpected(22 /* OpenBracketToken */);
             if (scanner.hasPrecedingLineBreak()) {
                 node.multiLine = true;
@@ -20703,17 +20858,17 @@ var ts;
         function parseObjectLiteralElement() {
             var node = createNodeWithJSDoc(0 /* Unknown */);
             if (parseOptionalToken(25 /* DotDotDotToken */)) {
-                node.kind = 277 /* SpreadAssignment */;
+                node.kind = 278 /* SpreadAssignment */;
                 node.expression = parseAssignmentExpressionOrHigher();
                 return finishNode(node);
             }
             node.decorators = parseDecorators();
             node.modifiers = parseModifiers();
-            if (parseContextualModifier(126 /* GetKeyword */)) {
-                return parseAccessorDeclaration(node, 158 /* GetAccessor */);
+            if (parseContextualModifier(127 /* GetKeyword */)) {
+                return parseAccessorDeclaration(node, 159 /* GetAccessor */);
             }
-            if (parseContextualModifier(137 /* SetKeyword */)) {
-                return parseAccessorDeclaration(node, 159 /* SetAccessor */);
+            if (parseContextualModifier(138 /* SetKeyword */)) {
+                return parseAccessorDeclaration(node, 160 /* SetAccessor */);
             }
             var asteriskToken = parseOptionalToken(40 /* AsteriskToken */);
             var tokenIsIdentifier = isIdentifier();
@@ -20731,22 +20886,22 @@ var ts;
             // this is necessary because ObjectLiteral productions are also used to cover grammar for ObjectAssignmentPattern
             var isShorthandPropertyAssignment = tokenIsIdentifier && (token() !== 57 /* ColonToken */);
             if (isShorthandPropertyAssignment) {
-                node.kind = 276 /* ShorthandPropertyAssignment */;
-                var equalsToken = parseOptionalToken(59 /* EqualsToken */);
+                node.kind = 277 /* ShorthandPropertyAssignment */;
+                var equalsToken = parseOptionalToken(60 /* EqualsToken */);
                 if (equalsToken) {
                     node.equalsToken = equalsToken;
                     node.objectAssignmentInitializer = allowInAnd(parseAssignmentExpressionOrHigher);
                 }
             }
             else {
-                node.kind = 275 /* PropertyAssignment */;
+                node.kind = 276 /* PropertyAssignment */;
                 parseExpected(57 /* ColonToken */);
                 node.initializer = allowInAnd(parseAssignmentExpressionOrHigher);
             }
             return finishNode(node);
         }
         function parseObjectLiteralExpression() {
-            var node = createNode(188 /* ObjectLiteralExpression */);
+            var node = createNode(189 /* ObjectLiteralExpression */);
             parseExpected(18 /* OpenBraceToken */);
             if (scanner.hasPrecedingLineBreak()) {
                 node.multiLine = true;
@@ -20765,9 +20920,9 @@ var ts;
             if (saveDecoratorContext) {
                 setDecoratorContext(/*val*/ false);
             }
-            var node = createNodeWithJSDoc(196 /* FunctionExpression */);
+            var node = createNodeWithJSDoc(197 /* FunctionExpression */);
             node.modifiers = parseModifiers();
-            parseExpected(90 /* FunctionKeyword */);
+            parseExpected(91 /* FunctionKeyword */);
             node.asteriskToken = parseOptionalToken(40 /* AsteriskToken */);
             var isGenerator = node.asteriskToken ? 1 /* Yield */ : 0 /* None */;
             var isAsync = ts.hasModifier(node, 256 /* Async */) ? 2 /* Await */ : 0 /* None */;
@@ -20788,10 +20943,10 @@ var ts;
         }
         function parseNewExpressionOrNewDotTarget() {
             var fullStart = scanner.getStartPos();
-            parseExpected(95 /* NewKeyword */);
+            parseExpected(96 /* NewKeyword */);
             if (parseOptional(24 /* DotToken */)) {
-                var node_2 = createNode(214 /* MetaProperty */, fullStart);
-                node_2.keywordToken = 95 /* NewKeyword */;
+                var node_2 = createNode(215 /* MetaProperty */, fullStart);
+                node_2.keywordToken = 96 /* NewKeyword */;
                 node_2.name = parseIdentifierName();
                 return finishNode(node_2);
             }
@@ -20807,7 +20962,7 @@ var ts;
                 }
                 break;
             }
-            var node = createNode(192 /* NewExpression */, fullStart);
+            var node = createNode(193 /* NewExpression */, fullStart);
             node.expression = expression;
             node.typeArguments = typeArguments;
             if (node.typeArguments || token() === 20 /* OpenParenToken */) {
@@ -20817,7 +20972,7 @@ var ts;
         }
         // STATEMENTS
         function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) {
-            var node = createNode(218 /* Block */);
+            var node = createNode(219 /* Block */);
             if (parseExpected(18 /* OpenBraceToken */, diagnosticMessage) || ignoreMissingOpenBrace) {
                 if (scanner.hasPrecedingLineBreak()) {
                     node.multiLine = true;
@@ -20850,25 +21005,25 @@ var ts;
             return block;
         }
         function parseEmptyStatement() {
-            var node = createNode(220 /* EmptyStatement */);
+            var node = createNode(221 /* EmptyStatement */);
             parseExpected(26 /* SemicolonToken */);
             return finishNode(node);
         }
         function parseIfStatement() {
-            var node = createNode(222 /* IfStatement */);
-            parseExpected(91 /* IfKeyword */);
+            var node = createNode(223 /* IfStatement */);
+            parseExpected(92 /* IfKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
             node.thenStatement = parseStatement();
-            node.elseStatement = parseOptional(83 /* ElseKeyword */) ? parseStatement() : undefined;
+            node.elseStatement = parseOptional(84 /* ElseKeyword */) ? parseStatement() : undefined;
             return finishNode(node);
         }
         function parseDoStatement() {
-            var node = createNode(223 /* DoStatement */);
-            parseExpected(82 /* DoKeyword */);
+            var node = createNode(224 /* DoStatement */);
+            parseExpected(83 /* DoKeyword */);
             node.statement = parseStatement();
-            parseExpected(107 /* WhileKeyword */);
+            parseExpected(108 /* WhileKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
@@ -20880,8 +21035,8 @@ var ts;
             return finishNode(node);
         }
         function parseWhileStatement() {
-            var node = createNode(224 /* WhileStatement */);
-            parseExpected(107 /* WhileKeyword */);
+            var node = createNode(225 /* WhileStatement */);
+            parseExpected(108 /* WhileKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
@@ -20890,12 +21045,12 @@ var ts;
         }
         function parseForOrForInOrForOfStatement() {
             var pos = getNodePos();
-            parseExpected(89 /* ForKeyword */);
-            var awaitToken = parseOptionalToken(122 /* AwaitKeyword */);
+            parseExpected(90 /* ForKeyword */);
+            var awaitToken = parseOptionalToken(123 /* AwaitKeyword */);
             parseExpected(20 /* OpenParenToken */);
             var initializer;
             if (token() !== 26 /* SemicolonToken */) {
-                if (token() === 105 /* VarKeyword */ || token() === 111 /* LetKeyword */ || token() === 77 /* ConstKeyword */) {
+                if (token() === 106 /* VarKeyword */ || token() === 112 /* LetKeyword */ || token() === 78 /* ConstKeyword */) {
                     initializer = parseVariableDeclarationList(/*inForStatementInitializer*/ true);
                 }
                 else {
@@ -20903,23 +21058,23 @@ var ts;
                 }
             }
             var forOrForInOrForOfStatement;
-            if (awaitToken ? parseExpected(147 /* OfKeyword */) : parseOptional(147 /* OfKeyword */)) {
-                var forOfStatement = createNode(227 /* ForOfStatement */, pos);
+            if (awaitToken ? parseExpected(148 /* OfKeyword */) : parseOptional(148 /* OfKeyword */)) {
+                var forOfStatement = createNode(228 /* ForOfStatement */, pos);
                 forOfStatement.awaitModifier = awaitToken;
                 forOfStatement.initializer = initializer;
                 forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher);
                 parseExpected(21 /* CloseParenToken */);
                 forOrForInOrForOfStatement = forOfStatement;
             }
-            else if (parseOptional(93 /* InKeyword */)) {
-                var forInStatement = createNode(226 /* ForInStatement */, pos);
+            else if (parseOptional(94 /* InKeyword */)) {
+                var forInStatement = createNode(227 /* ForInStatement */, pos);
                 forInStatement.initializer = initializer;
                 forInStatement.expression = allowInAnd(parseExpression);
                 parseExpected(21 /* CloseParenToken */);
                 forOrForInOrForOfStatement = forInStatement;
             }
             else {
-                var forStatement = createNode(225 /* ForStatement */, pos);
+                var forStatement = createNode(226 /* ForStatement */, pos);
                 forStatement.initializer = initializer;
                 parseExpected(26 /* SemicolonToken */);
                 if (token() !== 26 /* SemicolonToken */ && token() !== 21 /* CloseParenToken */) {
@@ -20937,7 +21092,7 @@ var ts;
         }
         function parseBreakOrContinueStatement(kind) {
             var node = createNode(kind);
-            parseExpected(kind === 229 /* BreakStatement */ ? 73 /* BreakKeyword */ : 78 /* ContinueKeyword */);
+            parseExpected(kind === 230 /* BreakStatement */ ? 74 /* BreakKeyword */ : 79 /* ContinueKeyword */);
             if (!canParseSemicolon()) {
                 node.label = parseIdentifier();
             }
@@ -20945,8 +21100,8 @@ var ts;
             return finishNode(node);
         }
         function parseReturnStatement() {
-            var node = createNode(230 /* ReturnStatement */);
-            parseExpected(97 /* ReturnKeyword */);
+            var node = createNode(231 /* ReturnStatement */);
+            parseExpected(98 /* ReturnKeyword */);
             if (!canParseSemicolon()) {
                 node.expression = allowInAnd(parseExpression);
             }
@@ -20954,8 +21109,8 @@ var ts;
             return finishNode(node);
         }
         function parseWithStatement() {
-            var node = createNode(231 /* WithStatement */);
-            parseExpected(108 /* WithKeyword */);
+            var node = createNode(232 /* WithStatement */);
+            parseExpected(109 /* WithKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
@@ -20963,30 +21118,30 @@ var ts;
             return finishNode(node);
         }
         function parseCaseClause() {
-            var node = createNode(271 /* CaseClause */);
-            parseExpected(74 /* CaseKeyword */);
+            var node = createNode(272 /* CaseClause */);
+            parseExpected(75 /* CaseKeyword */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(57 /* ColonToken */);
             node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement);
             return finishNode(node);
         }
         function parseDefaultClause() {
-            var node = createNode(272 /* DefaultClause */);
-            parseExpected(80 /* DefaultKeyword */);
+            var node = createNode(273 /* DefaultClause */);
+            parseExpected(81 /* DefaultKeyword */);
             parseExpected(57 /* ColonToken */);
             node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement);
             return finishNode(node);
         }
         function parseCaseOrDefaultClause() {
-            return token() === 74 /* CaseKeyword */ ? parseCaseClause() : parseDefaultClause();
+            return token() === 75 /* CaseKeyword */ ? parseCaseClause() : parseDefaultClause();
         }
         function parseSwitchStatement() {
-            var node = createNode(232 /* SwitchStatement */);
-            parseExpected(99 /* SwitchKeyword */);
+            var node = createNode(233 /* SwitchStatement */);
+            parseExpected(100 /* SwitchKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
-            var caseBlock = createNode(246 /* CaseBlock */);
+            var caseBlock = createNode(247 /* CaseBlock */);
             parseExpected(18 /* OpenBraceToken */);
             caseBlock.clauses = parseList(2 /* SwitchClauses */, parseCaseOrDefaultClause);
             parseExpected(19 /* CloseBraceToken */);
@@ -21001,29 +21156,29 @@ var ts;
             // directly as that might consume an expression on the following line.
             // We just return 'undefined' in that case.  The actual error will be reported in the
             // grammar walker.
-            var node = createNode(234 /* ThrowStatement */);
-            parseExpected(101 /* ThrowKeyword */);
+            var node = createNode(235 /* ThrowStatement */);
+            parseExpected(102 /* ThrowKeyword */);
             node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression);
             parseSemicolon();
             return finishNode(node);
         }
         // TODO: Review for error recovery
         function parseTryStatement() {
-            var node = createNode(235 /* TryStatement */);
-            parseExpected(103 /* TryKeyword */);
+            var node = createNode(236 /* TryStatement */);
+            parseExpected(104 /* TryKeyword */);
             node.tryBlock = parseBlock(/*ignoreMissingOpenBrace*/ false);
-            node.catchClause = token() === 75 /* CatchKeyword */ ? parseCatchClause() : undefined;
+            node.catchClause = token() === 76 /* CatchKeyword */ ? parseCatchClause() : undefined;
             // If we don't have a catch clause, then we must have a finally clause.  Try to parse
             // one out no matter what.
-            if (!node.catchClause || token() === 88 /* FinallyKeyword */) {
-                parseExpected(88 /* FinallyKeyword */);
+            if (!node.catchClause || token() === 89 /* FinallyKeyword */) {
+                parseExpected(89 /* FinallyKeyword */);
                 node.finallyBlock = parseBlock(/*ignoreMissingOpenBrace*/ false);
             }
             return finishNode(node);
         }
         function parseCatchClause() {
-            var result = createNode(274 /* CatchClause */);
-            parseExpected(75 /* CatchKeyword */);
+            var result = createNode(275 /* CatchClause */);
+            parseExpected(76 /* CatchKeyword */);
             if (parseOptional(20 /* OpenParenToken */)) {
                 result.variableDeclaration = parseVariableDeclaration();
                 parseExpected(21 /* CloseParenToken */);
@@ -21036,8 +21191,8 @@ var ts;
             return finishNode(result);
         }
         function parseDebuggerStatement() {
-            var node = createNode(236 /* DebuggerStatement */);
-            parseExpected(79 /* DebuggerKeyword */);
+            var node = createNode(237 /* DebuggerStatement */);
+            parseExpected(80 /* DebuggerKeyword */);
             parseSemicolon();
             return finishNode(node);
         }
@@ -21047,13 +21202,13 @@ var ts;
             // a colon.
             var node = createNodeWithJSDoc(0 /* Unknown */);
             var expression = allowInAnd(parseExpression);
-            if (expression.kind === 72 /* Identifier */ && parseOptional(57 /* ColonToken */)) {
-                node.kind = 233 /* LabeledStatement */;
+            if (expression.kind === 73 /* Identifier */ && parseOptional(57 /* ColonToken */)) {
+                node.kind = 234 /* LabeledStatement */;
                 node.label = expression;
                 node.statement = parseStatement();
             }
             else {
-                node.kind = 221 /* ExpressionStatement */;
+                node.kind = 222 /* ExpressionStatement */;
                 node.expression = expression;
                 parseSemicolon();
             }
@@ -21065,11 +21220,11 @@ var ts;
         }
         function nextTokenIsClassKeywordOnSameLine() {
             nextToken();
-            return token() === 76 /* ClassKeyword */ && !scanner.hasPrecedingLineBreak();
+            return token() === 77 /* ClassKeyword */ && !scanner.hasPrecedingLineBreak();
         }
         function nextTokenIsFunctionKeywordOnSameLine() {
             nextToken();
-            return token() === 90 /* FunctionKeyword */ && !scanner.hasPrecedingLineBreak();
+            return token() === 91 /* FunctionKeyword */ && !scanner.hasPrecedingLineBreak();
         }
         function nextTokenIsIdentifierOrKeywordOrLiteralOnSameLine() {
             nextToken();
@@ -21078,12 +21233,12 @@ var ts;
         function isDeclaration() {
             while (true) {
                 switch (token()) {
-                    case 105 /* VarKeyword */:
-                    case 111 /* LetKeyword */:
-                    case 77 /* ConstKeyword */:
-                    case 90 /* FunctionKeyword */:
-                    case 76 /* ClassKeyword */:
-                    case 84 /* EnumKeyword */:
+                    case 106 /* VarKeyword */:
+                    case 112 /* LetKeyword */:
+                    case 78 /* ConstKeyword */:
+                    case 91 /* FunctionKeyword */:
+                    case 77 /* ClassKeyword */:
+                    case 85 /* EnumKeyword */:
                         return true;
                     // 'declare', 'module', 'namespace', 'interface'* and 'type' are all legal JavaScript identifiers;
                     // however, an identifier cannot be followed by another identifier on the same line. This is what we
@@ -21106,41 +21261,41 @@ var ts;
                     //   I {}
                     //
                     // could be legal, it would add complexity for very little gain.
-                    case 110 /* InterfaceKeyword */:
-                    case 140 /* TypeKeyword */:
+                    case 111 /* InterfaceKeyword */:
+                    case 141 /* TypeKeyword */:
                         return nextTokenIsIdentifierOnSameLine();
-                    case 130 /* ModuleKeyword */:
-                    case 131 /* NamespaceKeyword */:
+                    case 131 /* ModuleKeyword */:
+                    case 132 /* NamespaceKeyword */:
                         return nextTokenIsIdentifierOrStringLiteralOnSameLine();
-                    case 118 /* AbstractKeyword */:
-                    case 121 /* AsyncKeyword */:
-                    case 125 /* DeclareKeyword */:
-                    case 113 /* PrivateKeyword */:
-                    case 114 /* ProtectedKeyword */:
-                    case 115 /* PublicKeyword */:
-                    case 133 /* ReadonlyKeyword */:
+                    case 119 /* AbstractKeyword */:
+                    case 122 /* AsyncKeyword */:
+                    case 126 /* DeclareKeyword */:
+                    case 114 /* PrivateKeyword */:
+                    case 115 /* ProtectedKeyword */:
+                    case 116 /* PublicKeyword */:
+                    case 134 /* ReadonlyKeyword */:
                         nextToken();
                         // ASI takes effect for this modifier.
                         if (scanner.hasPrecedingLineBreak()) {
                             return false;
                         }
                         continue;
-                    case 145 /* GlobalKeyword */:
+                    case 146 /* GlobalKeyword */:
                         nextToken();
-                        return token() === 18 /* OpenBraceToken */ || token() === 72 /* Identifier */ || token() === 85 /* ExportKeyword */;
-                    case 92 /* ImportKeyword */:
+                        return token() === 18 /* OpenBraceToken */ || token() === 73 /* Identifier */ || token() === 86 /* ExportKeyword */;
+                    case 93 /* ImportKeyword */:
                         nextToken();
                         return token() === 10 /* StringLiteral */ || token() === 40 /* AsteriskToken */ ||
                             token() === 18 /* OpenBraceToken */ || ts.tokenIsIdentifierOrKeyword(token());
-                    case 85 /* ExportKeyword */:
+                    case 86 /* ExportKeyword */:
                         nextToken();
-                        if (token() === 59 /* EqualsToken */ || token() === 40 /* AsteriskToken */ ||
-                            token() === 18 /* OpenBraceToken */ || token() === 80 /* DefaultKeyword */ ||
-                            token() === 119 /* AsKeyword */) {
+                        if (token() === 60 /* EqualsToken */ || token() === 40 /* AsteriskToken */ ||
+                            token() === 18 /* OpenBraceToken */ || token() === 81 /* DefaultKeyword */ ||
+                            token() === 120 /* AsKeyword */) {
                             return true;
                         }
                         continue;
-                    case 116 /* StaticKeyword */:
+                    case 117 /* StaticKeyword */:
                         nextToken();
                         continue;
                     default:
@@ -21156,47 +21311,47 @@ var ts;
                 case 58 /* AtToken */:
                 case 26 /* SemicolonToken */:
                 case 18 /* OpenBraceToken */:
-                case 105 /* VarKeyword */:
-                case 111 /* LetKeyword */:
-                case 90 /* FunctionKeyword */:
-                case 76 /* ClassKeyword */:
-                case 84 /* EnumKeyword */:
-                case 91 /* IfKeyword */:
-                case 82 /* DoKeyword */:
-                case 107 /* WhileKeyword */:
-                case 89 /* ForKeyword */:
-                case 78 /* ContinueKeyword */:
-                case 73 /* BreakKeyword */:
-                case 97 /* ReturnKeyword */:
-                case 108 /* WithKeyword */:
-                case 99 /* SwitchKeyword */:
-                case 101 /* ThrowKeyword */:
-                case 103 /* TryKeyword */:
-                case 79 /* DebuggerKeyword */:
+                case 106 /* VarKeyword */:
+                case 112 /* LetKeyword */:
+                case 91 /* FunctionKeyword */:
+                case 77 /* ClassKeyword */:
+                case 85 /* EnumKeyword */:
+                case 92 /* IfKeyword */:
+                case 83 /* DoKeyword */:
+                case 108 /* WhileKeyword */:
+                case 90 /* ForKeyword */:
+                case 79 /* ContinueKeyword */:
+                case 74 /* BreakKeyword */:
+                case 98 /* ReturnKeyword */:
+                case 109 /* WithKeyword */:
+                case 100 /* SwitchKeyword */:
+                case 102 /* ThrowKeyword */:
+                case 104 /* TryKeyword */:
+                case 80 /* DebuggerKeyword */:
                 // 'catch' and 'finally' do not actually indicate that the code is part of a statement,
                 // however, we say they are here so that we may gracefully parse them and error later.
-                case 75 /* CatchKeyword */:
-                case 88 /* FinallyKeyword */:
+                case 76 /* CatchKeyword */:
+                case 89 /* FinallyKeyword */:
                     return true;
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     return isStartOfDeclaration() || lookAhead(nextTokenIsOpenParenOrLessThanOrDot);
-                case 77 /* ConstKeyword */:
-                case 85 /* ExportKeyword */:
+                case 78 /* ConstKeyword */:
+                case 86 /* ExportKeyword */:
                     return isStartOfDeclaration();
-                case 121 /* AsyncKeyword */:
-                case 125 /* DeclareKeyword */:
-                case 110 /* InterfaceKeyword */:
-                case 130 /* ModuleKeyword */:
-                case 131 /* NamespaceKeyword */:
-                case 140 /* TypeKeyword */:
-                case 145 /* GlobalKeyword */:
+                case 122 /* AsyncKeyword */:
+                case 126 /* DeclareKeyword */:
+                case 111 /* InterfaceKeyword */:
+                case 131 /* ModuleKeyword */:
+                case 132 /* NamespaceKeyword */:
+                case 141 /* TypeKeyword */:
+                case 146 /* GlobalKeyword */:
                     // When these don't start a declaration, they're an identifier in an expression statement
                     return true;
-                case 115 /* PublicKeyword */:
-                case 113 /* PrivateKeyword */:
-                case 114 /* ProtectedKeyword */:
-                case 116 /* StaticKeyword */:
-                case 133 /* ReadonlyKeyword */:
+                case 116 /* PublicKeyword */:
+                case 114 /* PrivateKeyword */:
+                case 115 /* ProtectedKeyword */:
+                case 117 /* StaticKeyword */:
+                case 134 /* ReadonlyKeyword */:
                     // When these don't start a declaration, they may be the start of a class member if an identifier
                     // immediately follows. Otherwise they're an identifier in an expression statement.
                     return isStartOfDeclaration() || !lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine);
@@ -21219,63 +21374,63 @@ var ts;
                     return parseEmptyStatement();
                 case 18 /* OpenBraceToken */:
                     return parseBlock(/*ignoreMissingOpenBrace*/ false);
-                case 105 /* VarKeyword */:
-                    return parseVariableStatement(createNodeWithJSDoc(237 /* VariableDeclaration */));
-                case 111 /* LetKeyword */:
+                case 106 /* VarKeyword */:
+                    return parseVariableStatement(createNodeWithJSDoc(238 /* VariableDeclaration */));
+                case 112 /* LetKeyword */:
                     if (isLetDeclaration()) {
-                        return parseVariableStatement(createNodeWithJSDoc(237 /* VariableDeclaration */));
+                        return parseVariableStatement(createNodeWithJSDoc(238 /* VariableDeclaration */));
                     }
                     break;
-                case 90 /* FunctionKeyword */:
-                    return parseFunctionDeclaration(createNodeWithJSDoc(239 /* FunctionDeclaration */));
-                case 76 /* ClassKeyword */:
-                    return parseClassDeclaration(createNodeWithJSDoc(240 /* ClassDeclaration */));
-                case 91 /* IfKeyword */:
+                case 91 /* FunctionKeyword */:
+                    return parseFunctionDeclaration(createNodeWithJSDoc(240 /* FunctionDeclaration */));
+                case 77 /* ClassKeyword */:
+                    return parseClassDeclaration(createNodeWithJSDoc(241 /* ClassDeclaration */));
+                case 92 /* IfKeyword */:
                     return parseIfStatement();
-                case 82 /* DoKeyword */:
+                case 83 /* DoKeyword */:
                     return parseDoStatement();
-                case 107 /* WhileKeyword */:
+                case 108 /* WhileKeyword */:
                     return parseWhileStatement();
-                case 89 /* ForKeyword */:
+                case 90 /* ForKeyword */:
                     return parseForOrForInOrForOfStatement();
-                case 78 /* ContinueKeyword */:
-                    return parseBreakOrContinueStatement(228 /* ContinueStatement */);
-                case 73 /* BreakKeyword */:
-                    return parseBreakOrContinueStatement(229 /* BreakStatement */);
-                case 97 /* ReturnKeyword */:
+                case 79 /* ContinueKeyword */:
+                    return parseBreakOrContinueStatement(229 /* ContinueStatement */);
+                case 74 /* BreakKeyword */:
+                    return parseBreakOrContinueStatement(230 /* BreakStatement */);
+                case 98 /* ReturnKeyword */:
                     return parseReturnStatement();
-                case 108 /* WithKeyword */:
+                case 109 /* WithKeyword */:
                     return parseWithStatement();
-                case 99 /* SwitchKeyword */:
+                case 100 /* SwitchKeyword */:
                     return parseSwitchStatement();
-                case 101 /* ThrowKeyword */:
+                case 102 /* ThrowKeyword */:
                     return parseThrowStatement();
-                case 103 /* TryKeyword */:
+                case 104 /* TryKeyword */:
                 // Include 'catch' and 'finally' for error recovery.
-                case 75 /* CatchKeyword */:
-                case 88 /* FinallyKeyword */:
+                case 76 /* CatchKeyword */:
+                case 89 /* FinallyKeyword */:
                     return parseTryStatement();
-                case 79 /* DebuggerKeyword */:
+                case 80 /* DebuggerKeyword */:
                     return parseDebuggerStatement();
                 case 58 /* AtToken */:
                     return parseDeclaration();
-                case 121 /* AsyncKeyword */:
-                case 110 /* InterfaceKeyword */:
-                case 140 /* TypeKeyword */:
-                case 130 /* ModuleKeyword */:
-                case 131 /* NamespaceKeyword */:
-                case 125 /* DeclareKeyword */:
-                case 77 /* ConstKeyword */:
-                case 84 /* EnumKeyword */:
-                case 85 /* ExportKeyword */:
-                case 92 /* ImportKeyword */:
-                case 113 /* PrivateKeyword */:
-                case 114 /* ProtectedKeyword */:
-                case 115 /* PublicKeyword */:
-                case 118 /* AbstractKeyword */:
-                case 116 /* StaticKeyword */:
-                case 133 /* ReadonlyKeyword */:
-                case 145 /* GlobalKeyword */:
+                case 122 /* AsyncKeyword */:
+                case 111 /* InterfaceKeyword */:
+                case 141 /* TypeKeyword */:
+                case 131 /* ModuleKeyword */:
+                case 132 /* NamespaceKeyword */:
+                case 126 /* DeclareKeyword */:
+                case 78 /* ConstKeyword */:
+                case 85 /* EnumKeyword */:
+                case 86 /* ExportKeyword */:
+                case 93 /* ImportKeyword */:
+                case 114 /* PrivateKeyword */:
+                case 115 /* ProtectedKeyword */:
+                case 116 /* PublicKeyword */:
+                case 119 /* AbstractKeyword */:
+                case 117 /* StaticKeyword */:
+                case 134 /* ReadonlyKeyword */:
+                case 146 /* GlobalKeyword */:
                     if (isStartOfDeclaration()) {
                         return parseDeclaration();
                     }
@@ -21284,7 +21439,7 @@ var ts;
             return parseExpressionOrLabeledStatement();
         }
         function isDeclareModifier(modifier) {
-            return modifier.kind === 125 /* DeclareKeyword */;
+            return modifier.kind === 126 /* DeclareKeyword */;
         }
         function parseDeclaration() {
             var node = createNodeWithJSDoc(0 /* Unknown */);
@@ -21303,33 +21458,33 @@ var ts;
         }
         function parseDeclarationWorker(node) {
             switch (token()) {
-                case 105 /* VarKeyword */:
-                case 111 /* LetKeyword */:
-                case 77 /* ConstKeyword */:
+                case 106 /* VarKeyword */:
+                case 112 /* LetKeyword */:
+                case 78 /* ConstKeyword */:
                     return parseVariableStatement(node);
-                case 90 /* FunctionKeyword */:
+                case 91 /* FunctionKeyword */:
                     return parseFunctionDeclaration(node);
-                case 76 /* ClassKeyword */:
+                case 77 /* ClassKeyword */:
                     return parseClassDeclaration(node);
-                case 110 /* InterfaceKeyword */:
+                case 111 /* InterfaceKeyword */:
                     return parseInterfaceDeclaration(node);
-                case 140 /* TypeKeyword */:
+                case 141 /* TypeKeyword */:
                     return parseTypeAliasDeclaration(node);
-                case 84 /* EnumKeyword */:
+                case 85 /* EnumKeyword */:
                     return parseEnumDeclaration(node);
-                case 145 /* GlobalKeyword */:
-                case 130 /* ModuleKeyword */:
-                case 131 /* NamespaceKeyword */:
+                case 146 /* GlobalKeyword */:
+                case 131 /* ModuleKeyword */:
+                case 132 /* NamespaceKeyword */:
                     return parseModuleDeclaration(node);
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     return parseImportDeclarationOrImportEqualsDeclaration(node);
-                case 85 /* ExportKeyword */:
+                case 86 /* ExportKeyword */:
                     nextToken();
                     switch (token()) {
-                        case 80 /* DefaultKeyword */:
-                        case 59 /* EqualsToken */:
+                        case 81 /* DefaultKeyword */:
+                        case 60 /* EqualsToken */:
                             return parseExportAssignment(node);
-                        case 119 /* AsKeyword */:
+                        case 120 /* AsKeyword */:
                             return parseNamespaceExportDeclaration(node);
                         default:
                             return parseExportDeclaration(node);
@@ -21338,7 +21493,7 @@ var ts;
                     if (node.decorators || node.modifiers) {
                         // We reached this point because we encountered decorators and/or modifiers and assumed a declaration
                         // would follow. For recovery and error reporting purposes, return an incomplete declaration.
-                        var missing = createMissingNode(258 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
+                        var missing = createMissingNode(259 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
                         missing.pos = node.pos;
                         missing.decorators = node.decorators;
                         missing.modifiers = node.modifiers;
@@ -21361,16 +21516,16 @@ var ts;
         // DECLARATIONS
         function parseArrayBindingElement() {
             if (token() === 27 /* CommaToken */) {
-                return createNode(210 /* OmittedExpression */);
+                return createNode(211 /* OmittedExpression */);
             }
-            var node = createNode(186 /* BindingElement */);
+            var node = createNode(187 /* BindingElement */);
             node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */);
             node.name = parseIdentifierOrPattern();
             node.initializer = parseInitializer();
             return finishNode(node);
         }
         function parseObjectBindingElement() {
-            var node = createNode(186 /* BindingElement */);
+            var node = createNode(187 /* BindingElement */);
             node.dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */);
             var tokenIsIdentifier = isIdentifier();
             var propertyName = parsePropertyName();
@@ -21386,14 +21541,14 @@ var ts;
             return finishNode(node);
         }
         function parseObjectBindingPattern() {
-            var node = createNode(184 /* ObjectBindingPattern */);
+            var node = createNode(185 /* ObjectBindingPattern */);
             parseExpected(18 /* OpenBraceToken */);
             node.elements = parseDelimitedList(9 /* ObjectBindingElements */, parseObjectBindingElement);
             parseExpected(19 /* CloseBraceToken */);
             return finishNode(node);
         }
         function parseArrayBindingPattern() {
-            var node = createNode(185 /* ArrayBindingPattern */);
+            var node = createNode(186 /* ArrayBindingPattern */);
             parseExpected(22 /* OpenBracketToken */);
             node.elements = parseDelimitedList(10 /* ArrayBindingElements */, parseArrayBindingElement);
             parseExpected(23 /* CloseBracketToken */);
@@ -21415,9 +21570,9 @@ var ts;
             return parseVariableDeclaration(/*allowExclamation*/ true);
         }
         function parseVariableDeclaration(allowExclamation) {
-            var node = createNode(237 /* VariableDeclaration */);
+            var node = createNode(238 /* VariableDeclaration */);
             node.name = parseIdentifierOrPattern();
-            if (allowExclamation && node.name.kind === 72 /* Identifier */ &&
+            if (allowExclamation && node.name.kind === 73 /* Identifier */ &&
                 token() === 52 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
                 node.exclamationToken = parseTokenNode();
             }
@@ -21428,14 +21583,14 @@ var ts;
             return finishNode(node);
         }
         function parseVariableDeclarationList(inForStatementInitializer) {
-            var node = createNode(238 /* VariableDeclarationList */);
+            var node = createNode(239 /* VariableDeclarationList */);
             switch (token()) {
-                case 105 /* VarKeyword */:
+                case 106 /* VarKeyword */:
                     break;
-                case 111 /* LetKeyword */:
+                case 112 /* LetKeyword */:
                     node.flags |= 1 /* Let */;
                     break;
-                case 77 /* ConstKeyword */:
+                case 78 /* ConstKeyword */:
                     node.flags |= 2 /* Const */;
                     break;
                 default:
@@ -21451,7 +21606,7 @@ var ts;
             // So we need to look ahead to determine if 'of' should be treated as a keyword in
             // this context.
             // The checker will then give an error that there is an empty declaration list.
-            if (token() === 147 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
+            if (token() === 148 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
                 node.declarations = createMissingList();
             }
             else {
@@ -21466,14 +21621,14 @@ var ts;
             return nextTokenIsIdentifier() && nextToken() === 21 /* CloseParenToken */;
         }
         function parseVariableStatement(node) {
-            node.kind = 219 /* VariableStatement */;
+            node.kind = 220 /* VariableStatement */;
             node.declarationList = parseVariableDeclarationList(/*inForStatementInitializer*/ false);
             parseSemicolon();
             return finishNode(node);
         }
         function parseFunctionDeclaration(node) {
-            node.kind = 239 /* FunctionDeclaration */;
-            parseExpected(90 /* FunctionKeyword */);
+            node.kind = 240 /* FunctionDeclaration */;
+            parseExpected(91 /* FunctionKeyword */);
             node.asteriskToken = parseOptionalToken(40 /* AsteriskToken */);
             node.name = ts.hasModifier(node, 512 /* Default */) ? parseOptionalIdentifier() : parseIdentifier();
             var isGenerator = node.asteriskToken ? 1 /* Yield */ : 0 /* None */;
@@ -21483,14 +21638,14 @@ var ts;
             return finishNode(node);
         }
         function parseConstructorDeclaration(node) {
-            node.kind = 157 /* Constructor */;
-            parseExpected(124 /* ConstructorKeyword */);
+            node.kind = 158 /* Constructor */;
+            parseExpected(125 /* ConstructorKeyword */);
             fillSignature(57 /* ColonToken */, 0 /* None */, node);
             node.body = parseFunctionBlockOrSemicolon(0 /* None */, ts.Diagnostics.or_expected);
             return finishNode(node);
         }
         function parseMethodDeclaration(node, asteriskToken, diagnosticMessage) {
-            node.kind = 156 /* MethodDeclaration */;
+            node.kind = 157 /* MethodDeclaration */;
             node.asteriskToken = asteriskToken;
             var isGenerator = asteriskToken ? 1 /* Yield */ : 0 /* None */;
             var isAsync = ts.hasModifier(node, 256 /* Async */) ? 2 /* Await */ : 0 /* None */;
@@ -21499,7 +21654,7 @@ var ts;
             return finishNode(node);
         }
         function parsePropertyDeclaration(node) {
-            node.kind = 154 /* PropertyDeclaration */;
+            node.kind = 155 /* PropertyDeclaration */;
             if (!node.questionToken && token() === 52 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
                 node.exclamationToken = parseTokenNode();
             }
@@ -21572,7 +21727,7 @@ var ts;
             // If we were able to get any potential identifier...
             if (idToken !== undefined) {
                 // If we have a non-keyword identifier, or if we have an accessor, then it's safe to parse.
-                if (!ts.isKeyword(idToken) || idToken === 137 /* SetKeyword */ || idToken === 126 /* GetKeyword */) {
+                if (!ts.isKeyword(idToken) || idToken === 138 /* SetKeyword */ || idToken === 127 /* GetKeyword */) {
                     return true;
                 }
                 // If it *is* a keyword, but not an accessor, check a little farther along
@@ -21582,7 +21737,7 @@ var ts;
                     case 28 /* LessThanToken */: // Generic Method declaration
                     case 52 /* ExclamationToken */: // Non-null assertion on property name
                     case 57 /* ColonToken */: // Type Annotation for declaration
-                    case 59 /* EqualsToken */: // Initializer for declaration
+                    case 60 /* EqualsToken */: // Initializer for declaration
                     case 56 /* QuestionToken */: // Not valid, but permitted so that it gets caught later on.
                         return true;
                     default:
@@ -21604,7 +21759,7 @@ var ts;
                 if (!parseOptional(58 /* AtToken */)) {
                     break;
                 }
-                var decorator = createNode(152 /* Decorator */, decoratorStart);
+                var decorator = createNode(153 /* Decorator */, decoratorStart);
                 decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher);
                 finishNode(decorator);
                 (list || (list = [])).push(decorator);
@@ -21624,7 +21779,7 @@ var ts;
             while (true) {
                 var modifierStart = scanner.getStartPos();
                 var modifierKind = token();
-                if (token() === 77 /* ConstKeyword */ && permitInvalidConstAsModifier) {
+                if (token() === 78 /* ConstKeyword */ && permitInvalidConstAsModifier) {
                     // We need to ensure that any subsequent modifiers appear on the same line
                     // so that when 'const' is a standalone declaration, we don't issue an error.
                     if (!tryParse(nextTokenIsOnSameLineAndCanFollowModifier)) {
@@ -21643,7 +21798,7 @@ var ts;
         }
         function parseModifiersForArrowFunction() {
             var modifiers;
-            if (token() === 121 /* AsyncKeyword */) {
+            if (token() === 122 /* AsyncKeyword */) {
                 var modifierStart = scanner.getStartPos();
                 var modifierKind = token();
                 nextToken();
@@ -21654,20 +21809,20 @@ var ts;
         }
         function parseClassElement() {
             if (token() === 26 /* SemicolonToken */) {
-                var result = createNode(217 /* SemicolonClassElement */);
+                var result = createNode(218 /* SemicolonClassElement */);
                 nextToken();
                 return finishNode(result);
             }
             var node = createNodeWithJSDoc(0 /* Unknown */);
             node.decorators = parseDecorators();
             node.modifiers = parseModifiers(/*permitInvalidConstAsModifier*/ true);
-            if (parseContextualModifier(126 /* GetKeyword */)) {
-                return parseAccessorDeclaration(node, 158 /* GetAccessor */);
+            if (parseContextualModifier(127 /* GetKeyword */)) {
+                return parseAccessorDeclaration(node, 159 /* GetAccessor */);
             }
-            if (parseContextualModifier(137 /* SetKeyword */)) {
-                return parseAccessorDeclaration(node, 159 /* SetAccessor */);
+            if (parseContextualModifier(138 /* SetKeyword */)) {
+                return parseAccessorDeclaration(node, 160 /* SetAccessor */);
             }
-            if (token() === 124 /* ConstructorKeyword */) {
+            if (token() === 125 /* ConstructorKeyword */) {
                 return parseConstructorDeclaration(node);
             }
             if (isIndexSignature()) {
@@ -21684,21 +21839,21 @@ var ts;
             }
             if (node.decorators || node.modifiers) {
                 // treat this as a property declaration with a missing name.
-                node.name = createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
+                node.name = createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
                 return parsePropertyDeclaration(node);
             }
             // 'isClassMemberStart' should have hinted not to attempt parsing.
             return ts.Debug.fail("Should not have attempted to parse class member declaration.");
         }
         function parseClassExpression() {
-            return parseClassDeclarationOrExpression(createNodeWithJSDoc(0 /* Unknown */), 209 /* ClassExpression */);
+            return parseClassDeclarationOrExpression(createNodeWithJSDoc(0 /* Unknown */), 210 /* ClassExpression */);
         }
         function parseClassDeclaration(node) {
-            return parseClassDeclarationOrExpression(node, 240 /* ClassDeclaration */);
+            return parseClassDeclarationOrExpression(node, 241 /* ClassDeclaration */);
         }
         function parseClassDeclarationOrExpression(node, kind) {
             node.kind = kind;
-            parseExpected(76 /* ClassKeyword */);
+            parseExpected(77 /* ClassKeyword */);
             node.name = parseNameOfClassDeclarationOrExpression();
             node.typeParameters = parseTypeParameters();
             node.heritageClauses = parseHeritageClauses();
@@ -21724,7 +21879,7 @@ var ts;
                 : undefined;
         }
         function isImplementsClause() {
-            return token() === 109 /* ImplementsKeyword */ && lookAhead(nextTokenIsIdentifierOrKeyword);
+            return token() === 110 /* ImplementsKeyword */ && lookAhead(nextTokenIsIdentifierOrKeyword);
         }
         function parseHeritageClauses() {
             // ClassTail[Yield,Await] : (Modified) See 14.5
@@ -21736,15 +21891,15 @@ var ts;
         }
         function parseHeritageClause() {
             var tok = token();
-            ts.Debug.assert(tok === 86 /* ExtendsKeyword */ || tok === 109 /* ImplementsKeyword */); // isListElement() should ensure this.
-            var node = createNode(273 /* HeritageClause */);
+            ts.Debug.assert(tok === 87 /* ExtendsKeyword */ || tok === 110 /* ImplementsKeyword */); // isListElement() should ensure this.
+            var node = createNode(274 /* HeritageClause */);
             node.token = tok;
             nextToken();
             node.types = parseDelimitedList(7 /* HeritageClauseElement */, parseExpressionWithTypeArguments);
             return finishNode(node);
         }
         function parseExpressionWithTypeArguments() {
-            var node = createNode(211 /* ExpressionWithTypeArguments */);
+            var node = createNode(212 /* ExpressionWithTypeArguments */);
             node.expression = parseLeftHandSideExpressionOrHigher();
             node.typeArguments = tryParseTypeArguments();
             return finishNode(node);
@@ -21755,14 +21910,14 @@ var ts;
                 : undefined;
         }
         function isHeritageClause() {
-            return token() === 86 /* ExtendsKeyword */ || token() === 109 /* ImplementsKeyword */;
+            return token() === 87 /* ExtendsKeyword */ || token() === 110 /* ImplementsKeyword */;
         }
         function parseClassMembers() {
             return parseList(5 /* ClassMembers */, parseClassElement);
         }
         function parseInterfaceDeclaration(node) {
-            node.kind = 241 /* InterfaceDeclaration */;
-            parseExpected(110 /* InterfaceKeyword */);
+            node.kind = 242 /* InterfaceDeclaration */;
+            parseExpected(111 /* InterfaceKeyword */);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
             node.heritageClauses = parseHeritageClauses();
@@ -21770,11 +21925,11 @@ var ts;
             return finishNode(node);
         }
         function parseTypeAliasDeclaration(node) {
-            node.kind = 242 /* TypeAliasDeclaration */;
-            parseExpected(140 /* TypeKeyword */);
+            node.kind = 243 /* TypeAliasDeclaration */;
+            parseExpected(141 /* TypeKeyword */);
             node.name = parseIdentifier();
             node.typeParameters = parseTypeParameters();
-            parseExpected(59 /* EqualsToken */);
+            parseExpected(60 /* EqualsToken */);
             node.type = parseType();
             parseSemicolon();
             return finishNode(node);
@@ -21784,14 +21939,14 @@ var ts;
         // ConstantEnumMemberSection, which starts at the beginning of an enum declaration
         // or any time an integer literal initializer is encountered.
         function parseEnumMember() {
-            var node = createNodeWithJSDoc(278 /* EnumMember */);
+            var node = createNodeWithJSDoc(279 /* EnumMember */);
             node.name = parsePropertyName();
             node.initializer = allowInAnd(parseInitializer);
             return finishNode(node);
         }
         function parseEnumDeclaration(node) {
-            node.kind = 243 /* EnumDeclaration */;
-            parseExpected(84 /* EnumKeyword */);
+            node.kind = 244 /* EnumDeclaration */;
+            parseExpected(85 /* EnumKeyword */);
             node.name = parseIdentifier();
             if (parseExpected(18 /* OpenBraceToken */)) {
                 node.members = parseDelimitedList(6 /* EnumMembers */, parseEnumMember);
@@ -21803,7 +21958,7 @@ var ts;
             return finishNode(node);
         }
         function parseModuleBlock() {
-            var node = createNode(245 /* ModuleBlock */);
+            var node = createNode(246 /* ModuleBlock */);
             if (parseExpected(18 /* OpenBraceToken */)) {
                 node.statements = parseList(1 /* BlockStatements */, parseStatement);
                 parseExpected(19 /* CloseBraceToken */);
@@ -21814,7 +21969,7 @@ var ts;
             return finishNode(node);
         }
         function parseModuleOrNamespaceDeclaration(node, flags) {
-            node.kind = 244 /* ModuleDeclaration */;
+            node.kind = 245 /* ModuleDeclaration */;
             // If we are parsing a dotted namespace name, we want to
             // propagate the 'Namespace' flag across the names if set.
             var namespaceFlag = flags & 16 /* Namespace */;
@@ -21826,8 +21981,8 @@ var ts;
             return finishNode(node);
         }
         function parseAmbientExternalModuleDeclaration(node) {
-            node.kind = 244 /* ModuleDeclaration */;
-            if (token() === 145 /* GlobalKeyword */) {
+            node.kind = 245 /* ModuleDeclaration */;
+            if (token() === 146 /* GlobalKeyword */) {
                 // parse 'global' as name of global scope augmentation
                 node.name = parseIdentifier();
                 node.flags |= 512 /* GlobalAugmentation */;
@@ -21846,15 +22001,15 @@ var ts;
         }
         function parseModuleDeclaration(node) {
             var flags = 0;
-            if (token() === 145 /* GlobalKeyword */) {
+            if (token() === 146 /* GlobalKeyword */) {
                 // global augmentation
                 return parseAmbientExternalModuleDeclaration(node);
             }
-            else if (parseOptional(131 /* NamespaceKeyword */)) {
+            else if (parseOptional(132 /* NamespaceKeyword */)) {
                 flags |= 16 /* Namespace */;
             }
             else {
-                parseExpected(130 /* ModuleKeyword */);
+                parseExpected(131 /* ModuleKeyword */);
                 if (token() === 10 /* StringLiteral */) {
                     return parseAmbientExternalModuleDeclaration(node);
                 }
@@ -21862,7 +22017,7 @@ var ts;
             return parseModuleOrNamespaceDeclaration(node, flags);
         }
         function isExternalModuleReference() {
-            return token() === 134 /* RequireKeyword */ &&
+            return token() === 135 /* RequireKeyword */ &&
                 lookAhead(nextTokenIsOpenParen);
         }
         function nextTokenIsOpenParen() {
@@ -21872,25 +22027,25 @@ var ts;
             return nextToken() === 42 /* SlashToken */;
         }
         function parseNamespaceExportDeclaration(node) {
-            node.kind = 247 /* NamespaceExportDeclaration */;
-            parseExpected(119 /* AsKeyword */);
-            parseExpected(131 /* NamespaceKeyword */);
+            node.kind = 248 /* NamespaceExportDeclaration */;
+            parseExpected(120 /* AsKeyword */);
+            parseExpected(132 /* NamespaceKeyword */);
             node.name = parseIdentifier();
             parseSemicolon();
             return finishNode(node);
         }
         function parseImportDeclarationOrImportEqualsDeclaration(node) {
-            parseExpected(92 /* ImportKeyword */);
+            parseExpected(93 /* ImportKeyword */);
             var afterImportPos = scanner.getStartPos();
             var identifier;
             if (isIdentifier()) {
                 identifier = parseIdentifier();
-                if (token() !== 27 /* CommaToken */ && token() !== 144 /* FromKeyword */) {
+                if (token() !== 27 /* CommaToken */ && token() !== 145 /* FromKeyword */) {
                     return parseImportEqualsDeclaration(node, identifier);
                 }
             }
             // Import statement
-            node.kind = 249 /* ImportDeclaration */;
+            node.kind = 250 /* ImportDeclaration */;
             // ImportDeclaration:
             //  import ImportClause from ModuleSpecifier ;
             //  import ModuleSpecifier;
@@ -21898,16 +22053,16 @@ var ts;
                 token() === 40 /* AsteriskToken */ || // import *
                 token() === 18 /* OpenBraceToken */) { // import {
                 node.importClause = parseImportClause(identifier, afterImportPos);
-                parseExpected(144 /* FromKeyword */);
+                parseExpected(145 /* FromKeyword */);
             }
             node.moduleSpecifier = parseModuleSpecifier();
             parseSemicolon();
             return finishNode(node);
         }
         function parseImportEqualsDeclaration(node, identifier) {
-            node.kind = 248 /* ImportEqualsDeclaration */;
+            node.kind = 249 /* ImportEqualsDeclaration */;
             node.name = identifier;
-            parseExpected(59 /* EqualsToken */);
+            parseExpected(60 /* EqualsToken */);
             node.moduleReference = parseModuleReference();
             parseSemicolon();
             return finishNode(node);
@@ -21919,7 +22074,7 @@ var ts;
             //  NamedImports
             //  ImportedDefaultBinding, NameSpaceImport
             //  ImportedDefaultBinding, NamedImports
-            var importClause = createNode(250 /* ImportClause */, fullStart);
+            var importClause = createNode(251 /* ImportClause */, fullStart);
             if (identifier) {
                 // ImportedDefaultBinding:
                 //  ImportedBinding
@@ -21929,7 +22084,7 @@ var ts;
             // parse namespace or named imports
             if (!importClause.name ||
                 parseOptional(27 /* CommaToken */)) {
-                importClause.namedBindings = token() === 40 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(252 /* NamedImports */);
+                importClause.namedBindings = token() === 40 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(253 /* NamedImports */);
             }
             return finishNode(importClause);
         }
@@ -21939,8 +22094,8 @@ var ts;
                 : parseEntityName(/*allowReservedWords*/ false);
         }
         function parseExternalModuleReference() {
-            var node = createNode(259 /* ExternalModuleReference */);
-            parseExpected(134 /* RequireKeyword */);
+            var node = createNode(260 /* ExternalModuleReference */);
+            parseExpected(135 /* RequireKeyword */);
             parseExpected(20 /* OpenParenToken */);
             node.expression = parseModuleSpecifier();
             parseExpected(21 /* CloseParenToken */);
@@ -21962,9 +22117,9 @@ var ts;
         function parseNamespaceImport() {
             // NameSpaceImport:
             //  * as ImportedBinding
-            var namespaceImport = createNode(251 /* NamespaceImport */);
+            var namespaceImport = createNode(252 /* NamespaceImport */);
             parseExpected(40 /* AsteriskToken */);
-            parseExpected(119 /* AsKeyword */);
+            parseExpected(120 /* AsKeyword */);
             namespaceImport.name = parseIdentifier();
             return finishNode(namespaceImport);
         }
@@ -21977,14 +22132,14 @@ var ts;
             // ImportsList:
             //  ImportSpecifier
             //  ImportsList, ImportSpecifier
-            node.elements = parseBracketedList(23 /* ImportOrExportSpecifiers */, kind === 252 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 18 /* OpenBraceToken */, 19 /* CloseBraceToken */);
+            node.elements = parseBracketedList(23 /* ImportOrExportSpecifiers */, kind === 253 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 18 /* OpenBraceToken */, 19 /* CloseBraceToken */);
             return finishNode(node);
         }
         function parseExportSpecifier() {
-            return parseImportOrExportSpecifier(257 /* ExportSpecifier */);
+            return parseImportOrExportSpecifier(258 /* ExportSpecifier */);
         }
         function parseImportSpecifier() {
-            return parseImportOrExportSpecifier(253 /* ImportSpecifier */);
+            return parseImportOrExportSpecifier(254 /* ImportSpecifier */);
         }
         function parseImportOrExportSpecifier(kind) {
             var node = createNode(kind);
@@ -21998,9 +22153,9 @@ var ts;
             var checkIdentifierStart = scanner.getTokenPos();
             var checkIdentifierEnd = scanner.getTextPos();
             var identifierName = parseIdentifierName();
-            if (token() === 119 /* AsKeyword */) {
+            if (token() === 120 /* AsKeyword */) {
                 node.propertyName = identifierName;
-                parseExpected(119 /* AsKeyword */);
+                parseExpected(120 /* AsKeyword */);
                 checkIdentifierIsKeyword = ts.isKeyword(token()) && !isIdentifier();
                 checkIdentifierStart = scanner.getTokenPos();
                 checkIdentifierEnd = scanner.getTextPos();
@@ -22009,24 +22164,24 @@ var ts;
             else {
                 node.name = identifierName;
             }
-            if (kind === 253 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
+            if (kind === 254 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
                 parseErrorAt(checkIdentifierStart, checkIdentifierEnd, ts.Diagnostics.Identifier_expected);
             }
             return finishNode(node);
         }
         function parseExportDeclaration(node) {
-            node.kind = 255 /* ExportDeclaration */;
+            node.kind = 256 /* ExportDeclaration */;
             if (parseOptional(40 /* AsteriskToken */)) {
-                parseExpected(144 /* FromKeyword */);
+                parseExpected(145 /* FromKeyword */);
                 node.moduleSpecifier = parseModuleSpecifier();
             }
             else {
-                node.exportClause = parseNamedImportsOrExports(256 /* NamedExports */);
+                node.exportClause = parseNamedImportsOrExports(257 /* NamedExports */);
                 // It is not uncommon to accidentally omit the 'from' keyword. Additionally, in editing scenarios,
                 // the 'from' keyword can be parsed as a named export when the export clause is unterminated (i.e. `export { from "moduleName";`)
                 // If we don't have a 'from' keyword, see if we have a string literal such that ASI won't take effect.
-                if (token() === 144 /* FromKeyword */ || (token() === 10 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) {
-                    parseExpected(144 /* FromKeyword */);
+                if (token() === 145 /* FromKeyword */ || (token() === 10 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) {
+                    parseExpected(145 /* FromKeyword */);
                     node.moduleSpecifier = parseModuleSpecifier();
                 }
             }
@@ -22034,12 +22189,12 @@ var ts;
             return finishNode(node);
         }
         function parseExportAssignment(node) {
-            node.kind = 254 /* ExportAssignment */;
-            if (parseOptional(59 /* EqualsToken */)) {
+            node.kind = 255 /* ExportAssignment */;
+            if (parseOptional(60 /* EqualsToken */)) {
                 node.isExportEquals = true;
             }
             else {
-                parseExpected(80 /* DefaultKeyword */);
+                parseExpected(81 /* DefaultKeyword */);
             }
             node.expression = parseAssignmentExpressionOrHigher();
             parseSemicolon();
@@ -22054,10 +22209,10 @@ var ts;
         }
         function isAnExternalModuleIndicatorNode(node) {
             return ts.hasModifier(node, 1 /* Export */)
-                || node.kind === 248 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 259 /* ExternalModuleReference */
-                || node.kind === 249 /* ImportDeclaration */
-                || node.kind === 254 /* ExportAssignment */
-                || node.kind === 255 /* ExportDeclaration */
+                || node.kind === 249 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 260 /* ExternalModuleReference */
+                || node.kind === 250 /* ImportDeclaration */
+                || node.kind === 255 /* ExportAssignment */
+                || node.kind === 256 /* ExportDeclaration */
                 ? node
                 : undefined;
         }
@@ -22070,7 +22225,7 @@ var ts;
             return isImportMeta(node) ? node : forEachChild(node, walkTreeForExternalModuleIndicators);
         }
         function isImportMeta(node) {
-            return ts.isMetaProperty(node) && node.keywordToken === 92 /* ImportKeyword */ && node.name.escapedText === "meta";
+            return ts.isMetaProperty(node) && node.keywordToken === 93 /* ImportKeyword */ && node.name.escapedText === "meta";
         }
         var ParsingContext;
         (function (ParsingContext) {
@@ -22109,8 +22264,8 @@ var ts;
         var JSDocParser;
         (function (JSDocParser) {
             function parseJSDocTypeExpressionForTests(content, start, length) {
-                initializeState(content, 7 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
-                sourceFile = createSourceFile("file.js", 7 /* Latest */, 1 /* JS */, /*isDeclarationFile*/ false);
+                initializeState(content, 8 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
+                sourceFile = createSourceFile("file.js", 8 /* Latest */, 1 /* JS */, /*isDeclarationFile*/ false);
                 scanner.setText(content, start, length);
                 currentToken = scanner.scan();
                 var jsDocTypeExpression = parseJSDocTypeExpression();
@@ -22121,18 +22276,18 @@ var ts;
             JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
             // Parses out a JSDoc type expression.
             function parseJSDocTypeExpression(mayOmitBraces) {
-                var result = createNode(288 /* JSDocTypeExpression */);
+                var result = createNode(289 /* JSDocTypeExpression */);
                 var hasBrace = (mayOmitBraces ? parseOptional : parseExpected)(18 /* OpenBraceToken */);
                 result.type = doInsideOfContext(2097152 /* JSDoc */, parseJSDocType);
                 if (!mayOmitBraces || hasBrace) {
-                    parseExpected(19 /* CloseBraceToken */);
+                    parseExpectedJSDoc(19 /* CloseBraceToken */);
                 }
                 fixupParentReferences(result);
                 return finishNode(result);
             }
             JSDocParser.parseJSDocTypeExpression = parseJSDocTypeExpression;
             function parseIsolatedJSDocComment(content, start, length) {
-                initializeState(content, 7 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
+                initializeState(content, 8 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
                 sourceFile = { languageVariant: 0 /* Standard */, text: content }; // tslint:disable-line no-object-literal-type-assertion
                 var jsDoc = parseJSDocCommentWorker(start, length);
                 var diagnostics = parseDiagnostics;
@@ -22204,7 +22359,7 @@ var ts;
                         comments.push(text);
                         indent += text.length;
                     }
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     while (parseOptionalJsdoc(5 /* WhitespaceTrivia */))
                         ;
                     if (parseOptionalJsdoc(4 /* NewLineTrivia */)) {
@@ -22222,7 +22377,6 @@ var ts;
                                     // for malformed examples like `/** @param {string} x @returns {number} the length */`
                                     state = 0 /* BeginningOfLine */;
                                     margin = undefined;
-                                    indent++;
                                 }
                                 else {
                                     pushComment(scanner.getTokenText());
@@ -22267,7 +22421,7 @@ var ts;
                                 pushComment(scanner.getTokenText());
                                 break;
                         }
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                     }
                     removeLeadingNewlines(comments);
                     removeTrailingWhitespace(comments);
@@ -22284,7 +22438,7 @@ var ts;
                     }
                 }
                 function createJSDocComment() {
-                    var result = createNode(296 /* JSDocComment */, start);
+                    var result = createNode(297 /* JSDocComment */, start);
                     result.tags = tags && createNodeArray(tags, tagsPos, tagsEnd);
                     result.comment = comments.length ? comments.join("") : undefined;
                     return finishNode(result, end);
@@ -22292,7 +22446,7 @@ var ts;
                 function isNextNonwhitespaceTokenEndOfFile() {
                     // We must use infinite lookahead, as there could be any number of newlines :(
                     while (true) {
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                         if (token() === 1 /* EndOfFileToken */) {
                             return true;
                         }
@@ -22308,32 +22462,38 @@ var ts;
                         }
                     }
                     while (token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                     }
                 }
                 function skipWhitespaceOrAsterisk() {
                     if (token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
                         if (lookAhead(isNextNonwhitespaceTokenEndOfFile)) {
-                            return; // Don't skip whitespace prior to EoF (or end of comment) - that shouldn't be included in any node's range
+                            return ""; // Don't skip whitespace prior to EoF (or end of comment) - that shouldn't be included in any node's range
                         }
                     }
                     var precedingLineBreak = scanner.hasPrecedingLineBreak();
+                    var seenLineBreak = false;
+                    var indentText = "";
                     while ((precedingLineBreak && token() === 40 /* AsteriskToken */) || token() === 5 /* WhitespaceTrivia */ || token() === 4 /* NewLineTrivia */) {
+                        indentText += scanner.getTokenText();
                         if (token() === 4 /* NewLineTrivia */) {
                             precedingLineBreak = true;
+                            seenLineBreak = true;
+                            indentText = "";
                         }
                         else if (token() === 40 /* AsteriskToken */) {
                             precedingLineBreak = false;
                         }
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                     }
+                    return seenLineBreak ? indentText : "";
                 }
-                function parseTag(indent) {
+                function parseTag(margin) {
                     ts.Debug.assert(token() === 58 /* AtToken */);
                     var start = scanner.getTokenPos();
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     var tagName = parseJSDocIdentifierName(/*message*/ undefined);
-                    skipWhitespaceOrAsterisk();
+                    var indentText = skipWhitespaceOrAsterisk();
                     var tag;
                     switch (tagName.escapedText) {
                         case "augments":
@@ -22353,7 +22513,7 @@ var ts;
                         case "arg":
                         case "argument":
                         case "param":
-                            return parseParameterOrPropertyTag(start, tagName, 2 /* Parameter */, indent);
+                            return parseParameterOrPropertyTag(start, tagName, 2 /* Parameter */, margin);
                         case "return":
                         case "returns":
                             tag = parseReturnTag(start, tagName);
@@ -22365,10 +22525,10 @@ var ts;
                             tag = parseTypeTag(start, tagName);
                             break;
                         case "typedef":
-                            tag = parseTypedefTag(start, tagName, indent);
+                            tag = parseTypedefTag(start, tagName, margin);
                             break;
                         case "callback":
-                            tag = parseCallbackTag(start, tagName, indent);
+                            tag = parseCallbackTag(start, tagName, margin);
                             break;
                         default:
                             tag = parseUnknownTag(start, tagName);
@@ -22376,11 +22536,14 @@ var ts;
                     }
                     if (!tag.comment) {
                         // some tags, like typedef and callback, have already parsed their comments earlier
-                        tag.comment = parseTagComments(indent + tag.end - tag.pos);
+                        if (!indentText) {
+                            margin += tag.end - tag.pos;
+                        }
+                        tag.comment = parseTagComments(margin, indentText.slice(margin));
                     }
                     return tag;
                 }
-                function parseTagComments(indent) {
+                function parseTagComments(indent, initialMargin) {
                     var comments = [];
                     var state = 0 /* BeginningOfLine */;
                     var margin;
@@ -22391,6 +22554,11 @@ var ts;
                         comments.push(text);
                         indent += text.length;
                     }
+                    if (initialMargin) {
+                        // jump straight to saving comments if there is some initial indentation
+                        pushComment(initialMargin);
+                        state = 2 /* SavingComments */;
+                    }
                     var tok = token();
                     loop: while (true) {
                         switch (tok) {
@@ -22415,18 +22583,18 @@ var ts;
                                     var whitespace = scanner.getTokenText();
                                     // if the whitespace crosses the margin, take only the whitespace that passes the margin
                                     if (margin !== undefined && indent + whitespace.length > margin) {
-                                        comments.push(whitespace.slice(margin - indent - 1));
+                                        comments.push(whitespace.slice(margin - indent));
                                     }
                                     indent += whitespace.length;
                                 }
                                 break;
                             case 18 /* OpenBraceToken */:
                                 state = 2 /* SavingComments */;
-                                if (lookAhead(function () { return nextJSDocToken() === 58 /* AtToken */ && ts.tokenIsIdentifierOrKeyword(nextJSDocToken()) && scanner.getTokenText() === "link"; })) {
+                                if (lookAhead(function () { return nextTokenJSDoc() === 58 /* AtToken */ && ts.tokenIsIdentifierOrKeyword(nextTokenJSDoc()) && scanner.getTokenText() === "link"; })) {
                                     pushComment(scanner.getTokenText());
-                                    nextJSDocToken();
+                                    nextTokenJSDoc();
                                     pushComment(scanner.getTokenText());
-                                    nextJSDocToken();
+                                    nextTokenJSDoc();
                                 }
                                 pushComment(scanner.getTokenText());
                                 break;
@@ -22444,14 +22612,14 @@ var ts;
                                 pushComment(scanner.getTokenText());
                                 break;
                         }
-                        tok = nextJSDocToken();
+                        tok = nextTokenJSDoc();
                     }
                     removeLeadingNewlines(comments);
                     removeTrailingWhitespace(comments);
                     return comments.length === 0 ? undefined : comments.join("");
                 }
                 function parseUnknownTag(start, tagName) {
-                    var result = createNode(299 /* JSDocTag */, start);
+                    var result = createNode(300 /* JSDocTag */, start);
                     result.tagName = tagName;
                     return finishNode(result);
                 }
@@ -22473,17 +22641,21 @@ var ts;
                     return token() === 18 /* OpenBraceToken */ ? parseJSDocTypeExpression() : undefined;
                 }
                 function parseBracketNameInPropertyAndParamTag() {
-                    if (token() === 14 /* NoSubstitutionTemplateLiteral */) {
-                        // a markdown-quoted name: `arg` is not legal jsdoc, but occurs in the wild
-                        return { name: createIdentifier(/*isIdentifier*/ true), isBracketed: false };
-                    }
                     // Looking for something like '[foo]', 'foo', '[foo.bar]' or 'foo.bar'
-                    var isBracketed = parseOptional(22 /* OpenBracketToken */);
+                    var isBracketed = parseOptionalJsdoc(22 /* OpenBracketToken */);
+                    if (isBracketed) {
+                        skipWhitespace();
+                    }
+                    // a markdown-quoted name: `arg` is not legal jsdoc, but occurs in the wild
+                    var isBackquoted = parseOptionalJsdoc(59 /* BacktickToken */);
                     var name = parseJSDocEntityName();
+                    if (isBackquoted) {
+                        parseExpectedTokenJSDoc(59 /* BacktickToken */);
+                    }
                     if (isBracketed) {
                         skipWhitespace();
                         // May have an optional default, e.g. '[foo = 42]'
-                        if (parseOptionalToken(59 /* EqualsToken */)) {
+                        if (parseOptionalToken(60 /* EqualsToken */)) {
                             parseExpression();
                         }
                         parseExpected(23 /* CloseBracketToken */);
@@ -22492,9 +22664,9 @@ var ts;
                 }
                 function isObjectOrObjectArrayTypeReference(node) {
                     switch (node.kind) {
-                        case 136 /* ObjectKeyword */:
+                        case 137 /* ObjectKeyword */:
                             return true;
-                        case 169 /* ArrayType */:
+                        case 170 /* ArrayType */:
                             return isObjectOrObjectArrayTypeReference(node.elementType);
                         default:
                             return ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName) && node.typeName.escapedText === "Object";
@@ -22510,8 +22682,8 @@ var ts;
                         typeExpression = tryParseTypeExpression();
                     }
                     var result = target === 1 /* Property */ ?
-                        createNode(310 /* JSDocPropertyTag */, start) :
-                        createNode(304 /* JSDocParameterTag */, start);
+                        createNode(311 /* JSDocPropertyTag */, start) :
+                        createNode(305 /* JSDocParameterTag */, start);
                     var comment = parseTagComments(indent + scanner.getStartPos() - start);
                     var nestedTypeLiteral = target !== 4 /* CallbackParameter */ && parseNestedTypeLiteral(typeExpression, name, target, indent);
                     if (nestedTypeLiteral) {
@@ -22528,20 +22700,20 @@ var ts;
                 }
                 function parseNestedTypeLiteral(typeExpression, name, target, indent) {
                     if (typeExpression && isObjectOrObjectArrayTypeReference(typeExpression.type)) {
-                        var typeLiteralExpression = createNode(288 /* JSDocTypeExpression */, scanner.getTokenPos());
+                        var typeLiteralExpression = createNode(289 /* JSDocTypeExpression */, scanner.getTokenPos());
                         var child = void 0;
                         var jsdocTypeLiteral = void 0;
                         var start_2 = scanner.getStartPos();
                         var children = void 0;
                         while (child = tryParse(function () { return parseChildParameterOrPropertyTag(target, indent, name); })) {
-                            if (child.kind === 304 /* JSDocParameterTag */ || child.kind === 310 /* JSDocPropertyTag */) {
+                            if (child.kind === 305 /* JSDocParameterTag */ || child.kind === 311 /* JSDocPropertyTag */) {
                                 children = ts.append(children, child);
                             }
                         }
                         if (children) {
-                            jsdocTypeLiteral = createNode(297 /* JSDocTypeLiteral */, start_2);
+                            jsdocTypeLiteral = createNode(298 /* JSDocTypeLiteral */, start_2);
                             jsdocTypeLiteral.jsDocPropertyTags = children;
-                            if (typeExpression.type.kind === 169 /* ArrayType */) {
+                            if (typeExpression.type.kind === 170 /* ArrayType */) {
                                 jsdocTypeLiteral.isArrayType = true;
                             }
                             typeLiteralExpression.type = finishNode(jsdocTypeLiteral);
@@ -22550,32 +22722,32 @@ var ts;
                     }
                 }
                 function parseReturnTag(start, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 305 /* JSDocReturnTag */; })) {
+                    if (ts.some(tags, ts.isJSDocReturnTag)) {
                         parseErrorAt(tagName.pos, scanner.getTokenPos(), ts.Diagnostics._0_tag_already_specified, tagName.escapedText);
                     }
-                    var result = createNode(305 /* JSDocReturnTag */, start);
+                    var result = createNode(306 /* JSDocReturnTag */, start);
                     result.tagName = tagName;
                     result.typeExpression = tryParseTypeExpression();
                     return finishNode(result);
                 }
                 function parseTypeTag(start, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 307 /* JSDocTypeTag */; })) {
+                    if (ts.some(tags, ts.isJSDocTypeTag)) {
                         parseErrorAt(tagName.pos, scanner.getTokenPos(), ts.Diagnostics._0_tag_already_specified, tagName.escapedText);
                     }
-                    var result = createNode(307 /* JSDocTypeTag */, start);
+                    var result = createNode(308 /* JSDocTypeTag */, start);
                     result.tagName = tagName;
                     result.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
                     return finishNode(result);
                 }
                 function parseAugmentsTag(start, tagName) {
-                    var result = createNode(300 /* JSDocAugmentsTag */, start);
+                    var result = createNode(301 /* JSDocAugmentsTag */, start);
                     result.tagName = tagName;
                     result.class = parseExpressionWithTypeArgumentsForAugments();
                     return finishNode(result);
                 }
                 function parseExpressionWithTypeArgumentsForAugments() {
                     var usedBrace = parseOptional(18 /* OpenBraceToken */);
-                    var node = createNode(211 /* ExpressionWithTypeArguments */);
+                    var node = createNode(212 /* ExpressionWithTypeArguments */);
                     node.expression = parsePropertyAccessEntityNameExpression();
                     node.typeArguments = tryParseTypeArguments();
                     var res = finishNode(node);
@@ -22587,7 +22759,7 @@ var ts;
                 function parsePropertyAccessEntityNameExpression() {
                     var node = parseJSDocIdentifierName();
                     while (parseOptional(24 /* DotToken */)) {
-                        var prop = createNode(189 /* PropertyAccessExpression */, node.pos);
+                        var prop = createNode(190 /* PropertyAccessExpression */, node.pos);
                         prop.expression = node;
                         prop.name = parseJSDocIdentifierName();
                         node = finishNode(prop);
@@ -22595,19 +22767,19 @@ var ts;
                     return node;
                 }
                 function parseClassTag(start, tagName) {
-                    var tag = createNode(301 /* JSDocClassTag */, start);
+                    var tag = createNode(302 /* JSDocClassTag */, start);
                     tag.tagName = tagName;
                     return finishNode(tag);
                 }
                 function parseThisTag(start, tagName) {
-                    var tag = createNode(306 /* JSDocThisTag */, start);
+                    var tag = createNode(307 /* JSDocThisTag */, start);
                     tag.tagName = tagName;
                     tag.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
                     skipWhitespace();
                     return finishNode(tag);
                 }
                 function parseEnumTag(start, tagName) {
-                    var tag = createNode(303 /* JSDocEnumTag */, start);
+                    var tag = createNode(304 /* JSDocEnumTag */, start);
                     tag.tagName = tagName;
                     tag.typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
                     skipWhitespace();
@@ -22616,7 +22788,7 @@ var ts;
                 function parseTypedefTag(start, tagName, indent) {
                     var typeExpression = tryParseTypeExpression();
                     skipWhitespaceOrAsterisk();
-                    var typedefTag = createNode(309 /* JSDocTypedefTag */, start);
+                    var typedefTag = createNode(310 /* JSDocTypedefTag */, start);
                     typedefTag.tagName = tagName;
                     typedefTag.fullName = parseJSDocTypeNameWithNamespace();
                     typedefTag.name = getJSDocTypeAliasName(typedefTag.fullName);
@@ -22630,9 +22802,9 @@ var ts;
                         var childTypeTag = void 0;
                         while (child = tryParse(function () { return parseChildPropertyTag(indent); })) {
                             if (!jsdocTypeLiteral) {
-                                jsdocTypeLiteral = createNode(297 /* JSDocTypeLiteral */, start);
+                                jsdocTypeLiteral = createNode(298 /* JSDocTypeLiteral */, start);
                             }
-                            if (child.kind === 307 /* JSDocTypeTag */) {
+                            if (child.kind === 308 /* JSDocTypeTag */) {
                                 if (childTypeTag) {
                                     break;
                                 }
@@ -22645,7 +22817,7 @@ var ts;
                             }
                         }
                         if (jsdocTypeLiteral) {
-                            if (typeExpression && typeExpression.type.kind === 169 /* ArrayType */) {
+                            if (typeExpression && typeExpression.type.kind === 170 /* ArrayType */) {
                                 jsdocTypeLiteral.isArrayType = true;
                             }
                             typedefTag.typeExpression = childTypeTag && childTypeTag.typeExpression && !isObjectOrObjectArrayTypeReference(childTypeTag.typeExpression.type) ?
@@ -22664,7 +22836,7 @@ var ts;
                     }
                     var typeNameOrNamespaceName = parseJSDocIdentifierName();
                     if (parseOptional(24 /* DotToken */)) {
-                        var jsDocNamespaceNode = createNode(244 /* ModuleDeclaration */, pos);
+                        var jsDocNamespaceNode = createNode(245 /* ModuleDeclaration */, pos);
                         if (nested) {
                             jsDocNamespaceNode.flags |= 4 /* NestedNamespace */;
                         }
@@ -22678,14 +22850,14 @@ var ts;
                     return typeNameOrNamespaceName;
                 }
                 function parseCallbackTag(start, tagName, indent) {
-                    var callbackTag = createNode(302 /* JSDocCallbackTag */, start);
+                    var callbackTag = createNode(303 /* JSDocCallbackTag */, start);
                     callbackTag.tagName = tagName;
                     callbackTag.fullName = parseJSDocTypeNameWithNamespace();
                     callbackTag.name = getJSDocTypeAliasName(callbackTag.fullName);
                     skipWhitespace();
                     callbackTag.comment = parseTagComments(indent);
                     var child;
-                    var jsdocSignature = createNode(298 /* JSDocSignature */, start);
+                    var jsdocSignature = createNode(299 /* JSDocSignature */, start);
                     jsdocSignature.parameters = [];
                     while (child = tryParse(function () { return parseChildParameterOrPropertyTag(4 /* CallbackParameter */, indent); })) {
                         jsdocSignature.parameters = ts.append(jsdocSignature.parameters, child);
@@ -22693,7 +22865,7 @@ var ts;
                     var returnTag = tryParse(function () {
                         if (parseOptionalJsdoc(58 /* AtToken */)) {
                             var tag = parseTag(indent);
-                            if (tag && tag.kind === 305 /* JSDocReturnTag */) {
+                            if (tag && tag.kind === 306 /* JSDocReturnTag */) {
                                 return tag;
                             }
                         }
@@ -22734,11 +22906,11 @@ var ts;
                     var canParseTag = true;
                     var seenAsterisk = false;
                     while (true) {
-                        switch (nextJSDocToken()) {
+                        switch (nextTokenJSDoc()) {
                             case 58 /* AtToken */:
                                 if (canParseTag) {
                                     var child = tryParseChildTag(target, indent);
-                                    if (child && (child.kind === 304 /* JSDocParameterTag */ || child.kind === 310 /* JSDocPropertyTag */) &&
+                                    if (child && (child.kind === 305 /* JSDocParameterTag */ || child.kind === 311 /* JSDocPropertyTag */) &&
                                         target !== 4 /* CallbackParameter */ &&
                                         name && (ts.isIdentifier(child.name) || !escapedTextsEqual(name, child.name.left))) {
                                         return false;
@@ -22757,7 +22929,7 @@ var ts;
                                 }
                                 seenAsterisk = true;
                                 break;
-                            case 72 /* Identifier */:
+                            case 73 /* Identifier */:
                                 canParseTag = false;
                                 break;
                             case 1 /* EndOfFileToken */:
@@ -22768,7 +22940,7 @@ var ts;
                 function tryParseChildTag(target, indent) {
                     ts.Debug.assert(token() === 58 /* AtToken */);
                     var start = scanner.getStartPos();
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     var tagName = parseJSDocIdentifierName();
                     skipWhitespace();
                     var t;
@@ -22802,25 +22974,22 @@ var ts;
                     var typeParametersPos = getNodePos();
                     do {
                         skipWhitespace();
-                        var typeParameter = createNode(150 /* TypeParameter */);
+                        var typeParameter = createNode(151 /* TypeParameter */);
                         typeParameter.name = parseJSDocIdentifierName(ts.Diagnostics.Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces);
                         finishNode(typeParameter);
                         skipWhitespace();
                         typeParameters.push(typeParameter);
                     } while (parseOptionalJsdoc(27 /* CommaToken */));
-                    var result = createNode(308 /* JSDocTemplateTag */, start);
+                    var result = createNode(309 /* JSDocTemplateTag */, start);
                     result.tagName = tagName;
                     result.constraint = constraint;
                     result.typeParameters = createNodeArray(typeParameters, typeParametersPos);
                     finishNode(result);
                     return result;
                 }
-                function nextJSDocToken() {
-                    return currentToken = scanner.scanJSDocToken();
-                }
                 function parseOptionalJsdoc(t) {
                     if (token() === t) {
-                        nextJSDocToken();
+                        nextTokenJSDoc();
                         return true;
                     }
                     return false;
@@ -22844,14 +23013,14 @@ var ts;
                 }
                 function parseJSDocIdentifierName(message) {
                     if (!ts.tokenIsIdentifierOrKeyword(token())) {
-                        return createMissingNode(72 /* Identifier */, /*reportAtCurrentPosition*/ !message, message || ts.Diagnostics.Identifier_expected);
+                        return createMissingNode(73 /* Identifier */, /*reportAtCurrentPosition*/ !message, message || ts.Diagnostics.Identifier_expected);
                     }
                     var pos = scanner.getTokenPos();
                     var end = scanner.getTextPos();
-                    var result = createNode(72 /* Identifier */, pos);
+                    var result = createNode(73 /* Identifier */, pos);
                     result.escapedText = ts.escapeLeadingUnderscores(scanner.getTokenText());
                     finishNode(result, end);
-                    nextJSDocToken();
+                    nextTokenJSDoc();
                     return result;
                 }
             }
@@ -22976,7 +23145,7 @@ var ts;
             switch (node.kind) {
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return true;
             }
             return false;
@@ -23343,28 +23512,16 @@ var ts;
     ts.isDeclarationFileName = isDeclarationFileName;
     /*@internal*/
     function processCommentPragmas(context, sourceText) {
-        var triviaScanner = ts.createScanner(context.languageVersion, /*skipTrivia*/ false, 0 /* Standard */, sourceText);
         var pragmas = [];
-        // Keep scanning all the leading trivia in the file until we get to something that
-        // isn't trivia.  Any single line comment will be analyzed to see if it is a
-        // reference comment.
-        while (true) {
-            var kind = triviaScanner.scan();
-            if (!ts.isTrivia(kind)) {
-                break;
-            }
-            var range = {
-                kind: triviaScanner.getToken(),
-                pos: triviaScanner.getTokenPos(),
-                end: triviaScanner.getTextPos(),
-            };
+        for (var _i = 0, _a = ts.getLeadingCommentRanges(sourceText, 0) || ts.emptyArray; _i < _a.length; _i++) {
+            var range = _a[_i];
             var comment = sourceText.substring(range.pos, range.end);
             extractPragmas(pragmas, range, comment);
         }
         context.pragmas = ts.createMap();
-        for (var _i = 0, pragmas_1 = pragmas; _i < pragmas_1.length; _i++) {
-            var pragma = pragmas_1[_i];
-            if (context.pragmas.has(pragma.name)) { // TODO: GH#18217
+        for (var _b = 0, pragmas_1 = pragmas; _b < pragmas_1.length; _b++) {
+            var pragma = pragmas_1[_b];
+            if (context.pragmas.has(pragma.name)) {
                 var currentValue = context.pragmas.get(pragma.name);
                 if (currentValue instanceof Array) {
                     currentValue.push(pragma.args);
@@ -23395,7 +23552,6 @@ var ts;
                     var typeReferenceDirectives_1 = context.typeReferenceDirectives;
                     var libReferenceDirectives_1 = context.libReferenceDirectives;
                     ts.forEach(ts.toArray(entryOrList), function (arg) {
-                        // TODO: GH#18217
                         var _a = arg.arguments, types = _a.types, lib = _a.lib, path = _a.path;
                         if (arg.arguments["no-default-lib"]) {
                             context.hasNoDefaultLib = true;
@@ -23416,7 +23572,7 @@ var ts;
                     break;
                 }
                 case "amd-dependency": {
-                    context.amdDependencies = ts.map(ts.toArray(entryOrList), function (x) { return ({ name: x.arguments.name, path: x.arguments.path }); }); // TODO: GH#18217
+                    context.amdDependencies = ts.map(ts.toArray(entryOrList), function (x) { return ({ name: x.arguments.name, path: x.arguments.path }); });
                     break;
                 }
                 case "amd-module": {
@@ -23439,7 +23595,7 @@ var ts;
                 case "ts-check": {
                     // _last_ of either nocheck or check in a file is the "winner"
                     ts.forEach(ts.toArray(entryOrList), function (entry) {
-                        if (!context.checkJsDirective || entry.range.pos > context.checkJsDirective.pos) { // TODO: GH#18217
+                        if (!context.checkJsDirective || entry.range.pos > context.checkJsDirective.pos) {
                             context.checkJsDirective = {
                                 enabled: key === "ts-check",
                                 end: entry.range.end,
@@ -23555,10 +23711,10 @@ var ts;
         if (lhs.kind !== rhs.kind) {
             return false;
         }
-        if (lhs.kind === 72 /* Identifier */) {
+        if (lhs.kind === 73 /* Identifier */) {
             return lhs.escapedText === rhs.escapedText;
         }
-        if (lhs.kind === 100 /* ThisKeyword */) {
+        if (lhs.kind === 101 /* ThisKeyword */) {
             return true;
         }
         // If we are at this statement then we must have PropertyAccessExpression and because tag name in Jsx element can only
@@ -23587,6 +23743,7 @@ var ts;
         ["es2017", "lib.es2017.d.ts"],
         ["es2018", "lib.es2018.d.ts"],
         ["es2019", "lib.es2019.d.ts"],
+        ["es2020", "lib.es2020.d.ts"],
         ["esnext", "lib.esnext.d.ts"],
         // Host only
         ["dom", "lib.dom.d.ts"],
@@ -23615,8 +23772,11 @@ var ts;
         ["es2018.promise", "lib.es2018.promise.d.ts"],
         ["es2018.regexp", "lib.es2018.regexp.d.ts"],
         ["es2019.array", "lib.es2019.array.d.ts"],
+        ["es2019.object", "lib.es2019.object.d.ts"],
         ["es2019.string", "lib.es2019.string.d.ts"],
         ["es2019.symbol", "lib.es2019.symbol.d.ts"],
+        ["es2020.string", "lib.es2020.string.d.ts"],
+        ["es2020.symbol.wellknown", "lib.es2020.symbol.wellknown.d.ts"],
         ["esnext.array", "lib.es2019.array.d.ts"],
         ["esnext.symbol", "lib.es2019.symbol.d.ts"],
         ["esnext.asynciterable", "lib.es2018.asynciterable.d.ts"],
@@ -23703,6 +23863,13 @@ var ts;
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Show_verbose_diagnostic_information
         },
+        {
+            name: "incremental",
+            shortName: "i",
+            type: "boolean",
+            category: ts.Diagnostics.Basic_Options,
+            description: ts.Diagnostics.Enable_incremental_compilation,
+        },
     ];
     /* @internal */
     ts.optionDeclarations = ts.commonOptionsWithBuild.concat([
@@ -23766,10 +23933,12 @@ var ts;
                 es2017: 4 /* ES2017 */,
                 es2018: 5 /* ES2018 */,
                 es2019: 6 /* ES2019 */,
-                esnext: 7 /* ESNext */,
+                es2020: 7 /* ES2020 */,
+                esnext: 8 /* ESNext */,
             }),
             affectsSourceFile: true,
             affectsModuleResolution: true,
+            affectsEmit: true,
             paramType: ts.Diagnostics.VERSION,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
@@ -23837,6 +24006,7 @@ var ts;
             name: "declaration",
             shortName: "d",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Generates_corresponding_d_ts_file,
@@ -23844,6 +24014,7 @@ var ts;
         {
             name: "declarationMap",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Generates_a_sourcemap_for_each_corresponding_d_ts_file,
@@ -23851,12 +24022,14 @@ var ts;
         {
             name: "emitDeclarationOnly",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Only_emit_d_ts_declaration_files,
         },
         {
             name: "sourceMap",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Generates_corresponding_map_file,
@@ -23864,6 +24037,7 @@ var ts;
         {
             name: "outFile",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.FILE,
             showInSimplifiedHelpView: true,
@@ -23873,6 +24047,7 @@ var ts;
         {
             name: "outDir",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.DIRECTORY,
             showInSimplifiedHelpView: true,
@@ -23882,6 +24057,7 @@ var ts;
         {
             name: "rootDir",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Basic_Options,
@@ -23890,29 +24066,24 @@ var ts;
         {
             name: "composite",
             type: "boolean",
+            affectsEmit: true,
             isTSConfigOnly: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Enable_project_compilation,
         },
-        {
-            name: "incremental",
-            type: "boolean",
-            isTSConfigOnly: true,
-            category: ts.Diagnostics.Basic_Options,
-            description: ts.Diagnostics.Enable_incremental_compilation,
-        },
         {
             name: "tsBuildInfoFile",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.FILE,
-            isTSConfigOnly: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Specify_file_to_store_incremental_compilation_information,
         },
         {
             name: "removeComments",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Do_not_emit_comments_to_output,
@@ -23920,6 +24091,7 @@ var ts;
         {
             name: "noEmit",
             type: "boolean",
+            affectsEmit: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Do_not_emit_outputs,
@@ -23927,12 +24099,14 @@ var ts;
         {
             name: "importHelpers",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Import_emit_helpers_from_tslib
         },
         {
             name: "downlevelIteration",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Basic_Options,
             description: ts.Diagnostics.Provide_full_support_for_iterables_in_for_of_spread_and_destructuring_when_targeting_ES5_or_ES3
         },
@@ -24136,10 +24310,18 @@ var ts;
             category: ts.Diagnostics.Module_Resolution_Options,
             description: ts.Diagnostics.Do_not_resolve_the_real_path_of_symlinks,
         },
+        {
+            name: "allowUmdGlobalAccess",
+            type: "boolean",
+            affectsSemanticDiagnostics: true,
+            category: ts.Diagnostics.Module_Resolution_Options,
+            description: ts.Diagnostics.Allow_accessing_UMD_globals_from_modules,
+        },
         // Source Maps
         {
             name: "sourceRoot",
             type: "string",
+            affectsEmit: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations,
@@ -24147,6 +24329,7 @@ var ts;
         {
             name: "mapRoot",
             type: "string",
+            affectsEmit: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations,
@@ -24154,12 +24337,14 @@ var ts;
         {
             name: "inlineSourceMap",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Emit_a_single_file_with_source_maps_instead_of_having_a_separate_file
         },
         {
             name: "inlineSources",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Source_Map_Options,
             description: ts.Diagnostics.Emit_the_source_alongside_the_sourcemaps_within_a_single_file_requires_inlineSourceMap_or_sourceMap_to_be_set
         },
@@ -24192,6 +24377,7 @@ var ts;
         {
             name: "out",
             type: "string",
+            affectsEmit: true,
             isFilePath: false,
             // for correct behaviour, please use outFile
             category: ts.Diagnostics.Advanced_Options,
@@ -24201,6 +24387,7 @@ var ts;
         {
             name: "reactNamespace",
             type: "string",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Deprecated_Use_jsxFactory_instead_Specify_the_object_invoked_for_createElement_when_targeting_react_JSX_emit
         },
@@ -24219,6 +24406,7 @@ var ts;
         {
             name: "emitBOM",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Emit_a_UTF_8_Byte_Order_Mark_BOM_in_the_beginning_of_output_files
         },
@@ -24234,6 +24422,7 @@ var ts;
                 crlf: 0 /* CarriageReturnLineFeed */,
                 lf: 1 /* LineFeed */
             }),
+            affectsEmit: true,
             paramType: ts.Diagnostics.NEWLINE,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix,
@@ -24261,6 +24450,7 @@ var ts;
         {
             name: "stripInternal",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_emit_declarations_for_code_that_has_an_internal_annotation,
         },
@@ -24281,24 +24471,28 @@ var ts;
         {
             name: "noEmitHelpers",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_generate_custom_helper_functions_like_extends_in_compiled_output
         },
         {
             name: "noEmitOnError",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_emit_outputs_if_any_errors_were_reported,
         },
         {
             name: "preserveConstEnums",
             type: "boolean",
+            affectsEmit: true,
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Do_not_erase_const_enum_declarations_in_generated_code
         },
         {
             name: "declarationDir",
             type: "string",
+            affectsEmit: true,
             isFilePath: true,
             paramType: ts.Diagnostics.DIRECTORY,
             category: ts.Diagnostics.Advanced_Options,
@@ -24381,6 +24575,8 @@ var ts;
     /* @internal */
     ts.semanticDiagnosticsOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsSemanticDiagnostics; });
     /* @internal */
+    ts.affectsEmitOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsEmit; });
+    /* @internal */
     ts.moduleResolutionOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsModuleResolution; });
     /* @internal */
     ts.sourceFileAffectingCompilerOptions = ts.optionDeclarations.filter(function (option) {
@@ -24788,7 +24984,7 @@ var ts;
     /**
      * Reads the config file, reports errors if any and exits if the config file cannot be found
      */
-    function getParsedCommandLineOfConfigFile(configFileName, optionsToExtend, host) {
+    function getParsedCommandLineOfConfigFile(configFileName, optionsToExtend, host, extendedConfigCache) {
         var configFileText;
         try {
             configFileText = host.readFile(configFileName);
@@ -24808,7 +25004,9 @@ var ts;
         result.path = ts.toPath(configFileName, cwd, ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames));
         result.resolvedPath = result.path;
         result.originalFileName = result.fileName;
-        return parseJsonSourceFileConfigFileContent(result, host, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), cwd), optionsToExtend, ts.getNormalizedAbsolutePath(configFileName, cwd));
+        return parseJsonSourceFileConfigFileContent(result, host, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), cwd), optionsToExtend, ts.getNormalizedAbsolutePath(configFileName, cwd), 
+        /*resolutionStack*/ undefined, 
+        /*extraFileExtension*/ undefined, extendedConfigCache);
     }
     ts.getParsedCommandLineOfConfigFile = getParsedCommandLineOfConfigFile;
     /**
@@ -24947,7 +25145,7 @@ var ts;
             var result = returnValue ? {} : undefined;
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var element = _a[_i];
-                if (element.kind !== 275 /* PropertyAssignment */) {
+                if (element.kind !== 276 /* PropertyAssignment */) {
                     errors.push(ts.createDiagnosticForNodeInSourceFile(sourceFile, element, ts.Diagnostics.Property_assignment_expected));
                     continue;
                 }
@@ -25003,13 +25201,13 @@ var ts;
         }
         function convertPropertyValueToJson(valueExpression, option) {
             switch (valueExpression.kind) {
-                case 102 /* TrueKeyword */:
+                case 103 /* TrueKeyword */:
                     reportInvalidOptionValue(option && option.type !== "boolean");
                     return true;
-                case 87 /* FalseKeyword */:
+                case 88 /* FalseKeyword */:
                     reportInvalidOptionValue(option && option.type !== "boolean");
                     return false;
-                case 96 /* NullKeyword */:
+                case 97 /* NullKeyword */:
                     reportInvalidOptionValue(option && option.name === "extends"); // "extends" is the only option we don't allow null/undefined for
                     return null; // tslint:disable-line:no-null-keyword
                 case 10 /* StringLiteral */:
@@ -25029,13 +25227,13 @@ var ts;
                 case 8 /* NumericLiteral */:
                     reportInvalidOptionValue(option && option.type !== "number");
                     return Number(valueExpression.text);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     if (valueExpression.operator !== 39 /* MinusToken */ || valueExpression.operand.kind !== 8 /* NumericLiteral */) {
                         break; // not valid JSON syntax
                     }
                     reportInvalidOptionValue(option && option.type !== "number");
                     return -Number(valueExpression.operand.text);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     reportInvalidOptionValue(option && option.type !== "object");
                     var objectLiteralExpression = valueExpression;
                     // Currently having element option declaration in the tsconfig with type "object"
@@ -25052,7 +25250,7 @@ var ts;
                         return convertObjectLiteralExpressionToJson(objectLiteralExpression, /* knownOptions*/ undefined, 
                         /*extraKeyDiagnosticMessage */ undefined, /*parentOption*/ undefined);
                     }
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     reportInvalidOptionValue(option && option.type !== "list");
                     return convertArrayLiteralExpressionToJson(valueExpression.elements, option && option.element);
             }
@@ -25308,8 +25506,8 @@ var ts;
      * @param basePath A root directory to resolve relative path entries in the config
      *    file to. e.g. outDir
      */
-    function parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
-        return parseJsonConfigFileContentWorker(json, /*sourceFile*/ undefined, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions);
+    function parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache) {
+        return parseJsonConfigFileContentWorker(json, /*sourceFile*/ undefined, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache);
     }
     ts.parseJsonConfigFileContent = parseJsonConfigFileContent;
     /**
@@ -25319,8 +25517,8 @@ var ts;
      * @param basePath A root directory to resolve relative path entries in the config
      *    file to. e.g. outDir
      */
-    function parseJsonSourceFileConfigFileContent(sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
-        return parseJsonConfigFileContentWorker(/*json*/ undefined, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions);
+    function parseJsonSourceFileConfigFileContent(sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache) {
+        return parseJsonConfigFileContentWorker(/*json*/ undefined, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache);
     }
     ts.parseJsonSourceFileConfigFileContent = parseJsonSourceFileConfigFileContent;
     /*@internal*/
@@ -25348,13 +25546,13 @@ var ts;
      *    file to. e.g. outDir
      * @param resolutionStack Only present for backwards-compatibility. Should be empty.
      */
-    function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions) {
+    function parseJsonConfigFileContentWorker(json, sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache) {
         if (existingOptions === void 0) { existingOptions = {}; }
         if (resolutionStack === void 0) { resolutionStack = []; }
         if (extraFileExtensions === void 0) { extraFileExtensions = []; }
         ts.Debug.assert((json === undefined && sourceFile !== undefined) || (json !== undefined && sourceFile === undefined));
         var errors = [];
-        var parsedConfig = parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors);
+        var parsedConfig = parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors, extendedConfigCache);
         var raw = parsedConfig.raw;
         var options = ts.extend(existingOptions, parsedConfig.options || {});
         options.configFilePath = configFileName && ts.normalizeSlashes(configFileName);
@@ -25494,7 +25692,7 @@ var ts;
      * This *just* extracts options/include/exclude/files out of a config file.
      * It does *not* resolve the included files.
      */
-    function parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors) {
+    function parseConfig(json, sourceFile, host, basePath, configFileName, resolutionStack, errors, extendedConfigCache) {
         basePath = ts.normalizeSlashes(basePath);
         var resolvedPath = ts.getNormalizedAbsolutePath(configFileName || "", basePath);
         if (resolutionStack.indexOf(resolvedPath) >= 0) {
@@ -25507,7 +25705,7 @@ var ts;
         if (ownConfig.extendedConfigPath) {
             // copy the resolution stack so it is never reused between branches in potential diamond-problem scenarios.
             resolutionStack = resolutionStack.concat([resolvedPath]);
-            var extendedConfig = getExtendedConfig(sourceFile, ownConfig.extendedConfigPath, host, basePath, resolutionStack, errors);
+            var extendedConfig = getExtendedConfig(sourceFile, ownConfig.extendedConfigPath, host, basePath, resolutionStack, errors, extendedConfigCache);
             if (extendedConfig && isSuccessfulParsedTsconfig(extendedConfig)) {
                 var baseRaw_1 = extendedConfig.raw;
                 var raw_1 = ownConfig.raw;
@@ -25604,7 +25802,7 @@ var ts;
             if (!host.fileExists(extendedConfigPath) && !ts.endsWith(extendedConfigPath, ".json" /* Json */)) {
                 extendedConfigPath = extendedConfigPath + ".json";
                 if (!host.fileExists(extendedConfigPath)) {
-                    errors.push(createDiagnostic(ts.Diagnostics.File_0_does_not_exist, extendedConfig));
+                    errors.push(createDiagnostic(ts.Diagnostics.File_0_not_found, extendedConfig));
                     return undefined;
                 }
             }
@@ -25615,38 +25813,52 @@ var ts;
         if (resolved.resolvedModule) {
             return resolved.resolvedModule.resolvedFileName;
         }
-        errors.push(createDiagnostic(ts.Diagnostics.File_0_does_not_exist, extendedConfig));
+        errors.push(createDiagnostic(ts.Diagnostics.File_0_not_found, extendedConfig));
         return undefined;
     }
-    function getExtendedConfig(sourceFile, extendedConfigPath, host, basePath, resolutionStack, errors) {
+    function getExtendedConfig(sourceFile, extendedConfigPath, host, basePath, resolutionStack, errors, extendedConfigCache) {
         var _a;
-        var extendedResult = readJsonConfigFile(extendedConfigPath, function (path) { return host.readFile(path); });
+        var path = host.useCaseSensitiveFileNames ? extendedConfigPath : ts.toLowerCase(extendedConfigPath);
+        var value;
+        var extendedResult;
+        var extendedConfig;
+        if (extendedConfigCache && (value = extendedConfigCache.get(path))) {
+            (extendedResult = value.extendedResult, extendedConfig = value.extendedConfig);
+        }
+        else {
+            extendedResult = readJsonConfigFile(extendedConfigPath, function (path) { return host.readFile(path); });
+            if (!extendedResult.parseDiagnostics.length) {
+                var extendedDirname = ts.getDirectoryPath(extendedConfigPath);
+                extendedConfig = parseConfig(/*json*/ undefined, extendedResult, host, extendedDirname, ts.getBaseFileName(extendedConfigPath), resolutionStack, errors, extendedConfigCache);
+                if (isSuccessfulParsedTsconfig(extendedConfig)) {
+                    // Update the paths to reflect base path
+                    var relativeDifference_1 = ts.convertToRelativePath(extendedDirname, basePath, ts.identity);
+                    var updatePath_1 = function (path) { return ts.isRootedDiskPath(path) ? path : ts.combinePaths(relativeDifference_1, path); };
+                    var mapPropertiesInRawIfNotUndefined = function (propertyName) {
+                        if (raw_2[propertyName]) {
+                            raw_2[propertyName] = ts.map(raw_2[propertyName], updatePath_1);
+                        }
+                    };
+                    var raw_2 = extendedConfig.raw;
+                    mapPropertiesInRawIfNotUndefined("include");
+                    mapPropertiesInRawIfNotUndefined("exclude");
+                    mapPropertiesInRawIfNotUndefined("files");
+                }
+            }
+            if (extendedConfigCache) {
+                extendedConfigCache.set(path, { extendedResult: extendedResult, extendedConfig: extendedConfig });
+            }
+        }
         if (sourceFile) {
             sourceFile.extendedSourceFiles = [extendedResult.fileName];
+            if (extendedResult.extendedSourceFiles) {
+                (_a = sourceFile.extendedSourceFiles).push.apply(_a, extendedResult.extendedSourceFiles);
+            }
         }
         if (extendedResult.parseDiagnostics.length) {
             errors.push.apply(errors, extendedResult.parseDiagnostics);
             return undefined;
         }
-        var extendedDirname = ts.getDirectoryPath(extendedConfigPath);
-        var extendedConfig = parseConfig(/*json*/ undefined, extendedResult, host, extendedDirname, ts.getBaseFileName(extendedConfigPath), resolutionStack, errors);
-        if (sourceFile && extendedResult.extendedSourceFiles) {
-            (_a = sourceFile.extendedSourceFiles).push.apply(_a, extendedResult.extendedSourceFiles);
-        }
-        if (isSuccessfulParsedTsconfig(extendedConfig)) {
-            // Update the paths to reflect base path
-            var relativeDifference_1 = ts.convertToRelativePath(extendedDirname, basePath, ts.identity);
-            var updatePath_1 = function (path) { return ts.isRootedDiskPath(path) ? path : ts.combinePaths(relativeDifference_1, path); };
-            var mapPropertiesInRawIfNotUndefined = function (propertyName) {
-                if (raw_2[propertyName]) {
-                    raw_2[propertyName] = ts.map(raw_2[propertyName], updatePath_1);
-                }
-            };
-            var raw_2 = extendedConfig.raw;
-            mapPropertiesInRawIfNotUndefined("include");
-            mapPropertiesInRawIfNotUndefined("exclude");
-            mapPropertiesInRawIfNotUndefined("files");
-        }
         return extendedConfig;
     }
     function convertCompileOnSaveOptionFromJson(jsonOption, basePath, errors) {
@@ -26116,11 +26328,22 @@ var ts;
         return !!compilerOptions.traceResolution && host.trace !== undefined;
     }
     ts.isTraceEnabled = isTraceEnabled;
-    function withPackageId(packageId, r) {
+    function withPackageId(packageInfo, r) {
+        var packageId;
+        if (r && packageInfo) {
+            var packageJsonContent = packageInfo.packageJsonContent;
+            if (typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string") {
+                packageId = {
+                    name: packageJsonContent.name,
+                    subModuleName: r.path.slice(packageInfo.packageDirectory.length + ts.directorySeparator.length),
+                    version: packageJsonContent.version
+                };
+            }
+        }
         return r && { path: r.path, extension: r.ext, packageId: packageId };
     }
     function noPackageId(r) {
-        return withPackageId(/*packageId*/ undefined, r);
+        return withPackageId(/*packageInfo*/ undefined, r);
     }
     function removeIgnoredPackageId(r) {
         if (r) {
@@ -26172,8 +26395,15 @@ var ts;
     }
     function readPackageJsonPathField(jsonContent, fieldName, baseDirectory, state) {
         var fileName = readPackageJsonField(jsonContent, fieldName, "string", state);
-        if (fileName === undefined)
+        if (fileName === undefined) {
+            return;
+        }
+        if (!fileName) {
+            if (state.traceEnabled) {
+                trace(state.host, ts.Diagnostics.package_json_had_a_falsy_0_field, fieldName);
+            }
             return;
+        }
         var path = ts.normalizePath(ts.combinePaths(baseDirectory, fileName));
         if (state.traceEnabled) {
             trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, fileName, path);
@@ -26326,7 +26556,12 @@ var ts;
             var fileName = resolved.fileName, packageId = resolved.packageId;
             var resolvedFileName = options.preserveSymlinks ? fileName : realPath(fileName, host, traceEnabled);
             if (traceEnabled) {
-                trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFileName, primary);
+                if (packageId) {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3, typeReferenceDirectiveName, resolvedFileName, ts.packageIdToString(packageId), primary);
+                }
+                else {
+                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFileName, primary);
+                }
             }
             resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolvedFileName, packageId: packageId, isExternalLibraryImport: pathContainsNodeModules(fileName) };
         }
@@ -26428,20 +26663,28 @@ var ts;
         return result;
     }
     ts.getAutomaticTypeDirectiveNames = getAutomaticTypeDirectiveNames;
-    function createModuleResolutionCache(currentDirectory, getCanonicalFileName) {
-        return createModuleResolutionCacheWithMaps(createCacheWithRedirects(), createCacheWithRedirects(), currentDirectory, getCanonicalFileName);
+    function createModuleResolutionCache(currentDirectory, getCanonicalFileName, options) {
+        return createModuleResolutionCacheWithMaps(createCacheWithRedirects(options), createCacheWithRedirects(options), currentDirectory, getCanonicalFileName);
     }
     ts.createModuleResolutionCache = createModuleResolutionCache;
     /*@internal*/
-    function createCacheWithRedirects() {
+    function createCacheWithRedirects(options) {
         var ownMap = ts.createMap();
         var redirectsMap = ts.createMap();
         return {
             ownMap: ownMap,
             redirectsMap: redirectsMap,
             getOrCreateMapOfCacheRedirects: getOrCreateMapOfCacheRedirects,
-            clear: clear
+            clear: clear,
+            setOwnOptions: setOwnOptions,
+            setOwnMap: setOwnMap
         };
+        function setOwnOptions(newOptions) {
+            options = newOptions;
+        }
+        function setOwnMap(newOwnMap) {
+            ownMap = newOwnMap;
+        }
         function getOrCreateMapOfCacheRedirects(redirectedReference) {
             if (!redirectedReference) {
                 return ownMap;
@@ -26449,7 +26692,8 @@ var ts;
             var path = redirectedReference.sourceFile.path;
             var redirects = redirectsMap.get(path);
             if (!redirects) {
-                redirects = ts.createMap();
+                // Reuse map if redirected reference map uses same resolution
+                redirects = !options || ts.optionsHaveModuleResolutionChanges(options, redirectedReference.commandLine.options) ? ts.createMap() : ownMap;
                 redirectsMap.set(path, redirects);
             }
             return redirects;
@@ -26462,7 +26706,7 @@ var ts;
     ts.createCacheWithRedirects = createCacheWithRedirects;
     /*@internal*/
     function createModuleResolutionCacheWithMaps(directoryToModuleNameMap, moduleNameToDirectoryMap, currentDirectory, getCanonicalFileName) {
-        return { getOrCreateCacheForDirectory: getOrCreateCacheForDirectory, getOrCreateCacheForModuleName: getOrCreateCacheForModuleName };
+        return { getOrCreateCacheForDirectory: getOrCreateCacheForDirectory, getOrCreateCacheForModuleName: getOrCreateCacheForModuleName, directoryToModuleNameMap: directoryToModuleNameMap, moduleNameToDirectoryMap: moduleNameToDirectoryMap };
         function getOrCreateCacheForDirectory(directoryName, redirectedReference) {
             var path = ts.toPath(directoryName, currentDirectory, getCanonicalFileName);
             return getOrCreateCache(directoryToModuleNameMap, redirectedReference, path, ts.createMap);
@@ -26605,7 +26849,12 @@ var ts;
         }
         if (traceEnabled) {
             if (result.resolvedModule) {
-                trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName);
+                if (result.resolvedModule.packageId) {
+                    trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1_with_Package_ID_2, moduleName, result.resolvedModule.resolvedFileName, ts.packageIdToString(result.resolvedModule.packageId));
+                }
+                else {
+                    trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName);
+                }
             }
             else {
                 trace(host, ts.Diagnostics.Module_name_0_was_not_resolved, moduleName);
@@ -26875,10 +27124,9 @@ var ts;
             }
             var resolvedFromFile = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state);
             if (resolvedFromFile) {
-                var nm = considerPackageJson ? parseNodeModuleFromPath(resolvedFromFile) : undefined;
-                var packageInfo = nm && getPackageJsonInfo(nm.packageDirectory, nm.subModuleName, /*onlyRecordFailures*/ false, state);
-                var packageId = packageInfo && packageInfo.packageId;
-                return withPackageId(packageId, resolvedFromFile);
+                var packageDirectory = considerPackageJson ? parseNodeModuleFromPath(resolvedFromFile) : undefined;
+                var packageInfo = packageDirectory ? getPackageJsonInfo(packageDirectory, /*onlyRecordFailures*/ false, state) : undefined;
+                return withPackageId(packageInfo, resolvedFromFile);
             }
         }
         if (!onlyRecordFailures) {
@@ -26904,11 +27152,10 @@ var ts;
      * (Not neeeded for `loadModuleFromNodeModules` as that looks up the `package.json` as part of resolution.)
      *
      * packageDirectory is the directory of the package itself.
-     * subModuleName is the path within the package.
-     *   For `blah/node_modules/foo/index.d.ts` this is { packageDirectory: "foo", subModuleName: "index.d.ts" }. (Part before "/node_modules/" is ignored.)
-     *   For `/node_modules/foo/bar.d.ts` this is { packageDirectory: "foo", subModuleName": "bar/index.d.ts" }.
-     *   For `/node_modules/@types/foo/bar/index.d.ts` this is { packageDirectory: "@types/foo", subModuleName: "bar/index.d.ts" }.
-     *   For `/node_modules/foo/bar/index.d.ts` this is { packageDirectory: "foo", subModuleName": "bar/index.d.ts" }.
+     *   For `blah/node_modules/foo/index.d.ts` this is packageDirectory: "foo"
+     *   For `/node_modules/foo/bar.d.ts` this is packageDirectory: "foo"
+     *   For `/node_modules/@types/foo/bar/index.d.ts` this is packageDirectory: "@types/foo"
+     *   For `/node_modules/foo/bar/index.d.ts` this is packageDirectory: "foo"
      */
     function parseNodeModuleFromPath(resolved) {
         var path = ts.normalizePath(resolved.path);
@@ -26921,26 +27168,12 @@ var ts;
         if (path.charCodeAt(indexAfterNodeModules) === 64 /* at */) {
             indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterPackageName);
         }
-        var packageDirectory = path.slice(0, indexAfterPackageName);
-        var subModuleName = ts.removeExtension(path.slice(indexAfterPackageName + 1), resolved.ext) + ".d.ts" /* Dts */;
-        return { packageDirectory: packageDirectory, subModuleName: subModuleName };
+        return path.slice(0, indexAfterPackageName);
     }
     function moveToNextDirectorySeparatorIfAvailable(path, prevSeparatorIndex) {
         var nextSeparatorIndex = path.indexOf(ts.directorySeparator, prevSeparatorIndex + 1);
         return nextSeparatorIndex === -1 ? prevSeparatorIndex : nextSeparatorIndex;
     }
-    function addExtensionAndIndex(path) {
-        if (path === "") {
-            return "index.d.ts";
-        }
-        if (ts.endsWith(path, ".d.ts")) {
-            return path;
-        }
-        if (path === "index" || ts.endsWith(path, "/index")) {
-            return path + ".d.ts";
-        }
-        return path + "/index.d.ts";
-    }
     function loadModuleFromFileNoPackageId(extensions, candidate, onlyRecordFailures, state) {
         return noPackageId(loadModuleFromFile(extensions, candidate, onlyRecordFailures, state));
     }
@@ -27014,52 +27247,22 @@ var ts;
     }
     function loadNodeModuleFromDirectory(extensions, candidate, onlyRecordFailures, state, considerPackageJson) {
         if (considerPackageJson === void 0) { considerPackageJson = true; }
-        var packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, "", onlyRecordFailures, state) : undefined;
-        var packageId = packageInfo && packageInfo.packageId;
+        var packageInfo = considerPackageJson ? getPackageJsonInfo(candidate, onlyRecordFailures, state) : undefined;
         var packageJsonContent = packageInfo && packageInfo.packageJsonContent;
-        var versionPaths = packageJsonContent && readPackageJsonTypesVersionPaths(packageJsonContent, state);
-        return withPackageId(packageId, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
+        var versionPaths = packageInfo && packageInfo.versionPaths;
+        return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
     }
-    function getPackageJsonInfo(packageDirectory, subModuleName, onlyRecordFailures, state) {
+    function getPackageJsonInfo(packageDirectory, onlyRecordFailures, state) {
         var host = state.host, traceEnabled = state.traceEnabled;
         var directoryExists = !onlyRecordFailures && ts.directoryProbablyExists(packageDirectory, host);
         var packageJsonPath = ts.combinePaths(packageDirectory, "package.json");
         if (directoryExists && host.fileExists(packageJsonPath)) {
             var packageJsonContent = ts.readJson(packageJsonPath, host);
-            if (subModuleName === "") { // looking up the root - need to handle types/typings/main redirects for subModuleName
-                var path = readPackageJsonTypesFields(packageJsonContent, packageDirectory, state);
-                if (typeof path === "string") {
-                    subModuleName = addExtensionAndIndex(path.substring(packageDirectory.length + 1));
-                }
-                else {
-                    var jsPath = readPackageJsonMainField(packageJsonContent, packageDirectory, state);
-                    if (typeof jsPath === "string" && jsPath.length > packageDirectory.length) {
-                        var potentialSubModule_1 = jsPath.substring(packageDirectory.length + 1);
-                        subModuleName = (ts.forEach(ts.supportedJSExtensions, function (extension) {
-                            return ts.tryRemoveExtension(potentialSubModule_1, extension);
-                        }) || potentialSubModule_1) + ".d.ts" /* Dts */;
-                    }
-                    else {
-                        subModuleName = "index.d.ts";
-                    }
-                }
-            }
-            if (!ts.endsWith(subModuleName, ".d.ts" /* Dts */)) {
-                subModuleName = addExtensionAndIndex(subModuleName);
-            }
-            var versionPaths = readPackageJsonTypesVersionPaths(packageJsonContent, state);
-            var packageId = typeof packageJsonContent.name === "string" && typeof packageJsonContent.version === "string"
-                ? { name: packageJsonContent.name, subModuleName: subModuleName, version: packageJsonContent.version }
-                : undefined;
             if (traceEnabled) {
-                if (packageId) {
-                    trace(host, ts.Diagnostics.Found_package_json_at_0_Package_ID_is_1, packageJsonPath, ts.packageIdToString(packageId));
-                }
-                else {
-                    trace(host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
-                }
+                trace(host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
             }
-            return { packageJsonContent: packageJsonContent, packageId: packageId, versionPaths: versionPaths };
+            var versionPaths = readPackageJsonTypesVersionPaths(packageJsonContent, state);
+            return { packageDirectory: packageDirectory, packageJsonContent: packageJsonContent, versionPaths: versionPaths };
         }
         else {
             if (directoryExists && traceEnabled) {
@@ -27198,37 +27401,31 @@ var ts;
     function loadModuleFromSpecificNodeModulesDirectory(extensions, moduleName, nodeModulesDirectory, nodeModulesDirectoryExists, state) {
         var candidate = ts.normalizePath(ts.combinePaths(nodeModulesDirectory, moduleName));
         // First look for a nested package.json, as in `node_modules/foo/bar/package.json`.
-        var packageJsonContent;
-        var packageId;
-        var versionPaths;
-        var packageInfo = getPackageJsonInfo(candidate, "", !nodeModulesDirectoryExists, state);
+        var packageInfo = getPackageJsonInfo(candidate, !nodeModulesDirectoryExists, state);
         if (packageInfo) {
-            (packageJsonContent = packageInfo.packageJsonContent, packageId = packageInfo.packageId, versionPaths = packageInfo.versionPaths);
             var fromFile = loadModuleFromFile(extensions, candidate, !nodeModulesDirectoryExists, state);
             if (fromFile) {
                 return noPackageId(fromFile);
             }
-            var fromDirectory = loadNodeModuleFromDirectoryWorker(extensions, candidate, !nodeModulesDirectoryExists, state, packageJsonContent, versionPaths);
-            return withPackageId(packageId, fromDirectory);
+            var fromDirectory = loadNodeModuleFromDirectoryWorker(extensions, candidate, !nodeModulesDirectoryExists, state, packageInfo.packageJsonContent, packageInfo.versionPaths);
+            return withPackageId(packageInfo, fromDirectory);
         }
         var loader = function (extensions, candidate, onlyRecordFailures, state) {
             var pathAndExtension = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state) ||
-                loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths);
-            return withPackageId(packageId, pathAndExtension);
+                loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo && packageInfo.packageJsonContent, packageInfo && packageInfo.versionPaths);
+            return withPackageId(packageInfo, pathAndExtension);
         };
         var _a = parsePackageName(moduleName), packageName = _a.packageName, rest = _a.rest;
         if (rest !== "") { // If "rest" is empty, we just did this search above.
             var packageDirectory = ts.combinePaths(nodeModulesDirectory, packageName);
             // Don't use a "types" or "main" from here because we're not loading the root, but a subdirectory -- just here for the packageId and path mappings.
-            var packageInfo_1 = getPackageJsonInfo(packageDirectory, rest, !nodeModulesDirectoryExists, state);
-            if (packageInfo_1)
-                (packageId = packageInfo_1.packageId, versionPaths = packageInfo_1.versionPaths);
-            if (versionPaths) {
+            packageInfo = getPackageJsonInfo(packageDirectory, !nodeModulesDirectoryExists, state);
+            if (packageInfo && packageInfo.versionPaths) {
                 if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, versionPaths.version, ts.version, rest);
+                    trace(state.host, ts.Diagnostics.package_json_has_a_typesVersions_entry_0_that_matches_compiler_version_1_looking_for_a_pattern_to_match_module_name_2, packageInfo.versionPaths.version, ts.version, rest);
                 }
                 var packageDirectoryExists = nodeModulesDirectoryExists && ts.directoryProbablyExists(packageDirectory, state.host);
-                var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, versionPaths.paths, loader, !packageDirectoryExists, state);
+                var fromPaths = tryLoadModuleUsingPaths(extensions, rest, packageDirectory, packageInfo.versionPaths.paths, loader, !packageDirectoryExists, state);
                 if (fromPaths) {
                     return fromPaths.value;
                 }
@@ -27396,24 +27593,24 @@ var ts;
         // A module is uninstantiated if it contains only
         switch (node.kind) {
             // 1. interface declarations, type alias declarations
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return 0 /* NonInstantiated */;
             // 2. const enum declarations
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 if (ts.isEnumConst(node)) {
                     return 2 /* ConstEnumOnly */;
                 }
                 break;
             // 3. non-exported import declarations
-            case 249 /* ImportDeclaration */:
-            case 248 /* ImportEqualsDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 if (!(ts.hasModifier(node, 1 /* Export */))) {
                     return 0 /* NonInstantiated */;
                 }
                 break;
             // 4. other uninstantiated module declarations.
-            case 245 /* ModuleBlock */: {
+            case 246 /* ModuleBlock */: {
                 var state_1 = 0 /* NonInstantiated */;
                 ts.forEachChild(node, function (n) {
                     var childState = getModuleInstanceStateWorker(n);
@@ -27435,9 +27632,9 @@ var ts;
                 });
                 return state_1;
             }
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return getModuleInstanceState(node);
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 // Only jsdoc typedef definition can exist in jsdoc namespace, and it should
                 // be considered the same as type alias
                 if (node.isInJSDocNamespace) {
@@ -27603,7 +27800,7 @@ var ts;
         // Should not be called on a declaration with a computed property name,
         // unless it is a well known Symbol.
         function getDeclarationName(node) {
-            if (node.kind === 254 /* ExportAssignment */) {
+            if (node.kind === 255 /* ExportAssignment */) {
                 return node.isExportEquals ? "export=" /* ExportEquals */ : "default" /* Default */;
             }
             var name = ts.getNameOfDeclaration(node);
@@ -27612,7 +27809,7 @@ var ts;
                     var moduleName = ts.getTextOfIdentifierOrLiteral(name);
                     return (ts.isGlobalScopeAugmentation(node) ? "__global" : "\"" + moduleName + "\"");
                 }
-                if (name.kind === 149 /* ComputedPropertyName */) {
+                if (name.kind === 150 /* ComputedPropertyName */) {
                     var nameExpression = name.expression;
                     // treat computed property names where expression is string/numeric literal as just string/numeric literal
                     if (ts.isStringOrNumericLiteralLike(nameExpression)) {
@@ -27624,36 +27821,36 @@ var ts;
                 return ts.isPropertyNameLiteral(name) ? ts.getEscapedTextOfIdentifierOrLiteral(name) : undefined;
             }
             switch (node.kind) {
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return "__constructor" /* Constructor */;
-                case 165 /* FunctionType */:
-                case 160 /* CallSignature */:
-                case 298 /* JSDocSignature */:
+                case 166 /* FunctionType */:
+                case 161 /* CallSignature */:
+                case 299 /* JSDocSignature */:
                     return "__call" /* Call */;
-                case 166 /* ConstructorType */:
-                case 161 /* ConstructSignature */:
+                case 167 /* ConstructorType */:
+                case 162 /* ConstructSignature */:
                     return "__new" /* New */;
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                     return "__index" /* Index */;
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return "__export" /* ExportStar */;
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     // json file should behave as
                     // module.exports = ...
                     return "export=" /* ExportEquals */;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     if (ts.getAssignmentDeclarationKind(node) === 2 /* ModuleExports */) {
                         // module.exports = ...
                         return "export=" /* ExportEquals */;
                     }
                     ts.Debug.fail("Unknown binary declaration kind");
                     break;
-                case 294 /* JSDocFunctionType */:
+                case 295 /* JSDocFunctionType */:
                     return (ts.isJSDocConstructSignature(node) ? "__new" /* New */ : "__call" /* Call */);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     // Parameters with names are handled at the top of this function.  Parameters
                     // without names can only come from JSDocFunctionTypes.
-                    ts.Debug.assert(node.parent.kind === 294 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
+                    ts.Debug.assert(node.parent.kind === 295 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
                     var functionType = node.parent;
                     var index = functionType.parameters.indexOf(node);
                     return "arg" + index;
@@ -27753,7 +27950,7 @@ var ts;
                                 // 1. multiple export default of class declaration or function declaration by checking NodeFlags.Default
                                 // 2. multiple export default of export assignment. This one doesn't have NodeFlags.Default on (as export default doesn't considered as modifiers)
                                 if (symbol.declarations && symbol.declarations.length &&
-                                    (node.kind === 254 /* ExportAssignment */ && !node.isExportEquals)) {
+                                    (node.kind === 255 /* ExportAssignment */ && !node.isExportEquals)) {
                                     message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                                     messageNeedsName_1 = false;
                                     multipleDefaultExports_1 = true;
@@ -27788,7 +27985,7 @@ var ts;
         function declareModuleMember(node, symbolFlags, symbolExcludes) {
             var hasExportModifier = ts.getCombinedModifierFlags(node) & 1 /* Export */;
             if (symbolFlags & 2097152 /* Alias */) {
-                if (node.kind === 257 /* ExportSpecifier */ || (node.kind === 248 /* ImportEqualsDeclaration */ && hasExportModifier)) {
+                if (node.kind === 258 /* ExportSpecifier */ || (node.kind === 249 /* ImportEqualsDeclaration */ && hasExportModifier)) {
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
                 }
                 else {
@@ -27855,7 +28052,7 @@ var ts;
             // for it.  We must clear this so we don't accidentally move any stale data forward from
             // a previous compilation.
             if (containerFlags & 1 /* IsContainer */) {
-                if (node.kind !== 197 /* ArrowFunction */) {
+                if (node.kind !== 198 /* ArrowFunction */) {
                     thisParentContainer = container;
                 }
                 container = blockScopeContainer = node;
@@ -27888,7 +28085,7 @@ var ts;
                 }
                 // We create a return control flow graph for IIFEs and constructors. For constructors
                 // we use the return control flow graph in strict property initialization checks.
-                currentReturnTarget = isIIFE || node.kind === 157 /* Constructor */ ? createBranchLabel() : undefined;
+                currentReturnTarget = isIIFE || node.kind === 158 /* Constructor */ ? createBranchLabel() : undefined;
                 currentBreakTarget = undefined;
                 currentContinueTarget = undefined;
                 activeLabels = undefined;
@@ -27902,13 +28099,13 @@ var ts;
                     if (hasExplicitReturn)
                         node.flags |= 256 /* HasExplicitReturn */;
                 }
-                if (node.kind === 284 /* SourceFile */) {
+                if (node.kind === 285 /* SourceFile */) {
                     node.flags |= emitFlags;
                 }
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
                     currentFlow = finishFlowLabel(currentReturnTarget);
-                    if (node.kind === 157 /* Constructor */) {
+                    if (node.kind === 158 /* Constructor */) {
                         node.returnFlowNode = currentFlow;
                     }
                 }
@@ -27952,8 +28149,8 @@ var ts;
             }
         }
         function bindEachFunctionsFirst(nodes) {
-            bindEach(nodes, function (n) { return n.kind === 239 /* FunctionDeclaration */ ? bind(n) : undefined; });
-            bindEach(nodes, function (n) { return n.kind !== 239 /* FunctionDeclaration */ ? bind(n) : undefined; });
+            bindEach(nodes, function (n) { return n.kind === 240 /* FunctionDeclaration */ ? bind(n) : undefined; });
+            bindEach(nodes, function (n) { return n.kind !== 240 /* FunctionDeclaration */ ? bind(n) : undefined; });
         }
         function bindEach(nodes, bindFunction) {
             if (bindFunction === void 0) { bindFunction = bind; }
@@ -27986,78 +28183,78 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     bindWhileStatement(node);
                     break;
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     bindDoStatement(node);
                     break;
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     bindForStatement(node);
                     break;
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
                     bindForInOrForOfStatement(node);
                     break;
-                case 222 /* IfStatement */:
+                case 223 /* IfStatement */:
                     bindIfStatement(node);
                     break;
-                case 230 /* ReturnStatement */:
-                case 234 /* ThrowStatement */:
+                case 231 /* ReturnStatement */:
+                case 235 /* ThrowStatement */:
                     bindReturnOrThrow(node);
                     break;
-                case 229 /* BreakStatement */:
-                case 228 /* ContinueStatement */:
+                case 230 /* BreakStatement */:
+                case 229 /* ContinueStatement */:
                     bindBreakOrContinueStatement(node);
                     break;
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     bindTryStatement(node);
                     break;
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     bindSwitchStatement(node);
                     break;
-                case 246 /* CaseBlock */:
+                case 247 /* CaseBlock */:
                     bindCaseBlock(node);
                     break;
-                case 271 /* CaseClause */:
+                case 272 /* CaseClause */:
                     bindCaseClause(node);
                     break;
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     bindLabeledStatement(node);
                     break;
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     bindPrefixUnaryExpressionFlow(node);
                     break;
-                case 203 /* PostfixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     bindPostfixUnaryExpressionFlow(node);
                     break;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     bindBinaryExpressionFlow(node);
                     break;
-                case 198 /* DeleteExpression */:
+                case 199 /* DeleteExpression */:
                     bindDeleteExpressionFlow(node);
                     break;
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     bindConditionalExpressionFlow(node);
                     break;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     bindVariableDeclarationFlow(node);
                     break;
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     bindCallExpressionFlow(node);
                     break;
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
+                case 310 /* JSDocTypedefTag */:
+                case 303 /* JSDocCallbackTag */:
                     bindJSDocTypeAlias(node);
                     break;
                 // In source files and blocks, bind functions first to match hoisting that occurs at runtime
-                case 284 /* SourceFile */: {
+                case 285 /* SourceFile */: {
                     bindEachFunctionsFirst(node.statements);
                     bind(node.endOfFileToken);
                     break;
                 }
-                case 218 /* Block */:
-                case 245 /* ModuleBlock */:
+                case 219 /* Block */:
+                case 246 /* ModuleBlock */:
                     bindEachFunctionsFirst(node.statements);
                     break;
                 default:
@@ -28068,26 +28265,26 @@ var ts;
         }
         function isNarrowingExpression(expr) {
             switch (expr.kind) {
-                case 72 /* Identifier */:
-                case 100 /* ThisKeyword */:
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 73 /* Identifier */:
+                case 101 /* ThisKeyword */:
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return isNarrowableReference(expr);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return hasNarrowableArgument(expr);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isNarrowingExpression(expr.expression);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return isNarrowingBinaryExpression(expr);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return expr.operator === 52 /* ExclamationToken */ && isNarrowingExpression(expr.operand);
-                case 199 /* TypeOfExpression */:
+                case 200 /* TypeOfExpression */:
                     return isNarrowingExpression(expr.expression);
             }
             return false;
         }
         function isNarrowableReference(expr) {
-            return expr.kind === 72 /* Identifier */ || expr.kind === 100 /* ThisKeyword */ || expr.kind === 98 /* SuperKeyword */ ||
+            return expr.kind === 73 /* Identifier */ || expr.kind === 101 /* ThisKeyword */ || expr.kind === 99 /* SuperKeyword */ ||
                 (ts.isPropertyAccessExpression(expr) || ts.isNonNullExpression(expr) || ts.isParenthesizedExpression(expr)) && isNarrowableReference(expr.expression) ||
                 ts.isElementAccessExpression(expr) && expr.argumentExpression &&
                     (ts.isStringLiteral(expr.argumentExpression) || ts.isNumericLiteral(expr.argumentExpression)) &&
@@ -28102,7 +28299,7 @@ var ts;
                     }
                 }
             }
-            if (expr.expression.kind === 189 /* PropertyAccessExpression */ &&
+            if (expr.expression.kind === 190 /* PropertyAccessExpression */ &&
                 isNarrowableReference(expr.expression.expression)) {
                 return true;
             }
@@ -28116,7 +28313,7 @@ var ts;
         }
         function isNarrowingBinaryExpression(expr) {
             switch (expr.operatorToken.kind) {
-                case 59 /* EqualsToken */:
+                case 60 /* EqualsToken */:
                     return isNarrowableReference(expr.left);
                 case 33 /* EqualsEqualsToken */:
                 case 34 /* ExclamationEqualsToken */:
@@ -28124,9 +28321,9 @@ var ts;
                 case 36 /* ExclamationEqualsEqualsToken */:
                     return isNarrowableOperand(expr.left) || isNarrowableOperand(expr.right) ||
                         isNarrowingTypeofOperands(expr.right, expr.left) || isNarrowingTypeofOperands(expr.left, expr.right);
-                case 94 /* InstanceOfKeyword */:
+                case 95 /* InstanceOfKeyword */:
                     return isNarrowableOperand(expr.left);
-                case 93 /* InKeyword */:
+                case 94 /* InKeyword */:
                     return isNarrowableInOperands(expr.left, expr.right);
                 case 27 /* CommaToken */:
                     return isNarrowingExpression(expr.right);
@@ -28135,11 +28332,11 @@ var ts;
         }
         function isNarrowableOperand(expr) {
             switch (expr.kind) {
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isNarrowableOperand(expr.expression);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     switch (expr.operatorToken.kind) {
-                        case 59 /* EqualsToken */:
+                        case 60 /* EqualsToken */:
                             return isNarrowableOperand(expr.left);
                         case 27 /* CommaToken */:
                             return isNarrowableOperand(expr.right);
@@ -28176,8 +28373,8 @@ var ts;
             if (!expression) {
                 return flags & 32 /* TrueCondition */ ? antecedent : unreachableFlow;
             }
-            if (expression.kind === 102 /* TrueKeyword */ && flags & 64 /* FalseCondition */ ||
-                expression.kind === 87 /* FalseKeyword */ && flags & 32 /* TrueCondition */) {
+            if (expression.kind === 103 /* TrueKeyword */ && flags & 64 /* FalseCondition */ ||
+                expression.kind === 88 /* FalseKeyword */ && flags & 32 /* TrueCondition */) {
                 return unreachableFlow;
             }
             if (!isNarrowingExpression(expression)) {
@@ -28215,33 +28412,33 @@ var ts;
         function isStatementCondition(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 222 /* IfStatement */:
-                case 224 /* WhileStatement */:
-                case 223 /* DoStatement */:
+                case 223 /* IfStatement */:
+                case 225 /* WhileStatement */:
+                case 224 /* DoStatement */:
                     return parent.expression === node;
-                case 225 /* ForStatement */:
-                case 205 /* ConditionalExpression */:
+                case 226 /* ForStatement */:
+                case 206 /* ConditionalExpression */:
                     return parent.condition === node;
             }
             return false;
         }
         function isLogicalExpression(node) {
             while (true) {
-                if (node.kind === 195 /* ParenthesizedExpression */) {
+                if (node.kind === 196 /* ParenthesizedExpression */) {
                     node = node.expression;
                 }
-                else if (node.kind === 202 /* PrefixUnaryExpression */ && node.operator === 52 /* ExclamationToken */) {
+                else if (node.kind === 203 /* PrefixUnaryExpression */ && node.operator === 52 /* ExclamationToken */) {
                     node = node.operand;
                 }
                 else {
-                    return node.kind === 204 /* BinaryExpression */ && (node.operatorToken.kind === 54 /* AmpersandAmpersandToken */ ||
+                    return node.kind === 205 /* BinaryExpression */ && (node.operatorToken.kind === 54 /* AmpersandAmpersandToken */ ||
                         node.operatorToken.kind === 55 /* BarBarToken */);
                 }
             }
         }
         function isTopLevelLogicalExpression(node) {
-            while (node.parent.kind === 195 /* ParenthesizedExpression */ ||
-                node.parent.kind === 202 /* PrefixUnaryExpression */ &&
+            while (node.parent.kind === 196 /* ParenthesizedExpression */ ||
+                node.parent.kind === 203 /* PrefixUnaryExpression */ &&
                     node.parent.operator === 52 /* ExclamationToken */) {
                 node = node.parent;
             }
@@ -28283,7 +28480,7 @@ var ts;
         }
         function bindDoStatement(node) {
             var preDoLabel = createLoopLabel();
-            var enclosingLabeledStatement = node.parent.kind === 233 /* LabeledStatement */
+            var enclosingLabeledStatement = node.parent.kind === 234 /* LabeledStatement */
                 ? ts.lastOrUndefined(activeLabels)
                 : undefined;
             // if do statement is wrapped in labeled statement then target labels for break/continue with or without
@@ -28317,13 +28514,13 @@ var ts;
             var postLoopLabel = createBranchLabel();
             addAntecedent(preLoopLabel, currentFlow);
             currentFlow = preLoopLabel;
-            if (node.kind === 227 /* ForOfStatement */) {
+            if (node.kind === 228 /* ForOfStatement */) {
                 bind(node.awaitModifier);
             }
             bind(node.expression);
             addAntecedent(postLoopLabel, currentFlow);
             bind(node.initializer);
-            if (node.initializer.kind !== 238 /* VariableDeclarationList */) {
+            if (node.initializer.kind !== 239 /* VariableDeclarationList */) {
                 bindAssignmentTargetFlow(node.initializer);
             }
             bindIterativeStatement(node.statement, postLoopLabel, preLoopLabel);
@@ -28345,7 +28542,7 @@ var ts;
         }
         function bindReturnOrThrow(node) {
             bind(node.expression);
-            if (node.kind === 230 /* ReturnStatement */) {
+            if (node.kind === 231 /* ReturnStatement */) {
                 hasExplicitReturn = true;
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
@@ -28365,7 +28562,7 @@ var ts;
             return undefined;
         }
         function bindBreakOrContinueFlow(node, breakTarget, continueTarget) {
-            var flowLabel = node.kind === 229 /* BreakStatement */ ? breakTarget : continueTarget;
+            var flowLabel = node.kind === 230 /* BreakStatement */ ? breakTarget : continueTarget;
             if (flowLabel) {
                 addAntecedent(flowLabel, currentFlow);
                 currentFlow = unreachableFlow;
@@ -28493,7 +28690,7 @@ var ts;
             preSwitchCaseFlow = currentFlow;
             bind(node.caseBlock);
             addAntecedent(postSwitchLabel, currentFlow);
-            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 272 /* DefaultClause */; });
+            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 273 /* DefaultClause */; });
             // We mark a switch statement as possibly exhaustive if it has no default clause and if all
             // case clauses have unreachable end points (e.g. they all return).
             node.possiblyExhaustive = !hasDefault && !postSwitchLabel.antecedents;
@@ -28560,14 +28757,14 @@ var ts;
             if (!activeLabel.referenced && !options.allowUnusedLabels) {
                 errorOrSuggestionOnNode(ts.unusedLabelIsError(options), node.label, ts.Diagnostics.Unused_label);
             }
-            if (!node.statement || node.statement.kind !== 223 /* DoStatement */) {
+            if (!node.statement || node.statement.kind !== 224 /* DoStatement */) {
                 // do statement sets current flow inside bindDoStatement
                 addAntecedent(postStatementLabel, currentFlow);
                 currentFlow = finishFlowLabel(postStatementLabel);
             }
         }
         function bindDestructuringTargetFlow(node) {
-            if (node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 59 /* EqualsToken */) {
+            if (node.kind === 205 /* BinaryExpression */ && node.operatorToken.kind === 60 /* EqualsToken */) {
                 bindAssignmentTargetFlow(node.left);
             }
             else {
@@ -28578,10 +28775,10 @@ var ts;
             if (isNarrowableReference(node)) {
                 currentFlow = createFlowAssignment(currentFlow, node);
             }
-            else if (node.kind === 187 /* ArrayLiteralExpression */) {
+            else if (node.kind === 188 /* ArrayLiteralExpression */) {
                 for (var _i = 0, _a = node.elements; _i < _a.length; _i++) {
                     var e = _a[_i];
-                    if (e.kind === 208 /* SpreadElement */) {
+                    if (e.kind === 209 /* SpreadElement */) {
                         bindAssignmentTargetFlow(e.expression);
                     }
                     else {
@@ -28589,16 +28786,16 @@ var ts;
                     }
                 }
             }
-            else if (node.kind === 188 /* ObjectLiteralExpression */) {
+            else if (node.kind === 189 /* ObjectLiteralExpression */) {
                 for (var _b = 0, _c = node.properties; _b < _c.length; _b++) {
                     var p = _c[_b];
-                    if (p.kind === 275 /* PropertyAssignment */) {
+                    if (p.kind === 276 /* PropertyAssignment */) {
                         bindDestructuringTargetFlow(p.initializer);
                     }
-                    else if (p.kind === 276 /* ShorthandPropertyAssignment */) {
+                    else if (p.kind === 277 /* ShorthandPropertyAssignment */) {
                         bindAssignmentTargetFlow(p.name);
                     }
-                    else if (p.kind === 277 /* SpreadAssignment */) {
+                    else if (p.kind === 278 /* SpreadAssignment */) {
                         bindAssignmentTargetFlow(p.expression);
                     }
                 }
@@ -28654,7 +28851,7 @@ var ts;
                 bindEachChild(node);
                 if (ts.isAssignmentOperator(operator) && !ts.isAssignmentTarget(node)) {
                     bindAssignmentTargetFlow(node.left);
-                    if (operator === 59 /* EqualsToken */ && node.left.kind === 190 /* ElementAccessExpression */) {
+                    if (operator === 60 /* EqualsToken */ && node.left.kind === 191 /* ElementAccessExpression */) {
                         var elementAccess = node.left;
                         if (isNarrowableOperand(elementAccess.expression)) {
                             currentFlow = createFlowArrayMutation(currentFlow, node);
@@ -28665,7 +28862,7 @@ var ts;
         }
         function bindDeleteExpressionFlow(node) {
             bindEachChild(node);
-            if (node.expression.kind === 189 /* PropertyAccessExpression */) {
+            if (node.expression.kind === 190 /* PropertyAccessExpression */) {
                 bindAssignmentTargetFlow(node.expression);
             }
         }
@@ -28713,10 +28910,10 @@ var ts;
             // an immediately invoked function expression (IIFE). Initialize the flowNode property to
             // the current control flow (which includes evaluation of the IIFE arguments).
             var expr = node.expression;
-            while (expr.kind === 195 /* ParenthesizedExpression */) {
+            while (expr.kind === 196 /* ParenthesizedExpression */) {
                 expr = expr.expression;
             }
-            if (expr.kind === 196 /* FunctionExpression */ || expr.kind === 197 /* ArrowFunction */) {
+            if (expr.kind === 197 /* FunctionExpression */ || expr.kind === 198 /* ArrowFunction */) {
                 bindEach(node.typeArguments);
                 bindEach(node.arguments);
                 bind(node.expression);
@@ -28724,7 +28921,7 @@ var ts;
             else {
                 bindEachChild(node);
             }
-            if (node.expression.kind === 189 /* PropertyAccessExpression */) {
+            if (node.expression.kind === 190 /* PropertyAccessExpression */) {
                 var propertyAccess = node.expression;
                 if (isNarrowableOperand(propertyAccess.expression) && ts.isPushOrUnshiftIdentifier(propertyAccess.name)) {
                     currentFlow = createFlowArrayMutation(currentFlow, node);
@@ -28733,54 +28930,54 @@ var ts;
         }
         function getContainerFlags(node) {
             switch (node.kind) {
-                case 209 /* ClassExpression */:
-                case 240 /* ClassDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 188 /* ObjectLiteralExpression */:
-                case 168 /* TypeLiteral */:
-                case 297 /* JSDocTypeLiteral */:
-                case 268 /* JsxAttributes */:
+                case 210 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 189 /* ObjectLiteralExpression */:
+                case 169 /* TypeLiteral */:
+                case 298 /* JSDocTypeLiteral */:
+                case 269 /* JsxAttributes */:
                     return 1 /* IsContainer */;
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return 1 /* IsContainer */ | 64 /* IsInterface */;
-                case 244 /* ModuleDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 181 /* MappedType */:
+                case 245 /* ModuleDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 182 /* MappedType */:
                     return 1 /* IsContainer */ | 32 /* HasLocals */;
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */;
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     if (ts.isObjectLiteralOrClassExpressionMethod(node)) {
                         return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 128 /* IsObjectLiteralOrClassExpressionMethod */;
                     }
                 // falls through
-                case 157 /* Constructor */:
-                case 239 /* FunctionDeclaration */:
-                case 155 /* MethodSignature */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 160 /* CallSignature */:
-                case 298 /* JSDocSignature */:
-                case 294 /* JSDocFunctionType */:
-                case 165 /* FunctionType */:
-                case 161 /* ConstructSignature */:
-                case 162 /* IndexSignature */:
-                case 166 /* ConstructorType */:
+                case 158 /* Constructor */:
+                case 240 /* FunctionDeclaration */:
+                case 156 /* MethodSignature */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 161 /* CallSignature */:
+                case 299 /* JSDocSignature */:
+                case 295 /* JSDocFunctionType */:
+                case 166 /* FunctionType */:
+                case 162 /* ConstructSignature */:
+                case 163 /* IndexSignature */:
+                case 167 /* ConstructorType */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */;
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 16 /* IsFunctionExpression */;
-                case 245 /* ModuleBlock */:
+                case 246 /* ModuleBlock */:
                     return 4 /* IsControlFlowContainer */;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return node.initializer ? 4 /* IsControlFlowContainer */ : 0;
-                case 274 /* CatchClause */:
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
-                case 246 /* CaseBlock */:
+                case 275 /* CatchClause */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
+                case 247 /* CaseBlock */:
                     return 2 /* IsBlockScopedContainer */;
-                case 218 /* Block */:
+                case 219 /* Block */:
                     // do not treat blocks directly inside a function as a block-scoped-container.
                     // Locals that reside in this block should go to the function locals. Otherwise 'x'
                     // would not appear to be a redeclaration of a block scoped local in the following
@@ -28813,45 +29010,45 @@ var ts;
                 // members are declared (for example, a member of a class will go into a specific
                 // symbol table depending on if it is static or not). We defer to specialized
                 // handlers to take care of declaring these child members.
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return declareModuleMember(node, symbolFlags, symbolExcludes);
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     return declareSourceFileMember(node, symbolFlags, symbolExcludes);
-                case 209 /* ClassExpression */:
-                case 240 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
                     return declareClassMember(node, symbolFlags, symbolExcludes);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                case 168 /* TypeLiteral */:
-                case 297 /* JSDocTypeLiteral */:
-                case 188 /* ObjectLiteralExpression */:
-                case 241 /* InterfaceDeclaration */:
-                case 268 /* JsxAttributes */:
+                case 169 /* TypeLiteral */:
+                case 298 /* JSDocTypeLiteral */:
+                case 189 /* ObjectLiteralExpression */:
+                case 242 /* InterfaceDeclaration */:
+                case 269 /* JsxAttributes */:
                     // Interface/Object-types always have their children added to the 'members' of
                     // their container. They are only accessible through an instance of their
                     // container, and are never in scope otherwise (even inside the body of the
                     // object / type / interface declaring them). An exception is type parameters,
                     // which are in scope without qualification (similar to 'locals').
                     return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 298 /* JSDocSignature */:
-                case 162 /* IndexSignature */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 157 /* Constructor */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 294 /* JSDocFunctionType */:
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
-                case 242 /* TypeAliasDeclaration */:
-                case 181 /* MappedType */:
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 299 /* JSDocSignature */:
+                case 163 /* IndexSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 158 /* Constructor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 295 /* JSDocFunctionType */:
+                case 310 /* JSDocTypedefTag */:
+                case 303 /* JSDocCallbackTag */:
+                case 243 /* TypeAliasDeclaration */:
+                case 182 /* MappedType */:
                     // All the children of these container types are never visible through another
                     // symbol (i.e. through another symbol's 'exports' or 'members').  Instead,
                     // they're only accessed 'lexically' (i.e. from code that exists underneath
@@ -28872,16 +29069,8 @@ var ts;
                 : declareSymbol(file.locals, /*parent*/ undefined, node, symbolFlags, symbolExcludes);
         }
         function hasExportDeclarations(node) {
-            var body = node.kind === 284 /* SourceFile */ ? node : node.body;
-            if (body && (body.kind === 284 /* SourceFile */ || body.kind === 245 /* ModuleBlock */)) {
-                for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
-                    var stat = _a[_i];
-                    if (stat.kind === 255 /* ExportDeclaration */ || stat.kind === 254 /* ExportAssignment */) {
-                        return true;
-                    }
-                }
-            }
-            return false;
+            var body = ts.isSourceFile(node) ? node : ts.tryCast(node.body, ts.isModuleBlock);
+            return !!body && body.statements.some(function (s) { return ts.isExportDeclaration(s) || ts.isExportAssignment(s); });
         }
         function setExportContextFlag(node) {
             // A declaration source file or ambient module declaration that contains no export declarations (but possibly regular
@@ -28960,7 +29149,7 @@ var ts;
                 var seen = ts.createUnderscoreEscapedMap();
                 for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    if (prop.kind === 277 /* SpreadAssignment */ || prop.name.kind !== 72 /* Identifier */) {
+                    if (prop.kind === 278 /* SpreadAssignment */ || prop.name.kind !== 73 /* Identifier */) {
                         continue;
                     }
                     var identifier = prop.name;
@@ -28972,7 +29161,7 @@ var ts;
                     //    c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true.
                     //    d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true
                     // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
-                    var currentKind = prop.kind === 275 /* PropertyAssignment */ || prop.kind === 276 /* ShorthandPropertyAssignment */ || prop.kind === 156 /* MethodDeclaration */
+                    var currentKind = prop.kind === 276 /* PropertyAssignment */ || prop.kind === 277 /* ShorthandPropertyAssignment */ || prop.kind === 157 /* MethodDeclaration */
                         ? 1 /* Property */
                         : 2 /* Accessor */;
                     var existingKind = seen.get(identifier.escapedText);
@@ -29004,10 +29193,10 @@ var ts;
         }
         function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
             switch (blockScopeContainer.kind) {
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     declareModuleMember(node, symbolFlags, symbolExcludes);
                     break;
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     if (ts.isExternalOrCommonJsModule(container)) {
                         declareModuleMember(node, symbolFlags, symbolExcludes);
                         break;
@@ -29038,7 +29227,7 @@ var ts;
                 currentFlow = { flags: 2 /* Start */ };
                 parent = typeAlias;
                 bind(typeAlias.typeExpression);
-                if (!typeAlias.fullName || typeAlias.fullName.kind === 72 /* Identifier */) {
+                if (!typeAlias.fullName || typeAlias.fullName.kind === 73 /* Identifier */) {
                     parent = typeAlias.parent;
                     bindBlockScopedDeclaration(typeAlias, 524288 /* TypeAlias */, 67897832 /* TypeAliasExcludes */);
                 }
@@ -29056,8 +29245,8 @@ var ts;
         // check for reserved words used as identifiers in strict mode code.
         function checkStrictModeIdentifier(node) {
             if (inStrictMode &&
-                node.originalKeywordKind >= 109 /* FirstFutureReservedWord */ &&
-                node.originalKeywordKind <= 117 /* LastFutureReservedWord */ &&
+                node.originalKeywordKind >= 110 /* FirstFutureReservedWord */ &&
+                node.originalKeywordKind <= 118 /* LastFutureReservedWord */ &&
                 !ts.isIdentifierName(node) &&
                 !(node.flags & 4194304 /* Ambient */)) {
                 // Report error only if there are no parse errors in file
@@ -29093,7 +29282,7 @@ var ts;
         }
         function checkStrictModeDeleteExpression(node) {
             // Grammar checking
-            if (inStrictMode && node.expression.kind === 72 /* Identifier */) {
+            if (inStrictMode && node.expression.kind === 73 /* Identifier */) {
                 // When a delete operator occurs within strict mode code, a SyntaxError is thrown if its
                 // UnaryExpression is a direct reference to a variable, function argument, or function name
                 var span = ts.getErrorSpanForNode(file, node.expression);
@@ -29104,7 +29293,7 @@ var ts;
             return ts.isIdentifier(node) && (node.escapedText === "eval" || node.escapedText === "arguments");
         }
         function checkStrictModeEvalOrArguments(contextNode, name) {
-            if (name && name.kind === 72 /* Identifier */) {
+            if (name && name.kind === 73 /* Identifier */) {
                 var identifier = name;
                 if (isEvalOrArgumentsIdentifier(identifier)) {
                     // We check first if the name is inside class declaration or class expression; if so give explicit message
@@ -29145,8 +29334,8 @@ var ts;
         function checkStrictModeFunctionDeclaration(node) {
             if (languageVersion < 2 /* ES2015 */) {
                 // Report error if function is not top level function declaration
-                if (blockScopeContainer.kind !== 284 /* SourceFile */ &&
-                    blockScopeContainer.kind !== 244 /* ModuleDeclaration */ &&
+                if (blockScopeContainer.kind !== 285 /* SourceFile */ &&
+                    blockScopeContainer.kind !== 245 /* ModuleDeclaration */ &&
                     !ts.isFunctionLike(blockScopeContainer)) {
                     // We check first if the name is inside class declaration or class expression; if so give explicit message
                     // otherwise report generic error message.
@@ -29241,7 +29430,7 @@ var ts;
             // the current 'container' node when it changes. This helps us know which symbol table
             // a local should go into for example. Since terminal nodes are known not to have
             // children, as an optimization we don't process those.
-            if (node.kind > 147 /* LastToken */) {
+            if (node.kind > 148 /* LastToken */) {
                 var saveParent = parent;
                 parent = node;
                 var containerFlags = getContainerFlags(node);
@@ -29303,7 +29492,7 @@ var ts;
         function bindWorker(node) {
             switch (node.kind) {
                 /* Strict mode checks */
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     // for typedef type names with namespaces, bind the new jsdoc type symbol here
                     // because it requires all containing namespaces to be in effect, namely the
                     // current "blockScopeContainer" needs to be set to its immediate namespace parent.
@@ -29316,13 +29505,13 @@ var ts;
                         break;
                     }
                 // falls through
-                case 100 /* ThisKeyword */:
-                    if (currentFlow && (ts.isExpression(node) || parent.kind === 276 /* ShorthandPropertyAssignment */)) {
+                case 101 /* ThisKeyword */:
+                    if (currentFlow && (ts.isExpression(node) || parent.kind === 277 /* ShorthandPropertyAssignment */)) {
                         node.flowNode = currentFlow;
                     }
                     return checkStrictModeIdentifier(node);
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     if (currentFlow && isNarrowableReference(node)) {
                         node.flowNode = currentFlow;
                     }
@@ -29336,7 +29525,7 @@ var ts;
                         declareSymbol(file.locals, /*parent*/ undefined, node.expression, 1 /* FunctionScopedVariable */ | 134217728 /* ModuleExports */, 67220414 /* FunctionScopedVariableExcludes */);
                     }
                     break;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     var specialKind = ts.getAssignmentDeclarationKind(node);
                     switch (specialKind) {
                         case 1 /* ExportsProperty */:
@@ -29364,76 +29553,76 @@ var ts;
                             ts.Debug.fail("Unknown binary expression special property assignment kind");
                     }
                     return checkStrictModeBinaryExpression(node);
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return checkStrictModeCatchClause(node);
-                case 198 /* DeleteExpression */:
+                case 199 /* DeleteExpression */:
                     return checkStrictModeDeleteExpression(node);
                 case 8 /* NumericLiteral */:
                     return checkStrictModeNumericLiteral(node);
-                case 203 /* PostfixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     return checkStrictModePostfixUnaryExpression(node);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return checkStrictModePrefixUnaryExpression(node);
-                case 231 /* WithStatement */:
+                case 232 /* WithStatement */:
                     return checkStrictModeWithStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return checkStrictModeLabeledStatement(node);
-                case 178 /* ThisType */:
+                case 179 /* ThisType */:
                     seenThisKeyword = true;
                     return;
-                case 163 /* TypePredicate */:
+                case 164 /* TypePredicate */:
                     break; // Binding the children will handle everything
-                case 150 /* TypeParameter */:
+                case 151 /* TypeParameter */:
                     return bindTypeParameter(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return bindParameter(node);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return bindVariableDeclarationOrBindingElement(node);
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     node.flowNode = currentFlow;
                     return bindVariableDeclarationOrBindingElement(node);
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     return bindPropertyWorker(node);
-                case 275 /* PropertyAssignment */:
-                case 276 /* ShorthandPropertyAssignment */:
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     return bindPropertyOrMethodOrAccessor(node, 4 /* Property */, 0 /* PropertyExcludes */);
-                case 278 /* EnumMember */:
+                case 279 /* EnumMember */:
                     return bindPropertyOrMethodOrAccessor(node, 8 /* EnumMember */, 68008959 /* EnumMemberExcludes */);
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 162 /* IndexSignature */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 163 /* IndexSignature */:
                     return declareSymbolAndAddToSymbolTable(node, 131072 /* Signature */, 0 /* None */);
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     // If this is an ObjectLiteralExpression method, then it sits in the same space
                     // as other properties in the object literal.  So we use SymbolFlags.PropertyExcludes
                     // so that it will conflict with any other object literal members with the same
                     // name.
                     return bindPropertyOrMethodOrAccessor(node, 8192 /* Method */ | (node.questionToken ? 16777216 /* Optional */ : 0 /* None */), ts.isObjectLiteralMethod(node) ? 0 /* PropertyExcludes */ : 67212223 /* MethodExcludes */);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return bindFunctionDeclaration(node);
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return declareSymbolAndAddToSymbolTable(node, 16384 /* Constructor */, /*symbolExcludes:*/ 0 /* None */);
-                case 158 /* GetAccessor */:
+                case 159 /* GetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 32768 /* GetAccessor */, 67154879 /* GetAccessorExcludes */);
-                case 159 /* SetAccessor */:
+                case 160 /* SetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 65536 /* SetAccessor */, 67187647 /* SetAccessorExcludes */);
-                case 165 /* FunctionType */:
-                case 294 /* JSDocFunctionType */:
-                case 298 /* JSDocSignature */:
-                case 166 /* ConstructorType */:
+                case 166 /* FunctionType */:
+                case 295 /* JSDocFunctionType */:
+                case 299 /* JSDocSignature */:
+                case 167 /* ConstructorType */:
                     return bindFunctionOrConstructorType(node);
-                case 168 /* TypeLiteral */:
-                case 297 /* JSDocTypeLiteral */:
-                case 181 /* MappedType */:
+                case 169 /* TypeLiteral */:
+                case 298 /* JSDocTypeLiteral */:
+                case 182 /* MappedType */:
                     return bindAnonymousTypeWorker(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return bindObjectLiteralExpression(node);
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return bindFunctionExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     var assignmentKind = ts.getAssignmentDeclarationKind(node);
                     switch (assignmentKind) {
                         case 7 /* ObjectDefinePropertyValue */:
@@ -29452,64 +29641,64 @@ var ts;
                     }
                     break;
                 // Members of classes, interfaces, and modules
-                case 209 /* ClassExpression */:
-                case 240 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
                     // All classes are automatically in strict mode in ES6.
                     inStrictMode = true;
                     return bindClassLikeDeclaration(node);
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return bindBlockScopedDeclaration(node, 64 /* Interface */, 67897736 /* InterfaceExcludes */);
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 67897832 /* TypeAliasExcludes */);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return bindEnumDeclaration(node);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return bindModuleDeclaration(node);
                 // Jsx-attributes
-                case 268 /* JsxAttributes */:
+                case 269 /* JsxAttributes */:
                     return bindJsxAttributes(node);
-                case 267 /* JsxAttribute */:
+                case 268 /* JsxAttribute */:
                     return bindJsxAttribute(node, 4 /* Property */, 0 /* PropertyExcludes */);
                 // Imports and exports
-                case 248 /* ImportEqualsDeclaration */:
-                case 251 /* NamespaceImport */:
-                case 253 /* ImportSpecifier */:
-                case 257 /* ExportSpecifier */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 252 /* NamespaceImport */:
+                case 254 /* ImportSpecifier */:
+                case 258 /* ExportSpecifier */:
                     return declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
-                case 247 /* NamespaceExportDeclaration */:
+                case 248 /* NamespaceExportDeclaration */:
                     return bindNamespaceExportDeclaration(node);
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     return bindImportClause(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return bindExportDeclaration(node);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return bindExportAssignment(node);
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     updateStrictModeStatementList(node.statements);
                     return bindSourceFileIfExternalModule();
-                case 218 /* Block */:
+                case 219 /* Block */:
                     if (!ts.isFunctionLike(node.parent)) {
                         return;
                     }
                 // falls through
-                case 245 /* ModuleBlock */:
+                case 246 /* ModuleBlock */:
                     return updateStrictModeStatementList(node.statements);
-                case 304 /* JSDocParameterTag */:
-                    if (node.parent.kind === 298 /* JSDocSignature */) {
+                case 305 /* JSDocParameterTag */:
+                    if (node.parent.kind === 299 /* JSDocSignature */) {
                         return bindParameter(node);
                     }
-                    if (node.parent.kind !== 297 /* JSDocTypeLiteral */) {
+                    if (node.parent.kind !== 298 /* JSDocTypeLiteral */) {
                         break;
                     }
                 // falls through
-                case 310 /* JSDocPropertyTag */:
+                case 311 /* JSDocPropertyTag */:
                     var propTag = node;
-                    var flags = propTag.isBracketed || propTag.typeExpression && propTag.typeExpression.type.kind === 293 /* JSDocOptionalType */ ?
+                    var flags = propTag.isBracketed || propTag.typeExpression && propTag.typeExpression.type.kind === 294 /* JSDocOptionalType */ ?
                         4 /* Property */ | 16777216 /* Optional */ :
                         4 /* Property */;
                     return declareSymbolAndAddToSymbolTable(propTag, flags, 0 /* PropertyExcludes */);
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
+                case 310 /* JSDocTypedefTag */:
+                case 303 /* JSDocCallbackTag */:
                     return (delayedTypeAliases || (delayedTypeAliases = [])).push(node);
             }
         }
@@ -29653,11 +29842,11 @@ var ts;
             ts.Debug.assert(ts.isInJSFile(node));
             var thisContainer = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
             switch (thisContainer.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
                     var constructorSymbol = thisContainer.symbol;
                     // For `f.prototype.m = function() { this.x = 0; }`, `this.x = 0` should modify `f`'s members, not the function expression.
-                    if (ts.isBinaryExpression(thisContainer.parent) && thisContainer.parent.operatorToken.kind === 59 /* EqualsToken */) {
+                    if (ts.isBinaryExpression(thisContainer.parent) && thisContainer.parent.operatorToken.kind === 60 /* EqualsToken */) {
                         var l = thisContainer.parent.left;
                         if (ts.isPropertyAccessEntityNameExpression(l) && ts.isPrototypeAccess(l.expression)) {
                             constructorSymbol = lookupSymbolForPropertyAccess(l.expression.expression, thisParentContainer);
@@ -29670,18 +29859,18 @@ var ts;
                         declareSymbol(constructorSymbol.members, constructorSymbol, node, 4 /* Property */, 0 /* PropertyExcludes */ & ~4 /* Property */);
                     }
                     break;
-                case 157 /* Constructor */:
-                case 154 /* PropertyDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 158 /* Constructor */:
+                case 155 /* PropertyDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     // this.foo assignment in a JavaScript class
                     // Bind this property to the containing class
                     var containingClass = thisContainer.parent;
                     var symbolTable = ts.hasModifier(thisContainer, 32 /* Static */) ? containingClass.symbol.exports : containingClass.symbol.members;
                     declareSymbol(symbolTable, containingClass.symbol, node, 4 /* Property */, 0 /* None */, /*isReplaceableByMethod*/ true);
                     break;
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     // this.property = assignment in a source file -- declare symbol in exports for a module, in locals for a script
                     if (thisContainer.commonJsModuleIndicator) {
                         declareSymbol(thisContainer.symbol.exports, thisContainer.symbol, node, 4 /* Property */ | 1048576 /* ExportValue */, 0 /* None */);
@@ -29691,14 +29880,14 @@ var ts;
                     }
                     break;
                 default:
-                    ts.Debug.fail(ts.Debug.showSyntaxKind(thisContainer));
+                    ts.Debug.failBadSyntaxKind(thisContainer);
             }
         }
         function bindSpecialPropertyDeclaration(node) {
-            if (node.expression.kind === 100 /* ThisKeyword */) {
+            if (node.expression.kind === 101 /* ThisKeyword */) {
                 bindThisPropertyAssignment(node);
             }
-            else if (ts.isPropertyAccessEntityNameExpression(node) && node.parent.parent.kind === 284 /* SourceFile */) {
+            else if (ts.isPropertyAccessEntityNameExpression(node) && node.parent.parent.kind === 285 /* SourceFile */) {
                 if (ts.isPrototypeAccess(node.expression)) {
                     bindPrototypePropertyAssignment(node, node.parent);
                 }
@@ -29735,7 +29924,7 @@ var ts;
         }
         function bindObjectDefinePropertyAssignment(node) {
             var namespaceSymbol = lookupSymbolForPropertyAccess(node.arguments[0]);
-            var isToplevel = node.parent.parent.kind === 284 /* SourceFile */;
+            var isToplevel = node.parent.parent.kind === 285 /* SourceFile */;
             namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, node.arguments[0], isToplevel, /*isPrototypeProperty*/ false);
             bindPotentiallyNewExpandoMemberToNamespace(node, namespaceSymbol, /*isPrototypeProperty*/ false);
         }
@@ -29749,7 +29938,7 @@ var ts;
             // Fix up parent pointers since we're going to use these nodes before we bind into them
             node.left.parent = node;
             node.right.parent = node;
-            if (ts.isIdentifier(lhs.expression) && container === file && isNameOfExportsOrModuleExportsAliasDeclaration(file, lhs.expression)) {
+            if (ts.isIdentifier(lhs.expression) && container === file && isExportsOrModuleExportsOrAlias(file, lhs.expression)) {
                 // This can be an alias for the 'exports' or 'module.exports' names, e.g.
                 //    var util = module.exports;
                 //    util.property = function ...
@@ -29802,8 +29991,8 @@ var ts;
         function bindPropertyAssignment(name, propertyAccess, isPrototypeProperty) {
             var namespaceSymbol = lookupSymbolForPropertyAccess(name);
             var isToplevel = ts.isBinaryExpression(propertyAccess.parent)
-                ? getParentOfBinaryExpression(propertyAccess.parent).parent.kind === 284 /* SourceFile */
-                : propertyAccess.parent.parent.kind === 284 /* SourceFile */;
+                ? getParentOfBinaryExpression(propertyAccess.parent).parent.kind === 285 /* SourceFile */
+                : propertyAccess.parent.parent.kind === 285 /* SourceFile */;
             namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, propertyAccess.expression, isToplevel, isPrototypeProperty);
             bindPotentiallyNewExpandoMemberToNamespace(propertyAccess, namespaceSymbol, isPrototypeProperty);
         }
@@ -29862,9 +30051,7 @@ var ts;
             }
             else {
                 var s = forEachIdentifierInEntityName(e.expression, parent, action);
-                if (!s || !s.exports)
-                    return ts.Debug.fail();
-                return action(e.name, s.exports.get(e.name.escapedText), s);
+                return action(e.name, s && s.exports && s.exports.get(e.name.escapedText), s);
             }
         }
         function bindCallExpression(node) {
@@ -29875,7 +30062,7 @@ var ts;
             }
         }
         function bindClassLikeDeclaration(node) {
-            if (node.kind === 240 /* ClassDeclaration */) {
+            if (node.kind === 241 /* ClassDeclaration */) {
                 bindBlockScopedDeclaration(node, 32 /* Class */, 68008383 /* ClassExcludes */);
             }
             else {
@@ -29941,7 +30128,7 @@ var ts;
             }
         }
         function bindParameter(node) {
-            if (node.kind === 304 /* JSDocParameterTag */ && container.kind !== 298 /* JSDocSignature */) {
+            if (node.kind === 305 /* JSDocParameterTag */ && container.kind !== 299 /* JSDocSignature */) {
                 return;
             }
             if (inStrictMode && !(node.flags & 4194304 /* Ambient */)) {
@@ -30018,7 +30205,7 @@ var ts;
                     declareSymbolAndAddToSymbolTable(node, 262144 /* TypeParameter */, 67635688 /* TypeParameterExcludes */);
                 }
             }
-            else if (node.parent.kind === 176 /* InferType */) {
+            else if (node.parent.kind === 177 /* InferType */) {
                 var container_2 = getInferTypeContainer(node.parent);
                 if (container_2) {
                     if (!container_2.locals) {
@@ -30046,11 +30233,11 @@ var ts;
             if (currentFlow === unreachableFlow) {
                 var reportError = 
                 // report error on all statements except empty ones
-                (ts.isStatementButNotDeclaration(node) && node.kind !== 220 /* EmptyStatement */) ||
+                (ts.isStatementButNotDeclaration(node) && node.kind !== 221 /* EmptyStatement */) ||
                     // report error on class declarations
-                    node.kind === 240 /* ClassDeclaration */ ||
+                    node.kind === 241 /* ClassDeclaration */ ||
                     // report error on instantiated modules or const-enums only modules if preserveConstEnums is set
-                    (node.kind === 244 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node));
+                    (node.kind === 245 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node));
                 if (reportError) {
                     currentFlow = reportedUnreachableFlow;
                     if (!options.allowUnreachableCode) {
@@ -30094,32 +30281,41 @@ var ts;
     }
     function isPurelyTypeDeclaration(s) {
         switch (s.kind) {
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return true;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return getModuleInstanceState(s) !== 1 /* Instantiated */;
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 return ts.hasModifier(s, 2048 /* Const */);
             default:
                 return false;
         }
     }
     function isExportsOrModuleExportsOrAlias(sourceFile, node) {
-        return ts.isExportsIdentifier(node) ||
-            ts.isModuleExportsPropertyAccessExpression(node) ||
-            ts.isIdentifier(node) && isNameOfExportsOrModuleExportsAliasDeclaration(sourceFile, node);
+        var i = 0;
+        var q = [node];
+        while (q.length && i < 100) {
+            i++;
+            node = q.shift();
+            if (ts.isExportsIdentifier(node) || ts.isModuleExportsPropertyAccessExpression(node)) {
+                return true;
+            }
+            else if (ts.isIdentifier(node)) {
+                var symbol = lookupSymbolForNameWorker(sourceFile, node.escapedText);
+                if (!!symbol && !!symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) && !!symbol.valueDeclaration.initializer) {
+                    var init = symbol.valueDeclaration.initializer;
+                    q.push(init);
+                    if (ts.isAssignmentExpression(init, /*excludeCompoundAssignment*/ true)) {
+                        q.push(init.left);
+                        q.push(init.right);
+                    }
+                }
+            }
+        }
+        return false;
     }
     ts.isExportsOrModuleExportsOrAlias = isExportsOrModuleExportsOrAlias;
-    function isNameOfExportsOrModuleExportsAliasDeclaration(sourceFile, node) {
-        var symbol = lookupSymbolForNameWorker(sourceFile, node.escapedText);
-        return !!symbol && !!symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) &&
-            !!symbol.valueDeclaration.initializer && isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, symbol.valueDeclaration.initializer);
-    }
-    function isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, node) {
-        return isExportsOrModuleExportsOrAlias(sourceFile, node) ||
-            (ts.isAssignmentExpression(node, /*excludeCompoundAssignment*/ true) && (isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, node.left) || isExportsOrModuleExportsOrAliasOrAssignment(sourceFile, node.right)));
-    }
     function lookupSymbolForNameWorker(container, name) {
         var local = container.locals && container.locals.get(name);
         if (local) {
@@ -30139,58 +30335,58 @@ var ts;
     function computeTransformFlagsForNode(node, subtreeFlags) {
         var kind = node.kind;
         switch (kind) {
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return computeCallExpression(node, subtreeFlags);
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return computeNewExpression(node, subtreeFlags);
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return computeModuleDeclaration(node, subtreeFlags);
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return computeParenthesizedExpression(node, subtreeFlags);
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 return computeBinaryExpression(node, subtreeFlags);
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 return computeExpressionStatement(node, subtreeFlags);
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 return computeParameter(node, subtreeFlags);
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 return computeArrowFunction(node, subtreeFlags);
-            case 196 /* FunctionExpression */:
+            case 197 /* FunctionExpression */:
                 return computeFunctionExpression(node, subtreeFlags);
-            case 239 /* FunctionDeclaration */:
+            case 240 /* FunctionDeclaration */:
                 return computeFunctionDeclaration(node, subtreeFlags);
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 return computeVariableDeclaration(node, subtreeFlags);
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 return computeVariableDeclarationList(node, subtreeFlags);
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 return computeVariableStatement(node, subtreeFlags);
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 return computeLabeledStatement(node, subtreeFlags);
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 return computeClassDeclaration(node, subtreeFlags);
-            case 209 /* ClassExpression */:
+            case 210 /* ClassExpression */:
                 return computeClassExpression(node, subtreeFlags);
-            case 273 /* HeritageClause */:
+            case 274 /* HeritageClause */:
                 return computeHeritageClause(node, subtreeFlags);
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return computeCatchClause(node, subtreeFlags);
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return computeExpressionWithTypeArguments(node, subtreeFlags);
-            case 157 /* Constructor */:
+            case 158 /* Constructor */:
                 return computeConstructor(node, subtreeFlags);
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 return computePropertyDeclaration(node, subtreeFlags);
-            case 156 /* MethodDeclaration */:
+            case 157 /* MethodDeclaration */:
                 return computeMethod(node, subtreeFlags);
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
                 return computeAccessor(node, subtreeFlags);
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return computeImportEquals(node, subtreeFlags);
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return computePropertyAccess(node, subtreeFlags);
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return computeElementAccess(node, subtreeFlags);
             default:
                 return computeOther(node, kind, subtreeFlags);
@@ -30212,7 +30408,7 @@ var ts;
                 transformFlags |= 2048 /* ContainsLexicalThis */;
             }
         }
-        if (expression.kind === 92 /* ImportKeyword */) {
+        if (expression.kind === 93 /* ImportKeyword */) {
             transformFlags |= 524288 /* ContainsDynamicImport */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
@@ -30235,17 +30431,17 @@ var ts;
         var transformFlags = subtreeFlags;
         var operatorTokenKind = node.operatorToken.kind;
         var leftKind = node.left.kind;
-        if (operatorTokenKind === 59 /* EqualsToken */ && leftKind === 188 /* ObjectLiteralExpression */) {
+        if (operatorTokenKind === 60 /* EqualsToken */ && leftKind === 189 /* ObjectLiteralExpression */) {
             // Destructuring object assignments with are ES2015 syntax
             // and possibly ES2018 if they contain rest
             transformFlags |= 16 /* AssertES2018 */ | 128 /* AssertES2015 */ | 512 /* AssertDestructuringAssignment */;
         }
-        else if (operatorTokenKind === 59 /* EqualsToken */ && leftKind === 187 /* ArrayLiteralExpression */) {
+        else if (operatorTokenKind === 60 /* EqualsToken */ && leftKind === 188 /* ArrayLiteralExpression */) {
             // Destructuring assignments are ES2015 syntax.
             transformFlags |= 128 /* AssertES2015 */ | 512 /* AssertDestructuringAssignment */;
         }
         else if (operatorTokenKind === 41 /* AsteriskAsteriskToken */
-            || operatorTokenKind === 63 /* AsteriskAsteriskEqualsToken */) {
+            || operatorTokenKind === 64 /* AsteriskAsteriskEqualsToken */) {
             // Exponentiation is ES2016 syntax.
             transformFlags |= 64 /* AssertES2016 */;
         }
@@ -30288,8 +30484,8 @@ var ts;
         // If the node is synthesized, it means the emitter put the parentheses there,
         // not the user. If we didn't want them, the emitter would not have put them
         // there.
-        if (expressionKind === 212 /* AsExpression */
-            || expressionKind === 194 /* TypeAssertionExpression */) {
+        if (expressionKind === 213 /* AsExpression */
+            || expressionKind === 195 /* TypeAssertionExpression */) {
             transformFlags |= 1 /* AssertTypeScript */;
         }
         node.transformFlags = transformFlags | 536870912 /* HasComputedFlags */;
@@ -30331,11 +30527,11 @@ var ts;
     function computeHeritageClause(node, subtreeFlags) {
         var transformFlags = subtreeFlags;
         switch (node.token) {
-            case 86 /* ExtendsKeyword */:
+            case 87 /* ExtendsKeyword */:
                 // An `extends` HeritageClause is ES6 syntax.
                 transformFlags |= 128 /* AssertES2015 */;
                 break;
-            case 109 /* ImplementsKeyword */:
+            case 110 /* ImplementsKeyword */:
                 // An `implements` HeritageClause is TypeScript syntax.
                 transformFlags |= 1 /* AssertTypeScript */;
                 break;
@@ -30528,7 +30724,7 @@ var ts;
         var transformFlags = subtreeFlags;
         // If a PropertyAccessExpression starts with a super keyword, then it is
         // ES6 syntax, and requires a lexical `this` binding.
-        if (node.expression.kind === 98 /* SuperKeyword */) {
+        if (node.expression.kind === 99 /* SuperKeyword */) {
             // super inside of an async function requires hoisting the super access (ES2017).
             // same for super inside of an async generator, which is ES2018.
             transformFlags |= 32 /* ContainsES2017 */ | 16 /* ContainsES2018 */;
@@ -30540,7 +30736,7 @@ var ts;
         var transformFlags = subtreeFlags;
         // If an ElementAccessExpression starts with a super keyword, then it is
         // ES6 syntax, and requires a lexical `this` binding.
-        if (node.expression.kind === 98 /* SuperKeyword */) {
+        if (node.expression.kind === 99 /* SuperKeyword */) {
             // super inside of an async function requires hoisting the super access (ES2017).
             // same for super inside of an async generator, which is ES2018.
             transformFlags |= 32 /* ContainsES2017 */ | 16 /* ContainsES2018 */;
@@ -30628,43 +30824,43 @@ var ts;
         var transformFlags = subtreeFlags;
         var excludeFlags = 536870912 /* NodeExcludes */;
         switch (kind) {
-            case 121 /* AsyncKeyword */:
-            case 201 /* AwaitExpression */:
+            case 122 /* AsyncKeyword */:
+            case 202 /* AwaitExpression */:
                 // async/await is ES2017 syntax, but may be ES2018 syntax (for async generators)
                 transformFlags |= 16 /* AssertES2018 */ | 32 /* AssertES2017 */;
                 break;
-            case 194 /* TypeAssertionExpression */:
-            case 212 /* AsExpression */:
-            case 313 /* PartiallyEmittedExpression */:
+            case 195 /* TypeAssertionExpression */:
+            case 213 /* AsExpression */:
+            case 314 /* PartiallyEmittedExpression */:
                 // These nodes are TypeScript syntax.
                 transformFlags |= 1 /* AssertTypeScript */;
                 excludeFlags = 536870912 /* OuterExpressionExcludes */;
                 break;
-            case 115 /* PublicKeyword */:
-            case 113 /* PrivateKeyword */:
-            case 114 /* ProtectedKeyword */:
-            case 118 /* AbstractKeyword */:
-            case 125 /* DeclareKeyword */:
-            case 77 /* ConstKeyword */:
-            case 243 /* EnumDeclaration */:
-            case 278 /* EnumMember */:
-            case 213 /* NonNullExpression */:
-            case 133 /* ReadonlyKeyword */:
+            case 116 /* PublicKeyword */:
+            case 114 /* PrivateKeyword */:
+            case 115 /* ProtectedKeyword */:
+            case 119 /* AbstractKeyword */:
+            case 126 /* DeclareKeyword */:
+            case 78 /* ConstKeyword */:
+            case 244 /* EnumDeclaration */:
+            case 279 /* EnumMember */:
+            case 214 /* NonNullExpression */:
+            case 134 /* ReadonlyKeyword */:
                 // These nodes are TypeScript syntax.
                 transformFlags |= 1 /* AssertTypeScript */;
                 break;
-            case 260 /* JsxElement */:
-            case 261 /* JsxSelfClosingElement */:
-            case 262 /* JsxOpeningElement */:
+            case 261 /* JsxElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 263 /* JsxOpeningElement */:
             case 11 /* JsxText */:
-            case 263 /* JsxClosingElement */:
-            case 264 /* JsxFragment */:
-            case 265 /* JsxOpeningFragment */:
-            case 266 /* JsxClosingFragment */:
-            case 267 /* JsxAttribute */:
-            case 268 /* JsxAttributes */:
-            case 269 /* JsxSpreadAttribute */:
-            case 270 /* JsxExpression */:
+            case 264 /* JsxClosingElement */:
+            case 265 /* JsxFragment */:
+            case 266 /* JsxOpeningFragment */:
+            case 267 /* JsxClosingFragment */:
+            case 268 /* JsxAttribute */:
+            case 269 /* JsxAttributes */:
+            case 270 /* JsxSpreadAttribute */:
+            case 271 /* JsxExpression */:
                 // These nodes are Jsx syntax.
                 transformFlags |= 2 /* AssertJsx */;
                 break;
@@ -30672,11 +30868,11 @@ var ts;
             case 15 /* TemplateHead */:
             case 16 /* TemplateMiddle */:
             case 17 /* TemplateTail */:
-            case 206 /* TemplateExpression */:
-            case 193 /* TaggedTemplateExpression */:
-            case 276 /* ShorthandPropertyAssignment */:
-            case 116 /* StaticKeyword */:
-            case 214 /* MetaProperty */:
+            case 207 /* TemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
+            case 277 /* ShorthandPropertyAssignment */:
+            case 117 /* StaticKeyword */:
+            case 215 /* MetaProperty */:
                 // These nodes are ES6 syntax.
                 transformFlags |= 128 /* AssertES2015 */;
                 break;
@@ -30693,103 +30889,103 @@ var ts;
             case 9 /* BigIntLiteral */:
                 transformFlags |= 4 /* AssertESNext */;
                 break;
-            case 227 /* ForOfStatement */:
+            case 228 /* ForOfStatement */:
                 // This node is either ES2015 syntax or ES2017 syntax (if it is a for-await-of).
                 if (node.awaitModifier) {
                     transformFlags |= 16 /* AssertES2018 */;
                 }
                 transformFlags |= 128 /* AssertES2015 */;
                 break;
-            case 207 /* YieldExpression */:
+            case 208 /* YieldExpression */:
                 // This node is either ES2015 syntax (in a generator) or ES2017 syntax (in an async
                 // generator).
                 transformFlags |= 16 /* AssertES2018 */ | 128 /* AssertES2015 */ | 131072 /* ContainsYield */;
                 break;
-            case 120 /* AnyKeyword */:
-            case 135 /* NumberKeyword */:
-            case 146 /* BigIntKeyword */:
-            case 132 /* NeverKeyword */:
-            case 136 /* ObjectKeyword */:
-            case 138 /* StringKeyword */:
-            case 123 /* BooleanKeyword */:
-            case 139 /* SymbolKeyword */:
-            case 106 /* VoidKeyword */:
-            case 150 /* TypeParameter */:
-            case 153 /* PropertySignature */:
-            case 155 /* MethodSignature */:
-            case 160 /* CallSignature */:
-            case 161 /* ConstructSignature */:
-            case 162 /* IndexSignature */:
-            case 163 /* TypePredicate */:
-            case 164 /* TypeReference */:
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
-            case 167 /* TypeQuery */:
-            case 168 /* TypeLiteral */:
-            case 169 /* ArrayType */:
-            case 170 /* TupleType */:
-            case 171 /* OptionalType */:
-            case 172 /* RestType */:
-            case 173 /* UnionType */:
-            case 174 /* IntersectionType */:
-            case 175 /* ConditionalType */:
-            case 176 /* InferType */:
-            case 177 /* ParenthesizedType */:
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 178 /* ThisType */:
-            case 179 /* TypeOperator */:
-            case 180 /* IndexedAccessType */:
-            case 181 /* MappedType */:
-            case 182 /* LiteralType */:
-            case 247 /* NamespaceExportDeclaration */:
+            case 121 /* AnyKeyword */:
+            case 136 /* NumberKeyword */:
+            case 147 /* BigIntKeyword */:
+            case 133 /* NeverKeyword */:
+            case 137 /* ObjectKeyword */:
+            case 139 /* StringKeyword */:
+            case 124 /* BooleanKeyword */:
+            case 140 /* SymbolKeyword */:
+            case 107 /* VoidKeyword */:
+            case 151 /* TypeParameter */:
+            case 154 /* PropertySignature */:
+            case 156 /* MethodSignature */:
+            case 161 /* CallSignature */:
+            case 162 /* ConstructSignature */:
+            case 163 /* IndexSignature */:
+            case 164 /* TypePredicate */:
+            case 165 /* TypeReference */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
+            case 168 /* TypeQuery */:
+            case 169 /* TypeLiteral */:
+            case 170 /* ArrayType */:
+            case 171 /* TupleType */:
+            case 172 /* OptionalType */:
+            case 173 /* RestType */:
+            case 174 /* UnionType */:
+            case 175 /* IntersectionType */:
+            case 176 /* ConditionalType */:
+            case 177 /* InferType */:
+            case 178 /* ParenthesizedType */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 179 /* ThisType */:
+            case 180 /* TypeOperator */:
+            case 181 /* IndexedAccessType */:
+            case 182 /* MappedType */:
+            case 183 /* LiteralType */:
+            case 248 /* NamespaceExportDeclaration */:
                 // Types and signatures are TypeScript syntax, and exclude all other facts.
                 transformFlags = 1 /* AssertTypeScript */;
                 excludeFlags = -2 /* TypeExcludes */;
                 break;
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 // Even though computed property names are ES6, we don't treat them as such.
                 // This is so that they can flow through PropertyName transforms unaffected.
                 // Instead, we mark the container as ES6, so that it can properly handle the transform.
                 transformFlags |= 16384 /* ContainsComputedPropertyName */;
                 break;
-            case 208 /* SpreadElement */:
+            case 209 /* SpreadElement */:
                 transformFlags |= 128 /* AssertES2015 */ | 4096 /* ContainsRestOrSpread */;
                 break;
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 transformFlags |= 16 /* AssertES2018 */ | 8192 /* ContainsObjectRestOrSpread */;
                 break;
-            case 98 /* SuperKeyword */:
+            case 99 /* SuperKeyword */:
                 // This node is ES6 syntax.
                 transformFlags |= 128 /* AssertES2015 */;
                 excludeFlags = 536870912 /* OuterExpressionExcludes */; // must be set to persist `Super`
                 break;
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
                 // Mark this node and its ancestors as containing a lexical `this` keyword.
                 transformFlags |= 2048 /* ContainsLexicalThis */;
                 break;
-            case 184 /* ObjectBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
                 transformFlags |= 128 /* AssertES2015 */ | 65536 /* ContainsBindingPattern */;
                 if (subtreeFlags & 4096 /* ContainsRestOrSpread */) {
                     transformFlags |= 16 /* AssertES2018 */ | 8192 /* ContainsObjectRestOrSpread */;
                 }
                 excludeFlags = 536875008 /* BindingPatternExcludes */;
                 break;
-            case 185 /* ArrayBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 transformFlags |= 128 /* AssertES2015 */ | 65536 /* ContainsBindingPattern */;
                 excludeFlags = 536875008 /* BindingPatternExcludes */;
                 break;
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 transformFlags |= 128 /* AssertES2015 */;
                 if (node.dotDotDotToken) {
                     transformFlags |= 4096 /* ContainsRestOrSpread */;
                 }
                 break;
-            case 152 /* Decorator */:
+            case 153 /* Decorator */:
                 // This node is TypeScript syntax, and marks its container as also being TypeScript syntax.
                 transformFlags |= 1 /* AssertTypeScript */ | 1024 /* ContainsTypeScriptClassSyntax */;
                 break;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 excludeFlags = 536896512 /* ObjectLiteralExcludes */;
                 if (subtreeFlags & 16384 /* ContainsComputedPropertyName */) {
                     // If an ObjectLiteralExpression contains a ComputedPropertyName, then it
@@ -30802,26 +30998,26 @@ var ts;
                     transformFlags |= 16 /* AssertES2018 */;
                 }
                 break;
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 excludeFlags = 536875008 /* ArrayLiteralOrCallOrNewExcludes */;
                 break;
-            case 223 /* DoStatement */:
-            case 224 /* WhileStatement */:
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
+            case 224 /* DoStatement */:
+            case 225 /* WhileStatement */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
                 // A loop containing a block scoped binding *may* need to be transformed from ES6.
                 if (subtreeFlags & 32768 /* ContainsBlockScopedBinding */) {
                     transformFlags |= 128 /* AssertES2015 */;
                 }
                 break;
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 break;
-            case 230 /* ReturnStatement */:
+            case 231 /* ReturnStatement */:
                 // Return statements may require an `await` in ES2018.
                 transformFlags |= 262144 /* ContainsHoistedDeclarationOrCompletion */ | 16 /* AssertES2018 */;
                 break;
-            case 228 /* ContinueStatement */:
-            case 229 /* BreakStatement */:
+            case 229 /* ContinueStatement */:
+            case 230 /* BreakStatement */:
                 transformFlags |= 262144 /* ContainsHoistedDeclarationOrCompletion */;
                 break;
         }
@@ -30839,67 +31035,67 @@ var ts;
      *       than calling this function.
      */
     function getTransformFlagsSubtreeExclusions(kind) {
-        if (kind >= 163 /* FirstTypeNode */ && kind <= 183 /* LastTypeNode */) {
+        if (kind >= 164 /* FirstTypeNode */ && kind <= 184 /* LastTypeNode */) {
             return -2 /* TypeExcludes */;
         }
         switch (kind) {
-            case 191 /* CallExpression */:
-            case 192 /* NewExpression */:
-            case 187 /* ArrayLiteralExpression */:
+            case 192 /* CallExpression */:
+            case 193 /* NewExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 return 536875008 /* ArrayLiteralOrCallOrNewExcludes */;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return 537168896 /* ModuleExcludes */;
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 return 536870912 /* ParameterExcludes */;
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 return 537371648 /* ArrowFunctionExcludes */;
-            case 196 /* FunctionExpression */:
-            case 239 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 240 /* FunctionDeclaration */:
                 return 537373696 /* FunctionExcludes */;
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 return 536944640 /* VariableDeclarationListExcludes */;
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
                 return 536888320 /* ClassExcludes */;
-            case 157 /* Constructor */:
+            case 158 /* Constructor */:
                 return 537372672 /* ConstructorExcludes */;
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
                 return 537372672 /* MethodOrAccessorExcludes */;
-            case 120 /* AnyKeyword */:
-            case 135 /* NumberKeyword */:
-            case 146 /* BigIntKeyword */:
-            case 132 /* NeverKeyword */:
-            case 138 /* StringKeyword */:
-            case 136 /* ObjectKeyword */:
-            case 123 /* BooleanKeyword */:
-            case 139 /* SymbolKeyword */:
-            case 106 /* VoidKeyword */:
-            case 150 /* TypeParameter */:
-            case 153 /* PropertySignature */:
-            case 155 /* MethodSignature */:
-            case 160 /* CallSignature */:
-            case 161 /* ConstructSignature */:
-            case 162 /* IndexSignature */:
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
+            case 121 /* AnyKeyword */:
+            case 136 /* NumberKeyword */:
+            case 147 /* BigIntKeyword */:
+            case 133 /* NeverKeyword */:
+            case 139 /* StringKeyword */:
+            case 137 /* ObjectKeyword */:
+            case 124 /* BooleanKeyword */:
+            case 140 /* SymbolKeyword */:
+            case 107 /* VoidKeyword */:
+            case 151 /* TypeParameter */:
+            case 154 /* PropertySignature */:
+            case 156 /* MethodSignature */:
+            case 161 /* CallSignature */:
+            case 162 /* ConstructSignature */:
+            case 163 /* IndexSignature */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return -2 /* TypeExcludes */;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return 536896512 /* ObjectLiteralExcludes */;
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return 536879104 /* CatchClauseExcludes */;
-            case 184 /* ObjectBindingPattern */:
-            case 185 /* ArrayBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 return 536875008 /* BindingPatternExcludes */;
-            case 194 /* TypeAssertionExpression */:
-            case 212 /* AsExpression */:
-            case 313 /* PartiallyEmittedExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 98 /* SuperKeyword */:
+            case 195 /* TypeAssertionExpression */:
+            case 213 /* AsExpression */:
+            case 314 /* PartiallyEmittedExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 99 /* SuperKeyword */:
                 return 536870912 /* OuterExpressionExcludes */;
-            case 189 /* PropertyAccessExpression */:
-            case 190 /* ElementAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return 536870912 /* PropertyAccessExcludes */;
             default:
                 return 536870912 /* NodeExcludes */;
@@ -31074,7 +31270,7 @@ var ts;
                     //  (their type resolved directly to the member deeply referenced)
                     // So to get the intervening symbols, we need to check if there's a type
                     // query node on any of the symbol's declarations and get symbols there
-                    if (d.type && d.type.kind === 167 /* TypeQuery */) {
+                    if (d.type && d.type.kind === 168 /* TypeQuery */) {
                         var query = d.type;
                         var entity = getResolvedSymbol(getFirstIdentifier(query.exprName));
                         visitSymbol(entity);
@@ -31173,8 +31369,6 @@ var ts;
         undefinedSymbol.declarations = [];
         var globalThisSymbol = createSymbol(1536 /* Module */, "globalThis", 8 /* Readonly */);
         globalThisSymbol.exports = globals;
-        globalThisSymbol.valueDeclaration = ts.createNode(72 /* Identifier */);
-        globalThisSymbol.valueDeclaration.escapedText = "globalThis";
         globals.set(globalThisSymbol.escapedName, globalThisSymbol);
         var argumentsSymbol = createSymbol(4 /* Property */, "arguments");
         var requireSymbol = createSymbol(4 /* Property */, "require");
@@ -31190,6 +31384,11 @@ var ts;
             getIdentifierCount: function () { return ts.sum(host.getSourceFiles(), "identifierCount"); },
             getSymbolCount: function () { return ts.sum(host.getSourceFiles(), "symbolCount") + symbolCount; },
             getTypeCount: function () { return typeCount; },
+            getRelationCacheSizes: function () { return ({
+                assignable: assignableRelation.size,
+                identity: identityRelation.size,
+                subtype: subtypeRelation.size,
+            }); },
             isUndefinedSymbol: function (symbol) { return symbol === undefinedSymbol; },
             isArgumentsSymbol: function (symbol) { return symbol === argumentsSymbol; },
             isUnknownSymbol: function (symbol) { return symbol === unknownSymbol; },
@@ -31256,6 +31455,10 @@ var ts;
                 node = ts.getParseTreeNode(node);
                 return node ? getTypeOfNode(node) : errorType;
             },
+            getTypeOfAssignmentPattern: function (nodeIn) {
+                var node = ts.getParseTreeNode(nodeIn, ts.isAssignmentPattern);
+                return node && getTypeOfAssignmentPattern(node) || errorType;
+            },
             getPropertySymbolOfDestructuringAssignment: function (locationIn) {
                 var location = ts.getParseTreeNode(locationIn, ts.isIdentifier);
                 return location ? getPropertySymbolOfDestructuringAssignment(location) : undefined;
@@ -31304,11 +31507,11 @@ var ts;
             },
             isContextSensitive: isContextSensitive,
             getFullyQualifiedName: getFullyQualifiedName,
-            getResolvedSignature: function (node, candidatesOutArray, agumentCount) {
-                return getResolvedSignatureWorker(node, candidatesOutArray, agumentCount, 0 /* Normal */);
+            getResolvedSignature: function (node, candidatesOutArray, argumentCount) {
+                return getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 0 /* Normal */);
             },
-            getResolvedSignatureForSignatureHelp: function (node, candidatesOutArray, agumentCount) {
-                return getResolvedSignatureWorker(node, candidatesOutArray, agumentCount, 16 /* IsForSignatureHelp */);
+            getResolvedSignatureForSignatureHelp: function (node, candidatesOutArray, argumentCount) {
+                return getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 16 /* IsForSignatureHelp */);
             },
             getExpandedParameters: getExpandedParameters,
             hasEffectiveRestParameter: hasEffectiveRestParameter,
@@ -31451,7 +31654,7 @@ var ts;
         var intersectionTypes = ts.createMap();
         var literalTypes = ts.createMap();
         var indexedAccessTypes = ts.createMap();
-        var conditionalTypes = ts.createMap();
+        var substitutionTypes = ts.createMap();
         var evolvingArrayTypes = [];
         var undefinedProperties = ts.createMap();
         var unknownSymbol = createSymbol(4 /* Property */, "unknown");
@@ -31461,10 +31664,10 @@ var ts;
         var wildcardType = createIntrinsicType(1 /* Any */, "any");
         var errorType = createIntrinsicType(1 /* Any */, "error");
         var unknownType = createIntrinsicType(2 /* Unknown */, "unknown");
-        var undefinedType = createNullableType(32768 /* Undefined */, "undefined", 0);
-        var undefinedWideningType = strictNullChecks ? undefinedType : createNullableType(32768 /* Undefined */, "undefined", 131072 /* ContainsWideningType */);
-        var nullType = createNullableType(65536 /* Null */, "null", 0);
-        var nullWideningType = strictNullChecks ? nullType : createNullableType(65536 /* Null */, "null", 131072 /* ContainsWideningType */);
+        var undefinedType = createIntrinsicType(32768 /* Undefined */, "undefined");
+        var undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(32768 /* Undefined */, "undefined", 131072 /* ContainsWideningType */);
+        var nullType = createIntrinsicType(65536 /* Null */, "null");
+        var nullWideningType = strictNullChecks ? nullType : createIntrinsicType(65536 /* Null */, "null", 131072 /* ContainsWideningType */);
         var stringType = createIntrinsicType(4 /* String */, "string");
         var numberType = createIntrinsicType(8 /* Number */, "number");
         var bigintType = createIntrinsicType(64 /* BigInt */, "bigint");
@@ -31490,6 +31693,7 @@ var ts;
         var voidType = createIntrinsicType(16384 /* Void */, "void");
         var neverType = createIntrinsicType(131072 /* Never */, "never");
         var silentNeverType = createIntrinsicType(131072 /* Never */, "never");
+        var nonInferrableType = createIntrinsicType(131072 /* Never */, "never", 524288 /* NonInferrableType */);
         var implicitNeverType = createIntrinsicType(131072 /* Never */, "never");
         var nonPrimitiveType = createIntrinsicType(67108864 /* NonPrimitive */, "object");
         var stringNumberSymbolType = getUnionType([stringType, numberType, esSymbolType]);
@@ -31506,7 +31710,7 @@ var ts;
         var anyFunctionType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         // The anyFunctionType contains the anyFunctionType by definition. The flag is further propagated
         // in getPropagatingFlagsOfTypes, and it is checked in inferFromTypes.
-        anyFunctionType.objectFlags |= 524288 /* ContainsAnyFunctionType */;
+        anyFunctionType.objectFlags |= 524288 /* NonInferrableType */;
         var noConstraintType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         var circularConstraintType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         var resolvingDefaultType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
@@ -31530,6 +31734,7 @@ var ts;
          * This is only used if there is no exact match.
          */
         var patternAmbientModules;
+        var patternAmbientModuleAugmentations;
         var globalObjectType;
         var globalFunctionType;
         var globalCallableFunctionType;
@@ -31564,8 +31769,7 @@ var ts;
         var deferredGlobalTemplateStringsArrayType;
         var deferredGlobalImportMetaType;
         var deferredGlobalExtractSymbol;
-        var deferredGlobalExcludeSymbol;
-        var deferredGlobalPickSymbol;
+        var deferredGlobalOmitSymbol;
         var deferredGlobalBigIntType;
         var allPotentiallyUnusedIdentifiers = ts.createMap(); // key is file name
         var flowLoopStart = 0;
@@ -31584,6 +31788,8 @@ var ts;
         var symbolLinks = [];
         var nodeLinks = [];
         var flowLoopCaches = [];
+        var flowAssignmentKeys = [];
+        var flowAssignmentTypes = [];
         var flowLoopNodes = [];
         var flowLoopKeys = [];
         var flowLoopTypes = [];
@@ -31700,6 +31906,7 @@ var ts;
         var typeofType = createTypeofType();
         var _jsxNamespace;
         var _jsxFactoryEntity;
+        var outofbandVarianceMarkerHandler;
         var subtypeRelation = ts.createMap();
         var assignableRelation = ts.createMap();
         var comparableRelation = ts.createMap();
@@ -31724,6 +31931,18 @@ var ts;
             CheckMode[CheckMode["SkipGenericFunctions"] = 8] = "SkipGenericFunctions";
             CheckMode[CheckMode["IsForSignatureHelp"] = 16] = "IsForSignatureHelp";
         })(CheckMode || (CheckMode = {}));
+        var ContextFlags;
+        (function (ContextFlags) {
+            ContextFlags[ContextFlags["None"] = 0] = "None";
+            ContextFlags[ContextFlags["Signature"] = 1] = "Signature";
+        })(ContextFlags || (ContextFlags = {}));
+        var AccessFlags;
+        (function (AccessFlags) {
+            AccessFlags[AccessFlags["None"] = 0] = "None";
+            AccessFlags[AccessFlags["NoIndexSignatures"] = 1] = "NoIndexSignatures";
+            AccessFlags[AccessFlags["Writing"] = 2] = "Writing";
+            AccessFlags[AccessFlags["CacheSymbol"] = 4] = "CacheSymbol";
+        })(AccessFlags || (AccessFlags = {}));
         var CallbackCheck;
         (function (CallbackCheck) {
             CallbackCheck[CallbackCheck["None"] = 0] = "None";
@@ -31898,7 +32117,8 @@ var ts;
          * Note: if target is transient, then it is mutable, and mergeSymbol with both mutate and return it.
          * If target is not transient, mergeSymbol will produce a transient clone, mutate that and return it.
          */
-        function mergeSymbol(target, source) {
+        function mergeSymbol(target, source, unidirectional) {
+            if (unidirectional === void 0) { unidirectional = false; }
             if (!(target.flags & getExcludedSymbolFlags(source.flags)) ||
                 (source.flags | target.flags) & 67108864 /* Assignment */) {
                 ts.Debug.assert(source !== target);
@@ -31926,17 +32146,24 @@ var ts;
                 if (source.members) {
                     if (!target.members)
                         target.members = ts.createSymbolTable();
-                    mergeSymbolTable(target.members, source.members);
+                    mergeSymbolTable(target.members, source.members, unidirectional);
                 }
                 if (source.exports) {
                     if (!target.exports)
                         target.exports = ts.createSymbolTable();
-                    mergeSymbolTable(target.exports, source.exports);
+                    mergeSymbolTable(target.exports, source.exports, unidirectional);
+                }
+                if (!unidirectional) {
+                    recordMergedSymbol(target, source);
                 }
-                recordMergedSymbol(target, source);
             }
             else if (target.flags & 1024 /* NamespaceModule */) {
-                error(ts.getNameOfDeclaration(source.declarations[0]), ts.Diagnostics.Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity, symbolToString(target));
+                // Do not report an error when merging `var globalThis` with the built-in `globalThis`,
+                // as we will already report a "Declaration name conflicts..." error, and this error
+                // won't make much sense.
+                if (target !== globalThisSymbol) {
+                    error(ts.getNameOfDeclaration(source.declarations[0]), ts.Diagnostics.Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity, symbolToString(target));
+                }
             }
             else { // error
                 var isEitherEnum = !!(target.flags & 384 /* Enum */ || source.flags & 384 /* Enum */);
@@ -32001,10 +32228,11 @@ var ts;
             mergeSymbolTable(combined, second);
             return combined;
         }
-        function mergeSymbolTable(target, source) {
+        function mergeSymbolTable(target, source, unidirectional) {
+            if (unidirectional === void 0) { unidirectional = false; }
             source.forEach(function (sourceSymbol, id) {
                 var targetSymbol = target.get(id);
-                target.set(id, targetSymbol ? mergeSymbol(targetSymbol, sourceSymbol) : sourceSymbol);
+                target.set(id, targetSymbol ? mergeSymbol(targetSymbol, sourceSymbol, unidirectional) : sourceSymbol);
             });
         }
         function mergeModuleAugmentation(moduleName) {
@@ -32025,14 +32253,29 @@ var ts;
                 var moduleNotFoundError = !(moduleName.parent.parent.flags & 4194304 /* Ambient */)
                     ? ts.Diagnostics.Invalid_module_name_in_augmentation_module_0_cannot_be_found
                     : undefined;
-                var mainModule = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError, /*isForAugmentation*/ true);
-                if (!mainModule) {
+                var mainModule_1 = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError, /*isForAugmentation*/ true);
+                if (!mainModule_1) {
                     return;
                 }
                 // obtain item referenced by 'export='
-                mainModule = resolveExternalModuleSymbol(mainModule);
-                if (mainModule.flags & 1920 /* Namespace */) {
-                    mainModule = mergeSymbol(mainModule, moduleAugmentation.symbol);
+                mainModule_1 = resolveExternalModuleSymbol(mainModule_1);
+                if (mainModule_1.flags & 1920 /* Namespace */) {
+                    // If we’re merging an augmentation to a pattern ambient module, we want to
+                    // perform the merge unidirectionally from the augmentation ('a.foo') to
+                    // the pattern ('*.foo'), so that 'getMergedSymbol()' on a.foo gives you
+                    // all the exports both from the pattern and from the augmentation, but
+                    // 'getMergedSymbol()' on *.foo only gives you exports from *.foo.
+                    if (ts.some(patternAmbientModules, function (module) { return mainModule_1 === module.symbol; })) {
+                        var merged = mergeSymbol(moduleAugmentation.symbol, mainModule_1, /*unidirectional*/ true);
+                        if (!patternAmbientModuleAugmentations) {
+                            patternAmbientModuleAugmentations = ts.createMap();
+                        }
+                        // moduleName will be a StringLiteral since this is not `declare global`.
+                        patternAmbientModuleAugmentations.set(moduleName.text, merged);
+                    }
+                    else {
+                        mergeSymbol(mainModule_1, moduleAugmentation.symbol);
+                    }
                 }
                 else {
                     // moduleName will be a StringLiteral since this is not `declare global`.
@@ -32066,7 +32309,7 @@ var ts;
             return nodeLinks[nodeId] || (nodeLinks[nodeId] = { flags: 0 });
         }
         function isGlobalSourceFile(node) {
-            return node.kind === 284 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
+            return node.kind === 285 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning) {
@@ -32124,17 +32367,17 @@ var ts;
             }
             if (declaration.pos <= usage.pos) {
                 // declaration is before usage
-                if (declaration.kind === 186 /* BindingElement */) {
+                if (declaration.kind === 187 /* BindingElement */) {
                     // still might be illegal if declaration and usage are both binding elements (eg var [a = b, b = b] = [1, 2])
-                    var errorBindingElement = ts.getAncestor(usage, 186 /* BindingElement */);
+                    var errorBindingElement = ts.getAncestor(usage, 187 /* BindingElement */);
                     if (errorBindingElement) {
                         return ts.findAncestor(errorBindingElement, ts.isBindingElement) !== ts.findAncestor(declaration, ts.isBindingElement) ||
                             declaration.pos < errorBindingElement.pos;
                     }
                     // or it might be illegal if usage happens before parent variable is declared (eg var [a] = a)
-                    return isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 237 /* VariableDeclaration */), usage);
+                    return isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 238 /* VariableDeclaration */), usage);
                 }
-                else if (declaration.kind === 237 /* VariableDeclaration */) {
+                else if (declaration.kind === 238 /* VariableDeclaration */) {
                     // still might be illegal if usage is in the initializer of the variable declaration (eg var a = a)
                     return !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
                 }
@@ -32142,6 +32385,10 @@ var ts;
                     // still might be illegal if the usage is within a computed property name in the class (eg class A { static p = "a"; [A.p]() {} })
                     return !ts.findAncestor(usage, function (n) { return ts.isComputedPropertyName(n) && n.parent.parent === declaration; });
                 }
+                else if (ts.isPropertyDeclaration(declaration)) {
+                    // still might be illegal if a self-referencing property initializer (eg private x = this.x)
+                    return !isPropertyImmediatelyReferencedWithinDeclaration(declaration, usage);
+                }
                 return true;
             }
             // declaration is after usage, but it can still be legal if usage is deferred:
@@ -32153,12 +32400,12 @@ var ts;
             // or if usage is in a type context:
             // 1. inside a type query (typeof in type position)
             // 2. inside a jsdoc comment
-            if (usage.parent.kind === 257 /* ExportSpecifier */ || (usage.parent.kind === 254 /* ExportAssignment */ && usage.parent.isExportEquals)) {
+            if (usage.parent.kind === 258 /* ExportSpecifier */ || (usage.parent.kind === 255 /* ExportAssignment */ && usage.parent.isExportEquals)) {
                 // export specifiers do not use the variable, they only make it available for use
                 return true;
             }
             // When resolving symbols for exports, the `usage` location passed in can be the export site directly
-            if (usage.kind === 254 /* ExportAssignment */ && usage.isExportEquals) {
+            if (usage.kind === 255 /* ExportAssignment */ && usage.isExportEquals) {
                 return true;
             }
             var container = ts.getEnclosingBlockScopeContainer(declaration);
@@ -32166,9 +32413,9 @@ var ts;
             function isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage) {
                 var container = ts.getEnclosingBlockScopeContainer(declaration);
                 switch (declaration.parent.parent.kind) {
-                    case 219 /* VariableStatement */:
-                    case 225 /* ForStatement */:
-                    case 227 /* ForOfStatement */:
+                    case 220 /* VariableStatement */:
+                    case 226 /* ForStatement */:
+                    case 228 /* ForOfStatement */:
                         // variable statement/for/for-of statement case,
                         // use site should not be inside variable declaration (initializer of declaration or binding element)
                         if (isSameScopeDescendentOf(usage, declaration, container)) {
@@ -32189,16 +32436,16 @@ var ts;
                         return true;
                     }
                     var initializerOfProperty = current.parent &&
-                        current.parent.kind === 154 /* PropertyDeclaration */ &&
+                        current.parent.kind === 155 /* PropertyDeclaration */ &&
                         current.parent.initializer === current;
                     if (initializerOfProperty) {
                         if (ts.hasModifier(current.parent, 32 /* Static */)) {
-                            if (declaration.kind === 156 /* MethodDeclaration */) {
+                            if (declaration.kind === 157 /* MethodDeclaration */) {
                                 return true;
                             }
                         }
                         else {
-                            var isDeclarationInstanceProperty = declaration.kind === 154 /* PropertyDeclaration */ && !ts.hasModifier(declaration, 32 /* Static */);
+                            var isDeclarationInstanceProperty = declaration.kind === 155 /* PropertyDeclaration */ && !ts.hasModifier(declaration, 32 /* Static */);
                             if (!isDeclarationInstanceProperty || ts.getContainingClass(usage) !== ts.getContainingClass(declaration)) {
                                 return true;
                             }
@@ -32207,6 +32454,36 @@ var ts;
                     return false;
                 });
             }
+            function isPropertyImmediatelyReferencedWithinDeclaration(declaration, usage) {
+                // always legal if usage is after declaration
+                if (usage.end > declaration.end) {
+                    return false;
+                }
+                // still might be legal if usage is deferred (e.g. x: any = () => this.x)
+                // otherwise illegal if immediately referenced within the declaration (e.g. x: any = this.x)
+                var ancestorChangingReferenceScope = ts.findAncestor(usage, function (node) {
+                    if (node === declaration) {
+                        return "quit";
+                    }
+                    switch (node.kind) {
+                        case 198 /* ArrowFunction */:
+                        case 155 /* PropertyDeclaration */:
+                            return true;
+                        case 219 /* Block */:
+                            switch (node.parent.kind) {
+                                case 159 /* GetAccessor */:
+                                case 157 /* MethodDeclaration */:
+                                case 160 /* SetAccessor */:
+                                    return true;
+                                default:
+                                    return false;
+                            }
+                        default:
+                            return false;
+                    }
+                });
+                return ancestorChangingReferenceScope === undefined;
+            }
         }
         /**
          * Resolve a given name for a given meaning at a given location. An error is reported if the name was not found and
@@ -32225,6 +32502,8 @@ var ts;
             var lastLocation;
             var lastSelfReferenceLocation;
             var propertyWithInvalidInitializer;
+            var associatedDeclarationForContainingInitializer;
+            var withinDeferredContext = false;
             var errorLocation = location;
             var grandparent;
             var isInExternalModule = false;
@@ -32240,12 +32519,12 @@ var ts;
                             // - parameters are only in the scope of function body
                             // This restriction does not apply to JSDoc comment types because they are parented
                             // at a higher level than type parameters would normally be
-                            if (meaning & result.flags & 67897832 /* Type */ && lastLocation.kind !== 296 /* JSDocComment */) {
+                            if (meaning & result.flags & 67897832 /* Type */ && lastLocation.kind !== 297 /* JSDocComment */) {
                                 useResult = result.flags & 262144 /* TypeParameter */
                                     // type parameters are visible in parameter list, return type and type parameter list
                                     ? lastLocation === location.type ||
-                                        lastLocation.kind === 151 /* Parameter */ ||
-                                        lastLocation.kind === 150 /* TypeParameter */
+                                        lastLocation.kind === 152 /* Parameter */ ||
+                                        lastLocation.kind === 151 /* TypeParameter */
                                     // local types not visible outside the function body
                                     : false;
                             }
@@ -32262,13 +32541,13 @@ var ts;
                                     // however it is detected separately when checking initializers of parameters
                                     // to make sure that they reference no variables declared after them.
                                     useResult =
-                                        lastLocation.kind === 151 /* Parameter */ ||
+                                        lastLocation.kind === 152 /* Parameter */ ||
                                             (lastLocation === location.type &&
                                                 !!ts.findAncestor(result.valueDeclaration, ts.isParameter));
                                 }
                             }
                         }
-                        else if (location.kind === 175 /* ConditionalType */) {
+                        else if (location.kind === 176 /* ConditionalType */) {
                             // A type parameter declared using 'infer T' in a conditional type is visible only in
                             // the true branch of the conditional type.
                             useResult = lastLocation === location.trueType;
@@ -32281,15 +32560,16 @@ var ts;
                         }
                     }
                 }
+                withinDeferredContext = withinDeferredContext || getIsDeferredContext(location, lastLocation);
                 switch (location.kind) {
-                    case 284 /* SourceFile */:
+                    case 285 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location))
                             break;
                         isInExternalModule = true;
                     // falls through
-                    case 244 /* ModuleDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         var moduleExports = getSymbolOfNode(location).exports;
-                        if (location.kind === 284 /* SourceFile */ || ts.isAmbientModule(location)) {
+                        if (location.kind === 285 /* SourceFile */ || ts.isAmbientModule(location)) {
                             // It's an external module. First see if the module has an export default and if the local
                             // name of that export default matches.
                             if (result = moduleExports.get("default" /* Default */)) {
@@ -32313,7 +32593,7 @@ var ts;
                             var moduleExport = moduleExports.get(name);
                             if (moduleExport &&
                                 moduleExport.flags === 2097152 /* Alias */ &&
-                                ts.getDeclarationOfKind(moduleExport, 257 /* ExportSpecifier */)) {
+                                ts.getDeclarationOfKind(moduleExport, 258 /* ExportSpecifier */)) {
                                 break;
                             }
                         }
@@ -32327,20 +32607,19 @@ var ts;
                             }
                         }
                         break;
-                    case 243 /* EnumDeclaration */:
+                    case 244 /* EnumDeclaration */:
                         if (result = lookup(getSymbolOfNode(location).exports, name, meaning & 8 /* EnumMember */)) {
                             break loop;
                         }
                         break;
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
+                    case 155 /* PropertyDeclaration */:
                         // TypeScript 1.0 spec (April 2014): 8.4.1
                         // Initializer expressions for instance member variables are evaluated in the scope
                         // of the class constructor body but are not permitted to reference parameters or
                         // local variables of the constructor. This effectively means that entities from outer scopes
                         // by the same name as a constructor parameter or local variable are inaccessible
                         // in initializer expressions for instance member variables.
-                        if (ts.isClassLike(location.parent) && !ts.hasModifier(location, 32 /* Static */)) {
+                        if (!ts.hasModifier(location, 32 /* Static */)) {
                             var ctor = findConstructorDeclaration(location.parent);
                             if (ctor && ctor.locals) {
                                 if (lookup(ctor.locals, name, meaning & 67220415 /* Value */)) {
@@ -32350,9 +32629,9 @@ var ts;
                             }
                         }
                         break;
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
                         // The below is used to lookup type parameters within a class or interface, as they are added to the class/interface locals
                         // These can never be latebound, so the symbol's raw members are sufficient. `getMembersOfNode` cannot be used, as it would
                         // trigger resolving late-bound names, which we may already be in the process of doing while we're here!
@@ -32371,7 +32650,7 @@ var ts;
                             }
                             break loop;
                         }
-                        if (location.kind === 209 /* ClassExpression */ && meaning & 32 /* Class */) {
+                        if (location.kind === 210 /* ClassExpression */ && meaning & 32 /* Class */) {
                             var className = location.name;
                             if (className && name === className.escapedText) {
                                 result = location.symbol;
@@ -32379,9 +32658,9 @@ var ts;
                             }
                         }
                         break;
-                    case 211 /* ExpressionWithTypeArguments */:
+                    case 212 /* ExpressionWithTypeArguments */:
                         // The type parameters of a class are not in scope in the base class expression.
-                        if (lastLocation === location.expression && location.parent.token === 86 /* ExtendsKeyword */) {
+                        if (lastLocation === location.expression && location.parent.token === 87 /* ExtendsKeyword */) {
                             var container = location.parent.parent;
                             if (ts.isClassLike(container) && (result = lookup(getSymbolOfNode(container).members, name, meaning & 67897832 /* Type */))) {
                                 if (nameNotFoundMessage) {
@@ -32399,9 +32678,9 @@ var ts;
                     //       [foo<T>()]() { } // <-- Reference to T from class's own computed property
                     //   }
                     //
-                    case 149 /* ComputedPropertyName */:
+                    case 150 /* ComputedPropertyName */:
                         grandparent = location.parent.parent;
-                        if (ts.isClassLike(grandparent) || grandparent.kind === 241 /* InterfaceDeclaration */) {
+                        if (ts.isClassLike(grandparent) || grandparent.kind === 242 /* InterfaceDeclaration */) {
                             // A reference to this grandparent's type parameters would be an error
                             if (result = lookup(getSymbolOfNode(grandparent).members, name, meaning & 67897832 /* Type */)) {
                                 error(errorLocation, ts.Diagnostics.A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type);
@@ -32409,24 +32688,24 @@ var ts;
                             }
                         }
                         break;
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         // when targeting ES6 or higher there is no 'arguments' in an arrow function
                         // for lower compile targets the resolved symbol is used to emit an error
                         if (compilerOptions.target >= 2 /* ES2015 */) {
                             break;
                         }
                     // falls through
-                    case 156 /* MethodDeclaration */:
-                    case 157 /* Constructor */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 239 /* FunctionDeclaration */:
+                    case 157 /* MethodDeclaration */:
+                    case 158 /* Constructor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 240 /* FunctionDeclaration */:
                         if (meaning & 3 /* Variable */ && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
                         }
                         break;
-                    case 196 /* FunctionExpression */:
+                    case 197 /* FunctionExpression */:
                         if (meaning & 3 /* Variable */ && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
@@ -32439,7 +32718,7 @@ var ts;
                             }
                         }
                         break;
-                    case 152 /* Decorator */:
+                    case 153 /* Decorator */:
                         // Decorators are resolved at the class declaration. Resolving at the parameter
                         // or member would result in looking up locals in the method.
                         //
@@ -32448,7 +32727,7 @@ var ts;
                         //       method(@y x, y) {} // <-- decorator y should be resolved at the class declaration, not the parameter.
                         //   }
                         //
-                        if (location.parent && location.parent.kind === 151 /* Parameter */) {
+                        if (location.parent && location.parent.kind === 152 /* Parameter */) {
                             location = location.parent;
                         }
                         //
@@ -32463,15 +32742,28 @@ var ts;
                         //   declare function y(x: T): any;
                         //   @param(1 as T) // <-- T should resolve to the type alias outside of class C
                         //   class C<T> {}
-                        if (location.parent && (ts.isClassElement(location.parent) || location.parent.kind === 240 /* ClassDeclaration */)) {
+                        if (location.parent && (ts.isClassElement(location.parent) || location.parent.kind === 241 /* ClassDeclaration */)) {
                             location = location.parent;
                         }
                         break;
-                    case 309 /* JSDocTypedefTag */:
-                    case 302 /* JSDocCallbackTag */:
+                    case 310 /* JSDocTypedefTag */:
+                    case 303 /* JSDocCallbackTag */:
                         // js type aliases do not resolve names from their host, so skip past it
                         location = ts.getJSDocHost(location);
                         break;
+                    case 152 /* Parameter */:
+                        if (lastLocation && lastLocation === location.initializer) {
+                            associatedDeclarationForContainingInitializer = location;
+                        }
+                        break;
+                    case 187 /* BindingElement */:
+                        if (lastLocation && lastLocation === location.initializer) {
+                            var root = ts.getRootDeclaration(location);
+                            if (root.kind === 152 /* Parameter */) {
+                                associatedDeclarationForContainingInitializer = location;
+                            }
+                        }
+                        break;
                 }
                 if (isSelfReferenceLocation(location)) {
                     lastSelfReferenceLocation = location;
@@ -32487,7 +32779,7 @@ var ts;
             }
             if (!result) {
                 if (lastLocation) {
-                    ts.Debug.assert(lastLocation.kind === 284 /* SourceFile */);
+                    ts.Debug.assert(lastLocation.kind === 285 /* SourceFile */);
                     if (lastLocation.commonJsModuleIndicator && name === "exports" && meaning & lastLocation.symbol.flags) {
                         return lastLocation.symbol;
                     }
@@ -32563,20 +32855,48 @@ var ts;
                 if (result && isInExternalModule && (meaning & 67220415 /* Value */) === 67220415 /* Value */ && !(originalLocation.flags & 2097152 /* JSDoc */)) {
                     var merged = getMergedSymbol(result);
                     if (ts.length(merged.declarations) && ts.every(merged.declarations, function (d) { return ts.isNamespaceExportDeclaration(d) || ts.isSourceFile(d) && !!d.symbol.globalExports; })) {
-                        error(errorLocation, ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead, ts.unescapeLeadingUnderscores(name)); // TODO: GH#18217
+                        errorOrSuggestion(!compilerOptions.allowUmdGlobalAccess, errorLocation, ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead, ts.unescapeLeadingUnderscores(name));
+                    }
+                }
+                // If we're in a parameter initializer, we can't reference the values of the parameter whose initializer we're within or parameters to the right
+                if (result && associatedDeclarationForContainingInitializer && !withinDeferredContext && (meaning & 67220415 /* Value */) === 67220415 /* Value */) {
+                    var candidate = getMergedSymbol(getLateBoundSymbol(result));
+                    var root = ts.getRootDeclaration(associatedDeclarationForContainingInitializer);
+                    // A parameter initializer or binding pattern initializer within a parameter cannot refer to itself
+                    if (candidate === getSymbolOfNode(associatedDeclarationForContainingInitializer)) {
+                        error(errorLocation, ts.Diagnostics.Parameter_0_cannot_be_referenced_in_its_initializer, ts.declarationNameToString(associatedDeclarationForContainingInitializer.name));
+                    }
+                    // And it cannot refer to any declarations which come after it
+                    else if (candidate.valueDeclaration && candidate.valueDeclaration.pos > associatedDeclarationForContainingInitializer.pos && root.parent.locals && lookup(root.parent.locals, candidate.escapedName, meaning) === candidate) {
+                        error(errorLocation, ts.Diagnostics.Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it, ts.declarationNameToString(associatedDeclarationForContainingInitializer.name), ts.declarationNameToString(errorLocation));
                     }
                 }
             }
             return result;
         }
+        function getIsDeferredContext(location, lastLocation) {
+            if (location.kind !== 198 /* ArrowFunction */ && location.kind !== 197 /* FunctionExpression */) {
+                // initializers in instance property declaration of class like entities are executed in constructor and thus deferred
+                return ts.isTypeQueryNode(location) || ((ts.isFunctionLikeDeclaration(location) ||
+                    (location.kind === 155 /* PropertyDeclaration */ && !ts.hasModifier(location, 32 /* Static */))) && (!lastLocation || lastLocation !== location.name)); // A name is evaluated within the enclosing scope - so it shouldn't count as deferred
+            }
+            if (lastLocation && lastLocation === location.name) {
+                return false;
+            }
+            // generator functions and async functions are not inlined in control flow when immediately invoked
+            if (location.asteriskToken || ts.hasModifier(location, 256 /* Async */)) {
+                return true;
+            }
+            return !ts.getImmediatelyInvokedFunctionExpression(location);
+        }
         function isSelfReferenceLocation(node) {
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 244 /* ModuleDeclaration */: // For `namespace N { N; }`
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 245 /* ModuleDeclaration */: // For `namespace N { N; }`
                     return true;
                 default:
                     return false;
@@ -32588,7 +32908,7 @@ var ts;
         function isTypeParameterSymbolDeclaredInContainer(symbol, container) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var decl = _a[_i];
-                if (decl.kind === 150 /* TypeParameter */) {
+                if (decl.kind === 151 /* TypeParameter */) {
                     var parent = ts.isJSDocTemplateTag(decl.parent) ? ts.getJSDocHost(decl.parent) : decl.parent;
                     if (parent === container) {
                         return !(ts.isJSDocTemplateTag(decl.parent) && ts.find(decl.parent.parent.tags, ts.isJSDocTypeAlias)); // TODO: GH#18217
@@ -32643,10 +32963,10 @@ var ts;
          */
         function getEntityNameForExtendingInterface(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
-                case 189 /* PropertyAccessExpression */:
+                case 73 /* Identifier */:
+                case 190 /* PropertyAccessExpression */:
                     return node.parent ? getEntityNameForExtendingInterface(node.parent) : undefined;
-                case 211 /* ExpressionWithTypeArguments */:
+                case 212 /* ExpressionWithTypeArguments */:
                     if (ts.isEntityNameExpression(node.expression)) {
                         return node.expression;
                     }
@@ -32735,7 +33055,7 @@ var ts;
         function checkResolvedBlockScopedVariable(result, errorLocation) {
             ts.Debug.assert(!!(result.flags & 2 /* BlockScopedVariable */ || result.flags & 32 /* Class */ || result.flags & 384 /* Enum */));
             // Block-scoped variables cannot be used before their definition
-            var declaration = ts.find(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 243 /* EnumDeclaration */) || ts.isInJSFile(d) && !!ts.getJSDocEnumTag(d); });
+            var declaration = ts.find(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 244 /* EnumDeclaration */) || ts.isInJSFile(d) && !!ts.getJSDocEnumTag(d); });
             if (declaration === undefined)
                 return ts.Debug.fail("Declaration to checkResolvedBlockScopedVariable is undefined");
             if (!(declaration.flags & 4194304 /* Ambient */) && !isBlockScopedNameDeclaredBeforeUse(declaration, errorLocation)) {
@@ -32770,13 +33090,13 @@ var ts;
         }
         function getAnyImportSyntax(node) {
             switch (node.kind) {
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return node;
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     return node.parent;
-                case 251 /* NamespaceImport */:
+                case 252 /* NamespaceImport */:
                     return node.parent.parent;
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     return node.parent.parent.parent;
                 default:
                     return undefined;
@@ -32786,7 +33106,7 @@ var ts;
             return ts.find(symbol.declarations, ts.isAliasSymbolDeclaration);
         }
         function getTargetOfImportEqualsDeclaration(node, dontResolveAlias) {
-            if (node.moduleReference.kind === 259 /* ExternalModuleReference */) {
+            if (node.moduleReference.kind === 260 /* ExternalModuleReference */) {
                 return resolveExternalModuleSymbol(resolveExternalModuleName(node, ts.getExternalModuleImportEqualsDeclarationExpression(node)));
             }
             return getSymbolOfPartOfRightHandSideOfImportEquals(node.moduleReference, dontResolveAlias);
@@ -32843,7 +33163,16 @@ var ts;
                 var file = ts.find(moduleSymbol.declarations, ts.isSourceFile);
                 var hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias);
                 if (!exportDefaultSymbol && !hasSyntheticDefault) {
-                    error(node.name, ts.Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol));
+                    if (hasExportAssignmentSymbol(moduleSymbol)) {
+                        var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015 ? "allowSyntheticDefaultImports" : "esModuleInterop";
+                        var exportEqualsSymbol = moduleSymbol.exports.get("export=" /* ExportEquals */);
+                        var exportAssignment = exportEqualsSymbol.valueDeclaration;
+                        var err = error(node.name, ts.Diagnostics.Module_0_can_only_be_default_imported_using_the_1_flag, symbolToString(moduleSymbol), compilerOptionName);
+                        ts.addRelatedInfo(err, ts.createDiagnosticForNode(exportAssignment, ts.Diagnostics.This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag, compilerOptionName));
+                    }
+                    else {
+                        error(node.name, ts.Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol));
+                    }
                 }
                 else if (hasSyntheticDefault) {
                     // per emit behavior, a synthetic default overrides a "real" .default member if `__esModule` is not present
@@ -32978,20 +33307,20 @@ var ts;
         function getTargetOfAliasDeclaration(node, dontRecursivelyResolve) {
             if (dontRecursivelyResolve === void 0) { dontRecursivelyResolve = false; }
             switch (node.kind) {
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return getTargetOfImportEqualsDeclaration(node, dontRecursivelyResolve);
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     return getTargetOfImportClause(node, dontRecursivelyResolve);
-                case 251 /* NamespaceImport */:
+                case 252 /* NamespaceImport */:
                     return getTargetOfNamespaceImport(node, dontRecursivelyResolve);
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     return getTargetOfImportSpecifier(node, dontRecursivelyResolve);
-                case 257 /* ExportSpecifier */:
+                case 258 /* ExportSpecifier */:
                     return getTargetOfExportSpecifier(node, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */, dontRecursivelyResolve);
-                case 254 /* ExportAssignment */:
-                case 204 /* BinaryExpression */:
+                case 255 /* ExportAssignment */:
+                case 205 /* BinaryExpression */:
                     return getTargetOfExportAssignment(node, dontRecursivelyResolve);
-                case 247 /* NamespaceExportDeclaration */:
+                case 248 /* NamespaceExportDeclaration */:
                     return getTargetOfNamespaceExportDeclaration(node, dontRecursivelyResolve);
                 default:
                     return ts.Debug.fail();
@@ -33052,11 +33381,11 @@ var ts;
                 var node = getDeclarationOfAliasSymbol(symbol);
                 if (!node)
                     return ts.Debug.fail();
-                if (node.kind === 254 /* ExportAssignment */) {
+                if (node.kind === 255 /* ExportAssignment */) {
                     // export default <symbol>
                     checkExpressionCached(node.expression);
                 }
-                else if (node.kind === 257 /* ExportSpecifier */) {
+                else if (node.kind === 258 /* ExportSpecifier */) {
                     // export { <symbol> } or export { <symbol> as foo }
                     checkExpressionCached(node.propertyName || node.name);
                 }
@@ -33074,17 +33403,17 @@ var ts;
             //     import a = |b|; // Namespace
             //     import a = |b.c|; // Value, type, namespace
             //     import a = |b.c|.d; // Namespace
-            if (entityName.kind === 72 /* Identifier */ && ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
+            if (entityName.kind === 73 /* Identifier */ && ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
                 entityName = entityName.parent;
             }
             // Check for case 1 and 3 in the above example
-            if (entityName.kind === 72 /* Identifier */ || entityName.parent.kind === 148 /* QualifiedName */) {
+            if (entityName.kind === 73 /* Identifier */ || entityName.parent.kind === 149 /* QualifiedName */) {
                 return resolveEntityName(entityName, 1920 /* Namespace */, /*ignoreErrors*/ false, dontResolveAlias);
             }
             else {
                 // Case 2 in above example
                 // entityName.kind could be a QualifiedName or a Missing identifier
-                ts.Debug.assert(entityName.parent.kind === 248 /* ImportEqualsDeclaration */);
+                ts.Debug.assert(entityName.parent.kind === 249 /* ImportEqualsDeclaration */);
                 return resolveEntityName(entityName, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */, /*ignoreErrors*/ false, dontResolveAlias);
             }
         }
@@ -33100,17 +33429,17 @@ var ts;
             }
             var namespaceMeaning = 1920 /* Namespace */ | (ts.isInJSFile(name) ? meaning & 67220415 /* Value */ : 0);
             var symbol;
-            if (name.kind === 72 /* Identifier */) {
-                var message = meaning === namespaceMeaning ? ts.Diagnostics.Cannot_find_namespace_0 : getCannotFindNameDiagnosticForName(getFirstIdentifier(name).escapedText);
+            if (name.kind === 73 /* Identifier */) {
+                var message = meaning === namespaceMeaning ? ts.Diagnostics.Cannot_find_namespace_0 : getCannotFindNameDiagnosticForName(getFirstIdentifier(name));
                 var symbolFromJSPrototype = ts.isInJSFile(name) ? resolveEntityNameFromAssignmentDeclaration(name, meaning) : undefined;
                 symbol = resolveName(location || name, name.escapedText, meaning, ignoreErrors || symbolFromJSPrototype ? undefined : message, name, /*isUse*/ true);
                 if (!symbol) {
                     return symbolFromJSPrototype;
                 }
             }
-            else if (name.kind === 148 /* QualifiedName */ || name.kind === 189 /* PropertyAccessExpression */) {
-                var left = name.kind === 148 /* QualifiedName */ ? name.left : name.expression;
-                var right = name.kind === 148 /* QualifiedName */ ? name.right : name.name;
+            else if (name.kind === 149 /* QualifiedName */ || name.kind === 190 /* PropertyAccessExpression */) {
+                var left = name.kind === 149 /* QualifiedName */ ? name.left : name.expression;
+                var right = name.kind === 149 /* QualifiedName */ ? name.right : name.name;
                 var namespace = resolveEntityName(left, namespaceMeaning, ignoreErrors, /*dontResolveAlias*/ false, location);
                 if (!namespace || ts.nodeIsMissing(right)) {
                     return undefined;
@@ -33245,6 +33574,14 @@ var ts;
             if (patternAmbientModules) {
                 var pattern = ts.findBestPatternMatch(patternAmbientModules, function (_) { return _.pattern; }, moduleReference);
                 if (pattern) {
+                    // If the module reference matched a pattern ambient module ('*.foo') but there’s also a
+                    // module augmentation by the specific name requested ('a.foo'), we store the merged symbol
+                    // by the augmentation name ('a.foo'), because asking for *.foo should not give you exports
+                    // from a.foo.
+                    var augmentation = patternAmbientModuleAugmentations && patternAmbientModuleAugmentations.get(moduleReference);
+                    if (augmentation) {
+                        return getMergedSymbol(augmentation);
+                    }
                     return getMergedSymbol(pattern.symbol);
                 }
             }
@@ -33335,7 +33672,7 @@ var ts;
         function resolveESModuleSymbol(moduleSymbol, referencingLocation, dontResolveAlias) {
             var symbol = resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias);
             if (!dontResolveAlias && symbol) {
-                if (!(symbol.flags & (1536 /* Module */ | 3 /* Variable */)) && !ts.getDeclarationOfKind(symbol, 284 /* SourceFile */)) {
+                if (!(symbol.flags & (1536 /* Module */ | 3 /* Variable */)) && !ts.getDeclarationOfKind(symbol, 285 /* SourceFile */)) {
                     var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015
                         ? "allowSyntheticDefaultImports"
                         : "esModuleInterop";
@@ -33597,7 +33934,7 @@ var ts;
             var members = node.members;
             for (var _i = 0, members_2 = members; _i < members_2.length; _i++) {
                 var member = members_2[_i];
-                if (member.kind === 157 /* Constructor */ && ts.nodeIsPresent(member.body)) {
+                if (member.kind === 158 /* Constructor */ && ts.nodeIsPresent(member.body)) {
                     return member;
                 }
             }
@@ -33608,13 +33945,10 @@ var ts;
             result.id = typeCount;
             return result;
         }
-        function createIntrinsicType(kind, intrinsicName) {
+        function createIntrinsicType(kind, intrinsicName, objectFlags) {
+            if (objectFlags === void 0) { objectFlags = 0; }
             var type = createType(kind);
             type.intrinsicName = intrinsicName;
-            return type;
-        }
-        function createNullableType(kind, intrinsicName, objectFlags) {
-            var type = createIntrinsicType(kind, intrinsicName);
             type.objectFlags = objectFlags;
             return type;
         }
@@ -33646,7 +33980,7 @@ var ts;
             return type;
         }
         // A reserved member name starts with two underscores, but the third character cannot be an underscore
-        // or the @ symbol. A third underscore indicates an escaped form of an identifer that started
+        // or the @ symbol. A third underscore indicates an escaped form of an identifier that started
         // with at least two underscores. The @ character indicates that the name is denoted by a well known ES
         // Symbol instance.
         function isReservedMemberName(name) {
@@ -33686,12 +34020,12 @@ var ts;
                     }
                 }
                 switch (location.kind) {
-                    case 284 /* SourceFile */:
+                    case 285 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location)) {
                             break;
                         }
                     // falls through
-                    case 244 /* ModuleDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         if (result = callback(getSymbolOfNode(location).exports)) {
                             return result;
                         }
@@ -33755,7 +34089,7 @@ var ts;
                         && (!useOnlyExternalAliasing || ts.some(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration))
                         // While exports are generally considered to be in scope, export-specifier declared symbols are _not_
                         // See similar comment in `resolveName` for details
-                        && (ignoreQualification || !ts.getDeclarationOfKind(symbolFromSymbolTable, 257 /* ExportSpecifier */))) {
+                        && (ignoreQualification || !ts.getDeclarationOfKind(symbolFromSymbolTable, 258 /* ExportSpecifier */))) {
                         var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
                         if (isAccessible(symbolFromSymbolTable, resolvedImportedSymbol, ignoreQualification)) {
                             return [symbolFromSymbolTable];
@@ -33791,7 +34125,7 @@ var ts;
                     return true;
                 }
                 // Qualify if the symbol from symbol table has same meaning as expected
-                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 2097152 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 257 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
+                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 2097152 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 258 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
                 if (symbolFromSymbolTable.flags & meaning) {
                     qualify = true;
                     return true;
@@ -33806,10 +34140,10 @@ var ts;
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
                     switch (declaration.kind) {
-                        case 154 /* PropertyDeclaration */:
-                        case 156 /* MethodDeclaration */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
+                        case 155 /* PropertyDeclaration */:
+                        case 157 /* MethodDeclaration */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
                             continue;
                         default:
                             return false;
@@ -33865,7 +34199,7 @@ var ts;
                 var containers = getContainersOfSymbol(symbol, enclosingDeclaration);
                 // If we're trying to reference some object literal in, eg `var a = { x: 1 }`, the symbol for the literal, `__object`, is distinct
                 // from the symbol of the declaration it is being assigned to. Since we can use the declaration to refer to the literal, however,
-                // we'd like to make that connection here - potentially causing us to paint the declararation's visibiility, and therefore the literal.
+                // we'd like to make that connection here - potentially causing us to paint the declaration's visibility, and therefore the literal.
                 var firstDecl = ts.first(symbol.declarations);
                 if (!ts.length(containers) && meaning & 67220415 /* Value */ && firstDecl && ts.isObjectLiteralExpression(firstDecl)) {
                     if (firstDecl.parent && ts.isVariableDeclaration(firstDecl.parent) && firstDecl === firstDecl.parent.initializer) {
@@ -33926,10 +34260,10 @@ var ts;
             return node && getSymbolOfNode(node);
         }
         function hasExternalModuleSymbol(declaration) {
-            return ts.isAmbientModule(declaration) || (declaration.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isAmbientModule(declaration) || (declaration.kind === 285 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasNonGlobalAugmentationExternalModuleSymbol(declaration) {
-            return ts.isModuleWithStringLiteralName(declaration) || (declaration.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isModuleWithStringLiteralName(declaration) || (declaration.kind === 285 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasVisibleDeclarations(symbol, shouldComputeAliasToMakeVisible) {
             var aliasesToMakeVisible;
@@ -33976,14 +34310,14 @@ var ts;
         function isEntityNameVisible(entityName, enclosingDeclaration) {
             // get symbol of the first identifier of the entityName
             var meaning;
-            if (entityName.parent.kind === 167 /* TypeQuery */ ||
+            if (entityName.parent.kind === 168 /* TypeQuery */ ||
                 ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent) ||
-                entityName.parent.kind === 149 /* ComputedPropertyName */) {
+                entityName.parent.kind === 150 /* ComputedPropertyName */) {
                 // Typeof value
                 meaning = 67220415 /* Value */ | 1048576 /* ExportValue */;
             }
-            else if (entityName.kind === 148 /* QualifiedName */ || entityName.kind === 189 /* PropertyAccessExpression */ ||
-                entityName.parent.kind === 248 /* ImportEqualsDeclaration */) {
+            else if (entityName.kind === 149 /* QualifiedName */ || entityName.kind === 190 /* PropertyAccessExpression */ ||
+                entityName.parent.kind === 249 /* ImportEqualsDeclaration */) {
                 // Left identifier from type reference or TypeAlias
                 // Entity name of the import declaration
                 meaning = 1920 /* Namespace */;
@@ -34032,10 +34366,10 @@ var ts;
             function signatureToStringWorker(writer) {
                 var sigOutput;
                 if (flags & 262144 /* WriteArrowStyleSignature */) {
-                    sigOutput = kind === 1 /* Construct */ ? 166 /* ConstructorType */ : 165 /* FunctionType */;
+                    sigOutput = kind === 1 /* Construct */ ? 167 /* ConstructorType */ : 166 /* FunctionType */;
                 }
                 else {
-                    sigOutput = kind === 1 /* Construct */ ? 161 /* ConstructSignature */ : 160 /* CallSignature */;
+                    sigOutput = kind === 1 /* Construct */ ? 162 /* ConstructSignature */ : 161 /* CallSignature */;
                 }
                 var sig = nodeBuilder.signatureToSignatureDeclaration(signature, sigOutput, enclosingDeclaration, toNodeBuilderFlags(flags) | 70221824 /* IgnoreErrors */ | 512 /* WriteTypeParametersInQualifiedName */);
                 var printer = ts.createPrinter({ removeComments: true, omitTrailingSemicolon: true });
@@ -34062,6 +34396,15 @@ var ts;
             }
             return result;
         }
+        function getTypeNamesForErrorDisplay(left, right) {
+            var leftStr = typeToString(left);
+            var rightStr = typeToString(right);
+            if (leftStr === rightStr) {
+                leftStr = typeToString(left, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
+                rightStr = typeToString(right, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
+            }
+            return [leftStr, rightStr];
+        }
         function toNodeBuilderFlags(flags) {
             if (flags === void 0) { flags = 0 /* None */; }
             return flags & 9469291 /* NodeBuilderFlagsMask */;
@@ -34130,26 +34473,26 @@ var ts;
                 }
                 if (type.flags & 1 /* Any */) {
                     context.approximateLength += 3;
-                    return ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                    return ts.createKeywordTypeNode(121 /* AnyKeyword */);
                 }
                 if (type.flags & 2 /* Unknown */) {
-                    return ts.createKeywordTypeNode(143 /* UnknownKeyword */);
+                    return ts.createKeywordTypeNode(144 /* UnknownKeyword */);
                 }
                 if (type.flags & 4 /* String */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(138 /* StringKeyword */);
+                    return ts.createKeywordTypeNode(139 /* StringKeyword */);
                 }
                 if (type.flags & 8 /* Number */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(135 /* NumberKeyword */);
+                    return ts.createKeywordTypeNode(136 /* NumberKeyword */);
                 }
                 if (type.flags & 64 /* BigInt */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(146 /* BigIntKeyword */);
+                    return ts.createKeywordTypeNode(147 /* BigIntKeyword */);
                 }
                 if (type.flags & 16 /* Boolean */) {
                     context.approximateLength += 7;
-                    return ts.createKeywordTypeNode(123 /* BooleanKeyword */);
+                    return ts.createKeywordTypeNode(124 /* BooleanKeyword */);
                 }
                 if (type.flags & 1024 /* EnumLiteral */ && !(type.flags & 1048576 /* Union */)) {
                     var parentSymbol = getParentOfSymbol(type.symbol);
@@ -34167,8 +34510,9 @@ var ts;
                     return ts.createLiteralTypeNode(ts.setEmitFlags(ts.createLiteral(type.value), 16777216 /* NoAsciiEscaping */));
                 }
                 if (type.flags & 256 /* NumberLiteral */) {
-                    context.approximateLength += (("" + type.value).length);
-                    return ts.createLiteralTypeNode((ts.createLiteral(type.value)));
+                    var value = type.value;
+                    context.approximateLength += ("" + value).length;
+                    return ts.createLiteralTypeNode(value < 0 ? ts.createPrefix(39 /* MinusToken */, ts.createLiteral(-value)) : ts.createLiteral(value));
                 }
                 if (type.flags & 2048 /* BigIntLiteral */) {
                     context.approximateLength += (ts.pseudoBigIntToString(type.value).length) + 1;
@@ -34189,33 +34533,33 @@ var ts;
                         }
                     }
                     context.approximateLength += 13;
-                    return ts.createTypeOperatorNode(142 /* UniqueKeyword */, ts.createKeywordTypeNode(139 /* SymbolKeyword */));
+                    return ts.createTypeOperatorNode(143 /* UniqueKeyword */, ts.createKeywordTypeNode(140 /* SymbolKeyword */));
                 }
                 if (type.flags & 16384 /* Void */) {
                     context.approximateLength += 4;
-                    return ts.createKeywordTypeNode(106 /* VoidKeyword */);
+                    return ts.createKeywordTypeNode(107 /* VoidKeyword */);
                 }
                 if (type.flags & 32768 /* Undefined */) {
                     context.approximateLength += 9;
-                    return ts.createKeywordTypeNode(141 /* UndefinedKeyword */);
+                    return ts.createKeywordTypeNode(142 /* UndefinedKeyword */);
                 }
                 if (type.flags & 65536 /* Null */) {
                     context.approximateLength += 4;
-                    return ts.createKeywordTypeNode(96 /* NullKeyword */);
+                    return ts.createKeywordTypeNode(97 /* NullKeyword */);
                 }
                 if (type.flags & 131072 /* Never */) {
                     context.approximateLength += 5;
-                    return ts.createKeywordTypeNode(132 /* NeverKeyword */);
+                    return ts.createKeywordTypeNode(133 /* NeverKeyword */);
                 }
                 if (type.flags & 4096 /* ESSymbol */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(139 /* SymbolKeyword */);
+                    return ts.createKeywordTypeNode(140 /* SymbolKeyword */);
                 }
                 if (type.flags & 67108864 /* NonPrimitive */) {
                     context.approximateLength += 6;
-                    return ts.createKeywordTypeNode(136 /* ObjectKeyword */);
+                    return ts.createKeywordTypeNode(137 /* ObjectKeyword */);
                 }
-                if (type.flags & 262144 /* TypeParameter */ && type.isThisType) {
+                if (isThisTypeParameter(type)) {
                     if (context.flags & 4194304 /* InObjectTypeLiteral */) {
                         if (!context.encounteredError && !(context.flags & 32768 /* AllowThisInObjectLiteral */)) {
                             context.encounteredError = true;
@@ -34265,7 +34609,7 @@ var ts;
                     }
                     var typeNodes = mapToTypeNodes(types, context, /*isBareList*/ true);
                     if (typeNodes && typeNodes.length > 0) {
-                        var unionOrIntersectionTypeNode = ts.createUnionOrIntersectionTypeNode(type.flags & 1048576 /* Union */ ? 173 /* UnionType */ : 174 /* IntersectionType */, typeNodes);
+                        var unionOrIntersectionTypeNode = ts.createUnionOrIntersectionTypeNode(type.flags & 1048576 /* Union */ ? 174 /* UnionType */ : 175 /* IntersectionType */, typeNodes);
                         return unionOrIntersectionTypeNode;
                     }
                     else {
@@ -34298,8 +34642,8 @@ var ts;
                     context.inferTypeParameters = type.root.inferTypeParameters;
                     var extendsTypeNode = typeToTypeNodeHelper(type.extendsType, context);
                     context.inferTypeParameters = saveInferTypeParameters;
-                    var trueTypeNode = typeToTypeNodeHelper(type.trueType, context);
-                    var falseTypeNode = typeToTypeNodeHelper(type.falseType, context);
+                    var trueTypeNode = typeToTypeNodeHelper(getTrueTypeFromConditionalType(type), context);
+                    var falseTypeNode = typeToTypeNodeHelper(getFalseTypeFromConditionalType(type), context);
                     context.approximateLength += 15;
                     return ts.createConditionalTypeNode(checkTypeNode, extendsTypeNode, trueTypeNode, falseTypeNode);
                 }
@@ -34339,7 +34683,7 @@ var ts;
                             return symbolToTypeNode(symbol, context, isInstanceType);
                         }
                         // Always use 'typeof T' for type of class, enum, and module objects
-                        else if (symbol.flags & 32 /* Class */ && !getBaseTypeVariableOfClass(symbol) && !(symbol.valueDeclaration.kind === 209 /* ClassExpression */ && context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */) ||
+                        else if (symbol.flags & 32 /* Class */ && !getBaseTypeVariableOfClass(symbol) && !(symbol.valueDeclaration.kind === 210 /* ClassExpression */ && context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */) ||
                             symbol.flags & (384 /* Enum */ | 512 /* ValueModule */) ||
                             shouldWriteTypeOfFunctionSymbol()) {
                             return symbolToTypeNode(symbol, context, 67220415 /* Value */);
@@ -34386,7 +34730,7 @@ var ts;
                         var isNonLocalFunctionSymbol = !!(symbol.flags & 16 /* Function */) &&
                             (symbol.parent || // is exported function symbol
                                 ts.forEach(symbol.declarations, function (declaration) {
-                                    return declaration.parent.kind === 284 /* SourceFile */ || declaration.parent.kind === 245 /* ModuleBlock */;
+                                    return declaration.parent.kind === 285 /* SourceFile */ || declaration.parent.kind === 246 /* ModuleBlock */;
                                 }));
                         if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
                             // typeof is allowed only for static/non local functions
@@ -34407,12 +34751,12 @@ var ts;
                         }
                         if (resolved.callSignatures.length === 1 && !resolved.constructSignatures.length) {
                             var signature = resolved.callSignatures[0];
-                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 165 /* FunctionType */, context);
+                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 166 /* FunctionType */, context);
                             return signatureNode;
                         }
                         if (resolved.constructSignatures.length === 1 && !resolved.callSignatures.length) {
                             var signature = resolved.constructSignatures[0];
-                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 166 /* ConstructorType */, context);
+                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 167 /* ConstructorType */, context);
                             return signatureNode;
                         }
                     }
@@ -34433,7 +34777,7 @@ var ts;
                         }
                         var elementType = typeToTypeNodeHelper(typeArguments[0], context);
                         var arrayType = ts.createArrayTypeNode(elementType);
-                        return type.target === globalArrayType ? arrayType : ts.createTypeOperatorNode(133 /* ReadonlyKeyword */, arrayType);
+                        return type.target === globalArrayType ? arrayType : ts.createTypeOperatorNode(134 /* ReadonlyKeyword */, arrayType);
                     }
                     else if (type.target.objectFlags & 8 /* Tuple */) {
                         if (typeArguments.length > 0) {
@@ -34447,12 +34791,12 @@ var ts;
                                         ts.createOptionalTypeNode(tupleConstituentNodes[i]);
                                 }
                                 var tupleTypeNode = ts.createTupleTypeNode(tupleConstituentNodes);
-                                return type.target.readonly ? ts.createTypeOperatorNode(133 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
+                                return type.target.readonly ? ts.createTypeOperatorNode(134 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
                             }
                         }
                         if (context.encounteredError || (context.flags & 524288 /* AllowEmptyTuple */)) {
                             var tupleTypeNode = ts.createTupleTypeNode([]);
-                            return type.target.readonly ? ts.createTypeOperatorNode(133 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
+                            return type.target.readonly ? ts.createTypeOperatorNode(134 /* ReadonlyKeyword */, tupleTypeNode) : tupleTypeNode;
                         }
                         context.encounteredError = true;
                         return undefined; // TODO: GH#18217
@@ -34547,11 +34891,11 @@ var ts;
                     var typeElements = [];
                     for (var _i = 0, _a = resolvedType.callSignatures; _i < _a.length; _i++) {
                         var signature = _a[_i];
-                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 160 /* CallSignature */, context));
+                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 161 /* CallSignature */, context));
                     }
                     for (var _b = 0, _c = resolvedType.constructSignatures; _b < _c.length; _b++) {
                         var signature = _c[_b];
-                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 161 /* ConstructSignature */, context));
+                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 162 /* ConstructSignature */, context));
                     }
                     if (resolvedType.stringIndexInfo) {
                         var indexSignature = void 0;
@@ -34598,15 +34942,15 @@ var ts;
                 if (!(context.flags & 1 /* NoTruncation */)) {
                     return ts.createTypeReferenceNode(ts.createIdentifier("..."), /*typeArguments*/ undefined);
                 }
-                return ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                return ts.createKeywordTypeNode(121 /* AnyKeyword */);
             }
             function addPropertyToElementList(propertySymbol, context, typeElements) {
-                var propertyIsReverseMapped = !!(ts.getCheckFlags(propertySymbol) & 4096 /* ReverseMapped */);
+                var propertyIsReverseMapped = !!(ts.getCheckFlags(propertySymbol) & 8192 /* ReverseMapped */);
                 var propertyType = propertyIsReverseMapped && context.flags & 33554432 /* InReverseMappedType */ ?
                     anyType : getTypeOfSymbol(propertySymbol);
                 var saveEnclosingDeclaration = context.enclosingDeclaration;
                 context.enclosingDeclaration = undefined;
-                if (context.tracker.trackSymbol && ts.getCheckFlags(propertySymbol) & 2048 /* Late */) {
+                if (context.tracker.trackSymbol && ts.getCheckFlags(propertySymbol) & 4096 /* Late */) {
                     var decl = ts.first(propertySymbol.declarations);
                     if (hasLateBindableName(decl)) {
                         trackComputedName(decl.name, saveEnclosingDeclaration, context);
@@ -34620,7 +34964,7 @@ var ts;
                     var signatures = getSignaturesOfType(propertyType, 0 /* Call */);
                     for (var _i = 0, signatures_1 = signatures; _i < signatures_1.length; _i++) {
                         var signature = signatures_1[_i];
-                        var methodDeclaration = signatureToSignatureDeclarationHelper(signature, 155 /* MethodSignature */, context);
+                        var methodDeclaration = signatureToSignatureDeclarationHelper(signature, 156 /* MethodSignature */, context);
                         methodDeclaration.name = propertyName;
                         methodDeclaration.questionToken = optionalToken;
                         if (propertySymbol.valueDeclaration) {
@@ -34638,10 +34982,10 @@ var ts;
                         propertyTypeNode = createElidedInformationPlaceholder(context);
                     }
                     else {
-                        propertyTypeNode = propertyType ? typeToTypeNodeHelper(propertyType, context) : ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                        propertyTypeNode = propertyType ? typeToTypeNodeHelper(propertyType, context) : ts.createKeywordTypeNode(121 /* AnyKeyword */);
                     }
                     context.flags = savedFlags;
-                    var modifiers = isReadonlySymbol(propertySymbol) ? [ts.createToken(133 /* ReadonlyKeyword */)] : undefined;
+                    var modifiers = isReadonlySymbol(propertySymbol) ? [ts.createToken(134 /* ReadonlyKeyword */)] : undefined;
                     if (modifiers) {
                         context.approximateLength += 9;
                     }
@@ -34692,7 +35036,7 @@ var ts;
             }
             function indexInfoToIndexSignatureDeclarationHelper(indexInfo, kind, context) {
                 var name = ts.getNameFromIndexInfo(indexInfo) || "x";
-                var indexerTypeNode = ts.createKeywordTypeNode(kind === 0 /* String */ ? 138 /* StringKeyword */ : 135 /* NumberKeyword */);
+                var indexerTypeNode = ts.createKeywordTypeNode(kind === 0 /* String */ ? 139 /* StringKeyword */ : 136 /* NumberKeyword */);
                 var indexingParameter = ts.createParameter(
                 /*decorators*/ undefined, 
                 /*modifiers*/ undefined, 
@@ -34705,7 +35049,7 @@ var ts;
                 }
                 context.approximateLength += (name.length + 4);
                 return ts.createIndexSignature(
-                /*decorators*/ undefined, indexInfo.isReadonly ? [ts.createToken(133 /* ReadonlyKeyword */)] : undefined, [indexingParameter], typeNode);
+                /*decorators*/ undefined, indexInfo.isReadonly ? [ts.createToken(134 /* ReadonlyKeyword */)] : undefined, [indexingParameter], typeNode);
             }
             function signatureToSignatureDeclarationHelper(signature, kind, context) {
                 var typeParameters;
@@ -34716,7 +35060,7 @@ var ts;
                 else {
                     typeParameters = signature.typeParameters && signature.typeParameters.map(function (parameter) { return typeParameterToDeclaration(parameter, context); });
                 }
-                var parameters = getExpandedParameters(signature).map(function (parameter) { return symbolToParameterDeclaration(parameter, context, kind === 157 /* Constructor */); });
+                var parameters = getExpandedParameters(signature).map(function (parameter) { return symbolToParameterDeclaration(parameter, context, kind === 158 /* Constructor */); });
                 if (signature.thisParameter) {
                     var thisParameter = symbolToParameterDeclaration(signature.thisParameter, context);
                     parameters.unshift(thisParameter);
@@ -34735,12 +35079,12 @@ var ts;
                     returnTypeNode = returnType && typeToTypeNodeHelper(returnType, context);
                 }
                 if (context.flags & 256 /* SuppressAnyReturnType */) {
-                    if (returnTypeNode && returnTypeNode.kind === 120 /* AnyKeyword */) {
+                    if (returnTypeNode && returnTypeNode.kind === 121 /* AnyKeyword */) {
                         returnTypeNode = undefined;
                     }
                 }
                 else if (!returnTypeNode) {
-                    returnTypeNode = ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                    returnTypeNode = ts.createKeywordTypeNode(121 /* AnyKeyword */);
                 }
                 context.approximateLength += 3; // Usually a signature contributes a few more characters than this, but 3 is the minimum
                 return ts.createSignatureDeclaration(kind, typeParameters, parameters, returnTypeNode, typeArguments);
@@ -34769,9 +35113,9 @@ var ts;
                 return typeParameterToDeclarationWithConstraint(type, context, constraintNode);
             }
             function symbolToParameterDeclaration(parameterSymbol, context, preserveModifierFlags) {
-                var parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 151 /* Parameter */);
+                var parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 152 /* Parameter */);
                 if (!parameterDeclaration && !isTransientSymbol(parameterSymbol)) {
-                    parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 304 /* JSDocParameterTag */);
+                    parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 305 /* JSDocParameterTag */);
                 }
                 var parameterType = getTypeOfSymbol(parameterSymbol);
                 if (parameterDeclaration && isRequiredInitializedParameter(parameterDeclaration)) {
@@ -34779,16 +35123,16 @@ var ts;
                 }
                 var parameterTypeNode = typeToTypeNodeHelper(parameterType, context);
                 var modifiers = !(context.flags & 8192 /* OmitParameterModifiers */) && preserveModifierFlags && parameterDeclaration && parameterDeclaration.modifiers ? parameterDeclaration.modifiers.map(ts.getSynthesizedClone) : undefined;
-                var isRest = parameterDeclaration && ts.isRestParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 16384 /* RestParameter */;
+                var isRest = parameterDeclaration && ts.isRestParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 32768 /* RestParameter */;
                 var dotDotDotToken = isRest ? ts.createToken(25 /* DotDotDotToken */) : undefined;
                 var name = parameterDeclaration
                     ? parameterDeclaration.name ?
-                        parameterDeclaration.name.kind === 72 /* Identifier */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name), 16777216 /* NoAsciiEscaping */) :
-                            parameterDeclaration.name.kind === 148 /* QualifiedName */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name.right), 16777216 /* NoAsciiEscaping */) :
+                        parameterDeclaration.name.kind === 73 /* Identifier */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name), 16777216 /* NoAsciiEscaping */) :
+                            parameterDeclaration.name.kind === 149 /* QualifiedName */ ? ts.setEmitFlags(ts.getSynthesizedClone(parameterDeclaration.name.right), 16777216 /* NoAsciiEscaping */) :
                                 cloneBindingName(parameterDeclaration.name) :
                         ts.symbolName(parameterSymbol)
                     : ts.symbolName(parameterSymbol);
-                var isOptional = parameterDeclaration && isOptionalParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 8192 /* OptionalParameter */;
+                var isOptional = parameterDeclaration && isOptionalParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 16384 /* OptionalParameter */;
                 var questionToken = isOptional ? ts.createToken(56 /* QuestionToken */) : undefined;
                 var parameterNode = ts.createParameter(
                 /*decorators*/ undefined, modifiers, dotDotDotToken, name, questionToken, parameterTypeNode, 
@@ -34803,7 +35147,7 @@ var ts;
                         }
                         var visited = ts.visitEachChild(node, elideInitializerAndSetEmitFlags, ts.nullTransformationContext, /*nodesVisitor*/ undefined, elideInitializerAndSetEmitFlags);
                         var clone = ts.nodeIsSynthesized(visited) ? visited : ts.getSynthesizedClone(visited);
-                        if (clone.kind === 186 /* BindingElement */) {
+                        if (clone.kind === 187 /* BindingElement */) {
                             clone.initializer = undefined;
                         }
                         return ts.setEmitFlags(clone, 1 /* SingleLine */ | 16777216 /* NoAsciiEscaping */);
@@ -34905,6 +35249,11 @@ var ts;
             function lookupTypeParameterNodes(chain, index, context) {
                 ts.Debug.assert(chain && 0 <= index && index < chain.length);
                 var symbol = chain[index];
+                var symbolId = "" + getSymbolId(symbol);
+                if (context.typeParameterSymbolList && context.typeParameterSymbolList.get(symbolId)) {
+                    return undefined;
+                }
+                (context.typeParameterSymbolList || (context.typeParameterSymbolList = ts.createMap())).set(symbolId, true);
                 var typeParameterNodes;
                 if (context.flags & 512 /* WriteTypeParametersInQualifiedName */ && index < (chain.length - 1)) {
                     var parentSymbol = symbol;
@@ -34929,7 +35278,7 @@ var ts;
                 return top;
             }
             function getSpecifierForModuleSymbol(symbol, context) {
-                var file = ts.getDeclarationOfKind(symbol, 284 /* SourceFile */);
+                var file = ts.getDeclarationOfKind(symbol, 285 /* SourceFile */);
                 if (file && file.moduleName !== undefined) {
                     // Use the amd name if it is available
                     return file.moduleName;
@@ -35169,8 +35518,8 @@ var ts;
         }
         function getTypeAliasForTypeLiteral(type) {
             if (type.symbol && type.symbol.flags & 2048 /* TypeLiteral */) {
-                var node = ts.findAncestor(type.symbol.declarations[0].parent, function (n) { return n.kind !== 177 /* ParenthesizedType */; });
-                if (node.kind === 242 /* TypeAliasDeclaration */) {
+                var node = ts.findAncestor(type.symbol.declarations[0].parent, function (n) { return n.kind !== 178 /* ParenthesizedType */; });
+                if (node.kind === 243 /* TypeAliasDeclaration */) {
                     return getSymbolOfNode(node);
                 }
             }
@@ -35178,11 +35527,11 @@ var ts;
         }
         function isTopLevelInExternalModuleAugmentation(node) {
             return node && node.parent &&
-                node.parent.kind === 245 /* ModuleBlock */ &&
+                node.parent.kind === 246 /* ModuleBlock */ &&
                 ts.isExternalModuleAugmentation(node.parent.parent);
         }
         function isDefaultBindingContext(location) {
-            return location.kind === 284 /* SourceFile */ || ts.isAmbientModule(location);
+            return location.kind === 285 /* SourceFile */ || ts.isAmbientModule(location);
         }
         function getNameOfSymbolFromNameType(symbol, context) {
             var nameType = symbol.nameType;
@@ -35223,7 +35572,7 @@ var ts;
                     if (ts.isCallExpression(declaration) && ts.isBindableObjectDefinePropertyCall(declaration)) {
                         return ts.symbolName(symbol);
                     }
-                    if (ts.isComputedPropertyName(name_2) && !(ts.getCheckFlags(symbol) & 2048 /* Late */) && symbol.nameType && symbol.nameType.flags & 384 /* StringOrNumberLiteral */) {
+                    if (ts.isComputedPropertyName(name_2) && !(ts.getCheckFlags(symbol) & 4096 /* Late */) && symbol.nameType && symbol.nameType.flags & 384 /* StringOrNumberLiteral */) {
                         // Computed property name isn't late bound, but has a well-known name type - use name type to generate a symbol name
                         var result = getNameOfSymbolFromNameType(symbol, context);
                         if (result !== undefined) {
@@ -35232,17 +35581,17 @@ var ts;
                     }
                     return ts.declarationNameToString(name_2);
                 }
-                if (declaration.parent && declaration.parent.kind === 237 /* VariableDeclaration */) {
+                if (declaration.parent && declaration.parent.kind === 238 /* VariableDeclaration */) {
                     return ts.declarationNameToString(declaration.parent.name);
                 }
                 switch (declaration.kind) {
-                    case 209 /* ClassExpression */:
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
+                    case 210 /* ClassExpression */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
                         if (context && !context.encounteredError && !(context.flags & 131072 /* AllowAnonymousIdentifier */)) {
                             context.encounteredError = true;
                         }
-                        return declaration.kind === 209 /* ClassExpression */ ? "(Anonymous class)" : "(Anonymous function)";
+                        return declaration.kind === 210 /* ClassExpression */ ? "(Anonymous class)" : "(Anonymous function)";
                 }
             }
             var name = getNameOfSymbolFromNameType(symbol, context);
@@ -35259,27 +35608,27 @@ var ts;
             return false;
             function determineIfDeclarationIsVisible() {
                 switch (node.kind) {
-                    case 302 /* JSDocCallbackTag */:
-                    case 309 /* JSDocTypedefTag */:
+                    case 303 /* JSDocCallbackTag */:
+                    case 310 /* JSDocTypedefTag */:
                         // Top-level jsdoc type aliases are considered exported
                         // First parent is comment node, second is hosting declaration or token; we only care about those tokens or declarations whose parent is a source file
                         return !!(node.parent && node.parent.parent && node.parent.parent.parent && ts.isSourceFile(node.parent.parent.parent));
-                    case 186 /* BindingElement */:
+                    case 187 /* BindingElement */:
                         return isDeclarationVisible(node.parent.parent);
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                         if (ts.isBindingPattern(node.name) &&
                             !node.name.elements.length) {
                             // If the binding pattern is empty, this variable declaration is not visible
                             return false;
                         }
                     // falls through
-                    case 244 /* ModuleDeclaration */:
-                    case 240 /* ClassDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 239 /* FunctionDeclaration */:
-                    case 243 /* EnumDeclaration */:
-                    case 248 /* ImportEqualsDeclaration */:
+                    case 245 /* ModuleDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 240 /* FunctionDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
                         // external module augmentation is always visible
                         if (ts.isExternalModuleAugmentation(node)) {
                             return true;
@@ -35287,53 +35636,53 @@ var ts;
                         var parent = getDeclarationContainer(node);
                         // If the node is not exported or it is not ambient module element (except import declaration)
                         if (!(ts.getCombinedModifierFlags(node) & 1 /* Export */) &&
-                            !(node.kind !== 248 /* ImportEqualsDeclaration */ && parent.kind !== 284 /* SourceFile */ && parent.flags & 4194304 /* Ambient */)) {
+                            !(node.kind !== 249 /* ImportEqualsDeclaration */ && parent.kind !== 285 /* SourceFile */ && parent.flags & 4194304 /* Ambient */)) {
                             return isGlobalSourceFile(parent);
                         }
                         // Exported members/ambient module elements (exception import declaration) are visible if parent is visible
                         return isDeclarationVisible(parent);
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
                         if (ts.hasModifier(node, 8 /* Private */ | 16 /* Protected */)) {
                             // Private/protected properties/methods are not visible
                             return false;
                         }
                     // Public properties/methods are visible if its parents are visible, so:
                     // falls through
-                    case 157 /* Constructor */:
-                    case 161 /* ConstructSignature */:
-                    case 160 /* CallSignature */:
-                    case 162 /* IndexSignature */:
-                    case 151 /* Parameter */:
-                    case 245 /* ModuleBlock */:
-                    case 165 /* FunctionType */:
-                    case 166 /* ConstructorType */:
-                    case 168 /* TypeLiteral */:
-                    case 164 /* TypeReference */:
-                    case 169 /* ArrayType */:
-                    case 170 /* TupleType */:
-                    case 173 /* UnionType */:
-                    case 174 /* IntersectionType */:
-                    case 177 /* ParenthesizedType */:
+                    case 158 /* Constructor */:
+                    case 162 /* ConstructSignature */:
+                    case 161 /* CallSignature */:
+                    case 163 /* IndexSignature */:
+                    case 152 /* Parameter */:
+                    case 246 /* ModuleBlock */:
+                    case 166 /* FunctionType */:
+                    case 167 /* ConstructorType */:
+                    case 169 /* TypeLiteral */:
+                    case 165 /* TypeReference */:
+                    case 170 /* ArrayType */:
+                    case 171 /* TupleType */:
+                    case 174 /* UnionType */:
+                    case 175 /* IntersectionType */:
+                    case 178 /* ParenthesizedType */:
                         return isDeclarationVisible(node.parent);
                     // Default binding, import specifier and namespace import is visible
                     // only on demand so by default it is not visible
-                    case 250 /* ImportClause */:
-                    case 251 /* NamespaceImport */:
-                    case 253 /* ImportSpecifier */:
+                    case 251 /* ImportClause */:
+                    case 252 /* NamespaceImport */:
+                    case 254 /* ImportSpecifier */:
                         return false;
                     // Type parameters are always visible
-                    case 150 /* TypeParameter */:
+                    case 151 /* TypeParameter */:
                     // Source file and namespace export are always visible
-                    case 284 /* SourceFile */:
-                    case 247 /* NamespaceExportDeclaration */:
+                    case 285 /* SourceFile */:
+                    case 248 /* NamespaceExportDeclaration */:
                         return true;
                     // Export assignments do not create name bindings outside the module
-                    case 254 /* ExportAssignment */:
+                    case 255 /* ExportAssignment */:
                         return false;
                     default:
                         return false;
@@ -35342,10 +35691,10 @@ var ts;
         }
         function collectLinkedAliases(node, setVisibility) {
             var exportSymbol;
-            if (node.parent && node.parent.kind === 254 /* ExportAssignment */) {
+            if (node.parent && node.parent.kind === 255 /* ExportAssignment */) {
                 exportSymbol = resolveName(node, node.escapedText, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */, /*nameNotFoundMessage*/ undefined, node, /*isUse*/ false);
             }
-            else if (node.parent.kind === 257 /* ExportSpecifier */) {
+            else if (node.parent.kind === 258 /* ExportSpecifier */) {
                 exportSymbol = getTargetOfExportSpecifier(node.parent, 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */);
             }
             var result;
@@ -35441,12 +35790,12 @@ var ts;
         function getDeclarationContainer(node) {
             return ts.findAncestor(ts.getRootDeclaration(node), function (node) {
                 switch (node.kind) {
-                    case 237 /* VariableDeclaration */:
-                    case 238 /* VariableDeclarationList */:
-                    case 253 /* ImportSpecifier */:
-                    case 252 /* NamedImports */:
-                    case 251 /* NamespaceImport */:
-                    case 250 /* ImportClause */:
+                    case 238 /* VariableDeclaration */:
+                    case 239 /* VariableDeclarationList */:
+                    case 254 /* ImportSpecifier */:
+                    case 253 /* NamedImports */:
+                    case 252 /* NamespaceImport */:
+                    case 251 /* ImportClause */:
                         return false;
                     default:
                         return true;
@@ -35479,7 +35828,7 @@ var ts;
             return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node, /*includeOptionality*/ false);
         }
         function isComputedNonLiteralName(name) {
-            return name.kind === 149 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteralLike(name.expression);
+            return name.kind === 150 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteralLike(name.expression);
         }
         function getRestType(source, properties, symbol) {
             source = filterType(source, function (t) { return !(t.flags & 98304 /* Nullable */); });
@@ -35494,13 +35843,11 @@ var ts;
                 if (omitKeyType.flags & 131072 /* Never */) {
                     return source;
                 }
-                var pickTypeAlias = getGlobalPickSymbol();
-                var excludeTypeAlias = getGlobalExcludeSymbol();
-                if (!pickTypeAlias || !excludeTypeAlias) {
+                var omitTypeAlias = getGlobalOmitSymbol();
+                if (!omitTypeAlias) {
                     return errorType;
                 }
-                var pickKeys = getTypeAliasInstantiation(excludeTypeAlias, [getIndexType(source), omitKeyType]);
-                return getTypeAliasInstantiation(pickTypeAlias, [source, pickKeys]);
+                return getTypeAliasInstantiation(omitTypeAlias, [source, omitKeyType]);
             }
             var members = ts.createSymbolTable();
             for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
@@ -35533,7 +35880,7 @@ var ts;
             if (parentAccess && parentAccess.flowNode) {
                 var propName = getDestructuringPropertyName(node);
                 if (propName) {
-                    var result = ts.createNode(190 /* ElementAccessExpression */, node.pos, node.end);
+                    var result = ts.createNode(191 /* ElementAccessExpression */, node.pos, node.end);
                     result.parent = node;
                     result.expression = parentAccess;
                     var literal = ts.createNode(10 /* StringLiteral */, node.pos, node.end);
@@ -35548,23 +35895,23 @@ var ts;
         function getParentElementAccess(node) {
             var ancestor = node.parent.parent;
             switch (ancestor.kind) {
-                case 186 /* BindingElement */:
-                case 275 /* PropertyAssignment */:
+                case 187 /* BindingElement */:
+                case 276 /* PropertyAssignment */:
                     return getSyntheticElementAccess(ancestor);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return getSyntheticElementAccess(node.parent);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return ancestor.initializer;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return ancestor.right;
             }
         }
         function getDestructuringPropertyName(node) {
             var parent = node.parent;
-            if (node.kind === 186 /* BindingElement */ && parent.kind === 184 /* ObjectBindingPattern */) {
+            if (node.kind === 187 /* BindingElement */ && parent.kind === 185 /* ObjectBindingPattern */) {
                 return getLiteralPropertyNameText(node.propertyName || node.name);
             }
-            if (node.kind === 275 /* PropertyAssignment */ || node.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (node.kind === 276 /* PropertyAssignment */ || node.kind === 277 /* ShorthandPropertyAssignment */) {
                 return getLiteralPropertyNameText(node.name);
             }
             return "" + parent.elements.indexOf(node);
@@ -35586,7 +35933,7 @@ var ts;
                 parentType = getNonNullableType(parentType);
             }
             var type;
-            if (pattern.kind === 184 /* ObjectBindingPattern */) {
+            if (pattern.kind === 185 /* ObjectBindingPattern */) {
                 if (declaration.dotDotDotToken) {
                     if (parentType.flags & 2 /* Unknown */ || !isValidSpreadType(parentType)) {
                         error(declaration, ts.Diagnostics.Rest_types_may_only_be_created_from_object_types);
@@ -35650,30 +35997,30 @@ var ts;
         }
         function isNullOrUndefined(node) {
             var expr = ts.skipParentheses(node);
-            return expr.kind === 96 /* NullKeyword */ || expr.kind === 72 /* Identifier */ && getResolvedSymbol(expr) === undefinedSymbol;
+            return expr.kind === 97 /* NullKeyword */ || expr.kind === 73 /* Identifier */ && getResolvedSymbol(expr) === undefinedSymbol;
         }
         function isEmptyArrayLiteral(node) {
             var expr = ts.skipParentheses(node);
-            return expr.kind === 187 /* ArrayLiteralExpression */ && expr.elements.length === 0;
+            return expr.kind === 188 /* ArrayLiteralExpression */ && expr.elements.length === 0;
         }
         function addOptionality(type, optional) {
             if (optional === void 0) { optional = true; }
             return strictNullChecks && optional ? getOptionalType(type) : type;
         }
         function isParameterOfContextuallyTypedFunction(node) {
-            return node.kind === 151 /* Parameter */ &&
-                (node.parent.kind === 196 /* FunctionExpression */ || node.parent.kind === 197 /* ArrowFunction */) &&
+            return node.kind === 152 /* Parameter */ &&
+                (node.parent.kind === 197 /* FunctionExpression */ || node.parent.kind === 198 /* ArrowFunction */) &&
                 !!getContextualType(node.parent);
         }
         // Return the inferred type for a variable, parameter, or property declaration
         function getTypeForVariableLikeDeclaration(declaration, includeOptionality) {
             // A variable declared in a for..in statement is of type string, or of type keyof T when the
             // right hand expression is of a type parameter type.
-            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 226 /* ForInStatement */) {
+            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 227 /* ForInStatement */) {
                 var indexType = getIndexType(getNonNullableTypeIfNeeded(checkExpression(declaration.parent.parent.expression)));
                 return indexType.flags & (262144 /* TypeParameter */ | 4194304 /* Index */) ? getExtractStringType(indexType) : stringType;
             }
-            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 227 /* ForOfStatement */) {
+            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 228 /* ForOfStatement */) {
                 // checkRightHandSideOfForOf will return undefined if the for-of expression type was
                 // missing properties/signatures required to get its iteratedType (like
                 // [Symbol.iterator] or next). This may be because we accessed properties from anyType,
@@ -35692,7 +36039,7 @@ var ts;
                 return addOptionality(declaredType, isOptional);
             }
             if ((noImplicitAny || ts.isInJSFile(declaration)) &&
-                declaration.kind === 237 /* VariableDeclaration */ && !ts.isBindingPattern(declaration.name) &&
+                declaration.kind === 238 /* VariableDeclaration */ && !ts.isBindingPattern(declaration.name) &&
                 !(ts.getCombinedModifierFlags(declaration) & 1 /* Export */) && !(declaration.flags & 4194304 /* Ambient */)) {
                 // If --noImplicitAny is on or the declaration is in a Javascript file,
                 // use control flow tracked 'any' type for non-ambient, non-exported var or let variables with no
@@ -35706,11 +36053,11 @@ var ts;
                     return autoArrayType;
                 }
             }
-            if (declaration.kind === 151 /* Parameter */) {
+            if (declaration.kind === 152 /* Parameter */) {
                 var func = declaration.parent;
                 // For a parameter of a set accessor, use the type of the get accessor if one is present
-                if (func.kind === 159 /* SetAccessor */ && !hasNonBindableDynamicName(func)) {
-                    var getter = ts.getDeclarationOfKind(getSymbolOfNode(declaration.parent), 158 /* GetAccessor */);
+                if (func.kind === 160 /* SetAccessor */ && !hasNonBindableDynamicName(func)) {
+                    var getter = ts.getDeclarationOfKind(getSymbolOfNode(declaration.parent), 159 /* GetAccessor */);
                     if (getter) {
                         var getterSignature = getSignatureFromDeclaration(getter);
                         var thisParameter = getAccessorThisParameter(func);
@@ -35847,7 +36194,7 @@ var ts;
                     return type;
                 }
                 else if (declaredType !== errorType && type !== errorType && !isTypeIdenticalTo(declaredType, type)) {
-                    errorNextVariableOrPropertyDeclarationMustHaveSameType(declaredType, declaration, type);
+                    errorNextVariableOrPropertyDeclarationMustHaveSameType(/*firstDeclaration*/ undefined, declaredType, declaration, type);
                 }
             }
             return declaredType;
@@ -35914,9 +36261,9 @@ var ts;
             var thisContainer = ts.getThisContainer(expression, /*includeArrowFunctions*/ false);
             // Properties defined in a constructor (or base constructor, or javascript constructor function) don't get undefined added.
             // Function expressions that are assigned to the prototype count as methods.
-            return thisContainer.kind === 157 /* Constructor */ ||
-                thisContainer.kind === 239 /* FunctionDeclaration */ ||
-                (thisContainer.kind === 196 /* FunctionExpression */ && !ts.isPrototypePropertyAssignment(thisContainer.parent));
+            return thisContainer.kind === 158 /* Constructor */ ||
+                thisContainer.kind === 240 /* FunctionDeclaration */ ||
+                (thisContainer.kind === 197 /* FunctionExpression */ && !ts.isPrototypePropertyAssignment(thisContainer.parent));
         }
         function getConstructorDefinedThisAssignmentTypes(types, declarations) {
             ts.Debug.assert(types.length === declarations.length);
@@ -35991,7 +36338,7 @@ var ts;
         function getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors) {
             var elements = pattern.elements;
             var lastElement = ts.lastOrUndefined(elements);
-            var hasRestElement = !!(lastElement && lastElement.kind === 186 /* BindingElement */ && lastElement.dotDotDotToken);
+            var hasRestElement = !!(lastElement && lastElement.kind === 187 /* BindingElement */ && lastElement.dotDotDotToken);
             if (elements.length === 0 || elements.length === 1 && hasRestElement) {
                 return languageVersion >= 2 /* ES2015 */ ? createIterableType(anyType) : anyArrayType;
             }
@@ -36014,7 +36361,7 @@ var ts;
         function getTypeFromBindingPattern(pattern, includePatternInType, reportErrors) {
             if (includePatternInType === void 0) { includePatternInType = false; }
             if (reportErrors === void 0) { reportErrors = false; }
-            return pattern.kind === 184 /* ObjectBindingPattern */
+            return pattern.kind === 185 /* ObjectBindingPattern */
                 ? getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors)
                 : getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors);
         }
@@ -36053,7 +36400,7 @@ var ts;
         }
         function declarationBelongsToPrivateAmbientMember(declaration) {
             var root = ts.getRootDeclaration(declaration);
-            var memberDeclaration = root.kind === 151 /* Parameter */ ? root.parent : root;
+            var memberDeclaration = root.kind === 152 /* Parameter */ ? root.parent : root;
             return isPrivateWithinAmbient(memberDeclaration);
         }
         function tryGetTypeFromEffectiveTypeNode(declaration) {
@@ -36115,7 +36462,7 @@ var ts;
                 return reportCircularityError(symbol);
             }
             var type;
-            if (declaration.kind === 254 /* ExportAssignment */) {
+            if (declaration.kind === 255 /* ExportAssignment */) {
                 type = widenTypeForVariableLikeDeclaration(checkExpressionCached(declaration.expression), declaration);
             }
             else if (ts.isInJSFile(declaration) &&
@@ -36166,7 +36513,7 @@ var ts;
                 type = getTypeOfEnumMember(symbol);
             }
             else {
-                return ts.Debug.fail("Unhandled declaration kind! " + ts.Debug.showSyntaxKind(declaration) + " for " + ts.Debug.showSymbol(symbol));
+                return ts.Debug.fail("Unhandled declaration kind! " + ts.Debug.formatSyntaxKind(declaration.kind) + " for " + ts.Debug.formatSymbol(symbol));
             }
             if (!popTypeResolution()) {
                 // Symbol is property of some kind that is merged with something - should use `getTypeOfFuncClassEnumModule` and not `getTypeOfVariableOrParameterOrProperty`
@@ -36179,7 +36526,7 @@ var ts;
         }
         function getAnnotatedAccessorTypeNode(accessor) {
             if (accessor) {
-                if (accessor.kind === 158 /* GetAccessor */) {
+                if (accessor.kind === 159 /* GetAccessor */) {
                     var getterTypeAnnotation = ts.getEffectiveReturnTypeNode(accessor);
                     return getterTypeAnnotation;
                 }
@@ -36206,8 +36553,8 @@ var ts;
             return links.type || (links.type = getTypeOfAccessorsWorker(symbol));
         }
         function getTypeOfAccessorsWorker(symbol) {
-            var getter = ts.getDeclarationOfKind(symbol, 158 /* GetAccessor */);
-            var setter = ts.getDeclarationOfKind(symbol, 159 /* SetAccessor */);
+            var getter = ts.getDeclarationOfKind(symbol, 159 /* GetAccessor */);
+            var setter = ts.getDeclarationOfKind(symbol, 160 /* SetAccessor */);
             if (getter && ts.isInJSFile(getter)) {
                 var jsDocType = getTypeForDeclarationFromJSDocComment(getter);
                 if (jsDocType) {
@@ -36250,7 +36597,7 @@ var ts;
             if (!popTypeResolution()) {
                 type = anyType;
                 if (noImplicitAny) {
-                    var getter_1 = ts.getDeclarationOfKind(symbol, 158 /* GetAccessor */);
+                    var getter_1 = ts.getDeclarationOfKind(symbol, 159 /* GetAccessor */);
                     error(getter_1, ts.Diagnostics._0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions, symbolToString(symbol));
                 }
             }
@@ -36290,8 +36637,8 @@ var ts;
             if (symbol.flags & 1536 /* Module */ && ts.isShorthandAmbientModuleSymbol(symbol)) {
                 return anyType;
             }
-            else if (declaration.kind === 204 /* BinaryExpression */ ||
-                declaration.kind === 189 /* PropertyAccessExpression */ && declaration.parent.kind === 204 /* BinaryExpression */) {
+            else if (declaration.kind === 205 /* BinaryExpression */ ||
+                declaration.kind === 190 /* PropertyAccessExpression */ && declaration.parent.kind === 205 /* BinaryExpression */) {
                 return getWidenedTypeFromAssignmentDeclaration(symbol);
             }
             else if (symbol.flags & 512 /* ValueModule */ && declaration && ts.isSourceFile(declaration) && declaration.commonJsModuleIndicator) {
@@ -36358,7 +36705,7 @@ var ts;
                 return errorType;
             }
             // Check if variable has initializer that circularly references the variable itself
-            if (noImplicitAny && (declaration.kind !== 151 /* Parameter */ || declaration.initializer)) {
+            if (noImplicitAny && (declaration.kind !== 152 /* Parameter */ || declaration.initializer)) {
                 error(symbol.valueDeclaration, ts.Diagnostics._0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer, symbolToString(symbol));
             }
             // Circularities could also result from parameters in function expressions that end up
@@ -36366,11 +36713,23 @@ var ts;
             // we have already reported an implicit any error so we don't report anything here.
             return anyType;
         }
+        function getTypeOfSymbolWithDeferredType(symbol) {
+            var links = getSymbolLinks(symbol);
+            if (!links.type) {
+                ts.Debug.assertDefined(links.deferralParent);
+                ts.Debug.assertDefined(links.deferralConstituents);
+                links.type = links.deferralParent.flags & 1048576 /* Union */ ? getUnionType(links.deferralConstituents) : getIntersectionType(links.deferralConstituents);
+            }
+            return links.type;
+        }
         function getTypeOfSymbol(symbol) {
+            if (ts.getCheckFlags(symbol) & 65536 /* DeferredType */) {
+                return getTypeOfSymbolWithDeferredType(symbol);
+            }
             if (ts.getCheckFlags(symbol) & 1 /* Instantiated */) {
                 return getTypeOfInstantiatedSymbol(symbol);
             }
-            if (ts.getCheckFlags(symbol) & 4096 /* ReverseMapped */) {
+            if (ts.getCheckFlags(symbol) & 8192 /* ReverseMapped */) {
                 return getTypeOfReverseMappedSymbol(symbol);
             }
             if (symbol.flags & (3 /* Variable */ | 4 /* Property */)) {
@@ -36431,35 +36790,35 @@ var ts;
                     return undefined;
                 }
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 160 /* CallSignature */:
-                    case 161 /* ConstructSignature */:
-                    case 155 /* MethodSignature */:
-                    case 165 /* FunctionType */:
-                    case 166 /* ConstructorType */:
-                    case 294 /* JSDocFunctionType */:
-                    case 239 /* FunctionDeclaration */:
-                    case 156 /* MethodDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 308 /* JSDocTemplateTag */:
-                    case 309 /* JSDocTypedefTag */:
-                    case 302 /* JSDocCallbackTag */:
-                    case 181 /* MappedType */:
-                    case 175 /* ConditionalType */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 161 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 156 /* MethodSignature */:
+                    case 166 /* FunctionType */:
+                    case 167 /* ConstructorType */:
+                    case 295 /* JSDocFunctionType */:
+                    case 240 /* FunctionDeclaration */:
+                    case 157 /* MethodDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 309 /* JSDocTemplateTag */:
+                    case 310 /* JSDocTypedefTag */:
+                    case 303 /* JSDocCallbackTag */:
+                    case 182 /* MappedType */:
+                    case 176 /* ConditionalType */:
                         var outerTypeParameters = getOuterTypeParameters(node, includeThisTypes);
-                        if (node.kind === 181 /* MappedType */) {
+                        if (node.kind === 182 /* MappedType */) {
                             return ts.append(outerTypeParameters, getDeclaredTypeOfTypeParameter(getSymbolOfNode(node.typeParameter)));
                         }
-                        else if (node.kind === 175 /* ConditionalType */) {
+                        else if (node.kind === 176 /* ConditionalType */) {
                             return ts.concatenate(outerTypeParameters, getInferTypeParameters(node));
                         }
                         var outerAndOwnTypeParameters = appendTypeParameters(outerTypeParameters, ts.getEffectiveTypeParameterDeclarations(node));
                         var thisType = includeThisTypes &&
-                            (node.kind === 240 /* ClassDeclaration */ || node.kind === 209 /* ClassExpression */ || node.kind === 241 /* InterfaceDeclaration */) &&
+                            (node.kind === 241 /* ClassDeclaration */ || node.kind === 210 /* ClassExpression */ || node.kind === 242 /* InterfaceDeclaration */) &&
                             getDeclaredTypeOfClassOrInterface(getSymbolOfNode(node)).thisType;
                         return thisType ? ts.append(outerAndOwnTypeParameters, thisType) : outerAndOwnTypeParameters;
                 }
@@ -36467,7 +36826,7 @@ var ts;
         }
         // The outer type parameters are those defined by enclosing generic classes, methods, or functions.
         function getOuterTypeParametersOfClassOrInterface(symbol) {
-            var declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 241 /* InterfaceDeclaration */);
+            var declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 242 /* InterfaceDeclaration */);
             return getOuterTypeParameters(declaration);
         }
         // The local type parameters are the combined set of type parameters from all declarations of the class,
@@ -36476,9 +36835,9 @@ var ts;
             var result;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var node = _a[_i];
-                if (node.kind === 241 /* InterfaceDeclaration */ ||
-                    node.kind === 240 /* ClassDeclaration */ ||
-                    node.kind === 209 /* ClassExpression */ ||
+                if (node.kind === 242 /* InterfaceDeclaration */ ||
+                    node.kind === 241 /* ClassDeclaration */ ||
+                    node.kind === 210 /* ClassExpression */ ||
                     ts.isTypeAlias(node)) {
                     var declaration = node;
                     result = appendTypeParameters(result, ts.getEffectiveTypeParameterDeclarations(declaration));
@@ -36672,7 +37031,7 @@ var ts;
             type.resolvedBaseTypes = type.resolvedBaseTypes || ts.emptyArray;
             for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 241 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
+                if (declaration.kind === 242 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
                     for (var _b = 0, _c = ts.getInterfaceBaseTypeNodes(declaration); _b < _c.length; _b++) {
                         var node = _c[_b];
                         var baseType = getTypeFromTypeNode(node);
@@ -36708,7 +37067,7 @@ var ts;
         function isThislessInterface(symbol) {
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 241 /* InterfaceDeclaration */) {
+                if (declaration.kind === 242 /* InterfaceDeclaration */) {
                     if (declaration.flags & 64 /* ContainsThis */) {
                         return false;
                     }
@@ -36765,7 +37124,7 @@ var ts;
                     return errorType;
                 }
                 var declaration = ts.find(symbol.declarations, function (d) {
-                    return ts.isJSDocTypeAlias(d) || d.kind === 242 /* TypeAliasDeclaration */;
+                    return ts.isJSDocTypeAlias(d) || d.kind === 243 /* TypeAliasDeclaration */;
                 });
                 var typeNode = ts.isJSDocTypeAlias(declaration) ? declaration.typeExpression : declaration.type;
                 // If typeNode is missing, we will error in checkJSDocTypedefTag.
@@ -36792,7 +37151,7 @@ var ts;
             if (expr.kind === 10 /* StringLiteral */) {
                 return true;
             }
-            else if (expr.kind === 204 /* BinaryExpression */) {
+            else if (expr.kind === 205 /* BinaryExpression */) {
                 return isStringConcatExpression(expr.left) && isStringConcatExpression(expr.right);
             }
             return false;
@@ -36806,12 +37165,12 @@ var ts;
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                     return true;
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return expr.operator === 39 /* MinusToken */ &&
                         expr.operand.kind === 8 /* NumericLiteral */;
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return ts.nodeIsMissing(expr) || !!getSymbolOfNode(member.parent).exports.get(expr.escapedText);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return isStringConcatExpression(expr);
                 default:
                     return false;
@@ -36825,7 +37184,7 @@ var ts;
             var hasNonLiteralMember = false;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 243 /* EnumDeclaration */) {
+                if (declaration.kind === 244 /* EnumDeclaration */) {
                     for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                         var member = _c[_b];
                         if (member.initializer && member.initializer.kind === 10 /* StringLiteral */) {
@@ -36852,7 +37211,7 @@ var ts;
                 var memberTypeList = [];
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
-                    if (declaration.kind === 243 /* EnumDeclaration */) {
+                    if (declaration.kind === 244 /* EnumDeclaration */) {
                         for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
                             var member = _c[_b];
                             var memberType = getFreshTypeOfLiteralType(getLiteralType(getEnumMemberValue(member), enumCount, getSymbolOfNode(member))); // TODO: GH#18217
@@ -36923,23 +37282,23 @@ var ts;
          */
         function isThislessType(node) {
             switch (node.kind) {
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 138 /* StringKeyword */:
-                case 135 /* NumberKeyword */:
-                case 146 /* BigIntKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 136 /* ObjectKeyword */:
-                case 106 /* VoidKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 96 /* NullKeyword */:
-                case 132 /* NeverKeyword */:
-                case 182 /* LiteralType */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 139 /* StringKeyword */:
+                case 136 /* NumberKeyword */:
+                case 147 /* BigIntKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 137 /* ObjectKeyword */:
+                case 107 /* VoidKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 97 /* NullKeyword */:
+                case 133 /* NeverKeyword */:
+                case 183 /* LiteralType */:
                     return true;
-                case 169 /* ArrayType */:
+                case 170 /* ArrayType */:
                     return isThislessType(node.elementType);
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return !node.typeArguments || node.typeArguments.every(isThislessType);
             }
             return false;
@@ -36965,7 +37324,7 @@ var ts;
         function isThislessFunctionLikeDeclaration(node) {
             var returnType = ts.getEffectiveReturnTypeNode(node);
             var typeParameters = ts.getEffectiveTypeParameterDeclarations(node);
-            return (node.kind === 157 /* Constructor */ || (!!returnType && isThislessType(returnType))) &&
+            return (node.kind === 158 /* Constructor */ || (!!returnType && isThislessType(returnType))) &&
                 node.parameters.every(isThislessVariableLikeDeclaration) &&
                 typeParameters.every(isThislessTypeParameter);
         }
@@ -36981,14 +37340,14 @@ var ts;
                 var declaration = symbol.declarations[0];
                 if (declaration) {
                     switch (declaration.kind) {
-                        case 154 /* PropertyDeclaration */:
-                        case 153 /* PropertySignature */:
+                        case 155 /* PropertyDeclaration */:
+                        case 154 /* PropertySignature */:
                             return isThislessVariableLikeDeclaration(declaration);
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 157 /* Constructor */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 158 /* Constructor */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
                             return isThislessFunctionLikeDeclaration(declaration);
                     }
                 }
@@ -37089,7 +37448,7 @@ var ts;
          * members.
          */
         function addDeclarationToLateBoundSymbol(symbol, member, symbolFlags) {
-            ts.Debug.assert(!!(ts.getCheckFlags(symbol) & 2048 /* Late */), "Expected a late-bound symbol.");
+            ts.Debug.assert(!!(ts.getCheckFlags(symbol) & 4096 /* Late */), "Expected a late-bound symbol.");
             symbol.flags |= symbolFlags;
             getSymbolLinks(member.symbol).lateSymbol = symbol;
             if (!symbol.declarations) {
@@ -37146,7 +37505,7 @@ var ts;
                     // Get or add a late-bound symbol for the member. This allows us to merge late-bound accessor declarations.
                     var lateSymbol = lateSymbols.get(memberName);
                     if (!lateSymbol)
-                        lateSymbols.set(memberName, lateSymbol = createSymbol(0 /* None */, memberName, 2048 /* Late */));
+                        lateSymbols.set(memberName, lateSymbol = createSymbol(0 /* None */, memberName, 4096 /* Late */));
                     // Report an error if a late-bound member has the same name as an early-bound member,
                     // or if we have another early-bound symbol declaration with the same name and
                     // conflicting flags.
@@ -37158,7 +37517,7 @@ var ts;
                         var name_3 = !(type.flags & 8192 /* UniqueESSymbol */) && ts.unescapeLeadingUnderscores(memberName) || ts.declarationNameToString(decl.name);
                         ts.forEach(declarations, function (declaration) { return error(ts.getNameOfDeclaration(declaration) || declaration, ts.Diagnostics.Property_0_was_also_declared_here, name_3); });
                         error(decl.name || decl, ts.Diagnostics.Duplicate_property_0, name_3);
-                        lateSymbol = createSymbol(0 /* None */, memberName, 2048 /* Late */);
+                        lateSymbol = createSymbol(0 /* None */, memberName, 4096 /* Late */);
                     }
                     lateSymbol.nameType = type;
                     addDeclarationToLateBoundSymbol(lateSymbol, decl, symbolFlags);
@@ -37223,11 +37582,12 @@ var ts;
                 var links = getSymbolLinks(symbol);
                 if (!links.lateSymbol && ts.some(symbol.declarations, hasLateBindableName)) {
                     // force late binding of members/exports. This will set the late-bound symbol
+                    var parent = getMergedSymbol(symbol.parent);
                     if (ts.some(symbol.declarations, ts.hasStaticModifier)) {
-                        getExportsOfSymbol(symbol.parent);
+                        getExportsOfSymbol(parent);
                     }
                     else {
-                        getMembersOfSymbol(symbol.parent);
+                        getMembersOfSymbol(parent);
                     }
                 }
                 return links.lateSymbol || (links.lateSymbol = symbol);
@@ -37344,8 +37704,8 @@ var ts;
                     var tupleRestIndex_1 = restType.target.hasRestElement ? elementTypes.length - 1 : -1;
                     var restParams = ts.map(elementTypes, function (t, i) {
                         var name = getParameterNameAtPosition(sig, restIndex_1 + i);
-                        var checkFlags = i === tupleRestIndex_1 ? 16384 /* RestParameter */ :
-                            i >= minLength_1 ? 8192 /* OptionalParameter */ : 0;
+                        var checkFlags = i === tupleRestIndex_1 ? 32768 /* RestParameter */ :
+                            i >= minLength_1 ? 16384 /* OptionalParameter */ : 0;
                         var symbol = createSymbol(1 /* FunctionScopedVariable */, name, checkFlags);
                         symbol.type = i === tupleRestIndex_1 ? createArrayType(t) : t;
                         return symbol;
@@ -37435,10 +37795,10 @@ var ts;
                             // Union the result types when more than one signature matches
                             if (unionSignatures.length > 1) {
                                 var thisParameter = signature.thisParameter;
-                                if (ts.forEach(unionSignatures, function (sig) { return sig.thisParameter; })) {
-                                    // TODO: GH#18217 We tested that *some* has thisParameter and now act as if *all* do
+                                var firstThisParameterOfUnionSignatures = ts.forEach(unionSignatures, function (sig) { return sig.thisParameter; });
+                                if (firstThisParameterOfUnionSignatures) {
                                     var thisType = getUnionType(ts.map(unionSignatures, function (sig) { return sig.thisParameter ? getTypeOfSymbol(sig.thisParameter) : anyType; }), 2 /* Subtype */);
-                                    thisParameter = createSymbolWithType(signature.thisParameter, thisType);
+                                    thisParameter = createSymbolWithType(firstThisParameterOfUnionSignatures, thisType);
                                 }
                                 s = createUnionSignature(signature, unionSignatures);
                                 s.thisParameter = thisParameter;
@@ -37695,7 +38055,7 @@ var ts;
             var members = ts.createSymbolTable();
             for (var _i = 0, _a = getPropertiesOfType(type.source); _i < _a.length; _i++) {
                 var prop = _a[_i];
-                var checkFlags = 4096 /* ReverseMapped */ | (readonlyMask && isReadonlySymbol(prop) ? 8 /* Readonly */ : 0);
+                var checkFlags = 8192 /* ReverseMapped */ | (readonlyMask && isReadonlySymbol(prop) ? 8 /* Readonly */ : 0);
                 var inferredProp = createSymbol(4 /* Property */ | prop.flags & optionalMask, prop.escapedName, checkFlags);
                 inferredProp.declarations = prop.declarations;
                 inferredProp.nameType = prop.nameType;
@@ -37717,7 +38077,15 @@ var ts;
                 return getIndexType(getApparentType(type.type));
             }
             if (type.flags & 16777216 /* Conditional */) {
-                return getLowerBoundOfConditionalType(type);
+                if (type.root.isDistributive) {
+                    var checkType = type.checkType;
+                    var constraint = getLowerBoundOfKeyType(checkType);
+                    if (constraint !== checkType) {
+                        var mapper = makeUnaryTypeMapper(type.root.checkType, constraint);
+                        return getConditionalTypeInstantiation(type, combineTypeMappers(mapper, type.mapper));
+                    }
+                }
+                return type;
             }
             if (type.flags & 1048576 /* Union */) {
                 return getUnionType(ts.sameMap(type.types, getLowerBoundOfKeyType));
@@ -37727,16 +38095,6 @@ var ts;
             }
             return neverType;
         }
-        function getLowerBoundOfConditionalType(type) {
-            if (type.root.isDistributive) {
-                var constraint = getLowerBoundOfKeyType(type.checkType);
-                if (constraint !== type.checkType) {
-                    var mapper = makeUnaryTypeMapper(type.root.checkType, constraint);
-                    return getConditionalTypeInstantiation(type, combineTypeMappers(mapper, type.mapper));
-                }
-            }
-            return type;
-        }
         /** Resolve the members of a mapped type { [P in K]: T } */
         function resolveMappedTypeMembers(type) {
             var members = ts.createSymbolTable();
@@ -37825,8 +38183,8 @@ var ts;
         }
         function isMappedTypeWithKeyofConstraintDeclaration(type) {
             var constraintDeclaration = getConstraintDeclarationForMappedType(type); // TODO: GH#18217
-            return constraintDeclaration.kind === 179 /* TypeOperator */ &&
-                constraintDeclaration.operator === 129 /* KeyOfKeyword */;
+            return constraintDeclaration.kind === 180 /* TypeOperator */ &&
+                constraintDeclaration.operator === 130 /* KeyOfKeyword */;
         }
         function getModifiersTypeFromMappedType(type) {
             if (!type.modifiersType) {
@@ -37843,7 +38201,7 @@ var ts;
                     var declaredType = getTypeFromMappedTypeNode(type.declaration);
                     var constraint = getConstraintTypeFromMappedType(declaredType);
                     var extendedConstraint = constraint && constraint.flags & 262144 /* TypeParameter */ ? getConstraintOfTypeParameter(constraint) : constraint;
-                    type.modifiersType = extendedConstraint && extendedConstraint.flags & 4194304 /* Index */ ? instantiateType(extendedConstraint.type, type.mapper || identityMapper) : emptyObjectType;
+                    type.modifiersType = extendedConstraint && extendedConstraint.flags & 4194304 /* Index */ ? instantiateType(extendedConstraint.type, type.mapper || identityMapper) : unknownType;
                 }
             }
             return type.modifiersType;
@@ -37939,6 +38297,26 @@ var ts;
             }
             return type.resolvedProperties;
         }
+        function getPossiblePropertiesOfUnionType(type) {
+            if (type.possiblePropertyCache) {
+                return type.possiblePropertyCache.size ? ts.arrayFrom(type.possiblePropertyCache.values()) : ts.emptyArray;
+            }
+            type.possiblePropertyCache = ts.createSymbolTable();
+            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                var t = _a[_i];
+                for (var _b = 0, _c = getPropertiesOfType(t); _b < _c.length; _b++) {
+                    var p = _c[_b];
+                    if (!type.possiblePropertyCache.has(p.escapedName)) {
+                        var prop = getUnionOrIntersectionProperty(type, p.escapedName);
+                        if (prop) {
+                            type.possiblePropertyCache.set(p.escapedName, prop);
+                        }
+                    }
+                }
+            }
+            // We can't simply use the normal property cache here, since that will contain cached apparent type members :(
+            return type.possiblePropertyCache.size ? ts.arrayFrom(type.possiblePropertyCache.values()) : ts.emptyArray;
+        }
         function getPropertiesOfType(type) {
             type = getApparentType(type);
             return type.flags & 3145728 /* UnionOrIntersection */ ?
@@ -37986,16 +38364,23 @@ var ts;
         function getConstraintOfIndexedAccess(type) {
             return hasNonCircularBaseConstraint(type) ? getConstraintFromIndexedAccess(type) : undefined;
         }
+        function getSimplifiedTypeOrConstraint(type) {
+            var simplified = getSimplifiedType(type, /*writing*/ false);
+            return simplified !== type ? simplified : getConstraintOfType(type);
+        }
         function getConstraintFromIndexedAccess(type) {
-            var objectType = getConstraintOfType(type.objectType) || type.objectType;
-            if (objectType !== type.objectType) {
-                var constraint = getIndexedAccessType(objectType, type.indexType, /*accessNode*/ undefined, errorType);
-                if (constraint && constraint !== errorType) {
-                    return constraint;
+            var indexConstraint = getSimplifiedTypeOrConstraint(type.indexType);
+            if (indexConstraint && indexConstraint !== type.indexType) {
+                var indexedAccess = getIndexedAccessTypeOrUndefined(type.objectType, indexConstraint);
+                if (indexedAccess) {
+                    return indexedAccess;
                 }
             }
-            var baseConstraint = getBaseConstraintOfType(type);
-            return baseConstraint && baseConstraint !== type ? baseConstraint : undefined;
+            var objectConstraint = getSimplifiedTypeOrConstraint(type.objectType);
+            if (objectConstraint && objectConstraint !== type.objectType) {
+                return getIndexedAccessTypeOrUndefined(objectConstraint, type.indexType);
+            }
+            return undefined;
         }
         function getDefaultConstraintOfConditionalType(type) {
             if (!type.resolvedDefaultConstraint) {
@@ -38004,7 +38389,7 @@ var ts;
                 // just `any`. This result is _usually_ unwanted - so instead here we elide an `any` branch from the constraint type,
                 // in effect treating `any` like `never` rather than `unknown` in this location.
                 var trueConstraint = getInferredTrueTypeFromConditionalType(type);
-                var falseConstraint = type.falseType;
+                var falseConstraint = getFalseTypeFromConditionalType(type);
                 type.resolvedDefaultConstraint = isTypeAny(trueConstraint) ? falseConstraint : isTypeAny(falseConstraint) ? trueConstraint : getUnionType([trueConstraint, falseConstraint]);
             }
             return type.resolvedDefaultConstraint;
@@ -38022,7 +38407,7 @@ var ts;
             // a union - once negated types exist and are applied to the conditional false branch, this "constraint"
             // likely doesn't need to exist.
             if (type.root.isDistributive && type.restrictiveInstantiation !== type) {
-                var simplified = getSimplifiedType(type.checkType);
+                var simplified = getSimplifiedType(type.checkType, /*writing*/ false);
                 var constraint = simplified === type.checkType ? getConstraintOfType(simplified) : simplified;
                 if (constraint && constraint !== type.checkType) {
                     var mapper = makeUnaryTypeMapper(type.root.checkType, constraint);
@@ -38053,11 +38438,6 @@ var ts;
                         constraint = getConstraintOfType(constraint);
                     }
                     if (constraint) {
-                        // A constraint that isn't a union type implies that the final type would be a non-union
-                        // type as well. Since non-union constraints are of no interest, we can exit here.
-                        if (!(constraint.flags & 1048576 /* Union */)) {
-                            return undefined;
-                        }
                         constraints = ts.append(constraints, constraint);
                     }
                 }
@@ -38066,10 +38446,10 @@ var ts;
                 }
             }
             // If the target is a union type or if we are intersecting with types belonging to one of the
-            // disjoint domans, we may end up producing a constraint that hasn't been examined before.
+            // disjoint domains, we may end up producing a constraint that hasn't been examined before.
             if (constraints && (targetIsUnion || hasDisjointDomainType)) {
                 if (hasDisjointDomainType) {
-                    // We add any types belong to one of the disjoint domans because they might cause the final
+                    // We add any types belong to one of the disjoint domains because they might cause the final
                     // intersection operation to reduce the union constraints.
                     for (var _b = 0, _c = type.types; _b < _c.length; _b++) {
                         var t = _c[_b];
@@ -38115,7 +38495,7 @@ var ts;
                     }
                     if (constraintDepth >= 50) {
                         // We have reached 50 recursive invocations of getImmediateBaseConstraint and there is a
-                        // very high likelyhood we're dealing with an infinite generic type that perpetually generates
+                        // very high likelihood we're dealing with an infinite generic type that perpetually generates
                         // new type identities as we descend into it. We stop the recursion here and mark this type
                         // and the outer types as having circular constraints.
                         error(currentNode, ts.Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
@@ -38123,7 +38503,7 @@ var ts;
                         return t.immediateBaseConstraint = noConstraintType;
                     }
                     constraintDepth++;
-                    var result = computeBaseConstraint(getSimplifiedType(t));
+                    var result = computeBaseConstraint(getSimplifiedType(t, /*writing*/ false));
                     constraintDepth--;
                     if (!popTypeResolution()) {
                         if (t.flags & 262144 /* TypeParameter */) {
@@ -38175,8 +38555,8 @@ var ts;
                 if (t.flags & 8388608 /* IndexedAccess */) {
                     var baseObjectType = getBaseConstraint(t.objectType);
                     var baseIndexType = getBaseConstraint(t.indexType);
-                    var baseIndexedAccess = baseObjectType && baseIndexType ? getIndexedAccessType(baseObjectType, baseIndexType, /*accessNode*/ undefined, errorType) : undefined;
-                    return baseIndexedAccess && baseIndexedAccess !== errorType ? getBaseConstraint(baseIndexedAccess) : undefined;
+                    var baseIndexedAccess = baseObjectType && baseIndexType && getIndexedAccessTypeOrUndefined(baseObjectType, baseIndexType);
+                    return baseIndexedAccess && getBaseConstraint(baseIndexedAccess);
                 }
                 if (t.flags & 16777216 /* Conditional */) {
                     var constraint = getConstraintFromConditionalType(t);
@@ -38257,17 +38637,18 @@ var ts;
          * type itself. Note that the apparent type of a union type is the union type itself.
          */
         function getApparentType(type) {
-            var t = type.flags & 63176704 /* Instantiable */ ? getBaseConstraintOfType(type) || emptyObjectType : type;
+            var t = type.flags & 63176704 /* Instantiable */ ? getBaseConstraintOfType(type) || unknownType : type;
             return ts.getObjectFlags(t) & 32 /* Mapped */ ? getApparentTypeOfMappedType(t) :
                 t.flags & 2097152 /* Intersection */ ? getApparentTypeOfIntersectionType(t) :
                     t.flags & 132 /* StringLike */ ? globalStringType :
                         t.flags & 296 /* NumberLike */ ? globalNumberType :
-                            t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType(/*reportErrors*/ languageVersion >= 7 /* ESNext */) :
+                            t.flags & 2112 /* BigIntLike */ ? getGlobalBigIntType(/*reportErrors*/ languageVersion >= 8 /* ESNext */) :
                                 t.flags & 528 /* BooleanLike */ ? globalBooleanType :
                                     t.flags & 12288 /* ESSymbolLike */ ? getGlobalESSymbolType(/*reportErrors*/ languageVersion >= 2 /* ES2015 */) :
                                         t.flags & 67108864 /* NonPrimitive */ ? emptyObjectType :
                                             t.flags & 4194304 /* Index */ ? keyofConstraintType :
-                                                t;
+                                                t.flags & 2 /* Unknown */ && !strictNullChecks ? emptyObjectType :
+                                                    t;
         }
         function createUnionOrIntersectionProperty(containingType, name) {
             var propSet = ts.createMap();
@@ -38275,7 +38656,7 @@ var ts;
             var isUnion = containingType.flags & 1048576 /* Union */;
             var excludeModifiers = isUnion ? 24 /* NonPublicAccessibilityModifier */ : 0;
             // Flags we want to propagate to the result if they exist in all source symbols
-            var commonFlags = isUnion ? 0 /* None */ : 16777216 /* Optional */;
+            var optionalFlag = isUnion ? 0 /* None */ : 16777216 /* Optional */;
             var syntheticFlag = 4 /* SyntheticMethod */;
             var checkFlags = 0;
             for (var _i = 0, _a = containingType.types; _i < _a.length; _i++) {
@@ -38285,16 +38666,21 @@ var ts;
                     var prop = getPropertyOfType(type, name);
                     var modifiers = prop ? ts.getDeclarationModifierFlagsFromSymbol(prop) : 0;
                     if (prop && !(modifiers & excludeModifiers)) {
-                        commonFlags &= prop.flags;
+                        if (isUnion) {
+                            optionalFlag |= (prop.flags & 16777216 /* Optional */);
+                        }
+                        else {
+                            optionalFlag &= prop.flags;
+                        }
                         var id = "" + getSymbolId(prop);
                         if (!propSet.has(id)) {
                             propSet.set(id, prop);
                         }
                         checkFlags |= (isReadonlySymbol(prop) ? 8 /* Readonly */ : 0) |
-                            (!(modifiers & 24 /* NonPublicAccessibilityModifier */) ? 128 /* ContainsPublic */ : 0) |
-                            (modifiers & 16 /* Protected */ ? 256 /* ContainsProtected */ : 0) |
-                            (modifiers & 8 /* Private */ ? 512 /* ContainsPrivate */ : 0) |
-                            (modifiers & 32 /* Static */ ? 1024 /* ContainsStatic */ : 0);
+                            (!(modifiers & 24 /* NonPublicAccessibilityModifier */) ? 256 /* ContainsPublic */ : 0) |
+                            (modifiers & 16 /* Protected */ ? 512 /* ContainsProtected */ : 0) |
+                            (modifiers & 8 /* Private */ ? 1024 /* ContainsPrivate */ : 0) |
+                            (modifiers & 32 /* Static */ ? 2048 /* ContainsStatic */ : 0);
                         if (!isPrototypeProperty(prop)) {
                             syntheticFlag = 2 /* SyntheticProperty */;
                         }
@@ -38303,10 +38689,11 @@ var ts;
                         var indexInfo = !isLateBoundName(name) && (isNumericLiteralName(name) && getIndexInfoOfType(type, 1 /* Number */) || getIndexInfoOfType(type, 0 /* String */));
                         if (indexInfo) {
                             checkFlags |= indexInfo.isReadonly ? 8 /* Readonly */ : 0;
+                            checkFlags |= 32 /* WritePartial */;
                             indexTypes = ts.append(indexTypes, isTupleType(type) ? getRestTypeOfTupleType(type) || undefinedType : indexInfo.type);
                         }
                         else {
-                            checkFlags |= 16 /* Partial */;
+                            checkFlags |= 16 /* ReadPartial */;
                         }
                     }
                 }
@@ -38315,7 +38702,7 @@ var ts;
                 return undefined;
             }
             var props = ts.arrayFrom(propSet.values());
-            if (props.length === 1 && !(checkFlags & 16 /* Partial */) && !indexTypes) {
+            if (props.length === 1 && !(checkFlags & 16 /* ReadPartial */) && !indexTypes) {
                 return props[0];
             }
             var declarations;
@@ -38339,15 +38726,15 @@ var ts;
                     nameType = prop.nameType;
                 }
                 else if (type !== firstType) {
-                    checkFlags |= 32 /* HasNonUniformType */;
+                    checkFlags |= 64 /* HasNonUniformType */;
                 }
                 if (isLiteralType(type)) {
-                    checkFlags |= 64 /* HasLiteralType */;
+                    checkFlags |= 128 /* HasLiteralType */;
                 }
                 propTypes.push(type);
             }
             ts.addRange(propTypes, indexTypes);
-            var result = createSymbol(4 /* Property */ | commonFlags, name, syntheticFlag | checkFlags);
+            var result = createSymbol(4 /* Property */ | optionalFlag, name, syntheticFlag | checkFlags);
             result.containingType = containingType;
             if (!hasNonUniformValueDeclaration && firstValueDeclaration) {
                 result.valueDeclaration = firstValueDeclaration;
@@ -38358,7 +38745,15 @@ var ts;
             }
             result.declarations = declarations;
             result.nameType = nameType;
-            result.type = isUnion ? getUnionType(propTypes) : getIntersectionType(propTypes);
+            if (propTypes.length > 2) {
+                // When `propTypes` has the potential to explode in size when normalized, defer normalization until absolutely needed
+                result.checkFlags |= 65536 /* DeferredType */;
+                result.deferralParent = containingType;
+                result.deferralConstituents = propTypes;
+            }
+            else {
+                result.type = isUnion ? getUnionType(propTypes) : getIntersectionType(propTypes);
+            }
             return result;
         }
         // Return the symbol for a given property in a union or intersection type, or undefined if the property
@@ -38380,7 +38775,7 @@ var ts;
         function getPropertyOfUnionOrIntersectionType(type, name) {
             var property = getUnionOrIntersectionProperty(type, name);
             // We need to filter out partial properties in union types
-            return property && !(ts.getCheckFlags(property) & 16 /* Partial */) ? property : undefined;
+            return property && !(ts.getCheckFlags(property) & 16 /* ReadPartial */) ? property : undefined;
         }
         /**
          * Return the symbol for the property with the given name in the given type. Creates synthetic union properties when
@@ -38486,10 +38881,10 @@ var ts;
         function isJSDocOptionalParameter(node) {
             return ts.isInJSFile(node) && (
             // node.type should only be a JSDocOptionalType when node is a parameter of a JSDocFunctionType
-            node.type && node.type.kind === 293 /* JSDocOptionalType */
+            node.type && node.type.kind === 294 /* JSDocOptionalType */
                 || ts.getJSDocParameterTags(node).some(function (_a) {
                     var isBracketed = _a.isBracketed, typeExpression = _a.typeExpression;
-                    return isBracketed || !!typeExpression && typeExpression.type.kind === 293 /* JSDocOptionalType */;
+                    return isBracketed || !!typeExpression && typeExpression.type.kind === 294 /* JSDocOptionalType */;
                 }));
         }
         function tryFindAmbientModule(moduleName, withAugmentations) {
@@ -38523,7 +38918,7 @@ var ts;
                 return false;
             }
             var isBracketed = node.isBracketed, typeExpression = node.typeExpression;
-            return isBracketed || !!typeExpression && typeExpression.type.kind === 293 /* JSDocOptionalType */;
+            return isBracketed || !!typeExpression && typeExpression.type.kind === 294 /* JSDocOptionalType */;
         }
         function createIdentifierTypePredicate(parameterName, parameterIndex, type) {
             return { kind: 1 /* Identifier */, parameterName: parameterName, parameterIndex: parameterIndex, type: type };
@@ -38561,7 +38956,7 @@ var ts;
                 var baseDefaultType = getDefaultTypeArgumentType(isJavaScriptImplicitAny);
                 for (var i = numTypeArguments; i < numTypeParameters; i++) {
                     var defaultType = getDefaultFromTypeParameter(typeParameters[i]);
-                    if (isJavaScriptImplicitAny && defaultType && isTypeIdenticalTo(defaultType, emptyObjectType)) {
+                    if (isJavaScriptImplicitAny && defaultType && (isTypeIdenticalTo(defaultType, unknownType) || isTypeIdenticalTo(defaultType, emptyObjectType))) {
                         defaultType = anyType;
                     }
                     result[i] = defaultType ? instantiateType(defaultType, createTypeMapper(typeParameters, result)) : baseDefaultType;
@@ -38605,7 +39000,7 @@ var ts;
                     else {
                         parameters.push(paramSymbol);
                     }
-                    if (type && type.kind === 182 /* LiteralType */) {
+                    if (type && type.kind === 183 /* LiteralType */) {
                         hasLiteralTypes = true;
                     }
                     // Record a new minimum argument count if this is not an optional parameter
@@ -38619,16 +39014,16 @@ var ts;
                     }
                 }
                 // If only one accessor includes a this-type annotation, the other behaves as if it had the same type annotation
-                if ((declaration.kind === 158 /* GetAccessor */ || declaration.kind === 159 /* SetAccessor */) &&
+                if ((declaration.kind === 159 /* GetAccessor */ || declaration.kind === 160 /* SetAccessor */) &&
                     !hasNonBindableDynamicName(declaration) &&
                     (!hasThisParameter || !thisParameter)) {
-                    var otherKind = declaration.kind === 158 /* GetAccessor */ ? 159 /* SetAccessor */ : 158 /* GetAccessor */;
+                    var otherKind = declaration.kind === 159 /* GetAccessor */ ? 160 /* SetAccessor */ : 159 /* GetAccessor */;
                     var other = ts.getDeclarationOfKind(getSymbolOfNode(declaration), otherKind);
                     if (other) {
                         thisParameter = getAnnotatedAccessorThisParameter(other);
                     }
                 }
-                var classType = declaration.kind === 157 /* Constructor */ ?
+                var classType = declaration.kind === 158 /* Constructor */ ?
                     getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol))
                     : undefined;
                 var typeParameters = classType ? classType.localTypeParameters : getTypeParametersFromDeclaration(declaration);
@@ -38653,7 +39048,7 @@ var ts;
             var lastParamVariadicType = ts.firstDefined(lastParamTags, function (p) {
                 return p.typeExpression && ts.isJSDocVariadicType(p.typeExpression.type) ? p.typeExpression.type : undefined;
             });
-            var syntheticArgsSymbol = createSymbol(3 /* Variable */, "args", 16384 /* RestParameter */);
+            var syntheticArgsSymbol = createSymbol(3 /* Variable */, "args", 32768 /* RestParameter */);
             syntheticArgsSymbol.type = lastParamVariadicType ? createArrayType(getTypeFromTypeNode(lastParamVariadicType.type)) : anyArrayType;
             if (lastParamVariadicType) {
                 // Replace the last parameter with a rest parameter.
@@ -38686,13 +39081,13 @@ var ts;
                 if (!node)
                     return false;
                 switch (node.kind) {
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return node.escapedText === "arguments" && ts.isExpressionNode(node);
-                    case 154 /* PropertyDeclaration */:
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                        return node.name.kind === 149 /* ComputedPropertyName */
+                    case 155 /* PropertyDeclaration */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                        return node.name.kind === 150 /* ComputedPropertyName */
                             && traverse(node.name);
                     default:
                         return !ts.nodeStartsNewLexicalEnvironment(node) && !ts.isPartOfTypeNode(node) && !!ts.forEachChild(node, traverse);
@@ -38767,7 +39162,7 @@ var ts;
         function createTypePredicateFromTypePredicateNode(node, signature) {
             var parameterName = node.parameterName;
             var type = getTypeFromTypeNode(node.type);
-            if (parameterName.kind === 72 /* Identifier */) {
+            if (parameterName.kind === 73 /* Identifier */) {
                 return createIdentifierTypePredicate(parameterName.escapedText, ts.findIndex(signature.parameters, function (p) { return p.escapedName === parameterName.escapedText; }), type);
             }
             else {
@@ -38808,7 +39203,7 @@ var ts;
             return signature.resolvedReturnType;
         }
         function getReturnTypeFromAnnotation(declaration) {
-            if (declaration.kind === 157 /* Constructor */) {
+            if (declaration.kind === 158 /* Constructor */) {
                 return getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol));
             }
             if (ts.isJSDocConstructSignature(declaration)) {
@@ -38818,12 +39213,12 @@ var ts;
             if (typeNode) {
                 return getTypeFromTypeNode(typeNode);
             }
-            if (declaration.kind === 158 /* GetAccessor */ && !hasNonBindableDynamicName(declaration)) {
+            if (declaration.kind === 159 /* GetAccessor */ && !hasNonBindableDynamicName(declaration)) {
                 var jsDocType = ts.isInJSFile(declaration) && getTypeForDeclarationFromJSDocComment(declaration);
                 if (jsDocType) {
                     return jsDocType;
                 }
-                var setter = ts.getDeclarationOfKind(getSymbolOfNode(declaration), 159 /* SetAccessor */);
+                var setter = ts.getDeclarationOfKind(getSymbolOfNode(declaration), 160 /* SetAccessor */);
                 var setterType = getAnnotatedAccessorType(setter);
                 if (setterType) {
                     return setterType;
@@ -38848,7 +39243,7 @@ var ts;
         function getSignatureInstantiation(signature, typeArguments, isJavascript, inferredTypeParameters) {
             var instantiatedSignature = getSignatureInstantiationWithoutFillingInTypeArguments(signature, fillMissingTypeArguments(typeArguments, signature.typeParameters, getMinTypeArgumentCount(signature.typeParameters), isJavascript));
             if (inferredTypeParameters) {
-                var returnSignature = getSingleCallSignature(getReturnTypeOfSignature(instantiatedSignature));
+                var returnSignature = getSingleCallOrConstructSignature(getReturnTypeOfSignature(instantiatedSignature));
                 if (returnSignature) {
                     var newReturnSignature = cloneSignature(returnSignature);
                     newReturnSignature.typeParameters = inferredTypeParameters;
@@ -38901,7 +39296,7 @@ var ts;
             var typeParameters = signature.typeParameters;
             if (typeParameters) {
                 var typeEraser_1 = createTypeEraser(typeParameters);
-                var baseConstraints = ts.map(typeParameters, function (tp) { return instantiateType(getBaseConstraintOfType(tp), typeEraser_1) || emptyObjectType; });
+                var baseConstraints = ts.map(typeParameters, function (tp) { return instantiateType(getBaseConstraintOfType(tp), typeEraser_1) || unknownType; });
                 return instantiateSignature(signature, createTypeMapper(typeParameters, baseConstraints), /*eraseTypeParameters*/ true);
             }
             return signature;
@@ -38912,7 +39307,8 @@ var ts;
             // object type literal or interface (using the new keyword). Each way of declaring a constructor
             // will result in a different declaration kind.
             if (!signature.isolatedSignatureType) {
-                var isConstructor = signature.declaration.kind === 157 /* Constructor */ || signature.declaration.kind === 161 /* ConstructSignature */; // TODO: GH#18217
+                var kind = signature.declaration ? signature.declaration.kind : 0 /* Unknown */;
+                var isConstructor = kind === 158 /* Constructor */ || kind === 162 /* ConstructSignature */ || kind === 167 /* ConstructorType */;
                 var type = createObjectType(16 /* Anonymous */);
                 type.members = emptySymbols;
                 type.properties = ts.emptyArray;
@@ -38926,7 +39322,7 @@ var ts;
             return symbol.members.get("__index" /* Index */);
         }
         function getIndexDeclarationOfSymbol(symbol, kind) {
-            var syntaxKind = kind === 1 /* Number */ ? 135 /* NumberKeyword */ : 138 /* StringKeyword */;
+            var syntaxKind = kind === 1 /* Number */ ? 136 /* NumberKeyword */ : 139 /* StringKeyword */;
             var indexSymbol = getIndexSymbol(symbol);
             if (indexSymbol) {
                 for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
@@ -38953,7 +39349,7 @@ var ts;
             return undefined;
         }
         function getConstraintDeclaration(type) {
-            var decl = type.symbol && ts.getDeclarationOfKind(type.symbol, 150 /* TypeParameter */);
+            var decl = type.symbol && ts.getDeclarationOfKind(type.symbol, 151 /* TypeParameter */);
             return decl && ts.getEffectiveConstraintOfTypeParameter(decl);
         }
         function getInferredTypeParameterConstraint(typeParameter) {
@@ -38961,13 +39357,13 @@ var ts;
             if (typeParameter.symbol) {
                 for (var _i = 0, _a = typeParameter.symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
-                    if (declaration.parent.kind === 176 /* InferType */) {
+                    if (declaration.parent.kind === 177 /* InferType */) {
                         // When an 'infer T' declaration is immediately contained in a type reference node
                         // (such as 'Foo<infer T>'), T's constraint is inferred from the constraint of the
                         // corresponding type parameter in 'Foo'. When multiple 'infer T' declarations are
                         // present, we form an intersection of the inferred constraint types.
                         var grandParent = declaration.parent.parent;
-                        if (grandParent.kind === 164 /* TypeReference */) {
+                        if (grandParent.kind === 165 /* TypeReference */) {
                             var typeReference = grandParent;
                             var typeParameters = getTypeParametersForTypeReference(typeReference);
                             if (typeParameters) {
@@ -38992,7 +39388,7 @@ var ts;
                         }
                         // When an 'infer T' declaration is immediately contained in a rest parameter
                         // declaration, we infer an 'unknown[]' constraint.
-                        else if (grandParent.kind === 151 /* Parameter */ && grandParent.dotDotDotToken) {
+                        else if (grandParent.kind === 152 /* Parameter */ && grandParent.dotDotDotToken) {
                             inferences = ts.append(inferences, createArrayType(unknownType));
                         }
                     }
@@ -39016,7 +39412,7 @@ var ts;
             return typeParameter.constraint === noConstraintType ? undefined : typeParameter.constraint;
         }
         function getParentSymbolOfTypeParameter(typeParameter) {
-            var tp = ts.getDeclarationOfKind(typeParameter.symbol, 150 /* TypeParameter */);
+            var tp = ts.getDeclarationOfKind(typeParameter.symbol, 151 /* TypeParameter */);
             var host = ts.isJSDocTemplateTag(tp.parent) ? ts.getHostSignatureFromJSDoc(tp.parent) : tp.parent;
             return host && getSymbolOfNode(host);
         }
@@ -39149,9 +39545,9 @@ var ts;
         }
         function getTypeReferenceName(node) {
             switch (node.kind) {
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return node.typeName;
-                case 211 /* ExpressionWithTypeArguments */:
+                case 212 /* ExpressionWithTypeArguments */:
                     // We only support expressions that are simple qualified names. For other
                     // expressions this produces undefined.
                     var expr = node.expression;
@@ -39250,16 +39646,22 @@ var ts;
             }
         }
         function getSubstitutionType(typeVariable, substitute) {
-            if (substitute.flags & 3 /* AnyOrUnknown */) {
+            if (substitute.flags & 3 /* AnyOrUnknown */ || substitute === typeVariable) {
                 return typeVariable;
             }
+            var id = getTypeId(typeVariable) + ">" + getTypeId(substitute);
+            var cached = substitutionTypes.get(id);
+            if (cached) {
+                return cached;
+            }
             var result = createType(33554432 /* Substitution */);
             result.typeVariable = typeVariable;
             result.substitute = substitute;
+            substitutionTypes.set(id, result);
             return result;
         }
         function isUnaryTupleTypeNode(node) {
-            return node.kind === 170 /* TupleType */ && node.elementTypes.length === 1;
+            return node.kind === 171 /* TupleType */ && node.elementTypes.length === 1;
         }
         function getImpliedConstraint(typeVariable, checkNode, extendsNode) {
             return isUnaryTupleTypeNode(checkNode) && isUnaryTupleTypeNode(extendsNode) ? getImpliedConstraint(typeVariable, checkNode.elementTypes[0], extendsNode.elementTypes[0]) :
@@ -39268,9 +39670,9 @@ var ts;
         }
         function getConstrainedTypeVariable(typeVariable, node) {
             var constraints;
-            while (node && !ts.isStatement(node) && node.kind !== 296 /* JSDocComment */) {
+            while (node && !ts.isStatement(node) && node.kind !== 297 /* JSDocComment */) {
                 var parent = node.parent;
-                if (parent.kind === 175 /* ConditionalType */ && node === parent.trueType) {
+                if (parent.kind === 176 /* ConditionalType */ && node === parent.trueType) {
                     var constraint = getImpliedConstraint(typeVariable, parent.checkType, parent.extendsType);
                     if (constraint) {
                         constraints = ts.append(constraints, constraint);
@@ -39281,7 +39683,7 @@ var ts;
             return constraints ? getSubstitutionType(typeVariable, getIntersectionType(ts.append(constraints, typeVariable))) : typeVariable;
         }
         function isJSDocTypeReference(node) {
-            return !!(node.flags & 2097152 /* JSDoc */) && (node.kind === 164 /* TypeReference */ || node.kind === 183 /* ImportType */);
+            return !!(node.flags & 2097152 /* JSDoc */) && (node.kind === 165 /* TypeReference */ || node.kind === 184 /* ImportType */);
         }
         function checkNoTypeArguments(node, symbol) {
             if (node.typeArguments) {
@@ -39382,9 +39784,9 @@ var ts;
                 for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
                     var declaration = declarations_3[_i];
                     switch (declaration.kind) {
-                        case 240 /* ClassDeclaration */:
-                        case 241 /* InterfaceDeclaration */:
-                        case 243 /* EnumDeclaration */:
+                        case 241 /* ClassDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             return declaration;
                     }
                 }
@@ -39470,11 +39872,8 @@ var ts;
         function getGlobalExtractSymbol() {
             return deferredGlobalExtractSymbol || (deferredGlobalExtractSymbol = getGlobalSymbol("Extract", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
         }
-        function getGlobalExcludeSymbol() {
-            return deferredGlobalExcludeSymbol || (deferredGlobalExcludeSymbol = getGlobalSymbol("Exclude", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
-        }
-        function getGlobalPickSymbol() {
-            return deferredGlobalPickSymbol || (deferredGlobalPickSymbol = getGlobalSymbol("Pick", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
+        function getGlobalOmitSymbol() {
+            return deferredGlobalOmitSymbol || (deferredGlobalOmitSymbol = getGlobalSymbol("Omit", 524288 /* TypeAlias */, ts.Diagnostics.Cannot_find_global_type_0)); // TODO: GH#18217
         }
         function getGlobalBigIntType(reportErrors) {
             return deferredGlobalBigIntType || (deferredGlobalBigIntType = getGlobalType("BigInt", /*arity*/ 0, reportErrors)) || emptyObjectType;
@@ -39511,7 +39910,7 @@ var ts;
             return links.resolvedType;
         }
         function isReadonlyTypeOperator(node) {
-            return ts.isTypeOperatorNode(node) && node.operator === 133 /* ReadonlyKeyword */;
+            return ts.isTypeOperatorNode(node) && node.operator === 134 /* ReadonlyKeyword */;
         }
         // We represent tuple types as type references to synthesized generic interface types created by
         // this function. The types are of the form:
@@ -39586,8 +39985,8 @@ var ts;
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
                 var lastElement = ts.lastOrUndefined(node.elementTypes);
-                var restElement_1 = lastElement && lastElement.kind === 172 /* RestType */ ? lastElement : undefined;
-                var minLength = ts.findLastIndex(node.elementTypes, function (n) { return n.kind !== 171 /* OptionalType */ && n !== restElement_1; }) + 1;
+                var restElement_1 = lastElement && lastElement.kind === 173 /* RestType */ ? lastElement : undefined;
+                var minLength = ts.findLastIndex(node.elementTypes, function (n) { return n.kind !== 172 /* OptionalType */ && n !== restElement_1; }) + 1;
                 var elementTypes = ts.map(node.elementTypes, function (n) {
                     var type = getTypeFromTypeNode(n);
                     return n === restElement_1 && getIndexTypeOfType(type, 1 /* Number */) || type;
@@ -39974,6 +40373,14 @@ var ts;
             types[index] = getUnionTypeFromSortedList(result, 65536 /* PrimitiveUnion */);
             return true;
         }
+        function createIntersectionType(types, aliasSymbol, aliasTypeArguments) {
+            var result = createType(2097152 /* Intersection */);
+            result.objectFlags = getPropagatingFlagsOfTypes(types, /*excludeKinds*/ 98304 /* Nullable */);
+            result.types = types;
+            result.aliasSymbol = aliasSymbol; // See comment in `getUnionTypeFromSortedList`.
+            result.aliasTypeArguments = aliasTypeArguments;
+            return result;
+        }
         // We normalize combinations of intersection and union types based on the distributive property of the '&'
         // operator. Specifically, because X & (A | B) is equivalent to X & A | X & B, we can transform intersection
         // types with union type constituents into equivalent union types with intersection type constituents and
@@ -40011,30 +40418,36 @@ var ts;
             if (typeSet.length === 1) {
                 return typeSet[0];
             }
-            if (includes & 1048576 /* Union */) {
-                if (intersectUnionsOfPrimitiveTypes(typeSet)) {
-                    // When the intersection creates a reduced set (which might mean that *all* union types have
-                    // disappeared), we restart the operation to get a new set of combined flags. Once we have
-                    // reduced we'll never reduce again, so this occurs at most once.
-                    return getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
-                }
-                // We are attempting to construct a type of the form X & (A | B) & Y. Transform this into a type of
-                // the form X & A & Y | X & B & Y and recursively reduce until no union type constituents remain.
-                var unionIndex_1 = ts.findIndex(typeSet, function (t) { return (t.flags & 1048576 /* Union */) !== 0; });
-                var unionType = typeSet[unionIndex_1];
-                return getUnionType(ts.map(unionType.types, function (t) { return getIntersectionType(ts.replaceElement(typeSet, unionIndex_1, t)); }), 1 /* Literal */, aliasSymbol, aliasTypeArguments);
-            }
             var id = getTypeListId(typeSet);
-            var type = intersectionTypes.get(id);
-            if (!type) {
-                type = createType(2097152 /* Intersection */);
-                intersectionTypes.set(id, type);
-                type.objectFlags = getPropagatingFlagsOfTypes(typeSet, /*excludeKinds*/ 98304 /* Nullable */);
-                type.types = typeSet;
-                type.aliasSymbol = aliasSymbol; // See comment in `getUnionTypeFromSortedList`.
-                type.aliasTypeArguments = aliasTypeArguments;
+            var result = intersectionTypes.get(id);
+            if (!result) {
+                if (includes & 1048576 /* Union */) {
+                    if (intersectUnionsOfPrimitiveTypes(typeSet)) {
+                        // When the intersection creates a reduced set (which might mean that *all* union types have
+                        // disappeared), we restart the operation to get a new set of combined flags. Once we have
+                        // reduced we'll never reduce again, so this occurs at most once.
+                        result = getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
+                    }
+                    else {
+                        // We are attempting to construct a type of the form X & (A | B) & Y. Transform this into a type of
+                        // the form X & A & Y | X & B & Y and recursively reduce until no union type constituents remain.
+                        // If the estimated size of the resulting union type exceeds 100000 constituents, report an error.
+                        var size = ts.reduceLeft(typeSet, function (n, t) { return n * (t.flags & 1048576 /* Union */ ? t.types.length : 1); }, 1);
+                        if (size >= 100000) {
+                            error(currentNode, ts.Diagnostics.Expression_produces_a_union_type_that_is_too_complex_to_represent);
+                            return errorType;
+                        }
+                        var unionIndex_1 = ts.findIndex(typeSet, function (t) { return (t.flags & 1048576 /* Union */) !== 0; });
+                        var unionType = typeSet[unionIndex_1];
+                        result = getUnionType(ts.map(unionType.types, function (t) { return getIntersectionType(ts.replaceElement(typeSet, unionIndex_1, t)); }), 1 /* Literal */, aliasSymbol, aliasTypeArguments);
+                    }
+                }
+                else {
+                    result = createIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
+                }
+                intersectionTypes.set(id, result);
             }
-            return type;
+            return result;
         }
         function getTypeFromIntersectionTypeNode(node) {
             var links = getNodeLinks(node);
@@ -40090,18 +40503,19 @@ var ts;
             var numberIndexInfo = getIndexInfoOfType(type, 1 /* Number */);
             return numberIndexInfo !== enumNumberIndexInfo ? numberIndexInfo : undefined;
         }
-        function getIndexType(type, stringsOnly) {
+        function getIndexType(type, stringsOnly, noIndexSignatures) {
             if (stringsOnly === void 0) { stringsOnly = keyofStringsOnly; }
-            return type.flags & 1048576 /* Union */ ? getIntersectionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly); })) :
-                type.flags & 2097152 /* Intersection */ ? getUnionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly); })) :
+            return type.flags & 1048576 /* Union */ ? getIntersectionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly, noIndexSignatures); })) :
+                type.flags & 2097152 /* Intersection */ ? getUnionType(ts.map(type.types, function (t) { return getIndexType(t, stringsOnly, noIndexSignatures); })) :
                     maybeTypeOfKind(type, 58982400 /* InstantiableNonPrimitive */) ? getIndexTypeForGenericType(type, stringsOnly) :
-                        ts.getObjectFlags(type) & 32 /* Mapped */ ? getConstraintTypeFromMappedType(type) :
+                        ts.getObjectFlags(type) & 32 /* Mapped */ ? filterType(getConstraintTypeFromMappedType(type), function (t) { return !(noIndexSignatures && t.flags & (1 /* Any */ | 4 /* String */)); }) :
                             type === wildcardType ? wildcardType :
-                                type.flags & 1 /* Any */ ? keyofConstraintType :
-                                    stringsOnly ? getIndexInfoOfType(type, 0 /* String */) ? stringType : getLiteralTypeFromProperties(type, 128 /* StringLiteral */) :
-                                        getIndexInfoOfType(type, 0 /* String */) ? getUnionType([stringType, numberType, getLiteralTypeFromProperties(type, 8192 /* UniqueESSymbol */)]) :
-                                            getNonEnumNumberIndexInfo(type) ? getUnionType([numberType, getLiteralTypeFromProperties(type, 128 /* StringLiteral */ | 8192 /* UniqueESSymbol */)]) :
-                                                getLiteralTypeFromProperties(type, 8576 /* StringOrNumberLiteralOrUnique */);
+                                type.flags & 2 /* Unknown */ ? neverType :
+                                    type.flags & (1 /* Any */ | 131072 /* Never */) ? keyofConstraintType :
+                                        stringsOnly ? !noIndexSignatures && getIndexInfoOfType(type, 0 /* String */) ? stringType : getLiteralTypeFromProperties(type, 128 /* StringLiteral */) :
+                                            !noIndexSignatures && getIndexInfoOfType(type, 0 /* String */) ? getUnionType([stringType, numberType, getLiteralTypeFromProperties(type, 8192 /* UniqueESSymbol */)]) :
+                                                getNonEnumNumberIndexInfo(type) ? getUnionType([numberType, getLiteralTypeFromProperties(type, 128 /* StringLiteral */ | 8192 /* UniqueESSymbol */)]) :
+                                                    getLiteralTypeFromProperties(type, 8576 /* StringOrNumberLiteralOrUnique */);
         }
         function getExtractStringType(type) {
             if (keyofStringsOnly) {
@@ -40118,15 +40532,15 @@ var ts;
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
                 switch (node.operator) {
-                    case 129 /* KeyOfKeyword */:
+                    case 130 /* KeyOfKeyword */:
                         links.resolvedType = getIndexType(getTypeFromTypeNode(node.type));
                         break;
-                    case 142 /* UniqueKeyword */:
-                        links.resolvedType = node.type.kind === 139 /* SymbolKeyword */
+                    case 143 /* UniqueKeyword */:
+                        links.resolvedType = node.type.kind === 140 /* SymbolKeyword */
                             ? getESSymbolLikeTypeForNode(ts.walkUpParenthesizedTypes(node.parent))
                             : errorType;
                         break;
-                    case 133 /* ReadonlyKeyword */:
+                    case 134 /* ReadonlyKeyword */:
                         links.resolvedType = getTypeFromTypeNode(node.type);
                         break;
                 }
@@ -40166,8 +40580,8 @@ var ts;
             }
             return false;
         }
-        function getPropertyTypeForIndexType(objectType, indexType, accessNode, cacheSymbol, missingType) {
-            var accessExpression = accessNode && accessNode.kind === 190 /* ElementAccessExpression */ ? accessNode : undefined;
+        function getPropertyTypeForIndexType(originalObjectType, objectType, indexType, fullIndexType, suppressNoImplicitAnyError, accessNode, accessFlags) {
+            var accessExpression = accessNode && accessNode.kind === 191 /* ElementAccessExpression */ ? accessNode : undefined;
             var propName = isTypeUsableAsPropertyName(indexType) ?
                 getPropertyNameFromType(indexType) :
                 accessExpression && checkThatExpressionIsProperSymbolReference(accessExpression.argumentExpression, indexType, /*reportError*/ false) ?
@@ -40180,12 +40594,12 @@ var ts;
                 var prop = getPropertyOfType(objectType, propName);
                 if (prop) {
                     if (accessExpression) {
-                        markPropertyAsReferenced(prop, accessExpression, /*isThisAccess*/ accessExpression.expression.kind === 100 /* ThisKeyword */);
+                        markPropertyAsReferenced(prop, accessExpression, /*isThisAccess*/ accessExpression.expression.kind === 101 /* ThisKeyword */);
                         if (ts.isAssignmentTarget(accessExpression) && (isReferenceToReadonlyEntity(accessExpression, prop) || isReferenceThroughNamespaceImport(accessExpression))) {
                             error(accessExpression.argumentExpression, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_read_only_property, symbolToString(prop));
-                            return missingType;
+                            return undefined;
                         }
-                        if (cacheSymbol) {
+                        if (accessFlags & 4 /* CacheSymbol */) {
                             getNodeLinks(accessNode).resolvedSymbol = prop;
                         }
                     }
@@ -40204,6 +40618,7 @@ var ts;
                             error(indexNode, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(propName), typeToString(objectType));
                         }
                     }
+                    errorIfWritingToReadonlyIndex(getIndexInfoOfType(objectType, 1 /* Number */));
                     return mapType(objectType, function (t) { return getRestTypeOfTupleType(t) || undefinedType; });
                 }
             }
@@ -40211,17 +40626,21 @@ var ts;
                 if (objectType.flags & (1 /* Any */ | 131072 /* Never */)) {
                     return objectType;
                 }
-                var indexInfo = isTypeAssignableToKind(indexType, 296 /* NumberLike */) && getIndexInfoOfType(objectType, 1 /* Number */) ||
-                    getIndexInfoOfType(objectType, 0 /* String */) ||
-                    undefined;
+                var stringIndexInfo = getIndexInfoOfType(objectType, 0 /* String */);
+                var indexInfo = isTypeAssignableToKind(indexType, 296 /* NumberLike */) && getIndexInfoOfType(objectType, 1 /* Number */) || stringIndexInfo;
                 if (indexInfo) {
+                    if (accessFlags & 1 /* NoIndexSignatures */ && indexInfo === stringIndexInfo) {
+                        if (accessExpression) {
+                            error(accessExpression, ts.Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(originalObjectType));
+                        }
+                        return undefined;
+                    }
                     if (accessNode && !isTypeAssignableToKind(indexType, 4 /* String */ | 8 /* Number */)) {
                         var indexNode = getIndexNodeForAccessExpression(accessNode);
                         error(indexNode, ts.Diagnostics.Type_0_cannot_be_used_as_an_index_type, typeToString(indexType));
+                        return indexInfo.type;
                     }
-                    else if (accessExpression && indexInfo.isReadonly && (ts.isAssignmentTarget(accessExpression) || ts.isDeleteTarget(accessExpression))) {
-                        error(accessExpression, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
-                    }
+                    errorIfWritingToReadonlyIndex(indexInfo);
                     return indexInfo.type;
                 }
                 if (indexType.flags & 131072 /* Never */) {
@@ -40234,7 +40653,7 @@ var ts;
                     if (objectType.symbol === globalThisSymbol && propName !== undefined && globalThisSymbol.exports.has(propName) && (globalThisSymbol.exports.get(propName).flags & 418 /* BlockScoped */)) {
                         error(accessExpression, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.unescapeLeadingUnderscores(propName), typeToString(objectType));
                     }
-                    else if (noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors) {
+                    else if (noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors && !suppressNoImplicitAnyError) {
                         if (propName !== undefined && typeHasStaticProperty(propName, objectType)) {
                             error(accessExpression, ts.Diagnostics.Property_0_is_a_static_member_of_type_1, propName, typeToString(objectType));
                         }
@@ -40249,11 +40668,35 @@ var ts;
                                 }
                             }
                             else {
-                                error(accessExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature, typeToString(objectType));
+                                var suggestion_1 = getSuggestionForNonexistentIndexSignature(objectType, accessExpression);
+                                if (suggestion_1 !== undefined) {
+                                    error(accessExpression, ts.Diagnostics.Element_implicitly_has_an_any_type_because_type_0_has_no_index_signature_Did_you_mean_to_call_1, typeToString(objectType), suggestion_1);
+                                }
+                                else {
+                                    var errorInfo = void 0;
+                                    if (indexType.flags & 1024 /* EnumLiteral */) {
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, "[" + typeToString(indexType) + "]", typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & 8192 /* UniqueESSymbol */) {
+                                        var symbolName_2 = getFullyQualifiedName(indexType.symbol, accessExpression);
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, "[" + symbolName_2 + "]", typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & 128 /* StringLiteral */) {
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, indexType.value, typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & 256 /* NumberLiteral */) {
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.Property_0_does_not_exist_on_type_1, indexType.value, typeToString(objectType));
+                                    }
+                                    else if (indexType.flags & (8 /* Number */ | 4 /* String */)) {
+                                        errorInfo = ts.chainDiagnosticMessages(/* details */ undefined, ts.Diagnostics.No_index_signature_with_a_parameter_of_type_0_was_found_on_type_1, typeToString(indexType), typeToString(objectType));
+                                    }
+                                    errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Element_implicitly_has_an_any_type_because_expression_of_type_0_can_t_be_used_to_index_type_1, typeToString(fullIndexType), typeToString(objectType));
+                                    diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(accessExpression, errorInfo));
+                                }
                             }
                         }
                     }
-                    return missingType;
+                    return undefined;
                 }
             }
             if (isJSLiteralType(objectType)) {
@@ -40274,14 +40717,19 @@ var ts;
             if (isTypeAny(indexType)) {
                 return indexType;
             }
-            return missingType;
+            return undefined;
+            function errorIfWritingToReadonlyIndex(indexInfo) {
+                if (indexInfo && indexInfo.isReadonly && accessExpression && (ts.isAssignmentTarget(accessExpression) || ts.isDeleteTarget(accessExpression))) {
+                    error(accessExpression, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
+                }
+            }
         }
         function getIndexNodeForAccessExpression(accessNode) {
-            return accessNode.kind === 190 /* ElementAccessExpression */
+            return accessNode.kind === 191 /* ElementAccessExpression */
                 ? accessNode.argumentExpression
-                : accessNode.kind === 180 /* IndexedAccessType */
+                : accessNode.kind === 181 /* IndexedAccessType */
                     ? accessNode.indexType
-                    : accessNode.kind === 149 /* ComputedPropertyName */
+                    : accessNode.kind === 150 /* ComputedPropertyName */
                         ? accessNode.expression
                         : accessNode;
         }
@@ -40291,67 +40739,124 @@ var ts;
         function isGenericIndexType(type) {
             return maybeTypeOfKind(type, 58982400 /* InstantiableNonPrimitive */ | 4194304 /* Index */);
         }
-        function getSimplifiedType(type) {
-            return type.flags & 8388608 /* IndexedAccess */ ? getSimplifiedIndexedAccessType(type) : type;
+        function isThisTypeParameter(type) {
+            return !!(type.flags & 262144 /* TypeParameter */ && type.isThisType);
         }
-        function distributeIndexOverObjectType(objectType, indexType) {
-            // (T | U)[K] -> T[K] | U[K]
-            if (objectType.flags & 1048576 /* Union */) {
-                return mapType(objectType, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType)); });
-            }
+        function getSimplifiedType(type, writing) {
+            return type.flags & 8388608 /* IndexedAccess */ ? getSimplifiedIndexedAccessType(type, writing) :
+                type.flags & 16777216 /* Conditional */ ? getSimplifiedConditionalType(type, writing) :
+                    type;
+        }
+        function distributeIndexOverObjectType(objectType, indexType, writing) {
+            // (T | U)[K] -> T[K] | U[K] (reading)
+            // (T | U)[K] -> T[K] & U[K] (writing)
             // (T & U)[K] -> T[K] & U[K]
-            if (objectType.flags & 2097152 /* Intersection */) {
-                return getIntersectionType(ts.map(objectType.types, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType)); }));
+            if (objectType.flags & 3145728 /* UnionOrIntersection */) {
+                var types = ts.map(objectType.types, function (t) { return getSimplifiedType(getIndexedAccessType(t, indexType), writing); });
+                return objectType.flags & 2097152 /* Intersection */ || writing ? getIntersectionType(types) : getUnionType(types);
             }
         }
-        // Transform an indexed access to a simpler form, if possible. Return the simpler form, or return
-        // the type itself if no transformation is possible.
-        function getSimplifiedIndexedAccessType(type) {
-            if (type.simplified) {
-                return type.simplified === circularConstraintType ? type : type.simplified;
+        function distributeObjectOverIndexType(objectType, indexType, writing) {
+            // T[A | B] -> T[A] | T[B] (reading)
+            // T[A | B] -> T[A] & T[B] (writing)
+            if (indexType.flags & 1048576 /* Union */) {
+                var types = ts.map(indexType.types, function (t) { return getSimplifiedType(getIndexedAccessType(objectType, t), writing); });
+                return writing ? getIntersectionType(types) : getUnionType(types);
             }
-            type.simplified = circularConstraintType;
+        }
+        // Transform an indexed access to a simpler form, if possible. Return the simpler form, or return
+        // the type itself if no transformation is possible. The writing flag indicates that the type is
+        // the target of an assignment.
+        function getSimplifiedIndexedAccessType(type, writing) {
+            var cache = writing ? "simplifiedForWriting" : "simplifiedForReading";
+            if (type[cache]) {
+                return type[cache] === circularConstraintType ? type : type[cache];
+            }
+            type[cache] = circularConstraintType;
             // We recursively simplify the object type as it may in turn be an indexed access type. For example, with
             // '{ [P in T]: { [Q in U]: number } }[T][U]' we want to first simplify the inner indexed access type.
-            var objectType = getSimplifiedType(type.objectType);
-            var indexType = getSimplifiedType(type.indexType);
-            // T[A | B] -> T[A] | T[B]
-            if (indexType.flags & 1048576 /* Union */) {
-                return type.simplified = mapType(indexType, function (t) { return getSimplifiedType(getIndexedAccessType(objectType, t)); });
+            var objectType = getSimplifiedType(type.objectType, writing);
+            var indexType = getSimplifiedType(type.indexType, writing);
+            // T[A | B] -> T[A] | T[B] (reading)
+            // T[A | B] -> T[A] & T[B] (writing)
+            var distributedOverIndex = distributeObjectOverIndexType(objectType, indexType, writing);
+            if (distributedOverIndex) {
+                return type[cache] = distributedOverIndex;
             }
             // Only do the inner distributions if the index can no longer be instantiated to cause index distribution again
             if (!(indexType.flags & 63176704 /* Instantiable */)) {
-                var simplified = distributeIndexOverObjectType(objectType, indexType);
-                if (simplified) {
-                    return type.simplified = simplified;
+                // (T | U)[K] -> T[K] | U[K] (reading)
+                // (T | U)[K] -> T[K] & U[K] (writing)
+                // (T & U)[K] -> T[K] & U[K]
+                var distributedOverObject = distributeIndexOverObjectType(objectType, indexType, writing);
+                if (distributedOverObject) {
+                    return type[cache] = distributedOverObject;
                 }
             }
-            // So ultimately:
+            // So ultimately (reading):
             // ((A & B) | C)[K1 | K2] -> ((A & B) | C)[K1] | ((A & B) | C)[K2] -> (A & B)[K1] | C[K1] | (A & B)[K2] | C[K2] -> (A[K1] & B[K1]) | C[K1] | (A[K2] & B[K2]) | C[K2]
             // If the object type is a mapped type { [P in K]: E }, where K is generic, instantiate E using a mapper
             // that substitutes the index type for P. For example, for an index access { [P in K]: Box<T[P]> }[X], we
             // construct the type Box<T[X]>.
             if (isGenericMappedType(objectType)) {
-                return type.simplified = mapType(substituteIndexedMappedType(objectType, type.indexType), getSimplifiedType);
+                return type[cache] = mapType(substituteIndexedMappedType(objectType, type.indexType), function (t) { return getSimplifiedType(t, writing); });
             }
-            return type.simplified = type;
+            return type[cache] = type;
+        }
+        function getSimplifiedConditionalType(type, writing) {
+            var checkType = type.checkType;
+            var extendsType = type.extendsType;
+            var trueType = getTrueTypeFromConditionalType(type);
+            var falseType = getFalseTypeFromConditionalType(type);
+            // Simplifications for types of the form `T extends U ? T : never` and `T extends U ? never : T`.
+            if (falseType.flags & 131072 /* Never */ && getActualTypeVariable(trueType) === getActualTypeVariable(checkType)) {
+                if (checkType.flags & 1 /* Any */ || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
+                    return getSimplifiedType(trueType, writing);
+                }
+                else if (isIntersectionEmpty(checkType, extendsType)) { // Always false
+                    return neverType;
+                }
+            }
+            else if (trueType.flags & 131072 /* Never */ && getActualTypeVariable(falseType) === getActualTypeVariable(checkType)) {
+                if (!(checkType.flags & 1 /* Any */) && isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
+                    return neverType;
+                }
+                else if (checkType.flags & 1 /* Any */ || isIntersectionEmpty(checkType, extendsType)) { // Always false
+                    return getSimplifiedType(falseType, writing);
+                }
+            }
+            return type;
+        }
+        /**
+         * Invokes union simplification logic to determine if an intersection is considered empty as a union constituent
+         */
+        function isIntersectionEmpty(type1, type2) {
+            return !!(getUnionType([intersectTypes(type1, type2), neverType]).flags & 131072 /* Never */);
         }
         function substituteIndexedMappedType(objectType, index) {
             var mapper = createTypeMapper([getTypeParameterFromMappedType(objectType)], [index]);
             var templateMapper = combineTypeMappers(objectType.mapper, mapper);
             return instantiateType(getTemplateTypeFromMappedType(objectType), templateMapper);
         }
-        function getIndexedAccessType(objectType, indexType, accessNode, missingType) {
-            if (missingType === void 0) { missingType = accessNode ? errorType : unknownType; }
+        function getIndexedAccessType(objectType, indexType, accessNode) {
+            return getIndexedAccessTypeOrUndefined(objectType, indexType, accessNode, 0 /* None */) || (accessNode ? errorType : unknownType);
+        }
+        function getIndexedAccessTypeOrUndefined(objectType, indexType, accessNode, accessFlags) {
+            if (accessFlags === void 0) { accessFlags = 0 /* None */; }
             if (objectType === wildcardType || indexType === wildcardType) {
                 return wildcardType;
             }
+            // If the object type has a string index signature and no other members we know that the result will
+            // always be the type of that index signature and we can simplify accordingly.
+            if (isStringIndexSignatureOnlyType(objectType) && !(indexType.flags & 98304 /* Nullable */) && isTypeAssignableToKind(indexType, 4 /* String */ | 8 /* Number */)) {
+                indexType = stringType;
+            }
             // If the index type is generic, or if the object type is generic and doesn't originate in an expression,
             // we are performing a higher-order index access where we cannot meaningfully access the properties of the
             // object type. Note that for a generic T and a non-generic K, we eagerly resolve T[K] if it originates in
             // an expression. This is to preserve backwards compatibility. For example, an element access 'this["foo"]'
             // has always been resolved eagerly using the constraint type of 'this' at the given location.
-            if (isGenericIndexType(indexType) || !(accessNode && accessNode.kind !== 180 /* IndexedAccessType */) && isGenericObjectType(objectType)) {
+            if (isGenericIndexType(indexType) || !(accessNode && accessNode.kind !== 181 /* IndexedAccessType */) && isGenericObjectType(objectType)) {
                 if (objectType.flags & 3 /* AnyOrUnknown */) {
                     return objectType;
                 }
@@ -40372,25 +40877,25 @@ var ts;
                 var wasMissingProp = false;
                 for (var _i = 0, _a = indexType.types; _i < _a.length; _i++) {
                     var t = _a[_i];
-                    var propType = getPropertyTypeForIndexType(apparentObjectType, t, accessNode, /*cacheSymbol*/ false, missingType);
-                    if (propType === missingType) {
-                        if (!accessNode) {
-                            // If there's no error node, we can immeditely stop, since error reporting is off
-                            return missingType;
-                        }
-                        else {
-                            // Otherwise we set a flag and return at the end of the loop so we still mark all errors
-                            wasMissingProp = true;
-                        }
+                    var propType = getPropertyTypeForIndexType(objectType, apparentObjectType, t, indexType, wasMissingProp, accessNode, accessFlags);
+                    if (propType) {
+                        propTypes.push(propType);
+                    }
+                    else if (!accessNode) {
+                        // If there's no error node, we can immeditely stop, since error reporting is off
+                        return undefined;
+                    }
+                    else {
+                        // Otherwise we set a flag and return at the end of the loop so we still mark all errors
+                        wasMissingProp = true;
                     }
-                    propTypes.push(propType);
                 }
                 if (wasMissingProp) {
-                    return missingType;
+                    return undefined;
                 }
-                return getUnionType(propTypes);
+                return accessFlags & 2 /* Writing */ ? getIntersectionType(propTypes) : getUnionType(propTypes);
             }
-            return getPropertyTypeForIndexType(apparentObjectType, indexType, accessNode, /*cacheSymbol*/ true, missingType);
+            return getPropertyTypeForIndexType(objectType, apparentObjectType, indexType, indexType, /* supressNoImplicitAnyError */ false, accessNode, accessFlags | 4 /* CacheSymbol */);
         }
         function getTypeFromIndexedAccessTypeNode(node) {
             var links = getNodeLinks(node);
@@ -40420,13 +40925,14 @@ var ts;
             return links.resolvedType;
         }
         function getActualTypeVariable(type) {
-            return type.flags & 33554432 /* Substitution */ ? type.typeVariable : type;
-        }
-        /**
-         * Invokes union simplification logic to determine if an intersection is considered empty as a union constituent
-         */
-        function isIntersectionEmpty(type1, type2) {
-            return !!(getUnionType([intersectTypes(type1, type2), neverType]).flags & 131072 /* Never */);
+            if (type.flags & 33554432 /* Substitution */) {
+                return type.typeVariable;
+            }
+            if (type.flags & 8388608 /* IndexedAccess */ && (type.objectType.flags & 33554432 /* Substitution */ ||
+                type.indexType.flags & 33554432 /* Substitution */)) {
+                return getIndexedAccessType(getActualTypeVariable(type.objectType), getActualTypeVariable(type.indexType));
+            }
+            return type;
         }
         function getConditionalType(root, mapper) {
             var checkType = instantiateType(root.checkType, mapper);
@@ -40434,35 +40940,6 @@ var ts;
             if (checkType === wildcardType || extendsType === wildcardType) {
                 return wildcardType;
             }
-            var trueType = instantiateType(root.trueType, mapper);
-            var falseType = instantiateType(root.falseType, mapper);
-            var instantiationId = "" + (root.isDistributive ? "d" : "") + getTypeId(checkType) + ">" + getTypeId(extendsType) + "?" + getTypeId(trueType) + ":" + getTypeId(falseType);
-            var result = conditionalTypes.get(instantiationId);
-            if (result) {
-                return result;
-            }
-            var newResult = getConditionalTypeWorker(root, mapper, checkType, extendsType, trueType, falseType);
-            conditionalTypes.set(instantiationId, newResult);
-            return newResult;
-        }
-        function getConditionalTypeWorker(root, mapper, checkType, extendsType, trueType, falseType) {
-            // Simplifications for types of the form `T extends U ? T : never` and `T extends U ? never : T`.
-            if (falseType.flags & 131072 /* Never */ && isTypeIdenticalTo(getActualTypeVariable(trueType), getActualTypeVariable(checkType))) {
-                if (checkType.flags & 1 /* Any */ || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
-                    return trueType;
-                }
-                else if (isIntersectionEmpty(checkType, extendsType)) { // Always false
-                    return neverType;
-                }
-            }
-            else if (trueType.flags & 131072 /* Never */ && isTypeIdenticalTo(getActualTypeVariable(falseType), getActualTypeVariable(checkType))) {
-                if (!(checkType.flags & 1 /* Any */) && isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(extendsType))) { // Always true
-                    return neverType;
-                }
-                else if (checkType.flags & 1 /* Any */ || isIntersectionEmpty(checkType, extendsType)) { // Always false
-                    return falseType;
-                }
-            }
             var checkTypeInstantiable = maybeTypeOfKind(checkType, 63176704 /* Instantiable */ | 131072 /* GenericMappedType */);
             var combinedMapper;
             if (root.inferTypeParameters) {
@@ -40471,7 +40948,7 @@ var ts;
                     // We don't want inferences from constraints as they may cause us to eagerly resolve the
                     // conditional type instead of deferring resolution. Also, we always want strict function
                     // types rules (i.e. proper contravariance) for inferences.
-                    inferTypes(context.inferences, checkType, extendsType, 32 /* NoConstraints */ | 64 /* AlwaysStrict */);
+                    inferTypes(context.inferences, checkType, extendsType, 64 /* NoConstraints */ | 128 /* AlwaysStrict */);
                 }
                 combinedMapper = combineTypeMappers(mapper, context.mapper);
             }
@@ -40480,18 +40957,18 @@ var ts;
             // We attempt to resolve the conditional type only when the check and extends types are non-generic
             if (!checkTypeInstantiable && !maybeTypeOfKind(inferredExtendsType, 63176704 /* Instantiable */ | 131072 /* GenericMappedType */)) {
                 if (inferredExtendsType.flags & 3 /* AnyOrUnknown */) {
-                    return trueType;
+                    return instantiateType(root.trueType, combinedMapper || mapper);
                 }
                 // Return union of trueType and falseType for 'any' since it matches anything
                 if (checkType.flags & 1 /* Any */) {
-                    return getUnionType([instantiateType(root.trueType, combinedMapper || mapper), falseType]);
+                    return getUnionType([instantiateType(root.trueType, combinedMapper || mapper), instantiateType(root.falseType, mapper)]);
                 }
                 // Return falseType for a definitely false extends check. We check an instantiations of the two
                 // types with type parameters mapped to the wildcard type, the most permissive instantiations
                 // possible (the wildcard type is assignable to and from all types). If those are not related,
                 // then no instantiations will be and we can just return the false branch type.
                 if (!isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType))) {
-                    return falseType;
+                    return instantiateType(root.falseType, mapper);
                 }
                 // Return trueType for a definitely true extends check. We check instantiations of the two
                 // types with type parameters mapped to their restrictive form, i.e. a form of the type parameter
@@ -40503,9 +40980,6 @@ var ts;
                 }
             }
             // Return a deferred type for a check that is neither definitely true nor definitely false
-            return getDeferredConditionalType(root, mapper, combinedMapper, checkType, extendsType, trueType, falseType);
-        }
-        function getDeferredConditionalType(root, mapper, combinedMapper, checkType, extendsType, trueType, falseType) {
             var erasedCheckType = getActualTypeVariable(checkType);
             var result = createType(16777216 /* Conditional */);
             result.root = root;
@@ -40513,14 +40987,18 @@ var ts;
             result.extendsType = extendsType;
             result.mapper = mapper;
             result.combinedMapper = combinedMapper;
-            result.trueType = trueType;
-            result.falseType = falseType;
             result.aliasSymbol = root.aliasSymbol;
             result.aliasTypeArguments = instantiateTypes(root.aliasTypeArguments, mapper); // TODO: GH#18217
             return result;
         }
+        function getTrueTypeFromConditionalType(type) {
+            return type.resolvedTrueType || (type.resolvedTrueType = instantiateType(type.root.trueType, type.mapper));
+        }
+        function getFalseTypeFromConditionalType(type) {
+            return type.resolvedFalseType || (type.resolvedFalseType = instantiateType(type.root.falseType, type.mapper));
+        }
         function getInferredTrueTypeFromConditionalType(type) {
-            return type.resolvedInferredTrueType || (type.resolvedInferredTrueType = instantiateType(type.root.trueType, type.combinedMapper || type.mapper));
+            return type.resolvedInferredTrueType || (type.resolvedInferredTrueType = type.combinedMapper ? instantiateType(type.root.trueType, type.combinedMapper) : getTrueTypeFromConditionalType(type));
         }
         function getInferTypeParameters(node) {
             var result;
@@ -40533,20 +41011,6 @@ var ts;
             }
             return result;
         }
-        function isPossiblyReferencedInConditionalType(tp, node) {
-            if (isTypeParameterPossiblyReferenced(tp, node)) {
-                return true;
-            }
-            while (node) {
-                if (node.kind === 175 /* ConditionalType */) {
-                    if (isTypeParameterPossiblyReferenced(tp, node.extendsType)) {
-                        return true;
-                    }
-                }
-                node = node.parent;
-            }
-            return false;
-        }
         function getTypeFromConditionalTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
@@ -40554,7 +41018,7 @@ var ts;
                 var aliasSymbol = getAliasSymbolForTypeNode(node);
                 var aliasTypeArguments = getTypeArgumentsForAliasSymbol(aliasSymbol);
                 var allOuterTypeParameters = getOuterTypeParameters(node, /*includeThisTypes*/ true);
-                var outerTypeParameters = aliasTypeArguments ? allOuterTypeParameters : ts.filter(allOuterTypeParameters, function (tp) { return isPossiblyReferencedInConditionalType(tp, node); });
+                var outerTypeParameters = aliasTypeArguments ? allOuterTypeParameters : ts.filter(allOuterTypeParameters, function (tp) { return isTypeParameterPossiblyReferenced(tp, node); });
                 var root = {
                     node: node,
                     checkType: checkType,
@@ -40865,9 +41329,9 @@ var ts;
         function getThisType(node) {
             var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
             var parent = container && container.parent;
-            if (parent && (ts.isClassLike(parent) || parent.kind === 241 /* InterfaceDeclaration */)) {
+            if (parent && (ts.isClassLike(parent) || parent.kind === 242 /* InterfaceDeclaration */)) {
                 if (!ts.hasModifier(container, 32 /* Static */) &&
-                    (container.kind !== 157 /* Constructor */ || ts.isNodeDescendantOf(node, container.body))) {
+                    (container.kind !== 158 /* Constructor */ || ts.isNodeDescendantOf(node, container.body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
                 }
             }
@@ -40883,89 +41347,89 @@ var ts;
         }
         function getTypeFromTypeNode(node) {
             switch (node.kind) {
-                case 120 /* AnyKeyword */:
-                case 289 /* JSDocAllType */:
-                case 290 /* JSDocUnknownType */:
+                case 121 /* AnyKeyword */:
+                case 290 /* JSDocAllType */:
+                case 291 /* JSDocUnknownType */:
                     return anyType;
-                case 143 /* UnknownKeyword */:
+                case 144 /* UnknownKeyword */:
                     return unknownType;
-                case 138 /* StringKeyword */:
+                case 139 /* StringKeyword */:
                     return stringType;
-                case 135 /* NumberKeyword */:
+                case 136 /* NumberKeyword */:
                     return numberType;
-                case 146 /* BigIntKeyword */:
+                case 147 /* BigIntKeyword */:
                     return bigintType;
-                case 123 /* BooleanKeyword */:
+                case 124 /* BooleanKeyword */:
                     return booleanType;
-                case 139 /* SymbolKeyword */:
+                case 140 /* SymbolKeyword */:
                     return esSymbolType;
-                case 106 /* VoidKeyword */:
+                case 107 /* VoidKeyword */:
                     return voidType;
-                case 141 /* UndefinedKeyword */:
+                case 142 /* UndefinedKeyword */:
                     return undefinedType;
-                case 96 /* NullKeyword */:
+                case 97 /* NullKeyword */:
                     return nullType;
-                case 132 /* NeverKeyword */:
+                case 133 /* NeverKeyword */:
                     return neverType;
-                case 136 /* ObjectKeyword */:
+                case 137 /* ObjectKeyword */:
                     return node.flags & 65536 /* JavaScriptFile */ ? anyType : nonPrimitiveType;
-                case 178 /* ThisType */:
-                case 100 /* ThisKeyword */:
+                case 179 /* ThisType */:
+                case 101 /* ThisKeyword */:
                     return getTypeFromThisTypeNode(node);
-                case 182 /* LiteralType */:
+                case 183 /* LiteralType */:
                     return getTypeFromLiteralTypeNode(node);
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return getTypeFromTypeReference(node);
-                case 163 /* TypePredicate */:
+                case 164 /* TypePredicate */:
                     return booleanType;
-                case 211 /* ExpressionWithTypeArguments */:
+                case 212 /* ExpressionWithTypeArguments */:
                     return getTypeFromTypeReference(node);
-                case 167 /* TypeQuery */:
+                case 168 /* TypeQuery */:
                     return getTypeFromTypeQueryNode(node);
-                case 169 /* ArrayType */:
+                case 170 /* ArrayType */:
                     return getTypeFromArrayTypeNode(node);
-                case 170 /* TupleType */:
+                case 171 /* TupleType */:
                     return getTypeFromTupleTypeNode(node);
-                case 171 /* OptionalType */:
+                case 172 /* OptionalType */:
                     return getTypeFromOptionalTypeNode(node);
-                case 173 /* UnionType */:
+                case 174 /* UnionType */:
                     return getTypeFromUnionTypeNode(node);
-                case 174 /* IntersectionType */:
+                case 175 /* IntersectionType */:
                     return getTypeFromIntersectionTypeNode(node);
-                case 291 /* JSDocNullableType */:
+                case 292 /* JSDocNullableType */:
                     return getTypeFromJSDocNullableTypeNode(node);
-                case 293 /* JSDocOptionalType */:
+                case 294 /* JSDocOptionalType */:
                     return addOptionality(getTypeFromTypeNode(node.type));
-                case 177 /* ParenthesizedType */:
-                case 172 /* RestType */:
-                case 292 /* JSDocNonNullableType */:
-                case 288 /* JSDocTypeExpression */:
+                case 178 /* ParenthesizedType */:
+                case 173 /* RestType */:
+                case 293 /* JSDocNonNullableType */:
+                case 289 /* JSDocTypeExpression */:
                     return getTypeFromTypeNode(node.type);
-                case 295 /* JSDocVariadicType */:
+                case 296 /* JSDocVariadicType */:
                     return getTypeFromJSDocVariadicType(node);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */:
-                case 168 /* TypeLiteral */:
-                case 297 /* JSDocTypeLiteral */:
-                case 294 /* JSDocFunctionType */:
-                case 298 /* JSDocSignature */:
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */:
+                case 169 /* TypeLiteral */:
+                case 298 /* JSDocTypeLiteral */:
+                case 295 /* JSDocFunctionType */:
+                case 299 /* JSDocSignature */:
                     return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
-                case 179 /* TypeOperator */:
+                case 180 /* TypeOperator */:
                     return getTypeFromTypeOperatorNode(node);
-                case 180 /* IndexedAccessType */:
+                case 181 /* IndexedAccessType */:
                     return getTypeFromIndexedAccessTypeNode(node);
-                case 181 /* MappedType */:
+                case 182 /* MappedType */:
                     return getTypeFromMappedTypeNode(node);
-                case 175 /* ConditionalType */:
+                case 176 /* ConditionalType */:
                     return getTypeFromConditionalTypeNode(node);
-                case 176 /* InferType */:
+                case 177 /* InferType */:
                     return getTypeFromInferTypeNode(node);
-                case 183 /* ImportType */:
+                case 184 /* ImportType */:
                     return getTypeFromImportTypeNode(node);
                 // This function assumes that an identifier or qualified name is a type expression
                 // Callers should first ensure this by calling isTypeNode
-                case 72 /* Identifier */:
-                case 148 /* QualifiedName */:
+                case 73 /* Identifier */:
+                case 149 /* QualifiedName */:
                     var symbol = getSymbolAtLocation(node);
                     return symbol ? getDeclaredTypeOfSymbol(symbol) : errorType;
                 default:
@@ -41025,7 +41489,7 @@ var ts;
          * This is used during inference when instantiating type parameter defaults.
          */
         function createBackreferenceMapper(context, index) {
-            return function (t) { return ts.findIndex(context.inferences, function (info) { return info.typeParameter === t; }) >= index ? emptyObjectType : t; };
+            return function (t) { return ts.findIndex(context.inferences, function (info) { return info.typeParameter === t; }) >= index ? unknownType : t; };
         }
         function combineTypeMappers(mapper1, mapper2) {
             if (!mapper1)
@@ -41108,7 +41572,7 @@ var ts;
             }
             // Keep the flags from the symbol we're instantiating.  Mark that is instantiated, and
             // also transient so that we can just store data on it directly.
-            var result = createSymbol(symbol.flags, symbol.escapedName, 1 /* Instantiated */ | ts.getCheckFlags(symbol) & (8 /* Readonly */ | 2048 /* Late */ | 8192 /* OptionalParameter */ | 16384 /* RestParameter */));
+            var result = createSymbol(symbol.flags, symbol.escapedName, 1 /* Instantiated */ | ts.getCheckFlags(symbol) & (8 /* Readonly */ | 4096 /* Late */ | 16384 /* OptionalParameter */ | 32768 /* RestParameter */));
             result.declarations = symbol.declarations;
             result.parent = symbol.parent;
             result.target = symbol;
@@ -41174,28 +41638,31 @@ var ts;
             return type;
         }
         function maybeTypeParameterReference(node) {
-            return !(node.kind === 148 /* QualifiedName */ ||
-                node.parent.kind === 164 /* TypeReference */ && node.parent.typeArguments && node === node.parent.typeName);
+            return !(node.kind === 149 /* QualifiedName */ ||
+                node.parent.kind === 165 /* TypeReference */ && node.parent.typeArguments && node === node.parent.typeName);
         }
         function isTypeParameterPossiblyReferenced(tp, node) {
             // If the type parameter doesn't have exactly one declaration, if there are invening statement blocks
             // between the node and the type parameter declaration, if the node contains actual references to the
             // type parameter, or if the node contains type queries, we consider the type parameter possibly referenced.
             if (tp.symbol && tp.symbol.declarations && tp.symbol.declarations.length === 1) {
-                var container_3 = tp.symbol.declarations[0].parent;
-                if (ts.findAncestor(node, function (n) { return n.kind === 218 /* Block */ ? "quit" : n === container_3; })) {
-                    return !!ts.forEachChild(node, containsReference);
+                var container = tp.symbol.declarations[0].parent;
+                for (var n = node; n !== container; n = n.parent) {
+                    if (!n || n.kind === 219 /* Block */ || n.kind === 176 /* ConditionalType */ && ts.forEachChild(n.extendsType, containsReference)) {
+                        return true;
+                    }
                 }
+                return !!ts.forEachChild(node, containsReference);
             }
             return true;
             function containsReference(node) {
                 switch (node.kind) {
-                    case 178 /* ThisType */:
+                    case 179 /* ThisType */:
                         return !!tp.isThisType;
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return !tp.isThisType && ts.isPartOfTypeNode(node) && maybeTypeParameterReference(node) &&
                             getTypeFromTypeNode(node) === tp;
-                    case 167 /* TypeQuery */:
+                    case 168 /* TypeQuery */:
                         return true;
                 }
                 return !!ts.forEachChild(node, containsReference);
@@ -41343,7 +41810,7 @@ var ts;
                     // If the anonymous type originates in a declaration of a function, method, class, or
                     // interface, in an object type literal, or in an object literal expression, we may need
                     // to instantiate the type because it might reference a type parameter.
-                    return type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations ?
+                    return couldContainTypeVariables(type) ?
                         getAnonymousTypeInstantiation(type, mapper) : type;
                 }
                 if (objectFlags & 32 /* Mapped */) {
@@ -41382,7 +41849,7 @@ var ts;
                 }
                 else {
                     var sub = instantiateType(type.substitute, mapper);
-                    if (sub.flags & 3 /* AnyOrUnknown */ || isTypeSubtypeOf(getRestrictiveInstantiation(maybeVariable), getRestrictiveInstantiation(sub))) {
+                    if (sub.flags & 3 /* AnyOrUnknown */ || isTypeAssignableTo(getRestrictiveInstantiation(maybeVariable), getRestrictiveInstantiation(sub))) {
                         return maybeVariable;
                     }
                     return sub;
@@ -41416,34 +41883,34 @@ var ts;
         // Returns true if the given expression contains (at any level of nesting) a function or arrow expression
         // that is subject to contextual typing.
         function isContextSensitive(node) {
-            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             switch (node.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 156 /* MethodDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 157 /* MethodDeclaration */:
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return ts.some(node.properties, isContextSensitive);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return ts.some(node.elements, isContextSensitive);
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     return isContextSensitive(node.whenTrue) ||
                         isContextSensitive(node.whenFalse);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return node.operatorToken.kind === 55 /* BarBarToken */ &&
                         (isContextSensitive(node.left) || isContextSensitive(node.right));
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     return isContextSensitive(node.initializer);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isContextSensitive(node.expression);
-                case 268 /* JsxAttributes */:
+                case 269 /* JsxAttributes */:
                     return ts.some(node.properties, isContextSensitive) || ts.isJsxOpeningElement(node.parent) && ts.some(node.parent.parent.children, isContextSensitive);
-                case 267 /* JsxAttribute */: {
+                case 268 /* JsxAttribute */: {
                     // If there is no initializer, JSX attribute has a boolean value of true which is not context sensitive.
                     var initializer = node.initializer;
                     return !!initializer && isContextSensitive(initializer);
                 }
-                case 270 /* JsxExpression */: {
+                case 271 /* JsxExpression */: {
                     // It is possible to that node.expression is undefined (e.g <div x={} />)
                     var expression = node.expression;
                     return !!expression && isContextSensitive(expression);
@@ -41460,7 +41927,7 @@ var ts;
             if (ts.some(node.parameters, function (p) { return !ts.getEffectiveTypeAnnotationNode(p); })) {
                 return true;
             }
-            if (node.kind !== 197 /* ArrowFunction */) {
+            if (node.kind !== 198 /* ArrowFunction */) {
                 // If the first parameter is not an explicit 'this' parameter, then the function has
                 // an implicit 'this' parameter which is subject to contextual typing.
                 var parameter = ts.firstOrUndefined(node.parameters);
@@ -41472,7 +41939,7 @@ var ts;
         }
         function hasContextSensitiveReturnExpression(node) {
             // TODO(anhans): A block should be context-sensitive if it has a context-sensitive return value.
-            return !!node.body && node.body.kind !== 218 /* Block */ && isContextSensitive(node.body);
+            return !!node.body && node.body.kind !== 219 /* Block */ && isContextSensitive(node.body);
         }
         function isContextSensitiveFunctionOrObjectLiteralMethod(func) {
             return (ts.isInJSFile(func) && ts.isFunctionDeclaration(func) || isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) &&
@@ -41525,7 +41992,7 @@ var ts;
         function isTypeDerivedFrom(source, target) {
             return source.flags & 1048576 /* Union */ ? ts.every(source.types, function (t) { return isTypeDerivedFrom(t, target); }) :
                 target.flags & 1048576 /* Union */ ? ts.some(target.types, function (t) { return isTypeDerivedFrom(source, t); }) :
-                    source.flags & 58982400 /* InstantiableNonPrimitive */ ? isTypeDerivedFrom(getBaseConstraintOfType(source) || emptyObjectType, target) :
+                    source.flags & 58982400 /* InstantiableNonPrimitive */ ? isTypeDerivedFrom(getBaseConstraintOfType(source) || unknownType, target) :
                         target === globalObjectType ? !!(source.flags & (524288 /* Object */ | 67108864 /* NonPrimitive */)) :
                             target === globalFunctionType ? !!(source.flags & 524288 /* Object */) && isFunctionObjectType(source) :
                                 hasBaseType(source, getTargetType(target));
@@ -41574,23 +42041,23 @@ var ts;
                 return true;
             }
             switch (node.kind) {
-                case 270 /* JsxExpression */:
-                case 195 /* ParenthesizedExpression */:
+                case 271 /* JsxExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return elaborateError(node.expression, source, target, relation, headMessage);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     switch (node.operatorToken.kind) {
-                        case 59 /* EqualsToken */:
+                        case 60 /* EqualsToken */:
                         case 27 /* CommaToken */:
                             return elaborateError(node.right, source, target, relation, headMessage);
                     }
                     break;
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return elaborateObjectLiteral(node, source, target, relation);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return elaborateArrayLiteral(node, source, target, relation);
-                case 268 /* JsxAttributes */:
+                case 269 /* JsxAttributes */:
                     return elaborateJsxComponents(node, source, target, relation);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     return elaborateArrowFunction(node, source, target, relation);
             }
             return false;
@@ -41659,11 +42126,11 @@ var ts;
             var reportedError = false;
             for (var status = iterator.next(); !status.done; status = iterator.next()) {
                 var _a = status.value, prop = _a.errorNode, next = _a.innerExpression, nameType = _a.nameType, errorMessage = _a.errorMessage;
-                var targetPropType = getIndexedAccessType(target, nameType, /*accessNode*/ undefined, errorType);
-                if (targetPropType === errorType || targetPropType.flags & 8388608 /* IndexedAccess */)
+                var targetPropType = getIndexedAccessTypeOrUndefined(target, nameType);
+                if (!targetPropType || targetPropType.flags & 8388608 /* IndexedAccess */)
                     continue; // Don't elaborate on indexes on generic variables
-                var sourcePropType = getIndexedAccessType(source, nameType, /*accessNode*/ undefined, errorType);
-                if (sourcePropType !== errorType && targetPropType !== errorType && !checkTypeRelatedTo(sourcePropType, targetPropType, relation, /*errorNode*/ undefined)) {
+                var sourcePropType = getIndexedAccessTypeOrUndefined(source, nameType);
+                if (sourcePropType && !checkTypeRelatedTo(sourcePropType, targetPropType, relation, /*errorNode*/ undefined)) {
                     var elaborated = next && elaborateError(next, sourcePropType, targetPropType, relation, /*headMessage*/ undefined);
                     if (elaborated) {
                         reportedError = true;
@@ -41762,7 +42229,7 @@ var ts;
         }
         function getElaborationElementForJsxChild(child, nameType, getInvalidTextDiagnostic) {
             switch (child.kind) {
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     // child is of the type of the expression
                     return { errorNode: child, innerExpression: child.expression, nameType: nameType };
                 case 11 /* JsxText */:
@@ -41771,15 +42238,18 @@ var ts;
                     }
                     // child is a string
                     return { errorNode: child, innerExpression: undefined, nameType: nameType, errorMessage: getInvalidTextDiagnostic() };
-                case 260 /* JsxElement */:
-                case 261 /* JsxSelfClosingElement */:
-                case 264 /* JsxFragment */:
+                case 261 /* JsxElement */:
+                case 262 /* JsxSelfClosingElement */:
+                case 265 /* JsxFragment */:
                     // child is of type JSX.Element
                     return { errorNode: child, innerExpression: child, nameType: nameType };
                 default:
                     return ts.Debug.assertNever(child, "Found invalid jsx child");
             }
         }
+        function getSemanticJsxChildren(children) {
+            return ts.filter(children, function (i) { return !ts.isJsxText(i) || !i.containsOnlyTriviaWhiteSpaces; });
+        }
         function elaborateJsxComponents(node, source, target, relation) {
             var result = elaborateElementwise(generateJsxAttributes(node), source, target, relation);
             var invalidTextDiagnostic;
@@ -41789,7 +42259,7 @@ var ts;
                 var childrenPropName = childPropName === undefined ? "children" : ts.unescapeLeadingUnderscores(childPropName);
                 var childrenNameType = getLiteralType(childrenPropName);
                 var childrenTargetType = getIndexedAccessType(target, childrenNameType);
-                var validChildren = ts.filter(containingElement.children, function (i) { return !ts.isJsxText(i) || !i.containsOnlyTriviaWhiteSpaces; });
+                var validChildren = getSemanticJsxChildren(containingElement.children);
                 if (!ts.length(validChildren)) {
                     return result;
                 }
@@ -41873,6 +42343,8 @@ var ts;
             });
         }
         function elaborateArrayLiteral(node, source, target, relation) {
+            if (target.flags & 131068 /* Primitive */)
+                return false;
             if (isTupleLikeType(source)) {
                 return elaborateElementwise(generateLimitedTupleElements(node, target), source, target, relation);
             }
@@ -41903,11 +42375,11 @@ var ts;
                         }
                         _b = prop.kind;
                         switch (_b) {
-                            case 159 /* SetAccessor */: return [3 /*break*/, 2];
-                            case 158 /* GetAccessor */: return [3 /*break*/, 2];
-                            case 156 /* MethodDeclaration */: return [3 /*break*/, 2];
-                            case 276 /* ShorthandPropertyAssignment */: return [3 /*break*/, 2];
-                            case 275 /* PropertyAssignment */: return [3 /*break*/, 4];
+                            case 160 /* SetAccessor */: return [3 /*break*/, 2];
+                            case 159 /* GetAccessor */: return [3 /*break*/, 2];
+                            case 157 /* MethodDeclaration */: return [3 /*break*/, 2];
+                            case 277 /* ShorthandPropertyAssignment */: return [3 /*break*/, 2];
+                            case 276 /* PropertyAssignment */: return [3 /*break*/, 4];
                         }
                         return [3 /*break*/, 6];
                     case 2: return [4 /*yield*/, { errorNode: prop.name, innerExpression: undefined, nameType: type }];
@@ -41929,6 +42401,8 @@ var ts;
             });
         }
         function elaborateObjectLiteral(node, source, target, relation) {
+            if (target.flags & 131068 /* Primitive */)
+                return false;
             return elaborateElementwise(generateObjectLiteralElements(node), source, target, relation);
         }
         /**
@@ -41977,8 +42451,8 @@ var ts;
                 return 0 /* False */;
             }
             var kind = target.declaration ? target.declaration.kind : 0 /* Unknown */;
-            var strictVariance = !callbackCheck && strictFunctionTypes && kind !== 156 /* MethodDeclaration */ &&
-                kind !== 155 /* MethodSignature */ && kind !== 157 /* Constructor */;
+            var strictVariance = !callbackCheck && strictFunctionTypes && kind !== 157 /* MethodDeclaration */ &&
+                kind !== 156 /* MethodSignature */ && kind !== 158 /* Constructor */;
             var result = -1 /* True */;
             var sourceThisType = getThisTypeOfSignature(source);
             if (sourceThisType && sourceThisType !== voidType) {
@@ -42026,12 +42500,14 @@ var ts;
                 result &= related;
             }
             if (!ignoreReturnTypes) {
-                var targetReturnType = (target.declaration && isJSConstructor(target.declaration)) ?
+                // If a signature reolution is already in-flight, skip issuing a circularity error
+                // here and just use the `any` type directly
+                var targetReturnType = isResolvingReturnTypeOfSignature(target) ? anyType : (target.declaration && isJSConstructor(target.declaration)) ?
                     getJSClassType(target.declaration.symbol) : getReturnTypeOfSignature(target);
                 if (targetReturnType === voidType) {
                     return result;
                 }
-                var sourceReturnType = (source.declaration && isJSConstructor(source.declaration)) ?
+                var sourceReturnType = isResolvingReturnTypeOfSignature(source) ? anyType : (source.declaration && isJSConstructor(source.declaration)) ?
                     getJSClassType(source.declaration.symbol) : getReturnTypeOfSignature(source);
                 // The following block preserves behavior forbidding boolean returning functions from being assignable to type guard returning functions
                 var targetTypePredicate = getTypePredicateOfSignature(target);
@@ -42110,6 +42586,11 @@ var ts;
         function isEmptyAnonymousObjectType(type) {
             return !!(ts.getObjectFlags(type) & 16 /* Anonymous */) && isEmptyObjectType(type);
         }
+        function isStringIndexSignatureOnlyType(type) {
+            return type.flags & 524288 /* Object */ && !isGenericMappedType(type) && getPropertiesOfType(type).length === 0 && getIndexInfoOfType(type, 0 /* String */) && !getIndexInfoOfType(type, 1 /* Number */) ||
+                type.flags & 3145728 /* UnionOrIntersection */ && ts.every(type.types, isStringIndexSignatureOnlyType) ||
+                false;
+        }
         function isEnumTypeRelatedTo(sourceSymbol, targetSymbol, errorReporter) {
             if (sourceSymbol === targetSymbol) {
                 return true;
@@ -42218,8 +42699,8 @@ var ts;
             }
             return false;
         }
-        function isIgnoredJsxProperty(source, sourceProp, targetMemberType) {
-            return ts.getObjectFlags(source) & 4096 /* JsxAttributes */ && !(isUnhyphenatedJsxName(sourceProp.escapedName) || targetMemberType);
+        function isIgnoredJsxProperty(source, sourceProp) {
+            return ts.getObjectFlags(source) & 4096 /* JsxAttributes */ && !isUnhyphenatedJsxName(sourceProp.escapedName);
         }
         /**
          * Checks if 'source' is related to 'target' (e.g.: is a assignable to).
@@ -42241,7 +42722,7 @@ var ts;
             var depth = 0;
             var expandingFlags = 0 /* None */;
             var overflow = false;
-            var suppressNextError = false;
+            var overrideNextErrorInfo;
             ts.Debug.assert(relation !== identityRelation || !errorNode, "no error reporting in identity checking");
             var result = isRelatedTo(source, target, /*reportErrors*/ !!errorNode, headMessage);
             if (overflow) {
@@ -42249,9 +42730,9 @@ var ts;
             }
             else if (errorInfo) {
                 if (containingMessageChain) {
-                    var chain_1 = containingMessageChain();
-                    if (chain_1) {
-                        errorInfo = ts.concatenateDiagnosticMessageChains(chain_1, errorInfo);
+                    var chain = containingMessageChain();
+                    if (chain) {
+                        errorInfo = ts.concatenateDiagnosticMessageChains(chain, errorInfo);
                     }
                 }
                 var relatedInformation = void 0;
@@ -42291,11 +42772,9 @@ var ts;
                 }
             }
             function reportRelationError(message, source, target) {
-                var sourceType = typeToString(source);
-                var targetType = typeToString(target);
-                if (sourceType === targetType) {
-                    sourceType = typeToString(source, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
-                    targetType = typeToString(target, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
+                var _a = getTypeNamesForErrorDisplay(source, target), sourceType = _a[0], targetType = _a[1];
+                if (target.flags & 262144 /* TypeParameter */ && target.immediateBaseConstraint !== undefined && isTypeAssignableTo(source, target.immediateBaseConstraint)) {
+                    reportError(ts.Diagnostics._0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_constraint_2, sourceType, targetType, typeToString(target.immediateBaseConstraint));
                 }
                 if (!message) {
                     if (relation === comparableRelation) {
@@ -42320,24 +42799,38 @@ var ts;
                     reportError(ts.Diagnostics._0_is_a_primitive_but_1_is_a_wrapper_object_Prefer_using_0_when_possible, targetType, sourceType);
                 }
             }
-            function isUnionOrIntersectionTypeWithoutNullableConstituents(type) {
-                if (!(type.flags & 3145728 /* UnionOrIntersection */)) {
-                    return false;
-                }
-                // at this point we know that this is union or intersection type possibly with nullable constituents.
-                // check if we still will have compound type if we ignore nullable components.
-                var seenNonNullable = false;
-                for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
-                    var t = _a[_i];
-                    if (t.flags & 98304 /* Nullable */) {
-                        continue;
+            /**
+             * Try and elaborate array and tuple errors. Returns false
+             * if we have found an elaboration, or we should ignore
+             * any other elaborations when relating the `source` and
+             * `target` types.
+             *
+             * @param source
+             * @param target
+             * @param reportErrors
+             */
+            function tryElaborateArrayLikeErrors(source, target, reportErrors) {
+                if (isTupleLikeType(source)) {
+                    var sourceTuple = source.target;
+                    if (sourceTuple && sourceTuple.readonly && isArrayOrTupleLikeType(target) &&
+                        (!isReadonlyArrayType(target) || isTupleType(target) && !target.target.readonly)) {
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1, typeToString(source), typeToString(target));
+                        }
+                        return false;
                     }
-                    if (seenNonNullable) {
-                        return true;
+                    return isArrayLikeType(target);
+                }
+                if (isTupleLikeType(target)) {
+                    return isArrayLikeType(source);
+                }
+                if (isReadonlyArrayType(source) && isArrayType(target) && !isReadonlyArrayType(target)) {
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.The_type_0_is_readonly_and_cannot_be_assigned_to_the_mutable_type_1, typeToString(source), typeToString(target));
                     }
-                    seenNonNullable = true;
+                    return false;
                 }
-                return false;
+                return true;
             }
             /**
              * Compare two types and return
@@ -42359,11 +42852,11 @@ var ts;
                 if (target.flags & 33554432 /* Substitution */) {
                     target = target.typeVariable;
                 }
-                if (source.flags & 8388608 /* IndexedAccess */) {
-                    source = getSimplifiedType(source);
+                if (source.flags & 25165824 /* Simplifiable */) {
+                    source = getSimplifiedType(source, /*writing*/ false);
                 }
-                if (target.flags & 8388608 /* IndexedAccess */) {
-                    target = getSimplifiedType(target);
+                if (target.flags & 25165824 /* Simplifiable */) {
+                    target = getSimplifiedType(target, /*writing*/ true);
                 }
                 // Try to see if we're relating something like `Foo` -> `Bar | null | undefined`.
                 // If so, reporting the `null` and `undefined` in the type is hardly useful.
@@ -42391,7 +42884,8 @@ var ts;
                     isSimpleTypeRelatedTo(source, target, relation, reportErrors ? reportError : undefined))
                     return -1 /* True */;
                 var isComparingJsxAttributes = !!(ts.getObjectFlags(source) & 4096 /* JsxAttributes */);
-                if (isObjectLiteralType(source) && ts.getObjectFlags(source) & 32768 /* FreshLiteral */) {
+                var isPerformingExcessPropertyChecks = (isObjectLiteralType(source) && ts.getObjectFlags(source) & 32768 /* FreshLiteral */);
+                if (isPerformingExcessPropertyChecks) {
                     var discriminantType = target.flags & 1048576 /* Union */ ? findMatchingDiscriminantType(source, target) : undefined;
                     if (hasExcessProperties(source, target, discriminantType, reportErrors)) {
                         if (reportErrors) {
@@ -42399,13 +42893,6 @@ var ts;
                         }
                         return 0 /* False */;
                     }
-                    // Above we check for excess properties with respect to the entire target type. When union
-                    // and intersection types are further deconstructed on the target side, we don't want to
-                    // make the check again (as it might fail for a partial target type). Therefore we obtain
-                    // the regular source type and proceed with that.
-                    if (isUnionOrIntersectionTypeWithoutNullableConstituents(target) && !discriminantType) {
-                        source = getRegularTypeOfObjectLiteral(source);
-                    }
                 }
                 if (relation !== comparableRelation && !isApparentIntersectionConstituent &&
                     source.flags & (131068 /* Primitive */ | 524288 /* Object */ | 2097152 /* Intersection */) && source !== globalObjectType &&
@@ -42438,11 +42925,24 @@ var ts;
                 }
                 else {
                     if (target.flags & 1048576 /* Union */) {
-                        result = typeRelatedToSomeType(source, target, reportErrors && !(source.flags & 131068 /* Primitive */) && !(target.flags & 131068 /* Primitive */));
+                        result = typeRelatedToSomeType(getRegularTypeOfObjectLiteral(source), target, reportErrors && !(source.flags & 131068 /* Primitive */) && !(target.flags & 131068 /* Primitive */));
+                        if (result && isPerformingExcessPropertyChecks) {
+                            // Validate against excess props using the original `source`
+                            var discriminantType = target.flags & 1048576 /* Union */ ? findMatchingDiscriminantType(source, target) : undefined;
+                            if (!propertiesRelatedTo(source, discriminantType || target, reportErrors, /*excludedProperties*/ undefined)) {
+                                return 0 /* False */;
+                            }
+                        }
                     }
                     else if (target.flags & 2097152 /* Intersection */) {
                         isIntersectionConstituent = true; // set here to affect the following trio of checks
-                        result = typeRelatedToEachType(source, target, reportErrors);
+                        result = typeRelatedToEachType(getRegularTypeOfObjectLiteral(source), target, reportErrors);
+                        if (result && isPerformingExcessPropertyChecks) {
+                            // Validate against excess props using the original `source`
+                            if (!propertiesRelatedTo(source, target, reportErrors, /*excludedProperties*/ undefined)) {
+                                return 0 /* False */;
+                            }
+                        }
                     }
                     else if (source.flags & 2097152 /* Intersection */) {
                         // Check to see if any constituents of the intersection are immediately related to the target.
@@ -42484,8 +42984,15 @@ var ts;
                     }
                 }
                 if (!result && reportErrors) {
-                    var maybeSuppress = suppressNextError;
-                    suppressNextError = false;
+                    var maybeSuppress = overrideNextErrorInfo;
+                    overrideNextErrorInfo = undefined;
+                    if (source.flags & 524288 /* Object */ && target.flags & 524288 /* Object */) {
+                        var currentError = errorInfo;
+                        tryElaborateArrayLikeErrors(source, target, reportErrors);
+                        if (errorInfo !== currentError) {
+                            maybeSuppress = errorInfo;
+                        }
+                    }
                     if (source.flags & 524288 /* Object */ && target.flags & 131068 /* Primitive */) {
                         tryElaborateErrorsForPrimitivesAndObjects(source, target);
                     }
@@ -42580,7 +43087,7 @@ var ts;
                             return { value: true };
                         }
                     };
-                    for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
+                    for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
                         var prop = _a[_i];
                         var state_3 = _loop_7(prop);
                         if (typeof state_3 === "object")
@@ -42687,8 +43194,8 @@ var ts;
             }
             // Keep this up-to-date with the same logic within `getApparentTypeOfContextualType`, since they should behave similarly
             function findMatchingDiscriminantType(source, target) {
-                if (target.flags & 1048576 /* Union */) {
-                    var sourceProperties = getPropertiesOfObjectType(source);
+                if (target.flags & 1048576 /* Union */ && source.flags & (2097152 /* Intersection */ | 524288 /* Object */)) {
+                    var sourceProperties = getPropertiesOfType(source);
                     if (sourceProperties) {
                         var sourcePropertiesFiltered = findDiscriminantProperties(sourceProperties, target);
                         if (sourcePropertiesFiltered) {
@@ -42751,13 +43258,20 @@ var ts;
                     // When variance information isn't available we default to covariance. This happens
                     // in the process of computing variance information for recursive types and when
                     // comparing 'this' type arguments.
-                    var variance = i < variances.length ? variances[i] : 1 /* Covariant */;
+                    var varianceFlags = i < variances.length ? variances[i] : 1 /* Covariant */;
+                    var variance = varianceFlags & 7 /* VarianceMask */;
                     // We ignore arguments for independent type parameters (because they're never witnessed).
                     if (variance !== 4 /* Independent */) {
                         var s = sources[i];
                         var t = targets[i];
                         var related = -1 /* True */;
-                        if (variance === 1 /* Covariant */) {
+                        if (varianceFlags & 8 /* Unmeasurable */) {
+                            // Even an `Unmeasurable` variance works out without a structural check if the source and target are _identical_.
+                            // We can't simply assume invariance, because `Unmeasurable` marks nonlinear relations, for example, a relation tained by
+                            // the `-?` modifier in a mapped type (where, no matter how the inputs are related, the outputs still might not be)
+                            related = relation === identityRelation ? isRelatedTo(s, t, /*reportErrors*/ false) : compareTypesIdentical(s, t);
+                        }
+                        else if (variance === 1 /* Covariant */) {
                             related = isRelatedTo(s, t, reportErrors);
                         }
                         else if (variance === 2 /* Contravariant */) {
@@ -42790,6 +43304,17 @@ var ts;
                 }
                 return result;
             }
+            function propagateSidebandVarianceFlags(typeArguments, variances) {
+                for (var i = 0; i < variances.length; i++) {
+                    var v = variances[i];
+                    if (v & 8 /* Unmeasurable */) {
+                        instantiateType(typeArguments[i], reportUnmeasurableMarkers);
+                    }
+                    if (v & 16 /* Unreliable */) {
+                        instantiateType(typeArguments[i], reportUnreliableMarkers);
+                    }
+                }
+            }
             // Determine if possibly recursive types are related. First, check if the result is already available in the global cache.
             // Second, check if we have already started a comparison of the given two types in which case we assume the result to be true.
             // Third, check if both types are part of deeply nested chains of generic type instantiations and if so assume the types are
@@ -42807,6 +43332,16 @@ var ts;
                         // as a failure, and should be updated as a reported failure by the bottom of this function.
                     }
                     else {
+                        if (outofbandVarianceMarkerHandler) {
+                            // We're in the middle of variance checking - integrate any unmeasurable/unreliable flags from this cached component
+                            if (source.flags & (524288 /* Object */ | 16777216 /* Conditional */) && source.aliasSymbol &&
+                                source.aliasTypeArguments && source.aliasSymbol === target.aliasSymbol) {
+                                propagateSidebandVarianceFlags(source.aliasTypeArguments, getAliasVariances(source.aliasSymbol));
+                            }
+                            if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && source.target === target.target && ts.length(source.typeArguments)) {
+                                propagateSidebandVarianceFlags(source.typeArguments, getVariances(source.target));
+                            }
+                        }
                         return related === 1 /* Succeeded */ ? -1 /* True */ : 0 /* False */;
                     }
                 }
@@ -42876,8 +43411,8 @@ var ts;
                         if (source.root.isDistributive === target.root.isDistributive) {
                             if (result_3 = isRelatedTo(source.checkType, target.checkType, /*reportErrors*/ false)) {
                                 if (result_3 &= isRelatedTo(source.extendsType, target.extendsType, /*reportErrors*/ false)) {
-                                    if (result_3 &= isRelatedTo(source.trueType, target.trueType, /*reportErrors*/ false)) {
-                                        if (result_3 &= isRelatedTo(source.falseType, target.falseType, /*reportErrors*/ false)) {
+                                    if (result_3 &= isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), /*reportErrors*/ false)) {
+                                        if (result_3 &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), /*reportErrors*/ false)) {
                                             return result_3;
                                         }
                                     }
@@ -42927,8 +43462,7 @@ var ts;
                     }
                     // A type S is assignable to keyof T if S is assignable to keyof C, where C is the
                     // simplified form of T or, if T doesn't simplify, the constraint of T.
-                    var simplified = getSimplifiedType(target.type);
-                    var constraint = simplified !== target.type ? simplified : getConstraintOfType(target.type);
+                    var constraint = getSimplifiedTypeOrConstraint(target.type);
                     if (constraint) {
                         // We require Ternary.True here such that circular constraints don't cause
                         // false positives. For example, given 'T extends { [K in keyof T]: string }',
@@ -42940,13 +43474,17 @@ var ts;
                     }
                 }
                 else if (target.flags & 8388608 /* IndexedAccess */) {
-                    // A type S is related to a type T[K], where T and K aren't both type variables, if S is related to C,
-                    // where C is the base constraint of T[K]
-                    if (relation !== identityRelation &&
-                        !(isGenericObjectType(target.objectType) && isGenericIndexType(target.indexType))) {
-                        var constraint = getBaseConstraintOfType(target);
-                        if (constraint && constraint !== target) {
-                            if (result = isRelatedTo(source, constraint, reportErrors)) {
+                    // A type S is related to a type T[K] if S is related to C, where C is the base
+                    // constraint of T[K] for writing.
+                    if (relation !== identityRelation) {
+                        var objectType = target.objectType;
+                        var indexType = target.indexType;
+                        var baseObjectType = getBaseConstraintOfType(objectType) || objectType;
+                        var baseIndexType = getBaseConstraintOfType(indexType) || indexType;
+                        if (!isGenericObjectType(baseObjectType) && !isGenericIndexType(baseIndexType)) {
+                            var accessFlags = 2 /* Writing */ | (baseObjectType !== objectType ? 1 /* NoIndexSignatures */ : 0);
+                            var constraint = getIndexedAccessTypeOrUndefined(baseObjectType, baseIndexType, /*accessNode*/ undefined, accessFlags);
+                            if (constraint && (result = isRelatedTo(source, constraint, reportErrors))) {
                                 return result;
                             }
                         }
@@ -42963,7 +43501,7 @@ var ts;
                         }
                         if (!isGenericMappedType(source)) {
                             var targetConstraint = getConstraintTypeFromMappedType(target);
-                            var sourceKeys_1 = getIndexType(source);
+                            var sourceKeys_1 = getIndexType(source, /*stringsOnly*/ undefined, /*noIndexSignatures*/ true);
                             var hasOptionalUnionKeys = modifiers & 4 /* IncludeOptional */ && targetConstraint.flags & 1048576 /* Union */;
                             var filteredByApplicability = hasOptionalUnionKeys ? filterType(targetConstraint, function (t) { return !!isRelatedTo(t, sourceKeys_1); }) : undefined;
                             // A source type T is related to a target type { [P in Q]: X } if Q is related to keyof T and T[Q] is related to X.
@@ -42994,23 +43532,25 @@ var ts;
                             return result;
                         }
                     }
-                    var constraint = getConstraintOfType(source);
-                    if (!constraint || (source.flags & 262144 /* TypeParameter */ && constraint.flags & 1 /* Any */)) {
-                        // A type variable with no constraint is not related to the non-primitive object type.
-                        if (result = isRelatedTo(emptyObjectType, extractTypesOfKind(target, ~67108864 /* NonPrimitive */))) {
+                    else {
+                        var constraint = getConstraintOfType(source);
+                        if (!constraint || (source.flags & 262144 /* TypeParameter */ && constraint.flags & 1 /* Any */)) {
+                            // A type variable with no constraint is not related to the non-primitive object type.
+                            if (result = isRelatedTo(emptyObjectType, extractTypesOfKind(target, ~67108864 /* NonPrimitive */))) {
+                                errorInfo = saveErrorInfo;
+                                return result;
+                            }
+                        }
+                        // hi-speed no-this-instantiation check (less accurate, but avoids costly `this`-instantiation when the constraint will suffice), see #28231 for report on why this is needed
+                        else if (result = isRelatedTo(constraint, target, /*reportErrors*/ false, /*headMessage*/ undefined, isIntersectionConstituent)) {
+                            errorInfo = saveErrorInfo;
+                            return result;
+                        }
+                        // slower, fuller, this-instantiated check (necessary when comparing raw `this` types from base classes), see `subclassWithPolymorphicThisIsAssignable.ts` test for example
+                        else if (result = isRelatedTo(getTypeWithThisArgument(constraint, source), target, reportErrors, /*headMessage*/ undefined, isIntersectionConstituent)) {
                             errorInfo = saveErrorInfo;
                             return result;
                         }
-                    }
-                    // hi-speed no-this-instantiation check (less accurate, but avoids costly `this`-instantiation when the constraint will suffice), see #28231 for report on why this is needed
-                    else if (result = isRelatedTo(constraint, target, /*reportErrors*/ false, /*headMessage*/ undefined, isIntersectionConstituent)) {
-                        errorInfo = saveErrorInfo;
-                        return result;
-                    }
-                    // slower, fuller, this-instantiated check (necessary when comparing raw `this` types from base classes), see `subclassWithPolymorphicThisIsAssignable.ts` test for example
-                    else if (result = isRelatedTo(getTypeWithThisArgument(constraint, source), target, reportErrors, /*headMessage*/ undefined, isIntersectionConstituent)) {
-                        errorInfo = saveErrorInfo;
-                        return result;
                     }
                 }
                 else if (source.flags & 4194304 /* Index */) {
@@ -43026,8 +43566,8 @@ var ts;
                         // and Y1 is related to Y2.
                         if (isTypeIdenticalTo(source.extendsType, target.extendsType) &&
                             (isRelatedTo(source.checkType, target.checkType) || isRelatedTo(target.checkType, source.checkType))) {
-                            if (result = isRelatedTo(source.trueType, target.trueType, reportErrors)) {
-                                result &= isRelatedTo(source.falseType, target.falseType, reportErrors);
+                            if (result = isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), reportErrors)) {
+                                result &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), reportErrors);
                             }
                             if (result) {
                                 errorInfo = saveErrorInfo;
@@ -43097,7 +43637,7 @@ var ts;
                     if (source.flags & (524288 /* Object */ | 2097152 /* Intersection */) && target.flags & 524288 /* Object */) {
                         // Report structural errors only if we haven't reported any errors yet
                         var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo && !sourceIsPrimitive;
-                        result = propertiesRelatedTo(source, target, reportStructuralErrors);
+                        result = propertiesRelatedTo(source, target, reportStructuralErrors, /*excludedProperties*/ undefined);
                         if (result) {
                             result &= signaturesRelatedTo(source, target, 0 /* Call */, reportStructuralErrors);
                             if (result) {
@@ -43117,22 +43657,35 @@ var ts;
                             return result;
                         }
                     }
-                }
-                return 0 /* False */;
-                function isNonGeneric(type) {
-                    // If we're already in identity relationship checking, we should use `isRelatedTo`
-                    // to catch the `Maybe` from an excessively deep type (which we then assume means
-                    // that the type could possibly contain a generic)
-                    if (relation === identityRelation) {
-                        return isRelatedTo(type, getPermissiveInstantiation(type)) === -1 /* True */;
+                    // If S is an object type and T is a discriminated union, S may be related to T if
+                    // there exists a constituent of T for every combination of the discriminants of S
+                    // with respect to T. We do not report errors here, as we will use the existing
+                    // error result from checking each constituent of the union.
+                    if (source.flags & (524288 /* Object */ | 2097152 /* Intersection */) && target.flags & 1048576 /* Union */) {
+                        var objectOnlyTarget = extractTypesOfKind(target, 524288 /* Object */);
+                        if (objectOnlyTarget.flags & 1048576 /* Union */) {
+                            var result_4 = typeRelatedToDiscriminatedType(source, objectOnlyTarget);
+                            if (result_4) {
+                                return result_4;
+                            }
+                        }
                     }
-                    return isTypeIdenticalTo(type, getPermissiveInstantiation(type));
                 }
+                return 0 /* False */;
                 function relateVariances(sourceTypeArguments, targetTypeArguments, variances) {
                     if (result = typeArgumentsRelatedTo(sourceTypeArguments, targetTypeArguments, variances, reportErrors)) {
                         return result;
                     }
-                    var allowStructuralFallback = (targetTypeArguments && hasCovariantVoidArgument(targetTypeArguments, variances)) || isNonGeneric(source) || isNonGeneric(target);
+                    if (ts.some(variances, function (v) { return !!(v & 24 /* AllowsStructuralFallback */); })) {
+                        // If some type parameter was `Unmeasurable` or `Unreliable`, and we couldn't pass by assuming it was identical, then we
+                        // have to allow a structural fallback check
+                        // We elide the variance-based error elaborations, since those might not be too helpful, since we'll potentially
+                        // be assuming identity of the type parameter.
+                        originalErrorInfo = undefined;
+                        errorInfo = saveErrorInfo;
+                        return undefined;
+                    }
+                    var allowStructuralFallback = targetTypeArguments && hasCovariantVoidArgument(targetTypeArguments, variances);
                     varianceCheckFailed = !allowStructuralFallback;
                     // The type arguments did not relate appropriately, but it may be because we have no variance
                     // information (in which case typeArgumentsRelatedTo defaulted to covariance for all type
@@ -43150,7 +43703,7 @@ var ts;
                         // reveal the reason).
                         // We can switch on `reportErrors` here, since varianceCheckFailed guarantees we return `False`,
                         // we can return `False` early here to skip calculating the structural error message we don't need.
-                        if (varianceCheckFailed && !(reportErrors && ts.some(variances, function (v) { return v === 0 /* Invariant */; }))) {
+                        if (varianceCheckFailed && !(reportErrors && ts.some(variances, function (v) { return (v & 7 /* VarianceMask */) === 0 /* Invariant */; }))) {
                             return 0 /* False */;
                         }
                         // We remember the original error information so we can restore it in case the structural
@@ -43161,6 +43714,18 @@ var ts;
                     }
                 }
             }
+            function reportUnmeasurableMarkers(p) {
+                if (outofbandVarianceMarkerHandler && (p === markerSuperType || p === markerSubType || p === markerOtherType)) {
+                    outofbandVarianceMarkerHandler(/*onlyUnreliable*/ false);
+                }
+                return p;
+            }
+            function reportUnreliableMarkers(p) {
+                if (outofbandVarianceMarkerHandler && (p === markerSuperType || p === markerSubType || p === markerOtherType)) {
+                    outofbandVarianceMarkerHandler(/*onlyUnreliable*/ true);
+                }
+                return p;
+            }
             // A type [P in S]: X is related to a type [Q in T]: Y if T is related to S and X' is
             // related to Y, where X' is an instantiation of X in which P is replaced with Q. Notice
             // that S and T are contra-variant whereas X and Y are co-variant.
@@ -43168,45 +43733,281 @@ var ts;
                 var modifiersRelated = relation === comparableRelation || (relation === identityRelation ? getMappedTypeModifiers(source) === getMappedTypeModifiers(target) :
                     getCombinedMappedTypeOptionality(source) <= getCombinedMappedTypeOptionality(target));
                 if (modifiersRelated) {
-                    var result_4;
-                    if (result_4 = isRelatedTo(getConstraintTypeFromMappedType(target), getConstraintTypeFromMappedType(source), reportErrors)) {
+                    var result_5;
+                    var targetConstraint = getConstraintTypeFromMappedType(target);
+                    var sourceConstraint = instantiateType(getConstraintTypeFromMappedType(source), getCombinedMappedTypeOptionality(source) < 0 ? reportUnmeasurableMarkers : reportUnreliableMarkers);
+                    if (result_5 = isRelatedTo(targetConstraint, sourceConstraint, reportErrors)) {
                         var mapper = createTypeMapper([getTypeParameterFromMappedType(source)], [getTypeParameterFromMappedType(target)]);
-                        return result_4 & isRelatedTo(instantiateType(getTemplateTypeFromMappedType(source), mapper), getTemplateTypeFromMappedType(target), reportErrors);
+                        return result_5 & isRelatedTo(instantiateType(getTemplateTypeFromMappedType(source), mapper), getTemplateTypeFromMappedType(target), reportErrors);
                     }
                 }
                 return 0 /* False */;
             }
-            function propertiesRelatedTo(source, target, reportErrors) {
+            function typeRelatedToDiscriminatedType(source, target) {
+                // 1. Generate the combinations of discriminant properties & types 'source' can satisfy.
+                //    a. If the number of combinations is above a set limit, the comparison is too complex.
+                // 2. Filter 'target' to the subset of types whose discriminants exist in the matrix.
+                //    a. If 'target' does not satisfy all discriminants in the matrix, 'source' is not related.
+                // 3. For each type in the filtered 'target', determine if all non-discriminant properties of
+                //    'target' are related to a property in 'source'.
+                //
+                // NOTE: See ~/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithDiscriminatedUnion.ts
+                //       for examples.
+                var sourceProperties = getPropertiesOfObjectType(source);
+                var sourcePropertiesFiltered = findDiscriminantProperties(sourceProperties, target);
+                if (!sourcePropertiesFiltered)
+                    return 0 /* False */;
+                // Though we could compute the number of combinations as we generate
+                // the matrix, this would incur additional memory overhead due to
+                // array allocations. To reduce this overhead, we first compute
+                // the number of combinations to ensure we will not surpass our
+                // fixed limit before incurring the cost of any allocations:
+                var numCombinations = 1;
+                for (var _i = 0, sourcePropertiesFiltered_1 = sourcePropertiesFiltered; _i < sourcePropertiesFiltered_1.length; _i++) {
+                    var sourceProperty = sourcePropertiesFiltered_1[_i];
+                    numCombinations *= countTypes(getTypeOfSymbol(sourceProperty));
+                    if (numCombinations > 25) {
+                        // We've reached the complexity limit.
+                        return 0 /* False */;
+                    }
+                }
+                // Compute the set of types for each discriminant property.
+                var sourceDiscriminantTypes = new Array(sourcePropertiesFiltered.length);
+                var excludedProperties = ts.createUnderscoreEscapedMap();
+                for (var i = 0; i < sourcePropertiesFiltered.length; i++) {
+                    var sourceProperty = sourcePropertiesFiltered[i];
+                    var sourcePropertyType = getTypeOfSymbol(sourceProperty);
+                    sourceDiscriminantTypes[i] = sourcePropertyType.flags & 1048576 /* Union */
+                        ? sourcePropertyType.types
+                        : [sourcePropertyType];
+                    excludedProperties.set(sourceProperty.escapedName, true);
+                }
+                // Match each combination of the cartesian product of discriminant properties to one or more
+                // constituents of 'target'. If any combination does not have a match then 'source' is not relatable.
+                var discriminantCombinations = ts.cartesianProduct(sourceDiscriminantTypes);
+                var matchingTypes = [];
+                var _loop_8 = function (combination) {
+                    var hasMatch = false;
+                    outer: for (var _i = 0, _a = target.types; _i < _a.length; _i++) {
+                        var type = _a[_i];
+                        var _loop_9 = function (i) {
+                            var sourceProperty = sourcePropertiesFiltered[i];
+                            var targetProperty = getPropertyOfObjectType(type, sourceProperty.escapedName);
+                            if (!targetProperty)
+                                return "continue-outer";
+                            if (sourceProperty === targetProperty)
+                                return "continue";
+                            // We compare the source property to the target in the context of a single discriminant type.
+                            var related = propertyRelatedTo(source, target, sourceProperty, targetProperty, function (_) { return combination[i]; }, /*reportErrors*/ false);
+                            // If the target property could not be found, or if the properties were not related,
+                            // then this constituent is not a match.
+                            if (!related) {
+                                return "continue-outer";
+                            }
+                        };
+                        for (var i = 0; i < sourcePropertiesFiltered.length; i++) {
+                            var state_5 = _loop_9(i);
+                            switch (state_5) {
+                                case "continue-outer": continue outer;
+                            }
+                        }
+                        ts.pushIfUnique(matchingTypes, type, ts.equateValues);
+                        hasMatch = true;
+                    }
+                    if (!hasMatch) {
+                        return { value: 0 /* False */ };
+                    }
+                };
+                for (var _a = 0, discriminantCombinations_1 = discriminantCombinations; _a < discriminantCombinations_1.length; _a++) {
+                    var combination = discriminantCombinations_1[_a];
+                    var state_4 = _loop_8(combination);
+                    if (typeof state_4 === "object")
+                        return state_4.value;
+                }
+                // Compare the remaining non-discriminant properties of each match.
+                var result = -1 /* True */;
+                for (var _b = 0, matchingTypes_1 = matchingTypes; _b < matchingTypes_1.length; _b++) {
+                    var type = matchingTypes_1[_b];
+                    result &= propertiesRelatedTo(source, type, /*reportErrors*/ false, excludedProperties);
+                    if (result) {
+                        result &= signaturesRelatedTo(source, type, 0 /* Call */, /*reportStructuralErrors*/ false);
+                        if (result) {
+                            result &= signaturesRelatedTo(source, type, 1 /* Construct */, /*reportStructuralErrors*/ false);
+                            if (result) {
+                                result &= indexTypesRelatedTo(source, type, 0 /* String */, /*sourceIsPrimitive*/ false, /*reportStructuralErrors*/ false);
+                                if (result) {
+                                    result &= indexTypesRelatedTo(source, type, 1 /* Number */, /*sourceIsPrimitive*/ false, /*reportStructuralErrors*/ false);
+                                }
+                            }
+                        }
+                    }
+                    if (!result) {
+                        return result;
+                    }
+                }
+                return result;
+            }
+            function excludeProperties(properties, excludedProperties) {
+                if (!excludedProperties || properties.length === 0)
+                    return properties;
+                var result;
+                for (var i = 0; i < properties.length; i++) {
+                    if (!excludedProperties.has(properties[i].escapedName)) {
+                        if (result) {
+                            result.push(properties[i]);
+                        }
+                    }
+                    else if (!result) {
+                        result = properties.slice(0, i);
+                    }
+                }
+                return result || properties;
+            }
+            function isPropertySymbolTypeRelated(sourceProp, targetProp, getTypeOfSourceProperty, reportErrors) {
+                var targetIsOptional = strictNullChecks && !!(ts.getCheckFlags(targetProp) & 48 /* Partial */);
+                var source = getTypeOfSourceProperty(sourceProp);
+                if (ts.getCheckFlags(targetProp) & 65536 /* DeferredType */ && !getSymbolLinks(targetProp).type) {
+                    // Rather than resolving (and normalizing) the type, relate constituent-by-constituent without performing normalization or seconadary passes
+                    var links = getSymbolLinks(targetProp);
+                    ts.Debug.assertDefined(links.deferralParent);
+                    ts.Debug.assertDefined(links.deferralConstituents);
+                    var unionParent = !!(links.deferralParent.flags & 1048576 /* Union */);
+                    var result_6 = unionParent ? 0 /* False */ : -1 /* True */;
+                    var targetTypes = links.deferralConstituents;
+                    for (var _i = 0, targetTypes_3 = targetTypes; _i < targetTypes_3.length; _i++) {
+                        var targetType = targetTypes_3[_i];
+                        var related = isRelatedTo(source, targetType, /*reportErrors*/ false, /*headMessage*/ undefined, /*isIntersectionConstituent*/ !unionParent);
+                        if (!unionParent) {
+                            if (!related) {
+                                // Can't assign to a target individually - have to fallback to assigning to the _whole_ intersection (which forces normalization)
+                                return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors);
+                            }
+                            result_6 &= related;
+                        }
+                        else {
+                            if (related) {
+                                return related;
+                            }
+                        }
+                    }
+                    if (unionParent && !result_6 && targetIsOptional) {
+                        result_6 = isRelatedTo(source, undefinedType);
+                    }
+                    if (unionParent && !result_6 && reportErrors) {
+                        // The easiest way to get the right errors here is to un-defer (which may be costly)
+                        // If it turns out this is too costly too often, we can replicate the error handling logic within
+                        // typeRelatedToSomeType without the discriminatable type branch (as that requires a manifest union
+                        // type on which to hand discriminable properties, which we are expressly trying to avoid here)
+                        return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors);
+                    }
+                    return result_6;
+                }
+                else {
+                    return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors);
+                }
+            }
+            function propertyRelatedTo(source, target, sourceProp, targetProp, getTypeOfSourceProperty, reportErrors) {
+                var sourcePropFlags = ts.getDeclarationModifierFlagsFromSymbol(sourceProp);
+                var targetPropFlags = ts.getDeclarationModifierFlagsFromSymbol(targetProp);
+                if (sourcePropFlags & 8 /* Private */ || targetPropFlags & 8 /* Private */) {
+                    var hasDifferingDeclarations = sourceProp.valueDeclaration !== targetProp.valueDeclaration;
+                    if (ts.getCheckFlags(sourceProp) & 1024 /* ContainsPrivate */ && hasDifferingDeclarations) {
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(sourceProp), typeToString(source));
+                        }
+                        return 0 /* False */;
+                    }
+                    if (hasDifferingDeclarations) {
+                        if (reportErrors) {
+                            if (sourcePropFlags & 8 /* Private */ && targetPropFlags & 8 /* Private */) {
+                                reportError(ts.Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
+                            }
+                            else {
+                                reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 8 /* Private */ ? source : target), typeToString(sourcePropFlags & 8 /* Private */ ? target : source));
+                            }
+                        }
+                        return 0 /* False */;
+                    }
+                }
+                else if (targetPropFlags & 16 /* Protected */) {
+                    if (!isValidOverrideOf(sourceProp, targetProp)) {
+                        if (reportErrors) {
+                            reportError(ts.Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, symbolToString(targetProp), typeToString(getDeclaringClass(sourceProp) || source), typeToString(getDeclaringClass(targetProp) || target));
+                        }
+                        return 0 /* False */;
+                    }
+                }
+                else if (sourcePropFlags & 16 /* Protected */) {
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
+                    }
+                    return 0 /* False */;
+                }
+                // If the target comes from a partial union prop, allow `undefined` in the target type
+                var related = isPropertySymbolTypeRelated(sourceProp, targetProp, getTypeOfSourceProperty, reportErrors);
+                if (!related) {
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.Types_of_property_0_are_incompatible, symbolToString(targetProp));
+                    }
+                    return 0 /* False */;
+                }
+                // When checking for comparability, be more lenient with optional properties.
+                if (relation !== comparableRelation && sourceProp.flags & 16777216 /* Optional */ && !(targetProp.flags & 16777216 /* Optional */)) {
+                    // TypeScript 1.0 spec (April 2014): 3.8.3
+                    // S is a subtype of a type T, and T is a supertype of S if ...
+                    // S' and T are object types and, for each member M in T..
+                    // M is a property and S' contains a property N where
+                    // if M is a required property, N is also a required property
+                    // (M - property in T)
+                    // (N - property in S)
+                    if (reportErrors) {
+                        reportError(ts.Diagnostics.Property_0_is_optional_in_type_1_but_required_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
+                    }
+                    return 0 /* False */;
+                }
+                return related;
+            }
+            function propertiesRelatedTo(source, target, reportErrors, excludedProperties) {
                 if (relation === identityRelation) {
-                    return propertiesIdenticalTo(source, target);
+                    return propertiesIdenticalTo(source, target, excludedProperties);
                 }
                 var requireOptionalProperties = relation === subtypeRelation && !isObjectLiteralType(source) && !isEmptyArrayLiteralType(source) && !isTupleType(source);
                 var unmatchedProperty = getUnmatchedProperty(source, target, requireOptionalProperties, /*matchDiscriminantProperties*/ false);
                 if (unmatchedProperty) {
                     if (reportErrors) {
                         var props = ts.arrayFrom(getUnmatchedProperties(source, target, requireOptionalProperties, /*matchDiscriminantProperties*/ false));
+                        var shouldSkipElaboration = false;
                         if (!headMessage || (headMessage.code !== ts.Diagnostics.Class_0_incorrectly_implements_interface_1.code &&
                             headMessage.code !== ts.Diagnostics.Class_0_incorrectly_implements_class_1_Did_you_mean_to_extend_1_and_inherit_its_members_as_a_subclass.code)) {
-                            suppressNextError = true; // Retain top-level error for interface implementing issues, otherwise omit it
+                            shouldSkipElaboration = true; // Retain top-level error for interface implementing issues, otherwise omit it
                         }
                         if (props.length === 1) {
                             var propName = symbolToString(unmatchedProperty);
-                            reportError(ts.Diagnostics.Property_0_is_missing_in_type_1_but_required_in_type_2, propName, typeToString(source), typeToString(target));
+                            reportError.apply(void 0, [ts.Diagnostics.Property_0_is_missing_in_type_1_but_required_in_type_2, propName].concat(getTypeNamesForErrorDisplay(source, target)));
                             if (ts.length(unmatchedProperty.declarations)) {
                                 associateRelatedInfo(ts.createDiagnosticForNode(unmatchedProperty.declarations[0], ts.Diagnostics._0_is_declared_here, propName));
                             }
+                            if (shouldSkipElaboration) {
+                                overrideNextErrorInfo = errorInfo;
+                            }
                         }
-                        else if (props.length > 5) { // arbitrary cutoff for too-long list form
-                            reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2_and_3_more, typeToString(source), typeToString(target), ts.map(props.slice(0, 4), function (p) { return symbolToString(p); }).join(", "), props.length - 4);
-                        }
-                        else {
-                            reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2, typeToString(source), typeToString(target), ts.map(props, function (p) { return symbolToString(p); }).join(", "));
+                        else if (tryElaborateArrayLikeErrors(source, target, /*reportErrors*/ false)) {
+                            if (props.length > 5) { // arbitrary cutoff for too-long list form
+                                reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2_and_3_more, typeToString(source), typeToString(target), ts.map(props.slice(0, 4), function (p) { return symbolToString(p); }).join(", "), props.length - 4);
+                            }
+                            else {
+                                reportError(ts.Diagnostics.Type_0_is_missing_the_following_properties_from_type_1_Colon_2, typeToString(source), typeToString(target), ts.map(props, function (p) { return symbolToString(p); }).join(", "));
+                            }
+                            if (shouldSkipElaboration) {
+                                overrideNextErrorInfo = errorInfo;
+                            }
                         }
+                        // ELSE: No array like or unmatched property error - just issue top level error (errorInfo = undefined)
                     }
                     return 0 /* False */;
                 }
                 if (isObjectLiteralType(target)) {
-                    for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
+                    for (var _i = 0, _a = excludeProperties(getPropertiesOfType(source), excludedProperties); _i < _a.length; _i++) {
                         var sourceProp = _a[_i];
                         if (!getPropertyOfObjectType(target, sourceProp.escapedName)) {
                             var sourceType = getTypeOfSymbol(sourceProp);
@@ -43247,84 +44048,30 @@ var ts;
                         }
                     }
                 }
-                var properties = getPropertiesOfObjectType(target);
-                for (var _b = 0, properties_2 = properties; _b < properties_2.length; _b++) {
-                    var targetProp = properties_2[_b];
+                // We only call this for union target types when we're attempting to do excess property checking - in those cases, we want to get _all possible props_
+                // from the target union, across all members
+                var properties = target.flags & 1048576 /* Union */ ? getPossiblePropertiesOfUnionType(target) : getPropertiesOfType(target);
+                for (var _b = 0, _c = excludeProperties(properties, excludedProperties); _b < _c.length; _b++) {
+                    var targetProp = _c[_b];
                     if (!(targetProp.flags & 4194304 /* Prototype */)) {
                         var sourceProp = getPropertyOfType(source, targetProp.escapedName);
                         if (sourceProp && sourceProp !== targetProp) {
-                            if (isIgnoredJsxProperty(source, sourceProp, getTypeOfSymbol(targetProp))) {
-                                continue;
-                            }
-                            var sourcePropFlags = ts.getDeclarationModifierFlagsFromSymbol(sourceProp);
-                            var targetPropFlags = ts.getDeclarationModifierFlagsFromSymbol(targetProp);
-                            if (sourcePropFlags & 8 /* Private */ || targetPropFlags & 8 /* Private */) {
-                                var hasDifferingDeclarations = sourceProp.valueDeclaration !== targetProp.valueDeclaration;
-                                if (ts.getCheckFlags(sourceProp) & 512 /* ContainsPrivate */ && hasDifferingDeclarations) {
-                                    if (reportErrors) {
-                                        reportError(ts.Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(sourceProp), typeToString(source));
-                                    }
-                                    return 0 /* False */;
-                                }
-                                if (hasDifferingDeclarations) {
-                                    if (reportErrors) {
-                                        if (sourcePropFlags & 8 /* Private */ && targetPropFlags & 8 /* Private */) {
-                                            reportError(ts.Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
-                                        }
-                                        else {
-                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 8 /* Private */ ? source : target), typeToString(sourcePropFlags & 8 /* Private */ ? target : source));
-                                        }
-                                    }
-                                    return 0 /* False */;
-                                }
-                            }
-                            else if (targetPropFlags & 16 /* Protected */) {
-                                if (!isValidOverrideOf(sourceProp, targetProp)) {
-                                    if (reportErrors) {
-                                        reportError(ts.Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, symbolToString(targetProp), typeToString(getDeclaringClass(sourceProp) || source), typeToString(getDeclaringClass(targetProp) || target));
-                                    }
-                                    return 0 /* False */;
-                                }
-                            }
-                            else if (sourcePropFlags & 16 /* Protected */) {
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
-                                }
-                                return 0 /* False */;
-                            }
-                            var related = isRelatedTo(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp), reportErrors);
+                            var related = propertyRelatedTo(source, target, sourceProp, targetProp, getTypeOfSymbol, reportErrors);
                             if (!related) {
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Types_of_property_0_are_incompatible, symbolToString(targetProp));
-                                }
                                 return 0 /* False */;
                             }
                             result &= related;
-                            // When checking for comparability, be more lenient with optional properties.
-                            if (relation !== comparableRelation && sourceProp.flags & 16777216 /* Optional */ && !(targetProp.flags & 16777216 /* Optional */)) {
-                                // TypeScript 1.0 spec (April 2014): 3.8.3
-                                // S is a subtype of a type T, and T is a supertype of S if ...
-                                // S' and T are object types and, for each member M in T..
-                                // M is a property and S' contains a property N where
-                                // if M is a required property, N is also a required property
-                                // (M - property in T)
-                                // (N - property in S)
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Property_0_is_optional_in_type_1_but_required_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
-                                }
-                                return 0 /* False */;
-                            }
                         }
                     }
                 }
                 return result;
             }
-            function propertiesIdenticalTo(source, target) {
+            function propertiesIdenticalTo(source, target, excludedProperties) {
                 if (!(source.flags & 524288 /* Object */ && target.flags & 524288 /* Object */)) {
                     return 0 /* False */;
                 }
-                var sourceProperties = getPropertiesOfObjectType(source);
-                var targetProperties = getPropertiesOfObjectType(target);
+                var sourceProperties = excludeProperties(getPropertiesOfObjectType(source), excludedProperties);
+                var targetProperties = excludeProperties(getPropertiesOfObjectType(target), excludedProperties);
                 if (sourceProperties.length !== targetProperties.length) {
                     return 0 /* False */;
                 }
@@ -43444,7 +44191,7 @@ var ts;
                 var result = -1 /* True */;
                 for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    if (isIgnoredJsxProperty(source, prop, /*targetMemberType*/ undefined)) {
+                    if (isIgnoredJsxProperty(source, prop)) {
                         continue;
                     }
                     // Skip over symbol-named members
@@ -43476,7 +44223,7 @@ var ts;
                     return indexTypesIdenticalTo(source, target, kind);
                 }
                 var targetInfo = getIndexInfoOfType(target, kind);
-                if (!targetInfo || targetInfo.type.flags & 3 /* AnyOrUnknown */ && !sourceIsPrimitive) {
+                if (!targetInfo || targetInfo.type.flags & 1 /* Any */ && !sourceIsPrimitive) {
                     // Index signature of type any permits assignment from everything but primitives
                     return -1 /* True */;
                 }
@@ -43616,8 +44363,11 @@ var ts;
                 // The emptyArray singleton is used to signal a recursive invocation.
                 cache.variances = ts.emptyArray;
                 variances = [];
-                for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
-                    var tp = typeParameters_1[_i];
+                var _loop_10 = function (tp) {
+                    var unmeasurable = false;
+                    var unreliable = false;
+                    var oldHandler = outofbandVarianceMarkerHandler;
+                    outofbandVarianceMarkerHandler = function (onlyUnreliable) { return onlyUnreliable ? unreliable = true : unmeasurable = true; };
                     // We first compare instantiations where the type parameter is replaced with
                     // marker types that have a known subtype relationship. From this we can infer
                     // invariance, covariance, contravariance or bivariance.
@@ -43632,7 +44382,20 @@ var ts;
                     if (variance === 3 /* Bivariant */ && isTypeAssignableTo(createMarkerType(cache, tp, markerOtherType), typeWithSuper)) {
                         variance = 4 /* Independent */;
                     }
+                    outofbandVarianceMarkerHandler = oldHandler;
+                    if (unmeasurable || unreliable) {
+                        if (unmeasurable) {
+                            variance |= 8 /* Unmeasurable */;
+                        }
+                        if (unreliable) {
+                            variance |= 16 /* Unreliable */;
+                        }
+                    }
                     variances.push(variance);
+                };
+                for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
+                    var tp = typeParameters_1[_i];
+                    _loop_10(tp);
                 }
                 cache.variances = variances;
             }
@@ -43649,7 +44412,7 @@ var ts;
         // See comment at call in recursiveTypeRelatedTo for when this case matters.
         function hasCovariantVoidArgument(typeArguments, variances) {
             for (var i = 0; i < variances.length; i++) {
-                if (variances[i] === 1 /* Covariant */ && typeArguments[i].flags & 16384 /* Void */) {
+                if ((variances[i] & 7 /* VarianceMask */) === 1 /* Covariant */ && typeArguments[i].flags & 16384 /* Void */) {
                     return true;
                 }
             }
@@ -44074,6 +44837,30 @@ var ts;
         function getNonNullableType(type) {
             return strictNullChecks ? getGlobalNonNullableTypeInstantiation(type) : type;
         }
+        /**
+         * Is source potentially coercible to target type under `==`.
+         * Assumes that `source` is a constituent of a union, hence
+         * the boolean literal flag on the LHS, but not on the RHS.
+         *
+         * This does not fully replicate the semantics of `==`. The
+         * intention is to catch cases that are clearly not right.
+         *
+         * Comparing (string | number) to number should not remove the
+         * string element.
+         *
+         * Comparing (string | number) to 1 will remove the string
+         * element, though this is not sound. This is a pragmatic
+         * choice.
+         *
+         * @see narrowTypeByEquality
+         *
+         * @param source
+         * @param target
+         */
+        function isCoercibleUnderDoubleEquals(source, target) {
+            return ((source.flags & (8 /* Number */ | 4 /* String */ | 512 /* BooleanLiteral */)) !== 0)
+                && ((target.flags & (8 /* Number */ | 4 /* String */ | 16 /* Boolean */)) !== 0);
+        }
         /**
          * Return true if type was inferred from an object literal, written as an object type literal, or is the shape of a module
          * with no call or construct signatures.
@@ -44202,7 +44989,7 @@ var ts;
             var stringIndexInfo = getIndexInfoOfType(type, 0 /* String */);
             var numberIndexInfo = getIndexInfoOfType(type, 1 /* Number */);
             var result = createAnonymousType(type.symbol, members, ts.emptyArray, ts.emptyArray, stringIndexInfo && createIndexInfo(getWidenedType(stringIndexInfo.type), stringIndexInfo.isReadonly), numberIndexInfo && createIndexInfo(getWidenedType(numberIndexInfo.type), numberIndexInfo.isReadonly));
-            result.objectFlags |= (ts.getObjectFlags(type) & 16384 /* JSLiteral */); // Retain js literal flag through widening
+            result.objectFlags |= (ts.getObjectFlags(type) & (16384 /* JSLiteral */ | 524288 /* NonInferrableType */)); // Retain js literal flag through widening
             return result;
         }
         function getWidenedType(type) {
@@ -44210,26 +44997,34 @@ var ts;
         }
         function getWidenedTypeWithContext(type, context) {
             if (ts.getObjectFlags(type) & 393216 /* RequiresWidening */) {
+                if (context === undefined && type.widened) {
+                    return type.widened;
+                }
+                var result = void 0;
                 if (type.flags & 98304 /* Nullable */) {
-                    return anyType;
+                    result = anyType;
                 }
-                if (isObjectLiteralType(type)) {
-                    return getWidenedTypeOfObjectLiteral(type, context);
+                else if (isObjectLiteralType(type)) {
+                    result = getWidenedTypeOfObjectLiteral(type, context);
                 }
-                if (type.flags & 1048576 /* Union */) {
+                else if (type.flags & 1048576 /* Union */) {
                     var unionContext_1 = context || createWideningContext(/*parent*/ undefined, /*propertyName*/ undefined, type.types);
                     var widenedTypes = ts.sameMap(type.types, function (t) { return t.flags & 98304 /* Nullable */ ? t : getWidenedTypeWithContext(t, unionContext_1); });
                     // Widening an empty object literal transitions from a highly restrictive type to
                     // a highly inclusive one. For that reason we perform subtype reduction here if the
                     // union includes empty object types (e.g. reducing {} | string to just {}).
-                    return getUnionType(widenedTypes, ts.some(widenedTypes, isEmptyObjectType) ? 2 /* Subtype */ : 1 /* Literal */);
+                    result = getUnionType(widenedTypes, ts.some(widenedTypes, isEmptyObjectType) ? 2 /* Subtype */ : 1 /* Literal */);
                 }
-                if (type.flags & 2097152 /* Intersection */) {
-                    return getIntersectionType(ts.sameMap(type.types, getWidenedType));
+                else if (type.flags & 2097152 /* Intersection */) {
+                    result = getIntersectionType(ts.sameMap(type.types, getWidenedType));
                 }
-                if (isArrayType(type) || isTupleType(type)) {
-                    return createTypeReference(type.target, ts.sameMap(type.typeArguments, getWidenedType));
+                else if (isArrayType(type) || isTupleType(type)) {
+                    result = createTypeReference(type.target, ts.sameMap(type.typeArguments, getWidenedType));
+                }
+                if (result && context === undefined) {
+                    type.widened = result;
                 }
+                return result || type;
             }
             return type;
         }
@@ -44291,12 +45086,12 @@ var ts;
             }
             var diagnostic;
             switch (declaration.kind) {
-                case 204 /* BinaryExpression */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 205 /* BinaryExpression */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     diagnostic = noImplicitAny ? ts.Diagnostics.Member_0_implicitly_has_an_1_type : ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage;
                     break;
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     var param = declaration;
                     if (ts.isIdentifier(param.name) &&
                         (ts.isCallSignatureDeclaration(param.parent) || ts.isMethodSignature(param.parent) || ts.isFunctionTypeNode(param.parent)) &&
@@ -44311,30 +45106,30 @@ var ts;
                         noImplicitAny ? ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type : ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage :
                         noImplicitAny ? ts.Diagnostics.Parameter_0_implicitly_has_an_1_type : ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage;
                     break;
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     diagnostic = ts.Diagnostics.Binding_element_0_implicitly_has_an_1_type;
                     if (!noImplicitAny) {
                         // Don't issue a suggestion for binding elements since the codefix doesn't yet support them.
                         return;
                     }
                     break;
-                case 294 /* JSDocFunctionType */:
+                case 295 /* JSDocFunctionType */:
                     error(declaration, ts.Diagnostics.Function_type_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
                     return;
-                case 239 /* FunctionDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 240 /* FunctionDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     if (noImplicitAny && !declaration.name) {
                         error(declaration, ts.Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
                         return;
                     }
                     diagnostic = noImplicitAny ? ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type : ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage;
                     break;
-                case 181 /* MappedType */:
+                case 182 /* MappedType */:
                     if (noImplicitAny) {
                         error(declaration, ts.Diagnostics.Mapped_object_type_implicitly_has_an_any_template_type);
                     }
@@ -44454,7 +45249,7 @@ var ts;
             var objectFlags = ts.getObjectFlags(type);
             return !!(type.flags & 63176704 /* Instantiable */ ||
                 objectFlags & 4 /* Reference */ && ts.forEach(type.typeArguments, couldContainTypeVariables) ||
-                objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 2048 /* TypeLiteral */ | 32 /* Class */) ||
+                objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations ||
                 objectFlags & 32 /* Mapped */ ||
                 type.flags & 3145728 /* UnionOrIntersection */ && couldUnionOrIntersectionContainTypeVariables(type));
         }
@@ -44502,19 +45297,20 @@ var ts;
             reverseMappedCache.set(key, type);
             return type;
         }
+        // We consider a type to be partially inferable if it isn't marked non-inferable or if it is
+        // an object literal type with at least one property of an inferable type. For example, an object
+        // literal { a: 123, b: x => true } is marked non-inferable because it contains a context sensitive
+        // arrow function, but is considered partially inferable because property 'a' has an inferable type.
+        function isPartiallyInferableType(type) {
+            return !(ts.getObjectFlags(type) & 524288 /* NonInferrableType */) ||
+                isObjectLiteralType(type) && ts.some(getPropertiesOfType(type), function (prop) { return isPartiallyInferableType(getTypeOfSymbol(prop)); });
+        }
         function createReverseMappedType(source, target, constraint) {
-            var properties = getPropertiesOfType(source);
-            if (properties.length === 0 && !getIndexInfoOfType(source, 0 /* String */)) {
+            // We consider a source type reverse mappable if it has a string index signature or if
+            // it has one or more properties and is of a partially inferable type.
+            if (!(getIndexInfoOfType(source, 0 /* String */) || getPropertiesOfType(source).length !== 0 && isPartiallyInferableType(source))) {
                 return undefined;
             }
-            // If any property contains context sensitive functions that have been skipped, the source type
-            // is incomplete and we can't infer a meaningful input type.
-            for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
-                var prop = properties_3[_i];
-                if (ts.getObjectFlags(getTypeOfSymbol(prop)) & 524288 /* ContainsAnyFunctionType */) {
-                    return undefined;
-                }
-            }
             // For arrays and tuples we infer new arrays and tuples where the reverse mapping has been
             // applied to the element type(s).
             if (isArrayType(source)) {
@@ -44542,20 +45338,20 @@ var ts;
             var templateType = getTemplateTypeFromMappedType(target);
             var inference = createInferenceInfo(typeParameter);
             inferTypes([inference], sourceType, templateType);
-            return getTypeFromInference(inference);
+            return getTypeFromInference(inference) || unknownType;
         }
         function getUnmatchedProperties(source, target, requireOptionalProperties, matchDiscriminantProperties) {
-            var properties, _i, properties_4, targetProp, sourceProp, targetType, sourceType;
+            var properties, _i, properties_2, targetProp, sourceProp, targetType, sourceType;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        properties = target.flags & 2097152 /* Intersection */ ? getPropertiesOfUnionOrIntersectionType(target) : getPropertiesOfObjectType(target);
-                        _i = 0, properties_4 = properties;
+                        properties = target.flags & 1048576 /* Union */ ? getPossiblePropertiesOfUnionType(target) : getPropertiesOfType(target);
+                        _i = 0, properties_2 = properties;
                         _a.label = 1;
                     case 1:
-                        if (!(_i < properties_4.length)) return [3 /*break*/, 6];
-                        targetProp = properties_4[_i];
-                        if (!(requireOptionalProperties || !(targetProp.flags & 16777216 /* Optional */))) return [3 /*break*/, 5];
+                        if (!(_i < properties_2.length)) return [3 /*break*/, 6];
+                        targetProp = properties_2[_i];
+                        if (!(requireOptionalProperties || !(targetProp.flags & 16777216 /* Optional */ || ts.getCheckFlags(targetProp) & 48 /* Partial */))) return [3 /*break*/, 5];
                         sourceProp = getPropertyOfType(source, targetProp.escapedName);
                         if (!!sourceProp) return [3 /*break*/, 3];
                         return [4 /*yield*/, targetProp];
@@ -44596,7 +45392,7 @@ var ts;
         function getTypeFromInference(inference) {
             return inference.candidates ? getUnionType(inference.candidates, 2 /* Subtype */) :
                 inference.contraCandidates ? getIntersectionType(inference.contraCandidates) :
-                    emptyObjectType;
+                    undefined;
         }
         function inferTypes(inferences, originalSource, originalTarget, priority, contravariant) {
             if (priority === void 0) { priority = 0; }
@@ -44670,6 +45466,9 @@ var ts;
                         target = removeTypesFromUnionOrIntersection(target, matchingTypes);
                     }
                 }
+                else if (target.flags & (8388608 /* IndexedAccess */ | 33554432 /* Substitution */)) {
+                    target = getActualTypeVariable(target);
+                }
                 if (target.flags & 8650752 /* TypeVariable */) {
                     // If target is a type parameter, make an inference, unless the source type contains
                     // the anyFunctionType (the wildcard type that's used to avoid contextually typing functions).
@@ -44678,7 +45477,7 @@ var ts;
                     // not contain anyFunctionType when we come back to this argument for its second round
                     // of inference. Also, we exclude inferences for silentNeverType (which is used as a wildcard
                     // when constructing types from type parameters that had no inference candidates).
-                    if (ts.getObjectFlags(source) & 524288 /* ContainsAnyFunctionType */ || source === silentNeverType || (priority & 8 /* ReturnType */ && (source === autoType || source === autoArrayType))) {
+                    if (ts.getObjectFlags(source) & 524288 /* NonInferrableType */ || source === silentNeverType || (priority & 16 /* ReturnType */ && (source === autoType || source === autoArrayType))) {
                         return;
                     }
                     var inference = getInferenceInfoForType(target);
@@ -44705,7 +45504,7 @@ var ts;
                                     inference.inferredType = undefined;
                                 }
                             }
-                            if (!(priority & 8 /* ReturnType */) && target.flags & 262144 /* TypeParameter */ && inference.topLevel && !isTypeParameterAtTopLevel(originalTarget, target)) {
+                            if (!(priority & 16 /* ReturnType */) && target.flags & 262144 /* TypeParameter */ && inference.topLevel && !isTypeParameterAtTopLevel(originalTarget, target)) {
                                 inference.topLevel = false;
                                 inference.inferredType = undefined;
                             }
@@ -44714,16 +45513,16 @@ var ts;
                     }
                     else {
                         // Infer to the simplified version of an indexed access, if possible, to (hopefully) expose more bare type parameters to the inference engine
-                        var simplified = getSimplifiedType(target);
+                        var simplified = getSimplifiedType(target, /*writing*/ false);
                         if (simplified !== target) {
                             inferFromTypesOnce(source, simplified);
                         }
                         else if (target.flags & 8388608 /* IndexedAccess */) {
-                            var indexType = getSimplifiedType(target.indexType);
+                            var indexType = getSimplifiedType(target.indexType, /*writing*/ false);
                             // Generally simplifications of instantiable indexes are avoided to keep relationship checking correct, however if our target is an access, we can consider
                             // that key of that access to be "instantiated", since we're looking to find the infernce goal in any way we can.
                             if (indexType.flags & 63176704 /* Instantiable */) {
-                                var simplified_1 = distributeIndexOverObjectType(getSimplifiedType(target.objectType), indexType);
+                                var simplified_1 = distributeIndexOverObjectType(getSimplifiedType(target.objectType, /*writing*/ false), indexType, /*writing*/ false);
                                 if (simplified_1 && simplified_1 !== target) {
                                     inferFromTypesOnce(source, simplified_1);
                                 }
@@ -44731,9 +45530,6 @@ var ts;
                         }
                     }
                 }
-                else if (target.flags & 33554432 /* Substitution */) {
-                    inferFromTypes(source, target.typeVariable);
-                }
                 if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && source.target === target.target) {
                     // If source and target are references to the same generic type, infer from type arguments
                     var sourceTypes = source.typeArguments || ts.emptyArray;
@@ -44741,7 +45537,7 @@ var ts;
                     var count = sourceTypes.length < targetTypes.length ? sourceTypes.length : targetTypes.length;
                     var variances = getVariances(source.target);
                     for (var i = 0; i < count; i++) {
-                        if (i < variances.length && variances[i] === 2 /* Contravariant */) {
+                        if (i < variances.length && (variances[i] & 7 /* VarianceMask */) === 2 /* Contravariant */) {
                             inferFromContravariantTypes(sourceTypes[i], targetTypes[i]);
                         }
                         else {
@@ -44758,7 +45554,7 @@ var ts;
                     var empty = createEmptyObjectTypeFromStringLiteral(source);
                     contravariant = !contravariant;
                     var savePriority = priority;
-                    priority |= 16 /* LiteralKeyof */;
+                    priority |= 32 /* LiteralKeyof */;
                     inferFromTypes(empty, target.type);
                     priority = savePriority;
                     contravariant = !contravariant;
@@ -44770,37 +45566,53 @@ var ts;
                 else if (source.flags & 16777216 /* Conditional */ && target.flags & 16777216 /* Conditional */) {
                     inferFromTypes(source.checkType, target.checkType);
                     inferFromTypes(source.extendsType, target.extendsType);
-                    inferFromTypes(source.trueType, target.trueType);
-                    inferFromTypes(source.falseType, target.falseType);
+                    inferFromTypes(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target));
+                    inferFromTypes(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target));
                 }
                 else if (target.flags & 16777216 /* Conditional */ && !contravariant) {
-                    inferFromTypes(source, target.trueType);
-                    inferFromTypes(source, target.falseType);
+                    inferFromTypes(source, getTrueTypeFromConditionalType(target));
+                    inferFromTypes(source, getFalseTypeFromConditionalType(target));
                 }
                 else if (target.flags & 3145728 /* UnionOrIntersection */) {
+                    // We infer from types that are not naked type variables first so that inferences we
+                    // make from nested naked type variables and given slightly higher priority by virtue
+                    // of being first in the candidates array.
+                    var typeVariableCount = 0;
                     for (var _d = 0, _e = target.types; _d < _e.length; _d++) {
                         var t = _e[_d];
-                        var savePriority = priority;
-                        // Inferences directly to naked type variables are given lower priority as they are
-                        // less specific. For example, when inferring from Promise<string> to T | Promise<T>,
-                        // we want to infer string for T, not Promise<string> | string.
                         if (getInferenceInfoForType(t)) {
-                            priority |= 1 /* NakedTypeVariable */;
+                            typeVariableCount++;
+                        }
+                        else {
+                            inferFromTypes(source, t);
+                        }
+                    }
+                    // Inferences directly to naked type variables are given lower priority as they are
+                    // less specific. For example, when inferring from Promise<string> to T | Promise<T>,
+                    // we want to infer string for T, not Promise<string> | string. For intersection types
+                    // we only infer to single naked type variables.
+                    if (target.flags & 1048576 /* Union */ ? typeVariableCount !== 0 : typeVariableCount === 1) {
+                        var savePriority = priority;
+                        priority |= 1 /* NakedTypeVariable */;
+                        for (var _f = 0, _g = target.types; _f < _g.length; _f++) {
+                            var t = _g[_f];
+                            if (getInferenceInfoForType(t)) {
+                                inferFromTypes(source, t);
+                            }
                         }
-                        inferFromTypes(source, t);
                         priority = savePriority;
                     }
                 }
                 else if (source.flags & 1048576 /* Union */) {
                     // Source is a union or intersection type, infer from each constituent type
                     var sourceTypes = source.types;
-                    for (var _f = 0, sourceTypes_3 = sourceTypes; _f < sourceTypes_3.length; _f++) {
-                        var sourceType = sourceTypes_3[_f];
+                    for (var _h = 0, sourceTypes_3 = sourceTypes; _h < sourceTypes_3.length; _h++) {
+                        var sourceType = sourceTypes_3[_h];
                         inferFromTypes(sourceType, target);
                     }
                 }
                 else {
-                    if (!(priority & 32 /* NoConstraints */ && source.flags & (2097152 /* Intersection */ | 63176704 /* Instantiable */))) {
+                    if (!(priority & 64 /* NoConstraints */ && source.flags & (2097152 /* Intersection */ | 63176704 /* Instantiable */))) {
                         var apparentSource = getApparentType(source);
                         // getApparentType can return _any_ type, since an indexed access or conditional may simplify to any other type.
                         // If that occurs and it doesn't simplify to an object or intersection, we'll need to restart `inferFromTypes`
@@ -44853,7 +45665,7 @@ var ts;
                 }
             }
             function inferFromContravariantTypes(source, target) {
-                if (strictFunctionTypes || priority & 64 /* AlwaysStrict */) {
+                if (strictFunctionTypes || priority & 128 /* AlwaysStrict */) {
                     contravariant = !contravariant;
                     inferFromTypes(source, target);
                     contravariant = !contravariant;
@@ -44892,7 +45704,11 @@ var ts;
                         var inferredType = inferTypeForHomomorphicMappedType(source, target, constraintType);
                         if (inferredType) {
                             var savePriority = priority;
-                            priority |= 2 /* HomomorphicMappedType */;
+                            // We assign a lower priority to inferences made from types containing non-inferrable
+                            // types because we may only have a partial result (i.e. we may have failed to make
+                            // reverse inferences for some properties).
+                            priority |= ts.getObjectFlags(source) & 524288 /* NonInferrableType */ ?
+                                4 /* PartialHomomorphicMappedType */ : 2 /* HomomorphicMappedType */;
                             inferFromTypes(inferredType, inference.typeParameter);
                             priority = savePriority;
                         }
@@ -44903,7 +45719,7 @@ var ts;
                     // We're inferring from some source type S to a mapped type { [P in K]: X }, where K is a type
                     // parameter. First infer from 'keyof S' to K.
                     var savePriority = priority;
-                    priority |= 4 /* MappedTypeConstraint */;
+                    priority |= 8 /* MappedTypeConstraint */;
                     inferFromTypes(getIndexType(source), constraintType);
                     priority = savePriority;
                     // If K is constrained to a type C, also infer to C. Thus, for a mapped type { [P in K]: X },
@@ -44916,11 +45732,11 @@ var ts;
                     }
                     // If no inferences can be made to K's constraint, infer from a union of the property types
                     // in the source to the template type X.
-                    var valueTypes = ts.compact([
-                        getIndexTypeOfType(source, 0 /* String */),
-                        getIndexTypeOfType(source, 1 /* Number */)
-                    ].concat(ts.map(getPropertiesOfType(source), getTypeOfSymbol)));
-                    inferFromTypes(getUnionType(valueTypes), getTemplateTypeFromMappedType(target));
+                    var propTypes = ts.map(getPropertiesOfType(source), getTypeOfSymbol);
+                    var stringIndexType = getIndexTypeOfType(source, 0 /* String */);
+                    var numberIndexInfo = getNonEnumNumberIndexInfo(source);
+                    var numberIndexType = numberIndexInfo && numberIndexInfo.type;
+                    inferFromTypes(getUnionType(ts.append(ts.append(propTypes, stringIndexType), numberIndexType)), getTemplateTypeFromMappedType(target));
                     return true;
                 }
                 return false;
@@ -44974,8 +45790,8 @@ var ts;
                     }
                 }
                 var properties = getPropertiesOfObjectType(target);
-                for (var _i = 0, properties_5 = properties; _i < properties_5.length; _i++) {
-                    var targetProp = properties_5[_i];
+                for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
+                    var targetProp = properties_3[_i];
                     var sourceProp = getPropertyOfType(source, targetProp.escapedName);
                     if (sourceProp) {
                         inferFromTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
@@ -44988,7 +45804,7 @@ var ts;
                 var sourceLen = sourceSignatures.length;
                 var targetLen = targetSignatures.length;
                 var len = sourceLen < targetLen ? sourceLen : targetLen;
-                var skipParameters = !!(ts.getObjectFlags(source) & 524288 /* ContainsAnyFunctionType */);
+                var skipParameters = !!(ts.getObjectFlags(source) & 524288 /* NonInferrableType */);
                 for (var i = 0; i < len; i++) {
                     inferFromSignature(getBaseSignature(sourceSignatures[sourceLen - len + i]), getBaseSignature(targetSignatures[targetLen - len + i]), skipParameters);
                 }
@@ -44998,7 +45814,7 @@ var ts;
                     var saveBivariant = bivariant;
                     var kind = target.declaration ? target.declaration.kind : 0 /* Unknown */;
                     // Once we descend into a bivariant signature we remain bivariant for all nested inferences
-                    bivariant = bivariant || kind === 156 /* MethodDeclaration */ || kind === 155 /* MethodSignature */ || kind === 157 /* Constructor */;
+                    bivariant = bivariant || kind === 157 /* MethodDeclaration */ || kind === 156 /* MethodSignature */ || kind === 158 /* Constructor */;
                     applyToParameterTypes(source, target, inferFromContravariantTypes);
                     bivariant = saveBivariant;
                 }
@@ -45065,7 +45881,7 @@ var ts;
             return candidates;
         }
         function getContravariantInference(inference) {
-            return inference.priority & 28 /* PriorityImpliesCombination */ ? getIntersectionType(inference.contraCandidates) : getCommonSubtype(inference.contraCandidates);
+            return inference.priority & 56 /* PriorityImpliesCombination */ ? getIntersectionType(inference.contraCandidates) : getCommonSubtype(inference.contraCandidates);
         }
         function getCovariantInference(inference, signature) {
             // Extract all object literal types and replace them with a single widened and normalized type.
@@ -45082,15 +45898,15 @@ var ts;
                     candidates;
             // If all inferences were made from a position that implies a combined result, infer a union type.
             // Otherwise, infer a common supertype.
-            var unwidenedType = inference.priority & 28 /* PriorityImpliesCombination */ ?
+            var unwidenedType = inference.priority & 56 /* PriorityImpliesCombination */ ?
                 getUnionType(baseCandidates, 2 /* Subtype */) :
                 getCommonSupertype(baseCandidates);
             return getWidenedType(unwidenedType);
         }
         function getInferredType(context, index) {
             var inference = context.inferences[index];
-            var inferredType = inference.inferredType;
-            if (!inferredType) {
+            if (!inference.inferredType) {
+                var inferredType = void 0;
                 var signature = context.signature;
                 if (signature) {
                     var inferredCovariantType = inference.candidates ? getCovariantInference(inference, signature) : undefined;
@@ -45121,27 +45937,24 @@ var ts;
                             // parameter should be instantiated to the empty object type.
                             inferredType = instantiateType(defaultType, combineTypeMappers(createBackreferenceMapper(context, index), context.nonFixingMapper));
                         }
-                        else {
-                            inferredType = getDefaultTypeArgumentType(!!(context.flags & 2 /* AnyDefault */));
-                        }
                     }
                 }
                 else {
                     inferredType = getTypeFromInference(inference);
                 }
-                inference.inferredType = inferredType;
+                inference.inferredType = inferredType || getDefaultTypeArgumentType(!!(context.flags & 2 /* AnyDefault */));
                 var constraint = getConstraintOfTypeParameter(inference.typeParameter);
                 if (constraint) {
                     var instantiatedConstraint = instantiateType(constraint, context.nonFixingMapper);
-                    if (!context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
+                    if (!inferredType || !context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
                         inference.inferredType = inferredType = instantiatedConstraint;
                     }
                 }
             }
-            return inferredType;
+            return inference.inferredType;
         }
         function getDefaultTypeArgumentType(isInJavaScriptFile) {
-            return isInJavaScriptFile ? anyType : emptyObjectType;
+            return isInJavaScriptFile ? anyType : unknownType;
         }
         function getInferredTypes(context) {
             var result = [];
@@ -45151,8 +45964,8 @@ var ts;
             return result;
         }
         // EXPRESSION TYPE CHECKING
-        function getCannotFindNameDiagnosticForName(name) {
-            switch (name) {
+        function getCannotFindNameDiagnosticForName(node) {
+            switch (node.escapedText) {
                 case "document":
                 case "console":
                     return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_include_dom;
@@ -45183,14 +45996,20 @@ var ts;
                 case "Iterator":
                 case "AsyncIterator":
                     return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_es2015_or_later;
-                default: return ts.Diagnostics.Cannot_find_name_0;
+                default:
+                    if (node.parent.kind === 277 /* ShorthandPropertyAssignment */) {
+                        return ts.Diagnostics.No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer;
+                    }
+                    else {
+                        return ts.Diagnostics.Cannot_find_name_0;
+                    }
             }
         }
         function getResolvedSymbol(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedSymbol) {
                 links.resolvedSymbol = !ts.nodeIsMissing(node) &&
-                    resolveName(node, node.escapedText, 67220415 /* Value */ | 1048576 /* ExportValue */, getCannotFindNameDiagnosticForName(node.escapedText), node, !ts.isWriteOnlyAccess(node), 
+                    resolveName(node, node.escapedText, 67220415 /* Value */ | 1048576 /* ExportValue */, getCannotFindNameDiagnosticForName(node), node, !ts.isWriteOnlyAccess(node), 
                     /*excludeGlobals*/ false, ts.Diagnostics.Cannot_find_name_0_Did_you_mean_1) || unknownSymbol;
             }
             return links.resolvedSymbol;
@@ -45199,7 +46018,7 @@ var ts;
             // TypeScript 1.0 spec (April 2014): 3.6.3
             // A type query consists of the keyword typeof followed by an expression.
             // The expression is restricted to a single identifier or a sequence of identifiers separated by periods
-            return !!ts.findAncestor(node, function (n) { return n.kind === 167 /* TypeQuery */ ? true : n.kind === 72 /* Identifier */ || n.kind === 148 /* QualifiedName */ ? false : "quit"; });
+            return !!ts.findAncestor(node, function (n) { return n.kind === 168 /* TypeQuery */ ? true : n.kind === 73 /* Identifier */ || n.kind === 149 /* QualifiedName */ ? false : "quit"; });
         }
         // Return the flow cache key for a "dotted name" (i.e. a sequence of identifiers
         // separated by dots). The key consists of the id of the symbol referenced by the
@@ -45207,21 +46026,21 @@ var ts;
         // The result is undefined if the reference isn't a dotted name. We prefix nodes
         // occurring in an apparent type position with '@' because the control flow type
         // of such nodes may be based on the apparent type instead of the declared type.
-        function getFlowCacheKey(node) {
+        function getFlowCacheKey(node, declaredType, initialType, flowContainer) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     var symbol = getResolvedSymbol(node);
-                    return symbol !== unknownSymbol ? (isConstraintPosition(node) ? "@" : "") + getSymbolId(symbol) : undefined;
-                case 100 /* ThisKeyword */:
+                    return symbol !== unknownSymbol ? (flowContainer ? getNodeId(flowContainer) : "-1") + "|" + getTypeId(declaredType) + "|" + getTypeId(initialType) + "|" + (isConstraintPosition(node) ? "@" : "") + getSymbolId(symbol) : undefined;
+                case 101 /* ThisKeyword */:
                     return "0";
-                case 213 /* NonNullExpression */:
-                case 195 /* ParenthesizedExpression */:
-                    return getFlowCacheKey(node.expression);
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 214 /* NonNullExpression */:
+                case 196 /* ParenthesizedExpression */:
+                    return getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     var propName = getAccessedPropertyName(node);
                     if (propName !== undefined) {
-                        var key = getFlowCacheKey(node.expression);
+                        var key = getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
                         return key && key + "." + propName;
                     }
             }
@@ -45229,24 +46048,24 @@ var ts;
         }
         function isMatchingReference(source, target) {
             switch (target.kind) {
-                case 195 /* ParenthesizedExpression */:
-                case 213 /* NonNullExpression */:
+                case 196 /* ParenthesizedExpression */:
+                case 214 /* NonNullExpression */:
                     return isMatchingReference(source, target.expression);
             }
             switch (source.kind) {
-                case 72 /* Identifier */:
-                    return target.kind === 72 /* Identifier */ && getResolvedSymbol(source) === getResolvedSymbol(target) ||
-                        (target.kind === 237 /* VariableDeclaration */ || target.kind === 186 /* BindingElement */) &&
+                case 73 /* Identifier */:
+                    return target.kind === 73 /* Identifier */ && getResolvedSymbol(source) === getResolvedSymbol(target) ||
+                        (target.kind === 238 /* VariableDeclaration */ || target.kind === 187 /* BindingElement */) &&
                             getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(source)) === getSymbolOfNode(target);
-                case 100 /* ThisKeyword */:
-                    return target.kind === 100 /* ThisKeyword */;
-                case 98 /* SuperKeyword */:
-                    return target.kind === 98 /* SuperKeyword */;
-                case 213 /* NonNullExpression */:
-                case 195 /* ParenthesizedExpression */:
+                case 101 /* ThisKeyword */:
+                    return target.kind === 101 /* ThisKeyword */;
+                case 99 /* SuperKeyword */:
+                    return target.kind === 99 /* SuperKeyword */;
+                case 214 /* NonNullExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isMatchingReference(source.expression, target);
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return ts.isAccessExpression(target) &&
                         getAccessedPropertyName(source) === getAccessedPropertyName(target) &&
                         isMatchingReference(source.expression, target.expression);
@@ -45254,7 +46073,7 @@ var ts;
             return false;
         }
         function getAccessedPropertyName(access) {
-            return access.kind === 189 /* PropertyAccessExpression */ ? access.name.escapedText :
+            return access.kind === 190 /* PropertyAccessExpression */ ? access.name.escapedText :
                 ts.isStringLiteral(access.argumentExpression) || ts.isNumericLiteral(access.argumentExpression) ? ts.escapeLeadingUnderscores(access.argumentExpression.text) :
                     undefined;
         }
@@ -45279,7 +46098,7 @@ var ts;
                 isDiscriminantProperty(getDeclaredTypeOfReference(target.expression), name);
         }
         function getDeclaredTypeOfReference(expr) {
-            if (expr.kind === 72 /* Identifier */) {
+            if (expr.kind === 73 /* Identifier */) {
                 return getTypeOfSymbol(getResolvedSymbol(expr));
             }
             if (ts.isAccessExpression(expr)) {
@@ -45301,7 +46120,7 @@ var ts;
                 if (prop && ts.getCheckFlags(prop) & 2 /* SyntheticProperty */) {
                     if (prop.isDiscriminantProperty === undefined) {
                         prop.isDiscriminantProperty =
-                            (prop.checkFlags & 96 /* Discriminant */) === 96 /* Discriminant */ &&
+                            (prop.checkFlags & 192 /* Discriminant */) === 192 /* Discriminant */ &&
                                 isDiscriminantType(getTypeOfSymbol(prop));
                     }
                     return !!prop.isDiscriminantProperty;
@@ -45310,7 +46129,7 @@ var ts;
             return false;
         }
         function isSyntheticThisPropertyAccess(expr) {
-            return ts.isAccessExpression(expr) && expr.expression.kind === 100 /* ThisKeyword */ && !!(expr.expression.flags & 8 /* Synthesized */);
+            return ts.isAccessExpression(expr) && expr.expression.kind === 101 /* ThisKeyword */ && !!(expr.expression.flags & 8 /* Synthesized */);
         }
         function findDiscriminantProperties(sourceProperties, target) {
             var result;
@@ -45338,7 +46157,7 @@ var ts;
                     }
                 }
             }
-            if (callExpression.expression.kind === 189 /* PropertyAccessExpression */ &&
+            if (callExpression.expression.kind === 190 /* PropertyAccessExpression */ &&
                 isOrContainsMatchingReference(reference, callExpression.expression.expression)) {
                 return true;
             }
@@ -45457,7 +46276,7 @@ var ts;
                 return strictNullChecks ? 7888800 /* ObjectStrictFacts */ : 16736160 /* ObjectFacts */;
             }
             if (flags & 63176704 /* Instantiable */) {
-                return getTypeFacts(getBaseConstraintOfType(type) || emptyObjectType);
+                return getTypeFacts(getBaseConstraintOfType(type) || unknownType);
             }
             if (flags & 3145728 /* UnionOrIntersection */) {
                 return getTypeFactsOfTypes(type.types);
@@ -45493,15 +46312,15 @@ var ts;
             return createArrayType(checkIteratedTypeOrElementType(type, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) || errorType);
         }
         function getAssignedTypeOfBinaryExpression(node) {
-            var isDestructuringDefaultAssignment = node.parent.kind === 187 /* ArrayLiteralExpression */ && isDestructuringAssignmentTarget(node.parent) ||
-                node.parent.kind === 275 /* PropertyAssignment */ && isDestructuringAssignmentTarget(node.parent.parent);
+            var isDestructuringDefaultAssignment = node.parent.kind === 188 /* ArrayLiteralExpression */ && isDestructuringAssignmentTarget(node.parent) ||
+                node.parent.kind === 276 /* PropertyAssignment */ && isDestructuringAssignmentTarget(node.parent.parent);
             return isDestructuringDefaultAssignment ?
                 getTypeWithDefault(getAssignedType(node), node.right) :
                 getTypeOfExpression(node.right);
         }
         function isDestructuringAssignmentTarget(parent) {
-            return parent.parent.kind === 204 /* BinaryExpression */ && parent.parent.left === parent ||
-                parent.parent.kind === 227 /* ForOfStatement */ && parent.parent.initializer === parent;
+            return parent.parent.kind === 205 /* BinaryExpression */ && parent.parent.left === parent ||
+                parent.parent.kind === 228 /* ForOfStatement */ && parent.parent.initializer === parent;
         }
         function getAssignedTypeOfArrayLiteralElement(node, element) {
             return getTypeOfDestructuredArrayElement(getAssignedType(node), node.elements.indexOf(element));
@@ -45518,21 +46337,21 @@ var ts;
         function getAssignedType(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return stringType;
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return checkRightHandSideOfForOf(parent.expression, parent.awaitModifier) || errorType;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return getAssignedTypeOfBinaryExpression(parent);
-                case 198 /* DeleteExpression */:
+                case 199 /* DeleteExpression */:
                     return undefinedType;
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return getAssignedTypeOfArrayLiteralElement(parent, node);
-                case 208 /* SpreadElement */:
+                case 209 /* SpreadElement */:
                     return getAssignedTypeOfSpreadExpression(parent);
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     return getAssignedTypeOfPropertyAssignment(parent);
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     return getAssignedTypeOfShorthandPropertyAssignment(parent);
             }
             return errorType;
@@ -45540,7 +46359,7 @@ var ts;
         function getInitialTypeOfBindingElement(node) {
             var pattern = node.parent;
             var parentType = getInitialType(pattern.parent);
-            var type = pattern.kind === 184 /* ObjectBindingPattern */ ?
+            var type = pattern.kind === 185 /* ObjectBindingPattern */ ?
                 getTypeOfDestructuredProperty(parentType, node.propertyName || node.name) :
                 !node.dotDotDotToken ?
                     getTypeOfDestructuredArrayElement(parentType, pattern.elements.indexOf(node)) :
@@ -45558,37 +46377,37 @@ var ts;
             if (node.initializer) {
                 return getTypeOfInitializer(node.initializer);
             }
-            if (node.parent.parent.kind === 226 /* ForInStatement */) {
+            if (node.parent.parent.kind === 227 /* ForInStatement */) {
                 return stringType;
             }
-            if (node.parent.parent.kind === 227 /* ForOfStatement */) {
+            if (node.parent.parent.kind === 228 /* ForOfStatement */) {
                 return checkRightHandSideOfForOf(node.parent.parent.expression, node.parent.parent.awaitModifier) || errorType;
             }
             return errorType;
         }
         function getInitialType(node) {
-            return node.kind === 237 /* VariableDeclaration */ ?
+            return node.kind === 238 /* VariableDeclaration */ ?
                 getInitialTypeOfVariableDeclaration(node) :
                 getInitialTypeOfBindingElement(node);
         }
         function getInitialOrAssignedType(node, reference) {
-            return getConstraintForLocation(node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */ ?
+            return getConstraintForLocation(node.kind === 238 /* VariableDeclaration */ || node.kind === 187 /* BindingElement */ ?
                 getInitialType(node) :
                 getAssignedType(node), reference);
         }
         function isEmptyArrayAssignment(node) {
-            return node.kind === 237 /* VariableDeclaration */ && node.initializer &&
+            return node.kind === 238 /* VariableDeclaration */ && node.initializer &&
                 isEmptyArrayLiteral(node.initializer) ||
-                node.kind !== 186 /* BindingElement */ && node.parent.kind === 204 /* BinaryExpression */ &&
+                node.kind !== 187 /* BindingElement */ && node.parent.kind === 205 /* BinaryExpression */ &&
                     isEmptyArrayLiteral(node.parent.right);
         }
         function getReferenceCandidate(node) {
             switch (node.kind) {
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return getReferenceCandidate(node.expression);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     switch (node.operatorToken.kind) {
-                        case 59 /* EqualsToken */:
+                        case 60 /* EqualsToken */:
                             return getReferenceCandidate(node.left);
                         case 27 /* CommaToken */:
                             return getReferenceCandidate(node.right);
@@ -45598,13 +46417,13 @@ var ts;
         }
         function getReferenceRoot(node) {
             var parent = node.parent;
-            return parent.kind === 195 /* ParenthesizedExpression */ ||
-                parent.kind === 204 /* BinaryExpression */ && parent.operatorToken.kind === 59 /* EqualsToken */ && parent.left === node ||
-                parent.kind === 204 /* BinaryExpression */ && parent.operatorToken.kind === 27 /* CommaToken */ && parent.right === node ?
+            return parent.kind === 196 /* ParenthesizedExpression */ ||
+                parent.kind === 205 /* BinaryExpression */ && parent.operatorToken.kind === 60 /* EqualsToken */ && parent.left === node ||
+                parent.kind === 205 /* BinaryExpression */ && parent.operatorToken.kind === 27 /* CommaToken */ && parent.right === node ?
                 getReferenceRoot(parent) : node;
         }
         function getTypeOfSwitchClause(clause) {
-            if (clause.kind === 271 /* CaseClause */) {
+            if (clause.kind === 272 /* CaseClause */) {
                 return getRegularTypeOfLiteralType(getTypeOfExpression(clause.expression));
             }
             return neverType;
@@ -45626,7 +46445,7 @@ var ts;
             var witnesses = [];
             for (var _i = 0, _a = switchStatement.caseBlock.clauses; _i < _a.length; _i++) {
                 var clause = _a[_i];
-                if (clause.kind === 271 /* CaseClause */) {
+                if (clause.kind === 272 /* CaseClause */) {
                     if (clause.expression.kind === 10 /* StringLiteral */) {
                         witnesses.push(clause.expression.text);
                         continue;
@@ -45672,6 +46491,9 @@ var ts;
             }
             return f(type) ? type : neverType;
         }
+        function countTypes(type) {
+            return type.flags & 1048576 /* Union */ ? type.types.length : 1;
+        }
         function mapType(type, mapper, noReductions) {
             if (type.flags & 131072 /* Never */) {
                 return type;
@@ -45679,25 +46501,20 @@ var ts;
             if (!(type.flags & 1048576 /* Union */)) {
                 return mapper(type);
             }
-            var types = type.types;
-            var mappedType;
             var mappedTypes;
-            for (var _i = 0, types_13 = types; _i < types_13.length; _i++) {
-                var current = types_13[_i];
-                var t = mapper(current);
-                if (t) {
-                    if (!mappedType) {
-                        mappedType = t;
-                    }
-                    else if (!mappedTypes) {
-                        mappedTypes = [mappedType, t];
+            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                var t = _a[_i];
+                var mapped = mapper(t);
+                if (mapped) {
+                    if (!mappedTypes) {
+                        mappedTypes = [mapped];
                     }
                     else {
-                        mappedTypes.push(t);
+                        mappedTypes.push(mapped);
                     }
                 }
             }
-            return mappedTypes ? getUnionType(mappedTypes, noReductions ? 0 /* None */ : 1 /* Literal */) : mappedType;
+            return mappedTypes && getUnionType(mappedTypes, noReductions ? 0 /* None */ : 1 /* Literal */);
         }
         function extractTypesOfKind(type, kind) {
             return filterType(type, function (t) { return (t.flags & kind) !== 0; });
@@ -45765,8 +46582,8 @@ var ts;
         }
         function isEvolvingArrayTypeList(types) {
             var hasEvolvingArrayType = false;
-            for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
-                var t = types_14[_i];
+            for (var _i = 0, types_13 = types; _i < types_13.length; _i++) {
+                var t = types_13[_i];
                 if (!(t.flags & 131072 /* Never */)) {
                     if (!(ts.getObjectFlags(t) & 256 /* EvolvingArray */)) {
                         return false;
@@ -45789,12 +46606,12 @@ var ts;
         function isEvolvingArrayOperationTarget(node) {
             var root = getReferenceRoot(node);
             var parent = root.parent;
-            var isLengthPushOrUnshift = parent.kind === 189 /* PropertyAccessExpression */ && (parent.name.escapedText === "length" ||
-                parent.parent.kind === 191 /* CallExpression */ && ts.isPushOrUnshiftIdentifier(parent.name));
-            var isElementAssignment = parent.kind === 190 /* ElementAccessExpression */ &&
+            var isLengthPushOrUnshift = parent.kind === 190 /* PropertyAccessExpression */ && (parent.name.escapedText === "length" ||
+                parent.parent.kind === 192 /* CallExpression */ && ts.isPushOrUnshiftIdentifier(parent.name));
+            var isElementAssignment = parent.kind === 191 /* ElementAccessExpression */ &&
                 parent.expression === root &&
-                parent.parent.kind === 204 /* BinaryExpression */ &&
-                parent.parent.operatorToken.kind === 59 /* EqualsToken */ &&
+                parent.parent.kind === 205 /* BinaryExpression */ &&
+                parent.parent.operatorToken.kind === 60 /* EqualsToken */ &&
                 parent.parent.left === parent &&
                 !ts.isAssignmentTarget(parent.parent) &&
                 isTypeAssignableToKind(getTypeOfExpression(parent.argumentExpression), 296 /* NumberLike */);
@@ -45808,7 +46625,7 @@ var ts;
             return links.maybeTypePredicate;
         }
         function getMaybeTypePredicate(node) {
-            if (node.expression.kind !== 98 /* SuperKeyword */) {
+            if (node.expression.kind !== 99 /* SuperKeyword */) {
                 var funcType = checkNonNullExpression(node.expression);
                 if (funcType !== silentNeverType) {
                     var apparentType = getApparentType(funcType);
@@ -45826,6 +46643,7 @@ var ts;
         function getFlowTypeOfReference(reference, declaredType, initialType, flowContainer, couldBeUninitialized) {
             if (initialType === void 0) { initialType = declaredType; }
             var key;
+            var keySet = false;
             var flowDepth = 0;
             if (flowAnalysisDisabled) {
                 return errorType;
@@ -45841,10 +46659,17 @@ var ts;
             // on empty arrays are possible without implicit any errors and new element types can be inferred without
             // type mismatch errors.
             var resultType = ts.getObjectFlags(evolvedType) & 256 /* EvolvingArray */ && isEvolvingArrayOperationTarget(reference) ? autoArrayType : finalizeEvolvingArrayType(evolvedType);
-            if (reference.parent && reference.parent.kind === 213 /* NonNullExpression */ && getTypeWithFacts(resultType, 2097152 /* NEUndefinedOrNull */).flags & 131072 /* Never */) {
+            if (reference.parent && reference.parent.kind === 214 /* NonNullExpression */ && getTypeWithFacts(resultType, 2097152 /* NEUndefinedOrNull */).flags & 131072 /* Never */) {
                 return declaredType;
             }
             return resultType;
+            function getOrSetCacheKey() {
+                if (keySet) {
+                    return key;
+                }
+                keySet = true;
+                return key = getFlowCacheKey(reference, declaredType, initialType, flowContainer);
+            }
             function getTypeAtFlowNode(flow) {
                 if (flowDepth === 2000) {
                     // We have made 2000 recursive invocations. To avoid overflowing the call stack we report an error
@@ -45856,6 +46681,15 @@ var ts;
                 flowDepth++;
                 while (true) {
                     var flags = flow.flags;
+                    if (flags & 8192 /* Cached */) {
+                        var key_2 = getOrSetCacheKey();
+                        if (key_2) {
+                            var id = getFlowNodeId(flow);
+                            if (flowAssignmentKeys[id] === key_2) {
+                                return flowAssignmentTypes[id];
+                            }
+                        }
+                    }
                     if (flags & 1024 /* Shared */) {
                         // We cache results of flow type resolution for shared nodes that were previously visited in
                         // the same getFlowTypeOfReference invocation. A node is considered shared when it is the
@@ -45886,6 +46720,15 @@ var ts;
                             flow = flow.antecedent;
                             continue;
                         }
+                        else if (flowLoopCount === flowLoopStart) { // Only cache assignments when not within loop analysis
+                            var key_3 = getOrSetCacheKey();
+                            if (key_3 && !isIncomplete(type)) {
+                                flow.flags |= 8192 /* Cached */;
+                                var id = getFlowNodeId(flow);
+                                flowAssignmentKeys[id] = key_3;
+                                flowAssignmentTypes[id] = type;
+                            }
+                        }
                     }
                     else if (flags & 96 /* Condition */) {
                         type = getTypeAtFlowCondition(flow);
@@ -45913,9 +46756,9 @@ var ts;
                         // Check if we should continue with the control flow of the containing function.
                         var container = flow.container;
                         if (container && container !== flowContainer &&
-                            reference.kind !== 189 /* PropertyAccessExpression */ &&
-                            reference.kind !== 190 /* ElementAccessExpression */ &&
-                            reference.kind !== 100 /* ThisKeyword */) {
+                            reference.kind !== 190 /* PropertyAccessExpression */ &&
+                            reference.kind !== 191 /* ElementAccessExpression */ &&
+                            reference.kind !== 101 /* ThisKeyword */) {
                             flow = container.flowNode;
                             continue;
                         }
@@ -45967,14 +46810,14 @@ var ts;
                     // in which case we continue control flow analysis back to the function's declaration
                     if (ts.isVariableDeclaration(node) && (ts.isInJSFile(node) || ts.isVarConst(node))) {
                         var init = ts.getDeclaredExpandoInitializer(node);
-                        if (init && (init.kind === 196 /* FunctionExpression */ || init.kind === 197 /* ArrowFunction */)) {
+                        if (init && (init.kind === 197 /* FunctionExpression */ || init.kind === 198 /* ArrowFunction */)) {
                             return getTypeAtFlowNode(flow.antecedent);
                         }
                     }
                     return declaredType;
                 }
                 // for (const _ in ref) acts as a nonnull on ref
-                if (ts.isVariableDeclaration(node) && node.parent.parent.kind === 226 /* ForInStatement */ && isMatchingReference(reference, node.parent.parent.expression)) {
+                if (ts.isVariableDeclaration(node) && node.parent.parent.kind === 227 /* ForInStatement */ && isMatchingReference(reference, node.parent.parent.expression)) {
                     return getNonNullableTypeIfNeeded(getTypeFromFlowType(getTypeAtFlowNode(flow.antecedent)));
                 }
                 // Assignment doesn't affect reference
@@ -45983,7 +46826,7 @@ var ts;
             function getTypeAtFlowArrayMutation(flow) {
                 if (declaredType === autoType || declaredType === autoArrayType) {
                     var node = flow.node;
-                    var expr = node.kind === 191 /* CallExpression */ ?
+                    var expr = node.kind === 192 /* CallExpression */ ?
                         node.expression.expression :
                         node.left.expression;
                     if (isMatchingReference(reference, getReferenceCandidate(expr))) {
@@ -45991,7 +46834,7 @@ var ts;
                         var type = getTypeFromFlowType(flowType);
                         if (ts.getObjectFlags(type) & 256 /* EvolvingArray */) {
                             var evolvedType_1 = type;
-                            if (node.kind === 191 /* CallExpression */) {
+                            if (node.kind === 192 /* CallExpression */) {
                                 for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
                                     var arg = _a[_i];
                                     evolvedType_1 = addEvolvingArrayElementType(evolvedType_1, arg);
@@ -46044,7 +46887,7 @@ var ts;
                 else if (isMatchingReferenceDiscriminant(expr, type)) {
                     type = narrowTypeByDiscriminant(type, expr, function (t) { return narrowTypeBySwitchOnDiscriminant(t, flow.switchStatement, flow.clauseStart, flow.clauseEnd); });
                 }
-                else if (expr.kind === 199 /* TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
+                else if (expr.kind === 200 /* TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
                     type = narrowBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else if (containsMatchingReferenceDiscriminant(reference, expr)) {
@@ -46091,12 +46934,10 @@ var ts;
                 // this flow loop junction, return the cached type.
                 var id = getFlowNodeId(flow);
                 var cache = flowLoopCaches[id] || (flowLoopCaches[id] = ts.createMap());
+                var key = getOrSetCacheKey();
                 if (!key) {
-                    key = getFlowCacheKey(reference);
                     // No cache key is generated when binding patterns are in unnarrowable situations
-                    if (!key) {
-                        return declaredType;
-                    }
+                    return declaredType;
                 }
                 var cached = cache.get(key);
                 if (cached) {
@@ -46204,7 +47045,7 @@ var ts;
                 return !assumeTrue;
             }
             function narrowByInKeyword(type, literal, assumeTrue) {
-                if ((type.flags & (1048576 /* Union */ | 524288 /* Object */)) || (type.flags & 262144 /* TypeParameter */ && type.isThisType)) {
+                if (type.flags & (1048576 /* Union */ | 524288 /* Object */) || isThisTypeParameter(type)) {
                     var propName_1 = ts.escapeLeadingUnderscores(literal.text);
                     return filterType(type, function (t) { return isTypePresencePossible(t, propName_1, assumeTrue); });
                 }
@@ -46212,8 +47053,8 @@ var ts;
             }
             function narrowTypeByBinaryExpression(type, expr, assumeTrue) {
                 switch (expr.operatorToken.kind) {
-                    case 59 /* EqualsToken */:
-                        return narrowTypeByTruthiness(type, expr.left, assumeTrue);
+                    case 60 /* EqualsToken */:
+                        return narrowTypeByTruthiness(narrowType(type, expr.right, assumeTrue), expr.left, assumeTrue);
                     case 33 /* EqualsEqualsToken */:
                     case 34 /* ExclamationEqualsToken */:
                     case 35 /* EqualsEqualsEqualsToken */:
@@ -46221,10 +47062,10 @@ var ts;
                         var operator_1 = expr.operatorToken.kind;
                         var left_1 = getReferenceCandidate(expr.left);
                         var right_1 = getReferenceCandidate(expr.right);
-                        if (left_1.kind === 199 /* TypeOfExpression */ && ts.isStringLiteralLike(right_1)) {
+                        if (left_1.kind === 200 /* TypeOfExpression */ && ts.isStringLiteralLike(right_1)) {
                             return narrowTypeByTypeof(type, left_1, operator_1, right_1, assumeTrue);
                         }
-                        if (right_1.kind === 199 /* TypeOfExpression */ && ts.isStringLiteralLike(left_1)) {
+                        if (right_1.kind === 200 /* TypeOfExpression */ && ts.isStringLiteralLike(left_1)) {
                             return narrowTypeByTypeof(type, right_1, operator_1, left_1, assumeTrue);
                         }
                         if (isMatchingReference(reference, left_1)) {
@@ -46243,9 +47084,9 @@ var ts;
                             return declaredType;
                         }
                         break;
-                    case 94 /* InstanceOfKeyword */:
+                    case 95 /* InstanceOfKeyword */:
                         return narrowTypeByInstanceof(type, expr, assumeTrue);
-                    case 93 /* InKeyword */:
+                    case 94 /* InKeyword */:
                         var target = getReferenceCandidate(expr.right);
                         if (ts.isStringLiteralLike(expr.left) && isMatchingReference(reference, target)) {
                             return narrowByInKeyword(type, expr.left, assumeTrue);
@@ -46289,7 +47130,10 @@ var ts;
                     return type;
                 }
                 if (assumeTrue) {
-                    var narrowedType = filterType(type, function (t) { return areTypesComparable(t, valueType); });
+                    var filterFn = operator === 33 /* EqualsEqualsToken */ ?
+                        (function (t) { return areTypesComparable(t, valueType) || isCoercibleUnderDoubleEquals(t, valueType); }) :
+                        function (t) { return areTypesComparable(t, valueType); };
+                    var narrowedType = filterType(type, filterFn);
                     return narrowedType.flags & 131072 /* Never */ ? type : replacePrimitivesWithLiterals(narrowedType, valueType);
                 }
                 if (isUnitType(valueType)) {
@@ -46578,19 +47422,19 @@ var ts;
             // will be a subtype or the same type as the argument.
             function narrowType(type, expr, assumeTrue) {
                 switch (expr.kind) {
-                    case 72 /* Identifier */:
-                    case 100 /* ThisKeyword */:
-                    case 98 /* SuperKeyword */:
-                    case 189 /* PropertyAccessExpression */:
-                    case 190 /* ElementAccessExpression */:
+                    case 73 /* Identifier */:
+                    case 101 /* ThisKeyword */:
+                    case 99 /* SuperKeyword */:
+                    case 190 /* PropertyAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         return narrowTypeByTruthiness(type, expr, assumeTrue);
-                    case 191 /* CallExpression */:
+                    case 192 /* CallExpression */:
                         return narrowTypeByTypePredicate(type, expr, assumeTrue);
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return narrowType(type, expr.expression, assumeTrue);
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         return narrowTypeByBinaryExpression(type, expr, assumeTrue);
-                    case 202 /* PrefixUnaryExpression */:
+                    case 203 /* PrefixUnaryExpression */:
                         if (expr.operator === 52 /* ExclamationToken */) {
                             return narrowType(type, expr.operand, !assumeTrue);
                         }
@@ -46605,7 +47449,7 @@ var ts;
             // an dotted name expression, and if the location is not an assignment target, obtain the type
             // of the expression (which will reflect control flow analysis). If the expression indeed
             // resolved to the given symbol, return the narrowed type.
-            if (location.kind === 72 /* Identifier */) {
+            if (location.kind === 73 /* Identifier */) {
                 if (ts.isRightSideOfQualifiedNameOrPropertyAccess(location)) {
                     location = location.parent;
                 }
@@ -46626,9 +47470,9 @@ var ts;
         function getControlFlowContainer(node) {
             return ts.findAncestor(node.parent, function (node) {
                 return ts.isFunctionLike(node) && !ts.getImmediatelyInvokedFunctionExpression(node) ||
-                    node.kind === 245 /* ModuleBlock */ ||
-                    node.kind === 284 /* SourceFile */ ||
-                    node.kind === 154 /* PropertyDeclaration */;
+                    node.kind === 246 /* ModuleBlock */ ||
+                    node.kind === 285 /* SourceFile */ ||
+                    node.kind === 155 /* PropertyDeclaration */;
             });
         }
         // Check if a parameter is assigned anywhere within its declaring function.
@@ -46647,10 +47491,10 @@ var ts;
             return !!ts.findAncestor(node.parent, function (node) { return ts.isFunctionLike(node) && !!(getNodeLinks(node).flags & 8388608 /* AssignmentsMarked */); });
         }
         function markParameterAssignments(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 if (ts.isAssignmentTarget(node)) {
                     var symbol = getResolvedSymbol(node);
-                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 151 /* Parameter */) {
+                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 152 /* Parameter */) {
                         symbol.isAssigned = true;
                     }
                 }
@@ -46665,7 +47509,7 @@ var ts;
         /** remove undefined from the annotated type of a parameter when there is an initializer (that doesn't include undefined) */
         function removeOptionalityFromDeclaredType(declaredType, declaration) {
             var annotationIncludesUndefined = strictNullChecks &&
-                declaration.kind === 151 /* Parameter */ &&
+                declaration.kind === 152 /* Parameter */ &&
                 declaration.initializer &&
                 getFalsyFlags(declaredType) & 32768 /* Undefined */ &&
                 !(getFalsyFlags(checkExpression(declaration.initializer)) & 32768 /* Undefined */);
@@ -46673,13 +47517,13 @@ var ts;
         }
         function isConstraintPosition(node) {
             var parent = node.parent;
-            return parent.kind === 189 /* PropertyAccessExpression */ ||
-                parent.kind === 191 /* CallExpression */ && parent.expression === node ||
-                parent.kind === 190 /* ElementAccessExpression */ && parent.expression === node ||
-                parent.kind === 186 /* BindingElement */ && parent.name === node && !!parent.initializer;
+            return parent.kind === 190 /* PropertyAccessExpression */ ||
+                parent.kind === 192 /* CallExpression */ && parent.expression === node ||
+                parent.kind === 191 /* ElementAccessExpression */ && parent.expression === node ||
+                parent.kind === 187 /* BindingElement */ && parent.name === node && !!parent.initializer;
         }
         function typeHasNullableConstraint(type) {
-            return type.flags & 58982400 /* InstantiableNonPrimitive */ && maybeTypeOfKind(getBaseConstraintOfType(type) || emptyObjectType, 98304 /* Nullable */);
+            return type.flags & 58982400 /* InstantiableNonPrimitive */ && maybeTypeOfKind(getBaseConstraintOfType(type) || unknownType, 98304 /* Nullable */);
         }
         function getConstraintForLocation(type, node) {
             // When a node is the left hand expression of a property access, element access, or call expression,
@@ -46710,7 +47554,7 @@ var ts;
             if (symbol === argumentsSymbol) {
                 var container = ts.getContainingFunction(node);
                 if (languageVersion < 2 /* ES2015 */) {
-                    if (container.kind === 197 /* ArrowFunction */) {
+                    if (container.kind === 198 /* ArrowFunction */) {
                         error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression);
                     }
                     else if (ts.hasModifier(container, 256 /* Async */)) {
@@ -46731,7 +47575,7 @@ var ts;
                 // Due to the emit for class decorators, any reference to the class from inside of the class body
                 // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
                 // behavior of class names in ES6.
-                if (declaration.kind === 240 /* ClassDeclaration */
+                if (declaration.kind === 241 /* ClassDeclaration */
                     && ts.nodeIsDecorated(declaration)) {
                     var container = ts.getContainingClass(node);
                     while (container !== undefined) {
@@ -46743,14 +47587,14 @@ var ts;
                         container = ts.getContainingClass(container);
                     }
                 }
-                else if (declaration.kind === 209 /* ClassExpression */) {
+                else if (declaration.kind === 210 /* ClassExpression */) {
                     // When we emit a class expression with static members that contain a reference
                     // to the constructor in the initializer, we will need to substitute that
                     // binding with an alias as the class name is not in scope.
                     var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
-                    while (container.kind !== 284 /* SourceFile */) {
+                    while (container.kind !== 285 /* SourceFile */) {
                         if (container.parent === declaration) {
-                            if (container.kind === 154 /* PropertyDeclaration */ && ts.hasModifier(container, 32 /* Static */)) {
+                            if (container.kind === 155 /* PropertyDeclaration */ && ts.hasModifier(container, 32 /* Static */)) {
                                 getNodeLinks(declaration).flags |= 16777216 /* ClassWithConstructorReference */;
                                 getNodeLinks(node).flags |= 33554432 /* ConstructorReferenceInClass */;
                             }
@@ -46799,7 +47643,7 @@ var ts;
             // The declaration container is the innermost function that encloses the declaration of the variable
             // or parameter. The flow container is the innermost function starting with which we analyze the control
             // flow graph to determine the control flow based type.
-            var isParameter = ts.getRootDeclaration(declaration).kind === 151 /* Parameter */;
+            var isParameter = ts.getRootDeclaration(declaration).kind === 152 /* Parameter */;
             var declarationContainer = getControlFlowContainer(declaration);
             var flowContainer = getControlFlowContainer(node);
             var isOuterVariable = flowContainer !== declarationContainer;
@@ -46808,19 +47652,19 @@ var ts;
             // When the control flow originates in a function expression or arrow function and we are referencing
             // a const variable or parameter from an outer function, we extend the origin of the control flow
             // analysis to include the immediately enclosing function.
-            while (flowContainer !== declarationContainer && (flowContainer.kind === 196 /* FunctionExpression */ ||
-                flowContainer.kind === 197 /* ArrowFunction */ || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
+            while (flowContainer !== declarationContainer && (flowContainer.kind === 197 /* FunctionExpression */ ||
+                flowContainer.kind === 198 /* ArrowFunction */ || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
                 (isConstVariable(localOrExportSymbol) || isParameter && !isParameterAssigned(localOrExportSymbol))) {
                 flowContainer = getControlFlowContainer(flowContainer);
             }
             // We only look for uninitialized variables in strict null checking mode, and only when we can analyze
             // the entire control flow graph from the variable's declaration (i.e. when the flow container and
             // declaration container are the same).
-            var assumeInitialized = isParameter || isAlias || isOuterVariable || isSpreadDestructuringAssignmentTarget || isModuleExports ||
+            var assumeInitialized = isParameter || isAlias || isOuterVariable || isSpreadDestructuringAssignmentTarget || isModuleExports || ts.isBindingElement(declaration) ||
                 type !== autoType && type !== autoArrayType && (!strictNullChecks || (type.flags & 3 /* AnyOrUnknown */) !== 0 ||
-                    isInTypeQuery(node) || node.parent.kind === 257 /* ExportSpecifier */) ||
-                node.parent.kind === 213 /* NonNullExpression */ ||
-                declaration.kind === 237 /* VariableDeclaration */ && declaration.exclamationToken ||
+                    isInTypeQuery(node) || node.parent.kind === 258 /* ExportSpecifier */) ||
+                node.parent.kind === 214 /* NonNullExpression */ ||
+                declaration.kind === 238 /* VariableDeclaration */ && declaration.exclamationToken ||
                 declaration.flags & 4194304 /* Ambient */;
             var initialType = assumeInitialized ? (isParameter ? removeOptionalityFromDeclaredType(type, declaration) : type) :
                 type === autoType || type === autoArrayType ? undefinedType :
@@ -46855,7 +47699,7 @@ var ts;
             if (languageVersion >= 2 /* ES2015 */ ||
                 (symbol.flags & (2 /* BlockScopedVariable */ | 32 /* Class */)) === 0 ||
                 ts.isSourceFile(symbol.valueDeclaration) ||
-                symbol.valueDeclaration.parent.kind === 274 /* CatchClause */) {
+                symbol.valueDeclaration.parent.kind === 275 /* CatchClause */) {
                 return;
             }
             // 1. walk from the use site up to the declaration and check
@@ -46878,7 +47722,7 @@ var ts;
                     // mark iteration statement as containing block-scoped binding captured in some function
                     var capturesBlockScopeBindingInLoopBody = true;
                     if (ts.isForStatement(container) &&
-                        ts.getAncestor(symbol.valueDeclaration, 238 /* VariableDeclarationList */).parent === container) {
+                        ts.getAncestor(symbol.valueDeclaration, 239 /* VariableDeclarationList */).parent === container) {
                         var part = getPartOfForStatementContainingNode(node.parent, container);
                         if (part) {
                             var links = getNodeLinks(part);
@@ -46896,8 +47740,8 @@ var ts;
                 }
                 // mark variables that are declared in loop initializer and reassigned inside the body of ForStatement.
                 // if body of ForStatement will be converted to function then we'll need a extra machinery to propagate reassigned values back.
-                if (container.kind === 225 /* ForStatement */ &&
-                    ts.getAncestor(symbol.valueDeclaration, 238 /* VariableDeclarationList */).parent === container &&
+                if (container.kind === 226 /* ForStatement */ &&
+                    ts.getAncestor(symbol.valueDeclaration, 239 /* VariableDeclarationList */).parent === container &&
                     isAssignedInBodyOfForStatement(node, container)) {
                     getNodeLinks(symbol.valueDeclaration).flags |= 4194304 /* NeedsLoopOutParameter */;
                 }
@@ -46915,7 +47759,7 @@ var ts;
         function isAssignedInBodyOfForStatement(node, container) {
             // skip parenthesized nodes
             var current = node;
-            while (current.parent.kind === 195 /* ParenthesizedExpression */) {
+            while (current.parent.kind === 196 /* ParenthesizedExpression */) {
                 current = current.parent;
             }
             // check if node is used as LHS in some assignment expression
@@ -46923,7 +47767,7 @@ var ts;
             if (ts.isAssignmentTarget(current)) {
                 isAssigned = true;
             }
-            else if ((current.parent.kind === 202 /* PrefixUnaryExpression */ || current.parent.kind === 203 /* PostfixUnaryExpression */)) {
+            else if ((current.parent.kind === 203 /* PrefixUnaryExpression */ || current.parent.kind === 204 /* PostfixUnaryExpression */)) {
                 var expr = current.parent;
                 isAssigned = expr.operator === 44 /* PlusPlusToken */ || expr.operator === 45 /* MinusMinusToken */;
             }
@@ -46936,7 +47780,7 @@ var ts;
         }
         function captureLexicalThis(node, container) {
             getNodeLinks(node).flags |= 2 /* LexicalThis */;
-            if (container.kind === 154 /* PropertyDeclaration */ || container.kind === 157 /* Constructor */) {
+            if (container.kind === 155 /* PropertyDeclaration */ || container.kind === 158 /* Constructor */) {
                 var classNode = container.parent;
                 getNodeLinks(classNode).flags |= 4 /* CaptureThis */;
             }
@@ -47004,37 +47848,37 @@ var ts;
             // tell whether 'this' needs to be captured.
             var container = ts.getThisContainer(node, /* includeArrowFunctions */ true);
             var capturedByArrowFunction = false;
-            if (container.kind === 157 /* Constructor */) {
+            if (container.kind === 158 /* Constructor */) {
                 checkThisBeforeSuper(node, container, ts.Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class);
             }
             // Now skip arrow functions to get the "real" owner of 'this'.
-            if (container.kind === 197 /* ArrowFunction */) {
+            if (container.kind === 198 /* ArrowFunction */) {
                 container = ts.getThisContainer(container, /* includeArrowFunctions */ false);
                 capturedByArrowFunction = true;
             }
             switch (container.kind) {
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_module_or_namespace_body);
                     // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     break;
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
                     // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     break;
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     if (isInConstructorArgumentInitializer(node, container)) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_constructor_arguments);
                         // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     }
                     break;
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     if (ts.hasModifier(container, 32 /* Static */)) {
                         error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_static_property_initializer);
                         // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
                     }
                     break;
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_computed_property_name);
                     break;
             }
@@ -47084,7 +47928,7 @@ var ts;
                 //   * /** @constructor */ function [name]() { ... }
                 //   * /** @constructor */ var x = function() { ... }
                 else if (isInJS &&
-                    (container.kind === 196 /* FunctionExpression */ || container.kind === 239 /* FunctionDeclaration */) &&
+                    (container.kind === 197 /* FunctionExpression */ || container.kind === 240 /* FunctionDeclaration */) &&
                     ts.getJSDocClassTag(container)) {
                     var classType = getJSClassType(getMergedSymbol(container.symbol));
                     if (classType) {
@@ -47120,7 +47964,7 @@ var ts;
         }
         function getClassNameFromPrototypeMethod(container) {
             // Check if it's the RHS of a x.prototype.y = function [name]() { .... }
-            if (container.kind === 196 /* FunctionExpression */ &&
+            if (container.kind === 197 /* FunctionExpression */ &&
                 ts.isBinaryExpression(container.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent) === 3 /* PrototypeProperty */) {
                 // Get the 'x' of 'x.prototype.y = container'
@@ -47130,16 +47974,16 @@ var ts;
                     .expression; // x
             }
             // x.prototype = { method() { } }
-            else if (container.kind === 156 /* MethodDeclaration */ &&
-                container.parent.kind === 188 /* ObjectLiteralExpression */ &&
+            else if (container.kind === 157 /* MethodDeclaration */ &&
+                container.parent.kind === 189 /* ObjectLiteralExpression */ &&
                 ts.isBinaryExpression(container.parent.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent.parent) === 6 /* Prototype */) {
                 return container.parent.parent.left.expression;
             }
             // x.prototype = { method: function() { } }
-            else if (container.kind === 196 /* FunctionExpression */ &&
-                container.parent.kind === 275 /* PropertyAssignment */ &&
-                container.parent.parent.kind === 188 /* ObjectLiteralExpression */ &&
+            else if (container.kind === 197 /* FunctionExpression */ &&
+                container.parent.kind === 276 /* PropertyAssignment */ &&
+                container.parent.parent.kind === 189 /* ObjectLiteralExpression */ &&
                 ts.isBinaryExpression(container.parent.parent.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent.parent.parent) === 6 /* Prototype */) {
                 return container.parent.parent.parent.left.expression;
@@ -47147,7 +47991,7 @@ var ts;
             // Object.defineProperty(x, "method", { value: function() { } });
             // Object.defineProperty(x, "method", { set: (x: () => void) => void });
             // Object.defineProperty(x, "method", { get: () => function() { }) });
-            else if (container.kind === 196 /* FunctionExpression */ &&
+            else if (container.kind === 197 /* FunctionExpression */ &&
                 ts.isPropertyAssignment(container.parent) &&
                 ts.isIdentifier(container.parent.name) &&
                 (container.parent.name.escapedText === "value" || container.parent.name.escapedText === "get" || container.parent.name.escapedText === "set") &&
@@ -47172,7 +48016,7 @@ var ts;
         }
         function getTypeForThisExpressionFromJSDoc(node) {
             var jsdocType = ts.getJSDocType(node);
-            if (jsdocType && jsdocType.kind === 294 /* JSDocFunctionType */) {
+            if (jsdocType && jsdocType.kind === 295 /* JSDocFunctionType */) {
                 var jsDocFunctionType = jsdocType;
                 if (jsDocFunctionType.parameters.length > 0 &&
                     jsDocFunctionType.parameters[0].name &&
@@ -47186,15 +48030,15 @@ var ts;
             }
         }
         function isInConstructorArgumentInitializer(node, constructorDecl) {
-            return !!ts.findAncestor(node, function (n) { return ts.isFunctionLikeDeclaration(n) ? "quit" : n.kind === 151 /* Parameter */ && n.parent === constructorDecl; });
+            return !!ts.findAncestor(node, function (n) { return ts.isFunctionLikeDeclaration(n) ? "quit" : n.kind === 152 /* Parameter */ && n.parent === constructorDecl; });
         }
         function checkSuperExpression(node) {
-            var isCallExpression = node.parent.kind === 191 /* CallExpression */ && node.parent.expression === node;
+            var isCallExpression = node.parent.kind === 192 /* CallExpression */ && node.parent.expression === node;
             var container = ts.getSuperContainer(node, /*stopOnFunctions*/ true);
             var needToCaptureLexicalThis = false;
             // adjust the container reference in case if super is used inside arrow functions with arbitrarily deep nesting
             if (!isCallExpression) {
-                while (container && container.kind === 197 /* ArrowFunction */) {
+                while (container && container.kind === 198 /* ArrowFunction */) {
                     container = ts.getSuperContainer(container, /*stopOnFunctions*/ true);
                     needToCaptureLexicalThis = languageVersion < 2 /* ES2015 */;
                 }
@@ -47207,14 +48051,14 @@ var ts;
                 // class B {
                 //     [super.foo()]() {}
                 // }
-                var current = ts.findAncestor(node, function (n) { return n === container ? "quit" : n.kind === 149 /* ComputedPropertyName */; });
-                if (current && current.kind === 149 /* ComputedPropertyName */) {
+                var current = ts.findAncestor(node, function (n) { return n === container ? "quit" : n.kind === 150 /* ComputedPropertyName */; });
+                if (current && current.kind === 150 /* ComputedPropertyName */) {
                     error(node, ts.Diagnostics.super_cannot_be_referenced_in_a_computed_property_name);
                 }
                 else if (isCallExpression) {
                     error(node, ts.Diagnostics.Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors);
                 }
-                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 188 /* ObjectLiteralExpression */)) {
+                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 189 /* ObjectLiteralExpression */)) {
                     error(node, ts.Diagnostics.super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions);
                 }
                 else {
@@ -47222,7 +48066,7 @@ var ts;
                 }
                 return errorType;
             }
-            if (!isCallExpression && container.kind === 157 /* Constructor */) {
+            if (!isCallExpression && container.kind === 158 /* Constructor */) {
                 checkThisBeforeSuper(node, container, ts.Diagnostics.super_must_be_called_before_accessing_a_property_of_super_in_the_constructor_of_a_derived_class);
             }
             if (ts.hasModifier(container, 32 /* Static */) || isCallExpression) {
@@ -47291,7 +48135,7 @@ var ts;
             // as a call expression cannot be used as the target of a destructuring assignment while a property access can.
             //
             // For element access expressions (`super[x]`), we emit a generic helper that forwards the element access in both situations.
-            if (container.kind === 156 /* MethodDeclaration */ && ts.hasModifier(container, 256 /* Async */)) {
+            if (container.kind === 157 /* MethodDeclaration */ && ts.hasModifier(container, 256 /* Async */)) {
                 if (ts.isSuperProperty(node.parent) && ts.isAssignmentTarget(node.parent)) {
                     getNodeLinks(container).flags |= 4096 /* AsyncMethodWithSuperBinding */;
                 }
@@ -47305,7 +48149,7 @@ var ts;
                 // in this case they should also use correct lexical this
                 captureLexicalThis(node.parent, container);
             }
-            if (container.parent.kind === 188 /* ObjectLiteralExpression */) {
+            if (container.parent.kind === 189 /* ObjectLiteralExpression */) {
                 if (languageVersion < 2 /* ES2015 */) {
                     error(node, ts.Diagnostics.super_is_only_allowed_in_members_of_object_literal_expressions_when_option_target_is_ES2015_or_higher);
                     return errorType;
@@ -47326,7 +48170,7 @@ var ts;
             if (!baseClassType) {
                 return errorType;
             }
-            if (container.kind === 157 /* Constructor */ && isInConstructorArgumentInitializer(node, container)) {
+            if (container.kind === 158 /* Constructor */ && isInConstructorArgumentInitializer(node, container)) {
                 // issue custom error message for super property access in constructor arguments (to be aligned with old compiler)
                 error(node, ts.Diagnostics.super_cannot_be_referenced_in_constructor_arguments);
                 return errorType;
@@ -47341,7 +48185,7 @@ var ts;
                 if (isCallExpression) {
                     // TS 1.0 SPEC (April 2014): 4.8.1
                     // Super calls are only permitted in constructors of derived classes
-                    return container.kind === 157 /* Constructor */;
+                    return container.kind === 158 /* Constructor */;
                 }
                 else {
                     // TS 1.0 SPEC (April 2014)
@@ -47349,21 +48193,21 @@ var ts;
                     // - In a constructor, instance member function, instance member accessor, or instance member variable initializer where this references a derived class instance
                     // - In a static member function or static member accessor
                     // topmost container must be something that is directly nested in the class declaration\object literal expression
-                    if (ts.isClassLike(container.parent) || container.parent.kind === 188 /* ObjectLiteralExpression */) {
+                    if (ts.isClassLike(container.parent) || container.parent.kind === 189 /* ObjectLiteralExpression */) {
                         if (ts.hasModifier(container, 32 /* Static */)) {
-                            return container.kind === 156 /* MethodDeclaration */ ||
-                                container.kind === 155 /* MethodSignature */ ||
-                                container.kind === 158 /* GetAccessor */ ||
-                                container.kind === 159 /* SetAccessor */;
+                            return container.kind === 157 /* MethodDeclaration */ ||
+                                container.kind === 156 /* MethodSignature */ ||
+                                container.kind === 159 /* GetAccessor */ ||
+                                container.kind === 160 /* SetAccessor */;
                         }
                         else {
-                            return container.kind === 156 /* MethodDeclaration */ ||
-                                container.kind === 155 /* MethodSignature */ ||
-                                container.kind === 158 /* GetAccessor */ ||
-                                container.kind === 159 /* SetAccessor */ ||
-                                container.kind === 154 /* PropertyDeclaration */ ||
-                                container.kind === 153 /* PropertySignature */ ||
-                                container.kind === 157 /* Constructor */;
+                            return container.kind === 157 /* MethodDeclaration */ ||
+                                container.kind === 156 /* MethodSignature */ ||
+                                container.kind === 159 /* GetAccessor */ ||
+                                container.kind === 160 /* SetAccessor */ ||
+                                container.kind === 155 /* PropertyDeclaration */ ||
+                                container.kind === 154 /* PropertySignature */ ||
+                                container.kind === 158 /* Constructor */;
                         }
                     }
                 }
@@ -47371,10 +48215,10 @@ var ts;
             }
         }
         function getContainingObjectLiteral(func) {
-            return (func.kind === 156 /* MethodDeclaration */ ||
-                func.kind === 158 /* GetAccessor */ ||
-                func.kind === 159 /* SetAccessor */) && func.parent.kind === 188 /* ObjectLiteralExpression */ ? func.parent :
-                func.kind === 196 /* FunctionExpression */ && func.parent.kind === 275 /* PropertyAssignment */ ? func.parent.parent :
+            return (func.kind === 157 /* MethodDeclaration */ ||
+                func.kind === 159 /* GetAccessor */ ||
+                func.kind === 160 /* SetAccessor */) && func.parent.kind === 189 /* ObjectLiteralExpression */ ? func.parent :
+                func.kind === 197 /* FunctionExpression */ && func.parent.kind === 276 /* PropertyAssignment */ ? func.parent.parent :
                     undefined;
         }
         function getThisTypeArgument(type) {
@@ -47386,7 +48230,7 @@ var ts;
             });
         }
         function getContextualThisParameterType(func) {
-            if (func.kind === 197 /* ArrowFunction */) {
+            if (func.kind === 198 /* ArrowFunction */) {
                 return undefined;
             }
             if (isContextSensitiveFunctionOrObjectLiteralMethod(func)) {
@@ -47413,7 +48257,7 @@ var ts;
                         if (thisType) {
                             return instantiateType(thisType, getMapperFromContext(getInferenceContext(containingLiteral)));
                         }
-                        if (literal.parent.kind !== 275 /* PropertyAssignment */) {
+                        if (literal.parent.kind !== 276 /* PropertyAssignment */) {
                             break;
                         }
                         literal = literal.parent.parent;
@@ -47427,9 +48271,9 @@ var ts;
                 // In an assignment of the form 'obj.xxx = function(...)' or 'obj[xxx] = function(...)', the
                 // contextual type for 'this' is 'obj'.
                 var parent = func.parent;
-                if (parent.kind === 204 /* BinaryExpression */ && parent.operatorToken.kind === 59 /* EqualsToken */) {
+                if (parent.kind === 205 /* BinaryExpression */ && parent.operatorToken.kind === 60 /* EqualsToken */) {
                     var target = parent.left;
-                    if (target.kind === 189 /* PropertyAccessExpression */ || target.kind === 190 /* ElementAccessExpression */) {
+                    if (target.kind === 190 /* PropertyAccessExpression */ || target.kind === 191 /* ElementAccessExpression */) {
                         var expression = target.expression;
                         // Don't contextually type `this` as `exports` in `exports.Point = function(x, y) { this.x = x; this.y = y; }`
                         if (inJs && ts.isIdentifier(expression)) {
@@ -47480,9 +48324,9 @@ var ts;
                 return getTypeFromTypeNode(typeNode);
             }
             switch (declaration.kind) {
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return getContextuallyTypedParameterType(declaration);
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     return getContextualTypeForBindingElement(declaration);
                 // By default, do nothing and return undefined - only parameters and binding elements have context implied by a parent
             }
@@ -47603,16 +48447,16 @@ var ts;
             return getTypeAtPosition(signature, argIndex);
         }
         function getContextualTypeForSubstitutionExpression(template, substitutionExpression) {
-            if (template.parent.kind === 193 /* TaggedTemplateExpression */) {
+            if (template.parent.kind === 194 /* TaggedTemplateExpression */) {
                 return getContextualTypeForArgument(template.parent, substitutionExpression);
             }
             return undefined;
         }
-        function getContextualTypeForBinaryOperand(node) {
+        function getContextualTypeForBinaryOperand(node, contextFlags) {
             var binaryExpression = node.parent;
             var left = binaryExpression.left, operatorToken = binaryExpression.operatorToken, right = binaryExpression.right;
             switch (operatorToken.kind) {
-                case 59 /* EqualsToken */:
+                case 60 /* EqualsToken */:
                     if (node !== right) {
                         return undefined;
                     }
@@ -47625,12 +48469,12 @@ var ts;
                     // When an || expression has a contextual type, the operands are contextually typed by that type. When an ||
                     // expression has no contextual type, the right operand is contextually typed by the type of the left operand,
                     // except for the special case of Javascript declarations of the form `namespace.prop = namespace.prop || {}`
-                    var type = getContextualType(binaryExpression);
+                    var type = getContextualType(binaryExpression, contextFlags);
                     return !type && node === right && !ts.isDefaultedExpandoInitializer(binaryExpression) ?
                         getTypeOfExpression(left) : type;
                 case 54 /* AmpersandAmpersandToken */:
                 case 27 /* CommaToken */:
-                    return node === right ? getContextualType(binaryExpression) : undefined;
+                    return node === right ? getContextualType(binaryExpression, contextFlags) : undefined;
                 default:
                     return undefined;
             }
@@ -47737,24 +48581,24 @@ var ts;
         // In an object literal contextually typed by a type T, the contextual type of a property assignment is the type of
         // the matching property in T, if one exists. Otherwise, it is the type of the numeric index signature in T, if one
         // exists. Otherwise, it is the type of the string index signature in T, if one exists.
-        function getContextualTypeForObjectLiteralMethod(node) {
+        function getContextualTypeForObjectLiteralMethod(node, contextFlags) {
             ts.Debug.assert(ts.isObjectLiteralMethod(node));
             if (node.flags & 8388608 /* InWithStatement */) {
                 // We cannot answer semantic questions within a with block, do not proceed any further
                 return undefined;
             }
-            return getContextualTypeForObjectLiteralElement(node);
+            return getContextualTypeForObjectLiteralElement(node, contextFlags);
         }
-        function getContextualTypeForObjectLiteralElement(element) {
+        function getContextualTypeForObjectLiteralElement(element, contextFlags) {
             var objectLiteral = element.parent;
-            var type = getApparentTypeOfContextualType(objectLiteral);
+            var type = getApparentTypeOfContextualType(objectLiteral, contextFlags);
             if (type) {
                 if (!hasNonBindableDynamicName(element)) {
                     // For a (non-symbol) computed property, there is no reason to look up the name
                     // in the type. It will just be "__computed", which does not appear in any
                     // SymbolTable.
-                    var symbolName_2 = getSymbolOfNode(element).escapedName;
-                    var propertyType = getTypeOfPropertyOfContextualType(type, symbolName_2);
+                    var symbolName_3 = getSymbolOfNode(element).escapedName;
+                    var propertyType = getTypeOfPropertyOfContextualType(type, symbolName_3);
                     if (propertyType) {
                         return propertyType;
                     }
@@ -47773,9 +48617,9 @@ var ts;
                 || getIteratedTypeOrElementType(arrayContextualType, /*errorNode*/ undefined, /*allowStringInput*/ false, /*allowAsyncIterables*/ false, /*checkAssignability*/ false));
         }
         // In a contextually typed conditional expression, the true/false expressions are contextually typed by the same type.
-        function getContextualTypeForConditionalOperand(node) {
+        function getContextualTypeForConditionalOperand(node, contextFlags) {
             var conditional = node.parent;
-            return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType(conditional) : undefined;
+            return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType(conditional, contextFlags) : undefined;
         }
         function getContextualTypeForChildJsxExpression(node, child) {
             var attributesType = getApparentTypeOfContextualType(node.openingElement.tagName);
@@ -47784,16 +48628,17 @@ var ts;
             if (!(attributesType && !isTypeAny(attributesType) && jsxChildrenPropertyName && jsxChildrenPropertyName !== "")) {
                 return undefined;
             }
-            var childIndex = node.children.indexOf(child);
+            var realChildren = getSemanticJsxChildren(node.children);
+            var childIndex = realChildren.indexOf(child);
             var childFieldType = getTypeOfPropertyOfContextualType(attributesType, jsxChildrenPropertyName);
-            return childFieldType && mapType(childFieldType, function (t) {
+            return childFieldType && (realChildren.length === 1 ? childFieldType : mapType(childFieldType, function (t) {
                 if (isArrayLikeType(t)) {
                     return getIndexedAccessType(t, getLiteralType(childIndex));
                 }
                 else {
                     return t;
                 }
-            }, /*noReductions*/ true);
+            }, /*noReductions*/ true));
         }
         function getContextualTypeForJsxExpression(node) {
             var exprParent = node.parent;
@@ -47827,30 +48672,30 @@ var ts;
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
                 case 14 /* NoSubstitutionTemplateLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 96 /* NullKeyword */:
-                case 72 /* Identifier */:
-                case 141 /* UndefinedKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 97 /* NullKeyword */:
+                case 73 /* Identifier */:
+                case 142 /* UndefinedKeyword */:
                     return true;
-                case 189 /* PropertyAccessExpression */:
-                case 195 /* ParenthesizedExpression */:
+                case 190 /* PropertyAccessExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isPossiblyDiscriminantValue(node.expression);
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return !node.expression || isPossiblyDiscriminantValue(node.expression);
             }
             return false;
         }
         function discriminateContextualTypeByObjectMembers(node, contextualType) {
-            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 275 /* PropertyAssignment */ && isPossiblyDiscriminantValue(p.initializer) && isDiscriminantProperty(contextualType, p.symbol.escapedName); }), function (prop) { return [function () { return checkExpression(prop.initializer); }, prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
+            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 276 /* PropertyAssignment */ && isPossiblyDiscriminantValue(p.initializer) && isDiscriminantProperty(contextualType, p.symbol.escapedName); }), function (prop) { return [function () { return checkExpression(prop.initializer); }, prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
         }
         function discriminateContextualTypeByJSXAttributes(node, contextualType) {
-            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 267 /* JsxAttribute */ && isDiscriminantProperty(contextualType, p.symbol.escapedName) && (!p.initializer || isPossiblyDiscriminantValue(p.initializer)); }), function (prop) { return [!prop.initializer ? (function () { return trueType; }) : (function () { return checkExpression(prop.initializer); }), prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
+            return discriminateTypeByDiscriminableItems(contextualType, ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 268 /* JsxAttribute */ && isDiscriminantProperty(contextualType, p.symbol.escapedName) && (!p.initializer || isPossiblyDiscriminantValue(p.initializer)); }), function (prop) { return [!prop.initializer ? (function () { return trueType; }) : (function () { return checkExpression(prop.initializer); }), prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
         }
         // Return the contextual type for a given expression node. During overload resolution, a contextual type may temporarily
         // be "pushed" onto a node using the contextualType property.
-        function getApparentTypeOfContextualType(node) {
-            var contextualType = instantiateContextualType(getContextualType(node), node);
+        function getApparentTypeOfContextualType(node, contextFlags) {
+            var contextualType = instantiateContextualType(getContextualType(node, contextFlags), node, contextFlags);
             if (contextualType) {
                 var apparentType = mapType(contextualType, getApparentType, /*noReductions*/ true);
                 if (apparentType.flags & 1048576 /* Union */) {
@@ -47866,11 +48711,22 @@ var ts;
         }
         // If the given contextual type contains instantiable types and if a mapper representing
         // return type inferences is available, instantiate those types using that mapper.
-        function instantiateContextualType(contextualType, node) {
+        function instantiateContextualType(contextualType, node, contextFlags) {
             if (contextualType && maybeTypeOfKind(contextualType, 63176704 /* Instantiable */)) {
                 var inferenceContext = getInferenceContext(node);
-                if (inferenceContext && inferenceContext.returnMapper) {
-                    return instantiateInstantiableTypes(contextualType, inferenceContext.returnMapper);
+                // If no inferences have been made, nothing is gained from instantiating as type parameters
+                // would just be replaced with their defaults similar to the apparent type.
+                if (inferenceContext && ts.some(inferenceContext.inferences, hasInferenceCandidates)) {
+                    // For contextual signatures we incorporate all inferences made so far, e.g. from return
+                    // types as well as arguments to the left in a function call.
+                    if (contextFlags && contextFlags & 1 /* Signature */) {
+                        return instantiateInstantiableTypes(contextualType, inferenceContext.nonFixingMapper);
+                    }
+                    // For other purposes (e.g. determining whether to produce literal types) we only
+                    // incorporate inferences made from the return type in a function call.
+                    if (inferenceContext.returnMapper) {
+                        return instantiateInstantiableTypes(contextualType, inferenceContext.returnMapper);
+                    }
                 }
             }
             return contextualType;
@@ -47907,7 +48763,7 @@ var ts;
          * @param node the expression whose contextual type will be returned.
          * @returns the contextual type of an expression.
          */
-        function getContextualType(node) {
+        function getContextualType(node, contextFlags) {
             if (node.flags & 8388608 /* InWithStatement */) {
                 // We cannot answer semantic questions within a with block, do not proceed any further
                 return undefined;
@@ -47917,54 +48773,54 @@ var ts;
             }
             var parent = node.parent;
             switch (parent.kind) {
-                case 237 /* VariableDeclaration */:
-                case 151 /* Parameter */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 186 /* BindingElement */:
+                case 238 /* VariableDeclaration */:
+                case 152 /* Parameter */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 187 /* BindingElement */:
                     return getContextualTypeForInitializerExpression(node);
-                case 197 /* ArrowFunction */:
-                case 230 /* ReturnStatement */:
+                case 198 /* ArrowFunction */:
+                case 231 /* ReturnStatement */:
                     return getContextualTypeForReturnExpression(node);
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return getContextualTypeForYieldOperand(parent);
-                case 201 /* AwaitExpression */:
+                case 202 /* AwaitExpression */:
                     return getContextualTypeForAwaitOperand(parent);
-                case 191 /* CallExpression */:
-                case 192 /* NewExpression */:
+                case 192 /* CallExpression */:
+                case 193 /* NewExpression */:
                     return getContextualTypeForArgument(parent, node);
-                case 194 /* TypeAssertionExpression */:
-                case 212 /* AsExpression */:
+                case 195 /* TypeAssertionExpression */:
+                case 213 /* AsExpression */:
                     return ts.isConstTypeReference(parent.type) ? undefined : getTypeFromTypeNode(parent.type);
-                case 204 /* BinaryExpression */:
-                    return getContextualTypeForBinaryOperand(node);
-                case 275 /* PropertyAssignment */:
-                case 276 /* ShorthandPropertyAssignment */:
-                    return getContextualTypeForObjectLiteralElement(parent);
-                case 277 /* SpreadAssignment */:
-                    return getApparentTypeOfContextualType(parent.parent);
-                case 187 /* ArrayLiteralExpression */: {
+                case 205 /* BinaryExpression */:
+                    return getContextualTypeForBinaryOperand(node, contextFlags);
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
+                    return getContextualTypeForObjectLiteralElement(parent, contextFlags);
+                case 278 /* SpreadAssignment */:
+                    return getApparentTypeOfContextualType(parent.parent, contextFlags);
+                case 188 /* ArrayLiteralExpression */: {
                     var arrayLiteral = parent;
-                    var type = getApparentTypeOfContextualType(arrayLiteral);
+                    var type = getApparentTypeOfContextualType(arrayLiteral, contextFlags);
                     return getContextualTypeForElementExpression(type, ts.indexOfNode(arrayLiteral.elements, node));
                 }
-                case 205 /* ConditionalExpression */:
-                    return getContextualTypeForConditionalOperand(node);
-                case 216 /* TemplateSpan */:
-                    ts.Debug.assert(parent.parent.kind === 206 /* TemplateExpression */);
+                case 206 /* ConditionalExpression */:
+                    return getContextualTypeForConditionalOperand(node, contextFlags);
+                case 217 /* TemplateSpan */:
+                    ts.Debug.assert(parent.parent.kind === 207 /* TemplateExpression */);
                     return getContextualTypeForSubstitutionExpression(parent.parent, node);
-                case 195 /* ParenthesizedExpression */: {
+                case 196 /* ParenthesizedExpression */: {
                     // Like in `checkParenthesizedExpression`, an `/** @type {xyz} */` comment before a parenthesized expression acts as a type cast.
                     var tag = ts.isInJSFile(parent) ? ts.getJSDocTypeTag(parent) : undefined;
-                    return tag ? getTypeFromTypeNode(tag.typeExpression.type) : getContextualType(parent);
+                    return tag ? getTypeFromTypeNode(tag.typeExpression.type) : getContextualType(parent, contextFlags);
                 }
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return getContextualTypeForJsxExpression(parent);
-                case 267 /* JsxAttribute */:
-                case 269 /* JsxSpreadAttribute */:
+                case 268 /* JsxAttribute */:
+                case 270 /* JsxSpreadAttribute */:
                     return getContextualTypeForJsxAttribute(parent);
-                case 262 /* JsxOpeningElement */:
-                case 261 /* JsxSelfClosingElement */:
+                case 263 /* JsxOpeningElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return getContextualJsxElementAttributesType(parent);
             }
             return undefined;
@@ -47986,7 +48842,7 @@ var ts;
             return getJsxReferenceKind(node) !== 0 /* Component */ ? getJsxPropsTypeFromCallSignature(signature, node) : getJsxPropsTypeFromClassType(signature, node);
         }
         function getJsxPropsTypeFromCallSignature(sig, context) {
-            var propsType = getTypeOfFirstParameterOfSignatureWithFallback(sig, emptyObjectType);
+            var propsType = getTypeOfFirstParameterOfSignatureWithFallback(sig, unknownType);
             propsType = getJsxManagedAttributesFromLocatedAttributes(context, getJsxNamespaceAt(context), propsType);
             var intrinsicAttribs = getJsxType(JsxNames.IntrinsicAttributes, context);
             if (intrinsicAttribs !== errorType) {
@@ -48057,7 +48913,7 @@ var ts;
             var forcedLookupLocation = getJsxElementPropertiesName(ns);
             var attributesType = forcedLookupLocation === undefined
                 // If there is no type ElementAttributesProperty, return the type of the first parameter of the signature, which should be the props type
-                ? getTypeOfFirstParameterOfSignatureWithFallback(sig, emptyObjectType)
+                ? getTypeOfFirstParameterOfSignatureWithFallback(sig, unknownType)
                 : forcedLookupLocation === ""
                     // If there is no e.g. 'props' member in ElementAttributesProperty, use the element class type instead
                     ? getReturnTypeOfSignature(sig)
@@ -48068,7 +48924,7 @@ var ts;
                 if (!!forcedLookupLocation && !!ts.length(context.attributes.properties)) {
                     error(context, ts.Diagnostics.JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property, ts.unescapeLeadingUnderscores(forcedLookupLocation));
                 }
-                return emptyObjectType;
+                return unknownType;
             }
             attributesType = getJsxManagedAttributesFromLocatedAttributes(context, ns, attributesType);
             if (isTypeAny(attributesType)) {
@@ -48119,7 +48975,7 @@ var ts;
             return !hasEffectiveRestParameter(signature) && getParameterCount(signature) < targetParameterCount;
         }
         function isFunctionExpressionOrArrowFunction(node) {
-            return node.kind === 196 /* FunctionExpression */ || node.kind === 197 /* ArrowFunction */;
+            return node.kind === 197 /* FunctionExpression */ || node.kind === 198 /* ArrowFunction */;
         }
         function getContextualSignatureForFunctionLikeDeclaration(node) {
             // Only function expressions, arrow functions, and object literal methods are contextually typed.
@@ -48127,23 +48983,20 @@ var ts;
                 ? getContextualSignature(node)
                 : undefined;
         }
-        function getContextualTypeForFunctionLikeDeclaration(node) {
-            return ts.isObjectLiteralMethod(node) ?
-                getContextualTypeForObjectLiteralMethod(node) :
-                getApparentTypeOfContextualType(node);
-        }
         // Return the contextual signature for a given expression node. A contextual type provides a
         // contextual signature if it has a single call signature and if that call signature is non-generic.
         // If the contextual type is a union type, get the signature from each type possible and if they are
         // all identical ignoring their return type, the result is same signature but with return type as
         // union type of return types from these signatures
         function getContextualSignature(node) {
-            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var typeTagSignature = getSignatureOfTypeTag(node);
             if (typeTagSignature) {
                 return typeTagSignature;
             }
-            var type = getContextualTypeForFunctionLikeDeclaration(node);
+            var type = ts.isObjectLiteralMethod(node) ?
+                getContextualTypeForObjectLiteralMethod(node, 1 /* Signature */) :
+                getApparentTypeOfContextualType(node, 1 /* Signature */);
             if (!type) {
                 return undefined;
             }
@@ -48152,8 +49005,8 @@ var ts;
             }
             var signatureList;
             var types = type.types;
-            for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
-                var current = types_15[_i];
+            for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
+                var current = types_14[_i];
                 var signature = getContextualCallSignature(current, node);
                 if (signature) {
                     if (!signatureList) {
@@ -48181,8 +49034,8 @@ var ts;
             return checkIteratedTypeOrElementType(arrayOrIterableType, node.expression, /*allowStringInput*/ false, /*allowAsyncIterables*/ false);
         }
         function hasDefaultValue(node) {
-            return (node.kind === 186 /* BindingElement */ && !!node.initializer) ||
-                (node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 59 /* EqualsToken */);
+            return (node.kind === 187 /* BindingElement */ && !!node.initializer) ||
+                (node.kind === 205 /* BinaryExpression */ && node.operatorToken.kind === 60 /* EqualsToken */);
         }
         function checkArrayLiteral(node, checkMode, forceTuple) {
             var elements = node.elements;
@@ -48194,7 +49047,7 @@ var ts;
             var inConstContext = isConstContext(node);
             for (var index = 0; index < elementCount; index++) {
                 var e = elements[index];
-                if (inDestructuringPattern && e.kind === 208 /* SpreadElement */) {
+                if (inDestructuringPattern && e.kind === 209 /* SpreadElement */) {
                     // Given the following situation:
                     //    var c: {};
                     //    [...c] = ["", 0];
@@ -48219,12 +49072,12 @@ var ts;
                     var type = checkExpressionForMutableLocation(e, checkMode, elementContextualType, forceTuple);
                     elementTypes.push(type);
                 }
-                if (index < elementCount - 1 && e.kind === 208 /* SpreadElement */) {
+                if (index < elementCount - 1 && e.kind === 209 /* SpreadElement */) {
                     hasNonEndingSpreadElement = true;
                 }
             }
             if (!hasNonEndingSpreadElement) {
-                var hasRestElement = elementCount > 0 && elements[elementCount - 1].kind === 208 /* SpreadElement */;
+                var hasRestElement = elementCount > 0 && elements[elementCount - 1].kind === 209 /* SpreadElement */;
                 var minLength = elementCount - (hasRestElement ? 1 : 0);
                 // If array literal is actually a destructuring pattern, mark it as an implied type. We do this such
                 // that we get the same behavior for "var [x, y] = []" and "[x, y] = []".
@@ -48254,15 +49107,15 @@ var ts;
                 var pattern = contextualType && contextualType.pattern;
                 // If array literal is contextually typed by a binding pattern or an assignment pattern, pad the resulting
                 // tuple type with the corresponding binding or assignment element types to make the lengths equal.
-                if (!hasRestElement && pattern && (pattern.kind === 185 /* ArrayBindingPattern */ || pattern.kind === 187 /* ArrayLiteralExpression */)) {
+                if (!hasRestElement && pattern && (pattern.kind === 186 /* ArrayBindingPattern */ || pattern.kind === 188 /* ArrayLiteralExpression */)) {
                     var patternElements = pattern.elements;
                     for (var i = elementCount; i < patternElements.length; i++) {
                         var e = patternElements[i];
                         if (hasDefaultValue(e)) {
                             elementTypes.push(contextualType.typeArguments[i]);
                         }
-                        else if (i < patternElements.length - 1 || !(e.kind === 186 /* BindingElement */ && e.dotDotDotToken || e.kind === 208 /* SpreadElement */)) {
-                            if (e.kind !== 210 /* OmittedExpression */) {
+                        else if (i < patternElements.length - 1 || !(e.kind === 187 /* BindingElement */ && e.dotDotDotToken || e.kind === 209 /* SpreadElement */)) {
+                            if (e.kind !== 211 /* OmittedExpression */) {
                                 error(e, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
                             }
                             elementTypes.push(strictNullChecks ? implicitNeverType : undefinedWideningType);
@@ -48274,9 +49127,9 @@ var ts;
         }
         function isNumericName(name) {
             switch (name.kind) {
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     return isNumericComputedName(name);
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return isNumericLiteralName(name.escapedText);
                 case 8 /* NumericLiteral */:
                 case 10 /* StringLiteral */:
@@ -48364,7 +49217,7 @@ var ts;
             var spread = emptyObjectType;
             var contextualType = getApparentTypeOfContextualType(node);
             var contextualTypeHasPattern = contextualType && contextualType.pattern &&
-                (contextualType.pattern.kind === 184 /* ObjectBindingPattern */ || contextualType.pattern.kind === 188 /* ObjectLiteralExpression */);
+                (contextualType.pattern.kind === 185 /* ObjectBindingPattern */ || contextualType.pattern.kind === 189 /* ObjectLiteralExpression */);
             var inConstContext = isConstContext(node);
             var checkFlags = inConstContext ? 8 /* Readonly */ : 0;
             var isInJavascript = ts.isInJSFile(node) && !ts.isInJsonFile(node);
@@ -48379,13 +49232,13 @@ var ts;
             for (var i = 0; i < node.properties.length; i++) {
                 var memberDecl = node.properties[i];
                 var member = getSymbolOfNode(memberDecl);
-                var computedNameType = memberDecl.name && memberDecl.name.kind === 149 /* ComputedPropertyName */ && !ts.isWellKnownSymbolSyntactically(memberDecl.name.expression) ?
+                var computedNameType = memberDecl.name && memberDecl.name.kind === 150 /* ComputedPropertyName */ && !ts.isWellKnownSymbolSyntactically(memberDecl.name.expression) ?
                     checkComputedPropertyName(memberDecl.name) : undefined;
-                if (memberDecl.kind === 275 /* PropertyAssignment */ ||
-                    memberDecl.kind === 276 /* ShorthandPropertyAssignment */ ||
+                if (memberDecl.kind === 276 /* PropertyAssignment */ ||
+                    memberDecl.kind === 277 /* ShorthandPropertyAssignment */ ||
                     ts.isObjectLiteralMethod(memberDecl)) {
-                    var type = memberDecl.kind === 275 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) :
-                        memberDecl.kind === 276 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(memberDecl.name, checkMode) :
+                    var type = memberDecl.kind === 276 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) :
+                        memberDecl.kind === 277 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(memberDecl.name, checkMode) :
                             checkObjectLiteralMethod(memberDecl, checkMode);
                     if (isInJavascript) {
                         var jsDocType = getTypeForDeclarationFromJSDocComment(memberDecl);
@@ -48400,7 +49253,7 @@ var ts;
                     objectFlags |= ts.getObjectFlags(type) & 917504 /* PropagatingFlags */;
                     var nameType = computedNameType && isTypeUsableAsPropertyName(computedNameType) ? computedNameType : undefined;
                     var prop = nameType ?
-                        createSymbol(4 /* Property */ | member.flags, getPropertyNameFromType(nameType), checkFlags | 2048 /* Late */) :
+                        createSymbol(4 /* Property */ | member.flags, getPropertyNameFromType(nameType), checkFlags | 4096 /* Late */) :
                         createSymbol(4 /* Property */ | member.flags, member.escapedName, checkFlags);
                     if (nameType) {
                         prop.nameType = nameType;
@@ -48408,8 +49261,8 @@ var ts;
                     if (inDestructuringPattern) {
                         // If object literal is an assignment pattern and if the assignment pattern specifies a default value
                         // for the property, make the property optional.
-                        var isOptional = (memberDecl.kind === 275 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
-                            (memberDecl.kind === 276 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
+                        var isOptional = (memberDecl.kind === 276 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
+                            (memberDecl.kind === 277 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
                         if (isOptional) {
                             prop.flags |= 16777216 /* Optional */;
                         }
@@ -48434,7 +49287,7 @@ var ts;
                     prop.target = member;
                     member = prop;
                 }
-                else if (memberDecl.kind === 277 /* SpreadAssignment */) {
+                else if (memberDecl.kind === 278 /* SpreadAssignment */) {
                     if (languageVersion < 2 /* ES2015 */) {
                         checkExternalEmitHelpers(memberDecl, 2 /* Assign */);
                     }
@@ -48460,7 +49313,7 @@ var ts;
                     // an ordinary function declaration(section 6.1) with no parameters.
                     // A set accessor declaration is processed in the same manner
                     // as an ordinary function declaration with a single parameter and a Void return type.
-                    ts.Debug.assert(memberDecl.kind === 158 /* GetAccessor */ || memberDecl.kind === 159 /* SetAccessor */);
+                    ts.Debug.assert(memberDecl.kind === 159 /* GetAccessor */ || memberDecl.kind === 160 /* SetAccessor */);
                     checkNodeDeferred(memberDecl);
                 }
                 if (computedNameType && !(computedNameType.flags & 8576 /* StringOrNumberLiteralOrUnique */)) {
@@ -48568,7 +49421,7 @@ var ts;
          * Returns true iff React would emit this tag name as a string rather than an identifier or qualified name
          */
         function isJsxIntrinsicIdentifier(tagName) {
-            return tagName.kind === 72 /* Identifier */ && ts.isIntrinsicJsxName(tagName.escapedText);
+            return tagName.kind === 73 /* Identifier */ && ts.isIntrinsicJsxName(tagName.escapedText);
         }
         function checkJsxAttribute(node, checkMode) {
             return node.initializer
@@ -48613,7 +49466,7 @@ var ts;
                     }
                 }
                 else {
-                    ts.Debug.assert(attributeDecl.kind === 269 /* JsxSpreadAttribute */);
+                    ts.Debug.assert(attributeDecl.kind === 270 /* JsxSpreadAttribute */);
                     if (attributesTable.size > 0) {
                         spread = getSpreadType(spread, createJsxAttributesType(), attributes.symbol, objectFlags, /*readonly*/ false);
                         attributesTable = ts.createSymbolTable();
@@ -48636,7 +49489,7 @@ var ts;
                 }
             }
             // Handle children attribute
-            var parent = openingLikeElement.parent.kind === 260 /* JsxElement */ ? openingLikeElement.parent : undefined;
+            var parent = openingLikeElement.parent.kind === 261 /* JsxElement */ ? openingLikeElement.parent : undefined;
             // We have to check that openingElement of the parent is the one we are visiting as this may not be true for selfClosingElement
             if (parent && parent.openingElement === openingLikeElement && parent.children.length > 0) {
                 var childrenTypes = checkJsxChildren(parent, checkMode);
@@ -49054,8 +49907,8 @@ var ts;
          */
         function checkPropertyAccessibility(node, isSuper, type, prop) {
             var flags = ts.getDeclarationModifierFlagsFromSymbol(prop);
-            var errorNode = node.kind === 148 /* QualifiedName */ ? node.right : node.kind === 183 /* ImportType */ ? node : node.name;
-            if (ts.getCheckFlags(prop) & 512 /* ContainsPrivate */) {
+            var errorNode = node.kind === 149 /* QualifiedName */ ? node.right : node.kind === 184 /* ImportType */ ? node : node.name;
+            if (ts.getCheckFlags(prop) & 1024 /* ContainsPrivate */) {
                 // Synthetic property with private constituent property
                 error(errorNode, ts.Diagnostics.Property_0_has_conflicting_declarations_and_is_inaccessible_in_type_1, symbolToString(prop), typeToString(type));
                 return false;
@@ -49160,7 +50013,7 @@ var ts;
             return type;
         }
         function checkNonNullType(type, node, nullDiagnostic, undefinedDiagnostic, nullOrUndefinedDiagnostic) {
-            if (type.flags & 2 /* Unknown */) {
+            if (strictNullChecks && type.flags & 2 /* Unknown */) {
                 error(node, ts.Diagnostics.Object_is_of_type_unknown);
                 return errorType;
             }
@@ -49175,6 +50028,13 @@ var ts;
             }
             return type;
         }
+        function checkNonNullNonVoidType(type, node) {
+            var nonNullType = checkNonNullType(type, node);
+            if (nonNullType !== errorType && nonNullType.flags & 16384 /* Void */) {
+                error(node, ts.Diagnostics.Object_is_possibly_undefined);
+            }
+            return nonNullType;
+        }
         function checkPropertyAccessExpression(node) {
             return checkPropertyAccessExpressionOrQualifiedName(node, node.expression, node.name);
         }
@@ -49198,7 +50058,7 @@ var ts;
                 markAliasReferenced(parentSymbol, node);
             }
             if (!prop) {
-                var indexInfo = getIndexInfoOfType(apparentType, 0 /* String */);
+                var indexInfo = assignmentKind === 0 /* None */ || !isGenericObjectType(leftType) ? getIndexInfoOfType(apparentType, 0 /* String */) : undefined;
                 if (!(indexInfo && indexInfo.type)) {
                     if (isJSLiteralType(leftType)) {
                         return anyType;
@@ -49213,7 +50073,7 @@ var ts;
                         return anyType;
                     }
                     if (right.escapedText && !checkAndReportErrorForExtendingInterface(node)) {
-                        reportNonexistentProperty(right, leftType.flags & 262144 /* TypeParameter */ && leftType.isThisType ? apparentType : leftType);
+                        reportNonexistentProperty(right, isThisTypeParameter(leftType) ? apparentType : leftType);
                     }
                     return errorType;
                 }
@@ -49224,9 +50084,9 @@ var ts;
             }
             else {
                 checkPropertyNotUsedBeforeDeclaration(prop, node, right);
-                markPropertyAsReferenced(prop, node, left.kind === 100 /* ThisKeyword */);
+                markPropertyAsReferenced(prop, node, left.kind === 101 /* ThisKeyword */);
                 getNodeLinks(node).resolvedSymbol = prop;
-                checkPropertyAccessibility(node, left.kind === 98 /* SuperKeyword */, apparentType, prop);
+                checkPropertyAccessibility(node, left.kind === 99 /* SuperKeyword */, apparentType, prop);
                 if (assignmentKind) {
                     if (isReferenceToReadonlyEntity(node, prop) || isReferenceThroughNamespaceImport(node)) {
                         error(right, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_read_only_property, ts.idText(right));
@@ -49238,7 +50098,7 @@ var ts;
             // Only compute control flow type if this is a property access expression that isn't an
             // assignment target, and the referenced property was declared as a variable, property,
             // accessor, or optional method.
-            if (node.kind !== 189 /* PropertyAccessExpression */ ||
+            if (node.kind !== 190 /* PropertyAccessExpression */ ||
                 assignmentKind === 1 /* Definite */ ||
                 prop && !(prop.flags & (3 /* Variable */ | 4 /* Property */ | 98304 /* Accessor */)) && !(prop.flags & 8192 /* Method */ && propType.flags & 1048576 /* Union */)) {
                 return propType;
@@ -49248,11 +50108,11 @@ var ts;
             // and if we are in a constructor of the same class as the property declaration, assume that
             // the property is uninitialized at the top of the control flow.
             var assumeUninitialized = false;
-            if (strictNullChecks && strictPropertyInitialization && left.kind === 100 /* ThisKeyword */) {
+            if (strictNullChecks && strictPropertyInitialization && left.kind === 101 /* ThisKeyword */) {
                 var declaration = prop && prop.valueDeclaration;
                 if (declaration && isInstancePropertyWithoutInitializer(declaration)) {
                     var flowContainer = getControlFlowContainer(node);
-                    if (flowContainer.kind === 157 /* Constructor */ && flowContainer.parent === declaration.parent) {
+                    if (flowContainer.kind === 158 /* Constructor */ && flowContainer.parent === declaration.parent) {
                         assumeUninitialized = true;
                     }
                 }
@@ -49283,8 +50143,8 @@ var ts;
                 && !isPropertyDeclaredInAncestorClass(prop)) {
                 diagnosticMessage = error(right, ts.Diagnostics.Property_0_is_used_before_its_initialization, declarationName);
             }
-            else if (valueDeclaration.kind === 240 /* ClassDeclaration */ &&
-                node.parent.kind !== 164 /* TypeReference */ &&
+            else if (valueDeclaration.kind === 241 /* ClassDeclaration */ &&
+                node.parent.kind !== 165 /* TypeReference */ &&
                 !(valueDeclaration.flags & 4194304 /* Ambient */) &&
                 !isBlockScopedNameDeclaredBeforeUse(valueDeclaration, right)) {
                 diagnosticMessage = error(right, ts.Diagnostics.Class_0_used_before_its_declaration, declarationName);
@@ -49296,22 +50156,22 @@ var ts;
         function isInPropertyInitializer(node) {
             return !!ts.findAncestor(node, function (node) {
                 switch (node.kind) {
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         return true;
-                    case 275 /* PropertyAssignment */:
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 277 /* SpreadAssignment */:
-                    case 149 /* ComputedPropertyName */:
-                    case 216 /* TemplateSpan */:
-                    case 270 /* JsxExpression */:
-                    case 267 /* JsxAttribute */:
-                    case 268 /* JsxAttributes */:
-                    case 269 /* JsxSpreadAttribute */:
-                    case 262 /* JsxOpeningElement */:
-                    case 211 /* ExpressionWithTypeArguments */:
-                    case 273 /* HeritageClause */:
+                    case 276 /* PropertyAssignment */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 278 /* SpreadAssignment */:
+                    case 150 /* ComputedPropertyName */:
+                    case 217 /* TemplateSpan */:
+                    case 271 /* JsxExpression */:
+                    case 268 /* JsxAttribute */:
+                    case 269 /* JsxAttributes */:
+                    case 270 /* JsxSpreadAttribute */:
+                    case 263 /* JsxOpeningElement */:
+                    case 212 /* ExpressionWithTypeArguments */:
+                    case 274 /* HeritageClause */:
                         return false;
                     default:
                         return ts.isExpressionNode(node) ? false : "quit";
@@ -49417,6 +50277,32 @@ var ts;
             var suggestion = getSuggestedSymbolForNonexistentModule(name, targetModule);
             return suggestion && ts.symbolName(suggestion);
         }
+        function getSuggestionForNonexistentIndexSignature(objectType, expr) {
+            // check if object type has setter or getter
+            var hasProp = function (name, argCount) {
+                if (argCount === void 0) { argCount = 1; }
+                var prop = getPropertyOfObjectType(objectType, name);
+                if (prop) {
+                    var s = getSingleCallSignature(getTypeOfSymbol(prop));
+                    if (s && getMinArgumentCount(s) === argCount && typeToString(getTypeAtPosition(s, 0)) === "string") {
+                        return true;
+                    }
+                }
+                return false;
+            };
+            var suggestedMethod = ts.isAssignmentTarget(expr) ? "set" : "get";
+            if (!hasProp(suggestedMethod)) {
+                return undefined;
+            }
+            var suggestion = ts.tryGetPropertyAccessOrIdentifierToString(expr);
+            if (suggestion === undefined) {
+                suggestion = suggestedMethod;
+            }
+            else {
+                suggestion += "." + suggestedMethod;
+            }
+            return suggestion;
+        }
         /**
          * Given a name and a list of symbols whose names are *not* equal to the name, return a spelling suggestion if there is one that is close enough.
          * Names less than length 3 only check for case-insensitive equality, not levenshtein distance.
@@ -49457,34 +50343,17 @@ var ts;
         }
         function isValidPropertyAccess(node, propertyName) {
             switch (node.kind) {
-                case 189 /* PropertyAccessExpression */:
-                    return isValidPropertyAccessWithType(node, node.expression.kind === 98 /* SuperKeyword */, propertyName, getWidenedType(checkExpression(node.expression)));
-                case 148 /* QualifiedName */:
+                case 190 /* PropertyAccessExpression */:
+                    return isValidPropertyAccessWithType(node, node.expression.kind === 99 /* SuperKeyword */, propertyName, getWidenedType(checkExpression(node.expression)));
+                case 149 /* QualifiedName */:
                     return isValidPropertyAccessWithType(node, /*isSuper*/ false, propertyName, getWidenedType(checkExpression(node.left)));
-                case 183 /* ImportType */:
+                case 184 /* ImportType */:
                     return isValidPropertyAccessWithType(node, /*isSuper*/ false, propertyName, getTypeFromTypeNode(node));
             }
         }
         function isValidPropertyAccessForCompletions(node, type, property) {
-            return isValidPropertyAccessWithType(node, node.kind === 189 /* PropertyAccessExpression */ && node.expression.kind === 98 /* SuperKeyword */, property.escapedName, type)
-                && (!(property.flags & 8192 /* Method */) || isValidMethodAccess(property, type));
-        }
-        function isValidMethodAccess(method, actualThisType) {
-            var propType = getTypeOfPropertyOfType(actualThisType, method.escapedName);
-            var signatures = getSignaturesOfType(getNonNullableType(propType), 0 /* Call */);
-            ts.Debug.assert(signatures.length !== 0);
-            return signatures.some(function (sig) {
-                var signatureThisType = getThisTypeOfSignature(sig);
-                return !signatureThisType || isTypeAssignableTo(actualThisType, getInstantiatedSignatureThisType(sig, signatureThisType, actualThisType));
-            });
-        }
-        function getInstantiatedSignatureThisType(sig, signatureThisType, actualThisType) {
-            if (!sig.typeParameters) {
-                return signatureThisType;
-            }
-            var context = createInferenceContext(sig.typeParameters, sig, 0 /* None */);
-            inferTypes(context.inferences, actualThisType, signatureThisType);
-            return instantiateType(signatureThisType, createSignatureTypeMapper(sig, getInferredTypes(context)));
+            return isValidPropertyAccessWithType(node, node.kind === 190 /* PropertyAccessExpression */ && node.expression.kind === 99 /* SuperKeyword */, property.escapedName, type);
+            // Previously we validated the 'this' type of methods but this adversely affected performance. See #31377 for more context.
         }
         function isValidPropertyAccessWithType(node, isSuper, propertyName, type) {
             if (type === errorType || isTypeAny(type)) {
@@ -49500,13 +50369,13 @@ var ts;
          */
         function getForInVariableSymbol(node) {
             var initializer = node.initializer;
-            if (initializer.kind === 238 /* VariableDeclarationList */) {
+            if (initializer.kind === 239 /* VariableDeclarationList */) {
                 var variable = initializer.declarations[0];
                 if (variable && !ts.isBindingPattern(variable.name)) {
                     return getSymbolOfNode(variable);
                 }
             }
-            else if (initializer.kind === 72 /* Identifier */) {
+            else if (initializer.kind === 73 /* Identifier */) {
                 return getResolvedSymbol(initializer);
             }
             return undefined;
@@ -49523,13 +50392,13 @@ var ts;
          */
         function isForInVariableForNumericPropertyNames(expr) {
             var e = ts.skipParentheses(expr);
-            if (e.kind === 72 /* Identifier */) {
+            if (e.kind === 73 /* Identifier */) {
                 var symbol = getResolvedSymbol(e);
                 if (symbol.flags & 3 /* Variable */) {
                     var child = expr;
                     var node = expr.parent;
                     while (node) {
-                        if (node.kind === 226 /* ForInStatement */ &&
+                        if (node.kind === 227 /* ForInStatement */ &&
                             child === node.statement &&
                             getForInVariableSymbol(node) === symbol &&
                             hasNumericPropertyNames(getTypeOfExpression(node.expression))) {
@@ -49547,7 +50416,7 @@ var ts;
             var indexExpression = node.argumentExpression;
             if (!indexExpression) {
                 var sourceFile = ts.getSourceFileOfNode(node);
-                if (node.parent.kind === 192 /* NewExpression */ && node.parent.expression === node) {
+                if (node.parent.kind === 193 /* NewExpression */ && node.parent.expression === node) {
                     var start = ts.skipTrivia(sourceFile.text, node.expression.end);
                     var end = node.end;
                     grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead);
@@ -49567,7 +50436,12 @@ var ts;
                 error(indexExpression, ts.Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
                 return errorType;
             }
-            return checkIndexedAccessIndexType(getIndexedAccessType(objectType, isForInVariableForNumericPropertyNames(indexExpression) ? numberType : indexType, node), node);
+            var effectiveIndexType = isForInVariableForNumericPropertyNames(indexExpression) ? numberType : indexType;
+            var accessFlags = ts.isAssignmentTarget(node) ?
+                2 /* Writing */ | (isGenericObjectType(objectType) && !isThisTypeParameter(objectType) ? 1 /* NoIndexSignatures */ : 0) :
+                0 /* None */;
+            var indexedAccessType = getIndexedAccessTypeOrUndefined(objectType, effectiveIndexType, node, accessFlags) || errorType;
+            return checkIndexedAccessIndexType(indexedAccessType, node);
         }
         function checkThatExpressionIsProperSymbolReference(expression, expressionType, reportError) {
             if (expressionType === errorType) {
@@ -49613,13 +50487,13 @@ var ts;
                 // This gets us diagnostics for the type arguments and marks them as referenced.
                 ts.forEach(node.typeArguments, checkSourceElement);
             }
-            if (node.kind === 193 /* TaggedTemplateExpression */) {
+            if (node.kind === 194 /* TaggedTemplateExpression */) {
                 checkExpression(node.template);
             }
             else if (ts.isJsxOpeningLikeElement(node)) {
                 checkExpression(node.attributes);
             }
-            else if (node.kind !== 152 /* Decorator */) {
+            else if (node.kind !== 153 /* Decorator */) {
                 ts.forEach(node.arguments, function (argument) {
                     checkExpression(argument);
                 });
@@ -49683,7 +50557,7 @@ var ts;
             }
         }
         function isSpreadArgument(arg) {
-            return !!arg && (arg.kind === 208 /* SpreadElement */ || arg.kind === 215 /* SyntheticExpression */ && arg.isSpread);
+            return !!arg && (arg.kind === 209 /* SpreadElement */ || arg.kind === 216 /* SyntheticExpression */ && arg.isSpread);
         }
         function getSpreadArgumentIndex(args) {
             return ts.findIndex(args, isSpreadArgument);
@@ -49697,9 +50571,9 @@ var ts;
             var callIsIncomplete = false; // In incomplete call we want to be lenient when we have too few arguments
             var effectiveParameterCount = getParameterCount(signature);
             var effectiveMinimumArguments = getMinArgumentCount(signature);
-            if (node.kind === 193 /* TaggedTemplateExpression */) {
+            if (node.kind === 194 /* TaggedTemplateExpression */) {
                 argCount = args.length;
-                if (node.template.kind === 206 /* TemplateExpression */) {
+                if (node.template.kind === 207 /* TemplateExpression */) {
                     // If a tagged template expression lacks a tail literal, the call is incomplete.
                     // Specifically, a template only can end in a TemplateTail or a Missing literal.
                     var lastSpan = ts.last(node.template.templateSpans); // we should always have at least one span.
@@ -49714,7 +50588,7 @@ var ts;
                     callIsIncomplete = !!templateLiteral.isUnterminated;
                 }
             }
-            else if (node.kind === 152 /* Decorator */) {
+            else if (node.kind === 153 /* Decorator */) {
                 argCount = getDecoratorArgumentCount(node, signature);
             }
             else if (ts.isJsxOpeningLikeElement(node)) {
@@ -49729,7 +50603,7 @@ var ts;
             else {
                 if (!node.arguments) {
                     // This only happens when we have something of the form: 'new C'
-                    ts.Debug.assert(node.kind === 192 /* NewExpression */);
+                    ts.Debug.assert(node.kind === 193 /* NewExpression */);
                     return getMinArgumentCount(signature) === 0;
                 }
                 argCount = signatureHelpTrailingComma ? args.length + 1 : args.length;
@@ -49768,11 +50642,22 @@ var ts;
         }
         // If type has a single call signature and no other members, return that signature. Otherwise, return undefined.
         function getSingleCallSignature(type) {
+            return getSingleSignature(type, 0 /* Call */, /*allowMembers*/ false);
+        }
+        function getSingleCallOrConstructSignature(type) {
+            return getSingleSignature(type, 0 /* Call */, /*allowMembers*/ false) ||
+                getSingleSignature(type, 1 /* Construct */, /*allowMembers*/ false);
+        }
+        function getSingleSignature(type, kind, allowMembers) {
             if (type.flags & 524288 /* Object */) {
                 var resolved = resolveStructuredTypeMembers(type);
-                if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 &&
-                    resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
-                    return resolved.callSignatures[0];
+                if (allowMembers || resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
+                    if (kind === 0 /* Call */ && resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0) {
+                        return resolved.callSignatures[0];
+                    }
+                    if (kind === 1 /* Construct */ && resolved.constructSignatures.length === 1 && resolved.callSignatures.length === 0) {
+                        return resolved.constructSignatures[0];
+                    }
                 }
             }
             return undefined;
@@ -49792,7 +50677,7 @@ var ts;
             });
             if (!inferenceContext) {
                 applyToReturnTypes(contextualSignature, signature, function (source, target) {
-                    inferTypes(context.inferences, source, target, 8 /* ReturnType */);
+                    inferTypes(context.inferences, source, target, 16 /* ReturnType */);
                 });
             }
             return getSignatureInstantiation(signature, getInferredTypes(context), ts.isInJSFile(contextualSignature.declaration));
@@ -49811,7 +50696,7 @@ var ts;
             // example, given a 'function wrap<T, U>(cb: (x: T) => U): (x: T) => U' and a call expression
             // 'let f: (x: string) => number = wrap(s => s.length)', we infer from the declared type of 'f' to the
             // return type of 'wrap'.
-            if (node.kind !== 152 /* Decorator */) {
+            if (node.kind !== 153 /* Decorator */) {
                 var contextualType = getContextualType(node);
                 if (contextualType) {
                     // We clone the inference context to avoid disturbing a resolution in progress for an
@@ -49832,7 +50717,7 @@ var ts;
                         instantiatedType;
                     var inferenceTargetType = getReturnTypeOfSignature(signature);
                     // Inferences made from return types have lower priority than all other inferences.
-                    inferTypes(context.inferences, inferenceSourceType, inferenceTargetType, 8 /* ReturnType */);
+                    inferTypes(context.inferences, inferenceSourceType, inferenceTargetType, 16 /* ReturnType */);
                     // Create a type mapper for instantiating generic contextual types using the inferences made
                     // from the return type.
                     context.returnMapper = getMapperFromContext(cloneInferredPartOfContext(context));
@@ -49848,7 +50733,7 @@ var ts;
             var argCount = restType ? Math.min(getParameterCount(signature) - 1, args.length) : args.length;
             for (var i = 0; i < argCount; i++) {
                 var arg = args[i];
-                if (arg.kind !== 210 /* OmittedExpression */) {
+                if (arg.kind !== 211 /* OmittedExpression */) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = checkExpressionWithContextualType(arg, paramType, context, checkMode);
                     inferTypes(context.inferences, argType, paramType);
@@ -49862,7 +50747,7 @@ var ts;
         }
         function getArrayifiedType(type) {
             if (forEachType(type, function (t) { return !(t.flags & (1 /* Any */ | 63176704 /* Instantiable */) || isArrayType(t) || isTupleType(t)); })) {
-                return createArrayType(getIndexTypeOfType(type, 1 /* Number */) || errorType);
+                return createArrayType(getIndexedAccessType(type, numberType));
             }
             return type;
         }
@@ -49872,20 +50757,20 @@ var ts;
                 if (isSpreadArgument(arg)) {
                     // We are inferring from a spread expression in the last argument position, i.e. both the parameter
                     // and the argument are ...x forms.
-                    return arg.kind === 215 /* SyntheticExpression */ ?
+                    return arg.kind === 216 /* SyntheticExpression */ ?
                         createArrayType(arg.type) :
                         getArrayifiedType(checkExpressionWithContextualType(arg.expression, restType, context, 0 /* Normal */));
                 }
             }
-            var contextualType = getIndexTypeOfType(restType, 1 /* Number */) || anyType;
-            var hasPrimitiveContextualType = maybeTypeOfKind(contextualType, 131068 /* Primitive */ | 4194304 /* Index */);
             var types = [];
             var spreadIndex = -1;
             for (var i = index; i < argCount; i++) {
+                var contextualType = getIndexedAccessType(restType, getLiteralType(i - index));
                 var argType = checkExpressionWithContextualType(args[i], contextualType, context, 0 /* Normal */);
                 if (spreadIndex < 0 && isSpreadArgument(args[i])) {
                     spreadIndex = i - index;
                 }
+                var hasPrimitiveContextualType = maybeTypeOfKind(contextualType, 131068 /* Primitive */ | 4194304 /* Index */);
                 types.push(hasPrimitiveContextualType ? getRegularTypeOfLiteralType(argType) : getWidenedLiteralType(argType));
             }
             return spreadIndex < 0 ?
@@ -49946,7 +50831,7 @@ var ts;
                 return checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors);
             }
             var thisType = getThisTypeOfSignature(signature);
-            if (thisType && thisType !== voidType && node.kind !== 192 /* NewExpression */) {
+            if (thisType && thisType !== voidType && node.kind !== 193 /* NewExpression */) {
                 // If the called expression is not of the form `x.f` or `x["f"]`, then sourceType = voidType
                 // If the signature's 'this' type is voidType, then the check is skipped -- anything is compatible.
                 // If the expression is a new expression, then the check is skipped.
@@ -49963,7 +50848,7 @@ var ts;
             var argCount = restType ? Math.min(getParameterCount(signature) - 1, args.length) : args.length;
             for (var i = 0; i < argCount; i++) {
                 var arg = args[i];
-                if (arg.kind !== 210 /* OmittedExpression */) {
+                if (arg.kind !== 211 /* OmittedExpression */) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = checkExpressionWithContextualType(arg, paramType, /*inferenceContext*/ undefined, checkMode);
                     // If one or more arguments are still excluded (as indicated by CheckMode.SkipContextSensitive),
@@ -49986,15 +50871,15 @@ var ts;
          * Returns the this argument in calls like x.f(...) and x[f](...). Undefined otherwise.
          */
         function getThisArgumentOfCall(node) {
-            if (node.kind === 191 /* CallExpression */) {
+            if (node.kind === 192 /* CallExpression */) {
                 var callee = ts.skipOuterExpressions(node.expression);
-                if (callee.kind === 189 /* PropertyAccessExpression */ || callee.kind === 190 /* ElementAccessExpression */) {
+                if (callee.kind === 190 /* PropertyAccessExpression */ || callee.kind === 191 /* ElementAccessExpression */) {
                     return callee.expression;
                 }
             }
         }
         function createSyntheticExpression(parent, type, isSpread) {
-            var result = ts.createNode(215 /* SyntheticExpression */, parent.pos, parent.end);
+            var result = ts.createNode(216 /* SyntheticExpression */, parent.pos, parent.end);
             result.parent = parent;
             result.type = type;
             result.isSpread = isSpread || false;
@@ -50004,17 +50889,17 @@ var ts;
          * Returns the effective arguments for an expression that works like a function invocation.
          */
         function getEffectiveCallArguments(node) {
-            if (node.kind === 193 /* TaggedTemplateExpression */) {
+            if (node.kind === 194 /* TaggedTemplateExpression */) {
                 var template = node.template;
-                var args_4 = [createSyntheticExpression(template, getGlobalTemplateStringsArrayType())];
-                if (template.kind === 206 /* TemplateExpression */) {
+                var args_3 = [createSyntheticExpression(template, getGlobalTemplateStringsArrayType())];
+                if (template.kind === 207 /* TemplateExpression */) {
                     ts.forEach(template.templateSpans, function (span) {
-                        args_4.push(span.expression);
+                        args_3.push(span.expression);
                     });
                 }
-                return args_4;
+                return args_3;
             }
-            if (node.kind === 152 /* Decorator */) {
+            if (node.kind === 153 /* Decorator */) {
                 return getEffectiveDecoratorArguments(node);
             }
             if (ts.isJsxOpeningLikeElement(node)) {
@@ -50027,7 +50912,7 @@ var ts;
                 // of the argument is a tuple type, spread the tuple elements into the argument list. We can
                 // call checkExpressionCached because spread expressions never have a contextual type.
                 var spreadArgument_1 = args[length - 1];
-                var type = checkExpressionCached(spreadArgument_1.expression);
+                var type = flowLoopCount ? checkExpression(spreadArgument_1.expression) : checkExpressionCached(spreadArgument_1.expression);
                 if (isTupleType(type)) {
                     var typeArguments = type.typeArguments || ts.emptyArray;
                     var restIndex_2 = type.target.hasRestElement ? typeArguments.length - 1 : -1;
@@ -50044,30 +50929,30 @@ var ts;
             var parent = node.parent;
             var expr = node.expression;
             switch (parent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     // For a class decorator, the `target` is the type of the class (e.g. the
                     // "static" or "constructor" side of the class).
                     return [
                         createSyntheticExpression(expr, getTypeOfSymbol(getSymbolOfNode(parent)))
                     ];
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     // A parameter declaration decorator will have three arguments (see
                     // `ParameterDecorator` in core.d.ts).
                     var func = parent.parent;
                     return [
-                        createSyntheticExpression(expr, parent.parent.kind === 157 /* Constructor */ ? getTypeOfSymbol(getSymbolOfNode(func)) : errorType),
+                        createSyntheticExpression(expr, parent.parent.kind === 158 /* Constructor */ ? getTypeOfSymbol(getSymbolOfNode(func)) : errorType),
                         createSyntheticExpression(expr, anyType),
                         createSyntheticExpression(expr, numberType)
                     ];
-                case 154 /* PropertyDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 155 /* PropertyDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     // A method or accessor declaration decorator will have two or three arguments (see
                     // `PropertyDecorator` and `MethodDecorator` in core.d.ts). If we are emitting decorators
                     // for ES3, we will only pass two arguments.
-                    var hasPropDesc = parent.kind !== 154 /* PropertyDeclaration */ && languageVersion !== 0 /* ES3 */;
+                    var hasPropDesc = parent.kind !== 155 /* PropertyDeclaration */ && languageVersion !== 0 /* ES3 */;
                     return [
                         createSyntheticExpression(expr, getParentTypeOfClassElement(parent)),
                         createSyntheticExpression(expr, getClassElementPropertyKeyType(parent)),
@@ -50081,17 +50966,17 @@ var ts;
          */
         function getDecoratorArgumentCount(node, signature) {
             switch (node.parent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     return 1;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return 2;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     // For ES3 or decorators with only two parameters we supply only two arguments
                     return languageVersion === 0 /* ES3 */ || signature.parameters.length <= 2 ? 2 : 3;
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return 3;
                 default:
                     return ts.Debug.fail();
@@ -50148,7 +51033,7 @@ var ts;
                 spanArray = ts.createNodeArray(args);
                 if (hasSpreadArgument && argCount) {
                     var nextArg = ts.elementAt(args, getSpreadArgumentIndex(args) + 1) || undefined;
-                    spanArray = ts.createNodeArray(args.slice(max > argCount && nextArg ? args.indexOf(nextArg) : max));
+                    spanArray = ts.createNodeArray(args.slice(max > argCount && nextArg ? args.indexOf(nextArg) : Math.min(max, args.length - 1)));
                 }
             }
             else {
@@ -50191,15 +51076,15 @@ var ts;
             return ts.createDiagnosticForNodeArray(ts.getSourceFileOfNode(node), typeArguments, ts.Diagnostics.Expected_0_type_arguments_but_got_1, belowArgCount === -Infinity ? aboveArgCount : belowArgCount, argCount);
         }
         function resolveCall(node, signatures, candidatesOutArray, checkMode, fallbackError) {
-            var isTaggedTemplate = node.kind === 193 /* TaggedTemplateExpression */;
-            var isDecorator = node.kind === 152 /* Decorator */;
+            var isTaggedTemplate = node.kind === 194 /* TaggedTemplateExpression */;
+            var isDecorator = node.kind === 153 /* Decorator */;
             var isJsxOpeningOrSelfClosingElement = ts.isJsxOpeningLikeElement(node);
             var reportErrors = !candidatesOutArray;
             var typeArguments;
             if (!isDecorator) {
                 typeArguments = node.typeArguments;
                 // We already perform checking on the type arguments on the class declaration itself.
-                if (isTaggedTemplate || isJsxOpeningOrSelfClosingElement || node.expression.kind !== 98 /* SuperKeyword */) {
+                if (isTaggedTemplate || isJsxOpeningOrSelfClosingElement || node.expression.kind !== 99 /* SuperKeyword */) {
                     ts.forEach(typeArguments, checkSourceElement);
                 }
             }
@@ -50254,7 +51139,7 @@ var ts;
             var result;
             // If we are in signature help, a trailing comma indicates that we intend to provide another argument,
             // so we will only accept overloads with arity at least 1 higher than the current number of provided arguments.
-            var signatureHelpTrailingComma = !!(checkMode & 16 /* IsForSignatureHelp */) && node.kind === 191 /* CallExpression */ && node.arguments.hasTrailingComma;
+            var signatureHelpTrailingComma = !!(checkMode & 16 /* IsForSignatureHelp */) && node.kind === 192 /* CallExpression */ && node.arguments.hasTrailingComma;
             // Section 4.12.1:
             // if the candidate list contains one or more signatures for which the type of each argument
             // expression is a subtype of each corresponding parameter type, the return type of the first
@@ -50405,7 +51290,7 @@ var ts;
             }
             var _a = ts.minAndMax(candidates, getNumNonRestParameters), minArgumentCount = _a.min, maxNonRestParam = _a.max;
             var parameters = [];
-            var _loop_8 = function (i) {
+            var _loop_11 = function (i) {
                 var symbols = ts.mapDefined(candidates, function (_a) {
                     var parameters = _a.parameters, hasRestParameter = _a.hasRestParameter;
                     return hasRestParameter ?
@@ -50416,7 +51301,7 @@ var ts;
                 parameters.push(createCombinedSymbolFromTypes(symbols, ts.mapDefined(candidates, function (candidate) { return tryGetTypeAtPosition(candidate, i); })));
             };
             for (var i = 0; i < maxNonRestParam; i++) {
-                _loop_8(i);
+                _loop_11(i);
             }
             var restParameterSymbols = ts.mapDefined(candidates, function (c) { return c.hasRestParameter ? ts.last(c.parameters) : undefined; });
             var hasRestParameter = restParameterSymbols.length !== 0;
@@ -50494,7 +51379,7 @@ var ts;
             return maxParamsIndex;
         }
         function resolveCallExpression(node, candidatesOutArray, checkMode) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 var superType = checkSuperExpression(node.expression);
                 if (isTypeAny(superType)) {
                     for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
@@ -50569,7 +51454,7 @@ var ts;
             // returns a function type, we choose to defer processing. This narrowly permits function composition
             // operators to flow inferences through return types, but otherwise processes calls right away. We
             // use the resolvingSignature singleton to indicate that we deferred processing. This result will be
-            // propagated out and eventually turned into silentNeverType (a type that is assignable to anything and
+            // propagated out and eventually turned into nonInferrableType (a type that is assignable to anything and
             // from which we never make inferences).
             if (checkMode & 8 /* SkipGenericFunctions */ && !node.typeArguments && callSignatures.some(isGenericFunctionReturningFunction)) {
                 skippedGenericFunction(node, checkMode);
@@ -50771,16 +51656,16 @@ var ts;
          */
         function getDiagnosticHeadMessageForDecoratorResolution(node) {
             switch (node.parent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression;
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression;
                 default:
                     return ts.Debug.fail();
@@ -50823,7 +51708,7 @@ var ts;
             // file would probably be preferable.
             var typeSymbol = exports && getSymbol(exports, JsxNames.Element, 67897832 /* Type */);
             var returnNode = typeSymbol && nodeBuilder.symbolToEntityName(typeSymbol, 67897832 /* Type */, node);
-            var declaration = ts.createFunctionTypeNode(/*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotdotdot*/ undefined, "props", /*questionMark*/ undefined, nodeBuilder.typeToTypeNode(result, node))], returnNode ? ts.createTypeReferenceNode(returnNode, /*typeArguments*/ undefined) : ts.createKeywordTypeNode(120 /* AnyKeyword */));
+            var declaration = ts.createFunctionTypeNode(/*typeParameters*/ undefined, [ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotdotdot*/ undefined, "props", /*questionMark*/ undefined, nodeBuilder.typeToTypeNode(result, node))], returnNode ? ts.createTypeReferenceNode(returnNode, /*typeArguments*/ undefined) : ts.createKeywordTypeNode(121 /* AnyKeyword */));
             var parameterSymbol = createSymbol(1 /* FunctionScopedVariable */, "props");
             parameterSymbol.type = result;
             return createSignature(declaration, 
@@ -50870,16 +51755,16 @@ var ts;
         }
         function resolveSignature(node, candidatesOutArray, checkMode) {
             switch (node.kind) {
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return resolveCallExpression(node, candidatesOutArray, checkMode);
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return resolveNewExpression(node, candidatesOutArray, checkMode);
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     return resolveTaggedTemplateExpression(node, candidatesOutArray, checkMode);
-                case 152 /* Decorator */:
+                case 153 /* Decorator */:
                     return resolveDecorator(node, candidatesOutArray, checkMode);
-                case 262 /* JsxOpeningElement */:
-                case 261 /* JsxSelfClosingElement */:
+                case 263 /* JsxOpeningElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return resolveJsxOpeningLikeElement(node, candidatesOutArray, checkMode);
             }
             throw ts.Debug.assertNever(node, "Branch in 'resolveSignature' should be unreachable.");
@@ -50966,10 +51851,10 @@ var ts;
                 return false;
             }
             var parent = node.parent;
-            while (parent && parent.kind === 189 /* PropertyAccessExpression */) {
+            while (parent && parent.kind === 190 /* PropertyAccessExpression */) {
                 parent = parent.parent;
             }
-            if (parent && ts.isBinaryExpression(parent) && ts.isPrototypeAccess(parent.left) && parent.operatorToken.kind === 59 /* EqualsToken */) {
+            if (parent && ts.isBinaryExpression(parent) && ts.isPrototypeAccess(parent.left) && parent.operatorToken.kind === 60 /* EqualsToken */) {
                 var right = ts.getInitializerOfBinaryExpression(parent);
                 return ts.isObjectLiteralExpression(right) && right;
             }
@@ -50992,18 +51877,18 @@ var ts;
             var signature = getResolvedSignature(node, /*candidatesOutArray*/ undefined, checkMode);
             if (signature === resolvingSignature) {
                 // CheckMode.SkipGenericFunctions is enabled and this is a call to a generic function that
-                // returns a function type. We defer checking and return anyFunctionType.
-                return silentNeverType;
+                // returns a function type. We defer checking and return nonInferrableType.
+                return nonInferrableType;
             }
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return voidType;
             }
-            if (node.kind === 192 /* NewExpression */) {
+            if (node.kind === 193 /* NewExpression */) {
                 var declaration = signature.declaration;
                 if (declaration &&
-                    declaration.kind !== 157 /* Constructor */ &&
-                    declaration.kind !== 161 /* ConstructSignature */ &&
-                    declaration.kind !== 166 /* ConstructorType */ &&
+                    declaration.kind !== 158 /* Constructor */ &&
+                    declaration.kind !== 162 /* ConstructSignature */ &&
+                    declaration.kind !== 167 /* ConstructorType */ &&
                     !ts.isJSDocConstructSignature(declaration) &&
                     !isJSConstructor(declaration)) {
                     // When resolved signature is a call signature (and not a construct signature) the result type is any
@@ -51120,9 +52005,9 @@ var ts;
                 return false;
             }
             var targetDeclarationKind = resolvedRequire.flags & 16 /* Function */
-                ? 239 /* FunctionDeclaration */
+                ? 240 /* FunctionDeclaration */
                 : resolvedRequire.flags & 3 /* Variable */
-                    ? 237 /* VariableDeclaration */
+                    ? 238 /* VariableDeclaration */
                     : 0 /* Unknown */;
             if (targetDeclarationKind !== 0 /* Unknown */) {
                 var decl = ts.getDeclarationOfKind(resolvedRequire, targetDeclarationKind);
@@ -51147,18 +52032,25 @@ var ts;
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 187 /* ArrayLiteralExpression */:
-                case 188 /* ObjectLiteralExpression */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 188 /* ArrayLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return true;
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return isValidConstAssertionArgument(node.expression);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     var op = node.operator;
                     var arg = node.operand;
                     return op === 39 /* MinusToken */ && (arg.kind === 8 /* NumericLiteral */ || arg.kind === 9 /* BigIntLiteral */) ||
                         op === 38 /* PlusToken */ && arg.kind === 8 /* NumericLiteral */;
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
+                    var expr = node.expression;
+                    if (ts.isIdentifier(expr)) {
+                        var symbol = getSymbolAtLocation(expr);
+                        return !!(symbol && (symbol.flags & 384 /* Enum */) && getEnumKind(symbol) === 1 /* Literal */);
+                    }
             }
             return false;
         }
@@ -51166,7 +52058,7 @@ var ts;
             var exprType = checkExpression(expression, checkMode);
             if (ts.isConstTypeReference(type)) {
                 if (!isValidConstAssertionArgument(expression)) {
-                    error(expression, ts.Diagnostics.A_const_assertion_can_only_be_applied_to_a_string_number_boolean_array_or_object_literal);
+                    error(expression, ts.Diagnostics.A_const_assertions_can_only_be_applied_to_references_to_enum_members_or_string_number_boolean_array_or_object_literals);
                 }
                 return getRegularTypeOfLiteralType(exprType);
             }
@@ -51186,10 +52078,10 @@ var ts;
         }
         function checkMetaProperty(node) {
             checkGrammarMetaProperty(node);
-            if (node.keywordToken === 95 /* NewKeyword */) {
+            if (node.keywordToken === 96 /* NewKeyword */) {
                 return checkNewTargetMetaProperty(node);
             }
-            if (node.keywordToken === 92 /* ImportKeyword */) {
+            if (node.keywordToken === 93 /* ImportKeyword */) {
                 return checkImportMetaProperty(node);
             }
             return ts.Debug.assertNever(node.keywordToken);
@@ -51200,7 +52092,7 @@ var ts;
                 error(node, ts.Diagnostics.Meta_property_0_is_only_allowed_in_the_body_of_a_function_declaration_function_expression_or_constructor, "new.target");
                 return errorType;
             }
-            else if (container.kind === 157 /* Constructor */) {
+            else if (container.kind === 158 /* Constructor */) {
                 var symbol = getSymbolOfNode(container.parent);
                 return getTypeOfSymbol(symbol);
             }
@@ -51210,7 +52102,7 @@ var ts;
             }
         }
         function checkImportMetaProperty(node) {
-            if (languageVersion < 7 /* ESNext */ || moduleKind < ts.ModuleKind.ESNext) {
+            if (languageVersion < 8 /* ESNext */ || moduleKind < ts.ModuleKind.ESNext) {
                 error(node, ts.Diagnostics.The_import_meta_meta_property_is_only_allowed_using_ESNext_for_the_target_and_module_compiler_options);
             }
             var file = ts.getSourceFileOfNode(node);
@@ -51386,7 +52278,7 @@ var ts;
             for (var _i = 0, _a = pattern.elements; _i < _a.length; _i++) {
                 var element = _a[_i];
                 if (!ts.isOmittedExpression(element)) {
-                    if (element.name.kind === 72 /* Identifier */) {
+                    if (element.name.kind === 73 /* Identifier */) {
                         getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
                     }
                     else {
@@ -51400,9 +52292,9 @@ var ts;
             if (!links.type) {
                 links.type = contextualType;
                 var decl = parameter.valueDeclaration;
-                if (decl.name.kind !== 72 /* Identifier */) {
+                if (decl.name.kind !== 73 /* Identifier */) {
                     // if inference didn't come up with anything but {}, fall back to the binding pattern if present.
-                    if (links.type === emptyObjectType) {
+                    if (links.type === unknownType) {
                         links.type = getTypeFromBindingPattern(decl.name);
                     }
                     assignBindingElementTypes(decl.name);
@@ -51414,24 +52306,24 @@ var ts;
             var globalPromiseType = getGlobalPromiseType(/*reportErrors*/ true);
             if (globalPromiseType !== emptyGenericType) {
                 // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
-                promisedType = getAwaitedType(promisedType) || emptyObjectType;
+                promisedType = getAwaitedType(promisedType) || unknownType;
                 return createTypeReference(globalPromiseType, [promisedType]);
             }
-            return emptyObjectType;
+            return unknownType;
         }
         function createPromiseLikeType(promisedType) {
             // creates a `PromiseLike<T>` type where `T` is the promisedType argument
             var globalPromiseLikeType = getGlobalPromiseLikeType(/*reportErrors*/ true);
             if (globalPromiseLikeType !== emptyGenericType) {
                 // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
-                promisedType = getAwaitedType(promisedType) || emptyObjectType;
+                promisedType = getAwaitedType(promisedType) || unknownType;
                 return createTypeReference(globalPromiseLikeType, [promisedType]);
             }
-            return emptyObjectType;
+            return unknownType;
         }
         function createPromiseReturnType(func, promisedType) {
             var promiseType = createPromiseType(promisedType);
-            if (promiseType === emptyObjectType) {
+            if (promiseType === unknownType) {
                 error(func, ts.isImportCall(func) ?
                     ts.Diagnostics.A_dynamic_import_call_returns_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option :
                     ts.Diagnostics.An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option);
@@ -51450,7 +52342,7 @@ var ts;
             }
             var functionFlags = ts.getFunctionFlags(func);
             var type;
-            if (func.body.kind !== 218 /* Block */) {
+            if (func.body.kind !== 219 /* Block */) {
                 type = checkExpressionCached(func.body, checkMode && checkMode & ~8 /* SkipGenericFunctions */);
                 if (functionFlags & 2 /* Async */) {
                     // From within an async function you can return either a non-promise value or a promise. Any
@@ -51592,7 +52484,7 @@ var ts;
             if (!node.possiblyExhaustive) {
                 return false;
             }
-            if (node.expression.kind === 199 /* TypeOfExpression */) {
+            if (node.expression.kind === 200 /* TypeOfExpression */) {
                 var operandType = getTypeOfExpression(node.expression.expression);
                 // This cast is safe because the switch is possibly exhaustive and does not contain a default case, so there can be no undefined.
                 var witnesses = getSwitchClauseTypeOfWitnesses(node);
@@ -51615,7 +52507,7 @@ var ts;
             if (!(func.flags & 128 /* HasImplicitReturn */)) {
                 return false;
             }
-            if (ts.some(func.body.statements, function (statement) { return statement.kind === 232 /* SwitchStatement */ && isExhaustiveSwitchStatement(statement); })) {
+            if (ts.some(func.body.statements, function (statement) { return statement.kind === 233 /* SwitchStatement */ && isExhaustiveSwitchStatement(statement); })) {
                 return false;
             }
             return true;
@@ -51658,11 +52550,11 @@ var ts;
         }
         function mayReturnNever(func) {
             switch (func.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return true;
-                case 156 /* MethodDeclaration */:
-                    return func.parent.kind === 188 /* ObjectLiteralExpression */;
+                case 157 /* MethodDeclaration */:
+                    return func.parent.kind === 189 /* ObjectLiteralExpression */;
                 default:
                     return false;
             }
@@ -51686,7 +52578,7 @@ var ts;
             }
             // If all we have is a function signature, or an arrow function with an expression body, then there is nothing to check.
             // also if HasImplicitReturn flag is not set this means that all codepaths in function body end with return or throw
-            if (func.kind === 155 /* MethodSignature */ || ts.nodeIsMissing(func.body) || func.body.kind !== 218 /* Block */ || !functionHasImplicitReturn(func)) {
+            if (func.kind === 156 /* MethodSignature */ || ts.nodeIsMissing(func.body) || func.body.kind !== 219 /* Block */ || !functionHasImplicitReturn(func)) {
                 return;
             }
             var hasExplicitReturn = func.flags & 256 /* HasExplicitReturn */;
@@ -51719,7 +52611,7 @@ var ts;
             }
         }
         function checkFunctionExpressionOrObjectLiteralMethod(node, checkMode) {
-            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             checkNodeDeferred(node);
             // The identityMapper object is used to indicate that function expressions are wildcards
             if (checkMode && checkMode & 4 /* SkipContextSensitive */ && isContextSensitive(node)) {
@@ -51732,14 +52624,14 @@ var ts;
                     var returnType = getReturnTypeFromBody(node, checkMode);
                     var returnOnlySignature = createSignature(undefined, undefined, undefined, ts.emptyArray, returnType, /*resolvedTypePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasLiteralTypes*/ false);
                     var returnOnlyType = createAnonymousType(node.symbol, emptySymbols, [returnOnlySignature], ts.emptyArray, undefined, undefined);
-                    returnOnlyType.objectFlags |= 524288 /* ContainsAnyFunctionType */;
+                    returnOnlyType.objectFlags |= 524288 /* NonInferrableType */;
                     return links_1.contextFreeType = returnOnlyType;
                 }
                 return anyFunctionType;
             }
             // Grammar checking
             var hasGrammarError = checkGrammarFunctionLikeDeclaration(node);
-            if (!hasGrammarError && node.kind === 196 /* FunctionExpression */) {
+            if (!hasGrammarError && node.kind === 197 /* FunctionExpression */) {
                 checkGrammarForGenerator(node);
             }
             var links = getNodeLinks(node);
@@ -51784,7 +52676,7 @@ var ts;
                 getAwaitedType(type) || errorType : type;
         }
         function checkFunctionExpressionOrObjectLiteralMethodDeferred(node) {
-            ts.Debug.assert(node.kind !== 156 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 157 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var functionFlags = ts.getFunctionFlags(node);
             var returnOrPromisedType = getReturnOrPromisedType(node, functionFlags);
             if ((functionFlags & 1 /* Generator */) === 0) { // Async function or normal function
@@ -51800,7 +52692,7 @@ var ts;
                     // checkFunctionExpressionBodies). So it must be done now.
                     getReturnTypeOfSignature(getSignatureFromDeclaration(node));
                 }
-                if (node.body.kind === 218 /* Block */) {
+                if (node.body.kind === 219 /* Block */) {
                     checkSourceElement(node.body);
                 }
                 else {
@@ -51878,11 +52770,11 @@ var ts;
             if (isReadonlySymbol(symbol)) {
                 // Allow assignments to readonly properties within constructors of the same class declaration.
                 if (symbol.flags & 4 /* Property */ &&
-                    (expr.kind === 189 /* PropertyAccessExpression */ || expr.kind === 190 /* ElementAccessExpression */) &&
-                    expr.expression.kind === 100 /* ThisKeyword */) {
+                    (expr.kind === 190 /* PropertyAccessExpression */ || expr.kind === 191 /* ElementAccessExpression */) &&
+                    expr.expression.kind === 101 /* ThisKeyword */) {
                     // Look for if this is the constructor for the class that `symbol` is a property of.
                     var func = ts.getContainingFunction(expr);
-                    if (!(func && func.kind === 157 /* Constructor */)) {
+                    if (!(func && func.kind === 158 /* Constructor */)) {
                         return true;
                     }
                     // If func.parent is a class and symbol is a (readonly) property of that class, or
@@ -51895,13 +52787,13 @@ var ts;
             return false;
         }
         function isReferenceThroughNamespaceImport(expr) {
-            if (expr.kind === 189 /* PropertyAccessExpression */ || expr.kind === 190 /* ElementAccessExpression */) {
+            if (expr.kind === 190 /* PropertyAccessExpression */ || expr.kind === 191 /* ElementAccessExpression */) {
                 var node = ts.skipParentheses(expr.expression);
-                if (node.kind === 72 /* Identifier */) {
+                if (node.kind === 73 /* Identifier */) {
                     var symbol = getNodeLinks(node).resolvedSymbol;
                     if (symbol.flags & 2097152 /* Alias */) {
                         var declaration = getDeclarationOfAliasSymbol(symbol);
-                        return !!declaration && declaration.kind === 251 /* NamespaceImport */;
+                        return !!declaration && declaration.kind === 252 /* NamespaceImport */;
                     }
                 }
             }
@@ -51910,7 +52802,7 @@ var ts;
         function checkReferenceExpression(expr, invalidReferenceMessage) {
             // References are combinations of identifiers, parentheses, and property accesses.
             var node = ts.skipOuterExpressions(expr, 2 /* Assertions */ | 1 /* Parentheses */);
-            if (node.kind !== 72 /* Identifier */ && node.kind !== 189 /* PropertyAccessExpression */ && node.kind !== 190 /* ElementAccessExpression */) {
+            if (node.kind !== 73 /* Identifier */ && node.kind !== 190 /* PropertyAccessExpression */ && node.kind !== 191 /* ElementAccessExpression */) {
                 error(expr, invalidReferenceMessage);
                 return false;
             }
@@ -51919,7 +52811,7 @@ var ts;
         function checkDeleteExpression(node) {
             checkExpression(node.expression);
             var expr = ts.skipParentheses(node.expression);
-            if (expr.kind !== 189 /* PropertyAccessExpression */ && expr.kind !== 190 /* ElementAccessExpression */) {
+            if (expr.kind !== 190 /* PropertyAccessExpression */ && expr.kind !== 191 /* ElementAccessExpression */) {
                 error(expr, ts.Diagnostics.The_operand_of_a_delete_operator_must_be_a_property_reference);
                 return booleanType;
             }
@@ -51942,7 +52834,19 @@ var ts;
             // Grammar checking
             if (produceDiagnostics) {
                 if (!(node.flags & 16384 /* AwaitContext */)) {
-                    grammarErrorOnFirstToken(node, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
+                    // use of 'await' in non-async function
+                    var sourceFile = ts.getSourceFileOfNode(node);
+                    if (!hasParseDiagnostics(sourceFile)) {
+                        var span = ts.getSpanOfTokenAtPosition(sourceFile, node.pos);
+                        var diagnostic = ts.createFileDiagnostic(sourceFile, span.start, span.length, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
+                        var func = ts.getContainingFunction(node);
+                        if (func && func.kind !== 158 /* Constructor */) {
+                            ts.Debug.assert((ts.getFunctionFlags(func) & 2 /* Async */) === 0, "Enclosing function should never be an async function.");
+                            var relatedInfo = ts.createDiagnosticForNode(func, ts.Diagnostics.Did_you_mean_to_mark_this_function_as_async);
+                            ts.addRelatedInfo(diagnostic, relatedInfo);
+                        }
+                        diagnostics.add(diagnostic);
+                    }
                 }
                 if (isInParameterInitializerBeforeContainingFunction(node)) {
                     error(node, ts.Diagnostics.await_expressions_cannot_be_used_in_a_parameter_initializer);
@@ -52034,8 +52938,8 @@ var ts;
             }
             if (type.flags & 3145728 /* UnionOrIntersection */) {
                 var types = type.types;
-                for (var _i = 0, types_16 = types; _i < types_16.length; _i++) {
-                    var t = types_16[_i];
+                for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
+                    var t = types_15[_i];
                     if (maybeTypeOfKind(t, kind)) {
                         return true;
                     }
@@ -52114,16 +53018,17 @@ var ts;
             if (strictNullChecks && properties.length === 0) {
                 return checkNonNullType(sourceType, node);
             }
-            for (var _i = 0, properties_6 = properties; _i < properties_6.length; _i++) {
-                var p = properties_6[_i];
-                checkObjectLiteralDestructuringPropertyAssignment(sourceType, p, properties, rightIsThis);
+            for (var i = 0; i < properties.length; i++) {
+                checkObjectLiteralDestructuringPropertyAssignment(node, sourceType, i, properties, rightIsThis);
             }
             return sourceType;
         }
         /** Note: If property cannot be a SpreadAssignment, then allProperties does not need to be provided */
-        function checkObjectLiteralDestructuringPropertyAssignment(objectLiteralType, property, allProperties, rightIsThis) {
+        function checkObjectLiteralDestructuringPropertyAssignment(node, objectLiteralType, propertyIndex, allProperties, rightIsThis) {
             if (rightIsThis === void 0) { rightIsThis = false; }
-            if (property.kind === 275 /* PropertyAssignment */ || property.kind === 276 /* ShorthandPropertyAssignment */) {
+            var properties = node.properties;
+            var property = properties[propertyIndex];
+            if (property.kind === 276 /* PropertyAssignment */ || property.kind === 277 /* ShorthandPropertyAssignment */) {
                 var name = property.name;
                 var exprType = getLiteralTypeFromPropertyName(name);
                 if (isTypeUsableAsPropertyName(exprType)) {
@@ -52136,21 +53041,29 @@ var ts;
                 }
                 var elementType = getIndexedAccessType(objectLiteralType, exprType, name);
                 var type = getFlowTypeOfDestructuring(property, elementType);
-                return checkDestructuringAssignment(property.kind === 276 /* ShorthandPropertyAssignment */ ? property : property.initializer, type);
+                return checkDestructuringAssignment(property.kind === 277 /* ShorthandPropertyAssignment */ ? property : property.initializer, type);
             }
-            else if (property.kind === 277 /* SpreadAssignment */) {
-                if (languageVersion < 7 /* ESNext */) {
-                    checkExternalEmitHelpers(property, 4 /* Rest */);
+            else if (property.kind === 278 /* SpreadAssignment */) {
+                if (propertyIndex < properties.length - 1) {
+                    error(property, ts.Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern);
                 }
-                var nonRestNames = [];
-                if (allProperties) {
-                    for (var i = 0; i < allProperties.length - 1; i++) {
-                        nonRestNames.push(allProperties[i].name);
+                else {
+                    if (languageVersion < 8 /* ESNext */) {
+                        checkExternalEmitHelpers(property, 4 /* Rest */);
+                    }
+                    var nonRestNames = [];
+                    if (allProperties) {
+                        for (var _i = 0, allProperties_1 = allProperties; _i < allProperties_1.length; _i++) {
+                            var otherProperty = allProperties_1[_i];
+                            if (!ts.isSpreadAssignment(otherProperty)) {
+                                nonRestNames.push(otherProperty.name);
+                            }
+                        }
                     }
+                    var type = getRestType(objectLiteralType, nonRestNames, objectLiteralType.symbol);
+                    checkGrammarForDisallowedTrailingComma(allProperties, ts.Diagnostics.A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma);
+                    return checkDestructuringAssignment(property.expression, type);
                 }
-                var type = getRestType(objectLiteralType, nonRestNames, objectLiteralType.symbol);
-                checkGrammarForDisallowedTrailingComma(allProperties, ts.Diagnostics.A_rest_parameter_or_binding_pattern_may_not_have_a_trailing_comma);
-                return checkDestructuringAssignment(property.expression, type);
             }
             else {
                 error(property, ts.Diagnostics.Property_assignment_expected);
@@ -52173,8 +53086,8 @@ var ts;
         function checkArrayLiteralDestructuringElementAssignment(node, sourceType, elementIndex, elementType, checkMode) {
             var elements = node.elements;
             var element = elements[elementIndex];
-            if (element.kind !== 210 /* OmittedExpression */) {
-                if (element.kind !== 208 /* SpreadElement */) {
+            if (element.kind !== 211 /* OmittedExpression */) {
+                if (element.kind !== 209 /* SpreadElement */) {
                     var indexType = getLiteralType(elementIndex);
                     if (isArrayLikeType(sourceType)) {
                         // We create a synthetic expression so that getIndexedAccessType doesn't get confused
@@ -52190,7 +53103,7 @@ var ts;
                 }
                 else {
                     var restExpression = element.expression;
-                    if (restExpression.kind === 204 /* BinaryExpression */ && restExpression.operatorToken.kind === 59 /* EqualsToken */) {
+                    if (restExpression.kind === 205 /* BinaryExpression */ && restExpression.operatorToken.kind === 60 /* EqualsToken */) {
                         error(restExpression.operatorToken, ts.Diagnostics.A_rest_element_cannot_have_an_initializer);
                     }
                     else {
@@ -52206,7 +53119,7 @@ var ts;
         }
         function checkDestructuringAssignment(exprOrAssignment, sourceType, checkMode, rightIsThis) {
             var target;
-            if (exprOrAssignment.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (exprOrAssignment.kind === 277 /* ShorthandPropertyAssignment */) {
                 var prop = exprOrAssignment;
                 if (prop.objectAssignmentInitializer) {
                     // In strict null checking mode, if a default value of a non-undefined type is specified, remove
@@ -52222,21 +53135,21 @@ var ts;
             else {
                 target = exprOrAssignment;
             }
-            if (target.kind === 204 /* BinaryExpression */ && target.operatorToken.kind === 59 /* EqualsToken */) {
+            if (target.kind === 205 /* BinaryExpression */ && target.operatorToken.kind === 60 /* EqualsToken */) {
                 checkBinaryExpression(target, checkMode);
                 target = target.left;
             }
-            if (target.kind === 188 /* ObjectLiteralExpression */) {
+            if (target.kind === 189 /* ObjectLiteralExpression */) {
                 return checkObjectLiteralAssignment(target, sourceType, rightIsThis);
             }
-            if (target.kind === 187 /* ArrayLiteralExpression */) {
+            if (target.kind === 188 /* ArrayLiteralExpression */) {
                 return checkArrayLiteralAssignment(target, sourceType, checkMode);
             }
             return checkReferenceAssignment(target, sourceType, checkMode);
         }
         function checkReferenceAssignment(target, sourceType, checkMode) {
             var targetType = checkExpression(target, checkMode);
-            var error = target.parent.kind === 277 /* SpreadAssignment */ ?
+            var error = target.parent.kind === 278 /* SpreadAssignment */ ?
                 ts.Diagnostics.The_target_of_an_object_rest_assignment_must_be_a_variable_or_a_property_access :
                 ts.Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access;
             if (checkReferenceExpression(target, error)) {
@@ -52255,39 +53168,39 @@ var ts;
         function isSideEffectFree(node) {
             node = ts.skipParentheses(node);
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                 case 10 /* StringLiteral */:
                 case 13 /* RegularExpressionLiteral */:
-                case 193 /* TaggedTemplateExpression */:
-                case 206 /* TemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
+                case 207 /* TemplateExpression */:
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 96 /* NullKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 196 /* FunctionExpression */:
-                case 209 /* ClassExpression */:
-                case 197 /* ArrowFunction */:
-                case 187 /* ArrayLiteralExpression */:
-                case 188 /* ObjectLiteralExpression */:
-                case 199 /* TypeOfExpression */:
-                case 213 /* NonNullExpression */:
-                case 261 /* JsxSelfClosingElement */:
-                case 260 /* JsxElement */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 97 /* NullKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 197 /* FunctionExpression */:
+                case 210 /* ClassExpression */:
+                case 198 /* ArrowFunction */:
+                case 188 /* ArrayLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
+                case 200 /* TypeOfExpression */:
+                case 214 /* NonNullExpression */:
+                case 262 /* JsxSelfClosingElement */:
+                case 261 /* JsxElement */:
                     return true;
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     return isSideEffectFree(node.whenTrue) &&
                         isSideEffectFree(node.whenFalse);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     if (ts.isAssignmentOperator(node.operatorToken.kind)) {
                         return false;
                     }
                     return isSideEffectFree(node.left) &&
                         isSideEffectFree(node.right);
-                case 202 /* PrefixUnaryExpression */:
-                case 203 /* PostfixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     // Unary operators ~, !, +, and - have no side effects.
                     // The rest do.
                     switch (node.operator) {
@@ -52299,9 +53212,9 @@ var ts;
                     }
                     return false;
                 // Some forms listed here for clarity
-                case 200 /* VoidExpression */: // Explicit opt-out
-                case 194 /* TypeAssertionExpression */: // Not SEF, but can produce useful type warnings
-                case 212 /* AsExpression */: // Not SEF, but can produce useful type warnings
+                case 201 /* VoidExpression */: // Explicit opt-out
+                case 195 /* TypeAssertionExpression */: // Not SEF, but can produce useful type warnings
+                case 213 /* AsExpression */: // Not SEF, but can produce useful type warnings
                 default:
                     return false;
             }
@@ -52317,8 +53230,8 @@ var ts;
         }
         function checkBinaryLikeExpression(left, operatorToken, right, checkMode, errorNode) {
             var operator = operatorToken.kind;
-            if (operator === 59 /* EqualsToken */ && (left.kind === 188 /* ObjectLiteralExpression */ || left.kind === 187 /* ArrayLiteralExpression */)) {
-                return checkDestructuringAssignment(left, checkExpression(right, checkMode), checkMode, right.kind === 100 /* ThisKeyword */);
+            if (operator === 60 /* EqualsToken */ && (left.kind === 189 /* ObjectLiteralExpression */ || left.kind === 188 /* ArrayLiteralExpression */)) {
+                return checkDestructuringAssignment(left, checkExpression(right, checkMode), checkMode, right.kind === 101 /* ThisKeyword */);
             }
             var leftType;
             if (operator === 54 /* AmpersandAmpersandToken */ || operator === 55 /* BarBarToken */) {
@@ -52331,26 +53244,26 @@ var ts;
             switch (operator) {
                 case 40 /* AsteriskToken */:
                 case 41 /* AsteriskAsteriskToken */:
-                case 62 /* AsteriskEqualsToken */:
-                case 63 /* AsteriskAsteriskEqualsToken */:
+                case 63 /* AsteriskEqualsToken */:
+                case 64 /* AsteriskAsteriskEqualsToken */:
                 case 42 /* SlashToken */:
-                case 64 /* SlashEqualsToken */:
+                case 65 /* SlashEqualsToken */:
                 case 43 /* PercentToken */:
-                case 65 /* PercentEqualsToken */:
+                case 66 /* PercentEqualsToken */:
                 case 39 /* MinusToken */:
-                case 61 /* MinusEqualsToken */:
+                case 62 /* MinusEqualsToken */:
                 case 46 /* LessThanLessThanToken */:
-                case 66 /* LessThanLessThanEqualsToken */:
+                case 67 /* LessThanLessThanEqualsToken */:
                 case 47 /* GreaterThanGreaterThanToken */:
-                case 67 /* GreaterThanGreaterThanEqualsToken */:
+                case 68 /* GreaterThanGreaterThanEqualsToken */:
                 case 48 /* GreaterThanGreaterThanGreaterThanToken */:
-                case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
                 case 50 /* BarToken */:
-                case 70 /* BarEqualsToken */:
+                case 71 /* BarEqualsToken */:
                 case 51 /* CaretToken */:
-                case 71 /* CaretEqualsToken */:
+                case 72 /* CaretEqualsToken */:
                 case 49 /* AmpersandToken */:
-                case 69 /* AmpersandEqualsToken */:
+                case 70 /* AmpersandEqualsToken */:
                     if (leftType === silentNeverType || rightType === silentNeverType) {
                         return silentNeverType;
                     }
@@ -52380,7 +53293,7 @@ var ts;
                         else if (isTypeAssignableToKind(leftType, 2112 /* BigIntLike */) && isTypeAssignableToKind(rightType, 2112 /* BigIntLike */)) {
                             switch (operator) {
                                 case 48 /* GreaterThanGreaterThanGreaterThanToken */:
-                                case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                                case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
                                     reportOperatorError();
                             }
                             resultType_1 = bigintType;
@@ -52395,7 +53308,7 @@ var ts;
                         return resultType_1;
                     }
                 case 38 /* PlusToken */:
-                case 60 /* PlusEqualsToken */:
+                case 61 /* PlusEqualsToken */:
                     if (leftType === silentNeverType || rightType === silentNeverType) {
                         return silentNeverType;
                     }
@@ -52430,7 +53343,7 @@ var ts;
                         reportOperatorError();
                         return anyType;
                     }
-                    if (operator === 60 /* PlusEqualsToken */) {
+                    if (operator === 61 /* PlusEqualsToken */) {
                         checkAssignmentOperator(resultType);
                     }
                     return resultType;
@@ -52451,19 +53364,13 @@ var ts;
                 case 34 /* ExclamationEqualsToken */:
                 case 35 /* EqualsEqualsEqualsToken */:
                 case 36 /* ExclamationEqualsEqualsToken */:
-                    var leftIsLiteral = isLiteralType(leftType);
-                    var rightIsLiteral = isLiteralType(rightType);
-                    if (!leftIsLiteral || !rightIsLiteral) {
-                        leftType = leftIsLiteral ? getBaseTypeOfLiteralType(leftType) : leftType;
-                        rightType = rightIsLiteral ? getBaseTypeOfLiteralType(rightType) : rightType;
-                    }
                     if (!isTypeEqualityComparableTo(leftType, rightType) && !isTypeEqualityComparableTo(rightType, leftType)) {
                         reportOperatorError();
                     }
                     return booleanType;
-                case 94 /* InstanceOfKeyword */:
+                case 95 /* InstanceOfKeyword */:
                     return checkInstanceOfExpression(left, right, leftType, rightType);
-                case 93 /* InKeyword */:
+                case 94 /* InKeyword */:
                     return checkInExpression(left, right, leftType, rightType);
                 case 54 /* AmpersandAmpersandToken */:
                     return getTypeFacts(leftType) & 4194304 /* Truthy */ ?
@@ -52473,7 +53380,7 @@ var ts;
                     return getTypeFacts(leftType) & 8388608 /* Falsy */ ?
                         getUnionType([removeDefinitelyFalsyTypes(leftType), rightType], 2 /* Subtype */) :
                         leftType;
-                case 59 /* EqualsToken */:
+                case 60 /* EqualsToken */:
                     var declKind = ts.isBinaryExpression(left.parent) ? ts.getAssignmentDeclarationKind(left.parent) : 0 /* None */;
                     checkAssignmentDeclaration(declKind, rightType);
                     if (isAssignmentDeclaration(declKind)) {
@@ -52517,7 +53424,7 @@ var ts;
                 }
             }
             function isEvalNode(node) {
-                return node.kind === 72 /* Identifier */ && node.escapedText === "eval";
+                return node.kind === 73 /* Identifier */ && node.escapedText === "eval";
             }
             // Return true if there was no error, false if there was an error.
             function checkForDisallowedESSymbolOperand(operator) {
@@ -52533,13 +53440,13 @@ var ts;
             function getSuggestedBooleanOperator(operator) {
                 switch (operator) {
                     case 50 /* BarToken */:
-                    case 70 /* BarEqualsToken */:
+                    case 71 /* BarEqualsToken */:
                         return 55 /* BarBarToken */;
                     case 51 /* CaretToken */:
-                    case 71 /* CaretEqualsToken */:
+                    case 72 /* CaretEqualsToken */:
                         return 36 /* ExclamationEqualsEqualsToken */;
                     case 49 /* AmpersandToken */:
-                    case 69 /* AmpersandEqualsToken */:
+                    case 70 /* AmpersandEqualsToken */:
                         return 54 /* AmpersandAmpersandToken */;
                     default:
                         return undefined;
@@ -52578,8 +53485,7 @@ var ts;
                 }
             }
             function reportOperatorError() {
-                var leftStr = typeToString(leftType);
-                var rightStr = typeToString(rightType);
+                var _a = getTypeNamesForErrorDisplay(leftType, rightType), leftStr = _a[0], rightStr = _a[1];
                 var errNode = errorNode || operatorToken;
                 if (!tryGiveBetterPrimaryError(errNode, leftStr, rightStr)) {
                     error(errNode, ts.Diagnostics.Operator_0_cannot_be_applied_to_types_1_and_2, ts.tokenToString(operatorToken.kind), leftStr, rightStr);
@@ -52634,7 +53540,7 @@ var ts;
                 // Async generator functions prior to ESNext require the __await, __asyncDelegator,
                 // and __asyncValues helpers
                 if ((functionFlags & 3 /* AsyncGenerator */) === 3 /* AsyncGenerator */ &&
-                    languageVersion < 7 /* ESNext */) {
+                    languageVersion < 8 /* ESNext */) {
                     checkExternalEmitHelpers(node, 26624 /* AsyncDelegatorIncludes */);
                 }
                 // Generator functions prior to ES2015 require the __values helper
@@ -52676,7 +53582,7 @@ var ts;
             return stringType;
         }
         function getContextNode(node) {
-            if (node.kind === 268 /* JsxAttributes */ && !ts.isJsxSelfClosingElement(node.parent)) {
+            if (node.kind === 269 /* JsxAttributes */ && !ts.isJsxSelfClosingElement(node.parent)) {
                 return node.parent.parent; // Needs to be the root JsxElement, so it encompasses the attributes _and_ the children (which are essentially part of the attributes)
             }
             return node;
@@ -52715,7 +53621,7 @@ var ts;
         }
         function isTypeAssertion(node) {
             node = ts.skipParentheses(node);
-            return node.kind === 194 /* TypeAssertionExpression */ || node.kind === 212 /* AsExpression */;
+            return node.kind === 195 /* TypeAssertionExpression */ || node.kind === 213 /* AsExpression */;
         }
         function checkDeclarationInitializer(declaration) {
             var initializer = ts.getEffectiveInitializer(declaration);
@@ -52746,7 +53652,7 @@ var ts;
                     // If the contextual type is a type variable constrained to a primitive type, consider
                     // this a literal context for literals of that primitive type. For example, given a
                     // type parameter 'T extends string', infer string literal types for T.
-                    var constraint = getBaseConstraintOfType(contextualType) || emptyObjectType;
+                    var constraint = getBaseConstraintOfType(contextualType) || unknownType;
                     return maybeTypeOfKind(constraint, 4 /* String */) && maybeTypeOfKind(candidateType, 128 /* StringLiteral */) ||
                         maybeTypeOfKind(constraint, 8 /* Number */) && maybeTypeOfKind(candidateType, 256 /* NumberLiteral */) ||
                         maybeTypeOfKind(constraint, 64 /* BigInt */) && maybeTypeOfKind(candidateType, 2048 /* BigIntLiteral */) ||
@@ -52779,7 +53685,7 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name.kind === 149 /* ComputedPropertyName */) {
+            if (node.name.kind === 150 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
             }
             return checkExpressionForMutableLocation(node.initializer, checkMode);
@@ -52790,7 +53696,7 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name.kind === 149 /* ComputedPropertyName */) {
+            if (node.name.kind === 150 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
             }
             var uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, checkMode);
@@ -52798,16 +53704,18 @@ var ts;
         }
         function instantiateTypeWithSingleGenericCallSignature(node, type, checkMode) {
             if (checkMode && checkMode & (2 /* Inferential */ | 8 /* SkipGenericFunctions */)) {
-                var signature = getSingleCallSignature(type);
+                var callSignature = getSingleSignature(type, 0 /* Call */, /*allowMembers*/ true);
+                var constructSignature = getSingleSignature(type, 1 /* Construct */, /*allowMembers*/ true);
+                var signature = callSignature || constructSignature;
                 if (signature && signature.typeParameters) {
-                    if (checkMode & 8 /* SkipGenericFunctions */) {
-                        skippedGenericFunction(node, checkMode);
-                        return anyFunctionType;
-                    }
                     var contextualType = getApparentTypeOfContextualType(node);
-                    if (contextualType) {
-                        var contextualSignature = getSingleCallSignature(getNonNullableType(contextualType));
+                    if (contextualType && !isMixinConstructorType(contextualType)) {
+                        var contextualSignature = getSingleSignature(getNonNullableType(contextualType), callSignature ? 0 /* Call */ : 1 /* Construct */, /*allowMembers*/ false);
                         if (contextualSignature && !contextualSignature.typeParameters) {
+                            if (checkMode & 8 /* SkipGenericFunctions */) {
+                                skippedGenericFunction(node, checkMode);
+                                return anyFunctionType;
+                            }
                             var context = getInferenceContext(node);
                             // We have an expression that is an argument of a generic function for which we are performing
                             // type argument inference. The expression is of a function type with a single generic call
@@ -52815,7 +53723,8 @@ var ts;
                             // if the outer function returns a function type with a single non-generic call signature and
                             // if some of the outer function type parameters have no inferences so far. If so, we can
                             // potentially add inferred type parameters to the outer function return type.
-                            var returnSignature = context.signature && getSingleCallSignature(getReturnTypeOfSignature(context.signature));
+                            var returnType = context.signature && getReturnTypeOfSignature(context.signature);
+                            var returnSignature = returnType && getSingleCallOrConstructSignature(returnType);
                             if (returnSignature && !returnSignature.typeParameters && !ts.every(context.inferences, hasInferenceCandidates)) {
                                 // Instantiate the signature with its own type parameters as type arguments, possibly
                                 // renaming the type parameters to ensure they have unique names.
@@ -52930,7 +53839,7 @@ var ts;
             var expr = ts.skipParentheses(node);
             // Optimize for the common case of a call to a function with a single non-generic call
             // signature where we can just fetch the return type without checking the arguments.
-            if (expr.kind === 191 /* CallExpression */ && expr.expression.kind !== 98 /* SuperKeyword */ && !ts.isRequireCall(expr, /*checkArgumentIsStringLiteralLike*/ true) && !isSymbolOrSymbolForCall(expr)) {
+            if (expr.kind === 192 /* CallExpression */ && expr.expression.kind !== 99 /* SuperKeyword */ && !ts.isRequireCall(expr, /*checkArgumentIsStringLiteralLike*/ true) && !isSymbolOrSymbolForCall(expr)) {
                 var funcType = checkNonNullExpression(expr.expression);
                 var signature = getSingleCallSignature(funcType);
                 if (signature && !signature.typeParameters) {
@@ -52979,10 +53888,10 @@ var ts;
             // - 'left' in property access
             // - 'object' in indexed access
             // - target in rhs of import statement
-            var ok = (node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.expression === node) ||
-                (node.parent.kind === 190 /* ElementAccessExpression */ && node.parent.expression === node) ||
-                ((node.kind === 72 /* Identifier */ || node.kind === 148 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node) ||
-                    (node.parent.kind === 167 /* TypeQuery */ && node.parent.exprName === node));
+            var ok = (node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.expression === node) ||
+                (node.parent.kind === 191 /* ElementAccessExpression */ && node.parent.expression === node) ||
+                ((node.kind === 73 /* Identifier */ || node.kind === 149 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node) ||
+                    (node.parent.kind === 168 /* TypeQuery */ && node.parent.exprName === node));
             if (!ok) {
                 error(node, ts.Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment_or_type_query);
             }
@@ -53003,13 +53912,13 @@ var ts;
         }
         function checkExpressionWorker(node, checkMode, forceTuple) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return checkIdentifier(node);
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     return checkThisExpression(node);
-                case 98 /* SuperKeyword */:
+                case 99 /* SuperKeyword */:
                     return checkSuperExpression(node);
-                case 96 /* NullKeyword */:
+                case 97 /* NullKeyword */:
                     return nullWideningType;
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 10 /* StringLiteral */:
@@ -53020,82 +53929,82 @@ var ts;
                 case 9 /* BigIntLiteral */:
                     checkGrammarBigIntLiteral(node);
                     return getFreshTypeOfLiteralType(getBigIntLiteralType(node));
-                case 102 /* TrueKeyword */:
+                case 103 /* TrueKeyword */:
                     return trueType;
-                case 87 /* FalseKeyword */:
+                case 88 /* FalseKeyword */:
                     return falseType;
-                case 206 /* TemplateExpression */:
+                case 207 /* TemplateExpression */:
                     return checkTemplateExpression(node);
                 case 13 /* RegularExpressionLiteral */:
                     return globalRegExpType;
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return checkArrayLiteral(node, checkMode, forceTuple);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return checkObjectLiteral(node, checkMode);
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return checkPropertyAccessExpression(node);
-                case 148 /* QualifiedName */:
+                case 149 /* QualifiedName */:
                     return checkQualifiedName(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return checkIndexedAccess(node);
-                case 191 /* CallExpression */:
-                    if (node.expression.kind === 92 /* ImportKeyword */) {
+                case 192 /* CallExpression */:
+                    if (node.expression.kind === 93 /* ImportKeyword */) {
                         return checkImportCallExpression(node);
                     }
                 /* falls through */
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return checkCallExpression(node, checkMode);
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     return checkTaggedTemplateExpression(node);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return checkParenthesizedExpression(node, checkMode);
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     return checkClassExpression(node);
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return checkFunctionExpressionOrObjectLiteralMethod(node, checkMode);
-                case 199 /* TypeOfExpression */:
+                case 200 /* TypeOfExpression */:
                     return checkTypeOfExpression(node);
-                case 194 /* TypeAssertionExpression */:
-                case 212 /* AsExpression */:
+                case 195 /* TypeAssertionExpression */:
+                case 213 /* AsExpression */:
                     return checkAssertion(node);
-                case 213 /* NonNullExpression */:
+                case 214 /* NonNullExpression */:
                     return checkNonNullAssertion(node);
-                case 214 /* MetaProperty */:
+                case 215 /* MetaProperty */:
                     return checkMetaProperty(node);
-                case 198 /* DeleteExpression */:
+                case 199 /* DeleteExpression */:
                     return checkDeleteExpression(node);
-                case 200 /* VoidExpression */:
+                case 201 /* VoidExpression */:
                     return checkVoidExpression(node);
-                case 201 /* AwaitExpression */:
+                case 202 /* AwaitExpression */:
                     return checkAwaitExpression(node);
-                case 202 /* PrefixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return checkPrefixUnaryExpression(node);
-                case 203 /* PostfixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     return checkPostfixUnaryExpression(node);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return checkBinaryExpression(node, checkMode);
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     return checkConditionalExpression(node, checkMode);
-                case 208 /* SpreadElement */:
+                case 209 /* SpreadElement */:
                     return checkSpreadExpression(node, checkMode);
-                case 210 /* OmittedExpression */:
+                case 211 /* OmittedExpression */:
                     return undefinedWideningType;
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return checkYieldExpression(node);
-                case 215 /* SyntheticExpression */:
+                case 216 /* SyntheticExpression */:
                     return node.type;
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return checkJsxExpression(node, checkMode);
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     return checkJsxElement(node, checkMode);
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return checkJsxSelfClosingElement(node, checkMode);
-                case 264 /* JsxFragment */:
+                case 265 /* JsxFragment */:
                     return checkJsxFragment(node);
-                case 268 /* JsxAttributes */:
+                case 269 /* JsxAttributes */:
                     return checkJsxAttributes(node, checkMode);
-                case 262 /* JsxOpeningElement */:
+                case 263 /* JsxOpeningElement */:
                     ts.Debug.fail("Shouldn't ever directly check a JsxOpeningElement");
             }
             return errorType;
@@ -53117,7 +54026,7 @@ var ts;
             var constraintType = getConstraintOfTypeParameter(typeParameter);
             var defaultType = getDefaultFromTypeParameter(typeParameter);
             if (constraintType && defaultType) {
-                checkTypeAssignableTo(defaultType, getTypeWithThisArgument(constraintType, defaultType), node.default, ts.Diagnostics.Type_0_does_not_satisfy_the_constraint_1);
+                checkTypeAssignableTo(defaultType, getTypeWithThisArgument(instantiateType(constraintType, makeUnaryTypeMapper(typeParameter, defaultType)), defaultType), node.default, ts.Diagnostics.Type_0_does_not_satisfy_the_constraint_1);
             }
             if (produceDiagnostics) {
                 checkTypeNameIsReserved(node.name, ts.Diagnostics.Type_parameter_name_cannot_be_0);
@@ -53132,7 +54041,7 @@ var ts;
             checkVariableLikeDeclaration(node);
             var func = ts.getContainingFunction(node);
             if (ts.hasModifier(node, 92 /* ParameterPropertyModifier */)) {
-                if (!(func.kind === 157 /* Constructor */ && ts.nodeIsPresent(func.body))) {
+                if (!(func.kind === 158 /* Constructor */ && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                 }
             }
@@ -53143,10 +54052,10 @@ var ts;
                 if (func.parameters.indexOf(node) !== 0) {
                     error(node, ts.Diagnostics.A_0_parameter_must_be_the_first_parameter, node.name.escapedText);
                 }
-                if (func.kind === 157 /* Constructor */ || func.kind === 161 /* ConstructSignature */ || func.kind === 166 /* ConstructorType */) {
+                if (func.kind === 158 /* Constructor */ || func.kind === 162 /* ConstructSignature */ || func.kind === 167 /* ConstructorType */) {
                     error(node, ts.Diagnostics.A_constructor_cannot_have_a_this_parameter);
                 }
-                if (func.kind === 197 /* ArrowFunction */) {
+                if (func.kind === 198 /* ArrowFunction */) {
                     error(node, ts.Diagnostics.An_arrow_function_cannot_have_a_this_parameter);
                 }
             }
@@ -53202,13 +54111,13 @@ var ts;
         }
         function getTypePredicateParent(node) {
             switch (node.parent.kind) {
-                case 197 /* ArrowFunction */:
-                case 160 /* CallSignature */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 165 /* FunctionType */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 198 /* ArrowFunction */:
+                case 161 /* CallSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 166 /* FunctionType */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     var parent = node.parent;
                     if (node === parent.type) {
                         return parent;
@@ -53222,11 +54131,11 @@ var ts;
                     continue;
                 }
                 var name = element.name;
-                if (name.kind === 72 /* Identifier */ && name.escapedText === predicateVariableName) {
+                if (name.kind === 73 /* Identifier */ && name.escapedText === predicateVariableName) {
                     error(predicateVariableNode, ts.Diagnostics.A_type_predicate_cannot_reference_element_0_in_a_binding_pattern, predicateVariableName);
                     return true;
                 }
-                else if (name.kind === 185 /* ArrayBindingPattern */ || name.kind === 184 /* ObjectBindingPattern */) {
+                else if (name.kind === 186 /* ArrayBindingPattern */ || name.kind === 185 /* ObjectBindingPattern */) {
                     if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name, predicateVariableNode, predicateVariableName)) {
                         return true;
                     }
@@ -53235,19 +54144,19 @@ var ts;
         }
         function checkSignatureDeclaration(node) {
             // Grammar checking
-            if (node.kind === 162 /* IndexSignature */) {
+            if (node.kind === 163 /* IndexSignature */) {
                 checkGrammarIndexSignature(node);
             }
             // TODO (yuisu): Remove this check in else-if when SyntaxKind.Construct is moved and ambient context is handled
-            else if (node.kind === 165 /* FunctionType */ || node.kind === 239 /* FunctionDeclaration */ || node.kind === 166 /* ConstructorType */ ||
-                node.kind === 160 /* CallSignature */ || node.kind === 157 /* Constructor */ ||
-                node.kind === 161 /* ConstructSignature */) {
+            else if (node.kind === 166 /* FunctionType */ || node.kind === 240 /* FunctionDeclaration */ || node.kind === 167 /* ConstructorType */ ||
+                node.kind === 161 /* CallSignature */ || node.kind === 158 /* Constructor */ ||
+                node.kind === 162 /* ConstructSignature */) {
                 checkGrammarFunctionLikeDeclaration(node);
             }
             var functionFlags = ts.getFunctionFlags(node);
             if (!(functionFlags & 4 /* Invalid */)) {
                 // Async generators prior to ESNext require the __await and __asyncGenerator helpers
-                if ((functionFlags & 3 /* AsyncGenerator */) === 3 /* AsyncGenerator */ && languageVersion < 7 /* ESNext */) {
+                if ((functionFlags & 3 /* AsyncGenerator */) === 3 /* AsyncGenerator */ && languageVersion < 8 /* ESNext */) {
                     checkExternalEmitHelpers(node, 6144 /* AsyncGeneratorIncludes */);
                 }
                 // Async functions prior to ES2017 require the __awaiter helper
@@ -53271,10 +54180,10 @@ var ts;
                 var returnTypeNode = ts.getEffectiveReturnTypeNode(node);
                 if (noImplicitAny && !returnTypeNode) {
                     switch (node.kind) {
-                        case 161 /* ConstructSignature */:
+                        case 162 /* ConstructSignature */:
                             error(node, ts.Diagnostics.Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
-                        case 160 /* CallSignature */:
+                        case 161 /* CallSignature */:
                             error(node, ts.Diagnostics.Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
                     }
@@ -53304,7 +54213,7 @@ var ts;
                         checkAsyncFunctionReturnType(node, returnTypeNode);
                     }
                 }
-                if (node.kind !== 162 /* IndexSignature */ && node.kind !== 294 /* JSDocFunctionType */) {
+                if (node.kind !== 163 /* IndexSignature */ && node.kind !== 295 /* JSDocFunctionType */) {
                     registerForUnusedIdentifiersCheck(node);
                 }
             }
@@ -53321,7 +54230,7 @@ var ts;
             var staticNames = ts.createUnderscoreEscapedMap();
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                if (member.kind === 157 /* Constructor */) {
+                if (member.kind === 158 /* Constructor */) {
                     for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                         var param = _c[_b];
                         if (ts.isParameterPropertyDeclaration(param) && !ts.isBindingPattern(param.name)) {
@@ -53336,16 +54245,16 @@ var ts;
                     var memberName = name && ts.getPropertyNameForPropertyNameNode(name);
                     if (name && memberName) {
                         switch (member.kind) {
-                            case 158 /* GetAccessor */:
+                            case 159 /* GetAccessor */:
                                 addName(names, name, memberName, 1 /* Getter */);
                                 break;
-                            case 159 /* SetAccessor */:
+                            case 160 /* SetAccessor */:
                                 addName(names, name, memberName, 2 /* Setter */);
                                 break;
-                            case 154 /* PropertyDeclaration */:
+                            case 155 /* PropertyDeclaration */:
                                 addName(names, name, memberName, 3 /* Property */);
                                 break;
-                            case 156 /* MethodDeclaration */:
+                            case 157 /* MethodDeclaration */:
                                 addName(names, name, memberName, 4 /* Method */);
                                 break;
                         }
@@ -53408,7 +54317,7 @@ var ts;
             var names = ts.createMap();
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                if (member.kind === 153 /* PropertySignature */) {
+                if (member.kind === 154 /* PropertySignature */) {
                     var memberName = void 0;
                     var name = member.name;
                     switch (name.kind) {
@@ -53416,7 +54325,7 @@ var ts;
                         case 8 /* NumericLiteral */:
                             memberName = name.text;
                             break;
-                        case 72 /* Identifier */:
+                        case 73 /* Identifier */:
                             memberName = ts.idText(name);
                             break;
                         default:
@@ -53433,7 +54342,7 @@ var ts;
             }
         }
         function checkTypeForDuplicateIndexSignatures(node) {
-            if (node.kind === 241 /* InterfaceDeclaration */) {
+            if (node.kind === 242 /* InterfaceDeclaration */) {
                 var nodeSymbol = getSymbolOfNode(node);
                 // in case of merging interface declaration it is possible that we'll enter this check procedure several times for every declaration
                 // to prevent this run check only for the first declaration of a given kind
@@ -53453,7 +54362,7 @@ var ts;
                     var declaration = decl;
                     if (declaration.parameters.length === 1 && declaration.parameters[0].type) {
                         switch (declaration.parameters[0].type.kind) {
-                            case 138 /* StringKeyword */:
+                            case 139 /* StringKeyword */:
                                 if (!seenStringIndexer) {
                                     seenStringIndexer = true;
                                 }
@@ -53461,7 +54370,7 @@ var ts;
                                     error(declaration, ts.Diagnostics.Duplicate_string_index_signature);
                                 }
                                 break;
-                            case 135 /* NumberKeyword */:
+                            case 136 /* NumberKeyword */:
                                 if (!seenNumericIndexer) {
                                     seenNumericIndexer = true;
                                 }
@@ -53488,7 +54397,7 @@ var ts;
             checkFunctionOrMethodDeclaration(node);
             // Abstract methods cannot have an implementation.
             // Extra checks are to avoid reporting multiple errors relating to the "abstractness" of the node.
-            if (ts.hasModifier(node, 128 /* Abstract */) && node.kind === 156 /* MethodDeclaration */ && node.body) {
+            if (ts.hasModifier(node, 128 /* Abstract */) && node.kind === 157 /* MethodDeclaration */ && node.body) {
                 error(node, ts.Diagnostics.Method_0_cannot_have_an_implementation_because_it_is_marked_abstract, ts.declarationNameToString(node.name));
             }
         }
@@ -53513,7 +54422,7 @@ var ts;
                 return;
             }
             function isInstancePropertyWithInitializer(n) {
-                return n.kind === 154 /* PropertyDeclaration */ &&
+                return n.kind === 155 /* PropertyDeclaration */ &&
                     !ts.hasModifier(n, 32 /* Static */) &&
                     !!n.initializer;
             }
@@ -53543,7 +54452,7 @@ var ts;
                         var superCallStatement = void 0;
                         for (var _i = 0, statements_2 = statements; _i < statements_2.length; _i++) {
                             var statement = statements_2[_i];
-                            if (statement.kind === 221 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
+                            if (statement.kind === 222 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
                                 superCallStatement = statement;
                                 break;
                             }
@@ -53568,7 +54477,7 @@ var ts;
                     checkGrammarComputedPropertyName(node.name);
                 checkDecorators(node);
                 checkSignatureDeclaration(node);
-                if (node.kind === 158 /* GetAccessor */) {
+                if (node.kind === 159 /* GetAccessor */) {
                     if (!(node.flags & 4194304 /* Ambient */) && ts.nodeIsPresent(node.body) && (node.flags & 128 /* HasImplicitReturn */)) {
                         if (!(node.flags & 256 /* HasExplicitReturn */)) {
                             error(node.name, ts.Diagnostics.A_get_accessor_must_return_a_value);
@@ -53578,13 +54487,13 @@ var ts;
                 // Do not use hasDynamicName here, because that returns false for well known symbols.
                 // We want to perform checkComputedPropertyName for all computed properties, including
                 // well known symbols.
-                if (node.name.kind === 149 /* ComputedPropertyName */) {
+                if (node.name.kind === 150 /* ComputedPropertyName */) {
                     checkComputedPropertyName(node.name);
                 }
                 if (!hasNonBindableDynamicName(node)) {
                     // TypeScript 1.0 spec (April 2014): 8.4.3
                     // Accessors for the same member name must specify the same accessibility.
-                    var otherKind = node.kind === 158 /* GetAccessor */ ? 159 /* SetAccessor */ : 158 /* GetAccessor */;
+                    var otherKind = node.kind === 159 /* GetAccessor */ ? 160 /* SetAccessor */ : 159 /* GetAccessor */;
                     var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(node), otherKind);
                     if (otherAccessor) {
                         var nodeFlags = ts.getModifierFlags(node);
@@ -53602,7 +54511,7 @@ var ts;
                     }
                 }
                 var returnType = getTypeOfAccessors(getSymbolOfNode(node));
-                if (node.kind === 158 /* GetAccessor */) {
+                if (node.kind === 159 /* GetAccessor */) {
                     checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType);
                 }
             }
@@ -53650,7 +54559,7 @@ var ts;
         }
         function checkTypeReferenceNode(node) {
             checkGrammarTypeArguments(node, node.typeArguments);
-            if (node.kind === 164 /* TypeReference */ && node.typeName.jsdocDotPos !== undefined && !ts.isInJSFile(node) && !ts.isInJSDoc(node)) {
+            if (node.kind === 165 /* TypeReference */ && node.typeName.jsdocDotPos !== undefined && !ts.isInJSFile(node) && !ts.isInJSDoc(node)) {
                 grammarErrorAtPos(node, node.typeName.jsdocDotPos, 1, ts.Diagnostics.JSDoc_types_can_only_be_used_inside_documentation_comments);
             }
             var type = getTypeFromTypeReference(node);
@@ -53698,7 +54607,7 @@ var ts;
             var seenOptionalElement = false;
             for (var i = 0; i < elementTypes.length; i++) {
                 var e = elementTypes[i];
-                if (e.kind === 172 /* RestType */) {
+                if (e.kind === 173 /* RestType */) {
                     if (i !== elementTypes.length - 1) {
                         grammarErrorOnNode(e, ts.Diagnostics.A_rest_element_must_be_last_in_a_tuple_type);
                         break;
@@ -53707,7 +54616,7 @@ var ts;
                         error(e, ts.Diagnostics.A_rest_element_type_must_be_an_array_type);
                     }
                 }
-                else if (e.kind === 171 /* OptionalType */) {
+                else if (e.kind === 172 /* OptionalType */) {
                     seenOptionalElement = true;
                 }
                 else if (seenOptionalElement) {
@@ -53728,7 +54637,7 @@ var ts;
             var objectType = type.objectType;
             var indexType = type.indexType;
             if (isTypeAssignableTo(indexType, getIndexType(objectType, /*stringsOnly*/ false))) {
-                if (accessNode.kind === 190 /* ElementAccessExpression */ && ts.isAssignmentTarget(accessNode) &&
+                if (accessNode.kind === 191 /* ElementAccessExpression */ && ts.isAssignmentTarget(accessNode) &&
                     ts.getObjectFlags(objectType) & 32 /* Mapped */ && getMappedTypeModifiers(objectType) & 1 /* IncludeReadonly */) {
                     error(accessNode, ts.Diagnostics.Index_signature_in_type_0_only_permits_reading, typeToString(objectType));
                 }
@@ -53740,7 +54649,7 @@ var ts;
                 return type;
             }
             error(accessNode, ts.Diagnostics.Type_0_cannot_be_used_to_index_type_1, typeToString(indexType), typeToString(objectType));
-            return type;
+            return errorType;
         }
         function checkIndexedAccessType(node) {
             checkSourceElement(node.objectType);
@@ -53768,7 +54677,7 @@ var ts;
             ts.forEachChild(node, checkSourceElement);
         }
         function checkInferType(node) {
-            if (!ts.findAncestor(node, function (n) { return n.parent && n.parent.kind === 175 /* ConditionalType */ && n.parent.extendsType === n; })) {
+            if (!ts.findAncestor(node, function (n) { return n.parent && n.parent.kind === 176 /* ConditionalType */ && n.parent.extendsType === n; })) {
                 grammarErrorOnNode(node, ts.Diagnostics.infer_declarations_are_only_permitted_in_the_extends_clause_of_a_conditional_type);
             }
             checkSourceElement(node.typeParameter);
@@ -53785,9 +54694,9 @@ var ts;
             var flags = ts.getCombinedModifierFlags(n);
             // children of classes (even ambient classes) should not be marked as ambient or export
             // because those flags have no useful semantics there.
-            if (n.parent.kind !== 241 /* InterfaceDeclaration */ &&
-                n.parent.kind !== 240 /* ClassDeclaration */ &&
-                n.parent.kind !== 209 /* ClassExpression */ &&
+            if (n.parent.kind !== 242 /* InterfaceDeclaration */ &&
+                n.parent.kind !== 241 /* ClassDeclaration */ &&
+                n.parent.kind !== 210 /* ClassExpression */ &&
                 n.flags & 4194304 /* Ambient */) {
                 if (!(flags & 2 /* Ambient */) && !(ts.isModuleBlock(n.parent) && ts.isModuleDeclaration(n.parent.parent) && ts.isGlobalScopeAugmentation(n.parent.parent))) {
                     // It is nested in an ambient context, which means it is automatically exported
@@ -53878,7 +54787,7 @@ var ts;
                         if (node.name && subsequentName &&
                             (ts.isComputedPropertyName(node.name) && ts.isComputedPropertyName(subsequentName) ||
                                 !ts.isComputedPropertyName(node.name) && !ts.isComputedPropertyName(subsequentName) && ts.getEscapedTextOfIdentifierOrLiteral(node.name) === ts.getEscapedTextOfIdentifierOrLiteral(subsequentName))) {
-                            var reportError = (node.kind === 156 /* MethodDeclaration */ || node.kind === 155 /* MethodSignature */) &&
+                            var reportError = (node.kind === 157 /* MethodDeclaration */ || node.kind === 156 /* MethodSignature */) &&
                                 ts.hasModifier(node, 32 /* Static */) !== ts.hasModifier(subsequentNode, 32 /* Static */);
                             // we can get here in two cases
                             // 1. mixed static and instance class members
@@ -53917,7 +54826,7 @@ var ts;
                 var current = declarations_4[_i];
                 var node = current;
                 var inAmbientContext = node.flags & 4194304 /* Ambient */;
-                var inAmbientContextOrInterface = node.parent.kind === 241 /* InterfaceDeclaration */ || node.parent.kind === 168 /* TypeLiteral */ || inAmbientContext;
+                var inAmbientContextOrInterface = node.parent.kind === 242 /* InterfaceDeclaration */ || node.parent.kind === 169 /* TypeLiteral */ || inAmbientContext;
                 if (inAmbientContextOrInterface) {
                     // check if declarations are consecutive only if they are non-ambient
                     // 1. ambient declarations can be interleaved
@@ -53928,7 +54837,7 @@ var ts;
                     // 2. mixing ambient and non-ambient declarations is a separate error that will be reported - do not want to report an extra one
                     previousDeclaration = undefined;
                 }
-                if (node.kind === 239 /* FunctionDeclaration */ || node.kind === 156 /* MethodDeclaration */ || node.kind === 155 /* MethodSignature */ || node.kind === 157 /* Constructor */) {
+                if (node.kind === 240 /* FunctionDeclaration */ || node.kind === 157 /* MethodDeclaration */ || node.kind === 156 /* MethodSignature */ || node.kind === 158 /* Constructor */) {
                     var currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
                     someNodeFlags |= currentNodeFlags;
                     allNodeFlags &= currentNodeFlags;
@@ -54057,22 +54966,22 @@ var ts;
             function getDeclarationSpaces(decl) {
                 var d = decl;
                 switch (d.kind) {
-                    case 241 /* InterfaceDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
                     // A jsdoc typedef and callback are, by definition, type aliases
-                    case 309 /* JSDocTypedefTag */:
-                    case 302 /* JSDocCallbackTag */:
+                    case 310 /* JSDocTypedefTag */:
+                    case 303 /* JSDocCallbackTag */:
                         return 2 /* ExportType */;
-                    case 244 /* ModuleDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         return ts.isAmbientModule(d) || ts.getModuleInstanceState(d) !== 0 /* NonInstantiated */
                             ? 4 /* ExportNamespace */ | 1 /* ExportValue */
                             : 4 /* ExportNamespace */;
-                    case 240 /* ClassDeclaration */:
-                    case 243 /* EnumDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 244 /* EnumDeclaration */:
                         return 2 /* ExportType */ | 1 /* ExportValue */;
-                    case 284 /* SourceFile */:
+                    case 285 /* SourceFile */:
                         return 2 /* ExportType */ | 1 /* ExportValue */ | 4 /* ExportNamespace */;
-                    case 254 /* ExportAssignment */:
+                    case 255 /* ExportAssignment */:
                         // Export assigned entity name expressions act as aliases and should fall through, otherwise they export values
                         if (!ts.isEntityNameExpression(d.expression)) {
                             return 1 /* ExportValue */;
@@ -54080,20 +54989,20 @@ var ts;
                         d = d.expression;
                     /* falls through */
                     // The below options all declare an Alias, which is allowed to merge with other values within the importing module
-                    case 248 /* ImportEqualsDeclaration */:
-                    case 251 /* NamespaceImport */:
-                    case 250 /* ImportClause */:
-                        var result_5 = 0 /* None */;
+                    case 249 /* ImportEqualsDeclaration */:
+                    case 252 /* NamespaceImport */:
+                    case 251 /* ImportClause */:
+                        var result_7 = 0 /* None */;
                         var target = resolveAlias(getSymbolOfNode(d));
-                        ts.forEach(target.declarations, function (d) { result_5 |= getDeclarationSpaces(d); });
-                        return result_5;
-                    case 237 /* VariableDeclaration */:
-                    case 186 /* BindingElement */:
-                    case 239 /* FunctionDeclaration */:
-                    case 253 /* ImportSpecifier */: // https://github.com/Microsoft/TypeScript/pull/7591
+                        ts.forEach(target.declarations, function (d) { result_7 |= getDeclarationSpaces(d); });
+                        return result_7;
+                    case 238 /* VariableDeclaration */:
+                    case 187 /* BindingElement */:
+                    case 240 /* FunctionDeclaration */:
+                    case 254 /* ImportSpecifier */: // https://github.com/Microsoft/TypeScript/pull/7591
                         return 1 /* ExportValue */;
                     default:
-                        return ts.Debug.fail(ts.Debug.showSyntaxKind(d));
+                        return ts.Debug.failBadSyntaxKind(d);
                 }
             }
         }
@@ -54319,7 +55228,7 @@ var ts;
                 var promiseConstructorSymbol = resolveEntityName(promiseConstructorName, 67220415 /* Value */, /*ignoreErrors*/ true);
                 var promiseConstructorType = promiseConstructorSymbol ? getTypeOfSymbol(promiseConstructorSymbol) : errorType;
                 if (promiseConstructorType === errorType) {
-                    if (promiseConstructorName.kind === 72 /* Identifier */ && promiseConstructorName.escapedText === "Promise" && getTargetType(returnType) === getGlobalPromiseType(/*reportErrors*/ false)) {
+                    if (promiseConstructorName.kind === 73 /* Identifier */ && promiseConstructorName.escapedText === "Promise" && getTargetType(returnType) === getGlobalPromiseType(/*reportErrors*/ false)) {
                         error(returnTypeNode, ts.Diagnostics.An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option);
                     }
                     else {
@@ -54358,24 +55267,24 @@ var ts;
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             var errorInfo;
             switch (node.parent.kind) {
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     var classSymbol = getSymbolOfNode(node.parent);
                     var classConstructorType = getTypeOfSymbol(classSymbol);
                     expectedReturnType = getUnionType([classConstructorType, voidType]);
                     break;
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(
                     /*details*/ undefined, ts.Diagnostics.The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any);
                     break;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     expectedReturnType = voidType;
                     errorInfo = ts.chainDiagnosticMessages(
                     /*details*/ undefined, ts.Diagnostics.The_return_type_of_a_property_decorator_function_must_be_either_void_or_any);
                     break;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     var methodType = getTypeOfNode(node.parent);
                     var descriptorType = createTypedPropertyDescriptorType(methodType);
                     expectedReturnType = getUnionType([descriptorType, voidType]);
@@ -54396,7 +55305,7 @@ var ts;
             if (!typeName)
                 return;
             var rootName = getFirstIdentifier(typeName);
-            var meaning = (typeName.kind === 72 /* Identifier */ ? 67897832 /* Type */ : 1920 /* Namespace */) | 2097152 /* Alias */;
+            var meaning = (typeName.kind === 73 /* Identifier */ ? 67897832 /* Type */ : 1920 /* Namespace */) | 2097152 /* Alias */;
             var rootSymbol = resolveName(rootName, rootName.escapedText, meaning, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isRefernce*/ true);
             if (rootSymbol
                 && rootSymbol.flags & 2097152 /* Alias */
@@ -54421,29 +55330,29 @@ var ts;
         function getEntityNameForDecoratorMetadata(node) {
             if (node) {
                 switch (node.kind) {
-                    case 174 /* IntersectionType */:
-                    case 173 /* UnionType */:
+                    case 175 /* IntersectionType */:
+                    case 174 /* UnionType */:
                         return getEntityNameForDecoratorMetadataFromTypeList(node.types);
-                    case 175 /* ConditionalType */:
+                    case 176 /* ConditionalType */:
                         return getEntityNameForDecoratorMetadataFromTypeList([node.trueType, node.falseType]);
-                    case 177 /* ParenthesizedType */:
+                    case 178 /* ParenthesizedType */:
                         return getEntityNameForDecoratorMetadata(node.type);
-                    case 164 /* TypeReference */:
+                    case 165 /* TypeReference */:
                         return node.typeName;
                 }
             }
         }
         function getEntityNameForDecoratorMetadataFromTypeList(types) {
             var commonEntityName;
-            for (var _i = 0, types_17 = types; _i < types_17.length; _i++) {
-                var typeNode = types_17[_i];
-                while (typeNode.kind === 177 /* ParenthesizedType */) {
+            for (var _i = 0, types_16 = types; _i < types_16.length; _i++) {
+                var typeNode = types_16[_i];
+                while (typeNode.kind === 178 /* ParenthesizedType */) {
                     typeNode = typeNode.type; // Skip parens if need be
                 }
-                if (typeNode.kind === 132 /* NeverKeyword */) {
+                if (typeNode.kind === 133 /* NeverKeyword */) {
                     continue; // Always elide `never` from the union/intersection if possible
                 }
-                if (!strictNullChecks && (typeNode.kind === 96 /* NullKeyword */ || typeNode.kind === 141 /* UndefinedKeyword */)) {
+                if (!strictNullChecks && (typeNode.kind === 97 /* NullKeyword */ || typeNode.kind === 142 /* UndefinedKeyword */)) {
                     continue; // Elide null and undefined from unions for metadata, just like what we did prior to the implementation of strict null checks
                 }
                 var individualEntityName = getEntityNameForDecoratorMetadata(typeNode);
@@ -54485,18 +55394,18 @@ var ts;
                 return;
             }
             if (!compilerOptions.experimentalDecorators) {
-                error(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning);
+                error(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning);
             }
             var firstDecorator = node.decorators[0];
             checkExternalEmitHelpers(firstDecorator, 8 /* Decorate */);
-            if (node.kind === 151 /* Parameter */) {
+            if (node.kind === 152 /* Parameter */) {
                 checkExternalEmitHelpers(firstDecorator, 32 /* Param */);
             }
             if (compilerOptions.emitDecoratorMetadata) {
                 checkExternalEmitHelpers(firstDecorator, 16 /* Metadata */);
                 // we only need to perform these checks if we are emitting serialized type metadata for the target of a decorator.
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */:
+                    case 241 /* ClassDeclaration */:
                         var constructor = ts.getFirstConstructorWithBody(node);
                         if (constructor) {
                             for (var _i = 0, _a = constructor.parameters; _i < _a.length; _i++) {
@@ -54505,23 +55414,23 @@ var ts;
                             }
                         }
                         break;
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                        var otherKind = node.kind === 158 /* GetAccessor */ ? 159 /* SetAccessor */ : 158 /* GetAccessor */;
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                        var otherKind = node.kind === 159 /* GetAccessor */ ? 160 /* SetAccessor */ : 159 /* GetAccessor */;
                         var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(node), otherKind);
                         markDecoratorMedataDataTypeNodeAsReferenced(getAnnotatedAccessorTypeNode(node) || otherAccessor && getAnnotatedAccessorTypeNode(otherAccessor));
                         break;
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         for (var _b = 0, _c = node.parameters; _b < _c.length; _b++) {
                             var parameter = _c[_b];
                             markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(parameter));
                         }
                         markDecoratorMedataDataTypeNodeAsReferenced(ts.getEffectiveReturnTypeNode(node));
                         break;
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         markDecoratorMedataDataTypeNodeAsReferenced(ts.getEffectiveTypeAnnotationNode(node));
                         break;
-                    case 151 /* Parameter */:
+                    case 152 /* Parameter */:
                         markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(node));
                         var containingSignature = node.parent;
                         for (var _d = 0, _e = containingSignature.parameters; _d < _e.length; _d++) {
@@ -54584,7 +55493,7 @@ var ts;
                     else if (ts.findLast(ts.getJSDocTags(decl), ts.isJSDocParameterTag) === node &&
                         node.typeExpression && node.typeExpression.type &&
                         !isArrayType(getTypeFromTypeNode(node.typeExpression.type))) {
-                        error(node.name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_It_would_match_arguments_if_it_had_an_array_type, ts.idText(node.name.kind === 148 /* QualifiedName */ ? node.name.right : node.name));
+                        error(node.name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_It_would_match_arguments_if_it_had_an_array_type, ts.idText(node.name.kind === 149 /* QualifiedName */ ? node.name.right : node.name));
                     }
                 }
             }
@@ -54617,9 +55526,9 @@ var ts;
         }
         function getIdentifierFromEntityNameExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return node;
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return node.name;
                 default:
                     return undefined;
@@ -54632,7 +55541,7 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name && node.name.kind === 149 /* ComputedPropertyName */) {
+            if (node.name && node.name.kind === 150 /* ComputedPropertyName */) {
                 // This check will account for methods in class/interface declarations,
                 // as well as accessors in classes/object literals
                 checkComputedPropertyName(node.name);
@@ -54661,7 +55570,7 @@ var ts;
                     }
                 }
             }
-            var body = node.kind === 155 /* MethodSignature */ ? undefined : node.body;
+            var body = node.kind === 156 /* MethodSignature */ ? undefined : node.body;
             checkSourceElement(body);
             if ((functionFlags & 1 /* Generator */) === 0) { // Async function or normal function
                 var returnOrPromisedType = getReturnOrPromisedType(node, functionFlags);
@@ -54706,42 +55615,42 @@ var ts;
             for (var _i = 0, potentiallyUnusedIdentifiers_1 = potentiallyUnusedIdentifiers; _i < potentiallyUnusedIdentifiers_1.length; _i++) {
                 var node = potentiallyUnusedIdentifiers_1[_i];
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
                         checkUnusedClassMembers(node, addDiagnostic);
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 284 /* SourceFile */:
-                    case 244 /* ModuleDeclaration */:
-                    case 218 /* Block */:
-                    case 246 /* CaseBlock */:
-                    case 225 /* ForStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
+                    case 285 /* SourceFile */:
+                    case 245 /* ModuleDeclaration */:
+                    case 219 /* Block */:
+                    case 247 /* CaseBlock */:
+                    case 226 /* ForStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
                         checkUnusedLocalsAndParameters(node, addDiagnostic);
                         break;
-                    case 157 /* Constructor */:
-                    case 196 /* FunctionExpression */:
-                    case 239 /* FunctionDeclaration */:
-                    case 197 /* ArrowFunction */:
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 158 /* Constructor */:
+                    case 197 /* FunctionExpression */:
+                    case 240 /* FunctionDeclaration */:
+                    case 198 /* ArrowFunction */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         if (node.body) { // Don't report unused parameters in overloads
                             checkUnusedLocalsAndParameters(node, addDiagnostic);
                         }
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 155 /* MethodSignature */:
-                    case 160 /* CallSignature */:
-                    case 161 /* ConstructSignature */:
-                    case 165 /* FunctionType */:
-                    case 166 /* ConstructorType */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
+                    case 156 /* MethodSignature */:
+                    case 161 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 166 /* FunctionType */:
+                    case 167 /* ConstructorType */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 176 /* InferType */:
+                    case 177 /* InferType */:
                         checkUnusedInferTypeParameter(node, addDiagnostic);
                         break;
                     default:
@@ -54761,11 +55670,11 @@ var ts;
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
                 switch (member.kind) {
-                    case 156 /* MethodDeclaration */:
-                    case 154 /* PropertyDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                        if (member.kind === 159 /* SetAccessor */ && member.symbol.flags & 32768 /* GetAccessor */) {
+                    case 157 /* MethodDeclaration */:
+                    case 155 /* PropertyDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                        if (member.kind === 160 /* SetAccessor */ && member.symbol.flags & 32768 /* GetAccessor */) {
                             // Already would have reported an error on the getter.
                             break;
                         }
@@ -54774,7 +55683,7 @@ var ts;
                             addDiagnostic(member, 0 /* Local */, ts.createDiagnosticForNode(member.name, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, symbolToString(symbol)));
                         }
                         break;
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
                             var parameter = _c[_b];
                             if (!parameter.symbol.isReferenced && ts.hasModifier(parameter, 8 /* Private */)) {
@@ -54782,8 +55691,8 @@ var ts;
                             }
                         }
                         break;
-                    case 162 /* IndexSignature */:
-                    case 217 /* SemicolonClassElement */:
+                    case 163 /* IndexSignature */:
+                    case 218 /* SemicolonClassElement */:
                         // Can't be private
                         break;
                     default:
@@ -54810,7 +55719,7 @@ var ts;
                     continue;
                 var name = ts.idText(typeParameter.name);
                 var parent = typeParameter.parent;
-                if (parent.kind !== 176 /* InferType */ && parent.typeParameters.every(isTypeParameterUnused)) {
+                if (parent.kind !== 177 /* InferType */ && parent.typeParameters.every(isTypeParameterUnused)) {
                     if (seenParentsWithEveryUnused.tryAdd(parent)) {
                         var range = ts.isJSDocTemplateTag(parent)
                             // Whole @template tag
@@ -54895,7 +55804,7 @@ var ts;
                 var importDecl = importClause.parent;
                 var nDeclarations = (importClause.name ? 1 : 0) +
                     (importClause.namedBindings ?
-                        (importClause.namedBindings.kind === 251 /* NamespaceImport */ ? 1 : importClause.namedBindings.elements.length)
+                        (importClause.namedBindings.kind === 252 /* NamespaceImport */ ? 1 : importClause.namedBindings.elements.length)
                         : 0);
                 if (nDeclarations === unuseds.length) {
                     addDiagnostic(importDecl, 0 /* Local */, unuseds.length === 1
@@ -54913,7 +55822,7 @@ var ts;
                 var bindingPattern = _a[0], bindingElements = _a[1];
                 var kind = tryGetRootParameterDeclaration(bindingPattern.parent) ? 1 /* Parameter */ : 0 /* Local */;
                 if (bindingPattern.elements.length === bindingElements.length) {
-                    if (bindingElements.length === 1 && bindingPattern.parent.kind === 237 /* VariableDeclaration */ && bindingPattern.parent.parent.kind === 238 /* VariableDeclarationList */) {
+                    if (bindingElements.length === 1 && bindingPattern.parent.kind === 238 /* VariableDeclaration */ && bindingPattern.parent.parent.kind === 239 /* VariableDeclarationList */) {
                         addToGroup(unusedVariables, bindingPattern.parent.parent, bindingPattern.parent, getNodeId);
                     }
                     else {
@@ -54934,7 +55843,7 @@ var ts;
                 if (declarationList.declarations.length === declarations.length) {
                     addDiagnostic(declarationList, 0 /* Local */, declarations.length === 1
                         ? ts.createDiagnosticForNode(ts.first(declarations).name, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, bindingNameText(ts.first(declarations).name))
-                        : ts.createDiagnosticForNode(declarationList.parent.kind === 219 /* VariableStatement */ ? declarationList.parent : declarationList, ts.Diagnostics.All_variables_are_unused));
+                        : ts.createDiagnosticForNode(declarationList.parent.kind === 220 /* VariableStatement */ ? declarationList.parent : declarationList, ts.Diagnostics.All_variables_are_unused));
                 }
                 else {
                     for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
@@ -54946,24 +55855,24 @@ var ts;
         }
         function bindingNameText(name) {
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return ts.idText(name);
-                case 185 /* ArrayBindingPattern */:
-                case 184 /* ObjectBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
+                case 185 /* ObjectBindingPattern */:
                     return bindingNameText(ts.cast(ts.first(name.elements), ts.isBindingElement).name);
                 default:
                     return ts.Debug.assertNever(name);
             }
         }
         function isImportedDeclaration(node) {
-            return node.kind === 250 /* ImportClause */ || node.kind === 253 /* ImportSpecifier */ || node.kind === 251 /* NamespaceImport */;
+            return node.kind === 251 /* ImportClause */ || node.kind === 254 /* ImportSpecifier */ || node.kind === 252 /* NamespaceImport */;
         }
         function importClauseFromImported(decl) {
-            return decl.kind === 250 /* ImportClause */ ? decl : decl.kind === 251 /* NamespaceImport */ ? decl.parent : decl.parent.parent;
+            return decl.kind === 251 /* ImportClause */ ? decl : decl.kind === 252 /* NamespaceImport */ ? decl.parent : decl.parent.parent;
         }
         function checkBlock(node) {
             // Grammar checking for SyntaxKind.Block
-            if (node.kind === 218 /* Block */) {
+            if (node.kind === 219 /* Block */) {
                 checkGrammarStatementInAmbientContext(node);
             }
             if (ts.isFunctionOrModuleBlock(node)) {
@@ -54993,12 +55902,12 @@ var ts;
             if (!(identifier && identifier.escapedText === name)) {
                 return false;
             }
-            if (node.kind === 154 /* PropertyDeclaration */ ||
-                node.kind === 153 /* PropertySignature */ ||
-                node.kind === 156 /* MethodDeclaration */ ||
-                node.kind === 155 /* MethodSignature */ ||
-                node.kind === 158 /* GetAccessor */ ||
-                node.kind === 159 /* SetAccessor */) {
+            if (node.kind === 155 /* PropertyDeclaration */ ||
+                node.kind === 154 /* PropertySignature */ ||
+                node.kind === 157 /* MethodDeclaration */ ||
+                node.kind === 156 /* MethodSignature */ ||
+                node.kind === 159 /* GetAccessor */ ||
+                node.kind === 160 /* SetAccessor */) {
                 // it is ok to have member named '_super' or '_this' - member access is always qualified
                 return false;
             }
@@ -55007,7 +55916,7 @@ var ts;
                 return false;
             }
             var root = ts.getRootDeclaration(node);
-            if (root.kind === 151 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
+            if (root.kind === 152 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
                 // just an overload - no codegen impact
                 return false;
             }
@@ -55017,7 +55926,7 @@ var ts;
         function checkIfThisIsCapturedInEnclosingScope(node) {
             ts.findAncestor(node, function (current) {
                 if (getNodeCheckFlags(current) & 4 /* CaptureThis */) {
-                    var isDeclaration_1 = node.kind !== 72 /* Identifier */;
+                    var isDeclaration_1 = node.kind !== 73 /* Identifier */;
                     if (isDeclaration_1) {
                         error(ts.getNameOfDeclaration(node), ts.Diagnostics.Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference);
                     }
@@ -55032,7 +55941,7 @@ var ts;
         function checkIfNewTargetIsCapturedInEnclosingScope(node) {
             ts.findAncestor(node, function (current) {
                 if (getNodeCheckFlags(current) & 8 /* CaptureNewTarget */) {
-                    var isDeclaration_2 = node.kind !== 72 /* Identifier */;
+                    var isDeclaration_2 = node.kind !== 73 /* Identifier */;
                     if (isDeclaration_2) {
                         error(ts.getNameOfDeclaration(node), ts.Diagnostics.Duplicate_identifier_newTarget_Compiler_uses_variable_declaration_newTarget_to_capture_new_target_meta_property_reference);
                     }
@@ -55058,7 +55967,7 @@ var ts;
             }
             // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
+            if (parent.kind === 285 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
                 // If the declaration happens to be in external module, report error that require and exports are reserved keywords
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
@@ -55073,7 +55982,7 @@ var ts;
             }
             // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
             var parent = getDeclarationContainer(node);
-            if (parent.kind === 284 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 1024 /* HasAsyncFunctions */) {
+            if (parent.kind === 285 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 1024 /* HasAsyncFunctions */) {
                 // If the declaration happens to be in external module, report error that Promise is a reserved identifier.
                 error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions, ts.declarationNameToString(name), ts.declarationNameToString(name));
             }
@@ -55108,7 +56017,7 @@ var ts;
             // skip variable declarations that don't have initializers
             // NOTE: in ES6 spec initializer is required in variable declarations where name is binding pattern
             // so we'll always treat binding elements as initialized
-            if (node.kind === 237 /* VariableDeclaration */ && !node.initializer) {
+            if (node.kind === 238 /* VariableDeclaration */ && !node.initializer) {
                 return;
             }
             var symbol = getSymbolOfNode(node);
@@ -55120,17 +56029,17 @@ var ts;
                     localDeclarationSymbol !== symbol &&
                     localDeclarationSymbol.flags & 2 /* BlockScopedVariable */) {
                     if (getDeclarationNodeFlagsFromSymbol(localDeclarationSymbol) & 3 /* BlockScoped */) {
-                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 238 /* VariableDeclarationList */);
-                        var container = varDeclList.parent.kind === 219 /* VariableStatement */ && varDeclList.parent.parent
+                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 239 /* VariableDeclarationList */);
+                        var container = varDeclList.parent.kind === 220 /* VariableStatement */ && varDeclList.parent.parent
                             ? varDeclList.parent.parent
                             : undefined;
                         // names of block-scoped and function scoped variables can collide only
                         // if block scoped variable is defined in the function\module\source file scope (because of variable hoisting)
                         var namesShareScope = container &&
-                            (container.kind === 218 /* Block */ && ts.isFunctionLike(container.parent) ||
-                                container.kind === 245 /* ModuleBlock */ ||
-                                container.kind === 244 /* ModuleDeclaration */ ||
-                                container.kind === 284 /* SourceFile */);
+                            (container.kind === 219 /* Block */ && ts.isFunctionLike(container.parent) ||
+                                container.kind === 246 /* ModuleBlock */ ||
+                                container.kind === 245 /* ModuleDeclaration */ ||
+                                container.kind === 285 /* SourceFile */);
                         // here we know that function scoped variable is shadowed by block scoped one
                         // if they are defined in the same scope - binder has already reported redeclaration error
                         // otherwise if variable has an initializer - show error that initialization will fail
@@ -55143,69 +56052,6 @@ var ts;
                 }
             }
         }
-        // Check that a parameter initializer contains no references to parameters declared to the right of itself
-        function checkParameterInitializer(node) {
-            if (ts.getRootDeclaration(node).kind !== 151 /* Parameter */) {
-                return;
-            }
-            var func = ts.getContainingFunction(node);
-            visit(node.initializer);
-            function visit(n) {
-                if (ts.isTypeNode(n) || ts.isDeclarationName(n)) {
-                    // do not dive in types
-                    // skip declaration names (i.e. in object literal expressions)
-                    return;
-                }
-                if (n.kind === 189 /* PropertyAccessExpression */) {
-                    // skip property names in property access expression
-                    return visit(n.expression);
-                }
-                else if (n.kind === 72 /* Identifier */) {
-                    // check FunctionLikeDeclaration.locals (stores parameters\function local variable)
-                    // if it contains entry with a specified name
-                    var symbol = resolveName(n, n.escapedText, 67220415 /* Value */ | 2097152 /* Alias */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false);
-                    if (!symbol || symbol === unknownSymbol || !symbol.valueDeclaration) {
-                        return;
-                    }
-                    if (symbol.valueDeclaration === node) {
-                        error(n, ts.Diagnostics.Parameter_0_cannot_be_referenced_in_its_initializer, ts.declarationNameToString(node.name));
-                        return;
-                    }
-                    // locals map for function contain both parameters and function locals
-                    // so we need to do a bit of extra work to check if reference is legal
-                    var enclosingContainer = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
-                    if (enclosingContainer === func) {
-                        if (symbol.valueDeclaration.kind === 151 /* Parameter */ ||
-                            symbol.valueDeclaration.kind === 186 /* BindingElement */) {
-                            // it is ok to reference parameter in initializer if either
-                            // - parameter is located strictly on the left of current parameter declaration
-                            if (symbol.valueDeclaration.pos < node.pos) {
-                                return;
-                            }
-                            // - parameter is wrapped in function-like entity
-                            if (ts.findAncestor(n, function (current) {
-                                if (current === node.initializer) {
-                                    return "quit";
-                                }
-                                return ts.isFunctionLike(current.parent) ||
-                                    // computed property names/initializers in instance property declaration of class like entities
-                                    // are executed in constructor and thus deferred
-                                    (current.parent.kind === 154 /* PropertyDeclaration */ &&
-                                        !(ts.hasModifier(current.parent, 32 /* Static */)) &&
-                                        ts.isClassLike(current.parent.parent));
-                            })) {
-                                return;
-                            }
-                            // fall through to report error
-                        }
-                        error(n, ts.Diagnostics.Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it, ts.declarationNameToString(node.name), ts.declarationNameToString(n));
-                    }
-                }
-                else {
-                    return ts.forEachChild(n, visit);
-                }
-            }
-        }
         function convertAutoToAny(type) {
             return type === autoType ? anyType : type === autoArrayType ? anyArrayType : type;
         }
@@ -55223,18 +56069,18 @@ var ts;
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name.kind === 149 /* ComputedPropertyName */) {
+            if (node.name.kind === 150 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
                 if (node.initializer) {
                     checkExpressionCached(node.initializer);
                 }
             }
-            if (node.kind === 186 /* BindingElement */) {
-                if (node.parent.kind === 184 /* ObjectBindingPattern */ && languageVersion < 7 /* ESNext */) {
+            if (node.kind === 187 /* BindingElement */) {
+                if (node.parent.kind === 185 /* ObjectBindingPattern */ && languageVersion < 8 /* ESNext */) {
                     checkExternalEmitHelpers(node, 4 /* Rest */);
                 }
                 // check computed properties inside property names of binding elements
-                if (node.propertyName && node.propertyName.kind === 149 /* ComputedPropertyName */) {
+                if (node.propertyName && node.propertyName.kind === 150 /* ComputedPropertyName */) {
                     checkComputedPropertyName(node.propertyName);
                 }
                 // check private/protected variable access
@@ -55248,35 +56094,48 @@ var ts;
                         var property = getPropertyOfType(parentType, nameText);
                         if (property) {
                             markPropertyAsReferenced(property, /*nodeForCheckWriteOnly*/ undefined, /*isThisAccess*/ false); // A destructuring is never a write-only reference.
-                            checkPropertyAccessibility(parent, !!parent.initializer && parent.initializer.kind === 98 /* SuperKeyword */, parentType, property);
+                            checkPropertyAccessibility(parent, !!parent.initializer && parent.initializer.kind === 99 /* SuperKeyword */, parentType, property);
                         }
                     }
                 }
             }
             // For a binding pattern, check contained binding elements
             if (ts.isBindingPattern(node.name)) {
-                if (node.name.kind === 185 /* ArrayBindingPattern */ && languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
+                if (node.name.kind === 186 /* ArrayBindingPattern */ && languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
                     checkExternalEmitHelpers(node, 512 /* Read */);
                 }
                 ts.forEach(node.name.elements, checkSourceElement);
             }
             // For a parameter declaration with an initializer, error and exit if the containing function doesn't have a body
-            if (node.initializer && ts.getRootDeclaration(node).kind === 151 /* Parameter */ && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
+            if (node.initializer && ts.getRootDeclaration(node).kind === 152 /* Parameter */ && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
                 error(node, ts.Diagnostics.A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation);
                 return;
             }
             // For a binding pattern, validate the initializer and exit
             if (ts.isBindingPattern(node.name)) {
-                // Don't validate for-in initializer as it is already an error
-                if (node.initializer && node.parent.parent.kind !== 226 /* ForInStatement */) {
-                    var initializerType = checkExpressionCached(node.initializer);
-                    if (strictNullChecks && node.name.elements.length === 0) {
-                        checkNonNullType(initializerType, node);
+                var needCheckInitializer = node.initializer && node.parent.parent.kind !== 227 /* ForInStatement */;
+                var needCheckWidenedType = node.name.elements.length === 0;
+                if (needCheckInitializer || needCheckWidenedType) {
+                    // Don't validate for-in initializer as it is already an error
+                    var widenedType = getWidenedTypeForVariableLikeDeclaration(node);
+                    if (needCheckInitializer) {
+                        var initializerType = checkExpressionCached(node.initializer);
+                        if (strictNullChecks && needCheckWidenedType) {
+                            checkNonNullNonVoidType(initializerType, node);
+                        }
+                        else {
+                            checkTypeAssignableToAndOptionallyElaborate(initializerType, getWidenedTypeForVariableLikeDeclaration(node), node, node.initializer);
+                        }
                     }
-                    else {
-                        checkTypeAssignableToAndOptionallyElaborate(initializerType, getWidenedTypeForVariableLikeDeclaration(node), node, node.initializer);
+                    // check the binding pattern with empty elements
+                    if (needCheckWidenedType) {
+                        if (ts.isArrayBindingPattern(node.name)) {
+                            checkIteratedTypeOrElementType(widenedType, node, /* allowStringInput */ false, /* allowAsyncIterables */ false);
+                        }
+                        else if (strictNullChecks) {
+                            checkNonNullNonVoidType(widenedType, node);
+                        }
                     }
-                    checkParameterInitializer(node);
                 }
                 return;
             }
@@ -55291,9 +56150,8 @@ var ts;
                         ts.isObjectLiteralExpression(initializer) &&
                         (initializer.properties.length === 0 || ts.isPrototypeAccess(node.name)) &&
                         ts.hasEntries(symbol.exports);
-                    if (!isJSObjectLiteralInitializer && node.parent.parent.kind !== 226 /* ForInStatement */) {
+                    if (!isJSObjectLiteralInitializer && node.parent.parent.kind !== 227 /* ForInStatement */) {
                         checkTypeAssignableToAndOptionallyElaborate(checkExpressionCached(initializer), type, node, initializer, /*headMessage*/ undefined);
-                        checkParameterInitializer(node);
                     }
                 }
                 if (symbol.declarations.length > 1) {
@@ -55309,7 +56167,7 @@ var ts;
                 if (type !== errorType && declarationType !== errorType &&
                     !isTypeIdenticalTo(type, declarationType) &&
                     !(symbol.flags & 67108864 /* Assignment */)) {
-                    errorNextVariableOrPropertyDeclarationMustHaveSameType(type, node, declarationType);
+                    errorNextVariableOrPropertyDeclarationMustHaveSameType(symbol.valueDeclaration, type, node, declarationType);
                 }
                 if (node.initializer) {
                     checkTypeAssignableToAndOptionallyElaborate(checkExpressionCached(node.initializer), declarationType, node, node.initializer, /*headMessage*/ undefined);
@@ -55318,26 +56176,30 @@ var ts;
                     error(node.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_modifiers, ts.declarationNameToString(node.name));
                 }
             }
-            if (node.kind !== 154 /* PropertyDeclaration */ && node.kind !== 153 /* PropertySignature */) {
+            if (node.kind !== 155 /* PropertyDeclaration */ && node.kind !== 154 /* PropertySignature */) {
                 // We know we don't have a binding pattern or computed name here
                 checkExportsOnMergedDeclarations(node);
-                if (node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */) {
+                if (node.kind === 238 /* VariableDeclaration */ || node.kind === 187 /* BindingElement */) {
                     checkVarDeclaredNamesNotShadowed(node);
                 }
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
                 checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             }
         }
-        function errorNextVariableOrPropertyDeclarationMustHaveSameType(firstType, nextDeclaration, nextType) {
+        function errorNextVariableOrPropertyDeclarationMustHaveSameType(firstDeclaration, firstType, nextDeclaration, nextType) {
             var nextDeclarationName = ts.getNameOfDeclaration(nextDeclaration);
-            var message = nextDeclaration.kind === 154 /* PropertyDeclaration */ || nextDeclaration.kind === 153 /* PropertySignature */
+            var message = nextDeclaration.kind === 155 /* PropertyDeclaration */ || nextDeclaration.kind === 154 /* PropertySignature */
                 ? ts.Diagnostics.Subsequent_property_declarations_must_have_the_same_type_Property_0_must_be_of_type_1_but_here_has_type_2
                 : ts.Diagnostics.Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2;
-            error(nextDeclarationName, message, ts.declarationNameToString(nextDeclarationName), typeToString(firstType), typeToString(nextType));
+            var declName = ts.declarationNameToString(nextDeclarationName);
+            var err = error(nextDeclarationName, message, declName, typeToString(firstType), typeToString(nextType));
+            if (firstDeclaration) {
+                ts.addRelatedInfo(err, ts.createDiagnosticForNode(firstDeclaration, ts.Diagnostics._0_was_also_declared_here, declName));
+            }
         }
         function areDeclarationFlagsIdentical(left, right) {
-            if ((left.kind === 151 /* Parameter */ && right.kind === 237 /* VariableDeclaration */) ||
-                (left.kind === 237 /* VariableDeclaration */ && right.kind === 151 /* Parameter */)) {
+            if ((left.kind === 152 /* Parameter */ && right.kind === 238 /* VariableDeclaration */) ||
+                (left.kind === 238 /* VariableDeclaration */ && right.kind === 152 /* Parameter */)) {
                 // Differences in optionality between parameters and variables are allowed.
                 return true;
             }
@@ -55376,7 +56238,7 @@ var ts;
             checkGrammarStatementInAmbientContext(node);
             checkTruthinessExpression(node.expression);
             checkSourceElement(node.thenStatement);
-            if (node.thenStatement.kind === 220 /* EmptyStatement */) {
+            if (node.thenStatement.kind === 221 /* EmptyStatement */) {
                 error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
             }
             checkSourceElement(node.elseStatement);
@@ -55403,12 +56265,12 @@ var ts;
         function checkForStatement(node) {
             // Grammar checking
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.initializer && node.initializer.kind === 238 /* VariableDeclarationList */) {
+                if (node.initializer && node.initializer.kind === 239 /* VariableDeclarationList */) {
                     checkGrammarVariableDeclarationList(node.initializer);
                 }
             }
             if (node.initializer) {
-                if (node.initializer.kind === 238 /* VariableDeclarationList */) {
+                if (node.initializer.kind === 239 /* VariableDeclarationList */) {
                     ts.forEach(node.initializer.declarations, checkVariableDeclaration);
                 }
                 else {
@@ -55428,7 +56290,7 @@ var ts;
             checkGrammarForInOrForOfStatement(node);
             if (node.awaitModifier) {
                 var functionFlags = ts.getFunctionFlags(ts.getContainingFunction(node));
-                if ((functionFlags & (4 /* Invalid */ | 2 /* Async */)) === 2 /* Async */ && languageVersion < 7 /* ESNext */) {
+                if ((functionFlags & (4 /* Invalid */ | 2 /* Async */)) === 2 /* Async */ && languageVersion < 8 /* ESNext */) {
                     // for..await..of in an async function or async generator function prior to ESNext requires the __asyncValues helper
                     checkExternalEmitHelpers(node, 16384 /* ForAwaitOfIncludes */);
                 }
@@ -55442,14 +56304,14 @@ var ts;
             // via checkRightHandSideOfForOf.
             // If the LHS is an expression, check the LHS, as a destructuring assignment or as a reference.
             // Then check that the RHS is assignable to it.
-            if (node.initializer.kind === 238 /* VariableDeclarationList */) {
+            if (node.initializer.kind === 239 /* VariableDeclarationList */) {
                 checkForInOrForOfVariableDeclaration(node);
             }
             else {
                 var varExpr = node.initializer;
                 var iteratedType = checkRightHandSideOfForOf(node.expression, node.awaitModifier);
                 // There may be a destructuring assignment on the left side
-                if (varExpr.kind === 187 /* ArrayLiteralExpression */ || varExpr.kind === 188 /* ObjectLiteralExpression */) {
+                if (varExpr.kind === 188 /* ArrayLiteralExpression */ || varExpr.kind === 189 /* ObjectLiteralExpression */) {
                     // iteratedType may be undefined. In this case, we still want to check the structure of
                     // varExpr, in particular making sure it's a valid LeftHandSideExpression. But we'd like
                     // to short circuit the type relation checking as much as possible, so we pass the unknownType.
@@ -55481,7 +56343,7 @@ var ts;
             // for (let VarDecl in Expr) Statement
             //   VarDecl must be a variable declaration without a type annotation that declares a variable of type Any,
             //   and Expr must be an expression of type Any, an object type, or a type parameter type.
-            if (node.initializer.kind === 238 /* VariableDeclarationList */) {
+            if (node.initializer.kind === 239 /* VariableDeclarationList */) {
                 var variable = node.initializer.declarations[0];
                 if (variable && ts.isBindingPattern(variable.name)) {
                     error(variable.name, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
@@ -55495,7 +56357,7 @@ var ts;
                 //   and Expr must be an expression of type Any, an object type, or a type parameter type.
                 var varExpr = node.initializer;
                 var leftType = checkExpression(varExpr);
-                if (varExpr.kind === 187 /* ArrayLiteralExpression */ || varExpr.kind === 188 /* ObjectLiteralExpression */) {
+                if (varExpr.kind === 188 /* ArrayLiteralExpression */ || varExpr.kind === 189 /* ObjectLiteralExpression */) {
                     error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
                 }
                 else if (!isTypeAssignableTo(getIndexTypeOrString(rightType), leftType)) {
@@ -55855,12 +56717,12 @@ var ts;
                     // for generators.
                     return;
                 }
-                else if (func.kind === 159 /* SetAccessor */) {
+                else if (func.kind === 160 /* SetAccessor */) {
                     if (node.expression) {
                         error(node, ts.Diagnostics.Setters_cannot_return_a_value);
                     }
                 }
-                else if (func.kind === 157 /* Constructor */) {
+                else if (func.kind === 158 /* Constructor */) {
                     if (node.expression && !checkTypeAssignableToAndOptionallyElaborate(exprType, returnType, node, node.expression)) {
                         error(node, ts.Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
                     }
@@ -55881,7 +56743,7 @@ var ts;
                     }
                 }
             }
-            else if (func.kind !== 157 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType) && !isGenerator) {
+            else if (func.kind !== 158 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType) && !isGenerator) {
                 // The function has a return type, but the return statement doesn't have an expression.
                 error(node, ts.Diagnostics.Not_all_code_paths_return_a_value);
             }
@@ -55910,7 +56772,7 @@ var ts;
             var expressionIsLiteral = isLiteralType(expressionType);
             ts.forEach(node.caseBlock.clauses, function (clause) {
                 // Grammar check for duplicate default clauses, skip if we already report duplicate default clause
-                if (clause.kind === 272 /* DefaultClause */ && !hasDuplicateDefaultClause) {
+                if (clause.kind === 273 /* DefaultClause */ && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
                         firstDefaultClause = clause;
                     }
@@ -55922,7 +56784,7 @@ var ts;
                         hasDuplicateDefaultClause = true;
                     }
                 }
-                if (produceDiagnostics && clause.kind === 271 /* CaseClause */) {
+                if (produceDiagnostics && clause.kind === 272 /* CaseClause */) {
                     // TypeScript 1.0 spec (April 2014): 5.9
                     // In a 'switch' statement, each 'case' expression must be of a type that is comparable
                     // to or from the type of the 'switch' expression.
@@ -55951,7 +56813,7 @@ var ts;
                     if (ts.isFunctionLike(current)) {
                         return "quit";
                     }
-                    if (current.kind === 233 /* LabeledStatement */ && current.label.escapedText === node.label.escapedText) {
+                    if (current.kind === 234 /* LabeledStatement */ && current.label.escapedText === node.label.escapedText) {
                         grammarErrorOnNode(node.label, ts.Diagnostics.Duplicate_label_0, ts.getTextOfNode(node.label));
                         return true;
                     }
@@ -56058,8 +56920,8 @@ var ts;
                 // this allows us to rule out cases when both property and indexer are inherited from the base class
                 var errorNode;
                 if (propDeclaration && name &&
-                    (propDeclaration.kind === 204 /* BinaryExpression */ ||
-                        name.kind === 149 /* ComputedPropertyName */ ||
+                    (propDeclaration.kind === 205 /* BinaryExpression */ ||
+                        name.kind === 150 /* ComputedPropertyName */ ||
                         prop.parent === containingType.symbol)) {
                     errorNode = propDeclaration;
                 }
@@ -56136,7 +56998,7 @@ var ts;
         function checkTypeParametersNotReferenced(root, typeParameters, index) {
             visit(root);
             function visit(node) {
-                if (node.kind === 164 /* TypeReference */) {
+                if (node.kind === 165 /* TypeReference */) {
                     var type = getTypeFromTypeReference(node);
                     if (type.flags & 262144 /* TypeParameter */) {
                         for (var i = index; i < typeParameters.length; i++) {
@@ -56258,6 +57120,11 @@ var ts;
                 if (languageVersion < 2 /* ES2015 */) {
                     checkExternalEmitHelpers(baseTypeNode.parent, 1 /* Extends */);
                 }
+                // check both @extends and extends if both are specified.
+                var extendsNode = ts.getClassExtendsHeritageElement(node);
+                if (extendsNode && extendsNode !== baseTypeNode) {
+                    checkExpression(extendsNode.expression);
+                }
                 var baseTypes = getBaseTypes(type);
                 if (baseTypes.length && produceDiagnostics) {
                     var baseType_1 = baseTypes[0];
@@ -56265,10 +57132,6 @@ var ts;
                     var staticBaseType = getApparentType(baseConstructorType);
                     checkBaseTypeAccessibility(staticBaseType, baseTypeNode);
                     checkSourceElement(baseTypeNode.expression);
-                    var extendsNode = ts.getClassExtendsHeritageElement(node);
-                    if (extendsNode && extendsNode !== baseTypeNode) {
-                        checkExpression(extendsNode.expression);
-                    }
                     if (ts.some(baseTypeNode.typeArguments)) {
                         ts.forEach(baseTypeNode.typeArguments, checkSourceElement);
                         for (var _i = 0, _a = getConstructorsForTypeArguments(staticBaseType, baseTypeNode.typeArguments, baseTypeNode); _i < _a.length; _i++) {
@@ -56339,7 +57202,7 @@ var ts;
         function issueMemberSpecificError(node, typeWithThis, baseWithThis, broadDiag) {
             // iterate over all implemented properties and issue errors on each one which isn't compatible, rather than the class as a whole, if possible
             var issuedMemberError = false;
-            var _loop_9 = function (member) {
+            var _loop_12 = function (member) {
                 if (ts.hasStaticModifier(member)) {
                     return "continue";
                 }
@@ -56358,7 +57221,7 @@ var ts;
             };
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                _loop_9(member);
+                _loop_12(member);
             }
             if (!issuedMemberError) {
                 // check again with diagnostics to generate a less-specific error
@@ -56384,7 +57247,7 @@ var ts;
         }
         function getClassOrInterfaceDeclarationsOfSymbol(symbol) {
             return ts.filter(symbol.declarations, function (d) {
-                return d.kind === 240 /* ClassDeclaration */ || d.kind === 241 /* InterfaceDeclaration */;
+                return d.kind === 241 /* ClassDeclaration */ || d.kind === 242 /* InterfaceDeclaration */;
             });
         }
         function checkKindsOfPropertyMemberOverrides(type, baseType) {
@@ -56423,7 +57286,7 @@ var ts;
                         // If there is no declaration for the derived class (as in the case of class expressions),
                         // then the class cannot be declared abstract.
                         if (baseDeclarationFlags & 128 /* Abstract */ && (!derivedClassDecl || !ts.hasModifier(derivedClassDecl, 128 /* Abstract */))) {
-                            if (derivedClassDecl.kind === 209 /* ClassExpression */) {
+                            if (derivedClassDecl.kind === 210 /* ClassExpression */) {
                                 error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType));
                             }
                             else {
@@ -56473,8 +57336,8 @@ var ts;
             for (var _i = 0, baseTypes_2 = baseTypes; _i < baseTypes_2.length; _i++) {
                 var base = baseTypes_2[_i];
                 var properties = getPropertiesOfType(getTypeWithThisArgument(base, type.thisType));
-                for (var _a = 0, properties_7 = properties; _a < properties_7.length; _a++) {
-                    var prop = properties_7[_a];
+                for (var _a = 0, properties_4 = properties; _a < properties_4.length; _a++) {
+                    var prop = properties_4[_a];
                     var existing = seen.get(prop.escapedName);
                     if (!existing) {
                         seen.set(prop.escapedName, { prop: prop, containingType: base });
@@ -56515,7 +57378,7 @@ var ts;
             }
         }
         function isInstancePropertyWithoutInitializer(node) {
-            return node.kind === 154 /* PropertyDeclaration */ &&
+            return node.kind === 155 /* PropertyDeclaration */ &&
                 !ts.hasModifier(node, 32 /* Static */ | 128 /* Abstract */) &&
                 !node.exclamationToken &&
                 !node.initializer;
@@ -56539,7 +57402,7 @@ var ts;
                 var symbol = getSymbolOfNode(node);
                 checkTypeParameterListsIdentical(symbol);
                 // Only check this symbol once
-                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 241 /* InterfaceDeclaration */);
+                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 242 /* InterfaceDeclaration */);
                 if (node === firstInterfaceDecl) {
                     var type = getDeclaredTypeOfSymbol(symbol);
                     var typeWithThis = getTypeWithThisArgument(type);
@@ -56644,7 +57507,7 @@ var ts;
             return value;
             function evaluate(expr) {
                 switch (expr.kind) {
-                    case 202 /* PrefixUnaryExpression */:
+                    case 203 /* PrefixUnaryExpression */:
                         var value_2 = evaluate(expr.operand);
                         if (typeof value_2 === "number") {
                             switch (expr.operator) {
@@ -56654,7 +57517,7 @@ var ts;
                             }
                         }
                         break;
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         var left = evaluate(expr.left);
                         var right = evaluate(expr.right);
                         if (typeof left === "number" && typeof right === "number") {
@@ -56682,22 +57545,22 @@ var ts;
                     case 8 /* NumericLiteral */:
                         checkGrammarNumericLiteral(expr);
                         return +expr.text;
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return evaluate(expr.expression);
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         var identifier = expr;
                         if (isInfinityOrNaNString(identifier.escapedText)) {
                             return +(identifier.escapedText);
                         }
                         return ts.nodeIsMissing(expr) ? 0 : evaluateEnumMember(expr, getSymbolOfNode(member.parent), identifier.escapedText);
-                    case 190 /* ElementAccessExpression */:
-                    case 189 /* PropertyAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         var ex = expr;
                         if (isConstantMemberAccess(ex)) {
                             var type = getTypeOfExpression(ex.expression);
                             if (type.symbol && type.symbol.flags & 384 /* Enum */) {
                                 var name = void 0;
-                                if (ex.kind === 189 /* PropertyAccessExpression */) {
+                                if (ex.kind === 190 /* PropertyAccessExpression */) {
                                     name = ex.name.escapedText;
                                 }
                                 else {
@@ -56728,9 +57591,9 @@ var ts;
             }
         }
         function isConstantMemberAccess(node) {
-            return node.kind === 72 /* Identifier */ ||
-                node.kind === 189 /* PropertyAccessExpression */ && isConstantMemberAccess(node.expression) ||
-                node.kind === 190 /* ElementAccessExpression */ && isConstantMemberAccess(node.expression) &&
+            return node.kind === 73 /* Identifier */ ||
+                node.kind === 190 /* PropertyAccessExpression */ && isConstantMemberAccess(node.expression) ||
+                node.kind === 191 /* ElementAccessExpression */ && isConstantMemberAccess(node.expression) &&
                     node.argumentExpression.kind === 10 /* StringLiteral */;
         }
         function checkEnumDeclaration(node) {
@@ -56765,7 +57628,7 @@ var ts;
                 var seenEnumMissingInitialInitializer_1 = false;
                 ts.forEach(enumSymbol.declarations, function (declaration) {
                     // return true if we hit a violation of the rule, false otherwise
-                    if (declaration.kind !== 243 /* EnumDeclaration */) {
+                    if (declaration.kind !== 244 /* EnumDeclaration */) {
                         return false;
                     }
                     var enumDeclaration = declaration;
@@ -56788,8 +57651,8 @@ var ts;
             var declarations = symbol.declarations;
             for (var _i = 0, declarations_8 = declarations; _i < declarations_8.length; _i++) {
                 var declaration = declarations_8[_i];
-                if ((declaration.kind === 240 /* ClassDeclaration */ ||
-                    (declaration.kind === 239 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
+                if ((declaration.kind === 241 /* ClassDeclaration */ ||
+                    (declaration.kind === 240 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
                     !(declaration.flags & 4194304 /* Ambient */)) {
                     return declaration;
                 }
@@ -56852,7 +57715,7 @@ var ts;
                     }
                     // if the module merges with a class declaration in the same lexical scope,
                     // we need to track this to ensure the correct emit.
-                    var mergedClass = ts.getDeclarationOfKind(symbol, 240 /* ClassDeclaration */);
+                    var mergedClass = ts.getDeclarationOfKind(symbol, 241 /* ClassDeclaration */);
                     if (mergedClass &&
                         inSameLexicalScope(node, mergedClass)) {
                         getNodeLinks(node).flags |= 32768 /* LexicalModuleMergesWithClass */;
@@ -56902,23 +57765,23 @@ var ts;
         }
         function checkModuleAugmentationElement(node, isGlobalAugmentation) {
             switch (node.kind) {
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     // error each individual name in variable statement instead of marking the entire variable statement
                     for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
                         checkModuleAugmentationElement(decl, isGlobalAugmentation);
                     }
                     break;
-                case 254 /* ExportAssignment */:
-                case 255 /* ExportDeclaration */:
+                case 255 /* ExportAssignment */:
+                case 256 /* ExportDeclaration */:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Exports_and_export_assignments_are_not_permitted_in_module_augmentations);
                     break;
-                case 248 /* ImportEqualsDeclaration */:
-                case 249 /* ImportDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 250 /* ImportDeclaration */:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module);
                     break;
-                case 186 /* BindingElement */:
-                case 237 /* VariableDeclaration */:
+                case 187 /* BindingElement */:
+                case 238 /* VariableDeclaration */:
                     var name = node.name;
                     if (ts.isBindingPattern(name)) {
                         for (var _b = 0, _c = name.elements; _b < _c.length; _b++) {
@@ -56929,12 +57792,12 @@ var ts;
                         break;
                     }
                 // falls through
-                case 240 /* ClassDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 239 /* FunctionDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     if (isGlobalAugmentation) {
                         return;
                     }
@@ -56955,17 +57818,17 @@ var ts;
         }
         function getFirstIdentifier(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return node;
-                case 148 /* QualifiedName */:
+                case 149 /* QualifiedName */:
                     do {
                         node = node.left;
-                    } while (node.kind !== 72 /* Identifier */);
+                    } while (node.kind !== 73 /* Identifier */);
                     return node;
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     do {
                         node = node.expression;
-                    } while (node.kind !== 72 /* Identifier */);
+                    } while (node.kind !== 73 /* Identifier */);
                     return node;
             }
         }
@@ -56979,9 +57842,9 @@ var ts;
                 error(moduleName, ts.Diagnostics.String_literal_expected);
                 return false;
             }
-            var inAmbientExternalModule = node.parent.kind === 245 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-            if (node.parent.kind !== 284 /* SourceFile */ && !inAmbientExternalModule) {
-                error(moduleName, node.kind === 255 /* ExportDeclaration */ ?
+            var inAmbientExternalModule = node.parent.kind === 246 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+            if (node.parent.kind !== 285 /* SourceFile */ && !inAmbientExternalModule) {
+                error(moduleName, node.kind === 256 /* ExportDeclaration */ ?
                     ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace :
                     ts.Diagnostics.Import_declarations_in_a_namespace_cannot_reference_a_module);
                 return false;
@@ -57014,14 +57877,14 @@ var ts;
                     (symbol.flags & 67897832 /* Type */ ? 67897832 /* Type */ : 0) |
                     (symbol.flags & 1920 /* Namespace */ ? 1920 /* Namespace */ : 0);
                 if (target.flags & excludedMeanings) {
-                    var message = node.kind === 257 /* ExportSpecifier */ ?
+                    var message = node.kind === 258 /* ExportSpecifier */ ?
                         ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 :
                         ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
                     error(node, message, symbolToString(symbol));
                 }
                 // Don't allow to re-export something with no value side when `--isolatedModules` is set.
                 if (compilerOptions.isolatedModules
-                    && node.kind === 257 /* ExportSpecifier */
+                    && node.kind === 258 /* ExportSpecifier */
                     && !(target.flags & 67220415 /* Value */)
                     && !(node.flags & 4194304 /* Ambient */)) {
                     error(node, ts.Diagnostics.Cannot_re_export_a_type_when_the_isolatedModules_flag_is_provided);
@@ -57048,7 +57911,7 @@ var ts;
                         checkImportBinding(importClause);
                     }
                     if (importClause.namedBindings) {
-                        if (importClause.namedBindings.kind === 251 /* NamespaceImport */) {
+                        if (importClause.namedBindings.kind === 252 /* NamespaceImport */) {
                             checkImportBinding(importClause.namedBindings);
                         }
                         else {
@@ -57072,7 +57935,7 @@ var ts;
                 if (ts.hasModifier(node, 1 /* Export */)) {
                     markExportAsReferenced(node);
                 }
-                if (node.moduleReference.kind !== 259 /* ExternalModuleReference */) {
+                if (node.moduleReference.kind !== 260 /* ExternalModuleReference */) {
                     var target = resolveAlias(getSymbolOfNode(node));
                     if (target !== unknownSymbol) {
                         if (target.flags & 67220415 /* Value */) {
@@ -57108,10 +57971,10 @@ var ts;
                     // export { x, y }
                     // export { x, y } from "foo"
                     ts.forEach(node.exportClause.elements, checkExportSpecifier);
-                    var inAmbientExternalModule = node.parent.kind === 245 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-                    var inAmbientNamespaceDeclaration = !inAmbientExternalModule && node.parent.kind === 245 /* ModuleBlock */ &&
+                    var inAmbientExternalModule = node.parent.kind === 246 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+                    var inAmbientNamespaceDeclaration = !inAmbientExternalModule && node.parent.kind === 246 /* ModuleBlock */ &&
                         !node.moduleSpecifier && node.flags & 4194304 /* Ambient */;
-                    if (node.parent.kind !== 284 /* SourceFile */ && !inAmbientExternalModule && !inAmbientNamespaceDeclaration) {
+                    if (node.parent.kind !== 285 /* SourceFile */ && !inAmbientExternalModule && !inAmbientNamespaceDeclaration) {
                         error(node, ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace);
                     }
                 }
@@ -57128,7 +57991,7 @@ var ts;
             }
         }
         function checkGrammarModuleElementContext(node, errorMessage) {
-            var isInAppropriateContext = node.parent.kind === 284 /* SourceFile */ || node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 244 /* ModuleDeclaration */;
+            var isInAppropriateContext = node.parent.kind === 285 /* SourceFile */ || node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 245 /* ModuleDeclaration */;
             if (!isInAppropriateContext) {
                 grammarErrorOnFirstToken(node, errorMessage);
             }
@@ -57157,8 +58020,8 @@ var ts;
                 // If we hit an export assignment in an illegal context, just bail out to avoid cascading errors.
                 return;
             }
-            var container = node.parent.kind === 284 /* SourceFile */ ? node.parent : node.parent.parent;
-            if (container.kind === 244 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
+            var container = node.parent.kind === 285 /* SourceFile */ ? node.parent : node.parent.parent;
+            if (container.kind === 245 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
                 if (node.isExportEquals) {
                     error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
                 }
@@ -57171,7 +58034,7 @@ var ts;
             if (!checkGrammarDecoratorsAndModifiers(node) && ts.hasModifiers(node)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_assignment_cannot_have_modifiers);
             }
-            if (node.expression.kind === 72 /* Identifier */) {
+            if (node.expression.kind === 73 /* Identifier */) {
                 markExportAsReferenced(node);
                 if (ts.getEmitDeclarations(compilerOptions)) {
                     collectLinkedAliases(node.expression, /*setVisibility*/ true);
@@ -57246,7 +58109,7 @@ var ts;
             return !ts.isAccessor(declaration);
         }
         function isNotOverload(declaration) {
-            return (declaration.kind !== 239 /* FunctionDeclaration */ && declaration.kind !== 156 /* MethodDeclaration */) ||
+            return (declaration.kind !== 240 /* FunctionDeclaration */ && declaration.kind !== 157 /* MethodDeclaration */) ||
                 !!declaration.body;
         }
         function checkSourceElement(node) {
@@ -57269,158 +58132,158 @@ var ts;
                 // Only bother checking on a few construct kinds.  We don't want to be excessively
                 // hitting the cancellation token on every node we check.
                 switch (kind) {
-                    case 244 /* ModuleDeclaration */:
-                    case 240 /* ClassDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 239 /* FunctionDeclaration */:
+                    case 245 /* ModuleDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 240 /* FunctionDeclaration */:
                         cancellationToken.throwIfCancellationRequested();
                 }
             }
             switch (kind) {
-                case 150 /* TypeParameter */:
+                case 151 /* TypeParameter */:
                     return checkTypeParameter(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return checkParameter(node);
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     return checkPropertyDeclaration(node);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 162 /* IndexSignature */:
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 163 /* IndexSignature */:
                     return checkSignatureDeclaration(node);
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     return checkMethodDeclaration(node);
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return checkConstructorDeclaration(node);
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return checkAccessorDeclaration(node);
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return checkTypeReferenceNode(node);
-                case 163 /* TypePredicate */:
+                case 164 /* TypePredicate */:
                     return checkTypePredicate(node);
-                case 167 /* TypeQuery */:
+                case 168 /* TypeQuery */:
                     return checkTypeQuery(node);
-                case 168 /* TypeLiteral */:
+                case 169 /* TypeLiteral */:
                     return checkTypeLiteral(node);
-                case 169 /* ArrayType */:
+                case 170 /* ArrayType */:
                     return checkArrayType(node);
-                case 170 /* TupleType */:
+                case 171 /* TupleType */:
                     return checkTupleType(node);
-                case 173 /* UnionType */:
-                case 174 /* IntersectionType */:
+                case 174 /* UnionType */:
+                case 175 /* IntersectionType */:
                     return checkUnionOrIntersectionType(node);
-                case 177 /* ParenthesizedType */:
-                case 171 /* OptionalType */:
-                case 172 /* RestType */:
+                case 178 /* ParenthesizedType */:
+                case 172 /* OptionalType */:
+                case 173 /* RestType */:
                     return checkSourceElement(node.type);
-                case 178 /* ThisType */:
+                case 179 /* ThisType */:
                     return checkThisType(node);
-                case 179 /* TypeOperator */:
+                case 180 /* TypeOperator */:
                     return checkTypeOperator(node);
-                case 175 /* ConditionalType */:
+                case 176 /* ConditionalType */:
                     return checkConditionalType(node);
-                case 176 /* InferType */:
+                case 177 /* InferType */:
                     return checkInferType(node);
-                case 183 /* ImportType */:
+                case 184 /* ImportType */:
                     return checkImportType(node);
-                case 300 /* JSDocAugmentsTag */:
+                case 301 /* JSDocAugmentsTag */:
                     return checkJSDocAugmentsTag(node);
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
+                case 310 /* JSDocTypedefTag */:
+                case 303 /* JSDocCallbackTag */:
                     return checkJSDocTypeAliasTag(node);
-                case 308 /* JSDocTemplateTag */:
+                case 309 /* JSDocTemplateTag */:
                     return checkJSDocTemplateTag(node);
-                case 307 /* JSDocTypeTag */:
+                case 308 /* JSDocTypeTag */:
                     return checkJSDocTypeTag(node);
-                case 304 /* JSDocParameterTag */:
+                case 305 /* JSDocParameterTag */:
                     return checkJSDocParameterTag(node);
-                case 294 /* JSDocFunctionType */:
+                case 295 /* JSDocFunctionType */:
                     checkJSDocFunctionType(node);
                 // falls through
-                case 292 /* JSDocNonNullableType */:
-                case 291 /* JSDocNullableType */:
-                case 289 /* JSDocAllType */:
-                case 290 /* JSDocUnknownType */:
-                case 297 /* JSDocTypeLiteral */:
+                case 293 /* JSDocNonNullableType */:
+                case 292 /* JSDocNullableType */:
+                case 290 /* JSDocAllType */:
+                case 291 /* JSDocUnknownType */:
+                case 298 /* JSDocTypeLiteral */:
                     checkJSDocTypeIsInJsFile(node);
                     ts.forEachChild(node, checkSourceElement);
                     return;
-                case 295 /* JSDocVariadicType */:
+                case 296 /* JSDocVariadicType */:
                     checkJSDocVariadicType(node);
                     return;
-                case 288 /* JSDocTypeExpression */:
+                case 289 /* JSDocTypeExpression */:
                     return checkSourceElement(node.type);
-                case 180 /* IndexedAccessType */:
+                case 181 /* IndexedAccessType */:
                     return checkIndexedAccessType(node);
-                case 181 /* MappedType */:
+                case 182 /* MappedType */:
                     return checkMappedType(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return checkFunctionDeclaration(node);
-                case 218 /* Block */:
-                case 245 /* ModuleBlock */:
+                case 219 /* Block */:
+                case 246 /* ModuleBlock */:
                     return checkBlock(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return checkVariableStatement(node);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return checkExpressionStatement(node);
-                case 222 /* IfStatement */:
+                case 223 /* IfStatement */:
                     return checkIfStatement(node);
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     return checkDoStatement(node);
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     return checkWhileStatement(node);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return checkForStatement(node);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return checkForInStatement(node);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return checkForOfStatement(node);
-                case 228 /* ContinueStatement */:
-                case 229 /* BreakStatement */:
+                case 229 /* ContinueStatement */:
+                case 230 /* BreakStatement */:
                     return checkBreakOrContinueStatement(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return checkReturnStatement(node);
-                case 231 /* WithStatement */:
+                case 232 /* WithStatement */:
                     return checkWithStatement(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return checkSwitchStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return checkLabeledStatement(node);
-                case 234 /* ThrowStatement */:
+                case 235 /* ThrowStatement */:
                     return checkThrowStatement(node);
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     return checkTryStatement(node);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return checkVariableDeclaration(node);
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     return checkBindingElement(node);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return checkClassDeclaration(node);
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return checkInterfaceDeclaration(node);
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     return checkTypeAliasDeclaration(node);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return checkEnumDeclaration(node);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return checkModuleDeclaration(node);
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return checkImportDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return checkImportEqualsDeclaration(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return checkExportDeclaration(node);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return checkExportAssignment(node);
-                case 220 /* EmptyStatement */:
-                case 236 /* DebuggerStatement */:
+                case 221 /* EmptyStatement */:
+                case 237 /* DebuggerStatement */:
                     checkGrammarStatementInAmbientContext(node);
                     return;
-                case 258 /* MissingDeclaration */:
+                case 259 /* MissingDeclaration */:
                     return checkMissingDeclaration(node);
             }
         }
@@ -57514,23 +58377,23 @@ var ts;
             var saveCurrentNode = currentNode;
             currentNode = node;
             switch (node.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     checkFunctionExpressionOrObjectLiteralMethodDeferred(node);
                     break;
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     checkAccessorDeclaration(node);
                     break;
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     checkClassExpressionDeferred(node);
                     break;
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     checkJsxSelfClosingElementDeferred(node);
                     break;
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     checkJsxElementDeferred(node);
                     break;
             }
@@ -57660,17 +58523,17 @@ var ts;
                         copySymbols(location.locals, meaning);
                     }
                     switch (location.kind) {
-                        case 284 /* SourceFile */:
+                        case 285 /* SourceFile */:
                             if (!ts.isExternalOrCommonJsModule(location))
                                 break;
                         // falls through
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 2623475 /* ModuleMember */);
                             break;
-                        case 243 /* EnumDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8 /* EnumMember */);
                             break;
-                        case 209 /* ClassExpression */:
+                        case 210 /* ClassExpression */:
                             var className = location.name;
                             if (className) {
                                 copySymbol(location.symbol, meaning);
@@ -57678,8 +58541,8 @@ var ts;
                         // falls through
                         // this fall-through is necessary because we would like to handle
                         // type parameter inside class expression similar to how we handle it in classDeclaration and interface Declaration
-                        case 240 /* ClassDeclaration */:
-                        case 241 /* InterfaceDeclaration */:
+                        case 241 /* ClassDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
                             // If we didn't come from static member of class or interface,
                             // add the type parameters into the symbol table
                             // (type parameters of classDeclaration/classExpression and interface are in member property of the symbol.
@@ -57688,7 +58551,7 @@ var ts;
                                 copySymbols(getMembersOfSymbol(getSymbolOfNode(location)), meaning & 67897832 /* Type */);
                             }
                             break;
-                        case 196 /* FunctionExpression */:
+                        case 197 /* FunctionExpression */:
                             var funcName = location.name;
                             if (funcName) {
                                 copySymbol(location.symbol, meaning);
@@ -57730,17 +58593,17 @@ var ts;
             }
         }
         function isTypeDeclarationName(name) {
-            return name.kind === 72 /* Identifier */ &&
+            return name.kind === 73 /* Identifier */ &&
                 isTypeDeclaration(name.parent) &&
                 name.parent.name === name;
         }
         function isTypeDeclaration(node) {
             switch (node.kind) {
-                case 150 /* TypeParameter */:
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 243 /* EnumDeclaration */:
+                case 151 /* TypeParameter */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return true;
                 default:
                     return false;
@@ -57748,16 +58611,16 @@ var ts;
         }
         // True if the given identifier is part of a type reference
         function isTypeReferenceIdentifier(node) {
-            while (node.parent.kind === 148 /* QualifiedName */) {
+            while (node.parent.kind === 149 /* QualifiedName */) {
                 node = node.parent;
             }
-            return node.parent.kind === 164 /* TypeReference */;
+            return node.parent.kind === 165 /* TypeReference */;
         }
         function isHeritageClauseElementIdentifier(node) {
-            while (node.parent.kind === 189 /* PropertyAccessExpression */) {
+            while (node.parent.kind === 190 /* PropertyAccessExpression */) {
                 node = node.parent;
             }
-            return node.parent.kind === 211 /* ExpressionWithTypeArguments */;
+            return node.parent.kind === 212 /* ExpressionWithTypeArguments */;
         }
         function forEachEnclosingClass(node, callback) {
             var result;
@@ -57785,13 +58648,13 @@ var ts;
             return !!forEachEnclosingClass(node, function (n) { return n === classDeclaration; });
         }
         function getLeftSideOfImportEqualsOrExportAssignment(nodeOnRightSide) {
-            while (nodeOnRightSide.parent.kind === 148 /* QualifiedName */) {
+            while (nodeOnRightSide.parent.kind === 149 /* QualifiedName */) {
                 nodeOnRightSide = nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 248 /* ImportEqualsDeclaration */) {
+            if (nodeOnRightSide.parent.kind === 249 /* ImportEqualsDeclaration */) {
                 return nodeOnRightSide.parent.moduleReference === nodeOnRightSide ? nodeOnRightSide.parent : undefined;
             }
-            if (nodeOnRightSide.parent.kind === 254 /* ExportAssignment */) {
+            if (nodeOnRightSide.parent.kind === 255 /* ExportAssignment */) {
                 return nodeOnRightSide.parent.expression === nodeOnRightSide ? nodeOnRightSide.parent : undefined;
             }
             return undefined;
@@ -57817,7 +58680,7 @@ var ts;
                 node = parent;
                 parent = parent.parent;
             }
-            if (parent && parent.kind === 183 /* ImportType */ && parent.qualifier === node) {
+            if (parent && parent.kind === 184 /* ImportType */ && parent.qualifier === node) {
                 return parent;
             }
             return undefined;
@@ -57827,7 +58690,7 @@ var ts;
                 return getSymbolOfNode(entityName.parent);
             }
             if (ts.isInJSFile(entityName) &&
-                entityName.parent.kind === 189 /* PropertyAccessExpression */ &&
+                entityName.parent.kind === 190 /* PropertyAccessExpression */ &&
                 entityName.parent === entityName.parent.parent.left) {
                 // Check if this is a special property assignment
                 var specialPropertyAssignmentSymbol = getSpecialPropertyAssignmentSymbolFromEntityName(entityName);
@@ -57835,7 +58698,7 @@ var ts;
                     return specialPropertyAssignmentSymbol;
                 }
             }
-            if (entityName.parent.kind === 254 /* ExportAssignment */ && ts.isEntityNameExpression(entityName)) {
+            if (entityName.parent.kind === 255 /* ExportAssignment */ && ts.isEntityNameExpression(entityName)) {
                 // Even an entity name expression that doesn't resolve as an entityname may still typecheck as a property access expression
                 var success = resolveEntityName(entityName, 
                 /*all meanings*/ 67220415 /* Value */ | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */, /*ignoreErrors*/ true);
@@ -57845,7 +58708,7 @@ var ts;
             }
             else if (!ts.isPropertyAccessExpression(entityName) && isInRightSideOfImportOrExportAssignment(entityName)) {
                 // Since we already checked for ExportAssignment, this really could only be an Import
-                var importEqualsDeclaration = ts.getAncestor(entityName, 248 /* ImportEqualsDeclaration */);
+                var importEqualsDeclaration = ts.getAncestor(entityName, 249 /* ImportEqualsDeclaration */);
                 ts.Debug.assert(importEqualsDeclaration !== undefined);
                 return getSymbolOfPartOfRightHandSideOfImportEquals(entityName, /*dontResolveAlias*/ true);
             }
@@ -57863,7 +58726,7 @@ var ts;
             if (isHeritageClauseElementIdentifier(entityName)) {
                 var meaning = 0 /* None */;
                 // In an interface or class, we're definitely interested in a type.
-                if (entityName.parent.kind === 211 /* ExpressionWithTypeArguments */) {
+                if (entityName.parent.kind === 212 /* ExpressionWithTypeArguments */) {
                     meaning = 67897832 /* Type */;
                     // In a class 'extends' clause we are also looking for a value.
                     if (ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
@@ -57879,10 +58742,10 @@ var ts;
                     return entityNameSymbol;
                 }
             }
-            if (entityName.parent.kind === 304 /* JSDocParameterTag */) {
+            if (entityName.parent.kind === 305 /* JSDocParameterTag */) {
                 return ts.getParameterSymbolFromJSDoc(entityName.parent);
             }
-            if (entityName.parent.kind === 150 /* TypeParameter */ && entityName.parent.parent.kind === 308 /* JSDocTemplateTag */) {
+            if (entityName.parent.kind === 151 /* TypeParameter */ && entityName.parent.parent.kind === 309 /* JSDocTemplateTag */) {
                 ts.Debug.assert(!ts.isInJSFile(entityName)); // Otherwise `isDeclarationName` would have been true.
                 var typeParameter = ts.getTypeParameterFromJsDoc(entityName.parent);
                 return typeParameter && typeParameter.symbol;
@@ -57892,19 +58755,19 @@ var ts;
                     // Missing entity name.
                     return undefined;
                 }
-                if (entityName.kind === 72 /* Identifier */) {
+                if (entityName.kind === 73 /* Identifier */) {
                     if (ts.isJSXTagName(entityName) && isJsxIntrinsicIdentifier(entityName)) {
                         var symbol = getIntrinsicTagSymbol(entityName.parent);
                         return symbol === unknownSymbol ? undefined : symbol;
                     }
                     return resolveEntityName(entityName, 67220415 /* Value */, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
                 }
-                else if (entityName.kind === 189 /* PropertyAccessExpression */ || entityName.kind === 148 /* QualifiedName */) {
+                else if (entityName.kind === 190 /* PropertyAccessExpression */ || entityName.kind === 149 /* QualifiedName */) {
                     var links = getNodeLinks(entityName);
                     if (links.resolvedSymbol) {
                         return links.resolvedSymbol;
                     }
-                    if (entityName.kind === 189 /* PropertyAccessExpression */) {
+                    if (entityName.kind === 190 /* PropertyAccessExpression */) {
                         checkPropertyAccessExpression(entityName);
                     }
                     else {
@@ -57914,17 +58777,17 @@ var ts;
                 }
             }
             else if (isTypeReferenceIdentifier(entityName)) {
-                var meaning = entityName.parent.kind === 164 /* TypeReference */ ? 67897832 /* Type */ : 1920 /* Namespace */;
+                var meaning = entityName.parent.kind === 165 /* TypeReference */ ? 67897832 /* Type */ : 1920 /* Namespace */;
                 return resolveEntityName(entityName, meaning, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
             }
-            if (entityName.parent.kind === 163 /* TypePredicate */) {
+            if (entityName.parent.kind === 164 /* TypePredicate */) {
                 return resolveEntityName(entityName, /*meaning*/ 1 /* FunctionScopedVariable */);
             }
             // Do we want to return undefined here?
             return undefined;
         }
         function getSymbolAtLocation(node) {
-            if (node.kind === 284 /* SourceFile */) {
+            if (node.kind === 285 /* SourceFile */) {
                 return ts.isExternalModule(node) ? getMergedSymbol(node.symbol) : undefined;
             }
             var parent = node.parent;
@@ -57943,12 +58806,12 @@ var ts;
             else if (ts.isLiteralComputedPropertyDeclarationName(node)) {
                 return getSymbolOfNode(parent.parent);
             }
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 if (isInRightSideOfImportOrExportAssignment(node)) {
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
                 }
-                else if (parent.kind === 186 /* BindingElement */ &&
-                    grandParent.kind === 184 /* ObjectBindingPattern */ &&
+                else if (parent.kind === 187 /* BindingElement */ &&
+                    grandParent.kind === 185 /* ObjectBindingPattern */ &&
                     node === parent.propertyName) {
                     var typeOfPattern = getTypeOfNode(grandParent);
                     var propertyDeclaration = getPropertyOfType(typeOfPattern, node.escapedText);
@@ -57958,11 +58821,11 @@ var ts;
                 }
             }
             switch (node.kind) {
-                case 72 /* Identifier */:
-                case 189 /* PropertyAccessExpression */:
-                case 148 /* QualifiedName */:
+                case 73 /* Identifier */:
+                case 190 /* PropertyAccessExpression */:
+                case 149 /* QualifiedName */:
                     return getSymbolOfEntityNameOrPropertyAccessExpression(node);
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
                     if (ts.isFunctionLike(container)) {
                         var sig = getSignatureFromDeclaration(container);
@@ -57974,14 +58837,14 @@ var ts;
                         return checkExpression(node).symbol;
                     }
                 // falls through
-                case 178 /* ThisType */:
+                case 179 /* ThisType */:
                     return getTypeFromThisTypeNode(node).symbol;
-                case 98 /* SuperKeyword */:
+                case 99 /* SuperKeyword */:
                     return checkExpression(node).symbol;
-                case 124 /* ConstructorKeyword */:
+                case 125 /* ConstructorKeyword */:
                     // constructor keyword for an overload, should take us to the definition if it exist
                     var constructorDeclaration = node.parent;
-                    if (constructorDeclaration && constructorDeclaration.kind === 157 /* Constructor */) {
+                    if (constructorDeclaration && constructorDeclaration.kind === 158 /* Constructor */) {
                         return constructorDeclaration.parent.symbol;
                     }
                     return undefined;
@@ -57992,7 +58855,7 @@ var ts;
                     // 3). Dynamic import call or require in javascript
                     // 4). type A = import("./f/*gotToDefinitionHere*/oo")
                     if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
-                        ((node.parent.kind === 249 /* ImportDeclaration */ || node.parent.kind === 255 /* ExportDeclaration */) && node.parent.moduleSpecifier === node) ||
+                        ((node.parent.kind === 250 /* ImportDeclaration */ || node.parent.kind === 256 /* ExportDeclaration */) && node.parent.moduleSpecifier === node) ||
                         ((ts.isInJSFile(node) && ts.isRequireCall(node.parent, /*checkArgumentIsStringLiteralLike*/ false)) || ts.isImportCall(node.parent)) ||
                         (ts.isLiteralTypeNode(node.parent) && ts.isLiteralImportTypeNode(node.parent.parent) && node.parent.parent.argument === node.parent)) {
                         return resolveExternalModuleName(node, node);
@@ -58009,21 +58872,21 @@ var ts;
                             ? getTypeFromTypeNode(grandParent.objectType)
                             : undefined;
                     return objectType && getPropertyOfType(objectType, ts.escapeLeadingUnderscores(node.text));
-                case 80 /* DefaultKeyword */:
-                case 90 /* FunctionKeyword */:
+                case 81 /* DefaultKeyword */:
+                case 91 /* FunctionKeyword */:
                 case 37 /* EqualsGreaterThanToken */:
-                case 76 /* ClassKeyword */:
+                case 77 /* ClassKeyword */:
                     return getSymbolOfNode(node.parent);
-                case 183 /* ImportType */:
+                case 184 /* ImportType */:
                     return ts.isLiteralImportTypeNode(node) ? getSymbolAtLocation(node.argument.literal) : undefined;
-                case 85 /* ExportKeyword */:
+                case 86 /* ExportKeyword */:
                     return ts.isExportAssignment(node.parent) ? ts.Debug.assertDefined(node.parent.symbol) : undefined;
                 default:
                     return undefined;
             }
         }
         function getShorthandAssignmentValueSymbol(location) {
-            if (location && location.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (location && location.kind === 277 /* ShorthandPropertyAssignment */) {
                 return resolveEntityName(location.name, 67220415 /* Value */ | 2097152 /* Alias */);
             }
             return undefined;
@@ -58090,33 +58953,35 @@ var ts;
         //     }
         // [ a ] from
         //     [a] = [ some array ...]
-        function getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr) {
-            ts.Debug.assert(expr.kind === 188 /* ObjectLiteralExpression */ || expr.kind === 187 /* ArrayLiteralExpression */);
+        function getTypeOfAssignmentPattern(expr) {
+            ts.Debug.assert(expr.kind === 189 /* ObjectLiteralExpression */ || expr.kind === 188 /* ArrayLiteralExpression */);
             // If this is from "for of"
             //     for ( { a } of elems) {
             //     }
-            if (expr.parent.kind === 227 /* ForOfStatement */) {
+            if (expr.parent.kind === 228 /* ForOfStatement */) {
                 var iteratedType = checkRightHandSideOfForOf(expr.parent.expression, expr.parent.awaitModifier);
                 return checkDestructuringAssignment(expr, iteratedType || errorType);
             }
             // If this is from "for" initializer
             //     for ({a } = elems[0];.....) { }
-            if (expr.parent.kind === 204 /* BinaryExpression */) {
+            if (expr.parent.kind === 205 /* BinaryExpression */) {
                 var iteratedType = getTypeOfExpression(expr.parent.right);
                 return checkDestructuringAssignment(expr, iteratedType || errorType);
             }
             // If this is from nested object binding pattern
             //     for ({ skills: { primary, secondary } } = multiRobot, i = 0; i < 1; i++) {
-            if (expr.parent.kind === 275 /* PropertyAssignment */) {
-                var typeOfParentObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent.parent);
-                return checkObjectLiteralDestructuringPropertyAssignment(typeOfParentObjectLiteral || errorType, expr.parent); // TODO: GH#18217
+            if (expr.parent.kind === 276 /* PropertyAssignment */) {
+                var node_3 = ts.cast(expr.parent.parent, ts.isObjectLiteralExpression);
+                var typeOfParentObjectLiteral = getTypeOfAssignmentPattern(node_3) || errorType;
+                var propertyIndex = ts.indexOfNode(node_3.properties, expr.parent);
+                return checkObjectLiteralDestructuringPropertyAssignment(node_3, typeOfParentObjectLiteral, propertyIndex);
             }
             // Array literal assignment - array destructuring pattern
-            ts.Debug.assert(expr.parent.kind === 187 /* ArrayLiteralExpression */);
+            var node = ts.cast(expr.parent, ts.isArrayLiteralExpression);
             //    [{ property1: p1, property2 }] = elems;
-            var typeOfArrayLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent);
-            var elementType = checkIteratedTypeOrElementType(typeOfArrayLiteral || errorType, expr.parent, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) || errorType;
-            return checkArrayLiteralDestructuringElementAssignment(expr.parent, typeOfArrayLiteral, expr.parent.elements.indexOf(expr), elementType || errorType); // TODO: GH#18217
+            var typeOfArrayLiteral = getTypeOfAssignmentPattern(node) || errorType;
+            var elementType = checkIteratedTypeOrElementType(typeOfArrayLiteral, expr.parent, /*allowStringInput*/ false, /*allowAsyncIterables*/ false) || errorType;
+            return checkArrayLiteralDestructuringElementAssignment(node, typeOfArrayLiteral, node.elements.indexOf(expr), elementType);
         }
         // Gets the property symbol corresponding to the property in destructuring assignment
         // 'property1' from
@@ -58126,7 +58991,7 @@ var ts;
         //     [a] = [ property1, property2 ]
         function getPropertySymbolOfDestructuringAssignment(location) {
             // Get the type of the object or array literal and then look for property of given name in the type
-            var typeOfObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(location.parent.parent);
+            var typeOfObjectLiteral = getTypeOfAssignmentPattern(ts.cast(location.parent.parent, ts.isAssignmentPattern));
             return typeOfObjectLiteral && getPropertyOfType(typeOfObjectLiteral, location.escapedText);
         }
         function getRegularTypeOfExpression(expr) {
@@ -58148,12 +59013,12 @@ var ts;
         function getClassElementPropertyKeyType(element) {
             var name = element.name;
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return getLiteralType(ts.idText(name));
                 case 8 /* NumericLiteral */:
                 case 10 /* StringLiteral */:
                     return getLiteralType(name.text);
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     var nameType = checkComputedPropertyName(name);
                     return isTypeAssignableToKind(nameType, 12288 /* ESSymbolLike */) ? nameType : stringType;
                 default:
@@ -58210,7 +59075,7 @@ var ts;
             if (!ts.isGeneratedIdentifier(nodeIn)) {
                 var node = ts.getParseTreeNode(nodeIn, ts.isIdentifier);
                 if (node) {
-                    var isPropertyName_1 = node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node;
+                    var isPropertyName_1 = node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.name === node;
                     return !isPropertyName_1 && getReferencedValueSymbol(node) === argumentsSymbol;
                 }
             }
@@ -58266,7 +59131,7 @@ var ts;
                     }
                     var parentSymbol_1 = getParentOfSymbol(symbol);
                     if (parentSymbol_1) {
-                        if (parentSymbol_1.flags & 512 /* ValueModule */ && parentSymbol_1.valueDeclaration.kind === 284 /* SourceFile */) {
+                        if (parentSymbol_1.flags & 512 /* ValueModule */ && parentSymbol_1.valueDeclaration.kind === 285 /* SourceFile */) {
                             var symbolFile = parentSymbol_1.valueDeclaration;
                             var referenceFile = ts.getSourceFileOfNode(node);
                             // If `node` accesses an export and that export isn't in the same file, then symbol is a namespace export, so return undefined.
@@ -58292,12 +59157,16 @@ var ts;
             }
             return undefined;
         }
+        function isSymbolOfDestructuredElementOfCatchBinding(symbol) {
+            return ts.isBindingElement(symbol.valueDeclaration)
+                && ts.walkUpBindingElementsAndPatterns(symbol.valueDeclaration).parent.kind === 275 /* CatchClause */;
+        }
         function isSymbolOfDeclarationWithCollidingName(symbol) {
             if (symbol.flags & 418 /* BlockScoped */ && !ts.isSourceFile(symbol.valueDeclaration)) {
                 var links = getSymbolLinks(symbol);
                 if (links.isDeclarationWithCollidingName === undefined) {
                     var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
-                    if (ts.isStatementWithLocals(container)) {
+                    if (ts.isStatementWithLocals(container) || isSymbolOfDestructuredElementOfCatchBinding(symbol)) {
                         var nodeLinks_1 = getNodeLinks(symbol.valueDeclaration);
                         if (resolveName(container.parent, symbol.escapedName, 67220415 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false)) {
                             // redeclaration - always should be renamed
@@ -58321,7 +59190,7 @@ var ts;
                             //       they will not collide with anything
                             var isDeclaredInLoop = nodeLinks_1.flags & 524288 /* BlockScopedBindingInLoop */;
                             var inLoopInitializer = ts.isIterationStatement(container, /*lookInLabeledStatements*/ false);
-                            var inLoopBodyBlock = container.kind === 218 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
+                            var inLoopBodyBlock = container.kind === 219 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
                             links.isDeclarationWithCollidingName = !ts.isBlockScopedContainerTopLevel(container) && (!isDeclaredInLoop || (!inLoopInitializer && !inLoopBodyBlock));
                         }
                         else {
@@ -58362,18 +59231,18 @@ var ts;
         }
         function isValueAliasDeclaration(node) {
             switch (node.kind) {
-                case 248 /* ImportEqualsDeclaration */:
-                case 250 /* ImportClause */:
-                case 251 /* NamespaceImport */:
-                case 253 /* ImportSpecifier */:
-                case 257 /* ExportSpecifier */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 251 /* ImportClause */:
+                case 252 /* NamespaceImport */:
+                case 254 /* ImportSpecifier */:
+                case 258 /* ExportSpecifier */:
                     return isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     var exportClause = node.exportClause;
                     return !!exportClause && ts.some(exportClause.elements, isValueAliasDeclaration);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return node.expression
-                        && node.expression.kind === 72 /* Identifier */
+                        && node.expression.kind === 73 /* Identifier */
                         ? isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol)
                         : true;
             }
@@ -58381,7 +59250,7 @@ var ts;
         }
         function isTopLevelValueImportEqualsWithEntityName(nodeIn) {
             var node = ts.getParseTreeNode(nodeIn, ts.isImportEqualsDeclaration);
-            if (node === undefined || node.parent.kind !== 284 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
+            if (node === undefined || node.parent.kind !== 285 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
                 // parent is not source file or it is not reference to internal module
                 return false;
             }
@@ -58482,15 +59351,15 @@ var ts;
         }
         function canHaveConstantValue(node) {
             switch (node.kind) {
-                case 278 /* EnumMember */:
-                case 189 /* PropertyAccessExpression */:
-                case 190 /* ElementAccessExpression */:
+                case 279 /* EnumMember */:
+                case 190 /* PropertyAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return true;
             }
             return false;
         }
         function getConstantValue(node) {
-            if (node.kind === 278 /* EnumMember */) {
+            if (node.kind === 279 /* EnumMember */) {
                 return getEnumMemberValue(node);
             }
             var symbol = getNodeLinks(node).resolvedSymbol;
@@ -58575,7 +59444,7 @@ var ts;
         function createTypeOfDeclaration(declarationIn, enclosingDeclaration, flags, tracker, addUndefined) {
             var declaration = ts.getParseTreeNode(declarationIn, ts.isVariableLikeOrAccessor);
             if (!declaration) {
-                return ts.createToken(120 /* AnyKeyword */);
+                return ts.createToken(121 /* AnyKeyword */);
             }
             // Get type of the symbol if this is the valid symbol otherwise get type at location
             var symbol = getSymbolOfNode(declaration);
@@ -58594,7 +59463,7 @@ var ts;
         function createReturnTypeOfSignatureDeclaration(signatureDeclarationIn, enclosingDeclaration, flags, tracker) {
             var signatureDeclaration = ts.getParseTreeNode(signatureDeclarationIn, ts.isFunctionLike);
             if (!signatureDeclaration) {
-                return ts.createToken(120 /* AnyKeyword */);
+                return ts.createToken(121 /* AnyKeyword */);
             }
             var signature = getSignatureFromDeclaration(signatureDeclaration);
             return nodeBuilder.typeToTypeNode(getReturnTypeOfSignature(signature), enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */, tracker);
@@ -58602,7 +59471,7 @@ var ts;
         function createTypeOfExpression(exprIn, enclosingDeclaration, flags, tracker) {
             var expr = ts.getParseTreeNode(exprIn, ts.isExpression);
             if (!expr) {
-                return ts.createToken(120 /* AnyKeyword */);
+                return ts.createToken(121 /* AnyKeyword */);
             }
             var type = getWidenedType(getRegularTypeOfExpression(expr));
             return nodeBuilder.typeToTypeNode(type, enclosingDeclaration, flags | 1024 /* MultilineObjectLiterals */, tracker);
@@ -58721,17 +59590,17 @@ var ts;
                 isLateBound: function (nodeIn) {
                     var node = ts.getParseTreeNode(nodeIn, ts.isDeclaration);
                     var symbol = node && getSymbolOfNode(node);
-                    return !!(symbol && ts.getCheckFlags(symbol) & 2048 /* Late */);
+                    return !!(symbol && ts.getCheckFlags(symbol) & 4096 /* Late */);
                 },
                 getJsxFactoryEntity: function (location) { return location ? (getJsxNamespace(location), (ts.getSourceFileOfNode(location).localJsxFactory || _jsxFactoryEntity)) : _jsxFactoryEntity; },
                 getAllAccessorDeclarations: function (accessor) {
                     accessor = ts.getParseTreeNode(accessor, ts.isGetOrSetAccessorDeclaration); // TODO: GH#18217
-                    var otherKind = accessor.kind === 159 /* SetAccessor */ ? 158 /* GetAccessor */ : 159 /* SetAccessor */;
+                    var otherKind = accessor.kind === 160 /* SetAccessor */ ? 159 /* GetAccessor */ : 160 /* SetAccessor */;
                     var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(accessor), otherKind);
                     var firstAccessor = otherAccessor && (otherAccessor.pos < accessor.pos) ? otherAccessor : accessor;
                     var secondAccessor = otherAccessor && (otherAccessor.pos < accessor.pos) ? accessor : otherAccessor;
-                    var setAccessor = accessor.kind === 159 /* SetAccessor */ ? accessor : otherAccessor;
-                    var getAccessor = accessor.kind === 158 /* GetAccessor */ ? accessor : otherAccessor;
+                    var setAccessor = accessor.kind === 160 /* SetAccessor */ ? accessor : otherAccessor;
+                    var getAccessor = accessor.kind === 159 /* GetAccessor */ ? accessor : otherAccessor;
                     return {
                         firstAccessor: firstAccessor,
                         secondAccessor: secondAccessor,
@@ -58747,7 +59616,7 @@ var ts;
                 }
             };
             function isInHeritageClause(node) {
-                return node.parent && node.parent.kind === 211 /* ExpressionWithTypeArguments */ && node.parent.parent && node.parent.parent.kind === 273 /* HeritageClause */;
+                return node.parent && node.parent.kind === 212 /* ExpressionWithTypeArguments */ && node.parent.parent && node.parent.parent.kind === 274 /* HeritageClause */;
             }
             // defined here to avoid outer scope pollution
             function getTypeReferenceDirectivesForEntityName(node) {
@@ -58759,7 +59628,7 @@ var ts;
                 // qualified names can only be used as types\namespaces
                 // identifiers are treated as values only if they appear in type queries
                 var meaning = 67897832 /* Type */ | 1920 /* Namespace */;
-                if ((node.kind === 72 /* Identifier */ && isInTypeQuery(node)) || (node.kind === 189 /* PropertyAccessExpression */ && !isInHeritageClause(node))) {
+                if ((node.kind === 73 /* Identifier */ && isInTypeQuery(node)) || (node.kind === 190 /* PropertyAccessExpression */ && !isInHeritageClause(node))) {
                     meaning = 67220415 /* Value */ | 1048576 /* ExportValue */;
                 }
                 var symbol = resolveEntityName(node, meaning, /*ignoreErrors*/ true);
@@ -58810,7 +59679,7 @@ var ts;
                         break;
                     }
                 }
-                if (current.valueDeclaration && current.valueDeclaration.kind === 284 /* SourceFile */ && current.flags & 512 /* ValueModule */) {
+                if (current.valueDeclaration && current.valueDeclaration.kind === 285 /* SourceFile */ && current.flags & 512 /* ValueModule */) {
                     return false;
                 }
                 // check that at least one declaration of top level symbol originates from type declaration file
@@ -58838,12 +59707,12 @@ var ts;
             }
         }
         function getExternalModuleFileFromDeclaration(declaration) {
-            var specifier = declaration.kind === 244 /* ModuleDeclaration */ ? ts.tryCast(declaration.name, ts.isStringLiteral) : ts.getExternalModuleName(declaration);
+            var specifier = declaration.kind === 245 /* ModuleDeclaration */ ? ts.tryCast(declaration.name, ts.isStringLiteral) : ts.getExternalModuleName(declaration);
             var moduleSymbol = resolveExternalModuleNameWorker(specifier, specifier, /*moduleNotFoundError*/ undefined); // TODO: GH#18217
             if (!moduleSymbol) {
                 return undefined;
             }
-            return ts.getDeclarationOfKind(moduleSymbol, 284 /* SourceFile */);
+            return ts.getDeclarationOfKind(moduleSymbol, 285 /* SourceFile */);
         }
         function initializeTypeChecker() {
             // Bind all source files and propagate errors
@@ -58860,6 +59729,15 @@ var ts;
                     continue;
                 }
                 if (!ts.isExternalOrCommonJsModule(file)) {
+                    // It is an error for a non-external-module (i.e. script) to declare its own `globalThis`.
+                    // We can't use `builtinGlobals` for this due to synthetic expando-namespace generation in JS files.
+                    var fileGlobalThisSymbol = file.locals.get("globalThis");
+                    if (fileGlobalThisSymbol) {
+                        for (var _d = 0, _e = fileGlobalThisSymbol.declarations; _d < _e.length; _d++) {
+                            var declaration = _e[_d];
+                            diagnostics.add(ts.createDiagnosticForNode(declaration, ts.Diagnostics.Declaration_name_conflicts_with_built_in_global_identifier_0, "globalThis"));
+                        }
+                    }
                     mergeSymbolTable(globals, file.locals);
                 }
                 if (file.jsGlobalAugmentations) {
@@ -58890,10 +59768,10 @@ var ts;
             if (augmentations) {
                 // merge _global_ module augmentations.
                 // this needs to be done after global symbol table is initialized to make sure that all ambient modules are indexed
-                for (var _d = 0, augmentations_1 = augmentations; _d < augmentations_1.length; _d++) {
-                    var list = augmentations_1[_d];
-                    for (var _e = 0, list_1 = list; _e < list_1.length; _e++) {
-                        var augmentation = list_1[_e];
+                for (var _f = 0, augmentations_1 = augmentations; _f < augmentations_1.length; _f++) {
+                    var list = augmentations_1[_f];
+                    for (var _g = 0, list_1 = list; _g < list_1.length; _g++) {
+                        var augmentation = list_1[_g];
                         if (!ts.isGlobalScopeAugmentation(augmentation.parent))
                             continue;
                         mergeModuleAugmentation(augmentation);
@@ -58905,6 +59783,7 @@ var ts;
             getSymbolLinks(undefinedSymbol).type = undefinedWideningType;
             getSymbolLinks(argumentsSymbol).type = getGlobalType("IArguments", /*arity*/ 0, /*reportErrors*/ true);
             getSymbolLinks(unknownSymbol).type = errorType;
+            getSymbolLinks(globalThisSymbol).type = createObjectType(16 /* Anonymous */, globalThisSymbol);
             // Initialize special types
             globalArrayType = getGlobalType("Array", /*arity*/ 1, /*reportErrors*/ true);
             globalObjectType = getGlobalType("Object", /*arity*/ 0, /*reportErrors*/ true);
@@ -58921,16 +59800,16 @@ var ts;
                 // autoArrayType is used as a marker, so even if global Array type is not defined, it needs to be a unique type
                 autoArrayType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
             }
-            globalReadonlyArrayType = getGlobalTypeOrUndefined("ReadonlyArray", /*arity*/ 1);
+            globalReadonlyArrayType = getGlobalTypeOrUndefined("ReadonlyArray", /*arity*/ 1) || globalArrayType;
             anyReadonlyArrayType = globalReadonlyArrayType ? createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]) : anyArrayType;
             globalThisType = getGlobalTypeOrUndefined("ThisType", /*arity*/ 1);
             if (augmentations) {
                 // merge _nonglobal_ module augmentations.
                 // this needs to be done after global symbol table is initialized to make sure that all ambient modules are indexed
-                for (var _f = 0, augmentations_2 = augmentations; _f < augmentations_2.length; _f++) {
-                    var list = augmentations_2[_f];
-                    for (var _g = 0, list_2 = list; _g < list_2.length; _g++) {
-                        var augmentation = list_2[_g];
+                for (var _h = 0, augmentations_2 = augmentations; _h < augmentations_2.length; _h++) {
+                    var list = augmentations_2[_h];
+                    for (var _j = 0, list_2 = list; _j < list_2.length; _j++) {
+                        var augmentation = list_2[_j];
                         if (ts.isGlobalScopeAugmentation(augmentation.parent))
                             continue;
                         mergeModuleAugmentation(augmentation);
@@ -59021,14 +59900,14 @@ var ts;
                 return false;
             }
             if (!ts.nodeCanBeDecorated(node, node.parent, node.parent.parent)) {
-                if (node.kind === 156 /* MethodDeclaration */ && !ts.nodeIsPresent(node.body)) {
+                if (node.kind === 157 /* MethodDeclaration */ && !ts.nodeIsPresent(node.body)) {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.A_decorator_can_only_decorate_a_method_implementation_not_an_overload);
                 }
                 else {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_are_not_valid_here);
                 }
             }
-            else if (node.kind === 158 /* GetAccessor */ || node.kind === 159 /* SetAccessor */) {
+            else if (node.kind === 159 /* GetAccessor */ || node.kind === 160 /* SetAccessor */) {
                 var accessors = ts.getAllAccessorDeclarations(node.parent.members, node);
                 if (accessors.firstAccessor.decorators && node === accessors.secondAccessor) {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name);
@@ -59045,23 +59924,23 @@ var ts;
             var flags = 0 /* None */;
             for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
                 var modifier = _a[_i];
-                if (modifier.kind !== 133 /* ReadonlyKeyword */) {
-                    if (node.kind === 153 /* PropertySignature */ || node.kind === 155 /* MethodSignature */) {
+                if (modifier.kind !== 134 /* ReadonlyKeyword */) {
+                    if (node.kind === 154 /* PropertySignature */ || node.kind === 156 /* MethodSignature */) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_type_member, ts.tokenToString(modifier.kind));
                     }
-                    if (node.kind === 162 /* IndexSignature */) {
+                    if (node.kind === 163 /* IndexSignature */) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_an_index_signature, ts.tokenToString(modifier.kind));
                     }
                 }
                 switch (modifier.kind) {
-                    case 77 /* ConstKeyword */:
-                        if (node.kind !== 243 /* EnumDeclaration */) {
-                            return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(77 /* ConstKeyword */));
+                    case 78 /* ConstKeyword */:
+                        if (node.kind !== 244 /* EnumDeclaration */) {
+                            return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(78 /* ConstKeyword */));
                         }
                         break;
-                    case 115 /* PublicKeyword */:
-                    case 114 /* ProtectedKeyword */:
-                    case 113 /* PrivateKeyword */:
+                    case 116 /* PublicKeyword */:
+                    case 115 /* ProtectedKeyword */:
+                    case 114 /* PrivateKeyword */:
                         var text = visibilityToString(ts.modifierToFlag(modifier.kind));
                         if (flags & 28 /* AccessibilityModifier */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.Accessibility_modifier_already_seen);
@@ -59075,11 +59954,11 @@ var ts;
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "async");
                         }
-                        else if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
+                        else if (node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 285 /* SourceFile */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text);
                         }
                         else if (flags & 128 /* Abstract */) {
-                            if (modifier.kind === 113 /* PrivateKeyword */) {
+                            if (modifier.kind === 114 /* PrivateKeyword */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, text, "abstract");
                             }
                             else {
@@ -59088,7 +59967,7 @@ var ts;
                         }
                         flags |= ts.modifierToFlag(modifier.kind);
                         break;
-                    case 116 /* StaticKeyword */:
+                    case 117 /* StaticKeyword */:
                         if (flags & 32 /* Static */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static");
                         }
@@ -59098,10 +59977,10 @@ var ts;
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "async");
                         }
-                        else if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
+                        else if (node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 285 /* SourceFile */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, "static");
                         }
-                        else if (node.kind === 151 /* Parameter */) {
+                        else if (node.kind === 152 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
                         }
                         else if (flags & 128 /* Abstract */) {
@@ -59110,18 +59989,18 @@ var ts;
                         flags |= 32 /* Static */;
                         lastStatic = modifier;
                         break;
-                    case 133 /* ReadonlyKeyword */:
+                    case 134 /* ReadonlyKeyword */:
                         if (flags & 64 /* Readonly */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "readonly");
                         }
-                        else if (node.kind !== 154 /* PropertyDeclaration */ && node.kind !== 153 /* PropertySignature */ && node.kind !== 162 /* IndexSignature */ && node.kind !== 151 /* Parameter */) {
+                        else if (node.kind !== 155 /* PropertyDeclaration */ && node.kind !== 154 /* PropertySignature */ && node.kind !== 163 /* IndexSignature */ && node.kind !== 152 /* Parameter */) {
                             // If node.kind === SyntaxKind.Parameter, checkParameter report an error if it's not a parameter property.
                             return grammarErrorOnNode(modifier, ts.Diagnostics.readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature);
                         }
                         flags |= 64 /* Readonly */;
                         lastReadonly = modifier;
                         break;
-                    case 85 /* ExportKeyword */:
+                    case 86 /* ExportKeyword */:
                         if (flags & 1 /* Export */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "export");
                         }
@@ -59134,52 +60013,52 @@ var ts;
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "async");
                         }
-                        else if (node.parent.kind === 240 /* ClassDeclaration */) {
+                        else if (node.parent.kind === 241 /* ClassDeclaration */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "export");
                         }
-                        else if (node.kind === 151 /* Parameter */) {
+                        else if (node.kind === 152 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
                         }
                         flags |= 1 /* Export */;
                         break;
-                    case 80 /* DefaultKeyword */:
-                        var container = node.parent.kind === 284 /* SourceFile */ ? node.parent : node.parent.parent;
-                        if (container.kind === 244 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
+                    case 81 /* DefaultKeyword */:
+                        var container = node.parent.kind === 285 /* SourceFile */ ? node.parent : node.parent.parent;
+                        if (container.kind === 245 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_default_export_can_only_be_used_in_an_ECMAScript_style_module);
                         }
                         flags |= 512 /* Default */;
                         break;
-                    case 125 /* DeclareKeyword */:
+                    case 126 /* DeclareKeyword */:
                         if (flags & 2 /* Ambient */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "declare");
                         }
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.parent.kind === 240 /* ClassDeclaration */) {
+                        else if (node.parent.kind === 241 /* ClassDeclaration */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "declare");
                         }
-                        else if (node.kind === 151 /* Parameter */) {
+                        else if (node.kind === 152 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "declare");
                         }
-                        else if ((node.parent.flags & 4194304 /* Ambient */) && node.parent.kind === 245 /* ModuleBlock */) {
+                        else if ((node.parent.flags & 4194304 /* Ambient */) && node.parent.kind === 246 /* ModuleBlock */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
                         }
                         flags |= 2 /* Ambient */;
                         lastDeclare = modifier;
                         break;
-                    case 118 /* AbstractKeyword */:
+                    case 119 /* AbstractKeyword */:
                         if (flags & 128 /* Abstract */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract");
                         }
-                        if (node.kind !== 240 /* ClassDeclaration */) {
-                            if (node.kind !== 156 /* MethodDeclaration */ &&
-                                node.kind !== 154 /* PropertyDeclaration */ &&
-                                node.kind !== 158 /* GetAccessor */ &&
-                                node.kind !== 159 /* SetAccessor */) {
+                        if (node.kind !== 241 /* ClassDeclaration */) {
+                            if (node.kind !== 157 /* MethodDeclaration */ &&
+                                node.kind !== 155 /* PropertyDeclaration */ &&
+                                node.kind !== 159 /* GetAccessor */ &&
+                                node.kind !== 160 /* SetAccessor */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration);
                             }
-                            if (!(node.parent.kind === 240 /* ClassDeclaration */ && ts.hasModifier(node.parent, 128 /* Abstract */))) {
+                            if (!(node.parent.kind === 241 /* ClassDeclaration */ && ts.hasModifier(node.parent, 128 /* Abstract */))) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class);
                             }
                             if (flags & 32 /* Static */) {
@@ -59191,14 +60070,14 @@ var ts;
                         }
                         flags |= 128 /* Abstract */;
                         break;
-                    case 121 /* AsyncKeyword */:
+                    case 122 /* AsyncKeyword */:
                         if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "async");
                         }
                         else if (flags & 2 /* Ambient */ || node.parent.flags & 4194304 /* Ambient */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
-                        else if (node.kind === 151 /* Parameter */) {
+                        else if (node.kind === 152 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
                         }
                         flags |= 256 /* Async */;
@@ -59206,7 +60085,7 @@ var ts;
                         break;
                 }
             }
-            if (node.kind === 157 /* Constructor */) {
+            if (node.kind === 158 /* Constructor */) {
                 if (flags & 32 /* Static */) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
@@ -59221,13 +60100,13 @@ var ts;
                 }
                 return false;
             }
-            else if ((node.kind === 249 /* ImportDeclaration */ || node.kind === 248 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
+            else if ((node.kind === 250 /* ImportDeclaration */ || node.kind === 249 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
-            else if (node.kind === 151 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && ts.isBindingPattern(node.name)) {
+            else if (node.kind === 152 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && ts.isBindingPattern(node.name)) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_may_not_be_declared_using_a_binding_pattern);
             }
-            else if (node.kind === 151 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && node.dotDotDotToken) {
+            else if (node.kind === 152 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && node.dotDotDotToken) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_cannot_be_declared_using_a_rest_parameter);
             }
             if (flags & 256 /* Async */) {
@@ -59248,38 +60127,38 @@ var ts;
         }
         function shouldReportBadModifier(node) {
             switch (node.kind) {
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 157 /* Constructor */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 162 /* IndexSignature */:
-                case 244 /* ModuleDeclaration */:
-                case 249 /* ImportDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
-                case 255 /* ExportDeclaration */:
-                case 254 /* ExportAssignment */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 151 /* Parameter */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 158 /* Constructor */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 163 /* IndexSignature */:
+                case 245 /* ModuleDeclaration */:
+                case 250 /* ImportDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 256 /* ExportDeclaration */:
+                case 255 /* ExportAssignment */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 152 /* Parameter */:
                     return false;
                 default:
-                    if (node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
+                    if (node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 285 /* SourceFile */) {
                         return false;
                     }
                     switch (node.kind) {
-                        case 239 /* FunctionDeclaration */:
-                            return nodeHasAnyModifiersExcept(node, 121 /* AsyncKeyword */);
-                        case 240 /* ClassDeclaration */:
-                            return nodeHasAnyModifiersExcept(node, 118 /* AbstractKeyword */);
-                        case 241 /* InterfaceDeclaration */:
-                        case 219 /* VariableStatement */:
-                        case 242 /* TypeAliasDeclaration */:
+                        case 240 /* FunctionDeclaration */:
+                            return nodeHasAnyModifiersExcept(node, 122 /* AsyncKeyword */);
+                        case 241 /* ClassDeclaration */:
+                            return nodeHasAnyModifiersExcept(node, 119 /* AbstractKeyword */);
+                        case 242 /* InterfaceDeclaration */:
+                        case 220 /* VariableStatement */:
+                        case 243 /* TypeAliasDeclaration */:
                             return true;
-                        case 243 /* EnumDeclaration */:
-                            return nodeHasAnyModifiersExcept(node, 77 /* ConstKeyword */);
+                        case 244 /* EnumDeclaration */:
+                            return nodeHasAnyModifiersExcept(node, 78 /* ConstKeyword */);
                         default:
                             ts.Debug.fail();
                             return false;
@@ -59291,10 +60170,10 @@ var ts;
         }
         function checkGrammarAsyncModifier(node, asyncModifier) {
             switch (node.kind) {
-                case 156 /* MethodDeclaration */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 157 /* MethodDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return false;
             }
             return grammarErrorOnNode(asyncModifier, ts.Diagnostics._0_modifier_cannot_be_used_here, "async");
@@ -59409,10 +60288,10 @@ var ts;
             if (!parameter.type) {
                 return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_must_have_a_type_annotation);
             }
-            if (parameter.type.kind !== 138 /* StringKeyword */ && parameter.type.kind !== 135 /* NumberKeyword */) {
+            if (parameter.type.kind !== 139 /* StringKeyword */ && parameter.type.kind !== 136 /* NumberKeyword */) {
                 var type = getTypeFromTypeNode(parameter.type);
                 if (type.flags & 4 /* String */ || type.flags & 8 /* Number */) {
-                    return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_type_alias_Consider_writing_0_Colon_1_Colon_2_instead, ts.getTextOfNode(parameter.name), typeToString(type), typeToString(getTypeFromTypeNode(node.type)));
+                    return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_type_alias_Consider_writing_0_Colon_1_Colon_2_instead, ts.getTextOfNode(parameter.name), typeToString(type), typeToString(node.type ? getTypeFromTypeNode(node.type) : anyType));
                 }
                 if (type.flags & 1048576 /* Union */ && allTypesAssignableToKind(type, 128 /* StringLiteral */, /*strict*/ true)) {
                     return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_cannot_be_a_union_type_Consider_using_a_mapped_object_type_instead);
@@ -59443,9 +60322,9 @@ var ts;
         }
         function checkGrammarForOmittedArgument(args) {
             if (args) {
-                for (var _i = 0, args_5 = args; _i < args_5.length; _i++) {
-                    var arg = args_5[_i];
-                    if (arg.kind === 210 /* OmittedExpression */) {
+                for (var _i = 0, args_4 = args; _i < args_4.length; _i++) {
+                    var arg = args_4[_i];
+                    if (arg.kind === 211 /* OmittedExpression */) {
                         return grammarErrorAtPos(arg, arg.pos, 0, ts.Diagnostics.Argument_expression_expected);
                     }
                 }
@@ -59475,7 +60354,7 @@ var ts;
             if (!checkGrammarDecoratorsAndModifiers(node) && node.heritageClauses) {
                 for (var _i = 0, _a = node.heritageClauses; _i < _a.length; _i++) {
                     var heritageClause = _a[_i];
-                    if (heritageClause.token === 86 /* ExtendsKeyword */) {
+                    if (heritageClause.token === 87 /* ExtendsKeyword */) {
                         if (seenExtendsClause) {
                             return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.extends_clause_already_seen);
                         }
@@ -59488,7 +60367,7 @@ var ts;
                         seenExtendsClause = true;
                     }
                     else {
-                        ts.Debug.assert(heritageClause.token === 109 /* ImplementsKeyword */);
+                        ts.Debug.assert(heritageClause.token === 110 /* ImplementsKeyword */);
                         if (seenImplementsClause) {
                             return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.implements_clause_already_seen);
                         }
@@ -59504,14 +60383,14 @@ var ts;
             if (node.heritageClauses) {
                 for (var _i = 0, _a = node.heritageClauses; _i < _a.length; _i++) {
                     var heritageClause = _a[_i];
-                    if (heritageClause.token === 86 /* ExtendsKeyword */) {
+                    if (heritageClause.token === 87 /* ExtendsKeyword */) {
                         if (seenExtendsClause) {
                             return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.extends_clause_already_seen);
                         }
                         seenExtendsClause = true;
                     }
                     else {
-                        ts.Debug.assert(heritageClause.token === 109 /* ImplementsKeyword */);
+                        ts.Debug.assert(heritageClause.token === 110 /* ImplementsKeyword */);
                         return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.Interface_declaration_cannot_have_implements_clause);
                     }
                     // Grammar checking heritageClause inside class declaration
@@ -59522,20 +60401,20 @@ var ts;
         }
         function checkGrammarComputedPropertyName(node) {
             // If node is not a computedPropertyName, just skip the grammar checking
-            if (node.kind !== 149 /* ComputedPropertyName */) {
+            if (node.kind !== 150 /* ComputedPropertyName */) {
                 return false;
             }
             var computedPropertyName = node;
-            if (computedPropertyName.expression.kind === 204 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 27 /* CommaToken */) {
+            if (computedPropertyName.expression.kind === 205 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 27 /* CommaToken */) {
                 return grammarErrorOnNode(computedPropertyName.expression, ts.Diagnostics.A_comma_expression_is_not_allowed_in_a_computed_property_name);
             }
             return false;
         }
         function checkGrammarForGenerator(node) {
             if (node.asteriskToken) {
-                ts.Debug.assert(node.kind === 239 /* FunctionDeclaration */ ||
-                    node.kind === 196 /* FunctionExpression */ ||
-                    node.kind === 156 /* MethodDeclaration */);
+                ts.Debug.assert(node.kind === 240 /* FunctionDeclaration */ ||
+                    node.kind === 197 /* FunctionExpression */ ||
+                    node.kind === 157 /* MethodDeclaration */);
                 if (node.flags & 4194304 /* Ambient */) {
                     return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
                 }
@@ -59561,15 +60440,22 @@ var ts;
             var seen = ts.createUnderscoreEscapedMap();
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var prop = _a[_i];
-                if (prop.kind === 277 /* SpreadAssignment */) {
+                if (prop.kind === 278 /* SpreadAssignment */) {
+                    if (inDestructuring) {
+                        // a rest property cannot be destructured any further
+                        var expression = ts.skipParentheses(prop.expression);
+                        if (ts.isArrayLiteralExpression(expression) || ts.isObjectLiteralExpression(expression)) {
+                            return grammarErrorOnNode(prop.expression, ts.Diagnostics.A_rest_element_cannot_contain_a_binding_pattern);
+                        }
+                    }
                     continue;
                 }
                 var name = prop.name;
-                if (name.kind === 149 /* ComputedPropertyName */) {
+                if (name.kind === 150 /* ComputedPropertyName */) {
                     // If the name is not a ComputedPropertyName, the grammar checking will skip it
                     checkGrammarComputedPropertyName(name);
                 }
-                if (prop.kind === 276 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) {
+                if (prop.kind === 277 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) {
                     // having objectAssignmentInitializer is only valid in ObjectAssignmentPattern
                     // outside of destructuring it is a syntax error
                     return grammarErrorOnNode(prop.equalsToken, ts.Diagnostics.can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment);
@@ -59578,7 +60464,7 @@ var ts;
                 if (prop.modifiers) {
                     for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) { // TODO: GH#19955
                         var mod = _c[_b];
-                        if (mod.kind !== 121 /* AsyncKeyword */ || prop.kind !== 156 /* MethodDeclaration */) {
+                        if (mod.kind !== 122 /* AsyncKeyword */ || prop.kind !== 157 /* MethodDeclaration */) {
                             grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
                         }
                     }
@@ -59593,23 +60479,23 @@ var ts;
                 // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
                 var currentKind = void 0;
                 switch (prop.kind) {
-                    case 276 /* ShorthandPropertyAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
                         checkGrammarForInvalidExclamationToken(prop.exclamationToken, ts.Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context);
                     /* tslint:disable:no-switch-case-fall-through */
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         // Grammar checking for computedPropertyName and shorthandPropertyAssignment
                         checkGrammarForInvalidQuestionMark(prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional);
                         if (name.kind === 8 /* NumericLiteral */) {
                             checkGrammarNumericLiteral(name);
                         }
                     // falls through
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         currentKind = 1 /* Property */;
                         break;
-                    case 158 /* GetAccessor */:
+                    case 159 /* GetAccessor */:
                         currentKind = 2 /* GetAccessor */;
                         break;
-                    case 159 /* SetAccessor */:
+                    case 160 /* SetAccessor */:
                         currentKind = 4 /* SetAccessor */;
                         break;
                     default:
@@ -59646,7 +60532,7 @@ var ts;
             var seen = ts.createUnderscoreEscapedMap();
             for (var _i = 0, _a = node.attributes.properties; _i < _a.length; _i++) {
                 var attr = _a[_i];
-                if (attr.kind === 269 /* JsxSpreadAttribute */) {
+                if (attr.kind === 270 /* JsxSpreadAttribute */) {
                     continue;
                 }
                 var name = attr.name, initializer = attr.initializer;
@@ -59656,7 +60542,7 @@ var ts;
                 else {
                     return grammarErrorOnNode(name, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
                 }
-                if (initializer && initializer.kind === 270 /* JsxExpression */ && !initializer.expression) {
+                if (initializer && initializer.kind === 271 /* JsxExpression */ && !initializer.expression) {
                     return grammarErrorOnNode(initializer, ts.Diagnostics.JSX_attributes_must_only_be_assigned_a_non_empty_expression);
                 }
             }
@@ -59665,12 +60551,25 @@ var ts;
             if (checkGrammarStatementInAmbientContext(forInOrOfStatement)) {
                 return true;
             }
-            if (forInOrOfStatement.kind === 227 /* ForOfStatement */ && forInOrOfStatement.awaitModifier) {
+            if (forInOrOfStatement.kind === 228 /* ForOfStatement */ && forInOrOfStatement.awaitModifier) {
                 if ((forInOrOfStatement.flags & 16384 /* AwaitContext */) === 0 /* None */) {
-                    return grammarErrorOnNode(forInOrOfStatement.awaitModifier, ts.Diagnostics.A_for_await_of_statement_is_only_allowed_within_an_async_function_or_async_generator);
+                    // use of 'for-await-of' in non-async function
+                    var sourceFile = ts.getSourceFileOfNode(forInOrOfStatement);
+                    if (!hasParseDiagnostics(sourceFile)) {
+                        var diagnostic = ts.createDiagnosticForNode(forInOrOfStatement.awaitModifier, ts.Diagnostics.A_for_await_of_statement_is_only_allowed_within_an_async_function_or_async_generator);
+                        var func = ts.getContainingFunction(forInOrOfStatement);
+                        if (func && func.kind !== 158 /* Constructor */) {
+                            ts.Debug.assert((ts.getFunctionFlags(func) & 2 /* Async */) === 0, "Enclosing function should never be an async function.");
+                            var relatedInfo = ts.createDiagnosticForNode(func, ts.Diagnostics.Did_you_mean_to_mark_this_function_as_async);
+                            ts.addRelatedInfo(diagnostic, relatedInfo);
+                        }
+                        diagnostics.add(diagnostic);
+                        return true;
+                    }
+                    return false;
                 }
             }
-            if (forInOrOfStatement.initializer.kind === 238 /* VariableDeclarationList */) {
+            if (forInOrOfStatement.initializer.kind === 239 /* VariableDeclarationList */) {
                 var variableList = forInOrOfStatement.initializer;
                 if (!checkGrammarVariableDeclarationList(variableList)) {
                     var declarations = variableList.declarations;
@@ -59685,20 +60584,20 @@ var ts;
                         return false;
                     }
                     if (declarations.length > 1) {
-                        var diagnostic = forInOrOfStatement.kind === 226 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 227 /* ForInStatement */
                             ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement
                             : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement;
                         return grammarErrorOnFirstToken(variableList.declarations[1], diagnostic);
                     }
                     var firstDeclaration = declarations[0];
                     if (firstDeclaration.initializer) {
-                        var diagnostic = forInOrOfStatement.kind === 226 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 227 /* ForInStatement */
                             ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer
                             : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer;
                         return grammarErrorOnNode(firstDeclaration.name, diagnostic);
                     }
                     if (firstDeclaration.type) {
-                        var diagnostic = forInOrOfStatement.kind === 226 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 227 /* ForInStatement */
                             ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation
                             : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation;
                         return grammarErrorOnNode(firstDeclaration, diagnostic);
@@ -59725,11 +60624,11 @@ var ts;
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_have_type_parameters);
             }
             else if (!doesAccessorHaveCorrectParameterCount(accessor)) {
-                return grammarErrorOnNode(accessor.name, kind === 158 /* GetAccessor */ ?
+                return grammarErrorOnNode(accessor.name, kind === 159 /* GetAccessor */ ?
                     ts.Diagnostics.A_get_accessor_cannot_have_parameters :
                     ts.Diagnostics.A_set_accessor_must_have_exactly_one_parameter);
             }
-            else if (kind === 159 /* SetAccessor */) {
+            else if (kind === 160 /* SetAccessor */) {
                 if (accessor.type) {
                     return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_set_accessor_cannot_have_a_return_type_annotation);
                 }
@@ -59753,23 +60652,23 @@ var ts;
          * A set accessor has one parameter or a `this` parameter and one more parameter.
          */
         function doesAccessorHaveCorrectParameterCount(accessor) {
-            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 158 /* GetAccessor */ ? 0 : 1);
+            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 159 /* GetAccessor */ ? 0 : 1);
         }
         function getAccessorThisParameter(accessor) {
-            if (accessor.parameters.length === (accessor.kind === 158 /* GetAccessor */ ? 1 : 2)) {
+            if (accessor.parameters.length === (accessor.kind === 159 /* GetAccessor */ ? 1 : 2)) {
                 return ts.getThisParameter(accessor);
             }
         }
         function checkGrammarTypeOperatorNode(node) {
-            if (node.operator === 142 /* UniqueKeyword */) {
-                if (node.type.kind !== 139 /* SymbolKeyword */) {
-                    return grammarErrorOnNode(node.type, ts.Diagnostics._0_expected, ts.tokenToString(139 /* SymbolKeyword */));
+            if (node.operator === 143 /* UniqueKeyword */) {
+                if (node.type.kind !== 140 /* SymbolKeyword */) {
+                    return grammarErrorOnNode(node.type, ts.Diagnostics._0_expected, ts.tokenToString(140 /* SymbolKeyword */));
                 }
                 var parent = ts.walkUpParenthesizedTypes(node.parent);
                 switch (parent.kind) {
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                         var decl = parent;
-                        if (decl.name.kind !== 72 /* Identifier */) {
+                        if (decl.name.kind !== 73 /* Identifier */) {
                             return grammarErrorOnNode(node, ts.Diagnostics.unique_symbol_types_may_not_be_used_on_a_variable_declaration_with_a_binding_name);
                         }
                         if (!ts.isVariableDeclarationInVariableStatement(decl)) {
@@ -59779,13 +60678,13 @@ var ts;
                             return grammarErrorOnNode(parent.name, ts.Diagnostics.A_variable_whose_type_is_a_unique_symbol_type_must_be_const);
                         }
                         break;
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         if (!ts.hasModifier(parent, 32 /* Static */) ||
                             !ts.hasModifier(parent, 64 /* Readonly */)) {
                             return grammarErrorOnNode(parent.name, ts.Diagnostics.A_property_of_a_class_whose_type_is_a_unique_symbol_type_must_be_both_static_and_readonly);
                         }
                         break;
-                    case 153 /* PropertySignature */:
+                    case 154 /* PropertySignature */:
                         if (!ts.hasModifier(parent, 64 /* Readonly */)) {
                             return grammarErrorOnNode(parent.name, ts.Diagnostics.A_property_of_an_interface_or_type_literal_whose_type_is_a_unique_symbol_type_must_be_readonly);
                         }
@@ -59794,9 +60693,9 @@ var ts;
                         return grammarErrorOnNode(node, ts.Diagnostics.unique_symbol_types_are_not_allowed_here);
                 }
             }
-            else if (node.operator === 133 /* ReadonlyKeyword */) {
-                if (node.type.kind !== 169 /* ArrayType */ && node.type.kind !== 170 /* TupleType */) {
-                    return grammarErrorOnFirstToken(node, ts.Diagnostics.readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types, ts.tokenToString(139 /* SymbolKeyword */));
+            else if (node.operator === 134 /* ReadonlyKeyword */) {
+                if (node.type.kind !== 170 /* ArrayType */ && node.type.kind !== 171 /* TupleType */) {
+                    return grammarErrorOnFirstToken(node, ts.Diagnostics.readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types, ts.tokenToString(140 /* SymbolKeyword */));
                 }
             }
         }
@@ -59809,10 +60708,10 @@ var ts;
             if (checkGrammarFunctionLikeDeclaration(node)) {
                 return true;
             }
-            if (node.kind === 156 /* MethodDeclaration */) {
-                if (node.parent.kind === 188 /* ObjectLiteralExpression */) {
+            if (node.kind === 157 /* MethodDeclaration */) {
+                if (node.parent.kind === 189 /* ObjectLiteralExpression */) {
                     // We only disallow modifier on a method declaration if it is a property of object-literal-expression
-                    if (node.modifiers && !(node.modifiers.length === 1 && ts.first(node.modifiers).kind === 121 /* AsyncKeyword */)) {
+                    if (node.modifiers && !(node.modifiers.length === 1 && ts.first(node.modifiers).kind === 122 /* AsyncKeyword */)) {
                         return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
                     }
                     else if (checkGrammarForInvalidQuestionMark(node.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional)) {
@@ -59825,6 +60724,9 @@ var ts;
                         return grammarErrorAtPos(node, node.end - 1, ";".length, ts.Diagnostics._0_expected, "{");
                     }
                 }
+                else if (ts.isClassLike(node.parent) && ts.isStringLiteral(node.name) && node.name.text === "constructor" && (!compilerOptions.target || compilerOptions.target < 1 /* ES5 */)) {
+                    return grammarErrorOnNode(node.name, ts.Diagnostics.Quoted_constructors_have_previously_been_interpreted_as_methods_which_is_incorrect_In_TypeScript_3_6_they_will_be_correctly_parsed_as_constructors_In_the_meantime_consider_using_constructor_to_write_a_constructor_or_constructor_to_write_a_method);
+                }
                 if (checkGrammarForGenerator(node)) {
                     return true;
                 }
@@ -59838,14 +60740,14 @@ var ts;
                 if (node.flags & 4194304 /* Ambient */) {
                     return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_ambient_context_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
                 }
-                else if (node.kind === 156 /* MethodDeclaration */ && !node.body) {
+                else if (node.kind === 157 /* MethodDeclaration */ && !node.body) {
                     return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_method_overload_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
                 }
             }
-            else if (node.parent.kind === 241 /* InterfaceDeclaration */) {
+            else if (node.parent.kind === 242 /* InterfaceDeclaration */) {
                 return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
             }
-            else if (node.parent.kind === 168 /* TypeLiteral */) {
+            else if (node.parent.kind === 169 /* TypeLiteral */) {
                 return checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type);
             }
         }
@@ -59856,11 +60758,11 @@ var ts;
                     return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary);
                 }
                 switch (current.kind) {
-                    case 233 /* LabeledStatement */:
+                    case 234 /* LabeledStatement */:
                         if (node.label && current.label.escapedText === node.label.escapedText) {
                             // found matching label - verify that label usage is correct
                             // continue can only target labels that are on iteration statements
-                            var isMisplacedContinueLabel = node.kind === 228 /* ContinueStatement */
+                            var isMisplacedContinueLabel = node.kind === 229 /* ContinueStatement */
                                 && !ts.isIterationStatement(current.statement, /*lookInLabeledStatement*/ true);
                             if (isMisplacedContinueLabel) {
                                 return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement);
@@ -59868,8 +60770,8 @@ var ts;
                             return false;
                         }
                         break;
-                    case 232 /* SwitchStatement */:
-                        if (node.kind === 229 /* BreakStatement */ && !node.label) {
+                    case 233 /* SwitchStatement */:
+                        if (node.kind === 230 /* BreakStatement */ && !node.label) {
                             // unlabeled break within switch statement - ok
                             return false;
                         }
@@ -59884,13 +60786,13 @@ var ts;
                 current = current.parent;
             }
             if (node.label) {
-                var message = node.kind === 229 /* BreakStatement */
+                var message = node.kind === 230 /* BreakStatement */
                     ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement
                     : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
             }
             else {
-                var message = node.kind === 229 /* BreakStatement */
+                var message = node.kind === 230 /* BreakStatement */
                     ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement
                     : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement;
                 return grammarErrorOnNode(node, message);
@@ -59914,12 +60816,12 @@ var ts;
         }
         function isStringOrNumberLiteralExpression(expr) {
             return expr.kind === 10 /* StringLiteral */ || expr.kind === 8 /* NumericLiteral */ ||
-                expr.kind === 202 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
+                expr.kind === 203 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
                     expr.operand.kind === 8 /* NumericLiteral */;
         }
         function isBigIntLiteralExpression(expr) {
             return expr.kind === 9 /* BigIntLiteral */ ||
-                expr.kind === 202 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
+                expr.kind === 203 /* PrefixUnaryExpression */ && expr.operator === 39 /* MinusToken */ &&
                     expr.operand.kind === 9 /* BigIntLiteral */;
         }
         function isSimpleLiteralEnumReference(expr) {
@@ -59932,7 +60834,7 @@ var ts;
             if (initializer) {
                 var isInvalidInitializer = !(isStringOrNumberLiteralExpression(initializer) ||
                     isSimpleLiteralEnumReference(initializer) ||
-                    initializer.kind === 102 /* TrueKeyword */ || initializer.kind === 87 /* FalseKeyword */ ||
+                    initializer.kind === 103 /* TrueKeyword */ || initializer.kind === 88 /* FalseKeyword */ ||
                     isBigIntLiteralExpression(initializer));
                 var isConstOrReadonly = ts.isDeclarationReadonly(node) || ts.isVariableDeclaration(node) && ts.isVarConst(node);
                 if (isConstOrReadonly && !node.type) {
@@ -59949,7 +60851,7 @@ var ts;
             }
         }
         function checkGrammarVariableDeclaration(node) {
-            if (node.parent.parent.kind !== 226 /* ForInStatement */ && node.parent.parent.kind !== 227 /* ForOfStatement */) {
+            if (node.parent.parent.kind !== 227 /* ForInStatement */ && node.parent.parent.kind !== 228 /* ForOfStatement */) {
                 if (node.flags & 4194304 /* Ambient */) {
                     checkAmbientInitializer(node);
                 }
@@ -59962,8 +60864,8 @@ var ts;
                     }
                 }
             }
-            if (node.exclamationToken && (node.parent.parent.kind !== 219 /* VariableStatement */ || !node.type || node.initializer || node.flags & 4194304 /* Ambient */)) {
-                return grammarErrorOnNode(node.exclamationToken, ts.Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context);
+            if (node.exclamationToken && (node.parent.parent.kind !== 220 /* VariableStatement */ || !node.type || node.initializer || node.flags & 4194304 /* Ambient */)) {
+                return grammarErrorOnNode(node.exclamationToken, ts.Diagnostics.Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation);
             }
             if (compilerOptions.module !== ts.ModuleKind.ES2015 && compilerOptions.module !== ts.ModuleKind.ESNext && compilerOptions.module !== ts.ModuleKind.System && !compilerOptions.noEmit &&
                 !(node.parent.parent.flags & 4194304 /* Ambient */) && ts.hasModifier(node.parent.parent, 1 /* Export */)) {
@@ -59979,7 +60881,7 @@ var ts;
             return checkLetConstNames && checkGrammarNameInLetOrConstDeclarations(node.name);
         }
         function checkESModuleMarker(name) {
-            if (name.kind === 72 /* Identifier */) {
+            if (name.kind === 73 /* Identifier */) {
                 if (ts.idText(name) === "__esModule") {
                     return grammarErrorOnNode(name, ts.Diagnostics.Identifier_expected_esModule_is_reserved_as_an_exported_marker_when_transforming_ECMAScript_modules);
                 }
@@ -59996,8 +60898,8 @@ var ts;
             return false;
         }
         function checkGrammarNameInLetOrConstDeclarations(name) {
-            if (name.kind === 72 /* Identifier */) {
-                if (name.originalKeywordKind === 111 /* LetKeyword */) {
+            if (name.kind === 73 /* Identifier */) {
+                if (name.originalKeywordKind === 112 /* LetKeyword */) {
                     return grammarErrorOnNode(name, ts.Diagnostics.let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations);
                 }
             }
@@ -60024,15 +60926,15 @@ var ts;
         }
         function allowLetAndConstDeclarations(parent) {
             switch (parent.kind) {
-                case 222 /* IfStatement */:
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
-                case 231 /* WithStatement */:
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
+                case 223 /* IfStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
+                case 232 /* WithStatement */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
                     return false;
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return allowLetAndConstDeclarations(parent.parent);
             }
             return true;
@@ -60050,12 +60952,12 @@ var ts;
         function checkGrammarMetaProperty(node) {
             var escapedText = node.name.escapedText;
             switch (node.keywordToken) {
-                case 95 /* NewKeyword */:
+                case 96 /* NewKeyword */:
                     if (escapedText !== "target") {
                         return grammarErrorOnNode(node.name, ts.Diagnostics._0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_2, node.name.escapedText, ts.tokenToString(node.keywordToken), "target");
                     }
                     break;
-                case 92 /* ImportKeyword */:
+                case 93 /* ImportKeyword */:
                     if (escapedText !== "meta") {
                         return grammarErrorOnNode(node.name, ts.Diagnostics._0_is_not_a_valid_meta_property_for_keyword_1_Did_you_mean_2, node.name.escapedText, ts.tokenToString(node.keywordToken), "meta");
                     }
@@ -60106,11 +61008,14 @@ var ts;
         }
         function checkGrammarProperty(node) {
             if (ts.isClassLike(node.parent)) {
+                if (ts.isStringLiteral(node.name) && node.name.text === "constructor") {
+                    return grammarErrorOnNode(node.name, ts.Diagnostics.Classes_may_not_have_a_field_named_constructor);
+                }
                 if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_class_property_declaration_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
                     return true;
                 }
             }
-            else if (node.parent.kind === 241 /* InterfaceDeclaration */) {
+            else if (node.parent.kind === 242 /* InterfaceDeclaration */) {
                 if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
                     return true;
                 }
@@ -60118,7 +61023,7 @@ var ts;
                     return grammarErrorOnNode(node.initializer, ts.Diagnostics.An_interface_property_cannot_have_an_initializer);
                 }
             }
-            else if (node.parent.kind === 168 /* TypeLiteral */) {
+            else if (node.parent.kind === 169 /* TypeLiteral */) {
                 if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
                     return true;
                 }
@@ -60147,22 +61052,22 @@ var ts;
             //     export_opt   AmbientDeclaration
             //
             // TODO: The spec needs to be amended to reflect this grammar.
-            if (node.kind === 241 /* InterfaceDeclaration */ ||
-                node.kind === 242 /* TypeAliasDeclaration */ ||
-                node.kind === 249 /* ImportDeclaration */ ||
-                node.kind === 248 /* ImportEqualsDeclaration */ ||
-                node.kind === 255 /* ExportDeclaration */ ||
-                node.kind === 254 /* ExportAssignment */ ||
-                node.kind === 247 /* NamespaceExportDeclaration */ ||
+            if (node.kind === 242 /* InterfaceDeclaration */ ||
+                node.kind === 243 /* TypeAliasDeclaration */ ||
+                node.kind === 250 /* ImportDeclaration */ ||
+                node.kind === 249 /* ImportEqualsDeclaration */ ||
+                node.kind === 256 /* ExportDeclaration */ ||
+                node.kind === 255 /* ExportAssignment */ ||
+                node.kind === 248 /* NamespaceExportDeclaration */ ||
                 ts.hasModifier(node, 2 /* Ambient */ | 1 /* Export */ | 512 /* Default */)) {
                 return false;
             }
-            return grammarErrorOnFirstToken(node, ts.Diagnostics.A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file);
+            return grammarErrorOnFirstToken(node, ts.Diagnostics.Top_level_declarations_in_d_ts_files_must_start_with_either_a_declare_or_export_modifier);
         }
         function checkGrammarTopLevelElementsForRequiredDeclareModifier(file) {
             for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
                 var decl = _a[_i];
-                if (ts.isDeclaration(decl) || decl.kind === 219 /* VariableStatement */) {
+                if (ts.isDeclaration(decl) || decl.kind === 220 /* VariableStatement */) {
                     if (checkGrammarTopLevelElementForRequiredDeclareModifier(decl)) {
                         return true;
                     }
@@ -60189,7 +61094,7 @@ var ts;
                 // to prevent noisiness.  So use a bit on the block to indicate if
                 // this has already been reported, and don't report if it has.
                 //
-                if (node.parent.kind === 218 /* Block */ || node.parent.kind === 245 /* ModuleBlock */ || node.parent.kind === 284 /* SourceFile */) {
+                if (node.parent.kind === 219 /* Block */ || node.parent.kind === 246 /* ModuleBlock */ || node.parent.kind === 285 /* SourceFile */) {
                     var links_2 = getNodeLinks(node.parent);
                     // Check if the containing block ever report this error
                     if (!links_2.hasReportedStatementInAmbientContext) {
@@ -60211,10 +61116,10 @@ var ts;
                 if (languageVersion >= 1 /* ES5 */) {
                     diagnosticMessage = ts.Diagnostics.Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher_Use_the_syntax_0;
                 }
-                else if (ts.isChildOfNodeWithKind(node, 182 /* LiteralType */)) {
+                else if (ts.isChildOfNodeWithKind(node, 183 /* LiteralType */)) {
                     diagnosticMessage = ts.Diagnostics.Octal_literal_types_must_use_ES2015_syntax_Use_the_syntax_0;
                 }
-                else if (ts.isChildOfNodeWithKind(node, 278 /* EnumMember */)) {
+                else if (ts.isChildOfNodeWithKind(node, 279 /* EnumMember */)) {
                     diagnosticMessage = ts.Diagnostics.Octal_literals_are_not_allowed_in_enums_members_initializer_Use_the_syntax_0;
                 }
                 if (diagnosticMessage) {
@@ -60229,7 +61134,7 @@ var ts;
             var literalType = ts.isLiteralTypeNode(node.parent) ||
                 ts.isPrefixUnaryExpression(node.parent) && ts.isLiteralTypeNode(node.parent.parent);
             if (!literalType) {
-                if (languageVersion < 7 /* ESNext */) {
+                if (languageVersion < 8 /* ESNext */) {
                     if (grammarErrorOnNode(node, ts.Diagnostics.BigInt_literals_are_not_available_when_targeting_lower_than_ESNext)) {
                         return true;
                     }
@@ -60282,8 +61187,8 @@ var ts;
     /** Like 'isDeclarationName', but returns true for LHS of `import { x as y }` or `export { x as y }`. */
     function isDeclarationNameOrImportPropertyName(name) {
         switch (name.parent.kind) {
-            case 253 /* ImportSpecifier */:
-            case 257 /* ExportSpecifier */:
+            case 254 /* ImportSpecifier */:
+            case 258 /* ExportSpecifier */:
                 return ts.isIdentifier(name);
             default:
                 return ts.isDeclarationName(name);
@@ -60291,14 +61196,14 @@ var ts;
     }
     function isSomeImportDeclaration(decl) {
         switch (decl.kind) {
-            case 250 /* ImportClause */: // For default import
-            case 248 /* ImportEqualsDeclaration */:
-            case 251 /* NamespaceImport */:
-            case 253 /* ImportSpecifier */: // For rename import `x as y`
+            case 251 /* ImportClause */: // For default import
+            case 249 /* ImportEqualsDeclaration */:
+            case 252 /* NamespaceImport */:
+            case 254 /* ImportSpecifier */: // For rename import `x as y`
                 return true;
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 // For regular import, `decl` is an Identifier under the ImportSpecifier.
-                return decl.parent.kind === 253 /* ImportSpecifier */;
+                return decl.parent.kind === 254 /* ImportSpecifier */;
             default:
                 return false;
         }
@@ -60426,7 +61331,7 @@ var ts;
         return node;
     }
     function createIdentifier(text, typeArguments) {
-        var node = createSynthesizedNode(72 /* Identifier */);
+        var node = createSynthesizedNode(73 /* Identifier */);
         node.escapedText = ts.escapeLeadingUnderscores(text);
         node.originalKeywordKind = text ? ts.stringToToken(text) : 0 /* Unknown */;
         node.autoGenerateFlags = 0 /* None */;
@@ -60507,23 +61412,23 @@ var ts;
     ts.createToken = createToken;
     // Reserved words
     function createSuper() {
-        return createSynthesizedNode(98 /* SuperKeyword */);
+        return createSynthesizedNode(99 /* SuperKeyword */);
     }
     ts.createSuper = createSuper;
     function createThis() {
-        return createSynthesizedNode(100 /* ThisKeyword */);
+        return createSynthesizedNode(101 /* ThisKeyword */);
     }
     ts.createThis = createThis;
     function createNull() {
-        return createSynthesizedNode(96 /* NullKeyword */);
+        return createSynthesizedNode(97 /* NullKeyword */);
     }
     ts.createNull = createNull;
     function createTrue() {
-        return createSynthesizedNode(102 /* TrueKeyword */);
+        return createSynthesizedNode(103 /* TrueKeyword */);
     }
     ts.createTrue = createTrue;
     function createFalse() {
-        return createSynthesizedNode(87 /* FalseKeyword */);
+        return createSynthesizedNode(88 /* FalseKeyword */);
     }
     ts.createFalse = createFalse;
     // Modifiers
@@ -60534,44 +61439,44 @@ var ts;
     function createModifiersFromModifierFlags(flags) {
         var result = [];
         if (flags & 1 /* Export */) {
-            result.push(createModifier(85 /* ExportKeyword */));
+            result.push(createModifier(86 /* ExportKeyword */));
         }
         if (flags & 2 /* Ambient */) {
-            result.push(createModifier(125 /* DeclareKeyword */));
+            result.push(createModifier(126 /* DeclareKeyword */));
         }
         if (flags & 512 /* Default */) {
-            result.push(createModifier(80 /* DefaultKeyword */));
+            result.push(createModifier(81 /* DefaultKeyword */));
         }
         if (flags & 2048 /* Const */) {
-            result.push(createModifier(77 /* ConstKeyword */));
+            result.push(createModifier(78 /* ConstKeyword */));
         }
         if (flags & 4 /* Public */) {
-            result.push(createModifier(115 /* PublicKeyword */));
+            result.push(createModifier(116 /* PublicKeyword */));
         }
         if (flags & 8 /* Private */) {
-            result.push(createModifier(113 /* PrivateKeyword */));
+            result.push(createModifier(114 /* PrivateKeyword */));
         }
         if (flags & 16 /* Protected */) {
-            result.push(createModifier(114 /* ProtectedKeyword */));
+            result.push(createModifier(115 /* ProtectedKeyword */));
         }
         if (flags & 128 /* Abstract */) {
-            result.push(createModifier(118 /* AbstractKeyword */));
+            result.push(createModifier(119 /* AbstractKeyword */));
         }
         if (flags & 32 /* Static */) {
-            result.push(createModifier(116 /* StaticKeyword */));
+            result.push(createModifier(117 /* StaticKeyword */));
         }
         if (flags & 64 /* Readonly */) {
-            result.push(createModifier(133 /* ReadonlyKeyword */));
+            result.push(createModifier(134 /* ReadonlyKeyword */));
         }
         if (flags & 256 /* Async */) {
-            result.push(createModifier(121 /* AsyncKeyword */));
+            result.push(createModifier(122 /* AsyncKeyword */));
         }
         return result;
     }
     ts.createModifiersFromModifierFlags = createModifiersFromModifierFlags;
     // Names
     function createQualifiedName(left, right) {
-        var node = createSynthesizedNode(148 /* QualifiedName */);
+        var node = createSynthesizedNode(149 /* QualifiedName */);
         node.left = left;
         node.right = asName(right);
         return node;
@@ -60590,7 +61495,7 @@ var ts;
             : expression;
     }
     function createComputedPropertyName(expression) {
-        var node = createSynthesizedNode(149 /* ComputedPropertyName */);
+        var node = createSynthesizedNode(150 /* ComputedPropertyName */);
         node.expression = parenthesizeForComputedName(expression);
         return node;
     }
@@ -60603,7 +61508,7 @@ var ts;
     ts.updateComputedPropertyName = updateComputedPropertyName;
     // Signature elements
     function createTypeParameterDeclaration(name, constraint, defaultType) {
-        var node = createSynthesizedNode(150 /* TypeParameter */);
+        var node = createSynthesizedNode(151 /* TypeParameter */);
         node.name = asName(name);
         node.constraint = constraint;
         node.default = defaultType;
@@ -60619,7 +61524,7 @@ var ts;
     }
     ts.updateTypeParameterDeclaration = updateTypeParameterDeclaration;
     function createParameter(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer) {
-        var node = createSynthesizedNode(151 /* Parameter */);
+        var node = createSynthesizedNode(152 /* Parameter */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.dotDotDotToken = dotDotDotToken;
@@ -60643,7 +61548,7 @@ var ts;
     }
     ts.updateParameter = updateParameter;
     function createDecorator(expression) {
-        var node = createSynthesizedNode(152 /* Decorator */);
+        var node = createSynthesizedNode(153 /* Decorator */);
         node.expression = ts.parenthesizeForAccess(expression);
         return node;
     }
@@ -60656,7 +61561,7 @@ var ts;
     ts.updateDecorator = updateDecorator;
     // Type Elements
     function createPropertySignature(modifiers, name, questionToken, type, initializer) {
-        var node = createSynthesizedNode(153 /* PropertySignature */);
+        var node = createSynthesizedNode(154 /* PropertySignature */);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
         node.questionToken = questionToken;
@@ -60676,7 +61581,7 @@ var ts;
     }
     ts.updatePropertySignature = updatePropertySignature;
     function createProperty(decorators, modifiers, name, questionOrExclamationToken, type, initializer) {
-        var node = createSynthesizedNode(154 /* PropertyDeclaration */);
+        var node = createSynthesizedNode(155 /* PropertyDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -60700,7 +61605,7 @@ var ts;
     }
     ts.updateProperty = updateProperty;
     function createMethodSignature(typeParameters, parameters, type, name, questionToken) {
-        var node = createSignatureDeclaration(155 /* MethodSignature */, typeParameters, parameters, type);
+        var node = createSignatureDeclaration(156 /* MethodSignature */, typeParameters, parameters, type);
         node.name = asName(name);
         node.questionToken = questionToken;
         return node;
@@ -60717,7 +61622,7 @@ var ts;
     }
     ts.updateMethodSignature = updateMethodSignature;
     function createMethod(decorators, modifiers, asteriskToken, name, questionToken, typeParameters, parameters, type, body) {
-        var node = createSynthesizedNode(156 /* MethodDeclaration */);
+        var node = createSynthesizedNode(157 /* MethodDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.asteriskToken = asteriskToken;
@@ -60745,7 +61650,7 @@ var ts;
     }
     ts.updateMethod = updateMethod;
     function createConstructor(decorators, modifiers, parameters, body) {
-        var node = createSynthesizedNode(157 /* Constructor */);
+        var node = createSynthesizedNode(158 /* Constructor */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.typeParameters = undefined;
@@ -60765,7 +61670,7 @@ var ts;
     }
     ts.updateConstructor = updateConstructor;
     function createGetAccessor(decorators, modifiers, name, parameters, type, body) {
-        var node = createSynthesizedNode(158 /* GetAccessor */);
+        var node = createSynthesizedNode(159 /* GetAccessor */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -60788,7 +61693,7 @@ var ts;
     }
     ts.updateGetAccessor = updateGetAccessor;
     function createSetAccessor(decorators, modifiers, name, parameters, body) {
-        var node = createSynthesizedNode(159 /* SetAccessor */);
+        var node = createSynthesizedNode(160 /* SetAccessor */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -60809,7 +61714,7 @@ var ts;
     }
     ts.updateSetAccessor = updateSetAccessor;
     function createCallSignature(typeParameters, parameters, type) {
-        return createSignatureDeclaration(160 /* CallSignature */, typeParameters, parameters, type);
+        return createSignatureDeclaration(161 /* CallSignature */, typeParameters, parameters, type);
     }
     ts.createCallSignature = createCallSignature;
     function updateCallSignature(node, typeParameters, parameters, type) {
@@ -60817,7 +61722,7 @@ var ts;
     }
     ts.updateCallSignature = updateCallSignature;
     function createConstructSignature(typeParameters, parameters, type) {
-        return createSignatureDeclaration(161 /* ConstructSignature */, typeParameters, parameters, type);
+        return createSignatureDeclaration(162 /* ConstructSignature */, typeParameters, parameters, type);
     }
     ts.createConstructSignature = createConstructSignature;
     function updateConstructSignature(node, typeParameters, parameters, type) {
@@ -60825,7 +61730,7 @@ var ts;
     }
     ts.updateConstructSignature = updateConstructSignature;
     function createIndexSignature(decorators, modifiers, parameters, type) {
-        var node = createSynthesizedNode(162 /* IndexSignature */);
+        var node = createSynthesizedNode(163 /* IndexSignature */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.parameters = createNodeArray(parameters);
@@ -60865,7 +61770,7 @@ var ts;
     }
     ts.createKeywordTypeNode = createKeywordTypeNode;
     function createTypePredicateNode(parameterName, type) {
-        var node = createSynthesizedNode(163 /* TypePredicate */);
+        var node = createSynthesizedNode(164 /* TypePredicate */);
         node.parameterName = asName(parameterName);
         node.type = type;
         return node;
@@ -60879,7 +61784,7 @@ var ts;
     }
     ts.updateTypePredicateNode = updateTypePredicateNode;
     function createTypeReferenceNode(typeName, typeArguments) {
-        var node = createSynthesizedNode(164 /* TypeReference */);
+        var node = createSynthesizedNode(165 /* TypeReference */);
         node.typeName = asName(typeName);
         node.typeArguments = typeArguments && ts.parenthesizeTypeParameters(typeArguments);
         return node;
@@ -60893,7 +61798,7 @@ var ts;
     }
     ts.updateTypeReferenceNode = updateTypeReferenceNode;
     function createFunctionTypeNode(typeParameters, parameters, type) {
-        return createSignatureDeclaration(165 /* FunctionType */, typeParameters, parameters, type);
+        return createSignatureDeclaration(166 /* FunctionType */, typeParameters, parameters, type);
     }
     ts.createFunctionTypeNode = createFunctionTypeNode;
     function updateFunctionTypeNode(node, typeParameters, parameters, type) {
@@ -60901,7 +61806,7 @@ var ts;
     }
     ts.updateFunctionTypeNode = updateFunctionTypeNode;
     function createConstructorTypeNode(typeParameters, parameters, type) {
-        return createSignatureDeclaration(166 /* ConstructorType */, typeParameters, parameters, type);
+        return createSignatureDeclaration(167 /* ConstructorType */, typeParameters, parameters, type);
     }
     ts.createConstructorTypeNode = createConstructorTypeNode;
     function updateConstructorTypeNode(node, typeParameters, parameters, type) {
@@ -60909,7 +61814,7 @@ var ts;
     }
     ts.updateConstructorTypeNode = updateConstructorTypeNode;
     function createTypeQueryNode(exprName) {
-        var node = createSynthesizedNode(167 /* TypeQuery */);
+        var node = createSynthesizedNode(168 /* TypeQuery */);
         node.exprName = exprName;
         return node;
     }
@@ -60921,7 +61826,7 @@ var ts;
     }
     ts.updateTypeQueryNode = updateTypeQueryNode;
     function createTypeLiteralNode(members) {
-        var node = createSynthesizedNode(168 /* TypeLiteral */);
+        var node = createSynthesizedNode(169 /* TypeLiteral */);
         node.members = createNodeArray(members);
         return node;
     }
@@ -60933,7 +61838,7 @@ var ts;
     }
     ts.updateTypeLiteralNode = updateTypeLiteralNode;
     function createArrayTypeNode(elementType) {
-        var node = createSynthesizedNode(169 /* ArrayType */);
+        var node = createSynthesizedNode(170 /* ArrayType */);
         node.elementType = ts.parenthesizeArrayTypeMember(elementType);
         return node;
     }
@@ -60945,7 +61850,7 @@ var ts;
     }
     ts.updateArrayTypeNode = updateArrayTypeNode;
     function createTupleTypeNode(elementTypes) {
-        var node = createSynthesizedNode(170 /* TupleType */);
+        var node = createSynthesizedNode(171 /* TupleType */);
         node.elementTypes = createNodeArray(elementTypes);
         return node;
     }
@@ -60957,7 +61862,7 @@ var ts;
     }
     ts.updateTupleTypeNode = updateTupleTypeNode;
     function createOptionalTypeNode(type) {
-        var node = createSynthesizedNode(171 /* OptionalType */);
+        var node = createSynthesizedNode(172 /* OptionalType */);
         node.type = ts.parenthesizeArrayTypeMember(type);
         return node;
     }
@@ -60969,7 +61874,7 @@ var ts;
     }
     ts.updateOptionalTypeNode = updateOptionalTypeNode;
     function createRestTypeNode(type) {
-        var node = createSynthesizedNode(172 /* RestType */);
+        var node = createSynthesizedNode(173 /* RestType */);
         node.type = type;
         return node;
     }
@@ -60981,7 +61886,7 @@ var ts;
     }
     ts.updateRestTypeNode = updateRestTypeNode;
     function createUnionTypeNode(types) {
-        return createUnionOrIntersectionTypeNode(173 /* UnionType */, types);
+        return createUnionOrIntersectionTypeNode(174 /* UnionType */, types);
     }
     ts.createUnionTypeNode = createUnionTypeNode;
     function updateUnionTypeNode(node, types) {
@@ -60989,7 +61894,7 @@ var ts;
     }
     ts.updateUnionTypeNode = updateUnionTypeNode;
     function createIntersectionTypeNode(types) {
-        return createUnionOrIntersectionTypeNode(174 /* IntersectionType */, types);
+        return createUnionOrIntersectionTypeNode(175 /* IntersectionType */, types);
     }
     ts.createIntersectionTypeNode = createIntersectionTypeNode;
     function updateIntersectionTypeNode(node, types) {
@@ -61008,7 +61913,7 @@ var ts;
             : node;
     }
     function createConditionalTypeNode(checkType, extendsType, trueType, falseType) {
-        var node = createSynthesizedNode(175 /* ConditionalType */);
+        var node = createSynthesizedNode(176 /* ConditionalType */);
         node.checkType = ts.parenthesizeConditionalTypeMember(checkType);
         node.extendsType = ts.parenthesizeConditionalTypeMember(extendsType);
         node.trueType = trueType;
@@ -61026,7 +61931,7 @@ var ts;
     }
     ts.updateConditionalTypeNode = updateConditionalTypeNode;
     function createInferTypeNode(typeParameter) {
-        var node = createSynthesizedNode(176 /* InferType */);
+        var node = createSynthesizedNode(177 /* InferType */);
         node.typeParameter = typeParameter;
         return node;
     }
@@ -61038,10 +61943,10 @@ var ts;
     }
     ts.updateInferTypeNode = updateInferTypeNode;
     function createImportTypeNode(argument, qualifier, typeArguments, isTypeOf) {
-        var node = createSynthesizedNode(183 /* ImportType */);
+        var node = createSynthesizedNode(184 /* ImportType */);
         node.argument = argument;
         node.qualifier = qualifier;
-        node.typeArguments = asNodeArray(typeArguments);
+        node.typeArguments = ts.parenthesizeTypeParameters(typeArguments);
         node.isTypeOf = isTypeOf;
         return node;
     }
@@ -61056,7 +61961,7 @@ var ts;
     }
     ts.updateImportTypeNode = updateImportTypeNode;
     function createParenthesizedType(type) {
-        var node = createSynthesizedNode(177 /* ParenthesizedType */);
+        var node = createSynthesizedNode(178 /* ParenthesizedType */);
         node.type = type;
         return node;
     }
@@ -61068,12 +61973,12 @@ var ts;
     }
     ts.updateParenthesizedType = updateParenthesizedType;
     function createThisTypeNode() {
-        return createSynthesizedNode(178 /* ThisType */);
+        return createSynthesizedNode(179 /* ThisType */);
     }
     ts.createThisTypeNode = createThisTypeNode;
     function createTypeOperatorNode(operatorOrType, type) {
-        var node = createSynthesizedNode(179 /* TypeOperator */);
-        node.operator = typeof operatorOrType === "number" ? operatorOrType : 129 /* KeyOfKeyword */;
+        var node = createSynthesizedNode(180 /* TypeOperator */);
+        node.operator = typeof operatorOrType === "number" ? operatorOrType : 130 /* KeyOfKeyword */;
         node.type = ts.parenthesizeElementTypeMember(typeof operatorOrType === "number" ? type : operatorOrType);
         return node;
     }
@@ -61083,7 +61988,7 @@ var ts;
     }
     ts.updateTypeOperatorNode = updateTypeOperatorNode;
     function createIndexedAccessTypeNode(objectType, indexType) {
-        var node = createSynthesizedNode(180 /* IndexedAccessType */);
+        var node = createSynthesizedNode(181 /* IndexedAccessType */);
         node.objectType = ts.parenthesizeElementTypeMember(objectType);
         node.indexType = indexType;
         return node;
@@ -61097,7 +62002,7 @@ var ts;
     }
     ts.updateIndexedAccessTypeNode = updateIndexedAccessTypeNode;
     function createMappedTypeNode(readonlyToken, typeParameter, questionToken, type) {
-        var node = createSynthesizedNode(181 /* MappedType */);
+        var node = createSynthesizedNode(182 /* MappedType */);
         node.readonlyToken = readonlyToken;
         node.typeParameter = typeParameter;
         node.questionToken = questionToken;
@@ -61115,7 +62020,7 @@ var ts;
     }
     ts.updateMappedTypeNode = updateMappedTypeNode;
     function createLiteralTypeNode(literal) {
-        var node = createSynthesizedNode(182 /* LiteralType */);
+        var node = createSynthesizedNode(183 /* LiteralType */);
         node.literal = literal;
         return node;
     }
@@ -61128,7 +62033,7 @@ var ts;
     ts.updateLiteralTypeNode = updateLiteralTypeNode;
     // Binding Patterns
     function createObjectBindingPattern(elements) {
-        var node = createSynthesizedNode(184 /* ObjectBindingPattern */);
+        var node = createSynthesizedNode(185 /* ObjectBindingPattern */);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -61140,7 +62045,7 @@ var ts;
     }
     ts.updateObjectBindingPattern = updateObjectBindingPattern;
     function createArrayBindingPattern(elements) {
-        var node = createSynthesizedNode(185 /* ArrayBindingPattern */);
+        var node = createSynthesizedNode(186 /* ArrayBindingPattern */);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -61152,7 +62057,7 @@ var ts;
     }
     ts.updateArrayBindingPattern = updateArrayBindingPattern;
     function createBindingElement(dotDotDotToken, propertyName, name, initializer) {
-        var node = createSynthesizedNode(186 /* BindingElement */);
+        var node = createSynthesizedNode(187 /* BindingElement */);
         node.dotDotDotToken = dotDotDotToken;
         node.propertyName = asName(propertyName);
         node.name = asName(name);
@@ -61171,7 +62076,7 @@ var ts;
     ts.updateBindingElement = updateBindingElement;
     // Expression
     function createArrayLiteral(elements, multiLine) {
-        var node = createSynthesizedNode(187 /* ArrayLiteralExpression */);
+        var node = createSynthesizedNode(188 /* ArrayLiteralExpression */);
         node.elements = ts.parenthesizeListElements(createNodeArray(elements));
         if (multiLine)
             node.multiLine = true;
@@ -61185,7 +62090,7 @@ var ts;
     }
     ts.updateArrayLiteral = updateArrayLiteral;
     function createObjectLiteral(properties, multiLine) {
-        var node = createSynthesizedNode(188 /* ObjectLiteralExpression */);
+        var node = createSynthesizedNode(189 /* ObjectLiteralExpression */);
         node.properties = createNodeArray(properties);
         if (multiLine)
             node.multiLine = true;
@@ -61199,9 +62104,9 @@ var ts;
     }
     ts.updateObjectLiteral = updateObjectLiteral;
     function createPropertyAccess(expression, name) {
-        var node = createSynthesizedNode(189 /* PropertyAccessExpression */);
+        var node = createSynthesizedNode(190 /* PropertyAccessExpression */);
         node.expression = ts.parenthesizeForAccess(expression);
-        node.name = asName(name); // TODO: GH#18217
+        node.name = asName(name);
         setEmitFlags(node, 131072 /* NoIndentation */);
         return node;
     }
@@ -61216,7 +62121,7 @@ var ts;
     }
     ts.updatePropertyAccess = updatePropertyAccess;
     function createElementAccess(expression, index) {
-        var node = createSynthesizedNode(190 /* ElementAccessExpression */);
+        var node = createSynthesizedNode(191 /* ElementAccessExpression */);
         node.expression = ts.parenthesizeForAccess(expression);
         node.argumentExpression = asExpression(index);
         return node;
@@ -61230,7 +62135,7 @@ var ts;
     }
     ts.updateElementAccess = updateElementAccess;
     function createCall(expression, typeArguments, argumentsArray) {
-        var node = createSynthesizedNode(191 /* CallExpression */);
+        var node = createSynthesizedNode(192 /* CallExpression */);
         node.expression = ts.parenthesizeForAccess(expression);
         node.typeArguments = asNodeArray(typeArguments);
         node.arguments = ts.parenthesizeListElements(createNodeArray(argumentsArray));
@@ -61246,7 +62151,7 @@ var ts;
     }
     ts.updateCall = updateCall;
     function createNew(expression, typeArguments, argumentsArray) {
-        var node = createSynthesizedNode(192 /* NewExpression */);
+        var node = createSynthesizedNode(193 /* NewExpression */);
         node.expression = ts.parenthesizeForNew(expression);
         node.typeArguments = asNodeArray(typeArguments);
         node.arguments = argumentsArray ? ts.parenthesizeListElements(createNodeArray(argumentsArray)) : undefined;
@@ -61262,7 +62167,7 @@ var ts;
     }
     ts.updateNew = updateNew;
     function createTaggedTemplate(tag, typeArgumentsOrTemplate, template) {
-        var node = createSynthesizedNode(193 /* TaggedTemplateExpression */);
+        var node = createSynthesizedNode(194 /* TaggedTemplateExpression */);
         node.tag = ts.parenthesizeForAccess(tag);
         if (template) {
             node.typeArguments = asNodeArray(typeArgumentsOrTemplate);
@@ -61285,7 +62190,7 @@ var ts;
     }
     ts.updateTaggedTemplate = updateTaggedTemplate;
     function createTypeAssertion(type, expression) {
-        var node = createSynthesizedNode(194 /* TypeAssertionExpression */);
+        var node = createSynthesizedNode(195 /* TypeAssertionExpression */);
         node.type = type;
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
@@ -61299,7 +62204,7 @@ var ts;
     }
     ts.updateTypeAssertion = updateTypeAssertion;
     function createParen(expression) {
-        var node = createSynthesizedNode(195 /* ParenthesizedExpression */);
+        var node = createSynthesizedNode(196 /* ParenthesizedExpression */);
         node.expression = expression;
         return node;
     }
@@ -61311,7 +62216,7 @@ var ts;
     }
     ts.updateParen = updateParen;
     function createFunctionExpression(modifiers, asteriskToken, name, typeParameters, parameters, type, body) {
-        var node = createSynthesizedNode(196 /* FunctionExpression */);
+        var node = createSynthesizedNode(197 /* FunctionExpression */);
         node.modifiers = asNodeArray(modifiers);
         node.asteriskToken = asteriskToken;
         node.name = asName(name);
@@ -61335,7 +62240,7 @@ var ts;
     }
     ts.updateFunctionExpression = updateFunctionExpression;
     function createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body) {
-        var node = createSynthesizedNode(197 /* ArrowFunction */);
+        var node = createSynthesizedNode(198 /* ArrowFunction */);
         node.modifiers = asNodeArray(modifiers);
         node.typeParameters = asNodeArray(typeParameters);
         node.parameters = createNodeArray(parameters);
@@ -61357,7 +62262,7 @@ var ts;
     }
     ts.updateArrowFunction = updateArrowFunction;
     function createDelete(expression) {
-        var node = createSynthesizedNode(198 /* DeleteExpression */);
+        var node = createSynthesizedNode(199 /* DeleteExpression */);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -61369,7 +62274,7 @@ var ts;
     }
     ts.updateDelete = updateDelete;
     function createTypeOf(expression) {
-        var node = createSynthesizedNode(199 /* TypeOfExpression */);
+        var node = createSynthesizedNode(200 /* TypeOfExpression */);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -61381,7 +62286,7 @@ var ts;
     }
     ts.updateTypeOf = updateTypeOf;
     function createVoid(expression) {
-        var node = createSynthesizedNode(200 /* VoidExpression */);
+        var node = createSynthesizedNode(201 /* VoidExpression */);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -61393,7 +62298,7 @@ var ts;
     }
     ts.updateVoid = updateVoid;
     function createAwait(expression) {
-        var node = createSynthesizedNode(201 /* AwaitExpression */);
+        var node = createSynthesizedNode(202 /* AwaitExpression */);
         node.expression = ts.parenthesizePrefixOperand(expression);
         return node;
     }
@@ -61405,7 +62310,7 @@ var ts;
     }
     ts.updateAwait = updateAwait;
     function createPrefix(operator, operand) {
-        var node = createSynthesizedNode(202 /* PrefixUnaryExpression */);
+        var node = createSynthesizedNode(203 /* PrefixUnaryExpression */);
         node.operator = operator;
         node.operand = ts.parenthesizePrefixOperand(operand);
         return node;
@@ -61418,7 +62323,7 @@ var ts;
     }
     ts.updatePrefix = updatePrefix;
     function createPostfix(operand, operator) {
-        var node = createSynthesizedNode(203 /* PostfixUnaryExpression */);
+        var node = createSynthesizedNode(204 /* PostfixUnaryExpression */);
         node.operand = ts.parenthesizePostfixOperand(operand);
         node.operator = operator;
         return node;
@@ -61431,7 +62336,7 @@ var ts;
     }
     ts.updatePostfix = updatePostfix;
     function createBinary(left, operator, right) {
-        var node = createSynthesizedNode(204 /* BinaryExpression */);
+        var node = createSynthesizedNode(205 /* BinaryExpression */);
         var operatorToken = asToken(operator);
         var operatorKind = operatorToken.kind;
         node.left = ts.parenthesizeBinaryOperand(operatorKind, left, /*isLeftSideOfBinary*/ true, /*leftOperand*/ undefined);
@@ -61448,7 +62353,7 @@ var ts;
     }
     ts.updateBinary = updateBinary;
     function createConditional(condition, questionTokenOrWhenTrue, whenTrueOrWhenFalse, colonToken, whenFalse) {
-        var node = createSynthesizedNode(205 /* ConditionalExpression */);
+        var node = createSynthesizedNode(206 /* ConditionalExpression */);
         node.condition = ts.parenthesizeForConditionalHead(condition);
         node.questionToken = whenFalse ? questionTokenOrWhenTrue : createToken(56 /* QuestionToken */);
         node.whenTrue = ts.parenthesizeSubexpressionOfConditionalExpression(whenFalse ? whenTrueOrWhenFalse : questionTokenOrWhenTrue);
@@ -61468,7 +62373,7 @@ var ts;
     }
     ts.updateConditional = updateConditional;
     function createTemplateExpression(head, templateSpans) {
-        var node = createSynthesizedNode(206 /* TemplateExpression */);
+        var node = createSynthesizedNode(207 /* TemplateExpression */);
         node.head = head;
         node.templateSpans = createNodeArray(templateSpans);
         return node;
@@ -61506,7 +62411,7 @@ var ts;
     }
     ts.createNoSubstitutionTemplateLiteral = createNoSubstitutionTemplateLiteral;
     function createYield(asteriskTokenOrExpression, expression) {
-        var node = createSynthesizedNode(207 /* YieldExpression */);
+        var node = createSynthesizedNode(208 /* YieldExpression */);
         node.asteriskToken = asteriskTokenOrExpression && asteriskTokenOrExpression.kind === 40 /* AsteriskToken */ ? asteriskTokenOrExpression : undefined;
         node.expression = asteriskTokenOrExpression && asteriskTokenOrExpression.kind !== 40 /* AsteriskToken */ ? asteriskTokenOrExpression : expression;
         return node;
@@ -61520,7 +62425,7 @@ var ts;
     }
     ts.updateYield = updateYield;
     function createSpread(expression) {
-        var node = createSynthesizedNode(208 /* SpreadElement */);
+        var node = createSynthesizedNode(209 /* SpreadElement */);
         node.expression = ts.parenthesizeExpressionForList(expression);
         return node;
     }
@@ -61532,7 +62437,7 @@ var ts;
     }
     ts.updateSpread = updateSpread;
     function createClassExpression(modifiers, name, typeParameters, heritageClauses, members) {
-        var node = createSynthesizedNode(209 /* ClassExpression */);
+        var node = createSynthesizedNode(210 /* ClassExpression */);
         node.decorators = undefined;
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61553,11 +62458,11 @@ var ts;
     }
     ts.updateClassExpression = updateClassExpression;
     function createOmittedExpression() {
-        return createSynthesizedNode(210 /* OmittedExpression */);
+        return createSynthesizedNode(211 /* OmittedExpression */);
     }
     ts.createOmittedExpression = createOmittedExpression;
     function createExpressionWithTypeArguments(typeArguments, expression) {
-        var node = createSynthesizedNode(211 /* ExpressionWithTypeArguments */);
+        var node = createSynthesizedNode(212 /* ExpressionWithTypeArguments */);
         node.expression = ts.parenthesizeForAccess(expression);
         node.typeArguments = asNodeArray(typeArguments);
         return node;
@@ -61571,7 +62476,7 @@ var ts;
     }
     ts.updateExpressionWithTypeArguments = updateExpressionWithTypeArguments;
     function createAsExpression(expression, type) {
-        var node = createSynthesizedNode(212 /* AsExpression */);
+        var node = createSynthesizedNode(213 /* AsExpression */);
         node.expression = expression;
         node.type = type;
         return node;
@@ -61585,7 +62490,7 @@ var ts;
     }
     ts.updateAsExpression = updateAsExpression;
     function createNonNullExpression(expression) {
-        var node = createSynthesizedNode(213 /* NonNullExpression */);
+        var node = createSynthesizedNode(214 /* NonNullExpression */);
         node.expression = ts.parenthesizeForAccess(expression);
         return node;
     }
@@ -61597,7 +62502,7 @@ var ts;
     }
     ts.updateNonNullExpression = updateNonNullExpression;
     function createMetaProperty(keywordToken, name) {
-        var node = createSynthesizedNode(214 /* MetaProperty */);
+        var node = createSynthesizedNode(215 /* MetaProperty */);
         node.keywordToken = keywordToken;
         node.name = name;
         return node;
@@ -61611,7 +62516,7 @@ var ts;
     ts.updateMetaProperty = updateMetaProperty;
     // Misc
     function createTemplateSpan(expression, literal) {
-        var node = createSynthesizedNode(216 /* TemplateSpan */);
+        var node = createSynthesizedNode(217 /* TemplateSpan */);
         node.expression = expression;
         node.literal = literal;
         return node;
@@ -61625,12 +62530,12 @@ var ts;
     }
     ts.updateTemplateSpan = updateTemplateSpan;
     function createSemicolonClassElement() {
-        return createSynthesizedNode(217 /* SemicolonClassElement */);
+        return createSynthesizedNode(218 /* SemicolonClassElement */);
     }
     ts.createSemicolonClassElement = createSemicolonClassElement;
     // Element
     function createBlock(statements, multiLine) {
-        var block = createSynthesizedNode(218 /* Block */);
+        var block = createSynthesizedNode(219 /* Block */);
         block.statements = createNodeArray(statements);
         if (multiLine)
             block.multiLine = multiLine;
@@ -61644,7 +62549,7 @@ var ts;
     }
     ts.updateBlock = updateBlock;
     function createVariableStatement(modifiers, declarationList) {
-        var node = createSynthesizedNode(219 /* VariableStatement */);
+        var node = createSynthesizedNode(220 /* VariableStatement */);
         node.decorators = undefined;
         node.modifiers = asNodeArray(modifiers);
         node.declarationList = ts.isArray(declarationList) ? createVariableDeclarationList(declarationList) : declarationList;
@@ -61659,11 +62564,11 @@ var ts;
     }
     ts.updateVariableStatement = updateVariableStatement;
     function createEmptyStatement() {
-        return createSynthesizedNode(220 /* EmptyStatement */);
+        return createSynthesizedNode(221 /* EmptyStatement */);
     }
     ts.createEmptyStatement = createEmptyStatement;
     function createExpressionStatement(expression) {
-        var node = createSynthesizedNode(221 /* ExpressionStatement */);
+        var node = createSynthesizedNode(222 /* ExpressionStatement */);
         node.expression = ts.parenthesizeExpressionForExpressionStatement(expression);
         return node;
     }
@@ -61679,7 +62584,7 @@ var ts;
     /** @deprecated Use `updateExpressionStatement` instead.  */
     ts.updateStatement = updateExpressionStatement;
     function createIf(expression, thenStatement, elseStatement) {
-        var node = createSynthesizedNode(222 /* IfStatement */);
+        var node = createSynthesizedNode(223 /* IfStatement */);
         node.expression = expression;
         node.thenStatement = thenStatement;
         node.elseStatement = elseStatement;
@@ -61695,7 +62600,7 @@ var ts;
     }
     ts.updateIf = updateIf;
     function createDo(statement, expression) {
-        var node = createSynthesizedNode(223 /* DoStatement */);
+        var node = createSynthesizedNode(224 /* DoStatement */);
         node.statement = statement;
         node.expression = expression;
         return node;
@@ -61709,7 +62614,7 @@ var ts;
     }
     ts.updateDo = updateDo;
     function createWhile(expression, statement) {
-        var node = createSynthesizedNode(224 /* WhileStatement */);
+        var node = createSynthesizedNode(225 /* WhileStatement */);
         node.expression = expression;
         node.statement = statement;
         return node;
@@ -61723,7 +62628,7 @@ var ts;
     }
     ts.updateWhile = updateWhile;
     function createFor(initializer, condition, incrementor, statement) {
-        var node = createSynthesizedNode(225 /* ForStatement */);
+        var node = createSynthesizedNode(226 /* ForStatement */);
         node.initializer = initializer;
         node.condition = condition;
         node.incrementor = incrementor;
@@ -61741,7 +62646,7 @@ var ts;
     }
     ts.updateFor = updateFor;
     function createForIn(initializer, expression, statement) {
-        var node = createSynthesizedNode(226 /* ForInStatement */);
+        var node = createSynthesizedNode(227 /* ForInStatement */);
         node.initializer = initializer;
         node.expression = expression;
         node.statement = statement;
@@ -61757,7 +62662,7 @@ var ts;
     }
     ts.updateForIn = updateForIn;
     function createForOf(awaitModifier, initializer, expression, statement) {
-        var node = createSynthesizedNode(227 /* ForOfStatement */);
+        var node = createSynthesizedNode(228 /* ForOfStatement */);
         node.awaitModifier = awaitModifier;
         node.initializer = initializer;
         node.expression = expression;
@@ -61775,7 +62680,7 @@ var ts;
     }
     ts.updateForOf = updateForOf;
     function createContinue(label) {
-        var node = createSynthesizedNode(228 /* ContinueStatement */);
+        var node = createSynthesizedNode(229 /* ContinueStatement */);
         node.label = asName(label);
         return node;
     }
@@ -61787,7 +62692,7 @@ var ts;
     }
     ts.updateContinue = updateContinue;
     function createBreak(label) {
-        var node = createSynthesizedNode(229 /* BreakStatement */);
+        var node = createSynthesizedNode(230 /* BreakStatement */);
         node.label = asName(label);
         return node;
     }
@@ -61799,7 +62704,7 @@ var ts;
     }
     ts.updateBreak = updateBreak;
     function createReturn(expression) {
-        var node = createSynthesizedNode(230 /* ReturnStatement */);
+        var node = createSynthesizedNode(231 /* ReturnStatement */);
         node.expression = expression;
         return node;
     }
@@ -61811,7 +62716,7 @@ var ts;
     }
     ts.updateReturn = updateReturn;
     function createWith(expression, statement) {
-        var node = createSynthesizedNode(231 /* WithStatement */);
+        var node = createSynthesizedNode(232 /* WithStatement */);
         node.expression = expression;
         node.statement = statement;
         return node;
@@ -61825,7 +62730,7 @@ var ts;
     }
     ts.updateWith = updateWith;
     function createSwitch(expression, caseBlock) {
-        var node = createSynthesizedNode(232 /* SwitchStatement */);
+        var node = createSynthesizedNode(233 /* SwitchStatement */);
         node.expression = ts.parenthesizeExpressionForList(expression);
         node.caseBlock = caseBlock;
         return node;
@@ -61839,7 +62744,7 @@ var ts;
     }
     ts.updateSwitch = updateSwitch;
     function createLabel(label, statement) {
-        var node = createSynthesizedNode(233 /* LabeledStatement */);
+        var node = createSynthesizedNode(234 /* LabeledStatement */);
         node.label = asName(label);
         node.statement = statement;
         return node;
@@ -61853,7 +62758,7 @@ var ts;
     }
     ts.updateLabel = updateLabel;
     function createThrow(expression) {
-        var node = createSynthesizedNode(234 /* ThrowStatement */);
+        var node = createSynthesizedNode(235 /* ThrowStatement */);
         node.expression = expression;
         return node;
     }
@@ -61865,7 +62770,7 @@ var ts;
     }
     ts.updateThrow = updateThrow;
     function createTry(tryBlock, catchClause, finallyBlock) {
-        var node = createSynthesizedNode(235 /* TryStatement */);
+        var node = createSynthesizedNode(236 /* TryStatement */);
         node.tryBlock = tryBlock;
         node.catchClause = catchClause;
         node.finallyBlock = finallyBlock;
@@ -61881,11 +62786,11 @@ var ts;
     }
     ts.updateTry = updateTry;
     function createDebuggerStatement() {
-        return createSynthesizedNode(236 /* DebuggerStatement */);
+        return createSynthesizedNode(237 /* DebuggerStatement */);
     }
     ts.createDebuggerStatement = createDebuggerStatement;
     function createVariableDeclaration(name, type, initializer) {
-        var node = createSynthesizedNode(237 /* VariableDeclaration */);
+        var node = createSynthesizedNode(238 /* VariableDeclaration */);
         node.name = asName(name);
         node.type = type;
         node.initializer = initializer !== undefined ? ts.parenthesizeExpressionForList(initializer) : undefined;
@@ -61902,7 +62807,7 @@ var ts;
     ts.updateVariableDeclaration = updateVariableDeclaration;
     function createVariableDeclarationList(declarations, flags) {
         if (flags === void 0) { flags = 0 /* None */; }
-        var node = createSynthesizedNode(238 /* VariableDeclarationList */);
+        var node = createSynthesizedNode(239 /* VariableDeclarationList */);
         node.flags |= flags & 3 /* BlockScoped */;
         node.declarations = createNodeArray(declarations);
         return node;
@@ -61915,7 +62820,7 @@ var ts;
     }
     ts.updateVariableDeclarationList = updateVariableDeclarationList;
     function createFunctionDeclaration(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body) {
-        var node = createSynthesizedNode(239 /* FunctionDeclaration */);
+        var node = createSynthesizedNode(240 /* FunctionDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.asteriskToken = asteriskToken;
@@ -61941,7 +62846,7 @@ var ts;
     }
     ts.updateFunctionDeclaration = updateFunctionDeclaration;
     function createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) {
-        var node = createSynthesizedNode(240 /* ClassDeclaration */);
+        var node = createSynthesizedNode(241 /* ClassDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61963,7 +62868,7 @@ var ts;
     }
     ts.updateClassDeclaration = updateClassDeclaration;
     function createInterfaceDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) {
-        var node = createSynthesizedNode(241 /* InterfaceDeclaration */);
+        var node = createSynthesizedNode(242 /* InterfaceDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -61985,7 +62890,7 @@ var ts;
     }
     ts.updateInterfaceDeclaration = updateInterfaceDeclaration;
     function createTypeAliasDeclaration(decorators, modifiers, name, typeParameters, type) {
-        var node = createSynthesizedNode(242 /* TypeAliasDeclaration */);
+        var node = createSynthesizedNode(243 /* TypeAliasDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -62005,7 +62910,7 @@ var ts;
     }
     ts.updateTypeAliasDeclaration = updateTypeAliasDeclaration;
     function createEnumDeclaration(decorators, modifiers, name, members) {
-        var node = createSynthesizedNode(243 /* EnumDeclaration */);
+        var node = createSynthesizedNode(244 /* EnumDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -62024,7 +62929,7 @@ var ts;
     ts.updateEnumDeclaration = updateEnumDeclaration;
     function createModuleDeclaration(decorators, modifiers, name, body, flags) {
         if (flags === void 0) { flags = 0 /* None */; }
-        var node = createSynthesizedNode(244 /* ModuleDeclaration */);
+        var node = createSynthesizedNode(245 /* ModuleDeclaration */);
         node.flags |= flags & (16 /* Namespace */ | 4 /* NestedNamespace */ | 512 /* GlobalAugmentation */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
@@ -62043,7 +62948,7 @@ var ts;
     }
     ts.updateModuleDeclaration = updateModuleDeclaration;
     function createModuleBlock(statements) {
-        var node = createSynthesizedNode(245 /* ModuleBlock */);
+        var node = createSynthesizedNode(246 /* ModuleBlock */);
         node.statements = createNodeArray(statements);
         return node;
     }
@@ -62055,7 +62960,7 @@ var ts;
     }
     ts.updateModuleBlock = updateModuleBlock;
     function createCaseBlock(clauses) {
-        var node = createSynthesizedNode(246 /* CaseBlock */);
+        var node = createSynthesizedNode(247 /* CaseBlock */);
         node.clauses = createNodeArray(clauses);
         return node;
     }
@@ -62067,7 +62972,7 @@ var ts;
     }
     ts.updateCaseBlock = updateCaseBlock;
     function createNamespaceExportDeclaration(name) {
-        var node = createSynthesizedNode(247 /* NamespaceExportDeclaration */);
+        var node = createSynthesizedNode(248 /* NamespaceExportDeclaration */);
         node.name = asName(name);
         return node;
     }
@@ -62079,7 +62984,7 @@ var ts;
     }
     ts.updateNamespaceExportDeclaration = updateNamespaceExportDeclaration;
     function createImportEqualsDeclaration(decorators, modifiers, name, moduleReference) {
-        var node = createSynthesizedNode(248 /* ImportEqualsDeclaration */);
+        var node = createSynthesizedNode(249 /* ImportEqualsDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.name = asName(name);
@@ -62097,7 +63002,7 @@ var ts;
     }
     ts.updateImportEqualsDeclaration = updateImportEqualsDeclaration;
     function createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier) {
-        var node = createSynthesizedNode(249 /* ImportDeclaration */);
+        var node = createSynthesizedNode(250 /* ImportDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.importClause = importClause;
@@ -62115,7 +63020,7 @@ var ts;
     }
     ts.updateImportDeclaration = updateImportDeclaration;
     function createImportClause(name, namedBindings) {
-        var node = createSynthesizedNode(250 /* ImportClause */);
+        var node = createSynthesizedNode(251 /* ImportClause */);
         node.name = name;
         node.namedBindings = namedBindings;
         return node;
@@ -62129,7 +63034,7 @@ var ts;
     }
     ts.updateImportClause = updateImportClause;
     function createNamespaceImport(name) {
-        var node = createSynthesizedNode(251 /* NamespaceImport */);
+        var node = createSynthesizedNode(252 /* NamespaceImport */);
         node.name = name;
         return node;
     }
@@ -62141,7 +63046,7 @@ var ts;
     }
     ts.updateNamespaceImport = updateNamespaceImport;
     function createNamedImports(elements) {
-        var node = createSynthesizedNode(252 /* NamedImports */);
+        var node = createSynthesizedNode(253 /* NamedImports */);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -62153,7 +63058,7 @@ var ts;
     }
     ts.updateNamedImports = updateNamedImports;
     function createImportSpecifier(propertyName, name) {
-        var node = createSynthesizedNode(253 /* ImportSpecifier */);
+        var node = createSynthesizedNode(254 /* ImportSpecifier */);
         node.propertyName = propertyName;
         node.name = name;
         return node;
@@ -62167,11 +63072,11 @@ var ts;
     }
     ts.updateImportSpecifier = updateImportSpecifier;
     function createExportAssignment(decorators, modifiers, isExportEquals, expression) {
-        var node = createSynthesizedNode(254 /* ExportAssignment */);
+        var node = createSynthesizedNode(255 /* ExportAssignment */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.isExportEquals = isExportEquals;
-        node.expression = isExportEquals ? ts.parenthesizeBinaryOperand(59 /* EqualsToken */, expression, /*isLeftSideOfBinary*/ false, /*leftOperand*/ undefined) : ts.parenthesizeDefaultExpression(expression);
+        node.expression = isExportEquals ? ts.parenthesizeBinaryOperand(60 /* EqualsToken */, expression, /*isLeftSideOfBinary*/ false, /*leftOperand*/ undefined) : ts.parenthesizeDefaultExpression(expression);
         return node;
     }
     ts.createExportAssignment = createExportAssignment;
@@ -62184,7 +63089,7 @@ var ts;
     }
     ts.updateExportAssignment = updateExportAssignment;
     function createExportDeclaration(decorators, modifiers, exportClause, moduleSpecifier) {
-        var node = createSynthesizedNode(255 /* ExportDeclaration */);
+        var node = createSynthesizedNode(256 /* ExportDeclaration */);
         node.decorators = asNodeArray(decorators);
         node.modifiers = asNodeArray(modifiers);
         node.exportClause = exportClause;
@@ -62202,7 +63107,7 @@ var ts;
     }
     ts.updateExportDeclaration = updateExportDeclaration;
     function createNamedExports(elements) {
-        var node = createSynthesizedNode(256 /* NamedExports */);
+        var node = createSynthesizedNode(257 /* NamedExports */);
         node.elements = createNodeArray(elements);
         return node;
     }
@@ -62214,7 +63119,7 @@ var ts;
     }
     ts.updateNamedExports = updateNamedExports;
     function createExportSpecifier(propertyName, name) {
-        var node = createSynthesizedNode(257 /* ExportSpecifier */);
+        var node = createSynthesizedNode(258 /* ExportSpecifier */);
         node.propertyName = asName(propertyName);
         node.name = asName(name);
         return node;
@@ -62229,7 +63134,7 @@ var ts;
     ts.updateExportSpecifier = updateExportSpecifier;
     // Module references
     function createExternalModuleReference(expression) {
-        var node = createSynthesizedNode(259 /* ExternalModuleReference */);
+        var node = createSynthesizedNode(260 /* ExternalModuleReference */);
         node.expression = expression;
         return node;
     }
@@ -62243,14 +63148,14 @@ var ts;
     // JSDoc
     /* @internal */
     function createJSDocTypeExpression(type) {
-        var node = createSynthesizedNode(288 /* JSDocTypeExpression */);
+        var node = createSynthesizedNode(289 /* JSDocTypeExpression */);
         node.type = type;
         return node;
     }
     ts.createJSDocTypeExpression = createJSDocTypeExpression;
     /* @internal */
     function createJSDocTypeTag(typeExpression, comment) {
-        var tag = createJSDocTag(307 /* JSDocTypeTag */, "type");
+        var tag = createJSDocTag(308 /* JSDocTypeTag */, "type");
         tag.typeExpression = typeExpression;
         tag.comment = comment;
         return tag;
@@ -62258,7 +63163,7 @@ var ts;
     ts.createJSDocTypeTag = createJSDocTypeTag;
     /* @internal */
     function createJSDocReturnTag(typeExpression, comment) {
-        var tag = createJSDocTag(305 /* JSDocReturnTag */, "returns");
+        var tag = createJSDocTag(306 /* JSDocReturnTag */, "returns");
         tag.typeExpression = typeExpression;
         tag.comment = comment;
         return tag;
@@ -62266,7 +63171,7 @@ var ts;
     ts.createJSDocReturnTag = createJSDocReturnTag;
     /* @internal */
     function createJSDocParamTag(name, isBracketed, typeExpression, comment) {
-        var tag = createJSDocTag(304 /* JSDocParameterTag */, "param");
+        var tag = createJSDocTag(305 /* JSDocParameterTag */, "param");
         tag.typeExpression = typeExpression;
         tag.name = name;
         tag.isBracketed = isBracketed;
@@ -62276,7 +63181,7 @@ var ts;
     ts.createJSDocParamTag = createJSDocParamTag;
     /* @internal */
     function createJSDocComment(comment, tags) {
-        var node = createSynthesizedNode(296 /* JSDocComment */);
+        var node = createSynthesizedNode(297 /* JSDocComment */);
         node.comment = comment;
         node.tags = tags;
         return node;
@@ -62290,7 +63195,7 @@ var ts;
     }
     // JSX
     function createJsxElement(openingElement, children, closingElement) {
-        var node = createSynthesizedNode(260 /* JsxElement */);
+        var node = createSynthesizedNode(261 /* JsxElement */);
         node.openingElement = openingElement;
         node.children = createNodeArray(children);
         node.closingElement = closingElement;
@@ -62306,7 +63211,7 @@ var ts;
     }
     ts.updateJsxElement = updateJsxElement;
     function createJsxSelfClosingElement(tagName, typeArguments, attributes) {
-        var node = createSynthesizedNode(261 /* JsxSelfClosingElement */);
+        var node = createSynthesizedNode(262 /* JsxSelfClosingElement */);
         node.tagName = tagName;
         node.typeArguments = asNodeArray(typeArguments);
         node.attributes = attributes;
@@ -62322,7 +63227,7 @@ var ts;
     }
     ts.updateJsxSelfClosingElement = updateJsxSelfClosingElement;
     function createJsxOpeningElement(tagName, typeArguments, attributes) {
-        var node = createSynthesizedNode(262 /* JsxOpeningElement */);
+        var node = createSynthesizedNode(263 /* JsxOpeningElement */);
         node.tagName = tagName;
         node.typeArguments = asNodeArray(typeArguments);
         node.attributes = attributes;
@@ -62338,7 +63243,7 @@ var ts;
     }
     ts.updateJsxOpeningElement = updateJsxOpeningElement;
     function createJsxClosingElement(tagName) {
-        var node = createSynthesizedNode(263 /* JsxClosingElement */);
+        var node = createSynthesizedNode(264 /* JsxClosingElement */);
         node.tagName = tagName;
         return node;
     }
@@ -62350,7 +63255,7 @@ var ts;
     }
     ts.updateJsxClosingElement = updateJsxClosingElement;
     function createJsxFragment(openingFragment, children, closingFragment) {
-        var node = createSynthesizedNode(264 /* JsxFragment */);
+        var node = createSynthesizedNode(265 /* JsxFragment */);
         node.openingFragment = openingFragment;
         node.children = createNodeArray(children);
         node.closingFragment = closingFragment;
@@ -62372,11 +63277,11 @@ var ts;
     }
     ts.updateJsxText = updateJsxText;
     function createJsxOpeningFragment() {
-        return createSynthesizedNode(265 /* JsxOpeningFragment */);
+        return createSynthesizedNode(266 /* JsxOpeningFragment */);
     }
     ts.createJsxOpeningFragment = createJsxOpeningFragment;
     function createJsxJsxClosingFragment() {
-        return createSynthesizedNode(266 /* JsxClosingFragment */);
+        return createSynthesizedNode(267 /* JsxClosingFragment */);
     }
     ts.createJsxJsxClosingFragment = createJsxJsxClosingFragment;
     function updateJsxFragment(node, openingFragment, children, closingFragment) {
@@ -62388,7 +63293,7 @@ var ts;
     }
     ts.updateJsxFragment = updateJsxFragment;
     function createJsxAttribute(name, initializer) {
-        var node = createSynthesizedNode(267 /* JsxAttribute */);
+        var node = createSynthesizedNode(268 /* JsxAttribute */);
         node.name = name;
         node.initializer = initializer;
         return node;
@@ -62402,7 +63307,7 @@ var ts;
     }
     ts.updateJsxAttribute = updateJsxAttribute;
     function createJsxAttributes(properties) {
-        var node = createSynthesizedNode(268 /* JsxAttributes */);
+        var node = createSynthesizedNode(269 /* JsxAttributes */);
         node.properties = createNodeArray(properties);
         return node;
     }
@@ -62414,7 +63319,7 @@ var ts;
     }
     ts.updateJsxAttributes = updateJsxAttributes;
     function createJsxSpreadAttribute(expression) {
-        var node = createSynthesizedNode(269 /* JsxSpreadAttribute */);
+        var node = createSynthesizedNode(270 /* JsxSpreadAttribute */);
         node.expression = expression;
         return node;
     }
@@ -62426,7 +63331,7 @@ var ts;
     }
     ts.updateJsxSpreadAttribute = updateJsxSpreadAttribute;
     function createJsxExpression(dotDotDotToken, expression) {
-        var node = createSynthesizedNode(270 /* JsxExpression */);
+        var node = createSynthesizedNode(271 /* JsxExpression */);
         node.dotDotDotToken = dotDotDotToken;
         node.expression = expression;
         return node;
@@ -62440,7 +63345,7 @@ var ts;
     ts.updateJsxExpression = updateJsxExpression;
     // Clauses
     function createCaseClause(expression, statements) {
-        var node = createSynthesizedNode(271 /* CaseClause */);
+        var node = createSynthesizedNode(272 /* CaseClause */);
         node.expression = ts.parenthesizeExpressionForList(expression);
         node.statements = createNodeArray(statements);
         return node;
@@ -62454,7 +63359,7 @@ var ts;
     }
     ts.updateCaseClause = updateCaseClause;
     function createDefaultClause(statements) {
-        var node = createSynthesizedNode(272 /* DefaultClause */);
+        var node = createSynthesizedNode(273 /* DefaultClause */);
         node.statements = createNodeArray(statements);
         return node;
     }
@@ -62466,7 +63371,7 @@ var ts;
     }
     ts.updateDefaultClause = updateDefaultClause;
     function createHeritageClause(token, types) {
-        var node = createSynthesizedNode(273 /* HeritageClause */);
+        var node = createSynthesizedNode(274 /* HeritageClause */);
         node.token = token;
         node.types = createNodeArray(types);
         return node;
@@ -62479,7 +63384,7 @@ var ts;
     }
     ts.updateHeritageClause = updateHeritageClause;
     function createCatchClause(variableDeclaration, block) {
-        var node = createSynthesizedNode(274 /* CatchClause */);
+        var node = createSynthesizedNode(275 /* CatchClause */);
         node.variableDeclaration = ts.isString(variableDeclaration) ? createVariableDeclaration(variableDeclaration) : variableDeclaration;
         node.block = block;
         return node;
@@ -62494,7 +63399,7 @@ var ts;
     ts.updateCatchClause = updateCatchClause;
     // Property assignments
     function createPropertyAssignment(name, initializer) {
-        var node = createSynthesizedNode(275 /* PropertyAssignment */);
+        var node = createSynthesizedNode(276 /* PropertyAssignment */);
         node.name = asName(name);
         node.questionToken = undefined;
         node.initializer = ts.parenthesizeExpressionForList(initializer);
@@ -62509,7 +63414,7 @@ var ts;
     }
     ts.updatePropertyAssignment = updatePropertyAssignment;
     function createShorthandPropertyAssignment(name, objectAssignmentInitializer) {
-        var node = createSynthesizedNode(276 /* ShorthandPropertyAssignment */);
+        var node = createSynthesizedNode(277 /* ShorthandPropertyAssignment */);
         node.name = asName(name);
         node.objectAssignmentInitializer = objectAssignmentInitializer !== undefined ? ts.parenthesizeExpressionForList(objectAssignmentInitializer) : undefined;
         return node;
@@ -62523,8 +63428,8 @@ var ts;
     }
     ts.updateShorthandPropertyAssignment = updateShorthandPropertyAssignment;
     function createSpreadAssignment(expression) {
-        var node = createSynthesizedNode(277 /* SpreadAssignment */);
-        node.expression = expression !== undefined ? ts.parenthesizeExpressionForList(expression) : undefined; // TODO: GH#18217
+        var node = createSynthesizedNode(278 /* SpreadAssignment */);
+        node.expression = ts.parenthesizeExpressionForList(expression);
         return node;
     }
     ts.createSpreadAssignment = createSpreadAssignment;
@@ -62536,7 +63441,7 @@ var ts;
     ts.updateSpreadAssignment = updateSpreadAssignment;
     // Enum
     function createEnumMember(name, initializer) {
-        var node = createSynthesizedNode(278 /* EnumMember */);
+        var node = createSynthesizedNode(279 /* EnumMember */);
         node.name = asName(name);
         node.initializer = initializer && ts.parenthesizeExpressionForList(initializer);
         return node;
@@ -62557,7 +63462,7 @@ var ts;
             (typeReferences !== undefined && node.typeReferenceDirectives !== typeReferences) ||
             (libReferences !== undefined && node.libReferenceDirectives !== libReferences) ||
             (hasNoDefaultLib !== undefined && node.hasNoDefaultLib !== hasNoDefaultLib)) {
-            var updated = createSynthesizedNode(284 /* SourceFile */);
+            var updated = createSynthesizedNode(285 /* SourceFile */);
             updated.flags |= node.flags;
             updated.statements = createNodeArray(statements);
             updated.endOfFileToken = node.endOfFileToken;
@@ -62641,7 +63546,7 @@ var ts;
      * @param original The original statement.
      */
     function createNotEmittedStatement(original) {
-        var node = createSynthesizedNode(312 /* NotEmittedStatement */);
+        var node = createSynthesizedNode(313 /* NotEmittedStatement */);
         node.original = original;
         setTextRange(node, original);
         return node;
@@ -62653,7 +63558,7 @@ var ts;
      */
     /* @internal */
     function createEndOfDeclarationMarker(original) {
-        var node = createSynthesizedNode(316 /* EndOfDeclarationMarker */);
+        var node = createSynthesizedNode(317 /* EndOfDeclarationMarker */);
         node.emitNode = {};
         node.original = original;
         return node;
@@ -62665,7 +63570,7 @@ var ts;
      */
     /* @internal */
     function createMergeDeclarationMarker(original) {
-        var node = createSynthesizedNode(315 /* MergeDeclarationMarker */);
+        var node = createSynthesizedNode(316 /* MergeDeclarationMarker */);
         node.emitNode = {};
         node.original = original;
         return node;
@@ -62680,7 +63585,7 @@ var ts;
      * @param location The location for the expression. Defaults to the positions from "original" if provided.
      */
     function createPartiallyEmittedExpression(expression, original) {
-        var node = createSynthesizedNode(313 /* PartiallyEmittedExpression */);
+        var node = createSynthesizedNode(314 /* PartiallyEmittedExpression */);
         node.expression = expression;
         node.original = original;
         setTextRange(node, original);
@@ -62696,7 +63601,7 @@ var ts;
     ts.updatePartiallyEmittedExpression = updatePartiallyEmittedExpression;
     function flattenCommaElements(node) {
         if (ts.nodeIsSynthesized(node) && !ts.isParseTreeNode(node) && !node.original && !node.emitNode && !node.id) {
-            if (node.kind === 314 /* CommaListExpression */) {
+            if (node.kind === 315 /* CommaListExpression */) {
                 return node.elements;
             }
             if (ts.isBinaryExpression(node) && node.operatorToken.kind === 27 /* CommaToken */) {
@@ -62706,7 +63611,7 @@ var ts;
         return node;
     }
     function createCommaList(elements) {
-        var node = createSynthesizedNode(314 /* CommaListExpression */);
+        var node = createSynthesizedNode(315 /* CommaListExpression */);
         node.elements = createNodeArray(ts.sameFlatMap(elements, flattenCommaElements));
         return node;
     }
@@ -62719,7 +63624,7 @@ var ts;
     ts.updateCommaList = updateCommaList;
     function createBundle(sourceFiles, prepends) {
         if (prepends === void 0) { prepends = ts.emptyArray; }
-        var node = ts.createNode(285 /* Bundle */);
+        var node = ts.createNode(286 /* Bundle */);
         node.prepends = prepends;
         node.sourceFiles = sourceFiles;
         return node;
@@ -62749,7 +63654,7 @@ var ts;
         ], function (helper) { return helper.name; }));
     }
     function createUnparsedSource() {
-        var node = ts.createNode(286 /* UnparsedSource */);
+        var node = ts.createNode(287 /* UnparsedSource */);
         node.prologues = ts.emptyArray;
         node.referencedFiles = ts.emptyArray;
         node.libReferenceDirectives = ts.emptyArray;
@@ -62881,10 +63786,10 @@ var ts;
     }
     function mapBundleFileSectionKindToSyntaxKind(kind) {
         switch (kind) {
-            case "prologue" /* Prologue */: return 279 /* UnparsedPrologue */;
-            case "prepend" /* Prepend */: return 280 /* UnparsedPrepend */;
-            case "internal" /* Internal */: return 282 /* UnparsedInternalText */;
-            case "text" /* Text */: return 281 /* UnparsedText */;
+            case "prologue" /* Prologue */: return 280 /* UnparsedPrologue */;
+            case "prepend" /* Prepend */: return 281 /* UnparsedPrepend */;
+            case "internal" /* Internal */: return 283 /* UnparsedInternalText */;
+            case "text" /* Text */: return 282 /* UnparsedText */;
             case "emitHelpers" /* EmitHelpers */:
             case "no-default-lib" /* NoDefaultLib */:
             case "reference" /* Reference */:
@@ -62902,14 +63807,14 @@ var ts;
         return node;
     }
     function createUnparsedSyntheticReference(section, parent) {
-        var node = ts.createNode(283 /* UnparsedSyntheticReference */, section.pos, section.end);
+        var node = ts.createNode(284 /* UnparsedSyntheticReference */, section.pos, section.end);
         node.parent = parent;
         node.data = section.data;
         node.section = section;
         return node;
     }
     function createInputFiles(javascriptTextOrReadFileText, declarationTextOrJavascriptPath, javascriptMapPath, javascriptMapTextOrDeclarationPath, declarationMapPath, declarationMapTextOrBuildInfoPath, javascriptPath, declarationPath, buildInfoPath, buildInfo, oldFileOfCurrentEmit) {
-        var node = ts.createNode(287 /* InputFiles */);
+        var node = ts.createNode(288 /* InputFiles */);
         if (!ts.isString(javascriptTextOrReadFileText)) {
             var cache_1 = ts.createMap();
             var textGetter_1 = function (path) {
@@ -63003,7 +63908,7 @@ var ts;
     }
     ts.createLessThan = createLessThan;
     function createAssignment(left, right) {
-        return createBinary(left, 59 /* EqualsToken */, right);
+        return createBinary(left, 60 /* EqualsToken */, right);
     }
     ts.createAssignment = createAssignment;
     function createStrictEquality(left, right) {
@@ -63096,7 +64001,7 @@ var ts;
                 // To avoid holding onto transformation artifacts, we keep track of any
                 // parse tree node we are annotating. This allows us to clean them up after
                 // all transformations have completed.
-                if (node.kind === 284 /* SourceFile */) {
+                if (node.kind === 285 /* SourceFile */) {
                     return node.emitNode = { annotatedNodes: [node] };
                 }
                 var sourceFile = ts.getSourceFileOfNode(ts.getParseTreeNode(ts.getSourceFileOfNode(node)));
@@ -63607,7 +64512,7 @@ var ts;
         if (!outermostLabeledStatement) {
             return node;
         }
-        var updated = ts.updateLabel(outermostLabeledStatement, outermostLabeledStatement.label, outermostLabeledStatement.statement.kind === 233 /* LabeledStatement */
+        var updated = ts.updateLabel(outermostLabeledStatement, outermostLabeledStatement.label, outermostLabeledStatement.statement.kind === 234 /* LabeledStatement */
             ? restoreEnclosingLabel(node, outermostLabeledStatement.statement)
             : node);
         if (afterRestoreLabelCallback) {
@@ -63619,20 +64524,20 @@ var ts;
     function shouldBeCapturedInTempVariable(node, cacheIdentifiers) {
         var target = ts.skipParentheses(node);
         switch (target.kind) {
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return cacheIdentifiers;
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
                 return false;
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 var elements = target.elements;
                 if (elements.length === 0) {
                     return false;
                 }
                 return true;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return target.properties.length > 0;
             default:
                 return true;
@@ -63647,7 +64552,7 @@ var ts;
             thisArg = ts.createThis();
             target = callee;
         }
-        else if (callee.kind === 98 /* SuperKeyword */) {
+        else if (callee.kind === 99 /* SuperKeyword */) {
             thisArg = ts.createThis();
             target = languageVersion < 2 /* ES2015 */
                 ? ts.setTextRange(ts.createIdentifier("_super"), callee)
@@ -63659,7 +64564,7 @@ var ts;
         }
         else {
             switch (callee.kind) {
-                case 189 /* PropertyAccessExpression */: {
+                case 190 /* PropertyAccessExpression */: {
                     if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
                         // for `a.b()` target is `(_a = a).b` and thisArg is `_a`
                         thisArg = ts.createTempVariable(recordTempVariable);
@@ -63672,7 +64577,7 @@ var ts;
                     }
                     break;
                 }
-                case 190 /* ElementAccessExpression */: {
+                case 191 /* ElementAccessExpression */: {
                     if (shouldBeCapturedInTempVariable(callee.expression, cacheIdentifiers)) {
                         // for `a[b]()` target is `(_a = a)[b]` and thisArg is `_a`
                         thisArg = ts.createTempVariable(recordTempVariable);
@@ -63729,14 +64634,14 @@ var ts;
     ts.createExpressionForPropertyName = createExpressionForPropertyName;
     function createExpressionForObjectLiteralElementLike(node, property, receiver) {
         switch (property.kind) {
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
                 return createExpressionForAccessorDeclaration(node.properties, property, receiver, !!node.multiLine);
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 return createExpressionForPropertyAssignment(property, receiver);
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 return createExpressionForShorthandPropertyAssignment(property, receiver);
-            case 156 /* MethodDeclaration */:
+            case 157 /* MethodDeclaration */:
                 return createExpressionForMethodDeclaration(property, receiver);
         }
     }
@@ -63744,7 +64649,7 @@ var ts;
     function createExpressionForAccessorDeclaration(properties, property, receiver, multiLine) {
         var _a = ts.getAllAccessorDeclarations(properties, property), firstAccessor = _a.firstAccessor, getAccessor = _a.getAccessor, setAccessor = _a.setAccessor;
         if (property === firstAccessor) {
-            var properties_8 = [];
+            var properties_5 = [];
             if (getAccessor) {
                 var getterFunction = ts.createFunctionExpression(getAccessor.modifiers, 
                 /*asteriskToken*/ undefined, 
@@ -63755,7 +64660,7 @@ var ts;
                 ts.setTextRange(getterFunction, getAccessor);
                 ts.setOriginalNode(getterFunction, getAccessor);
                 var getter = ts.createPropertyAssignment("get", getterFunction);
-                properties_8.push(getter);
+                properties_5.push(getter);
             }
             if (setAccessor) {
                 var setterFunction = ts.createFunctionExpression(setAccessor.modifiers, 
@@ -63767,15 +64672,15 @@ var ts;
                 ts.setTextRange(setterFunction, setAccessor);
                 ts.setOriginalNode(setterFunction, setAccessor);
                 var setter = ts.createPropertyAssignment("set", setterFunction);
-                properties_8.push(setter);
+                properties_5.push(setter);
             }
-            properties_8.push(ts.createPropertyAssignment("enumerable", ts.createTrue()));
-            properties_8.push(ts.createPropertyAssignment("configurable", ts.createTrue()));
+            properties_5.push(ts.createPropertyAssignment("enumerable", ts.createTrue()));
+            properties_5.push(ts.createPropertyAssignment("configurable", ts.createTrue()));
             var expression = ts.setTextRange(ts.createCall(ts.createPropertyAccess(ts.createIdentifier("Object"), "defineProperty"), 
             /*typeArguments*/ undefined, [
                 receiver,
                 createExpressionForPropertyName(property.name),
-                ts.createObjectLiteral(properties_8, multiLine)
+                ts.createObjectLiteral(properties_5, multiLine)
             ]), 
             /*location*/ firstAccessor);
             return ts.aggregateTransformFlags(expression);
@@ -64062,7 +64967,7 @@ var ts;
     function parenthesizeBinaryOperand(binaryOperator, operand, isLeftSideOfBinary, leftOperand) {
         var skipped = ts.skipPartiallyEmittedExpressions(operand);
         // If the resulting expression is already parenthesized, we do not need to do any further processing.
-        if (skipped.kind === 195 /* ParenthesizedExpression */) {
+        if (skipped.kind === 196 /* ParenthesizedExpression */) {
             return operand;
         }
         return binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand)
@@ -64096,10 +65001,10 @@ var ts;
         //
         // If `a ** d` is on the left of operator `**`, we need to parenthesize to preserve
         // the intended order of operations: `(a ** b) ** c`
-        var binaryOperatorPrecedence = ts.getOperatorPrecedence(204 /* BinaryExpression */, binaryOperator);
-        var binaryOperatorAssociativity = ts.getOperatorAssociativity(204 /* BinaryExpression */, binaryOperator);
+        var binaryOperatorPrecedence = ts.getOperatorPrecedence(205 /* BinaryExpression */, binaryOperator);
+        var binaryOperatorAssociativity = ts.getOperatorAssociativity(205 /* BinaryExpression */, binaryOperator);
         var emittedOperand = ts.skipPartiallyEmittedExpressions(operand);
-        if (!isLeftSideOfBinary && operand.kind === 197 /* ArrowFunction */ && binaryOperatorPrecedence > 4) {
+        if (!isLeftSideOfBinary && operand.kind === 198 /* ArrowFunction */ && binaryOperatorPrecedence > 4) {
             // We need to parenthesize arrow functions on the right side to avoid it being
             // parsed as parenthesized expression: `a && (() => {})`
             return true;
@@ -64111,7 +65016,7 @@ var ts;
                 // and is a yield expression, then we do not need parentheses.
                 if (!isLeftSideOfBinary
                     && binaryOperatorAssociativity === 1 /* Right */
-                    && operand.kind === 207 /* YieldExpression */) {
+                    && operand.kind === 208 /* YieldExpression */) {
                     return false;
                 }
                 return true;
@@ -64199,7 +65104,7 @@ var ts;
         if (ts.isLiteralKind(node.kind)) {
             return node.kind;
         }
-        if (node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 38 /* PlusToken */) {
+        if (node.kind === 205 /* BinaryExpression */ && node.operatorToken.kind === 38 /* PlusToken */) {
             if (node.cachedLiteralKind !== undefined) {
                 return node.cachedLiteralKind;
             }
@@ -64214,7 +65119,7 @@ var ts;
         return 0 /* Unknown */;
     }
     function parenthesizeForConditionalHead(condition) {
-        var conditionalPrecedence = ts.getOperatorPrecedence(205 /* ConditionalExpression */, 56 /* QuestionToken */);
+        var conditionalPrecedence = ts.getOperatorPrecedence(206 /* ConditionalExpression */, 56 /* QuestionToken */);
         var emittedCondition = ts.skipPartiallyEmittedExpressions(condition);
         var conditionPrecedence = ts.getExpressionPrecedence(emittedCondition);
         if (ts.compareValues(conditionPrecedence, conditionalPrecedence) === -1 /* LessThan */) {
@@ -64249,8 +65154,8 @@ var ts;
         var needsParens = isCommaSequence(check);
         if (!needsParens) {
             switch (getLeftmostExpression(check, /*stopAtCallExpression*/ false).kind) {
-                case 209 /* ClassExpression */:
-                case 196 /* FunctionExpression */:
+                case 210 /* ClassExpression */:
+                case 197 /* FunctionExpression */:
                     needsParens = true;
             }
         }
@@ -64266,9 +65171,9 @@ var ts;
     function parenthesizeForNew(expression) {
         var leftmostExpr = getLeftmostExpression(expression, /*stopAtCallExpressions*/ true);
         switch (leftmostExpr.kind) {
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return ts.createParen(expression);
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return !leftmostExpr.arguments
                     ? ts.createParen(expression)
                     : expression;
@@ -64291,7 +65196,7 @@ var ts;
         //
         var emittedExpression = ts.skipPartiallyEmittedExpressions(expression);
         if (ts.isLeftHandSideExpression(emittedExpression)
-            && (emittedExpression.kind !== 192 /* NewExpression */ || emittedExpression.arguments)) {
+            && (emittedExpression.kind !== 193 /* NewExpression */ || emittedExpression.arguments)) {
             return expression;
         }
         return ts.setTextRange(ts.createParen(expression), expression);
@@ -64329,7 +65234,7 @@ var ts;
     function parenthesizeExpressionForList(expression) {
         var emittedExpression = ts.skipPartiallyEmittedExpressions(expression);
         var expressionPrecedence = ts.getExpressionPrecedence(emittedExpression);
-        var commaPrecedence = ts.getOperatorPrecedence(204 /* BinaryExpression */, 27 /* CommaToken */);
+        var commaPrecedence = ts.getOperatorPrecedence(205 /* BinaryExpression */, 27 /* CommaToken */);
         return expressionPrecedence > commaPrecedence
             ? expression
             : ts.setTextRange(ts.createParen(expression), expression);
@@ -64340,29 +65245,29 @@ var ts;
         if (ts.isCallExpression(emittedExpression)) {
             var callee = emittedExpression.expression;
             var kind = ts.skipPartiallyEmittedExpressions(callee).kind;
-            if (kind === 196 /* FunctionExpression */ || kind === 197 /* ArrowFunction */) {
+            if (kind === 197 /* FunctionExpression */ || kind === 198 /* ArrowFunction */) {
                 var mutableCall = ts.getMutableClone(emittedExpression);
                 mutableCall.expression = ts.setTextRange(ts.createParen(callee), callee);
                 return recreateOuterExpressions(expression, mutableCall, 4 /* PartiallyEmittedExpressions */);
             }
         }
         var leftmostExpressionKind = getLeftmostExpression(emittedExpression, /*stopAtCallExpressions*/ false).kind;
-        if (leftmostExpressionKind === 188 /* ObjectLiteralExpression */ || leftmostExpressionKind === 196 /* FunctionExpression */) {
+        if (leftmostExpressionKind === 189 /* ObjectLiteralExpression */ || leftmostExpressionKind === 197 /* FunctionExpression */) {
             return ts.setTextRange(ts.createParen(expression), expression);
         }
         return expression;
     }
     ts.parenthesizeExpressionForExpressionStatement = parenthesizeExpressionForExpressionStatement;
     function parenthesizeConditionalTypeMember(member) {
-        return member.kind === 175 /* ConditionalType */ ? ts.createParenthesizedType(member) : member;
+        return member.kind === 176 /* ConditionalType */ ? ts.createParenthesizedType(member) : member;
     }
     ts.parenthesizeConditionalTypeMember = parenthesizeConditionalTypeMember;
     function parenthesizeElementTypeMember(member) {
         switch (member.kind) {
-            case 173 /* UnionType */:
-            case 174 /* IntersectionType */:
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
+            case 174 /* UnionType */:
+            case 175 /* IntersectionType */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
                 return ts.createParenthesizedType(member);
         }
         return parenthesizeConditionalTypeMember(member);
@@ -64370,9 +65275,9 @@ var ts;
     ts.parenthesizeElementTypeMember = parenthesizeElementTypeMember;
     function parenthesizeArrayTypeMember(member) {
         switch (member.kind) {
-            case 167 /* TypeQuery */:
-            case 179 /* TypeOperator */:
-            case 176 /* InferType */:
+            case 168 /* TypeQuery */:
+            case 180 /* TypeOperator */:
+            case 177 /* InferType */:
                 return ts.createParenthesizedType(member);
         }
         return parenthesizeElementTypeMember(member);
@@ -64398,28 +65303,28 @@ var ts;
     function getLeftmostExpression(node, stopAtCallExpressions) {
         while (true) {
             switch (node.kind) {
-                case 203 /* PostfixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     node = node.operand;
                     continue;
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     node = node.left;
                     continue;
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     node = node.condition;
                     continue;
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     node = node.tag;
                     continue;
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     if (stopAtCallExpressions) {
                         return node;
                     }
                 // falls through
-                case 212 /* AsExpression */:
-                case 190 /* ElementAccessExpression */:
-                case 189 /* PropertyAccessExpression */:
-                case 213 /* NonNullExpression */:
-                case 313 /* PartiallyEmittedExpression */:
+                case 213 /* AsExpression */:
+                case 191 /* ElementAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
+                case 214 /* NonNullExpression */:
+                case 314 /* PartiallyEmittedExpression */:
                     node = node.expression;
                     continue;
             }
@@ -64427,15 +65332,15 @@ var ts;
         }
     }
     function parenthesizeConciseBody(body) {
-        if (!ts.isBlock(body) && (isCommaSequence(body) || getLeftmostExpression(body, /*stopAtCallExpressions*/ false).kind === 188 /* ObjectLiteralExpression */)) {
+        if (!ts.isBlock(body) && (isCommaSequence(body) || getLeftmostExpression(body, /*stopAtCallExpressions*/ false).kind === 189 /* ObjectLiteralExpression */)) {
             return ts.setTextRange(ts.createParen(body), body);
         }
         return body;
     }
     ts.parenthesizeConciseBody = parenthesizeConciseBody;
     function isCommaSequence(node) {
-        return node.kind === 204 /* BinaryExpression */ && node.operatorToken.kind === 27 /* CommaToken */ ||
-            node.kind === 314 /* CommaListExpression */;
+        return node.kind === 205 /* BinaryExpression */ && node.operatorToken.kind === 27 /* CommaToken */ ||
+            node.kind === 315 /* CommaListExpression */;
     }
     ts.isCommaSequence = isCommaSequence;
     var OuterExpressionKinds;
@@ -64448,13 +65353,13 @@ var ts;
     function isOuterExpression(node, kinds) {
         if (kinds === void 0) { kinds = 7 /* All */; }
         switch (node.kind) {
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return (kinds & 1 /* Parentheses */) !== 0;
-            case 194 /* TypeAssertionExpression */:
-            case 212 /* AsExpression */:
-            case 213 /* NonNullExpression */:
+            case 195 /* TypeAssertionExpression */:
+            case 213 /* AsExpression */:
+            case 214 /* NonNullExpression */:
                 return (kinds & 2 /* Assertions */) !== 0;
-            case 313 /* PartiallyEmittedExpression */:
+            case 314 /* PartiallyEmittedExpression */:
                 return (kinds & 4 /* PartiallyEmittedExpressions */) !== 0;
         }
         return false;
@@ -64479,7 +65384,7 @@ var ts;
     }
     ts.skipOuterExpressions = skipOuterExpressions;
     function skipAssertions(node) {
-        while (ts.isAssertionExpression(node) || node.kind === 213 /* NonNullExpression */) {
+        while (ts.isAssertionExpression(node) || node.kind === 214 /* NonNullExpression */) {
             node = node.expression;
         }
         return node;
@@ -64487,11 +65392,11 @@ var ts;
     ts.skipAssertions = skipAssertions;
     function updateOuterExpression(outerExpression, expression) {
         switch (outerExpression.kind) {
-            case 195 /* ParenthesizedExpression */: return ts.updateParen(outerExpression, expression);
-            case 194 /* TypeAssertionExpression */: return ts.updateTypeAssertion(outerExpression, outerExpression.type, expression);
-            case 212 /* AsExpression */: return ts.updateAsExpression(outerExpression, expression, outerExpression.type);
-            case 213 /* NonNullExpression */: return ts.updateNonNullExpression(outerExpression, expression);
-            case 313 /* PartiallyEmittedExpression */: return ts.updatePartiallyEmittedExpression(outerExpression, expression);
+            case 196 /* ParenthesizedExpression */: return ts.updateParen(outerExpression, expression);
+            case 195 /* TypeAssertionExpression */: return ts.updateTypeAssertion(outerExpression, outerExpression.type, expression);
+            case 213 /* AsExpression */: return ts.updateAsExpression(outerExpression, expression, outerExpression.type);
+            case 214 /* NonNullExpression */: return ts.updateNonNullExpression(outerExpression, expression);
+            case 314 /* PartiallyEmittedExpression */: return ts.updatePartiallyEmittedExpression(outerExpression, expression);
         }
     }
     /**
@@ -64509,7 +65414,7 @@ var ts;
      * the containing expression is created/updated.
      */
     function isIgnorableParen(node) {
-        return node.kind === 195 /* ParenthesizedExpression */
+        return node.kind === 196 /* ParenthesizedExpression */
             && ts.nodeIsSynthesized(node)
             && ts.nodeIsSynthesized(ts.getSourceMapRange(node))
             && ts.nodeIsSynthesized(ts.getCommentRange(node))
@@ -64574,10 +65479,10 @@ var ts;
             var name = namespaceDeclaration.name;
             return ts.isGeneratedIdentifier(name) ? name : ts.createIdentifier(ts.getSourceTextOfNodeFromSourceFile(sourceFile, name) || ts.idText(name));
         }
-        if (node.kind === 249 /* ImportDeclaration */ && node.importClause) {
+        if (node.kind === 250 /* ImportDeclaration */ && node.importClause) {
             return ts.getGeneratedNameForNode(node);
         }
-        if (node.kind === 255 /* ExportDeclaration */ && node.moduleSpecifier) {
+        if (node.kind === 256 /* ExportDeclaration */ && node.moduleSpecifier) {
             return ts.getGeneratedNameForNode(node);
         }
         return undefined;
@@ -64696,7 +65601,7 @@ var ts;
         }
         if (ts.isObjectLiteralElementLike(bindingElement)) {
             switch (bindingElement.kind) {
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     // `b` in `({ a: b } = ...)`
                     // `b` in `({ a: b = 1 } = ...)`
                     // `{b}` in `({ a: {b} } = ...)`
@@ -64708,11 +65613,11 @@ var ts;
                     // `b[0]` in `({ a: b[0] } = ...)`
                     // `b[0]` in `({ a: b[0] = 1 } = ...)`
                     return getTargetOfBindingOrAssignmentElement(bindingElement.initializer);
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     // `a` in `({ a } = ...)`
                     // `a` in `({ a = 1 } = ...)`
                     return bindingElement.name;
-                case 277 /* SpreadAssignment */:
+                case 278 /* SpreadAssignment */:
                     // `a` in `({ ...a } = ...)`
                     return getTargetOfBindingOrAssignmentElement(bindingElement.expression);
             }
@@ -64744,12 +65649,12 @@ var ts;
      */
     function getRestIndicatorOfBindingOrAssignmentElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 151 /* Parameter */:
-            case 186 /* BindingElement */:
+            case 152 /* Parameter */:
+            case 187 /* BindingElement */:
                 // `...` in `let [...a] = ...`
                 return bindingElement.dotDotDotToken;
-            case 208 /* SpreadElement */:
-            case 277 /* SpreadAssignment */:
+            case 209 /* SpreadElement */:
+            case 278 /* SpreadAssignment */:
                 // `...` in `[...a] = ...`
                 return bindingElement;
         }
@@ -64761,7 +65666,7 @@ var ts;
      */
     function getPropertyNameOfBindingOrAssignmentElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 // `a` in `let { a: b } = ...`
                 // `[a]` in `let { [a]: b } = ...`
                 // `"a"` in `let { "a": b } = ...`
@@ -64773,7 +65678,7 @@ var ts;
                         : propertyName;
                 }
                 break;
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 // `a` in `({ a: b } = ...)`
                 // `[a]` in `({ [a]: b } = ...)`
                 // `"a"` in `({ "a": b } = ...)`
@@ -64785,7 +65690,7 @@ var ts;
                         : propertyName;
                 }
                 break;
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 // `a` in `({ ...a } = ...)`
                 return bindingElement.name;
         }
@@ -64808,13 +65713,13 @@ var ts;
      */
     function getElementsOfBindingOrAssignmentPattern(name) {
         switch (name.kind) {
-            case 184 /* ObjectBindingPattern */:
-            case 185 /* ArrayBindingPattern */:
-            case 187 /* ArrayLiteralExpression */:
+            case 185 /* ObjectBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
+            case 188 /* ArrayLiteralExpression */:
                 // `a` in `{a}`
                 // `a` in `[a]`
                 return name.elements;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 // `a` in `{a}`
                 return name.properties;
         }
@@ -64854,11 +65759,11 @@ var ts;
     ts.convertToObjectAssignmentElement = convertToObjectAssignmentElement;
     function convertToAssignmentPattern(node) {
         switch (node.kind) {
-            case 185 /* ArrayBindingPattern */:
-            case 187 /* ArrayLiteralExpression */:
+            case 186 /* ArrayBindingPattern */:
+            case 188 /* ArrayLiteralExpression */:
                 return convertToArrayAssignmentPattern(node);
-            case 184 /* ObjectBindingPattern */:
-            case 188 /* ObjectLiteralExpression */:
+            case 185 /* ObjectBindingPattern */:
+            case 189 /* ObjectLiteralExpression */:
                 return convertToObjectAssignmentPattern(node);
         }
     }
@@ -65019,276 +65924,278 @@ var ts;
         }
         var kind = node.kind;
         // No need to visit nodes with no children.
-        if ((kind > 0 /* FirstToken */ && kind <= 147 /* LastToken */) || kind === 178 /* ThisType */) {
+        if ((kind > 0 /* FirstToken */ && kind <= 148 /* LastToken */) || kind === 179 /* ThisType */) {
             return node;
         }
         switch (kind) {
             // Names
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return ts.updateIdentifier(node, nodesVisitor(node.typeArguments, visitor, isTypeNodeOrTypeParameterDeclaration));
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 return ts.updateQualifiedName(node, visitNode(node.left, visitor, ts.isEntityName), visitNode(node.right, visitor, ts.isIdentifier));
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 return ts.updateComputedPropertyName(node, visitNode(node.expression, visitor, ts.isExpression));
             // Signature elements
-            case 150 /* TypeParameter */:
+            case 151 /* TypeParameter */:
                 return ts.updateTypeParameterDeclaration(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.constraint, visitor, ts.isTypeNode), visitNode(node.default, visitor, ts.isTypeNode));
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 return ts.updateParameter(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.dotDotDotToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
-            case 152 /* Decorator */:
+            case 153 /* Decorator */:
                 return ts.updateDecorator(node, visitNode(node.expression, visitor, ts.isExpression));
             // Type elements
-            case 153 /* PropertySignature */:
+            case 154 /* PropertySignature */:
                 return ts.updatePropertySignature(node, nodesVisitor(node.modifiers, visitor, ts.isToken), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
-            case 154 /* PropertyDeclaration */:
-                return ts.updateProperty(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
-            case 155 /* MethodSignature */:
+            case 155 /* PropertyDeclaration */:
+                return ts.updateProperty(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), 
+                // QuestionToken and ExclamationToken is uniqued in Property Declaration and the signature of 'updateProperty' is that too
+                visitNode(node.questionToken || node.exclamationToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
+            case 156 /* MethodSignature */:
                 return ts.updateMethodSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken));
-            case 156 /* MethodDeclaration */:
+            case 157 /* MethodDeclaration */:
                 return ts.updateMethod(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.questionToken, tokenVisitor, ts.isToken), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
-            case 157 /* Constructor */:
+            case 158 /* Constructor */:
                 return ts.updateConstructor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitFunctionBody(node.body, visitor, context));
-            case 158 /* GetAccessor */:
+            case 159 /* GetAccessor */:
                 return ts.updateGetAccessor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
-            case 159 /* SetAccessor */:
+            case 160 /* SetAccessor */:
                 return ts.updateSetAccessor(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isPropertyName), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitFunctionBody(node.body, visitor, context));
-            case 160 /* CallSignature */:
+            case 161 /* CallSignature */:
                 return ts.updateCallSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 161 /* ConstructSignature */:
+            case 162 /* ConstructSignature */:
                 return ts.updateConstructSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 162 /* IndexSignature */:
+            case 163 /* IndexSignature */:
                 return ts.updateIndexSignature(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
             // Types
-            case 163 /* TypePredicate */:
+            case 164 /* TypePredicate */:
                 return ts.updateTypePredicateNode(node, visitNode(node.parameterName, visitor), visitNode(node.type, visitor, ts.isTypeNode));
-            case 164 /* TypeReference */:
+            case 165 /* TypeReference */:
                 return ts.updateTypeReferenceNode(node, visitNode(node.typeName, visitor, ts.isEntityName), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode));
-            case 165 /* FunctionType */:
+            case 166 /* FunctionType */:
                 return ts.updateFunctionTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 166 /* ConstructorType */:
+            case 167 /* ConstructorType */:
                 return ts.updateConstructorTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 167 /* TypeQuery */:
+            case 168 /* TypeQuery */:
                 return ts.updateTypeQueryNode(node, visitNode(node.exprName, visitor, ts.isEntityName));
-            case 168 /* TypeLiteral */:
+            case 169 /* TypeLiteral */:
                 return ts.updateTypeLiteralNode(node, nodesVisitor(node.members, visitor, ts.isTypeElement));
-            case 169 /* ArrayType */:
+            case 170 /* ArrayType */:
                 return ts.updateArrayTypeNode(node, visitNode(node.elementType, visitor, ts.isTypeNode));
-            case 170 /* TupleType */:
+            case 171 /* TupleType */:
                 return ts.updateTupleTypeNode(node, nodesVisitor(node.elementTypes, visitor, ts.isTypeNode));
-            case 171 /* OptionalType */:
+            case 172 /* OptionalType */:
                 return ts.updateOptionalTypeNode(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 172 /* RestType */:
+            case 173 /* RestType */:
                 return ts.updateRestTypeNode(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 173 /* UnionType */:
+            case 174 /* UnionType */:
                 return ts.updateUnionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode));
-            case 174 /* IntersectionType */:
+            case 175 /* IntersectionType */:
                 return ts.updateIntersectionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode));
-            case 175 /* ConditionalType */:
+            case 176 /* ConditionalType */:
                 return ts.updateConditionalTypeNode(node, visitNode(node.checkType, visitor, ts.isTypeNode), visitNode(node.extendsType, visitor, ts.isTypeNode), visitNode(node.trueType, visitor, ts.isTypeNode), visitNode(node.falseType, visitor, ts.isTypeNode));
-            case 176 /* InferType */:
+            case 177 /* InferType */:
                 return ts.updateInferTypeNode(node, visitNode(node.typeParameter, visitor, ts.isTypeParameterDeclaration));
-            case 183 /* ImportType */:
+            case 184 /* ImportType */:
                 return ts.updateImportTypeNode(node, visitNode(node.argument, visitor, ts.isTypeNode), visitNode(node.qualifier, visitor, ts.isEntityName), visitNodes(node.typeArguments, visitor, ts.isTypeNode), node.isTypeOf);
-            case 177 /* ParenthesizedType */:
+            case 178 /* ParenthesizedType */:
                 return ts.updateParenthesizedType(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 179 /* TypeOperator */:
+            case 180 /* TypeOperator */:
                 return ts.updateTypeOperatorNode(node, visitNode(node.type, visitor, ts.isTypeNode));
-            case 180 /* IndexedAccessType */:
+            case 181 /* IndexedAccessType */:
                 return ts.updateIndexedAccessTypeNode(node, visitNode(node.objectType, visitor, ts.isTypeNode), visitNode(node.indexType, visitor, ts.isTypeNode));
-            case 181 /* MappedType */:
+            case 182 /* MappedType */:
                 return ts.updateMappedTypeNode(node, visitNode(node.readonlyToken, tokenVisitor, ts.isToken), visitNode(node.typeParameter, visitor, ts.isTypeParameterDeclaration), visitNode(node.questionToken, tokenVisitor, ts.isToken), visitNode(node.type, visitor, ts.isTypeNode));
-            case 182 /* LiteralType */:
+            case 183 /* LiteralType */:
                 return ts.updateLiteralTypeNode(node, visitNode(node.literal, visitor, ts.isExpression));
             // Binding patterns
-            case 184 /* ObjectBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
                 return ts.updateObjectBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isBindingElement));
-            case 185 /* ArrayBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 return ts.updateArrayBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isArrayBindingElement));
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 return ts.updateBindingElement(node, visitNode(node.dotDotDotToken, tokenVisitor, ts.isToken), visitNode(node.propertyName, visitor, ts.isPropertyName), visitNode(node.name, visitor, ts.isBindingName), visitNode(node.initializer, visitor, ts.isExpression));
             // Expression
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 return ts.updateArrayLiteral(node, nodesVisitor(node.elements, visitor, ts.isExpression));
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 return ts.updateObjectLiteral(node, nodesVisitor(node.properties, visitor, ts.isObjectLiteralElementLike));
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 return ts.updatePropertyAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.name, visitor, ts.isIdentifier));
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return ts.updateElementAccess(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.argumentExpression, visitor, ts.isExpression));
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 return ts.updateCall(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression));
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return ts.updateNew(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression));
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return ts.updateTaggedTemplate(node, visitNode(node.tag, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isExpression), visitNode(node.template, visitor, ts.isTemplateLiteral));
-            case 194 /* TypeAssertionExpression */:
+            case 195 /* TypeAssertionExpression */:
                 return ts.updateTypeAssertion(node, visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
-            case 195 /* ParenthesizedExpression */:
+            case 196 /* ParenthesizedExpression */:
                 return ts.updateParen(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 196 /* FunctionExpression */:
+            case 197 /* FunctionExpression */:
                 return ts.updateFunctionExpression(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 return ts.updateArrowFunction(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.equalsGreaterThanToken, visitor, ts.isToken), visitFunctionBody(node.body, visitor, context));
-            case 198 /* DeleteExpression */:
+            case 199 /* DeleteExpression */:
                 return ts.updateDelete(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 199 /* TypeOfExpression */:
+            case 200 /* TypeOfExpression */:
                 return ts.updateTypeOf(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 200 /* VoidExpression */:
+            case 201 /* VoidExpression */:
                 return ts.updateVoid(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 201 /* AwaitExpression */:
+            case 202 /* AwaitExpression */:
                 return ts.updateAwait(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 return ts.updatePrefix(node, visitNode(node.operand, visitor, ts.isExpression));
-            case 203 /* PostfixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 return ts.updatePostfix(node, visitNode(node.operand, visitor, ts.isExpression));
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 return ts.updateBinary(node, visitNode(node.left, visitor, ts.isExpression), visitNode(node.right, visitor, ts.isExpression), visitNode(node.operatorToken, visitor, ts.isToken));
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 return ts.updateConditional(node, visitNode(node.condition, visitor, ts.isExpression), visitNode(node.questionToken, visitor, ts.isToken), visitNode(node.whenTrue, visitor, ts.isExpression), visitNode(node.colonToken, visitor, ts.isToken), visitNode(node.whenFalse, visitor, ts.isExpression));
-            case 206 /* TemplateExpression */:
+            case 207 /* TemplateExpression */:
                 return ts.updateTemplateExpression(node, visitNode(node.head, visitor, ts.isTemplateHead), nodesVisitor(node.templateSpans, visitor, ts.isTemplateSpan));
-            case 207 /* YieldExpression */:
+            case 208 /* YieldExpression */:
                 return ts.updateYield(node, visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.expression, visitor, ts.isExpression));
-            case 208 /* SpreadElement */:
+            case 209 /* SpreadElement */:
                 return ts.updateSpread(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 209 /* ClassExpression */:
+            case 210 /* ClassExpression */:
                 return ts.updateClassExpression(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isClassElement));
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return ts.updateExpressionWithTypeArguments(node, nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.expression, visitor, ts.isExpression));
-            case 212 /* AsExpression */:
+            case 213 /* AsExpression */:
                 return ts.updateAsExpression(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.type, visitor, ts.isTypeNode));
-            case 213 /* NonNullExpression */:
+            case 214 /* NonNullExpression */:
                 return ts.updateNonNullExpression(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 214 /* MetaProperty */:
+            case 215 /* MetaProperty */:
                 return ts.updateMetaProperty(node, visitNode(node.name, visitor, ts.isIdentifier));
             // Misc
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 return ts.updateTemplateSpan(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.literal, visitor, ts.isTemplateMiddleOrTemplateTail));
             // Element
-            case 218 /* Block */:
+            case 219 /* Block */:
                 return ts.updateBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 return ts.updateVariableStatement(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.declarationList, visitor, ts.isVariableDeclarationList));
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 return ts.updateExpressionStatement(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 222 /* IfStatement */:
+            case 223 /* IfStatement */:
                 return ts.updateIf(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.thenStatement, visitor, ts.isStatement, ts.liftToBlock), visitNode(node.elseStatement, visitor, ts.isStatement, ts.liftToBlock));
-            case 223 /* DoStatement */:
+            case 224 /* DoStatement */:
                 return ts.updateDo(node, visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock), visitNode(node.expression, visitor, ts.isExpression));
-            case 224 /* WhileStatement */:
+            case 225 /* WhileStatement */:
                 return ts.updateWhile(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 225 /* ForStatement */:
+            case 226 /* ForStatement */:
                 return ts.updateFor(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.condition, visitor, ts.isExpression), visitNode(node.incrementor, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 226 /* ForInStatement */:
+            case 227 /* ForInStatement */:
                 return ts.updateForIn(node, visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 227 /* ForOfStatement */:
+            case 228 /* ForOfStatement */:
                 return ts.updateForOf(node, visitNode(node.awaitModifier, visitor, ts.isToken), visitNode(node.initializer, visitor, ts.isForInitializer), visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 228 /* ContinueStatement */:
+            case 229 /* ContinueStatement */:
                 return ts.updateContinue(node, visitNode(node.label, visitor, ts.isIdentifier));
-            case 229 /* BreakStatement */:
+            case 230 /* BreakStatement */:
                 return ts.updateBreak(node, visitNode(node.label, visitor, ts.isIdentifier));
-            case 230 /* ReturnStatement */:
+            case 231 /* ReturnStatement */:
                 return ts.updateReturn(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 231 /* WithStatement */:
+            case 232 /* WithStatement */:
                 return ts.updateWith(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 232 /* SwitchStatement */:
+            case 233 /* SwitchStatement */:
                 return ts.updateSwitch(node, visitNode(node.expression, visitor, ts.isExpression), visitNode(node.caseBlock, visitor, ts.isCaseBlock));
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 return ts.updateLabel(node, visitNode(node.label, visitor, ts.isIdentifier), visitNode(node.statement, visitor, ts.isStatement, ts.liftToBlock));
-            case 234 /* ThrowStatement */:
+            case 235 /* ThrowStatement */:
                 return ts.updateThrow(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 235 /* TryStatement */:
+            case 236 /* TryStatement */:
                 return ts.updateTry(node, visitNode(node.tryBlock, visitor, ts.isBlock), visitNode(node.catchClause, visitor, ts.isCatchClause), visitNode(node.finallyBlock, visitor, ts.isBlock));
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 return ts.updateVariableDeclaration(node, visitNode(node.name, visitor, ts.isBindingName), visitNode(node.type, visitor, ts.isTypeNode), visitNode(node.initializer, visitor, ts.isExpression));
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 return ts.updateVariableDeclarationList(node, nodesVisitor(node.declarations, visitor, ts.isVariableDeclaration));
-            case 239 /* FunctionDeclaration */:
+            case 240 /* FunctionDeclaration */:
                 return ts.updateFunctionDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.asteriskToken, tokenVisitor, ts.isToken), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitParameterList(node.parameters, visitor, context, nodesVisitor), visitNode(node.type, visitor, ts.isTypeNode), visitFunctionBody(node.body, visitor, context));
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 return ts.updateClassDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isClassElement));
-            case 241 /* InterfaceDeclaration */:
+            case 242 /* InterfaceDeclaration */:
                 return ts.updateInterfaceDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.heritageClauses, visitor, ts.isHeritageClause), nodesVisitor(node.members, visitor, ts.isTypeElement));
-            case 242 /* TypeAliasDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
                 return ts.updateTypeAliasDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), visitNode(node.type, visitor, ts.isTypeNode));
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 return ts.updateEnumDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), nodesVisitor(node.members, visitor, ts.isEnumMember));
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return ts.updateModuleDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.body, visitor, ts.isModuleBody));
-            case 245 /* ModuleBlock */:
+            case 246 /* ModuleBlock */:
                 return ts.updateModuleBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 246 /* CaseBlock */:
+            case 247 /* CaseBlock */:
                 return ts.updateCaseBlock(node, nodesVisitor(node.clauses, visitor, ts.isCaseOrDefaultClause));
-            case 247 /* NamespaceExportDeclaration */:
+            case 248 /* NamespaceExportDeclaration */:
                 return ts.updateNamespaceExportDeclaration(node, visitNode(node.name, visitor, ts.isIdentifier));
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return ts.updateImportEqualsDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.moduleReference, visitor, ts.isModuleReference));
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 return ts.updateImportDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.importClause, visitor, ts.isImportClause), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
-            case 250 /* ImportClause */:
+            case 251 /* ImportClause */:
                 return ts.updateImportClause(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.namedBindings, visitor, ts.isNamedImportBindings));
-            case 251 /* NamespaceImport */:
+            case 252 /* NamespaceImport */:
                 return ts.updateNamespaceImport(node, visitNode(node.name, visitor, ts.isIdentifier));
-            case 252 /* NamedImports */:
+            case 253 /* NamedImports */:
                 return ts.updateNamedImports(node, nodesVisitor(node.elements, visitor, ts.isImportSpecifier));
-            case 253 /* ImportSpecifier */:
+            case 254 /* ImportSpecifier */:
                 return ts.updateImportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier), visitNode(node.name, visitor, ts.isIdentifier));
-            case 254 /* ExportAssignment */:
+            case 255 /* ExportAssignment */:
                 return ts.updateExportAssignment(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.expression, visitor, ts.isExpression));
-            case 255 /* ExportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 return ts.updateExportDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), visitNode(node.exportClause, visitor, ts.isNamedExports), visitNode(node.moduleSpecifier, visitor, ts.isExpression));
-            case 256 /* NamedExports */:
+            case 257 /* NamedExports */:
                 return ts.updateNamedExports(node, nodesVisitor(node.elements, visitor, ts.isExportSpecifier));
-            case 257 /* ExportSpecifier */:
+            case 258 /* ExportSpecifier */:
                 return ts.updateExportSpecifier(node, visitNode(node.propertyName, visitor, ts.isIdentifier), visitNode(node.name, visitor, ts.isIdentifier));
             // Module references
-            case 259 /* ExternalModuleReference */:
+            case 260 /* ExternalModuleReference */:
                 return ts.updateExternalModuleReference(node, visitNode(node.expression, visitor, ts.isExpression));
             // JSX
-            case 260 /* JsxElement */:
+            case 261 /* JsxElement */:
                 return ts.updateJsxElement(node, visitNode(node.openingElement, visitor, ts.isJsxOpeningElement), nodesVisitor(node.children, visitor, ts.isJsxChild), visitNode(node.closingElement, visitor, ts.isJsxClosingElement));
-            case 261 /* JsxSelfClosingElement */:
+            case 262 /* JsxSelfClosingElement */:
                 return ts.updateJsxSelfClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.attributes, visitor, ts.isJsxAttributes));
-            case 262 /* JsxOpeningElement */:
+            case 263 /* JsxOpeningElement */:
                 return ts.updateJsxOpeningElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), visitNode(node.attributes, visitor, ts.isJsxAttributes));
-            case 263 /* JsxClosingElement */:
+            case 264 /* JsxClosingElement */:
                 return ts.updateJsxClosingElement(node, visitNode(node.tagName, visitor, ts.isJsxTagNameExpression));
-            case 264 /* JsxFragment */:
+            case 265 /* JsxFragment */:
                 return ts.updateJsxFragment(node, visitNode(node.openingFragment, visitor, ts.isJsxOpeningFragment), nodesVisitor(node.children, visitor, ts.isJsxChild), visitNode(node.closingFragment, visitor, ts.isJsxClosingFragment));
-            case 267 /* JsxAttribute */:
+            case 268 /* JsxAttribute */:
                 return ts.updateJsxAttribute(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.initializer, visitor, ts.isStringLiteralOrJsxExpression));
-            case 268 /* JsxAttributes */:
+            case 269 /* JsxAttributes */:
                 return ts.updateJsxAttributes(node, nodesVisitor(node.properties, visitor, ts.isJsxAttributeLike));
-            case 269 /* JsxSpreadAttribute */:
+            case 270 /* JsxSpreadAttribute */:
                 return ts.updateJsxSpreadAttribute(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 270 /* JsxExpression */:
+            case 271 /* JsxExpression */:
                 return ts.updateJsxExpression(node, visitNode(node.expression, visitor, ts.isExpression));
             // Clauses
-            case 271 /* CaseClause */:
+            case 272 /* CaseClause */:
                 return ts.updateCaseClause(node, visitNode(node.expression, visitor, ts.isExpression), nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 272 /* DefaultClause */:
+            case 273 /* DefaultClause */:
                 return ts.updateDefaultClause(node, nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 273 /* HeritageClause */:
+            case 274 /* HeritageClause */:
                 return ts.updateHeritageClause(node, nodesVisitor(node.types, visitor, ts.isExpressionWithTypeArguments));
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return ts.updateCatchClause(node, visitNode(node.variableDeclaration, visitor, ts.isVariableDeclaration), visitNode(node.block, visitor, ts.isBlock));
             // Property assignments
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 return ts.updatePropertyAssignment(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 return ts.updateShorthandPropertyAssignment(node, visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.objectAssignmentInitializer, visitor, ts.isExpression));
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 return ts.updateSpreadAssignment(node, visitNode(node.expression, visitor, ts.isExpression));
             // Enum
-            case 278 /* EnumMember */:
+            case 279 /* EnumMember */:
                 return ts.updateEnumMember(node, visitNode(node.name, visitor, ts.isPropertyName), visitNode(node.initializer, visitor, ts.isExpression));
             // Top-level nodes
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return ts.updateSourceFileNode(node, visitLexicalEnvironment(node.statements, visitor, context));
             // Transformation nodes
-            case 313 /* PartiallyEmittedExpression */:
+            case 314 /* PartiallyEmittedExpression */:
                 return ts.updatePartiallyEmittedExpression(node, visitNode(node.expression, visitor, ts.isExpression));
-            case 314 /* CommaListExpression */:
+            case 315 /* CommaListExpression */:
                 return ts.updateCommaList(node, nodesVisitor(node.elements, visitor, ts.isExpression));
             default:
                 // No need to visit nodes with no children.
@@ -65330,58 +66237,58 @@ var ts;
         var cbNodes = cbNodeArray || cbNode;
         var kind = node.kind;
         // No need to visit nodes with no children.
-        if ((kind > 0 /* FirstToken */ && kind <= 147 /* LastToken */)) {
+        if ((kind > 0 /* FirstToken */ && kind <= 148 /* LastToken */)) {
             return initial;
         }
         // We do not yet support types.
-        if ((kind >= 163 /* TypePredicate */ && kind <= 182 /* LiteralType */)) {
+        if ((kind >= 164 /* TypePredicate */ && kind <= 183 /* LiteralType */)) {
             return initial;
         }
         var result = initial;
         switch (node.kind) {
             // Leaf nodes
-            case 217 /* SemicolonClassElement */:
-            case 220 /* EmptyStatement */:
-            case 210 /* OmittedExpression */:
-            case 236 /* DebuggerStatement */:
-            case 312 /* NotEmittedStatement */:
+            case 218 /* SemicolonClassElement */:
+            case 221 /* EmptyStatement */:
+            case 211 /* OmittedExpression */:
+            case 237 /* DebuggerStatement */:
+            case 313 /* NotEmittedStatement */:
                 // No need to visit nodes with no children.
                 break;
             // Names
-            case 148 /* QualifiedName */:
+            case 149 /* QualifiedName */:
                 result = reduceNode(node.left, cbNode, result);
                 result = reduceNode(node.right, cbNode, result);
                 break;
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // Signature elements
-            case 151 /* Parameter */:
+            case 152 /* Parameter */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 152 /* Decorator */:
+            case 153 /* Decorator */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // Type member
-            case 153 /* PropertySignature */:
+            case 154 /* PropertySignature */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.questionToken, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 154 /* PropertyDeclaration */:
+            case 155 /* PropertyDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 156 /* MethodDeclaration */:
+            case 157 /* MethodDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65390,12 +66297,12 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 157 /* Constructor */:
+            case 158 /* Constructor */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNodes(node.parameters, cbNodes, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 158 /* GetAccessor */:
+            case 159 /* GetAccessor */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65403,7 +66310,7 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 159 /* SetAccessor */:
+            case 160 /* SetAccessor */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65411,50 +66318,50 @@ var ts;
                 result = reduceNode(node.body, cbNode, result);
                 break;
             // Binding patterns
-            case 184 /* ObjectBindingPattern */:
-            case 185 /* ArrayBindingPattern */:
+            case 185 /* ObjectBindingPattern */:
+            case 186 /* ArrayBindingPattern */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 result = reduceNode(node.propertyName, cbNode, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
             // Expression
-            case 187 /* ArrayLiteralExpression */:
+            case 188 /* ArrayLiteralExpression */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
-            case 188 /* ObjectLiteralExpression */:
+            case 189 /* ObjectLiteralExpression */:
                 result = reduceNodes(node.properties, cbNodes, result);
                 break;
-            case 189 /* PropertyAccessExpression */:
+            case 190 /* PropertyAccessExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.name, cbNode, result);
                 break;
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.argumentExpression, cbNode, result);
                 break;
-            case 191 /* CallExpression */:
+            case 192 /* CallExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 result = reduceNodes(node.arguments, cbNodes, result);
                 break;
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 result = reduceNodes(node.arguments, cbNodes, result);
                 break;
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 result = reduceNode(node.tag, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 result = reduceNode(node.template, cbNode, result);
                 break;
-            case 194 /* TypeAssertionExpression */:
+            case 195 /* TypeAssertionExpression */:
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 196 /* FunctionExpression */:
+            case 197 /* FunctionExpression */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNodes(node.typeParameters, cbNodes, result);
@@ -65462,123 +66369,123 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 197 /* ArrowFunction */:
+            case 198 /* ArrowFunction */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNodes(node.typeParameters, cbNodes, result);
                 result = reduceNodes(node.parameters, cbNodes, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 195 /* ParenthesizedExpression */:
-            case 198 /* DeleteExpression */:
-            case 199 /* TypeOfExpression */:
-            case 200 /* VoidExpression */:
-            case 201 /* AwaitExpression */:
-            case 207 /* YieldExpression */:
-            case 208 /* SpreadElement */:
-            case 213 /* NonNullExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 199 /* DeleteExpression */:
+            case 200 /* TypeOfExpression */:
+            case 201 /* VoidExpression */:
+            case 202 /* AwaitExpression */:
+            case 208 /* YieldExpression */:
+            case 209 /* SpreadElement */:
+            case 214 /* NonNullExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 202 /* PrefixUnaryExpression */:
-            case 203 /* PostfixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
+            case 204 /* PostfixUnaryExpression */:
                 result = reduceNode(node.operand, cbNode, result);
                 break;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 result = reduceNode(node.left, cbNode, result);
                 result = reduceNode(node.right, cbNode, result);
                 break;
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 result = reduceNode(node.condition, cbNode, result);
                 result = reduceNode(node.whenTrue, cbNode, result);
                 result = reduceNode(node.whenFalse, cbNode, result);
                 break;
-            case 206 /* TemplateExpression */:
+            case 207 /* TemplateExpression */:
                 result = reduceNode(node.head, cbNode, result);
                 result = reduceNodes(node.templateSpans, cbNodes, result);
                 break;
-            case 209 /* ClassExpression */:
+            case 210 /* ClassExpression */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNodes(node.typeParameters, cbNodes, result);
                 result = reduceNodes(node.heritageClauses, cbNodes, result);
                 result = reduceNodes(node.members, cbNodes, result);
                 break;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNodes, result);
                 break;
-            case 212 /* AsExpression */:
+            case 213 /* AsExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 break;
             // Misc
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.literal, cbNode, result);
                 break;
             // Element
-            case 218 /* Block */:
+            case 219 /* Block */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
-            case 219 /* VariableStatement */:
+            case 220 /* VariableStatement */:
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.declarationList, cbNode, result);
                 break;
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 222 /* IfStatement */:
+            case 223 /* IfStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.thenStatement, cbNode, result);
                 result = reduceNode(node.elseStatement, cbNode, result);
                 break;
-            case 223 /* DoStatement */:
+            case 224 /* DoStatement */:
                 result = reduceNode(node.statement, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 224 /* WhileStatement */:
-            case 231 /* WithStatement */:
+            case 225 /* WhileStatement */:
+            case 232 /* WithStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 225 /* ForStatement */:
+            case 226 /* ForStatement */:
                 result = reduceNode(node.initializer, cbNode, result);
                 result = reduceNode(node.condition, cbNode, result);
                 result = reduceNode(node.incrementor, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
                 result = reduceNode(node.initializer, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 230 /* ReturnStatement */:
-            case 234 /* ThrowStatement */:
+            case 231 /* ReturnStatement */:
+            case 235 /* ThrowStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 232 /* SwitchStatement */:
+            case 233 /* SwitchStatement */:
                 result = reduceNode(node.expression, cbNode, result);
                 result = reduceNode(node.caseBlock, cbNode, result);
                 break;
-            case 233 /* LabeledStatement */:
+            case 234 /* LabeledStatement */:
                 result = reduceNode(node.label, cbNode, result);
                 result = reduceNode(node.statement, cbNode, result);
                 break;
-            case 235 /* TryStatement */:
+            case 236 /* TryStatement */:
                 result = reduceNode(node.tryBlock, cbNode, result);
                 result = reduceNode(node.catchClause, cbNode, result);
                 result = reduceNode(node.finallyBlock, cbNode, result);
                 break;
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 238 /* VariableDeclarationList */:
+            case 239 /* VariableDeclarationList */:
                 result = reduceNodes(node.declarations, cbNodes, result);
                 break;
-            case 239 /* FunctionDeclaration */:
+            case 240 /* FunctionDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65587,7 +66494,7 @@ var ts;
                 result = reduceNode(node.type, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 240 /* ClassDeclaration */:
+            case 241 /* ClassDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
@@ -65595,140 +66502,140 @@ var ts;
                 result = reduceNodes(node.heritageClauses, cbNodes, result);
                 result = reduceNodes(node.members, cbNodes, result);
                 break;
-            case 243 /* EnumDeclaration */:
+            case 244 /* EnumDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNodes(node.members, cbNodes, result);
                 break;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.body, cbNode, result);
                 break;
-            case 245 /* ModuleBlock */:
+            case 246 /* ModuleBlock */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
-            case 246 /* CaseBlock */:
+            case 247 /* CaseBlock */:
                 result = reduceNodes(node.clauses, cbNodes, result);
                 break;
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.moduleReference, cbNode, result);
                 break;
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 result = reduceNodes(node.decorators, cbNodes, result);
                 result = reduceNodes(node.modifiers, cbNodes, result);
                 result = reduceNode(node.importClause, cbNode, result);
                 result = reduceNode(node.moduleSpecifier, cbNode, result);
                 break;
-            case 250 /* ImportClause */:
+            case 251 /* ImportClause */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.namedBindings, cbNode, result);
                 break;
-            case 251 /* NamespaceImport */:
+            case 252 /* NamespaceImport */:
                 result = reduceNode(node.name, cbNode, result);
                 break;
-            case 252 /* NamedImports */:
-            case 256 /* NamedExports */:
+            case 253 /* NamedImports */:
+            case 257 /* NamedExports */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
-            case 253 /* ImportSpecifier */:
-            case 257 /* ExportSpecifier */:
+            case 254 /* ImportSpecifier */:
+            case 258 /* ExportSpecifier */:
                 result = reduceNode(node.propertyName, cbNode, result);
                 result = reduceNode(node.name, cbNode, result);
                 break;
-            case 254 /* ExportAssignment */:
+            case 255 /* ExportAssignment */:
                 result = ts.reduceLeft(node.decorators, cbNode, result);
                 result = ts.reduceLeft(node.modifiers, cbNode, result);
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 255 /* ExportDeclaration */:
+            case 256 /* ExportDeclaration */:
                 result = ts.reduceLeft(node.decorators, cbNode, result);
                 result = ts.reduceLeft(node.modifiers, cbNode, result);
                 result = reduceNode(node.exportClause, cbNode, result);
                 result = reduceNode(node.moduleSpecifier, cbNode, result);
                 break;
             // Module references
-            case 259 /* ExternalModuleReference */:
+            case 260 /* ExternalModuleReference */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // JSX
-            case 260 /* JsxElement */:
+            case 261 /* JsxElement */:
                 result = reduceNode(node.openingElement, cbNode, result);
                 result = ts.reduceLeft(node.children, cbNode, result);
                 result = reduceNode(node.closingElement, cbNode, result);
                 break;
-            case 264 /* JsxFragment */:
+            case 265 /* JsxFragment */:
                 result = reduceNode(node.openingFragment, cbNode, result);
                 result = ts.reduceLeft(node.children, cbNode, result);
                 result = reduceNode(node.closingFragment, cbNode, result);
                 break;
-            case 261 /* JsxSelfClosingElement */:
-            case 262 /* JsxOpeningElement */:
+            case 262 /* JsxSelfClosingElement */:
+            case 263 /* JsxOpeningElement */:
                 result = reduceNode(node.tagName, cbNode, result);
                 result = reduceNodes(node.typeArguments, cbNode, result);
                 result = reduceNode(node.attributes, cbNode, result);
                 break;
-            case 268 /* JsxAttributes */:
+            case 269 /* JsxAttributes */:
                 result = reduceNodes(node.properties, cbNodes, result);
                 break;
-            case 263 /* JsxClosingElement */:
+            case 264 /* JsxClosingElement */:
                 result = reduceNode(node.tagName, cbNode, result);
                 break;
-            case 267 /* JsxAttribute */:
+            case 268 /* JsxAttribute */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 269 /* JsxSpreadAttribute */:
+            case 270 /* JsxSpreadAttribute */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 270 /* JsxExpression */:
+            case 271 /* JsxExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // Clauses
-            case 271 /* CaseClause */:
+            case 272 /* CaseClause */:
                 result = reduceNode(node.expression, cbNode, result);
             // falls through
-            case 272 /* DefaultClause */:
+            case 273 /* DefaultClause */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
-            case 273 /* HeritageClause */:
+            case 274 /* HeritageClause */:
                 result = reduceNodes(node.types, cbNodes, result);
                 break;
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 result = reduceNode(node.variableDeclaration, cbNode, result);
                 result = reduceNode(node.block, cbNode, result);
                 break;
             // Property assignments
-            case 275 /* PropertyAssignment */:
+            case 276 /* PropertyAssignment */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
-            case 276 /* ShorthandPropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.objectAssignmentInitializer, cbNode, result);
                 break;
-            case 277 /* SpreadAssignment */:
+            case 278 /* SpreadAssignment */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
             // Enum
-            case 278 /* EnumMember */:
+            case 279 /* EnumMember */:
                 result = reduceNode(node.name, cbNode, result);
                 result = reduceNode(node.initializer, cbNode, result);
                 break;
             // Top-level nodes
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 result = reduceNodes(node.statements, cbNodes, result);
                 break;
             // Transformation nodes
-            case 313 /* PartiallyEmittedExpression */:
+            case 314 /* PartiallyEmittedExpression */:
                 result = reduceNode(node.expression, cbNode, result);
                 break;
-            case 314 /* CommaListExpression */:
+            case 315 /* CommaListExpression */:
                 result = reduceNodes(node.elements, cbNodes, result);
                 break;
             default:
@@ -65752,7 +66659,7 @@ var ts;
      * @param nodes The NodeArray.
      */
     function liftToBlock(nodes) {
-        Debug.assert(ts.every(nodes, ts.isStatement), "Cannot lift nodes to a Block.");
+        ts.Debug.assert(ts.every(nodes, ts.isStatement), "Cannot lift nodes to a Block.");
         return ts.singleOrUndefined(nodes) || ts.createBlock(nodes);
     }
     ts.liftToBlock = liftToBlock;
@@ -65801,7 +66708,7 @@ var ts;
     function aggregateTransformFlagsForSubtree(node) {
         // We do not transform ambient declarations or types, so there is no need to
         // recursively aggregate transform flags.
-        if (ts.hasModifier(node, 2 /* Ambient */) || (ts.isTypeNode(node) && node.kind !== 211 /* ExpressionWithTypeArguments */)) {
+        if (ts.hasModifier(node, 2 /* Ambient */) || (ts.isTypeNode(node) && node.kind !== 212 /* ExpressionWithTypeArguments */)) {
             return 0 /* None */;
         }
         // Aggregate the transform flags of each child.
@@ -65817,73 +66724,6 @@ var ts;
     function aggregateTransformFlagsForChildNodes(transformFlags, nodes) {
         return transformFlags | aggregateTransformFlagsForNodeArray(nodes);
     }
-    var Debug;
-    (function (Debug) {
-        var isDebugInfoEnabled = false;
-        function failBadSyntaxKind(node, message) {
-            return Debug.fail((message || "Unexpected node.") + "\r\nNode " + ts.formatSyntaxKind(node.kind) + " was unexpected.", failBadSyntaxKind);
-        }
-        Debug.failBadSyntaxKind = failBadSyntaxKind;
-        Debug.assertEachNode = Debug.shouldAssert(1 /* Normal */)
-            ? function (nodes, test, message) { return Debug.assert(test === undefined || ts.every(nodes, test), message || "Unexpected node.", function () { return "Node array did not pass test '" + Debug.getFunctionName(test) + "'."; }, Debug.assertEachNode); }
-            : ts.noop;
-        Debug.assertNode = Debug.shouldAssert(1 /* Normal */)
-            ? function (node, test, message) { return Debug.assert(test === undefined || test(node), message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " did not pass test '" + Debug.getFunctionName(test) + "'."; }, Debug.assertNode); }
-            : ts.noop;
-        Debug.assertOptionalNode = Debug.shouldAssert(1 /* Normal */)
-            ? function (node, test, message) { return Debug.assert(test === undefined || node === undefined || test(node), message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " did not pass test '" + Debug.getFunctionName(test) + "'."; }, Debug.assertOptionalNode); }
-            : ts.noop;
-        Debug.assertOptionalToken = Debug.shouldAssert(1 /* Normal */)
-            ? function (node, kind, message) { return Debug.assert(kind === undefined || node === undefined || node.kind === kind, message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " was not a '" + ts.formatSyntaxKind(kind) + "' token."; }, Debug.assertOptionalToken); }
-            : ts.noop;
-        Debug.assertMissingNode = Debug.shouldAssert(1 /* Normal */)
-            ? function (node, message) { return Debug.assert(node === undefined, message || "Unexpected node.", function () { return "Node " + ts.formatSyntaxKind(node.kind) + " was unexpected'."; }, Debug.assertMissingNode); }
-            : ts.noop;
-        /**
-         * Injects debug information into frequently used types.
-         */
-        function enableDebugInfo() {
-            if (isDebugInfoEnabled)
-                return;
-            // Add additional properties in debug mode to assist with debugging.
-            Object.defineProperties(ts.objectAllocator.getSymbolConstructor().prototype, {
-                __debugFlags: { get: function () { return ts.formatSymbolFlags(this.flags); } }
-            });
-            Object.defineProperties(ts.objectAllocator.getTypeConstructor().prototype, {
-                __debugFlags: { get: function () { return ts.formatTypeFlags(this.flags); } },
-                __debugObjectFlags: { get: function () { return this.flags & 524288 /* Object */ ? ts.formatObjectFlags(this.objectFlags) : ""; } },
-                __debugTypeToString: { value: function () { return this.checker.typeToString(this); } },
-            });
-            var nodeConstructors = [
-                ts.objectAllocator.getNodeConstructor(),
-                ts.objectAllocator.getIdentifierConstructor(),
-                ts.objectAllocator.getTokenConstructor(),
-                ts.objectAllocator.getSourceFileConstructor()
-            ];
-            for (var _i = 0, nodeConstructors_1 = nodeConstructors; _i < nodeConstructors_1.length; _i++) {
-                var ctor = nodeConstructors_1[_i];
-                if (!ctor.prototype.hasOwnProperty("__debugKind")) {
-                    Object.defineProperties(ctor.prototype, {
-                        __debugKind: { get: function () { return ts.formatSyntaxKind(this.kind); } },
-                        __debugModifierFlags: { get: function () { return ts.formatModifierFlags(ts.getModifierFlagsNoCache(this)); } },
-                        __debugTransformFlags: { get: function () { return ts.formatTransformFlags(this.transformFlags); } },
-                        __debugEmitFlags: { get: function () { return ts.formatEmitFlags(ts.getEmitFlags(this)); } },
-                        __debugGetText: {
-                            value: function (includeTrivia) {
-                                if (ts.nodeIsSynthesized(this))
-                                    return "";
-                                var parseNode = ts.getParseTreeNode(this);
-                                var sourceFile = parseNode && ts.getSourceFileOfNode(parseNode);
-                                return sourceFile ? ts.getSourceTextOfNodeFromSourceFile(sourceFile, parseNode, includeTrivia) : "";
-                            }
-                        }
-                    });
-                }
-            }
-            isDebugInfoEnabled = true;
-        }
-        Debug.enableDebugInfo = enableDebugInfo;
-    })(Debug = ts.Debug || (ts.Debug = {}));
 })(ts || (ts = {}));
 /* @internal */
 var ts;
@@ -66541,7 +67381,7 @@ var ts;
     function chainBundle(transformSourceFile) {
         return transformSourceFileOrBundle;
         function transformSourceFileOrBundle(node) {
-            return node.kind === 284 /* SourceFile */ ? transformSourceFile(node) : transformBundle(node);
+            return node.kind === 285 /* SourceFile */ ? transformSourceFile(node) : transformBundle(node);
         }
         function transformBundle(node) {
             return ts.createBundle(ts.map(node.sourceFiles, transformSourceFile), node.prepends);
@@ -66587,7 +67427,7 @@ var ts;
         for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
             var node = _a[_i];
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     // import "mod"
                     // import x from "mod"
                     // import * as x from "mod"
@@ -66595,13 +67435,13 @@ var ts;
                     externalImports.push(node);
                     hasImportStarOrImportDefault = hasImportStarOrImportDefault || getImportNeedsImportStarHelper(node) || getImportNeedsImportDefaultHelper(node);
                     break;
-                case 248 /* ImportEqualsDeclaration */:
-                    if (node.moduleReference.kind === 259 /* ExternalModuleReference */) {
+                case 249 /* ImportEqualsDeclaration */:
+                    if (node.moduleReference.kind === 260 /* ExternalModuleReference */) {
                         // import x = require("mod")
                         externalImports.push(node);
                     }
                     break;
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     if (node.moduleSpecifier) {
                         if (!node.exportClause) {
                             // export * from "mod"
@@ -66631,13 +67471,13 @@ var ts;
                         }
                     }
                     break;
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     if (node.isExportEquals && !exportEquals) {
                         // export = x
                         exportEquals = node;
                     }
                     break;
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     if (ts.hasModifier(node, 1 /* Export */)) {
                         for (var _d = 0, _e = node.declarationList.declarations; _d < _e.length; _d++) {
                             var decl = _e[_d];
@@ -66645,7 +67485,7 @@ var ts;
                         }
                     }
                     break;
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     if (ts.hasModifier(node, 1 /* Export */)) {
                         if (ts.hasModifier(node, 512 /* Default */)) {
                             // export default function() { }
@@ -66665,7 +67505,7 @@ var ts;
                         }
                     }
                     break;
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     if (ts.hasModifier(node, 1 /* Export */)) {
                         if (ts.hasModifier(node, 512 /* Default */)) {
                             // export default class { }
@@ -67205,7 +68045,7 @@ var ts;
     ts.restHelper = {
         name: "typescript:rest",
         scoped: false,
-        text: "\n            var __rest = (this && this.__rest) || function (s, e) {\n                var t = {};\n                for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)\n                    t[p] = s[p];\n                if (s != null && typeof Object.getOwnPropertySymbols === \"function\")\n                    for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)\n                        t[p[i]] = s[p[i]];\n                return t;\n            };"
+        text: "\n            var __rest = (this && this.__rest) || function (s, e) {\n                var t = {};\n                for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)\n                    t[p] = s[p];\n                if (s != null && typeof Object.getOwnPropertySymbols === \"function\")\n                    for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {\n                        if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))\n                            t[p[i]] = s[p[i]];\n                    }\n                return t;\n            };"
     };
     /** Given value: o, propName: p, pattern: { a, b, ...p } from the original statement
      * `{ a, b, ...p } = o`, create `p = __rest(o, ["a", "b"]);`
@@ -67281,8 +68121,8 @@ var ts;
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         // Enable substitution for property/element access to emit const enum values.
-        context.enableSubstitution(189 /* PropertyAccessExpression */);
-        context.enableSubstitution(190 /* ElementAccessExpression */);
+        context.enableSubstitution(190 /* PropertyAccessExpression */);
+        context.enableSubstitution(191 /* ElementAccessExpression */);
         // These variables contain state that changes as we descend into the tree.
         var currentSourceFile;
         var currentNamespace;
@@ -67312,14 +68152,14 @@ var ts;
         var pendingExpressions;
         return transformSourceFileOrBundle;
         function transformSourceFileOrBundle(node) {
-            if (node.kind === 285 /* Bundle */) {
+            if (node.kind === 286 /* Bundle */) {
                 return transformBundle(node);
             }
             return transformSourceFile(node);
         }
         function transformBundle(node) {
             return ts.createBundle(node.sourceFiles.map(transformSourceFile), ts.mapDefined(node.prepends, function (prepend) {
-                if (prepend.kind === 287 /* InputFiles */) {
+                if (prepend.kind === 288 /* InputFiles */) {
                     return ts.createUnparsedSourceFile(prepend, "js");
                 }
                 return prepend;
@@ -67368,16 +68208,16 @@ var ts;
          */
         function onBeforeVisitNode(node) {
             switch (node.kind) {
-                case 284 /* SourceFile */:
-                case 246 /* CaseBlock */:
-                case 245 /* ModuleBlock */:
-                case 218 /* Block */:
+                case 285 /* SourceFile */:
+                case 247 /* CaseBlock */:
+                case 246 /* ModuleBlock */:
+                case 219 /* Block */:
                     currentLexicalScope = node;
                     currentNameScope = undefined;
                     currentScopeFirstDeclarationsOfName = undefined;
                     break;
-                case 240 /* ClassDeclaration */:
-                case 239 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     if (ts.hasModifier(node, 2 /* Ambient */)) {
                         break;
                     }
@@ -67389,7 +68229,7 @@ var ts;
                         // These nodes should always have names unless they are default-exports;
                         // however, class declaration parsing allows for undefined names, so syntactically invalid
                         // programs may also have an undefined name.
-                        ts.Debug.assert(node.kind === 240 /* ClassDeclaration */ || ts.hasModifier(node, 512 /* Default */));
+                        ts.Debug.assert(node.kind === 241 /* ClassDeclaration */ || ts.hasModifier(node, 512 /* Default */));
                     }
                     if (ts.isClassDeclaration(node)) {
                         // XXX: should probably also cover interfaces and type aliases that can have type variables?
@@ -67432,10 +68272,10 @@ var ts;
          */
         function sourceElementVisitorWorker(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
-                case 254 /* ExportAssignment */:
-                case 255 /* ExportDeclaration */:
+                case 250 /* ImportDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 255 /* ExportAssignment */:
+                case 256 /* ExportDeclaration */:
                     return visitEllidableStatement(node);
                 default:
                     return visitorWorker(node);
@@ -67456,13 +68296,13 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return visitExportAssignment(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return visitExportDeclaration(node);
                 default:
                     ts.Debug.fail("Unhandled ellided statement");
@@ -67482,11 +68322,11 @@ var ts;
          * @param node The node to visit.
          */
         function namespaceElementVisitorWorker(node) {
-            if (node.kind === 255 /* ExportDeclaration */ ||
-                node.kind === 249 /* ImportDeclaration */ ||
-                node.kind === 250 /* ImportClause */ ||
-                (node.kind === 248 /* ImportEqualsDeclaration */ &&
-                    node.moduleReference.kind === 259 /* ExternalModuleReference */)) {
+            if (node.kind === 256 /* ExportDeclaration */ ||
+                node.kind === 250 /* ImportDeclaration */ ||
+                node.kind === 251 /* ImportClause */ ||
+                (node.kind === 249 /* ImportEqualsDeclaration */ &&
+                    node.moduleReference.kind === 260 /* ExternalModuleReference */)) {
                 // do not emit ES6 imports and exports since they are illegal inside a namespace
                 return undefined;
             }
@@ -67510,19 +68350,19 @@ var ts;
          */
         function classElementVisitorWorker(node) {
             switch (node.kind) {
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     // TypeScript constructors are transformed in `visitClassDeclaration`.
                     // We elide them here as `visitorWorker` checks transform flags, which could
                     // erronously include an ES6 constructor without TypeScript syntax.
                     return undefined;
-                case 154 /* PropertyDeclaration */:
-                case 162 /* IndexSignature */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 156 /* MethodDeclaration */:
+                case 155 /* PropertyDeclaration */:
+                case 163 /* IndexSignature */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
                     // Fallback to the default visit behavior.
                     return visitorWorker(node);
-                case 217 /* SemicolonClassElement */:
+                case 218 /* SemicolonClassElement */:
                     return node;
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -67532,7 +68372,7 @@ var ts;
             if (ts.modifierToFlag(node.kind) & 2270 /* TypeScriptModifier */) {
                 return undefined;
             }
-            else if (currentNamespace && node.kind === 85 /* ExportKeyword */) {
+            else if (currentNamespace && node.kind === 86 /* ExportKeyword */) {
                 return undefined;
             }
             return node;
@@ -67549,67 +68389,67 @@ var ts;
                 return ts.createNotEmittedStatement(node);
             }
             switch (node.kind) {
-                case 85 /* ExportKeyword */:
-                case 80 /* DefaultKeyword */:
+                case 86 /* ExportKeyword */:
+                case 81 /* DefaultKeyword */:
                     // ES6 export and default modifiers are elided when inside a namespace.
                     return currentNamespace ? undefined : node;
-                case 115 /* PublicKeyword */:
-                case 113 /* PrivateKeyword */:
-                case 114 /* ProtectedKeyword */:
-                case 118 /* AbstractKeyword */:
-                case 77 /* ConstKeyword */:
-                case 125 /* DeclareKeyword */:
-                case 133 /* ReadonlyKeyword */:
+                case 116 /* PublicKeyword */:
+                case 114 /* PrivateKeyword */:
+                case 115 /* ProtectedKeyword */:
+                case 119 /* AbstractKeyword */:
+                case 78 /* ConstKeyword */:
+                case 126 /* DeclareKeyword */:
+                case 134 /* ReadonlyKeyword */:
                 // TypeScript accessibility and readonly modifiers are elided.
-                case 169 /* ArrayType */:
-                case 170 /* TupleType */:
-                case 171 /* OptionalType */:
-                case 172 /* RestType */:
-                case 168 /* TypeLiteral */:
-                case 163 /* TypePredicate */:
-                case 150 /* TypeParameter */:
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 138 /* StringKeyword */:
-                case 135 /* NumberKeyword */:
-                case 132 /* NeverKeyword */:
-                case 106 /* VoidKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 166 /* ConstructorType */:
-                case 165 /* FunctionType */:
-                case 167 /* TypeQuery */:
-                case 164 /* TypeReference */:
-                case 173 /* UnionType */:
-                case 174 /* IntersectionType */:
-                case 175 /* ConditionalType */:
-                case 177 /* ParenthesizedType */:
-                case 178 /* ThisType */:
-                case 179 /* TypeOperator */:
-                case 180 /* IndexedAccessType */:
-                case 181 /* MappedType */:
-                case 182 /* LiteralType */:
+                case 170 /* ArrayType */:
+                case 171 /* TupleType */:
+                case 172 /* OptionalType */:
+                case 173 /* RestType */:
+                case 169 /* TypeLiteral */:
+                case 164 /* TypePredicate */:
+                case 151 /* TypeParameter */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 139 /* StringKeyword */:
+                case 136 /* NumberKeyword */:
+                case 133 /* NeverKeyword */:
+                case 107 /* VoidKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 167 /* ConstructorType */:
+                case 166 /* FunctionType */:
+                case 168 /* TypeQuery */:
+                case 165 /* TypeReference */:
+                case 174 /* UnionType */:
+                case 175 /* IntersectionType */:
+                case 176 /* ConditionalType */:
+                case 178 /* ParenthesizedType */:
+                case 179 /* ThisType */:
+                case 180 /* TypeOperator */:
+                case 181 /* IndexedAccessType */:
+                case 182 /* MappedType */:
+                case 183 /* LiteralType */:
                 // TypeScript type nodes are elided.
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                 // TypeScript index signatures are elided.
-                case 152 /* Decorator */:
+                case 153 /* Decorator */:
                 // TypeScript decorators are elided. They will be emitted as part of visitClassDeclaration.
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     // TypeScript type-only declarations are elided.
                     return undefined;
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     // TypeScript property declarations are elided. However their names are still visited, and can potentially be retained if they could have sideeffects
                     return visitPropertyDeclaration(node);
-                case 247 /* NamespaceExportDeclaration */:
+                case 248 /* NamespaceExportDeclaration */:
                     // TypeScript namespace export declarations are elided.
                     return undefined;
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return visitConstructor(node);
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     // TypeScript interfaces are elided, but some comments may be preserved.
                     // See the implementation of `getLeadingComments` in comments.ts for more details.
                     return ts.createNotEmittedStatement(node);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     // This may be a class declaration with TypeScript syntax extensions.
                     //
                     // TypeScript class syntax extensions include:
@@ -67620,7 +68460,7 @@ var ts;
                     // - index signatures
                     // - method overload signatures
                     return visitClassDeclaration(node);
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     // This may be a class expression with TypeScript syntax extensions.
                     //
                     // TypeScript class syntax extensions include:
@@ -67631,35 +68471,35 @@ var ts;
                     // - index signatures
                     // - method overload signatures
                     return visitClassExpression(node);
-                case 273 /* HeritageClause */:
+                case 274 /* HeritageClause */:
                     // This may be a heritage clause with TypeScript syntax extensions.
                     //
                     // TypeScript heritage clause extensions include:
                     // - `implements` clause
                     return visitHeritageClause(node);
-                case 211 /* ExpressionWithTypeArguments */:
+                case 212 /* ExpressionWithTypeArguments */:
                     // TypeScript supports type arguments on an expression in an `extends` heritage clause.
                     return visitExpressionWithTypeArguments(node);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     // TypeScript method declarations may have decorators, modifiers
                     // or type annotations.
                     return visitMethodDeclaration(node);
-                case 158 /* GetAccessor */:
+                case 159 /* GetAccessor */:
                     // Get Accessors can have TypeScript modifiers, decorators, and type annotations.
                     return visitGetAccessor(node);
-                case 159 /* SetAccessor */:
+                case 160 /* SetAccessor */:
                     // Set Accessors can have TypeScript modifiers and type annotations.
                     return visitSetAccessor(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     // Typescript function declarations can have modifiers, decorators, and type annotations.
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     // TypeScript function expressions can have modifiers and type annotations.
                     return visitFunctionExpression(node);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     // TypeScript arrow functions can have modifiers and type annotations.
                     return visitArrowFunction(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     // This may be a parameter declaration with TypeScript syntax extensions.
                     //
                     // TypeScript parameter declaration syntax extensions include:
@@ -67669,35 +68509,35 @@ var ts;
                     // - type annotations
                     // - this parameters
                     return visitParameter(node);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     // ParenthesizedExpressions are TypeScript if their expression is a
                     // TypeAssertion or AsExpression
                     return visitParenthesizedExpression(node);
-                case 194 /* TypeAssertionExpression */:
-                case 212 /* AsExpression */:
+                case 195 /* TypeAssertionExpression */:
+                case 213 /* AsExpression */:
                     // TypeScript type assertions are removed, but their subtrees are preserved.
                     return visitAssertionExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return visitCallExpression(node);
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return visitNewExpression(node);
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     return visitTaggedTemplateExpression(node);
-                case 213 /* NonNullExpression */:
+                case 214 /* NonNullExpression */:
                     // TypeScript non-null expressions are removed, but their subtrees are preserved.
                     return visitNonNullExpression(node);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     // TypeScript enum declarations do not exist in ES6 and must be rewritten.
                     return visitEnumDeclaration(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     // TypeScript namespace exports for variable statements must be transformed.
                     return visitVariableStatement(node);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     // TypeScript namespace declarations must be transformed.
                     return visitModuleDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     // TypeScript namespace or external module import.
                     return visitImportEqualsDeclaration(node);
                 default:
@@ -67735,7 +68575,7 @@ var ts;
             if (ts.some(staticProperties))
                 facts |= 1 /* HasStaticInitializedProperties */;
             var extendsClauseElement = ts.getEffectiveBaseTypeNode(node);
-            if (extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 96 /* NullKeyword */)
+            if (extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97 /* NullKeyword */)
                 facts |= 64 /* IsDerivedClass */;
             if (shouldEmitDecorateCallForClass(node))
                 facts |= 2 /* HasConstructorDecorators */;
@@ -68001,7 +68841,7 @@ var ts;
             pendingExpressions = undefined;
             var staticProperties = getInitializedProperties(node, /*isStatic*/ true);
             var heritageClauses = ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause);
-            var members = transformClassMembers(node, ts.some(heritageClauses, function (c) { return c.token === 86 /* ExtendsKeyword */; }));
+            var members = transformClassMembers(node, ts.some(heritageClauses, function (c) { return c.token === 87 /* ExtendsKeyword */; }));
             var classExpression = ts.createClassExpression(
             /*modifiers*/ undefined, node.name, 
             /*typeParameters*/ undefined, heritageClauses, members);
@@ -68177,7 +69017,7 @@ var ts;
                     return index;
                 }
                 var statement = statements[index];
-                if (statement.kind === 221 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
+                if (statement.kind === 222 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
                     result.push(ts.visitNode(statement, visitor, ts.isStatement));
                     return index + 1;
                 }
@@ -68248,7 +69088,7 @@ var ts;
          * @param isStatic A value indicating whether the member should be a static or instance member.
          */
         function isInitializedProperty(member, isStatic) {
-            return member.kind === 154 /* PropertyDeclaration */
+            return member.kind === 155 /* PropertyDeclaration */
                 && isStatic === ts.hasModifier(member, 32 /* Static */)
                 && member.initializer !== undefined;
         }
@@ -68259,8 +69099,8 @@ var ts;
          * @param receiver The receiver on which each property should be assigned.
          */
         function addInitializedPropertyStatements(statements, properties, receiver) {
-            for (var _i = 0, properties_9 = properties; _i < properties_9.length; _i++) {
-                var property = properties_9[_i];
+            for (var _i = 0, properties_6 = properties; _i < properties_6.length; _i++) {
+                var property = properties_6[_i];
                 var statement = ts.createExpressionStatement(transformInitializedProperty(property, receiver));
                 ts.setSourceMapRange(statement, ts.moveRangePastModifiers(property));
                 ts.setCommentRange(statement, property);
@@ -68276,8 +69116,8 @@ var ts;
          */
         function generateInitializedPropertyExpressions(properties, receiver) {
             var expressions = [];
-            for (var _i = 0, properties_10 = properties; _i < properties_10.length; _i++) {
-                var property = properties_10[_i];
+            for (var _i = 0, properties_7 = properties; _i < properties_7.length; _i++) {
+                var property = properties_7[_i];
                 var expression = transformInitializedProperty(property, receiver);
                 ts.startOnNewLine(expression);
                 ts.setSourceMapRange(expression, ts.moveRangePastModifiers(property));
@@ -68391,12 +69231,12 @@ var ts;
          */
         function getAllDecoratorsOfClassElement(node, member) {
             switch (member.kind) {
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return getAllDecoratorsOfAccessors(node, member);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     return getAllDecoratorsOfMethod(member);
-                case 154 /* PropertyDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return getAllDecoratorsOfProperty(member);
                 default:
                     return undefined;
@@ -68549,7 +69389,7 @@ var ts;
             var prefix = getClassMemberPrefix(node, member);
             var memberName = getExpressionForPropertyName(member, /*generateNameForComputedPropertyName*/ true);
             var descriptor = languageVersion > 0 /* ES3 */
-                ? member.kind === 154 /* PropertyDeclaration */
+                ? member.kind === 155 /* PropertyDeclaration */
                     // We emit `void 0` here to indicate to `__decorate` that it can invoke `Object.defineProperty` directly, but that it
                     // should not invoke `Object.getOwnPropertyDescriptor`.
                     ? ts.createVoidZero()
@@ -68672,10 +69512,10 @@ var ts;
          */
         function shouldAddTypeMetadata(node) {
             var kind = node.kind;
-            return kind === 156 /* MethodDeclaration */
-                || kind === 158 /* GetAccessor */
-                || kind === 159 /* SetAccessor */
-                || kind === 154 /* PropertyDeclaration */;
+            return kind === 157 /* MethodDeclaration */
+                || kind === 159 /* GetAccessor */
+                || kind === 160 /* SetAccessor */
+                || kind === 155 /* PropertyDeclaration */;
         }
         /**
          * Determines whether to emit the "design:returntype" metadata based on the node's kind.
@@ -68685,7 +69525,7 @@ var ts;
          * @param node The node to test.
          */
         function shouldAddReturnTypeMetadata(node) {
-            return node.kind === 156 /* MethodDeclaration */;
+            return node.kind === 157 /* MethodDeclaration */;
         }
         /**
          * Determines whether to emit the "design:paramtypes" metadata based on the node's kind.
@@ -68696,12 +69536,12 @@ var ts;
          */
         function shouldAddParamTypesMetadata(node) {
             switch (node.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     return ts.getFirstConstructorWithBody(node) !== undefined;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return true;
             }
             return false;
@@ -68718,15 +69558,15 @@ var ts;
          */
         function serializeTypeOfNode(node) {
             switch (node.kind) {
-                case 154 /* PropertyDeclaration */:
-                case 151 /* Parameter */:
+                case 155 /* PropertyDeclaration */:
+                case 152 /* Parameter */:
                     return serializeTypeNode(node.type);
-                case 159 /* SetAccessor */:
-                case 158 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 159 /* GetAccessor */:
                     return serializeTypeNode(getAccessorTypeNode(node));
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 156 /* MethodDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 157 /* MethodDeclaration */:
                     return ts.createIdentifier("Function");
                 default:
                     return ts.createVoidZero();
@@ -68763,7 +69603,7 @@ var ts;
             return ts.createArrayLiteral(expressions);
         }
         function getParametersOfDecoratedDeclaration(node, container) {
-            if (container && node.kind === 158 /* GetAccessor */) {
+            if (container && node.kind === 159 /* GetAccessor */) {
                 var setAccessor = ts.getAllAccessorDeclarations(container.members, node).setAccessor;
                 if (setAccessor) {
                     return setAccessor.parameters;
@@ -68808,69 +69648,69 @@ var ts;
                 return ts.createIdentifier("Object");
             }
             switch (node.kind) {
-                case 106 /* VoidKeyword */:
-                case 141 /* UndefinedKeyword */:
-                case 96 /* NullKeyword */:
-                case 132 /* NeverKeyword */:
+                case 107 /* VoidKeyword */:
+                case 142 /* UndefinedKeyword */:
+                case 97 /* NullKeyword */:
+                case 133 /* NeverKeyword */:
                     return ts.createVoidZero();
-                case 177 /* ParenthesizedType */:
+                case 178 /* ParenthesizedType */:
                     return serializeTypeNode(node.type);
-                case 165 /* FunctionType */:
-                case 166 /* ConstructorType */:
+                case 166 /* FunctionType */:
+                case 167 /* ConstructorType */:
                     return ts.createIdentifier("Function");
-                case 169 /* ArrayType */:
-                case 170 /* TupleType */:
+                case 170 /* ArrayType */:
+                case 171 /* TupleType */:
                     return ts.createIdentifier("Array");
-                case 163 /* TypePredicate */:
-                case 123 /* BooleanKeyword */:
+                case 164 /* TypePredicate */:
+                case 124 /* BooleanKeyword */:
                     return ts.createIdentifier("Boolean");
-                case 138 /* StringKeyword */:
+                case 139 /* StringKeyword */:
                     return ts.createIdentifier("String");
-                case 136 /* ObjectKeyword */:
+                case 137 /* ObjectKeyword */:
                     return ts.createIdentifier("Object");
-                case 182 /* LiteralType */:
+                case 183 /* LiteralType */:
                     switch (node.literal.kind) {
                         case 10 /* StringLiteral */:
                             return ts.createIdentifier("String");
-                        case 202 /* PrefixUnaryExpression */:
+                        case 203 /* PrefixUnaryExpression */:
                         case 8 /* NumericLiteral */:
                             return ts.createIdentifier("Number");
                         case 9 /* BigIntLiteral */:
                             return getGlobalBigIntNameWithFallback();
-                        case 102 /* TrueKeyword */:
-                        case 87 /* FalseKeyword */:
+                        case 103 /* TrueKeyword */:
+                        case 88 /* FalseKeyword */:
                             return ts.createIdentifier("Boolean");
                         default:
                             return ts.Debug.failBadSyntaxKind(node.literal);
                     }
-                case 135 /* NumberKeyword */:
+                case 136 /* NumberKeyword */:
                     return ts.createIdentifier("Number");
-                case 146 /* BigIntKeyword */:
+                case 147 /* BigIntKeyword */:
                     return getGlobalBigIntNameWithFallback();
-                case 139 /* SymbolKeyword */:
+                case 140 /* SymbolKeyword */:
                     return languageVersion < 2 /* ES2015 */
                         ? getGlobalSymbolNameWithFallback()
                         : ts.createIdentifier("Symbol");
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return serializeTypeReferenceNode(node);
-                case 174 /* IntersectionType */:
-                case 173 /* UnionType */:
+                case 175 /* IntersectionType */:
+                case 174 /* UnionType */:
                     return serializeTypeList(node.types);
-                case 175 /* ConditionalType */:
+                case 176 /* ConditionalType */:
                     return serializeTypeList([node.trueType, node.falseType]);
-                case 179 /* TypeOperator */:
-                    if (node.operator === 133 /* ReadonlyKeyword */) {
+                case 180 /* TypeOperator */:
+                    if (node.operator === 134 /* ReadonlyKeyword */) {
                         return serializeTypeNode(node.type);
                     }
                     break;
-                case 167 /* TypeQuery */:
-                case 180 /* IndexedAccessType */:
-                case 181 /* MappedType */:
-                case 168 /* TypeLiteral */:
-                case 120 /* AnyKeyword */:
-                case 143 /* UnknownKeyword */:
-                case 178 /* ThisType */:
-                case 183 /* ImportType */:
+                case 168 /* TypeQuery */:
+                case 181 /* IndexedAccessType */:
+                case 182 /* MappedType */:
+                case 169 /* TypeLiteral */:
+                case 121 /* AnyKeyword */:
+                case 144 /* UnknownKeyword */:
+                case 179 /* ThisType */:
+                case 184 /* ImportType */:
                     break;
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -68881,15 +69721,15 @@ var ts;
             // Note when updating logic here also update getEntityNameForDecoratorMetadata
             // so that aliases can be marked as referenced
             var serializedUnion;
-            for (var _i = 0, types_18 = types; _i < types_18.length; _i++) {
-                var typeNode = types_18[_i];
-                while (typeNode.kind === 177 /* ParenthesizedType */) {
+            for (var _i = 0, types_17 = types; _i < types_17.length; _i++) {
+                var typeNode = types_17[_i];
+                while (typeNode.kind === 178 /* ParenthesizedType */) {
                     typeNode = typeNode.type; // Skip parens if need be
                 }
-                if (typeNode.kind === 132 /* NeverKeyword */) {
+                if (typeNode.kind === 133 /* NeverKeyword */) {
                     continue; // Always elide `never` from the union/intersection if possible
                 }
-                if (!strictNullChecks && (typeNode.kind === 96 /* NullKeyword */ || typeNode.kind === 141 /* UndefinedKeyword */)) {
+                if (!strictNullChecks && (typeNode.kind === 97 /* NullKeyword */ || typeNode.kind === 142 /* UndefinedKeyword */)) {
                     continue; // Elide null and undefined from unions for metadata, just like what we did prior to the implementation of strict null checks
                 }
                 var serializedIndividual = serializeTypeNode(typeNode);
@@ -68969,12 +69809,12 @@ var ts;
          * @param node The entity name to serialize.
          */
         function serializeEntityNameAsExpressionFallback(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 // A -> typeof A !== undefined && A
                 var copied = serializeEntityNameAsExpression(node);
                 return createCheckedValue(copied, copied);
             }
-            if (node.left.kind === 72 /* Identifier */) {
+            if (node.left.kind === 73 /* Identifier */) {
                 // A.B -> typeof A !== undefined && A.B
                 return createCheckedValue(serializeEntityNameAsExpression(node.left), serializeEntityNameAsExpression(node));
             }
@@ -68990,7 +69830,7 @@ var ts;
          */
         function serializeEntityNameAsExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     // Create a clone of the name with a new parent, and treat it as if it were
                     // a source tree node for the purposes of the checker.
                     var name = ts.getMutableClone(node);
@@ -68998,7 +69838,7 @@ var ts;
                     name.original = undefined;
                     name.parent = ts.getParseTreeNode(currentLexicalScope); // ensure the parent is set to a parse tree node.
                     return name;
-                case 148 /* QualifiedName */:
+                case 149 /* QualifiedName */:
                     return serializeQualifiedNameAsExpression(node);
             }
         }
@@ -69024,7 +69864,7 @@ var ts;
          * available.
          */
         function getGlobalBigIntNameWithFallback() {
-            return languageVersion < 7 /* ESNext */
+            return languageVersion < 8 /* ESNext */
                 ? ts.createConditional(ts.createTypeCheck(ts.createIdentifier("BigInt"), "function"), ts.createIdentifier("BigInt"), ts.createIdentifier("Object"))
                 : ts.createIdentifier("BigInt");
         }
@@ -69108,7 +69948,7 @@ var ts;
          * @param node The HeritageClause to transform.
          */
         function visitHeritageClause(node) {
-            if (node.token === 109 /* ImplementsKeyword */) {
+            if (node.token === 110 /* ImplementsKeyword */) {
                 // implements clauses are elided
                 return undefined;
             }
@@ -69347,7 +70187,7 @@ var ts;
          */
         function visitEnumDeclaration(node) {
             if (!shouldEmitEnumDeclaration(node)) {
-                return undefined;
+                return ts.createNotEmittedStatement(node);
             }
             var statements = [];
             // We request to be advised when the printer is about to print this node. This allows
@@ -69515,12 +70355,12 @@ var ts;
             // enums in any other scope are emitted as a `let` declaration.
             var statement = ts.createVariableStatement(ts.visitNodes(node.modifiers, modifierVisitor, ts.isModifier), ts.createVariableDeclarationList([
                 ts.createVariableDeclaration(ts.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true))
-            ], currentLexicalScope.kind === 284 /* SourceFile */ ? 0 /* None */ : 1 /* Let */));
+            ], currentLexicalScope.kind === 285 /* SourceFile */ ? 0 /* None */ : 1 /* Let */));
             ts.setOriginalNode(statement, node);
             recordEmittedDeclarationInScope(node);
             if (isFirstEmittedDeclarationInScope(node)) {
                 // Adjust the source map emit to match the old emitter.
-                if (node.kind === 243 /* EnumDeclaration */) {
+                if (node.kind === 244 /* EnumDeclaration */) {
                     ts.setSourceMapRange(statement.declarationList, node);
                 }
                 else {
@@ -69645,7 +70485,7 @@ var ts;
             var statementsLocation;
             var blockLocation;
             var body = node.body;
-            if (body.kind === 245 /* ModuleBlock */) {
+            if (body.kind === 246 /* ModuleBlock */) {
                 saveStateAndInvoke(body, function (body) { return ts.addRange(statements, ts.visitNodes(body.statements, namespaceElementVisitor, ts.isStatement)); });
                 statementsLocation = body.statements;
                 blockLocation = body;
@@ -69691,13 +70531,13 @@ var ts;
             //     })(hi = hello.hi || (hello.hi = {}));
             // })(hello || (hello = {}));
             // We only want to emit comment on the namespace which contains block body itself, not the containing namespaces.
-            if (body.kind !== 245 /* ModuleBlock */) {
+            if (body.kind !== 246 /* ModuleBlock */) {
                 ts.setEmitFlags(block, ts.getEmitFlags(block) | 1536 /* NoComments */);
             }
             return block;
         }
         function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration) {
-            if (moduleDeclaration.body.kind === 244 /* ModuleDeclaration */) {
+            if (moduleDeclaration.body.kind === 245 /* ModuleDeclaration */) {
                 var recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration.body);
                 return recursiveInnerModule || moduleDeclaration.body;
             }
@@ -69738,7 +70578,7 @@ var ts;
          * @param node The named import bindings node.
          */
         function visitNamedImportBindings(node) {
-            if (node.kind === 251 /* NamespaceImport */) {
+            if (node.kind === 252 /* NamespaceImport */) {
                 // Elide a namespace import if it is not referenced.
                 return resolver.isReferencedAliasDeclaration(node) ? node : undefined;
             }
@@ -69951,7 +70791,7 @@ var ts;
         function enableSubstitutionForNonQualifiedEnumMembers() {
             if ((enabledSubstitutions & 8 /* NonQualifiedEnumMembers */) === 0) {
                 enabledSubstitutions |= 8 /* NonQualifiedEnumMembers */;
-                context.enableSubstitution(72 /* Identifier */);
+                context.enableSubstitution(73 /* Identifier */);
             }
         }
         function enableSubstitutionForClassAliases() {
@@ -69959,7 +70799,7 @@ var ts;
                 enabledSubstitutions |= 1 /* ClassAliases */;
                 // We need to enable substitutions for identifiers. This allows us to
                 // substitute class names inside of a class declaration.
-                context.enableSubstitution(72 /* Identifier */);
+                context.enableSubstitution(73 /* Identifier */);
                 // Keep track of class aliases.
                 classAliases = [];
             }
@@ -69969,17 +70809,17 @@ var ts;
                 enabledSubstitutions |= 2 /* NamespaceExports */;
                 // We need to enable substitutions for identifiers and shorthand property assignments. This allows us to
                 // substitute the names of exported members of a namespace.
-                context.enableSubstitution(72 /* Identifier */);
-                context.enableSubstitution(276 /* ShorthandPropertyAssignment */);
+                context.enableSubstitution(73 /* Identifier */);
+                context.enableSubstitution(277 /* ShorthandPropertyAssignment */);
                 // We need to be notified when entering and exiting namespaces.
-                context.enableEmitNotification(244 /* ModuleDeclaration */);
+                context.enableEmitNotification(245 /* ModuleDeclaration */);
             }
         }
         function isTransformedModuleDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 244 /* ModuleDeclaration */;
+            return ts.getOriginalNode(node).kind === 245 /* ModuleDeclaration */;
         }
         function isTransformedEnumDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 243 /* EnumDeclaration */;
+            return ts.getOriginalNode(node).kind === 244 /* EnumDeclaration */;
         }
         /**
          * Hook for node emit.
@@ -70038,11 +70878,11 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
             }
             return node;
@@ -70080,9 +70920,9 @@ var ts;
                 // If we are nested within a namespace declaration, we may need to qualifiy
                 // an identifier that is exported from a merged namespace.
                 var container = resolver.getReferencedExportContainer(node, /*prefixLocals*/ false);
-                if (container && container.kind !== 284 /* SourceFile */) {
-                    var substitute = (applicableSubstitutions & 2 /* NamespaceExports */ && container.kind === 244 /* ModuleDeclaration */) ||
-                        (applicableSubstitutions & 8 /* NonQualifiedEnumMembers */ && container.kind === 243 /* EnumDeclaration */);
+                if (container && container.kind !== 285 /* SourceFile */) {
+                    var substitute = (applicableSubstitutions & 2 /* NamespaceExports */ && container.kind === 245 /* ModuleDeclaration */) ||
+                        (applicableSubstitutions & 8 /* NonQualifiedEnumMembers */ && container.kind === 244 /* EnumDeclaration */);
                     if (substitute) {
                         return ts.setTextRange(ts.createPropertyAccess(ts.getGeneratedNameForNode(container), node), 
                         /*location*/ node);
@@ -70222,26 +71062,26 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 121 /* AsyncKeyword */:
+                case 122 /* AsyncKeyword */:
                     // ES2017 async modifier should be elided for targets < ES2017
                     return undefined;
-                case 201 /* AwaitExpression */:
+                case 202 /* AwaitExpression */:
                     return visitAwaitExpression(node);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     return visitMethodDeclaration(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     return visitArrowFunction(node);
-                case 189 /* PropertyAccessExpression */:
-                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 98 /* SuperKeyword */) {
+                case 190 /* PropertyAccessExpression */:
+                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 99 /* SuperKeyword */) {
                         capturedSuperProperties.set(node.name.escapedText, true);
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 190 /* ElementAccessExpression */:
-                    if (capturedSuperProperties && node.expression.kind === 98 /* SuperKeyword */) {
+                case 191 /* ElementAccessExpression */:
+                    if (capturedSuperProperties && node.expression.kind === 99 /* SuperKeyword */) {
                         hasSuperElementAccess = true;
                     }
                     return ts.visitEachChild(node, visitor, context);
@@ -70252,27 +71092,27 @@ var ts;
         function asyncBodyVisitor(node) {
             if (ts.isNodeWithPossibleHoistedDeclaration(node)) {
                 switch (node.kind) {
-                    case 219 /* VariableStatement */:
+                    case 220 /* VariableStatement */:
                         return visitVariableStatementInAsyncBody(node);
-                    case 225 /* ForStatement */:
+                    case 226 /* ForStatement */:
                         return visitForStatementInAsyncBody(node);
-                    case 226 /* ForInStatement */:
+                    case 227 /* ForInStatement */:
                         return visitForInStatementInAsyncBody(node);
-                    case 227 /* ForOfStatement */:
+                    case 228 /* ForOfStatement */:
                         return visitForOfStatementInAsyncBody(node);
-                    case 274 /* CatchClause */:
+                    case 275 /* CatchClause */:
                         return visitCatchClauseInAsyncBody(node);
-                    case 218 /* Block */:
-                    case 232 /* SwitchStatement */:
-                    case 246 /* CaseBlock */:
-                    case 271 /* CaseClause */:
-                    case 272 /* DefaultClause */:
-                    case 235 /* TryStatement */:
-                    case 223 /* DoStatement */:
-                    case 224 /* WhileStatement */:
-                    case 222 /* IfStatement */:
-                    case 231 /* WithStatement */:
-                    case 233 /* LabeledStatement */:
+                    case 219 /* Block */:
+                    case 233 /* SwitchStatement */:
+                    case 247 /* CaseBlock */:
+                    case 272 /* CaseClause */:
+                    case 273 /* DefaultClause */:
+                    case 236 /* TryStatement */:
+                    case 224 /* DoStatement */:
+                    case 225 /* WhileStatement */:
+                    case 223 /* IfStatement */:
+                    case 232 /* WithStatement */:
+                    case 234 /* LabeledStatement */:
                         return ts.visitEachChild(node, asyncBodyVisitor, context);
                     default:
                         return ts.Debug.assertNever(node, "Unhandled node.");
@@ -70473,7 +71313,7 @@ var ts;
             var original = ts.getOriginalNode(node, ts.isFunctionLike);
             var nodeType = original.type;
             var promiseConstructor = languageVersion < 2 /* ES2015 */ ? getPromiseConstructor(nodeType) : undefined;
-            var isArrowFunction = node.kind === 197 /* ArrowFunction */;
+            var isArrowFunction = node.kind === 198 /* ArrowFunction */;
             var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 8192 /* CaptureArguments */) !== 0;
             // An async function is emit as an outer function that calls an inner
             // generator function. To preserve lexical bindings, we pass the current
@@ -70564,17 +71404,17 @@ var ts;
                 enabledSubstitutions |= 1 /* AsyncMethodsWithSuper */;
                 // We need to enable substitutions for call, property access, and element access
                 // if we need to rewrite super calls.
-                context.enableSubstitution(191 /* CallExpression */);
-                context.enableSubstitution(189 /* PropertyAccessExpression */);
-                context.enableSubstitution(190 /* ElementAccessExpression */);
+                context.enableSubstitution(192 /* CallExpression */);
+                context.enableSubstitution(190 /* PropertyAccessExpression */);
+                context.enableSubstitution(191 /* ElementAccessExpression */);
                 // We need to be notified when entering and exiting declarations that bind super.
-                context.enableEmitNotification(240 /* ClassDeclaration */);
-                context.enableEmitNotification(156 /* MethodDeclaration */);
-                context.enableEmitNotification(158 /* GetAccessor */);
-                context.enableEmitNotification(159 /* SetAccessor */);
-                context.enableEmitNotification(157 /* Constructor */);
+                context.enableEmitNotification(241 /* ClassDeclaration */);
+                context.enableEmitNotification(157 /* MethodDeclaration */);
+                context.enableEmitNotification(159 /* GetAccessor */);
+                context.enableEmitNotification(160 /* SetAccessor */);
+                context.enableEmitNotification(158 /* Constructor */);
                 // We need to be notified when entering the generated accessor arrow functions.
-                context.enableEmitNotification(219 /* VariableStatement */);
+                context.enableEmitNotification(220 /* VariableStatement */);
             }
         }
         /**
@@ -70622,23 +71462,23 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return substituteCallExpression(node);
             }
             return node;
         }
         function substitutePropertyAccessExpression(node) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return ts.setTextRange(ts.createPropertyAccess(ts.createFileLevelUniqueName("_super"), node.name), node);
             }
             return node;
         }
         function substituteElementAccessExpression(node) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return createSuperElementAccessInAsyncMethod(node.argumentExpression, node);
             }
             return node;
@@ -70658,11 +71498,11 @@ var ts;
         }
         function isSuperContainer(node) {
             var kind = node.kind;
-            return kind === 240 /* ClassDeclaration */
-                || kind === 157 /* Constructor */
-                || kind === 156 /* MethodDeclaration */
-                || kind === 158 /* GetAccessor */
-                || kind === 159 /* SetAccessor */;
+            return kind === 241 /* ClassDeclaration */
+                || kind === 158 /* Constructor */
+                || kind === 157 /* MethodDeclaration */
+                || kind === 159 /* GetAccessor */
+                || kind === 160 /* SetAccessor */;
         }
         function createSuperElementAccessInAsyncMethod(argumentExpression, location) {
             if (enclosingSuperContainerFlags & 4096 /* AsyncMethodWithSuperBinding */) {
@@ -70797,7 +71637,7 @@ var ts;
             return visitorWorker(node, /*noDestructuringValue*/ true);
         }
         function visitorNoAsyncModifier(node) {
-            if (node.kind === 121 /* AsyncKeyword */) {
+            if (node.kind === 122 /* AsyncKeyword */) {
                 return undefined;
             }
             return node;
@@ -70807,53 +71647,55 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 201 /* AwaitExpression */:
+                case 202 /* AwaitExpression */:
                     return visitAwaitExpression(node);
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return visitReturnStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return visitBinaryExpression(node, noDestructuringValue);
-                case 237 /* VariableDeclaration */:
+                case 275 /* CatchClause */:
+                    return visitCatchClause(node);
+                case 238 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return visitForOfStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node);
-                case 200 /* VoidExpression */:
+                case 201 /* VoidExpression */:
                     return visitVoidExpression(node);
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return visitConstructorDeclaration(node);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     return visitMethodDeclaration(node);
-                case 158 /* GetAccessor */:
+                case 159 /* GetAccessor */:
                     return visitGetAccessorDeclaration(node);
-                case 159 /* SetAccessor */:
+                case 160 /* SetAccessor */:
                     return visitSetAccessorDeclaration(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     return visitArrowFunction(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return visitParameter(node);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return visitExpressionStatement(node);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return visitParenthesizedExpression(node, noDestructuringValue);
-                case 189 /* PropertyAccessExpression */:
-                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 98 /* SuperKeyword */) {
+                case 190 /* PropertyAccessExpression */:
+                    if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 99 /* SuperKeyword */) {
                         capturedSuperProperties.set(node.name.escapedText, true);
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 190 /* ElementAccessExpression */:
-                    if (capturedSuperProperties && node.expression.kind === 98 /* SuperKeyword */) {
+                case 191 /* ElementAccessExpression */:
+                    if (capturedSuperProperties && node.expression.kind === 99 /* SuperKeyword */) {
                         hasSuperElementAccess = true;
                     }
                     return ts.visitEachChild(node, visitor, context);
@@ -70889,7 +71731,7 @@ var ts;
         function visitLabeledStatement(node) {
             if (enclosingFunctionFlags & 2 /* Async */) {
                 var statement = ts.unwrapInnermostStatementOfLabel(node);
-                if (statement.kind === 227 /* ForOfStatement */ && statement.awaitModifier) {
+                if (statement.kind === 228 /* ForOfStatement */ && statement.awaitModifier) {
                     return visitForOfStatement(statement, node);
                 }
                 return ts.restoreEnclosingLabel(ts.visitEachChild(statement, visitor, context), node);
@@ -70901,7 +71743,7 @@ var ts;
             var objects = [];
             for (var _i = 0, elements_4 = elements; _i < elements_4.length; _i++) {
                 var e = elements_4[_i];
-                if (e.kind === 277 /* SpreadAssignment */) {
+                if (e.kind === 278 /* SpreadAssignment */) {
                     if (chunkObject) {
                         objects.push(ts.createObjectLiteral(chunkObject));
                         chunkObject = undefined;
@@ -70910,7 +71752,7 @@ var ts;
                     objects.push(ts.visitNode(target, visitor, ts.isExpression));
                 }
                 else {
-                    chunkObject = ts.append(chunkObject, e.kind === 275 /* PropertyAssignment */
+                    chunkObject = ts.append(chunkObject, e.kind === 276 /* PropertyAssignment */
                         ? ts.createPropertyAssignment(e.name, ts.visitNode(e.initializer, visitor, ts.isExpression))
                         : ts.visitNode(e, visitor, ts.isObjectLiteralElementLike));
                 }
@@ -70928,7 +71770,7 @@ var ts;
                 // If the first element is a spread element, then the first argument to __assign is {}:
                 //     { ...o, a, b, ...o2 } => __assign({}, o, {a, b}, o2)
                 var objects = chunkObjectLiteralElements(node.properties);
-                if (objects.length && objects[0].kind !== 188 /* ObjectLiteralExpression */) {
+                if (objects.length && objects[0].kind !== 189 /* ObjectLiteralExpression */) {
                     objects.unshift(ts.createObjectLiteral());
                 }
                 return createAssignHelper(context, objects);
@@ -70955,6 +71797,23 @@ var ts;
             }
             return ts.visitEachChild(node, visitor, context);
         }
+        function visitCatchClause(node) {
+            if (node.variableDeclaration &&
+                ts.isBindingPattern(node.variableDeclaration.name) &&
+                node.variableDeclaration.name.transformFlags & 8192 /* ContainsObjectRestOrSpread */) {
+                var name = ts.getGeneratedNameForNode(node.variableDeclaration.name);
+                var updatedDecl = ts.updateVariableDeclaration(node.variableDeclaration, node.variableDeclaration.name, /*type*/ undefined, name);
+                var visitedBindings = ts.flattenDestructuringBinding(updatedDecl, visitor, context, 1 /* ObjectRest */);
+                var block = ts.visitNode(node.block, visitor, ts.isBlock);
+                if (ts.some(visitedBindings)) {
+                    block = ts.updateBlock(block, [
+                        ts.createVariableStatement(/*modifiers*/ undefined, visitedBindings)
+                    ].concat(block.statements));
+                }
+                return ts.updateCatchClause(node, ts.updateVariableDeclaration(node.variableDeclaration, name, /*type*/ undefined, /*initializer*/ undefined), block);
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
         /**
          * Visits a VariableDeclaration node with a binding pattern.
          *
@@ -71247,17 +72106,17 @@ var ts;
                 enabledSubstitutions |= 1 /* AsyncMethodsWithSuper */;
                 // We need to enable substitutions for call, property access, and element access
                 // if we need to rewrite super calls.
-                context.enableSubstitution(191 /* CallExpression */);
-                context.enableSubstitution(189 /* PropertyAccessExpression */);
-                context.enableSubstitution(190 /* ElementAccessExpression */);
+                context.enableSubstitution(192 /* CallExpression */);
+                context.enableSubstitution(190 /* PropertyAccessExpression */);
+                context.enableSubstitution(191 /* ElementAccessExpression */);
                 // We need to be notified when entering and exiting declarations that bind super.
-                context.enableEmitNotification(240 /* ClassDeclaration */);
-                context.enableEmitNotification(156 /* MethodDeclaration */);
-                context.enableEmitNotification(158 /* GetAccessor */);
-                context.enableEmitNotification(159 /* SetAccessor */);
-                context.enableEmitNotification(157 /* Constructor */);
+                context.enableEmitNotification(241 /* ClassDeclaration */);
+                context.enableEmitNotification(157 /* MethodDeclaration */);
+                context.enableEmitNotification(159 /* GetAccessor */);
+                context.enableEmitNotification(160 /* SetAccessor */);
+                context.enableEmitNotification(158 /* Constructor */);
                 // We need to be notified when entering the generated accessor arrow functions.
-                context.enableEmitNotification(219 /* VariableStatement */);
+                context.enableEmitNotification(220 /* VariableStatement */);
             }
         }
         /**
@@ -71305,23 +72164,23 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return substituteCallExpression(node);
             }
             return node;
         }
         function substitutePropertyAccessExpression(node) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return ts.setTextRange(ts.createPropertyAccess(ts.createFileLevelUniqueName("_super"), node.name), node);
             }
             return node;
         }
         function substituteElementAccessExpression(node) {
-            if (node.expression.kind === 98 /* SuperKeyword */) {
+            if (node.expression.kind === 99 /* SuperKeyword */) {
                 return createSuperElementAccessInAsyncMethod(node.argumentExpression, node);
             }
             return node;
@@ -71341,11 +72200,11 @@ var ts;
         }
         function isSuperContainer(node) {
             var kind = node.kind;
-            return kind === 240 /* ClassDeclaration */
-                || kind === 157 /* Constructor */
-                || kind === 156 /* MethodDeclaration */
-                || kind === 158 /* GetAccessor */
-                || kind === 159 /* SetAccessor */;
+            return kind === 241 /* ClassDeclaration */
+                || kind === 158 /* Constructor */
+                || kind === 157 /* MethodDeclaration */
+                || kind === 159 /* GetAccessor */
+                || kind === 160 /* SetAccessor */;
         }
         function createSuperElementAccessInAsyncMethod(argumentExpression, location) {
             if (enclosingSuperContainerFlags & 4096 /* AsyncMethodWithSuperBinding */) {
@@ -71439,7 +72298,7 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return visitCatchClause(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -71508,13 +72367,13 @@ var ts;
         }
         function visitorWorker(node) {
             switch (node.kind) {
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     return visitJsxElement(node, /*isChild*/ false);
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return visitJsxSelfClosingElement(node, /*isChild*/ false);
-                case 264 /* JsxFragment */:
+                case 265 /* JsxFragment */:
                     return visitJsxFragment(node, /*isChild*/ false);
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return visitJsxExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -71524,13 +72383,13 @@ var ts;
             switch (node.kind) {
                 case 11 /* JsxText */:
                     return visitJsxText(node);
-                case 270 /* JsxExpression */:
+                case 271 /* JsxExpression */:
                     return visitJsxExpression(node);
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     return visitJsxElement(node, /*isChild*/ true);
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     return visitJsxSelfClosingElement(node, /*isChild*/ true);
-                case 264 /* JsxFragment */:
+                case 265 /* JsxFragment */:
                     return visitJsxFragment(node, /*isChild*/ true);
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -71605,7 +72464,7 @@ var ts;
                 literal.singleQuote = node.singleQuote !== undefined ? node.singleQuote : !ts.isStringDoubleQuoted(node, currentSourceFile);
                 return ts.setTextRange(literal, node);
             }
-            else if (node.kind === 270 /* JsxExpression */) {
+            else if (node.kind === 271 /* JsxExpression */) {
                 if (node.expression === undefined) {
                     return ts.createTrue();
                 }
@@ -71699,7 +72558,7 @@ var ts;
             return decoded === text ? undefined : decoded;
         }
         function getTagName(node) {
-            if (node.kind === 260 /* JsxElement */) {
+            if (node.kind === 261 /* JsxElement */) {
                 return getTagName(node.openingElement);
             }
             else {
@@ -72005,7 +72864,7 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return visitBinaryExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -72013,7 +72872,7 @@ var ts;
         }
         function visitBinaryExpression(node) {
             switch (node.operatorToken.kind) {
-                case 63 /* AsteriskAsteriskEqualsToken */:
+                case 64 /* AsteriskAsteriskEqualsToken */:
                     return visitExponentiationAssignmentExpression(node);
                 case 41 /* AsteriskAsteriskToken */:
                     return visitExponentiationExpression(node);
@@ -72098,62 +72957,63 @@ var ts;
         HierarchyFacts[HierarchyFacts["Block"] = 128] = "Block";
         HierarchyFacts[HierarchyFacts["IterationStatement"] = 256] = "IterationStatement";
         HierarchyFacts[HierarchyFacts["IterationStatementBlock"] = 512] = "IterationStatementBlock";
-        HierarchyFacts[HierarchyFacts["ForStatement"] = 1024] = "ForStatement";
-        HierarchyFacts[HierarchyFacts["ForInOrForOfStatement"] = 2048] = "ForInOrForOfStatement";
-        HierarchyFacts[HierarchyFacts["ConstructorWithCapturedSuper"] = 4096] = "ConstructorWithCapturedSuper";
+        HierarchyFacts[HierarchyFacts["IterationContainer"] = 1024] = "IterationContainer";
+        HierarchyFacts[HierarchyFacts["ForStatement"] = 2048] = "ForStatement";
+        HierarchyFacts[HierarchyFacts["ForInOrForOfStatement"] = 4096] = "ForInOrForOfStatement";
+        HierarchyFacts[HierarchyFacts["ConstructorWithCapturedSuper"] = 8192] = "ConstructorWithCapturedSuper";
         // NOTE: do not add more ancestor flags without also updating AncestorFactsMask below.
         // NOTE: when adding a new ancestor flag, be sure to update the subtree flags below.
         //
         // Ancestor masks
         //
-        HierarchyFacts[HierarchyFacts["AncestorFactsMask"] = 8191] = "AncestorFactsMask";
+        HierarchyFacts[HierarchyFacts["AncestorFactsMask"] = 16383] = "AncestorFactsMask";
         // We are always in *some* kind of block scope, but only specific block-scope containers are
         // top-level or Blocks.
         HierarchyFacts[HierarchyFacts["BlockScopeIncludes"] = 0] = "BlockScopeIncludes";
-        HierarchyFacts[HierarchyFacts["BlockScopeExcludes"] = 4032] = "BlockScopeExcludes";
+        HierarchyFacts[HierarchyFacts["BlockScopeExcludes"] = 7104] = "BlockScopeExcludes";
         // A source file is a top-level block scope.
         HierarchyFacts[HierarchyFacts["SourceFileIncludes"] = 64] = "SourceFileIncludes";
-        HierarchyFacts[HierarchyFacts["SourceFileExcludes"] = 3968] = "SourceFileExcludes";
+        HierarchyFacts[HierarchyFacts["SourceFileExcludes"] = 8064] = "SourceFileExcludes";
         // Functions, methods, and accessors are both new lexical scopes and new block scopes.
         HierarchyFacts[HierarchyFacts["FunctionIncludes"] = 65] = "FunctionIncludes";
-        HierarchyFacts[HierarchyFacts["FunctionExcludes"] = 8094] = "FunctionExcludes";
+        HierarchyFacts[HierarchyFacts["FunctionExcludes"] = 16286] = "FunctionExcludes";
         HierarchyFacts[HierarchyFacts["AsyncFunctionBodyIncludes"] = 69] = "AsyncFunctionBodyIncludes";
-        HierarchyFacts[HierarchyFacts["AsyncFunctionBodyExcludes"] = 8086] = "AsyncFunctionBodyExcludes";
+        HierarchyFacts[HierarchyFacts["AsyncFunctionBodyExcludes"] = 16278] = "AsyncFunctionBodyExcludes";
         // Arrow functions are lexically scoped to their container, but are new block scopes.
         HierarchyFacts[HierarchyFacts["ArrowFunctionIncludes"] = 66] = "ArrowFunctionIncludes";
-        HierarchyFacts[HierarchyFacts["ArrowFunctionExcludes"] = 8064] = "ArrowFunctionExcludes";
+        HierarchyFacts[HierarchyFacts["ArrowFunctionExcludes"] = 15232] = "ArrowFunctionExcludes";
         // Constructors are both new lexical scopes and new block scopes. Constructors are also
         // always considered non-static members of a class.
         HierarchyFacts[HierarchyFacts["ConstructorIncludes"] = 73] = "ConstructorIncludes";
-        HierarchyFacts[HierarchyFacts["ConstructorExcludes"] = 8086] = "ConstructorExcludes";
+        HierarchyFacts[HierarchyFacts["ConstructorExcludes"] = 16278] = "ConstructorExcludes";
         // 'do' and 'while' statements are not block scopes. We track that the subtree is contained
         // within an IterationStatement to indicate whether the embedded statement is an
         // IterationStatementBlock.
-        HierarchyFacts[HierarchyFacts["DoOrWhileStatementIncludes"] = 256] = "DoOrWhileStatementIncludes";
+        HierarchyFacts[HierarchyFacts["DoOrWhileStatementIncludes"] = 1280] = "DoOrWhileStatementIncludes";
         HierarchyFacts[HierarchyFacts["DoOrWhileStatementExcludes"] = 0] = "DoOrWhileStatementExcludes";
         // 'for' statements are new block scopes and have special handling for 'let' declarations.
-        HierarchyFacts[HierarchyFacts["ForStatementIncludes"] = 1280] = "ForStatementIncludes";
-        HierarchyFacts[HierarchyFacts["ForStatementExcludes"] = 3008] = "ForStatementExcludes";
+        HierarchyFacts[HierarchyFacts["ForStatementIncludes"] = 3328] = "ForStatementIncludes";
+        HierarchyFacts[HierarchyFacts["ForStatementExcludes"] = 5056] = "ForStatementExcludes";
         // 'for-in' and 'for-of' statements are new block scopes and have special handling for
         // 'let' declarations.
-        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementIncludes"] = 2304] = "ForInOrForOfStatementIncludes";
-        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementExcludes"] = 1984] = "ForInOrForOfStatementExcludes";
+        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementIncludes"] = 5376] = "ForInOrForOfStatementIncludes";
+        HierarchyFacts[HierarchyFacts["ForInOrForOfStatementExcludes"] = 3008] = "ForInOrForOfStatementExcludes";
         // Blocks (other than function bodies) are new block scopes.
         HierarchyFacts[HierarchyFacts["BlockIncludes"] = 128] = "BlockIncludes";
-        HierarchyFacts[HierarchyFacts["BlockExcludes"] = 3904] = "BlockExcludes";
+        HierarchyFacts[HierarchyFacts["BlockExcludes"] = 6976] = "BlockExcludes";
         HierarchyFacts[HierarchyFacts["IterationStatementBlockIncludes"] = 512] = "IterationStatementBlockIncludes";
-        HierarchyFacts[HierarchyFacts["IterationStatementBlockExcludes"] = 4032] = "IterationStatementBlockExcludes";
+        HierarchyFacts[HierarchyFacts["IterationStatementBlockExcludes"] = 7104] = "IterationStatementBlockExcludes";
         //
         // Subtree facts
         //
-        HierarchyFacts[HierarchyFacts["NewTarget"] = 8192] = "NewTarget";
-        HierarchyFacts[HierarchyFacts["CapturedLexicalThis"] = 16384] = "CapturedLexicalThis";
+        HierarchyFacts[HierarchyFacts["NewTarget"] = 16384] = "NewTarget";
+        HierarchyFacts[HierarchyFacts["CapturedLexicalThis"] = 32768] = "CapturedLexicalThis";
         //
         // Subtree masks
         //
-        HierarchyFacts[HierarchyFacts["SubtreeFactsMask"] = -8192] = "SubtreeFactsMask";
+        HierarchyFacts[HierarchyFacts["SubtreeFactsMask"] = -16384] = "SubtreeFactsMask";
         HierarchyFacts[HierarchyFacts["ArrowFunctionSubtreeExcludes"] = 0] = "ArrowFunctionSubtreeExcludes";
-        HierarchyFacts[HierarchyFacts["FunctionSubtreeExcludes"] = 24576] = "FunctionSubtreeExcludes";
+        HierarchyFacts[HierarchyFacts["FunctionSubtreeExcludes"] = 49152] = "FunctionSubtreeExcludes";
     })(HierarchyFacts || (HierarchyFacts = {}));
     function transformES2015(context) {
         var startLexicalEnvironment = context.startLexicalEnvironment, resumeLexicalEnvironment = context.resumeLexicalEnvironment, endLexicalEnvironment = context.endLexicalEnvironment, hoistVariableDeclaration = context.hoistVariableDeclaration;
@@ -72202,7 +73062,7 @@ var ts;
          */
         function enterSubtree(excludeFacts, includeFacts) {
             var ancestorFacts = hierarchyFacts;
-            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & 8191 /* AncestorFactsMask */;
+            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & 16383 /* AncestorFactsMask */;
             return ancestorFacts;
         }
         /**
@@ -72213,17 +73073,17 @@ var ts;
          * @param includeFacts The new `HierarchyFacts` of the subtree that should be propagated.
          */
         function exitSubtree(ancestorFacts, excludeFacts, includeFacts) {
-            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & -8192 /* SubtreeFactsMask */ | ancestorFacts;
+            hierarchyFacts = (hierarchyFacts & ~excludeFacts | includeFacts) & -16384 /* SubtreeFactsMask */ | ancestorFacts;
         }
         function isReturnVoidStatementInConstructorWithCapturedSuper(node) {
-            return (hierarchyFacts & 4096 /* ConstructorWithCapturedSuper */) !== 0
-                && node.kind === 230 /* ReturnStatement */
+            return (hierarchyFacts & 8192 /* ConstructorWithCapturedSuper */) !== 0
+                && node.kind === 231 /* ReturnStatement */
                 && !node.expression;
         }
         function shouldVisitNode(node) {
             return (node.transformFlags & 128 /* ContainsES2015 */) !== 0
                 || convertedLoopState !== undefined
-                || (hierarchyFacts & 4096 /* ConstructorWithCapturedSuper */ && (ts.isStatement(node) || (node.kind === 218 /* Block */)))
+                || (hierarchyFacts & 8192 /* ConstructorWithCapturedSuper */ && (ts.isStatement(node) || (node.kind === 219 /* Block */)))
                 || (ts.isIterationStatement(node, /*lookInLabeledStatements*/ false) && shouldConvertIterationStatement(node))
                 || (ts.getEmitFlags(node) & 33554432 /* TypeScriptClassWrapper */) !== 0;
         }
@@ -72236,72 +73096,72 @@ var ts;
             }
         }
         function callExpressionVisitor(node) {
-            if (node.kind === 98 /* SuperKeyword */) {
+            if (node.kind === 99 /* SuperKeyword */) {
                 return visitSuperKeyword(/*isExpressionOfCall*/ true);
             }
             return visitor(node);
         }
         function visitJavaScript(node) {
             switch (node.kind) {
-                case 116 /* StaticKeyword */:
+                case 117 /* StaticKeyword */:
                     return undefined; // elide static keyword
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     return visitClassExpression(node);
-                case 151 /* Parameter */:
+                case 152 /* Parameter */:
                     return visitParameter(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     return visitArrowFunction(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return visitIdentifier(node);
-                case 238 /* VariableDeclarationList */:
+                case 239 /* VariableDeclarationList */:
                     return visitVariableDeclarationList(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 246 /* CaseBlock */:
+                case 247 /* CaseBlock */:
                     return visitCaseBlock(node);
-                case 218 /* Block */:
+                case 219 /* Block */:
                     return visitBlock(node, /*isFunctionBody*/ false);
-                case 229 /* BreakStatement */:
-                case 228 /* ContinueStatement */:
+                case 230 /* BreakStatement */:
+                case 229 /* ContinueStatement */:
                     return visitBreakOrContinueStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
                     return visitDoOrWhileStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return visitForInStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return visitForOfStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return visitExpressionStatement(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return visitCatchClause(node);
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     return visitShorthandPropertyAssignment(node);
-                case 149 /* ComputedPropertyName */:
+                case 150 /* ComputedPropertyName */:
                     return visitComputedPropertyName(node);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return visitArrayLiteralExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return visitCallExpression(node);
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return visitNewExpression(node);
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return visitParenthesizedExpression(node, /*needsDestructuringValue*/ true);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return visitBinaryExpression(node, /*needsDestructuringValue*/ true);
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 15 /* TemplateHead */:
@@ -72312,35 +73172,35 @@ var ts;
                     return visitStringLiteral(node);
                 case 8 /* NumericLiteral */:
                     return visitNumericLiteral(node);
-                case 193 /* TaggedTemplateExpression */:
+                case 194 /* TaggedTemplateExpression */:
                     return visitTaggedTemplateExpression(node);
-                case 206 /* TemplateExpression */:
+                case 207 /* TemplateExpression */:
                     return visitTemplateExpression(node);
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 208 /* SpreadElement */:
+                case 209 /* SpreadElement */:
                     return visitSpreadElement(node);
-                case 98 /* SuperKeyword */:
+                case 99 /* SuperKeyword */:
                     return visitSuperKeyword(/*isExpressionOfCall*/ false);
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     return visitThisKeyword(node);
-                case 214 /* MetaProperty */:
+                case 215 /* MetaProperty */:
                     return visitMetaProperty(node);
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     return visitMethodDeclaration(node);
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return visitAccessorDeclaration(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return visitReturnStatement(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
             }
         }
         function visitSourceFile(node) {
-            var ancestorFacts = enterSubtree(3968 /* SourceFileExcludes */, 64 /* SourceFileIncludes */);
+            var ancestorFacts = enterSubtree(8064 /* SourceFileExcludes */, 64 /* SourceFileIncludes */);
             var prologue = [];
             var statements = [];
             startLexicalEnvironment();
@@ -72367,7 +73227,7 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitCaseBlock(node) {
-            var ancestorFacts = enterSubtree(4032 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
+            var ancestorFacts = enterSubtree(7104 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
             var updated = ts.visitEachChild(node, visitor, context);
             exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
             return updated;
@@ -72394,7 +73254,7 @@ var ts;
         }
         function visitThisKeyword(node) {
             if (hierarchyFacts & 2 /* ArrowFunction */) {
-                hierarchyFacts |= 16384 /* CapturedLexicalThis */;
+                hierarchyFacts |= 32768 /* CapturedLexicalThis */;
             }
             if (convertedLoopState) {
                 if (hierarchyFacts & 2 /* ArrowFunction */) {
@@ -72424,14 +73284,14 @@ var ts;
                 // it is possible if either
                 //   - break/continue is labeled and label is located inside the converted loop
                 //   - break/continue is non-labeled and located in non-converted loop/switch statement
-                var jump = node.kind === 229 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
+                var jump = node.kind === 230 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
                 var canUseBreakOrContinue = (node.label && convertedLoopState.labels && convertedLoopState.labels.get(ts.idText(node.label))) ||
                     (!node.label && (convertedLoopState.allowedNonLabeledJumps & jump));
                 if (!canUseBreakOrContinue) {
                     var labelMarker = void 0;
                     var label = node.label;
                     if (!label) {
-                        if (node.kind === 229 /* BreakStatement */) {
+                        if (node.kind === 230 /* BreakStatement */) {
                             convertedLoopState.nonLocalJumps |= 2 /* Break */;
                             labelMarker = "break";
                         }
@@ -72442,7 +73302,7 @@ var ts;
                         }
                     }
                     else {
-                        if (node.kind === 229 /* BreakStatement */) {
+                        if (node.kind === 230 /* BreakStatement */) {
                             labelMarker = "break-" + label.escapedText;
                             setLabeledJump(convertedLoopState, /*isBreak*/ true, ts.idText(label), labelMarker);
                         }
@@ -72637,7 +73497,7 @@ var ts;
         function addConstructor(statements, node, extendsClauseElement) {
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8086 /* ConstructorExcludes */, 73 /* ConstructorIncludes */);
+            var ancestorFacts = enterSubtree(16278 /* ConstructorExcludes */, 73 /* ConstructorIncludes */);
             var constructor = ts.getFirstConstructorWithBody(node);
             var hasSynthesizedSuper = hasSynthesizedDefaultSuperCall(constructor, extendsClauseElement !== undefined);
             var constructorFunction = ts.createFunctionDeclaration(
@@ -72651,7 +73511,7 @@ var ts;
                 ts.setEmitFlags(constructorFunction, 8 /* CapturesThis */);
             }
             statements.push(constructorFunction);
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
         }
         /**
@@ -72700,7 +73560,7 @@ var ts;
         function transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper) {
             // determine whether the class is known syntactically to be a derived class (e.g. a
             // class that extends a value that is not syntactically known to be `null`).
-            var isDerivedClass = !!extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 96 /* NullKeyword */;
+            var isDerivedClass = !!extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 97 /* NullKeyword */;
             // When the subclass does not have a constructor, we synthesize a *default* constructor using the following
             // representation:
             //
@@ -72744,7 +73604,7 @@ var ts;
                 }
             }
             if (superCallExpression) {
-                hierarchyFacts |= 4096 /* ConstructorWithCapturedSuper */;
+                hierarchyFacts |= 8192 /* ConstructorWithCapturedSuper */;
                 statementOffset++; // skip this statement, we will add it after visiting the rest of the body.
             }
             // visit the remaining statements
@@ -72838,11 +73698,11 @@ var ts;
          */
         function isSufficientlyCoveredByReturnStatements(statement) {
             // A return statement is considered covered.
-            if (statement.kind === 230 /* ReturnStatement */) {
+            if (statement.kind === 231 /* ReturnStatement */) {
                 return true;
             }
             // An if-statement with two covered branches is covered.
-            else if (statement.kind === 222 /* IfStatement */) {
+            else if (statement.kind === 223 /* IfStatement */) {
                 var ifStatement = statement;
                 if (ifStatement.elseStatement) {
                     return isSufficientlyCoveredByReturnStatements(ifStatement.thenStatement) &&
@@ -72850,7 +73710,7 @@ var ts;
                 }
             }
             // A block is covered if it has a last statement which is covered.
-            else if (statement.kind === 218 /* Block */) {
+            else if (statement.kind === 219 /* Block */) {
                 var lastStatement = ts.lastOrUndefined(statement.statements);
                 if (lastStatement && isSufficientlyCoveredByReturnStatements(lastStatement)) {
                     return true;
@@ -73005,10 +73865,10 @@ var ts;
                 return false;
             }
             // `declarationName` is the name of the local declaration for the parameter.
-            var declarationName = parameter.name.kind === 72 /* Identifier */ ? ts.getMutableClone(parameter.name) : ts.createTempVariable(/*recordTempVariable*/ undefined);
+            var declarationName = parameter.name.kind === 73 /* Identifier */ ? ts.getMutableClone(parameter.name) : ts.createTempVariable(/*recordTempVariable*/ undefined);
             ts.setEmitFlags(declarationName, 48 /* NoSourceMap */);
             // `expressionName` is the name of the parameter used in expressions.
-            var expressionName = parameter.name.kind === 72 /* Identifier */ ? ts.getSynthesizedClone(parameter.name) : declarationName;
+            var expressionName = parameter.name.kind === 73 /* Identifier */ ? ts.getSynthesizedClone(parameter.name) : declarationName;
             var restIndex = node.parameters.length - 1;
             var temp = ts.createLoopVariable();
             // var param = [];
@@ -73032,7 +73892,7 @@ var ts;
             ts.setEmitFlags(forStatement, 1048576 /* CustomPrologue */);
             ts.startOnNewLine(forStatement);
             prologueStatements.push(forStatement);
-            if (parameter.name.kind !== 72 /* Identifier */) {
+            if (parameter.name.kind !== 73 /* Identifier */) {
                 // do the actual destructuring of the rest parameter if necessary
                 prologueStatements.push(ts.setEmitFlags(ts.setTextRange(ts.createVariableStatement(
                 /*modifiers*/ undefined, ts.createVariableDeclarationList(ts.flattenDestructuringBinding(parameter, visitor, context, 0 /* All */, expressionName))), parameter), 1048576 /* CustomPrologue */));
@@ -73048,7 +73908,7 @@ var ts;
          * @param node A node.
          */
         function insertCaptureThisForNodeIfNeeded(statements, node) {
-            if (hierarchyFacts & 16384 /* CapturedLexicalThis */ && node.kind !== 197 /* ArrowFunction */) {
+            if (hierarchyFacts & 32768 /* CapturedLexicalThis */ && node.kind !== 198 /* ArrowFunction */) {
                 insertCaptureThisForNode(statements, node, ts.createThis());
                 return true;
             }
@@ -73066,28 +73926,28 @@ var ts;
             ts.insertStatementAfterCustomPrologue(statements, captureThisStatement);
         }
         function insertCaptureNewTargetIfNeeded(statements, node, copyOnWrite) {
-            if (hierarchyFacts & 8192 /* NewTarget */) {
+            if (hierarchyFacts & 16384 /* NewTarget */) {
                 var newTarget = void 0;
                 switch (node.kind) {
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         return statements;
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         // Methods and accessors cannot be constructors, so 'new.target' will
                         // always return 'undefined'.
                         newTarget = ts.createVoidZero();
                         break;
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         // Class constructors can only be called with `new`, so `this.constructor`
                         // should be relatively safe to use.
                         newTarget = ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), "constructor");
                         break;
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
                         // Functions can be called or constructed, and may have a `this` due to
                         // being a member or when calling an imported function via `other_1.f()`.
-                        newTarget = ts.createConditional(ts.createLogicalAnd(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), ts.createBinary(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), 94 /* InstanceOfKeyword */, ts.getLocalName(node))), ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), "constructor"), ts.createVoidZero());
+                        newTarget = ts.createConditional(ts.createLogicalAnd(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), ts.createBinary(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), 95 /* InstanceOfKeyword */, ts.getLocalName(node))), ts.createPropertyAccess(ts.setEmitFlags(ts.createThis(), 4 /* NoSubstitution */), "constructor"), ts.createVoidZero());
                         break;
                     default:
                         return ts.Debug.failBadSyntaxKind(node);
@@ -73116,20 +73976,20 @@ var ts;
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
                 switch (member.kind) {
-                    case 217 /* SemicolonClassElement */:
+                    case 218 /* SemicolonClassElement */:
                         statements.push(transformSemicolonClassElementToStatement(member));
                         break;
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         statements.push(transformClassMethodDeclarationToStatement(getClassMemberPrefix(node, member), member, node));
                         break;
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         var accessors = ts.getAllAccessorDeclarations(node.members, member);
                         if (member === accessors.firstAccessor) {
                             statements.push(transformAccessorsToStatement(getClassMemberPrefix(node, member), accessors, node));
                         }
                         break;
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         // Constructors are handled in visitClassExpression/visitClassDeclaration
                         break;
                     default:
@@ -73196,7 +74056,7 @@ var ts;
             // arguments are both mapped contiguously to the accessor name.
             var target = ts.getMutableClone(receiver);
             ts.setEmitFlags(target, 1536 /* NoComments */ | 32 /* NoTrailingSourceMap */);
-            ts.setSourceMapRange(target, firstAccessor.name); // TODO: GH#18217
+            ts.setSourceMapRange(target, firstAccessor.name);
             var propertyName = ts.createExpressionForPropertyName(ts.visitNode(firstAccessor.name, visitor, ts.isPropertyName));
             ts.setEmitFlags(propertyName, 1536 /* NoComments */ | 16 /* NoLeadingSourceMap */);
             ts.setSourceMapRange(propertyName, firstAccessor.name);
@@ -73236,11 +74096,11 @@ var ts;
          */
         function visitArrowFunction(node) {
             if (node.transformFlags & 2048 /* ContainsLexicalThis */) {
-                hierarchyFacts |= 16384 /* CapturedLexicalThis */;
+                hierarchyFacts |= 32768 /* CapturedLexicalThis */;
             }
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8064 /* ArrowFunctionExcludes */, 66 /* ArrowFunctionIncludes */);
+            var ancestorFacts = enterSubtree(15232 /* ArrowFunctionExcludes */, 66 /* ArrowFunctionIncludes */);
             var func = ts.createFunctionExpression(
             /*modifiers*/ undefined, 
             /*asteriskToken*/ undefined, 
@@ -73250,7 +74110,7 @@ var ts;
             ts.setTextRange(func, node);
             ts.setOriginalNode(func, node);
             ts.setEmitFlags(func, 8 /* CapturesThis */);
-            if (hierarchyFacts & 16384 /* CapturedLexicalThis */) {
+            if (hierarchyFacts & 32768 /* CapturedLexicalThis */) {
                 enableSubstitutionsForCapturedThis();
             }
             // If an arrow function contains
@@ -73265,16 +74125,16 @@ var ts;
          */
         function visitFunctionExpression(node) {
             var ancestorFacts = ts.getEmitFlags(node) & 262144 /* AsyncFunctionBody */
-                ? enterSubtree(8086 /* AsyncFunctionBodyExcludes */, 69 /* AsyncFunctionBodyIncludes */)
-                : enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+                ? enterSubtree(16278 /* AsyncFunctionBodyExcludes */, 69 /* AsyncFunctionBodyIncludes */)
+                : enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            var name = hierarchyFacts & 8192 /* NewTarget */
+            var name = hierarchyFacts & 16384 /* NewTarget */
                 ? ts.getLocalName(node)
                 : node.name;
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return ts.updateFunctionExpression(node, 
             /*modifiers*/ undefined, node.asteriskToken, name, 
@@ -73289,13 +74149,13 @@ var ts;
         function visitFunctionDeclaration(node) {
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+            var ancestorFacts = enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            var name = hierarchyFacts & 8192 /* NewTarget */
+            var name = hierarchyFacts & 16384 /* NewTarget */
                 ? ts.getLocalName(node)
                 : node.name;
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return ts.updateFunctionDeclaration(node, 
             /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.asteriskToken, name, 
@@ -73313,14 +74173,14 @@ var ts;
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
             var ancestorFacts = container && ts.isClassLike(container) && !ts.hasModifier(node, 32 /* Static */)
-                ? enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */ | 8 /* NonStaticClassElement */)
-                : enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+                ? enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */ | 8 /* NonStaticClassElement */)
+                : enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            if (hierarchyFacts & 8192 /* NewTarget */ && !name && (node.kind === 239 /* FunctionDeclaration */ || node.kind === 196 /* FunctionExpression */)) {
+            if (hierarchyFacts & 16384 /* NewTarget */ && !name && (node.kind === 240 /* FunctionDeclaration */ || node.kind === 197 /* FunctionExpression */)) {
                 name = ts.getGeneratedNameForNode(node);
             }
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return ts.setOriginalNode(ts.setTextRange(ts.createFunctionExpression(
             /*modifiers*/ undefined, node.asteriskToken, name, 
@@ -73361,7 +74221,7 @@ var ts;
                 }
             }
             else {
-                ts.Debug.assert(node.kind === 197 /* ArrowFunction */);
+                ts.Debug.assert(node.kind === 198 /* ArrowFunction */);
                 // To align with the old emitter, we use a synthetic end position on the location
                 // for the statement list we synthesize when we down-level an arrow function with
                 // an expression function body. This prevents both comments and source maps from
@@ -73415,8 +74275,8 @@ var ts;
                 return ts.visitEachChild(node, visitor, context);
             }
             var ancestorFacts = hierarchyFacts & 256 /* IterationStatement */
-                ? enterSubtree(4032 /* IterationStatementBlockExcludes */, 512 /* IterationStatementBlockIncludes */)
-                : enterSubtree(3904 /* BlockExcludes */, 128 /* BlockIncludes */);
+                ? enterSubtree(7104 /* IterationStatementBlockExcludes */, 512 /* IterationStatementBlockIncludes */)
+                : enterSubtree(6976 /* BlockExcludes */, 128 /* BlockIncludes */);
             var updated = ts.visitEachChild(node, visitor, context);
             exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
             return updated;
@@ -73429,9 +74289,9 @@ var ts;
         function visitExpressionStatement(node) {
             // If we are here it is most likely because our expression is a destructuring assignment.
             switch (node.expression.kind) {
-                case 195 /* ParenthesizedExpression */:
+                case 196 /* ParenthesizedExpression */:
                     return ts.updateExpressionStatement(node, visitParenthesizedExpression(node.expression, /*needsDestructuringValue*/ false));
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return ts.updateExpressionStatement(node, visitBinaryExpression(node.expression, /*needsDestructuringValue*/ false));
             }
             return ts.visitEachChild(node, visitor, context);
@@ -73450,9 +74310,9 @@ var ts;
                 // expression. If we are in a state where we do not need the destructuring value,
                 // we pass that information along to the children that care about it.
                 switch (node.expression.kind) {
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return ts.updateParen(node, visitParenthesizedExpression(node.expression, /*needsDestructuringValue*/ false));
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         return ts.updateParen(node, visitBinaryExpression(node.expression, /*needsDestructuringValue*/ false));
                 }
             }
@@ -73487,7 +74347,7 @@ var ts;
                             assignment = ts.flattenDestructuringAssignment(decl, visitor, context, 0 /* All */);
                         }
                         else {
-                            assignment = ts.createBinary(decl.name, 59 /* EqualsToken */, ts.visitNode(decl.initializer, visitor, ts.isExpression));
+                            assignment = ts.createBinary(decl.name, 60 /* EqualsToken */, ts.visitNode(decl.initializer, visitor, ts.isExpression));
                             ts.setTextRange(assignment, decl);
                         }
                         assignments = ts.append(assignments, assignment);
@@ -73599,11 +74459,11 @@ var ts;
                     && isDeclaredInLoop
                     && (hierarchyFacts & 512 /* IterationStatementBlock */) !== 0);
             var emitExplicitInitializer = !emittedAsTopLevel
-                && (hierarchyFacts & 2048 /* ForInOrForOfStatement */) === 0
+                && (hierarchyFacts & 4096 /* ForInOrForOfStatement */) === 0
                 && (!resolver.isDeclarationWithCollidingName(node)
                     || (isDeclaredInLoop
                         && !isCapturedInFunction
-                        && (hierarchyFacts & (1024 /* ForStatement */ | 2048 /* ForInOrForOfStatement */)) === 0));
+                        && (hierarchyFacts & (2048 /* ForStatement */ | 4096 /* ForInOrForOfStatement */)) === 0));
             return emitExplicitInitializer;
         }
         /**
@@ -73661,34 +74521,34 @@ var ts;
         }
         function visitIterationStatement(node, outermostLabeledStatement) {
             switch (node.kind) {
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
                     return visitDoOrWhileStatement(node, outermostLabeledStatement);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node, outermostLabeledStatement);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return visitForInStatement(node, outermostLabeledStatement);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return visitForOfStatement(node, outermostLabeledStatement);
             }
         }
         function visitIterationStatementWithFacts(excludeFacts, includeFacts, node, outermostLabeledStatement, convert) {
             var ancestorFacts = enterSubtree(excludeFacts, includeFacts);
-            var updated = convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, convert);
+            var updated = convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, ancestorFacts, convert);
             exitSubtree(ancestorFacts, 0 /* None */, 0 /* None */);
             return updated;
         }
         function visitDoOrWhileStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(0 /* DoOrWhileStatementExcludes */, 256 /* DoOrWhileStatementIncludes */, node, outermostLabeledStatement);
+            return visitIterationStatementWithFacts(0 /* DoOrWhileStatementExcludes */, 1280 /* DoOrWhileStatementIncludes */, node, outermostLabeledStatement);
         }
         function visitForStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(3008 /* ForStatementExcludes */, 1280 /* ForStatementIncludes */, node, outermostLabeledStatement);
+            return visitIterationStatementWithFacts(5056 /* ForStatementExcludes */, 3328 /* ForStatementIncludes */, node, outermostLabeledStatement);
         }
         function visitForInStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(1984 /* ForInOrForOfStatementExcludes */, 2304 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement);
+            return visitIterationStatementWithFacts(3008 /* ForInOrForOfStatementExcludes */, 5376 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement);
         }
         function visitForOfStatement(node, outermostLabeledStatement) {
-            return visitIterationStatementWithFacts(1984 /* ForInOrForOfStatementExcludes */, 2304 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement, compilerOptions.downlevelIteration ? convertForOfStatementForIterable : convertForOfStatementForArray);
+            return visitIterationStatementWithFacts(3008 /* ForInOrForOfStatementExcludes */, 5376 /* ForInOrForOfStatementIncludes */, node, outermostLabeledStatement, compilerOptions.downlevelIteration ? convertForOfStatementForIterable : convertForOfStatementForArray);
         }
         function convertForOfStatementHead(node, boundValue, convertedLoopBodyStatements) {
             var statements = [];
@@ -73796,7 +74656,7 @@ var ts;
             ts.setTextRange(forStatement, node);
             return ts.restoreEnclosingLabel(forStatement, outermostLabeledStatement, convertedLoopState && resetLabel);
         }
-        function convertForOfStatementForIterable(node, outermostLabeledStatement, convertedLoopBodyStatements) {
+        function convertForOfStatementForIterable(node, outermostLabeledStatement, convertedLoopBodyStatements, ancestorFacts) {
             var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
             var iterator = ts.isIdentifier(expression) ? ts.getGeneratedNameForNode(expression) : ts.createTempVariable(/*recordTempVariable*/ undefined);
             var result = ts.isIdentifier(expression) ? ts.getGeneratedNameForNode(iterator) : ts.createTempVariable(/*recordTempVariable*/ undefined);
@@ -73807,9 +74667,13 @@ var ts;
             var next = ts.createCall(ts.createPropertyAccess(iterator, "next"), /*typeArguments*/ undefined, []);
             hoistVariableDeclaration(errorRecord);
             hoistVariableDeclaration(returnMethod);
+            // if we are enclosed in an outer loop ensure we reset 'errorRecord' per each iteration
+            var initializer = ancestorFacts & 1024 /* IterationContainer */
+                ? ts.inlineExpressions([ts.createAssignment(errorRecord, ts.createVoidZero()), values])
+                : values;
             var forStatement = ts.setEmitFlags(ts.setTextRange(ts.createFor(
             /*initializer*/ ts.setEmitFlags(ts.setTextRange(ts.createVariableDeclarationList([
-                ts.setTextRange(ts.createVariableDeclaration(iterator, /*type*/ undefined, values), node.expression),
+                ts.setTextRange(ts.createVariableDeclaration(iterator, /*type*/ undefined, initializer), node.expression),
                 ts.createVariableDeclaration(result, /*type*/ undefined, next)
             ]), node.expression), 2097152 /* NoHoisting */), 
             /*condition*/ ts.createLogicalNot(ts.createPropertyAccess(result, "done")), 
@@ -73852,7 +74716,7 @@ var ts;
                     && i < numInitialPropertiesWithoutYield) {
                     numInitialPropertiesWithoutYield = i;
                 }
-                if (property.name.kind === 149 /* ComputedPropertyName */) {
+                if (property.name.kind === 150 /* ComputedPropertyName */) {
                     numInitialProperties = i;
                     break;
                 }
@@ -73907,7 +74771,7 @@ var ts;
             }
             visit(node.name);
             function visit(node) {
-                if (node.kind === 72 /* Identifier */) {
+                if (node.kind === 73 /* Identifier */) {
                     state.hoistedLocalVariables.push(node);
                 }
                 else {
@@ -73920,7 +74784,7 @@ var ts;
                 }
             }
         }
-        function convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, convert) {
+        function convertIterationStatementBodyIfNecessary(node, outermostLabeledStatement, ancestorFacts, convert) {
             if (!shouldConvertIterationStatement(node)) {
                 var saveAllowedNonLabeledJumps = void 0;
                 if (convertedLoopState) {
@@ -73930,7 +74794,7 @@ var ts;
                     convertedLoopState.allowedNonLabeledJumps = 2 /* Break */ | 4 /* Continue */;
                 }
                 var result = convert
-                    ? convert(node, outermostLabeledStatement, /*convertedLoopBodyStatements*/ undefined)
+                    ? convert(node, outermostLabeledStatement, /*convertedLoopBodyStatements*/ undefined, ancestorFacts)
                     : ts.restoreEnclosingLabel(ts.visitEachChild(node, visitor, context), outermostLabeledStatement, convertedLoopState && resetLabel);
                 if (convertedLoopState) {
                     convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
@@ -73955,7 +74819,7 @@ var ts;
             var loop;
             if (bodyFunction) {
                 if (convert) {
-                    loop = convert(node, outermostLabeledStatement, bodyFunction.part);
+                    loop = convert(node, outermostLabeledStatement, bodyFunction.part, ancestorFacts);
                 }
                 else {
                     var clone_3 = convertIterationStatementCore(node, initializerFunction, ts.createBlock(bodyFunction.part, /*multiLine*/ true));
@@ -73973,11 +74837,11 @@ var ts;
         }
         function convertIterationStatementCore(node, initializerFunction, convertedLoopBody) {
             switch (node.kind) {
-                case 225 /* ForStatement */: return convertForStatement(node, initializerFunction, convertedLoopBody);
-                case 226 /* ForInStatement */: return convertForInStatement(node, convertedLoopBody);
-                case 227 /* ForOfStatement */: return convertForOfStatement(node, convertedLoopBody);
-                case 223 /* DoStatement */: return convertDoStatement(node, convertedLoopBody);
-                case 224 /* WhileStatement */: return convertWhileStatement(node, convertedLoopBody);
+                case 226 /* ForStatement */: return convertForStatement(node, initializerFunction, convertedLoopBody);
+                case 227 /* ForInStatement */: return convertForInStatement(node, convertedLoopBody);
+                case 228 /* ForOfStatement */: return convertForOfStatement(node, convertedLoopBody);
+                case 224 /* DoStatement */: return convertDoStatement(node, convertedLoopBody);
+                case 225 /* WhileStatement */: return convertWhileStatement(node, convertedLoopBody);
                 default: return ts.Debug.failBadSyntaxKind(node, "IterationStatement expected");
             }
         }
@@ -74002,11 +74866,11 @@ var ts;
         function createConvertedLoopState(node) {
             var loopInitializer;
             switch (node.kind) {
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
                     var initializer = node.initializer;
-                    if (initializer && initializer.kind === 238 /* VariableDeclarationList */) {
+                    if (initializer && initializer.kind === 239 /* VariableDeclarationList */) {
                         loopInitializer = initializer;
                     }
                     break;
@@ -74268,7 +75132,7 @@ var ts;
         function copyOutParameter(outParam, copyDirection) {
             var source = copyDirection === 0 /* ToOriginal */ ? outParam.outParamName : outParam.originalName;
             var target = copyDirection === 0 /* ToOriginal */ ? outParam.originalName : outParam.outParamName;
-            return ts.createBinary(target, 59 /* EqualsToken */, source);
+            return ts.createBinary(target, 60 /* EqualsToken */, source);
         }
         function copyOutParameters(outParams, partFlags, copyDirection, statements) {
             for (var _i = 0, outParams_1 = outParams; _i < outParams_1.length; _i++) {
@@ -74405,20 +75269,20 @@ var ts;
             for (var i = start; i < numProperties; i++) {
                 var property = properties[i];
                 switch (property.kind) {
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         var accessors = ts.getAllAccessorDeclarations(node.properties, property);
                         if (property === accessors.firstAccessor) {
                             expressions.push(transformAccessorsToExpression(receiver, accessors, node, !!node.multiLine));
                         }
                         break;
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         expressions.push(transformObjectLiteralMethodDeclarationToExpression(property, receiver, node, node.multiLine));
                         break;
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         expressions.push(transformPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
-                    case 276 /* ShorthandPropertyAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
                         expressions.push(transformShorthandPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
                     default:
@@ -74473,7 +75337,7 @@ var ts;
             return expression;
         }
         function visitCatchClause(node) {
-            var ancestorFacts = enterSubtree(4032 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
+            var ancestorFacts = enterSubtree(7104 /* BlockScopeExcludes */, 0 /* BlockScopeIncludes */);
             var updated;
             ts.Debug.assert(!!node.variableDeclaration, "Catch clause variable should always be present when downleveling ES2015.");
             if (ts.isBindingPattern(node.variableDeclaration.name)) {
@@ -74521,17 +75385,17 @@ var ts;
             ts.Debug.assert(!ts.isComputedPropertyName(node.name));
             var savedConvertedLoopState = convertedLoopState;
             convertedLoopState = undefined;
-            var ancestorFacts = enterSubtree(8094 /* FunctionExcludes */, 65 /* FunctionIncludes */);
+            var ancestorFacts = enterSubtree(16286 /* FunctionExcludes */, 65 /* FunctionIncludes */);
             var updated;
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            if (node.kind === 158 /* GetAccessor */) {
+            if (node.kind === 159 /* GetAccessor */) {
                 updated = ts.updateGetAccessor(node, node.decorators, node.modifiers, node.name, parameters, node.type, body);
             }
             else {
                 updated = ts.updateSetAccessor(node, node.decorators, node.modifiers, node.name, parameters, body);
             }
-            exitSubtree(ancestorFacts, 24576 /* FunctionSubtreeExcludes */, 0 /* None */);
+            exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
             convertedLoopState = savedConvertedLoopState;
             return updated;
         }
@@ -74578,7 +75442,7 @@ var ts;
                 return visitTypeScriptClassWrapper(node);
             }
             var expression = ts.skipOuterExpressions(node.expression);
-            if (expression.kind === 98 /* SuperKeyword */ ||
+            if (expression.kind === 99 /* SuperKeyword */ ||
                 ts.isSuperProperty(expression) ||
                 ts.some(node.arguments, ts.isSpreadElement)) {
                 return visitCallExpressionWithPotentialCapturedThisAssignment(node, /*assignToCapturedThis*/ true);
@@ -74702,10 +75566,10 @@ var ts;
             // We are here either because SuperKeyword was used somewhere in the expression, or
             // because we contain a SpreadElementExpression.
             if (node.transformFlags & 4096 /* ContainsRestOrSpread */ ||
-                node.expression.kind === 98 /* SuperKeyword */ ||
+                node.expression.kind === 99 /* SuperKeyword */ ||
                 ts.isSuperProperty(ts.skipOuterExpressions(node.expression))) {
                 var _a = ts.createCallBinding(node.expression, hoistVariableDeclaration), target = _a.target, thisArg = _a.thisArg;
-                if (node.expression.kind === 98 /* SuperKeyword */) {
+                if (node.expression.kind === 99 /* SuperKeyword */) {
                     ts.setEmitFlags(thisArg, 4 /* NoSubstitution */);
                 }
                 var resultingCall = void 0;
@@ -74723,7 +75587,7 @@ var ts;
                     //      _super.apply(this, a.concat([b]))
                     //      _super.m.apply(this, a.concat([b]))
                     //      _super.prototype.m.apply(this, a.concat([b]))
-                    resultingCall = ts.createFunctionApply(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 98 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), transformAndSpreadElements(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*hasTrailingComma*/ false));
+                    resultingCall = ts.createFunctionApply(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 99 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), transformAndSpreadElements(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*hasTrailingComma*/ false));
                 }
                 else {
                     // [source]
@@ -74735,10 +75599,10 @@ var ts;
                     //      _super.call(this, a)
                     //      _super.m.call(this, a)
                     //      _super.prototype.m.call(this, a)
-                    resultingCall = ts.createFunctionCall(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 98 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), ts.visitNodes(node.arguments, visitor, ts.isExpression), 
+                    resultingCall = ts.createFunctionCall(ts.visitNode(target, callExpressionVisitor, ts.isExpression), node.expression.kind === 99 /* SuperKeyword */ ? thisArg : ts.visitNode(thisArg, visitor, ts.isExpression), ts.visitNodes(node.arguments, visitor, ts.isExpression), 
                     /*location*/ node);
                 }
-                if (node.expression.kind === 98 /* SuperKeyword */) {
+                if (node.expression.kind === 99 /* SuperKeyword */) {
                     var initializer = ts.createLogicalOr(resultingCall, createActualThis());
                     resultingCall = assignToCapturedThis
                         ? ts.createAssignment(ts.createFileLevelUniqueName("_this"), initializer)
@@ -74801,7 +75665,7 @@ var ts;
             else {
                 if (segments.length === 1) {
                     var firstElement = elements[0];
-                    return needsUniqueCopy && ts.isSpreadElement(firstElement) && firstElement.expression.kind !== 187 /* ArrayLiteralExpression */
+                    return needsUniqueCopy && ts.isSpreadElement(firstElement) && firstElement.expression.kind !== 188 /* ArrayLiteralExpression */
                         ? ts.createArraySlice(segments[0])
                         : segments[0];
                 }
@@ -75016,8 +75880,8 @@ var ts;
                 : ts.createFileLevelUniqueName("_super");
         }
         function visitMetaProperty(node) {
-            if (node.keywordToken === 95 /* NewKeyword */ && node.name.escapedText === "target") {
-                hierarchyFacts |= 8192 /* NewTarget */;
+            if (node.keywordToken === 96 /* NewKeyword */ && node.name.escapedText === "target") {
+                hierarchyFacts |= 16384 /* NewTarget */;
                 return ts.createFileLevelUniqueName("_newTarget");
             }
             return node;
@@ -75032,7 +75896,7 @@ var ts;
         function onEmitNode(hint, node, emitCallback) {
             if (enabledSubstitutions & 1 /* CapturedThis */ && ts.isFunctionLike(node)) {
                 // If we are tracking a captured `this`, keep track of the enclosing function.
-                var ancestorFacts = enterSubtree(8094 /* FunctionExcludes */, ts.getEmitFlags(node) & 8 /* CapturesThis */
+                var ancestorFacts = enterSubtree(16286 /* FunctionExcludes */, ts.getEmitFlags(node) & 8 /* CapturesThis */
                     ? 65 /* FunctionIncludes */ | 16 /* CapturesThis */
                     : 65 /* FunctionIncludes */);
                 previousOnEmitNode(hint, node, emitCallback);
@@ -75048,7 +75912,7 @@ var ts;
         function enableSubstitutionsForBlockScopedBindings() {
             if ((enabledSubstitutions & 2 /* BlockScopedBindings */) === 0) {
                 enabledSubstitutions |= 2 /* BlockScopedBindings */;
-                context.enableSubstitution(72 /* Identifier */);
+                context.enableSubstitution(73 /* Identifier */);
             }
         }
         /**
@@ -75058,14 +75922,14 @@ var ts;
         function enableSubstitutionsForCapturedThis() {
             if ((enabledSubstitutions & 1 /* CapturedThis */) === 0) {
                 enabledSubstitutions |= 1 /* CapturedThis */;
-                context.enableSubstitution(100 /* ThisKeyword */);
-                context.enableEmitNotification(157 /* Constructor */);
-                context.enableEmitNotification(156 /* MethodDeclaration */);
-                context.enableEmitNotification(158 /* GetAccessor */);
-                context.enableEmitNotification(159 /* SetAccessor */);
-                context.enableEmitNotification(197 /* ArrowFunction */);
-                context.enableEmitNotification(196 /* FunctionExpression */);
-                context.enableEmitNotification(239 /* FunctionDeclaration */);
+                context.enableSubstitution(101 /* ThisKeyword */);
+                context.enableEmitNotification(158 /* Constructor */);
+                context.enableEmitNotification(157 /* MethodDeclaration */);
+                context.enableEmitNotification(159 /* GetAccessor */);
+                context.enableEmitNotification(160 /* SetAccessor */);
+                context.enableEmitNotification(198 /* ArrowFunction */);
+                context.enableEmitNotification(197 /* FunctionExpression */);
+                context.enableEmitNotification(240 /* FunctionDeclaration */);
             }
         }
         /**
@@ -75106,10 +75970,10 @@ var ts;
          */
         function isNameOfDeclarationWithCollidingName(node) {
             switch (node.parent.kind) {
-                case 186 /* BindingElement */:
-                case 240 /* ClassDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 237 /* VariableDeclaration */:
+                case 187 /* BindingElement */:
+                case 241 /* ClassDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return node.parent.name === node
                         && resolver.isDeclarationWithCollidingName(node.parent);
             }
@@ -75122,9 +75986,9 @@ var ts;
          */
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     return substituteThisKeyword(node);
             }
             return node;
@@ -75191,19 +76055,19 @@ var ts;
                 return false;
             }
             var statement = ts.firstOrUndefined(constructor.body.statements);
-            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 221 /* ExpressionStatement */) {
+            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 222 /* ExpressionStatement */) {
                 return false;
             }
             var statementExpression = statement.expression;
-            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 191 /* CallExpression */) {
+            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 192 /* CallExpression */) {
                 return false;
             }
             var callTarget = statementExpression.expression;
-            if (!ts.nodeIsSynthesized(callTarget) || callTarget.kind !== 98 /* SuperKeyword */) {
+            if (!ts.nodeIsSynthesized(callTarget) || callTarget.kind !== 99 /* SuperKeyword */) {
                 return false;
             }
             var callArgument = ts.singleOrUndefined(statementExpression.arguments);
-            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 208 /* SpreadElement */) {
+            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 209 /* SpreadElement */) {
                 return false;
             }
             var expression = callArgument.expression;
@@ -75256,15 +76120,15 @@ var ts;
         if (compilerOptions.jsx === 1 /* Preserve */ || compilerOptions.jsx === 3 /* ReactNative */) {
             previousOnEmitNode = context.onEmitNode;
             context.onEmitNode = onEmitNode;
-            context.enableEmitNotification(262 /* JsxOpeningElement */);
-            context.enableEmitNotification(263 /* JsxClosingElement */);
-            context.enableEmitNotification(261 /* JsxSelfClosingElement */);
+            context.enableEmitNotification(263 /* JsxOpeningElement */);
+            context.enableEmitNotification(264 /* JsxClosingElement */);
+            context.enableEmitNotification(262 /* JsxSelfClosingElement */);
             noSubstitution = [];
         }
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableSubstitution(189 /* PropertyAccessExpression */);
-        context.enableSubstitution(275 /* PropertyAssignment */);
+        context.enableSubstitution(190 /* PropertyAccessExpression */);
+        context.enableSubstitution(276 /* PropertyAssignment */);
         return ts.chainBundle(transformSourceFile);
         /**
          * Transforms an ES5 source file to ES3.
@@ -75283,9 +76147,9 @@ var ts;
          */
         function onEmitNode(hint, node, emitCallback) {
             switch (node.kind) {
-                case 262 /* JsxOpeningElement */:
-                case 263 /* JsxClosingElement */:
-                case 261 /* JsxSelfClosingElement */:
+                case 263 /* JsxOpeningElement */:
+                case 264 /* JsxClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     var tagName = node.tagName;
                     noSubstitution[ts.getOriginalNodeId(tagName)] = true;
                     break;
@@ -75342,7 +76206,7 @@ var ts;
          */
         function trySubstituteReservedName(name) {
             var token = name.originalKeywordKind || (ts.nodeIsSynthesized(name) ? ts.stringToToken(ts.idText(name)) : undefined);
-            if (token !== undefined && token >= 73 /* FirstReservedWord */ && token <= 108 /* LastReservedWord */) {
+            if (token !== undefined && token >= 74 /* FirstReservedWord */ && token <= 109 /* LastReservedWord */) {
                 return ts.setTextRange(ts.createLiteral(name), name);
             }
             return undefined;
@@ -75617,13 +76481,13 @@ var ts;
          */
         function visitJavaScriptInStatementContainingYield(node) {
             switch (node.kind) {
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     return visitDoStatement(node);
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     return visitWhileStatement(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return visitLabeledStatement(node);
                 default:
                     return visitJavaScriptInGeneratorFunctionBody(node);
@@ -75636,24 +76500,24 @@ var ts;
          */
         function visitJavaScriptInGeneratorFunctionBody(node) {
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return visitAccessorDeclaration(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return visitForInStatement(node);
-                case 229 /* BreakStatement */:
+                case 230 /* BreakStatement */:
                     return visitBreakStatement(node);
-                case 228 /* ContinueStatement */:
+                case 229 /* ContinueStatement */:
                     return visitContinueStatement(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return visitReturnStatement(node);
                 default:
                     if (node.transformFlags & 131072 /* ContainsYield */) {
@@ -75674,21 +76538,21 @@ var ts;
          */
         function visitJavaScriptContainingYield(node) {
             switch (node.kind) {
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return visitBinaryExpression(node);
-                case 205 /* ConditionalExpression */:
+                case 206 /* ConditionalExpression */:
                     return visitConditionalExpression(node);
-                case 207 /* YieldExpression */:
+                case 208 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return visitArrayLiteralExpression(node);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 190 /* ElementAccessExpression */:
+                case 191 /* ElementAccessExpression */:
                     return visitElementAccessExpression(node);
-                case 191 /* CallExpression */:
+                case 192 /* CallExpression */:
                     return visitCallExpression(node);
-                case 192 /* NewExpression */:
+                case 193 /* NewExpression */:
                     return visitNewExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -75701,9 +76565,9 @@ var ts;
          */
         function visitGenerator(node) {
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 196 /* FunctionExpression */:
+                case 197 /* FunctionExpression */:
                     return visitFunctionExpression(node);
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -75902,23 +76766,23 @@ var ts;
             }
         }
         function isCompoundAssignment(kind) {
-            return kind >= 60 /* FirstCompoundAssignment */
-                && kind <= 71 /* LastCompoundAssignment */;
+            return kind >= 61 /* FirstCompoundAssignment */
+                && kind <= 72 /* LastCompoundAssignment */;
         }
         function getOperatorForCompoundAssignment(kind) {
             switch (kind) {
-                case 60 /* PlusEqualsToken */: return 38 /* PlusToken */;
-                case 61 /* MinusEqualsToken */: return 39 /* MinusToken */;
-                case 62 /* AsteriskEqualsToken */: return 40 /* AsteriskToken */;
-                case 63 /* AsteriskAsteriskEqualsToken */: return 41 /* AsteriskAsteriskToken */;
-                case 64 /* SlashEqualsToken */: return 42 /* SlashToken */;
-                case 65 /* PercentEqualsToken */: return 43 /* PercentToken */;
-                case 66 /* LessThanLessThanEqualsToken */: return 46 /* LessThanLessThanToken */;
-                case 67 /* GreaterThanGreaterThanEqualsToken */: return 47 /* GreaterThanGreaterThanToken */;
-                case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */: return 48 /* GreaterThanGreaterThanGreaterThanToken */;
-                case 69 /* AmpersandEqualsToken */: return 49 /* AmpersandToken */;
-                case 70 /* BarEqualsToken */: return 50 /* BarToken */;
-                case 71 /* CaretEqualsToken */: return 51 /* CaretToken */;
+                case 61 /* PlusEqualsToken */: return 38 /* PlusToken */;
+                case 62 /* MinusEqualsToken */: return 39 /* MinusToken */;
+                case 63 /* AsteriskEqualsToken */: return 40 /* AsteriskToken */;
+                case 64 /* AsteriskAsteriskEqualsToken */: return 41 /* AsteriskAsteriskToken */;
+                case 65 /* SlashEqualsToken */: return 42 /* SlashToken */;
+                case 66 /* PercentEqualsToken */: return 43 /* PercentToken */;
+                case 67 /* LessThanLessThanEqualsToken */: return 46 /* LessThanLessThanToken */;
+                case 68 /* GreaterThanGreaterThanEqualsToken */: return 47 /* GreaterThanGreaterThanToken */;
+                case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */: return 48 /* GreaterThanGreaterThanGreaterThanToken */;
+                case 70 /* AmpersandEqualsToken */: return 49 /* AmpersandToken */;
+                case 71 /* BarEqualsToken */: return 50 /* BarToken */;
+                case 72 /* CaretEqualsToken */: return 51 /* CaretToken */;
             }
         }
         /**
@@ -75931,7 +76795,7 @@ var ts;
             if (containsYield(right)) {
                 var target = void 0;
                 switch (left.kind) {
-                    case 189 /* PropertyAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         // [source]
                         //      a.b = yield;
                         //
@@ -75943,7 +76807,7 @@ var ts;
                         //      _a.b = %sent%;
                         target = ts.updatePropertyAccess(left, cacheExpression(ts.visitNode(left.expression, visitor, ts.isLeftHandSideExpression)), left.name);
                         break;
-                    case 190 /* ElementAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         // [source]
                         //      a[b] = yield;
                         //
@@ -76319,35 +77183,35 @@ var ts;
         }
         function transformAndEmitStatementWorker(node) {
             switch (node.kind) {
-                case 218 /* Block */:
+                case 219 /* Block */:
                     return transformAndEmitBlock(node);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return transformAndEmitExpressionStatement(node);
-                case 222 /* IfStatement */:
+                case 223 /* IfStatement */:
                     return transformAndEmitIfStatement(node);
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     return transformAndEmitDoStatement(node);
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     return transformAndEmitWhileStatement(node);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return transformAndEmitForStatement(node);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return transformAndEmitForInStatement(node);
-                case 228 /* ContinueStatement */:
+                case 229 /* ContinueStatement */:
                     return transformAndEmitContinueStatement(node);
-                case 229 /* BreakStatement */:
+                case 230 /* BreakStatement */:
                     return transformAndEmitBreakStatement(node);
-                case 230 /* ReturnStatement */:
+                case 231 /* ReturnStatement */:
                     return transformAndEmitReturnStatement(node);
-                case 231 /* WithStatement */:
+                case 232 /* WithStatement */:
                     return transformAndEmitWithStatement(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return transformAndEmitSwitchStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return transformAndEmitLabeledStatement(node);
-                case 234 /* ThrowStatement */:
+                case 235 /* ThrowStatement */:
                     return transformAndEmitThrowStatement(node);
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     return transformAndEmitTryStatement(node);
                 default:
                     return emitStatement(ts.visitNode(node, visitor, ts.isStatement));
@@ -76777,7 +77641,7 @@ var ts;
                 for (var i = 0; i < numClauses; i++) {
                     var clause = caseBlock.clauses[i];
                     clauseLabels.push(defineLabel());
-                    if (clause.kind === 272 /* DefaultClause */ && defaultClauseIndex === -1) {
+                    if (clause.kind === 273 /* DefaultClause */ && defaultClauseIndex === -1) {
                         defaultClauseIndex = i;
                     }
                 }
@@ -76790,7 +77654,7 @@ var ts;
                     var defaultClausesSkipped = 0;
                     for (var i = clausesWritten; i < numClauses; i++) {
                         var clause = caseBlock.clauses[i];
-                        if (clause.kind === 271 /* CaseClause */) {
+                        if (clause.kind === 272 /* CaseClause */) {
                             if (containsYield(clause.expression) && pendingClauses.length > 0) {
                                 break;
                             }
@@ -77102,7 +77966,7 @@ var ts;
                 if (!renamedCatchVariables) {
                     renamedCatchVariables = ts.createMap();
                     renamedCatchVariableDeclarations = [];
-                    context.enableSubstitution(72 /* Identifier */);
+                    context.enableSubstitution(73 /* Identifier */);
                 }
                 renamedCatchVariables.set(text, true);
                 renamedCatchVariableDeclarations[ts.getOriginalNodeId(variable)] = name;
@@ -78018,12 +78882,12 @@ var ts;
         var previousOnEmitNode = context.onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         context.onEmitNode = onEmitNode;
-        context.enableSubstitution(72 /* Identifier */); // Substitutes expression identifiers with imported/exported symbols.
-        context.enableSubstitution(204 /* BinaryExpression */); // Substitutes assignments to exported symbols.
-        context.enableSubstitution(202 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableSubstitution(203 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableSubstitution(276 /* ShorthandPropertyAssignment */); // Substitutes shorthand property assignments for imported/exported symbols.
-        context.enableEmitNotification(284 /* SourceFile */); // Restore state when substituting nodes in a file.
+        context.enableSubstitution(73 /* Identifier */); // Substitutes expression identifiers with imported/exported symbols.
+        context.enableSubstitution(205 /* BinaryExpression */); // Substitutes assignments to exported symbols.
+        context.enableSubstitution(203 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(204 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(277 /* ShorthandPropertyAssignment */); // Substitutes shorthand property assignments for imported/exported symbols.
+        context.enableEmitNotification(285 /* SourceFile */); // Restore state when substituting nodes in a file.
         var moduleInfoMap = []; // The ExternalModuleInfo for each file.
         var deferredExports = []; // Exports to defer until an EndOfDeclarationMarker is found.
         var currentSourceFile; // The current file.
@@ -78351,23 +79215,23 @@ var ts;
          */
         function sourceElementVisitor(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return visitExportDeclaration(node);
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return visitExportAssignment(node);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 315 /* MergeDeclarationMarker */:
+                case 316 /* MergeDeclarationMarker */:
                     return visitMergeDeclarationMarker(node);
-                case 316 /* EndOfDeclarationMarker */:
+                case 317 /* EndOfDeclarationMarker */:
                     return visitEndOfDeclarationMarker(node);
                 default:
                     return ts.visitEachChild(node, moduleExpressionElementVisitor, context);
@@ -78394,24 +79258,24 @@ var ts;
                 for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                     var elem = _a[_i];
                     switch (elem.kind) {
-                        case 275 /* PropertyAssignment */:
+                        case 276 /* PropertyAssignment */:
                             if (destructuringNeedsFlattening(elem.initializer)) {
                                 return true;
                             }
                             break;
-                        case 276 /* ShorthandPropertyAssignment */:
+                        case 277 /* ShorthandPropertyAssignment */:
                             if (destructuringNeedsFlattening(elem.name)) {
                                 return true;
                             }
                             break;
-                        case 277 /* SpreadAssignment */:
+                        case 278 /* SpreadAssignment */:
                             if (destructuringNeedsFlattening(elem.expression)) {
                                 return true;
                             }
                             break;
-                        case 156 /* MethodDeclaration */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
+                        case 157 /* MethodDeclaration */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
                             return false;
                         default: ts.Debug.assertNever(elem, "Unhandled object member kind");
                     }
@@ -78889,7 +79753,7 @@ var ts;
             //
             // To balance the declaration, add the exports of the elided variable
             // statement.
-            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 219 /* VariableStatement */) {
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 220 /* VariableStatement */) {
                 var id = ts.getOriginalNodeId(node);
                 deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original);
             }
@@ -78944,10 +79808,10 @@ var ts;
             var namedBindings = importClause.namedBindings;
             if (namedBindings) {
                 switch (namedBindings.kind) {
-                    case 251 /* NamespaceImport */:
+                    case 252 /* NamespaceImport */:
                         statements = appendExportsOfDeclaration(statements, namedBindings);
                         break;
-                    case 252 /* NamedImports */:
+                    case 253 /* NamedImports */:
                         for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
                             var importBinding = _a[_i];
                             statements = appendExportsOfDeclaration(statements, importBinding);
@@ -79129,8 +79993,8 @@ var ts;
         function modifierVisitor(node) {
             // Elide module-specific modifiers.
             switch (node.kind) {
-                case 85 /* ExportKeyword */:
-                case 80 /* DefaultKeyword */:
+                case 86 /* ExportKeyword */:
+                case 81 /* DefaultKeyword */:
                     return undefined;
             }
             return node;
@@ -79146,7 +80010,7 @@ var ts;
          * @param emit A callback used to emit the node in the printer.
          */
         function onEmitNode(hint, node, emitCallback) {
-            if (node.kind === 284 /* SourceFile */) {
+            if (node.kind === 285 /* SourceFile */) {
                 currentSourceFile = node;
                 currentModuleInfo = moduleInfoMap[ts.getOriginalNodeId(currentSourceFile)];
                 noSubstitution = [];
@@ -79208,12 +80072,12 @@ var ts;
          */
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return substituteBinaryExpression(node);
-                case 203 /* PostfixUnaryExpression */:
-                case 202 /* PrefixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
                     return substituteUnaryExpression(node);
             }
             return node;
@@ -79234,7 +80098,7 @@ var ts;
             }
             if (!ts.isGeneratedIdentifier(node) && !ts.isLocalName(node)) {
                 var exportContainer = resolver.getReferencedExportContainer(node, ts.isExportName(node));
-                if (exportContainer && exportContainer.kind === 284 /* SourceFile */) {
+                if (exportContainer && exportContainer.kind === 285 /* SourceFile */) {
                     return ts.setTextRange(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.getSynthesizedClone(node)), 
                     /*location*/ node);
                 }
@@ -79309,8 +80173,8 @@ var ts;
                 && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
                 var exportedNames = getExports(node.operand);
                 if (exportedNames) {
-                    var expression = node.kind === 203 /* PostfixUnaryExpression */
-                        ? ts.setTextRange(ts.createBinary(node.operand, ts.createToken(node.operator === 44 /* PlusPlusToken */ ? 60 /* PlusEqualsToken */ : 61 /* MinusEqualsToken */), ts.createLiteral(1)), 
+                    var expression = node.kind === 204 /* PostfixUnaryExpression */
+                        ? ts.setTextRange(ts.createBinary(node.operand, ts.createToken(node.operator === 44 /* PlusPlusToken */ ? 61 /* PlusEqualsToken */ : 62 /* MinusEqualsToken */), ts.createLiteral(1)), 
                         /*location*/ node)
                         : node;
                     for (var _i = 0, exportedNames_3 = exportedNames; _i < exportedNames_3.length; _i++) {
@@ -79384,12 +80248,12 @@ var ts;
         var previousOnEmitNode = context.onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         context.onEmitNode = onEmitNode;
-        context.enableSubstitution(72 /* Identifier */); // Substitutes expression identifiers for imported symbols.
-        context.enableSubstitution(276 /* ShorthandPropertyAssignment */); // Substitutes expression identifiers for imported symbols
-        context.enableSubstitution(204 /* BinaryExpression */); // Substitutes assignments to exported symbols.
-        context.enableSubstitution(202 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableSubstitution(203 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
-        context.enableEmitNotification(284 /* SourceFile */); // Restore state when substituting nodes in a file.
+        context.enableSubstitution(73 /* Identifier */); // Substitutes expression identifiers for imported symbols.
+        context.enableSubstitution(277 /* ShorthandPropertyAssignment */); // Substitutes expression identifiers for imported symbols
+        context.enableSubstitution(205 /* BinaryExpression */); // Substitutes assignments to exported symbols.
+        context.enableSubstitution(203 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(204 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableEmitNotification(285 /* SourceFile */); // Restore state when substituting nodes in a file.
         var moduleInfoMap = []; // The ExternalModuleInfo for each file.
         var deferredExports = []; // Exports to defer until an EndOfDeclarationMarker is found.
         var exportFunctionsMap = []; // The export function associated with a source file.
@@ -79610,7 +80474,7 @@ var ts;
                 var hasExportDeclarationWithExportClause = false;
                 for (var _i = 0, _a = moduleInfo.externalImports; _i < _a.length; _i++) {
                     var externalImport = _a[_i];
-                    if (externalImport.kind === 255 /* ExportDeclaration */ && externalImport.exportClause) {
+                    if (externalImport.kind === 256 /* ExportDeclaration */ && externalImport.exportClause) {
                         hasExportDeclarationWithExportClause = true;
                         break;
                     }
@@ -79635,7 +80499,7 @@ var ts;
             }
             for (var _d = 0, _e = moduleInfo.externalImports; _d < _e.length; _d++) {
                 var externalImport = _e[_d];
-                if (externalImport.kind !== 255 /* ExportDeclaration */) {
+                if (externalImport.kind !== 256 /* ExportDeclaration */) {
                     continue;
                 }
                 if (!externalImport.exportClause) {
@@ -79713,19 +80577,19 @@ var ts;
                     var entry = _b[_a];
                     var importVariableName = ts.getLocalNameForExternalImport(entry, currentSourceFile); // TODO: GH#18217
                     switch (entry.kind) {
-                        case 249 /* ImportDeclaration */:
+                        case 250 /* ImportDeclaration */:
                             if (!entry.importClause) {
                                 // 'import "..."' case
                                 // module is imported only for side-effects, no emit required
                                 break;
                             }
                         // falls through
-                        case 248 /* ImportEqualsDeclaration */:
+                        case 249 /* ImportEqualsDeclaration */:
                             ts.Debug.assert(importVariableName !== undefined);
                             // save import into the local
                             statements.push(ts.createExpressionStatement(ts.createAssignment(importVariableName, parameterName)));
                             break;
-                        case 255 /* ExportDeclaration */:
+                        case 256 /* ExportDeclaration */:
                             ts.Debug.assert(importVariableName !== undefined);
                             if (entry.exportClause) {
                                 //  export {a, b as c} from 'foo'
@@ -79775,15 +80639,15 @@ var ts;
          */
         function sourceElementVisitor(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 255 /* ExportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     // ExportDeclarations are elided as they are handled via
                     // `appendExportsOfDeclaration`.
                     return undefined;
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return visitExportAssignment(node);
                 default:
                     return nestedElementVisitor(node);
@@ -79959,7 +80823,7 @@ var ts;
         function shouldHoistVariableDeclarationList(node) {
             // hoist only non-block scoped declarations or block scoped declarations parented by source file
             return (ts.getEmitFlags(node) & 2097152 /* NoHoisting */) === 0
-                && (enclosingBlockScopedContainer.kind === 284 /* SourceFile */
+                && (enclosingBlockScopedContainer.kind === 285 /* SourceFile */
                     || (ts.getOriginalNode(node).flags & 3 /* BlockScoped */) === 0);
         }
         /**
@@ -80023,7 +80887,7 @@ var ts;
             //
             // To balance the declaration, we defer the exports of the elided variable
             // statement until we visit this declaration's `EndOfDeclarationMarker`.
-            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 219 /* VariableStatement */) {
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 220 /* VariableStatement */) {
                 var id = ts.getOriginalNodeId(node);
                 var isExportedDeclaration = ts.hasModifier(node.original, 1 /* Export */);
                 deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original, isExportedDeclaration);
@@ -80085,10 +80949,10 @@ var ts;
             var namedBindings = importClause.namedBindings;
             if (namedBindings) {
                 switch (namedBindings.kind) {
-                    case 251 /* NamespaceImport */:
+                    case 252 /* NamespaceImport */:
                         statements = appendExportsOfDeclaration(statements, namedBindings);
                         break;
-                    case 252 /* NamedImports */:
+                    case 253 /* NamedImports */:
                         for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
                             var importBinding = _a[_i];
                             statements = appendExportsOfDeclaration(statements, importBinding);
@@ -80268,43 +81132,43 @@ var ts;
          */
         function nestedElementVisitor(node) {
             switch (node.kind) {
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 225 /* ForStatement */:
+                case 226 /* ForStatement */:
                     return visitForStatement(node);
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                     return visitForInStatement(node);
-                case 227 /* ForOfStatement */:
+                case 228 /* ForOfStatement */:
                     return visitForOfStatement(node);
-                case 223 /* DoStatement */:
+                case 224 /* DoStatement */:
                     return visitDoStatement(node);
-                case 224 /* WhileStatement */:
+                case 225 /* WhileStatement */:
                     return visitWhileStatement(node);
-                case 233 /* LabeledStatement */:
+                case 234 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 231 /* WithStatement */:
+                case 232 /* WithStatement */:
                     return visitWithStatement(node);
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 246 /* CaseBlock */:
+                case 247 /* CaseBlock */:
                     return visitCaseBlock(node);
-                case 271 /* CaseClause */:
+                case 272 /* CaseClause */:
                     return visitCaseClause(node);
-                case 272 /* DefaultClause */:
+                case 273 /* DefaultClause */:
                     return visitDefaultClause(node);
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     return visitTryStatement(node);
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return visitCatchClause(node);
-                case 218 /* Block */:
+                case 219 /* Block */:
                     return visitBlock(node);
-                case 315 /* MergeDeclarationMarker */:
+                case 316 /* MergeDeclarationMarker */:
                     return visitMergeDeclarationMarker(node);
-                case 316 /* EndOfDeclarationMarker */:
+                case 317 /* EndOfDeclarationMarker */:
                     return visitEndOfDeclarationMarker(node);
                 default:
                     return destructuringAndImportCallVisitor(node);
@@ -80551,7 +81415,7 @@ var ts;
             }
             else if (ts.isIdentifier(node)) {
                 var container = resolver.getReferencedExportContainer(node);
-                return container !== undefined && container.kind === 284 /* SourceFile */;
+                return container !== undefined && container.kind === 285 /* SourceFile */;
             }
             else {
                 return false;
@@ -80567,8 +81431,8 @@ var ts;
          */
         function modifierVisitor(node) {
             switch (node.kind) {
-                case 85 /* ExportKeyword */:
-                case 80 /* DefaultKeyword */:
+                case 86 /* ExportKeyword */:
+                case 81 /* DefaultKeyword */:
                     return undefined;
             }
             return node;
@@ -80584,7 +81448,7 @@ var ts;
          * @param emitCallback A callback used to emit the node in the printer.
          */
         function onEmitNode(hint, node, emitCallback) {
-            if (node.kind === 284 /* SourceFile */) {
+            if (node.kind === 285 /* SourceFile */) {
                 var id = ts.getOriginalNodeId(node);
                 currentSourceFile = node;
                 moduleInfo = moduleInfoMap[id];
@@ -80632,7 +81496,7 @@ var ts;
          */
         function substituteUnspecified(node) {
             switch (node.kind) {
-                case 276 /* ShorthandPropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
                     return substituteShorthandPropertyAssignment(node);
             }
             return node;
@@ -80666,12 +81530,12 @@ var ts;
          */
         function substituteExpression(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 204 /* BinaryExpression */:
+                case 205 /* BinaryExpression */:
                     return substituteBinaryExpression(node);
-                case 202 /* PrefixUnaryExpression */:
-                case 203 /* PostfixUnaryExpression */:
+                case 203 /* PrefixUnaryExpression */:
+                case 204 /* PostfixUnaryExpression */:
                     return substituteUnaryExpression(node);
             }
             return node;
@@ -80764,14 +81628,14 @@ var ts;
                 && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
                 var exportedNames = getExports(node.operand);
                 if (exportedNames) {
-                    var expression = node.kind === 203 /* PostfixUnaryExpression */
+                    var expression = node.kind === 204 /* PostfixUnaryExpression */
                         ? ts.setTextRange(ts.createPrefix(node.operator, node.operand), node)
                         : node;
                     for (var _i = 0, exportedNames_5 = exportedNames; _i < exportedNames_5.length; _i++) {
                         var exportName = exportedNames_5[_i];
                         expression = createExportExpression(exportName, preventSubstitution(expression));
                     }
-                    if (node.kind === 203 /* PostfixUnaryExpression */) {
+                    if (node.kind === 204 /* PostfixUnaryExpression */) {
                         expression = node.operator === 44 /* PlusPlusToken */
                             ? ts.createSubtract(preventSubstitution(expression), ts.createLiteral(1))
                             : ts.createAdd(preventSubstitution(expression), ts.createLiteral(1));
@@ -80793,7 +81657,7 @@ var ts;
                     || resolver.getReferencedValueDeclaration(name);
                 if (valueDeclaration) {
                     var exportContainer = resolver.getReferencedExportContainer(name, /*prefixLocals*/ false);
-                    if (exportContainer && exportContainer.kind === 284 /* SourceFile */) {
+                    if (exportContainer && exportContainer.kind === 285 /* SourceFile */) {
                         exportedNames = ts.append(exportedNames, ts.getDeclarationName(valueDeclaration));
                     }
                     exportedNames = ts.addRange(exportedNames, moduleInfo && moduleInfo.exportedBindings[ts.getOriginalNodeId(valueDeclaration)]);
@@ -80832,8 +81696,8 @@ var ts;
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableEmitNotification(284 /* SourceFile */);
-        context.enableSubstitution(72 /* Identifier */);
+        context.enableEmitNotification(285 /* SourceFile */);
+        context.enableSubstitution(73 /* Identifier */);
         var currentSourceFile;
         return ts.chainBundle(transformSourceFile);
         function transformSourceFile(node) {
@@ -80861,10 +81725,10 @@ var ts;
         }
         function visitor(node) {
             switch (node.kind) {
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     // Elide `import=` as it is not legal with --module ES6
                     return undefined;
-                case 254 /* ExportAssignment */:
+                case 255 /* ExportAssignment */:
                     return visitExportAssignment(node);
             }
             return node;
@@ -80972,7 +81836,7 @@ var ts;
                         ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                     ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
             }
-            else if (node.parent.kind === 240 /* ClassDeclaration */) {
+            else if (node.parent.kind === 241 /* ClassDeclaration */) {
                 return symbolAccessibilityResult.errorModuleName ?
                     symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                         ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -81001,7 +81865,7 @@ var ts;
                         ts.Diagnostics.Public_static_method_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                     ts.Diagnostics.Public_static_method_0_of_exported_class_has_or_is_using_private_name_1;
             }
-            else if (node.parent.kind === 240 /* ClassDeclaration */) {
+            else if (node.parent.kind === 241 /* ClassDeclaration */) {
                 return symbolAccessibilityResult.errorModuleName ?
                     symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                         ts.Diagnostics.Public_method_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -81048,7 +81912,7 @@ var ts;
             return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: " + ts.SyntaxKind[node.kind]);
         }
         function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
-            if (node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */) {
+            if (node.kind === 238 /* VariableDeclaration */ || node.kind === 187 /* BindingElement */) {
                 return symbolAccessibilityResult.errorModuleName ?
                     symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                         ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -81057,8 +81921,8 @@ var ts;
             }
             // This check is to ensure we don't report error on constructor parameter property as that error would be reported during parameter emit
             // The only exception here is if the constructor was marked as private. we are not emitting the constructor parameters at all.
-            else if (node.kind === 154 /* PropertyDeclaration */ || node.kind === 189 /* PropertyAccessExpression */ || node.kind === 153 /* PropertySignature */ ||
-                (node.kind === 151 /* Parameter */ && ts.hasModifier(node.parent, 8 /* Private */))) {
+            else if (node.kind === 155 /* PropertyDeclaration */ || node.kind === 190 /* PropertyAccessExpression */ || node.kind === 154 /* PropertySignature */ ||
+                (node.kind === 152 /* Parameter */ && ts.hasModifier(node.parent, 8 /* Private */))) {
                 // TODO(jfreeman): Deal with computed properties in error reporting.
                 if (ts.hasModifier(node, 32 /* Static */)) {
                     return symbolAccessibilityResult.errorModuleName ?
@@ -81067,7 +81931,7 @@ var ts;
                             ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
                 }
-                else if (node.parent.kind === 240 /* ClassDeclaration */ || node.kind === 151 /* Parameter */) {
+                else if (node.parent.kind === 241 /* ClassDeclaration */ || node.kind === 152 /* Parameter */) {
                     return symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -81092,7 +81956,7 @@ var ts;
         }
         function getAccessorDeclarationTypeVisibilityError(symbolAccessibilityResult) {
             var diagnosticMessage;
-            if (node.kind === 159 /* SetAccessor */) {
+            if (node.kind === 160 /* SetAccessor */) {
                 // Getters can infer the return type from the returned expression, but setters cannot, so the
                 // "_from_external_module_1_but_cannot_be_named" case cannot occur.
                 if (ts.hasModifier(node, 32 /* Static */)) {
@@ -81131,26 +81995,26 @@ var ts;
         function getReturnTypeVisibilityError(symbolAccessibilityResult) {
             var diagnosticMessage;
             switch (node.kind) {
-                case 161 /* ConstructSignature */:
+                case 162 /* ConstructSignature */:
                     // Interfaces cannot have return types that cannot be named
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                         ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0;
                     break;
-                case 160 /* CallSignature */:
+                case 161 /* CallSignature */:
                     // Interfaces cannot have return types that cannot be named
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                         ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0;
                     break;
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                     // Interfaces cannot have return types that cannot be named
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
                         ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0;
                     break;
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     if (ts.hasModifier(node, 32 /* Static */)) {
                         diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
@@ -81158,7 +82022,7 @@ var ts;
                                 ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
                             ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0;
                     }
-                    else if (node.parent.kind === 240 /* ClassDeclaration */) {
+                    else if (node.parent.kind === 241 /* ClassDeclaration */) {
                         diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
@@ -81172,7 +82036,7 @@ var ts;
                             ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
                     }
                     break;
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
@@ -81197,30 +82061,30 @@ var ts;
         }
         function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
             switch (node.parent.kind) {
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
                             ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1;
-                case 161 /* ConstructSignature */:
-                case 166 /* ConstructorType */:
+                case 162 /* ConstructSignature */:
+                case 167 /* ConstructorType */:
                     // Interfaces cannot have parameter types that cannot be named
                     return symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
-                case 160 /* CallSignature */:
+                case 161 /* CallSignature */:
                     // Interfaces cannot have parameter types that cannot be named
                     return symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                     // Interfaces cannot have parameter types that cannot be named
                     return symbolAccessibilityResult.errorModuleName ?
                         ts.Diagnostics.Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_index_signature_from_exported_interface_has_or_is_using_private_name_1;
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     if (ts.hasModifier(node.parent, 32 /* Static */)) {
                         return symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
@@ -81228,7 +82092,7 @@ var ts;
                                 ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                     }
-                    else if (node.parent.parent.kind === 240 /* ClassDeclaration */) {
+                    else if (node.parent.parent.kind === 241 /* ClassDeclaration */) {
                         return symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                                 ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -81241,8 +82105,8 @@ var ts;
                             ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
                             ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                     }
-                case 239 /* FunctionDeclaration */:
-                case 165 /* FunctionType */:
+                case 240 /* FunctionDeclaration */:
+                case 166 /* FunctionType */:
                     return symbolAccessibilityResult.errorModuleName ?
                         symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
                             ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
@@ -81256,39 +82120,39 @@ var ts;
             // Type parameter constraints are named by user so we should always be able to name it
             var diagnosticMessage;
             switch (node.parent.kind) {
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_class_has_or_is_using_private_name_1;
                     break;
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 181 /* MappedType */:
+                case 182 /* MappedType */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1;
                     break;
-                case 166 /* ConstructorType */:
-                case 161 /* ConstructSignature */:
+                case 167 /* ConstructorType */:
+                case 162 /* ConstructSignature */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 160 /* CallSignature */:
+                case 161 /* CallSignature */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                     if (ts.hasModifier(node.parent, 32 /* Static */)) {
                         diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
                     }
-                    else if (node.parent.parent.kind === 240 /* ClassDeclaration */) {
+                    else if (node.parent.parent.kind === 241 /* ClassDeclaration */) {
                         diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
                     }
                     else {
                         diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
                     }
                     break;
-                case 165 /* FunctionType */:
-                case 239 /* FunctionDeclaration */:
+                case 166 /* FunctionType */:
+                case 240 /* FunctionDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_function_has_or_is_using_private_name_1;
                     break;
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1;
                     break;
                 default:
@@ -81303,9 +82167,9 @@ var ts;
         function getHeritageClauseVisibilityError() {
             var diagnosticMessage;
             // Heritage clause is written by user so it can always be named
-            if (node.parent.parent.kind === 240 /* ClassDeclaration */) {
+            if (node.parent.parent.kind === 241 /* ClassDeclaration */) {
                 // Class or Interface implemented/extended is inaccessible
-                diagnosticMessage = ts.isHeritageClause(node.parent) && node.parent.token === 109 /* ImplementsKeyword */ ?
+                diagnosticMessage = ts.isHeritageClause(node.parent) && node.parent.token === 110 /* ImplementsKeyword */ ?
                     ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 :
                     ts.Diagnostics.extends_clause_of_exported_class_0_has_or_is_using_private_name_1;
             }
@@ -81354,7 +82218,7 @@ var ts;
     }
     function isInternalDeclaration(node, currentSourceFile) {
         var parseTreeNode = ts.getParseTreeNode(node);
-        if (parseTreeNode && parseTreeNode.kind === 151 /* Parameter */) {
+        if (parseTreeNode && parseTreeNode.kind === 152 /* Parameter */) {
             var paramIdx = parseTreeNode.parent.parameters.indexOf(parseTreeNode);
             var previousSibling = paramIdx > 0 ? parseTreeNode.parent.parameters[paramIdx - 1] : undefined;
             var text = currentSourceFile.text;
@@ -81501,10 +82365,10 @@ var ts;
             }
         }
         function transformRoot(node) {
-            if (node.kind === 284 /* SourceFile */ && (node.isDeclarationFile || ts.isSourceFileJS(node))) {
+            if (node.kind === 285 /* SourceFile */ && (node.isDeclarationFile || ts.isSourceFileJS(node))) {
                 return node;
             }
-            if (node.kind === 285 /* Bundle */) {
+            if (node.kind === 286 /* Bundle */) {
                 isBundledEmit = true;
                 refs = ts.createMap();
                 libs = ts.createMap();
@@ -81527,14 +82391,14 @@ var ts;
                         resultHasExternalModuleIndicator = false; // unused in external module bundle emit (all external modules are within module blocks, therefore are known to be modules)
                         needsDeclare = false;
                         var statements_4 = ts.visitNodes(sourceFile.statements, visitDeclarationStatements);
-                        var newFile = ts.updateSourceFileNode(sourceFile, [ts.createModuleDeclaration([], [ts.createModifier(125 /* DeclareKeyword */)], ts.createLiteral(ts.getResolvedExternalModuleName(context.getEmitHost(), sourceFile)), ts.createModuleBlock(ts.setTextRange(ts.createNodeArray(transformAndReplaceLatePaintedStatements(statements_4)), sourceFile.statements)))], /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []);
+                        var newFile = ts.updateSourceFileNode(sourceFile, [ts.createModuleDeclaration([], [ts.createModifier(126 /* DeclareKeyword */)], ts.createLiteral(ts.getResolvedExternalModuleName(context.getEmitHost(), sourceFile)), ts.createModuleBlock(ts.setTextRange(ts.createNodeArray(transformAndReplaceLatePaintedStatements(statements_4)), sourceFile.statements)))], /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []);
                         return newFile;
                     }
                     needsDeclare = true;
                     var updated = ts.visitNodes(sourceFile.statements, visitDeclarationStatements);
                     return ts.updateSourceFileNode(sourceFile, transformAndReplaceLatePaintedStatements(updated), /*isDeclarationFile*/ true, /*referencedFiles*/ [], /*typeReferences*/ [], /*hasNoDefaultLib*/ false, /*libReferences*/ []);
                 }), ts.mapDefined(node.prepends, function (prepend) {
-                    if (prepend.kind === 287 /* InputFiles */) {
+                    if (prepend.kind === 288 /* InputFiles */) {
                         var sourceFile = ts.createUnparsedSourceFile(prepend, "dts", stripInternal);
                         hasNoDefaultLib_1 = hasNoDefaultLib_1 || !!sourceFile.hasNoDefaultLib;
                         collectReferences(sourceFile, refs);
@@ -81654,11 +82518,11 @@ var ts;
             return ret;
         }
         function filterBindingPatternInitializers(name) {
-            if (name.kind === 72 /* Identifier */) {
+            if (name.kind === 73 /* Identifier */) {
                 return name;
             }
             else {
-                if (name.kind === 185 /* ArrayBindingPattern */) {
+                if (name.kind === 186 /* ArrayBindingPattern */) {
                     return ts.updateArrayBindingPattern(name, ts.visitNodes(name.elements, visitBindingElement));
                 }
                 else {
@@ -81666,7 +82530,7 @@ var ts;
                 }
             }
             function visitBindingElement(elem) {
-                if (elem.kind === 210 /* OmittedExpression */) {
+                if (elem.kind === 211 /* OmittedExpression */) {
                     return elem;
                 }
                 return ts.updateBindingElement(elem, elem.dotDotDotToken, elem.propertyName, filterBindingPatternInitializers(elem.name), shouldPrintWithInitializer(elem) ? elem.initializer : undefined);
@@ -81704,19 +82568,19 @@ var ts;
                 // Literal const declarations will have an initializer ensured rather than a type
                 return;
             }
-            var shouldUseResolverType = node.kind === 151 /* Parameter */ &&
+            var shouldUseResolverType = node.kind === 152 /* Parameter */ &&
                 (resolver.isRequiredInitializedParameter(node) ||
                     resolver.isOptionalUninitializedParameterProperty(node));
             if (type && !shouldUseResolverType) {
                 return ts.visitNode(type, visitDeclarationSubtree);
             }
             if (!ts.getParseTreeNode(node)) {
-                return type ? ts.visitNode(type, visitDeclarationSubtree) : ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                return type ? ts.visitNode(type, visitDeclarationSubtree) : ts.createKeywordTypeNode(121 /* AnyKeyword */);
             }
-            if (node.kind === 159 /* SetAccessor */) {
+            if (node.kind === 160 /* SetAccessor */) {
                 // Set accessors with no associated type node (from it's param or get accessor return) are `any` since they are never contextually typed right now
                 // (The inferred type here will be void, but the old declaration emitter printed `any`, so this replicates that)
-                return ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                return ts.createKeywordTypeNode(121 /* AnyKeyword */);
             }
             errorNameNode = node.name;
             var oldDiag;
@@ -81724,12 +82588,12 @@ var ts;
                 oldDiag = getSymbolAccessibilityDiagnostic;
                 getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(node);
             }
-            if (node.kind === 237 /* VariableDeclaration */ || node.kind === 186 /* BindingElement */) {
+            if (node.kind === 238 /* VariableDeclaration */ || node.kind === 187 /* BindingElement */) {
                 return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker));
             }
-            if (node.kind === 151 /* Parameter */
-                || node.kind === 154 /* PropertyDeclaration */
-                || node.kind === 153 /* PropertySignature */) {
+            if (node.kind === 152 /* Parameter */
+                || node.kind === 155 /* PropertyDeclaration */
+                || node.kind === 154 /* PropertySignature */) {
                 if (!node.initializer)
                     return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker, shouldUseResolverType));
                 return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker, shouldUseResolverType) || resolver.createTypeOfExpression(node.initializer, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker));
@@ -81740,26 +82604,26 @@ var ts;
                 if (!suppressNewDiagnosticContexts) {
                     getSymbolAccessibilityDiagnostic = oldDiag;
                 }
-                return returnValue || ts.createKeywordTypeNode(120 /* AnyKeyword */);
+                return returnValue || ts.createKeywordTypeNode(121 /* AnyKeyword */);
             }
         }
         function isDeclarationAndNotVisible(node) {
             node = ts.getParseTreeNode(node);
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 243 /* EnumDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return !resolver.isDeclarationVisible(node);
                 // The following should be doing their own visibility checks based on filtering their members
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return !getBindingNameVisible(node);
-                case 248 /* ImportEqualsDeclaration */:
-                case 249 /* ImportDeclaration */:
-                case 255 /* ExportDeclaration */:
-                case 254 /* ExportAssignment */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 250 /* ImportDeclaration */:
+                case 256 /* ExportDeclaration */:
+                case 255 /* ExportAssignment */:
                     return false;
             }
             return false;
@@ -81813,7 +82677,7 @@ var ts;
         function rewriteModuleSpecifier(parent, input) {
             if (!input)
                 return undefined; // TODO: GH#18217
-            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || (parent.kind !== 244 /* ModuleDeclaration */ && parent.kind !== 183 /* ImportType */);
+            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || (parent.kind !== 245 /* ModuleDeclaration */ && parent.kind !== 184 /* ImportType */);
             if (ts.isStringLiteralLike(input)) {
                 if (isBundledEmit) {
                     var newName = ts.getExternalModuleNameFromDeclaration(context.getEmitHost(), resolver, parent);
@@ -81833,7 +82697,7 @@ var ts;
         function transformImportEqualsDeclaration(decl) {
             if (!resolver.isDeclarationVisible(decl))
                 return;
-            if (decl.moduleReference.kind === 259 /* ExternalModuleReference */) {
+            if (decl.moduleReference.kind === 260 /* ExternalModuleReference */) {
                 // Rewrite external module names if necessary
                 var specifier = ts.getExternalModuleImportEqualsDeclarationExpression(decl);
                 return ts.updateImportEqualsDeclaration(decl, 
@@ -81860,7 +82724,7 @@ var ts;
                 return visibleDefaultBinding && ts.updateImportDeclaration(decl, /*decorators*/ undefined, decl.modifiers, ts.updateImportClause(decl.importClause, visibleDefaultBinding, 
                 /*namedBindings*/ undefined), rewriteModuleSpecifier(decl, decl.moduleSpecifier));
             }
-            if (decl.importClause.namedBindings.kind === 251 /* NamespaceImport */) {
+            if (decl.importClause.namedBindings.kind === 252 /* NamespaceImport */) {
                 // Namespace import (optionally with visible default)
                 var namedBindings = resolver.isDeclarationVisible(decl.importClause.namedBindings) ? decl.importClause.namedBindings : /*namedBindings*/ undefined;
                 return visibleDefaultBinding || namedBindings ? ts.updateImportDeclaration(decl, /*decorators*/ undefined, decl.modifiers, ts.updateImportClause(decl.importClause, visibleDefaultBinding, namedBindings), rewriteModuleSpecifier(decl, decl.moduleSpecifier)) : undefined;
@@ -81968,68 +82832,68 @@ var ts;
                 checkEntityNameVisibility(input.exprName, enclosingDeclaration);
             }
             var oldWithinObjectLiteralType = suppressNewDiagnosticContexts;
-            var shouldEnterSuppressNewDiagnosticsContextContext = ((input.kind === 168 /* TypeLiteral */ || input.kind === 181 /* MappedType */) && input.parent.kind !== 242 /* TypeAliasDeclaration */);
+            var shouldEnterSuppressNewDiagnosticsContextContext = ((input.kind === 169 /* TypeLiteral */ || input.kind === 182 /* MappedType */) && input.parent.kind !== 243 /* TypeAliasDeclaration */);
             if (shouldEnterSuppressNewDiagnosticsContextContext) {
                 // We stop making new diagnostic contexts within object literal types. Unless it's an object type on the RHS of a type alias declaration. Then we do.
                 suppressNewDiagnosticContexts = true;
             }
             if (isProcessedComponent(input)) {
                 switch (input.kind) {
-                    case 211 /* ExpressionWithTypeArguments */: {
+                    case 212 /* ExpressionWithTypeArguments */: {
                         if ((ts.isEntityName(input.expression) || ts.isEntityNameExpression(input.expression))) {
                             checkEntityNameVisibility(input.expression, enclosingDeclaration);
                         }
                         var node = ts.visitEachChild(input, visitDeclarationSubtree, context);
                         return cleanup(ts.updateExpressionWithTypeArguments(node, ts.parenthesizeTypeParameters(node.typeArguments), node.expression));
                     }
-                    case 164 /* TypeReference */: {
+                    case 165 /* TypeReference */: {
                         checkEntityNameVisibility(input.typeName, enclosingDeclaration);
                         var node = ts.visitEachChild(input, visitDeclarationSubtree, context);
                         return cleanup(ts.updateTypeReferenceNode(node, node.typeName, ts.parenthesizeTypeParameters(node.typeArguments)));
                     }
-                    case 161 /* ConstructSignature */:
+                    case 162 /* ConstructSignature */:
                         return cleanup(ts.updateConstructSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type)));
-                    case 157 /* Constructor */: {
+                    case 158 /* Constructor */: {
                         var isPrivate = ts.hasModifier(input, 8 /* Private */);
                         // A constructor declaration may not have a type annotation
-                        var ctor = ts.createSignatureDeclaration(157 /* Constructor */, isPrivate ? undefined : ensureTypeParams(input, input.typeParameters), 
+                        var ctor = ts.createSignatureDeclaration(158 /* Constructor */, isPrivate ? undefined : ensureTypeParams(input, input.typeParameters), 
                         // TODO: GH#18217
                         isPrivate ? undefined : updateParamsList(input, input.parameters, 0 /* None */), 
                         /*type*/ undefined);
                         ctor.modifiers = ts.createNodeArray(ensureModifiers(input));
                         return cleanup(ctor);
                     }
-                    case 156 /* MethodDeclaration */: {
-                        var sig = ts.createSignatureDeclaration(155 /* MethodSignature */, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type));
+                    case 157 /* MethodDeclaration */: {
+                        var sig = ts.createSignatureDeclaration(156 /* MethodSignature */, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type));
                         sig.name = input.name;
                         sig.modifiers = ts.createNodeArray(ensureModifiers(input));
                         sig.questionToken = input.questionToken;
                         return cleanup(sig);
                     }
-                    case 158 /* GetAccessor */: {
+                    case 159 /* GetAccessor */: {
                         var newNode = ensureAccessor(input);
                         return cleanup(newNode);
                     }
-                    case 159 /* SetAccessor */: {
+                    case 160 /* SetAccessor */: {
                         var newNode = ensureAccessor(input);
                         return cleanup(newNode);
                     }
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         return cleanup(ts.updateProperty(input, 
                         /*decorators*/ undefined, ensureModifiers(input), input.name, input.questionToken, !ts.hasModifier(input, 8 /* Private */) ? ensureType(input, input.type) : undefined, ensureNoInitializer(input)));
-                    case 153 /* PropertySignature */:
+                    case 154 /* PropertySignature */:
                         return cleanup(ts.updatePropertySignature(input, ensureModifiers(input), input.name, input.questionToken, !ts.hasModifier(input, 8 /* Private */) ? ensureType(input, input.type) : undefined, ensureNoInitializer(input)));
-                    case 155 /* MethodSignature */: {
+                    case 156 /* MethodSignature */: {
                         return cleanup(ts.updateMethodSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type), input.name, input.questionToken));
                     }
-                    case 160 /* CallSignature */: {
+                    case 161 /* CallSignature */: {
                         return cleanup(ts.updateCallSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type)));
                     }
-                    case 162 /* IndexSignature */: {
+                    case 163 /* IndexSignature */: {
                         return cleanup(ts.updateIndexSignature(input, 
-                        /*decorators*/ undefined, ensureModifiers(input), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree) || ts.createKeywordTypeNode(120 /* AnyKeyword */)));
+                        /*decorators*/ undefined, ensureModifiers(input), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree) || ts.createKeywordTypeNode(121 /* AnyKeyword */)));
                     }
-                    case 237 /* VariableDeclaration */: {
+                    case 238 /* VariableDeclaration */: {
                         if (ts.isBindingPattern(input.name)) {
                             return recreateBindingPattern(input.name);
                         }
@@ -82037,13 +82901,13 @@ var ts;
                         suppressNewDiagnosticContexts = true; // Variable declaration types also suppress new diagnostic contexts, provided the contexts wouldn't be made for binding pattern types
                         return cleanup(ts.updateVariableDeclaration(input, input.name, ensureType(input, input.type), ensureNoInitializer(input)));
                     }
-                    case 150 /* TypeParameter */: {
+                    case 151 /* TypeParameter */: {
                         if (isPrivateMethodTypeParameter(input) && (input.default || input.constraint)) {
                             return cleanup(ts.updateTypeParameterDeclaration(input, input.name, /*constraint*/ undefined, /*defaultType*/ undefined));
                         }
                         return cleanup(ts.visitEachChild(input, visitDeclarationSubtree, context));
                     }
-                    case 175 /* ConditionalType */: {
+                    case 176 /* ConditionalType */: {
                         // We have to process conditional types in a special way because for visibility purposes we need to push a new enclosingDeclaration
                         // just for the `infer` types in the true branch. It's an implicit declaration scope that only applies to _part_ of the type.
                         var checkType = ts.visitNode(input.checkType, visitDeclarationSubtree);
@@ -82055,13 +82919,13 @@ var ts;
                         var falseType = ts.visitNode(input.falseType, visitDeclarationSubtree);
                         return cleanup(ts.updateConditionalTypeNode(input, checkType, extendsType, trueType, falseType));
                     }
-                    case 165 /* FunctionType */: {
+                    case 166 /* FunctionType */: {
                         return cleanup(ts.updateFunctionTypeNode(input, ts.visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree)));
                     }
-                    case 166 /* ConstructorType */: {
+                    case 167 /* ConstructorType */: {
                         return cleanup(ts.updateConstructorTypeNode(input, ts.visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree)));
                     }
-                    case 183 /* ImportType */: {
+                    case 184 /* ImportType */: {
                         if (!ts.isLiteralImportTypeNode(input))
                             return cleanup(input);
                         return cleanup(ts.updateImportTypeNode(input, ts.updateLiteralTypeNode(input.argument, rewriteModuleSpecifier(input, input.argument.literal)), input.qualifier, ts.visitNodes(input.typeArguments, visitDeclarationSubtree, ts.isTypeNode), input.isTypeOf));
@@ -82090,7 +82954,7 @@ var ts;
             }
         }
         function isPrivateMethodTypeParameter(node) {
-            return node.parent.kind === 156 /* MethodDeclaration */ && ts.hasModifier(node.parent, 8 /* Private */);
+            return node.parent.kind === 157 /* MethodDeclaration */ && ts.hasModifier(node.parent, 8 /* Private */);
         }
         function visitDeclarationStatements(input) {
             if (!isPreservedDeclarationStatement(input)) {
@@ -82100,7 +82964,7 @@ var ts;
             if (shouldStripInternal(input))
                 return;
             switch (input.kind) {
-                case 255 /* ExportDeclaration */: {
+                case 256 /* ExportDeclaration */: {
                     if (ts.isSourceFile(input.parent)) {
                         resultHasExternalModuleIndicator = true;
                         resultHasScopeMarker = true;
@@ -82109,13 +82973,13 @@ var ts;
                     // Rewrite external module names if necessary
                     return ts.updateExportDeclaration(input, /*decorators*/ undefined, input.modifiers, input.exportClause, rewriteModuleSpecifier(input, input.moduleSpecifier));
                 }
-                case 254 /* ExportAssignment */: {
+                case 255 /* ExportAssignment */: {
                     // Always visible if the parent node isn't dropped for being not visible
                     if (ts.isSourceFile(input.parent)) {
                         resultHasExternalModuleIndicator = true;
                         resultHasScopeMarker = true;
                     }
-                    if (input.expression.kind === 72 /* Identifier */) {
+                    if (input.expression.kind === 73 /* Identifier */) {
                         return input;
                     }
                     else {
@@ -82125,7 +82989,7 @@ var ts;
                             errorNode: input
                         }); };
                         var varDecl = ts.createVariableDeclaration(newId, resolver.createTypeOfExpression(input.expression, input, declarationEmitNodeBuilderFlags, symbolTracker), /*initializer*/ undefined);
-                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(125 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
+                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(126 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
                         return [statement, ts.updateExportAssignment(input, input.decorators, input.modifiers, newId)];
                     }
                 }
@@ -82139,10 +83003,10 @@ var ts;
             if (shouldStripInternal(input))
                 return;
             switch (input.kind) {
-                case 248 /* ImportEqualsDeclaration */: {
+                case 249 /* ImportEqualsDeclaration */: {
                     return transformImportEqualsDeclaration(input);
                 }
-                case 249 /* ImportDeclaration */: {
+                case 250 /* ImportDeclaration */: {
                     return transformImportDeclaration(input);
                 }
             }
@@ -82163,41 +83027,63 @@ var ts;
             }
             var previousNeedsDeclare = needsDeclare;
             switch (input.kind) {
-                case 242 /* TypeAliasDeclaration */: // Type aliases get `declare`d if need be (for legacy support), but that's all
+                case 243 /* TypeAliasDeclaration */: // Type aliases get `declare`d if need be (for legacy support), but that's all
                     return cleanup(ts.updateTypeAliasDeclaration(input, 
                     /*decorators*/ undefined, ensureModifiers(input, isPrivate), input.name, ts.visitNodes(input.typeParameters, visitDeclarationSubtree, ts.isTypeParameterDeclaration), ts.visitNode(input.type, visitDeclarationSubtree, ts.isTypeNode)));
-                case 241 /* InterfaceDeclaration */: {
+                case 242 /* InterfaceDeclaration */: {
                     return cleanup(ts.updateInterfaceDeclaration(input, 
                     /*decorators*/ undefined, ensureModifiers(input, isPrivate), input.name, ensureTypeParams(input, input.typeParameters), transformHeritageClauses(input.heritageClauses), ts.visitNodes(input.members, visitDeclarationSubtree)));
                 }
-                case 239 /* FunctionDeclaration */: {
+                case 240 /* FunctionDeclaration */: {
                     // Generators lose their generator-ness, excepting their return type
                     var clean = cleanup(ts.updateFunctionDeclaration(input, 
                     /*decorators*/ undefined, ensureModifiers(input, isPrivate), 
                     /*asteriskToken*/ undefined, input.name, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type), 
                     /*body*/ undefined));
                     if (clean && resolver.isExpandoFunctionDeclaration(input)) {
-                        var declarations = ts.mapDefined(resolver.getPropertiesOfContainerFunction(input), function (p) {
+                        var props = resolver.getPropertiesOfContainerFunction(input);
+                        var fakespace_1 = ts.createModuleDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, clean.name || ts.createIdentifier("_default"), ts.createModuleBlock([]), 16 /* Namespace */);
+                        fakespace_1.flags ^= 8 /* Synthesized */; // unset synthesized so it is usable as an enclosing declaration
+                        fakespace_1.parent = enclosingDeclaration;
+                        fakespace_1.locals = ts.createSymbolTable(props);
+                        fakespace_1.symbol = props[0].parent;
+                        var declarations = ts.mapDefined(props, function (p) {
                             if (!ts.isPropertyAccessExpression(p.valueDeclaration)) {
                                 return undefined;
                             }
                             getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(p.valueDeclaration);
-                            var type = resolver.createTypeOfDeclaration(p.valueDeclaration, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker);
+                            var type = resolver.createTypeOfDeclaration(p.valueDeclaration, fakespace_1, declarationEmitNodeBuilderFlags, symbolTracker);
                             getSymbolAccessibilityDiagnostic = oldDiag;
                             var varDecl = ts.createVariableDeclaration(ts.unescapeLeadingUnderscores(p.escapedName), type, /*initializer*/ undefined);
                             return ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList([varDecl]));
                         });
                         var namespaceDecl = ts.createModuleDeclaration(/*decorators*/ undefined, ensureModifiers(input, isPrivate), input.name, ts.createModuleBlock(declarations), 16 /* Namespace */);
-                        return [clean, namespaceDecl];
+                        if (!ts.hasModifier(clean, 512 /* Default */)) {
+                            return [clean, namespaceDecl];
+                        }
+                        var modifiers = ts.createModifiersFromModifierFlags((ts.getModifierFlags(clean) & ~513 /* ExportDefault */) | 2 /* Ambient */);
+                        var cleanDeclaration = ts.updateFunctionDeclaration(clean, 
+                        /*decorators*/ undefined, modifiers, 
+                        /*asteriskToken*/ undefined, clean.name, clean.typeParameters, clean.parameters, clean.type, 
+                        /*body*/ undefined);
+                        var namespaceDeclaration = ts.updateModuleDeclaration(namespaceDecl, 
+                        /*decorators*/ undefined, modifiers, namespaceDecl.name, namespaceDecl.body);
+                        var exportDefaultDeclaration = ts.createExportAssignment(
+                        /*decorators*/ undefined, 
+                        /*modifiers*/ undefined, 
+                        /*isExportEquals*/ false, namespaceDecl.name);
+                        resultHasExternalModuleIndicator = true;
+                        resultHasScopeMarker = true;
+                        return [cleanDeclaration, namespaceDeclaration, exportDefaultDeclaration];
                     }
                     else {
                         return clean;
                     }
                 }
-                case 244 /* ModuleDeclaration */: {
+                case 245 /* ModuleDeclaration */: {
                     needsDeclare = false;
                     var inner = input.body;
-                    if (inner && inner.kind === 245 /* ModuleBlock */) {
+                    if (inner && inner.kind === 246 /* ModuleBlock */) {
                         var statements = ts.visitNodes(inner.statements, visitDeclarationStatements);
                         var body = ts.updateModuleBlock(inner, transformAndReplaceLatePaintedStatements(statements));
                         needsDeclare = previousNeedsDeclare;
@@ -82218,7 +83104,7 @@ var ts;
                         /*decorators*/ undefined, mods, input.name, body));
                     }
                 }
-                case 240 /* ClassDeclaration */: {
+                case 241 /* ClassDeclaration */: {
                     var modifiers = ts.createNodeArray(ensureModifiers(input, isPrivate));
                     var typeParameters = ensureTypeParams(input, input.typeParameters);
                     var ctor = ts.getFirstConstructorWithBody(input);
@@ -82229,7 +83115,7 @@ var ts;
                             if (!ts.hasModifier(param, 92 /* ParameterPropertyModifier */) || shouldStripInternal(param))
                                 return;
                             getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(param);
-                            if (param.name.kind === 72 /* Identifier */) {
+                            if (param.name.kind === 73 /* Identifier */) {
                                 return preserveJsDoc(ts.createProperty(
                                 /*decorators*/ undefined, ensureModifiers(param), param.name, param.questionToken, ensureType(param, param.type), ensureNoInitializer(param)), param);
                             }
@@ -82259,7 +83145,7 @@ var ts;
                     }
                     var members = ts.createNodeArray(ts.concatenate(parameterProperties, ts.visitNodes(input.members, visitDeclarationSubtree)));
                     var extendsClause_1 = ts.getEffectiveBaseTypeNode(input);
-                    if (extendsClause_1 && !ts.isEntityNameExpression(extendsClause_1.expression) && extendsClause_1.expression.kind !== 96 /* NullKeyword */) {
+                    if (extendsClause_1 && !ts.isEntityNameExpression(extendsClause_1.expression) && extendsClause_1.expression.kind !== 97 /* NullKeyword */) {
                         // We must add a temporary declaration for the extends clause expression
                         var oldId = input.name ? ts.unescapeLeadingUnderscores(input.name.escapedText) : "default";
                         var newId_1 = ts.createOptimisticUniqueName(oldId + "_base");
@@ -82269,16 +83155,16 @@ var ts;
                             typeName: input.name
                         }); };
                         var varDecl = ts.createVariableDeclaration(newId_1, resolver.createTypeOfExpression(extendsClause_1.expression, input, declarationEmitNodeBuilderFlags, symbolTracker), /*initializer*/ undefined);
-                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(125 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
+                        var statement = ts.createVariableStatement(needsDeclare ? [ts.createModifier(126 /* DeclareKeyword */)] : [], ts.createVariableDeclarationList([varDecl], 2 /* Const */));
                         var heritageClauses = ts.createNodeArray(ts.map(input.heritageClauses, function (clause) {
-                            if (clause.token === 86 /* ExtendsKeyword */) {
+                            if (clause.token === 87 /* ExtendsKeyword */) {
                                 var oldDiag_2 = getSymbolAccessibilityDiagnostic;
                                 getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(clause.types[0]);
                                 var newClause = ts.updateHeritageClause(clause, ts.map(clause.types, function (t) { return ts.updateExpressionWithTypeArguments(t, ts.visitNodes(t.typeArguments, visitDeclarationSubtree), newId_1); }));
                                 getSymbolAccessibilityDiagnostic = oldDiag_2;
                                 return newClause;
                             }
-                            return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) { return ts.isEntityNameExpression(t.expression) || t.expression.kind === 96 /* NullKeyword */; })), visitDeclarationSubtree));
+                            return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) { return ts.isEntityNameExpression(t.expression) || t.expression.kind === 97 /* NullKeyword */; })), visitDeclarationSubtree));
                         }));
                         return [statement, cleanup(ts.updateClassDeclaration(input, 
                             /*decorators*/ undefined, modifiers, input.name, typeParameters, heritageClauses, members))]; // TODO: GH#18217
@@ -82289,10 +83175,10 @@ var ts;
                         /*decorators*/ undefined, modifiers, input.name, typeParameters, heritageClauses, members));
                     }
                 }
-                case 219 /* VariableStatement */: {
+                case 220 /* VariableStatement */: {
                     return cleanup(transformVariableStatement(input, isPrivate));
                 }
-                case 243 /* EnumDeclaration */: {
+                case 244 /* EnumDeclaration */: {
                     return cleanup(ts.updateEnumDeclaration(input, /*decorators*/ undefined, ts.createNodeArray(ensureModifiers(input, isPrivate)), input.name, ts.createNodeArray(ts.mapDefined(input.members, function (m) {
                         if (shouldStripInternal(m))
                             return;
@@ -82311,7 +83197,7 @@ var ts;
                 if (canProdiceDiagnostic) {
                     getSymbolAccessibilityDiagnostic = oldDiag;
                 }
-                if (input.kind === 244 /* ModuleDeclaration */) {
+                if (input.kind === 245 /* ModuleDeclaration */) {
                     needsDeclare = previousNeedsDeclare;
                 }
                 if (node === input) {
@@ -82332,7 +83218,7 @@ var ts;
             return ts.flatten(ts.mapDefined(d.elements, function (e) { return recreateBindingElement(e); }));
         }
         function recreateBindingElement(e) {
-            if (e.kind === 210 /* OmittedExpression */) {
+            if (e.kind === 211 /* OmittedExpression */) {
                 return;
             }
             if (e.name) {
@@ -82385,7 +83271,7 @@ var ts;
         function ensureModifierFlags(node, privateDeclaration) {
             var mask = 3071 /* All */ ^ (4 /* Public */ | 256 /* Async */); // No async modifiers in declaration files
             var additions = (needsDeclare && !isAlwaysType(node)) ? 2 /* Ambient */ : 0 /* None */;
-            var parentIsFile = node.parent.kind === 284 /* SourceFile */;
+            var parentIsFile = node.parent.kind === 285 /* SourceFile */;
             if (!parentIsFile || (isBundledEmit && parentIsFile && ts.isExternalModule(node.parent))) {
                 mask ^= ((privateDeclaration || (isBundledEmit && parentIsFile) || hasScopeMarker(node.parent) ? 0 : 1 /* Export */) | 2 /* Ambient */);
                 additions = 0 /* None */;
@@ -82406,7 +83292,7 @@ var ts;
             var prop = ts.createProperty(/*decorators*/ undefined, maskModifiers(node, /*mask*/ undefined, (!accessors.setAccessor) ? 64 /* Readonly */ : 0 /* None */), node.name, node.questionToken, ensureType(node, accessorType), /*initializer*/ undefined);
             var leadingsSyntheticCommentRanges = accessors.secondAccessor && ts.getLeadingCommentRangesOfNode(accessors.secondAccessor, currentSourceFile);
             if (leadingsSyntheticCommentRanges) {
-                var _loop_10 = function (range) {
+                var _loop_13 = function (range) {
                     if (range.kind === 3 /* MultiLineCommentTrivia */) {
                         var text = currentSourceFile.text.slice(range.pos + 2, range.end - 2);
                         var lines = text.split(/\r\n?|\n/g);
@@ -82420,20 +83306,20 @@ var ts;
                 };
                 for (var _i = 0, leadingsSyntheticCommentRanges_1 = leadingsSyntheticCommentRanges; _i < leadingsSyntheticCommentRanges_1.length; _i++) {
                     var range = leadingsSyntheticCommentRanges_1[_i];
-                    _loop_10(range);
+                    _loop_13(range);
                 }
             }
             return prop;
         }
         function transformHeritageClauses(nodes) {
             return ts.createNodeArray(ts.filter(ts.map(nodes, function (clause) { return ts.updateHeritageClause(clause, ts.visitNodes(ts.createNodeArray(ts.filter(clause.types, function (t) {
-                return ts.isEntityNameExpression(t.expression) || (clause.token === 86 /* ExtendsKeyword */ && t.expression.kind === 96 /* NullKeyword */);
+                return ts.isEntityNameExpression(t.expression) || (clause.token === 87 /* ExtendsKeyword */ && t.expression.kind === 97 /* NullKeyword */);
             })), visitDeclarationSubtree)); }), function (clause) { return clause.types && !!clause.types.length; }));
         }
     }
     ts.transformDeclarations = transformDeclarations;
     function isAlwaysType(node) {
-        if (node.kind === 241 /* InterfaceDeclaration */) {
+        if (node.kind === 242 /* InterfaceDeclaration */) {
             return true;
         }
         return false;
@@ -82458,7 +83344,7 @@ var ts;
     }
     function getTypeAnnotationFromAccessor(accessor) {
         if (accessor) {
-            return accessor.kind === 158 /* GetAccessor */
+            return accessor.kind === 159 /* GetAccessor */
                 ? accessor.type // Getter - return type
                 : accessor.parameters.length > 0
                     ? accessor.parameters[0].type // Setter parameter type
@@ -82467,52 +83353,52 @@ var ts;
     }
     function canHaveLiteralInitializer(node) {
         switch (node.kind) {
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
                 return !ts.hasModifier(node, 8 /* Private */);
-            case 151 /* Parameter */:
-            case 237 /* VariableDeclaration */:
+            case 152 /* Parameter */:
+            case 238 /* VariableDeclaration */:
                 return true;
         }
         return false;
     }
     function isPreservedDeclarationStatement(node) {
         switch (node.kind) {
-            case 239 /* FunctionDeclaration */:
-            case 244 /* ModuleDeclaration */:
-            case 248 /* ImportEqualsDeclaration */:
-            case 241 /* InterfaceDeclaration */:
-            case 240 /* ClassDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 243 /* EnumDeclaration */:
-            case 219 /* VariableStatement */:
-            case 249 /* ImportDeclaration */:
-            case 255 /* ExportDeclaration */:
-            case 254 /* ExportAssignment */:
+            case 240 /* FunctionDeclaration */:
+            case 245 /* ModuleDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 241 /* ClassDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 244 /* EnumDeclaration */:
+            case 220 /* VariableStatement */:
+            case 250 /* ImportDeclaration */:
+            case 256 /* ExportDeclaration */:
+            case 255 /* ExportAssignment */:
                 return true;
         }
         return false;
     }
     function isProcessedComponent(node) {
         switch (node.kind) {
-            case 161 /* ConstructSignature */:
-            case 157 /* Constructor */:
-            case 156 /* MethodDeclaration */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 155 /* MethodSignature */:
-            case 160 /* CallSignature */:
-            case 162 /* IndexSignature */:
-            case 237 /* VariableDeclaration */:
-            case 150 /* TypeParameter */:
-            case 211 /* ExpressionWithTypeArguments */:
-            case 164 /* TypeReference */:
-            case 175 /* ConditionalType */:
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
-            case 183 /* ImportType */:
+            case 162 /* ConstructSignature */:
+            case 158 /* Constructor */:
+            case 157 /* MethodDeclaration */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 156 /* MethodSignature */:
+            case 161 /* CallSignature */:
+            case 163 /* IndexSignature */:
+            case 238 /* VariableDeclaration */:
+            case 151 /* TypeParameter */:
+            case 212 /* ExpressionWithTypeArguments */:
+            case 165 /* TypeReference */:
+            case 176 /* ConditionalType */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
+            case 184 /* ImportType */:
                 return true;
         }
         return false;
@@ -82544,17 +83430,27 @@ var ts;
         SyntaxKindFeatureFlags[SyntaxKindFeatureFlags["Substitution"] = 1] = "Substitution";
         SyntaxKindFeatureFlags[SyntaxKindFeatureFlags["EmitNotifications"] = 2] = "EmitNotifications";
     })(SyntaxKindFeatureFlags || (SyntaxKindFeatureFlags = {}));
-    function getTransformers(compilerOptions, customTransformers) {
+    ts.noTransformers = { scriptTransformers: ts.emptyArray, declarationTransformers: ts.emptyArray };
+    function getTransformers(compilerOptions, customTransformers, emitOnlyDtsFiles) {
+        return {
+            scriptTransformers: getScriptTransformers(compilerOptions, customTransformers, emitOnlyDtsFiles),
+            declarationTransformers: getDeclarationTransformers(customTransformers),
+        };
+    }
+    ts.getTransformers = getTransformers;
+    function getScriptTransformers(compilerOptions, customTransformers, emitOnlyDtsFiles) {
+        if (emitOnlyDtsFiles)
+            return ts.emptyArray;
         var jsx = compilerOptions.jsx;
         var languageVersion = ts.getEmitScriptTarget(compilerOptions);
         var moduleKind = ts.getEmitModuleKind(compilerOptions);
         var transformers = [];
-        ts.addRange(transformers, customTransformers && customTransformers.before);
+        ts.addRange(transformers, customTransformers && ts.map(customTransformers.before, wrapScriptTransformerFactory));
         transformers.push(ts.transformTypeScript);
         if (jsx === 2 /* React */) {
             transformers.push(ts.transformJsx);
         }
-        if (languageVersion < 7 /* ESNext */) {
+        if (languageVersion < 8 /* ESNext */) {
             transformers.push(ts.transformESNext);
         }
         if (languageVersion < 6 /* ES2019 */) {
@@ -82579,10 +83475,38 @@ var ts;
         if (languageVersion < 1 /* ES5 */) {
             transformers.push(ts.transformES5);
         }
-        ts.addRange(transformers, customTransformers && customTransformers.after);
+        ts.addRange(transformers, customTransformers && ts.map(customTransformers.after, wrapScriptTransformerFactory));
         return transformers;
     }
-    ts.getTransformers = getTransformers;
+    function getDeclarationTransformers(customTransformers) {
+        var transformers = [];
+        transformers.push(ts.transformDeclarations);
+        ts.addRange(transformers, customTransformers && ts.map(customTransformers.afterDeclarations, wrapDeclarationTransformerFactory));
+        return transformers;
+    }
+    /**
+     * Wrap a custom script or declaration transformer object in a `Transformer` callback with fallback support for transforming bundles.
+     */
+    function wrapCustomTransformer(transformer) {
+        return function (node) { return ts.isBundle(node) ? transformer.transformBundle(node) : transformer.transformSourceFile(node); };
+    }
+    /**
+     * Wrap a transformer factory that may return a custom script or declaration transformer object.
+     */
+    function wrapCustomTransformerFactory(transformer, handleDefault) {
+        return function (context) {
+            var customTransformer = transformer(context);
+            return typeof customTransformer === "function"
+                ? handleDefault(customTransformer)
+                : wrapCustomTransformer(customTransformer);
+        };
+    }
+    function wrapScriptTransformerFactory(transformer) {
+        return wrapCustomTransformerFactory(transformer, ts.chainBundle);
+    }
+    function wrapDeclarationTransformerFactory(transformer) {
+        return wrapCustomTransformerFactory(transformer, ts.identity);
+    }
     function noEmitSubstitution(_hint, node) {
         return node;
     }
@@ -82602,7 +83526,7 @@ var ts;
      * @param allowDtsFiles A value indicating whether to allow the transformation of .d.ts files.
      */
     function transformNodes(resolver, host, options, nodes, transformers, allowDtsFiles) {
-        var enabledSyntaxKindFeatures = new Array(317 /* Count */);
+        var enabledSyntaxKindFeatures = new Array(318 /* Count */);
         var lexicalEnvironmentVariableDeclarations;
         var lexicalEnvironmentFunctionDeclarations;
         var lexicalEnvironmentVariableDeclarationsStack = [];
@@ -82655,7 +83579,14 @@ var ts;
         }
         ts.performance.mark("beforeTransform");
         // Chain together and initialize each transformer.
-        var transformation = ts.chain.apply(void 0, transformers)(context);
+        var transformersWithContext = transformers.map(function (t) { return t(context); });
+        var transformation = function (node) {
+            for (var _i = 0, transformersWithContext_1 = transformersWithContext; _i < transformersWithContext_1.length; _i++) {
+                var transform = transformersWithContext_1[_i];
+                node = transform(node);
+            }
+            return node;
+        };
         // prevent modification of transformation hooks.
         state = 1 /* Initialized */;
         // Transform each node.
@@ -82807,6 +83738,7 @@ var ts;
                 if (lexicalEnvironmentVariableDeclarations) {
                     var statement = ts.createVariableStatement(
                     /*modifiers*/ undefined, ts.createVariableDeclarationList(lexicalEnvironmentVariableDeclarations));
+                    ts.setEmitFlags(statement, 1048576 /* CustomPrologue */);
                     if (!statements) {
                         statements = [statement];
                     }
@@ -82914,7 +83846,7 @@ var ts;
     /*@internal*/
     function getOutputPathForBuildInfo(options) {
         var configFile = options.configFilePath;
-        if (!configFile || !ts.isIncrementalCompilation(options))
+        if (!ts.isIncrementalCompilation(options))
             return undefined;
         if (options.tsBuildInfoFile)
             return options.tsBuildInfoFile;
@@ -82924,6 +83856,8 @@ var ts;
             buildInfoExtensionLess = ts.removeFileExtension(outPath);
         }
         else {
+            if (!configFile)
+                return undefined;
             var configFileExtensionLess = ts.removeFileExtension(configFile);
             buildInfoExtensionLess = options.outDir ?
                 options.rootDir ?
@@ -82948,7 +83882,7 @@ var ts;
     /*@internal*/
     function getOutputPathsFor(sourceFile, host, forceDtsPaths) {
         var options = host.getCompilerOptions();
-        if (sourceFile.kind === 285 /* Bundle */) {
+        if (sourceFile.kind === 286 /* Bundle */) {
             return getOutputPathsForBundle(options, forceDtsPaths);
         }
         else {
@@ -83075,14 +84009,15 @@ var ts;
     ts.getFirstProjectOutput = getFirstProjectOutput;
     /*@internal*/
     // targetSourceFile is when users only want one file in entire project to be emitted. This is used in compileOnSave feature
-    function emitFiles(resolver, host, targetSourceFile, emitOnlyDtsFiles, transformers, declarationTransformers, onlyBuildInfo) {
+    function emitFiles(resolver, host, targetSourceFile, _a, emitOnlyDtsFiles, onlyBuildInfo) {
+        var scriptTransformers = _a.scriptTransformers, declarationTransformers = _a.declarationTransformers;
         var compilerOptions = host.getCompilerOptions();
         var sourceMapDataList = (compilerOptions.sourceMap || compilerOptions.inlineSourceMap || ts.getAreDeclarationMapsEnabled(compilerOptions)) ? [] : undefined;
         var emittedFilesList = compilerOptions.listEmittedFiles ? [] : undefined;
         var emitterDiagnostics = ts.createDiagnosticCollection();
         var newLine = ts.getNewLineCharacter(compilerOptions, function () { return host.getNewLine(); });
         var writer = ts.createTextWriter(newLine);
-        var _a = ts.performance.createTimer("printTime", "beforePrint", "afterPrint"), enter = _a.enter, exit = _a.exit;
+        var _b = ts.performance.createTimer("printTime", "beforePrint", "afterPrint"), enter = _b.enter, exit = _b.exit;
         var bundleBuildInfo;
         var emitSkipped = false;
         var exportedModulesFromDeclarationEmit;
@@ -83151,7 +84086,7 @@ var ts;
                 return;
             }
             // Transform the source files
-            var transform = ts.transformNodes(resolver, host, compilerOptions, [sourceFileOrBundle], transformers, /*allowDtsFiles*/ false);
+            var transform = ts.transformNodes(resolver, host, compilerOptions, [sourceFileOrBundle], scriptTransformers, /*allowDtsFiles*/ false);
             var printerOptions = {
                 removeComments: compilerOptions.removeComments,
                 newLine: compilerOptions.newLine,
@@ -83192,7 +84127,7 @@ var ts;
                 // Do that here when emitting only dts files
                 nonJsFiles.forEach(collectLinkedAliases);
             }
-            var declarationTransform = ts.transformNodes(resolver, host, compilerOptions, inputListOrBundle, ts.concatenate([ts.transformDeclarations], declarationTransformers), /*allowDtsFiles*/ false);
+            var declarationTransform = ts.transformNodes(resolver, host, compilerOptions, inputListOrBundle, declarationTransformers, /*allowDtsFiles*/ false);
             if (ts.length(declarationTransform.diagnostics)) {
                 for (var _a = 0, _b = declarationTransform.diagnostics; _a < _b.length; _a++) {
                     var diagnostic = _b[_a];
@@ -83229,7 +84164,7 @@ var ts;
                     mapRoot: compilerOptions.mapRoot,
                     extendedDiagnostics: compilerOptions.extendedDiagnostics,
                 });
-                if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === 284 /* SourceFile */) {
+                if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === 285 /* SourceFile */) {
                     var sourceFile = declarationTransform.transformed[0];
                     exportedModulesFromDeclarationEmit = sourceFile.exportedModulesFromDeclarationEmit;
                 }
@@ -83240,7 +84175,7 @@ var ts;
         }
         function collectLinkedAliases(node) {
             if (ts.isExportAssignment(node)) {
-                if (node.expression.kind === 72 /* Identifier */) {
+                if (node.expression.kind === 73 /* Identifier */) {
                     resolver.collectLinkedAliases(node.expression, /*setVisibility*/ true);
                 }
                 return;
@@ -83252,8 +84187,8 @@ var ts;
             ts.forEachChild(node, collectLinkedAliases);
         }
         function printSourceFileOrBundle(jsFilePath, sourceMapFilePath, sourceFileOrBundle, printer, mapOptions) {
-            var bundle = sourceFileOrBundle.kind === 285 /* Bundle */ ? sourceFileOrBundle : undefined;
-            var sourceFile = sourceFileOrBundle.kind === 284 /* SourceFile */ ? sourceFileOrBundle : undefined;
+            var bundle = sourceFileOrBundle.kind === 286 /* Bundle */ ? sourceFileOrBundle : undefined;
+            var sourceFile = sourceFileOrBundle.kind === 285 /* SourceFile */ ? sourceFileOrBundle : undefined;
             var sourceFiles = bundle ? bundle.sourceFiles : [sourceFile];
             var sourceMapGenerator;
             if (shouldEmitSourceMaps(mapOptions, sourceFileOrBundle)) {
@@ -83294,7 +84229,7 @@ var ts;
         }
         function shouldEmitSourceMaps(mapOptions, sourceFileOrBundle) {
             return (mapOptions.sourceMap || mapOptions.inlineSourceMap)
-                && (sourceFileOrBundle.kind !== 284 /* SourceFile */ || !ts.fileExtensionIs(sourceFileOrBundle.fileName, ".json" /* Json */));
+                && (sourceFileOrBundle.kind !== 285 /* SourceFile */ || !ts.fileExtensionIs(sourceFileOrBundle.fileName, ".json" /* Json */));
         }
         function getSourceRoot(mapOptions) {
             // Normalize source root and make sure it has trailing "/" so that it can be used to combine paths with the
@@ -83404,7 +84339,7 @@ var ts;
     };
     function createSourceFilesFromBundleBuildInfo(bundle) {
         var sourceFiles = bundle.sourceFiles.map(function (fileName) {
-            var sourceFile = ts.createNode(284 /* SourceFile */, 0, 0);
+            var sourceFile = ts.createNode(285 /* SourceFile */, 0, 0);
             sourceFile.fileName = fileName;
             sourceFile.text = "";
             sourceFile.statements = ts.createNodeArray();
@@ -83416,7 +84351,7 @@ var ts;
             sourceFile.text = prologueInfo.text;
             sourceFile.end = prologueInfo.text.length;
             sourceFile.statements = ts.createNodeArray(prologueInfo.directives.map(function (directive) {
-                var statement = ts.createNode(221 /* ExpressionStatement */, directive.pos, directive.end);
+                var statement = ts.createNode(222 /* ExpressionStatement */, directive.pos, directive.end);
                 statement.expression = ts.createNode(10 /* StringLiteral */, directive.expression.pos, directive.expression.end);
                 statement.expression.text = directive.expression.text;
                 return statement;
@@ -83508,7 +84443,7 @@ var ts;
             useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
             getProgramBuildInfo: ts.returnUndefined
         };
-        emitFiles(ts.notImplementedResolver, emitHost, /*targetSourceFile*/ undefined, /*emitOnlyDtsFiles*/ false, ts.getTransformers(config.options));
+        emitFiles(ts.notImplementedResolver, emitHost, /*targetSourceFile*/ undefined, ts.getTransformers(config.options), /*emitOnlyDtsFiles*/ false);
         return outputFiles;
     }
     ts.emitUsingBuildInfo = emitUsingBuildInfo;
@@ -83585,9 +84520,9 @@ var ts;
                     break;
             }
             switch (node.kind) {
-                case 284 /* SourceFile */: return printFile(node);
-                case 285 /* Bundle */: return printBundle(node);
-                case 286 /* UnparsedSource */: return printUnparsedSource(node);
+                case 285 /* SourceFile */: return printFile(node);
+                case 286 /* Bundle */: return printBundle(node);
+                case 287 /* UnparsedSource */: return printUnparsedSource(node);
             }
             writeNode(hint, node, sourceFile, beginPrint());
             return endPrint();
@@ -83817,12 +84752,12 @@ var ts;
                     }
                 // falls through
                 case 2 /* Comments */:
-                    if (!commentsDisabled && node.kind !== 284 /* SourceFile */) {
+                    if (!commentsDisabled && node.kind !== 285 /* SourceFile */) {
                         return pipelineEmitWithComments;
                     }
                 // falls through
                 case 3 /* SourceMaps */:
-                    if (!sourceMapsDisabled && node.kind !== 284 /* SourceFile */ && !ts.isInJsonFile(node)) {
+                    if (!sourceMapsDisabled && node.kind !== 285 /* SourceFile */ && !ts.isInJsonFile(node)) {
                         return pipelineEmitWithSourceMap;
                     }
                 // falls through
@@ -83859,272 +84794,272 @@ var ts;
                     case 16 /* TemplateMiddle */:
                     case 17 /* TemplateTail */:
                         return emitLiteral(node);
-                    case 286 /* UnparsedSource */:
-                    case 280 /* UnparsedPrepend */:
+                    case 287 /* UnparsedSource */:
+                    case 281 /* UnparsedPrepend */:
                         return emitUnparsedSourceOrPrepend(node);
-                    case 279 /* UnparsedPrologue */:
+                    case 280 /* UnparsedPrologue */:
                         return writeUnparsedNode(node);
-                    case 281 /* UnparsedText */:
-                    case 282 /* UnparsedInternalText */:
+                    case 282 /* UnparsedText */:
+                    case 283 /* UnparsedInternalText */:
                         return emitUnparsedTextLike(node);
-                    case 283 /* UnparsedSyntheticReference */:
+                    case 284 /* UnparsedSyntheticReference */:
                         return emitUnparsedSyntheticReference(node);
                     // Identifiers
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return emitIdentifier(node);
                     // Parse tree nodes
                     // Names
-                    case 148 /* QualifiedName */:
+                    case 149 /* QualifiedName */:
                         return emitQualifiedName(node);
-                    case 149 /* ComputedPropertyName */:
+                    case 150 /* ComputedPropertyName */:
                         return emitComputedPropertyName(node);
                     // Signature elements
-                    case 150 /* TypeParameter */:
+                    case 151 /* TypeParameter */:
                         return emitTypeParameter(node);
-                    case 151 /* Parameter */:
+                    case 152 /* Parameter */:
                         return emitParameter(node);
-                    case 152 /* Decorator */:
+                    case 153 /* Decorator */:
                         return emitDecorator(node);
                     // Type members
-                    case 153 /* PropertySignature */:
+                    case 154 /* PropertySignature */:
                         return emitPropertySignature(node);
-                    case 154 /* PropertyDeclaration */:
+                    case 155 /* PropertyDeclaration */:
                         return emitPropertyDeclaration(node);
-                    case 155 /* MethodSignature */:
+                    case 156 /* MethodSignature */:
                         return emitMethodSignature(node);
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         return emitMethodDeclaration(node);
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         return emitConstructor(node);
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         return emitAccessorDeclaration(node);
-                    case 160 /* CallSignature */:
+                    case 161 /* CallSignature */:
                         return emitCallSignature(node);
-                    case 161 /* ConstructSignature */:
+                    case 162 /* ConstructSignature */:
                         return emitConstructSignature(node);
-                    case 162 /* IndexSignature */:
+                    case 163 /* IndexSignature */:
                         return emitIndexSignature(node);
                     // Types
-                    case 163 /* TypePredicate */:
+                    case 164 /* TypePredicate */:
                         return emitTypePredicate(node);
-                    case 164 /* TypeReference */:
+                    case 165 /* TypeReference */:
                         return emitTypeReference(node);
-                    case 165 /* FunctionType */:
+                    case 166 /* FunctionType */:
                         return emitFunctionType(node);
-                    case 294 /* JSDocFunctionType */:
+                    case 295 /* JSDocFunctionType */:
                         return emitJSDocFunctionType(node);
-                    case 166 /* ConstructorType */:
+                    case 167 /* ConstructorType */:
                         return emitConstructorType(node);
-                    case 167 /* TypeQuery */:
+                    case 168 /* TypeQuery */:
                         return emitTypeQuery(node);
-                    case 168 /* TypeLiteral */:
+                    case 169 /* TypeLiteral */:
                         return emitTypeLiteral(node);
-                    case 169 /* ArrayType */:
+                    case 170 /* ArrayType */:
                         return emitArrayType(node);
-                    case 170 /* TupleType */:
+                    case 171 /* TupleType */:
                         return emitTupleType(node);
-                    case 171 /* OptionalType */:
+                    case 172 /* OptionalType */:
                         return emitOptionalType(node);
-                    case 173 /* UnionType */:
+                    case 174 /* UnionType */:
                         return emitUnionType(node);
-                    case 174 /* IntersectionType */:
+                    case 175 /* IntersectionType */:
                         return emitIntersectionType(node);
-                    case 175 /* ConditionalType */:
+                    case 176 /* ConditionalType */:
                         return emitConditionalType(node);
-                    case 176 /* InferType */:
+                    case 177 /* InferType */:
                         return emitInferType(node);
-                    case 177 /* ParenthesizedType */:
+                    case 178 /* ParenthesizedType */:
                         return emitParenthesizedType(node);
-                    case 211 /* ExpressionWithTypeArguments */:
+                    case 212 /* ExpressionWithTypeArguments */:
                         return emitExpressionWithTypeArguments(node);
-                    case 178 /* ThisType */:
+                    case 179 /* ThisType */:
                         return emitThisType();
-                    case 179 /* TypeOperator */:
+                    case 180 /* TypeOperator */:
                         return emitTypeOperator(node);
-                    case 180 /* IndexedAccessType */:
+                    case 181 /* IndexedAccessType */:
                         return emitIndexedAccessType(node);
-                    case 181 /* MappedType */:
+                    case 182 /* MappedType */:
                         return emitMappedType(node);
-                    case 182 /* LiteralType */:
+                    case 183 /* LiteralType */:
                         return emitLiteralType(node);
-                    case 183 /* ImportType */:
+                    case 184 /* ImportType */:
                         return emitImportTypeNode(node);
-                    case 289 /* JSDocAllType */:
+                    case 290 /* JSDocAllType */:
                         writePunctuation("*");
                         return;
-                    case 290 /* JSDocUnknownType */:
+                    case 291 /* JSDocUnknownType */:
                         writePunctuation("?");
                         return;
-                    case 291 /* JSDocNullableType */:
+                    case 292 /* JSDocNullableType */:
                         return emitJSDocNullableType(node);
-                    case 292 /* JSDocNonNullableType */:
+                    case 293 /* JSDocNonNullableType */:
                         return emitJSDocNonNullableType(node);
-                    case 293 /* JSDocOptionalType */:
+                    case 294 /* JSDocOptionalType */:
                         return emitJSDocOptionalType(node);
-                    case 172 /* RestType */:
-                    case 295 /* JSDocVariadicType */:
+                    case 173 /* RestType */:
+                    case 296 /* JSDocVariadicType */:
                         return emitRestOrJSDocVariadicType(node);
                     // Binding patterns
-                    case 184 /* ObjectBindingPattern */:
+                    case 185 /* ObjectBindingPattern */:
                         return emitObjectBindingPattern(node);
-                    case 185 /* ArrayBindingPattern */:
+                    case 186 /* ArrayBindingPattern */:
                         return emitArrayBindingPattern(node);
-                    case 186 /* BindingElement */:
+                    case 187 /* BindingElement */:
                         return emitBindingElement(node);
                     // Misc
-                    case 216 /* TemplateSpan */:
+                    case 217 /* TemplateSpan */:
                         return emitTemplateSpan(node);
-                    case 217 /* SemicolonClassElement */:
+                    case 218 /* SemicolonClassElement */:
                         return emitSemicolonClassElement();
                     // Statements
-                    case 218 /* Block */:
+                    case 219 /* Block */:
                         return emitBlock(node);
-                    case 219 /* VariableStatement */:
+                    case 220 /* VariableStatement */:
                         return emitVariableStatement(node);
-                    case 220 /* EmptyStatement */:
+                    case 221 /* EmptyStatement */:
                         return emitEmptyStatement(/*isEmbeddedStatement*/ false);
-                    case 221 /* ExpressionStatement */:
+                    case 222 /* ExpressionStatement */:
                         return emitExpressionStatement(node);
-                    case 222 /* IfStatement */:
+                    case 223 /* IfStatement */:
                         return emitIfStatement(node);
-                    case 223 /* DoStatement */:
+                    case 224 /* DoStatement */:
                         return emitDoStatement(node);
-                    case 224 /* WhileStatement */:
+                    case 225 /* WhileStatement */:
                         return emitWhileStatement(node);
-                    case 225 /* ForStatement */:
+                    case 226 /* ForStatement */:
                         return emitForStatement(node);
-                    case 226 /* ForInStatement */:
+                    case 227 /* ForInStatement */:
                         return emitForInStatement(node);
-                    case 227 /* ForOfStatement */:
+                    case 228 /* ForOfStatement */:
                         return emitForOfStatement(node);
-                    case 228 /* ContinueStatement */:
+                    case 229 /* ContinueStatement */:
                         return emitContinueStatement(node);
-                    case 229 /* BreakStatement */:
+                    case 230 /* BreakStatement */:
                         return emitBreakStatement(node);
-                    case 230 /* ReturnStatement */:
+                    case 231 /* ReturnStatement */:
                         return emitReturnStatement(node);
-                    case 231 /* WithStatement */:
+                    case 232 /* WithStatement */:
                         return emitWithStatement(node);
-                    case 232 /* SwitchStatement */:
+                    case 233 /* SwitchStatement */:
                         return emitSwitchStatement(node);
-                    case 233 /* LabeledStatement */:
+                    case 234 /* LabeledStatement */:
                         return emitLabeledStatement(node);
-                    case 234 /* ThrowStatement */:
+                    case 235 /* ThrowStatement */:
                         return emitThrowStatement(node);
-                    case 235 /* TryStatement */:
+                    case 236 /* TryStatement */:
                         return emitTryStatement(node);
-                    case 236 /* DebuggerStatement */:
+                    case 237 /* DebuggerStatement */:
                         return emitDebuggerStatement(node);
                     // Declarations
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                         return emitVariableDeclaration(node);
-                    case 238 /* VariableDeclarationList */:
+                    case 239 /* VariableDeclarationList */:
                         return emitVariableDeclarationList(node);
-                    case 239 /* FunctionDeclaration */:
+                    case 240 /* FunctionDeclaration */:
                         return emitFunctionDeclaration(node);
-                    case 240 /* ClassDeclaration */:
+                    case 241 /* ClassDeclaration */:
                         return emitClassDeclaration(node);
-                    case 241 /* InterfaceDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
                         return emitInterfaceDeclaration(node);
-                    case 242 /* TypeAliasDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
                         return emitTypeAliasDeclaration(node);
-                    case 243 /* EnumDeclaration */:
+                    case 244 /* EnumDeclaration */:
                         return emitEnumDeclaration(node);
-                    case 244 /* ModuleDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         return emitModuleDeclaration(node);
-                    case 245 /* ModuleBlock */:
+                    case 246 /* ModuleBlock */:
                         return emitModuleBlock(node);
-                    case 246 /* CaseBlock */:
+                    case 247 /* CaseBlock */:
                         return emitCaseBlock(node);
-                    case 247 /* NamespaceExportDeclaration */:
+                    case 248 /* NamespaceExportDeclaration */:
                         return emitNamespaceExportDeclaration(node);
-                    case 248 /* ImportEqualsDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
                         return emitImportEqualsDeclaration(node);
-                    case 249 /* ImportDeclaration */:
+                    case 250 /* ImportDeclaration */:
                         return emitImportDeclaration(node);
-                    case 250 /* ImportClause */:
+                    case 251 /* ImportClause */:
                         return emitImportClause(node);
-                    case 251 /* NamespaceImport */:
+                    case 252 /* NamespaceImport */:
                         return emitNamespaceImport(node);
-                    case 252 /* NamedImports */:
+                    case 253 /* NamedImports */:
                         return emitNamedImports(node);
-                    case 253 /* ImportSpecifier */:
+                    case 254 /* ImportSpecifier */:
                         return emitImportSpecifier(node);
-                    case 254 /* ExportAssignment */:
+                    case 255 /* ExportAssignment */:
                         return emitExportAssignment(node);
-                    case 255 /* ExportDeclaration */:
+                    case 256 /* ExportDeclaration */:
                         return emitExportDeclaration(node);
-                    case 256 /* NamedExports */:
+                    case 257 /* NamedExports */:
                         return emitNamedExports(node);
-                    case 257 /* ExportSpecifier */:
+                    case 258 /* ExportSpecifier */:
                         return emitExportSpecifier(node);
-                    case 258 /* MissingDeclaration */:
+                    case 259 /* MissingDeclaration */:
                         return;
                     // Module references
-                    case 259 /* ExternalModuleReference */:
+                    case 260 /* ExternalModuleReference */:
                         return emitExternalModuleReference(node);
                     // JSX (non-expression)
                     case 11 /* JsxText */:
                         return emitJsxText(node);
-                    case 262 /* JsxOpeningElement */:
-                    case 265 /* JsxOpeningFragment */:
+                    case 263 /* JsxOpeningElement */:
+                    case 266 /* JsxOpeningFragment */:
                         return emitJsxOpeningElementOrFragment(node);
-                    case 263 /* JsxClosingElement */:
-                    case 266 /* JsxClosingFragment */:
+                    case 264 /* JsxClosingElement */:
+                    case 267 /* JsxClosingFragment */:
                         return emitJsxClosingElementOrFragment(node);
-                    case 267 /* JsxAttribute */:
+                    case 268 /* JsxAttribute */:
                         return emitJsxAttribute(node);
-                    case 268 /* JsxAttributes */:
+                    case 269 /* JsxAttributes */:
                         return emitJsxAttributes(node);
-                    case 269 /* JsxSpreadAttribute */:
+                    case 270 /* JsxSpreadAttribute */:
                         return emitJsxSpreadAttribute(node);
-                    case 270 /* JsxExpression */:
+                    case 271 /* JsxExpression */:
                         return emitJsxExpression(node);
                     // Clauses
-                    case 271 /* CaseClause */:
+                    case 272 /* CaseClause */:
                         return emitCaseClause(node);
-                    case 272 /* DefaultClause */:
+                    case 273 /* DefaultClause */:
                         return emitDefaultClause(node);
-                    case 273 /* HeritageClause */:
+                    case 274 /* HeritageClause */:
                         return emitHeritageClause(node);
-                    case 274 /* CatchClause */:
+                    case 275 /* CatchClause */:
                         return emitCatchClause(node);
                     // Property assignments
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         return emitPropertyAssignment(node);
-                    case 276 /* ShorthandPropertyAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
                         return emitShorthandPropertyAssignment(node);
-                    case 277 /* SpreadAssignment */:
+                    case 278 /* SpreadAssignment */:
                         return emitSpreadAssignment(node);
                     // Enum
-                    case 278 /* EnumMember */:
+                    case 279 /* EnumMember */:
                         return emitEnumMember(node);
                     // JSDoc nodes (only used in codefixes currently)
-                    case 304 /* JSDocParameterTag */:
-                    case 310 /* JSDocPropertyTag */:
+                    case 305 /* JSDocParameterTag */:
+                    case 311 /* JSDocPropertyTag */:
                         return emitJSDocPropertyLikeTag(node);
-                    case 305 /* JSDocReturnTag */:
-                    case 307 /* JSDocTypeTag */:
-                    case 306 /* JSDocThisTag */:
-                    case 303 /* JSDocEnumTag */:
+                    case 306 /* JSDocReturnTag */:
+                    case 308 /* JSDocTypeTag */:
+                    case 307 /* JSDocThisTag */:
+                    case 304 /* JSDocEnumTag */:
                         return emitJSDocSimpleTypedTag(node);
-                    case 300 /* JSDocAugmentsTag */:
+                    case 301 /* JSDocAugmentsTag */:
                         return emitJSDocAugmentsTag(node);
-                    case 308 /* JSDocTemplateTag */:
+                    case 309 /* JSDocTemplateTag */:
                         return emitJSDocTemplateTag(node);
-                    case 309 /* JSDocTypedefTag */:
+                    case 310 /* JSDocTypedefTag */:
                         return emitJSDocTypedefTag(node);
-                    case 302 /* JSDocCallbackTag */:
+                    case 303 /* JSDocCallbackTag */:
                         return emitJSDocCallbackTag(node);
-                    case 298 /* JSDocSignature */:
+                    case 299 /* JSDocSignature */:
                         return emitJSDocSignature(node);
-                    case 297 /* JSDocTypeLiteral */:
+                    case 298 /* JSDocTypeLiteral */:
                         return emitJSDocTypeLiteral(node);
-                    case 301 /* JSDocClassTag */:
-                    case 299 /* JSDocTag */:
+                    case 302 /* JSDocClassTag */:
+                    case 300 /* JSDocTag */:
                         return emitJSDocSimpleTag(node);
-                    case 296 /* JSDocComment */:
+                    case 297 /* JSDocComment */:
                         return emitJSDoc(node);
                     // Transformation nodes (ignored)
                 }
@@ -84149,83 +85084,83 @@ var ts;
                     case 14 /* NoSubstitutionTemplateLiteral */:
                         return emitLiteral(node);
                     // Identifiers
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return emitIdentifier(node);
                     // Reserved words
-                    case 87 /* FalseKeyword */:
-                    case 96 /* NullKeyword */:
-                    case 98 /* SuperKeyword */:
-                    case 102 /* TrueKeyword */:
-                    case 100 /* ThisKeyword */:
-                    case 92 /* ImportKeyword */:
+                    case 88 /* FalseKeyword */:
+                    case 97 /* NullKeyword */:
+                    case 99 /* SuperKeyword */:
+                    case 103 /* TrueKeyword */:
+                    case 101 /* ThisKeyword */:
+                    case 93 /* ImportKeyword */:
                         writeTokenNode(node, writeKeyword);
                         return;
                     // Expressions
-                    case 187 /* ArrayLiteralExpression */:
+                    case 188 /* ArrayLiteralExpression */:
                         return emitArrayLiteralExpression(node);
-                    case 188 /* ObjectLiteralExpression */:
+                    case 189 /* ObjectLiteralExpression */:
                         return emitObjectLiteralExpression(node);
-                    case 189 /* PropertyAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         return emitPropertyAccessExpression(node);
-                    case 190 /* ElementAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         return emitElementAccessExpression(node);
-                    case 191 /* CallExpression */:
+                    case 192 /* CallExpression */:
                         return emitCallExpression(node);
-                    case 192 /* NewExpression */:
+                    case 193 /* NewExpression */:
                         return emitNewExpression(node);
-                    case 193 /* TaggedTemplateExpression */:
+                    case 194 /* TaggedTemplateExpression */:
                         return emitTaggedTemplateExpression(node);
-                    case 194 /* TypeAssertionExpression */:
+                    case 195 /* TypeAssertionExpression */:
                         return emitTypeAssertionExpression(node);
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return emitParenthesizedExpression(node);
-                    case 196 /* FunctionExpression */:
+                    case 197 /* FunctionExpression */:
                         return emitFunctionExpression(node);
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         return emitArrowFunction(node);
-                    case 198 /* DeleteExpression */:
+                    case 199 /* DeleteExpression */:
                         return emitDeleteExpression(node);
-                    case 199 /* TypeOfExpression */:
+                    case 200 /* TypeOfExpression */:
                         return emitTypeOfExpression(node);
-                    case 200 /* VoidExpression */:
+                    case 201 /* VoidExpression */:
                         return emitVoidExpression(node);
-                    case 201 /* AwaitExpression */:
+                    case 202 /* AwaitExpression */:
                         return emitAwaitExpression(node);
-                    case 202 /* PrefixUnaryExpression */:
+                    case 203 /* PrefixUnaryExpression */:
                         return emitPrefixUnaryExpression(node);
-                    case 203 /* PostfixUnaryExpression */:
+                    case 204 /* PostfixUnaryExpression */:
                         return emitPostfixUnaryExpression(node);
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         return emitBinaryExpression(node);
-                    case 205 /* ConditionalExpression */:
+                    case 206 /* ConditionalExpression */:
                         return emitConditionalExpression(node);
-                    case 206 /* TemplateExpression */:
+                    case 207 /* TemplateExpression */:
                         return emitTemplateExpression(node);
-                    case 207 /* YieldExpression */:
+                    case 208 /* YieldExpression */:
                         return emitYieldExpression(node);
-                    case 208 /* SpreadElement */:
+                    case 209 /* SpreadElement */:
                         return emitSpreadExpression(node);
-                    case 209 /* ClassExpression */:
+                    case 210 /* ClassExpression */:
                         return emitClassExpression(node);
-                    case 210 /* OmittedExpression */:
+                    case 211 /* OmittedExpression */:
                         return;
-                    case 212 /* AsExpression */:
+                    case 213 /* AsExpression */:
                         return emitAsExpression(node);
-                    case 213 /* NonNullExpression */:
+                    case 214 /* NonNullExpression */:
                         return emitNonNullExpression(node);
-                    case 214 /* MetaProperty */:
+                    case 215 /* MetaProperty */:
                         return emitMetaProperty(node);
                     // JSX
-                    case 260 /* JsxElement */:
+                    case 261 /* JsxElement */:
                         return emitJsxElement(node);
-                    case 261 /* JsxSelfClosingElement */:
+                    case 262 /* JsxSelfClosingElement */:
                         return emitJsxSelfClosingElement(node);
-                    case 264 /* JsxFragment */:
+                    case 265 /* JsxFragment */:
                         return emitJsxFragment(node);
                     // Transformation nodes
-                    case 313 /* PartiallyEmittedExpression */:
+                    case 314 /* PartiallyEmittedExpression */:
                         return emitPartiallyEmittedExpression(node);
-                    case 314 /* CommaListExpression */:
+                    case 315 /* CommaListExpression */:
                         return emitCommaList(node);
                 }
             }
@@ -84265,7 +85200,7 @@ var ts;
         }
         function emitHelpers(node) {
             var helpersEmitted = false;
-            var bundle = node.kind === 285 /* Bundle */ ? node : undefined;
+            var bundle = node.kind === 286 /* Bundle */ ? node : undefined;
             if (bundle && moduleKind === ts.ModuleKind.None) {
                 return;
             }
@@ -84365,7 +85300,7 @@ var ts;
             var pos = getTextPosWithWriteLine();
             writeUnparsedNode(unparsed);
             if (bundleFileInfo) {
-                updateOrPushBundleFileTextLike(pos, writer.getTextPos(), unparsed.kind === 281 /* UnparsedText */ ?
+                updateOrPushBundleFileTextLike(pos, writer.getTextPos(), unparsed.kind === 282 /* UnparsedText */ ?
                     "text" /* Text */ :
                     "internal" /* Internal */);
             }
@@ -84398,7 +85333,7 @@ var ts;
             emit(node.right);
         }
         function emitEntityName(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 emitExpression(node);
             }
             else {
@@ -84434,7 +85369,7 @@ var ts;
             emit(node.dotDotDotToken);
             emitNodeWithWriter(node.name, writeParameter);
             emit(node.questionToken);
-            if (node.parent && node.parent.kind === 294 /* JSDocFunctionType */ && !node.name) {
+            if (node.parent && node.parent.kind === 295 /* JSDocFunctionType */ && !node.name) {
                 emit(node.type);
             }
             else {
@@ -84496,7 +85431,7 @@ var ts;
         function emitAccessorDeclaration(node) {
             emitDecorators(node, node.decorators);
             emitModifiers(node, node.modifiers);
-            writeKeyword(node.kind === 158 /* GetAccessor */ ? "get" : "set");
+            writeKeyword(node.kind === 159 /* GetAccessor */ ? "get" : "set");
             writeSpace();
             emit(node.name);
             emitSignatureAndBody(node, emitSignatureHead);
@@ -84673,7 +85608,7 @@ var ts;
             }
             if (node.readonlyToken) {
                 emit(node.readonlyToken);
-                if (node.readonlyToken.kind !== 133 /* ReadonlyKeyword */) {
+                if (node.readonlyToken.kind !== 134 /* ReadonlyKeyword */) {
                     writeKeyword("readonly");
                 }
                 writeSpace();
@@ -84823,7 +85758,7 @@ var ts;
             emitExpressionList(node, node.arguments, 2576 /* CallExpressionArguments */);
         }
         function emitNewExpression(node) {
-            emitTokenWithComment(95 /* NewKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(96 /* NewKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitTypeArguments(node, node.typeArguments);
@@ -84863,22 +85798,22 @@ var ts;
             emit(node.equalsGreaterThanToken);
         }
         function emitDeleteExpression(node) {
-            emitTokenWithComment(81 /* DeleteKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(82 /* DeleteKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
         function emitTypeOfExpression(node) {
-            emitTokenWithComment(104 /* TypeOfKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(105 /* TypeOfKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
         function emitVoidExpression(node) {
-            emitTokenWithComment(106 /* VoidKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(107 /* VoidKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
         function emitAwaitExpression(node) {
-            emitTokenWithComment(122 /* AwaitKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(123 /* AwaitKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
         }
@@ -84903,7 +85838,7 @@ var ts;
             // expression a prefix increment whose operand is a plus expression - (++(+x))
             // The same is true of minus of course.
             var operand = node.operand;
-            return operand.kind === 202 /* PrefixUnaryExpression */
+            return operand.kind === 203 /* PrefixUnaryExpression */
                 && ((node.operator === 38 /* PlusToken */ && (operand.operator === 38 /* PlusToken */ || operand.operator === 44 /* PlusPlusToken */))
                     || (node.operator === 39 /* MinusToken */ && (operand.operator === 39 /* MinusToken */ || operand.operator === 45 /* MinusMinusToken */)));
         }
@@ -84918,7 +85853,7 @@ var ts;
             emitExpression(node.left);
             increaseIndentIf(indentBeforeOperator, isCommaOperator);
             emitLeadingCommentsOfPosition(node.operatorToken.pos);
-            writeTokenNode(node.operatorToken, node.operatorToken.kind === 93 /* InKeyword */ ? writeKeyword : writeOperator);
+            writeTokenNode(node.operatorToken, node.operatorToken.kind === 94 /* InKeyword */ ? writeKeyword : writeOperator);
             emitTrailingCommentsOfPosition(node.operatorToken.end, /*prefixSpace*/ true); // Binary operators should have a space before the comment starts
             increaseIndentIf(indentAfterOperator, /*writeSpaceIfNotIndenting*/ true);
             emitExpression(node.right);
@@ -84946,7 +85881,7 @@ var ts;
             emitList(node, node.templateSpans, 262144 /* TemplateExpressionSpans */);
         }
         function emitYieldExpression(node) {
-            emitTokenWithComment(117 /* YieldKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(118 /* YieldKeyword */, node.pos, writeKeyword, node);
             emit(node.asteriskToken);
             emitExpressionWithLeadingSpace(node.expression);
         }
@@ -85023,7 +85958,7 @@ var ts;
             }
         }
         function emitIfStatement(node) {
-            var openParenPos = emitTokenWithComment(91 /* IfKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(92 /* IfKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
@@ -85031,8 +85966,8 @@ var ts;
             emitEmbeddedStatement(node, node.thenStatement);
             if (node.elseStatement) {
                 writeLineOrSpace(node);
-                emitTokenWithComment(83 /* ElseKeyword */, node.thenStatement.end, writeKeyword, node);
-                if (node.elseStatement.kind === 222 /* IfStatement */) {
+                emitTokenWithComment(84 /* ElseKeyword */, node.thenStatement.end, writeKeyword, node);
+                if (node.elseStatement.kind === 223 /* IfStatement */) {
                     writeSpace();
                     emit(node.elseStatement);
                 }
@@ -85042,14 +85977,14 @@ var ts;
             }
         }
         function emitWhileClause(node, startPos) {
-            var openParenPos = emitTokenWithComment(107 /* WhileKeyword */, startPos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(108 /* WhileKeyword */, startPos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
         }
         function emitDoStatement(node) {
-            emitTokenWithComment(82 /* DoKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(83 /* DoKeyword */, node.pos, writeKeyword, node);
             emitEmbeddedStatement(node, node.statement);
             if (ts.isBlock(node.statement)) {
                 writeSpace();
@@ -85065,7 +86000,7 @@ var ts;
             emitEmbeddedStatement(node, node.statement);
         }
         function emitForStatement(node) {
-            var openParenPos = emitTokenWithComment(89 /* ForKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(90 /* ForKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             var pos = emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, /*contextNode*/ node);
             emitForBinding(node.initializer);
@@ -85077,25 +86012,25 @@ var ts;
             emitEmbeddedStatement(node, node.statement);
         }
         function emitForInStatement(node) {
-            var openParenPos = emitTokenWithComment(89 /* ForKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(90 /* ForKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitForBinding(node.initializer);
             writeSpace();
-            emitTokenWithComment(93 /* InKeyword */, node.initializer.end, writeKeyword, node);
+            emitTokenWithComment(94 /* InKeyword */, node.initializer.end, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
             emitEmbeddedStatement(node, node.statement);
         }
         function emitForOfStatement(node) {
-            var openParenPos = emitTokenWithComment(89 /* ForKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(90 /* ForKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitWithTrailingSpace(node.awaitModifier);
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitForBinding(node.initializer);
             writeSpace();
-            emitTokenWithComment(147 /* OfKeyword */, node.initializer.end, writeKeyword, node);
+            emitTokenWithComment(148 /* OfKeyword */, node.initializer.end, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
@@ -85103,7 +86038,7 @@ var ts;
         }
         function emitForBinding(node) {
             if (node !== undefined) {
-                if (node.kind === 238 /* VariableDeclarationList */) {
+                if (node.kind === 239 /* VariableDeclarationList */) {
                     emit(node);
                 }
                 else {
@@ -85112,12 +86047,12 @@ var ts;
             }
         }
         function emitContinueStatement(node) {
-            emitTokenWithComment(78 /* ContinueKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(79 /* ContinueKeyword */, node.pos, writeKeyword, node);
             emitWithLeadingSpace(node.label);
             writeTrailingSemicolon();
         }
         function emitBreakStatement(node) {
-            emitTokenWithComment(73 /* BreakKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(74 /* BreakKeyword */, node.pos, writeKeyword, node);
             emitWithLeadingSpace(node.label);
             writeTrailingSemicolon();
         }
@@ -85145,12 +86080,12 @@ var ts;
             return pos;
         }
         function emitReturnStatement(node) {
-            emitTokenWithComment(97 /* ReturnKeyword */, node.pos, writeKeyword, /*contextNode*/ node);
+            emitTokenWithComment(98 /* ReturnKeyword */, node.pos, writeKeyword, /*contextNode*/ node);
             emitExpressionWithLeadingSpace(node.expression);
             writeTrailingSemicolon();
         }
         function emitWithStatement(node) {
-            var openParenPos = emitTokenWithComment(108 /* WithKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(109 /* WithKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
@@ -85158,7 +86093,7 @@ var ts;
             emitEmbeddedStatement(node, node.statement);
         }
         function emitSwitchStatement(node) {
-            var openParenPos = emitTokenWithComment(99 /* SwitchKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(100 /* SwitchKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitExpression(node.expression);
@@ -85173,12 +86108,12 @@ var ts;
             emit(node.statement);
         }
         function emitThrowStatement(node) {
-            emitTokenWithComment(101 /* ThrowKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(102 /* ThrowKeyword */, node.pos, writeKeyword, node);
             emitExpressionWithLeadingSpace(node.expression);
             writeTrailingSemicolon();
         }
         function emitTryStatement(node) {
-            emitTokenWithComment(103 /* TryKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(104 /* TryKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emit(node.tryBlock);
             if (node.catchClause) {
@@ -85187,13 +86122,13 @@ var ts;
             }
             if (node.finallyBlock) {
                 writeLineOrSpace(node);
-                emitTokenWithComment(88 /* FinallyKeyword */, (node.catchClause || node.tryBlock).end, writeKeyword, node);
+                emitTokenWithComment(89 /* FinallyKeyword */, (node.catchClause || node.tryBlock).end, writeKeyword, node);
                 writeSpace();
                 emit(node.finallyBlock);
             }
         }
         function emitDebuggerStatement(node) {
-            writeToken(79 /* DebuggerKeyword */, node.pos, writeKeyword);
+            writeToken(80 /* DebuggerKeyword */, node.pos, writeKeyword);
             writeTrailingSemicolon();
         }
         //
@@ -85398,7 +86333,7 @@ var ts;
             var body = node.body;
             if (!body)
                 return writeTrailingSemicolon();
-            while (body.kind === 244 /* ModuleDeclaration */) {
+            while (body.kind === 245 /* ModuleDeclaration */) {
                 writePunctuation(".");
                 emit(body.name);
                 body = body.body;
@@ -85419,17 +86354,17 @@ var ts;
         }
         function emitImportEqualsDeclaration(node) {
             emitModifiers(node, node.modifiers);
-            emitTokenWithComment(92 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
+            emitTokenWithComment(93 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
             writeSpace();
             emit(node.name);
             writeSpace();
-            emitTokenWithComment(59 /* EqualsToken */, node.name.end, writePunctuation, node);
+            emitTokenWithComment(60 /* EqualsToken */, node.name.end, writePunctuation, node);
             writeSpace();
             emitModuleReference(node.moduleReference);
             writeTrailingSemicolon();
         }
         function emitModuleReference(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 emitExpression(node);
             }
             else {
@@ -85438,12 +86373,12 @@ var ts;
         }
         function emitImportDeclaration(node) {
             emitModifiers(node, node.modifiers);
-            emitTokenWithComment(92 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
+            emitTokenWithComment(93 /* ImportKeyword */, node.modifiers ? node.modifiers.end : node.pos, writeKeyword, node);
             writeSpace();
             if (node.importClause) {
                 emit(node.importClause);
                 writeSpace();
-                emitTokenWithComment(144 /* FromKeyword */, node.importClause.end, writeKeyword, node);
+                emitTokenWithComment(145 /* FromKeyword */, node.importClause.end, writeKeyword, node);
                 writeSpace();
             }
             emitExpression(node.moduleSpecifier);
@@ -85460,7 +86395,7 @@ var ts;
         function emitNamespaceImport(node) {
             var asPos = emitTokenWithComment(40 /* AsteriskToken */, node.pos, writePunctuation, node);
             writeSpace();
-            emitTokenWithComment(119 /* AsKeyword */, asPos, writeKeyword, node);
+            emitTokenWithComment(120 /* AsKeyword */, asPos, writeKeyword, node);
             writeSpace();
             emit(node.name);
         }
@@ -85471,20 +86406,20 @@ var ts;
             emitImportOrExportSpecifier(node);
         }
         function emitExportAssignment(node) {
-            var nextPos = emitTokenWithComment(85 /* ExportKeyword */, node.pos, writeKeyword, node);
+            var nextPos = emitTokenWithComment(86 /* ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.isExportEquals) {
-                emitTokenWithComment(59 /* EqualsToken */, nextPos, writeOperator, node);
+                emitTokenWithComment(60 /* EqualsToken */, nextPos, writeOperator, node);
             }
             else {
-                emitTokenWithComment(80 /* DefaultKeyword */, nextPos, writeKeyword, node);
+                emitTokenWithComment(81 /* DefaultKeyword */, nextPos, writeKeyword, node);
             }
             writeSpace();
             emitExpression(node.expression);
             writeTrailingSemicolon();
         }
         function emitExportDeclaration(node) {
-            var nextPos = emitTokenWithComment(85 /* ExportKeyword */, node.pos, writeKeyword, node);
+            var nextPos = emitTokenWithComment(86 /* ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.exportClause) {
                 emit(node.exportClause);
@@ -85495,18 +86430,18 @@ var ts;
             if (node.moduleSpecifier) {
                 writeSpace();
                 var fromPos = node.exportClause ? node.exportClause.end : nextPos;
-                emitTokenWithComment(144 /* FromKeyword */, fromPos, writeKeyword, node);
+                emitTokenWithComment(145 /* FromKeyword */, fromPos, writeKeyword, node);
                 writeSpace();
                 emitExpression(node.moduleSpecifier);
             }
             writeTrailingSemicolon();
         }
         function emitNamespaceExportDeclaration(node) {
-            var nextPos = emitTokenWithComment(85 /* ExportKeyword */, node.pos, writeKeyword, node);
+            var nextPos = emitTokenWithComment(86 /* ExportKeyword */, node.pos, writeKeyword, node);
             writeSpace();
-            nextPos = emitTokenWithComment(119 /* AsKeyword */, nextPos, writeKeyword, node);
+            nextPos = emitTokenWithComment(120 /* AsKeyword */, nextPos, writeKeyword, node);
             writeSpace();
-            nextPos = emitTokenWithComment(131 /* NamespaceKeyword */, nextPos, writeKeyword, node);
+            nextPos = emitTokenWithComment(132 /* NamespaceKeyword */, nextPos, writeKeyword, node);
             writeSpace();
             emit(node.name);
             writeTrailingSemicolon();
@@ -85526,7 +86461,7 @@ var ts;
             if (node.propertyName) {
                 emit(node.propertyName);
                 writeSpace();
-                emitTokenWithComment(119 /* AsKeyword */, node.propertyName.end, writeKeyword, node);
+                emitTokenWithComment(120 /* AsKeyword */, node.propertyName.end, writeKeyword, node);
                 writeSpace();
             }
             emit(node.name);
@@ -85604,7 +86539,7 @@ var ts;
             }
         }
         function emitJsxTagName(node) {
-            if (node.kind === 72 /* Identifier */) {
+            if (node.kind === 73 /* Identifier */) {
                 emitExpression(node);
             }
             else {
@@ -85615,13 +86550,13 @@ var ts;
         // Clauses
         //
         function emitCaseClause(node) {
-            emitTokenWithComment(74 /* CaseKeyword */, node.pos, writeKeyword, node);
+            emitTokenWithComment(75 /* CaseKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitCaseOrDefaultClauseRest(node, node.statements, node.expression.end);
         }
         function emitDefaultClause(node) {
-            var pos = emitTokenWithComment(80 /* DefaultKeyword */, node.pos, writeKeyword, node);
+            var pos = emitTokenWithComment(81 /* DefaultKeyword */, node.pos, writeKeyword, node);
             emitCaseOrDefaultClauseRest(node, node.statements, pos);
         }
         function emitCaseOrDefaultClauseRest(parentNode, statements, colonPos) {
@@ -85649,7 +86584,7 @@ var ts;
             emitList(node, node.types, 528 /* HeritageClauseTypes */);
         }
         function emitCatchClause(node) {
-            var openParenPos = emitTokenWithComment(75 /* CatchKeyword */, node.pos, writeKeyword, node);
+            var openParenPos = emitTokenWithComment(76 /* CatchKeyword */, node.pos, writeKeyword, node);
             writeSpace();
             if (node.variableDeclaration) {
                 emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
@@ -85719,7 +86654,7 @@ var ts;
                 }
             }
             if (node.tags) {
-                if (node.tags.length === 1 && node.tags[0].kind === 307 /* JSDocTypeTag */ && !node.comment) {
+                if (node.tags.length === 1 && node.tags[0].kind === 308 /* JSDocTypeTag */ && !node.comment) {
                     writeSpace();
                     emit(node.tags[0]);
                 }
@@ -85753,7 +86688,7 @@ var ts;
         function emitJSDocTypedefTag(tag) {
             emitJSDocTagName(tag.tagName);
             if (tag.typeExpression) {
-                if (tag.typeExpression.kind === 288 /* JSDocTypeExpression */) {
+                if (tag.typeExpression.kind === 289 /* JSDocTypeExpression */) {
                     emitJSDocTypeExpression(tag.typeExpression);
                 }
                 else {
@@ -85772,7 +86707,7 @@ var ts;
                 emit(tag.fullName);
             }
             emitJSDocComment(tag.comment);
-            if (tag.typeExpression && tag.typeExpression.kind === 297 /* JSDocTypeLiteral */) {
+            if (tag.typeExpression && tag.typeExpression.kind === 298 /* JSDocTypeLiteral */) {
                 emitJSDocTypeLiteral(tag.typeExpression);
             }
         }
@@ -85906,8 +86841,8 @@ var ts;
                     bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "reference" /* Reference */, data: directive.fileName });
                 writeLine();
             }
-            for (var _d = 0, types_19 = types; _d < types_19.length; _d++) {
-                var directive = types_19[_d];
+            for (var _d = 0, types_18 = types; _d < types_18.length; _d++) {
+                var directive = types_18[_d];
                 var pos = writer.getTextPos();
                 writeComment("/// <reference types=\"" + directive.fileName + "\" />");
                 if (bundleFileInfo)
@@ -86087,7 +87022,7 @@ var ts;
         function emitInitializer(node, equalCommentStartPos, container) {
             if (node) {
                 writeSpace();
-                emitTokenWithComment(59 /* EqualsToken */, equalCommentStartPos, writeOperator, container);
+                emitTokenWithComment(60 /* EqualsToken */, equalCommentStartPos, writeOperator, container);
                 writeSpace();
                 emitExpression(node);
             }
@@ -86550,7 +87485,7 @@ var ts;
                 && ts.rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile);
         }
         function skipSynthesizedParentheses(node) {
-            while (node.kind === 195 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) {
+            while (node.kind === 196 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) {
                 node = node.expression;
             }
             return node;
@@ -86615,81 +87550,81 @@ var ts;
             if (!node)
                 return;
             switch (node.kind) {
-                case 218 /* Block */:
+                case 219 /* Block */:
                     ts.forEach(node.statements, generateNames);
                     break;
-                case 233 /* LabeledStatement */:
-                case 231 /* WithStatement */:
-                case 223 /* DoStatement */:
-                case 224 /* WhileStatement */:
+                case 234 /* LabeledStatement */:
+                case 232 /* WithStatement */:
+                case 224 /* DoStatement */:
+                case 225 /* WhileStatement */:
                     generateNames(node.statement);
                     break;
-                case 222 /* IfStatement */:
+                case 223 /* IfStatement */:
                     generateNames(node.thenStatement);
                     generateNames(node.elseStatement);
                     break;
-                case 225 /* ForStatement */:
-                case 227 /* ForOfStatement */:
-                case 226 /* ForInStatement */:
+                case 226 /* ForStatement */:
+                case 228 /* ForOfStatement */:
+                case 227 /* ForInStatement */:
                     generateNames(node.initializer);
                     generateNames(node.statement);
                     break;
-                case 232 /* SwitchStatement */:
+                case 233 /* SwitchStatement */:
                     generateNames(node.caseBlock);
                     break;
-                case 246 /* CaseBlock */:
+                case 247 /* CaseBlock */:
                     ts.forEach(node.clauses, generateNames);
                     break;
-                case 271 /* CaseClause */:
-                case 272 /* DefaultClause */:
+                case 272 /* CaseClause */:
+                case 273 /* DefaultClause */:
                     ts.forEach(node.statements, generateNames);
                     break;
-                case 235 /* TryStatement */:
+                case 236 /* TryStatement */:
                     generateNames(node.tryBlock);
                     generateNames(node.catchClause);
                     generateNames(node.finallyBlock);
                     break;
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     generateNames(node.variableDeclaration);
                     generateNames(node.block);
                     break;
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     generateNames(node.declarationList);
                     break;
-                case 238 /* VariableDeclarationList */:
+                case 239 /* VariableDeclarationList */:
                     ts.forEach(node.declarations, generateNames);
                     break;
-                case 237 /* VariableDeclaration */:
-                case 151 /* Parameter */:
-                case 186 /* BindingElement */:
-                case 240 /* ClassDeclaration */:
+                case 238 /* VariableDeclaration */:
+                case 152 /* Parameter */:
+                case 187 /* BindingElement */:
+                case 241 /* ClassDeclaration */:
                     generateNameIfNeeded(node.name);
                     break;
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     generateNameIfNeeded(node.name);
                     if (ts.getEmitFlags(node) & 524288 /* ReuseTempVariableScope */) {
                         ts.forEach(node.parameters, generateNames);
                         generateNames(node.body);
                     }
                     break;
-                case 184 /* ObjectBindingPattern */:
-                case 185 /* ArrayBindingPattern */:
+                case 185 /* ObjectBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
                     ts.forEach(node.elements, generateNames);
                     break;
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     generateNames(node.importClause);
                     break;
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     generateNameIfNeeded(node.name);
                     generateNames(node.namedBindings);
                     break;
-                case 251 /* NamespaceImport */:
+                case 252 /* NamespaceImport */:
                     generateNameIfNeeded(node.name);
                     break;
-                case 252 /* NamedImports */:
+                case 253 /* NamedImports */:
                     ts.forEach(node.elements, generateNames);
                     break;
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     generateNameIfNeeded(node.propertyName || node.name);
                     break;
             }
@@ -86698,12 +87633,12 @@ var ts;
             if (!node)
                 return;
             switch (node.kind) {
-                case 275 /* PropertyAssignment */:
-                case 276 /* ShorthandPropertyAssignment */:
-                case 154 /* PropertyDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 276 /* PropertyAssignment */:
+                case 277 /* ShorthandPropertyAssignment */:
+                case 155 /* PropertyDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     generateNameIfNeeded(node.name);
                     break;
             }
@@ -86883,24 +87818,26 @@ var ts;
          */
         function generateNameForNode(node, flags) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return makeUniqueName(getTextOfNode(node), isUniqueName, !!(flags & 16 /* Optimistic */), !!(flags & 8 /* ReservedInNestedScopes */));
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return generateNameForModuleOrEnum(node);
-                case 249 /* ImportDeclaration */:
-                case 255 /* ExportDeclaration */:
+                case 250 /* ImportDeclaration */:
+                case 256 /* ExportDeclaration */:
                     return generateNameForImportOrExportDeclaration(node);
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 254 /* ExportAssignment */:
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 255 /* ExportAssignment */:
                     return generateNameForExportDefault();
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     return generateNameForClassExpression();
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return generateNameForMethodOrAccessor(node);
+                case 150 /* ComputedPropertyName */:
+                    return makeTempVariableName(0 /* Auto */, /*reserveInNestedScopes*/ true);
                 default:
                     return makeTempVariableName(0 /* Auto */);
             }
@@ -86946,7 +87883,7 @@ var ts;
             hasWrittenComment = false;
             var emitFlags = ts.getEmitFlags(node);
             var _a = ts.getCommentRange(node), pos = _a.pos, end = _a.end;
-            var isEmittedNode = node.kind !== 312 /* NotEmittedStatement */;
+            var isEmittedNode = node.kind !== 313 /* NotEmittedStatement */;
             // We have to explicitly check that the node is JsxText because if the compilerOptions.jsx is "preserve" we will not do any transformation.
             // It is expensive to walk entire tree just to set one kind of node to have no comments.
             var skipLeadingComments = pos < 0 || (emitFlags & 512 /* NoLeadingComments */) !== 0 || node.kind === 11 /* JsxText */;
@@ -86970,7 +87907,7 @@ var ts;
                     containerEnd = end;
                     // To avoid invalid comment emit in a down-level binding pattern, we
                     // keep track of the last declaration list container's end
-                    if (node.kind === 238 /* VariableDeclarationList */) {
+                    if (node.kind === 239 /* VariableDeclarationList */) {
                         declarationListContainerEnd = end;
                     }
                 }
@@ -87227,7 +88164,7 @@ var ts;
             else {
                 var _a = ts.getSourceMapRange(node), pos = _a.pos, end = _a.end, _b = _a.source, source = _b === void 0 ? sourceMapSource : _b;
                 var emitFlags = ts.getEmitFlags(node);
-                if (node.kind !== 312 /* NotEmittedStatement */
+                if (node.kind !== 313 /* NotEmittedStatement */
                     && (emitFlags & 16 /* NoLeadingSourceMap */) === 0
                     && pos >= 0) {
                     emitSourcePos(source, skipSourceTrivia(source, pos));
@@ -87240,7 +88177,7 @@ var ts;
                 else {
                     pipelinePhase(hint, node);
                 }
-                if (node.kind !== 312 /* NotEmittedStatement */
+                if (node.kind !== 313 /* NotEmittedStatement */
                     && (emitFlags & 32 /* NoTrailingSourceMap */) === 0
                     && end >= 0) {
                     emitSourcePos(source, end);
@@ -87855,7 +88792,8 @@ var ts;
             getDirectories: function (path) { return system.getDirectories(path); },
             realpath: realpath,
             readDirectory: function (path, extensions, include, exclude, depth) { return system.readDirectory(path, extensions, include, exclude, depth); },
-            createDirectory: function (d) { return system.createDirectory(d); }
+            createDirectory: function (d) { return system.createDirectory(d); },
+            createHash: ts.maybeBind(system, system.createHash)
         };
         return compilerHost;
     }
@@ -88141,6 +89079,7 @@ var ts;
         }
     }
     ts.flattenDiagnosticMessageText = flattenDiagnosticMessageText;
+    /* @internal */
     function loadWithLocalCache(names, containingFile, redirectedReference, loader) {
         if (names.length === 0) {
             return [];
@@ -88160,6 +89099,7 @@ var ts;
         }
         return resolutions;
     }
+    ts.loadWithLocalCache = loadWithLocalCache;
     /**
      * Determines if program structure is upto date or needs to be recreated
      */
@@ -88319,7 +89259,7 @@ var ts;
             }); };
         }
         else {
-            moduleResolutionCache = ts.createModuleResolutionCache(currentDirectory, function (x) { return host.getCanonicalFileName(x); });
+            moduleResolutionCache = ts.createModuleResolutionCache(currentDirectory, function (x) { return host.getCanonicalFileName(x); }, options);
             var loader_1 = function (moduleName, containingFile, redirectedReference) { return ts.resolveModuleName(moduleName, containingFile, options, host, moduleResolutionCache, redirectedReference).resolvedModule; }; // TODO: GH#18217
             resolveModuleNamesWorker = function (moduleNames, containingFile, _reusedNames, redirectedReference) { return loadWithLocalCache(ts.Debug.assertEachDefined(moduleNames), containingFile, redirectedReference, loader_1); };
         }
@@ -88465,6 +89405,7 @@ var ts;
             getIdentifierCount: function () { return getDiagnosticsProducingTypeChecker().getIdentifierCount(); },
             getSymbolCount: function () { return getDiagnosticsProducingTypeChecker().getSymbolCount(); },
             getTypeCount: function () { return getDiagnosticsProducingTypeChecker().getTypeCount(); },
+            getRelationCacheSizes: function () { return getDiagnosticsProducingTypeChecker().getRelationCacheSizes(); },
             getFileProcessingDiagnostics: function () { return fileProcessingDiagnostics; },
             getResolvedTypeReferenceDirectives: function () { return resolvedTypeReferenceDirectives; },
             isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
@@ -88562,13 +89503,13 @@ var ts;
                 // which per above occurred during the current program creation.
                 // Since we assume the filesystem does not change during program creation,
                 // it is safe to reuse resolutions from the earlier call.
-                var result_6 = [];
+                var result_8 = [];
                 for (var _i = 0, moduleNames_1 = moduleNames; _i < moduleNames_1.length; _i++) {
                     var moduleName = moduleNames_1[_i];
                     var resolvedModule = file.resolvedModules.get(moduleName);
-                    result_6.push(resolvedModule);
+                    result_8.push(resolvedModule);
                 }
-                return result_6;
+                return result_8;
             }
             // At this point, we know at least one of the following hold:
             // - file has local declarations for ambient modules
@@ -88655,7 +89596,7 @@ var ts;
             function moduleNameResolvesToAmbientModuleInNonModifiedFile(moduleName) {
                 var resolutionToFile = ts.getResolvedModule(oldSourceFile, moduleName);
                 var resolvedFile = resolutionToFile && oldProgram.getSourceFile(resolutionToFile.resolvedFileName);
-                if (resolutionToFile && resolvedFile && !resolvedFile.externalModuleIndicator) {
+                if (resolutionToFile && resolvedFile) {
                     // In the old program, we resolved to an ambient module that was in the same
                     //   place as we expected to find an actual module file.
                     // We actually need to return 'false' here even though this seems like a 'true' case
@@ -88918,9 +89859,8 @@ var ts;
             ts.performance.mark("beforeEmit");
             var emitResult = ts.emitFiles(ts.notImplementedResolver, getEmitHost(writeFileCallback), 
             /*targetSourceFile*/ undefined, 
+            /*transformers*/ ts.noTransformers, 
             /*emitOnlyDtsFiles*/ false, 
-            /*transformers*/ undefined, 
-            /*declaraitonTransformers*/ undefined, 
             /*onlyBuildInfo*/ true);
             ts.performance.mark("afterEmit");
             ts.performance.measure("Emit", "beforeEmit", "afterEmit");
@@ -89008,8 +89948,7 @@ var ts;
             // checked is to not pass the file to getEmitResolver.
             var emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver((options.outFile || options.out) ? undefined : sourceFile, cancellationToken);
             ts.performance.mark("beforeEmit");
-            var transformers = emitOnlyDtsFiles ? [] : ts.getTransformers(options, customTransformers);
-            var emitResult = ts.emitFiles(emitResolver, getEmitHost(writeFileCallback), sourceFile, emitOnlyDtsFiles, transformers, customTransformers && customTransformers.afterDeclarations);
+            var emitResult = ts.emitFiles(emitResolver, getEmitHost(writeFileCallback), sourceFile, ts.getTransformers(options, customTransformers, emitOnlyDtsFiles), emitOnlyDtsFiles);
             ts.performance.mark("afterEmit");
             ts.performance.measure("Emit", "beforeEmit", "afterEmit");
             return emitResult;
@@ -89151,22 +90090,22 @@ var ts;
                     // Return directly from the case if the given node doesnt want to visit each child
                     // Otherwise break to visit each child
                     switch (parent.kind) {
-                        case 151 /* Parameter */:
-                        case 154 /* PropertyDeclaration */:
+                        case 152 /* Parameter */:
+                        case 155 /* PropertyDeclaration */:
                             if (parent.questionToken === node) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, "?"));
                                 return;
                             }
                         // falls through
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 157 /* Constructor */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
-                        case 196 /* FunctionExpression */:
-                        case 239 /* FunctionDeclaration */:
-                        case 197 /* ArrowFunction */:
-                        case 237 /* VariableDeclaration */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 158 /* Constructor */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
+                        case 197 /* FunctionExpression */:
+                        case 240 /* FunctionDeclaration */:
+                        case 198 /* ArrowFunction */:
+                        case 238 /* VariableDeclaration */:
                             // type annotation
                             if (parent.type === node) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
@@ -89174,41 +90113,41 @@ var ts;
                             }
                     }
                     switch (node.kind) {
-                        case 248 /* ImportEqualsDeclaration */:
+                        case 249 /* ImportEqualsDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_a_ts_file));
                             return;
-                        case 254 /* ExportAssignment */:
+                        case 255 /* ExportAssignment */:
                             if (node.isExportEquals) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                             break;
-                        case 273 /* HeritageClause */:
+                        case 274 /* HeritageClause */:
                             var heritageClause = node;
-                            if (heritageClause.token === 109 /* ImplementsKeyword */) {
+                            if (heritageClause.token === 110 /* ImplementsKeyword */) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                             break;
-                        case 241 /* InterfaceDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
                             return;
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
                             return;
-                        case 242 /* TypeAliasDeclaration */:
+                        case 243 /* TypeAliasDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
                             return;
-                        case 243 /* EnumDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
                             return;
-                        case 213 /* NonNullExpression */:
+                        case 214 /* NonNullExpression */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.non_null_assertions_can_only_be_used_in_a_ts_file));
                             return;
-                        case 212 /* AsExpression */:
+                        case 213 /* AsExpression */:
                             diagnostics.push(createDiagnosticForNode(node.type, ts.Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
                             return;
-                        case 194 /* TypeAssertionExpression */:
+                        case 195 /* TypeAssertionExpression */:
                             ts.Debug.fail(); // Won't parse these in a JS file anyway, as they are interpreted as JSX.
                     }
                     var prevParent = parent;
@@ -89218,54 +90157,54 @@ var ts;
                 }
                 function walkArray(nodes) {
                     if (parent.decorators === nodes && !options.experimentalDecorators) {
-                        diagnostics.push(createDiagnosticForNode(parent, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning));
+                        diagnostics.push(createDiagnosticForNode(parent, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning));
                     }
                     switch (parent.kind) {
-                        case 240 /* ClassDeclaration */:
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 157 /* Constructor */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
-                        case 196 /* FunctionExpression */:
-                        case 239 /* FunctionDeclaration */:
-                        case 197 /* ArrowFunction */:
+                        case 241 /* ClassDeclaration */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 158 /* Constructor */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
+                        case 197 /* FunctionExpression */:
+                        case 240 /* FunctionDeclaration */:
+                        case 198 /* ArrowFunction */:
                             // Check type parameters
                             if (nodes === parent.typeParameters) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.type_parameter_declarations_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                         // falls through
-                        case 219 /* VariableStatement */:
+                        case 220 /* VariableStatement */:
                             // Check modifiers
                             if (nodes === parent.modifiers) {
-                                return checkModifiers(nodes, parent.kind === 219 /* VariableStatement */);
+                                return checkModifiers(nodes, parent.kind === 220 /* VariableStatement */);
                             }
                             break;
-                        case 154 /* PropertyDeclaration */:
+                        case 155 /* PropertyDeclaration */:
                             // Check modifiers of property declaration
                             if (nodes === parent.modifiers) {
                                 for (var _i = 0, _a = nodes; _i < _a.length; _i++) {
                                     var modifier = _a[_i];
-                                    if (modifier.kind !== 116 /* StaticKeyword */) {
+                                    if (modifier.kind !== 117 /* StaticKeyword */) {
                                         diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
                                     }
                                 }
                                 return;
                             }
                             break;
-                        case 151 /* Parameter */:
+                        case 152 /* Parameter */:
                             // Check modifiers of parameter declaration
                             if (nodes === parent.modifiers) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.parameter_modifiers_can_only_be_used_in_a_ts_file));
                                 return;
                             }
                             break;
-                        case 191 /* CallExpression */:
-                        case 192 /* NewExpression */:
-                        case 211 /* ExpressionWithTypeArguments */:
-                        case 261 /* JsxSelfClosingElement */:
-                        case 262 /* JsxOpeningElement */:
+                        case 192 /* CallExpression */:
+                        case 193 /* NewExpression */:
+                        case 212 /* ExpressionWithTypeArguments */:
+                        case 262 /* JsxSelfClosingElement */:
+                        case 263 /* JsxOpeningElement */:
                             // Check type arguments
                             if (nodes === parent.typeArguments) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.type_arguments_can_only_be_used_in_a_ts_file));
@@ -89282,24 +90221,24 @@ var ts;
                     for (var _i = 0, modifiers_1 = modifiers; _i < modifiers_1.length; _i++) {
                         var modifier = modifiers_1[_i];
                         switch (modifier.kind) {
-                            case 77 /* ConstKeyword */:
+                            case 78 /* ConstKeyword */:
                                 if (isConstValid) {
                                     continue;
                                 }
                             // to report error,
                             // falls through
-                            case 115 /* PublicKeyword */:
-                            case 113 /* PrivateKeyword */:
-                            case 114 /* ProtectedKeyword */:
-                            case 133 /* ReadonlyKeyword */:
-                            case 125 /* DeclareKeyword */:
-                            case 118 /* AbstractKeyword */:
+                            case 116 /* PublicKeyword */:
+                            case 114 /* PrivateKeyword */:
+                            case 115 /* ProtectedKeyword */:
+                            case 134 /* ReadonlyKeyword */:
+                            case 126 /* DeclareKeyword */:
+                            case 119 /* AbstractKeyword */:
                                 diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
                                 break;
                             // These are all legal modifiers.
-                            case 116 /* StaticKeyword */:
-                            case 85 /* ExportKeyword */:
-                            case 80 /* DefaultKeyword */:
+                            case 117 /* StaticKeyword */:
+                            case 86 /* ExportKeyword */:
+                            case 81 /* DefaultKeyword */:
                         }
                     }
                 }
@@ -89374,8 +90313,8 @@ var ts;
             return a.fileName === b.fileName;
         }
         function moduleNameIsEqualTo(a, b) {
-            return a.kind === 72 /* Identifier */
-                ? b.kind === 72 /* Identifier */ && a.escapedText === b.escapedText
+            return a.kind === 73 /* Identifier */
+                ? b.kind === 73 /* Identifier */ && a.escapedText === b.escapedText
                 : b.kind === 10 /* StringLiteral */ && a.text === b.text;
         }
         function collectExternalModuleReferences(file) {
@@ -89590,7 +90529,10 @@ var ts;
                     if (isRedirect) {
                         inputName = getProjectReferenceRedirect(fileName) || fileName;
                     }
-                    if (ts.getNormalizedAbsolutePath(checkedName, currentDirectory) !== ts.getNormalizedAbsolutePath(inputName, currentDirectory)) {
+                    // Check if it differs only in drive letters its ok to ignore that error:
+                    var checkedAbsolutePath = ts.getNormalizedAbsolutePathWithoutRoot(checkedName, currentDirectory);
+                    var inputAbsolutePath = ts.getNormalizedAbsolutePathWithoutRoot(inputName, currentDirectory);
+                    if (checkedAbsolutePath !== inputAbsolutePath) {
                         reportFileNamesDifferOnlyInCasingError(inputName, checkedName, refFile, refPos, refEnd);
                     }
                 }
@@ -89619,8 +90561,13 @@ var ts;
             }
             var redirectedPath;
             if (refFile) {
-                var redirect = getProjectReferenceRedirect(fileName);
-                if (redirect) {
+                var redirectProject = getProjectReferenceRedirectProject(fileName);
+                if (redirectProject) {
+                    if (redirectProject.commandLine.options.outFile || redirectProject.commandLine.options.out) {
+                        // Shouldnt create many to 1 mapping file in --out scenario
+                        return undefined;
+                    }
+                    var redirect = getProjectReferenceOutputName(redirectProject, fileName);
                     fileName = redirect;
                     // Once we start redirecting to a file, we can potentially come back to it
                     // via a back-reference from another file in the .d.ts folder. If that happens we'll
@@ -89704,16 +90651,19 @@ var ts;
             }
         }
         function getProjectReferenceRedirect(fileName) {
+            var referencedProject = getProjectReferenceRedirectProject(fileName);
+            return referencedProject && getProjectReferenceOutputName(referencedProject, fileName);
+        }
+        function getProjectReferenceRedirectProject(fileName) {
             // Ignore dts or any of the non ts files
             if (!resolvedProjectReferences || !resolvedProjectReferences.length || ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) || !ts.fileExtensionIsOneOf(fileName, ts.supportedTSExtensions)) {
                 return undefined;
             }
             // If this file is produced by a referenced project, we need to rewrite it to
             // look in the output folder of the referenced project rather than the input
-            var referencedProject = getResolvedProjectReferenceToRedirect(fileName);
-            if (!referencedProject) {
-                return undefined;
-            }
+            return getResolvedProjectReferenceToRedirect(fileName);
+        }
+        function getProjectReferenceOutputName(referencedProject, fileName) {
             var out = referencedProject.commandLine.options.outFile || referencedProject.commandLine.options.out;
             return out ?
                 ts.changeExtension(out, ".d.ts" /* Dts */) :
@@ -89958,18 +90908,33 @@ var ts;
             if (fromCache !== undefined) {
                 return fromCache || undefined;
             }
-            // An absolute path pointing to the containing directory of the config file
-            var basePath = ts.getNormalizedAbsolutePath(ts.getDirectoryPath(refPath), host.getCurrentDirectory());
-            var sourceFile = host.getSourceFile(refPath, 100 /* JSON */);
-            addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined);
-            if (sourceFile === undefined) {
-                projectReferenceRedirects.set(sourceFilePath, false);
-                return undefined;
+            var commandLine;
+            var sourceFile;
+            if (host.getParsedCommandLine) {
+                commandLine = host.getParsedCommandLine(refPath);
+                if (!commandLine) {
+                    addFileToFilesByName(/*sourceFile*/ undefined, sourceFilePath, /*redirectedPath*/ undefined);
+                    projectReferenceRedirects.set(sourceFilePath, false);
+                    return undefined;
+                }
+                sourceFile = ts.Debug.assertDefined(commandLine.options.configFile);
+                ts.Debug.assert(!sourceFile.path || sourceFile.path === sourceFilePath);
+                addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined);
+            }
+            else {
+                // An absolute path pointing to the containing directory of the config file
+                var basePath = ts.getNormalizedAbsolutePath(ts.getDirectoryPath(refPath), host.getCurrentDirectory());
+                sourceFile = host.getSourceFile(refPath, 100 /* JSON */);
+                addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined);
+                if (sourceFile === undefined) {
+                    projectReferenceRedirects.set(sourceFilePath, false);
+                    return undefined;
+                }
+                commandLine = ts.parseJsonSourceFileConfigFileContent(sourceFile, configParsingHost, basePath, /*existingOptions*/ undefined, refPath);
             }
             sourceFile.path = sourceFilePath;
             sourceFile.resolvedPath = sourceFilePath;
             sourceFile.originalFileName = refPath;
-            var commandLine = ts.parseJsonSourceFileConfigFileContent(sourceFile, configParsingHost, basePath, /*existingOptions*/ undefined, refPath);
             var resolvedRef = { commandLine: commandLine, sourceFile: sourceFile };
             projectReferenceRedirects.set(sourceFilePath, resolvedRef);
             if (commandLine.projectReferences) {
@@ -89985,9 +90950,6 @@ var ts;
                 if (ts.getEmitDeclarations(options)) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, getEmitDeclarationOptionName(options), "isolatedModules");
                 }
-                if (options.noEmitOnError) {
-                    createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmitOnError", "isolatedModules");
-                }
                 if (options.out) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "out", "isolatedModules");
                 }
@@ -90019,17 +90981,17 @@ var ts;
                     createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1_or_option_2, "tsBuildInfoFile", "incremental", "composite");
                 }
             }
+            else if (options.incremental && !options.outFile && !options.out && !options.configFilePath) {
+                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBuildInfoFile_is_specified));
+            }
             verifyProjectReferences();
             // List of collected files is complete; validate exhautiveness if this is a project with a file list
             if (options.composite) {
                 var rootPaths = rootNames.map(toPath);
                 for (var _i = 0, files_3 = files; _i < files_3.length; _i++) {
                     var file = files_3[_i];
-                    // Ignore declaration files
-                    if (file.isDeclarationFile)
-                        continue;
-                    // Ignore json file thats from project reference
-                    if (ts.isJsonSourceFile(file) && getResolvedProjectReferenceToRedirect(file.fileName))
+                    // Ignore file that is not emitted
+                    if (!ts.sourceFileMayBeEmitted(file, options, isSourceFileFromExternalLibrary, getResolvedProjectReferenceToRedirect))
                         continue;
                     if (rootPaths.indexOf(file.path) === -1) {
                         programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_is_not_in_project_file_list_Projects_must_list_all_files_or_use_an_include_pattern, file.fileName));
@@ -90106,10 +91068,10 @@ var ts;
                 if (options.module === ts.ModuleKind.None && languageVersion < 2 /* ES2015 */) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher, "isolatedModules", "target");
                 }
-                var firstNonExternalModuleSourceFile = ts.find(files, function (f) { return !ts.isExternalModule(f) && !f.isDeclarationFile && f.scriptKind !== 6 /* JSON */; });
+                var firstNonExternalModuleSourceFile = ts.find(files, function (f) { return !ts.isExternalModule(f) && !ts.isSourceFileJS(f) && !f.isDeclarationFile && f.scriptKind !== 6 /* JSON */; });
                 if (firstNonExternalModuleSourceFile) {
                     var span = ts.getErrorSpanForNode(firstNonExternalModuleSourceFile, firstNonExternalModuleSourceFile);
-                    programDiagnostics.add(ts.createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided));
+                    programDiagnostics.add(ts.createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.All_files_must_be_modules_when_the_isolatedModules_flag_is_provided));
                 }
             }
             else if (firstNonAmbientExternalModuleSourceFile && languageVersion < 2 /* ES2015 */ && options.module === ts.ModuleKind.None) {
@@ -90194,13 +91156,13 @@ var ts;
                     var emitFilePath = toPath(emitFileName);
                     // Report error if the output overwrites input file
                     if (filesByName.has(emitFilePath)) {
-                        var chain_2;
+                        var chain = void 0;
                         if (!options.configFilePath) {
                             // The program is from either an inferred project or an external project
-                            chain_2 = ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
+                            chain = ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Adding_a_tsconfig_json_file_will_help_organize_projects_that_contain_both_TypeScript_and_JavaScript_files_Learn_more_at_https_Colon_Slash_Slashaka_ms_Slashtsconfig);
                         }
-                        chain_2 = ts.chainDiagnosticMessages(chain_2, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
-                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnosticFromMessageChain(chain_2));
+                        chain = ts.chainDiagnosticMessages(chain, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file, emitFileName);
+                        blockEmittingOfFile(emitFileName, ts.createCompilerDiagnosticFromMessageChain(chain));
                     }
                     var emitFileKey = !host.useCaseSensitiveFileNames() ? emitFilePath.toLocaleLowerCase() : emitFilePath;
                     // Report error if multiple files write into same file
@@ -90735,6 +91697,7 @@ var ts;
             cacheToUpdateSignature.set(sourceFile.path, latestSignature);
             return !prevSignature || latestSignature !== prevSignature;
         }
+        BuilderState.updateShapeSignature = updateShapeSignature;
         /**
          * Coverts the declaration emit result into exported modules map
          */
@@ -91012,15 +91975,9 @@ var ts;
                 }
             }
         });
-        if (oldCompilerOptions &&
-            (oldCompilerOptions.outDir !== compilerOptions.outDir ||
-                oldCompilerOptions.declarationDir !== compilerOptions.declarationDir ||
-                (oldCompilerOptions.outFile || oldCompilerOptions.out) !== (compilerOptions.outFile || compilerOptions.out))) {
+        if (oldCompilerOptions && ts.compilerOptionsAffectEmit(compilerOptions, oldCompilerOptions)) {
             // Add all files to affectedFilesPendingEmit since emit changed
-            state.affectedFilesPendingEmit = ts.concatenate(state.affectedFilesPendingEmit, newProgram.getSourceFiles().map(function (f) { return f.path; }));
-            if (state.affectedFilesPendingEmitIndex === undefined) {
-                state.affectedFilesPendingEmitIndex = 0;
-            }
+            addToAffectedFilesPendingEmit(state, newProgram.getSourceFiles().map(function (f) { return f.path; }));
             ts.Debug.assert(state.seenAffectedFiles === undefined);
             state.seenAffectedFiles = ts.createMap();
         }
@@ -91104,7 +92061,7 @@ var ts;
                     if (!seenAffectedFiles.has(affectedFile.path)) {
                         // Set the next affected file as seen and remove the cached semantic diagnostics
                         state.affectedFilesIndex = affectedFilesIndex;
-                        cleanSemanticDiagnosticsOfAffectedFile(state, affectedFile);
+                        handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, computeHash);
                         return affectedFile;
                     }
                     seenAffectedFiles.set(affectedFile.path, true);
@@ -91165,28 +92122,68 @@ var ts;
         return undefined;
     }
     /**
-     * Remove the semantic diagnostics cached from old state for affected File and the files that are referencing modules that export entities from affected file
+     *  Handles semantic diagnostics and dts emit for affectedFile and files, that are referencing modules that export entities from affected file
+     *  This is because even though js emit doesnt change, dts emit / type used can change resulting in need for dts emit and js change
      */
-    function cleanSemanticDiagnosticsOfAffectedFile(state, affectedFile) {
-        if (removeSemanticDiagnosticsOf(state, affectedFile.path)) {
-            // If there are no more diagnostics from old cache, done
+    function handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, computeHash) {
+        removeSemanticDiagnosticsOf(state, affectedFile.path);
+        // If affected files is everything except default library, then nothing more to do
+        if (state.allFilesExcludingDefaultLibraryFile === state.affectedFiles) {
+            if (!state.cleanedDiagnosticsOfLibFiles) {
+                state.cleanedDiagnosticsOfLibFiles = true;
+                var program_1 = ts.Debug.assertDefined(state.program);
+                var options_2 = program_1.getCompilerOptions();
+                ts.forEach(program_1.getSourceFiles(), function (f) {
+                    return program_1.isSourceFileDefaultLibrary(f) &&
+                        !ts.skipTypeChecking(f, options_2) &&
+                        removeSemanticDiagnosticsOf(state, f.path);
+                });
+            }
             return;
         }
-        // Clean lib file diagnostics if its all files excluding default files to emit
-        if (state.allFilesExcludingDefaultLibraryFile === state.affectedFiles && !state.cleanedDiagnosticsOfLibFiles) {
-            state.cleanedDiagnosticsOfLibFiles = true;
-            var program_1 = ts.Debug.assertDefined(state.program);
-            var options_2 = program_1.getCompilerOptions();
-            if (ts.forEach(program_1.getSourceFiles(), function (f) {
-                return program_1.isSourceFileDefaultLibrary(f) &&
-                    !ts.skipTypeChecking(f, options_2) &&
-                    removeSemanticDiagnosticsOf(state, f.path);
-            })) {
-                return;
+        forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, function (state, path) { return handleDtsMayChangeOf(state, path, cancellationToken, computeHash); });
+    }
+    /**
+     * Handle the dts may change, so they need to be added to pending emit if dts emit is enabled,
+     * Also we need to make sure signature is updated for these files
+     */
+    function handleDtsMayChangeOf(state, path, cancellationToken, computeHash) {
+        removeSemanticDiagnosticsOf(state, path);
+        if (!state.changedFilesSet.has(path)) {
+            var program = ts.Debug.assertDefined(state.program);
+            var sourceFile = program.getSourceFileByPath(path);
+            if (sourceFile) {
+                // Even though the js emit doesnt change and we are already handling dts emit and semantic diagnostics
+                // we need to update the signature to reflect correctness of the signature(which is output d.ts emit) of this file
+                // This ensures that we dont later during incremental builds considering wrong signature.
+                // Eg where this also is needed to ensure that .tsbuildinfo generated by incremental build should be same as if it was first fresh build
+                ts.BuilderState.updateShapeSignature(state, program, sourceFile, ts.Debug.assertDefined(state.currentAffectedFilesSignatures), cancellationToken, computeHash, state.currentAffectedFilesExportedModulesMap);
+                // If not dts emit, nothing more to do
+                if (ts.getEmitDeclarations(state.compilerOptions)) {
+                    addToAffectedFilesPendingEmit(state, [path]);
+                }
             }
         }
-        // If there was change in signature for the changed file,
-        // then delete the semantic diagnostics for files that are affected by using exports of this module
+        return false;
+    }
+    /**
+     * Removes semantic diagnostics for path and
+     * returns true if there are no more semantic diagnostics from the old state
+     */
+    function removeSemanticDiagnosticsOf(state, path) {
+        if (!state.semanticDiagnosticsFromOldState) {
+            return true;
+        }
+        state.semanticDiagnosticsFromOldState.delete(path);
+        state.semanticDiagnosticsPerFile.delete(path);
+        return !state.semanticDiagnosticsFromOldState.size;
+    }
+    /**
+     * Iterate on referencing modules that export entities from affected file
+     */
+    function forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, fn) {
+        // If there was change in signature (dts output) for the changed file,
+        // then only we need to handle pending file emit
         if (!state.exportedModulesMap || state.affectedFiles.length === 1 || !state.changedFilesSet.has(affectedFile.path)) {
             return;
         }
@@ -91197,7 +92194,7 @@ var ts;
         if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
             return exportedModules &&
                 exportedModules.has(affectedFile.path) &&
-                removeSemanticDiagnosticsOfFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile);
+                forEachFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile, fn);
         })) {
             return;
         }
@@ -91205,26 +92202,25 @@ var ts;
         ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
             return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) && // If we already iterated this through cache, ignore it
                 exportedModules.has(affectedFile.path) &&
-                removeSemanticDiagnosticsOfFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile);
+                forEachFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile, fn);
         });
     }
     /**
-     * removes the semantic diagnostics of files referencing referencedPath and
-     * returns true if there are no more semantic diagnostics from old state
+     * Iterate on files referencing referencedPath
      */
-    function removeSemanticDiagnosticsOfFilesReferencingPath(state, referencedPath, seenFileAndExportsOfFile) {
+    function forEachFilesReferencingPath(state, referencedPath, seenFileAndExportsOfFile, fn) {
         return ts.forEachEntry(state.referencedMap, function (referencesInFile, filePath) {
-            return referencesInFile.has(referencedPath) && removeSemanticDiagnosticsOfFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile);
+            return referencesInFile.has(referencedPath) && forEachFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, fn);
         });
     }
     /**
-     * Removes semantic diagnostics of file and anything that exports this file
+     * fn on file and iterate on anything that exports this file
      */
-    function removeSemanticDiagnosticsOfFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile) {
+    function forEachFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, fn) {
         if (!ts.addToSeen(seenFileAndExportsOfFile, filePath)) {
             return false;
         }
-        if (removeSemanticDiagnosticsOf(state, filePath)) {
+        if (fn(state, filePath)) {
             // If there are no more diagnostics from old cache, done
             return true;
         }
@@ -91234,7 +92230,7 @@ var ts;
         if (ts.forEachEntry(state.currentAffectedFilesExportedModulesMap, function (exportedModules, exportedFromPath) {
             return exportedModules &&
                 exportedModules.has(filePath) &&
-                removeSemanticDiagnosticsOfFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile);
+                forEachFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile, fn);
         })) {
             return true;
         }
@@ -91242,7 +92238,7 @@ var ts;
         if (ts.forEachEntry(state.exportedModulesMap, function (exportedModules, exportedFromPath) {
             return !state.currentAffectedFilesExportedModulesMap.has(exportedFromPath) && // If we already iterated this through cache, ignore it
                 exportedModules.has(filePath) &&
-                removeSemanticDiagnosticsOfFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile);
+                forEachFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile, fn);
         })) {
             return true;
         }
@@ -91250,22 +92246,10 @@ var ts;
         return !!ts.forEachEntry(state.referencedMap, function (referencesInFile, referencingFilePath) {
             return referencesInFile.has(filePath) &&
                 !seenFileAndExportsOfFile.has(referencingFilePath) && // Not already removed diagnostic file
-                removeSemanticDiagnosticsOf(state, referencingFilePath);
+                fn(state, referencingFilePath);
         } // Dont add to seen since this is not yet done with the export removal
         );
     }
-    /**
-     * Removes semantic diagnostics for path and
-     * returns true if there are no more semantic diagnostics from the old state
-     */
-    function removeSemanticDiagnosticsOf(state, path) {
-        if (!state.semanticDiagnosticsFromOldState) {
-            return true;
-        }
-        state.semanticDiagnosticsFromOldState.delete(path);
-        state.semanticDiagnosticsPerFile.delete(path);
-        return !state.semanticDiagnosticsFromOldState.size;
-    }
     /**
      * This is called after completing operation on the next affected file.
      * The operations here are postponed to ensure that cancellation during the iteration is handled correctly
@@ -91493,7 +92477,7 @@ var ts;
                         return toAffectedFileResult(state, 
                         // When whole program is affected, do emit only once (eg when --out or --outFile is specified)
                         // Otherwise just affected file
-                        affected_1.emitBuildInfo(writeFile || host.writeFile, cancellationToken), affected_1, 
+                        affected_1.emitBuildInfo(writeFile || ts.maybeBind(host, host.writeFile), cancellationToken), affected_1, 
                         /*isPendingEmitFile*/ false, 
                         /*isBuildInfoEmit*/ true);
                     }
@@ -91509,14 +92493,10 @@ var ts;
                     affected = program;
                 }
             }
-            // Mark seen emitted files if there are pending files to be emitted
-            if (state.affectedFilesPendingEmit && state.program !== affected) {
-                (state.seenEmittedFiles || (state.seenEmittedFiles = ts.createMap())).set(affected.path, true);
-            }
             return toAffectedFileResult(state, 
             // When whole program is affected, do emit only once (eg when --out or --outFile is specified)
             // Otherwise just affected file
-            ts.Debug.assertDefined(state.program).emit(affected === state.program ? undefined : affected, writeFile || host.writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers), affected, isPendingEmitFile);
+            ts.Debug.assertDefined(state.program).emit(affected === state.program ? undefined : affected, writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers), affected, isPendingEmitFile);
         }
         /**
          * Emits the JavaScript and declaration files.
@@ -91553,7 +92533,7 @@ var ts;
                     };
                 }
             }
-            return ts.Debug.assertDefined(state.program).emit(targetSourceFile, writeFile || host.writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers);
+            return ts.Debug.assertDefined(state.program).emit(targetSourceFile, writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
         }
         /**
          * Return the semantic diagnostics for the next affected file or undefined if iteration is complete
@@ -91610,14 +92590,7 @@ var ts;
             }
             // In case of emit builder, cache the files to be emitted
             if (affectedFilesPendingEmit) {
-                state.affectedFilesPendingEmit = ts.concatenate(state.affectedFilesPendingEmit, affectedFilesPendingEmit);
-                // affectedFilesPendingEmitIndex === undefined
-                // - means the emit state.affectedFilesPendingEmit was undefined before adding current affected files
-                //   so start from 0 as array would be affectedFilesPendingEmit
-                // else, continue to iterate from existing index, the current set is appended to existing files
-                if (state.affectedFilesPendingEmitIndex === undefined) {
-                    state.affectedFilesPendingEmitIndex = 0;
-                }
+                addToAffectedFilesPendingEmit(state, affectedFilesPendingEmit);
             }
             var diagnostics;
             for (var _i = 0, _a = ts.Debug.assertDefined(state.program).getSourceFiles(); _i < _a.length; _i++) {
@@ -91628,6 +92601,16 @@ var ts;
         }
     }
     ts.createBuilderProgram = createBuilderProgram;
+    function addToAffectedFilesPendingEmit(state, affectedFilesPendingEmit) {
+        state.affectedFilesPendingEmit = ts.concatenate(state.affectedFilesPendingEmit, affectedFilesPendingEmit);
+        // affectedFilesPendingEmitIndex === undefined
+        // - means the emit state.affectedFilesPendingEmit was undefined before adding current affected files
+        //   so start from 0 as array would be affectedFilesPendingEmit
+        // else, continue to iterate from existing index, the current set is appended to existing files
+        if (state.affectedFilesPendingEmitIndex === undefined) {
+            state.affectedFilesPendingEmitIndex = 0;
+        }
+    }
     function getMapOfReferencedSet(mapLike) {
         if (!mapLike)
             return undefined;
@@ -92247,6 +93230,10 @@ var ts;
                 // If something to do with folder/file starting with "." in node_modules folder, skip it
                 if (isPathIgnored(fileOrDirectoryPath))
                     return false;
+                // prevent saving an open file from over-eagerly triggering invalidation
+                if (resolutionHost.fileIsOpen(fileOrDirectoryPath)) {
+                    return false;
+                }
                 // Some file or directory in the watching directory is created
                 // Return early if it does not have any of the watching extension or not the custom failed lookup path
                 var dirOfFileOrDirectory = ts.getDirectoryPath(fileOrDirectoryPath);
@@ -92489,11 +93476,11 @@ var ts;
         }
         function discoverProbableSymlinks(files, getCanonicalFileName, cwd) {
             var result = ts.createMap();
-            var symlinks = ts.mapDefined(files, function (sf) {
-                return sf.resolvedModules && ts.firstDefinedIterator(sf.resolvedModules.values(), function (res) {
+            var symlinks = ts.flatten(ts.mapDefined(files, function (sf) {
+                return sf.resolvedModules && ts.compact(ts.arrayFrom(ts.mapIterator(sf.resolvedModules.values(), function (res) {
                     return res && res.originalPath && res.resolvedFileName !== res.originalPath ? [res.resolvedFileName, res.originalPath] : undefined;
-                });
-            });
+                })));
+            }));
             for (var _i = 0, symlinks_1 = symlinks; _i < symlinks_1.length; _i++) {
                 var _a = symlinks_1[_i], resolvedPath = _a[0], originalPath = _a[1];
                 var _b = guessDirectorySymlink(resolvedPath, originalPath, cwd, getCanonicalFileName), commonResolved = _b[0], commonOriginal = _b[1];
@@ -92836,6 +93823,14 @@ var ts;
         return "" + newLine + ts.flattenDiagnosticMessageText(d.messageText, newLine) + newLine + newLine;
     }
     ts.getErrorSummaryText = getErrorSummaryText;
+    function listFiles(program, writeFileName) {
+        if (program.getCompilerOptions().listFiles) {
+            ts.forEach(program.getSourceFiles(), function (file) {
+                writeFileName(file.fileName);
+            });
+        }
+    }
+    ts.listFiles = listFiles;
     /**
      * Helper that emit files, report diagnostics and lists emitted and/or source files depending on compiler options
      */
@@ -92863,11 +93858,7 @@ var ts;
                 var filepath = ts.getNormalizedAbsolutePath(file, currentDir_1);
                 writeFileName("TSFILE: " + filepath);
             });
-            if (program.getCompilerOptions().listFiles) {
-                ts.forEach(program.getSourceFiles(), function (file) {
-                    writeFileName(file.fileName);
-                });
-            }
+            listFiles(program, writeFileName);
         }
         if (reportSummary) {
             reportSummary(getErrorCountForSummary(diagnostics));
@@ -93190,6 +94181,7 @@ var ts;
             hasChangedAutomaticTypeDirectiveNames = true;
             scheduleProgramUpdate();
         };
+        compilerHost.fileIsOpen = ts.returnFalse;
         compilerHost.maxNumberOfFilesToIterateForInvalidation = host.maxNumberOfFilesToIterateForInvalidation;
         compilerHost.getCurrentProgram = getCurrentProgram;
         compilerHost.writeLog = writeLog;
@@ -93680,7 +94672,8 @@ var ts;
     function getCompilerOptionsOfBuildOptions(buildOptions) {
         var result = {};
         ts.commonOptionsWithBuild.forEach(function (option) {
-            result[option.name] = buildOptions[option.name];
+            if (ts.hasProperty(buildOptions, option.name))
+                result[option.name] = buildOptions[option.name];
         });
         return result;
     }
@@ -93699,12 +94692,18 @@ var ts;
         var projectStatus = createFileMap(toPath);
         var missingRoots = ts.createMap();
         var globalDependencyGraph;
-        var writeFileName = function (s) { return host.trace && host.trace(s); };
+        var writeFileName = host.trace ? function (s) { return host.trace(s); } : undefined;
         var readFileWithCache = function (f) { return host.readFile(f); };
         var projectCompilerOptions = baseCompilerOptions;
         var compilerHost = ts.createCompilerHostFromProgramHost(host, function () { return projectCompilerOptions; });
         ts.setGetSourceFileAsHashVersioned(compilerHost, host);
+        compilerHost.getParsedCommandLine = parseConfigFile;
+        compilerHost.resolveModuleNames = ts.maybeBind(host, host.resolveModuleNames);
+        compilerHost.resolveTypeReferenceDirectives = ts.maybeBind(host, host.resolveTypeReferenceDirectives);
+        var moduleResolutionCache = !compilerHost.resolveModuleNames ? ts.createModuleResolutionCache(currentDirectory, getCanonicalFileName) : undefined;
+        var cacheState;
         var buildInfoChecked = createFileMap(toPath);
+        var extendedConfigCache = ts.createMap();
         // Watch state
         var builderPrograms = createFileMap(toPath);
         var diagnostics = createFileMap(toPath);
@@ -93768,7 +94767,7 @@ var ts;
             }
             var diagnostic;
             parseConfigFileHost.onUnRecoverableConfigFileDiagnostic = function (d) { return diagnostic = d; };
-            var parsed = ts.getParsedCommandLineOfConfigFile(configFilePath, baseCompilerOptions, parseConfigFileHost);
+            var parsed = ts.getParsedCommandLineOfConfigFile(configFilePath, baseCompilerOptions, parseConfigFileHost, extendedConfigCache);
             parseConfigFileHost.onUnRecoverableConfigFileDiagnostic = ts.noop;
             configFileCache.setValue(configFilePath, parsed || diagnostic);
             return parsed;
@@ -94090,6 +95089,7 @@ var ts;
             projectStatus.removeKey(resolved);
             diagnostics.removeKey(resolved);
             addProjToQueue(resolved, reloadLevel);
+            enableCache();
         }
         /**
          * return true if new addition
@@ -94145,6 +95145,7 @@ var ts;
                     }
                 }
                 else {
+                    disableCache();
                     reportErrorSummary();
                 }
             }
@@ -94307,6 +95308,28 @@ var ts;
             }
             // TODO: handle resolve module name to cache result in project reference redirect
             projectCompilerOptions = configFile.options;
+            // Update module resolution cache if needed
+            if (moduleResolutionCache) {
+                var projPath = toPath(proj);
+                if (moduleResolutionCache.directoryToModuleNameMap.redirectsMap.size === 0) {
+                    // The own map will be for projectCompilerOptions
+                    ts.Debug.assert(moduleResolutionCache.moduleNameToDirectoryMap.redirectsMap.size === 0);
+                    moduleResolutionCache.directoryToModuleNameMap.redirectsMap.set(projPath, moduleResolutionCache.directoryToModuleNameMap.ownMap);
+                    moduleResolutionCache.moduleNameToDirectoryMap.redirectsMap.set(projPath, moduleResolutionCache.moduleNameToDirectoryMap.ownMap);
+                }
+                else {
+                    // Set correct own map
+                    ts.Debug.assert(moduleResolutionCache.moduleNameToDirectoryMap.redirectsMap.size > 0);
+                    var ref = {
+                        sourceFile: projectCompilerOptions.configFile,
+                        commandLine: configFile
+                    };
+                    moduleResolutionCache.directoryToModuleNameMap.setOwnMap(moduleResolutionCache.directoryToModuleNameMap.getOrCreateMapOfCacheRedirects(ref));
+                    moduleResolutionCache.moduleNameToDirectoryMap.setOwnMap(moduleResolutionCache.moduleNameToDirectoryMap.getOrCreateMapOfCacheRedirects(ref));
+                }
+                moduleResolutionCache.directoryToModuleNameMap.setOwnOptions(projectCompilerOptions);
+                moduleResolutionCache.moduleNameToDirectoryMap.setOwnOptions(projectCompilerOptions);
+            }
             var program = host.createProgram(configFile.fileNames, configFile.options, compilerHost, getOldProgram(proj, configFile), configFile.errors, configFile.projectReferences);
             // Don't emit anything in the presence of syntactic errors or options diagnostics
             var syntaxDiagnostics = program.getConfigFileParsingDiagnostics().concat(program.getOptionsDiagnostics(), program.getGlobalDiagnostics(), program.getSyntacticDiagnostics());
@@ -94325,7 +95348,7 @@ var ts;
             var declDiagnostics;
             var reportDeclarationDiagnostics = function (d) { return (declDiagnostics || (declDiagnostics = [])).push(d); };
             var outputFiles = [];
-            ts.emitFilesAndReportErrors(program, reportDeclarationDiagnostics, writeFileName, /*reportSummary*/ undefined, function (name, text, writeByteOrderMark) { return outputFiles.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark }); });
+            ts.emitFilesAndReportErrors(program, reportDeclarationDiagnostics, /*writeFileName*/ undefined, /*reportSummary*/ undefined, function (name, text, writeByteOrderMark) { return outputFiles.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark }); });
             // Don't emit .d.ts if there are decl file errors
             if (declDiagnostics) {
                 program.restoreState();
@@ -94347,7 +95370,7 @@ var ts;
                         anyDtsChanged = true;
                     }
                 }
-                emittedOutputs.setValue(name, true);
+                emittedOutputs.setValue(name, name);
                 ts.writeFile(compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
                 if (priorChangeTime !== undefined) {
                     newestDeclarationFileContentChangedTime = newer(priorChangeTime, newestDeclarationFileContentChangedTime);
@@ -94358,6 +95381,10 @@ var ts;
             if (emitDiagnostics.length) {
                 return buildErrors(emitDiagnostics, BuildResultFlags.EmitErrors, "Emit");
             }
+            if (writeFileName) {
+                emittedOutputs.forEach(function (name) { return listEmittedFile(configFile, name); });
+                ts.listFiles(program, writeFileName);
+            }
             // Update time stamps for rest of the outputs
             newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(configFile, newestDeclarationFileContentChangedTime, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
             var status = {
@@ -94373,12 +95400,20 @@ var ts;
             function buildErrors(diagnostics, errorFlags, errorType) {
                 resultFlags |= errorFlags;
                 reportAndStoreErrors(proj, diagnostics);
+                // List files if any other build error using program (emit errors already report files)
+                if (writeFileName)
+                    ts.listFiles(program, writeFileName);
                 projectStatus.setValue(proj, { type: UpToDateStatusType.Unbuildable, reason: errorType + " errors" });
                 afterProgramCreate(proj, program);
                 projectCompilerOptions = baseCompilerOptions;
                 return resultFlags;
             }
         }
+        function listEmittedFile(proj, file) {
+            if (writeFileName && proj.options.listEmittedFiles) {
+                writeFileName("TSFILE: " + file);
+            }
+        }
         function afterProgramCreate(proj, program) {
             if (host.afterProgramEmitAndDiagnostics) {
                 host.afterProgramEmitAndDiagnostics(program);
@@ -94417,7 +95452,7 @@ var ts;
             var emittedOutputs = createFileMap(toPath);
             outputFiles.forEach(function (_a) {
                 var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark;
-                emittedOutputs.setValue(name, true);
+                emittedOutputs.setValue(name, name);
                 ts.writeFile(compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
             });
             var emitDiagnostics = emitterDiagnostics.getDiagnostics();
@@ -94427,6 +95462,9 @@ var ts;
                 projectCompilerOptions = baseCompilerOptions;
                 return BuildResultFlags.DeclarationOutputUnchanged | BuildResultFlags.EmitErrors;
             }
+            if (writeFileName) {
+                emittedOutputs.forEach(function (name) { return listEmittedFile(config, name); });
+            }
             // Update timestamps for dts
             var newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(config, minimumDate, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
             var status = {
@@ -94467,9 +95505,7 @@ var ts;
                         priorNewestUpdateTime = newer(priorNewestUpdateTime, host.getModifiedTime(file) || ts.missingFileModifiedTime);
                     }
                     host.setModifiedTime(file, now);
-                    if (proj.options.listEmittedFiles) {
-                        writeFileName("TSFILE: " + file);
-                    }
+                    listEmittedFile(proj, file);
                 }
             }
             return priorNewestUpdateTime;
@@ -94514,28 +95550,67 @@ var ts;
         function resolveProjectNames(configFileNames) {
             return configFileNames.map(resolveProjectName);
         }
-        function buildAllProjects() {
-            if (options.watch) {
-                reportWatchStatus(ts.Diagnostics.Starting_compilation_in_watch_mode);
+        function enableCache() {
+            if (cacheState) {
+                disableCache();
             }
-            // TODO:: In watch mode as well to use caches for incremental build once we can invalidate caches correctly and have right api
-            // Override readFile for json files and output .d.ts to cache the text
-            var savedReadFileWithCache = readFileWithCache;
-            var savedGetSourceFile = compilerHost.getSourceFile;
+            var originalReadFileWithCache = readFileWithCache;
+            var originalGetSourceFile = compilerHost.getSourceFile;
             var _a = ts.changeCompilerHostLikeToUseCache(host, toPath, function () {
                 var args = [];
                 for (var _i = 0; _i < arguments.length; _i++) {
                     args[_i] = arguments[_i];
                 }
-                return savedGetSourceFile.call.apply(savedGetSourceFile, [compilerHost].concat(args));
+                return originalGetSourceFile.call.apply(originalGetSourceFile, [compilerHost].concat(args));
             }), originalReadFile = _a.originalReadFile, originalFileExists = _a.originalFileExists, originalDirectoryExists = _a.originalDirectoryExists, originalCreateDirectory = _a.originalCreateDirectory, originalWriteFile = _a.originalWriteFile, getSourceFileWithCache = _a.getSourceFileWithCache, newReadFileWithCache = _a.readFileWithCache;
             readFileWithCache = newReadFileWithCache;
             compilerHost.getSourceFile = getSourceFileWithCache;
+            var originalResolveModuleNames = compilerHost.resolveModuleNames;
+            if (!compilerHost.resolveModuleNames) {
+                var loader_3 = function (moduleName, containingFile, redirectedReference) { return ts.resolveModuleName(moduleName, containingFile, projectCompilerOptions, compilerHost, moduleResolutionCache, redirectedReference).resolvedModule; };
+                compilerHost.resolveModuleNames = function (moduleNames, containingFile, _reusedNames, redirectedReference) {
+                    return ts.loadWithLocalCache(ts.Debug.assertEachDefined(moduleNames), containingFile, redirectedReference, loader_3);
+                };
+            }
+            cacheState = {
+                originalReadFile: originalReadFile,
+                originalFileExists: originalFileExists,
+                originalDirectoryExists: originalDirectoryExists,
+                originalCreateDirectory: originalCreateDirectory,
+                originalWriteFile: originalWriteFile,
+                originalReadFileWithCache: originalReadFileWithCache,
+                originalGetSourceFile: originalGetSourceFile,
+                originalResolveModuleNames: originalResolveModuleNames
+            };
+        }
+        function disableCache() {
+            if (!cacheState)
+                return;
+            host.readFile = cacheState.originalReadFile;
+            host.fileExists = cacheState.originalFileExists;
+            host.directoryExists = cacheState.originalDirectoryExists;
+            host.createDirectory = cacheState.originalCreateDirectory;
+            host.writeFile = cacheState.originalWriteFile;
+            compilerHost.getSourceFile = cacheState.originalGetSourceFile;
+            readFileWithCache = cacheState.originalReadFileWithCache;
+            compilerHost.resolveModuleNames = cacheState.originalResolveModuleNames;
+            extendedConfigCache.clear();
+            if (moduleResolutionCache) {
+                moduleResolutionCache.directoryToModuleNameMap.clear();
+                moduleResolutionCache.moduleNameToDirectoryMap.clear();
+            }
+            cacheState = undefined;
+        }
+        function buildAllProjects() {
+            if (options.watch) {
+                reportWatchStatus(ts.Diagnostics.Starting_compilation_in_watch_mode);
+            }
+            enableCache();
             var graph = getGlobalDependencyGraph();
             reportBuildQueue(graph);
             var anyFailed = false;
-            for (var _i = 0, _b = graph.buildQueue; _i < _b.length; _i++) {
-                var next = _b[_i];
+            for (var _i = 0, _a = graph.buildQueue; _i < _a.length; _i++) {
+                var next = _a[_i];
                 var proj = parseConfigFile(next);
                 if (proj === undefined) {
                     reportParseConfigFileDiagnostic(next);
@@ -94579,13 +95654,7 @@ var ts;
                 anyFailed = anyFailed || !!(buildResult & BuildResultFlags.AnyErrors);
             }
             reportErrorSummary();
-            host.readFile = originalReadFile;
-            host.fileExists = originalFileExists;
-            host.directoryExists = originalDirectoryExists;
-            host.createDirectory = originalCreateDirectory;
-            host.writeFile = originalWriteFile;
-            compilerHost.getSourceFile = savedGetSourceFile;
-            readFileWithCache = savedReadFileWithCache;
+            disableCache();
             return anyFailed ? ts.ExitStatus.DiagnosticsPresent_OutputsSkipped : ts.ExitStatus.Success;
         }
         function needsBuild(status, configFile) {
@@ -94675,144 +95744,6 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
-(function (ts) {
-    var ValueKind;
-    (function (ValueKind) {
-        ValueKind[ValueKind["Const"] = 0] = "Const";
-        ValueKind[ValueKind["Array"] = 1] = "Array";
-        ValueKind[ValueKind["FunctionOrClass"] = 2] = "FunctionOrClass";
-        ValueKind[ValueKind["Object"] = 3] = "Object";
-    })(ValueKind = ts.ValueKind || (ts.ValueKind = {}));
-    function inspectModule(fileNameToRequire) {
-        return inspectValue(ts.removeFileExtension(ts.getBaseFileName(fileNameToRequire)), tryRequire(fileNameToRequire));
-    }
-    ts.inspectModule = inspectModule;
-    function inspectValue(name, value) {
-        return getValueInfo(name, value, getRecurser());
-    }
-    ts.inspectValue = inspectValue;
-    function getRecurser() {
-        var seen = [];
-        var nameStack = [];
-        return function (obj, name, cbOk, cbFail) {
-            if (seen.indexOf(obj) !== -1 || nameStack.length > 4) {
-                return cbFail(seen.indexOf(obj) !== -1, nameStack);
-            }
-            seen.push(obj);
-            nameStack.push(name);
-            var res = cbOk();
-            nameStack.pop();
-            seen.pop();
-            return res;
-        };
-    }
-    function getValueInfo(name, value, recurser) {
-        return recurser(value, name, function () {
-            if (typeof value === "function")
-                return getFunctionOrClassInfo(value, name, recurser);
-            if (typeof value === "object") {
-                var builtin = getBuiltinType(name, value, recurser);
-                if (builtin !== undefined)
-                    return builtin;
-                var entries = getEntriesOfObject(value);
-                var hasNontrivialPrototype = Object.getPrototypeOf(value) !== Object.prototype;
-                var members = ts.flatMap(entries, function (_a) {
-                    var key = _a.key, value = _a.value;
-                    return getValueInfo(key, value, recurser);
-                });
-                return { kind: 3 /* Object */, name: name, hasNontrivialPrototype: hasNontrivialPrototype, members: members };
-            }
-            return { kind: 0 /* Const */, name: name, typeName: isNullOrUndefined(value) ? "any" : typeof value };
-        }, function (isCircularReference, keyStack) { return anyValue(name, " " + (isCircularReference ? "Circular reference" : "Too-deep object hierarchy") + " from " + keyStack.join(".")); });
-    }
-    function getFunctionOrClassInfo(fn, name, recurser) {
-        var prototypeMembers = getPrototypeMembers(fn, recurser);
-        var namespaceMembers = ts.flatMap(getEntriesOfObject(fn), function (_a) {
-            var key = _a.key, value = _a.value;
-            return getValueInfo(key, value, recurser);
-        });
-        var toString = ts.cast(Function.prototype.toString.call(fn), ts.isString);
-        var source = ts.stringContains(toString, "{ [native code] }") ? getFunctionLength(fn) : toString;
-        return { kind: 2 /* FunctionOrClass */, name: name, source: source, namespaceMembers: namespaceMembers, prototypeMembers: prototypeMembers };
-    }
-    var builtins = ts.memoize(function () {
-        var map = ts.createMap();
-        for (var _i = 0, _a = getEntriesOfObject(global); _i < _a.length; _i++) {
-            var _b = _a[_i], key = _b.key, value = _b.value;
-            if (typeof value === "function" && typeof value.prototype === "object" && value !== Object) {
-                map.set(key, value);
-            }
-        }
-        return map;
-    });
-    function getBuiltinType(name, value, recurser) {
-        return ts.isArray(value)
-            ? { name: name, kind: 1 /* Array */, inner: value.length && getValueInfo("element", ts.first(value), recurser) || anyValue(name) }
-            : ts.forEachEntry(builtins(), function (builtin, builtinName) {
-                return value instanceof builtin ? { kind: 0 /* Const */, name: name, typeName: builtinName } : undefined;
-            });
-    }
-    function getPrototypeMembers(fn, recurser) {
-        var prototype = fn.prototype;
-        // tslint:disable-next-line no-unnecessary-type-assertion (TODO: update LKG and it will really be unnecessary)
-        return typeof prototype !== "object" || prototype === null ? ts.emptyArray : ts.mapDefined(getEntriesOfObject(prototype), function (_a) {
-            var key = _a.key, value = _a.value;
-            return key === "constructor" ? undefined : getValueInfo(key, value, recurser);
-        });
-    }
-    var ignoredProperties = ["arguments", "caller", "constructor", "eval", "super_"];
-    var reservedFunctionProperties = Object.getOwnPropertyNames(ts.noop);
-    function getEntriesOfObject(obj) {
-        var seen = ts.createMap();
-        var entries = [];
-        var chain = obj;
-        while (!isNullOrUndefined(chain) && chain !== Object.prototype && chain !== Function.prototype) {
-            for (var _i = 0, _a = Object.getOwnPropertyNames(chain); _i < _a.length; _i++) {
-                var key = _a[_i];
-                if (!isJsPrivate(key) &&
-                    ignoredProperties.indexOf(key) === -1 &&
-                    (typeof obj !== "function" || reservedFunctionProperties.indexOf(key) === -1) &&
-                    // Don't add property from a higher prototype if it already exists in a lower one
-                    ts.addToSeen(seen, key)) {
-                    var value = safeGetPropertyOfObject(chain, key);
-                    // Don't repeat "toString" that matches signature from Object.prototype
-                    if (!(key === "toString" && typeof value === "function" && value.length === 0)) {
-                        entries.push({ key: key, value: value });
-                    }
-                }
-            }
-            chain = Object.getPrototypeOf(chain);
-        }
-        return entries.sort(function (e1, e2) { return ts.compareStringsCaseSensitive(e1.key, e2.key); });
-    }
-    function getFunctionLength(fn) {
-        return ts.tryCast(safeGetPropertyOfObject(fn, "length"), ts.isNumber) || 0;
-    }
-    function safeGetPropertyOfObject(obj, key) {
-        var desc = Object.getOwnPropertyDescriptor(obj, key);
-        return desc && desc.value;
-    }
-    function isNullOrUndefined(value) {
-        return value == null; // tslint:disable-line
-    }
-    function anyValue(name, comment) {
-        return { kind: 0 /* Const */, name: name, typeName: "any", comment: comment };
-    }
-    function isJsPrivate(name) {
-        return ts.startsWith(name, "_");
-    }
-    ts.isJsPrivate = isJsPrivate;
-    function tryRequire(fileNameToRequire) {
-        try {
-            return require(fileNameToRequire);
-        }
-        catch (_a) {
-            return undefined;
-        }
-    }
-})(ts || (ts = {}));
-/* @internal */
-var ts;
 (function (ts) {
     var server;
     (function (server) {
@@ -94820,7 +95751,6 @@ var ts;
         server.ActionSet = "action::set";
         server.ActionInvalidate = "action::invalidate";
         server.ActionPackageInstalled = "action::packageInstalled";
-        server.ActionValueInspected = "action::valueInspected";
         server.EventTypesRegistry = "event::typesRegistry";
         server.EventBeginInstallTypes = "event::beginInstallTypes";
         server.EventEndInstallTypes = "event::endInstallTypes";
@@ -94837,6 +95767,11 @@ var ts;
              * typingsInstaller will run the command with `${npmLocation} install ...`.
              */
             Arguments.NpmLocation = "--npmLocation";
+            /**
+             * Flag indicating that the typings installer should try to validate the default npm location.
+             * If the default npm is not found when this flag is enabled, fallback to `npm install`
+             */
+            Arguments.ValidateDefaultNpmLocation = "--validateDefaultNpmLocation";
         })(Arguments = server.Arguments || (server.Arguments = {}));
         function hasArgument(argumentName) {
             return ts.sys.args.indexOf(argumentName) >= 0;
@@ -95433,7 +96368,7 @@ var ts;
 /* @internal */
 var ts;
 (function (ts) {
-    ts.scanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ true);
+    ts.scanner = ts.createScanner(8 /* Latest */, /*skipTrivia*/ true);
     var SemanticMeaning;
     (function (SemanticMeaning) {
         SemanticMeaning[SemanticMeaning["None"] = 0] = "None";
@@ -95444,37 +96379,37 @@ var ts;
     })(SemanticMeaning = ts.SemanticMeaning || (ts.SemanticMeaning = {}));
     function getMeaningFromDeclaration(node) {
         switch (node.kind) {
-            case 237 /* VariableDeclaration */:
+            case 238 /* VariableDeclaration */:
                 return ts.isInJSFile(node) && ts.getJSDocEnumTag(node) ? 7 /* All */ : 1 /* Value */;
-            case 151 /* Parameter */:
-            case 186 /* BindingElement */:
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 275 /* PropertyAssignment */:
-            case 276 /* ShorthandPropertyAssignment */:
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
-            case 274 /* CatchClause */:
-            case 267 /* JsxAttribute */:
+            case 152 /* Parameter */:
+            case 187 /* BindingElement */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 276 /* PropertyAssignment */:
+            case 277 /* ShorthandPropertyAssignment */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
+            case 275 /* CatchClause */:
+            case 268 /* JsxAttribute */:
                 return 1 /* Value */;
-            case 150 /* TypeParameter */:
-            case 241 /* InterfaceDeclaration */:
-            case 242 /* TypeAliasDeclaration */:
-            case 168 /* TypeLiteral */:
+            case 151 /* TypeParameter */:
+            case 242 /* InterfaceDeclaration */:
+            case 243 /* TypeAliasDeclaration */:
+            case 169 /* TypeLiteral */:
                 return 2 /* Type */;
-            case 309 /* JSDocTypedefTag */:
+            case 310 /* JSDocTypedefTag */:
                 // If it has no name node, it shares the name with the value declaration below it.
                 return node.name === undefined ? 1 /* Value */ | 2 /* Type */ : 2 /* Type */;
-            case 278 /* EnumMember */:
-            case 240 /* ClassDeclaration */:
+            case 279 /* EnumMember */:
+            case 241 /* ClassDeclaration */:
                 return 1 /* Value */ | 2 /* Type */;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 if (ts.isAmbientModule(node)) {
                     return 4 /* Namespace */ | 1 /* Value */;
                 }
@@ -95484,26 +96419,26 @@ var ts;
                 else {
                     return 4 /* Namespace */;
                 }
-            case 243 /* EnumDeclaration */:
-            case 252 /* NamedImports */:
-            case 253 /* ImportSpecifier */:
-            case 248 /* ImportEqualsDeclaration */:
-            case 249 /* ImportDeclaration */:
-            case 254 /* ExportAssignment */:
-            case 255 /* ExportDeclaration */:
+            case 244 /* EnumDeclaration */:
+            case 253 /* NamedImports */:
+            case 254 /* ImportSpecifier */:
+            case 249 /* ImportEqualsDeclaration */:
+            case 250 /* ImportDeclaration */:
+            case 255 /* ExportAssignment */:
+            case 256 /* ExportDeclaration */:
                 return 7 /* All */;
             // An external module can be a Value
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return 4 /* Namespace */ | 1 /* Value */;
         }
         return 7 /* All */;
     }
     ts.getMeaningFromDeclaration = getMeaningFromDeclaration;
     function getMeaningFromLocation(node) {
-        if (node.kind === 284 /* SourceFile */) {
+        if (node.kind === 285 /* SourceFile */) {
             return 1 /* Value */;
         }
-        else if (node.parent.kind === 254 /* ExportAssignment */ || node.parent.kind === 259 /* ExternalModuleReference */) {
+        else if (node.parent.kind === 255 /* ExportAssignment */ || node.parent.kind === 260 /* ExternalModuleReference */) {
             return 7 /* All */;
         }
         else if (isInRightSideOfInternalImportEqualsDeclaration(node)) {
@@ -95535,11 +96470,11 @@ var ts;
         //     import a = |b|; // Namespace
         //     import a = |b.c|; // Value, type, namespace
         //     import a = |b.c|.d; // Namespace
-        var name = node.kind === 148 /* QualifiedName */ ? node : ts.isQualifiedName(node.parent) && node.parent.right === node ? node.parent : undefined;
-        return name && name.parent.kind === 248 /* ImportEqualsDeclaration */ ? 7 /* All */ : 4 /* Namespace */;
+        var name = node.kind === 149 /* QualifiedName */ ? node : ts.isQualifiedName(node.parent) && node.parent.right === node ? node.parent : undefined;
+        return name && name.parent.kind === 249 /* ImportEqualsDeclaration */ ? 7 /* All */ : 4 /* Namespace */;
     }
     function isInRightSideOfInternalImportEqualsDeclaration(node) {
-        while (node.parent.kind === 148 /* QualifiedName */) {
+        while (node.parent.kind === 149 /* QualifiedName */) {
             node = node.parent;
         }
         return ts.isInternalModuleImportEqualsDeclaration(node.parent) && node.parent.moduleReference === node;
@@ -95551,27 +96486,27 @@ var ts;
     function isQualifiedNameNamespaceReference(node) {
         var root = node;
         var isLastClause = true;
-        if (root.parent.kind === 148 /* QualifiedName */) {
-            while (root.parent && root.parent.kind === 148 /* QualifiedName */) {
+        if (root.parent.kind === 149 /* QualifiedName */) {
+            while (root.parent && root.parent.kind === 149 /* QualifiedName */) {
                 root = root.parent;
             }
             isLastClause = root.right === node;
         }
-        return root.parent.kind === 164 /* TypeReference */ && !isLastClause;
+        return root.parent.kind === 165 /* TypeReference */ && !isLastClause;
     }
     function isPropertyAccessNamespaceReference(node) {
         var root = node;
         var isLastClause = true;
-        if (root.parent.kind === 189 /* PropertyAccessExpression */) {
-            while (root.parent && root.parent.kind === 189 /* PropertyAccessExpression */) {
+        if (root.parent.kind === 190 /* PropertyAccessExpression */) {
+            while (root.parent && root.parent.kind === 190 /* PropertyAccessExpression */) {
                 root = root.parent;
             }
             isLastClause = root.name === node;
         }
-        if (!isLastClause && root.parent.kind === 211 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 273 /* HeritageClause */) {
+        if (!isLastClause && root.parent.kind === 212 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 274 /* HeritageClause */) {
             var decl = root.parent.parent.parent;
-            return (decl.kind === 240 /* ClassDeclaration */ && root.parent.parent.token === 109 /* ImplementsKeyword */) ||
-                (decl.kind === 241 /* InterfaceDeclaration */ && root.parent.parent.token === 86 /* ExtendsKeyword */);
+            return (decl.kind === 241 /* ClassDeclaration */ && root.parent.parent.token === 110 /* ImplementsKeyword */) ||
+                (decl.kind === 242 /* InterfaceDeclaration */ && root.parent.parent.token === 87 /* ExtendsKeyword */);
         }
         return false;
     }
@@ -95580,17 +96515,17 @@ var ts;
             node = node.parent;
         }
         switch (node.kind) {
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
                 return !ts.isExpressionNode(node);
-            case 178 /* ThisType */:
+            case 179 /* ThisType */:
                 return true;
         }
         switch (node.parent.kind) {
-            case 164 /* TypeReference */:
+            case 165 /* TypeReference */:
                 return true;
-            case 183 /* ImportType */:
+            case 184 /* ImportType */:
                 return !node.parent.isTypeOf;
-            case 211 /* ExpressionWithTypeArguments */:
+            case 212 /* ExpressionWithTypeArguments */:
                 return !ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent);
         }
         return false;
@@ -95617,7 +96552,7 @@ var ts;
     ts.climbPastPropertyAccess = climbPastPropertyAccess;
     function getTargetLabel(referenceNode, labelName) {
         while (referenceNode) {
-            if (referenceNode.kind === 233 /* LabeledStatement */ && referenceNode.label.escapedText === labelName) {
+            if (referenceNode.kind === 234 /* LabeledStatement */ && referenceNode.label.escapedText === labelName) {
                 return referenceNode.label;
             }
             referenceNode = referenceNode.parent;
@@ -95633,11 +96568,11 @@ var ts;
     }
     ts.hasPropertyAccessExpressionWithName = hasPropertyAccessExpressionWithName;
     function isJumpStatementTarget(node) {
-        return node.kind === 72 /* Identifier */ && ts.isBreakOrContinueStatement(node.parent) && node.parent.label === node;
+        return node.kind === 73 /* Identifier */ && ts.isBreakOrContinueStatement(node.parent) && node.parent.label === node;
     }
     ts.isJumpStatementTarget = isJumpStatementTarget;
     function isLabelOfLabeledStatement(node) {
-        return node.kind === 72 /* Identifier */ && ts.isLabeledStatement(node.parent) && node.parent.label === node;
+        return node.kind === 73 /* Identifier */ && ts.isLabeledStatement(node.parent) && node.parent.label === node;
     }
     ts.isLabelOfLabeledStatement = isLabelOfLabeledStatement;
     function isLabelName(node) {
@@ -95649,40 +96584,40 @@ var ts;
     }
     ts.isTagName = isTagName;
     function isRightSideOfQualifiedName(node) {
-        return node.parent.kind === 148 /* QualifiedName */ && node.parent.right === node;
+        return node.parent.kind === 149 /* QualifiedName */ && node.parent.right === node;
     }
     ts.isRightSideOfQualifiedName = isRightSideOfQualifiedName;
     function isRightSideOfPropertyAccess(node) {
-        return node && node.parent && node.parent.kind === 189 /* PropertyAccessExpression */ && node.parent.name === node;
+        return node && node.parent && node.parent.kind === 190 /* PropertyAccessExpression */ && node.parent.name === node;
     }
     ts.isRightSideOfPropertyAccess = isRightSideOfPropertyAccess;
     function isNameOfModuleDeclaration(node) {
-        return node.parent.kind === 244 /* ModuleDeclaration */ && node.parent.name === node;
+        return node.parent.kind === 245 /* ModuleDeclaration */ && node.parent.name === node;
     }
     ts.isNameOfModuleDeclaration = isNameOfModuleDeclaration;
     function isNameOfFunctionDeclaration(node) {
-        return node.kind === 72 /* Identifier */ &&
+        return node.kind === 73 /* Identifier */ &&
             ts.isFunctionLike(node.parent) && node.parent.name === node;
     }
     ts.isNameOfFunctionDeclaration = isNameOfFunctionDeclaration;
     function isLiteralNameOfPropertyDeclarationOrIndexAccess(node) {
         switch (node.parent.kind) {
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
-            case 275 /* PropertyAssignment */:
-            case 278 /* EnumMember */:
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 244 /* ModuleDeclaration */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
+            case 276 /* PropertyAssignment */:
+            case 279 /* EnumMember */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 245 /* ModuleDeclaration */:
                 return ts.getNameOfDeclaration(node.parent) === node;
-            case 190 /* ElementAccessExpression */:
+            case 191 /* ElementAccessExpression */:
                 return node.parent.argumentExpression === node;
-            case 149 /* ComputedPropertyName */:
+            case 150 /* ComputedPropertyName */:
                 return true;
-            case 182 /* LiteralType */:
-                return node.parent.parent.kind === 180 /* IndexedAccessType */;
+            case 183 /* LiteralType */:
+                return node.parent.parent.kind === 181 /* IndexedAccessType */;
             default:
                 return false;
         }
@@ -95706,17 +96641,17 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 284 /* SourceFile */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 244 /* ModuleDeclaration */:
+                case 285 /* SourceFile */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return node;
             }
         }
@@ -95724,48 +96659,48 @@ var ts;
     ts.getContainerNode = getContainerNode;
     function getNodeKind(node) {
         switch (node.kind) {
-            case 284 /* SourceFile */:
+            case 285 /* SourceFile */:
                 return ts.isExternalModule(node) ? "module" /* moduleElement */ : "script" /* scriptElement */;
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return "module" /* moduleElement */;
-            case 240 /* ClassDeclaration */:
-            case 209 /* ClassExpression */:
+            case 241 /* ClassDeclaration */:
+            case 210 /* ClassExpression */:
                 return "class" /* classElement */;
-            case 241 /* InterfaceDeclaration */: return "interface" /* interfaceElement */;
-            case 242 /* TypeAliasDeclaration */:
-            case 302 /* JSDocCallbackTag */:
-            case 309 /* JSDocTypedefTag */:
+            case 242 /* InterfaceDeclaration */: return "interface" /* interfaceElement */;
+            case 243 /* TypeAliasDeclaration */:
+            case 303 /* JSDocCallbackTag */:
+            case 310 /* JSDocTypedefTag */:
                 return "type" /* typeElement */;
-            case 243 /* EnumDeclaration */: return "enum" /* enumElement */;
-            case 237 /* VariableDeclaration */:
+            case 244 /* EnumDeclaration */: return "enum" /* enumElement */;
+            case 238 /* VariableDeclaration */:
                 return getKindOfVariableDeclaration(node);
-            case 186 /* BindingElement */:
+            case 187 /* BindingElement */:
                 return getKindOfVariableDeclaration(ts.getRootDeclaration(node));
-            case 197 /* ArrowFunction */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
                 return "function" /* functionElement */;
-            case 158 /* GetAccessor */: return "getter" /* memberGetAccessorElement */;
-            case 159 /* SetAccessor */: return "setter" /* memberSetAccessorElement */;
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
+            case 159 /* GetAccessor */: return "getter" /* memberGetAccessorElement */;
+            case 160 /* SetAccessor */: return "setter" /* memberSetAccessorElement */;
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
                 return "method" /* memberFunctionElement */;
-            case 154 /* PropertyDeclaration */:
-            case 153 /* PropertySignature */:
+            case 155 /* PropertyDeclaration */:
+            case 154 /* PropertySignature */:
                 return "property" /* memberVariableElement */;
-            case 162 /* IndexSignature */: return "index" /* indexSignatureElement */;
-            case 161 /* ConstructSignature */: return "construct" /* constructSignatureElement */;
-            case 160 /* CallSignature */: return "call" /* callSignatureElement */;
-            case 157 /* Constructor */: return "constructor" /* constructorImplementationElement */;
-            case 150 /* TypeParameter */: return "type parameter" /* typeParameterElement */;
-            case 278 /* EnumMember */: return "enum member" /* enumMemberElement */;
-            case 151 /* Parameter */: return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) ? "property" /* memberVariableElement */ : "parameter" /* parameterElement */;
-            case 248 /* ImportEqualsDeclaration */:
-            case 253 /* ImportSpecifier */:
-            case 257 /* ExportSpecifier */:
-            case 251 /* NamespaceImport */:
+            case 163 /* IndexSignature */: return "index" /* indexSignatureElement */;
+            case 162 /* ConstructSignature */: return "construct" /* constructSignatureElement */;
+            case 161 /* CallSignature */: return "call" /* callSignatureElement */;
+            case 158 /* Constructor */: return "constructor" /* constructorImplementationElement */;
+            case 151 /* TypeParameter */: return "type parameter" /* typeParameterElement */;
+            case 279 /* EnumMember */: return "enum member" /* enumMemberElement */;
+            case 152 /* Parameter */: return ts.hasModifier(node, 92 /* ParameterPropertyModifier */) ? "property" /* memberVariableElement */ : "parameter" /* parameterElement */;
+            case 249 /* ImportEqualsDeclaration */:
+            case 254 /* ImportSpecifier */:
+            case 258 /* ExportSpecifier */:
+            case 252 /* NamespaceImport */:
                 return "alias" /* alias */;
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 var kind = ts.getAssignmentDeclarationKind(node);
                 var right = node.right;
                 switch (kind) {
@@ -95792,7 +96727,7 @@ var ts;
                         return "" /* unknown */;
                     }
                 }
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return ts.isImportClause(node.parent) ? "alias" /* alias */ : "" /* unknown */;
             default:
                 return "" /* unknown */;
@@ -95808,12 +96743,12 @@ var ts;
     ts.getNodeKind = getNodeKind;
     function isThis(node) {
         switch (node.kind) {
-            case 100 /* ThisKeyword */:
+            case 101 /* ThisKeyword */:
                 // case SyntaxKind.ThisType: TODO: GH#9267
                 return true;
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 // 'this' as a parameter
-                return ts.identifierIsThisKeyword(node) && node.parent.kind === 151 /* Parameter */;
+                return ts.identifierIsThisKeyword(node) && node.parent.kind === 152 /* Parameter */;
             default:
                 return false;
         }
@@ -95878,42 +96813,42 @@ var ts;
             return false;
         }
         switch (n.kind) {
-            case 240 /* ClassDeclaration */:
-            case 241 /* InterfaceDeclaration */:
-            case 243 /* EnumDeclaration */:
-            case 188 /* ObjectLiteralExpression */:
-            case 184 /* ObjectBindingPattern */:
-            case 168 /* TypeLiteral */:
-            case 218 /* Block */:
-            case 245 /* ModuleBlock */:
-            case 246 /* CaseBlock */:
-            case 252 /* NamedImports */:
-            case 256 /* NamedExports */:
+            case 241 /* ClassDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 244 /* EnumDeclaration */:
+            case 189 /* ObjectLiteralExpression */:
+            case 185 /* ObjectBindingPattern */:
+            case 169 /* TypeLiteral */:
+            case 219 /* Block */:
+            case 246 /* ModuleBlock */:
+            case 247 /* CaseBlock */:
+            case 253 /* NamedImports */:
+            case 257 /* NamedExports */:
                 return nodeEndsWith(n, 19 /* CloseBraceToken */, sourceFile);
-            case 274 /* CatchClause */:
+            case 275 /* CatchClause */:
                 return isCompletedNode(n.block, sourceFile);
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 if (!n.arguments) {
                     return true;
                 }
             // falls through
-            case 191 /* CallExpression */:
-            case 195 /* ParenthesizedExpression */:
-            case 177 /* ParenthesizedType */:
+            case 192 /* CallExpression */:
+            case 196 /* ParenthesizedExpression */:
+            case 178 /* ParenthesizedType */:
                 return nodeEndsWith(n, 21 /* CloseParenToken */, sourceFile);
-            case 165 /* FunctionType */:
-            case 166 /* ConstructorType */:
+            case 166 /* FunctionType */:
+            case 167 /* ConstructorType */:
                 return isCompletedNode(n.type, sourceFile);
-            case 157 /* Constructor */:
-            case 158 /* GetAccessor */:
-            case 159 /* SetAccessor */:
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 156 /* MethodDeclaration */:
-            case 155 /* MethodSignature */:
-            case 161 /* ConstructSignature */:
-            case 160 /* CallSignature */:
-            case 197 /* ArrowFunction */:
+            case 158 /* Constructor */:
+            case 159 /* GetAccessor */:
+            case 160 /* SetAccessor */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 157 /* MethodDeclaration */:
+            case 156 /* MethodSignature */:
+            case 162 /* ConstructSignature */:
+            case 161 /* CallSignature */:
+            case 198 /* ArrowFunction */:
                 if (n.body) {
                     return isCompletedNode(n.body, sourceFile);
                 }
@@ -95923,65 +96858,65 @@ var ts;
                 // Even though type parameters can be unclosed, we can get away with
                 // having at least a closing paren.
                 return hasChildOfKind(n, 21 /* CloseParenToken */, sourceFile);
-            case 244 /* ModuleDeclaration */:
+            case 245 /* ModuleDeclaration */:
                 return !!n.body && isCompletedNode(n.body, sourceFile);
-            case 222 /* IfStatement */:
+            case 223 /* IfStatement */:
                 if (n.elseStatement) {
                     return isCompletedNode(n.elseStatement, sourceFile);
                 }
                 return isCompletedNode(n.thenStatement, sourceFile);
-            case 221 /* ExpressionStatement */:
+            case 222 /* ExpressionStatement */:
                 return isCompletedNode(n.expression, sourceFile) ||
                     hasChildOfKind(n, 26 /* SemicolonToken */, sourceFile);
-            case 187 /* ArrayLiteralExpression */:
-            case 185 /* ArrayBindingPattern */:
-            case 190 /* ElementAccessExpression */:
-            case 149 /* ComputedPropertyName */:
-            case 170 /* TupleType */:
+            case 188 /* ArrayLiteralExpression */:
+            case 186 /* ArrayBindingPattern */:
+            case 191 /* ElementAccessExpression */:
+            case 150 /* ComputedPropertyName */:
+            case 171 /* TupleType */:
                 return nodeEndsWith(n, 23 /* CloseBracketToken */, sourceFile);
-            case 162 /* IndexSignature */:
+            case 163 /* IndexSignature */:
                 if (n.type) {
                     return isCompletedNode(n.type, sourceFile);
                 }
                 return hasChildOfKind(n, 23 /* CloseBracketToken */, sourceFile);
-            case 271 /* CaseClause */:
-            case 272 /* DefaultClause */:
+            case 272 /* CaseClause */:
+            case 273 /* DefaultClause */:
                 // there is no such thing as terminator token for CaseClause/DefaultClause so for simplicity always consider them non-completed
                 return false;
-            case 225 /* ForStatement */:
-            case 226 /* ForInStatement */:
-            case 227 /* ForOfStatement */:
-            case 224 /* WhileStatement */:
+            case 226 /* ForStatement */:
+            case 227 /* ForInStatement */:
+            case 228 /* ForOfStatement */:
+            case 225 /* WhileStatement */:
                 return isCompletedNode(n.statement, sourceFile);
-            case 223 /* DoStatement */:
+            case 224 /* DoStatement */:
                 // rough approximation: if DoStatement has While keyword - then if node is completed is checking the presence of ')';
-                return hasChildOfKind(n, 107 /* WhileKeyword */, sourceFile)
+                return hasChildOfKind(n, 108 /* WhileKeyword */, sourceFile)
                     ? nodeEndsWith(n, 21 /* CloseParenToken */, sourceFile)
                     : isCompletedNode(n.statement, sourceFile);
-            case 167 /* TypeQuery */:
+            case 168 /* TypeQuery */:
                 return isCompletedNode(n.exprName, sourceFile);
-            case 199 /* TypeOfExpression */:
-            case 198 /* DeleteExpression */:
-            case 200 /* VoidExpression */:
-            case 207 /* YieldExpression */:
-            case 208 /* SpreadElement */:
+            case 200 /* TypeOfExpression */:
+            case 199 /* DeleteExpression */:
+            case 201 /* VoidExpression */:
+            case 208 /* YieldExpression */:
+            case 209 /* SpreadElement */:
                 var unaryWordExpression = n;
                 return isCompletedNode(unaryWordExpression.expression, sourceFile);
-            case 193 /* TaggedTemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return isCompletedNode(n.template, sourceFile);
-            case 206 /* TemplateExpression */:
+            case 207 /* TemplateExpression */:
                 var lastSpan = ts.lastOrUndefined(n.templateSpans);
                 return isCompletedNode(lastSpan, sourceFile);
-            case 216 /* TemplateSpan */:
+            case 217 /* TemplateSpan */:
                 return ts.nodeIsPresent(n.literal);
-            case 255 /* ExportDeclaration */:
-            case 249 /* ImportDeclaration */:
+            case 256 /* ExportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 return ts.nodeIsPresent(n.moduleSpecifier);
-            case 202 /* PrefixUnaryExpression */:
+            case 203 /* PrefixUnaryExpression */:
                 return isCompletedNode(n.operand, sourceFile);
-            case 204 /* BinaryExpression */:
+            case 205 /* BinaryExpression */:
                 return isCompletedNode(n.right, sourceFile);
-            case 205 /* ConditionalExpression */:
+            case 206 /* ConditionalExpression */:
                 return isCompletedNode(n.whenFalse, sourceFile);
             default:
                 return true;
@@ -96160,7 +97095,7 @@ var ts;
                     }
                 }
             }
-            ts.Debug.assert(startNode !== undefined || n.kind === 284 /* SourceFile */ || n.kind === 1 /* EndOfFileToken */ || ts.isJSDocCommentContainingNode(n));
+            ts.Debug.assert(startNode !== undefined || n.kind === 285 /* SourceFile */ || n.kind === 1 /* EndOfFileToken */ || ts.isJSDocCommentContainingNode(n));
             // Here we know that none of child token nodes embrace the position,
             // the only known case is when position is at the end of the file.
             // Try to find the rightmost token in the file without filtering.
@@ -96230,17 +97165,17 @@ var ts;
             return true;
         }
         // <div> { | </div> or <div a={| </div>
-        if (token.kind === 28 /* LessThanToken */ && token.parent.kind === 270 /* JsxExpression */) {
+        if (token.kind === 28 /* LessThanToken */ && token.parent.kind === 271 /* JsxExpression */) {
             return true;
         }
         // <div> {
         // |
         // } < /div>
-        if (token && token.kind === 19 /* CloseBraceToken */ && token.parent.kind === 270 /* JsxExpression */) {
+        if (token && token.kind === 19 /* CloseBraceToken */ && token.parent.kind === 271 /* JsxExpression */) {
             return true;
         }
         // <div>|</div>
-        if (token.kind === 28 /* LessThanToken */ && token.parent.kind === 263 /* JsxClosingElement */) {
+        if (token.kind === 28 /* LessThanToken */ && token.parent.kind === 264 /* JsxClosingElement */) {
             return true;
         }
         return false;
@@ -96359,15 +97294,15 @@ var ts;
                     nTypeArguments++;
                     break;
                 case 37 /* EqualsGreaterThanToken */:
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                 case 10 /* StringLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
-                case 102 /* TrueKeyword */:
-                case 87 /* FalseKeyword */:
-                case 104 /* TypeOfKeyword */:
-                case 86 /* ExtendsKeyword */:
-                case 129 /* KeyOfKeyword */:
+                case 103 /* TrueKeyword */:
+                case 88 /* FalseKeyword */:
+                case 105 /* TypeOfKeyword */:
+                case 87 /* ExtendsKeyword */:
+                case 130 /* KeyOfKeyword */:
                 case 24 /* DotToken */:
                 case 50 /* BarToken */:
                 case 56 /* QuestionToken */:
@@ -96426,10 +97361,10 @@ var ts;
     }
     ts.getNodeModifiers = getNodeModifiers;
     function getTypeArgumentOrTypeParameterList(node) {
-        if (node.kind === 164 /* TypeReference */ || node.kind === 191 /* CallExpression */) {
+        if (node.kind === 165 /* TypeReference */ || node.kind === 192 /* CallExpression */) {
             return node.typeArguments;
         }
-        if (ts.isFunctionLike(node) || node.kind === 240 /* ClassDeclaration */ || node.kind === 241 /* InterfaceDeclaration */) {
+        if (ts.isFunctionLike(node) || node.kind === 241 /* ClassDeclaration */ || node.kind === 242 /* InterfaceDeclaration */) {
             return node.typeParameters;
         }
         return undefined;
@@ -96449,7 +97384,7 @@ var ts;
     }
     ts.isStringOrRegularExpressionOrTemplateLiteral = isStringOrRegularExpressionOrTemplateLiteral;
     function isPunctuation(kind) {
-        return 18 /* FirstPunctuation */ <= kind && kind <= 71 /* LastPunctuation */;
+        return 18 /* FirstPunctuation */ <= kind && kind <= 72 /* LastPunctuation */;
     }
     ts.isPunctuation = isPunctuation;
     function isInsideTemplateLiteral(node, position, sourceFile) {
@@ -96459,9 +97394,9 @@ var ts;
     ts.isInsideTemplateLiteral = isInsideTemplateLiteral;
     function isAccessibilityModifier(kind) {
         switch (kind) {
-            case 115 /* PublicKeyword */:
-            case 113 /* PrivateKeyword */:
-            case 114 /* ProtectedKeyword */:
+            case 116 /* PublicKeyword */:
+            case 114 /* PrivateKeyword */:
+            case 115 /* ProtectedKeyword */:
                 return true;
         }
         return false;
@@ -96474,18 +97409,18 @@ var ts;
     }
     ts.cloneCompilerOptions = cloneCompilerOptions;
     function isArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-        if (node.kind === 187 /* ArrayLiteralExpression */ ||
-            node.kind === 188 /* ObjectLiteralExpression */) {
+        if (node.kind === 188 /* ArrayLiteralExpression */ ||
+            node.kind === 189 /* ObjectLiteralExpression */) {
             // [a,b,c] from:
             // [a, b, c] = someExpression;
-            if (node.parent.kind === 204 /* BinaryExpression */ &&
+            if (node.parent.kind === 205 /* BinaryExpression */ &&
                 node.parent.left === node &&
-                node.parent.operatorToken.kind === 59 /* EqualsToken */) {
+                node.parent.operatorToken.kind === 60 /* EqualsToken */) {
                 return true;
             }
             // [a, b, c] from:
             // for([a, b, c] of expression)
-            if (node.parent.kind === 227 /* ForOfStatement */ &&
+            if (node.parent.kind === 228 /* ForOfStatement */ &&
                 node.parent.initializer === node) {
                 return true;
             }
@@ -96493,7 +97428,7 @@ var ts;
             // [x, [a, b, c] ] = someExpression
             // or
             // {x, a: {a, b, c} } = someExpression
-            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 275 /* PropertyAssignment */ ? node.parent.parent : node.parent)) {
+            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 276 /* PropertyAssignment */ ? node.parent.parent : node.parent)) {
                 return true;
             }
         }
@@ -96537,22 +97472,22 @@ var ts;
     }
     ts.createTextChange = createTextChange;
     ts.typeKeywords = [
-        120 /* AnyKeyword */,
-        146 /* BigIntKeyword */,
-        123 /* BooleanKeyword */,
-        87 /* FalseKeyword */,
-        129 /* KeyOfKeyword */,
-        132 /* NeverKeyword */,
-        96 /* NullKeyword */,
-        135 /* NumberKeyword */,
-        136 /* ObjectKeyword */,
-        138 /* StringKeyword */,
-        139 /* SymbolKeyword */,
-        102 /* TrueKeyword */,
-        106 /* VoidKeyword */,
-        141 /* UndefinedKeyword */,
-        142 /* UniqueKeyword */,
-        143 /* UnknownKeyword */,
+        121 /* AnyKeyword */,
+        147 /* BigIntKeyword */,
+        124 /* BooleanKeyword */,
+        88 /* FalseKeyword */,
+        130 /* KeyOfKeyword */,
+        133 /* NeverKeyword */,
+        97 /* NullKeyword */,
+        136 /* NumberKeyword */,
+        137 /* ObjectKeyword */,
+        139 /* StringKeyword */,
+        140 /* SymbolKeyword */,
+        103 /* TrueKeyword */,
+        107 /* VoidKeyword */,
+        142 /* UndefinedKeyword */,
+        143 /* UniqueKeyword */,
+        144 /* UnknownKeyword */,
     ];
     function isTypeKeyword(kind) {
         return ts.contains(ts.typeKeywords, kind);
@@ -96588,7 +97523,7 @@ var ts;
     }
     ts.skipConstraint = skipConstraint;
     function getNameFromPropertyName(name) {
-        return name.kind === 149 /* ComputedPropertyName */
+        return name.kind === 150 /* ComputedPropertyName */
             // treat computed property names where expression is string/numeric literal as just string/numeric literal
             ? ts.isStringOrNumericLiteralLike(name.expression) ? name.expression.text : undefined
             : ts.getTextOfIdentifierOrLiteral(name);
@@ -96664,7 +97599,7 @@ var ts;
         }
         return ts.firstDefined(symbol.declarations, function (decl) {
             var name = ts.getNameOfDeclaration(decl);
-            return name && name.kind === 72 /* Identifier */ ? name.escapedText : undefined;
+            return name && name.kind === 73 /* Identifier */ ? name.escapedText : undefined;
         });
     }
     ts.symbolEscapedNameNoDefault = symbolEscapedNameNoDefault;
@@ -96753,7 +97688,7 @@ var ts;
 /* @internal */
 (function (ts) {
     function isFirstDeclarationOfSymbolParameter(symbol) {
-        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 151 /* Parameter */;
+        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 152 /* Parameter */;
     }
     ts.isFirstDeclarationOfSymbolParameter = isFirstDeclarationOfSymbolParameter;
     var displayPartWriter = getDisplayPartWriter();
@@ -97007,10 +97942,15 @@ var ts;
         return ts.ensureScriptKind(fileName, host && host.getScriptKind && host.getScriptKind(fileName));
     }
     ts.getScriptKind = getScriptKind;
-    function getSymbolTarget(symbol) {
+    function getSymbolTarget(symbol, checker) {
         var next = symbol;
-        while (isTransientSymbol(next) && next.target) {
-            next = next.target;
+        while (isAliasSymbol(next) || (isTransientSymbol(next) && next.target)) {
+            if (isTransientSymbol(next) && next.target) {
+                next = next.target;
+            }
+            else {
+                next = ts.skipAlias(next, checker);
+            }
         }
         return next;
     }
@@ -97018,6 +97958,9 @@ var ts;
     function isTransientSymbol(symbol) {
         return (symbol.flags & 33554432 /* Transient */) !== 0;
     }
+    function isAliasSymbol(symbol) {
+        return (symbol.flags & 2097152 /* Alias */) !== 0;
+    }
     function getUniqueSymbolId(symbol, checker) {
         return ts.getSymbolId(ts.skipAlias(symbol, checker));
     }
@@ -97053,7 +97996,14 @@ var ts;
     function getSynthesizedDeepCloneWithRenames(node, includeTrivia, renameMap, checker, callback) {
         if (includeTrivia === void 0) { includeTrivia = true; }
         var clone;
-        if (ts.isIdentifier(node) && renameMap && checker) {
+        if (renameMap && checker && ts.isBindingElement(node) && ts.isIdentifier(node.name) && ts.isObjectBindingPattern(node.parent)) {
+            var symbol = checker.getSymbolAtLocation(node.name);
+            var renameInfo = symbol && renameMap.get(String(ts.getSymbolId(symbol)));
+            if (renameInfo && renameInfo.text !== (node.name || node.propertyName).getText()) {
+                clone = ts.createBindingElement(node.dotDotDotToken, node.propertyName || node.name, renameInfo, node.initializer);
+            }
+        }
+        else if (renameMap && checker && ts.isIdentifier(node)) {
             var symbol = checker.getSymbolAtLocation(node);
             var renameInfo = symbol && renameMap.get(String(ts.getSymbolId(symbol)));
             if (renameInfo) {
@@ -97217,15 +98167,15 @@ var ts;
     function getContextualTypeFromParent(node, checker) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 192 /* NewExpression */:
+            case 193 /* NewExpression */:
                 return checker.getContextualType(parent);
-            case 204 /* BinaryExpression */: {
+            case 205 /* BinaryExpression */: {
                 var _a = parent, left = _a.left, operatorToken = _a.operatorToken, right = _a.right;
                 return isEqualityOperatorKind(operatorToken.kind)
                     ? checker.getTypeAtLocation(node === right ? left : right)
                     : checker.getContextualType(node);
             }
-            case 271 /* CaseClause */:
+            case 272 /* CaseClause */:
                 return parent.expression === node ? getSwitchedType(parent, checker) : undefined;
             default:
                 return checker.getContextualType(node);
@@ -97267,8 +98217,8 @@ var ts;
         switch (node.kind) {
             case 10 /* StringLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 206 /* TemplateExpression */:
-            case 193 /* TaggedTemplateExpression */:
+            case 207 /* TemplateExpression */:
+            case 194 /* TaggedTemplateExpression */:
                 return true;
             default:
                 return false;
@@ -97311,7 +98261,7 @@ var ts;
 var ts;
 (function (ts) {
     function createClassifier() {
-        var scanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false);
+        var scanner = ts.createScanner(8 /* Latest */, /*skipTrivia*/ false);
         function getClassificationsForLine(text, lexState, syntacticClassifierAbsent) {
             return convertClassificationsToResult(getEncodedLexicalClassifications(text, lexState, syntacticClassifierAbsent), text);
         }
@@ -97388,13 +98338,13 @@ var ts;
             function handleToken() {
                 switch (token) {
                     case 42 /* SlashToken */:
-                    case 64 /* SlashEqualsToken */:
+                    case 65 /* SlashEqualsToken */:
                         if (!noRegexTable[lastNonTriviaToken] && scanner.reScanSlashToken() === 13 /* RegularExpressionLiteral */) {
                             token = 13 /* RegularExpressionLiteral */;
                         }
                         break;
                     case 28 /* LessThanToken */:
-                        if (lastNonTriviaToken === 72 /* Identifier */) {
+                        if (lastNonTriviaToken === 73 /* Identifier */) {
                             // Could be the start of something generic.  Keep track of that by bumping
                             // up the current count of generic contexts we may be in.
                             angleBracketStack++;
@@ -97407,16 +98357,16 @@ var ts;
                             angleBracketStack--;
                         }
                         break;
-                    case 120 /* AnyKeyword */:
-                    case 138 /* StringKeyword */:
-                    case 135 /* NumberKeyword */:
-                    case 123 /* BooleanKeyword */:
-                    case 139 /* SymbolKeyword */:
+                    case 121 /* AnyKeyword */:
+                    case 139 /* StringKeyword */:
+                    case 136 /* NumberKeyword */:
+                    case 124 /* BooleanKeyword */:
+                    case 140 /* SymbolKeyword */:
                         if (angleBracketStack > 0 && !syntacticClassifierAbsent) {
                             // If it looks like we're could be in something generic, don't classify this
                             // as a keyword.  We may just get overwritten by the syntactic classifier,
                             // causing a noisy experience for the user.
-                            token = 72 /* Identifier */;
+                            token = 73 /* Identifier */;
                         }
                         break;
                     case 15 /* TemplateHead */:
@@ -97455,14 +98405,14 @@ var ts;
                             break;
                         }
                         if (lastNonTriviaToken === 24 /* DotToken */) {
-                            token = 72 /* Identifier */;
+                            token = 73 /* Identifier */;
                         }
                         else if (ts.isKeyword(lastNonTriviaToken) && ts.isKeyword(token) && !canFollow(lastNonTriviaToken, token)) {
                             // We have two keywords in a row.  Only treat the second as a keyword if
                             // it's a sequence that could legally occur in the language.  Otherwise
                             // treat it as an identifier.  This way, if someone writes "private var"
                             // we recognize that 'var' is actually an identifier here.
-                            token = 72 /* Identifier */;
+                            token = 73 /* Identifier */;
                         }
                 }
             }
@@ -97476,19 +98426,19 @@ var ts;
     /// we have a series of divide operator. this list allows us to be more accurate by ruling out
     /// locations where a regexp cannot exist.
     var noRegexTable = ts.arrayToNumericMap([
-        72 /* Identifier */,
+        73 /* Identifier */,
         10 /* StringLiteral */,
         8 /* NumericLiteral */,
         9 /* BigIntLiteral */,
         13 /* RegularExpressionLiteral */,
-        100 /* ThisKeyword */,
+        101 /* ThisKeyword */,
         44 /* PlusPlusToken */,
         45 /* MinusMinusToken */,
         21 /* CloseParenToken */,
         23 /* CloseBracketToken */,
         19 /* CloseBraceToken */,
-        102 /* TrueKeyword */,
-        87 /* FalseKeyword */,
+        103 /* TrueKeyword */,
+        88 /* FalseKeyword */,
     ], function (token) { return token; }, function () { return true; });
     function getNewEndOfLineState(scanner, token, lastOnTemplateStack) {
         switch (token) {
@@ -97600,10 +98550,10 @@ var ts;
             return true;
         }
         switch (keyword2) {
-            case 126 /* GetKeyword */:
-            case 137 /* SetKeyword */:
-            case 124 /* ConstructorKeyword */:
-            case 116 /* StaticKeyword */:
+            case 127 /* GetKeyword */:
+            case 138 /* SetKeyword */:
+            case 125 /* ConstructorKeyword */:
+            case 117 /* StaticKeyword */:
                 return true; // Allow things like "public get", "public constructor" and "public static".
             default:
                 return false; // Any other keyword following "public" is actually an identifier, not a real keyword.
@@ -97648,9 +98598,9 @@ var ts;
             case 30 /* GreaterThanToken */:
             case 31 /* LessThanEqualsToken */:
             case 32 /* GreaterThanEqualsToken */:
-            case 94 /* InstanceOfKeyword */:
-            case 93 /* InKeyword */:
-            case 119 /* AsKeyword */:
+            case 95 /* InstanceOfKeyword */:
+            case 94 /* InKeyword */:
+            case 120 /* AsKeyword */:
             case 33 /* EqualsEqualsToken */:
             case 34 /* ExclamationEqualsToken */:
             case 35 /* EqualsEqualsEqualsToken */:
@@ -97660,18 +98610,18 @@ var ts;
             case 50 /* BarToken */:
             case 54 /* AmpersandAmpersandToken */:
             case 55 /* BarBarToken */:
-            case 70 /* BarEqualsToken */:
-            case 69 /* AmpersandEqualsToken */:
-            case 71 /* CaretEqualsToken */:
-            case 66 /* LessThanLessThanEqualsToken */:
-            case 67 /* GreaterThanGreaterThanEqualsToken */:
-            case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-            case 60 /* PlusEqualsToken */:
-            case 61 /* MinusEqualsToken */:
-            case 62 /* AsteriskEqualsToken */:
-            case 64 /* SlashEqualsToken */:
-            case 65 /* PercentEqualsToken */:
-            case 59 /* EqualsToken */:
+            case 71 /* BarEqualsToken */:
+            case 70 /* AmpersandEqualsToken */:
+            case 72 /* CaretEqualsToken */:
+            case 67 /* LessThanLessThanEqualsToken */:
+            case 68 /* GreaterThanGreaterThanEqualsToken */:
+            case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+            case 61 /* PlusEqualsToken */:
+            case 62 /* MinusEqualsToken */:
+            case 63 /* AsteriskEqualsToken */:
+            case 65 /* SlashEqualsToken */:
+            case 66 /* PercentEqualsToken */:
+            case 60 /* EqualsToken */:
             case 27 /* CommaToken */:
                 return true;
             default:
@@ -97698,7 +98648,7 @@ var ts;
         else if (isBinaryExpressionOperatorToken(token) || isPrefixUnaryExpressionOperatorToken(token)) {
             return 5 /* operator */;
         }
-        else if (token >= 18 /* FirstPunctuation */ && token <= 71 /* LastPunctuation */) {
+        else if (token >= 18 /* FirstPunctuation */ && token <= 72 /* LastPunctuation */) {
             return 10 /* punctuation */;
         }
         switch (token) {
@@ -97717,7 +98667,7 @@ var ts;
             case 5 /* WhitespaceTrivia */:
             case 4 /* NewLineTrivia */:
                 return 8 /* whiteSpace */;
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
             default:
                 if (ts.isTemplateLiteralKind(token)) {
                     return 6 /* stringLiteral */;
@@ -97742,10 +98692,10 @@ var ts;
         // That means we're calling back into the host around every 1.2k of the file we process.
         // Lib.d.ts has similar numbers.
         switch (kind) {
-            case 244 /* ModuleDeclaration */:
-            case 240 /* ClassDeclaration */:
-            case 241 /* InterfaceDeclaration */:
-            case 239 /* FunctionDeclaration */:
+            case 245 /* ModuleDeclaration */:
+            case 241 /* ClassDeclaration */:
+            case 242 /* InterfaceDeclaration */:
+            case 240 /* FunctionDeclaration */:
                 cancellationToken.throwIfCancellationRequested();
         }
     }
@@ -97865,8 +98815,8 @@ var ts;
         var spanStart = span.start;
         var spanLength = span.length;
         // Make a scanner we can get trivia from.
-        var triviaScanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
-        var mergeConflictScanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
+        var triviaScanner = ts.createScanner(8 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
+        var mergeConflictScanner = ts.createScanner(8 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
         var result = [];
         processElement(sourceFile);
         return { spans: result, endOfLineState: 0 /* None */ };
@@ -97958,18 +98908,18 @@ var ts;
                     pushClassification(tag.tagName.pos, tag.tagName.end - tag.tagName.pos, 18 /* docCommentTagName */); // e.g. "param"
                     pos = tag.tagName.end;
                     switch (tag.kind) {
-                        case 304 /* JSDocParameterTag */:
+                        case 305 /* JSDocParameterTag */:
                             processJSDocParameterTag(tag);
                             break;
-                        case 308 /* JSDocTemplateTag */:
+                        case 309 /* JSDocTemplateTag */:
                             processJSDocTemplateTag(tag);
                             pos = tag.end;
                             break;
-                        case 307 /* JSDocTypeTag */:
+                        case 308 /* JSDocTypeTag */:
                             processElement(tag.typeExpression);
                             pos = tag.end;
                             break;
-                        case 305 /* JSDocReturnTag */:
+                        case 306 /* JSDocReturnTag */:
                             processElement(tag.typeExpression);
                             pos = tag.end;
                             break;
@@ -98056,22 +99006,22 @@ var ts;
         }
         function tryClassifyJsxElementName(token) {
             switch (token.parent && token.parent.kind) {
-                case 262 /* JsxOpeningElement */:
+                case 263 /* JsxOpeningElement */:
                     if (token.parent.tagName === token) {
                         return 19 /* jsxOpenTagName */;
                     }
                     break;
-                case 263 /* JsxClosingElement */:
+                case 264 /* JsxClosingElement */:
                     if (token.parent.tagName === token) {
                         return 20 /* jsxCloseTagName */;
                     }
                     break;
-                case 261 /* JsxSelfClosingElement */:
+                case 262 /* JsxSelfClosingElement */:
                     if (token.parent.tagName === token) {
                         return 21 /* jsxSelfClosingTagName */;
                     }
                     break;
-                case 267 /* JsxAttribute */:
+                case 268 /* JsxAttribute */:
                     if (token.parent.name === token) {
                         return 22 /* jsxAttribute */;
                     }
@@ -98098,19 +99048,19 @@ var ts;
             if (ts.isPunctuation(tokenKind)) {
                 if (token) {
                     var parent = token.parent;
-                    if (tokenKind === 59 /* EqualsToken */) {
+                    if (tokenKind === 60 /* EqualsToken */) {
                         // the '=' in a variable declaration is special cased here.
-                        if (parent.kind === 237 /* VariableDeclaration */ ||
-                            parent.kind === 154 /* PropertyDeclaration */ ||
-                            parent.kind === 151 /* Parameter */ ||
-                            parent.kind === 267 /* JsxAttribute */) {
+                        if (parent.kind === 238 /* VariableDeclaration */ ||
+                            parent.kind === 155 /* PropertyDeclaration */ ||
+                            parent.kind === 152 /* Parameter */ ||
+                            parent.kind === 268 /* JsxAttribute */) {
                             return 5 /* operator */;
                         }
                     }
-                    if (parent.kind === 204 /* BinaryExpression */ ||
-                        parent.kind === 202 /* PrefixUnaryExpression */ ||
-                        parent.kind === 203 /* PostfixUnaryExpression */ ||
-                        parent.kind === 205 /* ConditionalExpression */) {
+                    if (parent.kind === 205 /* BinaryExpression */ ||
+                        parent.kind === 203 /* PrefixUnaryExpression */ ||
+                        parent.kind === 204 /* PostfixUnaryExpression */ ||
+                        parent.kind === 206 /* ConditionalExpression */) {
                         return 5 /* operator */;
                     }
                 }
@@ -98124,7 +99074,7 @@ var ts;
             }
             else if (tokenKind === 10 /* StringLiteral */) {
                 // TODO: GH#18217
-                return token.parent.kind === 267 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */;
+                return token.parent.kind === 268 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */;
             }
             else if (tokenKind === 13 /* RegularExpressionLiteral */) {
                 // TODO: we should get another classification type for these literals.
@@ -98137,35 +99087,35 @@ var ts;
             else if (tokenKind === 11 /* JsxText */) {
                 return 23 /* jsxText */;
             }
-            else if (tokenKind === 72 /* Identifier */) {
+            else if (tokenKind === 73 /* Identifier */) {
                 if (token) {
                     switch (token.parent.kind) {
-                        case 240 /* ClassDeclaration */:
+                        case 241 /* ClassDeclaration */:
                             if (token.parent.name === token) {
                                 return 11 /* className */;
                             }
                             return;
-                        case 150 /* TypeParameter */:
+                        case 151 /* TypeParameter */:
                             if (token.parent.name === token) {
                                 return 15 /* typeParameterName */;
                             }
                             return;
-                        case 241 /* InterfaceDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
                             if (token.parent.name === token) {
                                 return 13 /* interfaceName */;
                             }
                             return;
-                        case 243 /* EnumDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             if (token.parent.name === token) {
                                 return 12 /* enumName */;
                             }
                             return;
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             if (token.parent.name === token) {
                                 return 14 /* moduleName */;
                             }
                             return;
-                        case 151 /* Parameter */:
+                        case 152 /* Parameter */:
                             if (token.parent.name === token) {
                                 return ts.isThisIdentifier(token) ? 3 /* keyword */ : 17 /* parameterName */;
                             }
@@ -98222,7 +99172,7 @@ var ts;
                         return convertPathCompletions(completion.paths);
                     case 1 /* Properties */: {
                         var entries = [];
-                        Completions.getCompletionEntriesFromSymbols(completion.symbols, entries, sourceFile, sourceFile, checker, 7 /* ESNext */, log, 4 /* String */, preferences); // Target will not be used, so arbitrary
+                        Completions.getCompletionEntriesFromSymbols(completion.symbols, entries, sourceFile, sourceFile, checker, 8 /* ESNext */, log, 4 /* String */, preferences); // Target will not be used, so arbitrary
                         return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: completion.hasIndexSignature, entries: entries };
                     }
                     case 2 /* Types */: {
@@ -98261,7 +99211,7 @@ var ts;
                 var isNewIdentifierLocation = true; // The user may type in a path that doesn't yet exist, creating a "new identifier" with respect to the collection of identifiers the server is aware of.
                 var entries = pathCompletions.map(function (_a) {
                     var name = _a.name, kind = _a.kind, span = _a.span, extension = _a.extension;
-                    return ({ name: name, kind: kind, kindModifiers: kindModifiersFromExtension(extension), sortText: "0", replacementSpan: span });
+                    return ({ name: name, kind: kind, kindModifiers: kindModifiersFromExtension(extension), sortText: Completions.SortText.LocationPriority, replacementSpan: span });
                 });
                 return { isGlobalCompletion: isGlobalCompletion, isMemberCompletion: false, isNewIdentifierLocation: isNewIdentifierLocation, entries: entries };
             }
@@ -98288,11 +99238,11 @@ var ts;
             function getStringLiteralCompletionEntries(sourceFile, node, position, typeChecker, compilerOptions, host) {
                 var parent = node.parent;
                 switch (parent.kind) {
-                    case 182 /* LiteralType */:
+                    case 183 /* LiteralType */:
                         switch (parent.parent.kind) {
-                            case 164 /* TypeReference */:
+                            case 165 /* TypeReference */:
                                 return { kind: 2 /* Types */, types: getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(parent)), isNewIdentifier: false };
-                            case 180 /* IndexedAccessType */:
+                            case 181 /* IndexedAccessType */:
                                 // Get all apparent property names
                                 // i.e. interface Foo {
                                 //          foo: string;
@@ -98300,9 +99250,9 @@ var ts;
                                 //      }
                                 //      let x: Foo["/*completion position*/"]
                                 return stringLiteralCompletionsFromProperties(typeChecker.getTypeFromTypeNode(parent.parent.objectType));
-                            case 183 /* ImportType */:
+                            case 184 /* ImportType */:
                                 return { kind: 0 /* Paths */, paths: getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker) };
-                            case 173 /* UnionType */: {
+                            case 174 /* UnionType */: {
                                 if (!ts.isTypeReferenceNode(parent.parent.parent))
                                     return undefined;
                                 var alreadyUsedTypes_1 = getAlreadyUsedTypesInStringLiteralUnion(parent.parent, parent);
@@ -98312,7 +99262,7 @@ var ts;
                             default:
                                 return undefined;
                         }
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         if (ts.isObjectLiteralExpression(parent.parent) && parent.name === node) {
                             // Get quoted name of properties of the object literal expression
                             // i.e. interface ConfigFiles {
@@ -98329,7 +99279,7 @@ var ts;
                             return stringLiteralCompletionsFromProperties(typeChecker.getContextualType(parent.parent));
                         }
                         return fromContextualType();
-                    case 190 /* ElementAccessExpression */: {
+                    case 191 /* ElementAccessExpression */: {
                         var _a = parent, expression = _a.expression, argumentExpression = _a.argumentExpression;
                         if (node === argumentExpression) {
                             // Get all names of properties on the expression
@@ -98342,8 +99292,8 @@ var ts;
                         }
                         return undefined;
                     }
-                    case 191 /* CallExpression */:
-                    case 192 /* NewExpression */:
+                    case 192 /* CallExpression */:
+                    case 193 /* NewExpression */:
                         if (!ts.isRequireCall(parent, /*checkArgumentIsStringLiteralLike*/ false) && !ts.isImportCall(parent)) {
                             var argumentInfo = ts.SignatureHelp.getArgumentInfoForCompletions(node, position, sourceFile);
                             // Get string literal completions from specialized signatures of the target
@@ -98352,9 +99302,9 @@ var ts;
                             return argumentInfo ? getStringLiteralCompletionsFromSignature(argumentInfo, typeChecker) : fromContextualType();
                         }
                     // falls through (is `require("")` or `import("")`)
-                    case 249 /* ImportDeclaration */:
-                    case 255 /* ExportDeclaration */:
-                    case 259 /* ExternalModuleReference */:
+                    case 250 /* ImportDeclaration */:
+                    case 256 /* ExportDeclaration */:
+                    case 260 /* ExternalModuleReference */:
                         // Get all known external module names or complete a path to a module
                         // i.e. import * as ns from "/*completion position*/";
                         //      var y = import("/*completion position*/");
@@ -98801,7 +99751,7 @@ var ts;
                 var offset = index !== -1 ? index + 1 : 0;
                 // If the range is an identifier, span is unnecessary.
                 var length = text.length - offset;
-                return length === 0 || ts.isIdentifierText(text.substr(offset, length), 7 /* ESNext */) ? undefined : ts.createTextSpan(textStart + offset, length);
+                return length === 0 || ts.isIdentifierText(text.substr(offset, length), 8 /* ESNext */) ? undefined : ts.createTextSpan(textStart + offset, length);
             }
             // Returns true if the path is explicitly relative to the script (i.e. relative to . or ..)
             function isPathRelativeToScript(path) {
@@ -98864,6 +99814,14 @@ var ts;
 (function (ts) {
     var Completions;
     (function (Completions) {
+        var SortText;
+        (function (SortText) {
+            SortText["LocationPriority"] = "0";
+            SortText["SuggestedClassMembers"] = "1";
+            SortText["GlobalsOrKeywords"] = "2";
+            SortText["AutoImportSuggestions"] = "3";
+            SortText["JavascriptIdentifiers"] = "4";
+        })(SortText = Completions.SortText || (Completions.SortText = {}));
         var SymbolOriginInfoKind;
         (function (SymbolOriginInfoKind) {
             SymbolOriginInfoKind[SymbolOriginInfoKind["ThisType"] = 0] = "ThisType";
@@ -98898,14 +99856,15 @@ var ts;
             var typeChecker = program.getTypeChecker();
             var compilerOptions = program.getCompilerOptions();
             var contextToken = ts.findPrecedingToken(position, sourceFile);
-            if (triggerCharacter && !isValidTrigger(sourceFile, triggerCharacter, contextToken, position))
+            if (triggerCharacter && !ts.isInString(sourceFile, position, contextToken) && !isValidTrigger(sourceFile, triggerCharacter, contextToken, position)) {
                 return undefined;
+            }
             var stringCompletions = Completions.StringCompletions.getStringLiteralCompletions(sourceFile, position, contextToken, typeChecker, compilerOptions, host, log, preferences);
             if (stringCompletions) {
                 return stringCompletions;
             }
             if (contextToken && ts.isBreakOrContinueStatement(contextToken.parent)
-                && (contextToken.kind === 73 /* BreakKeyword */ || contextToken.kind === 78 /* ContinueKeyword */ || contextToken.kind === 72 /* Identifier */)) {
+                && (contextToken.kind === 74 /* BreakKeyword */ || contextToken.kind === 79 /* ContinueKeyword */ || contextToken.kind === 73 /* Identifier */)) {
                 return getLabelCompletionAtPosition(contextToken.parent);
             }
             var completionData = getCompletionData(program, log, sourceFile, isUncheckedFile(sourceFile, compilerOptions), position, preferences, /*detailsEntryId*/ undefined);
@@ -98932,7 +99891,7 @@ var ts;
             return { isGlobalCompletion: false, isMemberCompletion: false, isNewIdentifierLocation: false, entries: entries };
         }
         function completionInfoFromData(sourceFile, typeChecker, compilerOptions, log, completionData, preferences) {
-            var symbols = completionData.symbols, completionKind = completionData.completionKind, isInSnippetScope = completionData.isInSnippetScope, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, propertyAccessToConvert = completionData.propertyAccessToConvert, keywordFilters = completionData.keywordFilters, literals = completionData.literals, symbolToOriginInfoMap = completionData.symbolToOriginInfoMap, recommendedCompletion = completionData.recommendedCompletion, isJsxInitializer = completionData.isJsxInitializer, insideJsDocTagTypeExpression = completionData.insideJsDocTagTypeExpression;
+            var symbols = completionData.symbols, completionKind = completionData.completionKind, isInSnippetScope = completionData.isInSnippetScope, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, propertyAccessToConvert = completionData.propertyAccessToConvert, keywordFilters = completionData.keywordFilters, literals = completionData.literals, symbolToOriginInfoMap = completionData.symbolToOriginInfoMap, recommendedCompletion = completionData.recommendedCompletion, isJsxInitializer = completionData.isJsxInitializer, insideJsDocTagTypeExpression = completionData.insideJsDocTagTypeExpression, symbolToSortTextMap = completionData.symbolToSortTextMap;
             if (location && location.parent && ts.isJsxClosingElement(location.parent)) {
                 // In the TypeScript JSX element, if such element is not defined. When users query for completion at closing tag,
                 // instead of simply giving unknown value, the completion will return the tag-name of an associated opening-element.
@@ -98946,20 +99905,20 @@ var ts;
                     name: tagName.getFullText(sourceFile) + (hasClosingAngleBracket ? "" : ">"),
                     kind: "class" /* classElement */,
                     kindModifiers: undefined,
-                    sortText: "0",
+                    sortText: SortText.LocationPriority,
                 };
                 return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: false, entries: [entry] };
             }
             var entries = [];
             if (isUncheckedFile(sourceFile, compilerOptions)) {
-                var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap);
+                var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap);
                 getJSCompletionEntries(sourceFile, location.pos, uniqueNames, compilerOptions.target, entries); // TODO: GH#18217
             }
             else {
                 if (!isNewIdentifierLocation && (!symbols || symbols.length === 0) && keywordFilters === 0 /* None */) {
                     return undefined;
                 }
-                getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap);
+                getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap);
             }
             if (keywordFilters !== 0 /* None */) {
                 var entryNames = ts.arrayToSet(entries, function (e) { return e.name; });
@@ -99001,7 +99960,7 @@ var ts;
                         name: realName,
                         kind: "warning" /* warning */,
                         kindModifiers: "",
-                        sortText: "1"
+                        sortText: SortText.JavascriptIdentifiers
                     });
                 }
             });
@@ -99010,14 +99969,9 @@ var ts;
             return typeof literal === "object" ? ts.pseudoBigIntToString(literal) + "n" : JSON.stringify(literal);
         };
         function createCompletionEntryForLiteral(literal) {
-            return { name: completionNameForLiteral(literal), kind: "string" /* string */, kindModifiers: "" /* none */, sortText: "0" };
+            return { name: completionNameForLiteral(literal), kind: "string" /* string */, kindModifiers: "" /* none */, sortText: SortText.LocationPriority };
         }
-        function createCompletionEntry(symbol, location, sourceFile, typeChecker, target, kind, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences) {
-            var info = getCompletionEntryDisplayNameForSymbol(symbol, target, origin, kind);
-            if (!info) {
-                return undefined;
-            }
-            var name = info.name, needsConvertPropertyAccess = info.needsConvertPropertyAccess;
+        function createCompletionEntry(symbol, sortText, location, sourceFile, typeChecker, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences) {
             var insertText;
             var replacementSpan;
             if (origin && origin.kind === 0 /* ThisType */) {
@@ -99054,7 +100008,7 @@ var ts;
                 name: name,
                 kind: ts.SymbolDisplay.getSymbolKind(typeChecker, symbol, location),
                 kindModifiers: ts.SymbolDisplay.getSymbolModifiers(symbol),
-                sortText: "0",
+                sortText: sortText,
                 source: getSourceFromOrigin(origin),
                 hasAction: trueOrUndefined(!!origin && originIsExport(origin)),
                 isRecommended: trueOrUndefined(isRecommendedCompletionMatch(symbol, recommendedCompletion, typeChecker)),
@@ -99072,7 +100026,7 @@ var ts;
         function getSourceFromOrigin(origin) {
             return origin && originIsExport(origin) ? ts.stripQuotes(origin.moduleSymbol.name) : undefined;
         }
-        function getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, target, log, kind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap) {
+        function getCompletionEntriesFromSymbols(symbols, entries, location, sourceFile, typeChecker, target, log, kind, preferences, propertyAccessToConvert, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap) {
             var start = ts.timestamp();
             // Tracks unique names.
             // We don't set this for global variables or completions from external module exports, because we can have multiple of those.
@@ -99082,14 +100036,18 @@ var ts;
             for (var _i = 0, symbols_1 = symbols; _i < symbols_1.length; _i++) {
                 var symbol = symbols_1[_i];
                 var origin = symbolToOriginInfoMap ? symbolToOriginInfoMap[ts.getSymbolId(symbol)] : undefined;
-                var entry = createCompletionEntry(symbol, location, sourceFile, typeChecker, target, kind, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences);
-                if (!entry) {
+                var info = getCompletionEntryDisplayNameForSymbol(symbol, target, origin, kind);
+                if (!info) {
                     continue;
                 }
-                var name = entry.name;
+                var name = info.name, needsConvertPropertyAccess = info.needsConvertPropertyAccess;
                 if (uniques.has(name)) {
                     continue;
                 }
+                var entry = createCompletionEntry(symbol, symbolToSortTextMap && symbolToSortTextMap[ts.getSymbolId(symbol)] || SortText.LocationPriority, location, sourceFile, typeChecker, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences);
+                if (!entry) {
+                    continue;
+                }
                 // Latter case tests whether this is a global variable.
                 if (!origin && !(symbol.parent === undefined && !ts.some(symbol.declarations, function (d) { return d.getSourceFile() === location.getSourceFile(); }))) { // TODO: GH#18217
                     uniques.set(name, true);
@@ -99122,7 +100080,7 @@ var ts;
                             name: name,
                             kindModifiers: "" /* none */,
                             kind: "label" /* label */,
-                            sortText: "0"
+                            sortText: SortText.LocationPriority
                         });
                     }
                 }
@@ -99262,25 +100220,25 @@ var ts;
         function getContextualType(previousToken, position, sourceFile, checker) {
             var parent = previousToken.parent;
             switch (previousToken.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return ts.getContextualTypeFromParent(previousToken, checker);
-                case 59 /* EqualsToken */:
+                case 60 /* EqualsToken */:
                     switch (parent.kind) {
-                        case 237 /* VariableDeclaration */:
+                        case 238 /* VariableDeclaration */:
                             return checker.getContextualType(parent.initializer); // TODO: GH#18217
-                        case 204 /* BinaryExpression */:
+                        case 205 /* BinaryExpression */:
                             return checker.getTypeAtLocation(parent.left);
-                        case 267 /* JsxAttribute */:
+                        case 268 /* JsxAttribute */:
                             return checker.getContextualTypeForJsxAttribute(parent);
                         default:
                             return undefined;
                     }
-                case 95 /* NewKeyword */:
+                case 96 /* NewKeyword */:
                     return checker.getContextualType(parent);
-                case 74 /* CaseKeyword */:
+                case 75 /* CaseKeyword */:
                     return ts.getSwitchedType(ts.cast(parent, ts.isCaseClause), checker);
                 case 18 /* OpenBraceToken */:
-                    return ts.isJsxExpression(parent) && parent.parent.kind !== 260 /* JsxElement */ ? checker.getContextualTypeForJsxAttribute(parent.parent) : undefined;
+                    return ts.isJsxExpression(parent) && parent.parent.kind !== 261 /* JsxElement */ ? checker.getContextualTypeForJsxAttribute(parent.parent) : undefined;
                 default:
                     var argInfo = ts.SignatureHelp.getArgumentInfoForCompletions(previousToken, position, sourceFile);
                     return argInfo
@@ -99299,7 +100257,7 @@ var ts;
             return symbol.parent && (isModuleSymbol(symbol.parent) ? symbol : getFirstSymbolInChain(symbol.parent, enclosingDeclaration, checker));
         }
         function isModuleSymbol(symbol) {
-            return symbol.declarations.some(function (d) { return d.kind === 284 /* SourceFile */; });
+            return symbol.declarations.some(function (d) { return d.kind === 285 /* SourceFile */; });
         }
         function getCompletionData(program, log, sourceFile, isUncheckedFile, position, preferences, detailsEntryId) {
             var typeChecker = program.getTypeChecker();
@@ -99350,11 +100308,11 @@ var ts;
                     if (tag.tagName.pos <= position && position <= tag.tagName.end) {
                         return { kind: 1 /* JsDocTagName */ };
                     }
-                    if (isTagWithTypeExpression(tag) && tag.typeExpression && tag.typeExpression.kind === 288 /* JSDocTypeExpression */) {
+                    if (isTagWithTypeExpression(tag) && tag.typeExpression && tag.typeExpression.kind === 289 /* JSDocTypeExpression */) {
                         currentToken = ts.getTokenAtPosition(sourceFile, position);
                         if (!currentToken ||
                             (!ts.isDeclarationName(currentToken) &&
-                                (currentToken.parent.kind !== 310 /* JSDocPropertyTag */ ||
+                                (currentToken.parent.kind !== 311 /* JSDocPropertyTag */ ||
                                     currentToken.parent.name !== currentToken))) {
                             // Use as type location if inside tag's type expression
                             insideJsDocTagTypeExpression = isCurrentlyEditingNode(tag.typeExpression);
@@ -99404,7 +100362,7 @@ var ts;
                 if (contextToken.kind === 24 /* DotToken */) {
                     isRightOfDot = true;
                     switch (parent.kind) {
-                        case 189 /* PropertyAccessExpression */:
+                        case 190 /* PropertyAccessExpression */:
                             propertyAccessToConvert = parent;
                             node = propertyAccessToConvert.expression;
                             if (node.end === contextToken.pos &&
@@ -99416,14 +100374,14 @@ var ts;
                                 return undefined;
                             }
                             break;
-                        case 148 /* QualifiedName */:
+                        case 149 /* QualifiedName */:
                             node = parent.left;
                             break;
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             node = parent.name;
                             break;
-                        case 183 /* ImportType */:
-                        case 214 /* MetaProperty */:
+                        case 184 /* ImportType */:
+                        case 215 /* MetaProperty */:
                             node = parent;
                             break;
                         default:
@@ -99436,7 +100394,7 @@ var ts;
                     // <UI.Test /* completion position */ />
                     // If the tagname is a property access expression, we will then walk up to the top most of property access expression.
                     // Then, try to get a JSX container and its associated attributes type.
-                    if (parent && parent.kind === 189 /* PropertyAccessExpression */) {
+                    if (parent && parent.kind === 190 /* PropertyAccessExpression */) {
                         contextToken = parent;
                         parent = parent.parent;
                     }
@@ -99444,48 +100402,48 @@ var ts;
                     if (currentToken.parent === location) {
                         switch (currentToken.kind) {
                             case 30 /* GreaterThanToken */:
-                                if (currentToken.parent.kind === 260 /* JsxElement */ || currentToken.parent.kind === 262 /* JsxOpeningElement */) {
+                                if (currentToken.parent.kind === 261 /* JsxElement */ || currentToken.parent.kind === 263 /* JsxOpeningElement */) {
                                     location = currentToken;
                                 }
                                 break;
                             case 42 /* SlashToken */:
-                                if (currentToken.parent.kind === 261 /* JsxSelfClosingElement */) {
+                                if (currentToken.parent.kind === 262 /* JsxSelfClosingElement */) {
                                     location = currentToken;
                                 }
                                 break;
                         }
                     }
                     switch (parent.kind) {
-                        case 263 /* JsxClosingElement */:
+                        case 264 /* JsxClosingElement */:
                             if (contextToken.kind === 42 /* SlashToken */) {
                                 isStartingCloseTag = true;
                                 location = contextToken;
                             }
                             break;
-                        case 204 /* BinaryExpression */:
+                        case 205 /* BinaryExpression */:
                             if (!binaryExpressionMayBeOpenTag(parent)) {
                                 break;
                             }
                         // falls through
-                        case 261 /* JsxSelfClosingElement */:
-                        case 260 /* JsxElement */:
-                        case 262 /* JsxOpeningElement */:
+                        case 262 /* JsxSelfClosingElement */:
+                        case 261 /* JsxElement */:
+                        case 263 /* JsxOpeningElement */:
                             if (contextToken.kind === 28 /* LessThanToken */) {
                                 isRightOfOpenTag = true;
                                 location = contextToken;
                             }
                             break;
-                        case 267 /* JsxAttribute */:
+                        case 268 /* JsxAttribute */:
                             switch (previousToken.kind) {
-                                case 59 /* EqualsToken */:
+                                case 60 /* EqualsToken */:
                                     isJsxInitializer = true;
                                     break;
-                                case 72 /* Identifier */:
+                                case 73 /* Identifier */:
                                     // For `<div x=[|f/**/|]`, `parent` will be `x` and `previousToken.parent` will be `f` (which is its own JsxAttribute)
                                     // Note for `<div someBool f>` we don't want to treat this as a jsx inializer, instead it's the attribute name.
                                     if (parent !== previousToken.parent &&
                                         !parent.initializer &&
-                                        ts.findChildOfKind(parent, 59 /* EqualsToken */, sourceFile)) {
+                                        ts.findChildOfKind(parent, 60 /* EqualsToken */, sourceFile)) {
                                         isJsxInitializer = previousToken;
                                     }
                             }
@@ -99499,6 +100457,7 @@ var ts;
             var keywordFilters = 0 /* None */;
             var symbols = [];
             var symbolToOriginInfoMap = [];
+            var symbolToSortTextMap = [];
             if (isRightOfDot) {
                 getTypeScriptMemberSymbols();
             }
@@ -99544,15 +100503,16 @@ var ts;
                 recommendedCompletion: recommendedCompletion,
                 previousToken: previousToken,
                 isJsxInitializer: isJsxInitializer,
-                insideJsDocTagTypeExpression: insideJsDocTagTypeExpression
+                insideJsDocTagTypeExpression: insideJsDocTagTypeExpression,
+                symbolToSortTextMap: symbolToSortTextMap
             };
             function isTagWithTypeExpression(tag) {
                 switch (tag.kind) {
-                    case 304 /* JSDocParameterTag */:
-                    case 310 /* JSDocPropertyTag */:
-                    case 305 /* JSDocReturnTag */:
-                    case 307 /* JSDocTypeTag */:
-                    case 309 /* JSDocTypedefTag */:
+                    case 305 /* JSDocParameterTag */:
+                    case 311 /* JSDocPropertyTag */:
+                    case 306 /* JSDocReturnTag */:
+                    case 308 /* JSDocTypeTag */:
+                    case 310 /* JSDocTypedefTag */:
                         return true;
                     default:
                         return false;
@@ -99594,15 +100554,15 @@ var ts;
                             // If the module is merged with a value, we must get the type of the class and add its propertes (for inherited static methods).
                             if (!isTypeLocation &&
                                 symbol.declarations &&
-                                symbol.declarations.some(function (d) { return d.kind !== 284 /* SourceFile */ && d.kind !== 244 /* ModuleDeclaration */ && d.kind !== 243 /* EnumDeclaration */; })) {
+                                symbol.declarations.some(function (d) { return d.kind !== 285 /* SourceFile */ && d.kind !== 245 /* ModuleDeclaration */ && d.kind !== 244 /* EnumDeclaration */; })) {
                                 addTypeProperties(typeChecker.getTypeOfSymbolAtLocation(symbol, node));
                             }
                             return;
                         }
                     }
                 }
-                if (ts.isMetaProperty(node) && (node.keywordToken === 95 /* NewKeyword */ || node.keywordToken === 92 /* ImportKeyword */)) {
-                    var completion = (node.keywordToken === 95 /* NewKeyword */) ? "target" : "meta";
+                if (ts.isMetaProperty(node) && (node.keywordToken === 96 /* NewKeyword */ || node.keywordToken === 93 /* ImportKeyword */)) {
+                    var completion = (node.keywordToken === 96 /* NewKeyword */) ? "target" : "meta";
                     symbols.push(typeChecker.createSymbol(4 /* Property */, ts.escapeLeadingUnderscores(completion)));
                     return;
                 }
@@ -99623,7 +100583,7 @@ var ts;
                 else {
                     for (var _i = 0, _a = type.getApparentProperties(); _i < _a.length; _i++) {
                         var symbol = _a[_i];
-                        if (typeChecker.isValidPropertyAccessForCompletions(node.kind === 183 /* ImportType */ ? node : node.parent, type, symbol)) {
+                        if (typeChecker.isValidPropertyAccessForCompletions(node.kind === 184 /* ImportType */ ? node : node.parent, type, symbol)) {
                             addPropertySymbol(symbol);
                         }
                     }
@@ -99726,14 +100686,22 @@ var ts;
                 var isTypeOnly = isTypeOnlyCompletion();
                 var symbolMeanings = (isTypeOnly ? 0 /* None */ : 67220415 /* Value */) | 67897832 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */;
                 symbols = ts.Debug.assertEachDefined(typeChecker.getSymbolsInScope(scopeNode, symbolMeanings), "getSymbolsInScope() should all be defined");
+                for (var _i = 0, symbols_2 = symbols; _i < symbols_2.length; _i++) {
+                    var symbol = symbols_2[_i];
+                    if (!typeChecker.isArgumentsSymbol(symbol) &&
+                        !ts.some(symbol.declarations, function (d) { return d.getSourceFile() === sourceFile; })) {
+                        symbolToSortTextMap[ts.getSymbolId(symbol)] = SortText.GlobalsOrKeywords;
+                    }
+                }
                 // Need to insert 'this.' before properties of `this` type, so only do that if `includeInsertTextCompletions`
-                if (preferences.includeCompletionsWithInsertText && scopeNode.kind !== 284 /* SourceFile */) {
+                if (preferences.includeCompletionsWithInsertText && scopeNode.kind !== 285 /* SourceFile */) {
                     var thisType = typeChecker.tryGetThisTypeAt(scopeNode, /*includeGlobalThis*/ false);
                     if (thisType) {
-                        for (var _i = 0, _a = getPropertiesForCompletion(thisType, typeChecker); _i < _a.length; _i++) {
-                            var symbol = _a[_i];
+                        for (var _a = 0, _b = getPropertiesForCompletion(thisType, typeChecker); _a < _b.length; _a++) {
+                            var symbol = _b[_a];
                             symbolToOriginInfoMap[ts.getSymbolId(symbol)] = { kind: 0 /* ThisType */ };
                             symbols.push(symbol);
+                            symbolToSortTextMap[ts.getSymbolId(symbol)] = SortText.SuggestedClassMembers;
                         }
                     }
                 }
@@ -99760,10 +100728,10 @@ var ts;
             }
             function isSnippetScope(scopeNode) {
                 switch (scopeNode.kind) {
-                    case 284 /* SourceFile */:
-                    case 206 /* TemplateExpression */:
-                    case 270 /* JsxExpression */:
-                    case 218 /* Block */:
+                    case 285 /* SourceFile */:
+                    case 207 /* TemplateExpression */:
+                    case 271 /* JsxExpression */:
+                    case 219 /* Block */:
                         return true;
                     default:
                         return ts.isStatement(scopeNode);
@@ -99802,25 +100770,25 @@ var ts;
             }
             function isContextTokenValueLocation(contextToken) {
                 return contextToken &&
-                    contextToken.kind === 104 /* TypeOfKeyword */ &&
-                    (contextToken.parent.kind === 167 /* TypeQuery */ || ts.isTypeOfExpression(contextToken.parent));
+                    contextToken.kind === 105 /* TypeOfKeyword */ &&
+                    (contextToken.parent.kind === 168 /* TypeQuery */ || ts.isTypeOfExpression(contextToken.parent));
             }
             function isContextTokenTypeLocation(contextToken) {
                 if (contextToken) {
                     var parentKind = contextToken.parent.kind;
                     switch (contextToken.kind) {
                         case 57 /* ColonToken */:
-                            return parentKind === 154 /* PropertyDeclaration */ ||
-                                parentKind === 153 /* PropertySignature */ ||
-                                parentKind === 151 /* Parameter */ ||
-                                parentKind === 237 /* VariableDeclaration */ ||
+                            return parentKind === 155 /* PropertyDeclaration */ ||
+                                parentKind === 154 /* PropertySignature */ ||
+                                parentKind === 152 /* Parameter */ ||
+                                parentKind === 238 /* VariableDeclaration */ ||
                                 ts.isFunctionLikeKind(parentKind);
-                        case 59 /* EqualsToken */:
-                            return parentKind === 242 /* TypeAliasDeclaration */;
-                        case 119 /* AsKeyword */:
-                            return parentKind === 212 /* AsExpression */;
-                        case 86 /* ExtendsKeyword */:
-                            return parentKind === 150 /* TypeParameter */;
+                        case 60 /* EqualsToken */:
+                            return parentKind === 243 /* TypeAliasDeclaration */;
+                        case 120 /* AsKeyword */:
+                            return parentKind === 213 /* AsExpression */;
+                        case 87 /* ExtendsKeyword */:
+                            return parentKind === 151 /* TypeParameter */;
                     }
                 }
                 return false;
@@ -99852,6 +100820,7 @@ var ts;
                         // So in `declare namespace foo {} declare module "foo" { export = foo; }`, there will just be the global completion for `foo`.
                         ts.some(resolvedModuleSymbol.declarations, function (d) { return !!d.getSourceFile().externalModuleIndicator; })) {
                         symbols.push(resolvedModuleSymbol);
+                        symbolToSortTextMap[ts.getSymbolId(resolvedModuleSymbol)] = SortText.AutoImportSuggestions;
                         symbolToOriginInfoMap[ts.getSymbolId(resolvedModuleSymbol)] = { kind: 3 /* Export */, moduleSymbol: moduleSymbol, isDefaultExport: false };
                     }
                     for (var _i = 0, _a = typeChecker.getExportsOfModule(moduleSymbol); _i < _a.length; _i++) {
@@ -99876,6 +100845,7 @@ var ts;
                         var origin = { kind: 3 /* Export */, moduleSymbol: moduleSymbol, isDefaultExport: isDefaultExport };
                         if (detailsEntryId || stringContainsCharactersInOrder(getSymbolName(symbol, origin, target).toLowerCase(), tokenTextLowerCase)) {
                             symbols.push(symbol);
+                            symbolToSortTextMap[ts.getSymbolId(symbol)] = SortText.AutoImportSuggestions;
                             symbolToOriginInfoMap[ts.getSymbolId(symbol)] = origin;
                         }
                     }
@@ -99927,11 +100897,11 @@ var ts;
                     return true;
                 }
                 if (contextToken.kind === 30 /* GreaterThanToken */ && contextToken.parent) {
-                    if (contextToken.parent.kind === 262 /* JsxOpeningElement */) {
+                    if (contextToken.parent.kind === 263 /* JsxOpeningElement */) {
                         return true;
                     }
-                    if (contextToken.parent.kind === 263 /* JsxClosingElement */ || contextToken.parent.kind === 261 /* JsxSelfClosingElement */) {
-                        return !!contextToken.parent.parent && contextToken.parent.parent.kind === 260 /* JsxElement */;
+                    if (contextToken.parent.kind === 264 /* JsxClosingElement */ || contextToken.parent.kind === 262 /* JsxSelfClosingElement */) {
+                        return !!contextToken.parent.parent && contextToken.parent.parent.kind === 261 /* JsxElement */;
                     }
                 }
                 return false;
@@ -99942,40 +100912,40 @@ var ts;
                     // Previous token may have been a keyword that was converted to an identifier.
                     switch (keywordForNode(previousToken)) {
                         case 27 /* CommaToken */:
-                            return containingNodeKind === 191 /* CallExpression */ // func( a, |
-                                || containingNodeKind === 157 /* Constructor */ // constructor( a, |   /* public, protected, private keywords are allowed here, so show completion */
-                                || containingNodeKind === 192 /* NewExpression */ // new C(a, |
-                                || containingNodeKind === 187 /* ArrayLiteralExpression */ // [a, |
-                                || containingNodeKind === 204 /* BinaryExpression */ // const x = (a, |
-                                || containingNodeKind === 165 /* FunctionType */; // var x: (s: string, list|
+                            return containingNodeKind === 192 /* CallExpression */ // func( a, |
+                                || containingNodeKind === 158 /* Constructor */ // constructor( a, |   /* public, protected, private keywords are allowed here, so show completion */
+                                || containingNodeKind === 193 /* NewExpression */ // new C(a, |
+                                || containingNodeKind === 188 /* ArrayLiteralExpression */ // [a, |
+                                || containingNodeKind === 205 /* BinaryExpression */ // const x = (a, |
+                                || containingNodeKind === 166 /* FunctionType */; // var x: (s: string, list|
                         case 20 /* OpenParenToken */:
-                            return containingNodeKind === 191 /* CallExpression */ // func( |
-                                || containingNodeKind === 157 /* Constructor */ // constructor( |
-                                || containingNodeKind === 192 /* NewExpression */ // new C(a|
-                                || containingNodeKind === 195 /* ParenthesizedExpression */ // const x = (a|
-                                || containingNodeKind === 177 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */
+                            return containingNodeKind === 192 /* CallExpression */ // func( |
+                                || containingNodeKind === 158 /* Constructor */ // constructor( |
+                                || containingNodeKind === 193 /* NewExpression */ // new C(a|
+                                || containingNodeKind === 196 /* ParenthesizedExpression */ // const x = (a|
+                                || containingNodeKind === 178 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */
                         case 22 /* OpenBracketToken */:
-                            return containingNodeKind === 187 /* ArrayLiteralExpression */ // [ |
-                                || containingNodeKind === 162 /* IndexSignature */ // [ | : string ]
-                                || containingNodeKind === 149 /* ComputedPropertyName */; // [ |    /* this can become an index signature */
-                        case 130 /* ModuleKeyword */: // module |
-                        case 131 /* NamespaceKeyword */: // namespace |
+                            return containingNodeKind === 188 /* ArrayLiteralExpression */ // [ |
+                                || containingNodeKind === 163 /* IndexSignature */ // [ | : string ]
+                                || containingNodeKind === 150 /* ComputedPropertyName */; // [ |    /* this can become an index signature */
+                        case 131 /* ModuleKeyword */: // module |
+                        case 132 /* NamespaceKeyword */: // namespace |
                             return true;
                         case 24 /* DotToken */:
-                            return containingNodeKind === 244 /* ModuleDeclaration */; // module A.|
+                            return containingNodeKind === 245 /* ModuleDeclaration */; // module A.|
                         case 18 /* OpenBraceToken */:
-                            return containingNodeKind === 240 /* ClassDeclaration */; // class A{ |
-                        case 59 /* EqualsToken */:
-                            return containingNodeKind === 237 /* VariableDeclaration */ // const x = a|
-                                || containingNodeKind === 204 /* BinaryExpression */; // x = a|
+                            return containingNodeKind === 241 /* ClassDeclaration */; // class A{ |
+                        case 60 /* EqualsToken */:
+                            return containingNodeKind === 238 /* VariableDeclaration */ // const x = a|
+                                || containingNodeKind === 205 /* BinaryExpression */; // x = a|
                         case 15 /* TemplateHead */:
-                            return containingNodeKind === 206 /* TemplateExpression */; // `aa ${|
+                            return containingNodeKind === 207 /* TemplateExpression */; // `aa ${|
                         case 16 /* TemplateMiddle */:
-                            return containingNodeKind === 216 /* TemplateSpan */; // `aa ${10} dd ${|
-                        case 115 /* PublicKeyword */:
-                        case 113 /* PrivateKeyword */:
-                        case 114 /* ProtectedKeyword */:
-                            return containingNodeKind === 154 /* PropertyDeclaration */; // class A{ public |
+                            return containingNodeKind === 217 /* TemplateSpan */; // `aa ${10} dd ${|
+                        case 116 /* PublicKeyword */:
+                        case 114 /* PrivateKeyword */:
+                        case 115 /* ProtectedKeyword */:
+                            return containingNodeKind === 155 /* PropertyDeclaration */; // class A{ public |
                     }
                 }
                 return false;
@@ -100002,7 +100972,7 @@ var ts;
                 completionKind = 0 /* ObjectPropertyDeclaration */;
                 var typeMembers;
                 var existingMembers;
-                if (objectLikeContainer.kind === 188 /* ObjectLiteralExpression */) {
+                if (objectLikeContainer.kind === 189 /* ObjectLiteralExpression */) {
                     var typeForObject = typeChecker.getContextualType(objectLikeContainer);
                     if (!typeForObject)
                         return 2 /* Fail */;
@@ -100011,7 +100981,7 @@ var ts;
                     existingMembers = objectLikeContainer.properties;
                 }
                 else {
-                    ts.Debug.assert(objectLikeContainer.kind === 184 /* ObjectBindingPattern */);
+                    ts.Debug.assert(objectLikeContainer.kind === 185 /* ObjectBindingPattern */);
                     // We are *only* completing on properties from the type being destructured.
                     isNewIdentifierLocation = false;
                     var rootDeclaration = ts.getRootDeclaration(objectLikeContainer.parent);
@@ -100022,12 +100992,12 @@ var ts;
                     // through type declaration or inference.
                     // Also proceed if rootDeclaration is a parameter and if its containing function expression/arrow function is contextually typed -
                     // type of parameter will flow in from the contextual type of the function
-                    var canGetType = ts.hasInitializer(rootDeclaration) || ts.hasType(rootDeclaration) || rootDeclaration.parent.parent.kind === 227 /* ForOfStatement */;
-                    if (!canGetType && rootDeclaration.kind === 151 /* Parameter */) {
+                    var canGetType = ts.hasInitializer(rootDeclaration) || ts.hasType(rootDeclaration) || rootDeclaration.parent.parent.kind === 228 /* ForOfStatement */;
+                    if (!canGetType && rootDeclaration.kind === 152 /* Parameter */) {
                         if (ts.isExpression(rootDeclaration.parent)) {
                             canGetType = !!typeChecker.getContextualType(rootDeclaration.parent);
                         }
-                        else if (rootDeclaration.parent.kind === 156 /* MethodDeclaration */ || rootDeclaration.parent.kind === 159 /* SetAccessor */) {
+                        else if (rootDeclaration.parent.kind === 157 /* MethodDeclaration */ || rootDeclaration.parent.kind === 160 /* SetAccessor */) {
                             canGetType = ts.isExpression(rootDeclaration.parent.parent) && !!typeChecker.getContextualType(rootDeclaration.parent.parent);
                         }
                     }
@@ -100069,7 +101039,7 @@ var ts;
                     return 0 /* Continue */;
                 // cursor is in an import clause
                 // try to show exported member for imported module
-                var moduleSpecifier = (namedImportsOrExports.kind === 252 /* NamedImports */ ? namedImportsOrExports.parent.parent : namedImportsOrExports.parent).moduleSpecifier;
+                var moduleSpecifier = (namedImportsOrExports.kind === 253 /* NamedImports */ ? namedImportsOrExports.parent.parent : namedImportsOrExports.parent).moduleSpecifier;
                 var moduleSpecifierSymbol = typeChecker.getSymbolAtLocation(moduleSpecifier); // TODO: GH#18217
                 if (!moduleSpecifierSymbol)
                     return 2 /* Fail */;
@@ -100100,7 +101070,7 @@ var ts;
                 var classElement = contextToken.parent;
                 var classElementModifierFlags = ts.isClassElement(classElement) ? ts.getModifierFlags(classElement) : 0 /* None */;
                 // If this is context token is not something we are editing now, consider if this would lead to be modifier
-                if (contextToken.kind === 72 /* Identifier */ && !isCurrentlyEditingNode(contextToken)) {
+                if (contextToken.kind === 73 /* Identifier */ && !isCurrentlyEditingNode(contextToken)) {
                     switch (contextToken.getText()) {
                         case "private":
                             classElementModifierFlags = classElementModifierFlags | 8 /* Private */;
@@ -100137,7 +101107,7 @@ var ts;
                             break;
                         case 40 /* AsteriskToken */:
                             return ts.isMethodDeclaration(parent) ? ts.tryCast(parent.parent, ts.isObjectLiteralExpression) : undefined;
-                        case 72 /* Identifier */:
+                        case 73 /* Identifier */:
                             return contextToken.text === "async" && ts.isShorthandPropertyAssignment(contextToken.parent)
                                 ? contextToken.parent.parent : undefined;
                     }
@@ -100190,12 +101160,12 @@ var ts;
                         case 30 /* GreaterThanToken */: // End of a type argument list
                         case 29 /* LessThanSlashToken */:
                         case 42 /* SlashToken */:
-                        case 72 /* Identifier */:
-                        case 189 /* PropertyAccessExpression */:
-                        case 268 /* JsxAttributes */:
-                        case 267 /* JsxAttribute */:
-                        case 269 /* JsxSpreadAttribute */:
-                            if (parent && (parent.kind === 261 /* JsxSelfClosingElement */ || parent.kind === 262 /* JsxOpeningElement */)) {
+                        case 73 /* Identifier */:
+                        case 190 /* PropertyAccessExpression */:
+                        case 269 /* JsxAttributes */:
+                        case 268 /* JsxAttribute */:
+                        case 270 /* JsxSpreadAttribute */:
+                            if (parent && (parent.kind === 262 /* JsxSelfClosingElement */ || parent.kind === 263 /* JsxOpeningElement */)) {
                                 if (contextToken.kind === 30 /* GreaterThanToken */) {
                                     var precedingToken = ts.findPrecedingToken(contextToken.pos, sourceFile, /*startNode*/ undefined);
                                     if (!parent.typeArguments || (precedingToken && precedingToken.kind === 42 /* SlashToken */))
@@ -100203,7 +101173,7 @@ var ts;
                                 }
                                 return parent;
                             }
-                            else if (parent.kind === 267 /* JsxAttribute */) {
+                            else if (parent.kind === 268 /* JsxAttribute */) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -100215,7 +101185,7 @@ var ts;
                         // its parent is a JsxExpression, whose parent is a JsxAttribute,
                         // whose parent is a JsxOpeningLikeElement
                         case 10 /* StringLiteral */:
-                            if (parent && ((parent.kind === 267 /* JsxAttribute */) || (parent.kind === 269 /* JsxSpreadAttribute */))) {
+                            if (parent && ((parent.kind === 268 /* JsxAttribute */) || (parent.kind === 270 /* JsxSpreadAttribute */))) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -100225,8 +101195,8 @@ var ts;
                             break;
                         case 19 /* CloseBraceToken */:
                             if (parent &&
-                                parent.kind === 270 /* JsxExpression */ &&
-                                parent.parent && parent.parent.kind === 267 /* JsxAttribute */) {
+                                parent.kind === 271 /* JsxExpression */ &&
+                                parent.parent && parent.parent.kind === 268 /* JsxAttribute */) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -100234,7 +101204,7 @@ var ts;
                                 //                  each JsxAttribute can have initializer as JsxExpression
                                 return parent.parent.parent.parent;
                             }
-                            if (parent && parent.kind === 269 /* JsxSpreadAttribute */) {
+                            if (parent && parent.kind === 270 /* JsxSpreadAttribute */) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -100254,62 +101224,62 @@ var ts;
                 var containingNodeKind = parent.kind;
                 switch (contextToken.kind) {
                     case 27 /* CommaToken */:
-                        return containingNodeKind === 237 /* VariableDeclaration */ ||
-                            containingNodeKind === 238 /* VariableDeclarationList */ ||
-                            containingNodeKind === 219 /* VariableStatement */ ||
-                            containingNodeKind === 243 /* EnumDeclaration */ || // enum a { foo, |
+                        return containingNodeKind === 238 /* VariableDeclaration */ ||
+                            containingNodeKind === 239 /* VariableDeclarationList */ ||
+                            containingNodeKind === 220 /* VariableStatement */ ||
+                            containingNodeKind === 244 /* EnumDeclaration */ || // enum a { foo, |
                             isFunctionLikeButNotConstructor(containingNodeKind) ||
-                            containingNodeKind === 241 /* InterfaceDeclaration */ || // interface A<T, |
-                            containingNodeKind === 185 /* ArrayBindingPattern */ || // var [x, y|
-                            containingNodeKind === 242 /* TypeAliasDeclaration */ || // type Map, K, |
+                            containingNodeKind === 242 /* InterfaceDeclaration */ || // interface A<T, |
+                            containingNodeKind === 186 /* ArrayBindingPattern */ || // var [x, y|
+                            containingNodeKind === 243 /* TypeAliasDeclaration */ || // type Map, K, |
                             // class A<T, |
                             // var C = class D<T, |
                             (ts.isClassLike(parent) &&
                                 !!parent.typeParameters &&
                                 parent.typeParameters.end >= contextToken.pos);
                     case 24 /* DotToken */:
-                        return containingNodeKind === 185 /* ArrayBindingPattern */; // var [.|
+                        return containingNodeKind === 186 /* ArrayBindingPattern */; // var [.|
                     case 57 /* ColonToken */:
-                        return containingNodeKind === 186 /* BindingElement */; // var {x :html|
+                        return containingNodeKind === 187 /* BindingElement */; // var {x :html|
                     case 22 /* OpenBracketToken */:
-                        return containingNodeKind === 185 /* ArrayBindingPattern */; // var [x|
+                        return containingNodeKind === 186 /* ArrayBindingPattern */; // var [x|
                     case 20 /* OpenParenToken */:
-                        return containingNodeKind === 274 /* CatchClause */ ||
+                        return containingNodeKind === 275 /* CatchClause */ ||
                             isFunctionLikeButNotConstructor(containingNodeKind);
                     case 18 /* OpenBraceToken */:
-                        return containingNodeKind === 243 /* EnumDeclaration */; // enum a { |
+                        return containingNodeKind === 244 /* EnumDeclaration */; // enum a { |
                     case 28 /* LessThanToken */:
-                        return containingNodeKind === 240 /* ClassDeclaration */ || // class A< |
-                            containingNodeKind === 209 /* ClassExpression */ || // var C = class D< |
-                            containingNodeKind === 241 /* InterfaceDeclaration */ || // interface A< |
-                            containingNodeKind === 242 /* TypeAliasDeclaration */ || // type List< |
+                        return containingNodeKind === 241 /* ClassDeclaration */ || // class A< |
+                            containingNodeKind === 210 /* ClassExpression */ || // var C = class D< |
+                            containingNodeKind === 242 /* InterfaceDeclaration */ || // interface A< |
+                            containingNodeKind === 243 /* TypeAliasDeclaration */ || // type List< |
                             ts.isFunctionLikeKind(containingNodeKind);
-                    case 116 /* StaticKeyword */:
-                        return containingNodeKind === 154 /* PropertyDeclaration */ && !ts.isClassLike(parent.parent);
+                    case 117 /* StaticKeyword */:
+                        return containingNodeKind === 155 /* PropertyDeclaration */ && !ts.isClassLike(parent.parent);
                     case 25 /* DotDotDotToken */:
-                        return containingNodeKind === 151 /* Parameter */ ||
-                            (!!parent.parent && parent.parent.kind === 185 /* ArrayBindingPattern */); // var [...z|
-                    case 115 /* PublicKeyword */:
-                    case 113 /* PrivateKeyword */:
-                    case 114 /* ProtectedKeyword */:
-                        return containingNodeKind === 151 /* Parameter */ && !ts.isConstructorDeclaration(parent.parent);
-                    case 119 /* AsKeyword */:
-                        return containingNodeKind === 253 /* ImportSpecifier */ ||
-                            containingNodeKind === 257 /* ExportSpecifier */ ||
-                            containingNodeKind === 251 /* NamespaceImport */;
-                    case 126 /* GetKeyword */:
-                    case 137 /* SetKeyword */:
+                        return containingNodeKind === 152 /* Parameter */ ||
+                            (!!parent.parent && parent.parent.kind === 186 /* ArrayBindingPattern */); // var [...z|
+                    case 116 /* PublicKeyword */:
+                    case 114 /* PrivateKeyword */:
+                    case 115 /* ProtectedKeyword */:
+                        return containingNodeKind === 152 /* Parameter */ && !ts.isConstructorDeclaration(parent.parent);
+                    case 120 /* AsKeyword */:
+                        return containingNodeKind === 254 /* ImportSpecifier */ ||
+                            containingNodeKind === 258 /* ExportSpecifier */ ||
+                            containingNodeKind === 252 /* NamespaceImport */;
+                    case 127 /* GetKeyword */:
+                    case 138 /* SetKeyword */:
                         return !isFromObjectTypeDeclaration(contextToken);
-                    case 76 /* ClassKeyword */:
-                    case 84 /* EnumKeyword */:
-                    case 110 /* InterfaceKeyword */:
-                    case 90 /* FunctionKeyword */:
-                    case 105 /* VarKeyword */:
-                    case 92 /* ImportKeyword */:
-                    case 111 /* LetKeyword */:
-                    case 77 /* ConstKeyword */:
-                    case 117 /* YieldKeyword */:
-                    case 140 /* TypeKeyword */: // type htm|
+                    case 77 /* ClassKeyword */:
+                    case 85 /* EnumKeyword */:
+                    case 111 /* InterfaceKeyword */:
+                    case 91 /* FunctionKeyword */:
+                    case 106 /* VarKeyword */:
+                    case 93 /* ImportKeyword */:
+                    case 112 /* LetKeyword */:
+                    case 78 /* ConstKeyword */:
+                    case 118 /* YieldKeyword */:
+                    case 141 /* TypeKeyword */: // type htm|
                         return true;
                     case 40 /* AsteriskToken */:
                         return ts.isFunctionLike(contextToken.parent) && !ts.isMethodDeclaration(contextToken.parent);
@@ -100332,22 +101302,22 @@ var ts;
                 }
                 // Previous token may have been a keyword that was converted to an identifier.
                 switch (keywordForNode(contextToken)) {
-                    case 118 /* AbstractKeyword */:
-                    case 76 /* ClassKeyword */:
-                    case 77 /* ConstKeyword */:
-                    case 125 /* DeclareKeyword */:
-                    case 84 /* EnumKeyword */:
-                    case 90 /* FunctionKeyword */:
-                    case 110 /* InterfaceKeyword */:
-                    case 111 /* LetKeyword */:
-                    case 113 /* PrivateKeyword */:
-                    case 114 /* ProtectedKeyword */:
-                    case 115 /* PublicKeyword */:
-                    case 116 /* StaticKeyword */:
-                    case 105 /* VarKeyword */:
-                    case 117 /* YieldKeyword */:
+                    case 119 /* AbstractKeyword */:
+                    case 77 /* ClassKeyword */:
+                    case 78 /* ConstKeyword */:
+                    case 126 /* DeclareKeyword */:
+                    case 85 /* EnumKeyword */:
+                    case 91 /* FunctionKeyword */:
+                    case 111 /* InterfaceKeyword */:
+                    case 112 /* LetKeyword */:
+                    case 114 /* PrivateKeyword */:
+                    case 115 /* ProtectedKeyword */:
+                    case 116 /* PublicKeyword */:
+                    case 117 /* StaticKeyword */:
+                    case 106 /* VarKeyword */:
+                    case 118 /* YieldKeyword */:
                         return true;
-                    case 121 /* AsyncKeyword */:
+                    case 122 /* AsyncKeyword */:
                         return ts.isPropertyDeclaration(contextToken.parent);
                 }
                 return ts.isDeclarationName(contextToken)
@@ -100357,7 +101327,7 @@ var ts;
                     && !(ts.isClassLike(contextToken.parent) && (contextToken !== previousToken || position > previousToken.end));
             }
             function isFunctionLikeButNotConstructor(kind) {
-                return ts.isFunctionLikeKind(kind) && kind !== 157 /* Constructor */;
+                return ts.isFunctionLikeKind(kind) && kind !== 158 /* Constructor */;
             }
             function isDotOfNumericLiteral(contextToken) {
                 if (contextToken.kind === 8 /* NumericLiteral */) {
@@ -100380,12 +101350,12 @@ var ts;
                 for (var _i = 0, existingMembers_1 = existingMembers; _i < existingMembers_1.length; _i++) {
                     var m = existingMembers_1[_i];
                     // Ignore omitted expressions for missing members
-                    if (m.kind !== 275 /* PropertyAssignment */ &&
-                        m.kind !== 276 /* ShorthandPropertyAssignment */ &&
-                        m.kind !== 186 /* BindingElement */ &&
-                        m.kind !== 156 /* MethodDeclaration */ &&
-                        m.kind !== 158 /* GetAccessor */ &&
-                        m.kind !== 159 /* SetAccessor */) {
+                    if (m.kind !== 276 /* PropertyAssignment */ &&
+                        m.kind !== 277 /* ShorthandPropertyAssignment */ &&
+                        m.kind !== 187 /* BindingElement */ &&
+                        m.kind !== 157 /* MethodDeclaration */ &&
+                        m.kind !== 159 /* GetAccessor */ &&
+                        m.kind !== 160 /* SetAccessor */) {
                         continue;
                     }
                     // If this is the current item we are editing right now, do not filter it out
@@ -100395,7 +101365,7 @@ var ts;
                     var existingName = void 0;
                     if (ts.isBindingElement(m) && m.propertyName) {
                         // include only identifiers in completion list
-                        if (m.propertyName.kind === 72 /* Identifier */) {
+                        if (m.propertyName.kind === 73 /* Identifier */) {
                             existingName = m.propertyName.escapedText;
                         }
                     }
@@ -100420,10 +101390,10 @@ var ts;
                 for (var _i = 0, existingMembers_2 = existingMembers; _i < existingMembers_2.length; _i++) {
                     var m = existingMembers_2[_i];
                     // Ignore omitted expressions for missing members
-                    if (m.kind !== 154 /* PropertyDeclaration */ &&
-                        m.kind !== 156 /* MethodDeclaration */ &&
-                        m.kind !== 158 /* GetAccessor */ &&
-                        m.kind !== 159 /* SetAccessor */) {
+                    if (m.kind !== 155 /* PropertyDeclaration */ &&
+                        m.kind !== 157 /* MethodDeclaration */ &&
+                        m.kind !== 159 /* GetAccessor */ &&
+                        m.kind !== 160 /* SetAccessor */) {
                         continue;
                     }
                     // If this is the current item we are editing right now, do not filter it out
@@ -100463,7 +101433,7 @@ var ts;
                     if (isCurrentlyEditingNode(attr)) {
                         continue;
                     }
-                    if (attr.kind === 267 /* JsxAttribute */) {
+                    if (attr.kind === 268 /* JsxAttribute */) {
                         seenNames.set(attr.name.escapedText, true);
                     }
                 }
@@ -100483,9 +101453,9 @@ var ts;
                 || ts.isKnownSymbol(symbol)) {
                 return undefined;
             }
-            var validIdentiferResult = { name: name, needsConvertPropertyAccess: false };
+            var validIdentifierResult = { name: name, needsConvertPropertyAccess: false };
             if (ts.isIdentifierText(name, target))
-                return validIdentiferResult;
+                return validIdentifierResult;
             switch (kind) {
                 case 3 /* MemberLike */:
                     return undefined;
@@ -100498,7 +101468,7 @@ var ts;
                     return name.charCodeAt(0) === 32 /* space */ ? undefined : { name: name, needsConvertPropertyAccess: true };
                 case 5 /* None */:
                 case 4 /* String */:
-                    return validIdentiferResult;
+                    return validIdentifierResult;
                 default:
                     ts.Debug.assertNever(kind);
             }
@@ -100507,12 +101477,12 @@ var ts;
         var _keywordCompletions = [];
         var allKeywordsCompletions = ts.memoize(function () {
             var res = [];
-            for (var i = 73 /* FirstKeyword */; i <= 147 /* LastKeyword */; i++) {
+            for (var i = 74 /* FirstKeyword */; i <= 148 /* LastKeyword */; i++) {
                 res.push({
                     name: ts.tokenToString(i),
                     kind: "keyword" /* keyword */,
                     kindModifiers: "" /* none */,
-                    sortText: "0"
+                    sortText: SortText.GlobalsOrKeywords
                 });
             }
             return res;
@@ -100532,8 +101502,8 @@ var ts;
                     case 0 /* None */:
                         return false;
                     case 1 /* All */:
-                        return kind === 121 /* AsyncKeyword */ || 122 /* AwaitKeyword */ || !ts.isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind) || kind === 125 /* DeclareKeyword */ || kind === 130 /* ModuleKeyword */
-                            || ts.isTypeKeyword(kind) && kind !== 141 /* UndefinedKeyword */;
+                        return kind === 122 /* AsyncKeyword */ || 123 /* AwaitKeyword */ || !ts.isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind) || kind === 126 /* DeclareKeyword */ || kind === 131 /* ModuleKeyword */
+                            || ts.isTypeKeyword(kind) && kind !== 142 /* UndefinedKeyword */;
                     case 2 /* ClassElementKeywords */:
                         return isClassMemberCompletionKeyword(kind);
                     case 3 /* InterfaceElementKeywords */:
@@ -100551,54 +101521,54 @@ var ts;
         }
         function isTypeScriptOnlyKeyword(kind) {
             switch (kind) {
-                case 118 /* AbstractKeyword */:
-                case 120 /* AnyKeyword */:
-                case 146 /* BigIntKeyword */:
-                case 123 /* BooleanKeyword */:
-                case 125 /* DeclareKeyword */:
-                case 84 /* EnumKeyword */:
-                case 145 /* GlobalKeyword */:
-                case 109 /* ImplementsKeyword */:
-                case 127 /* InferKeyword */:
-                case 110 /* InterfaceKeyword */:
-                case 128 /* IsKeyword */:
-                case 129 /* KeyOfKeyword */:
-                case 130 /* ModuleKeyword */:
-                case 131 /* NamespaceKeyword */:
-                case 132 /* NeverKeyword */:
-                case 135 /* NumberKeyword */:
-                case 136 /* ObjectKeyword */:
-                case 113 /* PrivateKeyword */:
-                case 114 /* ProtectedKeyword */:
-                case 115 /* PublicKeyword */:
-                case 133 /* ReadonlyKeyword */:
-                case 138 /* StringKeyword */:
-                case 139 /* SymbolKeyword */:
-                case 140 /* TypeKeyword */:
-                case 142 /* UniqueKeyword */:
-                case 143 /* UnknownKeyword */:
+                case 119 /* AbstractKeyword */:
+                case 121 /* AnyKeyword */:
+                case 147 /* BigIntKeyword */:
+                case 124 /* BooleanKeyword */:
+                case 126 /* DeclareKeyword */:
+                case 85 /* EnumKeyword */:
+                case 146 /* GlobalKeyword */:
+                case 110 /* ImplementsKeyword */:
+                case 128 /* InferKeyword */:
+                case 111 /* InterfaceKeyword */:
+                case 129 /* IsKeyword */:
+                case 130 /* KeyOfKeyword */:
+                case 131 /* ModuleKeyword */:
+                case 132 /* NamespaceKeyword */:
+                case 133 /* NeverKeyword */:
+                case 136 /* NumberKeyword */:
+                case 137 /* ObjectKeyword */:
+                case 114 /* PrivateKeyword */:
+                case 115 /* ProtectedKeyword */:
+                case 116 /* PublicKeyword */:
+                case 134 /* ReadonlyKeyword */:
+                case 139 /* StringKeyword */:
+                case 140 /* SymbolKeyword */:
+                case 141 /* TypeKeyword */:
+                case 143 /* UniqueKeyword */:
+                case 144 /* UnknownKeyword */:
                     return true;
                 default:
                     return false;
             }
         }
         function isInterfaceOrTypeLiteralCompletionKeyword(kind) {
-            return kind === 133 /* ReadonlyKeyword */;
+            return kind === 134 /* ReadonlyKeyword */;
         }
         function isClassMemberCompletionKeyword(kind) {
             switch (kind) {
-                case 118 /* AbstractKeyword */:
-                case 124 /* ConstructorKeyword */:
-                case 126 /* GetKeyword */:
-                case 137 /* SetKeyword */:
-                case 121 /* AsyncKeyword */:
+                case 119 /* AbstractKeyword */:
+                case 125 /* ConstructorKeyword */:
+                case 127 /* GetKeyword */:
+                case 138 /* SetKeyword */:
+                case 122 /* AsyncKeyword */:
                     return true;
                 default:
                     return ts.isClassMemberModifier(kind);
             }
         }
         function isFunctionLikeBodyKeyword(kind) {
-            return kind === 121 /* AsyncKeyword */ || kind === 122 /* AwaitKeyword */ || !ts.isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
+            return kind === 122 /* AsyncKeyword */ || kind === 123 /* AwaitKeyword */ || !ts.isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
         }
         function keywordForNode(node) {
             return ts.isIdentifier(node) ? node.originalKeywordKind || 0 /* Unknown */ : node.kind;
@@ -100635,7 +101605,7 @@ var ts;
         function tryGetObjectTypeDeclarationCompletionContainer(sourceFile, contextToken, location) {
             // class c { method() { } | method2() { } }
             switch (location.kind) {
-                case 311 /* SyntaxList */:
+                case 312 /* SyntaxList */:
                     return ts.tryCast(location.parent, ts.isObjectTypeDeclaration);
                 case 1 /* EndOfFileToken */:
                     var cls = ts.tryCast(ts.lastOrUndefined(ts.cast(location.parent, ts.isSourceFile).statements), ts.isObjectTypeDeclaration);
@@ -100744,40 +101714,40 @@ var ts;
         }
         function getHighlightSpans(node, sourceFile) {
             switch (node.kind) {
-                case 91 /* IfKeyword */:
-                case 83 /* ElseKeyword */:
+                case 92 /* IfKeyword */:
+                case 84 /* ElseKeyword */:
                     return ts.isIfStatement(node.parent) ? getIfElseOccurrences(node.parent, sourceFile) : undefined;
-                case 97 /* ReturnKeyword */:
+                case 98 /* ReturnKeyword */:
                     return useParent(node.parent, ts.isReturnStatement, getReturnOccurrences);
-                case 101 /* ThrowKeyword */:
+                case 102 /* ThrowKeyword */:
                     return useParent(node.parent, ts.isThrowStatement, getThrowOccurrences);
-                case 103 /* TryKeyword */:
-                case 75 /* CatchKeyword */:
-                case 88 /* FinallyKeyword */:
-                    var tryStatement = node.kind === 75 /* CatchKeyword */ ? node.parent.parent : node.parent;
+                case 104 /* TryKeyword */:
+                case 76 /* CatchKeyword */:
+                case 89 /* FinallyKeyword */:
+                    var tryStatement = node.kind === 76 /* CatchKeyword */ ? node.parent.parent : node.parent;
                     return useParent(tryStatement, ts.isTryStatement, getTryCatchFinallyOccurrences);
-                case 99 /* SwitchKeyword */:
+                case 100 /* SwitchKeyword */:
                     return useParent(node.parent, ts.isSwitchStatement, getSwitchCaseDefaultOccurrences);
-                case 74 /* CaseKeyword */:
-                case 80 /* DefaultKeyword */:
+                case 75 /* CaseKeyword */:
+                case 81 /* DefaultKeyword */:
                     return useParent(node.parent.parent.parent, ts.isSwitchStatement, getSwitchCaseDefaultOccurrences);
-                case 73 /* BreakKeyword */:
-                case 78 /* ContinueKeyword */:
+                case 74 /* BreakKeyword */:
+                case 79 /* ContinueKeyword */:
                     return useParent(node.parent, ts.isBreakOrContinueStatement, getBreakOrContinueStatementOccurrences);
-                case 89 /* ForKeyword */:
-                case 107 /* WhileKeyword */:
-                case 82 /* DoKeyword */:
+                case 90 /* ForKeyword */:
+                case 108 /* WhileKeyword */:
+                case 83 /* DoKeyword */:
                     return useParent(node.parent, function (n) { return ts.isIterationStatement(n, /*lookInLabeledStatements*/ true); }, getLoopBreakContinueOccurrences);
-                case 124 /* ConstructorKeyword */:
-                    return getFromAllDeclarations(ts.isConstructorDeclaration, [124 /* ConstructorKeyword */]);
-                case 126 /* GetKeyword */:
-                case 137 /* SetKeyword */:
-                    return getFromAllDeclarations(ts.isAccessor, [126 /* GetKeyword */, 137 /* SetKeyword */]);
-                case 122 /* AwaitKeyword */:
+                case 125 /* ConstructorKeyword */:
+                    return getFromAllDeclarations(ts.isConstructorDeclaration, [125 /* ConstructorKeyword */]);
+                case 127 /* GetKeyword */:
+                case 138 /* SetKeyword */:
+                    return getFromAllDeclarations(ts.isAccessor, [127 /* GetKeyword */, 138 /* SetKeyword */]);
+                case 123 /* AwaitKeyword */:
                     return useParent(node.parent, ts.isAwaitExpression, getAsyncAndAwaitOccurrences);
-                case 121 /* AsyncKeyword */:
+                case 122 /* AsyncKeyword */:
                     return highlightSpans(getAsyncAndAwaitOccurrences(node));
-                case 117 /* YieldKeyword */:
+                case 118 /* YieldKeyword */:
                     return highlightSpans(getYieldOccurrences(node));
                 default:
                     return ts.isModifierKind(node.kind) && (ts.isDeclaration(node.parent) || ts.isVariableStatement(node.parent))
@@ -100820,7 +101790,7 @@ var ts;
             var child = throwStatement;
             while (child.parent) {
                 var parent = child.parent;
-                if (ts.isFunctionBlock(parent) || parent.kind === 284 /* SourceFile */) {
+                if (ts.isFunctionBlock(parent) || parent.kind === 285 /* SourceFile */) {
                     return parent;
                 }
                 // A throw-statement is only owned by a try-statement if the try-statement has
@@ -100852,16 +101822,16 @@ var ts;
         function getBreakOrContinueOwner(statement) {
             return ts.findAncestor(statement, function (node) {
                 switch (node.kind) {
-                    case 232 /* SwitchStatement */:
-                        if (statement.kind === 228 /* ContinueStatement */) {
+                    case 233 /* SwitchStatement */:
+                        if (statement.kind === 229 /* ContinueStatement */) {
                             return false;
                         }
                     // falls through
-                    case 225 /* ForStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
-                    case 224 /* WhileStatement */:
-                    case 223 /* DoStatement */:
+                    case 226 /* ForStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 225 /* WhileStatement */:
+                    case 224 /* DoStatement */:
                         return !statement.label || isLabeledBy(node, statement.label.escapedText);
                     default:
                         // Don't cross function boundaries.
@@ -100877,11 +101847,11 @@ var ts;
             // Types of node whose children might have modifiers.
             var container = declaration.parent;
             switch (container.kind) {
-                case 245 /* ModuleBlock */:
-                case 284 /* SourceFile */:
-                case 218 /* Block */:
-                case 271 /* CaseClause */:
-                case 272 /* DefaultClause */:
+                case 246 /* ModuleBlock */:
+                case 285 /* SourceFile */:
+                case 219 /* Block */:
+                case 272 /* CaseClause */:
+                case 273 /* DefaultClause */:
                     // Container is either a class declaration or the declaration is a classDeclaration
                     if (modifierFlag & 128 /* Abstract */ && ts.isClassDeclaration(declaration)) {
                         return declaration.members.concat([declaration]);
@@ -100889,12 +101859,12 @@ var ts;
                     else {
                         return container.statements;
                     }
-                case 157 /* Constructor */:
-                case 156 /* MethodDeclaration */:
-                case 239 /* FunctionDeclaration */:
+                case 158 /* Constructor */:
+                case 157 /* MethodDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return container.parameters.concat((ts.isClassLike(container.parent) ? container.parent.members : []));
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     var nodes = container.members;
                     // If we're an accessibility modifier, we're in an instance member and should search
                     // the constructor's parameter list for instance members as well.
@@ -100925,12 +101895,12 @@ var ts;
         }
         function getLoopBreakContinueOccurrences(loopNode) {
             var keywords = [];
-            if (pushKeywordIf(keywords, loopNode.getFirstToken(), 89 /* ForKeyword */, 107 /* WhileKeyword */, 82 /* DoKeyword */)) {
+            if (pushKeywordIf(keywords, loopNode.getFirstToken(), 90 /* ForKeyword */, 108 /* WhileKeyword */, 83 /* DoKeyword */)) {
                 // If we succeeded and got a do-while loop, then start looking for a 'while' keyword.
-                if (loopNode.kind === 223 /* DoStatement */) {
+                if (loopNode.kind === 224 /* DoStatement */) {
                     var loopTokens = loopNode.getChildren();
                     for (var i = loopTokens.length - 1; i >= 0; i--) {
-                        if (pushKeywordIf(keywords, loopTokens[i], 107 /* WhileKeyword */)) {
+                        if (pushKeywordIf(keywords, loopTokens[i], 108 /* WhileKeyword */)) {
                             break;
                         }
                     }
@@ -100938,7 +101908,7 @@ var ts;
             }
             ts.forEach(aggregateAllBreakAndContinueStatements(loopNode.statement), function (statement) {
                 if (ownsBreakOrContinueStatement(loopNode, statement)) {
-                    pushKeywordIf(keywords, statement.getFirstToken(), 73 /* BreakKeyword */, 78 /* ContinueKeyword */);
+                    pushKeywordIf(keywords, statement.getFirstToken(), 74 /* BreakKeyword */, 79 /* ContinueKeyword */);
                 }
             });
             return keywords;
@@ -100947,13 +101917,13 @@ var ts;
             var owner = getBreakOrContinueOwner(breakOrContinueStatement);
             if (owner) {
                 switch (owner.kind) {
-                    case 225 /* ForStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
-                    case 223 /* DoStatement */:
-                    case 224 /* WhileStatement */:
+                    case 226 /* ForStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 224 /* DoStatement */:
+                    case 225 /* WhileStatement */:
                         return getLoopBreakContinueOccurrences(owner);
-                    case 232 /* SwitchStatement */:
+                    case 233 /* SwitchStatement */:
                         return getSwitchCaseDefaultOccurrences(owner);
                 }
             }
@@ -100961,13 +101931,13 @@ var ts;
         }
         function getSwitchCaseDefaultOccurrences(switchStatement) {
             var keywords = [];
-            pushKeywordIf(keywords, switchStatement.getFirstToken(), 99 /* SwitchKeyword */);
+            pushKeywordIf(keywords, switchStatement.getFirstToken(), 100 /* SwitchKeyword */);
             // Go through each clause in the switch statement, collecting the 'case'/'default' keywords.
             ts.forEach(switchStatement.caseBlock.clauses, function (clause) {
-                pushKeywordIf(keywords, clause.getFirstToken(), 74 /* CaseKeyword */, 80 /* DefaultKeyword */);
+                pushKeywordIf(keywords, clause.getFirstToken(), 75 /* CaseKeyword */, 81 /* DefaultKeyword */);
                 ts.forEach(aggregateAllBreakAndContinueStatements(clause), function (statement) {
                     if (ownsBreakOrContinueStatement(switchStatement, statement)) {
-                        pushKeywordIf(keywords, statement.getFirstToken(), 73 /* BreakKeyword */);
+                        pushKeywordIf(keywords, statement.getFirstToken(), 74 /* BreakKeyword */);
                     }
                 });
             });
@@ -100975,13 +101945,13 @@ var ts;
         }
         function getTryCatchFinallyOccurrences(tryStatement, sourceFile) {
             var keywords = [];
-            pushKeywordIf(keywords, tryStatement.getFirstToken(), 103 /* TryKeyword */);
+            pushKeywordIf(keywords, tryStatement.getFirstToken(), 104 /* TryKeyword */);
             if (tryStatement.catchClause) {
-                pushKeywordIf(keywords, tryStatement.catchClause.getFirstToken(), 75 /* CatchKeyword */);
+                pushKeywordIf(keywords, tryStatement.catchClause.getFirstToken(), 76 /* CatchKeyword */);
             }
             if (tryStatement.finallyBlock) {
-                var finallyKeyword = ts.findChildOfKind(tryStatement, 88 /* FinallyKeyword */, sourceFile);
-                pushKeywordIf(keywords, finallyKeyword, 88 /* FinallyKeyword */);
+                var finallyKeyword = ts.findChildOfKind(tryStatement, 89 /* FinallyKeyword */, sourceFile);
+                pushKeywordIf(keywords, finallyKeyword, 89 /* FinallyKeyword */);
             }
             return keywords;
         }
@@ -100992,13 +101962,13 @@ var ts;
             }
             var keywords = [];
             ts.forEach(aggregateOwnedThrowStatements(owner), function (throwStatement) {
-                keywords.push(ts.findChildOfKind(throwStatement, 101 /* ThrowKeyword */, sourceFile));
+                keywords.push(ts.findChildOfKind(throwStatement, 102 /* ThrowKeyword */, sourceFile));
             });
             // If the "owner" is a function, then we equate 'return' and 'throw' statements in their
             // ability to "jump out" of the function, and include occurrences for both.
             if (ts.isFunctionBlock(owner)) {
                 ts.forEachReturnStatement(owner, function (returnStatement) {
-                    keywords.push(ts.findChildOfKind(returnStatement, 97 /* ReturnKeyword */, sourceFile));
+                    keywords.push(ts.findChildOfKind(returnStatement, 98 /* ReturnKeyword */, sourceFile));
                 });
             }
             return keywords;
@@ -101010,11 +101980,11 @@ var ts;
             }
             var keywords = [];
             ts.forEachReturnStatement(ts.cast(func.body, ts.isBlock), function (returnStatement) {
-                keywords.push(ts.findChildOfKind(returnStatement, 97 /* ReturnKeyword */, sourceFile));
+                keywords.push(ts.findChildOfKind(returnStatement, 98 /* ReturnKeyword */, sourceFile));
             });
             // Include 'throw' statements that do not occur within a try block.
             ts.forEach(aggregateOwnedThrowStatements(func.body), function (throwStatement) {
-                keywords.push(ts.findChildOfKind(throwStatement, 101 /* ThrowKeyword */, sourceFile));
+                keywords.push(ts.findChildOfKind(throwStatement, 102 /* ThrowKeyword */, sourceFile));
             });
             return keywords;
         }
@@ -101026,13 +101996,13 @@ var ts;
             var keywords = [];
             if (func.modifiers) {
                 func.modifiers.forEach(function (modifier) {
-                    pushKeywordIf(keywords, modifier, 121 /* AsyncKeyword */);
+                    pushKeywordIf(keywords, modifier, 122 /* AsyncKeyword */);
                 });
             }
             ts.forEachChild(func, function (child) {
                 traverseWithoutCrossingFunction(child, function (node) {
                     if (ts.isAwaitExpression(node)) {
-                        pushKeywordIf(keywords, node.getFirstToken(), 122 /* AwaitKeyword */);
+                        pushKeywordIf(keywords, node.getFirstToken(), 123 /* AwaitKeyword */);
                     }
                 });
             });
@@ -101047,7 +102017,7 @@ var ts;
             ts.forEachChild(func, function (child) {
                 traverseWithoutCrossingFunction(child, function (node) {
                     if (ts.isYieldExpression(node)) {
-                        pushKeywordIf(keywords, node.getFirstToken(), 117 /* YieldKeyword */);
+                        pushKeywordIf(keywords, node.getFirstToken(), 118 /* YieldKeyword */);
                     }
                 });
             });
@@ -101066,7 +102036,7 @@ var ts;
             // We'd like to highlight else/ifs together if they are only separated by whitespace
             // (i.e. the keywords are separated by no comments, no newlines).
             for (var i = 0; i < keywords.length; i++) {
-                if (keywords[i].kind === 83 /* ElseKeyword */ && i < keywords.length - 1) {
+                if (keywords[i].kind === 84 /* ElseKeyword */ && i < keywords.length - 1) {
                     var elseKeyword = keywords[i];
                     var ifKeyword = keywords[i + 1]; // this *should* always be an 'if' keyword.
                     var shouldCombineElseAndIf = true;
@@ -101101,10 +102071,10 @@ var ts;
             // Now traverse back down through the else branches, aggregating if/else keywords of if-statements.
             while (true) {
                 var children = ifStatement.getChildren(sourceFile);
-                pushKeywordIf(keywords, children[0], 91 /* IfKeyword */);
+                pushKeywordIf(keywords, children[0], 92 /* IfKeyword */);
                 // Generally the 'else' keyword is second-to-last, so we traverse backwards.
                 for (var i = children.length - 1; i >= 0; i--) {
-                    if (pushKeywordIf(keywords, children[i], 83 /* ElseKeyword */)) {
+                    if (pushKeywordIf(keywords, children[i], 84 /* ElseKeyword */)) {
                         break;
                     }
                 }
@@ -101320,12 +102290,12 @@ var ts;
                         if (cancellationToken)
                             cancellationToken.throwIfCancellationRequested();
                         switch (direct.kind) {
-                            case 191 /* CallExpression */:
+                            case 192 /* CallExpression */:
                                 if (!isAvailableThroughGlobal) {
                                     var parent = direct.parent;
-                                    if (exportKind === 2 /* ExportEquals */ && parent.kind === 237 /* VariableDeclaration */) {
+                                    if (exportKind === 2 /* ExportEquals */ && parent.kind === 238 /* VariableDeclaration */) {
                                         var name = parent.name;
-                                        if (name.kind === 72 /* Identifier */) {
+                                        if (name.kind === 73 /* Identifier */) {
                                             directImports.push(name);
                                             break;
                                         }
@@ -101334,22 +102304,22 @@ var ts;
                                     addIndirectUser(direct.getSourceFile());
                                 }
                                 break;
-                            case 72 /* Identifier */: // for 'const x = require("y");
+                            case 73 /* Identifier */: // for 'const x = require("y");
                                 break; // TODO: GH#23879
-                            case 248 /* ImportEqualsDeclaration */:
+                            case 249 /* ImportEqualsDeclaration */:
                                 handleNamespaceImport(direct, direct.name, ts.hasModifier(direct, 1 /* Export */), /*alreadyAddedDirect*/ false);
                                 break;
-                            case 249 /* ImportDeclaration */:
+                            case 250 /* ImportDeclaration */:
                                 directImports.push(direct);
                                 var namedBindings = direct.importClause && direct.importClause.namedBindings;
-                                if (namedBindings && namedBindings.kind === 251 /* NamespaceImport */) {
+                                if (namedBindings && namedBindings.kind === 252 /* NamespaceImport */) {
                                     handleNamespaceImport(direct, namedBindings.name, /*isReExport*/ false, /*alreadyAddedDirect*/ true);
                                 }
                                 else if (!isAvailableThroughGlobal && ts.isDefaultImport(direct)) {
                                     addIndirectUser(getSourceFileLikeForImportDeclaration(direct)); // Add a check for indirect uses to handle synthetic default imports
                                 }
                                 break;
-                            case 255 /* ExportDeclaration */:
+                            case 256 /* ExportDeclaration */:
                                 if (!direct.exportClause) {
                                     // This is `export * from "foo"`, so imports of this module may import the export too.
                                     handleDirectImports(getContainingModuleSymbol(direct, checker));
@@ -101359,11 +102329,11 @@ var ts;
                                     directImports.push(direct);
                                 }
                                 break;
-                            case 183 /* ImportType */:
+                            case 184 /* ImportType */:
                                 directImports.push(direct);
                                 break;
                             default:
-                                ts.Debug.assertNever(direct, "Unexpected import kind: " + ts.Debug.showSyntaxKind(direct));
+                                ts.Debug.failBadSyntaxKind(direct, "Unexpected import kind.");
                         }
                     }
                 }
@@ -101376,7 +102346,7 @@ var ts;
                 }
                 else if (!isAvailableThroughGlobal) {
                     var sourceFileLike = getSourceFileLikeForImportDeclaration(importDeclaration);
-                    ts.Debug.assert(sourceFileLike.kind === 284 /* SourceFile */ || sourceFileLike.kind === 244 /* ModuleDeclaration */);
+                    ts.Debug.assert(sourceFileLike.kind === 285 /* SourceFile */ || sourceFileLike.kind === 245 /* ModuleDeclaration */);
                     if (isReExport || findNamespaceReExports(sourceFileLike, name, checker)) {
                         addIndirectUsers(sourceFileLike);
                     }
@@ -101431,17 +102401,17 @@ var ts;
             }
             return { importSearches: importSearches, singleReferences: singleReferences };
             function handleImport(decl) {
-                if (decl.kind === 248 /* ImportEqualsDeclaration */) {
+                if (decl.kind === 249 /* ImportEqualsDeclaration */) {
                     if (isExternalModuleImportEquals(decl)) {
                         handleNamespaceImportLike(decl.name);
                     }
                     return;
                 }
-                if (decl.kind === 72 /* Identifier */) {
+                if (decl.kind === 73 /* Identifier */) {
                     handleNamespaceImportLike(decl);
                     return;
                 }
-                if (decl.kind === 183 /* ImportType */) {
+                if (decl.kind === 184 /* ImportType */) {
                     if (decl.qualifier) {
                         if (ts.isIdentifier(decl.qualifier) && decl.qualifier.escapedText === ts.symbolName(exportSymbol)) {
                             singleReferences.push(decl.qualifier);
@@ -101456,17 +102426,17 @@ var ts;
                 if (decl.moduleSpecifier.kind !== 10 /* StringLiteral */) {
                     return;
                 }
-                if (decl.kind === 255 /* ExportDeclaration */) {
+                if (decl.kind === 256 /* ExportDeclaration */) {
                     searchForNamedImport(decl.exportClause);
                     return;
                 }
                 var _a = decl.importClause || { name: undefined, namedBindings: undefined }, name = _a.name, namedBindings = _a.namedBindings;
                 if (namedBindings) {
                     switch (namedBindings.kind) {
-                        case 251 /* NamespaceImport */:
+                        case 252 /* NamespaceImport */:
                             handleNamespaceImportLike(namedBindings.name);
                             break;
-                        case 252 /* NamedImports */:
+                        case 253 /* NamedImports */:
                             // 'default' might be accessed as a named import `{ default as foo }`.
                             if (exportKind === 0 /* Named */ || exportKind === 1 /* Default */) {
                                 searchForNamedImport(namedBindings);
@@ -101516,7 +102486,7 @@ var ts;
                         }
                     }
                     else {
-                        var localSymbol = element.kind === 257 /* ExportSpecifier */ && element.propertyName
+                        var localSymbol = element.kind === 258 /* ExportSpecifier */ && element.propertyName
                             ? checker.getExportSpecifierLocalTargetSymbol(element) // For re-exporting under a different name, we want to get the re-exported symbol.
                             : checker.getSymbolAtLocation(name);
                         addSearch(name, localSymbol);
@@ -101545,7 +102515,7 @@ var ts;
             for (var _i = 0, sourceFiles_1 = sourceFiles; _i < sourceFiles_1.length; _i++) {
                 var referencingFile = sourceFiles_1[_i];
                 var searchSourceFile = searchModuleSymbol.valueDeclaration;
-                if (searchSourceFile.kind === 284 /* SourceFile */) {
+                if (searchSourceFile.kind === 285 /* SourceFile */) {
                     for (var _a = 0, _b = referencingFile.referencedFiles; _a < _b.length; _a++) {
                         var ref = _b[_a];
                         if (program.getSourceFileFromReference(referencingFile, ref) === searchSourceFile) {
@@ -101593,7 +102563,7 @@ var ts;
         }
         /** Iterates over all statements at the top level or in module declarations. Returns the first truthy result. */
         function forEachPossibleImportOrExportStatement(sourceFileLike, action) {
-            return ts.forEach(sourceFileLike.kind === 284 /* SourceFile */ ? sourceFileLike.statements : sourceFileLike.body.statements, function (statement) {
+            return ts.forEach(sourceFileLike.kind === 285 /* SourceFile */ ? sourceFileLike.statements : sourceFileLike.body.statements, function (statement) {
                 return action(statement) || (isAmbientModuleDeclaration(statement) && ts.forEach(statement.body && statement.body.statements, action));
             });
         }
@@ -101608,15 +102578,15 @@ var ts;
             else {
                 forEachPossibleImportOrExportStatement(sourceFile, function (statement) {
                     switch (statement.kind) {
-                        case 255 /* ExportDeclaration */:
-                        case 249 /* ImportDeclaration */: {
+                        case 256 /* ExportDeclaration */:
+                        case 250 /* ImportDeclaration */: {
                             var decl = statement;
                             if (decl.moduleSpecifier && ts.isStringLiteral(decl.moduleSpecifier)) {
                                 action(decl, decl.moduleSpecifier);
                             }
                             break;
                         }
-                        case 248 /* ImportEqualsDeclaration */: {
+                        case 249 /* ImportEqualsDeclaration */: {
                             var decl = statement;
                             if (isExternalModuleImportEquals(decl)) {
                                 action(decl, decl.moduleReference.expression);
@@ -101640,7 +102610,7 @@ var ts;
                 var parent = node.parent;
                 var grandParent = parent.parent;
                 if (symbol.exportSymbol) {
-                    if (parent.kind === 189 /* PropertyAccessExpression */) {
+                    if (parent.kind === 190 /* PropertyAccessExpression */) {
                         // When accessing an export of a JS module, there's no alias. The symbol will still be flagged as an export even though we're at the use.
                         // So check that we are at the declaration.
                         return symbol.declarations.some(function (d) { return d === parent; }) && ts.isBinaryExpression(grandParent)
@@ -101706,7 +102676,7 @@ var ts;
                     var sym = useLhsSymbol ? checker.getSymbolAtLocation(ts.cast(node.left, ts.isPropertyAccessExpression).name) : symbol;
                     // Better detection for GH#20803
                     if (sym && !(checker.getMergedSymbol(sym.parent).flags & 1536 /* Module */)) {
-                        ts.Debug.fail("Special property assignment kind does not have a module as its parent. Assignment is " + ts.Debug.showSymbol(sym) + ", parent is " + ts.Debug.showSymbol(sym.parent));
+                        ts.Debug.fail("Special property assignment kind does not have a module as its parent. Assignment is " + ts.Debug.formatSymbol(sym) + ", parent is " + ts.Debug.formatSymbol(sym.parent));
                     }
                     return sym && exportInfo(sym, kind);
                 }
@@ -101762,10 +102732,10 @@ var ts;
         // If a reference is a class expression, the exported node would be its parent.
         // If a reference is a variable declaration, the exported node would be the variable statement.
         function getExportNode(parent, node) {
-            if (parent.kind === 237 /* VariableDeclaration */) {
+            if (parent.kind === 238 /* VariableDeclaration */) {
                 var p = parent;
                 return p.name !== node ? undefined :
-                    p.parent.kind === 274 /* CatchClause */ ? undefined : p.parent.parent.kind === 219 /* VariableStatement */ ? p.parent.parent : undefined;
+                    p.parent.kind === 275 /* CatchClause */ ? undefined : p.parent.parent.kind === 220 /* VariableStatement */ ? p.parent.parent : undefined;
             }
             else {
                 return parent;
@@ -101774,13 +102744,13 @@ var ts;
         function isNodeImport(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return parent.name === node && isExternalModuleImportEquals(parent);
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     // For a rename import `{ foo as bar }`, don't search for the imported symbol. Just find local uses of `bar`.
                     return !parent.propertyName;
-                case 250 /* ImportClause */:
-                case 251 /* NamespaceImport */:
+                case 251 /* ImportClause */:
+                case 252 /* NamespaceImport */:
                     ts.Debug.assert(parent.name === node);
                     return true;
                 default:
@@ -101813,21 +102783,21 @@ var ts;
             return checker.getMergedSymbol(getSourceFileLikeForImportDeclaration(importer).symbol);
         }
         function getSourceFileLikeForImportDeclaration(node) {
-            if (node.kind === 191 /* CallExpression */) {
+            if (node.kind === 192 /* CallExpression */) {
                 return node.getSourceFile();
             }
             var parent = node.parent;
-            if (parent.kind === 284 /* SourceFile */) {
+            if (parent.kind === 285 /* SourceFile */) {
                 return parent;
             }
-            ts.Debug.assert(parent.kind === 245 /* ModuleBlock */);
+            ts.Debug.assert(parent.kind === 246 /* ModuleBlock */);
             return ts.cast(parent.parent, isAmbientModuleDeclaration);
         }
         function isAmbientModuleDeclaration(node) {
-            return node.kind === 244 /* ModuleDeclaration */ && node.name.kind === 10 /* StringLiteral */;
+            return node.kind === 245 /* ModuleDeclaration */ && node.name.kind === 10 /* StringLiteral */;
         }
         function isExternalModuleImportEquals(eq) {
-            return eq.moduleReference.kind === 259 /* ExternalModuleReference */ && eq.moduleReference.expression.kind === 10 /* StringLiteral */;
+            return eq.moduleReference.kind === 260 /* ExternalModuleReference */ && eq.moduleReference.expression.kind === 10 /* StringLiteral */;
         }
     })(FindAllReferences = ts.FindAllReferences || (ts.FindAllReferences = {}));
 })(ts || (ts = {}));
@@ -101879,18 +102849,18 @@ var ts;
         }
         FindAllReferences.getImplementationsAtPosition = getImplementationsAtPosition;
         function getImplementationReferenceEntries(program, cancellationToken, sourceFiles, node, position) {
-            if (node.kind === 284 /* SourceFile */) {
+            if (node.kind === 285 /* SourceFile */) {
                 return undefined;
             }
             var checker = program.getTypeChecker();
             // If invoked directly on a shorthand property assignment, then return
             // the declaration of the symbol being assigned (not the symbol being assigned to).
-            if (node.parent.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (node.parent.kind === 277 /* ShorthandPropertyAssignment */) {
                 var result_1 = [];
                 FindAllReferences.Core.getReferenceEntriesForShorthandPropertyAssignment(node, checker, function (node) { return result_1.push(nodeEntry(node)); });
                 return result_1;
             }
-            else if (node.kind === 98 /* SuperKeyword */ || ts.isSuperProperty(node.parent)) {
+            else if (node.kind === 99 /* SuperKeyword */ || ts.isSuperProperty(node.parent)) {
                 // References to and accesses on the super keyword only have one possible implementation, so no
                 // need to "Find all References"
                 var symbol = checker.getSymbolAtLocation(node);
@@ -101970,7 +102940,7 @@ var ts;
                 textSpan: textSpan,
                 fileName: fileName,
                 isWriteAccess: isWriteAccessForReference(node),
-                isDefinition: node.kind === 80 /* DefaultKeyword */
+                isDefinition: node.kind === 81 /* DefaultKeyword */
                     || !!ts.getDeclarationFromName(node)
                     || ts.isLiteralComputedPropertyDeclarationName(node),
                 isInString: kind === 2 /* StringLiteral */ ? true : undefined,
@@ -102027,13 +102997,13 @@ var ts;
             if (symbol) {
                 return getDefinitionKindAndDisplayParts(symbol, checker, node);
             }
-            else if (node.kind === 188 /* ObjectLiteralExpression */) {
+            else if (node.kind === 189 /* ObjectLiteralExpression */) {
                 return {
                     kind: "interface" /* interfaceElement */,
                     displayParts: [ts.punctuationPart(20 /* OpenParenToken */), ts.textPart("object literal"), ts.punctuationPart(21 /* CloseParenToken */)]
                 };
             }
-            else if (node.kind === 209 /* ClassExpression */) {
+            else if (node.kind === 210 /* ClassExpression */) {
                 return {
                     kind: "local class" /* localClassElement */,
                     displayParts: [ts.punctuationPart(20 /* OpenParenToken */), ts.textPart("anonymous local class"), ts.punctuationPart(21 /* CloseParenToken */)]
@@ -102076,7 +103046,7 @@ var ts;
         /** A node is considered a writeAccess iff it is a name of a declaration or a target of an assignment */
         function isWriteAccessForReference(node) {
             var decl = ts.getDeclarationFromName(node);
-            return !!decl && declarationIsWriteAccess(decl) || node.kind === 80 /* DefaultKeyword */ || ts.isWriteAccess(node);
+            return !!decl && declarationIsWriteAccess(decl) || node.kind === 81 /* DefaultKeyword */ || ts.isWriteAccess(node);
         }
         /**
          * True if 'decl' provides a value, as in `function f() {}`;
@@ -102087,46 +103057,46 @@ var ts;
             if (!!(decl.flags & 4194304 /* Ambient */))
                 return true;
             switch (decl.kind) {
-                case 204 /* BinaryExpression */:
-                case 186 /* BindingElement */:
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 80 /* DefaultKeyword */:
-                case 243 /* EnumDeclaration */:
-                case 278 /* EnumMember */:
-                case 257 /* ExportSpecifier */:
-                case 250 /* ImportClause */: // default import
-                case 248 /* ImportEqualsDeclaration */:
-                case 253 /* ImportSpecifier */:
-                case 241 /* InterfaceDeclaration */:
-                case 302 /* JSDocCallbackTag */:
-                case 309 /* JSDocTypedefTag */:
-                case 267 /* JsxAttribute */:
-                case 244 /* ModuleDeclaration */:
-                case 247 /* NamespaceExportDeclaration */:
-                case 251 /* NamespaceImport */:
-                case 151 /* Parameter */:
-                case 276 /* ShorthandPropertyAssignment */:
-                case 242 /* TypeAliasDeclaration */:
-                case 150 /* TypeParameter */:
+                case 205 /* BinaryExpression */:
+                case 187 /* BindingElement */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 81 /* DefaultKeyword */:
+                case 244 /* EnumDeclaration */:
+                case 279 /* EnumMember */:
+                case 258 /* ExportSpecifier */:
+                case 251 /* ImportClause */: // default import
+                case 249 /* ImportEqualsDeclaration */:
+                case 254 /* ImportSpecifier */:
+                case 242 /* InterfaceDeclaration */:
+                case 303 /* JSDocCallbackTag */:
+                case 310 /* JSDocTypedefTag */:
+                case 268 /* JsxAttribute */:
+                case 245 /* ModuleDeclaration */:
+                case 248 /* NamespaceExportDeclaration */:
+                case 252 /* NamespaceImport */:
+                case 152 /* Parameter */:
+                case 277 /* ShorthandPropertyAssignment */:
+                case 243 /* TypeAliasDeclaration */:
+                case 151 /* TypeParameter */:
                     return true;
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     // In `({ x: y } = 0);`, `x` is not a write access. (Won't call this function for `y`.)
                     return !ts.isArrayLiteralOrObjectLiteralDestructuringPattern(decl.parent);
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 157 /* Constructor */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 158 /* Constructor */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return !!decl.body;
-                case 237 /* VariableDeclaration */:
-                case 154 /* PropertyDeclaration */:
+                case 238 /* VariableDeclaration */:
+                case 155 /* PropertyDeclaration */:
                     return !!decl.initializer || ts.isCatchClause(decl.parent);
-                case 155 /* MethodSignature */:
-                case 153 /* PropertySignature */:
-                case 310 /* JSDocPropertyTag */:
-                case 304 /* JSDocParameterTag */:
+                case 156 /* MethodSignature */:
+                case 154 /* PropertySignature */:
+                case 311 /* JSDocPropertyTag */:
+                case 305 /* JSDocParameterTag */:
                     return false;
                 default:
                     return ts.Debug.failBadSyntaxKind(decl);
@@ -102286,10 +103256,10 @@ var ts;
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var decl = _a[_i];
                     switch (decl.kind) {
-                        case 284 /* SourceFile */:
+                        case 285 /* SourceFile */:
                             // Don't include the source file itself. (This may not be ideal behavior, but awkward to include an entire file as a reference.)
                             break;
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             if (sourceFilesSet.has(decl.getSourceFile().fileName)) {
                                 references.push(FindAllReferences.nodeEntry(decl.name));
                             }
@@ -102309,7 +103279,7 @@ var ts;
                             var node = ts.isBinaryExpression(decl) && ts.isPropertyAccessExpression(decl.left)
                                 ? decl.left.expression
                                 : ts.isExportAssignment(decl)
-                                    ? ts.Debug.assertDefined(ts.findChildOfKind(decl, 85 /* ExportKeyword */, sourceFile))
+                                    ? ts.Debug.assertDefined(ts.findChildOfKind(decl, 86 /* ExportKeyword */, sourceFile))
                                     : ts.getNameOfDeclaration(decl) || decl;
                             references.push(FindAllReferences.nodeEntry(node));
                         }
@@ -102336,7 +103306,7 @@ var ts;
                 if (ts.isThis(node)) {
                     return getReferencesForThisKeyword(node, sourceFiles, cancellationToken);
                 }
-                if (node.kind === 98 /* SuperKeyword */) {
+                if (node.kind === 99 /* SuperKeyword */) {
                     return getReferencesForSuperKeyword(node);
                 }
                 return undefined;
@@ -102353,7 +103323,7 @@ var ts;
                     // When renaming at an export specifier, rename the export and not the thing being exported.
                     getReferencesAtExportSpecifier(exportSpecifier.name, symbol, exportSpecifier, state.createSearch(node, originalSymbol, /*comingFrom*/ undefined), state, /*addReferencesHere*/ true, /*alwaysGetReferences*/ true);
                 }
-                else if (node && node.kind === 80 /* DefaultKeyword */) {
+                else if (node && node.kind === 81 /* DefaultKeyword */) {
                     addReference(node, symbol, state);
                     searchForImportsOfExport(node, symbol, { exportingModuleSymbol: ts.Debug.assertDefined(symbol.parent, "Expected export symbol to have a parent"), exportKind: 1 /* Default */ }, state);
                 }
@@ -102381,9 +103351,9 @@ var ts;
             }
             function getSpecialSearchKind(node) {
                 switch (node.kind) {
-                    case 124 /* ConstructorKeyword */:
+                    case 125 /* ConstructorKeyword */:
                         return 1 /* Constructor */;
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         if (ts.isClassLike(node.parent)) {
                             ts.Debug.assert(node.parent.name === node);
                             return 2 /* Class */;
@@ -102406,7 +103376,7 @@ var ts;
                         if (symbol.flags & 33554432 /* Transient */)
                             return undefined;
                         // Assertions for GH#21814. We should be handling SourceFile symbols in `getReferencedSymbolsForModule` instead of getting here.
-                        ts.Debug.fail("Unexpected symbol at " + ts.Debug.showSyntaxKind(node) + ": " + ts.Debug.showSymbol(symbol));
+                        ts.Debug.fail("Unexpected symbol at " + ts.Debug.formatSyntaxKind(node.kind) + ": " + ts.Debug.formatSymbol(symbol));
                     }
                     return ts.isTypeLiteralNode(decl.parent) && ts.isUnionTypeNode(decl.parent.parent)
                         ? checker.getPropertyOfType(checker.getTypeFromTypeNode(decl.parent.parent), symbol.name)
@@ -102511,8 +103481,8 @@ var ts;
                     var sourceId = ts.getNodeId(sourceFile);
                     var seenSymbols = this.sourceFileToSeenSymbols[sourceId] || (this.sourceFileToSeenSymbols[sourceId] = ts.createMap());
                     var anyNewSymbols = false;
-                    for (var _i = 0, symbols_2 = symbols; _i < symbols_2.length; _i++) {
-                        var sym = symbols_2[_i];
+                    for (var _i = 0, symbols_3 = symbols; _i < symbols_3.length; _i++) {
+                        var sym = symbols_3[_i];
                         anyNewSymbols = ts.addToSeen(seenSymbols, ts.getSymbolId(sym)) || anyNewSymbols;
                     }
                     return anyNewSymbols;
@@ -102619,7 +103589,7 @@ var ts;
                 // If this is the symbol of a named function expression or named class expression,
                 // then named references are limited to its own scope.
                 var declarations = symbol.declarations, flags = symbol.flags, parent = symbol.parent, valueDeclaration = symbol.valueDeclaration;
-                if (valueDeclaration && (valueDeclaration.kind === 196 /* FunctionExpression */ || valueDeclaration.kind === 209 /* ClassExpression */)) {
+                if (valueDeclaration && (valueDeclaration.kind === 197 /* FunctionExpression */ || valueDeclaration.kind === 210 /* ClassExpression */)) {
                     return valueDeclaration;
                 }
                 if (!declarations) {
@@ -102629,7 +103599,7 @@ var ts;
                 if (flags & (4 /* Property */ | 8192 /* Method */)) {
                     var privateDeclaration = ts.find(declarations, function (d) { return ts.hasModifier(d, 8 /* Private */); });
                     if (privateDeclaration) {
-                        return ts.getAncestor(privateDeclaration, 240 /* ClassDeclaration */);
+                        return ts.getAncestor(privateDeclaration, 241 /* ClassDeclaration */);
                     }
                     // Else this is a public property and could be accessed from anywhere.
                     return undefined;
@@ -102658,7 +103628,7 @@ var ts;
                         // Different declarations have different containers, bail out
                         return undefined;
                     }
-                    if (!container || container.kind === 284 /* SourceFile */ && !ts.isExternalOrCommonJsModule(container)) {
+                    if (!container || container.kind === 285 /* SourceFile */ && !ts.isExternalOrCommonJsModule(container)) {
                         // This is a global variable and not an external module, any declaration defined
                         // within this scope is visible outside the file
                         return undefined;
@@ -102745,8 +103715,8 @@ var ts;
                     // We found a match.  Make sure it's not part of a larger word (i.e. the char
                     // before and after it have to be a non-identifier char).
                     var endPosition = position + symbolNameLength;
-                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 7 /* Latest */)) &&
-                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 7 /* Latest */))) {
+                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 8 /* Latest */)) &&
+                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 8 /* Latest */))) {
                         // Found a real match.  Keep searching.
                         positions.push(position);
                     }
@@ -102766,7 +103736,7 @@ var ts;
             function isValidReferencePosition(node, searchSymbolName) {
                 // Compare the length so we filter out strict superstrings of the symbol we are looking for
                 switch (node.kind) {
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return node.text.length === searchSymbolName.length;
                     case 10 /* StringLiteral */: {
                         var str = node;
@@ -102775,7 +103745,7 @@ var ts;
                     }
                     case 8 /* NumericLiteral */:
                         return ts.isLiteralNameOfPropertyDeclarationOrIndexAccess(node) && node.text.length === searchSymbolName.length;
-                    case 80 /* DefaultKeyword */:
+                    case 81 /* DefaultKeyword */:
                         return "default".length === searchSymbolName.length;
                     default:
                         return false;
@@ -102839,7 +103809,7 @@ var ts;
                     return;
                 }
                 if (ts.isExportSpecifier(parent)) {
-                    ts.Debug.assert(referenceLocation.kind === 72 /* Identifier */);
+                    ts.Debug.assert(referenceLocation.kind === 73 /* Identifier */);
                     getReferencesAtExportSpecifier(referenceLocation, referenceSymbol, parent, search, state, addReferencesHere);
                     return;
                 }
@@ -102895,8 +103865,8 @@ var ts;
                 }
                 // For `export { foo as bar }`, rename `foo`, but not `bar`.
                 if (!isForRenameWithPrefixAndSuffixText(state.options) || alwaysGetReferences) {
-                    var isDefaultExport = referenceLocation.originalKeywordKind === 80 /* DefaultKeyword */
-                        || exportSpecifier.name.originalKeywordKind === 80 /* DefaultKeyword */;
+                    var isDefaultExport = referenceLocation.originalKeywordKind === 81 /* DefaultKeyword */
+                        || exportSpecifier.name.originalKeywordKind === 81 /* DefaultKeyword */;
                     var exportKind = isDefaultExport ? 1 /* Default */ : 0 /* Named */;
                     var exportSymbol = ts.Debug.assertDefined(exportSpecifier.symbol);
                     var exportInfo = ts.Debug.assertDefined(FindAllReferences.getExportInfo(exportSymbol, exportKind, state.checker));
@@ -102975,7 +103945,7 @@ var ts;
                 }
                 var pusher = function () { return state.referenceAdder(search.symbol); };
                 if (ts.isClassLike(referenceLocation.parent)) {
-                    ts.Debug.assert(referenceLocation.kind === 80 /* DefaultKeyword */ || referenceLocation.parent.name === referenceLocation);
+                    ts.Debug.assert(referenceLocation.kind === 81 /* DefaultKeyword */ || referenceLocation.parent.name === referenceLocation);
                     // This is the class declaration containing the constructor.
                     findOwnConstructorReferences(search.symbol, sourceFile, pusher());
                 }
@@ -103002,7 +103972,7 @@ var ts;
                     }
                     if (member.body) {
                         member.body.forEachChild(function cb(node) {
-                            if (node.kind === 100 /* ThisKeyword */) {
+                            if (node.kind === 101 /* ThisKeyword */) {
                                 addRef(node);
                             }
                             else if (!ts.isFunctionLike(node) && !ts.isClassLike(node)) {
@@ -103021,18 +103991,18 @@ var ts;
                 if (constructorSymbol) {
                     for (var _i = 0, _a = constructorSymbol.declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
-                        var ctrKeyword = ts.findChildOfKind(decl, 124 /* ConstructorKeyword */, sourceFile);
-                        ts.Debug.assert(decl.kind === 157 /* Constructor */ && !!ctrKeyword);
+                        var ctrKeyword = ts.findChildOfKind(decl, 125 /* ConstructorKeyword */, sourceFile);
+                        ts.Debug.assert(decl.kind === 158 /* Constructor */ && !!ctrKeyword);
                         addNode(ctrKeyword);
                     }
                 }
                 if (classSymbol.exports) {
                     classSymbol.exports.forEach(function (member) {
                         var decl = member.valueDeclaration;
-                        if (decl && decl.kind === 156 /* MethodDeclaration */) {
+                        if (decl && decl.kind === 157 /* MethodDeclaration */) {
                             var body = decl.body;
                             if (body) {
-                                forEachDescendantOfKind(body, 100 /* ThisKeyword */, function (thisKeyword) {
+                                forEachDescendantOfKind(body, 101 /* ThisKeyword */, function (thisKeyword) {
                                     if (ts.isNewExpressionTarget(thisKeyword)) {
                                         addNode(thisKeyword);
                                     }
@@ -103053,10 +104023,10 @@ var ts;
                 }
                 for (var _i = 0, _a = constructor.declarations; _i < _a.length; _i++) {
                     var decl = _a[_i];
-                    ts.Debug.assert(decl.kind === 157 /* Constructor */);
+                    ts.Debug.assert(decl.kind === 158 /* Constructor */);
                     var body = decl.body;
                     if (body) {
-                        forEachDescendantOfKind(body, 98 /* SuperKeyword */, function (node) {
+                        forEachDescendantOfKind(body, 99 /* SuperKeyword */, function (node) {
                             if (ts.isCallExpressionTarget(node)) {
                                 addNode(node);
                             }
@@ -103080,10 +104050,10 @@ var ts;
                     addReference(refNode);
                     return;
                 }
-                if (refNode.kind !== 72 /* Identifier */) {
+                if (refNode.kind !== 73 /* Identifier */) {
                     return;
                 }
-                if (refNode.parent.kind === 276 /* ShorthandPropertyAssignment */) {
+                if (refNode.parent.kind === 277 /* ShorthandPropertyAssignment */) {
                     // Go ahead and dereference the shorthand assignment by going to its definition
                     getReferenceEntriesForShorthandPropertyAssignment(refNode, state.checker, addReference);
                 }
@@ -103103,7 +104073,7 @@ var ts;
                     }
                     else if (ts.isFunctionLike(typeHavingNode) && typeHavingNode.body) {
                         var body = typeHavingNode.body;
-                        if (body.kind === 218 /* Block */) {
+                        if (body.kind === 219 /* Block */) {
                             ts.forEachReturnStatement(body, function (returnStatement) {
                                 if (returnStatement.expression)
                                     addIfImplementation(returnStatement.expression);
@@ -103131,13 +104101,13 @@ var ts;
              */
             function isImplementationExpression(node) {
                 switch (node.kind) {
-                    case 195 /* ParenthesizedExpression */:
+                    case 196 /* ParenthesizedExpression */:
                         return isImplementationExpression(node.expression);
-                    case 197 /* ArrowFunction */:
-                    case 196 /* FunctionExpression */:
-                    case 188 /* ObjectLiteralExpression */:
-                    case 209 /* ClassExpression */:
-                    case 187 /* ArrayLiteralExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 197 /* FunctionExpression */:
+                    case 189 /* ObjectLiteralExpression */:
+                    case 210 /* ClassExpression */:
+                    case 188 /* ArrayLiteralExpression */:
                         return true;
                     default:
                         return false;
@@ -103190,13 +104160,13 @@ var ts;
                 // Whether 'super' occurs in a static context within a class.
                 var staticFlag = 32 /* Static */;
                 switch (searchSpaceNode.kind) {
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
-                    case 157 /* Constructor */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
+                    case 158 /* Constructor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         staticFlag &= ts.getModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
@@ -103205,7 +104175,7 @@ var ts;
                 }
                 var sourceFile = searchSpaceNode.getSourceFile();
                 var references = ts.mapDefined(getPossibleSymbolReferenceNodes(sourceFile, "super", searchSpaceNode), function (node) {
-                    if (node.kind !== 98 /* SuperKeyword */) {
+                    if (node.kind !== 99 /* SuperKeyword */) {
                         return;
                     }
                     var container = ts.getSuperContainer(node, /*stopOnFunctions*/ false);
@@ -103217,41 +104187,41 @@ var ts;
                 return [{ definition: { type: 0 /* Symbol */, symbol: searchSpaceNode.symbol }, references: references }];
             }
             function isParameterName(node) {
-                return node.kind === 72 /* Identifier */ && node.parent.kind === 151 /* Parameter */ && node.parent.name === node;
+                return node.kind === 73 /* Identifier */ && node.parent.kind === 152 /* Parameter */ && node.parent.name === node;
             }
             function getReferencesForThisKeyword(thisOrSuperKeyword, sourceFiles, cancellationToken) {
                 var searchSpaceNode = ts.getThisContainer(thisOrSuperKeyword, /* includeArrowFunctions */ false);
                 // Whether 'this' occurs in a static context within a class.
                 var staticFlag = 32 /* Static */;
                 switch (searchSpaceNode.kind) {
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
                         if (ts.isObjectLiteralMethod(searchSpaceNode)) {
                             break;
                         }
                     // falls through
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
-                    case 157 /* Constructor */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
+                    case 158 /* Constructor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                         staticFlag &= ts.getModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
-                    case 284 /* SourceFile */:
+                    case 285 /* SourceFile */:
                         if (ts.isExternalModule(searchSpaceNode) || isParameterName(thisOrSuperKeyword)) {
                             return undefined;
                         }
                     // falls through
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
                         break;
                     // Computed properties in classes are not handled here because references to this are illegal,
                     // so there is no point finding references to them.
                     default:
                         return undefined;
                 }
-                var references = ts.flatMap(searchSpaceNode.kind === 284 /* SourceFile */ ? sourceFiles : [searchSpaceNode.getSourceFile()], function (sourceFile) {
+                var references = ts.flatMap(searchSpaceNode.kind === 285 /* SourceFile */ ? sourceFiles : [searchSpaceNode.getSourceFile()], function (sourceFile) {
                     cancellationToken.throwIfCancellationRequested();
                     return getPossibleSymbolReferenceNodes(sourceFile, "this", ts.isSourceFile(searchSpaceNode) ? sourceFile : searchSpaceNode).filter(function (node) {
                         if (!ts.isThis(node)) {
@@ -103259,19 +104229,19 @@ var ts;
                         }
                         var container = ts.getThisContainer(node, /* includeArrowFunctions */ false);
                         switch (searchSpaceNode.kind) {
-                            case 196 /* FunctionExpression */:
-                            case 239 /* FunctionDeclaration */:
+                            case 197 /* FunctionExpression */:
+                            case 240 /* FunctionDeclaration */:
                                 return searchSpaceNode.symbol === container.symbol;
-                            case 156 /* MethodDeclaration */:
-                            case 155 /* MethodSignature */:
+                            case 157 /* MethodDeclaration */:
+                            case 156 /* MethodSignature */:
                                 return ts.isObjectLiteralMethod(searchSpaceNode) && searchSpaceNode.symbol === container.symbol;
-                            case 209 /* ClassExpression */:
-                            case 240 /* ClassDeclaration */:
+                            case 210 /* ClassExpression */:
+                            case 241 /* ClassDeclaration */:
                                 // Make sure the container belongs to the same class
                                 // and has the appropriate static modifier from the original container.
                                 return container.parent && searchSpaceNode.symbol === container.parent.symbol && (ts.getModifierFlags(container) & 32 /* Static */) === staticFlag;
-                            case 284 /* SourceFile */:
-                                return container.kind === 284 /* SourceFile */ && !ts.isExternalModule(container) && !isParameterName(node);
+                            case 285 /* SourceFile */:
+                                return container.kind === 285 /* SourceFile */ && !ts.isExternalModule(container) && !isParameterName(node);
                         }
                     });
                 }).map(function (n) { return FindAllReferences.nodeEntry(n); });
@@ -103390,7 +104360,7 @@ var ts;
                     });
                 }
                 function getPropertySymbolOfObjectBindingPatternWithoutPropertyName(symbol, checker) {
-                    var bindingElement = ts.getDeclarationOfKind(symbol, 186 /* BindingElement */);
+                    var bindingElement = ts.getDeclarationOfKind(symbol, 187 /* BindingElement */);
                     if (bindingElement && ts.isObjectBindingElementWithoutPropertyName(bindingElement)) {
                         return ts.getPropertySymbolFromBindingElement(checker, bindingElement);
                     }
@@ -103749,7 +104719,7 @@ var ts;
                 else {
                     var defs = getDefinitionFromSymbol(typeChecker, symbol, node) || ts.emptyArray;
                     // For a 'super()' call, put the signature first, else put the variable first.
-                    return node.kind === 98 /* SuperKeyword */ ? [sigInfo].concat(defs) : defs.concat([sigInfo]);
+                    return node.kind === 99 /* SuperKeyword */ ? [sigInfo].concat(defs) : defs.concat([sigInfo]);
                 }
             }
             // Because name in short-hand property assignment has two different meanings: property name and property value,
@@ -103757,7 +104727,7 @@ var ts;
             // go to the declaration of the property name (in this case stay at the same position). However, if go-to-definition
             // is performed at the location of property access, we would like to go to definition of the property in the short-hand
             // assignment. This case and others are handled by the following code.
-            if (node.parent.kind === 276 /* ShorthandPropertyAssignment */) {
+            if (node.parent.kind === 277 /* ShorthandPropertyAssignment */) {
                 var shorthandSymbol_1 = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
                 return shorthandSymbol_1 ? shorthandSymbol_1.declarations.map(function (decl) { return createDefinitionInfo(decl, typeChecker, shorthandSymbol_1, node); }) : [];
             }
@@ -103910,18 +104880,18 @@ var ts;
         //   (2) when the aliased symbol is originating from an import.
         //
         function shouldSkipAlias(node, declaration) {
-            if (node.kind !== 72 /* Identifier */) {
+            if (node.kind !== 73 /* Identifier */) {
                 return false;
             }
             if (node.parent === declaration) {
                 return true;
             }
             switch (declaration.kind) {
-                case 250 /* ImportClause */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 251 /* ImportClause */:
+                case 249 /* ImportEqualsDeclaration */:
                     return true;
-                case 253 /* ImportSpecifier */:
-                    return declaration.parent.kind === 252 /* NamedImports */;
+                case 254 /* ImportSpecifier */:
+                    return declaration.parent.kind === 253 /* NamedImports */;
                 default:
                     return false;
             }
@@ -103931,7 +104901,7 @@ var ts;
             function getConstructSignatureDefinition() {
                 // Applicable only if we are in a new expression, or we are on a constructor declaration
                 // and in either case the symbol has a construct signature definition, i.e. class
-                if (symbol.flags & 32 /* Class */ && (ts.isNewExpressionTarget(node) || node.kind === 124 /* ConstructorKeyword */)) {
+                if (symbol.flags & 32 /* Class */ && (ts.isNewExpressionTarget(node) || node.kind === 125 /* ConstructorKeyword */)) {
                     var cls = ts.find(symbol.declarations, ts.isClassLike) || ts.Debug.fail("Expected declaration to have at least one class-like declaration");
                     return getSignatureDefinition(cls.members, /*selectConstructors*/ true);
                 }
@@ -104005,9 +104975,9 @@ var ts;
         }
         function isConstructorLike(node) {
             switch (node.kind) {
-                case 157 /* Constructor */:
-                case 166 /* ConstructorType */:
-                case 161 /* ConstructSignature */:
+                case 158 /* Constructor */:
+                case 167 /* ConstructorType */:
+                case 162 /* ConstructSignature */:
                     return true;
                 default:
                     return false;
@@ -104125,11 +105095,11 @@ var ts;
         JsDoc.getJsDocCommentsFromDeclarations = getJsDocCommentsFromDeclarations;
         function getCommentHavingNodes(declaration) {
             switch (declaration.kind) {
-                case 304 /* JSDocParameterTag */:
-                case 310 /* JSDocPropertyTag */:
+                case 305 /* JSDocParameterTag */:
+                case 311 /* JSDocPropertyTag */:
                     return [declaration];
-                case 302 /* JSDocCallbackTag */:
-                case 309 /* JSDocTypedefTag */:
+                case 303 /* JSDocCallbackTag */:
+                case 310 /* JSDocTypedefTag */:
                     return [declaration, declaration.parent];
                 default:
                     return ts.getJSDocCommentsAndTags(declaration);
@@ -104150,16 +105120,16 @@ var ts;
         function getCommentText(tag) {
             var comment = tag.comment;
             switch (tag.kind) {
-                case 300 /* JSDocAugmentsTag */:
+                case 301 /* JSDocAugmentsTag */:
                     return withNode(tag.class);
-                case 308 /* JSDocTemplateTag */:
+                case 309 /* JSDocTemplateTag */:
                     return withList(tag.typeParameters);
-                case 307 /* JSDocTypeTag */:
+                case 308 /* JSDocTypeTag */:
                     return withNode(tag.typeExpression);
-                case 309 /* JSDocTypedefTag */:
-                case 302 /* JSDocCallbackTag */:
-                case 310 /* JSDocPropertyTag */:
-                case 304 /* JSDocParameterTag */:
+                case 310 /* JSDocTypedefTag */:
+                case 303 /* JSDocCallbackTag */:
+                case 311 /* JSDocPropertyTag */:
+                case 305 /* JSDocParameterTag */:
                     var name = tag.name;
                     return name ? withNode(name) : comment;
                 default:
@@ -104336,7 +105306,7 @@ var ts;
         function parameterDocComments(parameters, isJavaScriptFile, indentationStr, newLine) {
             return parameters.map(function (_a, i) {
                 var name = _a.name, dotDotDotToken = _a.dotDotDotToken;
-                var paramName = name.kind === 72 /* Identifier */ ? name.text : "param" + i;
+                var paramName = name.kind === 73 /* Identifier */ ? name.text : "param" + i;
                 var type = isJavaScriptFile ? (dotDotDotToken ? "{...any} " : "{any} ") : "";
                 return indentationStr + " * @param " + type + paramName + newLine;
             }).join("");
@@ -104346,23 +105316,23 @@ var ts;
         }
         function getCommentOwnerInfoWorker(commentOwner) {
             switch (commentOwner.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 156 /* MethodDeclaration */:
-                case 157 /* Constructor */:
-                case 155 /* MethodSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 157 /* MethodDeclaration */:
+                case 158 /* Constructor */:
+                case 156 /* MethodSignature */:
                     var parameters = commentOwner.parameters;
                     return { commentOwner: commentOwner, parameters: parameters };
-                case 275 /* PropertyAssignment */:
+                case 276 /* PropertyAssignment */:
                     return getCommentOwnerInfoWorker(commentOwner.initializer);
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 153 /* PropertySignature */:
-                case 243 /* EnumDeclaration */:
-                case 278 /* EnumMember */:
-                case 242 /* TypeAliasDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 154 /* PropertySignature */:
+                case 244 /* EnumDeclaration */:
+                case 279 /* EnumMember */:
+                case 243 /* TypeAliasDeclaration */:
                     return { commentOwner: commentOwner };
-                case 219 /* VariableStatement */: {
+                case 220 /* VariableStatement */: {
                     var varStatement = commentOwner;
                     var varDeclarations = varStatement.declarationList.declarations;
                     var parameters_1 = varDeclarations.length === 1 && varDeclarations[0].initializer
@@ -104370,14 +105340,14 @@ var ts;
                         : undefined;
                     return { commentOwner: commentOwner, parameters: parameters_1 };
                 }
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     return "quit";
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     // If in walking up the tree, we hit a a nested namespace declaration,
                     // then we must be somewhere within a dotted namespace name; however we don't
                     // want to give back a JSDoc template for the 'b' or 'c' in 'namespace a.b.c { }'.
-                    return commentOwner.parent.kind === 244 /* ModuleDeclaration */ ? undefined : { commentOwner: commentOwner };
-                case 204 /* BinaryExpression */: {
+                    return commentOwner.parent.kind === 245 /* ModuleDeclaration */ ? undefined : { commentOwner: commentOwner };
+                case 205 /* BinaryExpression */: {
                     var be = commentOwner;
                     if (ts.getAssignmentDeclarationKind(be) === 0 /* None */) {
                         return "quit";
@@ -104396,14 +105366,14 @@ var ts;
          * @returns the parameters of a signature found on the RHS if one exists; otherwise 'emptyArray'.
          */
         function getParametersFromRightHandSideOfAssignment(rightHandSide) {
-            while (rightHandSide.kind === 195 /* ParenthesizedExpression */) {
+            while (rightHandSide.kind === 196 /* ParenthesizedExpression */) {
                 rightHandSide = rightHandSide.expression;
             }
             switch (rightHandSide.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     return rightHandSide.parameters;
-                case 209 /* ClassExpression */: {
+                case 210 /* ClassExpression */: {
                     var ctr = ts.find(rightHandSide.members, ts.isConstructorDeclaration);
                     return ctr ? ctr.parameters : ts.emptyArray;
                 }
@@ -104465,9 +105435,9 @@ var ts;
         }
         function shouldKeepItem(declaration, checker) {
             switch (declaration.kind) {
-                case 250 /* ImportClause */:
-                case 253 /* ImportSpecifier */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 251 /* ImportClause */:
+                case 254 /* ImportSpecifier */:
+                case 249 /* ImportEqualsDeclaration */:
                     var importer = checker.getSymbolAtLocation(declaration.name); // TODO: GH#18217
                     var imported = checker.getAliasedSymbol(importer);
                     return importer.escapedName !== imported.escapedName;
@@ -104477,7 +105447,7 @@ var ts;
         }
         function tryAddSingleDeclarationName(declaration, containers) {
             var name = ts.getNameOfDeclaration(declaration);
-            return !!name && (pushLiteral(name, containers) || name.kind === 149 /* ComputedPropertyName */ && tryAddComputedPropertyName(name.expression, containers));
+            return !!name && (pushLiteral(name, containers) || name.kind === 150 /* ComputedPropertyName */ && tryAddComputedPropertyName(name.expression, containers));
         }
         // Only added the names of computed properties if they're simple dotted expressions, like:
         //
@@ -104494,7 +105464,7 @@ var ts;
             // First, if we started with a computed property name, then add all but the last
             // portion into the container array.
             var name = ts.getNameOfDeclaration(declaration);
-            if (name && name.kind === 149 /* ComputedPropertyName */ && !tryAddComputedPropertyName(name.expression, containers)) {
+            if (name && name.kind === 150 /* ComputedPropertyName */ && !tryAddComputedPropertyName(name.expression, containers)) {
                 return ts.emptyArray;
             }
             // Don't include the last portion.
@@ -104663,7 +105633,7 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     // Get parameter properties, and treat them as being on the *same* level as the constructor, not under it.
                     var ctr = node;
                     addNodeWithRecursiveChild(ctr, ctr.body);
@@ -104675,21 +105645,21 @@ var ts;
                         }
                     }
                     break;
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 155 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 156 /* MethodSignature */:
                     if (!ts.hasDynamicName(node)) {
                         addNodeWithRecursiveChild(node, node.body);
                     }
                     break;
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
                     if (!ts.hasDynamicName(node)) {
                         addLeafNode(node);
                     }
                     break;
-                case 250 /* ImportClause */:
+                case 251 /* ImportClause */:
                     var importClause = node;
                     // Handle default import case e.g.:
                     //    import d from "mod";
@@ -104701,7 +105671,7 @@ var ts;
                     //    import {a, b as B} from "mod";
                     var namedBindings = importClause.namedBindings;
                     if (namedBindings) {
-                        if (namedBindings.kind === 251 /* NamespaceImport */) {
+                        if (namedBindings.kind === 252 /* NamespaceImport */) {
                             addLeafNode(namedBindings);
                         }
                         else {
@@ -104712,8 +105682,8 @@ var ts;
                         }
                     }
                     break;
-                case 186 /* BindingElement */:
-                case 237 /* VariableDeclaration */:
+                case 187 /* BindingElement */:
+                case 238 /* VariableDeclaration */:
                     var _d = node, name = _d.name, initializer = _d.initializer;
                     if (ts.isBindingPattern(name)) {
                         addChildrenRecursively(name);
@@ -104734,12 +105704,12 @@ var ts;
                         addNodeWithRecursiveChild(node, initializer);
                     }
                     break;
-                case 197 /* ArrowFunction */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
                     addNodeWithRecursiveChild(node, node.body);
                     break;
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     startNode(node);
                     for (var _e = 0, _f = node.members; _e < _f.length; _e++) {
                         var member = _f[_e];
@@ -104749,9 +105719,9 @@ var ts;
                     }
                     endNode();
                     break;
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 241 /* InterfaceDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 242 /* InterfaceDeclaration */:
                     startNode(node);
                     for (var _g = 0, _h = node.members; _g < _h.length; _g++) {
                         var member = _h[_g];
@@ -104759,18 +105729,18 @@ var ts;
                     }
                     endNode();
                     break;
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     addNodeWithRecursiveChild(node, getInteriorModule(node).body);
                     break;
-                case 257 /* ExportSpecifier */:
-                case 248 /* ImportEqualsDeclaration */:
-                case 162 /* IndexSignature */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 242 /* TypeAliasDeclaration */:
+                case 258 /* ExportSpecifier */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 163 /* IndexSignature */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 243 /* TypeAliasDeclaration */:
                     addLeafNode(node);
                     break;
-                case 204 /* BinaryExpression */: {
+                case 205 /* BinaryExpression */: {
                     var special = ts.getAssignmentDeclarationKind(node);
                     switch (special) {
                         case 1 /* ExportsProperty */:
@@ -104852,12 +105822,12 @@ var ts;
                 return false;
             }
             switch (a.kind) {
-                case 154 /* PropertyDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 155 /* PropertyDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                     return ts.hasModifier(a, 32 /* Static */) === ts.hasModifier(b, 32 /* Static */);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return areSameModule(a, b);
                 default:
                     return true;
@@ -104873,7 +105843,7 @@ var ts;
         // Only merge module nodes that have the same chain. Don't merge 'A.B.C' with 'A'!
         function areSameModule(a, b) {
             // TODO: GH#18217
-            return a.body.kind === b.body.kind && (a.body.kind !== 244 /* ModuleDeclaration */ || areSameModule(a.body, b.body));
+            return a.body.kind === b.body.kind && (a.body.kind !== 245 /* ModuleDeclaration */ || areSameModule(a.body, b.body));
         }
         /** Merge source into target. Source should be thrown away after this is called. */
         function merge(target, source) {
@@ -104903,7 +105873,7 @@ var ts;
          * So `new()` can still come before an `aardvark` method.
          */
         function tryGetName(node) {
-            if (node.kind === 244 /* ModuleDeclaration */) {
+            if (node.kind === 245 /* ModuleDeclaration */) {
                 return getModuleName(node);
             }
             var declName = ts.getNameOfDeclaration(node);
@@ -104911,16 +105881,16 @@ var ts;
                 return ts.unescapeLeadingUnderscores(ts.getPropertyNameForPropertyNameNode(declName)); // TODO: GH#18217
             }
             switch (node.kind) {
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 209 /* ClassExpression */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 210 /* ClassExpression */:
                     return getFunctionOrClassName(node);
                 default:
                     return undefined;
             }
         }
         function getItemName(node, name) {
-            if (node.kind === 244 /* ModuleDeclaration */) {
+            if (node.kind === 245 /* ModuleDeclaration */) {
                 return getModuleName(node);
             }
             if (name) {
@@ -104930,16 +105900,16 @@ var ts;
                 }
             }
             switch (node.kind) {
-                case 284 /* SourceFile */:
+                case 285 /* SourceFile */:
                     var sourceFile = node;
                     return ts.isExternalModule(sourceFile)
                         ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(sourceFile.fileName)))) + "\""
                         : "<global>";
-                case 197 /* ArrowFunction */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
+                case 198 /* ArrowFunction */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
                     if (ts.getModifierFlags(node) & 512 /* Default */) {
                         return "default";
                     }
@@ -104947,13 +105917,13 @@ var ts;
                     // (eg: "app\n.onactivated"), so we should remove the whitespace for readabiltiy in the
                     // navigation bar.
                     return getFunctionOrClassName(node);
-                case 157 /* Constructor */:
+                case 158 /* Constructor */:
                     return "constructor";
-                case 161 /* ConstructSignature */:
+                case 162 /* ConstructSignature */:
                     return "new()";
-                case 160 /* CallSignature */:
+                case 161 /* CallSignature */:
                     return "()";
-                case 162 /* IndexSignature */:
+                case 163 /* IndexSignature */:
                     return "[]";
                 default:
                     return "<unknown>";
@@ -104977,25 +105947,25 @@ var ts;
             return topLevel;
             function isTopLevel(item) {
                 switch (navigationBarNodeKind(item)) {
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 243 /* EnumDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 244 /* ModuleDeclaration */:
-                    case 284 /* SourceFile */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 309 /* JSDocTypedefTag */:
-                    case 302 /* JSDocCallbackTag */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 244 /* EnumDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 245 /* ModuleDeclaration */:
+                    case 285 /* SourceFile */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 310 /* JSDocTypedefTag */:
+                    case 303 /* JSDocCallbackTag */:
                         return true;
-                    case 157 /* Constructor */:
-                    case 156 /* MethodDeclaration */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 237 /* VariableDeclaration */:
+                    case 158 /* Constructor */:
+                    case 157 /* MethodDeclaration */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 238 /* VariableDeclaration */:
                         return hasSomeImportantChild(item);
-                    case 197 /* ArrowFunction */:
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
                         return isTopLevelFunctionDeclaration(item);
                     default:
                         return false;
@@ -105005,10 +105975,10 @@ var ts;
                         return false;
                     }
                     switch (navigationBarNodeKind(item.parent)) {
-                        case 245 /* ModuleBlock */:
-                        case 284 /* SourceFile */:
-                        case 156 /* MethodDeclaration */:
-                        case 157 /* Constructor */:
+                        case 246 /* ModuleBlock */:
+                        case 285 /* SourceFile */:
+                        case 157 /* MethodDeclaration */:
+                        case 158 /* Constructor */:
                             return true;
                         default:
                             return hasSomeImportantChild(item);
@@ -105017,7 +105987,7 @@ var ts;
                 function hasSomeImportantChild(item) {
                     return ts.some(item.children, function (child) {
                         var childKind = navigationBarNodeKind(child);
-                        return childKind !== 237 /* VariableDeclaration */ && childKind !== 186 /* BindingElement */;
+                        return childKind !== 238 /* VariableDeclaration */ && childKind !== 187 /* BindingElement */;
                     });
                 }
             }
@@ -105074,7 +106044,7 @@ var ts;
             // Otherwise, we need to aggregate each identifier to build up the qualified name.
             var result = [];
             result.push(ts.getTextOfIdentifierOrLiteral(moduleDeclaration.name));
-            while (moduleDeclaration.body && moduleDeclaration.body.kind === 244 /* ModuleDeclaration */) {
+            while (moduleDeclaration.body && moduleDeclaration.body.kind === 245 /* ModuleDeclaration */) {
                 moduleDeclaration = moduleDeclaration.body;
                 result.push(ts.getTextOfIdentifierOrLiteral(moduleDeclaration.name));
             }
@@ -105088,13 +106058,13 @@ var ts;
             return decl.body && ts.isModuleDeclaration(decl.body) ? getInteriorModule(decl.body) : decl;
         }
         function isComputedProperty(member) {
-            return !member.name || member.name.kind === 149 /* ComputedPropertyName */;
+            return !member.name || member.name.kind === 150 /* ComputedPropertyName */;
         }
         function getNodeSpan(node) {
-            return node.kind === 284 /* SourceFile */ ? ts.createTextSpanFromRange(node) : ts.createTextSpanFromNode(node, curSourceFile);
+            return node.kind === 285 /* SourceFile */ ? ts.createTextSpanFromRange(node) : ts.createTextSpanFromNode(node, curSourceFile);
         }
         function getModifiers(node) {
-            if (node.parent && node.parent.kind === 237 /* VariableDeclaration */) {
+            if (node.parent && node.parent.kind === 238 /* VariableDeclaration */) {
                 node = node.parent;
             }
             return ts.getNodeModifiers(node);
@@ -105109,7 +106079,7 @@ var ts;
                 return ts.declarationNameToString(parent.name);
             }
             // See if it is of the form "<expr> = function(){...}". If so, use the text from the left-hand side.
-            else if (ts.isBinaryExpression(parent) && parent.operatorToken.kind === 59 /* EqualsToken */) {
+            else if (ts.isBinaryExpression(parent) && parent.operatorToken.kind === 60 /* EqualsToken */) {
                 return nodeText(parent.left).replace(whiteSpaceRegex, "");
             }
             // See if it is a property assignment, and if so use the property name
@@ -105147,9 +106117,9 @@ var ts;
         }
         function isFunctionOrClassExpression(node) {
             switch (node.kind) {
-                case 197 /* ArrowFunction */:
-                case 196 /* FunctionExpression */:
-                case 209 /* ClassExpression */:
+                case 198 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
+                case 210 /* ClassExpression */:
                     return true;
                 default:
                     return false;
@@ -105476,7 +106446,7 @@ var ts;
                 }
                 var lastImport = current - 1;
                 if (lastImport !== firstImport) {
-                    out.push(createOutliningSpanFromBounds(ts.findChildOfKind(statements[firstImport], 92 /* ImportKeyword */, sourceFile).getStart(sourceFile), statements[lastImport].getEnd(), "imports" /* Imports */));
+                    out.push(createOutliningSpanFromBounds(ts.findChildOfKind(statements[firstImport], 93 /* ImportKeyword */, sourceFile).getStart(sourceFile), statements[lastImport].getEnd(), "imports" /* Imports */));
                 }
             }
             function visitNonImportNode(n) {
@@ -105593,31 +106563,31 @@ var ts;
         }
         function getOutliningSpanForNode(n, sourceFile) {
             switch (n.kind) {
-                case 218 /* Block */:
-                    if (ts.isFunctionBlock(n)) {
-                        return spanForNode(n.parent, /*autoCollapse*/ n.parent.kind !== 197 /* ArrowFunction */);
+                case 219 /* Block */:
+                    if (ts.isFunctionLike(n.parent)) {
+                        return functionSpan(n.parent, n, sourceFile);
                     }
                     // Check if the block is standalone, or 'attached' to some parent statement.
                     // If the latter, we want to collapse the block, but consider its hint span
                     // to be the entire span of the parent.
                     switch (n.parent.kind) {
-                        case 223 /* DoStatement */:
-                        case 226 /* ForInStatement */:
-                        case 227 /* ForOfStatement */:
-                        case 225 /* ForStatement */:
-                        case 222 /* IfStatement */:
-                        case 224 /* WhileStatement */:
-                        case 231 /* WithStatement */:
-                        case 274 /* CatchClause */:
+                        case 224 /* DoStatement */:
+                        case 227 /* ForInStatement */:
+                        case 228 /* ForOfStatement */:
+                        case 226 /* ForStatement */:
+                        case 223 /* IfStatement */:
+                        case 225 /* WhileStatement */:
+                        case 232 /* WithStatement */:
+                        case 275 /* CatchClause */:
                             return spanForNode(n.parent);
-                        case 235 /* TryStatement */:
+                        case 236 /* TryStatement */:
                             // Could be the try-block, or the finally-block.
                             var tryStatement = n.parent;
                             if (tryStatement.tryBlock === n) {
                                 return spanForNode(n.parent);
                             }
                             else if (tryStatement.finallyBlock === n) {
-                                return spanForNode(ts.findChildOfKind(tryStatement, 88 /* FinallyKeyword */, sourceFile));
+                                return spanForNode(ts.findChildOfKind(tryStatement, 89 /* FinallyKeyword */, sourceFile));
                             }
                         // falls through
                         default:
@@ -105625,22 +106595,22 @@ var ts;
                             // the span of the block, independent of any parent span.
                             return createOutliningSpan(ts.createTextSpanFromNode(n, sourceFile), "code" /* Code */);
                     }
-                case 245 /* ModuleBlock */:
+                case 246 /* ModuleBlock */:
                     return spanForNode(n.parent);
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 246 /* CaseBlock */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 247 /* CaseBlock */:
                     return spanForNode(n);
-                case 188 /* ObjectLiteralExpression */:
+                case 189 /* ObjectLiteralExpression */:
                     return spanForObjectOrArrayLiteral(n);
-                case 187 /* ArrayLiteralExpression */:
+                case 188 /* ArrayLiteralExpression */:
                     return spanForObjectOrArrayLiteral(n, 22 /* OpenBracketToken */);
-                case 260 /* JsxElement */:
+                case 261 /* JsxElement */:
                     return spanForJSXElement(n);
-                case 261 /* JsxSelfClosingElement */:
-                case 262 /* JsxOpeningElement */:
+                case 262 /* JsxSelfClosingElement */:
+                case 263 /* JsxOpeningElement */:
                     return spanForJSXAttributes(n.attributes);
             }
             function spanForJSXElement(node) {
@@ -105662,20 +106632,29 @@ var ts;
                 // Otherwise, the collapsed section will include the end of the previous line.
                 return spanForNode(node, /*autoCollapse*/ false, /*useFullStart*/ !ts.isArrayLiteralExpression(node.parent) && !ts.isCallExpression(node.parent), open);
             }
-            function spanForNode(hintSpanNode, autoCollapse, useFullStart, open) {
+            function spanForNode(hintSpanNode, autoCollapse, useFullStart, open, close) {
                 if (autoCollapse === void 0) { autoCollapse = false; }
                 if (useFullStart === void 0) { useFullStart = true; }
                 if (open === void 0) { open = 18 /* OpenBraceToken */; }
+                if (close === void 0) { close = open === 18 /* OpenBraceToken */ ? 19 /* CloseBraceToken */ : 23 /* CloseBracketToken */; }
                 var openToken = ts.findChildOfKind(n, open, sourceFile);
-                var close = open === 18 /* OpenBraceToken */ ? 19 /* CloseBraceToken */ : 23 /* CloseBracketToken */;
                 var closeToken = ts.findChildOfKind(n, close, sourceFile);
-                if (!openToken || !closeToken) {
-                    return undefined;
-                }
-                var textSpan = ts.createTextSpanFromBounds(useFullStart ? openToken.getFullStart() : openToken.getStart(sourceFile), closeToken.getEnd());
-                return createOutliningSpan(textSpan, "code" /* Code */, ts.createTextSpanFromNode(hintSpanNode, sourceFile), autoCollapse);
+                return openToken && closeToken && spanBetweenTokens(openToken, closeToken, hintSpanNode, sourceFile, autoCollapse, useFullStart);
             }
         }
+        function functionSpan(node, body, sourceFile) {
+            var openToken = ts.isNodeArrayMultiLine(node.parameters, sourceFile)
+                ? ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile)
+                : ts.findChildOfKind(body, 18 /* OpenBraceToken */, sourceFile);
+            var closeToken = ts.findChildOfKind(body, 19 /* CloseBraceToken */, sourceFile);
+            return openToken && closeToken && spanBetweenTokens(openToken, closeToken, node, sourceFile, /*autoCollapse*/ node.kind !== 198 /* ArrowFunction */);
+        }
+        function spanBetweenTokens(openToken, closeToken, hintSpanNode, sourceFile, autoCollapse, useFullStart) {
+            if (autoCollapse === void 0) { autoCollapse = false; }
+            if (useFullStart === void 0) { useFullStart = true; }
+            var textSpan = ts.createTextSpanFromBounds(useFullStart ? openToken.getFullStart() : openToken.getStart(sourceFile), closeToken.getEnd());
+            return createOutliningSpan(textSpan, "code" /* Code */, ts.createTextSpanFromNode(hintSpanNode, sourceFile), autoCollapse);
+        }
         function createOutliningSpan(textSpan, kind, hintSpan, autoCollapse, bannerText) {
             if (hintSpan === void 0) { hintSpan = textSpan; }
             if (autoCollapse === void 0) { autoCollapse = false; }
@@ -105938,7 +106917,7 @@ var ts;
         if (ch >= 65 /* A */ && ch <= 90 /* Z */) {
             return true;
         }
-        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 7 /* Latest */)) {
+        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 8 /* Latest */)) {
             return false;
         }
         // TODO: find a way to determine this for any unicode characters in a
@@ -105951,7 +106930,7 @@ var ts;
         if (ch >= 97 /* a */ && ch <= 122 /* z */) {
             return true;
         }
-        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 7 /* Latest */)) {
+        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 8 /* Latest */)) {
             return false;
         }
         // TODO: find a way to determine this for any unicode characters in a
@@ -106203,10 +107182,10 @@ var ts;
          */
         function tryConsumeDeclare() {
             var token = ts.scanner.getToken();
-            if (token === 125 /* DeclareKeyword */) {
+            if (token === 126 /* DeclareKeyword */) {
                 // declare module "mod"
                 token = nextToken();
-                if (token === 130 /* ModuleKeyword */) {
+                if (token === 131 /* ModuleKeyword */) {
                     token = nextToken();
                     if (token === 10 /* StringLiteral */) {
                         recordAmbientExternalModule();
@@ -106224,7 +107203,7 @@ var ts;
                 return false;
             }
             var token = ts.scanner.getToken();
-            if (token === 92 /* ImportKeyword */) {
+            if (token === 93 /* ImportKeyword */) {
                 token = nextToken();
                 if (token === 20 /* OpenParenToken */) {
                     token = nextToken();
@@ -106240,9 +107219,9 @@ var ts;
                     return true;
                 }
                 else {
-                    if (token === 72 /* Identifier */ || ts.isKeyword(token)) {
+                    if (token === 73 /* Identifier */ || ts.isKeyword(token)) {
                         token = nextToken();
-                        if (token === 144 /* FromKeyword */) {
+                        if (token === 145 /* FromKeyword */) {
                             token = nextToken();
                             if (token === 10 /* StringLiteral */) {
                                 // import d from "mod";
@@ -106250,7 +107229,7 @@ var ts;
                                 return true;
                             }
                         }
-                        else if (token === 59 /* EqualsToken */) {
+                        else if (token === 60 /* EqualsToken */) {
                             if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) {
                                 return true;
                             }
@@ -106273,7 +107252,7 @@ var ts;
                         }
                         if (token === 19 /* CloseBraceToken */) {
                             token = nextToken();
-                            if (token === 144 /* FromKeyword */) {
+                            if (token === 145 /* FromKeyword */) {
                                 token = nextToken();
                                 if (token === 10 /* StringLiteral */) {
                                     // import {a as A} from "mod";
@@ -106285,11 +107264,11 @@ var ts;
                     }
                     else if (token === 40 /* AsteriskToken */) {
                         token = nextToken();
-                        if (token === 119 /* AsKeyword */) {
+                        if (token === 120 /* AsKeyword */) {
                             token = nextToken();
-                            if (token === 72 /* Identifier */ || ts.isKeyword(token)) {
+                            if (token === 73 /* Identifier */ || ts.isKeyword(token)) {
                                 token = nextToken();
-                                if (token === 144 /* FromKeyword */) {
+                                if (token === 145 /* FromKeyword */) {
                                     token = nextToken();
                                     if (token === 10 /* StringLiteral */) {
                                         // import * as NS from "mod"
@@ -106307,7 +107286,7 @@ var ts;
         }
         function tryConsumeExport() {
             var token = ts.scanner.getToken();
-            if (token === 85 /* ExportKeyword */) {
+            if (token === 86 /* ExportKeyword */) {
                 markAsExternalModuleIfTopLevel();
                 token = nextToken();
                 if (token === 18 /* OpenBraceToken */) {
@@ -106319,7 +107298,7 @@ var ts;
                     }
                     if (token === 19 /* CloseBraceToken */) {
                         token = nextToken();
-                        if (token === 144 /* FromKeyword */) {
+                        if (token === 145 /* FromKeyword */) {
                             token = nextToken();
                             if (token === 10 /* StringLiteral */) {
                                 // export {a as A} from "mod";
@@ -106331,7 +107310,7 @@ var ts;
                 }
                 else if (token === 40 /* AsteriskToken */) {
                     token = nextToken();
-                    if (token === 144 /* FromKeyword */) {
+                    if (token === 145 /* FromKeyword */) {
                         token = nextToken();
                         if (token === 10 /* StringLiteral */) {
                             // export * from "mod"
@@ -106339,11 +107318,11 @@ var ts;
                         }
                     }
                 }
-                else if (token === 92 /* ImportKeyword */) {
+                else if (token === 93 /* ImportKeyword */) {
                     token = nextToken();
-                    if (token === 72 /* Identifier */ || ts.isKeyword(token)) {
+                    if (token === 73 /* Identifier */ || ts.isKeyword(token)) {
                         token = nextToken();
-                        if (token === 59 /* EqualsToken */) {
+                        if (token === 60 /* EqualsToken */) {
                             if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) {
                                 return true;
                             }
@@ -106356,7 +107335,7 @@ var ts;
         }
         function tryConsumeRequireCall(skipCurrentToken) {
             var token = skipCurrentToken ? nextToken() : ts.scanner.getToken();
-            if (token === 134 /* RequireKeyword */) {
+            if (token === 135 /* RequireKeyword */) {
                 token = nextToken();
                 if (token === 20 /* OpenParenToken */) {
                     token = nextToken();
@@ -106371,7 +107350,7 @@ var ts;
         }
         function tryConsumeDefine() {
             var token = ts.scanner.getToken();
-            if (token === 72 /* Identifier */ && ts.scanner.getTokenValue() === "define") {
+            if (token === 73 /* Identifier */ && ts.scanner.getTokenValue() === "define") {
                 token = nextToken();
                 if (token !== 20 /* OpenParenToken */) {
                     return true;
@@ -106505,14 +107484,14 @@ var ts;
                 return getRenameInfoError(ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library);
             }
             // Cannot rename `default` as in `import { default as foo } from "./someModule";
-            if (ts.isIdentifier(node) && node.originalKeywordKind === 80 /* DefaultKeyword */ && symbol.parent.flags & 1536 /* Module */) {
+            if (ts.isIdentifier(node) && node.originalKeywordKind === 81 /* DefaultKeyword */ && symbol.parent.flags & 1536 /* Module */) {
                 return undefined;
             }
             if (ts.isStringLiteralLike(node) && ts.tryGetImportFromModuleSpecifier(node)) {
                 return options && options.allowRenameOfImportPath ? getRenameInfoForModule(node, sourceFile, symbol) : undefined;
             }
             var kind = ts.SymbolDisplay.getSymbolKind(typeChecker, symbol, node);
-            var specifierName = (ts.isImportOrExportSpecifierName(node) || ts.isStringOrNumericLiteralLike(node) && node.parent.kind === 149 /* ComputedPropertyName */)
+            var specifierName = (ts.isImportOrExportSpecifierName(node) || ts.isStringOrNumericLiteralLike(node) && node.parent.kind === 150 /* ComputedPropertyName */)
                 ? ts.stripQuotes(ts.getTextOfIdentifierOrLiteral(node))
                 : undefined;
             var displayName = specifierName || typeChecker.symbolToString(symbol);
@@ -106568,9 +107547,9 @@ var ts;
         }
         function nodeIsEligibleForRename(node) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                 case 10 /* StringLiteral */:
-                case 100 /* ThisKeyword */:
+                case 101 /* ThisKeyword */:
                     return true;
                 case 8 /* NumericLiteral */:
                     return ts.isLiteralNameOfPropertyDeclarationOrIndexAccess(node);
@@ -106582,6 +107561,275 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var SmartSelectionRange;
+    (function (SmartSelectionRange) {
+        function getSmartSelectionRange(pos, sourceFile) {
+            var selectionRange = {
+                textSpan: ts.createTextSpanFromBounds(sourceFile.getFullStart(), sourceFile.getEnd())
+            };
+            var parentNode = sourceFile;
+            outer: while (true) {
+                var children = getSelectionChildren(parentNode);
+                if (!children.length)
+                    break;
+                for (var i = 0; i < children.length; i++) {
+                    var prevNode = children[i - 1];
+                    var node = children[i];
+                    var nextNode = children[i + 1];
+                    if (node.getStart(sourceFile) > pos) {
+                        break outer;
+                    }
+                    if (positionShouldSnapToNode(pos, node, nextNode)) {
+                        // 1. Blocks are effectively redundant with SyntaxLists.
+                        // 2. TemplateSpans, along with the SyntaxLists containing them, are a somewhat unintuitive grouping
+                        //    of things that should be considered independently.
+                        // 3. A VariableStatement’s children are just a VaraiableDeclarationList and a semicolon.
+                        // 4. A lone VariableDeclaration in a VaraibleDeclaration feels redundant with the VariableStatement.
+                        //
+                        // Dive in without pushing a selection range.
+                        if (ts.isBlock(node)
+                            || ts.isTemplateSpan(node) || ts.isTemplateHead(node)
+                            || prevNode && ts.isTemplateHead(prevNode)
+                            || ts.isVariableDeclarationList(node) && ts.isVariableStatement(parentNode)
+                            || ts.isSyntaxList(node) && ts.isVariableDeclarationList(parentNode)
+                            || ts.isVariableDeclaration(node) && ts.isSyntaxList(parentNode) && children.length === 1) {
+                            parentNode = node;
+                            break;
+                        }
+                        // Synthesize a stop for '${ ... }' since '${' and '}' actually belong to siblings.
+                        if (ts.isTemplateSpan(parentNode) && nextNode && ts.isTemplateMiddleOrTemplateTail(nextNode)) {
+                            var start_2 = node.getFullStart() - "${".length;
+                            var end_2 = nextNode.getStart() + "}".length;
+                            pushSelectionRange(start_2, end_2);
+                        }
+                        // Blocks with braces, brackets, parens, or JSX tags on separate lines should be
+                        // selected from open to close, including whitespace but not including the braces/etc. themselves.
+                        var isBetweenMultiLineBookends = ts.isSyntaxList(node)
+                            && isListOpener(prevNode)
+                            && isListCloser(nextNode)
+                            && !ts.positionsAreOnSameLine(prevNode.getStart(), nextNode.getStart(), sourceFile);
+                        var jsDocCommentStart = ts.hasJSDocNodes(node) && node.jsDoc[0].getStart();
+                        var start = isBetweenMultiLineBookends ? prevNode.getEnd() : node.getStart();
+                        var end = isBetweenMultiLineBookends ? nextNode.getStart() : node.getEnd();
+                        if (ts.isNumber(jsDocCommentStart)) {
+                            pushSelectionRange(jsDocCommentStart, end);
+                        }
+                        pushSelectionRange(start, end);
+                        // String literals should have a stop both inside and outside their quotes.
+                        if (ts.isStringLiteral(node) || ts.isTemplateLiteral(node)) {
+                            pushSelectionRange(start + 1, end - 1);
+                        }
+                        parentNode = node;
+                        break;
+                    }
+                }
+            }
+            return selectionRange;
+            function pushSelectionRange(start, end) {
+                // Skip empty ranges
+                if (start !== end) {
+                    // Skip ranges that are identical to the parent
+                    var textSpan = ts.createTextSpanFromBounds(start, end);
+                    if (!selectionRange || !ts.textSpansEqual(textSpan, selectionRange.textSpan)) {
+                        selectionRange = __assign({ textSpan: textSpan }, selectionRange && { parent: selectionRange });
+                    }
+                }
+            }
+        }
+        SmartSelectionRange.getSmartSelectionRange = getSmartSelectionRange;
+        /**
+         * Like `ts.positionBelongsToNode`, except positions immediately after nodes
+         * count too, unless that position belongs to the next node. In effect, makes
+         * selections able to snap to preceding tokens when the cursor is on the tail
+         * end of them with only whitespace ahead.
+         * @param pos The position to check.
+         * @param node The candidate node to snap to.
+         * @param nextNode The next sibling node in the tree.
+         * @param sourceFile The source file containing the nodes.
+         */
+        function positionShouldSnapToNode(pos, node, nextNode) {
+            // Can’t use 'ts.positionBelongsToNode()' here because it cleverly accounts
+            // for missing nodes, which can’t really be considered when deciding what
+            // to select.
+            ts.Debug.assert(node.pos <= pos);
+            if (pos < node.end) {
+                return true;
+            }
+            var nodeEnd = node.getEnd();
+            var nextNodeStart = nextNode && nextNode.getStart();
+            if (nodeEnd === pos) {
+                return pos !== nextNodeStart;
+            }
+            return false;
+        }
+        var isImport = ts.or(ts.isImportDeclaration, ts.isImportEqualsDeclaration);
+        /**
+         * Gets the children of a node to be considered for selection ranging,
+         * transforming them into an artificial tree according to their intuitive
+         * grouping where no grouping actually exists in the parse tree. For example,
+         * top-level imports are grouped into their own SyntaxList so they can be
+         * selected all together, even though in the AST they’re just siblings of each
+         * other as well as of other top-level statements and declarations.
+         */
+        function getSelectionChildren(node) {
+            // Group top-level imports
+            if (ts.isSourceFile(node)) {
+                return groupChildren(node.getChildAt(0).getChildren(), isImport);
+            }
+            // Mapped types _look_ like ObjectTypes with a single member,
+            // but in fact don’t contain a SyntaxList or a node containing
+            // the “key/value” pair like ObjectTypes do, but it seems intuitive
+            // that the selection would snap to those points. The philosophy
+            // of choosing a selection range is not so much about what the
+            // syntax currently _is_ as what the syntax might easily become
+            // if the user is making a selection; e.g., we synthesize a selection
+            // around the “key/value” pair not because there’s a node there, but
+            // because it allows the mapped type to become an object type with a
+            // few keystrokes.
+            if (ts.isMappedTypeNode(node)) {
+                var _a = node.getChildren(), openBraceToken = _a[0], children = _a.slice(1);
+                var closeBraceToken = ts.Debug.assertDefined(children.pop());
+                ts.Debug.assertEqual(openBraceToken.kind, 18 /* OpenBraceToken */);
+                ts.Debug.assertEqual(closeBraceToken.kind, 19 /* CloseBraceToken */);
+                // Group `-/+readonly` and `-/+?`
+                var groupedWithPlusMinusTokens = groupChildren(children, function (child) {
+                    return child === node.readonlyToken || child.kind === 134 /* ReadonlyKeyword */ ||
+                        child === node.questionToken || child.kind === 56 /* QuestionToken */;
+                });
+                // Group type parameter with surrounding brackets
+                var groupedWithBrackets = groupChildren(groupedWithPlusMinusTokens, function (_a) {
+                    var kind = _a.kind;
+                    return kind === 22 /* OpenBracketToken */ ||
+                        kind === 151 /* TypeParameter */ ||
+                        kind === 23 /* CloseBracketToken */;
+                });
+                return [
+                    openBraceToken,
+                    // Pivot on `:`
+                    createSyntaxList(splitChildren(groupedWithBrackets, function (_a) {
+                        var kind = _a.kind;
+                        return kind === 57 /* ColonToken */;
+                    })),
+                    closeBraceToken,
+                ];
+            }
+            // Group modifiers and property name, then pivot on `:`.
+            if (ts.isPropertySignature(node)) {
+                var children = groupChildren(node.getChildren(), function (child) {
+                    return child === node.name || ts.contains(node.modifiers, child);
+                });
+                return splitChildren(children, function (_a) {
+                    var kind = _a.kind;
+                    return kind === 57 /* ColonToken */;
+                });
+            }
+            // Group the parameter name with its `...`, then that group with its `?`, then pivot on `=`.
+            if (ts.isParameter(node)) {
+                var groupedDotDotDotAndName_1 = groupChildren(node.getChildren(), function (child) {
+                    return child === node.dotDotDotToken || child === node.name;
+                });
+                var groupedWithQuestionToken = groupChildren(groupedDotDotDotAndName_1, function (child) {
+                    return child === groupedDotDotDotAndName_1[0] || child === node.questionToken;
+                });
+                return splitChildren(groupedWithQuestionToken, function (_a) {
+                    var kind = _a.kind;
+                    return kind === 60 /* EqualsToken */;
+                });
+            }
+            // Pivot on '='
+            if (ts.isBindingElement(node)) {
+                return splitChildren(node.getChildren(), function (_a) {
+                    var kind = _a.kind;
+                    return kind === 60 /* EqualsToken */;
+                });
+            }
+            return node.getChildren();
+        }
+        /**
+         * Groups sibling nodes together into their own SyntaxList if they
+         * a) are adjacent, AND b) match a predicate function.
+         */
+        function groupChildren(children, groupOn) {
+            var result = [];
+            var group;
+            for (var _i = 0, children_1 = children; _i < children_1.length; _i++) {
+                var child = children_1[_i];
+                if (groupOn(child)) {
+                    group = group || [];
+                    group.push(child);
+                }
+                else {
+                    if (group) {
+                        result.push(createSyntaxList(group));
+                        group = undefined;
+                    }
+                    result.push(child);
+                }
+            }
+            if (group) {
+                result.push(createSyntaxList(group));
+            }
+            return result;
+        }
+        /**
+         * Splits sibling nodes into up to four partitions:
+         * 1) everything left of the first node matched by `pivotOn`,
+         * 2) the first node matched by `pivotOn`,
+         * 3) everything right of the first node matched by `pivotOn`,
+         * 4) a trailing semicolon, if `separateTrailingSemicolon` is enabled.
+         * The left and right groups, if not empty, will each be grouped into their own containing SyntaxList.
+         * @param children The sibling nodes to split.
+         * @param pivotOn The predicate function to match the node to be the pivot. The first node that matches
+         * the predicate will be used; any others that may match will be included into the right-hand group.
+         * @param separateTrailingSemicolon If the last token is a semicolon, it will be returned as a separate
+         * child rather than be included in the right-hand group.
+         */
+        function splitChildren(children, pivotOn, separateTrailingSemicolon) {
+            if (separateTrailingSemicolon === void 0) { separateTrailingSemicolon = true; }
+            if (children.length < 2) {
+                return children;
+            }
+            var splitTokenIndex = ts.findIndex(children, pivotOn);
+            if (splitTokenIndex === -1) {
+                return children;
+            }
+            var leftChildren = children.slice(0, splitTokenIndex);
+            var splitToken = children[splitTokenIndex];
+            var lastToken = ts.last(children);
+            var separateLastToken = separateTrailingSemicolon && lastToken.kind === 26 /* SemicolonToken */;
+            var rightChildren = children.slice(splitTokenIndex + 1, separateLastToken ? children.length - 1 : undefined);
+            var result = ts.compact([
+                leftChildren.length ? createSyntaxList(leftChildren) : undefined,
+                splitToken,
+                rightChildren.length ? createSyntaxList(rightChildren) : undefined,
+            ]);
+            return separateLastToken ? result.concat(lastToken) : result;
+        }
+        function createSyntaxList(children) {
+            ts.Debug.assertGreaterThanOrEqual(children.length, 1);
+            var syntaxList = ts.createNode(312 /* SyntaxList */, children[0].pos, ts.last(children).end);
+            syntaxList._children = children;
+            return syntaxList;
+        }
+        function isListOpener(token) {
+            var kind = token && token.kind;
+            return kind === 18 /* OpenBraceToken */
+                || kind === 22 /* OpenBracketToken */
+                || kind === 20 /* OpenParenToken */
+                || kind === 263 /* JsxOpeningElement */;
+        }
+        function isListCloser(token) {
+            var kind = token && token.kind;
+            return kind === 19 /* CloseBraceToken */
+                || kind === 23 /* CloseBracketToken */
+                || kind === 21 /* CloseParenToken */
+                || kind === 264 /* JsxClosingElement */;
+        }
+    })(SmartSelectionRange = ts.SmartSelectionRange || (ts.SmartSelectionRange = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var SignatureHelp;
     (function (SignatureHelp) {
@@ -106693,8 +107941,21 @@ var ts;
             });
         }
         function containsPrecedingToken(startingToken, sourceFile, container) {
-            var precedingToken = ts.Debug.assertDefined(ts.findPrecedingToken(startingToken.getFullStart(), sourceFile, startingToken.parent, /*excludeJsdoc*/ true));
-            return ts.rangeContainsRange(container, precedingToken);
+            var pos = startingToken.getFullStart();
+            // There’s a possibility that `startingToken.parent` contains only `startingToken` and
+            // missing nodes, none of which are valid to be returned by `findPrecedingToken`. In that
+            // case, the preceding token we want is actually higher up the tree—almost definitely the
+            // next parent, but theoretically the situation with missing nodes might be happening on
+            // multiple nested levels.
+            var currentParent = startingToken.parent;
+            while (currentParent) {
+                var precedingToken = ts.findPrecedingToken(pos, sourceFile, currentParent, /*excludeJsdoc*/ true);
+                if (precedingToken) {
+                    return ts.rangeContainsRange(container, precedingToken);
+                }
+                currentParent = currentParent.parent;
+            }
+            return ts.Debug.fail("Could not find preceding token");
         }
         function getArgumentInfoForCompletions(node, position, sourceFile) {
             var info = getImmediatelyContainingArgumentInfo(node, position, sourceFile);
@@ -106768,10 +108029,10 @@ var ts;
                 }
                 return undefined;
             }
-            else if (ts.isTemplateHead(node) && parent.parent.kind === 193 /* TaggedTemplateExpression */) {
+            else if (ts.isTemplateHead(node) && parent.parent.kind === 194 /* TaggedTemplateExpression */) {
                 var templateExpression = parent;
                 var tagExpression = templateExpression.parent;
-                ts.Debug.assert(templateExpression.kind === 206 /* TemplateExpression */);
+                ts.Debug.assert(templateExpression.kind === 207 /* TemplateExpression */);
                 var argumentIndex = ts.isInsideTemplateLiteral(node, position, sourceFile) ? 0 : 1;
                 return getArgumentListInfoForTemplate(tagExpression, argumentIndex, sourceFile);
             }
@@ -106838,17 +108099,17 @@ var ts;
                 return undefined;
             var parent = startingToken.parent;
             switch (parent.kind) {
-                case 195 /* ParenthesizedExpression */:
-                case 156 /* MethodDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
+                case 196 /* ParenthesizedExpression */:
+                case 157 /* MethodDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
                     var info = getArgumentOrParameterListInfo(startingToken, sourceFile);
                     if (!info)
                         return undefined;
                     var argumentIndex = info.argumentIndex, argumentCount = info.argumentCount, argumentsSpan = info.argumentsSpan;
                     var contextualType = ts.isMethodDeclaration(parent) ? checker.getContextualTypeForObjectLiteralElement(parent) : checker.getContextualType(parent);
                     return contextualType && { contextualType: contextualType, argumentIndex: argumentIndex, argumentCount: argumentCount, argumentsSpan: argumentsSpan };
-                case 204 /* BinaryExpression */: {
+                case 205 /* BinaryExpression */: {
                     var highestBinary = getHighestBinary(parent);
                     var contextualType_1 = checker.getContextualType(highestBinary);
                     var argumentIndex_1 = startingToken.kind === 20 /* OpenParenToken */ ? 0 : countBinaryExpressionParameters(parent) - 1;
@@ -106972,7 +108233,7 @@ var ts;
             //       |       |
             // This is because a Missing node has no width. However, what we actually want is to include trivia
             // leading up to the next token in case the user is about to type in a TemplateMiddle or TemplateTail.
-            if (template.kind === 206 /* TemplateExpression */) {
+            if (template.kind === 207 /* TemplateExpression */) {
                 var lastSpan = ts.last(template.templateSpans);
                 if (lastSpan.literal.getFullWidth() === 0) {
                     applicableSpanEnd = ts.skipTrivia(sourceFile.text, applicableSpanEnd, /*stopAfterLineBreak*/ false);
@@ -106984,7 +108245,7 @@ var ts;
             var _loop_7 = function (n) {
                 // If the node is not a subspan of its parent, this is a big problem.
                 // There have been crashes that might be caused by this violation.
-                ts.Debug.assert(ts.rangeContainsRange(n.parent, n), "Not a subspan", function () { return "Child: " + ts.Debug.showSyntaxKind(n) + ", parent: " + ts.Debug.showSyntaxKind(n.parent); });
+                ts.Debug.assert(ts.rangeContainsRange(n.parent, n), "Not a subspan", function () { return "Child: " + ts.Debug.formatSyntaxKind(n.kind) + ", parent: " + ts.Debug.formatSyntaxKind(n.parent.kind); });
                 var argumentInfo = getImmediatelyContainingArgumentOrContextualParameterInfo(n, position, sourceFile, checker);
                 if (argumentInfo) {
                     return { value: argumentInfo };
@@ -107284,7 +108545,7 @@ var ts;
         function check(node) {
             if (isJsFile) {
                 switch (node.kind) {
-                    case 196 /* FunctionExpression */:
+                    case 197 /* FunctionExpression */:
                         var decl = ts.getDeclarationOfExpando(node);
                         if (decl) {
                             var symbol_1 = decl.symbol;
@@ -107294,7 +108555,7 @@ var ts;
                             }
                         }
                     // falls through if no diagnostic was created
-                    case 239 /* FunctionDeclaration */:
+                    case 240 /* FunctionDeclaration */:
                         var symbol = node.symbol;
                         if (symbol.members && (symbol.members.size > 0)) {
                             diags.push(ts.createDiagnosticForNode(ts.isVariableDeclaration(node.parent) ? node.parent.name : node, ts.Diagnostics.This_constructor_function_may_be_converted_to_a_class_declaration));
@@ -107327,11 +108588,11 @@ var ts;
     function containsTopLevelCommonjs(sourceFile) {
         return sourceFile.statements.some(function (statement) {
             switch (statement.kind) {
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return statement.declarationList.declarations.some(function (decl) {
                         return !!decl.initializer && ts.isRequireCall(propertyAccessLeftHandSide(decl.initializer), /*checkArgumentIsStringLiteralLike*/ true);
                     });
-                case 221 /* ExpressionStatement */: {
+                case 222 /* ExpressionStatement */: {
                     var expression = statement.expression;
                     if (!ts.isBinaryExpression(expression))
                         return ts.isRequireCall(expression, /*checkArgumentIsStringLiteralLike*/ true);
@@ -107348,12 +108609,12 @@ var ts;
     }
     function importNameForConvertToDefaultImport(node) {
         switch (node.kind) {
-            case 249 /* ImportDeclaration */:
+            case 250 /* ImportDeclaration */:
                 var importClause = node.importClause, moduleSpecifier = node.moduleSpecifier;
-                return importClause && !importClause.name && importClause.namedBindings && importClause.namedBindings.kind === 251 /* NamespaceImport */ && ts.isStringLiteral(moduleSpecifier)
+                return importClause && !importClause.name && importClause.namedBindings && importClause.namedBindings.kind === 252 /* NamespaceImport */ && ts.isStringLiteral(moduleSpecifier)
                     ? importClause.namedBindings.name
                     : undefined;
-            case 248 /* ImportEqualsDeclaration */:
+            case 249 /* ImportEqualsDeclaration */:
                 return node.name;
             default:
                 return undefined;
@@ -107411,13 +108672,13 @@ var ts;
     // should be kept up to date with getTransformationBody in convertToAsyncFunction.ts
     function isFixablePromiseArgument(arg) {
         switch (arg.kind) {
-            case 239 /* FunctionDeclaration */:
-            case 196 /* FunctionExpression */:
-            case 197 /* ArrowFunction */:
+            case 240 /* FunctionDeclaration */:
+            case 197 /* FunctionExpression */:
+            case 198 /* ArrowFunction */:
                 visitedNestedConvertibleFunctions.set(getKeyFromNode(arg), true);
             /* falls through */
-            case 96 /* NullKeyword */:
-            case 72 /* Identifier */: // identifier includes undefined
+            case 97 /* NullKeyword */:
+            case 73 /* Identifier */: // identifier includes undefined
                 return true;
             default:
                 return false;
@@ -107440,7 +108701,7 @@ var ts;
             }
             var flags = ts.getCombinedLocalAndExportSymbolFlags(symbol);
             if (flags & 32 /* Class */) {
-                return ts.getDeclarationOfKind(symbol, 209 /* ClassExpression */) ?
+                return ts.getDeclarationOfKind(symbol, 210 /* ClassExpression */) ?
                     "local class" /* localClassElement */ : "class" /* classElement */;
             }
             if (flags & 384 /* Enum */)
@@ -107477,7 +108738,7 @@ var ts;
             if (typeChecker.isArgumentsSymbol(symbol)) {
                 return "local var" /* localVariableElement */;
             }
-            if (location.kind === 100 /* ThisKeyword */ && ts.isExpression(location)) {
+            if (location.kind === 101 /* ThisKeyword */ && ts.isExpression(location)) {
                 return "parameter" /* parameterElement */;
             }
             var flags = ts.getCombinedLocalAndExportSymbolFlags(symbol);
@@ -107528,11 +108789,11 @@ var ts;
                 // If we requested completions after `x.` at the top-level, we may be at a source file location.
                 switch (location.parent && location.parent.kind) {
                     // If we've typed a character of the attribute name, will be 'JsxAttribute', else will be 'JsxOpeningElement'.
-                    case 262 /* JsxOpeningElement */:
-                    case 260 /* JsxElement */:
-                    case 261 /* JsxSelfClosingElement */:
-                        return location.kind === 72 /* Identifier */ ? "property" /* memberVariableElement */ : "JSX attribute" /* jsxAttribute */;
-                    case 267 /* JsxAttribute */:
+                    case 263 /* JsxOpeningElement */:
+                    case 261 /* JsxElement */:
+                    case 262 /* JsxSelfClosingElement */:
+                        return location.kind === 73 /* Identifier */ ? "property" /* memberVariableElement */ : "JSX attribute" /* jsxAttribute */;
+                    case 268 /* JsxAttribute */:
                         return "JSX attribute" /* jsxAttribute */;
                     default:
                         return "property" /* memberVariableElement */;
@@ -107559,13 +108820,13 @@ var ts;
             var symbolFlags = ts.getCombinedLocalAndExportSymbolFlags(symbol);
             var symbolKind = semanticMeaning & 1 /* Value */ ? getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(typeChecker, symbol, location) : "" /* unknown */;
             var hasAddedSymbolInfo = false;
-            var isThisExpression = location.kind === 100 /* ThisKeyword */ && ts.isInExpressionContext(location);
+            var isThisExpression = location.kind === 101 /* ThisKeyword */ && ts.isInExpressionContext(location);
             var type;
             var printer;
             var documentationFromAlias;
             var tagsFromAlias;
-            if (location.kind === 100 /* ThisKeyword */ && !isThisExpression) {
-                return { displayParts: [ts.keywordPart(100 /* ThisKeyword */)], documentation: [], symbolKind: "primitive type" /* primitiveType */, tags: undefined };
+            if (location.kind === 101 /* ThisKeyword */ && !isThisExpression) {
+                return { displayParts: [ts.keywordPart(101 /* ThisKeyword */)], documentation: [], symbolKind: "primitive type" /* primitiveType */, tags: undefined };
             }
             // Class at constructor site need to be shown as constructor apart from property,method, vars
             if (symbolKind !== "" /* unknown */ || symbolFlags & 32 /* Class */ || symbolFlags & 2097152 /* Alias */) {
@@ -107575,7 +108836,7 @@ var ts;
                 }
                 var signature = void 0;
                 type = isThisExpression ? typeChecker.getTypeAtLocation(location) : typeChecker.getTypeOfSymbolAtLocation(symbol.exportSymbol || symbol, location);
-                if (location.parent && location.parent.kind === 189 /* PropertyAccessExpression */) {
+                if (location.parent && location.parent.kind === 190 /* PropertyAccessExpression */) {
                     var right = location.parent.name;
                     // Either the location is on the right of a property access, or on the left and the right is missing
                     if (right === location || (right && right.getFullWidth() === 0)) {
@@ -107594,9 +108855,8 @@ var ts;
                     callExpressionLike = location.parent;
                 }
                 if (callExpressionLike) {
-                    var candidateSignatures = [];
-                    signature = typeChecker.getResolvedSignature(callExpressionLike, candidateSignatures); // TODO: GH#18217
-                    var useConstructSignatures = callExpressionLike.kind === 192 /* NewExpression */ || (ts.isCallExpression(callExpressionLike) && callExpressionLike.expression.kind === 98 /* SuperKeyword */);
+                    signature = typeChecker.getResolvedSignature(callExpressionLike); // TODO: GH#18217
+                    var useConstructSignatures = callExpressionLike.kind === 193 /* NewExpression */ || (ts.isCallExpression(callExpressionLike) && callExpressionLike.expression.kind === 99 /* SuperKeyword */);
                     var allSignatures = useConstructSignatures ? type.getConstructSignatures() : type.getCallSignatures();
                     if (!ts.contains(allSignatures, signature.target) && !ts.contains(allSignatures, signature)) {
                         // Get the first signature if there is one -- allSignatures may contain
@@ -107614,7 +108874,7 @@ var ts;
                             pushSymbolKind(symbolKind);
                             displayParts.push(ts.spacePart());
                             if (useConstructSignatures) {
-                                displayParts.push(ts.keywordPart(95 /* NewKeyword */));
+                                displayParts.push(ts.keywordPart(96 /* NewKeyword */));
                                 displayParts.push(ts.spacePart());
                             }
                             addFullSymbolName(symbol);
@@ -107638,7 +108898,7 @@ var ts;
                                     displayParts.push(ts.lineBreakPart());
                                 }
                                 if (useConstructSignatures) {
-                                    displayParts.push(ts.keywordPart(95 /* NewKeyword */));
+                                    displayParts.push(ts.keywordPart(96 /* NewKeyword */));
                                     displayParts.push(ts.spacePart());
                                 }
                                 addSignatureDisplayParts(signature, allSignatures, 262144 /* WriteArrowStyleSignature */);
@@ -107651,29 +108911,29 @@ var ts;
                     }
                 }
                 else if ((ts.isNameOfFunctionDeclaration(location) && !(symbolFlags & 98304 /* Accessor */)) || // name of function declaration
-                    (location.kind === 124 /* ConstructorKeyword */ && location.parent.kind === 157 /* Constructor */)) { // At constructor keyword of constructor declaration
+                    (location.kind === 125 /* ConstructorKeyword */ && location.parent.kind === 158 /* Constructor */)) { // At constructor keyword of constructor declaration
                     // get the signature from the declaration and write it
                     var functionDeclaration_1 = location.parent;
                     // Use function declaration to write the signatures only if the symbol corresponding to this declaration
                     var locationIsSymbolDeclaration = ts.find(symbol.declarations, function (declaration) {
-                        return declaration === (location.kind === 124 /* ConstructorKeyword */ ? functionDeclaration_1.parent : functionDeclaration_1);
+                        return declaration === (location.kind === 125 /* ConstructorKeyword */ ? functionDeclaration_1.parent : functionDeclaration_1);
                     });
                     if (locationIsSymbolDeclaration) {
-                        var allSignatures = functionDeclaration_1.kind === 157 /* Constructor */ ? type.getNonNullableType().getConstructSignatures() : type.getNonNullableType().getCallSignatures();
+                        var allSignatures = functionDeclaration_1.kind === 158 /* Constructor */ ? type.getNonNullableType().getConstructSignatures() : type.getNonNullableType().getCallSignatures();
                         if (!typeChecker.isImplementationOfOverload(functionDeclaration_1)) {
                             signature = typeChecker.getSignatureFromDeclaration(functionDeclaration_1); // TODO: GH#18217
                         }
                         else {
                             signature = allSignatures[0];
                         }
-                        if (functionDeclaration_1.kind === 157 /* Constructor */) {
+                        if (functionDeclaration_1.kind === 158 /* Constructor */) {
                             // show (constructor) Type(...) signature
                             symbolKind = "constructor" /* constructorImplementationElement */;
                             addPrefixForAnyFunctionOrVar(type.symbol, symbolKind);
                         }
                         else {
                             // (function/method) symbol(..signature)
-                            addPrefixForAnyFunctionOrVar(functionDeclaration_1.kind === 160 /* CallSignature */ &&
+                            addPrefixForAnyFunctionOrVar(functionDeclaration_1.kind === 161 /* CallSignature */ &&
                                 !(type.symbol.flags & 2048 /* TypeLiteral */ || type.symbol.flags & 4096 /* ObjectLiteral */) ? type.symbol : symbol, symbolKind);
                         }
                         addSignatureDisplayParts(signature, allSignatures);
@@ -107683,7 +108943,7 @@ var ts;
             }
             if (symbolFlags & 32 /* Class */ && !hasAddedSymbolInfo && !isThisExpression) {
                 addAliasPrefixIfNecessary();
-                if (ts.getDeclarationOfKind(symbol, 209 /* ClassExpression */)) {
+                if (ts.getDeclarationOfKind(symbol, 210 /* ClassExpression */)) {
                     // Special case for class expressions because we would like to indicate that
                     // the class name is local to the class body (similar to function expression)
                     //      (local class) class <className>
@@ -107691,7 +108951,7 @@ var ts;
                 }
                 else {
                     // Class declaration has name which is not local.
-                    displayParts.push(ts.keywordPart(76 /* ClassKeyword */));
+                    displayParts.push(ts.keywordPart(77 /* ClassKeyword */));
                 }
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
@@ -107699,37 +108959,37 @@ var ts;
             }
             if ((symbolFlags & 64 /* Interface */) && (semanticMeaning & 2 /* Type */)) {
                 prefixNextMeaning();
-                displayParts.push(ts.keywordPart(110 /* InterfaceKeyword */));
+                displayParts.push(ts.keywordPart(111 /* InterfaceKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 writeTypeParametersOfSymbol(symbol, sourceFile);
             }
             if ((symbolFlags & 524288 /* TypeAlias */) && (semanticMeaning & 2 /* Type */)) {
                 prefixNextMeaning();
-                displayParts.push(ts.keywordPart(140 /* TypeKeyword */));
+                displayParts.push(ts.keywordPart(141 /* TypeKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 writeTypeParametersOfSymbol(symbol, sourceFile);
                 displayParts.push(ts.spacePart());
-                displayParts.push(ts.operatorPart(59 /* EqualsToken */));
+                displayParts.push(ts.operatorPart(60 /* EqualsToken */));
                 displayParts.push(ts.spacePart());
                 ts.addRange(displayParts, ts.typeToDisplayParts(typeChecker, typeChecker.getDeclaredTypeOfSymbol(symbol), enclosingDeclaration, 8388608 /* InTypeAlias */));
             }
             if (symbolFlags & 384 /* Enum */) {
                 prefixNextMeaning();
                 if (ts.some(symbol.declarations, function (d) { return ts.isEnumDeclaration(d) && ts.isEnumConst(d); })) {
-                    displayParts.push(ts.keywordPart(77 /* ConstKeyword */));
+                    displayParts.push(ts.keywordPart(78 /* ConstKeyword */));
                     displayParts.push(ts.spacePart());
                 }
-                displayParts.push(ts.keywordPart(84 /* EnumKeyword */));
+                displayParts.push(ts.keywordPart(85 /* EnumKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
             }
             if (symbolFlags & 1536 /* Module */ && !isThisExpression) {
                 prefixNextMeaning();
-                var declaration = ts.getDeclarationOfKind(symbol, 244 /* ModuleDeclaration */);
-                var isNamespace = declaration && declaration.name && declaration.name.kind === 72 /* Identifier */;
-                displayParts.push(ts.keywordPart(isNamespace ? 131 /* NamespaceKeyword */ : 130 /* ModuleKeyword */));
+                var declaration = ts.getDeclarationOfKind(symbol, 245 /* ModuleDeclaration */);
+                var isNamespace = declaration && declaration.name && declaration.name.kind === 73 /* Identifier */;
+                displayParts.push(ts.keywordPart(isNamespace ? 132 /* NamespaceKeyword */ : 131 /* ModuleKeyword */));
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
             }
@@ -107748,7 +109008,7 @@ var ts;
                 }
                 else {
                     // Method/function type parameter
-                    var decl = ts.getDeclarationOfKind(symbol, 150 /* TypeParameter */);
+                    var decl = ts.getDeclarationOfKind(symbol, 151 /* TypeParameter */);
                     if (decl === undefined)
                         return ts.Debug.fail();
                     var declaration = decl.parent;
@@ -107756,21 +109016,21 @@ var ts;
                         if (ts.isFunctionLikeKind(declaration.kind)) {
                             addInPrefix();
                             var signature = typeChecker.getSignatureFromDeclaration(declaration); // TODO: GH#18217
-                            if (declaration.kind === 161 /* ConstructSignature */) {
-                                displayParts.push(ts.keywordPart(95 /* NewKeyword */));
+                            if (declaration.kind === 162 /* ConstructSignature */) {
+                                displayParts.push(ts.keywordPart(96 /* NewKeyword */));
                                 displayParts.push(ts.spacePart());
                             }
-                            else if (declaration.kind !== 160 /* CallSignature */ && declaration.name) {
+                            else if (declaration.kind !== 161 /* CallSignature */ && declaration.name) {
                                 addFullSymbolName(declaration.symbol);
                             }
                             ts.addRange(displayParts, ts.signatureToDisplayParts(typeChecker, signature, sourceFile, 32 /* WriteTypeArgumentsOfSignature */));
                         }
-                        else if (declaration.kind === 242 /* TypeAliasDeclaration */) {
+                        else if (declaration.kind === 243 /* TypeAliasDeclaration */) {
                             // Type alias type parameter
                             // For example
                             //      type list<T> = T[]; // Both T will go through same code path
                             addInPrefix();
-                            displayParts.push(ts.keywordPart(140 /* TypeKeyword */));
+                            displayParts.push(ts.keywordPart(141 /* TypeKeyword */));
                             displayParts.push(ts.spacePart());
                             addFullSymbolName(declaration.symbol);
                             writeTypeParametersOfSymbol(declaration.symbol, sourceFile);
@@ -107782,11 +109042,11 @@ var ts;
                 symbolKind = "enum member" /* enumMemberElement */;
                 addPrefixForAnyFunctionOrVar(symbol, "enum member");
                 var declaration = symbol.declarations[0];
-                if (declaration.kind === 278 /* EnumMember */) {
+                if (declaration.kind === 279 /* EnumMember */) {
                     var constantValue = typeChecker.getConstantValue(declaration);
                     if (constantValue !== undefined) {
                         displayParts.push(ts.spacePart());
-                        displayParts.push(ts.operatorPart(59 /* EqualsToken */));
+                        displayParts.push(ts.operatorPart(60 /* EqualsToken */));
                         displayParts.push(ts.spacePart());
                         displayParts.push(ts.displayPart(ts.getTextOfConstantValue(constantValue), typeof constantValue === "number" ? ts.SymbolDisplayPartKind.numericLiteral : ts.SymbolDisplayPartKind.stringLiteral));
                     }
@@ -107812,32 +109072,32 @@ var ts;
                     }
                 }
                 switch (symbol.declarations[0].kind) {
-                    case 247 /* NamespaceExportDeclaration */:
-                        displayParts.push(ts.keywordPart(85 /* ExportKeyword */));
+                    case 248 /* NamespaceExportDeclaration */:
+                        displayParts.push(ts.keywordPart(86 /* ExportKeyword */));
                         displayParts.push(ts.spacePart());
-                        displayParts.push(ts.keywordPart(131 /* NamespaceKeyword */));
+                        displayParts.push(ts.keywordPart(132 /* NamespaceKeyword */));
                         break;
-                    case 254 /* ExportAssignment */:
-                        displayParts.push(ts.keywordPart(85 /* ExportKeyword */));
+                    case 255 /* ExportAssignment */:
+                        displayParts.push(ts.keywordPart(86 /* ExportKeyword */));
                         displayParts.push(ts.spacePart());
-                        displayParts.push(ts.keywordPart(symbol.declarations[0].isExportEquals ? 59 /* EqualsToken */ : 80 /* DefaultKeyword */));
+                        displayParts.push(ts.keywordPart(symbol.declarations[0].isExportEquals ? 60 /* EqualsToken */ : 81 /* DefaultKeyword */));
                         break;
-                    case 257 /* ExportSpecifier */:
-                        displayParts.push(ts.keywordPart(85 /* ExportKeyword */));
+                    case 258 /* ExportSpecifier */:
+                        displayParts.push(ts.keywordPart(86 /* ExportKeyword */));
                         break;
                     default:
-                        displayParts.push(ts.keywordPart(92 /* ImportKeyword */));
+                        displayParts.push(ts.keywordPart(93 /* ImportKeyword */));
                 }
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 ts.forEach(symbol.declarations, function (declaration) {
-                    if (declaration.kind === 248 /* ImportEqualsDeclaration */) {
+                    if (declaration.kind === 249 /* ImportEqualsDeclaration */) {
                         var importEqualsDeclaration = declaration;
                         if (ts.isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) {
                             displayParts.push(ts.spacePart());
-                            displayParts.push(ts.operatorPart(59 /* EqualsToken */));
+                            displayParts.push(ts.operatorPart(60 /* EqualsToken */));
                             displayParts.push(ts.spacePart());
-                            displayParts.push(ts.keywordPart(134 /* RequireKeyword */));
+                            displayParts.push(ts.keywordPart(135 /* RequireKeyword */));
                             displayParts.push(ts.punctuationPart(20 /* OpenParenToken */));
                             displayParts.push(ts.displayPart(ts.getTextOfNode(ts.getExternalModuleImportEqualsDeclarationExpression(importEqualsDeclaration)), ts.SymbolDisplayPartKind.stringLiteral));
                             displayParts.push(ts.punctuationPart(21 /* CloseParenToken */));
@@ -107846,7 +109106,7 @@ var ts;
                             var internalAliasSymbol = typeChecker.getSymbolAtLocation(importEqualsDeclaration.moduleReference);
                             if (internalAliasSymbol) {
                                 displayParts.push(ts.spacePart());
-                                displayParts.push(ts.operatorPart(59 /* EqualsToken */));
+                                displayParts.push(ts.operatorPart(60 /* EqualsToken */));
                                 displayParts.push(ts.spacePart());
                                 addFullSymbolName(internalAliasSymbol, enclosingDeclaration);
                             }
@@ -107860,7 +109120,7 @@ var ts;
                     if (type) {
                         if (isThisExpression) {
                             prefixNextMeaning();
-                            displayParts.push(ts.keywordPart(100 /* ThisKeyword */));
+                            displayParts.push(ts.keywordPart(101 /* ThisKeyword */));
                         }
                         else {
                             addPrefixForAnyFunctionOrVar(symbol, symbolKind);
@@ -107909,10 +109169,10 @@ var ts;
                     // For some special property access expressions like `exports.foo = foo` or `module.exports.foo = foo`
                     // there documentation comments might be attached to the right hand side symbol of their declarations.
                     // The pattern of such special property access is that the parent symbol is the symbol of the file.
-                    if (symbol.parent && ts.forEach(symbol.parent.declarations, function (declaration) { return declaration.kind === 284 /* SourceFile */; })) {
+                    if (symbol.parent && ts.forEach(symbol.parent.declarations, function (declaration) { return declaration.kind === 285 /* SourceFile */; })) {
                         for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                             var declaration = _a[_i];
-                            if (!declaration.parent || declaration.parent.kind !== 204 /* BinaryExpression */) {
+                            if (!declaration.parent || declaration.parent.kind !== 205 /* BinaryExpression */) {
                                 continue;
                             }
                             var rhsSymbol = typeChecker.getSymbolAtLocation(declaration.parent.right);
@@ -107955,7 +109215,7 @@ var ts;
             }
             function addInPrefix() {
                 displayParts.push(ts.spacePart());
-                displayParts.push(ts.keywordPart(93 /* InKeyword */));
+                displayParts.push(ts.keywordPart(94 /* InKeyword */));
                 displayParts.push(ts.spacePart());
             }
             function addFullSymbolName(symbolToDisplay, enclosingDeclaration) {
@@ -108025,16 +109285,16 @@ var ts;
             }
             return ts.forEach(symbol.declarations, function (declaration) {
                 // Function expressions are local
-                if (declaration.kind === 196 /* FunctionExpression */) {
+                if (declaration.kind === 197 /* FunctionExpression */) {
                     return true;
                 }
-                if (declaration.kind !== 237 /* VariableDeclaration */ && declaration.kind !== 239 /* FunctionDeclaration */) {
+                if (declaration.kind !== 238 /* VariableDeclaration */ && declaration.kind !== 240 /* FunctionDeclaration */) {
                     return false;
                 }
                 // If the parent is not sourceFile or module block it is local variable
                 for (var parent = declaration.parent; !ts.isFunctionBlock(parent); parent = parent.parent) {
                     // Reached source file or module block
-                    if (parent.kind === 284 /* SourceFile */ || parent.kind === 245 /* ModuleBlock */) {
+                    if (parent.kind === 285 /* SourceFile */ || parent.kind === 246 /* ModuleBlock */) {
                         return false;
                     }
                 }
@@ -108263,8 +109523,8 @@ var ts;
 (function (ts) {
     var formatting;
     (function (formatting) {
-        var standardScanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false, 0 /* Standard */);
-        var jsxScanner = ts.createScanner(7 /* Latest */, /*skipTrivia*/ false, 1 /* JSX */);
+        var standardScanner = ts.createScanner(8 /* Latest */, /*skipTrivia*/ false, 0 /* Standard */);
+        var jsxScanner = ts.createScanner(8 /* Latest */, /*skipTrivia*/ false, 1 /* JSX */);
         var ScanAction;
         (function (ScanAction) {
             ScanAction[ScanAction["Scan"] = 0] = "Scan";
@@ -108328,8 +109588,8 @@ var ts;
             function shouldRescanGreaterThanToken(node) {
                 switch (node.kind) {
                     case 32 /* GreaterThanEqualsToken */:
-                    case 67 /* GreaterThanGreaterThanEqualsToken */:
-                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanEqualsToken */:
+                    case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
                     case 48 /* GreaterThanGreaterThanGreaterThanToken */:
                     case 47 /* GreaterThanGreaterThanToken */:
                         return true;
@@ -108339,12 +109599,12 @@ var ts;
             function shouldRescanJsxIdentifier(node) {
                 if (node.parent) {
                     switch (node.parent.kind) {
-                        case 267 /* JsxAttribute */:
-                        case 262 /* JsxOpeningElement */:
-                        case 263 /* JsxClosingElement */:
-                        case 261 /* JsxSelfClosingElement */:
+                        case 268 /* JsxAttribute */:
+                        case 263 /* JsxOpeningElement */:
+                        case 264 /* JsxClosingElement */:
+                        case 262 /* JsxSelfClosingElement */:
                             // May parse an identifier like `module-layout`; that will be scanned as a keyword at first, but we should parse the whole thing to get an identifier.
-                            return ts.isKeyword(node.kind) || node.kind === 72 /* Identifier */;
+                            return ts.isKeyword(node.kind) || node.kind === 73 /* Identifier */;
                     }
                 }
                 return false;
@@ -108360,7 +109620,7 @@ var ts;
                     container.kind === 17 /* TemplateTail */;
             }
             function startsWithSlashToken(t) {
-                return t === 42 /* SlashToken */ || t === 64 /* SlashEqualsToken */;
+                return t === 42 /* SlashToken */ || t === 65 /* SlashEqualsToken */;
             }
             function readTokenInfo(n) {
                 ts.Debug.assert(isOnToken());
@@ -108519,7 +109779,7 @@ var ts;
     (function (formatting) {
         function getAllRules() {
             var allTokens = [];
-            for (var token = 0 /* FirstToken */; token <= 147 /* LastToken */; token++) {
+            for (var token = 0 /* FirstToken */; token <= 148 /* LastToken */; token++) {
                 allTokens.push(token);
             }
             function anyTokenExcept() {
@@ -108531,27 +109791,27 @@ var ts;
             }
             var anyToken = { tokens: allTokens, isSpecific: false };
             var anyTokenIncludingMultilineComments = tokenRangeFrom(allTokens.concat([3 /* MultiLineCommentTrivia */]));
-            var keywords = tokenRangeFromRange(73 /* FirstKeyword */, 147 /* LastKeyword */);
-            var binaryOperators = tokenRangeFromRange(28 /* FirstBinaryOperator */, 71 /* LastBinaryOperator */);
-            var binaryKeywordOperators = [93 /* InKeyword */, 94 /* InstanceOfKeyword */, 147 /* OfKeyword */, 119 /* AsKeyword */, 128 /* IsKeyword */];
+            var keywords = tokenRangeFromRange(74 /* FirstKeyword */, 148 /* LastKeyword */);
+            var binaryOperators = tokenRangeFromRange(28 /* FirstBinaryOperator */, 72 /* LastBinaryOperator */);
+            var binaryKeywordOperators = [94 /* InKeyword */, 95 /* InstanceOfKeyword */, 148 /* OfKeyword */, 120 /* AsKeyword */, 129 /* IsKeyword */];
             var unaryPrefixOperators = [44 /* PlusPlusToken */, 45 /* MinusMinusToken */, 53 /* TildeToken */, 52 /* ExclamationToken */];
             var unaryPrefixExpressions = [
-                8 /* NumericLiteral */, 9 /* BigIntLiteral */, 72 /* Identifier */, 20 /* OpenParenToken */,
-                22 /* OpenBracketToken */, 18 /* OpenBraceToken */, 100 /* ThisKeyword */, 95 /* NewKeyword */
+                8 /* NumericLiteral */, 9 /* BigIntLiteral */, 73 /* Identifier */, 20 /* OpenParenToken */,
+                22 /* OpenBracketToken */, 18 /* OpenBraceToken */, 101 /* ThisKeyword */, 96 /* NewKeyword */
             ];
-            var unaryPreincrementExpressions = [72 /* Identifier */, 20 /* OpenParenToken */, 100 /* ThisKeyword */, 95 /* NewKeyword */];
-            var unaryPostincrementExpressions = [72 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 95 /* NewKeyword */];
-            var unaryPredecrementExpressions = [72 /* Identifier */, 20 /* OpenParenToken */, 100 /* ThisKeyword */, 95 /* NewKeyword */];
-            var unaryPostdecrementExpressions = [72 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 95 /* NewKeyword */];
+            var unaryPreincrementExpressions = [73 /* Identifier */, 20 /* OpenParenToken */, 101 /* ThisKeyword */, 96 /* NewKeyword */];
+            var unaryPostincrementExpressions = [73 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 96 /* NewKeyword */];
+            var unaryPredecrementExpressions = [73 /* Identifier */, 20 /* OpenParenToken */, 101 /* ThisKeyword */, 96 /* NewKeyword */];
+            var unaryPostdecrementExpressions = [73 /* Identifier */, 21 /* CloseParenToken */, 23 /* CloseBracketToken */, 96 /* NewKeyword */];
             var comments = [2 /* SingleLineCommentTrivia */, 3 /* MultiLineCommentTrivia */];
-            var typeNames = [72 /* Identifier */].concat(ts.typeKeywords);
+            var typeNames = [73 /* Identifier */].concat(ts.typeKeywords);
             // Place a space before open brace in a function declaration
             // TypeScript: Function can have return types, which can be made of tons of different token kinds
             var functionOpenBraceLeftTokenRange = anyTokenIncludingMultilineComments;
             // Place a space before open brace in a TypeScript declaration that has braces as children (class, module, enum, etc)
-            var typeScriptOpenBraceLeftTokenRange = tokenRangeFrom([72 /* Identifier */, 3 /* MultiLineCommentTrivia */, 76 /* ClassKeyword */, 85 /* ExportKeyword */, 92 /* ImportKeyword */]);
+            var typeScriptOpenBraceLeftTokenRange = tokenRangeFrom([73 /* Identifier */, 3 /* MultiLineCommentTrivia */, 77 /* ClassKeyword */, 86 /* ExportKeyword */, 93 /* ImportKeyword */]);
             // Place a space before open brace in a control flow construct
-            var controlOpenBraceLeftTokenRange = tokenRangeFrom([21 /* CloseParenToken */, 3 /* MultiLineCommentTrivia */, 82 /* DoKeyword */, 103 /* TryKeyword */, 88 /* FinallyKeyword */, 83 /* ElseKeyword */]);
+            var controlOpenBraceLeftTokenRange = tokenRangeFrom([21 /* CloseParenToken */, 3 /* MultiLineCommentTrivia */, 83 /* DoKeyword */, 104 /* TryKeyword */, 89 /* FinallyKeyword */, 84 /* ElseKeyword */]);
             // These rules are higher in priority than user-configurable
             var highPriorityCommonRules = [
                 // Leave comments alone
@@ -108566,7 +109826,7 @@ var ts;
                 rule("NoSpaceAfterQuestionMark", 56 /* QuestionToken */, anyToken, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("NoSpaceBeforeDot", anyToken, 24 /* DotToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("NoSpaceAfterDot", 24 /* DotToken */, anyToken, [isNonJsxSameLineTokenContext], 8 /* Delete */),
-                rule("NoSpaceBetweenImportParenInImportType", 92 /* ImportKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isImportTypeContext], 8 /* Delete */),
+                rule("NoSpaceBetweenImportParenInImportType", 93 /* ImportKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isImportTypeContext], 8 /* Delete */),
                 // Special handling of unary operators.
                 // Prefix operators generally shouldn't have a space between
                 // them and their target unary expression.
@@ -108593,79 +109853,79 @@ var ts;
                 rule("SpaceAfterCloseBrace", 19 /* CloseBraceToken */, anyTokenExcept(21 /* CloseParenToken */), [isNonJsxSameLineTokenContext, isAfterCodeBlockContext], 2 /* Space */),
                 // Special case for (}, else) and (}, while) since else & while tokens are not part of the tree which makes SpaceAfterCloseBrace rule not applied
                 // Also should not apply to })
-                rule("SpaceBetweenCloseBraceAndElse", 19 /* CloseBraceToken */, 83 /* ElseKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("SpaceBetweenCloseBraceAndWhile", 19 /* CloseBraceToken */, 107 /* WhileKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenCloseBraceAndElse", 19 /* CloseBraceToken */, 84 /* ElseKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenCloseBraceAndWhile", 19 /* CloseBraceToken */, 108 /* WhileKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("NoSpaceBetweenEmptyBraceBrackets", 18 /* OpenBraceToken */, 19 /* CloseBraceToken */, [isNonJsxSameLineTokenContext, isObjectContext], 8 /* Delete */),
                 // Add a space after control dec context if the next character is an open bracket ex: 'if (false)[a, b] = [1, 2];' -> 'if (false) [a, b] = [1, 2];'
                 rule("SpaceAfterConditionalClosingParen", 21 /* CloseParenToken */, 22 /* OpenBracketToken */, [isControlDeclContext], 2 /* Space */),
-                rule("NoSpaceBetweenFunctionKeywordAndStar", 90 /* FunctionKeyword */, 40 /* AsteriskToken */, [isFunctionDeclarationOrFunctionExpressionContext], 8 /* Delete */),
-                rule("SpaceAfterStarInGeneratorDeclaration", 40 /* AsteriskToken */, [72 /* Identifier */, 20 /* OpenParenToken */], [isFunctionDeclarationOrFunctionExpressionContext], 2 /* Space */),
-                rule("SpaceAfterFunctionInFuncDecl", 90 /* FunctionKeyword */, anyToken, [isFunctionDeclContext], 2 /* Space */),
+                rule("NoSpaceBetweenFunctionKeywordAndStar", 91 /* FunctionKeyword */, 40 /* AsteriskToken */, [isFunctionDeclarationOrFunctionExpressionContext], 8 /* Delete */),
+                rule("SpaceAfterStarInGeneratorDeclaration", 40 /* AsteriskToken */, 73 /* Identifier */, [isFunctionDeclarationOrFunctionExpressionContext], 2 /* Space */),
+                rule("SpaceAfterFunctionInFuncDecl", 91 /* FunctionKeyword */, anyToken, [isFunctionDeclContext], 2 /* Space */),
                 // Insert new line after { and before } in multi-line contexts.
                 rule("NewLineAfterOpenBraceInBlockContext", 18 /* OpenBraceToken */, anyToken, [isMultilineBlockContext], 4 /* NewLine */),
                 // For get/set members, we check for (identifier,identifier) since get/set don't have tokens and they are represented as just an identifier token.
                 // Though, we do extra check on the context to make sure we are dealing with get/set node. Example:
                 //      get x() {}
                 //      set x(val) {}
-                rule("SpaceAfterGetSetInMember", [126 /* GetKeyword */, 137 /* SetKeyword */], 72 /* Identifier */, [isFunctionDeclContext], 2 /* Space */),
-                rule("NoSpaceBetweenYieldKeywordAndStar", 117 /* YieldKeyword */, 40 /* AsteriskToken */, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 8 /* Delete */),
-                rule("SpaceBetweenYieldOrYieldStarAndOperand", [117 /* YieldKeyword */, 40 /* AsteriskToken */], anyToken, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 2 /* Space */),
-                rule("NoSpaceBetweenReturnAndSemicolon", 97 /* ReturnKeyword */, 26 /* SemicolonToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
-                rule("SpaceAfterCertainKeywords", [105 /* VarKeyword */, 101 /* ThrowKeyword */, 95 /* NewKeyword */, 81 /* DeleteKeyword */, 97 /* ReturnKeyword */, 104 /* TypeOfKeyword */, 122 /* AwaitKeyword */], anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("SpaceAfterLetConstInVariableDeclaration", [111 /* LetKeyword */, 77 /* ConstKeyword */], anyToken, [isNonJsxSameLineTokenContext, isStartOfVariableDeclarationList], 2 /* Space */),
+                rule("SpaceAfterGetSetInMember", [127 /* GetKeyword */, 138 /* SetKeyword */], 73 /* Identifier */, [isFunctionDeclContext], 2 /* Space */),
+                rule("NoSpaceBetweenYieldKeywordAndStar", 118 /* YieldKeyword */, 40 /* AsteriskToken */, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 8 /* Delete */),
+                rule("SpaceBetweenYieldOrYieldStarAndOperand", [118 /* YieldKeyword */, 40 /* AsteriskToken */], anyToken, [isNonJsxSameLineTokenContext, isYieldOrYieldStarWithOperand], 2 /* Space */),
+                rule("NoSpaceBetweenReturnAndSemicolon", 98 /* ReturnKeyword */, 26 /* SemicolonToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("SpaceAfterCertainKeywords", [106 /* VarKeyword */, 102 /* ThrowKeyword */, 96 /* NewKeyword */, 82 /* DeleteKeyword */, 98 /* ReturnKeyword */, 105 /* TypeOfKeyword */, 123 /* AwaitKeyword */], anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceAfterLetConstInVariableDeclaration", [112 /* LetKeyword */, 78 /* ConstKeyword */], anyToken, [isNonJsxSameLineTokenContext, isStartOfVariableDeclarationList], 2 /* Space */),
                 rule("NoSpaceBeforeOpenParenInFuncCall", anyToken, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isFunctionCallOrNewContext, isPreviousTokenNotComma], 8 /* Delete */),
                 // Special case for binary operators (that are keywords). For these we have to add a space and shouldn't follow any user options.
                 rule("SpaceBeforeBinaryKeywordOperator", anyToken, binaryKeywordOperators, [isNonJsxSameLineTokenContext, isBinaryOpContext], 2 /* Space */),
                 rule("SpaceAfterBinaryKeywordOperator", binaryKeywordOperators, anyToken, [isNonJsxSameLineTokenContext, isBinaryOpContext], 2 /* Space */),
-                rule("SpaceAfterVoidOperator", 106 /* VoidKeyword */, anyToken, [isNonJsxSameLineTokenContext, isVoidOpContext], 2 /* Space */),
+                rule("SpaceAfterVoidOperator", 107 /* VoidKeyword */, anyToken, [isNonJsxSameLineTokenContext, isVoidOpContext], 2 /* Space */),
                 // Async-await
-                rule("SpaceBetweenAsyncAndOpenParen", 121 /* AsyncKeyword */, 20 /* OpenParenToken */, [isArrowFunctionContext, isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("SpaceBetweenAsyncAndFunctionKeyword", 121 /* AsyncKeyword */, 90 /* FunctionKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenAsyncAndOpenParen", 122 /* AsyncKeyword */, 20 /* OpenParenToken */, [isArrowFunctionContext, isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenAsyncAndFunctionKeyword", 122 /* AsyncKeyword */, 91 /* FunctionKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Template string
-                rule("NoSpaceBetweenTagAndTemplateString", [72 /* Identifier */, 21 /* CloseParenToken */], [14 /* NoSubstitutionTemplateLiteral */, 15 /* TemplateHead */], [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceBetweenTagAndTemplateString", [73 /* Identifier */, 21 /* CloseParenToken */], [14 /* NoSubstitutionTemplateLiteral */, 15 /* TemplateHead */], [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // JSX opening elements
-                rule("SpaceBeforeJsxAttribute", anyToken, 72 /* Identifier */, [isNextTokenParentJsxAttribute, isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBeforeJsxAttribute", anyToken, 73 /* Identifier */, [isNextTokenParentJsxAttribute, isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("SpaceBeforeSlashInJsxOpeningElement", anyToken, 42 /* SlashToken */, [isJsxSelfClosingElementContext, isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("NoSpaceBeforeGreaterThanTokenInJsxOpeningElement", 42 /* SlashToken */, 30 /* GreaterThanToken */, [isJsxSelfClosingElementContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
-                rule("NoSpaceBeforeEqualInJsxAttribute", anyToken, 59 /* EqualsToken */, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
-                rule("NoSpaceAfterEqualInJsxAttribute", 59 /* EqualsToken */, anyToken, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceBeforeEqualInJsxAttribute", anyToken, 60 /* EqualsToken */, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceAfterEqualInJsxAttribute", 60 /* EqualsToken */, anyToken, [isJsxAttributeContext, isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // TypeScript-specific rules
                 // Use of module as a function call. e.g.: import m2 = module("m2");
-                rule("NoSpaceAfterModuleImport", [130 /* ModuleKeyword */, 134 /* RequireKeyword */], 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceAfterModuleImport", [131 /* ModuleKeyword */, 135 /* RequireKeyword */], 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // Add a space around certain TypeScript keywords
                 rule("SpaceAfterCertainTypeScriptKeywords", [
-                    118 /* AbstractKeyword */,
-                    76 /* ClassKeyword */,
-                    125 /* DeclareKeyword */,
-                    80 /* DefaultKeyword */,
-                    84 /* EnumKeyword */,
-                    85 /* ExportKeyword */,
-                    86 /* ExtendsKeyword */,
-                    126 /* GetKeyword */,
-                    109 /* ImplementsKeyword */,
-                    92 /* ImportKeyword */,
-                    110 /* InterfaceKeyword */,
-                    130 /* ModuleKeyword */,
-                    131 /* NamespaceKeyword */,
-                    113 /* PrivateKeyword */,
-                    115 /* PublicKeyword */,
-                    114 /* ProtectedKeyword */,
-                    133 /* ReadonlyKeyword */,
-                    137 /* SetKeyword */,
-                    116 /* StaticKeyword */,
-                    140 /* TypeKeyword */,
-                    144 /* FromKeyword */,
-                    129 /* KeyOfKeyword */,
-                    127 /* InferKeyword */,
+                    119 /* AbstractKeyword */,
+                    77 /* ClassKeyword */,
+                    126 /* DeclareKeyword */,
+                    81 /* DefaultKeyword */,
+                    85 /* EnumKeyword */,
+                    86 /* ExportKeyword */,
+                    87 /* ExtendsKeyword */,
+                    127 /* GetKeyword */,
+                    110 /* ImplementsKeyword */,
+                    93 /* ImportKeyword */,
+                    111 /* InterfaceKeyword */,
+                    131 /* ModuleKeyword */,
+                    132 /* NamespaceKeyword */,
+                    114 /* PrivateKeyword */,
+                    116 /* PublicKeyword */,
+                    115 /* ProtectedKeyword */,
+                    134 /* ReadonlyKeyword */,
+                    138 /* SetKeyword */,
+                    117 /* StaticKeyword */,
+                    141 /* TypeKeyword */,
+                    145 /* FromKeyword */,
+                    130 /* KeyOfKeyword */,
+                    128 /* InferKeyword */,
                 ], anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("SpaceBeforeCertainTypeScriptKeywords", anyToken, [86 /* ExtendsKeyword */, 109 /* ImplementsKeyword */, 144 /* FromKeyword */], [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBeforeCertainTypeScriptKeywords", anyToken, [87 /* ExtendsKeyword */, 110 /* ImplementsKeyword */, 145 /* FromKeyword */], [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Treat string literals in module names as identifiers, and add a space between the literal and the opening Brace braces, e.g.: module "m2" {
                 rule("SpaceAfterModuleName", 10 /* StringLiteral */, 18 /* OpenBraceToken */, [isModuleDeclContext], 2 /* Space */),
                 // Lambda expressions
                 rule("SpaceBeforeArrow", anyToken, 37 /* EqualsGreaterThanToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("SpaceAfterArrow", 37 /* EqualsGreaterThanToken */, anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Optional parameters and let args
-                rule("NoSpaceAfterEllipsis", 25 /* DotDotDotToken */, 72 /* Identifier */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceAfterEllipsis", 25 /* DotDotDotToken */, 73 /* Identifier */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("NoSpaceAfterOptionalParameters", 56 /* QuestionToken */, [21 /* CloseParenToken */, 27 /* CommaToken */], [isNonJsxSameLineTokenContext, isNotBinaryOpContext], 8 /* Delete */),
                 // Remove spaces in empty interface literals. e.g.: x: {}
                 rule("NoSpaceBetweenEmptyInterfaceBraceBrackets", 18 /* OpenBraceToken */, 19 /* CloseBraceToken */, [isNonJsxSameLineTokenContext, isObjectTypeContext], 8 /* Delete */),
@@ -108676,37 +109936,37 @@ var ts;
                 rule("NoSpaceBeforeCloseAngularBracket", anyToken, 30 /* GreaterThanToken */, [isNonJsxSameLineTokenContext, isTypeArgumentOrParameterOrAssertionContext], 8 /* Delete */),
                 rule("NoSpaceAfterCloseAngularBracket", 30 /* GreaterThanToken */, [20 /* OpenParenToken */, 22 /* OpenBracketToken */, 30 /* GreaterThanToken */, 27 /* CommaToken */], [isNonJsxSameLineTokenContext, isTypeArgumentOrParameterOrAssertionContext, isNotFunctionDeclContext /*To prevent an interference with the SpaceBeforeOpenParenInFuncDecl rule*/], 8 /* Delete */),
                 // decorators
-                rule("SpaceBeforeAt", [21 /* CloseParenToken */, 72 /* Identifier */], 58 /* AtToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBeforeAt", [21 /* CloseParenToken */, 73 /* Identifier */], 58 /* AtToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 rule("NoSpaceAfterAt", 58 /* AtToken */, anyToken, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // Insert space after @ in decorator
                 rule("SpaceAfterDecorator", anyToken, [
-                    118 /* AbstractKeyword */,
-                    72 /* Identifier */,
-                    85 /* ExportKeyword */,
-                    80 /* DefaultKeyword */,
-                    76 /* ClassKeyword */,
-                    116 /* StaticKeyword */,
-                    115 /* PublicKeyword */,
-                    113 /* PrivateKeyword */,
-                    114 /* ProtectedKeyword */,
-                    126 /* GetKeyword */,
-                    137 /* SetKeyword */,
+                    119 /* AbstractKeyword */,
+                    73 /* Identifier */,
+                    86 /* ExportKeyword */,
+                    81 /* DefaultKeyword */,
+                    77 /* ClassKeyword */,
+                    117 /* StaticKeyword */,
+                    116 /* PublicKeyword */,
+                    114 /* PrivateKeyword */,
+                    115 /* ProtectedKeyword */,
+                    127 /* GetKeyword */,
+                    138 /* SetKeyword */,
                     22 /* OpenBracketToken */,
                     40 /* AsteriskToken */,
                 ], [isEndOfDecoratorContextOnSameLine], 2 /* Space */),
                 rule("NoSpaceBeforeNonNullAssertionOperator", anyToken, 52 /* ExclamationToken */, [isNonJsxSameLineTokenContext, isNonNullAssertionContext], 8 /* Delete */),
-                rule("NoSpaceAfterNewKeywordOnConstructorSignature", 95 /* NewKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isConstructorSignatureContext], 8 /* Delete */),
+                rule("NoSpaceAfterNewKeywordOnConstructorSignature", 96 /* NewKeyword */, 20 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isConstructorSignatureContext], 8 /* Delete */),
             ];
             // These rules are applied after high priority
             var userConfigurableRules = [
                 // Treat constructor as an identifier in a function declaration, and remove spaces between constructor and following left parentheses
-                rule("SpaceAfterConstructor", 124 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 2 /* Space */),
-                rule("NoSpaceAfterConstructor", 124 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("SpaceAfterConstructor", 125 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("NoSpaceAfterConstructor", 125 /* ConstructorKeyword */, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterConstructor"), isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("SpaceAfterComma", 27 /* CommaToken */, anyToken, [isOptionEnabled("insertSpaceAfterCommaDelimiter"), isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext, isNextTokenNotCloseBracket], 2 /* Space */),
                 rule("NoSpaceAfterComma", 27 /* CommaToken */, anyToken, [isOptionDisabledOrUndefined("insertSpaceAfterCommaDelimiter"), isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext], 8 /* Delete */),
                 // Insert space after function keyword for anonymous functions
-                rule("SpaceAfterAnonymousFunctionKeyword", 90 /* FunctionKeyword */, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 2 /* Space */),
-                rule("NoSpaceAfterAnonymousFunctionKeyword", 90 /* FunctionKeyword */, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 8 /* Delete */),
+                rule("SpaceAfterAnonymousFunctionKeyword", [91 /* FunctionKeyword */, 40 /* AsteriskToken */], 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 2 /* Space */),
+                rule("NoSpaceAfterAnonymousFunctionKeyword", [91 /* FunctionKeyword */, 40 /* AsteriskToken */], 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterFunctionKeywordForAnonymousFunctions"), isFunctionDeclContext], 8 /* Delete */),
                 // Insert space after keywords in control flow statements
                 rule("SpaceAfterKeywordInControl", keywords, 20 /* OpenParenToken */, [isOptionEnabled("insertSpaceAfterKeywordsInControlFlowStatements"), isControlDeclContext], 2 /* Space */),
                 rule("NoSpaceAfterKeywordInControl", keywords, 20 /* OpenParenToken */, [isOptionDisabledOrUndefined("insertSpaceAfterKeywordsInControlFlowStatements"), isControlDeclContext], 8 /* Delete */),
@@ -108770,16 +110030,16 @@ var ts;
                 rule("SpaceBeforeOpenBraceInTypeScriptDeclWithBlock", typeScriptOpenBraceLeftTokenRange, 18 /* OpenBraceToken */, [isOptionDisabledOrUndefinedOrTokensOnSameLine("placeOpenBraceOnNewLineForFunctions"), isTypeScriptDeclWithBlockContext, isNotFormatOnEnter, isSameLineTokenOrBeforeBlockContext], 2 /* Space */, 1 /* CanDeleteNewLines */),
                 rule("NoSpaceBeforeComma", anyToken, 27 /* CommaToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 // No space before and after indexer `x[]`
-                rule("NoSpaceBeforeOpenBracket", anyTokenExcept(121 /* AsyncKeyword */, 74 /* CaseKeyword */), 22 /* OpenBracketToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
+                rule("NoSpaceBeforeOpenBracket", anyTokenExcept(122 /* AsyncKeyword */, 75 /* CaseKeyword */), 22 /* OpenBracketToken */, [isNonJsxSameLineTokenContext], 8 /* Delete */),
                 rule("NoSpaceAfterCloseBracket", 23 /* CloseBracketToken */, anyToken, [isNonJsxSameLineTokenContext, isNotBeforeBlockInFunctionDeclarationContext], 8 /* Delete */),
                 rule("SpaceAfterSemicolon", 26 /* SemicolonToken */, anyToken, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Remove extra space between for and await
-                rule("SpaceBetweenForAndAwaitKeyword", 89 /* ForKeyword */, 122 /* AwaitKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceBetweenForAndAwaitKeyword", 90 /* ForKeyword */, 123 /* AwaitKeyword */, [isNonJsxSameLineTokenContext], 2 /* Space */),
                 // Add a space between statements. All keywords except (do,else,case) has open/close parens after them.
                 // So, we have a rule to add a space for [),Any], [do,Any], [else,Any], and [case,Any]
-                rule("SpaceBetweenStatements", [21 /* CloseParenToken */, 82 /* DoKeyword */, 83 /* ElseKeyword */, 74 /* CaseKeyword */], anyToken, [isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext, isNotForContext], 2 /* Space */),
+                rule("SpaceBetweenStatements", [21 /* CloseParenToken */, 83 /* DoKeyword */, 84 /* ElseKeyword */, 75 /* CaseKeyword */], anyToken, [isNonJsxSameLineTokenContext, isNonJsxElementOrFragmentContext, isNotForContext], 2 /* Space */),
                 // This low-pri rule takes care of "try {" and "finally {" in case the rule SpaceBeforeOpenBraceInControl didn't execute on FormatOnEnter.
-                rule("SpaceAfterTryFinally", [103 /* TryKeyword */, 88 /* FinallyKeyword */], 18 /* OpenBraceToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
+                rule("SpaceAfterTryFinally", [104 /* TryKeyword */, 89 /* FinallyKeyword */], 18 /* OpenBraceToken */, [isNonJsxSameLineTokenContext], 2 /* Space */),
             ];
             return highPriorityCommonRules.concat(userConfigurableRules, lowPriorityCommonRules);
         }
@@ -108823,45 +110083,45 @@ var ts;
             return function (context) { return !context.options || !context.options.hasOwnProperty(optionName) || !!context.options[optionName]; };
         }
         function isForContext(context) {
-            return context.contextNode.kind === 225 /* ForStatement */;
+            return context.contextNode.kind === 226 /* ForStatement */;
         }
         function isNotForContext(context) {
             return !isForContext(context);
         }
         function isBinaryOpContext(context) {
             switch (context.contextNode.kind) {
-                case 204 /* BinaryExpression */:
-                case 205 /* ConditionalExpression */:
-                case 175 /* ConditionalType */:
-                case 212 /* AsExpression */:
-                case 257 /* ExportSpecifier */:
-                case 253 /* ImportSpecifier */:
-                case 163 /* TypePredicate */:
-                case 173 /* UnionType */:
-                case 174 /* IntersectionType */:
+                case 205 /* BinaryExpression */:
+                case 206 /* ConditionalExpression */:
+                case 176 /* ConditionalType */:
+                case 213 /* AsExpression */:
+                case 258 /* ExportSpecifier */:
+                case 254 /* ImportSpecifier */:
+                case 164 /* TypePredicate */:
+                case 174 /* UnionType */:
+                case 175 /* IntersectionType */:
                     return true;
                 // equals in binding elements: function foo([[x, y] = [1, 2]])
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                 // equals in type X = ...
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                 // equal in import a = module('a');
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                 // equal in let a = 0;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                 // equal in p = 0;
-                case 151 /* Parameter */:
-                case 278 /* EnumMember */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                    return context.currentTokenSpan.kind === 59 /* EqualsToken */ || context.nextTokenSpan.kind === 59 /* EqualsToken */;
+                case 152 /* Parameter */:
+                case 279 /* EnumMember */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                    return context.currentTokenSpan.kind === 60 /* EqualsToken */ || context.nextTokenSpan.kind === 60 /* EqualsToken */;
                 // "in" keyword in for (let x in []) { }
-                case 226 /* ForInStatement */:
+                case 227 /* ForInStatement */:
                 // "in" keyword in [P in keyof T]: T[P]
-                case 150 /* TypeParameter */:
-                    return context.currentTokenSpan.kind === 93 /* InKeyword */ || context.nextTokenSpan.kind === 93 /* InKeyword */ || context.currentTokenSpan.kind === 59 /* EqualsToken */ || context.nextTokenSpan.kind === 59 /* EqualsToken */;
+                case 151 /* TypeParameter */:
+                    return context.currentTokenSpan.kind === 94 /* InKeyword */ || context.nextTokenSpan.kind === 94 /* InKeyword */ || context.currentTokenSpan.kind === 60 /* EqualsToken */ || context.nextTokenSpan.kind === 60 /* EqualsToken */;
                 // Technically, "of" is not a binary operator, but format it the same way as "in"
-                case 227 /* ForOfStatement */:
-                    return context.currentTokenSpan.kind === 147 /* OfKeyword */ || context.nextTokenSpan.kind === 147 /* OfKeyword */;
+                case 228 /* ForOfStatement */:
+                    return context.currentTokenSpan.kind === 148 /* OfKeyword */ || context.nextTokenSpan.kind === 148 /* OfKeyword */;
             }
             return false;
         }
@@ -108873,22 +110133,22 @@ var ts;
         }
         function isTypeAnnotationContext(context) {
             var contextKind = context.contextNode.kind;
-            return contextKind === 154 /* PropertyDeclaration */ ||
-                contextKind === 153 /* PropertySignature */ ||
-                contextKind === 151 /* Parameter */ ||
-                contextKind === 237 /* VariableDeclaration */ ||
+            return contextKind === 155 /* PropertyDeclaration */ ||
+                contextKind === 154 /* PropertySignature */ ||
+                contextKind === 152 /* Parameter */ ||
+                contextKind === 238 /* VariableDeclaration */ ||
                 ts.isFunctionLikeKind(contextKind);
         }
         function isConditionalOperatorContext(context) {
-            return context.contextNode.kind === 205 /* ConditionalExpression */ ||
-                context.contextNode.kind === 175 /* ConditionalType */;
+            return context.contextNode.kind === 206 /* ConditionalExpression */ ||
+                context.contextNode.kind === 176 /* ConditionalType */;
         }
         function isSameLineTokenOrBeforeBlockContext(context) {
             return context.TokensAreOnSameLine() || isBeforeBlockContext(context);
         }
         function isBraceWrappedContext(context) {
-            return context.contextNode.kind === 184 /* ObjectBindingPattern */ ||
-                context.contextNode.kind === 181 /* MappedType */ ||
+            return context.contextNode.kind === 185 /* ObjectBindingPattern */ ||
+                context.contextNode.kind === 182 /* MappedType */ ||
                 isSingleLineBlockContext(context);
         }
         // This check is done before an open brace in a control construct, a function, or a typescript block declaration
@@ -108914,31 +110174,31 @@ var ts;
                 return true;
             }
             switch (node.kind) {
-                case 218 /* Block */:
-                case 246 /* CaseBlock */:
-                case 188 /* ObjectLiteralExpression */:
-                case 245 /* ModuleBlock */:
+                case 219 /* Block */:
+                case 247 /* CaseBlock */:
+                case 189 /* ObjectLiteralExpression */:
+                case 246 /* ModuleBlock */:
                     return true;
             }
             return false;
         }
         function isFunctionDeclContext(context) {
             switch (context.contextNode.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
                 // case SyntaxKind.MemberFunctionDeclaration:
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
                 // case SyntaxKind.MethodSignature:
-                case 160 /* CallSignature */:
-                case 196 /* FunctionExpression */:
-                case 157 /* Constructor */:
-                case 197 /* ArrowFunction */:
+                case 161 /* CallSignature */:
+                case 197 /* FunctionExpression */:
+                case 158 /* Constructor */:
+                case 198 /* ArrowFunction */:
                 // case SyntaxKind.ConstructorDeclaration:
                 // case SyntaxKind.SimpleArrowFunctionExpression:
                 // case SyntaxKind.ParenthesizedArrowFunctionExpression:
-                case 241 /* InterfaceDeclaration */: // This one is not truly a function, but for formatting purposes, it acts just like one
+                case 242 /* InterfaceDeclaration */: // This one is not truly a function, but for formatting purposes, it acts just like one
                     return true;
             }
             return false;
@@ -108947,40 +110207,40 @@ var ts;
             return !isFunctionDeclContext(context);
         }
         function isFunctionDeclarationOrFunctionExpressionContext(context) {
-            return context.contextNode.kind === 239 /* FunctionDeclaration */ || context.contextNode.kind === 196 /* FunctionExpression */;
+            return context.contextNode.kind === 240 /* FunctionDeclaration */ || context.contextNode.kind === 197 /* FunctionExpression */;
         }
         function isTypeScriptDeclWithBlockContext(context) {
             return nodeIsTypeScriptDeclWithBlockContext(context.contextNode);
         }
         function nodeIsTypeScriptDeclWithBlockContext(node) {
             switch (node.kind) {
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 168 /* TypeLiteral */:
-                case 244 /* ModuleDeclaration */:
-                case 255 /* ExportDeclaration */:
-                case 256 /* NamedExports */:
-                case 249 /* ImportDeclaration */:
-                case 252 /* NamedImports */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 169 /* TypeLiteral */:
+                case 245 /* ModuleDeclaration */:
+                case 256 /* ExportDeclaration */:
+                case 257 /* NamedExports */:
+                case 250 /* ImportDeclaration */:
+                case 253 /* NamedImports */:
                     return true;
             }
             return false;
         }
         function isAfterCodeBlockContext(context) {
             switch (context.currentTokenParent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 274 /* CatchClause */:
-                case 245 /* ModuleBlock */:
-                case 232 /* SwitchStatement */:
+                case 241 /* ClassDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 275 /* CatchClause */:
+                case 246 /* ModuleBlock */:
+                case 233 /* SwitchStatement */:
                     return true;
-                case 218 /* Block */: {
+                case 219 /* Block */: {
                     var blockParent = context.currentTokenParent.parent;
                     // In a codefix scenario, we can't rely on parents being set. So just always return true.
-                    if (!blockParent || blockParent.kind !== 197 /* ArrowFunction */ && blockParent.kind !== 196 /* FunctionExpression */) {
+                    if (!blockParent || blockParent.kind !== 198 /* ArrowFunction */ && blockParent.kind !== 197 /* FunctionExpression */) {
                         return true;
                     }
                 }
@@ -108989,31 +110249,31 @@ var ts;
         }
         function isControlDeclContext(context) {
             switch (context.contextNode.kind) {
-                case 222 /* IfStatement */:
-                case 232 /* SwitchStatement */:
-                case 225 /* ForStatement */:
-                case 226 /* ForInStatement */:
-                case 227 /* ForOfStatement */:
-                case 224 /* WhileStatement */:
-                case 235 /* TryStatement */:
-                case 223 /* DoStatement */:
-                case 231 /* WithStatement */:
+                case 223 /* IfStatement */:
+                case 233 /* SwitchStatement */:
+                case 226 /* ForStatement */:
+                case 227 /* ForInStatement */:
+                case 228 /* ForOfStatement */:
+                case 225 /* WhileStatement */:
+                case 236 /* TryStatement */:
+                case 224 /* DoStatement */:
+                case 232 /* WithStatement */:
                 // TODO
                 // case SyntaxKind.ElseClause:
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return true;
                 default:
                     return false;
             }
         }
         function isObjectContext(context) {
-            return context.contextNode.kind === 188 /* ObjectLiteralExpression */;
+            return context.contextNode.kind === 189 /* ObjectLiteralExpression */;
         }
         function isFunctionCallContext(context) {
-            return context.contextNode.kind === 191 /* CallExpression */;
+            return context.contextNode.kind === 192 /* CallExpression */;
         }
         function isNewContext(context) {
-            return context.contextNode.kind === 192 /* NewExpression */;
+            return context.contextNode.kind === 193 /* NewExpression */;
         }
         function isFunctionCallOrNewContext(context) {
             return isFunctionCallContext(context) || isNewContext(context);
@@ -109025,28 +110285,28 @@ var ts;
             return context.nextTokenSpan.kind !== 23 /* CloseBracketToken */;
         }
         function isArrowFunctionContext(context) {
-            return context.contextNode.kind === 197 /* ArrowFunction */;
+            return context.contextNode.kind === 198 /* ArrowFunction */;
         }
         function isImportTypeContext(context) {
-            return context.contextNode.kind === 183 /* ImportType */;
+            return context.contextNode.kind === 184 /* ImportType */;
         }
         function isNonJsxSameLineTokenContext(context) {
             return context.TokensAreOnSameLine() && context.contextNode.kind !== 11 /* JsxText */;
         }
         function isNonJsxElementOrFragmentContext(context) {
-            return context.contextNode.kind !== 260 /* JsxElement */ && context.contextNode.kind !== 264 /* JsxFragment */;
+            return context.contextNode.kind !== 261 /* JsxElement */ && context.contextNode.kind !== 265 /* JsxFragment */;
         }
         function isJsxExpressionContext(context) {
-            return context.contextNode.kind === 270 /* JsxExpression */ || context.contextNode.kind === 269 /* JsxSpreadAttribute */;
+            return context.contextNode.kind === 271 /* JsxExpression */ || context.contextNode.kind === 270 /* JsxSpreadAttribute */;
         }
         function isNextTokenParentJsxAttribute(context) {
-            return context.nextTokenParent.kind === 267 /* JsxAttribute */;
+            return context.nextTokenParent.kind === 268 /* JsxAttribute */;
         }
         function isJsxAttributeContext(context) {
-            return context.contextNode.kind === 267 /* JsxAttribute */;
+            return context.contextNode.kind === 268 /* JsxAttribute */;
         }
         function isJsxSelfClosingElementContext(context) {
-            return context.contextNode.kind === 261 /* JsxSelfClosingElement */;
+            return context.contextNode.kind === 262 /* JsxSelfClosingElement */;
         }
         function isNotBeforeBlockInFunctionDeclarationContext(context) {
             return !isFunctionDeclContext(context) && !isBeforeBlockContext(context);
@@ -109061,45 +110321,45 @@ var ts;
             while (ts.isExpressionNode(node)) {
                 node = node.parent;
             }
-            return node.kind === 152 /* Decorator */;
+            return node.kind === 153 /* Decorator */;
         }
         function isStartOfVariableDeclarationList(context) {
-            return context.currentTokenParent.kind === 238 /* VariableDeclarationList */ &&
+            return context.currentTokenParent.kind === 239 /* VariableDeclarationList */ &&
                 context.currentTokenParent.getStart(context.sourceFile) === context.currentTokenSpan.pos;
         }
         function isNotFormatOnEnter(context) {
             return context.formattingRequestKind !== 2 /* FormatOnEnter */;
         }
         function isModuleDeclContext(context) {
-            return context.contextNode.kind === 244 /* ModuleDeclaration */;
+            return context.contextNode.kind === 245 /* ModuleDeclaration */;
         }
         function isObjectTypeContext(context) {
-            return context.contextNode.kind === 168 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration;
+            return context.contextNode.kind === 169 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration;
         }
         function isConstructorSignatureContext(context) {
-            return context.contextNode.kind === 161 /* ConstructSignature */;
+            return context.contextNode.kind === 162 /* ConstructSignature */;
         }
         function isTypeArgumentOrParameterOrAssertion(token, parent) {
             if (token.kind !== 28 /* LessThanToken */ && token.kind !== 30 /* GreaterThanToken */) {
                 return false;
             }
             switch (parent.kind) {
-                case 164 /* TypeReference */:
-                case 194 /* TypeAssertionExpression */:
-                case 242 /* TypeAliasDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 209 /* ClassExpression */:
-                case 241 /* InterfaceDeclaration */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 191 /* CallExpression */:
-                case 192 /* NewExpression */:
-                case 211 /* ExpressionWithTypeArguments */:
+                case 165 /* TypeReference */:
+                case 195 /* TypeAssertionExpression */:
+                case 243 /* TypeAliasDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 210 /* ClassExpression */:
+                case 242 /* InterfaceDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 192 /* CallExpression */:
+                case 193 /* NewExpression */:
+                case 212 /* ExpressionWithTypeArguments */:
                     return true;
                 default:
                     return false;
@@ -109110,16 +110370,16 @@ var ts;
                 isTypeArgumentOrParameterOrAssertion(context.nextTokenSpan, context.nextTokenParent);
         }
         function isTypeAssertionContext(context) {
-            return context.contextNode.kind === 194 /* TypeAssertionExpression */;
+            return context.contextNode.kind === 195 /* TypeAssertionExpression */;
         }
         function isVoidOpContext(context) {
-            return context.currentTokenSpan.kind === 106 /* VoidKeyword */ && context.currentTokenParent.kind === 200 /* VoidExpression */;
+            return context.currentTokenSpan.kind === 107 /* VoidKeyword */ && context.currentTokenParent.kind === 201 /* VoidExpression */;
         }
         function isYieldOrYieldStarWithOperand(context) {
-            return context.contextNode.kind === 207 /* YieldExpression */ && context.contextNode.expression !== undefined;
+            return context.contextNode.kind === 208 /* YieldExpression */ && context.contextNode.expression !== undefined;
         }
         function isNonNullAssertionContext(context) {
-            return context.contextNode.kind === 213 /* NonNullExpression */;
+            return context.contextNode.kind === 214 /* NonNullExpression */;
         }
     })(formatting = ts.formatting || (ts.formatting = {}));
 })(ts || (ts = {}));
@@ -109170,12 +110430,12 @@ var ts;
             return map;
         }
         function getRuleBucketIndex(row, column) {
-            ts.Debug.assert(row <= 147 /* LastKeyword */ && column <= 147 /* LastKeyword */, "Must compute formatting context from tokens");
+            ts.Debug.assert(row <= 148 /* LastKeyword */ && column <= 148 /* LastKeyword */, "Must compute formatting context from tokens");
             return (row * mapRowLength) + column;
         }
         var maskBitSize = 5;
         var mask = 31; // MaskBitSize bits
-        var mapRowLength = 147 /* LastToken */ + 1;
+        var mapRowLength = 148 /* LastToken */ + 1;
         var RulesPosition;
         (function (RulesPosition) {
             RulesPosition[RulesPosition["IgnoreRulesSpecific"] = 0] = "IgnoreRulesSpecific";
@@ -109353,17 +110613,17 @@ var ts;
         // i.e. parent is class declaration with the list of members and node is one of members.
         function isListElement(parent, node) {
             switch (parent.kind) {
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return ts.rangeContainsRange(parent.members, node);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     var body = parent.body;
-                    return !!body && body.kind === 245 /* ModuleBlock */ && ts.rangeContainsRange(body.statements, node);
-                case 284 /* SourceFile */:
-                case 218 /* Block */:
-                case 245 /* ModuleBlock */:
+                    return !!body && body.kind === 246 /* ModuleBlock */ && ts.rangeContainsRange(body.statements, node);
+                case 285 /* SourceFile */:
+                case 219 /* Block */:
+                case 246 /* ModuleBlock */:
                     return ts.rangeContainsRange(parent.statements, node);
-                case 274 /* CatchClause */:
+                case 275 /* CatchClause */:
                     return ts.rangeContainsRange(parent.block.statements, node);
             }
             return false;
@@ -109585,19 +110845,19 @@ var ts;
                     return node.modifiers[0].kind;
                 }
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */: return 76 /* ClassKeyword */;
-                    case 241 /* InterfaceDeclaration */: return 110 /* InterfaceKeyword */;
-                    case 239 /* FunctionDeclaration */: return 90 /* FunctionKeyword */;
-                    case 243 /* EnumDeclaration */: return 243 /* EnumDeclaration */;
-                    case 158 /* GetAccessor */: return 126 /* GetKeyword */;
-                    case 159 /* SetAccessor */: return 137 /* SetKeyword */;
-                    case 156 /* MethodDeclaration */:
+                    case 241 /* ClassDeclaration */: return 77 /* ClassKeyword */;
+                    case 242 /* InterfaceDeclaration */: return 111 /* InterfaceKeyword */;
+                    case 240 /* FunctionDeclaration */: return 91 /* FunctionKeyword */;
+                    case 244 /* EnumDeclaration */: return 244 /* EnumDeclaration */;
+                    case 159 /* GetAccessor */: return 127 /* GetKeyword */;
+                    case 160 /* SetAccessor */: return 138 /* SetKeyword */;
+                    case 157 /* MethodDeclaration */:
                         if (node.asteriskToken) {
                             return 40 /* AsteriskToken */;
                         }
                     // falls through
-                    case 154 /* PropertyDeclaration */:
-                    case 151 /* Parameter */:
+                    case 155 /* PropertyDeclaration */:
+                    case 152 /* Parameter */:
                         var name = ts.getNameOfDeclaration(node);
                         if (name) {
                             return name.kind;
@@ -109647,22 +110907,22 @@ var ts;
                         case 18 /* OpenBraceToken */:
                         case 19 /* CloseBraceToken */:
                         case 21 /* CloseParenToken */:
-                        case 83 /* ElseKeyword */:
-                        case 107 /* WhileKeyword */:
+                        case 84 /* ElseKeyword */:
+                        case 108 /* WhileKeyword */:
                         case 58 /* AtToken */:
                             return false;
                         case 42 /* SlashToken */:
                         case 30 /* GreaterThanToken */:
                             switch (container.kind) {
-                                case 262 /* JsxOpeningElement */:
-                                case 263 /* JsxClosingElement */:
-                                case 261 /* JsxSelfClosingElement */:
+                                case 263 /* JsxOpeningElement */:
+                                case 264 /* JsxClosingElement */:
+                                case 262 /* JsxSelfClosingElement */:
                                     return false;
                             }
                             break;
                         case 22 /* OpenBracketToken */:
                         case 23 /* CloseBracketToken */:
-                            if (container.kind !== 181 /* MappedType */) {
+                            if (container.kind !== 182 /* MappedType */) {
                                 return false;
                             }
                             break;
@@ -109754,7 +111014,7 @@ var ts;
                         consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, child);
                         return inheritedIndentation;
                     }
-                    var effectiveParentStartLine = child.kind === 152 /* Decorator */ ? childStartLine : undecoratedParentStartLine;
+                    var effectiveParentStartLine = child.kind === 153 /* Decorator */ ? childStartLine : undecoratedParentStartLine;
                     var childIndentation = computeIndentation(child, childStartLine, childIndentationAmount, node, parentDynamicIndentation, effectiveParentStartLine);
                     processNode(child, childContextNode, childStartLine, undecoratedChildStartLine, childIndentation.indentation, childIndentation.delta);
                     if (child.kind === 11 /* JsxText */) {
@@ -109762,7 +111022,7 @@ var ts;
                         indentMultilineCommentOrJsxText(range, childIndentation.indentation, /*firstLineIsIndented*/ true, /*indentFinalLine*/ false);
                     }
                     childContextNode = node;
-                    if (isFirstListItem && parent.kind === 187 /* ArrayLiteralExpression */ && inheritedIndentation === -1 /* Unknown */) {
+                    if (isFirstListItem && parent.kind === 188 /* ArrayLiteralExpression */ && inheritedIndentation === -1 /* Unknown */) {
                         inheritedIndentation = childIndentation.indentation;
                     }
                     return inheritedIndentation;
@@ -110180,12 +111440,12 @@ var ts;
         formatting.getRangeOfEnclosingComment = getRangeOfEnclosingComment;
         function getOpenTokenForList(node, list) {
             switch (node.kind) {
-                case 157 /* Constructor */:
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 197 /* ArrowFunction */:
+                case 158 /* Constructor */:
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 198 /* ArrowFunction */:
                     if (node.typeParameters === list) {
                         return 28 /* LessThanToken */;
                     }
@@ -110193,8 +111453,8 @@ var ts;
                         return 20 /* OpenParenToken */;
                     }
                     break;
-                case 191 /* CallExpression */:
-                case 192 /* NewExpression */:
+                case 192 /* CallExpression */:
+                case 193 /* NewExpression */:
                     if (node.typeArguments === list) {
                         return 28 /* LessThanToken */;
                     }
@@ -110202,12 +111462,12 @@ var ts;
                         return 20 /* OpenParenToken */;
                     }
                     break;
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     if (node.typeArguments === list) {
                         return 28 /* LessThanToken */;
                     }
                     break;
-                case 168 /* TypeLiteral */:
+                case 169 /* TypeLiteral */:
                     return 18 /* OpenBraceToken */;
             }
             return 0 /* Unknown */;
@@ -110324,7 +111584,7 @@ var ts;
                 if (options.indentStyle === ts.IndentStyle.Block) {
                     return getBlockIndent(sourceFile, position, options);
                 }
-                if (precedingToken.kind === 27 /* CommaToken */ && precedingToken.parent.kind !== 204 /* BinaryExpression */) {
+                if (precedingToken.kind === 27 /* CommaToken */ && precedingToken.parent.kind !== 205 /* BinaryExpression */) {
                     // previous token is comma that separates items in list - find the previous item and try to derive indentation from it
                     var actualIndentation = getActualIndentationForListItemBeforeComma(precedingToken, sourceFile, options);
                     if (actualIndentation !== -1 /* Unknown */) {
@@ -110478,7 +111738,7 @@ var ts;
                 // - parent is SourceFile - by default immediate children of SourceFile are not indented except when user indents them manually
                 // - parent and child are not on the same line
                 var useActualIndentation = (ts.isDeclaration(current) || ts.isStatementButNotDeclaration(current)) &&
-                    (parent.kind === 284 /* SourceFile */ || !parentAndChildShareLine);
+                    (parent.kind === 285 /* SourceFile */ || !parentAndChildShareLine);
                 if (!useActualIndentation) {
                     return -1 /* Unknown */;
                 }
@@ -110526,8 +111786,8 @@ var ts;
             }
             SmartIndenter.isArgumentAndStartLineOverlapsExpressionBeingCalled = isArgumentAndStartLineOverlapsExpressionBeingCalled;
             function childStartsOnTheSameLineWithElseInIfStatement(parent, child, childStartLine, sourceFile) {
-                if (parent.kind === 222 /* IfStatement */ && parent.elseStatement === child) {
-                    var elseKeyword = ts.findChildOfKind(parent, 83 /* ElseKeyword */, sourceFile);
+                if (parent.kind === 223 /* IfStatement */ && parent.elseStatement === child) {
+                    var elseKeyword = ts.findChildOfKind(parent, 84 /* ElseKeyword */, sourceFile);
                     ts.Debug.assert(elseKeyword !== undefined);
                     var elseKeywordStartLine = getStartLineAndCharacterForNode(elseKeyword, sourceFile).line;
                     return elseKeywordStartLine === childStartLine;
@@ -110544,40 +111804,40 @@ var ts;
             }
             function getListByRange(start, end, node, sourceFile) {
                 switch (node.kind) {
-                    case 164 /* TypeReference */:
+                    case 165 /* TypeReference */:
                         return getList(node.typeArguments);
-                    case 188 /* ObjectLiteralExpression */:
+                    case 189 /* ObjectLiteralExpression */:
                         return getList(node.properties);
-                    case 187 /* ArrayLiteralExpression */:
+                    case 188 /* ArrayLiteralExpression */:
                         return getList(node.elements);
-                    case 168 /* TypeLiteral */:
+                    case 169 /* TypeLiteral */:
                         return getList(node.members);
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
-                    case 160 /* CallSignature */:
-                    case 157 /* Constructor */:
-                    case 166 /* ConstructorType */:
-                    case 161 /* ConstructSignature */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
+                    case 161 /* CallSignature */:
+                    case 158 /* Constructor */:
+                    case 167 /* ConstructorType */:
+                    case 162 /* ConstructSignature */:
                         return getList(node.typeParameters) || getList(node.parameters);
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 308 /* JSDocTemplateTag */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 309 /* JSDocTemplateTag */:
                         return getList(node.typeParameters);
-                    case 192 /* NewExpression */:
-                    case 191 /* CallExpression */:
+                    case 193 /* NewExpression */:
+                    case 192 /* CallExpression */:
                         return getList(node.typeArguments) || getList(node.arguments);
-                    case 238 /* VariableDeclarationList */:
+                    case 239 /* VariableDeclarationList */:
                         return getList(node.declarations);
-                    case 252 /* NamedImports */:
-                    case 256 /* NamedExports */:
+                    case 253 /* NamedImports */:
+                    case 257 /* NamedExports */:
                         return getList(node.elements);
-                    case 184 /* ObjectBindingPattern */:
-                    case 185 /* ArrayBindingPattern */:
+                    case 185 /* ObjectBindingPattern */:
+                    case 186 /* ArrayBindingPattern */:
                         return getList(node.elements);
                 }
                 function getList(list) {
@@ -110600,7 +111860,7 @@ var ts;
                 return findColumnForFirstNonWhitespaceCharacterInLine(sourceFile.getLineAndCharacterOfPosition(list.pos), sourceFile, options);
             }
             function getActualIndentationForListItem(node, sourceFile, options, listIndentsChild) {
-                if (node.parent && node.parent.kind === 238 /* VariableDeclarationList */) {
+                if (node.parent && node.parent.kind === 239 /* VariableDeclarationList */) {
                     // VariableDeclarationList has no wrapping tokens
                     return -1 /* Unknown */;
                 }
@@ -110673,83 +111933,83 @@ var ts;
             function nodeWillIndentChild(settings, parent, child, sourceFile, indentByDefault) {
                 var childKind = child ? child.kind : 0 /* Unknown */;
                 switch (parent.kind) {
-                    case 221 /* ExpressionStatement */:
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 243 /* EnumDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 187 /* ArrayLiteralExpression */:
-                    case 218 /* Block */:
-                    case 245 /* ModuleBlock */:
-                    case 188 /* ObjectLiteralExpression */:
-                    case 168 /* TypeLiteral */:
-                    case 181 /* MappedType */:
-                    case 170 /* TupleType */:
-                    case 246 /* CaseBlock */:
-                    case 272 /* DefaultClause */:
-                    case 271 /* CaseClause */:
-                    case 195 /* ParenthesizedExpression */:
-                    case 189 /* PropertyAccessExpression */:
-                    case 191 /* CallExpression */:
-                    case 192 /* NewExpression */:
-                    case 219 /* VariableStatement */:
-                    case 254 /* ExportAssignment */:
-                    case 230 /* ReturnStatement */:
-                    case 205 /* ConditionalExpression */:
-                    case 185 /* ArrayBindingPattern */:
-                    case 184 /* ObjectBindingPattern */:
-                    case 262 /* JsxOpeningElement */:
-                    case 265 /* JsxOpeningFragment */:
-                    case 261 /* JsxSelfClosingElement */:
-                    case 270 /* JsxExpression */:
-                    case 155 /* MethodSignature */:
-                    case 160 /* CallSignature */:
-                    case 161 /* ConstructSignature */:
-                    case 151 /* Parameter */:
-                    case 165 /* FunctionType */:
-                    case 166 /* ConstructorType */:
-                    case 177 /* ParenthesizedType */:
-                    case 193 /* TaggedTemplateExpression */:
-                    case 201 /* AwaitExpression */:
-                    case 256 /* NamedExports */:
-                    case 252 /* NamedImports */:
-                    case 257 /* ExportSpecifier */:
-                    case 253 /* ImportSpecifier */:
-                    case 154 /* PropertyDeclaration */:
+                    case 222 /* ExpressionStatement */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 188 /* ArrayLiteralExpression */:
+                    case 219 /* Block */:
+                    case 246 /* ModuleBlock */:
+                    case 189 /* ObjectLiteralExpression */:
+                    case 169 /* TypeLiteral */:
+                    case 182 /* MappedType */:
+                    case 171 /* TupleType */:
+                    case 247 /* CaseBlock */:
+                    case 273 /* DefaultClause */:
+                    case 272 /* CaseClause */:
+                    case 196 /* ParenthesizedExpression */:
+                    case 190 /* PropertyAccessExpression */:
+                    case 192 /* CallExpression */:
+                    case 193 /* NewExpression */:
+                    case 220 /* VariableStatement */:
+                    case 255 /* ExportAssignment */:
+                    case 231 /* ReturnStatement */:
+                    case 206 /* ConditionalExpression */:
+                    case 186 /* ArrayBindingPattern */:
+                    case 185 /* ObjectBindingPattern */:
+                    case 263 /* JsxOpeningElement */:
+                    case 266 /* JsxOpeningFragment */:
+                    case 262 /* JsxSelfClosingElement */:
+                    case 271 /* JsxExpression */:
+                    case 156 /* MethodSignature */:
+                    case 161 /* CallSignature */:
+                    case 162 /* ConstructSignature */:
+                    case 152 /* Parameter */:
+                    case 166 /* FunctionType */:
+                    case 167 /* ConstructorType */:
+                    case 178 /* ParenthesizedType */:
+                    case 194 /* TaggedTemplateExpression */:
+                    case 202 /* AwaitExpression */:
+                    case 257 /* NamedExports */:
+                    case 253 /* NamedImports */:
+                    case 258 /* ExportSpecifier */:
+                    case 254 /* ImportSpecifier */:
+                    case 155 /* PropertyDeclaration */:
                         return true;
-                    case 237 /* VariableDeclaration */:
-                    case 275 /* PropertyAssignment */:
-                        if (!settings.indentMultiLineObjectLiteralBeginningOnBlankLine && sourceFile && childKind === 188 /* ObjectLiteralExpression */) { // TODO: GH#18217
+                    case 238 /* VariableDeclaration */:
+                    case 276 /* PropertyAssignment */:
+                        if (!settings.indentMultiLineObjectLiteralBeginningOnBlankLine && sourceFile && childKind === 189 /* ObjectLiteralExpression */) { // TODO: GH#18217
                             return rangeIsOnOneLine(sourceFile, child);
                         }
                         return true;
-                    case 223 /* DoStatement */:
-                    case 224 /* WhileStatement */:
-                    case 226 /* ForInStatement */:
-                    case 227 /* ForOfStatement */:
-                    case 225 /* ForStatement */:
-                    case 222 /* IfStatement */:
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 156 /* MethodDeclaration */:
-                    case 197 /* ArrowFunction */:
-                    case 157 /* Constructor */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                        return childKind !== 218 /* Block */;
-                    case 255 /* ExportDeclaration */:
-                        return childKind !== 256 /* NamedExports */;
-                    case 249 /* ImportDeclaration */:
-                        return childKind !== 250 /* ImportClause */ ||
-                            (!!child.namedBindings && child.namedBindings.kind !== 252 /* NamedImports */);
-                    case 260 /* JsxElement */:
-                        return childKind !== 263 /* JsxClosingElement */;
-                    case 264 /* JsxFragment */:
-                        return childKind !== 266 /* JsxClosingFragment */;
-                    case 174 /* IntersectionType */:
-                    case 173 /* UnionType */:
-                        if (childKind === 168 /* TypeLiteral */) {
+                    case 224 /* DoStatement */:
+                    case 225 /* WhileStatement */:
+                    case 227 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 226 /* ForStatement */:
+                    case 223 /* IfStatement */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 157 /* MethodDeclaration */:
+                    case 198 /* ArrowFunction */:
+                    case 158 /* Constructor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                        return childKind !== 219 /* Block */;
+                    case 256 /* ExportDeclaration */:
+                        return childKind !== 257 /* NamedExports */;
+                    case 250 /* ImportDeclaration */:
+                        return childKind !== 251 /* ImportClause */ ||
+                            (!!child.namedBindings && child.namedBindings.kind !== 253 /* NamedImports */);
+                    case 261 /* JsxElement */:
+                        return childKind !== 264 /* JsxClosingElement */;
+                    case 265 /* JsxFragment */:
+                        return childKind !== 267 /* JsxClosingFragment */;
+                    case 175 /* IntersectionType */:
+                    case 174 /* UnionType */:
+                        if (childKind === 169 /* TypeLiteral */) {
                             return false;
                         }
                     // falls through
@@ -110760,11 +112020,11 @@ var ts;
             SmartIndenter.nodeWillIndentChild = nodeWillIndentChild;
             function isControlFlowEndingStatement(kind, parent) {
                 switch (kind) {
-                    case 230 /* ReturnStatement */:
-                    case 234 /* ThrowStatement */:
-                    case 228 /* ContinueStatement */:
-                    case 229 /* BreakStatement */:
-                        return parent.kind !== 218 /* Block */;
+                    case 231 /* ReturnStatement */:
+                    case 235 /* ThrowStatement */:
+                    case 229 /* ContinueStatement */:
+                    case 230 /* BreakStatement */:
+                        return parent.kind !== 219 /* Block */;
                     default:
                         return false;
                 }
@@ -110906,7 +112166,7 @@ var ts;
          * Checks if 'candidate' argument is a legal separator in the list that contains 'node' as an element
          */
         function isSeparator(node, candidate) {
-            return !!candidate && !!node.parent && (candidate.kind === 27 /* CommaToken */ || (candidate.kind === 26 /* SemicolonToken */ && node.parent.kind === 188 /* ObjectLiteralExpression */));
+            return !!candidate && !!node.parent && (candidate.kind === 27 /* CommaToken */ || (candidate.kind === 26 /* SemicolonToken */ && node.parent.kind === 189 /* ObjectLiteralExpression */));
         }
         function spaces(count) {
             var s = "";
@@ -111067,7 +112327,7 @@ var ts;
                     }
                 }
                 else {
-                    endNode = node.kind !== 237 /* VariableDeclaration */ && node.questionToken ? node.questionToken : node.name;
+                    endNode = node.kind !== 238 /* VariableDeclaration */ && node.questionToken ? node.questionToken : node.name;
                 }
                 this.insertNodeAt(sourceFile, endNode.end, type, { prefix: ": " });
             };
@@ -111179,18 +112439,18 @@ var ts;
             };
             ChangeTracker.prototype.getInsertNodeAfterOptionsWorker = function (node) {
                 switch (node.kind) {
-                    case 240 /* ClassDeclaration */:
-                    case 244 /* ModuleDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         return { prefix: this.newLineCharacter, suffix: this.newLineCharacter };
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                     case 10 /* StringLiteral */:
-                    case 72 /* Identifier */:
+                    case 73 /* Identifier */:
                         return { prefix: ", " };
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         return { suffix: "," + this.newLineCharacter };
-                    case 85 /* ExportKeyword */:
+                    case 86 /* ExportKeyword */:
                         return { prefix: " " };
-                    case 151 /* Parameter */:
+                    case 152 /* Parameter */:
                         return {};
                     default:
                         ts.Debug.assert(ts.isStatement(node) || ts.isClassOrTypeElement(node)); // Else we haven't handled this kind of node yet -- add it
@@ -111199,12 +112459,12 @@ var ts;
             };
             ChangeTracker.prototype.insertName = function (sourceFile, node, name) {
                 ts.Debug.assert(!node.name);
-                if (node.kind === 197 /* ArrowFunction */) {
+                if (node.kind === 198 /* ArrowFunction */) {
                     var arrow = ts.findChildOfKind(node, 37 /* EqualsGreaterThanToken */, sourceFile);
                     var lparen = ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile);
                     if (lparen) {
                         // `() => {}` --> `function f() {}`
-                        this.insertNodesAt(sourceFile, lparen.getStart(sourceFile), [ts.createToken(90 /* FunctionKeyword */), ts.createIdentifier(name)], { joiner: " " });
+                        this.insertNodesAt(sourceFile, lparen.getStart(sourceFile), [ts.createToken(91 /* FunctionKeyword */), ts.createIdentifier(name)], { joiner: " " });
                         deleteNode(this, sourceFile, arrow);
                     }
                     else {
@@ -111213,14 +112473,14 @@ var ts;
                         // Replacing full range of arrow to get rid of the leading space -- replace ` =>` with `)`
                         this.replaceRange(sourceFile, arrow, ts.createToken(21 /* CloseParenToken */));
                     }
-                    if (node.body.kind !== 218 /* Block */) {
+                    if (node.body.kind !== 219 /* Block */) {
                         // `() => 0` => `function f() { return 0; }`
-                        this.insertNodesAt(sourceFile, node.body.getStart(sourceFile), [ts.createToken(18 /* OpenBraceToken */), ts.createToken(97 /* ReturnKeyword */)], { joiner: " ", suffix: " " });
+                        this.insertNodesAt(sourceFile, node.body.getStart(sourceFile), [ts.createToken(18 /* OpenBraceToken */), ts.createToken(98 /* ReturnKeyword */)], { joiner: " ", suffix: " " });
                         this.insertNodesAt(sourceFile, node.body.end, [ts.createToken(26 /* SemicolonToken */), ts.createToken(19 /* CloseBraceToken */)], { joiner: " " });
                     }
                 }
                 else {
-                    var pos = ts.findChildOfKind(node, node.kind === 196 /* FunctionExpression */ ? 90 /* FunctionKeyword */ : 76 /* ClassKeyword */, sourceFile).end;
+                    var pos = ts.findChildOfKind(node, node.kind === 197 /* FunctionExpression */ ? 91 /* FunctionKeyword */ : 77 /* ClassKeyword */, sourceFile).end;
                     this.insertNodeAt(sourceFile, pos, ts.createIdentifier(name), { prefix: " " });
                 }
             };
@@ -111447,7 +112707,7 @@ var ts;
             function newFileChangesWorker(oldFile, scriptKind, statements, newLineCharacter, formatContext) {
                 // TODO: this emits the file, parses it back, then formats it that -- may be a less roundabout way to do this
                 var nonFormattedText = statements.map(function (s) { return getNonformattedText(s, oldFile, newLineCharacter).text; }).join(newLineCharacter);
-                var sourceFile = ts.createSourceFile("any file name", nonFormattedText, 7 /* ESNext */, /*setParentNodes*/ true, scriptKind);
+                var sourceFile = ts.createSourceFile("any file name", nonFormattedText, 8 /* ESNext */, /*setParentNodes*/ true, scriptKind);
                 var changes = ts.formatting.formatDocument(sourceFile, formatContext);
                 return applyChanges(nonFormattedText, changes) + newLineCharacter;
             }
@@ -111715,14 +112975,14 @@ var ts;
         }
         textChanges_3.isValidLocationToAddComment = isValidLocationToAddComment;
         function needSemicolonBetween(a, b) {
-            return (ts.isPropertySignature(a) || ts.isPropertyDeclaration(a)) && ts.isClassOrTypeElement(b) && b.name.kind === 149 /* ComputedPropertyName */
+            return (ts.isPropertySignature(a) || ts.isPropertyDeclaration(a)) && ts.isClassOrTypeElement(b) && b.name.kind === 150 /* ComputedPropertyName */
                 || ts.isStatementButNotDeclaration(a) && ts.isStatementButNotDeclaration(b); // TODO: only if b would start with a `(` or `[`
         }
         var deleteDeclaration;
         (function (deleteDeclaration_1) {
             function deleteDeclaration(changes, deletedNodesInLists, sourceFile, node) {
                 switch (node.kind) {
-                    case 151 /* Parameter */: {
+                    case 152 /* Parameter */: {
                         var oldFunction = node.parent;
                         if (ts.isArrowFunction(oldFunction) &&
                             oldFunction.parameters.length === 1 &&
@@ -111737,14 +112997,14 @@ var ts;
                         }
                         break;
                     }
-                    case 249 /* ImportDeclaration */:
+                    case 250 /* ImportDeclaration */:
                         deleteNode(changes, sourceFile, node, 
                         // For first import, leave header comment in place
                         node === sourceFile.imports[0].parent ? { leadingTriviaOption: LeadingTriviaOption.Exclude } : undefined);
                         break;
-                    case 186 /* BindingElement */:
+                    case 187 /* BindingElement */:
                         var pattern = node.parent;
-                        var preserveComma = pattern.kind === 185 /* ArrayBindingPattern */ && node !== ts.last(pattern.elements);
+                        var preserveComma = pattern.kind === 186 /* ArrayBindingPattern */ && node !== ts.last(pattern.elements);
                         if (preserveComma) {
                             deleteNode(changes, sourceFile, node);
                         }
@@ -111752,13 +113012,13 @@ var ts;
                             deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         }
                         break;
-                    case 237 /* VariableDeclaration */:
+                    case 238 /* VariableDeclaration */:
                         deleteVariableDeclaration(changes, deletedNodesInLists, sourceFile, node);
                         break;
-                    case 150 /* TypeParameter */:
+                    case 151 /* TypeParameter */:
                         deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         break;
-                    case 253 /* ImportSpecifier */:
+                    case 254 /* ImportSpecifier */:
                         var namedImports = node.parent;
                         if (namedImports.elements.length === 1) {
                             deleteImportBinding(changes, sourceFile, namedImports);
@@ -111767,7 +113027,7 @@ var ts;
                             deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         }
                         break;
-                    case 251 /* NamespaceImport */:
+                    case 252 /* NamespaceImport */:
                         deleteImportBinding(changes, sourceFile, node);
                         break;
                     default:
@@ -111814,13 +113074,13 @@ var ts;
                     // Delete the entire import declaration
                     // |import * as ns from './file'|
                     // |import { a } from './file'|
-                    var importDecl = ts.getAncestor(node, 249 /* ImportDeclaration */);
+                    var importDecl = ts.getAncestor(node, 250 /* ImportDeclaration */);
                     deleteNode(changes, sourceFile, importDecl);
                 }
             }
             function deleteVariableDeclaration(changes, deletedNodesInLists, sourceFile, node) {
                 var parent = node.parent;
-                if (parent.kind === 274 /* CatchClause */) {
+                if (parent.kind === 275 /* CatchClause */) {
                     // TODO: There's currently no unused diagnostic for this, could be a suggestion
                     changes.deleteNodeRange(sourceFile, ts.findChildOfKind(parent, 20 /* OpenParenToken */, sourceFile), ts.findChildOfKind(parent, 21 /* CloseParenToken */, sourceFile));
                     return;
@@ -111831,14 +113091,14 @@ var ts;
                 }
                 var gp = parent.parent;
                 switch (gp.kind) {
-                    case 227 /* ForOfStatement */:
-                    case 226 /* ForInStatement */:
+                    case 228 /* ForOfStatement */:
+                    case 227 /* ForInStatement */:
                         changes.replaceNode(sourceFile, node, ts.createObjectLiteral());
                         break;
-                    case 225 /* ForStatement */:
+                    case 226 /* ForStatement */:
                         deleteNode(changes, sourceFile, parent);
                         break;
-                    case 219 /* VariableStatement */:
+                    case 220 /* VariableStatement */:
                         deleteNode(changes, sourceFile, gp);
                         break;
                     default:
@@ -112001,8 +113261,8 @@ var ts;
             var token = ts.getTokenAtPosition(sourceFile, pos);
             var assertion = ts.Debug.assertDefined(ts.findAncestor(token, function (n) { return ts.isAsExpression(n) || ts.isTypeAssertion(n); }));
             var replacement = ts.isAsExpression(assertion)
-                ? ts.createAsExpression(assertion.expression, ts.createKeywordTypeNode(143 /* UnknownKeyword */))
-                : ts.createTypeAssertion(ts.createKeywordTypeNode(143 /* UnknownKeyword */), assertion.expression);
+                ? ts.createAsExpression(assertion.expression, ts.createKeywordTypeNode(144 /* UnknownKeyword */))
+                : ts.createTypeAssertion(ts.createKeywordTypeNode(144 /* UnknownKeyword */), assertion.expression);
             changeTracker.replaceNode(sourceFile, assertion.expression, replacement);
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
@@ -112051,11 +113311,11 @@ var ts;
         function makeChange(changeTracker, sourceFile, pos) {
             var token = ts.getTokenAtPosition(sourceFile, pos);
             if (!ts.isIdentifier(token)) {
-                return ts.Debug.fail("add-name-to-nameless-parameter operates on identifiers, but got a " + ts.formatSyntaxKind(token.kind));
+                return ts.Debug.fail("add-name-to-nameless-parameter operates on identifiers, but got a " + ts.Debug.formatSyntaxKind(token.kind));
             }
             var param = token.parent;
             if (!ts.isParameter(param)) {
-                return ts.Debug.fail("Tried to add a parameter name to a non-parameter: " + ts.formatSyntaxKind(token.kind));
+                return ts.Debug.fail("Tried to add a parameter name to a non-parameter: " + ts.Debug.formatSyntaxKind(token.kind));
             }
             var i = param.parent.parameters.indexOf(param);
             ts.Debug.assert(!param.type, "Tried to add a parameter name to a parameter that already had one.");
@@ -112137,26 +113397,26 @@ var ts;
         }
         function isDeclarationWithType(node) {
             return ts.isFunctionLikeDeclaration(node) ||
-                node.kind === 237 /* VariableDeclaration */ ||
-                node.kind === 153 /* PropertySignature */ ||
-                node.kind === 154 /* PropertyDeclaration */;
+                node.kind === 238 /* VariableDeclaration */ ||
+                node.kind === 154 /* PropertySignature */ ||
+                node.kind === 155 /* PropertyDeclaration */;
         }
         function transformJSDocType(node) {
             switch (node.kind) {
-                case 289 /* JSDocAllType */:
-                case 290 /* JSDocUnknownType */:
+                case 290 /* JSDocAllType */:
+                case 291 /* JSDocUnknownType */:
                     return ts.createTypeReferenceNode("any", ts.emptyArray);
-                case 293 /* JSDocOptionalType */:
+                case 294 /* JSDocOptionalType */:
                     return transformJSDocOptionalType(node);
-                case 292 /* JSDocNonNullableType */:
+                case 293 /* JSDocNonNullableType */:
                     return transformJSDocType(node.type);
-                case 291 /* JSDocNullableType */:
+                case 292 /* JSDocNullableType */:
                     return transformJSDocNullableType(node);
-                case 295 /* JSDocVariadicType */:
+                case 296 /* JSDocVariadicType */:
                     return transformJSDocVariadicType(node);
-                case 294 /* JSDocFunctionType */:
+                case 295 /* JSDocFunctionType */:
                     return transformJSDocFunctionType(node);
-                case 164 /* TypeReference */:
+                case 165 /* TypeReference */:
                     return transformJSDocTypeReference(node);
                 default:
                     var visited = ts.visitEachChild(node, transformJSDocType, /*context*/ undefined); // TODO: GH#18217
@@ -112178,7 +113438,7 @@ var ts;
         }
         function transformJSDocParameter(node) {
             var index = node.parent.parameters.indexOf(node);
-            var isRest = node.type.kind === 295 /* JSDocVariadicType */ && index === node.parent.parameters.length - 1; // TODO: GH#18217
+            var isRest = node.type.kind === 296 /* JSDocVariadicType */ && index === node.parent.parameters.length - 1; // TODO: GH#18217
             var name = node.name || (isRest ? "rest" : "arg" + index);
             var dotdotdot = isRest ? ts.createToken(25 /* DotDotDotToken */) : node.dotDotDotToken;
             return ts.createParameter(node.decorators, node.modifiers, dotdotdot, name, node.questionToken, ts.visitNode(node.type, transformJSDocType), node.initializer);
@@ -112218,8 +113478,8 @@ var ts;
             var index = ts.createParameter(
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
-            /*dotDotDotToken*/ undefined, node.typeArguments[0].kind === 135 /* NumberKeyword */ ? "n" : "s", 
-            /*questionToken*/ undefined, ts.createTypeReferenceNode(node.typeArguments[0].kind === 135 /* NumberKeyword */ ? "number" : "string", []), 
+            /*dotDotDotToken*/ undefined, node.typeArguments[0].kind === 136 /* NumberKeyword */ ? "n" : "s", 
+            /*questionToken*/ undefined, ts.createTypeReferenceNode(node.typeArguments[0].kind === 136 /* NumberKeyword */ ? "number" : "string", []), 
             /*initializer*/ undefined);
             var indexSignature = ts.createTypeLiteralNode([ts.createIndexSignature(/*decorators*/ undefined, /*modifiers*/ undefined, [index], node.typeArguments[1])]);
             ts.setEmitFlags(indexSignature, 1 /* SingleLine */);
@@ -112319,7 +113579,7 @@ var ts;
             return errorCode;
         }
         function doChange(changes, sourceFile, token, errorCode, program, cancellationToken, markSeen, host) {
-            if (!ts.isParameterPropertyModifier(token.kind) && token.kind !== 72 /* Identifier */ && token.kind !== 25 /* DotDotDotToken */ && token.kind !== 100 /* ThisKeyword */) {
+            if (!ts.isParameterPropertyModifier(token.kind) && token.kind !== 73 /* Identifier */ && token.kind !== 25 /* DotDotDotToken */ && token.kind !== 101 /* ThisKeyword */) {
                 return undefined;
             }
             var parent = token.parent;
@@ -112440,7 +113700,7 @@ var ts;
         function annotate(changes, sourceFile, declaration, type, program, host) {
             var typeNode = ts.getTypeNodeIfAccessible(type, declaration, program, host);
             if (typeNode) {
-                if (ts.isInJSFile(sourceFile) && declaration.kind !== 153 /* PropertySignature */) {
+                if (ts.isInJSFile(sourceFile) && declaration.kind !== 154 /* PropertySignature */) {
                     var parent = ts.isVariableDeclaration(declaration) ? ts.tryCast(declaration.parent.parent, ts.isVariableStatement) : declaration;
                     if (!parent) {
                         return;
@@ -112481,13 +113741,13 @@ var ts;
                 return !!merged;
             }); });
             var tag = ts.createJSDocComment(comments.join("\n"), ts.createNodeArray((oldTags || ts.emptyArray).concat(unmergedNewTags)));
-            var jsDocNode = parent.kind === 197 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent;
+            var jsDocNode = parent.kind === 198 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent;
             jsDocNode.jsDoc = parent.jsDoc;
             jsDocNode.jsDocCache = parent.jsDocCache;
             changes.insertJsdocCommentBefore(sourceFile, jsDocNode, tag);
         }
         function getJsDocNodeForArrowFunction(signature) {
-            if (signature.parent.kind === 154 /* PropertyDeclaration */) {
+            if (signature.parent.kind === 155 /* PropertyDeclaration */) {
                 return signature.parent;
             }
             return signature.parent.parent;
@@ -112497,14 +113757,14 @@ var ts;
                 return undefined;
             }
             switch (oldTag.kind) {
-                case 304 /* JSDocParameterTag */: {
+                case 305 /* JSDocParameterTag */: {
                     var oldParam = oldTag;
                     var newParam = newTag;
                     return ts.isIdentifier(oldParam.name) && ts.isIdentifier(newParam.name) && oldParam.name.escapedText === newParam.name.escapedText
                         ? ts.createJSDocParamTag(newParam.name, newParam.isBracketed, newParam.typeExpression, oldParam.comment)
                         : undefined;
                 }
-                case 305 /* JSDocReturnTag */:
+                case 306 /* JSDocReturnTag */:
                     return ts.createJSDocReturnTag(newTag.typeExpression, oldTag.comment);
             }
         }
@@ -112523,18 +113783,18 @@ var ts;
         function inferTypeForParametersFromUsage(containingFunction, sourceFile, program, cancellationToken) {
             var searchToken;
             switch (containingFunction.kind) {
-                case 157 /* Constructor */:
-                    searchToken = ts.findChildOfKind(containingFunction, 124 /* ConstructorKeyword */, sourceFile);
+                case 158 /* Constructor */:
+                    searchToken = ts.findChildOfKind(containingFunction, 125 /* ConstructorKeyword */, sourceFile);
                     break;
-                case 197 /* ArrowFunction */:
-                case 196 /* FunctionExpression */:
+                case 198 /* ArrowFunction */:
+                case 197 /* FunctionExpression */:
                     var parent = containingFunction.parent;
                     searchToken = ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name) ?
                         parent.name :
                         containingFunction.name;
                     break;
-                case 239 /* FunctionDeclaration */:
-                case 156 /* MethodDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 157 /* MethodDeclaration */:
                     searchToken = containingFunction.name;
                     break;
             }
@@ -112606,21 +113866,21 @@ var ts;
                     node = node.parent;
                 }
                 switch (node.parent.kind) {
-                    case 203 /* PostfixUnaryExpression */:
+                    case 204 /* PostfixUnaryExpression */:
                         usageContext.isNumber = true;
                         break;
-                    case 202 /* PrefixUnaryExpression */:
+                    case 203 /* PrefixUnaryExpression */:
                         inferTypeFromPrefixUnaryExpressionContext(node.parent, usageContext);
                         break;
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         inferTypeFromBinaryExpressionContext(node, node.parent, checker, usageContext);
                         break;
-                    case 271 /* CaseClause */:
-                    case 272 /* DefaultClause */:
+                    case 272 /* CaseClause */:
+                    case 273 /* DefaultClause */:
                         inferTypeFromSwitchStatementLabelContext(node.parent, checker, usageContext);
                         break;
-                    case 191 /* CallExpression */:
-                    case 192 /* NewExpression */:
+                    case 192 /* CallExpression */:
+                    case 193 /* NewExpression */:
                         if (node.parent.expression === node) {
                             inferTypeFromCallExpressionContext(node.parent, checker, usageContext);
                         }
@@ -112628,13 +113888,13 @@ var ts;
                             inferTypeFromContextualType(node, checker, usageContext);
                         }
                         break;
-                    case 189 /* PropertyAccessExpression */:
+                    case 190 /* PropertyAccessExpression */:
                         inferTypeFromPropertyAccessExpressionContext(node.parent, checker, usageContext);
                         break;
-                    case 190 /* ElementAccessExpression */:
+                    case 191 /* ElementAccessExpression */:
                         inferTypeFromPropertyElementExpressionContext(node.parent, node, checker, usageContext);
                         break;
-                    case 237 /* VariableDeclaration */: {
+                    case 238 /* VariableDeclaration */: {
                         var _a = node.parent, name = _a.name, initializer = _a.initializer;
                         if (node === name) {
                             if (initializer) { // This can happen for `let x = null;` which still has an implicit-any error.
@@ -112685,17 +113945,17 @@ var ts;
                     case 50 /* BarToken */:
                     case 51 /* CaretToken */:
                     // CompoundAssignmentOperator
-                    case 61 /* MinusEqualsToken */:
-                    case 63 /* AsteriskAsteriskEqualsToken */:
-                    case 62 /* AsteriskEqualsToken */:
-                    case 64 /* SlashEqualsToken */:
-                    case 65 /* PercentEqualsToken */:
-                    case 69 /* AmpersandEqualsToken */:
-                    case 70 /* BarEqualsToken */:
-                    case 71 /* CaretEqualsToken */:
-                    case 66 /* LessThanLessThanEqualsToken */:
-                    case 68 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-                    case 67 /* GreaterThanGreaterThanEqualsToken */:
+                    case 62 /* MinusEqualsToken */:
+                    case 64 /* AsteriskAsteriskEqualsToken */:
+                    case 63 /* AsteriskEqualsToken */:
+                    case 65 /* SlashEqualsToken */:
+                    case 66 /* PercentEqualsToken */:
+                    case 70 /* AmpersandEqualsToken */:
+                    case 71 /* BarEqualsToken */:
+                    case 72 /* CaretEqualsToken */:
+                    case 67 /* LessThanLessThanEqualsToken */:
+                    case 69 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 68 /* GreaterThanGreaterThanEqualsToken */:
                     // AdditiveOperator
                     case 39 /* MinusToken */:
                     // RelationalOperator
@@ -112711,7 +113971,7 @@ var ts;
                             usageContext.isNumber = true;
                         }
                         break;
-                    case 60 /* PlusEqualsToken */:
+                    case 61 /* PlusEqualsToken */:
                     case 38 /* PlusToken */:
                         var otherOperandType = checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
                         if (otherOperandType.flags & 1056 /* EnumLike */) {
@@ -112728,14 +113988,14 @@ var ts;
                         }
                         break;
                     //  AssignmentOperators
-                    case 59 /* EqualsToken */:
+                    case 60 /* EqualsToken */:
                     case 33 /* EqualsEqualsToken */:
                     case 35 /* EqualsEqualsEqualsToken */:
                     case 36 /* ExclamationEqualsEqualsToken */:
                     case 34 /* ExclamationEqualsToken */:
                         addCandidateType(usageContext, checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left));
                         break;
-                    case 93 /* InKeyword */:
+                    case 94 /* InKeyword */:
                         if (node === parent.left) {
                             usageContext.isString = true;
                         }
@@ -112743,7 +114003,7 @@ var ts;
                     // LogicalOperator
                     case 55 /* BarBarToken */:
                         if (node === parent.left &&
-                            (node.parent.parent.kind === 237 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) {
+                            (node.parent.parent.kind === 238 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) {
                             // var x = x || {};
                             // TODO: use getFalsyflagsOfType
                             addCandidateType(usageContext, checker.getTypeAtLocation(parent.right));
@@ -112751,7 +114011,7 @@ var ts;
                         break;
                     case 54 /* AmpersandAmpersandToken */:
                     case 27 /* CommaToken */:
-                    case 94 /* InstanceOfKeyword */:
+                    case 95 /* InstanceOfKeyword */:
                         // nothing to infer here
                         break;
                 }
@@ -112771,7 +114031,7 @@ var ts;
                     }
                 }
                 inferTypeFromContext(parent, checker, callContext.returnType);
-                if (parent.kind === 191 /* CallExpression */) {
+                if (parent.kind === 192 /* CallExpression */) {
                     (usageContext.callContexts || (usageContext.callContexts = [])).push(callContext);
                 }
                 else {
@@ -113011,12 +114271,12 @@ var ts;
             var precedingNode;
             var newClassDeclaration;
             switch (ctorDeclaration.kind) {
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     precedingNode = ctorDeclaration;
                     changes.delete(sourceFile, ctorDeclaration);
                     newClassDeclaration = createClassFromFunctionDeclaration(ctorDeclaration);
                     break;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     precedingNode = ctorDeclaration.parent.parent;
                     newClassDeclaration = createClassFromVariableDeclaration(ctorDeclaration);
                     if (ctorDeclaration.parent.declarations.length === 1) {
@@ -113048,7 +114308,7 @@ var ts;
                 // all static members are stored in the "exports" array of symbol
                 if (symbol.exports) {
                     symbol.exports.forEach(function (member) {
-                        var memberElement = createClassElement(member, [ts.createToken(116 /* StaticKeyword */)]);
+                        var memberElement = createClassElement(member, [ts.createToken(117 /* StaticKeyword */)]);
                         if (memberElement) {
                             memberElements.push(memberElement);
                         }
@@ -113071,7 +114331,7 @@ var ts;
                         return;
                     }
                     // delete the entire statement if this expression is the sole expression to take care of the semicolon at the end
-                    var nodeToDelete = assignmentBinaryExpression.parent && assignmentBinaryExpression.parent.kind === 221 /* ExpressionStatement */
+                    var nodeToDelete = assignmentBinaryExpression.parent && assignmentBinaryExpression.parent.kind === 222 /* ExpressionStatement */
                         ? assignmentBinaryExpression.parent : assignmentBinaryExpression;
                     changes.delete(sourceFile, nodeToDelete);
                     if (!assignmentBinaryExpression.right) {
@@ -113079,27 +114339,27 @@ var ts;
                         /*type*/ undefined, /*initializer*/ undefined);
                     }
                     switch (assignmentBinaryExpression.right.kind) {
-                        case 196 /* FunctionExpression */: {
+                        case 197 /* FunctionExpression */: {
                             var functionExpression = assignmentBinaryExpression.right;
-                            var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(functionExpression, 121 /* AsyncKeyword */));
+                            var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(functionExpression, 122 /* AsyncKeyword */));
                             var method = ts.createMethod(/*decorators*/ undefined, fullModifiers, /*asteriskToken*/ undefined, memberDeclaration.name, /*questionToken*/ undefined, 
                             /*typeParameters*/ undefined, functionExpression.parameters, /*type*/ undefined, functionExpression.body);
                             ts.copyLeadingComments(assignmentBinaryExpression, method, sourceFile);
                             return method;
                         }
-                        case 197 /* ArrowFunction */: {
+                        case 198 /* ArrowFunction */: {
                             var arrowFunction = assignmentBinaryExpression.right;
                             var arrowFunctionBody = arrowFunction.body;
                             var bodyBlock = void 0;
                             // case 1: () => { return [1,2,3] }
-                            if (arrowFunctionBody.kind === 218 /* Block */) {
+                            if (arrowFunctionBody.kind === 219 /* Block */) {
                                 bodyBlock = arrowFunctionBody;
                             }
                             // case 2: () => [1,2,3]
                             else {
                                 bodyBlock = ts.createBlock([ts.createReturn(arrowFunctionBody)]);
                             }
-                            var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(arrowFunction, 121 /* AsyncKeyword */));
+                            var fullModifiers = ts.concatenate(modifiers, getModifierKindFromSource(arrowFunction, 122 /* AsyncKeyword */));
                             var method = ts.createMethod(/*decorators*/ undefined, fullModifiers, /*asteriskToken*/ undefined, memberDeclaration.name, /*questionToken*/ undefined, 
                             /*typeParameters*/ undefined, arrowFunction.parameters, /*type*/ undefined, bodyBlock);
                             ts.copyLeadingComments(assignmentBinaryExpression, method, sourceFile);
@@ -113120,17 +114380,17 @@ var ts;
             }
             function createClassFromVariableDeclaration(node) {
                 var initializer = node.initializer;
-                if (!initializer || initializer.kind !== 196 /* FunctionExpression */) {
+                if (!initializer || initializer.kind !== 197 /* FunctionExpression */) {
                     return undefined;
                 }
-                if (node.name.kind !== 72 /* Identifier */) {
+                if (node.name.kind !== 73 /* Identifier */) {
                     return undefined;
                 }
                 var memberElements = createClassElementsFromSymbol(node.symbol);
                 if (initializer.body) {
                     memberElements.unshift(ts.createConstructor(/*decorators*/ undefined, /*modifiers*/ undefined, initializer.parameters, initializer.body));
                 }
-                var modifiers = getModifierKindFromSource(precedingNode, 85 /* ExportKeyword */);
+                var modifiers = getModifierKindFromSource(precedingNode, 86 /* ExportKeyword */);
                 var cls = ts.createClassDeclaration(/*decorators*/ undefined, modifiers, node.name, 
                 /*typeParameters*/ undefined, /*heritageClauses*/ undefined, memberElements);
                 // Don't call copyComments here because we'll already leave them in place
@@ -113141,7 +114401,7 @@ var ts;
                 if (node.body) {
                     memberElements.unshift(ts.createConstructor(/*decorators*/ undefined, /*modifiers*/ undefined, node.parameters, node.body));
                 }
-                var modifiers = getModifierKindFromSource(node, 85 /* ExportKeyword */);
+                var modifiers = getModifierKindFromSource(node, 86 /* ExportKeyword */);
                 var cls = ts.createClassDeclaration(/*decorators*/ undefined, modifiers, node.name, 
                 /*typeParameters*/ undefined, /*heritageClauses*/ undefined, memberElements);
                 // Don't call copyComments here because we'll already leave them in place
@@ -113171,6 +114431,11 @@ var ts;
             fixIds: [fixId],
             getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, err) { return convertToAsyncFunction(changes, err.file, err.start, context.program.getTypeChecker(), context); }); },
         });
+        var SynthBindingNameKind;
+        (function (SynthBindingNameKind) {
+            SynthBindingNameKind[SynthBindingNameKind["Identifier"] = 0] = "Identifier";
+            SynthBindingNameKind[SynthBindingNameKind["BindingPattern"] = 1] = "BindingPattern";
+        })(SynthBindingNameKind || (SynthBindingNameKind = {}));
         function convertToAsyncFunction(changes, sourceFile, position, checker, context) {
             // get the function declaration - returns a promise
             var tokenAtPosition = ts.getTokenAtPosition(sourceFile, position);
@@ -113199,7 +114464,7 @@ var ts;
                 return;
             }
             // add the async keyword
-            changes.insertLastModifierBefore(sourceFile, 121 /* AsyncKeyword */, functionToConvert);
+            changes.insertLastModifierBefore(sourceFile, 122 /* AsyncKeyword */, functionToConvert);
             function startTransformation(node, nodeToReplace) {
                 var newNodes = transformExpression(node, transformer, node);
                 changes.replaceNodeWithNodes(sourceFile, nodeToReplace, newNodes);
@@ -113307,8 +114572,8 @@ var ts;
                         allVarNames.push({ identifier: synthName.identifier, symbol: symbol });
                         addNameToFrequencyMap(collidingSymbolMap, ident.text, symbol);
                     }
-                    // we only care about identifiers that are parameters and declarations (don't care about other uses)
-                    else if (node.parent && (ts.isParameter(node.parent) || ts.isVariableDeclaration(node.parent))) {
+                    // we only care about identifiers that are parameters, declarations, or binding elements (don't care about other uses)
+                    else if (node.parent && (ts.isParameter(node.parent) || ts.isVariableDeclaration(node.parent) || ts.isBindingElement(node.parent))) {
                         var originalName = node.text;
                         var collidingSymbols = collidingSymbolMap.get(originalName);
                         // if the identifier name conflicts with a different identifier that we've already seen
@@ -113322,7 +114587,7 @@ var ts;
                         else {
                             var identifier = ts.getSynthesizedDeepClone(node);
                             identsToRenameMap.set(symbolIdString, identifier);
-                            synthNamesMap.set(symbolIdString, { identifier: identifier, types: [], numberOfAssignmentsOriginal: allVarNames.filter(function (elem) { return elem.identifier.text === node.text; }).length /*, numberOfAssignmentsSynthesized: 0*/ });
+                            synthNamesMap.set(symbolIdString, createSynthIdentifier(identifier, [], allVarNames.filter(function (elem) { return elem.identifier.text === node.text; }).length /*, numberOfAssignmentsSynthesized: 0*/));
                             if ((ts.isParameter(node.parent) && isExpressionOrCallOnTypePromise(node.parent.parent)) || ts.isVariableDeclaration(node.parent)) {
                                 allVarNames.push({ identifier: identifier, symbol: symbol });
                                 addNameToFrequencyMap(collidingSymbolMap, originalName, symbol);
@@ -113370,7 +114635,7 @@ var ts;
             var numVarsSameName = (originalNames.get(name.text) || ts.emptyArray).length;
             var numberOfAssignmentsOriginal = 0;
             var identifier = numVarsSameName === 0 ? name : ts.createIdentifier(name.text + "_" + numVarsSameName);
-            return { identifier: identifier, types: [], numberOfAssignmentsOriginal: numberOfAssignmentsOriginal };
+            return createSynthIdentifier(identifier, [], numberOfAssignmentsOriginal);
         }
         // dispatch function to recursively build the refactoring
         // should be kept up to date with isFixablePromiseHandler in suggestionDiagnostics.ts
@@ -113397,68 +114662,90 @@ var ts;
         }
         function transformCatch(node, transformer, prevArgName) {
             var func = node.arguments[0];
-            var argName = getArgName(func, transformer);
+            var argName = getArgBindingName(func, transformer);
             var shouldReturn = transformer.setOfExpressionsToReturn.get(ts.getNodeId(node).toString());
+            var possibleNameForVarDecl;
             /*
                 If there is another call in the chain after the .catch() we are transforming, we will need to save the result of both paths (try block and catch block)
                 To do this, we will need to synthesize a variable that we were not aware of while we were adding identifiers to the synthNamesMap
                 We will use the prevArgName and then update the synthNamesMap with a new variable name for the next transformation step
             */
             if (prevArgName && !shouldReturn) {
-                prevArgName.numberOfAssignmentsOriginal = 2; // Try block and catch block
-                transformer.synthNamesMap.forEach(function (val, key) {
-                    if (val.identifier.text === prevArgName.identifier.text) {
-                        var newSynthName = createUniqueSynthName(prevArgName);
-                        transformer.synthNamesMap.set(key, newSynthName);
-                    }
-                });
+                if (isSynthIdentifier(prevArgName)) {
+                    possibleNameForVarDecl = prevArgName;
+                    transformer.synthNamesMap.forEach(function (val, key) {
+                        if (val.identifier.text === prevArgName.identifier.text) {
+                            var newSynthName = createUniqueSynthName(prevArgName);
+                            transformer.synthNamesMap.set(key, newSynthName);
+                        }
+                    });
+                }
+                else {
+                    possibleNameForVarDecl = createSynthIdentifier(ts.createOptimisticUniqueName("result"), prevArgName.types);
+                }
+                possibleNameForVarDecl.numberOfAssignmentsOriginal = 2; // Try block and catch block
                 // update the constIdentifiers list
-                if (transformer.constIdentifiers.some(function (elem) { return elem.text === prevArgName.identifier.text; })) {
-                    transformer.constIdentifiers.push(createUniqueSynthName(prevArgName).identifier);
+                if (transformer.constIdentifiers.some(function (elem) { return elem.text === possibleNameForVarDecl.identifier.text; })) {
+                    transformer.constIdentifiers.push(createUniqueSynthName(possibleNameForVarDecl).identifier);
                 }
             }
-            var tryBlock = ts.createBlock(transformExpression(node.expression, transformer, node, prevArgName));
-            var transformationBody = getTransformationBody(func, prevArgName, argName, node, transformer);
-            var catchArg = argName ? argName.identifier.text : "e";
-            var catchClause = ts.createCatchClause(catchArg, ts.createBlock(transformationBody));
+            var tryBlock = ts.createBlock(transformExpression(node.expression, transformer, node, possibleNameForVarDecl));
+            var transformationBody = getTransformationBody(func, possibleNameForVarDecl, argName, node, transformer);
+            var catchArg = argName ? isSynthIdentifier(argName) ? argName.identifier.text : argName.bindingPattern : "e";
+            var catchVariableDeclaration = ts.createVariableDeclaration(catchArg);
+            var catchClause = ts.createCatchClause(catchVariableDeclaration, ts.createBlock(transformationBody));
             /*
                 In order to avoid an implicit any, we will synthesize a type for the declaration using the unions of the types of both paths (try block and catch block)
             */
             var varDeclList;
-            if (prevArgName && !shouldReturn) {
-                var typeArray = prevArgName.types;
+            var varDeclIdentifier;
+            if (possibleNameForVarDecl && !shouldReturn) {
+                varDeclIdentifier = ts.getSynthesizedDeepClone(possibleNameForVarDecl.identifier);
+                var typeArray = possibleNameForVarDecl.types;
                 var unionType = transformer.checker.getUnionType(typeArray, 2 /* Subtype */);
                 var unionTypeNode = transformer.isInJSFile ? undefined : transformer.checker.typeToTypeNode(unionType);
-                var varDecl = [ts.createVariableDeclaration(ts.getSynthesizedDeepClone(prevArgName.identifier), unionTypeNode)];
+                var varDecl = [ts.createVariableDeclaration(varDeclIdentifier, unionTypeNode)];
                 varDeclList = ts.createVariableStatement(/*modifiers*/ undefined, ts.createVariableDeclarationList(varDecl, 1 /* Let */));
             }
             var tryStatement = ts.createTry(tryBlock, catchClause, /*finallyBlock*/ undefined);
-            return varDeclList ? [varDeclList, tryStatement] : [tryStatement];
+            var destructuredResult = prevArgName && varDeclIdentifier && isSynthBindingPattern(prevArgName)
+                && ts.createVariableStatement(/* modifiers */ undefined, ts.createVariableDeclarationList([ts.createVariableDeclaration(ts.getSynthesizedDeepCloneWithRenames(prevArgName.bindingPattern), /* type */ undefined, varDeclIdentifier)], 2 /* Const */));
+            return ts.compact([varDeclList, tryStatement, destructuredResult]);
+        }
+        function getIdentifierTextsFromBindingName(bindingName) {
+            if (ts.isIdentifier(bindingName))
+                return [bindingName.text];
+            return ts.flatMap(bindingName.elements, function (element) {
+                if (ts.isOmittedExpression(element))
+                    return [];
+                return getIdentifierTextsFromBindingName(element.name);
+            });
         }
         function createUniqueSynthName(prevArgName) {
             var renamedPrevArg = ts.createOptimisticUniqueName(prevArgName.identifier.text);
-            var newSynthName = { identifier: renamedPrevArg, types: [], numberOfAssignmentsOriginal: 0 };
-            return newSynthName;
+            return createSynthIdentifier(renamedPrevArg);
         }
         function transformThen(node, transformer, outermostParent, prevArgName) {
             var _a = node.arguments, res = _a[0], rej = _a[1];
             if (!res) {
                 return transformExpression(node.expression, transformer, outermostParent);
             }
-            var argNameRes = getArgName(res, transformer);
+            var argNameRes = getArgBindingName(res, transformer);
             var transformationBody = getTransformationBody(res, prevArgName, argNameRes, node, transformer);
             if (rej) {
-                var argNameRej = getArgName(rej, transformer);
+                var argNameRej = getArgBindingName(rej, transformer);
                 var tryBlock = ts.createBlock(transformExpression(node.expression, transformer, node, argNameRes).concat(transformationBody));
                 var transformationBody2 = getTransformationBody(rej, prevArgName, argNameRej, node, transformer);
-                var catchArg = argNameRej ? argNameRej.identifier.text : "e";
-                var catchClause = ts.createCatchClause(catchArg, ts.createBlock(transformationBody2));
+                var catchArg = argNameRej ? isSynthIdentifier(argNameRej) ? argNameRej.identifier.text : argNameRej.bindingPattern : "e";
+                var catchVariableDeclaration = ts.createVariableDeclaration(catchArg);
+                var catchClause = ts.createCatchClause(catchVariableDeclaration, ts.createBlock(transformationBody2));
                 return [ts.createTry(tryBlock, catchClause, /* finallyBlock */ undefined)];
             }
             return transformExpression(node.expression, transformer, node, argNameRes).concat(transformationBody);
         }
-        function getFlagOfIdentifier(node, constIdentifiers) {
-            var inArr = constIdentifiers.some(function (elem) { return elem.text === node.text; });
+        function getFlagOfBindingName(bindingName, constIdentifiers) {
+            var identifiers = getIdentifierTextsFromBindingName(getNode(bindingName));
+            var inArr = constIdentifiers.some(function (elem) { return ts.contains(identifiers, elem.text); });
             return inArr ? 2 /* Const */ : 1 /* Let */;
         }
         function transformPromiseCall(node, transformer, prevArgName) {
@@ -113474,29 +114761,29 @@ var ts;
             return [ts.createReturn(ts.getSynthesizedDeepClone(node))];
         }
         function createTransformedStatement(prevArgName, rightHandSide, transformer) {
-            if (!prevArgName || prevArgName.identifier.text.length === 0) {
+            if (!prevArgName || isEmpty(prevArgName)) {
                 // if there's no argName to assign to, there still might be side effects
                 return [ts.createStatement(rightHandSide)];
             }
-            if (prevArgName.types.length < prevArgName.numberOfAssignmentsOriginal) {
+            if (isSynthIdentifier(prevArgName) && prevArgName.types.length < prevArgName.numberOfAssignmentsOriginal) {
                 // if the variable has already been declared, we don't need "let" or "const"
                 return [ts.createStatement(ts.createAssignment(ts.getSynthesizedDeepClone(prevArgName.identifier), rightHandSide))];
             }
-            return [ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(ts.getSynthesizedDeepClone(prevArgName.identifier), /*type*/ undefined, rightHandSide)], getFlagOfIdentifier(prevArgName.identifier, transformer.constIdentifiers))))];
+            return [ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(ts.getSynthesizedDeepClone(getNode(prevArgName)), /*type*/ undefined, rightHandSide)], getFlagOfBindingName(prevArgName, transformer.constIdentifiers))))];
         }
         // should be kept up to date with isFixablePromiseArgument in suggestionDiagnostics.ts
         function getTransformationBody(func, prevArgName, argName, parent, transformer) {
             var shouldReturn = transformer.setOfExpressionsToReturn.get(ts.getNodeId(parent).toString());
             switch (func.kind) {
-                case 96 /* NullKeyword */:
+                case 97 /* NullKeyword */:
                     // do not produce a transformed statement for a null argument
                     break;
-                case 72 /* Identifier */: // identifier includes undefined
+                case 73 /* Identifier */: // identifier includes undefined
                     if (!argName) {
                         // undefined was argument passed to promise handler
                         break;
                     }
-                    var synthCall = ts.createCall(ts.getSynthesizedDeepClone(func), /*typeArguments*/ undefined, [argName.identifier]);
+                    var synthCall = ts.createCall(ts.getSynthesizedDeepClone(func), /*typeArguments*/ undefined, isSynthIdentifier(argName) ? [argName.identifier] : []);
                     if (shouldReturn) {
                         return [ts.createReturn(synthCall)];
                     }
@@ -113513,8 +114800,8 @@ var ts;
                         prevArgName.types.push(returnType);
                     }
                     return varDeclOrAssignment;
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */: {
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */: {
                     var funcBody = func.body;
                     // Arrow functions with block bodies { } will enter this control flow
                     if (ts.isBlock(funcBody)) {
@@ -113533,7 +114820,7 @@ var ts;
                             }
                         }
                         return shouldReturn ? refactoredStmts.map(function (s) { return ts.getSynthesizedDeepClone(s); }) :
-                            removeReturns(refactoredStmts, prevArgName === undefined ? undefined : prevArgName.identifier, transformer, seenReturnStatement);
+                            removeReturns(refactoredStmts, prevArgName, transformer, seenReturnStatement);
                     }
                     else {
                         var innerRetStmts = ts.isFixablePromiseHandler(funcBody) ? [ts.createReturn(funcBody)] : ts.emptyArray;
@@ -113579,7 +114866,7 @@ var ts;
                             ret.push(ts.createExpressionStatement(possiblyAwaitedExpression));
                         }
                         else {
-                            ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(prevArgName, /*type*/ undefined, possiblyAwaitedExpression)], getFlagOfIdentifier(prevArgName, transformer.constIdentifiers)))));
+                            ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(getNode(prevArgName), /*type*/ undefined, possiblyAwaitedExpression)], getFlagOfBindingName(prevArgName, transformer.constIdentifiers)))));
                         }
                     }
                 }
@@ -113589,7 +114876,7 @@ var ts;
             }
             // if block has no return statement, need to define prevArgName as undefined to prevent undeclared variables
             if (!seenReturnStatement && prevArgName !== undefined) {
-                ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(prevArgName, /*type*/ undefined, ts.createIdentifier("undefined"))], getFlagOfIdentifier(prevArgName, transformer.constIdentifiers)))));
+                ret.push(ts.createVariableStatement(/*modifiers*/ undefined, (ts.createVariableDeclarationList([ts.createVariableDeclaration(getNode(prevArgName), /*type*/ undefined, ts.createIdentifier("undefined"))], getFlagOfBindingName(prevArgName, transformer.constIdentifiers)))));
             }
             return ret;
         }
@@ -113612,32 +114899,42 @@ var ts;
             }
             return innerCbBody;
         }
-        function getArgName(funcNode, transformer) {
+        function getArgBindingName(funcNode, transformer) {
             var numberOfAssignmentsOriginal = 0;
             var types = [];
             var name;
             if (ts.isFunctionLikeDeclaration(funcNode)) {
                 if (funcNode.parameters.length > 0) {
                     var param = funcNode.parameters[0].name;
-                    name = getMapEntryOrDefault(param);
+                    name = getMappedBindingNameOrDefault(param);
                 }
             }
             else if (ts.isIdentifier(funcNode)) {
                 name = getMapEntryOrDefault(funcNode);
             }
             // return undefined argName when arg is null or undefined
-            if (!name || name.identifier.text === "undefined") {
+            if (!name || "identifier" in name && name.identifier.text === "undefined") {
                 return undefined;
             }
             return name;
+            function getMappedBindingNameOrDefault(bindingName) {
+                if (ts.isIdentifier(bindingName))
+                    return getMapEntryOrDefault(bindingName);
+                var elements = ts.flatMap(bindingName.elements, function (element) {
+                    if (ts.isOmittedExpression(element))
+                        return [];
+                    return [getMappedBindingNameOrDefault(element.name)];
+                });
+                return createSynthBindingPattern(bindingName, elements);
+            }
             function getMapEntryOrDefault(identifier) {
                 var originalNode = getOriginalNode(identifier);
                 var symbol = getSymbol(originalNode);
                 if (!symbol) {
-                    return { identifier: identifier, types: types, numberOfAssignmentsOriginal: numberOfAssignmentsOriginal };
+                    return createSynthIdentifier(identifier, types, numberOfAssignmentsOriginal);
                 }
                 var mapEntry = transformer.synthNamesMap.get(ts.getSymbolId(symbol).toString());
-                return mapEntry || { identifier: identifier, types: types, numberOfAssignmentsOriginal: numberOfAssignmentsOriginal };
+                return mapEntry || createSynthIdentifier(identifier, types, numberOfAssignmentsOriginal);
             }
             function getSymbol(node) {
                 return node.symbol ? node.symbol : transformer.checker.getSymbolAtLocation(node);
@@ -113646,6 +114943,34 @@ var ts;
                 return node.original ? node.original : node;
             }
         }
+        function isEmpty(bindingName) {
+            if (!bindingName) {
+                return true;
+            }
+            if (isSynthIdentifier(bindingName)) {
+                return !bindingName.identifier.text;
+            }
+            return ts.every(bindingName.elements, isEmpty);
+        }
+        function getNode(bindingName) {
+            return isSynthIdentifier(bindingName) ? bindingName.identifier : bindingName.bindingPattern;
+        }
+        function createSynthIdentifier(identifier, types, numberOfAssignmentsOriginal) {
+            if (types === void 0) { types = []; }
+            if (numberOfAssignmentsOriginal === void 0) { numberOfAssignmentsOriginal = 0; }
+            return { kind: 0 /* Identifier */, identifier: identifier, types: types, numberOfAssignmentsOriginal: numberOfAssignmentsOriginal };
+        }
+        function createSynthBindingPattern(bindingPattern, elements, types) {
+            if (elements === void 0) { elements = ts.emptyArray; }
+            if (types === void 0) { types = []; }
+            return { kind: 1 /* BindingPattern */, bindingPattern: bindingPattern, elements: elements, types: types };
+        }
+        function isSynthIdentifier(bindingName) {
+            return bindingName.kind === 0 /* Identifier */;
+        }
+        function isSynthBindingPattern(bindingName) {
+            return bindingName.kind === 1 /* BindingPattern */;
+        }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
 /* @internal */
@@ -113679,10 +115004,10 @@ var ts;
                 }
                 var importNode = ts.importFromModuleSpecifier(moduleSpecifier);
                 switch (importNode.kind) {
-                    case 248 /* ImportEqualsDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
                         changes.replaceNode(importingFile, importNode, ts.makeImport(importNode.name, /*namedImports*/ undefined, moduleSpecifier, quotePreference));
                         break;
-                    case 191 /* CallExpression */:
+                    case 192 /* CallExpression */:
                         if (ts.isRequireCall(importNode, /*checkArgumentIsStringLiteralLike*/ false)) {
                             changes.replaceNode(importingFile, importNode, ts.createPropertyAccess(ts.getSynthesizedDeepClone(importNode), "default"));
                         }
@@ -113728,29 +115053,29 @@ var ts;
             sourceFile.forEachChild(function recur(node) {
                 if (ts.isPropertyAccessExpression(node) && ts.isExportsOrModuleExportsOrAlias(sourceFile, node.expression)) {
                     var parent = node.parent;
-                    cb(node, ts.isBinaryExpression(parent) && parent.left === node && parent.operatorToken.kind === 59 /* EqualsToken */);
+                    cb(node, ts.isBinaryExpression(parent) && parent.left === node && parent.operatorToken.kind === 60 /* EqualsToken */);
                 }
                 node.forEachChild(recur);
             });
         }
         function convertStatement(sourceFile, statement, checker, changes, identifiers, target, exports, quotePreference) {
             switch (statement.kind) {
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     convertVariableStatement(sourceFile, statement, changes, checker, identifiers, target, quotePreference);
                     return false;
-                case 221 /* ExpressionStatement */: {
+                case 222 /* ExpressionStatement */: {
                     var expression = statement.expression;
                     switch (expression.kind) {
-                        case 191 /* CallExpression */: {
+                        case 192 /* CallExpression */: {
                             if (ts.isRequireCall(expression, /*checkArgumentIsStringLiteralLike*/ true)) {
                                 // For side-effecting require() call, just make a side-effecting import.
                                 changes.replaceNode(sourceFile, statement, ts.makeImport(/*name*/ undefined, /*namedImports*/ undefined, expression.arguments[0], quotePreference));
                             }
                             return false;
                         }
-                        case 204 /* BinaryExpression */: {
+                        case 205 /* BinaryExpression */: {
                             var operatorToken = expression.operatorToken;
-                            return operatorToken.kind === 59 /* EqualsToken */ && convertAssignment(sourceFile, checker, expression, changes, exports);
+                            return operatorToken.kind === 60 /* EqualsToken */ && convertAssignment(sourceFile, checker, expression, changes, exports);
                         }
                     }
                 }
@@ -113790,8 +115115,8 @@ var ts;
         /** Converts `const name = require("moduleSpecifier").propertyName` */
         function convertPropertyAccessImport(name, propertyName, moduleSpecifier, identifiers, quotePreference) {
             switch (name.kind) {
-                case 184 /* ObjectBindingPattern */:
-                case 185 /* ArrayBindingPattern */: {
+                case 185 /* ObjectBindingPattern */:
+                case 186 /* ArrayBindingPattern */: {
                     // `const [a, b] = require("c").d` --> `import { d } from "c"; const [a, b] = d;`
                     var tmp = makeUniqueName(propertyName, identifiers);
                     return [
@@ -113799,7 +115124,7 @@ var ts;
                         makeConst(/*modifiers*/ undefined, name, ts.createIdentifier(tmp)),
                     ];
                 }
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     // `const a = require("b").c` --> `import { c as a } from "./b";
                     return [makeSingleImport(name.text, propertyName, moduleSpecifier, quotePreference)];
                 default:
@@ -113842,16 +115167,16 @@ var ts;
         function tryChangeModuleExportsObject(object) {
             var statements = ts.mapAllOrFail(object.properties, function (prop) {
                 switch (prop.kind) {
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
                     // TODO: Maybe we should handle this? See fourslash test `refactorConvertToEs6Module_export_object_shorthand.ts`.
-                    case 276 /* ShorthandPropertyAssignment */:
-                    case 277 /* SpreadAssignment */:
+                    case 277 /* ShorthandPropertyAssignment */:
+                    case 278 /* SpreadAssignment */:
                         return undefined;
-                    case 275 /* PropertyAssignment */:
+                    case 276 /* PropertyAssignment */:
                         return !ts.isIdentifier(prop.name) ? undefined : convertExportsDotXEquals_replaceNode(prop.name.text, prop.initializer);
-                    case 156 /* MethodDeclaration */:
-                        return !ts.isIdentifier(prop.name) ? undefined : functionExpressionToDeclaration(prop.name.text, [ts.createToken(85 /* ExportKeyword */)], prop);
+                    case 157 /* MethodDeclaration */:
+                        return !ts.isIdentifier(prop.name) ? undefined : functionExpressionToDeclaration(prop.name.text, [ts.createToken(86 /* ExportKeyword */)], prop);
                     default:
                         ts.Debug.assertNever(prop);
                 }
@@ -113900,7 +115225,7 @@ var ts;
             var name = left.name.text;
             if ((ts.isFunctionExpression(right) || ts.isArrowFunction(right) || ts.isClassExpression(right)) && (!right.name || right.name.text === name)) {
                 // `exports.f = function() {}` -> `export function f() {}` -- Replace `exports.f = ` with `export `, and insert the name after `function`.
-                changes.replaceRange(sourceFile, { pos: left.getStart(sourceFile), end: right.getStart(sourceFile) }, ts.createToken(85 /* ExportKeyword */), { suffix: " " });
+                changes.replaceRange(sourceFile, { pos: left.getStart(sourceFile), end: right.getStart(sourceFile) }, ts.createToken(86 /* ExportKeyword */), { suffix: " " });
                 if (!right.name)
                     changes.insertName(sourceFile, right, name);
                 var semi = ts.findChildOfKind(parent, 26 /* SemicolonToken */, sourceFile);
@@ -113909,14 +115234,14 @@ var ts;
             }
             else {
                 // `exports.f = function g() {}` -> `export const f = function g() {}` -- just replace `exports.` with `export const `
-                changes.replaceNodeRangeWithNodes(sourceFile, left.expression, ts.findChildOfKind(left, 24 /* DotToken */, sourceFile), [ts.createToken(85 /* ExportKeyword */), ts.createToken(77 /* ConstKeyword */)], { joiner: " ", suffix: " " });
+                changes.replaceNodeRangeWithNodes(sourceFile, left.expression, ts.findChildOfKind(left, 24 /* DotToken */, sourceFile), [ts.createToken(86 /* ExportKeyword */), ts.createToken(78 /* ConstKeyword */)], { joiner: " ", suffix: " " });
             }
         }
         // TODO: GH#22492 this will cause an error if a change has been made inside the body of the node.
         function convertExportsDotXEquals_replaceNode(name, exported) {
-            var modifiers = [ts.createToken(85 /* ExportKeyword */)];
+            var modifiers = [ts.createToken(86 /* ExportKeyword */)];
             switch (exported.kind) {
-                case 196 /* FunctionExpression */: {
+                case 197 /* FunctionExpression */: {
                     var expressionName = exported.name;
                     if (expressionName && expressionName.text !== name) {
                         // `exports.f = function g() {}` -> `export const f = function g() {}`
@@ -113924,10 +115249,10 @@ var ts;
                     }
                 }
                 // falls through
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     // `exports.f = function() {}` --> `export function f() {}`
                     return functionExpressionToDeclaration(name, modifiers, exported);
-                case 209 /* ClassExpression */:
+                case 210 /* ClassExpression */:
                     // `exports.C = class {}` --> `export class C {}`
                     return classExpressionToDeclaration(name, modifiers, exported);
                 default:
@@ -113945,7 +115270,7 @@ var ts;
          */
         function convertSingleImport(file, name, moduleSpecifier, changes, checker, identifiers, target, quotePreference) {
             switch (name.kind) {
-                case 184 /* ObjectBindingPattern */: {
+                case 185 /* ObjectBindingPattern */: {
                     var importSpecifiers = ts.mapAllOrFail(name.elements, function (e) {
                         return e.dotDotDotToken || e.initializer || e.propertyName && !ts.isIdentifier(e.propertyName) || !ts.isIdentifier(e.name)
                             ? undefined
@@ -113956,7 +115281,7 @@ var ts;
                     }
                 }
                 // falls through -- object destructuring has an interesting pattern and must be a variable declaration
-                case 185 /* ArrayBindingPattern */: {
+                case 186 /* ArrayBindingPattern */: {
                     /*
                     import x from "x";
                     const [a, b, c] = x;
@@ -113967,7 +115292,7 @@ var ts;
                         makeConst(/*modifiers*/ undefined, ts.getSynthesizedDeepClone(name), ts.createIdentifier(tmp)),
                     ];
                 }
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return convertSingleIdentifierImport(file, name, moduleSpecifier, changes, checker, identifiers, quotePreference);
                 default:
                     return ts.Debug.assertNever(name);
@@ -114039,11 +115364,11 @@ var ts;
         function isFreeIdentifier(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     return parent.name !== node;
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     return parent.propertyName !== node;
-                case 253 /* ImportSpecifier */:
+                case 254 /* ImportSpecifier */:
                     return parent.propertyName !== node;
                 default:
                     return true;
@@ -114382,21 +115707,21 @@ var ts;
         function tryAddToExistingImport(existingImports) {
             return ts.firstDefined(existingImports, function (_a) {
                 var declaration = _a.declaration, importKind = _a.importKind;
-                if (declaration.kind !== 249 /* ImportDeclaration */)
+                if (declaration.kind !== 250 /* ImportDeclaration */)
                     return undefined;
                 var importClause = declaration.importClause;
                 if (!importClause)
                     return undefined;
                 var name = importClause.name, namedBindings = importClause.namedBindings;
-                return importKind === 1 /* Default */ && !name || importKind === 0 /* Named */ && (!namedBindings || namedBindings.kind === 252 /* NamedImports */)
+                return importKind === 1 /* Default */ && !name || importKind === 0 /* Named */ && (!namedBindings || namedBindings.kind === 253 /* NamedImports */)
                     ? { kind: 2 /* AddToExisting */, importClause: importClause, importKind: importKind }
                     : undefined;
             });
         }
         function getNamespaceImportName(declaration) {
-            if (declaration.kind === 249 /* ImportDeclaration */) {
+            if (declaration.kind === 250 /* ImportDeclaration */) {
                 var namedBindings = declaration.importClause && ts.isImportClause(declaration.importClause) && declaration.importClause.namedBindings;
-                return namedBindings && namedBindings.kind === 251 /* NamespaceImport */ ? namedBindings.name : undefined;
+                return namedBindings && namedBindings.kind === 252 /* NamespaceImport */ ? namedBindings.name : undefined;
             }
             else {
                 return declaration.name;
@@ -114407,7 +115732,7 @@ var ts;
             // Can't use an es6 import for a type in JS.
             return exportedSymbolIsTypeOnly && ts.isSourceFileJS(sourceFile) ? ts.emptyArray : ts.mapDefined(sourceFile.imports, function (moduleSpecifier) {
                 var i = ts.importFromModuleSpecifier(moduleSpecifier);
-                return (i.kind === 249 /* ImportDeclaration */ || i.kind === 248 /* ImportEqualsDeclaration */)
+                return (i.kind === 250 /* ImportDeclaration */ || i.kind === 249 /* ImportEqualsDeclaration */)
                     && checker.getSymbolAtLocation(moduleSpecifier) === moduleSymbol ? { declaration: i, importKind: importKind } : undefined;
             });
         }
@@ -114430,9 +115755,9 @@ var ts;
         }
         function newImportInfoFromExistingSpecifier(_a) {
             var declaration = _a.declaration, importKind = _a.importKind;
-            var expression = declaration.kind === 249 /* ImportDeclaration */
+            var expression = declaration.kind === 250 /* ImportDeclaration */
                 ? declaration.moduleSpecifier
-                : declaration.moduleReference.kind === 259 /* ExternalModuleReference */
+                : declaration.moduleReference.kind === 260 /* ExternalModuleReference */
                     ? declaration.moduleReference.expression
                     : undefined;
             return expression && ts.isStringLiteral(expression) ? { kind: 3 /* AddNew */, moduleSpecifier: expression.text, importKind: importKind } : undefined;
@@ -114760,12 +116085,12 @@ var ts;
             var checker = context.program.getTypeChecker();
             var suggestion;
             if (ts.isPropertyAccessExpression(node.parent) && node.parent.name === node) {
-                ts.Debug.assert(node.kind === 72 /* Identifier */);
+                ts.Debug.assert(node.kind === 73 /* Identifier */);
                 var containingType = checker.getTypeAtLocation(node.parent.expression);
                 suggestion = checker.getSuggestionForNonexistentProperty(node, containingType);
             }
             else if (ts.isImportSpecifier(node.parent) && node.parent.name === node) {
-                ts.Debug.assert(node.kind === 72 /* Identifier */);
+                ts.Debug.assert(node.kind === 73 /* Identifier */);
                 var importDeclaration = ts.findAncestor(node, ts.isImportDeclaration);
                 var resolvedSourceFile = getResolvedSourceFileFromImportDeclaration(sourceFile, context, importDeclaration);
                 if (resolvedSourceFile && resolvedSourceFile.symbol) {
@@ -114828,7 +116153,7 @@ var ts;
         codefix.registerCodeFix({
             errorCodes: errorCodes,
             getCodeActions: function (context) {
-                var info = getInfo(context.sourceFile, context.span.start, context.program.getTypeChecker());
+                var info = getInfo(context.sourceFile, context.span.start, context.program.getTypeChecker(), context.program);
                 if (!info)
                     return undefined;
                 if (info.kind === 0 /* Enum */) {
@@ -114851,7 +116176,7 @@ var ts;
                 var typeDeclToMembers = new ts.NodeMap();
                 return codefix.createCombinedCodeActions(ts.textChanges.ChangeTracker.with(context, function (changes) {
                     codefix.eachDiagnostic(context, errorCodes, function (diag) {
-                        var info = getInfo(diag.file, diag.start, checker);
+                        var info = getInfo(diag.file, diag.start, checker, context.program);
                         if (!info || !ts.addToSeen(seen, ts.getNodeId(info.parentDeclaration) + "#" + info.token.text)) {
                             return;
                         }
@@ -114919,7 +116244,7 @@ var ts;
             InfoKind[InfoKind["Enum"] = 0] = "Enum";
             InfoKind[InfoKind["ClassOrInterface"] = 1] = "ClassOrInterface";
         })(InfoKind || (InfoKind = {}));
-        function getInfo(tokenSourceFile, tokenPos, checker) {
+        function getInfo(tokenSourceFile, tokenPos, checker, program) {
             // The identifier of the missing property. eg:
             // this.missing = 1;
             //      ^^^^^^^
@@ -114936,7 +116261,7 @@ var ts;
                 return undefined;
             // Prefer to change the class instead of the interface if they are merged
             var classOrInterface = ts.find(symbol.declarations, ts.isClassLike) || ts.find(symbol.declarations, ts.isInterfaceDeclaration);
-            if (classOrInterface) {
+            if (classOrInterface && !program.isSourceFileFromExternalLibrary(classOrInterface.getSourceFile())) {
                 var makeStatic = (leftExpressionType.target || leftExpressionType) !== checker.getDeclaredTypeOfSymbol(symbol);
                 var declSourceFile = classOrInterface.getSourceFile();
                 var inJs = ts.isSourceFileJS(declSourceFile);
@@ -114944,7 +116269,7 @@ var ts;
                 return { kind: 1 /* ClassOrInterface */, token: token, parentDeclaration: classOrInterface, makeStatic: makeStatic, declSourceFile: declSourceFile, inJs: inJs, call: call };
             }
             var enumDeclaration = ts.find(symbol.declarations, ts.isEnumDeclaration);
-            if (enumDeclaration) {
+            if (enumDeclaration && !program.isSourceFileFromExternalLibrary(enumDeclaration.getSourceFile())) {
                 return { kind: 0 /* Enum */, token: token, parentDeclaration: enumDeclaration };
             }
             return undefined;
@@ -114956,7 +116281,7 @@ var ts;
         }
         function addMissingMemberInJs(changeTracker, declSourceFile, classDeclaration, tokenName, makeStatic) {
             if (makeStatic) {
-                if (classDeclaration.kind === 209 /* ClassExpression */) {
+                if (classDeclaration.kind === 210 /* ClassExpression */) {
                     return;
                 }
                 var className = classDeclaration.name.getText();
@@ -114982,7 +116307,7 @@ var ts;
         }
         function getTypeNode(checker, classDeclaration, token) {
             var typeNode;
-            if (token.parent.parent.kind === 204 /* BinaryExpression */) {
+            if (token.parent.parent.kind === 205 /* BinaryExpression */) {
                 var binaryExpression = token.parent.parent;
                 var otherExpression = token.parent === binaryExpression.left ? binaryExpression.right : binaryExpression.left;
                 var widenedType = checker.getWidenedType(checker.getBaseTypeOfLiteralType(checker.getTypeAtLocation(otherExpression)));
@@ -114992,7 +116317,7 @@ var ts;
                 var contextualType = checker.getContextualType(token.parent);
                 typeNode = contextualType ? checker.typeToTypeNode(contextualType) : undefined;
             }
-            return typeNode || ts.createKeywordTypeNode(120 /* AnyKeyword */);
+            return typeNode || ts.createKeywordTypeNode(121 /* AnyKeyword */);
         }
         function createAddPropertyDeclarationAction(context, declSourceFile, classDeclaration, makeStatic, tokenName, typeNode) {
             var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return addPropertyDeclaration(t, declSourceFile, classDeclaration, tokenName, typeNode, makeStatic); });
@@ -115001,7 +116326,7 @@ var ts;
         function addPropertyDeclaration(changeTracker, declSourceFile, classDeclaration, tokenName, typeNode, makeStatic) {
             var property = ts.createProperty(
             /*decorators*/ undefined, 
-            /*modifiers*/ makeStatic ? [ts.createToken(116 /* StaticKeyword */)] : undefined, tokenName, 
+            /*modifiers*/ makeStatic ? [ts.createToken(117 /* StaticKeyword */)] : undefined, tokenName, 
             /*questionToken*/ undefined, typeNode, 
             /*initializer*/ undefined);
             var lastProp = getNodeToInsertPropertyAfter(classDeclaration);
@@ -115025,7 +116350,7 @@ var ts;
         }
         function createAddIndexSignatureAction(context, declSourceFile, classDeclaration, tokenName, typeNode) {
             // Index signatures cannot have the static modifier.
-            var stringTypeNode = ts.createKeywordTypeNode(138 /* StringKeyword */);
+            var stringTypeNode = ts.createKeywordTypeNode(139 /* StringKeyword */);
             var indexingParameter = ts.createParameter(
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
@@ -115045,7 +116370,7 @@ var ts;
         }
         function addMethodDeclaration(context, changeTracker, declSourceFile, typeDecl, token, callExpression, makeStatic, inJs, preferences) {
             var methodDeclaration = codefix.createMethodFromCallExpression(context, callExpression, token.text, inJs, makeStatic, preferences, typeDecl);
-            var containingMethodDeclaration = ts.getAncestor(callExpression, 156 /* MethodDeclaration */);
+            var containingMethodDeclaration = ts.getAncestor(callExpression, 157 /* MethodDeclaration */);
             if (containingMethodDeclaration && containingMethodDeclaration.parent === typeDecl) {
                 changeTracker.insertNodeAfter(declSourceFile, containingMethodDeclaration, methodDeclaration);
             }
@@ -115109,7 +116434,6 @@ var ts;
     (function (codefix) {
         var fixName = "fixCannotFindModule";
         var fixIdInstallTypesPackage = "installTypesPackage";
-        var fixIdGenerateTypes = "generateTypes";
         var errorCodeCannotFindModule = ts.Diagnostics.Cannot_find_module_0.code;
         var errorCodes = [
             errorCodeCannotFindModule,
@@ -115124,13 +116448,12 @@ var ts;
                     return undefined;
                 var typesPackageName = getTypesPackageNameToInstall(packageName, host, context.errorCode);
                 return typesPackageName === undefined
-                    ? ts.singleElementArray(tryGetGenerateTypesAction(context, packageName))
+                    ? []
                     : [codefix.createCodeFixAction(fixName, /*changes*/ [], [ts.Diagnostics.Install_0, typesPackageName], fixIdInstallTypesPackage, ts.Diagnostics.Install_all_missing_types_packages, getInstallCommand(sourceFile.fileName, typesPackageName))];
             },
-            fixIds: [fixIdInstallTypesPackage, fixIdGenerateTypes],
+            fixIds: [fixIdInstallTypesPackage],
             getAllCodeActions: function (context) {
-                var savedTypesDir = null; // tslint:disable-line no-null-keyword
-                return codefix.codeFixAll(context, errorCodes, function (changes, diag, commands) {
+                return codefix.codeFixAll(context, errorCodes, function (_changes, diag, commands) {
                     var packageName = tryGetImportedPackageName(diag.file, diag.start);
                     if (packageName === undefined)
                         return undefined;
@@ -115142,96 +116465,12 @@ var ts;
                             }
                             break;
                         }
-                        case fixIdGenerateTypes: {
-                            var typesDir = savedTypesDir !== null ? savedTypesDir : savedTypesDir = getOrCreateTypesDirectory(changes, context);
-                            var command = typesDir === undefined ? undefined : tryGenerateTypes(typesDir, packageName, context);
-                            if (command)
-                                commands.push(command);
-                            break;
-                        }
                         default:
                             ts.Debug.fail("Bad fixId: " + context.fixId);
                     }
                 });
             },
         });
-        function tryGetGenerateTypesAction(context, packageName) {
-            var command;
-            var changes = ts.textChanges.ChangeTracker.with(context, function (t) {
-                var typesDir = getOrCreateTypesDirectory(t, context);
-                command = typesDir === undefined ? undefined : tryGenerateTypes(typesDir, packageName, context);
-            });
-            return command && codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Generate_types_for_0, packageName], fixIdGenerateTypes, ts.Diagnostics.Generate_types_for_all_packages_without_types, command);
-        }
-        function tryGenerateTypes(typesDir, packageName, context) {
-            var file = context.sourceFile.fileName;
-            var fileToGenerateTypesFor = ts.tryResolveJSModule(packageName, ts.getDirectoryPath(file), context.host); // TODO: GH#18217
-            if (fileToGenerateTypesFor === undefined)
-                return undefined;
-            var outputFileName = ts.resolvePath(ts.getDirectoryPath(context.program.getCompilerOptions().configFile.fileName), typesDir, packageName + ".d.ts");
-            if (context.host.fileExists(outputFileName))
-                return undefined;
-            return { type: "generate types", file: file, fileToGenerateTypesFor: fileToGenerateTypesFor, outputFileName: outputFileName };
-        }
-        // If no types directory exists yet, adds it to tsconfig.json
-        function getOrCreateTypesDirectory(changes, context) {
-            var configFile = context.program.getCompilerOptions().configFile;
-            if (!configFile)
-                return undefined;
-            var tsconfigObjectLiteral = ts.getTsConfigObjectLiteralExpression(configFile);
-            if (!tsconfigObjectLiteral)
-                return undefined;
-            var compilerOptionsProperty = codefix.findJsonProperty(tsconfigObjectLiteral, "compilerOptions");
-            if (!compilerOptionsProperty) {
-                var newCompilerOptions = ts.createObjectLiteral([makeDefaultBaseUrl(), makeDefaultPaths()]);
-                changes.insertNodeAtObjectStart(configFile, tsconfigObjectLiteral, codefix.createJsonPropertyAssignment("compilerOptions", newCompilerOptions));
-                return defaultTypesDirectoryName;
-            }
-            var compilerOptions = compilerOptionsProperty.initializer;
-            if (!ts.isObjectLiteralExpression(compilerOptions))
-                return defaultTypesDirectoryName;
-            var baseUrl = getOrAddBaseUrl(changes, configFile, compilerOptions);
-            var typesDirectoryFromPathMapping = getOrAddPathMapping(changes, configFile, compilerOptions);
-            return ts.combinePaths(baseUrl, typesDirectoryFromPathMapping);
-        }
-        var defaultBaseUrl = ".";
-        function makeDefaultBaseUrl() {
-            return codefix.createJsonPropertyAssignment("baseUrl", ts.createStringLiteral(defaultBaseUrl));
-        }
-        function getOrAddBaseUrl(changes, tsconfig, compilerOptions) {
-            var baseUrlProp = codefix.findJsonProperty(compilerOptions, "baseUrl");
-            if (baseUrlProp) {
-                return ts.isStringLiteral(baseUrlProp.initializer) ? baseUrlProp.initializer.text : defaultBaseUrl;
-            }
-            else {
-                changes.insertNodeAtObjectStart(tsconfig, compilerOptions, makeDefaultBaseUrl());
-                return defaultBaseUrl;
-            }
-        }
-        var defaultTypesDirectoryName = "types";
-        function makeDefaultPathMapping() {
-            return codefix.createJsonPropertyAssignment("*", ts.createArrayLiteral([ts.createStringLiteral(defaultTypesDirectoryName + "/*")]));
-        }
-        function makeDefaultPaths() {
-            return codefix.createJsonPropertyAssignment("paths", ts.createObjectLiteral([makeDefaultPathMapping()]));
-        }
-        function getOrAddPathMapping(changes, tsconfig, compilerOptions) {
-            var paths = codefix.findJsonProperty(compilerOptions, "paths");
-            if (!paths || !ts.isObjectLiteralExpression(paths.initializer)) {
-                changes.insertNodeAtObjectStart(tsconfig, compilerOptions, makeDefaultPaths());
-                return defaultTypesDirectoryName;
-            }
-            // Look for an existing path mapping. Should look like `"*": "foo/*"`.
-            var existing = ts.firstDefined(paths.initializer.properties, function (prop) {
-                return ts.isPropertyAssignment(prop) && ts.isStringLiteral(prop.name) && prop.name.text === "*" && ts.isArrayLiteralExpression(prop.initializer)
-                    ? ts.firstDefined(prop.initializer.elements, function (value) { return ts.isStringLiteral(value) ? ts.tryRemoveSuffix(value.text, "/*") : undefined; })
-                    : undefined;
-            });
-            if (existing)
-                return existing;
-            changes.insertNodeAtObjectStart(tsconfig, paths.initializer, makeDefaultPathMapping());
-            return defaultTypesDirectoryName;
-        }
         function getInstallCommand(fileName, packageName) {
             return { type: "install package", file: fileName, packageName: packageName };
         }
@@ -115339,7 +116578,7 @@ var ts;
         }
         function getNodes(sourceFile, pos) {
             var token = ts.getTokenAtPosition(sourceFile, pos);
-            if (token.kind !== 100 /* ThisKeyword */)
+            if (token.kind !== 101 /* ThisKeyword */)
                 return undefined;
             var constructor = ts.getContainingFunction(token);
             var superCall = findSuperCall(constructor.body);
@@ -115378,7 +116617,7 @@ var ts;
         });
         function getNode(sourceFile, pos) {
             var token = ts.getTokenAtPosition(sourceFile, pos);
-            ts.Debug.assert(token.kind === 124 /* ConstructorKeyword */);
+            ts.Debug.assert(token.kind === 125 /* ConstructorKeyword */);
             return token.parent;
         }
         function doChange(changes, sourceFile, ctr) {
@@ -115394,7 +116633,7 @@ var ts;
     (function (codefix) {
         var fixId = "enableExperimentalDecorators";
         var errorCodes = [
-            ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning.code
+            ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_in_your_tsconfig_or_jsconfig_to_remove_this_warning.code
         ];
         codefix.registerCodeFix({
             errorCodes: errorCodes,
@@ -115403,12 +116642,19 @@ var ts;
                 if (configFile === undefined) {
                     return undefined;
                 }
-                var changes = ts.textChanges.ChangeTracker.with(context, function (changeTracker) { return makeChange(changeTracker, configFile); });
+                var changes = ts.textChanges.ChangeTracker.with(context, function (changeTracker) { return doChange(changeTracker, configFile); });
                 return [codefix.createCodeFixActionNoFixId(fixId, changes, ts.Diagnostics.Enable_the_experimentalDecorators_option_in_your_configuration_file)];
             },
             fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes) {
+                var configFile = context.program.getCompilerOptions().configFile;
+                if (configFile === undefined) {
+                    return undefined;
+                }
+                doChange(changes, configFile);
+            }); },
         });
-        function makeChange(changeTracker, configFile) {
+        function doChange(changeTracker, configFile) {
             codefix.setJsonCompilerOptionValue(changeTracker, configFile, "experimentalDecorators", ts.createTrue());
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
@@ -115442,14 +116688,14 @@ var ts;
             var token = ts.getTokenAtPosition(sourceFile, pos);
             var heritageClauses = ts.getContainingClass(token).heritageClauses;
             var extendsToken = heritageClauses[0].getFirstToken();
-            return extendsToken.kind === 86 /* ExtendsKeyword */ ? { extendsToken: extendsToken, heritageClauses: heritageClauses } : undefined;
+            return extendsToken.kind === 87 /* ExtendsKeyword */ ? { extendsToken: extendsToken, heritageClauses: heritageClauses } : undefined;
         }
         function doChanges(changes, sourceFile, extendsToken, heritageClauses) {
-            changes.replaceNode(sourceFile, extendsToken, ts.createToken(109 /* ImplementsKeyword */));
+            changes.replaceNode(sourceFile, extendsToken, ts.createToken(110 /* ImplementsKeyword */));
             // If there is already an implements clause, replace the implements keyword with a comma.
             if (heritageClauses.length === 2 &&
-                heritageClauses[0].token === 86 /* ExtendsKeyword */ &&
-                heritageClauses[1].token === 109 /* ImplementsKeyword */) {
+                heritageClauses[0].token === 87 /* ExtendsKeyword */ &&
+                heritageClauses[1].token === 110 /* ImplementsKeyword */) {
                 var implementsToken = heritageClauses[1].getFirstToken();
                 var implementsFullStart = implementsToken.getFullStart();
                 changes.replaceRange(sourceFile, { pos: implementsFullStart, end: implementsFullStart }, ts.createToken(27 /* CommaToken */));
@@ -115556,7 +116802,7 @@ var ts;
                     return [createDeleteFix(delVar, ts.Diagnostics.Remove_variable_statement)];
                 }
                 var result = [];
-                if (token.kind === 127 /* InferKeyword */) {
+                if (token.kind === 128 /* InferKeyword */) {
                     var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return changeInferToUnknown(t, sourceFile, token); });
                     var name = ts.cast(token.parent, ts.isInferTypeNode).typeParameter.name.text;
                     result.push(codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Replace_infer_0_with_unknown, name], fixIdInfer, ts.Diagnostics.Replace_all_unused_infer_with_unknown));
@@ -115588,7 +116834,7 @@ var ts;
                             tryPrefixDeclaration(changes, diag.code, sourceFile, token);
                             break;
                         case fixIdDelete: {
-                            if (token.kind === 127 /* InferKeyword */)
+                            if (token.kind === 128 /* InferKeyword */)
                                 break; // Can't delete
                             var importDecl = tryGetFullImport(token);
                             if (importDecl) {
@@ -115607,7 +116853,7 @@ var ts;
                             break;
                         }
                         case fixIdInfer:
-                            if (token.kind === 127 /* InferKeyword */) {
+                            if (token.kind === 128 /* InferKeyword */) {
                                 changeInferToUnknown(changes, sourceFile, token);
                             }
                             break;
@@ -115618,7 +116864,7 @@ var ts;
             },
         });
         function changeInferToUnknown(changes, sourceFile, token) {
-            changes.replaceNode(sourceFile, token.parent, ts.createKeywordTypeNode(143 /* UnknownKeyword */));
+            changes.replaceNode(sourceFile, token.parent, ts.createKeywordTypeNode(144 /* UnknownKeyword */));
         }
         function createDeleteFix(changes, diag) {
             return codefix.createCodeFixAction(fixName, changes, diag, fixIdDelete, ts.Diagnostics.Delete_all_unused_declarations);
@@ -115628,13 +116874,13 @@ var ts;
         }
         // Sometimes the diagnostic span is an entire ImportDeclaration, so we should remove the whole thing.
         function tryGetFullImport(token) {
-            return token.kind === 92 /* ImportKeyword */ ? ts.tryCast(token.parent, ts.isImportDeclaration) : undefined;
+            return token.kind === 93 /* ImportKeyword */ ? ts.tryCast(token.parent, ts.isImportDeclaration) : undefined;
         }
         function tryDeleteFullDestructure(token, changes, sourceFile, checker, sourceFiles, isFixAll) {
             if (token.kind !== 18 /* OpenBraceToken */ || !ts.isObjectBindingPattern(token.parent))
                 return false;
             var decl = token.parent.parent;
-            if (decl.kind === 151 /* Parameter */) {
+            if (decl.kind === 152 /* Parameter */) {
                 tryDeleteParameter(changes, sourceFile, decl, checker, sourceFiles, isFixAll);
             }
             else {
@@ -115645,7 +116891,7 @@ var ts;
         function tryDeleteFullVariableStatement(sourceFile, token, changes) {
             var declarationList = ts.tryCast(token.parent, ts.isVariableDeclarationList);
             if (declarationList && declarationList.getChildren(sourceFile)[0] === token) {
-                changes.delete(sourceFile, declarationList.parent.kind === 219 /* VariableStatement */ ? declarationList.parent : declarationList);
+                changes.delete(sourceFile, declarationList.parent.kind === 220 /* VariableStatement */ ? declarationList.parent : declarationList);
                 return true;
             }
             return false;
@@ -115654,7 +116900,7 @@ var ts;
             // Don't offer to prefix a property.
             if (errorCode === ts.Diagnostics.Property_0_is_declared_but_its_value_is_never_read.code)
                 return;
-            if (token.kind === 127 /* InferKeyword */) {
+            if (token.kind === 128 /* InferKeyword */) {
                 token = ts.cast(token.parent, ts.isInferTypeNode).typeParameter.name;
             }
             if (ts.isIdentifier(token) && canPrefix(token)) {
@@ -115663,14 +116909,14 @@ var ts;
         }
         function canPrefix(token) {
             switch (token.parent.kind) {
-                case 151 /* Parameter */:
-                case 150 /* TypeParameter */:
+                case 152 /* Parameter */:
+                case 151 /* TypeParameter */:
                     return true;
-                case 237 /* VariableDeclaration */: {
+                case 238 /* VariableDeclaration */: {
                     var varDecl = token.parent;
                     switch (varDecl.parent.parent.kind) {
-                        case 227 /* ForOfStatement */:
-                        case 226 /* ForInStatement */:
+                        case 228 /* ForOfStatement */:
+                        case 227 /* ForInStatement */:
                             return true;
                     }
                 }
@@ -115717,26 +116963,26 @@ var ts;
         function mayDeleteParameter(p, checker, isFixAll) {
             var parent = p.parent;
             switch (parent.kind) {
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     // Don't remove a parameter if this overrides something.
                     var symbol = checker.getSymbolAtLocation(parent.name);
                     if (ts.isMemberSymbolInBaseType(symbol, checker))
                         return false;
                 // falls through
-                case 157 /* Constructor */:
-                case 239 /* FunctionDeclaration */:
+                case 158 /* Constructor */:
+                case 240 /* FunctionDeclaration */:
                     return true;
-                case 196 /* FunctionExpression */:
-                case 197 /* ArrowFunction */: {
+                case 197 /* FunctionExpression */:
+                case 198 /* ArrowFunction */: {
                     // Can't remove a non-last parameter in a callback. Can remove a parameter in code-fix-all if future parameters are also unused.
                     var parameters = parent.parameters;
                     var index = parameters.indexOf(p);
                     ts.Debug.assert(index !== -1);
                     return isFixAll
-                        ? parameters.slice(index + 1).every(function (p) { return p.name.kind === 72 /* Identifier */ && !p.symbol.isReferenced; })
+                        ? parameters.slice(index + 1).every(function (p) { return p.name.kind === 73 /* Identifier */ && !p.symbol.isReferenced; })
                         : index === parameters.length - 1;
                 }
-                case 159 /* SetAccessor */:
+                case 160 /* SetAccessor */:
                     // Setter must have a parameter
                     return false;
                 default:
@@ -115776,7 +117022,7 @@ var ts;
             var container = (ts.isBlock(statement.parent) ? statement.parent : statement).parent;
             if (!ts.isBlock(statement.parent) || statement === ts.first(statement.parent.statements)) {
                 switch (container.kind) {
-                    case 222 /* IfStatement */:
+                    case 223 /* IfStatement */:
                         if (container.elseStatement) {
                             if (ts.isBlock(statement.parent)) {
                                 break;
@@ -115787,15 +117033,15 @@ var ts;
                             return;
                         }
                     // falls through
-                    case 224 /* WhileStatement */:
-                    case 225 /* ForStatement */:
+                    case 225 /* WhileStatement */:
+                    case 226 /* ForStatement */:
                         changes.delete(sourceFile, container);
                         return;
                 }
             }
             if (ts.isBlock(statement.parent)) {
-                var end_2 = start + length;
-                var lastStatement = ts.Debug.assertDefined(lastWhere(ts.sliceAfter(statement.parent.statements, statement), function (s) { return s.pos < end_2; }));
+                var end_3 = start + length;
+                var lastStatement = ts.Debug.assertDefined(lastWhere(ts.sliceAfter(statement.parent.statements, statement), function (s) { return s.pos < end_3; }));
                 changes.deleteNodeRange(sourceFile, statement, lastStatement);
             }
             else {
@@ -115861,7 +117107,7 @@ var ts;
                 var typeNode = info.typeNode, type = info.type;
                 var original = typeNode.getText(sourceFile);
                 var actions = [fix(type, fixIdPlain, ts.Diagnostics.Change_all_jsdoc_style_types_to_TypeScript)];
-                if (typeNode.kind === 291 /* JSDocNullableType */) {
+                if (typeNode.kind === 292 /* JSDocNullableType */) {
                     // for nullable types, suggest the flow-compatible `T | null | undefined`
                     // in addition to the jsdoc/closure-compatible `T | null`
                     actions.push(fix(checker.getNullableType(type, 32768 /* Undefined */), fixIdNullable, ts.Diagnostics.Change_all_jsdoc_style_types_to_TypeScript_and_add_undefined_to_nullable_types));
@@ -115881,7 +117127,7 @@ var ts;
                     if (!info)
                         return;
                     var typeNode = info.typeNode, type = info.type;
-                    var fixedType = typeNode.kind === 291 /* JSDocNullableType */ && fixId === fixIdNullable ? checker.getNullableType(type, 32768 /* Undefined */) : type;
+                    var fixedType = typeNode.kind === 292 /* JSDocNullableType */ && fixId === fixIdNullable ? checker.getNullableType(type, 32768 /* Undefined */) : type;
                     doChange(changes, sourceFile, typeNode, fixedType, checker);
                 });
             }
@@ -115898,22 +117144,22 @@ var ts;
             // NOTE: Some locations are not handled yet:
             // MappedTypeNode.typeParameters and SignatureDeclaration.typeParameters, as well as CallExpression.typeArguments
             switch (node.kind) {
-                case 212 /* AsExpression */:
-                case 160 /* CallSignature */:
-                case 161 /* ConstructSignature */:
-                case 239 /* FunctionDeclaration */:
-                case 158 /* GetAccessor */:
-                case 162 /* IndexSignature */:
-                case 181 /* MappedType */:
-                case 156 /* MethodDeclaration */:
-                case 155 /* MethodSignature */:
-                case 151 /* Parameter */:
-                case 154 /* PropertyDeclaration */:
-                case 153 /* PropertySignature */:
-                case 159 /* SetAccessor */:
-                case 242 /* TypeAliasDeclaration */:
-                case 194 /* TypeAssertionExpression */:
-                case 237 /* VariableDeclaration */:
+                case 213 /* AsExpression */:
+                case 161 /* CallSignature */:
+                case 162 /* ConstructSignature */:
+                case 240 /* FunctionDeclaration */:
+                case 159 /* GetAccessor */:
+                case 163 /* IndexSignature */:
+                case 182 /* MappedType */:
+                case 157 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 152 /* Parameter */:
+                case 155 /* PropertyDeclaration */:
+                case 154 /* PropertySignature */:
+                case 160 /* SetAccessor */:
+                case 243 /* TypeAliasDeclaration */:
+                case 195 /* TypeAssertionExpression */:
+                case 238 /* VariableDeclaration */:
                     return true;
                 default:
                     return false;
@@ -115967,14 +117213,14 @@ var ts;
             }
             var insertBefore;
             switch (containingFunction.kind) {
-                case 156 /* MethodDeclaration */:
+                case 157 /* MethodDeclaration */:
                     insertBefore = containingFunction.name;
                     break;
-                case 239 /* FunctionDeclaration */:
-                case 196 /* FunctionExpression */:
-                    insertBefore = ts.findChildOfKind(containingFunction, 90 /* FunctionKeyword */, sourceFile);
+                case 240 /* FunctionDeclaration */:
+                case 197 /* FunctionExpression */:
+                    insertBefore = ts.findChildOfKind(containingFunction, 91 /* FunctionKeyword */, sourceFile);
                     break;
-                case 197 /* ArrowFunction */:
+                case 198 /* ArrowFunction */:
                     insertBefore = ts.findChildOfKind(containingFunction, 20 /* OpenParenToken */, sourceFile) || ts.first(containingFunction.parameters);
                     break;
                 default:
@@ -115989,11 +117235,11 @@ var ts;
             var insertBefore = _a.insertBefore, returnType = _a.returnType;
             if (returnType) {
                 var entityName = ts.getEntityNameFromTypeNode(returnType);
-                if (!entityName || entityName.kind !== 72 /* Identifier */ || entityName.text !== "Promise") {
+                if (!entityName || entityName.kind !== 73 /* Identifier */ || entityName.text !== "Promise") {
                     changes.replaceNode(sourceFile, returnType, ts.createTypeReferenceNode("Promise", ts.createNodeArray([returnType])));
                 }
             }
-            changes.insertModifierBefore(sourceFile, 121 /* AsyncKeyword */, insertBefore);
+            changes.insertModifierBefore(sourceFile, 122 /* AsyncKeyword */, insertBefore);
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
@@ -116102,17 +117348,17 @@ var ts;
             var type = checker.getWidenedType(checker.getTypeOfSymbolAtLocation(symbol, enclosingDeclaration));
             var optional = !!(symbol.flags & 16777216 /* Optional */);
             switch (declaration.kind) {
-                case 158 /* GetAccessor */:
-                case 159 /* SetAccessor */:
-                case 153 /* PropertySignature */:
-                case 154 /* PropertyDeclaration */:
+                case 159 /* GetAccessor */:
+                case 160 /* SetAccessor */:
+                case 154 /* PropertySignature */:
+                case 155 /* PropertyDeclaration */:
                     var typeNode = checker.typeToTypeNode(type, enclosingDeclaration, /*flags*/ undefined, getNoopSymbolTrackerWithResolver(context));
                     out(ts.createProperty(
                     /*decorators*/ undefined, modifiers, name, optional ? ts.createToken(56 /* QuestionToken */) : undefined, typeNode, 
                     /*initializer*/ undefined));
                     break;
-                case 155 /* MethodSignature */:
-                case 156 /* MethodDeclaration */:
+                case 156 /* MethodSignature */:
+                case 157 /* MethodDeclaration */:
                     // The signature for the implementation appears as an entry in `signatures` iff
                     // there is only one signature.
                     // If there are overloads and an implementation signature, it appears as an
@@ -116153,7 +117399,7 @@ var ts;
         }
         function signatureToMethodDeclaration(context, signature, enclosingDeclaration, modifiers, name, optional, body) {
             var program = context.program;
-            var signatureDeclaration = program.getTypeChecker().signatureToSignatureDeclaration(signature, 156 /* MethodDeclaration */, enclosingDeclaration, 1 /* NoTruncation */ | 256 /* SuppressAnyReturnType */, getNoopSymbolTrackerWithResolver(context));
+            var signatureDeclaration = program.getTypeChecker().signatureToSignatureDeclaration(signature, 157 /* MethodDeclaration */, enclosingDeclaration, 1 /* NoTruncation */ | 256 /* SuppressAnyReturnType */, getNoopSymbolTrackerWithResolver(context));
             if (!signatureDeclaration) {
                 return undefined;
             }
@@ -116181,7 +117427,7 @@ var ts;
             var returnType = (inJs || !contextualType) ? undefined : checker.typeToTypeNode(contextualType, contextNode, /*flags*/ undefined, tracker);
             return ts.createMethod(
             /*decorators*/ undefined, 
-            /*modifiers*/ makeStatic ? [ts.createToken(116 /* StaticKeyword */)] : undefined, 
+            /*modifiers*/ makeStatic ? [ts.createToken(117 /* StaticKeyword */)] : undefined, 
             /*asteriskToken*/ ts.isYieldExpression(parent) ? ts.createToken(40 /* AsteriskToken */) : undefined, methodName, 
             /*questionToken*/ undefined, 
             /*typeParameters*/ inJs ? undefined : ts.map(typeArguments, function (_, i) {
@@ -116200,7 +117446,7 @@ var ts;
                 /*dotDotDotToken*/ undefined, 
                 /*name*/ names && names[i] || "arg" + i, 
                 /*questionToken*/ minArgumentCount !== undefined && i >= minArgumentCount ? ts.createToken(56 /* QuestionToken */) : undefined, 
-                /*type*/ inJs ? undefined : types && types[i] || ts.createKeywordTypeNode(120 /* AnyKeyword */), 
+                /*type*/ inJs ? undefined : types && types[i] || ts.createKeywordTypeNode(121 /* AnyKeyword */), 
                 /*initializer*/ undefined);
                 parameters.push(newParameter);
             }
@@ -116228,7 +117474,7 @@ var ts;
             var maxArgsParameterSymbolNames = maxArgsSignature.parameters.map(function (symbol) { return symbol.name; });
             var parameters = createDummyParameters(maxNonRestArgs, maxArgsParameterSymbolNames, /* types */ undefined, minArgumentCount, /*inJs*/ false);
             if (someSigHasRestParameter) {
-                var anyArrayType = ts.createArrayTypeNode(ts.createKeywordTypeNode(120 /* AnyKeyword */));
+                var anyArrayType = ts.createArrayTypeNode(ts.createKeywordTypeNode(121 /* AnyKeyword */));
                 var restParameter = ts.createParameter(
                 /*decorators*/ undefined, 
                 /*modifiers*/ undefined, ts.createToken(25 /* DotDotDotToken */), maxArgsParameterSymbolNames[maxNonRestArgs] || "rest", 
@@ -116254,10 +117500,10 @@ var ts;
         }
         function createVisibilityModifier(flags) {
             if (flags & 4 /* Public */) {
-                return ts.createToken(115 /* PublicKeyword */);
+                return ts.createToken(116 /* PublicKeyword */);
             }
             else if (flags & 16 /* Protected */) {
-                return ts.createToken(114 /* ProtectedKeyword */);
+                return ts.createToken(115 /* ProtectedKeyword */);
             }
             return undefined;
         }
@@ -116329,7 +117575,7 @@ var ts;
         });
         function getActionsForUsageOfInvalidImport(context) {
             var sourceFile = context.sourceFile;
-            var targetKind = ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures.code === context.errorCode ? 191 /* CallExpression */ : 192 /* NewExpression */;
+            var targetKind = ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures.code === context.errorCode ? 192 /* CallExpression */ : 193 /* NewExpression */;
             var node = ts.findAncestor(ts.getTokenAtPosition(sourceFile, context.span.start), function (a) { return a.kind === targetKind && a.getStart() === context.span.start && a.getEnd() === (context.span.start + context.span.length); });
             if (!node) {
                 return [];
@@ -116448,7 +117694,7 @@ var ts;
             return codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Add_undefined_type_to_property_0, propertyDeclaration.name.getText()], fixIdAddUndefinedType, ts.Diagnostics.Add_undefined_type_to_all_uninitialized_properties);
         }
         function addUndefinedType(changeTracker, propertyDeclarationSourceFile, propertyDeclaration) {
-            var undefinedTypeNode = ts.createKeywordTypeNode(141 /* UndefinedKeyword */);
+            var undefinedTypeNode = ts.createKeywordTypeNode(142 /* UndefinedKeyword */);
             var type = propertyDeclaration.type; // TODO: GH#18217
             var types = ts.isUnionTypeNode(type) ? type.types.concat(undefinedTypeNode) : [type, undefinedTypeNode];
             changeTracker.replaceNode(propertyDeclarationSourceFile, type, ts.createUnionTypeNode(types));
@@ -116494,235 +117740,6 @@ var ts;
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
-var ts;
-(function (ts) {
-    function generateTypesForModule(name, moduleValue, formatSettings) {
-        return generateTypesForModuleOrGlobal(name, moduleValue, formatSettings, 0 /* ExportEquals */);
-    }
-    ts.generateTypesForModule = generateTypesForModule;
-    function generateTypesForGlobal(name, globalValue, formatSettings) {
-        return generateTypesForModuleOrGlobal(name, globalValue, formatSettings, 3 /* Global */);
-    }
-    ts.generateTypesForGlobal = generateTypesForGlobal;
-    function generateTypesForModuleOrGlobal(name, globalValue, formatSettings, outputKind) {
-        return valueInfoToDeclarationFileText(ts.inspectValue(name, globalValue), formatSettings, outputKind);
-    }
-    /* @internal */
-    function valueInfoToDeclarationFileText(valueInfo, formatSettings, outputKind) {
-        if (outputKind === void 0) { outputKind = 0 /* ExportEquals */; }
-        return ts.textChanges.getNewFileText(toStatements(valueInfo, outputKind), 3 /* TS */, formatSettings.newLineCharacter || "\n", ts.formatting.getFormatContext(formatSettings));
-    }
-    ts.valueInfoToDeclarationFileText = valueInfoToDeclarationFileText;
-    /* @internal */
-    var OutputKind;
-    (function (OutputKind) {
-        OutputKind[OutputKind["ExportEquals"] = 0] = "ExportEquals";
-        OutputKind[OutputKind["NamedExport"] = 1] = "NamedExport";
-        OutputKind[OutputKind["NamespaceMember"] = 2] = "NamespaceMember";
-        OutputKind[OutputKind["Global"] = 3] = "Global";
-    })(OutputKind || (OutputKind = {}));
-    function toNamespaceMemberStatements(info) {
-        return toStatements(info, 2 /* NamespaceMember */);
-    }
-    function toStatements(info, kind) {
-        var isDefault = info.name === "default" /* Default */;
-        var name = isDefault ? "_default" : info.name;
-        if (!isValidIdentifier(name) || isDefault && kind !== 1 /* NamedExport */)
-            return ts.emptyArray;
-        var modifiers = isDefault && info.kind === 2 /* FunctionOrClass */ ? [ts.createModifier(85 /* ExportKeyword */), ts.createModifier(80 /* DefaultKeyword */)]
-            : kind === 3 /* Global */ || kind === 0 /* ExportEquals */ ? [ts.createModifier(125 /* DeclareKeyword */)]
-                : kind === 1 /* NamedExport */ ? [ts.createModifier(85 /* ExportKeyword */)]
-                    : undefined;
-        var exportEquals = function () { return kind === 0 /* ExportEquals */ ? [exportEqualsOrDefault(info.name, /*isExportEquals*/ true)] : ts.emptyArray; };
-        var exportDefault = function () { return isDefault ? [exportEqualsOrDefault("_default", /*isExportEquals*/ false)] : ts.emptyArray; };
-        switch (info.kind) {
-            case 2 /* FunctionOrClass */:
-                return exportEquals().concat(functionOrClassToStatements(modifiers, name, info));
-            case 3 /* Object */:
-                var members = info.members, hasNontrivialPrototype = info.hasNontrivialPrototype;
-                if (!hasNontrivialPrototype) {
-                    if (kind === 0 /* ExportEquals */) {
-                        return ts.flatMap(members, function (v) { return toStatements(v, 1 /* NamedExport */); });
-                    }
-                    if (members.some(function (m) { return m.kind === 2 /* FunctionOrClass */; })) {
-                        // If some member is a function, use a namespace so it gets a FunctionDeclaration or ClassDeclaration.
-                        return exportDefault().concat([createNamespace(modifiers, name, ts.flatMap(members, toNamespaceMemberStatements))]);
-                    }
-                }
-            // falls through
-            case 0 /* Const */:
-            case 1 /* Array */: {
-                var comment = info.kind === 0 /* Const */ ? info.comment : undefined;
-                var constVar = ts.createVariableStatement(modifiers, ts.createVariableDeclarationList([ts.createVariableDeclaration(name, toType(info))], 2 /* Const */));
-                return exportEquals().concat(exportDefault(), [addComment(constVar, comment)]);
-            }
-            default:
-                return ts.Debug.assertNever(info);
-        }
-    }
-    function exportEqualsOrDefault(name, isExportEquals) {
-        return ts.createExportAssignment(/*decorators*/ undefined, /*modifiers*/ undefined, isExportEquals, ts.createIdentifier(name));
-    }
-    function functionOrClassToStatements(modifiers, name, _a) {
-        var source = _a.source, prototypeMembers = _a.prototypeMembers, namespaceMembers = _a.namespaceMembers;
-        var fnAst = parseClassOrFunctionBody(source);
-        var _b = fnAst === undefined ? { parameters: ts.emptyArray, returnType: anyType() } : getParametersAndReturnType(fnAst), parameters = _b.parameters, returnType = _b.returnType;
-        var protoOrInstanceMembers = ts.createMap();
-        if (typeof fnAst === "object")
-            getConstructorFunctionInstanceProperties(fnAst, protoOrInstanceMembers);
-        for (var _i = 0, prototypeMembers_1 = prototypeMembers; _i < prototypeMembers_1.length; _i++) {
-            var p = prototypeMembers_1[_i];
-            // ignore non-functions on the prototype
-            if (p.kind === 2 /* FunctionOrClass */) {
-                var m = tryGetMethod(p);
-                if (m) {
-                    protoOrInstanceMembers.set(p.name, m);
-                }
-            }
-        }
-        var classStaticMembers = protoOrInstanceMembers.size !== 0 || fnAst === undefined || typeof fnAst !== "number" && fnAst.kind === 157 /* Constructor */ ? [] : undefined;
-        var namespaceStatements = ts.flatMap(namespaceMembers, function (info) {
-            if (!isValidIdentifier(info.name))
-                return undefined;
-            if (classStaticMembers) {
-                switch (info.kind) {
-                    case 3 /* Object */:
-                        if (info.members.some(function (m) { return m.kind === 2 /* FunctionOrClass */; })) {
-                            break;
-                        }
-                    // falls through
-                    case 1 /* Array */:
-                    case 0 /* Const */:
-                        classStaticMembers.push(addComment(ts.createProperty(/*decorators*/ undefined, [ts.createModifier(116 /* StaticKeyword */)], info.name, /*questionOrExclamationToken*/ undefined, toType(info), /*initializer*/ undefined), info.kind === 0 /* Const */ ? info.comment : undefined));
-                        return undefined;
-                    case 2 /* FunctionOrClass */:
-                        if (!info.namespaceMembers.length) { // Else, can't merge a static method with a namespace. Must make it a function on the namespace.
-                            var sig = tryGetMethod(info, [ts.createModifier(116 /* StaticKeyword */)]);
-                            if (sig) {
-                                classStaticMembers.push(sig);
-                                return undefined;
-                            }
-                        }
-                        break;
-                    default:
-                        ts.Debug.assertNever(info);
-                }
-            }
-            return toStatements(info, 2 /* NamespaceMember */);
-        });
-        var decl = classStaticMembers
-            ? ts.createClassDeclaration(
-            /*decorators*/ undefined, modifiers, name, 
-            /*typeParameters*/ undefined, 
-            /*heritageClauses*/ undefined, classStaticMembers.concat((parameters.length ? [ts.createConstructor(/*decorators*/ undefined, /*modifiers*/ undefined, parameters, /*body*/ undefined)] : ts.emptyArray), ts.arrayFrom(protoOrInstanceMembers.values())))
-            : ts.createFunctionDeclaration(/*decorators*/ undefined, modifiers, /*asteriskToken*/ undefined, name, /*typeParameters*/ undefined, parameters, returnType, /*body*/ undefined);
-        return [decl].concat((namespaceStatements.length === 0 ? ts.emptyArray : [createNamespace(modifiers && modifiers.map(function (m) { return ts.getSynthesizedDeepClone(m); }), name, namespaceStatements)]));
-    }
-    function tryGetMethod(_a, modifiers) {
-        var name = _a.name, source = _a.source;
-        if (!isValidIdentifier(name))
-            return undefined;
-        var fnAst = parseClassOrFunctionBody(source);
-        if (fnAst === undefined || (typeof fnAst !== "number" && fnAst.kind === 157 /* Constructor */))
-            return undefined;
-        var sig = getParametersAndReturnType(fnAst);
-        return sig && ts.createMethod(
-        /*decorators*/ undefined, modifiers, 
-        /*asteriskToken*/ undefined, name, 
-        /*questionToken*/ undefined, 
-        /*typeParameters*/ undefined, sig.parameters, sig.returnType, 
-        /*body*/ undefined);
-    }
-    function toType(info) {
-        switch (info.kind) {
-            case 0 /* Const */:
-                return ts.createTypeReferenceNode(info.typeName, /*typeArguments*/ undefined);
-            case 1 /* Array */:
-                return ts.createArrayTypeNode(toType(info.inner));
-            case 2 /* FunctionOrClass */:
-                return ts.createTypeReferenceNode("Function", /*typeArguments*/ undefined); // Normally we create a FunctionDeclaration, but this can happen for a function in an array.
-            case 3 /* Object */:
-                return ts.createTypeLiteralNode(info.members.map(function (m) { return ts.createPropertySignature(/*modifiers*/ undefined, toPropertyName(m.name), /*questionToken*/ undefined, toType(m), /*initializer*/ undefined); }));
-            default:
-                return ts.Debug.assertNever(info);
-        }
-    }
-    function toPropertyName(name) {
-        return ts.isIdentifierText(name, 7 /* ESNext */) ? ts.createIdentifier(name) : ts.createStringLiteral(name);
-    }
-    // Parses assignments to "this.x" in the constructor into class property declarations
-    function getConstructorFunctionInstanceProperties(fnAst, members) {
-        forEachOwnNodeOfFunction(fnAst, function (node) {
-            if (ts.isAssignmentExpression(node, /*excludeCompoundAssignment*/ true) &&
-                ts.isPropertyAccessExpression(node.left) && node.left.expression.kind === 100 /* ThisKeyword */) {
-                var name_4 = node.left.name.text;
-                if (!ts.isJsPrivate(name_4)) {
-                    ts.getOrUpdate(members, name_4, function () { return ts.createProperty(/*decorators*/ undefined, /*modifiers*/ undefined, name_4, /*questionOrExclamationToken*/ undefined, anyType(), /*initializer*/ undefined); });
-                }
-            }
-        });
-    }
-    function getParametersAndReturnType(fnAst) {
-        if (typeof fnAst === "number") {
-            return { parameters: ts.fill(fnAst, function (i) { return makeParameter("p" + i, anyType()); }), returnType: anyType() };
-        }
-        var usedArguments = false, hasReturn = false;
-        forEachOwnNodeOfFunction(fnAst, function (node) {
-            usedArguments = usedArguments || ts.isIdentifier(node) && node.text === "arguments";
-            hasReturn = hasReturn || ts.isReturnStatement(node) && !!node.expression && node.expression.kind !== 200 /* VoidExpression */;
-        });
-        var parameters = fnAst.parameters.map(function (p) { return makeParameter("" + p.name.getText(), inferParameterType(fnAst, p)); }).concat((usedArguments ? [makeRestParameter()] : ts.emptyArray));
-        return { parameters: parameters, returnType: hasReturn ? anyType() : ts.createKeywordTypeNode(106 /* VoidKeyword */) };
-    }
-    function makeParameter(name, type) {
-        return ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, /*dotDotDotToken*/ undefined, name, /*questionToken*/ undefined, type);
-    }
-    function makeRestParameter() {
-        return ts.createParameter(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createToken(25 /* DotDotDotToken */), "args", /*questionToken*/ undefined, ts.createArrayTypeNode(anyType()));
-    }
-    /** Returns 'undefined' for class with no declared constructor */
-    function parseClassOrFunctionBody(source) {
-        if (typeof source === "number")
-            return source;
-        var classOrFunction = ts.tryCast(parseExpression(source), function (node) { return ts.isFunctionExpression(node) || ts.isArrowFunction(node) || ts.isClassExpression(node); });
-        return classOrFunction
-            ? ts.isClassExpression(classOrFunction) ? ts.find(classOrFunction.members, ts.isConstructorDeclaration) : classOrFunction
-            // If that didn't parse, it's a method `m() {}`. Parse again inside of an object literal.
-            : ts.cast(ts.first(ts.cast(parseExpression("{ " + source + " }"), ts.isObjectLiteralExpression).properties), ts.isMethodDeclaration);
-    }
-    function parseExpression(expr) {
-        var text = "const _ = " + expr;
-        var srcFile = ts.createSourceFile("test.ts", text, 7 /* Latest */, /*setParentNodes*/ true);
-        return ts.first(ts.cast(ts.first(srcFile.statements), ts.isVariableStatement).declarationList.declarations).initializer;
-    }
-    function inferParameterType(_fn, _param) {
-        // TODO: Inspect function body for clues (see inferFromUsage.ts)
-        return anyType();
-    }
-    // Descends through all nodes in a function, but not in nested functions.
-    function forEachOwnNodeOfFunction(fnAst, cb) {
-        fnAst.body.forEachChild(function recur(node) {
-            cb(node);
-            if (!ts.isFunctionLike(node))
-                node.forEachChild(recur);
-        });
-    }
-    function isValidIdentifier(name) {
-        var keyword = ts.stringToToken(name);
-        return !(keyword && ts.isNonContextualKeyword(keyword)) && ts.isIdentifierText(name, 7 /* ESNext */);
-    }
-    function addComment(node, comment) {
-        if (comment !== undefined)
-            ts.addSyntheticLeadingComment(node, 2 /* SingleLineCommentTrivia */, comment);
-        return node;
-    }
-    function anyType() {
-        return ts.createKeywordTypeNode(120 /* AnyKeyword */);
-    }
-    function createNamespace(modifiers, name, statements) {
-        return ts.createModuleDeclaration(/*decorators*/ undefined, modifiers, ts.createIdentifier(name), ts.createModuleBlock(statements), 16 /* Namespace */);
-    }
-})(ts || (ts = {}));
 /* @internal */
 var ts;
 (function (ts) {
@@ -116819,8 +117836,8 @@ var ts;
         });
         function getImportTypeNode(sourceFile, pos) {
             var token = ts.getTokenAtPosition(sourceFile, pos);
-            ts.Debug.assert(token.kind === 92 /* ImportKeyword */);
-            ts.Debug.assert(token.parent.kind === 183 /* ImportType */);
+            ts.Debug.assert(token.kind === 93 /* ImportKeyword */);
+            ts.Debug.assert(token.parent.kind === 184 /* ImportType */);
             return token.parent;
         }
         function doChange(changes, sourceFile, importType) {
@@ -116872,7 +117889,7 @@ var ts;
             var otherMembers = members.filter(function (member) { return !ts.isIndexSignatureDeclaration(member); });
             var parameter = ts.first(indexSignature.parameters);
             var mappedTypeParameter = ts.createTypeParameterDeclaration(ts.cast(parameter.name, ts.isIdentifier), parameter.type);
-            var mappedIntersectionType = ts.createMappedTypeNode(ts.hasReadonlyModifier(indexSignature) ? ts.createModifier(133 /* ReadonlyKeyword */) : undefined, mappedTypeParameter, indexSignature.questionToken, indexSignature.type);
+            var mappedIntersectionType = ts.createMappedTypeNode(ts.hasReadonlyModifier(indexSignature) ? ts.createModifier(134 /* ReadonlyKeyword */) : undefined, mappedTypeParameter, indexSignature.questionToken, indexSignature.type);
             var intersectionType = ts.createIntersectionTypeNode(ts.getAllSuperTypeNodes(container).concat([
                 mappedIntersectionType
             ], (otherMembers.length ? [ts.createTypeLiteralNode(otherMembers)] : ts.emptyArray)));
@@ -116919,16 +117936,16 @@ var ts;
                 return undefined;
             }
             switch (exportNode.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 244 /* ModuleDeclaration */: {
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 245 /* ModuleDeclaration */: {
                     var node = exportNode;
                     return node.name && ts.isIdentifier(node.name) ? { exportNode: node, exportName: node.name, wasDefault: wasDefault, exportingModuleSymbol: exportingModuleSymbol } : undefined;
                 }
-                case 219 /* VariableStatement */: {
+                case 220 /* VariableStatement */: {
                     var vs = exportNode;
                     // Must be `export const x = something;`.
                     if (!(vs.declarationList.flags & 2 /* Const */) || vs.declarationList.declarations.length !== 1) {
@@ -116951,17 +117968,17 @@ var ts;
         function changeExport(exportingSourceFile, _a, changes, checker) {
             var wasDefault = _a.wasDefault, exportNode = _a.exportNode, exportName = _a.exportName;
             if (wasDefault) {
-                changes.delete(exportingSourceFile, ts.Debug.assertDefined(ts.findModifier(exportNode, 80 /* DefaultKeyword */)));
+                changes.delete(exportingSourceFile, ts.Debug.assertDefined(ts.findModifier(exportNode, 81 /* DefaultKeyword */)));
             }
             else {
-                var exportKeyword = ts.Debug.assertDefined(ts.findModifier(exportNode, 85 /* ExportKeyword */));
+                var exportKeyword = ts.Debug.assertDefined(ts.findModifier(exportNode, 86 /* ExportKeyword */));
                 switch (exportNode.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 240 /* ClassDeclaration */:
-                    case 241 /* InterfaceDeclaration */:
-                        changes.insertNodeAfter(exportingSourceFile, exportKeyword, ts.createToken(80 /* DefaultKeyword */));
+                    case 240 /* FunctionDeclaration */:
+                    case 241 /* ClassDeclaration */:
+                    case 242 /* InterfaceDeclaration */:
+                        changes.insertNodeAfter(exportingSourceFile, exportKeyword, ts.createToken(81 /* DefaultKeyword */));
                         break;
-                    case 219 /* VariableStatement */:
+                    case 220 /* VariableStatement */:
                         // If 'x' isn't used in this file, `export const x = 0;` --> `export default 0;`
                         if (!ts.FindAllReferences.Core.isSymbolReferencedInFile(exportName, checker, exportingSourceFile)) {
                             // We checked in `getInfo` that an initializer exists.
@@ -116969,9 +117986,9 @@ var ts;
                             break;
                         }
                     // falls through
-                    case 243 /* EnumDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 244 /* ModuleDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 245 /* ModuleDeclaration */:
                         // `export type T = number;` -> `type T = number; export default T;`
                         changes.deleteModifier(exportingSourceFile, exportKeyword);
                         changes.insertNodeAfter(exportingSourceFile, exportNode, ts.createExportDefault(ts.createIdentifier(exportName.text)));
@@ -116998,18 +118015,18 @@ var ts;
         function changeDefaultToNamedImport(importingSourceFile, ref, changes, exportName) {
             var parent = ref.parent;
             switch (parent.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     // `a.default` --> `a.foo`
                     changes.replaceNode(importingSourceFile, ref, ts.createIdentifier(exportName));
                     break;
-                case 253 /* ImportSpecifier */:
-                case 257 /* ExportSpecifier */: {
+                case 254 /* ImportSpecifier */:
+                case 258 /* ExportSpecifier */: {
                     var spec = parent;
                     // `default as foo` --> `foo`, `default as bar` --> `foo as bar`
                     changes.replaceNode(importingSourceFile, spec, makeImportSpecifier(exportName, spec.name.text));
                     break;
                 }
-                case 250 /* ImportClause */: {
+                case 251 /* ImportClause */: {
                     var clause = parent;
                     ts.Debug.assert(clause.name === ref);
                     var spec = makeImportSpecifier(exportName, ref.text);
@@ -117018,7 +118035,7 @@ var ts;
                         // `import foo from "./a";` --> `import { foo } from "./a";`
                         changes.replaceNode(importingSourceFile, ref, ts.createNamedImports([spec]));
                     }
-                    else if (namedBindings.kind === 251 /* NamespaceImport */) {
+                    else if (namedBindings.kind === 252 /* NamespaceImport */) {
                         // `import foo, * as a from "./a";` --> `import * as a from ".a/"; import { foo } from "./a";`
                         changes.deleteRange(importingSourceFile, { pos: ref.getStart(importingSourceFile), end: namedBindings.getStart(importingSourceFile) });
                         var quotePreference = ts.isStringLiteral(clause.parent.moduleSpecifier) ? ts.quotePreferenceFromString(clause.parent.moduleSpecifier, importingSourceFile) : 1 /* Double */;
@@ -117039,11 +118056,11 @@ var ts;
         function changeNamedToDefaultImport(importingSourceFile, ref, changes) {
             var parent = ref.parent;
             switch (parent.kind) {
-                case 189 /* PropertyAccessExpression */:
+                case 190 /* PropertyAccessExpression */:
                     // `a.foo` --> `a.default`
                     changes.replaceNode(importingSourceFile, ref, ts.createIdentifier("default"));
                     break;
-                case 253 /* ImportSpecifier */: {
+                case 254 /* ImportSpecifier */: {
                     // `import { foo } from "./a";` --> `import foo from "./a";`
                     // `import { foo as bar } from "./a";` --> `import bar from "./a";`
                     var defaultImport = ts.createIdentifier(parent.name.text);
@@ -117056,7 +118073,7 @@ var ts;
                     }
                     break;
                 }
-                case 257 /* ExportSpecifier */: {
+                case 258 /* ExportSpecifier */: {
                     // `export { foo } from "./a";` --> `export { default as foo } from "./a";`
                     // `export { foo as bar } from "./a";` --> `export { default as bar } from "./a";`
                     // `export { foo as default } from "./a";` --> `export { default } from "./a";`
@@ -117089,8 +118106,8 @@ var ts;
                 var i = getImportToConvert(context);
                 if (!i)
                     return ts.emptyArray;
-                var description = i.kind === 251 /* NamespaceImport */ ? ts.Diagnostics.Convert_namespace_import_to_named_imports.message : ts.Diagnostics.Convert_named_imports_to_namespace_import.message;
-                var actionName = i.kind === 251 /* NamespaceImport */ ? actionNameNamespaceToNamed : actionNameNamedToNamespace;
+                var description = i.kind === 252 /* NamespaceImport */ ? ts.Diagnostics.Convert_namespace_import_to_named_imports.message : ts.Diagnostics.Convert_named_imports_to_namespace_import.message;
+                var actionName = i.kind === 252 /* NamespaceImport */ ? actionNameNamespaceToNamed : actionNameNamedToNamespace;
                 return [{ name: refactorName, description: description, actions: [{ name: actionName, description: description }] }];
             },
             getEditsForAction: function (context, actionName) {
@@ -117112,7 +118129,7 @@ var ts;
         }
         function doChange(sourceFile, program, changes, toConvert) {
             var checker = program.getTypeChecker();
-            if (toConvert.kind === 251 /* NamespaceImport */) {
+            if (toConvert.kind === 252 /* NamespaceImport */) {
                 doChangeNamespaceToNamed(sourceFile, checker, changes, toConvert, ts.getAllowSyntheticDefaultImports(program.getCompilerOptions()));
             }
             else {
@@ -117164,7 +118181,7 @@ var ts;
         function doChangeNamedToNamespace(sourceFile, checker, changes, toConvert) {
             var importDecl = toConvert.parent.parent;
             var moduleSpecifier = importDecl.moduleSpecifier;
-            var preferredName = moduleSpecifier && ts.isStringLiteral(moduleSpecifier) ? ts.codefix.moduleSpecifierToValidIdentifier(moduleSpecifier.text, 7 /* ESNext */) : "module";
+            var preferredName = moduleSpecifier && ts.isStringLiteral(moduleSpecifier) ? ts.codefix.moduleSpecifierToValidIdentifier(moduleSpecifier.text, 8 /* ESNext */) : "module";
             var namespaceNameConflicts = toConvert.elements.some(function (element) {
                 return ts.FindAllReferences.Core.eachSymbolReferenceInFile(element.name, checker, sourceFile, function (id) {
                     return !!checker.resolveName(preferredName, id, 67108863 /* All */, /*excludeGlobals*/ true);
@@ -117455,20 +118472,20 @@ var ts;
                 function checkForStaticContext(nodeToCheck, containingClass) {
                     var current = nodeToCheck;
                     while (current !== containingClass) {
-                        if (current.kind === 154 /* PropertyDeclaration */) {
+                        if (current.kind === 155 /* PropertyDeclaration */) {
                             if (ts.hasModifier(current, 32 /* Static */)) {
                                 rangeFacts |= RangeFacts.InStaticRegion;
                             }
                             break;
                         }
-                        else if (current.kind === 151 /* Parameter */) {
+                        else if (current.kind === 152 /* Parameter */) {
                             var ctorOrMethod = ts.getContainingFunction(current);
-                            if (ctorOrMethod.kind === 157 /* Constructor */) {
+                            if (ctorOrMethod.kind === 158 /* Constructor */) {
                                 rangeFacts |= RangeFacts.InStaticRegion;
                             }
                             break;
                         }
-                        else if (current.kind === 156 /* MethodDeclaration */) {
+                        else if (current.kind === 157 /* MethodDeclaration */) {
                             if (ts.hasModifier(current, 32 /* Static */)) {
                                 rangeFacts |= RangeFacts.InStaticRegion;
                             }
@@ -117511,7 +118528,7 @@ var ts;
                             return true;
                         }
                         if (ts.isDeclaration(node)) {
-                            var declaringNode = (node.kind === 237 /* VariableDeclaration */) ? node.parent.parent : node;
+                            var declaringNode = (node.kind === 238 /* VariableDeclaration */) ? node.parent.parent : node;
                             if (ts.hasModifier(declaringNode, 1 /* Export */)) {
                                 // TODO: GH#18217 Silly to use `errors ||` since it's definitely not defined (see top of `visit`)
                                 // Also, if we're only pushing one error, just use `let error: Diagnostic | undefined`!
@@ -117523,13 +118540,13 @@ var ts;
                         }
                         // Some things can't be extracted in certain situations
                         switch (node.kind) {
-                            case 249 /* ImportDeclaration */:
+                            case 250 /* ImportDeclaration */:
                                 (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractImport));
                                 return true;
-                            case 98 /* SuperKeyword */:
+                            case 99 /* SuperKeyword */:
                                 // For a super *constructor call*, we have to be extracting the entire class,
                                 // but a super *method call* simply implies a 'this' reference
-                                if (node.parent.kind === 191 /* CallExpression */) {
+                                if (node.parent.kind === 192 /* CallExpression */) {
                                     // Super constructor call
                                     var containingClass_1 = ts.getContainingClass(node); // TODO:GH#18217
                                     if (containingClass_1.pos < span.start || containingClass_1.end >= (span.start + span.length)) {
@@ -117544,8 +118561,8 @@ var ts;
                         }
                         if (ts.isFunctionLikeDeclaration(node) || ts.isClassLike(node)) {
                             switch (node.kind) {
-                                case 239 /* FunctionDeclaration */:
-                                case 240 /* ClassDeclaration */:
+                                case 240 /* FunctionDeclaration */:
+                                case 241 /* ClassDeclaration */:
                                     if (ts.isSourceFile(node.parent) && node.parent.externalModuleIndicator === undefined) {
                                         // You cannot extract global declarations
                                         (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.functionWillNotBeVisibleInTheNewScope));
@@ -117557,20 +118574,20 @@ var ts;
                         }
                         var savedPermittedJumps = permittedJumps;
                         switch (node.kind) {
-                            case 222 /* IfStatement */:
+                            case 223 /* IfStatement */:
                                 permittedJumps = 0 /* None */;
                                 break;
-                            case 235 /* TryStatement */:
+                            case 236 /* TryStatement */:
                                 // forbid all jumps inside try blocks
                                 permittedJumps = 0 /* None */;
                                 break;
-                            case 218 /* Block */:
-                                if (node.parent && node.parent.kind === 235 /* TryStatement */ && node.parent.finallyBlock === node) {
+                            case 219 /* Block */:
+                                if (node.parent && node.parent.kind === 236 /* TryStatement */ && node.parent.finallyBlock === node) {
                                     // allow unconditional returns from finally blocks
                                     permittedJumps = 4 /* Return */;
                                 }
                                 break;
-                            case 271 /* CaseClause */:
+                            case 272 /* CaseClause */:
                                 // allow unlabeled break inside case clauses
                                 permittedJumps |= 1 /* Break */;
                                 break;
@@ -117582,19 +118599,19 @@ var ts;
                                 break;
                         }
                         switch (node.kind) {
-                            case 178 /* ThisType */:
-                            case 100 /* ThisKeyword */:
+                            case 179 /* ThisType */:
+                            case 101 /* ThisKeyword */:
                                 rangeFacts |= RangeFacts.UsesThis;
                                 break;
-                            case 233 /* LabeledStatement */: {
+                            case 234 /* LabeledStatement */: {
                                 var label = node.label;
                                 (seenLabels || (seenLabels = [])).push(label.escapedText);
                                 ts.forEachChild(node, visit);
                                 seenLabels.pop();
                                 break;
                             }
-                            case 229 /* BreakStatement */:
-                            case 228 /* ContinueStatement */: {
+                            case 230 /* BreakStatement */:
+                            case 229 /* ContinueStatement */: {
                                 var label = node.label;
                                 if (label) {
                                     if (!ts.contains(seenLabels, label.escapedText)) {
@@ -117603,20 +118620,20 @@ var ts;
                                     }
                                 }
                                 else {
-                                    if (!(permittedJumps & (node.kind === 229 /* BreakStatement */ ? 1 /* Break */ : 2 /* Continue */))) {
+                                    if (!(permittedJumps & (node.kind === 230 /* BreakStatement */ ? 1 /* Break */ : 2 /* Continue */))) {
                                         // attempt to break or continue in a forbidden context
                                         (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractRangeContainingConditionalBreakOrContinueStatements));
                                     }
                                 }
                                 break;
                             }
-                            case 201 /* AwaitExpression */:
+                            case 202 /* AwaitExpression */:
                                 rangeFacts |= RangeFacts.IsAsyncFunction;
                                 break;
-                            case 207 /* YieldExpression */:
+                            case 208 /* YieldExpression */:
                                 rangeFacts |= RangeFacts.IsGenerator;
                                 break;
-                            case 230 /* ReturnStatement */:
+                            case 231 /* ReturnStatement */:
                                 if (permittedJumps & 4 /* Return */) {
                                     rangeFacts |= RangeFacts.HasReturn;
                                 }
@@ -117670,7 +118687,7 @@ var ts;
                 while (true) {
                     current = current.parent;
                     // A function parameter's initializer is actually in the outer scope, not the function declaration
-                    if (current.kind === 151 /* Parameter */) {
+                    if (current.kind === 152 /* Parameter */) {
                         // Skip all the way to the outer scope of the function that declared this parameter
                         current = ts.findAncestor(current, function (parent) { return ts.isFunctionLikeDeclaration(parent); }).parent;
                     }
@@ -117681,7 +118698,7 @@ var ts;
                     //  * Module/namespace or source file
                     if (isScope(current)) {
                         scopes.push(current);
-                        if (current.kind === 284 /* SourceFile */) {
+                        if (current.kind === 285 /* SourceFile */) {
                             return scopes;
                         }
                     }
@@ -117771,32 +118788,32 @@ var ts;
             }
             function getDescriptionForFunctionLikeDeclaration(scope) {
                 switch (scope.kind) {
-                    case 157 /* Constructor */:
+                    case 158 /* Constructor */:
                         return "constructor";
-                    case 196 /* FunctionExpression */:
-                    case 239 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 240 /* FunctionDeclaration */:
                         return scope.name
                             ? "function '" + scope.name.text + "'"
                             : "anonymous function";
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         return "arrow function";
-                    case 156 /* MethodDeclaration */:
+                    case 157 /* MethodDeclaration */:
                         return "method '" + scope.name.getText() + "'";
-                    case 158 /* GetAccessor */:
+                    case 159 /* GetAccessor */:
                         return "'get " + scope.name.getText() + "'";
-                    case 159 /* SetAccessor */:
+                    case 160 /* SetAccessor */:
                         return "'set " + scope.name.getText() + "'";
                     default:
                         throw ts.Debug.assertNever(scope);
                 }
             }
             function getDescriptionForClassLikeDeclaration(scope) {
-                return scope.kind === 240 /* ClassDeclaration */
+                return scope.kind === 241 /* ClassDeclaration */
                     ? scope.name ? "class '" + scope.name.text + "'" : "anonymous class declaration"
                     : scope.name ? "class expression '" + scope.name.text + "'" : "anonymous class expression";
             }
             function getDescriptionForModuleLikeDeclaration(scope) {
-                return scope.kind === 245 /* ModuleBlock */
+                return scope.kind === 246 /* ModuleBlock */
                     ? "namespace '" + scope.parent.name.getText() + "'"
                     : scope.externalModuleIndicator ? 0 /* Module */ : 1 /* Global */;
             }
@@ -117862,12 +118879,12 @@ var ts;
                 var newFunction;
                 if (ts.isClassLike(scope)) {
                     // always create private method in TypeScript files
-                    var modifiers = isJS ? [] : [ts.createToken(113 /* PrivateKeyword */)];
+                    var modifiers = isJS ? [] : [ts.createToken(114 /* PrivateKeyword */)];
                     if (range.facts & RangeFacts.InStaticRegion) {
-                        modifiers.push(ts.createToken(116 /* StaticKeyword */));
+                        modifiers.push(ts.createToken(117 /* StaticKeyword */));
                     }
                     if (range.facts & RangeFacts.IsAsyncFunction) {
-                        modifiers.push(ts.createToken(121 /* AsyncKeyword */));
+                        modifiers.push(ts.createToken(122 /* AsyncKeyword */));
                     }
                     newFunction = ts.createMethod(
                     /*decorators*/ undefined, modifiers.length ? modifiers : undefined, range.facts & RangeFacts.IsGenerator ? ts.createToken(40 /* AsteriskToken */) : undefined, functionName, 
@@ -117875,7 +118892,7 @@ var ts;
                 }
                 else {
                     newFunction = ts.createFunctionDeclaration(
-                    /*decorators*/ undefined, range.facts & RangeFacts.IsAsyncFunction ? [ts.createToken(121 /* AsyncKeyword */)] : undefined, range.facts & RangeFacts.IsGenerator ? ts.createToken(40 /* AsteriskToken */) : undefined, functionName, typeParameters, parameters, returnType, body);
+                    /*decorators*/ undefined, range.facts & RangeFacts.IsAsyncFunction ? [ts.createToken(122 /* AsyncKeyword */)] : undefined, range.facts & RangeFacts.IsGenerator ? ts.createToken(40 /* AsteriskToken */) : undefined, functionName, typeParameters, parameters, returnType, body);
                 }
                 var changeTracker = ts.textChanges.ChangeTracker.fromContext(context);
                 var minInsertionPos = (isReadonlyArray(range.range) ? ts.last(range.range) : range.range).end;
@@ -118016,9 +119033,9 @@ var ts;
                     while (ts.isParenthesizedTypeNode(withoutParens)) {
                         withoutParens = withoutParens.type;
                     }
-                    return ts.isUnionTypeNode(withoutParens) && ts.find(withoutParens.types, function (t) { return t.kind === 141 /* UndefinedKeyword */; })
+                    return ts.isUnionTypeNode(withoutParens) && ts.find(withoutParens.types, function (t) { return t.kind === 142 /* UndefinedKeyword */; })
                         ? clone
-                        : ts.createUnionTypeNode([clone, ts.createKeywordTypeNode(141 /* UndefinedKeyword */)]);
+                        : ts.createUnionTypeNode([clone, ts.createKeywordTypeNode(142 /* UndefinedKeyword */)]);
                 }
             }
             /**
@@ -118041,11 +119058,11 @@ var ts;
                 if (ts.isClassLike(scope)) {
                     ts.Debug.assert(!isJS); // See CannotExtractToJSClass
                     var modifiers = [];
-                    modifiers.push(ts.createToken(113 /* PrivateKeyword */));
+                    modifiers.push(ts.createToken(114 /* PrivateKeyword */));
                     if (rangeFacts & RangeFacts.InStaticRegion) {
-                        modifiers.push(ts.createToken(116 /* StaticKeyword */));
+                        modifiers.push(ts.createToken(117 /* StaticKeyword */));
                     }
-                    modifiers.push(ts.createToken(133 /* ReadonlyKeyword */));
+                    modifiers.push(ts.createToken(134 /* ReadonlyKeyword */));
                     var newVariable = ts.createProperty(
                     /*decorators*/ undefined, modifiers, localNameText, 
                     /*questionToken*/ undefined, variableType, initializer);
@@ -118074,7 +119091,7 @@ var ts;
                         var localReference = ts.createIdentifier(localNameText);
                         changeTracker.replaceNode(context.file, node, localReference);
                     }
-                    else if (node.parent.kind === 221 /* ExpressionStatement */ && scope === ts.findAncestor(node, isScope)) {
+                    else if (node.parent.kind === 222 /* ExpressionStatement */ && scope === ts.findAncestor(node, isScope)) {
                         // If the parent is an expression statement and the target scope is the immediately enclosing one,
                         // replace the statement with the declaration.
                         var newVariableStatement = ts.createVariableStatement(
@@ -118093,7 +119110,7 @@ var ts;
                             changeTracker.insertNodeBefore(context.file, nodeToInsertBefore, newVariableStatement, /*blankLineBetween*/ false);
                         }
                         // Consume
-                        if (node.parent.kind === 221 /* ExpressionStatement */) {
+                        if (node.parent.kind === 222 /* ExpressionStatement */) {
                             // If the parent is an expression statement, delete it.
                             changeTracker.delete(context.file, node.parent);
                         }
@@ -118180,7 +119197,7 @@ var ts;
                     return { body: ts.createBlock(statements, /*multiLine*/ true), returnValueProperty: undefined };
                 }
                 function visitor(node) {
-                    if (!ignoreReturns && node.kind === 230 /* ReturnStatement */ && hasWritesOrVariableDeclarations) {
+                    if (!ignoreReturns && node.kind === 231 /* ReturnStatement */ && hasWritesOrVariableDeclarations) {
                         var assignments = getPropertyAssignmentsForWritesAndVariableDeclarations(exposedVariableDeclarations, writes);
                         if (node.expression) {
                             if (!returnValueProperty) {
@@ -118358,7 +119375,7 @@ var ts;
                     var scope = scopes_1[_i];
                     usagesPerScope.push({ usages: ts.createMap(), typeParameterUsages: ts.createMap(), substitutions: ts.createMap() });
                     substitutionsPerScope.push(ts.createMap());
-                    functionErrorsPerScope.push(ts.isFunctionLikeDeclaration(scope) && scope.kind !== 239 /* FunctionDeclaration */
+                    functionErrorsPerScope.push(ts.isFunctionLikeDeclaration(scope) && scope.kind !== 240 /* FunctionDeclaration */
                         ? [ts.createDiagnosticForNode(scope, Messages.cannotExtractToOtherFunctionLike)]
                         : []);
                     var constantErrors = [];
@@ -118674,30 +119691,30 @@ var ts;
             function isExtractableExpression(node) {
                 var parent = node.parent;
                 switch (parent.kind) {
-                    case 278 /* EnumMember */:
+                    case 279 /* EnumMember */:
                         return false;
                 }
                 switch (node.kind) {
                     case 10 /* StringLiteral */:
-                        return parent.kind !== 249 /* ImportDeclaration */ &&
-                            parent.kind !== 253 /* ImportSpecifier */;
-                    case 208 /* SpreadElement */:
-                    case 184 /* ObjectBindingPattern */:
-                    case 186 /* BindingElement */:
+                        return parent.kind !== 250 /* ImportDeclaration */ &&
+                            parent.kind !== 254 /* ImportSpecifier */;
+                    case 209 /* SpreadElement */:
+                    case 185 /* ObjectBindingPattern */:
+                    case 187 /* BindingElement */:
                         return false;
-                    case 72 /* Identifier */:
-                        return parent.kind !== 186 /* BindingElement */ &&
-                            parent.kind !== 253 /* ImportSpecifier */ &&
-                            parent.kind !== 257 /* ExportSpecifier */;
+                    case 73 /* Identifier */:
+                        return parent.kind !== 187 /* BindingElement */ &&
+                            parent.kind !== 254 /* ImportSpecifier */ &&
+                            parent.kind !== 258 /* ExportSpecifier */;
                 }
                 return true;
             }
             function isBlockLike(node) {
                 switch (node.kind) {
-                    case 218 /* Block */:
-                    case 284 /* SourceFile */:
-                    case 245 /* ModuleBlock */:
-                    case 271 /* CaseClause */:
+                    case 219 /* Block */:
+                    case 285 /* SourceFile */:
+                    case 246 /* ModuleBlock */:
+                    case 272 /* CaseClause */:
                         return true;
                     default:
                         return false;
@@ -118708,6 +119725,136 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var refactor;
+    (function (refactor) {
+        var refactorName = "Extract type";
+        var extractToTypeAlias = "Extract to type alias";
+        var extractToTypeDef = "Extract to typedef";
+        refactor.registerRefactor(refactorName, {
+            getAvailableActions: function (context) {
+                var info = getRangeToExtract(context);
+                if (!info)
+                    return ts.emptyArray;
+                return [{
+                        name: refactorName,
+                        description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_type),
+                        actions: [info.isJS ? {
+                                name: extractToTypeDef, description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_typedef)
+                            } : {
+                                name: extractToTypeAlias, description: ts.getLocaleSpecificMessage(ts.Diagnostics.Extract_to_type_alias)
+                            }]
+                    }];
+            },
+            getEditsForAction: function (context, actionName) {
+                ts.Debug.assert(actionName === extractToTypeAlias || actionName === extractToTypeDef);
+                var file = context.file;
+                var info = ts.Debug.assertDefined(getRangeToExtract(context));
+                ts.Debug.assert(actionName === extractToTypeAlias && !info.isJS || actionName === extractToTypeDef && info.isJS);
+                var name = ts.getUniqueName("NewType", file);
+                var edits = ts.textChanges.ChangeTracker.with(context, function (changes) { return info.isJS ?
+                    doTypedefChange(changes, file, name, info.firstStatement, info.selection, info.typeParameters) :
+                    doTypeAliasChange(changes, file, name, info.firstStatement, info.selection, info.typeParameters); });
+                var renameFilename = file.fileName;
+                var renameLocation = ts.getRenameLocation(edits, renameFilename, name, /*preferLastLocation*/ false);
+                return { edits: edits, renameFilename: renameFilename, renameLocation: renameLocation };
+            }
+        });
+        function getRangeToExtract(context) {
+            var file = context.file, startPosition = context.startPosition;
+            var isJS = ts.isSourceFileJS(file);
+            var current = ts.getTokenAtPosition(file, startPosition);
+            var range = ts.createTextRangeFromSpan(ts.getRefactorContextSpan(context));
+            var selection = ts.findAncestor(current, (function (node) { return node.parent && rangeContainsSkipTrivia(range, node, file) && !rangeContainsSkipTrivia(range, node.parent, file); }));
+            if (!selection || !ts.isTypeNode(selection))
+                return undefined;
+            var checker = context.program.getTypeChecker();
+            var firstStatement = ts.Debug.assertDefined(isJS ? ts.findAncestor(selection, isStatementAndHasJSDoc) : ts.findAncestor(selection, ts.isStatement));
+            var typeParameters = collectTypeParameters(checker, selection, firstStatement, file);
+            if (!typeParameters)
+                return undefined;
+            return { isJS: isJS, selection: selection, firstStatement: firstStatement, typeParameters: typeParameters };
+        }
+        function isStatementAndHasJSDoc(n) {
+            return ts.isStatement(n) && ts.hasJSDocNodes(n);
+        }
+        function rangeContainsSkipTrivia(r1, node, file) {
+            return ts.rangeContainsStartEnd(r1, ts.skipTrivia(file.text, node.pos), node.end);
+        }
+        function collectTypeParameters(checker, selection, statement, file) {
+            var result = [];
+            return visitor(selection) ? undefined : result;
+            function visitor(node) {
+                if (ts.isTypeReferenceNode(node)) {
+                    if (ts.isIdentifier(node.typeName)) {
+                        var symbol = checker.resolveName(node.typeName.text, node.typeName, 262144 /* TypeParameter */, /* excludeGlobals */ true);
+                        if (symbol) {
+                            var declaration = ts.cast(ts.first(symbol.declarations), ts.isTypeParameterDeclaration);
+                            if (rangeContainsSkipTrivia(statement, declaration, file) && !rangeContainsSkipTrivia(selection, declaration, file)) {
+                                result.push(declaration);
+                            }
+                        }
+                    }
+                }
+                else if (ts.isInferTypeNode(node)) {
+                    var conditionalTypeNode = ts.findAncestor(node, function (n) { return ts.isConditionalTypeNode(n) && rangeContainsSkipTrivia(n.extendsType, node, file); });
+                    if (!conditionalTypeNode || !rangeContainsSkipTrivia(selection, conditionalTypeNode, file)) {
+                        return true;
+                    }
+                }
+                else if ((ts.isTypePredicateNode(node) || ts.isThisTypeNode(node))) {
+                    var functionLikeNode = ts.findAncestor(node.parent, ts.isFunctionLike);
+                    if (functionLikeNode && functionLikeNode.type && rangeContainsSkipTrivia(functionLikeNode.type, node, file) && !rangeContainsSkipTrivia(selection, functionLikeNode, file)) {
+                        return true;
+                    }
+                }
+                else if (ts.isTypeQueryNode(node)) {
+                    if (ts.isIdentifier(node.exprName)) {
+                        var symbol = checker.resolveName(node.exprName.text, node.exprName, 67220415 /* Value */, /* excludeGlobals */ false);
+                        if (symbol && rangeContainsSkipTrivia(statement, symbol.valueDeclaration, file) && !rangeContainsSkipTrivia(selection, symbol.valueDeclaration, file)) {
+                            return true;
+                        }
+                    }
+                    else {
+                        if (ts.isThisIdentifier(node.exprName.left) && !rangeContainsSkipTrivia(selection, node.parent, file)) {
+                            return true;
+                        }
+                    }
+                }
+                return ts.forEachChild(node, visitor);
+            }
+        }
+        function doTypeAliasChange(changes, file, name, firstStatement, selection, typeParameters) {
+            var newTypeNode = ts.createTypeAliasDeclaration(
+            /* decorators */ undefined, 
+            /* modifiers */ undefined, name, typeParameters.map(function (id) { return ts.updateTypeParameterDeclaration(id, id.name, id.constraint, /* defaultType */ undefined); }), selection);
+            changes.insertNodeBefore(file, firstStatement, newTypeNode, /* blankLineBetween */ true);
+            changes.replaceNode(file, selection, ts.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.createTypeReferenceNode(id.name, /* typeArguments */ undefined); })));
+        }
+        function doTypedefChange(changes, file, name, firstStatement, selection, typeParameters) {
+            var node = ts.createNode(310 /* JSDocTypedefTag */);
+            node.tagName = ts.createIdentifier("typedef"); // TODO: jsdoc factory https://github.com/Microsoft/TypeScript/pull/29539
+            node.fullName = ts.createIdentifier(name);
+            node.name = node.fullName;
+            node.typeExpression = ts.createJSDocTypeExpression(selection);
+            var templates = [];
+            ts.forEach(typeParameters, function (typeParameter) {
+                var constraint = ts.getEffectiveConstraintOfTypeParameter(typeParameter);
+                var template = ts.createNode(309 /* JSDocTemplateTag */);
+                template.tagName = ts.createIdentifier("template");
+                template.constraint = constraint && ts.cast(constraint, ts.isJSDocTypeExpression);
+                var parameter = ts.createNode(151 /* TypeParameter */);
+                parameter.name = typeParameter.name;
+                template.typeParameters = ts.createNodeArray([parameter]);
+                templates.push(template);
+            });
+            changes.insertNodeBefore(file, firstStatement, ts.createJSDocComment(/* comment */ undefined, ts.createNodeArray(ts.concatenate(templates, [node]))), /* blankLineBetween */ true);
+            changes.replaceNode(file, selection, ts.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.createTypeReferenceNode(id.name, /* typeArguments */ undefined); })));
+        }
+    })(refactor = ts.refactor || (ts.refactor = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var refactor;
     (function (refactor) {
@@ -118746,10 +119893,10 @@ var ts;
                 var modifierFlags = ts.getModifierFlags(declaration) & ~64 /* Readonly */;
                 var accessorModifiers = isInClassLike
                     ? !modifierFlags || modifierFlags & 8 /* Private */
-                        ? getModifiers(isJS, isStatic, 115 /* PublicKeyword */)
+                        ? getModifiers(isJS, isStatic, 116 /* PublicKeyword */)
                         : ts.createNodeArray(ts.createModifiersFromModifierFlags(modifierFlags))
                     : undefined;
-                var fieldModifiers = isInClassLike ? getModifiers(isJS, isStatic, 113 /* PrivateKeyword */) : undefined;
+                var fieldModifiers = isInClassLike ? getModifiers(isJS, isStatic, 114 /* PrivateKeyword */) : undefined;
                 updateFieldDeclaration(changeTracker, file, declaration, fieldName, fieldModifiers);
                 var getAccessor = generateGetAccessor(fieldName, accessorName, type, accessorModifiers, isStatic, container);
                 ts.suppressLeadingAndTrailingTrivia(getAccessor);
@@ -118787,7 +119934,7 @@ var ts;
                 return ts.isIdentifier(fieldName) ? ts.createPropertyAccess(leftHead, fieldName) : ts.createElementAccess(leftHead, ts.createLiteral(fieldName));
             }
             function getModifiers(isJS, isStatic, accessModifier) {
-                var modifiers = ts.append(!isJS ? [ts.createToken(accessModifier)] : undefined, isStatic ? ts.createToken(116 /* StaticKeyword */) : undefined);
+                var modifiers = ts.append(!isJS ? [ts.createToken(accessModifier)] : undefined, isStatic ? ts.createToken(117 /* StaticKeyword */) : undefined);
                 return modifiers && ts.createNodeArray(modifiers);
             }
             function startsWithUnderscore(name) {
@@ -118810,7 +119957,7 @@ var ts;
                     isStatic: ts.hasStaticModifier(declaration),
                     isReadonly: ts.hasReadonlyModifier(declaration),
                     type: ts.getTypeAnnotationNode(declaration),
-                    container: declaration.kind === 151 /* Parameter */ ? declaration.parent.parent : declaration.parent,
+                    container: declaration.kind === 152 /* Parameter */ ? declaration.parent.parent : declaration.parent,
                     originalName: declaration.name.text,
                     declaration: declaration,
                     fieldName: fieldName,
@@ -118867,13 +120014,13 @@ var ts;
                     return;
                 constructor.body.forEachChild(function recur(node) {
                     if (ts.isElementAccessExpression(node) &&
-                        node.expression.kind === 100 /* ThisKeyword */ &&
+                        node.expression.kind === 101 /* ThisKeyword */ &&
                         ts.isStringLiteral(node.argumentExpression) &&
                         node.argumentExpression.text === originalName &&
                         ts.isWriteAccess(node)) {
                         changeTracker.replaceNode(file, node.argumentExpression, ts.createStringLiteral(fieldName));
                     }
-                    if (ts.isPropertyAccessExpression(node) && node.expression.kind === 100 /* ThisKeyword */ && node.name.text === originalName && ts.isWriteAccess(node)) {
+                    if (ts.isPropertyAccessExpression(node) && node.expression.kind === 101 /* ThisKeyword */ && node.name.text === originalName && ts.isWriteAccess(node)) {
                         changeTracker.replaceNode(file, node.name, ts.createIdentifier(fieldName));
                     }
                     if (!ts.isFunctionLike(node) && !ts.isClassLike(node)) {
@@ -118955,11 +120102,11 @@ var ts;
         }
         function isPureImport(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return true;
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return !ts.hasModifier(node, 1 /* Export */);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return node.declarationList.declarations.every(function (d) { return !!d.initializer && ts.isRequireCall(d.initializer, /*checkArgumentIsStringLiteralLike*/ true); });
                 default:
                     return false;
@@ -119047,19 +120194,19 @@ var ts;
         }
         function getNamespaceLikeImport(node) {
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
-                    return node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 251 /* NamespaceImport */ ?
+                case 250 /* ImportDeclaration */:
+                    return node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 252 /* NamespaceImport */ ?
                         node.importClause.namedBindings.name : undefined;
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return node.name;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return ts.tryCast(node.name, ts.isIdentifier);
                 default:
                     return ts.Debug.assertNever(node);
             }
         }
         function updateNamespaceLikeImport(changes, sourceFile, checker, movedSymbols, newModuleName, newModuleSpecifier, oldImportId, oldImportNode) {
-            var preferredNewNamespaceName = ts.codefix.moduleSpecifierToValidIdentifier(newModuleName, 7 /* ESNext */);
+            var preferredNewNamespaceName = ts.codefix.moduleSpecifierToValidIdentifier(newModuleName, 8 /* ESNext */);
             var needUniqueName = false;
             var toChange = [];
             ts.FindAllReferences.Core.eachSymbolReferenceInFile(oldImportId, checker, sourceFile, function (ref) {
@@ -119083,20 +120230,20 @@ var ts;
             var newNamespaceId = ts.createIdentifier(newNamespaceName);
             var newModuleString = ts.createLiteral(newModuleSpecifier);
             switch (node.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     return ts.createImportDeclaration(
                     /*decorators*/ undefined, /*modifiers*/ undefined, ts.createImportClause(/*name*/ undefined, ts.createNamespaceImport(newNamespaceId)), newModuleString);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return ts.createImportEqualsDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, newNamespaceId, ts.createExternalModuleReference(newModuleString));
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return ts.createVariableDeclaration(newNamespaceId, /*type*/ undefined, createRequireCall(newModuleString));
                 default:
                     return ts.Debug.assertNever(node);
             }
         }
         function moduleSpecifierFromImport(i) {
-            return (i.kind === 249 /* ImportDeclaration */ ? i.moduleSpecifier
-                : i.kind === 248 /* ImportEqualsDeclaration */ ? i.moduleReference.expression
+            return (i.kind === 250 /* ImportDeclaration */ ? i.moduleSpecifier
+                : i.kind === 249 /* ImportEqualsDeclaration */ ? i.moduleReference.expression
                     : i.initializer.arguments[0]);
         }
         function forEachImportInStatement(statement, cb) {
@@ -119166,15 +120313,15 @@ var ts;
         }
         function deleteUnusedImports(sourceFile, importDecl, changes, isUnused) {
             switch (importDecl.kind) {
-                case 249 /* ImportDeclaration */:
+                case 250 /* ImportDeclaration */:
                     deleteUnusedImportsInDeclaration(sourceFile, importDecl, changes, isUnused);
                     break;
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     if (isUnused(importDecl.name)) {
                         changes.delete(sourceFile, importDecl);
                     }
                     break;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     deleteUnusedImportsInVariableDeclaration(sourceFile, importDecl, changes, isUnused);
                     break;
                 default:
@@ -119187,7 +120334,7 @@ var ts;
             var _a = importDecl.importClause, name = _a.name, namedBindings = _a.namedBindings;
             var defaultUnused = !name || isUnused(name);
             var namedBindingsUnused = !namedBindings ||
-                (namedBindings.kind === 251 /* NamespaceImport */ ? isUnused(namedBindings.name) : namedBindings.elements.length !== 0 && namedBindings.elements.every(function (e) { return isUnused(e.name); }));
+                (namedBindings.kind === 252 /* NamespaceImport */ ? isUnused(namedBindings.name) : namedBindings.elements.length !== 0 && namedBindings.elements.every(function (e) { return isUnused(e.name); }));
             if (defaultUnused && namedBindingsUnused) {
                 changes.delete(sourceFile, importDecl);
             }
@@ -119199,7 +120346,7 @@ var ts;
                     if (namedBindingsUnused) {
                         changes.delete(sourceFile, namedBindings);
                     }
-                    else if (namedBindings.kind === 252 /* NamedImports */) {
+                    else if (namedBindings.kind === 253 /* NamedImports */) {
                         for (var _i = 0, _b = namedBindings.elements; _i < _b.length; _i++) {
                             var element = _b[_i];
                             if (isUnused(element.name))
@@ -119212,14 +120359,14 @@ var ts;
         function deleteUnusedImportsInVariableDeclaration(sourceFile, varDecl, changes, isUnused) {
             var name = varDecl.name;
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     if (isUnused(name)) {
                         changes.delete(sourceFile, name);
                     }
                     break;
-                case 185 /* ArrayBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
                     break;
-                case 184 /* ObjectBindingPattern */:
+                case 185 /* ObjectBindingPattern */:
                     if (name.elements.every(function (e) { return ts.isIdentifier(e.name) && isUnused(e.name); })) {
                         changes.delete(sourceFile, ts.isVariableDeclarationList(varDecl.parent) && varDecl.parent.declarations.length === 1 ? varDecl.parent.parent : varDecl);
                     }
@@ -119346,13 +120493,13 @@ var ts;
         // Below should all be utilities
         function isInImport(decl) {
             switch (decl.kind) {
-                case 248 /* ImportEqualsDeclaration */:
-                case 253 /* ImportSpecifier */:
-                case 250 /* ImportClause */:
+                case 249 /* ImportEqualsDeclaration */:
+                case 254 /* ImportSpecifier */:
+                case 251 /* ImportClause */:
                     return true;
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return isVariableDeclarationInImport(decl);
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     return ts.isVariableDeclaration(decl.parent.parent) && isVariableDeclarationInImport(decl.parent.parent);
                 default:
                     return false;
@@ -119364,7 +120511,7 @@ var ts;
         }
         function filterImport(i, moduleSpecifier, keep) {
             switch (i.kind) {
-                case 249 /* ImportDeclaration */: {
+                case 250 /* ImportDeclaration */: {
                     var clause = i.importClause;
                     if (!clause)
                         return undefined;
@@ -119374,9 +120521,9 @@ var ts;
                         ? ts.createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.createImportClause(defaultImport, namedBindings), moduleSpecifier)
                         : undefined;
                 }
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return keep(i.name) ? i : undefined;
-                case 237 /* VariableDeclaration */: {
+                case 238 /* VariableDeclaration */: {
                     var name = filterBindingName(i.name, keep);
                     return name ? makeVariableStatement(name, i.type, createRequireCall(moduleSpecifier), i.parent.flags) : undefined;
                 }
@@ -119385,7 +120532,7 @@ var ts;
             }
         }
         function filterNamedBindings(namedBindings, keep) {
-            if (namedBindings.kind === 251 /* NamespaceImport */) {
+            if (namedBindings.kind === 252 /* NamespaceImport */) {
                 return keep(namedBindings.name) ? namedBindings : undefined;
             }
             else {
@@ -119395,11 +120542,11 @@ var ts;
         }
         function filterBindingName(name, keep) {
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return keep(name) ? name : undefined;
-                case 185 /* ArrayBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
                     return name;
-                case 184 /* ObjectBindingPattern */: {
+                case 185 /* ObjectBindingPattern */: {
                     // We can't handle nested destructurings or property names well here, so just copy them all.
                     var newElements = name.elements.filter(function (prop) { return prop.propertyName || !ts.isIdentifier(prop.name) || keep(prop.name); });
                     return newElements.length ? ts.createObjectBindingPattern(newElements) : undefined;
@@ -119456,13 +120603,13 @@ var ts;
         }
         function isNonVariableTopLevelDeclaration(node) {
             switch (node.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return true;
                 default:
                     return false;
@@ -119470,17 +120617,17 @@ var ts;
         }
         function forEachTopLevelDeclaration(statement, cb) {
             switch (statement.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return cb(statement);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return ts.firstDefined(statement.declarationList.declarations, function (decl) { return forEachTopLevelDeclarationInBindingName(decl.name, cb); });
-                case 221 /* ExpressionStatement */: {
+                case 222 /* ExpressionStatement */: {
                     var expression = statement.expression;
                     return ts.isBinaryExpression(expression) && ts.getAssignmentDeclarationKind(expression) === 1 /* ExportsProperty */
                         ? cb(statement)
@@ -119490,10 +120637,10 @@ var ts;
         }
         function forEachTopLevelDeclarationInBindingName(name, cb) {
             switch (name.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return cb(ts.cast(name.parent, function (x) { return ts.isVariableDeclaration(x) || ts.isBindingElement(x); }));
-                case 185 /* ArrayBindingPattern */:
-                case 184 /* ObjectBindingPattern */:
+                case 186 /* ArrayBindingPattern */:
+                case 185 /* ObjectBindingPattern */:
                     return ts.firstDefined(name.elements, function (em) { return ts.isOmittedExpression(em) ? undefined : forEachTopLevelDeclarationInBindingName(em.name, cb); });
                 default:
                     return ts.Debug.assertNever(name);
@@ -119504,9 +120651,9 @@ var ts;
         }
         function getTopLevelDeclarationStatement(d) {
             switch (d.kind) {
-                case 237 /* VariableDeclaration */:
+                case 238 /* VariableDeclaration */:
                     return d.parent.parent;
-                case 186 /* BindingElement */:
+                case 187 /* BindingElement */:
                     return getTopLevelDeclarationStatement(ts.cast(d.parent.parent, function (p) { return ts.isVariableDeclaration(p) || ts.isBindingElement(p); }));
                 default:
                     return d;
@@ -119537,25 +120684,25 @@ var ts;
             return useEs6Exports ? [addEs6Export(decl)] : addCommonjsExport(decl);
         }
         function addEs6Export(d) {
-            var modifiers = ts.concatenate([ts.createModifier(85 /* ExportKeyword */)], d.modifiers);
+            var modifiers = ts.concatenate([ts.createModifier(86 /* ExportKeyword */)], d.modifiers);
             switch (d.kind) {
-                case 239 /* FunctionDeclaration */:
+                case 240 /* FunctionDeclaration */:
                     return ts.updateFunctionDeclaration(d, d.decorators, modifiers, d.asteriskToken, d.name, d.typeParameters, d.parameters, d.type, d.body);
-                case 240 /* ClassDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return ts.updateClassDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.heritageClauses, d.members);
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return ts.updateVariableStatement(d, modifiers, d.declarationList);
-                case 244 /* ModuleDeclaration */:
+                case 245 /* ModuleDeclaration */:
                     return ts.updateModuleDeclaration(d, d.decorators, modifiers, d.name, d.body);
-                case 243 /* EnumDeclaration */:
+                case 244 /* EnumDeclaration */:
                     return ts.updateEnumDeclaration(d, d.decorators, modifiers, d.name, d.members);
-                case 242 /* TypeAliasDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
                     return ts.updateTypeAliasDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.type);
-                case 241 /* InterfaceDeclaration */:
+                case 242 /* InterfaceDeclaration */:
                     return ts.updateInterfaceDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.heritageClauses, d.members);
-                case 248 /* ImportEqualsDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return ts.updateImportEqualsDeclaration(d, d.decorators, modifiers, d.name, d.moduleReference);
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return ts.Debug.fail(); // Shouldn't try to add 'export' keyword to `exports.x = ...`
                 default:
                     return ts.Debug.assertNever(d);
@@ -119566,18 +120713,18 @@ var ts;
         }
         function getNamesToExportInCommonJS(decl) {
             switch (decl.kind) {
-                case 239 /* FunctionDeclaration */:
-                case 240 /* ClassDeclaration */:
+                case 240 /* FunctionDeclaration */:
+                case 241 /* ClassDeclaration */:
                     return [decl.name.text]; // TODO: GH#18217
-                case 219 /* VariableStatement */:
+                case 220 /* VariableStatement */:
                     return ts.mapDefined(decl.declarationList.declarations, function (d) { return ts.isIdentifier(d.name) ? d.name.text : undefined; });
-                case 244 /* ModuleDeclaration */:
-                case 243 /* EnumDeclaration */:
-                case 242 /* TypeAliasDeclaration */:
-                case 241 /* InterfaceDeclaration */:
-                case 248 /* ImportEqualsDeclaration */:
+                case 245 /* ModuleDeclaration */:
+                case 244 /* EnumDeclaration */:
+                case 243 /* TypeAliasDeclaration */:
+                case 242 /* InterfaceDeclaration */:
+                case 249 /* ImportEqualsDeclaration */:
                     return ts.emptyArray;
-                case 221 /* ExpressionStatement */:
+                case 222 /* ExpressionStatement */:
                     return ts.Debug.fail(); // Shouldn't try to add 'export' keyword to `exports.x = ...`
                 default:
                     return ts.Debug.assertNever(decl);
@@ -119585,7 +120732,7 @@ var ts;
         }
         /** Creates `exports.x = x;` */
         function createExportAssignment(name) {
-            return ts.createExpressionStatement(ts.createBinary(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.createIdentifier(name)), 59 /* EqualsToken */, ts.createIdentifier(name)));
+            return ts.createExpressionStatement(ts.createBinary(ts.createPropertyAccess(ts.createIdentifier("exports"), ts.createIdentifier(name)), 60 /* EqualsToken */, ts.createIdentifier(name)));
         }
     })(refactor = ts.refactor || (ts.refactor = {}));
 })(ts || (ts = {}));
@@ -119751,8 +120898,8 @@ var ts;
                 function groupReferences(referenceEntries) {
                     var classReferences = { accessExpressions: [], typeUsages: [] };
                     var groupedReferences = { functionCalls: [], declarations: [], classReferences: classReferences, valid: true };
-                    var functionSymbols = ts.map(functionNames, checker.getSymbolAtLocation);
-                    var classSymbols = ts.map(classNames, checker.getSymbolAtLocation);
+                    var functionSymbols = ts.map(functionNames, getSymbolTargetAtLocation);
+                    var classSymbols = ts.map(classNames, getSymbolTargetAtLocation);
                     var isConstructor = ts.isConstructorDeclaration(functionDeclaration);
                     for (var _i = 0, referenceEntries_1 = referenceEntries; _i < referenceEntries_1.length; _i++) {
                         var entry = referenceEntries_1[_i];
@@ -119771,7 +120918,11 @@ var ts;
                         So we need to add a special case for this because when calling a constructor of a class through one of its subclasses,
                         the symbols are going to be different.
                         */
-                        if (ts.contains(functionSymbols, checker.getSymbolAtLocation(entry.node), symbolComparer) || ts.isNewExpressionTarget(entry.node)) {
+                        if (ts.contains(functionSymbols, getSymbolTargetAtLocation(entry.node)) || ts.isNewExpressionTarget(entry.node)) {
+                            var importOrExportReference = entryToImportOrExport(entry);
+                            if (importOrExportReference) {
+                                continue;
+                            }
                             var decl = entryToDeclaration(entry);
                             if (decl) {
                                 groupedReferences.declarations.push(decl);
@@ -119784,7 +120935,11 @@ var ts;
                             }
                         }
                         // if the refactored function is a constructor, we must also check if the references to its class are valid
-                        if (isConstructor && ts.contains(classSymbols, checker.getSymbolAtLocation(entry.node), symbolComparer)) {
+                        if (isConstructor && ts.contains(classSymbols, getSymbolTargetAtLocation(entry.node))) {
+                            var importOrExportReference = entryToImportOrExport(entry);
+                            if (importOrExportReference) {
+                                continue;
+                            }
                             var decl = entryToDeclaration(entry);
                             if (decl) {
                                 groupedReferences.declarations.push(decl);
@@ -119809,9 +120964,23 @@ var ts;
                     }
                     return groupedReferences;
                 }
+                function getSymbolTargetAtLocation(node) {
+                    var symbol = checker.getSymbolAtLocation(node);
+                    return symbol && ts.getSymbolTarget(symbol, checker);
+                }
             }
-            function symbolComparer(a, b) {
-                return ts.getSymbolTarget(a) === ts.getSymbolTarget(b);
+            function entryToImportOrExport(entry) {
+                var node = entry.node;
+                if (ts.isImportSpecifier(node.parent)
+                    || ts.isImportClause(node.parent)
+                    || ts.isImportEqualsDeclaration(node.parent)
+                    || ts.isNamespaceImport(node.parent)) {
+                    return node;
+                }
+                if (ts.isExportSpecifier(node.parent) || ts.isExportAssignment(node.parent)) {
+                    return node;
+                }
+                return undefined;
             }
             function entryToDeclaration(entry) {
                 if (ts.isDeclaration(entry.node.parent)) {
@@ -119824,37 +120993,31 @@ var ts;
                     var functionReference = entry.node;
                     var parent = functionReference.parent;
                     switch (parent.kind) {
-                        // Function call (foo(...) or super(...))
-                        case 191 /* CallExpression */:
-                            var callExpression = ts.tryCast(parent, ts.isCallExpression);
-                            if (callExpression && callExpression.expression === functionReference) {
-                                return callExpression;
-                            }
-                            break;
-                        // Constructor call (new Foo(...))
-                        case 192 /* NewExpression */:
-                            var newExpression = ts.tryCast(parent, ts.isNewExpression);
-                            if (newExpression && newExpression.expression === functionReference) {
-                                return newExpression;
+                        // foo(...) or super(...) or new Foo(...)
+                        case 192 /* CallExpression */:
+                        case 193 /* NewExpression */:
+                            var callOrNewExpression = ts.tryCast(parent, ts.isCallOrNewExpression);
+                            if (callOrNewExpression && callOrNewExpression.expression === functionReference) {
+                                return callOrNewExpression;
                             }
                             break;
-                        // Method call (x.foo(...))
-                        case 189 /* PropertyAccessExpression */:
+                        // x.foo(...)
+                        case 190 /* PropertyAccessExpression */:
                             var propertyAccessExpression = ts.tryCast(parent, ts.isPropertyAccessExpression);
                             if (propertyAccessExpression && propertyAccessExpression.parent && propertyAccessExpression.name === functionReference) {
-                                var callExpression_1 = ts.tryCast(propertyAccessExpression.parent, ts.isCallExpression);
-                                if (callExpression_1 && callExpression_1.expression === propertyAccessExpression) {
-                                    return callExpression_1;
+                                var callOrNewExpression_1 = ts.tryCast(propertyAccessExpression.parent, ts.isCallOrNewExpression);
+                                if (callOrNewExpression_1 && callOrNewExpression_1.expression === propertyAccessExpression) {
+                                    return callOrNewExpression_1;
                                 }
                             }
                             break;
-                        // Method call (x["foo"](...))
-                        case 190 /* ElementAccessExpression */:
+                        // x["foo"](...)
+                        case 191 /* ElementAccessExpression */:
                             var elementAccessExpression = ts.tryCast(parent, ts.isElementAccessExpression);
                             if (elementAccessExpression && elementAccessExpression.parent && elementAccessExpression.argumentExpression === functionReference) {
-                                var callExpression_2 = ts.tryCast(elementAccessExpression.parent, ts.isCallExpression);
-                                if (callExpression_2 && callExpression_2.expression === elementAccessExpression) {
-                                    return callExpression_2;
+                                var callOrNewExpression_2 = ts.tryCast(elementAccessExpression.parent, ts.isCallOrNewExpression);
+                                if (callOrNewExpression_2 && callOrNewExpression_2.expression === elementAccessExpression) {
+                                    return callOrNewExpression_2;
                                 }
                             }
                             break;
@@ -119868,14 +121031,14 @@ var ts;
                     var parent = reference.parent;
                     switch (parent.kind) {
                         // `C.foo`
-                        case 189 /* PropertyAccessExpression */:
+                        case 190 /* PropertyAccessExpression */:
                             var propertyAccessExpression = ts.tryCast(parent, ts.isPropertyAccessExpression);
                             if (propertyAccessExpression && propertyAccessExpression.expression === reference) {
                                 return propertyAccessExpression;
                             }
                             break;
                         // `C["foo"]`
-                        case 190 /* ElementAccessExpression */:
+                        case 191 /* ElementAccessExpression */:
                             var elementAccessExpression = ts.tryCast(parent, ts.isElementAccessExpression);
                             if (elementAccessExpression && elementAccessExpression.expression === reference) {
                                 return elementAccessExpression;
@@ -119894,7 +121057,7 @@ var ts;
             }
             function getFunctionDeclarationAtPosition(file, startPosition, checker) {
                 var node = ts.getTouchingToken(file, startPosition);
-                var functionDeclaration = ts.getContainingFunction(node);
+                var functionDeclaration = ts.getContainingFunctionDeclaration(node);
                 // don't offer refactor on top-level JSDoc
                 if (isTopLevelJSDoc(node))
                     return undefined;
@@ -119917,28 +121080,34 @@ var ts;
                 if (!isValidParameterNodeArray(functionDeclaration.parameters, checker))
                     return false;
                 switch (functionDeclaration.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 156 /* MethodDeclaration */:
-                        return !!functionDeclaration.name
-                            && !!functionDeclaration.body
-                            && !checker.isImplementationOfOverload(functionDeclaration);
-                    case 157 /* Constructor */:
+                    case 240 /* FunctionDeclaration */:
+                        return hasNameOrDefault(functionDeclaration) && isSingleImplementation(functionDeclaration, checker);
+                    case 157 /* MethodDeclaration */:
+                        return isSingleImplementation(functionDeclaration, checker);
+                    case 158 /* Constructor */:
                         if (ts.isClassDeclaration(functionDeclaration.parent)) {
-                            return !!functionDeclaration.body
-                                && !!functionDeclaration.parent.name
-                                && !checker.isImplementationOfOverload(functionDeclaration);
+                            return hasNameOrDefault(functionDeclaration.parent) && isSingleImplementation(functionDeclaration, checker);
                         }
                         else {
                             return isValidVariableDeclaration(functionDeclaration.parent.parent)
-                                && !!functionDeclaration.body
-                                && !checker.isImplementationOfOverload(functionDeclaration);
+                                && isSingleImplementation(functionDeclaration, checker);
                         }
-                    case 196 /* FunctionExpression */:
-                    case 197 /* ArrowFunction */:
+                    case 197 /* FunctionExpression */:
+                    case 198 /* ArrowFunction */:
                         return isValidVariableDeclaration(functionDeclaration.parent);
                 }
                 return false;
             }
+            function isSingleImplementation(functionDeclaration, checker) {
+                return !!functionDeclaration.body && !checker.isImplementationOfOverload(functionDeclaration);
+            }
+            function hasNameOrDefault(functionOrClassDeclaration) {
+                if (!functionOrClassDeclaration.name) {
+                    var defaultKeyword = ts.findModifier(functionOrClassDeclaration, 81 /* DefaultKeyword */);
+                    return !!defaultKeyword;
+                }
+                return true;
+            }
             function isValidParameterNodeArray(parameters, checker) {
                 return getRefactorableParametersLength(parameters) >= minimumParameterLength
                     && ts.every(parameters, /*callback*/ function (/*callback*/ paramDecl) { return isValidParameterDeclaration(paramDecl, checker); });
@@ -120095,10 +121264,15 @@ var ts;
             }
             function getClassNames(constructorDeclaration) {
                 switch (constructorDeclaration.parent.kind) {
-                    case 240 /* ClassDeclaration */:
+                    case 241 /* ClassDeclaration */:
                         var classDeclaration = constructorDeclaration.parent;
-                        return [classDeclaration.name];
-                    case 209 /* ClassExpression */:
+                        if (classDeclaration.name)
+                            return [classDeclaration.name];
+                        // If the class declaration doesn't have a name, it should have a default modifier.
+                        // We validated this in `isValidFunctionDeclaration` through `hasNameOrDefault`
+                        var defaultModifier = ts.Debug.assertDefined(ts.findModifier(classDeclaration, 81 /* DefaultKeyword */), "Nameless class declaration should be a default export");
+                        return [defaultModifier];
+                    case 210 /* ClassExpression */:
                         var classExpression = constructorDeclaration.parent;
                         var variableDeclaration = constructorDeclaration.parent.parent;
                         var className = classExpression.name;
@@ -120109,19 +121283,25 @@ var ts;
             }
             function getFunctionNames(functionDeclaration) {
                 switch (functionDeclaration.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 156 /* MethodDeclaration */:
+                    case 240 /* FunctionDeclaration */:
+                        if (functionDeclaration.name)
+                            return [functionDeclaration.name];
+                        // If the function declaration doesn't have a name, it should have a default modifier.
+                        // We validated this in `isValidFunctionDeclaration` through `hasNameOrDefault`
+                        var defaultModifier = ts.Debug.assertDefined(ts.findModifier(functionDeclaration, 81 /* DefaultKeyword */), "Nameless function declaration should be a default export");
+                        return [defaultModifier];
+                    case 157 /* MethodDeclaration */:
                         return [functionDeclaration.name];
-                    case 157 /* Constructor */:
-                        var ctrKeyword = ts.findChildOfKind(functionDeclaration, 124 /* ConstructorKeyword */, functionDeclaration.getSourceFile());
-                        if (functionDeclaration.parent.kind === 209 /* ClassExpression */) {
+                    case 158 /* Constructor */:
+                        var ctrKeyword = ts.Debug.assertDefined(ts.findChildOfKind(functionDeclaration, 125 /* ConstructorKeyword */, functionDeclaration.getSourceFile()), "Constructor declaration should have constructor keyword");
+                        if (functionDeclaration.parent.kind === 210 /* ClassExpression */) {
                             var variableDeclaration = functionDeclaration.parent.parent;
                             return [variableDeclaration.name, ctrKeyword];
                         }
                         return [ctrKeyword];
-                    case 197 /* ArrowFunction */:
+                    case 198 /* ArrowFunction */:
                         return [functionDeclaration.parent.name];
-                    case 196 /* FunctionExpression */:
+                    case 197 /* FunctionExpression */:
                         if (functionDeclaration.name)
                             return [functionDeclaration.name, functionDeclaration.parent.name];
                         return [functionDeclaration.parent.name];
@@ -120138,7 +121318,7 @@ var ts;
     ts.servicesVersion = "0.8";
     function createNode(kind, pos, end, parent) {
         var node = ts.isNodeKind(kind) ? new NodeObject(kind, pos, end) :
-            kind === 72 /* Identifier */ ? new IdentifierObject(72 /* Identifier */, pos, end) :
+            kind === 73 /* Identifier */ ? new IdentifierObject(73 /* Identifier */, pos, end) :
                 new TokenObject(kind, pos, end);
         node.parent = parent;
         node.flags = parent.flags & 12679168 /* ContextFlags */;
@@ -120212,8 +121392,8 @@ var ts;
             if (!children.length) {
                 return undefined;
             }
-            var child = ts.find(children, function (kid) { return kid.kind < 288 /* FirstJSDocNode */ || kid.kind > 310 /* LastJSDocNode */; });
-            return child.kind < 148 /* FirstNode */ ?
+            var child = ts.find(children, function (kid) { return kid.kind < 289 /* FirstJSDocNode */ || kid.kind > 311 /* LastJSDocNode */; });
+            return child.kind < 149 /* FirstNode */ ?
                 child :
                 child.getFirstToken(sourceFile);
         };
@@ -120224,7 +121404,7 @@ var ts;
             if (!child) {
                 return undefined;
             }
-            return child.kind < 148 /* FirstNode */ ? child : child.getLastToken(sourceFile);
+            return child.kind < 149 /* FirstNode */ ? child : child.getLastToken(sourceFile);
         };
         NodeObject.prototype.forEachChild = function (cbNode, cbNodeArray) {
             return ts.forEachChild(this, cbNode, cbNodeArray);
@@ -120270,8 +121450,8 @@ var ts;
             var token = ts.scanner.scan();
             var textPos = ts.scanner.getTextPos();
             if (textPos <= end) {
-                if (token === 72 /* Identifier */) {
-                    ts.Debug.fail("Did not expect " + ts.Debug.showSyntaxKind(parent) + " to have an Identifier in its trivia");
+                if (token === 73 /* Identifier */) {
+                    ts.Debug.fail("Did not expect " + ts.Debug.formatSyntaxKind(parent.kind) + " to have an Identifier in its trivia");
                 }
                 nodes.push(createNode(token, pos, textPos, parent));
             }
@@ -120282,7 +121462,7 @@ var ts;
         }
     }
     function createSyntaxList(nodes, parent) {
-        var list = createNode(311 /* SyntaxList */, nodes.pos, nodes.end, parent);
+        var list = createNode(312 /* SyntaxList */, nodes.pos, nodes.end, parent);
         list._children = [];
         var pos = nodes.pos;
         for (var _i = 0, nodes_1 = nodes; _i < nodes_1.length; _i++) {
@@ -120416,7 +121596,7 @@ var ts;
         });
         return IdentifierObject;
     }(TokenOrIdentifierObject));
-    IdentifierObject.prototype.kind = 72 /* Identifier */;
+    IdentifierObject.prototype.kind = 73 /* Identifier */;
     var TypeObject = /** @class */ (function () {
         function TypeObject(checker, flags) {
             this.checker = checker;
@@ -120617,10 +121797,10 @@ var ts;
             }
             function visit(node) {
                 switch (node.kind) {
-                    case 239 /* FunctionDeclaration */:
-                    case 196 /* FunctionExpression */:
-                    case 156 /* MethodDeclaration */:
-                    case 155 /* MethodSignature */:
+                    case 240 /* FunctionDeclaration */:
+                    case 197 /* FunctionExpression */:
+                    case 157 /* MethodDeclaration */:
+                    case 156 /* MethodSignature */:
                         var functionDeclaration = node;
                         var declarationName = getDeclarationName(functionDeclaration);
                         if (declarationName) {
@@ -120640,31 +121820,31 @@ var ts;
                         }
                         ts.forEachChild(node, visit);
                         break;
-                    case 240 /* ClassDeclaration */:
-                    case 209 /* ClassExpression */:
-                    case 241 /* InterfaceDeclaration */:
-                    case 242 /* TypeAliasDeclaration */:
-                    case 243 /* EnumDeclaration */:
-                    case 244 /* ModuleDeclaration */:
-                    case 248 /* ImportEqualsDeclaration */:
-                    case 257 /* ExportSpecifier */:
-                    case 253 /* ImportSpecifier */:
-                    case 250 /* ImportClause */:
-                    case 251 /* NamespaceImport */:
-                    case 158 /* GetAccessor */:
-                    case 159 /* SetAccessor */:
-                    case 168 /* TypeLiteral */:
+                    case 241 /* ClassDeclaration */:
+                    case 210 /* ClassExpression */:
+                    case 242 /* InterfaceDeclaration */:
+                    case 243 /* TypeAliasDeclaration */:
+                    case 244 /* EnumDeclaration */:
+                    case 245 /* ModuleDeclaration */:
+                    case 249 /* ImportEqualsDeclaration */:
+                    case 258 /* ExportSpecifier */:
+                    case 254 /* ImportSpecifier */:
+                    case 251 /* ImportClause */:
+                    case 252 /* NamespaceImport */:
+                    case 159 /* GetAccessor */:
+                    case 160 /* SetAccessor */:
+                    case 169 /* TypeLiteral */:
                         addDeclaration(node);
                         ts.forEachChild(node, visit);
                         break;
-                    case 151 /* Parameter */:
+                    case 152 /* Parameter */:
                         // Only consider parameter properties
                         if (!ts.hasModifier(node, 92 /* ParameterPropertyModifier */)) {
                             break;
                         }
                     // falls through
-                    case 237 /* VariableDeclaration */:
-                    case 186 /* BindingElement */: {
+                    case 238 /* VariableDeclaration */:
+                    case 187 /* BindingElement */: {
                         var decl = node;
                         if (ts.isBindingPattern(decl.name)) {
                             ts.forEachChild(decl.name, visit);
@@ -120675,19 +121855,19 @@ var ts;
                         }
                     }
                     // falls through
-                    case 278 /* EnumMember */:
-                    case 154 /* PropertyDeclaration */:
-                    case 153 /* PropertySignature */:
+                    case 279 /* EnumMember */:
+                    case 155 /* PropertyDeclaration */:
+                    case 154 /* PropertySignature */:
                         addDeclaration(node);
                         break;
-                    case 255 /* ExportDeclaration */:
+                    case 256 /* ExportDeclaration */:
                         // Handle named exports case e.g.:
                         //    export {a, b as B} from "mod";
                         if (node.exportClause) {
                             ts.forEach(node.exportClause.elements, visit);
                         }
                         break;
-                    case 249 /* ImportDeclaration */:
+                    case 250 /* ImportDeclaration */:
                         var importClause = node.importClause;
                         if (importClause) {
                             // Handle default import case e.g.:
@@ -120699,7 +121879,7 @@ var ts;
                             //    import * as NS from "mod";
                             //    import {a, b as B} from "mod";
                             if (importClause.namedBindings) {
-                                if (importClause.namedBindings.kind === 251 /* NamespaceImport */) {
+                                if (importClause.namedBindings.kind === 252 /* NamespaceImport */) {
                                     addDeclaration(importClause.namedBindings);
                                 }
                                 else {
@@ -120708,7 +121888,7 @@ var ts;
                             }
                         }
                         break;
-                    case 204 /* BinaryExpression */:
+                    case 205 /* BinaryExpression */:
                         if (ts.getAssignmentDeclarationKind(node) !== 0 /* None */) {
                             addDeclaration(node);
                         }
@@ -120877,7 +122057,7 @@ var ts;
             var sourceFile;
             if (this.currentFileName !== fileName) {
                 // This is a new file, just parse it
-                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 7 /* Latest */, version, /*setNodeParents*/ true, scriptKind);
+                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 8 /* Latest */, version, /*setNodeParents*/ true, scriptKind);
             }
             else if (this.currentFileVersion !== version) {
                 // This is the same file, just a newer version. Incrementally parse the file.
@@ -121281,41 +122461,48 @@ var ts;
                 return undefined;
             }
             var typeChecker = program.getTypeChecker();
-            var symbol = getSymbolAtLocationForQuickInfo(node, typeChecker);
+            var nodeForQuickInfo = getNodeForQuickInfo(node);
+            var symbol = getSymbolAtLocationForQuickInfo(nodeForQuickInfo, typeChecker);
             if (!symbol || typeChecker.isUnknownSymbol(symbol)) {
-                var type_2 = shouldGetType(sourceFile, node, position) ? typeChecker.getTypeAtLocation(node) : undefined;
+                var type_2 = shouldGetType(sourceFile, nodeForQuickInfo, position) ? typeChecker.getTypeAtLocation(nodeForQuickInfo) : undefined;
                 return type_2 && {
                     kind: "" /* unknown */,
                     kindModifiers: "" /* none */,
-                    textSpan: ts.createTextSpanFromNode(node, sourceFile),
-                    displayParts: typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) { return ts.typeToDisplayParts(typeChecker, type_2, ts.getContainerNode(node)); }),
+                    textSpan: ts.createTextSpanFromNode(nodeForQuickInfo, sourceFile),
+                    displayParts: typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) { return ts.typeToDisplayParts(typeChecker, type_2, ts.getContainerNode(nodeForQuickInfo)); }),
                     documentation: type_2.symbol ? type_2.symbol.getDocumentationComment(typeChecker) : undefined,
                     tags: type_2.symbol ? type_2.symbol.getJsDocTags() : undefined
                 };
             }
             var _a = typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) {
-                return ts.SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, sourceFile, ts.getContainerNode(node), node);
+                return ts.SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, sourceFile, ts.getContainerNode(nodeForQuickInfo), nodeForQuickInfo);
             }), symbolKind = _a.symbolKind, displayParts = _a.displayParts, documentation = _a.documentation, tags = _a.tags;
             return {
                 kind: symbolKind,
                 kindModifiers: ts.SymbolDisplay.getSymbolModifiers(symbol),
-                textSpan: ts.createTextSpanFromNode(node, sourceFile),
+                textSpan: ts.createTextSpanFromNode(nodeForQuickInfo, sourceFile),
                 displayParts: displayParts,
                 documentation: documentation,
                 tags: tags,
             };
         }
+        function getNodeForQuickInfo(node) {
+            if (ts.isNewExpression(node.parent) && node.pos === node.parent.pos) {
+                return node.parent.expression;
+            }
+            return node;
+        }
         function shouldGetType(sourceFile, node, position) {
             switch (node.kind) {
-                case 72 /* Identifier */:
+                case 73 /* Identifier */:
                     return !ts.isLabelName(node) && !ts.isTagName(node);
-                case 189 /* PropertyAccessExpression */:
-                case 148 /* QualifiedName */:
+                case 190 /* PropertyAccessExpression */:
+                case 149 /* QualifiedName */:
                     // Don't return quickInfo if inside the comment in `a/**/.b`
                     return !ts.isInComment(sourceFile, position);
-                case 100 /* ThisKeyword */:
-                case 178 /* ThisType */:
-                case 98 /* SuperKeyword */:
+                case 101 /* ThisKeyword */:
+                case 179 /* ThisType */:
+                case 99 /* SuperKeyword */:
                     return true;
                 default:
                     return false;
@@ -121422,16 +122609,16 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 189 /* PropertyAccessExpression */:
-                case 148 /* QualifiedName */:
+                case 190 /* PropertyAccessExpression */:
+                case 149 /* QualifiedName */:
                 case 10 /* StringLiteral */:
-                case 87 /* FalseKeyword */:
-                case 102 /* TrueKeyword */:
-                case 96 /* NullKeyword */:
-                case 98 /* SuperKeyword */:
-                case 100 /* ThisKeyword */:
-                case 178 /* ThisType */:
-                case 72 /* Identifier */:
+                case 88 /* FalseKeyword */:
+                case 103 /* TrueKeyword */:
+                case 97 /* NullKeyword */:
+                case 99 /* SuperKeyword */:
+                case 101 /* ThisKeyword */:
+                case 179 /* ThisType */:
+                case 73 /* Identifier */:
                     break;
                 // Cant create the text span
                 default:
@@ -121447,7 +122634,7 @@ var ts;
                     // If this is name of a module declarations, check if this is right side of dotted module name
                     // If parent of the module declaration which is parent of this node is module declaration and its body is the module declaration that this node is name of
                     // Then this name is name from dotted module
-                    if (nodeForStartPos.parent.parent.kind === 244 /* ModuleDeclaration */ &&
+                    if (nodeForStartPos.parent.parent.kind === 245 /* ModuleDeclaration */ &&
                         nodeForStartPos.parent.parent.body === nodeForStartPos.parent) {
                         // Use parent module declarations name for start pos
                         nodeForStartPos = nodeForStartPos.parent.parent.name;
@@ -121590,30 +122777,14 @@ var ts;
         }
         function applyCodeActionCommand(fileName, actionOrFormatSettingsOrUndefined) {
             var action = typeof fileName === "string" ? actionOrFormatSettingsOrUndefined : fileName;
-            var formatSettings = typeof fileName !== "string" ? actionOrFormatSettingsOrUndefined : undefined;
-            return ts.isArray(action) ? Promise.all(action.map(function (a) { return applySingleCodeActionCommand(a, formatSettings); })) : applySingleCodeActionCommand(action, formatSettings);
+            return ts.isArray(action) ? Promise.all(action.map(function (a) { return applySingleCodeActionCommand(a); })) : applySingleCodeActionCommand(action);
         }
-        function applySingleCodeActionCommand(action, formatSettings) {
+        function applySingleCodeActionCommand(action) {
             var getPath = function (path) { return ts.toPath(path, currentDirectory, getCanonicalFileName); };
-            switch (action.type) {
-                case "install package":
-                    return host.installPackage
-                        ? host.installPackage({ fileName: getPath(action.file), packageName: action.packageName })
-                        : Promise.reject("Host does not implement `installPackage`");
-                case "generate types": {
-                    var fileToGenerateTypesFor = action.fileToGenerateTypesFor, outputFileName_1 = action.outputFileName;
-                    if (!host.inspectValue)
-                        return Promise.reject("Host does not implement `installPackage`");
-                    var valueInfoPromise = host.inspectValue({ fileNameToRequire: fileToGenerateTypesFor });
-                    return valueInfoPromise.then(function (valueInfo) {
-                        var fullOut = getPath(outputFileName_1);
-                        host.writeFile(fullOut, ts.valueInfoToDeclarationFileText(valueInfo, formatSettings || ts.testFormatSettings)); // TODO: GH#18217
-                        return { successMessage: "Wrote types to '" + fullOut + "'" };
-                    });
-                }
-                default:
-                    return ts.Debug.assertNever(action);
-            }
+            ts.Debug.assertEqual(action.type, "install package");
+            return host.installPackage
+                ? host.installPackage({ fileName: getPath(action.file), packageName: action.packageName })
+                : Promise.reject("Host does not implement `installPackage`");
         }
         function getDocCommentTemplateAtPosition(fileName, position) {
             return ts.JsDoc.getDocCommentTemplateAtPosition(ts.getNewLineOrDefaultFromHost(host), syntaxTreeCache.getCurrentSourceFile(fileName), position);
@@ -121809,6 +122980,9 @@ var ts;
                 preferences: preferences,
             };
         }
+        function getSmartSelectionRange(fileName, position) {
+            return ts.SmartSelectionRange.getSmartSelectionRange(position, syntaxTreeCache.getCurrentSourceFile(fileName));
+        }
         function getApplicableRefactors(fileName, positionOrRange, preferences) {
             if (preferences === void 0) { preferences = ts.emptyOptions; }
             synchronizeHostData();
@@ -121849,6 +123023,7 @@ var ts;
             getBreakpointStatementAtPosition: getBreakpointStatementAtPosition,
             getNavigateToItems: getNavigateToItems,
             getRenameInfo: getRenameInfo,
+            getSmartSelectionRange: getSmartSelectionRange,
             findRenameLocations: findRenameLocations,
             getNavigationBarItems: getNavigationBarItems,
             getNavigationTree: getNavigationTree,
@@ -121911,7 +123086,7 @@ var ts;
      */
     function literalIsName(node) {
         return ts.isDeclarationName(node) ||
-            node.parent.kind === 259 /* ExternalModuleReference */ ||
+            node.parent.kind === 260 /* ExternalModuleReference */ ||
             isArgumentOfElementAccessExpression(node) ||
             ts.isLiteralComputedPropertyDeclarationName(node);
     }
@@ -121928,13 +123103,13 @@ var ts;
         switch (node.kind) {
             case 10 /* StringLiteral */:
             case 8 /* NumericLiteral */:
-                if (node.parent.kind === 149 /* ComputedPropertyName */) {
+                if (node.parent.kind === 150 /* ComputedPropertyName */) {
                     return ts.isObjectLiteralElement(node.parent.parent) ? node.parent.parent : undefined;
                 }
             // falls through
-            case 72 /* Identifier */:
+            case 73 /* Identifier */:
                 return ts.isObjectLiteralElement(node.parent) &&
-                    (node.parent.parent.kind === 188 /* ObjectLiteralExpression */ || node.parent.parent.kind === 268 /* JsxAttributes */) &&
+                    (node.parent.parent.kind === 189 /* ObjectLiteralExpression */ || node.parent.parent.kind === 269 /* JsxAttributes */) &&
                     node.parent.name === node ? node.parent : undefined;
         }
         return undefined;
@@ -121976,7 +123151,7 @@ var ts;
     function isArgumentOfElementAccessExpression(node) {
         return node &&
             node.parent &&
-            node.parent.kind === 190 /* ElementAccessExpression */ &&
+            node.parent.kind === 191 /* ElementAccessExpression */ &&
             node.parent.argumentExpression === node;
     }
     /**
@@ -122056,114 +123231,114 @@ var ts;
                 if (node) {
                     var parent = node.parent;
                     switch (node.kind) {
-                        case 219 /* VariableStatement */:
+                        case 220 /* VariableStatement */:
                             // Span on first variable declaration
                             return spanInVariableDeclaration(node.declarationList.declarations[0]);
-                        case 237 /* VariableDeclaration */:
-                        case 154 /* PropertyDeclaration */:
-                        case 153 /* PropertySignature */:
+                        case 238 /* VariableDeclaration */:
+                        case 155 /* PropertyDeclaration */:
+                        case 154 /* PropertySignature */:
                             return spanInVariableDeclaration(node);
-                        case 151 /* Parameter */:
+                        case 152 /* Parameter */:
                             return spanInParameterDeclaration(node);
-                        case 239 /* FunctionDeclaration */:
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
-                        case 157 /* Constructor */:
-                        case 196 /* FunctionExpression */:
-                        case 197 /* ArrowFunction */:
+                        case 240 /* FunctionDeclaration */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
+                        case 158 /* Constructor */:
+                        case 197 /* FunctionExpression */:
+                        case 198 /* ArrowFunction */:
                             return spanInFunctionDeclaration(node);
-                        case 218 /* Block */:
+                        case 219 /* Block */:
                             if (ts.isFunctionBlock(node)) {
                                 return spanInFunctionBlock(node);
                             }
                         // falls through
-                        case 245 /* ModuleBlock */:
+                        case 246 /* ModuleBlock */:
                             return spanInBlock(node);
-                        case 274 /* CatchClause */:
+                        case 275 /* CatchClause */:
                             return spanInBlock(node.block);
-                        case 221 /* ExpressionStatement */:
+                        case 222 /* ExpressionStatement */:
                             // span on the expression
                             return textSpan(node.expression);
-                        case 230 /* ReturnStatement */:
+                        case 231 /* ReturnStatement */:
                             // span on return keyword and expression if present
                             return textSpan(node.getChildAt(0), node.expression);
-                        case 224 /* WhileStatement */:
+                        case 225 /* WhileStatement */:
                             // Span on while(...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 223 /* DoStatement */:
+                        case 224 /* DoStatement */:
                             // span in statement of the do statement
                             return spanInNode(node.statement);
-                        case 236 /* DebuggerStatement */:
+                        case 237 /* DebuggerStatement */:
                             // span on debugger keyword
                             return textSpan(node.getChildAt(0));
-                        case 222 /* IfStatement */:
+                        case 223 /* IfStatement */:
                             // set on if(..) span
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 233 /* LabeledStatement */:
+                        case 234 /* LabeledStatement */:
                             // span in statement
                             return spanInNode(node.statement);
-                        case 229 /* BreakStatement */:
-                        case 228 /* ContinueStatement */:
+                        case 230 /* BreakStatement */:
+                        case 229 /* ContinueStatement */:
                             // On break or continue keyword and label if present
                             return textSpan(node.getChildAt(0), node.label);
-                        case 225 /* ForStatement */:
+                        case 226 /* ForStatement */:
                             return spanInForStatement(node);
-                        case 226 /* ForInStatement */:
+                        case 227 /* ForInStatement */:
                             // span of for (a in ...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 227 /* ForOfStatement */:
+                        case 228 /* ForOfStatement */:
                             // span in initializer
                             return spanInInitializerOfForLike(node);
-                        case 232 /* SwitchStatement */:
+                        case 233 /* SwitchStatement */:
                             // span on switch(...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 271 /* CaseClause */:
-                        case 272 /* DefaultClause */:
+                        case 272 /* CaseClause */:
+                        case 273 /* DefaultClause */:
                             // span in first statement of the clause
                             return spanInNode(node.statements[0]);
-                        case 235 /* TryStatement */:
+                        case 236 /* TryStatement */:
                             // span in try block
                             return spanInBlock(node.tryBlock);
-                        case 234 /* ThrowStatement */:
+                        case 235 /* ThrowStatement */:
                             // span in throw ...
                             return textSpan(node, node.expression);
-                        case 254 /* ExportAssignment */:
+                        case 255 /* ExportAssignment */:
                             // span on export = id
                             return textSpan(node, node.expression);
-                        case 248 /* ImportEqualsDeclaration */:
+                        case 249 /* ImportEqualsDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleReference);
-                        case 249 /* ImportDeclaration */:
+                        case 250 /* ImportDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleSpecifier);
-                        case 255 /* ExportDeclaration */:
+                        case 256 /* ExportDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleSpecifier);
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             // span on complete module if it is instantiated
                             if (ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
                         // falls through
-                        case 240 /* ClassDeclaration */:
-                        case 243 /* EnumDeclaration */:
-                        case 278 /* EnumMember */:
-                        case 186 /* BindingElement */:
+                        case 241 /* ClassDeclaration */:
+                        case 244 /* EnumDeclaration */:
+                        case 279 /* EnumMember */:
+                        case 187 /* BindingElement */:
                             // span on complete node
                             return textSpan(node);
-                        case 231 /* WithStatement */:
+                        case 232 /* WithStatement */:
                             // span in statement
                             return spanInNode(node.statement);
-                        case 152 /* Decorator */:
+                        case 153 /* Decorator */:
                             return spanInNodeArray(parent.decorators);
-                        case 184 /* ObjectBindingPattern */:
-                        case 185 /* ArrayBindingPattern */:
+                        case 185 /* ObjectBindingPattern */:
+                        case 186 /* ArrayBindingPattern */:
                             return spanInBindingPattern(node);
                         // No breakpoint in interface, type alias
-                        case 241 /* InterfaceDeclaration */:
-                        case 242 /* TypeAliasDeclaration */:
+                        case 242 /* InterfaceDeclaration */:
+                        case 243 /* TypeAliasDeclaration */:
                             return undefined;
                         // Tokens:
                         case 26 /* SemicolonToken */:
@@ -122187,13 +123362,13 @@ var ts;
                         case 28 /* LessThanToken */:
                             return spanInGreaterThanOrLessThanToken(node);
                         // Keywords:
-                        case 107 /* WhileKeyword */:
+                        case 108 /* WhileKeyword */:
                             return spanInWhileKeyword(node);
-                        case 83 /* ElseKeyword */:
-                        case 75 /* CatchKeyword */:
-                        case 88 /* FinallyKeyword */:
+                        case 84 /* ElseKeyword */:
+                        case 76 /* CatchKeyword */:
+                        case 89 /* FinallyKeyword */:
                             return spanInNextNode(node);
-                        case 147 /* OfKeyword */:
+                        case 148 /* OfKeyword */:
                             return spanInOfKeyword(node);
                         default:
                             // Destructuring pattern in destructuring assignment
@@ -122205,14 +123380,14 @@ var ts;
                             // Set breakpoint on identifier element of destructuring pattern
                             // `a` or `...c` or `d: x` from
                             // `[a, b, ...c]` or `{ a, b }` or `{ d: x }` from destructuring pattern
-                            if ((node.kind === 72 /* Identifier */ ||
-                                node.kind === 208 /* SpreadElement */ ||
-                                node.kind === 275 /* PropertyAssignment */ ||
-                                node.kind === 276 /* ShorthandPropertyAssignment */) &&
+                            if ((node.kind === 73 /* Identifier */ ||
+                                node.kind === 209 /* SpreadElement */ ||
+                                node.kind === 276 /* PropertyAssignment */ ||
+                                node.kind === 277 /* ShorthandPropertyAssignment */) &&
                                 ts.isArrayLiteralOrObjectLiteralDestructuringPattern(parent)) {
                                 return textSpan(node);
                             }
-                            if (node.kind === 204 /* BinaryExpression */) {
+                            if (node.kind === 205 /* BinaryExpression */) {
                                 var _a = node, left = _a.left, operatorToken = _a.operatorToken;
                                 // Set breakpoint in destructuring pattern if its destructuring assignment
                                 // [a, b, c] or {a, b, c} of
@@ -122221,7 +123396,7 @@ var ts;
                                 if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(left)) {
                                     return spanInArrayLiteralOrObjectLiteralDestructuringPattern(left);
                                 }
-                                if (operatorToken.kind === 59 /* EqualsToken */ && ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
+                                if (operatorToken.kind === 60 /* EqualsToken */ && ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
                                     // Set breakpoint on assignment expression element of destructuring pattern
                                     // a = expression of
                                     // [a = expression, b, c] = someExpression or
@@ -122234,22 +123409,22 @@ var ts;
                             }
                             if (ts.isExpressionNode(node)) {
                                 switch (parent.kind) {
-                                    case 223 /* DoStatement */:
+                                    case 224 /* DoStatement */:
                                         // Set span as if on while keyword
                                         return spanInPreviousNode(node);
-                                    case 152 /* Decorator */:
+                                    case 153 /* Decorator */:
                                         // Set breakpoint on the decorator emit
                                         return spanInNode(node.parent);
-                                    case 225 /* ForStatement */:
-                                    case 227 /* ForOfStatement */:
+                                    case 226 /* ForStatement */:
+                                    case 228 /* ForOfStatement */:
                                         return textSpan(node);
-                                    case 204 /* BinaryExpression */:
+                                    case 205 /* BinaryExpression */:
                                         if (node.parent.operatorToken.kind === 27 /* CommaToken */) {
                                             // If this is a comma expression, the breakpoint is possible in this expression
                                             return textSpan(node);
                                         }
                                         break;
-                                    case 197 /* ArrowFunction */:
+                                    case 198 /* ArrowFunction */:
                                         if (node.parent.body === node) {
                                             // If this is body of arrow function, it is allowed to have the breakpoint
                                             return textSpan(node);
@@ -122258,21 +123433,21 @@ var ts;
                                 }
                             }
                             switch (node.parent.kind) {
-                                case 275 /* PropertyAssignment */:
+                                case 276 /* PropertyAssignment */:
                                     // If this is name of property assignment, set breakpoint in the initializer
                                     if (node.parent.name === node &&
                                         !ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.parent)) {
                                         return spanInNode(node.parent.initializer);
                                     }
                                     break;
-                                case 194 /* TypeAssertionExpression */:
+                                case 195 /* TypeAssertionExpression */:
                                     // Breakpoint in type assertion goes to its operand
                                     if (node.parent.type === node) {
                                         return spanInNextNode(node.parent.type);
                                     }
                                     break;
-                                case 237 /* VariableDeclaration */:
-                                case 151 /* Parameter */: {
+                                case 238 /* VariableDeclaration */:
+                                case 152 /* Parameter */: {
                                     // initializer of variable/parameter declaration go to previous node
                                     var _b = node.parent, initializer = _b.initializer, type = _b.type;
                                     if (initializer === node || type === node || ts.isAssignmentOperator(node.kind)) {
@@ -122280,7 +123455,7 @@ var ts;
                                     }
                                     break;
                                 }
-                                case 204 /* BinaryExpression */: {
+                                case 205 /* BinaryExpression */: {
                                     var left = node.parent.left;
                                     if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(left) && node !== left) {
                                         // If initializer of destructuring assignment move to previous token
@@ -122310,7 +123485,7 @@ var ts;
                 }
                 function spanInVariableDeclaration(variableDeclaration) {
                     // If declaration of for in statement, just set the span in parent
-                    if (variableDeclaration.parent.parent.kind === 226 /* ForInStatement */) {
+                    if (variableDeclaration.parent.parent.kind === 227 /* ForInStatement */) {
                         return spanInNode(variableDeclaration.parent.parent);
                     }
                     var parent = variableDeclaration.parent;
@@ -122322,7 +123497,7 @@ var ts;
                     // or its declaration from 'for of'
                     if (variableDeclaration.initializer ||
                         ts.hasModifier(variableDeclaration, 1 /* Export */) ||
-                        parent.parent.kind === 227 /* ForOfStatement */) {
+                        parent.parent.kind === 228 /* ForOfStatement */) {
                         return textSpanFromVariableDeclaration(variableDeclaration);
                     }
                     if (ts.isVariableDeclarationList(variableDeclaration.parent) &&
@@ -122363,7 +123538,7 @@ var ts;
                 }
                 function canFunctionHaveSpanInWholeDeclaration(functionDeclaration) {
                     return ts.hasModifier(functionDeclaration, 1 /* Export */) ||
-                        (functionDeclaration.parent.kind === 240 /* ClassDeclaration */ && functionDeclaration.kind !== 157 /* Constructor */);
+                        (functionDeclaration.parent.kind === 241 /* ClassDeclaration */ && functionDeclaration.kind !== 158 /* Constructor */);
                 }
                 function spanInFunctionDeclaration(functionDeclaration) {
                     // No breakpoints in the function signature
@@ -122386,26 +123561,26 @@ var ts;
                 }
                 function spanInBlock(block) {
                     switch (block.parent.kind) {
-                        case 244 /* ModuleDeclaration */:
+                        case 245 /* ModuleDeclaration */:
                             if (ts.getModuleInstanceState(block.parent) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
                         // falls through
                         // Set on parent if on same line otherwise on first statement
-                        case 224 /* WhileStatement */:
-                        case 222 /* IfStatement */:
-                        case 226 /* ForInStatement */:
+                        case 225 /* WhileStatement */:
+                        case 223 /* IfStatement */:
+                        case 227 /* ForInStatement */:
                             return spanInNodeIfStartsOnSameLine(block.parent, block.statements[0]);
                         // Set span on previous token if it starts on same line otherwise on the first statement of the block
-                        case 225 /* ForStatement */:
-                        case 227 /* ForOfStatement */:
+                        case 226 /* ForStatement */:
+                        case 228 /* ForOfStatement */:
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(block.pos, sourceFile, block.parent), block.statements[0]);
                     }
                     // Default action is to set on first statement
                     return spanInNode(block.statements[0]);
                 }
                 function spanInInitializerOfForLike(forLikeStatement) {
-                    if (forLikeStatement.initializer.kind === 238 /* VariableDeclarationList */) {
+                    if (forLikeStatement.initializer.kind === 239 /* VariableDeclarationList */) {
                         // Declaration list - set breakpoint in first declaration
                         var variableDeclarationList = forLikeStatement.initializer;
                         if (variableDeclarationList.declarations.length > 0) {
@@ -122430,21 +123605,21 @@ var ts;
                 }
                 function spanInBindingPattern(bindingPattern) {
                     // Set breakpoint in first binding element
-                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 210 /* OmittedExpression */ ? element : undefined; });
+                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 211 /* OmittedExpression */ ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
                     // Empty binding pattern of binding element, set breakpoint on binding element
-                    if (bindingPattern.parent.kind === 186 /* BindingElement */) {
+                    if (bindingPattern.parent.kind === 187 /* BindingElement */) {
                         return textSpan(bindingPattern.parent);
                     }
                     // Variable declaration is used as the span
                     return textSpanFromVariableDeclaration(bindingPattern.parent);
                 }
                 function spanInArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-                    ts.Debug.assert(node.kind !== 185 /* ArrayBindingPattern */ && node.kind !== 184 /* ObjectBindingPattern */);
-                    var elements = node.kind === 187 /* ArrayLiteralExpression */ ? node.elements : node.properties;
-                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 210 /* OmittedExpression */ ? element : undefined; });
+                    ts.Debug.assert(node.kind !== 186 /* ArrayBindingPattern */ && node.kind !== 185 /* ObjectBindingPattern */);
+                    var elements = node.kind === 188 /* ArrayLiteralExpression */ ? node.elements : node.properties;
+                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 211 /* OmittedExpression */ ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
@@ -122452,18 +123627,18 @@ var ts;
                     // just nested element in another destructuring assignment
                     // set breakpoint on assignment when parent is destructuring assignment
                     // Otherwise set breakpoint for this element
-                    return textSpan(node.parent.kind === 204 /* BinaryExpression */ ? node.parent : node);
+                    return textSpan(node.parent.kind === 205 /* BinaryExpression */ ? node.parent : node);
                 }
                 // Tokens:
                 function spanInOpenBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 243 /* EnumDeclaration */:
+                        case 244 /* EnumDeclaration */:
                             var enumDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), enumDeclaration.members.length ? enumDeclaration.members[0] : enumDeclaration.getLastToken(sourceFile));
-                        case 240 /* ClassDeclaration */:
+                        case 241 /* ClassDeclaration */:
                             var classDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), classDeclaration.members.length ? classDeclaration.members[0] : classDeclaration.getLastToken(sourceFile));
-                        case 246 /* CaseBlock */:
+                        case 247 /* CaseBlock */:
                             return spanInNodeIfStartsOnSameLine(node.parent.parent, node.parent.clauses[0]);
                     }
                     // Default to parent node
@@ -122471,25 +123646,25 @@ var ts;
                 }
                 function spanInCloseBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 245 /* ModuleBlock */:
+                        case 246 /* ModuleBlock */:
                             // If this is not an instantiated module block, no bp span
                             if (ts.getModuleInstanceState(node.parent.parent) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
                         // falls through
-                        case 243 /* EnumDeclaration */:
-                        case 240 /* ClassDeclaration */:
+                        case 244 /* EnumDeclaration */:
+                        case 241 /* ClassDeclaration */:
                             // Span on close brace token
                             return textSpan(node);
-                        case 218 /* Block */:
+                        case 219 /* Block */:
                             if (ts.isFunctionBlock(node.parent)) {
                                 // Span on close brace token
                                 return textSpan(node);
                             }
                         // falls through
-                        case 274 /* CatchClause */:
+                        case 275 /* CatchClause */:
                             return spanInNode(ts.lastOrUndefined(node.parent.statements));
-                        case 246 /* CaseBlock */:
+                        case 247 /* CaseBlock */:
                             // breakpoint in last statement of the last clause
                             var caseBlock = node.parent;
                             var lastClause = ts.lastOrUndefined(caseBlock.clauses);
@@ -122497,7 +123672,7 @@ var ts;
                                 return spanInNode(ts.lastOrUndefined(lastClause.statements));
                             }
                             return undefined;
-                        case 184 /* ObjectBindingPattern */:
+                        case 185 /* ObjectBindingPattern */:
                             // Breakpoint in last binding element or binding pattern if it contains no elements
                             var bindingPattern = node.parent;
                             return spanInNode(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern);
@@ -122513,7 +123688,7 @@ var ts;
                 }
                 function spanInCloseBracketToken(node) {
                     switch (node.parent.kind) {
-                        case 185 /* ArrayBindingPattern */:
+                        case 186 /* ArrayBindingPattern */:
                             // Breakpoint in last binding element or binding pattern if it contains no elements
                             var bindingPattern = node.parent;
                             return textSpan(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern);
@@ -122528,12 +123703,12 @@ var ts;
                     }
                 }
                 function spanInOpenParenToken(node) {
-                    if (node.parent.kind === 223 /* DoStatement */ || // Go to while keyword and do action instead
-                        node.parent.kind === 191 /* CallExpression */ ||
-                        node.parent.kind === 192 /* NewExpression */) {
+                    if (node.parent.kind === 224 /* DoStatement */ || // Go to while keyword and do action instead
+                        node.parent.kind === 192 /* CallExpression */ ||
+                        node.parent.kind === 193 /* NewExpression */) {
                         return spanInPreviousNode(node);
                     }
-                    if (node.parent.kind === 195 /* ParenthesizedExpression */) {
+                    if (node.parent.kind === 196 /* ParenthesizedExpression */) {
                         return spanInNextNode(node);
                     }
                     // Default to parent node
@@ -122542,21 +123717,21 @@ var ts;
                 function spanInCloseParenToken(node) {
                     // Is this close paren token of parameter list, set span in previous token
                     switch (node.parent.kind) {
-                        case 196 /* FunctionExpression */:
-                        case 239 /* FunctionDeclaration */:
-                        case 197 /* ArrowFunction */:
-                        case 156 /* MethodDeclaration */:
-                        case 155 /* MethodSignature */:
-                        case 158 /* GetAccessor */:
-                        case 159 /* SetAccessor */:
-                        case 157 /* Constructor */:
-                        case 224 /* WhileStatement */:
-                        case 223 /* DoStatement */:
-                        case 225 /* ForStatement */:
-                        case 227 /* ForOfStatement */:
-                        case 191 /* CallExpression */:
-                        case 192 /* NewExpression */:
-                        case 195 /* ParenthesizedExpression */:
+                        case 197 /* FunctionExpression */:
+                        case 240 /* FunctionDeclaration */:
+                        case 198 /* ArrowFunction */:
+                        case 157 /* MethodDeclaration */:
+                        case 156 /* MethodSignature */:
+                        case 159 /* GetAccessor */:
+                        case 160 /* SetAccessor */:
+                        case 158 /* Constructor */:
+                        case 225 /* WhileStatement */:
+                        case 224 /* DoStatement */:
+                        case 226 /* ForStatement */:
+                        case 228 /* ForOfStatement */:
+                        case 192 /* CallExpression */:
+                        case 193 /* NewExpression */:
+                        case 196 /* ParenthesizedExpression */:
                             return spanInPreviousNode(node);
                         // Default to parent node
                         default:
@@ -122566,20 +123741,20 @@ var ts;
                 function spanInColonToken(node) {
                     // Is this : specifying return annotation of the function declaration
                     if (ts.isFunctionLike(node.parent) ||
-                        node.parent.kind === 275 /* PropertyAssignment */ ||
-                        node.parent.kind === 151 /* Parameter */) {
+                        node.parent.kind === 276 /* PropertyAssignment */ ||
+                        node.parent.kind === 152 /* Parameter */) {
                         return spanInPreviousNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInGreaterThanOrLessThanToken(node) {
-                    if (node.parent.kind === 194 /* TypeAssertionExpression */) {
+                    if (node.parent.kind === 195 /* TypeAssertionExpression */) {
                         return spanInNextNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInWhileKeyword(node) {
-                    if (node.parent.kind === 223 /* DoStatement */) {
+                    if (node.parent.kind === 224 /* DoStatement */) {
                         // Set span on while expression
                         return textSpanEndingAtNextToken(node, node.parent.expression);
                     }
@@ -122587,7 +123762,7 @@ var ts;
                     return spanInNode(node.parent);
                 }
                 function spanInOfKeyword(node) {
-                    if (node.parent.kind === 227 /* ForOfStatement */) {
+                    if (node.parent.kind === 228 /* ForOfStatement */) {
                         // Set using next token
                         return spanInNextNode(node);
                     }
@@ -123056,6 +124231,10 @@ var ts;
             var _this = this;
             return this.forwardJSONCall("getRenameInfo('" + fileName + "', " + position + ")", function () { return _this.languageService.getRenameInfo(fileName, position, options); });
         };
+        LanguageServiceShimObject.prototype.getSmartSelectionRange = function (fileName, position) {
+            var _this = this;
+            return this.forwardJSONCall("getSmartSelectionRange('" + fileName + "', " + position + ")", function () { return _this.languageService.getSmartSelectionRange(fileName, position); });
+        };
         LanguageServiceShimObject.prototype.findRenameLocations = function (fileName, position, findInStrings, findInComments, providePrefixAndSuffixTextForRename) {
             var _this = this;
             return this.forwardJSONCall("findRenameLocations('" + fileName + "', " + position + ", " + findInStrings + ", " + findInComments + ", " + providePrefixAndSuffixTextForRename + ")", function () { return _this.languageService.findRenameLocations(fileName, position, findInStrings, findInComments, providePrefixAndSuffixTextForRename); });
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 3f1016dbb2be..a1c89fd7c6f1 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -8,11 +8,11 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~8.2.0-next.2',
+  Angular: '~8.2.0-rc.0',
   RxJs: '~6.4.0',
   ZoneJs: '~0.9.1',
-  TypeScript: '~3.4.3',
-  TsLib: '^1.9.0',
+  TypeScript: '~3.5.3',
+  TsLib: '^1.10.0',
 
   // The versions below must be manually updated when making a new devkit release.
   DevkitBuildAngular: '~0.802.0-next.2',
@@ -20,6 +20,6 @@ export const latestVersions = {
   DevkitBuildWebpack: '~0.802.0-next.2',
   AngularPWA: '~0.802.0-next.2',
 
-  tsickle: '^0.35.0',
-  ngPackagr: '^5.1.0',
+  tsickle: '^0.36.0',
+  ngPackagr: '^5.3.0',
 };
diff --git a/packages/schematics/schematics/blank/project-files/package.json.template b/packages/schematics/schematics/blank/project-files/package.json.template
index ca350c4d8679..2f6937d0987e 100644
--- a/packages/schematics/schematics/blank/project-files/package.json.template
+++ b/packages/schematics/schematics/blank/project-files/package.json.template
@@ -18,6 +18,6 @@
     "@types/jasmine": "^3.3.9",
     "@types/node": "^8.0.31",
     "jasmine": "^3.3.1",
-    "typescript": "~3.4.3"
+    "typescript": "~3.5.3"
   }
 }
diff --git a/packages/schematics/schematics/schematic/files/package.json b/packages/schematics/schematics/schematic/files/package.json
index 29db628a2212..4c6c6be6b4bb 100644
--- a/packages/schematics/schematics/schematic/files/package.json
+++ b/packages/schematics/schematics/schematic/files/package.json
@@ -18,6 +18,6 @@
     "@types/jasmine": "^3.3.9",
     "@types/node": "^8.0.31",
     "jasmine": "^3.3.1",
-    "typescript": "3.4.5"
+    "typescript": "3.5.3"
   }
 }
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/package.json b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/package.json
index 71c49f7b9fa7..084987d33cdc 100644
--- a/tests/legacy-cli/e2e/assets/webpack/test-app-weird/package.json
+++ b/tests/legacy-cli/e2e/assets/webpack/test-app-weird/package.json
@@ -21,7 +21,7 @@
     "preprocess-loader": "^0.2.2",
     "raw-loader": "^0.5.1",
     "sass-loader": "^6.0.0",
-    "typescript": "~3.4.5",
+    "typescript": "~3.5.3",
     "webpack": "~4.0.1",
     "webpack-cli": "~2.0.9"
   }
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app/package.json b/tests/legacy-cli/e2e/assets/webpack/test-app/package.json
index 11ea587ef4da..ad8926ad672e 100644
--- a/tests/legacy-cli/e2e/assets/webpack/test-app/package.json
+++ b/tests/legacy-cli/e2e/assets/webpack/test-app/package.json
@@ -2,14 +2,14 @@
   "name": "test",
   "license": "MIT",
   "dependencies": {
-    "@angular/common": "^8.0.0-rc.0",
-    "@angular/compiler": "^8.0.0-rc.0",
-    "@angular/compiler-cli": "^8.0.0-rc.0",
-    "@angular/core": "^8.0.0-rc.0",
-    "@angular/platform-browser": "^8.0.0-rc.0",
-    "@angular/platform-browser-dynamic": "^8.0.0-rc.0",
-    "@angular/platform-server": "^8.0.0-rc.0",
-    "@angular/router": "^8.0.0-rc.0",
+    "@angular/common": "^8.2.0-rc.0",
+    "@angular/compiler": "^8.2.0-rc.0",
+    "@angular/compiler-cli": "^8.2.0-rc.0",
+    "@angular/core": "^8.2.0-rc.0",
+    "@angular/platform-browser": "^8.2.0-rc.0",
+    "@angular/platform-browser-dynamic": "^8.2.0-rc.0",
+    "@angular/platform-server": "^8.2.0-rc.0",
+    "@angular/router": "^8.2.0-rc.0",
     "@ngtools/webpack": "0.0.0",
     "core-js": "^3.0.0",
     "rxjs": "^6.4.0",
@@ -20,7 +20,7 @@
     "performance-now": "^0.2.0",
     "raw-loader": "^0.5.1",
     "sass-loader": "^6.0.0",
-    "typescript": "~3.4.5",
+    "typescript": "~3.5.3",
     "webpack": "~4.0.1",
     "webpack-cli": "~2.0.9"
   }
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-server-app/package.json b/tests/legacy-cli/e2e/assets/webpack/test-server-app/package.json
index 5f30c3cb4556..cd1f314e91a1 100644
--- a/tests/legacy-cli/e2e/assets/webpack/test-server-app/package.json
+++ b/tests/legacy-cli/e2e/assets/webpack/test-server-app/package.json
@@ -21,7 +21,7 @@
     "performance-now": "^0.2.0",
     "raw-loader": "^0.5.1",
     "sass-loader": "^6.0.3",
-    "typescript": "~3.4.5",
+    "typescript": "~3.5.3",
     "webpack": "~4.0.1",
     "webpack-cli": "~2.0.9"
   }
diff --git a/yarn.lock b/yarn.lock
index 8fe6d4366c2a..f40e733b0a1a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@angular/animations@~8.1.0":
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.1.0.tgz#acc6716df47599e48c715c7ec24dfc1e340256e2"
-  integrity sha512-v1paXrWQGsD+E4QBpwNUZ8dPj8hEn0b2kDVzYX6l/e9flUX6W2BWYx+BRuC4QBnNtTV9jiGsHT8FmQq/WztgWw==
+"@angular/animations@~8.2.0-rc.0":
+  version "8.2.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.2.0-rc.0.tgz#290466ddd7c93ba875cb13a053054334281f71d9"
+  integrity sha512-Uq6xORBq117KeD9iVXYu2Vkz55+zm3NngAkxyzlhZkbYRz8ByQxFAtfMhWVVcHlqW5GnLhyqX/lN5Nav0jdcIw==
   dependencies:
     tslib "^1.9.0"
 
@@ -18,17 +18,17 @@
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/common@~8.1.0":
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.1.0.tgz#aeb34e52e7f808e49d045eee36b97c802152c8fb"
-  integrity sha512-m5oEBPSy5nE+4SZTu3XchJhKT/u73NnJIS3+41xRsF5aX/1p8uNHkhJR7kcJmlVa7BZNr4byl8bGsYjX0CCpVg==
+"@angular/common@~8.2.0-rc.0":
+  version "8.2.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.2.0-rc.0.tgz#58b4fdc85d7db9667d9f9d28e8cb6356923c5e92"
+  integrity sha512-aOTXW2KRGhX/y5v6NUFFxxoTi1HlMwGv9XaxH1I9qj+YnlHO+oVqyHB4MS+gvb2eLqbyxKTKzUYWsMDblX8nVA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@~8.1.0":
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.1.0.tgz#a42376cc42d34d04a9d7f1238b5d7ef535a218f6"
-  integrity sha512-WqEWjUTkvkp4rYDwYKo9XVXK1sbUHihwiZDOZrBEiGdw08TvZ+3qZs/mnYwRUYCzoN99RVG5rxJDg8Sf2VTY+w==
+"@angular/compiler-cli@~8.2.0-rc.0":
+  version "8.2.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.2.0-rc.0.tgz#a5b290d5c92d0f9a6de5d17c63ea7740169845e3"
+  integrity sha512-w4KSp2cSYpg2qcONZeVaeCGB0JkiXdXVIPO9PdkCp8tU7KYVOAt/ZbN91zBKunSD4EbzlaF7pr290J094CH04w==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -37,22 +37,28 @@
     magic-string "^0.25.0"
     minimist "^1.2.0"
     reflect-metadata "^0.1.2"
-    shelljs "^0.8.1"
     source-map "^0.6.1"
     tslib "^1.9.0"
     yargs "13.1.0"
 
-"@angular/compiler@~8.1.0":
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.1.0.tgz#8d94ad49d5388b2f2f0e369233a224f649619be9"
-  integrity sha512-+o4jR7WfqR39zgGk7gwpxZfd2hS3X2qgr17mUCeqQkKj0gh+GYWj7OlSuYXG63OS9S4iLsKQiVUYYgqdNSK5mg==
+"@angular/compiler@~8.2.0-rc.0":
+  version "8.2.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.2.0-rc.0.tgz#3c288d33717e3a687333a5e7de533f871a5e5fca"
+  integrity sha512-fS2/5MTUtYy38kCwToltqBku6aq0hq90jn0p37TSRoYsNm7Ae2NU3nkM36A5G1wzetBn6R92updswbR62OVD1w==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@~8.1.0":
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.1.0.tgz#68bc170b4c041e3c19b9a17c0fff74b88fb37aae"
-  integrity sha512-GviWJjOu6LJMYNbukdSK35VaXvSrp5LTNd0FbXoBQF+mhVVV/8cG4hTKKjxG1xwWXI5E1t5U4aUKXrKUNJ1sQg==
+"@angular/core@~8.2.0-rc.0":
+  version "8.2.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.2.0-rc.0.tgz#97a028fb2871abed3aa5fd04b5c4237818a5adb8"
+  integrity sha512-G7vdTjNCxhpLlOaAcQ/xWt9kFLs1PkNkMzyRsiGUe/k5Mlr+xcmUDb1e5N3bLHJmIDFIUO1fXp/KHp1dysqB7g==
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/forms@~8.2.0-rc.0":
+  version "8.2.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-8.2.0-rc.0.tgz#999970f6e5d37bafd91dffaba7057fc1f801f4fe"
+  integrity sha512-HjUjdqAu8XfI29+CXC8qDGYsGkFFonLMRwuDhWn2KpF7MXvFhERlxsFUNYNIYd29+HcoJcg/PRHTzqqJ2TPJLg==
   dependencies:
     tslib "^1.9.0"
 
@@ -63,40 +69,40 @@
   dependencies:
     tslib "^1.7.1"
 
-"@angular/platform-browser-dynamic@~8.1.0":
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.1.0.tgz#407fae89fc7294783b8d27c19c1f96e36a3fdabd"
-  integrity sha512-By9I9hXqg538UzhlYDrF1dW7cDaF2JPjoFCE9jZZQxVRhOdjVoYVuIxIa5qPuGWfmMITO2G9rfMMrDiRHMyEDg==
+"@angular/platform-browser-dynamic@~8.2.0-rc.0":
+  version "8.2.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.0-rc.0.tgz#4d231e1091502792ef1bd02a49f94a54f12503d0"
+  integrity sha512-4LOE9pbcEM+dsXPBqIcHDglsizUYU4n23N+J6jsud3GM7VYx7KKd70e1KF+TTNEnNqE1gv7aCz5vZ3J3cYlWTQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@~8.1.0":
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.1.0.tgz#186ce714304d2f72c4a3bf50a1607e03c8de6abd"
-  integrity sha512-qH6bH6DSRGvgx5iD7BbufsdeMxhh7lL1zN47LkrLGa8hojF+yxwtdE+go+WJ160ArACyX/FrPmPDSWT20YilUQ==
+"@angular/platform-browser@~8.2.0-rc.0":
+  version "8.2.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.2.0-rc.0.tgz#69ae708dfc74fcc03e8cd1cdb296e1a828b433b9"
+  integrity sha512-Vk9Zdv6kHm3hwPvhc6FG0AnMxWOkNXfdAoXTLDY4vbo367ym1xxcDUmUf+mou/HODpnGdoHKSTLj5SEua2SSMw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-server@~8.1.0":
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.1.0.tgz#e0f9e69cbe87ab8538c5256be748e0718a480718"
-  integrity sha512-bFsbYnbsXl178pOYxppfpTAxGcOaAz1kjTWQr/zVcMOthtu/M08oGXMke2l7Fx4Bt3MM7DXd93Qjebv7N4ECRQ==
+"@angular/platform-server@~8.2.0-rc.0":
+  version "8.2.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-8.2.0-rc.0.tgz#7d54506a01f25a927f68716027f231947f293350"
+  integrity sha512-acMb95y5vKp5b/CbqDLbb5ZrS99nl4WedAv1FDfQH8kEWR/RtHfxB+Q3w3LwNBDC+Pivy3Ce+E8dZSpVTt4bUA==
   dependencies:
     domino "^2.1.2"
     tslib "^1.9.0"
     xhr2 "^0.1.4"
 
-"@angular/router@~8.1.0":
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.1.0.tgz#e8e0d146a489abcc7b8aed0f9efe10922e467db6"
-  integrity sha512-LeJOmiFdsXVf0KlN/jzA5NgWY1V4Ty5TDcfNd01s/ckZlzZd+p5hFhRFc75qwENTb8UwClTLsYQLmvmphnB4dA==
+"@angular/router@~8.2.0-rc.0":
+  version "8.2.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.2.0-rc.0.tgz#8a5eba78917d45485fc5001592e690d9ed4e4ad8"
+  integrity sha512-hpidAfvDpIaWBccogRNck1cFO/STgN/KinF/VkMWeYMlt9IFwefEOWwY/d1V71L3wjTwV+NMhuUTguE8OptT3w==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@~8.1.0":
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.1.0.tgz#bd7d41863526441e4ea2b93ac19e69255c52ca6e"
-  integrity sha512-O4vUqrTPoCeRRnbUYBk+5Dx2zj/nc6UxZS/WZ1HKEGJZvYvuXf3SMfi1cHdzKPedCUj8PMt6yLpiP0qkyxV+Ww==
+"@angular/service-worker@~8.2.0-rc.0":
+  version "8.2.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.2.0-rc.0.tgz#9bfc4da356c177264448185b0a8d0be80853154f"
+  integrity sha512-9RKJyjruUGY+caJ532J58umsR10R/eW2gU60cndDBPanopoqLsXMstss+bUZOgrtMnO7HaV72aypVZS6sBrbQA==
   dependencies:
     tslib "^1.9.0"
 
@@ -282,6 +288,13 @@
   dependencies:
     defer-to-connect "^1.0.1"
 
+"@szmarczak/http-timer@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
+  integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
+  dependencies:
+    defer-to-connect "^1.0.1"
+
 "@types/bluebird@*":
   version "3.5.26"
   resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.26.tgz#a38c438ae84fa02431d6892edf86e46edcbca291"
@@ -454,10 +467,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897"
   integrity sha512-fCHV45gS+m3hH17zgkgADUSi2RR1Vht6wOZ0jyHP8rjiQra9f+mIcgwPQHllmDocYOstIEbKlxbFDYlgrTPYqw==
 
-"@types/node@^11.11.6":
-  version "11.12.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.12.0.tgz#ec5594728811dc2797e42396cfcdf786f2052c12"
-  integrity sha512-Lg00egj78gM+4aE0Erw05cuDbvX9sLJbaaPwwRtdCdAMnIudqrQZ0oZX98Ek0yiSK/A2nubHgJfvII/rTT2Dwg==
+"@types/node@^12.6.2":
+  version "12.6.8"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.6.8.tgz#e469b4bf9d1c9832aee4907ba8a051494357c12c"
+  integrity sha512-aX+gFgA5GHcDi89KG5keey2zf0WfZk/HAQotEamsK2kbey+8yGKcson0hbK8E+v0NArlCJQCqMP161YhV6ZXLg==
 
 "@types/node@^6.0.46":
   version "6.14.0"
@@ -491,6 +504,13 @@
     "@types/node" "*"
     "@types/tough-cookie" "*"
 
+"@types/resolve@0.0.8":
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194"
+  integrity sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/rx-core-binding@*":
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/@types/rx-core-binding/-/rx-core-binding-4.0.4.tgz#d969d32f15a62b89e2862c17b3ee78fe329818d3"
@@ -1039,12 +1059,12 @@ amdefine@>=0.0.4:
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
   integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
-ansi-align@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f"
-  integrity sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=
+ansi-align@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb"
+  integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==
   dependencies:
-    string-width "^2.0.0"
+    string-width "^3.0.0"
 
 ansi-colors@3.2.4:
   version "3.2.4"
@@ -1336,7 +1356,7 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autoprefixer@9.6.1:
+autoprefixer@9.6.1, autoprefixer@^9.6.0:
   version "9.6.1"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz#51967a02d2d2300bb01866c1611ec8348d355a47"
   integrity sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==
@@ -1349,18 +1369,6 @@ autoprefixer@9.6.1:
     postcss "^7.0.17"
     postcss-value-parser "^4.0.0"
 
-autoprefixer@^9.0.0:
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.3.1.tgz#71b622174de2b783d5fd99f9ad617b7a3c78443e"
-  integrity sha512-DY9gOh8z3tnCbJ13JIWaeQsoYncTGdsrgCceBaQSIL4nvdrLxgbRSBPevg2XbX7u4QCSfLheSJEEIUUSlkbx6Q==
-  dependencies:
-    browserslist "^4.3.3"
-    caniuse-lite "^1.0.30000898"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^7.0.5"
-    postcss-value-parser "^3.3.1"
-
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
@@ -1620,17 +1628,18 @@ bootstrap@^4.0.0:
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.3.tgz#0eb371af2c8448e8c210411d0cb824a6409a12be"
   integrity sha512-rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w==
 
-boxen@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
-  integrity sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==
+boxen@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/boxen/-/boxen-3.2.0.tgz#fbdff0de93636ab4450886b6ff45b92d098f45eb"
+  integrity sha512-cU4J/+NodM3IHdSL2yN8bqYqnmlBTidDR4RC7nJs61ZmtGz8VZzM3HLQX0zY5mrSmPtR3xWwsq2jOUQqFZN8+A==
   dependencies:
-    ansi-align "^2.0.0"
-    camelcase "^4.0.0"
-    chalk "^2.0.1"
-    cli-boxes "^1.0.0"
-    string-width "^2.0.0"
+    ansi-align "^3.0.0"
+    camelcase "^5.3.1"
+    chalk "^2.4.2"
+    cli-boxes "^2.2.0"
+    string-width "^3.0.0"
     term-size "^1.2.0"
+    type-fest "^0.3.0"
     widest-line "^2.0.0"
 
 brace-expansion@^1.1.7:
@@ -1761,7 +1770,7 @@ browserslist@4.6.6:
     electron-to-chromium "^1.3.191"
     node-releases "^1.1.25"
 
-browserslist@^4.0.0, browserslist@^4.3.3:
+browserslist@^4.0.0:
   version "4.5.5"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.5.tgz#fe1a352330d2490d5735574c149a85bc18ef9b82"
   integrity sha512-0QFO1r/2c792Ohkit5XI8Cm8pDtZxgNl2H6HU4mHrpYz7314pEYcsAVVatM0l/YmxPnEzh9VygXouj4gkFUTKA==
@@ -1843,10 +1852,10 @@ builtin-modules@^1.0.0, builtin-modules@^1.1.1:
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
   integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
 
-builtin-modules@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.0.0.tgz#1e587d44b006620d90286cc7a9238bbc6129cab1"
-  integrity sha512-hMIeU4K2ilbXV6Uv93ZZ0Avg/M91RaKXucQ+4me2Do1txxBDyDZWCBa5bJSLqoNTRpXTLwEzIk1KmloenDDjhg==
+builtin-modules@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484"
+  integrity sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==
 
 builtin-status-codes@^3.0.0:
   version "3.0.0"
@@ -1993,6 +2002,19 @@ cacheable-request@^5.1.0:
     normalize-url "^3.1.0"
     responselike "^1.0.2"
 
+cacheable-request@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
+  integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==
+  dependencies:
+    clone-response "^1.0.2"
+    get-stream "^5.1.0"
+    http-cache-semantics "^4.0.0"
+    keyv "^3.0.0"
+    lowercase-keys "^2.0.0"
+    normalize-url "^4.1.0"
+    responselike "^1.0.2"
+
 caller-callsite@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
@@ -2039,12 +2061,12 @@ camelcase@^2.0.0, camelcase@^2.0.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
   integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
 
-camelcase@^4.0.0, camelcase@^4.1.0:
+camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
   integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
-camelcase@^5.0.0:
+camelcase@^5.0.0, camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
@@ -2054,11 +2076,6 @@ caniuse-lite@1.0.30000985:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000985.tgz#0eb40f6c8a8c219155cbe43c4975c0efb4a0f77f"
   integrity sha512-1ngiwkgqAYPG0JSSUp3PUDGPKKY59EK7NrGGX+VOxaKCNzRbNc7uXMny+c3VJfZxtoK3wSImTvG9T9sXiTw2+w==
 
-caniuse-lite@^1.0.30000898:
-  version "1.0.30000903"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000903.tgz#86d46227759279b3db345ddbe778335dbba9e858"
-  integrity sha512-T1XVJEpGCoaq7MDw7/6hCdYUukmSaS+1l/OQJkLtw7Cr2+/+d67tNGKEbyiqf7Ck8x6EhNFUxjYFXXka0N/w5g==
-
 caniuse-lite@^1.0.30000960:
   version "1.0.30000960"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000960.tgz#ec48297037e5607f582f246ae7b12bee66a78999"
@@ -2084,11 +2101,6 @@ canonical-path@1.0.0:
   resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
   integrity sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==
 
-capture-stack-trace@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
-  integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==
-
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -2234,11 +2246,6 @@ chrome-trace-event@^1.0.0:
   dependencies:
     tslib "^1.9.0"
 
-ci-info@^1.5.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.5.1.tgz#17e8eb5de6f8b2b6038f0cbb714d410bfa9f3030"
-  integrity sha512-fKFIKXaYiL1exImwJ0AhR/6jxFPSKQBk2ayV5NiNoruUs2+rxC2kNw0EG+1Z9dugZRdCrppskQ8DN2cyaUM1Hw==
-
 ci-info@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
@@ -2279,10 +2286,10 @@ clean-css@4.2.1, clean-css@^4.1.11:
   dependencies:
     source-map "~0.6.0"
 
-cli-boxes@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
-  integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM=
+cli-boxes@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.0.tgz#538ecae8f9c6ca508e3c3c95b453fe93cb4c168d"
+  integrity sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==
 
 cli-cursor@^2.1.0:
   version "2.1.0"
@@ -2557,10 +2564,10 @@ concat-stream@1.6.2, concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@~
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-configstore@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f"
-  integrity sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==
+configstore@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/configstore/-/configstore-4.0.0.tgz#5933311e95d3687efb592c528b922d9262d227e7"
+  integrity sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ==
   dependencies:
     dot-prop "^4.1.0"
     graceful-fs "^4.1.2"
@@ -2901,13 +2908,6 @@ create-ecdh@^4.0.0:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
 
-create-error-class@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
-  integrity sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=
-  dependencies:
-    capture-stack-trace "^1.0.0"
-
 create-hash@^1.1.0, create-hash@^1.1.2:
   version "1.2.0"
   resolved "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
@@ -3782,6 +3782,11 @@ estree-walker@^0.6.0:
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.0.tgz#5d865327c44a618dde5699f763891ae31f257dae"
   integrity sha512-peq1RfVAVzr3PU/jL31RaOjUKLoZJpObQWJJ+LgfcxDUifyLZ1RjPQZTl0pzj2uJ45b7A7XpyppXvxdEqzo4rw==
 
+estree-walker@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
+  integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
+
 esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
@@ -4359,6 +4364,15 @@ fs-extra@^7.0.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
+fs-extra@^8.0.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-minipass@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
@@ -4469,6 +4483,13 @@ get-stream@^4.0.0, get-stream@^4.1.0:
   dependencies:
     pump "^3.0.0"
 
+get-stream@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9"
+  integrity sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==
+  dependencies:
+    pump "^3.0.0"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -4609,7 +4630,7 @@ glob@^6.0.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
+glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
   integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
@@ -4673,23 +4694,6 @@ globby@^7.1.1:
     pify "^3.0.0"
     slash "^1.0.0"
 
-got@^6.7.1:
-  version "6.7.1"
-  resolved "http://registry.npmjs.org/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
-  integrity sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=
-  dependencies:
-    create-error-class "^3.0.0"
-    duplexer3 "^0.1.4"
-    get-stream "^3.0.0"
-    is-redirect "^1.0.0"
-    is-retry-allowed "^1.0.0"
-    is-stream "^1.0.0"
-    lowercase-keys "^1.0.0"
-    safe-buffer "^5.0.1"
-    timed-out "^4.0.0"
-    unzip-response "^2.0.1"
-    url-parse-lax "^1.0.0"
-
 got@^9.1.0:
   version "9.5.0"
   resolved "https://registry.yarnpkg.com/got/-/got-9.5.0.tgz#6fd0312c6b694c0a11d9119d95fd7daed174eb49"
@@ -4707,6 +4711,23 @@ got@^9.1.0:
     to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
 
+got@^9.6.0:
+  version "9.6.0"
+  resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
+  integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
+  dependencies:
+    "@sindresorhus/is" "^0.14.0"
+    "@szmarczak/http-timer" "^1.1.2"
+    cacheable-request "^6.0.0"
+    decompress-response "^3.3.0"
+    duplexer3 "^0.1.4"
+    get-stream "^4.1.0"
+    lowercase-keys "^1.0.1"
+    mimic-response "^1.0.1"
+    p-cancelable "^1.0.0"
+    to-readable-stream "^1.0.0"
+    url-parse-lax "^3.0.0"
+
 graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
@@ -4717,6 +4738,11 @@ graceful-fs@^4.1.15:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
   integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
 
+graceful-fs@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b"
+  integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==
+
 handle-thing@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
@@ -4840,6 +4866,11 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
+has-yarn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
+  integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==
+
 has@^1.0.1, has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
@@ -5209,11 +5240,6 @@ internal-ip@^4.3.0:
     default-gateway "^4.2.0"
     ipaddr.js "^1.9.0"
 
-interpret@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
-  integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
-
 invariant@^2.2.2:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
@@ -5311,13 +5337,6 @@ is-callable@^1.1.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
   integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
 
-is-ci@^1.0.10:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
-  integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==
-  dependencies:
-    ci-info "^1.5.0"
-
 is-ci@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
@@ -5461,10 +5480,10 @@ is-module@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
   integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
 
-is-npm@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
-  integrity sha1-8vtjpl5JBbQGyGBydloaTceTufQ=
+is-npm@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-3.0.0.tgz#ec9147bfb629c43f494cf67936a961edec7e8053"
+  integrity sha512-wsigDr1Kkschp2opC4G3yA6r9EgVA6NjRpWzIi9axXqeIaAATPRJc4uLujXe3Nd9uO8KoDyA4MD6aZSeXTADhA==
 
 is-number@^2.1.0:
   version "2.1.0"
@@ -5553,10 +5572,12 @@ is-promise@^2.1.0:
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
   integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
 
-is-redirect@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
-  integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=
+is-reference@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.1.3.tgz#e99059204b66fdbe09305cfca715a29caa5c8a51"
+  integrity sha512-W1iHHv/oyBb2pPxkBxtaewxa1BC58Pn5J0hogyCdefwUIvb6R+TGbAcIa4qPNYLqLhb3EnOgUf2MQkkF76BcKw==
+  dependencies:
+    "@types/estree" "0.0.39"
 
 is-regex@^1.0.4:
   version "1.0.4"
@@ -5565,12 +5586,7 @@ is-regex@^1.0.4:
   dependencies:
     has "^1.0.1"
 
-is-retry-allowed@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
-  integrity sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=
-
-is-stream@^1.0.0, is-stream@^1.1.0:
+is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
@@ -5614,6 +5630,11 @@ is-wsl@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
   integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
+is-yarn-global@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232"
+  integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==
+
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
@@ -6206,12 +6227,12 @@ kuler@1.0.x:
   dependencies:
     colornames "^1.1.1"
 
-latest-version@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15"
-  integrity sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=
+latest-version@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
+  integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==
   dependencies:
-    package-json "^4.0.0"
+    package-json "^6.3.0"
 
 lcid@^1.0.0:
   version "1.0.0"
@@ -6546,6 +6567,11 @@ lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
   integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
 
+lowercase-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
+  integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
+
 lru-cache@4.1.x, lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
@@ -6573,7 +6599,7 @@ lunr-mutable-indexes@2.3.2:
   resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.6.tgz#f278beee7ffd56ad86e6e478ce02ab2b98c78dd5"
   integrity sha512-swStvEyDqQ85MGpABCMBclZcLI/pBIlu8FFDtmX197+oEgKloJ67QnB+Tidh0340HmLMs39c4GrkPY3cmkXp6Q==
 
-magic-string@0.25.3:
+magic-string@0.25.3, magic-string@^0.25.2:
   version "0.25.3"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.3.tgz#34b8d2a2c7fec9d9bdf9929a3fd81d271ef35be9"
   integrity sha512-6QK0OpF/phMz0Q2AxILkX2mFhi7m+WMwTRg0LQKq/WBB0cDP4rYH3Wp4/d3OTXlrPLVJT/RFqj8tFeAR4nk8AA==
@@ -6594,13 +6620,6 @@ magic-string@^0.25.0:
   dependencies:
     sourcemap-codec "^1.4.1"
 
-magic-string@^0.25.1:
-  version "0.25.1"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.1.tgz#b1c248b399cd7485da0fe7385c2fc7011843266e"
-  integrity sha512-sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg==
-  dependencies:
-    sourcemap-codec "^1.4.1"
-
 make-dir@^1.0.0, make-dir@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -7142,39 +7161,38 @@ neo-async@^2.6.0:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
   integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
 
-ng-packagr@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-5.1.0.tgz#4262775f29f7da72b3e5492c480a6857065d712e"
-  integrity sha512-sBQrn3jy0S2T8nN1gnptO3Dd55X6oNPSFlCckfHPp7G3T3eNUfo3o9dqeZc58PFiY1WOAi4z43LI7kFFeSrTTA==
+ng-packagr@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-5.3.0.tgz#92434ca05ecbd1e01fe961a66c8a9a66b095f6fa"
+  integrity sha512-i+964lzZC7VVzatDCLDZndiXTog1XGozY7K1Bs78+uBF8O1YHNQP9wB9C5fR4uEaSKVhCWEBYekoS69flCugMA==
   dependencies:
     "@ngtools/json-schema" "^1.1.0"
-    autoprefixer "^9.0.0"
+    autoprefixer "^9.6.0"
     browserslist "^4.0.0"
     chalk "^2.3.1"
-    chokidar "^2.0.3"
+    chokidar "^3.0.0"
     clean-css "^4.1.11"
     commander "^2.12.0"
-    fs-extra "^7.0.0"
+    fs-extra "^8.0.0"
     glob "^7.1.2"
     injection-js "^2.2.1"
     less "^3.8.0"
     less-plugin-npm-import "^2.1.0"
     node-sass-tilde-importer "^1.0.0"
-    opencollective-postinstall "^2.0.1"
     postcss "^7.0.0"
     postcss-url "^8.0.0"
     read-pkg-up "^5.0.0"
     rimraf "^2.6.1"
-    rollup "^1.6.0"
-    rollup-plugin-commonjs "^9.1.3"
+    rollup "^1.12.1"
+    rollup-plugin-commonjs "^10.0.0"
     rollup-plugin-json "^4.0.0"
-    rollup-plugin-node-resolve "^4.0.1"
+    rollup-plugin-node-resolve "^5.0.0"
     rollup-plugin-sourcemaps "^0.4.2"
     rxjs "^6.0.0"
     sass "^1.17.3"
     stylus "^0.54.5"
-    terser "^3.16.1"
-    update-notifier "^2.3.0"
+    terser "^4.0.0"
+    update-notifier "^3.0.0"
 
 nice-try@^1.0.4:
   version "1.0.5"
@@ -7330,6 +7348,11 @@ normalize-url@^3.1.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
   integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
 
+normalize-url@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.3.0.tgz#9c49e10fc1876aeb76dba88bf1b2b5d9fa57b2ee"
+  integrity sha512-0NLtR71o4k6GLP+mr6Ty34c5GA6CMoEsncKJxvQd8NzPxaHRJNnb5gZE8R1XF4CPIS7QPHLJ74IFszwtNVAHVQ==
+
 npm-bundled@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
@@ -7572,11 +7595,6 @@ open@6.4.0:
   dependencies:
     is-wsl "^1.1.0"
 
-opencollective-postinstall@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89"
-  integrity sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw==
-
 opn@^5.1.0:
   version "5.4.0"
   resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
@@ -7753,15 +7771,15 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
   integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
 
-package-json@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed"
-  integrity sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=
+package-json@^6.3.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0"
+  integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==
   dependencies:
-    got "^6.7.1"
-    registry-auth-token "^3.0.1"
-    registry-url "^3.0.3"
-    semver "^5.1.0"
+    got "^9.6.0"
+    registry-auth-token "^4.0.0"
+    registry-url "^5.0.0"
+    semver "^6.2.0"
 
 pacote@9.5.4:
   version "9.5.4"
@@ -8167,7 +8185,7 @@ postcss-url@^8.0.0:
     postcss "^7.0.2"
     xxhashjs "^0.2.1"
 
-postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.1:
+postcss-value-parser@^3.2.3:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
@@ -8186,7 +8204,7 @@ postcss@7.0.17, postcss@^7.0.17:
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2:
   version "7.0.5"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.5.tgz#70e6443e36a6d520b0fd4e7593fcca3635ee9f55"
   integrity sha512-HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ==
@@ -8200,7 +8218,7 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
-prepend-http@^1.0.0, prepend-http@^1.0.1:
+prepend-http@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
   integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
@@ -8551,7 +8569,7 @@ raw-loader@1.0.0:
     loader-utils "^1.1.0"
     schema-utils "^1.0.0"
 
-rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
+rc@^1.2.7, rc@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -8739,13 +8757,6 @@ readdirp@^3.1.1:
   dependencies:
     picomatch "^2.0.4"
 
-rechoir@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-  integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
-  dependencies:
-    resolve "^1.1.6"
-
 redent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
@@ -8801,20 +8812,20 @@ regexpu-core@^1.0.0:
     regjsgen "^0.2.0"
     regjsparser "^0.1.4"
 
-registry-auth-token@^3.0.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
-  integrity sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==
+registry-auth-token@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.0.0.tgz#30e55961eec77379da551ea5c4cf43cbf03522be"
+  integrity sha512-lpQkHxd9UL6tb3k/aHAVfnVtn+Bcs9ob5InuFLLEDqSqeq+AljB8GZW9xY0x7F+xYwEcjKe07nyoxzEYz6yvkw==
   dependencies:
-    rc "^1.1.6"
+    rc "^1.2.8"
     safe-buffer "^5.0.1"
 
-registry-url@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
-  integrity sha1-PU74cPc93h138M+aOBQyRE4XSUI=
+registry-url@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009"
+  integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==
   dependencies:
-    rc "^1.0.1"
+    rc "^1.2.8"
 
 regjsgen@^0.2.0:
   version "0.2.0"
@@ -8970,17 +8981,17 @@ resolve@1.1.x, resolve@~1.1.6:
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.8.1:
+resolve@^1.1.5, resolve@^1.1.7, resolve@^1.3.2:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
   integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==
   dependencies:
     path-parse "^1.0.5"
 
-resolve@^1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
-  integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==
+resolve@^1.11.0, resolve@^1.11.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e"
+  integrity sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==
   dependencies:
     path-parse "^1.0.6"
 
@@ -9048,15 +9059,16 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
-rollup-plugin-commonjs@^9.1.3:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.2.0.tgz#4604e25069e0c78a09e08faa95dc32dec27f7c89"
-  integrity sha512-0RM5U4Vd6iHjL6rLvr3lKBwnPsaVml+qxOGaaNUWN1lSq6S33KhITOfHmvxV3z2vy9Mk4t0g4rNlVaJJsNQPWA==
+rollup-plugin-commonjs@^10.0.0:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.0.1.tgz#fbfcadf4ce2e826068e056a9f5c19287d9744ddf"
+  integrity sha512-x0PcCVdEc4J8igv1qe2vttz8JKAKcTs3wfIA3L8xEty3VzxgORLrzZrNWaVMc+pBC4U3aDOb9BnWLAQ8J11vkA==
   dependencies:
-    estree-walker "^0.5.2"
-    magic-string "^0.25.1"
-    resolve "^1.8.1"
-    rollup-pluginutils "^2.3.3"
+    estree-walker "^0.6.1"
+    is-reference "^1.1.2"
+    magic-string "^0.25.2"
+    resolve "^1.11.0"
+    rollup-pluginutils "^2.8.1"
 
 rollup-plugin-json@^4.0.0:
   version "4.0.0"
@@ -9065,14 +9077,16 @@ rollup-plugin-json@^4.0.0:
   dependencies:
     rollup-pluginutils "^2.5.0"
 
-rollup-plugin-node-resolve@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.0.1.tgz#f95765d174e5daeef9ea6268566141f53aa9d422"
-  integrity sha512-fSS7YDuCe0gYqKsr5OvxMloeZYUSgN43Ypi1WeRZzQcWtHgFayV5tUSPYpxuaioIIWaBXl6NrVk0T2/sKwueLg==
+rollup-plugin-node-resolve@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz#730f93d10ed202473b1fb54a5997a7db8c6d8523"
+  integrity sha512-jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw==
   dependencies:
-    builtin-modules "^3.0.0"
+    "@types/resolve" "0.0.8"
+    builtin-modules "^3.1.0"
     is-module "^1.0.0"
-    resolve "^1.10.0"
+    resolve "^1.11.1"
+    rollup-pluginutils "^2.8.1"
 
 rollup-plugin-sourcemaps@^0.4.2:
   version "0.4.2"
@@ -9082,7 +9096,7 @@ rollup-plugin-sourcemaps@^0.4.2:
     rollup-pluginutils "^2.0.1"
     source-map-resolve "^0.5.0"
 
-rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.3.3:
+rollup-pluginutils@^2.0.1:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.3.tgz#3aad9b1eb3e7fe8262820818840bf091e5ae6794"
   integrity sha512-2XZwja7b6P5q4RZ5FhyX1+f46xi1Z3qBKigLRZ6VTZjwbN0K1IFGMlwm06Uu0Emcre2Z63l77nq/pzn+KxIEoA==
@@ -9098,14 +9112,21 @@ rollup-pluginutils@^2.5.0:
     estree-walker "^0.6.0"
     micromatch "^3.1.10"
 
-rollup@^1.6.0:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.7.3.tgz#cade518b92e23efa72026e264e29d9a56cbf8eb9"
-  integrity sha512-U3/HaZujvGofNZQldfIknKoaNFNRS+j8/uCS/jSy3FrxF9t0FBsgZW4+VXLHG7l1daTgE6+jEy0Dv7cVCB2NPg==
+rollup-pluginutils@^2.8.1:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.1.tgz#8fa6dd0697344938ef26c2c09d2488ce9e33ce97"
+  integrity sha512-J5oAoysWar6GuZo0s+3bZ6sVZAC0pfqKz68De7ZgDi5z63jOVZn1uJL/+z1jeKHNbGII8kAyHF5q8LnxSX5lQg==
+  dependencies:
+    estree-walker "^0.6.1"
+
+rollup@^1.12.1:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.17.0.tgz#47ee8b04514544fc93b39bae06271244c8db7dfa"
+  integrity sha512-k/j1m0NIsI4SYgCJR4MWPstGJOWfJyd6gycKoMhyoKPVXxm+L49XtbUwZyFsrSU2YXsOkM4u1ll9CS/ZgJBUpw==
   dependencies:
     "@types/estree" "0.0.39"
-    "@types/node" "^11.11.6"
-    acorn "^6.1.1"
+    "@types/node" "^12.6.2"
+    acorn "^6.2.0"
 
 run-async@^2.2.0:
   version "2.3.0"
@@ -9307,7 +9328,7 @@ semver-intersect@1.4.0:
   dependencies:
     semver "^5.0.0"
 
-"semver@2 >=2.2.1 || 3.x || 4 || 5", semver@5.6.0, semver@^5.0.0, semver@^5.0.3, semver@^5.1.0, semver@^5.4.1, semver@^5.6.0:
+"semver@2 >=2.2.1 || 3.x || 4 || 5", semver@5.6.0, semver@^5.0.0, semver@^5.0.3, semver@^5.4.1, semver@^5.6.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
@@ -9322,7 +9343,7 @@ semver@6.2.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db"
   integrity sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==
 
-semver@6.3.0:
+semver@6.3.0, semver@^6.2.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -9492,15 +9513,6 @@ shebang-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
   integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
-shelljs@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.2.tgz#345b7df7763f4c2340d584abb532c5f752ca9e35"
-  integrity sha512-pRXeNrCA2Wd9itwhvLp5LZQvPJ0wU6bcjaTMywHHGX5XWhVN2nzSu7WV0q+oUY7mGK3mgSkDDzP3MgjqdyIgbQ==
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
 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"
@@ -9704,14 +9716,6 @@ source-map-support@~0.4.0:
   dependencies:
     source-map "^0.5.6"
 
-source-map-support@~0.5.9:
-  version "0.5.10"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
-  integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
@@ -10309,15 +10313,6 @@ terser-webpack-plugin@^1.1.0:
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
-terser@^3.16.1:
-  version "3.16.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-3.16.1.tgz#5b0dd4fa1ffd0b0b43c2493b2c364fd179160493"
-  integrity sha512-JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow==
-  dependencies:
-    commander "~2.17.1"
-    source-map "~0.6.1"
-    source-map-support "~0.5.9"
-
 terser@^3.8.1:
   version "3.10.8"
   resolved "https://registry.yarnpkg.com/terser/-/terser-3.10.8.tgz#2fe3967396a10cdc3d575074fe857efd30a2895a"
@@ -10364,11 +10359,6 @@ thunky@^1.0.2:
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.3.tgz#f5df732453407b09191dae73e2a8cc73f381a826"
   integrity sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==
 
-timed-out@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
-  integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
-
 timers-browserify@^2.0.4:
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
@@ -10559,6 +10549,11 @@ ts-node@^5.0.0:
     source-map-support "^0.5.3"
     yn "^2.0.0"
 
+tslib@^1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
+  integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
+
 tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
@@ -10633,6 +10628,11 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+type-fest@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1"
+  integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==
+
 type-is@~1.6.16:
   version "1.6.16"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
@@ -10654,10 +10654,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@3.4.5:
-  version "3.4.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.5.tgz#2d2618d10bb566572b8d7aad5180d84257d70a99"
-  integrity sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==
+typescript@3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
+  integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
 
 uglify-js@^3.1.4:
   version "3.4.9"
@@ -10750,11 +10750,6 @@ unset-value@^1.0.0:
     has-value "^0.3.1"
     isobject "^3.0.0"
 
-unzip-response@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
-  integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
-
 upath@^1.0.5:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
@@ -10765,19 +10760,21 @@ upath@^1.1.0, upath@^1.1.1:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
   integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
 
-update-notifier@^2.3.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6"
-  integrity sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==
+update-notifier@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-3.0.1.tgz#78ecb68b915e2fd1be9f767f6e298ce87b736250"
+  integrity sha512-grrmrB6Zb8DUiyDIaeRTBCkgISYUgETNe7NglEbVsrLWXeESnlCSP50WfRSj/GmzMPl6Uchj24S/p80nP/ZQrQ==
   dependencies:
-    boxen "^1.2.1"
+    boxen "^3.0.0"
     chalk "^2.0.1"
-    configstore "^3.0.0"
+    configstore "^4.0.0"
+    has-yarn "^2.1.0"
     import-lazy "^2.1.0"
-    is-ci "^1.0.10"
+    is-ci "^2.0.0"
     is-installed-globally "^0.1.0"
-    is-npm "^1.0.0"
-    latest-version "^3.0.0"
+    is-npm "^3.0.0"
+    is-yarn-global "^0.3.0"
+    latest-version "^5.0.0"
     semver-diff "^2.0.0"
     xdg-basedir "^3.0.0"
 
@@ -10798,13 +10795,6 @@ urix@^0.1.0:
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
-url-parse-lax@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73"
-  integrity sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=
-  dependencies:
-    prepend-http "^1.0.1"
-
 url-parse-lax@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"

From c4df643c6d896302cea7be7e2a91697868fe470f Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 29 Jul 2019 14:50:38 +0100
Subject: [PATCH 1680/1703] build: increase buffer size for DO_NOT_SUBMIT git
 diff

---
 scripts/validate-do-not-submit.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/validate-do-not-submit.ts b/scripts/validate-do-not-submit.ts
index 452827e41977..803ea3cbf320 100644
--- a/scripts/validate-do-not-submit.ts
+++ b/scripts/validate-do-not-submit.ts
@@ -50,7 +50,10 @@ export default async function (argv: ValidateCommitsOptions, logger: logging.Log
   let errorCount = 0;
 
   for (const fileName of files) {
-    const diff = execSync(`git diff "${baseSha}..${sha}" -- "${fileName}"`).toString().trim();
+    const diff = execSync(`git diff "${baseSha}..${sha}" -- "${fileName}"`, {
+      // Increase the default buffer size by 100. Diffs can be quite large.
+      maxBuffer: 100 * 1024 * 1024,
+    }).toString().trim();
 
     // This does not trigger itself because of the `b` in `\bDO_`...
     if (diff.match(/\bDO_NOT_SUBMIT\b/)) {

From a9ac221c4044a6255f38a0c08b666a23e6d97689 Mon Sep 17 00:00:00 2001
From: Amadou Sall <ahasall.dev@gmail.com>
Date: Sun, 2 Jun 2019 23:44:31 +0200
Subject: [PATCH 1681/1703] fix(@schematics/angular): application schematic
 should prompt for --routing and --style

This is the first step towards solving issue related to #13383

closes #14705
---
 .../schematics/angular/application/schema.json    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json
index cb616801886f..7b73fa9b6eba 100644
--- a/packages/schematics/angular/application/schema.json
+++ b/packages/schematics/angular/application/schema.json
@@ -48,7 +48,9 @@
     "routing": {
       "type": "boolean",
       "description": "When true, creates a routing NgModule.",
-      "default": false
+      "default": false,
+      "x-prompt": "Would you like to add Angular routing?",
+      "x-user-analytics": 17
     },
     "prefix": {
       "type": "string",
@@ -68,6 +70,17 @@
         "less",
         "styl"
       ],
+      "x-prompt": {
+        "message": "Which stylesheet format would you like to use?",
+        "type": "list",
+        "items": [
+          { "value": "css",  "label": "CSS" },
+          { "value": "scss", "label": "SCSS   [ https://sass-lang.com/documentation/syntax#scss                ]" },
+          { "value": "sass", "label": "Sass   [ https://sass-lang.com/documentation/syntax#the-indented-syntax ]" },
+          { "value": "less", "label": "Less   [ http://lesscss.org                                             ]" },
+          { "value": "styl", "label": "Stylus [ http://stylus-lang.com                                         ]" }
+        ]
+      },
       "x-user-analytics": 5
     },
     "skipTests": {

From b9598835bb2e5409a9b3478a1119ba51cd3968e5 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Thu, 25 Jul 2019 10:42:56 +0200
Subject: [PATCH 1682/1703] fix(@angular/cli): don't add leftovers when there
 are none

At the moment we are adding leftover args to `--` even when it's an empty array, this causes schematics without arguments to fail silently, because of https://github.com/angular/angular-cli/blob/07780b9272d985606d318da16d732dd28a41d592/packages/angular/cli/models/schematic-command.ts#L463

Fixes: #15156
---
 packages/angular/cli/models/parser.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/angular/cli/models/parser.ts b/packages/angular/cli/models/parser.ts
index f37d604aa536..2d5dbf7495e6 100644
--- a/packages/angular/cli/models/parser.ts
+++ b/packages/angular/cli/models/parser.ts
@@ -269,7 +269,9 @@ export function parseFreeFormArguments(args: string[]): Arguments {
     }
   }
 
-  parsedOptions['--'] = leftovers;
+  if (leftovers.length) {
+    parsedOptions['--'] = leftovers;
+  }
 
   return parsedOptions;
 }

From ab80209c922047fd7bb52fb32c6f325f062ca4dc Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 29 Jul 2019 17:01:18 +0200
Subject: [PATCH 1683/1703] fix(@angular-devkit/build-optimizer): don't wrap
 enum like nodes which are inside of methods.

With this change we stop recursive lookup when the current node is not a BlockLike.

This change should also, improve the BO overall speed as it's reduces a lot of recursive lookups.

Fixes #15145
---
 .../src/transforms/wrap-enums.ts              |  7 +--
 .../src/transforms/wrap-enums_spec.ts         | 47 +++++++++++++++++++
 2 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
index 350d4f70395c..d1f315431649 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
@@ -56,7 +56,7 @@ function visitBlockStatements(
           return node;
       }
     } else {
-      return ts.visitEachChild(node, visitor, context);
+      return node;
     }
   };
 
@@ -112,7 +112,7 @@ function visitBlockStatements(
             oIndex++;
           }
 
-          const enumStatements = findStatements(name, statements, oIndex + 1);
+          const enumStatements = findStatements(name, statements, oIndex, 1);
           if (!enumStatements) {
             continue;
           }
@@ -316,6 +316,7 @@ function findStatements(
   name: string,
   statements: ts.NodeArray<ts.Statement>,
   statementIndex: number,
+  offset = 0,
 ): ts.Statement[] | undefined {
   let count = 1;
 
@@ -369,7 +370,7 @@ function findStatements(
   }
 
   if (count > 1) {
-    return statements.slice(statementIndex, statementIndex + count);
+    return statements.slice(statementIndex + offset, statementIndex + count);
   }
 
   return undefined;
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
index a2b344b6f79b..b4d0e8917c4b 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
@@ -88,6 +88,37 @@ describe('wrap enums and classes transformer', () => {
       expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
     });
 
+    it('should not wrap enum like which are inside of methods', () => {
+      const input = tags.stripIndent`
+        class LayoutDirective {
+          constructor(elRef) { }
+
+          applyStyleToElement(element, style, value) {
+            let styles = {};
+            if (typeof style === 'string') {
+                styles[style] = value;
+                style = styles;
+            }
+            styles = this.layoutConfig.disableVendorPrefixes ? style : applyCssPrefixes(style);
+            this._applyMultiValueStyleToElement(styles, element);
+          }
+        }
+        LayoutDirective.ctorParameters = () => [
+          { type: ElementRef }
+        ];
+      `;
+
+      const output = tags.stripIndent`
+        let LayoutDirective = /*@__PURE__*/ (() => {
+          ${input}
+
+          return LayoutDirective;
+        })();
+      `;
+
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+
     it('should ClassDeclarations that are referenced with in CallExpressions', () => {
       const input = tags.stripIndent`
         class ApplicationModule {
@@ -439,6 +470,22 @@ describe('wrap enums and classes transformer', () => {
       expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
     });
 
+    it('should not wrap enum like object literal declarations', () => {
+      const input = tags.stripIndent`
+        const RendererStyleFlags3 = {
+            Important: 1,
+            DashCase: 2,
+        };
+        if (typeof RendererStyleFlags3 === 'object') {
+          RendererStyleFlags3[RendererStyleFlags3.Important] = 'DashCase';
+        }
+        RendererStyleFlags3[RendererStyleFlags3.Important] = 'Important';
+      `;
+      const output = input;
+
+      expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
+    });
+
     it('wraps ES2015 tsickle enums in IIFE', () => {
       const input = tags.stripIndent`
         const ChangeDetectionStrategy = {

From 687bc6a0a324f04c2a527caec959538a2a2d10ed Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Fri, 26 Jul 2019 11:01:54 +0200
Subject: [PATCH 1684/1703] ci: enable snapshot e2e for renovate PRs

snapshots builds are required to be run when the PR is created by renovate. This is because we have renovate jobs that update the snapshots commit SHA and we want to verify that these are green prior to merging them.

Related to: https://github.com/angular/angular-cli/pull/14687
---
 .circleci/config.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 67bd5fd2ac9c..35f3fafcf90d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -60,7 +60,7 @@ executors:
 # https://circleci.com/docs/2.0/reusing-config/#authoring-reusable-commands
 commands:
   setup_windows:
-    steps:     
+    steps:
       - checkout
       - run:
           # Need to install node and yarn before, as the base windows image doesn't have anything.
@@ -358,9 +358,16 @@ workflows:
       - e2e-cli:
           name: e2e-cli-ng-snapshots
           snapshots: true
-          <<: *ignore_pull_requests
           requires:
             - e2e-cli
+          pre-steps:
+            - run:
+                name: Don't run expensive e2e snapshots tests for forks other than renovate-bot and angular
+                command: >
+                  if [[ "$CIRCLE_PR_USERNAME" != "renovate-bot" ]] &&
+                    [[ "$CIRCLE_PROJECT_USERNAME" != "angular" || $CIRCLE_BRANCH != "master" ]]; then
+                    circleci step halt
+                  fi
       - e2e-cli-node-10:
           <<: *ignore_pull_requests
           requires:

From ea44b0dc5574c74dee2d8810482e3a7681001eff Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 26 Jul 2019 12:14:19 +0200
Subject: [PATCH 1685/1703] test: add library consumption protractor test

Update library-consumption e2e test to run protractor to verify that the library consumption works both during build and runtime
---
 .../generate/library/library-consumption.ts   | 52 ++++++++++++++-----
 1 file changed, 40 insertions(+), 12 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/generate/library/library-consumption.ts b/tests/legacy-cli/e2e/tests/generate/library/library-consumption.ts
index 075ba91da20c..8486a1549f27 100644
--- a/tests/legacy-cli/e2e/tests/generate/library/library-consumption.ts
+++ b/tests/legacy-cli/e2e/tests/generate/library/library-consumption.ts
@@ -1,10 +1,11 @@
-import { ng } from '../../../utils/process';
 import { writeFile } from '../../../utils/fs';
+import { ng } from '../../../utils/process';
+
+export default async function () {
+  await ng('generate', 'library', 'my-lib');
+  await ng('build', 'my-lib');
 
-export default function () {
-  return ng('generate', 'library', 'my-lib')
-    .then(() => ng('build', 'my-lib'))
-    .then(() => writeFile('./src/app/app.module.ts', `
+  await writeFile('./src/app/app.module.ts', `
       import { BrowserModule } from '@angular/platform-browser';
       import { NgModule } from '@angular/core';
       import { MyLibModule } from 'my-lib';
@@ -23,8 +24,9 @@ export default function () {
         bootstrap: [AppComponent]
       })
       export class AppModule { }
-    `))
-    .then(() => writeFile('./src/app/app.component.ts', `
+    `);
+
+  await writeFile('./src/app/app.component.ts', `
       import { Component } from '@angular/core';
       import { MyLibService } from 'my-lib';
 
@@ -39,9 +41,35 @@ export default function () {
           console.log(myLibService);
         }
       }
-    `))
-    // Check that the build succeeds both with named project, unnammed (should build app), and prod.
-    .then(() => ng('build', 'test-project'))
-    .then(() => ng('build'))
-    .then(() => ng('build', '--prod'));
+    `);
+
+  await writeFile('e2e/src/app.e2e-spec.ts', `
+    import { browser, logging, element, by } from 'protractor';
+    import { AppPage } from './app.po';
+
+    describe('workspace-project App', () => {
+      let page: AppPage;
+
+      beforeEach(() => {
+        page = new AppPage();
+      });
+
+      it('should display text from library component', () => {
+        page.navigateTo();
+        expect(element(by.css('lib-my-lib p')).getText()).toEqual('my-lib works!');
+      });
+
+      afterEach(async () => {
+        // Assert that there are no errors emitted from the browser
+        const logs = await browser.manage().logs().get(logging.Type.BROWSER);
+        expect(logs).not.toContain(jasmine.objectContaining({
+          level: logging.Level.SEVERE,
+        }));
+      });
+    });
+  `);
+
+  // Check that the tests succeeds both with named project, unnammed (should test app), and prod.
+  await ng('e2e');
+  await ng('e2e', 'test-project', '--devServerTarget=test-project:serve:production');
 }

From 588815ab83a0a95694f3a06bd2050d426e91cb71 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Fri, 26 Jul 2019 20:30:55 +0200
Subject: [PATCH 1686/1703] test: follow up comments from #15173

---
 tests/legacy-cli/e2e/tests/misc/ask-analytics.ts   | 4 +---
 tests/legacy-cli/e2e/tests/schematics_cli/basic.ts | 5 +----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/misc/ask-analytics.ts b/tests/legacy-cli/e2e/tests/misc/ask-analytics.ts
index ecc6b797de3f..5ef8dc5a6953 100644
--- a/tests/legacy-cli/e2e/tests/misc/ask-analytics.ts
+++ b/tests/legacy-cli/e2e/tests/misc/ask-analytics.ts
@@ -5,8 +5,6 @@ import {
   waitForAnyProcessOutputToMatch,
 } from '../../utils/process';
 
-const packages = require('../../../../../lib/packages').packages;
-
 export default async function() {
   // Create a temporary directory to install the CLI
   await createDir('../ask-analytics');
@@ -17,7 +15,7 @@ export default async function() {
     // Install the CLI with TTY force enabled
     const execution = execWithEnv(
       'npm',
-      ['install', packages['@angular/cli'].tar, '--registry=http://localhost:4873'],
+      ['install', '@angular/cli', '--registry=http://localhost:4873'],
       { ...process.env, 'NG_FORCE_TTY': '1' },
     );
 
diff --git a/tests/legacy-cli/e2e/tests/schematics_cli/basic.ts b/tests/legacy-cli/e2e/tests/schematics_cli/basic.ts
index fe94d50a057b..a160f5d703b7 100644
--- a/tests/legacy-cli/e2e/tests/schematics_cli/basic.ts
+++ b/tests/legacy-cli/e2e/tests/schematics_cli/basic.ts
@@ -2,8 +2,6 @@ import * as path from 'path';
 import { getGlobalVariable } from '../../utils/env';
 import { exec, execAndWaitForOutputToMatch, silentNpm } from '../../utils/process';
 
-const packages = require('../../../../../lib/packages').packages;
-
 export default async function () {
   // setup
   const argv = getGlobalVariable('argv');
@@ -15,8 +13,7 @@ export default async function () {
   await silentNpm(
     'install',
     '-g',
-    packages['@angular-devkit/schematics-cli'].tar,
-    '--unsafe-perm',
+    '@angular-devkit/schematics-cli',
     '--registry=http://localhost:4873',
   );
   await exec(process.platform.startsWith('win') ? 'where' : 'which', 'schematics');

From d1a25275693f70a7752cbd01dd2257ae80724694 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Sat, 27 Jul 2019 05:35:48 +0000
Subject: [PATCH 1687/1703] build: update caniuse-lite to version 1.0.30000986

---
 packages/angular_devkit/build_angular/package.json | 2 +-
 yarn.lock                                          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index a731d937734f..a323eecc4fd6 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -15,7 +15,7 @@
     "ajv": "6.10.2",
     "autoprefixer": "9.6.1",
     "browserslist": "4.6.6",
-    "caniuse-lite": "1.0.30000985",
+    "caniuse-lite": "1.0.30000986",
     "circular-dependency-plugin": "5.0.2",
     "clean-css": "4.2.1",
     "copy-webpack-plugin": "5.0.4",
diff --git a/yarn.lock b/yarn.lock
index f40e733b0a1a..071083b849fb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2071,10 +2071,10 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@1.0.30000985:
-  version "1.0.30000985"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000985.tgz#0eb40f6c8a8c219155cbe43c4975c0efb4a0f77f"
-  integrity sha512-1ngiwkgqAYPG0JSSUp3PUDGPKKY59EK7NrGGX+VOxaKCNzRbNc7uXMny+c3VJfZxtoK3wSImTvG9T9sXiTw2+w==
+caniuse-lite@1.0.30000986:
+  version "1.0.30000986"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000986.tgz#f34350e367cc900509511574817ac092112bf7ab"
+  integrity sha512-pM+LnkoAX0+QnIH3tpW5EnkmfpEoqOD8FAcoBvsl3Xh6DXkgctiCxeCbXphP/k3XJtJzm+zOAJbi6U6IVkpWZQ==
 
 caniuse-lite@^1.0.30000960:
   version "1.0.30000960"

From 0f8b33216d1389441f0882368f1c65c162ce6012 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 29 Jul 2019 16:59:19 +0100
Subject: [PATCH 1688/1703] fix(@ngtools/webpack): find aliased lazy route
 factories

Fix #14707
---
 .../src/transformers/import_factory.ts        | 16 +++-
 .../src/transformers/import_factory_spec.ts   | 76 ++++++++++++++++++-
 2 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/packages/ngtools/webpack/src/transformers/import_factory.ts b/packages/ngtools/webpack/src/transformers/import_factory.ts
index 7637c72f00bb..28257d847022 100644
--- a/packages/ngtools/webpack/src/transformers/import_factory.ts
+++ b/packages/ngtools/webpack/src/transformers/import_factory.ts
@@ -10,6 +10,9 @@ import * as ts from 'typescript';
 import { forwardSlashPath } from '../utils';
 
 
+// Check if a ts.Symbol is an alias.
+const isAlias = (symbol: ts.Symbol) => symbol.flags & ts.SymbolFlags.Alias;
+
 /**
  * Given this original source code:
  *
@@ -193,15 +196,26 @@ function replaceImport(
 
   // Try to resolve the import. It might be a reexport from somewhere and the ngfactory will only
   // be present next to the original module.
-  const exportedSymbol = typeChecker.getSymbolAtLocation(exportNameId);
+  let exportedSymbol = typeChecker.getSymbolAtLocation(exportNameId);
   if (!exportedSymbol) {
     return warnAndBail();
   }
+  // Named exports are also a declaration in the re-exporting module so we have to follow the
+  // re-exports to find the original symbol.
+  if (isAlias(exportedSymbol)) {
+    exportedSymbol = typeChecker.getAliasedSymbol(exportedSymbol);
+    if (!exportedSymbol) {
+      return warnAndBail();
+    }
+  }
+
+  // Find declarations of the original symbol so we can get their source file name.
   const exportedSymbolDecl = exportedSymbol.getDeclarations();
   if (!exportedSymbolDecl || exportedSymbolDecl.length === 0) {
     return warnAndBail();
   }
 
+  // Let's guess the first declaration is the one we want, because we don't have a better criteria.
   // Get the relative path from the containing module to the imported module.
   const relativePath = relative(dirname(fileName), exportedSymbolDecl[0].getSourceFile().fileName);
 
diff --git a/packages/ngtools/webpack/src/transformers/import_factory_spec.ts b/packages/ngtools/webpack/src/transformers/import_factory_spec.ts
index e0ab9422290b..06745ca9272c 100644
--- a/packages/ngtools/webpack/src/transformers/import_factory_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/import_factory_spec.ts
@@ -64,7 +64,7 @@ describe('@ngtools/webpack transformers', () => {
       expect(warningCalled).toBeTruthy();
     });
 
-    it('should support resolving reexports', () => {
+    it('should support resolving * re-exports', () => {
       const additionalFiles: Record<string, string> = {
         'shared/index.ts': `
           export * from './path/to/lazy/lazy.module';
@@ -95,5 +95,79 @@ describe('@ngtools/webpack transformers', () => {
 
       expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
     });
+
+    it('should support resolving named re-exports', () => {
+      const additionalFiles: Record<string, string> = {
+        'shared/index.ts': `
+          export { LazyModule } from './path/to/lazy/lazy.module';
+        `,
+        'shared/path/to/lazy/lazy.module.ts': `
+          export const LazyModule = {};
+        `,
+      };
+      const input = tags.stripIndent`
+        const ɵ0 = () => import('./shared').then(m => m.LazyModule);
+        const routes = [{
+          path: 'lazy',
+          loadChildren: ɵ0
+        }];
+      `;
+
+      const output = tags.stripIndent`
+        const ɵ0 = () => import("./shared/path/to/lazy/lazy.module.ngfactory").then(m => m.LazyModuleNgFactory);
+        const routes = [{
+          path: 'lazy',
+          loadChildren: ɵ0
+        }];
+      `;
+
+      const { program, compilerHost } = createTypescriptContext(input, additionalFiles, true);
+      const transformer = importFactory(() => { }, () => program.getTypeChecker());
+      const result = transformTypescript(undefined, [transformer], program, compilerHost);
+
+      expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+    });
+
+
+    it('should support resolving re-export chains', () => {
+      const additionalFiles: Record<string, string> = {
+        'shared/index.ts': `
+          export { LazyModule } from './index2';
+        `,
+        'shared/index2.ts': `
+          export * from './index3';
+        `,
+        'shared/index3.ts': `
+          export { LazyModule } from './index4';
+        `,
+        'shared/index4.ts': `
+          export * from './path/to/lazy/lazy.module';
+        `,
+        'shared/path/to/lazy/lazy.module.ts': `
+          export const LazyModule = {};
+        `,
+      };
+      const input = tags.stripIndent`
+        const ɵ0 = () => import('./shared').then(m => m.LazyModule);
+        const routes = [{
+          path: 'lazy',
+          loadChildren: ɵ0
+        }];
+      `;
+
+      const output = tags.stripIndent`
+        const ɵ0 = () => import("./shared/path/to/lazy/lazy.module.ngfactory").then(m => m.LazyModuleNgFactory);
+        const routes = [{
+          path: 'lazy',
+          loadChildren: ɵ0
+        }];
+      `;
+
+      const { program, compilerHost } = createTypescriptContext(input, additionalFiles, true);
+      const transformer = importFactory(() => { }, () => program.getTypeChecker());
+      const result = transformTypescript(undefined, [transformer], program, compilerHost);
+
+      expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+    });
   });
 });

From eaca31c745b82d4e0eaae96b9bba3aa9b4437d5a Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 26 Jul 2019 22:26:50 +0000
Subject: [PATCH 1689/1703] build: update @angular/animations to version

---
 tests/legacy-cli/e2e/ng-snapshot/package.json | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 6832f5a0757b..676270db21ec 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,15 +2,15 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#05dbe29e4cf274a1f3d2033c0747ce7e1c4df389",
-    "@angular/common": "github:angular/common-builds#bd8b165c773aac498a3b7f85a11451f78133f4ad",
-    "@angular/compiler": "github:angular/compiler-builds#d9eff2a8978631c6456e4854f827baeb4fdb7da3",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#b20f652da542fe1f8c04575dbb471cbb5452cb08",
-    "@angular/core": "github:angular/core-builds#d8f3855dfb5a839df67e9e01f5330db847c262c2",
-    "@angular/forms": "github:angular/forms-builds#9dc7f1e5358d1928c8c39570cd3e63cae8999ecc",
-    "@angular/language-service": "github:angular/language-service-builds#35ce49bfe0c9ee3cff517b324346c5055a5ba627",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#f3c23e305a7cf67c88ccfd0fd1b109653a563d9d",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#bb93ab9bb2a4f586b4a5d5c07dff4617a0c0288a",
-    "@angular/router": "github:angular/router-builds#f1cf28650b74b2e532be29064ee6fe46ae205bd1"
+    "@angular/animations": "github:angular/animations-builds#df44fec318ffc5f6e086af66df033b88a633ae6d",
+    "@angular/common": "github:angular/common-builds#728946a4d9ffd7b96a3331d616ce806b90c8febb",
+    "@angular/compiler": "github:angular/compiler-builds#08b4f40bc88cfc44d1de773acf676d24c14010ae",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#7137dfa9988799ecd6ee297f44fdb2f5ff207cee",
+    "@angular/core": "github:angular/core-builds#a9880fdf9302b7fd4d49a16806184b4dc9327395",
+    "@angular/forms": "github:angular/forms-builds#acee53679baf967933f9c3b0e36c72c28f595e3d",
+    "@angular/language-service": "github:angular/language-service-builds#e53ef09a6da3d2c713f95ef6cf81e7816869f8ca",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#116c2a269cbf30be15c70e4e56d3c6b48c268a12",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#07972bce79404902aa8dd2c0cd121f47a6e9c08c",
+    "@angular/router": "github:angular/router-builds#2b6c1d9b848413a5c75cd5c21303136e7ef96121"
   }
 }
\ No newline at end of file

From 168f07e9d033215a376b4b3d9fce6eecf44536fe Mon Sep 17 00:00:00 2001
From: vikerman <viks@google.com>
Date: Mon, 29 Jul 2019 12:11:01 -0700
Subject: [PATCH 1690/1703] release: v8.2.0-rc.0

---
 packages/schematics/angular/utility/latest-versions.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index a1c89fd7c6f1..761e1999d650 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -15,10 +15,10 @@ export const latestVersions = {
   TsLib: '^1.10.0',
 
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.802.0-next.2',
-  DevkitBuildNgPackagr: '~0.802.0-next.2',
-  DevkitBuildWebpack: '~0.802.0-next.2',
-  AngularPWA: '~0.802.0-next.2',
+  DevkitBuildAngular: '~0.802.0-rc.0',
+  DevkitBuildNgPackagr: '~0.802.0-rc.0',
+  DevkitBuildWebpack: '~0.802.0-rc.0',
+  AngularPWA: '~0.802.0-rc.0',
 
   tsickle: '^0.36.0',
   ngPackagr: '^5.3.0',

From 607e6f7cfd7b5f16231eae968fbf36e920c169e0 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 29 Jul 2019 20:45:15 +0200
Subject: [PATCH 1691/1703] test: increase/add debounceTime to reduce flakiness

---
 .../build_angular/test/browser/rebuild_spec_large.ts           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
index e82f573249d9..7950318dba69 100644
--- a/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts
@@ -77,6 +77,7 @@ describe('Browser Builder rebuilds', () => {
     const run = await architect.scheduleTarget(target, overrides);
     await run.output
       .pipe(
+        debounceTime(1000),
         tap(result => {
           expect(result.success).toBe(true, 'build should succeed');
           const hasLazyChunk = host.scopedSync().exists(normalize('dist/lazy-lazy-module.js'));
@@ -127,7 +128,7 @@ describe('Browser Builder rebuilds', () => {
     const run = await architect.scheduleTarget(target, overrides);
     await run.output
       .pipe(
-        debounceTime(500),
+        debounceTime(1000),
         tap(buildEvent => expect(buildEvent.success).toBe(true)),
         tap(() => host.appendToFile('src/app/app.component.css', ':host { color: blue; }')),
         take(2),

From 853af078fecde5706ff7104ef18d37329fd9e5c5 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 30 Jul 2019 09:19:35 +0200
Subject: [PATCH 1692/1703] fix(@angular-devkit/build-optimizer): don't wrap
 classes which static properties have been removed

At the moment the `wrap-enums` transfomers is being run prior to `scrub-file` and this is resulting classes which all static properties have been dropped to be wrapped in IIFE.
---
 .../src/build-optimizer/build-optimizer.ts    |  2 +-
 .../build-optimizer/build-optimizer_spec.ts   | 29 +++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer.ts b/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer.ts
index 437229b2af87..5113273314bd 100644
--- a/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer.ts
+++ b/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer.ts
@@ -149,7 +149,7 @@ export function buildOptimizer(options: BuildOptimizerOptions): TransformJavascr
     getTransforms.unshift(getImportTslibTransformer);
   }
 
-  getTransforms.unshift(getWrapEnumsTransformer);
+  getTransforms.push(getWrapEnumsTransformer);
 
   const transformJavascriptOpts: TransformJavascriptOptions = {
     content: content,
diff --git a/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer_spec.ts b/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer_spec.ts
index efc090e663b1..c9e8402dca91 100644
--- a/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer_spec.ts
+++ b/packages/angular_devkit/build_optimizer/src/build-optimizer/build-optimizer_spec.ts
@@ -99,6 +99,35 @@ describe('build-optimizer', () => {
       expect(tags.oneLine`${boOutput.content}`).toEqual(output);
       expect(boOutput.emitSkipped).toEqual(false);
     });
+
+    it('should not wrap classes which had all static properties dropped in IIFE', () => {
+      const classDeclaration = tags.oneLine`
+        import { Injectable } from '@angular/core';
+
+        class Platform {
+          constructor(_doc) {
+          }
+          init() {
+          }
+        }
+      `;
+      const input = tags.oneLine`
+        ${classDeclaration}
+
+        Platform.decorators = [
+            { type: Injectable }
+        ];
+
+        /** @nocollapse */
+        Platform.ctorParameters = () => [
+            { type: undefined, decorators: [{ type: Inject, args: [DOCUMENT] }] }
+        ];
+      `;
+
+      const boOutput = buildOptimizer({ content: input, isSideEffectFree: true });
+      expect(tags.oneLine`${boOutput.content}`).toEqual(classDeclaration);
+      expect(boOutput.emitSkipped).toEqual(false);
+    });
   });
 
 

From 7ab822f75335e28dd34a4a8869832d5f0ac199e9 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Tue, 30 Jul 2019 09:26:16 +0200
Subject: [PATCH 1693/1703] fix(@angular-devkit/build-angular): escape dot in
 js extensions to match literally

Closes #15195
---
 .../src/angular-cli-files/models/webpack-configs/common.ts  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index c393254f507a..9afad63c7cc3 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -403,11 +403,11 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
           parser: { system: true },
         },
         {
-          test: /[\/\\]hot[\/\\]emitter.js$/,
+          test: /[\/\\]hot[\/\\]emitter\.js$/,
           parser: { node: { events: true } },
         },
         {
-          test: /[\/\\]webpack-dev-server[\/\\]client[\/\\]utils[\/\\]createSocketUrl.js$/,
+          test: /[\/\\]webpack-dev-server[\/\\]client[\/\\]utils[\/\\]createSocketUrl\.js$/,
           parser: { node: { querystring: true } },
         },
         {
@@ -416,7 +416,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
         },
         {
           test: /\.js$/,
-          exclude: /(ngfactory|ngstyle).js$/,
+          exclude: /(ngfactory|ngstyle)\.js$/,
           enforce: 'pre',
           ...sourceMapUseRule,
         },

From 6d5e718cfb01ec6a3a49d536fcd0246808a7dc77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <brezinapavel@gmail.com>
Date: Mon, 15 Jul 2019 12:08:29 +0200
Subject: [PATCH 1694/1703] fix(@angular-devkit/architect): add target to
 ScheduleOptions to allow its use in `context.scheduleBuilder`

A custom builder can call `context.scheduleBuilder` to call another builder.
However, the following call will fail with `Must either have a target from
the context or a default project.` exception because `scheduleBuilder` does
not pass `target` to the called builder.

```typescript
import { JsonObject } from '@angular-devkit/core'
import { BuilderContext, BuilderOutput, BuilderRun, createBuilder } from '@angular-devkit/architect';
import { Observable, from } from 'rxjs';
import { concatMap, map } from 'rxjs/operators';

export default createBuilder(_customBuilder);

function _customBuilder(options: JsonObject, context: BuilderContext): Observable<BuilderOutput> {
    const builder = '@angular-devkit/build-angular:browser';

    return from(context.scheduleBuilder(builder, options)).pipe(
        concatMap(run => run.result)
    );
}
```

Resolves:
https://github.com/angular/angular-cli/issues/15053
---
 packages/angular_devkit/architect/src/api.ts            | 5 +++++
 packages/angular_devkit/architect/src/create-builder.ts | 1 +
 2 files changed, 6 insertions(+)

diff --git a/packages/angular_devkit/architect/src/api.ts b/packages/angular_devkit/architect/src/api.ts
index 52dfcf377883..35f7e4fd9275 100644
--- a/packages/angular_devkit/architect/src/api.ts
+++ b/packages/angular_devkit/architect/src/api.ts
@@ -109,6 +109,11 @@ export interface ScheduleOptions {
    * to log a builder scheduled from your builder you should forward log events yourself.
    */
   logger?: logging.Logger;
+
+  /**
+   * Target to pass to the builder.
+   */
+  target?: Target;
 }
 
 /**
diff --git a/packages/angular_devkit/architect/src/create-builder.ts b/packages/angular_devkit/architect/src/create-builder.ts
index 0a4b97aaebde..9b03efd8b85f 100644
--- a/packages/angular_devkit/architect/src/create-builder.ts
+++ b/packages/angular_devkit/architect/src/create-builder.ts
@@ -129,6 +129,7 @@ export function createBuilder<
           ) {
             const run = await scheduleByName(builderName, options, {
               scheduler,
+              target: scheduleOptions.target,
               logger: scheduleOptions.logger || logger.createChild(''),
               workspaceRoot: i.workspaceRoot,
               currentDirectory: i.currentDirectory,

From 0ed237e2d6ab28c34456374d7b8d460290caff62 Mon Sep 17 00:00:00 2001
From: vikerman <viks@google.com>
Date: Wed, 31 Jul 2019 14:55:24 -0700
Subject: [PATCH 1695/1703] release: v8.2.0

---
 packages/schematics/angular/utility/latest-versions.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 761e1999d650..40b706e94ca9 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -8,17 +8,17 @@
 
 export const latestVersions = {
   // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~8.2.0-rc.0',
+  Angular: '~8.2.0',
   RxJs: '~6.4.0',
   ZoneJs: '~0.9.1',
   TypeScript: '~3.5.3',
   TsLib: '^1.10.0',
 
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.802.0-rc.0',
-  DevkitBuildNgPackagr: '~0.802.0-rc.0',
-  DevkitBuildWebpack: '~0.802.0-rc.0',
-  AngularPWA: '~0.802.0-rc.0',
+  DevkitBuildAngular: '~0.802.0',
+  DevkitBuildNgPackagr: '~0.802.0',
+  DevkitBuildWebpack: '~0.802.0',
+  AngularPWA: '~0.802.0',
 
   tsickle: '^0.36.0',
   ngPackagr: '^5.3.0',

From 1acfaaed586b39d7a0f77b238b0463b40191b221 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 1 Aug 2019 10:55:07 +0200
Subject: [PATCH 1696/1703] fix(@angular-devkit/build-angular): various
 breakpoints issues

With this change we address 2 main issues related to unbound breakpoints:
1) in VS code when having a `baseHref` set.
2) Visual Studio when using an SPA inside a ASP.NET project

For the latter, it seems that there is no way to set a `webRoot`. However, `webpack:///` seems to be handled internally and will be mapped to the `SpaRoot` ie `ClientApp` folder.

Fixes: #15211
---
 .../src/angular-cli-files/models/webpack-configs/utils.ts    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
index 63c6651bb857..a00fe9c06348 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/utils.ts
@@ -93,6 +93,11 @@ export function getSourceMapDevTool(
   return new SourceMapDevToolPlugin({
     filename: inlineSourceMap ? undefined : '[file].map',
     include,
+    // We want to set sourceRoot to  `webpack:///` for non
+    // inline sourcemaps as otherwise paths to sourcemaps will be broken in browser
+    // `webpack:///` is needed for Visual Studio breakpoints to work properly as currently
+    // there is no way to set the 'webRoot'
+    sourceRoot: inlineSourceMap ? '' : 'webpack:///',
     moduleFilenameTemplate: '[resource-path]',
     append: hiddenSourceMap ? false : undefined,
   });

From d212620bf1c4747bec97926933483545a225eadd Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 1 Aug 2019 13:44:10 +0200
Subject: [PATCH 1697/1703] fix(@angular-devkit/core): add schema defaults when
 value is undefined

Related to https://github.com/angular/angular-cli/pull/15207#discussion_r309175463
---
 .../core/src/json/schema/registry_spec.ts     | 36 +++++++++++++++++++
 .../core/src/json/schema/transforms.ts        |  8 ++---
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/packages/angular_devkit/core/src/json/schema/registry_spec.ts b/packages/angular_devkit/core/src/json/schema/registry_spec.ts
index 1d9bf89c8d3f..0f6f49a96263 100644
--- a/packages/angular_devkit/core/src/json/schema/registry_spec.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry_spec.ts
@@ -445,4 +445,40 @@ describe('CoreSchemaRegistry', () => {
       .toPromise().then(done, done.fail);
   });
 
+  it('adds defaults to undefined properties', done => {
+    const registry = new CoreSchemaRegistry();
+    registry.addPostTransform(addUndefinedDefaults);
+    // tslint:disable-line:no-any
+    const data: any = {
+      bool: undefined,
+      str: undefined,
+      obj: {
+        num: undefined,
+      },
+    };
+
+    registry
+      .compile({
+        properties: {
+          bool: { type: 'boolean', default: true },
+          str: { type: 'string', default: 'someString' },
+          obj: {
+            properties: {
+              num: { type: 'number', default: 0 },
+            },
+          },
+        },
+      })
+      .pipe(
+        mergeMap(validator => validator(data)),
+        map(result => {
+          expect(result.success).toBe(true);
+          expect(data.bool).toBe(true);
+          expect(data.str).toBe('someString');
+          expect(data.obj.num).toBe(0);
+        }),
+      )
+      .toPromise().then(done, done.fail);
+  });
+
 });
diff --git a/packages/angular_devkit/core/src/json/schema/transforms.ts b/packages/angular_devkit/core/src/json/schema/transforms.ts
index e047d3c38f2a..0407c62b63b5 100644
--- a/packages/angular_devkit/core/src/json/schema/transforms.ts
+++ b/packages/angular_devkit/core/src/json/schema/transforms.ts
@@ -63,15 +63,13 @@ export function addUndefinedDefaults(
       return newValue;
     }
 
-    for (const propName of Object.getOwnPropertyNames(schema.properties)) {
-      if (propName in newValue) {
-        continue;
-      } else if (propName == '$schema') {
+    for (const [propName, schemaObject] of Object.entries(schema.properties)) {
+      if (newValue[propName] !== undefined || propName === '$schema') {
         continue;
       }
 
       // TODO: Does not currently handle more complex schemas (oneOf/anyOf/etc.)
-      const defaultValue = (schema.properties[propName] as JsonObject).default;
+      const defaultValue = (schemaObject as JsonObject).default;
 
       newValue[propName] = defaultValue;
     }

From 284de6c1f12946d55d95d54d6681d0223392a41b Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Wed, 31 Jul 2019 17:55:15 +0100
Subject: [PATCH 1698/1703] fix(@angular-devkit/build-angular): use
 GLOBAL_DEFS_FOR_TERSER_WITH_AOT if present

Fix #15206
---
 .../models/webpack-configs/common.ts          | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
index 9afad63c7cc3..6d7be009e41e 100644
--- a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -297,15 +297,22 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
       ngI18nClosureMode: false,
     };
 
-    try {
-      // Try to load known global definitions from @angular/compiler-cli.
-      // tslint:disable-next-line:no-implicit-dependencies
-      const GLOBAL_DEFS_FOR_TERSER = require('@angular/compiler-cli').GLOBAL_DEFS_FOR_TERSER;
-      if (GLOBAL_DEFS_FOR_TERSER) {
-        angularGlobalDefinitions = GLOBAL_DEFS_FOR_TERSER;
+    // Try to load known global definitions from @angular/compiler-cli.
+    const GLOBAL_DEFS_FOR_TERSER = require('@angular/compiler-cli').GLOBAL_DEFS_FOR_TERSER;
+    if (GLOBAL_DEFS_FOR_TERSER) {
+      angularGlobalDefinitions = GLOBAL_DEFS_FOR_TERSER;
+    }
+
+    if (buildOptions.aot) {
+      // Also try to load AOT-only global definitions.
+      const GLOBAL_DEFS_FOR_TERSER_WITH_AOT =
+        require('@angular/compiler-cli').GLOBAL_DEFS_FOR_TERSER_WITH_AOT;
+      if (GLOBAL_DEFS_FOR_TERSER_WITH_AOT) {
+        angularGlobalDefinitions = {
+          ...angularGlobalDefinitions,
+          ...GLOBAL_DEFS_FOR_TERSER_WITH_AOT,
+        };
       }
-    } catch {
-      // Do nothing, the default above will be used instead.
     }
 
     const terserOptions = {

From 6e9514b5129ddb95d2acfafefad1b9146e5704f6 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 1 Aug 2019 19:19:14 +0200
Subject: [PATCH 1699/1703] fix(@ngtools/webpack): display unused file warning
 once per file

---
 .../unused-files-warning_spec_large.ts        | 54 ++++++++++++++++++-
 .../webpack/src/angular_compiler_plugin.ts    | 17 ++++--
 2 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/unused-files-warning_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/unused-files-warning_spec_large.ts
index d341876d3218..3fc077a71a16 100644
--- a/packages/angular_devkit/build_angular/test/browser/unused-files-warning_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/unused-files-warning_spec_large.ts
@@ -11,7 +11,7 @@ import { debounceTime, take, tap } from 'rxjs/operators';
 import { BrowserBuilderOutput } from '../../src/browser/index';
 import { createArchitect, host, ivyEnabled } from '../utils';
 
-
+// tslint:disable-next-line:no-big-function
 describe('Browser Builder unused files warnings', () => {
   const warningMessageSuffix = `is part of the TypeScript compilation but it's unused`;
   const targetSpec = { project: 'app', target: 'build' };
@@ -162,4 +162,56 @@ describe('Browser Builder unused files warnings', () => {
     await run.stop();
   });
 
+  it('should only show warning once per file', async () => {
+    if (!ivyEnabled) {
+      // TODO: https://github.com/angular/angular-cli/issues/15056
+      pending('Only supported in Ivy.');
+
+      return;
+    }
+
+    host.replaceInFile(
+      'src/tsconfig.app.json',
+      '"**/*.d.ts"',
+      '"**/*.d.ts", "testing/**/*.ts"',
+    );
+
+    // Write a used file
+    host.writeMultipleFiles({
+      'src/testing/type.ts': 'export type MyType = number;',
+    });
+
+    const logger = new TestLogger('unused-files-warnings');
+    let buildNumber = 0;
+    const run = await architect.scheduleTarget(targetSpec, { watch: true }, { logger });
+
+    await run.output
+      .pipe(
+        debounceTime(1000),
+        tap(buildEvent => {
+          expect(buildEvent.success).toBe(true);
+
+          buildNumber ++;
+          switch (buildNumber) {
+            case 1:
+              // The first should have type.ts as unused.
+              expect(logger.includes(`type.ts ${warningMessageSuffix}`)).toBe(true, `Case ${buildNumber} failed.`);
+
+              // touch a file to trigger a rebuild
+              host.appendToFile('src/main.ts', '');
+              break;
+            case 2:
+              // The second should should have type.ts as unused but shouldn't warn.
+              expect(logger.includes(warningMessageSuffix)).toBe(false, `Case ${buildNumber} failed.`);
+              break;
+          }
+
+          logger.clear();
+        }),
+        take(2),
+      )
+      .toPromise();
+    await run.stop();
+  });
+
 });
diff --git a/packages/ngtools/webpack/src/angular_compiler_plugin.ts b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
index 6962bd7bb04d..7a9e642d2d94 100644
--- a/packages/ngtools/webpack/src/angular_compiler_plugin.ts
+++ b/packages/ngtools/webpack/src/angular_compiler_plugin.ts
@@ -111,6 +111,7 @@ export class AngularCompilerPlugin {
   // This is needed because if the first build fails we need to do a full emit
   // even whe only a single file gets updated.
   private _hadFullJitEmit: boolean | undefined;
+  private _unusedFiles = new Set<string>();
   private _changedFileExtensions = new Set(['ts', 'tsx', 'html', 'css', 'js', 'json']);
 
   // Webpack plugin.
@@ -626,12 +627,18 @@ export class AngularCompilerPlugin {
       }
     }
 
-    const unusedFilesWarning = program.getSourceFiles()
-      .filter(({ fileName }) => !fileExcludeRegExp.test(fileName) && !usedFiles.has(fileName))
-      .map(({ fileName }) => `${fileName} is part of the TypeScript compilation but it's unused.`);
+    const sourceFiles = program.getSourceFiles();
+    for (const { fileName } of sourceFiles) {
+      if (
+        fileExcludeRegExp.test(fileName)
+        || usedFiles.has(fileName)
+        || this._unusedFiles.has(fileName)
+      ) {
+        continue;
+      }
 
-    if (unusedFilesWarning.length) {
-      compilation.warnings.push(...unusedFilesWarning);
+      compilation.warnings.push(`${fileName} is part of the TypeScript compilation but it's unused.`);
+      this._unusedFiles.add(fileName);
     }
   }
 

From 6e7ec27808cbed433c71f99205953ff82e18ecc8 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Fri, 2 Aug 2019 18:10:33 +0100
Subject: [PATCH 1700/1703] ci: add flake jail

---
 .circleci/config.yml | 13 +++++++++++++
 scripts/test.ts      |  9 +++++++++
 2 files changed, 22 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 35f3fafcf90d..203e9386d302 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -241,6 +241,16 @@ jobs:
       - attach_workspace: *attach_options
       - run: yarn build
 
+  # This is where we put all the misbehaving and flaky tests so we can fine-tune their conditions 
+  # and rerun them faster.
+  flake-jail:
+    executor: action-executor
+    steps:
+      - attach_workspace: *attach_options
+      - run: yarn webdriver-update
+      - run: yarn test-large --full --flakey
+      - run: yarn test-large --full --flakey --ivy=true
+
   build-bazel:
     executor: action-executor
     resource_class: xlarge
@@ -379,6 +389,9 @@ workflows:
       - test-browsers:
           requires:
             - build
+      - flake-jail:
+          requires:
+            - build
       - snapshot_publish:
           <<: *ignore_pull_requests
           requires:
diff --git a/scripts/test.ts b/scripts/test.ts
index 1776875d6067..4bc9decb8b4f 100644
--- a/scripts/test.ts
+++ b/scripts/test.ts
@@ -22,6 +22,12 @@ import { packages } from '../lib/packages';
 const codeMap = require('../lib/istanbul-local').codeMap;
 const Jasmine = require('jasmine');
 
+const knownFlakes = [
+  // Rebuild tests in test-large are flakey if not run as the first suite.
+  // https://github.com/angular/angular-cli/pull/15204
+  'packages/angular_devkit/build_angular/test/browser/rebuild_spec_large.ts',
+];
+
 const projectBaseDir = join(__dirname, '..');
 require('source-map-support').install({
   hookRequire: true,
@@ -265,6 +271,9 @@ export default function(args: ParsedArgs, logger: logging.Logger) {
     }
   }
 
+  // Filter in/out flakes according to the --flakey flag.
+  tests = tests.filter(test => !!args.flakey == knownFlakes.includes(test.replace(/[\/\\]/g, '/')));
+
   if (args.shard !== undefined) {
     // Remove tests that are not part of this shard.
     const shardId = args['shard'];

From fd2c264f69b3cb189048993c2113ba5905493db1 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sat, 3 Aug 2019 12:05:13 +0200
Subject: [PATCH 1701/1703] test: fix failing prod build snapshots

The output of a prod build contains now:
```
bootstrapModuleFactory($l).catch(e=>console.error(e))}
```

Which is not being matched with the previously defined RegExp
---
 tests/legacy-cli/e2e/tests/build/prod-build.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/legacy-cli/e2e/tests/build/prod-build.ts b/tests/legacy-cli/e2e/tests/build/prod-build.ts
index e4839192591b..1fa929480d1f 100644
--- a/tests/legacy-cli/e2e/tests/build/prod-build.ts
+++ b/tests/legacy-cli/e2e/tests/build/prod-build.ts
@@ -33,8 +33,8 @@ export default async function () {
   const argv = getGlobalVariable('argv');
   const ivyProject = argv['ivy'];
   const bootstrapRegExp = ivyProject
-    ? /bootstrapModule\([a-zA-Z]+\)\./
-    : /bootstrapModuleFactory\([a-zA-Z]+\)\./;
+    ? /bootstrapModule\([$]?[a-zA-Z]+\)\./
+    : /bootstrapModuleFactory\([$]?[a-zA-Z]+\)\./;
 
   await ng('build', '--prod');
   await expectFileToExist(join(process.cwd(), 'dist'));

From c18ba5fb69f40868a43c59c49548a9ce2f76c96d Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sat, 3 Aug 2019 13:36:07 +0200
Subject: [PATCH 1702/1703] fix(@ngtools/webpack): gracefully show error when
 compiling broken component styles

Fixes #15240
---
 .../test/browser/aot_spec_large.ts            | 28 +++++++++++++++++++
 .../ngtools/webpack/src/resource_loader.ts    |  8 ++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts b/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
index 4d0a141a5c77..ec582187af8c 100644
--- a/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
+++ b/packages/angular_devkit/build_angular/test/browser/aot_spec_large.ts
@@ -63,4 +63,32 @@ describe('Browser Builder AOT', () => {
     expect(logs.join()).toContain('WARNING in Invalid selector');
     await run.stop();
   });
+
+  it('shows error when component stylesheet contains SCSS syntax error', async () => {
+    const overrides = {
+      aot: true,
+    };
+
+    host.replaceInFile(
+      'src/app/app.component.ts',
+      'app.component.css',
+      'app.component.scss',
+    );
+
+    host.writeMultipleFiles({
+      'src/app/app.component.scss': `
+        .foo {
+      `,
+    });
+
+    const logger = new logging.Logger('');
+    const logs: string[] = [];
+    logger.subscribe(e => logs.push(e.message));
+
+    const run = await architect.scheduleTarget(targetSpec, overrides, { logger });
+    const output = await run.result;
+    expect(output.success).toBe(false);
+    expect(logs.join()).toContain(`Expected "}".`);
+    await run.stop();
+  });
 });
diff --git a/packages/ngtools/webpack/src/resource_loader.ts b/packages/ngtools/webpack/src/resource_loader.ts
index 8dc72d93f202..31662c6b94fe 100644
--- a/packages/ngtools/webpack/src/resource_loader.ts
+++ b/packages/ngtools/webpack/src/resource_loader.ts
@@ -99,6 +99,12 @@ export class WebpackResourceLoader {
     // Compile and return a promise
     return new Promise((resolve, reject) => {
       childCompiler.compile((err: Error, childCompilation: any) => {
+        if (err) {
+          reject(err);
+
+          return;
+        }
+
         // Resolve / reject the promise
         const { warnings, errors } = childCompilation;
 
@@ -114,8 +120,6 @@ export class WebpackResourceLoader {
             .join('\n');
 
           reject(new Error('Child compilation failed:\n' + errorDetails));
-        } else if (err) {
-          reject(err);
         } else {
           Object.keys(childCompilation.assets).forEach(assetName => {
             // Add all new assets to the parent compilation, with the exception of

From 2af1deb51e77805c11f54f80c0be62b182f630d4 Mon Sep 17 00:00:00 2001
From: Keen Yee Liau <kyliau@google.com>
Date: Thu, 8 Aug 2019 09:10:41 -0700
Subject: [PATCH 1703/1703] release: v8.2.1

---
 packages/schematics/angular/utility/latest-versions.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 40b706e94ca9..95dad5091f14 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -15,10 +15,10 @@ export const latestVersions = {
   TsLib: '^1.10.0',
 
   // The versions below must be manually updated when making a new devkit release.
-  DevkitBuildAngular: '~0.802.0',
-  DevkitBuildNgPackagr: '~0.802.0',
-  DevkitBuildWebpack: '~0.802.0',
-  AngularPWA: '~0.802.0',
+  DevkitBuildAngular: '~0.802.1',
+  DevkitBuildNgPackagr: '~0.802.1',
+  DevkitBuildWebpack: '~0.802.1',
+  AngularPWA: '~0.802.1',
 
   tsickle: '^0.36.0',
   ngPackagr: '^5.3.0',